From 6c27fa17a6072baefec9462354a2f6152c02d015 Mon Sep 17 00:00:00 2001 From: VB Date: Sat, 11 Feb 2017 22:52:20 +0100 Subject: [PATCH 001/426] glfw --- Camera.cpp | 26 +- Console.cpp | 14 +- EU07.cpp | 750 +++++++------------------------------ Globals.cpp | 191 ++++------ Globals.h | 5 +- Ground.cpp | 25 +- Ground.h | 2 +- Texture.cpp | 2 +- Train.cpp | 122 +++--- World.cpp | 228 +++++------ World.h | 5 +- maszyna.sln | 13 +- maszyna.vcxproj | 80 +++- maszyna.vcxproj.filters | 9 - maszyna.vcxproj.user | 9 + opengl/ARB_Multisample.cpp | 120 ------ opengl/ARB_Multisample.h | 25 -- stdafx.h | 6 + 18 files changed, 516 insertions(+), 1116 deletions(-) delete mode 100644 opengl/ARB_Multisample.cpp delete mode 100644 opengl/ARB_Multisample.h diff --git a/Camera.cpp b/Camera.cpp index 4c20b7e5..1c57d303 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -61,8 +61,8 @@ void TCamera::OnCursorMove(double x, double y) void TCamera::Update() { // ABu: zmiana i uniezaleznienie predkosci od FPS - double a = (Console::Pressed(VK_SHIFT) ? 5.00 : 1.00); - if (Console::Pressed(VK_CONTROL)) + double a = (Global::shiftState ? 5.00 : 1.00); + if (Global::ctrlState) a = a * 100; // OldVelocity=Velocity; if (FreeFlyModeFlag == true) @@ -86,27 +86,27 @@ void TCamera::Update() if (Console::Pressed(VkKeyScan('s'))) Velocity.z+= a*Timer::GetDeltaTime(); - if (Console::Pressed(VK_NUMPAD4) || Console::Pressed(VK_NUMPAD7) || - Console::Pressed(VK_NUMPAD1)) + if (Console::Pressed(GLFW_KEY_KP_4) || Console::Pressed(GLFW_KEY_KP_7) || + Console::Pressed(GLFW_KEY_KP_1)) Yaw+= +1*M_PI*Timer::GetDeltaTime(); - if (Console::Pressed(VK_NUMPAD6) || Console::Pressed(VK_NUMPAD9) || - Console::Pressed(VK_NUMPAD3)) + if (Console::Pressed(GLFW_KEY_KP_6) || Console::Pressed(GLFW_KEY_KP_9) || + Console::Pressed(GLFW_KEY_KP_3)) Yaw+= -1*M_PI*Timer::GetDeltaTime(); - if (Pressed(VK_NUMPAD2) || Console::Pressed(VK_NUMPAD1) || - Console::Pressed(VK_NUMPAD3)) + if (Pressed(GLFW_KEY_KP_2) || Console::Pressed(GLFW_KEY_KP_1) || + Console::Pressed(GLFW_KEY_KP_3)) Pitch+= -1*M_PI*Timer::GetDeltaTime(); - if (Console::Pressed(VK_NUMPAD8) || Console::Pressed(VK_NUMPAD7) || - Console::Pressed(VK_NUMPAD9)) + if (Console::Pressed(GLFW_KEY_KP_8) || Console::Pressed(GLFW_KEY_KP_7) || + Console::Pressed(GLFW_KEY_KP_9)) Pitch+= +1*M_PI*Timer::GetDeltaTime(); if (Console::Pressed(VkKeyScan('.'))) Roll+= -1*M_PI*Timer::GetDeltaTime(); if (Console::Pressed(VkKeyScan(','))) Roll+= +1*M_PI*Timer::GetDeltaTime(); - if (Console::Pressed(VK_NUMPAD5)) + if (Console::Pressed(GLFW_KEY_KP_5)) Pitch=Roll= 0.0f; */ @@ -120,8 +120,8 @@ void TCamera::Update() if (Console::Pressed(Global::Keys[k_MechBackward])) Velocity.z += a; // gora-dol - // if (Console::Pressed(VK_NUMPAD9)) Pos.y+=0.1; - // if (Console::Pressed(VK_NUMPAD3)) Pos.y-=0.1; + // if (Console::Pressed(GLFW_KEY_KP_9)) Pos.y+=0.1; + // if (Console::Pressed(GLFW_KEY_KP_3)) Pos.y-=0.1; // McZapkie: zeby nie hustalo przy malym FPS: // Velocity= (Velocity+OldVelocity)/2; diff --git a/Console.cpp b/Console.cpp index 9943c924..4ae7272d 100644 --- a/Console.cpp +++ b/Console.cpp @@ -252,8 +252,8 @@ void Console::BitsUpdate(int mask) SetLedState(VK_CAPITAL, iBits & 2); if (mask & 1) // gdy SHP { // Scroll Lock ma jakoś dziwnie... zmiana stanu na przeciwny - SetLedState(VK_SCROLL, true); // przyciśnięty - SetLedState(VK_SCROLL, false); // zwolniony + SetLedState(VK_CAPITAL, true); // przyciśnięty + SetLedState(VK_CAPITAL, false); // zwolniony ++iConfig; // licznik użycia Scroll Lock } break; @@ -398,7 +398,13 @@ void Console::BitsUpdate(int mask) bool Console::Pressed(int x) { // na razie tak - czyta się tylko klawiatura - return Global::bActive && (GetKeyState(x) < 0); + if (!Global::bActive) + return false; + + if (glfwGetKey(Global::window, x) == GLFW_TRUE) + return true; + else + return false; }; void Console::ValueSet(int x, double y) @@ -499,7 +505,7 @@ void Console::Update() else { // błąd komunikacji - zapauzować symulację? if (!(Global::iPause & 8)) // jeśli jeszcze nie oflagowana - Global::iTextMode = VK_F1; // pokazanie czasu/pauzy + Global::iTextMode = GLFW_KEY_F1; // pokazanie czasu/pauzy Global::iPause |= 8; // tak??? PoKeys55[0]->Connect(); // próba ponownego podłączenia } diff --git a/EU07.cpp b/EU07.cpp index 367afaa8..fc980675 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -19,12 +19,6 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "stdafx.h" -#include //_clear87() itp. - -#include "opengl/glew.h" -#include "opengl/wglew.h" -#include "opengl/ARB_Multisample.h" - #include "Globals.h" #include "Logs.h" #include "Console.h" @@ -32,542 +26,20 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "World.h" #include "Mover.h" -#pragma comment( lib, "glew32.lib" ) -#pragma comment( lib, "glu32.lib" ) -#pragma comment( lib, "opengl32.lib" ) -#pragma comment( lib, "dsound.lib" ) -#pragma comment( lib, "winmm.lib" ) -#pragma comment( lib, "setupapi.lib" ) -#pragma comment( lib, "python27.lib" ) +#pragma comment (lib, "glew32.lib") +#pragma comment (lib, "glu32.lib") +#pragma comment (lib, "opengl32.lib") +#pragma comment (lib, "dsound.lib") +#pragma comment (lib, "winmm.lib") +#pragma comment (lib, "setupapi.lib") +#pragma comment (lib, "python27.lib") #pragma comment (lib, "dbghelp.lib") +#pragma comment (lib, "glfw3.lib") //static -HDC hDC = NULL; // Private GDI Device Context -HGLRC hRC = NULL; // Permanent Rendering Context -HWND hWnd = NULL; // Holds Our Window Handle +#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") TWorld World; -// bool active=TRUE; //window active flag set to TRUE by default -bool fullscreen = TRUE; // fullscreen flag set to fullscreen mode by default -int WindowWidth = 800; -int WindowHeight = 600; -int Bpp = 32; - -LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); // Declaration For WndProc - -//#include "dbgForm.h" -//--------------------------------------------------------------------------- - -int InitGL(GLvoid) // All Setup For OpenGL Goes Here -{ -// _clear87(); -// _control87(MCW_EM, MCW_EM); - glewInit(); - // hunter-271211: przeniesione - // AllocConsole(); - // SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE),FOREGROUND_GREEN); - - // ShaXbee-121209: Wlaczenie obslugi tablic wierzcholkow - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_NORMAL_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów - return World.Init(hWnd, hDC); // true jeśli wszystko pójdzie dobrze -} -//--------------------------------------------------------------------------- - -GLvoid ReSizeGLScene(GLsizei width, GLsizei height) // resize and initialize the GL Window -{ - WindowWidth = width; - WindowHeight = height; - if (height == 0) // prevent a divide by zero by - height = 1; // making height equal one - glViewport(0, 0, width, height); // Reset The Current Viewport - glMatrixMode(GL_PROJECTION); // select the Projection Matrix - glLoadIdentity(); // reset the Projection Matrix - // calculate the aspect ratio of the window - gluPerspective(45.0f, (GLdouble)width / (GLdouble)height, 0.2f, 2500.0f); - glMatrixMode(GL_MODELVIEW); // select the Modelview Matrix - glLoadIdentity(); // reset the Modelview Matrix -} - -//--------------------------------------------------------------------------- -GLvoid KillGLWindow(GLvoid) // properly kill the window -{ - if (hRC) // Do We Have A Rendering Context? - { - if (!wglMakeCurrent(NULL, NULL)) // are we able to release the DC and RC contexts? - { - ErrorLog("Fail: window releasing"); - MessageBox(NULL, "Release of DC and RC failed.", "SHUTDOWN ERROR", - MB_OK | MB_ICONINFORMATION); - } - - if (!wglDeleteContext(hRC)) // are we able to delete the RC? - { - ErrorLog("Fail: rendering context releasing"); - MessageBox(NULL, "Release rendering context failed.", "SHUTDOWN ERROR", - MB_OK | MB_ICONINFORMATION); - } - hRC = NULL; // set RC to NULL - } - - if (hDC && !ReleaseDC(hWnd, hDC)) // are we able to release the DC? - { - ErrorLog("Fail: device context releasing"); - MessageBox(NULL, "Release device context failed.", "SHUTDOWN ERROR", - MB_OK | MB_ICONINFORMATION); - hDC = NULL; // set DC to NULL - } - - if (hWnd && !DestroyWindow(hWnd)) // are we able to destroy the window? - { - ErrorLog("Fail: window destroying"); - MessageBox(NULL, "Could not release hWnd.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION); - hWnd = NULL; // set hWnd to NULL - } - - if (fullscreen) // Are We In Fullscreen Mode? - { - ChangeDisplaySettings(NULL, 0); // if so switch back to the desktop - ShowCursor(TRUE); // show mouse pointer - } - // KillFont(); -} - -/* This code creates our OpenGL Window. Parameters are: * - * title - title to appear at the top of the window * - * width - width of the GL Window or fullscreen mode * - * height - height of the GL Window or fullscreen mode * - * bits - number of bits to use for color (8/16/24/32) * - * fullscreenflag - use fullscreen mode (TRUE) or windowed mode (FALSE) */ - -BOOL CreateGLWindow(char *title, int width, int height, int bits, bool fullscreenflag) -{ - GLuint PixelFormat; // holds the results after searching for a match - HINSTANCE hInstance; // holds the instance of the application - WNDCLASS wc; // windows class structure - DWORD dwExStyle; // window extended style - DWORD dwStyle; // window style - RECT WindowRect; // grabs rectangle upper left / lower right values - WindowRect.left = (long)0; // set left value to 0 - WindowRect.right = (long)width; // set right value to requested width - WindowRect.top = (long)0; // set top value to 0 - WindowRect.bottom = (long)height; // set bottom value to requested height - - fullscreen = fullscreenflag; // set the global fullscreen flag - - hInstance = GetModuleHandle(NULL); // grab an instance for our window - wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; // redraw on size, and own DC for window. - wc.lpfnWndProc = (WNDPROC)WndProc; // wndproc handles messages - wc.cbClsExtra = 0; // no extra window data - wc.cbWndExtra = 0; // no extra window data - wc.hInstance = hInstance; // set the instance - wc.hIcon = LoadIcon(NULL, IDI_WINLOGO); // load the default icon - wc.hCursor = LoadCursor(NULL, IDC_ARROW); // load the arrow pointer - wc.hbrBackground = NULL; // no background required for GL - wc.lpszMenuName = NULL; // we don't want a menu - wc.lpszClassName = "EU07"; // nazwa okna do komunikacji zdalnej - // // Set The Class Name - - if (!arbMultisampleSupported) // tylko dla pierwszego okna - if (!RegisterClass(&wc)) // Attempt To Register The Window Class - { - ErrorLog("Fail: window class registeration"); - MessageBox(NULL, "Failed to register the window class.", "ERROR", - MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - if (fullscreen) // Attempt Fullscreen Mode? - { - DEVMODE dmScreenSettings; // device mode - memset(&dmScreenSettings, 0, sizeof(dmScreenSettings)); // makes sure memory's cleared - dmScreenSettings.dmSize = sizeof(dmScreenSettings); // size of the devmode structure - - // tolaris-240403: poprawka na odswiezanie monitora - // locate primary monitor... - if (Global::bAdjustScreenFreq) - { - POINT point; - point.x = 0; - point.y = 0; - MONITORINFOEX monitorinfo; - monitorinfo.cbSize = sizeof(MONITORINFOEX); - ::GetMonitorInfo(::MonitorFromPoint(point, MONITOR_DEFAULTTOPRIMARY), &monitorinfo); - // ..and query for highest supported refresh rate - unsigned int refreshrate = 0; - int i = 0; - while (::EnumDisplaySettings(monitorinfo.szDevice, i, &dmScreenSettings)) - { - if (i > 0) - if (dmScreenSettings.dmPelsWidth == (unsigned int)width) - if (dmScreenSettings.dmPelsHeight == (unsigned int)height) - if (dmScreenSettings.dmBitsPerPel == (unsigned int)bits) - if (dmScreenSettings.dmDisplayFrequency > refreshrate) - refreshrate = dmScreenSettings.dmDisplayFrequency; - ++i; - } - // fill refresh rate info for screen mode change - dmScreenSettings.dmDisplayFrequency = refreshrate; - dmScreenSettings.dmFields = DM_DISPLAYFREQUENCY; - } - dmScreenSettings.dmPelsWidth = width; // selected screen width - dmScreenSettings.dmPelsHeight = height; // selected screen height - dmScreenSettings.dmBitsPerPel = bits; // selected bits per pixel - dmScreenSettings.dmFields = - dmScreenSettings.dmFields | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - - // Try to set selected mode and get results. NOTE: CDS_FULLSCREEN gets rid of start bar. - if (ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) - { - // If the mode fails, offer two options. Quit or use windowed mode. - ErrorLog("Fail: full screen"); - if (MessageBox(NULL, "The requested fullscreen mode is not supported by\nyour video " - "card. Use windowed mode instead?", - "EU07", MB_YESNO | MB_ICONEXCLAMATION) == IDYES) - { - fullscreen = FALSE; // Windowed Mode Selected. Fullscreen = FALSE - } - else - { - // Pop Up A Message Box Letting User Know The Program Is Closing. - Error("Program will now close."); - return FALSE; // Return FALSE - } - } - } - - if (fullscreen) // Are We Still In Fullscreen Mode? - { - dwExStyle = WS_EX_APPWINDOW; // Window Extended Style - dwStyle = WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; // Windows Style - ShowCursor(FALSE); // Hide Mouse Pointer - } - else - { - dwExStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE; // Window Extended Style - dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; // Windows Style - } - - AdjustWindowRectEx(&WindowRect, dwStyle, FALSE, - dwExStyle); // Adjust Window To True Requested Size - - // Create The Window - if (NULL == - (hWnd = CreateWindowEx(dwExStyle, // Extended Style For The Window - "EU07", // Class Name - title, // Window Title - dwStyle | // Defined Window Style - WS_CLIPSIBLINGS | // Required Window Style - WS_CLIPCHILDREN, // Required Window Style - 0, - 0, // Window Position - WindowRect.right - WindowRect.left, // Calculate Window Width - WindowRect.bottom - WindowRect.top, // Calculate Window Height - NULL, // No Parent Window - NULL, // No Menu - hInstance, // Instance - NULL))) // Dont Pass Anything To WM_CREATE - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: window creation"); - MessageBox(NULL, "Window creation error.", "ERROR", MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - static PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be - { - sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor - 1, // Version Number - PFD_DRAW_TO_WINDOW | // Format Must Support Window - PFD_SUPPORT_OPENGL | // Format Must Support OpenGL - PFD_DOUBLEBUFFER, // Must Support Double Buffering - PFD_TYPE_RGBA, // Request An RGBA Format - bits, // Select Our Color Depth - 0, - 0, 0, 0, 0, 0, // Color Bits Ignored - 0, // No Alpha Buffer - 0, // Shift Bit Ignored - 0, // No Accumulation Buffer - 0, 0, 0, 0, // Accumulation Bits Ignored - 24, // 32Bit Z-Buffer (Depth Buffer) - 0, // No Stencil Buffer - 0, // No Auxiliary Buffer - PFD_MAIN_PLANE, // Main Drawing Layer - 0, // Reserved - 0, 0, 0 // Layer Masks Ignored - }; - - if (NULL == (hDC = GetDC(hWnd))) // Did We Get A Device Context? - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: device context"); - MessageBox(NULL, "Can't create a GL device context.", "ERROR", MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - /* - Our first pass, Multisampling hasn't been created yet, so we create a window normally - If it is supported, then we're on our second pass - that means we want to use our pixel format for sampling - so set PixelFormat to arbMultiSampleformat instead - */ - if (!arbMultisampleSupported) - { - if (NULL == (PixelFormat = - ChoosePixelFormat(hDC, &pfd))) // Did Windows Find A Matching Pixel Format? - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: pixelformat"); - MessageBox(NULL, "Can't find a suitable pixelformat.", "ERROR", - MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - } - else - PixelFormat = arbMultisampleFormat; - - if (!SetPixelFormat(hDC, PixelFormat, &pfd)) // Are We Able To Set The Pixel Format? - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: pixelformat"); - MessageBox(NULL, "Can't set the pixelformat.", "ERROR", MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - if (NULL == (hRC = wglCreateContext(hDC))) // Are We Able To Get A Rendering Context? - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: OpenGL rendering context creation"); - MessageBox(NULL, "Can't create a GL rendering context.", "ERROR", - MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - if (!wglMakeCurrent(hDC, hRC)) // Try To Activate The Rendering Context - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: OpenGL rendering context activation"); - MessageBox(NULL, "Can't activate the GL rendering context.", "ERROR", - MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - /* - Now that our window is created, we want to queary what samples are available - we call our InitMultiSample window - if we return a valid context, we want to destroy our current window - and create a new one using the multisample interface. - */ - if (Global::iMultisampling) - if (!arbMultisampleSupported) - if ((Global::iMultisampling = - InitMultisample(hInstance, hWnd, pfd, 1 << Global::iMultisampling)) != 0) - { - // WriteConsoleOnly("Opening second window for multisampling of - // "+AnsiString(Global::iMultisampling)+" samples."); - KillGLWindow(); // reset the display - return CreateGLWindow(title, width, height, bits, fullscreenflag); // rekurencja - } - - ShowWindow(hWnd, SW_SHOW); // show the window - SetForegroundWindow(hWnd); // slightly higher priority - SetFocus(hWnd); // sets keyboard focus to the window - ReSizeGLScene(width, height); // set up our perspective GL screen - - if (!InitGL()) // initialize our newly created GL Window - { - KillGLWindow(); // reset the display - ErrorLog("Fail: OpenGL initialization"); - MessageBox(NULL, "Initialization Failed.", "ERROR", MB_OK | MB_ICONEXCLAMATION); - return FALSE; // return FALSE - } - return TRUE; // success -} - -static int mx = 0, my = 0; -static POINT mouse; - -static int test = 0; -/**/ -// ************ Globals ************ -// -#define MYDISPLAY 1 - -PCOPYDATASTRUCT pDane; - -LRESULT CALLBACK WndProc(HWND hWnd, // handle for this window - UINT uMsg, // message for this window - WPARAM wParam, // additional message information - LPARAM lParam) // additional message information -{ - RECT rect; - switch (uMsg) // check for windows messages - { - case WM_PASTE: //[Ctrl]+[V] potrzebujemy do innych celów - return 0; - case WM_COPYDATA: // obsługa danych przesłanych przez program sterujący - pDane = (PCOPYDATASTRUCT)lParam; - if (pDane->dwData == 'EU07') // sygnatura danych - World.OnCommandGet((DaneRozkaz *)(pDane->lpData)); - break; - case WM_ACTIVATE: // watch for window activate message - // case WM_ACTIVATEAPP: - { // Ra: uzależnienie aktywności od bycia na wierzchu - Global::bActive = (LOWORD(wParam) != WA_INACTIVE); - if (Global::bInactivePause) // jeśli ma być pauzowanie okna w tle - if (Global::bActive) - Global::iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie - else - Global::iPause |= 4; // włączenie pauzy, gdy nieaktywy - if (Global::bActive) - SetCursorPos(mx, my); - ShowCursor(!Global::bActive); - /* - if (!HIWORD(wParam)) //check minimization state - active=TRUE; //program is active - else - active=FALSE; //program is no longer active - */ - return 0; // return to the message loop - } - case WM_SYSCOMMAND: // intercept system commands - { - switch (wParam) // check system calls - { - case 61696: // F10 - World.OnKeyDown(VK_F10); - return 0; - case SC_SCREENSAVE: // screensaver trying to start? - case SC_MONITORPOWER: // monitor trying to enter powersave? - return 0; // prevent from happening - } - break; // exit - } - case WM_CLOSE: // did we receive a close message? - { - PostQuitMessage(0); // send a quit message [Alt]+[F4] - return 0; // jump back - } - case WM_MOUSEMOVE: - { - // mx= 100;//Global::iWindowWidth/2; - // my= 100;//Global::iWindowHeight/2; - // SetCursorPos(Global::iWindowWidth/2,Global::iWindowHeight/2); - // m_x= LOWORD(lParam); - // m_y= HIWORD(lParam); - GetCursorPos(&mouse); - if (Global::bActive && ((mouse.x != mx) || (mouse.y != my))) - { - World.OnMouseMove(double(mouse.x - mx) * 0.005, double(mouse.y - my) * 0.01); - SetCursorPos(mx, my); - } - return 0; // jump back - } - case WM_KEYUP: - if (Global::bActive) - { - World.OnKeyUp(wParam); - return 0; - } - case WM_KEYDOWN: - if (Global::bActive) - { - if (wParam != 17) // bo naciśnięcia [Ctrl] nie ma po co przekazywać - if (wParam != 145) //[Scroll Lock] też nie - World.OnKeyDown(wParam); - switch (wParam) - { - case VK_ESCAPE: //[Esc] pauzuje tylko bez Debugmode - if (DebugModeFlag) - break; - case 19: //[Pause] - if (Global::iPause & 1) // jeśli pauza startowa - Global::iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować - else if (!(Global::iMultiplayer & 2)) // w multiplayerze pauza nie ma sensu - if (!Console::Pressed(VK_CONTROL)) // z [Ctrl] to radiostop jest - // Ra: poniższe nie ma sensu, bo brak komunikacji natychmiast zapauzuje - // ponownie - // if (Global::iPause&8) //jeśli pauza związana z brakiem komunikacji z - // PoKeys - // Global::iPause&=~10; //odpauzowanie pauzy PoKeys (chyba nic nie da) i - // ewentualnie klawiszowej również - // else - Global::iPause ^= 2; // zmiana stanu zapauzowania - if (Global::iPause) // jak pauza - Global::iTextMode = VK_F1; // to wyświetlić zegar i informację - break; - case VK_F7: - if (DebugModeFlag) - { // siatki wyświetlane tyko w trybie testowym - Global::bWireFrame = !Global::bWireFrame; - ++Global::iReCompile; // odświeżyć siatki - // Ra: jeszcze usunąć siatki ze skompilowanych obiektów! - } - break; - } - } - return 0; // jump back - case WM_CHAR: - { - /* - switch ((TCHAR) wParam) - { - // case 'q': - // done= true; - // KillGLWindow(); - // PostQuitMessage(0); - // DestroyWindow( hWnd ); - // break; - }; - */ - return 0; - } - case WM_SIZE: // resize the OpenGL window - { - ReSizeGLScene(LOWORD(lParam), HIWORD(lParam)); // LoWord=Width, HiWord=Height - if (GetWindowRect(hWnd, &rect)) - { // Ra: zmiana rozmiaru okna bez przesuwania myszy - // mx=WindowWidth/2+rect.left; // horizontal position - // my=WindowHeight/2+rect.top; // vertical position - // SetCursorPos(mx,my); - } - return 0; // jump back - } - case WM_MOVE: // przesuwanie okna? - { - mx = WindowWidth / 2 + LOWORD(lParam); // horizontal position - my = WindowHeight / 2 + HIWORD(lParam); // vertical position - // SetCursorPos(mx,my); - break; - } - case WM_PAINT: - { // odrysowanie okna - break; - } - // case WM_ERASEBKGND: //Process this message to keep Windows from erasing background. - case MM_JOY1BUTTONDOWN: - { - // WriteLog("Joystick button "+AnsiString(wParam)); - break; - } - case WM_CREATE: - /* Capture the joystick. If this fails, beep and display - * error, then quit. - */ - if (joySetCapture(hWnd, JOYSTICKID1, 0, FALSE)) - { - // MessageBeep(MB_ICONEXCLAMATION); - // MessageBox(hWnd,"Couldn't capture the joystick",NULL,MB_OK|MB_ICONEXCLAMATION); - // return -1; - } - break; - } - // pass all unhandled messages to DefWindowProc - return DefWindowProc(hWnd, uMsg, wParam, lParam); -}; - #ifdef _WINDOWS void make_minidump( ::EXCEPTION_POINTERS* e ) { @@ -617,27 +89,80 @@ LONG CALLBACK unhandled_handler( ::EXCEPTION_POINTERS* e ) { } #endif -int WINAPI WinMain(HINSTANCE hInstance, // instance - HINSTANCE hPrevInstance, // previous instance - LPSTR lpCmdLine, // command line parameters - int nCmdShow) // window show state +void window_resize_callback(GLFWwindow *window, int w, int h) +{ + glViewport(0, 0, w, h); // Reset The Current Viewport + 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) +{ + if (Global::bActive) + World.OnMouseMove(x * 0.005, y * 0.01); + glfwSetCursorPos(window, 0.0, 0.0); +} + +void key_callback(GLFWwindow *window, int key, int scancode, int action, int mods) +{ + //m7todo: bActive teraz pewnie nie potrzebne + if (!Global::bActive) + return; + + Global::shiftState = (mods & GLFW_MOD_SHIFT) ? true : false; + Global::ctrlState = (mods & GLFW_MOD_CONTROL) ? true : false; + + if (action == GLFW_PRESS) + { + World.OnKeyDown(key); + + switch (key) + { + case GLFW_KEY_PAUSE: + if (Global::iPause & 1) + Global::iPause &= ~1; + else if (!(Global::iMultiplayer & 2) && + (mods & GLFW_MOD_CONTROL)) + Global::iPause ^= 2; + if (Global::iPause) + Global::iTextMode = GLFW_KEY_F1; + break; + + case GLFW_KEY_F7: + Global::bWireFrame = !Global::bWireFrame; + ++Global::iReCompile; + break; + } + } + else if (action == GLFW_RELEASE) + { + World.OnKeyUp(key); + } +} + +void focus_callback(GLFWwindow *window, int focus) +{ + Global::bActive = (focus == GLFW_TRUE ? 1 : 0); + if (Global::bInactivePause) // jeśli ma być pauzowanie okna w tle + if (Global::bActive) + Global::iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie + else + Global::iPause |= 4; // włączenie pauzy, gdy nieaktywy +} + +int main(int argc, char argv[]) { -#if defined(_MSC_VER) && defined (_DEBUG) - // memory leaks - _CrtSetDbgFlag( _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ) | _CRTDBG_LEAK_CHECK_DF ); - // floating point operation errors - auto state = _clearfp(); - state = _control87( 0, 0 ); - // this will turn on FPE for #IND and zerodiv - state = _control87( state & ~( _EM_ZERODIVIDE | _EM_INVALID ), _MCW_EM ); -#endif #ifdef _WINDOWS - ::SetUnhandledExceptionFilter( unhandled_handler ); + ::SetUnhandledExceptionFilter(unhandled_handler); #endif - MSG msg; // windows message structure - BOOL done = FALSE; // bool variable to exit loop - fullscreen = true; + if (!glfwInit()) + return -1; + DeleteFile("errors.txt"); // usunięcie starego Global::LoadIniFile("eu07.ini"); // teraz dopiero można przejrzeć plik z ustawieniami Global::InitKeys("keys.ini"); // wczytanie mapowania klawiszy - jest na stałe @@ -648,31 +173,33 @@ int WINAPI WinMain(HINSTANCE hInstance, // instance AllocConsole(); SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN); } - std::string commandline( lpCmdLine ); // parametry uruchomienia - if( false == commandline.empty() ) - { // analizowanie parametrďż˝w - cParser parser( commandline ); + + std::string commandline(argv); + if (!commandline.empty()) + { + cParser parser(commandline); std::string token; - do { + do + { parser.getTokens(); token.clear(); parser >> token; - if( token == "-s" ) + if (token == "-s") { // nazwa scenerii parser.getTokens(); parser >> Global::SceneryFile; } - else if( token == "-v") + else if (token == "-v") { // nazwa wybranego pojazdu parser.getTokens(); parser >> Global::asHumanCtrlVehicle; } - else if( token == "-modifytga" ) + else if (token == "-modifytga") { // wykonanie modyfikacji wszystkich plików TGA Global::iModifyTGA = -1; // specjalny tryb wykonania totalnej modyfikacji } - else if( token == "-e3d" ) + else if (token == "-e3d") { // wygenerowanie wszystkich plików E3D if (Global::iConvertModels > 0) Global::iConvertModels = -Global::iConvertModels; // specjalny tryb @@ -684,34 +211,40 @@ int WINAPI WinMain(HINSTANCE hInstance, // instance "Program usage: EU07 [-s sceneryfilepath] [-v vehiclename] [-modifytga] [-e3d]", !Global::iWriteLogEnabled); } - while( false == token.empty() ); + while (!token.empty()); } - /* MC: usunalem tymczasowo bo sie gryzlo z nowym parserem - 8.6.2003 - AnsiString csp=AnsiString(Global::szSceneryFile); - csp=csp.Delete(csp.Pos(AnsiString(strrchr(Global::szSceneryFile,'/')))+1,csp.Length()); - Global::asCurrentSceneryPath=csp; - */ - fullscreen = Global::bFullScreen; - WindowWidth = Global::iWindowWidth; - WindowHeight = Global::iWindowHeight; - Bpp = Global::iBpp; - if (Bpp != 32) - Bpp = 16; - // create our OpenGL window - if (!CreateGLWindow(const_cast(Global::asHumanCtrlVehicle.c_str()), WindowWidth, WindowHeight, Bpp, - fullscreen)) - return 0; // quit if window was not created - SetForegroundWindow(hWnd); - // McZapkie: proba przeplukania klawiatury + bool fullscreen = Global::bFullScreen; + int width = Global::iWindowWidth; + int height = Global::iWindowHeight; + + GLFWwindow *window = glfwCreateWindow(width, height, "EU07++", nullptr, nullptr); + if (!window) + return -1; + glfwMakeContextCurrent(window); + glfwSwapInterval(1); //vsync + glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); //capture cursor + glfwSetCursorPos(window, 0.0, 0.0); + glfwSetFramebufferSizeCallback(window, window_resize_callback); + glfwSetCursorPosCallback(window, cursor_pos_callback); + glfwSetKeyCallback(window, key_callback); + glfwSetWindowFocusCallback(window, focus_callback); + glfwGetFramebufferSize(window, &width, &height); + window_resize_callback(window, width, height); + + if (glewInit() != GLEW_OK) + return -1; + + glEnableClientState(GL_VERTEX_ARRAY); + glEnableClientState(GL_NORMAL_ARRAY); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + + Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów + if (!World.Init(window)) + return -1; + Console *pConsole = new Console(); // Ra: nie wiem, czy ma to sens, ale jakoś zainicjowac trzeba - while (Console::Pressed(VK_F10)) - Error("Keyboard buffer problem - press F10"); // na Windows 98 lubi się to pojawiać - int iOldSpeed, iOldDelay; - SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &iOldSpeed, 0); - SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &iOldDelay, 0); - SystemParametersInfo(SPI_SETKEYBOARDSPEED, 20, NULL, 0); - // SystemParametersInfo(SPI_SETKEYBOARDDELAY,10,NULL,0); + if (!joyGetNumDevs()) WriteLog("No joystick"); if (Global::iModifyTGA < 0) @@ -727,43 +260,20 @@ int WINAPI WinMain(HINSTANCE hInstance, // instance World.CreateE3D("models\\"); // rekurencyjne przeglądanie katalogów World.CreateE3D("dynamic\\", true); } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć - // else - //{//główna pętla programu + Console::On(); // włączenie konsoli - while (!done) // loop that runs while done=FALSE + while (!glfwWindowShouldClose(window) && World.Update()) { - if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) // is there a message waiting? - { - if (msg.message == WM_QUIT) // have we received a quit message? - done = TRUE; // if so - else // if not, deal with window messages - { - // if (msg.message==WM_CHAR) - // World.OnKeyDown(msg.wParam); - TranslateMessage(&msg); // translate the message - DispatchMessage(&msg); // dispatch the message - } - } - else // if there are no messages - { - // draw the scene, watch for quit messages - // DrawGLScene() - // if (!pause) - // if (Global::bInactivePause?Global::bActive:true) //tak nie, bo spada z góry - if (World.Update()) // Was There A Quit Received? - SwapBuffers(hDC); // Swap Buffers (Double Buffering) - else - done = true; //[F10] or DrawGLScene signalled a quit - } + glfwSwapBuffers(window); + glfwPollEvents(); } Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) } - SystemParametersInfo(SPI_SETKEYBOARDSPEED, iOldSpeed, NULL, 0); - SystemParametersInfo(SPI_SETKEYBOARDDELAY, iOldDelay, NULL, 0); - delete pConsole; // deaktywania sterownika + + delete pConsole; TPythonInterpreter::killInstance(); - // shutdown - KillGLWindow(); // kill the window - return (msg.wParam); // exit the program + glfwDestroyWindow(window); + glfwTerminate(); + return 0; } diff --git a/Globals.cpp b/Globals.cpp index 397f0a6d..605b0452 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -48,7 +48,10 @@ bool Global::bOpenGL_1_5 = false; // czy są dostępne funkcje OpenGL 1.5 */ double Global::fLuminance = 1.0; // jasność światła do automatycznego zapalania int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki -HWND Global::hWnd = NULL; // uchwyt okna +//HWND Global::hWnd = NULL; // uchwyt okna +GLFWwindow *Global::window; +bool Global::shiftState; +bool Global::ctrlState; int Global::iCameraLast = -1; std::string Global::asRelease = "16.0.1172.482"; std::string Global::asVersion = @@ -909,7 +912,7 @@ void Global::ConfigParse(cParser &Parser) fFpsMax = fFpsAverage + fFpsDeviation; // górna granica FPS, przy której promień scenerii będzie zwiększany if (iPause) - iTextMode = VK_F1; // jak pauza, to pokazać zegar + iTextMode = GLFW_KEY_F1; // jak pauza, to pokazać zegar /* this won't execute anymore with the old parser removed // TBD: remove, or launch depending on passed flag? if (qp) @@ -934,128 +937,90 @@ void Global::ConfigParse(cParser &Parser) void Global::InitKeys(std::string asFileName) { - // if (FileExists(asFileName)) - // { - // Error("Chwilowo plik keys.ini nie jest obsługiwany. Ładuję standardowe - // ustawienia.\nKeys.ini file is temporarily not functional, loading default keymap..."); - /* TQueryParserComp *Parser; - Parser=new TQueryParserComp(NULL); - Parser->LoadStringToParse(asFileName); + Keys[k_IncMainCtrl] = GLFW_KEY_KP_ADD; + Keys[k_IncMainCtrlFAST] = GLFW_KEY_KP_ADD; + Keys[k_DecMainCtrl] = GLFW_KEY_KP_SUBTRACT; + Keys[k_DecMainCtrlFAST] = GLFW_KEY_KP_SUBTRACT; + Keys[k_IncScndCtrl] = GLFW_KEY_KP_DIVIDE; + Keys[k_IncScndCtrlFAST] = GLFW_KEY_KP_DIVIDE; + Keys[k_DecScndCtrl] = GLFW_KEY_KP_MULTIPLY; + Keys[k_DecScndCtrlFAST] = GLFW_KEY_KP_MULTIPLY; - for (int keycount=0; keycountGetNextSymbol().ToInt(); - } + Keys[k_IncLocalBrakeLevel] = GLFW_KEY_KP_1; + Keys[k_DecLocalBrakeLevel] = GLFW_KEY_KP_7; + Keys[k_IncBrakeLevel] = GLFW_KEY_KP_3; + Keys[k_DecBrakeLevel] = GLFW_KEY_KP_9; + Keys[k_Releaser] = GLFW_KEY_KP_6; + Keys[k_EmergencyBrake] = GLFW_KEY_KP_0; + Keys[k_Brake3] = GLFW_KEY_KP_8; + Keys[k_Brake2] = GLFW_KEY_KP_5; + Keys[k_Brake1] = GLFW_KEY_KP_2; + Keys[k_Brake0] = GLFW_KEY_KP_4; + Keys[k_WaveBrake] = GLFW_KEY_KP_DECIMAL; - delete Parser; - */ - // } - // else - { - Keys[k_IncMainCtrl] = VK_ADD; - Keys[k_IncMainCtrlFAST] = VK_ADD; - Keys[k_DecMainCtrl] = VK_SUBTRACT; - Keys[k_DecMainCtrlFAST] = VK_SUBTRACT; - Keys[k_IncScndCtrl] = VK_DIVIDE; - Keys[k_IncScndCtrlFAST] = VK_DIVIDE; - Keys[k_DecScndCtrl] = VK_MULTIPLY; - Keys[k_DecScndCtrlFAST] = VK_MULTIPLY; - ///*NORMALNE - Keys[k_IncLocalBrakeLevel] = VK_NUMPAD1; // VK_NUMPAD7; - // Keys[k_IncLocalBrakeLevelFAST]=VK_END; //VK_HOME; - Keys[k_DecLocalBrakeLevel] = VK_NUMPAD7; // VK_NUMPAD1; - // Keys[k_DecLocalBrakeLevelFAST]=VK_HOME; //VK_END; - Keys[k_IncBrakeLevel] = VK_NUMPAD3; // VK_NUMPAD9; - Keys[k_DecBrakeLevel] = VK_NUMPAD9; // VK_NUMPAD3; - Keys[k_Releaser] = VK_NUMPAD6; - Keys[k_EmergencyBrake] = VK_NUMPAD0; - Keys[k_Brake3] = VK_NUMPAD8; - Keys[k_Brake2] = VK_NUMPAD5; - Keys[k_Brake1] = VK_NUMPAD2; - Keys[k_Brake0] = VK_NUMPAD4; - Keys[k_WaveBrake] = VK_DECIMAL; - //*/ - /*MOJE - Keys[k_IncLocalBrakeLevel]=VK_NUMPAD3; //VK_NUMPAD7; - Keys[k_IncLocalBrakeLevelFAST]=VK_NUMPAD3; //VK_HOME; - Keys[k_DecLocalBrakeLevel]=VK_DECIMAL; //VK_NUMPAD1; - Keys[k_DecLocalBrakeLevelFAST]=VK_DECIMAL; //VK_END; - Keys[k_IncBrakeLevel]=VK_NUMPAD6; //VK_NUMPAD9; - Keys[k_DecBrakeLevel]=VK_NUMPAD9; //VK_NUMPAD3; - Keys[k_Releaser]=VK_NUMPAD5; - Keys[k_EmergencyBrake]=VK_NUMPAD0; - Keys[k_Brake3]=VK_NUMPAD2; - Keys[k_Brake2]=VK_NUMPAD1; - Keys[k_Brake1]=VK_NUMPAD4; - Keys[k_Brake0]=VK_NUMPAD7; - Keys[k_WaveBrake]=VK_NUMPAD8; - */ - Keys[k_AntiSlipping] = VK_RETURN; - Keys[k_Sand] = VkKeyScan('s'); - Keys[k_Main] = VkKeyScan('m'); - Keys[k_Active] = VkKeyScan('w'); - Keys[k_Battery] = VkKeyScan('j'); - Keys[k_DirectionForward] = VkKeyScan('d'); - Keys[k_DirectionBackward] = VkKeyScan('r'); - Keys[k_Fuse] = VkKeyScan('n'); - Keys[k_Compressor] = VkKeyScan('c'); - Keys[k_Converter] = VkKeyScan('x'); - Keys[k_MaxCurrent] = VkKeyScan('f'); - Keys[k_CurrentAutoRelay] = VkKeyScan('g'); - Keys[k_BrakeProfile] = VkKeyScan('b'); - Keys[k_CurrentNext] = VkKeyScan('z'); + Keys[k_AntiSlipping] = GLFW_KEY_KP_ENTER; + Keys[k_Sand] = 'S'; + Keys[k_Main] = 'M'; + Keys[k_Active] = 'W'; + Keys[k_Battery] = 'J'; + Keys[k_DirectionForward] = 'D'; + Keys[k_DirectionBackward] = 'R'; + Keys[k_Fuse] = 'N'; + Keys[k_Compressor] = 'C'; + Keys[k_Converter] = 'X'; + Keys[k_MaxCurrent] = 'F'; + Keys[k_CurrentAutoRelay] = 'G'; + Keys[k_BrakeProfile] = 'B'; + Keys[k_CurrentNext] = 'Z'; - Keys[k_Czuwak] = VkKeyScan(' '); - Keys[k_Horn] = VkKeyScan('a'); - Keys[k_Horn2] = VkKeyScan('a'); + Keys[k_Czuwak] = ' '; + Keys[k_Horn] = 'A'; + Keys[k_Horn2] = 'A'; - Keys[k_FailedEngineCutOff] = VkKeyScan('e'); + Keys[k_FailedEngineCutOff] = 'E'; - Keys[k_MechUp] = VK_PRIOR; - Keys[k_MechDown] = VK_NEXT; - Keys[k_MechLeft] = VK_LEFT; - Keys[k_MechRight] = VK_RIGHT; - Keys[k_MechForward] = VK_UP; - Keys[k_MechBackward] = VK_DOWN; + Keys[k_MechUp] = GLFW_KEY_PAGE_UP; + Keys[k_MechDown] = GLFW_KEY_PAGE_DOWN; + Keys[k_MechLeft] = GLFW_KEY_LEFT; + Keys[k_MechRight] = GLFW_KEY_RIGHT; + Keys[k_MechForward] = GLFW_KEY_UP; + Keys[k_MechBackward] = GLFW_KEY_DOWN; - Keys[k_CabForward] = VK_HOME; - Keys[k_CabBackward] = VK_END; + Keys[k_CabForward] = GLFW_KEY_HOME; + Keys[k_CabBackward] = GLFW_KEY_END; - Keys[k_Couple] = VK_INSERT; - Keys[k_DeCouple] = VK_DELETE; + Keys[k_Couple] = GLFW_KEY_INSERT; + Keys[k_DeCouple] = GLFW_KEY_DELETE; - Keys[k_ProgramQuit] = VK_F10; - // Keys[k_ProgramPause]=VK_F3; - Keys[k_ProgramHelp] = VK_F1; - // Keys[k_FreeFlyMode]=VK_F4; - Keys[k_WalkMode] = VK_F5; + Keys[k_ProgramQuit] = GLFW_KEY_F10; + Keys[k_ProgramHelp] = GLFW_KEY_F1; + Keys[k_WalkMode] = GLFW_KEY_F5; - Keys[k_OpenLeft] = VkKeyScan(','); - Keys[k_OpenRight] = VkKeyScan('.'); - Keys[k_CloseLeft] = VkKeyScan(','); - Keys[k_CloseRight] = VkKeyScan('.'); - Keys[k_DepartureSignal] = VkKeyScan('/'); + Keys[k_OpenLeft] = ','; + Keys[k_OpenRight] = '.'; + Keys[k_CloseLeft] = ','; + Keys[k_CloseRight] = '.'; + Keys[k_DepartureSignal] = '/'; - // Winger 160204 - obsluga pantografow - Keys[k_PantFrontUp] = VkKeyScan('p'); // Ra: zamieniony przedni z tylnym - Keys[k_PantFrontDown] = VkKeyScan('p'); - Keys[k_PantRearUp] = VkKeyScan('o'); - Keys[k_PantRearDown] = VkKeyScan('o'); - // Winger 020304 - ogrzewanie - Keys[k_Heating] = VkKeyScan('h'); - Keys[k_LeftSign] = VkKeyScan('y'); - Keys[k_UpperSign] = VkKeyScan('u'); - Keys[k_RightSign] = VkKeyScan('i'); - Keys[k_EndSign] = VkKeyScan('t'); + // Winger 160204 - obsluga pantografow + Keys[k_PantFrontUp] = 'P'; // Ra: zamieniony przedni z tylnym + Keys[k_PantFrontDown] = 'P'; + Keys[k_PantRearUp] = 'O'; + Keys[k_PantRearDown] = 'O'; + // Winger 020304 - ogrzewanie + Keys[k_Heating] = 'H'; + Keys[k_LeftSign] = 'Y'; + Keys[k_UpperSign] = 'U'; + Keys[k_RightSign] = 'I'; + Keys[k_EndSign] = 'T'; - Keys[k_SmallCompressor] = VkKeyScan('v'); - Keys[k_StLinOff] = VkKeyScan('l'); - // ABu 090305 - przyciski uniwersalne, do roznych bajerow :) - Keys[k_Univ1] = VkKeyScan('['); - Keys[k_Univ2] = VkKeyScan(']'); - Keys[k_Univ3] = VkKeyScan(';'); - Keys[k_Univ4] = VkKeyScan('\''); - } + Keys[k_SmallCompressor] = 'V'; + Keys[k_StLinOff] = 'L'; + // ABu 090305 - przyciski uniwersalne, do roznych bajerow :) + Keys[k_Univ1] = '['; + Keys[k_Univ2] = ']'; + Keys[k_Univ3] = ';'; + Keys[k_Univ4] = '\''; } /* vector3 Global::GetCameraPosition() diff --git a/Globals.h b/Globals.h index 38f18281..e2124e10 100644 --- a/Globals.h +++ b/Globals.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include #include +#include #include "opengl/glew.h" #include "dumb3d.h" @@ -241,7 +242,9 @@ class Global */ static double fLuminance; // jasność światła do automatycznego zapalania static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji - static HWND hWnd; // uchwyt okna + static GLFWwindow *window; + static bool shiftState; //m7todo: brzydko + static bool ctrlState; static int iCameraLast; static std::string asRelease; // numer static std::string asVersion; // z opisem diff --git a/Ground.cpp b/Ground.cpp index f3c0af7f..c544204c 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -17,7 +17,6 @@ http://mozilla.org/MPL/2.0/. #include "Ground.h" #include "opengl/glew.h" -#include "opengl/glut.h" #include "Globals.h" #include "Logs.h" @@ -312,7 +311,7 @@ void TGroundNode::RenderVBO() if (EvLaunch->Render()) if ((EvLaunch->dRadius < 0) || (mgn < EvLaunch->dRadius)) { - if (Console::Pressed(VK_SHIFT) && EvLaunch->Event2 != NULL) + if (Global::shiftState && EvLaunch->Event2 != NULL) Global::AddToQuery(EvLaunch->Event2, NULL); else if (EvLaunch->Event1 != NULL) Global::AddToQuery(EvLaunch->Event1, NULL); @@ -537,7 +536,7 @@ void TGroundNode::RenderHidden() if ((EvLaunch->dRadius < 0) || (mgn < EvLaunch->dRadius)) { WriteLog("Eventlauncher " + asName); - if (Console::Pressed(VK_SHIFT) && (EvLaunch->Event2)) + if (Global::shiftState && (EvLaunch->Event2)) Global::AddToQuery(EvLaunch->Event2, NULL); else if (EvLaunch->Event1) Global::AddToQuery(EvLaunch->Event1, NULL); @@ -2481,7 +2480,7 @@ void TGround::FirstInit() WriteLog("FirstInit is done"); }; -bool TGround::Init(std::string asFile, HDC hDC) +bool TGround::Init(std::string asFile) { // główne wczytywanie scenerii if (ToLower(asFile).substr(0, 7) == "scenery") asFile = asFile.erase(0, 8); // Ra: usunięcie niepotrzebnych znaków - zgodność wstecz z 2003 @@ -4974,7 +4973,8 @@ void TGround::WyslijEvent(const std::string &e, const std::string &d) cData.dwData = 'EU07'; // sygnatura cData.cbData = 12 + i + j; // 8+dwa liczniki i dwa zera kończące cData.lpData = &r; - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + //m7todo + //Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); CommLog( Now() + " " + std::to_string(r.iComm) + " " + e + " sent" ); }; //--------------------------------------------------------------------------- @@ -4991,7 +4991,8 @@ void TGround::WyslijUszkodzenia(const std::string &t, char fl) cData.dwData = 'EU07'; // sygnatura cData.cbData = 11 + i; // 8+licznik i zero kończące cData.lpData = &r; - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + //m7todo + //Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); }; //--------------------------------------------------------------------------- @@ -5007,7 +5008,8 @@ void TGround::WyslijString(const std::string &t, int n) cData.dwData = 'EU07'; // sygnatura cData.cbData = 10 + i; // 8+licznik i zero kończące cData.lpData = &r; - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + //m7todo + //Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); }; //--------------------------------------------------------------------------- @@ -5086,7 +5088,8 @@ void TGround::WyslijNamiary(TGroundNode *t) cData.cbData = 10 + i + j; // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + //m7todo + //Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); // WriteLog("Ramka poszla!"); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t->asName + " sent"); }; @@ -5129,7 +5132,8 @@ void TGround::WyslijObsadzone() cData.cbData = 8 + 1984; // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + //m7todo + //Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); CommLog( Now() + " " + std::to_string(r.iComm) + " obsadzone" + " sent"); } @@ -5153,7 +5157,8 @@ void TGround::WyslijParam(int nr, int fl) cData.dwData = 'EU07'; // sygnatura cData.cbData = 12 + i; // 12+rozmiar danych cData.lpData = &r; - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + //m7todo + //Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); }; //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- diff --git a/Ground.h b/Ground.h index 099eff67..386503f3 100644 --- a/Ground.h +++ b/Ground.h @@ -320,7 +320,7 @@ class TGround TGround(); ~TGround(); void Free(); - bool Init(std::string asFile, HDC hDC); + bool Init(std::string asFile); void FirstInit(); void InitTracks(); void InitTraction(); diff --git a/Texture.cpp b/Texture.cpp index c07b5a79..1550e4c8 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -268,7 +268,7 @@ TTexturesManager::AlphaValue TTexturesManager::LoadBMP(std::string const &fileNa if( infoSize > sizeof( info ) ) { WriteLog( "Warning - BMP header is larger than expected, possible format difference." ); } - file.read((char *)&info, std::min(infoSize, sizeof(info))); + file.read((char *)&info, std::min((size_t)infoSize, sizeof(info))); if (file.eof()) { diff --git a/Train.cpp b/Train.cpp index 9196e232..1dec2eaf 100644 --- a/Train.cpp +++ b/Train.cpp @@ -413,7 +413,7 @@ void TTrain::OnKeyDown(int cKey) // isEztOer=(mvControlled->TrainType==dt_EZT)&&(mvControlled->Mains)&&(mvOccupied->BrakeSubsystem==ss_ESt)&&(mvControlled->ActiveDir!=0); // isEztOer=((mvControlled->TrainType==dt_EZT)&&(mvControlled->Battery==true)&&(mvControlled->EpFuse==true)&&(mvOccupied->BrakeSubsystem==Oerlikon)&&(mvControlled->ActiveDir!=0)); - if (GetAsyncKeyState(VK_SHIFT) < 0) + if (Global::shiftState) { // wciśnięty [Shift] if (cKey == Global::Keys[k_IncMainCtrlFAST]) // McZapkie-200702: szybkie // przelaczanie na poz. @@ -428,7 +428,7 @@ void TTrain::OnKeyDown(int cKey) else if (cKey == Global::Keys[k_DirectionBackward]) { if (mvOccupied->Radio == false) - if (GetAsyncKeyState(VK_CONTROL) >= 0) + if (Global::ctrlState >= 0) { dsbSwitch->SetVolume(DSBVOLUME_MAX); dsbSwitch->Play(0, 0, 0); @@ -580,7 +580,7 @@ void TTrain::OnKeyDown(int cKey) int CouplNr = -2; if (!FreeFlyModeFlag) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if (mvOccupied->BrakeDelaySwitch(bdelay_R + bdelay_M)) { dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); @@ -607,7 +607,7 @@ void TTrain::OnKeyDown(int cKey) } if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R + bdelay_M)) { dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); @@ -677,7 +677,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || { // Ra: dźwięk, gdy razem z [Shift] if ((mvControlled->TrainType & dt_EZT) ? mvControlled == mvOccupied : !mvOccupied->ActiveCab) // tylko w maszynowym - if (Console::Pressed(VK_CONTROL)) // z [Ctrl] + if (Global::ctrlState) // z [Ctrl] mvControlled->bPantKurek3 = true; // zbiornik pantografu połączony // jest ze zbiornikiem głównym // (pompowanie nie ma sensu) @@ -779,7 +779,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // przyciemnienia pod Univ4) else if (cKey == Global::Keys[k_Univ3]) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { if (bCabLight == false) //(ggCabLightButton.GetValue()==0) { @@ -795,7 +795,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || dsbSwitch->Play(0, 0, 0); } /* - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) {//z [Ctrl] zapalamy albo gasimy światełko w kabinie if (iCabLightFlag<2) ++iCabLightFlag; //zapalenie } @@ -807,7 +807,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // hunter-091012: dzwiek dla przyciemnienia swiatelka w kabinie else if (cKey == Global::Keys[k_Univ4]) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { if (bCabLightDim == false) //(ggCabLightDimButton.GetValue()==0) { @@ -910,7 +910,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || { if (false == (mvOccupied->LightsPosNo > 0)) { - if ((GetAsyncKeyState(VK_CONTROL) < 0) && + if ((Global::ctrlState) && (ggRearLeftLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu { //------------------------------ @@ -1030,7 +1030,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || SetLights(); } } - else if ((GetAsyncKeyState(VK_CONTROL) < 0) && + else if ((Global::ctrlState) && (ggRearUpperLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu { //------------------------------ @@ -1085,7 +1085,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || { if (false == (mvOccupied->LightsPosNo > 0)) { - if ((GetAsyncKeyState(VK_CONTROL) < 0) && + if ((Global::ctrlState) && (ggRearRightLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu { //------------------------------ @@ -1264,7 +1264,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // World.cpp if (!FreeFlyModeFlag) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if ((mvOccupied->LocalBrake == ManualBrake) || (mvOccupied->MBrake == true)) { mvOccupied->IncManualBrakeLevel(1); @@ -1282,7 +1282,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // World.cpp if (!FreeFlyModeFlag) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if ((mvOccupied->LocalBrake == ManualBrake) || (mvOccupied->MBrake == true)) mvOccupied->DecManualBrakeLevel(1); else @@ -1376,7 +1376,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(mvOccupied->BrakeCtrlPosNo / 2 + (mvOccupied->BrakeHandle == FV4a ? 1 : 0)); - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos(bh_NP)); // yB: czy ten stos funkcji nie // powinien być jako oddzielna @@ -1395,7 +1395,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } else if (cKey == Global::Keys[k_Brake0]) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { mvOccupied->BrakeCtrlPos2 = 0; // wyrownaj kapturek } @@ -1457,7 +1457,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || else if (cKey == Global::Keys[k_Fuse]) //--------------- { - if (GetAsyncKeyState(VK_CONTROL) < 0) // z controlem + if (Global::ctrlState) // z controlem { ggConverterFuseButton.PutValue(1); // hunter-261211 if ((mvControlled->Mains == false) && (ggConverterButton.GetValue() == 0) && @@ -1498,7 +1498,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } else if (cKey == Global::Keys[k_DirectionBackward]) // r { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) { // wciśnięty [Ctrl] if (mvOccupied->Radio == true) { @@ -1580,7 +1580,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || int CouplNr = -2; if (!FreeFlyModeFlag) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if (mvOccupied->BrakeDelaySwitch(bdelay_R)) { dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); @@ -1607,7 +1607,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R)) { dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); @@ -1672,7 +1672,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || { // Ra: bez [Shift] też dać dźwięk if ((mvControlled->TrainType & dt_EZT) ? mvControlled == mvOccupied : !mvOccupied->ActiveCab) // tylko w maszynowym - if (Console::Pressed(VK_CONTROL)) // z [Ctrl] + if (Global::ctrlState) // z [Ctrl] mvControlled->bPantKurek3 = false; // zbiornik pantografu połączony jest z małą sprężarką // (pompowanie ma sens, ale potem trzeba przełączyć) @@ -2009,7 +2009,7 @@ if // przyciemnienia pod Univ4) else if (cKey == Global::Keys[k_Univ3]) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { if (bCabLight == true) //(ggCabLightButton.GetValue()!=0) { @@ -2025,7 +2025,7 @@ if dsbSwitch->Play(0, 0, 0); } /* - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) {//z [Ctrl] zapalamy albo gasimy światełko w kabinie if (iCabLightFlag) --iCabLightFlag; //gaszenie } */ @@ -2036,7 +2036,7 @@ if // hunter-091012: dzwiek dla przyciemnienia swiatelka w kabinie else if (cKey == Global::Keys[k_Univ4]) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { if (bCabLightDim == true) //(ggCabLightDimButton.GetValue()!=0) { @@ -2117,7 +2117,7 @@ if { if (false == (mvOccupied->LightsPosNo > 0)) { - if ((GetAsyncKeyState(VK_CONTROL) < 0) && + if ((Global::ctrlState) && (ggRearLeftLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu { //------------------------------ @@ -2236,7 +2236,7 @@ if SetLights(); } } - else if ((GetAsyncKeyState(VK_CONTROL) < 0) && + else if ((Global::ctrlState) && (ggRearUpperLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu { //------------------------------ @@ -2290,7 +2290,7 @@ if { if (false == (mvOccupied->LightsPosNo > 0)) { - if ((GetAsyncKeyState(VK_CONTROL) < 0) && + if ((Global::ctrlState) && (ggRearRightLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu { //------------------------------ @@ -2427,8 +2427,8 @@ if fMechCroach = -0.5; else fMechCroach = 0.5; - // if (!GetAsyncKeyState(VK_SHIFT)<0) // bez shifta - if (!Console::Pressed(VK_CONTROL)) // gdy [Ctrl] zwolniony (dodatkowe widoki) + // if (!Global::shiftState<0) // bez shifta + if (!Global::ctrlState) // gdy [Ctrl] zwolniony (dodatkowe widoki) { if (cKey == Global::Keys[k_MechLeft]) { @@ -2517,7 +2517,7 @@ if void TTrain::OnKeyUp(int cKey) { // zwolnienie klawisza - if (GetAsyncKeyState(VK_SHIFT) < 0) + if (Global::shiftState) { // wciśnięty [Shift] } else @@ -4198,7 +4198,7 @@ bool TTrain::Update( double const Deltatime ) if (Console::Pressed(Global::Keys[k_Horn])) { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { SetFlag(mvOccupied->WarningSignal, 2); mvOccupied->WarningSignal &= (255 - 1); @@ -4229,7 +4229,7 @@ bool TTrain::Update( double const Deltatime ) //---------------- // hunter-141211: wyl. szybki zalaczony i wylaczony przeniesiony z // OnKeyPress() - if (Console::Pressed(VK_SHIFT) && Console::Pressed(Global::Keys[k_Main])) + if (Global::shiftState && Console::Pressed(Global::Keys[k_Main])) { fMainRelayTimer += dt; ggMainOnButton.PutValue(1); @@ -4263,7 +4263,7 @@ bool TTrain::Update( double const Deltatime ) } //--- - if (!Console::Pressed(VK_SHIFT) && Console::Pressed(Global::Keys[k_Main])) + if (!Global::shiftState && Console::Pressed(Global::Keys[k_Main])) { ggMainOffButton.PutValue(1); if (mvControlled->MainSwitch(false)) @@ -4402,7 +4402,7 @@ bool TTrain::Update( double const Deltatime ) ggAntiSlipButton.UpdateValue(0); //----------------- // hunter-261211: przetwornica i sprezarka - if (Console::Pressed(VK_SHIFT) && + if (Global::shiftState && Console::Pressed(Global::Keys[k_Converter])) // NBMX 14-09-2003: przetwornica wl { //(mvControlled->CompressorPower<2) ggConverterButton.PutValue(1); @@ -4426,16 +4426,16 @@ bool TTrain::Update( double const Deltatime ) } // if ( - // Console::Pressed(VK_SHIFT)&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) + // Global::shiftState&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) // ) //NBMX 14-09-2003: sprezarka wl - if (Console::Pressed(VK_SHIFT) && Console::Pressed(Global::Keys[k_Compressor]) && + if (Global::shiftState && Console::Pressed(Global::Keys[k_Compressor]) && (mvControlled->CompressorPower < 2)) // hunter-091012: tak jest poprawnie { // hunter-110212: poprawka dla EZT ggCompressorButton.PutValue(1); mvControlled->CompressorSwitch(true); } - if (!Console::Pressed(VK_SHIFT) && + if (!Global::shiftState && Console::Pressed(Global::Keys[k_Converter])) // NBMX 14-09-2003: przetwornica wl { ggConverterButton.PutValue(0); @@ -4446,9 +4446,9 @@ bool TTrain::Update( double const Deltatime ) } // if ( - // !Console::Pressed(VK_SHIFT)&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) + // !Global::shiftState&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) // ) //NBMX 14-09-2003: sprezarka wl - if (!Console::Pressed(VK_SHIFT) && Console::Pressed(Global::Keys[k_Compressor]) && + if (!Global::shiftState && Console::Pressed(Global::Keys[k_Compressor]) && (mvControlled->CompressorPower < 2)) // hunter-091012: tak jest poprawnie { // hunter-110212: poprawka dla EZT ggCompressorButton.PutValue(0); @@ -4507,7 +4507,7 @@ bool TTrain::Update( double const Deltatime ) if (!DebugModeFlag) { if (ggUniversal1Button.SubModel) - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) ggUniversal1Button.IncValue(dt / 2); else ggUniversal1Button.DecValue(dt / 2); @@ -4523,7 +4523,7 @@ bool TTrain::Update( double const Deltatime ) if (!DebugModeFlag) { if (ggUniversal2Button.SubModel) - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) ggUniversal2Button.IncValue(dt / 2); else ggUniversal2Button.DecValue(dt / 2); @@ -4533,9 +4533,9 @@ bool TTrain::Update( double const Deltatime ) // hunter-091012: zrobione z uwzglednieniem przelacznika swiatla if (Console::Pressed(Global::Keys[k_Univ3])) { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { bCabLight = true; if (ggCabLightButton.SubModel) @@ -4558,7 +4558,7 @@ bool TTrain::Update( double const Deltatime ) } else { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { bCabLight = false; if (ggCabLightButton.SubModel) @@ -4589,10 +4589,10 @@ bool TTrain::Update( double const Deltatime ) if (ggUniversal3Button.SubModel) - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) {//z [Ctrl] zapalamy albo gasimy światełko w kabinie //tutaj jest bez sensu, trzeba reagować na wciskanie klawisza! - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) {//zapalenie if (iCabLightFlag<2) ++iCabLightFlag; } @@ -4604,7 +4604,7 @@ bool TTrain::Update( double const Deltatime ) } else {//bez [Ctrl] przełączamy cośtem - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { ggUniversal3Button.PutValue(1); //hunter-131211: z UpdateValue na PutValue - by zachowywal sie jak pozostale przelaczniki @@ -4645,7 +4645,7 @@ bool TTrain::Update( double const Deltatime ) if (Console::Pressed(Global::Keys[k_Univ4])) { if (ggUniversal4Button.SubModel) - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { ActiveUniversal4=true; //ggUniversal4Button.UpdateValue(1); @@ -4662,9 +4662,9 @@ bool TTrain::Update( double const Deltatime ) // swiatla if (Console::Pressed(Global::Keys[k_Univ4])) { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { bCabLightDim = true; if (ggCabLightDimButton.SubModel) @@ -4680,7 +4680,7 @@ bool TTrain::Update( double const Deltatime ) } else { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { bCabLightDim = false; if (ggCabLightDimButton.SubModel) @@ -4720,7 +4720,7 @@ bool TTrain::Update( double const Deltatime ) // ((mvOccupied->BrakeHandle==FV4a)&&(Console::Pressed(Global::Keys[k_IncBrakeLevel]))) if ((Console::Pressed(Global::Keys[k_IncBrakeLevel]))) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { // mvOccupied->BrakeCtrlPos2-=dt/20.0; // if (mvOccupied->BrakeCtrlPos2<-1.5) mvOccupied->BrakeCtrlPos2=-1.5; @@ -4735,7 +4735,7 @@ bool TTrain::Update( double const Deltatime ) // ((mvOccupied->BrakeHandle==FV4a)&&(Console::Pressed(Global::Keys[k_DecBrakeLevel]))) if ((Console::Pressed(Global::Keys[k_DecBrakeLevel]))) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { // mvOccupied->BrakeCtrlPos2+=(mvOccupied->BrakeCtrlPos2>2?0:dt/20.0); // if (mvOccupied->BrakeCtrlPos2<-3) mvOccupied->BrakeCtrlPos2=-3; @@ -4751,7 +4751,7 @@ bool TTrain::Update( double const Deltatime ) if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_IncBrakeLevel]))) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { mvOccupied->BrakeCtrlPos2 -= dt / 20.0; if (mvOccupied->BrakeCtrlPos2 < -1.5) @@ -4768,7 +4768,7 @@ bool TTrain::Update( double const Deltatime ) if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_DecBrakeLevel]))) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { mvOccupied->BrakeCtrlPos2 += (mvOccupied->BrakeCtrlPos2 > 2 ? 0 : dt / 20.0); if (mvOccupied->BrakeCtrlPos2 < -3) @@ -4821,7 +4821,7 @@ bool TTrain::Update( double const Deltatime ) if (Console::Pressed(Global::Keys[k_Main])) //[] { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) ggMainButton.PutValue(1); else ggMainButton.PutValue(0); @@ -4846,10 +4846,10 @@ bool TTrain::Update( double const Deltatime ) } else { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { // if (Console::Pressed(k_CurrentNext)) - { // Ra: było pod VK_F3 + { // Ra: było pod GLFW_KEY_F3 if ((mvOccupied->EpFuseSwitch(true))) { dsbPneumaticSwitch->SetVolume(-10); @@ -4860,8 +4860,8 @@ bool TTrain::Update( double const Deltatime ) else { // if (Console::Pressed(k_CurrentNext)) - { // Ra: było pod VK_F3 - if (Console::Pressed(VK_CONTROL)) + { // Ra: było pod GLFW_KEY_F3 + if (Global::ctrlState) { if ((mvOccupied->EpFuseSwitch(false))) { @@ -4890,7 +4890,7 @@ bool TTrain::Update( double const Deltatime ) // Winger 010304 PantAllDownButton if (Console::Pressed(Global::Keys[k_PantFrontUp])) { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) ggPantFrontButton.PutValue(1); else ggPantAllDownButton.PutValue(1); @@ -4903,7 +4903,7 @@ bool TTrain::Update( double const Deltatime ) if (Console::Pressed(Global::Keys[k_PantRearUp])) { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) ggPantRearButton.PutValue(1); else ggPantFrontButtonOff.PutValue(1); diff --git a/World.cpp b/World.cpp index 6ebe9161..451f9422 100644 --- a/World.cpp +++ b/World.cpp @@ -12,7 +12,10 @@ http://mozilla.org/MPL/2.0/. */ +#include + #include "stdafx.h" + #include "World.h" #include "opengl/glew.h" @@ -44,6 +47,11 @@ TDynamicObject *Controlled = NULL; // pojazd, który prowadzimy const double fTimeMax = 1.00; //[s] maksymalny czas aktualizacji w jednek klatce +extern "C" +{ + GLFWAPI HWND glfwGetWin32Window(GLFWwindow* window); //m7todo: potrzebne do directsound +} + TWorld::TWorld() { // randomize(); @@ -92,6 +100,8 @@ void TWorld::TrainDelete(TDynamicObject *d) GLvoid TWorld::glPrint(const char *txt) // custom GL "Print" routine { // wypisywanie tekstu 2D na ekranie + //m7todo + return; if (!txt) return; if (Global::bGlutFont) @@ -164,10 +174,12 @@ BOOL GetDisplayMonitorInfo(int nDeviceIndex, LPSTR lpszMonitorInfo) } */ -bool TWorld::Init(HWND NhWnd, HDC hDC) +bool TWorld::Init(GLFWwindow *w) { auto timestart = std::chrono::system_clock::now(); - Global::hWnd = NhWnd; // do WM_COPYDATA + + window = w; + Global::window = w; // do WM_COPYDATA Global::pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań Global::detonatoryOK = true; WriteLog("Starting MaSzyna rail vehicle simulator."); @@ -419,6 +431,8 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) /*--------------------Render Initialization End---------------------*/ + //m7todo: font + /* WriteLog("Font init"); // początek inicjacji fontów 2D if (Global::bGlutFont) // jeśli wybrano GLUT font, próbujemy zlinkować GLUT32.DLL { @@ -459,16 +473,14 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Display Lists font used."); //+AnsiString(glGetError()) } WriteLog("Font init OK"); //+AnsiString(glGetError()) - + */ Timer::ResetTimers(); - hWnd = NhWnd; glColor4f(1.0f, 3.0f, 3.0f, 0.0f); // SwapBuffers(hDC); // Swap Buffers (Double Buffering) // glClear(GL_COLOR_BUFFER_BIT); // glFlush(); - SetForegroundWindow(hWnd); WriteLog("Sound Init"); glLoadIdentity(); @@ -502,11 +514,14 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.10f); glPrint("Dzwiek / Sound..."); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + + glfwSwapBuffers(window); glEnable(GL_LIGHTING); /*-----------------------Sound Initialization-----------------------*/ - TSoundsManager::Init(hWnd); + + TSoundsManager::Init(glfwGetWin32Window(window)); + // TSoundsManager::LoadSounds( "" ); /*---------------------Sound Initialization End---------------------*/ WriteLog("Sound Init OK"); @@ -515,7 +530,8 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.11f); glPrint("OK."); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + + glfwSwapBuffers(window); int i; @@ -526,7 +542,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.12f); glPrint("Tekstury / Textures..."); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers(window); TTexturesManager::Init(); WriteLog("Textures init OK"); @@ -535,7 +551,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.13f); glPrint("OK."); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers(window); WriteLog("Models init"); if (Global::detonatoryOK) @@ -543,7 +559,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.14f); glPrint("Modele / Models..."); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers(window); // McZapkie: dodalem sciezke zeby mozna bylo definiowac skad brac modele ale to malo eleganckie // TModelsManager::LoadModels(asModelsPatch); TModelsManager::Init(); @@ -553,7 +569,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.15f); glPrint("OK."); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers(window); WriteLog("Ground init"); if (Global::detonatoryOK) @@ -561,9 +577,9 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.16f); glPrint("Sceneria / Scenery (please wait)..."); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers(window); - Ground.Init(Global::SceneryFile, hDC); + Ground.Init(Global::SceneryFile); // Global::tSinceStart= 0; Clouds.Init(); WriteLog("Ground init OK"); @@ -572,7 +588,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.17f); glPrint("OK."); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers(window); // TTrack *Track=Ground.FindGroundNode("train_start",TP_TRACK)->pTrack; @@ -589,7 +605,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.18f); glPrint("Przygotowanie kabiny do sterowania..."); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers(window); strcat(buff, Global::asHumanCtrlVehicle.c_str()); WriteLog(buff); @@ -611,7 +627,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glPrint("OK."); } FollowView(); - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers(window); } else { @@ -622,7 +638,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glRasterPos2f(-0.25f, -0.20f); glPrint("Blad inicjalizacji sterowanego pojazdu!"); } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers(window); Controlled = NULL; mvControlled = NULL; Camera.Type = tp_Free; @@ -640,7 +656,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) } } FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie - SwapBuffers(hDC); // swap buffers (double buffering) + glfwSwapBuffers(window); Controlled = NULL; mvControlled = NULL; Camera.Type = tp_Free; @@ -685,44 +701,11 @@ void TWorld::OnKeyDown(int cKey) // na każdy kod wirtualny niech przypadają 4 bajty: 2 dla naciśnięcia i 2 dla zwolnienia // powtórzone 256 razy da 1kB na każdy stan przełączników, łącznie będzie 4kB pierwszej tabeli // przekodowania - if (!Global::iPause) - { // podczas pauzy klawisze nie działają - std::string info = "Key pressed: ["; - if (Console::Pressed(VK_SHIFT)) - info += "Shift]+["; - if (Console::Pressed(VK_CONTROL)) - info += "Ctrl]+["; - if (cKey > 192) // coś tam jeszcze ciekawego jest? - { - if (cKey < 255) // 255 to [Fn] w laptopach - WriteLog(info + (char)(cKey - 128) + "]"); - } - else if (cKey >= 186) - WriteLog(info + std::string(";=,-./~").substr(cKey - 186, 1) + "]"); - else if (cKey > 123) // coś tam jeszcze ciekawego jest? - WriteLog(info + std::to_string(cKey) + "]"); // numer klawisza - else if (cKey >= 112) // funkcyjne - WriteLog(info + "F" + std::to_string(cKey - 111) + "]"); - else if (cKey >= 96) - WriteLog(info + "Num" + std::string("0123456789*+?-./").substr(cKey - 96, 1) + "]"); - else if (((cKey >= '0') && (cKey <= '9')) || ((cKey >= 'A') && (cKey <= 'Z')) || - (cKey == ' ')) - WriteLog(info + (char)(cKey) + "]"); - else if (cKey == '-') - WriteLog(info + "Insert]"); - else if (cKey == '.') - WriteLog(info + "Delete]"); - else if (cKey == '$') - WriteLog(info + "Home]"); - else if (cKey == '#') - WriteLog(info + "End]"); - else if (cKey > 'Z') //żeby nie logować kursorów - WriteLog(info + std::to_string(cKey) + "]"); // numer klawisza - } - if ((cKey <= '9') ? (cKey >= '0') : false) // klawisze cyfrowe + //m7todo: printowanie klawiszy? + if (cKey >= '0' && cKey <= '9') { int i = cKey - '0'; // numer klawisza - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { // z [Shift] uruchomienie eventu if (!Global::iPause) // podczas pauzy klawisze nie działają if (KeyEvents[i]) @@ -730,8 +713,8 @@ void TWorld::OnKeyDown(int cKey) } else // zapamiętywanie kamery może działać podczas pauzy if (FreeFlyModeFlag) // w trybie latania można przeskakiwać do ustawionych kamer - if ((Global::iTextMode != VK_F12) && - (Global::iTextMode != VK_F3)) // ograniczamy użycie kamer + if ((Global::iTextMode != GLFW_KEY_F12) && + (Global::iTextMode != GLFW_KEY_F3)) // ograniczamy użycie kamer { if ((!Global::pFreeCameraInit[i].x && !Global::pFreeCameraInit[i].y && !Global::pFreeCameraInit[i].z)) @@ -763,66 +746,56 @@ void TWorld::OnKeyDown(int cKey) } // będzie jeszcze załączanie sprzęgów z [Ctrl] } - else if ((cKey >= VK_F1) ? (cKey <= VK_F12) : false) + else if (cKey >= GLFW_KEY_F1 && cKey <= GLFW_KEY_F12) { switch (cKey) { - case VK_F1: // czas i relacja - case VK_F3: - case VK_F5: // przesiadka do innego pojazdu - case VK_F8: // FPS - case VK_F9: // wersja, typ wyświetlania, błędy OpenGL - case VK_F10: + case GLFW_KEY_F1: // czas i relacja + case GLFW_KEY_F3: + case GLFW_KEY_F5: // przesiadka do innego pojazdu + case GLFW_KEY_F8: // FPS + case GLFW_KEY_F9: // wersja, typ wyświetlania, błędy OpenGL + case GLFW_KEY_F10: if (Global::iTextMode == cKey) Global::iTextMode = - (Global::iPause && (cKey != VK_F1) ? VK_F1 : + (Global::iPause && (cKey != GLFW_KEY_F1) ? GLFW_KEY_F1 : 0); // wyłączenie napisów, chyba że pauza else Global::iTextMode = cKey; break; - case VK_F2: // parametry pojazdu + case GLFW_KEY_F2: // parametry pojazdu if (Global::iTextMode == cKey) // jeśli kolejne naciśnięcie - ++Global::iScreenMode[cKey - VK_F1]; // kolejny ekran + ++Global::iScreenMode[cKey - GLFW_KEY_F1]; // kolejny ekran else { // pierwsze naciśnięcie daje pierwszy (tzn. zerowy) ekran Global::iTextMode = cKey; - Global::iScreenMode[cKey - VK_F1] = 0; + Global::iScreenMode[cKey - GLFW_KEY_F1] = 0; } break; - case VK_F12: // coś tam jeszcze - if (Console::Pressed(VK_CONTROL) && Console::Pressed(VK_SHIFT)) + case GLFW_KEY_F12: + if (Global::ctrlState && Global::shiftState) DebugModeFlag = !DebugModeFlag; // taka opcjonalna funkcja, może się czasem przydać - /* //Ra 2F1P: teraz włączanie i wyłączanie klawiszami cyfrowymi po użyciu [F12] - else if (Console::Pressed(VK_SHIFT)) - {//odpalenie logu w razie "W" - if ((Global::iWriteLogEnabled&2)==0) //nie było okienka - {//otwarcie okna - AllocConsole(); - SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE),FOREGROUND_GREEN); - } - Global::iWriteLogEnabled|=3; - } */ else Global::iTextMode = cKey; break; - case VK_F4: + case GLFW_KEY_F4: InOutKey(); break; - case VK_F6: + case GLFW_KEY_F6: if (DebugModeFlag) { // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! - // Global::iViewMode=VK_F6; - if (Console::Pressed(VK_CONTROL)) - Global::fTimeSpeed = (Console::Pressed(VK_SHIFT) ? 10.0 : 5.0); + // Global::iViewMode=GLFW_KEY_F6; + if (Global::ctrlState) + Global::fTimeSpeed = (Global::shiftState ? 10.0 : 5.0); else - Global::fTimeSpeed = (Console::Pressed(VK_SHIFT) ? 2.0 : 1.0); + Global::fTimeSpeed = (Global::shiftState ? 2.0 : 1.0); } break; } - // if (cKey!=VK_F4) + // if (cKey!=GLFW_KEY_F4) return; // nie są przekazywane do pojazdu wcale } - if (Global::iTextMode == VK_F10) // wyświetlone napisy klawiszem F10 + if (Global::iTextMode == GLFW_KEY_F10) // wyświetlone napisy klawiszem F10 { // i potwierdzenie if( cKey == 'Y' ) { // flaga wyjścia z programu @@ -831,9 +804,9 @@ void TWorld::OnKeyDown(int cKey) } return; // nie przekazujemy do pociągu } - else if ((Global::iTextMode == VK_F12) ? (cKey >= '0') && (cKey <= '9') : false) + else if ((Global::iTextMode == GLFW_KEY_F12) ? (cKey >= '0') && (cKey <= '9') : false) { // tryb konfiguracji debugmode (przestawianie kamery już wyłączone - if (!Console::Pressed(VK_SHIFT)) // bez [Shift] + if (!Global::shiftState) // bez [Shift] { if (cKey == '1') Global::iWriteLogEnabled ^= 1; // włącz/wyłącz logowanie do pliku @@ -855,7 +828,7 @@ void TWorld::OnKeyDown(int cKey) if (Controlled->MoverParameters->Radio) Ground.RadioStop(Camera.Pos); } - else if (!Global::iPause) //||(cKey==VK_F4)) //podczas pauzy sterownaie nie działa, F4 tak + else if (!Global::iPause) //||(cKey==GLFW_KEY_F4)) //podczas pauzy sterownaie nie działa, F4 tak if (Train) if (Controlled) if ((Controlled->Controller == Humandriver) ? true : DebugModeFlag || (cKey == 'Q')) @@ -867,7 +840,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) // z ctrl odcinanie + if (Global::ctrlState) // z ctrl odcinanie { temp->MoverParameters->BrakeStatus ^= 128; } @@ -884,7 +857,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (Console::Pressed(VK_SHIFT) ? temp->MoverParameters->IncBrakeMult() : + if (Global::shiftState ? temp->MoverParameters->IncBrakeMult() : temp->MoverParameters->DecBrakeMult()) if (Train) { // dźwięk oczywiście jest w kabinie @@ -907,9 +880,9 @@ void TWorld::OnKeyDown(int cKey) CouplNr = 0; // z [-1,1] zrobić [0,1] int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę // tapety pulpitu :/ - if (GetAsyncKeyState(VK_SHIFT) < 0) // z [Shift] zapalanie + if (Global::shiftState) // z [Shift] zapalanie set = mask = 64; // bez [Ctrl] założyć tabliczki - else if (GetAsyncKeyState(VK_CONTROL) < 0) + else if (Global::ctrlState) set = mask = 2 + 32; // z [Ctrl] zapalić światła czerwone else mask = 2 + 32 + 64; // wyłączanie ściąga wszystko @@ -929,7 +902,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if ((temp->MoverParameters->LocalBrake == ManualBrake) || (temp->MoverParameters->MBrake == true)) temp->MoverParameters->IncManualBrakeLevel(1); @@ -949,7 +922,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if ((temp->MoverParameters->LocalBrake == ManualBrake) || (temp->MoverParameters->MBrake == true)) temp->MoverParameters->DecManualBrakeLevel(1); @@ -1041,7 +1014,7 @@ void TWorld::DistantView() void TWorld::FollowView(bool wycisz) { // ustawienie śledzenia pojazdu // ABu 180404 powrot mechanika na siedzenie albo w okolicę pojazdu - // if (Console::Pressed(VK_F4)) Global::iViewMode=VK_F4; + // if (Console::Pressed(GLFW_KEY_F4)) Global::iViewMode=GLFW_KEY_F4; // Ra: na zewnątrz wychodzimy w Train.cpp Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe if (Controlled) // jest pojazd do prowadzenia? @@ -1196,7 +1169,7 @@ bool TWorld::Update() Ground.UpdatePhys(fMaxDt,n); //Ra: teraz czas kroku jest (względnie) stały if (DebugModeFlag) if (Global::bActive) //nie przyspieszać, gdy jedzie w tle :) - if (GetAsyncKeyState(VK_ESCAPE)<0) + if (GetAsyncKeyState(GLFW_KEY_ESCAPE)<0) {//yB dodał przyspieszacz fizyki Ground.UpdatePhys(fMaxDt,n); Ground.UpdatePhys(fMaxDt,n); @@ -1228,7 +1201,7 @@ bool TWorld::Update() Ground.Update(dt, n); // tu zrobić tylko coklatkową aktualizację przesunięć if (DebugModeFlag) if (Global::bActive) // nie przyspieszać, gdy jedzie w tle :) - if (GetAsyncKeyState(VK_ESCAPE) < 0) + if (Console::Pressed(GLFW_KEY_ESCAPE)) { // yB dodał przyspieszacz fizyki Ground.Update(dt, n); Ground.Update(dt, n); @@ -1268,7 +1241,7 @@ TWorld::Update_Camera( double const Deltatime ) { // Console::Update(); //tu jest zależne od FPS, co nie jest korzystne if( Global::bActive ) { // obsługa ruchu kamery tylko gdy okno jest aktywne - if( Console::Pressed( VK_LBUTTON ) ) { + if( glfwGetMouseButton(window, GLFW_MOUSE_BUTTON_LEFT) == GLFW_PRESS ) { Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe // if (!FreeFlyModeFlag) //jeśli wewnątrz - patrzymy do tyłu // Camera.LookAt=Train->pMechPosition-Normalize(Train->GetDirection())*10; @@ -1294,7 +1267,7 @@ TWorld::Update_Camera( double const Deltatime ) { if( FreeFlyModeFlag ) Camera.RaLook(); // jednorazowe przestawienie kamery } - else if( Console::Pressed( VK_RBUTTON ) ) //||Console::Pressed(VK_F4)) + else if(glfwGetMouseButton(window, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS ) //||Console::Pressed(GLFW_KEY_F4)) FollowView( false ); // bez wyciszania dźwięków /* else if( Global::iTextMode == -1 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy @@ -1314,7 +1287,7 @@ TWorld::Update_Camera( double const Deltatime ) { tempangle = Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); modelrotate = atan2( -tempangle.x, tempangle.z ); - if( Console::Pressed( VK_CONTROL ) ? ( Console::Pressed( Global::Keys[ k_MechLeft ] ) || + if( Global::ctrlState ? ( Console::Pressed( Global::Keys[ k_MechLeft ] ) || Console::Pressed( Global::Keys[ k_MechRight ] ) ) : false ) { // jeśli lusterko lewe albo prawe (bez rzucania na razie) bool lr = Console::Pressed( Global::Keys[ k_MechLeft ] ); @@ -1333,7 +1306,7 @@ TWorld::Update_Camera( double const Deltatime ) { Camera.Yaw = 0; // odchylenie na bok od Camera.LookAt if( Train->Dynamic()->MoverParameters->ActiveCab == 0 ) Camera.LookAt = Camera.Pos - Train->GetDirection(); // gdy w korytarzu - else if( Console::Pressed( VK_SHIFT ) ) { // patrzenie w bok przez szybę + else if( Global::shiftState ) { // patrzenie w bok przez szybę Camera.LookAt = Camera.Pos - ( lr ? -1 : 1 ) * Train->Dynamic()->VectorLeft() * Train->Dynamic()->MoverParameters->ActiveCab; @@ -1780,13 +1753,13 @@ TWorld::Render_UI() { // OutText1+= " Slowing Down !!! "; // } } - /*if (Console::Pressed(VK_F5)) + /*if (Console::Pressed(GLFW_KEY_F5)) {Global::slowmotion=true;}; - if (Console::Pressed(VK_F6)) + if (Console::Pressed(GLFW_KEY_F6)) {Global::slowmotion=false;};*/ - if( Global::iTextMode == VK_F8 ) { - Global::iViewMode = VK_F8; + if( Global::iTextMode == GLFW_KEY_F8 ) { + Global::iViewMode = GLFW_KEY_F8; OutText1 = " FPS: "; OutText1 += to_string( Timer::GetFPS(), 2 ); //OutText1 += sprintf(); @@ -1796,7 +1769,7 @@ TWorld::Render_UI() { OutText1 += to_string( Ground.iRendered ); } - // if (Console::Pressed(VK_F7)) + // if (Console::Pressed(GLFW_KEY_F7)) //{ // OutText1=FloatToStrF(Controlled->MoverParameters->Couplers[0].CouplingFlag,ffFixed,2,0)+", // "; @@ -1804,7 +1777,7 @@ TWorld::Render_UI() { //} /* - if (Console::Pressed(VK_F5)) + if (Console::Pressed(GLFW_KEY_F5)) { int line=2; OutText1="Time: "+FloatToStrF(GlobalTime->hh,ffFixed,2,0)+":" @@ -1831,7 +1804,7 @@ TWorld::Render_UI() { }; // */ /* - if (Console::Pressed(VK_F6)) + if (Console::Pressed(GLFW_KEY_F6)) { //GlobalTime->UpdateMTableTime(100); //OutText1=FloatToStrF(SquareMagnitude(Global::pCameraPosition-Controlled->GetPosition()),ffFixed,10,0); @@ -1918,17 +1891,20 @@ TWorld::Render_UI() { } glDisable( GL_LIGHTING ); + //m7todo: title + /* if( Controlled ) SetWindowText( hWnd, Controlled->MoverParameters->Name.c_str() ); else SetWindowText( hWnd, Global::SceneryFile.c_str() ); // nazwa scenerii + */ glBindTexture( GL_TEXTURE_2D, 0 ); glColor4f( 1.0f, 0.0f, 0.0f, 1.0f ); glLoadIdentity(); glTranslatef( 0.0f, 0.0f, -0.50f ); - if( Global::iTextMode == VK_F1 ) { // tekst pokazywany po wciśnięciu [F1] - // Global::iViewMode=VK_F1; + if( Global::iTextMode == GLFW_KEY_F1 ) { // tekst pokazywany po wciśnięciu [F1] + // Global::iViewMode=GLFW_KEY_F1; glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy białym OutText1 = "Time: " @@ -1952,16 +1928,16 @@ TWorld::Render_UI() { OutText3 = ""; // Pomoc w sterowaniu - [F9]"; // OutText3=AnsiString(Global::pCameraRotationDeg); //kąt kamery względem północy } - else if( Global::iTextMode == VK_F12 ) { // opcje włączenia i wyłączenia logowania + else if( Global::iTextMode == GLFW_KEY_F12 ) { // opcje włączenia i wyłączenia logowania OutText1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); OutText2 = "[1] log.txt " + std::string( ( Global::iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); OutText3 = "[2] Console " + std::string( ( Global::iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); } - else if( Global::iTextMode == VK_F2 ) { // ABu: info dla najblizszego pojazdu! + else if( Global::iTextMode == GLFW_KEY_F2 ) { // ABu: info dla najblizszego pojazdu! TDynamicObject *tmp = FreeFlyModeFlag ? Ground.DynamicNearest( Camera.Pos ) : Controlled; // w trybie latania lokalizujemy wg mapy if( tmp ) { - if( Global::iScreenMode[ Global::iTextMode - VK_F1 ] == 0 ) { // jeśli domyślny ekran po pierwszym naciśnięciu + if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 0 ) { // jeśli domyślny ekran po pierwszym naciśnięciu OutText3 = ""; OutText1 = "Vehicle name: " + tmp->MoverParameters->Name; // yB OutText1+="; d: "+FloatToStrF(tmp->ABuGetDirection(),ffFixed,2,0); @@ -2155,7 +2131,7 @@ TWorld::Render_UI() { tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) : std::string( "NULL" ) ); - if( Console::Pressed( VK_F2 ) ) { + if( Console::Pressed( GLFW_KEY_F2 ) ) { WriteLog( OutText1 ); WriteLog( OutText2 ); WriteLog( OutText3 ); @@ -2228,7 +2204,7 @@ TWorld::Render_UI() { // OutText3="enrot="+FloatToStrF(Controlled->MoverParameters->enrot,ffFixed,6,2); // OutText3="; n="+FloatToStrF(Controlled->MoverParameters->n,ffFixed,6,2); } // koniec treści podstawowego ekranu FK_V2 - else if( Global::iTextMode == VK_F5 ) { // przesiadka do innego pojazdu + else if( Global::iTextMode == GLFW_KEY_F5 ) { // przesiadka do innego pojazdu if( FreeFlyModeFlag ) // jeśli tryb latania { TDynamicObject *tmp = Ground.DynamicNearest( Camera.Pos, 50, true ); //łapiemy z obsadą @@ -2251,7 +2227,7 @@ TWorld::Render_UI() { else SafeDelete( Train ); // i nie ma czym sterować // Global::pUserDynamic=Controlled; //renerowanie pojazdu względem kabiny - // Global::iTextMode=VK_F4; + // Global::iTextMode=GLFW_KEY_F4; if( Train ) InOutKey(); // do kabiny } @@ -2285,8 +2261,8 @@ TWorld::Render_UI() { } */ } - else if( Global::iTextMode == VK_F10 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy - // Global::iViewMode=VK_F10; + else if( Global::iTextMode == GLFW_KEY_F10 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy + // Global::iViewMode=GLFW_KEY_F10; // return false; OutText1 = ( "To quit press [Y] key." ); OutText3 = ( "Aby zakonczyc program, przycisnij klawisz [Y]." ); @@ -2483,9 +2459,9 @@ TWorld::Render_UI() { // ABu 150205: prosty help, zeby sie na forum nikt nie pytal, jak ma ruszyc :) if( Global::detonatoryOK ) { - // if (Console::Pressed(VK_F9)) ShowHints(); //to nie działa prawidłowo - prosili wyłączyć - if( Global::iTextMode == VK_F9 ) { // informacja o wersji, sposobie wyświetlania i błędach OpenGL - // Global::iViewMode=VK_F9; + // if (Console::Pressed(GLFW_KEY_F9)) ShowHints(); //to nie działa prawidłowo - prosili wyłączyć + if( Global::iTextMode == GLFW_KEY_F9 ) { // informacja o wersji, sposobie wyświetlania i błędach OpenGL + // Global::iViewMode=GLFW_KEY_F9; OutText1 = Global::asVersion; // informacja o wersji OutText2 = std::string( "Rendering mode: " ) + ( Global::bUseVBO ? "VBO" : "Display Lists" ); if( Global::iMultiplayer ) @@ -2497,7 +2473,7 @@ TWorld::Render_UI() { Global::Bezogonkow( ( (char *)gluErrorString( err ) ) ); } } - if( Global::iTextMode == VK_F3 ) { // wyświetlenie rozkładu jazdy, na razie jakkolwiek + if( Global::iTextMode == GLFW_KEY_F3 ) { // wyświetlenie rozkładu jazdy, na razie jakkolwiek TDynamicObject *tmp = FreeFlyModeFlag ? Ground.DynamicNearest( Camera.Pos ) : Controlled; // w trybie latania lokalizujemy wg mapy @@ -2585,7 +2561,7 @@ TWorld::Render_UI() { } } } - // if ((Global::iTextMode!=VK_F3)) + // if ((Global::iTextMode!=GLFW_KEY_F3)) { // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) glColor3f( 1.0f, 1.0f, 0.0f ); //żółte for( int i = 0; i < 5; ++i ) { // kilka linijek diff --git a/World.h b/World.h index 7868971c..acf2bf22 100644 --- a/World.h +++ b/World.h @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include #include #include "Camera.h" #include "Ground.h" @@ -22,8 +23,8 @@ class TWorld void DistantView(); public: - bool Init(HWND NhWnd, HDC hDC); - HWND hWnd; + bool Init(GLFWwindow *w); + GLFWwindow *window; GLvoid glPrint(const char *fmt); void OnKeyDown(int cKey); void OnKeyUp(int cKey); diff --git a/maszyna.sln b/maszyna.sln index 1c19b757..49bfe6ea 100644 --- a/maszyna.sln +++ b/maszyna.sln @@ -1,25 +1,28 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40629.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maszyna", "maszyna.vcxproj", "{8E0232E5-1C67-442F-9E04-45ED2DDFC960}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x64.ActiveCfg = Debug|x64 + {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x64.Build.0 = Debug|x64 {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x86.ActiveCfg = Debug|Win32 {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x86.Build.0 = Debug|Win32 + {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x64.ActiveCfg = Release|x64 + {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x64.Build.0 = Release|x64 {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x86.ActiveCfg = Release|Win32 {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection EndGlobal diff --git a/maszyna.vcxproj b/maszyna.vcxproj index c0f7ee8a..a4a1c191 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -1,14 +1,22 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {8E0232E5-1C67-442F-9E04-45ED2DDFC960} @@ -18,12 +26,22 @@ Application true - v120_xp + v140_xp + + + Application + true + v140_xp Application false - v120_xp + v140_xp + + + Application + false + v140_xp @@ -31,20 +49,37 @@ + + + + + + eu07++ $(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\ $(SolutionDir)bin\ + + eu07++ + eu07++ $(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\ $(SolutionDir)bin\ false + C:\Users\VB\Desktop\maszyna\lib;$(IncludePath) + C:\Users\VB\Desktop\maszyna\lib-vc2015;$(LibraryPath) + + + false + eu07++ + C:\Users\VB\Desktop\maszyna\lib;$(IncludePath) + C:\Users\VB\Desktop\maszyna\lib-vc2015;$(LibraryPath) @@ -64,6 +99,23 @@ $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) + + + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + Level3 + ProgramDatabase + $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories) + Use + true + false + true + + + true + Windows + $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) + + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) @@ -83,6 +135,24 @@ $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) + + + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ProgramDatabase + $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories) + Use + true + + + true + Windows + true + true + $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) + + @@ -114,7 +184,6 @@ - @@ -125,7 +194,9 @@ Create + Create Create + Create @@ -171,7 +242,6 @@ - diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index d18b00e4..4052a36a 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -13,9 +13,6 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - {d91dfdb6-7d84-4b52-a16a-bad302b45e3c} - {fafd38ab-4c2a-48c8-8e66-ad0d928573b3} @@ -156,9 +153,6 @@ Source Files - - Source Files\opengl - Source Files\mczapkie @@ -191,9 +185,6 @@ Header Files\opengl - - Header Files\opengl - Header Files diff --git a/maszyna.vcxproj.user b/maszyna.vcxproj.user index b99aece4..760c128e 100644 --- a/maszyna.vcxproj.user +++ b/maszyna.vcxproj.user @@ -4,9 +4,18 @@ ..\..\Projects\maszyna WindowsLocalDebugger + + ..\..\Projects\maszyna + WindowsLocalDebugger + ..\..\Projects\maszyna WindowsLocalDebugger _NO_DEBUG_HEAP=1 + + ..\..\Projects\maszyna + WindowsLocalDebugger + _NO_DEBUG_HEAP=1 + \ No newline at end of file diff --git a/opengl/ARB_Multisample.cpp b/opengl/ARB_Multisample.cpp deleted file mode 100644 index 0c58a540..00000000 --- a/opengl/ARB_Multisample.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/*======================================================================================== - - Name: ARB_multisample.cpp - Author: Colt "MainRoach" McAnlis - Date: 4/29/04 - Desc: This file contains the context to load a WGL extension from a string - As well as collect the sample format available based upon the graphics card. - -========================================================================================*/ - -#include "stdafx.h" -#include "arb_multisample.h" -#include "glew.h" -#include "wglew.h" - -// Declairations We'll Use -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 - -bool arbMultisampleSupported = false; -int arbMultisampleFormat = 0; - -// WGLisExtensionSupported: This Is A Form Of The Extension For WGL -bool WGLisExtensionSupported(const char *extension) -{ - const size_t extlen = strlen(extension); - const char *supported = NULL; - - // Try To Use wglGetExtensionStringARB On Current DC, If Possible - PROC wglGetExtString = wglGetProcAddress("wglGetExtensionsStringARB"); - - if (wglGetExtString) - supported = ((char*(__stdcall*)(HDC))wglGetExtString)(wglGetCurrentDC()); - - // If That Failed, Try Standard Opengl Extensions String - if (supported == NULL) - supported = (char*)glGetString(GL_EXTENSIONS); - - // If That Failed Too, Must Be No Extensions Supported - if (supported == NULL) - return false; - - // Begin Examination At Start Of String, Increment By 1 On False Match - for (const char* p = supported; ; p++) - { - // Advance p Up To The Next Possible Match - p = strstr(p, extension); - - if (p == NULL) - return false; // No Match - - // Make Sure That Match Is At The Start Of The String Or That - // The Previous Char Is A Space, Or Else We Could Accidentally - // Match "wglFunkywglExtension" With "wglExtension" - - // Also, Make Sure That The Following Character Is Space Or NULL - // Or Else "wglExtensionTwo" Might Match "wglExtension" - if ((p==supported || p[-1]==' ') && (p[extlen]=='\0' || p[extlen]==' ')) - return true; // Match - } -} - -int InitMultisample(HINSTANCE hInstance,HWND hWnd,PIXELFORMATDESCRIPTOR pfd,int mode) -{//used to query the multisample frequencies - arbMultisampleSupported=false; - //see if the string exists in WGL! - if (!WGLisExtensionSupported("WGL_ARB_multisample")) - return 0; - //get our pixel format - PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB=(PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB"); - if (!wglChoosePixelFormatARB) - return 0; - //get our current device context - HDC hDC=GetDC(hWnd); - int pixelFormat; - int valid; - UINT numFormats; - float fAttributes[]={0,0}; - // These attributes are the bits we want to test for in our sample - // everything is pretty standard, the only one we want to - // really focus on is the SAMPLE BUFFERS ARB and WGL SAMPLES - // these two are going to do the main testing for whether or not - // we support multisampling on this hardware. - int iAttributes[]= - { - WGL_DRAW_TO_WINDOW_ARB,GL_TRUE, - WGL_SUPPORT_OPENGL_ARB,GL_TRUE, - WGL_ACCELERATION_ARB,WGL_FULL_ACCELERATION_ARB, - WGL_COLOR_BITS_ARB,24, - WGL_ALPHA_BITS_ARB,8, - WGL_DEPTH_BITS_ARB,16, - WGL_STENCIL_BITS_ARB,0, - WGL_DOUBLE_BUFFER_ARB,GL_TRUE, - WGL_SAMPLE_BUFFERS_ARB,GL_TRUE, - WGL_SAMPLES_ARB,mode, - 0,0 - }; -/* - //first we check to see if we can get a pixel format for 4 samples - valid=wglChoosePixelFormatARB(hDC,iAttributes,fAttributes,1,&pixelFormat,&numFormats); - if (valid&&(numFormats>=1)) - {//if we returned true, and our format count is greater than 1 - arbMultisampleSupported=true; - arbMultisampleFormat=pixelFormat; - return arbMultisampleSupported; - } -*/ - while (iAttributes[19]>1) - {//our pixel format with (mode) samples failed, test for less samples - valid=wglChoosePixelFormatARB(hDC,iAttributes,fAttributes,1,&pixelFormat,&numFormats); - if (valid&&(numFormats>=1)) - {//if we returned true, and our format count is greater than 1 - arbMultisampleSupported=true; - arbMultisampleFormat=pixelFormat; - return iAttributes[19]; //return number of samples - } - iAttributes[19]>>=1; - } - return 0; -} diff --git a/opengl/ARB_Multisample.h b/opengl/ARB_Multisample.h deleted file mode 100644 index a688e851..00000000 --- a/opengl/ARB_Multisample.h +++ /dev/null @@ -1,25 +0,0 @@ -/*==================================== - Name: ARB_multisample.h - Author: Colt "MainRoach" McAnlis - Date: 4/29/04 - Desc: - This file contains our external items - -====================================*/ - -#ifndef __ARB_MULTISAMPLE_H__ -#define __ARB_MULTISAMPLE_H__ - -#include - -//Globals -extern bool arbMultisampleSupported; -extern int arbMultisampleFormat; - -//If you don't want multisampling, set this to 0 -#define CHECK_FOR_MULTISAMPLE 1 - -//to check for our sampling -int InitMultisample(HINSTANCE hInstance,HWND hWnd,PIXELFORMATDESCRIPTOR pfd,int mode=4); - -#endif diff --git a/stdafx.h b/stdafx.h index 22d52bd3..8c369415 100644 --- a/stdafx.h +++ b/stdafx.h @@ -57,3 +57,9 @@ #include #include #include + +#include "opengl/glew.h" +#include "opengl/wglew.h" + +//m7todo: jest tu bo nie chciao mi si wpycha do wszystkich plikw +#include \ No newline at end of file From eb30d3c80e3893d8f12ac5fa0657eed1b8b80e42 Mon Sep 17 00:00:00 2001 From: VB Date: Sun, 12 Feb 2017 10:48:43 +0100 Subject: [PATCH 002/426] =?UTF-8?q?ups,=20tego=20nie=20chcia=C5=82em=20rus?= =?UTF-8?q?za=C4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Console.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Console.cpp b/Console.cpp index 4ae7272d..3ca23127 100644 --- a/Console.cpp +++ b/Console.cpp @@ -252,8 +252,8 @@ void Console::BitsUpdate(int mask) SetLedState(VK_CAPITAL, iBits & 2); if (mask & 1) // gdy SHP { // Scroll Lock ma jakoś dziwnie... zmiana stanu na przeciwny - SetLedState(VK_CAPITAL, true); // przyciśnięty - SetLedState(VK_CAPITAL, false); // zwolniony + SetLedState(VK_SCROLL, true); // przyciśnięty + SetLedState(VK_SCROLL, false); // zwolniony ++iConfig; // licznik użycia Scroll Lock } break; From 3fc1cc9749e26e60eab39ea073e5ef4e30afc7e2 Mon Sep 17 00:00:00 2001 From: VB Date: Sun, 12 Feb 2017 11:41:56 +0100 Subject: [PATCH 003/426] =?UTF-8?q?respektowanie=20autorepetycji=20klawisz?= =?UTF-8?q?y,=20cmdline=20narazie=20tak=20jak=20by=C5=82o=20z=20WinMain?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EU07.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index fc980675..e0bba27b 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -36,8 +36,6 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #pragma comment (lib, "dbghelp.lib") #pragma comment (lib, "glfw3.lib") //static -#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") - TWorld World; #ifdef _WINDOWS @@ -116,7 +114,7 @@ void key_callback(GLFWwindow *window, int key, int scancode, int action, int mod Global::shiftState = (mods & GLFW_MOD_SHIFT) ? true : false; Global::ctrlState = (mods & GLFW_MOD_CONTROL) ? true : false; - if (action == GLFW_PRESS) + if (action == GLFW_PRESS || action == GLFW_REPEAT) { World.OnKeyDown(key); @@ -154,7 +152,7 @@ void focus_callback(GLFWwindow *window, int focus) Global::iPause |= 4; // włączenie pauzy, gdy nieaktywy } -int main(int argc, char argv[]) +int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) { #ifdef _WINDOWS ::SetUnhandledExceptionFilter(unhandled_handler); @@ -174,7 +172,7 @@ int main(int argc, char argv[]) SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN); } - std::string commandline(argv); + std::string commandline(lpCmdLine); if (!commandline.empty()) { cParser parser(commandline); From 67b20087b7114b49072e926f9445cf6207921c80 Mon Sep 17 00:00:00 2001 From: VB Date: Sun, 12 Feb 2017 14:02:26 +0100 Subject: [PATCH 004/426] fullscreen --- EU07.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/EU07.cpp b/EU07.cpp index e0bba27b..c192caf6 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -216,7 +216,25 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) int width = Global::iWindowWidth; int height = Global::iWindowHeight; - GLFWwindow *window = glfwCreateWindow(width, height, "EU07++", nullptr, nullptr); + GLFWwindow *window; + if (fullscreen) + { + // match requested video mode to current to allow for + // fullwindow creation when resolution is the same + + GLFWmonitor *monitor = glfwGetPrimaryMonitor(); + const GLFWvidmode *vmode = glfwGetVideoMode(monitor); + + glfwWindowHint(GLFW_RED_BITS, vmode->redBits); + glfwWindowHint(GLFW_GREEN_BITS, vmode->greenBits); + glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); + glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); + + window = glfwCreateWindow(width, height, "EU07++", monitor, nullptr); + } + else + window = glfwCreateWindow(width, height, "EU07++", nullptr, nullptr); + if (!window) return -1; glfwMakeContextCurrent(window); From 8cc249c05620f26e2a54b9fb59ba92892f335291 Mon Sep 17 00:00:00 2001 From: VB Date: Sun, 12 Feb 2017 16:50:32 +0100 Subject: [PATCH 005/426] multisampling --- EU07.cpp | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index c192caf6..d3638c9e 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -212,28 +212,21 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) while (!token.empty()); } - bool fullscreen = Global::bFullScreen; - int width = Global::iWindowWidth; - int height = Global::iWindowHeight; + glfwWindowHint(GL_SAMPLES, Global::iMultisampling); - GLFWwindow *window; - if (fullscreen) - { - // match requested video mode to current to allow for - // fullwindow creation when resolution is the same + // match requested video mode to current to allow for + // fullwindow creation when resolution is the same + GLFWmonitor *monitor = glfwGetPrimaryMonitor(); + const GLFWvidmode *vmode = glfwGetVideoMode(monitor); - GLFWmonitor *monitor = glfwGetPrimaryMonitor(); - const GLFWvidmode *vmode = glfwGetVideoMode(monitor); + glfwWindowHint(GLFW_RED_BITS, vmode->redBits); + glfwWindowHint(GLFW_GREEN_BITS, vmode->greenBits); + glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); + glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); - glfwWindowHint(GLFW_RED_BITS, vmode->redBits); - glfwWindowHint(GLFW_GREEN_BITS, vmode->greenBits); - glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); - glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); - - window = glfwCreateWindow(width, height, "EU07++", monitor, nullptr); - } - else - window = glfwCreateWindow(width, height, "EU07++", nullptr, nullptr); + GLFWwindow *window = + glfwCreateWindow(Global::iWindowWidth, Global::iWindowHeight, + "EU07++", Global::bFullScreen ? monitor : nullptr, nullptr); if (!window) return -1; From 3174af70d790e382a147c4eff1fc0249767930c5 Mon Sep 17 00:00:00 2001 From: VB Date: Sun, 12 Feb 2017 16:59:25 +0100 Subject: [PATCH 006/426] =?UTF-8?q?au=C4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EU07.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index d3638c9e..ca54dd43 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -238,8 +238,11 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) glfwSetCursorPosCallback(window, cursor_pos_callback); glfwSetKeyCallback(window, key_callback); glfwSetWindowFocusCallback(window, focus_callback); - glfwGetFramebufferSize(window, &width, &height); - window_resize_callback(window, width, height); + { + int width, height; + glfwGetFramebufferSize(window, &width, &height); + window_resize_callback(window, width, height); + } if (glewInit() != GLEW_OK) return -1; From 95e040f87411f58e599629d2157b8865db315a94 Mon Sep 17 00:00:00 2001 From: VB Date: Sun, 12 Feb 2017 17:08:42 +0100 Subject: [PATCH 007/426] =?UTF-8?q?au=C4=872?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EU07.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EU07.cpp b/EU07.cpp index ca54dd43..b93e1b6b 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -212,7 +212,7 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) while (!token.empty()); } - glfwWindowHint(GL_SAMPLES, Global::iMultisampling); + glfwWindowHint(GLFW_SAMPLES, Global::iMultisampling); // match requested video mode to current to allow for // fullwindow creation when resolution is the same From 92f39cd9b92c10fe9b4d4ed23f722285f41db0ef Mon Sep 17 00:00:00 2001 From: VB Date: Tue, 14 Feb 2017 19:13:48 +0100 Subject: [PATCH 008/426] =?UTF-8?q?tymczasowe=20przywr=C3=B3cenie=20tekstu?= =?UTF-8?q?,=20porz=C4=85dek,=20wywalenie=20starych=20plik=C3=B3w,=20warni?= =?UTF-8?q?ngi,=20cmake,=20itp.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + AnimModel.cpp | 8 +- CMakeLists.txt | 96 + CMake_modules/FindGLFW3.cmake | 75 + Console.cpp | 9 +- Console/LPT.cpp | 2 +- Console/MWD.cpp | 6 +- Console/PoKeys55.cpp | 1 - DirectX/DSOUND.LIB | Bin 1536 -> 0 bytes Dokumentacja zmiennych Python.docx | Bin 19876 -> 0 bytes Driver.cpp | 6 +- DynObj.cpp | 59 +- EU07.bpr | 144 - EU07.cpp | 147 +- EU07.res | Bin 3152 -> 0 bytes EvLaunch.cpp | 3 +- Event.cpp | 1 - Gauge.cpp | 2 +- Geom.cpp | 2 +- Globals.cpp | 16 +- Globals.h | 5 +- Ground.cpp | 101 +- Ground.h | 6 +- Logs.cpp | 6 +- McZapkie/Mover.cpp | 2 +- McZapkie/Mover.hpp | 906 -- McZapkie/Oerlikon_ESt.hpp | 293 - McZapkie/Oerlikon_ESt.pas | 805 -- McZapkie/Unit1.pas | 493 - McZapkie/_Mover.hpp | 903 -- McZapkie/_mover.pas | 7596 ---------- McZapkie/friction.hpp | 232 - McZapkie/friction.pas | 182 - McZapkie/hamulce.hpp | 881 -- McZapkie/hamulce.pas | 3200 ----- McZapkie/klasy_ham.pas | 69 - McZapkie/mctools.hpp | 95 - McZapkie/mctools.pas | 507 - McZapkie/mtable.hpp | 127 - McZapkie/mtable.pas | 530 - McZapkie/unit2.pas | 347 - Model3d.cpp | 51 +- Model3d.h | 19 +- PyInt.cpp | 2 +- QueryParserComp.pas | 733 - RealSound.cpp | 4 +- Segment.cpp | 5 +- Sound.cpp | 12 +- Texture.cpp | 2 +- Texture.h | 2 +- TextureDDS.cpp | 2 +- TextureDDS.h | 2 +- Track.cpp | 13 +- Track.h | 22 +- Traction.cpp | 124 +- Traction.h | 2 +- Train.cpp | 18 +- Train.h | 4 +- TrkFoll.cpp | 4 +- VBO.cpp | 2 +- World.cpp | 176 +- eu07.rc | 1 + geometry.h | 2 +- maszyna.rc | Bin 5814 -> 0 bytes maszyna.sln | 28 - maszyna.vcxproj | 281 - maszyna.vcxproj.filters | 374 - maszyna.vcxproj.user | 21 - mtable.cpp | 2 +- opengl/GLUT.H | 711 - opengl/glew.c | 12180 ---------------- opengl/glew.h | 20113 --------------------------- opengl/glew32.lib | Bin 631602 -> 0 bytes opengl/glew32s.lib | Bin 2141998 -> 0 bytes opengl/glext.h | 6495 --------- opengl/glut32.lib | Bin 13824 -> 0 bytes opengl/wglew.h | 1427 -- opengl/wglext.h | 929 -- parser.cpp | 4 +- parser.h | 2 +- python/include/Python-ast.h | 535 - python/include/Python.h | 178 - python/include/abstract.h | 1396 -- python/include/asdl.h | 45 - python/include/ast.h | 13 - python/include/bitset.h | 32 - python/include/boolobject.h | 36 - python/include/bufferobject.h | 33 - python/include/bytearrayobject.h | 57 - python/include/bytes_methods.h | 75 - python/include/bytesobject.h | 27 - python/include/cStringIO.h | 73 - python/include/cellobject.h | 28 - python/include/ceval.h | 153 - python/include/classobject.h | 83 - python/include/cobject.h | 89 - python/include/code.h | 107 - python/include/codecs.h | 167 - python/include/compile.h | 40 - python/include/complexobject.h | 66 - python/include/datetime.h | 239 - python/include/descrobject.h | 94 - python/include/dictobject.h | 156 - python/include/dtoa.h | 15 - python/include/enumobject.h | 17 - python/include/errcode.h | 36 - python/include/eval.h | 25 - python/include/fileobject.h | 97 - python/include/floatobject.h | 140 - python/include/frameobject.h | 89 - python/include/funcobject.h | 76 - python/include/genobject.h | 40 - python/include/graminit.h | 87 - python/include/grammar.h | 93 - python/include/import.h | 71 - python/include/intobject.h | 80 - python/include/intrcheck.h | 15 - python/include/iterobject.h | 23 - python/include/listobject.h | 68 - python/include/longintrepr.h | 103 - python/include/longobject.h | 134 - python/include/marshal.h | 25 - python/include/memoryobject.h | 74 - python/include/metagrammar.h | 18 - python/include/methodobject.h | 93 - python/include/modsupport.h | 134 - python/include/moduleobject.h | 24 - python/include/node.h | 40 - python/include/object.h | 996 -- python/include/objimpl.h | 354 - python/include/opcode.h | 162 - python/include/osdefs.h | 55 - python/include/parsetok.h | 64 - python/include/patchlevel.h | 43 - python/include/pgen.h | 18 - python/include/pgenheaders.h | 42 - python/include/py_curses.h | 176 - python/include/pyarena.h | 62 - python/include/pycapsule.h | 56 - python/include/pyconfig.h | 759 - python/include/pyctype.h | 31 - python/include/pydebug.h | 41 - python/include/pyerrors.h | 328 - python/include/pyexpat.h | 48 - python/include/pyfpe.h | 176 - python/include/pygetopt.h | 18 - python/include/pymacconfig.h | 102 - python/include/pymactoolbox.h | 217 - python/include/pymath.h | 192 - python/include/pymem.h | 122 - python/include/pyport.h | 904 -- python/include/pystate.h | 197 - python/include/pystrcmp.h | 23 - python/include/pystrtod.h | 45 - python/include/pythonrun.h | 181 - python/include/pythread.h | 41 - python/include/rangeobject.h | 28 - python/include/setobject.h | 99 - python/include/sliceobject.h | 44 - python/include/stringobject.h | 210 - python/include/structmember.h | 99 - python/include/structseq.h | 41 - python/include/symtable.h | 98 - python/include/sysmodule.h | 32 - python/include/timefuncs.h | 23 - python/include/token.h | 85 - python/include/traceback.h | 31 - python/include/tupleobject.h | 61 - python/include/ucnhash.h | 33 - python/include/unicodeobject.h | 1413 -- python/include/warnings.h | 23 - python/include/weakrefobject.h | 75 - python/libs/_bsddb.lib | Bin 1888 -> 0 bytes python/libs/_ctypes.lib | Bin 1714 -> 0 bytes python/libs/_ctypes_test.lib | Bin 21680 -> 0 bytes python/libs/_elementtree.lib | Bin 1878 -> 0 bytes python/libs/_hashlib.lib | Bin 1732 -> 0 bytes python/libs/_msi.lib | Bin 1664 -> 0 bytes python/libs/_multiprocessing.lib | Bin 1950 -> 0 bytes python/libs/_socket.lib | Bin 1920 -> 0 bytes python/libs/_sqlite3.lib | Bin 1732 -> 0 bytes python/libs/_ssl.lib | Bin 1664 -> 0 bytes python/libs/_testcapi.lib | Bin 1748 -> 0 bytes python/libs/_tkinter.lib | Bin 1732 -> 0 bytes python/libs/bz2.lib | Bin 1646 -> 0 bytes python/libs/omf_python27.lib | Bin 103936 -> 0 bytes python/libs/pyexpat.lib | Bin 1714 -> 0 bytes python/libs/python27.lib | Bin 231346 -> 0 bytes python/libs/select.lib | Bin 1698 -> 0 bytes python/libs/unicodedata.lib | Bin 1782 -> 0 bytes python/libs/winsound.lib | Bin 1732 -> 0 bytes python_var_doc.md | 17 + stdafx.h | 5 +- windows.cpp | 46 + 194 files changed, 612 insertions(+), 74277 deletions(-) create mode 100644 CMakeLists.txt create mode 100644 CMake_modules/FindGLFW3.cmake delete mode 100644 DirectX/DSOUND.LIB delete mode 100644 Dokumentacja zmiennych Python.docx delete mode 100644 EU07.bpr delete mode 100644 EU07.res delete mode 100644 McZapkie/Mover.hpp delete mode 100644 McZapkie/Oerlikon_ESt.hpp delete mode 100644 McZapkie/Oerlikon_ESt.pas delete mode 100644 McZapkie/Unit1.pas delete mode 100644 McZapkie/_Mover.hpp delete mode 100644 McZapkie/_mover.pas delete mode 100644 McZapkie/friction.hpp delete mode 100644 McZapkie/friction.pas delete mode 100644 McZapkie/hamulce.hpp delete mode 100644 McZapkie/hamulce.pas delete mode 100644 McZapkie/klasy_ham.pas delete mode 100644 McZapkie/mctools.hpp delete mode 100644 McZapkie/mctools.pas delete mode 100644 McZapkie/mtable.hpp delete mode 100644 McZapkie/mtable.pas delete mode 100644 McZapkie/unit2.pas delete mode 100644 QueryParserComp.pas create mode 100644 eu07.rc delete mode 100644 maszyna.rc delete mode 100644 maszyna.sln delete mode 100644 maszyna.vcxproj delete mode 100644 maszyna.vcxproj.filters delete mode 100644 maszyna.vcxproj.user delete mode 100644 opengl/GLUT.H delete mode 100644 opengl/glew.c delete mode 100644 opengl/glew.h delete mode 100644 opengl/glew32.lib delete mode 100644 opengl/glew32s.lib delete mode 100644 opengl/glext.h delete mode 100644 opengl/glut32.lib delete mode 100644 opengl/wglew.h delete mode 100644 opengl/wglext.h delete mode 100644 python/include/Python-ast.h delete mode 100644 python/include/Python.h delete mode 100644 python/include/abstract.h delete mode 100644 python/include/asdl.h delete mode 100644 python/include/ast.h delete mode 100644 python/include/bitset.h delete mode 100644 python/include/boolobject.h delete mode 100644 python/include/bufferobject.h delete mode 100644 python/include/bytearrayobject.h delete mode 100644 python/include/bytes_methods.h delete mode 100644 python/include/bytesobject.h delete mode 100644 python/include/cStringIO.h delete mode 100644 python/include/cellobject.h delete mode 100644 python/include/ceval.h delete mode 100644 python/include/classobject.h delete mode 100644 python/include/cobject.h delete mode 100644 python/include/code.h delete mode 100644 python/include/codecs.h delete mode 100644 python/include/compile.h delete mode 100644 python/include/complexobject.h delete mode 100644 python/include/datetime.h delete mode 100644 python/include/descrobject.h delete mode 100644 python/include/dictobject.h delete mode 100644 python/include/dtoa.h delete mode 100644 python/include/enumobject.h delete mode 100644 python/include/errcode.h delete mode 100644 python/include/eval.h delete mode 100644 python/include/fileobject.h delete mode 100644 python/include/floatobject.h delete mode 100644 python/include/frameobject.h delete mode 100644 python/include/funcobject.h delete mode 100644 python/include/genobject.h delete mode 100644 python/include/graminit.h delete mode 100644 python/include/grammar.h delete mode 100644 python/include/import.h delete mode 100644 python/include/intobject.h delete mode 100644 python/include/intrcheck.h delete mode 100644 python/include/iterobject.h delete mode 100644 python/include/listobject.h delete mode 100644 python/include/longintrepr.h delete mode 100644 python/include/longobject.h delete mode 100644 python/include/marshal.h delete mode 100644 python/include/memoryobject.h delete mode 100644 python/include/metagrammar.h delete mode 100644 python/include/methodobject.h delete mode 100644 python/include/modsupport.h delete mode 100644 python/include/moduleobject.h delete mode 100644 python/include/node.h delete mode 100644 python/include/object.h delete mode 100644 python/include/objimpl.h delete mode 100644 python/include/opcode.h delete mode 100644 python/include/osdefs.h delete mode 100644 python/include/parsetok.h delete mode 100644 python/include/patchlevel.h delete mode 100644 python/include/pgen.h delete mode 100644 python/include/pgenheaders.h delete mode 100644 python/include/py_curses.h delete mode 100644 python/include/pyarena.h delete mode 100644 python/include/pycapsule.h delete mode 100644 python/include/pyconfig.h delete mode 100644 python/include/pyctype.h delete mode 100644 python/include/pydebug.h delete mode 100644 python/include/pyerrors.h delete mode 100644 python/include/pyexpat.h delete mode 100644 python/include/pyfpe.h delete mode 100644 python/include/pygetopt.h delete mode 100644 python/include/pymacconfig.h delete mode 100644 python/include/pymactoolbox.h delete mode 100644 python/include/pymath.h delete mode 100644 python/include/pymem.h delete mode 100644 python/include/pyport.h delete mode 100644 python/include/pystate.h delete mode 100644 python/include/pystrcmp.h delete mode 100644 python/include/pystrtod.h delete mode 100644 python/include/pythonrun.h delete mode 100644 python/include/pythread.h delete mode 100644 python/include/rangeobject.h delete mode 100644 python/include/setobject.h delete mode 100644 python/include/sliceobject.h delete mode 100644 python/include/stringobject.h delete mode 100644 python/include/structmember.h delete mode 100644 python/include/structseq.h delete mode 100644 python/include/symtable.h delete mode 100644 python/include/sysmodule.h delete mode 100644 python/include/timefuncs.h delete mode 100644 python/include/token.h delete mode 100644 python/include/traceback.h delete mode 100644 python/include/tupleobject.h delete mode 100644 python/include/ucnhash.h delete mode 100644 python/include/unicodeobject.h delete mode 100644 python/include/warnings.h delete mode 100644 python/include/weakrefobject.h delete mode 100644 python/libs/_bsddb.lib delete mode 100644 python/libs/_ctypes.lib delete mode 100644 python/libs/_ctypes_test.lib delete mode 100644 python/libs/_elementtree.lib delete mode 100644 python/libs/_hashlib.lib delete mode 100644 python/libs/_msi.lib delete mode 100644 python/libs/_multiprocessing.lib delete mode 100644 python/libs/_socket.lib delete mode 100644 python/libs/_sqlite3.lib delete mode 100644 python/libs/_ssl.lib delete mode 100644 python/libs/_testcapi.lib delete mode 100644 python/libs/_tkinter.lib delete mode 100644 python/libs/bz2.lib delete mode 100644 python/libs/omf_python27.lib delete mode 100644 python/libs/pyexpat.lib delete mode 100644 python/libs/python27.lib delete mode 100644 python/libs/select.lib delete mode 100644 python/libs/unicodedata.lib delete mode 100644 python/libs/winsound.lib create mode 100644 python_var_doc.md create mode 100644 windows.cpp diff --git a/.gitignore b/.gitignore index 5fe4d243..b18c7752 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ tmp/ bin/ ipch/ *.aps + +builds/ \ No newline at end of file diff --git a/AnimModel.cpp b/AnimModel.cpp index 54e0d2b6..b2235e12 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -423,9 +423,9 @@ TAnimModel::TAnimModel() } vAngle.x = vAngle.y = vAngle.z = 0.0; // zerowanie obrotów egzemplarza pAdvanced = NULL; // nie ma zaawansowanej animacji - fDark = 0.25; // standardowy próg zaplania - fOnTime = 0.66; - fOffTime = fOnTime + 0.66; + fDark = 0.25f; // standardowy próg zaplania + fOnTime = 0.66f; + fOffTime = fOnTime + 0.66f; } TAnimModel::~TAnimModel() @@ -583,7 +583,7 @@ void TAnimModel::RaPrepare() if (LightsOff[i]) LightsOff[i]->iVisible = !state; } - TSubModel::iInstance = (int)this; //żeby nie robić cudzych animacji + TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji TSubModel::pasText = &asText; // przekazanie tekstu do wyświetlacza (!!!! do przemyślenia) if (pAdvanced) // jeśli jest zaawansowana animacja Advanced(); // wykonać co tam trzeba diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..3dda5e50 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,96 @@ +cmake_minimum_required(VERSION 3.0) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake_modules/") +project("eu07++ng") + +include_directories("." "Console" "McZapkie") +file(GLOB HEADERS "*.h" "Console/*.h" "McZapkie/*.h") + +set(SOURCES +"Texture.cpp" +"TextureDDS.cpp" +"Timer.cpp" +"Track.cpp" +"Traction.cpp" +"TractionPower.cpp" +"Train.cpp" +"TrkFoll.cpp" +"VBO.cpp" +"wavread.cpp" +"World.cpp" +"AdvSound.cpp" +"AirCoupler.cpp" +"AnimModel.cpp" +"Button.cpp" +"Camera.cpp" +"Console.cpp" +"console/LPT.cpp" +"Console/MWD.cpp" +"console/PoKeys55.cpp" +"Driver.cpp" +"dumb3d.cpp" +"DynObj.cpp" +"EU07.cpp" +"Event.cpp" +"EvLaunch.cpp" +"FadeSound.cpp" +"Float3d.cpp" +"Gauge.cpp" +"Globals.cpp" +"Ground.cpp" +"Logs.cpp" +"mczapkie/friction.cpp" +"mczapkie/hamulce.cpp" +"mczapkie/mctools.cpp" +"mczapkie/Mover.cpp" +"mczapkie/Oerlikon_ESt.cpp" +"MdlMngr.cpp" +"MemCell.cpp" +"Model3d.cpp" +"mtable.cpp" +"parser.cpp" +"PyInt.cpp" +"RealSound.cpp" +"ResourceManager.cpp" +"Segment.cpp" +"sky.cpp" +"Sound.cpp" +"Spring.cpp" +) + +if (WIN32) + add_definitions(-DHAVE_ROUND) # to make pymath to not redefine round + set(SOURCES ${SOURCES} "windows.cpp") +endif() + +if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) + set(SOURCES ${SOURCES} "eu07.rc") + set(SOURCES ${SOURCES} "eu07.ico") +endif() + +add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS}) + +if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC) + # /wd4996: disable "deprecation" warnings + # /wd4244: disable warnings for conversion with possible loss of data + set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/wd4996 /wd4244") +endif() + +find_package(OpenGL REQUIRED) +include_directories(${OPENGL_INCLUDE_DIR}) +target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES}) + +find_package(GLEW REQUIRED) +include_directories(${GLEW_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} ${GLEW_LIBRARIES}) + +find_package(GLFW3 REQUIRED) +include_directories(${GLFW3_INCLUDE_DIR}) +target_link_libraries(${PROJECT_NAME} ${GLFW3_LIBRARIES}) + +find_package(GLUT REQUIRED) +include_directories(${GLUT_INCLUDE_DIR}) +target_link_libraries(${PROJECT_NAME} ${GLUT_LIBRARIES}) + +find_package(PythonLibs 2 REQUIRED) +include_directories(${PYTHON_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES}) \ No newline at end of file diff --git a/CMake_modules/FindGLFW3.cmake b/CMake_modules/FindGLFW3.cmake new file mode 100644 index 00000000..a92f95a8 --- /dev/null +++ b/CMake_modules/FindGLFW3.cmake @@ -0,0 +1,75 @@ +# - Try to find GLFW3 +# +# If no pkgconfig, define GLFW_ROOT to installation tree +# Will define the following: +# GLFW3_FOUND +# GLFW3_INCLUDE_DIR +# GLFW3_LIBRARIES + +IF(PKG_CONFIG_FOUND) + IF(APPLE) + # homebrew or macports pkgconfig locations + SET(ENV{PKG_CONFIG_PATH} "/usr/local/opt/glfw3/lib/pkgconfig:/opt/local/lib/pkgconfig") + ENDIF() + SET(ENV{PKG_CONFIG_PATH} "${DEPENDS_DIR}/glfw/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}") + PKG_CHECK_MODULES(GLFW3 glfw3) + + FIND_LIBRARY(GLFW3_LIBRARY + NAMES ${GLFW3_LIBRARIES} + HINTS ${GLFW3_LIBRARY_DIR} + ) + SET(GLFW3_LIBRARIES ${GLFW3_LIBRARY}) + + RETURN() +ENDIF() + +FIND_PATH(GLFW3_INCLUDE_DIR + GLFW/glfw3.h + DOC "GLFW include directory " + PATHS + "${DEPENDS_DIR}/glfw" + "$ENV{ProgramW6432}/glfw" + ${GLFW3_ROOT_PATH} + PATH_SUFFIXES + include +) + +# directories in the official binary package +IF(MINGW) + SET(_SUFFIX lib-mingw) +ELSEIF(MSVC11) + SET(_SUFFIX lib-vc2012) +ELSEIF(MSVC12) + SET(_SUFFIX lib-vc2013) +ELSEIF(MSVC14) + SET(_SUFFIX lib-vc2015) +ELSEIF(MSVC) + SET(_SUFFIX lib-vc2012) +ENDIF() + +FIND_LIBRARY(GLFW3_LIBRARIES + NAMES glfw3dll glfw3 + PATHS + "${DEPENDS_DIR}/glfw" + "$ENV{ProgramW6432}/glfw" + ${GLFW3_ROOT_PATH} + PATH_SUFFIXES + lib + ${_SUFFIX} +) + +IF(WIN32) +FIND_FILE(GLFW3_DLL + glfw3.dll + PATHS + "${DEPENDS_DIR}/glfw" + "$ENV{ProgramW6432}/glfw" + ${GLFW3_ROOT_PATH} + PATH_SUFFIXES + ${_SUFFIX} +) +ENDIF() + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLFW3 FOUND_VAR GLFW3_FOUND + REQUIRED_VARS GLFW3_LIBRARIES GLFW3_INCLUDE_DIR) diff --git a/Console.cpp b/Console.cpp index 3ca23127..5f2ceb85 100644 --- a/Console.cpp +++ b/Console.cpp @@ -83,7 +83,7 @@ public static Int32 GetScreenSaverTimeout() TKeyTrans Console::ktTable[4 * 256]; // Ra: do poprawienia -void SetLedState(char Code, bool bOn){ +void SetLedState(unsigned char Code, bool bOn){ // Ra: bajer do migania LED-ami w klawiaturze // NOTE: disabled for the time being // TODO: find non Borland specific equivalent, or get rid of it @@ -239,7 +239,7 @@ void Console::BitsUpdate(int mask) { case 1: // sterowanie światełkami klawiatury: CA/SHP+opory if (mask & 3) // gdy SHP albo CA - SetLedState(VK_CAPITAL, iBits & 3); + SetLedState(VK_CAPITAL, (iBits & 3) != 0); if (mask & 4) // gdy jazda na oporach { // Scroll Lock ma jakoś dziwnie... zmiana stanu na przeciwny SetLedState(VK_SCROLL, true); // przyciśnięty @@ -249,7 +249,7 @@ void Console::BitsUpdate(int mask) break; case 2: // sterowanie światełkami klawiatury: CA+SHP if (mask & 2) // gdy CA - SetLedState(VK_CAPITAL, iBits & 2); + SetLedState(VK_CAPITAL, (iBits & 2) != 0); if (mask & 1) // gdy SHP { // Scroll Lock ma jakoś dziwnie... zmiana stanu na przeciwny SetLedState(VK_SCROLL, true); // przyciśnięty @@ -398,9 +398,6 @@ void Console::BitsUpdate(int mask) bool Console::Pressed(int x) { // na razie tak - czyta się tylko klawiatura - if (!Global::bActive) - return false; - if (glfwGetKey(Global::window, x) == GLFW_TRUE) return true; else diff --git a/Console/LPT.cpp b/Console/LPT.cpp index 2c22fa7c..3f6b2752 100644 --- a/Console/LPT.cpp +++ b/Console/LPT.cpp @@ -45,7 +45,7 @@ bool TLPT::Connect(int port) case 0xBD00: OutPort(address + 0x006, 0); // 0xBC06? czysta improwizacja } - return bool(OutPort); + return OutPort != 0; }; void TLPT::Out(int x) diff --git a/Console/MWD.cpp b/Console/MWD.cpp index c400abc7..42cb4efc 100644 --- a/Console/MWD.cpp +++ b/Console/MWD.cpp @@ -171,7 +171,6 @@ bool MWDComm::ReadData() // odbieranie danych + odczyta danych analogowych i zap bool MWDComm::SendData() // wysyłanie danych { DWORD bytes_write; - DWORD fdwEvtMask; WriteFile(hComm, &WriteDataBuff[0], BYTETOWRITE, &bytes_write, NULL); @@ -188,16 +187,17 @@ bool MWDComm::Run() // wywoływanie obsługi MWD + generacja większego opóźni SendData(); if (Global::bMWDInputDataEnable) ReadData(); - return 1; + return true; } else { WriteLog("Port COM: connection ERROR!"); // może spróbować się połączyć znowu? - return 0; + return false; } MWDTime = 0; } + return false; } void MWDComm::CheckData() // sprawdzanie wejść cyfrowych i odpowiednie sterowanie maszyną diff --git a/Console/PoKeys55.cpp b/Console/PoKeys55.cpp index d642b3fb..8fbb4dbd 100644 --- a/Console/PoKeys55.cpp +++ b/Console/PoKeys55.cpp @@ -70,7 +70,6 @@ bool TPoKeys55::Connect() PBYTE PropertyValueBuffer; bool MatchFound; DWORD ErrorStatus; - HDEVINFO hDevInfo; std::string DeviceIDFromRegistry; std::string DeviceIDToFind = "Vid_1dc3&Pid_1001&Rev_1000&MI_01"; // First populate a list of plugged in devices (by specifying "DIGCF_PRESENT"), which are of the diff --git a/DirectX/DSOUND.LIB b/DirectX/DSOUND.LIB deleted file mode 100644 index 6bae0a24fc001692ebfe8aab1efadd286149a089..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmeys%fP_Gz`)1=0sk7L7$jUWi&B$Ig7ZuBQk)YDN=l1Tor_WvOHvPYXfrS@U}VIp zfXgM=Kh)1fFC{03jp0BC8w0~{W(J0mE+!xWwV*+cK?c)&*Syl))FPl2j_MuyU_0V_>?uqc zB$F8#mP1TtW++6M+#t>%iew%lpg21;z-D5XMKYI(fg55j3qt|ITzL54FhBe=KJ$@7 zgqh(B#C%qUd@SY*GVr_Pt-Qc;y}08E_X>!14?|d8r|JY?KKL F0RYk&9bEtb diff --git a/Dokumentacja zmiennych Python.docx b/Dokumentacja zmiennych Python.docx deleted file mode 100644 index f421014b541c0ad11f6369681f4c428a33d56795..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19876 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 diff --git a/Driver.cpp b/Driver.cpp index 57ec94a6..d75b747d 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -260,8 +260,8 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) } if (iFlags & spSwitch) // jeśli odcinek zmienny { - if (bool(trTrack->GetSwitchState() & 1) != - bool(iFlags & spSwitchStatus)) // czy stan się zmienił? + if (((trTrack->GetSwitchState() & 1) != 0) != + ((iFlags & spSwitchStatus) != 0)) // czy stan się zmienił? { // Ra: zakładam, że są tylko 2 możliwe stany iFlags ^= spSwitchStatus; // fVelNext=trTrack->VelocityGet(); //nowa prędkość @@ -389,7 +389,7 @@ void TSpeedPos::Set(TTrack *track, double dist, int flag) fVelNext = (trTrack->iCategoryFlag & 1) ? 0.0 : 20.0; // jeśli koniec, to pociąg stój, a samochód zwolnij - vPos = (bool(iFlags & spReverse) != bool(iFlags & spEnd)) ? + vPos = (((iFlags & spReverse) != 0) != ((iFlags & spEnd) != 0)) ? trTrack->CurrentSegment()->FastGetPoint_1() : trTrack->CurrentSegment()->FastGetPoint_0(); } diff --git a/DynObj.cpp b/DynObj.cpp index 7c4618e0..033097a5 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -43,7 +43,7 @@ http://mozilla.org/MPL/2.0/. // vector3 vWorldLeft=CrossProduct(vWorldUp,vWorldFront); #define M_2PI 6.283185307179586476925286766559; -const float maxrot = (M_PI / 3.0); // 60° +const float maxrot = (float)(M_PI / 3.0); // 60° //--------------------------------------------------------------------------- void TAnimPant::AKP_4E() @@ -65,13 +65,13 @@ void TAnimPant::AKP_4E() PantWys = fLenL1 * sin(fAngleL) + fLenU1 * sin(fAngleU) + fHeight; // wysokość początkowa PantTraction = PantWys; hvPowerWire = NULL; - fWidthExtra = 0.381; //(2.032m-1.027)/2 + fWidthExtra = 0.381f; //(2.032m-1.027)/2 // poza obszarem roboczym jest aproksymacja łamaną o 5 odcinkach - fHeightExtra[0] = 0.0; //+0.0762 - fHeightExtra[1] = -0.01; //+0.1524 - fHeightExtra[2] = -0.03; //+0.2286 - fHeightExtra[3] = -0.07; //+0.3048 - fHeightExtra[4] = -0.15; //+0.3810 + fHeightExtra[0] = 0.0f; //+0.0762 + fHeightExtra[1] = -0.01f; //+0.1524 + fHeightExtra[2] = -0.03f; //+0.2286 + fHeightExtra[3] = -0.07f; //+0.3048 + fHeightExtra[4] = -0.15f; //+0.3810 }; //--------------------------------------------------------------------------- int TAnim::TypeSet(int i, int fl) @@ -1168,7 +1168,6 @@ TDynamicObject * TDynamicObject::ABuFindObject(TTrack *Track, int ScanDir, if( false == Track->Dynamics.empty() ) #endif { // sens szukania na tym torze jest tylko, gdy są na nim pojazdy - double ObjTranslation; // pozycja najblizszego obiektu na torze double MyTranslation; // pozycja szukającego na torze double MinDist = Track->Length(); // najmniejsza znaleziona odleglość // (zaczynamy od długości toru) @@ -1888,11 +1887,11 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // dodatkowe parametry yB MoreParams += "."; // wykonuje o jedną iterację za mało, więc trzeba mu dodać // kropkę na koniec - int kropka = MoreParams.find("."); // znajdź kropke + size_t kropka = MoreParams.find("."); // znajdź kropke std::string ActPar; // na parametry while (kropka != std::string::npos) // jesli sa kropki jeszcze { - int dlugosc = MoreParams.length(); + size_t dlugosc = MoreParams.length(); ActPar = ToUpper(MoreParams.substr(0, kropka)); // pierwszy parametr; MoreParams = MoreParams.substr(kropka + 1, dlugosc - kropka); // reszta do dalszej // obrobki @@ -2153,8 +2152,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" iNumAxles = 2; // McZapkie-090402: odleglosc miedzy czopami skretu lub osiami fAxleDist = Max0R(MoverParameters->BDist, MoverParameters->ADist); - if (fAxleDist < 0.2) - fAxleDist = 0.2; //żeby się dało wektory policzyć + if (fAxleDist < 0.2f) + fAxleDist = 0.2f; //żeby się dało wektory policzyć if (fAxleDist > MoverParameters->Dim.L - 0.2) // nie mogą być za daleko fAxleDist = MoverParameters->Dim.L - 0.2; // bo będzie "walenie w mur" double fAxleDistHalf = fAxleDist * 0.5; @@ -2264,18 +2263,18 @@ void TDynamicObject::Move(double fDistance) } if (fDistance > 0.0) { // gdy ruch w stronę sprzęgu 0, doliczyć korektę do osi 1 - bEnabled &= Axle0.Move(fDistance, !iAxleFirst); // oś z przodu pojazdu - bEnabled &= Axle1.Move(fDistance /*-fAdjustment*/, iAxleFirst); // oś z tyłu pojazdu + bEnabled &= Axle0.Move(fDistance, iAxleFirst == 0); // oś z przodu pojazdu + bEnabled &= Axle1.Move(fDistance /*-fAdjustment*/, iAxleFirst != 0); // oś z tyłu pojazdu } else if (fDistance < 0.0) { // gdy ruch w stronę sprzęgu 1, doliczyć korektę do osi 0 - bEnabled &= Axle1.Move(fDistance, iAxleFirst); // oś z tyłu pojazdu prusza się pierwsza - bEnabled &= Axle0.Move(fDistance /*-fAdjustment*/, !iAxleFirst); // oś z przodu pojazdu + bEnabled &= Axle1.Move(fDistance, iAxleFirst != 0); // oś z tyłu pojazdu prusza się pierwsza + bEnabled &= Axle0.Move(fDistance /*-fAdjustment*/, iAxleFirst == 0); // oś z przodu pojazdu } else // gf: bez wywolania Move na postoju nie ma event0 { - bEnabled &= Axle1.Move(fDistance, iAxleFirst); // oś z tyłu pojazdu prusza się pierwsza - bEnabled &= Axle0.Move(fDistance, !iAxleFirst); // oś z przodu pojazdu + bEnabled &= Axle1.Move(fDistance, iAxleFirst != 0); // oś z tyłu pojazdu prusza się pierwsza + bEnabled &= Axle0.Move(fDistance, iAxleFirst == 0); // oś z przodu pojazdu } if (fDistance != 0.0) // nie liczyć ponownie, jeśli stoi { // liczenie pozycji pojazdu tutaj, bo jest używane w wielu miejscach @@ -2353,10 +2352,10 @@ void TDynamicObject::Move(double fDistance) switch (t0->eEnvironment) { // typ zmiany oświetlenia case e_canyon: - fShade = 0.65; + fShade = 0.65f; break; // zacienienie w kanionie case e_tunnel: - fShade = 0.20; + fShade = 0.20f; break; // zacienienie w tunelu } } @@ -3112,7 +3111,6 @@ bool TDynamicObject::Update(double dt, double dt1) ResetdMoveLen(); // McZapkie-260202 // tupot mew, tfu, stukot kol: - DWORD stat; // taka prowizorka zeby sciszyc stukot dalekiej lokomotywy double ObjectDist; double vol = 0; @@ -3731,7 +3729,7 @@ void TDynamicObject::Render() if (renderme) { - TSubModel::iInstance = (int)this; //żeby nie robić cudzych animacji + TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji // AnsiString asLoadName=""; double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition); ABuLittleUpdate(ObjSqrDist); // ustawianie zmiennych submodeli dla wspólnego modelu @@ -3835,8 +3833,8 @@ void TDynamicObject::Render() { for (int li = 0; li < 3; li++) { - diffuseCabLight[li] *= 0.6; - specularCabLight[li] *= 0.7; + diffuseCabLight[li] *= 0.6f; + specularCabLight[li] *= 0.7f; } } break; @@ -3844,9 +3842,9 @@ void TDynamicObject::Render() { for (int li = 0; li < 3; li++) { - ambientCabLight[li] *= 0.3; - diffuseCabLight[li] *= 0.1; - specularCabLight[li] *= 0.2; + ambientCabLight[li] *= 0.3f; + diffuseCabLight[li] *= 0.1f; + specularCabLight[li] *= 0.2f; } } break; @@ -4240,7 +4238,7 @@ void TDynamicObject::RenderAlpha() { // rysowanie elementów półprzezroczystych if (renderme) { - TSubModel::iInstance = (int)this; //żeby nie robić cudzych animacji + TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition); ABuLittleUpdate(ObjSqrDist); // ustawianie zmiennych submodeli dla wspólnego modelu glPushMatrix(); @@ -4689,7 +4687,8 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, else if (token == "animwheelprefix:") { // prefiks kręcących się kół - int i, j, k, m; + int i, k, m; + unsigned int j; parser.getTokens( 1, false ); parser >> token; for (i = 0; i < iAnimType[ANIM_WHEELS]; ++i) // liczba osi { // McZapkie-050402: wyszukiwanie kol o nazwie str* @@ -5073,7 +5072,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, else if( token == "animdoorprefix:" ) { // nazwa animowanych drzwi - int i, j, k, m; + int i, j; parser.getTokens(1, false); parser >> token; for (i = 0, j = 0; i < ANIM_DOORS; ++i) j += iAnimType[i]; // zliczanie wcześniejszych animacji diff --git a/EU07.bpr b/EU07.bpr deleted file mode 100644 index 74206a6d..00000000 --- a/EU07.bpr +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[Version Info] -IncludeVerInfo=1 -AutoIncBuild=0 -MajorVer=16 -MinorVer=1 -Release=1174 -Build=483 -Debug=1 -PreRelease=0 -Special=0 -Private=0 -DLL=0 -Locale=1045 -CodePage=1250 - -[Version Info Keys] -CompanyName=EU07 Team -FileDescription=MaSzyna EU07-424 -FileVersion=16.1.1174.483 -InternalName=DP+SPKS+asynch+python -LegalCopyright= -LegalTrademarks= -OriginalFilename=eu07.exe -ProductName=MaSzyna EU07-424 -ProductVersion=16.1 -Comments= - -[Excluded Packages] -$(BCB)\Bin\bcbsmp50.bpl=Borland C++ Sample Components -$(BCB)\Bin\dclqrt50.bpl=QuickReport Components -C:\Windows\system32\ibsmp50.bpl=Borland C++ InterBase Alerter Component -$(BCB)\Bin\dcltee50.bpl=TeeChart 5.0 Components -$(BCB)\Bin\applet50.bpl=Borland Control Panel Applet Package - -[HistoryLists\hlIncludePath] -Count=2 -Item0=Console;opengl;McZapkie;$(BCB)\include;$(BCB)\include\vcl;python\include -Item1=Console;opengl;McZapkie;$(BCB)\include;$(BCB)\include\vcl - -[HistoryLists\hlLibraryPath] -Count=2 -Item0=Console;opengl;McZapkie;$(BCB)\lib\obj;$(BCB)\lib;python\libs -Item1=Console;opengl;McZapkie;$(BCB)\lib\obj;$(BCB)\lib - -[HistoryLists\hlDebugSourcePath] -Count=2 -Item0=McZapkie\ -Item1=$(BCB)\source\vcl - -[HistoryLists\hlConditionals] -Count=8 -Item0=GLEW_STATIC;_DEBUG -Item1=GLEW_STATIC -Item2=GLEW_STATIC;_DEBUG;USE_VBO -Item3=GLEW_STATIC;_DEBUG;_USE_OLD_RW_STL -Item4=GLEW_STATIC;USE_VERTEX_ARRAYS;_DEBUG -Item5=GLEW_STATIC;USE_VERTEX_ARRAYS -Item6=GLEW_STATIC;_DEBUG;USE_VERTEX_ARRAYS -Item7=_DEBUG - -[HistoryLists\hlFinalOutputDir] -Count=5 -Item0=E:\Gry\MaSzyna_15_04\ -Item1=D:\Maszyna -Item2=E:\Gry\MaSzyna_15_04 -Item3=D:\EU07\ -Item4=E:\EU07\ - -[Debugging] -DebugSourceDirs=McZapkie\ - -[Parameters] -RunParams=-s td.scn -v EP07-424 -HostApplication= -RemoteHost= -RemotePath= -RemoteDebug=0 - -[Compiler] -ShowInfoMsgs=0 -LinkDebugVcl=0 -LinkCGLIB=0 - -[Language] -ActiveLang= -ProjectLang= -RootDir= - - \ No newline at end of file diff --git a/EU07.cpp b/EU07.cpp index b93e1b6b..4f20bff9 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -26,67 +26,14 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "World.h" #include "Mover.h" -#pragma comment (lib, "glew32.lib") #pragma comment (lib, "glu32.lib") -#pragma comment (lib, "opengl32.lib") #pragma comment (lib, "dsound.lib") #pragma comment (lib, "winmm.lib") #pragma comment (lib, "setupapi.lib") -#pragma comment (lib, "python27.lib") #pragma comment (lib, "dbghelp.lib") -#pragma comment (lib, "glfw3.lib") //static TWorld World; -#ifdef _WINDOWS -void make_minidump( ::EXCEPTION_POINTERS* e ) { - - auto hDbgHelp = ::LoadLibraryA( "dbghelp" ); - if( hDbgHelp == nullptr ) - return; - auto pMiniDumpWriteDump = (decltype( &MiniDumpWriteDump ))::GetProcAddress( hDbgHelp, "MiniDumpWriteDump" ); - if( pMiniDumpWriteDump == nullptr ) - return; - - char name[ MAX_PATH ]; - { - auto nameEnd = name + ::GetModuleFileNameA( ::GetModuleHandleA( 0 ), name, MAX_PATH ); - ::SYSTEMTIME t; - ::GetSystemTime( &t ); - wsprintfA( nameEnd - strlen( ".exe" ), - "_crashdump_%4d%02d%02d_%02d%02d%02d.dmp", - t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond ); - } - - auto hFile = ::CreateFileA( name, GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0 ); - if( hFile == INVALID_HANDLE_VALUE ) - return; - - ::MINIDUMP_EXCEPTION_INFORMATION exceptionInfo; - exceptionInfo.ThreadId = ::GetCurrentThreadId(); - exceptionInfo.ExceptionPointers = e; - exceptionInfo.ClientPointers = FALSE; - - auto dumped = pMiniDumpWriteDump( - ::GetCurrentProcess(), - ::GetCurrentProcessId(), - hFile, - ::MINIDUMP_TYPE( ::MiniDumpWithIndirectlyReferencedMemory | ::MiniDumpScanMemory ), - e ? &exceptionInfo : nullptr, - nullptr, - nullptr ); - - ::CloseHandle( hFile ); - - return; -} - -LONG CALLBACK unhandled_handler( ::EXCEPTION_POINTERS* e ) { - make_minidump( e ); - return EXCEPTION_CONTINUE_SEARCH; -} -#endif - void window_resize_callback(GLFWwindow *window, int w, int h) { glViewport(0, 0, w, h); // Reset The Current Viewport @@ -100,17 +47,12 @@ void window_resize_callback(GLFWwindow *window, int w, int h) void cursor_pos_callback(GLFWwindow *window, double x, double y) { - if (Global::bActive) - World.OnMouseMove(x * 0.005, y * 0.01); + World.OnMouseMove(x * 0.005, y * 0.01); glfwSetCursorPos(window, 0.0, 0.0); } void key_callback(GLFWwindow *window, int key, int scancode, int action, int mods) { - //m7todo: bActive teraz pewnie nie potrzebne - if (!Global::bActive) - return; - Global::shiftState = (mods & GLFW_MOD_SHIFT) ? true : false; Global::ctrlState = (mods & GLFW_MOD_CONTROL) ? true : false; @@ -144,15 +86,18 @@ void key_callback(GLFWwindow *window, int key, int scancode, int action, int mod void focus_callback(GLFWwindow *window, int focus) { - Global::bActive = (focus == GLFW_TRUE ? 1 : 0); if (Global::bInactivePause) // jeśli ma być pauzowanie okna w tle - if (Global::bActive) + if (focus) Global::iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie else Global::iPause |= 4; // włączenie pauzy, gdy nieaktywy } -int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) +#ifdef _WINDOWS +LONG CALLBACK unhandled_handler(::EXCEPTION_POINTERS* e); +#endif + +int main(int argc, char *argv[]) { #ifdef _WINDOWS ::SetUnhandledExceptionFilter(unhandled_handler); @@ -161,9 +106,9 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) if (!glfwInit()) return -1; - DeleteFile("errors.txt"); // usunięcie starego - Global::LoadIniFile("eu07.ini"); // teraz dopiero można przejrzeć plik z ustawieniami - Global::InitKeys("keys.ini"); // wczytanie mapowania klawiszy - jest na stałe + DeleteFile("errors.txt"); + Global::LoadIniFile("eu07.ini"); + Global::InitKeys(); // hunter-271211: ukrywanie konsoli if (Global::iWriteLogEnabled & 2) @@ -172,45 +117,32 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN); } - std::string commandline(lpCmdLine); - if (!commandline.empty()) - { - cParser parser(commandline); - std::string token; - do - { - parser.getTokens(); - token.clear(); - parser >> token; + for (int i = 1; i < argc; i++) + { + std::string token(argv[i]); - if (token == "-s") - { // nazwa scenerii - parser.getTokens(); - parser >> Global::SceneryFile; - } - else if (token == "-v") - { // nazwa wybranego pojazdu - parser.getTokens(); - parser >> Global::asHumanCtrlVehicle; - } - else if (token == "-modifytga") - { // wykonanie modyfikacji wszystkich plików TGA - Global::iModifyTGA = -1; // specjalny tryb wykonania totalnej modyfikacji - } - else if (token == "-e3d") - { // wygenerowanie wszystkich plików E3D - if (Global::iConvertModels > 0) - Global::iConvertModels = -Global::iConvertModels; // specjalny tryb - else - Global::iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity - } - else - Error( - "Program usage: EU07 [-s sceneryfilepath] [-v vehiclename] [-modifytga] [-e3d]", - !Global::iWriteLogEnabled); + if (token == "-modifytga") + Global::iModifyTGA = -1; + else if (token == "-e3d") + { + if (Global::iConvertModels > 0) + Global::iConvertModels = -Global::iConvertModels; + else + Global::iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity } - while (!token.empty()); - } + else if (argc <= i + 1) + continue; + else if (token == "-s") + Global::SceneryFile = std::string(argv[++i]); + else if (token == "-v") + Global::asHumanCtrlVehicle = std::string(argv[++i]); + else + { + std::cout << "usage: " << std::string(argv[0]) << " [-s sceneryfilepath] " + << "[-v vehiclename] [-modifytga] [-e3d]" << std::endl; + return -1; + } + } glfwWindowHint(GLFW_SAMPLES, Global::iMultisampling); @@ -226,10 +158,13 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) GLFWwindow *window = glfwCreateWindow(Global::iWindowWidth, Global::iWindowHeight, - "EU07++", Global::bFullScreen ? monitor : nullptr, nullptr); + "EU07++NG", Global::bFullScreen ? monitor : nullptr, nullptr); if (!window) + { + std::cout << "failed to create window" << std::endl; return -1; + } glfwMakeContextCurrent(window); glfwSwapInterval(1); //vsync glfwSetInputMode(window, GLFW_CURSOR, GLFW_CURSOR_DISABLED); //capture cursor @@ -245,7 +180,10 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) } if (glewInit() != GLEW_OK) + { + std::cout << "failed to init GLEW" << std::endl; return -1; + } glEnableClientState(GL_VERTEX_ARRAY); glEnableClientState(GL_NORMAL_ARRAY); @@ -253,7 +191,10 @@ int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR lpCmdLine, int) Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów if (!World.Init(window)) + { + std::cout << "failed to init TWorld" << std::endl; return -1; + } Console *pConsole = new Console(); // Ra: nie wiem, czy ma to sens, ale jakoś zainicjowac trzeba diff --git a/EU07.res b/EU07.res deleted file mode 100644 index ebd7d7e48697eb1c04b4e4a7f3c669836cf189ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3152 zcmeHJO>0v@6g}_dg*IvP-UQTz8-o-P#nNh26tRBPLbYnK+EuYst+g1_(ne5MBK-xT z|3F0i5AIw^e?qC^!mVAp2z{P==S?yR1sA#zdg;x~opbNGADM;$fC@EDt#aETA9@|0 zqfeliF?%EDbeNk8^#U~johdI{sG6;hwO4DXZZ@(0WgVlJA`HB4qPg8f6t3aj`**1Q zpuPDSGk0e&aBu)`UcW&^eBxsh8=D)b)oU%T-OcU(EOdypXmwzl~M?Rwhg8G-4 zZC8W-enKtWnhwt=rk`Sx40mQeb0Dq(NumddGd)~0CQfYrq>U%}eBOb&s_pPFEEGgN z5ffpSKcq#<%t;`zLLWDAPiP8}m4XR-V#BC*yb0sj!{a#Y#zW$)B2fA`?80sSLKrA+ z^ZWc+=?o8CBOUp(L!LRDTdzK^b+`3#M=wEAph_#gShNE-MmBAunDt*YK@gNmy}daj z+A=zDbue@i+!}4XtY@azluOi%!Faehm{Q4<%c9o7!~4qRfQKc+jjE*ZaXA-?zCPkq zaum$w|t$qV?P92xz5dQQfpDe$UG~FIa_pqEHYMRElj*A$_4eDjw3mQer^k&{7QWd z-tx6%*Abq`sXU)#_2r)alT4w36)d8T1&nd6VV=x&Jj4>6&#TW6su;#ec3Wi)$9Y~w zk$jiw^90M7qyKYuJx6O^Q(VCvdY@)*w|OGxz*UqP<8qAhd=>XK_cCi(Bv)NyuhV}D zFUVNuuELC#>lm{hr;40I>~T$#YlUoWj$xd_AS)PT-NUTo1b0=gXBazyeTGHcx zk2ySG+!L-Vc+4D5&Z0o?n;D0EGs5iVCYGJ@Jf7-|2g&k`Dso9@JjvK4vOnc~8(wGN zJ^k}+2a#v~PLA#gyZK7a{o0$o3sRZP)pau}4!pV2qwAo3yMO_`nRXg=M%C!)--W%= G_vkl72j9j3 diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 72b815e9..84ec9962 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -145,8 +145,7 @@ bool TEventLauncher::Render() bool bCond = false; if (iKey != 0) { - if (Global::bActive) // tylko jeśli okno jest aktywne - bCond = (Console::Pressed(iKey)); // czy klawisz wciśnięty + bCond = (Console::Pressed(iKey)); // czy klawisz wciśnięty } if (DeltaTime > 0) { diff --git a/Event.cpp b/Event.cpp index 5ea1ddf5..059e5d61 100644 --- a/Event.cpp +++ b/Event.cpp @@ -142,7 +142,6 @@ void TEvent::Load(cParser *parser, vector3 *org) { int i; int ti; - double tf; std::string token; //string str; char *ptr; diff --git a/Gauge.cpp b/Gauge.cpp index 04091419..541deeb3 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -98,7 +98,7 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) Init(sm, gt_Digital, val3, val4, val5); else Init(sm, gt_Rotate, val3, val4, val5); - return (md2); // true, gdy podany model zewnętrzny, a w kabinie nie było + return md2 != nullptr; // true, gdy podany model zewnętrzny, a w kabinie nie było }; void TGauge::PermIncValue(double fNewDesired) diff --git a/Geom.cpp b/Geom.cpp index 9b2d7b02..6f43ea7f 100644 --- a/Geom.cpp +++ b/Geom.cpp @@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "classes.hpp" #include #include -#include "opengl/glut.h" +#include "GL/glut.h" #pragma hdrstop #include "Texture.h" diff --git a/Globals.cpp b/Globals.cpp index 605b0452..fcffc851 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -53,9 +53,9 @@ GLFWwindow *Global::window; bool Global::shiftState; bool Global::ctrlState; int Global::iCameraLast = -1; -std::string Global::asRelease = "16.0.1172.482"; +std::string Global::asRelease = "NG"; std::string Global::asVersion = - "Compilation 2017-01-10, release " + Global::asRelease + "."; // tutaj, bo wysyłany + "EU07++NG"; // tutaj, bo wysyłany int Global::iViewMode = 0; // co aktualnie widać: 0-kabina, 1-latanie, 2-sprzęgi, 3-dokumenty int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, @@ -68,7 +68,6 @@ char *Global::szTexturesDDS[4] = {"dds", "tga", "tex", "bmp"}; // lista tekstur int Global::iKeyLast = 0; // ostatnio naciśnięty klawisz w celu logowania GLuint Global::iTextureId = 0; // ostatnio użyta tekstura 2D int Global::iPause = 0x10; // globalna pauza ruchu -bool Global::bActive = true; // czy jest aktywnym oknem int Global::iErorrCounter = 0; // licznik sprawdzań do śledzenia błędów OpenGL int Global::iTextures = 0; // licznik użytych tekstur TWorld *Global::pWorld = NULL; @@ -88,7 +87,7 @@ vector3 Global::pFreeCameraInit[10]; vector3 Global::pFreeCameraInitAngle[10]; double Global::fFogStart = 1700; double Global::fFogEnd = 2000; -float Global::Background[3] = {0.2, 0.4, 0.33}; +float Global::Background[3] = {0.2f, 0.4f, 0.33f}; GLfloat Global::AtmoColor[] = {0.423f, 0.702f, 1.0f}; GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; GLfloat Global::ambientDayLight[] = {0.40f, 0.40f, 0.45f, 1.0f}; // robocze @@ -115,8 +114,8 @@ int Global::iFeedbackPort = 0; // dodatkowy adres dla informacji zwrotnych bool Global::bFreeFly = false; bool Global::bFullScreen = false; bool Global::bInactivePause = true; // automatyczna pauza, gdy okno nieaktywne -float Global::fMouseXScale = 1.5; -float Global::fMouseYScale = 0.2; +float Global::fMouseXScale = 1.5f; +float Global::fMouseYScale = 0.2f; std::string Global::SceneryFile = "td.scn"; std::string Global::asHumanCtrlVehicle = "EU07-424"; int Global::iMultiplayer = 0; // blokada działania niektórych funkcji na rzecz komunikacji @@ -935,7 +934,7 @@ void Global::ConfigParse(cParser &Parser) */ } -void Global::InitKeys(std::string asFileName) +void Global::InitKeys() { Keys[k_IncMainCtrl] = GLFW_KEY_KP_ADD; Keys[k_IncMainCtrlFAST] = GLFW_KEY_KP_ADD; @@ -1105,7 +1104,8 @@ void TTranscripts::AddLine(char const *txt, float show, float hide, bool it) return; // komentarz jest ignorowany show = Global::fTimeAngleDeg + show / 240.0; // jeśli doba to 360, to 1s będzie równe 1/240 hide = Global::fTimeAngleDeg + hide / 240.0; - int i = iStart, j, k; // od czegoś trzeba zacząć + int i = iStart, j; + size_t k; // od czegoś trzeba zacząć while ((aLines[i].iNext >= 0) ? (aLines[aLines[i].iNext].fShow <= show) : false) // póki nie koniec i wcześniej puszczane i = aLines[i].iNext; // przejście do kolejnej linijki diff --git a/Globals.h b/Globals.h index e2124e10..8d9ae07c 100644 --- a/Globals.h +++ b/Globals.h @@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include -#include "opengl/glew.h" +#include "GL/glew.h" #include "dumb3d.h" // definicje klawiszy @@ -198,7 +198,7 @@ class Global // McZapkie-170602: zewnetrzna definicja pojazdu uzytkownika static std::string asHumanCtrlVehicle; static void LoadIniFile(std::string asFileName); - static void InitKeys(std::string asFileName); + static void InitKeys(); inline static Math3D::vector3 GetCameraPosition() { return pCameraPosition; @@ -267,7 +267,6 @@ class Global static bool bGlutFont; // tekst generowany przez GLUT static int iKeyLast; // ostatnio naciśnięty klawisz w celu logowania static int iPause; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie - static bool bActive; // czy jest aktywnym oknem static void BindTexture(GLuint t); static int iConvertModels; // tworzenie plików binarnych static int iErorrCounter; // licznik sprawdzań do śledzenia błędów OpenGL diff --git a/Ground.cpp b/Ground.cpp index 48a98f97..f02a53a7 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -16,7 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Ground.h" -#include "opengl/glew.h" +#include "GL/glew.h" #include "Globals.h" #include "Logs.h" @@ -286,7 +286,6 @@ void TGroundNode::RenderVBO() (iType != TP_EVLAUNCH)) // McZapkie-070602: nie rysuj odleglych obiektow ale sprawdzaj // wyzwalacz zdarzen return; - int i, a; switch (iType) { case TP_TRACTION: @@ -350,12 +349,11 @@ void TGroundNode::RenderAlphaVBO() return; if (mgn > fSquareRadius) return; - int i, a; #ifdef _PROBLEND if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f }; #endif switch (iType) @@ -365,7 +363,7 @@ void TGroundNode::RenderAlphaVBO() { #ifdef _PROBLEND glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04); + glAlphaFunc(GL_GREATER, 0.04f); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); #endif hvTraction->RenderVBO(mgn, iVboPtr); @@ -374,7 +372,7 @@ void TGroundNode::RenderAlphaVBO() case TP_MODEL: #ifdef _PROBLEND glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04); + glAlphaFunc(GL_GREATER, 0.04f); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); #endif Model->RenderAlphaVBO(&pCenter); @@ -396,13 +394,13 @@ void TGroundNode::RenderAlphaVBO() // glEnable(GL_LIGHTING); #ifdef _PROBLEND glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04); + glAlphaFunc(GL_GREATER, 0.04f); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); #endif } #ifdef _PROBLEND glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04); + glAlphaFunc(GL_GREATER, 0.04f); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); #endif return; @@ -412,7 +410,7 @@ void TGroundNode::RenderAlphaVBO() RaRenderVBO(); #ifdef _PROBLEND glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04); + glAlphaFunc(GL_GREATER, 0.04f); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); #endif return; @@ -420,7 +418,7 @@ void TGroundNode::RenderAlphaVBO() } #ifdef _PROBLEND glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04); + glAlphaFunc(GL_GREATER, 0.04f); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); #endif return; @@ -559,7 +557,6 @@ void TGroundNode::RenderDL() // obiektow ale sprawdzaj wyzwalacz // zdarzen return; - int i, a; switch (iType) { case TP_TRACK: @@ -620,7 +617,6 @@ void TGroundNode::RenderAlphaDL() return; if (mgn > fSquareRadius) return; - int i, a; switch (iType) { case TP_TRACTION: @@ -642,7 +638,7 @@ void TGroundNode::RenderAlphaDL() if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f }; #endif if (!DisplayListID) //||Global::bReCompile) //Ra: wymuszenie rekompilacji @@ -673,7 +669,7 @@ void TGroundNode::RenderAlphaDL() if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04); + glAlphaFunc(GL_GREATER, 0.04f); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); }; #endif @@ -967,7 +963,6 @@ void TSubRect::Sort() TTrack * TSubRect::FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude) { // szukanie toru, którego koniec jest najbliższy (*Point) - TTrack *Track; for (int i = 0; i < iTracks; ++i) if (tTracks[i] != Exclude) // można użyć tabelę torów, bo jest mniejsza { @@ -1004,7 +999,7 @@ void TSubRect::RaAnimate() return; // nie ma nic do animowania if (Global::bUseVBO) { // odświeżenie VBO sektora - if (true == GLEW_VERSION_1_5) // modyfikacje VBO są dostępne od OpenGL 1.5 + if (GLEW_VERSION_1_5) // modyfikacje VBO są dostępne od OpenGL 1.5 glBindBuffer(GL_ARRAY_BUFFER, m_nVBOVertices); else // dla OpenGL 1.4 z GL_ARB_vertex_buffer_object odświeżenie całego sektora Release(); // opróżnienie VBO sektora, aby się odświeżył z nowymi ustawieniami @@ -1565,16 +1560,15 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) { // wczytanie wpisu typu "node" // parser->LoadTraction=Global::bLoadTraction; //Ra: tu nie potrzeba powtarzać string str, str1, str2, str3, str4, Skin, DriverType, asNodeName; - int nv, ti, i, n; - double tf, r, rmin, tf1, tf2, tf3, tf4, l, dist, mgn; - int int1, int2; - bool bError = false, curve; + int nv, i; + double tf, r, rmin, tf1, tf3; + int int1; + size_t int2; + bool bError = false; vector3 pt, front, up, left, pos, tv; matrix4x4 mat2, mat1, mat; - GLuint TexID; TGroundNode *tmp1; TTrack *Track; - TTextSound *tmpsound; std::string token; parser->getTokens(2); *parser >> r >> rmin; @@ -1585,7 +1579,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) *parser >> token; str = token; //str = AnsiString(token.c_str()); - TGroundNode *tmp, *tmp2; + TGroundNode *tmp; tmp = new TGroundNode(); tmp->asName = (asNodeName == "none" ? string("") : asNodeName); if (r >= 0) @@ -1647,10 +1641,10 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) parser->getTokens(3); *parser >> tmp->hvTraction->NominalVoltage >> tmp->hvTraction->MaxCurrent >> tmp->hvTraction->fResistivity; - if (tmp->hvTraction->fResistivity == 0.01) // tyle jest w sceneriach [om/km] - tmp->hvTraction->fResistivity = 0.075; // taka sensowniejsza wartość za + if (tmp->hvTraction->fResistivity == 0.01f) // tyle jest w sceneriach [om/km] + tmp->hvTraction->fResistivity = 0.075f; // taka sensowniejsza wartość za // http://www.ikolej.pl/fileadmin/user_upload/Seminaria_IK/13_05_07_Prezentacja_Kruczek.pdf - tmp->hvTraction->fResistivity *= 0.001; // teraz [om/m] + tmp->hvTraction->fResistivity *= 0.001f; // teraz [om/m] parser->getTokens(); *parser >> token; // Ra 2014-02: a tutaj damy symbol sieci i jej budowę, np.: @@ -1803,7 +1797,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) *parser >> token; str = token; //str = AnsiString(token.c_str()); - tmp->tsStaticSound = new TTextSound(str, sqrt(tmp->fSquareRadius), tmp->pCenter.x, tmp->pCenter.y, tmp->pCenter.z, false, rmin); + tmp->tsStaticSound = new TTextSound(str, sqrt(tmp->fSquareRadius), tmp->pCenter.x, tmp->pCenter.y, tmp->pCenter.z, false, false, rmin); if (rmin < 0.0) rmin = 0.0; // przywrócenie poprawnej wartości, jeśli służyła do wyłączenia efektu Dopplera @@ -1842,7 +1836,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) int2 = str4.find("."); // yB: wykorzystuje tutaj zmienna, ktora potem bedzie ladunkiem if (int2 != string::npos) // yB: jesli znalazl kropke, to ja przetwarza jako parametry { - int dlugosc = str4.length(); + size_t dlugosc = str4.length(); int1 = atoi(str4.substr(0, int2).c_str()); // niech sprzegiem bedzie do kropki cos str4 = str4.substr(int2 + 1, dlugosc - int2); } @@ -2220,7 +2214,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) /* nv = i; */ - nv = TempVerts.size(); + nv = (int)TempVerts.size(); tmp->Init(nv); // utworzenie tablicy wierzchołków tmp->pCenter /= (nv > 0 ? nv : 1); @@ -2515,9 +2509,6 @@ bool TGround::Init(std::string asFile) int OriginStackTop = 0; vector3 OriginStack[OriginStackMaxDepth]; // stos zagnieżdżenia origin - double tf; - int ParamCount, ParamPos; - // ABu: Jezeli nie ma definicji w scenerii to ustawiane ponizsze wartosci: hh = 10; // godzina startu mm = 30; // minuty startu @@ -3303,7 +3294,7 @@ void TGround::InitTracks() TGroundNode *Current, *Model; TTrack *tmp; // znaleziony tor TTrack *Track; - int iConnection, state; + int iConnection; string name; // tracks=tracksfar=0; for (Current = nRootOfType[TP_TRACK]; Current; Current = Current->nNext) @@ -3722,7 +3713,7 @@ bool TGround::InitLaunchers() { TGroundNode *Current, *tmp; TEventLauncher *EventLauncher; - int i; + for (Current = nRootOfType[TP_EVLAUNCH]; Current; Current = Current->nNext) { EventLauncher = Current->EvLaunch; @@ -3749,8 +3740,6 @@ bool TGround::InitLaunchers() TTrack * TGround::FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclude) { // wyszukiwanie innego toru kończącego się w (Point) - TTrack *Track; - TGroundNode *Current; TTrack *tmp; iConnection = -1; TSubRect *sr; @@ -3797,8 +3786,6 @@ TTrack * TGround::FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclud TTraction * TGround::FindTraction(vector3 *Point, int &iConnection, TGroundNode *Exclude) { // wyszukiwanie innego przęsła kończącego się w (Point) - TTraction *Traction; - TGroundNode *Current; TTraction *tmp; iConnection = -1; TSubRect *sr; @@ -4260,7 +4247,7 @@ bool TGround::CheckQuery() for (i = 0; i < 8; ++i) { // dodawane do kolejki w kolejności zapisania if (tmpEvent->Params[i].asEvent) - if (bCondition != bool(tmpEvent->iFlags & (conditional_else << i))) + if (bCondition != (((tmpEvent->iFlags & (conditional_else << i)) != 0))) { if (tmpEvent->Params[i].asEvent != tmpEvent) AddToQuery(tmpEvent->Params[i].asEvent, @@ -4762,11 +4749,10 @@ bool TGround::GetTraction(TDynamicObject *model) bool TGround::RenderDL(vector3 pPosition) { // renderowanie scenerii z Display List - faza nieprzezroczystych glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) CameraDirection.x = sin(Global::pCameraRotation); // wektor kierunkowy CameraDirection.z = cos(Global::pCameraRotation); - int tr, tc; TGroundNode *node; glColor3f(1.0f, 1.0f, 1.0f); glEnable(GL_LIGHTING); @@ -4823,7 +4809,7 @@ bool TGround::RenderDL(vector3 pPosition) bool TGround::RenderAlphaDL(vector3 pPosition) { // renderowanie scenerii z Display List - faza przezroczystych glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.04f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f TGroundNode *node; glColor4f(1.0f, 1.0f, 1.0f, 1.0f); TSubRect *tmp; @@ -4852,11 +4838,10 @@ bool TGround::RenderAlphaDL(vector3 pPosition) bool TGround::RenderVBO(vector3 pPosition) { // renderowanie scenerii z VBO - faza nieprzezroczystych glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek CameraDirection.x = sin(Global::pCameraRotation); // wektor kierunkowy CameraDirection.z = cos(Global::pCameraRotation); - int tr, tc; TGroundNode *node; glColor3f(1.0f, 1.0f, 1.0f); glEnable(GL_LIGHTING); @@ -4920,7 +4905,7 @@ bool TGround::RenderVBO(vector3 pPosition) bool TGround::RenderAlphaVBO(vector3 pPosition) { // renderowanie scenerii z VBO - faza przezroczystych glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.04f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f TGroundNode *node; glColor4f(1.0f, 1.0f, 1.0f, 1.0f); TSubRect *tmp; @@ -4967,14 +4952,14 @@ void TGround::WyslijEvent(const std::string &e, const std::string &d) DaneRozkaz r; r.iSygn = 'EU07'; r.iComm = 2; // 2 - event - int i = e.length(), j = d.length(); + size_t i = e.length(), j = d.length(); r.cString[0] = char(i); strcpy(r.cString + 1, e.c_str()); // zakończony zerem r.cString[i + 2] = char(j); // licznik po zerze kończącym strcpy(r.cString + 3 + i, d.c_str()); // zakończony zerem COPYDATASTRUCT cData; cData.dwData = 'EU07'; // sygnatura - cData.cbData = 12 + i + j; // 8+dwa liczniki i dwa zera kończące + cData.cbData = (DWORD)(12 + i + j); // 8+dwa liczniki i dwa zera kończące cData.lpData = &r; //m7todo //Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); @@ -4986,13 +4971,13 @@ void TGround::WyslijUszkodzenia(const std::string &t, char fl) DaneRozkaz r; r.iSygn = 'EU07'; r.iComm = 13; // numer komunikatu - int i = t.length(); + size_t i = t.length(); r.cString[0] = char(fl); r.cString[1] = char(i); strcpy(r.cString + 2, t.c_str()); // z zerem kończącym COPYDATASTRUCT cData; cData.dwData = 'EU07'; // sygnatura - cData.cbData = 11 + i; // 8+licznik i zero kończące + cData.cbData = (DWORD)(11 + i); // 8+licznik i zero kończące cData.lpData = &r; //m7todo //Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); @@ -5004,12 +4989,12 @@ void TGround::WyslijString(const std::string &t, int n) DaneRozkaz r; r.iSygn = 'EU07'; r.iComm = n; // numer komunikatu - int i = t.length(); + size_t i = t.length(); r.cString[0] = char(i); strcpy(r.cString + 1, t.c_str()); // z zerem kończącym COPYDATASTRUCT cData; cData.dwData = 'EU07'; // sygnatura - cData.cbData = 10 + i; // 8+licznik i zero kończące + cData.cbData = (DWORD)(10 + i); // 8+licznik i zero kończące cData.lpData = &r; //m7todo //Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); @@ -5027,7 +5012,8 @@ void TGround::WyslijNamiary(TGroundNode *t) DaneRozkaz r; r.iSygn = 'EU07'; r.iComm = 7; // 7 - dane pojazdu - int i = 32, j = t->asName.length(); + int i = 32; + size_t j = t->asName.length(); r.iPar[0] = i; // ilość danych liczbowych r.fPar[1] = Global::fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) r.fPar[2] = t->DynamicObject->MoverParameters->Loc.X; // pozycja X @@ -5088,7 +5074,7 @@ void TGround::WyslijNamiary(TGroundNode *t) strcpy(r.cString + i + 1, t->asName.c_str()); // zakończony zerem COPYDATASTRUCT cData; cData.dwData = 'EU07'; // sygnatura - cData.cbData = 10 + i + j; // 8+licznik i zero kończące + cData.cbData = (DWORD)(10 + i + j); // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); //m7todo @@ -5189,7 +5175,7 @@ TDynamicObject * TGround::DynamicNearest(vector3 pPosition, double distance, boo TDynamicObject *dyn = NULL; int c = GetColFromX(pPosition.x); int r = GetRowFromZ(pPosition.z); - int i, j, k; + int i, j; double sqm = distance * distance, sqd; // maksymalny promien poszukiwań do kwadratu for (j = r - 1; j <= r + 1; j++) // plus dwa zewnętrzne sektory, łącznie 9 for (i = c - 1; i <= c + 1; i++) @@ -5227,7 +5213,7 @@ TDynamicObject * TGround::CouplerNearest(vector3 pPosition, double distance, boo TDynamicObject *dyn = NULL; int c = GetColFromX(pPosition.x); int r = GetRowFromZ(pPosition.z); - int i, j, k; + int i, j; double sqm = distance * distance, sqd; // maksymalny promien poszukiwań do kwadratu for (j = r - 1; j <= r + 1; j++) // plus dwa zewnętrzne sektory, łącznie 9 for (i = c - 1; i <= c + 1; i++) @@ -5325,7 +5311,6 @@ void TGround::TerrainWrite() // chyba że dla danej tekstury wychodzi tylko jeden submodel. TModel3d *m = new TModel3d(); // wirtualny model roboczy z oddzielnymi submodelami TSubModel *sk; // wskaźnik roboczy na submodel kwadratu - TSubModel *st; // wskaźnik roboczy na submodel tekstury // Zliczamy kwadraty z trójkątami, ilość tekstur oraz wierzchołków. // Ilość kwadratów i ilość tekstur określi ilość submodeli. // int sub=0; //całkowita ilość submodeli @@ -5404,7 +5389,6 @@ void TGround::TerrainWrite() void TGround::TrackBusyList() { // wysłanie informacji o wszystkich zajętych odcinkach TGroundNode *Current; - TTrack *Track; for (Current = nRootOfType[TP_TRACK]; Current; Current = Current->nNext) if (!Current->asName.empty()) // musi być nazwa #ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY @@ -5445,13 +5429,12 @@ void TGround::IsolatedBusy(const std::string t) void TGround::Silence(vector3 gdzie) { // wyciszenie wszystkiego w sektorach przed przeniesieniem kamery z (gdzie) - int tr, tc; TGroundNode *node; int n = 2 * iNumSubRects; //(2*==2km) promień wyświetlanej mapy w sektorach int c = GetColFromX(gdzie.x); // sektory wg dotychczasowej pozycji kamery int r = GetRowFromZ(gdzie.z); TSubRect *tmp; - int i, j, k; + int i, j; // renderowanie czołgowe dla obiektów aktywnych a niewidocznych for (j = r - n; j <= r + n; j++) for (i = c - n; i <= c + n; i++) diff --git a/Ground.h b/Ground.h index 386503f3..47dde65e 100644 --- a/Ground.h +++ b/Ground.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "opengl/glew.h" +#include "GL/glew.h" #include "VBO.h" #include "Classes.h" #include "ResourceManager.h" @@ -393,11 +393,11 @@ class TGround TSubRect * FastGetSubRect(int iCol, int iRow); int GetRowFromZ(double z) { - return (z / fSubRectSize + fHalfTotalNumSubRects); + return (int)(z / fSubRectSize + fHalfTotalNumSubRects); }; int GetColFromX(double x) { - return (x / fSubRectSize + fHalfTotalNumSubRects); + return (int)(x / fSubRectSize + fHalfTotalNumSubRects); }; TEvent * FindEvent(const std::string &asEventName); TEvent * FindEventScan(const std::string &asEventName); diff --git a/Logs.cpp b/Logs.cpp index 563003b0..eff68c90 100644 --- a/Logs.cpp +++ b/Logs.cpp @@ -24,7 +24,7 @@ void WriteConsoleOnly(const char *str, double value) sprintf(buf, "%s %f \n", str, value); // stdout= GetStdHandle(STD_OUTPUT_HANDLE); DWORD wr = 0; - WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), buf, strlen(buf), &wr, NULL); + WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), buf, (DWORD)strlen(buf), &wr, NULL); // WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE),endstring,strlen(endstring),&wr,NULL); } @@ -34,9 +34,9 @@ void WriteConsoleOnly(const char *str, bool newline) SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN | FOREGROUND_INTENSITY); DWORD wr = 0; - WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), str, strlen(str), &wr, NULL); + WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), str, (DWORD)strlen(str), &wr, NULL); if (newline) - WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), endstring, strlen(endstring), &wr, NULL); + WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), endstring, (DWORD)strlen(endstring), &wr, NULL); } void WriteLog(const char *str, double value) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 8055a556..fbeae51d 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5478,7 +5478,7 @@ std::vector x; // ************************************************************************************************* // Q: 20160717 // ************************************************************************************************* -int Pos(std::string str_find, std::string in) +size_t Pos(std::string str_find, std::string in) { size_t pos = in.find(str_find); return (pos != std::string::npos ? pos+1 : 0); diff --git a/McZapkie/Mover.hpp b/McZapkie/Mover.hpp deleted file mode 100644 index 8bbe1677..00000000 --- a/McZapkie/Mover.hpp +++ /dev/null @@ -1,906 +0,0 @@ -// Borland C++ Builder -// Copyright (c) 1995, 1999 by Borland International -// All rights reserved - -// (DO NOT EDIT: machine generated header) '_mover.pas' rev: 5.00 -//Ra: eee... tam, sam si� generuje b��dnie i trzeba r�cznie poprawia�! - -#ifndef _moverHPP -#define _moverHPP - -#pragma delphiheader begin -#pragma option push -w- -#pragma option push -Vx -#include "Oerlikon_ESt.h" // Pascal unit -#include "hamulce.h" // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit - -//-- user supplied ----------------------------------------------------------- - -namespace _mover -{ -//-- type declarations ------------------------------------------------------- -struct TLocation -{ - double X; - double Y; - double Z; -} ; - -struct TRotation -{ - double Rx; - double Ry; - double Rz; -} ; - -struct TDimension -{ - double W; - double L; - double H; -} ; - -struct TCommand -{ - AnsiString Command; - double Value1; - double Value2; - TLocation Location; -} ; - -struct TTrackShape -{ - double R; - double Len; - double dHtrack; - double dHrail; -} ; - -struct TTrackParam -{ - double Width; - double friction; - Byte CategoryFlag; - Byte QualityFlag; - Byte DamageFlag; - double Velmax; -} ; - -struct TTractionParam -{ - double TractionVoltage; - double TractionFreq; - double TractionMaxCurrent; - double TractionResistivity; -} ; - -#pragma option push -b- -enum TBrakeSystem { Individual, Pneumatic, ElectroPneumatic }; -#pragma option pop - -#pragma option push -b- -enum TBrakeSubSystem { ss_None, ss_W, ss_K, ss_KK, ss_Hik, ss_ESt, ss_KE, ss_LSt, ss_MT, ss_Dako }; -#pragma option pop - -#pragma option push -b- -enum TBrakeValve { NoValve, W, W_Lu_VI, W_Lu_L, W_Lu_XR, K, Kg, Kp, Kss, Kkg, Kkp, Kks, Hikg1, Hikss, - Hikp1, KE, SW, EStED, NESt3, ESt3, LSt, ESt4, ESt3AL2, EP1, EP2, M483, CV1_L_TR, CV1, CV1_R, Other - }; -#pragma option pop - -#pragma option push -b- -enum TBrakeHandle { - NoHandle, West, FV4a, M394, M254, FVel1, FVel6, D2, Knorr, FD1, BS2, testH, St113, - MHZ_P, MHZ_T, MHZ_EN57 }; -#pragma option pop - -#pragma option push -b- -enum TLocalBrake { NoBrake, ManualBrake, PneumaticBrake, HydraulicBrake }; -#pragma option pop - -typedef double TBrakeDelayTable[4]; - -struct TBrakePressure -{ - double PipePressureVal; - double BrakePressureVal; - double FlowSpeedVal; - TBrakeSystem BrakeType; -} ; - -typedef TBrakePressure TBrakePressureTable[13]; - -#pragma option push -b- -enum TEngineTypes { None, Dumb, WheelsDriven, ElectricSeriesMotor, ElectricInductionMotor, DieselEngine, - SteamEngine, DieselElectric }; -#pragma option pop - -#pragma option push -b- -enum TPowerType { NoPower, BioPower, MechPower, ElectricPower, SteamPower }; -#pragma option pop - -#pragma option push -b- -enum TFuelType { Undefined, Coal, Oil }; -#pragma option pop - -struct TGrateType -{ - TFuelType FuelType; - double GrateSurface; - double FuelTransportSpeed; - double IgnitionTemperature; - double MaxTemperature; -} ; - -struct TBoilerType -{ - double BoilerVolume; - double BoilerHeatSurface; - double SuperHeaterSurface; - double MaxWaterVolume; - double MinWaterVolume; - double MaxPressure; -} ; - -struct TCurrentCollector -{ - int CollectorsNo; - double MinH; - double MaxH; - double CSW; - double MinV; - double MaxV; - double OVP; - double InsetV; - double MinPress; - double MaxPress; -} ; - -#pragma option push -b- -enum TPowerSource { NotDefined, InternalSource, Transducer, Generator, Accumulator, CurrentCollector, - PowerCable, Heater }; -#pragma option pop - -struct _mover__1 -{ - double MaxCapacity; - TPowerSource RechargeSource; -} ; - -struct _mover__2 -{ - TPowerType PowerTrans; - double SteamPressure; -} ; - -struct _mover__3 -{ - TGrateType Grate; - TBoilerType Boiler; -} ; - -struct TPowerParameters -{ - double MaxVoltage; - double MaxCurrent; - double IntR; - TPowerSource SourceType; - union - { - struct - { - _mover__3 RHeater; - - }; - struct - { - _mover__2 RPowerCable; - - }; - struct - { - TCurrentCollector CollectorParameters; - - }; - struct - { - _mover__1 RAccumulator; - - }; - struct - { - TEngineTypes GeneratorEngine; - - }; - struct - { - double InputVoltage; - - }; - struct - { - TPowerType PowerType; - - }; - - }; -} ; - -struct TScheme -{ - Byte Relay; - double R; - Byte Bn; - Byte Mn; - bool AutoSwitch; - Byte ScndAct; -} ; - -typedef TScheme TSchemeTable[65]; - -struct TDEScheme -{ - double RPM; - double GenPower; - double Umax; - double Imax; -} ; - -typedef TDEScheme TDESchemeTable[33]; - -struct TShuntScheme -{ - double Umin; - double Umax; - double Pmin; - double Pmax; -} ; - -typedef TShuntScheme TShuntSchemeTable[33]; - -struct TMPTRelay -{ - double Iup; - double Idown; -} ; - -typedef TMPTRelay TMPTRelayTable[8]; - -struct TMotorParameters -{ - double mfi; - double mIsat; - double mfi0; - double fi; - double Isat; - double fi0; - bool AutoSwitch; -} ; - -struct TSecuritySystem -{ - Byte SystemType; - double AwareDelay; - double AwareMinSpeed; - double SoundSignalDelay; - double EmergencyBrakeDelay; - Byte Status; - double SystemTimer; - double SystemSoundCATimer; - double SystemSoundSHPTimer; - double SystemBrakeCATimer; - double SystemBrakeSHPTimer; - double SystemBrakeCATestTimer; - int VelocityAllowed; - int NextVelocityAllowed; - bool RadioStop; -} ; - -struct TTransmision -{ - Byte NToothM; - Byte NToothW; - double Ratio; -} ; - -#pragma option push -b- -enum TCouplerType { NoCoupler, Articulated, Bare, Chain, Screw, Automatic }; -#pragma option pop - -class DELPHICLASS T_MoverParameters; -struct TCoupling -{ - double SpringKB; - double SpringKC; - double beta; - double DmaxB; - double FmaxB; - double DmaxC; - double FmaxC; - TCouplerType CouplerType; - Byte CouplingFlag; - int AllowedFlag; - bool Render; - double CoupleDist; - T_MoverParameters* Connected; - Byte ConnectedNr; - double CForce; - double Dist; - bool CheckCollision; -} ; - -class PASCALIMPLEMENTATION T_MoverParameters : public System::TObject -{ - typedef System::TObject inherited; - -public: - double dMoveLen; - AnsiString filename; - Byte CategoryFlag; - AnsiString TypeName; - int TrainType; - TEngineTypes EngineType; - TPowerParameters EnginePowerSource; - TPowerParameters SystemPowerSource; - TPowerParameters HeatingPowerSource; - TPowerParameters AlterHeatPowerSource; - TPowerParameters LightPowerSource; - TPowerParameters AlterLightPowerSource; - double Vmax; - double Mass; - double Power; - double Mred; - double TotalMass; - double HeatingPower; - double LightPower; - double BatteryVoltage; - bool Battery; - bool EpFuse; - bool Signalling; - bool DoorSignalling; - bool Radio; - double NominalBatteryVoltage; - TDimension Dim; - double Cx; - double Floor; - double WheelDiameter; - double WheelDiameterL; - double WheelDiameterT; - double TrackW; - double AxleInertialMoment; - AnsiString AxleArangement; - Byte NPoweredAxles; - Byte NAxles; - Byte BearingType; - double ADist; - double BDist; - Byte NBpA; - int SandCapacity; - TBrakeSystem BrakeSystem; - TBrakeSubSystem BrakeSubsystem; - TBrakeValve BrakeValve; - TBrakeHandle BrakeHandle; - TBrakeHandle BrakeLocHandle; - double MBPM; - Hamulce::TBrake* Hamulec; - Hamulce::THandle* Handle; - Hamulce::THandle* LocHandle; - Hamulce::TReservoir* Pipe; - Hamulce::TReservoir* Pipe2; - TLocalBrake LocalBrake; - TBrakePressure BrakePressureTable[13]; - TBrakePressure BrakePressureActual; - Byte ASBType; - Byte TurboTest; - double MaxBrakeForce; - double MaxBrakePress[5]; - double P2FTrans; - double TrackBrakeForce; - Byte BrakeMethod; - double HighPipePress; - double LowPipePress; - double DeltaPipePress; - double CntrlPipePress; - double BrakeVolume; - double BrakeVVolume; - double VeselVolume; - int BrakeCylNo; - double BrakeCylRadius; - double BrakeCylDist; - double BrakeCylMult[3]; - Byte LoadFlag; - double BrakeCylSpring; - double BrakeSlckAdj; - double BrakeRigEff; - double RapidMult; - int BrakeValveSize; - AnsiString BrakeValveParams; - double Spg; - double MinCompressor; - double MaxCompressor; - double CompressorSpeed; - double BrakeDelay[4]; - Byte BrakeCtrlPosNo; - Byte MainCtrlPosNo; - Byte ScndCtrlPosNo; - Byte LightsPosNo; - Byte LightsDefPos; - bool LightsWrap; - Byte Lights[2][16]; - bool ScndInMain; - bool MBrake; - double StopBrakeDecc; - TSecuritySystem SecuritySystem; - TScheme RList[65]; - int RlistSize; - TMotorParameters MotorParam[11]; - TTransmision Transmision; - double NominalVoltage; - double WindingRes; - double u; - double CircuitRes; - int IminLo; - int IminHi; - int ImaxLo; - int ImaxHi; - double nmax; - double InitialCtrlDelay; - double CtrlDelay; - double CtrlDownDelay; - Byte FastSerialCircuit; - Byte AutoRelayType; - bool CoupledCtrl; - bool IsCoupled; - Byte DynamicBrakeType; - Byte RVentType; - double RVentnmax; - double RVentCutOff; - int CompressorPower; - int SmallCompressorPower; - bool Trafo; - double dizel_Mmax; - double dizel_nMmax; - double dizel_Mnmax; - double dizel_nmax; - double dizel_nominalfill; - double dizel_Mstand; - double dizel_nmax_cutoff; - double dizel_nmin; - double dizel_minVelfullengage; - double dizel_AIM; - double dizel_engageDia; - double dizel_engageMaxForce; - double dizel_engagefriction; - double AnPos; - bool AnalogCtrl; - bool AnMainCtrl; - bool ShuntModeAllow; - bool ShuntMode; - bool Flat; - double Vhyp; - TDEScheme DElist[33]; - double Vadd; - TMPTRelay MPTRelay[8]; - Byte RelayType; - TShuntScheme SST[33]; - double PowerCorRatio; - double Ftmax; - double eimc[26]; - int MaxLoad; - AnsiString LoadAccepted; - AnsiString LoadQuantity; - double OverLoadFactor; - double LoadSpeed; - double UnLoadSpeed; - Byte DoorOpenCtrl; - Byte DoorCloseCtrl; - double DoorStayOpen; - bool DoorClosureWarning; - double DoorOpenSpeed; - double DoorCloseSpeed; - double DoorMaxShiftL; - double DoorMaxShiftR; - double DoorMaxPlugShift; - Byte DoorOpenMethod; - double PlatformSpeed; - double PlatformMaxShift; - Byte PlatformOpenMethod; - bool ScndS; - TLocation Loc; - TRotation Rot; - AnsiString Name; - TCoupling Couplers[2]; - double HVCouplers[2][2]; - int ScanCounter; - bool EventFlag; - Byte SoundFlag; - double DistCounter; - double V; - double Vel; - double AccS; - double AccN; - double AccV; - double nrot; - double EnginePower; - double dL; - double Fb; - double Ff; - double FTrain; - double FStand; - double FTotal; - double UnitBrakeForce; - double Ntotal; - bool SlippingWheels; - bool SandDose; - double Sand; - double BrakeSlippingTimer; - double dpBrake; - double dpPipe; - double dpMainValve; - double dpLocalValve; - double ScndPipePress; - double BrakePress; - double LocBrakePress; - double PipeBrakePress; - double PipePress; - double EqvtPipePress; - double Volume; - double CompressedVolume; - double PantVolume; - double Compressor; - bool CompressorFlag; - bool PantCompFlag; - bool CompressorAllow; - bool ConverterFlag; - bool ConverterAllow; - int BrakeCtrlPos; - double BrakeCtrlPosR; - double BrakeCtrlPos2; - Byte LocalBrakePos; - Byte ManualBrakePos; - double LocalBrakePosA; - Byte BrakeStatus; - bool EmergencyBrakeFlag; - Byte BrakeDelayFlag; - Byte BrakeDelays; - Byte BrakeOpModeFlag; - Byte BrakeOpModes; - bool DynamicBrakeFlag; - double LimPipePress; - double ActFlowSpeed; - Byte DamageFlag; - Byte EngDmgFlag; - Byte DerailReason; - TCommand CommandIn; - AnsiString CommandOut; - AnsiString CommandLast; - double ValueOut; - TTrackShape RunningShape; - TTrackParam RunningTrack; - double OffsetTrackH; - double OffsetTrackV; - bool Mains; - Byte MainCtrlPos; - Byte ScndCtrlPos; - Byte LightsPos; - int ActiveDir; - int CabNo; - int DirAbsolute; - int ActiveCab; - double LastSwitchingTime; - bool DepartureSignal; - bool InsideConsist; - TTractionParam RunningTraction; - double enrot; - double Im; - double Itot; - double IHeating; - double ITraction; - double TotalCurrent; - double Mm; - double Mw; - double Fw; - double Ft; - int Imin; - int Imax; - double Voltage; - Byte MainCtrlActualPos; - Byte ScndCtrlActualPos; - bool DelayCtrlFlag; - double LastRelayTime; - bool AutoRelayFlag; - bool FuseFlag; - bool ConvOvldFlag; - bool StLinFlag; - bool ResistorsFlag; - double RventRot; - bool UnBrake; - double PantPress; - bool s_CAtestebrake; - double dizel_fill; - double dizel_engagestate; - double dizel_engage; - double dizel_automaticgearstatus; - bool dizel_enginestart; - double dizel_engagedeltaomega; - double eimv[21]; - double PulseForce; - double PulseForceTimer; - int PulseForceCount; - double eAngle; - int Load; - AnsiString LoadType; - Byte LoadStatus; - double LastLoadChangeTime; - bool DoorBlocked; - bool DoorLeftOpened; - bool DoorRightOpened; - bool PantFrontUp; - bool PantRearUp; - bool PantFrontSP; - bool PantRearSP; - int PantFrontStart; - int PantRearStart; - double PantFrontVolt; - double PantRearVolt; - AnsiString PantSwitchType; - AnsiString ConvSwitchType; - bool Heating; - int DoubleTr; - bool PhysicActivation; - double FrictConst1; - double FrictConst2s; - double FrictConst2d; - double TotalMassxg; - double __fastcall GetTrainsetVoltage(void); - bool __fastcall Physic_ReActivation(void); - double __fastcall LocalBrakeRatio(void); - double __fastcall ManualBrakeRatio(void); - double __fastcall PipeRatio(void); - double __fastcall RealPipeRatio(void); - double __fastcall BrakeVP(void); - bool __fastcall DynamicBrakeSwitch(bool Switch); - bool __fastcall SendCtrlBroadcast(AnsiString CtrlCommand, double ctrlvalue); - bool __fastcall SendCtrlToNext(AnsiString CtrlCommand, double ctrlvalue, double dir); - bool __fastcall CabActivisation(void); - bool __fastcall CabDeactivisation(void); - bool __fastcall IncMainCtrl(int CtrlSpeed); - bool __fastcall DecMainCtrl(int CtrlSpeed); - bool __fastcall IncScndCtrl(int CtrlSpeed); - bool __fastcall DecScndCtrl(int CtrlSpeed); - bool __fastcall AddPulseForce(int Multipler); - bool __fastcall SandDoseOn(void); - bool __fastcall SecuritySystemReset(void); - void __fastcall SecuritySystemCheck(double dt); - bool __fastcall BatterySwitch(bool State); - bool __fastcall EpFuseSwitch(bool State); - bool __fastcall IncBrakeLevelOld(void); - bool __fastcall DecBrakeLevelOld(void); - bool __fastcall IncLocalBrakeLevel(Byte CtrlSpeed); - bool __fastcall DecLocalBrakeLevel(Byte CtrlSpeed); - bool __fastcall IncLocalBrakeLevelFAST(void); - bool __fastcall DecLocalBrakeLevelFAST(void); - bool __fastcall IncManualBrakeLevel(Byte CtrlSpeed); - bool __fastcall DecManualBrakeLevel(Byte CtrlSpeed); - bool __fastcall EmergencyBrakeSwitch(bool Switch); - bool __fastcall AntiSlippingBrake(void); - bool __fastcall BrakeReleaser(Byte state); - bool __fastcall SwitchEPBrake(Byte state); - bool __fastcall AntiSlippingButton(void); - bool __fastcall IncBrakePress(double &brake, double PressLimit, double dp); - bool __fastcall DecBrakePress(double &brake, double PressLimit, double dp); - bool __fastcall BrakeDelaySwitch(Byte BDS); - bool __fastcall IncBrakeMult(void); - bool __fastcall DecBrakeMult(void); - void __fastcall UpdateBrakePressure(double dt); - void __fastcall UpdatePipePressure(double dt); - void __fastcall CompressorCheck(double dt); - //void __fastcall UpdatePantVolume(double dt); - void __fastcall UpdateScndPipePressure(double dt); - void __fastcall UpdateBatteryVoltage(double dt); - double __fastcall GetDVc(double dt); - void __fastcall ComputeConstans(void); - double __fastcall ComputeMass(void); - double __fastcall Adhesive(double staticfriction); - double __fastcall TractionForce(double dt); - double __fastcall FrictionForce(double R, Byte TDamage); - double __fastcall BrakeForce(const TTrackParam &Track); - double __fastcall CouplerForce(Byte CouplerN, double dt); - void __fastcall CollisionDetect(Byte CouplerN, double dt); - double __fastcall ComputeRotatingWheel(double WForce, double dt, double n); - bool __fastcall SetInternalCommand(AnsiString NewCommand, double NewValue1, double NewValue2); - double __fastcall GetExternalCommand(AnsiString &Command); - bool __fastcall RunCommand(AnsiString command, double CValue1, double CValue2); - bool __fastcall RunInternalCommand(void); - void __fastcall PutCommand(AnsiString NewCommand, double NewValue1, double NewValue2, const TLocation - &NewLocation); - bool __fastcall DirectionBackward(void); - bool __fastcall MainSwitch(bool State); - bool __fastcall ConverterSwitch(bool State); - bool __fastcall CompressorSwitch(bool State); - bool __fastcall FuseOn(void); - bool __fastcall FuseFlagCheck(void); - void __fastcall FuseOff(void); - int __fastcall ShowCurrent(Byte AmpN); - double __fastcall v2n(void); - double __fastcall current(double n, double U); - double __fastcall Momentum(double I); - double __fastcall MomentumF(double I, double Iw, Byte SCP); - bool __fastcall CutOffEngine(void); - bool __fastcall MaxCurrentSwitch(bool State); - bool __fastcall ResistorsFlagCheck(void); - bool __fastcall MinCurrentSwitch(bool State); - bool __fastcall AutoRelaySwitch(bool State); - bool __fastcall AutoRelayCheck(void); - bool __fastcall dizel_EngageSwitch(double state); - bool __fastcall dizel_EngageChange(double dt); - bool __fastcall dizel_AutoGearCheck(void); - double __fastcall dizel_fillcheck(Byte mcp); - double __fastcall dizel_Momentum(double dizel_fill, double n, double dt); - bool __fastcall dizel_Update(double dt); - bool __fastcall LoadingDone(double LSpeed, AnsiString LoadInit); - void __fastcall ComputeTotalForce(double dt, double dt1, bool FullVer); - double __fastcall ComputeMovement(double dt, double dt1, const TTrackShape &Shape, TTrackParam &Track - , TTractionParam &ElectricTraction, const TLocation &NewLoc, TRotation &NewRot); - double __fastcall FastComputeMovement(double dt, const TTrackShape &Shape, TTrackParam &Track, const - TLocation &NewLoc, TRotation &NewRot); - bool __fastcall ChangeOffsetH(double DeltaOffset); - __fastcall T_MoverParameters(double VelInitial, AnsiString TypeNameInit, AnsiString NameInit, int LoadInitial - , AnsiString LoadTypeInitial, int Cab); - bool __fastcall LoadChkFile(AnsiString chkpath); - bool __fastcall CheckLocomotiveParameters(bool ReadyFlag, int Dir); - AnsiString __fastcall EngineDescription(int what); - bool __fastcall DoorLeft(bool State); - bool __fastcall DoorRight(bool State); - bool __fastcall DoorBlockedFlag(void); - bool __fastcall PantFront(bool State); - bool __fastcall PantRear(bool State); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall T_MoverParameters(void) : System::TObject() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~T_MoverParameters(void) { } - #pragma option pop - -}; - - -//-- var, const, procedure --------------------------------------------------- -static const bool Go = true; -static const bool Hold = false; -static const Shortint ResArraySize = 0x40; -static const Shortint MotorParametersArraySize = 0xa; -static const Shortint maxcc = 0x4; -static const Shortint LocalBrakePosNo = 0xa; -static const Shortint MainBrakeMaxPos = 0xa; -static const Shortint ManualBrakePosNo = 0x14; -static const Shortint LightsSwitchPosNo = 0x10; -static const Shortint dtrack_railwear = 0x2; -static const Shortint dtrack_freerail = 0x4; -static const Shortint dtrack_thinrail = 0x8; -static const Shortint dtrack_railbend = 0x10; -static const Shortint dtrack_plants = 0x20; -static const Shortint dtrack_nomove = 0x40; -static const Byte dtrack_norail = 0x80; -static const Shortint dtrain_thinwheel = 0x1; -static const Shortint dtrain_loadshift = 0x1; -static const Shortint dtrain_wheelwear = 0x2; -static const Shortint dtrain_bearing = 0x4; -static const Shortint dtrain_coupling = 0x8; -static const Shortint dtrain_ventilator = 0x10; -static const Shortint dtrain_loaddamage = 0x10; -static const Shortint dtrain_engine = 0x20; -static const Shortint dtrain_loaddestroyed = 0x20; -static const Shortint dtrain_axle = 0x40; -static const Byte dtrain_out = 0x80; -#define p_elengproblem (1.000000E-02) -#define p_elengdamage (1.000000E-01) -#define p_coupldmg (2.000000E-02) -#define p_derail (1.000000E-03) -#define p_accn (1.000000E-01) -#define p_slippdmg (1.000000E-03) -static const Shortint ctrain_virtual = 0x0; -static const Shortint ctrain_coupler = 0x1; -static const Shortint ctrain_pneumatic = 0x2; -static const Shortint ctrain_controll = 0x4; -static const Shortint ctrain_power = 0x8; -static const Shortint ctrain_passenger = 0x10; -static const Shortint ctrain_scndpneumatic = 0x20; -static const Shortint ctrain_heating = 0x40; -static const Byte ctrain_depot = 0x80; -static const Shortint dbrake_none = 0x0; -static const Shortint dbrake_passive = 0x1; -static const Shortint dbrake_switch = 0x2; -static const Shortint dbrake_reversal = 0x4; -static const Shortint dbrake_automatic = 0x8; -static const Shortint s_waiting = 0x1; -static const Shortint s_aware = 0x2; -static const Shortint s_active = 0x4; -static const Shortint s_CAalarm = 0x8; -static const Shortint s_SHPalarm = 0x10; -static const Shortint s_CAebrake = 0x20; -static const Shortint s_SHPebrake = 0x40; -static const Byte s_CAtest = 0x80; -static const Shortint sound_none = 0x0; -static const Shortint sound_loud = 0x1; -static const Shortint sound_couplerstretch = 0x2; -static const Shortint sound_bufferclamp = 0x4; -static const Shortint sound_bufferbump = 0x8; -static const Shortint sound_relay = 0x10; -static const Shortint sound_manyrelay = 0x20; -static const Shortint sound_brakeacc = 0x40; -extern PACKAGE bool PhysicActivationFlag; -static const Shortint dt_Default = 0x0; -static const Shortint dt_EZT = 0x1; -static const Shortint dt_ET41 = 0x2; -static const Shortint dt_ET42 = 0x4; -static const Shortint dt_PseudoDiesel = 0x8; -static const Shortint dt_ET22 = 0x10; -static const Shortint dt_SN61 = 0x20; -static const Shortint dt_EP05 = 0x40; -static const Byte dt_ET40 = 0x80; -static const Word dt_181 = 0x100; -static const Shortint eimc_s_dfic = 0x0; -static const Shortint eimc_s_dfmax = 0x1; -static const Shortint eimc_s_p = 0x2; -static const Shortint eimc_s_cfu = 0x3; -static const Shortint eimc_s_cim = 0x4; -static const Shortint eimc_s_icif = 0x5; -static const Shortint eimc_f_Uzmax = 0x7; -static const Shortint eimc_f_uzh = 0x8; -static const Shortint eimc_f_DU = 0x9; -static const Shortint eimc_f_I0 = 0xa; -static const Shortint eimc_f_cfu = 0xb; -static const Shortint eimc_p_F0 = 0xd; -static const Shortint eimc_p_a1 = 0xe; -static const Shortint eimc_p_Pmax = 0xf; -static const Shortint eimc_p_Fh = 0x10; -static const Shortint eimc_p_Ph = 0x11; -static const Shortint eimc_p_Vh0 = 0x12; -static const Shortint eimc_p_Vh1 = 0x13; -static const Shortint eimc_p_Imax = 0x14; -static const Shortint eimc_p_abed = 0x15; -static const Shortint eimc_p_eped = 0x16; -static const Shortint eimv_FMAXMAX = 0x0; -static const Shortint eimv_Fmax = 0x1; -static const Shortint eimv_ks = 0x2; -static const Shortint eimv_df = 0x3; -static const Shortint eimv_fp = 0x4; -static const Shortint eimv_U = 0x5; -static const Shortint eimv_pole = 0x6; -static const Shortint eimv_Ic = 0x7; -static const Shortint eimv_If = 0x8; -static const Shortint eimv_M = 0x9; -static const Shortint eimv_Fr = 0xa; -static const Shortint eimv_Ipoj = 0xb; -static const Shortint eimv_Pm = 0xc; -static const Shortint eimv_Pe = 0xd; -static const Shortint eimv_eta = 0xe; -static const Shortint eimv_fkr = 0xf; -static const Shortint eimv_Uzsmax = 0x10; -static const Shortint eimv_Pmax = 0x11; -static const Shortint eimv_Fzad = 0x12; -static const Shortint eimv_Imax = 0x13; -static const Shortint eimv_Fful = 0x14; -static const Shortint bom_PS = 0x1; -static const Shortint bom_PN = 0x2; -static const Shortint bom_EP = 0x4; -static const Shortint bom_MED = 0x8; -extern PACKAGE double __fastcall Distance(const TLocation &Loc1, const TLocation &Loc2, const TDimension - &Dim1, const TDimension &Dim2); - -} /* namespace _mover */ -#if !defined(NO_IMPLICIT_NAMESPACE_USE) -using namespace _mover; -#endif -#pragma option pop // -w- -#pragma option pop // -Vx - -#pragma delphiheader end. -//-- end unit ---------------------------------------------------------------- -#endif // _mover diff --git a/McZapkie/Oerlikon_ESt.hpp b/McZapkie/Oerlikon_ESt.hpp deleted file mode 100644 index a3bd4b73..00000000 --- a/McZapkie/Oerlikon_ESt.hpp +++ /dev/null @@ -1,293 +0,0 @@ -// Borland C++ Builder -// Copyright (c) 1995, 1999 by Borland International -// All rights reserved - -// (DO NOT EDIT: machine generated header) 'Oerlikon_ESt.pas' rev: 5.00 - -#ifndef Oerlikon_EStHPP -#define Oerlikon_EStHPP - -#pragma delphiheader begin -#pragma option push -w- -#pragma option push -Vx -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit - -//-- user supplied ----------------------------------------------------------- - -namespace Oerlikon_est -{ -//-- type declarations ------------------------------------------------------- -class DELPHICLASS TPrzekladnik; -class PASCALIMPLEMENTATION TPrzekladnik : public TReservoir -{ - typedef TReservoir inherited; - -public: - TReservoir* *BrakeRes; - TReservoir* *Next; - virtual void __fastcall Update(double dt); -public: - #pragma option push -w-inl - /* TReservoir.Create */ inline __fastcall TPrzekladnik(void) : TReservoir() { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TPrzekladnik(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TRura; -class PASCALIMPLEMENTATION TRura : public TPrzekladnik -{ - typedef TPrzekladnik inherited; - -public: - virtual double __fastcall P(void); - virtual void __fastcall Update(double dt); -public: - #pragma option push -w-inl - /* TReservoir.Create */ inline __fastcall TRura(void) : TPrzekladnik() { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TRura(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TPrzeciwposlizg; -class PASCALIMPLEMENTATION TPrzeciwposlizg : public TRura -{ - typedef TRura inherited; - -private: - bool Poslizg; - -public: - void __fastcall SetPoslizg(bool flag); - virtual void __fastcall Update(double dt); -public: - #pragma option push -w-inl - /* TReservoir.Create */ inline __fastcall TPrzeciwposlizg(void) : TRura() { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TPrzeciwposlizg(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TRapid; -class PASCALIMPLEMENTATION TRapid : public TPrzekladnik -{ - typedef TPrzekladnik inherited; - -private: - bool RapidStatus; - double RapidMult; - double DN; - double DL; - -public: - void __fastcall SetRapidParams(double mult, double size); - void __fastcall SetRapidStatus(bool rs); - virtual void __fastcall Update(double dt); -public: - #pragma option push -w-inl - /* TReservoir.Create */ inline __fastcall TRapid(void) : TPrzekladnik() { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TRapid(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TPrzekCiagly; -class PASCALIMPLEMENTATION TPrzekCiagly : public TPrzekladnik -{ - typedef TPrzekladnik inherited; - -private: - double Mult; - -public: - void __fastcall SetMult(double m); - virtual void __fastcall Update(double dt); -public: - #pragma option push -w-inl - /* TReservoir.Create */ inline __fastcall TPrzekCiagly(void) : TPrzekladnik() { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TPrzekCiagly(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TPrzek_PZZ; -class PASCALIMPLEMENTATION TPrzek_PZZ : public TPrzekladnik -{ - typedef TPrzekladnik inherited; - -private: - double LBP; - -public: - void __fastcall SetLBP(double P); - virtual void __fastcall Update(double dt); -public: - #pragma option push -w-inl - /* TReservoir.Create */ inline __fastcall TPrzek_PZZ(void) : TPrzekladnik() { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TPrzek_PZZ(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TPrzekZalamany; -class PASCALIMPLEMENTATION TPrzekZalamany : public TPrzekladnik -{ - typedef TPrzekladnik inherited; - -public: - #pragma option push -w-inl - /* TReservoir.Create */ inline __fastcall TPrzekZalamany(void) : TPrzekladnik() { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TPrzekZalamany(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TPrzekED; -class PASCALIMPLEMENTATION TPrzekED : public TRura -{ - typedef TRura inherited; - -private: - double MaxP; - -public: - void __fastcall SetP(double P); - virtual void __fastcall Update(double dt); -public: - #pragma option push -w-inl - /* TReservoir.Create */ inline __fastcall TPrzekED(void) : TRura() { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TPrzekED(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TNESt3; -class PASCALIMPLEMENTATION TNESt3 : public Hamulce::TBrake -{ - typedef Hamulce::TBrake inherited; - -private: - double Nozzles[11]; - Hamulce::TReservoir* CntrlRes; - double BVM; - bool Zamykajacy; - bool Przys_blok; - Hamulce::TReservoir* Miedzypoj; - TPrzekladnik* Przekladniki[3]; - bool RapidStatus; - bool RapidStaly; - double LoadC; - double TareM; - double LoadM; - double TareBP; - double HBG300; - double Podskok; - bool autom; - double LBP; - -public: - virtual double __fastcall GetPF(double PP, double dt, double Vel); - void __fastcall EStParams(double i_crc); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - virtual double __fastcall GetCRP(void); - void __fastcall CheckState(double BCP, double &dV1); - void __fastcall CheckReleaser(double dt); - double __fastcall CVs(double bp); - double __fastcall BVs(double BCP); - void __fastcall SetSize(int size, AnsiString params); - void __fastcall PLC(double mass); - void __fastcall SetLP(double TM, double LM, double TBP); - virtual void __fastcall ForceEmptiness(void); - void __fastcall SetLBP(double P); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TNESt3(double i_mbp, double i_bcr, double i_bcd, double i_brc - , Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : Hamulce::TBrake(i_mbp, i_bcr, i_bcd - , i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TNESt3(void) { } - #pragma option pop - -}; - - -//-- var, const, procedure --------------------------------------------------- -static const Shortint dMAX = 0xa; -static const Shortint dON = 0x0; -static const Shortint dOO = 0x1; -static const Shortint dTN = 0x2; -static const Shortint dTO = 0x3; -static const Shortint dP = 0x4; -static const Shortint dSd = 0x5; -static const Shortint dSm = 0x6; -static const Shortint dPd = 0x7; -static const Shortint dPm = 0x8; -static const Shortint dPO = 0x9; -static const Shortint dPT = 0xa; -static const Shortint p_none = 0x0; -static const Shortint p_rapid = 0x1; -static const Shortint p_pp = 0x2; -static const Shortint p_al2 = 0x3; -static const Shortint p_ppz = 0x4; -static const Shortint P_ed = 0x5; -extern PACKAGE double __fastcall d2A(double d); - -} /* namespace Oerlikon_est */ -#if !defined(NO_IMPLICIT_NAMESPACE_USE) -using namespace Oerlikon_est; -#endif -#pragma option pop // -w- -#pragma option pop // -Vx - -#pragma delphiheader end. -//-- end unit ---------------------------------------------------------------- -#endif // Oerlikon_ESt diff --git a/McZapkie/Oerlikon_ESt.pas b/McZapkie/Oerlikon_ESt.pas deleted file mode 100644 index af94f1bc..00000000 --- a/McZapkie/Oerlikon_ESt.pas +++ /dev/null @@ -1,805 +0,0 @@ -unit Oerlikon_ESt; {fizyka hamulcow Oerlikon ESt dla symulatora} - -(* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*) -(* - MaSzyna EU07 - SPKS - Brakes. Oerlikon ESt. - Copyright (C) 2007-2014 Maciej Cierniak -*) - - -(* -(C) youBy -Co jest: -- glowny przyrzad rozrzadczy -- napelniacz zbiornika pomocniczego -- napelniacz zbiornika sterujacego -- zawor podskoku -- nibyprzyspieszacz -- tylko 16",14",12",10" -- nieprzekladnik rura -- przekladnik 1:1 -- przekladniki AL2 -- przeciwposlizgi -- rapid REL2 -- HGB300 -- inne srednice -Co brakuje: -- dobry przyspieszacz -- mozliwosc zasilania z wysokiego cisnienia ESt4 -- ep: EP1 i EP2 -- samoczynne ep -- PZZ dla dodatkowego -*) - -interface - -uses mctools,sysutils,friction,hamulce;//,klasy_ham; - -CONST - dMAX=10; //dysze - dON = 0; //osobowy napelnianie (+ZP) - dOO = 1; //osobowy oproznianie - dTN = 2; //towarowy napelnianie (+ZP) - dTO = 3; //towarowy oproznianie - dP = 4; //zbiornik pomocniczy - dSd = 5; //zbiornik sterujacy - dSm = 6; //zbiornik sterujacy - dPd = 7; //duzy przelot zamykajcego - dPm = 8; //maly przelot zamykajacego - dPO = 9; //zasilanie pomocniczego O - dPT =10; //zasilanie pomocniczego T - -//przekladniki - p_none = 0; - p_rapid = 1; - p_pp = 2; - p_al2 = 3; - p_ppz = 4; - P_ed = 5; - - - -TYPE - TPrzekladnik= class(TReservoir) //przekladnik (powtarzacz) - private - public - BrakeRes: PReservoir; - Next: PReservoir; - procedure Update(dt:real); virtual; - end; - - TRura= class(TPrzekladnik) //nieprzekladnik, rura laczaca - private - public - function P: real; override; - procedure Update(dt:real); override; - end; - - TPrzeciwposlizg= class(TRura) //przy napelnianiu - rura, przy poslizgu - upust - private - Poslizg: boolean; - public - procedure SetPoslizg(flag: boolean); - procedure Update(dt:real); override; - end; - - TRapid= class(TPrzekladnik) //przekladnik dwustopniowy - private - RapidStatus: boolean; //status rapidu - RapidMult: real; //przelozenie (w dol) -// Komora2: real; - DN,DL: real; //srednice dysz napelniania i luzowania - public - procedure SetRapidParams(mult: real; size: real); - procedure SetRapidStatus(rs: boolean); - procedure Update(dt:real); override; - end; - - TPrzekCiagly= class(TPrzekladnik) //AL2 - private - Mult: real; - public - procedure SetMult(m: real); - procedure Update(dt:real); override; - end; - - TPrzek_PZZ= class(TPrzekladnik) //podwojny zawor zwrotny - private - LBP: real; - public - procedure SetLBP(P: real); - procedure Update(dt:real); override; - end; - - TPrzekZalamany= class(TPrzekladnik) //Knicksventil - private - public - end; - - TPrzekED= class(TRura) //przy napelnianiu - rura, przy hamowaniu - upust - private - MaxP: real; - public - procedure SetP(P: real); - procedure Update(dt:real); override; - end; - - TNESt3= class(TBrake) - private - Nozzles: array[0..dMAX] of real; //dysze - CntrlRes: TReservoir; //zbiornik sterujcy - BVM: real; //przelozenie PG-CH -// ValveFlag: byte; //polozenie roznych zaworkow - Zamykajacy: boolean; //pamiec zaworka zamykajacego -// Przys_wlot: boolean; //wlot do komory przyspieszacza - Przys_blok: boolean; //blokada przyspieszacza - Miedzypoj: TReservoir; //pojemnosc posrednia (urojona) do napelniania ZP i ZS - Przekladniki: array[1..3] of TPrzekladnik; - RapidStatus: boolean; - RapidStaly: boolean; - LoadC: real; - TareM, LoadM: real; //masa proznego i pelnego - TareBP: real; //cisnienie dla proznego - HBG300: real; //zawor ograniczajacy cisnienie - Podskok: real; //podskok preznosci poczatkowej -// HPBR: real; //zasilanie ZP z wysokiego cisnienia - autom: boolean; //odluzniacz samoczynny - LBP: real; //cisnienie hamulca pomocniczego - public - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - procedure EStParams(i_crc: real); //parametry charakterystyczne dla ESt - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - function GetCRP: real; override; - procedure CheckState(BCP: real; var dV1: real); //glowny przyrzad rozrzadczy - procedure CheckReleaser(dt: real); //odluzniacz - function CVs(bp: real): real; //napelniacz sterujacego - function BVs(BCP: real): real; //napelniacz pomocniczego - procedure SetSize(size: integer; params: string); //ustawianie dysz (rozmiaru ZR), przekladniki - procedure PLC(mass: real); //wspolczynnik cisnienia przystawki wazacej - procedure SetLP(TM, LM, TBP: real); //parametry przystawki wazacej - procedure ForceEmptiness(); override; //wymuszenie bycia pustym - procedure SetLBP(P: real); //cisnienie z hamulca pomocniczego - end; - -function d2A(d: real):real; - -implementation - -function d2A(d: real):real; -begin - d2A:=(d*d)*0.7854/1000; -end; - -// ------ RURA ------ - -function TRura.P: real; -begin - P:=Next.P; -end; - -procedure TRura.Update(dt: real); -begin - Next.Flow(dVol); - dVol:=0; -end; - -// ------ PRZECIWPOSLIG ------ - -procedure TPrzeciwposlizg.SetPoslizg(flag: boolean); -begin - Poslizg:=flag; -end; - -procedure TPrzeciwposlizg.Update(dt: real); -begin - if (Poslizg) then - begin - BrakeRes.Flow(dVol); - Next.Flow(PF(Next.P,0,d2A(10))*dt); - end - else - Next.Flow(dVol); - dVol:=0; -end; - - -// ------ PRZEKLADNIK ------ - -procedure TPrzekladnik.Update(dt: real); -var BCP, BVP, dV: real; -begin - - BCP:=Next.P; - BVP:=BrakeRes.P; - - if(BCP>P)then - dV:=-PFVd(BCP,0,d2A(10),P)*dt - else - if(BCP0 then - BrakeRes.Flow(-dV); - -end; - -// ------ PRZEKLADNIK RAPID ------ - -procedure TRapid.SetRapidParams(mult: real; size: real); -begin - RapidMult:=mult; - RapidStatus:=false; - if (size>0.1) then //dopasowywanie srednicy przekladnika - begin - DN:=D2A(size*0.4); - DL:=D2A(size*0.4); - end - else - begin - DN:=D2A(5); - DL:=D2A(5); - end; -end; - -procedure TRapid.SetRapidStatus(rs: boolean); -begin - RapidStatus:=rs; -end; - -procedure TRapid.Update(dt: real); -var BCP, BVP, dV, ActMult: real; -begin - BVP:=BrakeRes.P; - BCP:=Next.P; - - if(RapidStatus)then - begin - ActMult:=RapidMult; - end - else - begin - ActMult:=1; - end; - - if(BCP*RapidMult>P*actMult)then - dV:=-PFVd(BCP,0,DL,P*actMult/RapidMult)*dt - else - if(BCP*RapidMult0 then - BrakeRes.Flow(-dV); - -end; - -// ------ PRZEKADNIK CIGY ------ - -procedure TPrzekCiagly.SetMult(m:real); -begin - Mult:=m; -end; - -procedure TPrzekCiagly.Update(dt: real); -var BCP, BVP, dV: real; -begin - BVP:=BrakeRes.P; - BCP:=Next.P; - - if(BCP>P*Mult)then - dV:=-PFVd(BCP,0,d2A(8),P*Mult)*dt - else - if(BCP0 then - BrakeRes.Flow(-dV); - -end; - -// ------ PRZEKADNIK CIGY ------ - -procedure TPrzek_PZZ.SetLBP(P:real); -begin - LBP:=P; -end; - -procedure TPrzek_PZZ.Update(dt: real); -var BCP, BVP, dV, Pgr: real; -begin - BVP:=BrakeRes.P; - BCP:=Next.P; - - Pgr:=Max0R(LBP,P); - - if(BCP>Pgr)then - dV:=-PFVd(BCP,0,d2A(8),Pgr)*dt - else - if(BCP0 then - BrakeRes.Flow(-dV); - -end; - -// ------ PRZECIWPOSLIG ------ - -procedure TPrzekED.SetP(P: real); -begin - MaxP:=P; -end; - -procedure TPrzekED.Update(dt: real); -begin - if Next.P>MaxP then - begin - BrakeRes.Flow(dVol); - Next.Flow(PFVd(Next.P,0,d2A(10)*dt,MaxP)); - end - else - Next.Flow(dVol); - dVol:=0; -end; - - -// ------ OERLIKON EST NA BOGATO ------ - -function TNESt3.GetPF(PP, dt, Vel: real): real; //przeplyw miedzy komora wstepna i PG -var dv, dv1, temp:real; - VVP, BVP, BCP, CVP, MPP, nastG: real; - i: byte; -begin - BVP:=BrakeRes.P; - VVP:=ValveRes.P; -// BCP:=BrakeCyl.P; - BCP:=Przekladniki[1].P; - CVP:=CntrlRes.P-0.0; - MPP:=Miedzypoj.P; - dV1:=0; - - nastG:=(BrakeDelayFlag and bdelay_G); - -//sprawdzanie stanu - CheckState(BCP, dV1); - CheckReleaser(dt); - -//luzowanie - if(BrakeStatus and b_hld)=b_off then - dV:=PF(0,BCP,Nozzles[dTO]*nastG+(1-nastG)*Nozzles[dOO])*dt*(0.1+4.9*Min0R(0.2,BCP-((CVP-0.05-VVP)*BVM+0.1))) - else dV:=0; -// BrakeCyl.Flow(-dV); - Przekladniki[1].Flow(-dV); - if((BrakeStatus and b_on)=b_on)and(Przekladniki[1].P*HBG30070) or ((RapidStatus) and (Abs(Vel)>50)) or (RapidStaly))); - (Przekladniki[i] as TRapid).SetRapidStatus(RapidStatus); - end - else - if (Przekladniki[i] is TPrzeciwposlizg) then - (Przekladniki[i] as TPrzeciwposlizg).SetPoslizg((BrakeStatus and b_asb)=b_asb) - else - if (Przekladniki[i] is TPrzekED) then - if (Vel<-15) then - (Przekladniki[i] as TPrzekED).SetP(0) - else (Przekladniki[i] as TPrzekED).SetP(MaxBP*3) - else - if (Przekladniki[i] is TPrzekCiagly) then - (Przekladniki[i] as TPrzekCiagly).SetMult(LoadC) - else - if (Przekladniki[i] is TPrzek_PZZ) then - (Przekladniki[i] as TPrzek_PZZ).SetLBP(LBP); - end; - - -//przeplyw testowy miedzypojemnosci - dV:=PF(MPP,VVP,BVs(BCP))+PF(MPP,CVP,CVs(BCP)); - if(MPP-0.05>BVP)then - dV:=dV+PF(MPP-0.05,BVP,Nozzles[dPT]*nastG+(1-nastG)*Nozzles[dPO]); - if MPP>VVP then dV:=dV+PF(MPP,VVP,d2A(5)); - Miedzypoj.Flow(dV*dt*0.15); - - -//przeplyw ZS <-> PG - temp:=CVs(BCP); - dV:=PF(CVP,MPP,temp)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.02*dV); - dV1:=dV1+0.98*dV; - -//przeplyw ZP <-> MPJ - if(MPP-0.05>BVP)then - dV:=PF(BVP,MPP-0.05,Nozzles[dPT]*nastG+(1-nastG)*Nozzles[dPO])*dt - else dV:=0; - BrakeRes.Flow(dV); - dV1:=dV1+dV*0.98; - ValveRes.Flow(-0.02*dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.005)*dt; //0.01 - ValveRes.Flow(-dV); - - - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - CntrlRes.Act; - Miedzypoj.Act; - Przekladniki[1].Act; - Przekladniki[2].Act; - Przekladniki[3].Act; - GetPF:=dV-dV1; -end; - - -procedure TNESt3.EStParams(i_crc: real); //parametry charakterystyczne dla ESt -begin - -end; - - -procedure TNESt3.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - ValveRes.CreatePress(1*PP); - BrakeCyl.CreatePress(1*BP); - BrakeRes.CreatePress(1*PP); - CntrlRes:=TReservoir.Create; - CntrlRes.CreateCap(15); - CntrlRes.CreatePress(1*HPP); - BrakeStatus:=Byte(BP>1)*1; - Miedzypoj:=TReservoir.Create; - Miedzypoj.CreateCap(5); - Miedzypoj.CreatePress(PP); - - BVM:=1/(HPP-0.05-LPP)*MaxBP; - - BrakeDelayFlag:=BDF; - - Zamykajacy:=false; - - if not ((FM is TDisk1) or (FM is TDisk2)) then //jesli zeliwo to schodz - RapidStaly:=false - else - RapidStaly:=true; - -end; - - -function TNESt3.GetCRP: real; -begin - GetCRP:=CntrlRes.P; -// GetCRP:=Przekladniki[1].P; -// GetCRP:=Miedzypoj.P; -end; - - -procedure TNESt3.CheckState(BCP: real; var dV1: real); //glowny przyrzad rozrzadczy -var VVP, BVP, CVP, MPP: real; -begin - BVP:=BrakeRes.P; //-> tu ma byc komora rozprezna - VVP:=ValveRes.P; - CVP:=CntrlRes.P; - MPP:=Miedzypoj.P; - - if(BCP<0.25)and(VVP+0.08>CVP)then Przys_blok:=false; - -//sprawdzanie stanu -// if ((BrakeStatus and 1)=1)and(BCP>0.25)then - if(VVP+0.01+BCP/BVMCVP-0.05) then - BrakeStatus:=(BrakeStatus and 252) //luzowanie - else if(VVP+BCP/BVM>CVP-0.05) then - BrakeStatus:=(BrakeStatus and 253) //zatrzymanie napelaniania - else if(VVP+(BCP-0.1)/BVM0.25)then //zatrzymanie luzowania - BrakeStatus:=(BrakeStatus or 1); - - if (BrakeStatus and 1)=0 then - SoundFlag:=SoundFlag or sf_CylU; - - if(VVP+0.100.5)then - Zamykajacy:=true - else if(VVP-0.6 PG - if(MPPCVP-0.08)then - CVs:=Nozzles[dSD] - else - CVs:=Nozzles[dSm]; -end; - - -function TNESt3.BVs(BCP: real): real; //napelniacz pomocniczego -var CVP, MPP: real; -begin - CVP:=CntrlRes.P; - MPP:=Miedzypoj.P; - -//przeplyw ZP <-> rozdzielacz - if(MPP0 then - begin - Podskok:=0.7; - Przekladniki[1]:=TRura.Create; - Przekladniki[3]:=TRura.Create; - end - else - begin - Podskok:=-1; - Przekladniki[1]:=TRapid.Create; - if Pos('-s216',params)>0 then - (Przekladniki[1] as TRapid).SetRapidParams(2,16) - else - (Przekladniki[1] as TRapid).SetRapidParams(2,0); - Przekladniki[3]:=TPrzeciwposlizg.Create; - if Pos('-ED',params)>0 then - begin - Przekladniki[3].Free(); - (Przekladniki[1] as TRapid).SetRapidParams(2,18); - Przekladniki[3]:=TPrzekED.Create; - end; - end; - - if Pos('AL2',params)>0 then - Przekladniki[2]:=TPrzekCiagly.Create - else - if Pos('PZZ',params)>0 then - Przekladniki[2]:=TPrzek_PZZ.Create - else - Przekladniki[2]:=TRura.Create; - - if (Pos('3d',params)+Pos('4d',params)>0) then autom:=false else autom:=true; - if (Pos('HBG300',params)>0) then HBG300:=1 else HBG300:=0; - - case size of - 16: - begin //dON,dOO,dTN,dTO,dP,dS - Nozzles[dON]:=5.0;//5.0; - Nozzles[dOO]:=3.4;//3.4; - Nozzles[dTN]:=2.0; - Nozzles[dTO]:=1.75; - Nozzles[dP]:=3.8; - Nozzles[dPd]:=2.70; - Nozzles[dPm]:=1.25; - Nozzles[dPO]:=Nozzles[dON]; - Nozzles[dPT]:=Nozzles[dTN]; - end; - 14: - begin //dON,dOO,dTN,dTO,dP,dS - Nozzles[dON]:=4.3; - Nozzles[dOO]:=2.85; - Nozzles[dTN]:=1.83; - Nozzles[dTO]:=1.57; - Nozzles[dP]:=3.4; - Nozzles[dPd]:=2.20; - Nozzles[dPm]:=1.10; - Nozzles[dPO]:=Nozzles[dON]; - Nozzles[dPT]:=Nozzles[dTN]; - end; - 12: - begin //dON,dOO,dTN,dTO,dP,dS - Nozzles[dON]:=3.7; - Nozzles[dOO]:=2.50; - Nozzles[dTN]:=1.65; - Nozzles[dTO]:=1.39; - Nozzles[dP]:=2.65; - Nozzles[dPd]:=1.80; - Nozzles[dPm]:=0.85; - Nozzles[dPO]:=Nozzles[dON]; - Nozzles[dPT]:=Nozzles[dTN]; - end; - 10: - begin //dON,dOO,dTN,dTO,dP,dS - Nozzles[dON]:=3.1; - Nozzles[dOO]:=2.0; - Nozzles[dTN]:=1.35; - Nozzles[dTO]:=1.13; - Nozzles[dP]:=1.6; - Nozzles[dPd]:=1.55; - Nozzles[dPm]:=0.7; - Nozzles[dPO]:=Nozzles[dON]; - Nozzles[dPT]:=Nozzles[dTN]; - end; - 200: - begin //dON,dOO,dTN,dTO,dP,dS - Nozzles[dON]:=dNO1l; - Nozzles[dOO]:=dOO1l/1.15; - Nozzles[dTN]:=dNT1l; - Nozzles[dTO]:=dOT1l; - Nozzles[dP]:=7.4; - Nozzles[dPd]:=5.3; - Nozzles[dPm]:=2.5; - Nozzles[dPO]:=7.28; - Nozzles[dPT]:=2.96; - end; - 375: - begin //dON,dOO,dTN,dTO,dP,dS - Nozzles[dON]:=dNO1l; - Nozzles[dOO]:=dOO1l/1.15; - Nozzles[dTN]:=dNT1l; - Nozzles[dTO]:=dOT1l; - Nozzles[dP]:=13.0; - Nozzles[dPd]:=9.6; - Nozzles[dPm]:=4.4; - Nozzles[dPO]:=9.92; - Nozzles[dPT]:=3.99; - end; - 150: - begin //dON,dOO,dTN,dTO,dP,dS - Nozzles[dON]:=dNO1l; - Nozzles[dOO]:=dOO1l; - Nozzles[dTN]:=dNT1l; - Nozzles[dTO]:=dOT1l; - Nozzles[dP]:=5.8; - Nozzles[dPd]:=4.1; - Nozzles[dPm]:=1.9; - Nozzles[dPO]:=6.33; - Nozzles[dPT]:=2.58; - end; - 100: - begin //dON,dOO,dTN,dTO,dP,dS - Nozzles[dON]:=dNO1l; - Nozzles[dOO]:=dOO1l; - Nozzles[dTN]:=dNT1l; - Nozzles[dTO]:=dOT1l; - Nozzles[dP]:=4.2; - Nozzles[dPd]:=2.9; - Nozzles[dPm]:=1.4; - Nozzles[dPO]:=5.19; - Nozzles[dPT]:=2.14; - end; - else - begin - Nozzles[dON]:=0; - Nozzles[dOO]:=0; - Nozzles[dTN]:=0; - Nozzles[dTO]:=0; - Nozzles[dP]:=0; - Nozzles[dPd]:=0; - Nozzles[dPm]:=0; - end; - end; - - Nozzles[dSd]:=1.1; - Nozzles[dSm]:=0.9; - - //przeliczanie z mm^2 na l/m - for i:=0 to dMAX do - begin - Nozzles[i]:=d2A(Nozzles[i]); //(/1000^2*pi/4*1000) - end; - - for i:=1 to 3 do - begin - Przekladniki[i].BrakeRes:=@BrakeRes; - Przekladniki[i].CreateCap(i); - Przekladniki[i].CreatePress(BrakeCyl.P); - if i<3 then - Przekladniki[i].Next:=@Przekladniki[i+1] - else - Przekladniki[i].Next:=@BrakeCyl; - end -end; - -end. diff --git a/McZapkie/Unit1.pas b/McZapkie/Unit1.pas deleted file mode 100644 index 1ff4a41d..00000000 --- a/McZapkie/Unit1.pas +++ /dev/null @@ -1,493 +0,0 @@ -unit Unit1; - -(* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*) - -interface - -uses - ai_driver,mtable,mover,mctools,Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, - StdCtrls, ExtCtrls; - -type - TForm1 = class(TForm) - Button1: TButton; - Button2: TButton; - Button3: TButton; - Button4: TButton; - Button5: TButton; - Button6: TButton; - Label2: TLabel; - Label3: TLabel; - Timer1: TTimer; - Label4: TLabel; - Label5: TLabel; - Label6: TLabel; - Label9: TLabel; - Label10: TLabel; - Label11: TLabel; - Button7: TButton; - Button8: TButton; - Label12: TLabel; - Label13: TLabel; - Label14: TLabel; - Label15: TLabel; - Button9: TButton; - Button10: TButton; - Label16: TLabel; - Label17: TLabel; - Label18: TLabel; - Label19: TLabel; - Button11: TButton; - Label20: TLabel; - Label21: TLabel; - Label22: TLabel; - Label23: TLabel; - Label24: TLabel; - Label25: TLabel; - lczas: TLabel; - Label28: TLabel; - Label29: TLabel; - Label30: TLabel; - Label31: TLabel; - Label32: TLabel; - Label33: TLabel; - Label34: TLabel; - Button12: TButton; - BStart: TButton; - Label35: TLabel; - Label36: TLabel; - Label37: TLabel; - Label38: TLabel; - Button13: TButton; - Label39: TLabel; - Label40: TLabel; - Label41: TLabel; - Label42: TLabel; - Label43: TLabel; - Button14: TButton; - Button15: TButton; - Label44: TLabel; - Label45: TLabel; - Label46: TLabel; - Label47: TLabel; - BMains: TButton; - Label48: TLabel; - Label49: TLabel; - Label50: TLabel; - Panel1: TPanel; - Label1: TLabel; - OpenDialog1: TOpenDialog; - Edit1: TEdit; - GroupBox1: TGroupBox; - CheckBox1: TCheckBox; - BSInc: TButton; - BSDec: TButton; - Label51: TLabel; - Label52: TLabel; - procedure Button1Click(Sender: TObject); - procedure Button2Click(Sender: TObject); - procedure Timer1Timer(Sender: TObject); - procedure FormCreate(Sender: TObject); - procedure Button5Click(Sender: TObject); - procedure Button6Click(Sender: TObject); - procedure Button7Click(Sender: TObject); - procedure Button8Click(Sender: TObject); - procedure Button3Click(Sender: TObject); - procedure Button4Click(Sender: TObject); - procedure Button9Click(Sender: TObject); - procedure Button10Click(Sender: TObject); - procedure Button11Click(Sender: TObject); - procedure Button12Click(Sender: TObject); - procedure BStartClick(Sender: TObject); - procedure Button13MouseDown(Sender: TObject; Button: TMouseButton; - Shift: TShiftState; X, Y: Integer); - procedure Button14Click(Sender: TObject); - procedure Button15Click(Sender: TObject); - procedure BMainsClick(Sender: TObject); - procedure CheckBox1Click(Sender: TObject); - procedure BSIncClick(Sender: TObject); - procedure BSDecClick(Sender: TObject); - private - { Private declarations } - public - { Public declarations } - end; - -const -mtno=30; -tno:integer=0; - -var -Form1: TForm1; -loc:TMoverParameters; -wagony:array[1..mtno] of TMoverParameters; -mechanik: TController; -pociag: TTrainParameters; -couplerflag:byte; -l0,l0p:TLocation; -ll:array[1..mtno] of TLocation; -r0:TRotation; -rr:array[1..mtno] of TRotation; -Shape:TTrackShape; Track:TTrackParam; -ExternalVoltage:real; -ActualTime:real; -fout: text; -OK:boolean; - -implementation - -{$R *.DFM} - -procedure TForm1.Button1Click(Sender: TObject); -var typename,path:string;slashpos:byte; -begin - -couplerflag:=strtoint(Edit1.Text); -if tno>0 then - wagony[tno]:=TMoverParameters.Create; - -OpenDialog1.Execute; -path:=''; -typename:=OpenDialog1.Filename; -repeat - slashpos:=pos('\',typename); - if slashpos>0 then - typename:=copy(typename,slashpos+1,length(typename)); -until slashpos=0; -path:=copy(opendialog1.filename,1,length(opendialog1.filename)-length(typename)); -typename:=Copy(typename,1,Pos('.chk',typename)-1); - -if tno=0 then - begin - loc.Init(l0,r0,0,typename,'lokomotywa',0,'',1); - OK:=loc.loadchkfile(path) and loc.CheckLocomotiveParameters(Go); - if OK then - begin - Label1.Caption:=loc.TypeName; - case loc.AutoRelayType of - 2: CheckBox1.Enabled:=True; - 1: CheckBox1.Checked:=True; - end; - end; - end -else - begin - wagony[tno].Init(ll[tno],rr[tno],0,typename,IntToStr(tno),0,'',0); - OK:=OK and (wagony[tno].loadchkfile(path) and wagony[tno].CheckLocomotiveParameters(Go)); - if OK then - begin - Label1.Caption:=Label1.Caption+' '+wagony[tno].TypeName; - if tno=1 then - ll[tno].x:=loc.Loc.x-loc.Dim.L/2-wagony[tno].Dim.L/2 - else - ll[tno].x:=wagony[tno-1].Loc.x-wagony[tno-1].Dim.L/2-wagony[tno].Dim.L/2; - wagony[tno].loc:=ll[tno]; - if tno=1 then - begin - OK:=OK and loc.attach(2,@wagony[1],couplerflag); - OK:=OK and wagony[1].attach(1,@loc,couplerflag); - end - else - begin - OK:=OK and wagony[tno-1].attach(2,@wagony[tno],couplerflag); - OK:=OK and wagony[tno].attach(1,@wagony[tno-1],couplerflag); - end - end; - end; - - if OK then - begin - BStart.Enabled:=True; - if tno=mtno then button1.enabled:=false - else inc(tno); - Label49.Caption:='ilosc pojazdow '+inttostr(tno); - end - else - begin - Label1.Caption:=inttostr(conversionerror)+' '+inttostr(linecount); - Button1.Enabled:=False; - end; -end; - -procedure TForm1.Button2Click(Sender: TObject); -var iw:integer; -begin - if Timer1.Enabled then - begin - Timer1.Enabled:=False; - CloseFile(fout); - end; - mechanik.CloseLog; - mechanik.free; - loc.Free; - for iw:=1 to tno do - wagony[iw].Free; - Close; -end; - -procedure TForm1.Timer1Timer(Sender: TObject); -var dl,dt:real; iw:integer; -begin - dt:=Timer1.Interval/1000; - ActualTime:=ActualTime+dt; - if l0.x>200 then Shape.R:=1000; - if l0.x>1000 then Shape.R:=-500; - if l0.x>1500 then Shape.R:=0; - if l0.x>2000 then Shape.R:=1500; - if l0.x>2200 then Shape.R:=3000; - if l0.x>2400 then Shape.R:=0; - loc.ComputeTotalForce(dt); - for iw:=1 to tno do - wagony[iw].ComputeTotalForce(dt); - dl:=loc.ComputeMovement(dt,Shape,Track,ExternalVoltage,l0,r0); - l0.x:=l0.x+dl; - for iw:=1 to tno do - begin - dl:=wagony[iw].ComputeMovement(dt,Shape,Track,ExternalVoltage,ll[iw],rr[iw]); - ll[iw].x:=ll[iw].x+dl; - end; - - mechanik.UpdateSituation(dt); - - - l0p.x:=500; l0p.y:=2; l0.z:=0; - if (l0.x>-1) and (l0.x<5) then - loc.PutCommand('SetVelocity',60,-1,l0p); - if (l0.x>499) and (l0.x<505) then - loc.PutCommand('SetVelocity',-1,-1,l0); - l0p.x:=3600; - if (l0.x>2985) and (l0.x<3005) then - loc.PutCommand('SetVelocity',-1,0,l0p); - if (l0.x>3600) and (l0.x<3615) then - loc.PutCommand('SetVelocity',0,0,l0); - if (l0.x>3430) and (loc.Vel<0.01) and (mechanik.GetCurrentOrder=Obey_train) then - loc.PutCommand('SetVelocity',0,0,l0); - - if (loc.power>0) then - begin - Label2.Caption:='I0='+r2s(Loc.Im,0)+' A'; - Label3.Caption:=r2s(Loc.Ft/1000,0)+' kN'; - Label13.Caption:=IntToStr(Loc.MainCtrlPos); - Label18.Caption:=IntToStr(Loc.ScndCtrlPos); - Label20.Caption:=IntToStr(Loc.MainCtrlActualPos); - Label21.Caption:=IntToStr(Loc.ScndCtrlActualPos); - end - else - for iw:=1 to tno do - if wagony[iw].power>0 then - begin - Label2.Caption:='I'+IntToStr(iw)+'='+r2s(wagony[iw].Im,0)+' A'; - Label3.Caption:=r2s(wagony[iw].Ft/1000,0)+' kN'; - Label13.Caption:=IntToStr(wagony[iw].MainCtrlPos); - Label18.Caption:=IntToStr(wagony[iw].ScndCtrlPos); - Label20.Caption:=IntToStr(wagony[iw].MainCtrlActualPos); - Label21.Caption:=IntToStr(wagony[iw].ScndCtrlActualPos); - end; - Label4.Caption:=r2s(l0.x,0)+' m'; - Label5.Caption:=r2s(Sign(Loc.V)*Loc.Vel,0)+' km/h'; - Label6.Caption:=r2s(Loc.AccS,0)+' m/ss'; - Label9.Caption:=r2s(Loc.Fb/1000,0)+' kN'; - Label10.Caption:=r2s(Loc.Compressor,0)+' MPa'; - Label11.Caption:=r2s(Loc.PipePress,0)+' MPa'; - Label12.Caption:=r2s(Loc.BrakePress,0)+' MPa'; - - - Label14.Caption:=IntToStr(Loc.BrakeCtrlPos); - Label15.Caption:=IntToStr(Loc.LocalBrakePos); - - Label16.Caption:=IntToStr(Loc.showcurrent(1)); - Label17.Caption:=IntToStr(Loc.showcurrent(2)); - - if loc.SlippingWheels then - Label19.Caption:='Poslizg!' - else Label19.Caption:=' '; - - - Label22.Caption:=r2s(ll[1].x,0)+' m'; - if tno>=1 then - begin - Label23.Caption:=r2s(Sign(wagony[1].V)*wagony[1].Vel,0)+' km/h'; - Label24.Caption:=r2s(Distance(loc.loc,wagony[1].loc,loc.dim,wagony[1].dim),0)+' m'; - end; - Label25.Caption:=r2s(loc.nrot,0)+' 1/s'; - - Label28.Caption:=r2s(ll[2].x,0)+' m'; - - if tno>=2 then - Label29.Caption:=r2s(sign(wagony[2].V)*wagony[2].Vel,0)+' km/h'; - - Label30.Caption:=r2s(loc.dpLocalValve/dt,0)+' MPa/s'; - Label31.Caption:=r2s(loc.dpBrake/dt,0)+' MPa/s'; - Label32.Caption:=r2s(loc.dpMainValve/dt,0)+' MPa/s'; - Label33.Caption:=r2s(loc.dpPipe/dt,0)+' MPa/s'; - - if tno>0 then Label34.Caption:=r2s(wagony[tno].PipePress,0)+' MPa'; - - Label35.Caption:=r2s(ll[3].x,0)+' m'; - if tno>0 then Label36.Caption:=r2s(sign(wagony[tno].V)*wagony[tno].Vel,0)+' km/h'; - if tno>0 then Label37.Caption:=r2s(wagony[tno].couplers[1].cforce/1000,0)+' kN'; - if tno>0 then Label38.Caption:=r2s(wagony[tno].brakepress,0)+' MPa'; - - Label39.Caption:=r2s(loc.enginePower/1000,0)+' kW'; - Label40.Caption:=i2s(trunc(loc.Rventrot*60))+' /min'; - Label41.Visible:=loc.SandDose; - Label42.Caption:=r2s(mechanik.accdesired,0)+' m/ss'; - Label43.Caption:=r2s(mechanik.veldesired,0)+' km/h'; - if tno>0 then Label44.Caption:=r2s(ll[tno].x,0)+' m'; - Label45.Caption:=inttostr(loc.activedir); - Label46.Caption:=inttostr(ord(mechanik.orderlist[mechanik.orderpos])); - Label47.Caption:=inttostr(mechanik.orderpos); - Label48.Caption:=inttostr(ord(loc.mains)); -{ if tno>0 then Label51.Caption:=wagony[1].CommandIn.Command; - if tno>0 then Label52.Caption:=r2s(wagony[1].CommandIn.Value1,0); -} - Label51.Caption:=loc.CommandIn.Command; - Label52.Caption:=r2s(loc.CommandIn.Value1,0); - Lczas.Caption:=r2s(actualtime,0)+' s'; - writeln(fout,Actualtime,' ',{loc.v-wag.v,}loc.UnitBrakeForce,' ',loc.dpMainValve,{' ',loc.dpLocalValve,}' ',loc.accs,' ',loc.couplers[2].cforce,' ',{,l1.x}' '{,Distance(loc.loc,wagony[1].loc,loc.dim,wagony[1].dim)}); -end; - -procedure TForm1.FormCreate(Sender: TObject); -var iw:integer; -begin - Timer1.Enabled:=False; - tno:=0; - assignfile(fout,'log.dat'); - rewrite(fout); - ActualTime:=0; - loc:=TMoverParameters.Create; - Shape.R:=0; Shape.Len:=10000; Shape.dHtrack:=0; Shape.dHrail:=0; - Track.Width:=1435; Track.friction:=0.15; Track.CategoryFlag:=1; - Track.QualityFlag:=25; Track.DamageFlag:=0; - Track.VelMax:=120; - ExternalVoltage:=3000; - l0.x:=0; l0.y:=0; l0.z:=0; - r0.rx:=0; r0.ry:=0; r0.rz:=0; - for iw:=1 to mtno do - begin - rr[iw].rx:=0; rr[iw].ry:=0; rr[iw].rz:=0; - ll[iw].x:=0; ll[iw].y:=0; ll[iw].z:=0; - end; - -end; - -procedure TForm1.Button5Click(Sender: TObject); -begin - loc.incbrakelevel; -end; - -procedure TForm1.Button6Click(Sender: TObject); -begin - loc.decbrakelevel; -end; - -procedure TForm1.Button7Click(Sender: TObject); -begin - loc.inclocalbrakelevel(1); -end; - -procedure TForm1.Button8Click(Sender: TObject); -begin - loc.declocalbrakelevel(1); -end; - -procedure TForm1.Button3Click(Sender: TObject); -begin - loc.incmainctrl(1); -end; - -procedure TForm1.Button4Click(Sender: TObject); -begin - loc.decmainctrl(1); -end; - -procedure TForm1.Button9Click(Sender: TObject); -begin -loc.DirectionForward; -end; - -procedure TForm1.Button10Click(Sender: TObject); -begin - loc.DirectionBackward; -end; - -procedure TForm1.Button11Click(Sender: TObject); -begin - loc.FuseOn; -end; - -procedure TForm1.Button12Click(Sender: TObject); -begin - Loc.AntiSlippingBrake; -end; - -procedure TForm1.BStartClick(Sender: TObject); -begin - tno:=tno-1; - Button1.Enabled:=False; - Edit1.Enabled:=False; - Timer1.Enabled:=True; - mechanik:=TController.Create; - pociag:=TTrainParameters.Create; - pociag.init('Testowy Express',100); - mechanik.init(l0,r0,HumanDriver,@loc,@pociag,Aggressive); - - BStart.Enabled:=False; - Button14.enabled:=True; - Button15.enabled:=True; -end; - -procedure TForm1.Button13MouseDown(Sender: TObject; Button: TMouseButton; - Shift: TShiftState; X, Y: Integer); -begin - loc.SandDoseOn; -end; - -procedure TForm1.Button14Click(Sender: TObject); -begin - mechanik.SetVelocity(30,120); -end; - -procedure TForm1.Button15Click(Sender: TObject); -begin - mechanik.AIControllFlag:=not mechanik.AIControllFlag; - if not loc.mains then - begin - mechanik.ChangeOrder(Prepare_Engine); - mechanik.JumpToNextOrder; - mechanik.ChangeOrder(Obey_train); - mechanik.JumpToNextOrder; - mechanik.ChangeOrder(Release_engine); - mechanik.JumpToFirstOrder; - mechanik.SetVelocity(60,120); - end; -end; - -procedure TForm1.BMainsClick(Sender: TObject); -begin - loc.MainSwitch; -end; - -procedure TForm1.CheckBox1Click(Sender: TObject); -begin - loc.autorelayswitch; -end; - -procedure TForm1.BSIncClick(Sender: TObject); -begin - loc.incscndctrl(1); -end; - -procedure TForm1.BSDecClick(Sender: TObject); -begin - loc.decscndctrl(1); -end; - -end. diff --git a/McZapkie/_Mover.hpp b/McZapkie/_Mover.hpp deleted file mode 100644 index 3b8698d6..00000000 --- a/McZapkie/_Mover.hpp +++ /dev/null @@ -1,903 +0,0 @@ -// Borland C++ Builder -// Copyright (c) 1995, 1999 by Borland International -// All rights reserved - -// (DO NOT EDIT: machine generated header) '_mover.pas' rev: 5.00 - -#ifndef _moverHPP -#define _moverHPP - -#pragma delphiheader begin -#pragma option push -w- -#pragma option push -Vx -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit - -//-- user supplied ----------------------------------------------------------- - -namespace _mover -{ -//-- type declarations ------------------------------------------------------- -struct TLocation -{ - double X; - double Y; - double Z; -} ; - -struct TRotation -{ - double Rx; - double Ry; - double Rz; -} ; - -struct TDimension -{ - double W; - double L; - double H; -} ; - -struct TCommand -{ - AnsiString Command; - double Value1; - double Value2; - TLocation Location; -} ; - -struct TTrackShape -{ - double R; - double Len; - double dHtrack; - double dHrail; -} ; - -struct TTrackParam -{ - double Width; - double friction; - Byte CategoryFlag; - Byte QualityFlag; - Byte DamageFlag; - double Velmax; -} ; - -struct TTractionParam -{ - double TractionVoltage; - double TractionFreq; - double TractionMaxCurrent; - double TractionResistivity; -} ; - -#pragma option push -b- -enum TBrakeSystem { Individual, Pneumatic, ElectroPneumatic }; -#pragma option pop - -#pragma option push -b- -enum TBrakeSubSystem { ss_None, ss_W, ss_K, ss_KK, ss_Hik, ss_ESt, ss_KE, ss_LSt, ss_MT, ss_Dako }; -#pragma option pop - -#pragma option push -b- -enum TBrakeValve { NoValve, W, W_Lu_VI, W_Lu_L, W_Lu_XR, K, Kg, Kp, Kss, Kkg, Kkp, Kks, Hikg1, Hikss, - Hikp1, KE, SW, EStED, NESt3, ESt3, LSt, ESt4, ESt3AL2, EP1, EP2, M483, CV1_L_TR, CV1, CV1_R, Other - }; -#pragma option pop - -#pragma option push -b- -enum TBrakeHandle { NoHandle, West, FV4a, M394, M254, FVel1, FVel6, D2, Knorr, FD1, BS2, testH, St113, - MHZ_P, MHZ_T, MHZ_EN57 }; -#pragma option pop - -#pragma option push -b- -enum TLocalBrake { NoBrake, ManualBrake, PneumaticBrake, HydraulicBrake }; -#pragma option pop - -typedef double TBrakeDelayTable[4]; - -struct TBrakePressure -{ - double PipePressureVal; - double BrakePressureVal; - double FlowSpeedVal; - TBrakeSystem BrakeType; -} ; - -typedef TBrakePressure TBrakePressureTable[13]; - -#pragma option push -b- -enum TEngineTypes { None, Dumb, WheelsDriven, ElectricSeriesMotor, ElectricInductionMotor, DieselEngine, - SteamEngine, DieselElectric }; -#pragma option pop - -#pragma option push -b- -enum TPowerType { NoPower, BioPower, MechPower, ElectricPower, SteamPower }; -#pragma option pop - -#pragma option push -b- -enum TFuelType { Undefined, Coal, Oil }; -#pragma option pop - -struct TGrateType -{ - TFuelType FuelType; - double GrateSurface; - double FuelTransportSpeed; - double IgnitionTemperature; - double MaxTemperature; -} ; - -struct TBoilerType -{ - double BoilerVolume; - double BoilerHeatSurface; - double SuperHeaterSurface; - double MaxWaterVolume; - double MinWaterVolume; - double MaxPressure; -} ; - -struct TCurrentCollector -{ - int CollectorsNo; - double MinH; - double MaxH; - double CSW; - double MinV; - double MaxV; - double OVP; - double InsetV; - double MinPress; - double MaxPress; -} ; - -#pragma option push -b- -enum TPowerSource { NotDefined, InternalSource, Transducer, Generator, Accumulator, CurrentCollector, - PowerCable, Heater }; -#pragma option pop - -struct _mover__1 -{ - double MaxCapacity; - TPowerSource RechargeSource; -} ; - -struct _mover__2 -{ - TPowerType PowerTrans; - double SteamPressure; -} ; - -struct _mover__3 -{ - TGrateType Grate; - TBoilerType Boiler; -} ; - -struct TPowerParameters -{ - double MaxVoltage; - double MaxCurrent; - double IntR; - TPowerSource SourceType; - union - { - struct - { - _mover__3 RHeater; - - }; - struct - { - _mover__2 RPowerCable; - - }; - struct - { - TCurrentCollector CollectorParameters; - - }; - struct - { - _mover__1 RAccumulator; - - }; - struct - { - TEngineTypes GeneratorEngine; - - }; - struct - { - double InputVoltage; - - }; - struct - { - TPowerType PowerType; - - }; - - }; -} ; - -struct TScheme -{ - Byte Relay; - double R; - Byte Bn; - Byte Mn; - bool AutoSwitch; - Byte ScndAct; -} ; - -typedef TScheme TSchemeTable[65]; - -struct TDEScheme -{ - double RPM; - double GenPower; - double Umax; - double Imax; -} ; - -typedef TDEScheme TDESchemeTable[33]; - -struct TShuntScheme -{ - double Umin; - double Umax; - double Pmin; - double Pmax; -} ; - -typedef TShuntScheme TShuntSchemeTable[33]; - -struct TMPTRelay -{ - double Iup; - double Idown; -} ; - -typedef TMPTRelay TMPTRelayTable[8]; - -struct TMotorParameters -{ - double mfi; - double mIsat; - double mfi0; - double fi; - double Isat; - double fi0; - bool AutoSwitch; -} ; - -struct TSecuritySystem -{ - Byte SystemType; - double AwareDelay; - double AwareMinSpeed; - double SoundSignalDelay; - double EmergencyBrakeDelay; - Byte Status; - double SystemTimer; - double SystemSoundCATimer; - double SystemSoundSHPTimer; - double SystemBrakeCATimer; - double SystemBrakeSHPTimer; - double SystemBrakeCATestTimer; - int VelocityAllowed; - int NextVelocityAllowed; - bool RadioStop; -} ; - -struct TTransmision -{ - Byte NToothM; - Byte NToothW; - double Ratio; -} ; - -#pragma option push -b- -enum TCouplerType { NoCoupler, Articulated, Bare, Chain, Screw, Automatic }; -#pragma option pop - -class DELPHICLASS T_MoverParameters; -struct TCoupling; -class PASCALIMPLEMENTATION T_MoverParameters : public System::TObject -{ - typedef System::TObject inherited; - -public: - double dMoveLen; - AnsiString filename; - Byte CategoryFlag; - AnsiString TypeName; - int TrainType; - TEngineTypes EngineType; - TPowerParameters EnginePowerSource; - TPowerParameters SystemPowerSource; - TPowerParameters HeatingPowerSource; - TPowerParameters AlterHeatPowerSource; - TPowerParameters LightPowerSource; - TPowerParameters AlterLightPowerSource; - double Vmax; - double Mass; - double Power; - double Mred; - double TotalMass; - double HeatingPower; - double LightPower; - double BatteryVoltage; - bool Battery; - bool EpFuse; - bool Signalling; - bool DoorSignalling; - bool Radio; - double NominalBatteryVoltage; - TDimension Dim; - double Cx; - double Floor; - double WheelDiameter; - double WheelDiameterL; - double WheelDiameterT; - double TrackW; - double AxleInertialMoment; - AnsiString AxleArangement; - Byte NPoweredAxles; - Byte NAxles; - Byte BearingType; - double ADist; - double BDist; - Byte NBpA; - int SandCapacity; - TBrakeSystem BrakeSystem; - TBrakeSubSystem BrakeSubsystem; - TBrakeValve BrakeValve; - TBrakeHandle BrakeHandle; - TBrakeHandle BrakeLocHandle; - double MBPM; - Hamulce::TBrake* Hamulec; - Hamulce::THandle* Handle; - Hamulce::THandle* LocHandle; - Hamulce::TReservoir* Pipe; - Hamulce::TReservoir* Pipe2; - TLocalBrake LocalBrake; - TBrakePressure BrakePressureTable[13]; - TBrakePressure BrakePressureActual; - Byte ASBType; - Byte TurboTest; - double MaxBrakeForce; - double MaxBrakePress[5]; - double P2FTrans; - double TrackBrakeForce; - Byte BrakeMethod; - double HighPipePress; - double LowPipePress; - double DeltaPipePress; - double CntrlPipePress; - double BrakeVolume; - double BrakeVVolume; - double VeselVolume; - int BrakeCylNo; - double BrakeCylRadius; - double BrakeCylDist; - double BrakeCylMult[3]; - Byte LoadFlag; - double BrakeCylSpring; - double BrakeSlckAdj; - double BrakeRigEff; - double RapidMult; - int BrakeValveSize; - AnsiString BrakeValveParams; - double Spg; - double MinCompressor; - double MaxCompressor; - double CompressorSpeed; - double BrakeDelay[4]; - Byte BrakeCtrlPosNo; - Byte MainCtrlPosNo; - Byte ScndCtrlPosNo; - Byte LightsPosNo; - Byte LightsDefPos; - bool LightsWrap; - Byte Lights[2][16]; - bool ScndInMain; - bool MBrake; - double StopBrakeDecc; - TSecuritySystem SecuritySystem; - TScheme RList[65]; - int RlistSize; - TMotorParameters MotorParam[11]; - TTransmision Transmision; - double NominalVoltage; - double WindingRes; - double u; - double CircuitRes; - int IminLo; - int IminHi; - int ImaxLo; - int ImaxHi; - double nmax; - double InitialCtrlDelay; - double CtrlDelay; - double CtrlDownDelay; - Byte FastSerialCircuit; - Byte AutoRelayType; - bool CoupledCtrl; - bool IsCoupled; - Byte DynamicBrakeType; - Byte RVentType; - double RVentnmax; - double RVentCutOff; - int CompressorPower; - int SmallCompressorPower; - bool Trafo; - double dizel_Mmax; - double dizel_nMmax; - double dizel_Mnmax; - double dizel_nmax; - double dizel_nominalfill; - double dizel_Mstand; - double dizel_nmax_cutoff; - double dizel_nmin; - double dizel_minVelfullengage; - double dizel_AIM; - double dizel_engageDia; - double dizel_engageMaxForce; - double dizel_engagefriction; - double AnPos; - bool AnalogCtrl; - bool AnMainCtrl; - bool ShuntModeAllow; - bool ShuntMode; - bool Flat; - double Vhyp; - TDEScheme DElist[33]; - double Vadd; - TMPTRelay MPTRelay[8]; - Byte RelayType; - TShuntScheme SST[33]; - double PowerCorRatio; - double Ftmax; - double eimc[26]; - int MaxLoad; - AnsiString LoadAccepted; - AnsiString LoadQuantity; - double OverLoadFactor; - double LoadSpeed; - double UnLoadSpeed; - Byte DoorOpenCtrl; - Byte DoorCloseCtrl; - double DoorStayOpen; - bool DoorClosureWarning; - double DoorOpenSpeed; - double DoorCloseSpeed; - double DoorMaxShiftL; - double DoorMaxShiftR; - double DoorMaxPlugShift; - Byte DoorOpenMethod; - double PlatformSpeed; - double PlatformMaxShift; - Byte PlatformOpenMethod; - bool ScndS; - TLocation Loc; - TRotation Rot; - AnsiString Name; - TCoupling Couplers[2]; - double HVCouplers[2][2]; - int ScanCounter; - bool EventFlag; - Byte SoundFlag; - double DistCounter; - double V; - double Vel; - double AccS; - double AccN; - double AccV; - double nrot; - double EnginePower; - double dL; - double Fb; - double Ff; - double FTrain; - double FStand; - double FTotal; - double UnitBrakeForce; - double Ntotal; - bool SlippingWheels; - bool SandDose; - double Sand; - double BrakeSlippingTimer; - double dpBrake; - double dpPipe; - double dpMainValve; - double dpLocalValve; - double ScndPipePress; - double BrakePress; - double LocBrakePress; - double PipeBrakePress; - double PipePress; - double EqvtPipePress; - double Volume; - double CompressedVolume; - double PantVolume; - double Compressor; - bool CompressorFlag; - bool PantCompFlag; - bool CompressorAllow; - bool ConverterFlag; - bool ConverterAllow; - int BrakeCtrlPos; - double BrakeCtrlPosR; - double BrakeCtrlPos2; - Byte LocalBrakePos; - Byte ManualBrakePos; - double LocalBrakePosA; - Byte BrakeStatus; - bool EmergencyBrakeFlag; - Byte BrakeDelayFlag; - Byte BrakeDelays; - Byte BrakeOpModeFlag; - Byte BrakeOpModes; - bool DynamicBrakeFlag; - double LimPipePress; - double ActFlowSpeed; - Byte DamageFlag; - Byte EngDmgFlag; - Byte DerailReason; - TCommand CommandIn; - AnsiString CommandOut; - AnsiString CommandLast; - double ValueOut; - TTrackShape RunningShape; - TTrackParam RunningTrack; - double OffsetTrackH; - double OffsetTrackV; - bool Mains; - Byte MainCtrlPos; - Byte ScndCtrlPos; - Byte LightsPos; - int ActiveDir; - int CabNo; - int DirAbsolute; - int ActiveCab; - double LastSwitchingTime; - bool DepartureSignal; - bool InsideConsist; - TTractionParam RunningTraction; - double enrot; - double Im; - double Itot; - double IHeating; - double ITraction; - double TotalCurrent; - double Mm; - double Mw; - double Fw; - double Ft; - int Imin; - int Imax; - double Voltage; - Byte MainCtrlActualPos; - Byte ScndCtrlActualPos; - bool DelayCtrlFlag; - double LastRelayTime; - bool AutoRelayFlag; - bool FuseFlag; - bool ConvOvldFlag; - bool StLinFlag; - bool ResistorsFlag; - double RventRot; - bool UnBrake; - double PantPress; - bool s_CAtestebrake; - double dizel_fill; - double dizel_engagestate; - double dizel_engage; - double dizel_automaticgearstatus; - bool dizel_enginestart; - double dizel_engagedeltaomega; - double eimv[21]; - double PulseForce; - double PulseForceTimer; - int PulseForceCount; - double eAngle; - int Load; - AnsiString LoadType; - Byte LoadStatus; - double LastLoadChangeTime; - bool DoorBlocked; - bool DoorLeftOpened; - bool DoorRightOpened; - bool PantFrontUp; - bool PantRearUp; - bool PantFrontSP; - bool PantRearSP; - int PantFrontStart; - int PantRearStart; - double PantFrontVolt; - double PantRearVolt; - AnsiString PantSwitchType; - AnsiString ConvSwitchType; - bool Heating; - int DoubleTr; - bool PhysicActivation; - double FrictConst1; - double FrictConst2s; - double FrictConst2d; - double TotalMassxg; - double __fastcall GetTrainsetVoltage(void); - bool __fastcall Physic_ReActivation(void); - double __fastcall LocalBrakeRatio(void); - double __fastcall ManualBrakeRatio(void); - double __fastcall PipeRatio(void); - double __fastcall RealPipeRatio(void); - double __fastcall BrakeVP(void); - bool __fastcall DynamicBrakeSwitch(bool Switch); - bool __fastcall SendCtrlBroadcast(AnsiString CtrlCommand, double ctrlvalue); - bool __fastcall SendCtrlToNext(AnsiString CtrlCommand, double ctrlvalue, double dir); - bool __fastcall CabActivisation(void); - bool __fastcall CabDeactivisation(void); - bool __fastcall IncMainCtrl(int CtrlSpeed); - bool __fastcall DecMainCtrl(int CtrlSpeed); - bool __fastcall IncScndCtrl(int CtrlSpeed); - bool __fastcall DecScndCtrl(int CtrlSpeed); - bool __fastcall AddPulseForce(int Multipler); - bool __fastcall SandDoseOn(void); - bool __fastcall SecuritySystemReset(void); - void __fastcall SecuritySystemCheck(double dt); - bool __fastcall BatterySwitch(bool State); - bool __fastcall EpFuseSwitch(bool State); - bool __fastcall IncBrakeLevelOld(void); - bool __fastcall DecBrakeLevelOld(void); - bool __fastcall IncLocalBrakeLevel(Byte CtrlSpeed); - bool __fastcall DecLocalBrakeLevel(Byte CtrlSpeed); - bool __fastcall IncLocalBrakeLevelFAST(void); - bool __fastcall DecLocalBrakeLevelFAST(void); - bool __fastcall IncManualBrakeLevel(Byte CtrlSpeed); - bool __fastcall DecManualBrakeLevel(Byte CtrlSpeed); - bool __fastcall EmergencyBrakeSwitch(bool Switch); - bool __fastcall AntiSlippingBrake(void); - bool __fastcall BrakeReleaser(Byte state); - bool __fastcall SwitchEPBrake(Byte state); - bool __fastcall AntiSlippingButton(void); - bool __fastcall IncBrakePress(double &brake, double PressLimit, double dp); - bool __fastcall DecBrakePress(double &brake, double PressLimit, double dp); - bool __fastcall BrakeDelaySwitch(Byte BDS); - bool __fastcall IncBrakeMult(void); - bool __fastcall DecBrakeMult(void); - void __fastcall UpdateBrakePressure(double dt); - void __fastcall UpdatePipePressure(double dt); - void __fastcall CompressorCheck(double dt); - void __fastcall UpdateScndPipePressure(double dt); - double __fastcall GetDVc(double dt); - void __fastcall ComputeConstans(void); - double __fastcall ComputeMass(void); - double __fastcall Adhesive(double staticfriction); - double __fastcall TractionForce(double dt); - double __fastcall FrictionForce(double R, Byte TDamage); - double __fastcall BrakeForce(const TTrackParam &Track); - double __fastcall CouplerForce(Byte CouplerN, double dt); - void __fastcall CollisionDetect(Byte CouplerN, double dt); - double __fastcall ComputeRotatingWheel(double WForce, double dt, double n); - bool __fastcall SetInternalCommand(AnsiString NewCommand, double NewValue1, double NewValue2); - double __fastcall GetExternalCommand(AnsiString &Command); - bool __fastcall RunCommand(AnsiString command, double CValue1, double CValue2); - bool __fastcall RunInternalCommand(void); - void __fastcall PutCommand(AnsiString NewCommand, double NewValue1, double NewValue2, const TLocation - &NewLocation); - bool __fastcall DirectionBackward(void); - bool __fastcall MainSwitch(bool State); - bool __fastcall ConverterSwitch(bool State); - bool __fastcall CompressorSwitch(bool State); - bool __fastcall FuseOn(void); - bool __fastcall FuseFlagCheck(void); - void __fastcall FuseOff(void); - int __fastcall ShowCurrent(Byte AmpN); - double __fastcall v2n(void); - double __fastcall current(double n, double U); - double __fastcall Momentum(double I); - double __fastcall MomentumF(double I, double Iw, Byte SCP); - bool __fastcall CutOffEngine(void); - bool __fastcall MaxCurrentSwitch(bool State); - bool __fastcall ResistorsFlagCheck(void); - bool __fastcall MinCurrentSwitch(bool State); - bool __fastcall AutoRelaySwitch(bool State); - bool __fastcall AutoRelayCheck(void); - bool __fastcall dizel_EngageSwitch(double state); - bool __fastcall dizel_EngageChange(double dt); - bool __fastcall dizel_AutoGearCheck(void); - double __fastcall dizel_fillcheck(Byte mcp); - double __fastcall dizel_Momentum(double dizel_fill, double n, double dt); - bool __fastcall dizel_Update(double dt); - bool __fastcall LoadingDone(double LSpeed, AnsiString LoadInit); - void __fastcall ComputeTotalForce(double dt, double dt1, bool FullVer); - double __fastcall ComputeMovement(double dt, double dt1, const TTrackShape &Shape, TTrackParam &Track - , TTractionParam &ElectricTraction, const TLocation &NewLoc, TRotation &NewRot); - double __fastcall FastComputeMovement(double dt, const TTrackShape &Shape, TTrackParam &Track, const - TLocation &NewLoc, TRotation &NewRot); - bool __fastcall ChangeOffsetH(double DeltaOffset); - __fastcall T_MoverParameters(double VelInitial, AnsiString TypeNameInit, AnsiString NameInit, int LoadInitial - , AnsiString LoadTypeInitial, int Cab); - bool __fastcall LoadChkFile(AnsiString chkpath); - bool __fastcall CheckLocomotiveParameters(bool ReadyFlag, int Dir); - AnsiString __fastcall EngineDescription(int what); - bool __fastcall DoorLeft(bool State); - bool __fastcall DoorRight(bool State); - bool __fastcall DoorBlockedFlag(void); - bool __fastcall PantFront(bool State); - bool __fastcall PantRear(bool State); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall T_MoverParameters(void) : System::TObject() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~T_MoverParameters(void) { } - #pragma option pop - -}; - - -struct TCoupling -{ - double SpringKB; - double SpringKC; - double beta; - double DmaxB; - double FmaxB; - double DmaxC; - double FmaxC; - TCouplerType CouplerType; - Byte CouplingFlag; - int AllowedFlag; - bool Render; - double CoupleDist; - T_MoverParameters* Connected; - Byte ConnectedNr; - double CForce; - double Dist; - bool CheckCollision; -} ; - -//-- var, const, procedure --------------------------------------------------- -static const bool Go = true; -static const bool Hold = false; -static const Shortint ResArraySize = 0x40; -static const Shortint MotorParametersArraySize = 0xa; -static const Shortint maxcc = 0x4; -static const Shortint LocalBrakePosNo = 0xa; -static const Shortint MainBrakeMaxPos = 0xa; -static const Shortint ManualBrakePosNo = 0x14; -static const Shortint LightsSwitchPosNo = 0x10; -static const Shortint dtrack_railwear = 0x2; -static const Shortint dtrack_freerail = 0x4; -static const Shortint dtrack_thinrail = 0x8; -static const Shortint dtrack_railbend = 0x10; -static const Shortint dtrack_plants = 0x20; -static const Shortint dtrack_nomove = 0x40; -static const Byte dtrack_norail = 0x80; -static const Shortint dtrain_thinwheel = 0x1; -static const Shortint dtrain_loadshift = 0x1; -static const Shortint dtrain_wheelwear = 0x2; -static const Shortint dtrain_bearing = 0x4; -static const Shortint dtrain_coupling = 0x8; -static const Shortint dtrain_ventilator = 0x10; -static const Shortint dtrain_loaddamage = 0x10; -static const Shortint dtrain_engine = 0x20; -static const Shortint dtrain_loaddestroyed = 0x20; -static const Shortint dtrain_axle = 0x40; -static const Byte dtrain_out = 0x80; -#define p_elengproblem (1.000000E-02) -#define p_elengdamage (1.000000E-01) -#define p_coupldmg (2.000000E-02) -#define p_derail (1.000000E-03) -#define p_accn (1.000000E-01) -#define p_slippdmg (1.000000E-03) -static const Shortint ctrain_virtual = 0x0; -static const Shortint ctrain_coupler = 0x1; -static const Shortint ctrain_pneumatic = 0x2; -static const Shortint ctrain_controll = 0x4; -static const Shortint ctrain_power = 0x8; -static const Shortint ctrain_passenger = 0x10; -static const Shortint ctrain_scndpneumatic = 0x20; -static const Shortint ctrain_heating = 0x40; -static const Byte ctrain_depot = 0x80; -static const Shortint dbrake_none = 0x0; -static const Shortint dbrake_passive = 0x1; -static const Shortint dbrake_switch = 0x2; -static const Shortint dbrake_reversal = 0x4; -static const Shortint dbrake_automatic = 0x8; -static const Shortint s_waiting = 0x1; -static const Shortint s_aware = 0x2; -static const Shortint s_active = 0x4; -static const Shortint s_CAalarm = 0x8; -static const Shortint s_SHPalarm = 0x10; -static const Shortint s_CAebrake = 0x20; -static const Shortint s_SHPebrake = 0x40; -static const Byte s_CAtest = 0x80; -static const Shortint sound_none = 0x0; -static const Shortint sound_loud = 0x1; -static const Shortint sound_couplerstretch = 0x2; -static const Shortint sound_bufferclamp = 0x4; -static const Shortint sound_bufferbump = 0x8; -static const Shortint sound_relay = 0x10; -static const Shortint sound_manyrelay = 0x20; -static const Shortint sound_brakeacc = 0x40; -extern PACKAGE bool PhysicActivationFlag; -static const Shortint dt_Default = 0x0; -static const Shortint dt_EZT = 0x1; -static const Shortint dt_ET41 = 0x2; -static const Shortint dt_ET42 = 0x4; -static const Shortint dt_PseudoDiesel = 0x8; -static const Shortint dt_ET22 = 0x10; -static const Shortint dt_SN61 = 0x20; -static const Shortint dt_EP05 = 0x40; -static const Byte dt_ET40 = 0x80; -static const Word dt_181 = 0x100; -static const Shortint eimc_s_dfic = 0x0; -static const Shortint eimc_s_dfmax = 0x1; -static const Shortint eimc_s_p = 0x2; -static const Shortint eimc_s_cfu = 0x3; -static const Shortint eimc_s_cim = 0x4; -static const Shortint eimc_s_icif = 0x5; -static const Shortint eimc_f_Uzmax = 0x7; -static const Shortint eimc_f_Uzh = 0x8; -static const Shortint eimc_f_DU = 0x9; -static const Shortint eimc_f_I0 = 0xa; -static const Shortint eimc_f_cfu = 0xb; -static const Shortint eimc_p_F0 = 0xd; -static const Shortint eimc_p_a1 = 0xe; -static const Shortint eimc_p_Pmax = 0xf; -static const Shortint eimc_p_Fh = 0x10; -static const Shortint eimc_p_Ph = 0x11; -static const Shortint eimc_p_Vh0 = 0x12; -static const Shortint eimc_p_Vh1 = 0x13; -static const Shortint eimc_p_Imax = 0x14; -static const Shortint eimc_p_abed = 0x15; -static const Shortint eimc_p_eped = 0x16; -static const Shortint eimv_FMAXMAX = 0x0; -static const Shortint eimv_Fmax = 0x1; -static const Shortint eimv_ks = 0x2; -static const Shortint eimv_df = 0x3; -static const Shortint eimv_fp = 0x4; -static const Shortint eimv_U = 0x5; -static const Shortint eimv_pole = 0x6; -static const Shortint eimv_Ic = 0x7; -static const Shortint eimv_If = 0x8; -static const Shortint eimv_M = 0x9; -static const Shortint eimv_Fr = 0xa; -static const Shortint eimv_Ipoj = 0xb; -static const Shortint eimv_Pm = 0xc; -static const Shortint eimv_Pe = 0xd; -static const Shortint eimv_eta = 0xe; -static const Shortint eimv_fkr = 0xf; -static const Shortint eimv_Uzsmax = 0x10; -static const Shortint eimv_Pmax = 0x11; -static const Shortint eimv_Fzad = 0x12; -static const Shortint eimv_Imax = 0x13; -static const Shortint eimv_Fful = 0x14; -static const Shortint bom_PS = 0x1; -static const Shortint bom_PN = 0x2; -static const Shortint bom_EP = 0x4; -static const Shortint bom_MED = 0x8; -extern PACKAGE double __fastcall Distance(const TLocation &Loc1, const TLocation &Loc2, const TDimension - &Dim1, const TDimension &Dim2); - -} /* namespace _mover */ -#if !defined(NO_IMPLICIT_NAMESPACE_USE) -using namespace _mover; -#endif -#pragma option pop // -w- -#pragma option pop // -Vx - -#pragma delphiheader end. -//-- end unit ---------------------------------------------------------------- -#endif // _mover diff --git a/McZapkie/_mover.pas b/McZapkie/_mover.pas deleted file mode 100644 index 20c8d1c6..00000000 --- a/McZapkie/_mover.pas +++ /dev/null @@ -1,7596 +0,0 @@ -unit _mover; {fizyka ruchu dla symulatora lokomotywy} - -(* - MaSzyna EU07 locomotive simulator - Copyright (C) 2001-2004 Maciej Czapkiewicz and others - -*) - - -(* -(C) McZapkie v.2004.02 -Co brakuje: -6. brak pantografow itp 'Nie do konca, juz czesc zrobiona - Winger -7. brak efektu grzania oporow rozruchowych, silnika, osi -9. ulepszyc sprzeg sztywny oraz automatyczny -10. klopoty z EN57 -... -n. Inne lokomotywy oprocz elektrowozu pradu stalego -*) -(* -Zrobione: -1. model szeregowego silnika elektrycznego sterowanego reostatem -2. fizyka ruchu - sily oporu, nachylenia, przyspieszenia styczne i normalne, -przyczepnosc/poslizg przy hamowaniu i rozruchu -3. docisk klockow hamulcowych -hamulec reczny oraz pomocniczy hamulec pneumatyczny -4. ubytki cisnienia wskutek hamowania, kompresor - ladowanie zbiornika -5. niektore uszkodzenia i awarie - logika rozmyta -a) silnik elektryczny - za duzy prad, napiecie, obroty -b) sprzegi - zerwanie gdy zbyt duze sily -6. flagi niektorych dzwiekow -7. hamulec zasadniczy - elektropneumatyczny (impulsowanie), pneumatyczny - zmiany cisnienia -zwiekszenie nacisku przy duzych predkosciach w hamulcach Oerlikona -8. sprzegi - sila, tlumiennosc -9. lok. el. - wylacznik glowny, odlacznik uszkodzonych silnikow -10. parametry trakcji -11. opoznienia w zalaczaniu stycznikow -12. trakcja wielokrotna -13. informacja na temat zrodla mocy dla silnikow trakcyjnych, ogrzewania, oswietlenia -14. dumb - uproszczony model lokomotywy (tylko dla AI) -15. ladunki - ilosc, typ, szybkosc na- i rozladunku, funkcje przetestowac! -16. ulepszony model fizyczny silnika elektrycznego (hamowanie silnikiem, ujemne napiecia) -17. poprawione hamulce - parametry cylindrow itp -18. ulepszone hamulce - napelnianie uderzeniowe, stopnie hamowania -19. poprawione hamulce - wyszczegolnenie cisnienia dla stopni hamowania -20. poprawione hamulce elektropneumatyczne -21. poprawione hamowanie przeciwposlizgowe i odluzniacz -22. dodany model mechanicznego napedu recznego (drezyna) -23. poprawiona szybkosc hamowania pomocniczego i przeciwposlizgowego, odlaczanie silnikow, odlaczanie bocznikow -24. wprowadzone systemy zabezpieczenia: SHP, Czuwak, sygnalizacja kabinowa (nie dzialaja w DebugMode). -25. poprawiona predkosc propagacji fali cisnienia (normalizacja przez kwadrat dlugosci) //to jest zdeka liniowe -26. uwzgledniona masa ladunku, przesuniecie w/m toru ruchu -27. lampy/sygnaly przednie/tylne -28. wprowadzona pozycja odciecia hamulca (yB: tja, ale oerlikona....) -29. rozne poprawki: slizganie, wykolejanie itp -30. model silnika spalinowego z przekladnia mechaniczna -31. otwieranie drzwi, sprezarka, przetwornica -32. wylaczanie obliczen dla nieruchomych wagonow -33. Zbudowany model rozdzielacza powietrza roznych systemow -34. Poprawiona pozycja napelniania uderzeniowego i hamulec EP -35. Dodane baterie akumulatorow (KURS90) -36. Hamowanie elektrodynamiczne w ET42 i poprawione w EP09 -37. jednokierunkowosc walu kulakowego w EZT (nie do konca) -38. wal kulakowy w ET40 -39. poprawiona blokada nastawnika w ET40 -... -*) - - -interface uses mctools,sysutils,hamulce,Oerlikon_ESt; - -CONST - Go=true; - Hold=false; {dla CheckLocomotiveParameters} - ResArraySize=64; {dla silnikow elektrycznych} - MotorParametersArraySize=10; - maxcc=4; {max. ilosc odbierakow pradu} - LocalBrakePosNo=10; {ilosc nastaw hamulca pomocniczego} - MainBrakeMaxPos=10; {max. ilosc nastaw hamulca zasadniczego} - ManualBrakePosNo=20; {ilosc nastaw hamulca recznego} - LightsSwitchPosNo=16; - - {uszkodzenia toru} - dtrack_railwear=2; - dtrack_freerail=4; - dtrack_thinrail=8; - dtrack_railbend=16; - dtrack_plants=32; - dtrack_nomove=64; - dtrack_norail=128; - - {uszkodzenia taboru} - dtrain_thinwheel=1; {dla lokomotyw} - dtrain_loadshift=1; {dla wagonow} - dtrain_wheelwear=2; - dtrain_bearing=4; - dtrain_coupling=8; - dtrain_ventilator=16; {dla lokomotywy el.} - dtrain_loaddamage=16; {dla wagonow} - dtrain_engine=32; {dla lokomotyw} - dtrain_loaddestroyed=32;{dla wagonow} - dtrain_axle=64; - dtrain_out=128; {wykolejenie} - - {wagi prawdopodobienstwa dla funkcji FuzzyLogic} - p_elengproblem = 0.01; - p_elengdamage = 0.1; - p_coupldmg = 0.02; - p_derail=0.001; - p_accn=0.1; - p_slippdmg=0.001; - - {typ sprzegu} - ctrain_virtual=0; //gdy pojazdy na tym samym torze si widz wzajemnie - ctrain_coupler=1; //sprzeg fizyczny - ctrain_pneumatic=2; //przewody hamulcowe - ctrain_controll=4; //przewody sterujce (ukrotnienie) - ctrain_power=8; //przewody zasilajce (WN) - ctrain_passenger=16; //mostek przejciowy - ctrain_scndpneumatic=32; //przewody 8 atm (te; zasilanie powietrzem) - ctrain_heating=64; //przewody ogrzewania WN - ctrain_depot=128; //nie rozczalny podczas zwykych manewrw (midzyczonowy), we wpisie warto ujemna - - {typ hamulca elektrodynamicznego} - dbrake_none=0; - dbrake_passive=1; - dbrake_switch=2; - dbrake_reversal=4; - dbrake_automatic=8; - - {status czuwaka/SHP} - //hunter-091012: rozdzielenie alarmow, dodanie testu czuwaka - s_waiting=1; //dziaa - s_aware=2; //czuwak miga - s_active=4; //SHP wieci - s_CAalarm=8; //buczy - s_SHPalarm=16; //buczy - s_CAebrake=32; //hamuje - s_SHPebrake=64; //hamuje - s_CAtest=128; - - {dzwieki} - sound_none=0; - sound_loud=1; - sound_couplerstretch=2; - sound_bufferclamp=4; - sound_bufferbump=8; - sound_relay=16; - sound_manyrelay=32; - sound_brakeacc=64; - - PhysicActivationFlag: boolean=false; - - //szczeglne typy pojazdw (inna obsuga) dla zmiennej TrainType - //zamienione na flagi bitowe, aby szybko wybiera grup (np. EZT+SZT) - dt_Default=0; - dt_EZT=1; - dt_ET41=2; - dt_ET42=4; - dt_PseudoDiesel=8; - dt_ET22=$10; //uywane od Megapacka - dt_SN61=$20; //nie uywane w warunkach, ale ustawiane z CHK - dt_EP05=$40; - dt_ET40=$80; - dt_181=$100; - -//stae dla asynchronw - eimc_s_dfic=0; - eimc_s_dfmax=1; - eimc_s_p=2; - eimc_s_cfu=3; - eimc_s_cim=4; - eimc_s_icif=5; - eimc_f_Uzmax=7; - eimc_f_Uzh=8; - eimc_f_DU=9; - eimc_f_I0=10; - eimc_f_cfu=11; - eimc_p_F0=13; - eimc_p_a1=14; - eimc_p_Pmax=15; - eimc_p_Fh=16; - eimc_p_Ph=17; - eimc_p_Vh0=18; - eimc_p_Vh1=19; - eimc_p_Imax=20; - eimc_p_abed=21; - eimc_p_eped=22; - -//zmienne dla asynchronw - eimv_FMAXMAX=0; - eimv_Fmax=1; - eimv_ks=2; - eimv_df=3; - eimv_fp=4; - eimv_U=5; - eimv_pole=6; - eimv_Ic=7; - eimv_If=8; - eimv_M=9; - eimv_Fr=10; - eimv_Ipoj=11; - eimv_Pm=12; - eimv_Pe=13; - eimv_eta=14; - eimv_fkr=15; - eimv_Uzsmax=16; - eimv_Pmax=17; - eimv_Fzad=18; - eimv_Imax=19; - eimv_Fful=20; - - bom_PS = 1; - bom_PN = 2; - bom_EP = 4; - bom_MED = 8; - -TYPE - {ogolne} - TLocation = record - X,Y,Z: real; {lokacja} - end; - TRotation = record - Rx,Ry,Rz: real; {rotacja} - end; - TDimension= record - W,L,H: real; {wymiary} - end; - - TCommand = record - Command: string; {komenda} - Value1,Value2: real; {argumenty komendy} - Location: TLocation; - end; - - {tory} - TTrackShape= record {ksztalt odcinka - promien, dlugosc, nachylenie, przechylka} - R, Len, dHtrack, dHrail: real; - end; - - TTrackParam= record {parametry odcinka - szerokosc, tarcie statyczne, kategoria, obciazalnosc w t/os, uszkodzenia} - Width, friction: real; - CategoryFlag, QualityFlag, DamageFlag: byte; - Velmax:real; {dla uzytku maszynisty w ai_driver} - end; - TTractionParam= record - TractionVoltage: real; {napiecie} - TractionFreq: real; {czestotliwosc} - TractionMaxCurrent: real; {obciazalnosc} - TractionResistivity: real; {rezystancja styku} - end; - {powyzsze parametry zwiazane sa z torem po ktorym aktualnie pojazd jedzie} - - {typy hamulcow zespolonych} - TBrakeSystem = (Individual, Pneumatic, ElectroPneumatic); - {podtypy hamulcow zespolonych} - TBrakeSubSystem = (ss_None, ss_W, ss_K, ss_KK, ss_Hik, ss_ESt, ss_KE, ss_LSt, ss_MT, ss_Dako); - TBrakeValve = (NoValve, W, W_Lu_VI, W_Lu_L, W_Lu_XR, K, Kg, Kp, Kss, Kkg, Kkp, Kks, Hikg1, Hikss, Hikp1, KE, SW, EStED, NESt3, ESt3, LSt, ESt4, ESt3AL2, EP1, EP2, M483, CV1_L_TR, CV1, CV1_R, Other); - TBrakeHandle = (NoHandle, West, FV4a, M394, M254, FVel1, FVel6, D2, Knorr, FD1, BS2, testH, St113, MHZ_P, MHZ_T, MHZ_EN57); - {typy hamulcow indywidualnych} - TLocalBrake = (NoBrake, ManualBrake, PneumaticBrake, HydraulicBrake); - - TBrakeDelayTable= array[1..4] of real; - {dla osob/towar: opoznienie hamowania/odhamowania} - - TBrakePressure= record - PipePressureVal: real; - BrakePressureVal: real; - FlowSpeedVal: real; - BrakeType: TBrakeSystem; - end; - TBrakePressureTable= array[-2..MainBrakeMaxPos] of TBrakePressure; - - {typy napedow} - TEngineTypes = (None, Dumb, WheelsDriven, ElectricSeriesMotor, ElectricInductionMotor, DieselEngine, SteamEngine, DieselElectric); - {postac dostarczanej energii} - TPowerType = (NoPower, BioPower, MechPower, ElectricPower, SteamPower); - {rodzaj paliwa} - TFuelType = (Undefined, Coal, Oil); - {rodzaj rusztu} - TGrateType = record - FuelType: TFuelType; - GrateSurface: real; - FuelTransportSpeed: real; - IgnitionTemperature: real; - MaxTemperature: real; - end; - {rodzaj kotla} - TBoilerType = record - BoilerVolume: real; - BoilerHeatSurface: real; - SuperHeaterSurface: real; - MaxWaterVolume,MinWaterVolume: real; - MaxPressure: real; - end; - {rodzaj odbieraka pradu} - TCurrentCollector = record - CollectorsNo: longint; //musi by tu, bo inaczej si kopie - MinH,MaxH: real; //zakres ruchu pantografu, nigdzie nie uywany - CSW: real; //szeroko czci roboczej (styku) lizgacza - MinV,MaxV: real; //minimalne i maksymalne akceptowane napicie - OVP: real; //czy jest przekaznik nadnapieciowy - InsetV: real; //minimalne napicie wymagane do zaczenia - MinPress: real; //minimalne cinienie do zaczenia WS - MaxPress: real; //maksymalne cinienie za reduktorem - end; - {typy rde mocy} - TPowerSource = (NotDefined, InternalSource, Transducer, Generator, Accumulator, CurrentCollector, PowerCable, Heater); - {parametry rde mocy} - TPowerParameters = record - MaxVoltage: real; - MaxCurrent: real; - IntR: real; - case SourceType: TPowerSource of - NotDefined,InternalSource : (PowerType: TPowerType); - Transducer : (InputVoltage: real); - Generator : (GeneratorEngine: TEngineTypes); - Accumulator: (RAccumulator:record MaxCapacity:real; RechargeSource:TPowerSource end); - CurrentCollector: (CollectorParameters: TCurrentCollector); - PowerCable : (RPowerCable:record PowerTrans:TPowerType; SteamPressure:real end); - Heater : (RHeater:record Grate:TGrateType; Boiler:TBoilerType end); - end; - - {dla lokomotyw elektrycznych:} - TScheme= record - Relay: byte; {numer pozycji rozruchu samoczynnego} - R: real; {opornik rozruchowy} {dla dizla napelnienie} - Bn,Mn:byte; {ilosc galezi i silnikow w galezi} {dla dizla Mn: czy luz czy nie} - AutoSwitch: boolean; {czy dana pozycja nastawniana jest recznie czy autom.} - ScndAct: byte; {jesli ma bocznik w nastawniku, to ktory bocznik na ktorej pozycji} - end; - TSchemeTable = array[0..ResArraySize] of TScheme; {tablica rezystorow rozr.} - TDEScheme= record - RPM: real; {obroty diesla} - GenPower: real; {moc maksymalna} - Umax: real; {napiecie maksymalne} - Imax: real; {prad maksymalny} - end; - TDESchemeTable = array[0..32] of TDEScheme; {tablica rezystorow rozr.} - TShuntScheme = record - Umin: real; - Umax: real; - Pmin: real; - Pmax: real; - end; - TShuntSchemeTable = array[0..32] of TShuntScheme; - TMPTRelay = record {lista przekaznikow bocznikowania} - Iup: real; - Idown: real; - end; - TMPTRelayTable = array[0..7] of TMPTRelay; - - TMotorParameters = record - mfi,mIsat,mfi0:real; // aproksymacja M(I) silnika} {dla dizla mIsat=przekladnia biegu - fi,Isat,fi0: real; // aproksymacja E(n)=fi*n} {dla dizla fi, mfi: predkosci przelozenia biegu <-> - AutoSwitch: boolean; - end; - - TSecuritySystem= record - SystemType:byte; {0: brak, 1: czuwak aktywny, 2: SHP/sygnalizacja kabinowa} - AwareDelay:real; //czas powtarzania czuwaka - AwareMinSpeed:real; //minimalna prdko zaczenia czuwaka, normalnie 10% Vmax - SoundSignalDelay,EmergencyBrakeDelay:real; - Status: byte; {0: wylaczony, 1: wlaczony, 2: czuwak, 4: shp, 8: alarm, 16: hamowanie awaryjne} - //SystemTimer, SystemSoundTimer, SystemBrakeTimer: real; - SystemTimer, SystemSoundCATimer, SystemSoundSHPTimer, SystemBrakeCATimer, SystemBrakeSHPTimer, SystemBrakeCATestTimer: real; //hunter-091012 - VelocityAllowed, NextVelocityAllowed: integer; {predkosc pokazywana przez sygnalizacje kabinowa} - RadioStop:boolean; //czy jest RadioStop - end; - - //Ra: to oddzielnie, bo si kompilatorowi miesza - TTransmision= - record //liczba zebow przekladni} - NToothM, NToothW : byte; - Ratio: real; {NToothW/NToothM} - end; - - {sprzegi} - TCouplerType=(NoCoupler,Articulated,Bare,Chain,Screw,Automatic); - //Ra: T_MoverParameters jako klasa jest ju wskanikiem na poziomie Pascala - //P_MoverParameters=^T_MoverParameters - T_MoverParameters=class; - TCoupling = record - {parametry} - SpringKB,SpringKC,beta:real; {stala sprezystosci zderzaka/sprzegu, %tlumiennosci } - DmaxB,FmaxB,DmaxC,FmaxC: real; {tolerancja scisku/rozciagania, sila rozerwania} - CouplerType: TCouplerType; {typ sprzegu} - {zmienne} - CouplingFlag : byte; {0 - wirtualnie, 1 - sprzegi, 2 - pneumatycznie, 4 - sterowanie, 8 - kabel mocy} - AllowedFlag : Integer; //Ra: znaczenie jak wyej, maska dostpnych - Render: boolean; {ABu: czy rysowac jak zaczepiony sprzeg} - CoupleDist: real; {ABu: optymalizacja - liczenie odleglosci raz na klatk, bez iteracji} - Connected: T_MoverParameters; {co jest podlaczone} - ConnectedNr: byte; //Ra: od ktrej strony podczony do (Connected): 0=przd, 1=ty - CForce: real; {sila z jaka dzialal} - Dist: real; {strzalka ugiecia zderzakw} - CheckCollision: boolean; {czy sprawdzac sile czy pedy} - end; - - //TCouplers= array[0..1] of TCoupling; - //TCouplerNr= array[0..1] of byte; //ABu: nr sprzegu z ktorym polaczony; Ra: wrzuci do TCoupling - - {----------------------------------------------} - {glowny obiekt} - T_MoverParameters = class(TObject) //Ra: dodana kreska w celu zrobienia wrappera - dMoveLen:real; - filename:string; - {---opis lokomotywy, wagonu itp} - {--opis serii--} - CategoryFlag: byte; {1 - pociag, 2 - samochod, 4 - statek, 8 - samolot} - {--sekcja stalych typowych parametrow} - TypeName: string; {nazwa serii/typu} - //TrainType: string; {typ: EZT/elektrowoz - Winger 040304} - TrainType: integer; {Ra: powinno by szybciej ni string} - EngineType: TEngineTypes; {typ napedu} - EnginePowerSource: TPowerParameters; {zrodlo mocy dla silnikow} - SystemPowerSource: TPowerParameters; {zrodlo mocy dla systemow sterowania/przetwornic/sprezarek} - HeatingPowerSource: TPowerParameters; {zrodlo mocy dla ogrzewania} - AlterHeatPowerSource: TPowerParameters; {alternatywne zrodlo mocy dla ogrzewania} - LightPowerSource: TPowerParameters; {zrodlo mocy dla oswietlenia} - AlterLightPowerSource: TPowerParameters;{alternatywne mocy dla oswietlenia} - Vmax,Mass,Power: real; {max. predkosc kontrukcyjna, masa wlasna, moc} - Mred: real; {Ra: zredukowane masy wirujce; potrzebne do oblicze hamowania} - TotalMass:real; {wyliczane przez ComputeMass} - HeatingPower, LightPower: real; {moc pobierana na ogrzewanie/oswietlenie} - BatteryVoltage: real; {Winger - baterie w elektrykach} - Battery: boolean; {Czy sa zalavzone baterie} - EpFuse: boolean; {Czy sa zalavzone baterie} - Signalling: boolean; {Czy jest zalaczona sygnalizacja hamowania ostatniego wagonu} - DoorSignalling: boolean; {Czy jest zalaczona sygnalizacja blokady drzwi} - Radio: boolean; {Czy jest zalaczony radiotelefon} - NominalBatteryVoltage: real; {Winger - baterie w elektrykach} - Dim: TDimension; {wymiary} - Cx: real; {wsp. op. aerodyn.} - Floor: real; //poziom podogi dla adunkw - WheelDiameter : real; {srednica kol napednych} - WheelDiameterL : real; //Ra: srednica kol tocznych przednich - WheelDiameterT : real; //Ra: srednica kol tocznych tylnych - TrackW: real; {nominalna szerokosc toru [m]} - AxleInertialMoment: real; {moment bezwladnosci zestawu kolowego} - AxleArangement : string; {uklad osi np. Bo'Bo' albo 1'C} - NPoweredAxles : byte; {ilosc osi napednych liczona z powyzszego} - NAxles : byte; {ilosc wszystkich osi j.w.} - BearingType: byte; {lozyska: 0 - slizgowe, 1 - toczne} - ADist, BDist: real; {odlegosc osi oraz czopow skretu} - {hamulce:} - NBpA : byte; {ilosc el. ciernych na os: 0 1 2 lub 4} - SandCapacity: integer; {zasobnik piasku [kg]} - BrakeSystem: TBrakeSystem;{rodzaj hamulca zespolonego} - BrakeSubsystem: TBrakeSubsystem; - BrakeValve: TBrakeValve; - BrakeHandle: TBrakeHandle; - BrakeLocHandle: TBrakeHandle; - MBPM: real; {masa najwiekszego cisnienia} - - Hamulec: TBrake; - Handle: THandle; - LocHandle: THandle; - Pipe, Pipe2: TReservoir; - - LocalBrake: TLocalBrake; {rodzaj hamulca indywidualnego} - BrakePressureTable: TBrakePressureTable; {wyszczegolnienie cisnien w rurze} - BrakePressureActual: TBrakePressure; //wartoci waone dla aktualnej pozycji kranu - ASBType: byte; {0: brak hamulca przeciwposlizgowego, 1: reczny, 2: automat} - TurboTest: byte; - MaxBrakeForce: real; {maksymalna sila nacisku hamulca} - MaxBrakePress: array[0..4] of real; //pomocniczy, proz, sred, lad, pp - P2FTrans: real; - TrackBrakeForce: real; {sila nacisku hamulca szynowego} - BrakeMethod: byte; {flaga rodzaju hamulca} - {max. cisnienie w cyl. ham., stala proporcjonalnosci p-K} - HighPipePress,LowPipePress,DeltaPipePress: real; - {max. i min. robocze cisnienie w przewodzie glownym oraz roznica miedzy nimi} - CntrlPipePress: real; //cinienie z zbiorniku sterujcym - BrakeVolume, BrakeVVolume, VeselVolume: real; - {pojemnosc powietrza w ukladzie hamulcowym, w ukladzie glownej sprezarki [m^3] } - BrakeCylNo: integer; {ilosc cylindrow ham.} - BrakeCylRadius, BrakeCylDist: real; - BrakeCylMult: array[0..2] of real; - LoadFlag: byte; - {promien cylindra, skok cylindra, przekladnia hamulcowa} - BrakeCylSpring: real; {suma nacisku sprezyn powrotnych, kN} - BrakeSlckAdj: real; {opor nastawiacza skoku tloka, kN} - BrakeRigEff: real; {sprawnosc przekladni dzwigniowej} - RapidMult: real; {przelozenie rapidu} - BrakeValveSize: integer; - BrakeValveParams: string; - Spg: real; - MinCompressor,MaxCompressor,CompressorSpeed:real; - {cisnienie wlaczania, zalaczania sprezarki, wydajnosc sprezarki} - BrakeDelay: TBrakeDelayTable; {opoznienie hamowania/odhamowania t/o} - BrakeCtrlPosNo:byte; {ilosc pozycji hamulca} - {nastawniki:} - MainCtrlPosNo: byte; {ilosc pozycji nastawnika} - ScndCtrlPosNo: byte; - LightsPosNo, LightsDefPos: byte; - LightsWrap: boolean; - Lights: array [0..1] of array [1..16] of byte; - ScndInMain: boolean; {zaleznosc bocznika od nastawnika} - MBrake: boolean; {Czy jest hamulec reczny} - StopBrakeDecc: real; - SecuritySystem: TSecuritySystem; - - {-sekcja parametrow dla lokomotywy elektrycznej} - RList: TSchemeTable; {lista rezystorow rozruchowych i polaczen silnikow, dla dizla: napelnienia} - RlistSize: integer; - MotorParam: array[0..MotorParametersArraySize] of TMotorParameters; - {rozne parametry silnika przy bocznikowaniach} - {dla lokomotywy spalinowej z przekladnia mechaniczna: przelozenia biegow} - Transmision : TTransmision; - // record {liczba zebow przekladni} - // NToothM, NToothW : byte; - // Ratio: real; {NToothW/NToothM} - // end; - NominalVoltage: real; {nominalne napiecie silnika} - WindingRes : real; - u: real; //wspolczynnik tarcia yB wywalic!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - CircuitRes : real; {rezystancje silnika i obwodu} - IminLo,IminHi: integer; {prady przelacznika automatycznego rozruchu, uzywane tez przez ai_driver} - ImaxLo,ImaxHi: integer; {maksymalny prad niskiego i wysokiego rozruchu} - nmax: real; {maksymalna dop. ilosc obrotow /s} - InitialCtrlDelay, {ile sek. opoznienia po wl. silnika} - CtrlDelay: real; { -//- -//- miedzy kolejnymi poz.} - CtrlDownDelay: real; { -//- -//- przy schodzeniu z poz.} {hunter-101012} - FastSerialCircuit: byte;{0 - po kolei zamyka styczniki az do osiagniecia szeregowej, 1 - natychmiastowe wejscie na szeregowa} {hunter-111012} - AutoRelayType: byte; {0 -brak, 1 - jest, 2 - opcja} - CoupledCtrl: boolean; {czy mainctrl i scndctrl sa sprzezone} - //CouplerNr: TCouplerNr; {ABu: nr sprzegu podlaczonego w drugim obiekcie} - IsCoupled: boolean; {czy jest sprzezony ale jedzie z tylu} - DynamicBrakeType: byte; {patrz dbrake_*} - RVentType: byte; {0 - brak, 1 - jest, 2 - automatycznie wlaczany} - RVentnmax: real; {maks. obroty wentylatorow oporow rozruchowych} - RVentCutOff: real; {rezystancja wylaczania wentylatorow dla RVentType=2} - CompressorPower: integer; {0: bezp. z obwodow silnika, 1: z przetwornicy, reczne, 2: w przetwornicy, stale, 5: z silnikowego} - SmallCompressorPower: integer; {Winger ZROBIC} - Trafo: boolean; {pojazd wyposaony w transformator} - - {-sekcja parametrow dla lokomotywy spalinowej z przekladnia mechaniczna} - dizel_Mmax, dizel_nMmax, dizel_Mnmax, dizel_nmax, dizel_nominalfill: real; - {parametry aproksymacji silnika spalinowego} - dizel_Mstand: real; {moment oporow ruchu silnika dla enrot=0} -{ dizel_auto_min, dizel_auto_max: real; {predkosc obrotowa przelaczania automatycznej skrzyni biegow} - dizel_nmax_cutoff: real; {predkosc obrotowa zadzialania ogranicznika predkosci} - dizel_nmin: real; {najmniejsza dopuszczalna predkosc obrotowa} - dizel_minVelfullengage: real; {najmniejsza predkosc przy jezdzie ze sprzeglem bez poslizgu} - dizel_AIM: real; {moment bezwladnosci walu itp} - dizel_engageDia, dizel_engageMaxForce, dizel_engagefriction: real; {parametry sprzegla} - - {- dla lokomotyw spalinowo-elektrycznych -} - AnPos: real; // pozycja sterowania dokladnego (analogowego) - AnalogCtrl: boolean; // - AnMainCtrl: boolean; // - ShuntModeAllow: boolean; - ShuntMode: boolean; - - Flat: boolean; - Vhyp: real; - DElist: TDESchemeTable; - Vadd: real; - MPTRelay: TMPTRelayTable; - RelayType: byte; - SST: TShuntSchemeTable; - PowerCorRatio: real; //Wspolczynnik korekcyjny - - - {- dla uproszczonego modelu silnika (dumb) oraz dla drezyny} - Ftmax:real; - - {- dla lokomotyw z silnikami indukcyjnymi -} - eimc: array [0..25] of real; - - {-dla wagonow} - MaxLoad: longint; {masa w T lub ilosc w sztukach - ladownosc} - LoadAccepted, LoadQuantity: string; {co moze byc zaladowane, jednostki miary} - OverLoadFactor: real; {ile razy moze byc przekroczona ladownosc} - LoadSpeed,UnLoadSpeed: real;{szybkosc na- i rozladunku jednostki/s} - DoorOpenCtrl,DoorCloseCtrl: byte; {0: przez pasazera, 1: przez maszyniste, 2: samoczynne (zamykanie)} - DoorStayOpen: real; {jak dlugo otwarte w przypadku DoorCloseCtrl=2} - DoorClosureWarning: boolean; {czy jest ostrzeganie przed zamknieciem} - DoorOpenSpeed, DoorCloseSpeed: real; {predkosc otwierania i zamykania w j.u. } - DoorMaxShiftL,DoorMaxShiftR,DoorMaxPlugShift: real;{szerokosc otwarcia lub kat} - DoorOpenMethod: byte; {sposob otwarcia - 1: przesuwne, 2: obrotowe, 3: trjelementowe} - PlatformSpeed: real; {szybkosc stopnia} - PlatformMaxShift: real; {wysuniecie stopnia} - PlatformOpenMethod: byte; {sposob animacji stopnia} - ScndS: boolean; {Czy jest bocznikowanie na szeregowej} - - {--sekcja zmiennych} - {--opis konkretnego egzemplarza taboru} - Loc: TLocation; //pozycja pojazdw do wyznaczenia odlegoci pomidzy sprzgami - Rot: TRotation; - Name: string; {nazwa wlasna} - Couplers: array[0..1] of TCoupling; //urzadzenia zderzno-sprzegowe, polaczenia miedzy wagonami - HVCouplers: array[0..1] of array[0..1] of real; //przewod WN - ScanCounter: integer; {pomocnicze do skanowania sprzegow} - EventFlag: boolean; {!o true jesli cos nietypowego sie wydarzy} - SoundFlag: byte; {!o patrz stale sound_ } - DistCounter: real; {! licznik kilometrow } - V: real; //predkosc w [m/s] wzgldem sprzgw (dodania gdy jedzie w stron 0) - Vel: real; //modu prdkoci w [km/h], uywany przez AI - AccS: real; //efektywne przyspieszenie styczne w [m/s^2] (wszystkie siy) - AccN: real; //przyspieszenie normalne w [m/s^2] - AccV: real; - nrot: real; - {! rotacja kol [obr/s]} - EnginePower: real; {! chwilowa moc silnikow} - dL, Fb, Ff : real; {przesuniecie, sila hamowania i tarcia} - FTrain,FStand: real; {! sila pociagowa i oporow ruchu} - FTotal: real; {! calkowita sila dzialajaca na pojazd} - UnitBrakeForce: real; {!s sia hamowania przypadajca na jeden element} - Ntotal: real; {!s sia nacisku klockow} - SlippingWheels,SandDose: boolean; {! poslizg kol, sypanie piasku} - Sand: real; {ilosc piasku} - BrakeSlippingTimer:real; {pomocnicza zmienna do wylaczania przeciwposlizgu} - dpBrake,dpPipe,dpMainValve,dpLocalValve: real; - {! przyrosty cisnienia w kroku czasowym} - ScndPipePress: real; {cisnienie w przewodzie zasilajacym} - BrakePress:real; {!o cisnienie w cylindrach hamulcowych} - LocBrakePress:real; {!o cisnienie w cylindrach hamulcowych z pomocniczego} - PipeBrakePress:real; {!o cisnienie w cylindrach hamulcowych z przewodu} - PipePress: real; {!o cisnienie w przewodzie glownym} - EqvtPipePress: real; {!o cisnienie w przewodzie glownym skladu} - Volume: real; {objetosc spr. powietrza w zbiorniku hamulca} - CompressedVolume:real; {objetosc spr. powietrza w ukl. zasilania} - PantVolume:real; {objetosc spr. powietrza w ukl. pantografu} - Compressor: real; {! cisnienie w ukladzie zasilajacym} - CompressorFlag: boolean; {!o czy wlaczona sprezarka} - PantCompFlag: boolean; {!o czy wlaczona sprezarka pantografow} - CompressorAllow: boolean; {! zezwolenie na uruchomienie sprezarki NBMX} - ConverterFlag: boolean; {! czy wlaczona przetwornica NBMX} - ConverterAllow: boolean; {zezwolenie na prace przetwornicy NBMX} - BrakeCtrlPos:integer; {nastawa hamulca zespolonego} - BrakeCtrlPosR:real; {nastawa hamulca zespolonego - plynna dla FV4a} - BrakeCtrlPos2:real; {nastawa hamulca zespolonego - kapturek dla FV4a} - LocalBrakePos:byte; {nastawa hamulca indywidualnego} - ManualBrakePos:byte; {nastawa hamulca recznego} - LocalBrakePosA: real; - BrakeStatus: byte; {0 - odham, 1 - ham., 2 - uszk., 4 - odluzniacz, 8 - antyposlizg, 16 - uzyte EP, 32 - pozycja R, 64 - powrot z R} - EmergencyBrakeFlag: boolean; {hamowanie nagle} - BrakeDelayFlag: byte; {nastawa opoznienia ham. osob/towar/posp/exp 0/1/2/4} - BrakeDelays: byte; {nastawy mozliwe do uzyskania} - BrakeOpModeFlag: byte; {nastawa trybu pracy PS/PN/EP/MED 1/2/4/8} - BrakeOpModes: byte; {nastawy mozliwe do uzyskania} - DynamicBrakeFlag: boolean; {czy wlaczony hamulec elektrodymiczny} -// NapUdWsp: integer; - LimPipePress: real; {stabilizator cisnienia} - ActFlowSpeed: real; {szybkosc stabilizatora} - - - DamageFlag: byte; //kombinacja bitowa stalych dtrain_* } - EngDmgFlag: byte; //kombinacja bitowa stalych usterek} - DerailReason: byte; //przyczyna wykolejenia - - //EndSignalsFlag: byte; {ABu 060205: zmiany - koncowki: 1/16 - swiatla prz/tyl, 2/31 - blachy prz/tyl} - //HeadSignalsFlag: byte; {ABu 060205: zmiany - swiatla: 1/2/4 - przod, 16/32/63 - tyl} - CommandIn: TCommand; - {komenda przekazywana przez PutCommand} - {i wykonywana przez RunInternalCommand} - CommandOut: string; {komenda przekazywana przez ExternalCommand} - CommandLast: string; //Ra: ostatnio wykonana komenda do podgldu - ValueOut: real; {argument komendy ktra ma byc przekazana na zewnatrz} - - RunningShape:TTrackShape;{geometria toru po ktorym jedzie pojazd} - RunningTrack:TTrackParam;{parametry toru po ktorym jedzie pojazd} - OffsetTrackH, OffsetTrackV: real; {przesuniecie poz. i pion. w/m osi toru} - - {-zmienne dla lokomotyw} - Mains: boolean; {polozenie glownego wylacznika} - MainCtrlPos: byte; {polozenie glownego nastawnika} - ScndCtrlPos: byte; {polozenie dodatkowego nastawnika} - LightsPos: byte; - ActiveDir: integer; //czy lok. jest wlaczona i w ktorym kierunku: - //wzgldem wybranej kabiny: -1 - do tylu, +1 - do przodu, 0 - wylaczona - CabNo: integer; //numer kabiny, z ktrej jest sterowanie: 1 lub -1; w przeciwnym razie brak sterowania - rozrzad - DirAbsolute: integer; //zadany kierunek jazdy wzgldem sprzgw (1=w strone 0,-1=w stron 1) - ActiveCab: integer; //numer kabiny, w ktorej jest obsada (zwykle jedna na skad) - LastSwitchingTime: real; {czas ostatniego przelaczania czegos} - //WarningSignal: byte; {0: nie trabi, 1,2: trabi} - DepartureSignal: boolean; {sygnal odjazdu} - InsideConsist: boolean; - {-zmienne dla lokomotywy elektrycznej} - RunningTraction:TTractionParam;{parametry sieci trakcyjnej najblizej lokomotywy} - enrot, Im, Itot,IHeating,ITraction, TotalCurrent, Mm, Mw, Fw, Ft: real; - {ilosc obrotow, prad silnika i calkowity, momenty, sily napedne} - //Ra: Im jest ujemny, jeli lok jedzie w stron sprzgu 1 - //a ujemne powinien by przy odwrconej polaryzacji sieci... - //w wielu miejscach jest uywane abs(Im) - Imin,Imax: integer; {prad przelaczania automatycznego rozruchu, prad bezpiecznika} - Voltage: real; {aktualne napiecie sieci zasilajacej} - MainCtrlActualPos: byte; {wskaznik RList} - ScndCtrlActualPos: byte; {wskaznik MotorParam} - DelayCtrlFlag: boolean; //czy czekanie na 1. pozycji na zaczenie? - LastRelayTime: real; {czas ostatniego przelaczania stycznikow} - AutoRelayFlag: boolean; {mozna zmieniac jesli AutoRelayType=2} - FuseFlag: boolean; {!o bezpiecznik nadmiarowy} - ConvOvldFlag: boolean; {! nadmiarowy przetwornicy i ogrzewania} - StLinFlag: boolean; {!o styczniki liniowe} - ResistorsFlag: boolean; {!o jazda rezystorowa} - RventRot: real; {!s obroty wentylatorow rozruchowych} - UnBrake: boolean; {w EZT - nacisniete odhamowywanie} - PantPress: real; {Cisnienie w zbiornikach pantografow} - s_CAtestebrake: boolean; //hunter-091012: zmienna dla testu ca - - - {-zmienne dla lokomotywy spalinowej z przekladnia mechaniczna} - dizel_fill: real; {napelnienie} - dizel_engagestate: real; {sprzeglo skrzyni biegow: 0 - luz, 1 - wlaczone, 0.5 - wlaczone 50% (z poslizgiem)} - dizel_engage: real; {sprzeglo skrzyni biegow: aktualny docisk} - dizel_automaticgearstatus: real; {0 - bez zmiany, -1 zmiana na nizszy +1 zmiana na wyzszy} - dizel_enginestart: boolean; {czy trwa rozruch silnika} - dizel_engagedeltaomega: real; {roznica predkosci katowych tarcz sprzegla} - - {- zmienne dla lokomotyw z silnikami indukcyjnymi -} - eimv: array [0..20] of real; - - {-zmienne dla drezyny} - PulseForce :real; {przylozona sila} - PulseForceTimer: real; - PulseForceCount: integer; - - {dla drezyny, silnika spalinowego i parowego} - eAngle: real; - - {-dla wagonow} - Load: longint; {masa w T lub ilosc w sztukach - zaladowane} - LoadType: string; {co jest zaladowane} - LoadStatus: byte; //+1=trwa rozladunek,+2=trwa zaladunek,+4=zakoczono,0=zaktualizowany model - LastLoadChangeTime: real; //raz (roz)adowania - - DoorBlocked: boolean; //Czy jest blokada drzwi - DoorLeftOpened: boolean; //stan drzwi - DoorRightOpened: boolean; - PantFrontUp: boolean; //stan patykow 'Winger 160204 - PantRearUp: boolean; - PantFrontSP: boolean; //dzwiek patykow 'Winger 010304 - PantRearSP: boolean; - PantFrontStart: integer; //stan patykow 'Winger 160204 - PantRearStart: integer; - PantFrontVolt: real; //pantograf pod napieciem? 'Winger 160404 - PantRearVolt: real; - PantSwitchType: string; - ConvSwitchType: string; - - Heating: boolean; //ogrzewanie 'Winger 020304 - DoubleTr: integer; //trakcja ukrotniona - przedni pojazd 'Winger 160304 - - PhysicActivation: boolean; - - {ABu: stale dla wyznaczania sil (i nie tylko) po optymalizacji} - FrictConst1: real; - FrictConst2s: real; - FrictConst2d: real; - TotalMassxg : real; {TotalMass*g} - - - {--funkcje} - - - function GetTrainsetVoltage: real; - function Physic_ReActivation: boolean; - -{ function BrakeRatio: real; } - function LocalBrakeRatio: real; - function ManualBrakeRatio: real; - function PipeRatio: real; {ile napelniac} - function RealPipeRatio: real; {jak szybko} - function BrakeVP: real; - function DynamicBrakeSwitch(Switch:boolean):boolean; - - {! przesylanie komend sterujacych} - function SendCtrlBroadcast(CtrlCommand:string; ctrlvalue:real):boolean; - function SendCtrlToNext(CtrlCommand:string;ctrlvalue,dir:real):boolean; - function CabActivisation:boolean; - function CabDeactivisation:boolean; - - {! funkcje zwiekszajace/zmniejszajace nastawniki} - {! glowny nastawnik:} - function IncMainCtrl(CtrlSpeed:integer): boolean; - function DecMainCtrl(CtrlSpeed:integer): boolean; - {! pomocniczy nastawnik:} - function IncScndCtrl(CtrlSpeed:integer): boolean; - function DecScndCtrl(CtrlSpeed:integer): boolean; - - function AddPulseForce(Multipler:integer): boolean; {dla drezyny} - - {wlacza/wylacza sypanie piasku} - function SandDoseOn : boolean; - - {! zbijanie czuwaka/SHP} - function SecuritySystemReset:boolean; - {test czuwaka/SHP} - procedure SecuritySystemCheck(dt:real); - function BatterySwitch(State:boolean):boolean; - function EpFuseSwitch(State:boolean):boolean; - - {! stopnie hamowania - hamulec zasadniczy} - function IncBrakeLevelOld:boolean; - function DecBrakeLevelOld:boolean; - {! stopnie hamowania - hamulec pomocniczy} - function IncLocalBrakeLevel(CtrlSpeed:byte):boolean; - function DecLocalBrakeLevel(CtrlSpeed:byte):boolean; - {! ABu 010205: - skrajne polozenia ham. pomocniczego} - function IncLocalBrakeLevelFAST:boolean; - function DecLocalBrakeLevelFAST:boolean; - - {! stopnie hamowania - hamulec reczny} - function IncManualBrakeLevel(CtrlSpeed:byte):boolean; - function DecManualBrakeLevel(CtrlSpeed:byte):boolean; - - {! hamulec bezpieczenstwa} - function EmergencyBrakeSwitch(Switch:boolean): boolean; - {hamulec przeciwposlizgowy} - function AntiSlippingBrake: boolean; - {odluzniacz} - function BrakeReleaser(state: byte):boolean; - function SwitchEPBrake(state: byte):boolean; - - {! reczny wlacznik urzadzen antyposlizgowych} - function AntiSlippingButton: boolean; - - {funkcje dla ukladow pneumatycznych} - function IncBrakePress(var brake:real;PressLimit,dp:real):boolean; - function DecBrakePress(var brake:real;PressLimit,dp:real):boolean; - function BrakeDelaySwitch(BDS:byte): boolean; {! przelaczanie nastawy opoznienia} - function IncBrakeMult(): boolean; {przelaczanie prozny/ladowny} - function DecBrakeMult(): boolean; - {pomocnicze funkcje dla ukladow pneumatycznych} - procedure UpdateBrakePressure(dt: real); - procedure UpdatePipePressure(dt:real); - procedure CompressorCheck(dt:real); {wlacza, wylacza kompresor, laduje zbiornik} - procedure UpdateScndPipePressure(dt:real); - //procedure UpdateBatteryVoltage(dt:real); - function GetDVc(dt:real):real; - - {! funkcje laczace/rozlaczajace sprzegi} - //Ra: przeniesione do C++ - - {funkcje obliczajace sily} - procedure ComputeConstans; //ABu: wczesniejsze wyznaczenie stalych dla liczenia sil - //procedure SetCoupleDist; //ABu: wyznaczenie odleglosci miedzy wagonami - function ComputeMass:real; - function Adhesive(staticfriction:real): real; - function TractionForce(dt:real):real; - function FrictionForce(R:real;TDamage:byte):real; - function BrakeForce(Track:TTrackParam):real; - function CouplerForce(CouplerN:byte; dt:real):real; - procedure CollisionDetect(CouplerN:byte; dt:real); - - {obrot kol uwzgledniajacy poslizg} - function ComputeRotatingWheel(WForce,dt,n:real): real; - - {komendy} - function SetInternalCommand(NewCommand:string; NewValue1,NewValue2:real):boolean; - {! do wpisywania komend przez zewnetrzne zdarzenia} - function GetExternalCommand(var Command:string):real; - function RunCommand(command:string; CValue1,CValue2:real):boolean; - function RunInternalCommand:boolean; - procedure PutCommand(NewCommand:string; NewValue1,NewValue2:real; NewLocation:TLocation); - - {--funkcje dla lokomotyw} - {! kierunek ruchu} - //function DirectionForward: boolean; - function DirectionBackward: boolean; - {! wylacznik glowny} - function MainSwitch(State:boolean): boolean; -// procedure SwitchMainKey; - {! zmiana kabiny i resetowanie ustawien} - //function ChangeCab(direction:integer): boolean; - - {! wl/wyl przetwornicy} - function ConverterSwitch(State:boolean):boolean; - {! wl/wyl sprezarki} - function CompressorSwitch(State:boolean):boolean; -{ function SmallCompressorSwitch(State:boolean):boolean;} - {procedure ConverterCheck; ->C++} - - {-funkcje typowe dla lokomotywy elektrycznej} - {! wlaczanie bezpiecznika nadmiarowego} - function FuseOn: boolean; - function FuseFlagCheck: boolean; {sprawdzanei flagi nadmiarowego} - procedure FuseOff; {wywalanie bezpiecznika nadmiarowego} - {!o pokazuje bezwgl. wartosc pradu na wybranym amperomierzu} - function ShowCurrent(AmpN:byte): integer; - {!o pokazuje bezwgl. wartosc obrotow na obrotomierzu jednego z 3 pojazdow} - {function ShowEngineRotation(VehN:byte): integer; //Ra 2014-06: przeniesione do C++} - {funkcje uzalezniajace sile pociagowa od predkosci: v2n, n2r, current, momentum} - function v2n:real; - function current(n,U:real): real; - function Momentum(I:real): real; - function MomentumF(I, Iw :real; SCP:byte ): real; - {! odlaczanie uszkodzonych silnikow} - function CutOffEngine: boolean; - {! przelacznik pradu wysokiego rozruchu} - function MaxCurrentSwitch(State:boolean):boolean; - {sprawdzanie kontrolki rezystorow rozrochowych NBMX} - function ResistorsFlagCheck: boolean; - - {! przelacznik pradu automatycznego rozruchu} - function MinCurrentSwitch(State:boolean):boolean; - {! przelacznik automatycznego rozruchu} - function AutoRelaySwitch(State:boolean):boolean; - {symulacja automatycznego rozruchu} - function AutoRelayCheck: boolean; - - {-funkcje typowe dla lokomotywy spalinowej z przekladnia mechaniczna} - function dizel_EngageSwitch(state: real): boolean; - function dizel_EngageChange(dt: real): boolean; - function dizel_AutoGearCheck: boolean; - function dizel_fillcheck(mcp:byte): real; -{ function dizel_rotateengine(Momentum,dt,n,engage:real): real; } - function dizel_Momentum(dizel_fill,n,dt:real): real; - function dizel_Update(dt:real): boolean; - - {-funkcje dla wagonow} - function LoadingDone(LSpeed: real; LoadInit:string):boolean; - - {! WAZNA FUNKCJA - oblicza sile wypadkowa} - procedure ComputeTotalForce(dt: real; dt1: real; FullVer: boolean); - - {! BARDZO WAZNA FUNKCJA - oblicza przesuniecie lokomotywy lub wagonu} - function ComputeMovement(dt:real; dt1:real; Shape:TTrackShape; var Track:TTrackParam; var ElectricTraction:TTractionParam; NewLoc:TLocation; var NewRot:TRotation):real; - {dt powinno byc 10ms lub mniejsze} - {NewRot na wejsciu daje aktualna orientacje pojazdu, na wyjsciu daje dodatkowe wychylenia od tej orientacji} - - {! JESZCZE WAZNIEJSZA FUNKCJA - ABu: - mocno zoptymalizowanana ComputeMovement} - function FastComputeMovement(dt:real; Shape:TTrackShape; var Track:TTrackParam; NewLoc:TLocation; var NewRot:TRotation):real; //Shape:TTrackShape; var Track:TTrackParam; var ElectricTraction:TTractionParam; NewLoc:TLocation; var NewRot:TRotation):real; - {dt powinno byc 10ms lub mniejsze} - {NewRot na wejsciu daje aktualna orientacje pojazdu, na wyjsciu daje dodatkowe wychylenia od tej orientacji} - - - {dla samochodow} - function ChangeOffsetH(DeltaOffset:real): boolean; - - {! procedury I/O} - constructor Init(//LocInitial:TLocation; RotInitial:TRotation; - VelInitial:real; TypeNameInit, NameInit: string; LoadInitial:longint; LoadTypeInitial: string; Cab:integer); - {wywolac najpierw to} - function LoadChkFile(chkpath:string):Boolean; {potem zaladowac z pliku} - function CheckLocomotiveParameters(ReadyFlag:boolean;Dir:longint): boolean; {a nastepnie sprawdzic} - function EngineDescription(what:integer): string; {opis stanu lokomotywy} - - {obsluga drzwi} - function DoorLeft(State: Boolean): Boolean; {obsluga dzwi lewych} - function DoorRight(State: Boolean): Boolean; - function DoorBlockedFlag: Boolean; //czy blokada drzwi jest aktualnie zaczona - - {obsluga pantografow - Winger 160204} - function PantFront(State: Boolean): Boolean; - function PantRear(State: Boolean): Boolean; - {ogrzewanie - Winger 020304} - //function Heating(State: Boolean): Boolean; - - //private - //function TotalMass:real; -{ function GetFTotal(CN:byte): real; - function GetMass(CN:byte): real; - procedure SendAVL(AccS,AccN,V,dL:real; CN:byte); } - end; {ufff} - -function Distance(Loc1,Loc2: TLocation; Dim1,Dim2:TDimension) : real; - -{----------------------------------------------------------------} -{========================McZapkie'2001===========================} -{----------------------------------------------------------------} -implementation - -const - Steel2Steel_friction=0.15; {tarcie statyczne} - g=9.81; {przyspieszenie ziemskie} - SandSpeed=0.1; {ile kg/s} - RVentSpeed=0.4; {rozpedzanie sie wentylatora obr/s^2} - RVentMinI=50.0; {przy jakim pradzie sie wylaczaja} - CouplerTune:real=0.1; {skalowanie tlumiennosci} - Pirazy2=Pi*2; - -{------------------------------------------} -{funkcje pomocnicze} - -function s2NPW(s:string):byte; -{wylicza ilosc osi napednych ze stringu opisujacego uklad osi} -{np. 2'A' daje 1, Bo'Bo' daje 4, 1'E daje 5 itp} -const A=ord('A')-1; -var k,NPW:byte; -begin - NPW:=0; - for k:=1 to Length(s) do - begin - if s[k] in ['A'..'Z'] then - NPW:=NPW+Ord(s[k])-A; - end; - s2NPW:=NPW; -end; - -function s2NNW(s:string):byte; -{wylicza ilosc osi nienapednych ze stringu opisujacego uklad osi} -{np. 2'A' daje 2, Bo'Bo' daje 0, 1'E daje 1 itp} -const Zero=ord('0'); -var k,NNW:byte; -begin - NNW:=0; - for k:=1 to Length(s) do - begin - if s[k] in ['1'..'9'] then - NNW:=NNW+Ord(s[k])-Zero; - end; - s2NNW:=NNW; -end; - -function Distance(Loc1,Loc2:TLocation;Dim1,Dim2:TDimension):real; -//zwraca odlego pomidzy pojazdami (Loc1) i (Loc2) z uwzgldnieneim ich dugoci (kule!) -var Dist:real; -begin - Dist:=SQRT(SQR(Loc2.x-Loc1.x)+SQR(Loc1.y-Loc2.y)); - Distance:=Dist-Dim2.L/2.0-Dim1.L/2.0; -{ Distance:=Hypot(Loc2.x-Loc1.x,Loc2.y-Loc1.y)-(Dim2.L+Dim1.L)/2; } -end; - -{oblicza zmiane predkosci i przyrost pedu wskutek kolizji} -function ComputeCollision(var v1,v2:real; m1,m2,beta:real;vc:boolean):real; -var CCP,w1,w2,m1m2:real; -begin - if (v1Coupler2) then DirPatch:=1 - else DirPatch:=-1; -end; - - -function DirF(CouplerN:byte): real; -begin - case CouplerN of - 0: DirF:=-1; - 1: DirF:=1 - else DirF:=0; - end; -end; - -{yB: funkcje dodatkowe hamulcowe} - -function PR(p1,p2:real): real; -var ph,pl:real; -begin - ph:=Max0R(p1,p2)+0.1; - pl:=p1+p2-ph+0.2; - PR:=(ph-pl)/(1.13*ph-pl); -end; - -function SPR(ph,pl:real): real; -begin - SPR:=0.674*(ph-pl)/(1.13*ph-pl+0.013); -end; - -{---------rozwiniecie deklaracji metod obiektu T_MoverParameters--------} - -(* -function T_MoverParameters.GetTrainsetVoltage: real; -//ABu: funkcja zwracajaca napiecie dla calego skladu, przydatna dla EZT -var volt: real; -begin - volt:=0.0; - if Couplers[1].Connected<>nil then - if (TestFlag(Couplers[1].CouplingFlag,ctrain_power)) then //czy jest sprzg WN - begin //najczciej silnikowy jest z tyu - if (Couplers[1].Connected.PantFrontVolt<>0.0) then - volt:=Couplers[1].Connected.PantFrontVolt - else - if (Couplers[1].Connected.PantRearVolt<>0.0) then - volt:=Couplers[1].Connected.PantRearVolt; - end; - if (volt=0.0) then - if Couplers[0].Connected<>nil then - if (TestFlag(Couplers[0].CouplingFlag,ctrain_power)) then //czy jest sprzg WN - begin - if (Couplers[0].Connected.PantFrontVolt<>0.0) then - volt:=Couplers[0].Connected.PantFrontVolt - else - if (Couplers[0].Connected.PantRearVolt<>0.0) then - volt:=Couplers[0].Connected.PantRearVolt; - end; - GetTrainsetVoltage:=volt; -end; -*) - -function T_MoverParameters.GetTrainsetVoltage: real; -//ABu: funkcja zwracajaca napiecie dla calego skladu, przydatna dla EZT -//var volt: real; -begin - GetTrainsetVoltage:=Max0R(HVCouplers[1][1],HVCouplers[0][1]); -end; - - - -function T_MoverParameters.Physic_ReActivation: boolean; - begin - if PhysicActivation then - Physic_Reactivation:=false - else - begin - PhysicActivation:=true; - LastSwitchingTime:=0; - Physic_Reactivation:=true; - end; - end; - - -{stosunek obecnego nastawienia sily hamowania do maksymalnej nastawy} -{ -function T_MoverParameters.BrakeRatio: real; - begin - if BrakeCtrlPosNo>0 then - begin - if BrakeCtrlPos<0 then - BrakeRatio:=1 - else - BrakeRatio:=1-BrakeCtrlPos/BrakeCtrlPosNo - end - else - BrakeRatio:=0; - end; -} - -function T_MoverParameters.LocalBrakeRatio: real; -var LBR:real; -begin - if BrakeHandle=MHZ_EN57 then - if (BrakeOpModeFlag>=bom_EP) then - LBR:=(Handle as TMHZ_EN57).GetEP(BrakeCtrlPosR) - else - LBR:=0 - else - if LocalBrakePosNo>0 then - LBR:=LocalBrakePos/LocalBrakePosNo - else - LBR:=0; -// if TestFlag(BrakeStatus,b_antislip) then -// LBR:=Max0R(LBR,PipeRatio)+0.4; - LocalBrakeRatio:=LBR; -end; - -function T_MoverParameters.ManualBrakeRatio: real; -var MBR:real; -begin - if ManualBrakePosNo>0 then - MBR:=ManualBrakePos/ManualBrakePosNo - else - MBR:=0; - ManualBrakeRatio:=MBR; -end; - -function T_MoverParameters.PipeRatio: real; -var pr:real; -begin - if DeltaPipePress>0 then - if (false) then //SPKS!! - begin - if (3*PipePress)>(HighPipePress+LowPipePress+LowPipePress) then - pr:=(HighPipePress-Min0R(HighPipePress,PipePress))/(DeltaPipePress*4.0/3.0) - else - pr:=(HighPipePress-1.0/3.0*DeltaPipePress-Max0R(LowPipePress,PipePress))/(DeltaPipePress*2.0/3.0); -// if (not TestFlag(BrakeStatus,b_Ractive)) and (BrakeMethod and 1 = 0) and TestFlag(BrakeDelays,bdelay_R) and (Power<1) and (BrakeCtrlPos<1) then -// pr:=Min0R(0.5,pr); - //if (Compressor>0.5) then - // pr:=pr*1.333; //dziwny rapid wywalamy - end - else - pr:=(HighPipePress-Max0R(LowPipePress,Min0R(HighPipePress,PipePress)))/DeltaPipePress - else - pr:=0; - PipeRatio:=pr; -end; - -function T_MoverParameters.RealPipeRatio: real; -var rpp:real; -begin - if DeltaPipePress>0 then - rpp:=(CntrlPipePress-PipePress)/(DeltaPipePress) - else - rpp:=0; - RealPipeRatio:=rpp; -end; - -function T_MoverParameters.BrakeVP: real; -begin - if BrakeVVolume>0 then - BrakeVP:=Volume/(10.0*BrakeVVolume) - else BrakeVP:=0; -end; - -{reczne przelaczanie hamulca elektrodynamicznego} -function T_MoverParameters.DynamicBrakeSwitch(Switch:boolean):boolean; -var b:byte; -begin - if (DynamicBrakeType=dbrake_switch) and (MainCtrlPos=0) then - begin - DynamicBrakeFlag:=Switch; - DynamicBrakeSwitch:=true; - for b:=0 to 1 do - with Couplers[b] do - if TestFlag(CouplingFlag,ctrain_controll) then - Connected.DynamicBrakeFlag:=DynamicBrakeFlag; - {end; - if (DynamicBrakeType=dbrake_passive) and (TrainType=dt_ET42) then - begin - DynamicBrakeFlag:=false; - DynamicBrakeSwitch:=false;} - end - else - DynamicBrakeSwitch:=false; -end; - - -function T_MoverParameters.SendCtrlBroadcast(CtrlCommand:string;ctrlvalue:real):boolean; -var b:byte; OK:boolean; -begin - OK:=((CtrlCommand<>CommandIn.Command) and (ctrlvalue<>CommandIn.Value1)); - if OK then - for b:=0 to 1 do - with Couplers[b] do - if TestFlag(CouplingFlag,ctrain_controll) then - if Connected.SetInternalCommand(CtrlCommand,ctrlvalue,DirF(b)) then - OK:=Connected.RunInternalCommand or OK; - SendCtrlBroadcast:=OK; -end; - - -function T_MoverParameters.SendCtrlToNext(CtrlCommand:string;ctrlvalue,dir:real):boolean; -//wysanie komendy w kierunku dir (1=przod,-1=ty) do kolejnego pojazdu (jednego) -var - OK:Boolean; - d:Integer; //numer sprzgu w kierunku ktrego wysyamy -begin -//Ra: by problem z propagacj, jeli w skadzie jest pojazd wstawiony odwrotnie -//Ra: problem jest rwnie, jeli AI bdzie na kocu skadu - OK:=(dir<>0); // and Mains; - d:=(1+Sign(dir)) div 2; //dir=-1=>d=0, dir=1=>d=1 - wysyanie tylko w ty - if OK then //musi by wybrana niezerowa kabina - with Couplers[d] do //wasny sprzg od strony (d) - if TestFlag(CouplingFlag,ctrain_controll) then - if ConnectedNr<>d then //jeli ten nastpny jest zgodny z aktualnym - begin - if Connected.SetInternalCommand(CtrlCommand,ctrlvalue,dir) then - OK:=Connected.RunInternalCommand and OK; //tu jest rekurencja - end - else //jeli nastpny jest ustawiony przeciwnie, zmieniamy kierunek - if Connected.SetInternalCommand(CtrlCommand,ctrlvalue,-dir) then - OK:=Connected.RunInternalCommand and OK; //tu jest rekurencja - SendCtrlToNext:=OK; -end; - -function T_MoverParameters.CabActivisation:boolean; -//zaczenie rozrzdu -var OK:boolean; -begin - OK:=(CabNo=0); //numer kabiny, z ktrej jest sterowanie - if (OK) then - begin - CabNo:=ActiveCab; //sterowanie jest z kabiny z obsad - DirAbsolute:=ActiveDir*CabNo; - SendCtrlToNext('CabActivisation',1,CabNo); - end; - CabActivisation:=OK; -end; - -function T_MoverParameters.CabDeactivisation:boolean; -//wyczenie rozrzdu -var OK:boolean; -begin - OK:=(CabNo=ActiveCab); //o ile obsada jest w kabinie ze sterowaniem - if (OK) then - begin - CabNo:=0; - DirAbsolute:=ActiveDir*CabNo; - DepartureSignal:=false; //nie bucze z nieaktywnej kabiny - SendCtrlToNext('CabActivisation',0,ActiveCab); //CabNo==0! - end; - CabDeactivisation:=OK; -end; - -{ -procedure MainCtrlBroadcast(Couplers:TCouplers; MainCtrlPos,MainCtrlActualPos:byte); -var b:byte; -begin - - for b:=0 to 1 do - with Couplers[b] do - if TestFlag(CouplingFlag,ctrain_controll) then - begin - Connected^.MainCtrlPos:=MainCtrlPos; - Connected^.MainCtrlActualPos:=MainCtrlActualPos; - end; -poprawic to!!! -end; - -procedure ScndCtrlBroadcast(Couplers:TCouplers; ScndCtrlPos,ScndCtrlActualPos:byte); -var b:byte; -begin - for b:=0 to 1 do - with Couplers[b] do - if TestFlag(CouplingFlag,ctrain_controll) then - begin - Connected^.ScndCtrlPos:=ScndCtrlPos; - Connected^.ScndCtrlActualPos:=ScndCtrlActualPos; - end; -end; -} - -{funkcje zwiekszajace/zmniejszajace nastawniki} - -function T_MoverParameters.IncMainCtrl(CtrlSpeed:integer): boolean; -var //b:byte; - OK:boolean; -begin - OK:=false; - if (MainCtrlPosNo>0) and (CabNo<>0) then - begin - if MainCtrlPosdt_ET22) or ((TrainType=dt_ET22) and (ScndCtrlPos=0)) then //w ET22 nie da si krci nastawnikiem przy wczonym boczniku - case EngineType of - None, Dumb, DieselElectric, ElectricInductionMotor: - if ((CtrlSpeed=1) and (TrainType<>dt_EZT)) or ((CtrlSpeed=1) and (TrainType=dt_EZT)and (activedir<>0)) then - begin //w EZT nie da si zaczy pozycji bez ustawienia kierunku - inc(MainCtrlPos); - OK:=true; - end - else - if ((CtrlSpeed>1) and (TrainType<>dt_EZT)) or ((CtrlSpeed>1) and (TrainType=dt_EZT)and (activedir<>0)) then - OK:=IncMainCtrl(1) and IncMainCtrl(CtrlSpeed-1); - ElectricSeriesMotor: - if (CtrlSpeed=1) and (ActiveDir<>0) then - begin - inc(MainCtrlPos); - OK:=true; - if Imax=ImaxHi then - if RList[MainCtrlPos].Bn>1 then - begin - if(TrainType=dt_ET42)then - begin - dec(MainCtrlPos); - OK:=false; - end; - if MaxCurrentSwitch(false) then - SetFlag(SoundFlag,sound_relay); {wylaczanie wysokiego rozruchu} - { if (EngineType=ElectricSeriesMotor) and (MainCtrlPos=1) then - MainCtrlActualPos:=1; - } - end; - if (CtrlSpeed=1) and (ActiveDir=-1) and (RList[MainCtrlPos].Bn>1) and (TrainType<>dt_pseudodiesel) then - begin //blokada wejcia na rwnoleg podczas jazdy do tyu - dec(MainCtrlPos); - OK:=false; - end; - {if (TrainType='et40') then - if Abs(Im)>IminHi then - begin - dec(MainCtrlPos); //Blokada nastawnika po przekroczeniu minimalnego pradu - OK:=false; - end; } - if(DynamicBrakeFlag)then - if(TrainType=dt_ET42)then - if MainCtrlPos>20 then - begin - dec(MainCtrlPos); - OK:=false; - end; - end - else - if (CtrlSpeed>1) and (ActiveDir<>0) {and (ScndCtrlPos=0)} and (TrainType<>dt_ET40) then - begin //szybkie przejcie na bezoporow - while (RList[MainCtrlPos].R>0) and IncMainCtrl(1) do ; - //OK:=true ; {takie chamskie, potem poprawie} <-Ra: kto mia to poprawi i po co? - if ActiveDir=-1 then - while (RList[MainCtrlPos].Bn>1) and IncMainCtrl(1) do - dec(MainCtrlPos); - OK:=false; - {if (TrainType=dt_ET40) then - while Abs (Im)>IminHi do - dec(MainCtrlPos); - OK:=false ; } - if(DynamicBrakeFlag)then - if(TrainType=dt_ET42)then - while(MainCtrlPos>20)do - dec(MainCtrlPos); - OK:=false; - end; - DieselEngine: - if CtrlSpeed=1 then - begin - inc(MainCtrlPos); - OK:=true; - if MainCtrlPos>0 then - CompressorAllow:=true - else - CompressorAllow:=false; - end - else - if CtrlSpeed>1 then - begin - while (MainCtrlPos=MainCtrlPosNo - if (CoupledCtrl) then //wsplny wa nastawnika jazdy i bocznikowania - begin - if (ScndCtrlPos false - begin - inc(ScndCtrlPos); - OK:=true; - end - else OK:=false; - end; - if OK then - begin - {OK:=}SendCtrlToNext('MainCtrl',MainCtrlPos,CabNo); {???} - {OK:=}SendCtrlToNext('ScndCtrl',ScndCtrlPos,CabNo); - end; - end - else {nie ma sterowania} - OK:=false; - //if OK then LastRelayTime:=0; - - //hunter-101012: poprawka - //poprzedni warunek byl niezbyt dobry, bo przez to przy trzymaniu + - //styczniki tkwily na tej samej pozycji (LastRelayTime byl caly czas 0 i rosl - //po puszczeniu plusa) - - if OK then - begin - if (DelayCtrlFlag) then - begin - if (LastRelayTime>=InitialCtrlDelay)and(MainCtrlPos=1) then - LastRelayTime:=0 - end - else if (LastRelayTime>CtrlDelay) then - LastRelayTime:=0; - end; - IncMainCtrl:=OK; -end; - - -function T_MoverParameters.DecMainCtrl(CtrlSpeed:integer): boolean; -var //b:byte; - OK:boolean; -begin - OK:=false; - if (MainCtrlPosNo>0) and (CabNo<>0) then - begin - if MainCtrlPos>0 then - begin - if ((TrainType<>dt_ET22) or (ScndCtrlPos=0)) then //Ra: ET22 blokuje nastawnik przy boczniku - begin - if CoupledCtrl and (ScndCtrlPos>0) then - begin - dec(ScndCtrlPos); {wspolny wal} - OK:=true; - end - else - case EngineType of - None, Dumb, DieselElectric, ElectricInductionMotor: - if ((CtrlSpeed=1) and {(ScndCtrlPos=0) and} (EngineType<>DieselElectric)) or ((CtrlSpeed=1)and(EngineType=DieselElectric))then - begin - dec(MainCtrlPos); - OK:=true; - end - else - if CtrlSpeed>1 then - OK:=DecMainCtrl(1) and DecMainCtrl(2); //CtrlSpeed-1); - ElectricSeriesMotor: - if (CtrlSpeed=1) {and (ScndCtrlPos=0)} then - begin - dec(MainCtrlPos); -// if (MainCtrlPos=0) and (ScndCtrlPos=0) and (TrainType<>dt_ET40)and(TrainType<>dt_EP05) then -// StLinFlag:=false; -// if (MainCtrlPos=0) and (TrainType<>dt_ET40) and (TrainType<>dt_EP05) then -// MainCtrlActualPos:=0; //yBARC: co to tutaj robi? ;) - OK:=true; - end - else - if (CtrlSpeed>1) {and (ScndCtrlPos=0)} then - begin - OK:=true; - if (RList[MainCtrlPos].R=0) - then DecMainCtrl(1); - while (RList[MainCtrlPos].R>0) and DecMainCtrl(1) do ; {takie chamskie, potem poprawie} - end; - DieselEngine: - if CtrlSpeed=1 then - begin - dec(MainCtrlPos); - OK:=true; - end - else - if CtrlSpeed>1 then - begin - while (MainCtrlPos>0) or (RList[MainCtrlPos].Mn>0) do - DecMainCtrl(1); - OK:=true; - end; - end; - end; - end - else - if EngineType=WheelsDriven then - OK:=AddPulseForce(-CtrlSpeed) - else - OK:=false; - if OK then - begin - {OK:=}SendCtrlToNext('MainCtrl',MainCtrlPos,CabNo); {hmmmm...???!!!} - {OK:=}SendCtrlToNext('ScndCtrl',ScndCtrlPos,CabNo); - end; - end - else - OK:=false; - //if OK then LastRelayTime:=0; - //hunter-101012: poprawka - if OK then - begin - if DelayCtrlFlag then - begin - if (LastRelayTime>=InitialCtrlDelay) then - LastRelayTime:=0; - end - else if (LastRelayTime>CtrlDownDelay) then - LastRelayTime:=0; - end; - DecMainCtrl:=OK; -end; - -function T_MoverParameters.IncScndCtrl(CtrlSpeed:integer): boolean; -var //b:byte; - OK:boolean; -begin - if (MainCtrlPos=0)and(CabNo<>0)and(TrainType=dt_ET42)and(ScndCtrlPos=0)and(DynamicBrakeFlag)then - begin - OK:=DynamicBrakeSwitch(false); - end - else - if (ScndCtrlPosNo>0) and (CabNo<>0) and not ((TrainType=dt_ET42)and((Imax=ImaxHi)or((DynamicBrakeFlag)and(MainCtrlPos>0)))) then - begin -{ if (RList[MainCtrlPos].R=0) and (MainCtrlPos>0) and (ScndCtrlPosDieselElectric) or (not AutoRelayFlag)) then - begin - if CtrlSpeed=1 then - begin - inc(ScndCtrlPos); - end - else - if CtrlSpeed>1 then - begin - ScndCtrlPos:=ScndCtrlPosNo; {takie chamskie, potem poprawie} - end; - OK:=true; - end - else {nie mozna zmienic} - OK:=false; - if OK then - begin - {OK:=}SendCtrlToNext('MainCtrl',MainCtrlPos,CabNo); {???} - {OK:=}SendCtrlToNext('ScndCtrl',ScndCtrlPos,CabNo); - end; - end - else {nie ma sterowania} - OK:=false; - //if OK then LastRelayTime:=0; - //hunter-101012: poprawka - if OK then - if (LastRelayTime>CtrlDelay) then - LastRelayTime:=0; - - if (OK) and (EngineType=ElectricInductionMotor) then - if (Vmax<250) then - ScndCtrlActualPos:=Round(Vel+0.5) - else - ScndCtrlActualPos:=Round(Vel/2+0.5); - - IncScndCtrl:=OK; -end; - -function T_MoverParameters.DecScndCtrl(CtrlSpeed:integer): boolean; -var //b:byte; - OK:boolean; -begin - if (MainCtrlPos=0)and(CabNo<>0)and(TrainType=dt_ET42)and(ScndCtrlPos=0)and not(DynamicBrakeFlag)and(CtrlSpeed=1)then - begin - //Ra: AI wywouje z CtrlSpeed=2 albo gdy ScndCtrlPos>0 - OK:=DynamicBrakeSwitch(true); - end - else - if (ScndCtrlPosNo>0) and (CabNo<>0) then - begin - if (ScndCtrlPos>0) and (not CoupledCtrl) and ((EngineType<>DieselElectric) or (not AutoRelayFlag))then - begin - if CtrlSpeed=1 then - begin - dec(ScndCtrlPos); - end - else - if CtrlSpeed>1 then - begin - ScndCtrlPos:=0; {takie chamskie, potem poprawie} - end; - OK:=true; - end - else - OK:=false; - if OK then - begin - {OK:=}SendCtrlToNext('MainCtrl',MainCtrlPos,CabNo); {???} - {OK:=}SendCtrlToNext('ScndCtrl',ScndCtrlPos,CabNo); - end; - end - else - OK:=false; - //if OK then LastRelayTime:=0; - //hunter-101012: poprawka - if OK then - if (LastRelayTime>CtrlDownDelay) then - LastRelayTime:=0; - - if (OK) and (EngineType=ElectricInductionMotor) then - ScndCtrlActualPos:=0; - - DecScndCtrl:=OK; -end; - - -function T_MoverParameters.DirectionBackward: boolean; -begin - if (ActiveDir=1) and (MainCtrlPos=0) and (TrainType=dt_EZT) then - if MinCurrentSwitch(false) then - begin - DirectionBackward:=true; // - Exit; - end; - if (MainCtrlPosNo>0) and (ActiveDir>-1) and (MainCtrlPos=0) then - begin - if EngineType=WheelsDriven then - dec(CabNo); -{ else} - dec(ActiveDir); - DirAbsolute:=ActiveDir*CabNo; - if (DirAbsolute<>0) then - if (Battery) then //jeli bateria jest ju zaczona - BatterySwitch(true); //to w ten oto durny sposb aktywuje si CA/SHP - DirectionBackward:=true; - SendCtrltoNext('Direction',ActiveDir,CabNo); - end - else - DirectionBackward:=false; -end; - -function T_MoverParameters.MainSwitch(State:boolean): boolean; -begin - MainSwitch:=false; //Ra: przeniesione z koca - if ((Mains<>State) and (MainCtrlPosNo>0)) then - begin - if (State=false) or ({(MainCtrlPos=0) and} (ScndCtrlPos=0) and ((ConvOvldFlag=false)or(TrainType=dt_EZT)) and (LastSwitchingTime>CtrlDelay) and not TestFlag(DamageFlag,dtrain_out) and not TestFlag(EngDmgFlag,1)) then - begin - if Mains then //jeli by zaczony - SendCtrlToNext('MainSwitch',ord(State),CabNo); //wysanie wyczenia do pozostaych? - Mains:=State; - if Mains then //jeli zosta zaczony - SendCtrlToNext('MainSwitch',ord(State),CabNo); //wyslanie po wlaczeniu albo przed wylaczeniem - MainSwitch:=true; //warto zwrotna - LastSwitchingTime:=0; - if (EngineType=DieselEngine) and Mains then - begin - dizel_enginestart:=State; - end; - if ((TrainType=dt_EZT)and(not State)) then - ConvOvldFlag:=true; - //if (State=false) then //jeli wyczony - // begin - //SetFlag(SoundFlag,sound_relay); //hunter-091012: przeniesione do Train.cpp, zeby sie nie zapetlal - // if (SecuritySystem.Status<>12) then - // SecuritySystem.Status:=0; //deaktywacja czuwaka; Ra: a nie bateri? - // end - //else - //if (SecuritySystem.Status<>12) then - // SecuritySystem.Status:=s_waiting; //aktywacja czuwaka - end - end - //else MainSwitch:=false; -end; - -function T_MoverParameters.BatterySwitch(State:boolean):boolean; -begin - //Ra: ukrotnienie zaczania baterii jest jak fikcj... - if (Battery<>State) then - begin - Battery:=State; - end; - if (Battery=true) then SendCtrlToNext('BatterySwitch',1,CabNo) - else SendCtrlToNext('BatterySwitch',0,CabNo); - BatterySwitch:=true; - if (Battery) and (ActiveCab<>0) {or (TrainType=dt_EZT)} then - SecuritySystem.Status:=SecuritySystem.Status or s_waiting //aktywacja czuwaka - else - SecuritySystem.Status:=0; //wyczenie czuwaka -end; - -function T_MoverParameters.EpFuseSwitch(State:boolean):boolean; -begin - if (EpFuse<>State) then - begin - EpFuse:=State; - EpFuseSwitch:=true; - end - else - EpFuseSwitch:=false; -// if (EpFuse=true) then SendCtrlToNext('EpFuseSwitch',1,CabNo) -// else SendCtrlToNext('EpFuseSwitch',0,CabNo); -end; - -{wl/wyl przetwornicy} -function T_MoverParameters.ConverterSwitch(State:boolean):boolean; -begin - ConverterSwitch:=false; //Ra: normalnie chyba false? - if (ConverterAllow<>State) then - begin - ConverterAllow:=State; - ConverterSwitch:=true; - if CompressorPower=2 then - CompressorAllow:=ConverterAllow; - end; - if (ConverterAllow=true) then SendCtrlToNext('ConverterSwitch',1,CabNo) - else SendCtrlToNext('ConverterSwitch',0,CabNo) -end; - -{wl/wyl sprezarki} -function T_MoverParameters.CompressorSwitch(State:boolean):boolean; -begin - CompressorSwitch:=false; //Ra: normalnie chyba tak? -// if State=true then -// if ((CompressorPower=2) and (not ConverterAllow)) then -// State:=false; //yB: to juz niepotrzebne - if (CompressorAllow<>State)and(CompressorPower<2)then - begin - CompressorAllow:=State; - CompressorSwitch:=true; - end; - if (CompressorAllow=true) then SendCtrlToNext('CompressorSwitch',1,CabNo) - else SendCtrlToNext('CompressorSwitch',0,CabNo) -end; - -{wl/wyl malej sprezarki} -{function T_MoverParameters.SmallCompressorSwitch(State:boolean):boolean; -begin - if State=true then - if ((SmallCompressorPower=1) then - State:=false; - if (SmallCompressorAllow<>State) then - begin - SmallCompressorAllow:=State; - SmallCompressorSwitch:=true; - end; -end; -} -{sypanie piasku} -function T_MoverParameters.SandDoseOn : boolean; -begin - if (SandCapacity>0) then - begin - SandDoseOn:=true; - if SandDose then - SandDose:=false - else - if Sand>0 then SandDose:=true; - if CabNo<>0 then - SendCtrlToNext('SandDoseOn',1,CabNo); - end - else - SandDoseOn:=false; -end; - -(* -//Ra: to jest do przejrzenia i uporzdkowania -function T_MoverParameters.SecuritySystemReset : boolean; -//zbijanie czuwaka/SHP - procedure Reset; - begin - with SecuritySystem do - if not(TestFlag(SystemType,2) and TestFlag(Status,s_active)) then - SecuritySystem.SystemTimer:=0; - SecuritySystem.SystemBrakeTimer:=0; - SecuritySystem.SystemSoundTimer:=0; - SecuritySystem.Status:=s_waiting; //aktywacja czuwaka - SecuritySystem.VelocityAllowed:=-1; - end; - procedure ResetSHP; - begin - SecuritySystem.SystemBrakeTimer:=0; - SecuritySystem.SystemSoundTimer:=0; - SecuritySystem.VelocityAllowed:=-1; - SecuritySystem.Status:=s_waiting; - end; -begin - with SecuritySystem do - begin - if (Status=3) or (Status=2) or (Status=11) or (Status=26)or(Status=27) then - begin - SecuritySystemReset:=true; - if (Status0)) or (Status=28) then {Wlaczone tylko SHP} - { begin - SecuritySystemReset:=true; - if (Status0) and (Status>0) and ((status<>12) or ((status=12) and (activedir<>0))) then - //if (SystemType>0) and (Status>0) then - begin - SecuritySystemReset:=true; - if not (ActiveDir=0) then - if not TestFlag(Status,s_CAebrake) or not TestFlag(Status,s_SHPebrake) then - Reset; - //else - // if EmergencyBrakeSwitch(false) then - // Reset; - end - else - SecuritySystemReset:=false; -// SendCtrlToNext('SecurityReset',0,CabNo); -end; - -{testowanie czuwaka/SHP} -procedure T_MoverParameters.SecuritySystemCheck(dt:real); -begin - with SecuritySystem do - begin - if (SystemType>0) and (Status>0) then - begin - SystemTimer:=SystemTimer+dt; - if TestFlag(Status,s_aware) or TestFlag(Status,s_active) then //jeli wieci albo miga - SystemSoundTimer:=SystemSoundTimer+dt; - if TestFlag(Status,s_alarm) then //jeli buczy - SystemBrakeTimer:=SystemBrakeTimer+dt; - if TestFlag(SystemType,1) then - if (SystemTimer>AwareDelay) and (AwareDelay>=0) then {-1 blokuje} - if not SetFlag(Status,s_aware) then {juz wlaczony sygnal swietlny} - if (SystemSoundTimer>SoundSignalDelay) and (SoundSignalDelay>=0) then - if not SetFlag(Status,s_alarm) then {juz wlaczony sygnal dzwiekowy} - if (SystemBrakeTimer>EmergencyBrakeDelay) and (EmergencyBrakeDelay>=0) then - SetFlag(Status,s_ebrake); {przeterminowanie czuwaka, hamowanie awaryjne} - if TestFlag(SystemType,2) and TestFlag(Status,s_active) then - if (Vel>VelocityAllowed) and (VelocityAllowed>=0) then - SetFlag(Status,s_ebrake) - else - if ((SystemSoundTimer>SoundSignalDelay) and (SoundSignalDelay>=0)) or ((Vel>NextVelocityAllowed) and (NextVelocityAllowed>=0)) then - if not SetFlag(Status,s_alarm) then {juz wlaczony sygnal dzwiekowy} - if (SystemBrakeTimer>EmergencyBrakeDelay) and (EmergencyBrakeDelay>=0) then - SetFlag(Status,s_ebrake); - if TestFlag(Status,s_ebrake) then - if not EmergencyBrakeFlag then - EmergencyBrakeSwitch(true); - end; - end; -end; -*) - -//hunter-091012: rozbicie alarmow, dodanie testu czuwaka -function T_MoverParameters.SecuritySystemReset : boolean; -//zbijanie czuwaka/SHP - procedure Reset; - begin - SecuritySystem.SystemTimer:=0; - - if TestFlag(SecuritySystem.Status,s_aware) then - begin - SecuritySystem.SystemBrakeCATimer:=0; - SecuritySystem.SystemSoundCATimer:=0; - SetFlag(SecuritySystem.Status,-s_aware); - SetFlag(SecuritySystem.Status,-s_CAalarm); - SetFlag(SecuritySystem.Status,-s_CAebrake); -// EmergencyBrakeFlag:=false; //YB-HN - SecuritySystem.VelocityAllowed:=-1; - end - else if TestFlag(SecuritySystem.Status,s_active) then - begin - SecuritySystem.SystemBrakeSHPTimer:=0; - SecuritySystem.SystemSoundSHPTimer:=0; - SetFlag(SecuritySystem.Status,-s_active); - SetFlag(SecuritySystem.Status,-s_SHPalarm); - SetFlag(SecuritySystem.Status,-s_SHPebrake); -// EmergencyBrakeFlag:=false; //YB-HN - SecuritySystem.VelocityAllowed:=-1; - end; - end; -begin - with SecuritySystem do - if (SystemType>0) and (Status>0) then - begin - SecuritySystemReset:=true; - if ((TrainType=dt_EZT)or(ActiveDir<>0)) then //Ra 2014-03: w EZT nie trzeba ustawia kierunku - if not TestFlag(Status,s_CAebrake) or not TestFlag(Status,s_SHPebrake) then - Reset; - //else - // if EmergencyBrakeSwitch(false) then - // Reset; - end - else - SecuritySystemReset:=false; -// SendCtrlToNext('SecurityReset',0,CabNo); -end; - -procedure T_MoverParameters.SecuritySystemCheck(dt:real); -begin -//Ra: z CA/SHP w EZT jest ten problem, e w rozrzdczym nie ma kierunku, a w silnikowym nie ma obsady -//poza tym jest zdefiniowany we wszystkich 3 czonach EN57 - with SecuritySystem do - begin - if (not Radio) then - EmergencyBrakeSwitch(false); - if (SystemType>0) and (Status>0) and (Battery) then //Ra: EZT ma teraz czuwak w rozrzdczym - begin - //CA - if (Vel>=AwareMinSpeed) then //domylnie predko wiksza od 10% Vmax, albo podanej jawnie w FIZ - begin - SystemTimer:=SystemTimer+dt; - if TestFlag(SystemType,1) and TestFlag(Status,s_aware) then //jeli wieci albo miga - SystemSoundCATimer:=SystemSoundCATimer+dt; - if TestFlag(SystemType,1) and TestFlag(Status,s_CAalarm) then //jeli buczy - SystemBrakeCATimer:=SystemBrakeCATimer+dt; - if TestFlag(SystemType,1) then - if (SystemTimer>AwareDelay) and (AwareDelay>=0) then {-1 blokuje} - if not SetFlag(Status,s_aware) then {juz wlaczony sygnal swietlny} - if (SystemSoundCATimer>SoundSignalDelay) and (SoundSignalDelay>=0) then - if not SetFlag(Status,s_CAalarm) then {juz wlaczony sygnal dzwiekowy} - if (SystemBrakeCATimer>EmergencyBrakeDelay) and (EmergencyBrakeDelay>=0) then - SetFlag(Status,s_CAebrake); - - - //SHP - if TestFlag(SystemType,2) and TestFlag(Status,s_active) then //jeli wieci albo miga - SystemSoundSHPTimer:=SystemSoundSHPTimer+dt; - if TestFlag(SystemType,2) and TestFlag(Status,s_SHPalarm) then //jeli buczy - SystemBrakeSHPTimer:=SystemBrakeSHPTimer+dt; - if TestFlag(SystemType,2) and TestFlag(Status,s_active) then - if (Vel>VelocityAllowed) and (VelocityAllowed>=0) then - SetFlag(Status,s_SHPebrake) - else - if ((SystemSoundSHPTimer>SoundSignalDelay) and (SoundSignalDelay>=0)) or ((Vel>NextVelocityAllowed) and (NextVelocityAllowed>=0)) then - if not SetFlag(Status,s_SHPalarm) then {juz wlaczony sygnal dzwiekowy} - if (SystemBrakeSHPTimer>EmergencyBrakeDelay) and (EmergencyBrakeDelay>=0) then - SetFlag(Status,s_SHPebrake); - - end; //else SystemTimer:=0; - - //TEST CA - if TestFlag(Status,s_CAtest) then //jeli wieci albo miga - SystemBrakeCATestTimer:=SystemBrakeCATestTimer+dt; - if TestFlag(SystemType,1) then - if TestFlag(Status,s_CAtest) then {juz wlaczony sygnal swietlny} - if (SystemBrakeCATestTimer>EmergencyBrakeDelay) and (EmergencyBrakeDelay>=0) then - s_CAtestebrake:=true; - - //wdrazanie hamowania naglego -// if TestFlag(Status,s_SHPebrake) or TestFlag(Status,s_CAebrake) or (s_CAtestebrake=true) then -// EmergencyBrakeFlag:=true; //YB-HN - end - else if not (Battery) then - begin //wyczenie baterii deaktywuje sprzt - EmergencyBrakeSwitch(false); - //SecuritySystem.Status:=0; //deaktywacja czuwaka - end; - end; -end; - -{nastawy hamulca} - -function T_MoverParameters.IncBrakeLevelOld:boolean; -//var b:byte; -begin - if (BrakeCtrlPosNo>0) {and (LocalBrakePos=0)} then - begin - if BrakeCtrlPos0); - SendCtrlToNext('BrakeCtrl',BrakeCtrlPos,CabNo); - end - else SendCtrlToNext('BrakeCtrl',-2,CabNo); -// else -// if not TestFlag(BrakeStatus,b_dmg) then -// BrakeStatus:=b_on;} - -//youBy: EP po nowemu - - IncBrakeLevelOld:=true; - if (BrakePressureActual.PipePressureVal<0)and(BrakePressureTable[BrakeCtrlPos-1].PipePressureVal>0) then - LimPipePress:=PipePress; - - if (BrakeSystem=ElectroPneumatic) then - if (BrakeSubSystem<>ss_K) then - begin - if (BrakeCtrlPos*BrakeCtrlPos)=1 then - begin -// SendCtrlToNext('Brake',BrakeCtrlPos,CabNo); -// SetFlag(BrakeStatus,b_epused); - end - else - begin -// SendCtrlToNext('Brake',0,CabNo); -// SetFlag(BrakeStatus,-b_epused); - end; - end; - - end - else - begin - IncBrakeLevelOld:=false; -{ if BrakeSystem=Pneumatic then - EmergencyBrakeSwitch(true); } - end; - end - else - IncBrakeLevelOld:=false; -end; - -function T_MoverParameters.DecBrakeLevelOld:boolean; -//var b:byte; -begin - if (BrakeCtrlPosNo>0) {and (LocalBrakePos=0)} then - begin - if (BrakeCtrlPos>-1-Byte(BrakeHandle=FV4a)) then - begin - dec(BrakeCtrlPos); -// BrakeCtrlPosR:=BrakeCtrlPos; -//// if EmergencyBrakeFlag then //yB: czy to jest potrzebne? -//// begin -//// EmergencyBrakeFlag:=false; {!!!} -//// SendCtrlToNext('Emergency_brake',0,CabNo); -//// end; - -//youBy: wywalilem to, jak jest EP, to sa przenoszone sygnaly nt. co ma robic, a nie poszczegolne pozycje; -// wystarczy spojrzec na Knorra i Oerlikona EP w EN57; mogly ze soba wspolapracowac -{ - if (BrakeSystem=ElectroPneumatic) then - if BrakePressureActual.BrakeType=ElectroPneumatic then - begin -// BrakeStatus:=ord(BrakeCtrlPos>0); - SendCtrlToNext('BrakeCtrl',BrakeCtrlPos,CabNo); - end - else SendCtrlToNext('BrakeCtrl',-2,CabNo); -// else} -// if (not TestFlag(BrakeStatus,b_dmg) and (not TestFlag(BrakeStatus,b_release))) then -// BrakeStatus:=b_off; {luzowanie jesli dziala oraz nie byl wlaczony odluzniacz} - -//youBy: EP po nowemu - DecBrakeLevelOld:=true; -// if (BrakePressureTable[BrakeCtrlPos].PipePressureVal<0.0)and(BrakePressureTable[BrakeCtrlPos+1].PipePressureVal>0) then -// LimPipePress:=PipePress; - - if (BrakeSystem=ElectroPneumatic) then - if (BrakeSubSystem<>ss_K) then - begin - if (BrakeCtrlPos*BrakeCtrlPos)=1 then - begin -// SendCtrlToNext('Brake',BrakeCtrlPos,CabNo); -// SetFlag(BrakeStatus,b_epused); - end - else - begin -// SendCtrlToNext('Brake',0,CabNo); -// SetFlag(BrakeStatus,-b_epused); - end; - end; -(* for b:=0 to 1 do {poprawic to!} - with Couplers[b] do - if CouplingFlag and ctrain_controll=ctrain_controll then - Connected^.BrakeCtrlPos:=BrakeCtrlPos; -*) - end - else - DecBrakeLevelOld:=false; - end - else - DecBrakeLevelOld:=false; -end; - -function T_MoverParameters.IncLocalBrakeLevelFAST:boolean; -begin - if (LocalBrakePos0) do - begin - inc(LocalBrakePos); - dec(CtrlSpeed); - end; - IncLocalBrakeLevel:=true; - end - else - IncLocalBrakeLevel:=false; -UnBrake:=true; -end; - -function T_MoverParameters.IncManualBrakeLevel(CtrlSpeed:byte):boolean; -begin - if (ManualBrakePos0) do - begin - inc(ManualBrakePos); - dec(CtrlSpeed); - end; - IncManualBrakeLevel:=true; - end - else - IncManualBrakeLevel:=false; -end; - -function T_MoverParameters.DecLocalBrakeLevelFAST():boolean; -begin - if LocalBrakePos>0 then - begin - LocalBrakePos:=0; - DecLocalBrakeLevelFAST:=true; - end - else - DecLocalBrakeLevelFAST:=false; -UnBrake:=true; -end; - -function T_MoverParameters.DecLocalBrakeLevel(CtrlSpeed:byte):boolean; -begin - if LocalBrakePos>0 then - begin - while (CtrlSpeed>0) and (LocalBrakePos>0) do - begin - dec(LocalBrakePos); - dec(CtrlSpeed); - end; - DecLocalBrakeLevel:=true; - end - else - DecLocalBrakeLevel:=false; -UnBrake:=true; -end; - -function T_MoverParameters.DecManualBrakeLevel(CtrlSpeed:byte):boolean; -begin - if ManualBrakePos>0 then - begin - while (CtrlSpeed>0) and (ManualBrakePos>0) do - begin - dec(ManualBrakePos); - dec(CtrlSpeed); - end; - DecManualBrakeLevel:=true; - end - else - DecManualBrakeLevel:=false; - -end; - -function T_MoverParameters.EmergencyBrakeSwitch(Switch:boolean): boolean; -begin - if (BrakeSystem<>Individual) and (BrakeCtrlPosNo>0) then - begin - if (not EmergencyBrakeFlag) and Switch then - begin - EmergencyBrakeFlag:=Switch; - EmergencyBrakeSwitch:=true; - end - else - begin - if (Abs(V)<0.1) and (Switch=false) then {odblokowanie hamulca bezpieczenistwa tylko po zatrzymaniu} - begin - EmergencyBrakeFlag:=Switch; - EmergencyBrakeSwitch:=true; - end - else - EmergencyBrakeSwitch:=false; - end; - end - else - EmergencyBrakeSwitch:=false; {nie ma hamulca bezpieczenstwa gdy nie ma hamulca zesp.} -end; - -function T_MoverParameters.AntiSlippingBrake: boolean; -begin - AntiSlippingBrake:=false; //Ra: przeniesione z koca - if ASBType=1 then - begin - AntiSlippingBrake:=true; //SPKS!! - Hamulec.ASB(1); - BrakeSlippingTimer:=0; - end -end; - -function T_MoverParameters.AntiSlippingButton: boolean; -var OK:boolean; -begin - OK:=SandDoseOn; - AntiSlippingButton:=(AntiSlippingBrake or OK); -end; - -function T_MoverParameters.BrakeDelaySwitch(BDS:byte): boolean; -begin -// if BrakeCtrlPosNo>0 then - if BrakeHandle=MHZ_EN57 then - begin - if (BDS<>BrakeOpModeFlag) and ((BDS and BrakeOpModes) > 0) then - begin - BrakeOpModeFlag:=BDS; - BrakeDelaySwitch:=true; - end - else - BrakeDelaySwitch:=false; - end - else if Hamulec.SetBDF(BDS) then - begin - BrakeDelayFlag:=BDS; - BrakeDelaySwitch:=true; - BrakeStatus:=(BrakeStatus and 191); - //kopowanie nastawy hamulca do kolejnego czlonu - do przemylenia - if CabNo<>0 then - SendCtrlToNext('BrakeDelay',BrakeDelayFlag,CabNo); - end - else - BrakeDelaySwitch:=false; -end; - -function T_MoverParameters.IncBrakeMult(): boolean; -begin - if (LoadFlag>0) and (MBPM<2) and (LoadFlag<3) then - begin - if (MaxBrakePress[2]>0) and (LoadFlag=1) then - LoadFlag:=2 - else - LoadFlag:=3; - IncBrakeMult:=true; - if BrakeCylMult[2]>0 then BrakeCylMult[0]:=BrakeCylMult[2]; - end - else - IncBrakeMult:=false; -end; - -function T_MoverParameters.DecBrakeMult(): boolean; -begin - if (LoadFlag>1) and (MBPM<2) then - begin - if (MaxBrakePress[2]>0) and (LoadFlag=3) then - LoadFlag:=2 - else - LoadFlag:=1; - DecBrakeMult:=true; - if BrakeCylMult[1]>0 then BrakeCylMult[0]:=BrakeCylMult[1]; - end - else - DecBrakeMult:=false; -end; - -function T_MoverParameters.BrakeReleaser(state: byte): boolean; -var OK:boolean; -begin - Hamulec.Releaser(state); - if CabNo<>0 then //rekurencyjne wysanie do nastpnego - OK:=SendCtrlToNext('BrakeReleaser',state,CabNo); - BrakeReleaser:=OK; -end; - -function T_MoverParameters.SwitchEPBrake(state: byte):boolean; -var - OK:boolean; - temp: real; -begin - OK:=false; - if (BrakeHandle = St113) and (ActiveCab<>0) then - begin - if(state>0)then - temp:=(Handle as TSt113).GetCP - else - temp:=0; - Hamulec.SetEPS(temp); - SendCtrlToNext('Brake',temp,CabNo); - end; -// OK:=SetFlag(BrakeStatus,((2*State-1)*b_epused)); -// SendCtrlToNext('Brake',(state*(2*BrakeCtrlPos-1)),CabNo); - SwitchEPBrake:=OK; -end; - -{uklady pneumatyczne} - -function T_MoverParameters.IncBrakePress(var brake:real;PressLimit,dp:real):boolean; -begin -// if (DynamicBrakeType<>dbrake_switch) and (DynamicBrakeType<>dbrake_none) and ((BrakePress>2.0) or (PipePress<3.7{(LowPipePress+0.5)})) then - if (DynamicBrakeType<>dbrake_switch) and (DynamicBrakeType<>dbrake_none) and (BrakePress>2.0) and (TrainType<>dt_EZT) then //yB radzi nie sprawdza cinienia w przewodzie - //hunter-301211: dla EN57 silnikow nie odlaczamy - begin - DynamicBrakeFlag:=true; {uruchamianie hamulca ED albo odlaczanie silnikow} - if (DynamicBrakeType=dbrake_automatic) and (abs(Im)>60) then {nie napelniaj wiecej, jak na EP09} - dp:=0.0; - end; - if brake+dpPressLimit then - begin - brake:=brake-dp; - DecBrakePress:=true; - end - else - begin - DecBrakePress:=false; - brake:=PressLimit; - end; -// if (DynamicBrakeType<>dbrake_switch) and ((BrakePress<0.1) and (PipePress>0.45{(LowPipePress+0.06)})) then - if (DynamicBrakeType<>dbrake_switch) and (BrakePress<0.1) then //yB radzi nie sprawdza cinienia w przewodzie - DynamicBrakeFlag:=false; {wylaczanie hamulca ED i/albo zalaczanie silnikow} -end; - -procedure T_MoverParameters.UpdateBrakePressure(dt:real); -const LBDelay=5.0; {stala czasowa hamulca} -var Rate,Speed,dp,sm:real; -begin - dpLocalValve:=0; - dpBrake:=0; - - BrakePress:=Hamulec.GetBCP; -// BrakePress:=(Hamulec as TEst4).ImplsRes.pa; - Volume:=Hamulec.GetBRP; - -end; {updatebrakepressure} - - -function T_MoverParameters.GetDVc(dt:real):real; -var c:T_MoverParameters;dv1,dv2,dv:real; -begin - dv1:=0; - dv2:=0; -//sprzeg 1 - if Couplers[0].Connected<>nil then - if TestFlag(Couplers[0].CouplingFlag,ctrain_pneumatic) then - begin //*0.85 - c:=Couplers[0].Connected; //skrot //0.08 //e/D * L/D = e/D^2 * L - dv1:=0.5*dt*PF(PipePress,c.PipePress,(Spg)/(1+0.015/Spg*Dim.L)); - if (dv1*dv1>0.00000000000001) then c.Physic_Reactivation; - c.Pipe.Flow(-dv1); - end; -//sprzeg 2 - if Couplers[1].Connected<>nil then - if TestFlag(Couplers[1].CouplingFlag,ctrain_pneumatic) then - begin - c:=Couplers[1].Connected; //skrot - dv2:=0.5*dt*PF(PipePress,c.PipePress,(Spg)/(1+0.015/Spg*Dim.L)); - if (dv2*dv2>0.00000000000001) then c.Physic_Reactivation; - c.Pipe.Flow(-dv2); - end; - if (Couplers[1].Connected<>nil)and(Couplers[0].Connected<>nil) then - if (TestFlag(Couplers[0].CouplingFlag,ctrain_pneumatic))and(TestFlag(Couplers[1].CouplingFlag,ctrain_pneumatic))then - begin - dv:=0.05*dt*PF(Couplers[0].Connected.PipePress,Couplers[1].Connected.PipePress,(Spg*0.85)/(1+0.03*Dim.L))*0; - Couplers[0].Connected.Pipe.Flow(+dv); - Couplers[1].Connected.Pipe.Flow(-dv); - end; -//suma - GetDVc:=dv2+dv1; -end; - -procedure T_MoverParameters.UpdatePipePressure(dt:real); -const LBDelay=100;kL=0.5; -var {b: byte;} dV{,PWSpeed}{,PPP}:real; c: T_MoverParameters; - temp: real; - b: byte; -begin - - PipePress:=Pipe.P; -// PPP:=PipePress; - - dpMainValve:=0; - -if (BrakeCtrlPosNo>1) {and(ActiveCab<>0)}then -with BrakePressureTable[BrakeCtrlPos] do - begin - if(EngineType<>ElectricInductionMotor)then - dpLocalValve:=LocHandle.GetPF(Max0R(LocalBrakePos/LocalBrakePosNo,LocalBrakePosA), Hamulec.GetBCP, ScndPipePress, dt, 0) - else - dpLocalValve:=LocHandle.GetPF(LocalBrakePosA, Hamulec.GetBCP, ScndPipePress, dt, 0); - if(BrakeHandle=FV4a)and((PipePress<2.75)and((Hamulec.GetStatus and b_rls)=0))and(BrakeSubsystem=ss_LSt)and(TrainType<>dt_EZT)then - temp:=PipePress+0.00001 - else - temp:=ScndPipePress; - Handle.SetReductor(BrakeCtrlPos2); - - if (BrakeOpModeFlag<>bom_PS) then - if (BrakeOpModeFlagMHZ_EN57) then - dpMainValve:=Handle.GetPF(BrakeCtrlPosR, PipePress, temp, dt, EqvtPipePress) - else - dpMainValve:=Handle.GetPF(0, PipePress, temp, dt, EqvtPipePress); - - if (dpMainValve<0){and(PipePressureVal>0.01)} then {50} - if Compressor>ScndPipePress then - begin - CompressedVolume:=CompressedVolume+dpMainValve/1500; - Pipe2.Flow(dpMainValve/3); - end - else - Pipe2.Flow(dpMainValve); -end; - -// if(EmergencyBrakeFlag)and(BrakeCtrlPosNo=0)then {ulepszony hamulec bezp.} - if(EmergencyBrakeFlag)or TestFlag(SecuritySystem.Status,s_SHPebrake) or TestFlag(SecuritySystem.Status,s_CAebrake) or (s_CAtestebrake=true) or (TestFlag(EngDmgFlag,32)){ or (not Battery)}then {ulepszony hamulec bezp.} - dpMainValve:=dpMainValve/1+PF(0,PipePress,0.15)*dt; - //0.2*Spg - Pipe.Flow(-dpMainValve); - Pipe.Flow(-(PipePress)*0.001*dt); -// if Heating then -// Pipe.Flow(PF(PipePress,0,d2A(7))*dt); -// if ConverterFlag then -// Pipe.Flow(PF(PipePress,0,d2A(12))*dt); - dpMainValve:=dpMainValve/(Dim.L*Spg*20); - - CntrlPipePress:=Hamulec.GetVRP; //cinienie komory wstpnej rozdzielacza - - case BrakeValve of - W: - begin - if (BrakeLocHandle<>NoHandle) then - begin - LocBrakePress:=LocHandle.GetCP; - (Hamulec as TWest).SetLBP(LocBrakePress); - end; - if MBPM<2 then - (Hamulec as TWest).PLC(MaxBrakePress[LoadFlag]) - else - (Hamulec as TWest).PLC(TotalMass); - end; - LSt,EStED: - begin - LocBrakePress:=LocHandle.GetCP; - for b:=0 to 1 do - if((TrainType and (dt_ET41 or dt_ET42))>0)and(Couplers[b].Connected<>nil)then //nie podoba mi si to rozwizanie, chyba trzeba doda jaki wpis do fizyki na to - if((Couplers[b].Connected.TrainType and (dt_ET41 or dt_ET42))>0)and((Couplers[b].CouplingFlag and 36) = 36)then - LocBrakePress:=Max0R(Couplers[b].Connected.LocHandle.GetCP,LocBrakePress); - - if(DynamicBrakeFlag)and(EngineType=ElectricInductionMotor)then - begin - (Hamulec as TLSt).SetLBP(LocBrakePress); -// if(Vel>10)then LocBrakePress:=0 else -// if(Vel>5)then LocBrakePress:=(10-Vel)/5*LocBrakePress - end - else - (Hamulec as TLSt).SetLBP(LocBrakePress); - if (BrakeValve = EStED) then - if MBPM<2 then - (Hamulec as TEStED).PLC(MaxBrakePress[LoadFlag]) - else - (Hamulec as TEStED).PLC(TotalMass); - - end; - CV1_L_TR: - begin - LocBrakePress:=LocHandle.GetCP; - (Hamulec as TCV1L_TR).SetLBP(LocBrakePress); - end; - EP2: (Hamulec as TEStEP2).PLC(TotalMass); - ESt3AL2,NESt3,ESt4,ESt3: - begin - if MBPM<2 then - (Hamulec as TNESt3).PLC(MaxBrakePress[LoadFlag]) - else - (Hamulec as TNESt3).PLC(TotalMass); - LocBrakePress:=LocHandle.GetCP; - (Hamulec as TNESt3).SetLBP(LocBrakePress); - end; - KE: - begin - LocBrakePress:=LocHandle.GetCP; - (Hamulec as TKE).SetLBP(LocBrakePress); - if MBPM<2 then - (Hamulec as TKE).PLC(MaxBrakePress[LoadFlag]) - else - (Hamulec as TKE).PLC(TotalMass); - end; - end; - - if (BrakeHandle = FVel6) and (ActiveCab<>0) then - begin - if (Battery) and (ActiveDir<>0) and (EpFuse) then //tu powinien byc jeszcze bezpiecznik EP i baterie - - temp:=(Handle as TFVel6).GetCP - else - temp:=0; - Hamulec.SetEPS(temp); - SendCtrlToNext('Brake',temp,CabNo); //Ra 2014-11: na tym si wysypuje, ale nie wiem, w jakich warunkach - end; - - Pipe.Act; - PipePress:=Pipe.P; - if (BrakeStatus and 128)=128 then //jesli hamulec wyczony - temp:=0 //odetnij - else - temp:=1; //pocz - Pipe.Flow(temp*Hamulec.GetPF(temp*PipePress,dt,Vel)+GetDVc(dt)); - - if ASBType=128 then - Hamulec.ASB(Byte(SlippingWheels)); - - dpPipe:=0; - -//yB: jednokrokowe liczenie tego wszystkiego - Pipe.Act; - PipePress:=Pipe.P; - - dpMainValve:=dpMainValve/(100*dt); //normalizacja po czasie do syczenia; - - - if PipePress<-1 then - begin - PipePress:=-1; - Pipe.CreatePress(-1); - Pipe.Act; - end; - - if CompressedVolume<0 then - CompressedVolume:=0; -end; {updatepipepressure} - - -procedure T_MoverParameters.CompressorCheck(dt:real); -begin - //if (CompressorSpeed>0.0) then //ten warunek zosta sprawdzony przy wywoaniu funkcji - if (VeselVolume>0) then - begin - if MaxCompressor-MinCompressor<0.0001 then - begin -{ if Mains and (MainCtrlPos>1) then} - if CompressorAllow and Mains and (MainCtrlPos>0) then - begin - if (Compressor0) then - CompressedVolume:=CompressedVolume+dt*CompressorSpeed*(2*MaxCompressor-Compressor)/MaxCompressor*(DEList[MainCtrlPos].rpm/DEList[MainCtrlPosNo].rpm) - else - begin - CompressedVolume:=CompressedVolume+dt*CompressorSpeed*(2*MaxCompressor-Compressor)/MaxCompressor; - TotalCurrent:=TotalCurrent+0.0015*Voltage; //tymczasowo tylko obcienie sprarki, tak z 5A na sprark - end - else - begin - CompressedVolume:=CompressedVolume*0.8; - SetFlag(SoundFlag,sound_relay); - SetFlag(SoundFlag,sound_loud); - end; - end; - end - else - begin - if (CompressorFlag) then //jeli sprarka zaczona - begin //sprawdzi moliwe warunki wyczenia sprarki - if (CompressorPower=5) then //jeli zasilanie z ssiedniego czonu - begin //zasilanie sprarki w czonie ra z czonu silnikowego (sprzg 1) - if (Couplers[1].Connected<>NIL) then - CompressorFlag:=Couplers[1].Connected.CompressorAllow and Couplers[1].Connected.ConverterFlag and Couplers[1].Connected.Mains - else - CompressorFlag:=false; //bez tamtego czonu nie zadziaa - end - else if (CompressorPower=4) then //jeli zasilanie z poprzedniego czonu - begin //zasilanie sprarki w czonie ra z czonu silnikowego (sprzg 1) - if (Couplers[0].Connected<>NIL) then - CompressorFlag:=Couplers[0].Connected.CompressorAllow and Couplers[0].Connected.ConverterFlag and Couplers[0].Connected.Mains - else - CompressorFlag:=false; //bez tamtego czonu nie zadziaa - end - else - CompressorFlag:=(CompressorAllow) and ((ConverterFlag) or (CompressorPower=0)) and (Mains); - if (Compressor>MaxCompressor) then //wycznik cinieniowy jest niezaleny od sposobu zasilania - CompressorFlag:=false; - end - else //jeli nie zaczona - if (CompressorCtrlDelay) then //jeli nie zaczona, a cinienie za mae - begin //zaczenie przy maym cinieniu - if (CompressorPower=5) then //jeli zasilanie z nastpnego czonu - begin //zasilanie sprarki w czonie ra z czonu silnikowego (sprzg 1) - if (Couplers[1].Connected<>NIL) then - CompressorFlag:=Couplers[1].Connected.CompressorAllow and Couplers[1].Connected.ConverterFlag and Couplers[1].Connected.Mains - else - CompressorFlag:=false; //bez tamtego czonu nie zadziaa - end - else if (CompressorPower=4) then //jeli zasilanie z poprzedniego czonu - begin //zasilanie sprarki w czonie ra z czonu silnikowego (sprzg 1) - if (Couplers[0].Connected<>NIL) then - CompressorFlag:=Couplers[0].Connected.CompressorAllow and Couplers[0].Connected.ConverterFlag and Couplers[0].Connected.Mains - else - CompressorFlag:=false; //bez tamtego czonu nie zadziaa - end - else - CompressorFlag:=(CompressorAllow) and ((ConverterFlag) or (CompressorPower=0)) and (Mains); - if (CompressorFlag) then //jeli zostaa zaczona - LastSwitchingTime:=0; //to trzeba ograniczy ponowne wczenie - end; -// for b:=0 to 1 do //z Megapacka -// with Couplers[b] do -// if TestFlag(CouplingFlag,ctrain_scndpneumatic) then -// Connected.CompressorFlag:=CompressorFlag; - if CompressorFlag then - if (EngineType=DieselElectric) and (CompressorPower>0) then - CompressedVolume:=CompressedVolume+dt*CompressorSpeed*(2*MaxCompressor-Compressor)/MaxCompressor*(DEList[MainCtrlPos].rpm/DEList[MainCtrlPosNo].rpm) - else - begin - CompressedVolume:=CompressedVolume+dt*CompressorSpeed*(2*MaxCompressor-Compressor)/MaxCompressor; - if (CompressorPower=5)and(Couplers[1].Connected<>NIL) then - Couplers[1].Connected.TotalCurrent:=Couplers[1].Connected.TotalCurrent+0.0015*Couplers[1].Connected.Voltage //tymczasowo tylko obcienie sprarki, tak z 5A na sprark - else if (CompressorPower=4)and(Couplers[0].Connected<>NIL) then - Couplers[0].Connected.TotalCurrent:=Couplers[0].Connected.TotalCurrent+0.0015*Couplers[0].Connected.Voltage //tymczasowo tylko obcienie sprarki, tak z 5A na sprark - else - TotalCurrent:=TotalCurrent+0.0015*Voltage; //tymczasowo tylko obcienie sprarki, tak z 5A na sprark - end - end; - end; -end; -{Ra 2014-07: do C++ -procedure T_MoverParameters.ConverterCheck; -begin //sprawdzanie przetwornicy -if (ConverterAllow=true)and(Mains=true) then - ConverterFlag:=true - else - ConverterFlag:=false; -end; -} -//youBy - przewod zasilajacy -procedure T_MoverParameters.UpdateScndPipePressure(dt: real); -const Spz=0.5067; -var c:T_MoverParameters;dv1,dv2,dv:real; -begin - dv1:=0; - dv2:=0; - -//sprzeg 1 - if Couplers[0].Connected<>nil then - if TestFlag(Couplers[0].CouplingFlag,ctrain_scndpneumatic) then - begin - c:=Couplers[0].Connected; //skrot - dv1:=0.5*dt*PF(ScndPipePress,c.ScndPipePress,Spz*0.75); - if (dv1*dv1>0.00000000000001) then c.Physic_Reactivation; - c.Pipe2.Flow(-dv1); - end; -//sprzeg 2 - if Couplers[1].Connected<>nil then - if TestFlag(Couplers[1].CouplingFlag,ctrain_scndpneumatic) then - begin - c:=Couplers[1].Connected; //skrot - dv2:=0.5*dt*PF(ScndPipePress,c.ScndPipePress,Spz*0.75); - if (dv2*dv2>0.00000000000001) then c.Physic_Reactivation; - c.Pipe2.Flow(-dv2); - end; - if(Couplers[1].Connected<>nil)and(Couplers[0].Connected<>nil)then - if (TestFlag(Couplers[0].CouplingFlag,ctrain_scndpneumatic))and(TestFlag(Couplers[1].CouplingFlag,ctrain_scndpneumatic))then - begin - dv:=0.00025*dt*PF(Couplers[0].Connected.ScndPipePress,Couplers[1].Connected.ScndPipePress,Spz*0.25); - Couplers[0].Connected.Pipe2.Flow(+dv); - Couplers[1].Connected.Pipe2.Flow(-dv); - end; - - Pipe2.Flow(Hamulec.GetHPFlow(ScndPipePress, dt)); - - if ((Compressor>ScndPipePress) and (CompressorSpeed>0.0001)) or (TrainType=dt_EZT) then - begin - dV:=PF(Compressor,ScndPipePress,Spz)*dt; - CompressedVolume:=CompressedVolume+dV/1000; - Pipe2.Flow(-dV); - end; - - Pipe2.Flow(dv1+dv2); - Pipe2.Act; - ScndPipePress:=Pipe2.P; - - if ScndPipePress<-1 then - begin - ScndPipePress:=-1; - Pipe2.CreatePress(-1); - Pipe2.Act; - end; - - -end; - - -{lokomotywy} - -function T_MoverParameters.ComputeRotatingWheel(WForce,dt,n:real): real; -var newn,eps:real; -begin - if (n=0) and (WForce*Sign(V)<0) then - newn:=0 - else - begin - eps:=WForce*WheelDiameter/(2.0*AxleInertialMoment); - newn:=n+eps*dt; - if (newn*n<=0) and (eps*n<0) then - newn:=0; - end; - ComputeRotatingWheel:=newn; -end; - -{----------------------} -{LOKOMOTYWA ELEKTRYCZNA} - -function T_MoverParameters.FuseFlagCheck: boolean; -var b:byte; -begin - FuseFlagCheck:=false; - if Power>0.01 then FuseFlagCheck:=FuseFlag - else {pobor pradu jezeli niema mocy} - for b:=0 to 1 do - with Couplers[b] do - if TestFlag(CouplingFlag,ctrain_controll) then - if Connected.Power>0.01 then - FuseFlagCheck:=Connected.FuseFlagCheck(); -end; - -function T_MoverParameters.FuseOn: boolean; -begin - FuseOn:=false; - if (MainCtrlPos=0) and (ScndCtrlPos=0) and (TrainType<>dt_ET40) and ((Mains) or (TrainType<>dt_EZT)) and (not TestFlag(EngDmgFlag,1)) then - begin //w ET40 jest blokada nastawnika, ale czy dziaa dobrze? - SendCtrlToNext('FuseSwitch',1,CabNo); - if ((EngineType=ElectricSeriesMotor)or((EngineType=DieselElectric))) and FuseFlag then - begin - FuseFlag:=false; {wlaczenie ponowne obwodu} - FuseOn:=true; - SetFlag(SoundFlag,sound_relay); SetFlag(SoundFlag,sound_loud); - end; - end; -end; - -procedure T_MoverParameters.FuseOff; -begin - if not FuseFlag then - begin - FuseFlag:=true; - EventFlag:=true; - SetFlag(SoundFlag,sound_relay); - SetFlag(SoundFlag,sound_loud); - end; -end; - - -function T_MoverParameters.ShowCurrent(AmpN:byte): integer; -var b,Bn:byte; - Grupowy: boolean; -begin - ClearPendingExceptions; - ShowCurrent:=0; - Grupowy:=(DelayCtrlFlag) and (TrainType=dt_et22); //przerzucanie walu grupowego w ET22; - Bn:=RList[MainCtrlActualPos].Bn; //ile rwnolegych gazi silnikw - - if (DynamicBrakeType=dbrake_automatic) and (DynamicBrakeFlag) then - Bn:=2; - if Power>0.01 then - begin - if AmpN>0 then //poda prd w gazi - begin - if (Bn0.01 then - ShowCurrent:=Connected.ShowCurrent(AmpN); -end; - -{Ra 2014-06: przeniesione do C++ -function T_MoverParameters.ShowEngineRotation(VehN:byte): integer; -var b:Byte; //,Bn:byte; -begin - ClearPendingExceptions; - ShowEngineRotation:=0; - case VehN of - 1: ShowEngineRotation:=Trunc(Abs(enrot)); - 2: for b:=0 to 1 do - with Couplers[b] do - if TestFlag(CouplingFlag,ctrain_controll) then - if Connected.Power>0.01 then - ShowEngineRotation:=Trunc(Abs(Connected.enrot)); - 3: if Couplers[1].Connected<>nil then - if TestFlag(Couplers[1].CouplingFlag,ctrain_controll) then - if Couplers[1].Connected.Couplers[1].Connected<>nil then - if TestFlag(Couplers[1].Connected.Couplers[1].CouplingFlag,ctrain_controll) then - if Couplers[1].Connected.Couplers[1].Connected.Power>0.01 then - ShowEngineRotation:=Trunc(Abs(Couplers[1].Connected.Couplers[1].Connected.enrot)); - end; -end; -} - -{funkcje uzalezniajace sile pociagowa od predkosci: V2n, n2R, Current, Momentum} -{----------------} - -function T_MoverParameters.V2n:real; -{przelicza predkosc liniowa na obrotowa} -const dmgn=0.5; -var n,deltan:real; -begin - n:=V/(Pi*WheelDiameter); //predkosc obrotowa wynikajaca z liniowej [obr/s] - deltan:=n-nrot; //"pochodna" prdkoci obrotowej - if SlippingWheels then - if Abs(deltan)<0.01 then - SlippingWheels:=false; {wygaszenie poslizgu} - if SlippingWheels then {nie ma zwiazku z predkoscia liniowa V} - begin {McZapkie-221103: uszkodzenia kol podczas poslizgu} - if deltan>dmgn then - if FuzzyLogic(deltan,dmgn,p_slippdmg) then - if SetFlag(DamageFlag,dtrain_wheelwear) {podkucie} - then EventFlag:=true; - if deltan<-dmgn then - if FuzzyLogic(-deltan,dmgn,p_slippdmg) then - if SetFlag(DamageFlag,dtrain_thinwheel) {wycieranie sie obreczy} - then EventFlag:=true; - n:=nrot; {predkosc obrotowa nie zalezy od predkosci liniowej} - end; - V2n:=n; -end; - -function T_MoverParameters.Current(n,U:real): real; -{wazna funkcja - liczy prad plynacy przez silniki polaczone szeregowo lub rownolegle} -{w zaleznosci od polozenia nastawnikow MainCtrl i ScndCtrl oraz predkosci obrotowej n} -{a takze wywala bezpiecznik nadmiarowy gdy za duzy prad lub za male napiecie} -{jest takze mozliwosc uszkodzenia silnika wskutek nietypowych parametrow} -const ep09resED=5.8; {TODO: dobrac tak aby sie zgadzalo ze wbudzeniem} -var //Rw, - R,MotorCurrent:real; - Rz,Delta,Isf:real; - Mn: integer; - Bn: real; - SP: byte; - U1: real; //napiecie z korekta -begin - MotorCurrent:=0; -//i dzialanie hamulca ED w EP09 - if (DynamicBrakeType=dbrake_automatic) then - begin - if (((Hamulec as TLSt).GetEDBCP<0.25)and(Vadd<1))or(BrakePress>2.1) then - DynamicBrakeFlag:=false - else if (BrakePress>0.25) and ((Hamulec as TLSt).GetEDBCP>0.25) then - DynamicBrakeFlag:=true; - DynamicBrakeFlag:=DynamicBrakeFlag and ConverterFlag; - end; -//wylacznik cisnieniowy yBARC - to jest chyba niepotrzebne tutaj -// if BrakePress>2 then -// begin -// StLinFlag:=true; -// DelayCtrlFlag:=(TrainType<>dt_EZT); //EN57 nie ma czekania na 1. pozycji -// DynamicBrakeFlag:=false; -// end; - if(BrakeSubSystem=ss_LSt)then - if(DynamicBrakeFlag)then - (Hamulec as TLSt).SetED(Abs(Im/350)) //hamulec ED na EP09 dziala az do zatrzymania lokomotywy - else - (Hamulec as TLSt).SetED(0); - - ResistorsFlag:=(RList[MainCtrlActualPos].R>0.01){ and (not DelayCtrlFlag)}; - ResistorsFlag:=ResistorsFlag or ((DynamicBrakeFlag=true) and (DynamicBrakeType=dbrake_automatic)); - - if(TrainType=dt_ET22)and(DelayCtrlFlag)and(MainCtrlActualPos>1)then - Bn:=1-1/RList[MainCtrlActualPos].Bn - else - Bn:=1; - R:=RList[MainCtrlActualPos].R*Bn+CircuitRes; - - if (TrainType<>dt_EZT)or(Imin<>IminLo)or(not ScndS) then //yBARC - boczniki na szeregu poprawnie - Mn:=RList[MainCtrlActualPos].Mn - else - Mn:=RList[MainCtrlActualPos].Mn*RList[MainCtrlActualPos].Bn; -//z Megapacka -// if DynamicBrakeFlag and (TrainType=dt_ET42) then { KURS90 azeby mozna bylo hamowac przy opuszczonych pantografach } -// SP:=ScndCtrlActualPos; -// if(ScndInMain)then -// if not (RList[MainCtrlActualPos].ScndAct=255) then -// SP:=RList[MainCtrlActualPos].ScndAct; -// with MotorParam[SP] do -// begin -// Rz:=WindingRes+R; -// MotorCurrent:=-fi*n/Rz; -// end; - if DynamicBrakeFlag and (not FuseFlag) and (DynamicBrakeType=dbrake_automatic) and ConverterFlag and Mains then {hamowanie EP09} - with MotorParam[0] do //TUHEX - begin - MotorCurrent:=-Max0R(fi*(Vadd/(Vadd+Isat)-fi0),0)*n*2/ep09resED; {TODO: zrobic bardziej uniwersalne nie tylko dla EP09} -// if abs(MotorCurrent)>500 then -// MotorCurrent:=sign(MotorCurrent)*500 {TODO: zrobic bardziej finezyjnie} - end - else - if (RList[MainCtrlActualPos].Bn=0) {or FuseFlag} or (not StLinFlag) {or DelayCtrlFlag} then - //if (RList[MainCtrlActualPos].Bn=0) or FuseFlag or StLinFlag or DelayCtrlFlag or ((TrainType=dt_ET42)and(not(ConverterFlag)and not(DynamicBrakeFlag))) then //z Megapacka - MotorCurrent:=0 {wylaczone} - else {wlaczone} - begin - SP:=ScndCtrlActualPos; - if(ScndCtrlActualPos<255)then {tak smiesznie bede wylaczal } - begin - if(ScndInMain)then - if not (RList[MainCtrlActualPos].ScndAct=255) then - SP:=RList[MainCtrlActualPos].ScndAct; - with MotorParam[SP] do - begin - Rz:=Mn*WindingRes+R; - if DynamicBrakeFlag then {hamowanie} - begin - if DynamicBrakeType>1 then - begin - //if DynamicBrakeType<>dbrake_automatic then - // MotorCurrent:=-fi*n/Rz {hamowanie silnikiem na oporach rozruchowych} -(* begin - U:=0; - Isf:=Isat; - Delta:=SQR(Isf*Rz+Mn*fi*n-U)+4*U*Isf*Rz; - MotorCurrent:=(U-Isf*Rz-Mn*fi*n+SQRT(Delta))/(2*Rz) - end*) - if (DynamicBrakeType=dbrake_switch) and (TrainType=dt_ET42) then - begin //z Megapacka - Rz:=WindingRes+R; - MotorCurrent:=-fi*n/Rz; //{hamowanie silnikiem na oporach rozruchowych} - end; - end - else - MotorCurrent:=0; {odciecie pradu od silnika} - end - else - begin - U1:=U+Mn*n*fi0*fi; - Isf:=Sign(U1)*Isat; - Delta:=SQR(Isf*Rz+Mn*fi*n-U1)+4*U1*Isf*Rz; - if Mains then - begin - if U>0 then - MotorCurrent:=(U1-Isf*Rz-Mn*fi*n+SQRT(Delta))/(2.0*Rz) - else - MotorCurrent:=(U1-Isf*Rz-Mn*fi*n-SQRT(Delta))/(2.0*Rz) - end - else - MotorCurrent:=0; - end;{else DBF} - end;{with} - end{255} - else - MotorCurrent:=0; - end; -{ if Abs(CabNo)<2 then Im:=MotorCurrent*ActiveDir*CabNo - else Im:=0; -} - - if (DynamicBrakeType=dbrake_switch) and ((BrakePress>2.0) or (PipePress<3.6)) then - begin - Im:=0; - MotorCurrent:=0; - //Im:=0; - Itot:=0; - end - else - Im:=MotorCurrent; - Current:=Im; {prad brany do liczenia sily trakcyjnej} -{ EnginePower:=Im*Im*RList[MainCtrlActualPos].Bn*RList[MainCtrlActualPos].Mn*WindingRes;} - EnginePower:=Abs(Itot)*(1+RList[MainCtrlActualPos].Mn)*Abs(U); - - {awarie} - MotorCurrent:=Abs(Im); {zmienna pomocnicza} - if Motorcurrent>0 then - begin - if FuzzyLogic(Abs(n),nmax*1.1,p_elengproblem) then - if MainSwitch(false) then - EventFlag:=true; {zbyt duze obroty - wywalanie wskutek ognia okreznego} - if TestFlag(DamageFlag,dtrain_engine) then - if FuzzyLogic(MotorCurrent,ImaxLo/10.0,p_elengproblem) then - if MainSwitch(false) then - EventFlag:=true; {uszkodzony silnik (uplywy)} - if (FuzzyLogic(Abs(Im),Imax*2,p_elengproblem) or FuzzyLogic(Abs(n),nmax*1.11,p_elengproblem)) then -{ or FuzzyLogic(Abs(U/Mn),2*NominalVoltage,1)) then } {poprawic potem} - if (SetFlag(DamageFlag,dtrain_engine)) then - EventFlag:=true; - {! dorobic grzanie oporow rozruchowych i silnika} - end; -end; - -function T_MoverParameters.Momentum(I:real): real; -{liczy moment sily wytwarzany przez silnik elektryczny} -var SP: byte; -begin - SP:=ScndCtrlActualPos; - if (ScndInMain) then - if not (RList[MainCtrlActualPos].ScndAct=255) then - SP:=RList[MainCtrlActualPos].ScndAct; - with MotorParam[SP] do -// Momentum:=mfi*I*(1-1.0/(Abs(I)/mIsat+1)); - Momentum:=mfi*I*(Abs(I)/(Abs(I)+mIsat)-mfi0); -end; - -function T_MoverParameters.MomentumF(I, Iw :real; SCP: byte): real; -begin -//umozliwia dokladne sterowanie wzbudzeniem - with MotorParam[SCP] do - MomentumF:=mfi*I*Max0R(Abs(Iw)/(Abs(Iw)+mIsat)-mfi0,0); -end; - -function T_MoverParameters.dizel_Momentum(dizel_fill,n,dt:real): real; -{liczy moment sily wytwarzany przez silnik spalinowy} -var Moment, enMoment, eps, newn, friction: real; -begin -{ friction:=dizel_engagefriction*(11-2*random)/10; } - friction:=dizel_engagefriction; - if enrot>0 then - begin - Moment:=dizel_Mmax*dizel_fill-(dizel_Mmax-dizel_Mnmax*dizel_fill)*sqr(enrot/(dizel_nmax-dizel_nMmax*dizel_fill))-dizel_Mstand; -{ Moment:=Moment*(1+sin(eAngle*4))-dizel_Mstand*(1+cos(eAngle*4));} - end - else Moment:=-dizel_Mstand; - if enrot(dizel_engageMaxForce*dizel_engage*dizel_engageDia*friction*2) then {zerwanie przyczepnosci sprzegla} - enrot:=enrot+dt*Moment/dizel_AIM - else - begin - dizel_engagedeltaomega:=0; - enrot:=abs(n); {jest przyczepnosc tarcz} - end -(* - end - end - else - begin - if (enrot=0) and (Moment<0) then - newn:=0 - else - begin - //!! abs - dizel_engagedeltaomega:=enrot-n; {sliganie tarcz} - enMoment:=Moment-sign(dizel_engagedeltaomega)*dizel_engageMaxForce*dizel_engage*dizel_engageDia*friction; - Moment:=sign(dizel_engagedeltaomega)*dizel_engageMaxForce*dizel_engage*dizel_engageDia*friction; - dizel_engagedeltaomega:=abs(enrot-abs(n)); - eps:=enMoment/dizel_AIM; - newn:=enrot+eps*dt; - if (newn*enrot<=0) and (eps*enrot<0) then - newn:=0; - end; - enrot:=newn; - end; - dizel_Momentum:=Moment; - if (enrot=0) and (not dizel_enginestart) then - Mains:=false; -end; - -function T_MoverParameters.CutOffEngine: boolean; {wylacza uszkodzony silnik} -begin - CutOffEngine:=false; //Ra: warto domylna, sprawdzi to trzeba - if (NPoweredAxles>0) and (CabNo=0) and (EngineType=ElectricSeriesMotor) then - begin - if SetFlag(DamageFlag,-dtrain_engine) then - begin - NPoweredAxles:=NPoweredAxles div 2; - CutOffEngine:=true; - end; - end -end; - -{przelacznik pradu wysokiego rozruchu} -function T_MoverParameters.MaxCurrentSwitch(State:boolean):boolean; -begin - MaxCurrentSwitch:=false; - if (EngineType=ElectricSeriesMotor) then - if (ImaxHi>ImaxLo) then - begin - if State and (Imax=ImaxLo) and (RList[MainCtrlPos].Bn<2) and not ((TrainType=dt_ET42)and(MainctrlPos>0)) then - begin - Imax:=ImaxHi; - MaxCurrentSwitch:=true; - if CabNo<>0 then - SendCtrlToNext('MaxCurrentSwitch',1,CabNo); - end; - if (not State) then - if (Imax=ImaxHi) then - if not ((TrainType=dt_ET42)and(MainctrlPos>0)) then - begin - Imax:=ImaxLo; - MaxCurrentSwitch:=true; - if CabNo<>0 then - SendCtrlToNext('MaxCurrentSwitch',0,CabNo); - end; - end; -end; - - -{przelacznik pradu automatycznego rozruchu} -function T_MoverParameters.MinCurrentSwitch(State:boolean):boolean; -begin - MinCurrentSwitch:=false; - if ((EngineType=ElectricSeriesMotor) and (IminHi>IminLo)) or (TrainType=dt_EZT) then - begin - if State and (Imin=IminLo) then - begin - Imin:=IminHi; - MinCurrentSwitch:=true; - if CabNo<>0 then - SendCtrlToNext('MinCurrentSwitch',1,CabNo); - end; - if (not State) and (Imin=IminHi) then - begin - Imin:=IminLo; - MinCurrentSwitch:=true; - if CabNo<>0 then - SendCtrlToNext('MinCurrentSwitch',0,CabNo); - end; - end; -end; - - -{reczne przelaczanie samoczynnego rozruchu} -function T_MoverParameters.AutoRelaySwitch(State:boolean):boolean; - begin - if (AutoRelayType=2) and (AutoRelayFlag<>State) then - begin - AutoRelayFlag:=State; - AutoRelaySwitch:=true; - SendCtrlToNext('AutoRelaySwitch',ord(State),CabNo); - end - else - AutoRelaySwitch:=false; - end; - -function T_MoverParameters.AutoRelayCheck: boolean; -var OK:boolean; b:byte; -begin -// if ((TrainType=dt_EZT{) or (TrainType=dt_ET22)}) and (Imin=IminLo)) or ((ActiveDir<0) and (TrainType<>dt_PseudoDiesel')) then -// if RList[MainCtrlActualPos].Bn>1 then -// begin -// dec(MainCtrlActualPos); -// AutoRelayCheck:=false; -// Exit; -// end; -//yB: wychodzenie przy odcietym pradzie - if (ScndCtrlActualPos=255)then - begin - AutoRelayCheck:=false; - MainCtrlActualPos:=0; - end - else - //if (not Mains) or (FuseFlag) or (StLinFlag) then //hunter-111211: wylacznik cisnieniowy - //if ((not Mains) or (FuseFlag)) and not((DynamicBrakeFlag) and (TrainType=dt_ET42)) then - if ((not Mains) or (FuseFlag) or (StLinFlag)) and not((DynamicBrakeFlag) and (TrainType=dt_ET42)) then //hunter-111211: wylacznik cisnieniowy - begin - AutoRelayCheck:=false; - MainCtrlActualPos:=0; - ScndCtrlActualPos:=0; - end - else - begin - OK:=false; - if DelayCtrlFlag and (MainCtrlPos=1) and (MainCtrlActualPos=1) and (LastRelayTime>InitialCtrlDelay) then - begin - DelayCtrlFlag:=false; - SetFlag(SoundFlag,sound_relay); SetFlag(SoundFlag,sound_loud); - end; - //if (TrainType<>dt_EZT) then //Ra: w EZT mona da od razu na S albo R, wa kuakowy sobie dokrci - if (LastRelayTime>CtrlDelay) and not DelayCtrlFlag then - begin - if (MainCtrlPos=0) and (TrainType<>dt_ET40) and (TrainType<>dt_EP05) then - DelayCtrlFlag:=true; //(TrainType<>dt_EZT); //EN57 nie ma czekania na 1. pozycji - if (MainCtrlPos=0) and ((TrainType=dt_ET40)or(TrainType=dt_EP05)) and (MainCtrlActualPos=0) then - DelayCtrlFlag:=true; //(TrainType<>dt_EZT); //EN57 nie ma czekania na 1. pozycji - - if (((RList[MainCtrlActualPos].R=0) and ((not CoupledCtrl) or ((Imin=IminLo) and (ScndS=true)))) or (MainCtrlActualPos=RListSize)) - and ((ScndCtrlActualPos>0) or (ScndCtrlPos>0)) then - begin {zmieniaj scndctrlactualpos} - if (not AutoRelayFlag) or (not MotorParam[ScndCtrlActualPos].AutoSwitch) then - begin {scnd bez samoczynnego rozruchu} - OK:=true; - if (ScndCtrlActualPosScndCtrlPos) and (TrainType<>dt_EZT) then - dec(ScndCtrlActualPos) - - else - if (ScndCtrlActualPos>ScndCtrlPos) and (TrainType=dt_EZT) then - - Exit {utkniecie walu kulakowego} - else OK:=false; - end - else - begin {scnd z samoczynnym rozruchem} - if (ScndCtrlPosdt_EZT) then - begin - dec(ScndCtrlActualPos); - OK:=true; - end - else - if (ScndCtrlPosScndCtrlActualPos) then - if Abs(Im)1 then - begin - AutoRelayCheck:=false; - Exit; - end; - if (not AutoRelayFlag) or (not RList[MainCtrlActualPos].AutoSwitch) then - begin {main bez samoczynnego rozruchu} - OK:=true; - if RList[MainCtrlActualPos].RelayRList[MainCtrlPos].Mn)and (RList[MainCtrlActualPos+1].Mn0) and (TrainType=dt_ET22) and (LastRelayTime0 then - //if (RList[MainCtrlActualPos].R=0) and ((RList[MainCtrlActualPos].ScndAct=0) or (RList[MainCtrlActualPos].ScndAct=255)) then {dzwieki przechodzenia na bezoporowa} - if (RList[MainCtrlActualPos].R=0) and (not (MainCtrlActualPos=MainCtrlPosNo)) then //wejscie na bezoporowa - begin - SetFlag(SoundFlag,sound_manyrelay); SetFlag(SoundFlag,sound_loud); - end - else if (RList[MainCtrlActualPos].R>0) and (RList[MainCtrlActualPos-1].R=0) then //wejscie na drugi uklad - begin - SetFlag(SoundFlag,sound_manyrelay); - end; - - end - else if (RList[MainCtrlActualPos].Relay>MainCtrlPos) and (TrainType<>dt_EZT) then - begin - if not ((RList[MainCtrlActualPos].MnRList[MainCtrlActualPos].Mn)and (TrainType=dt_ET22) and (LastRelayTime0 then //hunter-111211: poprawki - //if (RList[MainCtrlActualPos+1].R=0) and ((RList[MainCtrlActualPos+1].ScndAct=0) or (RList[MainCtrlActualPos+1].ScndAct=255)) then {dzwieki schodzenia z bezoporowej} - if RList[MainCtrlActualPos].R=0 then {dzwieki schodzenia z bezoporowej} - begin - SetFlag(SoundFlag,sound_manyrelay); - end; - end - else - begin - Itot:=0; - Im:=0; - OK:=false; {odciecie pradu, przy przelaczaniu silnikow w ET22} - end; - end - else if (RList[MainCtrlActualPos].Relay>MainCtrlPos) and (TrainType=dt_EZT) and (MainCtrlPos>0) then //K90 - begin - Exit; {utkniecie walu kulakowego} - end - else if (TrainType=dt_EZT) and (MainCtrlPos=0) then - MainCtrlActualPos:=0 - else - if (RList[MainCtrlActualPos].R>0) and (ScndCtrlActualPos>0) and (TrainType<>dt_EZT) then - Dec(ScndCtrlActualPos) {boczniki nie dzialaja na poz. oporowych} - else - if (ScndCtrlPosdt_EZT) then - begin - if not ((RList[MainCtrlActualPos].MnRList[MainCtrlActualPos].Mn) and (TrainType=dt_ET22) and (LastRelayTime0 then - if (RList[MainCtrlActualPos+1].R=0) and ((RList[MainCtrlActualPos+1].ScndAct=0) or (RList[MainCtrlActualPos+1].ScndAct=255)) then {dzwieki schodzenia z bezoporowej} - begin - SetFlag(SoundFlag,sound_manyrelay); - end; - end - else - begin - Itot:=0; - Im:=0; - OK:=false; {odciecie pradu, przy przelaczaniu silnikow w ET22} - end; - end - else - if (MainCtrlPos0) and (TrainType=dt_EZT) then - begin - AutoRelayCheck:=false; - Exit; {utkniecie walu} - end - else - if (TrainType=dt_EZT) and (MainCtrlPos=0) then - begin - MainCtrlActualPos:=0; - ScndCtrlActualPos:=0; - end - else - if ((ScndCtrlPosRList[MainCtrlActualPos].Relay) or ((MainCtrlActualPosRList[MainCtrlPos].Mn) and(RList[MainCtrlActualPos+1].Mn0 then - if (RList[MainCtrlActualPos].R=0) and ((RList[MainCtrlActualPos].ScndAct=0) or (RList[MainCtrlActualPos].ScndAct=255)) then {dzwieki przechodzenia na bezoporowa} - begin - SetFlag(SoundFlag,sound_manyrelay); SetFlag(SoundFlag,sound_loud); - end; - end; - end; - end; - end; - end - else {DelayCtrlFlag} - if ((MainCtrlPos>1) and (MainCtrlActualPos>0) and DelayCtrlFlag) then - begin - //if (TrainType<>dt_EZT) then //Ra: w EZT mona da od razu na S albo R, wa kuakowy sobie dokrci - MainCtrlActualPos:=0; //Ra: tu jest chyba wyczanie przy zbyt szybkim wejciu na drug pozycj - OK:=true; - end - else - if ((MainCtrlPos=0) and (TrainType=dt_EZT)) then - begin - MainCtrlActualPos:=0; - ScndCtrlActualPos:=0; {zejscie walu kulakowego do 0 po ustawieniu nastawnika na 0} - OK:=true; - end - else - if (MainCtrlPos=1) and (MainCtrlActualPos=0) then - MainCtrlActualPos:=1 - else - if (MainCtrlPos=0) and (MainCtrlActualPos>0) and (TrainType<>dt_EZT) and (TrainType<>dt_ET40) and (TrainType<>dt_EP05) then - begin - dec(MainCtrlActualPos); - OK:=true; - end; - if (MainCtrlPos=0) and (MainCtrlActualPos>0) and ((TrainType=dt_ET40)or(TrainType=dt_EP05)) and (LastRelayTime>(InitialCtrlDelay*2)) then - begin - dec(MainCtrlActualPos); - OK:=true; {wal kulakowy w ET40} - end; - if OK then LastRelayTime:=0; - AutoRelayCheck:=OK; - end; -end; -*) - end - else - begin - if (enrot=0) and (Moment<0) then - newn:=0 - else - begin - //!! abs - dizel_engagedeltaomega:=enrot-n; {sliganie tarcz} - enMoment:=Moment-sign(dizel_engagedeltaomega)*dizel_engageMaxForce*dizel_engage*dizel_engageDia*friction; - Moment:=sign(dizel_engagedeltaomega)*dizel_engageMaxForce*dizel_engage*dizel_engageDia*friction; - dizel_engagedeltaomega:=abs(enrot-abs(n)); - eps:=enMoment/dizel_AIM; - newn:=enrot+eps*dt; - if (newn*enrot<=0) and (eps*enrot<0) then - newn:=0; - end; - enrot:=newn; - end; - dizel_Momentum:=Moment; - if (enrot=0) and (not dizel_enginestart) then - Mains:=false; -end; - -function T_MoverParameters.CutOffEngine: boolean; {wylacza uszkodzony silnik} -begin - CutOffEngine:=false; //Ra: warto domylna, sprawdzi to trzeba - if (NPoweredAxles>0) and (CabNo=0) and (EngineType=ElectricSeriesMotor) then - begin - if SetFlag(DamageFlag,-dtrain_engine) then - begin - NPoweredAxles:=NPoweredAxles div 2; - CutOffEngine:=true; - end; - end -end; - -{przelacznik pradu wysokiego rozruchu} -function T_MoverParameters.MaxCurrentSwitch(State:boolean):boolean; -begin - MaxCurrentSwitch:=false; - if (EngineType=ElectricSeriesMotor) then - if (ImaxHi>ImaxLo) then - begin - if State and (Imax=ImaxLo) and (RList[MainCtrlPos].Bn<2) and not ((TrainType=dt_ET42)and(MainctrlPos>0)) then - begin - Imax:=ImaxHi; - MaxCurrentSwitch:=true; - if CabNo<>0 then - SendCtrlToNext('MaxCurrentSwitch',1,CabNo); - end; - if (not State) then - if (Imax=ImaxHi) then - if not ((TrainType=dt_ET42)and(MainctrlPos>0)) then - begin - Imax:=ImaxLo; - MaxCurrentSwitch:=true; - if CabNo<>0 then - SendCtrlToNext('MaxCurrentSwitch',0,CabNo); - end; - end; -end; - - -{przelacznik pradu automatycznego rozruchu} -function T_MoverParameters.MinCurrentSwitch(State:boolean):boolean; -begin - MinCurrentSwitch:=false; - if ((EngineType=ElectricSeriesMotor) and (IminHi>IminLo)) or (TrainType=dt_EZT) then - begin - if State and (Imin=IminLo) then - begin - Imin:=IminHi; - MinCurrentSwitch:=true; - if CabNo<>0 then - SendCtrlToNext('MinCurrentSwitch',1,CabNo); - end; - if (not State) and (Imin=IminHi) then - begin - Imin:=IminLo; - MinCurrentSwitch:=true; - if CabNo<>0 then - SendCtrlToNext('MinCurrentSwitch',0,CabNo); - end; - end; -end; - - -{reczne przelaczanie samoczynnego rozruchu} -function T_MoverParameters.AutoRelaySwitch(State:boolean):boolean; - begin - if (AutoRelayType=2) and (AutoRelayFlag<>State) then - begin - AutoRelayFlag:=State; - AutoRelaySwitch:=true; - SendCtrlToNext('AutoRelaySwitch',ord(State),CabNo); - end - else - AutoRelaySwitch:=false; - end; - -function T_MoverParameters.AutoRelayCheck: boolean; -var OK:boolean; //b:byte; - ARFASI, ARFASI2 :boolean; //sprawdzenie wszystkich warunkow (AutoRelayFlag, AutoSwitch, Im2.1)and(TrainType<>dt_EZT)) or (ActiveDir=0) then //hunter-111211: wylacznik cisnieniowy - begin - StLinFlag:=false; //yBARC - rozlaczenie stycznikow liniowych - AutoRelayCheck:=false; - if not DynamicBrakeFlag then - begin - Im:=0; - Itot:=0; - ResistorsFlag:=false; - end; - end; - - ARFASI2:=(not AutoRelayFlag) or ((MotorParam[ScndCtrlActualPos].AutoSwitch) and (Abs(Im)0) or (ScndCtrlPos>0)) and (not(CoupledCtrl)or(RList[MainCtrlActualPos].Relay=MainCtrlPos))then - begin //zmieniaj scndctrlactualpos - begin {scnd bez samoczynnego rozruchu} - if (ScndCtrlActualPosCtrlDelay)and(ARFASI2) then - begin - inc(ScndCtrlActualPos); - OK:=true; - end - end - else - if ScndCtrlActualPos>ScndCtrlPos then - begin - if (LastRelayTime>CtrlDownDelay)and(TrainType<>dt_EZT) then - begin - dec(ScndCtrlActualPos); - OK:=true; - end - end - else OK:=false; - end; - end - else - begin //zmieniaj mainctrlactualpos - if ((ActiveDir<0) and (TrainType<>dt_PseudoDiesel)) then - if RList[MainCtrlActualPos+1].Bn>1 then - begin - AutoRelayCheck:=false; - Exit; //Ra: to powoduje, e EN57 nie wycza si przy IminLo - end; - begin //main bez samoczynnego rozruchu - if (RList[MainCtrlActualPos].Relay0) and (not (MainCtrlPos=MainCtrlPosNo)) and (FastSerialCircuit=1) then - begin - inc(MainCtrlActualPos); -// MainCtrlActualPos:=MainCtrlPos; //hunter-111012: szybkie wchodzenie na bezoporowa (303E) - OK:=true; - SetFlag(SoundFlag,sound_manyrelay); SetFlag(SoundFlag,sound_loud); - end - else if (LastRelayTime>CtrlDelay)and(ARFASI) then - begin - if (TrainType=dt_ET22)and(MainCtrlPos>1)and((RList[MainCtrlActualPos].Bn4*CtrlDelay) then //przejscie - begin - DelayCtrlFlag:=false; - OK:=true; - end - else - else //nie ET22 z waem grupowym - begin - inc(MainCtrlActualPos); - OK:=true; - end; - //--------- - //hunter-111211: poprawki - if MainCtrlActualPos>0 then - if (RList[MainCtrlActualPos].R=0) and (not (MainCtrlActualPos=MainCtrlPosNo)) then //wejscie na bezoporowa - begin - SetFlag(SoundFlag,sound_manyrelay); SetFlag(SoundFlag,sound_loud); - end - else if (RList[MainCtrlActualPos].R>0) and (RList[MainCtrlActualPos-1].R=0) then //wejscie na drugi uklad - begin - SetFlag(SoundFlag,sound_manyrelay); - end; - end - end - else if RList[MainCtrlActualPos].Relay>MainCtrlPos then - begin - if (RList[MainCtrlPos].R=0) and (MainCtrlPos>0) and (not (MainCtrlPos=MainCtrlPosNo)) and (FastSerialCircuit=1) then - begin - dec(MainCtrlActualPos); -// MainCtrlActualPos:=MainCtrlPos; //hunter-111012: szybkie wchodzenie na bezoporowa (303E) - OK:=true; - SetFlag(SoundFlag,sound_manyrelay); - end - else if (LastRelayTime>CtrlDownDelay) then - begin - if (TrainType<>dt_EZT) then //tutaj powinien by tryb sterowania waem - begin - dec(MainCtrlActualPos); - OK:=true; - end; - if MainCtrlActualPos>0 then //hunter-111211: poprawki - if RList[MainCtrlActualPos].R=0 then {dzwieki schodzenia z bezoporowej} - begin - SetFlag(SoundFlag,sound_manyrelay); - end; - end - end - else - if (RList[MainCtrlActualPos].R>0) and (ScndCtrlActualPos>0) then - begin - if (LastRelayTime>CtrlDownDelay) then - begin - Dec(ScndCtrlActualPos); {boczniki nie dzialaja na poz. oporowych} - OK:=true; - end - end - else - OK:=false; - end; - end; - end - else {not StLinFlag} - begin - OK:=false; - //ybARC - tutaj sa wszystkie warunki, jakie musza byc spelnione, zeby mozna byla zalaczyc styczniki liniowe - if ((MainCtrlPos=1)or((TrainType=dt_EZT)and(MainCtrlPos>0)))and(not FuseFlag)and(Mains)and((BrakePress<1.0)or(TrainType=dt_EZT))and(MainCtrlActualPos=0)and(ActiveDir<>0) then - begin - DelayCtrlFlag:=true; - if (LastRelayTime>=InitialCtrlDelay) then - begin - StLinFlag:=true; //ybARC - zalaczenie stycznikow liniowych - MainCtrlActualPos:=1; - DelayCtrlFlag:=false; - SetFlag(SoundFlag,sound_relay); SetFlag(SoundFlag,sound_loud); - OK:=true; - end; - end - else - DelayCtrlFlag:=false; - - if (not StLinFlag)and((MainCtrlActualPos>0)or(ScndCtrlActualPos>0)) then - if (TrainType=dt_EZT)and(CoupledCtrl)then //EN57 wal jednokierunkowy calosciowy - begin - if(MainCtrlActualPos=1)then - begin - MainCtrlActualPos:=0; - OK:=true; - end - else - if(LastRelayTime>CtrlDownDelay)then - begin - if(MainCtrlActualPosCtrlDownDelay) then - begin - if (ScndCtrlActualPos>0) then - dec(ScndCtrlActualPos) - else dec(MainCtrlActualPos); - OK:=true; - end - end - else - begin - MainCtrlActualPos:=0; - ScndCtrlActualPos:=0; - OK:=true; - end; - - end; - if OK then LastRelayTime:=0; - AutoRelayCheck:=OK; - end; -end; - -function T_MoverParameters.ResistorsFlagCheck:boolean; {sprawdzanie wskaznika oporow} -var b:byte; -begin - ResistorsFlagCheck:=false; - if Power>0.01 then ResistorsFlagCheck:=ResistorsFlag - else {pobor pradu jezeli niema mocy} - for b:=0 to 1 do - with Couplers[b] do - if TestFlag(CouplingFlag,ctrain_controll) then - if Connected.Power>0.01 then - ResistorsFlagCheck:=Connected.ResistorsFlagCheck(); -end; - -function T_MoverParameters.dizel_EngageSwitch(state: real): boolean; -{zmienia parametr do ktorego dazy sprzeglo} -begin - if (EngineType=DieselEngine) and (state<=1) and (state>=0) and (state<>dizel_engagestate) then - begin - dizel_engagestate:=state; - dizel_EngageSwitch:=true - end - else - dizel_EngageSwitch:=false; -end; - -function T_MoverParameters.dizel_EngageChange(dt: real): boolean; -{zmienia parametr do ktorego dazy sprzeglo} -const engagedownspeed=0.9; engageupspeed=0.5; -var engagespeed:real; //OK:boolean; -begin - dizel_EngageChange:=false; - if dizel_engage-dizel_engagestate>0 then - engagespeed:=engagedownspeed - else - engagespeed:=engageupspeed; - if dt>0.2 then - dt:=0.1; - if abs(dizel_engage-dizel_engagestate)<0.11 then - begin - if (dizel_engage<>dizel_engagestate) then - begin - dizel_EngageChange:=true; - dizel_engage:=dizel_engagestate; - end - //else OK:=false; //ju jest false - end - else - begin - dizel_engage:=dizel_engage+engagespeed*dt*(dizel_engagestate-dizel_engage); - //OK:=false; - end; - //dizel_EngageChange:=OK; -end; - -(* -function T_MoverParameters.dizel_rotateengine(Momentum,dt,n,engage:real): real; -{oblicza obroty silnika} -var newn,eps:real; -begin - if (Momentum<0) and (n=0) and (enrot=0) then - newn:=0 - else - begin - if (enrot0) then - Momentum:=0 {nie dziala przy b. malych obrotach} - else - if enrotPi/2) then Momentum:=Momentum-2*dizel_Mstand - end - else - if enrotPi) then Momentum:=Momentum-dizel_Mstand; {wstrzymywanie przy malych obrotach} - - eps:=Momentum/dizel_AIM; - if engage<0.9 then {niepelny docisk - poslizg} - begin - newn:=(1-engage)*(enrot+eps*dt)+engage*(n+eps*dt); - if (newn*enrot<=0) and (eps*enrot<0) then - newn:=0; - end - else - newn:=n; {bez poslizgu sprzegla} - end; - dizel_rotateengine:=newn; -{todo: uwzglednianie AIM przy ruszaniu} -end; -*) - -function T_MoverParameters.dizel_fillcheck(mcp:byte): real; -{oblicza napelnienie, uzwglednia regulator obrotow} -var realfill,nreg: real; -begin - realfill:=0; - nreg:=0; - if Mains and (MainCtrlPosNo>0) then - begin - if dizel_enginestart and (LastSwitchingTime>=0.9*InitialCtrlDelay) then {wzbogacenie przy rozruchu} - realfill:=1 - else - realfill:=RList[mcp].R; {napelnienie zalezne od MainCtrlPos} - if dizel_nmax_cutoff>0 then - begin - case RList[MainCtrlPos].Mn of - 0,1: nreg:=dizel_nmin; - 2: if(dizel_automaticgearstatus=0)then - nreg:=dizel_nmax - else - nreg:=dizel_nmin; - else realfill:=0; {sluczaj} - end; - if enrot>nreg then - realfill:=realfill*(3.9-3.0*abs(enrot)/nreg); - if enrot>dizel_nmax_cutoff then - realfill:=realfill*(9.8-9.0*abs(enrot)/dizel_nmax_cutoff); - if enrot1 then - realfill:=1; - dizel_fillcheck:=realfill; -end; - -function T_MoverParameters.dizel_AutoGearCheck: boolean; -{automatycznie zmienia biegi gdy predkosc przekroczy widelki} -var OK: boolean; -begin - OK:=false; - if MotorParam[ScndCtrlActualPos].AutoSwitch and Mains then - begin - if (RList[MainCtrlPos].Mn=0) then - begin - if (dizel_engagestate>0) then - dizel_EngageSwitch(0); - if (MainCtrlPos=0) and (ScndCtrlActualPos>0) then - dizel_automaticgearstatus:=-1 - end - else - begin - if MotorParam[ScndCtrlActualPos].AutoSwitch and (dizel_automaticgearstatus=0) then {sprawdz czy zmienic biegi} - begin - if (Vel>MotorParam[ScndCtrlActualPos].mfi) and (ScndCtrlActualPos0) then - begin - dizel_automaticgearstatus:=-1; - OK:=true - end; - end; - end; - if (dizel_engage<0.1) and (dizel_automaticgearstatus<>0) then - begin - if dizel_automaticgearstatus=1 then - inc(ScndCtrlActualPos) - else - dec(ScndCtrlActualPos); - dizel_automaticgearstatus:=0; -{} dizel_EngageSwitch(1.0); {} - OK:=true; - end - end; - if Mains then - begin - if (dizel_automaticgearstatus=0) then {ustaw cisnienie w silowniku sprzegla} - case RList[MainCtrlPos].Mn of - 1: dizel_EngageSwitch(0.5); - 2: dizel_EngageSwitch(1.0); - else dizel_EngageSwitch(0.0) - end - else - dizel_EngageSwitch(0.0); - if not (MotorParam[ScndCtrlActualPos].mIsat>0) then - dizel_EngageSwitch(0.0); //wylacz sprzeglo na pozycjach neutralnych - if not AutoRelayFlag then - ScndCtrlActualPos:=ScndCtrlPos; - end; - dizel_AutoGearCheck:=OK; -end; - -function T_MoverParameters.dizel_Update(dt:real): boolean; -{odwiea informacje o silniku} -//var OK:boolean; -const fillspeed=2; -begin - //dizel_Update:=false; - if dizel_enginestart and (LastSwitchingTime>=InitialCtrlDelay) then - begin - dizel_enginestart:=false; - LastSwitchingTime:=0; - enrot:=dizel_nmin/2.0; {TODO: dac zaleznie od temperatury i baterii} - end; - {OK:=}dizel_EngageChange(dt); -// if AutoRelayFlag then Poprawka na SM03 - dizel_Update:=dizel_AutoGearCheck; -{ dizel_fill:=(dizel_fill+dizel_fillcheck(MainCtrlPos))/2; } - dizel_fill:=dizel_fill+fillspeed*dt*(dizel_fillcheck(MainCtrlPos)-dizel_fill); - //dizel_Update:=OK; -end; - - -{przyczepnosc} -function T_MoverParameters.Adhesive(staticfriction:real): real; -//var Adhesion: real; -begin - {Adhesion:=0; - case SlippingWheels of - true: - if SandDose then - Adhesion:=0.48 - else - Adhesion:=staticfriction*0.2; - false: - if SandDose then - Adhesion:=Max0R(staticfriction*(100+Vel)/(50+Vel)*1.1,0.48) - else - Adhesion:=staticfriction*(100+Vel)/(50+Vel) - end; - Adhesion:=Adhesion*(11-2*random)/10; - Adhesive:=Adhesion;} - - //ABu: male przerobki, tylko czy to da jakikolwiek skutek w FPS? - // w kazdym razie zaciemni kod na pewno :) - if SlippingWheels=false then - begin - if SandDose then - Adhesive:=(Max0R(staticfriction*(100.0+Vel)/((50.0+Vel)*11.0),0.048))*(11.0-2.0*random) - else - Adhesive:=(staticfriction*(100.0+Vel)/((50.0+Vel)*10))*(11.0-2.0*random); - end - else - begin - if SandDose then - Adhesive:=(0.048)*(11-2*random) - else - Adhesive:=(staticfriction*0.02)*(11-2*random); - end; -end; - - -{SILY} - -function T_MoverParameters.TractionForce(dt:real):real; -const kv=0.2; ksum=0.05; -var PosRatio,dmoment,dtrans,tmp,tmpV: real; - i: byte; -{oblicza sile trakcyjna lokomotywy (dla elektrowozu tez calkowity prad)} -begin - Ft:=0; - dtrans:=0; - dmoment:=0; -// tmpV:=Abs(nrot*WheelDiameter/2); -//youBy - if (EngineType=DieselElectric) then - begin - tmp:=DEList[MainCtrlPos].rpm/60.0; - if (Heating) and (HeatingPower>0) and (MainCtrlPosNo>MainCtrlPos) then - begin - i:=MainCtrlPosNo; - while (DEList[i-2].rpm/60.0>tmp) do - i:=i-1; - tmp:=DEList[i].rpm/60.0 - end; - if enrot<>tmp*Byte(ConverterFlag) then - if ABS(tmp*Byte(ConverterFlag) - enrot) < 0.001 then - enrot:=tmp*Byte(ConverterFlag) - else - if (enrotDieselEngine then - enrot:=Transmision.Ratio*nrot - else //dla DieselEngine - begin - if (ShuntMode) then //dodatkowa przekadnia np. dla 2Ls150 - dtrans:=AnPos*Transmision.Ratio*MotorParam[ScndCtrlActualPos].mIsat - else - dtrans:=Transmision.Ratio*MotorParam[ScndCtrlActualPos].mIsat; - dmoment:=dizel_Momentum(dizel_fill,ActiveDir*1*dtrans*nrot,dt); {oblicza tez enrot} - end; - eAngle:=eAngle+enrot*dt; - if eAngle>Pirazy2 then - //eAngle:=Pirazy2-eAngle; <- ABu: a nie czasem tak, jak nizej? - eAngle:=eAngle-Pirazy2; - - //hunter-091012: przeniesione z if ActiveDir<>0 (zeby po zejsciu z kierunku dalej spadala predkosc wentylatorow) - if (EngineType=ElectricSeriesMotor) then - begin - case RVentType of {wentylatory rozruchowe} - 1: if (ActiveDir<>0) and (RList[MainCtrlActualPos].R>RVentCutOff) then - RventRot:=RventRot+(RVentnmax-RventRot)*RVentSpeed*dt - else - RventRot:=RventRot*(1-RVentSpeed*dt); - 2: if (Abs(Itot)>RVentMinI) and (RList[MainCtrlActualPos].R>RVentCutOff) then - RventRot:=RventRot+(RVentnmax*Abs(Itot)/(ImaxLo*RList[MainCtrlActualPos].Bn)-RventRot)*RVentSpeed*dt - else - if (DynamicBrakeType=dbrake_automatic) and (DynamicBrakeFlag) then - RventRot:=RventRot+(RVentnmax*Im/ImaxLo-RventRot)*RVentSpeed*dt - else - begin - RventRot:=RventRot*(1-RVentSpeed*dt); - if RventRot<0.1 then RventRot:=0; - end; - end; {case} - end; {if} - - if ActiveDir<>0 then - case EngineType of - Dumb: - begin - PosRatio:=(MainCtrlPos+ScndCtrlPos)/(MainCtrlPosNo+ScndCtrlPosNo+0.01); - if Mains and (ActiveDir<>0) and (CabNo<>0) then - begin - if Vel>0.1 then - begin - Ft:=Min0R(1000.0*Power/Abs(V),Ftmax)*PosRatio; - end - else Ft:=Ftmax*PosRatio; - Ft:=Ft*DirAbsolute; //ActiveDir*CabNo; - end - else Ft:=0; - EnginePower:=1000*Power*PosRatio; - end; - WheelsDriven: - begin - if EnginePowerSource.SourceType=InternalSource then - if EnginePowerSource.PowerType=BioPower then - Ft:=sign(sin(eAngle))*PulseForce*Transmision.Ratio; - PulseForceTimer:=PulseForceTimer+dt; - if PulseForceTimer>CtrlDelay then - begin - PulseForce:=0; - if PulseForceCount>0 then - dec(PulseForceCount); - end; - EnginePower:=Ft*(1+Vel); - end; - ElectricSeriesMotor: - begin -{ enrot:=Transmision.Ratio*nrot; } - //yB: szereg dwoch sekcji w ET42 - if(TrainType=dt_ET42)and(Imax=ImaxHi)then - Voltage:=Voltage/2.0; - Mm:=Momentum(Current(enrot,Voltage)); {oblicza tez prad p/slinik} - if(TrainType=dt_ET42)then - begin - if(Imax=ImaxHi)then - Voltage:=Voltage*2; - if(DynamicBrakeFlag)and(Abs(Im)>300)then - FuseOff; - end; - if (DynamicBrakeType=dbrake_automatic)and(DynamicBrakeFlag) then - begin - if ((Vadd+Abs(Im))>760)or((Hamulec as TLSt).GetEDBCP<0.25) then - begin - Vadd:=Vadd-500*dt; - if(Vadd<1)then - Vadd:=0; - end - else if (DynamicBrakeFlag)and((Vadd+Abs(Im))<740) then - begin - Vadd:=Vadd+70*dt; - Vadd:=Min0R(Max0R(Vadd,60),400); - end; - if(Vadd>0)then Mm:=MomentumF(Im,Vadd,0); - end; - - if(TrainType=dt_ET22)and(DelayCtrlFlag)then //szarpanie przy zmianie ukadu w byku - Mm:=Mm*RList[MainCtrlActualPos].Bn/(RList[MainCtrlActualPos].Bn+1); //zrobione w momencie, eby nie dawac elektryki w przeliczaniu si - - if (Abs(Im)>Imax) then - Vhyp:=Vhyp+dt//*(Abs(Im)/Imax-0.9)*10 //zwieksz czas oddzialywania na PN - else - Vhyp:=0; - if (Vhyp>CtrlDelay/2) then //jesli czas oddzialywania przekroczony -// dec(MainCtrlActualPos); - FuseOff; {wywalanie bezpiecznika z powodu przetezenia silnikow} - if (Mains) then //nie wchodzi w funkcj bez potrzeby - if (Abs(Voltage)EnginePowerSource.CollectorParameters.MaxV) then - if MainSwitch(false) then - EventFlag:=true; //wywalanie szybkiego z powodu niewaciwego napicia - - if (((DynamicBrakeType=dbrake_automatic)or(DynamicBrakeType=dbrake_switch)) and (DynamicBrakeFlag)) then - Itot:=Im*2 {2x2 silniki w EP09} - else if (TrainType=dt_EZT)and(Imin=IminLo)and(ScndS) then //yBARC - boczniki na szeregu poprawnie - Itot:=Im - else - Itot:=Im*RList[MainCtrlActualPos].Bn; {prad silnika * ilosc galezi} - Mw:=Mm*Transmision.Ratio; - Fw:=Mw*2.0/WheelDiameter; - Ft:=Fw*NPoweredAxles; {sila trakcyjna} - end; - DieselEngine: begin - EnginePower:=dmoment*enrot; - if MainCtrlPos>1 then - dmoment:=dmoment-dizel_Mstand*(0.2*enrot/nmax); {dodatkowe opory z powodu sprezarki} - Mm:=dizel_engage*dmoment; - Mw:=Mm*dtrans; {dmoment i dtrans policzone przy okazji enginerotation} - Fw:=Mw*2.0/WheelDiameter; - Ft:=Fw*NPoweredAxles; {sila trakcyjna} - Ft:=Ft*DirAbsolute; //ActiveDir*CabNo; - - end; - DieselElectric: //youBy - begin -// tmpV:=V*CabNo*ActiveDir; - tmpV:=nrot*Pirazy2*0.5*WheelDiameter*DirAbsolute; //*CabNo*ActiveDir; - //jazda manewrowa - if (ShuntMode) then - begin - Voltage:=(SST[MainCtrlPos].Umax * AnPos) + (SST[MainCtrlPos].Umin * (1 - AnPos)); - tmp:=(SST[MainCtrlPos].Pmax * AnPos) + (SST[MainCtrlPos].Pmin * (1 - AnPos)); - Ft:=tmp * 1000.0 / (abs(tmpV)+1.6); - PosRatio:=1; - end - else //jazda ciapongowa - begin - - tmp:=Min0R(DEList[MainCtrlPos].genpower,Power-HeatingPower*byte(Heating)); - - PosRatio:=DEList[MainCtrlPos].genpower / DEList[MainCtrlPosNo].genpower; {stosunek mocy teraz do mocy max} - if (MainCtrlPos>0) and (ConverterFlag) then - if tmpV < (Vhyp*(Power-HeatingPower*byte(Heating))/DEList[MainCtrlPosNo].genpower) then //czy na czesci prostej, czy na hiperboli - Ft:=(Ftmax - ((Ftmax - 1000.0 * DEList[MainCtrlPosNo].genpower / (Vhyp+Vadd)) * (tmpV/Vhyp) / PowerCorRatio)) * PosRatio //posratio - bo sila jakos tam sie rozklada - //Ft:=(Ftmax - (Ftmax - (1000.0 * DEList[MainCtrlPosNo].genpower / (Vhyp+Vadd) / PowerCorRatio)) * (tmpV/Vhyp)) * PosRatio //wersja z Megapacka - else //na hiperboli //1.107 - wspolczynnik sredniej nadwyzki Ft w symku nad charakterystyka - Ft:=1000.0 * tmp / (tmpV+Vadd) / PowerCorRatio //tu jest zawarty stosunek mocy - else Ft:=0; //jak nastawnik na zero, to sila tez zero - - PosRatio:=tmp/DEList[MainCtrlPosNo].genpower; - - end; - if (FuseFlag) then Ft:=0 else - Ft:=Ft*DirAbsolute; //ActiveDir * CabNo; //zwrot sily i jej wartosc - Fw:=Ft/NPoweredAxles; //sila na obwodzie kola - Mw:=Fw*WheelDiameter / 2.0; // moment na osi kola - Mm:=Mw/Transmision.Ratio; // moment silnika trakcyjnego - - - with MotorParam[ScndCtrlPos] do - if ABS(Mm) > fi then - Im:=NPoweredAxles * ABS(ABS(Mm) / mfi + mIsat) - else - Im:=NPoweredAxles * sqrt(ABS(Mm * Isat)); - - if (ShuntMode) then - begin - EnginePower:=Voltage * Im/1000.0; - if (EnginePower > tmp) then - begin - EnginePower:=tmp*1000.0; - Voltage:=EnginePower/Im; - end; - if (EnginePower < tmp) then - Ft:=Ft * EnginePower / tmp; - end - else - begin - if (ABS(Im) > DEList[MainCtrlPos].Imax) then - begin //nie ma nadmiarowego, tylko Imax i zwarcie na pradnicy - Ft:=Ft/Im*DEList[MainCtrlPos].Imax;Im:=DEList[MainCtrlPos].Imax; - end; - - if (Im > 0) then //jak pod obciazeniem - if (Flat) then //ograniczenie napiecia w pradnicy - plaszczak u gory - Voltage:=1000.0 * tmp / ABS(Im) - else //charakterystyka pradnicy obcowzbudnej (elipsa) - twierdzenie Pitagorasa - begin - Voltage:=sqrt(ABS(sqr(DEList[MainCtrlPos].Umax)-sqr(DEList[MainCtrlPos].Umax*Im/DEList[MainCtrlPos].Imax)))*(MainCtrlPos-1)+ - (1-Im/DEList[MainCtrlPos].Imax)*DEList[MainCtrlPos].Umax*(MainCtrlPosNo-MainCtrlPos); - Voltage:=Voltage/(MainCtrlPosNo-1); - Voltage:=Min0R(Voltage,(1000.0 * tmp / ABS(Im))); - if Voltage<(Im*0.05) then Voltage:=Im*0.05; - end; - if (Voltage > DEList[MainCtrlPos].Umax) or (Im = 0) then //gdy wychodzi za duze napiecie - Voltage:=DEList[MainCtrlPos].Umax * byte(ConverterFlag); //albo przy biegu jalowym (jest cos takiego?) - - EnginePower:=Voltage * Im / 1000.0; - - if (tmpV>2) and (EnginePower1) and (Im>Imax) then FuseOff; - if FuseFlag then Voltage:=0; - - //przekazniki bocznikowania, kazdy inny dla kazdej pozycji - if (MainCtrlPos = 0) or (ShuntMode) then - ScndCtrlPos:=0 - else if AutoRelayFlag then - case RelayType of - 0: begin - if (Im <= (MPTRelay[ScndCtrlPos].Iup*PosRatio)) and (ScndCtrlPos= (MPTRelay[ScndCtrlPos].Idown*PosRatio)) and (ScndCtrlPos>0) then - dec(ScndCtrlPos); - end; - 1: begin - if (MPTRelay[ScndCtrlPos].IupVel) and (ScndCtrlPos>0) then - dec(ScndCtrlPos); - end; - 2: begin - if (MPTRelay[ScndCtrlPos].Iup0) then - dec(ScndCtrlPos); - end; - 41: - begin - if (MainCtrlPos=MainCtrlPosNo) and (tmpV*3.6>MPTRelay[ScndCtrlPos].Iup) and (ScndCtrlPosMPTRelay[ScndCtrlPos].Idown)and (ScndCtrlPos>0) then - dec(ScndCtrlPos); - end; - 45: - begin - //wzrastanie - if (MainCtrlPos>11) and (ScndCtrlPosIm) then - inc(ScndCtrlPos) - else - else - if (MPTRelay[ScndCtrlPos].Iup0)and(MainCtrlPos<12)then - if (ScndCtrlPos=ScndCtrlPosNo)then - if (MPTRelay[ScndCtrlPos].IdownVel)then - dec(ScndCtrlPos); - if (MainCtrlPos<11)and(ScndCtrlPos>2) then ScndCtrlPos:=2; - if (MainCtrlPos<9)and(ScndCtrlPos>0) then ScndCtrlPos:=0; - end; - 46: - begin - //wzrastanie - if (MainCtrlPos>9) and (ScndCtrlPosIm) then - inc(ScndCtrlPos) - else - else - if (MPTRelay[ScndCtrlPos-1].Iup>Im) and (MPTRelay[ScndCtrlPos].Iup0)then - if (ScndCtrlPos) mod 2 = 0 then - if (MPTRelay[ScndCtrlPos].IdownVel)then - dec(ScndCtrlPos); - if (MainCtrlPos<9)and(ScndCtrlPos>2) then ScndCtrlPos:=2; - if (MainCtrlPos<6)and(ScndCtrlPos>0) then ScndCtrlPos:=0; - end; - end; - end; - ElectricInductionMotor: - begin - if (Mains) then //nie wchodzi w funkcj bez potrzeby - if (Abs(Voltage)EnginePowerSource.CollectorParameters.MaxV+200) then - begin - MainSwitch(false); - end; - tmpV:=abs(nrot)*(Pi*WheelDiameter)*3.6;//*DirAbsolute*eimc[eimc_s_p]; - do przemyslenia dzialanie pp - if (MainS) then - begin - - dtrans:=(Hamulec as TLSt).GetEDBCP; - if ((DoorLeftOpened)or(DoorRightOpened)) then - DynamicBrakeFlag:=true - else if ((dtrans<0.25) and (LocHandle.GetCP<0.25) and (AnPos<0.01)) or ((dtrans<0.25) and (ShuntModeAllow) and (LocalBrakePos=0)) then - DynamicBrakeFlag:=false - else if (((BrakePress>0.25) and (dtrans>0.25) or (LocHandle.GetCP>0.25))) or (AnPos>0.02) then - DynamicBrakeFlag:=true; - dtrans:=(Hamulec as TLSt).GetEDBCP*eimc[eimc_p_abed]; //stala napedu - if(DynamicBrakeFlag)then - begin - if eimv[eimv_Fmax]*sign(V)*DirAbsolute<-1 then - begin - PosRatio:=-sign(V)*DirAbsolute*eimv[eimv_Fr]/(eimc[eimc_p_Fh]*Max0R(dtrans/MaxBrakePress[0],AnPos){dizel_fill}); - end - else - PosRatio:=0; - PosRatio:=round(20*Posratio)/20; - if PosRatio<19.5/20 then PosRatio:=PosRatio*0.9; -// if PosRatio<0 then -// PosRatio:=2+PosRatio-2; - (Hamulec as TLSt).SetED(Max0R(0.0,Min0R(PosRatio,1))); -// (Hamulec as TLSt).SetLBP(LocBrakePress*(1-PosRatio)); - PosRatio:=-Max0R(Min0R(dtrans/MaxBrakePress[0],1),AnPos)*Max0R(0,Min0R(1,(Vel-eimc[eimc_p_Vh0])/(eimc[eimc_p_Vh1]-eimc[eimc_p_Vh0]))); - eimv[eimv_Fzad]:=-Max0R(LocalBrakeRatio,dtrans/MaxBrakePress[0]); - tmp:=5; - end - else - begin - PosRatio:=(MainCtrlPos/MainCtrlPosNo); - eimv[eimv_Fzad]:=PosRatio; - if(Flat)and(eimc[eimc_p_F0]*eimv[eimv_Fful]>0)then - PosRatio:=Min0R(PosRatio*eimc[eimc_p_F0]/eimv[eimv_Fful],1); - if ScndCtrlActualPos>0 then - if (Vmax<250) then - PosRatio:=Min0R(PosRatio,Max0R(-1,0.5*(ScndCtrlActualPos-Vel))) - else - PosRatio:=Min0R(PosRatio,Max0R(-1,0.5*(ScndCtrlActualPos*2-Vel))); - PosRatio:=1.0*(PosRatio*0+1)*PosRatio; - (Hamulec as TLSt).SetED(0); -// (Hamulec as TLSt).SetLBP(LocBrakePress); - if (PosRatio>dizel_fill) then tmp:=1 else tmp:=4; //szybkie malenie, powolne wzrastanie - end; -// if SlippingWheels then begin PosRatio:=0; tmp:=10; SandDoseOn; end;//przeciwposlizg - -// if(Flat)then //PRZECIWPOLIZG - dmoment:=eimv[eimv_Fful]; -// else -// dmoment:=eimc[eimc_p_F0]*0.99; - if (abs((PosRatio+9.66*dizel_fill)*dmoment*100)>0.95*Adhesive(RunningTrack.friction)*TotalMassxg) then begin PosRatio:=0; tmp:=4; SandDoseOn; end;//przeciwposlizg - if (abs((PosRatio+9.80*dizel_fill)*dmoment*100)>0.95*Adhesive(RunningTrack.friction)*TotalMassxg) then begin PosRatio:=0; tmp:=9; SandDoseOn; end;//przeciwposlizg - if (SlippingWheels) then begin PosRatio:=-PosRatio*0; tmp:=9; SandDoseOn; end;//przeciwposlizg - - dizel_fill:=dizel_fill+Max0R(Min0R(PosRatio-dizel_fill,0.1),-0.1)*2*(tmp{2{+4*byte(PosRatio=0) then - Vadd:=Vadd*(1-2*dt) - else if (Voltage1) or (abs(tmpV)>0.1))and(RlistSize>0) then - begin - i:=0; - while (i0 then - NBrakeAxles:=NPoweredAxles - else - NBrakeAxles:=NAxles; - case LocalBrake of - NoBrake : K:=0; - ManualBrake : K:=MaxBrakeForce*ManualBrakeRatio; - HydraulicBrake : K:=MaxBrakeForce*LocalBrakeRatio; - PneumaticBrake:if CompressorNtotal)then //histereza na nacisku klockow - Ntotal:=u*BrakeRigEff - else - begin - u:=(BrakePress*P2FTrans)*BrakeCylMult[0]-BrakeSlckAdj; - if (u*(2-1*BrakeRigEff)0) then - begin - if Ntotal>0 then {nie luz} - K:=K+Ntotal; {w kN} - K:=K*BrakeCylNo/(NBrakeAxles*NBpA); {w kN na os} - end; - if (BrakeSystem=Pneumatic)or(BrakeSystem=ElectroPneumatic) then - begin - u:=Hamulec.GetFC(Vel, K); - UnitBrakeForce:=u*K*1000; {sila na jeden klocek w N} - end - else - UnitBrakeForce:=K*1000; - if (NBpA*UnitBrakeForce>TotalMassxg*Adhesive(RunningTrack.friction)/NAxles) and (Abs(V)>0.001) then - {poslizg} - begin -{ Fb:=Adhesive(Track.friction)*Mass*g; } - SlippingWheels:=true; - end; -{ else - begin -{ SlippingWheels:=false;} -// if (LocalBrake=ManualBrake)or(MBrake=true)) and (BrakePress<0.3) then -// Fb:=UnitBrakeForce*NBpA {ham. reczny dziala na jedna os} -// else //yB: to nie do konca ma sens, poniewa rczny w wagonie dziaa na jeden cylinder hamulcowy/wzek, dlatego potrzebne s oddzielnie liczone osie - Fb:=UnitBrakeForce*NBrakeAxles*Max0R(1,NBpA); - -// u:=((BrakePress*P2FTrans)-BrakeCylSpring*BrakeCylMult[BCMFlag]/BrakeCylNo-0.83*BrakeSlckAdj/(BrakeCylNo))*BrakeCylNo; - { end; } - BrakeForce:=Fb; -end; - -function T_MoverParameters.CouplerForce(CouplerN:byte;dt:real):real; -//wyliczenie siy na sprzgu -var tempdist,newdist,distDelta,CF,dV,absdv,Fmax,BetaAvg:real; CNext:byte; -const MaxDist=405.0; {ustawione + 5 m, bo skanujemy do 400 m } - MinDist=0.5; {ustawione +.5 m, zeby nie rozlaczac przy malych odleglosciach} - MaxCount=1500; -begin - CF:=0; - //distDelta:=0; //Ra: value never used - CNext:=Couplers[CouplerN].ConnectedNr; -{ if Couplers[CouplerN].CForce=0 then {nie bylo uzgadniane wiec policz} - with Couplers[CouplerN] do - begin - CheckCollision:=false; - newdist:=CoupleDist; //odlego od sprzgu ssiada - //newdist:=Distance(Loc,Connected^.Loc,Dim,Connected^.Dim); - if (CouplerN=0) then - begin - //ABu: bylo newdist+10*((... - tempdist:=((Connected.dMoveLen*DirPatch(0,ConnectedNr))-dMoveLen); - newdist:=newdist+10.0*tempdist; - //tempdist:=tempdist+CoupleDist; //ABu: proby szybkiego naprawienia bledu - end - else - begin - //ABu: bylo newdist+10*((... - tempdist:=((dMoveLen-(Connected.dMoveLen*DirPatch(1,ConnectedNr)))); - newdist:=newdist+10.0*tempdist; - //tempdist:=tempdist+CoupleDist; //ABu: proby szybkiego naprawienia bledu - end; - - //blablabla - //ABu: proby znalezienia problemu ze zle odbijajacymi sie skladami - //***if (Couplers[CouplerN].CouplingFlag=ctrain_virtual) and (newdist>0) then - if (Couplers[CouplerN].CouplingFlag=ctrain_virtual) and (CoupleDist>0) then - begin - CF:=0; {kontrola zderzania sie - OK} - inc(ScanCounter); - if (newdist>MaxDist) or ((ScanCounter>MaxCount)and(newdist>MinDist)) then - //***if (tempdist>MaxDist) or ((ScanCounter>MaxCount)and(tempdist>MinDist)) then - begin {zerwij kontrolnie wirtualny sprzeg} - //Connected.Couplers[CNext].Connected:=nil; //Ra: ten podczony niekoniecznie jest wirtualny - Connected:=nil; - ScanCounter:=Random(500); - end; - end - else - begin - if CouplingFlag=ctrain_virtual then - begin - BetaAvg:=beta; - Fmax:=(FmaxC+FmaxB)*CouplerTune; - end - else {usrednij bo wspolny sprzeg} - begin - BetaAvg:=(beta+Connected.Couplers[CNext].beta)/2.0; - Fmax:=(FmaxC+FmaxB+Connected.Couplers[CNext].FmaxC+Connected.Couplers[CNext].FmaxB)*CouplerTune/2.0; - end; - dV:=V-DirPatch(CouplerN,CNext)*Connected.V; - absdv:=abs(dV); - if (newdist<-0.001) and (Dist>=-0.001) and (absdv>0.010) then {090503: dzwieki pracy zderzakow} - begin - if SetFlag(SoundFlag,sound_bufferclamp) then - if absdV>0.5 then - SetFlag(SoundFlag,sound_loud); - end - else - if (newdist>0.002) and (Dist<=0.002) and (absdv>0.005) then {090503: dzwieki pracy sprzegu} - begin - if CouplingFlag>0 then - if SetFlag(SoundFlag,sound_couplerstretch) then - if absdV>0.1 then - SetFlag(SoundFlag,sound_loud); - end; - distDelta:=abs(newdist)-abs(Dist); //McZapkie-191103: poprawka na histereze - Dist:=newdist; - if Dist>0 then - begin - if distDelta>0 then - CF:=(-(SpringKC+Connected.Couplers[CNext].SpringKC)*Dist/2.0)*DirF(CouplerN)-Fmax*dV*betaAvg - else - CF:=(-(SpringKC+Connected.Couplers[CNext].SpringKC)*Dist/2.0)*DirF(CouplerN)*betaAvg-Fmax*dV*betaAvg; - {liczenie sily ze sprezystosci sprzegu} - if Dist>(DmaxC+Connected.Couplers[CNext].DmaxC) then {zderzenie} - //***if tempdist>(DmaxC+Connected^.Couplers[CNext].DmaxC) then {zderzenie} - CheckCollision:=true; - end; - if Dist<0 then - begin - if distDelta>0 then - CF:=(-(SpringKB+Connected.Couplers[CNext].SpringKB)*Dist/2.0)*DirF(CouplerN)-Fmax*dV*betaAvg - else - CF:=(-(SpringKB+Connected.Couplers[CNext].SpringKB)*Dist/2.0)*DirF(CouplerN)*betaAvg-Fmax*dV*betaAvg; - {liczenie sily ze sprezystosci zderzaka} - if -Dist>(DmaxB+Connected.Couplers[CNext].DmaxB) then {zderzenie} - //***if -tempdist>(DmaxB+Connected^.Couplers[CNext].DmaxB)/10 then {zderzenie} - begin - CheckCollision:=true; - if (CouplerType=Automatic) and (CouplingFlag=0) then {sprzeganie wagonow z samoczynnymi sprzegami} - //CouplingFlag:=ctrain_coupler+ctrain_pneumatic+ctrain_controll+ctrain_passenger+ctrain_scndpneumatic; - CouplingFlag:=ctrain_coupler+ctrain_pneumatic+ctrain_controll; //EN57 - end; - end; - end; - if (CouplingFlag<>ctrain_virtual) - then {uzgadnianie prawa Newtona} - Connected.Couplers[1-CouplerN].CForce:=-CF; - end; - CouplerForce:=CF; -end; - -procedure T_MoverParameters.CollisionDetect(CouplerN:byte; dt:real); -var CCF,Vprev,VprevC:real; VirtualCoupling:boolean; -begin - CCF:=0; - with Couplers[CouplerN] do - if (Connected<>nil) then - begin - VirtualCoupling:=(CouplingFlag=ctrain_virtual); - Vprev:=V; - VprevC:=Connected.V; - case CouplerN of - 0 : CCF:=ComputeCollision(V,Connected.V,TotalMass,Connected.TotalMass,(beta+Connected.Couplers[ConnectedNr].beta)/2.0,VirtualCoupling)/(dt{+0.01}); //yB: ej ej ej, a po - 1 : CCF:=ComputeCollision(Connected.V,V,Connected.TotalMass,TotalMass,(beta+Connected.Couplers[ConnectedNr].beta)/2.0,VirtualCoupling)/(dt{+0.01}); //czemu tu jest +0.01?? - end; - AccS:=AccS+(V-Vprev)/dt; //korekta przyspieszenia o siy wynikajce ze zderze? - Connected.AccS:=Connected.AccS+(Connected.V-VprevC)/dt; - if (Dist>0) and (not VirtualCoupling) then - if FuzzyLogic(Abs(CCF),5*(FmaxC+1),p_coupldmg) then - begin {! zerwanie sprzegu} - if SetFlag(DamageFlag,dtrain_coupling) then - EventFlag:=true; - if (Couplers[CouplerN].CouplingFlag and ctrain_pneumatic>0) then - EmergencyBrakeFlag:=true; {hamowanie nagle - zerwanie przewodow hamulcowych} - CouplingFlag:=0; - case CouplerN of {wyzerowanie flag podlaczenia ale ciagle sa wirtualnie polaczone} - 0 : Connected.Couplers[1].CouplingFlag:=0; - 1 : Connected.Couplers[0].CouplingFlag:=0; - end - end ; - end; -end; - -procedure T_MoverParameters.ComputeConstans; -var BearingF,RollF,HideModifier: real; - Curvature: real; //Ra 2014-07: odwrotno promienia -begin - TotalCurrent:=0; //Ra 2014-04: tu zerowanie, aby EZT mogo pobiera prd innemu czonowi - TotalMass:=ComputeMass; - TotalMassxg:=TotalMass*g; {TotalMass*g} - BearingF:=2*(DamageFlag and dtrain_bearing); - - HideModifier:=0;//Byte(Couplers[0].CouplingFlag>0)+Byte(Couplers[1].CouplingFlag>0); - with Dim do - begin - if BearingType=0 then - RollF:=0.05 {slizgowe} - else - RollF:=0.015; {toczne} - RollF:=RollF+BearingF/200.0; - -(* if NPoweredAxles>0 then - RollF:=RollF*1.5; {dodatkowe lozyska silnikow}*) - if (NPoweredAxles>0) then //drobna optymalka - begin - RollF:=RollF+0.025; -{ if(Ft*Ft<1)then - HideModifier:=HideModifier-3; } - end; - Ff:=TotalMassxg*(BearingF+RollF*V*V/10.0)/1000.0; - {dorobic liczenie temperatury lozyska!} - FrictConst1:=((TotalMassxg*RollF)/10000.0)+(Cx*W*H); - Curvature:=abs(RunningShape.R); //zero oznacza nieskoczony promie - if (Curvature>0.0) then Curvature:=1.0/Curvature; - //opr skadu na uku (youBy): +(500*TrackW/R)*TotalMassxg*0.001 do FrictConst2s/d - FrictConst2s:= (TotalMassxg*((500.0*TrackW*Curvature)+ 2.5 - HideModifier + 2*BearingF/dtrain_bearing))*0.001; - FrictConst2d:= (TotalMassxg*((500.0*TrackW*Curvature)+ 2.0 - HideModifier + BearingF/dtrain_bearing))*0.001; - end; -end; - -(* poprawione opory ruchu czekajace na lepsze cx w chk -procedure T_MoverParameters.ComputeConstans2(R:real); -var BearingF,RollF,HideModifier: real; -begin - TotalMass:=ComputeMass; - TotalMassxg:=TotalMass*g; {TotalMass*g} - BearingF:=2*(DamageFlag and dtrain_bearing); - - HideModifier:=Byte(Couplers[0].CouplingFlag>0)+Byte(Couplers[1].CouplingFlag>0); - with Dim do - begin - if BearingType=0 then - RollF:=10 {slizgowe} - else - RollF:=8; {toczne} - if NPoweredAxles>0 then - RollF:=RollF+2; {dodatkowe lozyska silnikow} - - RollF:=RollF+BearingF/100.0; //stala do ustalenia - - {dorobic liczenie temperatury lozyska!} - //stale do wzoru CNTK - FrictConst1:=(Cx*W*H)*(6.0-2.5*HideModifier)/100; //dwa czola, kazde ma +2.5 (lokomotywa i wagon) //V2 - FrictConst2s:=Totalmass*0.001*0.15; //V1 - if(R0.01) then - FrictionForce:=(FrictConst1*V*V)+FrictConst2d - else - FrictionForce:=(FrictConst1*V*V)+FrictConst2s; -end; - -(* poprawione opory ruchu czekajace na lepsze cx w chk -function T_MoverParameters.FrictionForce2(R:real;TDamage:byte):real; -begin -//ABu 240205: chyba juz ekstremalnie zoptymalizowana funkcja liczaca sily tarcia - FrictionForce2:=(FrictConst1*Vel*Vel)+(FrictConst2s*Vel)+FrictConst2d; -end; *) - -function T_MoverParameters.AddPulseForce(Multipler:integer): boolean; {dla drezyny} -begin - if (EngineType=WheelsDriven) and (EnginePowerSource.SourceType=InternalSource) and (EnginePowerSource.PowerType=BioPower) then - begin - ActiveDir:=CabNo; - DirAbsolute:=ActiveDir*CabNo; - if Vel>0 then - PulseForce:=Min0R(1000.0*Power/(Abs(V)+0.1),Ftmax) - else PulseForce:=Ftmax; - if PulseForceCount>1000.0 then - PulseForce:=0 - else - PulseForce:=PulseForce*Multipler; - PulseForceCount:=PulseForceCount+Abs(Multipler); - AddPulseForce:=(PulseForce>0); - end - else AddPulseForce:=false; -end; - - -function T_MoverParameters.LoadingDone(LSpeed:real; LoadInit:string): boolean; -//test zakoczenia zaadunku/rozadunku -var LoadChange:longint; -begin - ClearPendingExceptions; //zabezpieczenie dla Trunc() - //LoadingDone:=false; //nie zakoczone - if (LoadInit<>'') then //nazwa adunku niepusta - begin - if Load>MaxLoad then - LoadChange:=Abs(Trunc(LSpeed*LastLoadChangeTime/2.0)) //przeadowanie? - else - LoadChange:=Abs(Trunc(LSpeed*LastLoadChangeTime)); - if LSpeed<0 then //gdy rozadunek - begin - LoadStatus:=2; //trwa rozadunek (wczenie naliczania czasu) - if LoadChange<>0 then //jeli co przeadowano - begin - LastLoadChangeTime:=0; //naliczony czas zosta zuyty - Load:=Load-LoadChange; //zmniejszenie iloci adunku - CommandIn.Value1:=CommandIn.Value1-LoadChange; //zmniejszenie iloci do rozadowania - if Load<0 then - Load:=0; //adunek nie moe by ujemny - if (Load=0) or (CommandIn.Value1<0) then //pusto lub rozadowano dan ilo - LoadStatus:=4; //skoczony rozadunek - if Load=0 then LoadType:=''; //jak nic nie ma, to nie ma te nazwy - end - end - else if LSpeed>0 then //gdy zaadunek - begin - LoadStatus:=1; //trwa zaadunek (wczenie naliczania czasu) - if LoadChange<>0 then //jeli co przeadowano - begin - LastLoadChangeTime:=0; //naliczony czas zosta zuyty - LoadType:=LoadInit; //nazwa - Load:=Load+LoadChange; //zwikszenie adunku - CommandIn.Value1:=CommandIn.Value1-LoadChange; - if (Load>=MaxLoad*(1+OverLoadFactor)) or (CommandIn.Value1<0) then - LoadStatus:=4; //skoczony zaadunek - end - end - else LoadStatus:=4; //zerowa prdko zmiany, to koniec - end; - LoadingDone:=(LoadStatus>=4); -end; - -{-------------------------------------------------------------------} -{WAZNA FUNKCJA - oblicza si wypadkow} -procedure T_MoverParameters.ComputeTotalForce(dt: real; dt1: real; FullVer: boolean); -var b: byte; -begin - if PhysicActivation then - begin - { EventFlag:=false; {jesli cos sie zlego wydarzy to ustawiane na true} - { SoundFlag:=0; {jesli ma byc jakis dzwiek to zapalany jet odpowiedni bit} - {to powinno byc zerowane na zewnatrz} - - //juz zoptymalizowane: - FStand:=FrictionForce(RunningShape.R,RunningTrack.DamageFlag); //sia oporw ruchu - Vel:=Abs(V)*3.6; //prdko w km/h - nrot:=V2n(); //przeliczenie prdkoci liniowej na obrotow - - if TestFlag(BrakeMethod,bp_MHS) and (PipePress<3.0) and (Vel>45) and TestFlag(BrakeDelayFlag,bdelay_M) then //ustawione na sztywno na 3 bar - FStand:=Fstand+{(RunningTrack.friction)*}TrackBrakeForce; //doliczenie hamowania hamulcem szynowym - //w charakterystykach jest warto siy hamowania zamiast nacisku -// if(FullVer=true) then -// begin //ABu: to dla optymalizacji, bo chyba te rzeczy wystarczy sprawdzac 1 raz na klatke? - LastSwitchingTime:=LastSwitchingTime+dt1; - if EngineType=ElectricSeriesMotor then - LastRelayTime:=LastRelayTime+dt1; -// end; - if Mains and {(Abs(CabNo)<2) and} (EngineType=ElectricSeriesMotor) then //potem ulepszyc! pantogtrafy! - begin //Ra 2014-03: uwzgldnienie kierunku jazdy w napiciu na silnikach, a powinien by zdefiniowany nawrotnik - if CabNo=0 then - Voltage:=RunningTraction.TractionVoltage*ActiveDir - else - Voltage:=RunningTraction.TractionVoltage*DirAbsolute; //ActiveDir*CabNo; - end {bo nie dzialalo} - else if (EngineType=ElectricInductionMotor) or (((Couplers[0].CouplingFlag and ctrain_power)=ctrain_power) or ((Couplers[1].CouplingFlag and ctrain_power)=ctrain_power)) then //potem ulepszyc! pantogtrafy! - Voltage:=Max0R(Max0R(RunningTraction.TractionVoltage,HVCouplers[0][1]),HVCouplers[1][1]) - else - Voltage:=0; - //end; - - if Power>0 then - FTrain:=TractionForce(dt) - else - FTrain:=0; - Fb:=BrakeForce(RunningTrack); - if Max0R(Abs(FTrain),Fb)>TotalMassxg*Adhesive(RunningTrack.friction) then {poslizg} - SlippingWheels:=true; - if SlippingWheels then - begin - { TrainForce:=TrainForce-Fb; } - nrot:=ComputeRotatingWheel((FTrain-Fb*Sign(V)-Fstand)/NAxles-Sign(nrot*Pi*WheelDiameter-V)*Adhesive(RunningTrack.friction)*TotalMass,dt,nrot); - FTrain:=sign(FTrain)*TotalMassxg*Adhesive(RunningTrack.friction); - Fb:=Min0R(Fb,TotalMassxg*Adhesive(RunningTrack.friction)); - end; - { else SlippingWheels:=false; } - { FStand:=0; } - for b:=0 to 1 do - if (Couplers[b].Connected<>nil) {and (Couplers[b].CouplerType<>Bare) and (Couplers[b].CouplerType<>Articulated)} then - begin //doliczenie si z innych pojazdw - Couplers[b].CForce:=CouplerForce(b,dt); - FTrain:=FTrain+Couplers[b].CForce - end - else Couplers[b].CForce:=0; - //FStand:=Fb+FrictionForce(RunningShape.R,RunningTrack.DamageFlag); - FStand:=Fb+FStand; - FTrain:=FTrain+TotalMassxg*RunningShape.dHtrack; //doliczenie skadowej stycznej grawitacji - {!niejawne przypisanie zmiennej!} - FTotal:=FTrain-Sign(V)*FStand; - end; - - {McZapkie-031103: sprawdzanie czy warto liczyc fizyke i inne updaty} - {ABu 300105: cos tu mieszalem , dziala teraz troche lepiej, wiec zostawiam - zakomentowalem PhysicActivationFlag bo cos nie dzialalo i fizyka byla - liczona zawsze.} - //if PhysicActivationFlag then - // begin - if (CabNo=0) and (Vel<0.0001) and (abs(AccS)<0.0001) and (TrainType<>dt_EZT) then - begin - if not PhysicActivation then - begin - if Couplers[0].Connected<>nil then - if (Couplers[0].Connected.Vel>0.0001) or (Abs(Couplers[0].Connected.AccS)>0.0001) then - Physic_ReActivation; - if Couplers[1].Connected<>nil then - if (Couplers[1].Connected.Vel>0.0001) or (Abs(Couplers[1].Connected.AccS)>0.0001) then - Physic_ReActivation; - end; - if LastSwitchingTime>5 then //10+Random(100) then - PhysicActivation:=false; {zeby nie brac pod uwage braku V po uruchomieniu programu} - end - else - PhysicActivation:=true; - // end; - -end; - -{------------------------------------------------------------} -{OBLICZENIE PRZEMIESZCZENIA} -function T_MoverParameters.ComputeMovement(dt:real; dt1:real; Shape:TTrackShape; var Track:TTrackParam; var ElectricTraction:TTractionParam; NewLoc:TLocation; var NewRot:TRotation):real; -var b:byte; - Vprev,AccSprev:real; -// Iheat:real; prad ogrzewania - hvc: real; -const Vepsilon=1e-5; Aepsilon=1e-3; //ASBSpeed=0.8; -begin - TotalCurrent:=0; - hvc:=Max0R(Max0R(PantFrontVolt,PantRearVolt),ElectricTraction.TractionVoltage*0.9); - for b:=0 to 1 do //przekazywanie napiec - if ((Couplers[b].CouplingFlag and ctrain_power) = ctrain_power)or(((Couplers[b].CouplingFlag and ctrain_heating) = ctrain_heating)and(Heating)) then - begin - HVCouplers[1-b][1]:=Max0R(Abs(hvc),Couplers[b].Connected.HVCouplers[Couplers[b].ConnectedNr][1]-HVCouplers[b][0]*0.02); - end - else - HVCouplers[1-b][1]:=Abs(hvc)-HVCouplers[b][0]*0.02;//Max0R(Abs(Voltage),0); -// end; - - hvc:=HVCouplers[0][1]+HVCouplers[1][1]; - - if (Abs(PantFrontVolt)+Abs(PantRearVolt)<1) and (hvc>1)then //bez napiecia, ale jest cos na sprzegach: - begin - for b:=0 to 1 do //przekazywanie pradow - if ((Couplers[b].CouplingFlag and ctrain_power) = ctrain_power)or(((Couplers[b].CouplingFlag and ctrain_heating) = ctrain_heating)and(Heating)) then //jesli spiety - begin - HVCouplers[b][0]:=Couplers[b].Connected.HVCouplers[1-Couplers[b].ConnectedNr][0]+Itot*HVCouplers[b][1]/hvc; //obcienie rozkladane stosownie do napiec - end - else //pierwszy pojazd - begin - HVCouplers[b][0]:=Itot*HVCouplers[b][1]/hvc; - end; - end - else - begin - if ((Couplers[0].CouplingFlag and ctrain_power) = ctrain_power)or(((Couplers[0].CouplingFlag and ctrain_heating) = ctrain_heating)and(Heating)) then - TotalCurrent:=TotalCurrent+Couplers[0].Connected.HVCouplers[1-Couplers[0].ConnectedNr][0]; - if ((Couplers[1].CouplingFlag and ctrain_power) = ctrain_power)or(((Couplers[1].CouplingFlag and ctrain_heating) = ctrain_heating)and(Heating)) then - TotalCurrent:=TotalCurrent+Couplers[1].Connected.HVCouplers[1-Couplers[1].ConnectedNr][0]; - HVCouplers[0][0]:=0; - HVCouplers[1][0]:=0; - end; - - ClearPendingExceptions; - if not TestFlag(DamageFlag,dtrain_out) then - begin //Ra: to przepisywanie tu jest bez sensu - RunningShape:=Shape; - RunningTrack:=Track; - RunningTraction:=ElectricTraction; - with ElectricTraction do - if not DynamicBrakeFlag then - RunningTraction.TractionVoltage:=TractionVoltage{-Abs(TractionResistivity*(Itot+HVCouplers[0][0]+HVCouplers[1][0]))} - else - RunningTraction.TractionVoltage:=TractionVoltage-Abs(TractionResistivity*Itot*0); //zasadniczo ED oporowe nie zmienia napicia w sieci - end; - if CategoryFlag=4 then - OffsetTrackV:=TotalMass/(Dim.L*Dim.W*1000.0) - else - if TestFlag(CategoryFlag,1) and TestFlag(RunningTrack.CategoryFlag,1) then - if TestFlag(DamageFlag,dtrain_out) then - begin - OffsetTrackV:=-0.2; OffsetTrackH:=sign(RunningShape.R)*0.2; - end; - Loc:=NewLoc; - Rot:=NewRot; - with NewRot do begin Rx:=0; Ry:=0; Rz:=0; end; - if dL=0 then {oblicz przesuniecie} - begin - Vprev:=V; - AccSprev:=AccS; - {dt:=ActualTime-LastUpdatedTime;} {przyrost czasu} - {przyspieszenie styczne} - AccS:=(FTotal/TotalMass+AccSprev)/2.0; //prawo Newtona ale z wygladzaniem (rednia z poprzednim) - - if TestFlag(DamageFlag,dtrain_out) then - AccS:=-Sign(V)*g*Random; - {przyspieszenie normalne} - if Abs(Shape.R)>0.01 then - AccN:=SQR(V)/Shape.R+g*Shape.dHrail/TrackW - else AccN:=g*Shape.dHrail/TrackW; - - {szarpanie} - if FuzzyLogic((10+Track.DamageFlag)*Mass*Vel/Vmax,500000,p_accn) then {Ra: czemu tu masa bez adunku?} - AccV:=sqrt((1+Track.DamageFlag)*random(Trunc(50*Mass/1000000.0))*Vel/(Vmax*(10+(Track.QualityFlag and 31)))) - else - AccV:=AccV/2.0; - if AccV>1.0 then - AccN:=AccN+(7-random(5))*(100.0+Track.DamageFlag/2.0)*AccV/2000.0; - - {wykolejanie na luku oraz z braku szyn} - if TestFlag(CategoryFlag,1) then - begin - if FuzzyLogic((AccN/g)*(1+0.1*(Track.DamageFlag and dtrack_freerail)),TrackW/Dim.H,1) - or TestFlag(Track.DamageFlag,dtrack_norail) then - if SetFlag(DamageFlag,dtrain_out) then - begin - EventFlag:=true; - MainS:=false; - RunningShape.R:=0; - if (TestFlag(Track.DamageFlag,dtrack_norail)) then - DerailReason:=1 //Ra: powd wykolejenia: brak szyn - else - DerailReason:=2; //Ra: powd wykolejenia: przewrcony na uku - end; - {wykolejanie na poszerzeniu toru} - if FuzzyLogic(Abs(Track.Width-TrackW),TrackW/10.0,1) then - if SetFlag(DamageFlag,dtrain_out) then - begin - EventFlag:=true; - MainS:=false; - RunningShape.R:=0; - DerailReason:=3; //Ra: powd wykolejenia: za szeroki tor - end; - end; - {wykolejanie wkutek niezgodnosci kategorii toru i pojazdu} - if not TestFlag(RunningTrack.CategoryFlag,CategoryFlag) then - if SetFlag(DamageFlag,dtrain_out) then - begin - EventFlag:=true; - MainS:=false; - DerailReason:=4; //Ra: powd wykolejenia: nieodpowiednia trajektoria - end; - - V:=V+(3*AccS-AccSprev)*dt/2.0; {przyrost predkosci} - - if TestFlag(DamageFlag,dtrain_out) then - if Vel<1 then - begin - V:=0; - AccS:=0; - end; - - if (V*Vprev<=0) and (Abs(FStand)>Abs(FTrain)) then {tlumienie predkosci przy hamowaniu} - begin {zahamowany} - V:=0; - //AccS:=0; //Ra 2014-03: ale sia grawitacji dziaa, wic nie moe by zerowe - end; - (* - else - if (Abs(V)0.01 then -// AccN:=SQR(V)/Shape.R+g*Shape.dHrail/TrackW -// else AccN:=g*Shape.dHrail/TrackW; - - {szarpanie} - if FuzzyLogic((10+Track.DamageFlag)*Mass*Vel/Vmax,500000,p_accn) then - AccV:=sqrt((1+Track.DamageFlag)*random(Trunc(50*Mass/1000000.0))*Vel/(Vmax*(10+(Track.QualityFlag and 31)))) - else - AccV:=AccV/2.0; - if AccV>1.0 then - AccN:=AccN+(7-random(5))*(100.0+Track.DamageFlag/2.0)*AccV/2000.0; - -// {wykolejanie na luku oraz z braku szyn} -// if TestFlag(CategoryFlag,1) then -// begin -// if FuzzyLogic((AccN/g)*(1+0.1*(Track.DamageFlag and dtrack_freerail)),TrackW/Dim.H,1) -// or TestFlag(Track.DamageFlag,dtrack_norail) then -// if SetFlag(DamageFlag,dtrain_out) then -// begin -// EventFlag:=true; -// MainS:=false; -// RunningShape.R:=0; -// end; -// {wykolejanie na poszerzeniu toru} -// if FuzzyLogic(Abs(Track.Width-TrackW),TrackW/10,1) then -// if SetFlag(DamageFlag,dtrain_out) then -// begin -// EventFlag:=true; -// MainS:=false; -// RunningShape.R:=0; -// end; -// end; -// {wykolejanie wkutek niezgodnosci kategorii toru i pojazdu} -// if not TestFlag(RunningTrack.CategoryFlag,CategoryFlag) then -// if SetFlag(DamageFlag,dtrain_out) then -// begin -// EventFlag:=true; -// MainS:=false; -// end; - - V:=V+(3.0*AccS-AccSprev)*dt/2.0; {przyrost predkosci} - - if TestFlag(DamageFlag,dtrain_out) then - if Vel<1 then - begin - V:=0; - AccS:=0; //Ra 2014-03: ale sia grawitacji dziaa, wic nie moe by zerowe - end; - - if (V*Vprev<=0) and (Abs(FStand)>Abs(FTrain)) then {tlumienie predkosci przy hamowaniu} - begin {zahamowany} - V:=0; - AccS:=0; - end; - dL:=(3*V-Vprev)*dt/2.0; {metoda Adamsa-Bashfortha} - {ale jesli jest kolizja (zas. zach. pedu) to...} - for b:=0 to 1 do - if Couplers[b].CheckCollision then - CollisionDetect(b,dt); {zmienia niejawnie AccS, V !!!} - end; {liczone dL, predkosc i przyspieszenie} - - {Ra: reszta przeniesiona do Mover.cpp} -end; {FastComputeMovement} - - - -function T_MoverParameters.ComputeMass: real; -var M:real; -begin - if Load>0 then - begin //zakadamy, e adunek jest pisany maymi literami - if LoadQuantity='tonns' then - M:=Load*1000 - else if (LoadType='passengers') then - M:=Load*80 - else if LoadType='luggage' then - M:=Load*100 - else if LoadType='cars' then - M:=Load*800 - else if LoadType='containers' then - M:=Load*8000 - else if LoadType='transformers' then - M:=Load*50000 - else - M:=Load*1000; - end - else - M:=0; - {Ra: na razie tak, ale nie wszdzie masy wirujce si wliczaj} - ComputeMass:=Mass+M+Mred; -end; - - - -{-----------------------------------------------------------------} -{funkcje wejscia/wyjscia} - -{przekazywanie komend i parametrow} - -function T_MoverParameters.SetInternalCommand(NewCommand:string; NewValue1,NewValue2:real):boolean; -begin - if (CommandIn.Command=Newcommand) and (commandIn.Value1=NewValue1) and (commandIn.Value2=NewValue2) then - SetInternalCommand:=false - else - with CommandIn do - begin - Command:=NewCommand; - Value1:=NewValue1; - Value2:=NewValue2; - SetInternalCommand:=true; - LastLoadChangeTime:=0; //zerowanie czasu (roz)adowania - end; -end; - -function T_MoverParameters.GetExternalCommand(var Command:string):real; -begin - Command:=CommandOut; - GetExternalCommand:=ValueOut; -end; - -function T_MoverParameters.DoorBlockedFlag:Boolean; -begin - //if (DoorBlocked=true) and (Vel<5.0) then - DoorBlockedFlag:=false; - if (DoorBlocked=true) and (Vel>=5.0) then - DoorBlockedFlag:=true -end; - -function T_MoverParameters.RunCommand(command:string; CValue1,CValue2:real):boolean; -//wysanie komendy otrzymanej z kierunku CValue2 (wzgldem sprzgw: 1=przod,-1=ty) -// Ra: Jest tu problem z rekurencj. Trzeba by oddzieli wykonywanie komend od mechanizmu -// ich propagacji w skadzie. Osobnym problemem moe by propagacja tylko w jedn stron. -// Jeli jaki czon jest wstawiony odwrotnie, to rwnie odwrotnie musi wykonywa -// komendy zwizane z kierunkami (PantFront, PantRear, DoorLeft, DoorRight). -// Komenda musi by zdefiniowana tutaj, a jeli si wywouje funkcj, to ona nie moe -// sama przesya do kolejnych pojazdw. Naley te si zastanowi, czy dla uzyskania -// jakiej zmiany (np. IncMainCtrl) lepiej wywoa funkcj, czy od razu wysa komend. -var OK:boolean; testload:string; -Begin -{$B+} {cholernie mi sie nie podoba ta dyrektywa!!!} - OK:=false; - ClearPendingExceptions(); - - {test komend sterowania ukrotnionego} - if command='MainCtrl' then - begin - if MainCtrlPosNo>=Trunc(CValue1) then - MainCtrlPos:=Trunc(CValue1); - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='ScndCtrl' then - begin - if (EngineType=ElectricInductionMotor) then - if (ScndCtrlPos=0) and (Trunc(CValue1)>0) then - if (Vmax<250) then - ScndCtrlActualPos:=Round(Vel+0.5) - else - ScndCtrlActualPos:=Round(Vel/2+0.5) - else if (Trunc(CValue1)=0) then - ScndCtrlActualPos:=0; - if ScndCtrlPosNo>=Trunc(CValue1) then - ScndCtrlPos:=Trunc(CValue1); - OK:=SendCtrlToNext(command,CValue1,CValue2); - end -(* else if command='BrakeCtrl' then - begin - if BrakeCtrlPosNo>=Trunc(CValue1) then - begin - BrakeCtrlPos:=Trunc(CValue1); - OK:=SendCtrlToNext(command,CValue1,CValue2); - end; - end *) - else if command='Brake' then //youBy - jak sie EP hamuje, to trza sygnal wyslac... - begin - Hamulec.SetEPS(CValue1); - //fBrakeCtrlPos:=BrakeCtrlPos; //to powinnno by w jednym miejscu, aktualnie w C++!!! - BrakePressureActual:=BrakePressureTable[BrakeCtrlPos]; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end //youby - odluzniacz hamulcow, przyda sie - else if command='BrakeReleaser' then - begin - OK:=BrakeReleaser(Round(CValue1)); //samo si przesya dalej - //OK:=SendCtrlToNext(command,CValue1,CValue2); //to robio kaskad 2^n - end - else if command='MainSwitch' then - begin - if CValue1=1 then - begin - Mains:=true; - if (EngineType=DieselEngine) and Mains then - dizel_enginestart:=true; - end - else Mains:=false; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='Direction' then - begin - ActiveDir:=Trunc(CValue1); - DirAbsolute:=ActiveDir*CabNo; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='CabActivisation' then - begin -// OK:=Power>0.01; - case Trunc(CValue1*CValue2) of //CValue2 ma zmieniany znak przy niezgodnoci sprzgw - 1 : CabNo:= 1; - -1 : CabNo:=-1; - else CabNo:=0; //gdy CValue1==0 - end; - DirAbsolute:=ActiveDir*CabNo; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='AutoRelaySwitch' then - begin - if (CValue1=1) and (AutoRelayType=2) then AutoRelayFlag:=true - else AutoRelayFlag:=false; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='FuseSwitch' then - begin - if ((EngineType=ElectricSeriesMotor)or(EngineType=DieselElectric)) and FuseFlag and (CValue1=1) and - (MainCtrlActualPos=0) and (ScndCtrlActualPos=0) and Mains then -{ if (EngineType=ElectricSeriesMotor) and (CValue1=1) and - (MainCtrlActualPos=0) and (ScndCtrlActualPos=0) and Mains then} - FuseFlag:=false; {wlaczenie ponowne obwodu} - // if ((EngineType=ElectricSeriesMotor)or(EngineType=DieselElectric)) and not FuseFlag and (CValue1=0) and Mains then - // FuseFlag:=true; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='ConverterSwitch' then {NBMX} - begin - if (CValue1=1) then ConverterAllow:=true - else if (CValue1=0) then ConverterAllow:=false; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='BatterySwitch' then {NBMX} - begin - if (CValue1=1) then Battery:=true - else if (CValue1=0) then Battery:=false; - if (Battery) and (ActiveCab<>0) {or (TrainType=dt_EZT)} then - SecuritySystem.Status:=SecuritySystem.Status or s_waiting //aktywacja czuwaka - else - SecuritySystem.Status:=0; //wyczenie czuwaka - OK:=SendCtrlToNext(command,CValue1,CValue2); - end -// else if command='EpFuseSwitch' then {NBMX} -// begin -// if (CValue1=1) then EpFuse:=true -// else if (CValue1=0) then EpFuse:=false; -// OK:=SendCtrlToNext(command,CValue1,CValue2); -// end - else if command='CompressorSwitch' then {NBMX} - begin - if (CValue1=1) then CompressorAllow:=true - else if (CValue1=0) then CompressorAllow:=false; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='DoorOpen' then {NBMX} - begin //Ra: uwzgldni trzeba jeszcze zgodno sprzgw - if (CValue2>0) then - begin //normalne ustawienie pojazdu - if (CValue1=1) OR (CValue1=3) then - DoorLeftOpened:=true; - if (CValue1=2) OR (CValue1=3) then - DoorRightOpened:=true; - end - else - begin //odwrotne ustawienie pojazdu - if (CValue1=2) OR (CValue1=3) then - DoorLeftOpened:=true; - if (CValue1=1) OR (CValue1=3) then - DoorRightOpened:=true; - end; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='DoorClose' then {NBMX} - begin //Ra: uwzgldni trzeba jeszcze zgodno sprzgw - if (CValue2>0) then - begin //normalne ustawienie pojazdu - if (CValue1=1) OR (CValue1=3) then - DoorLeftOpened:=false; - if (CValue1=2) OR (CValue1=3) then - DoorRightOpened:=false; - end - else - begin //odwrotne ustawienie pojazdu - if (CValue1=2) OR (CValue1=3) then - DoorLeftOpened:=false; - if (CValue1=1) OR (CValue1=3) then - DoorRightOpened:=false; - end; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='PantFront' then {Winger 160204} - begin //Ra: uwzgldni trzeba jeszcze zgodno sprzgw - //Czemu EZT ma by traktowane inaczej? Ukrotnienie ma, a czon moe by odwrcony - if (TrainType=dt_EZT) then - begin //'ezt' - if (CValue1=1) then - begin - PantFrontUp:=true; - PantFrontStart:=0; - end - else if (CValue1=0) then - begin - PantFrontUp:=false; - PantFrontStart:=1; - end; - end - else - begin //nie 'ezt' - odwrotne ustawienie pantografw: ^-.-^ zamiast ^-.^- - if (CValue1=1) then - if (TestFlag(Couplers[1].CouplingFlag,ctrain_controll)and(CValue2= 1)) - or(TestFlag(Couplers[0].CouplingFlag,ctrain_controll)and(CValue2=-1)) - then - begin - PantFrontUp:=true; - PantFrontStart:=0; - end - else - begin - PantRearUp:=true; - PantRearStart:=0; - end - else if (CValue1=0) then - if (TestFlag(Couplers[1].CouplingFlag,ctrain_controll)and(CValue2= 1)) - or(TestFlag(Couplers[0].CouplingFlag,ctrain_controll)and(CValue2=-1)) - then - begin - PantFrontUp:=false; - PantFrontStart:=1; - end - else - begin - PantRearUp:=false; - PantRearStart:=1; - end; - end; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='PantRear' then {Winger 160204, ABu 310105 i 030305} - begin //Ra: uwzgldni trzeba jeszcze zgodno sprzgw - if (TrainType=dt_EZT) then - begin {'ezt'} - if (CValue1=1) then - begin - PantRearUp:=true; - PantRearStart:=0; - end - else if (CValue1=0) then - begin - PantRearUp:=false; - PantRearStart:=1; - end; - end - else - begin {nie 'ezt'} - if (CValue1=1) then - {if ostatni polaczony sprz. sterowania} - if (TestFlag(Couplers[1].CouplingFlag,ctrain_controll)and(CValue2= 1)) - or(TestFlag(Couplers[0].CouplingFlag,ctrain_controll)and(CValue2=-1)) - then - begin - PantRearUp:=true; - PantRearStart:=0; - end - else - begin - PantFrontUp:=true; - PantFrontStart:=0; - end - else if (CValue1=0) then - if (TestFlag(Couplers[1].CouplingFlag,ctrain_controll)and(CValue2= 1)) - or(TestFlag(Couplers[0].CouplingFlag,ctrain_controll)and(CValue2=-1)) - then - begin - PantRearUp:=false; - PantRearStart:=1; - end - else - begin - PantFrontUp:=false; - PantFrontStart:=1; - end; - end; - OK:=SendCtrlToNext(command,CValue1,CValue2); - end - else if command='MaxCurrentSwitch' then - begin - OK:=MaxCurrentSwitch(CValue1=1); - end - else if command='MinCurrentSwitch' then - begin - OK:=MinCurrentSwitch(CValue1=1); - end -{test komend oddzialywujacych na tabor} - else if command='SetDamage' then - begin - if CValue2=1 then OK:=SetFlag(DamageFlag,Trunc(CValue1)); - if CValue2=-1 then OK:=SetFlag(DamageFlag,-Trunc(CValue1)); - end - else if command='Emergency_brake' then - begin - if EmergencyBrakeSwitch(Trunc(CValue1)=1) then //YB: czy to jest potrzebne? - OK:=true - else OK:=false; - end - else if command='BrakeDelay' then - begin - BrakeDelayFlag:=Trunc(CValue1); - OK:=true; - end - else if command='SandDoseOn' then - begin - if SandDoseOn then - OK:=true - else OK:=false; - end - else if command='CabSignal' then {SHP,Indusi} - begin //Ra: to powinno dziaa tylko w czonie obsadzonym - if {(TrainType=dt_EZT)or} (ActiveCab<>0) and (Battery) and TestFlag(SecuritySystem.SystemType,2) then //jeli kabina jest obsadzona (silnikowy w EZT?) - with SecuritySystem do - begin - VelocityAllowed:=Trunc(CValue1); - NextVelocityAllowed:=Trunc(CValue2); - SystemSoundSHPTimer:=0; //hunter-091012 - SetFlag(Status,s_active); - end; - //else OK:=false; - OK:=true; //true, gdy mona usun komend - end - {naladunek/rozladunek} - else if Pos('Load=',command)=1 then - begin - OK:=false; //bdzie powtarzane a si zaaduje - if (Vel=0) and (MaxLoad>0) and (Load0 then //nazwa jest obecna w CHK - OK:=LoadingDone(Min0R(CValue2,LoadSpeed),testload); //zmienia LoadStatus - end; - //if OK then LoadStatus:=0; //nie udalo sie w ogole albo juz skonczone - end - else if Pos('UnLoad=',command)=1 then - begin - OK:=false; //bdzie powtarzane a si rozaduje - if (Vel=0) and (Load>0) then //czy jest co rozladowac? - if Distance(Loc,CommandIn.Location,Dim,Dim)<10 then //ten peron - begin - testload:=DUE(command); //zgodno nazwy adunku z CHK - if LoadType=testload then {mozna to rozladowac} - OK:=LoadingDone(-Min0R(CValue2,LoadSpeed),testload); - end; - //if OK then LoadStatus:=0; - end; - RunCommand:=OK; //dla true komenda bdzie usunita, dla false wykonana ponownie -{$B-} -End; - -function T_MoverParameters.RunInternalCommand:boolean; -var OK:boolean; -begin - if CommandIn.Command<>'' then - begin - OK:=RunCommand(CommandIn.Command,CommandIn.Value1,CommandIn.Value2); - if OK then - with CommandIn do - begin - Command:=''; {kasowanie bo rozkaz wykonany} - Value1:=0; - Value2:=0; - Location.x:=0; Location.y:=0; Location.z:=0; - if not PhysicActivation then - Physic_ReActivation; - end; - end - else - OK:=false; - RunInternalCommand:=OK; -end; - -procedure T_MoverParameters.PutCommand(NewCommand:string; NewValue1,NewValue2:real; NewLocation:TLocation); -begin - CommandLast:=NewCommand; //zapamitanie komendy - with CommandIn do - begin - Command:=NewCommand; - Value1:=NewValue1; - Value2:=NewValue2; - Location:=NewLocation; - end; {czy uruchomic tu RunInternalCommand? nie wiem} -end; - -{dla samochodow - kolej nie wykuje} -function T_MoverParameters.ChangeOffsetH(DeltaOffset:real):boolean; -begin - if TestFlag(CategoryFlag,2) and TestFlag(RunningTrack.CategoryFlag,2) then - begin - OffsetTrackH:=OffsetTrackH+DeltaOffset; -// if abs(OffsetTrackH)>(RunningTrack.Width/1.95-TrackW/2.0) then - if abs(OffsetTrackH)>(0.5*(RunningTrack.Width-Dim.W)-0.05) then //Ra: moe p pojazdu od brzegu? - ChangeOffsetH:=false {kola na granicy drogi} - else - ChangeOffsetH:=true; - end - else ChangeOffsetH:=false; -end; - -{inicjalizacja} - -constructor T_MoverParameters.Init(//LocInitial:TLocation; RotInitial:TRotation; - VelInitial:real; TypeNameInit, NameInit: string; LoadInitial:longint; LoadTypeInitial: string; Cab:integer); - {predkosc pocz. w km/h, ilosc ladunku, typ ladunku, numer kabiny} -var b,k:integer; -begin - {inicjalizacja stalych} - dMoveLen:=0; - CategoryFlag:=1; - EngineType:=None; - for b:=0 to ResArraySize do - begin - RList[b].Relay:=0; - RList[b].R:=0; - RList[b].Bn:=0; - RList[b].Mn:=0; - RList[b].AutoSwitch:=false; - end; - WheelDiameter:=1.0; - BrakeCtrlPosNo:=0; - LightsPosNo:=0; - LightsDefPos:=1; - for k:=-1 to MainBrakeMaxPos do - with BrakePressureTable[k] do - begin - PipePressureVal:=0; - BrakePressureVal:=0; - FlowSpeedVal:=0; - end; - with BrakePressureTable[-2] do {pozycja odciecia} - begin - PipePressureVal:=-1; - BrakePressureVal:=-1; - FlowSpeedVal:=0; - end; - Transmision.Ratio:=1; - NBpA:=0; - DynamicBrakeType:=0; - ASBType:=0; - AutoRelayType:=0; - for b:=0 to 1 do //Ra: kto tu zrobi "for b:=1 to 2 do" ??? - with Couplers[b] do - begin - CouplerType:=NoCoupler; - SpringkB:=1; SpringkC:=1; - DmaxB:=0.1; FmaxB:=1000; - DmaxC:=0.1; FmaxC:=1000; - end; - Power:=0; - MaxLoad:=0; LoadAccepted:=''; - LoadSpeed:=0; UnLoadSpeed:=0; - HeatingPower:=0; LightPower:=0; - with HeatingPowerSource do - begin - MaxVoltage:=0; MaxCurrent:=0; IntR:=0.001; - SourceType:=NotDefined; PowerType:=NoPower; RPowerCable.PowerTrans:=NoPower; - end; - with AlterHeatPowerSource do - begin - MaxVoltage:=0; MaxCurrent:=0; IntR:=0.001; - SourceType:=NotDefined; PowerType:=NoPower; RPowerCable.PowerTrans:=NoPower; - end; - with LightPowerSource do - begin - MaxVoltage:=0; MaxCurrent:=0; IntR:=0.001; - SourceType:=NotDefined; PowerType:=NoPower; RPowerCable.PowerTrans:=NoPower; - end; - with AlterLightPowerSource do - begin - MaxVoltage:=0; MaxCurrent:=0; IntR:=0.001; - SourceType:=NotDefined; PowerType:=NoPower; RPowerCable.PowerTrans:=NoPower; - end; - TypeName:=TypeNameInit; - HighPipePress:=0; - LowPipePress:=0; - DeltaPipePress:=0; - BrakeCylNo:=0; - BrakeCylRadius:=0; - BrakeCylDist:=0; - for b:=0 to 3 do - BrakeCylMult[b]:=0; - VeselVolume:=0; - BrakeVolume:=0; - RapidMult:=1; - dizel_Mmax:=1; dizel_nMmax:=1; dizel_Mnmax:=2; dizel_nmax:=2; dizel_nominalfill:=0; - dizel_Mstand:=0; - dizel_nmax_cutoff:=0; - dizel_nmin:=0; - dizel_minVelfullengage:=0; - dizel_AIM:=1; - dizel_engageDia:=0.5; dizel_engageMaxForce:=6000; dizel_engagefriction:=0.5; - DoorOpenCtrl:=0; DoorCloseCtrl:=0; - DoorStayOpen:=0; - DoorClosureWarning:=false; - DoorOpenSpeed:=1; DoorCloseSpeed:=1; - DoorMaxShiftL:=0.5; DoorMaxShiftR:=0.5; - DoorOpenMethod:=2; - DepartureSignal:=false; - InsideConsist:=false; - CompressorPower:=1; - SmallCompressorPower:=0; - for b:=0 to 25 do - eimc[b]:=0; - eimc[eimc_p_eped]:=1.5; - StopBrakeDecc:=0; - - ScndInMain:=false; - - Vhyp:=1; - Vadd:=1; - PowerCorRatio:=1; - - {inicjalizacja zmiennych} - //Loc:=LocInitial; //Ra: to i tak trzeba potem przesun, po ustaleniu pozycji na torze (potrzebna dugo) - //Rot:=RotInitial; - for b:=0 to 1 do - with Couplers[b] do - begin - AllowedFlag:=3; //domylnie hak i hamulec, inne trzeba wczy jawnie w FIZ - CouplingFlag:=0; - Connected:=nil; - ConnectedNr:=0; //Ra: to nie ma znaczenia jak nie podczony - Render:=false; - CForce:=0; - Dist:=0; - CheckCollision:=false; - end; - ScanCounter:=0; - BrakeCtrlPos:=-2; //to nie ma znaczenia, konstruktor w Mover.cpp zmienia na -2 - BrakeDelayFlag:=0; - BrakeStatus:=b_off; - EmergencyBrakeFlag:=false; - MainCtrlPos:=0; - ScndCtrlPos:=0; - MainCtrlActualPos:=0; - ScndCtrlActualPos:=0; - LightsPos:=0; - Heating:=false; - Mains:=false; - ActiveDir:=0; //kierunek nie ustawiony - CabNo:=0; //sterowania nie ma, ustawiana przez CabActivization() - ActiveCab:=Cab; //obsada w podanej kabinie - DirAbsolute:=0; - SlippingWheels:=false; - SandDose:=false; - FuseFlag:=false; - ConvOvldFlag:=false; //hunter-251211 - StLinFlag:=false; - ResistorsFlag:=false; - Rventrot:=0; - enrot:=0; - nrot:=0; - Itot:=0; - EnginePower:=0; - BrakePress:=0; - Compressor:=0; - ConverterFlag:=false; - CompressorAllow:=false; - DoorLeftOpened:=false; - DoorRightOpened:=false; - battery:=false; - EpFuse:=true; - Signalling:=false; - Radio:=true; - DoorSignalling:=false; - UnBrake:=false; -//Winger 160204 - PantVolume:=0.48; //aby podniesione pantografy opady w krtkim czasie przy wyczonej sprarce - PantFrontUp:=false; - PantRearUp:=false; - PantFrontStart:=0; - PantRearStart:=0; - PantFrontSP:=true; - PantRearSP:=true; - DoubleTr:=1; - BrakeSlippingTimer:=0; - dpBrake:=0; dpPipe:=0; dpMainValve:=0; dpLocalValve:=0; - MBPM:=1; - DynamicBrakeFlag:=false; - BrakeSystem:=Individual; - BrakeSubsystem:=ss_None; - Ft:=0; Ff:=0; Fb:=0; - Ftotal:=0; FStand:=0; FTrain:=0; - AccS:=0; AccN:=0; AccV:=0; - EventFlag:=false; SoundFlag:=0; - Vel:=Abs(VelInitial); V:=VelInitial/3.6; - LastSwitchingTime:=0; - LastRelayTime:=0; - DistCounter:=0; - PulseForce:=0; - PulseForceTimer:=0; - PulseForceCount:=0; - eAngle:=1.5; - dizel_fill:=0; - dizel_engagestate:=0; - dizel_engage:=0; - dizel_automaticgearstatus:=0; - dizel_enginestart:=false; - dizel_engagedeltaomega:=0; - PhysicActivation:=true; - for b:=1 to 20 do - eimv[b]:=0; - - with RunningShape do - begin - R:=0; Len:=1; dHtrack:=0; dHrail:=0; - end; - RunningTrack.CategoryFlag:=CategoryFlag; - with RunningTrack do - begin - Width:=TrackW; friction:=Steel2Steel_friction; - QualityFlag:=20; - DamageFlag:=0; - Velmax:=100; {dla uzytku maszynisty w ai_driver} - end; - with RunningTraction do - begin - TractionVoltage:=0; - TractionFreq:=0; - TractionMaxCurrent:=0; - TractionResistivity:=1; - end; - OffsetTrackH:=0; OffsetTrackV:=0; - with CommandIn do - begin - Command:=''; - Value1:=0; Value2:=0; - Location.x:=0; Location.y:=0; Location.z:=0; - end; - - {czesciowo stale, czesciowo zmienne} - with SecuritySystem do - begin - SystemType:=0; - AwareDelay:=-1; SoundSignalDelay:=-1; EmergencyBrakeDelay:=-1; - Status:=0; - SystemTimer:=0; SystemBrakeCATimer:=0; SystemBrakeSHPTimer:=0; //hunter-091012 - VelocityAllowed:=-1; NextVelocityAllowed:=-1; - RadioStop:=false; //domylnie nie ma - AwareMinSpeed:=0.1*Vmax; - end; - //ABu 240105: - //CouplerNr[0]:=1; - //CouplerNr[1]:=0; - -{TO POTEM TU UAKTYWNIC A WYWALIC Z CHECKPARAM} -{ - if Pos(LoadTypeInitial,LoadAccepted)>0 then - begin -} - LoadType:=LoadTypeInitial; - Load:=LoadInitial; - LoadStatus:=0; - LastLoadChangeTime:=0; -{ - end - else Load:=0; - } - - Name:=NameInit; - DerailReason:=0; //Ra: powd wykolejenia - TotalCurrent:=0; - ShuntModeAllow:=false; - ShuntMode:=false; -end; - -function T_MoverParameters.EngineDescription(what:integer): string; {opis stanu lokomotywy} -var outstr: string; -begin - outstr:=''; - case what of - 0: begin - if DamageFlag=255 then - outstr:='Totally destroyed!' - else - begin - if TestFlag(DamageFlag,dtrain_thinwheel) then - if Power>0.1 then - outstr:='Thin wheel,' - else - outstr:='Load shifted,'; - if TestFlag(DamageFlag,dtrain_wheelwear) then - outstr:='Wheel wear,'; - if TestFlag(DamageFlag,dtrain_bearing) then - outstr:='Bearing damaged,'; - if TestFlag(DamageFlag,dtrain_coupling) then - outstr:='Coupler broken,'; - if TestFlag(DamageFlag,dtrain_loaddamage) then - if Power>0.1 then - outstr:='Ventilator damaged,' - else - outstr:='Load damaged,'; - if TestFlag(DamageFlag,dtrain_loaddestroyed) then - if Power>0.1 then - outstr:='Engine damaged,' - else - outstr:='Load destroyed!,'; - if TestFlag(DamageFlag,dtrain_axle) then - outstr:='Axle broken,'; - if TestFlag(DamageFlag,dtrain_out) then - outstr:='DERAILED!'; - if outstr='' then - outstr:='OK!'; - end; - end; - else outstr:='Invalid qualifier'; - end; - EngineDescription:=outstr; -end; - -function T_MoverParameters.CheckLocomotiveParameters(ReadyFlag:boolean;Dir:longint): boolean; -var //k:integer; - OK:boolean; - b:byte; - bcmsno: byte; - bcmss: byte; -const - DefBrakeTable:array[1..8]of Byte=(15,4,25,25,13,3,12,2); -begin - OK:=true; - AutoRelayFlag:=(AutoRelayType=1); - Sand:=SandCapacity; - if (Pos('o',AxleArangement)>0) and (EngineType=ElectricSeriesMotor) then - OK:=(RList[1].Bn*RList[1].Mn=NPoweredAxles); {test poprawnosci ilosci osi indywidualnie napedzanych} - if (Pos(LoadType,LoadAccepted)=0) and (LoadType<>'') then - begin - Load:=0; - OK:=false; - end; - if BrakeSystem=Individual then - if BrakeSubSystem<>ss_None then - OK:=false; {!} - - if(BrakeVVolume=0)and(MaxBrakePress[3]>0)and(BrakeSystem<>Individual)then - BrakeVVolume:=MaxBrakePress[3]/(5-MaxBrakePress[3])*(BrakeCylRadius*BrakeCylRadius*BrakeCylDist*BrakeCylNo*pi)*1000; - if BrakeVVolume=0 then BrakeVVolume:=0.01; - -// Hamulec.Free; -//(i_mbp, i_bcr, i_bcd, i_brc: real; i_bcn, i_BD, i_mat, i_ba, i_nbpa: byte) - -case BrakeValve of - W, K : begin - Hamulec := TWest.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA); - if(MBPM<2)then //jesli przystawka wazaca - (Hamulec as TWest).SetLP(0,MaxBrakePress[3],0) - else - (Hamulec as TWest).SetLP(Mass, MBPM, MaxBrakePress[1]); - end; - KE : begin - Hamulec := TKE.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA); - (Hamulec as TKE).SetRM(RapidMult); - if(MBPM<2)then //jesli przystawka wazaca - (Hamulec as TKE).SetLP(0,MaxBrakePress[3],0) - else - (Hamulec as TKE).SetLP(Mass, MBPM, MaxBrakePress[1]) - end; - NEst3, ESt3, ESt3AL2, ESt4: - begin - Hamulec := TNESt3.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA); - (Hamulec as TNEst3).SetSize(BrakeValveSize,BrakeValveParams); - if(MBPM<2)then //jesli przystawka wazaca - (Hamulec as TNESt3).SetLP(0,MaxBrakePress[3],0) - else - (Hamulec as TNESt3).SetLP(Mass, MBPM, MaxBrakePress[1]) - end; -{ ESt3, ESt3AL2: if (MaxBrakePress[1])>0 then - begin - Hamulec := TESt3AL2.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA); - if(MBPM<2)then - (Hamulec as TESt3AL2).SetLP(0,MaxBrakePress[3],0) - else - (Hamulec as TESt3AL2).SetLP(Mass, MBPM, MaxBrakePress[1]) - end - else - Hamulec := TESt3.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA);} - LSt :begin - Hamulec := TLSt.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA); - (Hamulec as TLSt).SetRM(RapidMult); - end; - EStED :begin - Hamulec := TEStED.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA); - (Hamulec as TEStED).SetRM(RapidMult); - if(MBPM<2)then //jesli przystawka wazaca - (Hamulec as TEStED).SetLP(0,MaxBrakePress[3],0) - else - (Hamulec as TEStED).SetLP(Mass, MBPM, MaxBrakePress[1]); - end; - EP2:begin - Hamulec :=TEStEP2.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA); - (Hamulec as TEStEP2).SetLP(Mass, MBPM, MaxBrakePress[1]); - end; -{ ESt4 :if (BrakeDelays and bdelay_R)=bdelay_R then - Hamulec:=TESt4R.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA) - else - Hamulec:= TESt.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA);} - CV1 : Hamulec:= TCV1.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA); - CV1_L_TR:Hamulec:= TCV1L_TR.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA) -else - Hamulec := TBrake.Create(MaxBrakePress[3], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA); -end; -Hamulec.SetASBP(MaxBrakePress[4]); - -case BrakeHandle of - FV4a: Handle := TFV4aM.Create; - MHZ_EN57: Handle := TMHZ_EN57.Create; - FVel6: Handle := TFVel6.Create; - testH: Handle := Ttest.Create; - M394: Handle := TM394.Create; - Knorr: Handle := TH14K1.Create; - St113: Handle := TSt113.Create; -else - Handle := THandle.Create; -end; - -case BrakeLocHandle of - FD1: - begin - LocHandle := TFD1.Create; - LocHandle.Init(MaxBrakePress[0]); - if(TrainType=dt_EZT)then - (LocHandle as TFD1).SetSpeed(3.5); - end; - Knorr: - begin - LocHandle := TH1405.Create; - LocHandle.Init(MaxBrakePress[0]); - end; -else - LocHandle := THandle.Create; -end; - -//ustalanie srednicy przewodu glownego (lokomotywa lub napdowy - if (TestFlag(BrakeDelays,bdelay_G))and((not TestFlag(BrakeDelays,bdelay_R)) or (Power>1))then - Spg:=0.792 - else - Spg:=0.507; - - Pipe:= TReservoir.Create; - Pipe2:= TReservoir.Create; //zabezpieczenie, bo sie PG wywala... :( - Pipe.CreateCap((Max0R(Dim.L,14)+0.5)*Spg*1); //dlugosc x przekroj x odejscia i takie tam - Pipe2.CreateCap((Max0R(Dim.L,14)+0.5)*Spg*1); - - if LightsPosNo>0 then LightsPos:=LightsDefPos; - -{to dac potem do init} - if ReadyFlag then {gotowy do drogi} - begin - CompressedVolume:=VeselVolume*MinCompressor*(9.8+Random)/10; - ScndPipePress:=CompressedVolume/VeselVolume; - PipePress:=CntrlPipePress; - BrakePress:=0; - LocalBrakePos:=0; -// if (BrakeSystem=Pneumatic) and (BrakeCtrlPosNo>0) then - if CabNo=0 then -// BrakeCtrlPos:=-2; //odcicie na zespolonym; Ra: hamulec jest poprawiany w DynObj.cpp - BrakeCtrlPos:=Trunc(Handle.GetPos(bh_NP)) - else - BrakeCtrlPos:=Trunc(Handle.GetPos(bh_RP)); - MainSwitch(false); - PantFront(true); - PantRear(true); - MainSwitch(true); - ActiveDir:=0; //Dir; //nastawnik kierunkowy - musi by ustawiane osobno! - DirAbsolute:=ActiveDir*CabNo; //kierunek jazdy wzgldem sprzgw - LimPipePress:=CntrlPipePress; - end - else - begin {zahamowany} - Volume:=BrakeVVolume*MaxBrakePress[3]; - CompressedVolume:=VeselVolume*MinCompressor*0.55; - ScndPipePress:=5.1; - PipePress:=LowPipePress; - PipeBrakePress:=MaxBrakePress[3]*0.5; - BrakePress:=MaxBrakePress[3]*0.5; - LocalBrakePos:=0; -// if (BrakeSystem=Pneumatic) and (BrakeCtrlPosNo>0) then -// BrakeCtrlPos:=-2; //Ra: hamulec jest poprawiany w DynObj.cpp - BrakeCtrlPos:=Trunc(Handle.GetPos(bh_NP)); - LimPipePress:=LowPipePress; - end; - ActFlowSpeed:=0; - BrakeCtrlPosR:=BrakeCtrlPos; - - if(BrakeLocHandle=Knorr)then - LocalBrakePos:=5; - - Pipe.CreatePress(PipePress); - Pipe2.CreatePress(ScndPipePress); - Pipe.Act;Pipe2.Act; - - EqvtPipePress:=PipePress; - -//// fv4ac:=Pipe.P; -//// fv4ar:=Pipe.P; - - Handle.Init(PipePress); - - ComputeConstans(); - - - if(LoadFlag>0)then - begin - if(Load=MaxLoad*0.45)then - begin - IncBrakeMult(); - if(Load>=MaxLoad*0.55)then - IncBrakeMult(); - end; - end; - -//taki mini automat - powinno byc ladnie dobrze :) - BrakeDelayFlag:=bdelay_P; - if(TestFlag(BrakeDelays,bdelay_G))and not(TestFlag(BrakeDelays,bdelay_R))then - BrakeDelayFlag:=bdelay_G; - if(TestFlag(BrakeDelays,bdelay_R))and not(TestFlag(BrakeDelays,bdelay_G))then - BrakeDelayFlag:=bdelay_R; - -//ustawianie PS/PN/EP/MED - BrakeOpModeFlag:=bom_PN; - if (BrakeOpModes and bom_PS)>0 then BrakeOpModeFlag:=bom_PS; -// if (BrakeOpModes and bom_EP)>0 then BrakeOpModeFlag:=bom_EP; -// if (BrakeOpModes and bom_MED)>0 then BrakeOpModeFlag:=bom_MED; -// -//yB: jesli pojazdy nie maja zadeklarowanych czasow, to wsadz z przepisow +-16,(6)% - for b:=1 to 4 do - begin - if BrakeDelay[b]=0 then - BrakeDelay[b]:=DefBrakeTable[b]; - BrakeDelay[b]:=BrakeDelay[b]*(2.5+Random)/3.0; - end; - - if(TrainType=dt_ET22)then - CompressorPower:=0; - -// Hamulec.Init(10*PipePress, 10*HighPipePress-0.15, 10*LowPipePress-0.15, 10*BrakePress, BrakeDelayFlag); - Hamulec.Init(PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag); -// Hamulec.Init(0, 0, -1.5, 0, BrakeDelayFlag); -// PipePress:=PipePress; - ScndPipePress:=Compressor; - CheckLocomotiveParameters:=OK; -end; - -function T_MoverParameters.DoorLeft(State: Boolean):Boolean; -begin - if (DoorLeftOpened<>State) and (DoorBlockedFlag=false) and (Battery=true) then - begin - DoorLeft:=true; - DoorLeftOpened:=State; - if (State=true) then - begin - if (CabNo>0) then - SendCtrlToNext('DoorOpen',1,CabNo) //1=lewe, 2=prawe - else - SendCtrlToNext('DoorOpen',2,CabNo); //zamiana - CompressedVolume:=CompressedVolume-0.003; - end - else - begin - if (CabNo>0) then - SendCtrlToNext('DoorClose',1,CabNo) - else - SendCtrlToNext('DoorClose',2,CabNo); - end; - end - else - DoorLeft:=false; -end; - -function T_MoverParameters.DoorRight(State: Boolean):Boolean; -begin - if (DoorRightOpened<>State) and (DoorBlockedFlag=false) and (Battery=true) then - begin - DoorRight:=true; - DoorRightOpened:=State; - if (State=true) then - begin - if (CabNo>0) then - SendCtrlToNext('DoorOpen',2,CabNo) //1=lewe, 2=prawe - else - SendCtrlToNext('DoorOpen',1,CabNo); //zamiana - CompressedVolume:=CompressedVolume-0.003; - end - else - begin - if (CabNo>0) then - SendCtrlToNext('DoorClose',2,CabNo) - else - SendCtrlToNext('DoorClose',1,CabNo); - end; - end - else - DoorRight:=false; -end; - -//Winger 160204 - pantografy -function T_MoverParameters.PantFront(State: Boolean):Boolean; -var pf1: Real; -begin -if (battery=true){ and ((TrainType<>dt_ET40)or ((TrainType=dt_ET40) and (EnginePowerSource.CollectorsNo>1)))}then -begin - PantFront:=true; - if (State=true) then pf1:=1 - else pf1:=0; - if (PantFrontUp<>State) then - begin - PantFrontUp:=State; - if (State=true) then - begin - PantFrontStart:=0; - SendCtrlToNext('PantFront',1,CabNo); - end - else - begin - PantFront:=false; - PantFrontStart:=1; - SendCtrlToNext('PantFront',0,CabNo); -{Ra: nie ma potrzeby opuszcza obydwu na raz, jak mozemy kady osobno - if (TrainType=dt_EZT) and (ActiveCab=1) then - begin - PantRearUp:=false; - PantRearStart:=1; - SendCtrlToNext('PantRear',0,CabNo); - end; -} - end; - end - else - SendCtrlToNext('PantFront',pf1,CabNo); -end -end; - -function T_MoverParameters.PantRear(State: Boolean):Boolean; -var pf1: Real; -begin -if battery=true then - begin - PantRear:=true; - if (State=true) then pf1:=1 - else pf1:=0; - if (PantRearUp<>State) then - begin - PantRearUp:=State; - if (State=true) then - begin - PantRearStart:=0; - SendCtrlToNext('PantRear',1,CabNo); - end - else - begin - PantRear:=false; - PantRearStart:=1; - SendCtrlToNext('PantRear',0,CabNo); - end; - end - else - SendCtrlToNext('PantRear',pf1,CabNo); - end -end; - - - -{function T_MoverParameters.Heating(State: Boolean):Boolean; -begin - if (Heating<>State) then - begin - Heating:=State; -{ if (State=true) then - begin -// SendCtrlToNext('PantRear',1,CabNo); - end - else - begin -// SendCtrlToNext('PantRear',0,CabNo); - end; } -{ end -{ else - SendCtrlToNext('PantRear',0,CabNo); } -{end;} - -function T_MoverParameters.LoadChkFile(chkpath:string):Boolean; -const param_ok=1; wheels_ok=2; dimensions_ok=4; -var - lines,s: string; - bl,i,k:integer; - b,OKflag:byte; - fin: text; - OK: boolean; -procedure BrakeValveDecode(s:string); -begin - if s='W' then - BrakeValve:=W - else if s='W_Lu_L' then - BrakeValve:=W_Lu_L - else if s='W_Lu_XR' then - BrakeValve:=W_Lu_XR - else if s='W_Lu_VI' then - BrakeValve:=W_Lu_VI - else if s='K' then - BrakeValve:=W - else if s='Kkg' then - BrakeValve:=Kkg - else if s='Kkp' then - BrakeValve:=Kkp - else if s='Kks' then - BrakeValve:=Kks - else if s='Hikp1' then - BrakeValve:=Hikp1 - else if s='Hikss' then - BrakeValve:=Hikss - else if s='Hikg1' then - BrakeValve:=Hikg1 - else if s='KE' then - BrakeValve:=KE - else if s='EStED' then - BrakeValve:=EStED - else if Pos('ESt',s)>0 then - BrakeValve:=ESt3 - else if s='LSt' then - BrakeValve:=LSt - else if s='EP2' then - BrakeValve:=EP2 - else if s='EP1' then - BrakeValve:=EP1 - else if s='CV1' then - BrakeValve:=CV1 - else if s='CV1_L_TR' then - BrakeValve:=CV1_L_TR - else - BrakeValve:=Other; -end; -procedure BrakeSubsystemDecode; -begin - case BrakeValve of - W,W_Lu_L,W_Lu_VI,W_Lu_XR: BrakeSubsystem:=ss_W; - ESt3,ESt3AL2,ESt4,EP2,EP1: BrakeSubsystem:=ss_ESt; - KE: BrakeSubsystem:=ss_KE; - CV1, CV1_L_TR: BrakeSubsystem:=ss_Dako; - LSt, EStED: BrakeSubsystem:=ss_LSt; - else - BrakeSubsystem:=ss_None; - end; -end; -function EngineDecode(s:string):TEngineTypes; - begin - if s='ElectricSeriesMotor' then - EngineDecode:=ElectricSeriesMotor - else if s='DieselEngine' then - EngineDecode:=DieselEngine - else if s='SteamEngine' then - EngineDecode:=SteamEngine - else if s='WheelsDriven' then - EngineDecode:=WheelsDriven - else if s='Dumb' then - EngineDecode:=Dumb - else if s='DieselElectric' then - EngineDecode:=DieselElectric //youBy: spal-ele - else if s='DumbDE' then - EngineDecode:=DieselElectric //youBy: spal-ele - else if s='ElectricInductionMotor' then - EngineDecode:=ElectricInductionMotor -{ else if s='EZT' then {dla kibla} - { EngineDecode:=EZT } - else EngineDecode:=None; - end; -function PowerSourceDecode(s:string):TPowerSource; - begin - if s='Transducer' then PowerSourceDecode:=Transducer - else if s='Generator' then PowerSourceDecode:=Generator - else if s='Accu' then PowerSourceDecode:=Accumulator - else if s='CurrentCollector' then PowerSourceDecode:=CurrentCollector - else if s='PowerCable' then PowerSourceDecode:=PowerCable - else if s='Heater' then PowerSourceDecode:=Heater - else if s='Internal' then PowerSourceDecode:=InternalSource - else PowerSourceDecode:=NotDefined; - end; -function PowerDecode(s:string): TPowerType; - begin - if s='BioPower' then PowerDecode:=BioPower - else if s='BioPower' then PowerDecode:=BioPower - else if s='MechPower' then PowerDecode:=MechPower - else if s='ElectricPower' then PowerDecode:=ElectricPower - else if s='SteamPower' then PowerDecode:=SteamPower - else PowerDecode:=NoPower; - end; - procedure PowerParamDecode(lines,prefix:string; var PowerParamDecode:TPowerParameters); - begin - with PowerParamDecode do - begin - case SourceType of - NotDefined : PowerType:=PowerDecode(DUE(ExtractKeyWord(lines,prefix+'PowerType='))); - InternalSource : PowerType:=PowerDecode(DUE(ExtractKeyWord(lines,prefix+'PowerType='))); - Transducer : InputVoltage:=s2rE(DUE(ExtractKeyWord(lines,prefix+'TransducerInputV='))); - Generator : GeneratorEngine:=EngineDecode(DUE(ExtractKeyWord(lines,prefix+'GeneratorEngine='))); - Accumulator: begin - RAccumulator.MaxCapacity:=s2r(DUE(ExtractKeyWord(lines,prefix+'Cap='))); - s:=DUE(ExtractKeyWord(lines,prefix+'RS=')); - RAccumulator.RechargeSource:=PowerSourceDecode(s); - end; - CurrentCollector: begin - with CollectorParameters do - begin - CollectorsNo:=s2lE(DUE(ExtractKeyWord(lines,'CollectorsNo='))); - MinH:=s2rE(DUE(ExtractKeyWord(lines,'MinH='))); - MaxH:=s2rE(DUE(ExtractKeyWord(lines,'MaxH='))); - CSW:=s2rE(DUE(ExtractKeyWord(lines,'CSW='))); //szeroko czci roboczej - MaxV:=s2rE(DUE(ExtractKeyWord(lines,'MaxVoltage='))); - s:=ExtractKeyWord(lines,'OverVoltProt='); //przekanik nadnapiciowy - if s='Yes' then - OVP:=1 - else - OVP:=0; - s:=ExtractKeyWord(lines,'MinV='); //napicie rozczajce WS - if s='' then - MinV:=0.5*MaxV //gdyby parametr nie podany - else - MinV:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'InsetV='); //napicie wymagane do zaczenia WS - if s='' then - InsetV:=0.6*MaxV //gdyby parametr nie podany - else - InsetV:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'MinPress='); //cinienie rozczajce WS - if s='' then - MinPress:=2.0 //domylnie 2 bary do zaczenia WS - else - MinPress:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'MaxPress='); //maksymalne cinienie za reduktorem - if s='' then - MaxPress:=5.0+0.001*(random(50)-random(50)) - else - MaxPress:=s2rE(DUE(s)); - end; - end; - PowerCable : begin - RPowerCable.PowerTrans:=PowerDecode(DUE(ExtractKeyWord(lines,prefix+'PowerTrans='))); - if RPowerCable.PowerTrans=SteamPower then - RPowerCable.SteamPressure:=s2r(DUE(ExtractKeyWord(lines,prefix+'SteamPress='))); - end; - Heater : begin - {jeszcze nie skonczone!} - end; - end; - if (SourceType<>Heater) and (SourceType<>InternalSource) then - if not ((SourceType=PowerCable) and (RPowerCable.PowerTrans=SteamPower)) then - begin -{ PowerTrans:=ElectricPower; } - MaxVoltage:=s2rE(DUE(ExtractKeyWord(lines,prefix+'MaxVoltage='))); - MaxCurrent:=s2r(DUE(ExtractKeyWord(lines,prefix+'MaxCurrent='))); - IntR:=s2r(DUE(ExtractKeyWord(lines,prefix+'IntR='))); - end; - end; - end; -begin - //OK:=true; - OKflag:=0; - LineCount:=0; - ConversionError:=666; - Mass:=0; - filename:=chkpath+TypeName+'.fiz';//'.chk'; - assignfile(fin,filename); -{$I-} - reset(fin); -{$I+} - if IOresult<>0 then - begin - OK:=false; - ConversionError:=-8; - end - else - begin - ConversionError:=0; - while not (eof(fin) or (ConversionError<>0)) do - begin - readln(fin,lines); - inc(LineCount); - if Pos('/',lines)=0 then {nie komentarz} - begin - if Pos('Param.',lines)>0 then {stale parametry} - begin - SetFlag(OKFlag,param_ok); - s:=DUE(ExtractKeyWord(lines,'Category=')); - if s='train' then - CategoryFlag:=1 - else if s='road' then - CategoryFlag:=2 - else if s='ship' then - CategoryFlag:=4 - else if s='airplane' then - CategoryFlag:=8 - else if s='unimog' then - CategoryFlag:=3 - else - ConversionError:=-7; - s:=ExtractKeyWord(lines,'M='); - Mass:=s2rE(DUE(s)); {w kg} - s:=ExtractKeyWord(lines,'Mred='); {zredukowane masy wirujce} - if s='' then - Mred:=0 - else - Mred:=s2rE(DUE(s)); {w kg} - s:=ExtractKeyWord(lines,'Vmax='); - Vmax:=s2rE(DUE(s)); {w km/h} - s:=ExtractKeyWord(lines,'PWR='); - Power:=s2r(DUE(s)); {w kW} - s:=ExtractKeyWord(lines,'HeatingP='); - HeatingPower:=s2r(DUE(s)); {w kW} - s:=ExtractKeyWord(lines,'LightP='); - LightPower:=s2r(DUE(s)); {w kW} - s:=ExtractKeyWord(lines,'SandCap='); - SandCapacity:=s2i(DUE(s)); {w kg} - TrainType:=dt_Default; - s:=Ups(DUE(ExtractKeyWord(lines,'Type='))); //wielkimi - if s='EZT' then - begin - TrainType:=dt_EZT; - IminLo:=1;IminHi:=2;Imin:=1; //wirtualne wartoci dla rozrzdczego - end - else if s='ET41' then TrainType:=dt_ET41 - else if s='ET42' then TrainType:=dt_ET42 - else if s='ET22' then TrainType:=dt_ET22 - else if s='ET40' then TrainType:=dt_ET40 - else if s='EP05' then TrainType:=dt_EP05 - else if s='SN61' then TrainType:=dt_SN61 - else if s='PSEUDODIESEL' then TrainType:=dt_PseudoDiesel - else if s='181' then TrainType:=dt_181 - else if s='182' then TrainType:=dt_181; {na razie tak} - end - else if Pos('Load:',lines)>0 then {stale parametry} - begin - LoadAccepted:=LowerCase(DUE(ExtractKeyWord(lines,'LoadAccepted='))); - if LoadAccepted<>'' then - begin - s:=ExtractKeyWord(lines,'MaxLoad='); - MaxLoad:=s2lE(DUE(s)); - LoadQuantity:=DUE(ExtractKeyWord(lines,'LoadQ=')); - s:=ExtractKeyWord(lines,'OverLoadFactor='); - OverLoadFactor:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'LoadSpeed='); - LoadSpeed:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'UnLoadSpeed='); - UnLoadSpeed:=s2rE(DUE(s)); - end; - end - else if Pos('Dimensions:',lines)>0 then {wymiary} - begin - with Dim do - begin - SetFlag(OKFlag,dimensions_ok); - s:=ExtractKeyWord(lines,'L='); - L:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'H='); - H:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'W='); - W:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'Cx='); - Cx:=s2r(DUE(s)); - if Cx=0 then Cx:=0.3; - s:=ExtractKeyWord(lines,'Floor='); - if s='' then - begin - if (H<=2.0) then - Floor:=H //gdyby nie byo parametru, lepsze to ni zero - else - Floor:=0.0; //zgodno wsteczna - end - else - Floor:=s2rE(DUE(s)); - end; - end - else if Pos('Wheels:',lines)>0 then {kola} - begin -{ SetFlag(OKFlag,wheels_ok);} - s:=ExtractKeyWord(lines,'D='); //rednica osi napdzajcych - WheelDiameter:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'Dl='); //rednica przednich osi tocznych - if s='' then - WheelDiameterL:=WheelDiameter //gdyby nie byo parametru, lepsze to ni zero - else - WheelDiameterL:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'Dt='); //rednica tylnych osi tocznych - if s='' then - WheelDiameterT:=WheelDiameter //gdyby nie byo parametru, lepsze to ni zero - else - WheelDiameterT:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'Tw='); - TrackW:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'AIM='); - AxleInertialMoment:=s2r(DUE(s)); - if AxleInertialMoment<=0 then AxleInertialMoment:=1; - AxleArangement:=DUE(ExtractKeyWord(lines,'Axle=')); - NPoweredAxles:=s2NPW(AxleArangement); - NAxles:=NPoweredAxles+s2NNW(AxleArangement); - if NAxles=0 then ConversionError:=-1; - s:=DUE(ExtractKeyWord(lines,'BearingType=')); - if s='Roll' then BearingType:=1 - else BearingType:=0; - s:=ExtractKeyWord(lines,'Ad='); - ADist:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'Bd='); - BDist:=s2r(DUE(s)); - end - else if Pos('Brake:',lines)>0 then {hamulce} - begin - BrakeValveParams:=DUE(ExtractKeyWord(lines,'BrakeValve=')); - BrakeValveDecode(BrakeValveParams); - BrakeSubSystemDecode; - s:=ExtractKeyWord(lines,'NBpA='); - NBpA:=s2b(DUE(s)); - s:=ExtractKeyWord(lines,'MBF='); - MaxBrakeForce:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Size='); - BrakeValveSize:=s2i(DUE(s)); - s:=ExtractKeyWord(lines,'TBF='); - TrackBrakeForce:=s2r(DUE(s))*1000; - s:=ExtractKeyWord(lines,'MaxBP='); - MaxBrakePress[3]:=s2r(DUE(s)); - if MaxBrakePress[3]>0 then - begin - s:=ExtractKeyWord(lines,'BCN='); - BrakeCylNo:=s2iE(DUE(s)); - if BrakeCylNo>0 then - begin - s:=ExtractKeyWord(lines,'MaxLBP='); - MaxBrakePress[0]:=s2r(DUE(s)); - if MaxBrakePress[0]<0.01 then - MaxBrakePress[0]:=MaxBrakePress[3]; - s:=DUE(ExtractKeyWord(lines,'TareMaxBP=')); - MaxBrakePress[1]:=s2r(s); - s:=DUE(ExtractKeyWord(lines,'MedMaxBP=')); - MaxBrakePress[2]:=s2r(s); - s:=ExtractKeyWord(lines,'MaxASBP='); - MaxBrakePress[4]:=s2r(DUE(s)); - if MaxBrakePress[4]<0.01 then - MaxBrakePress[4]:=0; - s:=ExtractKeyWord(lines,'BCR='); - BrakeCylRadius:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'BCD='); - BrakeCylDist:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'BCS='); - BrakeCylSpring:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'BSA='); - BrakeSlckAdj:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'BRE='); - if s<>'' then - BrakeRigEff:=s2r(DUE(s)) - else - BrakeRigEff:=1; - s:=ExtractKeyWord(lines,'BCM='); - BrakeCylMult[0]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'BCMlo='); - BrakeCylMult[1]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'BCMHi='); - BrakeCylMult[2]:=s2r(DUE(s)); - P2FTrans:=100*Pi*SQR(BrakeCylRadius); {w kN/bar} - if (BrakeCylMult[1]>0) or (MaxBrakePress[1]>0) then LoadFlag:=1 else LoadFlag:=0; - BrakeVolume:=Pi*SQR(BrakeCylRadius)*BrakeCylDist*BrakeCylNo; - s:=ExtractKeyWord(lines,'BVV='); - BrakeVVolume:=s2R(DUE(s)); - - s:=DUE(ExtractKeyWord(lines,'BM=')); - if s='P10-Bg' then BrakeMethod:=bp_P10Bg else - if s='P10-Bgu' then BrakeMethod:=bp_P10Bgu else - if s='FR513' then BrakeMethod:=bp_FR513 else - if s='FR510' then BrakeMethod:=bp_FR510 else - if s='Cosid' then BrakeMethod:=bp_Cosid else - if s='P10yBg' then BrakeMethod:=bp_P10yBg else - if s='P10yBgu' then BrakeMethod:=bp_P10yBgu else - if s='Disk1' then BrakeMethod:=bp_D1 else - if s='Disk1+Mg' then BrakeMethod:=bp_D1+bp_MHS else - if s='Disk2' then BrakeMethod:=bp_D2 else - BrakeMethod:=0; - - s:=ExtractKeyWord(lines,'RM='); - if s<>'' then - RapidMult:=s2r(DUE(s)) - else - RapidMult:=1; - - - end - else ConversionError:=-5; - end - else - P2FTrans:=0; - s:=ExtractKeyWord(lines,'HiPP='); - if s<>'' then CntrlPipePress:=s2r(DUE(s)) - else CntrlPipePress:=5+0.001*(random(10)-random(10)); //Ra 2014-07: troch niedokadnoci - HighPipePress:=CntrlPipePress; - s:=ExtractKeyWord(lines,'LoPP='); - if s<>'' then LowPipePress:=s2r(DUE(s)) - else LowPipePress:=Min0R(HighPipePress,3.5); - DeltaPipePress:=HighPipePress-LowPipePress; - s:=ExtractKeyWord(lines,'Vv='); - VeselVolume:=s2r(DUE(s)); - if VeselVolume=0 then - VeselVolume:=0.01; - s:=ExtractKeyWord(lines,'MinCP='); - MinCompressor:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'MaxCP='); - MaxCompressor:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'CompressorSpeed='); - CompressorSpeed:=s2r(DUE(s)); - s:=DUE(ExtractKeyWord(lines,'CompressorPower=')); - if s='Converter' then - CompressorPower:=2 - else if s='Engine' then - CompressorPower:=3 - else if s='Coupler1' then - CompressorPower:=4 //wczana w silnikowym EZT z przodu - else if s='Coupler2' then - CompressorPower:=5 //wczana w silnikowym EZT z tyu - else if s='Main' then - CompressorPower:=0; - end - else if Pos('Doors:',lines)>0 then {drzwi} - begin - s:=DUE(ExtractKeyWord(lines,'OpenCtrl=')); - if s='DriverCtrl' then DoorOpenCtrl:=1 - else - DoorOpenCtrl:=0; - s:=DUE(ExtractKeyWord(lines,'CloseCtrl=')); - if s='DriverCtrl' then DoorCloseCtrl:=1 - else - if s='AutomaticCtrl' then DoorCloseCtrl:=2 - else - DoorCloseCtrl:=0; - if DoorCloseCtrl=2 then - begin - s:=ExtractKeyWord(lines,'DoorStayOpen='); - DoorStayOpen:=s2rE(DUE(s)); - end; - s:=ExtractKeyWord(lines,'OpenSpeed='); - DoorOpenSpeed:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'CloseSpeed='); - DoorCloseSpeed:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'DoorMaxShiftL='); - DoorMaxShiftL:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'DoorMaxShiftR='); - DoorMaxShiftR:=s2r(DUE(s)); - s:=DUE(ExtractKeyWord(lines,'DoorOpenMethod=')); - if s='Shift' then DoorOpenMethod:=1 //przesuw - else if s='Fold' then DoorOpenMethod:=3 //3 submodele si obracaj - else if s='Plug' then DoorOpenMethod:=4 //odskokowo-przesuwne - else - DoorOpenMethod:=2; //obrt - s:=DUE(ExtractKeyWord(lines,'DoorClosureWarning=')); - if s='Yes' then - DoorClosureWarning:=true - else - DoorClosureWarning:=false; - s:=DUE(ExtractKeyWord(lines,'DoorBlocked=')); - if s='Yes' then DoorBlocked:=true - else - DoorBlocked:=false; - s:=ExtractKeyWord(lines,'DoorMaxShiftPlug='); - DoorMaxPlugShift:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'PlatformSpeed='); - PlatformSpeed:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'PlatformMaxSpeed='); - PlatformMaxShift:=s2r(DUE(s)); - s:=DUE(ExtractKeyWord(lines,'PlatformOpenMethod=')); - if s='Shift' then PlatformOpenMethod:=1 //przesuw - else - PlatformOpenMethod:=2; //obrt - end - else if (Pos('BuffCoupl.',lines)>0) or (Pos('BuffCoupl1.',lines)>0) then {zderzaki i sprzegi} - begin - with Couplers[0] do - begin - s:=DUE(ExtractKeyWord(lines,'CType=')); - if s='Automatic' then - CouplerType:=Automatic - else - if s='Screw' then - CouplerType:=Screw - else - if s='Chain' then - CouplerType:=Chain - else - if s='Bare' then - CouplerType:=Bare - else - if s='Articulated' then - CouplerType:=Articulated - else - CouplerType:=NoCoupler; - s:=ExtractKeyWord(lines,'AllowedFlag='); - if s<>'' then AllowedFlag:=s2i(DUE(s)); - if (AllowedFlag<0) then AllowedFlag:=(-AllowedFlag) OR ctrain_depot; - if (CouplerType<>NoCoupler) and (CouplerType<>Bare) and (CouplerType<>Articulated) then - begin - s:=ExtractKeyWord(lines,'kC='); - SpringKC:=s2rE(DUE(s))*1000; - s:=ExtractKeyWord(lines,'DmaxC='); - DmaxC:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'FmaxC='); - FmaxC:=s2rE(DUE(s))*1000; - s:=ExtractKeyWord(lines,'kB='); - SpringKB:=s2rE(DUE(s))*1000; - s:=ExtractKeyWord(lines,'DmaxB='); - DmaxB:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'FmaxB='); - FmaxB:=s2rE(DUE(s))*1000; - s:=ExtractKeyWord(lines,'beta='); - beta:=s2r(DUE(s)); - end - else - if (CouplerType=Bare) then {Ra: czemu masy bez adunkw?} - begin - SpringKC:=50*Mass+Ftmax/0.05; - DmaxC:=0.05; - FmaxC:=100*Mass+2*Ftmax; - SpringKB:=60*Mass+Ftmax/0.05; - DmaxB:=0.05; - FmaxB:=50*Mass+2*Ftmax; - beta:=0.3; - end - else - if (CouplerType=Articulated) then - begin - SpringKC:=60*Mass+1000; - DmaxC:=0.05; - FmaxC:=20000000+2*Ftmax; - SpringKB:=70*Mass+1000; - DmaxB:=0.05; - FmaxB:=4000000+2*Ftmax; - beta:=0.55; - end; - end; - if (Pos('BuffCoupl.',lines)>0) then - begin - Couplers[1].SpringKC:=Couplers[0].SpringKC; - Couplers[1].DmaxC:=Couplers[0].DmaxC; - Couplers[1].FmaxC:=Couplers[0].FmaxC; - Couplers[1].SpringKB:=Couplers[0].SpringKB; - Couplers[1].DmaxB:=Couplers[0].DmaxB; - Couplers[1].FmaxB:=Couplers[0].FmaxB; - Couplers[1].beta:=Couplers[0].beta; - Couplers[1].CouplerType:=Couplers[0].CouplerType; - Couplers[1].AllowedFlag:=Couplers[0].AllowedFlag; - end; -{ CouplerTune:=(1+Mass)/100000; } - end - else if (Pos('BuffCoupl2.',lines)>0) then {zderzaki i sprzegi jesli sa rozne} - with Couplers[1] do - begin - s:=DUE(ExtractKeyWord(lines,'CType=')); - if s='Automatic' then - CouplerType:=Automatic - else - if s='Screw' then - CouplerType:=Screw - else - if s='Chain' then - CouplerType:=Chain - else - if s='Bare' then - CouplerType:=Bare - else - if s='Articulated' then - CouplerType:=Articulated - else - CouplerType:=NoCoupler; - s:=ExtractKeyWord(lines,'AllowedFlag='); - if s<>'' then AllowedFlag:=s2i(DUE(s)); - if (AllowedFlag<0) then AllowedFlag:=(-AllowedFlag) OR ctrain_depot; - if (CouplerType<>NoCoupler) and (CouplerType<>Bare) and (CouplerType<>Articulated) then - begin - s:=ExtractKeyWord(lines,'kC='); - SpringKC:=s2rE(DUE(s))*1000; - s:=ExtractKeyWord(lines,'DmaxC='); - DmaxC:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'FmaxC='); - FmaxC:=s2rE(DUE(s))*1000; - s:=ExtractKeyWord(lines,'kB='); - SpringKB:=s2rE(DUE(s))*1000; - s:=ExtractKeyWord(lines,'DmaxB='); - DmaxB:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'FmaxB='); - FmaxB:=s2rE(DUE(s))*1000; - s:=ExtractKeyWord(lines,'beta='); - beta:=s2r(DUE(s)); - end - else - if (CouplerType=Bare) then - begin - SpringKC:=50*Mass+1000; - DmaxC:=0.05; - FmaxC:=20*Mass+2*Ftmax; - SpringKB:=60*Mass+1000; - DmaxB:=0.05; - FmaxB:=10*Mass+2*Ftmax; - beta:=0.3; - end - else - if (CouplerType=Articulated) then - begin - SpringKC:=60*Mass+1000; - DmaxC:=0.05; - FmaxC:=20000000+2*Ftmax; - SpringKB:=70*Mass+1000;; - DmaxB:=0.05; - FmaxB:=4000000+2*Ftmax; - beta:=0.55; - end; -{ CouplerTune:=(1+Mass)/100000; } - end - else if Pos('TurboPos:',lines)>0 then {turbo zalezne od pozycji nastawnika} - begin - s:=ExtractKeyWord(lines,'TurboPos='); - TurboTest:=s2b(DUE(s)); - end - else if Pos('Cntrl.',lines)>0 then {nastawniki} - begin - s:=DUE(ExtractKeyWord(lines,'BrakeSystem=')); - if s='Pneumatic' then BrakeSystem:=Pneumatic - else if s='ElectroPneumatic' then BrakeSystem:=ElectroPneumatic - else BrakeSystem:=Individual; - if BrakeSystem<>Individual then - begin - s:=ExtractKeyWord(lines,'BCPN='); - BrakeCtrlPosNo:=s2b(DUE(s)); - - for b:=1 to 4 do - begin - s:=ExtractKeyWord(lines,'BDelay'+Cut_Space(b2s(b),CutLeft)+'='); - BrakeDelay[b]:=s2b(DUE(s)); - end; - - s:=DUE(ExtractKeyWord(lines,'BrakeDelays=')); - if s='GPR' then BrakeDelays:=bdelay_G+bdelay_P+bdelay_R - else if s='PR' then BrakeDelays:=bdelay_P+bdelay_R - else if s='GP' then BrakeDelays:=bdelay_G+bdelay_P - else if s='R' then begin BrakeDelays:=bdelay_R; BrakeDelayFlag:=bdelay_R; end - else if s='P' then begin BrakeDelays:=bdelay_P; BrakeDelayFlag:=bdelay_P; end - else if s='G' then begin BrakeDelays:=bdelay_G; BrakeDelayFlag:=bdelay_G; end - else if s='GPR+Mg' then BrakeDelays:=bdelay_G+bdelay_P+bdelay_R+bdelay_M - else if s='PR+Mg' then BrakeDelays:=bdelay_P+bdelay_R+bdelay_M; - - s:=DUE(ExtractKeyWord(lines,'BrakeOpModes=')); - if s='PN' then BrakeOpModes:=bom_PS+bom_PN - else if s='PNEPMED' then BrakeOpModes:=bom_PS+bom_PN+bom_EP+bom_MED; - -{ else if s='DPR+Mg' then begin Brakedelays:=bdelay_R; BrakeMethod:=3; end - else if s='DGPR+Mg' then begin Brakedelays:=bdelay_G+bdelay_R; BrakeMethod:=3; end - else if s='DGPR' then begin Brakedelays:=bdelay_G+bdelay_R; BrakeMethod:=1; end - else if s='DPR' then begin Brakedelays:=bdelay_R; BrakeMethod:=1; end - else if s='DGP' then begin Brakedelays:=bdelay_G; BrakeMethod:=1; end;} -// else if s='GPR' then Brakedelays=bdelay_G+bdelay_R - - s:=DUE(ExtractKeyWord(lines,'BrakeHandle=')); - if s='FV4a' then BrakeHandle:=FV4a - else if s='test' then BrakeHandle:=testH - else if s='D2' then BrakeHandle:=D2 - else if s='MHZ_EN57' then BrakeHandle:=MHZ_EN57 - else if s='M394' then BrakeHandle:=M394 - else if s='Knorr' then BrakeHandle:=Knorr - else if s='Westinghouse' then BrakeHandle:=West - else if s='FVel6' then BrakeHandle:=FVel6 - else if s='St113' then BrakeHandle:=St113; - - s:=DUE(ExtractKeyWord(lines,'LocBrakeHandle=')); - if s='FD1' then BrakeLocHandle:=FD1 - else if s='Knorr' then BrakeLocHandle:=Knorr - else if s='Westinghouse' then BrakeLocHandle:=West; - - s:=DUE(ExtractKeyWord(lines,'MaxBPMass=')); - if s<>'' then - MBPM:=s2rE(s)*1000; - - - if BrakeCtrlPosNo>0 then - begin - s:=DUE(ExtractKeyWord(lines,'ASB=')); - if s='Manual' then ASBType:=1 else - if s='Automatic' then ASBType:=2; - end - else - begin - s:=DUE(ExtractKeyWord(lines,'ASB=')); - if s='Yes' then ASBType:=128; - end; - end; - s:=DUE(ExtractKeyWord(lines,'LocalBrake=')); - if s='ManualBrake' then LocalBrake:=ManualBrake - else - if s='PneumaticBrake' then LocalBrake:=PneumaticBrake - else - if s='HydraulicBrake' then LocalBrake:=HydraulicBrake - else LocalBrake:=NoBrake; - s:=DUE(ExtractKeyWord(lines,'ManualBrake=')); - if s='Yes' then MBrake:=true - else MBrake:=false; - s:=DUE(ExtractKeyWord(lines,'DynamicBrake=')); - if s='Passive' then DynamicBrakeType:=dbrake_passive - else - if s='Switch' then DynamicBrakeType:=dbrake_switch - else - if s='Reversal' then DynamicBrakeType:=dbrake_reversal - else - if s='Automatic' then DynamicBrakeType:=dbrake_automatic - else DynamicBrakeType:=dbrake_none; - s:=ExtractKeyWord(lines,'MCPN='); - MainCtrlPosNo:=s2b(DUE(s)); - s:=ExtractKeyWord(lines,'SCPN='); - ScndCtrlPosNo:=s2b(DUE(s)); - s:=ExtractKeyWord(lines,'SCIM='); - ScndinMain:=boolean(s2b(DUE(s))); - s:=DUE(ExtractKeyWord(lines,'AutoRelay=')); - if s='Optional' then - AutoRelayType:=2 - else - if s='Yes' then - AutoRelayType:=1 - else - AutoRelayType:=0; - s:=DUE(ExtractKeyWord(lines,'CoupledCtrl=')); - if s='Yes' then - CoupledCtrl:=true {wspolny wal} - else CoupledCtrl:=false; - s:=DUE(ExtractKeyWord(lines,'ScndS=')); - if s='Yes' then - ScndS:=true {brak pozycji rownoleglej przy niskiej nastawie PSR} - else ScndS:=false; - s:=ExtractKeyWord(lines,'IniCDelay='); - InitialCtrlDelay:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'SCDelay='); - CtrlDelay:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'SCDDelay='); - if s<>'' then CtrlDownDelay:=s2r(DUE(s)) else CtrlDownDelay:=CtrlDelay; //hunter-101012: jesli nie ma SCDDelay; - s:=DUE(ExtractKeyWord(lines,'FSCircuit=')); //hunter-111012: dla siodemek 303E - if s='Yes' then - FastSerialCircuit:=1 - else - FastSerialCircuit:=0; - s:=ExtractKeyWord(lines,'SBD='); - StopBrakeDecc:=s2r(DUE(s)); - - if BrakeCtrlPosNo>0 then - for i:=0 to BrakeCtrlPosNo+1 do - begin - s:=ReadWord(fin); - k:=s2iE(s); - if ConversionError=0 then - with BrakePressureTable[k] do - begin - read(fin,PipePressureVal,BrakePressureVal,FlowSpeedVal); - s:=ReadWord(fin); - if s='Pneumatic' then BrakeType:=Pneumatic - else if s='ElectroPneumatic' then BrakeType:=ElectroPneumatic - else BrakeType:=Individual; -{ readln(fin); } - end; - end; - end - else if Pos('Light:',lines)>0 then {zrodlo mocy dla oswietlenia} - begin - s:=DUE(ExtractKeyWord(lines,'Light=')); - if s<>'' then - begin - LightPowerSource.SourceType:=PowerSourceDecode(s); - PowerParamDecode(lines,'L',LightPowerSource); - s:=DUE(ExtractKeyWord(lines,'AlterLight=')); - if s<>'' then - begin - AlterLightPowerSource.SourceType:=PowerSourceDecode(s); - PowerParamDecode(lines,'AlterL',AlterLightPowerSource) - end - else AlterLightPowerSource.SourceType:=NotDefined; - end ; - s:=ExtractKeyWord(lines,'Volt='); - if s<>'' then - NominalVoltage:=s2r(DUE(s)); - - s:=ExtractKeyWord(lines,'LMaxVoltage='); - if s<>'' then - begin - BatteryVoltage:=s2r(DUE(s)); - NominalBatteryVoltage:=s2r(DUE(s)); - end; - //else LightPowerSource.SourceType:=NotDefined; - end - else if Pos('Security:',lines)>0 then - begin - //if (TrainType<>dt_EZT)or(Power>1) then //dla EZT tylko w silnikowym - with SecuritySystem do - begin - s:=DUE(ExtractKeyWord(lines,'AwareSystem=')); - if Pos('Active',s)>0 then - SetFlag(SystemType,1); - if Pos('CabSignal',s)>0 then - SetFlag(SystemType,2); - s:=ExtractKeyWord(lines,'AwareDelay='); - if s<>'' then - AwareDelay:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'AwareMinSpeed='); - if s<>'' then - AwareMinSpeed:=s2r(DUE(s)) - else - AwareMinSpeed:=0.1*Vmax; //domylnie 10% Vmax - s:=ExtractKeyWord(lines,'SoundSignalDelay='); - if s<>'' then - SoundSignalDelay:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'EmergencyBrakeDelay='); - if s<>'' then - EmergencyBrakeDelay:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'RadioStop='); - if s<>'' then - if Pos('Yes',s)>0 then - RadioStop:=true; - end - end - else if Pos('Clima:',lines)>0 then {zrodlo mocy dla ogrzewania itp} - begin - s:=DUE(ExtractKeyWord(lines,'Heating=')); - if s<>'' then - begin - HeatingPowerSource.SourceType:=PowerSourceDecode(s); - PowerParamDecode(lines,'H',HeatingPowerSource); - s:=DUE(ExtractKeyWord(lines,'AlterHeating=')); - if s<>'' then - begin - AlterHeatPowerSource.SourceType:=PowerSourceDecode(s); - PowerParamDecode(lines,'AlterH',AlterHeatPowerSource) - end - else AlterHeatPowerSource.SourceType:=NotDefined; - end - else HeatingPowerSource.SourceType:=NotDefined; - end - else if Pos('Power:',lines)>0 then {zrodlo mocy dla silnikow trakcyjnych itp} - begin - s:=DUE(ExtractKeyWord(lines,'EnginePower=')); - if s<>'' then - begin - EnginePowerSource.SourceType:=PowerSourceDecode(s); - PowerParamDecode(lines,'',EnginePowerSource); - if (EnginePowerSource.SourceType=Generator) and (EnginePowerSource.GeneratorEngine=WheelsDriven) then - ConversionError:=-666; {perpetuum mobile?} - if (Power=0) then //jeli nie ma mocy, np. rozrzdcze EZT - EnginePowerSource.SourceType:=NotDefined; //to silnik nie ma zasilania - end - else EnginePowerSource.SourceType:=NotDefined; - //if EnginePowerSource.SourceType=NotDefined then - begin - s:=DUE(ExtractKeyWord(lines,'SystemPower=')); - if s<>'' then - begin - SystemPowerSource.SourceType:=PowerSourceDecode(s); - PowerParamDecode(lines,'',SystemPowerSource); - end - else SystemPowerSource.SourceType:=NotDefined; - end - //else SystemPowerSource.SourceType:=InternalSource; - end - else if Pos('Engine:',lines)>0 then {stale parametry silnika} - begin - EngineType:=EngineDecode(DUE(ExtractKeyWord(lines,'EngineType='))); - case EngineType of - ElectricSeriesMotor: - begin - s:=ExtractKeyWord(lines,'Volt='); - NominalVoltage:=s2r(DUE(s)); - s:=DUE(ExtractKeyWord(lines,'Trans=')); - Transmision.NToothW:=s2b(copy(s,Pos(':',s)+1,Length(s))); - Transmision.NToothM:=s2b(copy(s,1,Pos(':',s)-1)); - if s<>'' then - with Transmision do - if NToothM>0 then - Ratio:=NToothW/NToothM - else Ratio:=1; - s:=ExtractKeyWord(lines,'WindingRes='); - WindingRes:=s2r(DUE(s)); - if WindingRes=0 then WindingRes:=0.01; - s:=ExtractKeyWord(lines,'nmax='); - nmax:=s2rE(DUE(s))/60.0; - end; - WheelsDriven: - begin - s:=DUE(ExtractKeyWord(lines,'Trans=')); - Transmision.NToothW:=s2b(copy(s,Pos(':',s)+1,Length(s))); - Transmision.NToothM:=s2b(copy(s,1,Pos(':',s)-1)); - if s<>'' then - with Transmision do - if NToothM>0 then - Ratio:=NToothW/NToothM - else Ratio:=1; - s:=ExtractKeyWord(lines,'Ftmax='); - Ftmax:=s2rE(DUE(s)); - end; - Dumb: - begin - s:=ExtractKeyWord(lines,'Ftmax='); - Ftmax:=s2rE(DUE(s)); - end; - DieselEngine: - begin - s:=DUE(ExtractKeyWord(lines,'Trans=')); - Transmision.NToothW:=s2b(copy(s,Pos(':',s)+1,Length(s))); - Transmision.NToothM:=s2b(copy(s,1,Pos(':',s)-1)); - if s<>'' then - with Transmision do - if NToothM>0 then - Ratio:=NToothW/NToothM - else Ratio:=1; - s:=ExtractKeyWord(lines,'nmin='); - dizel_nmin:=s2r(DUE(s))/60.0; - s:=ExtractKeyWord(lines,'nmax='); - nmax:=s2rE(DUE(s))/60.0; - s:=ExtractKeyWord(lines,'nmax_cutoff='); - dizel_nmax_cutoff:=s2r(DUE(s))/60.0; - s:=ExtractKeyWord(lines,'AIM='); - dizel_AIM:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'ShuntMode='); - if s<>'' then - begin //dodatkowa przekadnia dla SM03 (2Ls150) - ShuntModeAllow:=true; - ShuntMode:=false; - AnPos:=s2rE(DUE(s)); //dodatkowe przeoenie - if (AnPos<1.0) then //"rozruch wysoki" ma dawa wiksz si - AnPos:=1.0/AnPos; //im wiksza liczba, tym wolniej jedzie - end; - end; - DieselElectric: //youBy - begin - s:=DUE(ExtractKeyWord(lines,'Trans=')); - Transmision.NToothW:=s2b(copy(s,Pos(':',s)+1,Length(s))); - Transmision.NToothM:=s2b(copy(s,1,Pos(':',s)-1)); - if s<>'' then - with Transmision do - if NToothM>0 then - Ratio:=NToothW/NToothM - else Ratio:=1; - s:=ExtractKeyWord(lines,'Ftmax='); - Ftmax:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'Flat='); - Flat:=Boolean(s2b(DUE(s))); - s:=ExtractKeyWord(lines,'Vhyp='); - Vhyp:=s2rE(DUE(s))/3.6; - s:=ExtractKeyWord(lines,'Vadd='); - Vadd:=s2rE(DUE(s))/3.6; - s:=ExtractKeyWord(lines,'Cr='); - PowerCorRatio:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'RelayType='); - RelayType:=s2b(DUE(s)); - s:=ExtractKeyWord(lines,'ShuntMode='); - ShuntModeAllow:=Boolean(s2b(DUE(s))); - if (ShuntModeAllow) then - begin - ShuntModeAllow:=true; - ShuntMode:=false; - AnPos:=0; - ImaxHi:=2; - ImaxLo:=1; - end; - end; - ElectricInductionMotor: - begin - rventnmax:=1; - s:=ExtractKeyWord(lines,'Volt='); - NominalVoltage:=s2r(DUE(s)); - s:=DUE(ExtractKeyWord(lines,'Trans=')); - Transmision.NToothW:=s2b(copy(s,Pos(':',s)+1,Length(s))); - Transmision.NToothM:=s2b(copy(s,1,Pos(':',s)-1)); - if s<>'' then - with Transmision do - if NToothM>0 then - Ratio:=NToothW/NToothM - else Ratio:=1; - s:=ExtractKeyWord(lines,'dfic='); eimc[eimc_s_dfic]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'dfmax='); eimc[eimc_s_dfmax]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'p='); eimc[eimc_s_p]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'cfu='); eimc[eimc_s_cfu]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'cim='); eimc[eimc_s_cim]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'icif='); eimc[eimc_s_icif]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Uzmax='); eimc[eimc_f_Uzmax]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Uzh='); eimc[eimc_f_Uzh]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'DU='); eimc[eimc_f_DU]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'I0='); eimc[eimc_f_I0]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'fcfu='); eimc[eimc_f_cfu]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'F0='); eimc[eimc_p_F0]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'a1='); eimc[eimc_p_a1]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Pmax='); eimc[eimc_p_Pmax]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Fh='); eimc[eimc_p_Fh]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Ph='); eimc[eimc_p_Ph]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Vh0='); eimc[eimc_p_Vh0]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Vh1='); eimc[eimc_p_Vh1]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Imax='); eimc[eimc_p_Imax]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'abed='); if DUE(s)<>'' then eimc[eimc_p_abed]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'edep='); if DUE(s)<>'' then eimc[eimc_p_eped]:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'Flat='); if DUE(s)='Yes' then Flat:=true else Flat:=false; - end; - - else ConversionError:=-13; {not implemented yet!} - end; - end - { Typy przelacznika 'Winger 010304 } - else if Pos('Switches:',lines)>0 then - begin - s:=DUE(ExtractKeyWord(lines,'Pantograph=')); - PantSwitchType:=s; - s:=DUE(ExtractKeyWord(lines,'Converter=')); - ConvSwitchType:=s; - {case PantSwitchType of - Continuos: - begin - PantSwitchType:='continuos'; - end; - Impulse: - begin - PantSwitchType:='impulse'; - end; } - end - - else if Pos('MotorParamTable:',lines)>0 then - case EngineType of - ElectricSeriesMotor: - begin - for k:=0 to ScndCtrlPosNo do - begin - with MotorParam[k] do - read(fin, bl, mfi,mIsat, fi,Isat); - if AutoRelayType=0 then - MotorParam[k].AutoSwitch:=false - else begin - readln(fin,i); - MotorParam[k].AutoSwitch:=Boolean(i); - end; - if bl<>k then - ConversionError:=-2 - end; - end; -//youBy - DieselElectric: - begin -// WW_MPTRelayNo:= ScndCtrlPosNo; - for k:=0 to ScndCtrlPosNo do - begin - with MotorParam[k] do - readln(fin, bl, mfi, mIsat, fi, Isat, MPTRelay[k].Iup, MPTRelay[k].Idown); - if bl<>k then - ConversionError:=-2 - end; - end; - - DieselEngine: - begin - s:=ExtractKeyWord(lines,'minVelfullengage='); - dizel_minVelfullengage:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'engageDia='); - dizel_engageDia:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'engageMaxForce='); - dizel_engageMaxForce:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'engagefriction='); - dizel_engagefriction:=s2r(DUE(s)); - - for k:=0 to ScndCtrlPosNo do - begin - with MotorParam[k] do - read(fin, bl, mIsat, fi,mfi); - if AutoRelayType=0 then - MotorParam[k].AutoSwitch:=false - else begin - readln(fin,i); - MotorParam[k].AutoSwitch:=Boolean(i); - end; - if bl<>k then - ConversionError:=-2 - end; - end - else ConversionError:=-3; - end - //dwa dodatkowe parametry korekcyjne - else if Pos('MotorParamTable0:',lines)>0 then - begin - for k:=0 to ScndCtrlPosNo do - begin - with MotorParam[k] do - read(fin, bl, mfi,mIsat,mfi0, fi,Isat,fi0); - if AutoRelayType=0 then - MotorParam[k].AutoSwitch:=False - else begin - readln(fin,i); - MotorParam[k].AutoSwitch:=Boolean(i); - end; - if bl<>k then - ConversionError:=-2 - end; - end - - else if Pos('Circuit:',lines)>0 then - begin - s:=ExtractKeyWord(lines,'CircuitRes='); - CircuitRes:=s2r(DUE(s)); - s:=ExtractKeyWord(lines,'IminLo='); - IminLo:=s2iE(DUE(s)); - s:=ExtractKeyWord(lines,'IminHi='); - IminHi:=s2i(DUE(s)); - s:=ExtractKeyWord(lines,'ImaxLo='); - ImaxLo:=s2iE(DUE(s)); - s:=ExtractKeyWord(lines,'ImaxHi='); - ImaxHi:=s2i(DUE(s)); - Imin:=IminLo; - Imax:=ImaxLo; - end - else if Pos('RList:',lines)>0 then - begin - s:=DUE(ExtractKeyWord(lines,'RVent=')); - if s='Automatic' then RventType:=2 - else - if s='Yes' then RventType:=1 - else - RventType:=0; - if RventType>0 then - begin - s:=ExtractKeyWord(lines,'RVentnmax='); - RVentnmax:=s2rE(DUE(s))/60.0; - s:=ExtractKeyWord(lines,'RVentCutOff='); - RVentCutOff:=s2r(DUE(s)); - end; - RListSize:=s2b(DUE(ExtractKeyWord(lines,'Size='))); - if RListSize>ResArraySize then - ConversionError:=-4 - else - for k:=0 to RListSize do - begin - read(fin, RList[k].Relay, RList[k].R, RList[k].Bn, RList[k].Mn); -{ if AutoRelayType=0 then - RList[k].AutoSwitch:=false - else begin } {to sie przyda do pozycji przejsciowych} - read(fin,i); - RList[k].AutoSwitch:=Boolean(i); - if(ScndInMain)then - begin - readln(fin,i); - RList[k].ScndAct:=i; - end - else readln(fin); - end; - end - else if Pos('DList:',lines)>0 then {dla spalinowego silnika} - begin - s:=ExtractKeyWord(lines,'Mmax='); - dizel_Mmax:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'nMmax='); - dizel_nMmax:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'Mnmax='); - dizel_Mnmax:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'nmax='); - dizel_nmax:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'nominalfill='); - dizel_nominalfill:=s2rE(DUE(s)); - s:=ExtractKeyWord(lines,'Mstand='); - dizel_Mstand:=s2rE(DUE(s)); - RListSize:=s2b(DUE(ExtractKeyWord(lines,'Size='))); - if RListSize>ResArraySize then - ConversionError:=-4 - else - for k:=0 to RListSize do - begin - readln(fin, RList[k].Relay, RList[k].R, RList[k].Mn); - end; - end -//youBy - else if (Pos('WWList:',lines)>0) then {dla spal-ele} - begin - RListSize:=s2b(DUE(ExtractKeyWord(lines,'Size='))); - for k:=0 to RListSize do - begin - if not (ShuntModeAllow) then - readln(fin, DEList[k].rpm, DEList[k].genpower, DEList[k].Umax, DEList[k].Imax) - else - begin - readln(fin, DEList[k].rpm, DEList[k].genpower, DEList[k].Umax, DEList[k].Imax, SST[k].Umin, SST[k].Umax, SST[k].Pmax); - SST[k].Pmin:=sqrt(sqr(SST[k].Umin)/47.6); - SST[k].Pmax:=Min0R(SST[k].Pmax,sqr(SST[k].Umax)/47.6); - end; - end; - end - else if (Pos('ffList:',lines)>0) then {dla asynchronow} - begin - RListSize:=s2b(DUE(ExtractKeyWord(lines,'Size='))); - for k:=0 to RListSize do - readln(fin, DEList[k].rpm, DEList[k].genpower) - end - else if (Pos('LightsList:',lines)>0) then {dla asynchronow} - begin - LightsPosNo:=s2b(DUE(ExtractKeyWord(lines,'Size='))); - LightsWrap:=('Yes')=(DUE(ExtractKeyWord(lines,'Wrap='))); - LightsDefPos:=s2b(DUE(ExtractKeyWord(lines,'Default='))); - for k:=1 to LightsPosNo do - readln(fin, Lights[0][k], Lights[1][k]) - end; - - end; - end; {koniec filtru importu parametrow} - if ConversionError=0 then - OK:=true - else - OK:=false; - end; {otwarty plik} - if OK then - if OKflag<>param_ok{+wheels_ok}+dimensions_ok then - begin - OK:=false; - ConversionError:=-OKflag; {brakowalo jakiejs waznej linii z parametrami} - end; - if OK and (Mass<=0) then - begin - OK:=false; - ConversionError:=-666; - end; - LoadChkFile:=OK; - if ConversionError<>-8 then - close(fin); -end; {loadchkfile} - - -END. - - - diff --git a/McZapkie/friction.hpp b/McZapkie/friction.hpp deleted file mode 100644 index 250d1657..00000000 --- a/McZapkie/friction.hpp +++ /dev/null @@ -1,232 +0,0 @@ -// Borland C++ Builder -// Copyright (c) 1995, 1999 by Borland International -// All rights reserved - -// (DO NOT EDIT: machine generated header) 'friction.pas' rev: 5.00 - -#ifndef frictionHPP -#define frictionHPP - -#pragma delphiheader begin -#pragma option push -w- -#pragma option push -Vx -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit - -//-- user supplied ----------------------------------------------------------- - -namespace Friction -{ -//-- type declarations ------------------------------------------------------- -class DELPHICLASS TFricMat; -class PASCALIMPLEMENTATION TFricMat : public System::TObject -{ - typedef System::TObject inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TFricMat(void) : System::TObject() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TFricMat(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TP10Bg; -class PASCALIMPLEMENTATION TP10Bg : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TP10Bg(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TP10Bg(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TP10Bgu; -class PASCALIMPLEMENTATION TP10Bgu : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TP10Bgu(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TP10Bgu(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TP10yBg; -class PASCALIMPLEMENTATION TP10yBg : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TP10yBg(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TP10yBg(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TP10yBgu; -class PASCALIMPLEMENTATION TP10yBgu : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TP10yBgu(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TP10yBgu(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TP10; -class PASCALIMPLEMENTATION TP10 : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TP10(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TP10(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TFR513; -class PASCALIMPLEMENTATION TFR513 : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TFR513(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TFR513(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TFR510; -class PASCALIMPLEMENTATION TFR510 : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TFR510(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TFR510(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TCosid; -class PASCALIMPLEMENTATION TCosid : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TCosid(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TCosid(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TDisk1; -class PASCALIMPLEMENTATION TDisk1 : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TDisk1(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TDisk1(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TDisk2; -class PASCALIMPLEMENTATION TDisk2 : public TFricMat -{ - typedef TFricMat inherited; - -public: - virtual double __fastcall GetFC(double N, double Vel); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TDisk2(void) : TFricMat() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TDisk2(void) { } - #pragma option pop - -}; - - -//-- var, const, procedure --------------------------------------------------- - -} /* namespace Friction */ -#if !defined(NO_IMPLICIT_NAMESPACE_USE) -using namespace Friction; -#endif -#pragma option pop // -w- -#pragma option pop // -Vx - -#pragma delphiheader end. -//-- end unit ---------------------------------------------------------------- -#endif // friction diff --git a/McZapkie/friction.pas b/McZapkie/friction.pas deleted file mode 100644 index 9390feb1..00000000 --- a/McZapkie/friction.pas +++ /dev/null @@ -1,182 +0,0 @@ -unit friction; {wspolczynnik tarcia roznych materialow} - -(* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*) -(* - MaSzyna EU07 - SPKS - Friction coefficient. - Copyright (C) 2007-2013 Maciej Cierniak -*) - - -(* -(C) youBy -Co brakuje: -- hamulce tarczowe -- kompozyty -*) -(* -Zrobione: -1) zadeklarowane niektore typy -2) wzor jubaja na tarcie wstawek Bg i Bgu z zeliwa P10 -3) hamulec tarczowy marki 152A ;) -*) - -interface - -//uses hamulce; -uses mctools,sysutils; - -TYPE - - TFricMat = class - public - function GetFC(N, Vel: real): real; virtual; - end; - - TP10Bg = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - TP10Bgu = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - TP10yBg = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - TP10yBgu = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - TP10 = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - TFR513 = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - TFR510 = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - TCosid = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - TDisk1 = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - TDisk2 = class(TFricMat) - public - function GetFC(N, Vel: real): real; override; - end; - - -implementation - -function TFricMat.GetFC(N, Vel: real): real; -begin - GetFC:=1; -end; - -function TP10Bg.GetFC(N, Vel: real): real; -begin -// GetFC:=0.60*((1.6*N+100)/(8.0*N+100))*((Vel+100)/(5*Vel+100))*(1.0032-0.0007*N-0.0001*N*N); -// GetFC:=47/(2*Vel+100)*(2.145-0.0538*N+0.00074*N*N-0.00000536*N*N*N)/2.145; -// GetFC:=46/(2*Vel+100)*(11.33-0.105*N)/(11.33+0.179*N); -// GetFC:=49/(2*Vel+100)*(13.08-0.083*N)/(12.94+0.285*N); -//if Vel<20 then Vel:=20; -// Vel:= Vel-20; -// GetFC:=0.52*((1*Vel+100)/(5.0*Vel+100))*(13.08-0.083*N)/(12.94+0.285*N); -// GetFC:=Min0R(0.67*(1*(277-2.66*Vel)/(100+2.1*Vel)+0.23*(-686+8.27*Vel)/(100+1.16*Vel))*(13.08-0.083*N)/(12.94+0.285*N),0.4); - GetFC:=exp(-0.022*N)*(0.19-0.095*exp(-Vel/25.7))+0.384*exp(-Vel/25.7)-0.028; -end; - -function TP10Bgu.GetFC(N, Vel: real): real; -begin -// GetFC:=0.60*((1.6*N+100)/(8.0*N+100))*((Vel+100)/(5*Vel+100)); -// GetFC:=47/(2*Vel+100)*(2.137-0.0514*N+0.000832*N*N-0.00000604*N*N*N)/2.137; -// GetFC:=0.49*100/(2*Vel+100)*(11.33-0.013*N)/(11.33+0.280*N); -// GetFC:=0.52*((Vel+100)/(5.0*Vel+100))*(11.33-0.013*N)/(11.33+0.280*N); -//if Vel<20 then Vel:=20; -// Vel:= Vel-20; -// GetFC:=0.52*((0.0*Vel+120)/(5*Vel+100))*(11.33-0.013*N)/(11.33+0.280*N); -// GetFC:=0.49*100/(3*Vel+100)*(11.33-0.013*N)/(11.33+0.280*N); -// GetFC:=Min0R(0.67*(1*(277-2.66*Vel)/(100+2.1*Vel)+0.23*(-686+8.27*Vel)/(100+1.16*Vel))*(11.33-0.013*N)/(11.33+0.280*N),0.4); - GetFC:=exp(-0.017*N)*(0.18-0.09*exp(-Vel/25.7))+0.381*exp(-Vel/25.7)-0.022;//0.05*exp(-0.2*N); -end; - -function TP10yBg.GetFC(N, Vel: real): real; -var A,C,u0, V0: real; -begin - A:=2.135*exp(-0.03726*N)-0.5; - C:=0.353-A*0.029; - u0:=0.41-C; - V0:=25.7+20*A; - GetFC:=(u0+C*exp(-Vel/V0)); -end; - -function TP10yBgu.GetFC(N, Vel: real): real; -var A,C,u0, V0: real; -begin - A:=1.68*exp(-0.02735*N)-0.5; - C:=0.353-A*0.044; - u0:=0.41-C; - V0:=25.7+21*A; - GetFC:=(u0+C*exp(-Vel/V0)); -end; - -function TP10.GetFC(N, Vel: real): real; -begin - GetFC:=0.60*((1.6*N+100)/(8.0*N+100))*((Vel+100)/(5*Vel+100)); -// GetFC:=43/(2*Vel+100)*(2.145-0.0538*N+0.00074*N*N-0.00000536*N*N*N)/2.145 -end; - - -function TFR513.GetFC(N, Vel: real): real; -begin - GetFC:=0.3-Vel*0.00081; -// GetFC:=43/(2*Vel+100)*(2.145-0.0538*N+0.00074*N*N-0.00000536*N*N*N)/2.145 -end; - -function TCosid.GetFC(N, Vel: real): real; -begin - GetFC:=0.27; -end; - -function TDisk1.GetFC(N, Vel: real): real; -begin - GetFC:=0.2375+0.000885*N-0.000345*N*N; -end; - -function TDisk2.GetFC(N, Vel: real): real; -begin - GetFC:=0.27; -end; - -function TFR510.GetFC(N, Vel: real): real; -begin - GetFC:=0.15; -end; - -end. - diff --git a/McZapkie/hamulce.hpp b/McZapkie/hamulce.hpp deleted file mode 100644 index 19986fd1..00000000 --- a/McZapkie/hamulce.hpp +++ /dev/null @@ -1,881 +0,0 @@ -// Borland C++ Builder -// Copyright (c) 1995, 1999 by Borland International -// All rights reserved - -// (DO NOT EDIT: machine generated header) 'hamulce.pas' rev: 5.00 - -#ifndef hamulceHPP -#define hamulceHPP - -#pragma delphiheader begin -#pragma option push -w- -#pragma option push -Vx -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit - -//-- user supplied ----------------------------------------------------------- - -namespace Hamulce -{ -//-- type declarations ------------------------------------------------------- -class DELPHICLASS TReservoir; -class PASCALIMPLEMENTATION TReservoir : public System::TObject -{ - typedef System::TObject inherited; - -protected: - double Cap; - double Vol; - double dVol; - -public: - __fastcall TReservoir(void); - void __fastcall CreateCap(double Capacity); - void __fastcall CreatePress(double Press); - virtual double __fastcall pa(void); - virtual double __fastcall P(void); - void __fastcall Flow(double dv); - void __fastcall Act(void); -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TReservoir(void) { } - #pragma option pop - -}; - - -typedef TReservoir* *PReservoir; - -class DELPHICLASS TBrakeCyl; -class PASCALIMPLEMENTATION TBrakeCyl : public TReservoir -{ - typedef TReservoir inherited; - -public: - virtual double __fastcall pa(void); - virtual double __fastcall P(void); -public: - #pragma option push -w-inl - /* TReservoir.Create */ inline __fastcall TBrakeCyl(void) : TReservoir() { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TBrakeCyl(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TBrake; -class PASCALIMPLEMENTATION TBrake : public System::TObject -{ - typedef System::TObject inherited; - -protected: - TReservoir* BrakeCyl; - TReservoir* BrakeRes; - TReservoir* ValveRes; - Byte BCN; - double BCM; - double BCA; - Byte BrakeDelays; - Byte BrakeDelayFlag; - Friction::TFricMat* FM; - double MaxBP; - Byte BA; - Byte NBpA; - double SizeBR; - double SizeBC; - bool DCV; - double ASBP; - Byte BrakeStatus; - Byte SoundFlag; - -public: - __fastcall TBrake(double i_mbp, double i_bcr, double i_bcd, double i_brc, Byte i_bcn, Byte i_BD, Byte - i_mat, Byte i_ba, Byte i_nbpa); - virtual double __fastcall GetFC(double Vel, double N); - virtual double __fastcall GetPF(double PP, double dt, double Vel); - double __fastcall GetBCF(void); - virtual double __fastcall GetHPFlow(double HP, double dt); - virtual double __fastcall GetBCP(void); - double __fastcall GetBRP(void); - double __fastcall GetVRP(void); - virtual double __fastcall GetCRP(void); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - bool __fastcall SetBDF(Byte nBDF); - void __fastcall Releaser(Byte state); - virtual void __fastcall SetEPS(double nEPS); - void __fastcall ASB(Byte state); - Byte __fastcall GetStatus(void); - void __fastcall SetASBP(double press); - virtual void __fastcall ForceEmptiness(void); - Byte __fastcall GetSoundFlag(void); -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TBrake(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TWest; -class PASCALIMPLEMENTATION TWest : public TBrake -{ - typedef TBrake inherited; - -private: - double LBP; - double dVP; - double EPS; - double TareM; - double LoadM; - double TareBP; - double LoadC; - -public: - void __fastcall SetLBP(double P); - virtual double __fastcall GetPF(double PP, double dt, double Vel); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - virtual double __fastcall GetHPFlow(double HP, double dt); - void __fastcall PLC(double mass); - virtual void __fastcall SetEPS(double nEPS); - void __fastcall SetLP(double TM, double LM, double TBP); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TWest(double i_mbp, double i_bcr, double i_bcd, double i_brc, - Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TBrake(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TWest(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TESt; -class PASCALIMPLEMENTATION TESt : public TBrake -{ - typedef TBrake inherited; - -private: - TReservoir* CntrlRes; - double BVM; - -public: - virtual double __fastcall GetPF(double PP, double dt, double Vel); - void __fastcall EStParams(double i_crc); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - virtual double __fastcall GetCRP(void); - void __fastcall CheckState(double BCP, double &dV1); - void __fastcall CheckReleaser(double dt); - double __fastcall CVs(double bp); - double __fastcall BVs(double BCP); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TESt(double i_mbp, double i_bcr, double i_bcd, double i_brc, - Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TBrake(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TESt(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TESt3; -class PASCALIMPLEMENTATION TESt3 : public TESt -{ - typedef TESt inherited; - -private: - double CylFlowSpeed[2][2]; - -public: - virtual double __fastcall GetPF(double PP, double dt, double Vel); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TESt3(double i_mbp, double i_bcr, double i_bcd, double i_brc, - Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TESt(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TESt3(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TESt3AL2; -class PASCALIMPLEMENTATION TESt3AL2 : public TESt3 -{ - typedef TESt3 inherited; - -private: - double TareM; - double LoadM; - double TareBP; - double LoadC; - -public: - TReservoir* ImplsRes; - virtual double __fastcall GetPF(double PP, double dt, double Vel); - void __fastcall PLC(double mass); - void __fastcall SetLP(double TM, double LM, double TBP); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TESt3AL2(double i_mbp, double i_bcr, double i_bcd, double i_brc - , Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TESt3(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TESt3AL2(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TESt4R; -class PASCALIMPLEMENTATION TESt4R : public TESt -{ - typedef TESt inherited; - -private: - bool RapidStatus; - double RapidTemp; - -public: - TReservoir* ImplsRes; - virtual double __fastcall GetPF(double PP, double dt, double Vel); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TESt4R(double i_mbp, double i_bcr, double i_bcd, double i_brc - , Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TESt(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TESt4R(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TLSt; -class PASCALIMPLEMENTATION TLSt : public TESt4R -{ - typedef TESt4R inherited; - -private: - double CylFlowSpeed[2][2]; - double LBP; - double RM; - double EDFlag; - -public: - void __fastcall SetLBP(double P); - void __fastcall SetRM(double RMR); - virtual double __fastcall GetPF(double PP, double dt, double Vel); - virtual double __fastcall GetHPFlow(double HP, double dt); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - virtual double __fastcall GetEDBCP(void); - void __fastcall SetED(double EDstate); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TLSt(double i_mbp, double i_bcr, double i_bcd, double i_brc, - Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TESt4R(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TLSt(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TEStED; -class PASCALIMPLEMENTATION TEStED : public TLSt -{ - typedef TLSt inherited; - -private: - double Nozzles[11]; - bool Zamykajacy; - bool Przys_blok; - TReservoir* Miedzypoj; - double TareM; - double LoadM; - double TareBP; - double LoadC; - -public: - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - virtual double __fastcall GetPF(double PP, double dt, double Vel); - virtual double __fastcall GetEDBCP(void); - void __fastcall PLC(double mass); - void __fastcall SetLP(double TM, double LM, double TBP); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TEStED(double i_mbp, double i_bcr, double i_bcd, double i_brc - , Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TLSt(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TEStED(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TEStEP2; -class PASCALIMPLEMENTATION TEStEP2 : public TLSt -{ - typedef TLSt inherited; - -private: - double TareM; - double LoadM; - double TareBP; - double LoadC; - double EPS; - -public: - virtual double __fastcall GetPF(double PP, double dt, double Vel); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - void __fastcall PLC(double mass); - virtual void __fastcall SetEPS(double nEPS); - void __fastcall SetLP(double TM, double LM, double TBP); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TEStEP2(double i_mbp, double i_bcr, double i_bcd, double i_brc - , Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TLSt(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TEStEP2(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TCV1; -class PASCALIMPLEMENTATION TCV1 : public TBrake -{ - typedef TBrake inherited; - -private: - TReservoir* CntrlRes; - double BVM; - -public: - virtual double __fastcall GetPF(double PP, double dt, double Vel); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - virtual double __fastcall GetCRP(void); - void __fastcall CheckState(double BCP, double &dV1); - double __fastcall CVs(double bp); - double __fastcall BVs(double BCP); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TCV1(double i_mbp, double i_bcr, double i_bcd, double i_brc, - Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TBrake(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TCV1(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TCV1R; -class PASCALIMPLEMENTATION TCV1R : public TCV1 -{ - typedef TCV1 inherited; - -private: - TReservoir* ImplsRes; - bool RapidStatus; -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TCV1R(double i_mbp, double i_bcr, double i_bcd, double i_brc, - Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TCV1(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TCV1R(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TCV1L_TR; -class PASCALIMPLEMENTATION TCV1L_TR : public TCV1 -{ - typedef TCV1 inherited; - -private: - TReservoir* ImplsRes; - double LBP; - -public: - virtual double __fastcall GetPF(double PP, double dt, double Vel); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - void __fastcall SetLBP(double P); - virtual double __fastcall GetHPFlow(double HP, double dt); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TCV1L_TR(double i_mbp, double i_bcr, double i_bcd, double i_brc - , Byte i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TCV1(i_mbp, i_bcr, i_bcd, i_brc, i_bcn - , i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TCV1L_TR(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TKE; -class PASCALIMPLEMENTATION TKE : public TBrake -{ - typedef TBrake inherited; - -private: - bool RapidStatus; - TReservoir* ImplsRes; - TReservoir* CntrlRes; - TReservoir* Brak2Res; - double BVM; - double TareM; - double LoadM; - double TareBP; - double LoadC; - double RM; - double LBP; - -public: - void __fastcall SetRM(double RMR); - virtual double __fastcall GetPF(double PP, double dt, double Vel); - virtual void __fastcall Init(double PP, double HPP, double LPP, double BP, Byte BDF); - virtual double __fastcall GetHPFlow(double HP, double dt); - virtual double __fastcall GetCRP(void); - void __fastcall CheckState(double BCP, double &dV1); - void __fastcall CheckReleaser(double dt); - double __fastcall CVs(double bp); - double __fastcall BVs(double BCP); - void __fastcall PLC(double mass); - void __fastcall SetLP(double TM, double LM, double TBP); - void __fastcall SetLBP(double P); -public: - #pragma option push -w-inl - /* TBrake.Create */ inline __fastcall TKE(double i_mbp, double i_bcr, double i_bcd, double i_brc, Byte - i_bcn, Byte i_BD, Byte i_mat, Byte i_ba, Byte i_nbpa) : TBrake(i_mbp, i_bcr, i_bcd, i_brc, i_bcn, - i_BD, i_mat, i_ba, i_nbpa) { } - #pragma option pop - -public: - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TKE(void) { } - #pragma option pop - -}; - - -class DELPHICLASS THandle; -class PASCALIMPLEMENTATION THandle : public System::TObject -{ - typedef System::TObject inherited; - -public: - bool Time; - bool TimeEP; - double Sounds[5]; - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual void __fastcall Init(double press); - virtual double __fastcall GetCP(void); - virtual void __fastcall SetReductor(double nAdj); - virtual double __fastcall GetSound(Byte i); - virtual double __fastcall GetPos(Byte i); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall THandle(void) : System::TObject() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~THandle(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TFV4a; -class PASCALIMPLEMENTATION TFV4a : public THandle -{ - typedef THandle inherited; - -private: - double CP; - double TP; - double RP; - -public: - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual void __fastcall Init(double press); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TFV4a(void) : THandle() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TFV4a(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TFV4aM; -class PASCALIMPLEMENTATION TFV4aM : public THandle -{ - typedef THandle inherited; - -private: - double CP; - double TP; - double RP; - double XP; - double RedAdj; - bool Fala; - -public: - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual void __fastcall Init(double press); - virtual void __fastcall SetReductor(double nAdj); - virtual double __fastcall GetSound(Byte i); - virtual double __fastcall GetPos(Byte i); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TFV4aM(void) : THandle() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TFV4aM(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TMHZ_EN57; -class PASCALIMPLEMENTATION TMHZ_EN57 : public THandle -{ - typedef THandle inherited; - -private: - double CP; - double TP; - double RP; - double RedAdj; - bool Fala; - -public: - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual void __fastcall Init(double press); - virtual void __fastcall SetReductor(double nAdj); - virtual double __fastcall GetSound(Byte i); - virtual double __fastcall GetPos(Byte i); - virtual double __fastcall GetCP(void); - double __fastcall GetEP(double pos); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TMHZ_EN57(void) : THandle() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TMHZ_EN57(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TM394; -class PASCALIMPLEMENTATION TM394 : public THandle -{ - typedef THandle inherited; - -private: - double CP; - double RedAdj; - -public: - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual void __fastcall Init(double press); - virtual void __fastcall SetReductor(double nAdj); - virtual double __fastcall GetCP(void); - virtual double __fastcall GetPos(Byte i); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TM394(void) : THandle() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TM394(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TH14K1; -class PASCALIMPLEMENTATION TH14K1 : public THandle -{ - typedef THandle inherited; - -private: - double CP; - double RedAdj; - -public: - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual void __fastcall Init(double press); - virtual void __fastcall SetReductor(double nAdj); - virtual double __fastcall GetCP(void); - virtual double __fastcall GetPos(Byte i); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TH14K1(void) : THandle() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TH14K1(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TSt113; -class PASCALIMPLEMENTATION TSt113 : public TH14K1 -{ - typedef TH14K1 inherited; - -private: - double EPS; - -public: - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual double __fastcall GetCP(void); - virtual double __fastcall GetPos(Byte i); - virtual void __fastcall Init(double press); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TSt113(void) : TH14K1() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TSt113(void) { } - #pragma option pop - -}; - - -class DELPHICLASS Ttest; -class PASCALIMPLEMENTATION Ttest : public THandle -{ - typedef THandle inherited; - -private: - double CP; - -public: - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual void __fastcall Init(double press); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall Ttest(void) : THandle() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~Ttest(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TFD1; -class PASCALIMPLEMENTATION TFD1 : public THandle -{ - typedef THandle inherited; - -private: - double MaxBP; - double BP; - -public: - double Speed; - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual void __fastcall Init(double press); - virtual double __fastcall GetCP(void); - void __fastcall SetSpeed(double nSpeed); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TFD1(void) : THandle() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TFD1(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TH1405; -class PASCALIMPLEMENTATION TH1405 : public THandle -{ - typedef THandle inherited; - -private: - double MaxBP; - double BP; - -public: - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual void __fastcall Init(double press); - virtual double __fastcall GetCP(void); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TH1405(void) : THandle() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TH1405(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TFVel6; -class PASCALIMPLEMENTATION TFVel6 : public THandle -{ - typedef THandle inherited; - -private: - double EPS; - -public: - virtual double __fastcall GetPF(double i_bcp, double pp, double hp, double dt, double ep); - virtual double __fastcall GetCP(void); - virtual double __fastcall GetPos(Byte i); - virtual double __fastcall GetSound(Byte i); - virtual void __fastcall Init(double press); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TFVel6(void) : THandle() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TFVel6(void) { } - #pragma option pop - -}; - - -//-- var, const, procedure --------------------------------------------------- -static const Shortint LocalBrakePosNo = 0xa; -static const Shortint MainBrakeMaxPos = 0xa; -static const Shortint bdelay_G = 0x1; -static const Shortint bdelay_P = 0x2; -static const Shortint bdelay_R = 0x4; -static const Shortint bdelay_M = 0x8; -static const Byte bdelay_GR = 0x80; -static const Shortint b_off = 0x0; -static const Shortint b_hld = 0x1; -static const Shortint b_on = 0x2; -static const Shortint b_rfl = 0x4; -static const Shortint b_rls = 0x8; -static const Shortint b_ep = 0x10; -static const Shortint b_asb = 0x20; -static const Byte b_dmg = 0x80; -static const Shortint df_on = 0x1; -static const Shortint df_off = 0x2; -static const Shortint df_br = 0x4; -static const Shortint df_vv = 0x8; -static const Shortint df_bc = 0x10; -static const Shortint df_cv = 0x20; -static const Shortint df_PP = 0x40; -static const Byte df_RR = 0x80; -static const Shortint s_fv4a_b = 0x0; -static const Shortint s_fv4a_u = 0x1; -static const Shortint s_fv4a_e = 0x2; -static const Shortint s_fv4a_x = 0x3; -static const Shortint s_fv4a_t = 0x4; -static const Shortint bp_P10 = 0x0; -static const Shortint bp_P10Bg = 0x2; -static const Shortint bp_P10Bgu = 0x1; -static const Shortint bp_LLBg = 0x4; -static const Shortint bp_LLBgu = 0x3; -static const Shortint bp_LBg = 0x6; -static const Shortint bp_LBgu = 0x5; -static const Shortint bp_KBg = 0x8; -static const Shortint bp_KBgu = 0x7; -static const Shortint bp_D1 = 0x9; -static const Shortint bp_D2 = 0xa; -static const Shortint bp_FR513 = 0xb; -static const Shortint bp_Cosid = 0xc; -static const Shortint bp_PKPBg = 0xd; -static const Shortint bp_PKPBgu = 0xe; -static const Byte bp_MHS = 0x80; -static const Shortint bp_P10yBg = 0xf; -static const Shortint bp_P10yBgu = 0x10; -static const Shortint bp_FR510 = 0x11; -static const Shortint sf_Acc = 0x1; -static const Shortint sf_BR = 0x2; -static const Shortint sf_CylB = 0x4; -static const Shortint sf_CylU = 0x8; -static const Shortint sf_rel = 0x10; -static const Shortint sf_ep = 0x20; -static const Shortint bh_MIN = 0x0; -static const Shortint bh_MAX = 0x1; -static const Shortint bh_FS = 0x2; -static const Shortint bh_RP = 0x3; -static const Shortint bh_NP = 0x4; -static const Shortint bh_MB = 0x5; -static const Shortint bh_FB = 0x6; -static const Shortint bh_EB = 0x7; -static const Shortint bh_EPR = 0x8; -static const Shortint bh_EPN = 0x9; -static const Shortint bh_EPB = 0xa; -#define SpgD (7.917000E-01) -#define SpO (5.067000E-01) -extern PACKAGE double BPT[9][2]; -extern PACKAGE double BPT_394[7][2]; -static const Shortint i_bcpno = 0x6; -extern PACKAGE double __fastcall PF(double P1, double P2, double S, double DP); -extern PACKAGE double __fastcall PF1(double P1, double P2, double S); -extern PACKAGE double __fastcall PFVa(double PH, double PL, double S, double LIM, double DP); -extern PACKAGE double __fastcall PFVd(double PH, double PL, double S, double LIM, double DP); - -} /* namespace Hamulce */ -#if !defined(NO_IMPLICIT_NAMESPACE_USE) -using namespace Hamulce; -#endif -#pragma option pop // -w- -#pragma option pop // -Vx - -#pragma delphiheader end. -//-- end unit ---------------------------------------------------------------- -#endif // hamulce diff --git a/McZapkie/hamulce.pas b/McZapkie/hamulce.pas deleted file mode 100644 index efd36cbc..00000000 --- a/McZapkie/hamulce.pas +++ /dev/null @@ -1,3200 +0,0 @@ -unit hamulce; {fizyka hamulcow dla symulatora} - -(* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*) -(* - MaSzyna EU07 - SPKS - Brakes. - Copyright (C) 2007-2014 Maciej Cierniak -*) - - -(* -(C) youBy -Co brakuje: -moze jeszcze jakis SW -*) -(* -Zrobione: -ESt3, ESt3AL2, ESt4R, LSt, FV4a, FD1, EP2, prosty westinghouse -duzo wersji eliwa -KE -Tarcze od 152A -Magnetyki (implementacja w mover.pas) -Matrosow 394 -H14K1 (zasadniczy), H1405 (pomocniczy), St113 (ep) -Knorr/West EP - eby by -*) - -interface - -uses mctools,sysutils,friction; - -CONST - - LocalBrakePosNo=10; {ilosc nastaw hamulca recznego lub pomocniczego} - MainBrakeMaxPos=10; {max. ilosc nastaw hamulca zasadniczego} - - {nastawy hamulca} - bdelay_G=1; //G - bdelay_P=2; //P - bdelay_R=4; //R - bdelay_M=8; //Mg - bdelay_GR=128; //G-R - - - {stan hamulca} - b_off = 0; //luzowanie - b_hld = 1; //trzymanie - b_on = 2; //napelnianie - b_rfl = 4; //uzupelnianie - b_rls = 8; //odluzniacz - b_ep = 16; //elektropneumatyczny - b_asb = 32; //elektropneumatyczny - b_dmg =128; //wylaczony z dzialania - - {uszkodzenia hamulca} - df_on = 1; //napelnianie - df_off = 2; //luzowanie - df_br = 4; //wyplyw z ZP - df_vv = 8; //wyplyw z komory wstepnej - df_bc = 16; //wyplyw z silownika - df_cv = 32; //wyplyw z ZS - df_PP = 64; //zawsze niski stopien - df_RR =128; //zawsze wysoki stopien - - {indeksy dzwiekow FV4a} - s_fv4a_b = 0; //hamowanie - s_fv4a_u = 1; //luzowanie - s_fv4a_e = 2; //hamowanie nagle - s_fv4a_x = 3; //wyplyw sterujacego fala - s_fv4a_t = 4; //wyplyw z czasowego - - {pary cierne} - bp_P10 = 0; - bp_P10Bg = 2; //eliwo fosforowe P10 - bp_P10Bgu = 1; - bp_LLBg = 4; //komp. b.n.t. - bp_LLBgu = 3; - bp_LBg = 6; //komp. n.t. - bp_LBgu = 5; - bp_KBg = 8; //komp. w.t. - bp_KBgu = 7; - bp_D1 = 9; //tarcze - bp_D2 = 10; - bp_FR513 = 11; //Frenoplast FR513 - bp_Cosid = 12; //jakistam kompozyt :D - bp_PKPBg = 13; //eliwo PKP - bp_PKPBgu = 14; - bp_MHS = 128; //magnetyczny hamulec szynowy - bp_P10yBg = 15; //eliwo fosforowe P10 - bp_P10yBgu= 16; - bp_FR510 = 17; //Frenoplast FR510 - - sf_Acc = 1; //przyspieszacz - sf_BR = 2; //przekladnia - sf_CylB = 4; //cylinder - napelnianie - sf_CylU = 8; //cylinder - oproznianie - sf_rel = 16; //odluzniacz - sf_ep = 32; //zawory ep - - bh_MIN= 0; //minimalna pozycja - bh_MAX= 1; //maksymalna pozycja - bh_FS = 2; //napelnianie uderzeniowe //jesli nie ma, to jazda - bh_RP = 3; //jazda - bh_NP = 4; //odciecie - podwojna trakcja - bh_MB = 5; //odciecie - utrzymanie stopnia hamowania/pierwszy 1 stopien hamowania - bh_FB = 6; //pelne - bh_EB = 7; //nagle - bh_EPR= 8; //ep - luzowanie //pelny luz dla ep ktowego - bh_EPN= 9; //ep - utrzymanie //jesli rowne luzowaniu, wtedy sterowanie przyciskiem - bh_EPB=10; //ep - hamowanie //pelne hamowanie dla ep ktowego - - - SpgD=0.7917; - SpO=0.5067; //przekroj przewodu 1" w l/m - //wyj: jednostka dosyc dziwna, ale wszystkie obliczenia - //i pojemnosci sa podane w litrach (rozsadne wielkosci) - //zas dlugosc pojazdow jest podana w metrach - //a predkosc przeplywu w m/s //3.5 - //7//1.5 -// BPT: array[-2..6] of array [0..1] of real= ((0, 5.0), (14, 5.4), (9, 5.0), (6, 4.6), (9, 4.5), (9, 4.0), (9, 3.5), (9, 2.8), (34, 2.8)); -// BPT: array[-2..6] of array [0..1] of real= ((0, 5.0), (7, 5.0), (2.0, 5.0), (4.5, 4.6), (4.5, 4.2), (4.5, 3.8), (4.5, 3.4), (4.5, 2.8), (8, 2.8)); - BPT: array[-2..6] of array [0..1] of real= ((0, 5.0), (7, 5.0), (2.0, 5.0), (4.5, 4.6), (4.5, 4.2), (4.5, 3.8), (4.5, 3.4), (4.5, 2.8), (8, 2.8)); - BPT_394: array[-1..5] of array [0..1] of real= ((13, 10.0), (5, 5.0), (0, -1), (5, -1), (5, 0.0), (5, 0.0), (18, 0.0)); -// BPT: array[-2..6] of array [0..1] of real= ((0, 5.0), (12, 5.4), (9, 5.0), (9, 4.6), (9, 4.2), (9, 3.8), (9, 3.4), (9, 2.8), (34, 2.8)); -// BPT: array[-2..6] of array [0..1] of real= ((0, 0),(0, 0),(0, 0),(0, 0),(0, 0),(0, 0),(0, 0),(0, 0),(0, 0)); - i_bcpno= 6; - -TYPE - //klasa obejmujaca pojedyncze zbiorniki - TReservoir= class - protected - Cap: real; - Vol: real; - dVol: real; - public - constructor Create; - procedure CreateCap(Capacity: real); - procedure CreatePress(Press: real); - function pa: real; virtual; - function P: real; virtual; - procedure Flow(dv: real); - procedure Act; - end; - - PReservoir=^TReservoir; - - TBrakeCyl= class(TReservoir) - public - function pa: real; override; - function P: real; override; - end; - - //klasa obejmujaca uklad hamulca zespolonego pojazdu - TBrake= class - protected - BrakeCyl: TReservoir; //silownik - BrakeRes: TReservoir; //ZP - ValveRes: TReservoir; //komora wstepna - BCN: byte; //ilosc silownikow - BCM: real; //przekladnia hamulcowa - BCA: real; //laczny przekroj silownikow - BrakeDelays: byte; //dostepne opoznienia - BrakeDelayFlag: byte; //aktualna nastawa - FM: TFricMat; //material cierny - MaxBP: real; //najwyzsze cisnienie - BA: byte; //osie hamowane - NBpA: byte; //klocki na os - SizeBR: real; //rozmiar^2 ZP (w stosunku do 14") - SizeBC: real; //rozmiar^2 CH (w stosunku do 14") - DCV: boolean; //podwojny zawor zwrotny - ASBP: real; //cisnienie hamulca pp - - BrakeStatus: byte; //flaga stanu - SoundFlag: byte; - public - constructor Create(i_mbp, i_bcr, i_bcd, i_brc: real; - i_bcn, i_BD, i_mat, i_ba, i_nbpa: byte); - //maksymalne cisnienie, promien, skok roboczy, pojemnosc ZP; - //ilosc cylindrow, opoznienia hamulca, material klockow, osie hamowane, klocki na os; - - function GetFC(Vel, N: real): real; virtual; //wspolczynnik tarcia - hamulec wie lepiej - function GetPF(PP, dt, Vel: real): real; virtual; //przeplyw miedzy komora wstepna i PG - function GetBCF: real; //sila tlokowa z tloka - function GetHPFlow(HP, dt: real): real; virtual; //przeplyw - 8 bar - function GetBCP: real; virtual; //cisnienie cylindrow hamulcowych - function GetBRP: real; //cisnienie zbiornika pomocniczego - function GetVRP: real; //cisnienie komory wstepnej rozdzielacza - function GetCRP: real; virtual; //cisnienie zbiornika sterujacego - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); virtual; //inicjalizacja hamulca - function SetBDF(nBDF: byte): boolean; //nastawiacz GPRM - procedure Releaser(state: byte); //odluzniacz - procedure SetEPS(nEPS:real); virtual;//hamulec EP - procedure ASB(state: byte); //hamulec przeciwposlizgowy - function GetStatus(): byte; //flaga statusu, moze sie przydac do odglosow - procedure SetASBP(press: real); //ustalenie cisnienia pp - procedure ForceEmptiness(); virtual; - function GetSoundFlag: byte; -// procedure - end; - - TWest= class(TBrake) - private - LBP: real; //cisnienie hamulca pomocniczego - dVP: real; //pobor powietrza wysokiego cisnienia - EPS: real; //stan elektropneumatyka - TareM, LoadM: real; //masa proznego i pelnego - TareBP: real; //cisnienie dla proznego - LoadC: real; //wspolczynnik przystawki wazacej - public - procedure SetLBP(P: real); //cisnienie z hamulca pomocniczego - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - function GetHPFlow(HP, dt: real): real; override; - procedure PLC(mass: real); //wspolczynnik cisnienia przystawki wazacej - procedure SetEPS(nEPS: real); override; //stan hamulca EP - procedure SetLP(TM, LM, TBP: real); //parametry przystawki wazacej - end; - - TESt= class(TBrake) - private - CntrlRes: TReservoir; //zbiornik sterujcy - BVM: real; //przelozenie PG-CH - public - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - procedure EStParams(i_crc: real); //parametry charakterystyczne dla ESt - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - function GetCRP: real; override; - procedure CheckState(BCP: real; var dV1: real); //glowny przyrzad rozrzadczy - procedure CheckReleaser(dt: real); //odluzniacz - function CVs(bp: real): real; //napelniacz sterujacego - function BVs(BCP: real): real; //napelniacz pomocniczego - end; - - TESt3= class(TESt) - private - CylFlowSpeed: array[0..1] of array [0..1] of real; - public - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - end; - - TESt3AL2= class(TESt3) - private - TareM, LoadM: real; //masa proznego i pelnego - TareBP: real; //cisnienie dla proznego - LoadC: real; - public - ImplsRes: TReservoir; //komora impulsowa - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - procedure PLC(mass: real); //wspolczynnik cisnienia przystawki wazacej - procedure SetLP(TM, LM, TBP: real); //parametry przystawki wazacej - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - end; - - TESt4R= class(TESt) - private - RapidStatus: boolean; - RapidTemp: real; //akrualne, zmienne przelozenie - public - ImplsRes: TReservoir; //komora impulsowa - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - end; - - TLSt= class(TESt4R) - private - CylFlowSpeed: array[0..1] of array [0..1] of real; - LBP: real; //cisnienie hamulca pomocniczego - RM: real; //przelozenie rapida - EDFlag: real; //luzowanie hamulca z powodu zalaczonego ED - public - procedure SetLBP(P: real); //cisnienie z hamulca pomocniczego - procedure SetRM(RMR: real); //ustalenie przelozenia rapida - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - function GetHPFlow(HP, dt: real): real; override; //przeplyw - 8 bar - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - function GetEDBCP: real; virtual; //cisnienie tylko z hamulca zasadniczego, uzywane do hamulca ED w EP09 - procedure SetED(EDstate: real); //stan hamulca ED do luzowania - end; - - TEStED= class(TLSt) //zawor z EP09 - Est4 z oddzielnym przekladnikiem, kontrola rapidu i takie tam - private - Nozzles: array[0..10] of real; //dysze - Zamykajacy: boolean; //pamiec zaworka zamykajacego - Przys_blok: boolean; //blokada przyspieszacza - Miedzypoj: TReservoir; //pojemnosc posrednia (urojona) do napelniania ZP i ZS - TareM, LoadM: real; //masa proznego i pelnego - TareBP: real; //cisnienie dla proznego - LoadC: real; - public - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - function GetEDBCP: real; override; //cisnienie tylko z hamulca zasadniczego, uzywane do hamulca ED - procedure PLC(mass: real); //wspolczynnik cisnienia przystawki wazacej - procedure SetLP(TM, LM, TBP: real); //parametry przystawki wazacej - end; - - TEStEP2= class(TLSt) - private - TareM, LoadM: real; //masa proznego i pelnego - TareBP: real; //cisnienie dla proznego - LoadC: real; - EPS: real; - public - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; //inicjalizacja - procedure PLC(mass: real); //wspolczynnik cisnienia przystawki wazacej - procedure SetEPS(nEPS: real); override; //stan hamulca EP - procedure SetLP(TM, LM, TBP: real); //parametry przystawki wazacej - end; - - TCV1= class(TBrake) - private - CntrlRes: TReservoir; //zbiornik sterujcy - BVM: real; //przelozenie PG-CH - public - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - function GetCRP: real; override; - procedure CheckState(BCP: real; var dV1: real); - function CVs(bp: real): real; - function BVs(BCP: real): real; - public - end; - - TCV1R= class(TCV1) - private - ImplsRes: TReservoir; //komora impulsowa - RapidStatus: boolean; - public -// function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG -// procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - end; - - TCV1L_TR= class(TCV1) - private - ImplsRes: TReservoir; //komora impulsowa - LBP: real; //cisnienie hamulca pomocniczego - public - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - procedure SetLBP(P: real); //cisnienie z hamulca pomocniczego - function GetHPFlow(HP, dt: real): real; override; //przeplyw - 8 bar - end; - - TKE= class(TBrake) //Knorr Einheitsbauart jeden do wszystkiego - private - RapidStatus: boolean; - ImplsRes: TReservoir; //komora impulsowa - CntrlRes: TReservoir; //zbiornik sterujcy - Brak2Res: TReservoir; //zbiornik pomocniczy 2 - BVM: real; //przelozenie PG-CH - TareM, LoadM: real; //masa proznego i pelnego - TareBP: real; //cisnienie dla proznego - LoadC: real; //wspolczynnik zaladowania - RM: real; //przelozenie rapida - LBP: real; //cisnienie hamulca pomocniczego - public - procedure SetRM(RMR: real); //ustalenie przelozenia rapida - function GetPF(PP, dt, Vel: real): real; override; //przeplyw miedzy komora wstepna i PG - procedure Init(PP, HPP, LPP, BP: real; BDF: byte); override; - function GetHPFlow(HP, dt: real): real; override; //przeplyw - 8 bar - function GetCRP: real; override; - procedure CheckState(BCP: real; var dV1: real); - procedure CheckReleaser(dt: real); //odluzniacz - function CVs(bp: real): real; //napelniacz sterujacego - function BVs(BCP: real): real; //napelniacz pomocniczego - procedure PLC(mass: real); //wspolczynnik cisnienia przystawki wazacej - procedure SetLP(TM, LM, TBP: real); //parametry przystawki wazacej - procedure SetLBP(P: real); //cisnienie z hamulca pomocniczego - end; - - - - - //klasa obejmujaca krany - THandle= class - private -// BCP: integer; - public - Time: boolean; - TimeEP: boolean; - Sounds: array[0..4] of real; //wielkosci przeplywow dla dzwiekow - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; virtual; - procedure Init(press: real); virtual; - function GetCP(): real; virtual; - procedure SetReductor(nAdj: real); virtual; - function GetSound(i: byte): real; virtual; - function GetPos(i: byte): real; virtual; - end; - - TFV4a= class(THandle) - private - CP, TP, RP: real; //zbiornik sterujcy, czasowy, redukcyjny - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - end; - - TFV4aM= class(THandle) - private - CP, TP, RP: real; //zbiornik sterujcy, czasowy, redukcyjny - XP: real; //komora powietrzna w reduktorze jest potrzebna do odwzorowania fali - RedAdj: real; //dostosowanie reduktora cisnienia (krecenie kapturkiem) -// Sounds: array[0..4] of real; //wielkosci przeplywow dla dzwiekow - Fala: boolean; - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - procedure SetReductor(nAdj: real); override; - function GetSound(i: byte): real; override; - function GetPos(i: byte): real; override; - end; - - TMHZ_EN57= class(THandle) - private - CP, TP, RP: real; //zbiornik sterujcy, czasowy, redukcyjny - RedAdj: real; //dostosowanie reduktora cisnienia (krecenie kapturkiem) - Fala: boolean; - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - procedure SetReductor(nAdj: real); override; - function GetSound(i: byte): real; override; - function GetPos(i: byte): real; override; - function GetCP: real; override; - function GetEP(pos: real): real; - end; - - -{ FBS2= class(THandle) - private - CP, TP, RP: real; //zbiornik sterujcy, czasowy, redukcyjny - XP: real; //komora powietrzna w reduktorze jest potrzebna do odwzorowania fali - RedAdj: real; //dostosowanie reduktora cisnienia (krecenie kapturkiem) -// Sounds: array[0..4] of real; //wielkosci przeplywow dla dzwiekow - Fala: boolean; - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - procedure SetReductor(nAdj: real); override; - function GetSound(i: byte): real; override; - function GetPos(i: byte): real; override; - end; } - -{ TD2= class(THandle) - private - CP, TP, RP: real; //zbiornik sterujcy, czasowy, redukcyjny - XP: real; //komora powietrzna w reduktorze jest potrzebna do odwzorowania fali - RedAdj: real; //dostosowanie reduktora cisnienia (krecenie kapturkiem) -// Sounds: array[0..4] of real; //wielkosci przeplywow dla dzwiekow - Fala: boolean; - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - procedure SetReductor(nAdj: real); override; - function GetSound(i: byte): real; override; - function GetPos(i: byte): real; override; - end;} - - TM394= class(THandle) - private - CP: real; //zbiornik sterujcy, czasowy, redukcyjny - RedAdj: real; //dostosowanie reduktora cisnienia (krecenie kapturkiem) - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - procedure SetReductor(nAdj: real); override; - function GetCP: real; override; - function GetPos(i: byte): real; override; - end; - - TH14K1= class(THandle) - private - CP: real; //zbiornik sterujcy, czasowy, redukcyjny - RedAdj: real; //dostosowanie reduktora cisnienia (krecenie kapturkiem) - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - procedure SetReductor(nAdj: real); override; - function GetCP: real; override; - function GetPos(i: byte): real; override; - end; - - TSt113= class(TH14K1) - private - EPS: real; - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - function GetCP: real; override; - function GetPos(i: byte): real; override; - procedure Init(press: real); override; - end; - - Ttest= class(THandle) - private - CP: real; - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - end; - - TFD1= class(THandle) - private - MaxBP: real; //najwyzsze cisnienie - BP: real; //aktualne cisnienie - public - Speed: real; //szybkosc dzialania - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - function GetCP(): real; override; - procedure SetSpeed(nSpeed: real); -// procedure Init(press: real; MaxBP: real); overload; - end; - - TH1405= class(THandle) - private - MaxBP: real; //najwyzsze cisnienie - BP: real; //aktualne cisnienie - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - procedure Init(press: real); override; - function GetCP(): real; override; -// procedure Init(press: real; MaxBP: real); overload; - end; - - - TFVel6= class(THandle) - private - EPS: real; - public - function GetPF(i_bcp:real; pp, hp, dt, ep: real): real; override; - function GetCP(): real; override; - function GetPos(i: byte): real; override; - function GetSound(i: byte): real; override; - procedure Init(press: real); override; - end; - -function PF(P1,P2,S:real;DP:real = 0.25):real; -function PF1(P1,P2,S:real):real; - -function PFVa(PH,PL,S,LIM:real;DP:real = 0.1):real; //zawor napelniajacy z PH do PL, PL do LIM -function PFVd(PH,PL,S,LIM:real;DP:real = 0.1):real; //zawor wypuszczajacy z PH do PL, PH do LIM - -implementation - -uses _mover; -//---FUNKCJE OGOLNE--- - -const DPL=0.25; - -function PR(p1,p2:real):real; -var ph,pl: real; -begin - ph:=Max0R(p1,p2)+0.1; - pl:=p1+p2-ph+0.2; - PR:=(p2-p1)/(1.13*ph-pl); -end; - -function PF_old(P1,P2,S:real):real; -var ph,pl: real; -begin - PH:=Max0R(P1,P2)+1; - PL:=P1+P2-PH+2; - if PH-PL<0.0001 then PF_old:=0 else - if (PH-PL)<0.05 then - PF_old:=20*(PH-PL)*(PH+1)*222*S*(P2-P1)/(1.13*ph-pl) - else - PF_old:=(PH+1)*222*S*(P2-P1)/(1.13*ph-pl); -end; - -function PF(P1,P2,S:real;DP:real = 0.25):real; -var ph,pl,sg,fm: real; -begin - PH:=Max0R(P1,P2)+1; //wyzsze cisnienie absolutne - PL:=P1+P2-PH+2; //nizsze cisnienie absolutne - sg:=PL/PH; //bezwymiarowy stosunek cisnien - fm:=PH*197*S*sign(P2-P1); //najwyzszy mozliwy przeplyw, wraz z kierunkiem - if (SG>0.5) then //jesli ponizej stosunku krytycznego - if (PH-PL)0.5) then //jesli ponizej stosunku krytycznego - if (SGPL then - begin - LIM:=LIM+1; - PH:=PH+1; //wyzsze cisnienie absolutne - PL:=PL+1; //nizsze cisnienie absolutne - sg:=PL/PH; //bezwymiarowy stosunek cisnien - fm:=PH*197*S; //najwyzszy mozliwy przeplyw, wraz z kierunkiem - if (LIM-PL)0.5) then //jesli ponizej stosunku krytycznego - if (PH-PL)0.5) then //jesli ponizej stosunku krytycznego - if (PH-PL)0.88 then P:=0.5+(VtoC-0.88)*1.043-0.064*(VtoC-0.88)*(VtoC-0.88) - else P:=0.15+0.35/0.82*(VtoC-0.06); -end; *) - -//(* STARA WERSJA -function TBrakeCyl.P:real; -var VtoC: real; //stosunek cisnienia do objetosci -const - VS = 0.005; - pS = 0.05; - VD = 1.10; - cD = 1; - pD = VD-cD; -begin - VtoC:=Vol/Cap; -// P:=VtoC; - if VtoCVD then P:=VtoC-cD //caly silownik - else P:=pS+(VtoC-VS)/(VD-VS)*(pD-pS); //wysuwanie tloka -end; //*) - - -//---HAMULEC--- -(* -constructor TBrake.Create(i_mbp, i_bcr, i_bcd, i_brc: real; i_bcn, i_BD, i_mat, i_ba, i_nbpa: byte); -begin - inherited Create; - MaxBP:=i_mbp; - BCN:=i_bcn; - BCA:=i_bcn*i_bcr*i_bcr*pi; - BA:=i_ba; - NBpA:=i_nbpa; - BrakeDelays:=i_BD; - -//tworzenie zbiornikow - BrakeCyl.CreateCap(i_bcd*BCA*1000); - BrakeRes.CreateCap(i_brc); - ValveRes.CreateCap(0.2); - -// FM.Free; -//materialy cierne - case i_mat of - bp_P10Bg: FM:=TP10Bg.Create; - bp_P10Bgu: FM:=TP10Bgu.Create; - else //domyslnie - FM:=TP10.Create; - end; - - -end ; *) - -constructor TBrake.Create(i_mbp, i_bcr, i_bcd, i_brc: real; i_bcn, i_BD, i_mat, i_ba, i_nbpa: byte); -begin - inherited Create; - MaxBP:=i_mbp; - BCN:=i_bcn; - BCA:=i_bcn*i_bcr*i_bcr*pi; - BA:=i_ba; - NBpA:=i_nbpa; - BrakeDelays:=i_BD; - //210.88 -// SizeBR:=i_bcn*i_bcr*i_bcr*i_bcd*40.17*MaxBP/(5-MaxBP); //objetosc ZP w stosunku do cylindra 14" i cisnienia 4.2 atm - SizeBR:=i_brc*0.0128; - SizeBC:=i_bcn*i_bcr*i_bcr*i_bcd*210.88*MaxBP/4.2; //objetosc CH w stosunku do cylindra 14" i cisnienia 4.2 atm - -// BrakeCyl:=TReservoir.Create; - BrakeCyl:=TBrakeCyl.Create; - BrakeRes:=TReservoir.Create; - ValveRes:=TReservoir.Create; - -//tworzenie zbiornikow - BrakeCyl.CreateCap(i_bcd*BCA*1000); - BrakeRes.CreateCap(i_brc); - ValveRes.CreateCap(0.25); - -// FM.Free; -//materialy cierne - i_mat:=i_mat and (255-bp_MHS); - case i_mat of - bp_P10Bg: FM:=TP10Bg.Create; - bp_P10Bgu: FM:=TP10Bgu.Create; - bp_FR513: FM:=TFR513.Create; - bp_FR510: FM:=TFR510.Create; - bp_Cosid: FM:=TCosid.Create; - bp_P10yBg: FM:=TP10yBg.Create; - bp_P10yBgu: FM:=TP10yBgu.Create; - bp_D1: FM:=TDisk1.Create; - bp_D2: FM:=TDisk2.Create; - else //domyslnie - FM:=TP10.Create; - end; -end; - -//inicjalizacja hamulca (stan poczatkowy) -procedure TBrake.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - -end; - -//pobranie wspolczynnika tarcia materialu -function TBrake.GetFC(Vel, N: real): real; -begin - GetFC:=FM.GetFC(N, Vel); -end; - -//cisnienie cylindra hamulcowego -function TBrake.GetBCP: real; -begin - GetBCP:=BrakeCyl.P; -end; - -//cisnienie zbiornika pomocniczego -function TBrake.GetBRP: real; -begin - GetBRP:=BrakeRes.P; -end; - -//cisnienie komory wstepnej -function TBrake.GetVRP: real; -begin - GetVRP:=ValveRes.P; -end; - -//cisnienie zbiornika sterujacego -function TBrake.GetCRP: real; -begin - GetCRP:=0; -end; - -//przeplyw z przewodu glowneg -function TBrake.GetPF(PP, dt, Vel: real): real; -begin - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - GetPF:=0; -end; - -//przeplyw z przewodu zasilajacego -function TBrake.GetHPFlow(HP, dt: real): real; -begin - GetHPFlow:=0; -end; - -function TBrake.GetBCF: real; -begin - GetBCF:=BCA*100*BrakeCyl.P; -end; - -function TBrake.SetBDF(nBDF: byte): boolean; -begin - if ((nBDF and BrakeDelays)=nBDF)and(nBDF<>BrakeDelayFlag) then - begin - BrakeDelayFlag:=nBDF; - SetBDF:=true; - end - else - SetBDF:=false; -end; - -procedure TBrake.Releaser(state: byte); -begin - BrakeStatus:=(BrakeStatus and 247) or state*b_rls; -end; - -procedure TBrake.SetEPS(nEPS: real); -begin - -end; - -procedure TBrake.ASB(state: byte); -begin //255-b_asb(32) - BrakeStatus:=(BrakeStatus and 223) or state*b_asb; -end; - -function TBrake.GetStatus(): byte; -begin - GetStatus:=BrakeStatus; -end; - -function TBrake.GetSoundFlag: byte; -begin - GetSoundFlag:=SoundFlag; - SoundFlag:=0; -end; - -procedure TBrake.SetASBP(press: real); -begin - ASBP:=press; -end; - -procedure TBrake.ForceEmptiness(); -begin - ValveRes.CreatePress(0); - BrakeRes.CreatePress(0); - ValveRes.Act(); - BrakeRes.Act(); -end; - - -//---WESTINGHOUSE--- - -procedure TWest.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - ValveRes.CreatePress(PP); - BrakeCyl.CreatePress(BP); - BrakeRes.CreatePress(PP/2+HPP/2); -// BrakeStatus:=3*Byte(BP>0.1); -end; - -function TWest.GetPF(PP, dt, Vel: real): real; -var dv, dv1:real; - VVP, BVP, CVP, BCP: real; - temp: real; -begin - - BVP:=BrakeRes.P; - VVP:=ValveRes.P; - CVP:=BrakeCyl.P; - BCP:=BrakeCyl.P; - - if (BrakeStatus and 1)=1 then - if(VVP+0.03BVP+0.1) then - BrakeStatus:=(BrakeStatus and 252) - else if(VVP>BVP) then - BrakeStatus:=(BrakeStatus and 253) - else - else - if(VVP+0.25LBP+0.01) and (DCV) then - dV:=PF(0,CVP,0.1*sizeBC)*dt - else dV:=0; - BrakeCyl.Flow(-dV); - -//hamulec EP - temp:=BVP*Byte(EPS>0); - dV:=PF(temp,LBP,0.0015)*dt*EPS*EPS*Byte(LBP*EPS silowniki - if((BrakeStatus and b_on)=b_on)and((TareBP<0.1)or(BCPLBP)then - begin - DCV:=false; - dV:=PF(BVP,CVP,0.017*sizeBC)*dt; - end - else dV:=0 - else dV:=0; - BrakeRes.Flow(dV); - BrakeCyl.Flow(-dV); - if(DCV)then - dVP:=PF(LBP,BCP,0.01*sizeBC)*dt - else dVP:=0; - BrakeCyl.Flow(-dVP); - if(dVP>0)then dVP:=0; -//przeplyw ZP <-> rozdzielacz - if((BrakeStatus and b_hld)=b_off)then - dV:=PF(BVP,VVP,0.0011*sizeBR)*dt - else dV:=0; - BrakeRes.Flow(dV); - dV1:=dV*0.95; - ValveRes.Flow(-0.05*dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.01*sizeBR)*dt; - ValveRes.Flow(-dV); - - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - GetPF:=dV-dV1; -end; - -function TWest.GetHPFlow(HP, dt: real): real; -begin - GetHPFlow:=dVP; -end; - -procedure TWest.SetLBP(P: real); -begin - LBP:=P; - if P>BrakeCyl.P then -// begin - DCV:=true; -// end -// else -// LBP:=P; -end; - -procedure TWest.SetEPS(nEPS: real); -var - BCP: real; -begin - BCP:=BrakeCyl.P; - if nEPS>0 then - DCV:=true - else if nEPS=0 then - begin - if(EPS<>0)then - begin - if(LBP>0.4)then - LBP:=BrakeCyl.P; - if(LBP<0.15)then - LBP:=0; - end; - end; - EPS:=nEPS; -end; - -procedure TWest.PLC(mass: real); -begin - LoadC:=1+Byte(Mass0.25)then - if(VVP+0.003+BCP/BVMCVP) then - BrakeStatus:=(BrakeStatus and 252) //luzowanie - else if(VVP+BCP/BVM>CVP) then - BrakeStatus:=(BrakeStatus and 253) //zatrzymanie napelaniania - else - else - if(VVP+0.100.25)and(BCP>0.25)then //zatrzymanie luzowanie - BrakeStatus:=(BrakeStatus or 1); - - if (BrakeStatus and 1)=0 then - SoundFlag:=SoundFlag or sf_CylU; -end; - -function TESt.CVs(bp: real): real; -var VVP, BVP, CVP: real; -begin - BVP:=BrakeRes.P; - CVP:=CntrlRes.P; - VVP:=ValveRes.P; - -//przeplyw ZS <-> PG - if(VVP0.4)then - CVs:=0 - else - if(VVP>CVP+0.4)then - if(BVP>CVP+0.2)then - CVs:=0.23 - else - CVs:=0.05 - else - if(BVP>CVP-0.1)then - CVs:=1 - else - CVs:=0.3; -end; - -function TESt.BVs(BCP: real): real; -var VVP, BVP, CVP: real; -begin - BVP:=BrakeRes.P; - CVP:=CntrlRes.P; - VVP:=ValveRes.P; - -//przeplyw ZP <-> rozdzielacz - if(BVPCVP+0.4)then - BVs:=0.1 - else - BVs:=0.3 - else - BVs:=0; -end; - - - - - -function TESt.GetPF(PP, dt, Vel: real): real; -var dv, dv1, temp:real; - VVP, BVP, BCP, CVP: real; -begin - BVP:=BrakeRes.P; - VVP:=ValveRes.P; - BCP:=BrakeCyl.P; - CVP:=CntrlRes.P-0.0; - - dV:=0; dV1:=0; - -//sprawdzanie stanu - CheckState(BCP, dV1); - CheckReleaser(dt); - - CVP:=CntrlRes.P; - VVP:=ValveRes.P; -//przeplyw ZS <-> PG - temp:=CVs(BCP); - dV:=PF(CVP,VVP,0.0015*temp)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.04*dV); - dV1:=dV1-0.96*dV; - - -//luzowanie - if(BrakeStatus and b_hld)=b_off then - dV:=PF(0,BCP,0.0058*sizeBC)*dt - else dV:=0; - BrakeCyl.Flow(-dV); - -//przeplyw ZP <-> silowniki - if(BrakeStatus and b_on)=b_on then - dV:=PF(BVP,BCP,0.016*sizeBC)*dt - else dV:=0; - BrakeRes.Flow(dV); - BrakeCyl.Flow(-dV); - -//przeplyw ZP <-> rozdzielacz - temp:=BVs(BCP); -// if(BrakeStatus and b_hld)=b_off then - if(VVP-0.05>BVP)then - dV:=PF(BVP,VVP,0.02*sizeBR*temp/1.87)*dt - else dV:=0; - BrakeRes.Flow(dV); - dV1:=dV1+dV*0.96; - ValveRes.Flow(-0.04*dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.01)*dt; - ValveRes.Flow(-dV); - - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - CntrlRes.Act; - GetPF:=dV-dV1; -end; - -procedure TESt.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - ValveRes.CreatePress(PP); - BrakeCyl.CreatePress(BP); - BrakeRes.CreatePress(PP); - CntrlRes:=TReservoir.Create; - CntrlRes.CreateCap(15); - CntrlRes.CreatePress(HPP); - BrakeStatus:=0; - - BVM:=1/(HPP-LPP)*MaxBP; - - BrakeDelayFlag:=BDF; -end; - - -procedure TESt.EStParams(i_crc: real); -begin - -end; - - -function TESt.GetCRP: real; -begin - GetCRP:=CntrlRes.P; -end; - -//---EP2--- - -procedure TEStEP2.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - inherited; - ImplsRes.CreateCap(1); - ImplsRes.CreatePress(BP); - - BrakeRes.CreatePress(PP); - - BrakeDelayFlag:=bdelay_P; - BrakeDelays:=bdelay_P; -end; - - -function TEStEP2.GetPF(PP, dt, Vel: real): real; -var dv, dv1, temp:real; - VVP, BVP, BCP, CVP: real; -begin - BVP:=BrakeRes.P; - VVP:=ValveRes.P; - BCP:=ImplsRes.P; - CVP:=CntrlRes.P; //110115 - konsultacje warszawa1 - - dV:=0; dV1:=0; - -//odluzniacz - CheckReleaser(dt); - -//sprawdzanie stanu - if ((BrakeStatus and 1)=1)and(BCP>0.25) then - if(VVP+0.003+BCP/BVMCVP-0.12) then - BrakeStatus:=(BrakeStatus and 252) //luzowanie - else if(VVP+BCP/BVM>CVP-0.12) then - BrakeStatus:=(BrakeStatus and 253) //zatrzymanie napelaniania - else - else - if(VVP+0.100.25) then //zatrzymanie luzowanie - BrakeStatus:=(BrakeStatus or 1); - -//przeplyw ZS <-> PG - if(BVP0)or(BCP>0.25)then - temp:=0 - else - if(VVP>CVP+0.4)then - temp:=0.1 - else - temp:=0.5; - - dV:=PF(CVP,VVP,0.0015*temp/1.8)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.04*dV); - dV1:=dV1-0.96*dV; - -//hamulec EP - temp:=BVP*Byte(EPS>0); - dV:=PF(temp,LBP,0.00053+0.00060*Byte(EPS<0))*dt*EPS*EPS*Byte(LBP*EPS KI - if ((BrakeStatus and b_on)=b_on) and (BCP rozdzielacz - dV:=PF(PP,VVP,0.01*sizeBR)*dt; - ValveRes.Flow(-dV); - - GetPF:=dV-dV1; - - temp:=Max0R(BCP,LBP); - - if(ImplsRes.P>LBP+0.01)then - LBP:=0; - -//luzowanie CH - if(BrakeCyl.P>temp+0.005)or(Max0R(ImplsRes.P,8*LBP)<0.05) then - dV:=PF(0,BrakeCyl.P,0.25*sizeBC*(0.01+(BrakeCyl.P-temp)))*dt - else dV:=0; - BrakeCyl.Flow(-dV); -//przeplyw ZP <-> CH - if(BrakeCyl.P0.10)and(Max0R(BCP,LBP)0) and (LBP+0.01 PG - temp:=CVs(BCP); - dV:=PF(CVP,VVP,0.0015*temp)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.04*dV); - dV1:=dV1-0.96*dV; - - -//luzowanie - if(BrakeStatus and b_hld)=b_off then - dV:=PF(0,BCP,0.0042*(1.37-Byte(BrakeDelayFlag=bdelay_G))*sizeBC)*dt - else dV:=0; - BrakeCyl.Flow(-dV); -//przeplyw ZP <-> silowniki - if(BrakeStatus and b_on)=b_on then - dV:=PF(BVP,BCP,0.017*(1+Byte((BCP<0.58)and(BrakeDelayFlag=bdelay_G)))*(1.13-Byte((BCP>0.6)and(BrakeDelayFlag=bdelay_G)))*sizeBC)*dt - else dV:=0; - BrakeRes.Flow(dV); - BrakeCyl.Flow(-dV); -//przeplyw ZP <-> rozdzielacz - temp:=BVs(BCP); - if(VVP-0.05>BVP)then - dV:=PF(BVP,VVP,0.02*sizeBR*temp/1.87)*dt - else dV:=0; - BrakeRes.Flow(dV); - dV1:=dV1+dV*0.96; - ValveRes.Flow(-0.04*dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.01)*dt; - ValveRes.Flow(-dV); - - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - CntrlRes.Act; - GetPF:=dV-dV1; -end; - -//---EST4-RAPID--- - -function TESt4R.GetPF(PP, dt, Vel: real): real; -var dv, dv1, temp:real; - VVP, BVP, BCP, CVP: real; -begin - BVP:=BrakeRes.P; - VVP:=ValveRes.P; - BCP:=ImplsRes.P; - CVP:=CntrlRes.P-0.0; - - dV:=0; dV1:=0; - -//sprawdzanie stanu - CheckState(BCP, dV1); - CheckReleaser(dt); - - CVP:=CntrlRes.P; - VVP:=ValveRes.P; -//przeplyw ZS <-> PG - temp:=CVs(BCP); - dV:=PF(CVP,VVP,0.0015*temp/1.8)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.04*dV); - dV1:=dV1-0.96*dV; - - -//luzowanie KI - if(BrakeStatus and b_hld)=b_off then - dV:=PF(0,BCP,0.00037*1.14*15/19)*dt - else dV:=0; - ImplsRes.Flow(-dV); -//przeplyw ZP <-> KI - if(BrakeStatus and b_on)=b_on then - dV:=PF(BVP,BCP,0.0014)*dt - else dV:=0; -// BrakeRes.Flow(dV); - ImplsRes.Flow(-dV); -//przeplyw ZP <-> rozdzielacz - temp:=BVs(BCP); - if(BVP rozdzielacz - dV:=PF(PP,VVP,0.01*sizeBR)*dt; - ValveRes.Flow(-dV); - - GetPF:=dV-dV1; - - - - RapidStatus:=(BrakeDelayFlag=bdelay_R)and(((Vel>55)and(RapidStatus))or(Vel>70)); - - RapidTemp:=RapidTemp+(0.9*Byte(RapidStatus)-RapidTemp)*dt/2; - temp:=1.9-RapidTemp; - if((BrakeStatus and b_asb)=b_asb)then - temp:=1000; -//luzowanie CH - if(BrakeCyl.P*temp>ImplsRes.P+0.005)or(ImplsRes.P<0.25) then - if((BrakeStatus and b_asb)=b_asb)then - dV:=PFVd(BrakeCyl.P,0,0.115*sizeBC*4,ImplsRes.P/temp)*dt - else - dV:=PFVd(BrakeCyl.P,0,0.115*sizeBC,ImplsRes.P/temp)*dt -// dV:=PF(0,BrakeCyl.P,0.115*sizeBC/2)*dt -// dV:=PFVd(BrakeCyl.P,0,0.015*sizeBC/2,ImplsRes.P/temp)*dt - else dV:=0; - BrakeCyl.Flow(-dV); -//przeplyw ZP <-> CH - if(BrakeCyl.P*temp0.3) then -// dV:=PFVa(BVP,BrakeCyl.P,0.020*sizeBC,ImplsRes.P/temp)*dt - dV:=PFVa(BVP,BrakeCyl.P,0.60*sizeBC,ImplsRes.P/temp)*dt - else dV:=0; - BrakeRes.Flow(-dV); - BrakeCyl.Flow(+dV); - - ImplsRes.Act; - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - CntrlRes.Act; -end; - -procedure TESt4R.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - inherited; - ImplsRes:=TReservoir.Create; - ImplsRes.CreateCap(1); - ImplsRes.CreatePress(BP); - - BrakeDelayFlag:=bdelay_R; -end; - - -//---EST3/AL2--- - -function TESt3AL2.GetPF(PP, dt, Vel: real): real; -var dv, dv1, temp:real; - VVP, BVP, BCP, CVP: real; -begin - BVP:=BrakeRes.P; - VVP:=ValveRes.P; - BCP:=ImplsRes.P; - CVP:=CntrlRes.P-0.0; - - dV:=0; dV1:=0; - -//sprawdzanie stanu - CheckState(BCP, dV1); - CheckReleaser(dt); - - VVP:=ValveRes.P; -//przeplyw ZS <-> PG - temp:=CVs(BCP); - dV:=PF(CVP,VVP,0.0015*temp)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.04*dV); - dV1:=dV1-0.96*dV; - -//luzowanie KI - if(BrakeStatus and b_hld)=b_off then - dV:=PF(0,BCP,0.00017*(1.37-Byte(BrakeDelayFlag=bdelay_G)))*dt - else dV:=0; - ImplsRes.Flow(-dV); -//przeplyw ZP <-> KI - if ((BrakeStatus and b_on)=b_on) and (BCP0.6)and(BrakeDelayFlag=bdelay_G))))*dt - else dV:=0; - BrakeRes.Flow(dV); - ImplsRes.Flow(-dV); -//przeplyw ZP <-> rozdzielacz - temp:=BVs(BCP); - if(VVP-0.05>BVP)then - dV:=PF(BVP,VVP,0.02*sizeBR*temp/1.87)*dt - else dV:=0; - BrakeRes.Flow(dV); - dV1:=dV1+dV*0.96; - ValveRes.Flow(-0.04*dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.01)*dt; - ValveRes.Flow(-dV); - GetPF:=dV-dV1; - -//luzowanie CH - if(BrakeCyl.P>ImplsRes.P*LoadC+0.005)or(ImplsRes.P<0.15) then - dV:=PF(0,BrakeCyl.P,0.015*sizeBC)*dt - else dV:=0; - BrakeCyl.Flow(-dV); - -//przeplyw ZP <-> CH - if(BrakeCyl.P0.15) then - dV:=PF(BVP,BrakeCyl.P,0.020*sizeBC)*dt - else dV:=0; - BrakeRes.Flow(dV); - BrakeCyl.Flow(-dV); - - ImplsRes.Act; - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - CntrlRes.Act; -end; - -procedure TESt3AL2.PLC(mass: real); -begin - LoadC:=1+Byte(Mass PG - if((CVP-BCP)*BVM>0.5)then - temp:=0 - else - if(VVP>CVP+0.4)then - temp:=0.5 - else - temp:=0.5; - - dV:=PF1(CVP,VVP,0.0015*temp/1.8/2)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.04*dV); - dV1:=dV1-0.96*dV; - - -//luzowanie KI {G} -// if VVP>BCP then -// dV:=PF(VVP,BCP,0.00004)*dt -// else if (CVP-BCP)<1.5 then -// dV:=PF(VVP,BCP,0.00020*(1.33-Byte((CVP-BCP)*BVM>0.65)))*dt -// else dV:=0; 0.00025 P - {P} - if VVP>BCP then - dV:=PF(VVP,BCP,0.00043*(1.5-Byte(((CVP-BCP)*BVM>1)and(BrakeDelayFlag=bdelay_G))),0.1)*dt - else if (CVP-BCP)<1.5 then - dV:=PF(VVP,BCP,0.001472*(1.36-Byte(((CVP-BCP)*BVM>1)and(BrakeDelayFlag=bdelay_G))),0.1)*dt - else dV:=0; - - ImplsRes.Flow(-dV); - ValveRes.Flow(+dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.01,0.1)*dt; - ValveRes.Flow(-dV); - - GetPF:=dV-dV1; - -// if Vel>55 then temp:=0.72 else -// temp:=1;{R} -//cisnienie PP - RapidTemp:=RapidTemp+(RM*Byte((Vel>55)and(BrakeDelayFlag=bdelay_R))-RapidTemp)*dt/2; - temp:=1-RapidTemp; - if EDFlag>0.2 then temp:=10000; - -//powtarzacz podwojny zawor zwrotny - temp:=Max0R(((CVP-BCP)*BVM+ASBP*Byte((BrakeStatus and b_asb)=b_asb))/temp,LBP); -//luzowanie CH - if(BrakeCyl.P>temp+0.005)or(temp<0.28) then -// dV:=PF(0,BrakeCyl.P,0.0015*3*sizeBC)*dt -// dV:=PF(0,BrakeCyl.P,0.005*3*sizeBC)*dt - dV:=PFVd(BrakeCyl.P,0,0.005*7*sizeBC,temp)*dt - else dV:=0; - BrakeCyl.Flow(-dV); -//przeplyw ZP <-> CH - if(BrakeCyl.P0.29) then -// dV:=PF(BVP,BrakeCyl.P,0.002*3*sizeBC*2)*dt - dV:=-PFVa(BVP,BrakeCyl.P,0.002*7*sizeBC*2,temp)*dt - else dV:=0; - BrakeRes.Flow(dV); - BrakeCyl.Flow(-dV); - - ImplsRes.Act; - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - CntrlRes.Act; -// LBP:=ValveRes.P; -// ValveRes.CreatePress(ImplsRes.P); -end; - -procedure TLSt.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - inherited; - ValveRes.CreateCap(1); - ImplsRes.CreateCap(8); - ImplsRes.CreatePress(PP); - BrakeRes.CreatePress(8); - ValveRes.CreatePress(PP); - - EDFlag:=0; - - BrakeDelayFlag:=BDF; -end; - -procedure TLSt.SetLBP(P: real); -begin - LBP:=P; -end; - -function TLSt.GetEDBCP: real; -var CVP, BCP: real; -begin - CVP:=CntrlRes.P; - BCP:=ImplsRes.P; - GetEDBCP:=(CVP-BCP)*BVM; -end; - -procedure TLSt.SetED(EDstate: real); -begin - EDFlag:=EDstate; -end; - -procedure TLSt.SetRM(RMR: real); -begin - RM:=1-RMR; -end; - -function TLSt.GetHPFlow(HP, dt: real): real; -var dV: real; -begin - dV:=Min0R(PF(HP,BrakeRes.P,0.01*dt),0); - BrakeRes.Flow(-dV); - GetHPFlow:=dV; -end; - -//---EStED--- - -function TEStED.GetPF(PP, dt, Vel: real): real; -var dv, dv1, temp:real; - VVP, BVP, BCP, CVP, MPP, nastG: real; - i: byte; -begin - BVP:=BrakeRes.P; - VVP:=ValveRes.P; - BCP:=ImplsRes.P; - CVP:=CntrlRes.P-0.0; - MPP:=Miedzypoj.P; - dV1:=0; - - nastG:=(BrakeDelayFlag and bdelay_G); - -//sprawdzanie stanu - if(BCP<0.25)and(VVP+0.08>CVP)then Przys_blok:=false; - -//sprawdzanie stanu - if(VVP+0.002+BCP/BVMCVP-0.05) then - BrakeStatus:=(BrakeStatus and 252) //luzowanie - else if(VVP+BCP/BVM>CVP-0.05) then - BrakeStatus:=(BrakeStatus and 253) //zatrzymanie napelaniania - else if(VVP+(BCP-0.1)/BVM0.25)then //zatrzymanie luzowania - BrakeStatus:=(BrakeStatus or 1); - - if(VVP+0.100.5)then - Zamykajacy:=true - else if(VVP-0.6CVP-0.08)then - temp:=Nozzles[5] - else - temp:=Nozzles[6]; - dV:=dV+PF(MPP,CVP,temp); - - if(MPP-0.05>BVP)then - dV:=dV+PF(MPP-0.05,BVP,Nozzles[10]*nastG+(1-nastG)*Nozzles[9]); - if MPP>VVP then dV:=dV+PF(MPP,VVP,0.02); - Miedzypoj.Flow(dV*dt*0.15); - - - RapidTemp:=RapidTemp+(RM*Byte((Vel>55)and(BrakeDelayFlag=bdelay_R))-RapidTemp)*dt/2; - temp:=Max0R(1-RapidTemp,0.001); -// if EDFlag then temp:=1000; -// temp:=temp/(1-); - -//powtarzacz podwojny zawor zwrotny - temp:=Max0R(LoadC*BCP/temp*Min0R(Max0R(1-EDFlag,0),1),LBP); - - if(BrakeCyl.P>temp)then - dV:=-PFVd(BrakeCyl.P,0,0.02*sizeBC,temp)*dt - else - if(BrakeCyl.P0 then - BrakeRes.Flow(-dV); - - -//przeplyw ZS <-> PG - if(MPPCVP-0.08)then - temp:=Nozzles[5] - else - temp:=Nozzles[6]; - dV:=PF(CVP,MPP,temp)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.02*dV); - dV1:=dV1+0.98*dV; - -//przeplyw ZP <-> MPJ - if(MPP-0.05>BVP)then - dV:=PF(BVP,MPP-0.05,Nozzles[10]*nastG+(1-nastG)*Nozzles[9])*dt - else dV:=0; - BrakeRes.Flow(dV); - dV1:=dV1+dV*0.98; - ValveRes.Flow(-0.02*dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.005)*dt; //0.01 - ValveRes.Flow(-dV); - - - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - CntrlRes.Act; - Miedzypoj.Act; - ImplsRes.Act; - GetPF:=dV-dV1; -end; - -procedure TEStED.Init(PP, HPP, LPP, BP: real; BDF: byte); -var i:integer; -begin - inherited; - - ValveRes.CreatePress(1*PP); - BrakeCyl.CreatePress(1*BP); - -// CntrlRes:=TReservoir.Create; -// CntrlRes.CreateCap(15); -// CntrlRes.CreatePress(1*HPP); - - BrakeStatus:=Byte(BP>1)*1; - Miedzypoj:=TReservoir.Create; - Miedzypoj.CreateCap(5); - Miedzypoj.CreatePress(PP); - - ImplsRes.CreateCap(1); - ImplsRes.CreatePress(BP); - - BVM:=1/(HPP-0.05-LPP)*MaxBP; - - BrakeDelayFlag:=BDF; - Zamykajacy:=false; - EDFlag:=0; - - Nozzles[0]:=1.250/1.7; - Nozzles[1]:=0.907; - Nozzles[2]:=0.510/1.7; - Nozzles[3]:=0.524/1.17; - Nozzles[4]:=7.4; - Nozzles[7]:=5.3; - Nozzles[8]:=2.5; - Nozzles[9]:=7.28; - Nozzles[10]:=2.96; - Nozzles[5]:=1.1; - Nozzles[6]:=0.9; - - for i:=0 to 10 do - begin - Nozzles[i]:=Nozzles[i]*Nozzles[i]*3.14159/4000; - end; - -end; - -function TEStED.GetEDBCP: real; -begin - GetEDBCP:=ImplsRes.P*LoadC; -end; - -procedure TEStED.PLC(mass: real); -begin - LoadC:=1+Byte(MassCVP) then - BrakeStatus:=(BrakeStatus and 252) //luzowanie - else if(VVP+BCP/BVM>CVP) then - BrakeStatus:=(BrakeStatus and 253) //zatrzymanie napelaniania - else - else - if(VVP+0.100.25) then //zatrzymanie luzowanie - BrakeStatus:=(BrakeStatus or 1); -end; - -function TCV1.CVs(bp: real): real; -begin -//przeplyw ZS <-> PG - if(bp>0.05)then - CVs:=0 - else - CVs:=0.23 -end; - -function TCV1.BVs(BCP: real): real; -var VVP, BVP, CVP: real; -begin - BVP:=BrakeRes.P; - CVP:=CntrlRes.P; - VVP:=ValveRes.P; - -//przeplyw ZP <-> rozdzielacz - if(BVP0.05)then - BVs:=0 - else - BVs:=0.2*(1.5-Byte(BVP>VVP)); -end; - -function TCV1.GetPF(PP, dt, Vel: real): real; -var dv, dv1, temp:real; - VVP, BVP, BCP, CVP: real; -begin - BVP:=BrakeRes.P; - VVP:=Min0R(ValveRes.P,BVP+0.05); - BCP:=BrakeCyl.P; - CVP:=CntrlRes.P-0.0; - - dV:=0; dV1:=0; - -//sprawdzanie stanu - CheckState(BCP, dV1); - - VVP:=ValveRes.P; -//przeplyw ZS <-> PG - temp:=CVs(BCP); - dV:=PF(CVP,VVP,0.0015*temp)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.04*dV); - dV1:=dV1-0.96*dV; - - -//luzowanie - if(BrakeStatus and b_hld)=b_off then - dV:=PF(0,BCP,0.0042*(1.37-Byte(BrakeDelayFlag=bdelay_G))*sizeBC)*dt - else dV:=0; - BrakeCyl.Flow(-dV); - -//przeplyw ZP <-> silowniki - if(BrakeStatus and b_on)=b_on then - dV:=PF(BVP,BCP,0.017*(1+Byte((BCP<0.58)and(BrakeDelayFlag=bdelay_G)))*(1.13-Byte((BCP>0.6)and(BrakeDelayFlag=bdelay_G)))*sizeBC)*dt - else dV:=0; - BrakeRes.Flow(dV); - BrakeCyl.Flow(-dV); - -//przeplyw ZP <-> rozdzielacz - temp:=BVs(BCP); - if(VVP+0.05>BVP)then - dV:=PF(BVP,VVP,0.02*sizeBR*temp/1.87)*dt - else dV:=0; - BrakeRes.Flow(dV); - dV1:=dV1+dV*0.96; - ValveRes.Flow(-0.04*dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.01)*dt; - ValveRes.Flow(-dV); - - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - CntrlRes.Act; - GetPF:=dV-dV1; -end; - -procedure TCV1.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - ValveRes.CreatePress(PP); - BrakeCyl.CreatePress(BP); - BrakeRes.CreatePress(PP); - CntrlRes:=TReservoir.Create; - CntrlRes.CreateCap(15); - CntrlRes.CreatePress(HPP); - BrakeStatus:=0; - - BVM:=1/(HPP-LPP)*MaxBP; - - BrakeDelayFlag:=BDF; -end; - -function TCV1.GetCRP: real; -begin - GetCRP:=CntrlRes.P; -end; - - -//---CV1-L-TR--- - -procedure TCV1L_TR.SetLBP(P: real); -begin - LBP:=P; -end; - -function TCV1L_TR.GetHPFlow(HP, dt: real): real; -var dV: real; -begin - dV:=PF(HP,BrakeRes.P,0.01)*dt; - dV:=Min0R(0,dV); - BrakeRes.Flow(-dV); - GetHPFlow:=dV; -end; - -procedure TCV1L_TR.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - inherited; - ImplsRes:=TReservoir.Create; - ImplsRes.CreateCap(2.5); - ImplsRes.CreatePress(BP); -end; - -function TCV1L_TR.GetPF(PP, dt, Vel: real): real; -var dv, dv1, temp:real; - VVP, BVP, BCP, CVP: real; -begin - BVP:=BrakeRes.P; - VVP:=Min0R(ValveRes.P,BVP+0.05); - BCP:=ImplsRes.P; - CVP:=CntrlRes.P-0.0; - - dV:=0; dV1:=0; - -//sprawdzanie stanu - CheckState(BCP, dV1); - - VVP:=ValveRes.P; -//przeplyw ZS <-> PG - temp:=CVs(BCP); - dV:=PF(CVP,VVP,0.0015*temp)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.04*dV); - dV1:=dV1-0.96*dV; - - -//luzowanie KI - if(BrakeStatus and b_hld)=b_off then - dV:=PF(0,BCP,0.000425*(1.37-Byte(BrakeDelayFlag=bdelay_G)))*dt - else dV:=0; - ImplsRes.Flow(-dV); -//przeplyw ZP <-> KI - if ((BrakeStatus and b_on)=b_on) and (BCP0.6)and(BrakeDelayFlag=bdelay_G))))*dt - else dV:=0; - BrakeRes.Flow(dV); - ImplsRes.Flow(-dV); - -//przeplyw ZP <-> rozdzielacz - temp:=BVs(BCP); - if(VVP+0.05>BVP)then - dV:=PF(BVP,VVP,0.02*sizeBR*temp/1.87)*dt - else dV:=0; - BrakeRes.Flow(dV); - dV1:=dV1+dV*0.96; - ValveRes.Flow(-0.04*dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.01)*dt; - GetPF:=dV-dV1; - - temp:=Max0R(BCP,LBP); - -//luzowanie CH - if(BrakeCyl.P>temp+0.005)or(Max0R(ImplsRes.P,8*LBP)<0.25) then - dV:=PF(0,BrakeCyl.P,0.015*sizeBC)*dt - else dV:=0; - BrakeCyl.Flow(-dV); - -//przeplyw ZP <-> CH - if(BrakeCyl.P0.3)and(Max0R(BCP,LBP)CVP) then - BrakeStatus:=(BrakeStatus and 252) //luzowanie - else if(VVP+BCP/BVM>CVP) then - BrakeStatus:=(BrakeStatus and 253) //zatrzymanie napelaniania - else - else - if(VVP+0.100.25) then //zatrzymanie luzowanie - BrakeStatus:=(BrakeStatus or 1); -end; - -function TKE.CVs(bp: real): real; -var VVP, BVP, CVP: real; -begin - BVP:=BrakeRes.P; - CVP:=CntrlRes.P; - VVP:=ValveRes.P; - -//przeplyw ZS <-> PG - if(bp>0.2)then - CVs:=0 - else - if(VVP>CVP+0.4)then - CVs:=0.05 - else - CVs:=0.23 -end; - -function TKE.BVs(BCP: real): real; -var VVP, BVP, CVP: real; -begin - BVP:=BrakeRes.P; - CVP:=CntrlRes.P; - VVP:=ValveRes.P; - -//przeplyw ZP <-> rozdzielacz - if (BVP>VVP) then - BVs:=0 - else - if(BVP PG - temp:=CVs(IMP); - dV:=PF(CVP,VVP,0.0015*temp)*dt; - CntrlRes.Flow(+dV); - ValveRes.Flow(-0.04*dV); - dV1:=dV1-0.96*dV; - -//luzowanie - if(BrakeStatus and b_hld)=b_off then - begin - if ((BrakeDelayFlag and bdelay_G)=0) then - temp:=0.283+0.139 - else - temp:=0.139; - dV:=PF(0,IMP,0.001*temp)*dt - end - else dV:=0; - ImplsRes.Flow(-dV); - -//przeplyw ZP <-> silowniki - if((BrakeStatus and b_on)=b_on)and(IMP50)and(RapidStatus))or(Vel>70)) - else //jesli tarczowki, to zostan - RapidStatus:=((BrakeDelayFlag and bdelay_R)=bdelay_R); - -// temp:=1.9-0.9*Byte(RapidStatus); - - if(RM*RM>0.1)then //jesli jest rapid - if(RM>0)then //jesli dodatni (naddatek); - temp:=1-RM*Byte(RapidStatus) - else - temp:=1-RM*(1-Byte(RapidStatus)) - else - temp:=1; - temp:=temp/LoadC; -//luzowanie CH -// temp:=Max0R(BCP,LBP); - IMP:=Max0R(IMP/temp,Max0R(LBP,ASBP*Byte((BrakeStatus and b_asb)=b_asb))); - -//luzowanie CH - if(BCP>IMP+0.005)or(Max0R(ImplsRes.P,8*LBP)<0.25) then - dV:=PFVd(BCP,0,0.05,IMP)*dt - else dV:=0; - BrakeCyl.Flow(-dV); - if(BCP0.3) then - dV:=PFVa(BVP,BCP,0.05,IMP)*dt - else dV:=0; - BrakeRes.Flow(-dV); - BrakeCyl.Flow(+dV); - -//przeplyw ZP <-> rozdzielacz - temp:=BVs(IMP); -// if(BrakeStatus and b_hld)=b_off then - if(IMP<0.25)or(VVP+0.05>BVP)then - dV:=PF(BVP,VVP,0.02*sizeBR*temp/1.87)*dt - else dV:=0; - BrakeRes.Flow(dV); - dV1:=dV1+dV*0.96; - ValveRes.Flow(-0.04*dV); -//przeplyw PG <-> rozdzielacz - dV:=PF(PP,VVP,0.01)*dt; - ValveRes.Flow(-dV); - - ValveRes.Act; - BrakeCyl.Act; - BrakeRes.Act; - CntrlRes.Act; - ImplsRes.Act; - GetPF:=dV-dV1; -end; - -procedure TKE.Init(PP, HPP, LPP, BP: real; BDF: byte); -begin - ValveRes.CreatePress(PP); - BrakeCyl.CreatePress(BP); - BrakeRes.CreatePress(PP); - - CntrlRes:=TReservoir.Create; //komora sterujaca - CntrlRes.CreateCap(5); - CntrlRes.CreatePress(HPP); - - ImplsRes:=TReservoir.Create; //komora zastepcza silownika - ImplsRes.CreateCap(1); - ImplsRes.CreatePress(BP); - - BrakeStatus:=0; - - BVM:=1/(HPP-LPP)*MaxBP; - - BrakeDelayFlag:=BDF; -end; - -function TKE.GetCRP: real; -begin - GetCRP:=CntrlRes.P; -end; - -function TKE.GetHPFlow(HP, dt: real): real; -var dV: real; -begin - dV:=PF(HP,BrakeRes.P,0.01)*dt; - dV:=Min0R(0,dV); - BrakeRes.Flow(-dV); - GetHPFlow:=dV; -end; - -procedure TKE.PLC(mass: real); -begin - LoadC:=1+Byte(Massrp+0.05)then - dpMainValve:=PF(Min0R(cp+0.1,HP),pp,1.1*(ActFlowSpeed)/(LBDelay))*dt; - if(cp0.1)then - begin - cp:=5+(tp-0.1)*0.08; - tp:=tp-dt/12/2; - end; - if(cp>rp+0.1)and(cp<=5)then - dpMainValve:=PF(Min0R(cp+0.25,HP),pp,2*(ActFlowSpeed)/(LBDelay))*dt - else - if cp>5 then - dpMainValve:=PF(Min0R(cp,HP),pp,2*(ActFlowSpeed)/(LBDelay))*dt - else - dpMainValve:=PF(dpPipe,pp,(ActFlowSpeed)/(LBDelay))*dt - end; - - if(Round(i_bcp)=i_bcpNo)then - begin - dpMainValve:=PF(0,pp,(ActFlowSpeed)/(LBDelay))*dt; - end; - - GetPF:=dpMainValve; -end; - -procedure TFV4a.Init(press: real); -begin - CP:= press; - TP:= 0; - RP:= press; - Time:= false; - TimeEP:=false; -end; - - -//---FV4a/M--- nowonapisany kran bez poprawki IC - -function TFV4aM.GetPF(i_bcp:real; pp, hp, dt, ep: real): real; -function LPP_RP(pos: real): real; //cisnienie z zaokraglonej pozycji; -var i_pos: integer; -begin - i_pos:=Round(pos-0.5); //zaokraglone w dol - LPP_RP:=BPT[i_pos][1]+(BPT[i_pos+1][1]-BPT[i_pos][1])*(pos-i_pos); //interpolacja liniowa -end; -function EQ(pos: real; i_pos: real): boolean; -begin - EQ:=(pos<=i_pos+0.5)and(pos>i_pos-0.5); -end; -const - LBDelay = 100; - xpM = 0.3; //mnoznik membrany komory pod -var - LimPP, dpPipe, dpMainValve, ActFlowSpeed, dp: real; - pom: real; - i: byte; -begin - ep:=pp/2*1.5+ep/2*0.5; //SPKS!! -// ep:=pp; -// ep:=cp/3+pp/3+ep/3; -// ep:=cp; - - for i:=0 to 4 do - Sounds[i]:=0; - dp:=0; - - i_bcp:=Max0R(Min0R(i_bcp,5.999),-1.999); //na wszelki wypadek, zeby nie wyszlo poza zakres - - if(tp>0)then - begin //jesli czasowy jest niepusty -// dp:=0.07; //od cisnienia 5 do 0 w 60 sekund ((5-0)*dt/75) - dp:=0.045; //2.5 w 55 sekund (5,35->5,15 w PG) - tp:=tp-dp*dt; - Sounds[s_fv4a_t]:=dp; - end - else //.08 - begin - tp:=0; - end; - - if(xp>0)then //jesli komora pod niepusta jest niepusty - begin - dp:=2.5; - Sounds[s_fv4a_x]:=dp*xp; - xp:=xp-dt*dp*2; //od cisnienia 5 do 0 w 10 sekund ((5-0)*dt/10) - end - else //.75 - xp:=0; //jak pusty, to pusty - - Limpp:=Min0R(LPP_RP(i_bcp)+tp*0.08+RedAdj,HP); //pozycja + czasowy lub zasilanie - ActFlowSpeed:=BPT[Round(i_bcp)][0]; - - if(EQ(i_bcp,-1))then pom:=Min0R(HP,5.4+RedAdj) else pom:=Min0R(cp,HP); - - if(pom>rp+0.25)then Fala:=true; - if(Fala)then - if(pom>rp+0.3)then -// if(ep>rp+0.11)then - xp:=xp-20*PR(pom,xp)*dt -// else -// xp:=xp-16*(ep-(ep+0.01))/(0.1)*PR(ep,xp)*dt - else Fala:=false; - - if(Limpp>cp)then //podwyzszanie szybkie - cp:=cp+5*60*Min0R(abs(Limpp-cp),0.05)*PR(cp,Limpp)*dt //zbiornik sterujacy - else - cp:=cp+13*Min0R(abs(Limpp-cp),0.05)*PR(cp,Limpp)*dt; //zbiornik sterujacy - - Limpp:=pom; //cp - dpPipe:=Min0R(HP,Limpp+xp*xpM); - - if dpPipe>pp then - dpMainValve:=-PFVa(HP,pp,ActFlowSpeed/(LBDelay),dpPipe,0.4) - else - dpMainValve:=PFVd(pp,0,ActFlowSpeed/(LBDelay),dpPipe,0.4); - - if EQ(i_bcp,-1) then - begin - if(tp<5)then tp:=tp+dt; //5/10 - if(tp<1)then tp:=tp-0.5*dt; //5/10 -// dpMainValve:=dpMainValve*2;//+1*PF(dpPipe,pp,(ActFlowSpeed)/(LBDelay))//coby nie przeszkadzal przy ladowaniu z zaworu obok - end; - - if EQ(i_bcp,0) then - begin - if(tp>2)then - dpMainValve:=dpMainValve*1.5;//+0.5*PF(dpPipe,pp,(ActFlowSpeed)/(LBDelay))//coby nie przeszkadzal przy ladowaniu z zaworu obok - end; - - - - - - ep:=dpPipe; - if(EQ(i_bcp,0)or(rp>ep))then - rp:=rp+PF(rp,ep,0.0007)*dt //powolne wzrastanie, ale szybsze na jezdzie - else - rp:=rp+PF(rp,ep,0.000093/2*2)*dt; //powolne wzrastanie i to bardzo //jednak trzeba wydluzyc, bo obecnie zle dziala - if (rp0 then - Sounds[s_fv4a_b]:=dpMainValve - else - Sounds[s_fv4a_u]:=-dpMainValve; - end; - - GetPF:=dpMainValve*dt; -end; - -procedure TFV4aM.Init(press: real); -begin - CP:= press; - TP:= 0; - RP:= press; - XP:= 0; - Time:=false; - TimeEP:=false; -end; - -procedure TFV4aM.SetReductor(nAdj: real); -begin - RedAdj:= nAdj; -end; - -function TFV4aM.GetSound(i: byte): real; -begin - if i>4 then - GetSound:=0 - else - GetSound:=Sounds[i]; -end; - -function TFV4aM.GetPos(i: byte): real; -const - table: array[0..10] of real = (-2,6,-1,0,-2,1,4,6,0,0,0); -begin - GetPos:=table[i]; -end; - -//---FV4a/M--- nowonapisany kran bez poprawki IC - -function TMHZ_EN57.GetPF(i_bcp:real; pp, hp, dt, ep: real): real; -function LPP_RP(pos: real): real; //cisnienie z zaokraglonej pozycji; -begin - if pos>8.5 then - LPP_RP:=5.0-0.15*pos-0.35 - else if pos>0.5 then - LPP_RP:=5.0-0.15*pos-0.1 - else - LPP_RP:=5.0 -end; -function EQ(pos: real; i_pos: real): boolean; -begin - EQ:=(pos<=i_pos+0.5)and(pos>i_pos-0.5); -end; -const - LBDelay = 100; -var - LimPP, dpPipe, dpMainValve, ActFlowSpeed, dp: real; - pom: real; - i: byte; -begin - - for i:=0 to 4 do - Sounds[i]:=0; - dp:=0; - - i_bcp:=Max0R(Min0R(i_bcp,9.999),-0.999); //na wszelki wypadek, zeby nie wyszlo poza zakres - - if(tp>0)then - begin - dp:=0.045; - if EQ(i_bcp,0) then - tp:=tp-dp*dt; - Sounds[s_fv4a_t]:=dp; - end - else - begin - tp:=0; - end; - - Limpp:=Min0R(LPP_RP(i_bcp)+tp*0.08+RedAdj,HP); //pozycja + czasowy lub zasilanie - ActFlowSpeed:=4; - - if(EQ(i_bcp,-1))then pom:=Min0R(HP,5.4+RedAdj) else pom:=Min0R(cp,HP); - - if(Limpp>cp)then //podwyzszanie szybkie - cp:=cp+60*Min0R(abs(Limpp-cp),0.05)*PR(cp,Limpp)*dt //zbiornik sterujacy - else - cp:=cp+13*Min0R(abs(Limpp-cp),0.05)*PR(cp,Limpp)*dt; //zbiornik sterujacy - - Limpp:=pom; //cp - if EQ(i_bcp,-1) then - dpPipe:=HP - else - dpPipe:=Min0R(HP,Limpp); - - if dpPipe>pp then - dpMainValve:=-PFVa(HP,pp,ActFlowSpeed/(LBDelay),dpPipe,0.4) - else - dpMainValve:=PFVd(pp,0,ActFlowSpeed/(LBDelay),dpPipe,0.4); - - if EQ(i_bcp,-1) then - begin - if(tp<5)then tp:=tp+dt; //5/10 - if(tp<1)then tp:=tp-0.5*dt; //5/10 - end; - - if(EQ(i_bcp,10))or(EQ(i_bcp,-2))then - begin - dp:=PF(0,pp,2*(ActFlowSpeed)/(LBDelay)); - dpMainValve:=dp; - Sounds[s_fv4a_e]:=dp; - Sounds[s_fv4a_u]:=0; - Sounds[s_fv4a_b]:=0; - Sounds[s_fv4a_x]:=0; - end - else - begin - if dpMainValve>0 then - Sounds[s_fv4a_b]:=dpMainValve - else - Sounds[s_fv4a_u]:=-dpMainValve; - end; - - if (i_bcp<1.5) then - RP:=Max0R(0,0.125*i_bcp) - else - RP:=Min0R(1,0.125*i_bcp-0.125); - - GetPF:=dpMainValve*dt; -end; - -procedure TMHZ_EN57.Init(press: real); -begin - CP:= press; - TP:= 0; - RP:= 0; - Time:=false; - TimeEP:=false; -end; - -procedure TMHZ_EN57.SetReductor(nAdj: real); -begin - RedAdj:= nAdj; -end; - -function TMHZ_EN57.GetSound(i: byte): real; -begin - if i>4 then - GetSound:=0 - else - GetSound:=Sounds[i]; -end; - -function TMHZ_EN57.GetPos(i: byte): real; -const - table: array[0..10] of real = (-2,10,-1,0,0,2,9,10,0,0,0); -begin - GetPos:=table[i]; -end; - -function TMHZ_EN57.GetCP: real; -begin - GetCP:=RP; -end; - -function TMHZ_EN57.GetEP(pos: real): real; -begin - if pos<9.5 then - GetEP:=Min0R(Max0R(0,0.125*pos),1) - else - GetEP:=0; -end; - -//---M394--- Matrosow - -function TM394.GetPF(i_bcp:real; pp, hp, dt, ep: real): real; -const - LBDelay = 65; -var - LimPP, dpPipe, dpMainValve, ActFlowSpeed: real; - bcp: integer; -begin - bcp:=Round(i_bcp); - if bcp<-1 then bcp:=1; - - Limpp:=Min0R(BPT_394[bcp][1],HP); - ActFlowSpeed:=BPT_394[bcp][0]; - if (bcp=1)or(bcp=i_bcpNo) then - Limpp:=pp; - if (bcp=0) then - Limpp:=Limpp+RedAdj; - if (bcp<>2) then - if cp3)+Byte(bcp>4))*Min0R(abs(Limpp-cp),0.05)*PR(cp,Limpp)*dt; //zbiornik sterujacy - - Limpp:=cp; - dpPipe:=Min0R(HP,Limpp); - -// if(dpPipe>pp)then //napelnianie -// dpMainValve:=PF(dpPipe,pp,ActFlowSpeed/(LBDelay))*dt -// else //spuszczanie - dpMainValve:=PF(dpPipe,pp,ActFlowSpeed/(LBDelay))*dt; - - if bcp=-1 then -// begin - dpMainValve:=PF(HP,pp,(ActFlowSpeed)/(LBDelay))*dt; -// end; - - if bcp=i_bcpNo then -// begin - dpMainValve:=PF(0,pp,(ActFlowSpeed)/(LBDelay))*dt; -// end; - - GetPF:=dpMainValve; -end; - -procedure TM394.Init(press: real); -begin - CP:= press; - RedAdj:= 0; - Time:=true; - TimeEP:=false; -end; - -procedure TM394.SetReductor(nAdj: real); -begin - RedAdj:= nAdj; -end; - -function TM394.GetCP: real; -begin - GetCP:= CP; -end; - -function TM394.GetPos(i: byte): real; -const - table: array[0..10] of real = (-1,5,-1,0,1,2,4,5,0,0,0); -begin - GetPos:=table[i]; -end; - -//---H14K1-- Knorr - -function TH14K1.GetPF(i_bcp:real; pp, hp, dt, ep: real): real; -const - LBDelay = 100; //szybkosc + zasilanie sterujacego - BPT_K: array[-1..4] of array [0..1] of real= ((10, 0), (4, 1), (0, 1), (4, 0), (4, -1), (15, -1)); - NomPress = 5.0; -var - LimPP, dpPipe, dpMainValve, ActFlowSpeed: real; - bcp: integer; -begin - bcp:=Round(i_bcp); - if i_bcp<-1 then bcp:=1; - Limpp:=BPT_K[bcp][1]; - if Limpp<0 then - Limpp:=0.5*pp - else if Limpp>0 then - Limpp:=pp - else - Limpp:=cp; - ActFlowSpeed:=BPT_K[bcp][0]; - - cp:=cp+6*Min0R(abs(Limpp-cp),0.05)*PR(cp,Limpp)*dt; //zbiornik sterujacy - - dpMainValve:=0; - - if bcp=-1 then - dpMainValve:=PF(HP,pp,(ActFlowSpeed)/(LBDelay))*dt; - if(bcp=0)then - dpMainValve:=-PFVa(HP,pp,(ActFlowSpeed)/(LBDelay),NomPress+RedAdj)*dt; - if (bcp>1)and(pp>cp) then - dpMainValve:=PFVd(pp,0,(ActFlowSpeed)/(LBDelay),cp)*dt; - if bcp=i_bcpNo then - dpMainValve:=PF(0,pp,(ActFlowSpeed)/(LBDelay))*dt; - - GetPF:=dpMainValve; -end; - -procedure TH14K1.Init(press: real); -begin - CP:= press; - RedAdj:= 0; - Time:=true; - TimeEP:=true; -end; - -procedure TH14K1.SetReductor(nAdj: real); -begin - RedAdj:= nAdj; -end; - -function TH14K1.GetCP: real; -begin - GetCP:= CP; -end; - -function TH14K1.GetPos(i: byte): real; -const - table: array[0..10] of real = (-1,4,-1,0,1,2,3,4,0,0,0); -begin - GetPos:=table[i]; -end; - -//---St113-- Knorr EP - -function TSt113.GetPF(i_bcp:real; pp, hp, dt, ep: real): real; -const - LBDelay = 100; //szybkosc + zasilanie sterujacego - BPT_K: array[-1..4] of array [0..1] of real= ((10, 0), (4, 1), (0, 1), (4, 0), (4, -1), (15, -1)); - BEP_K: array[-1..5] of real= (0, -1, 1, 0, 0, 0, 0); - NomPress = 5.0; -var - LimPP, dpPipe, dpMainValve, ActFlowSpeed: real; - bcp: integer; -begin - bcp:=Round(i_bcp); - - EPS:=BEP_K[bcp]; - - if bcp>0 then bcp:=bcp-1; - - if bcp<-1 then bcp:=1; - Limpp:=BPT_K[bcp][1]; - if Limpp<0 then - Limpp:=0.5*pp - else if Limpp>0 then - Limpp:=pp - else - Limpp:=cp; - ActFlowSpeed:=BPT_K[bcp][0]; - - cp:=cp+6*Min0R(abs(Limpp-cp),0.05)*PR(cp,Limpp)*dt; //zbiornik sterujacy - - dpMainValve:=0; - - if bcp=-1 then - dpMainValve:=PF(HP,pp,(ActFlowSpeed)/(LBDelay))*dt; - if(bcp=0)then - dpMainValve:=-PFVa(HP,pp,(ActFlowSpeed)/(LBDelay),NomPress+RedAdj)*dt; - if (bcp>1)and(pp>cp) then - dpMainValve:=PFVd(pp,0,(ActFlowSpeed)/(LBDelay),cp)*dt; - if bcp=i_bcpNo then - dpMainValve:=PF(0,pp,(ActFlowSpeed)/(LBDelay))*dt; - - GetPF:=dpMainValve; -end; - -function TSt113.GetCP: real; -begin - GetCP:=EPS; -end; - -function TSt113.GetPos(i: byte): real; -const - table: array[0..10] of real = (-1,5,-1,0,2,3,4,5,0,0,1); -begin - GetPos:=table[i]; -end; - -procedure TSt113.Init(press: real); -begin - Time:=true; - TimeEP:=true; -end; - -//--- test --- - -function Ttest.GetPF(i_bcp:real; pp, hp, dt, ep: real): real; -const - LBDelay = 100; -var - LimPP, dpPipe, dpMainValve, ActFlowSpeed: real; -begin - - Limpp:=BPT[Round(i_bcp)][1]; - ActFlowSpeed:=BPT[Round(i_bcp)][0]; - - if(i_bcp=i_bcpNo)then limpp:=0.0; - - if(i_bcp=-1)then limpp:=7; - - cp:=cp+20*Min0R(abs(Limpp-cp),0.05)*PR(cp,Limpp)*dt/1; - - Limpp:=cp; - dpPipe:=Min0R(HP,Limpp); - - dpMainValve:=PF(dpPipe,pp,ActFlowSpeed/(LBDelay))*dt; - - if(Round(i_bcp)=i_bcpNo)then - begin - dpMainValve:=PF(0,pp,(ActFlowSpeed)/(LBDelay))*dt; - end; - - GetPF:=dpMainValve; -end; - -procedure Ttest.Init(press: real); -begin - CP:= press; -end; - - -//---FD1--- - -function TFD1.GetPF(i_bcp:real; pp, hp, dt, ep: real): real; -var dp, temp: real; -begin -// MaxBP:=4; -// temp:=Min0R(i_bcp*MaxBP,Min0R(5.0,HP)); - temp:=Min0R(i_bcp*MaxBP,HP); //0011 - dp:=10*Min0R(abs(temp-BP),0.1)*PF(temp,BP,0.0006*(2+Byte(temp>BP)))*dt*Speed; - BP:=BP-dp; - GetPF:=-dp; -end; - -procedure TFD1.Init(press: real); -begin - BP:=0; - MaxBP:=press; - Time:=false; - TimeEP:=false; - Speed:=1; -end; - -function TFD1.GetCP: real; -begin - GetCP:=BP; -end; - -procedure TFD1.SetSpeed(nSpeed: real); -begin - Speed:=nSpeed; -end; - - -//---KNORR--- - -function TH1405.GetPF(i_bcp:real; pp, hp, dt, ep: real): real; -var dp, temp, A: real; -begin - pp:=Min0R(pp,MaxBP); - if i_bcp>0.5 then - begin - temp:=Min0R(MaxBP,HP); - A:=2*(i_bcp-0.5)*0.0011; - BP:=Max0R(BP,pp); - end - else - begin - temp:=0; - A:=0.2*(0.5-i_bcp)*0.0033; - BP:=Min0R(BP,pp); - end; - dp:=PF(temp,BP,A)*dt; - BP:=BP-dp; - GetPF:=-dp; -end; - -procedure TH1405.Init(press: real); -begin - BP:=0; - MaxBP:=press; - Time:=true; - TimeEP:=false; -end; - -function TH1405.GetCP: real; -begin - GetCP:=BP; -end; - - -//---FVel6--- - -function TFVel6.GetPF(i_bcp:real; pp, hp, dt, ep: real): real; -const - LBDelay = 100; -var - LimPP, dpPipe, dpMainValve, ActFlowSpeed: real; -begin - Limpp:=Min0R(5*Byte(i_bcp<3.5),hp); - if (i_bcp>=3.5) and ((i_bcp<4.3)or(i_bcp>5.5)) then - ActFlowSpeed:=0 - else if (i_bcp>4.3) and (i_bcp<4.8) then - ActFlowSpeed:=4*(i_bcp-4.3) //konsultacje wawa1 - bylo 8 - else if (i_bcp<4) then - ActFlowSpeed:=2 - else - ActFlowSpeed:=4; - dpMainValve:=PF(Limpp,pp,ActFlowSpeed/(LBDelay))*dt; - - - Sounds[s_fv4a_e]:=0; - Sounds[s_fv4a_u]:=0; - Sounds[s_fv4a_b]:=0; - if(i_bcp<3.5)then Sounds[s_fv4a_u]:=-dpMainValve else - if(i_bcp<4.8)then Sounds[s_fv4a_b]:=dpMainValve else - if(i_bcp<5.5)then Sounds[s_fv4a_e]:=dpMainValve; - - GetPF:=dpMainValve; - if(i_bcp<-0.5)then - EPS:=-1 - else if(i_bcp>0.5)and(i_bcp<4.7)then - EPS:=1 - else - EPS:=0; -// EPS:=i_bcp*Byte(i_bcp<2) -end; - -function TFVel6.GetCP: real; -begin - GetCP:=EPS; -end; - -function TFVel6.GetPos(i: byte): real; -const - table: array[0..10] of real = (-1,6,-1,0,6,4,4.7,5,-1,0,1); -begin - GetPos:=table[i]; -end; - -function TFVel6.GetSound(i: byte): real; -begin - if i>2 then - GetSound:=0 - else - GetSound:=Sounds[i]; -end; - -procedure TFVel6.Init(press: real); -begin - Time:=true; - TimeEP:=true; -end; - -end. - - diff --git a/McZapkie/klasy_ham.pas b/McZapkie/klasy_ham.pas deleted file mode 100644 index 01aeab1c..00000000 --- a/McZapkie/klasy_ham.pas +++ /dev/null @@ -1,69 +0,0 @@ -unit klasy_ham; {fizyka hamulcow dla symulatora} - -(* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*) -(* - MaSzyna EU07 - SPKS - Brakes. Basic classes. - Copyright (C) 2007-2013 Maciej Cierniak -*) - - -interface - -uses mctools,sysutils; - -//CONST; - -TYPE - TRurka= class //bezposrednie polaczenie, co wleci to wyleci - private - Vol: real; - Cap: real; - - public - function Update(dt: real); - procedure Flow(dV: real); - end; - - PRurka= ^TRurka; - - TTrojnik= class(TRurka) - private - Wyjscie1: PRurka; - Wyjscie2: PRurka; - Wyjscie3: PRurka; - public - end; - - TZbiornik= class(TRurka) - private - Wyjscie_jeden: PRurka; - public - end; - - TPowtarzacz= class(TRurka) - private - public - end; - - TPrzekladnik= class(TPowtarzacz) - private - public - end; - -function PF(P1,P2,S:real):real; - -implementation - - - -end. - - diff --git a/McZapkie/mctools.hpp b/McZapkie/mctools.hpp deleted file mode 100644 index d989fcd1..00000000 --- a/McZapkie/mctools.hpp +++ /dev/null @@ -1,95 +0,0 @@ -// Borland C++ Builder -// Copyright (c) 1995, 1999 by Borland International -// All rights reserved - -// (DO NOT EDIT: machine generated header) 'mctools.pas' rev: 5.00 - -#ifndef mctoolsHPP -#define mctoolsHPP - -#pragma delphiheader begin -#pragma option push -w- -#pragma option push -Vx -#include // Pascal unit -#include // Pascal unit - -//-- user supplied ----------------------------------------------------------- - -namespace Mctools -{ -//-- type declarations ------------------------------------------------------- -typedef Set TableChar; - -//-- var, const, procedure --------------------------------------------------- -#define _EOL (System::Set () << '\xa' << '\xd' ) -static const char _SPACE = '\x20'; -#define _Spacesigns (System::Set () << '\x9' << '\xa' << '\xd' << '\x29' << '\x2a' << '\x2d' \ - << '\x49' << '\x4a' << '\x4d' << '\x69' << '\x6a' << '\x6d' << '\x89' << '\x8a' << '\x8d' << '\xa9' \ - << '\xaa' << '\xad' << '\xc9' << '\xca' << '\xcd' << '\xe9' << '\xea' << '\xed' ) -static const Shortint CutLeft = 0xffffffff; -static const Shortint CutRight = 0x1; -static const Shortint CutBoth = 0x0; -extern PACKAGE int ConversionError; -extern PACKAGE int LineCount; -extern PACKAGE bool DebugModeFlag; -extern PACKAGE bool FreeFlyModeFlag; -extern PACKAGE double Xmin; -extern PACKAGE double Ymin; -extern PACKAGE double Xmax; -extern PACKAGE double Ymax; -extern PACKAGE double Xaspect; -extern PACKAGE double Yaspect; -extern PACKAGE double Hstep; -extern PACKAGE double Vstep; -extern PACKAGE int Vsize; -extern PACKAGE int Hsize; -extern PACKAGE AnsiString __fastcall Ups(AnsiString s); -extern PACKAGE AnsiString __fastcall b2s(Byte b); -extern PACKAGE AnsiString __fastcall i2s(int i); -extern PACKAGE AnsiString __fastcall l2s(int l); -extern PACKAGE AnsiString __fastcall r2s(double r, Byte SWidth); -extern PACKAGE Byte __fastcall s2b(AnsiString s); -extern PACKAGE int __fastcall s2i(AnsiString s); -extern PACKAGE int __fastcall s2l(AnsiString s); -extern PACKAGE double __fastcall s2r(AnsiString s); -extern PACKAGE Byte __fastcall s2bE(AnsiString s); -extern PACKAGE int __fastcall s2iE(AnsiString s); -extern PACKAGE int __fastcall s2lE(AnsiString s); -extern PACKAGE double __fastcall s2rE(AnsiString s); -extern PACKAGE Byte __fastcall Max0(Byte x1, Byte x2); -extern PACKAGE Byte __fastcall Min0(Byte x1, Byte x2); -extern PACKAGE double __fastcall Max0R(double x1, double x2); -extern PACKAGE double __fastcall Min0R(double x1, double x2); -extern PACKAGE int __fastcall Sign(double x); -extern PACKAGE bool __fastcall TestFlag(int Flag, int Value); -extern PACKAGE bool __fastcall SetFlag(Byte &Flag, int Value); -extern PACKAGE bool __fastcall iSetFlag(int &Flag, int Value); -extern PACKAGE bool __fastcall FuzzyLogic(double Test, double Threshold, double Probability); -extern PACKAGE bool __fastcall FuzzyLogicAI(double Test, double Threshold, double Probability); -extern PACKAGE AnsiString __fastcall ReadWord(TextFile &infile); -extern PACKAGE AnsiString __fastcall Cut_Space(AnsiString s, int Just); -extern PACKAGE AnsiString __fastcall ExtractKeyWord(AnsiString InS, AnsiString KeyWord); -extern PACKAGE AnsiString __fastcall DUE(AnsiString S); -extern PACKAGE AnsiString __fastcall DWE(AnsiString S); -extern PACKAGE AnsiString __fastcall Ld2Sp(AnsiString S); -extern PACKAGE AnsiString __fastcall Tab2Sp(AnsiString S); -extern PACKAGE void __fastcall ComputeArc(double X0, double Y0, double Xn, double Yn, double R, double - L, double dL, double &phi, double &Xout, double &Yout); -extern PACKAGE void __fastcall ComputeALine(double X0, double Y0, double Xn, double Yn, double L, double - R, double &Xout, double &Yout); -extern PACKAGE double __fastcall Xhor(double h); -extern PACKAGE double __fastcall Yver(double v); -extern PACKAGE int __fastcall Horiz(double X); -extern PACKAGE int __fastcall Vert(double Y); -extern PACKAGE void __fastcall ClearPendingExceptions(void); - -} /* namespace Mctools */ -#if !defined(NO_IMPLICIT_NAMESPACE_USE) -using namespace Mctools; -#endif -#pragma option pop // -w- -#pragma option pop // -Vx - -#pragma delphiheader end. -//-- end unit ---------------------------------------------------------------- -#endif // mctools diff --git a/McZapkie/mctools.pas b/McZapkie/mctools.pas deleted file mode 100644 index c50cbf20..00000000 --- a/McZapkie/mctools.pas +++ /dev/null @@ -1,507 +0,0 @@ -unit mctools; - -(* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*) - -{rozne takie duperele do operacji na stringach w paszczalu, pewnie w delfi sa lepsze} -{konwersja zmiennych na stringi, funkcje matematyczne, logiczne, lancuchowe, I/O etc} - -interface - - -const -{Ra: te stae nie s uywane... - _FileName = ['a'..'z','A'..'Z',':','\','.','*','?','0'..'9','_','-']; - _RealNum = ['0'..'9','-','+','.','E','e']; - _Integer = ['0'..'9','-']; //Ra: to si gryzie z STLport w Builder 6 - _Plus_Int = ['0'..'9']; - _All = [' '..'']; - _Delimiter= [',',';']+_EOL; - _Delimiter_Space=_Delimiter+[' ']; -} - _EOL = [#13,#10]; - _SPACE = ' '; - _Spacesigns=[' ']+[#9]+_EOL; - CutLeft=-1; CutRight=1; CutBoth=0; {Cut_Space} - -var - ConversionError: integer=0; - LineCount: integer=0; - DebugModeFlag: boolean=False; - FreeFlyModeFlag: boolean=False; - -type - TableChar = Set Of Char; {MCTUTIL} - -{konwersje} -function b2s(b:byte):string; -function i2s(i:integer):string; -function l2s(l:longint):string; -function r2s(r:real; SWidth:byte):string; -function s2b(s:string):byte; -function s2i(s:string):integer; -function s2l(s:string):longint; -function s2r(s:string):real; -function s2bE(s:string):byte; -function s2iE(s:string):integer; -function s2lE(s:string):longint; -function s2rE(s:string):real; - -{funkcje matematyczne} -function Max0(x1,x2:byte) : byte; -function Min0(x1,x2:byte) : byte; - -function Max0R(x1,x2:real) : real; -function Min0R(x1,x2:real) : real; - -function Sign(x:real) : integer; - -{funkcje logiczne} -function TestFlag(Flag:integer; Value:integer):boolean; -function SetFlag(var Flag:byte; Value:integer):boolean; -function iSetFlag(var Flag:integer; Value:integer):boolean; - -function FuzzyLogic(Test,Threshold,Probability:real):boolean; -{jesli Test>Threshold to losowanie} -function FuzzyLogicAI(Test,Threshold,Probability:real):boolean; -{to samo ale zawsze niezaleznie od DebugFlag} - -{operacje na stringach} -Function ReadWord(var infile:text):string; {czyta slowo z wiersza pliku tekstowego} -Function Ups (s:string ): string ; -Function Cut_Space(s:string; Just:integer) : string; -Function ExtractKeyWord(InS:String; KeyWord:string) : String; {wyciaga slowo kluczowe i lancuch do pierwszej spacji} -Function DUE(S:String) : String; {Delete Until Equal sign} -Function DWE(S:String) : String; {Delete While Equal sign} -Function Ld2Sp(S:String): String; {Low dash to Space sign} -Function Tab2Sp(S:String): String; {Tab to Space sign} - -{procedury, zmienne i funkcje graficzne} -procedure ComputeArc(X0,Y0,Xn,Yn,R,L:real;dL:real; var phi,Xout,Yout:real); -{wylicza polozenie Xout Yout i orientacje phi punktu na elemencie dL luku} -procedure ComputeALine(X0,Y0,Xn,Yn,L,R:real; var Xout,Yout:real); - - -var - Xmin,Ymin,Xmax,Ymax:real; - Xaspect,Yaspect:real; - Hstep,Vstep: real; - Vsize,Hsize:integer; - -function Xhor( h:real) :real; - { Converts horizontal screen coordinate into real X-coordinate. } - -function Yver( v:real) :real; - { Converts vertical screen coordinate into real Y-coordinate. } - -function Horiz(X:real):longint; - -function Vert(Y:real):longint; - -procedure ClearPendingExceptions; - -{------------------------------------------------} -Implementation -{================================================} - -function Ups (s:string ): string ; -var - jatka : integer; swy:string; -begin - swy:=''; - for jatka:=1 to length(s) do swy:=swy+UpCase(s[jatka]); - Ups:=swy; -end; {=Ups=} - -function b2s(b:byte):string; -var - s:string; -begin - Str(b:2,s); - b2s:=s; -end; {=b2s=} - -function i2s(i:integer):string; -var - s:string; -begin - Str(i:3,s); - i2s:=s; -end; {=i2s=} - -function l2s(l:longint):string; -var - s:string; -begin - Str(l:4,s); - l2s:=s; -end; {=l2s=} - -function r2s(r:real; SWidth:byte):string; -var - s:string; - absr:real; {rr:integer;} -begin - absr:=Abs(r); - if SWidth<8 then SWidth:=8; - if absr > 0.0001 then - begin {rr:=(Round(ln(1/absr)/ln(10)-1+Swidth/2));} - if absr < 100 then - Str(r:Swidth:(Round(ln(1/absr)/ln(10)-1+Swidth/2)),s) - else Str(r:Swidth:1,s) - end - else Str(r:Swidth,s); -{ if r>0 then s:=insert('+'s,3);} - r2s:=s; -end; {=r2s=} - -function s2b(s:string):byte; -var e:integer; - b:byte; -begin - Val(s,b,e); - s2b:=b; -end; - -function s2i(s:string):integer; -var e:integer; - i:integer; -begin - Val(s,i,e); - s2i:=i; -end; - -function s2l(s:string):longint; -var e:integer; - l:longint; -begin - Val(s,l,e); - s2l:=l; -end; - -function s2r(s:string):real; -var e:integer; - r:real; -begin - Val(s,r,e); - s2r:=r; -end; - - -function s2bE(s:string):byte; -var e:integer; - b:byte; -begin - s2bE:=0; - Val(s,b,e); - if e>0 then - ConversionError:=e - else s2bE:=b; -end; - -function s2iE(s:string):integer; -var e:integer; - i:integer; -begin - s2iE:=0; - Val(s,i,e); - if e>0 then - ConversionError:=e - else s2iE:=i; -end; - -function s2lE(s:string):longint; -var e:integer; - l:longint; -begin - s2lE:=0; - Val(s,l,e); - if e>0 then - ConversionError:=e - else s2lE:=l; -end; - -function s2rE(s:string):real; -var e:integer; - r:real; -begin - s2rE:=0; - Val(s,r,e); - if e>0 then - ConversionError:=e - else s2rE:=r; -end; - - -function Max0(x1,x2:byte) : byte; -begin -if x1>x2 then - Max0:=x1 -else - Max0:=x2; -end; - -function Min0(x1,x2:byte) : byte; -begin -if x1x2 then - Max0R:=x1 -else - Max0R:=x2; -end; - -function Min0R(x1,x2:real) : real; -begin -if x10 then Sign:=1; - if x<0 then Sign:=-1; -end; - -function TestFlag(Flag:integer; Value:integer):boolean; -begin - if (Flag and Value)=Value then - TestFlag:=True - else TestFlag:=False; -end; - -function SetFlag(var Flag:byte; Value:integer):boolean; -begin - SetFlag:=False; - if Value>0 then - if (Flag and Value)=0 then - begin - Flag:=Flag+Value; - SetFlag:=True - end; - if Value<0 then - if (Flag and Abs(Value))=Abs(Value) then - begin - Flag:=Flag+Value; - SetFlag:=True - end; -end; - -function iSetFlag(var Flag:integer; Value:integer):boolean; -begin - iSetFlag:=False; - if Value>0 then - if (Flag and Value)=0 then - begin - Flag:=Flag+Value; - iSetFlag:=True; //true, gdy byo wczeniej 0 i zostao ustawione - end; - if Value<0 then - if (Flag and Abs(Value))=Abs(Value) then - begin - Flag:=Flag+Value; //Value jest ujemne, czyli zerowanie flagi - iSetFlag:=True; //true, gdy byo wczeniej 1 i zostao wyzerowane - end; -end; - - -function FuzzyLogic(Test,Threshold,Probability:real):boolean; -begin - if (Test>Threshold) and (not DebugModeFlag) then - FuzzyLogic:=(RandomThreshold) then - FuzzyLogicAI:=(Random'' then - nextword:=True; - if not (c in _Spacesigns) then - s:=s+c; - end; - ReadWord:=s; -end; - - -Function Cut_Space(s:string; Just:integer) : string; -var ii:byte; -begin - case Just of - CutLeft : begin - ii:=0; - while (ii0) and (s[ii]=_SPACE) do - dec(ii); - S:=Copy(s,1,ii); - end; - CutBoth : begin - S:=Cut_Space(S,CutLeft); - S:=Cut_Space(S,CutRight); - end; - end; - Cut_Space:=S; -end; -{Cut_Space} - -Function ExtractKeyWord(InS:String; KeyWord:string) : String; -var s:string; kwp:byte; -begin - Ins:=Ins+' '; - kwp:=Pos(KeyWord,InS); - if kwp>0 then - begin - s:=Copy(InS,kwp,Length(Ins)); - s:=Copy(s,1,Pos(' ',s)-1); - end - else s:=''; - ExtractKeyWord:=s; -end; - -Function DUE(S:String) : String; {Delete Until Equal sign} -begin - DUE:=Copy(S,Pos('=',S)+1,Length(S)); -end; - -Function DWE(S:String) : String; {Delete While Equal sign} -var ep:byte; -begin - ep:=Pos('=',S); - if ep>0 then - DWE:=Copy(S,1,ep-1) - else DWE:=S; -end; - -Function Ld2Sp(S:String): String; {Low dash to Space sign} -var b:byte; s2:string; -begin - s2:=''; - for b:=1 to length(S) do - if S[b]='_' then - s2:=s2+' ' - else - s2:=s2+S[b]; - Ld2Sp:=s2; -end; - -Function Tab2Sp(S:String): String; {Tab to Space sign} -var b:byte; s2:string; -begin - s2:=''; - for b:=1 to length(S) do - if S[b]=#9 then - s2:=s2+' ' - else - s2:=s2+S[b]; - Tab2Sp:=s2; -end; - - -procedure ComputeArc(X0,Y0,Xn,Yn,R,L:real;dL:real; var phi,Xout,Yout:real); -{wylicza polozenie Xout Yout i orientacje phi punktu na elemencie dL luku} -var dX,dY,Xc,Yc,gamma,alfa,AbsR:real; -begin - if (R<>0) and (L<>0) then - begin - AbsR:=Abs(R); - dX:=Xn-X0; - dY:=Yn-Y0; - if dX<>0 then gamma:=arctan(dY/dX) - else if dY>0 then gamma:=Pi/2 - else gamma:=3*Pi/2; - alfa:=L/R; - phi:=gamma-(alfa+Pi*Round(R/AbsR))/2; - Xc:=X0-AbsR*cos(phi); - Yc:=Y0-AbsR*sin(phi); - phi:=phi+alfa*dL/L; - Xout:=AbsR*cos(phi)+Xc; - Yout:=AbsR*sin(phi)+Yc; - end; -end; - -procedure ComputeALine(X0,Y0,Xn,Yn,L,R:real; var Xout,Yout:real); -var dX,dY,gamma,alfa:real; -{ pX,pY : real;} -begin - alfa:=0; //ABu: bo nie bylo zainicjowane - dX:=Xn-X0; - dY:=Yn-Y0; - if dX<>0 then gamma:=arctan(dY/dX) - else if dY>0 then gamma:=Pi/2 - else gamma:=3*Pi/2; - if R<>0 then alfa:=L/R; - Xout:=X0+L*cos(alfa/2-gamma); - Yout:=Y0+L*sin(alfa/2-gamma); -end; - -{graficzne:} - - -function Xhor( h:real) :real; - begin - Xhor:= h*Hstep + Xmin; - end; - -function Yver( v:real) :real; - begin - Yver:= (Vsize-v)*Vstep + Ymin; - end; - -function Horiz(X:real):longint; -begin - x:= (x-Xmin) / Hstep; - if x > -MaxInt then - if x < MaxInt then Horiz:=Round(x) - else Horiz:= MaxInt - else Horiz:= -MaxInt; -end; - -function Vert(Y:real):longint; -begin - y:= (y-Ymin) / Vstep; - if y > -MaxInt then - if y < MaxInt then Vert:=Vsize-Round(y) - else Vert:= MaxInt - else Vert:= -MaxInt -end; - -procedure ClearPendingExceptions; -//resetuje bdy FPU, wymagane dla Trunc() -asm - FNCLEX -end; - -end. \ No newline at end of file diff --git a/McZapkie/mtable.hpp b/McZapkie/mtable.hpp deleted file mode 100644 index 03bc55ef..00000000 --- a/McZapkie/mtable.hpp +++ /dev/null @@ -1,127 +0,0 @@ -// Borland C++ Builder -// Copyright (c) 1995, 1999 by Borland International -// All rights reserved - -// (DO NOT EDIT: machine generated header) 'mtable.pas' rev: 5.00 - -#ifndef mtableHPP -#define mtableHPP - -#pragma delphiheader begin -#pragma option push -w- -#pragma option push -Vx -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit -#include // Pascal unit - -//-- user supplied ----------------------------------------------------------- - -namespace Mtable -{ -//-- type declarations ------------------------------------------------------- -struct TMTableLine -{ - double km; - double vmax; - AnsiString StationName; - AnsiString StationWare; - Byte TrackNo; - int Ah; - int Am; - int Dh; - int Dm; - double tm; - int WaitTime; -} ; - -typedef TMTableLine TMTable[101]; - -class DELPHICLASS TTrainParameters; -typedef TTrainParameters* *PTrainParameters; - -class PASCALIMPLEMENTATION TTrainParameters : public System::TObject -{ - typedef System::TObject inherited; - -public: - AnsiString TrainName; - double TTVmax; - AnsiString Relation1; - AnsiString Relation2; - double BrakeRatio; - AnsiString LocSeries; - double LocLoad; - TMTableLine TimeTable[101]; - int StationCount; - int StationIndex; - AnsiString NextStationName; - double LastStationLatency; - int Direction; - double __fastcall CheckTrainLatency(void); - AnsiString __fastcall ShowRelation(); - double __fastcall WatchMTable(double DistCounter); - AnsiString __fastcall NextStop(); - bool __fastcall IsStop(void); - bool __fastcall IsTimeToGo(double hh, double mm); - bool __fastcall UpdateMTable(double hh, double mm, AnsiString NewName); - __fastcall TTrainParameters(AnsiString NewTrainName); - void __fastcall NewName(AnsiString NewTrainName); - bool __fastcall LoadTTfile(AnsiString scnpath, int iPlus, double vMax); - bool __fastcall DirectionChange(void); - void __fastcall StationIndexInc(void); -public: - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TTrainParameters(void) : System::TObject() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TTrainParameters(void) { } - #pragma option pop - -}; - - -class DELPHICLASS TMTableTime; -class PASCALIMPLEMENTATION TMTableTime : public System::TObject -{ - typedef System::TObject inherited; - -public: - double GameTime; - int dd; - int hh; - int mm; - int srh; - int srm; - int ssh; - int ssm; - double mr; - void __fastcall UpdateMTableTime(double deltaT); - __fastcall TMTableTime(int InitH, int InitM, int InitSRH, int InitSRM, int InitSSH, int InitSSM); -public: - - #pragma option push -w-inl - /* TObject.Create */ inline __fastcall TMTableTime(void) : System::TObject() { } - #pragma option pop - #pragma option push -w-inl - /* TObject.Destroy */ inline __fastcall virtual ~TMTableTime(void) { } - #pragma option pop - -}; - - -//-- var, const, procedure --------------------------------------------------- -static const Shortint MaxTTableSize = 0x64; -static const char hrsd = '\x2e'; -extern PACKAGE TMTableTime* GlobalTime; - -} /* namespace Mtable */ -#if !defined(NO_IMPLICIT_NAMESPACE_USE) -using namespace Mtable; -#endif -#pragma option pop // -w- -#pragma option pop // -Vx - -#pragma delphiheader end. -//-- end unit ---------------------------------------------------------------- -#endif // mtable diff --git a/McZapkie/mtable.pas b/McZapkie/mtable.pas deleted file mode 100644 index 5b9ce339..00000000 --- a/McZapkie/mtable.pas +++ /dev/null @@ -1,530 +0,0 @@ -unit mtable; - -(* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*) - -interface uses mctools,sysutils; - -const MaxTTableSize=100; //mona by to robi dynamicznie - hrsd= '.'; -Type -//Ra: pozycja zerowa rozkadu chyba nie ma sensu -//Ra: numeracja przystankw jest 1..StationCount - - TMTableLine=record - km:real; //kilometraz linii - vmax:real; //predkosc rozkladowa przed przystankiem - //StationName:string[32]; //nazwa stacji ('_' zamiast spacji) - //StationWare:string[32]; //typ i wyposazenie stacji, oddz. przecinkami} - StationName:string; //nazwa stacji ('_' zamiast spacji) - StationWare:string; //typ i wyposazenie stacji, oddz. przecinkami} - TrackNo:byte; //ilosc torow szlakowych - Ah,Am:integer; //godz. i min. przyjazdu, -1 gdy bez postoju - Dh,Dm:integer; //godz. i min. odjazdu - tm:real; //czas jazdy do tej stacji w min. (z kolumny) - WaitTime:integer; //czas postoju (liczony plus 6 sekund) - end; - - TMTable = array[0..MaxTTableSize] of TMTableLine; - - PTrainParameters= ^TTrainParameters; - - TTrainParameters = class(TObject) - TrainName:string; - TTVmax:real; - Relation1,Relation2: string; //nazwy stacji danego odcinka - BrakeRatio: real; - LocSeries: string; //seria (typ) pojazdu - LocLoad: real; - TimeTable: TMTable; - StationCount: integer; //ilo przystankw (0-techniczny) - StationIndex: integer; //numer najbliszego (aktualnego) przystanku - NextStationName: string; - LastStationLatency: real; - Direction: integer; {kierunek jazdy w/g kilometrazu} - function CheckTrainLatency: real; - {todo: str hh:mm to int i z powrotem} - function ShowRelation: string; - function WatchMTable(DistCounter:real): real; - function NextStop:string; - function IsStop:boolean; - function IsTimeToGo(hh,mm:real):boolean; - function UpdateMTable(hh,mm:real; NewName: string): boolean; - constructor Init(NewTrainName:string); - procedure NewName(NewTrainName:string); - function LoadTTfile(scnpath:string;iPlus:Integer;vMax:real):boolean; - function DirectionChange():boolean; - procedure StationIndexInc(); - end; - - TMTableTime = class(TObject) - GameTime: real; - dd,hh,mm: integer; - srh,srm : integer; {wschod slonca} - ssh,ssm : integer; {zachod slonca} - mr:real; - procedure UpdateMTableTime(deltaT:real); - constructor Init(InitH,InitM,InitSRH,InitSRM,InitSSH,InitSSM:integer); - end; - -var GlobalTime: TMTableTime; - -implementation - -function CompareTime(t1h,t1m,t2h,t2m:real):real; {roznica czasu w minutach} -//zwraca rnic czasu -//jeli pierwsza jest aktualna, a druga rozkadowa, to ujemna oznacza opnienie -//na dusz met trzeba uwzgldni dat, jakby opnienia miay przekracza 12h (towarowych) -var - t:real; -begin - if (t2h<0) then - CompareTime:=0 - else - begin - t:=(t2h-t1h)*60+t2m-t1m; //jeli t2=00:05, a t1=23:50, to rnica wyjdzie ujemna - if (t<-720) then //jeli rnica przekracza 12h na minus - t:=t+1440 //to dodanie doby minut - else - if (t>720) then //jeli przekracza 12h na plus - t:=t-1440; //to odjcie doby minut - CompareTime:=t; - end; -end; - -function TTrainParameters.CheckTrainLatency: real; -begin - if (LastStationLatency>1.0) or (LastStationLatency<0) then - CheckTrainLatency:=LastStationLatency {spoznienie + lub do przodu - z tolerancja 1 min} - else - CheckTrainLatency:=0 -end; - -function TTrainParameters.WatchMTable(DistCounter:real): real; -{zwraca odleglo do najblizszej stacji z zatrzymaniem} -var dist:real; -begin - if Direction=1 then - dist:=TimeTable[StationIndex].km-TimeTable[0].km-DistCounter - else - dist:=TimeTable[0].km-TimeTable[StationIndex].km-DistCounter; - WatchMTable:=dist; -end; - -function TTrainParameters.NextStop:string; -//pobranie nazwy nastpnego miejsca zatrzymania -begin - if StationIndex<=StationCount - then - NextStop:='PassengerStopPoint:'+NextStationName //nazwa nastpnego przystanku - else - NextStop:='[End of route]'; //e niby koniec -end; - -function TTrainParameters.IsStop:boolean; -//zapytanie, czy zatrzymywa na nastpnym punkcie rozkadu -begin - if (StationIndex=0 //-1 to brak postoju - else - IsStop:=true; //na ostatnim si zatrzyma zawsze -end; - -function TTrainParameters.UpdateMTable(hh,mm:real;NewName:string):boolean; -{odfajkowanie dojechania do stacji (NewName) i przeliczenie opnienia} -var OK:boolean; -begin - OK:=false; - if StationIndex<=StationCount then //Ra: "<=", bo ostatni przystanek jest traktowany wyjtkowo - begin - if NewName=NextStationName then //jeli dojechane do nastpnego - begin //Ra: wywoanie moe by powtarzane, jak stoi na W4 - if TimeTable[StationIndex+1].km-TimeTable[StationIndex].km<0 then //to jest bez sensu - Direction:=-1 - else - Direction:=1; //prowizorka bo moze byc zmiana kilometrazu - //ustalenie, czy opniony (porwnanie z czasem odjazdu) - LastStationLatency:=CompareTime(hh,mm,TimeTable[StationIndex].Dh,TimeTable[StationIndex].Dm); - //inc(StationIndex); //przejcie do nastpnej pozycji StationIndex<=StationCount - if StationIndex'') and (Relation2<>'') - then ShowRelation:=Relation1+' - '+Relation2 - else ShowRelation:=''; -end; - -constructor TTrainParameters.Init(NewTrainName:string); -{wstpne ustawienie parametrw rozkadu jazdy} -begin - NewName(NewTrainName); -end; - -procedure TTrainParameters.NewName(NewTrainName:string); -{wstpne ustawienie parametrw rozkadu jazdy} -var i:integer; -begin - TrainName:=NewTrainName; - StationCount:=0; - StationIndex:=0; - NextStationName:='nowhere'; - LastStationLatency:=0; - Direction:=1; - Relation1:=''; Relation2:=''; - for i:=0 to MaxTTableSize do - with timeTable[i] do - begin - km:=0; vmax:=-1; StationName:='nowhere'; StationWare:=''; - TrackNo:=1; Ah:=-1; Am:=-1; Dh:=-1; Dm:=-1; tm:=0; WaitTime:=0; - end; - TTVmax:=100; {wykasowac} -end; - -function TTrainParameters.LoadTTfile(scnpath:string;iPlus:Integer;vMax:real):boolean; -//wczytanie pliku-tabeli z rozkadem przesunitym o (fPlus); (vMax) nie ma znaczenia -var - lines,s:string; - fin:text; - EndTable:boolean; - vActual:real; - i,time:Integer; //do zwikszania czasu - -procedure UpdateVelocity(StationCount:integer;vActual:real); -//zapisywanie prdkoci maksymalnej do wczeniejszych odcinkw -//wywoywane z numerem ostatniego przetworzonego przystanku -var i:integer; -begin - i:=StationCount; - //TTVmax:=vActual; {PROWIZORKA!!!} - while (i>=0) and (TimeTable[i].vmax=-1) do - begin - TimeTable[i].vmax:=vActual; //prdko dojazdu do przystanku i - dec(i); //ewentualnie do poprzedniego te - end; -end; - -begin - ClearPendingExceptions; - ConversionError:=0; - EndTable:=False; - if (TrainName='') then - begin //jeli pusty rozkad - //UpdateVelocity(StationCount,vMax); //ograniczenie do prdkoci startowej - end - else - begin - ConversionError:=666; - vActual:=-1; - s:=scnpath+TrainName+'.txt'; - //Ra 2014-09: ustali zasady wyznaczenia pierwotnego pliku przy przesunitych rozkadach (kolejny pocig dostaje numer +2) - assignfile(fin,s); - s:=''; - {$I-} - reset(fin); - {$I+} - if IOresult<>0 then - begin - vMax:=s2r(TrainName); //nie ma pliku ale jest liczba - if (vMax>10)and(vMax<200) then - begin - TTVmax:=vMax; //Ra 2014-07: zamiast rozkadu mona poda Vmax - UpdateVelocity(StationCount,vMax); //ograniczenie do prdkoci startowej - ConversionError:=0; - end - else - ConversionError:=-8; {Ra: ten bd jest niepotrzebny} - end - else - begin {analiza rozkadu jazdy} - ConversionError:=0; - while not (eof(fin) or (ConversionError<>0) or EndTable) do - begin - readln(fin,lines); {wczytanie linii} - if Pos('___________________',lines)>0 then {linia pozioma grna} - if ReadWord(fin)='[' then {lewy pion} - if ReadWord(fin)='Rodzaj' then {"Rodzaj i numer pociagu"} - repeat - until (ReadWord(fin)='|') or (eof(fin)); {rodkowy pion} - s:=ReadWord(fin); {nazwa pocigu} - //if LowerCase(s)<>ExtractFileName(TrainName) then {musi by taka sama, jak nazwa pliku} - //ConversionError:=-7 {bd niezgodnoci} - TrainName:=s; //nadanie nazwy z pliku TXT (bez cieki do pliku) - //else - begin {czytaj naglowek} - repeat - until (Pos('_______|',ReadWord(fin))>0) or eof(fin); - repeat - until (ReadWord(fin)='[') or (eof(fin)); {pierwsza linia z relacj} - repeat - s:=ReadWord(fin); - until (s<>'|') or eof(fin); - if s<>'|' then Relation1:=s - else ConversionError:=-5; - repeat - until (Readword(fin)='Relacja') or (eof(fin)); {druga linia z relacj} - repeat - until (ReadWord(fin)='|') or (eof(fin)); - Relation2:=ReadWord(fin); - repeat - until Readword(fin)='Wymagany'; - repeat - until (ReadWord(fin)='|') or (eoln(fin)); - s:=ReadWord(fin); - s:=Copy(s,1,Pos('%',s)-1); - BrakeRatio:=s2rE(s); - repeat - until Readword(fin)='Seria'; - repeat - until (ReadWord(fin)='|') or (eof(fin)); - LocSeries:=ReadWord(fin); - LocLoad:=s2rE(ReadWord(fin)); - repeat - until (Pos('[______________',ReadWord(fin))>0) or (eof(fin)); - while not eof(fin) and not EndTable do - begin - inc(StationCount); - repeat - s:=ReadWord(fin); - until (s='[') or (eof(fin)); - with TimeTable[StationCount] do - begin - if s='[' then - s:=ReadWord(fin) - else ConversionError:=-4; - if Pos('|',s)=0 then - begin - km:=s2rE(s); - s:=ReadWord(fin); - end; - if Pos('|_____|',s)>0 then {zmiana predkosci szlakowej} - UpdateVelocity(StationCount,vActual) - else - begin - s:=ReadWord(fin); - if Pos('|',s)=0 then - vActual:=s2rE(s); - end; - while Pos('|',s)=0 do - s:=Readword(fin); - StationName:=ReadWord(fin); - repeat - s:=ReadWord(fin); - until (s='1') or (s='2') or eof(fin); - TrackNo:=s2bE(s); - s:=ReadWord(fin); - if s<>'|' then - begin - if Pos(hrsd,s)>0 then - begin - ah:=s2iE(Copy(s,1,Pos(hrsd,s)-1)); //godzina przyjazdu - am:=s2iE(Copy(s,Pos(hrsd,s)+1,Length(s))); //minuta przyjazdu - end - else - begin - ah:=TimeTable[StationCount-1].ah; //godzina z poprzedniej pozycji - am:=s2iE(s); //bo tylko minuty podane - end; - end; - repeat - s:=ReadWord(fin); - until (s<>'|') or (eof(fin)); - if s<>']' then - tm:=s2rE(s); - repeat - s:=ReadWord(fin); - until (s='[') or eof(fin); - s:=ReadWord(fin); - if Pos('|',s)=0 then - begin -{tu s moze byc miejscem zmiany predkosci szlakowej} - s:=ReadWord(fin); - end; - if Pos('|_____|',s)>0 then {zmiana predkosci szlakowej} - UpdateVelocity(StationCount,vActual) - else - begin - s:=ReadWord(fin); - if Pos('|',s)=0 then - vActual:=s2rE(s); - end; - while Pos('|',s)=0 do - s:=Readword(fin); - StationWare:=ReadWord(fin); - repeat - s:=ReadWord(fin); - until (s='1') or (s='2') or eof(fin); - TrackNo:=s2bE(s); - s:=ReadWord(fin); - if s<>'|' then - begin - if Pos(hrsd,s)>0 then - begin - dh:=s2iE(Copy(s,1,Pos(hrsd,s)-1)); //godzina odjazdu - dm:=s2iE(Copy(s,Pos(hrsd,s)+1,Length(s))); //minuta odjazdu - end - else - begin - dh:=TimeTable[StationCount-1].dh; //godzina z poprzedniej pozycji - dm:=s2iE(s); //bo tylko minuty podane - end; - end - else - begin - dh:=ah; //odjazd o tej samej, co przyjazd (dla ostatniego te) - dm:=am; //bo s uywane do wyliczenia opnienia po dojechaniu - end; - if (ah>=0) then - WaitTime:=Trunc(CompareTime(ah,am,dh,dm)+0.1); - repeat - s:=ReadWord(fin); - until (s<>'|') or (eof(fin)); - if s<>']' then - tm:=s2rE(s); - repeat - s:=ReadWord(fin); - until (Pos('[',s)>0) or eof(fin); - if Pos('_|_',s)=0 then - s:=Readword(fin); - if Pos('|',s)=0 then - begin -{tu s moze byc miejscem zmiany predkosci szlakowej} - s:=ReadWord(fin); - end; - if Pos('|_____|',s)>0 then {zmiana predkosci szlakowej} - UpdateVelocity(StationCount,vActual) - else - begin - s:=ReadWord(fin); - if Pos('|',s)=0 then - vActual:=s2rE(s); - end; - while Pos('|',s)=0 do - s:=Readword(fin); - while (Pos(']',s)=0) do - s:=ReadWord(fin); - if Pos('_|_',s)>0 then EndTable:=True; - end; {timetableline} - end; - end; - end; {while eof} - close(fin); - end; - end; - if ConversionError=0 then - begin - if (TimeTable[1].StationName=Relation1) then //jeli nazwa pierwszego zgodna z relacj - if (TimeTable[1].Ah<0) then //a nie podany czas przyjazdu - begin //to mamy zatrzymanie na pierwszym, a nie przelot - TimeTable[1].Ah:=TimeTable[1].Dh; - TimeTable[1].Am:=TimeTable[1].Dm; - end - //NextStationName:=TimeTable[1].StationName; -{ TTVmax:=TimeTable[1].vmax; } - end; - if (iPlus<>0) then //jeeli jest przesunicie rozkadu - for i:=1 to StationCount do //bez with, bo ciko si przenosi na C++ - begin - if (TimeTable[i].Ah>=0) then - begin - time:=iPlus+TimeTable[i].Ah*60+TimeTable[i].Am; //nowe minuty - TimeTable[i].Am:=time mod 60; - TimeTable[i].Ah:=(time div 60) mod 60; - end; - if (TimeTable[i].Dh>=0) then - begin - time:=iPlus+TimeTable[i].Dh*60+TimeTable[i].Dm; //nowe minuty - TimeTable[i].Dm:=time mod 60; - TimeTable[i].Dh:=(time div 60) mod 60; - end; - end; - LoadTTfile:=(ConversionError=0); -end; - -procedure TMTableTime.UpdateMTableTime(deltaT:real); -//dodanie czasu (deltaT) w sekundach, z przeliczeniem godziny -begin - mr:=mr+deltaT; //dodawanie sekund - while mr>60.0 do //przeliczenie sekund do waciwego przedziau - begin - mr:=mr-60.0; - inc(mm); - end; - while mm>59 do //przeliczenie minut do waciwego przedziau - begin - mm:=mm-60; - inc(hh); - end; - while hh>23 do //przeliczenie godzin do waciwego przedziau - begin - hh:=hh-24; - inc(dd); //zwikszenie numeru dnia - end; - GameTime:=GameTime+deltaT; -end; - -constructor TMTableTime.Init(InitH,InitM,InitSRH,InitSRM,InitSSH,InitSSM:integer); -begin - GameTime:=0.0; - dd:=0; - hh:=InitH; - mm:=InitM; - srh:=InitSRH; - srm:=InitSRM; - ssh:=InitSSH; - ssm:=InitSSM; -end; - -function TTrainParameters.DirectionChange():boolean; -//sprawdzenie, czy po zatrzymaniu wykona kolejne komendy -begin - DirectionChange:=false; //przed pierwsz bez zmiany - if (StationIndex>0) and (StationIndex0) then - DirectionChange:=true; -end; - - -END. - diff --git a/McZapkie/unit2.pas b/McZapkie/unit2.pas deleted file mode 100644 index c561dacb..00000000 --- a/McZapkie/unit2.pas +++ /dev/null @@ -1,347 +0,0 @@ -unit Unit1; - -(* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*) - -interface - -uses - ai_driver,mtable,mover,mctools,Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, - StdCtrls, ExtCtrls; - -type - TForm1 = class(TForm) - Button1: TButton; - Label1: TLabel; - Button2: TButton; - Button3: TButton; - Button4: TButton; - Button5: TButton; - Button6: TButton; - Label2: TLabel; - Label3: TLabel; - Timer1: TTimer; - Label4: TLabel; - Label5: TLabel; - Label6: TLabel; - Label7: TLabel; - Label8: TLabel; - Label9: TLabel; - Label10: TLabel; - Label11: TLabel; - Button7: TButton; - Button8: TButton; - Label12: TLabel; - Label13: TLabel; - Label14: TLabel; - Label15: TLabel; - Button9: TButton; - Button10: TButton; - Label16: TLabel; - Label17: TLabel; - Label18: TLabel; - Label19: TLabel; - Button11: TButton; - Label20: TLabel; - Label21: TLabel; - Label22: TLabel; - Label23: TLabel; - Label24: TLabel; - Label25: TLabel; - lczas: TLabel; - Label26: TLabel; - Label27: TLabel; - Label28: TLabel; - Label29: TLabel; - Label30: TLabel; - Label31: TLabel; - Label32: TLabel; - Label33: TLabel; - Label34: TLabel; - Button12: TButton; - BStart: TButton; - Label35: TLabel; - Label36: TLabel; - Label37: TLabel; - Label38: TLabel; - Button13: TButton; - Label39: TLabel; - Label40: TLabel; - Label41: TLabel; - Button14: TButton; - Button15: TButton; - Label42: TLabel; - Label43: TLabel; - procedure Button1Click(Sender: TObject); - procedure Button2Click(Sender: TObject); - procedure Timer1Timer(Sender: TObject); - procedure FormCreate(Sender: TObject); - procedure Button5Click(Sender: TObject); - procedure Button6Click(Sender: TObject); - procedure Button7Click(Sender: TObject); - procedure Button8Click(Sender: TObject); - procedure Button3Click(Sender: TObject); - procedure Button4Click(Sender: TObject); - procedure Button9Click(Sender: TObject); - procedure Button10Click(Sender: TObject); - procedure Button11Click(Sender: TObject); - procedure Button12Click(Sender: TObject); - procedure BStartClick(Sender: TObject); - procedure Button13MouseDown(Sender: TObject; Button: TMouseButton; - Shift: TShiftState; X, Y: Integer); - procedure Button14Click(Sender: TObject); - procedure Button15Click(Sender: TObject); - private - { Private declarations } - public - { Public declarations } - end; - -var -Form1: TForm1; -loc,wag,wag2,wag3:TMoverParameters; -mechanik: TController; -pociag: TTrainParameters; -l0,l1,l2,l3:TLocation; -r0,r1,r2,r3:TRotation; -Shape:TTrackShape; Track:TTrackParam; -ExternalVoltage:real; -ActualTime:real; -fout: text; - -implementation - -{$R *.DFM} - -procedure TForm1.Button1Click(Sender: TObject); -begin -assignfile(fout,'log.dat'); -rewrite(fout); -ActualTime:=0; -loc:=TMoverParameters.Create; -wag:=TMoverParameters.Create; -wag2:=TMoverParameters.Create; -wag3:=TMoverParameters.Create; -mechanik:=TController.Create; -pociag:=TTrainParameters.Create; -Shape.R:=0; Shape.Len:=10000; Shape.dHtrack:=0; Shape.dHrail:=0; -Track.Width:=1435; Track.friction:=0.15; Track.CategoryFlag:=1; -Track.QualityFlag:=25; Track.DamageFlag:=0; -Track.VelMax:=120; -ExternalVoltage:=3000; - l0.x:=0; l0.y:=0; l0.z:=0; - l1.x:=-14.0235; l1.y:=0; l1.z:=0; - l2.x:=-27.3634; l2.y:=0; l2.z:=0; - l3.x:=-40.7032; l3.y:=0; l3.z:=0; - r0.rx:=0; r0.ry:=0; r0.rz:=0; - r1.rx:=0; r1.ry:=0; r1.rz:=0; - r2.rx:=0; r2.ry:=0; r2.rz:=0; - r3.rx:=0; r3.ry:=0; r3.rz:=0; -{ loc.Init(l1,r1,0,'en57','456',0,'Human',1); } - loc.Init(l0,r0,60,'eu07','456',0,'',1); - wag.Init(l1,r1,60,'Falns_440v','52-51-342027-2',30,'',0); - wag2.Init(l2,r2,60,'Falns_440v','52-51-322311-5',30,'',0); - wag3.Init(l3,r3,60,'Falns_440v','52-51-410025-3',30,'',0); - pociag.init('Testowy Express',100); - mechanik.init(l1,r1,True,@loc,@pociag,Aggressive); - if (loc.loadchkfile('') and wag.loadchkfile('') and wag2.loadchkfile('') and wag3.loadchkfile('')) - and (loc.CheckLocomotiveParameters(Go) and wag.CheckLocomotiveParameters(Go) and wag2.CheckLocomotiveParameters(Go) and wag3.CheckLocomotiveParameters(Go)) then - begin - Label1.Caption:='OK'; - loc.attach(2,@wag,3); - wag.attach(1,@loc,3); - wag.attach(2,@wag2,3); - wag2.attach(1,@wag,3); - wag2.attach(2,@wag3,3); - wag3.attach(1,@wag2,3); - Timer1.Enabled:=True; - end - else Label1.Caption:=inttostr(conversionerror)+' '+inttostr(linecount); - Button1.Visible:=False; -end; - -procedure TForm1.Button2Click(Sender: TObject); -begin - if Timer1.Enabled then - begin - Timer1.Enabled:=False; - CloseFile(fout); - end; - loc.Free; - wag.Free; - wag2.free; - wag3.free; - mechanik.free; - Close; -end; - -procedure TForm1.Timer1Timer(Sender: TObject); -var dl,dt:real; -begin - dt:=Timer1.Interval/1000; - ActualTime:=ActualTime+dt; - loc.ComputeTotalForce(dt,Shape,Track,ExternalVoltage); - wag.ComputeTotalForce(dt,Shape,Track,ExternalVoltage); - wag2.ComputeTotalForce(dt,Shape,Track,ExternalVoltage); - wag3.ComputeTotalForce(dt,Shape,Track,ExternalVoltage); - dl:=loc.ComputeMovement(dt,Shape,Track,ExternalVoltage,l0,r0); - l0.x:=l0.x+dl; - dl:=wag.ComputeMovement(dt,Shape,Track,ExternalVoltage,l1,r1); - l1.x:=l1.x+dl; - dl:=wag2.ComputeMovement(dt,Shape,Track,ExternalVoltage,l2,r2); - l2.x:=l2.x+dl; - dl:=wag3.ComputeMovement(dt,Shape,Track,ExternalVoltage,l3,r3); - l3.x:=l3.x+dl; - - if l0.x<500 then mechanik.UpdateSituation(500-l0.x,dt) - else - if l0.x<2500 then mechanik.UpdateSituation(-1,dt) - else - if l0.x<3500 then mechanik.UpdateSituation(3500-l0.x,dt); - if (l0.x>499) and (l0.x<505) then - mechanik.SetVelocity(-1,-1,0); - if (l0.x>2499) and (l0.x<2510) then - mechanik.SetVelocity(-1,0,0); - - Label2.Caption:=r2s(Loc.Im,0)+' A'; - Label3.Caption:=r2s(Loc.Ft/1000,0)+' kN'; - Label4.Caption:=r2s(l0.x,0)+' m'; - Label5.Caption:=r2s(Sign(Loc.V)*Loc.Vel,0)+' km/h'; - Label6.Caption:=r2s(Loc.AccS,0)+' m/ss'; - Label7.Caption:=r2s(Loc.couplers[1].cforce/1000,0)+' kN'; - Label8.Caption:=r2s(Loc.couplers[2].cforce/1000,0)+' kN'; - Label9.Caption:=r2s(Loc.Fb/1000,0)+' kN'; - Label10.Caption:=r2s(Loc.Compressor,0)+' MPa'; - Label11.Caption:=r2s(Loc.PipePress,0)+' MPa'; - Label12.Caption:=r2s(Loc.BrakePress,0)+' MPa'; - - Label13.Caption:=IntToStr(Loc.MainCtrlPos); - Label14.Caption:=IntToStr(Loc.BrakeCtrlPos); - Label15.Caption:=IntToStr(Loc.LocalBrakePos); - - Label16.Caption:=IntToStr(Loc.showcurrent(1)); - Label17.Caption:=IntToStr(Loc.showcurrent(2)); - Label18.Caption:=IntToStr(Loc.ScndCtrlPos); - if loc.SlippingWheels then - Label19.Caption:='Poslizg!' - else Label19.Caption:=' '; - - Label20.Caption:=IntToStr(Loc.MainCtrlActualPos); - Label21.Caption:=IntToStr(Loc.ScndCtrlActualPos); - - Label22.Caption:=r2s(l1.x,0)+' m'; - Label23.Caption:=r2s(Sign(wag.V)*wag.Vel,0)+' km/h'; - Label24.Caption:=r2s(Distance(loc.loc,wag.loc,loc.dim,wag.dim),0)+' m'; - Label25.Caption:=r2s(loc.nrot,0)+' 1/s'; - - Label26.Caption:=r2s(wag.couplers[1].cforce/1000,0)+' kN'; - Label27.Caption:=r2s(wag.couplers[2].cforce/1000,0)+' kN'; - - Label28.Caption:=r2s(l2.x,0)+' m'; - Label29.Caption:=r2s(sign(wag2.V)*wag2.Vel,0)+' km/h'; - - Label30.Caption:=r2s(loc.dpLocalValve/dt,0)+' MPa/s'; - Label31.Caption:=r2s(loc.dpBrake/dt,0)+' MPa/s'; - Label32.Caption:=r2s(loc.dpMainValve/dt,0)+' MPa/s'; - Label33.Caption:=r2s(loc.dpPipe/dt,0)+' MPa/s'; - - Label34.Caption:=r2s(wag2.PipePress,0)+' MPa'; - - Label35.Caption:=r2s(l3.x,0)+' m'; - Label36.Caption:=r2s(sign(wag3.V)*wag3.Vel,0)+' km/h'; - Label37.Caption:=r2s(wag3.couplers[1].cforce/1000,0)+' kN'; - Label38.Caption:=r2s(wag3.brakepress,0)+' MPa'; - - Label39.Caption:=r2s(loc.enginePower/1000,0)+' kW'; - Label40.Caption:=i2s(trunc(loc.Rventrot*60))+' /min'; - Label41.Visible:=loc.SandDose; - Label42.Caption:=r2s(mechanik.accdesired,0)+' m/ss'; - Label43.Caption:=r2s(mechanik.veldesired,0)+' km/h'; - Lczas.Caption:=r2s(actualtime,0)+' s'; -end; - -procedure TForm1.FormCreate(Sender: TObject); -begin - Timer1.Enabled:=False; -end; - -procedure TForm1.Button5Click(Sender: TObject); -begin - loc.incbrakelevel(1); -end; - -procedure TForm1.Button6Click(Sender: TObject); -begin - loc.decbrakelevel(1); -end; - -procedure TForm1.Button7Click(Sender: TObject); -begin - loc.inclocalbrakelevel(1); -end; - -procedure TForm1.Button8Click(Sender: TObject); -begin - loc.declocalbrakelevel(1); -end; - -procedure TForm1.Button3Click(Sender: TObject); -begin - loc.incmainctrl(1); -end; - -procedure TForm1.Button4Click(Sender: TObject); -begin - loc.decmainctrl(1); -end; - -procedure TForm1.Button9Click(Sender: TObject); -begin -loc.DirectionForward; -end; - -procedure TForm1.Button10Click(Sender: TObject); -begin - loc.DirectionBackward; -end; - -procedure TForm1.Button11Click(Sender: TObject); -begin - loc.FuseOn; -end; - -procedure TForm1.Button12Click(Sender: TObject); -begin - Loc.AntiSlippingBrake; -end; - -procedure TForm1.BStartClick(Sender: TObject); -begin - loc.activedir:=1; -{ if mechanik.OrderDirectionChange(1) then } - mechanik.SetVelocity(60,0,0); -end; - -procedure TForm1.Button13MouseDown(Sender: TObject; Button: TMouseButton; - Shift: TShiftState; X, Y: Integer); -begin - loc.SandDoseOn; -end; - -procedure TForm1.Button14Click(Sender: TObject); -begin - mechanik.SetVelocity(30,120,0); -end; - -procedure TForm1.Button15Click(Sender: TObject); -begin - mechanik.SetVelocity(0,120,0); -end; - -end. diff --git a/Model3d.cpp b/Model3d.cpp index f70dd091..6b78a563 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -27,7 +27,7 @@ http://mozilla.org/MPL/2.0/. using namespace Mtable; double TSubModel::fSquareDist = 0; -int TSubModel::iInstance; // numer renderowanego egzemplarza obiektu +size_t TSubModel::iInstance; // numer renderowanego egzemplarza obiektu GLuint *TSubModel::ReplacableSkinId = NULL; int TSubModel::iAlpha = 0x30300030; // maska do testowania flag tekstur wymiennych TModel3d *TSubModel::pRoot; // Ra: tymczasowo wskaźnik na model widoczny z submodelu @@ -106,7 +106,7 @@ void TSubModel::FirstInit() iFarAttenDecay = 0; fFarDecayRadius = 100; fCosFalloffAngle = 0.5; // 120°? - fCosHotspotAngle = 0.3; // 145°? + fCosHotspotAngle = 0.3f; // 145°? fCosViewAngle = 0; fSquareMaxDist = 10000 * 10000; // 10km fSquareMinDist = 0; @@ -152,7 +152,7 @@ void TSubModel::TextureNameSet(const char *n) if (iFlags & 0x0200) { // tylko jeżeli submodel zosta utworzony przez new delete[] pTexture; // usunięcie poprzedniej - int i = strlen(n); + size_t i = strlen(n); if (i) { // utworzenie nowej pTexture = new char[i + 1]; @@ -169,7 +169,7 @@ void TSubModel::NameSet(const char *n) if (iFlags & 0x0200) { // tylko jeżeli submodel zosta utworzony przez new delete[] pName; // usunięcie poprzedniej - int i = strlen(n); + size_t i = strlen(n); if (i) { // utworzenie nowej pName = new char[i + 1]; @@ -368,8 +368,8 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) parser >> discard >> bWire >> discard >> fWireSize >> discard; Opacity = readIntAsDouble(parser, 100.0f); // wymagane jest 0 dla szyb, 100 idzie w nieprzezroczyste - if (Opacity > 1.0) - Opacity *= 0.01; // w 2013 był błąd i aby go obejść, trzeba było wpisać 10000.0 + if (Opacity > 1.0f) + Opacity *= 0.01f; // w 2013 był błąd i aby go obejść, trzeba było wpisać 10000.0 if ((Global::iConvertModels & 1) == 0) // dla zgodności wstecz Opacity = 0.0; // wszystko idzie w przezroczyste albo zależnie od tekstury if (!parser.expectToken("map:")) @@ -1221,9 +1221,8 @@ void TSubModel::RenderAlphaDL() if (eType == TP_TEXT) { // tekst renderujemy w specjalny sposób, zamiast // submodeli z łańcucha Child - int i, j = pasText->size(); + size_t i, j = pasText->size(); TSubModel *p; - char c; if (!smLetter) { // jeśli nie ma tablicy, to ją stworzyć; miejsce // nieodpowiednie, ale tymczasowo @@ -1290,12 +1289,12 @@ void TSubModel::RenderVBO() if (Global::fLuminance < fLight) { glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glDrawArrays(eType, iVboPtr, + glDrawArrays(eType, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie trójkąty z VBO glMaterialfv(GL_FRONT, GL_EMISSION, emm2); } else - glDrawArrays(eType, iVboPtr, + glDrawArrays(eType, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie trójkąty z VBO } } @@ -1353,15 +1352,15 @@ void TSubModel::RenderVBO() glBindTexture(GL_TEXTURE_2D, 0); // nie teksturować // glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); // glColorMaterial(GL_FRONT,GL_EMISSION); - float color[4] = {f4Diffuse[0] * Distdimm, f4Diffuse[1] * Distdimm, - f4Diffuse[2] * Distdimm, 0}; + float color[4] = {(float)(f4Diffuse[0] * Distdimm), (float)(f4Diffuse[1] * Distdimm), + (float)(f4Diffuse[2] * Distdimm, 0)}; // glColor3f(f4Diffuse[0]*Distdimm,f4Diffuse[1]*Distdimm,f4Diffuse[2]*Distdimm); glColorMaterial(GL_FRONT, GL_EMISSION); glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie // blendowaly glColor3fv(color); // inaczej są białe glMaterialfv(GL_FRONT, GL_EMISSION, color); - glDrawArrays(GL_POINTS, iVboPtr, iNumVerts); // narysuj wierzchołek z + glDrawArrays(GL_POINTS, (GLint)iVboPtr, iNumVerts); // narysuj wierzchołek z // VBO glEnable(GL_LIGHTING); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); // co ma ustawiać glColor @@ -1385,7 +1384,7 @@ void TSubModel::RenderVBO() // blendowaly // glMaterialfv(GL_FRONT,GL_EMISSION,f4Diffuse); //zeby swiecilo na // kolorowo - glDrawArrays(GL_POINTS, iVboPtr, + glDrawArrays(GL_POINTS, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie punkty z VBO glEnable(GL_LIGHTING); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); @@ -1461,12 +1460,12 @@ void TSubModel::RenderAlphaVBO() if (Global::fLuminance < fLight) { glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glDrawArrays(eType, iVboPtr, + glDrawArrays(eType, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie trójkąty z VBO glMaterialfv(GL_FRONT, GL_EMISSION, emm2); } else - glDrawArrays(eType, iVboPtr, + glDrawArrays(eType, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie trójkąty z VBO } } @@ -1543,7 +1542,7 @@ void TSubModel::Info() // pName=new char[token.length()+1]; //nie ma sensu skracać tabeli strcpy(pTexture, t.c_str()); } - info->iTextureLen = t.size() + 1; // przygotowanie do zapisania, z zerem na końcu + info->iTextureLen = (int)(t.size() + 1); // przygotowanie do zapisania, z zerem na końcu } } else @@ -1552,7 +1551,7 @@ void TSubModel::Info() if (pName) { info->iName = info->iTotalNames++; // przydzielenie numeru nazwy w pliku (od 0) - info->iNameLen = strlen(pName) + 1; // z zerem na końcu + info->iNameLen = (int)(strlen(pName) + 1); // z zerem na końcu } ++info->iCurrent; // przejście do kolejnego obiektu pomocniczego if (Child) @@ -1589,8 +1588,8 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, TStringPack *t, TS bool dynamic) { // ustawienie wskaźników w submodelu iVisible = 1; // tymczasowo używane - Child = ((int)Child > 0) ? s + (int)Child : NULL; // zerowy nie może być potomnym - Next = ((int)Next > 0) ? s + (int)Next : NULL; // zerowy nie może być następnym + Child = ((size_t)Child > 0) ? s + (size_t)Child : NULL; // zerowy nie może być potomnym + Next = ((size_t)Next > 0) ? s + (size_t)Next : NULL; // zerowy nie może być następnym fMatrix = ((iMatrix >= 0) && m) ? m + iMatrix : NULL; // if (n&&(iName>=0)) asName=AnsiString(n->String(iName)); else asName=""; if (n && (iName >= 0)) @@ -1839,6 +1838,12 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) { // wczytanie modelu z pliku binarnego + if (sizeof(TSubModel) != 256) + { + std::cout << "E3D files unsupported in current build" << std::endl; + exit(-1); + } + WriteLog("Loading - binary model: " + FileName); int i = 0, j, k, ch, size; @@ -2047,6 +2052,12 @@ void TModel3d::Init() void TModel3d::SaveToBinFile(char const *FileName) { // zapis modelu binarnego + if (sizeof(TSubModel) != 256) + { + std::cout << "E3D files unsupported in current build" << std::endl; + exit(-1); + } + WriteLog("Saving E3D binary model."); int i, zero = 0; TSubModelInfo *info = new TSubModelInfo[iSubModelsCount]; diff --git a/Model3d.h b/Model3d.h index 0653673b..481fc220 100644 --- a/Model3d.h +++ b/Model3d.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #ifndef Model3dH #define Model3dH -#include "opengl/glew.h" +#include "GL/glew.h" #include "Parser.h" #include "dumb3d.h" #include "Float3d.h" @@ -193,7 +193,7 @@ class TSubModel int iMatrix; // w pliku binarnym jest numer matrycy }; int iNumVerts; // ilość wierzchołków (1 dla FreeSpotLight) - int iVboPtr; // początek na liście wierzchołków albo indeksów + size_t iVboPtr; // początek na liście wierzchołków albo indeksów int iTexture; // numer nazwy tekstury, -1 wymienna, 0 brak float fVisible; // próg jasności światła do załączenia submodelu float fLight; // próg jasności światła do zadziałania selfillum @@ -226,15 +226,17 @@ class TSubModel float f_Angle; float3 v_RotateAxis; float3 v_Angles; - + public: // chwilowo float3 v_TransVector; float8 *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO - int iAnimOwner; // roboczy numer egzemplarza, który ustawił animację + size_t iAnimOwner; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim; // kody animacji oddzielnie, bo zerowane public: float4x4 *mAnimMatrix; // macierz do animacji kwaternionowych (należy do AnimContainer) - char space[8]; // wolne miejsce na przyszłe zmienne (zmniejszyć w miarę potrzeby) + + char space[8]; + public: TSubModel ** smLetter; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) @@ -251,7 +253,7 @@ class TSubModel void RaAnimation(TAnimType a); public: - static int iInstance; // identyfikator egzemplarza, który aktualnie renderuje model + static size_t iInstance; // identyfikator egzemplarza, który aktualnie renderuje model static GLuint *ReplacableSkinId; static int iAlpha; // maska bitowa dla danego przebiegu static double fSquareDist; @@ -354,7 +356,7 @@ class TSubModelInfo int iTexture; // numer tekstury int iNameLen; // długość nazwy int iTextureLen; // długość tekstury - int iNext, iChild; // numer następnego i potomnego + size_t iNext, iChild; // numer następnego i potomnego static int iTotalTransforms; // ilość transformów static int iTotalNames; // ilość nazw static int iTotalTextures; // ilość tekstur @@ -363,7 +365,8 @@ class TSubModelInfo TSubModelInfo() { pSubModel = NULL; - iTransform = iName = iTexture = iNext = iChild = -1; // nie ma + iTransform = iName = iTexture = -1; + iNext = iChild = -1; // nie ma iNameLen = iTextureLen = 0; } void Reset() diff --git a/PyInt.cpp b/PyInt.cpp index 190a9737..3a78d3a8 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -63,7 +63,7 @@ bool TPythonInterpreter::loadClassFile( std::string const &lookupPath, std::stri long fsize = ftell(sourceFile); char *buffer = (char *)calloc(fsize + 1, sizeof(char)); fseek(sourceFile, 0, SEEK_SET); - long freaded = fread(buffer, sizeof(char), fsize, sourceFile); + size_t freaded = fread(buffer, sizeof(char), fsize, sourceFile); buffer[freaded] = 0; // z jakiegos powodu czytamy troche mniej i trzczeba dodac konczace // zero do bufora (mimo ze calloc teoretycznie powiniene zwrocic // wyzerowana pamiec) diff --git a/QueryParserComp.pas b/QueryParserComp.pas deleted file mode 100644 index e6e86307..00000000 --- a/QueryParserComp.pas +++ /dev/null @@ -1,733 +0,0 @@ -unit QueryParserComp; - -(* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*) - -interface - -uses - Classes, Sysutils; - -resourcestring - sTextNotSet = 'You must set the TextToParse property first.'; - sIllegalSpecialChar = 'Illegal special character.'; - sIllegalStringChar = 'Illegal string delimiter.'; - -type - TTokenType = (ttString, ttSymbol, ttComment, ttDelimiter, ttSpecialChar, - ttStatementDelimiter, ttCommentedSymbol, ttCommentDelimiter); - TSetOfChar = set of Char; - TComment = array[0..1] of string; - TCharacterType = (ctSymbol, ctBeginComment, ctEndComment, ctDelimiter, - ctString, ctSpecialChar); - TCommentType = set of (cmt1, cmt2, cmt3); - -const - CR = #13; - LF = #10; - TAB = #9; - CRLF = CR + LF; - Delimiters: TSetOfChar = [' ', ',', ';', CR, LF, TAB]; - Comments: array[0..2] of TComment = (('/*', '*/'), ('#', LF), ('//', LF)); - -type - TEndOfStatement = procedure(Sender: TObject; SQLStatement: String) of object; - - TQueryParserComp = class(TComponent) - private - FStream: TStringStream; - FEOF: Boolean; - FToken: String; - FTokenType: TTokenType; - FComment: Boolean; - FString: Boolean; - FWasString: Boolean; - FCommentType: TCommentType; - FStringDelimiters: String; - FLastStringDelimiterFound: String; - FSymbolsCount: Integer; - FSpecialCharacters: String; - FRemoveStrDelimiter: Boolean; - FStringToParse: String; - FGoPosition: Integer; - FOnStatementDelimiter: TEndOfStatement; - FCountFromStatement: Boolean; - FStatementDelimiters: TStringList; - FStringDelimiter: Char; - FGenerateOnStmtDelimiter: Boolean; - procedure Init; - procedure SetStringToParse(AStringToParse: String); - function StatementDelimiter: Boolean; - function CheckForBeginComment: Boolean; - function CheckForEndComment(Character: Char): Boolean; - function CharacterType(Character: Char): TCharacterType; - function CheckCharcterType(Character: Char): Boolean; - function StringDelimiter(Character: Char): Boolean; - function SpecialCharacter(Character: Char): Boolean; - procedure RemoveStringDelimiter(var Source: String); - procedure SetDelimiterType(Source: String); - procedure SetToken; - procedure SetSD(ASD: TStringList); - procedure SetSpecialCharacters(ASpecialCharacters: String); - procedure SetStringDelimiters(AStringDelimiters: String); - protected - procedure DoStatementDelimiter; dynamic; - public - constructor Create(AOwner: TComponent); override; - destructor Destroy; override; - procedure LoadStringToParse(FileName: string); - procedure First; - procedure FirstToken; - procedure NextToken; - function GetNextSymbol : string; - property EndOfFile: Boolean read FEOF; - property Comment: Boolean read FComment; - property Token: String read FToken; - property TokenType: TTokenType read FTokenType; - property CurrentStringDelimiter: Char read FStringDelimiter; - property SymbolsCount: Integer read FSymbolsCount default 0; - property StringStream: TStringStream read FStream; - published - property IsEOFStmtDelimiter: Boolean read FGenerateOnStmtDelimiter - write FGenerateOnStmtDelimiter; - property StringDelimiters: String read FStringDelimiters - write SetStringDelimiters; - property SpecialCharacters: String read FSpecialCharacters - write SetSpecialCharacters; - property RemoveStrDelimiter: Boolean read FRemoveStrDelimiter - write FRemoveStrDelimiter; - property CountFromStatement: Boolean read FCountFromStatement - write FCountFromStatement; - property TextToParse: String read FStringToParse - write SetStringToParse; - property StatementDelimiters: TStringList read FStatementDelimiters write SetSD; - property OnStatementDelimiter: TEndOfStatement read FOnStatementDelimiter - write FOnStatementDelimiter; - end; - -procedure Register; - -implementation - -{ TSQLParser } - -procedure Register; -begin - RegisterComponents('Samples', [TQueryParserComp]); -end; - -constructor TQueryParserComp.Create(AOwner: TComponent); -begin - inherited; - FStatementDelimiters := TStringList.Create; - FStatementDelimiters.Add('GO'); - FStatementDelimiters.Add(';'); - FCountFromStatement := True; -end; - -procedure TQueryParserComp.LoadStringToParse(FileName: string); -var - fs:TFileStream; - size:integer; -begin - - fs:= TFileStream.Create(FileName, fmOpenRead); - - size:= fs.Size; - - if Assigned(FStream) then - FStream.Free; - - FStream := TStringStream.Create(''); - FStream.CopyFrom(fs,size); - fs.Free; - Init; - First; -end; - -procedure TQueryParserComp.FirstToken; -begin - Init; - NextToken; -end; - -function TQueryParserComp.CheckForBeginComment: Boolean; -var - Buffer: String; -begin - Result := False; - if not FEOF and not FString then - begin - Buffer := FStream.ReadString(1); - if cmt1 in FCommentType then - if Buffer[1] = '*' then - begin - FCommentType := [cmt1]; - Result := True; - end; - if cmt2 in FCommentType then - if Buffer[1] = '/' then - begin - FCommentType := [cmt2]; - Result := True; - end; - if cmt3 in FCommentType then - if Buffer[1] = '-' then - begin - FCommentType := [cmt3]; - Result := True; - end; - FStream.Seek(-1, soFromCurrent); - end; -end; - -procedure TQueryParserComp.SetDelimiterType(Source: String); -begin - FToken := Source[1]; - - if ((cmt2 in FCommentType) or (cmt3 in FCommentType)) and FComment - and ((Source[1] = CR) or (Source[1] = LF)) then - begin - FComment := False; - FTokenType := ttCommentDelimiter; - end - else - FTokenType := ttDelimiter; -end; - -procedure TQueryParserComp.NextToken; -var - Buffer: String; - ETextNotSet: Exception; -begin - if FEOF then - Exit; - - if not Assigned(FStream) then - begin - ETextNotSet := Exception.Create(sTextNotSet); - raise ETextNotSet; - end; - - if not FString then - FStringDelimiter := ' '; - - FToken := ''; - if not FEOF then - begin - Buffer := FStream.ReadString(1); - if Length(Buffer) > 0 then - begin - if (Buffer[1] in Delimiters) and not (FString or FComment)then - SetDelimiterType(Buffer) - else - begin - if FStream.Position > 0 then - FStream.Seek(-1, soFromCurrent); - SetToken; - end; - end - else - FEOF := True; - end; - - case FTokenType of - ttSymbol: Inc(FSymbolsCount); - ttString: - begin - FStringDelimiter := FToken[1]; - if FRemoveStrDelimiter then - RemoveStringDelimiter(FToken); - end; - end; - - if StatementDelimiter then - FTokenType := ttStatementDelimiter; - - if FEOF then - begin - FLastStringDelimiterFound := ''; - FWasString := False; - FString := False; - - if FGenerateOnStmtDelimiter then - DoStatementDelimiter; - end; -end; - -function TQueryParserComp.GetNextSymbol : string; -begin - GetNextSymbol:= ''; - while ( not EndOfFile) do - begin - NextToken; - if (TokenType=ttSymbol) then - begin - GetNextSymbol:= Token; - break; - end - end - -end; - -function TQueryParserComp.StatementDelimiter: Boolean; -var - i: Integer; -begin - Result := False; - if not FString then - for i := 0 to FStatementDelimiters.Count - 1 do - begin - Result := (UpperCase(FToken) = UpperCase(FStatementDelimiters.Strings[i])); - if Result then - begin - if FCountFromStatement then - FSymbolsCount := 0; - DoStatementDelimiter; - Break; - end; - end; -end; - -function TQueryParserComp.CharacterType(Character: Char): TCharacterType; -begin - Result := ctSymbol; - case Character of - '/': - begin - if not FComment then - begin - FCommentType := [cmt1, cmt2]; - if CheckForBeginComment then - Result := ctBeginComment; - end; - end; - '-': - begin - if not FComment then - begin - FCommentType := [cmt3]; - if CheckForBeginComment then - Result := ctBeginComment; - end; - end; - '*': - begin - if CheckForEndComment(Character) then - Result := ctEndComment; - end; - CR, LF, ' ', ',', TAB: - begin - if CheckForEndComment(Character) then - Result := ctEndComment - else - Result := ctDelimiter; - - if FString and ((Character = CR) or (Character = LF)) then - begin - FString := False; - FWasString := False; - Result := ctDelimiter; - end; - end; - end; - - if not FString then - if SpecialCharacter(Character) then - begin - if not FComment then - Result := ctSpecialChar; - end; - - if not FComment then - if StringDelimiter(Character) then - begin - Result := ctSymbol; - if FString then - begin - FLastStringDelimiterFound := ''; - FWasString := True; - FString := False; - end - else - begin - FWasString := False; - FString := True; - end; - end; -end; - -function TQueryParserComp.CheckForEndComment(Character: Char): Boolean; -var - Buffer: String; -begin - Result := False; - - if not FComment or FString then - Exit; - - if not FEOF then - begin - if cmt1 in FCommentType then - begin - Buffer := FStream.ReadString(1); - if Buffer[1] = '/' then - Result := True; - - FStream.Seek(-1, soFromCurrent); - end; - if (cmt2 in FCommentType) or (cmt3 in FCommentType) then - begin - if (Character = CR) or (Character = LF) then - Result := True; - end; - end; -end; - -function TQueryParserComp.CheckCharcterType(Character: Char): Boolean; -var - Buffer: String; -begin - Result := False; - case CharacterType(Character) of - ctBeginComment: - begin - if not FComment then - begin - if FToken <> '' then - begin - FStream.Seek(-1, soFromCurrent); - FTokenType := ttSymbol; - end - else - begin - FComment := True; - FToken := FToken + Character; - Buffer := FStream.ReadString(1); - FToken := FToken + Buffer; - FTokenType := ttComment; - end; - Result := True; - end; - end; - ctEndComment: - begin - if FComment then - begin - Result := True; - if FToken <> '' then - begin - FStream.Seek(-1, soFromCurrent); - FTokenType := ttCommentedSymbol; - end - else - begin - FComment := False; - FToken := FToken + Character; - if FCommentType = [cmt1] then - begin - Buffer := FStream.ReadString(1); - FToken := FToken + Buffer; - end; - FTokenType := ttComment; - end; - end; - end; - ctSymbol: - begin - FToken := FToken + Character; - if FComment then - FTokenType := ttCommentedSymbol - else - begin - if FString or FWasString then - begin - if FWasString then - begin - FTokenType := ttString; - FWasString := False; - - - Result := True; - end - else - FTokenType := ttString; - end - else - FTokenType := ttSymbol; - end; - end; - ctSpecialChar: - begin - if FToken <> '' then - begin - FStream.Seek(-1, soFromCurrent); - FTokenType := ttSymbol; - end - else - begin - FToken := FToken + Character; - FTokenType := ttSpecialChar; - end; - Result := True; - end; - ctDelimiter: - begin - FTokenType := ttDelimiter; - Result := True; - end; - end -end; - -procedure TQueryParserComp.RemoveStringDelimiter(var Source: String); -var - EndOfString: Integer; - i: Integer; -begin - for i := 1 to Length(FStringDelimiters) do - begin - EndOfString := 1; - while not (EndOfString = 0) do - begin - EndOfString := Pos(FStringDelimiters[i], Source); - if EndOfString <> 0 then - begin - FLastStringDelimiterFound := Copy(FStringDelimiters, i, 1); - Delete(Source, EndOfString, 1); - end; - end; - end; -end; - -function TQueryParserComp.StringDelimiter(Character: Char): Boolean; -var - i: Integer; - Buffer: String; -begin - Result := False; - - for i := 1 to Length(FStringDelimiters) do - if (Character = FStringDelimiters[i]) then - begin - if (FLastStringDelimiterFound = '') then - FLastStringDelimiterFound := FStringDelimiters[i]; - - if (FLastStringDelimiterFound = FStringDelimiters[i]) then - begin - if not FEOF then - Buffer := FStream.ReadString(1); - - if Length(Buffer) > 0 then - begin - if Buffer[1] <> Character then - begin - FStream.Seek(-1, soFromCurrent); - Result := True; - end - else - FToken := FToken + Buffer; - end - else - Result := True; - end; - end; -end; - -function TQueryParserComp.SpecialCharacter(Character: Char): Boolean; -var - i: Integer; -begin - Result := False; - for i := 1 to Length(FSpecialCharacters) do - if Character = FSpecialCharacters[i] then - Result := True; -end; - -procedure TQueryParserComp.SetToken; -var - EndToken: Boolean; - Buffer: String; -begin - EndToken := False; - while not (EndToken or FEOF) do - begin - FEOF := FStream.Position >= FStream.Size-1; - Buffer := FStream.ReadString(1); - - if not (Buffer[1] in Delimiters) then - EndToken := CheckCharcterType(Buffer[1]) - else - begin - if not (FString or FComment) then - begin - EndToken := True; - FStream.Seek(-1, soFromCurrent); - end - else - begin - if FString and ((Buffer[1] = CR) or (Buffer[1] = LF)) then - begin - FString := False; - FWasString := False; - EndToken := True; - end - else - if FComment and ((cmt2 in FCommentType) or - (cmt3 in FCommentType)) and ((Buffer[1] = CR) or - (Buffer[1] = LF)) then - begin - EndToken := True; - FStream.Seek(-1, soFromCurrent); - FComment := False; - FCommentType := []; - end - else - FToken := FToken + Buffer; - end; - end; - end; //while -end; - -destructor TQueryParserComp.Destroy; -begin - if Assigned(FStream) then - FStream.Free; - - inherited Destroy; -end; - -procedure TQueryParserComp.DoStatementDelimiter; -var - Buffer: String; - CurrentPosition: Integer; -begin - if Assigned(FOnStatementDelimiter) then - begin - CurrentPosition := FStream.Position; - FStream.Seek(FGoPosition, soFromBeginning); - Buffer := FStream.ReadString(CurrentPosition-FGoPosition-Length(FToken)); - FStream.Seek(Length(FToken), soFromCurrent); - if FStream.Position >= FStream.Size then - FEOF := True; - - FGoPosition := FStream.Position; - - if FCountFromStatement then - FSymbolsCount := 0; - - FOnStatementDelimiter(Self, Trim(Buffer)); - end; -end; - -procedure TQueryParserComp.SetStringToParse(AStringToParse: String); -begin - - if AStringToParse = '' then - Exit; - - if Assigned(FStream) then - FStream.Free; - - TrimRight(AStringToParse); - FStream := TStringStream.Create(AStringToParse); - FStringToParse := AStringToParse; - - Init; -end; - -procedure TQueryParserComp.SetSD(ASD: TStringList); -begin - FStatementDelimiters.Assign(ASD); -end; - -procedure TQueryParserComp.First; -begin - Init; -end; - -procedure TQueryParserComp.Init; -var - ETextNotSet: Exception; -begin - if not Assigned(FStream) then - begin - ETextNotSet := Exception.Create(sTextNotSet); - raise ETextNotSet; - end; - - FStream.Seek(0, soFromBeginning); - FToken := ''; - FTokenType := ttString; - FComment := False; - FCommentType := []; - FEOF := False; - FSymbolsCount := 0; - FGoPosition := 0; - FLastStringDelimiterFound := ''; - FWasString := False; - FString := False; -end; - -procedure TQueryParserComp.SetSpecialCharacters(ASpecialCharacters: String); -var - i: Integer; - k: Integer; - IllegalSpecialChar: Exception; -begin - for i := 1 to Length(ASpecialCharacters) do - begin - for k := 0 to FStatementDelimiters.Count - 1 do - begin - if (Pos(ASpecialCharacters[i], FStatementDelimiters.Strings[k]) <> 0) then - begin - IllegalSpecialChar := Exception.Create(sIllegalSpecialChar); - raise IllegalSpecialChar; - end; - end; - - if (ASpecialCharacters[i] in Delimiters) or - (Pos(ASpecialCharacters[i], FStringDelimiters) <> 0) then - begin - IllegalSpecialChar := Exception.Create(sIllegalSpecialChar); - raise IllegalSpecialChar; - end; - end; - - FSpecialCharacters := ASpecialCharacters; -end; - -procedure TQueryParserComp.SetStringDelimiters(AStringDelimiters: String); -var - i: Integer; - k: Integer; - IllegalStringChar: Exception; -begin - for i := 1 to Length(AStringDelimiters) do - begin - for k := 0 to FStatementDelimiters.Count - 1 do - begin - if (Pos(AStringDelimiters[i], FStatementDelimiters.Strings[k]) <> 0) then - begin - IllegalStringChar := Exception.Create(sIllegalStringChar); - raise IllegalStringChar; - end; - end; - - if (AStringDelimiters[i] in Delimiters) or - (Pos(AStringDelimiters[i], FSpecialCharacters) <> 0) then - begin - IllegalStringChar := Exception.Create(sIllegalStringChar); - raise IllegalStringChar; - end; - end; - - FStringDelimiters := AStringDelimiters; -end; - -end. diff --git a/RealSound.cpp b/RealSound.cpp index 42aa71a5..3633b26f 100644 --- a/RealSound.cpp +++ b/RealSound.cpp @@ -176,7 +176,7 @@ void TRealSound::Stop() void TRealSound::AdjFreq(double Freq, double dt) // McZapkie TODO: dorobic tu efekt Dopplera // Freq moze byc liczba dodatnia mniejsza od 1 lub wieksza od 1 { - float df, Vlist, Vsrc; + float df, Vlist; if ((Global::bSoundEnabled) && (AM != 0)) { if (dt > 0) @@ -247,7 +247,7 @@ void TTextSound::Init(std::string const &SoundName, double SoundAttenuation, dou fTime = GetWaveTime(); std::string txt(SoundName); txt.erase( txt.rfind( '.' ) ); // obcięcie rozszerzenia - for (int i = txt.length(); i > 0; --i) + for (size_t i = txt.length(); i > 0; --i) if (txt[i] == '/') txt[i] = '\\'; // bo nie rozumi txt += "-" + Global::asLang + ".txt"; // już może być w różnych językach diff --git a/Segment.cpp b/Segment.cpp index 5a9772ec..e9d48975 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Segment.h" -#include "opengl/glew.h" +#include "GL/glew.h" #include "Globals.h" #include "Logs.h" @@ -505,7 +505,7 @@ void TSegment::RenderSwitchRail(const vector6 *ShapePoints1, const vector6 *Shap double fOffsetX) { // tworzenie siatki trójkątów dla iglicy vector3 pos1, pos2, dir, parallel1, parallel2, pt; - double a1, a2, s, step, offset, tv1, tv2, t, t2, t2step, oldt2, sp, oldsp; + double a1, a2, s, step, offset, tv1, tv2, t, t2step, oldt2; int i, j; if (bCurve) { // dla toru odchylonego @@ -642,7 +642,6 @@ void TSegment::Render() { vector3 pt; glBindTexture(GL_TEXTURE_2D, 0); - int i; if (bCurve) { glColor3f(0, 0, 1.0f); diff --git a/Sound.cpp b/Sound.cpp index 101a3fdf..eb8c4893 100644 --- a/Sound.cpp +++ b/Sound.cpp @@ -8,7 +8,6 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#define STRICT #include "Sound.h" #include "Globals.h" #include "Logs.h" @@ -219,7 +218,6 @@ LPDIRECTSOUNDBUFFER TSoundsManager::GetFromName(const char *Name, bool Dynamic, Dynamic = false; // wczytanie z "sounds/" } TSoundContainer *Next = First; - DWORD dwStatus; for (int i = 0; i < Count; i++) { if (strcmp(Name, Next->Name) == 0) @@ -277,11 +275,6 @@ void TSoundsManager::RestoreAll() for (int i = 0; i < Count; i++) { - - if (FAILED(hr = Next->DSBuffer->GetStatus(&dwStatus))) - ; - // return hr; - if (dwStatus & DSBSTATUS_BUFFERLOST) { // Since the app could have just been activated, then @@ -375,7 +368,4 @@ void TSoundsManager::Init(HWND hWnd) return; SAFE_RELEASE(pDSBPrimary); -}; - -//--------------------------------------------------------------------------- -#pragma package(smart_init) +}; \ No newline at end of file diff --git a/Texture.cpp b/Texture.cpp index f60c02aa..4be853e3 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include -#include "opengl/glew.h" +#include "GL/glew.h" #include "Globals.h" #include "logs.h" diff --git a/Texture.h b/Texture.h index 8810d537..f0cfc629 100644 --- a/Texture.h +++ b/Texture.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "opengl/glew.h" +#include "GL/glew.h" /* //Ra: miejsce umieszczenia tego jest deczko bezsensowne diff --git a/TextureDDS.cpp b/TextureDDS.cpp index 74df0b07..1d218422 100644 --- a/TextureDDS.cpp +++ b/TextureDDS.cpp @@ -196,7 +196,7 @@ void DecompressDXT3(DDS_IMAGE_DATA lImage, const GLubyte *lCompData, GLubyte *Da void DecompressDXT5(DDS_IMAGE_DATA lImage, const GLubyte *lCompData, GLubyte *Data) { - GLint x, y, z, i, j, k; + GLint x, y, i, j, k; GLuint Select; const GLubyte *Temp; //, r0, g0, b0, r1, g1, b1; Color8888 colours[4], *col; diff --git a/TextureDDS.h b/TextureDDS.h index 543e67d8..8645a115 100644 --- a/TextureDDS.h +++ b/TextureDDS.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #ifndef TEXTURE_DDS_H #define TEXTURE_DDS_H 1 -#include "opengl/glew.h" +#include "GL/glew.h" #pragma hdrstop diff --git a/Track.cpp b/Track.cpp index 7386b98e..c8a5c07d 100644 --- a/Track.cpp +++ b/Track.cpp @@ -412,10 +412,9 @@ vector3 LoadPoint(cParser *parser) void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) { // pobranie obiektu trajektorii ruchu vector3 pt, vec, p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań - double a1, a2, r1, r2, r3, r4, d1, d2, a; + double a1, a2, r1, r2, r3, r4; string str; - bool bCurve; - int i; //,state; //Ra: teraz już nie ma początkowego stanu zwrotnicy we wpisie + size_t i; //,state; //Ra: teraz już nie ma początkowego stanu zwrotnicy we wpisie std::string token; parser->getTokens(); @@ -1557,7 +1556,7 @@ void TTrack::Compile(GLuint tex) // 2014-07: na początek rysować brzegi jak dla łuków // punkty brzegu nawierzchni uzyskujemy podczas renderowania boków (bez sensu, ale // najszybciej było zrobić) - int i, j; // ile punktów (może byc różna ilość punktów między drogami) + int i; // ile punktów (może byc różna ilość punktów między drogami) if (!SwitchExtension->vPoints) { // jeśli tablica punktów nie jest jeszcze utworzona, zliczamy punkty i tworzymy ją if (SwitchExtension->iRoads == 3) // mogą być tylko 3 drogi zamiast 4 @@ -1735,7 +1734,7 @@ void TTrack::Compile(GLuint tex) if (!SwitchExtension->bPoints) // jeśli tablica nie wypełniona if (b) // ale jest wskaźnik do tablicy - może nie być? { // coś się gubi w obliczeniach na wskaźnikach - i = (int((void *)(b)) - int((void *)(SwitchExtension->vPoints))) / + i = (int)(((size_t)(b)) - ((size_t)(SwitchExtension->vPoints))) / sizeof(vector3); // ustalenie liczby punktów, bo mogło wyjść inaczej niż // policzone z góry if (i > 0) @@ -2907,7 +2906,7 @@ TTrack * TTrack::RaAnimate() } if (Global::bUseVBO) { // dla OpenGL 1.4 odświeży się cały sektor, w późniejszych poprawiamy fragment - if (true == GLEW_VERSION_1_5) // dla OpenGL 1.4 to się nie wykona poprawnie + if (GLEW_VERSION_1_5) // dla OpenGL 1.4 to się nie wykona poprawnie if (TextureID1) // Ra: !!!! tu jest do poprawienia { // iglice liczone tylko dla zwrotnic vector6 rpts3[24], rpts4[24]; @@ -3018,7 +3017,7 @@ TTrack * TTrack::RaAnimate() if (Global::bUseVBO) { // dla OpenGL 1.4 odświeży się cały sektor, w późniejszych poprawiamy fragment // aktualizacja pojazdów na torze - if (true == GLEW_VERSION_1_5) // dla OpenGL 1.4 to się nie wykona poprawnie + if (GLEW_VERSION_1_5) // dla OpenGL 1.4 to się nie wykona poprawnie { int size = RaArrayPrepare(); // wielkość tabeli potrzebna dla tej obrotnicy diff --git a/Track.h b/Track.h index 6382f0f0..314870a3 100644 --- a/Track.h +++ b/Track.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "opengl/glew.h" +#include "GL/glew.h" #include "ResourceManager.h" #include "Segment.h" @@ -138,12 +138,12 @@ class TTrack : public Resource // McZapkie-070402: dodalem zmienne opisujace rozmiary tekstur GLuint TextureID1 = 0; // tekstura szyn albo nawierzchni GLuint TextureID2 = 0; // tekstura automatycznej podsypki albo pobocza - float fTexLength = 4.0; // długość powtarzania tekstury w metrach - float fTexRatio1 = 1.0; // proporcja boków tekstury nawierzchni (żeby zaoszczędzić na rozmiarach tekstur...) - float fTexRatio2 = 1.0; // proporcja boków tekstury chodnika (żeby zaoszczędzić na rozmiarach tekstur...) - float fTexHeight1 = 0.6; // wysokość brzegu względem trajektorii - float fTexWidth = 0.9; // szerokość boku - float fTexSlope = 0.9; + float fTexLength = 4.0f; // długość powtarzania tekstury w metrach + float fTexRatio1 = 1.0f; // proporcja boków tekstury nawierzchni (żeby zaoszczędzić na rozmiarach tekstur...) + float fTexRatio2 = 1.0f; // proporcja boków tekstury chodnika (żeby zaoszczędzić na rozmiarach tekstur...) + float fTexHeight1 = 0.6f; // wysokość brzegu względem trajektorii + float fTexWidth = 0.9f; // szerokość boku + float fTexSlope = 0.9f; double fRadiusTable[ 2 ]; // dwa promienie, drugi dla zwrotnicy int iTrapezoid = 0; // 0-standard, 1-przechyłka, 2-trapez, 3-oba GLuint DisplayListID = 0; @@ -175,10 +175,10 @@ class TTrack : public Resource int iPrevDirection = 0; // domyślnie wirtualne odcinki dołączamy stroną od Point1 TTrackType eType = tt_Normal; // domyślnie zwykły int iCategoryFlag = 1; // 0x100 - usuwanie pojazów // 1-tor, 2-droga, 4-rzeka, 8-samolot? - float fTrackWidth = 1.435; // szerokość w punkcie 1 // rozstaw toru, szerokość nawierzchni - float fTrackWidth2 = 0.0; // szerokość w punkcie 2 (głównie drogi i rzeki) - float fFriction = 0.15; // współczynnik tarcia - float fSoundDistance = -1.0; + float fTrackWidth = 1.435f; // szerokość w punkcie 1 // rozstaw toru, szerokość nawierzchni + float fTrackWidth2 = 0.0f; // szerokość w punkcie 2 (głównie drogi i rzeki) + float fFriction = 0.15f; // współczynnik tarcia + float fSoundDistance = -1.0f; int iQualityFlag = 20; int iDamageFlag = 0; TEnvironmentType eEnvironment = e_flat; // dźwięk i oświetlenie diff --git a/Traction.cpp b/Traction.cpp index 5b836c6f..35cc4de5 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -255,11 +255,11 @@ void TTraction::RenderDL(float mgn) // McZapkie: mgn to odleglosc od obserwatora if (!Global::bSmoothTraction) glDisable(GL_LINE_SMOOTH); // na liniach kiepsko wygląda - robi gradient float linealpha = 5000 * WireThickness / (mgn + 1.0); //*WireThickness - if (linealpha > 1.2) - linealpha = 1.2; // zbyt grube nie są dobre + if (linealpha > 1.2f) + linealpha = 1.2f; // zbyt grube nie są dobre glLineWidth(linealpha); - if (linealpha > 1.0) - linealpha = 1.0; + if (linealpha > 1.0f) + linealpha = 1.0f; // McZapkie-261102: kolor zalezy od materialu i zasniedzenia float r, g, b; switch (Material) @@ -268,65 +268,65 @@ void TTraction::RenderDL(float mgn) // McZapkie: mgn to odleglosc od obserwatora case 1: if (TestFlag(DamageFlag, 1)) { - r = 0.00000; - g = 0.32549; - b = 0.2882353; // zielona miedź + r = 0.00000f; + g = 0.32549f; + b = 0.2882353f; // zielona miedź } else { - r = 0.35098; - g = 0.22549; - b = 0.1; // czerwona miedź + r = 0.35098f; + g = 0.22549f; + b = 0.1f; // czerwona miedź } break; case 2: if (TestFlag(DamageFlag, 1)) { - r = 0.10; - g = 0.10; - b = 0.10; // czarne Al + r = 0.10f; + g = 0.10f; + b = 0.10f; // czarne Al } else { - r = 0.25; - g = 0.25; - b = 0.25; // srebrne Al + r = 0.25f; + g = 0.25f; + b = 0.25f; // srebrne Al } break; // tymczasowo pokazanie zasilanych odcinków case 4: - r = 0.5; - g = 0.5; - b = 1.0; + r = 0.5f; + g = 0.5f; + b = 1.0f; break; // niebieskie z podłączonym zasilaniem case 5: - r = 1.0; - g = 0.0; - b = 0.0; + r = 1.0f; + g = 0.0f; + b = 0.0f; break; // czerwone z podłączonym zasilaniem 1 case 6: - r = 0.0; - g = 1.0; - b = 0.0; + r = 0.0f; + g = 1.0f; + b = 0.0f; break; // zielone z podłączonym zasilaniem 2 case 7: - r = 1.0; - g = 1.0; - b = 0.0; + r = 1.0f; + g = 1.0f; + b = 0.0f; break; //żółte z podłączonym zasilaniem z obu stron } if (DebugModeFlag) if (hvParallel) { // jeśli z bieżnią wspólną, to dodatkowo przyciemniamy - r *= 0.6; - g *= 0.6; - b *= 0.6; + r *= 0.6f; + g *= 0.6f; + b *= 0.6f; } r *= Global::ambientDayLight[0]; // w zaleźności od koloru swiatła g *= Global::ambientDayLight[1]; b *= Global::ambientDayLight[2]; - if (linealpha > 1.0) - linealpha = 1.0; // trzeba ograniczyć do <=1 + if (linealpha > 1.0f) + linealpha = 1.0f; // trzeba ograniczyć do <=1 glColor4f(r, g, b, linealpha); if (!uiDisplayList) Optimize(); // generowanie DL w miarę potrzeby @@ -468,8 +468,8 @@ void TTraction::RenderVBO(float mgn, int iPtr) if (!Global::bSmoothTraction) glDisable(GL_LINE_SMOOTH); // na liniach kiepsko wygląda - robi gradient float linealpha = 5000 * WireThickness / (mgn + 1.0); //*WireThickness - if (linealpha > 1.2) - linealpha = 1.2; // zbyt grube nie są dobre + if (linealpha > 1.2f) + linealpha = 1.2f; // zbyt grube nie są dobre glLineWidth(linealpha); // McZapkie-261102: kolor zalezy od materialu i zasniedzenia float r, g, b; @@ -479,58 +479,58 @@ void TTraction::RenderVBO(float mgn, int iPtr) case 1: if (TestFlag(DamageFlag, 1)) { - r = 0.00000; - g = 0.32549; - b = 0.2882353; // zielona miedź + r = 0.00000f; + g = 0.32549f; + b = 0.2882353f; // zielona miedź } else { - r = 0.35098; - g = 0.22549; - b = 0.1; // czerwona miedź + r = 0.35098f; + g = 0.22549f; + b = 0.1f; // czerwona miedź } break; case 2: if (TestFlag(DamageFlag, 1)) { - r = 0.10; - g = 0.10; - b = 0.10; // czarne Al + r = 0.10f; + g = 0.10f; + b = 0.10f; // czarne Al } else { - r = 0.25; - g = 0.25; - b = 0.25; // srebrne Al + r = 0.25f; + g = 0.25f; + b = 0.25f; // srebrne Al } break; // tymczasowo pokazanie zasilanych odcinków case 4: - r = 0.5; - g = 0.5; - b = 1.0; + r = 0.5f; + g = 0.5f; + b = 1.0f; break; // niebieskie z podłączonym zasilaniem case 5: - r = 1.0; - g = 0.0; - b = 0.0; + r = 1.0f; + g = 0.0f; + b = 0.0f; break; // czerwone z podłączonym zasilaniem 1 case 6: - r = 0.0; - g = 1.0; - b = 0.0; + r = 0.0f; + g = 1.0f; + b = 0.0f; break; // zielone z podłączonym zasilaniem 2 case 7: - r = 1.0; - g = 1.0; - b = 0.0; + r = 1.0f; + g = 1.0f; + b = 0.0f; break; //żółte z podłączonym zasilaniem z obu stron } r = r * Global::ambientDayLight[0]; // w zaleznosci od koloru swiatla g = g * Global::ambientDayLight[1]; b = b * Global::ambientDayLight[2]; - if (linealpha > 1.0) - linealpha = 1.0; // trzeba ograniczyć do <=1 + if (linealpha > 1.0f) + linealpha = 1.0f; // trzeba ograniczyć do <=1 glColor4f(r, g, b, linealpha); glDrawArrays(GL_LINES, iPtr, iLines); glLineWidth(1.0); @@ -667,7 +667,7 @@ double TTraction::VoltageGet(double u, double i) return psPowered->CurrentGet(res) * res; // yB: dla zasilanego nie baw się w gwiazdy, tylko bierz bezpośrednio double r0t, r1t, r0g, r1g; - double u0, u1, i0, i1; + double i0, i1; r0t = fResistance[0]; //średni pomysł, ale lepsze niż nic r1t = fResistance[1]; // bo nie uwzględnia spadków z innych pojazdów if (psPower[0] && psPower[1]) diff --git a/Traction.h b/Traction.h index 75e72374..7dcbd496 100644 --- a/Traction.h +++ b/Traction.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "opengl/glew.h" +#include "GL/glew.h" #include "VBO.h" #include "dumb3d.h" diff --git a/Train.cpp b/Train.cpp index 1dec2eaf..24df2f06 100644 --- a/Train.cpp +++ b/Train.cpp @@ -428,7 +428,7 @@ void TTrain::OnKeyDown(int cKey) else if (cKey == Global::Keys[k_DirectionBackward]) { if (mvOccupied->Radio == false) - if (Global::ctrlState >= 0) + if (Global::ctrlState) { dsbSwitch->SetVolume(DSBVOLUME_MAX); dsbSwitch->Play(0, 0, 0); @@ -1864,9 +1864,8 @@ if ctrain_pneumatic)) { rsHiss.Play(1, DSBPLAY_LOOPING, true, tmp->GetPosition()); - DynamicObject->SetPneumatic(CouplNr, - 1); // Ra: to mi się nie podoba !!!! - tmp->SetPneumatic(CouplNr, 1); + DynamicObject->SetPneumatic(CouplNr != 0, true); // Ra: to mi się nie podoba !!!! + tmp->SetPneumatic(CouplNr != 0, true); } } else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, @@ -1886,9 +1885,8 @@ if // rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition()); dsbCouplerDetach->SetVolume(DSBVOLUME_MAX); dsbCouplerDetach->Play(0, 0, 0); - DynamicObject->SetPneumatic(CouplNr, - 0); // Ra: to mi się nie podoba !!!! - tmp->SetPneumatic(CouplNr, 0); + DynamicObject->SetPneumatic(CouplNr != 0, false); // Ra: to mi się nie podoba !!!! + tmp->SetPneumatic(CouplNr != 0, false); } } else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, @@ -1926,8 +1924,8 @@ if // rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition()); dsbCouplerDetach->SetVolume(DSBVOLUME_MAX); dsbCouplerDetach->Play(0, 0, 0); - DynamicObject->SetPneumatic(CouplNr, 0); - tmp->SetPneumatic(CouplNr, 0); + DynamicObject->SetPneumatic(CouplNr != 0, false); + tmp->SetPneumatic(CouplNr != 0, false); } } } @@ -5067,7 +5065,6 @@ bool TTrain::CabChange(int iDirection) // wczytywanie pliku z danymi multimedialnymi (dzwieki, kontrolki, kabiny) bool TTrain::LoadMMediaFile(std::string const &asFileName) { - double dSDist; cParser parser(asFileName, cParser::buffer_FILE); // NOTE: yaml-style comments are disabled until conflict in use of # is resolved // parser.addCommentStyle( "#", "\n" ); @@ -5374,7 +5371,6 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) pyScreens.reset(this); pyScreens.setLookupPath(DynamicObject->asBaseDir); bool parse = false; - double dSDist; int cabindex = 0; DynamicObject->mdKabina = NULL; // likwidacja wskaźnika na dotychczasową kabinę switch (NewCabNo) diff --git a/Train.h b/Train.h index 37d9a43f..844c959e 100644 --- a/Train.h +++ b/Train.h @@ -32,10 +32,10 @@ const int maxcab = 2; // const double fCzuwakTime= 90.0f; const double fCzuwakBlink = 0.15; -const float fConverterPrzekaznik = 1.5; // hunter-261211: do przekaznika nadmiarowego przetwornicy +const float fConverterPrzekaznik = 1.5f; // hunter-261211: do przekaznika nadmiarowego przetwornicy // 0.33f // const double fBuzzerTime= 5.0f; -const float fHaslerTime = 1.2; +const float fHaslerTime = 1.2f; // const double fStycznTime= 0.5f; // const double fDblClickTime= 0.2f; diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 349fa859..d610058e 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -303,8 +303,8 @@ bool TTrackFollower::ComputatePosition() return false; } #if RENDER_CONE -#include "opengl/glew.h" -#include "opengl/glut.h" +#include "GL/glew.h" +#include "GL/glut.h" void TTrackFollower::Render(float fNr) { // funkcja rysująca stożek w miejscu osi glPushMatrix(); // matryca kamery diff --git a/VBO.cpp b/VBO.cpp index 07e8dc01..8a033389 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "VBO.h" -#include "opengl/glew.h" +#include "GL/glew.h" #include "usefull.h" //--------------------------------------------------------------------------- diff --git a/World.cpp b/World.cpp index 451f9422..6ea8c0ec 100644 --- a/World.cpp +++ b/World.cpp @@ -12,14 +12,12 @@ http://mozilla.org/MPL/2.0/. */ -#include - #include "stdafx.h" #include "World.h" -#include "opengl/glew.h" -#include "opengl/glut.h" +#include "GL/glew.h" +#include "GL/glut.h" #include "Globals.h" #include "Logs.h" @@ -39,10 +37,6 @@ http://mozilla.org/MPL/2.0/. #define TEXTURE_LOD_BIAS_EXT 0x8501 //--------------------------------------------------------------------------- -typedef void(APIENTRY *FglutBitmapCharacter)(void *font, int character); // typ funkcji -FglutBitmapCharacter glutBitmapCharacterDLL = NULL; // deklaracja zmiennej -HINSTANCE hinstGLUT32 = NULL; // wskaźnik do GLUT32.DLL -// GLUTAPI void APIENTRY glutBitmapCharacterDLL(void *font, int character); TDynamicObject *Controlled = NULL; // pojazd, który prowadzimy const double fTimeMax = 1.00; //[s] maksymalny czas aktualizacji w jednek klatce @@ -81,8 +75,6 @@ TWorld::~TWorld() TModelsManager::Free(); TTexturesManager::Free(); glDeleteLists(base, 96); - if (hinstGLUT32) - FreeLibrary(hinstGLUT32); } void TWorld::TrainDelete(TDynamicObject *d) @@ -101,20 +93,19 @@ void TWorld::TrainDelete(TDynamicObject *d) GLvoid TWorld::glPrint(const char *txt) // custom GL "Print" routine { // wypisywanie tekstu 2D na ekranie //m7todo - return; if (!txt) return; if (Global::bGlutFont) { // tekst generowany przez GLUT - int i, len = strlen(txt); + size_t i, len = strlen(txt); for (i = 0; i < len; i++) - glutBitmapCharacterDLL(GLUT_BITMAP_8_BY_13, txt[i]); // funkcja linkowana dynamicznie + glutBitmapCharacter(GLUT_BITMAP_8_BY_13, txt[i]); } else { // generowanie przez Display Lists glPushAttrib(GL_LIST_BIT); // pushes the display list bits glListBase(base - 32); // sets the base character to 32 - glCallLists(strlen(txt), GL_UNSIGNED_BYTE, txt); // draws the display list text + glCallLists((GLsizei)strlen(txt), GL_UNSIGNED_BYTE, txt); // draws the display list text glPopAttrib(); // pops the display list bits } } @@ -185,8 +176,7 @@ bool TWorld::Init(GLFWwindow *w) WriteLog("Starting MaSzyna rail vehicle simulator."); WriteLog(Global::asVersion); if( sizeof( TSubModel ) != 256 ) { - Error( "Wrong sizeof(TSubModel) is " + std::to_string(sizeof( TSubModel )) ); - return false; + std::cout << "sizeof(TSubModel) != 256: E3D file support unavailable" << std::endl; } WriteLog("Online documentation and additional files on http://eu07.pl"); WriteLog("Authors: Marcin_EU, McZapkie, ABu, Winger, Tolaris, nbmx, OLO_EU, Bart, Quark-t, " @@ -260,7 +250,7 @@ bool TWorld::Init(GLFWwindow *w) else { Global::bDecompressDDS = - !(true == GLEW_EXT_texture_compression_s3tc); // czy obsługiwane? + !(GLEW_EXT_texture_compression_s3tc); // czy obsługiwane? if (Global::bDecompressDDS) // czy jest obsługa DDS w karcie graficznej WriteLog("DDS textures are not supported."); else // brak obsługi DDS - trzeba włączyć programową dekompresję @@ -313,7 +303,7 @@ bool TWorld::Init(GLFWwindow *w) WriteLog("glEnable(GL_ALPHA_TEST);"); glEnable(GL_ALPHA_TEST); WriteLog("glAlphaFunc(GL_GREATER,0.04);"); - glAlphaFunc(GL_GREATER, 0.04); + glAlphaFunc(GL_GREATER, 0.04f); WriteLog("glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);"); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); WriteLog("glDepthFunc(GL_LEQUAL);"); @@ -431,24 +421,16 @@ bool TWorld::Init(GLFWwindow *w) /*--------------------Render Initialization End---------------------*/ - //m7todo: font - /* + //m7todo + WriteLog("Font init"); // początek inicjacji fontów 2D - if (Global::bGlutFont) // jeśli wybrano GLUT font, próbujemy zlinkować GLUT32.DLL + if (Global::bGlutFont) { - UINT mode = SetErrorMode(SEM_NOOPENFILEERRORBOX); // aby nie wrzeszczał, że znaleźć nie może - hinstGLUT32 = LoadLibrary(TEXT("GLUT32.DLL")); // get a handle to the DLL module - SetErrorMode(mode); - // If the handle is valid, try to get the function address. - if (hinstGLUT32) - glutBitmapCharacterDLL = - (FglutBitmapCharacter)GetProcAddress(hinstGLUT32, "glutBitmapCharacter"); - else - WriteLog("Missed GLUT32.DLL."); - if (glutBitmapCharacterDLL) - WriteLog("Used font from GLUT32.DLL."); - else - Global::bGlutFont = false; // nie udało się, trzeba spróbować na Display List + int zi = 0; + char zc = 0; + char *zcp = &zc; + glutInit(&zi, &zcp); + WriteLog("Used font from GLUT."); } if (!Global::bGlutFont) { // jeśli bezGLUTowy font @@ -468,12 +450,13 @@ bool TWorld::Init(GLFWwindow *w) ANTIALIASED_QUALITY, // output quality FF_DONTCARE | DEFAULT_PITCH, // family and pitch "Courier New"); // font name + HDC hDC = GetDC(glfwGetWin32Window(window)); SelectObject(hDC, font); // selects the font we want wglUseFontBitmapsA(hDC, 32, 96, base); // builds 96 characters starting at character 32 WriteLog("Display Lists font used."); //+AnsiString(glGetError()) } WriteLog("Font init OK"); //+AnsiString(glGetError()) - */ + Timer::ResetTimers(); glColor4f(1.0f, 3.0f, 3.0f, 0.0f); @@ -533,8 +516,6 @@ bool TWorld::Init(GLFWwindow *w) glfwSwapBuffers(window); - int i; - Paused = true; WriteLog("Textures init"); if (Global::detonatoryOK) @@ -1128,7 +1109,7 @@ bool TWorld::Update() */ iCheckFPS = 0.25 * Timer::GetFPS(); // tak za 0.25 sekundy sprawdzić ponownie (jeszcze przycina?) } - Timer::UpdateTimers(Global::iPause); + Timer::UpdateTimers(Global::iPause != 0); if (!Global::iPause) { // jak pauza, to nie ma po co tego przeliczać GlobalTime->UpdateMTableTime(Timer::GetDeltaTime()); // McZapkie-300302: czas rozkladowy @@ -1199,15 +1180,13 @@ bool TWorld::Update() // blablabla // Ground.UpdatePhys(dt,n); //na razie tu //2014-12: yB przeniósł do Ground.Update() :( Ground.Update(dt, n); // tu zrobić tylko coklatkową aktualizację przesunięć - if (DebugModeFlag) - if (Global::bActive) // nie przyspieszać, gdy jedzie w tle :) - if (Console::Pressed(GLFW_KEY_ESCAPE)) - { // yB dodał przyspieszacz fizyki - Ground.Update(dt, n); - Ground.Update(dt, n); - Ground.Update(dt, n); - Ground.Update(dt, n); // 5 razy - } + if (DebugModeFlag && Console::Pressed(GLFW_KEY_ESCAPE)) + { // yB dodał przyspieszacz fizyki + Ground.Update(dt, n); + Ground.Update(dt, n); + Ground.Update(dt, n); + Ground.Update(dt, n); // 5 razy + } dt = Timer::GetDeltaTime(); // czas niekwantowany @@ -1216,7 +1195,7 @@ bool TWorld::Update() Ground.CheckQuery(); if( Train != nullptr ) { - TSubModel::iInstance = reinterpret_cast( Train->Dynamic() ); + TSubModel::iInstance = reinterpret_cast( Train->Dynamic() ); Train->Update( dt ); } else { @@ -1237,46 +1216,44 @@ bool TWorld::Update() }; void -TWorld::Update_Camera( double const Deltatime ) { - +TWorld::Update_Camera( double const Deltatime ) +{ // Console::Update(); //tu jest zależne od FPS, co nie jest korzystne - if( Global::bActive ) { // obsługa ruchu kamery tylko gdy okno jest aktywne - if( glfwGetMouseButton(window, GLFW_MOUSE_BUTTON_LEFT) == GLFW_PRESS ) { - Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe - // if (!FreeFlyModeFlag) //jeśli wewnątrz - patrzymy do tyłu - // Camera.LookAt=Train->pMechPosition-Normalize(Train->GetDirection())*10; - if( Controlled ? LengthSquared3( Controlled->GetPosition() - Camera.Pos ) < 2250000 : - false ) // gdy bliżej niż 1.5km - Camera.LookAt = Controlled->GetPosition(); - else { - TDynamicObject *d = - Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m - if( !d ) - d = Ground.DynamicNearest( Camera.Pos, - 1000 ); // dalej szukanie, jesli bliżej nie ma - if( d && pDynamicNearest ) // jeśli jakiś jest znaleziony wcześniej - if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > - LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) - d = pDynamicNearest; // jeśli najbliższy nie jest 10 razy bliżej niż - // poprzedni najbliższy, zostaje poprzedni - if( d ) - pDynamicNearest = d; // zmiana na nowy, jeśli coś znaleziony niepusty - if( pDynamicNearest ) - Camera.LookAt = pDynamicNearest->GetPosition(); - } - if( FreeFlyModeFlag ) - Camera.RaLook(); // jednorazowe przestawienie kamery + if( glfwGetMouseButton(window, GLFW_MOUSE_BUTTON_LEFT) == GLFW_PRESS ) { + Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe + // if (!FreeFlyModeFlag) //jeśli wewnątrz - patrzymy do tyłu + // Camera.LookAt=Train->pMechPosition-Normalize(Train->GetDirection())*10; + if( Controlled ? LengthSquared3( Controlled->GetPosition() - Camera.Pos ) < 2250000 : + false ) // gdy bliżej niż 1.5km + Camera.LookAt = Controlled->GetPosition(); + else { + TDynamicObject *d = + Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m + if( !d ) + d = Ground.DynamicNearest( Camera.Pos, + 1000 ); // dalej szukanie, jesli bliżej nie ma + if( d && pDynamicNearest ) // jeśli jakiś jest znaleziony wcześniej + if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > + LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) + d = pDynamicNearest; // jeśli najbliższy nie jest 10 razy bliżej niż + // poprzedni najbliższy, zostaje poprzedni + if( d ) + pDynamicNearest = d; // zmiana na nowy, jeśli coś znaleziony niepusty + if( pDynamicNearest ) + Camera.LookAt = pDynamicNearest->GetPosition(); } - else if(glfwGetMouseButton(window, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS ) //||Console::Pressed(GLFW_KEY_F4)) - FollowView( false ); // bez wyciszania dźwięków + if( FreeFlyModeFlag ) + Camera.RaLook(); // jednorazowe przestawienie kamery + } + else if(glfwGetMouseButton(window, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS ) //||Console::Pressed(GLFW_KEY_F4)) + FollowView( false ); // bez wyciszania dźwięków /* - else if( Global::iTextMode == -1 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy - WriteLog( "Number of textures used: " + std::to_string( Global::iTextures ) ); - return false; - } + else if( Global::iTextMode == -1 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy + WriteLog( "Number of textures used: " + std::to_string( Global::iTextures ) ); + return false; + } */ - Camera.Update(); // uwzględnienie ruchu wywołanego klawiszami - } // koniec bloku pomijanego przy nieaktywnym oknie + Camera.Update(); // uwzględnienie ruchu wywołanego klawiszami if( Camera.Type == tp_Follow ) { if( Train ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery @@ -1466,7 +1443,7 @@ void TWorld::Update_Lights() { bool TWorld::Render() { - glColor3b(255, 255, 255); + glColor3ub(255, 255, 255); // glColor3b(255, 0, 255); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix @@ -1521,7 +1498,7 @@ TWorld::Render_Cab() { } TDynamicObject *dynamic = Train->Dynamic(); - TSubModel::iInstance = reinterpret_cast( dynamic ); + TSubModel::iInstance = reinterpret_cast( dynamic ); if( ( true == FreeFlyModeFlag ) || ( false == dynamic->bDisplayCab ) @@ -1591,7 +1568,7 @@ TWorld::Render_Cab() { else { glBlendFunc( GL_DST_COLOR, GL_ONE ); glDepthFunc( GL_GEQUAL ); - glAlphaFunc( GL_GREATER, 0.004 ); + glAlphaFunc( GL_GREATER, 0.004f ); // glDisable(GL_DEPTH_TEST); glDisable( GL_LIGHTING ); glDisable( GL_FOG ); @@ -1627,7 +1604,7 @@ TWorld::Render_Cab() { glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); // glEnable(GL_DEPTH_TEST); - glAlphaFunc( GL_GREATER, 0.04 ); + glAlphaFunc( GL_GREATER, 0.04f ); glDepthFunc( GL_LEQUAL ); glEnable( GL_LIGHTING ); //i tak się włączy potem glEnable( GL_FOG ); @@ -1656,17 +1633,17 @@ TWorld::Render_Cab() { case e_canyon: { for( int li = 0; li < 3; li++ ) { - diffuseCabLight[ li ] *= 0.6; - specularCabLight[ li ] *= 0.7; + diffuseCabLight[ li ] *= 0.6f; + specularCabLight[ li ] *= 0.7f; } } break; case e_tunnel: { for( int li = 0; li < 3; li++ ) { - ambientCabLight[ li ] *= 0.3; - diffuseCabLight[ li ] *= 0.1; - specularCabLight[ li ] *= 0.2; + ambientCabLight[ li ] *= 0.3f; + diffuseCabLight[ li ] *= 0.1f; + specularCabLight[ li ] *= 0.2f; } } break; @@ -1891,13 +1868,10 @@ TWorld::Render_UI() { } glDisable( GL_LIGHTING ); - //m7todo: title - /* - if( Controlled ) - SetWindowText( hWnd, Controlled->MoverParameters->Name.c_str() ); - else - SetWindowText( hWnd, Global::SceneryFile.c_str() ); // nazwa scenerii - */ + + glfwSetWindowTitle(window, ("EU07++NG: " + Controlled->MoverParameters->Name).c_str()); + glfwSetWindowTitle(window, ("EU07++NG: " + Global::SceneryFile).c_str()); + glBindTexture( GL_TEXTURE_2D, 0 ); glColor4f( 1.0f, 0.0f, 0.0f, 1.0f ); glLoadIdentity(); @@ -2605,7 +2579,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0]))); if (e) if ((e->Type == tp_Multiple) || (e->Type == tp_Lights) || - bool(e->evJoined)) // tylko jawne albo niejawne Multiple + (e->evJoined != 0)) // tylko jawne albo niejawne Multiple Ground.AddToQuery(e, NULL); // drugi parametr to dynamic wywołujący - tu // brak } diff --git a/eu07.rc b/eu07.rc new file mode 100644 index 00000000..8e594be8 --- /dev/null +++ b/eu07.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON "eu07.ico" \ No newline at end of file diff --git a/geometry.h b/geometry.h index 5cdd2ec3..85f0e586 100644 --- a/geometry.h +++ b/geometry.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #ifndef GeometryH #define GeometryH -#include "opengl/glew.h" +#include "GL/glew.h" #include "dumb3d.h" using namespace Math3D; //--------------------------------------------------------------------------- diff --git a/maszyna.rc b/maszyna.rc deleted file mode 100644 index ac76d2e13680f203d41ccdf7ae22f32e5ea40aa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5814 zcmdUzTW=ya6vxkVrGAGgd1=*_gltyrYXXF#B^QN@S}77r6UZVFKmpp_s-L~>?{9N} zfgu~{s-har*khlY&(-$de;wMPC3aywySHZ>+L*U%6UJJMjcsao*5|Ki-|{5(XdN5y zJ~KX{ePHaFR(Ml-_w*C~M6G8dVDk2*eF2xl&>k>4V73qRLx9b#;pgqWTn)+v3I89(M-waBM!@O#j2#7pac|1{*r3Yx7+BsenW2jENG>N7n ze$>XBYCNL*Cr`2wvjL48e721|HG2n!B(5=f$!L?d68zFf1gE&H5}7~QcTlbabvDNk z=Q2{AGFrpGMa^}vUzTxcTsm)+JCz~F*lLJ%d|a*G7AtP^Eu*)3$YGcKD~`|6jIfty zd|a3b5LL8NUV%xhU_YSCBi=&jzomC#KiZqXQND8n?GidIqSG{oPh&gR^I)Y4QeR-7 zI@V6$`2j9nW+b8Vdv_j>(Uxa$t<2s@e;@JCDVihprUV_YF$ zggrq?8ho$6tqWMQIM3-?5@Um>JMh1?mKdZ2s9CTni;|mv;#*&{y1S!$UUJZs<8^roX1SC-gL)Yc3Du2i|Qs)PR44NW7ep(Zo~6x#zX!q&Tc#XE&GLAM?1t_)^-h_Au&8#1mq-$-pOBeVJ(l-7bw4KzG4?BxC)W7c^{aDXhSug<)XhX?=#l-{n|CPh{AX1 zFUG5DcK=$pwYQtjc0R9GZvpFXIt6Mzdk2tx-o7PI#N3+B3p!2i!XxXPpR@H-X3lQO zXSaBCIvOr<*t{?(>xIR%?3t XKF{^If0lNMUiS9^k*auoZC?Ec;)bvM diff --git a/maszyna.sln b/maszyna.sln deleted file mode 100644 index 49bfe6ea..00000000 --- a/maszyna.sln +++ /dev/null @@ -1,28 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maszyna", "maszyna.vcxproj", "{8E0232E5-1C67-442F-9E04-45ED2DDFC960}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x64.ActiveCfg = Debug|x64 - {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x64.Build.0 = Debug|x64 - {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x86.ActiveCfg = Debug|Win32 - {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x86.Build.0 = Debug|Win32 - {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x64.ActiveCfg = Release|x64 - {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x64.Build.0 = Release|x64 - {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x86.ActiveCfg = Release|Win32 - {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/maszyna.vcxproj b/maszyna.vcxproj deleted file mode 100644 index a4a1c191..00000000 --- a/maszyna.vcxproj +++ /dev/null @@ -1,281 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {8E0232E5-1C67-442F-9E04-45ED2DDFC960} - Win32Proj - - - - Application - true - v140_xp - - - Application - true - v140_xp - - - Application - false - v140_xp - - - Application - false - v140_xp - - - - - - - - - - - - - - - - - - - eu07++ - $(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\ - $(SolutionDir)bin\ - - - eu07++ - - - eu07++ - $(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\ - $(SolutionDir)bin\ - false - C:\Users\VB\Desktop\maszyna\lib;$(IncludePath) - C:\Users\VB\Desktop\maszyna\lib-vc2015;$(LibraryPath) - - - false - eu07++ - C:\Users\VB\Desktop\maszyna\lib;$(IncludePath) - C:\Users\VB\Desktop\maszyna\lib-vc2015;$(LibraryPath) - - - - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - Level3 - ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories) - Use - true - false - true - - - MachineX86 - true - Windows - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) - - - - - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - Level3 - ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories) - Use - true - false - true - - - true - Windows - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) - - - - - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories) - Use - true - - - MachineX86 - true - Windows - true - true - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) - - - - - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories) - Use - true - - - true - Windows - true - true - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters deleted file mode 100644 index cef11bd1..00000000 --- a/maszyna.vcxproj.filters +++ /dev/null @@ -1,374 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - {fafd38ab-4c2a-48c8-8e66-ad0d928573b3} - - - {2d73d7b2-5252-499c-963a-88fa3cb1af53} - - - {aec51dd3-af67-4f08-9dcb-889f673ad7c9} - - - {36684428-8a48-435f-bca4-a24d9bfe2587} - - - {cdf75bec-91f7-413c-8b57-9e32cba49148} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\mczapkie - - - Source Files\mczapkie - - - Source Files\console - - - Source Files\mczapkie - - - Source Files\mczapkie - - - Source Files\mczapkie - - - Source Files\console - - - Source Files - - - Source Files\console - - - Source Files - - - - - Header Files\opengl - - - Header Files - - - Header Files - - - Header Files - - - Header Files\mczapkie - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\mczapkie - - - Header Files\mczapkie - - - Header Files\mczapkie - - - Header Files\mczapkie - - - Header Files\console - - - Header Files\console - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\opengl - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\console - - - - - Resource Files - - - - - Resource Files - - - - - - - \ No newline at end of file diff --git a/maszyna.vcxproj.user b/maszyna.vcxproj.user deleted file mode 100644 index 760c128e..00000000 --- a/maszyna.vcxproj.user +++ /dev/null @@ -1,21 +0,0 @@ - - - - ..\..\Projects\maszyna - WindowsLocalDebugger - - - ..\..\Projects\maszyna - WindowsLocalDebugger - - - ..\..\Projects\maszyna - WindowsLocalDebugger - _NO_DEBUG_HEAP=1 - - - ..\..\Projects\maszyna - WindowsLocalDebugger - _NO_DEBUG_HEAP=1 - - \ No newline at end of file diff --git a/mtable.cpp b/mtable.cpp index 680f6cc6..7f1248bf 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -507,7 +507,7 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) } } } - return !(bool)ConversionError; + return ConversionError == 0; } void TMTableTime::UpdateMTableTime(double deltaT) diff --git a/opengl/GLUT.H b/opengl/GLUT.H deleted file mode 100644 index 525e5511..00000000 --- a/opengl/GLUT.H +++ /dev/null @@ -1,711 +0,0 @@ -#ifndef __glut_h__ -#define __glut_h__ - -/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. */ - -/* This program is freely distributable without licensing fees and is - provided without guarantee or warrantee expressed or implied. This - program is -not- in the public domain. */ - -#if defined(_WIN32) - -/* GLUT 3.7 now tries to avoid including - to avoid name space pollution, but Win32's - needs APIENTRY and WINGDIAPI defined properly. */ -# if 0 - /* This would put tons of macros and crap in our clean name space. */ -# define WIN32_LEAN_AND_MEAN -# include -# else - /* XXX This is from Win32's */ -# ifndef APIENTRY -# define GLUT_APIENTRY_DEFINED -# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__) -# define APIENTRY __stdcall -# else -# define APIENTRY -# endif -# endif - /* XXX This is from Win32's */ -# ifndef CALLBACK -# if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS) -# define CALLBACK __stdcall -# else -# define CALLBACK -# endif -# endif - /* XXX This is from Win32's and */ -# ifndef WINGDIAPI -# define GLUT_WINGDIAPI_DEFINED -# define WINGDIAPI __declspec(dllimport) -# endif - /* XXX This is from Win32's */ -# ifndef _WCHAR_T_DEFINED -typedef unsigned short wchar_t; -# define _WCHAR_T_DEFINED -# endif -# endif - -#define GLUT_BUILDING_LIB /* disable automatic library usage for GLUT */ -/* To disable automatic library usage for GLUT, define GLUT_NO_LIB_PRAGMA - in your compile preprocessor options. */ -# if !defined(GLUT_BUILDING_LIB) && !defined(GLUT_NO_LIB_PRAGMA) -# pragma comment (lib, "winmm.lib") /* link with Windows MultiMedia lib */ -/* To enable automatic SGI OpenGL for Windows library usage for GLUT, - define GLUT_USE_SGI_OPENGL in your compile preprocessor options. */ -# ifdef GLUT_USE_SGI_OPENGL -# pragma comment (lib, "opengl.lib") /* link with SGI OpenGL for Windows lib */ -# pragma comment (lib, "glu.lib") /* link with SGI OpenGL Utility lib */ -# pragma comment (lib, "glut.lib") /* link with Win32 GLUT for SGI OpenGL lib */ -# else -# pragma comment (lib, "opengl32.lib") /* link with Microsoft OpenGL lib */ -# pragma comment (lib, "glu32.lib") /* link with Microsoft OpenGL Utility lib */ -# pragma comment (lib, "glut32.lib") /* link with Win32 GLUT lib */ -# endif -# endif - -/* To disable supression of annoying warnings about floats being promoted - to doubles, define GLUT_NO_WARNING_DISABLE in your compile preprocessor - options. */ -# ifndef GLUT_NO_WARNING_DISABLE -# pragma warning (disable:4244) /* Disable bogus VC++ 4.2 conversion warnings. */ -# pragma warning (disable:4305) /* VC++ 5.0 version of above warning. */ -# endif - -/* Win32 has an annoying issue where there are multiple C run-time - libraries (CRTs). If the executable is linked with a different CRT - from the GLUT DLL, the GLUT DLL will not share the same CRT static - data seen by the executable. In particular, atexit callbacks registered - in the executable will not be called if GLUT calls its (different) - exit routine). GLUT is typically built with the - "/MD" option (the CRT with multithreading DLL support), but the Visual - C++ linker default is "/ML" (the single threaded CRT). - - One workaround to this issue is requiring users to always link with - the same CRT as GLUT is compiled with. That requires users supply a - non-standard option. GLUT 3.7 has its own built-in workaround where - the executable's "exit" function pointer is covertly passed to GLUT. - GLUT then calls the executable's exit function pointer to ensure that - any "atexit" calls registered by the application are called if GLUT - needs to exit. - - Note that the __glut*WithExit routines should NEVER be called directly. - To avoid the atexit workaround, #define GLUT_DISABLE_ATEXIT_HACK. */ - -/* XXX This is from Win32's */ -# if !defined(_MSC_VER) && !defined(__cdecl) - /* Define __cdecl for non-Microsoft compilers. */ -# define __cdecl -# define GLUT_DEFINED___CDECL -# endif -# ifndef _CRTIMP -# ifdef _NTSDK - /* Definition compatible with NT SDK */ -# define _CRTIMP -# else - /* Current definition */ -# ifdef _DLL -# define _CRTIMP __declspec(dllimport) -# else -# define _CRTIMP -# endif -# endif -# define GLUT_DEFINED__CRTIMP -# endif - -/* GLUT API entry point declarations for Win32. */ -# ifdef GLUT_BUILDING_LIB -# define GLUTAPI __declspec(dllexport) -# else -# ifdef _DLL -# define GLUTAPI __declspec(dllimport) -# else -# define GLUTAPI extern -# endif -# endif - -/* GLUT callback calling convention for Win32. */ -# define GLUTCALLBACK __cdecl - -#endif /* _WIN32 */ - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_WIN32) -# ifndef GLUT_BUILDING_LIB -//extern _CRTIMP void __cdecl exit(int); -# endif -#else -/* non-Win32 case. */ -/* Define APIENTRY and CALLBACK to nothing if we aren't on Win32. */ -# define APIENTRY -# define GLUT_APIENTRY_DEFINED -# define CALLBACK -/* Define GLUTAPI and GLUTCALLBACK as below if we aren't on Win32. */ -# define GLUTAPI extern -# define GLUTCALLBACK -/* Prototype exit for the non-Win32 case (see above). */ -extern void exit(int); -#endif - -/** - GLUT API revision history: - - GLUT_API_VERSION is updated to reflect incompatible GLUT - API changes (interface changes, semantic changes, deletions, - or additions). - - GLUT_API_VERSION=1 First public release of GLUT. 11/29/94 - - GLUT_API_VERSION=2 Added support for OpenGL/GLX multisampling, - extension. Supports new input devices like tablet, dial and button - box, and Spaceball. Easy to query OpenGL extensions. - - GLUT_API_VERSION=3 glutMenuStatus added. - - GLUT_API_VERSION=4 glutInitDisplayString, glutWarpPointer, - glutBitmapLength, glutStrokeLength, glutWindowStatusFunc, dynamic - video resize subAPI, glutPostWindowRedisplay, glutKeyboardUpFunc, - glutSpecialUpFunc, glutIgnoreKeyRepeat, glutSetKeyRepeat, - glutJoystickFunc, glutForceJoystickFunc (NOT FINALIZED!). -**/ -#ifndef GLUT_API_VERSION /* allow this to be overriden */ -#define GLUT_API_VERSION 3 -#endif - -/** - GLUT implementation revision history: - - GLUT_XLIB_IMPLEMENTATION is updated to reflect both GLUT - API revisions and implementation revisions (ie, bug fixes). - - GLUT_XLIB_IMPLEMENTATION=1 mjk's first public release of - GLUT Xlib-based implementation. 11/29/94 - - GLUT_XLIB_IMPLEMENTATION=2 mjk's second public release of - GLUT Xlib-based implementation providing GLUT version 2 - interfaces. - - GLUT_XLIB_IMPLEMENTATION=3 mjk's GLUT 2.2 images. 4/17/95 - - GLUT_XLIB_IMPLEMENTATION=4 mjk's GLUT 2.3 images. 6/?/95 - - GLUT_XLIB_IMPLEMENTATION=5 mjk's GLUT 3.0 images. 10/?/95 - - GLUT_XLIB_IMPLEMENTATION=7 mjk's GLUT 3.1+ with glutWarpPoitner. 7/24/96 - - GLUT_XLIB_IMPLEMENTATION=8 mjk's GLUT 3.1+ with glutWarpPoitner - and video resize. 1/3/97 - - GLUT_XLIB_IMPLEMENTATION=9 mjk's GLUT 3.4 release with early GLUT 4 routines. - - GLUT_XLIB_IMPLEMENTATION=11 Mesa 2.5's GLUT 3.6 release. - - GLUT_XLIB_IMPLEMENTATION=12 mjk's GLUT 3.6 release with early GLUT 4 routines + signal handling. - - GLUT_XLIB_IMPLEMENTATION=13 mjk's GLUT 3.7 beta with GameGLUT support. - - GLUT_XLIB_IMPLEMENTATION=14 mjk's GLUT 3.7 beta with f90gl friend interface. - - GLUT_XLIB_IMPLEMENTATION=15 mjk's GLUT 3.7 beta sync'ed with Mesa -**/ -#ifndef GLUT_XLIB_IMPLEMENTATION /* Allow this to be overriden. */ -#define GLUT_XLIB_IMPLEMENTATION 15 -#endif - -/* Display mode bit masks. */ -#define GLUT_RGB 0 -#define GLUT_RGBA GLUT_RGB -#define GLUT_INDEX 1 -#define GLUT_SINGLE 0 -#define GLUT_DOUBLE 2 -#define GLUT_ACCUM 4 -#define GLUT_ALPHA 8 -#define GLUT_DEPTH 16 -#define GLUT_STENCIL 32 -#if (GLUT_API_VERSION >= 2) -#define GLUT_MULTISAMPLE 128 -#define GLUT_STEREO 256 -#endif -#if (GLUT_API_VERSION >= 3) -#define GLUT_LUMINANCE 512 -#endif - -/* Mouse buttons. */ -#define GLUT_LEFT_BUTTON 0 -#define GLUT_MIDDLE_BUTTON 1 -#define GLUT_RIGHT_BUTTON 2 - -/* Mouse button state. */ -#define GLUT_DOWN 0 -#define GLUT_UP 1 - -#if (GLUT_API_VERSION >= 2) -/* function keys */ -#define GLUT_KEY_F1 1 -#define GLUT_KEY_F2 2 -#define GLUT_KEY_F3 3 -#define GLUT_KEY_F4 4 -#define GLUT_KEY_F5 5 -#define GLUT_KEY_F6 6 -#define GLUT_KEY_F7 7 -#define GLUT_KEY_F8 8 -#define GLUT_KEY_F9 9 -#define GLUT_KEY_F10 10 -#define GLUT_KEY_F11 11 -#define GLUT_KEY_F12 12 -/* directional keys */ -#define GLUT_KEY_LEFT 100 -#define GLUT_KEY_UP 101 -#define GLUT_KEY_RIGHT 102 -#define GLUT_KEY_DOWN 103 -#define GLUT_KEY_PAGE_UP 104 -#define GLUT_KEY_PAGE_DOWN 105 -#define GLUT_KEY_HOME 106 -#define GLUT_KEY_END 107 -#define GLUT_KEY_INSERT 108 -#endif - -/* Entry/exit state. */ -#define GLUT_LEFT 0 -#define GLUT_ENTERED 1 - -/* Menu usage state. */ -#define GLUT_MENU_NOT_IN_USE 0 -#define GLUT_MENU_IN_USE 1 - -/* Visibility state. */ -#define GLUT_NOT_VISIBLE 0 -#define GLUT_VISIBLE 1 - -/* Window status state. */ -#define GLUT_HIDDEN 0 -#define GLUT_FULLY_RETAINED 1 -#define GLUT_PARTIALLY_RETAINED 2 -#define GLUT_FULLY_COVERED 3 - -/* Color index component selection values. */ -#define GLUT_RED 0 -#define GLUT_GREEN 1 -#define GLUT_BLUE 2 - -#if defined(_WIN32) -/* Stroke font constants (use these in GLUT program). */ -#define GLUT_STROKE_ROMAN ((void*)0) -#define GLUT_STROKE_MONO_ROMAN ((void*)1) - -/* Bitmap font constants (use these in GLUT program). */ -#define GLUT_BITMAP_9_BY_15 ((void*)2) -#define GLUT_BITMAP_8_BY_13 ((void*)3) -#define GLUT_BITMAP_TIMES_ROMAN_10 ((void*)4) -#define GLUT_BITMAP_TIMES_ROMAN_24 ((void*)5) -#if (GLUT_API_VERSION >= 3) -#define GLUT_BITMAP_HELVETICA_10 ((void*)6) -#define GLUT_BITMAP_HELVETICA_12 ((void*)7) -#define GLUT_BITMAP_HELVETICA_18 ((void*)8) -#endif -#else -/* Stroke font opaque addresses (use constants instead in source code). */ -GLUTAPI void *glutStrokeRoman; -GLUTAPI void *glutStrokeMonoRoman; - -/* Stroke font constants (use these in GLUT program). */ -#define GLUT_STROKE_ROMAN (&glutStrokeRoman) -#define GLUT_STROKE_MONO_ROMAN (&glutStrokeMonoRoman) - -/* Bitmap font opaque addresses (use constants instead in source code). */ -GLUTAPI void *glutBitmap9By15; -GLUTAPI void *glutBitmap8By13; -GLUTAPI void *glutBitmapTimesRoman10; -GLUTAPI void *glutBitmapTimesRoman24; -GLUTAPI void *glutBitmapHelvetica10; -GLUTAPI void *glutBitmapHelvetica12; -GLUTAPI void *glutBitmapHelvetica18; - -/* Bitmap font constants (use these in GLUT program). */ -#define GLUT_BITMAP_9_BY_15 (&glutBitmap9By15) -#define GLUT_BITMAP_8_BY_13 (&glutBitmap8By13) -#define GLUT_BITMAP_TIMES_ROMAN_10 (&glutBitmapTimesRoman10) -#define GLUT_BITMAP_TIMES_ROMAN_24 (&glutBitmapTimesRoman24) -#if (GLUT_API_VERSION >= 3) -#define GLUT_BITMAP_HELVETICA_10 (&glutBitmapHelvetica10) -#define GLUT_BITMAP_HELVETICA_12 (&glutBitmapHelvetica12) -#define GLUT_BITMAP_HELVETICA_18 (&glutBitmapHelvetica18) -#endif -#endif - -/* glutGet parameters. */ -#define GLUT_WINDOW_X ((GLenum) 100) -#define GLUT_WINDOW_Y ((GLenum) 101) -#define GLUT_WINDOW_WIDTH ((GLenum) 102) -#define GLUT_WINDOW_HEIGHT ((GLenum) 103) -#define GLUT_WINDOW_BUFFER_SIZE ((GLenum) 104) -#define GLUT_WINDOW_STENCIL_SIZE ((GLenum) 105) -#define GLUT_WINDOW_DEPTH_SIZE ((GLenum) 106) -#define GLUT_WINDOW_RED_SIZE ((GLenum) 107) -#define GLUT_WINDOW_GREEN_SIZE ((GLenum) 108) -#define GLUT_WINDOW_BLUE_SIZE ((GLenum) 109) -#define GLUT_WINDOW_ALPHA_SIZE ((GLenum) 110) -#define GLUT_WINDOW_ACCUM_RED_SIZE ((GLenum) 111) -#define GLUT_WINDOW_ACCUM_GREEN_SIZE ((GLenum) 112) -#define GLUT_WINDOW_ACCUM_BLUE_SIZE ((GLenum) 113) -#define GLUT_WINDOW_ACCUM_ALPHA_SIZE ((GLenum) 114) -#define GLUT_WINDOW_DOUBLEBUFFER ((GLenum) 115) -#define GLUT_WINDOW_RGBA ((GLenum) 116) -#define GLUT_WINDOW_PARENT ((GLenum) 117) -#define GLUT_WINDOW_NUM_CHILDREN ((GLenum) 118) -#define GLUT_WINDOW_COLORMAP_SIZE ((GLenum) 119) -#if (GLUT_API_VERSION >= 2) -#define GLUT_WINDOW_NUM_SAMPLES ((GLenum) 120) -#define GLUT_WINDOW_STEREO ((GLenum) 121) -#endif -#if (GLUT_API_VERSION >= 3) -#define GLUT_WINDOW_CURSOR ((GLenum) 122) -#endif -#define GLUT_SCREEN_WIDTH ((GLenum) 200) -#define GLUT_SCREEN_HEIGHT ((GLenum) 201) -#define GLUT_SCREEN_WIDTH_MM ((GLenum) 202) -#define GLUT_SCREEN_HEIGHT_MM ((GLenum) 203) -#define GLUT_MENU_NUM_ITEMS ((GLenum) 300) -#define GLUT_DISPLAY_MODE_POSSIBLE ((GLenum) 400) -#define GLUT_INIT_WINDOW_X ((GLenum) 500) -#define GLUT_INIT_WINDOW_Y ((GLenum) 501) -#define GLUT_INIT_WINDOW_WIDTH ((GLenum) 502) -#define GLUT_INIT_WINDOW_HEIGHT ((GLenum) 503) -#define GLUT_INIT_DISPLAY_MODE ((GLenum) 504) -#if (GLUT_API_VERSION >= 2) -#define GLUT_ELAPSED_TIME ((GLenum) 700) -#endif -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13) -#define GLUT_WINDOW_FORMAT_ID ((GLenum) 123) -#endif - -#if (GLUT_API_VERSION >= 2) -/* glutDeviceGet parameters. */ -#define GLUT_HAS_KEYBOARD ((GLenum) 600) -#define GLUT_HAS_MOUSE ((GLenum) 601) -#define GLUT_HAS_SPACEBALL ((GLenum) 602) -#define GLUT_HAS_DIAL_AND_BUTTON_BOX ((GLenum) 603) -#define GLUT_HAS_TABLET ((GLenum) 604) -#define GLUT_NUM_MOUSE_BUTTONS ((GLenum) 605) -#define GLUT_NUM_SPACEBALL_BUTTONS ((GLenum) 606) -#define GLUT_NUM_BUTTON_BOX_BUTTONS ((GLenum) 607) -#define GLUT_NUM_DIALS ((GLenum) 608) -#define GLUT_NUM_TABLET_BUTTONS ((GLenum) 609) -#endif -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13) -#define GLUT_DEVICE_IGNORE_KEY_REPEAT ((GLenum) 610) -#define GLUT_DEVICE_KEY_REPEAT ((GLenum) 611) -#define GLUT_HAS_JOYSTICK ((GLenum) 612) -#define GLUT_OWNS_JOYSTICK ((GLenum) 613) -#define GLUT_JOYSTICK_BUTTONS ((GLenum) 614) -#define GLUT_JOYSTICK_AXES ((GLenum) 615) -#define GLUT_JOYSTICK_POLL_RATE ((GLenum) 616) -#endif - -#if (GLUT_API_VERSION >= 3) -/* glutLayerGet parameters. */ -#define GLUT_OVERLAY_POSSIBLE ((GLenum) 800) -#define GLUT_LAYER_IN_USE ((GLenum) 801) -#define GLUT_HAS_OVERLAY ((GLenum) 802) -#define GLUT_TRANSPARENT_INDEX ((GLenum) 803) -#define GLUT_NORMAL_DAMAGED ((GLenum) 804) -#define GLUT_OVERLAY_DAMAGED ((GLenum) 805) - -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -/* glutVideoResizeGet parameters. */ -#define GLUT_VIDEO_RESIZE_POSSIBLE ((GLenum) 900) -#define GLUT_VIDEO_RESIZE_IN_USE ((GLenum) 901) -#define GLUT_VIDEO_RESIZE_X_DELTA ((GLenum) 902) -#define GLUT_VIDEO_RESIZE_Y_DELTA ((GLenum) 903) -#define GLUT_VIDEO_RESIZE_WIDTH_DELTA ((GLenum) 904) -#define GLUT_VIDEO_RESIZE_HEIGHT_DELTA ((GLenum) 905) -#define GLUT_VIDEO_RESIZE_X ((GLenum) 906) -#define GLUT_VIDEO_RESIZE_Y ((GLenum) 907) -#define GLUT_VIDEO_RESIZE_WIDTH ((GLenum) 908) -#define GLUT_VIDEO_RESIZE_HEIGHT ((GLenum) 909) -#endif - -/* glutUseLayer parameters. */ -#define GLUT_NORMAL ((GLenum) 0) -#define GLUT_OVERLAY ((GLenum) 1) - -/* glutGetModifiers return mask. */ -#define GLUT_ACTIVE_SHIFT 1 -#define GLUT_ACTIVE_CTRL 2 -#define GLUT_ACTIVE_ALT 4 - -/* glutSetCursor parameters. */ -/* Basic arrows. */ -#define GLUT_CURSOR_RIGHT_ARROW 0 -#define GLUT_CURSOR_LEFT_ARROW 1 -/* Symbolic cursor shapes. */ -#define GLUT_CURSOR_INFO 2 -#define GLUT_CURSOR_DESTROY 3 -#define GLUT_CURSOR_HELP 4 -#define GLUT_CURSOR_CYCLE 5 -#define GLUT_CURSOR_SPRAY 6 -#define GLUT_CURSOR_WAIT 7 -#define GLUT_CURSOR_TEXT 8 -#define GLUT_CURSOR_CROSSHAIR 9 -/* Directional cursors. */ -#define GLUT_CURSOR_UP_DOWN 10 -#define GLUT_CURSOR_LEFT_RIGHT 11 -/* Sizing cursors. */ -#define GLUT_CURSOR_TOP_SIDE 12 -#define GLUT_CURSOR_BOTTOM_SIDE 13 -#define GLUT_CURSOR_LEFT_SIDE 14 -#define GLUT_CURSOR_RIGHT_SIDE 15 -#define GLUT_CURSOR_TOP_LEFT_CORNER 16 -#define GLUT_CURSOR_TOP_RIGHT_CORNER 17 -#define GLUT_CURSOR_BOTTOM_RIGHT_CORNER 18 -#define GLUT_CURSOR_BOTTOM_LEFT_CORNER 19 -/* Inherit from parent window. */ -#define GLUT_CURSOR_INHERIT 100 -/* Blank cursor. */ -#define GLUT_CURSOR_NONE 101 -/* Fullscreen crosshair (if available). */ -#define GLUT_CURSOR_FULL_CROSSHAIR 102 -#endif - -/* GLUT initialization sub-API. */ -GLUTAPI void APIENTRY glutInit(int *argcp, char **argv); -#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) -GLUTAPI void APIENTRY __glutInitWithExit(int *argcp, char **argv, void (__cdecl *exitfunc)(int)); -#ifndef GLUT_BUILDING_LIB -static void APIENTRY glutInit_ATEXIT_HACK(int *argcp, char **argv) { __glutInitWithExit(argcp, argv, exit); } -#define glutInit glutInit_ATEXIT_HACK -#endif -#endif -GLUTAPI void APIENTRY glutInitDisplayMode(unsigned int mode); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -GLUTAPI void APIENTRY glutInitDisplayString(const char *string); -#endif -GLUTAPI void APIENTRY glutInitWindowPosition(int x, int y); -GLUTAPI void APIENTRY glutInitWindowSize(int width, int height); -GLUTAPI void APIENTRY glutMainLoop(void); - -/* GLUT window sub-API. */ -GLUTAPI int APIENTRY glutCreateWindow(const char *title); -#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) -GLUTAPI int APIENTRY __glutCreateWindowWithExit(const char *title, void (__cdecl *exitfunc)(int)); -#ifndef GLUT_BUILDING_LIB -static int APIENTRY glutCreateWindow_ATEXIT_HACK(const char *title) { return __glutCreateWindowWithExit(title, exit); } -#define glutCreateWindow glutCreateWindow_ATEXIT_HACK -#endif -#endif -GLUTAPI int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height); -GLUTAPI void APIENTRY glutDestroyWindow(int win); -GLUTAPI void APIENTRY glutPostRedisplay(void); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11) -GLUTAPI void APIENTRY glutPostWindowRedisplay(int win); -#endif -GLUTAPI void APIENTRY glutSwapBuffers(void); -GLUTAPI int APIENTRY glutGetWindow(void); -GLUTAPI void APIENTRY glutSetWindow(int win); -GLUTAPI void APIENTRY glutSetWindowTitle(const char *title); -GLUTAPI void APIENTRY glutSetIconTitle(const char *title); -GLUTAPI void APIENTRY glutPositionWindow(int x, int y); -GLUTAPI void APIENTRY glutReshapeWindow(int width, int height); -GLUTAPI void APIENTRY glutPopWindow(void); -GLUTAPI void APIENTRY glutPushWindow(void); -GLUTAPI void APIENTRY glutIconifyWindow(void); -GLUTAPI void APIENTRY glutShowWindow(void); -GLUTAPI void APIENTRY glutHideWindow(void); -#if (GLUT_API_VERSION >= 3) -GLUTAPI void APIENTRY glutFullScreen(void); -GLUTAPI void APIENTRY glutSetCursor(int cursor); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -GLUTAPI void APIENTRY glutWarpPointer(int x, int y); -#endif - -/* GLUT overlay sub-API. */ -GLUTAPI void APIENTRY glutEstablishOverlay(void); -GLUTAPI void APIENTRY glutRemoveOverlay(void); -GLUTAPI void APIENTRY glutUseLayer(GLenum layer); -GLUTAPI void APIENTRY glutPostOverlayRedisplay(void); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11) -GLUTAPI void APIENTRY glutPostWindowOverlayRedisplay(int win); -#endif -GLUTAPI void APIENTRY glutShowOverlay(void); -GLUTAPI void APIENTRY glutHideOverlay(void); -#endif - -/* GLUT menu sub-API. */ -GLUTAPI int APIENTRY glutCreateMenu(void (GLUTCALLBACK *func)(int)); -#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) -GLUTAPI int APIENTRY __glutCreateMenuWithExit(void (GLUTCALLBACK *func)(int), void (__cdecl *exitfunc)(int)); -#ifndef GLUT_BUILDING_LIB -static int APIENTRY glutCreateMenu_ATEXIT_HACK(void (GLUTCALLBACK *func)(int)) { return __glutCreateMenuWithExit(func, exit); } -#define glutCreateMenu glutCreateMenu_ATEXIT_HACK -#endif -#endif -GLUTAPI void APIENTRY glutDestroyMenu(int menu); -GLUTAPI int APIENTRY glutGetMenu(void); -GLUTAPI void APIENTRY glutSetMenu(int menu); -GLUTAPI void APIENTRY glutAddMenuEntry(const char *label, int value); -GLUTAPI void APIENTRY glutAddSubMenu(const char *label, int submenu); -GLUTAPI void APIENTRY glutChangeToMenuEntry(int item, const char *label, int value); -GLUTAPI void APIENTRY glutChangeToSubMenu(int item, const char *label, int submenu); -GLUTAPI void APIENTRY glutRemoveMenuItem(int item); -GLUTAPI void APIENTRY glutAttachMenu(int button); -GLUTAPI void APIENTRY glutDetachMenu(int button); - -/* GLUT window callback sub-API. */ -GLUTAPI void APIENTRY glutDisplayFunc(void (GLUTCALLBACK *func)(void)); -GLUTAPI void APIENTRY glutReshapeFunc(void (GLUTCALLBACK *func)(int width, int height)); -GLUTAPI void APIENTRY glutKeyboardFunc(void (GLUTCALLBACK *func)(unsigned char key, int x, int y)); -GLUTAPI void APIENTRY glutMouseFunc(void (GLUTCALLBACK *func)(int button, int state, int x, int y)); -GLUTAPI void APIENTRY glutMotionFunc(void (GLUTCALLBACK *func)(int x, int y)); -GLUTAPI void APIENTRY glutPassiveMotionFunc(void (GLUTCALLBACK *func)(int x, int y)); -GLUTAPI void APIENTRY glutEntryFunc(void (GLUTCALLBACK *func)(int state)); -GLUTAPI void APIENTRY glutVisibilityFunc(void (GLUTCALLBACK *func)(int state)); -GLUTAPI void APIENTRY glutIdleFunc(void (GLUTCALLBACK *func)(void)); -GLUTAPI void APIENTRY glutTimerFunc(unsigned int millis, void (GLUTCALLBACK *func)(int value), int value); -GLUTAPI void APIENTRY glutMenuStateFunc(void (GLUTCALLBACK *func)(int state)); -#if (GLUT_API_VERSION >= 2) -GLUTAPI void APIENTRY glutSpecialFunc(void (GLUTCALLBACK *func)(int key, int x, int y)); -GLUTAPI void APIENTRY glutSpaceballMotionFunc(void (GLUTCALLBACK *func)(int x, int y, int z)); -GLUTAPI void APIENTRY glutSpaceballRotateFunc(void (GLUTCALLBACK *func)(int x, int y, int z)); -GLUTAPI void APIENTRY glutSpaceballButtonFunc(void (GLUTCALLBACK *func)(int button, int state)); -GLUTAPI void APIENTRY glutButtonBoxFunc(void (GLUTCALLBACK *func)(int button, int state)); -GLUTAPI void APIENTRY glutDialsFunc(void (GLUTCALLBACK *func)(int dial, int value)); -GLUTAPI void APIENTRY glutTabletMotionFunc(void (GLUTCALLBACK *func)(int x, int y)); -GLUTAPI void APIENTRY glutTabletButtonFunc(void (GLUTCALLBACK *func)(int button, int state, int x, int y)); -#if (GLUT_API_VERSION >= 3) -GLUTAPI void APIENTRY glutMenuStatusFunc(void (GLUTCALLBACK *func)(int status, int x, int y)); -GLUTAPI void APIENTRY glutOverlayDisplayFunc(void (GLUTCALLBACK *func)(void)); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -GLUTAPI void APIENTRY glutWindowStatusFunc(void (GLUTCALLBACK *func)(int state)); -#endif -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13) -GLUTAPI void APIENTRY glutKeyboardUpFunc(void (GLUTCALLBACK *func)(unsigned char key, int x, int y)); -GLUTAPI void APIENTRY glutSpecialUpFunc(void (GLUTCALLBACK *func)(int key, int x, int y)); -GLUTAPI void APIENTRY glutJoystickFunc(void (GLUTCALLBACK *func)(unsigned int buttonMask, int x, int y, int z), int pollInterval); -#endif -#endif -#endif - -/* GLUT color index sub-API. */ -GLUTAPI void APIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue); -GLUTAPI GLfloat APIENTRY glutGetColor(int ndx, int component); -GLUTAPI void APIENTRY glutCopyColormap(int win); - -/* GLUT state retrieval sub-API. */ -GLUTAPI int APIENTRY glutGet(GLenum type); -GLUTAPI int APIENTRY glutDeviceGet(GLenum type); -#if (GLUT_API_VERSION >= 2) -/* GLUT extension support sub-API */ -GLUTAPI int APIENTRY glutExtensionSupported(const char *name); -#endif -#if (GLUT_API_VERSION >= 3) -GLUTAPI int APIENTRY glutGetModifiers(void); -GLUTAPI int APIENTRY glutLayerGet(GLenum type); -#endif - -/* GLUT font sub-API */ -GLUTAPI void APIENTRY glutBitmapCharacter(void *font, int character); -GLUTAPI int APIENTRY glutBitmapWidth(void *font, int character); -GLUTAPI void APIENTRY glutStrokeCharacter(void *font, int character); -GLUTAPI int APIENTRY glutStrokeWidth(void *font, int character); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -GLUTAPI int APIENTRY glutBitmapLength(void *font, const unsigned char *string); -GLUTAPI int APIENTRY glutStrokeLength(void *font, const unsigned char *string); -#endif - -/* GLUT pre-built models sub-API */ -GLUTAPI void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutWireCube(GLdouble size); -GLUTAPI void APIENTRY glutSolidCube(GLdouble size); -GLUTAPI void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); -GLUTAPI void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); -GLUTAPI void APIENTRY glutWireDodecahedron(void); -GLUTAPI void APIENTRY glutSolidDodecahedron(void); -GLUTAPI void APIENTRY glutWireTeapot(GLdouble size); -GLUTAPI void APIENTRY glutSolidTeapot(GLdouble size); -GLUTAPI void APIENTRY glutWireOctahedron(void); -GLUTAPI void APIENTRY glutSolidOctahedron(void); -GLUTAPI void APIENTRY glutWireTetrahedron(void); -GLUTAPI void APIENTRY glutSolidTetrahedron(void); -GLUTAPI void APIENTRY glutWireIcosahedron(void); -GLUTAPI void APIENTRY glutSolidIcosahedron(void); - -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -/* GLUT video resize sub-API. */ -GLUTAPI int APIENTRY glutVideoResizeGet(GLenum param); -GLUTAPI void APIENTRY glutSetupVideoResizing(void); -GLUTAPI void APIENTRY glutStopVideoResizing(void); -GLUTAPI void APIENTRY glutVideoResize(int x, int y, int width, int height); -GLUTAPI void APIENTRY glutVideoPan(int x, int y, int width, int height); - -/* GLUT debugging sub-API. */ -GLUTAPI void APIENTRY glutReportErrors(void); -#endif - -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13) -/* GLUT device control sub-API. */ -/* glutSetKeyRepeat modes. */ -#define GLUT_KEY_REPEAT_OFF 0 -#define GLUT_KEY_REPEAT_ON 1 -#define GLUT_KEY_REPEAT_DEFAULT 2 - -/* Joystick button masks. */ -#define GLUT_JOYSTICK_BUTTON_A 1 -#define GLUT_JOYSTICK_BUTTON_B 2 -#define GLUT_JOYSTICK_BUTTON_C 4 -#define GLUT_JOYSTICK_BUTTON_D 8 - -GLUTAPI void APIENTRY glutIgnoreKeyRepeat(int ignore); -GLUTAPI void APIENTRY glutSetKeyRepeat(int repeatMode); -GLUTAPI void APIENTRY glutForceJoystickFunc(void); - -/* GLUT game mode sub-API. */ -/* glutGameModeGet. */ -#define GLUT_GAME_MODE_ACTIVE ((GLenum) 0) -#define GLUT_GAME_MODE_POSSIBLE ((GLenum) 1) -#define GLUT_GAME_MODE_WIDTH ((GLenum) 2) -#define GLUT_GAME_MODE_HEIGHT ((GLenum) 3) -#define GLUT_GAME_MODE_PIXEL_DEPTH ((GLenum) 4) -#define GLUT_GAME_MODE_REFRESH_RATE ((GLenum) 5) -#define GLUT_GAME_MODE_DISPLAY_CHANGED ((GLenum) 6) - -GLUTAPI void APIENTRY glutGameModeString(const char *string); -GLUTAPI int APIENTRY glutEnterGameMode(void); -GLUTAPI void APIENTRY glutLeaveGameMode(void); -GLUTAPI int APIENTRY glutGameModeGet(GLenum mode); -#endif - -#ifdef __cplusplus -} - -#endif - -#ifdef GLUT_APIENTRY_DEFINED -# undef GLUT_APIENTRY_DEFINED -# undef APIENTRY -#endif - -#ifdef GLUT_WINGDIAPI_DEFINED -# undef GLUT_WINGDIAPI_DEFINED -# undef WINGDIAPI -#endif - -#ifdef GLUT_DEFINED___CDECL -# undef GLUT_DEFINED___CDECL -# undef __cdecl -#endif - -#ifdef GLUT_DEFINED__CRTIMP -# undef GLUT_DEFINED__CRTIMP -# undef _CRTIMP -#endif - -#endif /* __glut_h__ */ diff --git a/opengl/glew.c b/opengl/glew.c deleted file mode 100644 index 539c61f4..00000000 --- a/opengl/glew.c +++ /dev/null @@ -1,12180 +0,0 @@ -/* -** The OpenGL Extension Wrangler Library -** Copyright (C) 2002-2008, Milan Ikits -** Copyright (C) 2002-2008, Marcelo E. Magallon -** Copyright (C) 2002, Lev Povalahev -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are met: -** -** * Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** * The name of the author may be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -** THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include "OPENGL/glew.h" -#if defined(_WIN32) -# include "OPENGL/wglew.h" -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -# include "OPENGL/glxew.h" -#endif - -/* - * Define glewGetContext and related helper macros. - */ -#ifdef GLEW_MX -# define glewGetContext() ctx -# ifdef _WIN32 -# define GLEW_CONTEXT_ARG_DEF_INIT GLEWContext* ctx -# define GLEW_CONTEXT_ARG_VAR_INIT ctx -# define wglewGetContext() ctx -# define WGLEW_CONTEXT_ARG_DEF_INIT WGLEWContext* ctx -# define WGLEW_CONTEXT_ARG_DEF_LIST WGLEWContext* ctx -# else /* _WIN32 */ -# define GLEW_CONTEXT_ARG_DEF_INIT void -# define GLEW_CONTEXT_ARG_VAR_INIT -# define glxewGetContext() ctx -# define GLXEW_CONTEXT_ARG_DEF_INIT void -# define GLXEW_CONTEXT_ARG_DEF_LIST GLXEWContext* ctx -# endif /* _WIN32 */ -# define GLEW_CONTEXT_ARG_DEF_LIST GLEWContext* ctx -#else /* GLEW_MX */ -# define GLEW_CONTEXT_ARG_DEF_INIT void -# define GLEW_CONTEXT_ARG_VAR_INIT -# define GLEW_CONTEXT_ARG_DEF_LIST void -# define WGLEW_CONTEXT_ARG_DEF_INIT void -# define WGLEW_CONTEXT_ARG_DEF_LIST void -# define GLXEW_CONTEXT_ARG_DEF_INIT void -# define GLXEW_CONTEXT_ARG_DEF_LIST void -#endif /* GLEW_MX */ - -#if defined(__APPLE__) -#include -#include -#include - -void* NSGLGetProcAddress (const GLubyte *name) -{ - static const struct mach_header* image = NULL; - NSSymbol symbol; - char* symbolName; - if (NULL == image) - { - image = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", NSADDIMAGE_OPTION_RETURN_ON_ERROR); - } - /* prepend a '_' for the Unix C symbol mangling convention */ - symbolName = malloc(strlen((const char*)name) + 2); - strcpy(symbolName+1, (const char*)name); - symbolName[0] = '_'; - symbol = NULL; - /* if (NSIsSymbolNameDefined(symbolName)) - symbol = NSLookupAndBindSymbol(symbolName); */ - symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL; - free(symbolName); - return symbol ? NSAddressOfSymbol(symbol) : NULL; -} -#endif /* __APPLE__ */ - -#if defined(__sgi) || defined (__sun) -#include -#include -#include - -void* dlGetProcAddress (const GLubyte* name) -{ - static void* h = NULL; - static void* gpa; - - if (h == NULL) - { - if ((h = dlopen(NULL, RTLD_LAZY | RTLD_LOCAL)) == NULL) return NULL; - gpa = dlsym(h, "glXGetProcAddress"); - } - - if (gpa != NULL) - return ((void*(*)(const GLubyte*))gpa)(name); - else - return dlsym(h, (const char*)name); -} -#endif /* __sgi || __sun */ - -/* - * Define glewGetProcAddress. - */ -#if defined(_WIN32) -# define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) -#else -# if defined(__APPLE__) -# define glewGetProcAddress(name) NSGLGetProcAddress(name) -# else -# if defined(__sgi) || defined(__sun) -# define glewGetProcAddress(name) dlGetProcAddress(name) -# else /* __linux */ -# define glewGetProcAddress(name) (*glXGetProcAddressARB)(name) -# endif -# endif -#endif - -/* - * Define GLboolean const cast. - */ -#define CONST_CAST(x) (*(GLboolean*)&x) - -/* - * GLEW, just like OpenGL or GLU, does not rely on the standard C library. - * These functions implement the functionality required in this file. - */ -static GLuint _glewStrLen (const GLubyte* s) -{ - GLuint i=0; - if (s == NULL) return 0; - while (s[i] != '\0') i++; - return i; -} - -static GLuint _glewStrCLen (const GLubyte* s, GLubyte c) -{ - GLuint i=0; - if (s == NULL) return 0; - while (s[i] != '\0' && s[i] != c) i++; - return (s[i] == '\0' || s[i] == c) ? i : 0; -} - -static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n) -{ - GLuint i=0; - if(a == NULL || b == NULL) - return (a == NULL && b == NULL && n == 0) ? GL_TRUE : GL_FALSE; - while (i < n && a[i] != '\0' && b[i] != '\0' && a[i] == b[i]) i++; - return i == n ? GL_TRUE : GL_FALSE; -} - -static GLboolean _glewStrSame1 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) -{ - while (*na > 0 && (**a == ' ' || **a == '\n' || **a == '\r' || **a == '\t')) - { - (*a)++; - (*na)--; - } - if(*na >= nb) - { - GLuint i=0; - while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++; - if(i == nb) - { - *a = *a + nb; - *na = *na - nb; - return GL_TRUE; - } - } - return GL_FALSE; -} - -static GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) -{ - if(*na >= nb) - { - GLuint i=0; - while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++; - if(i == nb) - { - *a = *a + nb; - *na = *na - nb; - return GL_TRUE; - } - } - return GL_FALSE; -} - -static GLboolean _glewStrSame3 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) -{ - if(*na >= nb) - { - GLuint i=0; - while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++; - if (i == nb && (*na == nb || (*a)[i] == ' ' || (*a)[i] == '\n' || (*a)[i] == '\r' || (*a)[i] == '\t')) - { - *a = *a + nb; - *na = *na - nb; - return GL_TRUE; - } - } - return GL_FALSE; -} - -#if !defined(_WIN32) || !defined(GLEW_MX) - -PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D = NULL; -PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements = NULL; -PFNGLTEXIMAGE3DPROC __glewTexImage3D = NULL; -PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D = NULL; - -PFNGLACTIVETEXTUREPROC __glewActiveTexture = NULL; -PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture = NULL; -PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D = NULL; -PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D = NULL; -PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D = NULL; -PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage = NULL; -PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd = NULL; -PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf = NULL; -PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd = NULL; -PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf = NULL; -PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d = NULL; -PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv = NULL; -PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f = NULL; -PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv = NULL; -PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i = NULL; -PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv = NULL; -PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s = NULL; -PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv = NULL; -PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d = NULL; -PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv = NULL; -PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f = NULL; -PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv = NULL; -PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i = NULL; -PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv = NULL; -PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s = NULL; -PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv = NULL; -PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d = NULL; -PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv = NULL; -PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f = NULL; -PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv = NULL; -PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i = NULL; -PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv = NULL; -PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s = NULL; -PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv = NULL; -PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d = NULL; -PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv = NULL; -PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f = NULL; -PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv = NULL; -PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i = NULL; -PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv = NULL; -PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s = NULL; -PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv = NULL; -PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage = NULL; - -PFNGLBLENDCOLORPROC __glewBlendColor = NULL; -PFNGLBLENDEQUATIONPROC __glewBlendEquation = NULL; -PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate = NULL; -PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer = NULL; -PFNGLFOGCOORDDPROC __glewFogCoordd = NULL; -PFNGLFOGCOORDDVPROC __glewFogCoorddv = NULL; -PFNGLFOGCOORDFPROC __glewFogCoordf = NULL; -PFNGLFOGCOORDFVPROC __glewFogCoordfv = NULL; -PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays = NULL; -PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements = NULL; -PFNGLPOINTPARAMETERFPROC __glewPointParameterf = NULL; -PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv = NULL; -PFNGLPOINTPARAMETERIPROC __glewPointParameteri = NULL; -PFNGLPOINTPARAMETERIVPROC __glewPointParameteriv = NULL; -PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b = NULL; -PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv = NULL; -PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d = NULL; -PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv = NULL; -PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f = NULL; -PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv = NULL; -PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i = NULL; -PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv = NULL; -PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s = NULL; -PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv = NULL; -PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub = NULL; -PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv = NULL; -PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui = NULL; -PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv = NULL; -PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us = NULL; -PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv = NULL; -PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer = NULL; -PFNGLWINDOWPOS2DPROC __glewWindowPos2d = NULL; -PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv = NULL; -PFNGLWINDOWPOS2FPROC __glewWindowPos2f = NULL; -PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv = NULL; -PFNGLWINDOWPOS2IPROC __glewWindowPos2i = NULL; -PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv = NULL; -PFNGLWINDOWPOS2SPROC __glewWindowPos2s = NULL; -PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv = NULL; -PFNGLWINDOWPOS3DPROC __glewWindowPos3d = NULL; -PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv = NULL; -PFNGLWINDOWPOS3FPROC __glewWindowPos3f = NULL; -PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv = NULL; -PFNGLWINDOWPOS3IPROC __glewWindowPos3i = NULL; -PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv = NULL; -PFNGLWINDOWPOS3SPROC __glewWindowPos3s = NULL; -PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv = NULL; - -PFNGLBEGINQUERYPROC __glewBeginQuery = NULL; -PFNGLBINDBUFFERPROC __glewBindBuffer = NULL; -PFNGLBUFFERDATAPROC __glewBufferData = NULL; -PFNGLBUFFERSUBDATAPROC __glewBufferSubData = NULL; -PFNGLDELETEBUFFERSPROC __glewDeleteBuffers = NULL; -PFNGLDELETEQUERIESPROC __glewDeleteQueries = NULL; -PFNGLENDQUERYPROC __glewEndQuery = NULL; -PFNGLGENBUFFERSPROC __glewGenBuffers = NULL; -PFNGLGENQUERIESPROC __glewGenQueries = NULL; -PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv = NULL; -PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv = NULL; -PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData = NULL; -PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv = NULL; -PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv = NULL; -PFNGLGETQUERYIVPROC __glewGetQueryiv = NULL; -PFNGLISBUFFERPROC __glewIsBuffer = NULL; -PFNGLISQUERYPROC __glewIsQuery = NULL; -PFNGLMAPBUFFERPROC __glewMapBuffer = NULL; -PFNGLUNMAPBUFFERPROC __glewUnmapBuffer = NULL; - -PFNGLATTACHSHADERPROC __glewAttachShader = NULL; -PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation = NULL; -PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate = NULL; -PFNGLCOMPILESHADERPROC __glewCompileShader = NULL; -PFNGLCREATEPROGRAMPROC __glewCreateProgram = NULL; -PFNGLCREATESHADERPROC __glewCreateShader = NULL; -PFNGLDELETEPROGRAMPROC __glewDeleteProgram = NULL; -PFNGLDELETESHADERPROC __glewDeleteShader = NULL; -PFNGLDETACHSHADERPROC __glewDetachShader = NULL; -PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray = NULL; -PFNGLDRAWBUFFERSPROC __glewDrawBuffers = NULL; -PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray = NULL; -PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib = NULL; -PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform = NULL; -PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders = NULL; -PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation = NULL; -PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog = NULL; -PFNGLGETPROGRAMIVPROC __glewGetProgramiv = NULL; -PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog = NULL; -PFNGLGETSHADERSOURCEPROC __glewGetShaderSource = NULL; -PFNGLGETSHADERIVPROC __glewGetShaderiv = NULL; -PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation = NULL; -PFNGLGETUNIFORMFVPROC __glewGetUniformfv = NULL; -PFNGLGETUNIFORMIVPROC __glewGetUniformiv = NULL; -PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv = NULL; -PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv = NULL; -PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv = NULL; -PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv = NULL; -PFNGLISPROGRAMPROC __glewIsProgram = NULL; -PFNGLISSHADERPROC __glewIsShader = NULL; -PFNGLLINKPROGRAMPROC __glewLinkProgram = NULL; -PFNGLSHADERSOURCEPROC __glewShaderSource = NULL; -PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate = NULL; -PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate = NULL; -PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate = NULL; -PFNGLUNIFORM1FPROC __glewUniform1f = NULL; -PFNGLUNIFORM1FVPROC __glewUniform1fv = NULL; -PFNGLUNIFORM1IPROC __glewUniform1i = NULL; -PFNGLUNIFORM1IVPROC __glewUniform1iv = NULL; -PFNGLUNIFORM2FPROC __glewUniform2f = NULL; -PFNGLUNIFORM2FVPROC __glewUniform2fv = NULL; -PFNGLUNIFORM2IPROC __glewUniform2i = NULL; -PFNGLUNIFORM2IVPROC __glewUniform2iv = NULL; -PFNGLUNIFORM3FPROC __glewUniform3f = NULL; -PFNGLUNIFORM3FVPROC __glewUniform3fv = NULL; -PFNGLUNIFORM3IPROC __glewUniform3i = NULL; -PFNGLUNIFORM3IVPROC __glewUniform3iv = NULL; -PFNGLUNIFORM4FPROC __glewUniform4f = NULL; -PFNGLUNIFORM4FVPROC __glewUniform4fv = NULL; -PFNGLUNIFORM4IPROC __glewUniform4i = NULL; -PFNGLUNIFORM4IVPROC __glewUniform4iv = NULL; -PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv = NULL; -PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv = NULL; -PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv = NULL; -PFNGLUSEPROGRAMPROC __glewUseProgram = NULL; -PFNGLVALIDATEPROGRAMPROC __glewValidateProgram = NULL; -PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d = NULL; -PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv = NULL; -PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f = NULL; -PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv = NULL; -PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s = NULL; -PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv = NULL; -PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d = NULL; -PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv = NULL; -PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f = NULL; -PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv = NULL; -PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s = NULL; -PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv = NULL; -PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d = NULL; -PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv = NULL; -PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f = NULL; -PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv = NULL; -PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s = NULL; -PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv = NULL; -PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv = NULL; -PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv = NULL; -PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv = NULL; -PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub = NULL; -PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv = NULL; -PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv = NULL; -PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv = NULL; -PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv = NULL; -PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d = NULL; -PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv = NULL; -PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f = NULL; -PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv = NULL; -PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv = NULL; -PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s = NULL; -PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv = NULL; -PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv = NULL; -PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv = NULL; -PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv = NULL; -PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer = NULL; - -PFNGLUNIFORMMATRIX2X3FVPROC __glewUniformMatrix2x3fv = NULL; -PFNGLUNIFORMMATRIX2X4FVPROC __glewUniformMatrix2x4fv = NULL; -PFNGLUNIFORMMATRIX3X2FVPROC __glewUniformMatrix3x2fv = NULL; -PFNGLUNIFORMMATRIX3X4FVPROC __glewUniformMatrix3x4fv = NULL; -PFNGLUNIFORMMATRIX4X2FVPROC __glewUniformMatrix4x2fv = NULL; -PFNGLUNIFORMMATRIX4X3FVPROC __glewUniformMatrix4x3fv = NULL; - -PFNGLBEGINCONDITIONALRENDERPROC __glewBeginConditionalRender = NULL; -PFNGLBEGINTRANSFORMFEEDBACKPROC __glewBeginTransformFeedback = NULL; -PFNGLBINDBUFFERBASEPROC __glewBindBufferBase = NULL; -PFNGLBINDBUFFERRANGEPROC __glewBindBufferRange = NULL; -PFNGLBINDFRAGDATALOCATIONPROC __glewBindFragDataLocation = NULL; -PFNGLCLAMPCOLORPROC __glewClampColor = NULL; -PFNGLCLEARBUFFERFIPROC __glewClearBufferfi = NULL; -PFNGLCLEARBUFFERFVPROC __glewClearBufferfv = NULL; -PFNGLCLEARBUFFERIVPROC __glewClearBufferiv = NULL; -PFNGLCLEARBUFFERUIVPROC __glewClearBufferuiv = NULL; -PFNGLCOLORMASKIPROC __glewColorMaski = NULL; -PFNGLDISABLEIPROC __glewDisablei = NULL; -PFNGLENABLEIPROC __glewEnablei = NULL; -PFNGLENDCONDITIONALRENDERPROC __glewEndConditionalRender = NULL; -PFNGLENDTRANSFORMFEEDBACKPROC __glewEndTransformFeedback = NULL; -PFNGLGETBOOLEANI_VPROC __glewGetBooleani_v = NULL; -PFNGLGETFRAGDATALOCATIONPROC __glewGetFragDataLocation = NULL; -PFNGLGETINTEGERI_VPROC __glewGetIntegeri_v = NULL; -PFNGLGETSTRINGIPROC __glewGetStringi = NULL; -PFNGLGETTEXPARAMETERIIVPROC __glewGetTexParameterIiv = NULL; -PFNGLGETTEXPARAMETERIUIVPROC __glewGetTexParameterIuiv = NULL; -PFNGLGETTRANSFORMFEEDBACKVARYINGPROC __glewGetTransformFeedbackVarying = NULL; -PFNGLGETUNIFORMUIVPROC __glewGetUniformuiv = NULL; -PFNGLGETVERTEXATTRIBIIVPROC __glewGetVertexAttribIiv = NULL; -PFNGLGETVERTEXATTRIBIUIVPROC __glewGetVertexAttribIuiv = NULL; -PFNGLISENABLEDIPROC __glewIsEnabledi = NULL; -PFNGLTEXPARAMETERIIVPROC __glewTexParameterIiv = NULL; -PFNGLTEXPARAMETERIUIVPROC __glewTexParameterIuiv = NULL; -PFNGLTRANSFORMFEEDBACKVARYINGSPROC __glewTransformFeedbackVaryings = NULL; -PFNGLUNIFORM1UIPROC __glewUniform1ui = NULL; -PFNGLUNIFORM1UIVPROC __glewUniform1uiv = NULL; -PFNGLUNIFORM2UIPROC __glewUniform2ui = NULL; -PFNGLUNIFORM2UIVPROC __glewUniform2uiv = NULL; -PFNGLUNIFORM3UIPROC __glewUniform3ui = NULL; -PFNGLUNIFORM3UIVPROC __glewUniform3uiv = NULL; -PFNGLUNIFORM4UIPROC __glewUniform4ui = NULL; -PFNGLUNIFORM4UIVPROC __glewUniform4uiv = NULL; -PFNGLVERTEXATTRIBI1IPROC __glewVertexAttribI1i = NULL; -PFNGLVERTEXATTRIBI1IVPROC __glewVertexAttribI1iv = NULL; -PFNGLVERTEXATTRIBI1UIPROC __glewVertexAttribI1ui = NULL; -PFNGLVERTEXATTRIBI1UIVPROC __glewVertexAttribI1uiv = NULL; -PFNGLVERTEXATTRIBI2IPROC __glewVertexAttribI2i = NULL; -PFNGLVERTEXATTRIBI2IVPROC __glewVertexAttribI2iv = NULL; -PFNGLVERTEXATTRIBI2UIPROC __glewVertexAttribI2ui = NULL; -PFNGLVERTEXATTRIBI2UIVPROC __glewVertexAttribI2uiv = NULL; -PFNGLVERTEXATTRIBI3IPROC __glewVertexAttribI3i = NULL; -PFNGLVERTEXATTRIBI3IVPROC __glewVertexAttribI3iv = NULL; -PFNGLVERTEXATTRIBI3UIPROC __glewVertexAttribI3ui = NULL; -PFNGLVERTEXATTRIBI3UIVPROC __glewVertexAttribI3uiv = NULL; -PFNGLVERTEXATTRIBI4BVPROC __glewVertexAttribI4bv = NULL; -PFNGLVERTEXATTRIBI4IPROC __glewVertexAttribI4i = NULL; -PFNGLVERTEXATTRIBI4IVPROC __glewVertexAttribI4iv = NULL; -PFNGLVERTEXATTRIBI4SVPROC __glewVertexAttribI4sv = NULL; -PFNGLVERTEXATTRIBI4UBVPROC __glewVertexAttribI4ubv = NULL; -PFNGLVERTEXATTRIBI4UIPROC __glewVertexAttribI4ui = NULL; -PFNGLVERTEXATTRIBI4UIVPROC __glewVertexAttribI4uiv = NULL; -PFNGLVERTEXATTRIBI4USVPROC __glewVertexAttribI4usv = NULL; -PFNGLVERTEXATTRIBIPOINTERPROC __glewVertexAttribIPointer = NULL; - -PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX = NULL; - -PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE = NULL; -PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE = NULL; -PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE = NULL; -PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE = NULL; -PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE = NULL; - -PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE = NULL; -PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE = NULL; -PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE = NULL; -PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE = NULL; -PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE = NULL; -PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE = NULL; -PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE = NULL; -PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE = NULL; - -PFNGLBUFFERPARAMETERIAPPLEPROC __glewBufferParameteriAPPLE = NULL; -PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC __glewFlushMappedBufferRangeAPPLE = NULL; - -PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE = NULL; -PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE = NULL; - -PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE = NULL; -PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE = NULL; -PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE = NULL; -PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE = NULL; - -PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE = NULL; -PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE = NULL; -PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE = NULL; - -PFNGLCLAMPCOLORARBPROC __glewClampColorARB = NULL; - -PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB = NULL; - -PFNGLDRAWARRAYSINSTANCEDARBPROC __glewDrawArraysInstancedARB = NULL; -PFNGLDRAWELEMENTSINSTANCEDARBPROC __glewDrawElementsInstancedARB = NULL; - -PFNGLBINDFRAMEBUFFERPROC __glewBindFramebuffer = NULL; -PFNGLBINDRENDERBUFFERPROC __glewBindRenderbuffer = NULL; -PFNGLBLITFRAMEBUFFERPROC __glewBlitFramebuffer = NULL; -PFNGLCHECKFRAMEBUFFERSTATUSPROC __glewCheckFramebufferStatus = NULL; -PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers = NULL; -PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers = NULL; -PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer = NULL; -PFNGLFRAMEBUFFERTEXTURLAYERPROC __glewFramebufferTexturLayer = NULL; -PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D = NULL; -PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D = NULL; -PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D = NULL; -PFNGLGENFRAMEBUFFERSPROC __glewGenFramebuffers = NULL; -PFNGLGENRENDERBUFFERSPROC __glewGenRenderbuffers = NULL; -PFNGLGENERATEMIPMAPPROC __glewGenerateMipmap = NULL; -PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetFramebufferAttachmentParameteriv = NULL; -PFNGLGETRENDERBUFFERPARAMETERIVPROC __glewGetRenderbufferParameteriv = NULL; -PFNGLISFRAMEBUFFERPROC __glewIsFramebuffer = NULL; -PFNGLISRENDERBUFFERPROC __glewIsRenderbuffer = NULL; -PFNGLRENDERBUFFERSTORAGEPROC __glewRenderbufferStorage = NULL; -PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewRenderbufferStorageMultisample = NULL; - -PFNGLFRAMEBUFFERTEXTUREARBPROC __glewFramebufferTextureARB = NULL; -PFNGLFRAMEBUFFERTEXTUREFACEARBPROC __glewFramebufferTextureFaceARB = NULL; -PFNGLFRAMEBUFFERTEXTURELAYERARBPROC __glewFramebufferTextureLayerARB = NULL; -PFNGLPROGRAMPARAMETERIARBPROC __glewProgramParameteriARB = NULL; - -PFNGLCOLORSUBTABLEPROC __glewColorSubTable = NULL; -PFNGLCOLORTABLEPROC __glewColorTable = NULL; -PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv = NULL; -PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv = NULL; -PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D = NULL; -PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D = NULL; -PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf = NULL; -PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv = NULL; -PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri = NULL; -PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv = NULL; -PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable = NULL; -PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable = NULL; -PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D = NULL; -PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D = NULL; -PFNGLGETCOLORTABLEPROC __glewGetColorTable = NULL; -PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv = NULL; -PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv = NULL; -PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter = NULL; -PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv = NULL; -PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv = NULL; -PFNGLGETHISTOGRAMPROC __glewGetHistogram = NULL; -PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv = NULL; -PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv = NULL; -PFNGLGETMINMAXPROC __glewGetMinmax = NULL; -PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv = NULL; -PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv = NULL; -PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter = NULL; -PFNGLHISTOGRAMPROC __glewHistogram = NULL; -PFNGLMINMAXPROC __glewMinmax = NULL; -PFNGLRESETHISTOGRAMPROC __glewResetHistogram = NULL; -PFNGLRESETMINMAXPROC __glewResetMinmax = NULL; -PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D = NULL; - -PFNGLVERTEXATTRIBDIVISORARBPROC __glewVertexAttribDivisorARB = NULL; - -PFNGLFLUSHMAPPEDBUFFERRANGEPROC __glewFlushMappedBufferRange = NULL; -PFNGLMAPBUFFERRANGEPROC __glewMapBufferRange = NULL; - -PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB = NULL; -PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB = NULL; -PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB = NULL; -PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB = NULL; -PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB = NULL; - -PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB = NULL; - -PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB = NULL; -PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB = NULL; -PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB = NULL; -PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB = NULL; -PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB = NULL; -PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB = NULL; -PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB = NULL; -PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB = NULL; -PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB = NULL; -PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB = NULL; -PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB = NULL; -PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB = NULL; -PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB = NULL; -PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB = NULL; -PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB = NULL; -PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB = NULL; -PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB = NULL; -PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB = NULL; -PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB = NULL; -PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB = NULL; -PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB = NULL; -PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB = NULL; -PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB = NULL; -PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB = NULL; -PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB = NULL; -PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB = NULL; -PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB = NULL; -PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB = NULL; -PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB = NULL; -PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB = NULL; -PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB = NULL; -PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB = NULL; -PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB = NULL; -PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB = NULL; - -PFNGLBEGINQUERYARBPROC __glewBeginQueryARB = NULL; -PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB = NULL; -PFNGLENDQUERYARBPROC __glewEndQueryARB = NULL; -PFNGLGENQUERIESARBPROC __glewGenQueriesARB = NULL; -PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB = NULL; -PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB = NULL; -PFNGLGETQUERYIVARBPROC __glewGetQueryivARB = NULL; -PFNGLISQUERYARBPROC __glewIsQueryARB = NULL; - -PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB = NULL; -PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB = NULL; - -PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB = NULL; -PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB = NULL; -PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB = NULL; -PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB = NULL; -PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB = NULL; -PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB = NULL; -PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB = NULL; -PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB = NULL; -PFNGLGETHANDLEARBPROC __glewGetHandleARB = NULL; -PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB = NULL; -PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB = NULL; -PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB = NULL; -PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB = NULL; -PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB = NULL; -PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB = NULL; -PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB = NULL; -PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB = NULL; -PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB = NULL; -PFNGLUNIFORM1FARBPROC __glewUniform1fARB = NULL; -PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB = NULL; -PFNGLUNIFORM1IARBPROC __glewUniform1iARB = NULL; -PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB = NULL; -PFNGLUNIFORM2FARBPROC __glewUniform2fARB = NULL; -PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB = NULL; -PFNGLUNIFORM2IARBPROC __glewUniform2iARB = NULL; -PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB = NULL; -PFNGLUNIFORM3FARBPROC __glewUniform3fARB = NULL; -PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB = NULL; -PFNGLUNIFORM3IARBPROC __glewUniform3iARB = NULL; -PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB = NULL; -PFNGLUNIFORM4FARBPROC __glewUniform4fARB = NULL; -PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB = NULL; -PFNGLUNIFORM4IARBPROC __glewUniform4iARB = NULL; -PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB = NULL; -PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB = NULL; -PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB = NULL; -PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB = NULL; -PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB = NULL; -PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB = NULL; - -PFNGLTEXBUFFERARBPROC __glewTexBufferARB = NULL; - -PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB = NULL; -PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB = NULL; -PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB = NULL; -PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB = NULL; - -PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB = NULL; -PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB = NULL; -PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB = NULL; -PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB = NULL; - -PFNGLBINDVERTEXARRAYPROC __glewBindVertexArray = NULL; -PFNGLDELETEVERTEXARRAYSPROC __glewDeleteVertexArrays = NULL; -PFNGLGENVERTEXARRAYSPROC __glewGenVertexArrays = NULL; -PFNGLISVERTEXARRAYPROC __glewIsVertexArray = NULL; - -PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB = NULL; -PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB = NULL; -PFNGLWEIGHTBVARBPROC __glewWeightbvARB = NULL; -PFNGLWEIGHTDVARBPROC __glewWeightdvARB = NULL; -PFNGLWEIGHTFVARBPROC __glewWeightfvARB = NULL; -PFNGLWEIGHTIVARBPROC __glewWeightivARB = NULL; -PFNGLWEIGHTSVARBPROC __glewWeightsvARB = NULL; -PFNGLWEIGHTUBVARBPROC __glewWeightubvARB = NULL; -PFNGLWEIGHTUIVARBPROC __glewWeightuivARB = NULL; -PFNGLWEIGHTUSVARBPROC __glewWeightusvARB = NULL; - -PFNGLBINDBUFFERARBPROC __glewBindBufferARB = NULL; -PFNGLBUFFERDATAARBPROC __glewBufferDataARB = NULL; -PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB = NULL; -PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB = NULL; -PFNGLGENBUFFERSARBPROC __glewGenBuffersARB = NULL; -PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB = NULL; -PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB = NULL; -PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB = NULL; -PFNGLISBUFFERARBPROC __glewIsBufferARB = NULL; -PFNGLMAPBUFFERARBPROC __glewMapBufferARB = NULL; -PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB = NULL; - -PFNGLBINDPROGRAMARBPROC __glewBindProgramARB = NULL; -PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB = NULL; -PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB = NULL; -PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB = NULL; -PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB = NULL; -PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB = NULL; -PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB = NULL; -PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB = NULL; -PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB = NULL; -PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB = NULL; -PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB = NULL; -PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB = NULL; -PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB = NULL; -PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB = NULL; -PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB = NULL; -PFNGLISPROGRAMARBPROC __glewIsProgramARB = NULL; -PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB = NULL; -PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB = NULL; -PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB = NULL; -PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB = NULL; -PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB = NULL; -PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB = NULL; -PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB = NULL; -PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB = NULL; -PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB = NULL; -PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB = NULL; -PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB = NULL; -PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB = NULL; -PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB = NULL; -PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB = NULL; -PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB = NULL; -PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB = NULL; -PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB = NULL; -PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB = NULL; -PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB = NULL; -PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB = NULL; -PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB = NULL; -PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB = NULL; -PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB = NULL; -PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB = NULL; -PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB = NULL; -PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB = NULL; -PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB = NULL; -PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB = NULL; -PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB = NULL; -PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB = NULL; -PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB = NULL; -PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB = NULL; -PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB = NULL; -PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB = NULL; -PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB = NULL; -PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB = NULL; -PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB = NULL; -PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB = NULL; -PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB = NULL; -PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB = NULL; -PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB = NULL; -PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB = NULL; - -PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB = NULL; -PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB = NULL; -PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB = NULL; - -PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB = NULL; -PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB = NULL; -PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB = NULL; -PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB = NULL; -PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB = NULL; -PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB = NULL; -PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB = NULL; -PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB = NULL; -PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB = NULL; -PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB = NULL; -PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB = NULL; -PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB = NULL; -PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB = NULL; -PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB = NULL; -PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB = NULL; -PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB = NULL; - -PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI = NULL; - -PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI = NULL; -PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI = NULL; -PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI = NULL; - -PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI = NULL; -PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI = NULL; -PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI = NULL; -PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI = NULL; - -PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI = NULL; -PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI = NULL; -PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI = NULL; -PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI = NULL; -PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI = NULL; -PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI = NULL; -PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI = NULL; -PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI = NULL; -PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI = NULL; -PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI = NULL; -PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI = NULL; -PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI = NULL; -PFNGLSAMPLEMAPATIPROC __glewSampleMapATI = NULL; -PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI = NULL; - -PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI = NULL; -PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI = NULL; - -PFNGLPNTRIANGLESFATIPROC __glPNTrianglewesfATI = NULL; -PFNGLPNTRIANGLESIATIPROC __glPNTrianglewesiATI = NULL; - -PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI = NULL; -PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI = NULL; - -PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI = NULL; -PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI = NULL; -PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI = NULL; -PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI = NULL; -PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI = NULL; -PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI = NULL; -PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI = NULL; -PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI = NULL; -PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI = NULL; -PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI = NULL; -PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI = NULL; -PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI = NULL; - -PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI = NULL; -PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI = NULL; -PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI = NULL; - -PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI = NULL; -PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI = NULL; -PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI = NULL; -PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI = NULL; -PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI = NULL; -PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI = NULL; -PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI = NULL; -PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI = NULL; -PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI = NULL; -PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI = NULL; -PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI = NULL; -PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI = NULL; -PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI = NULL; -PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI = NULL; -PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI = NULL; -PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI = NULL; -PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI = NULL; -PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI = NULL; -PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI = NULL; -PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI = NULL; -PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI = NULL; -PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI = NULL; -PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI = NULL; -PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI = NULL; -PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI = NULL; -PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI = NULL; -PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI = NULL; -PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI = NULL; -PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI = NULL; -PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI = NULL; -PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI = NULL; -PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI = NULL; -PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI = NULL; -PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI = NULL; -PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI = NULL; -PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI = NULL; -PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI = NULL; - -PFNGLGETUNIFORMBUFFERSIZEEXTPROC __glewGetUniformBufferSizeEXT = NULL; -PFNGLGETUNIFORMOFFSETEXTPROC __glewGetUniformOffsetEXT = NULL; -PFNGLUNIFORMBUFFEREXTPROC __glewUniformBufferEXT = NULL; - -PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT = NULL; - -PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT = NULL; - -PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT = NULL; - -PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT = NULL; - -PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT = NULL; -PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT = NULL; - -PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT = NULL; -PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT = NULL; - -PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT = NULL; -PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT = NULL; -PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT = NULL; -PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT = NULL; -PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT = NULL; -PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT = NULL; -PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT = NULL; -PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT = NULL; -PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT = NULL; -PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT = NULL; -PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT = NULL; -PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT = NULL; -PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT = NULL; - -PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT = NULL; -PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT = NULL; - -PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT = NULL; -PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT = NULL; -PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT = NULL; -PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT = NULL; -PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT = NULL; - -PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT = NULL; -PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT = NULL; - -PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT = NULL; - -PFNGLBINDMULTITEXTUREEXTPROC __glewBindMultiTextureEXT = NULL; -PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC __glewCheckNamedFramebufferStatusEXT = NULL; -PFNGLCLIENTATTRIBDEFAULTEXTPROC __glewClientAttribDefaultEXT = NULL; -PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC __glewCompressedMultiTexImage1DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC __glewCompressedMultiTexImage2DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC __glewCompressedMultiTexImage3DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC __glewCompressedMultiTexSubImage1DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC __glewCompressedMultiTexSubImage2DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC __glewCompressedMultiTexSubImage3DEXT = NULL; -PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC __glewCompressedTextureImage1DEXT = NULL; -PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC __glewCompressedTextureImage2DEXT = NULL; -PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC __glewCompressedTextureImage3DEXT = NULL; -PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC __glewCompressedTextureSubImage1DEXT = NULL; -PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC __glewCompressedTextureSubImage2DEXT = NULL; -PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC __glewCompressedTextureSubImage3DEXT = NULL; -PFNGLCOPYMULTITEXIMAGE1DEXTPROC __glewCopyMultiTexImage1DEXT = NULL; -PFNGLCOPYMULTITEXIMAGE2DEXTPROC __glewCopyMultiTexImage2DEXT = NULL; -PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC __glewCopyMultiTexSubImage1DEXT = NULL; -PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC __glewCopyMultiTexSubImage2DEXT = NULL; -PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC __glewCopyMultiTexSubImage3DEXT = NULL; -PFNGLCOPYTEXTUREIMAGE1DEXTPROC __glewCopyTextureImage1DEXT = NULL; -PFNGLCOPYTEXTUREIMAGE2DEXTPROC __glewCopyTextureImage2DEXT = NULL; -PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC __glewCopyTextureSubImage1DEXT = NULL; -PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC __glewCopyTextureSubImage2DEXT = NULL; -PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC __glewCopyTextureSubImage3DEXT = NULL; -PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC __glewDisableClientStateIndexedEXT = NULL; -PFNGLENABLECLIENTSTATEINDEXEDEXTPROC __glewEnableClientStateIndexedEXT = NULL; -PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC __glewFramebufferDrawBufferEXT = NULL; -PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC __glewFramebufferDrawBuffersEXT = NULL; -PFNGLFRAMEBUFFERREADBUFFEREXTPROC __glewFramebufferReadBufferEXT = NULL; -PFNGLGENERATEMULTITEXMIPMAPEXTPROC __glewGenerateMultiTexMipmapEXT = NULL; -PFNGLGENERATETEXTUREMIPMAPEXTPROC __glewGenerateTextureMipmapEXT = NULL; -PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC __glewGetCompressedMultiTexImageEXT = NULL; -PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC __glewGetCompressedTextureImageEXT = NULL; -PFNGLGETDOUBLEINDEXEDVEXTPROC __glewGetDoubleIndexedvEXT = NULL; -PFNGLGETFLOATINDEXEDVEXTPROC __glewGetFloatIndexedvEXT = NULL; -PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC __glewGetFramebufferParameterivEXT = NULL; -PFNGLGETMULTITEXENVFVEXTPROC __glewGetMultiTexEnvfvEXT = NULL; -PFNGLGETMULTITEXENVIVEXTPROC __glewGetMultiTexEnvivEXT = NULL; -PFNGLGETMULTITEXGENDVEXTPROC __glewGetMultiTexGendvEXT = NULL; -PFNGLGETMULTITEXGENFVEXTPROC __glewGetMultiTexGenfvEXT = NULL; -PFNGLGETMULTITEXGENIVEXTPROC __glewGetMultiTexGenivEXT = NULL; -PFNGLGETMULTITEXIMAGEEXTPROC __glewGetMultiTexImageEXT = NULL; -PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC __glewGetMultiTexLevelParameterfvEXT = NULL; -PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC __glewGetMultiTexLevelParameterivEXT = NULL; -PFNGLGETMULTITEXPARAMETERIIVEXTPROC __glewGetMultiTexParameterIivEXT = NULL; -PFNGLGETMULTITEXPARAMETERIUIVEXTPROC __glewGetMultiTexParameterIuivEXT = NULL; -PFNGLGETMULTITEXPARAMETERFVEXTPROC __glewGetMultiTexParameterfvEXT = NULL; -PFNGLGETMULTITEXPARAMETERIVEXTPROC __glewGetMultiTexParameterivEXT = NULL; -PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC __glewGetNamedBufferParameterivEXT = NULL; -PFNGLGETNAMEDBUFFERPOINTERVEXTPROC __glewGetNamedBufferPointervEXT = NULL; -PFNGLGETNAMEDBUFFERSUBDATAEXTPROC __glewGetNamedBufferSubDataEXT = NULL; -PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetNamedFramebufferAttachmentParameterivEXT = NULL; -PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC __glewGetNamedProgramLocalParameterIivEXT = NULL; -PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC __glewGetNamedProgramLocalParameterIuivEXT = NULL; -PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC __glewGetNamedProgramLocalParameterdvEXT = NULL; -PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC __glewGetNamedProgramLocalParameterfvEXT = NULL; -PFNGLGETNAMEDPROGRAMSTRINGEXTPROC __glewGetNamedProgramStringEXT = NULL; -PFNGLGETNAMEDPROGRAMIVEXTPROC __glewGetNamedProgramivEXT = NULL; -PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC __glewGetNamedRenderbufferParameterivEXT = NULL; -PFNGLGETPOINTERINDEXEDVEXTPROC __glewGetPointerIndexedvEXT = NULL; -PFNGLGETTEXTUREIMAGEEXTPROC __glewGetTextureImageEXT = NULL; -PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC __glewGetTextureLevelParameterfvEXT = NULL; -PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC __glewGetTextureLevelParameterivEXT = NULL; -PFNGLGETTEXTUREPARAMETERIIVEXTPROC __glewGetTextureParameterIivEXT = NULL; -PFNGLGETTEXTUREPARAMETERIUIVEXTPROC __glewGetTextureParameterIuivEXT = NULL; -PFNGLGETTEXTUREPARAMETERFVEXTPROC __glewGetTextureParameterfvEXT = NULL; -PFNGLGETTEXTUREPARAMETERIVEXTPROC __glewGetTextureParameterivEXT = NULL; -PFNGLMAPNAMEDBUFFEREXTPROC __glewMapNamedBufferEXT = NULL; -PFNGLMATRIXFRUSTUMEXTPROC __glewMatrixFrustumEXT = NULL; -PFNGLMATRIXLOADIDENTITYEXTPROC __glewMatrixLoadIdentityEXT = NULL; -PFNGLMATRIXLOADTRANSPOSEDEXTPROC __glewMatrixLoadTransposedEXT = NULL; -PFNGLMATRIXLOADTRANSPOSEFEXTPROC __glewMatrixLoadTransposefEXT = NULL; -PFNGLMATRIXLOADDEXTPROC __glewMatrixLoaddEXT = NULL; -PFNGLMATRIXLOADFEXTPROC __glewMatrixLoadfEXT = NULL; -PFNGLMATRIXMULTTRANSPOSEDEXTPROC __glewMatrixMultTransposedEXT = NULL; -PFNGLMATRIXMULTTRANSPOSEFEXTPROC __glewMatrixMultTransposefEXT = NULL; -PFNGLMATRIXMULTDEXTPROC __glewMatrixMultdEXT = NULL; -PFNGLMATRIXMULTFEXTPROC __glewMatrixMultfEXT = NULL; -PFNGLMATRIXORTHOEXTPROC __glewMatrixOrthoEXT = NULL; -PFNGLMATRIXPOPEXTPROC __glewMatrixPopEXT = NULL; -PFNGLMATRIXPUSHEXTPROC __glewMatrixPushEXT = NULL; -PFNGLMATRIXROTATEDEXTPROC __glewMatrixRotatedEXT = NULL; -PFNGLMATRIXROTATEFEXTPROC __glewMatrixRotatefEXT = NULL; -PFNGLMATRIXSCALEDEXTPROC __glewMatrixScaledEXT = NULL; -PFNGLMATRIXSCALEFEXTPROC __glewMatrixScalefEXT = NULL; -PFNGLMATRIXTRANSLATEDEXTPROC __glewMatrixTranslatedEXT = NULL; -PFNGLMATRIXTRANSLATEFEXTPROC __glewMatrixTranslatefEXT = NULL; -PFNGLMULTITEXBUFFEREXTPROC __glewMultiTexBufferEXT = NULL; -PFNGLMULTITEXCOORDPOINTEREXTPROC __glewMultiTexCoordPointerEXT = NULL; -PFNGLMULTITEXENVFEXTPROC __glewMultiTexEnvfEXT = NULL; -PFNGLMULTITEXENVFVEXTPROC __glewMultiTexEnvfvEXT = NULL; -PFNGLMULTITEXENVIEXTPROC __glewMultiTexEnviEXT = NULL; -PFNGLMULTITEXENVIVEXTPROC __glewMultiTexEnvivEXT = NULL; -PFNGLMULTITEXGENDEXTPROC __glewMultiTexGendEXT = NULL; -PFNGLMULTITEXGENDVEXTPROC __glewMultiTexGendvEXT = NULL; -PFNGLMULTITEXGENFEXTPROC __glewMultiTexGenfEXT = NULL; -PFNGLMULTITEXGENFVEXTPROC __glewMultiTexGenfvEXT = NULL; -PFNGLMULTITEXGENIEXTPROC __glewMultiTexGeniEXT = NULL; -PFNGLMULTITEXGENIVEXTPROC __glewMultiTexGenivEXT = NULL; -PFNGLMULTITEXIMAGE1DEXTPROC __glewMultiTexImage1DEXT = NULL; -PFNGLMULTITEXIMAGE2DEXTPROC __glewMultiTexImage2DEXT = NULL; -PFNGLMULTITEXIMAGE3DEXTPROC __glewMultiTexImage3DEXT = NULL; -PFNGLMULTITEXPARAMETERIIVEXTPROC __glewMultiTexParameterIivEXT = NULL; -PFNGLMULTITEXPARAMETERIUIVEXTPROC __glewMultiTexParameterIuivEXT = NULL; -PFNGLMULTITEXPARAMETERFEXTPROC __glewMultiTexParameterfEXT = NULL; -PFNGLMULTITEXPARAMETERFVEXTPROC __glewMultiTexParameterfvEXT = NULL; -PFNGLMULTITEXPARAMETERIEXTPROC __glewMultiTexParameteriEXT = NULL; -PFNGLMULTITEXPARAMETERIVEXTPROC __glewMultiTexParameterivEXT = NULL; -PFNGLMULTITEXRENDERBUFFEREXTPROC __glewMultiTexRenderbufferEXT = NULL; -PFNGLMULTITEXSUBIMAGE1DEXTPROC __glewMultiTexSubImage1DEXT = NULL; -PFNGLMULTITEXSUBIMAGE2DEXTPROC __glewMultiTexSubImage2DEXT = NULL; -PFNGLMULTITEXSUBIMAGE3DEXTPROC __glewMultiTexSubImage3DEXT = NULL; -PFNGLNAMEDBUFFERDATAEXTPROC __glewNamedBufferDataEXT = NULL; -PFNGLNAMEDBUFFERSUBDATAEXTPROC __glewNamedBufferSubDataEXT = NULL; -PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC __glewNamedFramebufferRenderbufferEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC __glewNamedFramebufferTexture1DEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC __glewNamedFramebufferTexture2DEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC __glewNamedFramebufferTexture3DEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC __glewNamedFramebufferTextureEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC __glewNamedFramebufferTextureFaceEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC __glewNamedFramebufferTextureLayerEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC __glewNamedProgramLocalParameter4dEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC __glewNamedProgramLocalParameter4dvEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC __glewNamedProgramLocalParameter4fEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC __glewNamedProgramLocalParameter4fvEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC __glewNamedProgramLocalParameterI4iEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC __glewNamedProgramLocalParameterI4ivEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC __glewNamedProgramLocalParameterI4uiEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC __glewNamedProgramLocalParameterI4uivEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC __glewNamedProgramLocalParameters4fvEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC __glewNamedProgramLocalParametersI4ivEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC __glewNamedProgramLocalParametersI4uivEXT = NULL; -PFNGLNAMEDPROGRAMSTRINGEXTPROC __glewNamedProgramStringEXT = NULL; -PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC __glewNamedRenderbufferStorageEXT = NULL; -PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC __glewNamedRenderbufferStorageMultisampleCoverageEXT = NULL; -PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewNamedRenderbufferStorageMultisampleEXT = NULL; -PFNGLPROGRAMUNIFORM1FEXTPROC __glewProgramUniform1fEXT = NULL; -PFNGLPROGRAMUNIFORM1FVEXTPROC __glewProgramUniform1fvEXT = NULL; -PFNGLPROGRAMUNIFORM1IEXTPROC __glewProgramUniform1iEXT = NULL; -PFNGLPROGRAMUNIFORM1IVEXTPROC __glewProgramUniform1ivEXT = NULL; -PFNGLPROGRAMUNIFORM1UIEXTPROC __glewProgramUniform1uiEXT = NULL; -PFNGLPROGRAMUNIFORM1UIVEXTPROC __glewProgramUniform1uivEXT = NULL; -PFNGLPROGRAMUNIFORM2FEXTPROC __glewProgramUniform2fEXT = NULL; -PFNGLPROGRAMUNIFORM2FVEXTPROC __glewProgramUniform2fvEXT = NULL; -PFNGLPROGRAMUNIFORM2IEXTPROC __glewProgramUniform2iEXT = NULL; -PFNGLPROGRAMUNIFORM2IVEXTPROC __glewProgramUniform2ivEXT = NULL; -PFNGLPROGRAMUNIFORM2UIEXTPROC __glewProgramUniform2uiEXT = NULL; -PFNGLPROGRAMUNIFORM2UIVEXTPROC __glewProgramUniform2uivEXT = NULL; -PFNGLPROGRAMUNIFORM3FEXTPROC __glewProgramUniform3fEXT = NULL; -PFNGLPROGRAMUNIFORM3FVEXTPROC __glewProgramUniform3fvEXT = NULL; -PFNGLPROGRAMUNIFORM3IEXTPROC __glewProgramUniform3iEXT = NULL; -PFNGLPROGRAMUNIFORM3IVEXTPROC __glewProgramUniform3ivEXT = NULL; -PFNGLPROGRAMUNIFORM3UIEXTPROC __glewProgramUniform3uiEXT = NULL; -PFNGLPROGRAMUNIFORM3UIVEXTPROC __glewProgramUniform3uivEXT = NULL; -PFNGLPROGRAMUNIFORM4FEXTPROC __glewProgramUniform4fEXT = NULL; -PFNGLPROGRAMUNIFORM4FVEXTPROC __glewProgramUniform4fvEXT = NULL; -PFNGLPROGRAMUNIFORM4IEXTPROC __glewProgramUniform4iEXT = NULL; -PFNGLPROGRAMUNIFORM4IVEXTPROC __glewProgramUniform4ivEXT = NULL; -PFNGLPROGRAMUNIFORM4UIEXTPROC __glewProgramUniform4uiEXT = NULL; -PFNGLPROGRAMUNIFORM4UIVEXTPROC __glewProgramUniform4uivEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC __glewProgramUniformMatrix2fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __glewProgramUniformMatrix2x3fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __glewProgramUniformMatrix2x4fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC __glewProgramUniformMatrix3fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __glewProgramUniformMatrix3x2fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __glewProgramUniformMatrix3x4fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __glewProgramUniformMatrix4x2fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __glewProgramUniformMatrix4x3fvEXT = NULL; -PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC __glewPushClientAttribDefaultEXT = NULL; -PFNGLTEXTUREBUFFEREXTPROC __glewTextureBufferEXT = NULL; -PFNGLTEXTUREIMAGE1DEXTPROC __glewTextureImage1DEXT = NULL; -PFNGLTEXTUREIMAGE2DEXTPROC __glewTextureImage2DEXT = NULL; -PFNGLTEXTUREIMAGE3DEXTPROC __glewTextureImage3DEXT = NULL; -PFNGLTEXTUREPARAMETERIIVEXTPROC __glewTextureParameterIivEXT = NULL; -PFNGLTEXTUREPARAMETERIUIVEXTPROC __glewTextureParameterIuivEXT = NULL; -PFNGLTEXTUREPARAMETERFEXTPROC __glewTextureParameterfEXT = NULL; -PFNGLTEXTUREPARAMETERFVEXTPROC __glewTextureParameterfvEXT = NULL; -PFNGLTEXTUREPARAMETERIEXTPROC __glewTextureParameteriEXT = NULL; -PFNGLTEXTUREPARAMETERIVEXTPROC __glewTextureParameterivEXT = NULL; -PFNGLTEXTURERENDERBUFFEREXTPROC __glewTextureRenderbufferEXT = NULL; -PFNGLTEXTURESUBIMAGE1DEXTPROC __glewTextureSubImage1DEXT = NULL; -PFNGLTEXTURESUBIMAGE2DEXTPROC __glewTextureSubImage2DEXT = NULL; -PFNGLTEXTURESUBIMAGE3DEXTPROC __glewTextureSubImage3DEXT = NULL; -PFNGLUNMAPNAMEDBUFFEREXTPROC __glewUnmapNamedBufferEXT = NULL; - -PFNGLCOLORMASKINDEXEDEXTPROC __glewColorMaskIndexedEXT = NULL; -PFNGLDISABLEINDEXEDEXTPROC __glewDisableIndexedEXT = NULL; -PFNGLENABLEINDEXEDEXTPROC __glewEnableIndexedEXT = NULL; -PFNGLGETBOOLEANINDEXEDVEXTPROC __glewGetBooleanIndexedvEXT = NULL; -PFNGLGETINTEGERINDEXEDVEXTPROC __glewGetIntegerIndexedvEXT = NULL; -PFNGLISENABLEDINDEXEDEXTPROC __glewIsEnabledIndexedEXT = NULL; - -PFNGLDRAWARRAYSINSTANCEDEXTPROC __glewDrawArraysInstancedEXT = NULL; -PFNGLDRAWELEMENTSINSTANCEDEXTPROC __glewDrawElementsInstancedEXT = NULL; - -PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT = NULL; - -PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT = NULL; -PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT = NULL; -PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT = NULL; -PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT = NULL; -PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT = NULL; - -PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT = NULL; -PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT = NULL; -PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT = NULL; -PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT = NULL; -PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT = NULL; -PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT = NULL; -PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT = NULL; -PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT = NULL; -PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT = NULL; -PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT = NULL; -PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT = NULL; -PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT = NULL; -PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT = NULL; -PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT = NULL; -PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT = NULL; -PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT = NULL; -PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT = NULL; -PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT = NULL; - -PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT = NULL; - -PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT = NULL; - -PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT = NULL; -PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT = NULL; -PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT = NULL; -PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT = NULL; -PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT = NULL; -PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT = NULL; -PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT = NULL; -PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT = NULL; -PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT = NULL; -PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT = NULL; -PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT = NULL; -PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT = NULL; -PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT = NULL; -PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT = NULL; -PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT = NULL; -PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT = NULL; -PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT = NULL; - -PFNGLFRAMEBUFFERTEXTUREEXTPROC __glewFramebufferTextureEXT = NULL; -PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC __glewFramebufferTextureFaceEXT = NULL; -PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC __glewFramebufferTextureLayerEXT = NULL; -PFNGLPROGRAMPARAMETERIEXTPROC __glewProgramParameteriEXT = NULL; - -PFNGLPROGRAMENVPARAMETERS4FVEXTPROC __glewProgramEnvParameters4fvEXT = NULL; -PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC __glewProgramLocalParameters4fvEXT = NULL; - -PFNGLBINDFRAGDATALOCATIONEXTPROC __glewBindFragDataLocationEXT = NULL; -PFNGLGETFRAGDATALOCATIONEXTPROC __glewGetFragDataLocationEXT = NULL; -PFNGLGETUNIFORMUIVEXTPROC __glewGetUniformuivEXT = NULL; -PFNGLGETVERTEXATTRIBIIVEXTPROC __glewGetVertexAttribIivEXT = NULL; -PFNGLGETVERTEXATTRIBIUIVEXTPROC __glewGetVertexAttribIuivEXT = NULL; -PFNGLUNIFORM1UIEXTPROC __glewUniform1uiEXT = NULL; -PFNGLUNIFORM1UIVEXTPROC __glewUniform1uivEXT = NULL; -PFNGLUNIFORM2UIEXTPROC __glewUniform2uiEXT = NULL; -PFNGLUNIFORM2UIVEXTPROC __glewUniform2uivEXT = NULL; -PFNGLUNIFORM3UIEXTPROC __glewUniform3uiEXT = NULL; -PFNGLUNIFORM3UIVEXTPROC __glewUniform3uivEXT = NULL; -PFNGLUNIFORM4UIEXTPROC __glewUniform4uiEXT = NULL; -PFNGLUNIFORM4UIVEXTPROC __glewUniform4uivEXT = NULL; -PFNGLVERTEXATTRIBI1IEXTPROC __glewVertexAttribI1iEXT = NULL; -PFNGLVERTEXATTRIBI1IVEXTPROC __glewVertexAttribI1ivEXT = NULL; -PFNGLVERTEXATTRIBI1UIEXTPROC __glewVertexAttribI1uiEXT = NULL; -PFNGLVERTEXATTRIBI1UIVEXTPROC __glewVertexAttribI1uivEXT = NULL; -PFNGLVERTEXATTRIBI2IEXTPROC __glewVertexAttribI2iEXT = NULL; -PFNGLVERTEXATTRIBI2IVEXTPROC __glewVertexAttribI2ivEXT = NULL; -PFNGLVERTEXATTRIBI2UIEXTPROC __glewVertexAttribI2uiEXT = NULL; -PFNGLVERTEXATTRIBI2UIVEXTPROC __glewVertexAttribI2uivEXT = NULL; -PFNGLVERTEXATTRIBI3IEXTPROC __glewVertexAttribI3iEXT = NULL; -PFNGLVERTEXATTRIBI3IVEXTPROC __glewVertexAttribI3ivEXT = NULL; -PFNGLVERTEXATTRIBI3UIEXTPROC __glewVertexAttribI3uiEXT = NULL; -PFNGLVERTEXATTRIBI3UIVEXTPROC __glewVertexAttribI3uivEXT = NULL; -PFNGLVERTEXATTRIBI4BVEXTPROC __glewVertexAttribI4bvEXT = NULL; -PFNGLVERTEXATTRIBI4IEXTPROC __glewVertexAttribI4iEXT = NULL; -PFNGLVERTEXATTRIBI4IVEXTPROC __glewVertexAttribI4ivEXT = NULL; -PFNGLVERTEXATTRIBI4SVEXTPROC __glewVertexAttribI4svEXT = NULL; -PFNGLVERTEXATTRIBI4UBVEXTPROC __glewVertexAttribI4ubvEXT = NULL; -PFNGLVERTEXATTRIBI4UIEXTPROC __glewVertexAttribI4uiEXT = NULL; -PFNGLVERTEXATTRIBI4UIVEXTPROC __glewVertexAttribI4uivEXT = NULL; -PFNGLVERTEXATTRIBI4USVEXTPROC __glewVertexAttribI4usvEXT = NULL; -PFNGLVERTEXATTRIBIPOINTEREXTPROC __glewVertexAttribIPointerEXT = NULL; - -PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT = NULL; -PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT = NULL; -PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT = NULL; -PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT = NULL; -PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT = NULL; -PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT = NULL; -PFNGLHISTOGRAMEXTPROC __glewHistogramEXT = NULL; -PFNGLMINMAXEXTPROC __glewMinmaxEXT = NULL; -PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT = NULL; -PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT = NULL; - -PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT = NULL; - -PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT = NULL; - -PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT = NULL; -PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT = NULL; -PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT = NULL; - -PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT = NULL; -PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT = NULL; - -PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT = NULL; -PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT = NULL; - -PFNGLCOLORTABLEEXTPROC __glewColorTableEXT = NULL; -PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT = NULL; -PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT = NULL; -PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT = NULL; - -PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT = NULL; -PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT = NULL; -PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT = NULL; -PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT = NULL; -PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT = NULL; -PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT = NULL; - -PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT = NULL; -PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT = NULL; - -PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT = NULL; - -PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT = NULL; -PFNGLENDSCENEEXTPROC __glewEndSceneEXT = NULL; - -PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT = NULL; -PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT = NULL; -PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT = NULL; -PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT = NULL; -PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT = NULL; -PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT = NULL; -PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT = NULL; -PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT = NULL; -PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT = NULL; -PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT = NULL; -PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT = NULL; -PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT = NULL; -PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT = NULL; -PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT = NULL; -PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT = NULL; -PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT = NULL; -PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT = NULL; - -PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT = NULL; - -PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT = NULL; -PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT = NULL; -PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT = NULL; - -PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT = NULL; - -PFNGLTEXBUFFEREXTPROC __glewTexBufferEXT = NULL; - -PFNGLCLEARCOLORIIEXTPROC __glewClearColorIiEXT = NULL; -PFNGLCLEARCOLORIUIEXTPROC __glewClearColorIuiEXT = NULL; -PFNGLGETTEXPARAMETERIIVEXTPROC __glewGetTexParameterIivEXT = NULL; -PFNGLGETTEXPARAMETERIUIVEXTPROC __glewGetTexParameterIuivEXT = NULL; -PFNGLTEXPARAMETERIIVEXTPROC __glewTexParameterIivEXT = NULL; -PFNGLTEXPARAMETERIUIVEXTPROC __glewTexParameterIuivEXT = NULL; - -PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT = NULL; -PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT = NULL; -PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT = NULL; -PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT = NULL; -PFNGLISTEXTUREEXTPROC __glewIsTextureEXT = NULL; -PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT = NULL; - -PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT = NULL; - -//PFNGLGETQUERYOBJECTI64VEXTPROC __glewGetQueryObjecti64vEXT = NULL; -//PFNGLGETQUERYOBJECTUI64VEXTPROC __glewGetQueryObjectui64vEXT = NULL; - -PFNGLBEGINTRANSFORMFEEDBACKEXTPROC __glewBeginTransformFeedbackEXT = NULL; -PFNGLBINDBUFFERBASEEXTPROC __glewBindBufferBaseEXT = NULL; -PFNGLBINDBUFFEROFFSETEXTPROC __glewBindBufferOffsetEXT = NULL; -PFNGLBINDBUFFERRANGEEXTPROC __glewBindBufferRangeEXT = NULL; -PFNGLENDTRANSFORMFEEDBACKEXTPROC __glewEndTransformFeedbackEXT = NULL; -PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC __glewGetTransformFeedbackVaryingEXT = NULL; -PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC __glewTransformFeedbackVaryingsEXT = NULL; - -PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT = NULL; -PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT = NULL; -PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT = NULL; -PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT = NULL; -PFNGLGETPOINTERVEXTPROC __glewGetPointervEXT = NULL; -PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT = NULL; -PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT = NULL; -PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT = NULL; -PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT = NULL; - -PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT = NULL; -PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT = NULL; -PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT = NULL; -PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT = NULL; -PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT = NULL; -PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT = NULL; -PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT = NULL; -PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT = NULL; -PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT = NULL; -PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT = NULL; -PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT = NULL; -PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT = NULL; -PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT = NULL; -PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT = NULL; -PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT = NULL; -PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT = NULL; -PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT = NULL; -PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT = NULL; -PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT = NULL; -PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT = NULL; -PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT = NULL; -PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT = NULL; -PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT = NULL; -PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT = NULL; -PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT = NULL; -PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT = NULL; -PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT = NULL; -PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT = NULL; -PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT = NULL; -PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT = NULL; -PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT = NULL; -PFNGLSWIZZLEEXTPROC __glewSwizzleEXT = NULL; -PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT = NULL; -PFNGLVARIANTBVEXTPROC __glewVariantbvEXT = NULL; -PFNGLVARIANTDVEXTPROC __glewVariantdvEXT = NULL; -PFNGLVARIANTFVEXTPROC __glewVariantfvEXT = NULL; -PFNGLVARIANTIVEXTPROC __glewVariantivEXT = NULL; -PFNGLVARIANTSVEXTPROC __glewVariantsvEXT = NULL; -PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT = NULL; -PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT = NULL; -PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT = NULL; -PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT = NULL; - -PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT = NULL; -PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT = NULL; -PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT = NULL; - -PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY = NULL; - -PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY = NULL; - -PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP = NULL; -PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP = NULL; -PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP = NULL; -PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP = NULL; -PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP = NULL; -PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP = NULL; - -PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM = NULL; -PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM = NULL; - -PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM = NULL; -PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM = NULL; -PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM = NULL; -PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM = NULL; -PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM = NULL; -PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM = NULL; -PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM = NULL; -PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM = NULL; - -PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL = NULL; -PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL = NULL; -PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL = NULL; -PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL = NULL; - -PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL = NULL; -PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL = NULL; - -PFNGLBUFFERREGIONENABLEDEXTPROC __glewBufferRegionEnabledEXT = NULL; -PFNGLDELETEBUFFERREGIONEXTPROC __glewDeleteBufferRegionEXT = NULL; -PFNGLDRAWBUFFERREGIONEXTPROC __glewDrawBufferRegionEXT = NULL; -PFNGLNEWBUFFERREGIONEXTPROC __glewNewBufferRegionEXT = NULL; -PFNGLREADBUFFERREGIONEXTPROC __glewReadBufferRegionEXT = NULL; - -PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA = NULL; - -PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA = NULL; -PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA = NULL; -PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA = NULL; -PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA = NULL; -PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA = NULL; -PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA = NULL; -PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA = NULL; -PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA = NULL; -PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA = NULL; -PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA = NULL; -PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA = NULL; -PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA = NULL; -PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA = NULL; -PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA = NULL; -PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA = NULL; -PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA = NULL; -PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA = NULL; -PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA = NULL; -PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA = NULL; -PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA = NULL; -PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA = NULL; -PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA = NULL; -PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA = NULL; -PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA = NULL; - -PFNGLBEGINCONDITIONALRENDERNVPROC __glewBeginConditionalRenderNV = NULL; -PFNGLENDCONDITIONALRENDERNVPROC __glewEndConditionalRenderNV = NULL; - -PFNGLCLEARDEPTHDNVPROC __glewClearDepthdNV = NULL; -PFNGLDEPTHBOUNDSDNVPROC __glewDepthBoundsdNV = NULL; -PFNGLDEPTHRANGEDNVPROC __glewDepthRangedNV = NULL; - -PFNGLEVALMAPSNVPROC __glewEvalMapsNV = NULL; -PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV = NULL; -PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV = NULL; -PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV = NULL; -PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV = NULL; -PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV = NULL; -PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV = NULL; -PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV = NULL; -PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV = NULL; - -PFNGLGETMULTISAMPLEFVNVPROC __glewGetMultisamplefvNV = NULL; -PFNGLSAMPLEMASKINDEXEDNVPROC __glewSampleMaskIndexedNV = NULL; -PFNGLTEXRENDERBUFFERNVPROC __glewTexRenderbufferNV = NULL; - -PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV = NULL; -PFNGLFINISHFENCENVPROC __glewFinishFenceNV = NULL; -PFNGLGENFENCESNVPROC __glewGenFencesNV = NULL; -PFNGLGETFENCEIVNVPROC __glewGetFenceivNV = NULL; -PFNGLISFENCENVPROC __glewIsFenceNV = NULL; -PFNGLSETFENCENVPROC __glewSetFenceNV = NULL; -PFNGLTESTFENCENVPROC __glewTestFenceNV = NULL; - -PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV = NULL; -PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV = NULL; -PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV = NULL; -PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV = NULL; -PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV = NULL; -PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV = NULL; - -PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC __glewRenderbufferStorageMultisampleCoverageNV = NULL; - -PFNGLPROGRAMVERTEXLIMITNVPROC __glewProgramVertexLimitNV = NULL; - -PFNGLPROGRAMENVPARAMETERI4INVPROC __glewProgramEnvParameterI4iNV = NULL; -PFNGLPROGRAMENVPARAMETERI4IVNVPROC __glewProgramEnvParameterI4ivNV = NULL; -PFNGLPROGRAMENVPARAMETERI4UINVPROC __glewProgramEnvParameterI4uiNV = NULL; -PFNGLPROGRAMENVPARAMETERI4UIVNVPROC __glewProgramEnvParameterI4uivNV = NULL; -PFNGLPROGRAMENVPARAMETERSI4IVNVPROC __glewProgramEnvParametersI4ivNV = NULL; -PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC __glewProgramEnvParametersI4uivNV = NULL; -PFNGLPROGRAMLOCALPARAMETERI4INVPROC __glewProgramLocalParameterI4iNV = NULL; -PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC __glewProgramLocalParameterI4ivNV = NULL; -PFNGLPROGRAMLOCALPARAMETERI4UINVPROC __glewProgramLocalParameterI4uiNV = NULL; -PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC __glewProgramLocalParameterI4uivNV = NULL; -PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC __glewProgramLocalParametersI4ivNV = NULL; -PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC __glewProgramLocalParametersI4uivNV = NULL; - -PFNGLCOLOR3HNVPROC __glewColor3hNV = NULL; -PFNGLCOLOR3HVNVPROC __glewColor3hvNV = NULL; -PFNGLCOLOR4HNVPROC __glewColor4hNV = NULL; -PFNGLCOLOR4HVNVPROC __glewColor4hvNV = NULL; -PFNGLFOGCOORDHNVPROC __glewFogCoordhNV = NULL; -PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV = NULL; -PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV = NULL; -PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV = NULL; -PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV = NULL; -PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV = NULL; -PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV = NULL; -PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV = NULL; -PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV = NULL; -PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV = NULL; -PFNGLNORMAL3HNVPROC __glewNormal3hNV = NULL; -PFNGLNORMAL3HVNVPROC __glewNormal3hvNV = NULL; -PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV = NULL; -PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV = NULL; -PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV = NULL; -PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV = NULL; -PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV = NULL; -PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV = NULL; -PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV = NULL; -PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV = NULL; -PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV = NULL; -PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV = NULL; -PFNGLVERTEX2HNVPROC __glewVertex2hNV = NULL; -PFNGLVERTEX2HVNVPROC __glewVertex2hvNV = NULL; -PFNGLVERTEX3HNVPROC __glewVertex3hNV = NULL; -PFNGLVERTEX3HVNVPROC __glewVertex3hvNV = NULL; -PFNGLVERTEX4HNVPROC __glewVertex4hNV = NULL; -PFNGLVERTEX4HVNVPROC __glewVertex4hvNV = NULL; -PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV = NULL; -PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV = NULL; -PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV = NULL; -PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV = NULL; -PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV = NULL; -PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV = NULL; -PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV = NULL; -PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV = NULL; -PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV = NULL; -PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV = NULL; -PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV = NULL; -PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV = NULL; -PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV = NULL; -PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV = NULL; - -PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV = NULL; -PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV = NULL; -PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV = NULL; -PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV = NULL; -PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV = NULL; -PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV = NULL; -PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV = NULL; - -PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC __glewProgramBufferParametersIivNV = NULL; -PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC __glewProgramBufferParametersIuivNV = NULL; -PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC __glewProgramBufferParametersfvNV = NULL; - -PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV = NULL; -PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV = NULL; - -PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV = NULL; -PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV = NULL; - -//PFNGLGETVIDEOI64VNVPROC __glewGetVideoi64vNV = NULL; -PFNGLGETVIDEOIVNVPROC __glewGetVideoivNV = NULL; -//PFNGLGETVIDEOUI64VNVPROC __glewGetVideoui64vNV = NULL; -PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV = NULL; -//PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV = NULL; -//PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV = NULL; -PFNGLVIDEOPARAMETERIVNVPROC __glewVideoParameterivNV = NULL; - -PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV = NULL; -PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV = NULL; - -PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV = NULL; -PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV = NULL; -PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV = NULL; -PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV = NULL; -PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV = NULL; -PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV = NULL; -PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV = NULL; -PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV = NULL; -PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV = NULL; -PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV = NULL; -PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV = NULL; -PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV = NULL; -PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV = NULL; - -PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV = NULL; -PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV = NULL; - -PFNGLACTIVEVARYINGNVPROC __glewActiveVaryingNV = NULL; -PFNGLBEGINTRANSFORMFEEDBACKNVPROC __glewBeginTransformFeedbackNV = NULL; -PFNGLBINDBUFFERBASENVPROC __glewBindBufferBaseNV = NULL; -PFNGLBINDBUFFEROFFSETNVPROC __glewBindBufferOffsetNV = NULL; -PFNGLBINDBUFFERRANGENVPROC __glewBindBufferRangeNV = NULL; -PFNGLENDTRANSFORMFEEDBACKNVPROC __glewEndTransformFeedbackNV = NULL; -PFNGLGETACTIVEVARYINGNVPROC __glewGetActiveVaryingNV = NULL; -PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC __glewGetTransformFeedbackVaryingNV = NULL; -PFNGLGETVARYINGLOCATIONNVPROC __glewGetVaryingLocationNV = NULL; -PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC __glewTransformFeedbackAttribsNV = NULL; -PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC __glewTransformFeedbackVaryingsNV = NULL; - -PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV = NULL; -PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV = NULL; - -PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV = NULL; -PFNGLBINDPROGRAMNVPROC __glewBindProgramNV = NULL; -PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV = NULL; -PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV = NULL; -PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV = NULL; -PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV = NULL; -PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV = NULL; -PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV = NULL; -PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV = NULL; -PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV = NULL; -PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV = NULL; -PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV = NULL; -PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV = NULL; -PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV = NULL; -PFNGLISPROGRAMNVPROC __glewIsProgramNV = NULL; -PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV = NULL; -PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV = NULL; -PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV = NULL; -PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV = NULL; -PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV = NULL; -PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV = NULL; -PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV = NULL; -PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV = NULL; -PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV = NULL; -PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV = NULL; -PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV = NULL; -PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV = NULL; -PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV = NULL; -PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV = NULL; -PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV = NULL; -PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV = NULL; -PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV = NULL; -PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV = NULL; -PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV = NULL; -PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV = NULL; -PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV = NULL; -PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV = NULL; -PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV = NULL; -PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV = NULL; -PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV = NULL; -PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV = NULL; -PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV = NULL; -PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV = NULL; -PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV = NULL; -PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV = NULL; -PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV = NULL; -PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV = NULL; -PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV = NULL; -PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV = NULL; -PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV = NULL; -PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV = NULL; -PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV = NULL; -PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV = NULL; -PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV = NULL; -PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV = NULL; -PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV = NULL; -PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV = NULL; -PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV = NULL; -PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV = NULL; -PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV = NULL; -PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV = NULL; -PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV = NULL; -PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV = NULL; -PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV = NULL; - -PFNGLCLEARDEPTHFOESPROC __glewClearDepthfOES = NULL; -PFNGLCLIPPLANEFOESPROC __glewClipPlanefOES = NULL; -PFNGLDEPTHRANGEFOESPROC __glewDepthRangefOES = NULL; -PFNGLFRUSTUMFOESPROC __glewFrustumfOES = NULL; -PFNGLGETCLIPPLANEFOESPROC __glewGetClipPlanefOES = NULL; -PFNGLORTHOFOESPROC __glewOrthofOES = NULL; - -PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS = NULL; -PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS = NULL; - -PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS = NULL; -PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS = NULL; - -PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS = NULL; -PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS = NULL; - -PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS = NULL; -PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS = NULL; - -PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS = NULL; -PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS = NULL; - -PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS = NULL; -PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS = NULL; - -PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX = NULL; -PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX = NULL; -PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX = NULL; -PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX = NULL; -PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX = NULL; -PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX = NULL; - -PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX = NULL; - -PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX = NULL; - -PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX = NULL; -PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX = NULL; -PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX = NULL; -PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX = NULL; -PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX = NULL; -PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX = NULL; -PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX = NULL; -PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX = NULL; -PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX = NULL; -PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX = NULL; -PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX = NULL; -PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX = NULL; -PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX = NULL; -PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX = NULL; -PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX = NULL; -PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX = NULL; -PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX = NULL; - -PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX = NULL; - -PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX = NULL; - -PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX = NULL; - -PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX = NULL; -PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX = NULL; -PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX = NULL; -PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX = NULL; - -PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX = NULL; - -PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI = NULL; -PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI = NULL; -PFNGLCOLORTABLESGIPROC __glewColorTableSGI = NULL; -PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI = NULL; -PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI = NULL; -PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI = NULL; -PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI = NULL; - -PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX = NULL; - -PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN = NULL; -PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN = NULL; -PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN = NULL; -PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN = NULL; -PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN = NULL; -PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN = NULL; -PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN = NULL; -PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN = NULL; - -PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN = NULL; - -PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN = NULL; -PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN = NULL; -PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN = NULL; -PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN = NULL; -PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN = NULL; -PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN = NULL; -PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN = NULL; - -PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN = NULL; -PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN = NULL; -PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN = NULL; -PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN = NULL; -PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN = NULL; -PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN = NULL; -PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN = NULL; -PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN = NULL; -PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN = NULL; -PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN = NULL; -PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN = NULL; -PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN = NULL; -PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN = NULL; -PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN = NULL; -PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN = NULL; -PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN = NULL; -PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN = NULL; -PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN = NULL; -PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN = NULL; -PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN = NULL; -PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN = NULL; -PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN = NULL; -PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN = NULL; -PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN = NULL; - -PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN = NULL; - -#endif /* !WIN32 || !GLEW_MX */ - -#if !defined(GLEW_MX) - -GLboolean __GLEW_VERSION_1_1 = GL_FALSE; -GLboolean __GLEW_VERSION_1_2 = GL_FALSE; -GLboolean __GLEW_VERSION_1_3 = GL_FALSE; -GLboolean __GLEW_VERSION_1_4 = GL_FALSE; -GLboolean __GLEW_VERSION_1_5 = GL_FALSE; -GLboolean __GLEW_VERSION_2_0 = GL_FALSE; -GLboolean __GLEW_VERSION_2_1 = GL_FALSE; -GLboolean __GLEW_VERSION_3_0 = GL_FALSE; -GLboolean __GLEW_3DFX_multisample = GL_FALSE; -GLboolean __GLEW_3DFX_tbuffer = GL_FALSE; -GLboolean __GLEW_3DFX_texture_compression_FXT1 = GL_FALSE; -GLboolean __GLEW_APPLE_client_storage = GL_FALSE; -GLboolean __GLEW_APPLE_element_array = GL_FALSE; -GLboolean __GLEW_APPLE_fence = GL_FALSE; -GLboolean __GLEW_APPLE_float_pixels = GL_FALSE; -GLboolean __GLEW_APPLE_flush_buffer_range = GL_FALSE; -GLboolean __GLEW_APPLE_pixel_buffer = GL_FALSE; -GLboolean __GLEW_APPLE_specular_vector = GL_FALSE; -GLboolean __GLEW_APPLE_texture_range = GL_FALSE; -GLboolean __GLEW_APPLE_transform_hint = GL_FALSE; -GLboolean __GLEW_APPLE_vertex_array_object = GL_FALSE; -GLboolean __GLEW_APPLE_vertex_array_range = GL_FALSE; -GLboolean __GLEW_APPLE_ycbcr_422 = GL_FALSE; -GLboolean __GLEW_ARB_color_buffer_float = GL_FALSE; -GLboolean __GLEW_ARB_depth_buffer_float = GL_FALSE; -GLboolean __GLEW_ARB_depth_texture = GL_FALSE; -GLboolean __GLEW_ARB_draw_buffers = GL_FALSE; -GLboolean __GLEW_ARB_draw_instanced = GL_FALSE; -GLboolean __GLEW_ARB_fragment_program = GL_FALSE; -GLboolean __GLEW_ARB_fragment_program_shadow = GL_FALSE; -GLboolean __GLEW_ARB_fragment_shader = GL_FALSE; -GLboolean __GLEW_ARB_framebuffer_object = GL_FALSE; -GLboolean __GLEW_ARB_framebuffer_sRGB = GL_FALSE; -GLboolean __GLEW_ARB_geometry_shader4 = GL_FALSE; -GLboolean __GLEW_ARB_half_float_pixel = GL_FALSE; -GLboolean __GLEW_ARB_half_float_vertex = GL_FALSE; -GLboolean __GLEW_ARB_imaging = GL_FALSE; -GLboolean __GLEW_ARB_instanced_arrays = GL_FALSE; -GLboolean __GLEW_ARB_map_buffer_range = GL_FALSE; -GLboolean __GLEW_ARB_matrix_palette = GL_FALSE; -GLboolean __GLEW_ARB_multisample = GL_FALSE; -GLboolean __GLEW_ARB_multitexture = GL_FALSE; -GLboolean __GLEW_ARB_occlusion_query = GL_FALSE; -GLboolean __GLEW_ARB_pixel_buffer_object = GL_FALSE; -GLboolean __GLEW_ARB_point_parameters = GL_FALSE; -GLboolean __GLEW_ARB_point_sprite = GL_FALSE; -GLboolean __GLEW_ARB_shader_objects = GL_FALSE; -GLboolean __GLEW_ARB_shading_language_100 = GL_FALSE; -GLboolean __GLEW_ARB_shadow = GL_FALSE; -GLboolean __GLEW_ARB_shadow_ambient = GL_FALSE; -GLboolean __GLEW_ARB_texture_border_clamp = GL_FALSE; -GLboolean __GLEW_ARB_texture_buffer_object = GL_FALSE; -GLboolean __GLEW_ARB_texture_compression = GL_FALSE; -GLboolean __GLEW_ARB_texture_compression_rgtc = GL_FALSE; -GLboolean __GLEW_ARB_texture_cube_map = GL_FALSE; -GLboolean __GLEW_ARB_texture_env_add = GL_FALSE; -GLboolean __GLEW_ARB_texture_env_combine = GL_FALSE; -GLboolean __GLEW_ARB_texture_env_crossbar = GL_FALSE; -GLboolean __GLEW_ARB_texture_env_dot3 = GL_FALSE; -GLboolean __GLEW_ARB_texture_float = GL_FALSE; -GLboolean __GLEW_ARB_texture_mirrored_repeat = GL_FALSE; -GLboolean __GLEW_ARB_texture_non_power_of_two = GL_FALSE; -GLboolean __GLEW_ARB_texture_rectangle = GL_FALSE; -GLboolean __GLEW_ARB_texture_rg = GL_FALSE; -GLboolean __GLEW_ARB_transpose_matrix = GL_FALSE; -GLboolean __GLEW_ARB_vertex_array_object = GL_FALSE; -GLboolean __GLEW_ARB_vertex_blend = GL_FALSE; -GLboolean __GLEW_ARB_vertex_buffer_object = GL_FALSE; -GLboolean __GLEW_ARB_vertex_program = GL_FALSE; -GLboolean __GLEW_ARB_vertex_shader = GL_FALSE; -GLboolean __GLEW_ARB_window_pos = GL_FALSE; -GLboolean __GLEW_ATIX_point_sprites = GL_FALSE; -GLboolean __GLEW_ATIX_texture_env_combine3 = GL_FALSE; -GLboolean __GLEW_ATIX_texture_env_route = GL_FALSE; -GLboolean __GLEW_ATIX_vertex_shader_output_point_size = GL_FALSE; -GLboolean __GLEW_ATI_draw_buffers = GL_FALSE; -GLboolean __GLEW_ATI_element_array = GL_FALSE; -GLboolean __GLEW_ATI_envmap_bumpmap = GL_FALSE; -GLboolean __GLEW_ATI_fragment_shader = GL_FALSE; -GLboolean __GLEW_ATI_map_object_buffer = GL_FALSE; -GLboolean __GLEW_ATI_pn_triangles = GL_FALSE; -GLboolean __GLEW_ATI_separate_stencil = GL_FALSE; -GLboolean __GLEW_ATI_shader_texture_lod = GL_FALSE; -GLboolean __GLEW_ATI_text_fragment_shader = GL_FALSE; -GLboolean __GLEW_ATI_texture_compression_3dc = GL_FALSE; -GLboolean __GLEW_ATI_texture_env_combine3 = GL_FALSE; -GLboolean __GLEW_ATI_texture_float = GL_FALSE; -GLboolean __GLEW_ATI_texture_mirror_once = GL_FALSE; -GLboolean __GLEW_ATI_vertex_array_object = GL_FALSE; -GLboolean __GLEW_ATI_vertex_attrib_array_object = GL_FALSE; -GLboolean __GLEW_ATI_vertex_streams = GL_FALSE; -GLboolean __GLEW_EXT_422_pixels = GL_FALSE; -GLboolean __GLEW_EXT_Cg_shader = GL_FALSE; -GLboolean __GLEW_EXT_abgr = GL_FALSE; -GLboolean __GLEW_EXT_bgra = GL_FALSE; -GLboolean __GLEW_EXT_bindable_uniform = GL_FALSE; -GLboolean __GLEW_EXT_blend_color = GL_FALSE; -GLboolean __GLEW_EXT_blend_equation_separate = GL_FALSE; -GLboolean __GLEW_EXT_blend_func_separate = GL_FALSE; -GLboolean __GLEW_EXT_blend_logic_op = GL_FALSE; -GLboolean __GLEW_EXT_blend_minmax = GL_FALSE; -GLboolean __GLEW_EXT_blend_subtract = GL_FALSE; -GLboolean __GLEW_EXT_clip_volume_hint = GL_FALSE; -GLboolean __GLEW_EXT_cmyka = GL_FALSE; -GLboolean __GLEW_EXT_color_subtable = GL_FALSE; -GLboolean __GLEW_EXT_compiled_vertex_array = GL_FALSE; -GLboolean __GLEW_EXT_convolution = GL_FALSE; -GLboolean __GLEW_EXT_coordinate_frame = GL_FALSE; -GLboolean __GLEW_EXT_copy_texture = GL_FALSE; -GLboolean __GLEW_EXT_cull_vertex = GL_FALSE; -GLboolean __GLEW_EXT_depth_bounds_test = GL_FALSE; -GLboolean __GLEW_EXT_direct_state_access = GL_FALSE; -GLboolean __GLEW_EXT_draw_buffers2 = GL_FALSE; -GLboolean __GLEW_EXT_draw_instanced = GL_FALSE; -GLboolean __GLEW_EXT_draw_range_elements = GL_FALSE; -GLboolean __GLEW_EXT_fog_coord = GL_FALSE; -GLboolean __GLEW_EXT_fragment_lighting = GL_FALSE; -GLboolean __GLEW_EXT_framebuffer_blit = GL_FALSE; -GLboolean __GLEW_EXT_framebuffer_multisample = GL_FALSE; -GLboolean __GLEW_EXT_framebuffer_object = GL_FALSE; -GLboolean __GLEW_EXT_framebuffer_sRGB = GL_FALSE; -GLboolean __GLEW_EXT_geometry_shader4 = GL_FALSE; -GLboolean __GLEW_EXT_gpu_program_parameters = GL_FALSE; -GLboolean __GLEW_EXT_gpu_shader4 = GL_FALSE; -GLboolean __GLEW_EXT_histogram = GL_FALSE; -GLboolean __GLEW_EXT_index_array_formats = GL_FALSE; -GLboolean __GLEW_EXT_index_func = GL_FALSE; -GLboolean __GLEW_EXT_index_material = GL_FALSE; -GLboolean __GLEW_EXT_index_texture = GL_FALSE; -GLboolean __GLEW_EXT_light_texture = GL_FALSE; -GLboolean __GLEW_EXT_misc_attribute = GL_FALSE; -GLboolean __GLEW_EXT_multi_draw_arrays = GL_FALSE; -GLboolean __GLEW_EXT_multisample = GL_FALSE; -GLboolean __GLEW_EXT_packed_depth_stencil = GL_FALSE; -GLboolean __GLEW_EXT_packed_float = GL_FALSE; -GLboolean __GLEW_EXT_packed_pixels = GL_FALSE; -GLboolean __GLEW_EXT_paletted_texture = GL_FALSE; -GLboolean __GLEW_EXT_pixel_buffer_object = GL_FALSE; -GLboolean __GLEW_EXT_pixel_transform = GL_FALSE; -GLboolean __GLEW_EXT_pixel_transform_color_table = GL_FALSE; -GLboolean __GLEW_EXT_point_parameters = GL_FALSE; -GLboolean __GLEW_EXT_polygon_offset = GL_FALSE; -GLboolean __GLEW_EXT_rescale_normal = GL_FALSE; -GLboolean __GLEW_EXT_scene_marker = GL_FALSE; -GLboolean __GLEW_EXT_secondary_color = GL_FALSE; -GLboolean __GLEW_EXT_separate_specular_color = GL_FALSE; -GLboolean __GLEW_EXT_shadow_funcs = GL_FALSE; -GLboolean __GLEW_EXT_shared_texture_palette = GL_FALSE; -GLboolean __GLEW_EXT_stencil_clear_tag = GL_FALSE; -GLboolean __GLEW_EXT_stencil_two_side = GL_FALSE; -GLboolean __GLEW_EXT_stencil_wrap = GL_FALSE; -GLboolean __GLEW_EXT_subtexture = GL_FALSE; -GLboolean __GLEW_EXT_texture = GL_FALSE; -GLboolean __GLEW_EXT_texture3D = GL_FALSE; -GLboolean __GLEW_EXT_texture_array = GL_FALSE; -GLboolean __GLEW_EXT_texture_buffer_object = GL_FALSE; -GLboolean __GLEW_EXT_texture_compression_dxt1 = GL_FALSE; -GLboolean __GLEW_EXT_texture_compression_latc = GL_FALSE; -GLboolean __GLEW_EXT_texture_compression_rgtc = GL_FALSE; -GLboolean __GLEW_EXT_texture_compression_s3tc = GL_FALSE; -GLboolean __GLEW_EXT_texture_cube_map = GL_FALSE; -GLboolean __GLEW_EXT_texture_edge_clamp = GL_FALSE; -GLboolean __GLEW_EXT_texture_env = GL_FALSE; -GLboolean __GLEW_EXT_texture_env_add = GL_FALSE; -GLboolean __GLEW_EXT_texture_env_combine = GL_FALSE; -GLboolean __GLEW_EXT_texture_env_dot3 = GL_FALSE; -GLboolean __GLEW_EXT_texture_filter_anisotropic = GL_FALSE; -GLboolean __GLEW_EXT_texture_integer = GL_FALSE; -GLboolean __GLEW_EXT_texture_lod_bias = GL_FALSE; -GLboolean __GLEW_EXT_texture_mirror_clamp = GL_FALSE; -GLboolean __GLEW_EXT_texture_object = GL_FALSE; -GLboolean __GLEW_EXT_texture_perturb_normal = GL_FALSE; -GLboolean __GLEW_EXT_texture_rectangle = GL_FALSE; -GLboolean __GLEW_EXT_texture_sRGB = GL_FALSE; -GLboolean __GLEW_EXT_texture_shared_exponent = GL_FALSE; -GLboolean __GLEW_EXT_texture_swizzle = GL_FALSE; -GLboolean __GLEW_EXT_timer_query = GL_FALSE; -GLboolean __GLEW_EXT_transform_feedback = GL_FALSE; -GLboolean __GLEW_EXT_vertex_array = GL_FALSE; -GLboolean __GLEW_EXT_vertex_array_bgra = GL_FALSE; -GLboolean __GLEW_EXT_vertex_shader = GL_FALSE; -GLboolean __GLEW_EXT_vertex_weighting = GL_FALSE; -GLboolean __GLEW_GREMEDY_frame_terminator = GL_FALSE; -GLboolean __GLEW_GREMEDY_string_marker = GL_FALSE; -GLboolean __GLEW_HP_convolution_border_modes = GL_FALSE; -GLboolean __GLEW_HP_image_transform = GL_FALSE; -GLboolean __GLEW_HP_occlusion_test = GL_FALSE; -GLboolean __GLEW_HP_texture_lighting = GL_FALSE; -GLboolean __GLEW_IBM_cull_vertex = GL_FALSE; -GLboolean __GLEW_IBM_multimode_draw_arrays = GL_FALSE; -GLboolean __GLEW_IBM_rasterpos_clip = GL_FALSE; -GLboolean __GLEW_IBM_static_data = GL_FALSE; -GLboolean __GLEW_IBM_texture_mirrored_repeat = GL_FALSE; -GLboolean __GLEW_IBM_vertex_array_lists = GL_FALSE; -GLboolean __GLEW_INGR_color_clamp = GL_FALSE; -GLboolean __GLEW_INGR_interlace_read = GL_FALSE; -GLboolean __GLEW_INTEL_parallel_arrays = GL_FALSE; -GLboolean __GLEW_INTEL_texture_scissor = GL_FALSE; -GLboolean __GLEW_KTX_buffer_region = GL_FALSE; -GLboolean __GLEW_MESAX_texture_stack = GL_FALSE; -GLboolean __GLEW_MESA_pack_invert = GL_FALSE; -GLboolean __GLEW_MESA_resize_buffers = GL_FALSE; -GLboolean __GLEW_MESA_window_pos = GL_FALSE; -GLboolean __GLEW_MESA_ycbcr_texture = GL_FALSE; -GLboolean __GLEW_NV_blend_square = GL_FALSE; -GLboolean __GLEW_NV_conditional_render = GL_FALSE; -GLboolean __GLEW_NV_copy_depth_to_color = GL_FALSE; -GLboolean __GLEW_NV_depth_buffer_float = GL_FALSE; -GLboolean __GLEW_NV_depth_clamp = GL_FALSE; -GLboolean __GLEW_NV_depth_range_unclamped = GL_FALSE; -GLboolean __GLEW_NV_evaluators = GL_FALSE; -GLboolean __GLEW_NV_explicit_multisample = GL_FALSE; -GLboolean __GLEW_NV_fence = GL_FALSE; -GLboolean __GLEW_NV_float_buffer = GL_FALSE; -GLboolean __GLEW_NV_fog_distance = GL_FALSE; -GLboolean __GLEW_NV_fragment_program = GL_FALSE; -GLboolean __GLEW_NV_fragment_program2 = GL_FALSE; -GLboolean __GLEW_NV_fragment_program4 = GL_FALSE; -GLboolean __GLEW_NV_fragment_program_option = GL_FALSE; -GLboolean __GLEW_NV_framebuffer_multisample_coverage = GL_FALSE; -GLboolean __GLEW_NV_geometry_program4 = GL_FALSE; -GLboolean __GLEW_NV_geometry_shader4 = GL_FALSE; -GLboolean __GLEW_NV_gpu_program4 = GL_FALSE; -GLboolean __GLEW_NV_half_float = GL_FALSE; -GLboolean __GLEW_NV_light_max_exponent = GL_FALSE; -GLboolean __GLEW_NV_multisample_filter_hint = GL_FALSE; -GLboolean __GLEW_NV_occlusion_query = GL_FALSE; -GLboolean __GLEW_NV_packed_depth_stencil = GL_FALSE; -GLboolean __GLEW_NV_parameter_buffer_object = GL_FALSE; -GLboolean __GLEW_NV_pixel_data_range = GL_FALSE; -GLboolean __GLEW_NV_point_sprite = GL_FALSE; -GLboolean __GLEW_NV_present_video = GL_FALSE; -GLboolean __GLEW_NV_primitive_restart = GL_FALSE; -GLboolean __GLEW_NV_register_combiners = GL_FALSE; -GLboolean __GLEW_NV_register_combiners2 = GL_FALSE; -GLboolean __GLEW_NV_texgen_emboss = GL_FALSE; -GLboolean __GLEW_NV_texgen_reflection = GL_FALSE; -GLboolean __GLEW_NV_texture_compression_vtc = GL_FALSE; -GLboolean __GLEW_NV_texture_env_combine4 = GL_FALSE; -GLboolean __GLEW_NV_texture_expand_normal = GL_FALSE; -GLboolean __GLEW_NV_texture_rectangle = GL_FALSE; -GLboolean __GLEW_NV_texture_shader = GL_FALSE; -GLboolean __GLEW_NV_texture_shader2 = GL_FALSE; -GLboolean __GLEW_NV_texture_shader3 = GL_FALSE; -GLboolean __GLEW_NV_transform_feedback = GL_FALSE; -GLboolean __GLEW_NV_vertex_array_range = GL_FALSE; -GLboolean __GLEW_NV_vertex_array_range2 = GL_FALSE; -GLboolean __GLEW_NV_vertex_program = GL_FALSE; -GLboolean __GLEW_NV_vertex_program1_1 = GL_FALSE; -GLboolean __GLEW_NV_vertex_program2 = GL_FALSE; -GLboolean __GLEW_NV_vertex_program2_option = GL_FALSE; -GLboolean __GLEW_NV_vertex_program3 = GL_FALSE; -GLboolean __GLEW_NV_vertex_program4 = GL_FALSE; -GLboolean __GLEW_OES_byte_coordinates = GL_FALSE; -GLboolean __GLEW_OES_compressed_paletted_texture = GL_FALSE; -GLboolean __GLEW_OES_read_format = GL_FALSE; -GLboolean __GLEW_OES_single_precision = GL_FALSE; -GLboolean __GLEW_OML_interlace = GL_FALSE; -GLboolean __GLEW_OML_resample = GL_FALSE; -GLboolean __GLEW_OML_subsample = GL_FALSE; -GLboolean __GLEW_PGI_misc_hints = GL_FALSE; -GLboolean __GLEW_PGI_vertex_hints = GL_FALSE; -GLboolean __GLEW_REND_screen_coordinates = GL_FALSE; -GLboolean __GLEW_S3_s3tc = GL_FALSE; -GLboolean __GLEW_SGIS_color_range = GL_FALSE; -GLboolean __GLEW_SGIS_detail_texture = GL_FALSE; -GLboolean __GLEW_SGIS_fog_function = GL_FALSE; -GLboolean __GLEW_SGIS_generate_mipmap = GL_FALSE; -GLboolean __GLEW_SGIS_multisample = GL_FALSE; -GLboolean __GLEW_SGIS_pixel_texture = GL_FALSE; -GLboolean __GLEW_SGIS_point_line_texgen = GL_FALSE; -GLboolean __GLEW_SGIS_sharpen_texture = GL_FALSE; -GLboolean __GLEW_SGIS_texture4D = GL_FALSE; -GLboolean __GLEW_SGIS_texture_border_clamp = GL_FALSE; -GLboolean __GLEW_SGIS_texture_edge_clamp = GL_FALSE; -GLboolean __GLEW_SGIS_texture_filter4 = GL_FALSE; -GLboolean __GLEW_SGIS_texture_lod = GL_FALSE; -GLboolean __GLEW_SGIS_texture_select = GL_FALSE; -GLboolean __GLEW_SGIX_async = GL_FALSE; -GLboolean __GLEW_SGIX_async_histogram = GL_FALSE; -GLboolean __GLEW_SGIX_async_pixel = GL_FALSE; -GLboolean __GLEW_SGIX_blend_alpha_minmax = GL_FALSE; -GLboolean __GLEW_SGIX_clipmap = GL_FALSE; -GLboolean __GLEW_SGIX_convolution_accuracy = GL_FALSE; -GLboolean __GLEW_SGIX_depth_texture = GL_FALSE; -GLboolean __GLEW_SGIX_flush_raster = GL_FALSE; -GLboolean __GLEW_SGIX_fog_offset = GL_FALSE; -GLboolean __GLEW_SGIX_fog_texture = GL_FALSE; -GLboolean __GLEW_SGIX_fragment_specular_lighting = GL_FALSE; -GLboolean __GLEW_SGIX_framezoom = GL_FALSE; -GLboolean __GLEW_SGIX_interlace = GL_FALSE; -GLboolean __GLEW_SGIX_ir_instrument1 = GL_FALSE; -GLboolean __GLEW_SGIX_list_priority = GL_FALSE; -GLboolean __GLEW_SGIX_pixel_texture = GL_FALSE; -GLboolean __GLEW_SGIX_pixel_texture_bits = GL_FALSE; -GLboolean __GLEW_SGIX_reference_plane = GL_FALSE; -GLboolean __GLEW_SGIX_resample = GL_FALSE; -GLboolean __GLEW_SGIX_shadow = GL_FALSE; -GLboolean __GLEW_SGIX_shadow_ambient = GL_FALSE; -GLboolean __GLEW_SGIX_sprite = GL_FALSE; -GLboolean __GLEW_SGIX_tag_sample_buffer = GL_FALSE; -GLboolean __GLEW_SGIX_texture_add_env = GL_FALSE; -GLboolean __GLEW_SGIX_texture_coordinate_clamp = GL_FALSE; -GLboolean __GLEW_SGIX_texture_lod_bias = GL_FALSE; -GLboolean __GLEW_SGIX_texture_multi_buffer = GL_FALSE; -GLboolean __GLEW_SGIX_texture_range = GL_FALSE; -GLboolean __GLEW_SGIX_texture_scale_bias = GL_FALSE; -GLboolean __GLEW_SGIX_vertex_preclip = GL_FALSE; -GLboolean __GLEW_SGIX_vertex_preclip_hint = GL_FALSE; -GLboolean __GLEW_SGIX_ycrcb = GL_FALSE; -GLboolean __GLEW_SGI_color_matrix = GL_FALSE; -GLboolean __GLEW_SGI_color_table = GL_FALSE; -GLboolean __GLEW_SGI_texture_color_table = GL_FALSE; -GLboolean __GLEW_SUNX_constant_data = GL_FALSE; -GLboolean __GLEW_SUN_convolution_border_modes = GL_FALSE; -GLboolean __GLEW_SUN_global_alpha = GL_FALSE; -GLboolean __GLEW_SUN_mesh_array = GL_FALSE; -GLboolean __GLEW_SUN_read_video_pixels = GL_FALSE; -GLboolean __GLEW_SUN_slice_accum = GL_FALSE; -GLboolean __GLEW_SUN_triangle_list = GL_FALSE; -GLboolean __GLEW_SUN_vertex = GL_FALSE; -GLboolean __GLEW_WIN_phong_shading = GL_FALSE; -GLboolean __GLEW_WIN_specular_fog = GL_FALSE; -GLboolean __GLEW_WIN_swap_hint = GL_FALSE; - -#endif /* !GLEW_MX */ - -#ifdef GL_VERSION_1_2 - -static GLboolean _glewInit_GL_VERSION_1_2 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3D")) == NULL) || r; - r = ((glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElements")) == NULL) || r; - r = ((glTexImage3D = (PFNGLTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexImage3D")) == NULL) || r; - r = ((glTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3D")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_1_2 */ - -#ifdef GL_VERSION_1_3 - -static GLboolean _glewInit_GL_VERSION_1_3 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glActiveTexture = (PFNGLACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glActiveTexture")) == NULL) || r; - r = ((glClientActiveTexture = (PFNGLCLIENTACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTexture")) == NULL) || r; - r = ((glCompressedTexImage1D = (PFNGLCOMPRESSEDTEXIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1D")) == NULL) || r; - r = ((glCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2D")) == NULL) || r; - r = ((glCompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3D")) == NULL) || r; - r = ((glCompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1D")) == NULL) || r; - r = ((glCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2D")) == NULL) || r; - r = ((glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3D")) == NULL) || r; - r = ((glGetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImage")) == NULL) || r; - r = ((glLoadTransposeMatrixd = (PFNGLLOADTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixd")) == NULL) || r; - r = ((glLoadTransposeMatrixf = (PFNGLLOADTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixf")) == NULL) || r; - r = ((glMultTransposeMatrixd = (PFNGLMULTTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixd")) == NULL) || r; - r = ((glMultTransposeMatrixf = (PFNGLMULTTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixf")) == NULL) || r; - r = ((glMultiTexCoord1d = (PFNGLMULTITEXCOORD1DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1d")) == NULL) || r; - r = ((glMultiTexCoord1dv = (PFNGLMULTITEXCOORD1DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dv")) == NULL) || r; - r = ((glMultiTexCoord1f = (PFNGLMULTITEXCOORD1FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1f")) == NULL) || r; - r = ((glMultiTexCoord1fv = (PFNGLMULTITEXCOORD1FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fv")) == NULL) || r; - r = ((glMultiTexCoord1i = (PFNGLMULTITEXCOORD1IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1i")) == NULL) || r; - r = ((glMultiTexCoord1iv = (PFNGLMULTITEXCOORD1IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iv")) == NULL) || r; - r = ((glMultiTexCoord1s = (PFNGLMULTITEXCOORD1SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1s")) == NULL) || r; - r = ((glMultiTexCoord1sv = (PFNGLMULTITEXCOORD1SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sv")) == NULL) || r; - r = ((glMultiTexCoord2d = (PFNGLMULTITEXCOORD2DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2d")) == NULL) || r; - r = ((glMultiTexCoord2dv = (PFNGLMULTITEXCOORD2DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dv")) == NULL) || r; - r = ((glMultiTexCoord2f = (PFNGLMULTITEXCOORD2FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2f")) == NULL) || r; - r = ((glMultiTexCoord2fv = (PFNGLMULTITEXCOORD2FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fv")) == NULL) || r; - r = ((glMultiTexCoord2i = (PFNGLMULTITEXCOORD2IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2i")) == NULL) || r; - r = ((glMultiTexCoord2iv = (PFNGLMULTITEXCOORD2IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iv")) == NULL) || r; - r = ((glMultiTexCoord2s = (PFNGLMULTITEXCOORD2SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2s")) == NULL) || r; - r = ((glMultiTexCoord2sv = (PFNGLMULTITEXCOORD2SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sv")) == NULL) || r; - r = ((glMultiTexCoord3d = (PFNGLMULTITEXCOORD3DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3d")) == NULL) || r; - r = ((glMultiTexCoord3dv = (PFNGLMULTITEXCOORD3DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dv")) == NULL) || r; - r = ((glMultiTexCoord3f = (PFNGLMULTITEXCOORD3FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3f")) == NULL) || r; - r = ((glMultiTexCoord3fv = (PFNGLMULTITEXCOORD3FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fv")) == NULL) || r; - r = ((glMultiTexCoord3i = (PFNGLMULTITEXCOORD3IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3i")) == NULL) || r; - r = ((glMultiTexCoord3iv = (PFNGLMULTITEXCOORD3IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iv")) == NULL) || r; - r = ((glMultiTexCoord3s = (PFNGLMULTITEXCOORD3SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3s")) == NULL) || r; - r = ((glMultiTexCoord3sv = (PFNGLMULTITEXCOORD3SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sv")) == NULL) || r; - r = ((glMultiTexCoord4d = (PFNGLMULTITEXCOORD4DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4d")) == NULL) || r; - r = ((glMultiTexCoord4dv = (PFNGLMULTITEXCOORD4DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dv")) == NULL) || r; - r = ((glMultiTexCoord4f = (PFNGLMULTITEXCOORD4FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4f")) == NULL) || r; - r = ((glMultiTexCoord4fv = (PFNGLMULTITEXCOORD4FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fv")) == NULL) || r; - r = ((glMultiTexCoord4i = (PFNGLMULTITEXCOORD4IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4i")) == NULL) || r; - r = ((glMultiTexCoord4iv = (PFNGLMULTITEXCOORD4IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iv")) == NULL) || r; - r = ((glMultiTexCoord4s = (PFNGLMULTITEXCOORD4SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4s")) == NULL) || r; - r = ((glMultiTexCoord4sv = (PFNGLMULTITEXCOORD4SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sv")) == NULL) || r; - r = ((glSampleCoverage = (PFNGLSAMPLECOVERAGEPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverage")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_1_3 */ - -#ifdef GL_VERSION_1_4 - -static GLboolean _glewInit_GL_VERSION_1_4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendColor = (PFNGLBLENDCOLORPROC)glewGetProcAddress((const GLubyte*)"glBlendColor")) == NULL) || r; - r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r; - r = ((glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparate")) == NULL) || r; - r = ((glFogCoordPointer = (PFNGLFOGCOORDPOINTERPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointer")) == NULL) || r; - r = ((glFogCoordd = (PFNGLFOGCOORDDPROC)glewGetProcAddress((const GLubyte*)"glFogCoordd")) == NULL) || r; - r = ((glFogCoorddv = (PFNGLFOGCOORDDVPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddv")) == NULL) || r; - r = ((glFogCoordf = (PFNGLFOGCOORDFPROC)glewGetProcAddress((const GLubyte*)"glFogCoordf")) == NULL) || r; - r = ((glFogCoordfv = (PFNGLFOGCOORDFVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfv")) == NULL) || r; - r = ((glMultiDrawArrays = (PFNGLMULTIDRAWARRAYSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArrays")) == NULL) || r; - r = ((glMultiDrawElements = (PFNGLMULTIDRAWELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElements")) == NULL) || r; - r = ((glPointParameterf = (PFNGLPOINTPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glPointParameterf")) == NULL) || r; - r = ((glPointParameterfv = (PFNGLPOINTPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfv")) == NULL) || r; - r = ((glPointParameteri = (PFNGLPOINTPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glPointParameteri")) == NULL) || r; - r = ((glPointParameteriv = (PFNGLPOINTPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glPointParameteriv")) == NULL) || r; - r = ((glSecondaryColor3b = (PFNGLSECONDARYCOLOR3BPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3b")) == NULL) || r; - r = ((glSecondaryColor3bv = (PFNGLSECONDARYCOLOR3BVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bv")) == NULL) || r; - r = ((glSecondaryColor3d = (PFNGLSECONDARYCOLOR3DPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3d")) == NULL) || r; - r = ((glSecondaryColor3dv = (PFNGLSECONDARYCOLOR3DVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dv")) == NULL) || r; - r = ((glSecondaryColor3f = (PFNGLSECONDARYCOLOR3FPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3f")) == NULL) || r; - r = ((glSecondaryColor3fv = (PFNGLSECONDARYCOLOR3FVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fv")) == NULL) || r; - r = ((glSecondaryColor3i = (PFNGLSECONDARYCOLOR3IPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3i")) == NULL) || r; - r = ((glSecondaryColor3iv = (PFNGLSECONDARYCOLOR3IVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iv")) == NULL) || r; - r = ((glSecondaryColor3s = (PFNGLSECONDARYCOLOR3SPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3s")) == NULL) || r; - r = ((glSecondaryColor3sv = (PFNGLSECONDARYCOLOR3SVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sv")) == NULL) || r; - r = ((glSecondaryColor3ub = (PFNGLSECONDARYCOLOR3UBPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ub")) == NULL) || r; - r = ((glSecondaryColor3ubv = (PFNGLSECONDARYCOLOR3UBVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubv")) == NULL) || r; - r = ((glSecondaryColor3ui = (PFNGLSECONDARYCOLOR3UIPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ui")) == NULL) || r; - r = ((glSecondaryColor3uiv = (PFNGLSECONDARYCOLOR3UIVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiv")) == NULL) || r; - r = ((glSecondaryColor3us = (PFNGLSECONDARYCOLOR3USPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3us")) == NULL) || r; - r = ((glSecondaryColor3usv = (PFNGLSECONDARYCOLOR3USVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usv")) == NULL) || r; - r = ((glSecondaryColorPointer = (PFNGLSECONDARYCOLORPOINTERPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointer")) == NULL) || r; - r = ((glWindowPos2d = (PFNGLWINDOWPOS2DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2d")) == NULL) || r; - r = ((glWindowPos2dv = (PFNGLWINDOWPOS2DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dv")) == NULL) || r; - r = ((glWindowPos2f = (PFNGLWINDOWPOS2FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2f")) == NULL) || r; - r = ((glWindowPos2fv = (PFNGLWINDOWPOS2FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fv")) == NULL) || r; - r = ((glWindowPos2i = (PFNGLWINDOWPOS2IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2i")) == NULL) || r; - r = ((glWindowPos2iv = (PFNGLWINDOWPOS2IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iv")) == NULL) || r; - r = ((glWindowPos2s = (PFNGLWINDOWPOS2SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2s")) == NULL) || r; - r = ((glWindowPos2sv = (PFNGLWINDOWPOS2SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sv")) == NULL) || r; - r = ((glWindowPos3d = (PFNGLWINDOWPOS3DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3d")) == NULL) || r; - r = ((glWindowPos3dv = (PFNGLWINDOWPOS3DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dv")) == NULL) || r; - r = ((glWindowPos3f = (PFNGLWINDOWPOS3FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3f")) == NULL) || r; - r = ((glWindowPos3fv = (PFNGLWINDOWPOS3FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fv")) == NULL) || r; - r = ((glWindowPos3i = (PFNGLWINDOWPOS3IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3i")) == NULL) || r; - r = ((glWindowPos3iv = (PFNGLWINDOWPOS3IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iv")) == NULL) || r; - r = ((glWindowPos3s = (PFNGLWINDOWPOS3SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3s")) == NULL) || r; - r = ((glWindowPos3sv = (PFNGLWINDOWPOS3SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sv")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_1_4 */ - -#ifdef GL_VERSION_1_5 - -static GLboolean _glewInit_GL_VERSION_1_5 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginQuery = (PFNGLBEGINQUERYPROC)glewGetProcAddress((const GLubyte*)"glBeginQuery")) == NULL) || r; - r = ((glBindBuffer = (PFNGLBINDBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindBuffer")) == NULL) || r; - r = ((glBufferData = (PFNGLBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferData")) == NULL) || r; - r = ((glBufferSubData = (PFNGLBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferSubData")) == NULL) || r; - r = ((glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffers")) == NULL) || r; - r = ((glDeleteQueries = (PFNGLDELETEQUERIESPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueries")) == NULL) || r; - r = ((glEndQuery = (PFNGLENDQUERYPROC)glewGetProcAddress((const GLubyte*)"glEndQuery")) == NULL) || r; - r = ((glGenBuffers = (PFNGLGENBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenBuffers")) == NULL) || r; - r = ((glGenQueries = (PFNGLGENQUERIESPROC)glewGetProcAddress((const GLubyte*)"glGenQueries")) == NULL) || r; - r = ((glGetBufferParameteriv = (PFNGLGETBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameteriv")) == NULL) || r; - r = ((glGetBufferPointerv = (PFNGLGETBUFFERPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointerv")) == NULL) || r; - r = ((glGetBufferSubData = (PFNGLGETBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubData")) == NULL) || r; - r = ((glGetQueryObjectiv = (PFNGLGETQUERYOBJECTIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectiv")) == NULL) || r; - r = ((glGetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuiv")) == NULL) || r; - r = ((glGetQueryiv = (PFNGLGETQUERYIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryiv")) == NULL) || r; - r = ((glIsBuffer = (PFNGLISBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsBuffer")) == NULL) || r; - r = ((glIsQuery = (PFNGLISQUERYPROC)glewGetProcAddress((const GLubyte*)"glIsQuery")) == NULL) || r; - r = ((glMapBuffer = (PFNGLMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glMapBuffer")) == NULL) || r; - r = ((glUnmapBuffer = (PFNGLUNMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glUnmapBuffer")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_1_5 */ - -#ifdef GL_VERSION_2_0 - -static GLboolean _glewInit_GL_VERSION_2_0 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAttachShader = (PFNGLATTACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glAttachShader")) == NULL) || r; - r = ((glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocation")) == NULL) || r; - r = ((glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparate")) == NULL) || r; - r = ((glCompileShader = (PFNGLCOMPILESHADERPROC)glewGetProcAddress((const GLubyte*)"glCompileShader")) == NULL) || r; - r = ((glCreateProgram = (PFNGLCREATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glCreateProgram")) == NULL) || r; - r = ((glCreateShader = (PFNGLCREATESHADERPROC)glewGetProcAddress((const GLubyte*)"glCreateShader")) == NULL) || r; - r = ((glDeleteProgram = (PFNGLDELETEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgram")) == NULL) || r; - r = ((glDeleteShader = (PFNGLDELETESHADERPROC)glewGetProcAddress((const GLubyte*)"glDeleteShader")) == NULL) || r; - r = ((glDetachShader = (PFNGLDETACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glDetachShader")) == NULL) || r; - r = ((glDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArray")) == NULL) || r; - r = ((glDrawBuffers = (PFNGLDRAWBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffers")) == NULL) || r; - r = ((glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArray")) == NULL) || r; - r = ((glGetActiveAttrib = (PFNGLGETACTIVEATTRIBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttrib")) == NULL) || r; - r = ((glGetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniform")) == NULL) || r; - r = ((glGetAttachedShaders = (PFNGLGETATTACHEDSHADERSPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedShaders")) == NULL) || r; - r = ((glGetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocation")) == NULL) || r; - r = ((glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetProgramInfoLog")) == NULL) || r; - r = ((glGetProgramiv = (PFNGLGETPROGRAMIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramiv")) == NULL) || r; - r = ((glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetShaderInfoLog")) == NULL) || r; - r = ((glGetShaderSource = (PFNGLGETSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSource")) == NULL) || r; - r = ((glGetShaderiv = (PFNGLGETSHADERIVPROC)glewGetProcAddress((const GLubyte*)"glGetShaderiv")) == NULL) || r; - r = ((glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocation")) == NULL) || r; - r = ((glGetUniformfv = (PFNGLGETUNIFORMFVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfv")) == NULL) || r; - r = ((glGetUniformiv = (PFNGLGETUNIFORMIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformiv")) == NULL) || r; - r = ((glGetVertexAttribPointerv = (PFNGLGETVERTEXATTRIBPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointerv")) == NULL) || r; - r = ((glGetVertexAttribdv = (PFNGLGETVERTEXATTRIBDVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdv")) == NULL) || r; - r = ((glGetVertexAttribfv = (PFNGLGETVERTEXATTRIBFVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfv")) == NULL) || r; - r = ((glGetVertexAttribiv = (PFNGLGETVERTEXATTRIBIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribiv")) == NULL) || r; - r = ((glIsProgram = (PFNGLISPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glIsProgram")) == NULL) || r; - r = ((glIsShader = (PFNGLISSHADERPROC)glewGetProcAddress((const GLubyte*)"glIsShader")) == NULL) || r; - r = ((glLinkProgram = (PFNGLLINKPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glLinkProgram")) == NULL) || r; - r = ((glShaderSource = (PFNGLSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glShaderSource")) == NULL) || r; - r = ((glStencilFuncSeparate = (PFNGLSTENCILFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparate")) == NULL) || r; - r = ((glStencilMaskSeparate = (PFNGLSTENCILMASKSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilMaskSeparate")) == NULL) || r; - r = ((glStencilOpSeparate = (PFNGLSTENCILOPSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparate")) == NULL) || r; - r = ((glUniform1f = (PFNGLUNIFORM1FPROC)glewGetProcAddress((const GLubyte*)"glUniform1f")) == NULL) || r; - r = ((glUniform1fv = (PFNGLUNIFORM1FVPROC)glewGetProcAddress((const GLubyte*)"glUniform1fv")) == NULL) || r; - r = ((glUniform1i = (PFNGLUNIFORM1IPROC)glewGetProcAddress((const GLubyte*)"glUniform1i")) == NULL) || r; - r = ((glUniform1iv = (PFNGLUNIFORM1IVPROC)glewGetProcAddress((const GLubyte*)"glUniform1iv")) == NULL) || r; - r = ((glUniform2f = (PFNGLUNIFORM2FPROC)glewGetProcAddress((const GLubyte*)"glUniform2f")) == NULL) || r; - r = ((glUniform2fv = (PFNGLUNIFORM2FVPROC)glewGetProcAddress((const GLubyte*)"glUniform2fv")) == NULL) || r; - r = ((glUniform2i = (PFNGLUNIFORM2IPROC)glewGetProcAddress((const GLubyte*)"glUniform2i")) == NULL) || r; - r = ((glUniform2iv = (PFNGLUNIFORM2IVPROC)glewGetProcAddress((const GLubyte*)"glUniform2iv")) == NULL) || r; - r = ((glUniform3f = (PFNGLUNIFORM3FPROC)glewGetProcAddress((const GLubyte*)"glUniform3f")) == NULL) || r; - r = ((glUniform3fv = (PFNGLUNIFORM3FVPROC)glewGetProcAddress((const GLubyte*)"glUniform3fv")) == NULL) || r; - r = ((glUniform3i = (PFNGLUNIFORM3IPROC)glewGetProcAddress((const GLubyte*)"glUniform3i")) == NULL) || r; - r = ((glUniform3iv = (PFNGLUNIFORM3IVPROC)glewGetProcAddress((const GLubyte*)"glUniform3iv")) == NULL) || r; - r = ((glUniform4f = (PFNGLUNIFORM4FPROC)glewGetProcAddress((const GLubyte*)"glUniform4f")) == NULL) || r; - r = ((glUniform4fv = (PFNGLUNIFORM4FVPROC)glewGetProcAddress((const GLubyte*)"glUniform4fv")) == NULL) || r; - r = ((glUniform4i = (PFNGLUNIFORM4IPROC)glewGetProcAddress((const GLubyte*)"glUniform4i")) == NULL) || r; - r = ((glUniform4iv = (PFNGLUNIFORM4IVPROC)glewGetProcAddress((const GLubyte*)"glUniform4iv")) == NULL) || r; - r = ((glUniformMatrix2fv = (PFNGLUNIFORMMATRIX2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fv")) == NULL) || r; - r = ((glUniformMatrix3fv = (PFNGLUNIFORMMATRIX3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fv")) == NULL) || r; - r = ((glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fv")) == NULL) || r; - r = ((glUseProgram = (PFNGLUSEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glUseProgram")) == NULL) || r; - r = ((glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glValidateProgram")) == NULL) || r; - r = ((glVertexAttrib1d = (PFNGLVERTEXATTRIB1DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1d")) == NULL) || r; - r = ((glVertexAttrib1dv = (PFNGLVERTEXATTRIB1DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dv")) == NULL) || r; - r = ((glVertexAttrib1f = (PFNGLVERTEXATTRIB1FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1f")) == NULL) || r; - r = ((glVertexAttrib1fv = (PFNGLVERTEXATTRIB1FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fv")) == NULL) || r; - r = ((glVertexAttrib1s = (PFNGLVERTEXATTRIB1SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1s")) == NULL) || r; - r = ((glVertexAttrib1sv = (PFNGLVERTEXATTRIB1SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sv")) == NULL) || r; - r = ((glVertexAttrib2d = (PFNGLVERTEXATTRIB2DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2d")) == NULL) || r; - r = ((glVertexAttrib2dv = (PFNGLVERTEXATTRIB2DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dv")) == NULL) || r; - r = ((glVertexAttrib2f = (PFNGLVERTEXATTRIB2FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2f")) == NULL) || r; - r = ((glVertexAttrib2fv = (PFNGLVERTEXATTRIB2FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fv")) == NULL) || r; - r = ((glVertexAttrib2s = (PFNGLVERTEXATTRIB2SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2s")) == NULL) || r; - r = ((glVertexAttrib2sv = (PFNGLVERTEXATTRIB2SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sv")) == NULL) || r; - r = ((glVertexAttrib3d = (PFNGLVERTEXATTRIB3DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3d")) == NULL) || r; - r = ((glVertexAttrib3dv = (PFNGLVERTEXATTRIB3DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dv")) == NULL) || r; - r = ((glVertexAttrib3f = (PFNGLVERTEXATTRIB3FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3f")) == NULL) || r; - r = ((glVertexAttrib3fv = (PFNGLVERTEXATTRIB3FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fv")) == NULL) || r; - r = ((glVertexAttrib3s = (PFNGLVERTEXATTRIB3SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3s")) == NULL) || r; - r = ((glVertexAttrib3sv = (PFNGLVERTEXATTRIB3SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sv")) == NULL) || r; - r = ((glVertexAttrib4Nbv = (PFNGLVERTEXATTRIB4NBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nbv")) == NULL) || r; - r = ((glVertexAttrib4Niv = (PFNGLVERTEXATTRIB4NIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Niv")) == NULL) || r; - r = ((glVertexAttrib4Nsv = (PFNGLVERTEXATTRIB4NSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nsv")) == NULL) || r; - r = ((glVertexAttrib4Nub = (PFNGLVERTEXATTRIB4NUBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nub")) == NULL) || r; - r = ((glVertexAttrib4Nubv = (PFNGLVERTEXATTRIB4NUBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nubv")) == NULL) || r; - r = ((glVertexAttrib4Nuiv = (PFNGLVERTEXATTRIB4NUIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nuiv")) == NULL) || r; - r = ((glVertexAttrib4Nusv = (PFNGLVERTEXATTRIB4NUSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nusv")) == NULL) || r; - r = ((glVertexAttrib4bv = (PFNGLVERTEXATTRIB4BVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bv")) == NULL) || r; - r = ((glVertexAttrib4d = (PFNGLVERTEXATTRIB4DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4d")) == NULL) || r; - r = ((glVertexAttrib4dv = (PFNGLVERTEXATTRIB4DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dv")) == NULL) || r; - r = ((glVertexAttrib4f = (PFNGLVERTEXATTRIB4FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4f")) == NULL) || r; - r = ((glVertexAttrib4fv = (PFNGLVERTEXATTRIB4FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fv")) == NULL) || r; - r = ((glVertexAttrib4iv = (PFNGLVERTEXATTRIB4IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4iv")) == NULL) || r; - r = ((glVertexAttrib4s = (PFNGLVERTEXATTRIB4SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4s")) == NULL) || r; - r = ((glVertexAttrib4sv = (PFNGLVERTEXATTRIB4SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sv")) == NULL) || r; - r = ((glVertexAttrib4ubv = (PFNGLVERTEXATTRIB4UBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubv")) == NULL) || r; - r = ((glVertexAttrib4uiv = (PFNGLVERTEXATTRIB4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uiv")) == NULL) || r; - r = ((glVertexAttrib4usv = (PFNGLVERTEXATTRIB4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usv")) == NULL) || r; - r = ((glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointer")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_2_0 */ - -#ifdef GL_VERSION_2_1 - -static GLboolean _glewInit_GL_VERSION_2_1 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glUniformMatrix2x3fv = (PFNGLUNIFORMMATRIX2X3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x3fv")) == NULL) || r; - r = ((glUniformMatrix2x4fv = (PFNGLUNIFORMMATRIX2X4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x4fv")) == NULL) || r; - r = ((glUniformMatrix3x2fv = (PFNGLUNIFORMMATRIX3X2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x2fv")) == NULL) || r; - r = ((glUniformMatrix3x4fv = (PFNGLUNIFORMMATRIX3X4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x4fv")) == NULL) || r; - r = ((glUniformMatrix4x2fv = (PFNGLUNIFORMMATRIX4X2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x2fv")) == NULL) || r; - r = ((glUniformMatrix4x3fv = (PFNGLUNIFORMMATRIX4X3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x3fv")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_2_1 */ - -#ifdef GL_VERSION_3_0 - -static GLboolean _glewInit_GL_VERSION_3_0 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginConditionalRender = (PFNGLBEGINCONDITIONALRENDERPROC)glewGetProcAddress((const GLubyte*)"glBeginConditionalRender")) == NULL) || r; - r = ((glBeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedback")) == NULL) || r; - r = ((glBindBufferBase = (PFNGLBINDBUFFERBASEPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBase")) == NULL) || r; - r = ((glBindBufferRange = (PFNGLBINDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRange")) == NULL) || r; - r = ((glBindFragDataLocation = (PFNGLBINDFRAGDATALOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocation")) == NULL) || r; - r = ((glClampColor = (PFNGLCLAMPCOLORPROC)glewGetProcAddress((const GLubyte*)"glClampColor")) == NULL) || r; - r = ((glClearBufferfi = (PFNGLCLEARBUFFERFIPROC)glewGetProcAddress((const GLubyte*)"glClearBufferfi")) == NULL) || r; - r = ((glClearBufferfv = (PFNGLCLEARBUFFERFVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferfv")) == NULL) || r; - r = ((glClearBufferiv = (PFNGLCLEARBUFFERIVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferiv")) == NULL) || r; - r = ((glClearBufferuiv = (PFNGLCLEARBUFFERUIVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferuiv")) == NULL) || r; - r = ((glColorMaski = (PFNGLCOLORMASKIPROC)glewGetProcAddress((const GLubyte*)"glColorMaski")) == NULL) || r; - r = ((glDisablei = (PFNGLDISABLEIPROC)glewGetProcAddress((const GLubyte*)"glDisablei")) == NULL) || r; - r = ((glEnablei = (PFNGLENABLEIPROC)glewGetProcAddress((const GLubyte*)"glEnablei")) == NULL) || r; - r = ((glEndConditionalRender = (PFNGLENDCONDITIONALRENDERPROC)glewGetProcAddress((const GLubyte*)"glEndConditionalRender")) == NULL) || r; - r = ((glEndTransformFeedback = (PFNGLENDTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedback")) == NULL) || r; - r = ((glGetBooleani_v = (PFNGLGETBOOLEANI_VPROC)glewGetProcAddress((const GLubyte*)"glGetBooleani_v")) == NULL) || r; - r = ((glGetFragDataLocation = (PFNGLGETFRAGDATALOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataLocation")) == NULL) || r; - r = ((glGetIntegeri_v = (PFNGLGETINTEGERI_VPROC)glewGetProcAddress((const GLubyte*)"glGetIntegeri_v")) == NULL) || r; - r = ((glGetStringi = (PFNGLGETSTRINGIPROC)glewGetProcAddress((const GLubyte*)"glGetStringi")) == NULL) || r; - r = ((glGetTexParameterIiv = (PFNGLGETTEXPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIiv")) == NULL) || r; - r = ((glGetTexParameterIuiv = (PFNGLGETTEXPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIuiv")) == NULL) || r; - r = ((glGetTransformFeedbackVarying = (PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVarying")) == NULL) || r; - r = ((glGetUniformuiv = (PFNGLGETUNIFORMUIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformuiv")) == NULL) || r; - r = ((glGetVertexAttribIiv = (PFNGLGETVERTEXATTRIBIIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIiv")) == NULL) || r; - r = ((glGetVertexAttribIuiv = (PFNGLGETVERTEXATTRIBIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIuiv")) == NULL) || r; - r = ((glIsEnabledi = (PFNGLISENABLEDIPROC)glewGetProcAddress((const GLubyte*)"glIsEnabledi")) == NULL) || r; - r = ((glTexParameterIiv = (PFNGLTEXPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIiv")) == NULL) || r; - r = ((glTexParameterIuiv = (PFNGLTEXPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIuiv")) == NULL) || r; - r = ((glTransformFeedbackVaryings = (PFNGLTRANSFORMFEEDBACKVARYINGSPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryings")) == NULL) || r; - r = ((glUniform1ui = (PFNGLUNIFORM1UIPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui")) == NULL) || r; - r = ((glUniform1uiv = (PFNGLUNIFORM1UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform1uiv")) == NULL) || r; - r = ((glUniform2ui = (PFNGLUNIFORM2UIPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui")) == NULL) || r; - r = ((glUniform2uiv = (PFNGLUNIFORM2UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform2uiv")) == NULL) || r; - r = ((glUniform3ui = (PFNGLUNIFORM3UIPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui")) == NULL) || r; - r = ((glUniform3uiv = (PFNGLUNIFORM3UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform3uiv")) == NULL) || r; - r = ((glUniform4ui = (PFNGLUNIFORM4UIPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui")) == NULL) || r; - r = ((glUniform4uiv = (PFNGLUNIFORM4UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform4uiv")) == NULL) || r; - r = ((glVertexAttribI1i = (PFNGLVERTEXATTRIBI1IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1i")) == NULL) || r; - r = ((glVertexAttribI1iv = (PFNGLVERTEXATTRIBI1IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1iv")) == NULL) || r; - r = ((glVertexAttribI1ui = (PFNGLVERTEXATTRIBI1UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1ui")) == NULL) || r; - r = ((glVertexAttribI1uiv = (PFNGLVERTEXATTRIBI1UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uiv")) == NULL) || r; - r = ((glVertexAttribI2i = (PFNGLVERTEXATTRIBI2IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2i")) == NULL) || r; - r = ((glVertexAttribI2iv = (PFNGLVERTEXATTRIBI2IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2iv")) == NULL) || r; - r = ((glVertexAttribI2ui = (PFNGLVERTEXATTRIBI2UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2ui")) == NULL) || r; - r = ((glVertexAttribI2uiv = (PFNGLVERTEXATTRIBI2UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uiv")) == NULL) || r; - r = ((glVertexAttribI3i = (PFNGLVERTEXATTRIBI3IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3i")) == NULL) || r; - r = ((glVertexAttribI3iv = (PFNGLVERTEXATTRIBI3IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3iv")) == NULL) || r; - r = ((glVertexAttribI3ui = (PFNGLVERTEXATTRIBI3UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3ui")) == NULL) || r; - r = ((glVertexAttribI3uiv = (PFNGLVERTEXATTRIBI3UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uiv")) == NULL) || r; - r = ((glVertexAttribI4bv = (PFNGLVERTEXATTRIBI4BVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4bv")) == NULL) || r; - r = ((glVertexAttribI4i = (PFNGLVERTEXATTRIBI4IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4i")) == NULL) || r; - r = ((glVertexAttribI4iv = (PFNGLVERTEXATTRIBI4IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4iv")) == NULL) || r; - r = ((glVertexAttribI4sv = (PFNGLVERTEXATTRIBI4SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4sv")) == NULL) || r; - r = ((glVertexAttribI4ubv = (PFNGLVERTEXATTRIBI4UBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ubv")) == NULL) || r; - r = ((glVertexAttribI4ui = (PFNGLVERTEXATTRIBI4UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ui")) == NULL) || r; - r = ((glVertexAttribI4uiv = (PFNGLVERTEXATTRIBI4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uiv")) == NULL) || r; - r = ((glVertexAttribI4usv = (PFNGLVERTEXATTRIBI4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4usv")) == NULL) || r; - r = ((glVertexAttribIPointer = (PFNGLVERTEXATTRIBIPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIPointer")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_3_0 */ - -#ifdef GL_3DFX_multisample - -#endif /* GL_3DFX_multisample */ - -#ifdef GL_3DFX_tbuffer - -static GLboolean _glewInit_GL_3DFX_tbuffer (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTbufferMask3DFX = (PFNGLTBUFFERMASK3DFXPROC)glewGetProcAddress((const GLubyte*)"glTbufferMask3DFX")) == NULL) || r; - - return r; -} - -#endif /* GL_3DFX_tbuffer */ - -#ifdef GL_3DFX_texture_compression_FXT1 - -#endif /* GL_3DFX_texture_compression_FXT1 */ - -#ifdef GL_APPLE_client_storage - -#endif /* GL_APPLE_client_storage */ - -#ifdef GL_APPLE_element_array - -static GLboolean _glewInit_GL_APPLE_element_array (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawElementArrayAPPLE = (PFNGLDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayAPPLE")) == NULL) || r; - r = ((glDrawRangeElementArrayAPPLE = (PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayAPPLE")) == NULL) || r; - r = ((glElementPointerAPPLE = (PFNGLELEMENTPOINTERAPPLEPROC)glewGetProcAddress((const GLubyte*)"glElementPointerAPPLE")) == NULL) || r; - r = ((glMultiDrawElementArrayAPPLE = (PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementArrayAPPLE")) == NULL) || r; - r = ((glMultiDrawRangeElementArrayAPPLE = (PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawRangeElementArrayAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_element_array */ - -#ifdef GL_APPLE_fence - -static GLboolean _glewInit_GL_APPLE_fence (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDeleteFencesAPPLE = (PFNGLDELETEFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesAPPLE")) == NULL) || r; - r = ((glFinishFenceAPPLE = (PFNGLFINISHFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceAPPLE")) == NULL) || r; - r = ((glFinishObjectAPPLE = (PFNGLFINISHOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishObjectAPPLE")) == NULL) || r; - r = ((glGenFencesAPPLE = (PFNGLGENFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenFencesAPPLE")) == NULL) || r; - r = ((glIsFenceAPPLE = (PFNGLISFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsFenceAPPLE")) == NULL) || r; - r = ((glSetFenceAPPLE = (PFNGLSETFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glSetFenceAPPLE")) == NULL) || r; - r = ((glTestFenceAPPLE = (PFNGLTESTFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestFenceAPPLE")) == NULL) || r; - r = ((glTestObjectAPPLE = (PFNGLTESTOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestObjectAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_fence */ - -#ifdef GL_APPLE_float_pixels - -#endif /* GL_APPLE_float_pixels */ - -#ifdef GL_APPLE_flush_buffer_range - -static GLboolean _glewInit_GL_APPLE_flush_buffer_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBufferParameteriAPPLE = (PFNGLBUFFERPARAMETERIAPPLEPROC)glewGetProcAddress((const GLubyte*)"glBufferParameteriAPPLE")) == NULL) || r; - r = ((glFlushMappedBufferRangeAPPLE = (PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedBufferRangeAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_flush_buffer_range */ - -#ifdef GL_APPLE_pixel_buffer - -#endif /* GL_APPLE_pixel_buffer */ - -#ifdef GL_APPLE_specular_vector - -#endif /* GL_APPLE_specular_vector */ - -#ifdef GL_APPLE_texture_range - -static GLboolean _glewInit_GL_APPLE_texture_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetTexParameterPointervAPPLE = (PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterPointervAPPLE")) == NULL) || r; - r = ((glTextureRangeAPPLE = (PFNGLTEXTURERANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTextureRangeAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_texture_range */ - -#ifdef GL_APPLE_transform_hint - -#endif /* GL_APPLE_transform_hint */ - -#ifdef GL_APPLE_vertex_array_object - -static GLboolean _glewInit_GL_APPLE_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindVertexArrayAPPLE = (PFNGLBINDVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArrayAPPLE")) == NULL) || r; - r = ((glDeleteVertexArraysAPPLE = (PFNGLDELETEVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArraysAPPLE")) == NULL) || r; - r = ((glGenVertexArraysAPPLE = (PFNGLGENVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArraysAPPLE")) == NULL) || r; - r = ((glIsVertexArrayAPPLE = (PFNGLISVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArrayAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_vertex_array_object */ - -#ifdef GL_APPLE_vertex_array_range - -static GLboolean _glewInit_GL_APPLE_vertex_array_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushVertexArrayRangeAPPLE = (PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeAPPLE")) == NULL) || r; - r = ((glVertexArrayParameteriAPPLE = (PFNGLVERTEXARRAYPARAMETERIAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayParameteriAPPLE")) == NULL) || r; - r = ((glVertexArrayRangeAPPLE = (PFNGLVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_vertex_array_range */ - -#ifdef GL_APPLE_ycbcr_422 - -#endif /* GL_APPLE_ycbcr_422 */ - -#ifdef GL_ARB_color_buffer_float - -static GLboolean _glewInit_GL_ARB_color_buffer_float (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClampColorARB = (PFNGLCLAMPCOLORARBPROC)glewGetProcAddress((const GLubyte*)"glClampColorARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_color_buffer_float */ - -#ifdef GL_ARB_depth_buffer_float - -#endif /* GL_ARB_depth_buffer_float */ - -#ifdef GL_ARB_depth_texture - -#endif /* GL_ARB_depth_texture */ - -#ifdef GL_ARB_draw_buffers - -static GLboolean _glewInit_GL_ARB_draw_buffers (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawBuffersARB = (PFNGLDRAWBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_draw_buffers */ - -#ifdef GL_ARB_draw_instanced - -static GLboolean _glewInit_GL_ARB_draw_instanced (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawArraysInstancedARB = (PFNGLDRAWARRAYSINSTANCEDARBPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedARB")) == NULL) || r; - r = ((glDrawElementsInstancedARB = (PFNGLDRAWELEMENTSINSTANCEDARBPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_draw_instanced */ - -#ifdef GL_ARB_fragment_program - -#endif /* GL_ARB_fragment_program */ - -#ifdef GL_ARB_fragment_program_shadow - -#endif /* GL_ARB_fragment_program_shadow */ - -#ifdef GL_ARB_fragment_shader - -#endif /* GL_ARB_fragment_shader */ - -#ifdef GL_ARB_framebuffer_object - -static GLboolean _glewInit_GL_ARB_framebuffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindFramebuffer")) == NULL) || r; - r = ((glBindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindRenderbuffer")) == NULL) || r; - r = ((glBlitFramebuffer = (PFNGLBLITFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebuffer")) == NULL) || r; - r = ((glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC)glewGetProcAddress((const GLubyte*)"glCheckFramebufferStatus")) == NULL) || r; - r = ((glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffers")) == NULL) || r; - r = ((glDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffers")) == NULL) || r; - r = ((glFramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbuffer")) == NULL) || r; - r = ((glFramebufferTexturLayer = (PFNGLFRAMEBUFFERTEXTURLAYERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexturLayer")) == NULL) || r; - r = ((glFramebufferTexture1D = (PFNGLFRAMEBUFFERTEXTURE1DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1D")) == NULL) || r; - r = ((glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2D")) == NULL) || r; - r = ((glFramebufferTexture3D = (PFNGLFRAMEBUFFERTEXTURE3DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3D")) == NULL) || r; - r = ((glGenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenFramebuffers")) == NULL) || r; - r = ((glGenRenderbuffers = (PFNGLGENRENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenRenderbuffers")) == NULL) || r; - r = ((glGenerateMipmap = (PFNGLGENERATEMIPMAPPROC)glewGetProcAddress((const GLubyte*)"glGenerateMipmap")) == NULL) || r; - r = ((glGetFramebufferAttachmentParameteriv = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferAttachmentParameteriv")) == NULL) || r; - r = ((glGetRenderbufferParameteriv = (PFNGLGETRENDERBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetRenderbufferParameteriv")) == NULL) || r; - r = ((glIsFramebuffer = (PFNGLISFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsFramebuffer")) == NULL) || r; - r = ((glIsRenderbuffer = (PFNGLISRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsRenderbuffer")) == NULL) || r; - r = ((glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorage")) == NULL) || r; - r = ((glRenderbufferStorageMultisample = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisample")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_framebuffer_object */ - -#ifdef GL_ARB_framebuffer_sRGB - -#endif /* GL_ARB_framebuffer_sRGB */ - -#ifdef GL_ARB_geometry_shader4 - -static GLboolean _glewInit_GL_ARB_geometry_shader4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFramebufferTextureARB = (PFNGLFRAMEBUFFERTEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureARB")) == NULL) || r; - r = ((glFramebufferTextureFaceARB = (PFNGLFRAMEBUFFERTEXTUREFACEARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureFaceARB")) == NULL) || r; - r = ((glFramebufferTextureLayerARB = (PFNGLFRAMEBUFFERTEXTURELAYERARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayerARB")) == NULL) || r; - r = ((glProgramParameteriARB = (PFNGLPROGRAMPARAMETERIARBPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteriARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_geometry_shader4 */ - -#ifdef GL_ARB_half_float_pixel - -#endif /* GL_ARB_half_float_pixel */ - -#ifdef GL_ARB_half_float_vertex - -#endif /* GL_ARB_half_float_vertex */ - -#ifdef GL_ARB_imaging - -static GLboolean _glewInit_GL_ARB_imaging (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r; - r = ((glColorSubTable = (PFNGLCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorSubTable")) == NULL) || r; - r = ((glColorTable = (PFNGLCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorTable")) == NULL) || r; - r = ((glColorTableParameterfv = (PFNGLCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfv")) == NULL) || r; - r = ((glColorTableParameteriv = (PFNGLCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameteriv")) == NULL) || r; - r = ((glConvolutionFilter1D = (PFNGLCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1D")) == NULL) || r; - r = ((glConvolutionFilter2D = (PFNGLCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2D")) == NULL) || r; - r = ((glConvolutionParameterf = (PFNGLCONVOLUTIONPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterf")) == NULL) || r; - r = ((glConvolutionParameterfv = (PFNGLCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfv")) == NULL) || r; - r = ((glConvolutionParameteri = (PFNGLCONVOLUTIONPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteri")) == NULL) || r; - r = ((glConvolutionParameteriv = (PFNGLCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriv")) == NULL) || r; - r = ((glCopyColorSubTable = (PFNGLCOPYCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTable")) == NULL) || r; - r = ((glCopyColorTable = (PFNGLCOPYCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTable")) == NULL) || r; - r = ((glCopyConvolutionFilter1D = (PFNGLCOPYCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1D")) == NULL) || r; - r = ((glCopyConvolutionFilter2D = (PFNGLCOPYCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2D")) == NULL) || r; - r = ((glGetColorTable = (PFNGLGETCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glGetColorTable")) == NULL) || r; - r = ((glGetColorTableParameterfv = (PFNGLGETCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfv")) == NULL) || r; - r = ((glGetColorTableParameteriv = (PFNGLGETCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameteriv")) == NULL) || r; - r = ((glGetConvolutionFilter = (PFNGLGETCONVOLUTIONFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilter")) == NULL) || r; - r = ((glGetConvolutionParameterfv = (PFNGLGETCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfv")) == NULL) || r; - r = ((glGetConvolutionParameteriv = (PFNGLGETCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameteriv")) == NULL) || r; - r = ((glGetHistogram = (PFNGLGETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glGetHistogram")) == NULL) || r; - r = ((glGetHistogramParameterfv = (PFNGLGETHISTOGRAMPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfv")) == NULL) || r; - r = ((glGetHistogramParameteriv = (PFNGLGETHISTOGRAMPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameteriv")) == NULL) || r; - r = ((glGetMinmax = (PFNGLGETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glGetMinmax")) == NULL) || r; - r = ((glGetMinmaxParameterfv = (PFNGLGETMINMAXPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfv")) == NULL) || r; - r = ((glGetMinmaxParameteriv = (PFNGLGETMINMAXPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameteriv")) == NULL) || r; - r = ((glGetSeparableFilter = (PFNGLGETSEPARABLEFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilter")) == NULL) || r; - r = ((glHistogram = (PFNGLHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glHistogram")) == NULL) || r; - r = ((glMinmax = (PFNGLMINMAXPROC)glewGetProcAddress((const GLubyte*)"glMinmax")) == NULL) || r; - r = ((glResetHistogram = (PFNGLRESETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glResetHistogram")) == NULL) || r; - r = ((glResetMinmax = (PFNGLRESETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glResetMinmax")) == NULL) || r; - r = ((glSeparableFilter2D = (PFNGLSEPARABLEFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2D")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_imaging */ - -#ifdef GL_ARB_instanced_arrays - -static GLboolean _glewInit_GL_ARB_instanced_arrays (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glVertexAttribDivisorARB = (PFNGLVERTEXATTRIBDIVISORARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribDivisorARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_instanced_arrays */ - -#ifdef GL_ARB_map_buffer_range - -static GLboolean _glewInit_GL_ARB_map_buffer_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedBufferRange")) == NULL) || r; - r = ((glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glMapBufferRange")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_map_buffer_range */ - -#ifdef GL_ARB_matrix_palette - -static GLboolean _glewInit_GL_ARB_matrix_palette (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCurrentPaletteMatrixARB = (PFNGLCURRENTPALETTEMATRIXARBPROC)glewGetProcAddress((const GLubyte*)"glCurrentPaletteMatrixARB")) == NULL) || r; - r = ((glMatrixIndexPointerARB = (PFNGLMATRIXINDEXPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexPointerARB")) == NULL) || r; - r = ((glMatrixIndexubvARB = (PFNGLMATRIXINDEXUBVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexubvARB")) == NULL) || r; - r = ((glMatrixIndexuivARB = (PFNGLMATRIXINDEXUIVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexuivARB")) == NULL) || r; - r = ((glMatrixIndexusvARB = (PFNGLMATRIXINDEXUSVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexusvARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_matrix_palette */ - -#ifdef GL_ARB_multisample - -static GLboolean _glewInit_GL_ARB_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSampleCoverageARB = (PFNGLSAMPLECOVERAGEARBPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverageARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_multisample */ - -#ifdef GL_ARB_multitexture - -static GLboolean _glewInit_GL_ARB_multitexture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glActiveTextureARB")) == NULL) || r; - r = ((glClientActiveTextureARB = (PFNGLCLIENTACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTextureARB")) == NULL) || r; - r = ((glMultiTexCoord1dARB = (PFNGLMULTITEXCOORD1DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dARB")) == NULL) || r; - r = ((glMultiTexCoord1dvARB = (PFNGLMULTITEXCOORD1DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dvARB")) == NULL) || r; - r = ((glMultiTexCoord1fARB = (PFNGLMULTITEXCOORD1FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fARB")) == NULL) || r; - r = ((glMultiTexCoord1fvARB = (PFNGLMULTITEXCOORD1FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fvARB")) == NULL) || r; - r = ((glMultiTexCoord1iARB = (PFNGLMULTITEXCOORD1IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iARB")) == NULL) || r; - r = ((glMultiTexCoord1ivARB = (PFNGLMULTITEXCOORD1IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1ivARB")) == NULL) || r; - r = ((glMultiTexCoord1sARB = (PFNGLMULTITEXCOORD1SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sARB")) == NULL) || r; - r = ((glMultiTexCoord1svARB = (PFNGLMULTITEXCOORD1SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1svARB")) == NULL) || r; - r = ((glMultiTexCoord2dARB = (PFNGLMULTITEXCOORD2DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dARB")) == NULL) || r; - r = ((glMultiTexCoord2dvARB = (PFNGLMULTITEXCOORD2DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dvARB")) == NULL) || r; - r = ((glMultiTexCoord2fARB = (PFNGLMULTITEXCOORD2FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fARB")) == NULL) || r; - r = ((glMultiTexCoord2fvARB = (PFNGLMULTITEXCOORD2FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fvARB")) == NULL) || r; - r = ((glMultiTexCoord2iARB = (PFNGLMULTITEXCOORD2IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iARB")) == NULL) || r; - r = ((glMultiTexCoord2ivARB = (PFNGLMULTITEXCOORD2IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2ivARB")) == NULL) || r; - r = ((glMultiTexCoord2sARB = (PFNGLMULTITEXCOORD2SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sARB")) == NULL) || r; - r = ((glMultiTexCoord2svARB = (PFNGLMULTITEXCOORD2SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2svARB")) == NULL) || r; - r = ((glMultiTexCoord3dARB = (PFNGLMULTITEXCOORD3DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dARB")) == NULL) || r; - r = ((glMultiTexCoord3dvARB = (PFNGLMULTITEXCOORD3DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dvARB")) == NULL) || r; - r = ((glMultiTexCoord3fARB = (PFNGLMULTITEXCOORD3FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fARB")) == NULL) || r; - r = ((glMultiTexCoord3fvARB = (PFNGLMULTITEXCOORD3FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fvARB")) == NULL) || r; - r = ((glMultiTexCoord3iARB = (PFNGLMULTITEXCOORD3IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iARB")) == NULL) || r; - r = ((glMultiTexCoord3ivARB = (PFNGLMULTITEXCOORD3IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3ivARB")) == NULL) || r; - r = ((glMultiTexCoord3sARB = (PFNGLMULTITEXCOORD3SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sARB")) == NULL) || r; - r = ((glMultiTexCoord3svARB = (PFNGLMULTITEXCOORD3SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3svARB")) == NULL) || r; - r = ((glMultiTexCoord4dARB = (PFNGLMULTITEXCOORD4DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dARB")) == NULL) || r; - r = ((glMultiTexCoord4dvARB = (PFNGLMULTITEXCOORD4DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dvARB")) == NULL) || r; - r = ((glMultiTexCoord4fARB = (PFNGLMULTITEXCOORD4FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fARB")) == NULL) || r; - r = ((glMultiTexCoord4fvARB = (PFNGLMULTITEXCOORD4FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fvARB")) == NULL) || r; - r = ((glMultiTexCoord4iARB = (PFNGLMULTITEXCOORD4IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iARB")) == NULL) || r; - r = ((glMultiTexCoord4ivARB = (PFNGLMULTITEXCOORD4IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4ivARB")) == NULL) || r; - r = ((glMultiTexCoord4sARB = (PFNGLMULTITEXCOORD4SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sARB")) == NULL) || r; - r = ((glMultiTexCoord4svARB = (PFNGLMULTITEXCOORD4SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4svARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_multitexture */ - -#ifdef GL_ARB_occlusion_query - -static GLboolean _glewInit_GL_ARB_occlusion_query (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginQueryARB = (PFNGLBEGINQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glBeginQueryARB")) == NULL) || r; - r = ((glDeleteQueriesARB = (PFNGLDELETEQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueriesARB")) == NULL) || r; - r = ((glEndQueryARB = (PFNGLENDQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glEndQueryARB")) == NULL) || r; - r = ((glGenQueriesARB = (PFNGLGENQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glGenQueriesARB")) == NULL) || r; - r = ((glGetQueryObjectivARB = (PFNGLGETQUERYOBJECTIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectivARB")) == NULL) || r; - r = ((glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuivARB")) == NULL) || r; - r = ((glGetQueryivARB = (PFNGLGETQUERYIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryivARB")) == NULL) || r; - r = ((glIsQueryARB = (PFNGLISQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glIsQueryARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_occlusion_query */ - -#ifdef GL_ARB_pixel_buffer_object - -#endif /* GL_ARB_pixel_buffer_object */ - -#ifdef GL_ARB_point_parameters - -static GLboolean _glewInit_GL_ARB_point_parameters (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfARB")) == NULL) || r; - r = ((glPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_point_parameters */ - -#ifdef GL_ARB_point_sprite - -#endif /* GL_ARB_point_sprite */ - -#ifdef GL_ARB_shader_objects - -static GLboolean _glewInit_GL_ARB_shader_objects (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glAttachObjectARB")) == NULL) || r; - r = ((glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)glewGetProcAddress((const GLubyte*)"glCompileShaderARB")) == NULL) || r; - r = ((glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateProgramObjectARB")) == NULL) || r; - r = ((glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateShaderObjectARB")) == NULL) || r; - r = ((glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteObjectARB")) == NULL) || r; - r = ((glDetachObjectARB = (PFNGLDETACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDetachObjectARB")) == NULL) || r; - r = ((glGetActiveUniformARB = (PFNGLGETACTIVEUNIFORMARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformARB")) == NULL) || r; - r = ((glGetAttachedObjectsARB = (PFNGLGETATTACHEDOBJECTSARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedObjectsARB")) == NULL) || r; - r = ((glGetHandleARB = (PFNGLGETHANDLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetHandleARB")) == NULL) || r; - r = ((glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC)glewGetProcAddress((const GLubyte*)"glGetInfoLogARB")) == NULL) || r; - r = ((glGetObjectParameterfvARB = (PFNGLGETOBJECTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterfvARB")) == NULL) || r; - r = ((glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterivARB")) == NULL) || r; - r = ((glGetShaderSourceARB = (PFNGLGETSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSourceARB")) == NULL) || r; - r = ((glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocationARB")) == NULL) || r; - r = ((glGetUniformfvARB = (PFNGLGETUNIFORMFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfvARB")) == NULL) || r; - r = ((glGetUniformivARB = (PFNGLGETUNIFORMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformivARB")) == NULL) || r; - r = ((glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glLinkProgramARB")) == NULL) || r; - r = ((glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glShaderSourceARB")) == NULL) || r; - r = ((glUniform1fARB = (PFNGLUNIFORM1FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fARB")) == NULL) || r; - r = ((glUniform1fvARB = (PFNGLUNIFORM1FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fvARB")) == NULL) || r; - r = ((glUniform1iARB = (PFNGLUNIFORM1IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1iARB")) == NULL) || r; - r = ((glUniform1ivARB = (PFNGLUNIFORM1IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1ivARB")) == NULL) || r; - r = ((glUniform2fARB = (PFNGLUNIFORM2FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fARB")) == NULL) || r; - r = ((glUniform2fvARB = (PFNGLUNIFORM2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fvARB")) == NULL) || r; - r = ((glUniform2iARB = (PFNGLUNIFORM2IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2iARB")) == NULL) || r; - r = ((glUniform2ivARB = (PFNGLUNIFORM2IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2ivARB")) == NULL) || r; - r = ((glUniform3fARB = (PFNGLUNIFORM3FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fARB")) == NULL) || r; - r = ((glUniform3fvARB = (PFNGLUNIFORM3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fvARB")) == NULL) || r; - r = ((glUniform3iARB = (PFNGLUNIFORM3IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3iARB")) == NULL) || r; - r = ((glUniform3ivARB = (PFNGLUNIFORM3IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3ivARB")) == NULL) || r; - r = ((glUniform4fARB = (PFNGLUNIFORM4FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fARB")) == NULL) || r; - r = ((glUniform4fvARB = (PFNGLUNIFORM4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fvARB")) == NULL) || r; - r = ((glUniform4iARB = (PFNGLUNIFORM4IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4iARB")) == NULL) || r; - r = ((glUniform4ivARB = (PFNGLUNIFORM4IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4ivARB")) == NULL) || r; - r = ((glUniformMatrix2fvARB = (PFNGLUNIFORMMATRIX2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fvARB")) == NULL) || r; - r = ((glUniformMatrix3fvARB = (PFNGLUNIFORMMATRIX3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fvARB")) == NULL) || r; - r = ((glUniformMatrix4fvARB = (PFNGLUNIFORMMATRIX4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fvARB")) == NULL) || r; - r = ((glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glUseProgramObjectARB")) == NULL) || r; - r = ((glValidateProgramARB = (PFNGLVALIDATEPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glValidateProgramARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_shader_objects */ - -#ifdef GL_ARB_shading_language_100 - -#endif /* GL_ARB_shading_language_100 */ - -#ifdef GL_ARB_shadow - -#endif /* GL_ARB_shadow */ - -#ifdef GL_ARB_shadow_ambient - -#endif /* GL_ARB_shadow_ambient */ - -#ifdef GL_ARB_texture_border_clamp - -#endif /* GL_ARB_texture_border_clamp */ - -#ifdef GL_ARB_texture_buffer_object - -static GLboolean _glewInit_GL_ARB_texture_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexBufferARB = (PFNGLTEXBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glTexBufferARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_texture_buffer_object */ - -#ifdef GL_ARB_texture_compression - -static GLboolean _glewInit_GL_ARB_texture_compression (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCompressedTexImage1DARB = (PFNGLCOMPRESSEDTEXIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1DARB")) == NULL) || r; - r = ((glCompressedTexImage2DARB = (PFNGLCOMPRESSEDTEXIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2DARB")) == NULL) || r; - r = ((glCompressedTexImage3DARB = (PFNGLCOMPRESSEDTEXIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3DARB")) == NULL) || r; - r = ((glCompressedTexSubImage1DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1DARB")) == NULL) || r; - r = ((glCompressedTexSubImage2DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2DARB")) == NULL) || r; - r = ((glCompressedTexSubImage3DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3DARB")) == NULL) || r; - r = ((glGetCompressedTexImageARB = (PFNGLGETCOMPRESSEDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImageARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_texture_compression */ - -#ifdef GL_ARB_texture_compression_rgtc - -#endif /* GL_ARB_texture_compression_rgtc */ - -#ifdef GL_ARB_texture_cube_map - -#endif /* GL_ARB_texture_cube_map */ - -#ifdef GL_ARB_texture_env_add - -#endif /* GL_ARB_texture_env_add */ - -#ifdef GL_ARB_texture_env_combine - -#endif /* GL_ARB_texture_env_combine */ - -#ifdef GL_ARB_texture_env_crossbar - -#endif /* GL_ARB_texture_env_crossbar */ - -#ifdef GL_ARB_texture_env_dot3 - -#endif /* GL_ARB_texture_env_dot3 */ - -#ifdef GL_ARB_texture_float - -#endif /* GL_ARB_texture_float */ - -#ifdef GL_ARB_texture_mirrored_repeat - -#endif /* GL_ARB_texture_mirrored_repeat */ - -#ifdef GL_ARB_texture_non_power_of_two - -#endif /* GL_ARB_texture_non_power_of_two */ - -#ifdef GL_ARB_texture_rectangle - -#endif /* GL_ARB_texture_rectangle */ - -#ifdef GL_ARB_texture_rg - -#endif /* GL_ARB_texture_rg */ - -#ifdef GL_ARB_transpose_matrix - -static GLboolean _glewInit_GL_ARB_transpose_matrix (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glLoadTransposeMatrixdARB = (PFNGLLOADTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixdARB")) == NULL) || r; - r = ((glLoadTransposeMatrixfARB = (PFNGLLOADTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixfARB")) == NULL) || r; - r = ((glMultTransposeMatrixdARB = (PFNGLMULTTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixdARB")) == NULL) || r; - r = ((glMultTransposeMatrixfARB = (PFNGLMULTTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixfARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_transpose_matrix */ - -#ifdef GL_ARB_vertex_array_object - -static GLboolean _glewInit_GL_ARB_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArray")) == NULL) || r; - r = ((glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArrays")) == NULL) || r; - r = ((glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArrays")) == NULL) || r; - r = ((glIsVertexArray = (PFNGLISVERTEXARRAYPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArray")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_array_object */ - -#ifdef GL_ARB_vertex_blend - -static GLboolean _glewInit_GL_ARB_vertex_blend (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glVertexBlendARB = (PFNGLVERTEXBLENDARBPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendARB")) == NULL) || r; - r = ((glWeightPointerARB = (PFNGLWEIGHTPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glWeightPointerARB")) == NULL) || r; - r = ((glWeightbvARB = (PFNGLWEIGHTBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightbvARB")) == NULL) || r; - r = ((glWeightdvARB = (PFNGLWEIGHTDVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightdvARB")) == NULL) || r; - r = ((glWeightfvARB = (PFNGLWEIGHTFVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightfvARB")) == NULL) || r; - r = ((glWeightivARB = (PFNGLWEIGHTIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightivARB")) == NULL) || r; - r = ((glWeightsvARB = (PFNGLWEIGHTSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightsvARB")) == NULL) || r; - r = ((glWeightubvARB = (PFNGLWEIGHTUBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightubvARB")) == NULL) || r; - r = ((glWeightuivARB = (PFNGLWEIGHTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightuivARB")) == NULL) || r; - r = ((glWeightusvARB = (PFNGLWEIGHTUSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightusvARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_blend */ - -#ifdef GL_ARB_vertex_buffer_object - -static GLboolean _glewInit_GL_ARB_vertex_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindBufferARB = (PFNGLBINDBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glBindBufferARB")) == NULL) || r; - r = ((glBufferDataARB = (PFNGLBUFFERDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferDataARB")) == NULL) || r; - r = ((glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferSubDataARB")) == NULL) || r; - r = ((glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffersARB")) == NULL) || r; - r = ((glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glGenBuffersARB")) == NULL) || r; - r = ((glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameterivARB")) == NULL) || r; - r = ((glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointervARB")) == NULL) || r; - r = ((glGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubDataARB")) == NULL) || r; - r = ((glIsBufferARB = (PFNGLISBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glIsBufferARB")) == NULL) || r; - r = ((glMapBufferARB = (PFNGLMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glMapBufferARB")) == NULL) || r; - r = ((glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glUnmapBufferARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_buffer_object */ - -#ifdef GL_ARB_vertex_program - -static GLboolean _glewInit_GL_ARB_vertex_program (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindProgramARB = (PFNGLBINDPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glBindProgramARB")) == NULL) || r; - r = ((glDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsARB")) == NULL) || r; - r = ((glDisableVertexAttribArrayARB = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArrayARB")) == NULL) || r; - r = ((glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArrayARB")) == NULL) || r; - r = ((glGenProgramsARB = (PFNGLGENPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsARB")) == NULL) || r; - r = ((glGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterdvARB")) == NULL) || r; - r = ((glGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterfvARB")) == NULL) || r; - r = ((glGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterdvARB")) == NULL) || r; - r = ((glGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterfvARB")) == NULL) || r; - r = ((glGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringARB")) == NULL) || r; - r = ((glGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivARB")) == NULL) || r; - r = ((glGetVertexAttribPointervARB = (PFNGLGETVERTEXATTRIBPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervARB")) == NULL) || r; - r = ((glGetVertexAttribdvARB = (PFNGLGETVERTEXATTRIBDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvARB")) == NULL) || r; - r = ((glGetVertexAttribfvARB = (PFNGLGETVERTEXATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvARB")) == NULL) || r; - r = ((glGetVertexAttribivARB = (PFNGLGETVERTEXATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivARB")) == NULL) || r; - r = ((glIsProgramARB = (PFNGLISPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glIsProgramARB")) == NULL) || r; - r = ((glProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dARB")) == NULL) || r; - r = ((glProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dvARB")) == NULL) || r; - r = ((glProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fARB")) == NULL) || r; - r = ((glProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fvARB")) == NULL) || r; - r = ((glProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dARB")) == NULL) || r; - r = ((glProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dvARB")) == NULL) || r; - r = ((glProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fARB")) == NULL) || r; - r = ((glProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fvARB")) == NULL) || r; - r = ((glProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glProgramStringARB")) == NULL) || r; - r = ((glVertexAttrib1dARB = (PFNGLVERTEXATTRIB1DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dARB")) == NULL) || r; - r = ((glVertexAttrib1dvARB = (PFNGLVERTEXATTRIB1DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvARB")) == NULL) || r; - r = ((glVertexAttrib1fARB = (PFNGLVERTEXATTRIB1FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fARB")) == NULL) || r; - r = ((glVertexAttrib1fvARB = (PFNGLVERTEXATTRIB1FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvARB")) == NULL) || r; - r = ((glVertexAttrib1sARB = (PFNGLVERTEXATTRIB1SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sARB")) == NULL) || r; - r = ((glVertexAttrib1svARB = (PFNGLVERTEXATTRIB1SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svARB")) == NULL) || r; - r = ((glVertexAttrib2dARB = (PFNGLVERTEXATTRIB2DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dARB")) == NULL) || r; - r = ((glVertexAttrib2dvARB = (PFNGLVERTEXATTRIB2DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvARB")) == NULL) || r; - r = ((glVertexAttrib2fARB = (PFNGLVERTEXATTRIB2FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fARB")) == NULL) || r; - r = ((glVertexAttrib2fvARB = (PFNGLVERTEXATTRIB2FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvARB")) == NULL) || r; - r = ((glVertexAttrib2sARB = (PFNGLVERTEXATTRIB2SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sARB")) == NULL) || r; - r = ((glVertexAttrib2svARB = (PFNGLVERTEXATTRIB2SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svARB")) == NULL) || r; - r = ((glVertexAttrib3dARB = (PFNGLVERTEXATTRIB3DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dARB")) == NULL) || r; - r = ((glVertexAttrib3dvARB = (PFNGLVERTEXATTRIB3DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvARB")) == NULL) || r; - r = ((glVertexAttrib3fARB = (PFNGLVERTEXATTRIB3FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fARB")) == NULL) || r; - r = ((glVertexAttrib3fvARB = (PFNGLVERTEXATTRIB3FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvARB")) == NULL) || r; - r = ((glVertexAttrib3sARB = (PFNGLVERTEXATTRIB3SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sARB")) == NULL) || r; - r = ((glVertexAttrib3svARB = (PFNGLVERTEXATTRIB3SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svARB")) == NULL) || r; - r = ((glVertexAttrib4NbvARB = (PFNGLVERTEXATTRIB4NBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NbvARB")) == NULL) || r; - r = ((glVertexAttrib4NivARB = (PFNGLVERTEXATTRIB4NIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NivARB")) == NULL) || r; - r = ((glVertexAttrib4NsvARB = (PFNGLVERTEXATTRIB4NSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NsvARB")) == NULL) || r; - r = ((glVertexAttrib4NubARB = (PFNGLVERTEXATTRIB4NUBARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubARB")) == NULL) || r; - r = ((glVertexAttrib4NubvARB = (PFNGLVERTEXATTRIB4NUBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubvARB")) == NULL) || r; - r = ((glVertexAttrib4NuivARB = (PFNGLVERTEXATTRIB4NUIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NuivARB")) == NULL) || r; - r = ((glVertexAttrib4NusvARB = (PFNGLVERTEXATTRIB4NUSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NusvARB")) == NULL) || r; - r = ((glVertexAttrib4bvARB = (PFNGLVERTEXATTRIB4BVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bvARB")) == NULL) || r; - r = ((glVertexAttrib4dARB = (PFNGLVERTEXATTRIB4DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dARB")) == NULL) || r; - r = ((glVertexAttrib4dvARB = (PFNGLVERTEXATTRIB4DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvARB")) == NULL) || r; - r = ((glVertexAttrib4fARB = (PFNGLVERTEXATTRIB4FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fARB")) == NULL) || r; - r = ((glVertexAttrib4fvARB = (PFNGLVERTEXATTRIB4FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvARB")) == NULL) || r; - r = ((glVertexAttrib4ivARB = (PFNGLVERTEXATTRIB4IVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ivARB")) == NULL) || r; - r = ((glVertexAttrib4sARB = (PFNGLVERTEXATTRIB4SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sARB")) == NULL) || r; - r = ((glVertexAttrib4svARB = (PFNGLVERTEXATTRIB4SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svARB")) == NULL) || r; - r = ((glVertexAttrib4ubvARB = (PFNGLVERTEXATTRIB4UBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvARB")) == NULL) || r; - r = ((glVertexAttrib4uivARB = (PFNGLVERTEXATTRIB4UIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uivARB")) == NULL) || r; - r = ((glVertexAttrib4usvARB = (PFNGLVERTEXATTRIB4USVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usvARB")) == NULL) || r; - r = ((glVertexAttribPointerARB = (PFNGLVERTEXATTRIBPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_program */ - -#ifdef GL_ARB_vertex_shader - -static GLboolean _glewInit_GL_ARB_vertex_shader (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocationARB")) == NULL) || r; - r = ((glGetActiveAttribARB = (PFNGLGETACTIVEATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttribARB")) == NULL) || r; - r = ((glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocationARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_shader */ - -#ifdef GL_ARB_window_pos - -static GLboolean _glewInit_GL_ARB_window_pos (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glWindowPos2dARB = (PFNGLWINDOWPOS2DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dARB")) == NULL) || r; - r = ((glWindowPos2dvARB = (PFNGLWINDOWPOS2DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvARB")) == NULL) || r; - r = ((glWindowPos2fARB = (PFNGLWINDOWPOS2FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fARB")) == NULL) || r; - r = ((glWindowPos2fvARB = (PFNGLWINDOWPOS2FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvARB")) == NULL) || r; - r = ((glWindowPos2iARB = (PFNGLWINDOWPOS2IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iARB")) == NULL) || r; - r = ((glWindowPos2ivARB = (PFNGLWINDOWPOS2IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivARB")) == NULL) || r; - r = ((glWindowPos2sARB = (PFNGLWINDOWPOS2SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sARB")) == NULL) || r; - r = ((glWindowPos2svARB = (PFNGLWINDOWPOS2SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svARB")) == NULL) || r; - r = ((glWindowPos3dARB = (PFNGLWINDOWPOS3DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dARB")) == NULL) || r; - r = ((glWindowPos3dvARB = (PFNGLWINDOWPOS3DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvARB")) == NULL) || r; - r = ((glWindowPos3fARB = (PFNGLWINDOWPOS3FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fARB")) == NULL) || r; - r = ((glWindowPos3fvARB = (PFNGLWINDOWPOS3FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvARB")) == NULL) || r; - r = ((glWindowPos3iARB = (PFNGLWINDOWPOS3IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iARB")) == NULL) || r; - r = ((glWindowPos3ivARB = (PFNGLWINDOWPOS3IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivARB")) == NULL) || r; - r = ((glWindowPos3sARB = (PFNGLWINDOWPOS3SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sARB")) == NULL) || r; - r = ((glWindowPos3svARB = (PFNGLWINDOWPOS3SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_window_pos */ - -#ifdef GL_ATIX_point_sprites - -#endif /* GL_ATIX_point_sprites */ - -#ifdef GL_ATIX_texture_env_combine3 - -#endif /* GL_ATIX_texture_env_combine3 */ - -#ifdef GL_ATIX_texture_env_route - -#endif /* GL_ATIX_texture_env_route */ - -#ifdef GL_ATIX_vertex_shader_output_point_size - -#endif /* GL_ATIX_vertex_shader_output_point_size */ - -#ifdef GL_ATI_draw_buffers - -static GLboolean _glewInit_GL_ATI_draw_buffers (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawBuffersATI = (PFNGLDRAWBUFFERSATIPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_draw_buffers */ - -#ifdef GL_ATI_element_array - -static GLboolean _glewInit_GL_ATI_element_array (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawElementArrayATI = (PFNGLDRAWELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayATI")) == NULL) || r; - r = ((glDrawRangeElementArrayATI = (PFNGLDRAWRANGEELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayATI")) == NULL) || r; - r = ((glElementPointerATI = (PFNGLELEMENTPOINTERATIPROC)glewGetProcAddress((const GLubyte*)"glElementPointerATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_element_array */ - -#ifdef GL_ATI_envmap_bumpmap - -static GLboolean _glewInit_GL_ATI_envmap_bumpmap (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetTexBumpParameterfvATI = (PFNGLGETTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterfvATI")) == NULL) || r; - r = ((glGetTexBumpParameterivATI = (PFNGLGETTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterivATI")) == NULL) || r; - r = ((glTexBumpParameterfvATI = (PFNGLTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterfvATI")) == NULL) || r; - r = ((glTexBumpParameterivATI = (PFNGLTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterivATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_envmap_bumpmap */ - -#ifdef GL_ATI_fragment_shader - -static GLboolean _glewInit_GL_ATI_fragment_shader (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAlphaFragmentOp1ATI = (PFNGLALPHAFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp1ATI")) == NULL) || r; - r = ((glAlphaFragmentOp2ATI = (PFNGLALPHAFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp2ATI")) == NULL) || r; - r = ((glAlphaFragmentOp3ATI = (PFNGLALPHAFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp3ATI")) == NULL) || r; - r = ((glBeginFragmentShaderATI = (PFNGLBEGINFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBeginFragmentShaderATI")) == NULL) || r; - r = ((glBindFragmentShaderATI = (PFNGLBINDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBindFragmentShaderATI")) == NULL) || r; - r = ((glColorFragmentOp1ATI = (PFNGLCOLORFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp1ATI")) == NULL) || r; - r = ((glColorFragmentOp2ATI = (PFNGLCOLORFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp2ATI")) == NULL) || r; - r = ((glColorFragmentOp3ATI = (PFNGLCOLORFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp3ATI")) == NULL) || r; - r = ((glDeleteFragmentShaderATI = (PFNGLDELETEFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glDeleteFragmentShaderATI")) == NULL) || r; - r = ((glEndFragmentShaderATI = (PFNGLENDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glEndFragmentShaderATI")) == NULL) || r; - r = ((glGenFragmentShadersATI = (PFNGLGENFRAGMENTSHADERSATIPROC)glewGetProcAddress((const GLubyte*)"glGenFragmentShadersATI")) == NULL) || r; - r = ((glPassTexCoordATI = (PFNGLPASSTEXCOORDATIPROC)glewGetProcAddress((const GLubyte*)"glPassTexCoordATI")) == NULL) || r; - r = ((glSampleMapATI = (PFNGLSAMPLEMAPATIPROC)glewGetProcAddress((const GLubyte*)"glSampleMapATI")) == NULL) || r; - r = ((glSetFragmentShaderConstantATI = (PFNGLSETFRAGMENTSHADERCONSTANTATIPROC)glewGetProcAddress((const GLubyte*)"glSetFragmentShaderConstantATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_fragment_shader */ - -#ifdef GL_ATI_map_object_buffer - -static GLboolean _glewInit_GL_ATI_map_object_buffer (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glMapObjectBufferATI = (PFNGLMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glMapObjectBufferATI")) == NULL) || r; - r = ((glUnmapObjectBufferATI = (PFNGLUNMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUnmapObjectBufferATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_map_object_buffer */ - -#ifdef GL_ATI_pn_triangles - -static GLboolean _glewInit_GL_ATI_pn_triangles (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPNTrianglesfATI = (PFNGLPNTRIANGLESFATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesfATI")) == NULL) || r; - r = ((glPNTrianglesiATI = (PFNGLPNTRIANGLESIATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesiATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_pn_triangles */ - -#ifdef GL_ATI_separate_stencil - -static GLboolean _glewInit_GL_ATI_separate_stencil (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glStencilFuncSeparateATI = (PFNGLSTENCILFUNCSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparateATI")) == NULL) || r; - r = ((glStencilOpSeparateATI = (PFNGLSTENCILOPSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparateATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_separate_stencil */ - -#ifdef GL_ATI_shader_texture_lod - -#endif /* GL_ATI_shader_texture_lod */ - -#ifdef GL_ATI_text_fragment_shader - -#endif /* GL_ATI_text_fragment_shader */ - -#ifdef GL_ATI_texture_compression_3dc - -#endif /* GL_ATI_texture_compression_3dc */ - -#ifdef GL_ATI_texture_env_combine3 - -#endif /* GL_ATI_texture_env_combine3 */ - -#ifdef GL_ATI_texture_float - -#endif /* GL_ATI_texture_float */ - -#ifdef GL_ATI_texture_mirror_once - -#endif /* GL_ATI_texture_mirror_once */ - -#ifdef GL_ATI_vertex_array_object - -static GLboolean _glewInit_GL_ATI_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glArrayObjectATI = (PFNGLARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glArrayObjectATI")) == NULL) || r; - r = ((glFreeObjectBufferATI = (PFNGLFREEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glFreeObjectBufferATI")) == NULL) || r; - r = ((glGetArrayObjectfvATI = (PFNGLGETARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectfvATI")) == NULL) || r; - r = ((glGetArrayObjectivATI = (PFNGLGETARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectivATI")) == NULL) || r; - r = ((glGetObjectBufferfvATI = (PFNGLGETOBJECTBUFFERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferfvATI")) == NULL) || r; - r = ((glGetObjectBufferivATI = (PFNGLGETOBJECTBUFFERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferivATI")) == NULL) || r; - r = ((glGetVariantArrayObjectfvATI = (PFNGLGETVARIANTARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectfvATI")) == NULL) || r; - r = ((glGetVariantArrayObjectivATI = (PFNGLGETVARIANTARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectivATI")) == NULL) || r; - r = ((glIsObjectBufferATI = (PFNGLISOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glIsObjectBufferATI")) == NULL) || r; - r = ((glNewObjectBufferATI = (PFNGLNEWOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glNewObjectBufferATI")) == NULL) || r; - r = ((glUpdateObjectBufferATI = (PFNGLUPDATEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUpdateObjectBufferATI")) == NULL) || r; - r = ((glVariantArrayObjectATI = (PFNGLVARIANTARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVariantArrayObjectATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_vertex_array_object */ - -#ifdef GL_ATI_vertex_attrib_array_object - -static GLboolean _glewInit_GL_ATI_vertex_attrib_array_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetVertexAttribArrayObjectfvATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectfvATI")) == NULL) || r; - r = ((glGetVertexAttribArrayObjectivATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectivATI")) == NULL) || r; - r = ((glVertexAttribArrayObjectATI = (PFNGLVERTEXATTRIBARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribArrayObjectATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_vertex_attrib_array_object */ - -#ifdef GL_ATI_vertex_streams - -static GLboolean _glewInit_GL_ATI_vertex_streams (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClientActiveVertexStreamATI = (PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC)glewGetProcAddress((const GLubyte*)"glClientActiveVertexStreamATI")) == NULL) || r; - r = ((glNormalStream3bATI = (PFNGLNORMALSTREAM3BATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bATI")) == NULL) || r; - r = ((glNormalStream3bvATI = (PFNGLNORMALSTREAM3BVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bvATI")) == NULL) || r; - r = ((glNormalStream3dATI = (PFNGLNORMALSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dATI")) == NULL) || r; - r = ((glNormalStream3dvATI = (PFNGLNORMALSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dvATI")) == NULL) || r; - r = ((glNormalStream3fATI = (PFNGLNORMALSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fATI")) == NULL) || r; - r = ((glNormalStream3fvATI = (PFNGLNORMALSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fvATI")) == NULL) || r; - r = ((glNormalStream3iATI = (PFNGLNORMALSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3iATI")) == NULL) || r; - r = ((glNormalStream3ivATI = (PFNGLNORMALSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3ivATI")) == NULL) || r; - r = ((glNormalStream3sATI = (PFNGLNORMALSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3sATI")) == NULL) || r; - r = ((glNormalStream3svATI = (PFNGLNORMALSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3svATI")) == NULL) || r; - r = ((glVertexBlendEnvfATI = (PFNGLVERTEXBLENDENVFATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnvfATI")) == NULL) || r; - r = ((glVertexBlendEnviATI = (PFNGLVERTEXBLENDENVIATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnviATI")) == NULL) || r; - r = ((glVertexStream2dATI = (PFNGLVERTEXSTREAM2DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dATI")) == NULL) || r; - r = ((glVertexStream2dvATI = (PFNGLVERTEXSTREAM2DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dvATI")) == NULL) || r; - r = ((glVertexStream2fATI = (PFNGLVERTEXSTREAM2FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fATI")) == NULL) || r; - r = ((glVertexStream2fvATI = (PFNGLVERTEXSTREAM2FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fvATI")) == NULL) || r; - r = ((glVertexStream2iATI = (PFNGLVERTEXSTREAM2IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2iATI")) == NULL) || r; - r = ((glVertexStream2ivATI = (PFNGLVERTEXSTREAM2IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2ivATI")) == NULL) || r; - r = ((glVertexStream2sATI = (PFNGLVERTEXSTREAM2SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2sATI")) == NULL) || r; - r = ((glVertexStream2svATI = (PFNGLVERTEXSTREAM2SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2svATI")) == NULL) || r; - r = ((glVertexStream3dATI = (PFNGLVERTEXSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dATI")) == NULL) || r; - r = ((glVertexStream3dvATI = (PFNGLVERTEXSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dvATI")) == NULL) || r; - r = ((glVertexStream3fATI = (PFNGLVERTEXSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fATI")) == NULL) || r; - r = ((glVertexStream3fvATI = (PFNGLVERTEXSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fvATI")) == NULL) || r; - r = ((glVertexStream3iATI = (PFNGLVERTEXSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3iATI")) == NULL) || r; - r = ((glVertexStream3ivATI = (PFNGLVERTEXSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3ivATI")) == NULL) || r; - r = ((glVertexStream3sATI = (PFNGLVERTEXSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3sATI")) == NULL) || r; - r = ((glVertexStream3svATI = (PFNGLVERTEXSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3svATI")) == NULL) || r; - r = ((glVertexStream4dATI = (PFNGLVERTEXSTREAM4DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dATI")) == NULL) || r; - r = ((glVertexStream4dvATI = (PFNGLVERTEXSTREAM4DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dvATI")) == NULL) || r; - r = ((glVertexStream4fATI = (PFNGLVERTEXSTREAM4FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fATI")) == NULL) || r; - r = ((glVertexStream4fvATI = (PFNGLVERTEXSTREAM4FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fvATI")) == NULL) || r; - r = ((glVertexStream4iATI = (PFNGLVERTEXSTREAM4IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4iATI")) == NULL) || r; - r = ((glVertexStream4ivATI = (PFNGLVERTEXSTREAM4IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4ivATI")) == NULL) || r; - r = ((glVertexStream4sATI = (PFNGLVERTEXSTREAM4SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4sATI")) == NULL) || r; - r = ((glVertexStream4svATI = (PFNGLVERTEXSTREAM4SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4svATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_vertex_streams */ - -#ifdef GL_EXT_422_pixels - -#endif /* GL_EXT_422_pixels */ - -#ifdef GL_EXT_Cg_shader - -#endif /* GL_EXT_Cg_shader */ - -#ifdef GL_EXT_abgr - -#endif /* GL_EXT_abgr */ - -#ifdef GL_EXT_bgra - -#endif /* GL_EXT_bgra */ - -#ifdef GL_EXT_bindable_uniform - -static GLboolean _glewInit_GL_EXT_bindable_uniform (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetUniformBufferSizeEXT = (PFNGLGETUNIFORMBUFFERSIZEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformBufferSizeEXT")) == NULL) || r; - r = ((glGetUniformOffsetEXT = (PFNGLGETUNIFORMOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformOffsetEXT")) == NULL) || r; - r = ((glUniformBufferEXT = (PFNGLUNIFORMBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glUniformBufferEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_bindable_uniform */ - -#ifdef GL_EXT_blend_color - -static GLboolean _glewInit_GL_EXT_blend_color (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendColorEXT = (PFNGLBLENDCOLOREXTPROC)glewGetProcAddress((const GLubyte*)"glBlendColorEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_blend_color */ - -#ifdef GL_EXT_blend_equation_separate - -static GLboolean _glewInit_GL_EXT_blend_equation_separate (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendEquationSeparateEXT = (PFNGLBLENDEQUATIONSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_blend_equation_separate */ - -#ifdef GL_EXT_blend_func_separate - -static GLboolean _glewInit_GL_EXT_blend_func_separate (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_blend_func_separate */ - -#ifdef GL_EXT_blend_logic_op - -#endif /* GL_EXT_blend_logic_op */ - -#ifdef GL_EXT_blend_minmax - -static GLboolean _glewInit_GL_EXT_blend_minmax (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendEquationEXT = (PFNGLBLENDEQUATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_blend_minmax */ - -#ifdef GL_EXT_blend_subtract - -#endif /* GL_EXT_blend_subtract */ - -#ifdef GL_EXT_clip_volume_hint - -#endif /* GL_EXT_clip_volume_hint */ - -#ifdef GL_EXT_cmyka - -#endif /* GL_EXT_cmyka */ - -#ifdef GL_EXT_color_subtable - -static GLboolean _glewInit_GL_EXT_color_subtable (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorSubTableEXT = (PFNGLCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorSubTableEXT")) == NULL) || r; - r = ((glCopyColorSubTableEXT = (PFNGLCOPYCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTableEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_color_subtable */ - -#ifdef GL_EXT_compiled_vertex_array - -static GLboolean _glewInit_GL_EXT_compiled_vertex_array (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glLockArraysEXT = (PFNGLLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glLockArraysEXT")) == NULL) || r; - r = ((glUnlockArraysEXT = (PFNGLUNLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glUnlockArraysEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_compiled_vertex_array */ - -#ifdef GL_EXT_convolution - -static GLboolean _glewInit_GL_EXT_convolution (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glConvolutionFilter1DEXT = (PFNGLCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1DEXT")) == NULL) || r; - r = ((glConvolutionFilter2DEXT = (PFNGLCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2DEXT")) == NULL) || r; - r = ((glConvolutionParameterfEXT = (PFNGLCONVOLUTIONPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfEXT")) == NULL) || r; - r = ((glConvolutionParameterfvEXT = (PFNGLCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfvEXT")) == NULL) || r; - r = ((glConvolutionParameteriEXT = (PFNGLCONVOLUTIONPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriEXT")) == NULL) || r; - r = ((glConvolutionParameterivEXT = (PFNGLCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterivEXT")) == NULL) || r; - r = ((glCopyConvolutionFilter1DEXT = (PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1DEXT")) == NULL) || r; - r = ((glCopyConvolutionFilter2DEXT = (PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2DEXT")) == NULL) || r; - r = ((glGetConvolutionFilterEXT = (PFNGLGETCONVOLUTIONFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilterEXT")) == NULL) || r; - r = ((glGetConvolutionParameterfvEXT = (PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfvEXT")) == NULL) || r; - r = ((glGetConvolutionParameterivEXT = (PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterivEXT")) == NULL) || r; - r = ((glGetSeparableFilterEXT = (PFNGLGETSEPARABLEFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilterEXT")) == NULL) || r; - r = ((glSeparableFilter2DEXT = (PFNGLSEPARABLEFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2DEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_convolution */ - -#ifdef GL_EXT_coordinate_frame - -static GLboolean _glewInit_GL_EXT_coordinate_frame (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBinormalPointerEXT = (PFNGLBINORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glBinormalPointerEXT")) == NULL) || r; - r = ((glTangentPointerEXT = (PFNGLTANGENTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTangentPointerEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_coordinate_frame */ - -#ifdef GL_EXT_copy_texture - -static GLboolean _glewInit_GL_EXT_copy_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCopyTexImage1DEXT = (PFNGLCOPYTEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage1DEXT")) == NULL) || r; - r = ((glCopyTexImage2DEXT = (PFNGLCOPYTEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage2DEXT")) == NULL) || r; - r = ((glCopyTexSubImage1DEXT = (PFNGLCOPYTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage1DEXT")) == NULL) || r; - r = ((glCopyTexSubImage2DEXT = (PFNGLCOPYTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage2DEXT")) == NULL) || r; - r = ((glCopyTexSubImage3DEXT = (PFNGLCOPYTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3DEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_copy_texture */ - -#ifdef GL_EXT_cull_vertex - -static GLboolean _glewInit_GL_EXT_cull_vertex (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCullParameterdvEXT = (PFNGLCULLPARAMETERDVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterdvEXT")) == NULL) || r; - r = ((glCullParameterfvEXT = (PFNGLCULLPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterfvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_cull_vertex */ - -#ifdef GL_EXT_depth_bounds_test - -static GLboolean _glewInit_GL_EXT_depth_bounds_test (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDepthBoundsEXT = (PFNGLDEPTHBOUNDSEXTPROC)glewGetProcAddress((const GLubyte*)"glDepthBoundsEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_depth_bounds_test */ - -#ifdef GL_EXT_direct_state_access - -static GLboolean _glewInit_GL_EXT_direct_state_access (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindMultiTextureEXT = (PFNGLBINDMULTITEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindMultiTextureEXT")) == NULL) || r; - r = ((glCheckNamedFramebufferStatusEXT = (PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC)glewGetProcAddress((const GLubyte*)"glCheckNamedFramebufferStatusEXT")) == NULL) || r; - r = ((glClientAttribDefaultEXT = (PFNGLCLIENTATTRIBDEFAULTEXTPROC)glewGetProcAddress((const GLubyte*)"glClientAttribDefaultEXT")) == NULL) || r; - r = ((glCompressedMultiTexImage1DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage1DEXT")) == NULL) || r; - r = ((glCompressedMultiTexImage2DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage2DEXT")) == NULL) || r; - r = ((glCompressedMultiTexImage3DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage3DEXT")) == NULL) || r; - r = ((glCompressedMultiTexSubImage1DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage1DEXT")) == NULL) || r; - r = ((glCompressedMultiTexSubImage2DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage2DEXT")) == NULL) || r; - r = ((glCompressedMultiTexSubImage3DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage3DEXT")) == NULL) || r; - r = ((glCompressedTextureImage1DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage1DEXT")) == NULL) || r; - r = ((glCompressedTextureImage2DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage2DEXT")) == NULL) || r; - r = ((glCompressedTextureImage3DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage3DEXT")) == NULL) || r; - r = ((glCompressedTextureSubImage1DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage1DEXT")) == NULL) || r; - r = ((glCompressedTextureSubImage2DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage2DEXT")) == NULL) || r; - r = ((glCompressedTextureSubImage3DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage3DEXT")) == NULL) || r; - r = ((glCopyMultiTexImage1DEXT = (PFNGLCOPYMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexImage1DEXT")) == NULL) || r; - r = ((glCopyMultiTexImage2DEXT = (PFNGLCOPYMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexImage2DEXT")) == NULL) || r; - r = ((glCopyMultiTexSubImage1DEXT = (PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage1DEXT")) == NULL) || r; - r = ((glCopyMultiTexSubImage2DEXT = (PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage2DEXT")) == NULL) || r; - r = ((glCopyMultiTexSubImage3DEXT = (PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage3DEXT")) == NULL) || r; - r = ((glCopyTextureImage1DEXT = (PFNGLCOPYTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureImage1DEXT")) == NULL) || r; - r = ((glCopyTextureImage2DEXT = (PFNGLCOPYTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureImage2DEXT")) == NULL) || r; - r = ((glCopyTextureSubImage1DEXT = (PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage1DEXT")) == NULL) || r; - r = ((glCopyTextureSubImage2DEXT = (PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage2DEXT")) == NULL) || r; - r = ((glCopyTextureSubImage3DEXT = (PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage3DEXT")) == NULL) || r; - r = ((glDisableClientStateIndexedEXT = (PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableClientStateIndexedEXT")) == NULL) || r; - r = ((glEnableClientStateIndexedEXT = (PFNGLENABLECLIENTSTATEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableClientStateIndexedEXT")) == NULL) || r; - r = ((glFramebufferDrawBufferEXT = (PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferDrawBufferEXT")) == NULL) || r; - r = ((glFramebufferDrawBuffersEXT = (PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferDrawBuffersEXT")) == NULL) || r; - r = ((glFramebufferReadBufferEXT = (PFNGLFRAMEBUFFERREADBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferReadBufferEXT")) == NULL) || r; - r = ((glGenerateMultiTexMipmapEXT = (PFNGLGENERATEMULTITEXMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateMultiTexMipmapEXT")) == NULL) || r; - r = ((glGenerateTextureMipmapEXT = (PFNGLGENERATETEXTUREMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateTextureMipmapEXT")) == NULL) || r; - r = ((glGetCompressedMultiTexImageEXT = (PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedMultiTexImageEXT")) == NULL) || r; - r = ((glGetCompressedTextureImageEXT = (PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTextureImageEXT")) == NULL) || r; - r = ((glGetDoubleIndexedvEXT = (PFNGLGETDOUBLEINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetDoubleIndexedvEXT")) == NULL) || r; - r = ((glGetFloatIndexedvEXT = (PFNGLGETFLOATINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFloatIndexedvEXT")) == NULL) || r; - r = ((glGetFramebufferParameterivEXT = (PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferParameterivEXT")) == NULL) || r; - r = ((glGetMultiTexEnvfvEXT = (PFNGLGETMULTITEXENVFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexEnvfvEXT")) == NULL) || r; - r = ((glGetMultiTexEnvivEXT = (PFNGLGETMULTITEXENVIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexEnvivEXT")) == NULL) || r; - r = ((glGetMultiTexGendvEXT = (PFNGLGETMULTITEXGENDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGendvEXT")) == NULL) || r; - r = ((glGetMultiTexGenfvEXT = (PFNGLGETMULTITEXGENFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGenfvEXT")) == NULL) || r; - r = ((glGetMultiTexGenivEXT = (PFNGLGETMULTITEXGENIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGenivEXT")) == NULL) || r; - r = ((glGetMultiTexImageEXT = (PFNGLGETMULTITEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexImageEXT")) == NULL) || r; - r = ((glGetMultiTexLevelParameterfvEXT = (PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexLevelParameterfvEXT")) == NULL) || r; - r = ((glGetMultiTexLevelParameterivEXT = (PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexLevelParameterivEXT")) == NULL) || r; - r = ((glGetMultiTexParameterIivEXT = (PFNGLGETMULTITEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterIivEXT")) == NULL) || r; - r = ((glGetMultiTexParameterIuivEXT = (PFNGLGETMULTITEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterIuivEXT")) == NULL) || r; - r = ((glGetMultiTexParameterfvEXT = (PFNGLGETMULTITEXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterfvEXT")) == NULL) || r; - r = ((glGetMultiTexParameterivEXT = (PFNGLGETMULTITEXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterivEXT")) == NULL) || r; - r = ((glGetNamedBufferParameterivEXT = (PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferParameterivEXT")) == NULL) || r; - r = ((glGetNamedBufferPointervEXT = (PFNGLGETNAMEDBUFFERPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferPointervEXT")) == NULL) || r; - r = ((glGetNamedBufferSubDataEXT = (PFNGLGETNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferSubDataEXT")) == NULL) || r; - r = ((glGetNamedFramebufferAttachmentParameterivEXT = (PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedFramebufferAttachmentParameterivEXT")) == NULL) || r; - r = ((glGetNamedProgramLocalParameterIivEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterIivEXT")) == NULL) || r; - r = ((glGetNamedProgramLocalParameterIuivEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterIuivEXT")) == NULL) || r; - r = ((glGetNamedProgramLocalParameterdvEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterdvEXT")) == NULL) || r; - r = ((glGetNamedProgramLocalParameterfvEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterfvEXT")) == NULL) || r; - r = ((glGetNamedProgramStringEXT = (PFNGLGETNAMEDPROGRAMSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramStringEXT")) == NULL) || r; - r = ((glGetNamedProgramivEXT = (PFNGLGETNAMEDPROGRAMIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramivEXT")) == NULL) || r; - r = ((glGetNamedRenderbufferParameterivEXT = (PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedRenderbufferParameterivEXT")) == NULL) || r; - r = ((glGetPointerIndexedvEXT = (PFNGLGETPOINTERINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPointerIndexedvEXT")) == NULL) || r; - r = ((glGetTextureImageEXT = (PFNGLGETTEXTUREIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureImageEXT")) == NULL) || r; - r = ((glGetTextureLevelParameterfvEXT = (PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameterfvEXT")) == NULL) || r; - r = ((glGetTextureLevelParameterivEXT = (PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameterivEXT")) == NULL) || r; - r = ((glGetTextureParameterIivEXT = (PFNGLGETTEXTUREPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIivEXT")) == NULL) || r; - r = ((glGetTextureParameterIuivEXT = (PFNGLGETTEXTUREPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIuivEXT")) == NULL) || r; - r = ((glGetTextureParameterfvEXT = (PFNGLGETTEXTUREPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterfvEXT")) == NULL) || r; - r = ((glGetTextureParameterivEXT = (PFNGLGETTEXTUREPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterivEXT")) == NULL) || r; - r = ((glMapNamedBufferEXT = (PFNGLMAPNAMEDBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMapNamedBufferEXT")) == NULL) || r; - r = ((glMatrixFrustumEXT = (PFNGLMATRIXFRUSTUMEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixFrustumEXT")) == NULL) || r; - r = ((glMatrixLoadIdentityEXT = (PFNGLMATRIXLOADIDENTITYEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadIdentityEXT")) == NULL) || r; - r = ((glMatrixLoadTransposedEXT = (PFNGLMATRIXLOADTRANSPOSEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadTransposedEXT")) == NULL) || r; - r = ((glMatrixLoadTransposefEXT = (PFNGLMATRIXLOADTRANSPOSEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadTransposefEXT")) == NULL) || r; - r = ((glMatrixLoaddEXT = (PFNGLMATRIXLOADDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoaddEXT")) == NULL) || r; - r = ((glMatrixLoadfEXT = (PFNGLMATRIXLOADFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadfEXT")) == NULL) || r; - r = ((glMatrixMultTransposedEXT = (PFNGLMATRIXMULTTRANSPOSEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultTransposedEXT")) == NULL) || r; - r = ((glMatrixMultTransposefEXT = (PFNGLMATRIXMULTTRANSPOSEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultTransposefEXT")) == NULL) || r; - r = ((glMatrixMultdEXT = (PFNGLMATRIXMULTDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultdEXT")) == NULL) || r; - r = ((glMatrixMultfEXT = (PFNGLMATRIXMULTFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultfEXT")) == NULL) || r; - r = ((glMatrixOrthoEXT = (PFNGLMATRIXORTHOEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixOrthoEXT")) == NULL) || r; - r = ((glMatrixPopEXT = (PFNGLMATRIXPOPEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixPopEXT")) == NULL) || r; - r = ((glMatrixPushEXT = (PFNGLMATRIXPUSHEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixPushEXT")) == NULL) || r; - r = ((glMatrixRotatedEXT = (PFNGLMATRIXROTATEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixRotatedEXT")) == NULL) || r; - r = ((glMatrixRotatefEXT = (PFNGLMATRIXROTATEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixRotatefEXT")) == NULL) || r; - r = ((glMatrixScaledEXT = (PFNGLMATRIXSCALEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixScaledEXT")) == NULL) || r; - r = ((glMatrixScalefEXT = (PFNGLMATRIXSCALEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixScalefEXT")) == NULL) || r; - r = ((glMatrixTranslatedEXT = (PFNGLMATRIXTRANSLATEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixTranslatedEXT")) == NULL) || r; - r = ((glMatrixTranslatefEXT = (PFNGLMATRIXTRANSLATEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixTranslatefEXT")) == NULL) || r; - r = ((glMultiTexBufferEXT = (PFNGLMULTITEXBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexBufferEXT")) == NULL) || r; - r = ((glMultiTexCoordPointerEXT = (PFNGLMULTITEXCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordPointerEXT")) == NULL) || r; - r = ((glMultiTexEnvfEXT = (PFNGLMULTITEXENVFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvfEXT")) == NULL) || r; - r = ((glMultiTexEnvfvEXT = (PFNGLMULTITEXENVFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvfvEXT")) == NULL) || r; - r = ((glMultiTexEnviEXT = (PFNGLMULTITEXENVIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnviEXT")) == NULL) || r; - r = ((glMultiTexEnvivEXT = (PFNGLMULTITEXENVIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvivEXT")) == NULL) || r; - r = ((glMultiTexGendEXT = (PFNGLMULTITEXGENDEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGendEXT")) == NULL) || r; - r = ((glMultiTexGendvEXT = (PFNGLMULTITEXGENDVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGendvEXT")) == NULL) || r; - r = ((glMultiTexGenfEXT = (PFNGLMULTITEXGENFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenfEXT")) == NULL) || r; - r = ((glMultiTexGenfvEXT = (PFNGLMULTITEXGENFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenfvEXT")) == NULL) || r; - r = ((glMultiTexGeniEXT = (PFNGLMULTITEXGENIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGeniEXT")) == NULL) || r; - r = ((glMultiTexGenivEXT = (PFNGLMULTITEXGENIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenivEXT")) == NULL) || r; - r = ((glMultiTexImage1DEXT = (PFNGLMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage1DEXT")) == NULL) || r; - r = ((glMultiTexImage2DEXT = (PFNGLMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage2DEXT")) == NULL) || r; - r = ((glMultiTexImage3DEXT = (PFNGLMULTITEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage3DEXT")) == NULL) || r; - r = ((glMultiTexParameterIivEXT = (PFNGLMULTITEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterIivEXT")) == NULL) || r; - r = ((glMultiTexParameterIuivEXT = (PFNGLMULTITEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterIuivEXT")) == NULL) || r; - r = ((glMultiTexParameterfEXT = (PFNGLMULTITEXPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterfEXT")) == NULL) || r; - r = ((glMultiTexParameterfvEXT = (PFNGLMULTITEXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterfvEXT")) == NULL) || r; - r = ((glMultiTexParameteriEXT = (PFNGLMULTITEXPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameteriEXT")) == NULL) || r; - r = ((glMultiTexParameterivEXT = (PFNGLMULTITEXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterivEXT")) == NULL) || r; - r = ((glMultiTexRenderbufferEXT = (PFNGLMULTITEXRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexRenderbufferEXT")) == NULL) || r; - r = ((glMultiTexSubImage1DEXT = (PFNGLMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage1DEXT")) == NULL) || r; - r = ((glMultiTexSubImage2DEXT = (PFNGLMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage2DEXT")) == NULL) || r; - r = ((glMultiTexSubImage3DEXT = (PFNGLMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage3DEXT")) == NULL) || r; - r = ((glNamedBufferDataEXT = (PFNGLNAMEDBUFFERDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferDataEXT")) == NULL) || r; - r = ((glNamedBufferSubDataEXT = (PFNGLNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferSubDataEXT")) == NULL) || r; - r = ((glNamedFramebufferRenderbufferEXT = (PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferRenderbufferEXT")) == NULL) || r; - r = ((glNamedFramebufferTexture1DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture1DEXT")) == NULL) || r; - r = ((glNamedFramebufferTexture2DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture2DEXT")) == NULL) || r; - r = ((glNamedFramebufferTexture3DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture3DEXT")) == NULL) || r; - r = ((glNamedFramebufferTextureEXT = (PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureEXT")) == NULL) || r; - r = ((glNamedFramebufferTextureFaceEXT = (PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureFaceEXT")) == NULL) || r; - r = ((glNamedFramebufferTextureLayerEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureLayerEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameter4dEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4dEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameter4dvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4dvEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameter4fEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4fEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameter4fvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4fvEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameterI4iEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4iEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameterI4ivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4ivEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameterI4uiEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4uiEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameterI4uivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4uivEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameters4fvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameters4fvEXT")) == NULL) || r; - r = ((glNamedProgramLocalParametersI4ivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParametersI4ivEXT")) == NULL) || r; - r = ((glNamedProgramLocalParametersI4uivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParametersI4uivEXT")) == NULL) || r; - r = ((glNamedProgramStringEXT = (PFNGLNAMEDPROGRAMSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramStringEXT")) == NULL) || r; - r = ((glNamedRenderbufferStorageEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageEXT")) == NULL) || r; - r = ((glNamedRenderbufferStorageMultisampleCoverageEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageMultisampleCoverageEXT")) == NULL) || r; - r = ((glNamedRenderbufferStorageMultisampleEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageMultisampleEXT")) == NULL) || r; - r = ((glProgramUniform1fEXT = (PFNGLPROGRAMUNIFORM1FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fEXT")) == NULL) || r; - r = ((glProgramUniform1fvEXT = (PFNGLPROGRAMUNIFORM1FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fvEXT")) == NULL) || r; - r = ((glProgramUniform1iEXT = (PFNGLPROGRAMUNIFORM1IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1iEXT")) == NULL) || r; - r = ((glProgramUniform1ivEXT = (PFNGLPROGRAMUNIFORM1IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ivEXT")) == NULL) || r; - r = ((glProgramUniform1uiEXT = (PFNGLPROGRAMUNIFORM1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uiEXT")) == NULL) || r; - r = ((glProgramUniform1uivEXT = (PFNGLPROGRAMUNIFORM1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uivEXT")) == NULL) || r; - r = ((glProgramUniform2fEXT = (PFNGLPROGRAMUNIFORM2FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fEXT")) == NULL) || r; - r = ((glProgramUniform2fvEXT = (PFNGLPROGRAMUNIFORM2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fvEXT")) == NULL) || r; - r = ((glProgramUniform2iEXT = (PFNGLPROGRAMUNIFORM2IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2iEXT")) == NULL) || r; - r = ((glProgramUniform2ivEXT = (PFNGLPROGRAMUNIFORM2IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ivEXT")) == NULL) || r; - r = ((glProgramUniform2uiEXT = (PFNGLPROGRAMUNIFORM2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uiEXT")) == NULL) || r; - r = ((glProgramUniform2uivEXT = (PFNGLPROGRAMUNIFORM2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uivEXT")) == NULL) || r; - r = ((glProgramUniform3fEXT = (PFNGLPROGRAMUNIFORM3FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fEXT")) == NULL) || r; - r = ((glProgramUniform3fvEXT = (PFNGLPROGRAMUNIFORM3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fvEXT")) == NULL) || r; - r = ((glProgramUniform3iEXT = (PFNGLPROGRAMUNIFORM3IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3iEXT")) == NULL) || r; - r = ((glProgramUniform3ivEXT = (PFNGLPROGRAMUNIFORM3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ivEXT")) == NULL) || r; - r = ((glProgramUniform3uiEXT = (PFNGLPROGRAMUNIFORM3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uiEXT")) == NULL) || r; - r = ((glProgramUniform3uivEXT = (PFNGLPROGRAMUNIFORM3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uivEXT")) == NULL) || r; - r = ((glProgramUniform4fEXT = (PFNGLPROGRAMUNIFORM4FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fEXT")) == NULL) || r; - r = ((glProgramUniform4fvEXT = (PFNGLPROGRAMUNIFORM4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fvEXT")) == NULL) || r; - r = ((glProgramUniform4iEXT = (PFNGLPROGRAMUNIFORM4IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4iEXT")) == NULL) || r; - r = ((glProgramUniform4ivEXT = (PFNGLPROGRAMUNIFORM4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ivEXT")) == NULL) || r; - r = ((glProgramUniform4uiEXT = (PFNGLPROGRAMUNIFORM4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uiEXT")) == NULL) || r; - r = ((glProgramUniform4uivEXT = (PFNGLPROGRAMUNIFORM4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uivEXT")) == NULL) || r; - r = ((glProgramUniformMatrix2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix2x3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x3fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix2x4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x4fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix3x2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x2fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix3x4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x4fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix4x2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x2fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix4x3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x3fvEXT")) == NULL) || r; - r = ((glPushClientAttribDefaultEXT = (PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC)glewGetProcAddress((const GLubyte*)"glPushClientAttribDefaultEXT")) == NULL) || r; - r = ((glTextureBufferEXT = (PFNGLTEXTUREBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTextureBufferEXT")) == NULL) || r; - r = ((glTextureImage1DEXT = (PFNGLTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage1DEXT")) == NULL) || r; - r = ((glTextureImage2DEXT = (PFNGLTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage2DEXT")) == NULL) || r; - r = ((glTextureImage3DEXT = (PFNGLTEXTUREIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage3DEXT")) == NULL) || r; - r = ((glTextureParameterIivEXT = (PFNGLTEXTUREPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIivEXT")) == NULL) || r; - r = ((glTextureParameterIuivEXT = (PFNGLTEXTUREPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIuivEXT")) == NULL) || r; - r = ((glTextureParameterfEXT = (PFNGLTEXTUREPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterfEXT")) == NULL) || r; - r = ((glTextureParameterfvEXT = (PFNGLTEXTUREPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterfvEXT")) == NULL) || r; - r = ((glTextureParameteriEXT = (PFNGLTEXTUREPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameteriEXT")) == NULL) || r; - r = ((glTextureParameterivEXT = (PFNGLTEXTUREPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterivEXT")) == NULL) || r; - r = ((glTextureRenderbufferEXT = (PFNGLTEXTURERENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTextureRenderbufferEXT")) == NULL) || r; - r = ((glTextureSubImage1DEXT = (PFNGLTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage1DEXT")) == NULL) || r; - r = ((glTextureSubImage2DEXT = (PFNGLTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage2DEXT")) == NULL) || r; - r = ((glTextureSubImage3DEXT = (PFNGLTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage3DEXT")) == NULL) || r; - r = ((glUnmapNamedBufferEXT = (PFNGLUNMAPNAMEDBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glUnmapNamedBufferEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_direct_state_access */ - -#ifdef GL_EXT_draw_buffers2 - -static GLboolean _glewInit_GL_EXT_draw_buffers2 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorMaskIndexedEXT = (PFNGLCOLORMASKINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glColorMaskIndexedEXT")) == NULL) || r; - r = ((glDisableIndexedEXT = (PFNGLDISABLEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableIndexedEXT")) == NULL) || r; - r = ((glEnableIndexedEXT = (PFNGLENABLEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableIndexedEXT")) == NULL) || r; - r = ((glGetBooleanIndexedvEXT = (PFNGLGETBOOLEANINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetBooleanIndexedvEXT")) == NULL) || r; - r = ((glGetIntegerIndexedvEXT = (PFNGLGETINTEGERINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetIntegerIndexedvEXT")) == NULL) || r; - r = ((glIsEnabledIndexedEXT = (PFNGLISENABLEDINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glIsEnabledIndexedEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_draw_buffers2 */ - -#ifdef GL_EXT_draw_instanced - -static GLboolean _glewInit_GL_EXT_draw_instanced (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawArraysInstancedEXT = (PFNGLDRAWARRAYSINSTANCEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedEXT")) == NULL) || r; - r = ((glDrawElementsInstancedEXT = (PFNGLDRAWELEMENTSINSTANCEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_draw_instanced */ - -#ifdef GL_EXT_draw_range_elements - -static GLboolean _glewInit_GL_EXT_draw_range_elements (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawRangeElementsEXT = (PFNGLDRAWRANGEELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementsEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_draw_range_elements */ - -#ifdef GL_EXT_fog_coord - -static GLboolean _glewInit_GL_EXT_fog_coord (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFogCoordPointerEXT = (PFNGLFOGCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerEXT")) == NULL) || r; - r = ((glFogCoorddEXT = (PFNGLFOGCOORDDEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddEXT")) == NULL) || r; - r = ((glFogCoorddvEXT = (PFNGLFOGCOORDDVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddvEXT")) == NULL) || r; - r = ((glFogCoordfEXT = (PFNGLFOGCOORDFEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfEXT")) == NULL) || r; - r = ((glFogCoordfvEXT = (PFNGLFOGCOORDFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_fog_coord */ - -#ifdef GL_EXT_fragment_lighting - -static GLboolean _glewInit_GL_EXT_fragment_lighting (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFragmentColorMaterialEXT = (PFNGLFRAGMENTCOLORMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialEXT")) == NULL) || r; - r = ((glFragmentLightModelfEXT = (PFNGLFRAGMENTLIGHTMODELFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfEXT")) == NULL) || r; - r = ((glFragmentLightModelfvEXT = (PFNGLFRAGMENTLIGHTMODELFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvEXT")) == NULL) || r; - r = ((glFragmentLightModeliEXT = (PFNGLFRAGMENTLIGHTMODELIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliEXT")) == NULL) || r; - r = ((glFragmentLightModelivEXT = (PFNGLFRAGMENTLIGHTMODELIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivEXT")) == NULL) || r; - r = ((glFragmentLightfEXT = (PFNGLFRAGMENTLIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfEXT")) == NULL) || r; - r = ((glFragmentLightfvEXT = (PFNGLFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvEXT")) == NULL) || r; - r = ((glFragmentLightiEXT = (PFNGLFRAGMENTLIGHTIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiEXT")) == NULL) || r; - r = ((glFragmentLightivEXT = (PFNGLFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivEXT")) == NULL) || r; - r = ((glFragmentMaterialfEXT = (PFNGLFRAGMENTMATERIALFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfEXT")) == NULL) || r; - r = ((glFragmentMaterialfvEXT = (PFNGLFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvEXT")) == NULL) || r; - r = ((glFragmentMaterialiEXT = (PFNGLFRAGMENTMATERIALIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiEXT")) == NULL) || r; - r = ((glFragmentMaterialivEXT = (PFNGLFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivEXT")) == NULL) || r; - r = ((glGetFragmentLightfvEXT = (PFNGLGETFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvEXT")) == NULL) || r; - r = ((glGetFragmentLightivEXT = (PFNGLGETFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivEXT")) == NULL) || r; - r = ((glGetFragmentMaterialfvEXT = (PFNGLGETFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvEXT")) == NULL) || r; - r = ((glGetFragmentMaterialivEXT = (PFNGLGETFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivEXT")) == NULL) || r; - r = ((glLightEnviEXT = (PFNGLLIGHTENVIEXTPROC)glewGetProcAddress((const GLubyte*)"glLightEnviEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_fragment_lighting */ - -#ifdef GL_EXT_framebuffer_blit - -static GLboolean _glewInit_GL_EXT_framebuffer_blit (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlitFramebufferEXT = (PFNGLBLITFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebufferEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_framebuffer_blit */ - -#ifdef GL_EXT_framebuffer_multisample - -static GLboolean _glewInit_GL_EXT_framebuffer_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glRenderbufferStorageMultisampleEXT = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_framebuffer_multisample */ - -#ifdef GL_EXT_framebuffer_object - -static GLboolean _glewInit_GL_EXT_framebuffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindFramebufferEXT")) == NULL) || r; - r = ((glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindRenderbufferEXT")) == NULL) || r; - r = ((glCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)glewGetProcAddress((const GLubyte*)"glCheckFramebufferStatusEXT")) == NULL) || r; - r = ((glDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffersEXT")) == NULL) || r; - r = ((glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffersEXT")) == NULL) || r; - r = ((glFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbufferEXT")) == NULL) || r; - r = ((glFramebufferTexture1DEXT = (PFNGLFRAMEBUFFERTEXTURE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1DEXT")) == NULL) || r; - r = ((glFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2DEXT")) == NULL) || r; - r = ((glFramebufferTexture3DEXT = (PFNGLFRAMEBUFFERTEXTURE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3DEXT")) == NULL) || r; - r = ((glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenFramebuffersEXT")) == NULL) || r; - r = ((glGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenRenderbuffersEXT")) == NULL) || r; - r = ((glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateMipmapEXT")) == NULL) || r; - r = ((glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferAttachmentParameterivEXT")) == NULL) || r; - r = ((glGetRenderbufferParameterivEXT = (PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetRenderbufferParameterivEXT")) == NULL) || r; - r = ((glIsFramebufferEXT = (PFNGLISFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsFramebufferEXT")) == NULL) || r; - r = ((glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsRenderbufferEXT")) == NULL) || r; - r = ((glRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_framebuffer_object */ - -#ifdef GL_EXT_framebuffer_sRGB - -#endif /* GL_EXT_framebuffer_sRGB */ - -#ifdef GL_EXT_geometry_shader4 - -static GLboolean _glewInit_GL_EXT_geometry_shader4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFramebufferTextureEXT = (PFNGLFRAMEBUFFERTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureEXT")) == NULL) || r; - r = ((glFramebufferTextureFaceEXT = (PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureFaceEXT")) == NULL) || r; - r = ((glFramebufferTextureLayerEXT = (PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayerEXT")) == NULL) || r; - r = ((glProgramParameteriEXT = (PFNGLPROGRAMPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteriEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_geometry_shader4 */ - -#ifdef GL_EXT_gpu_program_parameters - -static GLboolean _glewInit_GL_EXT_gpu_program_parameters (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glProgramEnvParameters4fvEXT = (PFNGLPROGRAMENVPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameters4fvEXT")) == NULL) || r; - r = ((glProgramLocalParameters4fvEXT = (PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameters4fvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_gpu_program_parameters */ - -#ifdef GL_EXT_gpu_shader4 - -static GLboolean _glewInit_GL_EXT_gpu_shader4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindFragDataLocationEXT = (PFNGLBINDFRAGDATALOCATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocationEXT")) == NULL) || r; - r = ((glGetFragDataLocationEXT = (PFNGLGETFRAGDATALOCATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataLocationEXT")) == NULL) || r; - r = ((glGetUniformuivEXT = (PFNGLGETUNIFORMUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformuivEXT")) == NULL) || r; - r = ((glGetVertexAttribIivEXT = (PFNGLGETVERTEXATTRIBIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIivEXT")) == NULL) || r; - r = ((glGetVertexAttribIuivEXT = (PFNGLGETVERTEXATTRIBIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIuivEXT")) == NULL) || r; - r = ((glUniform1uiEXT = (PFNGLUNIFORM1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform1uiEXT")) == NULL) || r; - r = ((glUniform1uivEXT = (PFNGLUNIFORM1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform1uivEXT")) == NULL) || r; - r = ((glUniform2uiEXT = (PFNGLUNIFORM2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform2uiEXT")) == NULL) || r; - r = ((glUniform2uivEXT = (PFNGLUNIFORM2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform2uivEXT")) == NULL) || r; - r = ((glUniform3uiEXT = (PFNGLUNIFORM3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform3uiEXT")) == NULL) || r; - r = ((glUniform3uivEXT = (PFNGLUNIFORM3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform3uivEXT")) == NULL) || r; - r = ((glUniform4uiEXT = (PFNGLUNIFORM4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform4uiEXT")) == NULL) || r; - r = ((glUniform4uivEXT = (PFNGLUNIFORM4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform4uivEXT")) == NULL) || r; - r = ((glVertexAttribI1iEXT = (PFNGLVERTEXATTRIBI1IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1iEXT")) == NULL) || r; - r = ((glVertexAttribI1ivEXT = (PFNGLVERTEXATTRIBI1IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1ivEXT")) == NULL) || r; - r = ((glVertexAttribI1uiEXT = (PFNGLVERTEXATTRIBI1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uiEXT")) == NULL) || r; - r = ((glVertexAttribI1uivEXT = (PFNGLVERTEXATTRIBI1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uivEXT")) == NULL) || r; - r = ((glVertexAttribI2iEXT = (PFNGLVERTEXATTRIBI2IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2iEXT")) == NULL) || r; - r = ((glVertexAttribI2ivEXT = (PFNGLVERTEXATTRIBI2IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2ivEXT")) == NULL) || r; - r = ((glVertexAttribI2uiEXT = (PFNGLVERTEXATTRIBI2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uiEXT")) == NULL) || r; - r = ((glVertexAttribI2uivEXT = (PFNGLVERTEXATTRIBI2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uivEXT")) == NULL) || r; - r = ((glVertexAttribI3iEXT = (PFNGLVERTEXATTRIBI3IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3iEXT")) == NULL) || r; - r = ((glVertexAttribI3ivEXT = (PFNGLVERTEXATTRIBI3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3ivEXT")) == NULL) || r; - r = ((glVertexAttribI3uiEXT = (PFNGLVERTEXATTRIBI3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uiEXT")) == NULL) || r; - r = ((glVertexAttribI3uivEXT = (PFNGLVERTEXATTRIBI3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uivEXT")) == NULL) || r; - r = ((glVertexAttribI4bvEXT = (PFNGLVERTEXATTRIBI4BVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4bvEXT")) == NULL) || r; - r = ((glVertexAttribI4iEXT = (PFNGLVERTEXATTRIBI4IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4iEXT")) == NULL) || r; - r = ((glVertexAttribI4ivEXT = (PFNGLVERTEXATTRIBI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ivEXT")) == NULL) || r; - r = ((glVertexAttribI4svEXT = (PFNGLVERTEXATTRIBI4SVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4svEXT")) == NULL) || r; - r = ((glVertexAttribI4ubvEXT = (PFNGLVERTEXATTRIBI4UBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ubvEXT")) == NULL) || r; - r = ((glVertexAttribI4uiEXT = (PFNGLVERTEXATTRIBI4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uiEXT")) == NULL) || r; - r = ((glVertexAttribI4uivEXT = (PFNGLVERTEXATTRIBI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uivEXT")) == NULL) || r; - r = ((glVertexAttribI4usvEXT = (PFNGLVERTEXATTRIBI4USVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4usvEXT")) == NULL) || r; - r = ((glVertexAttribIPointerEXT = (PFNGLVERTEXATTRIBIPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIPointerEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_gpu_shader4 */ - -#ifdef GL_EXT_histogram - -static GLboolean _glewInit_GL_EXT_histogram (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetHistogramEXT = (PFNGLGETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramEXT")) == NULL) || r; - r = ((glGetHistogramParameterfvEXT = (PFNGLGETHISTOGRAMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfvEXT")) == NULL) || r; - r = ((glGetHistogramParameterivEXT = (PFNGLGETHISTOGRAMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterivEXT")) == NULL) || r; - r = ((glGetMinmaxEXT = (PFNGLGETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxEXT")) == NULL) || r; - r = ((glGetMinmaxParameterfvEXT = (PFNGLGETMINMAXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfvEXT")) == NULL) || r; - r = ((glGetMinmaxParameterivEXT = (PFNGLGETMINMAXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterivEXT")) == NULL) || r; - r = ((glHistogramEXT = (PFNGLHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glHistogramEXT")) == NULL) || r; - r = ((glMinmaxEXT = (PFNGLMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glMinmaxEXT")) == NULL) || r; - r = ((glResetHistogramEXT = (PFNGLRESETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glResetHistogramEXT")) == NULL) || r; - r = ((glResetMinmaxEXT = (PFNGLRESETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glResetMinmaxEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_histogram */ - -#ifdef GL_EXT_index_array_formats - -#endif /* GL_EXT_index_array_formats */ - -#ifdef GL_EXT_index_func - -static GLboolean _glewInit_GL_EXT_index_func (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glIndexFuncEXT = (PFNGLINDEXFUNCEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexFuncEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_index_func */ - -#ifdef GL_EXT_index_material - -static GLboolean _glewInit_GL_EXT_index_material (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glIndexMaterialEXT = (PFNGLINDEXMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexMaterialEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_index_material */ - -#ifdef GL_EXT_index_texture - -#endif /* GL_EXT_index_texture */ - -#ifdef GL_EXT_light_texture - -static GLboolean _glewInit_GL_EXT_light_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glApplyTextureEXT = (PFNGLAPPLYTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glApplyTextureEXT")) == NULL) || r; - r = ((glTextureLightEXT = (PFNGLTEXTURELIGHTEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureLightEXT")) == NULL) || r; - r = ((glTextureMaterialEXT = (PFNGLTEXTUREMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureMaterialEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_light_texture */ - -#ifdef GL_EXT_misc_attribute - -#endif /* GL_EXT_misc_attribute */ - -#ifdef GL_EXT_multi_draw_arrays - -static GLboolean _glewInit_GL_EXT_multi_draw_arrays (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glMultiDrawArraysEXT = (PFNGLMULTIDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysEXT")) == NULL) || r; - r = ((glMultiDrawElementsEXT = (PFNGLMULTIDRAWELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_multi_draw_arrays */ - -#ifdef GL_EXT_multisample - -static GLboolean _glewInit_GL_EXT_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSampleMaskEXT = (PFNGLSAMPLEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskEXT")) == NULL) || r; - r = ((glSamplePatternEXT = (PFNGLSAMPLEPATTERNEXTPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_multisample */ - -#ifdef GL_EXT_packed_depth_stencil - -#endif /* GL_EXT_packed_depth_stencil */ - -#ifdef GL_EXT_packed_float - -#endif /* GL_EXT_packed_float */ - -#ifdef GL_EXT_packed_pixels - -#endif /* GL_EXT_packed_pixels */ - -#ifdef GL_EXT_paletted_texture - -static GLboolean _glewInit_GL_EXT_paletted_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorTableEXT = (PFNGLCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorTableEXT")) == NULL) || r; - r = ((glGetColorTableEXT = (PFNGLGETCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableEXT")) == NULL) || r; - r = ((glGetColorTableParameterfvEXT = (PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvEXT")) == NULL) || r; - r = ((glGetColorTableParameterivEXT = (PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_paletted_texture */ - -#ifdef GL_EXT_pixel_buffer_object - -#endif /* GL_EXT_pixel_buffer_object */ - -#ifdef GL_EXT_pixel_transform - -static GLboolean _glewInit_GL_EXT_pixel_transform (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetPixelTransformParameterfvEXT = (PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterfvEXT")) == NULL) || r; - r = ((glGetPixelTransformParameterivEXT = (PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterivEXT")) == NULL) || r; - r = ((glPixelTransformParameterfEXT = (PFNGLPIXELTRANSFORMPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfEXT")) == NULL) || r; - r = ((glPixelTransformParameterfvEXT = (PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfvEXT")) == NULL) || r; - r = ((glPixelTransformParameteriEXT = (PFNGLPIXELTRANSFORMPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameteriEXT")) == NULL) || r; - r = ((glPixelTransformParameterivEXT = (PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterivEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_pixel_transform */ - -#ifdef GL_EXT_pixel_transform_color_table - -#endif /* GL_EXT_pixel_transform_color_table */ - -#ifdef GL_EXT_point_parameters - -static GLboolean _glewInit_GL_EXT_point_parameters (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPointParameterfEXT = (PFNGLPOINTPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfEXT")) == NULL) || r; - r = ((glPointParameterfvEXT = (PFNGLPOINTPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_point_parameters */ - -#ifdef GL_EXT_polygon_offset - -static GLboolean _glewInit_GL_EXT_polygon_offset (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPolygonOffsetEXT = (PFNGLPOLYGONOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glPolygonOffsetEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_polygon_offset */ - -#ifdef GL_EXT_rescale_normal - -#endif /* GL_EXT_rescale_normal */ - -#ifdef GL_EXT_scene_marker - -static GLboolean _glewInit_GL_EXT_scene_marker (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginSceneEXT = (PFNGLBEGINSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glBeginSceneEXT")) == NULL) || r; - r = ((glEndSceneEXT = (PFNGLENDSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glEndSceneEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_scene_marker */ - -#ifdef GL_EXT_secondary_color - -static GLboolean _glewInit_GL_EXT_secondary_color (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSecondaryColor3bEXT = (PFNGLSECONDARYCOLOR3BEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bEXT")) == NULL) || r; - r = ((glSecondaryColor3bvEXT = (PFNGLSECONDARYCOLOR3BVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bvEXT")) == NULL) || r; - r = ((glSecondaryColor3dEXT = (PFNGLSECONDARYCOLOR3DEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dEXT")) == NULL) || r; - r = ((glSecondaryColor3dvEXT = (PFNGLSECONDARYCOLOR3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dvEXT")) == NULL) || r; - r = ((glSecondaryColor3fEXT = (PFNGLSECONDARYCOLOR3FEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fEXT")) == NULL) || r; - r = ((glSecondaryColor3fvEXT = (PFNGLSECONDARYCOLOR3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fvEXT")) == NULL) || r; - r = ((glSecondaryColor3iEXT = (PFNGLSECONDARYCOLOR3IEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iEXT")) == NULL) || r; - r = ((glSecondaryColor3ivEXT = (PFNGLSECONDARYCOLOR3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ivEXT")) == NULL) || r; - r = ((glSecondaryColor3sEXT = (PFNGLSECONDARYCOLOR3SEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sEXT")) == NULL) || r; - r = ((glSecondaryColor3svEXT = (PFNGLSECONDARYCOLOR3SVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3svEXT")) == NULL) || r; - r = ((glSecondaryColor3ubEXT = (PFNGLSECONDARYCOLOR3UBEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubEXT")) == NULL) || r; - r = ((glSecondaryColor3ubvEXT = (PFNGLSECONDARYCOLOR3UBVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubvEXT")) == NULL) || r; - r = ((glSecondaryColor3uiEXT = (PFNGLSECONDARYCOLOR3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiEXT")) == NULL) || r; - r = ((glSecondaryColor3uivEXT = (PFNGLSECONDARYCOLOR3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uivEXT")) == NULL) || r; - r = ((glSecondaryColor3usEXT = (PFNGLSECONDARYCOLOR3USEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usEXT")) == NULL) || r; - r = ((glSecondaryColor3usvEXT = (PFNGLSECONDARYCOLOR3USVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usvEXT")) == NULL) || r; - r = ((glSecondaryColorPointerEXT = (PFNGLSECONDARYCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_secondary_color */ - -#ifdef GL_EXT_separate_specular_color - -#endif /* GL_EXT_separate_specular_color */ - -#ifdef GL_EXT_shadow_funcs - -#endif /* GL_EXT_shadow_funcs */ - -#ifdef GL_EXT_shared_texture_palette - -#endif /* GL_EXT_shared_texture_palette */ - -#ifdef GL_EXT_stencil_clear_tag - -#endif /* GL_EXT_stencil_clear_tag */ - -#ifdef GL_EXT_stencil_two_side - -static GLboolean _glewInit_GL_EXT_stencil_two_side (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glActiveStencilFaceEXT = (PFNGLACTIVESTENCILFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glActiveStencilFaceEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_stencil_two_side */ - -#ifdef GL_EXT_stencil_wrap - -#endif /* GL_EXT_stencil_wrap */ - -#ifdef GL_EXT_subtexture - -static GLboolean _glewInit_GL_EXT_subtexture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexSubImage1DEXT = (PFNGLTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage1DEXT")) == NULL) || r; - r = ((glTexSubImage2DEXT = (PFNGLTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage2DEXT")) == NULL) || r; - r = ((glTexSubImage3DEXT = (PFNGLTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3DEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_subtexture */ - -#ifdef GL_EXT_texture - -#endif /* GL_EXT_texture */ - -#ifdef GL_EXT_texture3D - -static GLboolean _glewInit_GL_EXT_texture3D (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexImage3DEXT = (PFNGLTEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture3D */ - -#ifdef GL_EXT_texture_array - -#endif /* GL_EXT_texture_array */ - -#ifdef GL_EXT_texture_buffer_object - -static GLboolean _glewInit_GL_EXT_texture_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexBufferEXT = (PFNGLTEXBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTexBufferEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture_buffer_object */ - -#ifdef GL_EXT_texture_compression_dxt1 - -#endif /* GL_EXT_texture_compression_dxt1 */ - -#ifdef GL_EXT_texture_compression_latc - -#endif /* GL_EXT_texture_compression_latc */ - -#ifdef GL_EXT_texture_compression_rgtc - -#endif /* GL_EXT_texture_compression_rgtc */ - -#ifdef GL_EXT_texture_compression_s3tc - -#endif /* GL_EXT_texture_compression_s3tc */ - -#ifdef GL_EXT_texture_cube_map - -#endif /* GL_EXT_texture_cube_map */ - -#ifdef GL_EXT_texture_edge_clamp - -#endif /* GL_EXT_texture_edge_clamp */ - -#ifdef GL_EXT_texture_env - -#endif /* GL_EXT_texture_env */ - -#ifdef GL_EXT_texture_env_add - -#endif /* GL_EXT_texture_env_add */ - -#ifdef GL_EXT_texture_env_combine - -#endif /* GL_EXT_texture_env_combine */ - -#ifdef GL_EXT_texture_env_dot3 - -#endif /* GL_EXT_texture_env_dot3 */ - -#ifdef GL_EXT_texture_filter_anisotropic - -#endif /* GL_EXT_texture_filter_anisotropic */ - -#ifdef GL_EXT_texture_integer - -static GLboolean _glewInit_GL_EXT_texture_integer (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClearColorIiEXT = (PFNGLCLEARCOLORIIEXTPROC)glewGetProcAddress((const GLubyte*)"glClearColorIiEXT")) == NULL) || r; - r = ((glClearColorIuiEXT = (PFNGLCLEARCOLORIUIEXTPROC)glewGetProcAddress((const GLubyte*)"glClearColorIuiEXT")) == NULL) || r; - r = ((glGetTexParameterIivEXT = (PFNGLGETTEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIivEXT")) == NULL) || r; - r = ((glGetTexParameterIuivEXT = (PFNGLGETTEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIuivEXT")) == NULL) || r; - r = ((glTexParameterIivEXT = (PFNGLTEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIivEXT")) == NULL) || r; - r = ((glTexParameterIuivEXT = (PFNGLTEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIuivEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture_integer */ - -#ifdef GL_EXT_texture_lod_bias - -#endif /* GL_EXT_texture_lod_bias */ - -#ifdef GL_EXT_texture_mirror_clamp - -#endif /* GL_EXT_texture_mirror_clamp */ - -#ifdef GL_EXT_texture_object - -static GLboolean _glewInit_GL_EXT_texture_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAreTexturesResidentEXT = (PFNGLARETEXTURESRESIDENTEXTPROC)glewGetProcAddress((const GLubyte*)"glAreTexturesResidentEXT")) == NULL) || r; - r = ((glBindTextureEXT = (PFNGLBINDTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureEXT")) == NULL) || r; - r = ((glDeleteTexturesEXT = (PFNGLDELETETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteTexturesEXT")) == NULL) || r; - r = ((glGenTexturesEXT = (PFNGLGENTEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glGenTexturesEXT")) == NULL) || r; - r = ((glIsTextureEXT = (PFNGLISTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glIsTextureEXT")) == NULL) || r; - r = ((glPrioritizeTexturesEXT = (PFNGLPRIORITIZETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glPrioritizeTexturesEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture_object */ - -#ifdef GL_EXT_texture_perturb_normal - -static GLboolean _glewInit_GL_EXT_texture_perturb_normal (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTextureNormalEXT = (PFNGLTEXTURENORMALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureNormalEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture_perturb_normal */ - -#ifdef GL_EXT_texture_rectangle - -#endif /* GL_EXT_texture_rectangle */ - -#ifdef GL_EXT_texture_sRGB - -#endif /* GL_EXT_texture_sRGB */ - -#ifdef GL_EXT_texture_shared_exponent - -#endif /* GL_EXT_texture_shared_exponent */ - -#ifdef GL_EXT_texture_swizzle - -#endif /* GL_EXT_texture_swizzle */ - -#ifdef GL_EXT_timer_query - -static GLboolean _glewInit_GL_EXT_timer_query (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - -// r = ((glGetQueryObjecti64vEXT = (PFNGLGETQUERYOBJECTI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjecti64vEXT")) == NULL) || r; -// r = ((glGetQueryObjectui64vEXT = (PFNGLGETQUERYOBJECTUI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectui64vEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_timer_query */ - -#ifdef GL_EXT_transform_feedback - -static GLboolean _glewInit_GL_EXT_transform_feedback (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginTransformFeedbackEXT = (PFNGLBEGINTRANSFORMFEEDBACKEXTPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedbackEXT")) == NULL) || r; - r = ((glBindBufferBaseEXT = (PFNGLBINDBUFFERBASEEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBaseEXT")) == NULL) || r; - r = ((glBindBufferOffsetEXT = (PFNGLBINDBUFFEROFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferOffsetEXT")) == NULL) || r; - r = ((glBindBufferRangeEXT = (PFNGLBINDBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRangeEXT")) == NULL) || r; - r = ((glEndTransformFeedbackEXT = (PFNGLENDTRANSFORMFEEDBACKEXTPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedbackEXT")) == NULL) || r; - r = ((glGetTransformFeedbackVaryingEXT = (PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVaryingEXT")) == NULL) || r; - r = ((glTransformFeedbackVaryingsEXT = (PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryingsEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_transform_feedback */ - -#ifdef GL_EXT_vertex_array - -static GLboolean _glewInit_GL_EXT_vertex_array (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glArrayElementEXT = (PFNGLARRAYELEMENTEXTPROC)glewGetProcAddress((const GLubyte*)"glArrayElementEXT")) == NULL) || r; - r = ((glColorPointerEXT = (PFNGLCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glColorPointerEXT")) == NULL) || r; - r = ((glDrawArraysEXT = (PFNGLDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysEXT")) == NULL) || r; - r = ((glEdgeFlagPointerEXT = (PFNGLEDGEFLAGPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerEXT")) == NULL) || r; - r = ((glGetPointervEXT = (PFNGLGETPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPointervEXT")) == NULL) || r; - r = ((glIndexPointerEXT = (PFNGLINDEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerEXT")) == NULL) || r; - r = ((glNormalPointerEXT = (PFNGLNORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerEXT")) == NULL) || r; - r = ((glTexCoordPointerEXT = (PFNGLTEXCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerEXT")) == NULL) || r; - r = ((glVertexPointerEXT = (PFNGLVERTEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_vertex_array */ - -#ifdef GL_EXT_vertex_array_bgra - -#endif /* GL_EXT_vertex_array_bgra */ - -#ifdef GL_EXT_vertex_shader - -static GLboolean _glewInit_GL_EXT_vertex_shader (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginVertexShaderEXT = (PFNGLBEGINVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBeginVertexShaderEXT")) == NULL) || r; - r = ((glBindLightParameterEXT = (PFNGLBINDLIGHTPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindLightParameterEXT")) == NULL) || r; - r = ((glBindMaterialParameterEXT = (PFNGLBINDMATERIALPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindMaterialParameterEXT")) == NULL) || r; - r = ((glBindParameterEXT = (PFNGLBINDPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindParameterEXT")) == NULL) || r; - r = ((glBindTexGenParameterEXT = (PFNGLBINDTEXGENPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTexGenParameterEXT")) == NULL) || r; - r = ((glBindTextureUnitParameterEXT = (PFNGLBINDTEXTUREUNITPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureUnitParameterEXT")) == NULL) || r; - r = ((glBindVertexShaderEXT = (PFNGLBINDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindVertexShaderEXT")) == NULL) || r; - r = ((glDeleteVertexShaderEXT = (PFNGLDELETEVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexShaderEXT")) == NULL) || r; - r = ((glDisableVariantClientStateEXT = (PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableVariantClientStateEXT")) == NULL) || r; - r = ((glEnableVariantClientStateEXT = (PFNGLENABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableVariantClientStateEXT")) == NULL) || r; - r = ((glEndVertexShaderEXT = (PFNGLENDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glEndVertexShaderEXT")) == NULL) || r; - r = ((glExtractComponentEXT = (PFNGLEXTRACTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glExtractComponentEXT")) == NULL) || r; - r = ((glGenSymbolsEXT = (PFNGLGENSYMBOLSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenSymbolsEXT")) == NULL) || r; - r = ((glGenVertexShadersEXT = (PFNGLGENVERTEXSHADERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenVertexShadersEXT")) == NULL) || r; - r = ((glGetInvariantBooleanvEXT = (PFNGLGETINVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantBooleanvEXT")) == NULL) || r; - r = ((glGetInvariantFloatvEXT = (PFNGLGETINVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantFloatvEXT")) == NULL) || r; - r = ((glGetInvariantIntegervEXT = (PFNGLGETINVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantIntegervEXT")) == NULL) || r; - r = ((glGetLocalConstantBooleanvEXT = (PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantBooleanvEXT")) == NULL) || r; - r = ((glGetLocalConstantFloatvEXT = (PFNGLGETLOCALCONSTANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantFloatvEXT")) == NULL) || r; - r = ((glGetLocalConstantIntegervEXT = (PFNGLGETLOCALCONSTANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantIntegervEXT")) == NULL) || r; - r = ((glGetVariantBooleanvEXT = (PFNGLGETVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantBooleanvEXT")) == NULL) || r; - r = ((glGetVariantFloatvEXT = (PFNGLGETVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantFloatvEXT")) == NULL) || r; - r = ((glGetVariantIntegervEXT = (PFNGLGETVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantIntegervEXT")) == NULL) || r; - r = ((glGetVariantPointervEXT = (PFNGLGETVARIANTPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantPointervEXT")) == NULL) || r; - r = ((glInsertComponentEXT = (PFNGLINSERTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glInsertComponentEXT")) == NULL) || r; - r = ((glIsVariantEnabledEXT = (PFNGLISVARIANTENABLEDEXTPROC)glewGetProcAddress((const GLubyte*)"glIsVariantEnabledEXT")) == NULL) || r; - r = ((glSetInvariantEXT = (PFNGLSETINVARIANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetInvariantEXT")) == NULL) || r; - r = ((glSetLocalConstantEXT = (PFNGLSETLOCALCONSTANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetLocalConstantEXT")) == NULL) || r; - r = ((glShaderOp1EXT = (PFNGLSHADEROP1EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp1EXT")) == NULL) || r; - r = ((glShaderOp2EXT = (PFNGLSHADEROP2EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp2EXT")) == NULL) || r; - r = ((glShaderOp3EXT = (PFNGLSHADEROP3EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp3EXT")) == NULL) || r; - r = ((glSwizzleEXT = (PFNGLSWIZZLEEXTPROC)glewGetProcAddress((const GLubyte*)"glSwizzleEXT")) == NULL) || r; - r = ((glVariantPointerEXT = (PFNGLVARIANTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVariantPointerEXT")) == NULL) || r; - r = ((glVariantbvEXT = (PFNGLVARIANTBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantbvEXT")) == NULL) || r; - r = ((glVariantdvEXT = (PFNGLVARIANTDVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantdvEXT")) == NULL) || r; - r = ((glVariantfvEXT = (PFNGLVARIANTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantfvEXT")) == NULL) || r; - r = ((glVariantivEXT = (PFNGLVARIANTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantivEXT")) == NULL) || r; - r = ((glVariantsvEXT = (PFNGLVARIANTSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantsvEXT")) == NULL) || r; - r = ((glVariantubvEXT = (PFNGLVARIANTUBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantubvEXT")) == NULL) || r; - r = ((glVariantuivEXT = (PFNGLVARIANTUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantuivEXT")) == NULL) || r; - r = ((glVariantusvEXT = (PFNGLVARIANTUSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantusvEXT")) == NULL) || r; - r = ((glWriteMaskEXT = (PFNGLWRITEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glWriteMaskEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_vertex_shader */ - -#ifdef GL_EXT_vertex_weighting - -static GLboolean _glewInit_GL_EXT_vertex_weighting (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glVertexWeightPointerEXT = (PFNGLVERTEXWEIGHTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightPointerEXT")) == NULL) || r; - r = ((glVertexWeightfEXT = (PFNGLVERTEXWEIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfEXT")) == NULL) || r; - r = ((glVertexWeightfvEXT = (PFNGLVERTEXWEIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_vertex_weighting */ - -#ifdef GL_GREMEDY_frame_terminator - -static GLboolean _glewInit_GL_GREMEDY_frame_terminator (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFrameTerminatorGREMEDY = (PFNGLFRAMETERMINATORGREMEDYPROC)glewGetProcAddress((const GLubyte*)"glFrameTerminatorGREMEDY")) == NULL) || r; - - return r; -} - -#endif /* GL_GREMEDY_frame_terminator */ - -#ifdef GL_GREMEDY_string_marker - -static GLboolean _glewInit_GL_GREMEDY_string_marker (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glStringMarkerGREMEDY = (PFNGLSTRINGMARKERGREMEDYPROC)glewGetProcAddress((const GLubyte*)"glStringMarkerGREMEDY")) == NULL) || r; - - return r; -} - -#endif /* GL_GREMEDY_string_marker */ - -#ifdef GL_HP_convolution_border_modes - -#endif /* GL_HP_convolution_border_modes */ - -#ifdef GL_HP_image_transform - -static GLboolean _glewInit_GL_HP_image_transform (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetImageTransformParameterfvHP = (PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterfvHP")) == NULL) || r; - r = ((glGetImageTransformParameterivHP = (PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterivHP")) == NULL) || r; - r = ((glImageTransformParameterfHP = (PFNGLIMAGETRANSFORMPARAMETERFHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfHP")) == NULL) || r; - r = ((glImageTransformParameterfvHP = (PFNGLIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfvHP")) == NULL) || r; - r = ((glImageTransformParameteriHP = (PFNGLIMAGETRANSFORMPARAMETERIHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameteriHP")) == NULL) || r; - r = ((glImageTransformParameterivHP = (PFNGLIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterivHP")) == NULL) || r; - - return r; -} - -#endif /* GL_HP_image_transform */ - -#ifdef GL_HP_occlusion_test - -#endif /* GL_HP_occlusion_test */ - -#ifdef GL_HP_texture_lighting - -#endif /* GL_HP_texture_lighting */ - -#ifdef GL_IBM_cull_vertex - -#endif /* GL_IBM_cull_vertex */ - -#ifdef GL_IBM_multimode_draw_arrays - -static GLboolean _glewInit_GL_IBM_multimode_draw_arrays (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glMultiModeDrawArraysIBM = (PFNGLMULTIMODEDRAWARRAYSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawArraysIBM")) == NULL) || r; - r = ((glMultiModeDrawElementsIBM = (PFNGLMULTIMODEDRAWELEMENTSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawElementsIBM")) == NULL) || r; - - return r; -} - -#endif /* GL_IBM_multimode_draw_arrays */ - -#ifdef GL_IBM_rasterpos_clip - -#endif /* GL_IBM_rasterpos_clip */ - -#ifdef GL_IBM_static_data - -#endif /* GL_IBM_static_data */ - -#ifdef GL_IBM_texture_mirrored_repeat - -#endif /* GL_IBM_texture_mirrored_repeat */ - -#ifdef GL_IBM_vertex_array_lists - -static GLboolean _glewInit_GL_IBM_vertex_array_lists (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorPointerListIBM = (PFNGLCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glColorPointerListIBM")) == NULL) || r; - r = ((glEdgeFlagPointerListIBM = (PFNGLEDGEFLAGPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerListIBM")) == NULL) || r; - r = ((glFogCoordPointerListIBM = (PFNGLFOGCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerListIBM")) == NULL) || r; - r = ((glIndexPointerListIBM = (PFNGLINDEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerListIBM")) == NULL) || r; - r = ((glNormalPointerListIBM = (PFNGLNORMALPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerListIBM")) == NULL) || r; - r = ((glSecondaryColorPointerListIBM = (PFNGLSECONDARYCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerListIBM")) == NULL) || r; - r = ((glTexCoordPointerListIBM = (PFNGLTEXCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerListIBM")) == NULL) || r; - r = ((glVertexPointerListIBM = (PFNGLVERTEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerListIBM")) == NULL) || r; - - return r; -} - -#endif /* GL_IBM_vertex_array_lists */ - -#ifdef GL_INGR_color_clamp - -#endif /* GL_INGR_color_clamp */ - -#ifdef GL_INGR_interlace_read - -#endif /* GL_INGR_interlace_read */ - -#ifdef GL_INTEL_parallel_arrays - -static GLboolean _glewInit_GL_INTEL_parallel_arrays (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorPointervINTEL = (PFNGLCOLORPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glColorPointervINTEL")) == NULL) || r; - r = ((glNormalPointervINTEL = (PFNGLNORMALPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glNormalPointervINTEL")) == NULL) || r; - r = ((glTexCoordPointervINTEL = (PFNGLTEXCOORDPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointervINTEL")) == NULL) || r; - r = ((glVertexPointervINTEL = (PFNGLVERTEXPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glVertexPointervINTEL")) == NULL) || r; - - return r; -} - -#endif /* GL_INTEL_parallel_arrays */ - -#ifdef GL_INTEL_texture_scissor - -static GLboolean _glewInit_GL_INTEL_texture_scissor (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexScissorFuncINTEL = (PFNGLTEXSCISSORFUNCINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorFuncINTEL")) == NULL) || r; - r = ((glTexScissorINTEL = (PFNGLTEXSCISSORINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorINTEL")) == NULL) || r; - - return r; -} - -#endif /* GL_INTEL_texture_scissor */ - -#ifdef GL_KTX_buffer_region - -static GLboolean _glewInit_GL_KTX_buffer_region (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBufferRegionEnabledEXT = (PFNGLBUFFERREGIONENABLEDEXTPROC)glewGetProcAddress((const GLubyte*)"glBufferRegionEnabledEXT")) == NULL) || r; - r = ((glDeleteBufferRegionEXT = (PFNGLDELETEBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteBufferRegionEXT")) == NULL) || r; - r = ((glDrawBufferRegionEXT = (PFNGLDRAWBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawBufferRegionEXT")) == NULL) || r; - r = ((glNewBufferRegionEXT = (PFNGLNEWBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glNewBufferRegionEXT")) == NULL) || r; - r = ((glReadBufferRegionEXT = (PFNGLREADBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glReadBufferRegionEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_KTX_buffer_region */ - -#ifdef GL_MESAX_texture_stack - -#endif /* GL_MESAX_texture_stack */ - -#ifdef GL_MESA_pack_invert - -#endif /* GL_MESA_pack_invert */ - -#ifdef GL_MESA_resize_buffers - -static GLboolean _glewInit_GL_MESA_resize_buffers (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glResizeBuffersMESA = (PFNGLRESIZEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glResizeBuffersMESA")) == NULL) || r; - - return r; -} - -#endif /* GL_MESA_resize_buffers */ - -#ifdef GL_MESA_window_pos - -static GLboolean _glewInit_GL_MESA_window_pos (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glWindowPos2dMESA = (PFNGLWINDOWPOS2DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dMESA")) == NULL) || r; - r = ((glWindowPos2dvMESA = (PFNGLWINDOWPOS2DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvMESA")) == NULL) || r; - r = ((glWindowPos2fMESA = (PFNGLWINDOWPOS2FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fMESA")) == NULL) || r; - r = ((glWindowPos2fvMESA = (PFNGLWINDOWPOS2FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvMESA")) == NULL) || r; - r = ((glWindowPos2iMESA = (PFNGLWINDOWPOS2IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iMESA")) == NULL) || r; - r = ((glWindowPos2ivMESA = (PFNGLWINDOWPOS2IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivMESA")) == NULL) || r; - r = ((glWindowPos2sMESA = (PFNGLWINDOWPOS2SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sMESA")) == NULL) || r; - r = ((glWindowPos2svMESA = (PFNGLWINDOWPOS2SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svMESA")) == NULL) || r; - r = ((glWindowPos3dMESA = (PFNGLWINDOWPOS3DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dMESA")) == NULL) || r; - r = ((glWindowPos3dvMESA = (PFNGLWINDOWPOS3DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvMESA")) == NULL) || r; - r = ((glWindowPos3fMESA = (PFNGLWINDOWPOS3FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fMESA")) == NULL) || r; - r = ((glWindowPos3fvMESA = (PFNGLWINDOWPOS3FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvMESA")) == NULL) || r; - r = ((glWindowPos3iMESA = (PFNGLWINDOWPOS3IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iMESA")) == NULL) || r; - r = ((glWindowPos3ivMESA = (PFNGLWINDOWPOS3IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivMESA")) == NULL) || r; - r = ((glWindowPos3sMESA = (PFNGLWINDOWPOS3SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sMESA")) == NULL) || r; - r = ((glWindowPos3svMESA = (PFNGLWINDOWPOS3SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svMESA")) == NULL) || r; - r = ((glWindowPos4dMESA = (PFNGLWINDOWPOS4DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dMESA")) == NULL) || r; - r = ((glWindowPos4dvMESA = (PFNGLWINDOWPOS4DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dvMESA")) == NULL) || r; - r = ((glWindowPos4fMESA = (PFNGLWINDOWPOS4FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fMESA")) == NULL) || r; - r = ((glWindowPos4fvMESA = (PFNGLWINDOWPOS4FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fvMESA")) == NULL) || r; - r = ((glWindowPos4iMESA = (PFNGLWINDOWPOS4IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4iMESA")) == NULL) || r; - r = ((glWindowPos4ivMESA = (PFNGLWINDOWPOS4IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4ivMESA")) == NULL) || r; - r = ((glWindowPos4sMESA = (PFNGLWINDOWPOS4SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4sMESA")) == NULL) || r; - r = ((glWindowPos4svMESA = (PFNGLWINDOWPOS4SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4svMESA")) == NULL) || r; - - return r; -} - -#endif /* GL_MESA_window_pos */ - -#ifdef GL_MESA_ycbcr_texture - -#endif /* GL_MESA_ycbcr_texture */ - -#ifdef GL_NV_blend_square - -#endif /* GL_NV_blend_square */ - -#ifdef GL_NV_conditional_render - -static GLboolean _glewInit_GL_NV_conditional_render (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginConditionalRenderNV = (PFNGLBEGINCONDITIONALRENDERNVPROC)glewGetProcAddress((const GLubyte*)"glBeginConditionalRenderNV")) == NULL) || r; - r = ((glEndConditionalRenderNV = (PFNGLENDCONDITIONALRENDERNVPROC)glewGetProcAddress((const GLubyte*)"glEndConditionalRenderNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_conditional_render */ - -#ifdef GL_NV_copy_depth_to_color - -#endif /* GL_NV_copy_depth_to_color */ - -#ifdef GL_NV_depth_buffer_float - -static GLboolean _glewInit_GL_NV_depth_buffer_float (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClearDepthdNV = (PFNGLCLEARDEPTHDNVPROC)glewGetProcAddress((const GLubyte*)"glClearDepthdNV")) == NULL) || r; - r = ((glDepthBoundsdNV = (PFNGLDEPTHBOUNDSDNVPROC)glewGetProcAddress((const GLubyte*)"glDepthBoundsdNV")) == NULL) || r; - r = ((glDepthRangedNV = (PFNGLDEPTHRANGEDNVPROC)glewGetProcAddress((const GLubyte*)"glDepthRangedNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_depth_buffer_float */ - -#ifdef GL_NV_depth_clamp - -#endif /* GL_NV_depth_clamp */ - -#ifdef GL_NV_depth_range_unclamped - -#endif /* GL_NV_depth_range_unclamped */ - -#ifdef GL_NV_evaluators - -static GLboolean _glewInit_GL_NV_evaluators (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glEvalMapsNV = (PFNGLEVALMAPSNVPROC)glewGetProcAddress((const GLubyte*)"glEvalMapsNV")) == NULL) || r; - r = ((glGetMapAttribParameterfvNV = (PFNGLGETMAPATTRIBPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterfvNV")) == NULL) || r; - r = ((glGetMapAttribParameterivNV = (PFNGLGETMAPATTRIBPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterivNV")) == NULL) || r; - r = ((glGetMapControlPointsNV = (PFNGLGETMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapControlPointsNV")) == NULL) || r; - r = ((glGetMapParameterfvNV = (PFNGLGETMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterfvNV")) == NULL) || r; - r = ((glGetMapParameterivNV = (PFNGLGETMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterivNV")) == NULL) || r; - r = ((glMapControlPointsNV = (PFNGLMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glMapControlPointsNV")) == NULL) || r; - r = ((glMapParameterfvNV = (PFNGLMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterfvNV")) == NULL) || r; - r = ((glMapParameterivNV = (PFNGLMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_evaluators */ - -#ifdef GL_NV_explicit_multisample - -static GLboolean _glewInit_GL_NV_explicit_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetMultisamplefvNV = (PFNGLGETMULTISAMPLEFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMultisamplefvNV")) == NULL) || r; - r = ((glSampleMaskIndexedNV = (PFNGLSAMPLEMASKINDEXEDNVPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskIndexedNV")) == NULL) || r; - r = ((glTexRenderbufferNV = (PFNGLTEXRENDERBUFFERNVPROC)glewGetProcAddress((const GLubyte*)"glTexRenderbufferNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_explicit_multisample */ - -#ifdef GL_NV_fence - -static GLboolean _glewInit_GL_NV_fence (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDeleteFencesNV = (PFNGLDELETEFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesNV")) == NULL) || r; - r = ((glFinishFenceNV = (PFNGLFINISHFENCENVPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceNV")) == NULL) || r; - r = ((glGenFencesNV = (PFNGLGENFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glGenFencesNV")) == NULL) || r; - r = ((glGetFenceivNV = (PFNGLGETFENCEIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFenceivNV")) == NULL) || r; - r = ((glIsFenceNV = (PFNGLISFENCENVPROC)glewGetProcAddress((const GLubyte*)"glIsFenceNV")) == NULL) || r; - r = ((glSetFenceNV = (PFNGLSETFENCENVPROC)glewGetProcAddress((const GLubyte*)"glSetFenceNV")) == NULL) || r; - r = ((glTestFenceNV = (PFNGLTESTFENCENVPROC)glewGetProcAddress((const GLubyte*)"glTestFenceNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_fence */ - -#ifdef GL_NV_float_buffer - -#endif /* GL_NV_float_buffer */ - -#ifdef GL_NV_fog_distance - -#endif /* GL_NV_fog_distance */ - -#ifdef GL_NV_fragment_program - -static GLboolean _glewInit_GL_NV_fragment_program (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetProgramNamedParameterdvNV = (PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterdvNV")) == NULL) || r; - r = ((glGetProgramNamedParameterfvNV = (PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterfvNV")) == NULL) || r; - r = ((glProgramNamedParameter4dNV = (PFNGLPROGRAMNAMEDPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dNV")) == NULL) || r; - r = ((glProgramNamedParameter4dvNV = (PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dvNV")) == NULL) || r; - r = ((glProgramNamedParameter4fNV = (PFNGLPROGRAMNAMEDPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fNV")) == NULL) || r; - r = ((glProgramNamedParameter4fvNV = (PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_fragment_program */ - -#ifdef GL_NV_fragment_program2 - -#endif /* GL_NV_fragment_program2 */ - -#ifdef GL_NV_fragment_program4 - -#endif /* GL_NV_fragment_program4 */ - -#ifdef GL_NV_fragment_program_option - -#endif /* GL_NV_fragment_program_option */ - -#ifdef GL_NV_framebuffer_multisample_coverage - -static GLboolean _glewInit_GL_NV_framebuffer_multisample_coverage (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glRenderbufferStorageMultisampleCoverageNV = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleCoverageNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_framebuffer_multisample_coverage */ - -#ifdef GL_NV_geometry_program4 - -static GLboolean _glewInit_GL_NV_geometry_program4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glProgramVertexLimitNV = (PFNGLPROGRAMVERTEXLIMITNVPROC)glewGetProcAddress((const GLubyte*)"glProgramVertexLimitNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_geometry_program4 */ - -#ifdef GL_NV_geometry_shader4 - -#endif /* GL_NV_geometry_shader4 */ - -#ifdef GL_NV_gpu_program4 - -static GLboolean _glewInit_GL_NV_gpu_program4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glProgramEnvParameterI4iNV = (PFNGLPROGRAMENVPARAMETERI4INVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4iNV")) == NULL) || r; - r = ((glProgramEnvParameterI4ivNV = (PFNGLPROGRAMENVPARAMETERI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4ivNV")) == NULL) || r; - r = ((glProgramEnvParameterI4uiNV = (PFNGLPROGRAMENVPARAMETERI4UINVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4uiNV")) == NULL) || r; - r = ((glProgramEnvParameterI4uivNV = (PFNGLPROGRAMENVPARAMETERI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4uivNV")) == NULL) || r; - r = ((glProgramEnvParametersI4ivNV = (PFNGLPROGRAMENVPARAMETERSI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParametersI4ivNV")) == NULL) || r; - r = ((glProgramEnvParametersI4uivNV = (PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParametersI4uivNV")) == NULL) || r; - r = ((glProgramLocalParameterI4iNV = (PFNGLPROGRAMLOCALPARAMETERI4INVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4iNV")) == NULL) || r; - r = ((glProgramLocalParameterI4ivNV = (PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4ivNV")) == NULL) || r; - r = ((glProgramLocalParameterI4uiNV = (PFNGLPROGRAMLOCALPARAMETERI4UINVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4uiNV")) == NULL) || r; - r = ((glProgramLocalParameterI4uivNV = (PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4uivNV")) == NULL) || r; - r = ((glProgramLocalParametersI4ivNV = (PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParametersI4ivNV")) == NULL) || r; - r = ((glProgramLocalParametersI4uivNV = (PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParametersI4uivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_gpu_program4 */ - -#ifdef GL_NV_half_float - -static GLboolean _glewInit_GL_NV_half_float (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColor3hNV = (PFNGLCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hNV")) == NULL) || r; - r = ((glColor3hvNV = (PFNGLCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hvNV")) == NULL) || r; - r = ((glColor4hNV = (PFNGLCOLOR4HNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hNV")) == NULL) || r; - r = ((glColor4hvNV = (PFNGLCOLOR4HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hvNV")) == NULL) || r; - r = ((glFogCoordhNV = (PFNGLFOGCOORDHNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhNV")) == NULL) || r; - r = ((glFogCoordhvNV = (PFNGLFOGCOORDHVNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhvNV")) == NULL) || r; - r = ((glMultiTexCoord1hNV = (PFNGLMULTITEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hNV")) == NULL) || r; - r = ((glMultiTexCoord1hvNV = (PFNGLMULTITEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hvNV")) == NULL) || r; - r = ((glMultiTexCoord2hNV = (PFNGLMULTITEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hNV")) == NULL) || r; - r = ((glMultiTexCoord2hvNV = (PFNGLMULTITEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hvNV")) == NULL) || r; - r = ((glMultiTexCoord3hNV = (PFNGLMULTITEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hNV")) == NULL) || r; - r = ((glMultiTexCoord3hvNV = (PFNGLMULTITEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hvNV")) == NULL) || r; - r = ((glMultiTexCoord4hNV = (PFNGLMULTITEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hNV")) == NULL) || r; - r = ((glMultiTexCoord4hvNV = (PFNGLMULTITEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hvNV")) == NULL) || r; - r = ((glNormal3hNV = (PFNGLNORMAL3HNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hNV")) == NULL) || r; - r = ((glNormal3hvNV = (PFNGLNORMAL3HVNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hvNV")) == NULL) || r; - r = ((glSecondaryColor3hNV = (PFNGLSECONDARYCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hNV")) == NULL) || r; - r = ((glSecondaryColor3hvNV = (PFNGLSECONDARYCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hvNV")) == NULL) || r; - r = ((glTexCoord1hNV = (PFNGLTEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hNV")) == NULL) || r; - r = ((glTexCoord1hvNV = (PFNGLTEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hvNV")) == NULL) || r; - r = ((glTexCoord2hNV = (PFNGLTEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hNV")) == NULL) || r; - r = ((glTexCoord2hvNV = (PFNGLTEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hvNV")) == NULL) || r; - r = ((glTexCoord3hNV = (PFNGLTEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hNV")) == NULL) || r; - r = ((glTexCoord3hvNV = (PFNGLTEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hvNV")) == NULL) || r; - r = ((glTexCoord4hNV = (PFNGLTEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hNV")) == NULL) || r; - r = ((glTexCoord4hvNV = (PFNGLTEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hvNV")) == NULL) || r; - r = ((glVertex2hNV = (PFNGLVERTEX2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hNV")) == NULL) || r; - r = ((glVertex2hvNV = (PFNGLVERTEX2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hvNV")) == NULL) || r; - r = ((glVertex3hNV = (PFNGLVERTEX3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hNV")) == NULL) || r; - r = ((glVertex3hvNV = (PFNGLVERTEX3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hvNV")) == NULL) || r; - r = ((glVertex4hNV = (PFNGLVERTEX4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hNV")) == NULL) || r; - r = ((glVertex4hvNV = (PFNGLVERTEX4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hvNV")) == NULL) || r; - r = ((glVertexAttrib1hNV = (PFNGLVERTEXATTRIB1HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hNV")) == NULL) || r; - r = ((glVertexAttrib1hvNV = (PFNGLVERTEXATTRIB1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hvNV")) == NULL) || r; - r = ((glVertexAttrib2hNV = (PFNGLVERTEXATTRIB2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hNV")) == NULL) || r; - r = ((glVertexAttrib2hvNV = (PFNGLVERTEXATTRIB2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hvNV")) == NULL) || r; - r = ((glVertexAttrib3hNV = (PFNGLVERTEXATTRIB3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hNV")) == NULL) || r; - r = ((glVertexAttrib3hvNV = (PFNGLVERTEXATTRIB3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hvNV")) == NULL) || r; - r = ((glVertexAttrib4hNV = (PFNGLVERTEXATTRIB4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hNV")) == NULL) || r; - r = ((glVertexAttrib4hvNV = (PFNGLVERTEXATTRIB4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hvNV")) == NULL) || r; - r = ((glVertexAttribs1hvNV = (PFNGLVERTEXATTRIBS1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1hvNV")) == NULL) || r; - r = ((glVertexAttribs2hvNV = (PFNGLVERTEXATTRIBS2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2hvNV")) == NULL) || r; - r = ((glVertexAttribs3hvNV = (PFNGLVERTEXATTRIBS3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3hvNV")) == NULL) || r; - r = ((glVertexAttribs4hvNV = (PFNGLVERTEXATTRIBS4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4hvNV")) == NULL) || r; - r = ((glVertexWeighthNV = (PFNGLVERTEXWEIGHTHNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthNV")) == NULL) || r; - r = ((glVertexWeighthvNV = (PFNGLVERTEXWEIGHTHVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_half_float */ - -#ifdef GL_NV_light_max_exponent - -#endif /* GL_NV_light_max_exponent */ - -#ifdef GL_NV_multisample_filter_hint - -#endif /* GL_NV_multisample_filter_hint */ - -#ifdef GL_NV_occlusion_query - -static GLboolean _glewInit_GL_NV_occlusion_query (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginOcclusionQueryNV = (PFNGLBEGINOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glBeginOcclusionQueryNV")) == NULL) || r; - r = ((glDeleteOcclusionQueriesNV = (PFNGLDELETEOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteOcclusionQueriesNV")) == NULL) || r; - r = ((glEndOcclusionQueryNV = (PFNGLENDOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glEndOcclusionQueryNV")) == NULL) || r; - r = ((glGenOcclusionQueriesNV = (PFNGLGENOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glGenOcclusionQueriesNV")) == NULL) || r; - r = ((glGetOcclusionQueryivNV = (PFNGLGETOCCLUSIONQUERYIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryivNV")) == NULL) || r; - r = ((glGetOcclusionQueryuivNV = (PFNGLGETOCCLUSIONQUERYUIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryuivNV")) == NULL) || r; - r = ((glIsOcclusionQueryNV = (PFNGLISOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glIsOcclusionQueryNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_occlusion_query */ - -#ifdef GL_NV_packed_depth_stencil - -#endif /* GL_NV_packed_depth_stencil */ - -#ifdef GL_NV_parameter_buffer_object - -static GLboolean _glewInit_GL_NV_parameter_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glProgramBufferParametersIivNV = (PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersIivNV")) == NULL) || r; - r = ((glProgramBufferParametersIuivNV = (PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersIuivNV")) == NULL) || r; - r = ((glProgramBufferParametersfvNV = (PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersfvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_parameter_buffer_object */ - -#ifdef GL_NV_pixel_data_range - -static GLboolean _glewInit_GL_NV_pixel_data_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushPixelDataRangeNV = (PFNGLFLUSHPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushPixelDataRangeNV")) == NULL) || r; - r = ((glPixelDataRangeNV = (PFNGLPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glPixelDataRangeNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_pixel_data_range */ - -#ifdef GL_NV_point_sprite - -static GLboolean _glewInit_GL_NV_point_sprite (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPointParameteriNV = (PFNGLPOINTPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glPointParameteriNV")) == NULL) || r; - r = ((glPointParameterivNV = (PFNGLPOINTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_point_sprite */ - -#ifdef GL_NV_present_video - -static GLboolean _glewInit_GL_NV_present_video (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - -// r = ((glGetVideoi64vNV = (PFNGLGETVIDEOI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoi64vNV")) == NULL) || r; - r = ((glGetVideoivNV = (PFNGLGETVIDEOIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoivNV")) == NULL) || r; -// r = ((glGetVideoui64vNV = (PFNGLGETVIDEOUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoui64vNV")) == NULL) || r; - r = ((glGetVideouivNV = (PFNGLGETVIDEOUIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideouivNV")) == NULL) || r; -// r = ((glPresentFrameDualFillNV = (PFNGLPRESENTFRAMEDUALFILLNVPROC)glewGetProcAddress((const GLubyte*)"glPresentFrameDualFillNV")) == NULL) || r; -// r = ((glPresentFrameKeyedNV = (PFNGLPRESENTFRAMEKEYEDNVPROC)glewGetProcAddress((const GLubyte*)"glPresentFrameKeyedNV")) == NULL) || r; - r = ((glVideoParameterivNV = (PFNGLVIDEOPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glVideoParameterivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_present_video */ - -#ifdef GL_NV_primitive_restart - -static GLboolean _glewInit_GL_NV_primitive_restart (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPrimitiveRestartIndexNV = (PFNGLPRIMITIVERESTARTINDEXNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartIndexNV")) == NULL) || r; - r = ((glPrimitiveRestartNV = (PFNGLPRIMITIVERESTARTNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_primitive_restart */ - -#ifdef GL_NV_register_combiners - -static GLboolean _glewInit_GL_NV_register_combiners (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCombinerInputNV = (PFNGLCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerInputNV")) == NULL) || r; - r = ((glCombinerOutputNV = (PFNGLCOMBINEROUTPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerOutputNV")) == NULL) || r; - r = ((glCombinerParameterfNV = (PFNGLCOMBINERPARAMETERFNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfNV")) == NULL) || r; - r = ((glCombinerParameterfvNV = (PFNGLCOMBINERPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfvNV")) == NULL) || r; - r = ((glCombinerParameteriNV = (PFNGLCOMBINERPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameteriNV")) == NULL) || r; - r = ((glCombinerParameterivNV = (PFNGLCOMBINERPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterivNV")) == NULL) || r; - r = ((glFinalCombinerInputNV = (PFNGLFINALCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glFinalCombinerInputNV")) == NULL) || r; - r = ((glGetCombinerInputParameterfvNV = (PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterfvNV")) == NULL) || r; - r = ((glGetCombinerInputParameterivNV = (PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterivNV")) == NULL) || r; - r = ((glGetCombinerOutputParameterfvNV = (PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterfvNV")) == NULL) || r; - r = ((glGetCombinerOutputParameterivNV = (PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterivNV")) == NULL) || r; - r = ((glGetFinalCombinerInputParameterfvNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterfvNV")) == NULL) || r; - r = ((glGetFinalCombinerInputParameterivNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_register_combiners */ - -#ifdef GL_NV_register_combiners2 - -static GLboolean _glewInit_GL_NV_register_combiners2 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCombinerStageParameterfvNV = (PFNGLCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerStageParameterfvNV")) == NULL) || r; - r = ((glGetCombinerStageParameterfvNV = (PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerStageParameterfvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_register_combiners2 */ - -#ifdef GL_NV_texgen_emboss - -#endif /* GL_NV_texgen_emboss */ - -#ifdef GL_NV_texgen_reflection - -#endif /* GL_NV_texgen_reflection */ - -#ifdef GL_NV_texture_compression_vtc - -#endif /* GL_NV_texture_compression_vtc */ - -#ifdef GL_NV_texture_env_combine4 - -#endif /* GL_NV_texture_env_combine4 */ - -#ifdef GL_NV_texture_expand_normal - -#endif /* GL_NV_texture_expand_normal */ - -#ifdef GL_NV_texture_rectangle - -#endif /* GL_NV_texture_rectangle */ - -#ifdef GL_NV_texture_shader - -#endif /* GL_NV_texture_shader */ - -#ifdef GL_NV_texture_shader2 - -#endif /* GL_NV_texture_shader2 */ - -#ifdef GL_NV_texture_shader3 - -#endif /* GL_NV_texture_shader3 */ - -#ifdef GL_NV_transform_feedback - -static GLboolean _glewInit_GL_NV_transform_feedback (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glActiveVaryingNV = (PFNGLACTIVEVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glActiveVaryingNV")) == NULL) || r; - r = ((glBeginTransformFeedbackNV = (PFNGLBEGINTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedbackNV")) == NULL) || r; - r = ((glBindBufferBaseNV = (PFNGLBINDBUFFERBASENVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBaseNV")) == NULL) || r; - r = ((glBindBufferOffsetNV = (PFNGLBINDBUFFEROFFSETNVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferOffsetNV")) == NULL) || r; - r = ((glBindBufferRangeNV = (PFNGLBINDBUFFERRANGENVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRangeNV")) == NULL) || r; - r = ((glEndTransformFeedbackNV = (PFNGLENDTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedbackNV")) == NULL) || r; - r = ((glGetActiveVaryingNV = (PFNGLGETACTIVEVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveVaryingNV")) == NULL) || r; - r = ((glGetTransformFeedbackVaryingNV = (PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVaryingNV")) == NULL) || r; - r = ((glGetVaryingLocationNV = (PFNGLGETVARYINGLOCATIONNVPROC)glewGetProcAddress((const GLubyte*)"glGetVaryingLocationNV")) == NULL) || r; - r = ((glTransformFeedbackAttribsNV = (PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackAttribsNV")) == NULL) || r; - r = ((glTransformFeedbackVaryingsNV = (PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryingsNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_transform_feedback */ - -#ifdef GL_NV_vertex_array_range - -static GLboolean _glewInit_GL_NV_vertex_array_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushVertexArrayRangeNV = (PFNGLFLUSHVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeNV")) == NULL) || r; - r = ((glVertexArrayRangeNV = (PFNGLVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_vertex_array_range */ - -#ifdef GL_NV_vertex_array_range2 - -#endif /* GL_NV_vertex_array_range2 */ - -#ifdef GL_NV_vertex_program - -static GLboolean _glewInit_GL_NV_vertex_program (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAreProgramsResidentNV = (PFNGLAREPROGRAMSRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glAreProgramsResidentNV")) == NULL) || r; - r = ((glBindProgramNV = (PFNGLBINDPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glBindProgramNV")) == NULL) || r; - r = ((glDeleteProgramsNV = (PFNGLDELETEPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsNV")) == NULL) || r; - r = ((glExecuteProgramNV = (PFNGLEXECUTEPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glExecuteProgramNV")) == NULL) || r; - r = ((glGenProgramsNV = (PFNGLGENPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsNV")) == NULL) || r; - r = ((glGetProgramParameterdvNV = (PFNGLGETPROGRAMPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterdvNV")) == NULL) || r; - r = ((glGetProgramParameterfvNV = (PFNGLGETPROGRAMPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterfvNV")) == NULL) || r; - r = ((glGetProgramStringNV = (PFNGLGETPROGRAMSTRINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringNV")) == NULL) || r; - r = ((glGetProgramivNV = (PFNGLGETPROGRAMIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivNV")) == NULL) || r; - r = ((glGetTrackMatrixivNV = (PFNGLGETTRACKMATRIXIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetTrackMatrixivNV")) == NULL) || r; - r = ((glGetVertexAttribPointervNV = (PFNGLGETVERTEXATTRIBPOINTERVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervNV")) == NULL) || r; - r = ((glGetVertexAttribdvNV = (PFNGLGETVERTEXATTRIBDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvNV")) == NULL) || r; - r = ((glGetVertexAttribfvNV = (PFNGLGETVERTEXATTRIBFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvNV")) == NULL) || r; - r = ((glGetVertexAttribivNV = (PFNGLGETVERTEXATTRIBIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivNV")) == NULL) || r; - r = ((glIsProgramNV = (PFNGLISPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glIsProgramNV")) == NULL) || r; - r = ((glLoadProgramNV = (PFNGLLOADPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glLoadProgramNV")) == NULL) || r; - r = ((glProgramParameter4dNV = (PFNGLPROGRAMPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dNV")) == NULL) || r; - r = ((glProgramParameter4dvNV = (PFNGLPROGRAMPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dvNV")) == NULL) || r; - r = ((glProgramParameter4fNV = (PFNGLPROGRAMPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fNV")) == NULL) || r; - r = ((glProgramParameter4fvNV = (PFNGLPROGRAMPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fvNV")) == NULL) || r; - r = ((glProgramParameters4dvNV = (PFNGLPROGRAMPARAMETERS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4dvNV")) == NULL) || r; - r = ((glProgramParameters4fvNV = (PFNGLPROGRAMPARAMETERS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4fvNV")) == NULL) || r; - r = ((glRequestResidentProgramsNV = (PFNGLREQUESTRESIDENTPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glRequestResidentProgramsNV")) == NULL) || r; - r = ((glTrackMatrixNV = (PFNGLTRACKMATRIXNVPROC)glewGetProcAddress((const GLubyte*)"glTrackMatrixNV")) == NULL) || r; - r = ((glVertexAttrib1dNV = (PFNGLVERTEXATTRIB1DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dNV")) == NULL) || r; - r = ((glVertexAttrib1dvNV = (PFNGLVERTEXATTRIB1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvNV")) == NULL) || r; - r = ((glVertexAttrib1fNV = (PFNGLVERTEXATTRIB1FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fNV")) == NULL) || r; - r = ((glVertexAttrib1fvNV = (PFNGLVERTEXATTRIB1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvNV")) == NULL) || r; - r = ((glVertexAttrib1sNV = (PFNGLVERTEXATTRIB1SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sNV")) == NULL) || r; - r = ((glVertexAttrib1svNV = (PFNGLVERTEXATTRIB1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svNV")) == NULL) || r; - r = ((glVertexAttrib2dNV = (PFNGLVERTEXATTRIB2DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dNV")) == NULL) || r; - r = ((glVertexAttrib2dvNV = (PFNGLVERTEXATTRIB2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvNV")) == NULL) || r; - r = ((glVertexAttrib2fNV = (PFNGLVERTEXATTRIB2FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fNV")) == NULL) || r; - r = ((glVertexAttrib2fvNV = (PFNGLVERTEXATTRIB2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvNV")) == NULL) || r; - r = ((glVertexAttrib2sNV = (PFNGLVERTEXATTRIB2SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sNV")) == NULL) || r; - r = ((glVertexAttrib2svNV = (PFNGLVERTEXATTRIB2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svNV")) == NULL) || r; - r = ((glVertexAttrib3dNV = (PFNGLVERTEXATTRIB3DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dNV")) == NULL) || r; - r = ((glVertexAttrib3dvNV = (PFNGLVERTEXATTRIB3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvNV")) == NULL) || r; - r = ((glVertexAttrib3fNV = (PFNGLVERTEXATTRIB3FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fNV")) == NULL) || r; - r = ((glVertexAttrib3fvNV = (PFNGLVERTEXATTRIB3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvNV")) == NULL) || r; - r = ((glVertexAttrib3sNV = (PFNGLVERTEXATTRIB3SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sNV")) == NULL) || r; - r = ((glVertexAttrib3svNV = (PFNGLVERTEXATTRIB3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svNV")) == NULL) || r; - r = ((glVertexAttrib4dNV = (PFNGLVERTEXATTRIB4DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dNV")) == NULL) || r; - r = ((glVertexAttrib4dvNV = (PFNGLVERTEXATTRIB4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvNV")) == NULL) || r; - r = ((glVertexAttrib4fNV = (PFNGLVERTEXATTRIB4FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fNV")) == NULL) || r; - r = ((glVertexAttrib4fvNV = (PFNGLVERTEXATTRIB4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvNV")) == NULL) || r; - r = ((glVertexAttrib4sNV = (PFNGLVERTEXATTRIB4SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sNV")) == NULL) || r; - r = ((glVertexAttrib4svNV = (PFNGLVERTEXATTRIB4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svNV")) == NULL) || r; - r = ((glVertexAttrib4ubNV = (PFNGLVERTEXATTRIB4UBNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubNV")) == NULL) || r; - r = ((glVertexAttrib4ubvNV = (PFNGLVERTEXATTRIB4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvNV")) == NULL) || r; - r = ((glVertexAttribPointerNV = (PFNGLVERTEXATTRIBPOINTERNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerNV")) == NULL) || r; - r = ((glVertexAttribs1dvNV = (PFNGLVERTEXATTRIBS1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1dvNV")) == NULL) || r; - r = ((glVertexAttribs1fvNV = (PFNGLVERTEXATTRIBS1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1fvNV")) == NULL) || r; - r = ((glVertexAttribs1svNV = (PFNGLVERTEXATTRIBS1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1svNV")) == NULL) || r; - r = ((glVertexAttribs2dvNV = (PFNGLVERTEXATTRIBS2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2dvNV")) == NULL) || r; - r = ((glVertexAttribs2fvNV = (PFNGLVERTEXATTRIBS2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2fvNV")) == NULL) || r; - r = ((glVertexAttribs2svNV = (PFNGLVERTEXATTRIBS2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2svNV")) == NULL) || r; - r = ((glVertexAttribs3dvNV = (PFNGLVERTEXATTRIBS3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3dvNV")) == NULL) || r; - r = ((glVertexAttribs3fvNV = (PFNGLVERTEXATTRIBS3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3fvNV")) == NULL) || r; - r = ((glVertexAttribs3svNV = (PFNGLVERTEXATTRIBS3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3svNV")) == NULL) || r; - r = ((glVertexAttribs4dvNV = (PFNGLVERTEXATTRIBS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4dvNV")) == NULL) || r; - r = ((glVertexAttribs4fvNV = (PFNGLVERTEXATTRIBS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4fvNV")) == NULL) || r; - r = ((glVertexAttribs4svNV = (PFNGLVERTEXATTRIBS4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4svNV")) == NULL) || r; - r = ((glVertexAttribs4ubvNV = (PFNGLVERTEXATTRIBS4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4ubvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_vertex_program */ - -#ifdef GL_NV_vertex_program1_1 - -#endif /* GL_NV_vertex_program1_1 */ - -#ifdef GL_NV_vertex_program2 - -#endif /* GL_NV_vertex_program2 */ - -#ifdef GL_NV_vertex_program2_option - -#endif /* GL_NV_vertex_program2_option */ - -#ifdef GL_NV_vertex_program3 - -#endif /* GL_NV_vertex_program3 */ - -#ifdef GL_NV_vertex_program4 - -#endif /* GL_NV_vertex_program4 */ - -#ifdef GL_OES_byte_coordinates - -#endif /* GL_OES_byte_coordinates */ - -#ifdef GL_OES_compressed_paletted_texture - -#endif /* GL_OES_compressed_paletted_texture */ - -#ifdef GL_OES_read_format - -#endif /* GL_OES_read_format */ - -#ifdef GL_OES_single_precision - -static GLboolean _glewInit_GL_OES_single_precision (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClearDepthfOES = (PFNGLCLEARDEPTHFOESPROC)glewGetProcAddress((const GLubyte*)"glClearDepthfOES")) == NULL) || r; - r = ((glClipPlanefOES = (PFNGLCLIPPLANEFOESPROC)glewGetProcAddress((const GLubyte*)"glClipPlanefOES")) == NULL) || r; - r = ((glDepthRangefOES = (PFNGLDEPTHRANGEFOESPROC)glewGetProcAddress((const GLubyte*)"glDepthRangefOES")) == NULL) || r; - r = ((glFrustumfOES = (PFNGLFRUSTUMFOESPROC)glewGetProcAddress((const GLubyte*)"glFrustumfOES")) == NULL) || r; - r = ((glGetClipPlanefOES = (PFNGLGETCLIPPLANEFOESPROC)glewGetProcAddress((const GLubyte*)"glGetClipPlanefOES")) == NULL) || r; - r = ((glOrthofOES = (PFNGLORTHOFOESPROC)glewGetProcAddress((const GLubyte*)"glOrthofOES")) == NULL) || r; - - return r; -} - -#endif /* GL_OES_single_precision */ - -#ifdef GL_OML_interlace - -#endif /* GL_OML_interlace */ - -#ifdef GL_OML_resample - -#endif /* GL_OML_resample */ - -#ifdef GL_OML_subsample - -#endif /* GL_OML_subsample */ - -#ifdef GL_PGI_misc_hints - -#endif /* GL_PGI_misc_hints */ - -#ifdef GL_PGI_vertex_hints - -#endif /* GL_PGI_vertex_hints */ - -#ifdef GL_REND_screen_coordinates - -#endif /* GL_REND_screen_coordinates */ - -#ifdef GL_S3_s3tc - -#endif /* GL_S3_s3tc */ - -#ifdef GL_SGIS_color_range - -#endif /* GL_SGIS_color_range */ - -#ifdef GL_SGIS_detail_texture - -static GLboolean _glewInit_GL_SGIS_detail_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDetailTexFuncSGIS = (PFNGLDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glDetailTexFuncSGIS")) == NULL) || r; - r = ((glGetDetailTexFuncSGIS = (PFNGLGETDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetDetailTexFuncSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_detail_texture */ - -#ifdef GL_SGIS_fog_function - -static GLboolean _glewInit_GL_SGIS_fog_function (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFogFuncSGIS = (PFNGLFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glFogFuncSGIS")) == NULL) || r; - r = ((glGetFogFuncSGIS = (PFNGLGETFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetFogFuncSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_fog_function */ - -#ifdef GL_SGIS_generate_mipmap - -#endif /* GL_SGIS_generate_mipmap */ - -#ifdef GL_SGIS_multisample - -static GLboolean _glewInit_GL_SGIS_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSampleMaskSGIS = (PFNGLSAMPLEMASKSGISPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskSGIS")) == NULL) || r; - r = ((glSamplePatternSGIS = (PFNGLSAMPLEPATTERNSGISPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_multisample */ - -#ifdef GL_SGIS_pixel_texture - -#endif /* GL_SGIS_pixel_texture */ - -#ifdef GL_SGIS_point_line_texgen - -#endif /* GL_SGIS_point_line_texgen */ - -#ifdef GL_SGIS_sharpen_texture - -static GLboolean _glewInit_GL_SGIS_sharpen_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetSharpenTexFuncSGIS = (PFNGLGETSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetSharpenTexFuncSGIS")) == NULL) || r; - r = ((glSharpenTexFuncSGIS = (PFNGLSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glSharpenTexFuncSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_sharpen_texture */ - -#ifdef GL_SGIS_texture4D - -static GLboolean _glewInit_GL_SGIS_texture4D (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexImage4DSGIS = (PFNGLTEXIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexImage4DSGIS")) == NULL) || r; - r = ((glTexSubImage4DSGIS = (PFNGLTEXSUBIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage4DSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_texture4D */ - -#ifdef GL_SGIS_texture_border_clamp - -#endif /* GL_SGIS_texture_border_clamp */ - -#ifdef GL_SGIS_texture_edge_clamp - -#endif /* GL_SGIS_texture_edge_clamp */ - -#ifdef GL_SGIS_texture_filter4 - -static GLboolean _glewInit_GL_SGIS_texture_filter4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetTexFilterFuncSGIS = (PFNGLGETTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetTexFilterFuncSGIS")) == NULL) || r; - r = ((glTexFilterFuncSGIS = (PFNGLTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glTexFilterFuncSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_texture_filter4 */ - -#ifdef GL_SGIS_texture_lod - -#endif /* GL_SGIS_texture_lod */ - -#ifdef GL_SGIS_texture_select - -#endif /* GL_SGIS_texture_select */ - -#ifdef GL_SGIX_async - -static GLboolean _glewInit_GL_SGIX_async (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAsyncMarkerSGIX = (PFNGLASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glAsyncMarkerSGIX")) == NULL) || r; - r = ((glDeleteAsyncMarkersSGIX = (PFNGLDELETEASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glDeleteAsyncMarkersSGIX")) == NULL) || r; - r = ((glFinishAsyncSGIX = (PFNGLFINISHASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glFinishAsyncSGIX")) == NULL) || r; - r = ((glGenAsyncMarkersSGIX = (PFNGLGENASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glGenAsyncMarkersSGIX")) == NULL) || r; - r = ((glIsAsyncMarkerSGIX = (PFNGLISASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glIsAsyncMarkerSGIX")) == NULL) || r; - r = ((glPollAsyncSGIX = (PFNGLPOLLASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glPollAsyncSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_async */ - -#ifdef GL_SGIX_async_histogram - -#endif /* GL_SGIX_async_histogram */ - -#ifdef GL_SGIX_async_pixel - -#endif /* GL_SGIX_async_pixel */ - -#ifdef GL_SGIX_blend_alpha_minmax - -#endif /* GL_SGIX_blend_alpha_minmax */ - -#ifdef GL_SGIX_clipmap - -#endif /* GL_SGIX_clipmap */ - -#ifdef GL_SGIX_convolution_accuracy - -#endif /* GL_SGIX_convolution_accuracy */ - -#ifdef GL_SGIX_depth_texture - -#endif /* GL_SGIX_depth_texture */ - -#ifdef GL_SGIX_flush_raster - -static GLboolean _glewInit_GL_SGIX_flush_raster (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushRasterSGIX = (PFNGLFLUSHRASTERSGIXPROC)glewGetProcAddress((const GLubyte*)"glFlushRasterSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_flush_raster */ - -#ifdef GL_SGIX_fog_offset - -#endif /* GL_SGIX_fog_offset */ - -#ifdef GL_SGIX_fog_texture - -static GLboolean _glewInit_GL_SGIX_fog_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTextureFogSGIX = (PFNGLTEXTUREFOGSGIXPROC)glewGetProcAddress((const GLubyte*)"glTextureFogSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_fog_texture */ - -#ifdef GL_SGIX_fragment_specular_lighting - -static GLboolean _glewInit_GL_SGIX_fragment_specular_lighting (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFragmentColorMaterialSGIX = (PFNGLFRAGMENTCOLORMATERIALSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialSGIX")) == NULL) || r; - r = ((glFragmentLightModelfSGIX = (PFNGLFRAGMENTLIGHTMODELFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfSGIX")) == NULL) || r; - r = ((glFragmentLightModelfvSGIX = (PFNGLFRAGMENTLIGHTMODELFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvSGIX")) == NULL) || r; - r = ((glFragmentLightModeliSGIX = (PFNGLFRAGMENTLIGHTMODELISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliSGIX")) == NULL) || r; - r = ((glFragmentLightModelivSGIX = (PFNGLFRAGMENTLIGHTMODELIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivSGIX")) == NULL) || r; - r = ((glFragmentLightfSGIX = (PFNGLFRAGMENTLIGHTFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfSGIX")) == NULL) || r; - r = ((glFragmentLightfvSGIX = (PFNGLFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvSGIX")) == NULL) || r; - r = ((glFragmentLightiSGIX = (PFNGLFRAGMENTLIGHTISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiSGIX")) == NULL) || r; - r = ((glFragmentLightivSGIX = (PFNGLFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivSGIX")) == NULL) || r; - r = ((glFragmentMaterialfSGIX = (PFNGLFRAGMENTMATERIALFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfSGIX")) == NULL) || r; - r = ((glFragmentMaterialfvSGIX = (PFNGLFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvSGIX")) == NULL) || r; - r = ((glFragmentMaterialiSGIX = (PFNGLFRAGMENTMATERIALISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiSGIX")) == NULL) || r; - r = ((glFragmentMaterialivSGIX = (PFNGLFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivSGIX")) == NULL) || r; - r = ((glGetFragmentLightfvSGIX = (PFNGLGETFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvSGIX")) == NULL) || r; - r = ((glGetFragmentLightivSGIX = (PFNGLGETFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivSGIX")) == NULL) || r; - r = ((glGetFragmentMaterialfvSGIX = (PFNGLGETFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvSGIX")) == NULL) || r; - r = ((glGetFragmentMaterialivSGIX = (PFNGLGETFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_fragment_specular_lighting */ - -#ifdef GL_SGIX_framezoom - -static GLboolean _glewInit_GL_SGIX_framezoom (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFrameZoomSGIX = (PFNGLFRAMEZOOMSGIXPROC)glewGetProcAddress((const GLubyte*)"glFrameZoomSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_framezoom */ - -#ifdef GL_SGIX_interlace - -#endif /* GL_SGIX_interlace */ - -#ifdef GL_SGIX_ir_instrument1 - -#endif /* GL_SGIX_ir_instrument1 */ - -#ifdef GL_SGIX_list_priority - -#endif /* GL_SGIX_list_priority */ - -#ifdef GL_SGIX_pixel_texture - -static GLboolean _glewInit_GL_SGIX_pixel_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPixelTexGenSGIX = (PFNGLPIXELTEXGENSGIXPROC)glewGetProcAddress((const GLubyte*)"glPixelTexGenSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_pixel_texture */ - -#ifdef GL_SGIX_pixel_texture_bits - -#endif /* GL_SGIX_pixel_texture_bits */ - -#ifdef GL_SGIX_reference_plane - -static GLboolean _glewInit_GL_SGIX_reference_plane (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glReferencePlaneSGIX = (PFNGLREFERENCEPLANESGIXPROC)glewGetProcAddress((const GLubyte*)"glReferencePlaneSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_reference_plane */ - -#ifdef GL_SGIX_resample - -#endif /* GL_SGIX_resample */ - -#ifdef GL_SGIX_shadow - -#endif /* GL_SGIX_shadow */ - -#ifdef GL_SGIX_shadow_ambient - -#endif /* GL_SGIX_shadow_ambient */ - -#ifdef GL_SGIX_sprite - -static GLboolean _glewInit_GL_SGIX_sprite (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSpriteParameterfSGIX = (PFNGLSPRITEPARAMETERFSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfSGIX")) == NULL) || r; - r = ((glSpriteParameterfvSGIX = (PFNGLSPRITEPARAMETERFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfvSGIX")) == NULL) || r; - r = ((glSpriteParameteriSGIX = (PFNGLSPRITEPARAMETERISGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameteriSGIX")) == NULL) || r; - r = ((glSpriteParameterivSGIX = (PFNGLSPRITEPARAMETERIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterivSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_sprite */ - -#ifdef GL_SGIX_tag_sample_buffer - -static GLboolean _glewInit_GL_SGIX_tag_sample_buffer (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTagSampleBufferSGIX = (PFNGLTAGSAMPLEBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glTagSampleBufferSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_tag_sample_buffer */ - -#ifdef GL_SGIX_texture_add_env - -#endif /* GL_SGIX_texture_add_env */ - -#ifdef GL_SGIX_texture_coordinate_clamp - -#endif /* GL_SGIX_texture_coordinate_clamp */ - -#ifdef GL_SGIX_texture_lod_bias - -#endif /* GL_SGIX_texture_lod_bias */ - -#ifdef GL_SGIX_texture_multi_buffer - -#endif /* GL_SGIX_texture_multi_buffer */ - -#ifdef GL_SGIX_texture_range - -#endif /* GL_SGIX_texture_range */ - -#ifdef GL_SGIX_texture_scale_bias - -#endif /* GL_SGIX_texture_scale_bias */ - -#ifdef GL_SGIX_vertex_preclip - -#endif /* GL_SGIX_vertex_preclip */ - -#ifdef GL_SGIX_vertex_preclip_hint - -#endif /* GL_SGIX_vertex_preclip_hint */ - -#ifdef GL_SGIX_ycrcb - -#endif /* GL_SGIX_ycrcb */ - -#ifdef GL_SGI_color_matrix - -#endif /* GL_SGI_color_matrix */ - -#ifdef GL_SGI_color_table - -static GLboolean _glewInit_GL_SGI_color_table (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorTableParameterfvSGI = (PFNGLCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfvSGI")) == NULL) || r; - r = ((glColorTableParameterivSGI = (PFNGLCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterivSGI")) == NULL) || r; - r = ((glColorTableSGI = (PFNGLCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableSGI")) == NULL) || r; - r = ((glCopyColorTableSGI = (PFNGLCOPYCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTableSGI")) == NULL) || r; - r = ((glGetColorTableParameterfvSGI = (PFNGLGETCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvSGI")) == NULL) || r; - r = ((glGetColorTableParameterivSGI = (PFNGLGETCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivSGI")) == NULL) || r; - r = ((glGetColorTableSGI = (PFNGLGETCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableSGI")) == NULL) || r; - - return r; -} - -#endif /* GL_SGI_color_table */ - -#ifdef GL_SGI_texture_color_table - -#endif /* GL_SGI_texture_color_table */ - -#ifdef GL_SUNX_constant_data - -static GLboolean _glewInit_GL_SUNX_constant_data (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFinishTextureSUNX = (PFNGLFINISHTEXTURESUNXPROC)glewGetProcAddress((const GLubyte*)"glFinishTextureSUNX")) == NULL) || r; - - return r; -} - -#endif /* GL_SUNX_constant_data */ - -#ifdef GL_SUN_convolution_border_modes - -#endif /* GL_SUN_convolution_border_modes */ - -#ifdef GL_SUN_global_alpha - -static GLboolean _glewInit_GL_SUN_global_alpha (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGlobalAlphaFactorbSUN = (PFNGLGLOBALALPHAFACTORBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorbSUN")) == NULL) || r; - r = ((glGlobalAlphaFactordSUN = (PFNGLGLOBALALPHAFACTORDSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactordSUN")) == NULL) || r; - r = ((glGlobalAlphaFactorfSUN = (PFNGLGLOBALALPHAFACTORFSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorfSUN")) == NULL) || r; - r = ((glGlobalAlphaFactoriSUN = (PFNGLGLOBALALPHAFACTORISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoriSUN")) == NULL) || r; - r = ((glGlobalAlphaFactorsSUN = (PFNGLGLOBALALPHAFACTORSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorsSUN")) == NULL) || r; - r = ((glGlobalAlphaFactorubSUN = (PFNGLGLOBALALPHAFACTORUBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorubSUN")) == NULL) || r; - r = ((glGlobalAlphaFactoruiSUN = (PFNGLGLOBALALPHAFACTORUISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoruiSUN")) == NULL) || r; - r = ((glGlobalAlphaFactorusSUN = (PFNGLGLOBALALPHAFACTORUSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorusSUN")) == NULL) || r; - - return r; -} - -#endif /* GL_SUN_global_alpha */ - -#ifdef GL_SUN_mesh_array - -#endif /* GL_SUN_mesh_array */ - -#ifdef GL_SUN_read_video_pixels - -static GLboolean _glewInit_GL_SUN_read_video_pixels (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glReadVideoPixelsSUN = (PFNGLREADVIDEOPIXELSSUNPROC)glewGetProcAddress((const GLubyte*)"glReadVideoPixelsSUN")) == NULL) || r; - - return r; -} - -#endif /* GL_SUN_read_video_pixels */ - -#ifdef GL_SUN_slice_accum - -#endif /* GL_SUN_slice_accum */ - -#ifdef GL_SUN_triangle_list - -static GLboolean _glewInit_GL_SUN_triangle_list (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glReplacementCodePointerSUN = (PFNGLREPLACEMENTCODEPOINTERSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodePointerSUN")) == NULL) || r; - r = ((glReplacementCodeubSUN = (PFNGLREPLACEMENTCODEUBSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubSUN")) == NULL) || r; - r = ((glReplacementCodeubvSUN = (PFNGLREPLACEMENTCODEUBVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubvSUN")) == NULL) || r; - r = ((glReplacementCodeuiSUN = (PFNGLREPLACEMENTCODEUISUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiSUN")) == NULL) || r; - r = ((glReplacementCodeuivSUN = (PFNGLREPLACEMENTCODEUIVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuivSUN")) == NULL) || r; - r = ((glReplacementCodeusSUN = (PFNGLREPLACEMENTCODEUSSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusSUN")) == NULL) || r; - r = ((glReplacementCodeusvSUN = (PFNGLREPLACEMENTCODEUSVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusvSUN")) == NULL) || r; - - return r; -} - -#endif /* GL_SUN_triangle_list */ - -#ifdef GL_SUN_vertex - -static GLboolean _glewInit_GL_SUN_vertex (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColor3fVertex3fSUN = (PFNGLCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fSUN")) == NULL) || r; - r = ((glColor3fVertex3fvSUN = (PFNGLCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fvSUN")) == NULL) || r; - r = ((glColor4fNormal3fVertex3fSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glColor4fNormal3fVertex3fvSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glColor4ubVertex2fSUN = (PFNGLCOLOR4UBVERTEX2FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fSUN")) == NULL) || r; - r = ((glColor4ubVertex2fvSUN = (PFNGLCOLOR4UBVERTEX2FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fvSUN")) == NULL) || r; - r = ((glColor4ubVertex3fSUN = (PFNGLCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fSUN")) == NULL) || r; - r = ((glColor4ubVertex3fvSUN = (PFNGLCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fvSUN")) == NULL) || r; - r = ((glNormal3fVertex3fSUN = (PFNGLNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fSUN")) == NULL) || r; - r = ((glNormal3fVertex3fvSUN = (PFNGLNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor4ubVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor4ubVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiVertex3fSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiVertex3fvSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fColor3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fColor3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fColor4ubVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fColor4ubVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fVertex3fSUN = (PFNGLTEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fVertex3fvSUN = (PFNGLTEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord4fColor4fNormal3fVertex4fSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fSUN")) == NULL) || r; - r = ((glTexCoord4fColor4fNormal3fVertex4fvSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fvSUN")) == NULL) || r; - r = ((glTexCoord4fVertex4fSUN = (PFNGLTEXCOORD4FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fSUN")) == NULL) || r; - r = ((glTexCoord4fVertex4fvSUN = (PFNGLTEXCOORD4FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fvSUN")) == NULL) || r; - - return r; -} - -#endif /* GL_SUN_vertex */ - -#ifdef GL_WIN_phong_shading - -#endif /* GL_WIN_phong_shading */ - -#ifdef GL_WIN_specular_fog - -#endif /* GL_WIN_specular_fog */ - -#ifdef GL_WIN_swap_hint - -static GLboolean _glewInit_GL_WIN_swap_hint (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAddSwapHintRectWIN = (PFNGLADDSWAPHINTRECTWINPROC)glewGetProcAddress((const GLubyte*)"glAddSwapHintRectWIN")) == NULL) || r; - - return r; -} - -#endif /* GL_WIN_swap_hint */ - -/* ------------------------------------------------------------------------- */ - -/* - * Search for name in the extensions string. Use of strstr() - * is not sufficient because extension names can be prefixes of - * other extension names. Could use strtok() but the constant - * string returned by glGetString might be in read-only memory. - */ -GLboolean glewGetExtension (const char* name) -{ - GLubyte* p; - GLubyte* end; - GLuint len = _glewStrLen((const GLubyte*)name); - p = (GLubyte*)glGetString(GL_EXTENSIONS); - if (0 == p) return GL_FALSE; - end = p + _glewStrLen(p); - while (p < end) - { - GLuint n = _glewStrCLen(p, ' '); - if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE; - p += n+1; - } - return GL_FALSE; -} - -/* ------------------------------------------------------------------------- */ - -#ifndef GLEW_MX -static -#endif -GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) -{ - const GLubyte* s; - GLuint dot, major, minor; - /* query opengl version */ - s = glGetString(GL_VERSION); - dot = _glewStrCLen(s, '.'); - major = dot-1; - minor = dot+1; - if (dot == 0 || s[minor] == '\0') - return GLEW_ERROR_NO_GL_VERSION; - if (s[major] == '1' && s[minor] == '0') - { - return GLEW_ERROR_GL_VERSION_10_ONLY; - } - else - { - CONST_CAST(GLEW_VERSION_1_1) = GL_TRUE; - if (s[major] >= '2') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_5) = GL_TRUE; - CONST_CAST(GLEW_VERSION_2_0) = GL_TRUE; - if (s[minor] >= '1') - { - CONST_CAST(GLEW_VERSION_2_1) = GL_TRUE; - } - } - else - { - if (s[minor] >= '5') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_5) = GL_TRUE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - if (s[minor] == '4') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - if (s[minor] == '3') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - if (s[minor] == '2') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - if (s[minor] < '2') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_3) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - } - } - /* initialize extensions */ -#ifdef GL_VERSION_1_2 - if (glewExperimental || GLEW_VERSION_1_2) CONST_CAST(GLEW_VERSION_1_2) = !_glewInit_GL_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_1_2 */ -#ifdef GL_VERSION_1_3 - if (glewExperimental || GLEW_VERSION_1_3) CONST_CAST(GLEW_VERSION_1_3) = !_glewInit_GL_VERSION_1_3(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_1_3 */ -#ifdef GL_VERSION_1_4 - if (glewExperimental || GLEW_VERSION_1_4) CONST_CAST(GLEW_VERSION_1_4) = !_glewInit_GL_VERSION_1_4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_1_4 */ -#ifdef GL_VERSION_1_5 - if (glewExperimental || GLEW_VERSION_1_5) CONST_CAST(GLEW_VERSION_1_5) = !_glewInit_GL_VERSION_1_5(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_1_5 */ -#ifdef GL_VERSION_2_0 - if (glewExperimental || GLEW_VERSION_2_0) CONST_CAST(GLEW_VERSION_2_0) = !_glewInit_GL_VERSION_2_0(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_2_0 */ -#ifdef GL_VERSION_2_1 - if (glewExperimental || GLEW_VERSION_2_1) CONST_CAST(GLEW_VERSION_2_1) = !_glewInit_GL_VERSION_2_1(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_2_1 */ -#ifdef GL_VERSION_3_0 - if (glewExperimental || GLEW_VERSION_3_0) CONST_CAST(GLEW_VERSION_3_0) = !_glewInit_GL_VERSION_3_0(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_3_0 */ -#ifdef GL_3DFX_multisample - CONST_CAST(GLEW_3DFX_multisample) = glewGetExtension("GL_3DFX_multisample"); -#endif /* GL_3DFX_multisample */ -#ifdef GL_3DFX_tbuffer - CONST_CAST(GLEW_3DFX_tbuffer) = glewGetExtension("GL_3DFX_tbuffer"); - if (glewExperimental || GLEW_3DFX_tbuffer) CONST_CAST(GLEW_3DFX_tbuffer) = !_glewInit_GL_3DFX_tbuffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_3DFX_tbuffer */ -#ifdef GL_3DFX_texture_compression_FXT1 - CONST_CAST(GLEW_3DFX_texture_compression_FXT1) = glewGetExtension("GL_3DFX_texture_compression_FXT1"); -#endif /* GL_3DFX_texture_compression_FXT1 */ -#ifdef GL_APPLE_client_storage - CONST_CAST(GLEW_APPLE_client_storage) = glewGetExtension("GL_APPLE_client_storage"); -#endif /* GL_APPLE_client_storage */ -#ifdef GL_APPLE_element_array - CONST_CAST(GLEW_APPLE_element_array) = glewGetExtension("GL_APPLE_element_array"); - if (glewExperimental || GLEW_APPLE_element_array) CONST_CAST(GLEW_APPLE_element_array) = !_glewInit_GL_APPLE_element_array(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_element_array */ -#ifdef GL_APPLE_fence - CONST_CAST(GLEW_APPLE_fence) = glewGetExtension("GL_APPLE_fence"); - if (glewExperimental || GLEW_APPLE_fence) CONST_CAST(GLEW_APPLE_fence) = !_glewInit_GL_APPLE_fence(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_fence */ -#ifdef GL_APPLE_float_pixels - CONST_CAST(GLEW_APPLE_float_pixels) = glewGetExtension("GL_APPLE_float_pixels"); -#endif /* GL_APPLE_float_pixels */ -#ifdef GL_APPLE_flush_buffer_range - CONST_CAST(GLEW_APPLE_flush_buffer_range) = glewGetExtension("GL_APPLE_flush_buffer_range"); - if (glewExperimental || GLEW_APPLE_flush_buffer_range) CONST_CAST(GLEW_APPLE_flush_buffer_range) = !_glewInit_GL_APPLE_flush_buffer_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_flush_buffer_range */ -#ifdef GL_APPLE_pixel_buffer - CONST_CAST(GLEW_APPLE_pixel_buffer) = glewGetExtension("GL_APPLE_pixel_buffer"); -#endif /* GL_APPLE_pixel_buffer */ -#ifdef GL_APPLE_specular_vector - CONST_CAST(GLEW_APPLE_specular_vector) = glewGetExtension("GL_APPLE_specular_vector"); -#endif /* GL_APPLE_specular_vector */ -#ifdef GL_APPLE_texture_range - CONST_CAST(GLEW_APPLE_texture_range) = glewGetExtension("GL_APPLE_texture_range"); - if (glewExperimental || GLEW_APPLE_texture_range) CONST_CAST(GLEW_APPLE_texture_range) = !_glewInit_GL_APPLE_texture_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_texture_range */ -#ifdef GL_APPLE_transform_hint - CONST_CAST(GLEW_APPLE_transform_hint) = glewGetExtension("GL_APPLE_transform_hint"); -#endif /* GL_APPLE_transform_hint */ -#ifdef GL_APPLE_vertex_array_object - CONST_CAST(GLEW_APPLE_vertex_array_object) = glewGetExtension("GL_APPLE_vertex_array_object"); - if (glewExperimental || GLEW_APPLE_vertex_array_object) CONST_CAST(GLEW_APPLE_vertex_array_object) = !_glewInit_GL_APPLE_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_vertex_array_object */ -#ifdef GL_APPLE_vertex_array_range - CONST_CAST(GLEW_APPLE_vertex_array_range) = glewGetExtension("GL_APPLE_vertex_array_range"); - if (glewExperimental || GLEW_APPLE_vertex_array_range) CONST_CAST(GLEW_APPLE_vertex_array_range) = !_glewInit_GL_APPLE_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_vertex_array_range */ -#ifdef GL_APPLE_ycbcr_422 - CONST_CAST(GLEW_APPLE_ycbcr_422) = glewGetExtension("GL_APPLE_ycbcr_422"); -#endif /* GL_APPLE_ycbcr_422 */ -#ifdef GL_ARB_color_buffer_float - CONST_CAST(GLEW_ARB_color_buffer_float) = glewGetExtension("GL_ARB_color_buffer_float"); - if (glewExperimental || GLEW_ARB_color_buffer_float) CONST_CAST(GLEW_ARB_color_buffer_float) = !_glewInit_GL_ARB_color_buffer_float(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_color_buffer_float */ -#ifdef GL_ARB_depth_buffer_float - CONST_CAST(GLEW_ARB_depth_buffer_float) = glewGetExtension("GL_ARB_depth_buffer_float"); -#endif /* GL_ARB_depth_buffer_float */ -#ifdef GL_ARB_depth_texture - CONST_CAST(GLEW_ARB_depth_texture) = glewGetExtension("GL_ARB_depth_texture"); -#endif /* GL_ARB_depth_texture */ -#ifdef GL_ARB_draw_buffers - CONST_CAST(GLEW_ARB_draw_buffers) = glewGetExtension("GL_ARB_draw_buffers"); - if (glewExperimental || GLEW_ARB_draw_buffers) CONST_CAST(GLEW_ARB_draw_buffers) = !_glewInit_GL_ARB_draw_buffers(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_draw_buffers */ -#ifdef GL_ARB_draw_instanced - CONST_CAST(GLEW_ARB_draw_instanced) = glewGetExtension("GL_ARB_draw_instanced"); - if (glewExperimental || GLEW_ARB_draw_instanced) CONST_CAST(GLEW_ARB_draw_instanced) = !_glewInit_GL_ARB_draw_instanced(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_draw_instanced */ -#ifdef GL_ARB_fragment_program - CONST_CAST(GLEW_ARB_fragment_program) = glewGetExtension("GL_ARB_fragment_program"); -#endif /* GL_ARB_fragment_program */ -#ifdef GL_ARB_fragment_program_shadow - CONST_CAST(GLEW_ARB_fragment_program_shadow) = glewGetExtension("GL_ARB_fragment_program_shadow"); -#endif /* GL_ARB_fragment_program_shadow */ -#ifdef GL_ARB_fragment_shader - CONST_CAST(GLEW_ARB_fragment_shader) = glewGetExtension("GL_ARB_fragment_shader"); -#endif /* GL_ARB_fragment_shader */ -#ifdef GL_ARB_framebuffer_object - CONST_CAST(GLEW_ARB_framebuffer_object) = glewGetExtension("GL_ARB_framebuffer_object"); - if (glewExperimental || GLEW_ARB_framebuffer_object) CONST_CAST(GLEW_ARB_framebuffer_object) = !_glewInit_GL_ARB_framebuffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_framebuffer_object */ -#ifdef GL_ARB_framebuffer_sRGB - CONST_CAST(GLEW_ARB_framebuffer_sRGB) = glewGetExtension("GL_ARB_framebuffer_sRGB"); -#endif /* GL_ARB_framebuffer_sRGB */ -#ifdef GL_ARB_geometry_shader4 - CONST_CAST(GLEW_ARB_geometry_shader4) = glewGetExtension("GL_ARB_geometry_shader4"); - if (glewExperimental || GLEW_ARB_geometry_shader4) CONST_CAST(GLEW_ARB_geometry_shader4) = !_glewInit_GL_ARB_geometry_shader4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_geometry_shader4 */ -#ifdef GL_ARB_half_float_pixel - CONST_CAST(GLEW_ARB_half_float_pixel) = glewGetExtension("GL_ARB_half_float_pixel"); -#endif /* GL_ARB_half_float_pixel */ -#ifdef GL_ARB_half_float_vertex - CONST_CAST(GLEW_ARB_half_float_vertex) = glewGetExtension("GL_ARB_half_float_vertex"); -#endif /* GL_ARB_half_float_vertex */ -#ifdef GL_ARB_imaging - CONST_CAST(GLEW_ARB_imaging) = glewGetExtension("GL_ARB_imaging"); - if (glewExperimental || GLEW_ARB_imaging) CONST_CAST(GLEW_ARB_imaging) = !_glewInit_GL_ARB_imaging(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_imaging */ -#ifdef GL_ARB_instanced_arrays - CONST_CAST(GLEW_ARB_instanced_arrays) = glewGetExtension("GL_ARB_instanced_arrays"); - if (glewExperimental || GLEW_ARB_instanced_arrays) CONST_CAST(GLEW_ARB_instanced_arrays) = !_glewInit_GL_ARB_instanced_arrays(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_instanced_arrays */ -#ifdef GL_ARB_map_buffer_range - CONST_CAST(GLEW_ARB_map_buffer_range) = glewGetExtension("GL_ARB_map_buffer_range"); - if (glewExperimental || GLEW_ARB_map_buffer_range) CONST_CAST(GLEW_ARB_map_buffer_range) = !_glewInit_GL_ARB_map_buffer_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_map_buffer_range */ -#ifdef GL_ARB_matrix_palette - CONST_CAST(GLEW_ARB_matrix_palette) = glewGetExtension("GL_ARB_matrix_palette"); - if (glewExperimental || GLEW_ARB_matrix_palette) CONST_CAST(GLEW_ARB_matrix_palette) = !_glewInit_GL_ARB_matrix_palette(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_matrix_palette */ -#ifdef GL_ARB_multisample - CONST_CAST(GLEW_ARB_multisample) = glewGetExtension("GL_ARB_multisample"); - if (glewExperimental || GLEW_ARB_multisample) CONST_CAST(GLEW_ARB_multisample) = !_glewInit_GL_ARB_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_multisample */ -#ifdef GL_ARB_multitexture - CONST_CAST(GLEW_ARB_multitexture) = glewGetExtension("GL_ARB_multitexture"); - if (glewExperimental || GLEW_ARB_multitexture) CONST_CAST(GLEW_ARB_multitexture) = !_glewInit_GL_ARB_multitexture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_multitexture */ -#ifdef GL_ARB_occlusion_query - CONST_CAST(GLEW_ARB_occlusion_query) = glewGetExtension("GL_ARB_occlusion_query"); - if (glewExperimental || GLEW_ARB_occlusion_query) CONST_CAST(GLEW_ARB_occlusion_query) = !_glewInit_GL_ARB_occlusion_query(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_occlusion_query */ -#ifdef GL_ARB_pixel_buffer_object - CONST_CAST(GLEW_ARB_pixel_buffer_object) = glewGetExtension("GL_ARB_pixel_buffer_object"); -#endif /* GL_ARB_pixel_buffer_object */ -#ifdef GL_ARB_point_parameters - CONST_CAST(GLEW_ARB_point_parameters) = glewGetExtension("GL_ARB_point_parameters"); - if (glewExperimental || GLEW_ARB_point_parameters) CONST_CAST(GLEW_ARB_point_parameters) = !_glewInit_GL_ARB_point_parameters(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_point_parameters */ -#ifdef GL_ARB_point_sprite - CONST_CAST(GLEW_ARB_point_sprite) = glewGetExtension("GL_ARB_point_sprite"); -#endif /* GL_ARB_point_sprite */ -#ifdef GL_ARB_shader_objects - CONST_CAST(GLEW_ARB_shader_objects) = glewGetExtension("GL_ARB_shader_objects"); - if (glewExperimental || GLEW_ARB_shader_objects) CONST_CAST(GLEW_ARB_shader_objects) = !_glewInit_GL_ARB_shader_objects(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_shader_objects */ -#ifdef GL_ARB_shading_language_100 - CONST_CAST(GLEW_ARB_shading_language_100) = glewGetExtension("GL_ARB_shading_language_100"); -#endif /* GL_ARB_shading_language_100 */ -#ifdef GL_ARB_shadow - CONST_CAST(GLEW_ARB_shadow) = glewGetExtension("GL_ARB_shadow"); -#endif /* GL_ARB_shadow */ -#ifdef GL_ARB_shadow_ambient - CONST_CAST(GLEW_ARB_shadow_ambient) = glewGetExtension("GL_ARB_shadow_ambient"); -#endif /* GL_ARB_shadow_ambient */ -#ifdef GL_ARB_texture_border_clamp - CONST_CAST(GLEW_ARB_texture_border_clamp) = glewGetExtension("GL_ARB_texture_border_clamp"); -#endif /* GL_ARB_texture_border_clamp */ -#ifdef GL_ARB_texture_buffer_object - CONST_CAST(GLEW_ARB_texture_buffer_object) = glewGetExtension("GL_ARB_texture_buffer_object"); - if (glewExperimental || GLEW_ARB_texture_buffer_object) CONST_CAST(GLEW_ARB_texture_buffer_object) = !_glewInit_GL_ARB_texture_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_texture_buffer_object */ -#ifdef GL_ARB_texture_compression - CONST_CAST(GLEW_ARB_texture_compression) = glewGetExtension("GL_ARB_texture_compression"); - if (glewExperimental || GLEW_ARB_texture_compression) CONST_CAST(GLEW_ARB_texture_compression) = !_glewInit_GL_ARB_texture_compression(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_texture_compression */ -#ifdef GL_ARB_texture_compression_rgtc - CONST_CAST(GLEW_ARB_texture_compression_rgtc) = glewGetExtension("GL_ARB_texture_compression_rgtc"); -#endif /* GL_ARB_texture_compression_rgtc */ -#ifdef GL_ARB_texture_cube_map - CONST_CAST(GLEW_ARB_texture_cube_map) = glewGetExtension("GL_ARB_texture_cube_map"); -#endif /* GL_ARB_texture_cube_map */ -#ifdef GL_ARB_texture_env_add - CONST_CAST(GLEW_ARB_texture_env_add) = glewGetExtension("GL_ARB_texture_env_add"); -#endif /* GL_ARB_texture_env_add */ -#ifdef GL_ARB_texture_env_combine - CONST_CAST(GLEW_ARB_texture_env_combine) = glewGetExtension("GL_ARB_texture_env_combine"); -#endif /* GL_ARB_texture_env_combine */ -#ifdef GL_ARB_texture_env_crossbar - CONST_CAST(GLEW_ARB_texture_env_crossbar) = glewGetExtension("GL_ARB_texture_env_crossbar"); -#endif /* GL_ARB_texture_env_crossbar */ -#ifdef GL_ARB_texture_env_dot3 - CONST_CAST(GLEW_ARB_texture_env_dot3) = glewGetExtension("GL_ARB_texture_env_dot3"); -#endif /* GL_ARB_texture_env_dot3 */ -#ifdef GL_ARB_texture_float - CONST_CAST(GLEW_ARB_texture_float) = glewGetExtension("GL_ARB_texture_float"); -#endif /* GL_ARB_texture_float */ -#ifdef GL_ARB_texture_mirrored_repeat - CONST_CAST(GLEW_ARB_texture_mirrored_repeat) = glewGetExtension("GL_ARB_texture_mirrored_repeat"); -#endif /* GL_ARB_texture_mirrored_repeat */ -#ifdef GL_ARB_texture_non_power_of_two - CONST_CAST(GLEW_ARB_texture_non_power_of_two) = glewGetExtension("GL_ARB_texture_non_power_of_two"); -#endif /* GL_ARB_texture_non_power_of_two */ -#ifdef GL_ARB_texture_rectangle - CONST_CAST(GLEW_ARB_texture_rectangle) = glewGetExtension("GL_ARB_texture_rectangle"); -#endif /* GL_ARB_texture_rectangle */ -#ifdef GL_ARB_texture_rg - CONST_CAST(GLEW_ARB_texture_rg) = glewGetExtension("GL_ARB_texture_rg"); -#endif /* GL_ARB_texture_rg */ -#ifdef GL_ARB_transpose_matrix - CONST_CAST(GLEW_ARB_transpose_matrix) = glewGetExtension("GL_ARB_transpose_matrix"); - if (glewExperimental || GLEW_ARB_transpose_matrix) CONST_CAST(GLEW_ARB_transpose_matrix) = !_glewInit_GL_ARB_transpose_matrix(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_transpose_matrix */ -#ifdef GL_ARB_vertex_array_object - CONST_CAST(GLEW_ARB_vertex_array_object) = glewGetExtension("GL_ARB_vertex_array_object"); - if (glewExperimental || GLEW_ARB_vertex_array_object) CONST_CAST(GLEW_ARB_vertex_array_object) = !_glewInit_GL_ARB_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_array_object */ -#ifdef GL_ARB_vertex_blend - CONST_CAST(GLEW_ARB_vertex_blend) = glewGetExtension("GL_ARB_vertex_blend"); - if (glewExperimental || GLEW_ARB_vertex_blend) CONST_CAST(GLEW_ARB_vertex_blend) = !_glewInit_GL_ARB_vertex_blend(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_blend */ -#ifdef GL_ARB_vertex_buffer_object - CONST_CAST(GLEW_ARB_vertex_buffer_object) = glewGetExtension("GL_ARB_vertex_buffer_object"); - if (glewExperimental || GLEW_ARB_vertex_buffer_object) CONST_CAST(GLEW_ARB_vertex_buffer_object) = !_glewInit_GL_ARB_vertex_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_buffer_object */ -#ifdef GL_ARB_vertex_program - CONST_CAST(GLEW_ARB_vertex_program) = glewGetExtension("GL_ARB_vertex_program"); - if (glewExperimental || GLEW_ARB_vertex_program) CONST_CAST(GLEW_ARB_vertex_program) = !_glewInit_GL_ARB_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_program */ -#ifdef GL_ARB_vertex_shader - CONST_CAST(GLEW_ARB_vertex_shader) = glewGetExtension("GL_ARB_vertex_shader"); - if (glewExperimental || GLEW_ARB_vertex_shader) CONST_CAST(GLEW_ARB_vertex_shader) = !_glewInit_GL_ARB_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_shader */ -#ifdef GL_ARB_window_pos - CONST_CAST(GLEW_ARB_window_pos) = glewGetExtension("GL_ARB_window_pos"); - if (glewExperimental || GLEW_ARB_window_pos) CONST_CAST(GLEW_ARB_window_pos) = !_glewInit_GL_ARB_window_pos(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_window_pos */ -#ifdef GL_ATIX_point_sprites - CONST_CAST(GLEW_ATIX_point_sprites) = glewGetExtension("GL_ATIX_point_sprites"); -#endif /* GL_ATIX_point_sprites */ -#ifdef GL_ATIX_texture_env_combine3 - CONST_CAST(GLEW_ATIX_texture_env_combine3) = glewGetExtension("GL_ATIX_texture_env_combine3"); -#endif /* GL_ATIX_texture_env_combine3 */ -#ifdef GL_ATIX_texture_env_route - CONST_CAST(GLEW_ATIX_texture_env_route) = glewGetExtension("GL_ATIX_texture_env_route"); -#endif /* GL_ATIX_texture_env_route */ -#ifdef GL_ATIX_vertex_shader_output_point_size - CONST_CAST(GLEW_ATIX_vertex_shader_output_point_size) = glewGetExtension("GL_ATIX_vertex_shader_output_point_size"); -#endif /* GL_ATIX_vertex_shader_output_point_size */ -#ifdef GL_ATI_draw_buffers - CONST_CAST(GLEW_ATI_draw_buffers) = glewGetExtension("GL_ATI_draw_buffers"); - if (glewExperimental || GLEW_ATI_draw_buffers) CONST_CAST(GLEW_ATI_draw_buffers) = !_glewInit_GL_ATI_draw_buffers(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_draw_buffers */ -#ifdef GL_ATI_element_array - CONST_CAST(GLEW_ATI_element_array) = glewGetExtension("GL_ATI_element_array"); - if (glewExperimental || GLEW_ATI_element_array) CONST_CAST(GLEW_ATI_element_array) = !_glewInit_GL_ATI_element_array(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_element_array */ -#ifdef GL_ATI_envmap_bumpmap - CONST_CAST(GLEW_ATI_envmap_bumpmap) = glewGetExtension("GL_ATI_envmap_bumpmap"); - if (glewExperimental || GLEW_ATI_envmap_bumpmap) CONST_CAST(GLEW_ATI_envmap_bumpmap) = !_glewInit_GL_ATI_envmap_bumpmap(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_envmap_bumpmap */ -#ifdef GL_ATI_fragment_shader - CONST_CAST(GLEW_ATI_fragment_shader) = glewGetExtension("GL_ATI_fragment_shader"); - if (glewExperimental || GLEW_ATI_fragment_shader) CONST_CAST(GLEW_ATI_fragment_shader) = !_glewInit_GL_ATI_fragment_shader(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_fragment_shader */ -#ifdef GL_ATI_map_object_buffer - CONST_CAST(GLEW_ATI_map_object_buffer) = glewGetExtension("GL_ATI_map_object_buffer"); - if (glewExperimental || GLEW_ATI_map_object_buffer) CONST_CAST(GLEW_ATI_map_object_buffer) = !_glewInit_GL_ATI_map_object_buffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_map_object_buffer */ -#ifdef GL_ATI_pn_triangles - CONST_CAST(GLEW_ATI_pn_triangles) = glewGetExtension("GL_ATI_pn_triangles"); - if (glewExperimental || GLEW_ATI_pn_triangles) CONST_CAST(GLEW_ATI_pn_triangles) = !_glewInit_GL_ATI_pn_triangles(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_pn_triangles */ -#ifdef GL_ATI_separate_stencil - CONST_CAST(GLEW_ATI_separate_stencil) = glewGetExtension("GL_ATI_separate_stencil"); - if (glewExperimental || GLEW_ATI_separate_stencil) CONST_CAST(GLEW_ATI_separate_stencil) = !_glewInit_GL_ATI_separate_stencil(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_separate_stencil */ -#ifdef GL_ATI_shader_texture_lod - CONST_CAST(GLEW_ATI_shader_texture_lod) = glewGetExtension("GL_ATI_shader_texture_lod"); -#endif /* GL_ATI_shader_texture_lod */ -#ifdef GL_ATI_text_fragment_shader - CONST_CAST(GLEW_ATI_text_fragment_shader) = glewGetExtension("GL_ATI_text_fragment_shader"); -#endif /* GL_ATI_text_fragment_shader */ -#ifdef GL_ATI_texture_compression_3dc - CONST_CAST(GLEW_ATI_texture_compression_3dc) = glewGetExtension("GL_ATI_texture_compression_3dc"); -#endif /* GL_ATI_texture_compression_3dc */ -#ifdef GL_ATI_texture_env_combine3 - CONST_CAST(GLEW_ATI_texture_env_combine3) = glewGetExtension("GL_ATI_texture_env_combine3"); -#endif /* GL_ATI_texture_env_combine3 */ -#ifdef GL_ATI_texture_float - CONST_CAST(GLEW_ATI_texture_float) = glewGetExtension("GL_ATI_texture_float"); -#endif /* GL_ATI_texture_float */ -#ifdef GL_ATI_texture_mirror_once - CONST_CAST(GLEW_ATI_texture_mirror_once) = glewGetExtension("GL_ATI_texture_mirror_once"); -#endif /* GL_ATI_texture_mirror_once */ -#ifdef GL_ATI_vertex_array_object - CONST_CAST(GLEW_ATI_vertex_array_object) = glewGetExtension("GL_ATI_vertex_array_object"); - if (glewExperimental || GLEW_ATI_vertex_array_object) CONST_CAST(GLEW_ATI_vertex_array_object) = !_glewInit_GL_ATI_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_vertex_array_object */ -#ifdef GL_ATI_vertex_attrib_array_object - CONST_CAST(GLEW_ATI_vertex_attrib_array_object) = glewGetExtension("GL_ATI_vertex_attrib_array_object"); - if (glewExperimental || GLEW_ATI_vertex_attrib_array_object) CONST_CAST(GLEW_ATI_vertex_attrib_array_object) = !_glewInit_GL_ATI_vertex_attrib_array_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_vertex_attrib_array_object */ -#ifdef GL_ATI_vertex_streams - CONST_CAST(GLEW_ATI_vertex_streams) = glewGetExtension("GL_ATI_vertex_streams"); - if (glewExperimental || GLEW_ATI_vertex_streams) CONST_CAST(GLEW_ATI_vertex_streams) = !_glewInit_GL_ATI_vertex_streams(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_vertex_streams */ -#ifdef GL_EXT_422_pixels - CONST_CAST(GLEW_EXT_422_pixels) = glewGetExtension("GL_EXT_422_pixels"); -#endif /* GL_EXT_422_pixels */ -#ifdef GL_EXT_Cg_shader - CONST_CAST(GLEW_EXT_Cg_shader) = glewGetExtension("GL_EXT_Cg_shader"); -#endif /* GL_EXT_Cg_shader */ -#ifdef GL_EXT_abgr - CONST_CAST(GLEW_EXT_abgr) = glewGetExtension("GL_EXT_abgr"); -#endif /* GL_EXT_abgr */ -#ifdef GL_EXT_bgra - CONST_CAST(GLEW_EXT_bgra) = glewGetExtension("GL_EXT_bgra"); -#endif /* GL_EXT_bgra */ -#ifdef GL_EXT_bindable_uniform - CONST_CAST(GLEW_EXT_bindable_uniform) = glewGetExtension("GL_EXT_bindable_uniform"); - if (glewExperimental || GLEW_EXT_bindable_uniform) CONST_CAST(GLEW_EXT_bindable_uniform) = !_glewInit_GL_EXT_bindable_uniform(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_bindable_uniform */ -#ifdef GL_EXT_blend_color - CONST_CAST(GLEW_EXT_blend_color) = glewGetExtension("GL_EXT_blend_color"); - if (glewExperimental || GLEW_EXT_blend_color) CONST_CAST(GLEW_EXT_blend_color) = !_glewInit_GL_EXT_blend_color(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_blend_color */ -#ifdef GL_EXT_blend_equation_separate - CONST_CAST(GLEW_EXT_blend_equation_separate) = glewGetExtension("GL_EXT_blend_equation_separate"); - if (glewExperimental || GLEW_EXT_blend_equation_separate) CONST_CAST(GLEW_EXT_blend_equation_separate) = !_glewInit_GL_EXT_blend_equation_separate(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_blend_equation_separate */ -#ifdef GL_EXT_blend_func_separate - CONST_CAST(GLEW_EXT_blend_func_separate) = glewGetExtension("GL_EXT_blend_func_separate"); - if (glewExperimental || GLEW_EXT_blend_func_separate) CONST_CAST(GLEW_EXT_blend_func_separate) = !_glewInit_GL_EXT_blend_func_separate(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_blend_func_separate */ -#ifdef GL_EXT_blend_logic_op - CONST_CAST(GLEW_EXT_blend_logic_op) = glewGetExtension("GL_EXT_blend_logic_op"); -#endif /* GL_EXT_blend_logic_op */ -#ifdef GL_EXT_blend_minmax - CONST_CAST(GLEW_EXT_blend_minmax) = glewGetExtension("GL_EXT_blend_minmax"); - if (glewExperimental || GLEW_EXT_blend_minmax) CONST_CAST(GLEW_EXT_blend_minmax) = !_glewInit_GL_EXT_blend_minmax(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_blend_minmax */ -#ifdef GL_EXT_blend_subtract - CONST_CAST(GLEW_EXT_blend_subtract) = glewGetExtension("GL_EXT_blend_subtract"); -#endif /* GL_EXT_blend_subtract */ -#ifdef GL_EXT_clip_volume_hint - CONST_CAST(GLEW_EXT_clip_volume_hint) = glewGetExtension("GL_EXT_clip_volume_hint"); -#endif /* GL_EXT_clip_volume_hint */ -#ifdef GL_EXT_cmyka - CONST_CAST(GLEW_EXT_cmyka) = glewGetExtension("GL_EXT_cmyka"); -#endif /* GL_EXT_cmyka */ -#ifdef GL_EXT_color_subtable - CONST_CAST(GLEW_EXT_color_subtable) = glewGetExtension("GL_EXT_color_subtable"); - if (glewExperimental || GLEW_EXT_color_subtable) CONST_CAST(GLEW_EXT_color_subtable) = !_glewInit_GL_EXT_color_subtable(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_color_subtable */ -#ifdef GL_EXT_compiled_vertex_array - CONST_CAST(GLEW_EXT_compiled_vertex_array) = glewGetExtension("GL_EXT_compiled_vertex_array"); - if (glewExperimental || GLEW_EXT_compiled_vertex_array) CONST_CAST(GLEW_EXT_compiled_vertex_array) = !_glewInit_GL_EXT_compiled_vertex_array(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_compiled_vertex_array */ -#ifdef GL_EXT_convolution - CONST_CAST(GLEW_EXT_convolution) = glewGetExtension("GL_EXT_convolution"); - if (glewExperimental || GLEW_EXT_convolution) CONST_CAST(GLEW_EXT_convolution) = !_glewInit_GL_EXT_convolution(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_convolution */ -#ifdef GL_EXT_coordinate_frame - CONST_CAST(GLEW_EXT_coordinate_frame) = glewGetExtension("GL_EXT_coordinate_frame"); - if (glewExperimental || GLEW_EXT_coordinate_frame) CONST_CAST(GLEW_EXT_coordinate_frame) = !_glewInit_GL_EXT_coordinate_frame(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_coordinate_frame */ -#ifdef GL_EXT_copy_texture - CONST_CAST(GLEW_EXT_copy_texture) = glewGetExtension("GL_EXT_copy_texture"); - if (glewExperimental || GLEW_EXT_copy_texture) CONST_CAST(GLEW_EXT_copy_texture) = !_glewInit_GL_EXT_copy_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_copy_texture */ -#ifdef GL_EXT_cull_vertex - CONST_CAST(GLEW_EXT_cull_vertex) = glewGetExtension("GL_EXT_cull_vertex"); - if (glewExperimental || GLEW_EXT_cull_vertex) CONST_CAST(GLEW_EXT_cull_vertex) = !_glewInit_GL_EXT_cull_vertex(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_cull_vertex */ -#ifdef GL_EXT_depth_bounds_test - CONST_CAST(GLEW_EXT_depth_bounds_test) = glewGetExtension("GL_EXT_depth_bounds_test"); - if (glewExperimental || GLEW_EXT_depth_bounds_test) CONST_CAST(GLEW_EXT_depth_bounds_test) = !_glewInit_GL_EXT_depth_bounds_test(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_depth_bounds_test */ -#ifdef GL_EXT_direct_state_access - CONST_CAST(GLEW_EXT_direct_state_access) = glewGetExtension("GL_EXT_direct_state_access"); - if (glewExperimental || GLEW_EXT_direct_state_access) CONST_CAST(GLEW_EXT_direct_state_access) = !_glewInit_GL_EXT_direct_state_access(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_direct_state_access */ -#ifdef GL_EXT_draw_buffers2 - CONST_CAST(GLEW_EXT_draw_buffers2) = glewGetExtension("GL_EXT_draw_buffers2"); - if (glewExperimental || GLEW_EXT_draw_buffers2) CONST_CAST(GLEW_EXT_draw_buffers2) = !_glewInit_GL_EXT_draw_buffers2(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_draw_buffers2 */ -#ifdef GL_EXT_draw_instanced - CONST_CAST(GLEW_EXT_draw_instanced) = glewGetExtension("GL_EXT_draw_instanced"); - if (glewExperimental || GLEW_EXT_draw_instanced) CONST_CAST(GLEW_EXT_draw_instanced) = !_glewInit_GL_EXT_draw_instanced(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_draw_instanced */ -#ifdef GL_EXT_draw_range_elements - CONST_CAST(GLEW_EXT_draw_range_elements) = glewGetExtension("GL_EXT_draw_range_elements"); - if (glewExperimental || GLEW_EXT_draw_range_elements) CONST_CAST(GLEW_EXT_draw_range_elements) = !_glewInit_GL_EXT_draw_range_elements(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_draw_range_elements */ -#ifdef GL_EXT_fog_coord - CONST_CAST(GLEW_EXT_fog_coord) = glewGetExtension("GL_EXT_fog_coord"); - if (glewExperimental || GLEW_EXT_fog_coord) CONST_CAST(GLEW_EXT_fog_coord) = !_glewInit_GL_EXT_fog_coord(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_fog_coord */ -#ifdef GL_EXT_fragment_lighting - CONST_CAST(GLEW_EXT_fragment_lighting) = glewGetExtension("GL_EXT_fragment_lighting"); - if (glewExperimental || GLEW_EXT_fragment_lighting) CONST_CAST(GLEW_EXT_fragment_lighting) = !_glewInit_GL_EXT_fragment_lighting(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_fragment_lighting */ -#ifdef GL_EXT_framebuffer_blit - CONST_CAST(GLEW_EXT_framebuffer_blit) = glewGetExtension("GL_EXT_framebuffer_blit"); - if (glewExperimental || GLEW_EXT_framebuffer_blit) CONST_CAST(GLEW_EXT_framebuffer_blit) = !_glewInit_GL_EXT_framebuffer_blit(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_framebuffer_blit */ -#ifdef GL_EXT_framebuffer_multisample - CONST_CAST(GLEW_EXT_framebuffer_multisample) = glewGetExtension("GL_EXT_framebuffer_multisample"); - if (glewExperimental || GLEW_EXT_framebuffer_multisample) CONST_CAST(GLEW_EXT_framebuffer_multisample) = !_glewInit_GL_EXT_framebuffer_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_framebuffer_multisample */ -#ifdef GL_EXT_framebuffer_object - CONST_CAST(GLEW_EXT_framebuffer_object) = glewGetExtension("GL_EXT_framebuffer_object"); - if (glewExperimental || GLEW_EXT_framebuffer_object) CONST_CAST(GLEW_EXT_framebuffer_object) = !_glewInit_GL_EXT_framebuffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_framebuffer_object */ -#ifdef GL_EXT_framebuffer_sRGB - CONST_CAST(GLEW_EXT_framebuffer_sRGB) = glewGetExtension("GL_EXT_framebuffer_sRGB"); -#endif /* GL_EXT_framebuffer_sRGB */ -#ifdef GL_EXT_geometry_shader4 - CONST_CAST(GLEW_EXT_geometry_shader4) = glewGetExtension("GL_EXT_geometry_shader4"); - if (glewExperimental || GLEW_EXT_geometry_shader4) CONST_CAST(GLEW_EXT_geometry_shader4) = !_glewInit_GL_EXT_geometry_shader4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_geometry_shader4 */ -#ifdef GL_EXT_gpu_program_parameters - CONST_CAST(GLEW_EXT_gpu_program_parameters) = glewGetExtension("GL_EXT_gpu_program_parameters"); - if (glewExperimental || GLEW_EXT_gpu_program_parameters) CONST_CAST(GLEW_EXT_gpu_program_parameters) = !_glewInit_GL_EXT_gpu_program_parameters(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_gpu_program_parameters */ -#ifdef GL_EXT_gpu_shader4 - CONST_CAST(GLEW_EXT_gpu_shader4) = glewGetExtension("GL_EXT_gpu_shader4"); - if (glewExperimental || GLEW_EXT_gpu_shader4) CONST_CAST(GLEW_EXT_gpu_shader4) = !_glewInit_GL_EXT_gpu_shader4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_gpu_shader4 */ -#ifdef GL_EXT_histogram - CONST_CAST(GLEW_EXT_histogram) = glewGetExtension("GL_EXT_histogram"); - if (glewExperimental || GLEW_EXT_histogram) CONST_CAST(GLEW_EXT_histogram) = !_glewInit_GL_EXT_histogram(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_histogram */ -#ifdef GL_EXT_index_array_formats - CONST_CAST(GLEW_EXT_index_array_formats) = glewGetExtension("GL_EXT_index_array_formats"); -#endif /* GL_EXT_index_array_formats */ -#ifdef GL_EXT_index_func - CONST_CAST(GLEW_EXT_index_func) = glewGetExtension("GL_EXT_index_func"); - if (glewExperimental || GLEW_EXT_index_func) CONST_CAST(GLEW_EXT_index_func) = !_glewInit_GL_EXT_index_func(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_index_func */ -#ifdef GL_EXT_index_material - CONST_CAST(GLEW_EXT_index_material) = glewGetExtension("GL_EXT_index_material"); - if (glewExperimental || GLEW_EXT_index_material) CONST_CAST(GLEW_EXT_index_material) = !_glewInit_GL_EXT_index_material(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_index_material */ -#ifdef GL_EXT_index_texture - CONST_CAST(GLEW_EXT_index_texture) = glewGetExtension("GL_EXT_index_texture"); -#endif /* GL_EXT_index_texture */ -#ifdef GL_EXT_light_texture - CONST_CAST(GLEW_EXT_light_texture) = glewGetExtension("GL_EXT_light_texture"); - if (glewExperimental || GLEW_EXT_light_texture) CONST_CAST(GLEW_EXT_light_texture) = !_glewInit_GL_EXT_light_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_light_texture */ -#ifdef GL_EXT_misc_attribute - CONST_CAST(GLEW_EXT_misc_attribute) = glewGetExtension("GL_EXT_misc_attribute"); -#endif /* GL_EXT_misc_attribute */ -#ifdef GL_EXT_multi_draw_arrays - CONST_CAST(GLEW_EXT_multi_draw_arrays) = glewGetExtension("GL_EXT_multi_draw_arrays"); - if (glewExperimental || GLEW_EXT_multi_draw_arrays) CONST_CAST(GLEW_EXT_multi_draw_arrays) = !_glewInit_GL_EXT_multi_draw_arrays(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_multi_draw_arrays */ -#ifdef GL_EXT_multisample - CONST_CAST(GLEW_EXT_multisample) = glewGetExtension("GL_EXT_multisample"); - if (glewExperimental || GLEW_EXT_multisample) CONST_CAST(GLEW_EXT_multisample) = !_glewInit_GL_EXT_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_multisample */ -#ifdef GL_EXT_packed_depth_stencil - CONST_CAST(GLEW_EXT_packed_depth_stencil) = glewGetExtension("GL_EXT_packed_depth_stencil"); -#endif /* GL_EXT_packed_depth_stencil */ -#ifdef GL_EXT_packed_float - CONST_CAST(GLEW_EXT_packed_float) = glewGetExtension("GL_EXT_packed_float"); -#endif /* GL_EXT_packed_float */ -#ifdef GL_EXT_packed_pixels - CONST_CAST(GLEW_EXT_packed_pixels) = glewGetExtension("GL_EXT_packed_pixels"); -#endif /* GL_EXT_packed_pixels */ -#ifdef GL_EXT_paletted_texture - CONST_CAST(GLEW_EXT_paletted_texture) = glewGetExtension("GL_EXT_paletted_texture"); - if (glewExperimental || GLEW_EXT_paletted_texture) CONST_CAST(GLEW_EXT_paletted_texture) = !_glewInit_GL_EXT_paletted_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_paletted_texture */ -#ifdef GL_EXT_pixel_buffer_object - CONST_CAST(GLEW_EXT_pixel_buffer_object) = glewGetExtension("GL_EXT_pixel_buffer_object"); -#endif /* GL_EXT_pixel_buffer_object */ -#ifdef GL_EXT_pixel_transform - CONST_CAST(GLEW_EXT_pixel_transform) = glewGetExtension("GL_EXT_pixel_transform"); - if (glewExperimental || GLEW_EXT_pixel_transform) CONST_CAST(GLEW_EXT_pixel_transform) = !_glewInit_GL_EXT_pixel_transform(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_pixel_transform */ -#ifdef GL_EXT_pixel_transform_color_table - CONST_CAST(GLEW_EXT_pixel_transform_color_table) = glewGetExtension("GL_EXT_pixel_transform_color_table"); -#endif /* GL_EXT_pixel_transform_color_table */ -#ifdef GL_EXT_point_parameters - CONST_CAST(GLEW_EXT_point_parameters) = glewGetExtension("GL_EXT_point_parameters"); - if (glewExperimental || GLEW_EXT_point_parameters) CONST_CAST(GLEW_EXT_point_parameters) = !_glewInit_GL_EXT_point_parameters(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_point_parameters */ -#ifdef GL_EXT_polygon_offset - CONST_CAST(GLEW_EXT_polygon_offset) = glewGetExtension("GL_EXT_polygon_offset"); - if (glewExperimental || GLEW_EXT_polygon_offset) CONST_CAST(GLEW_EXT_polygon_offset) = !_glewInit_GL_EXT_polygon_offset(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_polygon_offset */ -#ifdef GL_EXT_rescale_normal - CONST_CAST(GLEW_EXT_rescale_normal) = glewGetExtension("GL_EXT_rescale_normal"); -#endif /* GL_EXT_rescale_normal */ -#ifdef GL_EXT_scene_marker - CONST_CAST(GLEW_EXT_scene_marker) = glewGetExtension("GL_EXT_scene_marker"); - if (glewExperimental || GLEW_EXT_scene_marker) CONST_CAST(GLEW_EXT_scene_marker) = !_glewInit_GL_EXT_scene_marker(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_scene_marker */ -#ifdef GL_EXT_secondary_color - CONST_CAST(GLEW_EXT_secondary_color) = glewGetExtension("GL_EXT_secondary_color"); - if (glewExperimental || GLEW_EXT_secondary_color) CONST_CAST(GLEW_EXT_secondary_color) = !_glewInit_GL_EXT_secondary_color(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_secondary_color */ -#ifdef GL_EXT_separate_specular_color - CONST_CAST(GLEW_EXT_separate_specular_color) = glewGetExtension("GL_EXT_separate_specular_color"); -#endif /* GL_EXT_separate_specular_color */ -#ifdef GL_EXT_shadow_funcs - CONST_CAST(GLEW_EXT_shadow_funcs) = glewGetExtension("GL_EXT_shadow_funcs"); -#endif /* GL_EXT_shadow_funcs */ -#ifdef GL_EXT_shared_texture_palette - CONST_CAST(GLEW_EXT_shared_texture_palette) = glewGetExtension("GL_EXT_shared_texture_palette"); -#endif /* GL_EXT_shared_texture_palette */ -#ifdef GL_EXT_stencil_clear_tag - CONST_CAST(GLEW_EXT_stencil_clear_tag) = glewGetExtension("GL_EXT_stencil_clear_tag"); -#endif /* GL_EXT_stencil_clear_tag */ -#ifdef GL_EXT_stencil_two_side - CONST_CAST(GLEW_EXT_stencil_two_side) = glewGetExtension("GL_EXT_stencil_two_side"); - if (glewExperimental || GLEW_EXT_stencil_two_side) CONST_CAST(GLEW_EXT_stencil_two_side) = !_glewInit_GL_EXT_stencil_two_side(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_stencil_two_side */ -#ifdef GL_EXT_stencil_wrap - CONST_CAST(GLEW_EXT_stencil_wrap) = glewGetExtension("GL_EXT_stencil_wrap"); -#endif /* GL_EXT_stencil_wrap */ -#ifdef GL_EXT_subtexture - CONST_CAST(GLEW_EXT_subtexture) = glewGetExtension("GL_EXT_subtexture"); - if (glewExperimental || GLEW_EXT_subtexture) CONST_CAST(GLEW_EXT_subtexture) = !_glewInit_GL_EXT_subtexture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_subtexture */ -#ifdef GL_EXT_texture - CONST_CAST(GLEW_EXT_texture) = glewGetExtension("GL_EXT_texture"); -#endif /* GL_EXT_texture */ -#ifdef GL_EXT_texture3D - CONST_CAST(GLEW_EXT_texture3D) = glewGetExtension("GL_EXT_texture3D"); - if (glewExperimental || GLEW_EXT_texture3D) CONST_CAST(GLEW_EXT_texture3D) = !_glewInit_GL_EXT_texture3D(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture3D */ -#ifdef GL_EXT_texture_array - CONST_CAST(GLEW_EXT_texture_array) = glewGetExtension("GL_EXT_texture_array"); -#endif /* GL_EXT_texture_array */ -#ifdef GL_EXT_texture_buffer_object - CONST_CAST(GLEW_EXT_texture_buffer_object) = glewGetExtension("GL_EXT_texture_buffer_object"); - if (glewExperimental || GLEW_EXT_texture_buffer_object) CONST_CAST(GLEW_EXT_texture_buffer_object) = !_glewInit_GL_EXT_texture_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture_buffer_object */ -#ifdef GL_EXT_texture_compression_dxt1 - CONST_CAST(GLEW_EXT_texture_compression_dxt1) = glewGetExtension("GL_EXT_texture_compression_dxt1"); -#endif /* GL_EXT_texture_compression_dxt1 */ -#ifdef GL_EXT_texture_compression_latc - CONST_CAST(GLEW_EXT_texture_compression_latc) = glewGetExtension("GL_EXT_texture_compression_latc"); -#endif /* GL_EXT_texture_compression_latc */ -#ifdef GL_EXT_texture_compression_rgtc - CONST_CAST(GLEW_EXT_texture_compression_rgtc) = glewGetExtension("GL_EXT_texture_compression_rgtc"); -#endif /* GL_EXT_texture_compression_rgtc */ -#ifdef GL_EXT_texture_compression_s3tc - CONST_CAST(GLEW_EXT_texture_compression_s3tc) = glewGetExtension("GL_EXT_texture_compression_s3tc"); -#endif /* GL_EXT_texture_compression_s3tc */ -#ifdef GL_EXT_texture_cube_map - CONST_CAST(GLEW_EXT_texture_cube_map) = glewGetExtension("GL_EXT_texture_cube_map"); -#endif /* GL_EXT_texture_cube_map */ -#ifdef GL_EXT_texture_edge_clamp - CONST_CAST(GLEW_EXT_texture_edge_clamp) = glewGetExtension("GL_EXT_texture_edge_clamp"); -#endif /* GL_EXT_texture_edge_clamp */ -#ifdef GL_EXT_texture_env - CONST_CAST(GLEW_EXT_texture_env) = glewGetExtension("GL_EXT_texture_env"); -#endif /* GL_EXT_texture_env */ -#ifdef GL_EXT_texture_env_add - CONST_CAST(GLEW_EXT_texture_env_add) = glewGetExtension("GL_EXT_texture_env_add"); -#endif /* GL_EXT_texture_env_add */ -#ifdef GL_EXT_texture_env_combine - CONST_CAST(GLEW_EXT_texture_env_combine) = glewGetExtension("GL_EXT_texture_env_combine"); -#endif /* GL_EXT_texture_env_combine */ -#ifdef GL_EXT_texture_env_dot3 - CONST_CAST(GLEW_EXT_texture_env_dot3) = glewGetExtension("GL_EXT_texture_env_dot3"); -#endif /* GL_EXT_texture_env_dot3 */ -#ifdef GL_EXT_texture_filter_anisotropic - CONST_CAST(GLEW_EXT_texture_filter_anisotropic) = glewGetExtension("GL_EXT_texture_filter_anisotropic"); -#endif /* GL_EXT_texture_filter_anisotropic */ -#ifdef GL_EXT_texture_integer - CONST_CAST(GLEW_EXT_texture_integer) = glewGetExtension("GL_EXT_texture_integer"); - if (glewExperimental || GLEW_EXT_texture_integer) CONST_CAST(GLEW_EXT_texture_integer) = !_glewInit_GL_EXT_texture_integer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture_integer */ -#ifdef GL_EXT_texture_lod_bias - CONST_CAST(GLEW_EXT_texture_lod_bias) = glewGetExtension("GL_EXT_texture_lod_bias"); -#endif /* GL_EXT_texture_lod_bias */ -#ifdef GL_EXT_texture_mirror_clamp - CONST_CAST(GLEW_EXT_texture_mirror_clamp) = glewGetExtension("GL_EXT_texture_mirror_clamp"); -#endif /* GL_EXT_texture_mirror_clamp */ -#ifdef GL_EXT_texture_object - CONST_CAST(GLEW_EXT_texture_object) = glewGetExtension("GL_EXT_texture_object"); - if (glewExperimental || GLEW_EXT_texture_object) CONST_CAST(GLEW_EXT_texture_object) = !_glewInit_GL_EXT_texture_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture_object */ -#ifdef GL_EXT_texture_perturb_normal - CONST_CAST(GLEW_EXT_texture_perturb_normal) = glewGetExtension("GL_EXT_texture_perturb_normal"); - if (glewExperimental || GLEW_EXT_texture_perturb_normal) CONST_CAST(GLEW_EXT_texture_perturb_normal) = !_glewInit_GL_EXT_texture_perturb_normal(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture_perturb_normal */ -#ifdef GL_EXT_texture_rectangle - CONST_CAST(GLEW_EXT_texture_rectangle) = glewGetExtension("GL_EXT_texture_rectangle"); -#endif /* GL_EXT_texture_rectangle */ -#ifdef GL_EXT_texture_sRGB - CONST_CAST(GLEW_EXT_texture_sRGB) = glewGetExtension("GL_EXT_texture_sRGB"); -#endif /* GL_EXT_texture_sRGB */ -#ifdef GL_EXT_texture_shared_exponent - CONST_CAST(GLEW_EXT_texture_shared_exponent) = glewGetExtension("GL_EXT_texture_shared_exponent"); -#endif /* GL_EXT_texture_shared_exponent */ -#ifdef GL_EXT_texture_swizzle - CONST_CAST(GLEW_EXT_texture_swizzle) = glewGetExtension("GL_EXT_texture_swizzle"); -#endif /* GL_EXT_texture_swizzle */ -#ifdef GL_EXT_timer_query - CONST_CAST(GLEW_EXT_timer_query) = glewGetExtension("GL_EXT_timer_query"); - if (glewExperimental || GLEW_EXT_timer_query) CONST_CAST(GLEW_EXT_timer_query) = !_glewInit_GL_EXT_timer_query(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_timer_query */ -#ifdef GL_EXT_transform_feedback - CONST_CAST(GLEW_EXT_transform_feedback) = glewGetExtension("GL_EXT_transform_feedback"); - if (glewExperimental || GLEW_EXT_transform_feedback) CONST_CAST(GLEW_EXT_transform_feedback) = !_glewInit_GL_EXT_transform_feedback(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_transform_feedback */ -#ifdef GL_EXT_vertex_array - CONST_CAST(GLEW_EXT_vertex_array) = glewGetExtension("GL_EXT_vertex_array"); - if (glewExperimental || GLEW_EXT_vertex_array) CONST_CAST(GLEW_EXT_vertex_array) = !_glewInit_GL_EXT_vertex_array(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_vertex_array */ -#ifdef GL_EXT_vertex_array_bgra - CONST_CAST(GLEW_EXT_vertex_array_bgra) = glewGetExtension("GL_EXT_vertex_array_bgra"); -#endif /* GL_EXT_vertex_array_bgra */ -#ifdef GL_EXT_vertex_shader - CONST_CAST(GLEW_EXT_vertex_shader) = glewGetExtension("GL_EXT_vertex_shader"); - if (glewExperimental || GLEW_EXT_vertex_shader) CONST_CAST(GLEW_EXT_vertex_shader) = !_glewInit_GL_EXT_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_vertex_shader */ -#ifdef GL_EXT_vertex_weighting - CONST_CAST(GLEW_EXT_vertex_weighting) = glewGetExtension("GL_EXT_vertex_weighting"); - if (glewExperimental || GLEW_EXT_vertex_weighting) CONST_CAST(GLEW_EXT_vertex_weighting) = !_glewInit_GL_EXT_vertex_weighting(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_vertex_weighting */ -#ifdef GL_GREMEDY_frame_terminator - CONST_CAST(GLEW_GREMEDY_frame_terminator) = glewGetExtension("GL_GREMEDY_frame_terminator"); - if (glewExperimental || GLEW_GREMEDY_frame_terminator) CONST_CAST(GLEW_GREMEDY_frame_terminator) = !_glewInit_GL_GREMEDY_frame_terminator(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_GREMEDY_frame_terminator */ -#ifdef GL_GREMEDY_string_marker - CONST_CAST(GLEW_GREMEDY_string_marker) = glewGetExtension("GL_GREMEDY_string_marker"); - if (glewExperimental || GLEW_GREMEDY_string_marker) CONST_CAST(GLEW_GREMEDY_string_marker) = !_glewInit_GL_GREMEDY_string_marker(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_GREMEDY_string_marker */ -#ifdef GL_HP_convolution_border_modes - CONST_CAST(GLEW_HP_convolution_border_modes) = glewGetExtension("GL_HP_convolution_border_modes"); -#endif /* GL_HP_convolution_border_modes */ -#ifdef GL_HP_image_transform - CONST_CAST(GLEW_HP_image_transform) = glewGetExtension("GL_HP_image_transform"); - if (glewExperimental || GLEW_HP_image_transform) CONST_CAST(GLEW_HP_image_transform) = !_glewInit_GL_HP_image_transform(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_HP_image_transform */ -#ifdef GL_HP_occlusion_test - CONST_CAST(GLEW_HP_occlusion_test) = glewGetExtension("GL_HP_occlusion_test"); -#endif /* GL_HP_occlusion_test */ -#ifdef GL_HP_texture_lighting - CONST_CAST(GLEW_HP_texture_lighting) = glewGetExtension("GL_HP_texture_lighting"); -#endif /* GL_HP_texture_lighting */ -#ifdef GL_IBM_cull_vertex - CONST_CAST(GLEW_IBM_cull_vertex) = glewGetExtension("GL_IBM_cull_vertex"); -#endif /* GL_IBM_cull_vertex */ -#ifdef GL_IBM_multimode_draw_arrays - CONST_CAST(GLEW_IBM_multimode_draw_arrays) = glewGetExtension("GL_IBM_multimode_draw_arrays"); - if (glewExperimental || GLEW_IBM_multimode_draw_arrays) CONST_CAST(GLEW_IBM_multimode_draw_arrays) = !_glewInit_GL_IBM_multimode_draw_arrays(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_IBM_multimode_draw_arrays */ -#ifdef GL_IBM_rasterpos_clip - CONST_CAST(GLEW_IBM_rasterpos_clip) = glewGetExtension("GL_IBM_rasterpos_clip"); -#endif /* GL_IBM_rasterpos_clip */ -#ifdef GL_IBM_static_data - CONST_CAST(GLEW_IBM_static_data) = glewGetExtension("GL_IBM_static_data"); -#endif /* GL_IBM_static_data */ -#ifdef GL_IBM_texture_mirrored_repeat - CONST_CAST(GLEW_IBM_texture_mirrored_repeat) = glewGetExtension("GL_IBM_texture_mirrored_repeat"); -#endif /* GL_IBM_texture_mirrored_repeat */ -#ifdef GL_IBM_vertex_array_lists - CONST_CAST(GLEW_IBM_vertex_array_lists) = glewGetExtension("GL_IBM_vertex_array_lists"); - if (glewExperimental || GLEW_IBM_vertex_array_lists) CONST_CAST(GLEW_IBM_vertex_array_lists) = !_glewInit_GL_IBM_vertex_array_lists(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_IBM_vertex_array_lists */ -#ifdef GL_INGR_color_clamp - CONST_CAST(GLEW_INGR_color_clamp) = glewGetExtension("GL_INGR_color_clamp"); -#endif /* GL_INGR_color_clamp */ -#ifdef GL_INGR_interlace_read - CONST_CAST(GLEW_INGR_interlace_read) = glewGetExtension("GL_INGR_interlace_read"); -#endif /* GL_INGR_interlace_read */ -#ifdef GL_INTEL_parallel_arrays - CONST_CAST(GLEW_INTEL_parallel_arrays) = glewGetExtension("GL_INTEL_parallel_arrays"); - if (glewExperimental || GLEW_INTEL_parallel_arrays) CONST_CAST(GLEW_INTEL_parallel_arrays) = !_glewInit_GL_INTEL_parallel_arrays(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_INTEL_parallel_arrays */ -#ifdef GL_INTEL_texture_scissor - CONST_CAST(GLEW_INTEL_texture_scissor) = glewGetExtension("GL_INTEL_texture_scissor"); - if (glewExperimental || GLEW_INTEL_texture_scissor) CONST_CAST(GLEW_INTEL_texture_scissor) = !_glewInit_GL_INTEL_texture_scissor(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_INTEL_texture_scissor */ -#ifdef GL_KTX_buffer_region - CONST_CAST(GLEW_KTX_buffer_region) = glewGetExtension("GL_KTX_buffer_region"); - if (glewExperimental || GLEW_KTX_buffer_region) CONST_CAST(GLEW_KTX_buffer_region) = !_glewInit_GL_KTX_buffer_region(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_KTX_buffer_region */ -#ifdef GL_MESAX_texture_stack - CONST_CAST(GLEW_MESAX_texture_stack) = glewGetExtension("GL_MESAX_texture_stack"); -#endif /* GL_MESAX_texture_stack */ -#ifdef GL_MESA_pack_invert - CONST_CAST(GLEW_MESA_pack_invert) = glewGetExtension("GL_MESA_pack_invert"); -#endif /* GL_MESA_pack_invert */ -#ifdef GL_MESA_resize_buffers - CONST_CAST(GLEW_MESA_resize_buffers) = glewGetExtension("GL_MESA_resize_buffers"); - if (glewExperimental || GLEW_MESA_resize_buffers) CONST_CAST(GLEW_MESA_resize_buffers) = !_glewInit_GL_MESA_resize_buffers(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_MESA_resize_buffers */ -#ifdef GL_MESA_window_pos - CONST_CAST(GLEW_MESA_window_pos) = glewGetExtension("GL_MESA_window_pos"); - if (glewExperimental || GLEW_MESA_window_pos) CONST_CAST(GLEW_MESA_window_pos) = !_glewInit_GL_MESA_window_pos(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_MESA_window_pos */ -#ifdef GL_MESA_ycbcr_texture - CONST_CAST(GLEW_MESA_ycbcr_texture) = glewGetExtension("GL_MESA_ycbcr_texture"); -#endif /* GL_MESA_ycbcr_texture */ -#ifdef GL_NV_blend_square - CONST_CAST(GLEW_NV_blend_square) = glewGetExtension("GL_NV_blend_square"); -#endif /* GL_NV_blend_square */ -#ifdef GL_NV_conditional_render - CONST_CAST(GLEW_NV_conditional_render) = glewGetExtension("GL_NV_conditional_render"); - if (glewExperimental || GLEW_NV_conditional_render) CONST_CAST(GLEW_NV_conditional_render) = !_glewInit_GL_NV_conditional_render(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_conditional_render */ -#ifdef GL_NV_copy_depth_to_color - CONST_CAST(GLEW_NV_copy_depth_to_color) = glewGetExtension("GL_NV_copy_depth_to_color"); -#endif /* GL_NV_copy_depth_to_color */ -#ifdef GL_NV_depth_buffer_float - CONST_CAST(GLEW_NV_depth_buffer_float) = glewGetExtension("GL_NV_depth_buffer_float"); - if (glewExperimental || GLEW_NV_depth_buffer_float) CONST_CAST(GLEW_NV_depth_buffer_float) = !_glewInit_GL_NV_depth_buffer_float(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_depth_buffer_float */ -#ifdef GL_NV_depth_clamp - CONST_CAST(GLEW_NV_depth_clamp) = glewGetExtension("GL_NV_depth_clamp"); -#endif /* GL_NV_depth_clamp */ -#ifdef GL_NV_depth_range_unclamped - CONST_CAST(GLEW_NV_depth_range_unclamped) = glewGetExtension("GL_NV_depth_range_unclamped"); -#endif /* GL_NV_depth_range_unclamped */ -#ifdef GL_NV_evaluators - CONST_CAST(GLEW_NV_evaluators) = glewGetExtension("GL_NV_evaluators"); - if (glewExperimental || GLEW_NV_evaluators) CONST_CAST(GLEW_NV_evaluators) = !_glewInit_GL_NV_evaluators(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_evaluators */ -#ifdef GL_NV_explicit_multisample - CONST_CAST(GLEW_NV_explicit_multisample) = glewGetExtension("GL_NV_explicit_multisample"); - if (glewExperimental || GLEW_NV_explicit_multisample) CONST_CAST(GLEW_NV_explicit_multisample) = !_glewInit_GL_NV_explicit_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_explicit_multisample */ -#ifdef GL_NV_fence - CONST_CAST(GLEW_NV_fence) = glewGetExtension("GL_NV_fence"); - if (glewExperimental || GLEW_NV_fence) CONST_CAST(GLEW_NV_fence) = !_glewInit_GL_NV_fence(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_fence */ -#ifdef GL_NV_float_buffer - CONST_CAST(GLEW_NV_float_buffer) = glewGetExtension("GL_NV_float_buffer"); -#endif /* GL_NV_float_buffer */ -#ifdef GL_NV_fog_distance - CONST_CAST(GLEW_NV_fog_distance) = glewGetExtension("GL_NV_fog_distance"); -#endif /* GL_NV_fog_distance */ -#ifdef GL_NV_fragment_program - CONST_CAST(GLEW_NV_fragment_program) = glewGetExtension("GL_NV_fragment_program"); - if (glewExperimental || GLEW_NV_fragment_program) CONST_CAST(GLEW_NV_fragment_program) = !_glewInit_GL_NV_fragment_program(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_fragment_program */ -#ifdef GL_NV_fragment_program2 - CONST_CAST(GLEW_NV_fragment_program2) = glewGetExtension("GL_NV_fragment_program2"); -#endif /* GL_NV_fragment_program2 */ -#ifdef GL_NV_fragment_program4 - CONST_CAST(GLEW_NV_fragment_program4) = glewGetExtension("GL_NV_fragment_program4"); -#endif /* GL_NV_fragment_program4 */ -#ifdef GL_NV_fragment_program_option - CONST_CAST(GLEW_NV_fragment_program_option) = glewGetExtension("GL_NV_fragment_program_option"); -#endif /* GL_NV_fragment_program_option */ -#ifdef GL_NV_framebuffer_multisample_coverage - CONST_CAST(GLEW_NV_framebuffer_multisample_coverage) = glewGetExtension("GL_NV_framebuffer_multisample_coverage"); - if (glewExperimental || GLEW_NV_framebuffer_multisample_coverage) CONST_CAST(GLEW_NV_framebuffer_multisample_coverage) = !_glewInit_GL_NV_framebuffer_multisample_coverage(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_framebuffer_multisample_coverage */ -#ifdef GL_NV_geometry_program4 - CONST_CAST(GLEW_NV_geometry_program4) = glewGetExtension("GL_NV_geometry_program4"); - if (glewExperimental || GLEW_NV_geometry_program4) CONST_CAST(GLEW_NV_geometry_program4) = !_glewInit_GL_NV_geometry_program4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_geometry_program4 */ -#ifdef GL_NV_geometry_shader4 - CONST_CAST(GLEW_NV_geometry_shader4) = glewGetExtension("GL_NV_geometry_shader4"); -#endif /* GL_NV_geometry_shader4 */ -#ifdef GL_NV_gpu_program4 - CONST_CAST(GLEW_NV_gpu_program4) = glewGetExtension("GL_NV_gpu_program4"); - if (glewExperimental || GLEW_NV_gpu_program4) CONST_CAST(GLEW_NV_gpu_program4) = !_glewInit_GL_NV_gpu_program4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_gpu_program4 */ -#ifdef GL_NV_half_float - CONST_CAST(GLEW_NV_half_float) = glewGetExtension("GL_NV_half_float"); - if (glewExperimental || GLEW_NV_half_float) CONST_CAST(GLEW_NV_half_float) = !_glewInit_GL_NV_half_float(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_half_float */ -#ifdef GL_NV_light_max_exponent - CONST_CAST(GLEW_NV_light_max_exponent) = glewGetExtension("GL_NV_light_max_exponent"); -#endif /* GL_NV_light_max_exponent */ -#ifdef GL_NV_multisample_filter_hint - CONST_CAST(GLEW_NV_multisample_filter_hint) = glewGetExtension("GL_NV_multisample_filter_hint"); -#endif /* GL_NV_multisample_filter_hint */ -#ifdef GL_NV_occlusion_query - CONST_CAST(GLEW_NV_occlusion_query) = glewGetExtension("GL_NV_occlusion_query"); - if (glewExperimental || GLEW_NV_occlusion_query) CONST_CAST(GLEW_NV_occlusion_query) = !_glewInit_GL_NV_occlusion_query(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_occlusion_query */ -#ifdef GL_NV_packed_depth_stencil - CONST_CAST(GLEW_NV_packed_depth_stencil) = glewGetExtension("GL_NV_packed_depth_stencil"); -#endif /* GL_NV_packed_depth_stencil */ -#ifdef GL_NV_parameter_buffer_object - CONST_CAST(GLEW_NV_parameter_buffer_object) = glewGetExtension("GL_NV_parameter_buffer_object"); - if (glewExperimental || GLEW_NV_parameter_buffer_object) CONST_CAST(GLEW_NV_parameter_buffer_object) = !_glewInit_GL_NV_parameter_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_parameter_buffer_object */ -#ifdef GL_NV_pixel_data_range - CONST_CAST(GLEW_NV_pixel_data_range) = glewGetExtension("GL_NV_pixel_data_range"); - if (glewExperimental || GLEW_NV_pixel_data_range) CONST_CAST(GLEW_NV_pixel_data_range) = !_glewInit_GL_NV_pixel_data_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_pixel_data_range */ -#ifdef GL_NV_point_sprite - CONST_CAST(GLEW_NV_point_sprite) = glewGetExtension("GL_NV_point_sprite"); - if (glewExperimental || GLEW_NV_point_sprite) CONST_CAST(GLEW_NV_point_sprite) = !_glewInit_GL_NV_point_sprite(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_point_sprite */ -#ifdef GL_NV_present_video - CONST_CAST(GLEW_NV_present_video) = glewGetExtension("GL_NV_present_video"); - if (glewExperimental || GLEW_NV_present_video) CONST_CAST(GLEW_NV_present_video) = !_glewInit_GL_NV_present_video(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_present_video */ -#ifdef GL_NV_primitive_restart - CONST_CAST(GLEW_NV_primitive_restart) = glewGetExtension("GL_NV_primitive_restart"); - if (glewExperimental || GLEW_NV_primitive_restart) CONST_CAST(GLEW_NV_primitive_restart) = !_glewInit_GL_NV_primitive_restart(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_primitive_restart */ -#ifdef GL_NV_register_combiners - CONST_CAST(GLEW_NV_register_combiners) = glewGetExtension("GL_NV_register_combiners"); - if (glewExperimental || GLEW_NV_register_combiners) CONST_CAST(GLEW_NV_register_combiners) = !_glewInit_GL_NV_register_combiners(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_register_combiners */ -#ifdef GL_NV_register_combiners2 - CONST_CAST(GLEW_NV_register_combiners2) = glewGetExtension("GL_NV_register_combiners2"); - if (glewExperimental || GLEW_NV_register_combiners2) CONST_CAST(GLEW_NV_register_combiners2) = !_glewInit_GL_NV_register_combiners2(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_register_combiners2 */ -#ifdef GL_NV_texgen_emboss - CONST_CAST(GLEW_NV_texgen_emboss) = glewGetExtension("GL_NV_texgen_emboss"); -#endif /* GL_NV_texgen_emboss */ -#ifdef GL_NV_texgen_reflection - CONST_CAST(GLEW_NV_texgen_reflection) = glewGetExtension("GL_NV_texgen_reflection"); -#endif /* GL_NV_texgen_reflection */ -#ifdef GL_NV_texture_compression_vtc - CONST_CAST(GLEW_NV_texture_compression_vtc) = glewGetExtension("GL_NV_texture_compression_vtc"); -#endif /* GL_NV_texture_compression_vtc */ -#ifdef GL_NV_texture_env_combine4 - CONST_CAST(GLEW_NV_texture_env_combine4) = glewGetExtension("GL_NV_texture_env_combine4"); -#endif /* GL_NV_texture_env_combine4 */ -#ifdef GL_NV_texture_expand_normal - CONST_CAST(GLEW_NV_texture_expand_normal) = glewGetExtension("GL_NV_texture_expand_normal"); -#endif /* GL_NV_texture_expand_normal */ -#ifdef GL_NV_texture_rectangle - CONST_CAST(GLEW_NV_texture_rectangle) = glewGetExtension("GL_NV_texture_rectangle"); -#endif /* GL_NV_texture_rectangle */ -#ifdef GL_NV_texture_shader - CONST_CAST(GLEW_NV_texture_shader) = glewGetExtension("GL_NV_texture_shader"); -#endif /* GL_NV_texture_shader */ -#ifdef GL_NV_texture_shader2 - CONST_CAST(GLEW_NV_texture_shader2) = glewGetExtension("GL_NV_texture_shader2"); -#endif /* GL_NV_texture_shader2 */ -#ifdef GL_NV_texture_shader3 - CONST_CAST(GLEW_NV_texture_shader3) = glewGetExtension("GL_NV_texture_shader3"); -#endif /* GL_NV_texture_shader3 */ -#ifdef GL_NV_transform_feedback - CONST_CAST(GLEW_NV_transform_feedback) = glewGetExtension("GL_NV_transform_feedback"); - if (glewExperimental || GLEW_NV_transform_feedback) CONST_CAST(GLEW_NV_transform_feedback) = !_glewInit_GL_NV_transform_feedback(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_transform_feedback */ -#ifdef GL_NV_vertex_array_range - CONST_CAST(GLEW_NV_vertex_array_range) = glewGetExtension("GL_NV_vertex_array_range"); - if (glewExperimental || GLEW_NV_vertex_array_range) CONST_CAST(GLEW_NV_vertex_array_range) = !_glewInit_GL_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_vertex_array_range */ -#ifdef GL_NV_vertex_array_range2 - CONST_CAST(GLEW_NV_vertex_array_range2) = glewGetExtension("GL_NV_vertex_array_range2"); -#endif /* GL_NV_vertex_array_range2 */ -#ifdef GL_NV_vertex_program - CONST_CAST(GLEW_NV_vertex_program) = glewGetExtension("GL_NV_vertex_program"); - if (glewExperimental || GLEW_NV_vertex_program) CONST_CAST(GLEW_NV_vertex_program) = !_glewInit_GL_NV_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_vertex_program */ -#ifdef GL_NV_vertex_program1_1 - CONST_CAST(GLEW_NV_vertex_program1_1) = glewGetExtension("GL_NV_vertex_program1_1"); -#endif /* GL_NV_vertex_program1_1 */ -#ifdef GL_NV_vertex_program2 - CONST_CAST(GLEW_NV_vertex_program2) = glewGetExtension("GL_NV_vertex_program2"); -#endif /* GL_NV_vertex_program2 */ -#ifdef GL_NV_vertex_program2_option - CONST_CAST(GLEW_NV_vertex_program2_option) = glewGetExtension("GL_NV_vertex_program2_option"); -#endif /* GL_NV_vertex_program2_option */ -#ifdef GL_NV_vertex_program3 - CONST_CAST(GLEW_NV_vertex_program3) = glewGetExtension("GL_NV_vertex_program3"); -#endif /* GL_NV_vertex_program3 */ -#ifdef GL_NV_vertex_program4 - CONST_CAST(GLEW_NV_vertex_program4) = glewGetExtension("GL_NV_vertex_program4"); -#endif /* GL_NV_vertex_program4 */ -#ifdef GL_OES_byte_coordinates - CONST_CAST(GLEW_OES_byte_coordinates) = glewGetExtension("GL_OES_byte_coordinates"); -#endif /* GL_OES_byte_coordinates */ -#ifdef GL_OES_compressed_paletted_texture - CONST_CAST(GLEW_OES_compressed_paletted_texture) = glewGetExtension("GL_OES_compressed_paletted_texture"); -#endif /* GL_OES_compressed_paletted_texture */ -#ifdef GL_OES_read_format - CONST_CAST(GLEW_OES_read_format) = glewGetExtension("GL_OES_read_format"); -#endif /* GL_OES_read_format */ -#ifdef GL_OES_single_precision - CONST_CAST(GLEW_OES_single_precision) = glewGetExtension("GL_OES_single_precision"); - if (glewExperimental || GLEW_OES_single_precision) CONST_CAST(GLEW_OES_single_precision) = !_glewInit_GL_OES_single_precision(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_OES_single_precision */ -#ifdef GL_OML_interlace - CONST_CAST(GLEW_OML_interlace) = glewGetExtension("GL_OML_interlace"); -#endif /* GL_OML_interlace */ -#ifdef GL_OML_resample - CONST_CAST(GLEW_OML_resample) = glewGetExtension("GL_OML_resample"); -#endif /* GL_OML_resample */ -#ifdef GL_OML_subsample - CONST_CAST(GLEW_OML_subsample) = glewGetExtension("GL_OML_subsample"); -#endif /* GL_OML_subsample */ -#ifdef GL_PGI_misc_hints - CONST_CAST(GLEW_PGI_misc_hints) = glewGetExtension("GL_PGI_misc_hints"); -#endif /* GL_PGI_misc_hints */ -#ifdef GL_PGI_vertex_hints - CONST_CAST(GLEW_PGI_vertex_hints) = glewGetExtension("GL_PGI_vertex_hints"); -#endif /* GL_PGI_vertex_hints */ -#ifdef GL_REND_screen_coordinates - CONST_CAST(GLEW_REND_screen_coordinates) = glewGetExtension("GL_REND_screen_coordinates"); -#endif /* GL_REND_screen_coordinates */ -#ifdef GL_S3_s3tc - CONST_CAST(GLEW_S3_s3tc) = glewGetExtension("GL_S3_s3tc"); -#endif /* GL_S3_s3tc */ -#ifdef GL_SGIS_color_range - CONST_CAST(GLEW_SGIS_color_range) = glewGetExtension("GL_SGIS_color_range"); -#endif /* GL_SGIS_color_range */ -#ifdef GL_SGIS_detail_texture - CONST_CAST(GLEW_SGIS_detail_texture) = glewGetExtension("GL_SGIS_detail_texture"); - if (glewExperimental || GLEW_SGIS_detail_texture) CONST_CAST(GLEW_SGIS_detail_texture) = !_glewInit_GL_SGIS_detail_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_detail_texture */ -#ifdef GL_SGIS_fog_function - CONST_CAST(GLEW_SGIS_fog_function) = glewGetExtension("GL_SGIS_fog_function"); - if (glewExperimental || GLEW_SGIS_fog_function) CONST_CAST(GLEW_SGIS_fog_function) = !_glewInit_GL_SGIS_fog_function(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_fog_function */ -#ifdef GL_SGIS_generate_mipmap - CONST_CAST(GLEW_SGIS_generate_mipmap) = glewGetExtension("GL_SGIS_generate_mipmap"); -#endif /* GL_SGIS_generate_mipmap */ -#ifdef GL_SGIS_multisample - CONST_CAST(GLEW_SGIS_multisample) = glewGetExtension("GL_SGIS_multisample"); - if (glewExperimental || GLEW_SGIS_multisample) CONST_CAST(GLEW_SGIS_multisample) = !_glewInit_GL_SGIS_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_multisample */ -#ifdef GL_SGIS_pixel_texture - CONST_CAST(GLEW_SGIS_pixel_texture) = glewGetExtension("GL_SGIS_pixel_texture"); -#endif /* GL_SGIS_pixel_texture */ -#ifdef GL_SGIS_point_line_texgen - CONST_CAST(GLEW_SGIS_point_line_texgen) = glewGetExtension("GL_SGIS_point_line_texgen"); -#endif /* GL_SGIS_point_line_texgen */ -#ifdef GL_SGIS_sharpen_texture - CONST_CAST(GLEW_SGIS_sharpen_texture) = glewGetExtension("GL_SGIS_sharpen_texture"); - if (glewExperimental || GLEW_SGIS_sharpen_texture) CONST_CAST(GLEW_SGIS_sharpen_texture) = !_glewInit_GL_SGIS_sharpen_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_sharpen_texture */ -#ifdef GL_SGIS_texture4D - CONST_CAST(GLEW_SGIS_texture4D) = glewGetExtension("GL_SGIS_texture4D"); - if (glewExperimental || GLEW_SGIS_texture4D) CONST_CAST(GLEW_SGIS_texture4D) = !_glewInit_GL_SGIS_texture4D(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_texture4D */ -#ifdef GL_SGIS_texture_border_clamp - CONST_CAST(GLEW_SGIS_texture_border_clamp) = glewGetExtension("GL_SGIS_texture_border_clamp"); -#endif /* GL_SGIS_texture_border_clamp */ -#ifdef GL_SGIS_texture_edge_clamp - CONST_CAST(GLEW_SGIS_texture_edge_clamp) = glewGetExtension("GL_SGIS_texture_edge_clamp"); -#endif /* GL_SGIS_texture_edge_clamp */ -#ifdef GL_SGIS_texture_filter4 - CONST_CAST(GLEW_SGIS_texture_filter4) = glewGetExtension("GL_SGIS_texture_filter4"); - if (glewExperimental || GLEW_SGIS_texture_filter4) CONST_CAST(GLEW_SGIS_texture_filter4) = !_glewInit_GL_SGIS_texture_filter4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_texture_filter4 */ -#ifdef GL_SGIS_texture_lod - CONST_CAST(GLEW_SGIS_texture_lod) = glewGetExtension("GL_SGIS_texture_lod"); -#endif /* GL_SGIS_texture_lod */ -#ifdef GL_SGIS_texture_select - CONST_CAST(GLEW_SGIS_texture_select) = glewGetExtension("GL_SGIS_texture_select"); -#endif /* GL_SGIS_texture_select */ -#ifdef GL_SGIX_async - CONST_CAST(GLEW_SGIX_async) = glewGetExtension("GL_SGIX_async"); - if (glewExperimental || GLEW_SGIX_async) CONST_CAST(GLEW_SGIX_async) = !_glewInit_GL_SGIX_async(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_async */ -#ifdef GL_SGIX_async_histogram - CONST_CAST(GLEW_SGIX_async_histogram) = glewGetExtension("GL_SGIX_async_histogram"); -#endif /* GL_SGIX_async_histogram */ -#ifdef GL_SGIX_async_pixel - CONST_CAST(GLEW_SGIX_async_pixel) = glewGetExtension("GL_SGIX_async_pixel"); -#endif /* GL_SGIX_async_pixel */ -#ifdef GL_SGIX_blend_alpha_minmax - CONST_CAST(GLEW_SGIX_blend_alpha_minmax) = glewGetExtension("GL_SGIX_blend_alpha_minmax"); -#endif /* GL_SGIX_blend_alpha_minmax */ -#ifdef GL_SGIX_clipmap - CONST_CAST(GLEW_SGIX_clipmap) = glewGetExtension("GL_SGIX_clipmap"); -#endif /* GL_SGIX_clipmap */ -#ifdef GL_SGIX_convolution_accuracy - CONST_CAST(GLEW_SGIX_convolution_accuracy) = glewGetExtension("GL_SGIX_convolution_accuracy"); -#endif /* GL_SGIX_convolution_accuracy */ -#ifdef GL_SGIX_depth_texture - CONST_CAST(GLEW_SGIX_depth_texture) = glewGetExtension("GL_SGIX_depth_texture"); -#endif /* GL_SGIX_depth_texture */ -#ifdef GL_SGIX_flush_raster - CONST_CAST(GLEW_SGIX_flush_raster) = glewGetExtension("GL_SGIX_flush_raster"); - if (glewExperimental || GLEW_SGIX_flush_raster) CONST_CAST(GLEW_SGIX_flush_raster) = !_glewInit_GL_SGIX_flush_raster(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_flush_raster */ -#ifdef GL_SGIX_fog_offset - CONST_CAST(GLEW_SGIX_fog_offset) = glewGetExtension("GL_SGIX_fog_offset"); -#endif /* GL_SGIX_fog_offset */ -#ifdef GL_SGIX_fog_texture - CONST_CAST(GLEW_SGIX_fog_texture) = glewGetExtension("GL_SGIX_fog_texture"); - if (glewExperimental || GLEW_SGIX_fog_texture) CONST_CAST(GLEW_SGIX_fog_texture) = !_glewInit_GL_SGIX_fog_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_fog_texture */ -#ifdef GL_SGIX_fragment_specular_lighting - CONST_CAST(GLEW_SGIX_fragment_specular_lighting) = glewGetExtension("GL_SGIX_fragment_specular_lighting"); - if (glewExperimental || GLEW_SGIX_fragment_specular_lighting) CONST_CAST(GLEW_SGIX_fragment_specular_lighting) = !_glewInit_GL_SGIX_fragment_specular_lighting(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_fragment_specular_lighting */ -#ifdef GL_SGIX_framezoom - CONST_CAST(GLEW_SGIX_framezoom) = glewGetExtension("GL_SGIX_framezoom"); - if (glewExperimental || GLEW_SGIX_framezoom) CONST_CAST(GLEW_SGIX_framezoom) = !_glewInit_GL_SGIX_framezoom(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_framezoom */ -#ifdef GL_SGIX_interlace - CONST_CAST(GLEW_SGIX_interlace) = glewGetExtension("GL_SGIX_interlace"); -#endif /* GL_SGIX_interlace */ -#ifdef GL_SGIX_ir_instrument1 - CONST_CAST(GLEW_SGIX_ir_instrument1) = glewGetExtension("GL_SGIX_ir_instrument1"); -#endif /* GL_SGIX_ir_instrument1 */ -#ifdef GL_SGIX_list_priority - CONST_CAST(GLEW_SGIX_list_priority) = glewGetExtension("GL_SGIX_list_priority"); -#endif /* GL_SGIX_list_priority */ -#ifdef GL_SGIX_pixel_texture - CONST_CAST(GLEW_SGIX_pixel_texture) = glewGetExtension("GL_SGIX_pixel_texture"); - if (glewExperimental || GLEW_SGIX_pixel_texture) CONST_CAST(GLEW_SGIX_pixel_texture) = !_glewInit_GL_SGIX_pixel_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_pixel_texture */ -#ifdef GL_SGIX_pixel_texture_bits - CONST_CAST(GLEW_SGIX_pixel_texture_bits) = glewGetExtension("GL_SGIX_pixel_texture_bits"); -#endif /* GL_SGIX_pixel_texture_bits */ -#ifdef GL_SGIX_reference_plane - CONST_CAST(GLEW_SGIX_reference_plane) = glewGetExtension("GL_SGIX_reference_plane"); - if (glewExperimental || GLEW_SGIX_reference_plane) CONST_CAST(GLEW_SGIX_reference_plane) = !_glewInit_GL_SGIX_reference_plane(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_reference_plane */ -#ifdef GL_SGIX_resample - CONST_CAST(GLEW_SGIX_resample) = glewGetExtension("GL_SGIX_resample"); -#endif /* GL_SGIX_resample */ -#ifdef GL_SGIX_shadow - CONST_CAST(GLEW_SGIX_shadow) = glewGetExtension("GL_SGIX_shadow"); -#endif /* GL_SGIX_shadow */ -#ifdef GL_SGIX_shadow_ambient - CONST_CAST(GLEW_SGIX_shadow_ambient) = glewGetExtension("GL_SGIX_shadow_ambient"); -#endif /* GL_SGIX_shadow_ambient */ -#ifdef GL_SGIX_sprite - CONST_CAST(GLEW_SGIX_sprite) = glewGetExtension("GL_SGIX_sprite"); - if (glewExperimental || GLEW_SGIX_sprite) CONST_CAST(GLEW_SGIX_sprite) = !_glewInit_GL_SGIX_sprite(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_sprite */ -#ifdef GL_SGIX_tag_sample_buffer - CONST_CAST(GLEW_SGIX_tag_sample_buffer) = glewGetExtension("GL_SGIX_tag_sample_buffer"); - if (glewExperimental || GLEW_SGIX_tag_sample_buffer) CONST_CAST(GLEW_SGIX_tag_sample_buffer) = !_glewInit_GL_SGIX_tag_sample_buffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_tag_sample_buffer */ -#ifdef GL_SGIX_texture_add_env - CONST_CAST(GLEW_SGIX_texture_add_env) = glewGetExtension("GL_SGIX_texture_add_env"); -#endif /* GL_SGIX_texture_add_env */ -#ifdef GL_SGIX_texture_coordinate_clamp - CONST_CAST(GLEW_SGIX_texture_coordinate_clamp) = glewGetExtension("GL_SGIX_texture_coordinate_clamp"); -#endif /* GL_SGIX_texture_coordinate_clamp */ -#ifdef GL_SGIX_texture_lod_bias - CONST_CAST(GLEW_SGIX_texture_lod_bias) = glewGetExtension("GL_SGIX_texture_lod_bias"); -#endif /* GL_SGIX_texture_lod_bias */ -#ifdef GL_SGIX_texture_multi_buffer - CONST_CAST(GLEW_SGIX_texture_multi_buffer) = glewGetExtension("GL_SGIX_texture_multi_buffer"); -#endif /* GL_SGIX_texture_multi_buffer */ -#ifdef GL_SGIX_texture_range - CONST_CAST(GLEW_SGIX_texture_range) = glewGetExtension("GL_SGIX_texture_range"); -#endif /* GL_SGIX_texture_range */ -#ifdef GL_SGIX_texture_scale_bias - CONST_CAST(GLEW_SGIX_texture_scale_bias) = glewGetExtension("GL_SGIX_texture_scale_bias"); -#endif /* GL_SGIX_texture_scale_bias */ -#ifdef GL_SGIX_vertex_preclip - CONST_CAST(GLEW_SGIX_vertex_preclip) = glewGetExtension("GL_SGIX_vertex_preclip"); -#endif /* GL_SGIX_vertex_preclip */ -#ifdef GL_SGIX_vertex_preclip_hint - CONST_CAST(GLEW_SGIX_vertex_preclip_hint) = glewGetExtension("GL_SGIX_vertex_preclip_hint"); -#endif /* GL_SGIX_vertex_preclip_hint */ -#ifdef GL_SGIX_ycrcb - CONST_CAST(GLEW_SGIX_ycrcb) = glewGetExtension("GL_SGIX_ycrcb"); -#endif /* GL_SGIX_ycrcb */ -#ifdef GL_SGI_color_matrix - CONST_CAST(GLEW_SGI_color_matrix) = glewGetExtension("GL_SGI_color_matrix"); -#endif /* GL_SGI_color_matrix */ -#ifdef GL_SGI_color_table - CONST_CAST(GLEW_SGI_color_table) = glewGetExtension("GL_SGI_color_table"); - if (glewExperimental || GLEW_SGI_color_table) CONST_CAST(GLEW_SGI_color_table) = !_glewInit_GL_SGI_color_table(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGI_color_table */ -#ifdef GL_SGI_texture_color_table - CONST_CAST(GLEW_SGI_texture_color_table) = glewGetExtension("GL_SGI_texture_color_table"); -#endif /* GL_SGI_texture_color_table */ -#ifdef GL_SUNX_constant_data - CONST_CAST(GLEW_SUNX_constant_data) = glewGetExtension("GL_SUNX_constant_data"); - if (glewExperimental || GLEW_SUNX_constant_data) CONST_CAST(GLEW_SUNX_constant_data) = !_glewInit_GL_SUNX_constant_data(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUNX_constant_data */ -#ifdef GL_SUN_convolution_border_modes - CONST_CAST(GLEW_SUN_convolution_border_modes) = glewGetExtension("GL_SUN_convolution_border_modes"); -#endif /* GL_SUN_convolution_border_modes */ -#ifdef GL_SUN_global_alpha - CONST_CAST(GLEW_SUN_global_alpha) = glewGetExtension("GL_SUN_global_alpha"); - if (glewExperimental || GLEW_SUN_global_alpha) CONST_CAST(GLEW_SUN_global_alpha) = !_glewInit_GL_SUN_global_alpha(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUN_global_alpha */ -#ifdef GL_SUN_mesh_array - CONST_CAST(GLEW_SUN_mesh_array) = glewGetExtension("GL_SUN_mesh_array"); -#endif /* GL_SUN_mesh_array */ -#ifdef GL_SUN_read_video_pixels - CONST_CAST(GLEW_SUN_read_video_pixels) = glewGetExtension("GL_SUN_read_video_pixels"); - if (glewExperimental || GLEW_SUN_read_video_pixels) CONST_CAST(GLEW_SUN_read_video_pixels) = !_glewInit_GL_SUN_read_video_pixels(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUN_read_video_pixels */ -#ifdef GL_SUN_slice_accum - CONST_CAST(GLEW_SUN_slice_accum) = glewGetExtension("GL_SUN_slice_accum"); -#endif /* GL_SUN_slice_accum */ -#ifdef GL_SUN_triangle_list - CONST_CAST(GLEW_SUN_triangle_list) = glewGetExtension("GL_SUN_triangle_list"); - if (glewExperimental || GLEW_SUN_triangle_list) CONST_CAST(GLEW_SUN_triangle_list) = !_glewInit_GL_SUN_triangle_list(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUN_triangle_list */ -#ifdef GL_SUN_vertex - CONST_CAST(GLEW_SUN_vertex) = glewGetExtension("GL_SUN_vertex"); - if (glewExperimental || GLEW_SUN_vertex) CONST_CAST(GLEW_SUN_vertex) = !_glewInit_GL_SUN_vertex(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUN_vertex */ -#ifdef GL_WIN_phong_shading - CONST_CAST(GLEW_WIN_phong_shading) = glewGetExtension("GL_WIN_phong_shading"); -#endif /* GL_WIN_phong_shading */ -#ifdef GL_WIN_specular_fog - CONST_CAST(GLEW_WIN_specular_fog) = glewGetExtension("GL_WIN_specular_fog"); -#endif /* GL_WIN_specular_fog */ -#ifdef GL_WIN_swap_hint - CONST_CAST(GLEW_WIN_swap_hint) = glewGetExtension("GL_WIN_swap_hint"); - if (glewExperimental || GLEW_WIN_swap_hint) CONST_CAST(GLEW_WIN_swap_hint) = !_glewInit_GL_WIN_swap_hint(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_WIN_swap_hint */ - - return GLEW_OK; -} - - -#if defined(_WIN32) - -#if !defined(GLEW_MX) - -PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL; - -PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB = NULL; -PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB = NULL; -PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB = NULL; -PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB = NULL; - -PFNWGLCREATECONTEXTATTRIBSARBPROC __wglewCreateContextAttribsARB = NULL; - -PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB = NULL; - -PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB = NULL; -PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB = NULL; - -PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB = NULL; -PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB = NULL; -PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB = NULL; -PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB = NULL; -PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB = NULL; - -PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB = NULL; -PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB = NULL; -PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB = NULL; - -PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB = NULL; -PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB = NULL; -PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB = NULL; - -PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT = NULL; -PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT = NULL; -PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT = NULL; -PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT = NULL; - -PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT = NULL; - -PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT = NULL; -PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT = NULL; - -PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT = NULL; -PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT = NULL; -PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT = NULL; -PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT = NULL; -PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT = NULL; - -PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT = NULL; -PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT = NULL; -PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT = NULL; - -PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT = NULL; -PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT = NULL; - -PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D = NULL; -PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D = NULL; - -PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D = NULL; -PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D = NULL; -PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D = NULL; -PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D = NULL; - -PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D = NULL; -PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D = NULL; -PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D = NULL; -PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D = NULL; -PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D = NULL; -PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D = NULL; -PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D = NULL; -PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D = NULL; -PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D = NULL; -PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D = NULL; -PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D = NULL; -PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D = NULL; - -PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D = NULL; -PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D = NULL; -PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D = NULL; -PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D = NULL; - -PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D = NULL; -PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D = NULL; -PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D = NULL; -PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D = NULL; - -PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D = NULL; -PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D = NULL; -PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D = NULL; -PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D = NULL; - -PFNWGLCREATEAFFINITYDCNVPROC __wglewCreateAffinityDCNV = NULL; -PFNWGLDELETEDCNVPROC __wglewDeleteDCNV = NULL; -PFNWGLENUMGPUDEVICESNVPROC __wglewEnumGpuDevicesNV = NULL; -PFNWGLENUMGPUSFROMAFFINITYDCNVPROC __wglewEnumGpusFromAffinityDCNV = NULL; -PFNWGLENUMGPUSNVPROC __wglewEnumGpusNV = NULL; - -PFNWGLBINDVIDEODEVICENVPROC __wglewBindVideoDeviceNV = NULL; -PFNWGLENUMERATEVIDEODEVICESNVPROC __wglewEnumerateVideoDevicesNV = NULL; -PFNWGLQUERYCURRENTCONTEXTNVPROC __wglewQueryCurrentContextNV = NULL; - -PFNWGLBINDSWAPBARRIERNVPROC __wglewBindSwapBarrierNV = NULL; -PFNWGLJOINSWAPGROUPNVPROC __wglewJoinSwapGroupNV = NULL; -PFNWGLQUERYFRAMECOUNTNVPROC __wglewQueryFrameCountNV = NULL; -PFNWGLQUERYMAXSWAPGROUPSNVPROC __wglewQueryMaxSwapGroupsNV = NULL; -PFNWGLQUERYSWAPGROUPNVPROC __wglewQuerySwapGroupNV = NULL; -PFNWGLRESETFRAMECOUNTNVPROC __wglewResetFrameCountNV = NULL; - -PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV = NULL; -PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV = NULL; - -PFNWGLBINDVIDEOIMAGENVPROC __wglewBindVideoImageNV = NULL; -PFNWGLGETVIDEODEVICENVPROC __wglewGetVideoDeviceNV = NULL; -PFNWGLGETVIDEOINFONVPROC __wglewGetVideoInfoNV = NULL; -PFNWGLRELEASEVIDEODEVICENVPROC __wglewReleaseVideoDeviceNV = NULL; -PFNWGLRELEASEVIDEOIMAGENVPROC __wglewReleaseVideoImageNV = NULL; -PFNWGLSENDPBUFFERTOVIDEONVPROC __wglewSendPbufferToVideoNV = NULL; - -PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML = NULL; -PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML = NULL; -PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML = NULL; -PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML = NULL; -PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML = NULL; -PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML = NULL; -GLboolean __WGLEW_3DFX_multisample = GL_FALSE; -GLboolean __WGLEW_3DL_stereo_control = GL_FALSE; -GLboolean __WGLEW_ARB_buffer_region = GL_FALSE; -GLboolean __WGLEW_ARB_create_context = GL_FALSE; -GLboolean __WGLEW_ARB_extensions_string = GL_FALSE; -GLboolean __WGLEW_ARB_framebuffer_sRGB = GL_FALSE; -GLboolean __WGLEW_ARB_make_current_read = GL_FALSE; -GLboolean __WGLEW_ARB_multisample = GL_FALSE; -GLboolean __WGLEW_ARB_pbuffer = GL_FALSE; -GLboolean __WGLEW_ARB_pixel_format = GL_FALSE; -GLboolean __WGLEW_ARB_pixel_format_float = GL_FALSE; -GLboolean __WGLEW_ARB_render_texture = GL_FALSE; -GLboolean __WGLEW_ATI_pixel_format_float = GL_FALSE; -GLboolean __WGLEW_ATI_render_texture_rectangle = GL_FALSE; -GLboolean __WGLEW_EXT_depth_float = GL_FALSE; -GLboolean __WGLEW_EXT_display_color_table = GL_FALSE; -GLboolean __WGLEW_EXT_extensions_string = GL_FALSE; -GLboolean __WGLEW_EXT_framebuffer_sRGB = GL_FALSE; -GLboolean __WGLEW_EXT_make_current_read = GL_FALSE; -GLboolean __WGLEW_EXT_multisample = GL_FALSE; -GLboolean __WGLEW_EXT_pbuffer = GL_FALSE; -GLboolean __WGLEW_EXT_pixel_format = GL_FALSE; -GLboolean __WGLEW_EXT_pixel_format_packed_float = GL_FALSE; -GLboolean __WGLEW_EXT_swap_control = GL_FALSE; -GLboolean __WGLEW_I3D_digital_video_control = GL_FALSE; -GLboolean __WGLEW_I3D_gamma = GL_FALSE; -GLboolean __WGLEW_I3D_genlock = GL_FALSE; -GLboolean __WGLEW_I3D_image_buffer = GL_FALSE; -GLboolean __WGLEW_I3D_swap_frame_lock = GL_FALSE; -GLboolean __WGLEW_I3D_swap_frame_usage = GL_FALSE; -GLboolean __WGLEW_NV_float_buffer = GL_FALSE; -GLboolean __WGLEW_NV_gpu_affinity = GL_FALSE; -GLboolean __WGLEW_NV_present_video = GL_FALSE; -GLboolean __WGLEW_NV_render_depth_texture = GL_FALSE; -GLboolean __WGLEW_NV_render_texture_rectangle = GL_FALSE; -GLboolean __WGLEW_NV_swap_group = GL_FALSE; -GLboolean __WGLEW_NV_vertex_array_range = GL_FALSE; -GLboolean __WGLEW_NV_video_output = GL_FALSE; -GLboolean __WGLEW_OML_sync_control = GL_FALSE; - -#endif /* !GLEW_MX */ - -#ifdef WGL_3DFX_multisample - -#endif /* WGL_3DFX_multisample */ - -#ifdef WGL_3DL_stereo_control - -static GLboolean _glewInit_WGL_3DL_stereo_control (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglSetStereoEmitterState3DL = (PFNWGLSETSTEREOEMITTERSTATE3DLPROC)glewGetProcAddress((const GLubyte*)"wglSetStereoEmitterState3DL")) == NULL) || r; - - return r; -} - -#endif /* WGL_3DL_stereo_control */ - -#ifdef WGL_ARB_buffer_region - -static GLboolean _glewInit_WGL_ARB_buffer_region (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreateBufferRegionARB = (PFNWGLCREATEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglCreateBufferRegionARB")) == NULL) || r; - r = ((wglDeleteBufferRegionARB = (PFNWGLDELETEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglDeleteBufferRegionARB")) == NULL) || r; - r = ((wglRestoreBufferRegionARB = (PFNWGLRESTOREBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglRestoreBufferRegionARB")) == NULL) || r; - r = ((wglSaveBufferRegionARB = (PFNWGLSAVEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglSaveBufferRegionARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_buffer_region */ - -#ifdef WGL_ARB_create_context - -static GLboolean _glewInit_WGL_ARB_create_context (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)glewGetProcAddress((const GLubyte*)"wglCreateContextAttribsARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_create_context */ - -#ifdef WGL_ARB_extensions_string - -static GLboolean _glewInit_WGL_ARB_extensions_string (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_extensions_string */ - -#ifdef WGL_ARB_framebuffer_sRGB - -#endif /* WGL_ARB_framebuffer_sRGB */ - -#ifdef WGL_ARB_make_current_read - -static GLboolean _glewInit_WGL_ARB_make_current_read (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetCurrentReadDCARB = (PFNWGLGETCURRENTREADDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCARB")) == NULL) || r; - r = ((wglMakeContextCurrentARB = (PFNWGLMAKECONTEXTCURRENTARBPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_make_current_read */ - -#ifdef WGL_ARB_multisample - -#endif /* WGL_ARB_multisample */ - -#ifdef WGL_ARB_pbuffer - -static GLboolean _glewInit_WGL_ARB_pbuffer (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreatePbufferARB = (PFNWGLCREATEPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferARB")) == NULL) || r; - r = ((wglDestroyPbufferARB = (PFNWGLDESTROYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferARB")) == NULL) || r; - r = ((wglGetPbufferDCARB = (PFNWGLGETPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCARB")) == NULL) || r; - r = ((wglQueryPbufferARB = (PFNWGLQUERYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferARB")) == NULL) || r; - r = ((wglReleasePbufferDCARB = (PFNWGLRELEASEPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_pbuffer */ - -#ifdef WGL_ARB_pixel_format - -static GLboolean _glewInit_WGL_ARB_pixel_format (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglChoosePixelFormatARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatARB")) == NULL) || r; - r = ((wglGetPixelFormatAttribfvARB = (PFNWGLGETPIXELFORMATATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvARB")) == NULL) || r; - r = ((wglGetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_pixel_format */ - -#ifdef WGL_ARB_pixel_format_float - -#endif /* WGL_ARB_pixel_format_float */ - -#ifdef WGL_ARB_render_texture - -static GLboolean _glewInit_WGL_ARB_render_texture (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindTexImageARB = (PFNWGLBINDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglBindTexImageARB")) == NULL) || r; - r = ((wglReleaseTexImageARB = (PFNWGLRELEASETEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglReleaseTexImageARB")) == NULL) || r; - r = ((wglSetPbufferAttribARB = (PFNWGLSETPBUFFERATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"wglSetPbufferAttribARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_render_texture */ - -#ifdef WGL_ATI_pixel_format_float - -#endif /* WGL_ATI_pixel_format_float */ - -#ifdef WGL_ATI_render_texture_rectangle - -#endif /* WGL_ATI_render_texture_rectangle */ - -#ifdef WGL_EXT_depth_float - -#endif /* WGL_EXT_depth_float */ - -#ifdef WGL_EXT_display_color_table - -static GLboolean _glewInit_WGL_EXT_display_color_table (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindDisplayColorTableEXT = (PFNWGLBINDDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglBindDisplayColorTableEXT")) == NULL) || r; - r = ((wglCreateDisplayColorTableEXT = (PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglCreateDisplayColorTableEXT")) == NULL) || r; - r = ((wglDestroyDisplayColorTableEXT = (PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyDisplayColorTableEXT")) == NULL) || r; - r = ((wglLoadDisplayColorTableEXT = (PFNWGLLOADDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglLoadDisplayColorTableEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_display_color_table */ - -#ifdef WGL_EXT_extensions_string - -static GLboolean _glewInit_WGL_EXT_extensions_string (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_extensions_string */ - -#ifdef WGL_EXT_framebuffer_sRGB - -#endif /* WGL_EXT_framebuffer_sRGB */ - -#ifdef WGL_EXT_make_current_read - -static GLboolean _glewInit_WGL_EXT_make_current_read (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetCurrentReadDCEXT = (PFNWGLGETCURRENTREADDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCEXT")) == NULL) || r; - r = ((wglMakeContextCurrentEXT = (PFNWGLMAKECONTEXTCURRENTEXTPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_make_current_read */ - -#ifdef WGL_EXT_multisample - -#endif /* WGL_EXT_multisample */ - -#ifdef WGL_EXT_pbuffer - -static GLboolean _glewInit_WGL_EXT_pbuffer (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreatePbufferEXT = (PFNWGLCREATEPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferEXT")) == NULL) || r; - r = ((wglDestroyPbufferEXT = (PFNWGLDESTROYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferEXT")) == NULL) || r; - r = ((wglGetPbufferDCEXT = (PFNWGLGETPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCEXT")) == NULL) || r; - r = ((wglQueryPbufferEXT = (PFNWGLQUERYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferEXT")) == NULL) || r; - r = ((wglReleasePbufferDCEXT = (PFNWGLRELEASEPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_pbuffer */ - -#ifdef WGL_EXT_pixel_format - -static GLboolean _glewInit_WGL_EXT_pixel_format (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglChoosePixelFormatEXT = (PFNWGLCHOOSEPIXELFORMATEXTPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatEXT")) == NULL) || r; - r = ((wglGetPixelFormatAttribfvEXT = (PFNWGLGETPIXELFORMATATTRIBFVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvEXT")) == NULL) || r; - r = ((wglGetPixelFormatAttribivEXT = (PFNWGLGETPIXELFORMATATTRIBIVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_pixel_format */ - -#ifdef WGL_EXT_pixel_format_packed_float - -#endif /* WGL_EXT_pixel_format_packed_float */ - -#ifdef WGL_EXT_swap_control - -static GLboolean _glewInit_WGL_EXT_swap_control (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetSwapIntervalEXT = (PFNWGLGETSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetSwapIntervalEXT")) == NULL) || r; - r = ((wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglSwapIntervalEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_swap_control */ - -#ifdef WGL_I3D_digital_video_control - -static GLboolean _glewInit_WGL_I3D_digital_video_control (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetDigitalVideoParametersI3D = (PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetDigitalVideoParametersI3D")) == NULL) || r; - r = ((wglSetDigitalVideoParametersI3D = (PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetDigitalVideoParametersI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_digital_video_control */ - -#ifdef WGL_I3D_gamma - -static GLboolean _glewInit_WGL_I3D_gamma (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetGammaTableI3D = (PFNWGLGETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableI3D")) == NULL) || r; - r = ((wglGetGammaTableParametersI3D = (PFNWGLGETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableParametersI3D")) == NULL) || r; - r = ((wglSetGammaTableI3D = (PFNWGLSETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableI3D")) == NULL) || r; - r = ((wglSetGammaTableParametersI3D = (PFNWGLSETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableParametersI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_gamma */ - -#ifdef WGL_I3D_genlock - -static GLboolean _glewInit_WGL_I3D_genlock (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglDisableGenlockI3D = (PFNWGLDISABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableGenlockI3D")) == NULL) || r; - r = ((wglEnableGenlockI3D = (PFNWGLENABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableGenlockI3D")) == NULL) || r; - r = ((wglGenlockSampleRateI3D = (PFNWGLGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSampleRateI3D")) == NULL) || r; - r = ((wglGenlockSourceDelayI3D = (PFNWGLGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceDelayI3D")) == NULL) || r; - r = ((wglGenlockSourceEdgeI3D = (PFNWGLGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceEdgeI3D")) == NULL) || r; - r = ((wglGenlockSourceI3D = (PFNWGLGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceI3D")) == NULL) || r; - r = ((wglGetGenlockSampleRateI3D = (PFNWGLGETGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSampleRateI3D")) == NULL) || r; - r = ((wglGetGenlockSourceDelayI3D = (PFNWGLGETGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceDelayI3D")) == NULL) || r; - r = ((wglGetGenlockSourceEdgeI3D = (PFNWGLGETGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceEdgeI3D")) == NULL) || r; - r = ((wglGetGenlockSourceI3D = (PFNWGLGETGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceI3D")) == NULL) || r; - r = ((wglIsEnabledGenlockI3D = (PFNWGLISENABLEDGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledGenlockI3D")) == NULL) || r; - r = ((wglQueryGenlockMaxSourceDelayI3D = (PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryGenlockMaxSourceDelayI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_genlock */ - -#ifdef WGL_I3D_image_buffer - -static GLboolean _glewInit_WGL_I3D_image_buffer (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglAssociateImageBufferEventsI3D = (PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglAssociateImageBufferEventsI3D")) == NULL) || r; - r = ((wglCreateImageBufferI3D = (PFNWGLCREATEIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglCreateImageBufferI3D")) == NULL) || r; - r = ((wglDestroyImageBufferI3D = (PFNWGLDESTROYIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglDestroyImageBufferI3D")) == NULL) || r; - r = ((wglReleaseImageBufferEventsI3D = (PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglReleaseImageBufferEventsI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_image_buffer */ - -#ifdef WGL_I3D_swap_frame_lock - -static GLboolean _glewInit_WGL_I3D_swap_frame_lock (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglDisableFrameLockI3D = (PFNWGLDISABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableFrameLockI3D")) == NULL) || r; - r = ((wglEnableFrameLockI3D = (PFNWGLENABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableFrameLockI3D")) == NULL) || r; - r = ((wglIsEnabledFrameLockI3D = (PFNWGLISENABLEDFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledFrameLockI3D")) == NULL) || r; - r = ((wglQueryFrameLockMasterI3D = (PFNWGLQUERYFRAMELOCKMASTERI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameLockMasterI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_swap_frame_lock */ - -#ifdef WGL_I3D_swap_frame_usage - -static GLboolean _glewInit_WGL_I3D_swap_frame_usage (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBeginFrameTrackingI3D = (PFNWGLBEGINFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglBeginFrameTrackingI3D")) == NULL) || r; - r = ((wglEndFrameTrackingI3D = (PFNWGLENDFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglEndFrameTrackingI3D")) == NULL) || r; - r = ((wglGetFrameUsageI3D = (PFNWGLGETFRAMEUSAGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetFrameUsageI3D")) == NULL) || r; - r = ((wglQueryFrameTrackingI3D = (PFNWGLQUERYFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameTrackingI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_swap_frame_usage */ - -#ifdef WGL_NV_float_buffer - -#endif /* WGL_NV_float_buffer */ - -#ifdef WGL_NV_gpu_affinity - -static GLboolean _glewInit_WGL_NV_gpu_affinity (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreateAffinityDCNV = (PFNWGLCREATEAFFINITYDCNVPROC)glewGetProcAddress((const GLubyte*)"wglCreateAffinityDCNV")) == NULL) || r; - r = ((wglDeleteDCNV = (PFNWGLDELETEDCNVPROC)glewGetProcAddress((const GLubyte*)"wglDeleteDCNV")) == NULL) || r; - r = ((wglEnumGpuDevicesNV = (PFNWGLENUMGPUDEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpuDevicesNV")) == NULL) || r; - r = ((wglEnumGpusFromAffinityDCNV = (PFNWGLENUMGPUSFROMAFFINITYDCNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpusFromAffinityDCNV")) == NULL) || r; - r = ((wglEnumGpusNV = (PFNWGLENUMGPUSNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpusNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_gpu_affinity */ - -#ifdef WGL_NV_present_video - -static GLboolean _glewInit_WGL_NV_present_video (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindVideoDeviceNV = (PFNWGLBINDVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoDeviceNV")) == NULL) || r; - r = ((wglEnumerateVideoDevicesNV = (PFNWGLENUMERATEVIDEODEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumerateVideoDevicesNV")) == NULL) || r; - r = ((wglQueryCurrentContextNV = (PFNWGLQUERYCURRENTCONTEXTNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryCurrentContextNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_present_video */ - -#ifdef WGL_NV_render_depth_texture - -#endif /* WGL_NV_render_depth_texture */ - -#ifdef WGL_NV_render_texture_rectangle - -#endif /* WGL_NV_render_texture_rectangle */ - -#ifdef WGL_NV_swap_group - -static GLboolean _glewInit_WGL_NV_swap_group (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindSwapBarrierNV = (PFNWGLBINDSWAPBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"wglBindSwapBarrierNV")) == NULL) || r; - r = ((wglJoinSwapGroupNV = (PFNWGLJOINSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"wglJoinSwapGroupNV")) == NULL) || r; - r = ((wglQueryFrameCountNV = (PFNWGLQUERYFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameCountNV")) == NULL) || r; - r = ((wglQueryMaxSwapGroupsNV = (PFNWGLQUERYMAXSWAPGROUPSNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryMaxSwapGroupsNV")) == NULL) || r; - r = ((wglQuerySwapGroupNV = (PFNWGLQUERYSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"wglQuerySwapGroupNV")) == NULL) || r; - r = ((wglResetFrameCountNV = (PFNWGLRESETFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"wglResetFrameCountNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_swap_group */ - -#ifdef WGL_NV_vertex_array_range - -static GLboolean _glewInit_WGL_NV_vertex_array_range (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglAllocateMemoryNV = (PFNWGLALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglAllocateMemoryNV")) == NULL) || r; - r = ((wglFreeMemoryNV = (PFNWGLFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglFreeMemoryNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_vertex_array_range */ - -#ifdef WGL_NV_video_output - -static GLboolean _glewInit_WGL_NV_video_output (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindVideoImageNV = (PFNWGLBINDVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoImageNV")) == NULL) || r; - r = ((wglGetVideoDeviceNV = (PFNWGLGETVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglGetVideoDeviceNV")) == NULL) || r; - r = ((wglGetVideoInfoNV = (PFNWGLGETVIDEOINFONVPROC)glewGetProcAddress((const GLubyte*)"wglGetVideoInfoNV")) == NULL) || r; - r = ((wglReleaseVideoDeviceNV = (PFNWGLRELEASEVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoDeviceNV")) == NULL) || r; - r = ((wglReleaseVideoImageNV = (PFNWGLRELEASEVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoImageNV")) == NULL) || r; - r = ((wglSendPbufferToVideoNV = (PFNWGLSENDPBUFFERTOVIDEONVPROC)glewGetProcAddress((const GLubyte*)"wglSendPbufferToVideoNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_video_output */ - -#ifdef WGL_OML_sync_control - -static GLboolean _glewInit_WGL_OML_sync_control (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetMscRateOML = (PFNWGLGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetMscRateOML")) == NULL) || r; - r = ((wglGetSyncValuesOML = (PFNWGLGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetSyncValuesOML")) == NULL) || r; - r = ((wglSwapBuffersMscOML = (PFNWGLSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapBuffersMscOML")) == NULL) || r; - r = ((wglSwapLayerBuffersMscOML = (PFNWGLSWAPLAYERBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapLayerBuffersMscOML")) == NULL) || r; - r = ((wglWaitForMscOML = (PFNWGLWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForMscOML")) == NULL) || r; - r = ((wglWaitForSbcOML = (PFNWGLWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForSbcOML")) == NULL) || r; - - return r; -} - -#endif /* WGL_OML_sync_control */ - -/* ------------------------------------------------------------------------- */ - -static PFNWGLGETEXTENSIONSSTRINGARBPROC _wglewGetExtensionsStringARB = NULL; -static PFNWGLGETEXTENSIONSSTRINGEXTPROC _wglewGetExtensionsStringEXT = NULL; - -GLboolean wglewGetExtension (const char* name) -{ - GLubyte* p; - GLubyte* end; - GLuint len = _glewStrLen((const GLubyte*)name); - if (_wglewGetExtensionsStringARB == NULL) - if (_wglewGetExtensionsStringEXT == NULL) - return GL_FALSE; - else - p = (GLubyte*)_wglewGetExtensionsStringEXT(); - else - p = (GLubyte*)_wglewGetExtensionsStringARB(wglGetCurrentDC()); - if (0 == p) return GL_FALSE; - end = p + _glewStrLen(p); - while (p < end) - { - GLuint n = _glewStrCLen(p, ' '); - if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE; - p += n+1; - } - return GL_FALSE; -} - -GLenum wglewContextInit (WGLEW_CONTEXT_ARG_DEF_LIST) -{ - GLboolean crippled; - /* find wgl extension string query functions */ - _wglewGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB"); - _wglewGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT"); - /* initialize extensions */ - crippled = _wglewGetExtensionsStringARB == NULL && _wglewGetExtensionsStringEXT == NULL; -#ifdef WGL_3DFX_multisample - CONST_CAST(WGLEW_3DFX_multisample) = wglewGetExtension("WGL_3DFX_multisample"); -#endif /* WGL_3DFX_multisample */ -#ifdef WGL_3DL_stereo_control - CONST_CAST(WGLEW_3DL_stereo_control) = wglewGetExtension("WGL_3DL_stereo_control"); - if (glewExperimental || WGLEW_3DL_stereo_control|| crippled) CONST_CAST(WGLEW_3DL_stereo_control)= !_glewInit_WGL_3DL_stereo_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_3DL_stereo_control */ -#ifdef WGL_ARB_buffer_region - CONST_CAST(WGLEW_ARB_buffer_region) = wglewGetExtension("WGL_ARB_buffer_region"); - if (glewExperimental || WGLEW_ARB_buffer_region|| crippled) CONST_CAST(WGLEW_ARB_buffer_region)= !_glewInit_WGL_ARB_buffer_region(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_buffer_region */ -#ifdef WGL_ARB_create_context - CONST_CAST(WGLEW_ARB_create_context) = wglewGetExtension("WGL_ARB_create_context"); - if (glewExperimental || WGLEW_ARB_create_context|| crippled) CONST_CAST(WGLEW_ARB_create_context)= !_glewInit_WGL_ARB_create_context(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_create_context */ -#ifdef WGL_ARB_extensions_string - CONST_CAST(WGLEW_ARB_extensions_string) = wglewGetExtension("WGL_ARB_extensions_string"); - if (glewExperimental || WGLEW_ARB_extensions_string|| crippled) CONST_CAST(WGLEW_ARB_extensions_string)= !_glewInit_WGL_ARB_extensions_string(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_extensions_string */ -#ifdef WGL_ARB_framebuffer_sRGB - CONST_CAST(WGLEW_ARB_framebuffer_sRGB) = wglewGetExtension("WGL_ARB_framebuffer_sRGB"); -#endif /* WGL_ARB_framebuffer_sRGB */ -#ifdef WGL_ARB_make_current_read - CONST_CAST(WGLEW_ARB_make_current_read) = wglewGetExtension("WGL_ARB_make_current_read"); - if (glewExperimental || WGLEW_ARB_make_current_read|| crippled) CONST_CAST(WGLEW_ARB_make_current_read)= !_glewInit_WGL_ARB_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_make_current_read */ -#ifdef WGL_ARB_multisample - CONST_CAST(WGLEW_ARB_multisample) = wglewGetExtension("WGL_ARB_multisample"); -#endif /* WGL_ARB_multisample */ -#ifdef WGL_ARB_pbuffer - CONST_CAST(WGLEW_ARB_pbuffer) = wglewGetExtension("WGL_ARB_pbuffer"); - if (glewExperimental || WGLEW_ARB_pbuffer|| crippled) CONST_CAST(WGLEW_ARB_pbuffer)= !_glewInit_WGL_ARB_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_pbuffer */ -#ifdef WGL_ARB_pixel_format - CONST_CAST(WGLEW_ARB_pixel_format) = wglewGetExtension("WGL_ARB_pixel_format"); - if (glewExperimental || WGLEW_ARB_pixel_format|| crippled) CONST_CAST(WGLEW_ARB_pixel_format)= !_glewInit_WGL_ARB_pixel_format(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_pixel_format */ -#ifdef WGL_ARB_pixel_format_float - CONST_CAST(WGLEW_ARB_pixel_format_float) = wglewGetExtension("WGL_ARB_pixel_format_float"); -#endif /* WGL_ARB_pixel_format_float */ -#ifdef WGL_ARB_render_texture - CONST_CAST(WGLEW_ARB_render_texture) = wglewGetExtension("WGL_ARB_render_texture"); - if (glewExperimental || WGLEW_ARB_render_texture|| crippled) CONST_CAST(WGLEW_ARB_render_texture)= !_glewInit_WGL_ARB_render_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_render_texture */ -#ifdef WGL_ATI_pixel_format_float - CONST_CAST(WGLEW_ATI_pixel_format_float) = wglewGetExtension("WGL_ATI_pixel_format_float"); -#endif /* WGL_ATI_pixel_format_float */ -#ifdef WGL_ATI_render_texture_rectangle - CONST_CAST(WGLEW_ATI_render_texture_rectangle) = wglewGetExtension("WGL_ATI_render_texture_rectangle"); -#endif /* WGL_ATI_render_texture_rectangle */ -#ifdef WGL_EXT_depth_float - CONST_CAST(WGLEW_EXT_depth_float) = wglewGetExtension("WGL_EXT_depth_float"); -#endif /* WGL_EXT_depth_float */ -#ifdef WGL_EXT_display_color_table - CONST_CAST(WGLEW_EXT_display_color_table) = wglewGetExtension("WGL_EXT_display_color_table"); - if (glewExperimental || WGLEW_EXT_display_color_table|| crippled) CONST_CAST(WGLEW_EXT_display_color_table)= !_glewInit_WGL_EXT_display_color_table(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_display_color_table */ -#ifdef WGL_EXT_extensions_string - CONST_CAST(WGLEW_EXT_extensions_string) = wglewGetExtension("WGL_EXT_extensions_string"); - if (glewExperimental || WGLEW_EXT_extensions_string|| crippled) CONST_CAST(WGLEW_EXT_extensions_string)= !_glewInit_WGL_EXT_extensions_string(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_extensions_string */ -#ifdef WGL_EXT_framebuffer_sRGB - CONST_CAST(WGLEW_EXT_framebuffer_sRGB) = wglewGetExtension("WGL_EXT_framebuffer_sRGB"); -#endif /* WGL_EXT_framebuffer_sRGB */ -#ifdef WGL_EXT_make_current_read - CONST_CAST(WGLEW_EXT_make_current_read) = wglewGetExtension("WGL_EXT_make_current_read"); - if (glewExperimental || WGLEW_EXT_make_current_read|| crippled) CONST_CAST(WGLEW_EXT_make_current_read)= !_glewInit_WGL_EXT_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_make_current_read */ -#ifdef WGL_EXT_multisample - CONST_CAST(WGLEW_EXT_multisample) = wglewGetExtension("WGL_EXT_multisample"); -#endif /* WGL_EXT_multisample */ -#ifdef WGL_EXT_pbuffer - CONST_CAST(WGLEW_EXT_pbuffer) = wglewGetExtension("WGL_EXT_pbuffer"); - if (glewExperimental || WGLEW_EXT_pbuffer|| crippled) CONST_CAST(WGLEW_EXT_pbuffer)= !_glewInit_WGL_EXT_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_pbuffer */ -#ifdef WGL_EXT_pixel_format - CONST_CAST(WGLEW_EXT_pixel_format) = wglewGetExtension("WGL_EXT_pixel_format"); - if (glewExperimental || WGLEW_EXT_pixel_format|| crippled) CONST_CAST(WGLEW_EXT_pixel_format)= !_glewInit_WGL_EXT_pixel_format(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_pixel_format */ -#ifdef WGL_EXT_pixel_format_packed_float - CONST_CAST(WGLEW_EXT_pixel_format_packed_float) = wglewGetExtension("WGL_EXT_pixel_format_packed_float"); -#endif /* WGL_EXT_pixel_format_packed_float */ -#ifdef WGL_EXT_swap_control - CONST_CAST(WGLEW_EXT_swap_control) = wglewGetExtension("WGL_EXT_swap_control"); - if (glewExperimental || WGLEW_EXT_swap_control|| crippled) CONST_CAST(WGLEW_EXT_swap_control)= !_glewInit_WGL_EXT_swap_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_swap_control */ -#ifdef WGL_I3D_digital_video_control - CONST_CAST(WGLEW_I3D_digital_video_control) = wglewGetExtension("WGL_I3D_digital_video_control"); - if (glewExperimental || WGLEW_I3D_digital_video_control|| crippled) CONST_CAST(WGLEW_I3D_digital_video_control)= !_glewInit_WGL_I3D_digital_video_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_digital_video_control */ -#ifdef WGL_I3D_gamma - CONST_CAST(WGLEW_I3D_gamma) = wglewGetExtension("WGL_I3D_gamma"); - if (glewExperimental || WGLEW_I3D_gamma|| crippled) CONST_CAST(WGLEW_I3D_gamma)= !_glewInit_WGL_I3D_gamma(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_gamma */ -#ifdef WGL_I3D_genlock - CONST_CAST(WGLEW_I3D_genlock) = wglewGetExtension("WGL_I3D_genlock"); - if (glewExperimental || WGLEW_I3D_genlock|| crippled) CONST_CAST(WGLEW_I3D_genlock)= !_glewInit_WGL_I3D_genlock(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_genlock */ -#ifdef WGL_I3D_image_buffer - CONST_CAST(WGLEW_I3D_image_buffer) = wglewGetExtension("WGL_I3D_image_buffer"); - if (glewExperimental || WGLEW_I3D_image_buffer|| crippled) CONST_CAST(WGLEW_I3D_image_buffer)= !_glewInit_WGL_I3D_image_buffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_image_buffer */ -#ifdef WGL_I3D_swap_frame_lock - CONST_CAST(WGLEW_I3D_swap_frame_lock) = wglewGetExtension("WGL_I3D_swap_frame_lock"); - if (glewExperimental || WGLEW_I3D_swap_frame_lock|| crippled) CONST_CAST(WGLEW_I3D_swap_frame_lock)= !_glewInit_WGL_I3D_swap_frame_lock(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_swap_frame_lock */ -#ifdef WGL_I3D_swap_frame_usage - CONST_CAST(WGLEW_I3D_swap_frame_usage) = wglewGetExtension("WGL_I3D_swap_frame_usage"); - if (glewExperimental || WGLEW_I3D_swap_frame_usage|| crippled) CONST_CAST(WGLEW_I3D_swap_frame_usage)= !_glewInit_WGL_I3D_swap_frame_usage(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_swap_frame_usage */ -#ifdef WGL_NV_float_buffer - CONST_CAST(WGLEW_NV_float_buffer) = wglewGetExtension("WGL_NV_float_buffer"); -#endif /* WGL_NV_float_buffer */ -#ifdef WGL_NV_gpu_affinity - CONST_CAST(WGLEW_NV_gpu_affinity) = wglewGetExtension("WGL_NV_gpu_affinity"); - if (glewExperimental || WGLEW_NV_gpu_affinity|| crippled) CONST_CAST(WGLEW_NV_gpu_affinity)= !_glewInit_WGL_NV_gpu_affinity(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_gpu_affinity */ -#ifdef WGL_NV_present_video - CONST_CAST(WGLEW_NV_present_video) = wglewGetExtension("WGL_NV_present_video"); - if (glewExperimental || WGLEW_NV_present_video|| crippled) CONST_CAST(WGLEW_NV_present_video)= !_glewInit_WGL_NV_present_video(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_present_video */ -#ifdef WGL_NV_render_depth_texture - CONST_CAST(WGLEW_NV_render_depth_texture) = wglewGetExtension("WGL_NV_render_depth_texture"); -#endif /* WGL_NV_render_depth_texture */ -#ifdef WGL_NV_render_texture_rectangle - CONST_CAST(WGLEW_NV_render_texture_rectangle) = wglewGetExtension("WGL_NV_render_texture_rectangle"); -#endif /* WGL_NV_render_texture_rectangle */ -#ifdef WGL_NV_swap_group - CONST_CAST(WGLEW_NV_swap_group) = wglewGetExtension("WGL_NV_swap_group"); - if (glewExperimental || WGLEW_NV_swap_group|| crippled) CONST_CAST(WGLEW_NV_swap_group)= !_glewInit_WGL_NV_swap_group(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_swap_group */ -#ifdef WGL_NV_vertex_array_range - CONST_CAST(WGLEW_NV_vertex_array_range) = wglewGetExtension("WGL_NV_vertex_array_range"); - if (glewExperimental || WGLEW_NV_vertex_array_range|| crippled) CONST_CAST(WGLEW_NV_vertex_array_range)= !_glewInit_WGL_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_vertex_array_range */ -#ifdef WGL_NV_video_output - CONST_CAST(WGLEW_NV_video_output) = wglewGetExtension("WGL_NV_video_output"); - if (glewExperimental || WGLEW_NV_video_output|| crippled) CONST_CAST(WGLEW_NV_video_output)= !_glewInit_WGL_NV_video_output(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_video_output */ -#ifdef WGL_OML_sync_control - CONST_CAST(WGLEW_OML_sync_control) = wglewGetExtension("WGL_OML_sync_control"); - if (glewExperimental || WGLEW_OML_sync_control|| crippled) CONST_CAST(WGLEW_OML_sync_control)= !_glewInit_WGL_OML_sync_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_OML_sync_control */ - - return GLEW_OK; -} - -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) - -PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay = NULL; - -PFNGLXCHOOSEFBCONFIGPROC __glewXChooseFBConfig = NULL; -PFNGLXCREATENEWCONTEXTPROC __glewXCreateNewContext = NULL; -PFNGLXCREATEPBUFFERPROC __glewXCreatePbuffer = NULL; -PFNGLXCREATEPIXMAPPROC __glewXCreatePixmap = NULL; -PFNGLXCREATEWINDOWPROC __glewXCreateWindow = NULL; -PFNGLXDESTROYPBUFFERPROC __glewXDestroyPbuffer = NULL; -PFNGLXDESTROYPIXMAPPROC __glewXDestroyPixmap = NULL; -PFNGLXDESTROYWINDOWPROC __glewXDestroyWindow = NULL; -PFNGLXGETCURRENTREADDRAWABLEPROC __glewXGetCurrentReadDrawable = NULL; -PFNGLXGETFBCONFIGATTRIBPROC __glewXGetFBConfigAttrib = NULL; -PFNGLXGETFBCONFIGSPROC __glewXGetFBConfigs = NULL; -PFNGLXGETSELECTEDEVENTPROC __glewXGetSelectedEvent = NULL; -PFNGLXGETVISUALFROMFBCONFIGPROC __glewXGetVisualFromFBConfig = NULL; -PFNGLXMAKECONTEXTCURRENTPROC __glewXMakeContextCurrent = NULL; -PFNGLXQUERYCONTEXTPROC __glewXQueryContext = NULL; -PFNGLXQUERYDRAWABLEPROC __glewXQueryDrawable = NULL; -PFNGLXSELECTEVENTPROC __glewXSelectEvent = NULL; - -PFNGLXCREATECONTEXTATTRIBSARBPROC __glewXCreateContextAttribsARB = NULL; - -PFNGLXBINDTEXIMAGEATIPROC __glewXBindTexImageATI = NULL; -PFNGLXDRAWABLEATTRIBATIPROC __glewXDrawableAttribATI = NULL; -PFNGLXRELEASETEXIMAGEATIPROC __glewXReleaseTexImageATI = NULL; - -PFNGLXFREECONTEXTEXTPROC __glewXFreeContextEXT = NULL; -PFNGLXGETCONTEXTIDEXTPROC __glewXGetContextIDEXT = NULL; -PFNGLXIMPORTCONTEXTEXTPROC __glewXImportContextEXT = NULL; -PFNGLXQUERYCONTEXTINFOEXTPROC __glewXQueryContextInfoEXT = NULL; - -PFNGLXBINDTEXIMAGEEXTPROC __glewXBindTexImageEXT = NULL; -PFNGLXRELEASETEXIMAGEEXTPROC __glewXReleaseTexImageEXT = NULL; - -PFNGLXGETAGPOFFSETMESAPROC __glewXGetAGPOffsetMESA = NULL; - -PFNGLXCOPYSUBBUFFERMESAPROC __glewXCopySubBufferMESA = NULL; - -PFNGLXCREATEGLXPIXMAPMESAPROC __glewXCreateGLXPixmapMESA = NULL; - -PFNGLXRELEASEBUFFERSMESAPROC __glewXReleaseBuffersMESA = NULL; - -PFNGLXSET3DFXMODEMESAPROC __glewXSet3DfxModeMESA = NULL; - -PFNGLXBINDVIDEODEVICENVPROC __glewXBindVideoDeviceNV = NULL; -PFNGLXENUMERATEVIDEODEVICESNVPROC __glewXEnumerateVideoDevicesNV = NULL; - -PFNGLXBINDSWAPBARRIERNVPROC __glewXBindSwapBarrierNV = NULL; -PFNGLXJOINSWAPGROUPNVPROC __glewXJoinSwapGroupNV = NULL; -PFNGLXQUERYFRAMECOUNTNVPROC __glewXQueryFrameCountNV = NULL; -PFNGLXQUERYMAXSWAPGROUPSNVPROC __glewXQueryMaxSwapGroupsNV = NULL; -PFNGLXQUERYSWAPGROUPNVPROC __glewXQuerySwapGroupNV = NULL; -PFNGLXRESETFRAMECOUNTNVPROC __glewXResetFrameCountNV = NULL; - -PFNGLXALLOCATEMEMORYNVPROC __glewXAllocateMemoryNV = NULL; -PFNGLXFREEMEMORYNVPROC __glewXFreeMemoryNV = NULL; - -PFNGLXBINDVIDEOIMAGENVPROC __glewXBindVideoImageNV = NULL; -PFNGLXGETVIDEODEVICENVPROC __glewXGetVideoDeviceNV = NULL; -PFNGLXGETVIDEOINFONVPROC __glewXGetVideoInfoNV = NULL; -PFNGLXRELEASEVIDEODEVICENVPROC __glewXReleaseVideoDeviceNV = NULL; -PFNGLXRELEASEVIDEOIMAGENVPROC __glewXReleaseVideoImageNV = NULL; -PFNGLXSENDPBUFFERTOVIDEONVPROC __glewXSendPbufferToVideoNV = NULL; - -#ifdef GLX_OML_sync_control -PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML = NULL; -PFNGLXGETSYNCVALUESOMLPROC __glewXGetSyncValuesOML = NULL; -PFNGLXSWAPBUFFERSMSCOMLPROC __glewXSwapBuffersMscOML = NULL; -PFNGLXWAITFORMSCOMLPROC __glewXWaitForMscOML = NULL; -PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML = NULL; -#endif - -PFNGLXCHOOSEFBCONFIGSGIXPROC __glewXChooseFBConfigSGIX = NULL; -PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC __glewXCreateContextWithConfigSGIX = NULL; -PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC __glewXCreateGLXPixmapWithConfigSGIX = NULL; -PFNGLXGETFBCONFIGATTRIBSGIXPROC __glewXGetFBConfigAttribSGIX = NULL; -PFNGLXGETFBCONFIGFROMVISUALSGIXPROC __glewXGetFBConfigFromVisualSGIX = NULL; -PFNGLXGETVISUALFROMFBCONFIGSGIXPROC __glewXGetVisualFromFBConfigSGIX = NULL; - -PFNGLXBINDHYPERPIPESGIXPROC __glewXBindHyperpipeSGIX = NULL; -PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC __glewXDestroyHyperpipeConfigSGIX = NULL; -PFNGLXHYPERPIPEATTRIBSGIXPROC __glewXHyperpipeAttribSGIX = NULL; -PFNGLXHYPERPIPECONFIGSGIXPROC __glewXHyperpipeConfigSGIX = NULL; -PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC __glewXQueryHyperpipeAttribSGIX = NULL; -PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC __glewXQueryHyperpipeBestAttribSGIX = NULL; -PFNGLXQUERYHYPERPIPECONFIGSGIXPROC __glewXQueryHyperpipeConfigSGIX = NULL; -PFNGLXQUERYHYPERPIPENETWORKSGIXPROC __glewXQueryHyperpipeNetworkSGIX = NULL; - -PFNGLXCREATEGLXPBUFFERSGIXPROC __glewXCreateGLXPbufferSGIX = NULL; -PFNGLXDESTROYGLXPBUFFERSGIXPROC __glewXDestroyGLXPbufferSGIX = NULL; -PFNGLXGETSELECTEDEVENTSGIXPROC __glewXGetSelectedEventSGIX = NULL; -PFNGLXQUERYGLXPBUFFERSGIXPROC __glewXQueryGLXPbufferSGIX = NULL; -PFNGLXSELECTEVENTSGIXPROC __glewXSelectEventSGIX = NULL; - -PFNGLXBINDSWAPBARRIERSGIXPROC __glewXBindSwapBarrierSGIX = NULL; -PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC __glewXQueryMaxSwapBarriersSGIX = NULL; - -PFNGLXJOINSWAPGROUPSGIXPROC __glewXJoinSwapGroupSGIX = NULL; - -PFNGLXBINDCHANNELTOWINDOWSGIXPROC __glewXBindChannelToWindowSGIX = NULL; -PFNGLXCHANNELRECTSGIXPROC __glewXChannelRectSGIX = NULL; -PFNGLXCHANNELRECTSYNCSGIXPROC __glewXChannelRectSyncSGIX = NULL; -PFNGLXQUERYCHANNELDELTASSGIXPROC __glewXQueryChannelDeltasSGIX = NULL; -PFNGLXQUERYCHANNELRECTSGIXPROC __glewXQueryChannelRectSGIX = NULL; - -PFNGLXCUSHIONSGIPROC __glewXCushionSGI = NULL; - -PFNGLXGETCURRENTREADDRAWABLESGIPROC __glewXGetCurrentReadDrawableSGI = NULL; -PFNGLXMAKECURRENTREADSGIPROC __glewXMakeCurrentReadSGI = NULL; - -PFNGLXSWAPINTERVALSGIPROC __glewXSwapIntervalSGI = NULL; - -PFNGLXGETVIDEOSYNCSGIPROC __glewXGetVideoSyncSGI = NULL; -PFNGLXWAITVIDEOSYNCSGIPROC __glewXWaitVideoSyncSGI = NULL; - -PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN = NULL; - -PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN = NULL; -PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN = NULL; - -#if !defined(GLEW_MX) - -GLboolean __GLXEW_VERSION_1_0 = GL_FALSE; -GLboolean __GLXEW_VERSION_1_1 = GL_FALSE; -GLboolean __GLXEW_VERSION_1_2 = GL_FALSE; -GLboolean __GLXEW_VERSION_1_3 = GL_FALSE; -GLboolean __GLXEW_VERSION_1_4 = GL_FALSE; -GLboolean __GLXEW_3DFX_multisample = GL_FALSE; -GLboolean __GLXEW_ARB_create_context = GL_FALSE; -GLboolean __GLXEW_ARB_fbconfig_float = GL_FALSE; -GLboolean __GLXEW_ARB_framebuffer_sRGB = GL_FALSE; -GLboolean __GLXEW_ARB_get_proc_address = GL_FALSE; -GLboolean __GLXEW_ARB_multisample = GL_FALSE; -GLboolean __GLXEW_ATI_pixel_format_float = GL_FALSE; -GLboolean __GLXEW_ATI_render_texture = GL_FALSE; -GLboolean __GLXEW_EXT_fbconfig_packed_float = GL_FALSE; -GLboolean __GLXEW_EXT_framebuffer_sRGB = GL_FALSE; -GLboolean __GLXEW_EXT_import_context = GL_FALSE; -GLboolean __GLXEW_EXT_scene_marker = GL_FALSE; -GLboolean __GLXEW_EXT_texture_from_pixmap = GL_FALSE; -GLboolean __GLXEW_EXT_visual_info = GL_FALSE; -GLboolean __GLXEW_EXT_visual_rating = GL_FALSE; -GLboolean __GLXEW_MESA_agp_offset = GL_FALSE; -GLboolean __GLXEW_MESA_copy_sub_buffer = GL_FALSE; -GLboolean __GLXEW_MESA_pixmap_colormap = GL_FALSE; -GLboolean __GLXEW_MESA_release_buffers = GL_FALSE; -GLboolean __GLXEW_MESA_set_3dfx_mode = GL_FALSE; -GLboolean __GLXEW_NV_float_buffer = GL_FALSE; -GLboolean __GLXEW_NV_present_video = GL_FALSE; -GLboolean __GLXEW_NV_swap_group = GL_FALSE; -GLboolean __GLXEW_NV_vertex_array_range = GL_FALSE; -GLboolean __GLXEW_NV_video_output = GL_FALSE; -GLboolean __GLXEW_OML_swap_method = GL_FALSE; -#ifdef GLX_OML_sync_control -GLboolean __GLXEW_OML_sync_control = GL_FALSE; -#endif -GLboolean __GLXEW_SGIS_blended_overlay = GL_FALSE; -GLboolean __GLXEW_SGIS_color_range = GL_FALSE; -GLboolean __GLXEW_SGIS_multisample = GL_FALSE; -GLboolean __GLXEW_SGIS_shared_multisample = GL_FALSE; -GLboolean __GLXEW_SGIX_fbconfig = GL_FALSE; -GLboolean __GLXEW_SGIX_hyperpipe = GL_FALSE; -GLboolean __GLXEW_SGIX_pbuffer = GL_FALSE; -GLboolean __GLXEW_SGIX_swap_barrier = GL_FALSE; -GLboolean __GLXEW_SGIX_swap_group = GL_FALSE; -GLboolean __GLXEW_SGIX_video_resize = GL_FALSE; -GLboolean __GLXEW_SGIX_visual_select_group = GL_FALSE; -GLboolean __GLXEW_SGI_cushion = GL_FALSE; -GLboolean __GLXEW_SGI_make_current_read = GL_FALSE; -GLboolean __GLXEW_SGI_swap_control = GL_FALSE; -GLboolean __GLXEW_SGI_video_sync = GL_FALSE; -GLboolean __GLXEW_SUN_get_transparent_index = GL_FALSE; -GLboolean __GLXEW_SUN_video_resize = GL_FALSE; - -#endif /* !GLEW_MX */ - -#ifdef GLX_VERSION_1_2 - -static GLboolean _glewInit_GLX_VERSION_1_2 (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r; - - return r; -} - -#endif /* GLX_VERSION_1_2 */ - -#ifdef GLX_VERSION_1_3 - -static GLboolean _glewInit_GLX_VERSION_1_3 (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXChooseFBConfig = (PFNGLXCHOOSEFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfig")) == NULL) || r; - r = ((glXCreateNewContext = (PFNGLXCREATENEWCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXCreateNewContext")) == NULL) || r; - r = ((glXCreatePbuffer = (PFNGLXCREATEPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXCreatePbuffer")) == NULL) || r; - r = ((glXCreatePixmap = (PFNGLXCREATEPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXCreatePixmap")) == NULL) || r; - r = ((glXCreateWindow = (PFNGLXCREATEWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXCreateWindow")) == NULL) || r; - r = ((glXDestroyPbuffer = (PFNGLXDESTROYPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPbuffer")) == NULL) || r; - r = ((glXDestroyPixmap = (PFNGLXDESTROYPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPixmap")) == NULL) || r; - r = ((glXDestroyWindow = (PFNGLXDESTROYWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXDestroyWindow")) == NULL) || r; - r = ((glXGetCurrentReadDrawable = (PFNGLXGETCURRENTREADDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawable")) == NULL) || r; - r = ((glXGetFBConfigAttrib = (PFNGLXGETFBCONFIGATTRIBPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttrib")) == NULL) || r; - r = ((glXGetFBConfigs = (PFNGLXGETFBCONFIGSPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigs")) == NULL) || r; - r = ((glXGetSelectedEvent = (PFNGLXGETSELECTEDEVENTPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEvent")) == NULL) || r; - r = ((glXGetVisualFromFBConfig = (PFNGLXGETVISUALFROMFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfig")) == NULL) || r; - r = ((glXMakeContextCurrent = (PFNGLXMAKECONTEXTCURRENTPROC)glewGetProcAddress((const GLubyte*)"glXMakeContextCurrent")) == NULL) || r; - r = ((glXQueryContext = (PFNGLXQUERYCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContext")) == NULL) || r; - r = ((glXQueryDrawable = (PFNGLXQUERYDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXQueryDrawable")) == NULL) || r; - r = ((glXSelectEvent = (PFNGLXSELECTEVENTPROC)glewGetProcAddress((const GLubyte*)"glXSelectEvent")) == NULL) || r; - - return r; -} - -#endif /* GLX_VERSION_1_3 */ - -#ifdef GLX_VERSION_1_4 - -#endif /* GLX_VERSION_1_4 */ - -#ifdef GLX_3DFX_multisample - -#endif /* GLX_3DFX_multisample */ - -#ifdef GLX_ARB_create_context - -static GLboolean _glewInit_GLX_ARB_create_context (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)glewGetProcAddress((const GLubyte*)"glXCreateContextAttribsARB")) == NULL) || r; - - return r; -} - -#endif /* GLX_ARB_create_context */ - -#ifdef GLX_ARB_fbconfig_float - -#endif /* GLX_ARB_fbconfig_float */ - -#ifdef GLX_ARB_framebuffer_sRGB - -#endif /* GLX_ARB_framebuffer_sRGB */ - -#ifdef GLX_ARB_get_proc_address - -#endif /* GLX_ARB_get_proc_address */ - -#ifdef GLX_ARB_multisample - -#endif /* GLX_ARB_multisample */ - -#ifdef GLX_ATI_pixel_format_float - -#endif /* GLX_ATI_pixel_format_float */ - -#ifdef GLX_ATI_render_texture - -static GLboolean _glewInit_GLX_ATI_render_texture (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindTexImageATI = (PFNGLXBINDTEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXBindTexImageATI")) == NULL) || r; - r = ((glXDrawableAttribATI = (PFNGLXDRAWABLEATTRIBATIPROC)glewGetProcAddress((const GLubyte*)"glXDrawableAttribATI")) == NULL) || r; - r = ((glXReleaseTexImageATI = (PFNGLXRELEASETEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXReleaseTexImageATI")) == NULL) || r; - - return r; -} - -#endif /* GLX_ATI_render_texture */ - -#ifdef GLX_EXT_fbconfig_packed_float - -#endif /* GLX_EXT_fbconfig_packed_float */ - -#ifdef GLX_EXT_framebuffer_sRGB - -#endif /* GLX_EXT_framebuffer_sRGB */ - -#ifdef GLX_EXT_import_context - -static GLboolean _glewInit_GLX_EXT_import_context (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXFreeContextEXT = (PFNGLXFREECONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXFreeContextEXT")) == NULL) || r; - r = ((glXGetContextIDEXT = (PFNGLXGETCONTEXTIDEXTPROC)glewGetProcAddress((const GLubyte*)"glXGetContextIDEXT")) == NULL) || r; - r = ((glXImportContextEXT = (PFNGLXIMPORTCONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXImportContextEXT")) == NULL) || r; - r = ((glXQueryContextInfoEXT = (PFNGLXQUERYCONTEXTINFOEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContextInfoEXT")) == NULL) || r; - - return r; -} - -#endif /* GLX_EXT_import_context */ - -#ifdef GLX_EXT_scene_marker - -#endif /* GLX_EXT_scene_marker */ - -#ifdef GLX_EXT_texture_from_pixmap - -static GLboolean _glewInit_GLX_EXT_texture_from_pixmap (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindTexImageEXT = (PFNGLXBINDTEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glXBindTexImageEXT")) == NULL) || r; - r = ((glXReleaseTexImageEXT = (PFNGLXRELEASETEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glXReleaseTexImageEXT")) == NULL) || r; - - return r; -} - -#endif /* GLX_EXT_texture_from_pixmap */ - -#ifdef GLX_EXT_visual_info - -#endif /* GLX_EXT_visual_info */ - -#ifdef GLX_EXT_visual_rating - -#endif /* GLX_EXT_visual_rating */ - -#ifdef GLX_MESA_agp_offset - -static GLboolean _glewInit_GLX_MESA_agp_offset (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetAGPOffsetMESA = (PFNGLXGETAGPOFFSETMESAPROC)glewGetProcAddress((const GLubyte*)"glXGetAGPOffsetMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_agp_offset */ - -#ifdef GLX_MESA_copy_sub_buffer - -static GLboolean _glewInit_GLX_MESA_copy_sub_buffer (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCopySubBufferMESA = (PFNGLXCOPYSUBBUFFERMESAPROC)glewGetProcAddress((const GLubyte*)"glXCopySubBufferMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_copy_sub_buffer */ - -#ifdef GLX_MESA_pixmap_colormap - -static GLboolean _glewInit_GLX_MESA_pixmap_colormap (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCreateGLXPixmapMESA = (PFNGLXCREATEGLXPIXMAPMESAPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_pixmap_colormap */ - -#ifdef GLX_MESA_release_buffers - -static GLboolean _glewInit_GLX_MESA_release_buffers (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXReleaseBuffersMESA = (PFNGLXRELEASEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glXReleaseBuffersMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_release_buffers */ - -#ifdef GLX_MESA_set_3dfx_mode - -static GLboolean _glewInit_GLX_MESA_set_3dfx_mode (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXSet3DfxModeMESA = (PFNGLXSET3DFXMODEMESAPROC)glewGetProcAddress((const GLubyte*)"glXSet3DfxModeMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_set_3dfx_mode */ - -#ifdef GLX_NV_float_buffer - -#endif /* GLX_NV_float_buffer */ - -#ifdef GLX_NV_present_video - -static GLboolean _glewInit_GLX_NV_present_video (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindVideoDeviceNV = (PFNGLXBINDVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoDeviceNV")) == NULL) || r; - r = ((glXEnumerateVideoDevicesNV = (PFNGLXENUMERATEVIDEODEVICESNVPROC)glewGetProcAddress((const GLubyte*)"glXEnumerateVideoDevicesNV")) == NULL) || r; - - return r; -} - -#endif /* GLX_NV_present_video */ - -#ifdef GLX_NV_swap_group - -static GLboolean _glewInit_GLX_NV_swap_group (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindSwapBarrierNV = (PFNGLXBINDSWAPBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"glXBindSwapBarrierNV")) == NULL) || r; - r = ((glXJoinSwapGroupNV = (PFNGLXJOINSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"glXJoinSwapGroupNV")) == NULL) || r; - r = ((glXQueryFrameCountNV = (PFNGLXQUERYFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glXQueryFrameCountNV")) == NULL) || r; - r = ((glXQueryMaxSwapGroupsNV = (PFNGLXQUERYMAXSWAPGROUPSNVPROC)glewGetProcAddress((const GLubyte*)"glXQueryMaxSwapGroupsNV")) == NULL) || r; - r = ((glXQuerySwapGroupNV = (PFNGLXQUERYSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"glXQuerySwapGroupNV")) == NULL) || r; - r = ((glXResetFrameCountNV = (PFNGLXRESETFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glXResetFrameCountNV")) == NULL) || r; - - return r; -} - -#endif /* GLX_NV_swap_group */ - -#ifdef GLX_NV_vertex_array_range - -static GLboolean _glewInit_GLX_NV_vertex_array_range (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXAllocateMemoryNV = (PFNGLXALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXAllocateMemoryNV")) == NULL) || r; - r = ((glXFreeMemoryNV = (PFNGLXFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXFreeMemoryNV")) == NULL) || r; - - return r; -} - -#endif /* GLX_NV_vertex_array_range */ - -#ifdef GLX_NV_video_output - -static GLboolean _glewInit_GLX_NV_video_output (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindVideoImageNV = (PFNGLXBINDVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoImageNV")) == NULL) || r; - r = ((glXGetVideoDeviceNV = (PFNGLXGETVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoDeviceNV")) == NULL) || r; - r = ((glXGetVideoInfoNV = (PFNGLXGETVIDEOINFONVPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoInfoNV")) == NULL) || r; - r = ((glXReleaseVideoDeviceNV = (PFNGLXRELEASEVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoDeviceNV")) == NULL) || r; - r = ((glXReleaseVideoImageNV = (PFNGLXRELEASEVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoImageNV")) == NULL) || r; - r = ((glXSendPbufferToVideoNV = (PFNGLXSENDPBUFFERTOVIDEONVPROC)glewGetProcAddress((const GLubyte*)"glXSendPbufferToVideoNV")) == NULL) || r; - - return r; -} - -#endif /* GLX_NV_video_output */ - -#ifdef GLX_OML_swap_method - -#endif /* GLX_OML_swap_method */ - -#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -#include - -static GLboolean _glewInit_GLX_OML_sync_control (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetMscRateOML = (PFNGLXGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetMscRateOML")) == NULL) || r; - r = ((glXGetSyncValuesOML = (PFNGLXGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetSyncValuesOML")) == NULL) || r; - r = ((glXSwapBuffersMscOML = (PFNGLXSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXSwapBuffersMscOML")) == NULL) || r; - r = ((glXWaitForMscOML = (PFNGLXWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForMscOML")) == NULL) || r; - r = ((glXWaitForSbcOML = (PFNGLXWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForSbcOML")) == NULL) || r; - - return r; -} - -#endif /* GLX_OML_sync_control */ - -#ifdef GLX_SGIS_blended_overlay - -#endif /* GLX_SGIS_blended_overlay */ - -#ifdef GLX_SGIS_color_range - -#endif /* GLX_SGIS_color_range */ - -#ifdef GLX_SGIS_multisample - -#endif /* GLX_SGIS_multisample */ - -#ifdef GLX_SGIS_shared_multisample - -#endif /* GLX_SGIS_shared_multisample */ - -#ifdef GLX_SGIX_fbconfig - -static GLboolean _glewInit_GLX_SGIX_fbconfig (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXChooseFBConfigSGIX = (PFNGLXCHOOSEFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfigSGIX")) == NULL) || r; - r = ((glXCreateContextWithConfigSGIX = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateContextWithConfigSGIX")) == NULL) || r; - r = ((glXCreateGLXPixmapWithConfigSGIX = (PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapWithConfigSGIX")) == NULL) || r; - r = ((glXGetFBConfigAttribSGIX = (PFNGLXGETFBCONFIGATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttribSGIX")) == NULL) || r; - r = ((glXGetFBConfigFromVisualSGIX = (PFNGLXGETFBCONFIGFROMVISUALSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigFromVisualSGIX")) == NULL) || r; - r = ((glXGetVisualFromFBConfigSGIX = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfigSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_fbconfig */ - -#ifdef GLX_SGIX_hyperpipe - -static GLboolean _glewInit_GLX_SGIX_hyperpipe (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindHyperpipeSGIX = (PFNGLXBINDHYPERPIPESGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindHyperpipeSGIX")) == NULL) || r; - r = ((glXDestroyHyperpipeConfigSGIX = (PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXDestroyHyperpipeConfigSGIX")) == NULL) || r; - r = ((glXHyperpipeAttribSGIX = (PFNGLXHYPERPIPEATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXHyperpipeAttribSGIX")) == NULL) || r; - r = ((glXHyperpipeConfigSGIX = (PFNGLXHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXHyperpipeConfigSGIX")) == NULL) || r; - r = ((glXQueryHyperpipeAttribSGIX = (PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeAttribSGIX")) == NULL) || r; - r = ((glXQueryHyperpipeBestAttribSGIX = (PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeBestAttribSGIX")) == NULL) || r; - r = ((glXQueryHyperpipeConfigSGIX = (PFNGLXQUERYHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeConfigSGIX")) == NULL) || r; - r = ((glXQueryHyperpipeNetworkSGIX = (PFNGLXQUERYHYPERPIPENETWORKSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeNetworkSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_hyperpipe */ - -#ifdef GLX_SGIX_pbuffer - -static GLboolean _glewInit_GLX_SGIX_pbuffer (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCreateGLXPbufferSGIX = (PFNGLXCREATEGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPbufferSGIX")) == NULL) || r; - r = ((glXDestroyGLXPbufferSGIX = (PFNGLXDESTROYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXDestroyGLXPbufferSGIX")) == NULL) || r; - r = ((glXGetSelectedEventSGIX = (PFNGLXGETSELECTEDEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEventSGIX")) == NULL) || r; - r = ((glXQueryGLXPbufferSGIX = (PFNGLXQUERYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryGLXPbufferSGIX")) == NULL) || r; - r = ((glXSelectEventSGIX = (PFNGLXSELECTEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXSelectEventSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_pbuffer */ - -#ifdef GLX_SGIX_swap_barrier - -static GLboolean _glewInit_GLX_SGIX_swap_barrier (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindSwapBarrierSGIX = (PFNGLXBINDSWAPBARRIERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindSwapBarrierSGIX")) == NULL) || r; - r = ((glXQueryMaxSwapBarriersSGIX = (PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryMaxSwapBarriersSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_swap_barrier */ - -#ifdef GLX_SGIX_swap_group - -static GLboolean _glewInit_GLX_SGIX_swap_group (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXJoinSwapGroupSGIX = (PFNGLXJOINSWAPGROUPSGIXPROC)glewGetProcAddress((const GLubyte*)"glXJoinSwapGroupSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_swap_group */ - -#ifdef GLX_SGIX_video_resize - -static GLboolean _glewInit_GLX_SGIX_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindChannelToWindowSGIX = (PFNGLXBINDCHANNELTOWINDOWSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindChannelToWindowSGIX")) == NULL) || r; - r = ((glXChannelRectSGIX = (PFNGLXCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSGIX")) == NULL) || r; - r = ((glXChannelRectSyncSGIX = (PFNGLXCHANNELRECTSYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSyncSGIX")) == NULL) || r; - r = ((glXQueryChannelDeltasSGIX = (PFNGLXQUERYCHANNELDELTASSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelDeltasSGIX")) == NULL) || r; - r = ((glXQueryChannelRectSGIX = (PFNGLXQUERYCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelRectSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_video_resize */ - -#ifdef GLX_SGIX_visual_select_group - -#endif /* GLX_SGIX_visual_select_group */ - -#ifdef GLX_SGI_cushion - -static GLboolean _glewInit_GLX_SGI_cushion (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCushionSGI = (PFNGLXCUSHIONSGIPROC)glewGetProcAddress((const GLubyte*)"glXCushionSGI")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGI_cushion */ - -#ifdef GLX_SGI_make_current_read - -static GLboolean _glewInit_GLX_SGI_make_current_read (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetCurrentReadDrawableSGI = (PFNGLXGETCURRENTREADDRAWABLESGIPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawableSGI")) == NULL) || r; - r = ((glXMakeCurrentReadSGI = (PFNGLXMAKECURRENTREADSGIPROC)glewGetProcAddress((const GLubyte*)"glXMakeCurrentReadSGI")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGI_make_current_read */ - -#ifdef GLX_SGI_swap_control - -static GLboolean _glewInit_GLX_SGI_swap_control (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glewGetProcAddress((const GLubyte*)"glXSwapIntervalSGI")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGI_swap_control */ - -#ifdef GLX_SGI_video_sync - -static GLboolean _glewInit_GLX_SGI_video_sync (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetVideoSyncSGI = (PFNGLXGETVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoSyncSGI")) == NULL) || r; - r = ((glXWaitVideoSyncSGI = (PFNGLXWAITVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXWaitVideoSyncSGI")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGI_video_sync */ - -#ifdef GLX_SUN_get_transparent_index - -static GLboolean _glewInit_GLX_SUN_get_transparent_index (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetTransparentIndexSUN = (PFNGLXGETTRANSPARENTINDEXSUNPROC)glewGetProcAddress((const GLubyte*)"glXGetTransparentIndexSUN")) == NULL) || r; - - return r; -} - -#endif /* GLX_SUN_get_transparent_index */ - -#ifdef GLX_SUN_video_resize - -static GLboolean _glewInit_GLX_SUN_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetVideoResizeSUN = (PFNGLXGETVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoResizeSUN")) == NULL) || r; - r = ((glXVideoResizeSUN = (PFNGLXVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXVideoResizeSUN")) == NULL) || r; - - return r; -} - -#endif /* GLX_SUN_video_resize */ - -/* ------------------------------------------------------------------------ */ - -GLboolean glxewGetExtension (const char* name) -{ - GLubyte* p; - GLubyte* end; - GLuint len = _glewStrLen((const GLubyte*)name); -/* if (glXQueryExtensionsString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; */ -/* p = (GLubyte*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay())); */ - if (glXGetClientString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; - p = (GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS); - if (0 == p) return GL_FALSE; - end = p + _glewStrLen(p); - while (p < end) - { - GLuint n = _glewStrCLen(p, ' '); - if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE; - p += n+1; - } - return GL_FALSE; -} - -GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST) -{ - int major, minor; - /* initialize core GLX 1.2 */ - if (_glewInit_GLX_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT)) return GLEW_ERROR_GLX_VERSION_11_ONLY; - /* initialize flags */ - CONST_CAST(GLXEW_VERSION_1_0) = GL_TRUE; - CONST_CAST(GLXEW_VERSION_1_1) = GL_TRUE; - CONST_CAST(GLXEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLXEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLXEW_VERSION_1_4) = GL_TRUE; - /* query GLX version */ - glXQueryVersion(glXGetCurrentDisplay(), &major, &minor); - if (major == 1 && minor <= 3) - { - switch (minor) - { - case 3: - CONST_CAST(GLXEW_VERSION_1_4) = GL_FALSE; - break; - case 2: - CONST_CAST(GLXEW_VERSION_1_4) = GL_FALSE; - CONST_CAST(GLXEW_VERSION_1_3) = GL_FALSE; - break; - default: - return GLEW_ERROR_GLX_VERSION_11_ONLY; - break; - } - } - /* initialize extensions */ -#ifdef GLX_VERSION_1_3 - if (glewExperimental || GLXEW_VERSION_1_3) CONST_CAST(GLXEW_VERSION_1_3) = !_glewInit_GLX_VERSION_1_3(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_VERSION_1_3 */ -#ifdef GLX_3DFX_multisample - CONST_CAST(GLXEW_3DFX_multisample) = glxewGetExtension("GLX_3DFX_multisample"); -#endif /* GLX_3DFX_multisample */ -#ifdef GLX_ARB_create_context - CONST_CAST(GLXEW_ARB_create_context) = glxewGetExtension("GLX_ARB_create_context"); - if (glewExperimental || GLXEW_ARB_create_context) CONST_CAST(GLXEW_ARB_create_context) = !_glewInit_GLX_ARB_create_context(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_ARB_create_context */ -#ifdef GLX_ARB_fbconfig_float - CONST_CAST(GLXEW_ARB_fbconfig_float) = glxewGetExtension("GLX_ARB_fbconfig_float"); -#endif /* GLX_ARB_fbconfig_float */ -#ifdef GLX_ARB_framebuffer_sRGB - CONST_CAST(GLXEW_ARB_framebuffer_sRGB) = glxewGetExtension("GLX_ARB_framebuffer_sRGB"); -#endif /* GLX_ARB_framebuffer_sRGB */ -#ifdef GLX_ARB_get_proc_address - CONST_CAST(GLXEW_ARB_get_proc_address) = glxewGetExtension("GLX_ARB_get_proc_address"); -#endif /* GLX_ARB_get_proc_address */ -#ifdef GLX_ARB_multisample - CONST_CAST(GLXEW_ARB_multisample) = glxewGetExtension("GLX_ARB_multisample"); -#endif /* GLX_ARB_multisample */ -#ifdef GLX_ATI_pixel_format_float - CONST_CAST(GLXEW_ATI_pixel_format_float) = glxewGetExtension("GLX_ATI_pixel_format_float"); -#endif /* GLX_ATI_pixel_format_float */ -#ifdef GLX_ATI_render_texture - CONST_CAST(GLXEW_ATI_render_texture) = glxewGetExtension("GLX_ATI_render_texture"); - if (glewExperimental || GLXEW_ATI_render_texture) CONST_CAST(GLXEW_ATI_render_texture) = !_glewInit_GLX_ATI_render_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_ATI_render_texture */ -#ifdef GLX_EXT_fbconfig_packed_float - CONST_CAST(GLXEW_EXT_fbconfig_packed_float) = glxewGetExtension("GLX_EXT_fbconfig_packed_float"); -#endif /* GLX_EXT_fbconfig_packed_float */ -#ifdef GLX_EXT_framebuffer_sRGB - CONST_CAST(GLXEW_EXT_framebuffer_sRGB) = glxewGetExtension("GLX_EXT_framebuffer_sRGB"); -#endif /* GLX_EXT_framebuffer_sRGB */ -#ifdef GLX_EXT_import_context - CONST_CAST(GLXEW_EXT_import_context) = glxewGetExtension("GLX_EXT_import_context"); - if (glewExperimental || GLXEW_EXT_import_context) CONST_CAST(GLXEW_EXT_import_context) = !_glewInit_GLX_EXT_import_context(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_EXT_import_context */ -#ifdef GLX_EXT_scene_marker - CONST_CAST(GLXEW_EXT_scene_marker) = glxewGetExtension("GLX_EXT_scene_marker"); -#endif /* GLX_EXT_scene_marker */ -#ifdef GLX_EXT_texture_from_pixmap - CONST_CAST(GLXEW_EXT_texture_from_pixmap) = glxewGetExtension("GLX_EXT_texture_from_pixmap"); - if (glewExperimental || GLXEW_EXT_texture_from_pixmap) CONST_CAST(GLXEW_EXT_texture_from_pixmap) = !_glewInit_GLX_EXT_texture_from_pixmap(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_EXT_texture_from_pixmap */ -#ifdef GLX_EXT_visual_info - CONST_CAST(GLXEW_EXT_visual_info) = glxewGetExtension("GLX_EXT_visual_info"); -#endif /* GLX_EXT_visual_info */ -#ifdef GLX_EXT_visual_rating - CONST_CAST(GLXEW_EXT_visual_rating) = glxewGetExtension("GLX_EXT_visual_rating"); -#endif /* GLX_EXT_visual_rating */ -#ifdef GLX_MESA_agp_offset - CONST_CAST(GLXEW_MESA_agp_offset) = glxewGetExtension("GLX_MESA_agp_offset"); - if (glewExperimental || GLXEW_MESA_agp_offset) CONST_CAST(GLXEW_MESA_agp_offset) = !_glewInit_GLX_MESA_agp_offset(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_agp_offset */ -#ifdef GLX_MESA_copy_sub_buffer - CONST_CAST(GLXEW_MESA_copy_sub_buffer) = glxewGetExtension("GLX_MESA_copy_sub_buffer"); - if (glewExperimental || GLXEW_MESA_copy_sub_buffer) CONST_CAST(GLXEW_MESA_copy_sub_buffer) = !_glewInit_GLX_MESA_copy_sub_buffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_copy_sub_buffer */ -#ifdef GLX_MESA_pixmap_colormap - CONST_CAST(GLXEW_MESA_pixmap_colormap) = glxewGetExtension("GLX_MESA_pixmap_colormap"); - if (glewExperimental || GLXEW_MESA_pixmap_colormap) CONST_CAST(GLXEW_MESA_pixmap_colormap) = !_glewInit_GLX_MESA_pixmap_colormap(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_pixmap_colormap */ -#ifdef GLX_MESA_release_buffers - CONST_CAST(GLXEW_MESA_release_buffers) = glxewGetExtension("GLX_MESA_release_buffers"); - if (glewExperimental || GLXEW_MESA_release_buffers) CONST_CAST(GLXEW_MESA_release_buffers) = !_glewInit_GLX_MESA_release_buffers(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_release_buffers */ -#ifdef GLX_MESA_set_3dfx_mode - CONST_CAST(GLXEW_MESA_set_3dfx_mode) = glxewGetExtension("GLX_MESA_set_3dfx_mode"); - if (glewExperimental || GLXEW_MESA_set_3dfx_mode) CONST_CAST(GLXEW_MESA_set_3dfx_mode) = !_glewInit_GLX_MESA_set_3dfx_mode(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_set_3dfx_mode */ -#ifdef GLX_NV_float_buffer - CONST_CAST(GLXEW_NV_float_buffer) = glxewGetExtension("GLX_NV_float_buffer"); -#endif /* GLX_NV_float_buffer */ -#ifdef GLX_NV_present_video - CONST_CAST(GLXEW_NV_present_video) = glxewGetExtension("GLX_NV_present_video"); - if (glewExperimental || GLXEW_NV_present_video) CONST_CAST(GLXEW_NV_present_video) = !_glewInit_GLX_NV_present_video(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_NV_present_video */ -#ifdef GLX_NV_swap_group - CONST_CAST(GLXEW_NV_swap_group) = glxewGetExtension("GLX_NV_swap_group"); - if (glewExperimental || GLXEW_NV_swap_group) CONST_CAST(GLXEW_NV_swap_group) = !_glewInit_GLX_NV_swap_group(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_NV_swap_group */ -#ifdef GLX_NV_vertex_array_range - CONST_CAST(GLXEW_NV_vertex_array_range) = glxewGetExtension("GLX_NV_vertex_array_range"); - if (glewExperimental || GLXEW_NV_vertex_array_range) CONST_CAST(GLXEW_NV_vertex_array_range) = !_glewInit_GLX_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_NV_vertex_array_range */ -#ifdef GLX_NV_video_output - CONST_CAST(GLXEW_NV_video_output) = glxewGetExtension("GLX_NV_video_output"); - if (glewExperimental || GLXEW_NV_video_output) CONST_CAST(GLXEW_NV_video_output) = !_glewInit_GLX_NV_video_output(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_NV_video_output */ -#ifdef GLX_OML_swap_method - CONST_CAST(GLXEW_OML_swap_method) = glxewGetExtension("GLX_OML_swap_method"); -#endif /* GLX_OML_swap_method */ -#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -#include - CONST_CAST(GLXEW_OML_sync_control) = glxewGetExtension("GLX_OML_sync_control"); - if (glewExperimental || GLXEW_OML_sync_control) CONST_CAST(GLXEW_OML_sync_control) = !_glewInit_GLX_OML_sync_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_OML_sync_control */ -#ifdef GLX_SGIS_blended_overlay - CONST_CAST(GLXEW_SGIS_blended_overlay) = glxewGetExtension("GLX_SGIS_blended_overlay"); -#endif /* GLX_SGIS_blended_overlay */ -#ifdef GLX_SGIS_color_range - CONST_CAST(GLXEW_SGIS_color_range) = glxewGetExtension("GLX_SGIS_color_range"); -#endif /* GLX_SGIS_color_range */ -#ifdef GLX_SGIS_multisample - CONST_CAST(GLXEW_SGIS_multisample) = glxewGetExtension("GLX_SGIS_multisample"); -#endif /* GLX_SGIS_multisample */ -#ifdef GLX_SGIS_shared_multisample - CONST_CAST(GLXEW_SGIS_shared_multisample) = glxewGetExtension("GLX_SGIS_shared_multisample"); -#endif /* GLX_SGIS_shared_multisample */ -#ifdef GLX_SGIX_fbconfig - CONST_CAST(GLXEW_SGIX_fbconfig) = glxewGetExtension("GLX_SGIX_fbconfig"); - if (glewExperimental || GLXEW_SGIX_fbconfig) CONST_CAST(GLXEW_SGIX_fbconfig) = !_glewInit_GLX_SGIX_fbconfig(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_fbconfig */ -#ifdef GLX_SGIX_hyperpipe - CONST_CAST(GLXEW_SGIX_hyperpipe) = glxewGetExtension("GLX_SGIX_hyperpipe"); - if (glewExperimental || GLXEW_SGIX_hyperpipe) CONST_CAST(GLXEW_SGIX_hyperpipe) = !_glewInit_GLX_SGIX_hyperpipe(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_hyperpipe */ -#ifdef GLX_SGIX_pbuffer - CONST_CAST(GLXEW_SGIX_pbuffer) = glxewGetExtension("GLX_SGIX_pbuffer"); - if (glewExperimental || GLXEW_SGIX_pbuffer) CONST_CAST(GLXEW_SGIX_pbuffer) = !_glewInit_GLX_SGIX_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_pbuffer */ -#ifdef GLX_SGIX_swap_barrier - CONST_CAST(GLXEW_SGIX_swap_barrier) = glxewGetExtension("GLX_SGIX_swap_barrier"); - if (glewExperimental || GLXEW_SGIX_swap_barrier) CONST_CAST(GLXEW_SGIX_swap_barrier) = !_glewInit_GLX_SGIX_swap_barrier(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_swap_barrier */ -#ifdef GLX_SGIX_swap_group - CONST_CAST(GLXEW_SGIX_swap_group) = glxewGetExtension("GLX_SGIX_swap_group"); - if (glewExperimental || GLXEW_SGIX_swap_group) CONST_CAST(GLXEW_SGIX_swap_group) = !_glewInit_GLX_SGIX_swap_group(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_swap_group */ -#ifdef GLX_SGIX_video_resize - CONST_CAST(GLXEW_SGIX_video_resize) = glxewGetExtension("GLX_SGIX_video_resize"); - if (glewExperimental || GLXEW_SGIX_video_resize) CONST_CAST(GLXEW_SGIX_video_resize) = !_glewInit_GLX_SGIX_video_resize(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_video_resize */ -#ifdef GLX_SGIX_visual_select_group - CONST_CAST(GLXEW_SGIX_visual_select_group) = glxewGetExtension("GLX_SGIX_visual_select_group"); -#endif /* GLX_SGIX_visual_select_group */ -#ifdef GLX_SGI_cushion - CONST_CAST(GLXEW_SGI_cushion) = glxewGetExtension("GLX_SGI_cushion"); - if (glewExperimental || GLXEW_SGI_cushion) CONST_CAST(GLXEW_SGI_cushion) = !_glewInit_GLX_SGI_cushion(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGI_cushion */ -#ifdef GLX_SGI_make_current_read - CONST_CAST(GLXEW_SGI_make_current_read) = glxewGetExtension("GLX_SGI_make_current_read"); - if (glewExperimental || GLXEW_SGI_make_current_read) CONST_CAST(GLXEW_SGI_make_current_read) = !_glewInit_GLX_SGI_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGI_make_current_read */ -#ifdef GLX_SGI_swap_control - CONST_CAST(GLXEW_SGI_swap_control) = glxewGetExtension("GLX_SGI_swap_control"); - if (glewExperimental || GLXEW_SGI_swap_control) CONST_CAST(GLXEW_SGI_swap_control) = !_glewInit_GLX_SGI_swap_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGI_swap_control */ -#ifdef GLX_SGI_video_sync - CONST_CAST(GLXEW_SGI_video_sync) = glxewGetExtension("GLX_SGI_video_sync"); - if (glewExperimental || GLXEW_SGI_video_sync) CONST_CAST(GLXEW_SGI_video_sync) = !_glewInit_GLX_SGI_video_sync(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGI_video_sync */ -#ifdef GLX_SUN_get_transparent_index - CONST_CAST(GLXEW_SUN_get_transparent_index) = glxewGetExtension("GLX_SUN_get_transparent_index"); - if (glewExperimental || GLXEW_SUN_get_transparent_index) CONST_CAST(GLXEW_SUN_get_transparent_index) = !_glewInit_GLX_SUN_get_transparent_index(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SUN_get_transparent_index */ -#ifdef GLX_SUN_video_resize - CONST_CAST(GLXEW_SUN_video_resize) = glxewGetExtension("GLX_SUN_video_resize"); - if (glewExperimental || GLXEW_SUN_video_resize) CONST_CAST(GLXEW_SUN_video_resize) = !_glewInit_GLX_SUN_video_resize(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SUN_video_resize */ - - return GLEW_OK; -} - -#endif /* !__APPLE__ || GLEW_APPLE_GLX */ - -/* ------------------------------------------------------------------------ */ - -const GLubyte* glewGetErrorString (GLenum error) -{ - static const GLubyte* _glewErrorString[] = - { - (const GLubyte*)"No error", - (const GLubyte*)"Missing GL version", - (const GLubyte*)"GL 1.1 and up are not supported", - (const GLubyte*)"GLX 1.2 and up are not supported", - (const GLubyte*)"Unknown error" - }; - const int max_error = sizeof(_glewErrorString)/sizeof(*_glewErrorString) - 1; - return _glewErrorString[(int)error > max_error ? max_error : (int)error]; -} - -const GLubyte* glewGetString (GLenum name) -{ - static const GLubyte* _glewString[] = - { - (const GLubyte*)NULL, - (const GLubyte*)"1.5.1", - (const GLubyte*)"1", - (const GLubyte*)"5", - (const GLubyte*)"1" - }; - const int max_string = sizeof(_glewString)/sizeof(*_glewString) - 1; - return _glewString[(int)name > max_string ? 0 : (int)name]; -} - -/* ------------------------------------------------------------------------ */ - -GLboolean glewExperimental = GL_FALSE; - -#if !defined(GLEW_MX) - -#if defined(_WIN32) -extern GLenum wglewContextInit (void); -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */ -extern GLenum glxewContextInit (void); -#endif /* _WIN32 */ - -GLenum glewInit () -{ - GLenum r; - if ( (r = glewContextInit())!=NULL ) return r; -#if defined(_WIN32) - return wglewContextInit(); -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */ - return glxewContextInit(); -#else - return r; -#endif /* _WIN32 */ -} - -#endif /* !GLEW_MX */ -#ifdef GLEW_MX -GLboolean glewContextIsSupported (GLEWContext* ctx, const char* name) -#else -GLboolean glewIsSupported (const char* name) -#endif -{ - GLubyte* pos = (GLubyte*)name; - GLuint len = _glewStrLen(pos); - GLboolean ret = GL_TRUE; - while (ret && len > 0) - { - if (_glewStrSame1(&pos, &len, (const GLubyte*)"GL_", 3)) - { - if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8)) - { -#ifdef GL_VERSION_1_2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3)) - { - ret = GLEW_VERSION_1_2; - continue; - } -#endif -#ifdef GL_VERSION_1_3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3)) - { - ret = GLEW_VERSION_1_3; - continue; - } -#endif -#ifdef GL_VERSION_1_4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3)) - { - ret = GLEW_VERSION_1_4; - continue; - } -#endif -#ifdef GL_VERSION_1_5 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_5", 3)) - { - ret = GLEW_VERSION_1_5; - continue; - } -#endif -#ifdef GL_VERSION_2_0 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"2_0", 3)) - { - ret = GLEW_VERSION_2_0; - continue; - } -#endif -#ifdef GL_VERSION_2_1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"2_1", 3)) - { - ret = GLEW_VERSION_2_1; - continue; - } -#endif -#ifdef GL_VERSION_3_0 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_0", 3)) - { - ret = GLEW_VERSION_3_0; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5)) - { -#ifdef GL_3DFX_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLEW_3DFX_multisample; - continue; - } -#endif -#ifdef GL_3DFX_tbuffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"tbuffer", 7)) - { - ret = GLEW_3DFX_tbuffer; - continue; - } -#endif -#ifdef GL_3DFX_texture_compression_FXT1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_FXT1", 24)) - { - ret = GLEW_3DFX_texture_compression_FXT1; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"APPLE_", 6)) - { -#ifdef GL_APPLE_client_storage - if (_glewStrSame3(&pos, &len, (const GLubyte*)"client_storage", 14)) - { - ret = GLEW_APPLE_client_storage; - continue; - } -#endif -#ifdef GL_APPLE_element_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13)) - { - ret = GLEW_APPLE_element_array; - continue; - } -#endif -#ifdef GL_APPLE_fence - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5)) - { - ret = GLEW_APPLE_fence; - continue; - } -#endif -#ifdef GL_APPLE_float_pixels - if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_pixels", 12)) - { - ret = GLEW_APPLE_float_pixels; - continue; - } -#endif -#ifdef GL_APPLE_flush_buffer_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"flush_buffer_range", 18)) - { - ret = GLEW_APPLE_flush_buffer_range; - continue; - } -#endif -#ifdef GL_APPLE_pixel_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer", 12)) - { - ret = GLEW_APPLE_pixel_buffer; - continue; - } -#endif -#ifdef GL_APPLE_specular_vector - if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_vector", 15)) - { - ret = GLEW_APPLE_specular_vector; - continue; - } -#endif -#ifdef GL_APPLE_texture_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13)) - { - ret = GLEW_APPLE_texture_range; - continue; - } -#endif -#ifdef GL_APPLE_transform_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_hint", 14)) - { - ret = GLEW_APPLE_transform_hint; - continue; - } -#endif -#ifdef GL_APPLE_vertex_array_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19)) - { - ret = GLEW_APPLE_vertex_array_object; - continue; - } -#endif -#ifdef GL_APPLE_vertex_array_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18)) - { - ret = GLEW_APPLE_vertex_array_range; - continue; - } -#endif -#ifdef GL_APPLE_ycbcr_422 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_422", 9)) - { - ret = GLEW_APPLE_ycbcr_422; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4)) - { -#ifdef GL_ARB_color_buffer_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_buffer_float", 18)) - { - ret = GLEW_ARB_color_buffer_float; - continue; - } -#endif -#ifdef GL_ARB_depth_buffer_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_buffer_float", 18)) - { - ret = GLEW_ARB_depth_buffer_float; - continue; - } -#endif -#ifdef GL_ARB_depth_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13)) - { - ret = GLEW_ARB_depth_texture; - continue; - } -#endif -#ifdef GL_ARB_draw_buffers - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12)) - { - ret = GLEW_ARB_draw_buffers; - continue; - } -#endif -#ifdef GL_ARB_draw_instanced - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_instanced", 14)) - { - ret = GLEW_ARB_draw_instanced; - continue; - } -#endif -#ifdef GL_ARB_fragment_program - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16)) - { - ret = GLEW_ARB_fragment_program; - continue; - } -#endif -#ifdef GL_ARB_fragment_program_shadow - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_shadow", 23)) - { - ret = GLEW_ARB_fragment_program_shadow; - continue; - } -#endif -#ifdef GL_ARB_fragment_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15)) - { - ret = GLEW_ARB_fragment_shader; - continue; - } -#endif -#ifdef GL_ARB_framebuffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_object", 18)) - { - ret = GLEW_ARB_framebuffer_object; - continue; - } -#endif -#ifdef GL_ARB_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = GLEW_ARB_framebuffer_sRGB; - continue; - } -#endif -#ifdef GL_ARB_geometry_shader4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16)) - { - ret = GLEW_ARB_geometry_shader4; - continue; - } -#endif -#ifdef GL_ARB_half_float_pixel - if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float_pixel", 16)) - { - ret = GLEW_ARB_half_float_pixel; - continue; - } -#endif -#ifdef GL_ARB_half_float_vertex - if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float_vertex", 17)) - { - ret = GLEW_ARB_half_float_vertex; - continue; - } -#endif -#ifdef GL_ARB_imaging - if (_glewStrSame3(&pos, &len, (const GLubyte*)"imaging", 7)) - { - ret = GLEW_ARB_imaging; - continue; - } -#endif -#ifdef GL_ARB_instanced_arrays - if (_glewStrSame3(&pos, &len, (const GLubyte*)"instanced_arrays", 16)) - { - ret = GLEW_ARB_instanced_arrays; - continue; - } -#endif -#ifdef GL_ARB_map_buffer_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_buffer_range", 16)) - { - ret = GLEW_ARB_map_buffer_range; - continue; - } -#endif -#ifdef GL_ARB_matrix_palette - if (_glewStrSame3(&pos, &len, (const GLubyte*)"matrix_palette", 14)) - { - ret = GLEW_ARB_matrix_palette; - continue; - } -#endif -#ifdef GL_ARB_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLEW_ARB_multisample; - continue; - } -#endif -#ifdef GL_ARB_multitexture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multitexture", 12)) - { - ret = GLEW_ARB_multitexture; - continue; - } -#endif -#ifdef GL_ARB_occlusion_query - if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15)) - { - ret = GLEW_ARB_occlusion_query; - continue; - } -#endif -#ifdef GL_ARB_pixel_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19)) - { - ret = GLEW_ARB_pixel_buffer_object; - continue; - } -#endif -#ifdef GL_ARB_point_parameters - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16)) - { - ret = GLEW_ARB_point_parameters; - continue; - } -#endif -#ifdef GL_ARB_point_sprite - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12)) - { - ret = GLEW_ARB_point_sprite; - continue; - } -#endif -#ifdef GL_ARB_shader_objects - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_objects", 14)) - { - ret = GLEW_ARB_shader_objects; - continue; - } -#endif -#ifdef GL_ARB_shading_language_100 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_100", 20)) - { - ret = GLEW_ARB_shading_language_100; - continue; - } -#endif -#ifdef GL_ARB_shadow - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6)) - { - ret = GLEW_ARB_shadow; - continue; - } -#endif -#ifdef GL_ARB_shadow_ambient - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14)) - { - ret = GLEW_ARB_shadow_ambient; - continue; - } -#endif -#ifdef GL_ARB_texture_border_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20)) - { - ret = GLEW_ARB_texture_border_clamp; - continue; - } -#endif -#ifdef GL_ARB_texture_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object", 21)) - { - ret = GLEW_ARB_texture_buffer_object; - continue; - } -#endif -#ifdef GL_ARB_texture_compression - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression", 19)) - { - ret = GLEW_ARB_texture_compression; - continue; - } -#endif -#ifdef GL_ARB_texture_compression_rgtc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_rgtc", 24)) - { - ret = GLEW_ARB_texture_compression_rgtc; - continue; - } -#endif -#ifdef GL_ARB_texture_cube_map - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16)) - { - ret = GLEW_ARB_texture_cube_map; - continue; - } -#endif -#ifdef GL_ARB_texture_env_add - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15)) - { - ret = GLEW_ARB_texture_env_add; - continue; - } -#endif -#ifdef GL_ARB_texture_env_combine - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19)) - { - ret = GLEW_ARB_texture_env_combine; - continue; - } -#endif -#ifdef GL_ARB_texture_env_crossbar - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_crossbar", 20)) - { - ret = GLEW_ARB_texture_env_crossbar; - continue; - } -#endif -#ifdef GL_ARB_texture_env_dot3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16)) - { - ret = GLEW_ARB_texture_env_dot3; - continue; - } -#endif -#ifdef GL_ARB_texture_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13)) - { - ret = GLEW_ARB_texture_float; - continue; - } -#endif -#ifdef GL_ARB_texture_mirrored_repeat - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23)) - { - ret = GLEW_ARB_texture_mirrored_repeat; - continue; - } -#endif -#ifdef GL_ARB_texture_non_power_of_two - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_non_power_of_two", 24)) - { - ret = GLEW_ARB_texture_non_power_of_two; - continue; - } -#endif -#ifdef GL_ARB_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17)) - { - ret = GLEW_ARB_texture_rectangle; - continue; - } -#endif -#ifdef GL_ARB_texture_rg - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rg", 10)) - { - ret = GLEW_ARB_texture_rg; - continue; - } -#endif -#ifdef GL_ARB_transpose_matrix - if (_glewStrSame3(&pos, &len, (const GLubyte*)"transpose_matrix", 16)) - { - ret = GLEW_ARB_transpose_matrix; - continue; - } -#endif -#ifdef GL_ARB_vertex_array_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19)) - { - ret = GLEW_ARB_vertex_array_object; - continue; - } -#endif -#ifdef GL_ARB_vertex_blend - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_blend", 12)) - { - ret = GLEW_ARB_vertex_blend; - continue; - } -#endif -#ifdef GL_ARB_vertex_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_buffer_object", 20)) - { - ret = GLEW_ARB_vertex_buffer_object; - continue; - } -#endif -#ifdef GL_ARB_vertex_program - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14)) - { - ret = GLEW_ARB_vertex_program; - continue; - } -#endif -#ifdef GL_ARB_vertex_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13)) - { - ret = GLEW_ARB_vertex_shader; - continue; - } -#endif -#ifdef GL_ARB_window_pos - if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10)) - { - ret = GLEW_ARB_window_pos; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATIX_", 5)) - { -#ifdef GL_ATIX_point_sprites - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprites", 13)) - { - ret = GLEW_ATIX_point_sprites; - continue; - } -#endif -#ifdef GL_ATIX_texture_env_combine3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20)) - { - ret = GLEW_ATIX_texture_env_combine3; - continue; - } -#endif -#ifdef GL_ATIX_texture_env_route - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_route", 17)) - { - ret = GLEW_ATIX_texture_env_route; - continue; - } -#endif -#ifdef GL_ATIX_vertex_shader_output_point_size - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_output_point_size", 31)) - { - ret = GLEW_ATIX_vertex_shader_output_point_size; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4)) - { -#ifdef GL_ATI_draw_buffers - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12)) - { - ret = GLEW_ATI_draw_buffers; - continue; - } -#endif -#ifdef GL_ATI_element_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13)) - { - ret = GLEW_ATI_element_array; - continue; - } -#endif -#ifdef GL_ATI_envmap_bumpmap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"envmap_bumpmap", 14)) - { - ret = GLEW_ATI_envmap_bumpmap; - continue; - } -#endif -#ifdef GL_ATI_fragment_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15)) - { - ret = GLEW_ATI_fragment_shader; - continue; - } -#endif -#ifdef GL_ATI_map_object_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_object_buffer", 17)) - { - ret = GLEW_ATI_map_object_buffer; - continue; - } -#endif -#ifdef GL_ATI_pn_triangles - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pn_triangles", 12)) - { - ret = GLEW_ATI_pn_triangles; - continue; - } -#endif -#ifdef GL_ATI_separate_stencil - if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_stencil", 16)) - { - ret = GLEW_ATI_separate_stencil; - continue; - } -#endif -#ifdef GL_ATI_shader_texture_lod - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_texture_lod", 18)) - { - ret = GLEW_ATI_shader_texture_lod; - continue; - } -#endif -#ifdef GL_ATI_text_fragment_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"text_fragment_shader", 20)) - { - ret = GLEW_ATI_text_fragment_shader; - continue; - } -#endif -#ifdef GL_ATI_texture_compression_3dc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_3dc", 23)) - { - ret = GLEW_ATI_texture_compression_3dc; - continue; - } -#endif -#ifdef GL_ATI_texture_env_combine3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20)) - { - ret = GLEW_ATI_texture_env_combine3; - continue; - } -#endif -#ifdef GL_ATI_texture_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13)) - { - ret = GLEW_ATI_texture_float; - continue; - } -#endif -#ifdef GL_ATI_texture_mirror_once - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_once", 19)) - { - ret = GLEW_ATI_texture_mirror_once; - continue; - } -#endif -#ifdef GL_ATI_vertex_array_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19)) - { - ret = GLEW_ATI_vertex_array_object; - continue; - } -#endif -#ifdef GL_ATI_vertex_attrib_array_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_array_object", 26)) - { - ret = GLEW_ATI_vertex_attrib_array_object; - continue; - } -#endif -#ifdef GL_ATI_vertex_streams - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_streams", 14)) - { - ret = GLEW_ATI_vertex_streams; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4)) - { -#ifdef GL_EXT_422_pixels - if (_glewStrSame3(&pos, &len, (const GLubyte*)"422_pixels", 10)) - { - ret = GLEW_EXT_422_pixels; - continue; - } -#endif -#ifdef GL_EXT_Cg_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"Cg_shader", 9)) - { - ret = GLEW_EXT_Cg_shader; - continue; - } -#endif -#ifdef GL_EXT_abgr - if (_glewStrSame3(&pos, &len, (const GLubyte*)"abgr", 4)) - { - ret = GLEW_EXT_abgr; - continue; - } -#endif -#ifdef GL_EXT_bgra - if (_glewStrSame3(&pos, &len, (const GLubyte*)"bgra", 4)) - { - ret = GLEW_EXT_bgra; - continue; - } -#endif -#ifdef GL_EXT_bindable_uniform - if (_glewStrSame3(&pos, &len, (const GLubyte*)"bindable_uniform", 16)) - { - ret = GLEW_EXT_bindable_uniform; - continue; - } -#endif -#ifdef GL_EXT_blend_color - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_color", 11)) - { - ret = GLEW_EXT_blend_color; - continue; - } -#endif -#ifdef GL_EXT_blend_equation_separate - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_separate", 23)) - { - ret = GLEW_EXT_blend_equation_separate; - continue; - } -#endif -#ifdef GL_EXT_blend_func_separate - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_func_separate", 19)) - { - ret = GLEW_EXT_blend_func_separate; - continue; - } -#endif -#ifdef GL_EXT_blend_logic_op - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_logic_op", 14)) - { - ret = GLEW_EXT_blend_logic_op; - continue; - } -#endif -#ifdef GL_EXT_blend_minmax - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_minmax", 12)) - { - ret = GLEW_EXT_blend_minmax; - continue; - } -#endif -#ifdef GL_EXT_blend_subtract - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_subtract", 14)) - { - ret = GLEW_EXT_blend_subtract; - continue; - } -#endif -#ifdef GL_EXT_clip_volume_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_volume_hint", 16)) - { - ret = GLEW_EXT_clip_volume_hint; - continue; - } -#endif -#ifdef GL_EXT_cmyka - if (_glewStrSame3(&pos, &len, (const GLubyte*)"cmyka", 5)) - { - ret = GLEW_EXT_cmyka; - continue; - } -#endif -#ifdef GL_EXT_color_subtable - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_subtable", 14)) - { - ret = GLEW_EXT_color_subtable; - continue; - } -#endif -#ifdef GL_EXT_compiled_vertex_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"compiled_vertex_array", 21)) - { - ret = GLEW_EXT_compiled_vertex_array; - continue; - } -#endif -#ifdef GL_EXT_convolution - if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution", 11)) - { - ret = GLEW_EXT_convolution; - continue; - } -#endif -#ifdef GL_EXT_coordinate_frame - if (_glewStrSame3(&pos, &len, (const GLubyte*)"coordinate_frame", 16)) - { - ret = GLEW_EXT_coordinate_frame; - continue; - } -#endif -#ifdef GL_EXT_copy_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_texture", 12)) - { - ret = GLEW_EXT_copy_texture; - continue; - } -#endif -#ifdef GL_EXT_cull_vertex - if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11)) - { - ret = GLEW_EXT_cull_vertex; - continue; - } -#endif -#ifdef GL_EXT_depth_bounds_test - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_bounds_test", 17)) - { - ret = GLEW_EXT_depth_bounds_test; - continue; - } -#endif -#ifdef GL_EXT_direct_state_access - if (_glewStrSame3(&pos, &len, (const GLubyte*)"direct_state_access", 19)) - { - ret = GLEW_EXT_direct_state_access; - continue; - } -#endif -#ifdef GL_EXT_draw_buffers2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers2", 13)) - { - ret = GLEW_EXT_draw_buffers2; - continue; - } -#endif -#ifdef GL_EXT_draw_instanced - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_instanced", 14)) - { - ret = GLEW_EXT_draw_instanced; - continue; - } -#endif -#ifdef GL_EXT_draw_range_elements - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_range_elements", 19)) - { - ret = GLEW_EXT_draw_range_elements; - continue; - } -#endif -#ifdef GL_EXT_fog_coord - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_coord", 9)) - { - ret = GLEW_EXT_fog_coord; - continue; - } -#endif -#ifdef GL_EXT_fragment_lighting - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_lighting", 17)) - { - ret = GLEW_EXT_fragment_lighting; - continue; - } -#endif -#ifdef GL_EXT_framebuffer_blit - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_blit", 16)) - { - ret = GLEW_EXT_framebuffer_blit; - continue; - } -#endif -#ifdef GL_EXT_framebuffer_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample", 23)) - { - ret = GLEW_EXT_framebuffer_multisample; - continue; - } -#endif -#ifdef GL_EXT_framebuffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_object", 18)) - { - ret = GLEW_EXT_framebuffer_object; - continue; - } -#endif -#ifdef GL_EXT_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = GLEW_EXT_framebuffer_sRGB; - continue; - } -#endif -#ifdef GL_EXT_geometry_shader4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16)) - { - ret = GLEW_EXT_geometry_shader4; - continue; - } -#endif -#ifdef GL_EXT_gpu_program_parameters - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program_parameters", 22)) - { - ret = GLEW_EXT_gpu_program_parameters; - continue; - } -#endif -#ifdef GL_EXT_gpu_shader4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader4", 11)) - { - ret = GLEW_EXT_gpu_shader4; - continue; - } -#endif -#ifdef GL_EXT_histogram - if (_glewStrSame3(&pos, &len, (const GLubyte*)"histogram", 9)) - { - ret = GLEW_EXT_histogram; - continue; - } -#endif -#ifdef GL_EXT_index_array_formats - if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_array_formats", 19)) - { - ret = GLEW_EXT_index_array_formats; - continue; - } -#endif -#ifdef GL_EXT_index_func - if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_func", 10)) - { - ret = GLEW_EXT_index_func; - continue; - } -#endif -#ifdef GL_EXT_index_material - if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_material", 14)) - { - ret = GLEW_EXT_index_material; - continue; - } -#endif -#ifdef GL_EXT_index_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_texture", 13)) - { - ret = GLEW_EXT_index_texture; - continue; - } -#endif -#ifdef GL_EXT_light_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_texture", 13)) - { - ret = GLEW_EXT_light_texture; - continue; - } -#endif -#ifdef GL_EXT_misc_attribute - if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_attribute", 14)) - { - ret = GLEW_EXT_misc_attribute; - continue; - } -#endif -#ifdef GL_EXT_multi_draw_arrays - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_arrays", 17)) - { - ret = GLEW_EXT_multi_draw_arrays; - continue; - } -#endif -#ifdef GL_EXT_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLEW_EXT_multisample; - continue; - } -#endif -#ifdef GL_EXT_packed_depth_stencil - if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20)) - { - ret = GLEW_EXT_packed_depth_stencil; - continue; - } -#endif -#ifdef GL_EXT_packed_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_float", 12)) - { - ret = GLEW_EXT_packed_float; - continue; - } -#endif -#ifdef GL_EXT_packed_pixels - if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_pixels", 13)) - { - ret = GLEW_EXT_packed_pixels; - continue; - } -#endif -#ifdef GL_EXT_paletted_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"paletted_texture", 16)) - { - ret = GLEW_EXT_paletted_texture; - continue; - } -#endif -#ifdef GL_EXT_pixel_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19)) - { - ret = GLEW_EXT_pixel_buffer_object; - continue; - } -#endif -#ifdef GL_EXT_pixel_transform - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform", 15)) - { - ret = GLEW_EXT_pixel_transform; - continue; - } -#endif -#ifdef GL_EXT_pixel_transform_color_table - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform_color_table", 27)) - { - ret = GLEW_EXT_pixel_transform_color_table; - continue; - } -#endif -#ifdef GL_EXT_point_parameters - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16)) - { - ret = GLEW_EXT_point_parameters; - continue; - } -#endif -#ifdef GL_EXT_polygon_offset - if (_glewStrSame3(&pos, &len, (const GLubyte*)"polygon_offset", 14)) - { - ret = GLEW_EXT_polygon_offset; - continue; - } -#endif -#ifdef GL_EXT_rescale_normal - if (_glewStrSame3(&pos, &len, (const GLubyte*)"rescale_normal", 14)) - { - ret = GLEW_EXT_rescale_normal; - continue; - } -#endif -#ifdef GL_EXT_scene_marker - if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12)) - { - ret = GLEW_EXT_scene_marker; - continue; - } -#endif -#ifdef GL_EXT_secondary_color - if (_glewStrSame3(&pos, &len, (const GLubyte*)"secondary_color", 15)) - { - ret = GLEW_EXT_secondary_color; - continue; - } -#endif -#ifdef GL_EXT_separate_specular_color - if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_specular_color", 23)) - { - ret = GLEW_EXT_separate_specular_color; - continue; - } -#endif -#ifdef GL_EXT_shadow_funcs - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_funcs", 12)) - { - ret = GLEW_EXT_shadow_funcs; - continue; - } -#endif -#ifdef GL_EXT_shared_texture_palette - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_texture_palette", 22)) - { - ret = GLEW_EXT_shared_texture_palette; - continue; - } -#endif -#ifdef GL_EXT_stencil_clear_tag - if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_clear_tag", 17)) - { - ret = GLEW_EXT_stencil_clear_tag; - continue; - } -#endif -#ifdef GL_EXT_stencil_two_side - if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_two_side", 16)) - { - ret = GLEW_EXT_stencil_two_side; - continue; - } -#endif -#ifdef GL_EXT_stencil_wrap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_wrap", 12)) - { - ret = GLEW_EXT_stencil_wrap; - continue; - } -#endif -#ifdef GL_EXT_subtexture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"subtexture", 10)) - { - ret = GLEW_EXT_subtexture; - continue; - } -#endif -#ifdef GL_EXT_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture", 7)) - { - ret = GLEW_EXT_texture; - continue; - } -#endif -#ifdef GL_EXT_texture3D - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture3D", 9)) - { - ret = GLEW_EXT_texture3D; - continue; - } -#endif -#ifdef GL_EXT_texture_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_array", 13)) - { - ret = GLEW_EXT_texture_array; - continue; - } -#endif -#ifdef GL_EXT_texture_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object", 21)) - { - ret = GLEW_EXT_texture_buffer_object; - continue; - } -#endif -#ifdef GL_EXT_texture_compression_dxt1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_dxt1", 24)) - { - ret = GLEW_EXT_texture_compression_dxt1; - continue; - } -#endif -#ifdef GL_EXT_texture_compression_latc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_latc", 24)) - { - ret = GLEW_EXT_texture_compression_latc; - continue; - } -#endif -#ifdef GL_EXT_texture_compression_rgtc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_rgtc", 24)) - { - ret = GLEW_EXT_texture_compression_rgtc; - continue; - } -#endif -#ifdef GL_EXT_texture_compression_s3tc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_s3tc", 24)) - { - ret = GLEW_EXT_texture_compression_s3tc; - continue; - } -#endif -#ifdef GL_EXT_texture_cube_map - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16)) - { - ret = GLEW_EXT_texture_cube_map; - continue; - } -#endif -#ifdef GL_EXT_texture_edge_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18)) - { - ret = GLEW_EXT_texture_edge_clamp; - continue; - } -#endif -#ifdef GL_EXT_texture_env - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env", 11)) - { - ret = GLEW_EXT_texture_env; - continue; - } -#endif -#ifdef GL_EXT_texture_env_add - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15)) - { - ret = GLEW_EXT_texture_env_add; - continue; - } -#endif -#ifdef GL_EXT_texture_env_combine - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19)) - { - ret = GLEW_EXT_texture_env_combine; - continue; - } -#endif -#ifdef GL_EXT_texture_env_dot3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16)) - { - ret = GLEW_EXT_texture_env_dot3; - continue; - } -#endif -#ifdef GL_EXT_texture_filter_anisotropic - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter_anisotropic", 26)) - { - ret = GLEW_EXT_texture_filter_anisotropic; - continue; - } -#endif -#ifdef GL_EXT_texture_integer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_integer", 15)) - { - ret = GLEW_EXT_texture_integer; - continue; - } -#endif -#ifdef GL_EXT_texture_lod_bias - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16)) - { - ret = GLEW_EXT_texture_lod_bias; - continue; - } -#endif -#ifdef GL_EXT_texture_mirror_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_clamp", 20)) - { - ret = GLEW_EXT_texture_mirror_clamp; - continue; - } -#endif -#ifdef GL_EXT_texture_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_object", 14)) - { - ret = GLEW_EXT_texture_object; - continue; - } -#endif -#ifdef GL_EXT_texture_perturb_normal - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_perturb_normal", 22)) - { - ret = GLEW_EXT_texture_perturb_normal; - continue; - } -#endif -#ifdef GL_EXT_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17)) - { - ret = GLEW_EXT_texture_rectangle; - continue; - } -#endif -#ifdef GL_EXT_texture_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_sRGB", 12)) - { - ret = GLEW_EXT_texture_sRGB; - continue; - } -#endif -#ifdef GL_EXT_texture_shared_exponent - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shared_exponent", 23)) - { - ret = GLEW_EXT_texture_shared_exponent; - continue; - } -#endif -#ifdef GL_EXT_texture_swizzle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_swizzle", 15)) - { - ret = GLEW_EXT_texture_swizzle; - continue; - } -#endif -#ifdef GL_EXT_timer_query - if (_glewStrSame3(&pos, &len, (const GLubyte*)"timer_query", 11)) - { - ret = GLEW_EXT_timer_query; - continue; - } -#endif -#ifdef GL_EXT_transform_feedback - if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback", 18)) - { - ret = GLEW_EXT_transform_feedback; - continue; - } -#endif -#ifdef GL_EXT_vertex_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array", 12)) - { - ret = GLEW_EXT_vertex_array; - continue; - } -#endif -#ifdef GL_EXT_vertex_array_bgra - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_bgra", 17)) - { - ret = GLEW_EXT_vertex_array_bgra; - continue; - } -#endif -#ifdef GL_EXT_vertex_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13)) - { - ret = GLEW_EXT_vertex_shader; - continue; - } -#endif -#ifdef GL_EXT_vertex_weighting - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_weighting", 16)) - { - ret = GLEW_EXT_vertex_weighting; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"GREMEDY_", 8)) - { -#ifdef GL_GREMEDY_frame_terminator - if (_glewStrSame3(&pos, &len, (const GLubyte*)"frame_terminator", 16)) - { - ret = GLEW_GREMEDY_frame_terminator; - continue; - } -#endif -#ifdef GL_GREMEDY_string_marker - if (_glewStrSame3(&pos, &len, (const GLubyte*)"string_marker", 13)) - { - ret = GLEW_GREMEDY_string_marker; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"HP_", 3)) - { -#ifdef GL_HP_convolution_border_modes - if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24)) - { - ret = GLEW_HP_convolution_border_modes; - continue; - } -#endif -#ifdef GL_HP_image_transform - if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_transform", 15)) - { - ret = GLEW_HP_image_transform; - continue; - } -#endif -#ifdef GL_HP_occlusion_test - if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_test", 14)) - { - ret = GLEW_HP_occlusion_test; - continue; - } -#endif -#ifdef GL_HP_texture_lighting - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lighting", 16)) - { - ret = GLEW_HP_texture_lighting; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"IBM_", 4)) - { -#ifdef GL_IBM_cull_vertex - if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11)) - { - ret = GLEW_IBM_cull_vertex; - continue; - } -#endif -#ifdef GL_IBM_multimode_draw_arrays - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multimode_draw_arrays", 21)) - { - ret = GLEW_IBM_multimode_draw_arrays; - continue; - } -#endif -#ifdef GL_IBM_rasterpos_clip - if (_glewStrSame3(&pos, &len, (const GLubyte*)"rasterpos_clip", 14)) - { - ret = GLEW_IBM_rasterpos_clip; - continue; - } -#endif -#ifdef GL_IBM_static_data - if (_glewStrSame3(&pos, &len, (const GLubyte*)"static_data", 11)) - { - ret = GLEW_IBM_static_data; - continue; - } -#endif -#ifdef GL_IBM_texture_mirrored_repeat - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23)) - { - ret = GLEW_IBM_texture_mirrored_repeat; - continue; - } -#endif -#ifdef GL_IBM_vertex_array_lists - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_lists", 18)) - { - ret = GLEW_IBM_vertex_array_lists; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"INGR_", 5)) - { -#ifdef GL_INGR_color_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_clamp", 11)) - { - ret = GLEW_INGR_color_clamp; - continue; - } -#endif -#ifdef GL_INGR_interlace_read - if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace_read", 14)) - { - ret = GLEW_INGR_interlace_read; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"INTEL_", 6)) - { -#ifdef GL_INTEL_parallel_arrays - if (_glewStrSame3(&pos, &len, (const GLubyte*)"parallel_arrays", 15)) - { - ret = GLEW_INTEL_parallel_arrays; - continue; - } -#endif -#ifdef GL_INTEL_texture_scissor - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scissor", 15)) - { - ret = GLEW_INTEL_texture_scissor; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"KTX_", 4)) - { -#ifdef GL_KTX_buffer_region - if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13)) - { - ret = GLEW_KTX_buffer_region; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESAX_", 6)) - { -#ifdef GL_MESAX_texture_stack - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_stack", 13)) - { - ret = GLEW_MESAX_texture_stack; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5)) - { -#ifdef GL_MESA_pack_invert - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pack_invert", 11)) - { - ret = GLEW_MESA_pack_invert; - continue; - } -#endif -#ifdef GL_MESA_resize_buffers - if (_glewStrSame3(&pos, &len, (const GLubyte*)"resize_buffers", 14)) - { - ret = GLEW_MESA_resize_buffers; - continue; - } -#endif -#ifdef GL_MESA_window_pos - if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10)) - { - ret = GLEW_MESA_window_pos; - continue; - } -#endif -#ifdef GL_MESA_ycbcr_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_texture", 13)) - { - ret = GLEW_MESA_ycbcr_texture; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3)) - { -#ifdef GL_NV_blend_square - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_square", 12)) - { - ret = GLEW_NV_blend_square; - continue; - } -#endif -#ifdef GL_NV_conditional_render - if (_glewStrSame3(&pos, &len, (const GLubyte*)"conditional_render", 18)) - { - ret = GLEW_NV_conditional_render; - continue; - } -#endif -#ifdef GL_NV_copy_depth_to_color - if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_depth_to_color", 19)) - { - ret = GLEW_NV_copy_depth_to_color; - continue; - } -#endif -#ifdef GL_NV_depth_buffer_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_buffer_float", 18)) - { - ret = GLEW_NV_depth_buffer_float; - continue; - } -#endif -#ifdef GL_NV_depth_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_clamp", 11)) - { - ret = GLEW_NV_depth_clamp; - continue; - } -#endif -#ifdef GL_NV_depth_range_unclamped - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_range_unclamped", 21)) - { - ret = GLEW_NV_depth_range_unclamped; - continue; - } -#endif -#ifdef GL_NV_evaluators - if (_glewStrSame3(&pos, &len, (const GLubyte*)"evaluators", 10)) - { - ret = GLEW_NV_evaluators; - continue; - } -#endif -#ifdef GL_NV_explicit_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"explicit_multisample", 20)) - { - ret = GLEW_NV_explicit_multisample; - continue; - } -#endif -#ifdef GL_NV_fence - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5)) - { - ret = GLEW_NV_fence; - continue; - } -#endif -#ifdef GL_NV_float_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12)) - { - ret = GLEW_NV_float_buffer; - continue; - } -#endif -#ifdef GL_NV_fog_distance - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_distance", 12)) - { - ret = GLEW_NV_fog_distance; - continue; - } -#endif -#ifdef GL_NV_fragment_program - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16)) - { - ret = GLEW_NV_fragment_program; - continue; - } -#endif -#ifdef GL_NV_fragment_program2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program2", 17)) - { - ret = GLEW_NV_fragment_program2; - continue; - } -#endif -#ifdef GL_NV_fragment_program4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program4", 17)) - { - ret = GLEW_NV_fragment_program4; - continue; - } -#endif -#ifdef GL_NV_fragment_program_option - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_option", 23)) - { - ret = GLEW_NV_fragment_program_option; - continue; - } -#endif -#ifdef GL_NV_framebuffer_multisample_coverage - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample_coverage", 32)) - { - ret = GLEW_NV_framebuffer_multisample_coverage; - continue; - } -#endif -#ifdef GL_NV_geometry_program4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_program4", 17)) - { - ret = GLEW_NV_geometry_program4; - continue; - } -#endif -#ifdef GL_NV_geometry_shader4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16)) - { - ret = GLEW_NV_geometry_shader4; - continue; - } -#endif -#ifdef GL_NV_gpu_program4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program4", 12)) - { - ret = GLEW_NV_gpu_program4; - continue; - } -#endif -#ifdef GL_NV_half_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float", 10)) - { - ret = GLEW_NV_half_float; - continue; - } -#endif -#ifdef GL_NV_light_max_exponent - if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_max_exponent", 18)) - { - ret = GLEW_NV_light_max_exponent; - continue; - } -#endif -#ifdef GL_NV_multisample_filter_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_filter_hint", 23)) - { - ret = GLEW_NV_multisample_filter_hint; - continue; - } -#endif -#ifdef GL_NV_occlusion_query - if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15)) - { - ret = GLEW_NV_occlusion_query; - continue; - } -#endif -#ifdef GL_NV_packed_depth_stencil - if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20)) - { - ret = GLEW_NV_packed_depth_stencil; - continue; - } -#endif -#ifdef GL_NV_parameter_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"parameter_buffer_object", 23)) - { - ret = GLEW_NV_parameter_buffer_object; - continue; - } -#endif -#ifdef GL_NV_pixel_data_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_data_range", 16)) - { - ret = GLEW_NV_pixel_data_range; - continue; - } -#endif -#ifdef GL_NV_point_sprite - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12)) - { - ret = GLEW_NV_point_sprite; - continue; - } -#endif -#ifdef GL_NV_present_video - if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13)) - { - ret = GLEW_NV_present_video; - continue; - } -#endif -#ifdef GL_NV_primitive_restart - if (_glewStrSame3(&pos, &len, (const GLubyte*)"primitive_restart", 17)) - { - ret = GLEW_NV_primitive_restart; - continue; - } -#endif -#ifdef GL_NV_register_combiners - if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners", 18)) - { - ret = GLEW_NV_register_combiners; - continue; - } -#endif -#ifdef GL_NV_register_combiners2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners2", 19)) - { - ret = GLEW_NV_register_combiners2; - continue; - } -#endif -#ifdef GL_NV_texgen_emboss - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_emboss", 13)) - { - ret = GLEW_NV_texgen_emboss; - continue; - } -#endif -#ifdef GL_NV_texgen_reflection - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_reflection", 17)) - { - ret = GLEW_NV_texgen_reflection; - continue; - } -#endif -#ifdef GL_NV_texture_compression_vtc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_vtc", 23)) - { - ret = GLEW_NV_texture_compression_vtc; - continue; - } -#endif -#ifdef GL_NV_texture_env_combine4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine4", 20)) - { - ret = GLEW_NV_texture_env_combine4; - continue; - } -#endif -#ifdef GL_NV_texture_expand_normal - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_expand_normal", 21)) - { - ret = GLEW_NV_texture_expand_normal; - continue; - } -#endif -#ifdef GL_NV_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17)) - { - ret = GLEW_NV_texture_rectangle; - continue; - } -#endif -#ifdef GL_NV_texture_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader", 14)) - { - ret = GLEW_NV_texture_shader; - continue; - } -#endif -#ifdef GL_NV_texture_shader2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader2", 15)) - { - ret = GLEW_NV_texture_shader2; - continue; - } -#endif -#ifdef GL_NV_texture_shader3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader3", 15)) - { - ret = GLEW_NV_texture_shader3; - continue; - } -#endif -#ifdef GL_NV_transform_feedback - if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback", 18)) - { - ret = GLEW_NV_transform_feedback; - continue; - } -#endif -#ifdef GL_NV_vertex_array_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18)) - { - ret = GLEW_NV_vertex_array_range; - continue; - } -#endif -#ifdef GL_NV_vertex_array_range2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range2", 19)) - { - ret = GLEW_NV_vertex_array_range2; - continue; - } -#endif -#ifdef GL_NV_vertex_program - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14)) - { - ret = GLEW_NV_vertex_program; - continue; - } -#endif -#ifdef GL_NV_vertex_program1_1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program1_1", 17)) - { - ret = GLEW_NV_vertex_program1_1; - continue; - } -#endif -#ifdef GL_NV_vertex_program2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2", 15)) - { - ret = GLEW_NV_vertex_program2; - continue; - } -#endif -#ifdef GL_NV_vertex_program2_option - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2_option", 22)) - { - ret = GLEW_NV_vertex_program2_option; - continue; - } -#endif -#ifdef GL_NV_vertex_program3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program3", 15)) - { - ret = GLEW_NV_vertex_program3; - continue; - } -#endif -#ifdef GL_NV_vertex_program4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program4", 15)) - { - ret = GLEW_NV_vertex_program4; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"OES_", 4)) - { -#ifdef GL_OES_byte_coordinates - if (_glewStrSame3(&pos, &len, (const GLubyte*)"byte_coordinates", 16)) - { - ret = GLEW_OES_byte_coordinates; - continue; - } -#endif -#ifdef GL_OES_compressed_paletted_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"compressed_paletted_texture", 27)) - { - ret = GLEW_OES_compressed_paletted_texture; - continue; - } -#endif -#ifdef GL_OES_read_format - if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_format", 11)) - { - ret = GLEW_OES_read_format; - continue; - } -#endif -#ifdef GL_OES_single_precision - if (_glewStrSame3(&pos, &len, (const GLubyte*)"single_precision", 16)) - { - ret = GLEW_OES_single_precision; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4)) - { -#ifdef GL_OML_interlace - if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9)) - { - ret = GLEW_OML_interlace; - continue; - } -#endif -#ifdef GL_OML_resample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8)) - { - ret = GLEW_OML_resample; - continue; - } -#endif -#ifdef GL_OML_subsample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"subsample", 9)) - { - ret = GLEW_OML_subsample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"PGI_", 4)) - { -#ifdef GL_PGI_misc_hints - if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_hints", 10)) - { - ret = GLEW_PGI_misc_hints; - continue; - } -#endif -#ifdef GL_PGI_vertex_hints - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_hints", 12)) - { - ret = GLEW_PGI_vertex_hints; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"REND_", 5)) - { -#ifdef GL_REND_screen_coordinates - if (_glewStrSame3(&pos, &len, (const GLubyte*)"screen_coordinates", 18)) - { - ret = GLEW_REND_screen_coordinates; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"S3_", 3)) - { -#ifdef GL_S3_s3tc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"s3tc", 4)) - { - ret = GLEW_S3_s3tc; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5)) - { -#ifdef GL_SGIS_color_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11)) - { - ret = GLEW_SGIS_color_range; - continue; - } -#endif -#ifdef GL_SGIS_detail_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"detail_texture", 14)) - { - ret = GLEW_SGIS_detail_texture; - continue; - } -#endif -#ifdef GL_SGIS_fog_function - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_function", 12)) - { - ret = GLEW_SGIS_fog_function; - continue; - } -#endif -#ifdef GL_SGIS_generate_mipmap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"generate_mipmap", 15)) - { - ret = GLEW_SGIS_generate_mipmap; - continue; - } -#endif -#ifdef GL_SGIS_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLEW_SGIS_multisample; - continue; - } -#endif -#ifdef GL_SGIS_pixel_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13)) - { - ret = GLEW_SGIS_pixel_texture; - continue; - } -#endif -#ifdef GL_SGIS_point_line_texgen - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_line_texgen", 17)) - { - ret = GLEW_SGIS_point_line_texgen; - continue; - } -#endif -#ifdef GL_SGIS_sharpen_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"sharpen_texture", 15)) - { - ret = GLEW_SGIS_sharpen_texture; - continue; - } -#endif -#ifdef GL_SGIS_texture4D - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture4D", 9)) - { - ret = GLEW_SGIS_texture4D; - continue; - } -#endif -#ifdef GL_SGIS_texture_border_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20)) - { - ret = GLEW_SGIS_texture_border_clamp; - continue; - } -#endif -#ifdef GL_SGIS_texture_edge_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18)) - { - ret = GLEW_SGIS_texture_edge_clamp; - continue; - } -#endif -#ifdef GL_SGIS_texture_filter4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter4", 15)) - { - ret = GLEW_SGIS_texture_filter4; - continue; - } -#endif -#ifdef GL_SGIS_texture_lod - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod", 11)) - { - ret = GLEW_SGIS_texture_lod; - continue; - } -#endif -#ifdef GL_SGIS_texture_select - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_select", 14)) - { - ret = GLEW_SGIS_texture_select; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5)) - { -#ifdef GL_SGIX_async - if (_glewStrSame3(&pos, &len, (const GLubyte*)"async", 5)) - { - ret = GLEW_SGIX_async; - continue; - } -#endif -#ifdef GL_SGIX_async_histogram - if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_histogram", 15)) - { - ret = GLEW_SGIX_async_histogram; - continue; - } -#endif -#ifdef GL_SGIX_async_pixel - if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_pixel", 11)) - { - ret = GLEW_SGIX_async_pixel; - continue; - } -#endif -#ifdef GL_SGIX_blend_alpha_minmax - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_alpha_minmax", 18)) - { - ret = GLEW_SGIX_blend_alpha_minmax; - continue; - } -#endif -#ifdef GL_SGIX_clipmap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"clipmap", 7)) - { - ret = GLEW_SGIX_clipmap; - continue; - } -#endif -#ifdef GL_SGIX_convolution_accuracy - if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_accuracy", 20)) - { - ret = GLEW_SGIX_convolution_accuracy; - continue; - } -#endif -#ifdef GL_SGIX_depth_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13)) - { - ret = GLEW_SGIX_depth_texture; - continue; - } -#endif -#ifdef GL_SGIX_flush_raster - if (_glewStrSame3(&pos, &len, (const GLubyte*)"flush_raster", 12)) - { - ret = GLEW_SGIX_flush_raster; - continue; - } -#endif -#ifdef GL_SGIX_fog_offset - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_offset", 10)) - { - ret = GLEW_SGIX_fog_offset; - continue; - } -#endif -#ifdef GL_SGIX_fog_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_texture", 11)) - { - ret = GLEW_SGIX_fog_texture; - continue; - } -#endif -#ifdef GL_SGIX_fragment_specular_lighting - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_specular_lighting", 26)) - { - ret = GLEW_SGIX_fragment_specular_lighting; - continue; - } -#endif -#ifdef GL_SGIX_framezoom - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framezoom", 9)) - { - ret = GLEW_SGIX_framezoom; - continue; - } -#endif -#ifdef GL_SGIX_interlace - if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9)) - { - ret = GLEW_SGIX_interlace; - continue; - } -#endif -#ifdef GL_SGIX_ir_instrument1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"ir_instrument1", 14)) - { - ret = GLEW_SGIX_ir_instrument1; - continue; - } -#endif -#ifdef GL_SGIX_list_priority - if (_glewStrSame3(&pos, &len, (const GLubyte*)"list_priority", 13)) - { - ret = GLEW_SGIX_list_priority; - continue; - } -#endif -#ifdef GL_SGIX_pixel_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13)) - { - ret = GLEW_SGIX_pixel_texture; - continue; - } -#endif -#ifdef GL_SGIX_pixel_texture_bits - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture_bits", 18)) - { - ret = GLEW_SGIX_pixel_texture_bits; - continue; - } -#endif -#ifdef GL_SGIX_reference_plane - if (_glewStrSame3(&pos, &len, (const GLubyte*)"reference_plane", 15)) - { - ret = GLEW_SGIX_reference_plane; - continue; - } -#endif -#ifdef GL_SGIX_resample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8)) - { - ret = GLEW_SGIX_resample; - continue; - } -#endif -#ifdef GL_SGIX_shadow - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6)) - { - ret = GLEW_SGIX_shadow; - continue; - } -#endif -#ifdef GL_SGIX_shadow_ambient - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14)) - { - ret = GLEW_SGIX_shadow_ambient; - continue; - } -#endif -#ifdef GL_SGIX_sprite - if (_glewStrSame3(&pos, &len, (const GLubyte*)"sprite", 6)) - { - ret = GLEW_SGIX_sprite; - continue; - } -#endif -#ifdef GL_SGIX_tag_sample_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"tag_sample_buffer", 17)) - { - ret = GLEW_SGIX_tag_sample_buffer; - continue; - } -#endif -#ifdef GL_SGIX_texture_add_env - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_add_env", 15)) - { - ret = GLEW_SGIX_texture_add_env; - continue; - } -#endif -#ifdef GL_SGIX_texture_coordinate_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_coordinate_clamp", 24)) - { - ret = GLEW_SGIX_texture_coordinate_clamp; - continue; - } -#endif -#ifdef GL_SGIX_texture_lod_bias - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16)) - { - ret = GLEW_SGIX_texture_lod_bias; - continue; - } -#endif -#ifdef GL_SGIX_texture_multi_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_multi_buffer", 20)) - { - ret = GLEW_SGIX_texture_multi_buffer; - continue; - } -#endif -#ifdef GL_SGIX_texture_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13)) - { - ret = GLEW_SGIX_texture_range; - continue; - } -#endif -#ifdef GL_SGIX_texture_scale_bias - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scale_bias", 18)) - { - ret = GLEW_SGIX_texture_scale_bias; - continue; - } -#endif -#ifdef GL_SGIX_vertex_preclip - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip", 14)) - { - ret = GLEW_SGIX_vertex_preclip; - continue; - } -#endif -#ifdef GL_SGIX_vertex_preclip_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip_hint", 19)) - { - ret = GLEW_SGIX_vertex_preclip_hint; - continue; - } -#endif -#ifdef GL_SGIX_ycrcb - if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycrcb", 5)) - { - ret = GLEW_SGIX_ycrcb; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4)) - { -#ifdef GL_SGI_color_matrix - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_matrix", 12)) - { - ret = GLEW_SGI_color_matrix; - continue; - } -#endif -#ifdef GL_SGI_color_table - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_table", 11)) - { - ret = GLEW_SGI_color_table; - continue; - } -#endif -#ifdef GL_SGI_texture_color_table - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_color_table", 19)) - { - ret = GLEW_SGI_texture_color_table; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUNX_", 5)) - { -#ifdef GL_SUNX_constant_data - if (_glewStrSame3(&pos, &len, (const GLubyte*)"constant_data", 13)) - { - ret = GLEW_SUNX_constant_data; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4)) - { -#ifdef GL_SUN_convolution_border_modes - if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24)) - { - ret = GLEW_SUN_convolution_border_modes; - continue; - } -#endif -#ifdef GL_SUN_global_alpha - if (_glewStrSame3(&pos, &len, (const GLubyte*)"global_alpha", 12)) - { - ret = GLEW_SUN_global_alpha; - continue; - } -#endif -#ifdef GL_SUN_mesh_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"mesh_array", 10)) - { - ret = GLEW_SUN_mesh_array; - continue; - } -#endif -#ifdef GL_SUN_read_video_pixels - if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_video_pixels", 17)) - { - ret = GLEW_SUN_read_video_pixels; - continue; - } -#endif -#ifdef GL_SUN_slice_accum - if (_glewStrSame3(&pos, &len, (const GLubyte*)"slice_accum", 11)) - { - ret = GLEW_SUN_slice_accum; - continue; - } -#endif -#ifdef GL_SUN_triangle_list - if (_glewStrSame3(&pos, &len, (const GLubyte*)"triangle_list", 13)) - { - ret = GLEW_SUN_triangle_list; - continue; - } -#endif -#ifdef GL_SUN_vertex - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex", 6)) - { - ret = GLEW_SUN_vertex; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"WIN_", 4)) - { -#ifdef GL_WIN_phong_shading - if (_glewStrSame3(&pos, &len, (const GLubyte*)"phong_shading", 13)) - { - ret = GLEW_WIN_phong_shading; - continue; - } -#endif -#ifdef GL_WIN_specular_fog - if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_fog", 12)) - { - ret = GLEW_WIN_specular_fog; - continue; - } -#endif -#ifdef GL_WIN_swap_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_hint", 9)) - { - ret = GLEW_WIN_swap_hint; - continue; - } -#endif - } - } - ret = (len == 0); - } - return ret; -} - -#if defined(_WIN32) - -#if defined(GLEW_MX) -GLboolean wglewContextIsSupported (WGLEWContext* ctx, const char* name) -#else -GLboolean wglewIsSupported (const char* name) -#endif -{ - GLubyte* pos = (GLubyte*)name; - GLuint len = _glewStrLen(pos); - GLboolean ret = GL_TRUE; - while (ret && len > 0) - { - if (_glewStrSame1(&pos, &len, (const GLubyte*)"WGL_", 4)) - { - if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5)) - { -#ifdef WGL_3DFX_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = WGLEW_3DFX_multisample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DL_", 4)) - { -#ifdef WGL_3DL_stereo_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"stereo_control", 14)) - { - ret = WGLEW_3DL_stereo_control; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4)) - { -#ifdef WGL_ARB_buffer_region - if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13)) - { - ret = WGLEW_ARB_buffer_region; - continue; - } -#endif -#ifdef WGL_ARB_create_context - if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context", 14)) - { - ret = WGLEW_ARB_create_context; - continue; - } -#endif -#ifdef WGL_ARB_extensions_string - if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17)) - { - ret = WGLEW_ARB_extensions_string; - continue; - } -#endif -#ifdef WGL_ARB_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = WGLEW_ARB_framebuffer_sRGB; - continue; - } -#endif -#ifdef WGL_ARB_make_current_read - if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17)) - { - ret = WGLEW_ARB_make_current_read; - continue; - } -#endif -#ifdef WGL_ARB_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = WGLEW_ARB_multisample; - continue; - } -#endif -#ifdef WGL_ARB_pbuffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7)) - { - ret = WGLEW_ARB_pbuffer; - continue; - } -#endif -#ifdef WGL_ARB_pixel_format - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12)) - { - ret = WGLEW_ARB_pixel_format; - continue; - } -#endif -#ifdef WGL_ARB_pixel_format_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18)) - { - ret = WGLEW_ARB_pixel_format_float; - continue; - } -#endif -#ifdef WGL_ARB_render_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14)) - { - ret = WGLEW_ARB_render_texture; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4)) - { -#ifdef WGL_ATI_pixel_format_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18)) - { - ret = WGLEW_ATI_pixel_format_float; - continue; - } -#endif -#ifdef WGL_ATI_render_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24)) - { - ret = WGLEW_ATI_render_texture_rectangle; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4)) - { -#ifdef WGL_EXT_depth_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_float", 11)) - { - ret = WGLEW_EXT_depth_float; - continue; - } -#endif -#ifdef WGL_EXT_display_color_table - if (_glewStrSame3(&pos, &len, (const GLubyte*)"display_color_table", 19)) - { - ret = WGLEW_EXT_display_color_table; - continue; - } -#endif -#ifdef WGL_EXT_extensions_string - if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17)) - { - ret = WGLEW_EXT_extensions_string; - continue; - } -#endif -#ifdef WGL_EXT_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = WGLEW_EXT_framebuffer_sRGB; - continue; - } -#endif -#ifdef WGL_EXT_make_current_read - if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17)) - { - ret = WGLEW_EXT_make_current_read; - continue; - } -#endif -#ifdef WGL_EXT_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = WGLEW_EXT_multisample; - continue; - } -#endif -#ifdef WGL_EXT_pbuffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7)) - { - ret = WGLEW_EXT_pbuffer; - continue; - } -#endif -#ifdef WGL_EXT_pixel_format - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12)) - { - ret = WGLEW_EXT_pixel_format; - continue; - } -#endif -#ifdef WGL_EXT_pixel_format_packed_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_packed_float", 25)) - { - ret = WGLEW_EXT_pixel_format_packed_float; - continue; - } -#endif -#ifdef WGL_EXT_swap_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12)) - { - ret = WGLEW_EXT_swap_control; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"I3D_", 4)) - { -#ifdef WGL_I3D_digital_video_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"digital_video_control", 21)) - { - ret = WGLEW_I3D_digital_video_control; - continue; - } -#endif -#ifdef WGL_I3D_gamma - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gamma", 5)) - { - ret = WGLEW_I3D_gamma; - continue; - } -#endif -#ifdef WGL_I3D_genlock - if (_glewStrSame3(&pos, &len, (const GLubyte*)"genlock", 7)) - { - ret = WGLEW_I3D_genlock; - continue; - } -#endif -#ifdef WGL_I3D_image_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_buffer", 12)) - { - ret = WGLEW_I3D_image_buffer; - continue; - } -#endif -#ifdef WGL_I3D_swap_frame_lock - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_lock", 15)) - { - ret = WGLEW_I3D_swap_frame_lock; - continue; - } -#endif -#ifdef WGL_I3D_swap_frame_usage - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_usage", 16)) - { - ret = WGLEW_I3D_swap_frame_usage; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3)) - { -#ifdef WGL_NV_float_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12)) - { - ret = WGLEW_NV_float_buffer; - continue; - } -#endif -#ifdef WGL_NV_gpu_affinity - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_affinity", 12)) - { - ret = WGLEW_NV_gpu_affinity; - continue; - } -#endif -#ifdef WGL_NV_present_video - if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13)) - { - ret = WGLEW_NV_present_video; - continue; - } -#endif -#ifdef WGL_NV_render_depth_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_depth_texture", 20)) - { - ret = WGLEW_NV_render_depth_texture; - continue; - } -#endif -#ifdef WGL_NV_render_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24)) - { - ret = WGLEW_NV_render_texture_rectangle; - continue; - } -#endif -#ifdef WGL_NV_swap_group - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10)) - { - ret = WGLEW_NV_swap_group; - continue; - } -#endif -#ifdef WGL_NV_vertex_array_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18)) - { - ret = WGLEW_NV_vertex_array_range; - continue; - } -#endif -#ifdef WGL_NV_video_output - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_output", 12)) - { - ret = WGLEW_NV_video_output; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4)) - { -#ifdef WGL_OML_sync_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12)) - { - ret = WGLEW_OML_sync_control; - continue; - } -#endif - } - } - ret = (len == 0); - } - return ret; -} - -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) - -#if defined(GLEW_MX) -GLboolean glxewContextIsSupported (GLXEWContext* ctx, const char* name) -#else -GLboolean glxewIsSupported (const char* name) -#endif -{ - GLubyte* pos = (GLubyte*)name; - GLuint len = _glewStrLen(pos); - GLboolean ret = GL_TRUE; - while (ret && len > 0) - { - if(_glewStrSame1(&pos, &len, (const GLubyte*)"GLX_", 4)) - { - if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8)) - { -#ifdef GLX_VERSION_1_2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3)) - { - ret = GLXEW_VERSION_1_2; - continue; - } -#endif -#ifdef GLX_VERSION_1_3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3)) - { - ret = GLXEW_VERSION_1_3; - continue; - } -#endif -#ifdef GLX_VERSION_1_4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3)) - { - ret = GLXEW_VERSION_1_4; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5)) - { -#ifdef GLX_3DFX_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLXEW_3DFX_multisample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4)) - { -#ifdef GLX_ARB_create_context - if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context", 14)) - { - ret = GLXEW_ARB_create_context; - continue; - } -#endif -#ifdef GLX_ARB_fbconfig_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig_float", 14)) - { - ret = GLXEW_ARB_fbconfig_float; - continue; - } -#endif -#ifdef GLX_ARB_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = GLXEW_ARB_framebuffer_sRGB; - continue; - } -#endif -#ifdef GLX_ARB_get_proc_address - if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_proc_address", 16)) - { - ret = GLXEW_ARB_get_proc_address; - continue; - } -#endif -#ifdef GLX_ARB_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLXEW_ARB_multisample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4)) - { -#ifdef GLX_ATI_pixel_format_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18)) - { - ret = GLXEW_ATI_pixel_format_float; - continue; - } -#endif -#ifdef GLX_ATI_render_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14)) - { - ret = GLXEW_ATI_render_texture; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4)) - { -#ifdef GLX_EXT_fbconfig_packed_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig_packed_float", 21)) - { - ret = GLXEW_EXT_fbconfig_packed_float; - continue; - } -#endif -#ifdef GLX_EXT_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = GLXEW_EXT_framebuffer_sRGB; - continue; - } -#endif -#ifdef GLX_EXT_import_context - if (_glewStrSame3(&pos, &len, (const GLubyte*)"import_context", 14)) - { - ret = GLXEW_EXT_import_context; - continue; - } -#endif -#ifdef GLX_EXT_scene_marker - if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12)) - { - ret = GLXEW_EXT_scene_marker; - continue; - } -#endif -#ifdef GLX_EXT_texture_from_pixmap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_from_pixmap", 19)) - { - ret = GLXEW_EXT_texture_from_pixmap; - continue; - } -#endif -#ifdef GLX_EXT_visual_info - if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_info", 11)) - { - ret = GLXEW_EXT_visual_info; - continue; - } -#endif -#ifdef GLX_EXT_visual_rating - if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_rating", 13)) - { - ret = GLXEW_EXT_visual_rating; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5)) - { -#ifdef GLX_MESA_agp_offset - if (_glewStrSame3(&pos, &len, (const GLubyte*)"agp_offset", 10)) - { - ret = GLXEW_MESA_agp_offset; - continue; - } -#endif -#ifdef GLX_MESA_copy_sub_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_sub_buffer", 15)) - { - ret = GLXEW_MESA_copy_sub_buffer; - continue; - } -#endif -#ifdef GLX_MESA_pixmap_colormap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixmap_colormap", 15)) - { - ret = GLXEW_MESA_pixmap_colormap; - continue; - } -#endif -#ifdef GLX_MESA_release_buffers - if (_glewStrSame3(&pos, &len, (const GLubyte*)"release_buffers", 15)) - { - ret = GLXEW_MESA_release_buffers; - continue; - } -#endif -#ifdef GLX_MESA_set_3dfx_mode - if (_glewStrSame3(&pos, &len, (const GLubyte*)"set_3dfx_mode", 13)) - { - ret = GLXEW_MESA_set_3dfx_mode; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3)) - { -#ifdef GLX_NV_float_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12)) - { - ret = GLXEW_NV_float_buffer; - continue; - } -#endif -#ifdef GLX_NV_present_video - if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13)) - { - ret = GLXEW_NV_present_video; - continue; - } -#endif -#ifdef GLX_NV_swap_group - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10)) - { - ret = GLXEW_NV_swap_group; - continue; - } -#endif -#ifdef GLX_NV_vertex_array_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18)) - { - ret = GLXEW_NV_vertex_array_range; - continue; - } -#endif -#ifdef GLX_NV_video_output - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_output", 12)) - { - ret = GLXEW_NV_video_output; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4)) - { -#ifdef GLX_OML_swap_method - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_method", 11)) - { - ret = GLXEW_OML_swap_method; - continue; - } -#endif -#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -#include - if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12)) - { - ret = GLXEW_OML_sync_control; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5)) - { -#ifdef GLX_SGIS_blended_overlay - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blended_overlay", 15)) - { - ret = GLXEW_SGIS_blended_overlay; - continue; - } -#endif -#ifdef GLX_SGIS_color_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11)) - { - ret = GLXEW_SGIS_color_range; - continue; - } -#endif -#ifdef GLX_SGIS_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLXEW_SGIS_multisample; - continue; - } -#endif -#ifdef GLX_SGIS_shared_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_multisample", 18)) - { - ret = GLXEW_SGIS_shared_multisample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5)) - { -#ifdef GLX_SGIX_fbconfig - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig", 8)) - { - ret = GLXEW_SGIX_fbconfig; - continue; - } -#endif -#ifdef GLX_SGIX_hyperpipe - if (_glewStrSame3(&pos, &len, (const GLubyte*)"hyperpipe", 9)) - { - ret = GLXEW_SGIX_hyperpipe; - continue; - } -#endif -#ifdef GLX_SGIX_pbuffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7)) - { - ret = GLXEW_SGIX_pbuffer; - continue; - } -#endif -#ifdef GLX_SGIX_swap_barrier - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_barrier", 12)) - { - ret = GLXEW_SGIX_swap_barrier; - continue; - } -#endif -#ifdef GLX_SGIX_swap_group - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10)) - { - ret = GLXEW_SGIX_swap_group; - continue; - } -#endif -#ifdef GLX_SGIX_video_resize - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12)) - { - ret = GLXEW_SGIX_video_resize; - continue; - } -#endif -#ifdef GLX_SGIX_visual_select_group - if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_select_group", 19)) - { - ret = GLXEW_SGIX_visual_select_group; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4)) - { -#ifdef GLX_SGI_cushion - if (_glewStrSame3(&pos, &len, (const GLubyte*)"cushion", 7)) - { - ret = GLXEW_SGI_cushion; - continue; - } -#endif -#ifdef GLX_SGI_make_current_read - if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17)) - { - ret = GLXEW_SGI_make_current_read; - continue; - } -#endif -#ifdef GLX_SGI_swap_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12)) - { - ret = GLXEW_SGI_swap_control; - continue; - } -#endif -#ifdef GLX_SGI_video_sync - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_sync", 10)) - { - ret = GLXEW_SGI_video_sync; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4)) - { -#ifdef GLX_SUN_get_transparent_index - if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_transparent_index", 21)) - { - ret = GLXEW_SUN_get_transparent_index; - continue; - } -#endif -#ifdef GLX_SUN_video_resize - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12)) - { - ret = GLXEW_SUN_video_resize; - continue; - } -#endif - } - } - ret = (len == 0); - } - return ret; -} - -#endif /* _WIN32 */ diff --git a/opengl/glew.h b/opengl/glew.h deleted file mode 100644 index fae0c216..00000000 --- a/opengl/glew.h +++ /dev/null @@ -1,20113 +0,0 @@ -/* -** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2015, Nigel Stewart -** Copyright (C) 2002-2008, Milan Ikits -** Copyright (C) 2002-2008, Marcelo E. Magallon -** Copyright (C) 2002, Lev Povalahev -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are met: -** -** * Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** * The name of the author may be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -** THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * Mesa 3-D graphics library - * Version: 7.0 - * - * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/* -** Copyright (c) 2007 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -#ifndef __glew_h__ -#define __glew_h__ -#define __GLEW_H__ - -#if defined(__gl_h_) || defined(__GL_H__) || defined(_GL_H) || defined(__X_GL_H) -#error gl.h included before glew.h -#endif -#if defined(__gl2_h_) -#error gl2.h included before glew.h -#endif -#if defined(__gltypes_h_) -#error gltypes.h included before glew.h -#endif -#if defined(__REGAL_H__) -#error Regal.h included before glew.h -#endif -#if defined(__glext_h_) || defined(__GLEXT_H_) -#error glext.h included before glew.h -#endif -#if defined(__gl_ATI_h_) -#error glATI.h included before glew.h -#endif - -#define __gl_h_ -#define __gl2_h_ -#define __GL_H__ -#define _GL_H -#define __gltypes_h_ -#define __REGAL_H__ -#define __X_GL_H -#define __glext_h_ -#define __GLEXT_H_ -#define __gl_ATI_h_ - -#if defined(_WIN32) - -/* - * GLEW does not include to avoid name space pollution. - * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t - * defined properly. - */ -/* and */ -#ifdef APIENTRY -# ifndef GLAPIENTRY -# define GLAPIENTRY APIENTRY -# endif -# ifndef GLEWAPIENTRY -# define GLEWAPIENTRY APIENTRY -# endif -#else -#define GLEW_APIENTRY_DEFINED -# if defined(__MINGW32__) || defined(__CYGWIN__) || (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__) -# define APIENTRY __stdcall -# ifndef GLAPIENTRY -# define GLAPIENTRY __stdcall -# endif -# ifndef GLEWAPIENTRY -# define GLEWAPIENTRY __stdcall -# endif -# else -# define APIENTRY -# endif -#endif -#ifndef GLAPI -# if defined(__MINGW32__) || defined(__CYGWIN__) -# define GLAPI extern -# endif -#endif -/* */ -#ifndef CALLBACK -#define GLEW_CALLBACK_DEFINED -# if defined(__MINGW32__) || defined(__CYGWIN__) -# define CALLBACK __attribute__ ((__stdcall__)) -# elif (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS) -# define CALLBACK __stdcall -# else -# define CALLBACK -# endif -#endif -/* and */ -#ifndef WINGDIAPI -#define GLEW_WINGDIAPI_DEFINED -#define WINGDIAPI __declspec(dllimport) -#endif -/* */ -#if (defined(_MSC_VER) || defined(__BORLANDC__)) && !defined(_WCHAR_T_DEFINED) -typedef unsigned short wchar_t; -# define _WCHAR_T_DEFINED -#endif -/* */ -#if !defined(_W64) -# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && defined(_MSC_VER) && _MSC_VER >= 1300 -# define _W64 __w64 -# else -# define _W64 -# endif -#endif -#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_) && !defined(__MINGW64__) -# ifdef _WIN64 -typedef __int64 ptrdiff_t; -# else -typedef _W64 int ptrdiff_t; -# endif -# define _PTRDIFF_T_DEFINED -# define _PTRDIFF_T_ -#endif - -#ifndef GLAPI -# if defined(__MINGW32__) || defined(__CYGWIN__) -# define GLAPI extern -# else -# define GLAPI WINGDIAPI -# endif -#endif - -/* - * GLEW_STATIC is defined for static library. - * GLEW_BUILD is defined for building the DLL library. - */ - -#ifdef GLEW_STATIC -# define GLEWAPI extern -#else -# ifdef GLEW_BUILD -# define GLEWAPI extern __declspec(dllexport) -# else -# define GLEWAPI extern __declspec(dllimport) -# endif -#endif - -#else /* _UNIX */ - -/* - * Needed for ptrdiff_t in turn needed by VBO. This is defined by ISO - * C. On my system, this amounts to _3 lines_ of included code, all of - * them pretty much harmless. If you know of a way of detecting 32 vs - * 64 _targets_ at compile time you are free to replace this with - * something that's portable. For now, _this_ is the portable solution. - * (mem, 2004-01-04) - */ - -#include - -/* SGI MIPSPro doesn't like stdint.h in C++ mode */ -/* ID: 3376260 Solaris 9 has inttypes.h, but not stdint.h */ - -#if (defined(__sgi) || defined(__sun)) && !defined(__GNUC__) -#include -#else -#include -#endif - -#define GLEW_APIENTRY_DEFINED -#define APIENTRY - -/* - * GLEW_STATIC is defined for static library. - */ - -#ifdef GLEW_STATIC -# define GLEWAPI extern -#else -# if defined(__GNUC__) && __GNUC__>=4 -# define GLEWAPI extern __attribute__ ((visibility("default"))) -# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) -# define GLEWAPI extern __global -# else -# define GLEWAPI extern -# endif -#endif - -/* */ -#ifndef GLAPI -#define GLAPI extern -#endif - -#endif /* _WIN32 */ - -#ifndef GLAPIENTRY -#define GLAPIENTRY -#endif - -#ifndef GLEWAPIENTRY -#define GLEWAPIENTRY -#endif - -#define GLEW_VAR_EXPORT GLEWAPI -#define GLEW_FUN_EXPORT GLEWAPI - -#ifdef __cplusplus -extern "C" { -#endif - -/* ----------------------------- GL_VERSION_1_1 ---------------------------- */ - -#ifndef GL_VERSION_1_1 -#define GL_VERSION_1_1 1 - -typedef unsigned int GLenum; -typedef unsigned int GLbitfield; -typedef unsigned int GLuint; -typedef int GLint; -typedef int GLsizei; -typedef unsigned char GLboolean; -typedef signed char GLbyte; -typedef short GLshort; -typedef unsigned char GLubyte; -typedef unsigned short GLushort; -typedef unsigned long GLulong; -typedef float GLfloat; -typedef float GLclampf; -typedef double GLdouble; -typedef double GLclampd; -typedef void GLvoid; -#if defined(_MSC_VER) && _MSC_VER < 1400 -typedef __int64 GLint64EXT; -typedef unsigned __int64 GLuint64EXT; -#elif defined(_MSC_VER) || defined(__BORLANDC__) -typedef signed long long GLint64EXT; -typedef unsigned long long GLuint64EXT; -#else -# if defined(__MINGW32__) || defined(__CYGWIN__) -#include -# endif -typedef int64_t GLint64EXT; -typedef uint64_t GLuint64EXT; -#endif -typedef GLint64EXT GLint64; -typedef GLuint64EXT GLuint64; -typedef struct __GLsync *GLsync; - -typedef char GLchar; - -#define GL_ZERO 0 -#define GL_FALSE 0 -#define GL_LOGIC_OP 0x0BF1 -#define GL_NONE 0 -#define GL_TEXTURE_COMPONENTS 0x1003 -#define GL_NO_ERROR 0 -#define GL_POINTS 0x0000 -#define GL_CURRENT_BIT 0x00000001 -#define GL_TRUE 1 -#define GL_ONE 1 -#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001 -#define GL_LINES 0x0001 -#define GL_LINE_LOOP 0x0002 -#define GL_POINT_BIT 0x00000002 -#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 -#define GL_LINE_STRIP 0x0003 -#define GL_LINE_BIT 0x00000004 -#define GL_TRIANGLES 0x0004 -#define GL_TRIANGLE_STRIP 0x0005 -#define GL_TRIANGLE_FAN 0x0006 -#define GL_QUADS 0x0007 -#define GL_QUAD_STRIP 0x0008 -#define GL_POLYGON_BIT 0x00000008 -#define GL_POLYGON 0x0009 -#define GL_POLYGON_STIPPLE_BIT 0x00000010 -#define GL_PIXEL_MODE_BIT 0x00000020 -#define GL_LIGHTING_BIT 0x00000040 -#define GL_FOG_BIT 0x00000080 -#define GL_DEPTH_BUFFER_BIT 0x00000100 -#define GL_ACCUM 0x0100 -#define GL_LOAD 0x0101 -#define GL_RETURN 0x0102 -#define GL_MULT 0x0103 -#define GL_ADD 0x0104 -#define GL_NEVER 0x0200 -#define GL_ACCUM_BUFFER_BIT 0x00000200 -#define GL_LESS 0x0201 -#define GL_EQUAL 0x0202 -#define GL_LEQUAL 0x0203 -#define GL_GREATER 0x0204 -#define GL_NOTEQUAL 0x0205 -#define GL_GEQUAL 0x0206 -#define GL_ALWAYS 0x0207 -#define GL_SRC_COLOR 0x0300 -#define GL_ONE_MINUS_SRC_COLOR 0x0301 -#define GL_SRC_ALPHA 0x0302 -#define GL_ONE_MINUS_SRC_ALPHA 0x0303 -#define GL_DST_ALPHA 0x0304 -#define GL_ONE_MINUS_DST_ALPHA 0x0305 -#define GL_DST_COLOR 0x0306 -#define GL_ONE_MINUS_DST_COLOR 0x0307 -#define GL_SRC_ALPHA_SATURATE 0x0308 -#define GL_STENCIL_BUFFER_BIT 0x00000400 -#define GL_FRONT_LEFT 0x0400 -#define GL_FRONT_RIGHT 0x0401 -#define GL_BACK_LEFT 0x0402 -#define GL_BACK_RIGHT 0x0403 -#define GL_FRONT 0x0404 -#define GL_BACK 0x0405 -#define GL_LEFT 0x0406 -#define GL_RIGHT 0x0407 -#define GL_FRONT_AND_BACK 0x0408 -#define GL_AUX0 0x0409 -#define GL_AUX1 0x040A -#define GL_AUX2 0x040B -#define GL_AUX3 0x040C -#define GL_INVALID_ENUM 0x0500 -#define GL_INVALID_VALUE 0x0501 -#define GL_INVALID_OPERATION 0x0502 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 -#define GL_OUT_OF_MEMORY 0x0505 -#define GL_2D 0x0600 -#define GL_3D 0x0601 -#define GL_3D_COLOR 0x0602 -#define GL_3D_COLOR_TEXTURE 0x0603 -#define GL_4D_COLOR_TEXTURE 0x0604 -#define GL_PASS_THROUGH_TOKEN 0x0700 -#define GL_POINT_TOKEN 0x0701 -#define GL_LINE_TOKEN 0x0702 -#define GL_POLYGON_TOKEN 0x0703 -#define GL_BITMAP_TOKEN 0x0704 -#define GL_DRAW_PIXEL_TOKEN 0x0705 -#define GL_COPY_PIXEL_TOKEN 0x0706 -#define GL_LINE_RESET_TOKEN 0x0707 -#define GL_EXP 0x0800 -#define GL_VIEWPORT_BIT 0x00000800 -#define GL_EXP2 0x0801 -#define GL_CW 0x0900 -#define GL_CCW 0x0901 -#define GL_COEFF 0x0A00 -#define GL_ORDER 0x0A01 -#define GL_DOMAIN 0x0A02 -#define GL_CURRENT_COLOR 0x0B00 -#define GL_CURRENT_INDEX 0x0B01 -#define GL_CURRENT_NORMAL 0x0B02 -#define GL_CURRENT_TEXTURE_COORDS 0x0B03 -#define GL_CURRENT_RASTER_COLOR 0x0B04 -#define GL_CURRENT_RASTER_INDEX 0x0B05 -#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06 -#define GL_CURRENT_RASTER_POSITION 0x0B07 -#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08 -#define GL_CURRENT_RASTER_DISTANCE 0x0B09 -#define GL_POINT_SMOOTH 0x0B10 -#define GL_POINT_SIZE 0x0B11 -#define GL_POINT_SIZE_RANGE 0x0B12 -#define GL_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_LINE_SMOOTH 0x0B20 -#define GL_LINE_WIDTH 0x0B21 -#define GL_LINE_WIDTH_RANGE 0x0B22 -#define GL_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_LINE_STIPPLE 0x0B24 -#define GL_LINE_STIPPLE_PATTERN 0x0B25 -#define GL_LINE_STIPPLE_REPEAT 0x0B26 -#define GL_LIST_MODE 0x0B30 -#define GL_MAX_LIST_NESTING 0x0B31 -#define GL_LIST_BASE 0x0B32 -#define GL_LIST_INDEX 0x0B33 -#define GL_POLYGON_MODE 0x0B40 -#define GL_POLYGON_SMOOTH 0x0B41 -#define GL_POLYGON_STIPPLE 0x0B42 -#define GL_EDGE_FLAG 0x0B43 -#define GL_CULL_FACE 0x0B44 -#define GL_CULL_FACE_MODE 0x0B45 -#define GL_FRONT_FACE 0x0B46 -#define GL_LIGHTING 0x0B50 -#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51 -#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52 -#define GL_LIGHT_MODEL_AMBIENT 0x0B53 -#define GL_SHADE_MODEL 0x0B54 -#define GL_COLOR_MATERIAL_FACE 0x0B55 -#define GL_COLOR_MATERIAL_PARAMETER 0x0B56 -#define GL_COLOR_MATERIAL 0x0B57 -#define GL_FOG 0x0B60 -#define GL_FOG_INDEX 0x0B61 -#define GL_FOG_DENSITY 0x0B62 -#define GL_FOG_START 0x0B63 -#define GL_FOG_END 0x0B64 -#define GL_FOG_MODE 0x0B65 -#define GL_FOG_COLOR 0x0B66 -#define GL_DEPTH_RANGE 0x0B70 -#define GL_DEPTH_TEST 0x0B71 -#define GL_DEPTH_WRITEMASK 0x0B72 -#define GL_DEPTH_CLEAR_VALUE 0x0B73 -#define GL_DEPTH_FUNC 0x0B74 -#define GL_ACCUM_CLEAR_VALUE 0x0B80 -#define GL_STENCIL_TEST 0x0B90 -#define GL_STENCIL_CLEAR_VALUE 0x0B91 -#define GL_STENCIL_FUNC 0x0B92 -#define GL_STENCIL_VALUE_MASK 0x0B93 -#define GL_STENCIL_FAIL 0x0B94 -#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 -#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 -#define GL_STENCIL_REF 0x0B97 -#define GL_STENCIL_WRITEMASK 0x0B98 -#define GL_MATRIX_MODE 0x0BA0 -#define GL_NORMALIZE 0x0BA1 -#define GL_VIEWPORT 0x0BA2 -#define GL_MODELVIEW_STACK_DEPTH 0x0BA3 -#define GL_PROJECTION_STACK_DEPTH 0x0BA4 -#define GL_TEXTURE_STACK_DEPTH 0x0BA5 -#define GL_MODELVIEW_MATRIX 0x0BA6 -#define GL_PROJECTION_MATRIX 0x0BA7 -#define GL_TEXTURE_MATRIX 0x0BA8 -#define GL_ATTRIB_STACK_DEPTH 0x0BB0 -#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 -#define GL_ALPHA_TEST 0x0BC0 -#define GL_ALPHA_TEST_FUNC 0x0BC1 -#define GL_ALPHA_TEST_REF 0x0BC2 -#define GL_DITHER 0x0BD0 -#define GL_BLEND_DST 0x0BE0 -#define GL_BLEND_SRC 0x0BE1 -#define GL_BLEND 0x0BE2 -#define GL_LOGIC_OP_MODE 0x0BF0 -#define GL_INDEX_LOGIC_OP 0x0BF1 -#define GL_COLOR_LOGIC_OP 0x0BF2 -#define GL_AUX_BUFFERS 0x0C00 -#define GL_DRAW_BUFFER 0x0C01 -#define GL_READ_BUFFER 0x0C02 -#define GL_SCISSOR_BOX 0x0C10 -#define GL_SCISSOR_TEST 0x0C11 -#define GL_INDEX_CLEAR_VALUE 0x0C20 -#define GL_INDEX_WRITEMASK 0x0C21 -#define GL_COLOR_CLEAR_VALUE 0x0C22 -#define GL_COLOR_WRITEMASK 0x0C23 -#define GL_INDEX_MODE 0x0C30 -#define GL_RGBA_MODE 0x0C31 -#define GL_DOUBLEBUFFER 0x0C32 -#define GL_STEREO 0x0C33 -#define GL_RENDER_MODE 0x0C40 -#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 -#define GL_POINT_SMOOTH_HINT 0x0C51 -#define GL_LINE_SMOOTH_HINT 0x0C52 -#define GL_POLYGON_SMOOTH_HINT 0x0C53 -#define GL_FOG_HINT 0x0C54 -#define GL_TEXTURE_GEN_S 0x0C60 -#define GL_TEXTURE_GEN_T 0x0C61 -#define GL_TEXTURE_GEN_R 0x0C62 -#define GL_TEXTURE_GEN_Q 0x0C63 -#define GL_PIXEL_MAP_I_TO_I 0x0C70 -#define GL_PIXEL_MAP_S_TO_S 0x0C71 -#define GL_PIXEL_MAP_I_TO_R 0x0C72 -#define GL_PIXEL_MAP_I_TO_G 0x0C73 -#define GL_PIXEL_MAP_I_TO_B 0x0C74 -#define GL_PIXEL_MAP_I_TO_A 0x0C75 -#define GL_PIXEL_MAP_R_TO_R 0x0C76 -#define GL_PIXEL_MAP_G_TO_G 0x0C77 -#define GL_PIXEL_MAP_B_TO_B 0x0C78 -#define GL_PIXEL_MAP_A_TO_A 0x0C79 -#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0 -#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1 -#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2 -#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3 -#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4 -#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5 -#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6 -#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7 -#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8 -#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9 -#define GL_UNPACK_SWAP_BYTES 0x0CF0 -#define GL_UNPACK_LSB_FIRST 0x0CF1 -#define GL_UNPACK_ROW_LENGTH 0x0CF2 -#define GL_UNPACK_SKIP_ROWS 0x0CF3 -#define GL_UNPACK_SKIP_PIXELS 0x0CF4 -#define GL_UNPACK_ALIGNMENT 0x0CF5 -#define GL_PACK_SWAP_BYTES 0x0D00 -#define GL_PACK_LSB_FIRST 0x0D01 -#define GL_PACK_ROW_LENGTH 0x0D02 -#define GL_PACK_SKIP_ROWS 0x0D03 -#define GL_PACK_SKIP_PIXELS 0x0D04 -#define GL_PACK_ALIGNMENT 0x0D05 -#define GL_MAP_COLOR 0x0D10 -#define GL_MAP_STENCIL 0x0D11 -#define GL_INDEX_SHIFT 0x0D12 -#define GL_INDEX_OFFSET 0x0D13 -#define GL_RED_SCALE 0x0D14 -#define GL_RED_BIAS 0x0D15 -#define GL_ZOOM_X 0x0D16 -#define GL_ZOOM_Y 0x0D17 -#define GL_GREEN_SCALE 0x0D18 -#define GL_GREEN_BIAS 0x0D19 -#define GL_BLUE_SCALE 0x0D1A -#define GL_BLUE_BIAS 0x0D1B -#define GL_ALPHA_SCALE 0x0D1C -#define GL_ALPHA_BIAS 0x0D1D -#define GL_DEPTH_SCALE 0x0D1E -#define GL_DEPTH_BIAS 0x0D1F -#define GL_MAX_EVAL_ORDER 0x0D30 -#define GL_MAX_LIGHTS 0x0D31 -#define GL_MAX_CLIP_PLANES 0x0D32 -#define GL_MAX_TEXTURE_SIZE 0x0D33 -#define GL_MAX_PIXEL_MAP_TABLE 0x0D34 -#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35 -#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36 -#define GL_MAX_NAME_STACK_DEPTH 0x0D37 -#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38 -#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39 -#define GL_MAX_VIEWPORT_DIMS 0x0D3A -#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B -#define GL_SUBPIXEL_BITS 0x0D50 -#define GL_INDEX_BITS 0x0D51 -#define GL_RED_BITS 0x0D52 -#define GL_GREEN_BITS 0x0D53 -#define GL_BLUE_BITS 0x0D54 -#define GL_ALPHA_BITS 0x0D55 -#define GL_DEPTH_BITS 0x0D56 -#define GL_STENCIL_BITS 0x0D57 -#define GL_ACCUM_RED_BITS 0x0D58 -#define GL_ACCUM_GREEN_BITS 0x0D59 -#define GL_ACCUM_BLUE_BITS 0x0D5A -#define GL_ACCUM_ALPHA_BITS 0x0D5B -#define GL_NAME_STACK_DEPTH 0x0D70 -#define GL_AUTO_NORMAL 0x0D80 -#define GL_MAP1_COLOR_4 0x0D90 -#define GL_MAP1_INDEX 0x0D91 -#define GL_MAP1_NORMAL 0x0D92 -#define GL_MAP1_TEXTURE_COORD_1 0x0D93 -#define GL_MAP1_TEXTURE_COORD_2 0x0D94 -#define GL_MAP1_TEXTURE_COORD_3 0x0D95 -#define GL_MAP1_TEXTURE_COORD_4 0x0D96 -#define GL_MAP1_VERTEX_3 0x0D97 -#define GL_MAP1_VERTEX_4 0x0D98 -#define GL_MAP2_COLOR_4 0x0DB0 -#define GL_MAP2_INDEX 0x0DB1 -#define GL_MAP2_NORMAL 0x0DB2 -#define GL_MAP2_TEXTURE_COORD_1 0x0DB3 -#define GL_MAP2_TEXTURE_COORD_2 0x0DB4 -#define GL_MAP2_TEXTURE_COORD_3 0x0DB5 -#define GL_MAP2_TEXTURE_COORD_4 0x0DB6 -#define GL_MAP2_VERTEX_3 0x0DB7 -#define GL_MAP2_VERTEX_4 0x0DB8 -#define GL_MAP1_GRID_DOMAIN 0x0DD0 -#define GL_MAP1_GRID_SEGMENTS 0x0DD1 -#define GL_MAP2_GRID_DOMAIN 0x0DD2 -#define GL_MAP2_GRID_SEGMENTS 0x0DD3 -#define GL_TEXTURE_1D 0x0DE0 -#define GL_TEXTURE_2D 0x0DE1 -#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0 -#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1 -#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2 -#define GL_SELECTION_BUFFER_POINTER 0x0DF3 -#define GL_SELECTION_BUFFER_SIZE 0x0DF4 -#define GL_TEXTURE_WIDTH 0x1000 -#define GL_TRANSFORM_BIT 0x00001000 -#define GL_TEXTURE_HEIGHT 0x1001 -#define GL_TEXTURE_INTERNAL_FORMAT 0x1003 -#define GL_TEXTURE_BORDER_COLOR 0x1004 -#define GL_TEXTURE_BORDER 0x1005 -#define GL_DONT_CARE 0x1100 -#define GL_FASTEST 0x1101 -#define GL_NICEST 0x1102 -#define GL_AMBIENT 0x1200 -#define GL_DIFFUSE 0x1201 -#define GL_SPECULAR 0x1202 -#define GL_POSITION 0x1203 -#define GL_SPOT_DIRECTION 0x1204 -#define GL_SPOT_EXPONENT 0x1205 -#define GL_SPOT_CUTOFF 0x1206 -#define GL_CONSTANT_ATTENUATION 0x1207 -#define GL_LINEAR_ATTENUATION 0x1208 -#define GL_QUADRATIC_ATTENUATION 0x1209 -#define GL_COMPILE 0x1300 -#define GL_COMPILE_AND_EXECUTE 0x1301 -#define GL_BYTE 0x1400 -#define GL_UNSIGNED_BYTE 0x1401 -#define GL_SHORT 0x1402 -#define GL_UNSIGNED_SHORT 0x1403 -#define GL_INT 0x1404 -#define GL_UNSIGNED_INT 0x1405 -#define GL_FLOAT 0x1406 -#define GL_2_BYTES 0x1407 -#define GL_3_BYTES 0x1408 -#define GL_4_BYTES 0x1409 -#define GL_DOUBLE 0x140A -#define GL_CLEAR 0x1500 -#define GL_AND 0x1501 -#define GL_AND_REVERSE 0x1502 -#define GL_COPY 0x1503 -#define GL_AND_INVERTED 0x1504 -#define GL_NOOP 0x1505 -#define GL_XOR 0x1506 -#define GL_OR 0x1507 -#define GL_NOR 0x1508 -#define GL_EQUIV 0x1509 -#define GL_INVERT 0x150A -#define GL_OR_REVERSE 0x150B -#define GL_COPY_INVERTED 0x150C -#define GL_OR_INVERTED 0x150D -#define GL_NAND 0x150E -#define GL_SET 0x150F -#define GL_EMISSION 0x1600 -#define GL_SHININESS 0x1601 -#define GL_AMBIENT_AND_DIFFUSE 0x1602 -#define GL_COLOR_INDEXES 0x1603 -#define GL_MODELVIEW 0x1700 -#define GL_PROJECTION 0x1701 -#define GL_TEXTURE 0x1702 -#define GL_COLOR 0x1800 -#define GL_DEPTH 0x1801 -#define GL_STENCIL 0x1802 -#define GL_COLOR_INDEX 0x1900 -#define GL_STENCIL_INDEX 0x1901 -#define GL_DEPTH_COMPONENT 0x1902 -#define GL_RED 0x1903 -#define GL_GREEN 0x1904 -#define GL_BLUE 0x1905 -#define GL_ALPHA 0x1906 -#define GL_RGB 0x1907 -#define GL_RGBA 0x1908 -#define GL_LUMINANCE 0x1909 -#define GL_LUMINANCE_ALPHA 0x190A -#define GL_BITMAP 0x1A00 -#define GL_POINT 0x1B00 -#define GL_LINE 0x1B01 -#define GL_FILL 0x1B02 -#define GL_RENDER 0x1C00 -#define GL_FEEDBACK 0x1C01 -#define GL_SELECT 0x1C02 -#define GL_FLAT 0x1D00 -#define GL_SMOOTH 0x1D01 -#define GL_KEEP 0x1E00 -#define GL_REPLACE 0x1E01 -#define GL_INCR 0x1E02 -#define GL_DECR 0x1E03 -#define GL_VENDOR 0x1F00 -#define GL_RENDERER 0x1F01 -#define GL_VERSION 0x1F02 -#define GL_EXTENSIONS 0x1F03 -#define GL_S 0x2000 -#define GL_ENABLE_BIT 0x00002000 -#define GL_T 0x2001 -#define GL_R 0x2002 -#define GL_Q 0x2003 -#define GL_MODULATE 0x2100 -#define GL_DECAL 0x2101 -#define GL_TEXTURE_ENV_MODE 0x2200 -#define GL_TEXTURE_ENV_COLOR 0x2201 -#define GL_TEXTURE_ENV 0x2300 -#define GL_EYE_LINEAR 0x2400 -#define GL_OBJECT_LINEAR 0x2401 -#define GL_SPHERE_MAP 0x2402 -#define GL_TEXTURE_GEN_MODE 0x2500 -#define GL_OBJECT_PLANE 0x2501 -#define GL_EYE_PLANE 0x2502 -#define GL_NEAREST 0x2600 -#define GL_LINEAR 0x2601 -#define GL_NEAREST_MIPMAP_NEAREST 0x2700 -#define GL_LINEAR_MIPMAP_NEAREST 0x2701 -#define GL_NEAREST_MIPMAP_LINEAR 0x2702 -#define GL_LINEAR_MIPMAP_LINEAR 0x2703 -#define GL_TEXTURE_MAG_FILTER 0x2800 -#define GL_TEXTURE_MIN_FILTER 0x2801 -#define GL_TEXTURE_WRAP_S 0x2802 -#define GL_TEXTURE_WRAP_T 0x2803 -#define GL_CLAMP 0x2900 -#define GL_REPEAT 0x2901 -#define GL_POLYGON_OFFSET_UNITS 0x2A00 -#define GL_POLYGON_OFFSET_POINT 0x2A01 -#define GL_POLYGON_OFFSET_LINE 0x2A02 -#define GL_R3_G3_B2 0x2A10 -#define GL_V2F 0x2A20 -#define GL_V3F 0x2A21 -#define GL_C4UB_V2F 0x2A22 -#define GL_C4UB_V3F 0x2A23 -#define GL_C3F_V3F 0x2A24 -#define GL_N3F_V3F 0x2A25 -#define GL_C4F_N3F_V3F 0x2A26 -#define GL_T2F_V3F 0x2A27 -#define GL_T4F_V4F 0x2A28 -#define GL_T2F_C4UB_V3F 0x2A29 -#define GL_T2F_C3F_V3F 0x2A2A -#define GL_T2F_N3F_V3F 0x2A2B -#define GL_T2F_C4F_N3F_V3F 0x2A2C -#define GL_T4F_C4F_N3F_V4F 0x2A2D -#define GL_CLIP_PLANE0 0x3000 -#define GL_CLIP_PLANE1 0x3001 -#define GL_CLIP_PLANE2 0x3002 -#define GL_CLIP_PLANE3 0x3003 -#define GL_CLIP_PLANE4 0x3004 -#define GL_CLIP_PLANE5 0x3005 -#define GL_LIGHT0 0x4000 -#define GL_COLOR_BUFFER_BIT 0x00004000 -#define GL_LIGHT1 0x4001 -#define GL_LIGHT2 0x4002 -#define GL_LIGHT3 0x4003 -#define GL_LIGHT4 0x4004 -#define GL_LIGHT5 0x4005 -#define GL_LIGHT6 0x4006 -#define GL_LIGHT7 0x4007 -#define GL_HINT_BIT 0x00008000 -#define GL_POLYGON_OFFSET_FILL 0x8037 -#define GL_POLYGON_OFFSET_FACTOR 0x8038 -#define GL_ALPHA4 0x803B -#define GL_ALPHA8 0x803C -#define GL_ALPHA12 0x803D -#define GL_ALPHA16 0x803E -#define GL_LUMINANCE4 0x803F -#define GL_LUMINANCE8 0x8040 -#define GL_LUMINANCE12 0x8041 -#define GL_LUMINANCE16 0x8042 -#define GL_LUMINANCE4_ALPHA4 0x8043 -#define GL_LUMINANCE6_ALPHA2 0x8044 -#define GL_LUMINANCE8_ALPHA8 0x8045 -#define GL_LUMINANCE12_ALPHA4 0x8046 -#define GL_LUMINANCE12_ALPHA12 0x8047 -#define GL_LUMINANCE16_ALPHA16 0x8048 -#define GL_INTENSITY 0x8049 -#define GL_INTENSITY4 0x804A -#define GL_INTENSITY8 0x804B -#define GL_INTENSITY12 0x804C -#define GL_INTENSITY16 0x804D -#define GL_RGB4 0x804F -#define GL_RGB5 0x8050 -#define GL_RGB8 0x8051 -#define GL_RGB10 0x8052 -#define GL_RGB12 0x8053 -#define GL_RGB16 0x8054 -#define GL_RGBA2 0x8055 -#define GL_RGBA4 0x8056 -#define GL_RGB5_A1 0x8057 -#define GL_RGBA8 0x8058 -#define GL_RGB10_A2 0x8059 -#define GL_RGBA12 0x805A -#define GL_RGBA16 0x805B -#define GL_TEXTURE_RED_SIZE 0x805C -#define GL_TEXTURE_GREEN_SIZE 0x805D -#define GL_TEXTURE_BLUE_SIZE 0x805E -#define GL_TEXTURE_ALPHA_SIZE 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE 0x8061 -#define GL_PROXY_TEXTURE_1D 0x8063 -#define GL_PROXY_TEXTURE_2D 0x8064 -#define GL_TEXTURE_PRIORITY 0x8066 -#define GL_TEXTURE_RESIDENT 0x8067 -#define GL_TEXTURE_BINDING_1D 0x8068 -#define GL_TEXTURE_BINDING_2D 0x8069 -#define GL_VERTEX_ARRAY 0x8074 -#define GL_NORMAL_ARRAY 0x8075 -#define GL_COLOR_ARRAY 0x8076 -#define GL_INDEX_ARRAY 0x8077 -#define GL_TEXTURE_COORD_ARRAY 0x8078 -#define GL_EDGE_FLAG_ARRAY 0x8079 -#define GL_VERTEX_ARRAY_SIZE 0x807A -#define GL_VERTEX_ARRAY_TYPE 0x807B -#define GL_VERTEX_ARRAY_STRIDE 0x807C -#define GL_NORMAL_ARRAY_TYPE 0x807E -#define GL_NORMAL_ARRAY_STRIDE 0x807F -#define GL_COLOR_ARRAY_SIZE 0x8081 -#define GL_COLOR_ARRAY_TYPE 0x8082 -#define GL_COLOR_ARRAY_STRIDE 0x8083 -#define GL_INDEX_ARRAY_TYPE 0x8085 -#define GL_INDEX_ARRAY_STRIDE 0x8086 -#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A -#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C -#define GL_VERTEX_ARRAY_POINTER 0x808E -#define GL_NORMAL_ARRAY_POINTER 0x808F -#define GL_COLOR_ARRAY_POINTER 0x8090 -#define GL_INDEX_ARRAY_POINTER 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093 -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_EVAL_BIT 0x00010000 -#define GL_LIST_BIT 0x00020000 -#define GL_TEXTURE_BIT 0x00040000 -#define GL_SCISSOR_BIT 0x00080000 -#define GL_ALL_ATTRIB_BITS 0x000fffff -#define GL_CLIENT_ALL_ATTRIB_BITS 0xffffffff - -GLAPI void GLAPIENTRY glAccum (GLenum op, GLfloat value); -GLAPI void GLAPIENTRY glAlphaFunc (GLenum func, GLclampf ref); -GLAPI GLboolean GLAPIENTRY glAreTexturesResident (GLsizei n, const GLuint *textures, GLboolean *residences); -GLAPI void GLAPIENTRY glArrayElement (GLint i); -GLAPI void GLAPIENTRY glBegin (GLenum mode); -GLAPI void GLAPIENTRY glBindTexture (GLenum target, GLuint texture); -GLAPI void GLAPIENTRY glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap); -GLAPI void GLAPIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor); -GLAPI void GLAPIENTRY glCallList (GLuint list); -GLAPI void GLAPIENTRY glCallLists (GLsizei n, GLenum type, const void *lists); -GLAPI void GLAPIENTRY glClear (GLbitfield mask); -GLAPI void GLAPIENTRY glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GLAPI void GLAPIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GLAPI void GLAPIENTRY glClearDepth (GLclampd depth); -GLAPI void GLAPIENTRY glClearIndex (GLfloat c); -GLAPI void GLAPIENTRY glClearStencil (GLint s); -GLAPI void GLAPIENTRY glClipPlane (GLenum plane, const GLdouble *equation); -GLAPI void GLAPIENTRY glColor3b (GLbyte red, GLbyte green, GLbyte blue); -GLAPI void GLAPIENTRY glColor3bv (const GLbyte *v); -GLAPI void GLAPIENTRY glColor3d (GLdouble red, GLdouble green, GLdouble blue); -GLAPI void GLAPIENTRY glColor3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glColor3f (GLfloat red, GLfloat green, GLfloat blue); -GLAPI void GLAPIENTRY glColor3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glColor3i (GLint red, GLint green, GLint blue); -GLAPI void GLAPIENTRY glColor3iv (const GLint *v); -GLAPI void GLAPIENTRY glColor3s (GLshort red, GLshort green, GLshort blue); -GLAPI void GLAPIENTRY glColor3sv (const GLshort *v); -GLAPI void GLAPIENTRY glColor3ub (GLubyte red, GLubyte green, GLubyte blue); -GLAPI void GLAPIENTRY glColor3ubv (const GLubyte *v); -GLAPI void GLAPIENTRY glColor3ui (GLuint red, GLuint green, GLuint blue); -GLAPI void GLAPIENTRY glColor3uiv (const GLuint *v); -GLAPI void GLAPIENTRY glColor3us (GLushort red, GLushort green, GLushort blue); -GLAPI void GLAPIENTRY glColor3usv (const GLushort *v); -GLAPI void GLAPIENTRY glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); -GLAPI void GLAPIENTRY glColor4bv (const GLbyte *v); -GLAPI void GLAPIENTRY glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); -GLAPI void GLAPIENTRY glColor4dv (const GLdouble *v); -GLAPI void GLAPIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GLAPI void GLAPIENTRY glColor4fv (const GLfloat *v); -GLAPI void GLAPIENTRY glColor4i (GLint red, GLint green, GLint blue, GLint alpha); -GLAPI void GLAPIENTRY glColor4iv (const GLint *v); -GLAPI void GLAPIENTRY glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha); -GLAPI void GLAPIENTRY glColor4sv (const GLshort *v); -GLAPI void GLAPIENTRY glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); -GLAPI void GLAPIENTRY glColor4ubv (const GLubyte *v); -GLAPI void GLAPIENTRY glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha); -GLAPI void GLAPIENTRY glColor4uiv (const GLuint *v); -GLAPI void GLAPIENTRY glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha); -GLAPI void GLAPIENTRY glColor4usv (const GLushort *v); -GLAPI void GLAPIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -GLAPI void GLAPIENTRY glColorMaterial (GLenum face, GLenum mode); -GLAPI void GLAPIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); -GLAPI void GLAPIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void GLAPIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void GLAPIENTRY glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void GLAPIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void GLAPIENTRY glCullFace (GLenum mode); -GLAPI void GLAPIENTRY glDeleteLists (GLuint list, GLsizei range); -GLAPI void GLAPIENTRY glDeleteTextures (GLsizei n, const GLuint *textures); -GLAPI void GLAPIENTRY glDepthFunc (GLenum func); -GLAPI void GLAPIENTRY glDepthMask (GLboolean flag); -GLAPI void GLAPIENTRY glDepthRange (GLclampd zNear, GLclampd zFar); -GLAPI void GLAPIENTRY glDisable (GLenum cap); -GLAPI void GLAPIENTRY glDisableClientState (GLenum array); -GLAPI void GLAPIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count); -GLAPI void GLAPIENTRY glDrawBuffer (GLenum mode); -GLAPI void GLAPIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const void *indices); -GLAPI void GLAPIENTRY glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glEdgeFlag (GLboolean flag); -GLAPI void GLAPIENTRY glEdgeFlagPointer (GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glEdgeFlagv (const GLboolean *flag); -GLAPI void GLAPIENTRY glEnable (GLenum cap); -GLAPI void GLAPIENTRY glEnableClientState (GLenum array); -GLAPI void GLAPIENTRY glEnd (void); -GLAPI void GLAPIENTRY glEndList (void); -GLAPI void GLAPIENTRY glEvalCoord1d (GLdouble u); -GLAPI void GLAPIENTRY glEvalCoord1dv (const GLdouble *u); -GLAPI void GLAPIENTRY glEvalCoord1f (GLfloat u); -GLAPI void GLAPIENTRY glEvalCoord1fv (const GLfloat *u); -GLAPI void GLAPIENTRY glEvalCoord2d (GLdouble u, GLdouble v); -GLAPI void GLAPIENTRY glEvalCoord2dv (const GLdouble *u); -GLAPI void GLAPIENTRY glEvalCoord2f (GLfloat u, GLfloat v); -GLAPI void GLAPIENTRY glEvalCoord2fv (const GLfloat *u); -GLAPI void GLAPIENTRY glEvalMesh1 (GLenum mode, GLint i1, GLint i2); -GLAPI void GLAPIENTRY glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); -GLAPI void GLAPIENTRY glEvalPoint1 (GLint i); -GLAPI void GLAPIENTRY glEvalPoint2 (GLint i, GLint j); -GLAPI void GLAPIENTRY glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer); -GLAPI void GLAPIENTRY glFinish (void); -GLAPI void GLAPIENTRY glFlush (void); -GLAPI void GLAPIENTRY glFogf (GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glFogfv (GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glFogi (GLenum pname, GLint param); -GLAPI void GLAPIENTRY glFogiv (GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glFrontFace (GLenum mode); -GLAPI void GLAPIENTRY glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI GLuint GLAPIENTRY glGenLists (GLsizei range); -GLAPI void GLAPIENTRY glGenTextures (GLsizei n, GLuint *textures); -GLAPI void GLAPIENTRY glGetBooleanv (GLenum pname, GLboolean *params); -GLAPI void GLAPIENTRY glGetClipPlane (GLenum plane, GLdouble *equation); -GLAPI void GLAPIENTRY glGetDoublev (GLenum pname, GLdouble *params); -GLAPI GLenum GLAPIENTRY glGetError (void); -GLAPI void GLAPIENTRY glGetFloatv (GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetIntegerv (GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetLightiv (GLenum light, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetMapdv (GLenum target, GLenum query, GLdouble *v); -GLAPI void GLAPIENTRY glGetMapfv (GLenum target, GLenum query, GLfloat *v); -GLAPI void GLAPIENTRY glGetMapiv (GLenum target, GLenum query, GLint *v); -GLAPI void GLAPIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetMaterialiv (GLenum face, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetPixelMapfv (GLenum map, GLfloat *values); -GLAPI void GLAPIENTRY glGetPixelMapuiv (GLenum map, GLuint *values); -GLAPI void GLAPIENTRY glGetPixelMapusv (GLenum map, GLushort *values); -GLAPI void GLAPIENTRY glGetPointerv (GLenum pname, void* *params); -GLAPI void GLAPIENTRY glGetPolygonStipple (GLubyte *mask); -GLAPI const GLubyte * GLAPIENTRY glGetString (GLenum name); -GLAPI void GLAPIENTRY glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetTexEnviv (GLenum target, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params); -GLAPI void GLAPIENTRY glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetTexGeniv (GLenum coord, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, void *pixels); -GLAPI void GLAPIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glHint (GLenum target, GLenum mode); -GLAPI void GLAPIENTRY glIndexMask (GLuint mask); -GLAPI void GLAPIENTRY glIndexPointer (GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glIndexd (GLdouble c); -GLAPI void GLAPIENTRY glIndexdv (const GLdouble *c); -GLAPI void GLAPIENTRY glIndexf (GLfloat c); -GLAPI void GLAPIENTRY glIndexfv (const GLfloat *c); -GLAPI void GLAPIENTRY glIndexi (GLint c); -GLAPI void GLAPIENTRY glIndexiv (const GLint *c); -GLAPI void GLAPIENTRY glIndexs (GLshort c); -GLAPI void GLAPIENTRY glIndexsv (const GLshort *c); -GLAPI void GLAPIENTRY glIndexub (GLubyte c); -GLAPI void GLAPIENTRY glIndexubv (const GLubyte *c); -GLAPI void GLAPIENTRY glInitNames (void); -GLAPI void GLAPIENTRY glInterleavedArrays (GLenum format, GLsizei stride, const void *pointer); -GLAPI GLboolean GLAPIENTRY glIsEnabled (GLenum cap); -GLAPI GLboolean GLAPIENTRY glIsList (GLuint list); -GLAPI GLboolean GLAPIENTRY glIsTexture (GLuint texture); -GLAPI void GLAPIENTRY glLightModelf (GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glLightModelfv (GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glLightModeli (GLenum pname, GLint param); -GLAPI void GLAPIENTRY glLightModeliv (GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glLightf (GLenum light, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glLighti (GLenum light, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glLightiv (GLenum light, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glLineStipple (GLint factor, GLushort pattern); -GLAPI void GLAPIENTRY glLineWidth (GLfloat width); -GLAPI void GLAPIENTRY glListBase (GLuint base); -GLAPI void GLAPIENTRY glLoadIdentity (void); -GLAPI void GLAPIENTRY glLoadMatrixd (const GLdouble *m); -GLAPI void GLAPIENTRY glLoadMatrixf (const GLfloat *m); -GLAPI void GLAPIENTRY glLoadName (GLuint name); -GLAPI void GLAPIENTRY glLogicOp (GLenum opcode); -GLAPI void GLAPIENTRY glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); -GLAPI void GLAPIENTRY glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); -GLAPI void GLAPIENTRY glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); -GLAPI void GLAPIENTRY glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); -GLAPI void GLAPIENTRY glMapGrid1d (GLint un, GLdouble u1, GLdouble u2); -GLAPI void GLAPIENTRY glMapGrid1f (GLint un, GLfloat u1, GLfloat u2); -GLAPI void GLAPIENTRY glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); -GLAPI void GLAPIENTRY glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); -GLAPI void GLAPIENTRY glMaterialf (GLenum face, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glMaterialfv (GLenum face, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glMateriali (GLenum face, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glMaterialiv (GLenum face, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glMatrixMode (GLenum mode); -GLAPI void GLAPIENTRY glMultMatrixd (const GLdouble *m); -GLAPI void GLAPIENTRY glMultMatrixf (const GLfloat *m); -GLAPI void GLAPIENTRY glNewList (GLuint list, GLenum mode); -GLAPI void GLAPIENTRY glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz); -GLAPI void GLAPIENTRY glNormal3bv (const GLbyte *v); -GLAPI void GLAPIENTRY glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz); -GLAPI void GLAPIENTRY glNormal3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz); -GLAPI void GLAPIENTRY glNormal3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glNormal3i (GLint nx, GLint ny, GLint nz); -GLAPI void GLAPIENTRY glNormal3iv (const GLint *v); -GLAPI void GLAPIENTRY glNormal3s (GLshort nx, GLshort ny, GLshort nz); -GLAPI void GLAPIENTRY glNormal3sv (const GLshort *v); -GLAPI void GLAPIENTRY glNormalPointer (GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI void GLAPIENTRY glPassThrough (GLfloat token); -GLAPI void GLAPIENTRY glPixelMapfv (GLenum map, GLsizei mapsize, const GLfloat *values); -GLAPI void GLAPIENTRY glPixelMapuiv (GLenum map, GLsizei mapsize, const GLuint *values); -GLAPI void GLAPIENTRY glPixelMapusv (GLenum map, GLsizei mapsize, const GLushort *values); -GLAPI void GLAPIENTRY glPixelStoref (GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glPixelStorei (GLenum pname, GLint param); -GLAPI void GLAPIENTRY glPixelTransferf (GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glPixelTransferi (GLenum pname, GLint param); -GLAPI void GLAPIENTRY glPixelZoom (GLfloat xfactor, GLfloat yfactor); -GLAPI void GLAPIENTRY glPointSize (GLfloat size); -GLAPI void GLAPIENTRY glPolygonMode (GLenum face, GLenum mode); -GLAPI void GLAPIENTRY glPolygonOffset (GLfloat factor, GLfloat units); -GLAPI void GLAPIENTRY glPolygonStipple (const GLubyte *mask); -GLAPI void GLAPIENTRY glPopAttrib (void); -GLAPI void GLAPIENTRY glPopClientAttrib (void); -GLAPI void GLAPIENTRY glPopMatrix (void); -GLAPI void GLAPIENTRY glPopName (void); -GLAPI void GLAPIENTRY glPrioritizeTextures (GLsizei n, const GLuint *textures, const GLclampf *priorities); -GLAPI void GLAPIENTRY glPushAttrib (GLbitfield mask); -GLAPI void GLAPIENTRY glPushClientAttrib (GLbitfield mask); -GLAPI void GLAPIENTRY glPushMatrix (void); -GLAPI void GLAPIENTRY glPushName (GLuint name); -GLAPI void GLAPIENTRY glRasterPos2d (GLdouble x, GLdouble y); -GLAPI void GLAPIENTRY glRasterPos2dv (const GLdouble *v); -GLAPI void GLAPIENTRY glRasterPos2f (GLfloat x, GLfloat y); -GLAPI void GLAPIENTRY glRasterPos2fv (const GLfloat *v); -GLAPI void GLAPIENTRY glRasterPos2i (GLint x, GLint y); -GLAPI void GLAPIENTRY glRasterPos2iv (const GLint *v); -GLAPI void GLAPIENTRY glRasterPos2s (GLshort x, GLshort y); -GLAPI void GLAPIENTRY glRasterPos2sv (const GLshort *v); -GLAPI void GLAPIENTRY glRasterPos3d (GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glRasterPos3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glRasterPos3f (GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glRasterPos3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glRasterPos3i (GLint x, GLint y, GLint z); -GLAPI void GLAPIENTRY glRasterPos3iv (const GLint *v); -GLAPI void GLAPIENTRY glRasterPos3s (GLshort x, GLshort y, GLshort z); -GLAPI void GLAPIENTRY glRasterPos3sv (const GLshort *v); -GLAPI void GLAPIENTRY glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void GLAPIENTRY glRasterPos4dv (const GLdouble *v); -GLAPI void GLAPIENTRY glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void GLAPIENTRY glRasterPos4fv (const GLfloat *v); -GLAPI void GLAPIENTRY glRasterPos4i (GLint x, GLint y, GLint z, GLint w); -GLAPI void GLAPIENTRY glRasterPos4iv (const GLint *v); -GLAPI void GLAPIENTRY glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void GLAPIENTRY glRasterPos4sv (const GLshort *v); -GLAPI void GLAPIENTRY glReadBuffer (GLenum mode); -GLAPI void GLAPIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); -GLAPI void GLAPIENTRY glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); -GLAPI void GLAPIENTRY glRectdv (const GLdouble *v1, const GLdouble *v2); -GLAPI void GLAPIENTRY glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); -GLAPI void GLAPIENTRY glRectfv (const GLfloat *v1, const GLfloat *v2); -GLAPI void GLAPIENTRY glRecti (GLint x1, GLint y1, GLint x2, GLint y2); -GLAPI void GLAPIENTRY glRectiv (const GLint *v1, const GLint *v2); -GLAPI void GLAPIENTRY glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2); -GLAPI void GLAPIENTRY glRectsv (const GLshort *v1, const GLshort *v2); -GLAPI GLint GLAPIENTRY glRenderMode (GLenum mode); -GLAPI void GLAPIENTRY glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glScaled (GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glScalef (GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void GLAPIENTRY glSelectBuffer (GLsizei size, GLuint *buffer); -GLAPI void GLAPIENTRY glShadeModel (GLenum mode); -GLAPI void GLAPIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); -GLAPI void GLAPIENTRY glStencilMask (GLuint mask); -GLAPI void GLAPIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); -GLAPI void GLAPIENTRY glTexCoord1d (GLdouble s); -GLAPI void GLAPIENTRY glTexCoord1dv (const GLdouble *v); -GLAPI void GLAPIENTRY glTexCoord1f (GLfloat s); -GLAPI void GLAPIENTRY glTexCoord1fv (const GLfloat *v); -GLAPI void GLAPIENTRY glTexCoord1i (GLint s); -GLAPI void GLAPIENTRY glTexCoord1iv (const GLint *v); -GLAPI void GLAPIENTRY glTexCoord1s (GLshort s); -GLAPI void GLAPIENTRY glTexCoord1sv (const GLshort *v); -GLAPI void GLAPIENTRY glTexCoord2d (GLdouble s, GLdouble t); -GLAPI void GLAPIENTRY glTexCoord2dv (const GLdouble *v); -GLAPI void GLAPIENTRY glTexCoord2f (GLfloat s, GLfloat t); -GLAPI void GLAPIENTRY glTexCoord2fv (const GLfloat *v); -GLAPI void GLAPIENTRY glTexCoord2i (GLint s, GLint t); -GLAPI void GLAPIENTRY glTexCoord2iv (const GLint *v); -GLAPI void GLAPIENTRY glTexCoord2s (GLshort s, GLshort t); -GLAPI void GLAPIENTRY glTexCoord2sv (const GLshort *v); -GLAPI void GLAPIENTRY glTexCoord3d (GLdouble s, GLdouble t, GLdouble r); -GLAPI void GLAPIENTRY glTexCoord3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glTexCoord3f (GLfloat s, GLfloat t, GLfloat r); -GLAPI void GLAPIENTRY glTexCoord3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glTexCoord3i (GLint s, GLint t, GLint r); -GLAPI void GLAPIENTRY glTexCoord3iv (const GLint *v); -GLAPI void GLAPIENTRY glTexCoord3s (GLshort s, GLshort t, GLshort r); -GLAPI void GLAPIENTRY glTexCoord3sv (const GLshort *v); -GLAPI void GLAPIENTRY glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI void GLAPIENTRY glTexCoord4dv (const GLdouble *v); -GLAPI void GLAPIENTRY glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void GLAPIENTRY glTexCoord4fv (const GLfloat *v); -GLAPI void GLAPIENTRY glTexCoord4i (GLint s, GLint t, GLint r, GLint q); -GLAPI void GLAPIENTRY glTexCoord4iv (const GLint *v); -GLAPI void GLAPIENTRY glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI void GLAPIENTRY glTexCoord4sv (const GLshort *v); -GLAPI void GLAPIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glTexEnviv (GLenum target, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glTexGend (GLenum coord, GLenum pname, GLdouble param); -GLAPI void GLAPIENTRY glTexGendv (GLenum coord, GLenum pname, const GLdouble *params); -GLAPI void GLAPIENTRY glTexGenf (GLenum coord, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glTexGenfv (GLenum coord, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glTexGeni (GLenum coord, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glTexGeniv (GLenum coord, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glTranslated (GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glVertex2d (GLdouble x, GLdouble y); -GLAPI void GLAPIENTRY glVertex2dv (const GLdouble *v); -GLAPI void GLAPIENTRY glVertex2f (GLfloat x, GLfloat y); -GLAPI void GLAPIENTRY glVertex2fv (const GLfloat *v); -GLAPI void GLAPIENTRY glVertex2i (GLint x, GLint y); -GLAPI void GLAPIENTRY glVertex2iv (const GLint *v); -GLAPI void GLAPIENTRY glVertex2s (GLshort x, GLshort y); -GLAPI void GLAPIENTRY glVertex2sv (const GLshort *v); -GLAPI void GLAPIENTRY glVertex3d (GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glVertex3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glVertex3f (GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glVertex3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glVertex3i (GLint x, GLint y, GLint z); -GLAPI void GLAPIENTRY glVertex3iv (const GLint *v); -GLAPI void GLAPIENTRY glVertex3s (GLshort x, GLshort y, GLshort z); -GLAPI void GLAPIENTRY glVertex3sv (const GLshort *v); -GLAPI void GLAPIENTRY glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void GLAPIENTRY glVertex4dv (const GLdouble *v); -GLAPI void GLAPIENTRY glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void GLAPIENTRY glVertex4fv (const GLfloat *v); -GLAPI void GLAPIENTRY glVertex4i (GLint x, GLint y, GLint z, GLint w); -GLAPI void GLAPIENTRY glVertex4iv (const GLint *v); -GLAPI void GLAPIENTRY glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void GLAPIENTRY glVertex4sv (const GLshort *v); -GLAPI void GLAPIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); - -#define GLEW_VERSION_1_1 GLEW_GET_VAR(__GLEW_VERSION_1_1) - -#endif /* GL_VERSION_1_1 */ - -/* ---------------------------------- GLU ---------------------------------- */ - -#ifndef GLEW_NO_GLU -# ifdef __APPLE__ -# include -# if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) -# define GLEW_NO_GLU -# endif -# endif -#endif - -#ifndef GLEW_NO_GLU -/* this is where we can safely include GLU */ -# if defined(__APPLE__) && defined(__MACH__) -# include -# else -# include -# endif -#endif - -/* ----------------------------- GL_VERSION_1_2 ---------------------------- */ - -#ifndef GL_VERSION_1_2 -#define GL_VERSION_1_2 1 - -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_RESCALE_NORMAL 0x803A -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E - -typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices); -typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); - -#define glCopyTexSubImage3D GLEW_GET_FUN(__glewCopyTexSubImage3D) -#define glDrawRangeElements GLEW_GET_FUN(__glewDrawRangeElements) -#define glTexImage3D GLEW_GET_FUN(__glewTexImage3D) -#define glTexSubImage3D GLEW_GET_FUN(__glewTexSubImage3D) - -#define GLEW_VERSION_1_2 GLEW_GET_VAR(__GLEW_VERSION_1_2) - -#endif /* GL_VERSION_1_2 */ - -/* ---------------------------- GL_VERSION_1_2_1 --------------------------- */ - -#ifndef GL_VERSION_1_2_1 -#define GL_VERSION_1_2_1 1 - -#define GLEW_VERSION_1_2_1 GLEW_GET_VAR(__GLEW_VERSION_1_2_1) - -#endif /* GL_VERSION_1_2_1 */ - -/* ----------------------------- GL_VERSION_1_3 ---------------------------- */ - -#ifndef GL_VERSION_1_3 -#define GL_VERSION_1_3 1 - -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_CLAMP_TO_BORDER 0x812D -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_SUBTRACT 0x84E7 -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#define GL_MULTISAMPLE_BIT 0x20000000 - -typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture); -typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, void *img); -typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble m[16]); -typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat m[16]); -typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble m[16]); -typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat m[16]); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); - -#define glActiveTexture GLEW_GET_FUN(__glewActiveTexture) -#define glClientActiveTexture GLEW_GET_FUN(__glewClientActiveTexture) -#define glCompressedTexImage1D GLEW_GET_FUN(__glewCompressedTexImage1D) -#define glCompressedTexImage2D GLEW_GET_FUN(__glewCompressedTexImage2D) -#define glCompressedTexImage3D GLEW_GET_FUN(__glewCompressedTexImage3D) -#define glCompressedTexSubImage1D GLEW_GET_FUN(__glewCompressedTexSubImage1D) -#define glCompressedTexSubImage2D GLEW_GET_FUN(__glewCompressedTexSubImage2D) -#define glCompressedTexSubImage3D GLEW_GET_FUN(__glewCompressedTexSubImage3D) -#define glGetCompressedTexImage GLEW_GET_FUN(__glewGetCompressedTexImage) -#define glLoadTransposeMatrixd GLEW_GET_FUN(__glewLoadTransposeMatrixd) -#define glLoadTransposeMatrixf GLEW_GET_FUN(__glewLoadTransposeMatrixf) -#define glMultTransposeMatrixd GLEW_GET_FUN(__glewMultTransposeMatrixd) -#define glMultTransposeMatrixf GLEW_GET_FUN(__glewMultTransposeMatrixf) -#define glMultiTexCoord1d GLEW_GET_FUN(__glewMultiTexCoord1d) -#define glMultiTexCoord1dv GLEW_GET_FUN(__glewMultiTexCoord1dv) -#define glMultiTexCoord1f GLEW_GET_FUN(__glewMultiTexCoord1f) -#define glMultiTexCoord1fv GLEW_GET_FUN(__glewMultiTexCoord1fv) -#define glMultiTexCoord1i GLEW_GET_FUN(__glewMultiTexCoord1i) -#define glMultiTexCoord1iv GLEW_GET_FUN(__glewMultiTexCoord1iv) -#define glMultiTexCoord1s GLEW_GET_FUN(__glewMultiTexCoord1s) -#define glMultiTexCoord1sv GLEW_GET_FUN(__glewMultiTexCoord1sv) -#define glMultiTexCoord2d GLEW_GET_FUN(__glewMultiTexCoord2d) -#define glMultiTexCoord2dv GLEW_GET_FUN(__glewMultiTexCoord2dv) -#define glMultiTexCoord2f GLEW_GET_FUN(__glewMultiTexCoord2f) -#define glMultiTexCoord2fv GLEW_GET_FUN(__glewMultiTexCoord2fv) -#define glMultiTexCoord2i GLEW_GET_FUN(__glewMultiTexCoord2i) -#define glMultiTexCoord2iv GLEW_GET_FUN(__glewMultiTexCoord2iv) -#define glMultiTexCoord2s GLEW_GET_FUN(__glewMultiTexCoord2s) -#define glMultiTexCoord2sv GLEW_GET_FUN(__glewMultiTexCoord2sv) -#define glMultiTexCoord3d GLEW_GET_FUN(__glewMultiTexCoord3d) -#define glMultiTexCoord3dv GLEW_GET_FUN(__glewMultiTexCoord3dv) -#define glMultiTexCoord3f GLEW_GET_FUN(__glewMultiTexCoord3f) -#define glMultiTexCoord3fv GLEW_GET_FUN(__glewMultiTexCoord3fv) -#define glMultiTexCoord3i GLEW_GET_FUN(__glewMultiTexCoord3i) -#define glMultiTexCoord3iv GLEW_GET_FUN(__glewMultiTexCoord3iv) -#define glMultiTexCoord3s GLEW_GET_FUN(__glewMultiTexCoord3s) -#define glMultiTexCoord3sv GLEW_GET_FUN(__glewMultiTexCoord3sv) -#define glMultiTexCoord4d GLEW_GET_FUN(__glewMultiTexCoord4d) -#define glMultiTexCoord4dv GLEW_GET_FUN(__glewMultiTexCoord4dv) -#define glMultiTexCoord4f GLEW_GET_FUN(__glewMultiTexCoord4f) -#define glMultiTexCoord4fv GLEW_GET_FUN(__glewMultiTexCoord4fv) -#define glMultiTexCoord4i GLEW_GET_FUN(__glewMultiTexCoord4i) -#define glMultiTexCoord4iv GLEW_GET_FUN(__glewMultiTexCoord4iv) -#define glMultiTexCoord4s GLEW_GET_FUN(__glewMultiTexCoord4s) -#define glMultiTexCoord4sv GLEW_GET_FUN(__glewMultiTexCoord4sv) -#define glSampleCoverage GLEW_GET_FUN(__glewSampleCoverage) - -#define GLEW_VERSION_1_3 GLEW_GET_VAR(__GLEW_VERSION_1_3) - -#endif /* GL_VERSION_1_3 */ - -/* ----------------------------- GL_VERSION_1_4 ---------------------------- */ - -#ifndef GL_VERSION_1_4 -#define GL_VERSION_1_4 1 - -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#define GL_COMPARE_R_TO_TEXTURE 0x884E - -typedef void (GLAPIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLFOGCOORDDPROC) (GLdouble coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDDVPROC) (const GLdouble *coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFPROC) (GLfloat coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFVPROC) (const GLfloat *coord); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const* indices, GLsizei drawcount); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVPROC) (const GLdouble *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVPROC) (const GLfloat *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IPROC) (GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVPROC) (const GLint *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVPROC) (const GLshort *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVPROC) (const GLdouble *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVPROC) (const GLfloat *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVPROC) (const GLint *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVPROC) (const GLshort *p); - -#define glBlendColor GLEW_GET_FUN(__glewBlendColor) -#define glBlendEquation GLEW_GET_FUN(__glewBlendEquation) -#define glBlendFuncSeparate GLEW_GET_FUN(__glewBlendFuncSeparate) -#define glFogCoordPointer GLEW_GET_FUN(__glewFogCoordPointer) -#define glFogCoordd GLEW_GET_FUN(__glewFogCoordd) -#define glFogCoorddv GLEW_GET_FUN(__glewFogCoorddv) -#define glFogCoordf GLEW_GET_FUN(__glewFogCoordf) -#define glFogCoordfv GLEW_GET_FUN(__glewFogCoordfv) -#define glMultiDrawArrays GLEW_GET_FUN(__glewMultiDrawArrays) -#define glMultiDrawElements GLEW_GET_FUN(__glewMultiDrawElements) -#define glPointParameterf GLEW_GET_FUN(__glewPointParameterf) -#define glPointParameterfv GLEW_GET_FUN(__glewPointParameterfv) -#define glPointParameteri GLEW_GET_FUN(__glewPointParameteri) -#define glPointParameteriv GLEW_GET_FUN(__glewPointParameteriv) -#define glSecondaryColor3b GLEW_GET_FUN(__glewSecondaryColor3b) -#define glSecondaryColor3bv GLEW_GET_FUN(__glewSecondaryColor3bv) -#define glSecondaryColor3d GLEW_GET_FUN(__glewSecondaryColor3d) -#define glSecondaryColor3dv GLEW_GET_FUN(__glewSecondaryColor3dv) -#define glSecondaryColor3f GLEW_GET_FUN(__glewSecondaryColor3f) -#define glSecondaryColor3fv GLEW_GET_FUN(__glewSecondaryColor3fv) -#define glSecondaryColor3i GLEW_GET_FUN(__glewSecondaryColor3i) -#define glSecondaryColor3iv GLEW_GET_FUN(__glewSecondaryColor3iv) -#define glSecondaryColor3s GLEW_GET_FUN(__glewSecondaryColor3s) -#define glSecondaryColor3sv GLEW_GET_FUN(__glewSecondaryColor3sv) -#define glSecondaryColor3ub GLEW_GET_FUN(__glewSecondaryColor3ub) -#define glSecondaryColor3ubv GLEW_GET_FUN(__glewSecondaryColor3ubv) -#define glSecondaryColor3ui GLEW_GET_FUN(__glewSecondaryColor3ui) -#define glSecondaryColor3uiv GLEW_GET_FUN(__glewSecondaryColor3uiv) -#define glSecondaryColor3us GLEW_GET_FUN(__glewSecondaryColor3us) -#define glSecondaryColor3usv GLEW_GET_FUN(__glewSecondaryColor3usv) -#define glSecondaryColorPointer GLEW_GET_FUN(__glewSecondaryColorPointer) -#define glWindowPos2d GLEW_GET_FUN(__glewWindowPos2d) -#define glWindowPos2dv GLEW_GET_FUN(__glewWindowPos2dv) -#define glWindowPos2f GLEW_GET_FUN(__glewWindowPos2f) -#define glWindowPos2fv GLEW_GET_FUN(__glewWindowPos2fv) -#define glWindowPos2i GLEW_GET_FUN(__glewWindowPos2i) -#define glWindowPos2iv GLEW_GET_FUN(__glewWindowPos2iv) -#define glWindowPos2s GLEW_GET_FUN(__glewWindowPos2s) -#define glWindowPos2sv GLEW_GET_FUN(__glewWindowPos2sv) -#define glWindowPos3d GLEW_GET_FUN(__glewWindowPos3d) -#define glWindowPos3dv GLEW_GET_FUN(__glewWindowPos3dv) -#define glWindowPos3f GLEW_GET_FUN(__glewWindowPos3f) -#define glWindowPos3fv GLEW_GET_FUN(__glewWindowPos3fv) -#define glWindowPos3i GLEW_GET_FUN(__glewWindowPos3i) -#define glWindowPos3iv GLEW_GET_FUN(__glewWindowPos3iv) -#define glWindowPos3s GLEW_GET_FUN(__glewWindowPos3s) -#define glWindowPos3sv GLEW_GET_FUN(__glewWindowPos3sv) - -#define GLEW_VERSION_1_4 GLEW_GET_VAR(__GLEW_VERSION_1_4) - -#endif /* GL_VERSION_1_4 */ - -/* ----------------------------- GL_VERSION_1_5 ---------------------------- */ - -#ifndef GL_VERSION_1_5 -#define GL_VERSION_1_5 1 - -#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE -#define GL_FOG_COORD GL_FOG_COORDINATE -#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING -#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER -#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE -#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE -#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE -#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA -#define GL_SRC0_RGB GL_SOURCE0_RGB -#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA -#define GL_SRC1_RGB GL_SOURCE1_RGB -#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA -#define GL_SRC2_RGB GL_SOURCE2_RGB -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 - -typedef ptrdiff_t GLintptr; -typedef ptrdiff_t GLsizeiptr; - -typedef void (GLAPIENTRY * PFNGLBEGINQUERYPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void* data, GLenum usage); -typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void* data); -typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLENDQUERYPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGENBUFFERSPROC) (GLsizei n, GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, void** params); -typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, void* data); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERPROC) (GLuint buffer); -typedef GLboolean (GLAPIENTRY * PFNGLISQUERYPROC) (GLuint id); -typedef void* (GLAPIENTRY * PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); -typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERPROC) (GLenum target); - -#define glBeginQuery GLEW_GET_FUN(__glewBeginQuery) -#define glBindBuffer GLEW_GET_FUN(__glewBindBuffer) -#define glBufferData GLEW_GET_FUN(__glewBufferData) -#define glBufferSubData GLEW_GET_FUN(__glewBufferSubData) -#define glDeleteBuffers GLEW_GET_FUN(__glewDeleteBuffers) -#define glDeleteQueries GLEW_GET_FUN(__glewDeleteQueries) -#define glEndQuery GLEW_GET_FUN(__glewEndQuery) -#define glGenBuffers GLEW_GET_FUN(__glewGenBuffers) -#define glGenQueries GLEW_GET_FUN(__glewGenQueries) -#define glGetBufferParameteriv GLEW_GET_FUN(__glewGetBufferParameteriv) -#define glGetBufferPointerv GLEW_GET_FUN(__glewGetBufferPointerv) -#define glGetBufferSubData GLEW_GET_FUN(__glewGetBufferSubData) -#define glGetQueryObjectiv GLEW_GET_FUN(__glewGetQueryObjectiv) -#define glGetQueryObjectuiv GLEW_GET_FUN(__glewGetQueryObjectuiv) -#define glGetQueryiv GLEW_GET_FUN(__glewGetQueryiv) -#define glIsBuffer GLEW_GET_FUN(__glewIsBuffer) -#define glIsQuery GLEW_GET_FUN(__glewIsQuery) -#define glMapBuffer GLEW_GET_FUN(__glewMapBuffer) -#define glUnmapBuffer GLEW_GET_FUN(__glewUnmapBuffer) - -#define GLEW_VERSION_1_5 GLEW_GET_VAR(__GLEW_VERSION_1_5) - -#endif /* GL_VERSION_1_5 */ - -/* ----------------------------- GL_VERSION_2_0 ---------------------------- */ - -#ifndef GL_VERSION_2_0 -#define GL_VERSION_2_0 1 - -#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_COORDS 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 - -typedef void (GLAPIENTRY * PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha); -typedef void (GLAPIENTRY * PFNGLCOMPILESHADERPROC) (GLuint shader); -typedef GLuint (GLAPIENTRY * PFNGLCREATEPROGRAMPROC) (void); -typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROC) (GLenum type); -typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLDELETESHADERPROC) (GLuint shader); -typedef void (GLAPIENTRY * PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum* bufs); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei* count, GLuint* shaders); -typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog); -typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEPROC) (GLuint obj, GLsizei maxLength, GLsizei* length, GLchar* source); -typedef void (GLAPIENTRY * PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint* param); -typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void** pointer); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPROC) (GLuint program); -typedef GLboolean (GLAPIENTRY * PFNGLISSHADERPROC) (GLuint shader); -typedef void (GLAPIENTRY * PFNGLLINKPROGRAMPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const* string, const GLint* length); -typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (GLAPIENTRY * PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1IPROC) (GLint location, GLint v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUSEPROGRAMPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* pointer); - -#define glAttachShader GLEW_GET_FUN(__glewAttachShader) -#define glBindAttribLocation GLEW_GET_FUN(__glewBindAttribLocation) -#define glBlendEquationSeparate GLEW_GET_FUN(__glewBlendEquationSeparate) -#define glCompileShader GLEW_GET_FUN(__glewCompileShader) -#define glCreateProgram GLEW_GET_FUN(__glewCreateProgram) -#define glCreateShader GLEW_GET_FUN(__glewCreateShader) -#define glDeleteProgram GLEW_GET_FUN(__glewDeleteProgram) -#define glDeleteShader GLEW_GET_FUN(__glewDeleteShader) -#define glDetachShader GLEW_GET_FUN(__glewDetachShader) -#define glDisableVertexAttribArray GLEW_GET_FUN(__glewDisableVertexAttribArray) -#define glDrawBuffers GLEW_GET_FUN(__glewDrawBuffers) -#define glEnableVertexAttribArray GLEW_GET_FUN(__glewEnableVertexAttribArray) -#define glGetActiveAttrib GLEW_GET_FUN(__glewGetActiveAttrib) -#define glGetActiveUniform GLEW_GET_FUN(__glewGetActiveUniform) -#define glGetAttachedShaders GLEW_GET_FUN(__glewGetAttachedShaders) -#define glGetAttribLocation GLEW_GET_FUN(__glewGetAttribLocation) -#define glGetProgramInfoLog GLEW_GET_FUN(__glewGetProgramInfoLog) -#define glGetProgramiv GLEW_GET_FUN(__glewGetProgramiv) -#define glGetShaderInfoLog GLEW_GET_FUN(__glewGetShaderInfoLog) -#define glGetShaderSource GLEW_GET_FUN(__glewGetShaderSource) -#define glGetShaderiv GLEW_GET_FUN(__glewGetShaderiv) -#define glGetUniformLocation GLEW_GET_FUN(__glewGetUniformLocation) -#define glGetUniformfv GLEW_GET_FUN(__glewGetUniformfv) -#define glGetUniformiv GLEW_GET_FUN(__glewGetUniformiv) -#define glGetVertexAttribPointerv GLEW_GET_FUN(__glewGetVertexAttribPointerv) -#define glGetVertexAttribdv GLEW_GET_FUN(__glewGetVertexAttribdv) -#define glGetVertexAttribfv GLEW_GET_FUN(__glewGetVertexAttribfv) -#define glGetVertexAttribiv GLEW_GET_FUN(__glewGetVertexAttribiv) -#define glIsProgram GLEW_GET_FUN(__glewIsProgram) -#define glIsShader GLEW_GET_FUN(__glewIsShader) -#define glLinkProgram GLEW_GET_FUN(__glewLinkProgram) -#define glShaderSource GLEW_GET_FUN(__glewShaderSource) -#define glStencilFuncSeparate GLEW_GET_FUN(__glewStencilFuncSeparate) -#define glStencilMaskSeparate GLEW_GET_FUN(__glewStencilMaskSeparate) -#define glStencilOpSeparate GLEW_GET_FUN(__glewStencilOpSeparate) -#define glUniform1f GLEW_GET_FUN(__glewUniform1f) -#define glUniform1fv GLEW_GET_FUN(__glewUniform1fv) -#define glUniform1i GLEW_GET_FUN(__glewUniform1i) -#define glUniform1iv GLEW_GET_FUN(__glewUniform1iv) -#define glUniform2f GLEW_GET_FUN(__glewUniform2f) -#define glUniform2fv GLEW_GET_FUN(__glewUniform2fv) -#define glUniform2i GLEW_GET_FUN(__glewUniform2i) -#define glUniform2iv GLEW_GET_FUN(__glewUniform2iv) -#define glUniform3f GLEW_GET_FUN(__glewUniform3f) -#define glUniform3fv GLEW_GET_FUN(__glewUniform3fv) -#define glUniform3i GLEW_GET_FUN(__glewUniform3i) -#define glUniform3iv GLEW_GET_FUN(__glewUniform3iv) -#define glUniform4f GLEW_GET_FUN(__glewUniform4f) -#define glUniform4fv GLEW_GET_FUN(__glewUniform4fv) -#define glUniform4i GLEW_GET_FUN(__glewUniform4i) -#define glUniform4iv GLEW_GET_FUN(__glewUniform4iv) -#define glUniformMatrix2fv GLEW_GET_FUN(__glewUniformMatrix2fv) -#define glUniformMatrix3fv GLEW_GET_FUN(__glewUniformMatrix3fv) -#define glUniformMatrix4fv GLEW_GET_FUN(__glewUniformMatrix4fv) -#define glUseProgram GLEW_GET_FUN(__glewUseProgram) -#define glValidateProgram GLEW_GET_FUN(__glewValidateProgram) -#define glVertexAttrib1d GLEW_GET_FUN(__glewVertexAttrib1d) -#define glVertexAttrib1dv GLEW_GET_FUN(__glewVertexAttrib1dv) -#define glVertexAttrib1f GLEW_GET_FUN(__glewVertexAttrib1f) -#define glVertexAttrib1fv GLEW_GET_FUN(__glewVertexAttrib1fv) -#define glVertexAttrib1s GLEW_GET_FUN(__glewVertexAttrib1s) -#define glVertexAttrib1sv GLEW_GET_FUN(__glewVertexAttrib1sv) -#define glVertexAttrib2d GLEW_GET_FUN(__glewVertexAttrib2d) -#define glVertexAttrib2dv GLEW_GET_FUN(__glewVertexAttrib2dv) -#define glVertexAttrib2f GLEW_GET_FUN(__glewVertexAttrib2f) -#define glVertexAttrib2fv GLEW_GET_FUN(__glewVertexAttrib2fv) -#define glVertexAttrib2s GLEW_GET_FUN(__glewVertexAttrib2s) -#define glVertexAttrib2sv GLEW_GET_FUN(__glewVertexAttrib2sv) -#define glVertexAttrib3d GLEW_GET_FUN(__glewVertexAttrib3d) -#define glVertexAttrib3dv GLEW_GET_FUN(__glewVertexAttrib3dv) -#define glVertexAttrib3f GLEW_GET_FUN(__glewVertexAttrib3f) -#define glVertexAttrib3fv GLEW_GET_FUN(__glewVertexAttrib3fv) -#define glVertexAttrib3s GLEW_GET_FUN(__glewVertexAttrib3s) -#define glVertexAttrib3sv GLEW_GET_FUN(__glewVertexAttrib3sv) -#define glVertexAttrib4Nbv GLEW_GET_FUN(__glewVertexAttrib4Nbv) -#define glVertexAttrib4Niv GLEW_GET_FUN(__glewVertexAttrib4Niv) -#define glVertexAttrib4Nsv GLEW_GET_FUN(__glewVertexAttrib4Nsv) -#define glVertexAttrib4Nub GLEW_GET_FUN(__glewVertexAttrib4Nub) -#define glVertexAttrib4Nubv GLEW_GET_FUN(__glewVertexAttrib4Nubv) -#define glVertexAttrib4Nuiv GLEW_GET_FUN(__glewVertexAttrib4Nuiv) -#define glVertexAttrib4Nusv GLEW_GET_FUN(__glewVertexAttrib4Nusv) -#define glVertexAttrib4bv GLEW_GET_FUN(__glewVertexAttrib4bv) -#define glVertexAttrib4d GLEW_GET_FUN(__glewVertexAttrib4d) -#define glVertexAttrib4dv GLEW_GET_FUN(__glewVertexAttrib4dv) -#define glVertexAttrib4f GLEW_GET_FUN(__glewVertexAttrib4f) -#define glVertexAttrib4fv GLEW_GET_FUN(__glewVertexAttrib4fv) -#define glVertexAttrib4iv GLEW_GET_FUN(__glewVertexAttrib4iv) -#define glVertexAttrib4s GLEW_GET_FUN(__glewVertexAttrib4s) -#define glVertexAttrib4sv GLEW_GET_FUN(__glewVertexAttrib4sv) -#define glVertexAttrib4ubv GLEW_GET_FUN(__glewVertexAttrib4ubv) -#define glVertexAttrib4uiv GLEW_GET_FUN(__glewVertexAttrib4uiv) -#define glVertexAttrib4usv GLEW_GET_FUN(__glewVertexAttrib4usv) -#define glVertexAttribPointer GLEW_GET_FUN(__glewVertexAttribPointer) - -#define GLEW_VERSION_2_0 GLEW_GET_VAR(__GLEW_VERSION_2_0) - -#endif /* GL_VERSION_2_0 */ - -/* ----------------------------- GL_VERSION_2_1 ---------------------------- */ - -#ifndef GL_VERSION_2_1 -#define GL_VERSION_2_1 1 - -#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F -#define GL_PIXEL_PACK_BUFFER 0x88EB -#define GL_PIXEL_UNPACK_BUFFER 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF -#define GL_FLOAT_MAT2x3 0x8B65 -#define GL_FLOAT_MAT2x4 0x8B66 -#define GL_FLOAT_MAT3x2 0x8B67 -#define GL_FLOAT_MAT3x4 0x8B68 -#define GL_FLOAT_MAT4x2 0x8B69 -#define GL_FLOAT_MAT4x3 0x8B6A -#define GL_SRGB 0x8C40 -#define GL_SRGB8 0x8C41 -#define GL_SRGB_ALPHA 0x8C42 -#define GL_SRGB8_ALPHA8 0x8C43 -#define GL_SLUMINANCE_ALPHA 0x8C44 -#define GL_SLUMINANCE8_ALPHA8 0x8C45 -#define GL_SLUMINANCE 0x8C46 -#define GL_SLUMINANCE8 0x8C47 -#define GL_COMPRESSED_SRGB 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 -#define GL_COMPRESSED_SLUMINANCE 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B - -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -#define glUniformMatrix2x3fv GLEW_GET_FUN(__glewUniformMatrix2x3fv) -#define glUniformMatrix2x4fv GLEW_GET_FUN(__glewUniformMatrix2x4fv) -#define glUniformMatrix3x2fv GLEW_GET_FUN(__glewUniformMatrix3x2fv) -#define glUniformMatrix3x4fv GLEW_GET_FUN(__glewUniformMatrix3x4fv) -#define glUniformMatrix4x2fv GLEW_GET_FUN(__glewUniformMatrix4x2fv) -#define glUniformMatrix4x3fv GLEW_GET_FUN(__glewUniformMatrix4x3fv) - -#define GLEW_VERSION_2_1 GLEW_GET_VAR(__GLEW_VERSION_2_1) - -#endif /* GL_VERSION_2_1 */ - -/* ----------------------------- GL_VERSION_3_0 ---------------------------- */ - -#ifndef GL_VERSION_3_0 -#define GL_VERSION_3_0 1 - -#define GL_CLIP_DISTANCE0 GL_CLIP_PLANE0 -#define GL_CLIP_DISTANCE1 GL_CLIP_PLANE1 -#define GL_CLIP_DISTANCE2 GL_CLIP_PLANE2 -#define GL_CLIP_DISTANCE3 GL_CLIP_PLANE3 -#define GL_CLIP_DISTANCE4 GL_CLIP_PLANE4 -#define GL_CLIP_DISTANCE5 GL_CLIP_PLANE5 -#define GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE_ARB -#define GL_MAX_CLIP_DISTANCES GL_MAX_CLIP_PLANES -#define GL_MAX_VARYING_COMPONENTS GL_MAX_VARYING_FLOATS -#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 -#define GL_MAJOR_VERSION 0x821B -#define GL_MINOR_VERSION 0x821C -#define GL_NUM_EXTENSIONS 0x821D -#define GL_CONTEXT_FLAGS 0x821E -#define GL_DEPTH_BUFFER 0x8223 -#define GL_STENCIL_BUFFER 0x8224 -#define GL_RGBA32F 0x8814 -#define GL_RGB32F 0x8815 -#define GL_RGBA16F 0x881A -#define GL_RGB16F 0x881B -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD -#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF -#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 -#define GL_CLAMP_VERTEX_COLOR 0x891A -#define GL_CLAMP_FRAGMENT_COLOR 0x891B -#define GL_CLAMP_READ_COLOR 0x891C -#define GL_FIXED_ONLY 0x891D -#define GL_TEXTURE_RED_TYPE 0x8C10 -#define GL_TEXTURE_GREEN_TYPE 0x8C11 -#define GL_TEXTURE_BLUE_TYPE 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE 0x8C16 -#define GL_TEXTURE_1D_ARRAY 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19 -#define GL_TEXTURE_2D_ARRAY 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D -#define GL_R11F_G11F_B10F 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B -#define GL_RGB9_E5 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E -#define GL_TEXTURE_SHARED_SIZE 0x8C3F -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 -#define GL_PRIMITIVES_GENERATED 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 -#define GL_RASTERIZER_DISCARD 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B -#define GL_INTERLEAVED_ATTRIBS 0x8C8C -#define GL_SEPARATE_ATTRIBS 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F -#define GL_RGBA32UI 0x8D70 -#define GL_RGB32UI 0x8D71 -#define GL_RGBA16UI 0x8D76 -#define GL_RGB16UI 0x8D77 -#define GL_RGBA8UI 0x8D7C -#define GL_RGB8UI 0x8D7D -#define GL_RGBA32I 0x8D82 -#define GL_RGB32I 0x8D83 -#define GL_RGBA16I 0x8D88 -#define GL_RGB16I 0x8D89 -#define GL_RGBA8I 0x8D8E -#define GL_RGB8I 0x8D8F -#define GL_RED_INTEGER 0x8D94 -#define GL_GREEN_INTEGER 0x8D95 -#define GL_BLUE_INTEGER 0x8D96 -#define GL_ALPHA_INTEGER 0x8D97 -#define GL_RGB_INTEGER 0x8D98 -#define GL_RGBA_INTEGER 0x8D99 -#define GL_BGR_INTEGER 0x8D9A -#define GL_BGRA_INTEGER 0x8D9B -#define GL_SAMPLER_1D_ARRAY 0x8DC0 -#define GL_SAMPLER_2D_ARRAY 0x8DC1 -#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW 0x8DC5 -#define GL_UNSIGNED_INT_VEC2 0x8DC6 -#define GL_UNSIGNED_INT_VEC3 0x8DC7 -#define GL_UNSIGNED_INT_VEC4 0x8DC8 -#define GL_INT_SAMPLER_1D 0x8DC9 -#define GL_INT_SAMPLER_2D 0x8DCA -#define GL_INT_SAMPLER_3D 0x8DCB -#define GL_INT_SAMPLER_CUBE 0x8DCC -#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF -#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7 -#define GL_QUERY_WAIT 0x8E13 -#define GL_QUERY_NO_WAIT 0x8E14 -#define GL_QUERY_BY_REGION_WAIT 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16 - -typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode); -typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode); -typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint colorNumber, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawBuffer, GLfloat depth, GLint stencil); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawBuffer, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawBuffer, const GLint* value); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawBuffer, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLCOLORMASKIPROC) (GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -typedef void (GLAPIENTRY * PFNGLDISABLEIPROC) (GLenum cap, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEIPROC) (GLenum cap, GLuint index); -typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERPROC) (void); -typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETBOOLEANI_VPROC) (GLenum pname, GLuint index, GLboolean* data); -typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar* name); -typedef const GLubyte* (GLAPIENTRY * PFNGLGETSTRINGIPROC) (GLenum name, GLuint index); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDIPROC) (GLenum cap, GLuint index); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar *const* varyings, GLenum bufferMode); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint v0, GLint v1); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint v0, GLuint v1); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint v0, GLint v1, GLint v2); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint v0, GLuint v1, GLuint v2); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void*pointer); - -#define glBeginConditionalRender GLEW_GET_FUN(__glewBeginConditionalRender) -#define glBeginTransformFeedback GLEW_GET_FUN(__glewBeginTransformFeedback) -#define glBindFragDataLocation GLEW_GET_FUN(__glewBindFragDataLocation) -#define glClampColor GLEW_GET_FUN(__glewClampColor) -#define glClearBufferfi GLEW_GET_FUN(__glewClearBufferfi) -#define glClearBufferfv GLEW_GET_FUN(__glewClearBufferfv) -#define glClearBufferiv GLEW_GET_FUN(__glewClearBufferiv) -#define glClearBufferuiv GLEW_GET_FUN(__glewClearBufferuiv) -#define glColorMaski GLEW_GET_FUN(__glewColorMaski) -#define glDisablei GLEW_GET_FUN(__glewDisablei) -#define glEnablei GLEW_GET_FUN(__glewEnablei) -#define glEndConditionalRender GLEW_GET_FUN(__glewEndConditionalRender) -#define glEndTransformFeedback GLEW_GET_FUN(__glewEndTransformFeedback) -#define glGetBooleani_v GLEW_GET_FUN(__glewGetBooleani_v) -#define glGetFragDataLocation GLEW_GET_FUN(__glewGetFragDataLocation) -#define glGetStringi GLEW_GET_FUN(__glewGetStringi) -#define glGetTexParameterIiv GLEW_GET_FUN(__glewGetTexParameterIiv) -#define glGetTexParameterIuiv GLEW_GET_FUN(__glewGetTexParameterIuiv) -#define glGetTransformFeedbackVarying GLEW_GET_FUN(__glewGetTransformFeedbackVarying) -#define glGetUniformuiv GLEW_GET_FUN(__glewGetUniformuiv) -#define glGetVertexAttribIiv GLEW_GET_FUN(__glewGetVertexAttribIiv) -#define glGetVertexAttribIuiv GLEW_GET_FUN(__glewGetVertexAttribIuiv) -#define glIsEnabledi GLEW_GET_FUN(__glewIsEnabledi) -#define glTexParameterIiv GLEW_GET_FUN(__glewTexParameterIiv) -#define glTexParameterIuiv GLEW_GET_FUN(__glewTexParameterIuiv) -#define glTransformFeedbackVaryings GLEW_GET_FUN(__glewTransformFeedbackVaryings) -#define glUniform1ui GLEW_GET_FUN(__glewUniform1ui) -#define glUniform1uiv GLEW_GET_FUN(__glewUniform1uiv) -#define glUniform2ui GLEW_GET_FUN(__glewUniform2ui) -#define glUniform2uiv GLEW_GET_FUN(__glewUniform2uiv) -#define glUniform3ui GLEW_GET_FUN(__glewUniform3ui) -#define glUniform3uiv GLEW_GET_FUN(__glewUniform3uiv) -#define glUniform4ui GLEW_GET_FUN(__glewUniform4ui) -#define glUniform4uiv GLEW_GET_FUN(__glewUniform4uiv) -#define glVertexAttribI1i GLEW_GET_FUN(__glewVertexAttribI1i) -#define glVertexAttribI1iv GLEW_GET_FUN(__glewVertexAttribI1iv) -#define glVertexAttribI1ui GLEW_GET_FUN(__glewVertexAttribI1ui) -#define glVertexAttribI1uiv GLEW_GET_FUN(__glewVertexAttribI1uiv) -#define glVertexAttribI2i GLEW_GET_FUN(__glewVertexAttribI2i) -#define glVertexAttribI2iv GLEW_GET_FUN(__glewVertexAttribI2iv) -#define glVertexAttribI2ui GLEW_GET_FUN(__glewVertexAttribI2ui) -#define glVertexAttribI2uiv GLEW_GET_FUN(__glewVertexAttribI2uiv) -#define glVertexAttribI3i GLEW_GET_FUN(__glewVertexAttribI3i) -#define glVertexAttribI3iv GLEW_GET_FUN(__glewVertexAttribI3iv) -#define glVertexAttribI3ui GLEW_GET_FUN(__glewVertexAttribI3ui) -#define glVertexAttribI3uiv GLEW_GET_FUN(__glewVertexAttribI3uiv) -#define glVertexAttribI4bv GLEW_GET_FUN(__glewVertexAttribI4bv) -#define glVertexAttribI4i GLEW_GET_FUN(__glewVertexAttribI4i) -#define glVertexAttribI4iv GLEW_GET_FUN(__glewVertexAttribI4iv) -#define glVertexAttribI4sv GLEW_GET_FUN(__glewVertexAttribI4sv) -#define glVertexAttribI4ubv GLEW_GET_FUN(__glewVertexAttribI4ubv) -#define glVertexAttribI4ui GLEW_GET_FUN(__glewVertexAttribI4ui) -#define glVertexAttribI4uiv GLEW_GET_FUN(__glewVertexAttribI4uiv) -#define glVertexAttribI4usv GLEW_GET_FUN(__glewVertexAttribI4usv) -#define glVertexAttribIPointer GLEW_GET_FUN(__glewVertexAttribIPointer) - -#define GLEW_VERSION_3_0 GLEW_GET_VAR(__GLEW_VERSION_3_0) - -#endif /* GL_VERSION_3_0 */ - -/* ----------------------------- GL_VERSION_3_1 ---------------------------- */ - -#ifndef GL_VERSION_3_1 -#define GL_VERSION_3_1 1 - -#define GL_TEXTURE_RECTANGLE 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8 -#define GL_SAMPLER_2D_RECT 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64 -#define GL_TEXTURE_BUFFER 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT 0x8C2E -#define GL_SAMPLER_BUFFER 0x8DC2 -#define GL_INT_SAMPLER_2D_RECT 0x8DCD -#define GL_INT_SAMPLER_BUFFER 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8 -#define GL_RED_SNORM 0x8F90 -#define GL_RG_SNORM 0x8F91 -#define GL_RGB_SNORM 0x8F92 -#define GL_RGBA_SNORM 0x8F93 -#define GL_R8_SNORM 0x8F94 -#define GL_RG8_SNORM 0x8F95 -#define GL_RGB8_SNORM 0x8F96 -#define GL_RGBA8_SNORM 0x8F97 -#define GL_R16_SNORM 0x8F98 -#define GL_RG16_SNORM 0x8F99 -#define GL_RGB16_SNORM 0x8F9A -#define GL_RGBA16_SNORM 0x8F9B -#define GL_SIGNED_NORMALIZED 0x8F9C -#define GL_PRIMITIVE_RESTART 0x8F9D -#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E -#define GL_BUFFER_ACCESS_FLAGS 0x911F -#define GL_BUFFER_MAP_LENGTH 0x9120 -#define GL_BUFFER_MAP_OFFSET 0x9121 - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalFormat, GLuint buffer); - -#define glDrawArraysInstanced GLEW_GET_FUN(__glewDrawArraysInstanced) -#define glDrawElementsInstanced GLEW_GET_FUN(__glewDrawElementsInstanced) -#define glPrimitiveRestartIndex GLEW_GET_FUN(__glewPrimitiveRestartIndex) -#define glTexBuffer GLEW_GET_FUN(__glewTexBuffer) - -#define GLEW_VERSION_3_1 GLEW_GET_VAR(__GLEW_VERSION_3_1) - -#endif /* GL_VERSION_3_1 */ - -/* ----------------------------- GL_VERSION_3_2 ---------------------------- */ - -#ifndef GL_VERSION_3_2 -#define GL_VERSION_3_2 1 - -#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 -#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 -#define GL_LINES_ADJACENCY 0x000A -#define GL_LINE_STRIP_ADJACENCY 0x000B -#define GL_TRIANGLES_ADJACENCY 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D -#define GL_PROGRAM_POINT_SIZE 0x8642 -#define GL_GEOMETRY_VERTICES_OUT 0x8916 -#define GL_GEOMETRY_INPUT_TYPE 0x8917 -#define GL_GEOMETRY_OUTPUT_TYPE 0x8918 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8 -#define GL_GEOMETRY_SHADER 0x8DD9 -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1 -#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122 -#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123 -#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124 -#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125 -#define GL_CONTEXT_PROFILE_MASK 0x9126 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum value, GLint64 * data); -typedef void (GLAPIENTRY * PFNGLGETINTEGER64I_VPROC) (GLenum pname, GLuint index, GLint64 * data); - -#define glFramebufferTexture GLEW_GET_FUN(__glewFramebufferTexture) -#define glGetBufferParameteri64v GLEW_GET_FUN(__glewGetBufferParameteri64v) -#define glGetInteger64i_v GLEW_GET_FUN(__glewGetInteger64i_v) - -#define GLEW_VERSION_3_2 GLEW_GET_VAR(__GLEW_VERSION_3_2) - -#endif /* GL_VERSION_3_2 */ - -/* ----------------------------- GL_VERSION_3_3 ---------------------------- */ - -#ifndef GL_VERSION_3_3 -#define GL_VERSION_3_3 1 - -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE -#define GL_RGB10_A2UI 0x906F - -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor); - -#define glVertexAttribDivisor GLEW_GET_FUN(__glewVertexAttribDivisor) - -#define GLEW_VERSION_3_3 GLEW_GET_VAR(__GLEW_VERSION_3_3) - -#endif /* GL_VERSION_3_3 */ - -/* ----------------------------- GL_VERSION_4_0 ---------------------------- */ - -#ifndef GL_VERSION_4_0 -#define GL_VERSION_4_0 1 - -#define GL_SAMPLE_SHADING 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F -#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS 0x8F9F -#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGPROC) (GLclampf value); - -#define glBlendEquationSeparatei GLEW_GET_FUN(__glewBlendEquationSeparatei) -#define glBlendEquationi GLEW_GET_FUN(__glewBlendEquationi) -#define glBlendFuncSeparatei GLEW_GET_FUN(__glewBlendFuncSeparatei) -#define glBlendFunci GLEW_GET_FUN(__glewBlendFunci) -#define glMinSampleShading GLEW_GET_FUN(__glewMinSampleShading) - -#define GLEW_VERSION_4_0 GLEW_GET_VAR(__GLEW_VERSION_4_0) - -#endif /* GL_VERSION_4_0 */ - -/* ----------------------------- GL_VERSION_4_1 ---------------------------- */ - -#ifndef GL_VERSION_4_1 -#define GL_VERSION_4_1 1 - -#define GLEW_VERSION_4_1 GLEW_GET_VAR(__GLEW_VERSION_4_1) - -#endif /* GL_VERSION_4_1 */ - -/* ----------------------------- GL_VERSION_4_2 ---------------------------- */ - -#ifndef GL_VERSION_4_2 -#define GL_VERSION_4_2 1 - -#define GL_TRANSFORM_FEEDBACK_PAUSED 0x8E23 -#define GL_TRANSFORM_FEEDBACK_ACTIVE 0x8E24 -#define GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C -#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D -#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E -#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F -#define GL_COPY_READ_BUFFER_BINDING 0x8F36 -#define GL_COPY_WRITE_BUFFER_BINDING 0x8F37 - -#define GLEW_VERSION_4_2 GLEW_GET_VAR(__GLEW_VERSION_4_2) - -#endif /* GL_VERSION_4_2 */ - -/* ----------------------------- GL_VERSION_4_3 ---------------------------- */ - -#ifndef GL_VERSION_4_3 -#define GL_VERSION_4_3 1 - -#define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9 -#define GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E - -#define GLEW_VERSION_4_3 GLEW_GET_VAR(__GLEW_VERSION_4_3) - -#endif /* GL_VERSION_4_3 */ - -/* ----------------------------- GL_VERSION_4_4 ---------------------------- */ - -#ifndef GL_VERSION_4_4 -#define GL_VERSION_4_4 1 - -#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221 -#define GL_MAX_VERTEX_ATTRIB_STRIDE 0x82E5 -#define GL_TEXTURE_BUFFER_BINDING 0x8C2A - -#define GLEW_VERSION_4_4 GLEW_GET_VAR(__GLEW_VERSION_4_4) - -#endif /* GL_VERSION_4_4 */ - -/* ----------------------------- GL_VERSION_4_5 ---------------------------- */ - -#ifndef GL_VERSION_4_5 -#define GL_VERSION_4_5 1 - -#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT 0x00000004 - -typedef GLenum (GLAPIENTRY * PFNGLGETGRAPHICSRESETSTATUSPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETNCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, GLsizei bufSize, GLvoid *pixels); -typedef void (GLAPIENTRY * PFNGLGETNTEXIMAGEPROC) (GLenum tex, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *pixels); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMDVPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params); - -#define glGetGraphicsResetStatus GLEW_GET_FUN(__glewGetGraphicsResetStatus) -#define glGetnCompressedTexImage GLEW_GET_FUN(__glewGetnCompressedTexImage) -#define glGetnTexImage GLEW_GET_FUN(__glewGetnTexImage) -#define glGetnUniformdv GLEW_GET_FUN(__glewGetnUniformdv) - -#define GLEW_VERSION_4_5 GLEW_GET_VAR(__GLEW_VERSION_4_5) - -#endif /* GL_VERSION_4_5 */ - -/* -------------------------- GL_3DFX_multisample -------------------------- */ - -#ifndef GL_3DFX_multisample -#define GL_3DFX_multisample 1 - -#define GL_MULTISAMPLE_3DFX 0x86B2 -#define GL_SAMPLE_BUFFERS_3DFX 0x86B3 -#define GL_SAMPLES_3DFX 0x86B4 -#define GL_MULTISAMPLE_BIT_3DFX 0x20000000 - -#define GLEW_3DFX_multisample GLEW_GET_VAR(__GLEW_3DFX_multisample) - -#endif /* GL_3DFX_multisample */ - -/* ---------------------------- GL_3DFX_tbuffer ---------------------------- */ - -#ifndef GL_3DFX_tbuffer -#define GL_3DFX_tbuffer 1 - -typedef void (GLAPIENTRY * PFNGLTBUFFERMASK3DFXPROC) (GLuint mask); - -#define glTbufferMask3DFX GLEW_GET_FUN(__glewTbufferMask3DFX) - -#define GLEW_3DFX_tbuffer GLEW_GET_VAR(__GLEW_3DFX_tbuffer) - -#endif /* GL_3DFX_tbuffer */ - -/* -------------------- GL_3DFX_texture_compression_FXT1 ------------------- */ - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_3DFX_texture_compression_FXT1 1 - -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 -#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 - -#define GLEW_3DFX_texture_compression_FXT1 GLEW_GET_VAR(__GLEW_3DFX_texture_compression_FXT1) - -#endif /* GL_3DFX_texture_compression_FXT1 */ - -/* ----------------------- GL_AMD_blend_minmax_factor ---------------------- */ - -#ifndef GL_AMD_blend_minmax_factor -#define GL_AMD_blend_minmax_factor 1 - -#define GL_FACTOR_MIN_AMD 0x901C -#define GL_FACTOR_MAX_AMD 0x901D - -#define GLEW_AMD_blend_minmax_factor GLEW_GET_VAR(__GLEW_AMD_blend_minmax_factor) - -#endif /* GL_AMD_blend_minmax_factor */ - -/* ----------------------- GL_AMD_conservative_depth ----------------------- */ - -#ifndef GL_AMD_conservative_depth -#define GL_AMD_conservative_depth 1 - -#define GLEW_AMD_conservative_depth GLEW_GET_VAR(__GLEW_AMD_conservative_depth) - -#endif /* GL_AMD_conservative_depth */ - -/* -------------------------- GL_AMD_debug_output -------------------------- */ - -#ifndef GL_AMD_debug_output -#define GL_AMD_debug_output 1 - -#define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_AMD 0x9147 -#define GL_DEBUG_SEVERITY_LOW_AMD 0x9148 -#define GL_DEBUG_CATEGORY_API_ERROR_AMD 0x9149 -#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A -#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B -#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C -#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D -#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E -#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F -#define GL_DEBUG_CATEGORY_OTHER_AMD 0x9150 - -typedef void (GLAPIENTRY *GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar* message, void* userParam); - -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar* buf); -typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, GLchar* message); - -#define glDebugMessageCallbackAMD GLEW_GET_FUN(__glewDebugMessageCallbackAMD) -#define glDebugMessageEnableAMD GLEW_GET_FUN(__glewDebugMessageEnableAMD) -#define glDebugMessageInsertAMD GLEW_GET_FUN(__glewDebugMessageInsertAMD) -#define glGetDebugMessageLogAMD GLEW_GET_FUN(__glewGetDebugMessageLogAMD) - -#define GLEW_AMD_debug_output GLEW_GET_VAR(__GLEW_AMD_debug_output) - -#endif /* GL_AMD_debug_output */ - -/* ---------------------- GL_AMD_depth_clamp_separate ---------------------- */ - -#ifndef GL_AMD_depth_clamp_separate -#define GL_AMD_depth_clamp_separate 1 - -#define GL_DEPTH_CLAMP_NEAR_AMD 0x901E -#define GL_DEPTH_CLAMP_FAR_AMD 0x901F - -#define GLEW_AMD_depth_clamp_separate GLEW_GET_VAR(__GLEW_AMD_depth_clamp_separate) - -#endif /* GL_AMD_depth_clamp_separate */ - -/* ----------------------- GL_AMD_draw_buffers_blend ----------------------- */ - -#ifndef GL_AMD_draw_buffers_blend -#define GL_AMD_draw_buffers_blend 1 - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); - -#define glBlendEquationIndexedAMD GLEW_GET_FUN(__glewBlendEquationIndexedAMD) -#define glBlendEquationSeparateIndexedAMD GLEW_GET_FUN(__glewBlendEquationSeparateIndexedAMD) -#define glBlendFuncIndexedAMD GLEW_GET_FUN(__glewBlendFuncIndexedAMD) -#define glBlendFuncSeparateIndexedAMD GLEW_GET_FUN(__glewBlendFuncSeparateIndexedAMD) - -#define GLEW_AMD_draw_buffers_blend GLEW_GET_VAR(__GLEW_AMD_draw_buffers_blend) - -#endif /* GL_AMD_draw_buffers_blend */ - -/* --------------------------- GL_AMD_gcn_shader --------------------------- */ - -#ifndef GL_AMD_gcn_shader -#define GL_AMD_gcn_shader 1 - -#define GLEW_AMD_gcn_shader GLEW_GET_VAR(__GLEW_AMD_gcn_shader) - -#endif /* GL_AMD_gcn_shader */ - -/* ------------------------ GL_AMD_gpu_shader_int64 ------------------------ */ - -#ifndef GL_AMD_gpu_shader_int64 -#define GL_AMD_gpu_shader_int64 1 - -#define GLEW_AMD_gpu_shader_int64 GLEW_GET_VAR(__GLEW_AMD_gpu_shader_int64) - -#endif /* GL_AMD_gpu_shader_int64 */ - -/* ---------------------- GL_AMD_interleaved_elements ---------------------- */ - -#ifndef GL_AMD_interleaved_elements -#define GL_AMD_interleaved_elements 1 - -#define GL_RED 0x1903 -#define GL_GREEN 0x1904 -#define GL_BLUE 0x1905 -#define GL_ALPHA 0x1906 -#define GL_RG8UI 0x8238 -#define GL_RG16UI 0x823A -#define GL_RGBA8UI 0x8D7C -#define GL_VERTEX_ELEMENT_SWIZZLE_AMD 0x91A4 -#define GL_VERTEX_ID_SWIZZLE_AMD 0x91A5 - -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPARAMETERIAMDPROC) (GLuint index, GLenum pname, GLint param); - -#define glVertexAttribParameteriAMD GLEW_GET_FUN(__glewVertexAttribParameteriAMD) - -#define GLEW_AMD_interleaved_elements GLEW_GET_VAR(__GLEW_AMD_interleaved_elements) - -#endif /* GL_AMD_interleaved_elements */ - -/* ----------------------- GL_AMD_multi_draw_indirect ---------------------- */ - -#ifndef GL_AMD_multi_draw_indirect -#define GL_AMD_multi_draw_indirect 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride); - -#define glMultiDrawArraysIndirectAMD GLEW_GET_FUN(__glewMultiDrawArraysIndirectAMD) -#define glMultiDrawElementsIndirectAMD GLEW_GET_FUN(__glewMultiDrawElementsIndirectAMD) - -#define GLEW_AMD_multi_draw_indirect GLEW_GET_VAR(__GLEW_AMD_multi_draw_indirect) - -#endif /* GL_AMD_multi_draw_indirect */ - -/* ------------------------- GL_AMD_name_gen_delete ------------------------ */ - -#ifndef GL_AMD_name_gen_delete -#define GL_AMD_name_gen_delete 1 - -#define GL_DATA_BUFFER_AMD 0x9151 -#define GL_PERFORMANCE_MONITOR_AMD 0x9152 -#define GL_QUERY_OBJECT_AMD 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_AMD 0x9154 -#define GL_SAMPLER_OBJECT_AMD 0x9155 - -typedef void (GLAPIENTRY * PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint* names); -typedef void (GLAPIENTRY * PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint* names); -typedef GLboolean (GLAPIENTRY * PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name); - -#define glDeleteNamesAMD GLEW_GET_FUN(__glewDeleteNamesAMD) -#define glGenNamesAMD GLEW_GET_FUN(__glewGenNamesAMD) -#define glIsNameAMD GLEW_GET_FUN(__glewIsNameAMD) - -#define GLEW_AMD_name_gen_delete GLEW_GET_VAR(__GLEW_AMD_name_gen_delete) - -#endif /* GL_AMD_name_gen_delete */ - -/* ---------------------- GL_AMD_occlusion_query_event --------------------- */ - -#ifndef GL_AMD_occlusion_query_event -#define GL_AMD_occlusion_query_event 1 - -#define GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD 0x00000001 -#define GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD 0x00000002 -#define GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD 0x00000004 -#define GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD 0x00000008 -#define GL_OCCLUSION_QUERY_EVENT_MASK_AMD 0x874F -#define GL_QUERY_ALL_EVENT_BITS_AMD 0xFFFFFFFF - -typedef void (GLAPIENTRY * PFNGLQUERYOBJECTPARAMETERUIAMDPROC) (GLenum target, GLuint id, GLenum pname, GLuint param); - -#define glQueryObjectParameteruiAMD GLEW_GET_FUN(__glewQueryObjectParameteruiAMD) - -#define GLEW_AMD_occlusion_query_event GLEW_GET_VAR(__GLEW_AMD_occlusion_query_event) - -#endif /* GL_AMD_occlusion_query_event */ - -/* ----------------------- GL_AMD_performance_monitor ---------------------- */ - -#ifndef GL_AMD_performance_monitor -#define GL_AMD_performance_monitor 1 - -#define GL_COUNTER_TYPE_AMD 0x8BC0 -#define GL_COUNTER_RANGE_AMD 0x8BC1 -#define GL_UNSIGNED_INT64_AMD 0x8BC2 -#define GL_PERCENTAGE_AMD 0x8BC3 -#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 -#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 -#define GL_PERFMON_RESULT_AMD 0x8BC6 - -typedef void (GLAPIENTRY * PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GLAPIENTRY * PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint* monitors); -typedef void (GLAPIENTRY * PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GLAPIENTRY * PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint* monitors); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint* data, GLint *bytesWritten); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, GLchar *counterString); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint* numCounters, GLint *maxActiveCounters, GLsizei countersSize, GLuint *counters); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei* length, GLchar *groupString); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint* numGroups, GLsizei groupsSize, GLuint *groups); -typedef void (GLAPIENTRY * PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint* counterList); - -#define glBeginPerfMonitorAMD GLEW_GET_FUN(__glewBeginPerfMonitorAMD) -#define glDeletePerfMonitorsAMD GLEW_GET_FUN(__glewDeletePerfMonitorsAMD) -#define glEndPerfMonitorAMD GLEW_GET_FUN(__glewEndPerfMonitorAMD) -#define glGenPerfMonitorsAMD GLEW_GET_FUN(__glewGenPerfMonitorsAMD) -#define glGetPerfMonitorCounterDataAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterDataAMD) -#define glGetPerfMonitorCounterInfoAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterInfoAMD) -#define glGetPerfMonitorCounterStringAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterStringAMD) -#define glGetPerfMonitorCountersAMD GLEW_GET_FUN(__glewGetPerfMonitorCountersAMD) -#define glGetPerfMonitorGroupStringAMD GLEW_GET_FUN(__glewGetPerfMonitorGroupStringAMD) -#define glGetPerfMonitorGroupsAMD GLEW_GET_FUN(__glewGetPerfMonitorGroupsAMD) -#define glSelectPerfMonitorCountersAMD GLEW_GET_FUN(__glewSelectPerfMonitorCountersAMD) - -#define GLEW_AMD_performance_monitor GLEW_GET_VAR(__GLEW_AMD_performance_monitor) - -#endif /* GL_AMD_performance_monitor */ - -/* -------------------------- GL_AMD_pinned_memory ------------------------- */ - -#ifndef GL_AMD_pinned_memory -#define GL_AMD_pinned_memory 1 - -#define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160 - -#define GLEW_AMD_pinned_memory GLEW_GET_VAR(__GLEW_AMD_pinned_memory) - -#endif /* GL_AMD_pinned_memory */ - -/* ----------------------- GL_AMD_query_buffer_object ---------------------- */ - -#ifndef GL_AMD_query_buffer_object -#define GL_AMD_query_buffer_object 1 - -#define GL_QUERY_BUFFER_AMD 0x9192 -#define GL_QUERY_BUFFER_BINDING_AMD 0x9193 -#define GL_QUERY_RESULT_NO_WAIT_AMD 0x9194 - -#define GLEW_AMD_query_buffer_object GLEW_GET_VAR(__GLEW_AMD_query_buffer_object) - -#endif /* GL_AMD_query_buffer_object */ - -/* ------------------------ GL_AMD_sample_positions ------------------------ */ - -#ifndef GL_AMD_sample_positions -#define GL_AMD_sample_positions 1 - -#define GL_SUBSAMPLE_DISTANCE_AMD 0x883F - -typedef void (GLAPIENTRY * PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat* val); - -#define glSetMultisamplefvAMD GLEW_GET_FUN(__glewSetMultisamplefvAMD) - -#define GLEW_AMD_sample_positions GLEW_GET_VAR(__GLEW_AMD_sample_positions) - -#endif /* GL_AMD_sample_positions */ - -/* ------------------ GL_AMD_seamless_cubemap_per_texture ------------------ */ - -#ifndef GL_AMD_seamless_cubemap_per_texture -#define GL_AMD_seamless_cubemap_per_texture 1 - -#define GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB 0x884F - -#define GLEW_AMD_seamless_cubemap_per_texture GLEW_GET_VAR(__GLEW_AMD_seamless_cubemap_per_texture) - -#endif /* GL_AMD_seamless_cubemap_per_texture */ - -/* -------------------- GL_AMD_shader_atomic_counter_ops ------------------- */ - -#ifndef GL_AMD_shader_atomic_counter_ops -#define GL_AMD_shader_atomic_counter_ops 1 - -#define GLEW_AMD_shader_atomic_counter_ops GLEW_GET_VAR(__GLEW_AMD_shader_atomic_counter_ops) - -#endif /* GL_AMD_shader_atomic_counter_ops */ - -/* ---------------- GL_AMD_shader_explicit_vertex_parameter ---------------- */ - -#ifndef GL_AMD_shader_explicit_vertex_parameter -#define GL_AMD_shader_explicit_vertex_parameter 1 - -#define GLEW_AMD_shader_explicit_vertex_parameter GLEW_GET_VAR(__GLEW_AMD_shader_explicit_vertex_parameter) - -#endif /* GL_AMD_shader_explicit_vertex_parameter */ - -/* ---------------------- GL_AMD_shader_stencil_export --------------------- */ - -#ifndef GL_AMD_shader_stencil_export -#define GL_AMD_shader_stencil_export 1 - -#define GLEW_AMD_shader_stencil_export GLEW_GET_VAR(__GLEW_AMD_shader_stencil_export) - -#endif /* GL_AMD_shader_stencil_export */ - -/* ------------------- GL_AMD_shader_stencil_value_export ------------------ */ - -#ifndef GL_AMD_shader_stencil_value_export -#define GL_AMD_shader_stencil_value_export 1 - -#define GLEW_AMD_shader_stencil_value_export GLEW_GET_VAR(__GLEW_AMD_shader_stencil_value_export) - -#endif /* GL_AMD_shader_stencil_value_export */ - -/* ---------------------- GL_AMD_shader_trinary_minmax --------------------- */ - -#ifndef GL_AMD_shader_trinary_minmax -#define GL_AMD_shader_trinary_minmax 1 - -#define GLEW_AMD_shader_trinary_minmax GLEW_GET_VAR(__GLEW_AMD_shader_trinary_minmax) - -#endif /* GL_AMD_shader_trinary_minmax */ - -/* ------------------------- GL_AMD_sparse_texture ------------------------- */ - -#ifndef GL_AMD_sparse_texture -#define GL_AMD_sparse_texture 1 - -#define GL_TEXTURE_STORAGE_SPARSE_BIT_AMD 0x00000001 -#define GL_VIRTUAL_PAGE_SIZE_X_AMD 0x9195 -#define GL_VIRTUAL_PAGE_SIZE_Y_AMD 0x9196 -#define GL_VIRTUAL_PAGE_SIZE_Z_AMD 0x9197 -#define GL_MAX_SPARSE_TEXTURE_SIZE_AMD 0x9198 -#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199 -#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A -#define GL_MIN_SPARSE_LEVEL_AMD 0x919B -#define GL_MIN_LOD_WARNING_AMD 0x919C - -typedef void (GLAPIENTRY * PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags); - -#define glTexStorageSparseAMD GLEW_GET_FUN(__glewTexStorageSparseAMD) -#define glTextureStorageSparseAMD GLEW_GET_FUN(__glewTextureStorageSparseAMD) - -#define GLEW_AMD_sparse_texture GLEW_GET_VAR(__GLEW_AMD_sparse_texture) - -#endif /* GL_AMD_sparse_texture */ - -/* ------------------- GL_AMD_stencil_operation_extended ------------------- */ - -#ifndef GL_AMD_stencil_operation_extended -#define GL_AMD_stencil_operation_extended 1 - -#define GL_SET_AMD 0x874A -#define GL_REPLACE_VALUE_AMD 0x874B -#define GL_STENCIL_OP_VALUE_AMD 0x874C -#define GL_STENCIL_BACK_OP_VALUE_AMD 0x874D - -typedef void (GLAPIENTRY * PFNGLSTENCILOPVALUEAMDPROC) (GLenum face, GLuint value); - -#define glStencilOpValueAMD GLEW_GET_FUN(__glewStencilOpValueAMD) - -#define GLEW_AMD_stencil_operation_extended GLEW_GET_VAR(__GLEW_AMD_stencil_operation_extended) - -#endif /* GL_AMD_stencil_operation_extended */ - -/* ------------------------ GL_AMD_texture_texture4 ------------------------ */ - -#ifndef GL_AMD_texture_texture4 -#define GL_AMD_texture_texture4 1 - -#define GLEW_AMD_texture_texture4 GLEW_GET_VAR(__GLEW_AMD_texture_texture4) - -#endif /* GL_AMD_texture_texture4 */ - -/* --------------- GL_AMD_transform_feedback3_lines_triangles -------------- */ - -#ifndef GL_AMD_transform_feedback3_lines_triangles -#define GL_AMD_transform_feedback3_lines_triangles 1 - -#define GLEW_AMD_transform_feedback3_lines_triangles GLEW_GET_VAR(__GLEW_AMD_transform_feedback3_lines_triangles) - -#endif /* GL_AMD_transform_feedback3_lines_triangles */ - -/* ----------------------- GL_AMD_transform_feedback4 ---------------------- */ - -#ifndef GL_AMD_transform_feedback4 -#define GL_AMD_transform_feedback4 1 - -#define GL_STREAM_RASTERIZATION_AMD 0x91A0 - -#define GLEW_AMD_transform_feedback4 GLEW_GET_VAR(__GLEW_AMD_transform_feedback4) - -#endif /* GL_AMD_transform_feedback4 */ - -/* ----------------------- GL_AMD_vertex_shader_layer ---------------------- */ - -#ifndef GL_AMD_vertex_shader_layer -#define GL_AMD_vertex_shader_layer 1 - -#define GLEW_AMD_vertex_shader_layer GLEW_GET_VAR(__GLEW_AMD_vertex_shader_layer) - -#endif /* GL_AMD_vertex_shader_layer */ - -/* -------------------- GL_AMD_vertex_shader_tessellator ------------------- */ - -#ifndef GL_AMD_vertex_shader_tessellator -#define GL_AMD_vertex_shader_tessellator 1 - -#define GL_SAMPLER_BUFFER_AMD 0x9001 -#define GL_INT_SAMPLER_BUFFER_AMD 0x9002 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003 -#define GL_TESSELLATION_MODE_AMD 0x9004 -#define GL_TESSELLATION_FACTOR_AMD 0x9005 -#define GL_DISCRETE_AMD 0x9006 -#define GL_CONTINUOUS_AMD 0x9007 - -typedef void (GLAPIENTRY * PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor); -typedef void (GLAPIENTRY * PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode); - -#define glTessellationFactorAMD GLEW_GET_FUN(__glewTessellationFactorAMD) -#define glTessellationModeAMD GLEW_GET_FUN(__glewTessellationModeAMD) - -#define GLEW_AMD_vertex_shader_tessellator GLEW_GET_VAR(__GLEW_AMD_vertex_shader_tessellator) - -#endif /* GL_AMD_vertex_shader_tessellator */ - -/* ------------------ GL_AMD_vertex_shader_viewport_index ------------------ */ - -#ifndef GL_AMD_vertex_shader_viewport_index -#define GL_AMD_vertex_shader_viewport_index 1 - -#define GLEW_AMD_vertex_shader_viewport_index GLEW_GET_VAR(__GLEW_AMD_vertex_shader_viewport_index) - -#endif /* GL_AMD_vertex_shader_viewport_index */ - -/* ------------------------- GL_ANGLE_depth_texture ------------------------ */ - -#ifndef GL_ANGLE_depth_texture -#define GL_ANGLE_depth_texture 1 - -#define GLEW_ANGLE_depth_texture GLEW_GET_VAR(__GLEW_ANGLE_depth_texture) - -#endif /* GL_ANGLE_depth_texture */ - -/* ----------------------- GL_ANGLE_framebuffer_blit ----------------------- */ - -#ifndef GL_ANGLE_framebuffer_blit -#define GL_ANGLE_framebuffer_blit 1 - -#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA - -typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); - -#define glBlitFramebufferANGLE GLEW_GET_FUN(__glewBlitFramebufferANGLE) - -#define GLEW_ANGLE_framebuffer_blit GLEW_GET_VAR(__GLEW_ANGLE_framebuffer_blit) - -#endif /* GL_ANGLE_framebuffer_blit */ - -/* -------------------- GL_ANGLE_framebuffer_multisample ------------------- */ - -#ifndef GL_ANGLE_framebuffer_multisample -#define GL_ANGLE_framebuffer_multisample 1 - -#define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56 -#define GL_MAX_SAMPLES_ANGLE 0x8D57 - -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); - -#define glRenderbufferStorageMultisampleANGLE GLEW_GET_FUN(__glewRenderbufferStorageMultisampleANGLE) - -#define GLEW_ANGLE_framebuffer_multisample GLEW_GET_VAR(__GLEW_ANGLE_framebuffer_multisample) - -#endif /* GL_ANGLE_framebuffer_multisample */ - -/* ----------------------- GL_ANGLE_instanced_arrays ----------------------- */ - -#ifndef GL_ANGLE_instanced_arrays -#define GL_ANGLE_instanced_arrays 1 - -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); - -#define glDrawArraysInstancedANGLE GLEW_GET_FUN(__glewDrawArraysInstancedANGLE) -#define glDrawElementsInstancedANGLE GLEW_GET_FUN(__glewDrawElementsInstancedANGLE) -#define glVertexAttribDivisorANGLE GLEW_GET_FUN(__glewVertexAttribDivisorANGLE) - -#define GLEW_ANGLE_instanced_arrays GLEW_GET_VAR(__GLEW_ANGLE_instanced_arrays) - -#endif /* GL_ANGLE_instanced_arrays */ - -/* -------------------- GL_ANGLE_pack_reverse_row_order -------------------- */ - -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_ANGLE_pack_reverse_row_order 1 - -#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 - -#define GLEW_ANGLE_pack_reverse_row_order GLEW_GET_VAR(__GLEW_ANGLE_pack_reverse_row_order) - -#endif /* GL_ANGLE_pack_reverse_row_order */ - -/* ------------------------ GL_ANGLE_program_binary ------------------------ */ - -#ifndef GL_ANGLE_program_binary -#define GL_ANGLE_program_binary 1 - -#define GL_PROGRAM_BINARY_ANGLE 0x93A6 - -#define GLEW_ANGLE_program_binary GLEW_GET_VAR(__GLEW_ANGLE_program_binary) - -#endif /* GL_ANGLE_program_binary */ - -/* ------------------- GL_ANGLE_texture_compression_dxt1 ------------------- */ - -#ifndef GL_ANGLE_texture_compression_dxt1 -#define GL_ANGLE_texture_compression_dxt1 1 - -#define GL_COMPRESSED_RGB_S3TC_DXT1_ANGLE 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_ANGLE 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 - -#define GLEW_ANGLE_texture_compression_dxt1 GLEW_GET_VAR(__GLEW_ANGLE_texture_compression_dxt1) - -#endif /* GL_ANGLE_texture_compression_dxt1 */ - -/* ------------------- GL_ANGLE_texture_compression_dxt3 ------------------- */ - -#ifndef GL_ANGLE_texture_compression_dxt3 -#define GL_ANGLE_texture_compression_dxt3 1 - -#define GL_COMPRESSED_RGB_S3TC_DXT1_ANGLE 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_ANGLE 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 - -#define GLEW_ANGLE_texture_compression_dxt3 GLEW_GET_VAR(__GLEW_ANGLE_texture_compression_dxt3) - -#endif /* GL_ANGLE_texture_compression_dxt3 */ - -/* ------------------- GL_ANGLE_texture_compression_dxt5 ------------------- */ - -#ifndef GL_ANGLE_texture_compression_dxt5 -#define GL_ANGLE_texture_compression_dxt5 1 - -#define GL_COMPRESSED_RGB_S3TC_DXT1_ANGLE 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_ANGLE 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 - -#define GLEW_ANGLE_texture_compression_dxt5 GLEW_GET_VAR(__GLEW_ANGLE_texture_compression_dxt5) - -#endif /* GL_ANGLE_texture_compression_dxt5 */ - -/* ------------------------- GL_ANGLE_texture_usage ------------------------ */ - -#ifndef GL_ANGLE_texture_usage -#define GL_ANGLE_texture_usage 1 - -#define GL_TEXTURE_USAGE_ANGLE 0x93A2 -#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 - -#define GLEW_ANGLE_texture_usage GLEW_GET_VAR(__GLEW_ANGLE_texture_usage) - -#endif /* GL_ANGLE_texture_usage */ - -/* -------------------------- GL_ANGLE_timer_query ------------------------- */ - -#ifndef GL_ANGLE_timer_query -#define GL_ANGLE_timer_query 1 - -#define GL_QUERY_COUNTER_BITS_ANGLE 0x8864 -#define GL_CURRENT_QUERY_ANGLE 0x8865 -#define GL_QUERY_RESULT_ANGLE 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ANGLE 0x8867 -#define GL_TIME_ELAPSED_ANGLE 0x88BF -#define GL_TIMESTAMP_ANGLE 0x8E28 - -typedef void (GLAPIENTRY * PFNGLBEGINQUERYANGLEPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEQUERIESANGLEPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLENDQUERYANGLEPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGENQUERIESANGLEPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VANGLEPROC) (GLuint id, GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVANGLEPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VANGLEPROC) (GLuint id, GLenum pname, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVANGLEPROC) (GLuint id, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYIVANGLEPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISQUERYANGLEPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLQUERYCOUNTERANGLEPROC) (GLuint id, GLenum target); - -#define glBeginQueryANGLE GLEW_GET_FUN(__glewBeginQueryANGLE) -#define glDeleteQueriesANGLE GLEW_GET_FUN(__glewDeleteQueriesANGLE) -#define glEndQueryANGLE GLEW_GET_FUN(__glewEndQueryANGLE) -#define glGenQueriesANGLE GLEW_GET_FUN(__glewGenQueriesANGLE) -#define glGetQueryObjecti64vANGLE GLEW_GET_FUN(__glewGetQueryObjecti64vANGLE) -#define glGetQueryObjectivANGLE GLEW_GET_FUN(__glewGetQueryObjectivANGLE) -#define glGetQueryObjectui64vANGLE GLEW_GET_FUN(__glewGetQueryObjectui64vANGLE) -#define glGetQueryObjectuivANGLE GLEW_GET_FUN(__glewGetQueryObjectuivANGLE) -#define glGetQueryivANGLE GLEW_GET_FUN(__glewGetQueryivANGLE) -#define glIsQueryANGLE GLEW_GET_FUN(__glewIsQueryANGLE) -#define glQueryCounterANGLE GLEW_GET_FUN(__glewQueryCounterANGLE) - -#define GLEW_ANGLE_timer_query GLEW_GET_VAR(__GLEW_ANGLE_timer_query) - -#endif /* GL_ANGLE_timer_query */ - -/* ------------------- GL_ANGLE_translated_shader_source ------------------- */ - -#ifndef GL_ANGLE_translated_shader_source -#define GL_ANGLE_translated_shader_source 1 - -#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 - -typedef void (GLAPIENTRY * PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source); - -#define glGetTranslatedShaderSourceANGLE GLEW_GET_FUN(__glewGetTranslatedShaderSourceANGLE) - -#define GLEW_ANGLE_translated_shader_source GLEW_GET_VAR(__GLEW_ANGLE_translated_shader_source) - -#endif /* GL_ANGLE_translated_shader_source */ - -/* ----------------------- GL_APPLE_aux_depth_stencil ---------------------- */ - -#ifndef GL_APPLE_aux_depth_stencil -#define GL_APPLE_aux_depth_stencil 1 - -#define GL_AUX_DEPTH_STENCIL_APPLE 0x8A14 - -#define GLEW_APPLE_aux_depth_stencil GLEW_GET_VAR(__GLEW_APPLE_aux_depth_stencil) - -#endif /* GL_APPLE_aux_depth_stencil */ - -/* ------------------------ GL_APPLE_client_storage ------------------------ */ - -#ifndef GL_APPLE_client_storage -#define GL_APPLE_client_storage 1 - -#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 - -#define GLEW_APPLE_client_storage GLEW_GET_VAR(__GLEW_APPLE_client_storage) - -#endif /* GL_APPLE_client_storage */ - -/* ------------------------- GL_APPLE_element_array ------------------------ */ - -#ifndef GL_APPLE_element_array -#define GL_APPLE_element_array 1 - -#define GL_ELEMENT_ARRAY_APPLE 0x8A0C -#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8A0D -#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x8A0E - -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void *pointer); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint* first, const GLsizei *count, GLsizei primcount); - -#define glDrawElementArrayAPPLE GLEW_GET_FUN(__glewDrawElementArrayAPPLE) -#define glDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewDrawRangeElementArrayAPPLE) -#define glElementPointerAPPLE GLEW_GET_FUN(__glewElementPointerAPPLE) -#define glMultiDrawElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawElementArrayAPPLE) -#define glMultiDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawRangeElementArrayAPPLE) - -#define GLEW_APPLE_element_array GLEW_GET_VAR(__GLEW_APPLE_element_array) - -#endif /* GL_APPLE_element_array */ - -/* ----------------------------- GL_APPLE_fence ---------------------------- */ - -#ifndef GL_APPLE_fence -#define GL_APPLE_fence 1 - -#define GL_DRAW_PIXELS_APPLE 0x8A0A -#define GL_FENCE_APPLE 0x8A0B - -typedef void (GLAPIENTRY * PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint* fences); -typedef void (GLAPIENTRY * PFNGLFINISHFENCEAPPLEPROC) (GLuint fence); -typedef void (GLAPIENTRY * PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name); -typedef void (GLAPIENTRY * PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint* fences); -typedef GLboolean (GLAPIENTRY * PFNGLISFENCEAPPLEPROC) (GLuint fence); -typedef void (GLAPIENTRY * PFNGLSETFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (GLAPIENTRY * PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name); - -#define glDeleteFencesAPPLE GLEW_GET_FUN(__glewDeleteFencesAPPLE) -#define glFinishFenceAPPLE GLEW_GET_FUN(__glewFinishFenceAPPLE) -#define glFinishObjectAPPLE GLEW_GET_FUN(__glewFinishObjectAPPLE) -#define glGenFencesAPPLE GLEW_GET_FUN(__glewGenFencesAPPLE) -#define glIsFenceAPPLE GLEW_GET_FUN(__glewIsFenceAPPLE) -#define glSetFenceAPPLE GLEW_GET_FUN(__glewSetFenceAPPLE) -#define glTestFenceAPPLE GLEW_GET_FUN(__glewTestFenceAPPLE) -#define glTestObjectAPPLE GLEW_GET_FUN(__glewTestObjectAPPLE) - -#define GLEW_APPLE_fence GLEW_GET_VAR(__GLEW_APPLE_fence) - -#endif /* GL_APPLE_fence */ - -/* ------------------------- GL_APPLE_float_pixels ------------------------- */ - -#ifndef GL_APPLE_float_pixels -#define GL_APPLE_float_pixels 1 - -#define GL_HALF_APPLE 0x140B -#define GL_RGBA_FLOAT32_APPLE 0x8814 -#define GL_RGB_FLOAT32_APPLE 0x8815 -#define GL_ALPHA_FLOAT32_APPLE 0x8816 -#define GL_INTENSITY_FLOAT32_APPLE 0x8817 -#define GL_LUMINANCE_FLOAT32_APPLE 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE 0x8819 -#define GL_RGBA_FLOAT16_APPLE 0x881A -#define GL_RGB_FLOAT16_APPLE 0x881B -#define GL_ALPHA_FLOAT16_APPLE 0x881C -#define GL_INTENSITY_FLOAT16_APPLE 0x881D -#define GL_LUMINANCE_FLOAT16_APPLE 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F -#define GL_COLOR_FLOAT_APPLE 0x8A0F - -#define GLEW_APPLE_float_pixels GLEW_GET_VAR(__GLEW_APPLE_float_pixels) - -#endif /* GL_APPLE_float_pixels */ - -/* ---------------------- GL_APPLE_flush_buffer_range ---------------------- */ - -#ifndef GL_APPLE_flush_buffer_range -#define GL_APPLE_flush_buffer_range 1 - -#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 -#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 - -typedef void (GLAPIENTRY * PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size); - -#define glBufferParameteriAPPLE GLEW_GET_FUN(__glewBufferParameteriAPPLE) -#define glFlushMappedBufferRangeAPPLE GLEW_GET_FUN(__glewFlushMappedBufferRangeAPPLE) - -#define GLEW_APPLE_flush_buffer_range GLEW_GET_VAR(__GLEW_APPLE_flush_buffer_range) - -#endif /* GL_APPLE_flush_buffer_range */ - -/* ----------------------- GL_APPLE_object_purgeable ----------------------- */ - -#ifndef GL_APPLE_object_purgeable -#define GL_APPLE_object_purgeable 1 - -#define GL_BUFFER_OBJECT_APPLE 0x85B3 -#define GL_RELEASED_APPLE 0x8A19 -#define GL_VOLATILE_APPLE 0x8A1A -#define GL_RETAINED_APPLE 0x8A1B -#define GL_UNDEFINED_APPLE 0x8A1C -#define GL_PURGEABLE_APPLE 0x8A1D - -typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint* params); -typedef GLenum (GLAPIENTRY * PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); -typedef GLenum (GLAPIENTRY * PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); - -#define glGetObjectParameterivAPPLE GLEW_GET_FUN(__glewGetObjectParameterivAPPLE) -#define glObjectPurgeableAPPLE GLEW_GET_FUN(__glewObjectPurgeableAPPLE) -#define glObjectUnpurgeableAPPLE GLEW_GET_FUN(__glewObjectUnpurgeableAPPLE) - -#define GLEW_APPLE_object_purgeable GLEW_GET_VAR(__GLEW_APPLE_object_purgeable) - -#endif /* GL_APPLE_object_purgeable */ - -/* ------------------------- GL_APPLE_pixel_buffer ------------------------- */ - -#ifndef GL_APPLE_pixel_buffer -#define GL_APPLE_pixel_buffer 1 - -#define GL_MIN_PBUFFER_VIEWPORT_DIMS_APPLE 0x8A10 - -#define GLEW_APPLE_pixel_buffer GLEW_GET_VAR(__GLEW_APPLE_pixel_buffer) - -#endif /* GL_APPLE_pixel_buffer */ - -/* ---------------------------- GL_APPLE_rgb_422 --------------------------- */ - -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 - -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#define GL_RGB_422_APPLE 0x8A1F -#define GL_RGB_RAW_422_APPLE 0x8A51 - -#define GLEW_APPLE_rgb_422 GLEW_GET_VAR(__GLEW_APPLE_rgb_422) - -#endif /* GL_APPLE_rgb_422 */ - -/* --------------------------- GL_APPLE_row_bytes -------------------------- */ - -#ifndef GL_APPLE_row_bytes -#define GL_APPLE_row_bytes 1 - -#define GL_PACK_ROW_BYTES_APPLE 0x8A15 -#define GL_UNPACK_ROW_BYTES_APPLE 0x8A16 - -#define GLEW_APPLE_row_bytes GLEW_GET_VAR(__GLEW_APPLE_row_bytes) - -#endif /* GL_APPLE_row_bytes */ - -/* ------------------------ GL_APPLE_specular_vector ----------------------- */ - -#ifndef GL_APPLE_specular_vector -#define GL_APPLE_specular_vector 1 - -#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0 - -#define GLEW_APPLE_specular_vector GLEW_GET_VAR(__GLEW_APPLE_specular_vector) - -#endif /* GL_APPLE_specular_vector */ - -/* ------------------------- GL_APPLE_texture_range ------------------------ */ - -#ifndef GL_APPLE_texture_range -#define GL_APPLE_texture_range 1 - -#define GL_TEXTURE_RANGE_LENGTH_APPLE 0x85B7 -#define GL_TEXTURE_RANGE_POINTER_APPLE 0x85B8 -#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC -#define GL_STORAGE_PRIVATE_APPLE 0x85BD -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF - -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, void **params); -typedef void (GLAPIENTRY * PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, void *pointer); - -#define glGetTexParameterPointervAPPLE GLEW_GET_FUN(__glewGetTexParameterPointervAPPLE) -#define glTextureRangeAPPLE GLEW_GET_FUN(__glewTextureRangeAPPLE) - -#define GLEW_APPLE_texture_range GLEW_GET_VAR(__GLEW_APPLE_texture_range) - -#endif /* GL_APPLE_texture_range */ - -/* ------------------------ GL_APPLE_transform_hint ------------------------ */ - -#ifndef GL_APPLE_transform_hint -#define GL_APPLE_transform_hint 1 - -#define GL_TRANSFORM_HINT_APPLE 0x85B1 - -#define GLEW_APPLE_transform_hint GLEW_GET_VAR(__GLEW_APPLE_transform_hint) - -#endif /* GL_APPLE_transform_hint */ - -/* ---------------------- GL_APPLE_vertex_array_object --------------------- */ - -#ifndef GL_APPLE_vertex_array_object -#define GL_APPLE_vertex_array_object 1 - -#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 - -typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array); -typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays); -typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays); -typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array); - -#define glBindVertexArrayAPPLE GLEW_GET_FUN(__glewBindVertexArrayAPPLE) -#define glDeleteVertexArraysAPPLE GLEW_GET_FUN(__glewDeleteVertexArraysAPPLE) -#define glGenVertexArraysAPPLE GLEW_GET_FUN(__glewGenVertexArraysAPPLE) -#define glIsVertexArrayAPPLE GLEW_GET_FUN(__glewIsVertexArrayAPPLE) - -#define GLEW_APPLE_vertex_array_object GLEW_GET_VAR(__GLEW_APPLE_vertex_array_object) - -#endif /* GL_APPLE_vertex_array_object */ - -/* ---------------------- GL_APPLE_vertex_array_range ---------------------- */ - -#ifndef GL_APPLE_vertex_array_range -#define GL_APPLE_vertex_array_range 1 - -#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E -#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_APPLE 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521 -#define GL_STORAGE_CLIENT_APPLE 0x85B4 -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF - -typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer); - -#define glFlushVertexArrayRangeAPPLE GLEW_GET_FUN(__glewFlushVertexArrayRangeAPPLE) -#define glVertexArrayParameteriAPPLE GLEW_GET_FUN(__glewVertexArrayParameteriAPPLE) -#define glVertexArrayRangeAPPLE GLEW_GET_FUN(__glewVertexArrayRangeAPPLE) - -#define GLEW_APPLE_vertex_array_range GLEW_GET_VAR(__GLEW_APPLE_vertex_array_range) - -#endif /* GL_APPLE_vertex_array_range */ - -/* ------------------- GL_APPLE_vertex_program_evaluators ------------------ */ - -#ifndef GL_APPLE_vertex_program_evaluators -#define GL_APPLE_vertex_program_evaluators 1 - -#define GL_VERTEX_ATTRIB_MAP1_APPLE 0x8A00 -#define GL_VERTEX_ATTRIB_MAP2_APPLE 0x8A01 -#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE 0x8A02 -#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03 -#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04 -#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05 -#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE 0x8A06 -#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07 -#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08 -#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09 - -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname); -typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble* points); -typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat* points); -typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble* points); -typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat* points); - -#define glDisableVertexAttribAPPLE GLEW_GET_FUN(__glewDisableVertexAttribAPPLE) -#define glEnableVertexAttribAPPLE GLEW_GET_FUN(__glewEnableVertexAttribAPPLE) -#define glIsVertexAttribEnabledAPPLE GLEW_GET_FUN(__glewIsVertexAttribEnabledAPPLE) -#define glMapVertexAttrib1dAPPLE GLEW_GET_FUN(__glewMapVertexAttrib1dAPPLE) -#define glMapVertexAttrib1fAPPLE GLEW_GET_FUN(__glewMapVertexAttrib1fAPPLE) -#define glMapVertexAttrib2dAPPLE GLEW_GET_FUN(__glewMapVertexAttrib2dAPPLE) -#define glMapVertexAttrib2fAPPLE GLEW_GET_FUN(__glewMapVertexAttrib2fAPPLE) - -#define GLEW_APPLE_vertex_program_evaluators GLEW_GET_VAR(__GLEW_APPLE_vertex_program_evaluators) - -#endif /* GL_APPLE_vertex_program_evaluators */ - -/* --------------------------- GL_APPLE_ycbcr_422 -------------------------- */ - -#ifndef GL_APPLE_ycbcr_422 -#define GL_APPLE_ycbcr_422 1 - -#define GL_YCBCR_422_APPLE 0x85B9 - -#define GLEW_APPLE_ycbcr_422 GLEW_GET_VAR(__GLEW_APPLE_ycbcr_422) - -#endif /* GL_APPLE_ycbcr_422 */ - -/* ------------------------ GL_ARB_ES2_compatibility ----------------------- */ - -#ifndef GL_ARB_ES2_compatibility -#define GL_ARB_ES2_compatibility 1 - -#define GL_FIXED 0x140C -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B -#define GL_RGB565 0x8D62 -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 -#define GL_SHADER_BINARY_FORMATS 0x8DF8 -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 -#define GL_SHADER_COMPILER 0x8DFA -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD - -typedef int GLfixed; - -typedef void (GLAPIENTRY * PFNGLCLEARDEPTHFPROC) (GLclampf d); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f); -typedef void (GLAPIENTRY * PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint* range, GLint *precision); -typedef void (GLAPIENTRY * PFNGLRELEASESHADERCOMPILERPROC) (void); -typedef void (GLAPIENTRY * PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint* shaders, GLenum binaryformat, const void*binary, GLsizei length); - -#define glClearDepthf GLEW_GET_FUN(__glewClearDepthf) -#define glDepthRangef GLEW_GET_FUN(__glewDepthRangef) -#define glGetShaderPrecisionFormat GLEW_GET_FUN(__glewGetShaderPrecisionFormat) -#define glReleaseShaderCompiler GLEW_GET_FUN(__glewReleaseShaderCompiler) -#define glShaderBinary GLEW_GET_FUN(__glewShaderBinary) - -#define GLEW_ARB_ES2_compatibility GLEW_GET_VAR(__GLEW_ARB_ES2_compatibility) - -#endif /* GL_ARB_ES2_compatibility */ - -/* ----------------------- GL_ARB_ES3_1_compatibility ---------------------- */ - -#ifndef GL_ARB_ES3_1_compatibility -#define GL_ARB_ES3_1_compatibility 1 - -typedef void (GLAPIENTRY * PFNGLMEMORYBARRIERBYREGIONPROC) (GLbitfield barriers); - -#define glMemoryBarrierByRegion GLEW_GET_FUN(__glewMemoryBarrierByRegion) - -#define GLEW_ARB_ES3_1_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_1_compatibility) - -#endif /* GL_ARB_ES3_1_compatibility */ - -/* ----------------------- GL_ARB_ES3_2_compatibility ---------------------- */ - -#ifndef GL_ARB_ES3_2_compatibility -#define GL_ARB_ES3_2_compatibility 1 - -#define GL_PRIMITIVE_BOUNDING_BOX_ARB 0x92BE -#define GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB 0x9381 -#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB 0x9382 - -typedef void (GLAPIENTRY * PFNGLPRIMITIVEBOUNDINGBOXARBPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); - -#define glPrimitiveBoundingBoxARB GLEW_GET_FUN(__glewPrimitiveBoundingBoxARB) - -#define GLEW_ARB_ES3_2_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_2_compatibility) - -#endif /* GL_ARB_ES3_2_compatibility */ - -/* ------------------------ GL_ARB_ES3_compatibility ----------------------- */ - -#ifndef GL_ARB_ES3_compatibility -#define GL_ARB_ES3_compatibility 1 - -#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF -#define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69 -#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A -#define GL_MAX_ELEMENT_INDEX 0x8D6B -#define GL_COMPRESSED_R11_EAC 0x9270 -#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271 -#define GL_COMPRESSED_RG11_EAC 0x9272 -#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273 -#define GL_COMPRESSED_RGB8_ETC2 0x9274 -#define GL_COMPRESSED_SRGB8_ETC2 0x9275 -#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276 -#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277 -#define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278 -#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279 - -#define GLEW_ARB_ES3_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_compatibility) - -#endif /* GL_ARB_ES3_compatibility */ - -/* ------------------------ GL_ARB_arrays_of_arrays ------------------------ */ - -#ifndef GL_ARB_arrays_of_arrays -#define GL_ARB_arrays_of_arrays 1 - -#define GLEW_ARB_arrays_of_arrays GLEW_GET_VAR(__GLEW_ARB_arrays_of_arrays) - -#endif /* GL_ARB_arrays_of_arrays */ - -/* -------------------------- GL_ARB_base_instance ------------------------- */ - -#ifndef GL_ARB_base_instance -#define GL_ARB_base_instance 1 - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLuint baseinstance); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); - -#define glDrawArraysInstancedBaseInstance GLEW_GET_FUN(__glewDrawArraysInstancedBaseInstance) -#define glDrawElementsInstancedBaseInstance GLEW_GET_FUN(__glewDrawElementsInstancedBaseInstance) -#define glDrawElementsInstancedBaseVertexBaseInstance GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertexBaseInstance) - -#define GLEW_ARB_base_instance GLEW_GET_VAR(__GLEW_ARB_base_instance) - -#endif /* GL_ARB_base_instance */ - -/* ------------------------ GL_ARB_bindless_texture ------------------------ */ - -#ifndef GL_ARB_bindless_texture -#define GL_ARB_bindless_texture 1 - -#define GL_UNSIGNED_INT64_ARB 0x140F - -typedef GLuint64 (GLAPIENTRY * PFNGLGETIMAGEHANDLEARBPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format); -typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture); -typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLUI64VARBPROC) (GLuint index, GLenum pname, GLuint64EXT* params); -typedef GLboolean (GLAPIENTRY * PFNGLISIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle); -typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle, GLenum access); -typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC) (GLuint program, GLint location, GLuint64 value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* values); -typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64ARBPROC) (GLint location, GLuint64 value); -typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64ARBPROC) (GLuint index, GLuint64EXT x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64VARBPROC) (GLuint index, const GLuint64EXT* v); - -#define glGetImageHandleARB GLEW_GET_FUN(__glewGetImageHandleARB) -#define glGetTextureHandleARB GLEW_GET_FUN(__glewGetTextureHandleARB) -#define glGetTextureSamplerHandleARB GLEW_GET_FUN(__glewGetTextureSamplerHandleARB) -#define glGetVertexAttribLui64vARB GLEW_GET_FUN(__glewGetVertexAttribLui64vARB) -#define glIsImageHandleResidentARB GLEW_GET_FUN(__glewIsImageHandleResidentARB) -#define glIsTextureHandleResidentARB GLEW_GET_FUN(__glewIsTextureHandleResidentARB) -#define glMakeImageHandleNonResidentARB GLEW_GET_FUN(__glewMakeImageHandleNonResidentARB) -#define glMakeImageHandleResidentARB GLEW_GET_FUN(__glewMakeImageHandleResidentARB) -#define glMakeTextureHandleNonResidentARB GLEW_GET_FUN(__glewMakeTextureHandleNonResidentARB) -#define glMakeTextureHandleResidentARB GLEW_GET_FUN(__glewMakeTextureHandleResidentARB) -#define glProgramUniformHandleui64ARB GLEW_GET_FUN(__glewProgramUniformHandleui64ARB) -#define glProgramUniformHandleui64vARB GLEW_GET_FUN(__glewProgramUniformHandleui64vARB) -#define glUniformHandleui64ARB GLEW_GET_FUN(__glewUniformHandleui64ARB) -#define glUniformHandleui64vARB GLEW_GET_FUN(__glewUniformHandleui64vARB) -#define glVertexAttribL1ui64ARB GLEW_GET_FUN(__glewVertexAttribL1ui64ARB) -#define glVertexAttribL1ui64vARB GLEW_GET_FUN(__glewVertexAttribL1ui64vARB) - -#define GLEW_ARB_bindless_texture GLEW_GET_VAR(__GLEW_ARB_bindless_texture) - -#endif /* GL_ARB_bindless_texture */ - -/* ----------------------- GL_ARB_blend_func_extended ---------------------- */ - -#ifndef GL_ARB_blend_func_extended -#define GL_ARB_blend_func_extended 1 - -#define GL_SRC1_COLOR 0x88F9 -#define GL_ONE_MINUS_SRC1_COLOR 0x88FA -#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB -#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC - -typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar * name); -typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar * name); - -#define glBindFragDataLocationIndexed GLEW_GET_FUN(__glewBindFragDataLocationIndexed) -#define glGetFragDataIndex GLEW_GET_FUN(__glewGetFragDataIndex) - -#define GLEW_ARB_blend_func_extended GLEW_GET_VAR(__GLEW_ARB_blend_func_extended) - -#endif /* GL_ARB_blend_func_extended */ - -/* ------------------------- GL_ARB_buffer_storage ------------------------- */ - -#ifndef GL_ARB_buffer_storage -#define GL_ARB_buffer_storage 1 - -#define GL_MAP_READ_BIT 0x0001 -#define GL_MAP_WRITE_BIT 0x0002 -#define GL_MAP_PERSISTENT_BIT 0x00000040 -#define GL_MAP_COHERENT_BIT 0x00000080 -#define GL_DYNAMIC_STORAGE_BIT 0x0100 -#define GL_CLIENT_STORAGE_BIT 0x0200 -#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000 -#define GL_BUFFER_IMMUTABLE_STORAGE 0x821F -#define GL_BUFFER_STORAGE_FLAGS 0x8220 - -typedef void (GLAPIENTRY * PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSTORAGEEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); - -#define glBufferStorage GLEW_GET_FUN(__glewBufferStorage) -#define glNamedBufferStorageEXT GLEW_GET_FUN(__glewNamedBufferStorageEXT) - -#define GLEW_ARB_buffer_storage GLEW_GET_VAR(__GLEW_ARB_buffer_storage) - -#endif /* GL_ARB_buffer_storage */ - -/* ---------------------------- GL_ARB_cl_event ---------------------------- */ - -#ifndef GL_ARB_cl_event -#define GL_ARB_cl_event 1 - -#define GL_SYNC_CL_EVENT_ARB 0x8240 -#define GL_SYNC_CL_EVENT_COMPLETE_ARB 0x8241 - -typedef struct _cl_context *cl_context; -typedef struct _cl_event *cl_event; - -typedef GLsync (GLAPIENTRY * PFNGLCREATESYNCFROMCLEVENTARBPROC) (cl_context context, cl_event event, GLbitfield flags); - -#define glCreateSyncFromCLeventARB GLEW_GET_FUN(__glewCreateSyncFromCLeventARB) - -#define GLEW_ARB_cl_event GLEW_GET_VAR(__GLEW_ARB_cl_event) - -#endif /* GL_ARB_cl_event */ - -/* ----------------------- GL_ARB_clear_buffer_object ---------------------- */ - -#ifndef GL_ARB_clear_buffer_object -#define GL_ARB_clear_buffer_object 1 - -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); - -#define glClearBufferData GLEW_GET_FUN(__glewClearBufferData) -#define glClearBufferSubData GLEW_GET_FUN(__glewClearBufferSubData) -#define glClearNamedBufferDataEXT GLEW_GET_FUN(__glewClearNamedBufferDataEXT) -#define glClearNamedBufferSubDataEXT GLEW_GET_FUN(__glewClearNamedBufferSubDataEXT) - -#define GLEW_ARB_clear_buffer_object GLEW_GET_VAR(__GLEW_ARB_clear_buffer_object) - -#endif /* GL_ARB_clear_buffer_object */ - -/* -------------------------- GL_ARB_clear_texture ------------------------- */ - -#ifndef GL_ARB_clear_texture -#define GL_ARB_clear_texture 1 - -#define GL_CLEAR_TEXTURE 0x9365 - -typedef void (GLAPIENTRY * PFNGLCLEARTEXIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARTEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data); - -#define glClearTexImage GLEW_GET_FUN(__glewClearTexImage) -#define glClearTexSubImage GLEW_GET_FUN(__glewClearTexSubImage) - -#define GLEW_ARB_clear_texture GLEW_GET_VAR(__GLEW_ARB_clear_texture) - -#endif /* GL_ARB_clear_texture */ - -/* -------------------------- GL_ARB_clip_control -------------------------- */ - -#ifndef GL_ARB_clip_control -#define GL_ARB_clip_control 1 - -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_CLIP_ORIGIN 0x935C -#define GL_CLIP_DEPTH_MODE 0x935D -#define GL_NEGATIVE_ONE_TO_ONE 0x935E -#define GL_ZERO_TO_ONE 0x935F - -typedef void (GLAPIENTRY * PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth); - -#define glClipControl GLEW_GET_FUN(__glewClipControl) - -#define GLEW_ARB_clip_control GLEW_GET_VAR(__GLEW_ARB_clip_control) - -#endif /* GL_ARB_clip_control */ - -/* ----------------------- GL_ARB_color_buffer_float ----------------------- */ - -#ifndef GL_ARB_color_buffer_float -#define GL_ARB_color_buffer_float 1 - -#define GL_RGBA_FLOAT_MODE_ARB 0x8820 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -#define GL_FIXED_ONLY_ARB 0x891D - -typedef void (GLAPIENTRY * PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); - -#define glClampColorARB GLEW_GET_FUN(__glewClampColorARB) - -#define GLEW_ARB_color_buffer_float GLEW_GET_VAR(__GLEW_ARB_color_buffer_float) - -#endif /* GL_ARB_color_buffer_float */ - -/* -------------------------- GL_ARB_compatibility ------------------------- */ - -#ifndef GL_ARB_compatibility -#define GL_ARB_compatibility 1 - -#define GLEW_ARB_compatibility GLEW_GET_VAR(__GLEW_ARB_compatibility) - -#endif /* GL_ARB_compatibility */ - -/* ---------------- GL_ARB_compressed_texture_pixel_storage ---------------- */ - -#ifndef GL_ARB_compressed_texture_pixel_storage -#define GL_ARB_compressed_texture_pixel_storage 1 - -#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH 0x9127 -#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128 -#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH 0x9129 -#define GL_UNPACK_COMPRESSED_BLOCK_SIZE 0x912A -#define GL_PACK_COMPRESSED_BLOCK_WIDTH 0x912B -#define GL_PACK_COMPRESSED_BLOCK_HEIGHT 0x912C -#define GL_PACK_COMPRESSED_BLOCK_DEPTH 0x912D -#define GL_PACK_COMPRESSED_BLOCK_SIZE 0x912E - -#define GLEW_ARB_compressed_texture_pixel_storage GLEW_GET_VAR(__GLEW_ARB_compressed_texture_pixel_storage) - -#endif /* GL_ARB_compressed_texture_pixel_storage */ - -/* ------------------------- GL_ARB_compute_shader ------------------------- */ - -#ifndef GL_ARB_compute_shader -#define GL_ARB_compute_shader 1 - -#define GL_COMPUTE_SHADER_BIT 0x00000020 -#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262 -#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263 -#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264 -#define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265 -#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266 -#define GL_COMPUTE_WORK_GROUP_SIZE 0x8267 -#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB -#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED -#define GL_DISPATCH_INDIRECT_BUFFER 0x90EE -#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF -#define GL_COMPUTE_SHADER 0x91B9 -#define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB -#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC -#define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD -#define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE -#define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF - -typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); -typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect); - -#define glDispatchCompute GLEW_GET_FUN(__glewDispatchCompute) -#define glDispatchComputeIndirect GLEW_GET_FUN(__glewDispatchComputeIndirect) - -#define GLEW_ARB_compute_shader GLEW_GET_VAR(__GLEW_ARB_compute_shader) - -#endif /* GL_ARB_compute_shader */ - -/* ------------------- GL_ARB_compute_variable_group_size ------------------ */ - -#ifndef GL_ARB_compute_variable_group_size -#define GL_ARB_compute_variable_group_size 1 - -#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB 0x90EB -#define GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB 0x91BF -#define GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB 0x9344 -#define GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB 0x9345 - -typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z); - -#define glDispatchComputeGroupSizeARB GLEW_GET_FUN(__glewDispatchComputeGroupSizeARB) - -#define GLEW_ARB_compute_variable_group_size GLEW_GET_VAR(__GLEW_ARB_compute_variable_group_size) - -#endif /* GL_ARB_compute_variable_group_size */ - -/* ------------------- GL_ARB_conditional_render_inverted ------------------ */ - -#ifndef GL_ARB_conditional_render_inverted -#define GL_ARB_conditional_render_inverted 1 - -#define GL_QUERY_WAIT_INVERTED 0x8E17 -#define GL_QUERY_NO_WAIT_INVERTED 0x8E18 -#define GL_QUERY_BY_REGION_WAIT_INVERTED 0x8E19 -#define GL_QUERY_BY_REGION_NO_WAIT_INVERTED 0x8E1A - -#define GLEW_ARB_conditional_render_inverted GLEW_GET_VAR(__GLEW_ARB_conditional_render_inverted) - -#endif /* GL_ARB_conditional_render_inverted */ - -/* ----------------------- GL_ARB_conservative_depth ----------------------- */ - -#ifndef GL_ARB_conservative_depth -#define GL_ARB_conservative_depth 1 - -#define GLEW_ARB_conservative_depth GLEW_GET_VAR(__GLEW_ARB_conservative_depth) - -#endif /* GL_ARB_conservative_depth */ - -/* --------------------------- GL_ARB_copy_buffer -------------------------- */ - -#ifndef GL_ARB_copy_buffer -#define GL_ARB_copy_buffer 1 - -#define GL_COPY_READ_BUFFER 0x8F36 -#define GL_COPY_WRITE_BUFFER 0x8F37 - -typedef void (GLAPIENTRY * PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readtarget, GLenum writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size); - -#define glCopyBufferSubData GLEW_GET_FUN(__glewCopyBufferSubData) - -#define GLEW_ARB_copy_buffer GLEW_GET_VAR(__GLEW_ARB_copy_buffer) - -#endif /* GL_ARB_copy_buffer */ - -/* --------------------------- GL_ARB_copy_image --------------------------- */ - -#ifndef GL_ARB_copy_image -#define GL_ARB_copy_image 1 - -typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); - -#define glCopyImageSubData GLEW_GET_FUN(__glewCopyImageSubData) - -#define GLEW_ARB_copy_image GLEW_GET_VAR(__GLEW_ARB_copy_image) - -#endif /* GL_ARB_copy_image */ - -/* -------------------------- GL_ARB_cull_distance ------------------------- */ - -#ifndef GL_ARB_cull_distance -#define GL_ARB_cull_distance 1 - -#define GL_MAX_CULL_DISTANCES 0x82F9 -#define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA - -#define GLEW_ARB_cull_distance GLEW_GET_VAR(__GLEW_ARB_cull_distance) - -#endif /* GL_ARB_cull_distance */ - -/* -------------------------- GL_ARB_debug_output -------------------------- */ - -#ifndef GL_ARB_debug_output -#define GL_ARB_debug_output 1 - -#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM_ARB 0x8245 -#define GL_DEBUG_SOURCE_API_ARB 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION_ARB 0x824A -#define GL_DEBUG_SOURCE_OTHER_ARB 0x824B -#define GL_DEBUG_TYPE_ERROR_ARB 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E -#define GL_DEBUG_TYPE_PORTABILITY_ARB 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE_ARB 0x8250 -#define GL_DEBUG_TYPE_OTHER_ARB 0x8251 -#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_ARB 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_ARB 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_ARB 0x9147 -#define GL_DEBUG_SEVERITY_LOW_ARB 0x9148 - -typedef void (GLAPIENTRY *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam); - -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const void *userParam); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf); -typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog); - -#define glDebugMessageCallbackARB GLEW_GET_FUN(__glewDebugMessageCallbackARB) -#define glDebugMessageControlARB GLEW_GET_FUN(__glewDebugMessageControlARB) -#define glDebugMessageInsertARB GLEW_GET_FUN(__glewDebugMessageInsertARB) -#define glGetDebugMessageLogARB GLEW_GET_FUN(__glewGetDebugMessageLogARB) - -#define GLEW_ARB_debug_output GLEW_GET_VAR(__GLEW_ARB_debug_output) - -#endif /* GL_ARB_debug_output */ - -/* ----------------------- GL_ARB_depth_buffer_float ----------------------- */ - -#ifndef GL_ARB_depth_buffer_float -#define GL_ARB_depth_buffer_float 1 - -#define GL_DEPTH_COMPONENT32F 0x8CAC -#define GL_DEPTH32F_STENCIL8 0x8CAD -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD - -#define GLEW_ARB_depth_buffer_float GLEW_GET_VAR(__GLEW_ARB_depth_buffer_float) - -#endif /* GL_ARB_depth_buffer_float */ - -/* --------------------------- GL_ARB_depth_clamp -------------------------- */ - -#ifndef GL_ARB_depth_clamp -#define GL_ARB_depth_clamp 1 - -#define GL_DEPTH_CLAMP 0x864F - -#define GLEW_ARB_depth_clamp GLEW_GET_VAR(__GLEW_ARB_depth_clamp) - -#endif /* GL_ARB_depth_clamp */ - -/* -------------------------- GL_ARB_depth_texture ------------------------- */ - -#ifndef GL_ARB_depth_texture -#define GL_ARB_depth_texture 1 - -#define GL_DEPTH_COMPONENT16_ARB 0x81A5 -#define GL_DEPTH_COMPONENT24_ARB 0x81A6 -#define GL_DEPTH_COMPONENT32_ARB 0x81A7 -#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A -#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B - -#define GLEW_ARB_depth_texture GLEW_GET_VAR(__GLEW_ARB_depth_texture) - -#endif /* GL_ARB_depth_texture */ - -/* ----------------------- GL_ARB_derivative_control ----------------------- */ - -#ifndef GL_ARB_derivative_control -#define GL_ARB_derivative_control 1 - -#define GLEW_ARB_derivative_control GLEW_GET_VAR(__GLEW_ARB_derivative_control) - -#endif /* GL_ARB_derivative_control */ - -/* ----------------------- GL_ARB_direct_state_access ---------------------- */ - -#ifndef GL_ARB_direct_state_access -#define GL_ARB_direct_state_access 1 - -#define GL_TEXTURE_TARGET 0x1006 -#define GL_QUERY_TARGET 0x82EA - -typedef void (GLAPIENTRY * PFNGLBINDTEXTUREUNITPROC) (GLuint unit, GLuint texture); -typedef void (GLAPIENTRY * PFNGLBLITNAMEDFRAMEBUFFERPROC) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef GLenum (GLAPIENTRY * PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC) (GLuint framebuffer, GLenum target); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERFVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat* value); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint* value); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLCREATEPROGRAMPIPELINESPROC) (GLsizei n, GLuint* pipelines); -typedef void (GLAPIENTRY * PFNGLCREATEQUERIESPROC) (GLenum target, GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLCREATERENDERBUFFERSPROC) (GLsizei n, GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLCREATESAMPLERSPROC) (GLsizei n, GLuint* samplers); -typedef void (GLAPIENTRY * PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei n, GLuint* textures); -typedef void (GLAPIENTRY * PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLCREATEVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index); -typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); -typedef void (GLAPIENTRY * PFNGLGENERATETEXTUREMIPMAPPROC) (GLuint texture); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLsizei bufSize, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint buffer, GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint buffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer, GLenum pname, void** params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); -typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC) (GLuint framebuffer, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint renderbuffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTI64VPROC) (GLuint id,GLuint buffer,GLenum pname,GLintptr offset); -typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTIVPROC) (GLuint id,GLuint buffer,GLenum pname,GLintptr offset); -typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTUI64VPROC) (GLuint id,GLuint buffer,GLenum pname,GLintptr offset); -typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTUIVPROC) (GLuint id,GLuint buffer,GLenum pname,GLintptr offset); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERFVPROC) (GLuint texture, GLint level, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERIVPROC) (GLuint texture, GLint level, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint64* param); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINDEXED64IVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint64* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINDEXEDIVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYIVPROC) (GLuint vaobj, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum* attachments); -typedef void (GLAPIENTRY * PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum access); -typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC) (GLuint framebuffer, GLenum mode); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC) (GLuint framebuffer, GLsizei n, const GLenum* bufs); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint framebuffer, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC) (GLuint framebuffer, GLenum mode); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum internalformat, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFPROC) (GLuint texture, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, const GLfloat* param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIPROC) (GLuint texture, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, const GLint* param); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE1DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint xfb, GLuint index, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef GLboolean (GLAPIENTRY * PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBBINDINGPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBIFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBLFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYBINDINGDIVISORPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYELEMENTBUFFERPROC) (GLuint vaobj, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXBUFFERPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXBUFFERSPROC) (GLuint vaobj, GLuint first, GLsizei count, const GLuint* buffers, const GLintptr *offsets, const GLsizei *strides); - -#define glBindTextureUnit GLEW_GET_FUN(__glewBindTextureUnit) -#define glBlitNamedFramebuffer GLEW_GET_FUN(__glewBlitNamedFramebuffer) -#define glCheckNamedFramebufferStatus GLEW_GET_FUN(__glewCheckNamedFramebufferStatus) -#define glClearNamedBufferData GLEW_GET_FUN(__glewClearNamedBufferData) -#define glClearNamedBufferSubData GLEW_GET_FUN(__glewClearNamedBufferSubData) -#define glClearNamedFramebufferfi GLEW_GET_FUN(__glewClearNamedFramebufferfi) -#define glClearNamedFramebufferfv GLEW_GET_FUN(__glewClearNamedFramebufferfv) -#define glClearNamedFramebufferiv GLEW_GET_FUN(__glewClearNamedFramebufferiv) -#define glClearNamedFramebufferuiv GLEW_GET_FUN(__glewClearNamedFramebufferuiv) -#define glCompressedTextureSubImage1D GLEW_GET_FUN(__glewCompressedTextureSubImage1D) -#define glCompressedTextureSubImage2D GLEW_GET_FUN(__glewCompressedTextureSubImage2D) -#define glCompressedTextureSubImage3D GLEW_GET_FUN(__glewCompressedTextureSubImage3D) -#define glCopyNamedBufferSubData GLEW_GET_FUN(__glewCopyNamedBufferSubData) -#define glCopyTextureSubImage1D GLEW_GET_FUN(__glewCopyTextureSubImage1D) -#define glCopyTextureSubImage2D GLEW_GET_FUN(__glewCopyTextureSubImage2D) -#define glCopyTextureSubImage3D GLEW_GET_FUN(__glewCopyTextureSubImage3D) -#define glCreateBuffers GLEW_GET_FUN(__glewCreateBuffers) -#define glCreateFramebuffers GLEW_GET_FUN(__glewCreateFramebuffers) -#define glCreateProgramPipelines GLEW_GET_FUN(__glewCreateProgramPipelines) -#define glCreateQueries GLEW_GET_FUN(__glewCreateQueries) -#define glCreateRenderbuffers GLEW_GET_FUN(__glewCreateRenderbuffers) -#define glCreateSamplers GLEW_GET_FUN(__glewCreateSamplers) -#define glCreateTextures GLEW_GET_FUN(__glewCreateTextures) -#define glCreateTransformFeedbacks GLEW_GET_FUN(__glewCreateTransformFeedbacks) -#define glCreateVertexArrays GLEW_GET_FUN(__glewCreateVertexArrays) -#define glDisableVertexArrayAttrib GLEW_GET_FUN(__glewDisableVertexArrayAttrib) -#define glEnableVertexArrayAttrib GLEW_GET_FUN(__glewEnableVertexArrayAttrib) -#define glFlushMappedNamedBufferRange GLEW_GET_FUN(__glewFlushMappedNamedBufferRange) -#define glGenerateTextureMipmap GLEW_GET_FUN(__glewGenerateTextureMipmap) -#define glGetCompressedTextureImage GLEW_GET_FUN(__glewGetCompressedTextureImage) -#define glGetNamedBufferParameteri64v GLEW_GET_FUN(__glewGetNamedBufferParameteri64v) -#define glGetNamedBufferParameteriv GLEW_GET_FUN(__glewGetNamedBufferParameteriv) -#define glGetNamedBufferPointerv GLEW_GET_FUN(__glewGetNamedBufferPointerv) -#define glGetNamedBufferSubData GLEW_GET_FUN(__glewGetNamedBufferSubData) -#define glGetNamedFramebufferAttachmentParameteriv GLEW_GET_FUN(__glewGetNamedFramebufferAttachmentParameteriv) -#define glGetNamedFramebufferParameteriv GLEW_GET_FUN(__glewGetNamedFramebufferParameteriv) -#define glGetNamedRenderbufferParameteriv GLEW_GET_FUN(__glewGetNamedRenderbufferParameteriv) -#define glGetQueryBufferObjecti64v GLEW_GET_FUN(__glewGetQueryBufferObjecti64v) -#define glGetQueryBufferObjectiv GLEW_GET_FUN(__glewGetQueryBufferObjectiv) -#define glGetQueryBufferObjectui64v GLEW_GET_FUN(__glewGetQueryBufferObjectui64v) -#define glGetQueryBufferObjectuiv GLEW_GET_FUN(__glewGetQueryBufferObjectuiv) -#define glGetTextureImage GLEW_GET_FUN(__glewGetTextureImage) -#define glGetTextureLevelParameterfv GLEW_GET_FUN(__glewGetTextureLevelParameterfv) -#define glGetTextureLevelParameteriv GLEW_GET_FUN(__glewGetTextureLevelParameteriv) -#define glGetTextureParameterIiv GLEW_GET_FUN(__glewGetTextureParameterIiv) -#define glGetTextureParameterIuiv GLEW_GET_FUN(__glewGetTextureParameterIuiv) -#define glGetTextureParameterfv GLEW_GET_FUN(__glewGetTextureParameterfv) -#define glGetTextureParameteriv GLEW_GET_FUN(__glewGetTextureParameteriv) -#define glGetTransformFeedbacki64_v GLEW_GET_FUN(__glewGetTransformFeedbacki64_v) -#define glGetTransformFeedbacki_v GLEW_GET_FUN(__glewGetTransformFeedbacki_v) -#define glGetTransformFeedbackiv GLEW_GET_FUN(__glewGetTransformFeedbackiv) -#define glGetVertexArrayIndexed64iv GLEW_GET_FUN(__glewGetVertexArrayIndexed64iv) -#define glGetVertexArrayIndexediv GLEW_GET_FUN(__glewGetVertexArrayIndexediv) -#define glGetVertexArrayiv GLEW_GET_FUN(__glewGetVertexArrayiv) -#define glInvalidateNamedFramebufferData GLEW_GET_FUN(__glewInvalidateNamedFramebufferData) -#define glInvalidateNamedFramebufferSubData GLEW_GET_FUN(__glewInvalidateNamedFramebufferSubData) -#define glMapNamedBuffer GLEW_GET_FUN(__glewMapNamedBuffer) -#define glMapNamedBufferRange GLEW_GET_FUN(__glewMapNamedBufferRange) -#define glNamedBufferData GLEW_GET_FUN(__glewNamedBufferData) -#define glNamedBufferStorage GLEW_GET_FUN(__glewNamedBufferStorage) -#define glNamedBufferSubData GLEW_GET_FUN(__glewNamedBufferSubData) -#define glNamedFramebufferDrawBuffer GLEW_GET_FUN(__glewNamedFramebufferDrawBuffer) -#define glNamedFramebufferDrawBuffers GLEW_GET_FUN(__glewNamedFramebufferDrawBuffers) -#define glNamedFramebufferParameteri GLEW_GET_FUN(__glewNamedFramebufferParameteri) -#define glNamedFramebufferReadBuffer GLEW_GET_FUN(__glewNamedFramebufferReadBuffer) -#define glNamedFramebufferRenderbuffer GLEW_GET_FUN(__glewNamedFramebufferRenderbuffer) -#define glNamedFramebufferTexture GLEW_GET_FUN(__glewNamedFramebufferTexture) -#define glNamedFramebufferTextureLayer GLEW_GET_FUN(__glewNamedFramebufferTextureLayer) -#define glNamedRenderbufferStorage GLEW_GET_FUN(__glewNamedRenderbufferStorage) -#define glNamedRenderbufferStorageMultisample GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisample) -#define glTextureBuffer GLEW_GET_FUN(__glewTextureBuffer) -#define glTextureBufferRange GLEW_GET_FUN(__glewTextureBufferRange) -#define glTextureParameterIiv GLEW_GET_FUN(__glewTextureParameterIiv) -#define glTextureParameterIuiv GLEW_GET_FUN(__glewTextureParameterIuiv) -#define glTextureParameterf GLEW_GET_FUN(__glewTextureParameterf) -#define glTextureParameterfv GLEW_GET_FUN(__glewTextureParameterfv) -#define glTextureParameteri GLEW_GET_FUN(__glewTextureParameteri) -#define glTextureParameteriv GLEW_GET_FUN(__glewTextureParameteriv) -#define glTextureStorage1D GLEW_GET_FUN(__glewTextureStorage1D) -#define glTextureStorage2D GLEW_GET_FUN(__glewTextureStorage2D) -#define glTextureStorage2DMultisample GLEW_GET_FUN(__glewTextureStorage2DMultisample) -#define glTextureStorage3D GLEW_GET_FUN(__glewTextureStorage3D) -#define glTextureStorage3DMultisample GLEW_GET_FUN(__glewTextureStorage3DMultisample) -#define glTextureSubImage1D GLEW_GET_FUN(__glewTextureSubImage1D) -#define glTextureSubImage2D GLEW_GET_FUN(__glewTextureSubImage2D) -#define glTextureSubImage3D GLEW_GET_FUN(__glewTextureSubImage3D) -#define glTransformFeedbackBufferBase GLEW_GET_FUN(__glewTransformFeedbackBufferBase) -#define glTransformFeedbackBufferRange GLEW_GET_FUN(__glewTransformFeedbackBufferRange) -#define glUnmapNamedBuffer GLEW_GET_FUN(__glewUnmapNamedBuffer) -#define glVertexArrayAttribBinding GLEW_GET_FUN(__glewVertexArrayAttribBinding) -#define glVertexArrayAttribFormat GLEW_GET_FUN(__glewVertexArrayAttribFormat) -#define glVertexArrayAttribIFormat GLEW_GET_FUN(__glewVertexArrayAttribIFormat) -#define glVertexArrayAttribLFormat GLEW_GET_FUN(__glewVertexArrayAttribLFormat) -#define glVertexArrayBindingDivisor GLEW_GET_FUN(__glewVertexArrayBindingDivisor) -#define glVertexArrayElementBuffer GLEW_GET_FUN(__glewVertexArrayElementBuffer) -#define glVertexArrayVertexBuffer GLEW_GET_FUN(__glewVertexArrayVertexBuffer) -#define glVertexArrayVertexBuffers GLEW_GET_FUN(__glewVertexArrayVertexBuffers) - -#define GLEW_ARB_direct_state_access GLEW_GET_VAR(__GLEW_ARB_direct_state_access) - -#endif /* GL_ARB_direct_state_access */ - -/* -------------------------- GL_ARB_draw_buffers -------------------------- */ - -#ifndef GL_ARB_draw_buffers -#define GL_ARB_draw_buffers 1 - -#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 -#define GL_DRAW_BUFFER0_ARB 0x8825 -#define GL_DRAW_BUFFER1_ARB 0x8826 -#define GL_DRAW_BUFFER2_ARB 0x8827 -#define GL_DRAW_BUFFER3_ARB 0x8828 -#define GL_DRAW_BUFFER4_ARB 0x8829 -#define GL_DRAW_BUFFER5_ARB 0x882A -#define GL_DRAW_BUFFER6_ARB 0x882B -#define GL_DRAW_BUFFER7_ARB 0x882C -#define GL_DRAW_BUFFER8_ARB 0x882D -#define GL_DRAW_BUFFER9_ARB 0x882E -#define GL_DRAW_BUFFER10_ARB 0x882F -#define GL_DRAW_BUFFER11_ARB 0x8830 -#define GL_DRAW_BUFFER12_ARB 0x8831 -#define GL_DRAW_BUFFER13_ARB 0x8832 -#define GL_DRAW_BUFFER14_ARB 0x8833 -#define GL_DRAW_BUFFER15_ARB 0x8834 - -typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum* bufs); - -#define glDrawBuffersARB GLEW_GET_FUN(__glewDrawBuffersARB) - -#define GLEW_ARB_draw_buffers GLEW_GET_VAR(__GLEW_ARB_draw_buffers) - -#endif /* GL_ARB_draw_buffers */ - -/* ----------------------- GL_ARB_draw_buffers_blend ----------------------- */ - -#ifndef GL_ARB_draw_buffers_blend -#define GL_ARB_draw_buffers_blend 1 - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst); - -#define glBlendEquationSeparateiARB GLEW_GET_FUN(__glewBlendEquationSeparateiARB) -#define glBlendEquationiARB GLEW_GET_FUN(__glewBlendEquationiARB) -#define glBlendFuncSeparateiARB GLEW_GET_FUN(__glewBlendFuncSeparateiARB) -#define glBlendFunciARB GLEW_GET_FUN(__glewBlendFunciARB) - -#define GLEW_ARB_draw_buffers_blend GLEW_GET_VAR(__GLEW_ARB_draw_buffers_blend) - -#endif /* GL_ARB_draw_buffers_blend */ - -/* -------------------- GL_ARB_draw_elements_base_vertex ------------------- */ - -#ifndef GL_ARB_draw_elements_base_vertex -#define GL_ARB_draw_elements_base_vertex 1 - -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLint basevertex); -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei* count, GLenum type, const void *const *indices, GLsizei primcount, const GLint *basevertex); - -#define glDrawElementsBaseVertex GLEW_GET_FUN(__glewDrawElementsBaseVertex) -#define glDrawElementsInstancedBaseVertex GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertex) -#define glDrawRangeElementsBaseVertex GLEW_GET_FUN(__glewDrawRangeElementsBaseVertex) -#define glMultiDrawElementsBaseVertex GLEW_GET_FUN(__glewMultiDrawElementsBaseVertex) - -#define GLEW_ARB_draw_elements_base_vertex GLEW_GET_VAR(__GLEW_ARB_draw_elements_base_vertex) - -#endif /* GL_ARB_draw_elements_base_vertex */ - -/* -------------------------- GL_ARB_draw_indirect ------------------------- */ - -#ifndef GL_ARB_draw_indirect -#define GL_ARB_draw_indirect 1 - -#define GL_DRAW_INDIRECT_BUFFER 0x8F3F -#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect); - -#define glDrawArraysIndirect GLEW_GET_FUN(__glewDrawArraysIndirect) -#define glDrawElementsIndirect GLEW_GET_FUN(__glewDrawElementsIndirect) - -#define GLEW_ARB_draw_indirect GLEW_GET_VAR(__GLEW_ARB_draw_indirect) - -#endif /* GL_ARB_draw_indirect */ - -/* ------------------------- GL_ARB_draw_instanced ------------------------- */ - -#ifndef GL_ARB_draw_instanced -#define GL_ARB_draw_instanced 1 - -#define GLEW_ARB_draw_instanced GLEW_GET_VAR(__GLEW_ARB_draw_instanced) - -#endif /* GL_ARB_draw_instanced */ - -/* ------------------------ GL_ARB_enhanced_layouts ------------------------ */ - -#ifndef GL_ARB_enhanced_layouts -#define GL_ARB_enhanced_layouts 1 - -#define GL_LOCATION_COMPONENT 0x934A -#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B -#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C - -#define GLEW_ARB_enhanced_layouts GLEW_GET_VAR(__GLEW_ARB_enhanced_layouts) - -#endif /* GL_ARB_enhanced_layouts */ - -/* -------------------- GL_ARB_explicit_attrib_location -------------------- */ - -#ifndef GL_ARB_explicit_attrib_location -#define GL_ARB_explicit_attrib_location 1 - -#define GLEW_ARB_explicit_attrib_location GLEW_GET_VAR(__GLEW_ARB_explicit_attrib_location) - -#endif /* GL_ARB_explicit_attrib_location */ - -/* -------------------- GL_ARB_explicit_uniform_location ------------------- */ - -#ifndef GL_ARB_explicit_uniform_location -#define GL_ARB_explicit_uniform_location 1 - -#define GL_MAX_UNIFORM_LOCATIONS 0x826E - -#define GLEW_ARB_explicit_uniform_location GLEW_GET_VAR(__GLEW_ARB_explicit_uniform_location) - -#endif /* GL_ARB_explicit_uniform_location */ - -/* ------------------- GL_ARB_fragment_coord_conventions ------------------- */ - -#ifndef GL_ARB_fragment_coord_conventions -#define GL_ARB_fragment_coord_conventions 1 - -#define GLEW_ARB_fragment_coord_conventions GLEW_GET_VAR(__GLEW_ARB_fragment_coord_conventions) - -#endif /* GL_ARB_fragment_coord_conventions */ - -/* --------------------- GL_ARB_fragment_layer_viewport -------------------- */ - -#ifndef GL_ARB_fragment_layer_viewport -#define GL_ARB_fragment_layer_viewport 1 - -#define GLEW_ARB_fragment_layer_viewport GLEW_GET_VAR(__GLEW_ARB_fragment_layer_viewport) - -#endif /* GL_ARB_fragment_layer_viewport */ - -/* ------------------------ GL_ARB_fragment_program ------------------------ */ - -#ifndef GL_ARB_fragment_program -#define GL_ARB_fragment_program 1 - -#define GL_FRAGMENT_PROGRAM_ARB 0x8804 -#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 -#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 -#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 -#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 -#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 -#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A -#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B -#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C -#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D -#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E -#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F -#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 -#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 - -#define GLEW_ARB_fragment_program GLEW_GET_VAR(__GLEW_ARB_fragment_program) - -#endif /* GL_ARB_fragment_program */ - -/* --------------------- GL_ARB_fragment_program_shadow -------------------- */ - -#ifndef GL_ARB_fragment_program_shadow -#define GL_ARB_fragment_program_shadow 1 - -#define GLEW_ARB_fragment_program_shadow GLEW_GET_VAR(__GLEW_ARB_fragment_program_shadow) - -#endif /* GL_ARB_fragment_program_shadow */ - -/* ------------------------- GL_ARB_fragment_shader ------------------------ */ - -#ifndef GL_ARB_fragment_shader -#define GL_ARB_fragment_shader 1 - -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B - -#define GLEW_ARB_fragment_shader GLEW_GET_VAR(__GLEW_ARB_fragment_shader) - -#endif /* GL_ARB_fragment_shader */ - -/* -------------------- GL_ARB_fragment_shader_interlock ------------------- */ - -#ifndef GL_ARB_fragment_shader_interlock -#define GL_ARB_fragment_shader_interlock 1 - -#define GLEW_ARB_fragment_shader_interlock GLEW_GET_VAR(__GLEW_ARB_fragment_shader_interlock) - -#endif /* GL_ARB_fragment_shader_interlock */ - -/* ------------------- GL_ARB_framebuffer_no_attachments ------------------- */ - -#ifndef GL_ARB_framebuffer_no_attachments -#define GL_ARB_framebuffer_no_attachments 1 - -#define GL_FRAMEBUFFER_DEFAULT_WIDTH 0x9310 -#define GL_FRAMEBUFFER_DEFAULT_HEIGHT 0x9311 -#define GL_FRAMEBUFFER_DEFAULT_LAYERS 0x9312 -#define GL_FRAMEBUFFER_DEFAULT_SAMPLES 0x9313 -#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314 -#define GL_MAX_FRAMEBUFFER_WIDTH 0x9315 -#define GL_MAX_FRAMEBUFFER_HEIGHT 0x9316 -#define GL_MAX_FRAMEBUFFER_LAYERS 0x9317 -#define GL_MAX_FRAMEBUFFER_SAMPLES 0x9318 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param); - -#define glFramebufferParameteri GLEW_GET_FUN(__glewFramebufferParameteri) -#define glGetFramebufferParameteriv GLEW_GET_FUN(__glewGetFramebufferParameteriv) -#define glGetNamedFramebufferParameterivEXT GLEW_GET_FUN(__glewGetNamedFramebufferParameterivEXT) -#define glNamedFramebufferParameteriEXT GLEW_GET_FUN(__glewNamedFramebufferParameteriEXT) - -#define GLEW_ARB_framebuffer_no_attachments GLEW_GET_VAR(__GLEW_ARB_framebuffer_no_attachments) - -#endif /* GL_ARB_framebuffer_no_attachments */ - -/* ----------------------- GL_ARB_framebuffer_object ----------------------- */ - -#ifndef GL_ARB_framebuffer_object -#define GL_ARB_framebuffer_object 1 - -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 -#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212 -#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213 -#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 -#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215 -#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 -#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217 -#define GL_FRAMEBUFFER_DEFAULT 0x8218 -#define GL_FRAMEBUFFER_UNDEFINED 0x8219 -#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A -#define GL_INDEX 0x8222 -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 -#define GL_DEPTH_STENCIL 0x84F9 -#define GL_UNSIGNED_INT_24_8 0x84FA -#define GL_DEPTH24_STENCIL8 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE 0x88F1 -#define GL_UNSIGNED_NORMALIZED 0x8C17 -#define GL_SRGB 0x8C40 -#define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_READ_FRAMEBUFFER 0x8CA8 -#define GL_DRAW_FRAMEBUFFER 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA -#define GL_RENDERBUFFER_SAMPLES 0x8CAB -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_COLOR_ATTACHMENT1 0x8CE1 -#define GL_COLOR_ATTACHMENT2 0x8CE2 -#define GL_COLOR_ATTACHMENT3 0x8CE3 -#define GL_COLOR_ATTACHMENT4 0x8CE4 -#define GL_COLOR_ATTACHMENT5 0x8CE5 -#define GL_COLOR_ATTACHMENT6 0x8CE6 -#define GL_COLOR_ATTACHMENT7 0x8CE7 -#define GL_COLOR_ATTACHMENT8 0x8CE8 -#define GL_COLOR_ATTACHMENT9 0x8CE9 -#define GL_COLOR_ATTACHMENT10 0x8CEA -#define GL_COLOR_ATTACHMENT11 0x8CEB -#define GL_COLOR_ATTACHMENT12 0x8CEC -#define GL_COLOR_ATTACHMENT13 0x8CED -#define GL_COLOR_ATTACHMENT14 0x8CEE -#define GL_COLOR_ATTACHMENT15 0x8CEF -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_STENCIL_INDEX1 0x8D46 -#define GL_STENCIL_INDEX4 0x8D47 -#define GL_STENCIL_INDEX8 0x8D48 -#define GL_STENCIL_INDEX16 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 -#define GL_MAX_SAMPLES 0x8D57 - -typedef void (GLAPIENTRY * PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer); -typedef void (GLAPIENTRY * PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef GLenum (GLAPIENTRY * PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target,GLenum attachment, GLuint texture,GLint level,GLint layer); -typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLGENERATEMIPMAPPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer); -typedef GLboolean (GLAPIENTRY * PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); - -#define glBindFramebuffer GLEW_GET_FUN(__glewBindFramebuffer) -#define glBindRenderbuffer GLEW_GET_FUN(__glewBindRenderbuffer) -#define glBlitFramebuffer GLEW_GET_FUN(__glewBlitFramebuffer) -#define glCheckFramebufferStatus GLEW_GET_FUN(__glewCheckFramebufferStatus) -#define glDeleteFramebuffers GLEW_GET_FUN(__glewDeleteFramebuffers) -#define glDeleteRenderbuffers GLEW_GET_FUN(__glewDeleteRenderbuffers) -#define glFramebufferRenderbuffer GLEW_GET_FUN(__glewFramebufferRenderbuffer) -#define glFramebufferTexture1D GLEW_GET_FUN(__glewFramebufferTexture1D) -#define glFramebufferTexture2D GLEW_GET_FUN(__glewFramebufferTexture2D) -#define glFramebufferTexture3D GLEW_GET_FUN(__glewFramebufferTexture3D) -#define glFramebufferTextureLayer GLEW_GET_FUN(__glewFramebufferTextureLayer) -#define glGenFramebuffers GLEW_GET_FUN(__glewGenFramebuffers) -#define glGenRenderbuffers GLEW_GET_FUN(__glewGenRenderbuffers) -#define glGenerateMipmap GLEW_GET_FUN(__glewGenerateMipmap) -#define glGetFramebufferAttachmentParameteriv GLEW_GET_FUN(__glewGetFramebufferAttachmentParameteriv) -#define glGetRenderbufferParameteriv GLEW_GET_FUN(__glewGetRenderbufferParameteriv) -#define glIsFramebuffer GLEW_GET_FUN(__glewIsFramebuffer) -#define glIsRenderbuffer GLEW_GET_FUN(__glewIsRenderbuffer) -#define glRenderbufferStorage GLEW_GET_FUN(__glewRenderbufferStorage) -#define glRenderbufferStorageMultisample GLEW_GET_FUN(__glewRenderbufferStorageMultisample) - -#define GLEW_ARB_framebuffer_object GLEW_GET_VAR(__GLEW_ARB_framebuffer_object) - -#endif /* GL_ARB_framebuffer_object */ - -/* ------------------------ GL_ARB_framebuffer_sRGB ------------------------ */ - -#ifndef GL_ARB_framebuffer_sRGB -#define GL_ARB_framebuffer_sRGB 1 - -#define GL_FRAMEBUFFER_SRGB 0x8DB9 - -#define GLEW_ARB_framebuffer_sRGB GLEW_GET_VAR(__GLEW_ARB_framebuffer_sRGB) - -#endif /* GL_ARB_framebuffer_sRGB */ - -/* ------------------------ GL_ARB_geometry_shader4 ------------------------ */ - -#ifndef GL_ARB_geometry_shader4 -#define GL_ARB_geometry_shader4 1 - -#define GL_LINES_ADJACENCY_ARB 0xA -#define GL_LINE_STRIP_ADJACENCY_ARB 0xB -#define GL_TRIANGLES_ADJACENCY_ARB 0xC -#define GL_TRIANGLE_STRIP_ADJACENCY_ARB 0xD -#define GL_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9 -#define GL_GEOMETRY_SHADER_ARB 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT_ARB 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_ARB 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_ARB 0x8DDC -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value); - -#define glFramebufferTextureARB GLEW_GET_FUN(__glewFramebufferTextureARB) -#define glFramebufferTextureFaceARB GLEW_GET_FUN(__glewFramebufferTextureFaceARB) -#define glFramebufferTextureLayerARB GLEW_GET_FUN(__glewFramebufferTextureLayerARB) -#define glProgramParameteriARB GLEW_GET_FUN(__glewProgramParameteriARB) - -#define GLEW_ARB_geometry_shader4 GLEW_GET_VAR(__GLEW_ARB_geometry_shader4) - -#endif /* GL_ARB_geometry_shader4 */ - -/* ----------------------- GL_ARB_get_program_binary ----------------------- */ - -#ifndef GL_ARB_get_program_binary -#define GL_ARB_get_program_binary 1 - -#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257 -#define GL_PROGRAM_BINARY_LENGTH 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE -#define GL_PROGRAM_BINARY_FORMATS 0x87FF - -typedef void (GLAPIENTRY * PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLenum *binaryFormat, void*binary); -typedef void (GLAPIENTRY * PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value); - -#define glGetProgramBinary GLEW_GET_FUN(__glewGetProgramBinary) -#define glProgramBinary GLEW_GET_FUN(__glewProgramBinary) -#define glProgramParameteri GLEW_GET_FUN(__glewProgramParameteri) - -#define GLEW_ARB_get_program_binary GLEW_GET_VAR(__GLEW_ARB_get_program_binary) - -#endif /* GL_ARB_get_program_binary */ - -/* ---------------------- GL_ARB_get_texture_sub_image --------------------- */ - -#ifndef GL_ARB_get_texture_sub_image -#define GL_ARB_get_texture_sub_image 1 - -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels); - -#define glGetCompressedTextureSubImage GLEW_GET_FUN(__glewGetCompressedTextureSubImage) -#define glGetTextureSubImage GLEW_GET_FUN(__glewGetTextureSubImage) - -#define GLEW_ARB_get_texture_sub_image GLEW_GET_VAR(__GLEW_ARB_get_texture_sub_image) - -#endif /* GL_ARB_get_texture_sub_image */ - -/* ---------------------------- GL_ARB_gl_spirv ---------------------------- */ - -#ifndef GL_ARB_gl_spirv -#define GL_ARB_gl_spirv 1 - -#define GL_SHADER_BINARY_FORMAT_SPIR_V_ARB 0x9551 -#define GL_SPIR_V_BINARY_ARB 0x9552 - -typedef void (GLAPIENTRY * PFNGLSPECIALIZESHADERARBPROC) (GLuint shader, const GLchar* pEntryPoint, GLuint numSpecializationConstants, const GLuint* pConstantIndex, const GLuint* pConstantValue); - -#define glSpecializeShaderARB GLEW_GET_FUN(__glewSpecializeShaderARB) - -#define GLEW_ARB_gl_spirv GLEW_GET_VAR(__GLEW_ARB_gl_spirv) - -#endif /* GL_ARB_gl_spirv */ - -/* --------------------------- GL_ARB_gpu_shader5 -------------------------- */ - -#ifndef GL_ARB_gpu_shader5 -#define GL_ARB_gpu_shader5 1 - -#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F -#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C -#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D -#define GL_MAX_VERTEX_STREAMS 0x8E71 - -#define GLEW_ARB_gpu_shader5 GLEW_GET_VAR(__GLEW_ARB_gpu_shader5) - -#endif /* GL_ARB_gpu_shader5 */ - -/* ------------------------- GL_ARB_gpu_shader_fp64 ------------------------ */ - -#ifndef GL_ARB_gpu_shader_fp64 -#define GL_ARB_gpu_shader_fp64 1 - -#define GL_DOUBLE_MAT2 0x8F46 -#define GL_DOUBLE_MAT3 0x8F47 -#define GL_DOUBLE_MAT4 0x8F48 -#define GL_DOUBLE_MAT2x3 0x8F49 -#define GL_DOUBLE_MAT2x4 0x8F4A -#define GL_DOUBLE_MAT3x2 0x8F4B -#define GL_DOUBLE_MAT3x4 0x8F4C -#define GL_DOUBLE_MAT4x2 0x8F4D -#define GL_DOUBLE_MAT4x3 0x8F4E -#define GL_DOUBLE_VEC2 0x8FFC -#define GL_DOUBLE_VEC3 0x8FFD -#define GL_DOUBLE_VEC4 0x8FFE - -typedef void (GLAPIENTRY * PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLUNIFORM1DPROC) (GLint location, GLdouble x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); - -#define glGetUniformdv GLEW_GET_FUN(__glewGetUniformdv) -#define glUniform1d GLEW_GET_FUN(__glewUniform1d) -#define glUniform1dv GLEW_GET_FUN(__glewUniform1dv) -#define glUniform2d GLEW_GET_FUN(__glewUniform2d) -#define glUniform2dv GLEW_GET_FUN(__glewUniform2dv) -#define glUniform3d GLEW_GET_FUN(__glewUniform3d) -#define glUniform3dv GLEW_GET_FUN(__glewUniform3dv) -#define glUniform4d GLEW_GET_FUN(__glewUniform4d) -#define glUniform4dv GLEW_GET_FUN(__glewUniform4dv) -#define glUniformMatrix2dv GLEW_GET_FUN(__glewUniformMatrix2dv) -#define glUniformMatrix2x3dv GLEW_GET_FUN(__glewUniformMatrix2x3dv) -#define glUniformMatrix2x4dv GLEW_GET_FUN(__glewUniformMatrix2x4dv) -#define glUniformMatrix3dv GLEW_GET_FUN(__glewUniformMatrix3dv) -#define glUniformMatrix3x2dv GLEW_GET_FUN(__glewUniformMatrix3x2dv) -#define glUniformMatrix3x4dv GLEW_GET_FUN(__glewUniformMatrix3x4dv) -#define glUniformMatrix4dv GLEW_GET_FUN(__glewUniformMatrix4dv) -#define glUniformMatrix4x2dv GLEW_GET_FUN(__glewUniformMatrix4x2dv) -#define glUniformMatrix4x3dv GLEW_GET_FUN(__glewUniformMatrix4x3dv) - -#define GLEW_ARB_gpu_shader_fp64 GLEW_GET_VAR(__GLEW_ARB_gpu_shader_fp64) - -#endif /* GL_ARB_gpu_shader_fp64 */ - -/* ------------------------ GL_ARB_gpu_shader_int64 ------------------------ */ - -#ifndef GL_ARB_gpu_shader_int64 -#define GL_ARB_gpu_shader_int64 1 - -#define GL_INT64_ARB 0x140E -#define GL_UNSIGNED_INT64_ARB 0x140F -#define GL_INT64_VEC2_ARB 0x8FE9 -#define GL_INT64_VEC3_ARB 0x8FEA -#define GL_INT64_VEC4_ARB 0x8FEB -#define GL_UNSIGNED_INT64_VEC2_ARB 0x8FF5 -#define GL_UNSIGNED_INT64_VEC3_ARB 0x8FF6 -#define GL_UNSIGNED_INT64_VEC4_ARB 0x8FF7 - -typedef void (GLAPIENTRY * PFNGLGETUNIFORMI64VARBPROC) (GLuint program, GLint location, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64ARBPROC) (GLuint program, GLint location, GLint64 x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64ARBPROC) (GLuint program, GLint location, GLuint64 x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1I64ARBPROC) (GLint location, GLint64 x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1I64VARBPROC) (GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64ARBPROC) (GLint location, GLuint64 x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2I64ARBPROC) (GLint location, GLint64 x, GLint64 y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2I64VARBPROC) (GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3I64VARBPROC) (GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4I64VARBPROC) (GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); - -#define glGetUniformi64vARB GLEW_GET_FUN(__glewGetUniformi64vARB) -#define glGetUniformui64vARB GLEW_GET_FUN(__glewGetUniformui64vARB) -#define glGetnUniformi64vARB GLEW_GET_FUN(__glewGetnUniformi64vARB) -#define glGetnUniformui64vARB GLEW_GET_FUN(__glewGetnUniformui64vARB) -#define glProgramUniform1i64ARB GLEW_GET_FUN(__glewProgramUniform1i64ARB) -#define glProgramUniform1i64vARB GLEW_GET_FUN(__glewProgramUniform1i64vARB) -#define glProgramUniform1ui64ARB GLEW_GET_FUN(__glewProgramUniform1ui64ARB) -#define glProgramUniform1ui64vARB GLEW_GET_FUN(__glewProgramUniform1ui64vARB) -#define glProgramUniform2i64ARB GLEW_GET_FUN(__glewProgramUniform2i64ARB) -#define glProgramUniform2i64vARB GLEW_GET_FUN(__glewProgramUniform2i64vARB) -#define glProgramUniform2ui64ARB GLEW_GET_FUN(__glewProgramUniform2ui64ARB) -#define glProgramUniform2ui64vARB GLEW_GET_FUN(__glewProgramUniform2ui64vARB) -#define glProgramUniform3i64ARB GLEW_GET_FUN(__glewProgramUniform3i64ARB) -#define glProgramUniform3i64vARB GLEW_GET_FUN(__glewProgramUniform3i64vARB) -#define glProgramUniform3ui64ARB GLEW_GET_FUN(__glewProgramUniform3ui64ARB) -#define glProgramUniform3ui64vARB GLEW_GET_FUN(__glewProgramUniform3ui64vARB) -#define glProgramUniform4i64ARB GLEW_GET_FUN(__glewProgramUniform4i64ARB) -#define glProgramUniform4i64vARB GLEW_GET_FUN(__glewProgramUniform4i64vARB) -#define glProgramUniform4ui64ARB GLEW_GET_FUN(__glewProgramUniform4ui64ARB) -#define glProgramUniform4ui64vARB GLEW_GET_FUN(__glewProgramUniform4ui64vARB) -#define glUniform1i64ARB GLEW_GET_FUN(__glewUniform1i64ARB) -#define glUniform1i64vARB GLEW_GET_FUN(__glewUniform1i64vARB) -#define glUniform1ui64ARB GLEW_GET_FUN(__glewUniform1ui64ARB) -#define glUniform1ui64vARB GLEW_GET_FUN(__glewUniform1ui64vARB) -#define glUniform2i64ARB GLEW_GET_FUN(__glewUniform2i64ARB) -#define glUniform2i64vARB GLEW_GET_FUN(__glewUniform2i64vARB) -#define glUniform2ui64ARB GLEW_GET_FUN(__glewUniform2ui64ARB) -#define glUniform2ui64vARB GLEW_GET_FUN(__glewUniform2ui64vARB) -#define glUniform3i64ARB GLEW_GET_FUN(__glewUniform3i64ARB) -#define glUniform3i64vARB GLEW_GET_FUN(__glewUniform3i64vARB) -#define glUniform3ui64ARB GLEW_GET_FUN(__glewUniform3ui64ARB) -#define glUniform3ui64vARB GLEW_GET_FUN(__glewUniform3ui64vARB) -#define glUniform4i64ARB GLEW_GET_FUN(__glewUniform4i64ARB) -#define glUniform4i64vARB GLEW_GET_FUN(__glewUniform4i64vARB) -#define glUniform4ui64ARB GLEW_GET_FUN(__glewUniform4ui64ARB) -#define glUniform4ui64vARB GLEW_GET_FUN(__glewUniform4ui64vARB) - -#define GLEW_ARB_gpu_shader_int64 GLEW_GET_VAR(__GLEW_ARB_gpu_shader_int64) - -#endif /* GL_ARB_gpu_shader_int64 */ - -/* ------------------------ GL_ARB_half_float_pixel ------------------------ */ - -#ifndef GL_ARB_half_float_pixel -#define GL_ARB_half_float_pixel 1 - -#define GL_HALF_FLOAT_ARB 0x140B - -#define GLEW_ARB_half_float_pixel GLEW_GET_VAR(__GLEW_ARB_half_float_pixel) - -#endif /* GL_ARB_half_float_pixel */ - -/* ------------------------ GL_ARB_half_float_vertex ----------------------- */ - -#ifndef GL_ARB_half_float_vertex -#define GL_ARB_half_float_vertex 1 - -#define GL_HALF_FLOAT 0x140B - -#define GLEW_ARB_half_float_vertex GLEW_GET_VAR(__GLEW_ARB_half_float_vertex) - -#endif /* GL_ARB_half_float_vertex */ - -/* ----------------------------- GL_ARB_imaging ---------------------------- */ - -#ifndef GL_ARB_imaging -#define GL_ARB_imaging 1 - -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_IGNORE_BORDER 0x8150 -#define GL_CONSTANT_BORDER 0x8151 -#define GL_WRAP_BORDER 0x8152 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 - -typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table); -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, void *table); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, void *image); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum types, void *values); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span); -typedef void (GLAPIENTRY * PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (GLAPIENTRY * PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLRESETMINMAXPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column); - -#define glColorSubTable GLEW_GET_FUN(__glewColorSubTable) -#define glColorTable GLEW_GET_FUN(__glewColorTable) -#define glColorTableParameterfv GLEW_GET_FUN(__glewColorTableParameterfv) -#define glColorTableParameteriv GLEW_GET_FUN(__glewColorTableParameteriv) -#define glConvolutionFilter1D GLEW_GET_FUN(__glewConvolutionFilter1D) -#define glConvolutionFilter2D GLEW_GET_FUN(__glewConvolutionFilter2D) -#define glConvolutionParameterf GLEW_GET_FUN(__glewConvolutionParameterf) -#define glConvolutionParameterfv GLEW_GET_FUN(__glewConvolutionParameterfv) -#define glConvolutionParameteri GLEW_GET_FUN(__glewConvolutionParameteri) -#define glConvolutionParameteriv GLEW_GET_FUN(__glewConvolutionParameteriv) -#define glCopyColorSubTable GLEW_GET_FUN(__glewCopyColorSubTable) -#define glCopyColorTable GLEW_GET_FUN(__glewCopyColorTable) -#define glCopyConvolutionFilter1D GLEW_GET_FUN(__glewCopyConvolutionFilter1D) -#define glCopyConvolutionFilter2D GLEW_GET_FUN(__glewCopyConvolutionFilter2D) -#define glGetColorTable GLEW_GET_FUN(__glewGetColorTable) -#define glGetColorTableParameterfv GLEW_GET_FUN(__glewGetColorTableParameterfv) -#define glGetColorTableParameteriv GLEW_GET_FUN(__glewGetColorTableParameteriv) -#define glGetConvolutionFilter GLEW_GET_FUN(__glewGetConvolutionFilter) -#define glGetConvolutionParameterfv GLEW_GET_FUN(__glewGetConvolutionParameterfv) -#define glGetConvolutionParameteriv GLEW_GET_FUN(__glewGetConvolutionParameteriv) -#define glGetHistogram GLEW_GET_FUN(__glewGetHistogram) -#define glGetHistogramParameterfv GLEW_GET_FUN(__glewGetHistogramParameterfv) -#define glGetHistogramParameteriv GLEW_GET_FUN(__glewGetHistogramParameteriv) -#define glGetMinmax GLEW_GET_FUN(__glewGetMinmax) -#define glGetMinmaxParameterfv GLEW_GET_FUN(__glewGetMinmaxParameterfv) -#define glGetMinmaxParameteriv GLEW_GET_FUN(__glewGetMinmaxParameteriv) -#define glGetSeparableFilter GLEW_GET_FUN(__glewGetSeparableFilter) -#define glHistogram GLEW_GET_FUN(__glewHistogram) -#define glMinmax GLEW_GET_FUN(__glewMinmax) -#define glResetHistogram GLEW_GET_FUN(__glewResetHistogram) -#define glResetMinmax GLEW_GET_FUN(__glewResetMinmax) -#define glSeparableFilter2D GLEW_GET_FUN(__glewSeparableFilter2D) - -#define GLEW_ARB_imaging GLEW_GET_VAR(__GLEW_ARB_imaging) - -#endif /* GL_ARB_imaging */ - -/* ----------------------- GL_ARB_indirect_parameters ---------------------- */ - -#ifndef GL_ARB_indirect_parameters -#define GL_ARB_indirect_parameters 1 - -#define GL_PARAMETER_BUFFER_ARB 0x80EE -#define GL_PARAMETER_BUFFER_BINDING_ARB 0x80EF - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); - -#define glMultiDrawArraysIndirectCountARB GLEW_GET_FUN(__glewMultiDrawArraysIndirectCountARB) -#define glMultiDrawElementsIndirectCountARB GLEW_GET_FUN(__glewMultiDrawElementsIndirectCountARB) - -#define GLEW_ARB_indirect_parameters GLEW_GET_VAR(__GLEW_ARB_indirect_parameters) - -#endif /* GL_ARB_indirect_parameters */ - -/* ------------------------ GL_ARB_instanced_arrays ------------------------ */ - -#ifndef GL_ARB_instanced_arrays -#define GL_ARB_instanced_arrays 1 - -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); - -#define glDrawArraysInstancedARB GLEW_GET_FUN(__glewDrawArraysInstancedARB) -#define glDrawElementsInstancedARB GLEW_GET_FUN(__glewDrawElementsInstancedARB) -#define glVertexAttribDivisorARB GLEW_GET_FUN(__glewVertexAttribDivisorARB) - -#define GLEW_ARB_instanced_arrays GLEW_GET_VAR(__GLEW_ARB_instanced_arrays) - -#endif /* GL_ARB_instanced_arrays */ - -/* ---------------------- GL_ARB_internalformat_query ---------------------- */ - -#ifndef GL_ARB_internalformat_query -#define GL_ARB_internalformat_query 1 - -#define GL_NUM_SAMPLE_COUNTS 0x9380 - -typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params); - -#define glGetInternalformativ GLEW_GET_FUN(__glewGetInternalformativ) - -#define GLEW_ARB_internalformat_query GLEW_GET_VAR(__GLEW_ARB_internalformat_query) - -#endif /* GL_ARB_internalformat_query */ - -/* ---------------------- GL_ARB_internalformat_query2 --------------------- */ - -#ifndef GL_ARB_internalformat_query2 -#define GL_ARB_internalformat_query2 1 - -#define GL_INTERNALFORMAT_SUPPORTED 0x826F -#define GL_INTERNALFORMAT_PREFERRED 0x8270 -#define GL_INTERNALFORMAT_RED_SIZE 0x8271 -#define GL_INTERNALFORMAT_GREEN_SIZE 0x8272 -#define GL_INTERNALFORMAT_BLUE_SIZE 0x8273 -#define GL_INTERNALFORMAT_ALPHA_SIZE 0x8274 -#define GL_INTERNALFORMAT_DEPTH_SIZE 0x8275 -#define GL_INTERNALFORMAT_STENCIL_SIZE 0x8276 -#define GL_INTERNALFORMAT_SHARED_SIZE 0x8277 -#define GL_INTERNALFORMAT_RED_TYPE 0x8278 -#define GL_INTERNALFORMAT_GREEN_TYPE 0x8279 -#define GL_INTERNALFORMAT_BLUE_TYPE 0x827A -#define GL_INTERNALFORMAT_ALPHA_TYPE 0x827B -#define GL_INTERNALFORMAT_DEPTH_TYPE 0x827C -#define GL_INTERNALFORMAT_STENCIL_TYPE 0x827D -#define GL_MAX_WIDTH 0x827E -#define GL_MAX_HEIGHT 0x827F -#define GL_MAX_DEPTH 0x8280 -#define GL_MAX_LAYERS 0x8281 -#define GL_MAX_COMBINED_DIMENSIONS 0x8282 -#define GL_COLOR_COMPONENTS 0x8283 -#define GL_DEPTH_COMPONENTS 0x8284 -#define GL_STENCIL_COMPONENTS 0x8285 -#define GL_COLOR_RENDERABLE 0x8286 -#define GL_DEPTH_RENDERABLE 0x8287 -#define GL_STENCIL_RENDERABLE 0x8288 -#define GL_FRAMEBUFFER_RENDERABLE 0x8289 -#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A -#define GL_FRAMEBUFFER_BLEND 0x828B -#define GL_READ_PIXELS 0x828C -#define GL_READ_PIXELS_FORMAT 0x828D -#define GL_READ_PIXELS_TYPE 0x828E -#define GL_TEXTURE_IMAGE_FORMAT 0x828F -#define GL_TEXTURE_IMAGE_TYPE 0x8290 -#define GL_GET_TEXTURE_IMAGE_FORMAT 0x8291 -#define GL_GET_TEXTURE_IMAGE_TYPE 0x8292 -#define GL_MIPMAP 0x8293 -#define GL_MANUAL_GENERATE_MIPMAP 0x8294 -#define GL_AUTO_GENERATE_MIPMAP 0x8295 -#define GL_COLOR_ENCODING 0x8296 -#define GL_SRGB_READ 0x8297 -#define GL_SRGB_WRITE 0x8298 -#define GL_SRGB_DECODE_ARB 0x8299 -#define GL_FILTER 0x829A -#define GL_VERTEX_TEXTURE 0x829B -#define GL_TESS_CONTROL_TEXTURE 0x829C -#define GL_TESS_EVALUATION_TEXTURE 0x829D -#define GL_GEOMETRY_TEXTURE 0x829E -#define GL_FRAGMENT_TEXTURE 0x829F -#define GL_COMPUTE_TEXTURE 0x82A0 -#define GL_TEXTURE_SHADOW 0x82A1 -#define GL_TEXTURE_GATHER 0x82A2 -#define GL_TEXTURE_GATHER_SHADOW 0x82A3 -#define GL_SHADER_IMAGE_LOAD 0x82A4 -#define GL_SHADER_IMAGE_STORE 0x82A5 -#define GL_SHADER_IMAGE_ATOMIC 0x82A6 -#define GL_IMAGE_TEXEL_SIZE 0x82A7 -#define GL_IMAGE_COMPATIBILITY_CLASS 0x82A8 -#define GL_IMAGE_PIXEL_FORMAT 0x82A9 -#define GL_IMAGE_PIXEL_TYPE 0x82AA -#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC -#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD -#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE -#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF -#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1 -#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2 -#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE 0x82B3 -#define GL_CLEAR_BUFFER 0x82B4 -#define GL_TEXTURE_VIEW 0x82B5 -#define GL_VIEW_COMPATIBILITY_CLASS 0x82B6 -#define GL_FULL_SUPPORT 0x82B7 -#define GL_CAVEAT_SUPPORT 0x82B8 -#define GL_IMAGE_CLASS_4_X_32 0x82B9 -#define GL_IMAGE_CLASS_2_X_32 0x82BA -#define GL_IMAGE_CLASS_1_X_32 0x82BB -#define GL_IMAGE_CLASS_4_X_16 0x82BC -#define GL_IMAGE_CLASS_2_X_16 0x82BD -#define GL_IMAGE_CLASS_1_X_16 0x82BE -#define GL_IMAGE_CLASS_4_X_8 0x82BF -#define GL_IMAGE_CLASS_2_X_8 0x82C0 -#define GL_IMAGE_CLASS_1_X_8 0x82C1 -#define GL_IMAGE_CLASS_11_11_10 0x82C2 -#define GL_IMAGE_CLASS_10_10_10_2 0x82C3 -#define GL_VIEW_CLASS_128_BITS 0x82C4 -#define GL_VIEW_CLASS_96_BITS 0x82C5 -#define GL_VIEW_CLASS_64_BITS 0x82C6 -#define GL_VIEW_CLASS_48_BITS 0x82C7 -#define GL_VIEW_CLASS_32_BITS 0x82C8 -#define GL_VIEW_CLASS_24_BITS 0x82C9 -#define GL_VIEW_CLASS_16_BITS 0x82CA -#define GL_VIEW_CLASS_8_BITS 0x82CB -#define GL_VIEW_CLASS_S3TC_DXT1_RGB 0x82CC -#define GL_VIEW_CLASS_S3TC_DXT1_RGBA 0x82CD -#define GL_VIEW_CLASS_S3TC_DXT3_RGBA 0x82CE -#define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF -#define GL_VIEW_CLASS_RGTC1_RED 0x82D0 -#define GL_VIEW_CLASS_RGTC2_RG 0x82D1 -#define GL_VIEW_CLASS_BPTC_UNORM 0x82D2 -#define GL_VIEW_CLASS_BPTC_FLOAT 0x82D3 - -typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64* params); - -#define glGetInternalformati64v GLEW_GET_FUN(__glewGetInternalformati64v) - -#define GLEW_ARB_internalformat_query2 GLEW_GET_VAR(__GLEW_ARB_internalformat_query2) - -#endif /* GL_ARB_internalformat_query2 */ - -/* ----------------------- GL_ARB_invalidate_subdata ----------------------- */ - -#ifndef GL_ARB_invalidate_subdata -#define GL_ARB_invalidate_subdata 1 - -typedef void (GLAPIENTRY * PFNGLINVALIDATEBUFFERDATAPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); -typedef void (GLAPIENTRY * PFNGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum* attachments); -typedef void (GLAPIENTRY * PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); - -#define glInvalidateBufferData GLEW_GET_FUN(__glewInvalidateBufferData) -#define glInvalidateBufferSubData GLEW_GET_FUN(__glewInvalidateBufferSubData) -#define glInvalidateFramebuffer GLEW_GET_FUN(__glewInvalidateFramebuffer) -#define glInvalidateSubFramebuffer GLEW_GET_FUN(__glewInvalidateSubFramebuffer) -#define glInvalidateTexImage GLEW_GET_FUN(__glewInvalidateTexImage) -#define glInvalidateTexSubImage GLEW_GET_FUN(__glewInvalidateTexSubImage) - -#define GLEW_ARB_invalidate_subdata GLEW_GET_VAR(__GLEW_ARB_invalidate_subdata) - -#endif /* GL_ARB_invalidate_subdata */ - -/* ---------------------- GL_ARB_map_buffer_alignment ---------------------- */ - -#ifndef GL_ARB_map_buffer_alignment -#define GL_ARB_map_buffer_alignment 1 - -#define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC - -#define GLEW_ARB_map_buffer_alignment GLEW_GET_VAR(__GLEW_ARB_map_buffer_alignment) - -#endif /* GL_ARB_map_buffer_alignment */ - -/* ------------------------ GL_ARB_map_buffer_range ------------------------ */ - -#ifndef GL_ARB_map_buffer_range -#define GL_ARB_map_buffer_range 1 - -#define GL_MAP_READ_BIT 0x0001 -#define GL_MAP_WRITE_BIT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 - -typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length); -typedef void * (GLAPIENTRY * PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); - -#define glFlushMappedBufferRange GLEW_GET_FUN(__glewFlushMappedBufferRange) -#define glMapBufferRange GLEW_GET_FUN(__glewMapBufferRange) - -#define GLEW_ARB_map_buffer_range GLEW_GET_VAR(__GLEW_ARB_map_buffer_range) - -#endif /* GL_ARB_map_buffer_range */ - -/* ------------------------- GL_ARB_matrix_palette ------------------------- */ - -#ifndef GL_ARB_matrix_palette -#define GL_ARB_matrix_palette 1 - -#define GL_MATRIX_PALETTE_ARB 0x8840 -#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 -#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 -#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 -#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 -#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 -#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 -#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 -#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 -#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 - -typedef void (GLAPIENTRY * PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index); -typedef void (GLAPIENTRY * PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, void *pointer); -typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUBVARBPROC) (GLint size, GLubyte *indices); -typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUIVARBPROC) (GLint size, GLuint *indices); -typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUSVARBPROC) (GLint size, GLushort *indices); - -#define glCurrentPaletteMatrixARB GLEW_GET_FUN(__glewCurrentPaletteMatrixARB) -#define glMatrixIndexPointerARB GLEW_GET_FUN(__glewMatrixIndexPointerARB) -#define glMatrixIndexubvARB GLEW_GET_FUN(__glewMatrixIndexubvARB) -#define glMatrixIndexuivARB GLEW_GET_FUN(__glewMatrixIndexuivARB) -#define glMatrixIndexusvARB GLEW_GET_FUN(__glewMatrixIndexusvARB) - -#define GLEW_ARB_matrix_palette GLEW_GET_VAR(__GLEW_ARB_matrix_palette) - -#endif /* GL_ARB_matrix_palette */ - -/* --------------------------- GL_ARB_multi_bind --------------------------- */ - -#ifndef GL_ARB_multi_bind -#define GL_ARB_multi_bind 1 - -typedef void (GLAPIENTRY * PFNGLBINDBUFFERSBASEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERSRANGEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint* buffers, const GLintptr *offsets, const GLsizeiptr *sizes); -typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTURESPROC) (GLuint first, GLsizei count, const GLuint* textures); -typedef void (GLAPIENTRY * PFNGLBINDSAMPLERSPROC) (GLuint first, GLsizei count, const GLuint* samplers); -typedef void (GLAPIENTRY * PFNGLBINDTEXTURESPROC) (GLuint first, GLsizei count, const GLuint* textures); -typedef void (GLAPIENTRY * PFNGLBINDVERTEXBUFFERSPROC) (GLuint first, GLsizei count, const GLuint* buffers, const GLintptr *offsets, const GLsizei *strides); - -#define glBindBuffersBase GLEW_GET_FUN(__glewBindBuffersBase) -#define glBindBuffersRange GLEW_GET_FUN(__glewBindBuffersRange) -#define glBindImageTextures GLEW_GET_FUN(__glewBindImageTextures) -#define glBindSamplers GLEW_GET_FUN(__glewBindSamplers) -#define glBindTextures GLEW_GET_FUN(__glewBindTextures) -#define glBindVertexBuffers GLEW_GET_FUN(__glewBindVertexBuffers) - -#define GLEW_ARB_multi_bind GLEW_GET_VAR(__GLEW_ARB_multi_bind) - -#endif /* GL_ARB_multi_bind */ - -/* ----------------------- GL_ARB_multi_draw_indirect ---------------------- */ - -#ifndef GL_ARB_multi_draw_indirect -#define GL_ARB_multi_draw_indirect 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride); - -#define glMultiDrawArraysIndirect GLEW_GET_FUN(__glewMultiDrawArraysIndirect) -#define glMultiDrawElementsIndirect GLEW_GET_FUN(__glewMultiDrawElementsIndirect) - -#define GLEW_ARB_multi_draw_indirect GLEW_GET_VAR(__GLEW_ARB_multi_draw_indirect) - -#endif /* GL_ARB_multi_draw_indirect */ - -/* --------------------------- GL_ARB_multisample -------------------------- */ - -#ifndef GL_ARB_multisample -#define GL_ARB_multisample 1 - -#define GL_MULTISAMPLE_ARB 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F -#define GL_SAMPLE_COVERAGE_ARB 0x80A0 -#define GL_SAMPLE_BUFFERS_ARB 0x80A8 -#define GL_SAMPLES_ARB 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB -#define GL_MULTISAMPLE_BIT_ARB 0x20000000 - -typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); - -#define glSampleCoverageARB GLEW_GET_FUN(__glewSampleCoverageARB) - -#define GLEW_ARB_multisample GLEW_GET_VAR(__GLEW_ARB_multisample) - -#endif /* GL_ARB_multisample */ - -/* -------------------------- GL_ARB_multitexture -------------------------- */ - -#ifndef GL_ARB_multitexture -#define GL_ARB_multitexture 1 - -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 - -typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); - -#define glActiveTextureARB GLEW_GET_FUN(__glewActiveTextureARB) -#define glClientActiveTextureARB GLEW_GET_FUN(__glewClientActiveTextureARB) -#define glMultiTexCoord1dARB GLEW_GET_FUN(__glewMultiTexCoord1dARB) -#define glMultiTexCoord1dvARB GLEW_GET_FUN(__glewMultiTexCoord1dvARB) -#define glMultiTexCoord1fARB GLEW_GET_FUN(__glewMultiTexCoord1fARB) -#define glMultiTexCoord1fvARB GLEW_GET_FUN(__glewMultiTexCoord1fvARB) -#define glMultiTexCoord1iARB GLEW_GET_FUN(__glewMultiTexCoord1iARB) -#define glMultiTexCoord1ivARB GLEW_GET_FUN(__glewMultiTexCoord1ivARB) -#define glMultiTexCoord1sARB GLEW_GET_FUN(__glewMultiTexCoord1sARB) -#define glMultiTexCoord1svARB GLEW_GET_FUN(__glewMultiTexCoord1svARB) -#define glMultiTexCoord2dARB GLEW_GET_FUN(__glewMultiTexCoord2dARB) -#define glMultiTexCoord2dvARB GLEW_GET_FUN(__glewMultiTexCoord2dvARB) -#define glMultiTexCoord2fARB GLEW_GET_FUN(__glewMultiTexCoord2fARB) -#define glMultiTexCoord2fvARB GLEW_GET_FUN(__glewMultiTexCoord2fvARB) -#define glMultiTexCoord2iARB GLEW_GET_FUN(__glewMultiTexCoord2iARB) -#define glMultiTexCoord2ivARB GLEW_GET_FUN(__glewMultiTexCoord2ivARB) -#define glMultiTexCoord2sARB GLEW_GET_FUN(__glewMultiTexCoord2sARB) -#define glMultiTexCoord2svARB GLEW_GET_FUN(__glewMultiTexCoord2svARB) -#define glMultiTexCoord3dARB GLEW_GET_FUN(__glewMultiTexCoord3dARB) -#define glMultiTexCoord3dvARB GLEW_GET_FUN(__glewMultiTexCoord3dvARB) -#define glMultiTexCoord3fARB GLEW_GET_FUN(__glewMultiTexCoord3fARB) -#define glMultiTexCoord3fvARB GLEW_GET_FUN(__glewMultiTexCoord3fvARB) -#define glMultiTexCoord3iARB GLEW_GET_FUN(__glewMultiTexCoord3iARB) -#define glMultiTexCoord3ivARB GLEW_GET_FUN(__glewMultiTexCoord3ivARB) -#define glMultiTexCoord3sARB GLEW_GET_FUN(__glewMultiTexCoord3sARB) -#define glMultiTexCoord3svARB GLEW_GET_FUN(__glewMultiTexCoord3svARB) -#define glMultiTexCoord4dARB GLEW_GET_FUN(__glewMultiTexCoord4dARB) -#define glMultiTexCoord4dvARB GLEW_GET_FUN(__glewMultiTexCoord4dvARB) -#define glMultiTexCoord4fARB GLEW_GET_FUN(__glewMultiTexCoord4fARB) -#define glMultiTexCoord4fvARB GLEW_GET_FUN(__glewMultiTexCoord4fvARB) -#define glMultiTexCoord4iARB GLEW_GET_FUN(__glewMultiTexCoord4iARB) -#define glMultiTexCoord4ivARB GLEW_GET_FUN(__glewMultiTexCoord4ivARB) -#define glMultiTexCoord4sARB GLEW_GET_FUN(__glewMultiTexCoord4sARB) -#define glMultiTexCoord4svARB GLEW_GET_FUN(__glewMultiTexCoord4svARB) - -#define GLEW_ARB_multitexture GLEW_GET_VAR(__GLEW_ARB_multitexture) - -#endif /* GL_ARB_multitexture */ - -/* ------------------------- GL_ARB_occlusion_query ------------------------ */ - -#ifndef GL_ARB_occlusion_query -#define GL_ARB_occlusion_query 1 - -#define GL_QUERY_COUNTER_BITS_ARB 0x8864 -#define GL_CURRENT_QUERY_ARB 0x8865 -#define GL_QUERY_RESULT_ARB 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 -#define GL_SAMPLES_PASSED_ARB 0x8914 - -typedef void (GLAPIENTRY * PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLENDQUERYARBPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISQUERYARBPROC) (GLuint id); - -#define glBeginQueryARB GLEW_GET_FUN(__glewBeginQueryARB) -#define glDeleteQueriesARB GLEW_GET_FUN(__glewDeleteQueriesARB) -#define glEndQueryARB GLEW_GET_FUN(__glewEndQueryARB) -#define glGenQueriesARB GLEW_GET_FUN(__glewGenQueriesARB) -#define glGetQueryObjectivARB GLEW_GET_FUN(__glewGetQueryObjectivARB) -#define glGetQueryObjectuivARB GLEW_GET_FUN(__glewGetQueryObjectuivARB) -#define glGetQueryivARB GLEW_GET_FUN(__glewGetQueryivARB) -#define glIsQueryARB GLEW_GET_FUN(__glewIsQueryARB) - -#define GLEW_ARB_occlusion_query GLEW_GET_VAR(__GLEW_ARB_occlusion_query) - -#endif /* GL_ARB_occlusion_query */ - -/* ------------------------ GL_ARB_occlusion_query2 ------------------------ */ - -#ifndef GL_ARB_occlusion_query2 -#define GL_ARB_occlusion_query2 1 - -#define GL_ANY_SAMPLES_PASSED 0x8C2F - -#define GLEW_ARB_occlusion_query2 GLEW_GET_VAR(__GLEW_ARB_occlusion_query2) - -#endif /* GL_ARB_occlusion_query2 */ - -/* --------------------- GL_ARB_parallel_shader_compile -------------------- */ - -#ifndef GL_ARB_parallel_shader_compile -#define GL_ARB_parallel_shader_compile 1 - -#define GL_MAX_SHADER_COMPILER_THREADS_ARB 0x91B0 -#define GL_COMPLETION_STATUS_ARB 0x91B1 - -typedef void (GLAPIENTRY * PFNGLMAXSHADERCOMPILERTHREADSARBPROC) (GLuint count); - -#define glMaxShaderCompilerThreadsARB GLEW_GET_FUN(__glewMaxShaderCompilerThreadsARB) - -#define GLEW_ARB_parallel_shader_compile GLEW_GET_VAR(__GLEW_ARB_parallel_shader_compile) - -#endif /* GL_ARB_parallel_shader_compile */ - -/* -------------------- GL_ARB_pipeline_statistics_query ------------------- */ - -#ifndef GL_ARB_pipeline_statistics_query -#define GL_ARB_pipeline_statistics_query 1 - -#define GL_VERTICES_SUBMITTED_ARB 0x82EE -#define GL_PRIMITIVES_SUBMITTED_ARB 0x82EF -#define GL_VERTEX_SHADER_INVOCATIONS_ARB 0x82F0 -#define GL_TESS_CONTROL_SHADER_PATCHES_ARB 0x82F1 -#define GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB 0x82F2 -#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB 0x82F3 -#define GL_FRAGMENT_SHADER_INVOCATIONS_ARB 0x82F4 -#define GL_COMPUTE_SHADER_INVOCATIONS_ARB 0x82F5 -#define GL_CLIPPING_INPUT_PRIMITIVES_ARB 0x82F6 -#define GL_CLIPPING_OUTPUT_PRIMITIVES_ARB 0x82F7 -#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F - -#define GLEW_ARB_pipeline_statistics_query GLEW_GET_VAR(__GLEW_ARB_pipeline_statistics_query) - -#endif /* GL_ARB_pipeline_statistics_query */ - -/* ----------------------- GL_ARB_pixel_buffer_object ---------------------- */ - -#ifndef GL_ARB_pixel_buffer_object -#define GL_ARB_pixel_buffer_object 1 - -#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF - -#define GLEW_ARB_pixel_buffer_object GLEW_GET_VAR(__GLEW_ARB_pixel_buffer_object) - -#endif /* GL_ARB_pixel_buffer_object */ - -/* ------------------------ GL_ARB_point_parameters ------------------------ */ - -#ifndef GL_ARB_point_parameters -#define GL_ARB_point_parameters 1 - -#define GL_POINT_SIZE_MIN_ARB 0x8126 -#define GL_POINT_SIZE_MAX_ARB 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 - -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat* params); - -#define glPointParameterfARB GLEW_GET_FUN(__glewPointParameterfARB) -#define glPointParameterfvARB GLEW_GET_FUN(__glewPointParameterfvARB) - -#define GLEW_ARB_point_parameters GLEW_GET_VAR(__GLEW_ARB_point_parameters) - -#endif /* GL_ARB_point_parameters */ - -/* -------------------------- GL_ARB_point_sprite -------------------------- */ - -#ifndef GL_ARB_point_sprite -#define GL_ARB_point_sprite 1 - -#define GL_POINT_SPRITE_ARB 0x8861 -#define GL_COORD_REPLACE_ARB 0x8862 - -#define GLEW_ARB_point_sprite GLEW_GET_VAR(__GLEW_ARB_point_sprite) - -#endif /* GL_ARB_point_sprite */ - -/* ----------------------- GL_ARB_post_depth_coverage ---------------------- */ - -#ifndef GL_ARB_post_depth_coverage -#define GL_ARB_post_depth_coverage 1 - -#define GLEW_ARB_post_depth_coverage GLEW_GET_VAR(__GLEW_ARB_post_depth_coverage) - -#endif /* GL_ARB_post_depth_coverage */ - -/* --------------------- GL_ARB_program_interface_query -------------------- */ - -#ifndef GL_ARB_program_interface_query -#define GL_ARB_program_interface_query 1 - -#define GL_UNIFORM 0x92E1 -#define GL_UNIFORM_BLOCK 0x92E2 -#define GL_PROGRAM_INPUT 0x92E3 -#define GL_PROGRAM_OUTPUT 0x92E4 -#define GL_BUFFER_VARIABLE 0x92E5 -#define GL_SHADER_STORAGE_BLOCK 0x92E6 -#define GL_IS_PER_PATCH 0x92E7 -#define GL_VERTEX_SUBROUTINE 0x92E8 -#define GL_TESS_CONTROL_SUBROUTINE 0x92E9 -#define GL_TESS_EVALUATION_SUBROUTINE 0x92EA -#define GL_GEOMETRY_SUBROUTINE 0x92EB -#define GL_FRAGMENT_SUBROUTINE 0x92EC -#define GL_COMPUTE_SUBROUTINE 0x92ED -#define GL_VERTEX_SUBROUTINE_UNIFORM 0x92EE -#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF -#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0 -#define GL_GEOMETRY_SUBROUTINE_UNIFORM 0x92F1 -#define GL_FRAGMENT_SUBROUTINE_UNIFORM 0x92F2 -#define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3 -#define GL_TRANSFORM_FEEDBACK_VARYING 0x92F4 -#define GL_ACTIVE_RESOURCES 0x92F5 -#define GL_MAX_NAME_LENGTH 0x92F6 -#define GL_MAX_NUM_ACTIVE_VARIABLES 0x92F7 -#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8 -#define GL_NAME_LENGTH 0x92F9 -#define GL_TYPE 0x92FA -#define GL_ARRAY_SIZE 0x92FB -#define GL_OFFSET 0x92FC -#define GL_BLOCK_INDEX 0x92FD -#define GL_ARRAY_STRIDE 0x92FE -#define GL_MATRIX_STRIDE 0x92FF -#define GL_IS_ROW_MAJOR 0x9300 -#define GL_ATOMIC_COUNTER_BUFFER_INDEX 0x9301 -#define GL_BUFFER_BINDING 0x9302 -#define GL_BUFFER_DATA_SIZE 0x9303 -#define GL_NUM_ACTIVE_VARIABLES 0x9304 -#define GL_ACTIVE_VARIABLES 0x9305 -#define GL_REFERENCED_BY_VERTEX_SHADER 0x9306 -#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307 -#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308 -#define GL_REFERENCED_BY_GEOMETRY_SHADER 0x9309 -#define GL_REFERENCED_BY_FRAGMENT_SHADER 0x930A -#define GL_REFERENCED_BY_COMPUTE_SHADER 0x930B -#define GL_TOP_LEVEL_ARRAY_SIZE 0x930C -#define GL_TOP_LEVEL_ARRAY_STRIDE 0x930D -#define GL_LOCATION 0x930E -#define GL_LOCATION_INDEX 0x930F - -typedef void (GLAPIENTRY * PFNGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint* params); -typedef GLuint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar* name); -typedef GLint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar* name); -typedef GLint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei* length, GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum* props, GLsizei bufSize, GLsizei *length, GLint *params); - -#define glGetProgramInterfaceiv GLEW_GET_FUN(__glewGetProgramInterfaceiv) -#define glGetProgramResourceIndex GLEW_GET_FUN(__glewGetProgramResourceIndex) -#define glGetProgramResourceLocation GLEW_GET_FUN(__glewGetProgramResourceLocation) -#define glGetProgramResourceLocationIndex GLEW_GET_FUN(__glewGetProgramResourceLocationIndex) -#define glGetProgramResourceName GLEW_GET_FUN(__glewGetProgramResourceName) -#define glGetProgramResourceiv GLEW_GET_FUN(__glewGetProgramResourceiv) - -#define GLEW_ARB_program_interface_query GLEW_GET_VAR(__GLEW_ARB_program_interface_query) - -#endif /* GL_ARB_program_interface_query */ - -/* ------------------------ GL_ARB_provoking_vertex ------------------------ */ - -#ifndef GL_ARB_provoking_vertex -#define GL_ARB_provoking_vertex 1 - -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION 0x8E4D -#define GL_LAST_VERTEX_CONVENTION 0x8E4E -#define GL_PROVOKING_VERTEX 0x8E4F - -typedef void (GLAPIENTRY * PFNGLPROVOKINGVERTEXPROC) (GLenum mode); - -#define glProvokingVertex GLEW_GET_FUN(__glewProvokingVertex) - -#define GLEW_ARB_provoking_vertex GLEW_GET_VAR(__GLEW_ARB_provoking_vertex) - -#endif /* GL_ARB_provoking_vertex */ - -/* ----------------------- GL_ARB_query_buffer_object ---------------------- */ - -#ifndef GL_ARB_query_buffer_object -#define GL_ARB_query_buffer_object 1 - -#define GL_QUERY_BUFFER_BARRIER_BIT 0x00008000 -#define GL_QUERY_BUFFER 0x9192 -#define GL_QUERY_BUFFER_BINDING 0x9193 -#define GL_QUERY_RESULT_NO_WAIT 0x9194 - -#define GLEW_ARB_query_buffer_object GLEW_GET_VAR(__GLEW_ARB_query_buffer_object) - -#endif /* GL_ARB_query_buffer_object */ - -/* ------------------ GL_ARB_robust_buffer_access_behavior ----------------- */ - -#ifndef GL_ARB_robust_buffer_access_behavior -#define GL_ARB_robust_buffer_access_behavior 1 - -#define GLEW_ARB_robust_buffer_access_behavior GLEW_GET_VAR(__GLEW_ARB_robust_buffer_access_behavior) - -#endif /* GL_ARB_robust_buffer_access_behavior */ - -/* --------------------------- GL_ARB_robustness --------------------------- */ - -#ifndef GL_ARB_robustness -#define GL_ARB_robustness 1 - -#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004 -#define GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 -#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 -#define GL_NO_RESET_NOTIFICATION_ARB 0x8261 - -typedef GLenum (GLAPIENTRY * PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* table); -typedef void (GLAPIENTRY * PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, void* img); -typedef void (GLAPIENTRY * PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* image); -typedef void (GLAPIENTRY * PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values); -typedef void (GLAPIENTRY * PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble* v); -typedef void (GLAPIENTRY * PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat* v); -typedef void (GLAPIENTRY * PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint* v); -typedef void (GLAPIENTRY * PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values); -typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat* values); -typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint* values); -typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort* values); -typedef void (GLAPIENTRY * PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte* pattern); -typedef void (GLAPIENTRY * PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void* row, GLsizei columnBufSize, void*column, void*span); -typedef void (GLAPIENTRY * PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void* img); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint* params); -typedef void (GLAPIENTRY * PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void* data); - -#define glGetGraphicsResetStatusARB GLEW_GET_FUN(__glewGetGraphicsResetStatusARB) -#define glGetnColorTableARB GLEW_GET_FUN(__glewGetnColorTableARB) -#define glGetnCompressedTexImageARB GLEW_GET_FUN(__glewGetnCompressedTexImageARB) -#define glGetnConvolutionFilterARB GLEW_GET_FUN(__glewGetnConvolutionFilterARB) -#define glGetnHistogramARB GLEW_GET_FUN(__glewGetnHistogramARB) -#define glGetnMapdvARB GLEW_GET_FUN(__glewGetnMapdvARB) -#define glGetnMapfvARB GLEW_GET_FUN(__glewGetnMapfvARB) -#define glGetnMapivARB GLEW_GET_FUN(__glewGetnMapivARB) -#define glGetnMinmaxARB GLEW_GET_FUN(__glewGetnMinmaxARB) -#define glGetnPixelMapfvARB GLEW_GET_FUN(__glewGetnPixelMapfvARB) -#define glGetnPixelMapuivARB GLEW_GET_FUN(__glewGetnPixelMapuivARB) -#define glGetnPixelMapusvARB GLEW_GET_FUN(__glewGetnPixelMapusvARB) -#define glGetnPolygonStippleARB GLEW_GET_FUN(__glewGetnPolygonStippleARB) -#define glGetnSeparableFilterARB GLEW_GET_FUN(__glewGetnSeparableFilterARB) -#define glGetnTexImageARB GLEW_GET_FUN(__glewGetnTexImageARB) -#define glGetnUniformdvARB GLEW_GET_FUN(__glewGetnUniformdvARB) -#define glGetnUniformfvARB GLEW_GET_FUN(__glewGetnUniformfvARB) -#define glGetnUniformivARB GLEW_GET_FUN(__glewGetnUniformivARB) -#define glGetnUniformuivARB GLEW_GET_FUN(__glewGetnUniformuivARB) -#define glReadnPixelsARB GLEW_GET_FUN(__glewReadnPixelsARB) - -#define GLEW_ARB_robustness GLEW_GET_VAR(__GLEW_ARB_robustness) - -#endif /* GL_ARB_robustness */ - -/* ---------------- GL_ARB_robustness_application_isolation ---------------- */ - -#ifndef GL_ARB_robustness_application_isolation -#define GL_ARB_robustness_application_isolation 1 - -#define GLEW_ARB_robustness_application_isolation GLEW_GET_VAR(__GLEW_ARB_robustness_application_isolation) - -#endif /* GL_ARB_robustness_application_isolation */ - -/* ---------------- GL_ARB_robustness_share_group_isolation ---------------- */ - -#ifndef GL_ARB_robustness_share_group_isolation -#define GL_ARB_robustness_share_group_isolation 1 - -#define GLEW_ARB_robustness_share_group_isolation GLEW_GET_VAR(__GLEW_ARB_robustness_share_group_isolation) - -#endif /* GL_ARB_robustness_share_group_isolation */ - -/* ------------------------ GL_ARB_sample_locations ------------------------ */ - -#ifndef GL_ARB_sample_locations -#define GL_ARB_sample_locations 1 - -#define GL_SAMPLE_LOCATION_ARB 0x8E50 -#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB 0x933D -#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB 0x933E -#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB 0x933F -#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB 0x9340 -#define GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB 0x9341 -#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB 0x9342 -#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB 0x9343 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v); - -#define glFramebufferSampleLocationsfvARB GLEW_GET_FUN(__glewFramebufferSampleLocationsfvARB) -#define glNamedFramebufferSampleLocationsfvARB GLEW_GET_FUN(__glewNamedFramebufferSampleLocationsfvARB) - -#define GLEW_ARB_sample_locations GLEW_GET_VAR(__GLEW_ARB_sample_locations) - -#endif /* GL_ARB_sample_locations */ - -/* ------------------------- GL_ARB_sample_shading ------------------------- */ - -#ifndef GL_ARB_sample_shading -#define GL_ARB_sample_shading 1 - -#define GL_SAMPLE_SHADING_ARB 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE_ARB 0x8C37 - -typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value); - -#define glMinSampleShadingARB GLEW_GET_FUN(__glewMinSampleShadingARB) - -#define GLEW_ARB_sample_shading GLEW_GET_VAR(__GLEW_ARB_sample_shading) - -#endif /* GL_ARB_sample_shading */ - -/* ------------------------- GL_ARB_sampler_objects ------------------------ */ - -#ifndef GL_ARB_sampler_objects -#define GL_ARB_sampler_objects 1 - -#define GL_SAMPLER_BINDING 0x8919 - -typedef void (GLAPIENTRY * PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler); -typedef void (GLAPIENTRY * PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint * samplers); -typedef void (GLAPIENTRY * PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint* samplers); -typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISSAMPLERPROC) (GLuint sampler); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint* params); - -#define glBindSampler GLEW_GET_FUN(__glewBindSampler) -#define glDeleteSamplers GLEW_GET_FUN(__glewDeleteSamplers) -#define glGenSamplers GLEW_GET_FUN(__glewGenSamplers) -#define glGetSamplerParameterIiv GLEW_GET_FUN(__glewGetSamplerParameterIiv) -#define glGetSamplerParameterIuiv GLEW_GET_FUN(__glewGetSamplerParameterIuiv) -#define glGetSamplerParameterfv GLEW_GET_FUN(__glewGetSamplerParameterfv) -#define glGetSamplerParameteriv GLEW_GET_FUN(__glewGetSamplerParameteriv) -#define glIsSampler GLEW_GET_FUN(__glewIsSampler) -#define glSamplerParameterIiv GLEW_GET_FUN(__glewSamplerParameterIiv) -#define glSamplerParameterIuiv GLEW_GET_FUN(__glewSamplerParameterIuiv) -#define glSamplerParameterf GLEW_GET_FUN(__glewSamplerParameterf) -#define glSamplerParameterfv GLEW_GET_FUN(__glewSamplerParameterfv) -#define glSamplerParameteri GLEW_GET_FUN(__glewSamplerParameteri) -#define glSamplerParameteriv GLEW_GET_FUN(__glewSamplerParameteriv) - -#define GLEW_ARB_sampler_objects GLEW_GET_VAR(__GLEW_ARB_sampler_objects) - -#endif /* GL_ARB_sampler_objects */ - -/* ------------------------ GL_ARB_seamless_cube_map ----------------------- */ - -#ifndef GL_ARB_seamless_cube_map -#define GL_ARB_seamless_cube_map 1 - -#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F - -#define GLEW_ARB_seamless_cube_map GLEW_GET_VAR(__GLEW_ARB_seamless_cube_map) - -#endif /* GL_ARB_seamless_cube_map */ - -/* ------------------ GL_ARB_seamless_cubemap_per_texture ------------------ */ - -#ifndef GL_ARB_seamless_cubemap_per_texture -#define GL_ARB_seamless_cubemap_per_texture 1 - -#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F - -#define GLEW_ARB_seamless_cubemap_per_texture GLEW_GET_VAR(__GLEW_ARB_seamless_cubemap_per_texture) - -#endif /* GL_ARB_seamless_cubemap_per_texture */ - -/* --------------------- GL_ARB_separate_shader_objects -------------------- */ - -#ifndef GL_ARB_separate_shader_objects -#define GL_ARB_separate_shader_objects 1 - -#define GL_VERTEX_SHADER_BIT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT 0x00000002 -#define GL_GEOMETRY_SHADER_BIT 0x00000004 -#define GL_TESS_CONTROL_SHADER_BIT 0x00000008 -#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010 -#define GL_PROGRAM_SEPARABLE 0x8258 -#define GL_ACTIVE_PROGRAM 0x8259 -#define GL_PROGRAM_PIPELINE_BINDING 0x825A -#define GL_ALL_SHADER_BITS 0xFFFFFFFF - -typedef void (GLAPIENTRY * PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program); -typedef void (GLAPIENTRY * PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar * const * strings); -typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint* pipelines); -typedef void (GLAPIENTRY * PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint* pipelines); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar *infoLog); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint x, GLuint y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint x, GLuint y, GLuint z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program); -typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline); - -#define glActiveShaderProgram GLEW_GET_FUN(__glewActiveShaderProgram) -#define glBindProgramPipeline GLEW_GET_FUN(__glewBindProgramPipeline) -#define glCreateShaderProgramv GLEW_GET_FUN(__glewCreateShaderProgramv) -#define glDeleteProgramPipelines GLEW_GET_FUN(__glewDeleteProgramPipelines) -#define glGenProgramPipelines GLEW_GET_FUN(__glewGenProgramPipelines) -#define glGetProgramPipelineInfoLog GLEW_GET_FUN(__glewGetProgramPipelineInfoLog) -#define glGetProgramPipelineiv GLEW_GET_FUN(__glewGetProgramPipelineiv) -#define glIsProgramPipeline GLEW_GET_FUN(__glewIsProgramPipeline) -#define glProgramUniform1d GLEW_GET_FUN(__glewProgramUniform1d) -#define glProgramUniform1dv GLEW_GET_FUN(__glewProgramUniform1dv) -#define glProgramUniform1f GLEW_GET_FUN(__glewProgramUniform1f) -#define glProgramUniform1fv GLEW_GET_FUN(__glewProgramUniform1fv) -#define glProgramUniform1i GLEW_GET_FUN(__glewProgramUniform1i) -#define glProgramUniform1iv GLEW_GET_FUN(__glewProgramUniform1iv) -#define glProgramUniform1ui GLEW_GET_FUN(__glewProgramUniform1ui) -#define glProgramUniform1uiv GLEW_GET_FUN(__glewProgramUniform1uiv) -#define glProgramUniform2d GLEW_GET_FUN(__glewProgramUniform2d) -#define glProgramUniform2dv GLEW_GET_FUN(__glewProgramUniform2dv) -#define glProgramUniform2f GLEW_GET_FUN(__glewProgramUniform2f) -#define glProgramUniform2fv GLEW_GET_FUN(__glewProgramUniform2fv) -#define glProgramUniform2i GLEW_GET_FUN(__glewProgramUniform2i) -#define glProgramUniform2iv GLEW_GET_FUN(__glewProgramUniform2iv) -#define glProgramUniform2ui GLEW_GET_FUN(__glewProgramUniform2ui) -#define glProgramUniform2uiv GLEW_GET_FUN(__glewProgramUniform2uiv) -#define glProgramUniform3d GLEW_GET_FUN(__glewProgramUniform3d) -#define glProgramUniform3dv GLEW_GET_FUN(__glewProgramUniform3dv) -#define glProgramUniform3f GLEW_GET_FUN(__glewProgramUniform3f) -#define glProgramUniform3fv GLEW_GET_FUN(__glewProgramUniform3fv) -#define glProgramUniform3i GLEW_GET_FUN(__glewProgramUniform3i) -#define glProgramUniform3iv GLEW_GET_FUN(__glewProgramUniform3iv) -#define glProgramUniform3ui GLEW_GET_FUN(__glewProgramUniform3ui) -#define glProgramUniform3uiv GLEW_GET_FUN(__glewProgramUniform3uiv) -#define glProgramUniform4d GLEW_GET_FUN(__glewProgramUniform4d) -#define glProgramUniform4dv GLEW_GET_FUN(__glewProgramUniform4dv) -#define glProgramUniform4f GLEW_GET_FUN(__glewProgramUniform4f) -#define glProgramUniform4fv GLEW_GET_FUN(__glewProgramUniform4fv) -#define glProgramUniform4i GLEW_GET_FUN(__glewProgramUniform4i) -#define glProgramUniform4iv GLEW_GET_FUN(__glewProgramUniform4iv) -#define glProgramUniform4ui GLEW_GET_FUN(__glewProgramUniform4ui) -#define glProgramUniform4uiv GLEW_GET_FUN(__glewProgramUniform4uiv) -#define glProgramUniformMatrix2dv GLEW_GET_FUN(__glewProgramUniformMatrix2dv) -#define glProgramUniformMatrix2fv GLEW_GET_FUN(__glewProgramUniformMatrix2fv) -#define glProgramUniformMatrix2x3dv GLEW_GET_FUN(__glewProgramUniformMatrix2x3dv) -#define glProgramUniformMatrix2x3fv GLEW_GET_FUN(__glewProgramUniformMatrix2x3fv) -#define glProgramUniformMatrix2x4dv GLEW_GET_FUN(__glewProgramUniformMatrix2x4dv) -#define glProgramUniformMatrix2x4fv GLEW_GET_FUN(__glewProgramUniformMatrix2x4fv) -#define glProgramUniformMatrix3dv GLEW_GET_FUN(__glewProgramUniformMatrix3dv) -#define glProgramUniformMatrix3fv GLEW_GET_FUN(__glewProgramUniformMatrix3fv) -#define glProgramUniformMatrix3x2dv GLEW_GET_FUN(__glewProgramUniformMatrix3x2dv) -#define glProgramUniformMatrix3x2fv GLEW_GET_FUN(__glewProgramUniformMatrix3x2fv) -#define glProgramUniformMatrix3x4dv GLEW_GET_FUN(__glewProgramUniformMatrix3x4dv) -#define glProgramUniformMatrix3x4fv GLEW_GET_FUN(__glewProgramUniformMatrix3x4fv) -#define glProgramUniformMatrix4dv GLEW_GET_FUN(__glewProgramUniformMatrix4dv) -#define glProgramUniformMatrix4fv GLEW_GET_FUN(__glewProgramUniformMatrix4fv) -#define glProgramUniformMatrix4x2dv GLEW_GET_FUN(__glewProgramUniformMatrix4x2dv) -#define glProgramUniformMatrix4x2fv GLEW_GET_FUN(__glewProgramUniformMatrix4x2fv) -#define glProgramUniformMatrix4x3dv GLEW_GET_FUN(__glewProgramUniformMatrix4x3dv) -#define glProgramUniformMatrix4x3fv GLEW_GET_FUN(__glewProgramUniformMatrix4x3fv) -#define glUseProgramStages GLEW_GET_FUN(__glewUseProgramStages) -#define glValidateProgramPipeline GLEW_GET_FUN(__glewValidateProgramPipeline) - -#define GLEW_ARB_separate_shader_objects GLEW_GET_VAR(__GLEW_ARB_separate_shader_objects) - -#endif /* GL_ARB_separate_shader_objects */ - -/* -------------------- GL_ARB_shader_atomic_counter_ops ------------------- */ - -#ifndef GL_ARB_shader_atomic_counter_ops -#define GL_ARB_shader_atomic_counter_ops 1 - -#define GLEW_ARB_shader_atomic_counter_ops GLEW_GET_VAR(__GLEW_ARB_shader_atomic_counter_ops) - -#endif /* GL_ARB_shader_atomic_counter_ops */ - -/* --------------------- GL_ARB_shader_atomic_counters --------------------- */ - -#ifndef GL_ARB_shader_atomic_counters -#define GL_ARB_shader_atomic_counters 1 - -#define GL_ATOMIC_COUNTER_BUFFER 0x92C0 -#define GL_ATOMIC_COUNTER_BUFFER_BINDING 0x92C1 -#define GL_ATOMIC_COUNTER_BUFFER_START 0x92C2 -#define GL_ATOMIC_COUNTER_BUFFER_SIZE 0x92C3 -#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4 -#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5 -#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB -#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC -#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD -#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE -#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF -#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0 -#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1 -#define GL_MAX_VERTEX_ATOMIC_COUNTERS 0x92D2 -#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3 -#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4 -#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS 0x92D5 -#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS 0x92D6 -#define GL_MAX_COMBINED_ATOMIC_COUNTERS 0x92D7 -#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8 -#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS 0x92D9 -#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA -#define GL_UNSIGNED_INT_ATOMIC_COUNTER 0x92DB -#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC - -typedef void (GLAPIENTRY * PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC) (GLuint program, GLuint bufferIndex, GLenum pname, GLint* params); - -#define glGetActiveAtomicCounterBufferiv GLEW_GET_FUN(__glewGetActiveAtomicCounterBufferiv) - -#define GLEW_ARB_shader_atomic_counters GLEW_GET_VAR(__GLEW_ARB_shader_atomic_counters) - -#endif /* GL_ARB_shader_atomic_counters */ - -/* -------------------------- GL_ARB_shader_ballot ------------------------- */ - -#ifndef GL_ARB_shader_ballot -#define GL_ARB_shader_ballot 1 - -#define GLEW_ARB_shader_ballot GLEW_GET_VAR(__GLEW_ARB_shader_ballot) - -#endif /* GL_ARB_shader_ballot */ - -/* ----------------------- GL_ARB_shader_bit_encoding ---------------------- */ - -#ifndef GL_ARB_shader_bit_encoding -#define GL_ARB_shader_bit_encoding 1 - -#define GLEW_ARB_shader_bit_encoding GLEW_GET_VAR(__GLEW_ARB_shader_bit_encoding) - -#endif /* GL_ARB_shader_bit_encoding */ - -/* -------------------------- GL_ARB_shader_clock -------------------------- */ - -#ifndef GL_ARB_shader_clock -#define GL_ARB_shader_clock 1 - -#define GLEW_ARB_shader_clock GLEW_GET_VAR(__GLEW_ARB_shader_clock) - -#endif /* GL_ARB_shader_clock */ - -/* --------------------- GL_ARB_shader_draw_parameters --------------------- */ - -#ifndef GL_ARB_shader_draw_parameters -#define GL_ARB_shader_draw_parameters 1 - -#define GLEW_ARB_shader_draw_parameters GLEW_GET_VAR(__GLEW_ARB_shader_draw_parameters) - -#endif /* GL_ARB_shader_draw_parameters */ - -/* ------------------------ GL_ARB_shader_group_vote ----------------------- */ - -#ifndef GL_ARB_shader_group_vote -#define GL_ARB_shader_group_vote 1 - -#define GLEW_ARB_shader_group_vote GLEW_GET_VAR(__GLEW_ARB_shader_group_vote) - -#endif /* GL_ARB_shader_group_vote */ - -/* --------------------- GL_ARB_shader_image_load_store -------------------- */ - -#ifndef GL_ARB_shader_image_load_store -#define GL_ARB_shader_image_load_store 1 - -#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001 -#define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002 -#define GL_UNIFORM_BARRIER_BIT 0x00000004 -#define GL_TEXTURE_FETCH_BARRIER_BIT 0x00000008 -#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020 -#define GL_COMMAND_BARRIER_BIT 0x00000040 -#define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080 -#define GL_TEXTURE_UPDATE_BARRIER_BIT 0x00000100 -#define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200 -#define GL_FRAMEBUFFER_BARRIER_BIT 0x00000400 -#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800 -#define GL_ATOMIC_COUNTER_BARRIER_BIT 0x00001000 -#define GL_MAX_IMAGE_UNITS 0x8F38 -#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39 -#define GL_IMAGE_BINDING_NAME 0x8F3A -#define GL_IMAGE_BINDING_LEVEL 0x8F3B -#define GL_IMAGE_BINDING_LAYERED 0x8F3C -#define GL_IMAGE_BINDING_LAYER 0x8F3D -#define GL_IMAGE_BINDING_ACCESS 0x8F3E -#define GL_IMAGE_1D 0x904C -#define GL_IMAGE_2D 0x904D -#define GL_IMAGE_3D 0x904E -#define GL_IMAGE_2D_RECT 0x904F -#define GL_IMAGE_CUBE 0x9050 -#define GL_IMAGE_BUFFER 0x9051 -#define GL_IMAGE_1D_ARRAY 0x9052 -#define GL_IMAGE_2D_ARRAY 0x9053 -#define GL_IMAGE_CUBE_MAP_ARRAY 0x9054 -#define GL_IMAGE_2D_MULTISAMPLE 0x9055 -#define GL_IMAGE_2D_MULTISAMPLE_ARRAY 0x9056 -#define GL_INT_IMAGE_1D 0x9057 -#define GL_INT_IMAGE_2D 0x9058 -#define GL_INT_IMAGE_3D 0x9059 -#define GL_INT_IMAGE_2D_RECT 0x905A -#define GL_INT_IMAGE_CUBE 0x905B -#define GL_INT_IMAGE_BUFFER 0x905C -#define GL_INT_IMAGE_1D_ARRAY 0x905D -#define GL_INT_IMAGE_2D_ARRAY 0x905E -#define GL_INT_IMAGE_CUBE_MAP_ARRAY 0x905F -#define GL_INT_IMAGE_2D_MULTISAMPLE 0x9060 -#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061 -#define GL_UNSIGNED_INT_IMAGE_1D 0x9062 -#define GL_UNSIGNED_INT_IMAGE_2D 0x9063 -#define GL_UNSIGNED_INT_IMAGE_3D 0x9064 -#define GL_UNSIGNED_INT_IMAGE_2D_RECT 0x9065 -#define GL_UNSIGNED_INT_IMAGE_CUBE 0x9066 -#define GL_UNSIGNED_INT_IMAGE_BUFFER 0x9067 -#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY 0x9068 -#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY 0x9069 -#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C -#define GL_MAX_IMAGE_SAMPLES 0x906D -#define GL_IMAGE_BINDING_FORMAT 0x906E -#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7 -#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8 -#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9 -#define GL_MAX_VERTEX_IMAGE_UNIFORMS 0x90CA -#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB -#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC -#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS 0x90CD -#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS 0x90CE -#define GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF -#define GL_ALL_BARRIER_BITS 0xFFFFFFFF - -typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTUREPROC) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format); -typedef void (GLAPIENTRY * PFNGLMEMORYBARRIERPROC) (GLbitfield barriers); - -#define glBindImageTexture GLEW_GET_FUN(__glewBindImageTexture) -#define glMemoryBarrier GLEW_GET_FUN(__glewMemoryBarrier) - -#define GLEW_ARB_shader_image_load_store GLEW_GET_VAR(__GLEW_ARB_shader_image_load_store) - -#endif /* GL_ARB_shader_image_load_store */ - -/* ------------------------ GL_ARB_shader_image_size ----------------------- */ - -#ifndef GL_ARB_shader_image_size -#define GL_ARB_shader_image_size 1 - -#define GLEW_ARB_shader_image_size GLEW_GET_VAR(__GLEW_ARB_shader_image_size) - -#endif /* GL_ARB_shader_image_size */ - -/* ------------------------- GL_ARB_shader_objects ------------------------- */ - -#ifndef GL_ARB_shader_objects -#define GL_ARB_shader_objects 1 - -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 -#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 -#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 -#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 -#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 - -typedef char GLcharARB; -typedef unsigned int GLhandleARB; - -typedef void (GLAPIENTRY * PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj); -typedef void (GLAPIENTRY * PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj); -typedef GLhandleARB (GLAPIENTRY * PFNGLCREATEPROGRAMOBJECTARBPROC) (void); -typedef GLhandleARB (GLAPIENTRY * PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType); -typedef void (GLAPIENTRY * PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj); -typedef void (GLAPIENTRY * PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name); -typedef void (GLAPIENTRY * PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei* count, GLhandleARB *obj); -typedef GLhandleARB (GLAPIENTRY * PFNGLGETHANDLEARBPROC) (GLenum pname); -typedef void (GLAPIENTRY * PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *infoLog); -typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *source); -typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint* params); -typedef void (GLAPIENTRY * PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (GLAPIENTRY * PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB ** string, const GLint *length); -typedef void (GLAPIENTRY * PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj); -typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj); - -#define glAttachObjectARB GLEW_GET_FUN(__glewAttachObjectARB) -#define glCompileShaderARB GLEW_GET_FUN(__glewCompileShaderARB) -#define glCreateProgramObjectARB GLEW_GET_FUN(__glewCreateProgramObjectARB) -#define glCreateShaderObjectARB GLEW_GET_FUN(__glewCreateShaderObjectARB) -#define glDeleteObjectARB GLEW_GET_FUN(__glewDeleteObjectARB) -#define glDetachObjectARB GLEW_GET_FUN(__glewDetachObjectARB) -#define glGetActiveUniformARB GLEW_GET_FUN(__glewGetActiveUniformARB) -#define glGetAttachedObjectsARB GLEW_GET_FUN(__glewGetAttachedObjectsARB) -#define glGetHandleARB GLEW_GET_FUN(__glewGetHandleARB) -#define glGetInfoLogARB GLEW_GET_FUN(__glewGetInfoLogARB) -#define glGetObjectParameterfvARB GLEW_GET_FUN(__glewGetObjectParameterfvARB) -#define glGetObjectParameterivARB GLEW_GET_FUN(__glewGetObjectParameterivARB) -#define glGetShaderSourceARB GLEW_GET_FUN(__glewGetShaderSourceARB) -#define glGetUniformLocationARB GLEW_GET_FUN(__glewGetUniformLocationARB) -#define glGetUniformfvARB GLEW_GET_FUN(__glewGetUniformfvARB) -#define glGetUniformivARB GLEW_GET_FUN(__glewGetUniformivARB) -#define glLinkProgramARB GLEW_GET_FUN(__glewLinkProgramARB) -#define glShaderSourceARB GLEW_GET_FUN(__glewShaderSourceARB) -#define glUniform1fARB GLEW_GET_FUN(__glewUniform1fARB) -#define glUniform1fvARB GLEW_GET_FUN(__glewUniform1fvARB) -#define glUniform1iARB GLEW_GET_FUN(__glewUniform1iARB) -#define glUniform1ivARB GLEW_GET_FUN(__glewUniform1ivARB) -#define glUniform2fARB GLEW_GET_FUN(__glewUniform2fARB) -#define glUniform2fvARB GLEW_GET_FUN(__glewUniform2fvARB) -#define glUniform2iARB GLEW_GET_FUN(__glewUniform2iARB) -#define glUniform2ivARB GLEW_GET_FUN(__glewUniform2ivARB) -#define glUniform3fARB GLEW_GET_FUN(__glewUniform3fARB) -#define glUniform3fvARB GLEW_GET_FUN(__glewUniform3fvARB) -#define glUniform3iARB GLEW_GET_FUN(__glewUniform3iARB) -#define glUniform3ivARB GLEW_GET_FUN(__glewUniform3ivARB) -#define glUniform4fARB GLEW_GET_FUN(__glewUniform4fARB) -#define glUniform4fvARB GLEW_GET_FUN(__glewUniform4fvARB) -#define glUniform4iARB GLEW_GET_FUN(__glewUniform4iARB) -#define glUniform4ivARB GLEW_GET_FUN(__glewUniform4ivARB) -#define glUniformMatrix2fvARB GLEW_GET_FUN(__glewUniformMatrix2fvARB) -#define glUniformMatrix3fvARB GLEW_GET_FUN(__glewUniformMatrix3fvARB) -#define glUniformMatrix4fvARB GLEW_GET_FUN(__glewUniformMatrix4fvARB) -#define glUseProgramObjectARB GLEW_GET_FUN(__glewUseProgramObjectARB) -#define glValidateProgramARB GLEW_GET_FUN(__glewValidateProgramARB) - -#define GLEW_ARB_shader_objects GLEW_GET_VAR(__GLEW_ARB_shader_objects) - -#endif /* GL_ARB_shader_objects */ - -/* ------------------------ GL_ARB_shader_precision ------------------------ */ - -#ifndef GL_ARB_shader_precision -#define GL_ARB_shader_precision 1 - -#define GLEW_ARB_shader_precision GLEW_GET_VAR(__GLEW_ARB_shader_precision) - -#endif /* GL_ARB_shader_precision */ - -/* ---------------------- GL_ARB_shader_stencil_export --------------------- */ - -#ifndef GL_ARB_shader_stencil_export -#define GL_ARB_shader_stencil_export 1 - -#define GLEW_ARB_shader_stencil_export GLEW_GET_VAR(__GLEW_ARB_shader_stencil_export) - -#endif /* GL_ARB_shader_stencil_export */ - -/* ------------------ GL_ARB_shader_storage_buffer_object ------------------ */ - -#ifndef GL_ARB_shader_storage_buffer_object -#define GL_ARB_shader_storage_buffer_object 1 - -#define GL_SHADER_STORAGE_BARRIER_BIT 0x2000 -#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39 -#define GL_SHADER_STORAGE_BUFFER 0x90D2 -#define GL_SHADER_STORAGE_BUFFER_BINDING 0x90D3 -#define GL_SHADER_STORAGE_BUFFER_START 0x90D4 -#define GL_SHADER_STORAGE_BUFFER_SIZE 0x90D5 -#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6 -#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7 -#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8 -#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9 -#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA -#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB -#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC -#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD -#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE 0x90DE -#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF - -typedef void (GLAPIENTRY * PFNGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding); - -#define glShaderStorageBlockBinding GLEW_GET_FUN(__glewShaderStorageBlockBinding) - -#define GLEW_ARB_shader_storage_buffer_object GLEW_GET_VAR(__GLEW_ARB_shader_storage_buffer_object) - -#endif /* GL_ARB_shader_storage_buffer_object */ - -/* ------------------------ GL_ARB_shader_subroutine ----------------------- */ - -#ifndef GL_ARB_shader_subroutine -#define GL_ARB_shader_subroutine 1 - -#define GL_ACTIVE_SUBROUTINES 0x8DE5 -#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6 -#define GL_MAX_SUBROUTINES 0x8DE7 -#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47 -#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49 -#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A -#define GL_COMPATIBLE_SUBROUTINES 0x8E4B - -typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint* values); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint* values); -typedef GLuint (GLAPIENTRY * PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar* name); -typedef GLint (GLAPIENTRY * PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint* params); -typedef void (GLAPIENTRY * PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint* indices); - -#define glGetActiveSubroutineName GLEW_GET_FUN(__glewGetActiveSubroutineName) -#define glGetActiveSubroutineUniformName GLEW_GET_FUN(__glewGetActiveSubroutineUniformName) -#define glGetActiveSubroutineUniformiv GLEW_GET_FUN(__glewGetActiveSubroutineUniformiv) -#define glGetProgramStageiv GLEW_GET_FUN(__glewGetProgramStageiv) -#define glGetSubroutineIndex GLEW_GET_FUN(__glewGetSubroutineIndex) -#define glGetSubroutineUniformLocation GLEW_GET_FUN(__glewGetSubroutineUniformLocation) -#define glGetUniformSubroutineuiv GLEW_GET_FUN(__glewGetUniformSubroutineuiv) -#define glUniformSubroutinesuiv GLEW_GET_FUN(__glewUniformSubroutinesuiv) - -#define GLEW_ARB_shader_subroutine GLEW_GET_VAR(__GLEW_ARB_shader_subroutine) - -#endif /* GL_ARB_shader_subroutine */ - -/* ------------------ GL_ARB_shader_texture_image_samples ------------------ */ - -#ifndef GL_ARB_shader_texture_image_samples -#define GL_ARB_shader_texture_image_samples 1 - -#define GLEW_ARB_shader_texture_image_samples GLEW_GET_VAR(__GLEW_ARB_shader_texture_image_samples) - -#endif /* GL_ARB_shader_texture_image_samples */ - -/* ----------------------- GL_ARB_shader_texture_lod ----------------------- */ - -#ifndef GL_ARB_shader_texture_lod -#define GL_ARB_shader_texture_lod 1 - -#define GLEW_ARB_shader_texture_lod GLEW_GET_VAR(__GLEW_ARB_shader_texture_lod) - -#endif /* GL_ARB_shader_texture_lod */ - -/* ------------------- GL_ARB_shader_viewport_layer_array ------------------ */ - -#ifndef GL_ARB_shader_viewport_layer_array -#define GL_ARB_shader_viewport_layer_array 1 - -#define GLEW_ARB_shader_viewport_layer_array GLEW_GET_VAR(__GLEW_ARB_shader_viewport_layer_array) - -#endif /* GL_ARB_shader_viewport_layer_array */ - -/* ---------------------- GL_ARB_shading_language_100 ---------------------- */ - -#ifndef GL_ARB_shading_language_100 -#define GL_ARB_shading_language_100 1 - -#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C - -#define GLEW_ARB_shading_language_100 GLEW_GET_VAR(__GLEW_ARB_shading_language_100) - -#endif /* GL_ARB_shading_language_100 */ - -/* -------------------- GL_ARB_shading_language_420pack -------------------- */ - -#ifndef GL_ARB_shading_language_420pack -#define GL_ARB_shading_language_420pack 1 - -#define GLEW_ARB_shading_language_420pack GLEW_GET_VAR(__GLEW_ARB_shading_language_420pack) - -#endif /* GL_ARB_shading_language_420pack */ - -/* -------------------- GL_ARB_shading_language_include -------------------- */ - -#ifndef GL_ARB_shading_language_include -#define GL_ARB_shading_language_include 1 - -#define GL_SHADER_INCLUDE_ARB 0x8DAE -#define GL_NAMED_STRING_LENGTH_ARB 0x8DE9 -#define GL_NAMED_STRING_TYPE_ARB 0x8DEA - -typedef void (GLAPIENTRY * PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* const *path, const GLint *length); -typedef void (GLAPIENTRY * PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name, GLsizei bufSize, GLint *stringlen, GLchar *string); -typedef void (GLAPIENTRY * PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar* name, GLenum pname, GLint *params); -typedef GLboolean (GLAPIENTRY * PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar* name, GLint stringlen, const GLchar *string); - -#define glCompileShaderIncludeARB GLEW_GET_FUN(__glewCompileShaderIncludeARB) -#define glDeleteNamedStringARB GLEW_GET_FUN(__glewDeleteNamedStringARB) -#define glGetNamedStringARB GLEW_GET_FUN(__glewGetNamedStringARB) -#define glGetNamedStringivARB GLEW_GET_FUN(__glewGetNamedStringivARB) -#define glIsNamedStringARB GLEW_GET_FUN(__glewIsNamedStringARB) -#define glNamedStringARB GLEW_GET_FUN(__glewNamedStringARB) - -#define GLEW_ARB_shading_language_include GLEW_GET_VAR(__GLEW_ARB_shading_language_include) - -#endif /* GL_ARB_shading_language_include */ - -/* -------------------- GL_ARB_shading_language_packing -------------------- */ - -#ifndef GL_ARB_shading_language_packing -#define GL_ARB_shading_language_packing 1 - -#define GLEW_ARB_shading_language_packing GLEW_GET_VAR(__GLEW_ARB_shading_language_packing) - -#endif /* GL_ARB_shading_language_packing */ - -/* ----------------------------- GL_ARB_shadow ----------------------------- */ - -#ifndef GL_ARB_shadow -#define GL_ARB_shadow 1 - -#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C -#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D -#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E - -#define GLEW_ARB_shadow GLEW_GET_VAR(__GLEW_ARB_shadow) - -#endif /* GL_ARB_shadow */ - -/* ------------------------- GL_ARB_shadow_ambient ------------------------- */ - -#ifndef GL_ARB_shadow_ambient -#define GL_ARB_shadow_ambient 1 - -#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF - -#define GLEW_ARB_shadow_ambient GLEW_GET_VAR(__GLEW_ARB_shadow_ambient) - -#endif /* GL_ARB_shadow_ambient */ - -/* -------------------------- GL_ARB_sparse_buffer ------------------------- */ - -#ifndef GL_ARB_sparse_buffer -#define GL_ARB_sparse_buffer 1 - -#define GL_SPARSE_STORAGE_BIT_ARB 0x0400 -#define GL_SPARSE_BUFFER_PAGE_SIZE_ARB 0x82F8 - -typedef void (GLAPIENTRY * PFNGLBUFFERPAGECOMMITMENTARBPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit); - -#define glBufferPageCommitmentARB GLEW_GET_FUN(__glewBufferPageCommitmentARB) - -#define GLEW_ARB_sparse_buffer GLEW_GET_VAR(__GLEW_ARB_sparse_buffer) - -#endif /* GL_ARB_sparse_buffer */ - -/* ------------------------- GL_ARB_sparse_texture ------------------------- */ - -#ifndef GL_ARB_sparse_texture -#define GL_ARB_sparse_texture 1 - -#define GL_VIRTUAL_PAGE_SIZE_X_ARB 0x9195 -#define GL_VIRTUAL_PAGE_SIZE_Y_ARB 0x9196 -#define GL_VIRTUAL_PAGE_SIZE_Z_ARB 0x9197 -#define GL_MAX_SPARSE_TEXTURE_SIZE_ARB 0x9198 -#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199 -#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A -#define GL_TEXTURE_SPARSE_ARB 0x91A6 -#define GL_VIRTUAL_PAGE_SIZE_INDEX_ARB 0x91A7 -#define GL_NUM_VIRTUAL_PAGE_SIZES_ARB 0x91A8 -#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9 -#define GL_NUM_SPARSE_LEVELS_ARB 0x91AA - -typedef void (GLAPIENTRY * PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); -typedef void (GLAPIENTRY * PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); - -#define glTexPageCommitmentARB GLEW_GET_FUN(__glewTexPageCommitmentARB) -#define glTexturePageCommitmentEXT GLEW_GET_FUN(__glewTexturePageCommitmentEXT) - -#define GLEW_ARB_sparse_texture GLEW_GET_VAR(__GLEW_ARB_sparse_texture) - -#endif /* GL_ARB_sparse_texture */ - -/* ------------------------- GL_ARB_sparse_texture2 ------------------------ */ - -#ifndef GL_ARB_sparse_texture2 -#define GL_ARB_sparse_texture2 1 - -#define GLEW_ARB_sparse_texture2 GLEW_GET_VAR(__GLEW_ARB_sparse_texture2) - -#endif /* GL_ARB_sparse_texture2 */ - -/* ---------------------- GL_ARB_sparse_texture_clamp ---------------------- */ - -#ifndef GL_ARB_sparse_texture_clamp -#define GL_ARB_sparse_texture_clamp 1 - -#define GLEW_ARB_sparse_texture_clamp GLEW_GET_VAR(__GLEW_ARB_sparse_texture_clamp) - -#endif /* GL_ARB_sparse_texture_clamp */ - -/* ------------------------ GL_ARB_stencil_texturing ----------------------- */ - -#ifndef GL_ARB_stencil_texturing -#define GL_ARB_stencil_texturing 1 - -#define GL_DEPTH_STENCIL_TEXTURE_MODE 0x90EA - -#define GLEW_ARB_stencil_texturing GLEW_GET_VAR(__GLEW_ARB_stencil_texturing) - -#endif /* GL_ARB_stencil_texturing */ - -/* ------------------------------ GL_ARB_sync ------------------------------ */ - -#ifndef GL_ARB_sync -#define GL_ARB_sync 1 - -#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 -#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 -#define GL_OBJECT_TYPE 0x9112 -#define GL_SYNC_CONDITION 0x9113 -#define GL_SYNC_STATUS 0x9114 -#define GL_SYNC_FLAGS 0x9115 -#define GL_SYNC_FENCE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 -#define GL_UNSIGNALED 0x9118 -#define GL_SIGNALED 0x9119 -#define GL_ALREADY_SIGNALED 0x911A -#define GL_TIMEOUT_EXPIRED 0x911B -#define GL_CONDITION_SATISFIED 0x911C -#define GL_WAIT_FAILED 0x911D -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull - -typedef GLenum (GLAPIENTRY * PFNGLCLIENTWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout); -typedef void (GLAPIENTRY * PFNGLDELETESYNCPROC) (GLsync GLsync); -typedef GLsync (GLAPIENTRY * PFNGLFENCESYNCPROC) (GLenum condition,GLbitfield flags); -typedef void (GLAPIENTRY * PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETSYNCIVPROC) (GLsync GLsync,GLenum pname,GLsizei bufSize,GLsizei* length, GLint *values); -typedef GLboolean (GLAPIENTRY * PFNGLISSYNCPROC) (GLsync GLsync); -typedef void (GLAPIENTRY * PFNGLWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout); - -#define glClientWaitSync GLEW_GET_FUN(__glewClientWaitSync) -#define glDeleteSync GLEW_GET_FUN(__glewDeleteSync) -#define glFenceSync GLEW_GET_FUN(__glewFenceSync) -#define glGetInteger64v GLEW_GET_FUN(__glewGetInteger64v) -#define glGetSynciv GLEW_GET_FUN(__glewGetSynciv) -#define glIsSync GLEW_GET_FUN(__glewIsSync) -#define glWaitSync GLEW_GET_FUN(__glewWaitSync) - -#define GLEW_ARB_sync GLEW_GET_VAR(__GLEW_ARB_sync) - -#endif /* GL_ARB_sync */ - -/* ----------------------- GL_ARB_tessellation_shader ---------------------- */ - -#ifndef GL_ARB_tessellation_shader -#define GL_ARB_tessellation_shader 1 - -#define GL_PATCHES 0xE -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1 -#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C -#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D -#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E -#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F -#define GL_PATCH_VERTICES 0x8E72 -#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73 -#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74 -#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75 -#define GL_TESS_GEN_MODE 0x8E76 -#define GL_TESS_GEN_SPACING 0x8E77 -#define GL_TESS_GEN_VERTEX_ORDER 0x8E78 -#define GL_TESS_GEN_POINT_MODE 0x8E79 -#define GL_ISOLINES 0x8E7A -#define GL_FRACTIONAL_ODD 0x8E7B -#define GL_FRACTIONAL_EVEN 0x8E7C -#define GL_MAX_PATCH_VERTICES 0x8E7D -#define GL_MAX_TESS_GEN_LEVEL 0x8E7E -#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F -#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80 -#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81 -#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82 -#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83 -#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84 -#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85 -#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86 -#define GL_TESS_EVALUATION_SHADER 0x8E87 -#define GL_TESS_CONTROL_SHADER 0x8E88 -#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89 -#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A - -typedef void (GLAPIENTRY * PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat* values); -typedef void (GLAPIENTRY * PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value); - -#define glPatchParameterfv GLEW_GET_FUN(__glewPatchParameterfv) -#define glPatchParameteri GLEW_GET_FUN(__glewPatchParameteri) - -#define GLEW_ARB_tessellation_shader GLEW_GET_VAR(__GLEW_ARB_tessellation_shader) - -#endif /* GL_ARB_tessellation_shader */ - -/* ------------------------- GL_ARB_texture_barrier ------------------------ */ - -#ifndef GL_ARB_texture_barrier -#define GL_ARB_texture_barrier 1 - -typedef void (GLAPIENTRY * PFNGLTEXTUREBARRIERPROC) (void); - -#define glTextureBarrier GLEW_GET_FUN(__glewTextureBarrier) - -#define GLEW_ARB_texture_barrier GLEW_GET_VAR(__GLEW_ARB_texture_barrier) - -#endif /* GL_ARB_texture_barrier */ - -/* ---------------------- GL_ARB_texture_border_clamp ---------------------- */ - -#ifndef GL_ARB_texture_border_clamp -#define GL_ARB_texture_border_clamp 1 - -#define GL_CLAMP_TO_BORDER_ARB 0x812D - -#define GLEW_ARB_texture_border_clamp GLEW_GET_VAR(__GLEW_ARB_texture_border_clamp) - -#endif /* GL_ARB_texture_border_clamp */ - -/* ---------------------- GL_ARB_texture_buffer_object --------------------- */ - -#ifndef GL_ARB_texture_buffer_object -#define GL_ARB_texture_buffer_object 1 - -#define GL_TEXTURE_BUFFER_ARB 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E - -typedef void (GLAPIENTRY * PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer); - -#define glTexBufferARB GLEW_GET_FUN(__glewTexBufferARB) - -#define GLEW_ARB_texture_buffer_object GLEW_GET_VAR(__GLEW_ARB_texture_buffer_object) - -#endif /* GL_ARB_texture_buffer_object */ - -/* ------------------- GL_ARB_texture_buffer_object_rgb32 ------------------ */ - -#ifndef GL_ARB_texture_buffer_object_rgb32 -#define GL_ARB_texture_buffer_object_rgb32 1 - -#define GLEW_ARB_texture_buffer_object_rgb32 GLEW_GET_VAR(__GLEW_ARB_texture_buffer_object_rgb32) - -#endif /* GL_ARB_texture_buffer_object_rgb32 */ - -/* ---------------------- GL_ARB_texture_buffer_range ---------------------- */ - -#ifndef GL_ARB_texture_buffer_range -#define GL_ARB_texture_buffer_range 1 - -#define GL_TEXTURE_BUFFER_OFFSET 0x919D -#define GL_TEXTURE_BUFFER_SIZE 0x919E -#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F - -typedef void (GLAPIENTRY * PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); - -#define glTexBufferRange GLEW_GET_FUN(__glewTexBufferRange) -#define glTextureBufferRangeEXT GLEW_GET_FUN(__glewTextureBufferRangeEXT) - -#define GLEW_ARB_texture_buffer_range GLEW_GET_VAR(__GLEW_ARB_texture_buffer_range) - -#endif /* GL_ARB_texture_buffer_range */ - -/* ----------------------- GL_ARB_texture_compression ---------------------- */ - -#ifndef GL_ARB_texture_compression -#define GL_ARB_texture_compression 1 - -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 -#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB -#define GL_COMPRESSED_INTENSITY_ARB 0x84EC -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 -#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 - -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, void *img); - -#define glCompressedTexImage1DARB GLEW_GET_FUN(__glewCompressedTexImage1DARB) -#define glCompressedTexImage2DARB GLEW_GET_FUN(__glewCompressedTexImage2DARB) -#define glCompressedTexImage3DARB GLEW_GET_FUN(__glewCompressedTexImage3DARB) -#define glCompressedTexSubImage1DARB GLEW_GET_FUN(__glewCompressedTexSubImage1DARB) -#define glCompressedTexSubImage2DARB GLEW_GET_FUN(__glewCompressedTexSubImage2DARB) -#define glCompressedTexSubImage3DARB GLEW_GET_FUN(__glewCompressedTexSubImage3DARB) -#define glGetCompressedTexImageARB GLEW_GET_FUN(__glewGetCompressedTexImageARB) - -#define GLEW_ARB_texture_compression GLEW_GET_VAR(__GLEW_ARB_texture_compression) - -#endif /* GL_ARB_texture_compression */ - -/* -------------------- GL_ARB_texture_compression_bptc -------------------- */ - -#ifndef GL_ARB_texture_compression_bptc -#define GL_ARB_texture_compression_bptc 1 - -#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C -#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D -#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E -#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F - -#define GLEW_ARB_texture_compression_bptc GLEW_GET_VAR(__GLEW_ARB_texture_compression_bptc) - -#endif /* GL_ARB_texture_compression_bptc */ - -/* -------------------- GL_ARB_texture_compression_rgtc -------------------- */ - -#ifndef GL_ARB_texture_compression_rgtc -#define GL_ARB_texture_compression_rgtc 1 - -#define GL_COMPRESSED_RED_RGTC1 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC -#define GL_COMPRESSED_RG_RGTC2 0x8DBD -#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE - -#define GLEW_ARB_texture_compression_rgtc GLEW_GET_VAR(__GLEW_ARB_texture_compression_rgtc) - -#endif /* GL_ARB_texture_compression_rgtc */ - -/* ------------------------ GL_ARB_texture_cube_map ------------------------ */ - -#ifndef GL_ARB_texture_cube_map -#define GL_ARB_texture_cube_map 1 - -#define GL_NORMAL_MAP_ARB 0x8511 -#define GL_REFLECTION_MAP_ARB 0x8512 -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C - -#define GLEW_ARB_texture_cube_map GLEW_GET_VAR(__GLEW_ARB_texture_cube_map) - -#endif /* GL_ARB_texture_cube_map */ - -/* --------------------- GL_ARB_texture_cube_map_array --------------------- */ - -#ifndef GL_ARB_texture_cube_map_array -#define GL_ARB_texture_cube_map_array 1 - -#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F - -#define GLEW_ARB_texture_cube_map_array GLEW_GET_VAR(__GLEW_ARB_texture_cube_map_array) - -#endif /* GL_ARB_texture_cube_map_array */ - -/* ------------------------- GL_ARB_texture_env_add ------------------------ */ - -#ifndef GL_ARB_texture_env_add -#define GL_ARB_texture_env_add 1 - -#define GLEW_ARB_texture_env_add GLEW_GET_VAR(__GLEW_ARB_texture_env_add) - -#endif /* GL_ARB_texture_env_add */ - -/* ----------------------- GL_ARB_texture_env_combine ---------------------- */ - -#ifndef GL_ARB_texture_env_combine -#define GL_ARB_texture_env_combine 1 - -#define GL_SUBTRACT_ARB 0x84E7 -#define GL_COMBINE_ARB 0x8570 -#define GL_COMBINE_RGB_ARB 0x8571 -#define GL_COMBINE_ALPHA_ARB 0x8572 -#define GL_RGB_SCALE_ARB 0x8573 -#define GL_ADD_SIGNED_ARB 0x8574 -#define GL_INTERPOLATE_ARB 0x8575 -#define GL_CONSTANT_ARB 0x8576 -#define GL_PRIMARY_COLOR_ARB 0x8577 -#define GL_PREVIOUS_ARB 0x8578 -#define GL_SOURCE0_RGB_ARB 0x8580 -#define GL_SOURCE1_RGB_ARB 0x8581 -#define GL_SOURCE2_RGB_ARB 0x8582 -#define GL_SOURCE0_ALPHA_ARB 0x8588 -#define GL_SOURCE1_ALPHA_ARB 0x8589 -#define GL_SOURCE2_ALPHA_ARB 0x858A -#define GL_OPERAND0_RGB_ARB 0x8590 -#define GL_OPERAND1_RGB_ARB 0x8591 -#define GL_OPERAND2_RGB_ARB 0x8592 -#define GL_OPERAND0_ALPHA_ARB 0x8598 -#define GL_OPERAND1_ALPHA_ARB 0x8599 -#define GL_OPERAND2_ALPHA_ARB 0x859A - -#define GLEW_ARB_texture_env_combine GLEW_GET_VAR(__GLEW_ARB_texture_env_combine) - -#endif /* GL_ARB_texture_env_combine */ - -/* ---------------------- GL_ARB_texture_env_crossbar ---------------------- */ - -#ifndef GL_ARB_texture_env_crossbar -#define GL_ARB_texture_env_crossbar 1 - -#define GLEW_ARB_texture_env_crossbar GLEW_GET_VAR(__GLEW_ARB_texture_env_crossbar) - -#endif /* GL_ARB_texture_env_crossbar */ - -/* ------------------------ GL_ARB_texture_env_dot3 ------------------------ */ - -#ifndef GL_ARB_texture_env_dot3 -#define GL_ARB_texture_env_dot3 1 - -#define GL_DOT3_RGB_ARB 0x86AE -#define GL_DOT3_RGBA_ARB 0x86AF - -#define GLEW_ARB_texture_env_dot3 GLEW_GET_VAR(__GLEW_ARB_texture_env_dot3) - -#endif /* GL_ARB_texture_env_dot3 */ - -/* ---------------------- GL_ARB_texture_filter_minmax --------------------- */ - -#ifndef GL_ARB_texture_filter_minmax -#define GL_ARB_texture_filter_minmax 1 - -#define GL_TEXTURE_REDUCTION_MODE_ARB 0x9366 -#define GL_WEIGHTED_AVERAGE_ARB 0x9367 - -#define GLEW_ARB_texture_filter_minmax GLEW_GET_VAR(__GLEW_ARB_texture_filter_minmax) - -#endif /* GL_ARB_texture_filter_minmax */ - -/* -------------------------- GL_ARB_texture_float ------------------------- */ - -#ifndef GL_ARB_texture_float -#define GL_ARB_texture_float 1 - -#define GL_RGBA32F_ARB 0x8814 -#define GL_RGB32F_ARB 0x8815 -#define GL_ALPHA32F_ARB 0x8816 -#define GL_INTENSITY32F_ARB 0x8817 -#define GL_LUMINANCE32F_ARB 0x8818 -#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 -#define GL_RGBA16F_ARB 0x881A -#define GL_RGB16F_ARB 0x881B -#define GL_ALPHA16F_ARB 0x881C -#define GL_INTENSITY16F_ARB 0x881D -#define GL_LUMINANCE16F_ARB 0x881E -#define GL_LUMINANCE_ALPHA16F_ARB 0x881F -#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 -#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 -#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 -#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 - -#define GLEW_ARB_texture_float GLEW_GET_VAR(__GLEW_ARB_texture_float) - -#endif /* GL_ARB_texture_float */ - -/* ------------------------- GL_ARB_texture_gather ------------------------- */ - -#ifndef GL_ARB_texture_gather -#define GL_ARB_texture_gather 1 - -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F -#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F - -#define GLEW_ARB_texture_gather GLEW_GET_VAR(__GLEW_ARB_texture_gather) - -#endif /* GL_ARB_texture_gather */ - -/* ------------------ GL_ARB_texture_mirror_clamp_to_edge ------------------ */ - -#ifndef GL_ARB_texture_mirror_clamp_to_edge -#define GL_ARB_texture_mirror_clamp_to_edge 1 - -#define GL_MIRROR_CLAMP_TO_EDGE 0x8743 - -#define GLEW_ARB_texture_mirror_clamp_to_edge GLEW_GET_VAR(__GLEW_ARB_texture_mirror_clamp_to_edge) - -#endif /* GL_ARB_texture_mirror_clamp_to_edge */ - -/* --------------------- GL_ARB_texture_mirrored_repeat -------------------- */ - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_ARB_texture_mirrored_repeat 1 - -#define GL_MIRRORED_REPEAT_ARB 0x8370 - -#define GLEW_ARB_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_ARB_texture_mirrored_repeat) - -#endif /* GL_ARB_texture_mirrored_repeat */ - -/* ----------------------- GL_ARB_texture_multisample ---------------------- */ - -#ifndef GL_ARB_texture_multisample -#define GL_ARB_texture_multisample 1 - -#define GL_SAMPLE_POSITION 0x8E50 -#define GL_SAMPLE_MASK 0x8E51 -#define GL_SAMPLE_MASK_VALUE 0x8E52 -#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59 -#define GL_TEXTURE_2D_MULTISAMPLE 0x9100 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101 -#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 -#define GL_TEXTURE_SAMPLES 0x9106 -#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107 -#define GL_SAMPLER_2D_MULTISAMPLE 0x9108 -#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109 -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A -#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B -#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D -#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E -#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F -#define GL_MAX_INTEGER_SAMPLES 0x9110 - -typedef void (GLAPIENTRY * PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat* val); -typedef void (GLAPIENTRY * PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask); -typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); - -#define glGetMultisamplefv GLEW_GET_FUN(__glewGetMultisamplefv) -#define glSampleMaski GLEW_GET_FUN(__glewSampleMaski) -#define glTexImage2DMultisample GLEW_GET_FUN(__glewTexImage2DMultisample) -#define glTexImage3DMultisample GLEW_GET_FUN(__glewTexImage3DMultisample) - -#define GLEW_ARB_texture_multisample GLEW_GET_VAR(__GLEW_ARB_texture_multisample) - -#endif /* GL_ARB_texture_multisample */ - -/* -------------------- GL_ARB_texture_non_power_of_two -------------------- */ - -#ifndef GL_ARB_texture_non_power_of_two -#define GL_ARB_texture_non_power_of_two 1 - -#define GLEW_ARB_texture_non_power_of_two GLEW_GET_VAR(__GLEW_ARB_texture_non_power_of_two) - -#endif /* GL_ARB_texture_non_power_of_two */ - -/* ---------------------- GL_ARB_texture_query_levels ---------------------- */ - -#ifndef GL_ARB_texture_query_levels -#define GL_ARB_texture_query_levels 1 - -#define GLEW_ARB_texture_query_levels GLEW_GET_VAR(__GLEW_ARB_texture_query_levels) - -#endif /* GL_ARB_texture_query_levels */ - -/* ------------------------ GL_ARB_texture_query_lod ----------------------- */ - -#ifndef GL_ARB_texture_query_lod -#define GL_ARB_texture_query_lod 1 - -#define GLEW_ARB_texture_query_lod GLEW_GET_VAR(__GLEW_ARB_texture_query_lod) - -#endif /* GL_ARB_texture_query_lod */ - -/* ------------------------ GL_ARB_texture_rectangle ----------------------- */ - -#ifndef GL_ARB_texture_rectangle -#define GL_ARB_texture_rectangle 1 - -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 - -#define GLEW_ARB_texture_rectangle GLEW_GET_VAR(__GLEW_ARB_texture_rectangle) - -#endif /* GL_ARB_texture_rectangle */ - -/* --------------------------- GL_ARB_texture_rg --------------------------- */ - -#ifndef GL_ARB_texture_rg -#define GL_ARB_texture_rg 1 - -#define GL_COMPRESSED_RED 0x8225 -#define GL_COMPRESSED_RG 0x8226 -#define GL_RG 0x8227 -#define GL_RG_INTEGER 0x8228 -#define GL_R8 0x8229 -#define GL_R16 0x822A -#define GL_RG8 0x822B -#define GL_RG16 0x822C -#define GL_R16F 0x822D -#define GL_R32F 0x822E -#define GL_RG16F 0x822F -#define GL_RG32F 0x8230 -#define GL_R8I 0x8231 -#define GL_R8UI 0x8232 -#define GL_R16I 0x8233 -#define GL_R16UI 0x8234 -#define GL_R32I 0x8235 -#define GL_R32UI 0x8236 -#define GL_RG8I 0x8237 -#define GL_RG8UI 0x8238 -#define GL_RG16I 0x8239 -#define GL_RG16UI 0x823A -#define GL_RG32I 0x823B -#define GL_RG32UI 0x823C - -#define GLEW_ARB_texture_rg GLEW_GET_VAR(__GLEW_ARB_texture_rg) - -#endif /* GL_ARB_texture_rg */ - -/* ----------------------- GL_ARB_texture_rgb10_a2ui ----------------------- */ - -#ifndef GL_ARB_texture_rgb10_a2ui -#define GL_ARB_texture_rgb10_a2ui 1 - -#define GL_RGB10_A2UI 0x906F - -#define GLEW_ARB_texture_rgb10_a2ui GLEW_GET_VAR(__GLEW_ARB_texture_rgb10_a2ui) - -#endif /* GL_ARB_texture_rgb10_a2ui */ - -/* ------------------------ GL_ARB_texture_stencil8 ------------------------ */ - -#ifndef GL_ARB_texture_stencil8 -#define GL_ARB_texture_stencil8 1 - -#define GL_STENCIL_INDEX 0x1901 -#define GL_STENCIL_INDEX8 0x8D48 - -#define GLEW_ARB_texture_stencil8 GLEW_GET_VAR(__GLEW_ARB_texture_stencil8) - -#endif /* GL_ARB_texture_stencil8 */ - -/* ------------------------- GL_ARB_texture_storage ------------------------ */ - -#ifndef GL_ARB_texture_storage -#define GL_ARB_texture_storage 1 - -#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F - -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE1DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); - -#define glTexStorage1D GLEW_GET_FUN(__glewTexStorage1D) -#define glTexStorage2D GLEW_GET_FUN(__glewTexStorage2D) -#define glTexStorage3D GLEW_GET_FUN(__glewTexStorage3D) -#define glTextureStorage1DEXT GLEW_GET_FUN(__glewTextureStorage1DEXT) -#define glTextureStorage2DEXT GLEW_GET_FUN(__glewTextureStorage2DEXT) -#define glTextureStorage3DEXT GLEW_GET_FUN(__glewTextureStorage3DEXT) - -#define GLEW_ARB_texture_storage GLEW_GET_VAR(__GLEW_ARB_texture_storage) - -#endif /* GL_ARB_texture_storage */ - -/* ------------------- GL_ARB_texture_storage_multisample ------------------ */ - -#ifndef GL_ARB_texture_storage_multisample -#define GL_ARB_texture_storage_multisample 1 - -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); - -#define glTexStorage2DMultisample GLEW_GET_FUN(__glewTexStorage2DMultisample) -#define glTexStorage3DMultisample GLEW_GET_FUN(__glewTexStorage3DMultisample) -#define glTextureStorage2DMultisampleEXT GLEW_GET_FUN(__glewTextureStorage2DMultisampleEXT) -#define glTextureStorage3DMultisampleEXT GLEW_GET_FUN(__glewTextureStorage3DMultisampleEXT) - -#define GLEW_ARB_texture_storage_multisample GLEW_GET_VAR(__GLEW_ARB_texture_storage_multisample) - -#endif /* GL_ARB_texture_storage_multisample */ - -/* ------------------------- GL_ARB_texture_swizzle ------------------------ */ - -#ifndef GL_ARB_texture_swizzle -#define GL_ARB_texture_swizzle 1 - -#define GL_TEXTURE_SWIZZLE_R 0x8E42 -#define GL_TEXTURE_SWIZZLE_G 0x8E43 -#define GL_TEXTURE_SWIZZLE_B 0x8E44 -#define GL_TEXTURE_SWIZZLE_A 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46 - -#define GLEW_ARB_texture_swizzle GLEW_GET_VAR(__GLEW_ARB_texture_swizzle) - -#endif /* GL_ARB_texture_swizzle */ - -/* -------------------------- GL_ARB_texture_view -------------------------- */ - -#ifndef GL_ARB_texture_view -#define GL_ARB_texture_view 1 - -#define GL_TEXTURE_VIEW_MIN_LEVEL 0x82DB -#define GL_TEXTURE_VIEW_NUM_LEVELS 0x82DC -#define GL_TEXTURE_VIEW_MIN_LAYER 0x82DD -#define GL_TEXTURE_VIEW_NUM_LAYERS 0x82DE -#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF - -typedef void (GLAPIENTRY * PFNGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); - -#define glTextureView GLEW_GET_FUN(__glewTextureView) - -#define GLEW_ARB_texture_view GLEW_GET_VAR(__GLEW_ARB_texture_view) - -#endif /* GL_ARB_texture_view */ - -/* --------------------------- GL_ARB_timer_query -------------------------- */ - -#ifndef GL_ARB_timer_query -#define GL_ARB_timer_query 1 - -#define GL_TIME_ELAPSED 0x88BF -#define GL_TIMESTAMP 0x8E28 - -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target); - -#define glGetQueryObjecti64v GLEW_GET_FUN(__glewGetQueryObjecti64v) -#define glGetQueryObjectui64v GLEW_GET_FUN(__glewGetQueryObjectui64v) -#define glQueryCounter GLEW_GET_FUN(__glewQueryCounter) - -#define GLEW_ARB_timer_query GLEW_GET_VAR(__GLEW_ARB_timer_query) - -#endif /* GL_ARB_timer_query */ - -/* ----------------------- GL_ARB_transform_feedback2 ---------------------- */ - -#ifndef GL_ARB_transform_feedback2 -#define GL_ARB_transform_feedback2 1 - -#define GL_TRANSFORM_FEEDBACK 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25 - -typedef void (GLAPIENTRY * PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id); -typedef void (GLAPIENTRY * PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint* ids); -typedef GLboolean (GLAPIENTRY * PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLPAUSETRANSFORMFEEDBACKPROC) (void); -typedef void (GLAPIENTRY * PFNGLRESUMETRANSFORMFEEDBACKPROC) (void); - -#define glBindTransformFeedback GLEW_GET_FUN(__glewBindTransformFeedback) -#define glDeleteTransformFeedbacks GLEW_GET_FUN(__glewDeleteTransformFeedbacks) -#define glDrawTransformFeedback GLEW_GET_FUN(__glewDrawTransformFeedback) -#define glGenTransformFeedbacks GLEW_GET_FUN(__glewGenTransformFeedbacks) -#define glIsTransformFeedback GLEW_GET_FUN(__glewIsTransformFeedback) -#define glPauseTransformFeedback GLEW_GET_FUN(__glewPauseTransformFeedback) -#define glResumeTransformFeedback GLEW_GET_FUN(__glewResumeTransformFeedback) - -#define GLEW_ARB_transform_feedback2 GLEW_GET_VAR(__GLEW_ARB_transform_feedback2) - -#endif /* GL_ARB_transform_feedback2 */ - -/* ----------------------- GL_ARB_transform_feedback3 ---------------------- */ - -#ifndef GL_ARB_transform_feedback3 -#define GL_ARB_transform_feedback3 1 - -#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70 -#define GL_MAX_VERTEX_STREAMS 0x8E71 - -typedef void (GLAPIENTRY * PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id); -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream); -typedef void (GLAPIENTRY * PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index); -typedef void (GLAPIENTRY * PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint* params); - -#define glBeginQueryIndexed GLEW_GET_FUN(__glewBeginQueryIndexed) -#define glDrawTransformFeedbackStream GLEW_GET_FUN(__glewDrawTransformFeedbackStream) -#define glEndQueryIndexed GLEW_GET_FUN(__glewEndQueryIndexed) -#define glGetQueryIndexediv GLEW_GET_FUN(__glewGetQueryIndexediv) - -#define GLEW_ARB_transform_feedback3 GLEW_GET_VAR(__GLEW_ARB_transform_feedback3) - -#endif /* GL_ARB_transform_feedback3 */ - -/* ------------------ GL_ARB_transform_feedback_instanced ------------------ */ - -#ifndef GL_ARB_transform_feedback_instanced -#define GL_ARB_transform_feedback_instanced 1 - -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei primcount); - -#define glDrawTransformFeedbackInstanced GLEW_GET_FUN(__glewDrawTransformFeedbackInstanced) -#define glDrawTransformFeedbackStreamInstanced GLEW_GET_FUN(__glewDrawTransformFeedbackStreamInstanced) - -#define GLEW_ARB_transform_feedback_instanced GLEW_GET_VAR(__GLEW_ARB_transform_feedback_instanced) - -#endif /* GL_ARB_transform_feedback_instanced */ - -/* ---------------- GL_ARB_transform_feedback_overflow_query --------------- */ - -#ifndef GL_ARB_transform_feedback_overflow_query -#define GL_ARB_transform_feedback_overflow_query 1 - -#define GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB 0x82EC -#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB 0x82ED - -#define GLEW_ARB_transform_feedback_overflow_query GLEW_GET_VAR(__GLEW_ARB_transform_feedback_overflow_query) - -#endif /* GL_ARB_transform_feedback_overflow_query */ - -/* ------------------------ GL_ARB_transpose_matrix ------------------------ */ - -#ifndef GL_ARB_transpose_matrix -#define GL_ARB_transpose_matrix 1 - -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 - -typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]); -typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]); -typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]); -typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]); - -#define glLoadTransposeMatrixdARB GLEW_GET_FUN(__glewLoadTransposeMatrixdARB) -#define glLoadTransposeMatrixfARB GLEW_GET_FUN(__glewLoadTransposeMatrixfARB) -#define glMultTransposeMatrixdARB GLEW_GET_FUN(__glewMultTransposeMatrixdARB) -#define glMultTransposeMatrixfARB GLEW_GET_FUN(__glewMultTransposeMatrixfARB) - -#define GLEW_ARB_transpose_matrix GLEW_GET_VAR(__GLEW_ARB_transpose_matrix) - -#endif /* GL_ARB_transpose_matrix */ - -/* ---------------------- GL_ARB_uniform_buffer_object --------------------- */ - -#ifndef GL_ARB_uniform_buffer_object -#define GL_ARB_uniform_buffer_object 1 - -#define GL_UNIFORM_BUFFER 0x8A11 -#define GL_UNIFORM_BUFFER_BINDING 0x8A28 -#define GL_UNIFORM_BUFFER_START 0x8A29 -#define GL_UNIFORM_BUFFER_SIZE 0x8A2A -#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B -#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C -#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D -#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E -#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F -#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30 -#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31 -#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32 -#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33 -#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34 -#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35 -#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36 -#define GL_UNIFORM_TYPE 0x8A37 -#define GL_UNIFORM_SIZE 0x8A38 -#define GL_UNIFORM_NAME_LENGTH 0x8A39 -#define GL_UNIFORM_BLOCK_INDEX 0x8A3A -#define GL_UNIFORM_OFFSET 0x8A3B -#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C -#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D -#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E -#define GL_UNIFORM_BLOCK_BINDING 0x8A3F -#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40 -#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46 -#define GL_INVALID_INDEX 0xFFFFFFFFu - -typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformName); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint* data); -typedef GLuint (GLAPIENTRY * PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar* uniformBlockName); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* const * uniformNames, GLuint* uniformIndices); -typedef void (GLAPIENTRY * PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); - -#define glBindBufferBase GLEW_GET_FUN(__glewBindBufferBase) -#define glBindBufferRange GLEW_GET_FUN(__glewBindBufferRange) -#define glGetActiveUniformBlockName GLEW_GET_FUN(__glewGetActiveUniformBlockName) -#define glGetActiveUniformBlockiv GLEW_GET_FUN(__glewGetActiveUniformBlockiv) -#define glGetActiveUniformName GLEW_GET_FUN(__glewGetActiveUniformName) -#define glGetActiveUniformsiv GLEW_GET_FUN(__glewGetActiveUniformsiv) -#define glGetIntegeri_v GLEW_GET_FUN(__glewGetIntegeri_v) -#define glGetUniformBlockIndex GLEW_GET_FUN(__glewGetUniformBlockIndex) -#define glGetUniformIndices GLEW_GET_FUN(__glewGetUniformIndices) -#define glUniformBlockBinding GLEW_GET_FUN(__glewUniformBlockBinding) - -#define GLEW_ARB_uniform_buffer_object GLEW_GET_VAR(__GLEW_ARB_uniform_buffer_object) - -#endif /* GL_ARB_uniform_buffer_object */ - -/* ------------------------ GL_ARB_vertex_array_bgra ----------------------- */ - -#ifndef GL_ARB_vertex_array_bgra -#define GL_ARB_vertex_array_bgra 1 - -#define GL_BGRA 0x80E1 - -#define GLEW_ARB_vertex_array_bgra GLEW_GET_VAR(__GLEW_ARB_vertex_array_bgra) - -#endif /* GL_ARB_vertex_array_bgra */ - -/* ----------------------- GL_ARB_vertex_array_object ---------------------- */ - -#ifndef GL_ARB_vertex_array_object -#define GL_ARB_vertex_array_object 1 - -#define GL_VERTEX_ARRAY_BINDING 0x85B5 - -typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYPROC) (GLuint array); -typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays); -typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays); -typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYPROC) (GLuint array); - -#define glBindVertexArray GLEW_GET_FUN(__glewBindVertexArray) -#define glDeleteVertexArrays GLEW_GET_FUN(__glewDeleteVertexArrays) -#define glGenVertexArrays GLEW_GET_FUN(__glewGenVertexArrays) -#define glIsVertexArray GLEW_GET_FUN(__glewIsVertexArray) - -#define GLEW_ARB_vertex_array_object GLEW_GET_VAR(__GLEW_ARB_vertex_array_object) - -#endif /* GL_ARB_vertex_array_object */ - -/* ----------------------- GL_ARB_vertex_attrib_64bit ---------------------- */ - -#ifndef GL_ARB_vertex_attrib_64bit -#define GL_ARB_vertex_attrib_64bit 1 - -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void* pointer); - -#define glGetVertexAttribLdv GLEW_GET_FUN(__glewGetVertexAttribLdv) -#define glVertexAttribL1d GLEW_GET_FUN(__glewVertexAttribL1d) -#define glVertexAttribL1dv GLEW_GET_FUN(__glewVertexAttribL1dv) -#define glVertexAttribL2d GLEW_GET_FUN(__glewVertexAttribL2d) -#define glVertexAttribL2dv GLEW_GET_FUN(__glewVertexAttribL2dv) -#define glVertexAttribL3d GLEW_GET_FUN(__glewVertexAttribL3d) -#define glVertexAttribL3dv GLEW_GET_FUN(__glewVertexAttribL3dv) -#define glVertexAttribL4d GLEW_GET_FUN(__glewVertexAttribL4d) -#define glVertexAttribL4dv GLEW_GET_FUN(__glewVertexAttribL4dv) -#define glVertexAttribLPointer GLEW_GET_FUN(__glewVertexAttribLPointer) - -#define GLEW_ARB_vertex_attrib_64bit GLEW_GET_VAR(__GLEW_ARB_vertex_attrib_64bit) - -#endif /* GL_ARB_vertex_attrib_64bit */ - -/* ---------------------- GL_ARB_vertex_attrib_binding --------------------- */ - -#ifndef GL_ARB_vertex_attrib_binding -#define GL_ARB_vertex_attrib_binding 1 - -#define GL_VERTEX_ATTRIB_BINDING 0x82D4 -#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D5 -#define GL_VERTEX_BINDING_DIVISOR 0x82D6 -#define GL_VERTEX_BINDING_OFFSET 0x82D7 -#define GL_VERTEX_BINDING_STRIDE 0x82D8 -#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9 -#define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA -#define GL_VERTEX_BINDING_BUFFER 0x8F4F - -typedef void (GLAPIENTRY * PFNGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor); - -#define glBindVertexBuffer GLEW_GET_FUN(__glewBindVertexBuffer) -#define glVertexArrayBindVertexBufferEXT GLEW_GET_FUN(__glewVertexArrayBindVertexBufferEXT) -#define glVertexArrayVertexAttribBindingEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribBindingEXT) -#define glVertexArrayVertexAttribFormatEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribFormatEXT) -#define glVertexArrayVertexAttribIFormatEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribIFormatEXT) -#define glVertexArrayVertexAttribLFormatEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribLFormatEXT) -#define glVertexArrayVertexBindingDivisorEXT GLEW_GET_FUN(__glewVertexArrayVertexBindingDivisorEXT) -#define glVertexAttribBinding GLEW_GET_FUN(__glewVertexAttribBinding) -#define glVertexAttribFormat GLEW_GET_FUN(__glewVertexAttribFormat) -#define glVertexAttribIFormat GLEW_GET_FUN(__glewVertexAttribIFormat) -#define glVertexAttribLFormat GLEW_GET_FUN(__glewVertexAttribLFormat) -#define glVertexBindingDivisor GLEW_GET_FUN(__glewVertexBindingDivisor) - -#define GLEW_ARB_vertex_attrib_binding GLEW_GET_VAR(__GLEW_ARB_vertex_attrib_binding) - -#endif /* GL_ARB_vertex_attrib_binding */ - -/* -------------------------- GL_ARB_vertex_blend -------------------------- */ - -#ifndef GL_ARB_vertex_blend -#define GL_ARB_vertex_blend 1 - -#define GL_MODELVIEW0_ARB 0x1700 -#define GL_MODELVIEW1_ARB 0x850A -#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 -#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 -#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 -#define GL_VERTEX_BLEND_ARB 0x86A7 -#define GL_CURRENT_WEIGHT_ARB 0x86A8 -#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 -#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA -#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB -#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC -#define GL_WEIGHT_ARRAY_ARB 0x86AD -#define GL_MODELVIEW2_ARB 0x8722 -#define GL_MODELVIEW3_ARB 0x8723 -#define GL_MODELVIEW4_ARB 0x8724 -#define GL_MODELVIEW5_ARB 0x8725 -#define GL_MODELVIEW6_ARB 0x8726 -#define GL_MODELVIEW7_ARB 0x8727 -#define GL_MODELVIEW8_ARB 0x8728 -#define GL_MODELVIEW9_ARB 0x8729 -#define GL_MODELVIEW10_ARB 0x872A -#define GL_MODELVIEW11_ARB 0x872B -#define GL_MODELVIEW12_ARB 0x872C -#define GL_MODELVIEW13_ARB 0x872D -#define GL_MODELVIEW14_ARB 0x872E -#define GL_MODELVIEW15_ARB 0x872F -#define GL_MODELVIEW16_ARB 0x8730 -#define GL_MODELVIEW17_ARB 0x8731 -#define GL_MODELVIEW18_ARB 0x8732 -#define GL_MODELVIEW19_ARB 0x8733 -#define GL_MODELVIEW20_ARB 0x8734 -#define GL_MODELVIEW21_ARB 0x8735 -#define GL_MODELVIEW22_ARB 0x8736 -#define GL_MODELVIEW23_ARB 0x8737 -#define GL_MODELVIEW24_ARB 0x8738 -#define GL_MODELVIEW25_ARB 0x8739 -#define GL_MODELVIEW26_ARB 0x873A -#define GL_MODELVIEW27_ARB 0x873B -#define GL_MODELVIEW28_ARB 0x873C -#define GL_MODELVIEW29_ARB 0x873D -#define GL_MODELVIEW30_ARB 0x873E -#define GL_MODELVIEW31_ARB 0x873F - -typedef void (GLAPIENTRY * PFNGLVERTEXBLENDARBPROC) (GLint count); -typedef void (GLAPIENTRY * PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, void *pointer); -typedef void (GLAPIENTRY * PFNGLWEIGHTBVARBPROC) (GLint size, GLbyte *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTDVARBPROC) (GLint size, GLdouble *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTFVARBPROC) (GLint size, GLfloat *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTIVARBPROC) (GLint size, GLint *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTSVARBPROC) (GLint size, GLshort *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTUBVARBPROC) (GLint size, GLubyte *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTUIVARBPROC) (GLint size, GLuint *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTUSVARBPROC) (GLint size, GLushort *weights); - -#define glVertexBlendARB GLEW_GET_FUN(__glewVertexBlendARB) -#define glWeightPointerARB GLEW_GET_FUN(__glewWeightPointerARB) -#define glWeightbvARB GLEW_GET_FUN(__glewWeightbvARB) -#define glWeightdvARB GLEW_GET_FUN(__glewWeightdvARB) -#define glWeightfvARB GLEW_GET_FUN(__glewWeightfvARB) -#define glWeightivARB GLEW_GET_FUN(__glewWeightivARB) -#define glWeightsvARB GLEW_GET_FUN(__glewWeightsvARB) -#define glWeightubvARB GLEW_GET_FUN(__glewWeightubvARB) -#define glWeightuivARB GLEW_GET_FUN(__glewWeightuivARB) -#define glWeightusvARB GLEW_GET_FUN(__glewWeightusvARB) - -#define GLEW_ARB_vertex_blend GLEW_GET_VAR(__GLEW_ARB_vertex_blend) - -#endif /* GL_ARB_vertex_blend */ - -/* ---------------------- GL_ARB_vertex_buffer_object ---------------------- */ - -#ifndef GL_ARB_vertex_buffer_object -#define GL_ARB_vertex_buffer_object 1 - -#define GL_BUFFER_SIZE_ARB 0x8764 -#define GL_BUFFER_USAGE_ARB 0x8765 -#define GL_ARRAY_BUFFER_ARB 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 -#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F -#define GL_READ_ONLY_ARB 0x88B8 -#define GL_WRITE_ONLY_ARB 0x88B9 -#define GL_READ_WRITE_ARB 0x88BA -#define GL_BUFFER_ACCESS_ARB 0x88BB -#define GL_BUFFER_MAPPED_ARB 0x88BC -#define GL_BUFFER_MAP_POINTER_ARB 0x88BD -#define GL_STREAM_DRAW_ARB 0x88E0 -#define GL_STREAM_READ_ARB 0x88E1 -#define GL_STREAM_COPY_ARB 0x88E2 -#define GL_STATIC_DRAW_ARB 0x88E4 -#define GL_STATIC_READ_ARB 0x88E5 -#define GL_STATIC_COPY_ARB 0x88E6 -#define GL_DYNAMIC_DRAW_ARB 0x88E8 -#define GL_DYNAMIC_READ_ARB 0x88E9 -#define GL_DYNAMIC_COPY_ARB 0x88EA - -typedef ptrdiff_t GLintptrARB; -typedef ptrdiff_t GLsizeiptrARB; - -typedef void (GLAPIENTRY * PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage); -typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data); -typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, void** params); -typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data); -typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERARBPROC) (GLuint buffer); -typedef void * (GLAPIENTRY * PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access); -typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERARBPROC) (GLenum target); - -#define glBindBufferARB GLEW_GET_FUN(__glewBindBufferARB) -#define glBufferDataARB GLEW_GET_FUN(__glewBufferDataARB) -#define glBufferSubDataARB GLEW_GET_FUN(__glewBufferSubDataARB) -#define glDeleteBuffersARB GLEW_GET_FUN(__glewDeleteBuffersARB) -#define glGenBuffersARB GLEW_GET_FUN(__glewGenBuffersARB) -#define glGetBufferParameterivARB GLEW_GET_FUN(__glewGetBufferParameterivARB) -#define glGetBufferPointervARB GLEW_GET_FUN(__glewGetBufferPointervARB) -#define glGetBufferSubDataARB GLEW_GET_FUN(__glewGetBufferSubDataARB) -#define glIsBufferARB GLEW_GET_FUN(__glewIsBufferARB) -#define glMapBufferARB GLEW_GET_FUN(__glewMapBufferARB) -#define glUnmapBufferARB GLEW_GET_FUN(__glewUnmapBufferARB) - -#define GLEW_ARB_vertex_buffer_object GLEW_GET_VAR(__GLEW_ARB_vertex_buffer_object) - -#endif /* GL_ARB_vertex_buffer_object */ - -/* ------------------------- GL_ARB_vertex_program ------------------------- */ - -#ifndef GL_ARB_vertex_program -#define GL_ARB_vertex_program 1 - -#define GL_COLOR_SUM_ARB 0x8458 -#define GL_VERTEX_PROGRAM_ARB 0x8620 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 -#define GL_PROGRAM_LENGTH_ARB 0x8627 -#define GL_PROGRAM_STRING_ARB 0x8628 -#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E -#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F -#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 -#define GL_CURRENT_MATRIX_ARB 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 -#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B -#define GL_PROGRAM_BINDING_ARB 0x8677 -#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A -#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 -#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -#define GL_PROGRAM_FORMAT_ARB 0x8876 -#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 -#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 -#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 -#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 -#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 -#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 -#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 -#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 -#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 -#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 -#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA -#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB -#define GL_PROGRAM_ATTRIBS_ARB 0x88AC -#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD -#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE -#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF -#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 -#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 -#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 -#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 -#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 -#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 -#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 -#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 -#define GL_MATRIX0_ARB 0x88C0 -#define GL_MATRIX1_ARB 0x88C1 -#define GL_MATRIX2_ARB 0x88C2 -#define GL_MATRIX3_ARB 0x88C3 -#define GL_MATRIX4_ARB 0x88C4 -#define GL_MATRIX5_ARB 0x88C5 -#define GL_MATRIX6_ARB 0x88C6 -#define GL_MATRIX7_ARB 0x88C7 -#define GL_MATRIX8_ARB 0x88C8 -#define GL_MATRIX9_ARB 0x88C9 -#define GL_MATRIX10_ARB 0x88CA -#define GL_MATRIX11_ARB 0x88CB -#define GL_MATRIX12_ARB 0x88CC -#define GL_MATRIX13_ARB 0x88CD -#define GL_MATRIX14_ARB 0x88CE -#define GL_MATRIX15_ARB 0x88CF -#define GL_MATRIX16_ARB 0x88D0 -#define GL_MATRIX17_ARB 0x88D1 -#define GL_MATRIX18_ARB 0x88D2 -#define GL_MATRIX19_ARB 0x88D3 -#define GL_MATRIX20_ARB 0x88D4 -#define GL_MATRIX21_ARB 0x88D5 -#define GL_MATRIX22_ARB 0x88D6 -#define GL_MATRIX23_ARB 0x88D7 -#define GL_MATRIX24_ARB 0x88D8 -#define GL_MATRIX25_ARB 0x88D9 -#define GL_MATRIX26_ARB 0x88DA -#define GL_MATRIX27_ARB 0x88DB -#define GL_MATRIX28_ARB 0x88DC -#define GL_MATRIX29_ARB 0x88DD -#define GL_MATRIX30_ARB 0x88DE -#define GL_MATRIX31_ARB 0x88DF - -typedef void (GLAPIENTRY * PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program); -typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint* programs); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint* programs); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void *string); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, void** pointer); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMARBPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void *string); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); - -#define glBindProgramARB GLEW_GET_FUN(__glewBindProgramARB) -#define glDeleteProgramsARB GLEW_GET_FUN(__glewDeleteProgramsARB) -#define glDisableVertexAttribArrayARB GLEW_GET_FUN(__glewDisableVertexAttribArrayARB) -#define glEnableVertexAttribArrayARB GLEW_GET_FUN(__glewEnableVertexAttribArrayARB) -#define glGenProgramsARB GLEW_GET_FUN(__glewGenProgramsARB) -#define glGetProgramEnvParameterdvARB GLEW_GET_FUN(__glewGetProgramEnvParameterdvARB) -#define glGetProgramEnvParameterfvARB GLEW_GET_FUN(__glewGetProgramEnvParameterfvARB) -#define glGetProgramLocalParameterdvARB GLEW_GET_FUN(__glewGetProgramLocalParameterdvARB) -#define glGetProgramLocalParameterfvARB GLEW_GET_FUN(__glewGetProgramLocalParameterfvARB) -#define glGetProgramStringARB GLEW_GET_FUN(__glewGetProgramStringARB) -#define glGetProgramivARB GLEW_GET_FUN(__glewGetProgramivARB) -#define glGetVertexAttribPointervARB GLEW_GET_FUN(__glewGetVertexAttribPointervARB) -#define glGetVertexAttribdvARB GLEW_GET_FUN(__glewGetVertexAttribdvARB) -#define glGetVertexAttribfvARB GLEW_GET_FUN(__glewGetVertexAttribfvARB) -#define glGetVertexAttribivARB GLEW_GET_FUN(__glewGetVertexAttribivARB) -#define glIsProgramARB GLEW_GET_FUN(__glewIsProgramARB) -#define glProgramEnvParameter4dARB GLEW_GET_FUN(__glewProgramEnvParameter4dARB) -#define glProgramEnvParameter4dvARB GLEW_GET_FUN(__glewProgramEnvParameter4dvARB) -#define glProgramEnvParameter4fARB GLEW_GET_FUN(__glewProgramEnvParameter4fARB) -#define glProgramEnvParameter4fvARB GLEW_GET_FUN(__glewProgramEnvParameter4fvARB) -#define glProgramLocalParameter4dARB GLEW_GET_FUN(__glewProgramLocalParameter4dARB) -#define glProgramLocalParameter4dvARB GLEW_GET_FUN(__glewProgramLocalParameter4dvARB) -#define glProgramLocalParameter4fARB GLEW_GET_FUN(__glewProgramLocalParameter4fARB) -#define glProgramLocalParameter4fvARB GLEW_GET_FUN(__glewProgramLocalParameter4fvARB) -#define glProgramStringARB GLEW_GET_FUN(__glewProgramStringARB) -#define glVertexAttrib1dARB GLEW_GET_FUN(__glewVertexAttrib1dARB) -#define glVertexAttrib1dvARB GLEW_GET_FUN(__glewVertexAttrib1dvARB) -#define glVertexAttrib1fARB GLEW_GET_FUN(__glewVertexAttrib1fARB) -#define glVertexAttrib1fvARB GLEW_GET_FUN(__glewVertexAttrib1fvARB) -#define glVertexAttrib1sARB GLEW_GET_FUN(__glewVertexAttrib1sARB) -#define glVertexAttrib1svARB GLEW_GET_FUN(__glewVertexAttrib1svARB) -#define glVertexAttrib2dARB GLEW_GET_FUN(__glewVertexAttrib2dARB) -#define glVertexAttrib2dvARB GLEW_GET_FUN(__glewVertexAttrib2dvARB) -#define glVertexAttrib2fARB GLEW_GET_FUN(__glewVertexAttrib2fARB) -#define glVertexAttrib2fvARB GLEW_GET_FUN(__glewVertexAttrib2fvARB) -#define glVertexAttrib2sARB GLEW_GET_FUN(__glewVertexAttrib2sARB) -#define glVertexAttrib2svARB GLEW_GET_FUN(__glewVertexAttrib2svARB) -#define glVertexAttrib3dARB GLEW_GET_FUN(__glewVertexAttrib3dARB) -#define glVertexAttrib3dvARB GLEW_GET_FUN(__glewVertexAttrib3dvARB) -#define glVertexAttrib3fARB GLEW_GET_FUN(__glewVertexAttrib3fARB) -#define glVertexAttrib3fvARB GLEW_GET_FUN(__glewVertexAttrib3fvARB) -#define glVertexAttrib3sARB GLEW_GET_FUN(__glewVertexAttrib3sARB) -#define glVertexAttrib3svARB GLEW_GET_FUN(__glewVertexAttrib3svARB) -#define glVertexAttrib4NbvARB GLEW_GET_FUN(__glewVertexAttrib4NbvARB) -#define glVertexAttrib4NivARB GLEW_GET_FUN(__glewVertexAttrib4NivARB) -#define glVertexAttrib4NsvARB GLEW_GET_FUN(__glewVertexAttrib4NsvARB) -#define glVertexAttrib4NubARB GLEW_GET_FUN(__glewVertexAttrib4NubARB) -#define glVertexAttrib4NubvARB GLEW_GET_FUN(__glewVertexAttrib4NubvARB) -#define glVertexAttrib4NuivARB GLEW_GET_FUN(__glewVertexAttrib4NuivARB) -#define glVertexAttrib4NusvARB GLEW_GET_FUN(__glewVertexAttrib4NusvARB) -#define glVertexAttrib4bvARB GLEW_GET_FUN(__glewVertexAttrib4bvARB) -#define glVertexAttrib4dARB GLEW_GET_FUN(__glewVertexAttrib4dARB) -#define glVertexAttrib4dvARB GLEW_GET_FUN(__glewVertexAttrib4dvARB) -#define glVertexAttrib4fARB GLEW_GET_FUN(__glewVertexAttrib4fARB) -#define glVertexAttrib4fvARB GLEW_GET_FUN(__glewVertexAttrib4fvARB) -#define glVertexAttrib4ivARB GLEW_GET_FUN(__glewVertexAttrib4ivARB) -#define glVertexAttrib4sARB GLEW_GET_FUN(__glewVertexAttrib4sARB) -#define glVertexAttrib4svARB GLEW_GET_FUN(__glewVertexAttrib4svARB) -#define glVertexAttrib4ubvARB GLEW_GET_FUN(__glewVertexAttrib4ubvARB) -#define glVertexAttrib4uivARB GLEW_GET_FUN(__glewVertexAttrib4uivARB) -#define glVertexAttrib4usvARB GLEW_GET_FUN(__glewVertexAttrib4usvARB) -#define glVertexAttribPointerARB GLEW_GET_FUN(__glewVertexAttribPointerARB) - -#define GLEW_ARB_vertex_program GLEW_GET_VAR(__GLEW_ARB_vertex_program) - -#endif /* GL_ARB_vertex_program */ - -/* -------------------------- GL_ARB_vertex_shader ------------------------- */ - -#ifndef GL_ARB_vertex_shader -#define GL_ARB_vertex_shader 1 - -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D -#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 -#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A - -typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB* name); -typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name); -typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name); - -#define glBindAttribLocationARB GLEW_GET_FUN(__glewBindAttribLocationARB) -#define glGetActiveAttribARB GLEW_GET_FUN(__glewGetActiveAttribARB) -#define glGetAttribLocationARB GLEW_GET_FUN(__glewGetAttribLocationARB) - -#define GLEW_ARB_vertex_shader GLEW_GET_VAR(__GLEW_ARB_vertex_shader) - -#endif /* GL_ARB_vertex_shader */ - -/* ------------------- GL_ARB_vertex_type_10f_11f_11f_rev ------------------ */ - -#ifndef GL_ARB_vertex_type_10f_11f_11f_rev -#define GL_ARB_vertex_type_10f_11f_11f_rev 1 - -#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B - -#define GLEW_ARB_vertex_type_10f_11f_11f_rev GLEW_GET_VAR(__GLEW_ARB_vertex_type_10f_11f_11f_rev) - -#endif /* GL_ARB_vertex_type_10f_11f_11f_rev */ - -/* ------------------- GL_ARB_vertex_type_2_10_10_10_rev ------------------- */ - -#ifndef GL_ARB_vertex_type_2_10_10_10_rev -#define GL_ARB_vertex_type_2_10_10_10_rev 1 - -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_INT_2_10_10_10_REV 0x8D9F - -typedef void (GLAPIENTRY * PFNGLCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (GLAPIENTRY * PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint* color); -typedef void (GLAPIENTRY * PFNGLCOLORP4UIPROC) (GLenum type, GLuint color); -typedef void (GLAPIENTRY * PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint* color); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint* color); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint* value); - -#define glColorP3ui GLEW_GET_FUN(__glewColorP3ui) -#define glColorP3uiv GLEW_GET_FUN(__glewColorP3uiv) -#define glColorP4ui GLEW_GET_FUN(__glewColorP4ui) -#define glColorP4uiv GLEW_GET_FUN(__glewColorP4uiv) -#define glMultiTexCoordP1ui GLEW_GET_FUN(__glewMultiTexCoordP1ui) -#define glMultiTexCoordP1uiv GLEW_GET_FUN(__glewMultiTexCoordP1uiv) -#define glMultiTexCoordP2ui GLEW_GET_FUN(__glewMultiTexCoordP2ui) -#define glMultiTexCoordP2uiv GLEW_GET_FUN(__glewMultiTexCoordP2uiv) -#define glMultiTexCoordP3ui GLEW_GET_FUN(__glewMultiTexCoordP3ui) -#define glMultiTexCoordP3uiv GLEW_GET_FUN(__glewMultiTexCoordP3uiv) -#define glMultiTexCoordP4ui GLEW_GET_FUN(__glewMultiTexCoordP4ui) -#define glMultiTexCoordP4uiv GLEW_GET_FUN(__glewMultiTexCoordP4uiv) -#define glNormalP3ui GLEW_GET_FUN(__glewNormalP3ui) -#define glNormalP3uiv GLEW_GET_FUN(__glewNormalP3uiv) -#define glSecondaryColorP3ui GLEW_GET_FUN(__glewSecondaryColorP3ui) -#define glSecondaryColorP3uiv GLEW_GET_FUN(__glewSecondaryColorP3uiv) -#define glTexCoordP1ui GLEW_GET_FUN(__glewTexCoordP1ui) -#define glTexCoordP1uiv GLEW_GET_FUN(__glewTexCoordP1uiv) -#define glTexCoordP2ui GLEW_GET_FUN(__glewTexCoordP2ui) -#define glTexCoordP2uiv GLEW_GET_FUN(__glewTexCoordP2uiv) -#define glTexCoordP3ui GLEW_GET_FUN(__glewTexCoordP3ui) -#define glTexCoordP3uiv GLEW_GET_FUN(__glewTexCoordP3uiv) -#define glTexCoordP4ui GLEW_GET_FUN(__glewTexCoordP4ui) -#define glTexCoordP4uiv GLEW_GET_FUN(__glewTexCoordP4uiv) -#define glVertexAttribP1ui GLEW_GET_FUN(__glewVertexAttribP1ui) -#define glVertexAttribP1uiv GLEW_GET_FUN(__glewVertexAttribP1uiv) -#define glVertexAttribP2ui GLEW_GET_FUN(__glewVertexAttribP2ui) -#define glVertexAttribP2uiv GLEW_GET_FUN(__glewVertexAttribP2uiv) -#define glVertexAttribP3ui GLEW_GET_FUN(__glewVertexAttribP3ui) -#define glVertexAttribP3uiv GLEW_GET_FUN(__glewVertexAttribP3uiv) -#define glVertexAttribP4ui GLEW_GET_FUN(__glewVertexAttribP4ui) -#define glVertexAttribP4uiv GLEW_GET_FUN(__glewVertexAttribP4uiv) -#define glVertexP2ui GLEW_GET_FUN(__glewVertexP2ui) -#define glVertexP2uiv GLEW_GET_FUN(__glewVertexP2uiv) -#define glVertexP3ui GLEW_GET_FUN(__glewVertexP3ui) -#define glVertexP3uiv GLEW_GET_FUN(__glewVertexP3uiv) -#define glVertexP4ui GLEW_GET_FUN(__glewVertexP4ui) -#define glVertexP4uiv GLEW_GET_FUN(__glewVertexP4uiv) - -#define GLEW_ARB_vertex_type_2_10_10_10_rev GLEW_GET_VAR(__GLEW_ARB_vertex_type_2_10_10_10_rev) - -#endif /* GL_ARB_vertex_type_2_10_10_10_rev */ - -/* ------------------------- GL_ARB_viewport_array ------------------------- */ - -#ifndef GL_ARB_viewport_array -#define GL_ARB_viewport_array 1 - -#define GL_DEPTH_RANGE 0x0B70 -#define GL_VIEWPORT 0x0BA2 -#define GL_SCISSOR_BOX 0x0C10 -#define GL_SCISSOR_TEST 0x0C11 -#define GL_MAX_VIEWPORTS 0x825B -#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C -#define GL_VIEWPORT_BOUNDS_RANGE 0x825D -#define GL_LAYER_PROVOKING_VERTEX 0x825E -#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F -#define GL_UNDEFINED_VERTEX 0x8260 -#define GL_FIRST_VERTEX_CONVENTION 0x8E4D -#define GL_LAST_VERTEX_CONVENTION 0x8E4E -#define GL_PROVOKING_VERTEX 0x8E4F - -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd * v); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f); -typedef void (GLAPIENTRY * PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble* data); -typedef void (GLAPIENTRY * PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat* data); -typedef void (GLAPIENTRY * PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint * v); -typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint * v); -typedef void (GLAPIENTRY * PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat * v); -typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); -typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat * v); - -#define glDepthRangeArrayv GLEW_GET_FUN(__glewDepthRangeArrayv) -#define glDepthRangeIndexed GLEW_GET_FUN(__glewDepthRangeIndexed) -#define glGetDoublei_v GLEW_GET_FUN(__glewGetDoublei_v) -#define glGetFloati_v GLEW_GET_FUN(__glewGetFloati_v) -#define glScissorArrayv GLEW_GET_FUN(__glewScissorArrayv) -#define glScissorIndexed GLEW_GET_FUN(__glewScissorIndexed) -#define glScissorIndexedv GLEW_GET_FUN(__glewScissorIndexedv) -#define glViewportArrayv GLEW_GET_FUN(__glewViewportArrayv) -#define glViewportIndexedf GLEW_GET_FUN(__glewViewportIndexedf) -#define glViewportIndexedfv GLEW_GET_FUN(__glewViewportIndexedfv) - -#define GLEW_ARB_viewport_array GLEW_GET_VAR(__GLEW_ARB_viewport_array) - -#endif /* GL_ARB_viewport_array */ - -/* --------------------------- GL_ARB_window_pos --------------------------- */ - -#ifndef GL_ARB_window_pos -#define GL_ARB_window_pos 1 - -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVARBPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVARBPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVARBPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVARBPROC) (const GLshort* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVARBPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVARBPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVARBPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVARBPROC) (const GLshort* p); - -#define glWindowPos2dARB GLEW_GET_FUN(__glewWindowPos2dARB) -#define glWindowPos2dvARB GLEW_GET_FUN(__glewWindowPos2dvARB) -#define glWindowPos2fARB GLEW_GET_FUN(__glewWindowPos2fARB) -#define glWindowPos2fvARB GLEW_GET_FUN(__glewWindowPos2fvARB) -#define glWindowPos2iARB GLEW_GET_FUN(__glewWindowPos2iARB) -#define glWindowPos2ivARB GLEW_GET_FUN(__glewWindowPos2ivARB) -#define glWindowPos2sARB GLEW_GET_FUN(__glewWindowPos2sARB) -#define glWindowPos2svARB GLEW_GET_FUN(__glewWindowPos2svARB) -#define glWindowPos3dARB GLEW_GET_FUN(__glewWindowPos3dARB) -#define glWindowPos3dvARB GLEW_GET_FUN(__glewWindowPos3dvARB) -#define glWindowPos3fARB GLEW_GET_FUN(__glewWindowPos3fARB) -#define glWindowPos3fvARB GLEW_GET_FUN(__glewWindowPos3fvARB) -#define glWindowPos3iARB GLEW_GET_FUN(__glewWindowPos3iARB) -#define glWindowPos3ivARB GLEW_GET_FUN(__glewWindowPos3ivARB) -#define glWindowPos3sARB GLEW_GET_FUN(__glewWindowPos3sARB) -#define glWindowPos3svARB GLEW_GET_FUN(__glewWindowPos3svARB) - -#define GLEW_ARB_window_pos GLEW_GET_VAR(__GLEW_ARB_window_pos) - -#endif /* GL_ARB_window_pos */ - -/* ------------------------- GL_ATIX_point_sprites ------------------------- */ - -#ifndef GL_ATIX_point_sprites -#define GL_ATIX_point_sprites 1 - -#define GL_TEXTURE_POINT_MODE_ATIX 0x60B0 -#define GL_TEXTURE_POINT_ONE_COORD_ATIX 0x60B1 -#define GL_TEXTURE_POINT_SPRITE_ATIX 0x60B2 -#define GL_POINT_SPRITE_CULL_MODE_ATIX 0x60B3 -#define GL_POINT_SPRITE_CULL_CENTER_ATIX 0x60B4 -#define GL_POINT_SPRITE_CULL_CLIP_ATIX 0x60B5 - -#define GLEW_ATIX_point_sprites GLEW_GET_VAR(__GLEW_ATIX_point_sprites) - -#endif /* GL_ATIX_point_sprites */ - -/* ---------------------- GL_ATIX_texture_env_combine3 --------------------- */ - -#ifndef GL_ATIX_texture_env_combine3 -#define GL_ATIX_texture_env_combine3 1 - -#define GL_MODULATE_ADD_ATIX 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATIX 0x8745 -#define GL_MODULATE_SUBTRACT_ATIX 0x8746 - -#define GLEW_ATIX_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATIX_texture_env_combine3) - -#endif /* GL_ATIX_texture_env_combine3 */ - -/* ----------------------- GL_ATIX_texture_env_route ----------------------- */ - -#ifndef GL_ATIX_texture_env_route -#define GL_ATIX_texture_env_route 1 - -#define GL_SECONDARY_COLOR_ATIX 0x8747 -#define GL_TEXTURE_OUTPUT_RGB_ATIX 0x8748 -#define GL_TEXTURE_OUTPUT_ALPHA_ATIX 0x8749 - -#define GLEW_ATIX_texture_env_route GLEW_GET_VAR(__GLEW_ATIX_texture_env_route) - -#endif /* GL_ATIX_texture_env_route */ - -/* ---------------- GL_ATIX_vertex_shader_output_point_size ---------------- */ - -#ifndef GL_ATIX_vertex_shader_output_point_size -#define GL_ATIX_vertex_shader_output_point_size 1 - -#define GL_OUTPUT_POINT_SIZE_ATIX 0x610E - -#define GLEW_ATIX_vertex_shader_output_point_size GLEW_GET_VAR(__GLEW_ATIX_vertex_shader_output_point_size) - -#endif /* GL_ATIX_vertex_shader_output_point_size */ - -/* -------------------------- GL_ATI_draw_buffers -------------------------- */ - -#ifndef GL_ATI_draw_buffers -#define GL_ATI_draw_buffers 1 - -#define GL_MAX_DRAW_BUFFERS_ATI 0x8824 -#define GL_DRAW_BUFFER0_ATI 0x8825 -#define GL_DRAW_BUFFER1_ATI 0x8826 -#define GL_DRAW_BUFFER2_ATI 0x8827 -#define GL_DRAW_BUFFER3_ATI 0x8828 -#define GL_DRAW_BUFFER4_ATI 0x8829 -#define GL_DRAW_BUFFER5_ATI 0x882A -#define GL_DRAW_BUFFER6_ATI 0x882B -#define GL_DRAW_BUFFER7_ATI 0x882C -#define GL_DRAW_BUFFER8_ATI 0x882D -#define GL_DRAW_BUFFER9_ATI 0x882E -#define GL_DRAW_BUFFER10_ATI 0x882F -#define GL_DRAW_BUFFER11_ATI 0x8830 -#define GL_DRAW_BUFFER12_ATI 0x8831 -#define GL_DRAW_BUFFER13_ATI 0x8832 -#define GL_DRAW_BUFFER14_ATI 0x8833 -#define GL_DRAW_BUFFER15_ATI 0x8834 - -typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum* bufs); - -#define glDrawBuffersATI GLEW_GET_FUN(__glewDrawBuffersATI) - -#define GLEW_ATI_draw_buffers GLEW_GET_VAR(__GLEW_ATI_draw_buffers) - -#endif /* GL_ATI_draw_buffers */ - -/* -------------------------- GL_ATI_element_array ------------------------- */ - -#ifndef GL_ATI_element_array -#define GL_ATI_element_array 1 - -#define GL_ELEMENT_ARRAY_ATI 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A - -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count); -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count); -typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERATIPROC) (GLenum type, const void *pointer); - -#define glDrawElementArrayATI GLEW_GET_FUN(__glewDrawElementArrayATI) -#define glDrawRangeElementArrayATI GLEW_GET_FUN(__glewDrawRangeElementArrayATI) -#define glElementPointerATI GLEW_GET_FUN(__glewElementPointerATI) - -#define GLEW_ATI_element_array GLEW_GET_VAR(__GLEW_ATI_element_array) - -#endif /* GL_ATI_element_array */ - -/* ------------------------- GL_ATI_envmap_bumpmap ------------------------- */ - -#ifndef GL_ATI_envmap_bumpmap -#define GL_ATI_envmap_bumpmap 1 - -#define GL_BUMP_ROT_MATRIX_ATI 0x8775 -#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 -#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 -#define GL_BUMP_TEX_UNITS_ATI 0x8778 -#define GL_DUDV_ATI 0x8779 -#define GL_DU8DV8_ATI 0x877A -#define GL_BUMP_ENVMAP_ATI 0x877B -#define GL_BUMP_TARGET_ATI 0x877C - -typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); -typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); -typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); -typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); - -#define glGetTexBumpParameterfvATI GLEW_GET_FUN(__glewGetTexBumpParameterfvATI) -#define glGetTexBumpParameterivATI GLEW_GET_FUN(__glewGetTexBumpParameterivATI) -#define glTexBumpParameterfvATI GLEW_GET_FUN(__glewTexBumpParameterfvATI) -#define glTexBumpParameterivATI GLEW_GET_FUN(__glewTexBumpParameterivATI) - -#define GLEW_ATI_envmap_bumpmap GLEW_GET_VAR(__GLEW_ATI_envmap_bumpmap) - -#endif /* GL_ATI_envmap_bumpmap */ - -/* ------------------------- GL_ATI_fragment_shader ------------------------ */ - -#ifndef GL_ATI_fragment_shader -#define GL_ATI_fragment_shader 1 - -#define GL_2X_BIT_ATI 0x00000001 -#define GL_RED_BIT_ATI 0x00000001 -#define GL_4X_BIT_ATI 0x00000002 -#define GL_COMP_BIT_ATI 0x00000002 -#define GL_GREEN_BIT_ATI 0x00000002 -#define GL_8X_BIT_ATI 0x00000004 -#define GL_BLUE_BIT_ATI 0x00000004 -#define GL_NEGATE_BIT_ATI 0x00000004 -#define GL_BIAS_BIT_ATI 0x00000008 -#define GL_HALF_BIT_ATI 0x00000008 -#define GL_QUARTER_BIT_ATI 0x00000010 -#define GL_EIGHTH_BIT_ATI 0x00000020 -#define GL_SATURATE_BIT_ATI 0x00000040 -#define GL_FRAGMENT_SHADER_ATI 0x8920 -#define GL_REG_0_ATI 0x8921 -#define GL_REG_1_ATI 0x8922 -#define GL_REG_2_ATI 0x8923 -#define GL_REG_3_ATI 0x8924 -#define GL_REG_4_ATI 0x8925 -#define GL_REG_5_ATI 0x8926 -#define GL_CON_0_ATI 0x8941 -#define GL_CON_1_ATI 0x8942 -#define GL_CON_2_ATI 0x8943 -#define GL_CON_3_ATI 0x8944 -#define GL_CON_4_ATI 0x8945 -#define GL_CON_5_ATI 0x8946 -#define GL_CON_6_ATI 0x8947 -#define GL_CON_7_ATI 0x8948 -#define GL_MOV_ATI 0x8961 -#define GL_ADD_ATI 0x8963 -#define GL_MUL_ATI 0x8964 -#define GL_SUB_ATI 0x8965 -#define GL_DOT3_ATI 0x8966 -#define GL_DOT4_ATI 0x8967 -#define GL_MAD_ATI 0x8968 -#define GL_LERP_ATI 0x8969 -#define GL_CND_ATI 0x896A -#define GL_CND0_ATI 0x896B -#define GL_DOT2_ADD_ATI 0x896C -#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D -#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E -#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F -#define GL_NUM_PASSES_ATI 0x8970 -#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971 -#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972 -#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973 -#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974 -#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 -#define GL_SWIZZLE_STR_ATI 0x8976 -#define GL_SWIZZLE_STQ_ATI 0x8977 -#define GL_SWIZZLE_STR_DR_ATI 0x8978 -#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 -#define GL_SWIZZLE_STRQ_ATI 0x897A -#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B - -typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (GLAPIENTRY * PFNGLBEGINFRAGMENTSHADERATIPROC) (void); -typedef void (GLAPIENTRY * PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (GLAPIENTRY * PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLENDFRAGMENTSHADERATIPROC) (void); -typedef GLuint (GLAPIENTRY * PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range); -typedef void (GLAPIENTRY * PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle); -typedef void (GLAPIENTRY * PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle); -typedef void (GLAPIENTRY * PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat* value); - -#define glAlphaFragmentOp1ATI GLEW_GET_FUN(__glewAlphaFragmentOp1ATI) -#define glAlphaFragmentOp2ATI GLEW_GET_FUN(__glewAlphaFragmentOp2ATI) -#define glAlphaFragmentOp3ATI GLEW_GET_FUN(__glewAlphaFragmentOp3ATI) -#define glBeginFragmentShaderATI GLEW_GET_FUN(__glewBeginFragmentShaderATI) -#define glBindFragmentShaderATI GLEW_GET_FUN(__glewBindFragmentShaderATI) -#define glColorFragmentOp1ATI GLEW_GET_FUN(__glewColorFragmentOp1ATI) -#define glColorFragmentOp2ATI GLEW_GET_FUN(__glewColorFragmentOp2ATI) -#define glColorFragmentOp3ATI GLEW_GET_FUN(__glewColorFragmentOp3ATI) -#define glDeleteFragmentShaderATI GLEW_GET_FUN(__glewDeleteFragmentShaderATI) -#define glEndFragmentShaderATI GLEW_GET_FUN(__glewEndFragmentShaderATI) -#define glGenFragmentShadersATI GLEW_GET_FUN(__glewGenFragmentShadersATI) -#define glPassTexCoordATI GLEW_GET_FUN(__glewPassTexCoordATI) -#define glSampleMapATI GLEW_GET_FUN(__glewSampleMapATI) -#define glSetFragmentShaderConstantATI GLEW_GET_FUN(__glewSetFragmentShaderConstantATI) - -#define GLEW_ATI_fragment_shader GLEW_GET_VAR(__GLEW_ATI_fragment_shader) - -#endif /* GL_ATI_fragment_shader */ - -/* ------------------------ GL_ATI_map_object_buffer ----------------------- */ - -#ifndef GL_ATI_map_object_buffer -#define GL_ATI_map_object_buffer 1 - -typedef void * (GLAPIENTRY * PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer); - -#define glMapObjectBufferATI GLEW_GET_FUN(__glewMapObjectBufferATI) -#define glUnmapObjectBufferATI GLEW_GET_FUN(__glewUnmapObjectBufferATI) - -#define GLEW_ATI_map_object_buffer GLEW_GET_VAR(__GLEW_ATI_map_object_buffer) - -#endif /* GL_ATI_map_object_buffer */ - -/* ----------------------------- GL_ATI_meminfo ---------------------------- */ - -#ifndef GL_ATI_meminfo -#define GL_ATI_meminfo 1 - -#define GL_VBO_FREE_MEMORY_ATI 0x87FB -#define GL_TEXTURE_FREE_MEMORY_ATI 0x87FC -#define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD - -#define GLEW_ATI_meminfo GLEW_GET_VAR(__GLEW_ATI_meminfo) - -#endif /* GL_ATI_meminfo */ - -/* -------------------------- GL_ATI_pn_triangles -------------------------- */ - -#ifndef GL_ATI_pn_triangles -#define GL_ATI_pn_triangles 1 - -#define GL_PN_TRIANGLES_ATI 0x87F0 -#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 -#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 -#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 -#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4 -#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5 -#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6 -#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 -#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8 - -typedef void (GLAPIENTRY * PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param); - -#define glPNTrianglesfATI GLEW_GET_FUN(__glewPNTrianglesfATI) -#define glPNTrianglesiATI GLEW_GET_FUN(__glewPNTrianglesiATI) - -#define GLEW_ATI_pn_triangles GLEW_GET_VAR(__GLEW_ATI_pn_triangles) - -#endif /* GL_ATI_pn_triangles */ - -/* ------------------------ GL_ATI_separate_stencil ------------------------ */ - -#ifndef GL_ATI_separate_stencil -#define GL_ATI_separate_stencil 1 - -#define GL_STENCIL_BACK_FUNC_ATI 0x8800 -#define GL_STENCIL_BACK_FAIL_ATI 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 - -typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); - -#define glStencilFuncSeparateATI GLEW_GET_FUN(__glewStencilFuncSeparateATI) -#define glStencilOpSeparateATI GLEW_GET_FUN(__glewStencilOpSeparateATI) - -#define GLEW_ATI_separate_stencil GLEW_GET_VAR(__GLEW_ATI_separate_stencil) - -#endif /* GL_ATI_separate_stencil */ - -/* ----------------------- GL_ATI_shader_texture_lod ----------------------- */ - -#ifndef GL_ATI_shader_texture_lod -#define GL_ATI_shader_texture_lod 1 - -#define GLEW_ATI_shader_texture_lod GLEW_GET_VAR(__GLEW_ATI_shader_texture_lod) - -#endif /* GL_ATI_shader_texture_lod */ - -/* ---------------------- GL_ATI_text_fragment_shader ---------------------- */ - -#ifndef GL_ATI_text_fragment_shader -#define GL_ATI_text_fragment_shader 1 - -#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 - -#define GLEW_ATI_text_fragment_shader GLEW_GET_VAR(__GLEW_ATI_text_fragment_shader) - -#endif /* GL_ATI_text_fragment_shader */ - -/* --------------------- GL_ATI_texture_compression_3dc -------------------- */ - -#ifndef GL_ATI_texture_compression_3dc -#define GL_ATI_texture_compression_3dc 1 - -#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 - -#define GLEW_ATI_texture_compression_3dc GLEW_GET_VAR(__GLEW_ATI_texture_compression_3dc) - -#endif /* GL_ATI_texture_compression_3dc */ - -/* ---------------------- GL_ATI_texture_env_combine3 ---------------------- */ - -#ifndef GL_ATI_texture_env_combine3 -#define GL_ATI_texture_env_combine3 1 - -#define GL_MODULATE_ADD_ATI 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 -#define GL_MODULATE_SUBTRACT_ATI 0x8746 - -#define GLEW_ATI_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATI_texture_env_combine3) - -#endif /* GL_ATI_texture_env_combine3 */ - -/* -------------------------- GL_ATI_texture_float ------------------------- */ - -#ifndef GL_ATI_texture_float -#define GL_ATI_texture_float 1 - -#define GL_RGBA_FLOAT32_ATI 0x8814 -#define GL_RGB_FLOAT32_ATI 0x8815 -#define GL_ALPHA_FLOAT32_ATI 0x8816 -#define GL_INTENSITY_FLOAT32_ATI 0x8817 -#define GL_LUMINANCE_FLOAT32_ATI 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819 -#define GL_RGBA_FLOAT16_ATI 0x881A -#define GL_RGB_FLOAT16_ATI 0x881B -#define GL_ALPHA_FLOAT16_ATI 0x881C -#define GL_INTENSITY_FLOAT16_ATI 0x881D -#define GL_LUMINANCE_FLOAT16_ATI 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F - -#define GLEW_ATI_texture_float GLEW_GET_VAR(__GLEW_ATI_texture_float) - -#endif /* GL_ATI_texture_float */ - -/* ----------------------- GL_ATI_texture_mirror_once ---------------------- */ - -#ifndef GL_ATI_texture_mirror_once -#define GL_ATI_texture_mirror_once 1 - -#define GL_MIRROR_CLAMP_ATI 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 - -#define GLEW_ATI_texture_mirror_once GLEW_GET_VAR(__GLEW_ATI_texture_mirror_once) - -#endif /* GL_ATI_texture_mirror_once */ - -/* ----------------------- GL_ATI_vertex_array_object ---------------------- */ - -#ifndef GL_ATI_vertex_array_object -#define GL_ATI_vertex_array_object 1 - -#define GL_STATIC_ATI 0x8760 -#define GL_DYNAMIC_ATI 0x8761 -#define GL_PRESERVE_ATI 0x8762 -#define GL_DISCARD_ATI 0x8763 -#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764 -#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765 -#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766 -#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767 - -typedef void (GLAPIENTRY * PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (GLAPIENTRY * PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer); -typedef GLuint (GLAPIENTRY * PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const void *pointer, GLenum usage); -typedef void (GLAPIENTRY * PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve); -typedef void (GLAPIENTRY * PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); - -#define glArrayObjectATI GLEW_GET_FUN(__glewArrayObjectATI) -#define glFreeObjectBufferATI GLEW_GET_FUN(__glewFreeObjectBufferATI) -#define glGetArrayObjectfvATI GLEW_GET_FUN(__glewGetArrayObjectfvATI) -#define glGetArrayObjectivATI GLEW_GET_FUN(__glewGetArrayObjectivATI) -#define glGetObjectBufferfvATI GLEW_GET_FUN(__glewGetObjectBufferfvATI) -#define glGetObjectBufferivATI GLEW_GET_FUN(__glewGetObjectBufferivATI) -#define glGetVariantArrayObjectfvATI GLEW_GET_FUN(__glewGetVariantArrayObjectfvATI) -#define glGetVariantArrayObjectivATI GLEW_GET_FUN(__glewGetVariantArrayObjectivATI) -#define glIsObjectBufferATI GLEW_GET_FUN(__glewIsObjectBufferATI) -#define glNewObjectBufferATI GLEW_GET_FUN(__glewNewObjectBufferATI) -#define glUpdateObjectBufferATI GLEW_GET_FUN(__glewUpdateObjectBufferATI) -#define glVariantArrayObjectATI GLEW_GET_FUN(__glewVariantArrayObjectATI) - -#define GLEW_ATI_vertex_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_array_object) - -#endif /* GL_ATI_vertex_array_object */ - -/* ------------------- GL_ATI_vertex_attrib_array_object ------------------- */ - -#ifndef GL_ATI_vertex_attrib_array_object -#define GL_ATI_vertex_attrib_array_object 1 - -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); - -#define glGetVertexAttribArrayObjectfvATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectfvATI) -#define glGetVertexAttribArrayObjectivATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectivATI) -#define glVertexAttribArrayObjectATI GLEW_GET_FUN(__glewVertexAttribArrayObjectATI) - -#define GLEW_ATI_vertex_attrib_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_attrib_array_object) - -#endif /* GL_ATI_vertex_attrib_array_object */ - -/* ------------------------- GL_ATI_vertex_streams ------------------------- */ - -#ifndef GL_ATI_vertex_streams -#define GL_ATI_vertex_streams 1 - -#define GL_MAX_VERTEX_STREAMS_ATI 0x876B -#define GL_VERTEX_SOURCE_ATI 0x876C -#define GL_VERTEX_STREAM0_ATI 0x876D -#define GL_VERTEX_STREAM1_ATI 0x876E -#define GL_VERTEX_STREAM2_ATI 0x876F -#define GL_VERTEX_STREAM3_ATI 0x8770 -#define GL_VERTEX_STREAM4_ATI 0x8771 -#define GL_VERTEX_STREAM5_ATI 0x8772 -#define GL_VERTEX_STREAM6_ATI 0x8773 -#define GL_VERTEX_STREAM7_ATI 0x8774 - -typedef void (GLAPIENTRY * PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte x, GLbyte y, GLbyte z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords); - -#define glClientActiveVertexStreamATI GLEW_GET_FUN(__glewClientActiveVertexStreamATI) -#define glNormalStream3bATI GLEW_GET_FUN(__glewNormalStream3bATI) -#define glNormalStream3bvATI GLEW_GET_FUN(__glewNormalStream3bvATI) -#define glNormalStream3dATI GLEW_GET_FUN(__glewNormalStream3dATI) -#define glNormalStream3dvATI GLEW_GET_FUN(__glewNormalStream3dvATI) -#define glNormalStream3fATI GLEW_GET_FUN(__glewNormalStream3fATI) -#define glNormalStream3fvATI GLEW_GET_FUN(__glewNormalStream3fvATI) -#define glNormalStream3iATI GLEW_GET_FUN(__glewNormalStream3iATI) -#define glNormalStream3ivATI GLEW_GET_FUN(__glewNormalStream3ivATI) -#define glNormalStream3sATI GLEW_GET_FUN(__glewNormalStream3sATI) -#define glNormalStream3svATI GLEW_GET_FUN(__glewNormalStream3svATI) -#define glVertexBlendEnvfATI GLEW_GET_FUN(__glewVertexBlendEnvfATI) -#define glVertexBlendEnviATI GLEW_GET_FUN(__glewVertexBlendEnviATI) -#define glVertexStream1dATI GLEW_GET_FUN(__glewVertexStream1dATI) -#define glVertexStream1dvATI GLEW_GET_FUN(__glewVertexStream1dvATI) -#define glVertexStream1fATI GLEW_GET_FUN(__glewVertexStream1fATI) -#define glVertexStream1fvATI GLEW_GET_FUN(__glewVertexStream1fvATI) -#define glVertexStream1iATI GLEW_GET_FUN(__glewVertexStream1iATI) -#define glVertexStream1ivATI GLEW_GET_FUN(__glewVertexStream1ivATI) -#define glVertexStream1sATI GLEW_GET_FUN(__glewVertexStream1sATI) -#define glVertexStream1svATI GLEW_GET_FUN(__glewVertexStream1svATI) -#define glVertexStream2dATI GLEW_GET_FUN(__glewVertexStream2dATI) -#define glVertexStream2dvATI GLEW_GET_FUN(__glewVertexStream2dvATI) -#define glVertexStream2fATI GLEW_GET_FUN(__glewVertexStream2fATI) -#define glVertexStream2fvATI GLEW_GET_FUN(__glewVertexStream2fvATI) -#define glVertexStream2iATI GLEW_GET_FUN(__glewVertexStream2iATI) -#define glVertexStream2ivATI GLEW_GET_FUN(__glewVertexStream2ivATI) -#define glVertexStream2sATI GLEW_GET_FUN(__glewVertexStream2sATI) -#define glVertexStream2svATI GLEW_GET_FUN(__glewVertexStream2svATI) -#define glVertexStream3dATI GLEW_GET_FUN(__glewVertexStream3dATI) -#define glVertexStream3dvATI GLEW_GET_FUN(__glewVertexStream3dvATI) -#define glVertexStream3fATI GLEW_GET_FUN(__glewVertexStream3fATI) -#define glVertexStream3fvATI GLEW_GET_FUN(__glewVertexStream3fvATI) -#define glVertexStream3iATI GLEW_GET_FUN(__glewVertexStream3iATI) -#define glVertexStream3ivATI GLEW_GET_FUN(__glewVertexStream3ivATI) -#define glVertexStream3sATI GLEW_GET_FUN(__glewVertexStream3sATI) -#define glVertexStream3svATI GLEW_GET_FUN(__glewVertexStream3svATI) -#define glVertexStream4dATI GLEW_GET_FUN(__glewVertexStream4dATI) -#define glVertexStream4dvATI GLEW_GET_FUN(__glewVertexStream4dvATI) -#define glVertexStream4fATI GLEW_GET_FUN(__glewVertexStream4fATI) -#define glVertexStream4fvATI GLEW_GET_FUN(__glewVertexStream4fvATI) -#define glVertexStream4iATI GLEW_GET_FUN(__glewVertexStream4iATI) -#define glVertexStream4ivATI GLEW_GET_FUN(__glewVertexStream4ivATI) -#define glVertexStream4sATI GLEW_GET_FUN(__glewVertexStream4sATI) -#define glVertexStream4svATI GLEW_GET_FUN(__glewVertexStream4svATI) - -#define GLEW_ATI_vertex_streams GLEW_GET_VAR(__GLEW_ATI_vertex_streams) - -#endif /* GL_ATI_vertex_streams */ - -/* ---------------- GL_EGL_NV_robustness_video_memory_purge ---------------- */ - -#ifndef GL_EGL_NV_robustness_video_memory_purge -#define GL_EGL_NV_robustness_video_memory_purge 1 - -#define GL_EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C -#define GL_PURGED_CONTEXT_RESET_NV 0x92BB - -#define GLEW_EGL_NV_robustness_video_memory_purge GLEW_GET_VAR(__GLEW_EGL_NV_robustness_video_memory_purge) - -#endif /* GL_EGL_NV_robustness_video_memory_purge */ - -/* --------------------------- GL_EXT_422_pixels --------------------------- */ - -#ifndef GL_EXT_422_pixels -#define GL_EXT_422_pixels 1 - -#define GL_422_EXT 0x80CC -#define GL_422_REV_EXT 0x80CD -#define GL_422_AVERAGE_EXT 0x80CE -#define GL_422_REV_AVERAGE_EXT 0x80CF - -#define GLEW_EXT_422_pixels GLEW_GET_VAR(__GLEW_EXT_422_pixels) - -#endif /* GL_EXT_422_pixels */ - -/* ---------------------------- GL_EXT_Cg_shader --------------------------- */ - -#ifndef GL_EXT_Cg_shader -#define GL_EXT_Cg_shader 1 - -#define GL_CG_VERTEX_SHADER_EXT 0x890E -#define GL_CG_FRAGMENT_SHADER_EXT 0x890F - -#define GLEW_EXT_Cg_shader GLEW_GET_VAR(__GLEW_EXT_Cg_shader) - -#endif /* GL_EXT_Cg_shader */ - -/* ------------------------------ GL_EXT_abgr ------------------------------ */ - -#ifndef GL_EXT_abgr -#define GL_EXT_abgr 1 - -#define GL_ABGR_EXT 0x8000 - -#define GLEW_EXT_abgr GLEW_GET_VAR(__GLEW_EXT_abgr) - -#endif /* GL_EXT_abgr */ - -/* ------------------------------ GL_EXT_bgra ------------------------------ */ - -#ifndef GL_EXT_bgra -#define GL_EXT_bgra 1 - -#define GL_BGR_EXT 0x80E0 -#define GL_BGRA_EXT 0x80E1 - -#define GLEW_EXT_bgra GLEW_GET_VAR(__GLEW_EXT_bgra) - -#endif /* GL_EXT_bgra */ - -/* ------------------------ GL_EXT_bindable_uniform ------------------------ */ - -#ifndef GL_EXT_bindable_uniform -#define GL_EXT_bindable_uniform 1 - -#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 -#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3 -#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4 -#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT 0x8DED -#define GL_UNIFORM_BUFFER_EXT 0x8DEE -#define GL_UNIFORM_BUFFER_BINDING_EXT 0x8DEF - -typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location); -typedef GLintptr (GLAPIENTRY * PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location); -typedef void (GLAPIENTRY * PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer); - -#define glGetUniformBufferSizeEXT GLEW_GET_FUN(__glewGetUniformBufferSizeEXT) -#define glGetUniformOffsetEXT GLEW_GET_FUN(__glewGetUniformOffsetEXT) -#define glUniformBufferEXT GLEW_GET_FUN(__glewUniformBufferEXT) - -#define GLEW_EXT_bindable_uniform GLEW_GET_VAR(__GLEW_EXT_bindable_uniform) - -#endif /* GL_EXT_bindable_uniform */ - -/* --------------------------- GL_EXT_blend_color -------------------------- */ - -#ifndef GL_EXT_blend_color -#define GL_EXT_blend_color 1 - -#define GL_CONSTANT_COLOR_EXT 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 -#define GL_CONSTANT_ALPHA_EXT 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 -#define GL_BLEND_COLOR_EXT 0x8005 - -typedef void (GLAPIENTRY * PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); - -#define glBlendColorEXT GLEW_GET_FUN(__glewBlendColorEXT) - -#define GLEW_EXT_blend_color GLEW_GET_VAR(__GLEW_EXT_blend_color) - -#endif /* GL_EXT_blend_color */ - -/* --------------------- GL_EXT_blend_equation_separate -------------------- */ - -#ifndef GL_EXT_blend_equation_separate -#define GL_EXT_blend_equation_separate 1 - -#define GL_BLEND_EQUATION_RGB_EXT 0x8009 -#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha); - -#define glBlendEquationSeparateEXT GLEW_GET_FUN(__glewBlendEquationSeparateEXT) - -#define GLEW_EXT_blend_equation_separate GLEW_GET_VAR(__GLEW_EXT_blend_equation_separate) - -#endif /* GL_EXT_blend_equation_separate */ - -/* ----------------------- GL_EXT_blend_func_separate ---------------------- */ - -#ifndef GL_EXT_blend_func_separate -#define GL_EXT_blend_func_separate 1 - -#define GL_BLEND_DST_RGB_EXT 0x80C8 -#define GL_BLEND_SRC_RGB_EXT 0x80C9 -#define GL_BLEND_DST_ALPHA_EXT 0x80CA -#define GL_BLEND_SRC_ALPHA_EXT 0x80CB - -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); - -#define glBlendFuncSeparateEXT GLEW_GET_FUN(__glewBlendFuncSeparateEXT) - -#define GLEW_EXT_blend_func_separate GLEW_GET_VAR(__GLEW_EXT_blend_func_separate) - -#endif /* GL_EXT_blend_func_separate */ - -/* ------------------------- GL_EXT_blend_logic_op ------------------------- */ - -#ifndef GL_EXT_blend_logic_op -#define GL_EXT_blend_logic_op 1 - -#define GLEW_EXT_blend_logic_op GLEW_GET_VAR(__GLEW_EXT_blend_logic_op) - -#endif /* GL_EXT_blend_logic_op */ - -/* -------------------------- GL_EXT_blend_minmax -------------------------- */ - -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 - -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#define GL_BLEND_EQUATION_EXT 0x8009 - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONEXTPROC) (GLenum mode); - -#define glBlendEquationEXT GLEW_GET_FUN(__glewBlendEquationEXT) - -#define GLEW_EXT_blend_minmax GLEW_GET_VAR(__GLEW_EXT_blend_minmax) - -#endif /* GL_EXT_blend_minmax */ - -/* ------------------------- GL_EXT_blend_subtract ------------------------- */ - -#ifndef GL_EXT_blend_subtract -#define GL_EXT_blend_subtract 1 - -#define GL_FUNC_SUBTRACT_EXT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B - -#define GLEW_EXT_blend_subtract GLEW_GET_VAR(__GLEW_EXT_blend_subtract) - -#endif /* GL_EXT_blend_subtract */ - -/* ------------------------ GL_EXT_clip_volume_hint ------------------------ */ - -#ifndef GL_EXT_clip_volume_hint -#define GL_EXT_clip_volume_hint 1 - -#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 - -#define GLEW_EXT_clip_volume_hint GLEW_GET_VAR(__GLEW_EXT_clip_volume_hint) - -#endif /* GL_EXT_clip_volume_hint */ - -/* ------------------------------ GL_EXT_cmyka ----------------------------- */ - -#ifndef GL_EXT_cmyka -#define GL_EXT_cmyka 1 - -#define GL_CMYK_EXT 0x800C -#define GL_CMYKA_EXT 0x800D -#define GL_PACK_CMYK_HINT_EXT 0x800E -#define GL_UNPACK_CMYK_HINT_EXT 0x800F - -#define GLEW_EXT_cmyka GLEW_GET_VAR(__GLEW_EXT_cmyka) - -#endif /* GL_EXT_cmyka */ - -/* ------------------------- GL_EXT_color_subtable ------------------------- */ - -#ifndef GL_EXT_color_subtable -#define GL_EXT_color_subtable 1 - -typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); - -#define glColorSubTableEXT GLEW_GET_FUN(__glewColorSubTableEXT) -#define glCopyColorSubTableEXT GLEW_GET_FUN(__glewCopyColorSubTableEXT) - -#define GLEW_EXT_color_subtable GLEW_GET_VAR(__GLEW_EXT_color_subtable) - -#endif /* GL_EXT_color_subtable */ - -/* ---------------------- GL_EXT_compiled_vertex_array --------------------- */ - -#ifndef GL_EXT_compiled_vertex_array -#define GL_EXT_compiled_vertex_array 1 - -#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8 -#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9 - -typedef void (GLAPIENTRY * PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count); -typedef void (GLAPIENTRY * PFNGLUNLOCKARRAYSEXTPROC) (void); - -#define glLockArraysEXT GLEW_GET_FUN(__glewLockArraysEXT) -#define glUnlockArraysEXT GLEW_GET_FUN(__glewUnlockArraysEXT) - -#define GLEW_EXT_compiled_vertex_array GLEW_GET_VAR(__GLEW_EXT_compiled_vertex_array) - -#endif /* GL_EXT_compiled_vertex_array */ - -/* --------------------------- GL_EXT_convolution -------------------------- */ - -#ifndef GL_EXT_convolution -#define GL_EXT_convolution 1 - -#define GL_CONVOLUTION_1D_EXT 0x8010 -#define GL_CONVOLUTION_2D_EXT 0x8011 -#define GL_SEPARABLE_2D_EXT 0x8012 -#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 -#define GL_REDUCE_EXT 0x8016 -#define GL_CONVOLUTION_FORMAT_EXT 0x8017 -#define GL_CONVOLUTION_WIDTH_EXT 0x8018 -#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 - -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *image); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span); -typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column); - -#define glConvolutionFilter1DEXT GLEW_GET_FUN(__glewConvolutionFilter1DEXT) -#define glConvolutionFilter2DEXT GLEW_GET_FUN(__glewConvolutionFilter2DEXT) -#define glConvolutionParameterfEXT GLEW_GET_FUN(__glewConvolutionParameterfEXT) -#define glConvolutionParameterfvEXT GLEW_GET_FUN(__glewConvolutionParameterfvEXT) -#define glConvolutionParameteriEXT GLEW_GET_FUN(__glewConvolutionParameteriEXT) -#define glConvolutionParameterivEXT GLEW_GET_FUN(__glewConvolutionParameterivEXT) -#define glCopyConvolutionFilter1DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter1DEXT) -#define glCopyConvolutionFilter2DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter2DEXT) -#define glGetConvolutionFilterEXT GLEW_GET_FUN(__glewGetConvolutionFilterEXT) -#define glGetConvolutionParameterfvEXT GLEW_GET_FUN(__glewGetConvolutionParameterfvEXT) -#define glGetConvolutionParameterivEXT GLEW_GET_FUN(__glewGetConvolutionParameterivEXT) -#define glGetSeparableFilterEXT GLEW_GET_FUN(__glewGetSeparableFilterEXT) -#define glSeparableFilter2DEXT GLEW_GET_FUN(__glewSeparableFilter2DEXT) - -#define GLEW_EXT_convolution GLEW_GET_VAR(__GLEW_EXT_convolution) - -#endif /* GL_EXT_convolution */ - -/* ------------------------ GL_EXT_coordinate_frame ------------------------ */ - -#ifndef GL_EXT_coordinate_frame -#define GL_EXT_coordinate_frame 1 - -#define GL_TANGENT_ARRAY_EXT 0x8439 -#define GL_BINORMAL_ARRAY_EXT 0x843A -#define GL_CURRENT_TANGENT_EXT 0x843B -#define GL_CURRENT_BINORMAL_EXT 0x843C -#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E -#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F -#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440 -#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441 -#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442 -#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443 -#define GL_MAP1_TANGENT_EXT 0x8444 -#define GL_MAP2_TANGENT_EXT 0x8445 -#define GL_MAP1_BINORMAL_EXT 0x8446 -#define GL_MAP2_BINORMAL_EXT 0x8447 - -typedef void (GLAPIENTRY * PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, void *pointer); -typedef void (GLAPIENTRY * PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, void *pointer); - -#define glBinormalPointerEXT GLEW_GET_FUN(__glewBinormalPointerEXT) -#define glTangentPointerEXT GLEW_GET_FUN(__glewTangentPointerEXT) - -#define GLEW_EXT_coordinate_frame GLEW_GET_VAR(__GLEW_EXT_coordinate_frame) - -#endif /* GL_EXT_coordinate_frame */ - -/* -------------------------- GL_EXT_copy_texture -------------------------- */ - -#ifndef GL_EXT_copy_texture -#define GL_EXT_copy_texture 1 - -typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); - -#define glCopyTexImage1DEXT GLEW_GET_FUN(__glewCopyTexImage1DEXT) -#define glCopyTexImage2DEXT GLEW_GET_FUN(__glewCopyTexImage2DEXT) -#define glCopyTexSubImage1DEXT GLEW_GET_FUN(__glewCopyTexSubImage1DEXT) -#define glCopyTexSubImage2DEXT GLEW_GET_FUN(__glewCopyTexSubImage2DEXT) -#define glCopyTexSubImage3DEXT GLEW_GET_FUN(__glewCopyTexSubImage3DEXT) - -#define GLEW_EXT_copy_texture GLEW_GET_VAR(__GLEW_EXT_copy_texture) - -#endif /* GL_EXT_copy_texture */ - -/* --------------------------- GL_EXT_cull_vertex -------------------------- */ - -#ifndef GL_EXT_cull_vertex -#define GL_EXT_cull_vertex 1 - -#define GL_CULL_VERTEX_EXT 0x81AA -#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB -#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC - -typedef void (GLAPIENTRY * PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat* params); - -#define glCullParameterdvEXT GLEW_GET_FUN(__glewCullParameterdvEXT) -#define glCullParameterfvEXT GLEW_GET_FUN(__glewCullParameterfvEXT) - -#define GLEW_EXT_cull_vertex GLEW_GET_VAR(__GLEW_EXT_cull_vertex) - -#endif /* GL_EXT_cull_vertex */ - -/* --------------------------- GL_EXT_debug_label -------------------------- */ - -#ifndef GL_EXT_debug_label -#define GL_EXT_debug_label 1 - -#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F -#define GL_PROGRAM_OBJECT_EXT 0x8B40 -#define GL_SHADER_OBJECT_EXT 0x8B48 -#define GL_BUFFER_OBJECT_EXT 0x9151 -#define GL_QUERY_OBJECT_EXT 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154 - -typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei* length, GLchar *label); -typedef void (GLAPIENTRY * PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar* label); - -#define glGetObjectLabelEXT GLEW_GET_FUN(__glewGetObjectLabelEXT) -#define glLabelObjectEXT GLEW_GET_FUN(__glewLabelObjectEXT) - -#define GLEW_EXT_debug_label GLEW_GET_VAR(__GLEW_EXT_debug_label) - -#endif /* GL_EXT_debug_label */ - -/* -------------------------- GL_EXT_debug_marker -------------------------- */ - -#ifndef GL_EXT_debug_marker -#define GL_EXT_debug_marker 1 - -typedef void (GLAPIENTRY * PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar* marker); -typedef void (GLAPIENTRY * PFNGLPOPGROUPMARKEREXTPROC) (void); -typedef void (GLAPIENTRY * PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar* marker); - -#define glInsertEventMarkerEXT GLEW_GET_FUN(__glewInsertEventMarkerEXT) -#define glPopGroupMarkerEXT GLEW_GET_FUN(__glewPopGroupMarkerEXT) -#define glPushGroupMarkerEXT GLEW_GET_FUN(__glewPushGroupMarkerEXT) - -#define GLEW_EXT_debug_marker GLEW_GET_VAR(__GLEW_EXT_debug_marker) - -#endif /* GL_EXT_debug_marker */ - -/* ------------------------ GL_EXT_depth_bounds_test ----------------------- */ - -#ifndef GL_EXT_depth_bounds_test -#define GL_EXT_depth_bounds_test 1 - -#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 -#define GL_DEPTH_BOUNDS_EXT 0x8891 - -typedef void (GLAPIENTRY * PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax); - -#define glDepthBoundsEXT GLEW_GET_FUN(__glewDepthBoundsEXT) - -#define GLEW_EXT_depth_bounds_test GLEW_GET_VAR(__GLEW_EXT_depth_bounds_test) - -#endif /* GL_EXT_depth_bounds_test */ - -/* ----------------------- GL_EXT_direct_state_access ---------------------- */ - -#ifndef GL_EXT_direct_state_access -#define GL_EXT_direct_state_access 1 - -#define GL_PROGRAM_MATRIX_EXT 0x8E2D -#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E -#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F - -typedef void (GLAPIENTRY * PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture); -typedef GLenum (GLAPIENTRY * PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target); -typedef void (GLAPIENTRY * PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (GLAPIENTRY * PFNGLDISABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array); -typedef void (GLAPIENTRY * PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array); -typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum* bufs); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (GLAPIENTRY * PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target); -typedef void (GLAPIENTRY * PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, void *img); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, void *img); -typedef void (GLAPIENTRY * PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETDOUBLEI_VEXTPROC) (GLenum pname, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFLOATI_VEXTPROC) (GLenum pname, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, void** params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); -typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, void *string); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, void** params); -typedef void (GLAPIENTRY * PFNGLGETPOINTERI_VEXTPROC) (GLenum pname, GLuint index, void** params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINTEGERVEXTPROC) (GLuint vaobj, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, void** param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYPOINTERVEXTPROC) (GLuint vaobj, GLenum pname, void** param); -typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access); -typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (GLAPIENTRY * PFNGLMATRIXFRUSTUMEXTPROC) (GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t, GLdouble n, GLdouble f); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum matrixMode); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum matrixMode, const GLdouble* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADDEXTPROC) (GLenum matrixMode, const GLdouble* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADFEXTPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum matrixMode, const GLdouble* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTDEXTPROC) (GLenum matrixMode, const GLdouble* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTFEXTPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXORTHOEXTPROC) (GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t, GLdouble n, GLdouble f); -typedef void (GLAPIENTRY * PFNGLMATRIXPOPEXTPROC) (GLenum matrixMode); -typedef void (GLAPIENTRY * PFNGLMATRIXPUSHEXTPROC) (GLenum matrixMode); -typedef void (GLAPIENTRY * PFNGLMATRIXROTATEDEXTPROC) (GLenum matrixMode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLMATRIXROTATEFEXTPROC) (GLenum matrixMode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLMATRIXSCALEDEXTPROC) (GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLMATRIXSCALEFEXTPROC) (GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat* param); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* param); -typedef void (GLAPIENTRY * PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); -typedef void (GLAPIENTRY * PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat* param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint* param); -typedef void (GLAPIENTRY * PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); -typedef GLboolean (GLAPIENTRY * PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYINDEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYNORMALOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC) (GLuint vaobj, GLuint index, GLuint divisor); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); - -#define glBindMultiTextureEXT GLEW_GET_FUN(__glewBindMultiTextureEXT) -#define glCheckNamedFramebufferStatusEXT GLEW_GET_FUN(__glewCheckNamedFramebufferStatusEXT) -#define glClientAttribDefaultEXT GLEW_GET_FUN(__glewClientAttribDefaultEXT) -#define glCompressedMultiTexImage1DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage1DEXT) -#define glCompressedMultiTexImage2DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage2DEXT) -#define glCompressedMultiTexImage3DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage3DEXT) -#define glCompressedMultiTexSubImage1DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage1DEXT) -#define glCompressedMultiTexSubImage2DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage2DEXT) -#define glCompressedMultiTexSubImage3DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage3DEXT) -#define glCompressedTextureImage1DEXT GLEW_GET_FUN(__glewCompressedTextureImage1DEXT) -#define glCompressedTextureImage2DEXT GLEW_GET_FUN(__glewCompressedTextureImage2DEXT) -#define glCompressedTextureImage3DEXT GLEW_GET_FUN(__glewCompressedTextureImage3DEXT) -#define glCompressedTextureSubImage1DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage1DEXT) -#define glCompressedTextureSubImage2DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage2DEXT) -#define glCompressedTextureSubImage3DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage3DEXT) -#define glCopyMultiTexImage1DEXT GLEW_GET_FUN(__glewCopyMultiTexImage1DEXT) -#define glCopyMultiTexImage2DEXT GLEW_GET_FUN(__glewCopyMultiTexImage2DEXT) -#define glCopyMultiTexSubImage1DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage1DEXT) -#define glCopyMultiTexSubImage2DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage2DEXT) -#define glCopyMultiTexSubImage3DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage3DEXT) -#define glCopyTextureImage1DEXT GLEW_GET_FUN(__glewCopyTextureImage1DEXT) -#define glCopyTextureImage2DEXT GLEW_GET_FUN(__glewCopyTextureImage2DEXT) -#define glCopyTextureSubImage1DEXT GLEW_GET_FUN(__glewCopyTextureSubImage1DEXT) -#define glCopyTextureSubImage2DEXT GLEW_GET_FUN(__glewCopyTextureSubImage2DEXT) -#define glCopyTextureSubImage3DEXT GLEW_GET_FUN(__glewCopyTextureSubImage3DEXT) -#define glDisableClientStateIndexedEXT GLEW_GET_FUN(__glewDisableClientStateIndexedEXT) -#define glDisableClientStateiEXT GLEW_GET_FUN(__glewDisableClientStateiEXT) -#define glDisableVertexArrayAttribEXT GLEW_GET_FUN(__glewDisableVertexArrayAttribEXT) -#define glDisableVertexArrayEXT GLEW_GET_FUN(__glewDisableVertexArrayEXT) -#define glEnableClientStateIndexedEXT GLEW_GET_FUN(__glewEnableClientStateIndexedEXT) -#define glEnableClientStateiEXT GLEW_GET_FUN(__glewEnableClientStateiEXT) -#define glEnableVertexArrayAttribEXT GLEW_GET_FUN(__glewEnableVertexArrayAttribEXT) -#define glEnableVertexArrayEXT GLEW_GET_FUN(__glewEnableVertexArrayEXT) -#define glFlushMappedNamedBufferRangeEXT GLEW_GET_FUN(__glewFlushMappedNamedBufferRangeEXT) -#define glFramebufferDrawBufferEXT GLEW_GET_FUN(__glewFramebufferDrawBufferEXT) -#define glFramebufferDrawBuffersEXT GLEW_GET_FUN(__glewFramebufferDrawBuffersEXT) -#define glFramebufferReadBufferEXT GLEW_GET_FUN(__glewFramebufferReadBufferEXT) -#define glGenerateMultiTexMipmapEXT GLEW_GET_FUN(__glewGenerateMultiTexMipmapEXT) -#define glGenerateTextureMipmapEXT GLEW_GET_FUN(__glewGenerateTextureMipmapEXT) -#define glGetCompressedMultiTexImageEXT GLEW_GET_FUN(__glewGetCompressedMultiTexImageEXT) -#define glGetCompressedTextureImageEXT GLEW_GET_FUN(__glewGetCompressedTextureImageEXT) -#define glGetDoubleIndexedvEXT GLEW_GET_FUN(__glewGetDoubleIndexedvEXT) -#define glGetDoublei_vEXT GLEW_GET_FUN(__glewGetDoublei_vEXT) -#define glGetFloatIndexedvEXT GLEW_GET_FUN(__glewGetFloatIndexedvEXT) -#define glGetFloati_vEXT GLEW_GET_FUN(__glewGetFloati_vEXT) -#define glGetFramebufferParameterivEXT GLEW_GET_FUN(__glewGetFramebufferParameterivEXT) -#define glGetMultiTexEnvfvEXT GLEW_GET_FUN(__glewGetMultiTexEnvfvEXT) -#define glGetMultiTexEnvivEXT GLEW_GET_FUN(__glewGetMultiTexEnvivEXT) -#define glGetMultiTexGendvEXT GLEW_GET_FUN(__glewGetMultiTexGendvEXT) -#define glGetMultiTexGenfvEXT GLEW_GET_FUN(__glewGetMultiTexGenfvEXT) -#define glGetMultiTexGenivEXT GLEW_GET_FUN(__glewGetMultiTexGenivEXT) -#define glGetMultiTexImageEXT GLEW_GET_FUN(__glewGetMultiTexImageEXT) -#define glGetMultiTexLevelParameterfvEXT GLEW_GET_FUN(__glewGetMultiTexLevelParameterfvEXT) -#define glGetMultiTexLevelParameterivEXT GLEW_GET_FUN(__glewGetMultiTexLevelParameterivEXT) -#define glGetMultiTexParameterIivEXT GLEW_GET_FUN(__glewGetMultiTexParameterIivEXT) -#define glGetMultiTexParameterIuivEXT GLEW_GET_FUN(__glewGetMultiTexParameterIuivEXT) -#define glGetMultiTexParameterfvEXT GLEW_GET_FUN(__glewGetMultiTexParameterfvEXT) -#define glGetMultiTexParameterivEXT GLEW_GET_FUN(__glewGetMultiTexParameterivEXT) -#define glGetNamedBufferParameterivEXT GLEW_GET_FUN(__glewGetNamedBufferParameterivEXT) -#define glGetNamedBufferPointervEXT GLEW_GET_FUN(__glewGetNamedBufferPointervEXT) -#define glGetNamedBufferSubDataEXT GLEW_GET_FUN(__glewGetNamedBufferSubDataEXT) -#define glGetNamedFramebufferAttachmentParameterivEXT GLEW_GET_FUN(__glewGetNamedFramebufferAttachmentParameterivEXT) -#define glGetNamedProgramLocalParameterIivEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterIivEXT) -#define glGetNamedProgramLocalParameterIuivEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterIuivEXT) -#define glGetNamedProgramLocalParameterdvEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterdvEXT) -#define glGetNamedProgramLocalParameterfvEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterfvEXT) -#define glGetNamedProgramStringEXT GLEW_GET_FUN(__glewGetNamedProgramStringEXT) -#define glGetNamedProgramivEXT GLEW_GET_FUN(__glewGetNamedProgramivEXT) -#define glGetNamedRenderbufferParameterivEXT GLEW_GET_FUN(__glewGetNamedRenderbufferParameterivEXT) -#define glGetPointerIndexedvEXT GLEW_GET_FUN(__glewGetPointerIndexedvEXT) -#define glGetPointeri_vEXT GLEW_GET_FUN(__glewGetPointeri_vEXT) -#define glGetTextureImageEXT GLEW_GET_FUN(__glewGetTextureImageEXT) -#define glGetTextureLevelParameterfvEXT GLEW_GET_FUN(__glewGetTextureLevelParameterfvEXT) -#define glGetTextureLevelParameterivEXT GLEW_GET_FUN(__glewGetTextureLevelParameterivEXT) -#define glGetTextureParameterIivEXT GLEW_GET_FUN(__glewGetTextureParameterIivEXT) -#define glGetTextureParameterIuivEXT GLEW_GET_FUN(__glewGetTextureParameterIuivEXT) -#define glGetTextureParameterfvEXT GLEW_GET_FUN(__glewGetTextureParameterfvEXT) -#define glGetTextureParameterivEXT GLEW_GET_FUN(__glewGetTextureParameterivEXT) -#define glGetVertexArrayIntegeri_vEXT GLEW_GET_FUN(__glewGetVertexArrayIntegeri_vEXT) -#define glGetVertexArrayIntegervEXT GLEW_GET_FUN(__glewGetVertexArrayIntegervEXT) -#define glGetVertexArrayPointeri_vEXT GLEW_GET_FUN(__glewGetVertexArrayPointeri_vEXT) -#define glGetVertexArrayPointervEXT GLEW_GET_FUN(__glewGetVertexArrayPointervEXT) -#define glMapNamedBufferEXT GLEW_GET_FUN(__glewMapNamedBufferEXT) -#define glMapNamedBufferRangeEXT GLEW_GET_FUN(__glewMapNamedBufferRangeEXT) -#define glMatrixFrustumEXT GLEW_GET_FUN(__glewMatrixFrustumEXT) -#define glMatrixLoadIdentityEXT GLEW_GET_FUN(__glewMatrixLoadIdentityEXT) -#define glMatrixLoadTransposedEXT GLEW_GET_FUN(__glewMatrixLoadTransposedEXT) -#define glMatrixLoadTransposefEXT GLEW_GET_FUN(__glewMatrixLoadTransposefEXT) -#define glMatrixLoaddEXT GLEW_GET_FUN(__glewMatrixLoaddEXT) -#define glMatrixLoadfEXT GLEW_GET_FUN(__glewMatrixLoadfEXT) -#define glMatrixMultTransposedEXT GLEW_GET_FUN(__glewMatrixMultTransposedEXT) -#define glMatrixMultTransposefEXT GLEW_GET_FUN(__glewMatrixMultTransposefEXT) -#define glMatrixMultdEXT GLEW_GET_FUN(__glewMatrixMultdEXT) -#define glMatrixMultfEXT GLEW_GET_FUN(__glewMatrixMultfEXT) -#define glMatrixOrthoEXT GLEW_GET_FUN(__glewMatrixOrthoEXT) -#define glMatrixPopEXT GLEW_GET_FUN(__glewMatrixPopEXT) -#define glMatrixPushEXT GLEW_GET_FUN(__glewMatrixPushEXT) -#define glMatrixRotatedEXT GLEW_GET_FUN(__glewMatrixRotatedEXT) -#define glMatrixRotatefEXT GLEW_GET_FUN(__glewMatrixRotatefEXT) -#define glMatrixScaledEXT GLEW_GET_FUN(__glewMatrixScaledEXT) -#define glMatrixScalefEXT GLEW_GET_FUN(__glewMatrixScalefEXT) -#define glMatrixTranslatedEXT GLEW_GET_FUN(__glewMatrixTranslatedEXT) -#define glMatrixTranslatefEXT GLEW_GET_FUN(__glewMatrixTranslatefEXT) -#define glMultiTexBufferEXT GLEW_GET_FUN(__glewMultiTexBufferEXT) -#define glMultiTexCoordPointerEXT GLEW_GET_FUN(__glewMultiTexCoordPointerEXT) -#define glMultiTexEnvfEXT GLEW_GET_FUN(__glewMultiTexEnvfEXT) -#define glMultiTexEnvfvEXT GLEW_GET_FUN(__glewMultiTexEnvfvEXT) -#define glMultiTexEnviEXT GLEW_GET_FUN(__glewMultiTexEnviEXT) -#define glMultiTexEnvivEXT GLEW_GET_FUN(__glewMultiTexEnvivEXT) -#define glMultiTexGendEXT GLEW_GET_FUN(__glewMultiTexGendEXT) -#define glMultiTexGendvEXT GLEW_GET_FUN(__glewMultiTexGendvEXT) -#define glMultiTexGenfEXT GLEW_GET_FUN(__glewMultiTexGenfEXT) -#define glMultiTexGenfvEXT GLEW_GET_FUN(__glewMultiTexGenfvEXT) -#define glMultiTexGeniEXT GLEW_GET_FUN(__glewMultiTexGeniEXT) -#define glMultiTexGenivEXT GLEW_GET_FUN(__glewMultiTexGenivEXT) -#define glMultiTexImage1DEXT GLEW_GET_FUN(__glewMultiTexImage1DEXT) -#define glMultiTexImage2DEXT GLEW_GET_FUN(__glewMultiTexImage2DEXT) -#define glMultiTexImage3DEXT GLEW_GET_FUN(__glewMultiTexImage3DEXT) -#define glMultiTexParameterIivEXT GLEW_GET_FUN(__glewMultiTexParameterIivEXT) -#define glMultiTexParameterIuivEXT GLEW_GET_FUN(__glewMultiTexParameterIuivEXT) -#define glMultiTexParameterfEXT GLEW_GET_FUN(__glewMultiTexParameterfEXT) -#define glMultiTexParameterfvEXT GLEW_GET_FUN(__glewMultiTexParameterfvEXT) -#define glMultiTexParameteriEXT GLEW_GET_FUN(__glewMultiTexParameteriEXT) -#define glMultiTexParameterivEXT GLEW_GET_FUN(__glewMultiTexParameterivEXT) -#define glMultiTexRenderbufferEXT GLEW_GET_FUN(__glewMultiTexRenderbufferEXT) -#define glMultiTexSubImage1DEXT GLEW_GET_FUN(__glewMultiTexSubImage1DEXT) -#define glMultiTexSubImage2DEXT GLEW_GET_FUN(__glewMultiTexSubImage2DEXT) -#define glMultiTexSubImage3DEXT GLEW_GET_FUN(__glewMultiTexSubImage3DEXT) -#define glNamedBufferDataEXT GLEW_GET_FUN(__glewNamedBufferDataEXT) -#define glNamedBufferSubDataEXT GLEW_GET_FUN(__glewNamedBufferSubDataEXT) -#define glNamedCopyBufferSubDataEXT GLEW_GET_FUN(__glewNamedCopyBufferSubDataEXT) -#define glNamedFramebufferRenderbufferEXT GLEW_GET_FUN(__glewNamedFramebufferRenderbufferEXT) -#define glNamedFramebufferTexture1DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture1DEXT) -#define glNamedFramebufferTexture2DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture2DEXT) -#define glNamedFramebufferTexture3DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture3DEXT) -#define glNamedFramebufferTextureEXT GLEW_GET_FUN(__glewNamedFramebufferTextureEXT) -#define glNamedFramebufferTextureFaceEXT GLEW_GET_FUN(__glewNamedFramebufferTextureFaceEXT) -#define glNamedFramebufferTextureLayerEXT GLEW_GET_FUN(__glewNamedFramebufferTextureLayerEXT) -#define glNamedProgramLocalParameter4dEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4dEXT) -#define glNamedProgramLocalParameter4dvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4dvEXT) -#define glNamedProgramLocalParameter4fEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4fEXT) -#define glNamedProgramLocalParameter4fvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4fvEXT) -#define glNamedProgramLocalParameterI4iEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4iEXT) -#define glNamedProgramLocalParameterI4ivEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4ivEXT) -#define glNamedProgramLocalParameterI4uiEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4uiEXT) -#define glNamedProgramLocalParameterI4uivEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4uivEXT) -#define glNamedProgramLocalParameters4fvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameters4fvEXT) -#define glNamedProgramLocalParametersI4ivEXT GLEW_GET_FUN(__glewNamedProgramLocalParametersI4ivEXT) -#define glNamedProgramLocalParametersI4uivEXT GLEW_GET_FUN(__glewNamedProgramLocalParametersI4uivEXT) -#define glNamedProgramStringEXT GLEW_GET_FUN(__glewNamedProgramStringEXT) -#define glNamedRenderbufferStorageEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageEXT) -#define glNamedRenderbufferStorageMultisampleCoverageEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisampleCoverageEXT) -#define glNamedRenderbufferStorageMultisampleEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisampleEXT) -#define glProgramUniform1fEXT GLEW_GET_FUN(__glewProgramUniform1fEXT) -#define glProgramUniform1fvEXT GLEW_GET_FUN(__glewProgramUniform1fvEXT) -#define glProgramUniform1iEXT GLEW_GET_FUN(__glewProgramUniform1iEXT) -#define glProgramUniform1ivEXT GLEW_GET_FUN(__glewProgramUniform1ivEXT) -#define glProgramUniform1uiEXT GLEW_GET_FUN(__glewProgramUniform1uiEXT) -#define glProgramUniform1uivEXT GLEW_GET_FUN(__glewProgramUniform1uivEXT) -#define glProgramUniform2fEXT GLEW_GET_FUN(__glewProgramUniform2fEXT) -#define glProgramUniform2fvEXT GLEW_GET_FUN(__glewProgramUniform2fvEXT) -#define glProgramUniform2iEXT GLEW_GET_FUN(__glewProgramUniform2iEXT) -#define glProgramUniform2ivEXT GLEW_GET_FUN(__glewProgramUniform2ivEXT) -#define glProgramUniform2uiEXT GLEW_GET_FUN(__glewProgramUniform2uiEXT) -#define glProgramUniform2uivEXT GLEW_GET_FUN(__glewProgramUniform2uivEXT) -#define glProgramUniform3fEXT GLEW_GET_FUN(__glewProgramUniform3fEXT) -#define glProgramUniform3fvEXT GLEW_GET_FUN(__glewProgramUniform3fvEXT) -#define glProgramUniform3iEXT GLEW_GET_FUN(__glewProgramUniform3iEXT) -#define glProgramUniform3ivEXT GLEW_GET_FUN(__glewProgramUniform3ivEXT) -#define glProgramUniform3uiEXT GLEW_GET_FUN(__glewProgramUniform3uiEXT) -#define glProgramUniform3uivEXT GLEW_GET_FUN(__glewProgramUniform3uivEXT) -#define glProgramUniform4fEXT GLEW_GET_FUN(__glewProgramUniform4fEXT) -#define glProgramUniform4fvEXT GLEW_GET_FUN(__glewProgramUniform4fvEXT) -#define glProgramUniform4iEXT GLEW_GET_FUN(__glewProgramUniform4iEXT) -#define glProgramUniform4ivEXT GLEW_GET_FUN(__glewProgramUniform4ivEXT) -#define glProgramUniform4uiEXT GLEW_GET_FUN(__glewProgramUniform4uiEXT) -#define glProgramUniform4uivEXT GLEW_GET_FUN(__glewProgramUniform4uivEXT) -#define glProgramUniformMatrix2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2fvEXT) -#define glProgramUniformMatrix2x3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x3fvEXT) -#define glProgramUniformMatrix2x4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x4fvEXT) -#define glProgramUniformMatrix3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3fvEXT) -#define glProgramUniformMatrix3x2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x2fvEXT) -#define glProgramUniformMatrix3x4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x4fvEXT) -#define glProgramUniformMatrix4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4fvEXT) -#define glProgramUniformMatrix4x2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x2fvEXT) -#define glProgramUniformMatrix4x3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x3fvEXT) -#define glPushClientAttribDefaultEXT GLEW_GET_FUN(__glewPushClientAttribDefaultEXT) -#define glTextureBufferEXT GLEW_GET_FUN(__glewTextureBufferEXT) -#define glTextureImage1DEXT GLEW_GET_FUN(__glewTextureImage1DEXT) -#define glTextureImage2DEXT GLEW_GET_FUN(__glewTextureImage2DEXT) -#define glTextureImage3DEXT GLEW_GET_FUN(__glewTextureImage3DEXT) -#define glTextureParameterIivEXT GLEW_GET_FUN(__glewTextureParameterIivEXT) -#define glTextureParameterIuivEXT GLEW_GET_FUN(__glewTextureParameterIuivEXT) -#define glTextureParameterfEXT GLEW_GET_FUN(__glewTextureParameterfEXT) -#define glTextureParameterfvEXT GLEW_GET_FUN(__glewTextureParameterfvEXT) -#define glTextureParameteriEXT GLEW_GET_FUN(__glewTextureParameteriEXT) -#define glTextureParameterivEXT GLEW_GET_FUN(__glewTextureParameterivEXT) -#define glTextureRenderbufferEXT GLEW_GET_FUN(__glewTextureRenderbufferEXT) -#define glTextureSubImage1DEXT GLEW_GET_FUN(__glewTextureSubImage1DEXT) -#define glTextureSubImage2DEXT GLEW_GET_FUN(__glewTextureSubImage2DEXT) -#define glTextureSubImage3DEXT GLEW_GET_FUN(__glewTextureSubImage3DEXT) -#define glUnmapNamedBufferEXT GLEW_GET_FUN(__glewUnmapNamedBufferEXT) -#define glVertexArrayColorOffsetEXT GLEW_GET_FUN(__glewVertexArrayColorOffsetEXT) -#define glVertexArrayEdgeFlagOffsetEXT GLEW_GET_FUN(__glewVertexArrayEdgeFlagOffsetEXT) -#define glVertexArrayFogCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayFogCoordOffsetEXT) -#define glVertexArrayIndexOffsetEXT GLEW_GET_FUN(__glewVertexArrayIndexOffsetEXT) -#define glVertexArrayMultiTexCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayMultiTexCoordOffsetEXT) -#define glVertexArrayNormalOffsetEXT GLEW_GET_FUN(__glewVertexArrayNormalOffsetEXT) -#define glVertexArraySecondaryColorOffsetEXT GLEW_GET_FUN(__glewVertexArraySecondaryColorOffsetEXT) -#define glVertexArrayTexCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayTexCoordOffsetEXT) -#define glVertexArrayVertexAttribDivisorEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribDivisorEXT) -#define glVertexArrayVertexAttribIOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribIOffsetEXT) -#define glVertexArrayVertexAttribOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribOffsetEXT) -#define glVertexArrayVertexOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexOffsetEXT) - -#define GLEW_EXT_direct_state_access GLEW_GET_VAR(__GLEW_EXT_direct_state_access) - -#endif /* GL_EXT_direct_state_access */ - -/* -------------------------- GL_EXT_draw_buffers2 ------------------------- */ - -#ifndef GL_EXT_draw_buffers2 -#define GL_EXT_draw_buffers2 1 - -typedef void (GLAPIENTRY * PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef void (GLAPIENTRY * PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef void (GLAPIENTRY * PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum value, GLuint index, GLboolean* data); -typedef void (GLAPIENTRY * PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum value, GLuint index, GLint* data); -typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index); - -#define glColorMaskIndexedEXT GLEW_GET_FUN(__glewColorMaskIndexedEXT) -#define glDisableIndexedEXT GLEW_GET_FUN(__glewDisableIndexedEXT) -#define glEnableIndexedEXT GLEW_GET_FUN(__glewEnableIndexedEXT) -#define glGetBooleanIndexedvEXT GLEW_GET_FUN(__glewGetBooleanIndexedvEXT) -#define glGetIntegerIndexedvEXT GLEW_GET_FUN(__glewGetIntegerIndexedvEXT) -#define glIsEnabledIndexedEXT GLEW_GET_FUN(__glewIsEnabledIndexedEXT) - -#define GLEW_EXT_draw_buffers2 GLEW_GET_VAR(__GLEW_EXT_draw_buffers2) - -#endif /* GL_EXT_draw_buffers2 */ - -/* ------------------------- GL_EXT_draw_instanced ------------------------- */ - -#ifndef GL_EXT_draw_instanced -#define GL_EXT_draw_instanced 1 - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); - -#define glDrawArraysInstancedEXT GLEW_GET_FUN(__glewDrawArraysInstancedEXT) -#define glDrawElementsInstancedEXT GLEW_GET_FUN(__glewDrawElementsInstancedEXT) - -#define GLEW_EXT_draw_instanced GLEW_GET_VAR(__GLEW_EXT_draw_instanced) - -#endif /* GL_EXT_draw_instanced */ - -/* ----------------------- GL_EXT_draw_range_elements ---------------------- */ - -#ifndef GL_EXT_draw_range_elements -#define GL_EXT_draw_range_elements 1 - -#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 -#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 - -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices); - -#define glDrawRangeElementsEXT GLEW_GET_FUN(__glewDrawRangeElementsEXT) - -#define GLEW_EXT_draw_range_elements GLEW_GET_VAR(__GLEW_EXT_draw_range_elements) - -#endif /* GL_EXT_draw_range_elements */ - -/* ---------------------------- GL_EXT_fog_coord --------------------------- */ - -#ifndef GL_EXT_fog_coord -#define GL_EXT_fog_coord 1 - -#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 -#define GL_FOG_COORDINATE_EXT 0x8451 -#define GL_FRAGMENT_DEPTH_EXT 0x8452 -#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 -#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 - -typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLFOGCOORDDEXTPROC) (GLdouble coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFEXTPROC) (GLfloat coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord); - -#define glFogCoordPointerEXT GLEW_GET_FUN(__glewFogCoordPointerEXT) -#define glFogCoorddEXT GLEW_GET_FUN(__glewFogCoorddEXT) -#define glFogCoorddvEXT GLEW_GET_FUN(__glewFogCoorddvEXT) -#define glFogCoordfEXT GLEW_GET_FUN(__glewFogCoordfEXT) -#define glFogCoordfvEXT GLEW_GET_FUN(__glewFogCoordfvEXT) - -#define GLEW_EXT_fog_coord GLEW_GET_VAR(__GLEW_EXT_fog_coord) - -#endif /* GL_EXT_fog_coord */ - -/* ------------------------ GL_EXT_fragment_lighting ----------------------- */ - -#ifndef GL_EXT_fragment_lighting -#define GL_EXT_fragment_lighting 1 - -#define GL_FRAGMENT_LIGHTING_EXT 0x8400 -#define GL_FRAGMENT_COLOR_MATERIAL_EXT 0x8401 -#define GL_FRAGMENT_COLOR_MATERIAL_FACE_EXT 0x8402 -#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_EXT 0x8403 -#define GL_MAX_FRAGMENT_LIGHTS_EXT 0x8404 -#define GL_MAX_ACTIVE_LIGHTS_EXT 0x8405 -#define GL_CURRENT_RASTER_NORMAL_EXT 0x8406 -#define GL_LIGHT_ENV_MODE_EXT 0x8407 -#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_EXT 0x8408 -#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_EXT 0x8409 -#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_EXT 0x840A -#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_EXT 0x840B -#define GL_FRAGMENT_LIGHT0_EXT 0x840C -#define GL_FRAGMENT_LIGHT7_EXT 0x8413 - -typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALEXTPROC) (GLenum face, GLenum mode); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFEXTPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVEXTPROC) (GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIEXTPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVEXTPROC) (GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFEXTPROC) (GLenum light, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIEXTPROC) (GLenum light, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFEXTPROC) (GLenum face, GLenum pname, const GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIEXTPROC) (GLenum face, GLenum pname, const GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLLIGHTENVIEXTPROC) (GLenum pname, GLint param); - -#define glFragmentColorMaterialEXT GLEW_GET_FUN(__glewFragmentColorMaterialEXT) -#define glFragmentLightModelfEXT GLEW_GET_FUN(__glewFragmentLightModelfEXT) -#define glFragmentLightModelfvEXT GLEW_GET_FUN(__glewFragmentLightModelfvEXT) -#define glFragmentLightModeliEXT GLEW_GET_FUN(__glewFragmentLightModeliEXT) -#define glFragmentLightModelivEXT GLEW_GET_FUN(__glewFragmentLightModelivEXT) -#define glFragmentLightfEXT GLEW_GET_FUN(__glewFragmentLightfEXT) -#define glFragmentLightfvEXT GLEW_GET_FUN(__glewFragmentLightfvEXT) -#define glFragmentLightiEXT GLEW_GET_FUN(__glewFragmentLightiEXT) -#define glFragmentLightivEXT GLEW_GET_FUN(__glewFragmentLightivEXT) -#define glFragmentMaterialfEXT GLEW_GET_FUN(__glewFragmentMaterialfEXT) -#define glFragmentMaterialfvEXT GLEW_GET_FUN(__glewFragmentMaterialfvEXT) -#define glFragmentMaterialiEXT GLEW_GET_FUN(__glewFragmentMaterialiEXT) -#define glFragmentMaterialivEXT GLEW_GET_FUN(__glewFragmentMaterialivEXT) -#define glGetFragmentLightfvEXT GLEW_GET_FUN(__glewGetFragmentLightfvEXT) -#define glGetFragmentLightivEXT GLEW_GET_FUN(__glewGetFragmentLightivEXT) -#define glGetFragmentMaterialfvEXT GLEW_GET_FUN(__glewGetFragmentMaterialfvEXT) -#define glGetFragmentMaterialivEXT GLEW_GET_FUN(__glewGetFragmentMaterialivEXT) -#define glLightEnviEXT GLEW_GET_FUN(__glewLightEnviEXT) - -#define GLEW_EXT_fragment_lighting GLEW_GET_VAR(__GLEW_EXT_fragment_lighting) - -#endif /* GL_EXT_fragment_lighting */ - -/* ------------------------ GL_EXT_framebuffer_blit ------------------------ */ - -#ifndef GL_EXT_framebuffer_blit -#define GL_EXT_framebuffer_blit 1 - -#define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_READ_FRAMEBUFFER_EXT 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA - -typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); - -#define glBlitFramebufferEXT GLEW_GET_FUN(__glewBlitFramebufferEXT) - -#define GLEW_EXT_framebuffer_blit GLEW_GET_VAR(__GLEW_EXT_framebuffer_blit) - -#endif /* GL_EXT_framebuffer_blit */ - -/* --------------------- GL_EXT_framebuffer_multisample -------------------- */ - -#ifndef GL_EXT_framebuffer_multisample -#define GL_EXT_framebuffer_multisample 1 - -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 - -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); - -#define glRenderbufferStorageMultisampleEXT GLEW_GET_FUN(__glewRenderbufferStorageMultisampleEXT) - -#define GLEW_EXT_framebuffer_multisample GLEW_GET_VAR(__GLEW_EXT_framebuffer_multisample) - -#endif /* GL_EXT_framebuffer_multisample */ - -/* --------------- GL_EXT_framebuffer_multisample_blit_scaled -------------- */ - -#ifndef GL_EXT_framebuffer_multisample_blit_scaled -#define GL_EXT_framebuffer_multisample_blit_scaled 1 - -#define GL_SCALED_RESOLVE_FASTEST_EXT 0x90BA -#define GL_SCALED_RESOLVE_NICEST_EXT 0x90BB - -#define GLEW_EXT_framebuffer_multisample_blit_scaled GLEW_GET_VAR(__GLEW_EXT_framebuffer_multisample_blit_scaled) - -#endif /* GL_EXT_framebuffer_multisample_blit_scaled */ - -/* ----------------------- GL_EXT_framebuffer_object ----------------------- */ - -#ifndef GL_EXT_framebuffer_object -#define GL_EXT_framebuffer_object 1 - -#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 -#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 -#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 -#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 -#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 -#define GL_FRAMEBUFFER_EXT 0x8D40 -#define GL_RENDERBUFFER_EXT 0x8D41 -#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 -#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 -#define GL_STENCIL_INDEX1_EXT 0x8D46 -#define GL_STENCIL_INDEX4_EXT 0x8D47 -#define GL_STENCIL_INDEX8_EXT 0x8D48 -#define GL_STENCIL_INDEX16_EXT 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 - -typedef void (GLAPIENTRY * PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer); -typedef void (GLAPIENTRY * PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer); -typedef GLenum (GLAPIENTRY * PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLGENERATEMIPMAPEXTPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer); -typedef GLboolean (GLAPIENTRY * PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); - -#define glBindFramebufferEXT GLEW_GET_FUN(__glewBindFramebufferEXT) -#define glBindRenderbufferEXT GLEW_GET_FUN(__glewBindRenderbufferEXT) -#define glCheckFramebufferStatusEXT GLEW_GET_FUN(__glewCheckFramebufferStatusEXT) -#define glDeleteFramebuffersEXT GLEW_GET_FUN(__glewDeleteFramebuffersEXT) -#define glDeleteRenderbuffersEXT GLEW_GET_FUN(__glewDeleteRenderbuffersEXT) -#define glFramebufferRenderbufferEXT GLEW_GET_FUN(__glewFramebufferRenderbufferEXT) -#define glFramebufferTexture1DEXT GLEW_GET_FUN(__glewFramebufferTexture1DEXT) -#define glFramebufferTexture2DEXT GLEW_GET_FUN(__glewFramebufferTexture2DEXT) -#define glFramebufferTexture3DEXT GLEW_GET_FUN(__glewFramebufferTexture3DEXT) -#define glGenFramebuffersEXT GLEW_GET_FUN(__glewGenFramebuffersEXT) -#define glGenRenderbuffersEXT GLEW_GET_FUN(__glewGenRenderbuffersEXT) -#define glGenerateMipmapEXT GLEW_GET_FUN(__glewGenerateMipmapEXT) -#define glGetFramebufferAttachmentParameterivEXT GLEW_GET_FUN(__glewGetFramebufferAttachmentParameterivEXT) -#define glGetRenderbufferParameterivEXT GLEW_GET_FUN(__glewGetRenderbufferParameterivEXT) -#define glIsFramebufferEXT GLEW_GET_FUN(__glewIsFramebufferEXT) -#define glIsRenderbufferEXT GLEW_GET_FUN(__glewIsRenderbufferEXT) -#define glRenderbufferStorageEXT GLEW_GET_FUN(__glewRenderbufferStorageEXT) - -#define GLEW_EXT_framebuffer_object GLEW_GET_VAR(__GLEW_EXT_framebuffer_object) - -#endif /* GL_EXT_framebuffer_object */ - -/* ------------------------ GL_EXT_framebuffer_sRGB ------------------------ */ - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_EXT_framebuffer_sRGB 1 - -#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 -#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA - -#define GLEW_EXT_framebuffer_sRGB GLEW_GET_VAR(__GLEW_EXT_framebuffer_sRGB) - -#endif /* GL_EXT_framebuffer_sRGB */ - -/* ------------------------ GL_EXT_geometry_shader4 ------------------------ */ - -#ifndef GL_EXT_geometry_shader4 -#define GL_EXT_geometry_shader4 1 - -#define GL_LINES_ADJACENCY_EXT 0xA -#define GL_LINE_STRIP_ADJACENCY_EXT 0xB -#define GL_TRIANGLES_ADJACENCY_EXT 0xC -#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0xD -#define GL_PROGRAM_POINT_SIZE_EXT 0x8642 -#define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9 -#define GL_GEOMETRY_SHADER_EXT 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); - -#define glFramebufferTextureEXT GLEW_GET_FUN(__glewFramebufferTextureEXT) -#define glFramebufferTextureFaceEXT GLEW_GET_FUN(__glewFramebufferTextureFaceEXT) -#define glProgramParameteriEXT GLEW_GET_FUN(__glewProgramParameteriEXT) - -#define GLEW_EXT_geometry_shader4 GLEW_GET_VAR(__GLEW_EXT_geometry_shader4) - -#endif /* GL_EXT_geometry_shader4 */ - -/* --------------------- GL_EXT_gpu_program_parameters --------------------- */ - -#ifndef GL_EXT_gpu_program_parameters -#define GL_EXT_gpu_program_parameters 1 - -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat* params); - -#define glProgramEnvParameters4fvEXT GLEW_GET_FUN(__glewProgramEnvParameters4fvEXT) -#define glProgramLocalParameters4fvEXT GLEW_GET_FUN(__glewProgramLocalParameters4fvEXT) - -#define GLEW_EXT_gpu_program_parameters GLEW_GET_VAR(__GLEW_EXT_gpu_program_parameters) - -#endif /* GL_EXT_gpu_program_parameters */ - -/* --------------------------- GL_EXT_gpu_shader4 -------------------------- */ - -#ifndef GL_EXT_gpu_shader4 -#define GL_EXT_gpu_shader4 1 - -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD -#define GL_SAMPLER_1D_ARRAY_EXT 0x8DC0 -#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1 -#define GL_SAMPLER_BUFFER_EXT 0x8DC2 -#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5 -#define GL_UNSIGNED_INT_VEC2_EXT 0x8DC6 -#define GL_UNSIGNED_INT_VEC3_EXT 0x8DC7 -#define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8 -#define GL_INT_SAMPLER_1D_EXT 0x8DC9 -#define GL_INT_SAMPLER_2D_EXT 0x8DCA -#define GL_INT_SAMPLER_3D_EXT 0x8DCB -#define GL_INT_SAMPLER_CUBE_EXT 0x8DCC -#define GL_INT_SAMPLER_2D_RECT_EXT 0x8DCD -#define GL_INT_SAMPLER_1D_ARRAY_EXT 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY_EXT 0x8DCF -#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_1D_EXT 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D_EXT 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D_EXT 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8 - -typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name); -typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); - -#define glBindFragDataLocationEXT GLEW_GET_FUN(__glewBindFragDataLocationEXT) -#define glGetFragDataLocationEXT GLEW_GET_FUN(__glewGetFragDataLocationEXT) -#define glGetUniformuivEXT GLEW_GET_FUN(__glewGetUniformuivEXT) -#define glGetVertexAttribIivEXT GLEW_GET_FUN(__glewGetVertexAttribIivEXT) -#define glGetVertexAttribIuivEXT GLEW_GET_FUN(__glewGetVertexAttribIuivEXT) -#define glUniform1uiEXT GLEW_GET_FUN(__glewUniform1uiEXT) -#define glUniform1uivEXT GLEW_GET_FUN(__glewUniform1uivEXT) -#define glUniform2uiEXT GLEW_GET_FUN(__glewUniform2uiEXT) -#define glUniform2uivEXT GLEW_GET_FUN(__glewUniform2uivEXT) -#define glUniform3uiEXT GLEW_GET_FUN(__glewUniform3uiEXT) -#define glUniform3uivEXT GLEW_GET_FUN(__glewUniform3uivEXT) -#define glUniform4uiEXT GLEW_GET_FUN(__glewUniform4uiEXT) -#define glUniform4uivEXT GLEW_GET_FUN(__glewUniform4uivEXT) -#define glVertexAttribI1iEXT GLEW_GET_FUN(__glewVertexAttribI1iEXT) -#define glVertexAttribI1ivEXT GLEW_GET_FUN(__glewVertexAttribI1ivEXT) -#define glVertexAttribI1uiEXT GLEW_GET_FUN(__glewVertexAttribI1uiEXT) -#define glVertexAttribI1uivEXT GLEW_GET_FUN(__glewVertexAttribI1uivEXT) -#define glVertexAttribI2iEXT GLEW_GET_FUN(__glewVertexAttribI2iEXT) -#define glVertexAttribI2ivEXT GLEW_GET_FUN(__glewVertexAttribI2ivEXT) -#define glVertexAttribI2uiEXT GLEW_GET_FUN(__glewVertexAttribI2uiEXT) -#define glVertexAttribI2uivEXT GLEW_GET_FUN(__glewVertexAttribI2uivEXT) -#define glVertexAttribI3iEXT GLEW_GET_FUN(__glewVertexAttribI3iEXT) -#define glVertexAttribI3ivEXT GLEW_GET_FUN(__glewVertexAttribI3ivEXT) -#define glVertexAttribI3uiEXT GLEW_GET_FUN(__glewVertexAttribI3uiEXT) -#define glVertexAttribI3uivEXT GLEW_GET_FUN(__glewVertexAttribI3uivEXT) -#define glVertexAttribI4bvEXT GLEW_GET_FUN(__glewVertexAttribI4bvEXT) -#define glVertexAttribI4iEXT GLEW_GET_FUN(__glewVertexAttribI4iEXT) -#define glVertexAttribI4ivEXT GLEW_GET_FUN(__glewVertexAttribI4ivEXT) -#define glVertexAttribI4svEXT GLEW_GET_FUN(__glewVertexAttribI4svEXT) -#define glVertexAttribI4ubvEXT GLEW_GET_FUN(__glewVertexAttribI4ubvEXT) -#define glVertexAttribI4uiEXT GLEW_GET_FUN(__glewVertexAttribI4uiEXT) -#define glVertexAttribI4uivEXT GLEW_GET_FUN(__glewVertexAttribI4uivEXT) -#define glVertexAttribI4usvEXT GLEW_GET_FUN(__glewVertexAttribI4usvEXT) -#define glVertexAttribIPointerEXT GLEW_GET_FUN(__glewVertexAttribIPointerEXT) - -#define GLEW_EXT_gpu_shader4 GLEW_GET_VAR(__GLEW_EXT_gpu_shader4) - -#endif /* GL_EXT_gpu_shader4 */ - -/* ---------------------------- GL_EXT_histogram --------------------------- */ - -#ifndef GL_EXT_histogram -#define GL_EXT_histogram 1 - -#define GL_HISTOGRAM_EXT 0x8024 -#define GL_PROXY_HISTOGRAM_EXT 0x8025 -#define GL_HISTOGRAM_WIDTH_EXT 0x8026 -#define GL_HISTOGRAM_FORMAT_EXT 0x8027 -#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C -#define GL_HISTOGRAM_SINK_EXT 0x802D -#define GL_MINMAX_EXT 0x802E -#define GL_MINMAX_FORMAT_EXT 0x802F -#define GL_MINMAX_SINK_EXT 0x8030 - -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (GLAPIENTRY * PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMEXTPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLRESETMINMAXEXTPROC) (GLenum target); - -#define glGetHistogramEXT GLEW_GET_FUN(__glewGetHistogramEXT) -#define glGetHistogramParameterfvEXT GLEW_GET_FUN(__glewGetHistogramParameterfvEXT) -#define glGetHistogramParameterivEXT GLEW_GET_FUN(__glewGetHistogramParameterivEXT) -#define glGetMinmaxEXT GLEW_GET_FUN(__glewGetMinmaxEXT) -#define glGetMinmaxParameterfvEXT GLEW_GET_FUN(__glewGetMinmaxParameterfvEXT) -#define glGetMinmaxParameterivEXT GLEW_GET_FUN(__glewGetMinmaxParameterivEXT) -#define glHistogramEXT GLEW_GET_FUN(__glewHistogramEXT) -#define glMinmaxEXT GLEW_GET_FUN(__glewMinmaxEXT) -#define glResetHistogramEXT GLEW_GET_FUN(__glewResetHistogramEXT) -#define glResetMinmaxEXT GLEW_GET_FUN(__glewResetMinmaxEXT) - -#define GLEW_EXT_histogram GLEW_GET_VAR(__GLEW_EXT_histogram) - -#endif /* GL_EXT_histogram */ - -/* ----------------------- GL_EXT_index_array_formats ---------------------- */ - -#ifndef GL_EXT_index_array_formats -#define GL_EXT_index_array_formats 1 - -#define GLEW_EXT_index_array_formats GLEW_GET_VAR(__GLEW_EXT_index_array_formats) - -#endif /* GL_EXT_index_array_formats */ - -/* --------------------------- GL_EXT_index_func --------------------------- */ - -#ifndef GL_EXT_index_func -#define GL_EXT_index_func 1 - -typedef void (GLAPIENTRY * PFNGLINDEXFUNCEXTPROC) (GLenum func, GLfloat ref); - -#define glIndexFuncEXT GLEW_GET_FUN(__glewIndexFuncEXT) - -#define GLEW_EXT_index_func GLEW_GET_VAR(__GLEW_EXT_index_func) - -#endif /* GL_EXT_index_func */ - -/* ------------------------- GL_EXT_index_material ------------------------- */ - -#ifndef GL_EXT_index_material -#define GL_EXT_index_material 1 - -typedef void (GLAPIENTRY * PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode); - -#define glIndexMaterialEXT GLEW_GET_FUN(__glewIndexMaterialEXT) - -#define GLEW_EXT_index_material GLEW_GET_VAR(__GLEW_EXT_index_material) - -#endif /* GL_EXT_index_material */ - -/* -------------------------- GL_EXT_index_texture ------------------------- */ - -#ifndef GL_EXT_index_texture -#define GL_EXT_index_texture 1 - -#define GLEW_EXT_index_texture GLEW_GET_VAR(__GLEW_EXT_index_texture) - -#endif /* GL_EXT_index_texture */ - -/* -------------------------- GL_EXT_light_texture ------------------------- */ - -#ifndef GL_EXT_light_texture -#define GL_EXT_light_texture 1 - -#define GL_FRAGMENT_MATERIAL_EXT 0x8349 -#define GL_FRAGMENT_NORMAL_EXT 0x834A -#define GL_FRAGMENT_COLOR_EXT 0x834C -#define GL_ATTENUATION_EXT 0x834D -#define GL_SHADOW_ATTENUATION_EXT 0x834E -#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F -#define GL_TEXTURE_LIGHT_EXT 0x8350 -#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351 -#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352 - -typedef void (GLAPIENTRY * PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode); -typedef void (GLAPIENTRY * PFNGLTEXTURELIGHTEXTPROC) (GLenum pname); -typedef void (GLAPIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode); - -#define glApplyTextureEXT GLEW_GET_FUN(__glewApplyTextureEXT) -#define glTextureLightEXT GLEW_GET_FUN(__glewTextureLightEXT) -#define glTextureMaterialEXT GLEW_GET_FUN(__glewTextureMaterialEXT) - -#define GLEW_EXT_light_texture GLEW_GET_VAR(__GLEW_EXT_light_texture) - -#endif /* GL_EXT_light_texture */ - -/* ------------------------- GL_EXT_misc_attribute ------------------------- */ - -#ifndef GL_EXT_misc_attribute -#define GL_EXT_misc_attribute 1 - -#define GLEW_EXT_misc_attribute GLEW_GET_VAR(__GLEW_EXT_misc_attribute) - -#endif /* GL_EXT_misc_attribute */ - -/* ------------------------ GL_EXT_multi_draw_arrays ----------------------- */ - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, GLsizei* count, GLenum type, const void *const *indices, GLsizei primcount); - -#define glMultiDrawArraysEXT GLEW_GET_FUN(__glewMultiDrawArraysEXT) -#define glMultiDrawElementsEXT GLEW_GET_FUN(__glewMultiDrawElementsEXT) - -#define GLEW_EXT_multi_draw_arrays GLEW_GET_VAR(__GLEW_EXT_multi_draw_arrays) - -#endif /* GL_EXT_multi_draw_arrays */ - -/* --------------------------- GL_EXT_multisample -------------------------- */ - -#ifndef GL_EXT_multisample -#define GL_EXT_multisample 1 - -#define GL_MULTISAMPLE_EXT 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F -#define GL_SAMPLE_MASK_EXT 0x80A0 -#define GL_1PASS_EXT 0x80A1 -#define GL_2PASS_0_EXT 0x80A2 -#define GL_2PASS_1_EXT 0x80A3 -#define GL_4PASS_0_EXT 0x80A4 -#define GL_4PASS_1_EXT 0x80A5 -#define GL_4PASS_2_EXT 0x80A6 -#define GL_4PASS_3_EXT 0x80A7 -#define GL_SAMPLE_BUFFERS_EXT 0x80A8 -#define GL_SAMPLES_EXT 0x80A9 -#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA -#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB -#define GL_SAMPLE_PATTERN_EXT 0x80AC -#define GL_MULTISAMPLE_BIT_EXT 0x20000000 - -typedef void (GLAPIENTRY * PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert); -typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern); - -#define glSampleMaskEXT GLEW_GET_FUN(__glewSampleMaskEXT) -#define glSamplePatternEXT GLEW_GET_FUN(__glewSamplePatternEXT) - -#define GLEW_EXT_multisample GLEW_GET_VAR(__GLEW_EXT_multisample) - -#endif /* GL_EXT_multisample */ - -/* ---------------------- GL_EXT_packed_depth_stencil ---------------------- */ - -#ifndef GL_EXT_packed_depth_stencil -#define GL_EXT_packed_depth_stencil 1 - -#define GL_DEPTH_STENCIL_EXT 0x84F9 -#define GL_UNSIGNED_INT_24_8_EXT 0x84FA -#define GL_DEPTH24_STENCIL8_EXT 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 - -#define GLEW_EXT_packed_depth_stencil GLEW_GET_VAR(__GLEW_EXT_packed_depth_stencil) - -#endif /* GL_EXT_packed_depth_stencil */ - -/* -------------------------- GL_EXT_packed_float -------------------------- */ - -#ifndef GL_EXT_packed_float -#define GL_EXT_packed_float 1 - -#define GL_R11F_G11F_B10F_EXT 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B -#define GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C - -#define GLEW_EXT_packed_float GLEW_GET_VAR(__GLEW_EXT_packed_float) - -#endif /* GL_EXT_packed_float */ - -/* -------------------------- GL_EXT_packed_pixels ------------------------- */ - -#ifndef GL_EXT_packed_pixels -#define GL_EXT_packed_pixels 1 - -#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 - -#define GLEW_EXT_packed_pixels GLEW_GET_VAR(__GLEW_EXT_packed_pixels) - -#endif /* GL_EXT_packed_pixels */ - -/* ------------------------ GL_EXT_paletted_texture ------------------------ */ - -#ifndef GL_EXT_paletted_texture -#define GL_EXT_paletted_texture 1 - -#define GL_TEXTURE_1D 0x0DE0 -#define GL_TEXTURE_2D 0x0DE1 -#define GL_PROXY_TEXTURE_1D 0x8063 -#define GL_PROXY_TEXTURE_2D 0x8064 -#define GL_COLOR_TABLE_FORMAT_EXT 0x80D8 -#define GL_COLOR_TABLE_WIDTH_EXT 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_EXT 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_EXT 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_EXT 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_EXT 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_EXT 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_EXT 0x80DF -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B - -typedef void (GLAPIENTRY * PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, void *data); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); - -#define glColorTableEXT GLEW_GET_FUN(__glewColorTableEXT) -#define glGetColorTableEXT GLEW_GET_FUN(__glewGetColorTableEXT) -#define glGetColorTableParameterfvEXT GLEW_GET_FUN(__glewGetColorTableParameterfvEXT) -#define glGetColorTableParameterivEXT GLEW_GET_FUN(__glewGetColorTableParameterivEXT) - -#define GLEW_EXT_paletted_texture GLEW_GET_VAR(__GLEW_EXT_paletted_texture) - -#endif /* GL_EXT_paletted_texture */ - -/* ----------------------- GL_EXT_pixel_buffer_object ---------------------- */ - -#ifndef GL_EXT_pixel_buffer_object -#define GL_EXT_pixel_buffer_object 1 - -#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF - -#define GLEW_EXT_pixel_buffer_object GLEW_GET_VAR(__GLEW_EXT_pixel_buffer_object) - -#endif /* GL_EXT_pixel_buffer_object */ - -/* ------------------------- GL_EXT_pixel_transform ------------------------ */ - -#ifndef GL_EXT_pixel_transform -#define GL_EXT_pixel_transform 1 - -#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330 -#define GL_PIXEL_MAG_FILTER_EXT 0x8331 -#define GL_PIXEL_MIN_FILTER_EXT 0x8332 -#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333 -#define GL_CUBIC_EXT 0x8334 -#define GL_AVERAGE_EXT 0x8335 -#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336 -#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337 -#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338 - -typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, const GLfloat param); -typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, const GLint param); -typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params); - -#define glGetPixelTransformParameterfvEXT GLEW_GET_FUN(__glewGetPixelTransformParameterfvEXT) -#define glGetPixelTransformParameterivEXT GLEW_GET_FUN(__glewGetPixelTransformParameterivEXT) -#define glPixelTransformParameterfEXT GLEW_GET_FUN(__glewPixelTransformParameterfEXT) -#define glPixelTransformParameterfvEXT GLEW_GET_FUN(__glewPixelTransformParameterfvEXT) -#define glPixelTransformParameteriEXT GLEW_GET_FUN(__glewPixelTransformParameteriEXT) -#define glPixelTransformParameterivEXT GLEW_GET_FUN(__glewPixelTransformParameterivEXT) - -#define GLEW_EXT_pixel_transform GLEW_GET_VAR(__GLEW_EXT_pixel_transform) - -#endif /* GL_EXT_pixel_transform */ - -/* ------------------- GL_EXT_pixel_transform_color_table ------------------ */ - -#ifndef GL_EXT_pixel_transform_color_table -#define GL_EXT_pixel_transform_color_table 1 - -#define GLEW_EXT_pixel_transform_color_table GLEW_GET_VAR(__GLEW_EXT_pixel_transform_color_table) - -#endif /* GL_EXT_pixel_transform_color_table */ - -/* ------------------------ GL_EXT_point_parameters ------------------------ */ - -#ifndef GL_EXT_point_parameters -#define GL_EXT_point_parameters 1 - -#define GL_POINT_SIZE_MIN_EXT 0x8126 -#define GL_POINT_SIZE_MAX_EXT 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 -#define GL_DISTANCE_ATTENUATION_EXT 0x8129 - -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat* params); - -#define glPointParameterfEXT GLEW_GET_FUN(__glewPointParameterfEXT) -#define glPointParameterfvEXT GLEW_GET_FUN(__glewPointParameterfvEXT) - -#define GLEW_EXT_point_parameters GLEW_GET_VAR(__GLEW_EXT_point_parameters) - -#endif /* GL_EXT_point_parameters */ - -/* ------------------------- GL_EXT_polygon_offset ------------------------- */ - -#ifndef GL_EXT_polygon_offset -#define GL_EXT_polygon_offset 1 - -#define GL_POLYGON_OFFSET_EXT 0x8037 -#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 -#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 - -typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias); - -#define glPolygonOffsetEXT GLEW_GET_FUN(__glewPolygonOffsetEXT) - -#define GLEW_EXT_polygon_offset GLEW_GET_VAR(__GLEW_EXT_polygon_offset) - -#endif /* GL_EXT_polygon_offset */ - -/* ---------------------- GL_EXT_polygon_offset_clamp ---------------------- */ - -#ifndef GL_EXT_polygon_offset_clamp -#define GL_EXT_polygon_offset_clamp 1 - -#define GL_POLYGON_OFFSET_CLAMP_EXT 0x8E1B - -typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETCLAMPEXTPROC) (GLfloat factor, GLfloat units, GLfloat clamp); - -#define glPolygonOffsetClampEXT GLEW_GET_FUN(__glewPolygonOffsetClampEXT) - -#define GLEW_EXT_polygon_offset_clamp GLEW_GET_VAR(__GLEW_EXT_polygon_offset_clamp) - -#endif /* GL_EXT_polygon_offset_clamp */ - -/* ----------------------- GL_EXT_post_depth_coverage ---------------------- */ - -#ifndef GL_EXT_post_depth_coverage -#define GL_EXT_post_depth_coverage 1 - -#define GLEW_EXT_post_depth_coverage GLEW_GET_VAR(__GLEW_EXT_post_depth_coverage) - -#endif /* GL_EXT_post_depth_coverage */ - -/* ------------------------ GL_EXT_provoking_vertex ------------------------ */ - -#ifndef GL_EXT_provoking_vertex -#define GL_EXT_provoking_vertex 1 - -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D -#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E -#define GL_PROVOKING_VERTEX_EXT 0x8E4F - -typedef void (GLAPIENTRY * PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode); - -#define glProvokingVertexEXT GLEW_GET_FUN(__glewProvokingVertexEXT) - -#define GLEW_EXT_provoking_vertex GLEW_GET_VAR(__GLEW_EXT_provoking_vertex) - -#endif /* GL_EXT_provoking_vertex */ - -/* ----------------------- GL_EXT_raster_multisample ----------------------- */ - -#ifndef GL_EXT_raster_multisample -#define GL_EXT_raster_multisample 1 - -#define GL_COLOR_SAMPLES_NV 0x8E20 -#define GL_RASTER_MULTISAMPLE_EXT 0x9327 -#define GL_RASTER_SAMPLES_EXT 0x9328 -#define GL_MAX_RASTER_SAMPLES_EXT 0x9329 -#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A -#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B -#define GL_EFFECTIVE_RASTER_SAMPLES_EXT 0x932C -#define GL_DEPTH_SAMPLES_NV 0x932D -#define GL_STENCIL_SAMPLES_NV 0x932E -#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F -#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330 -#define GL_COVERAGE_MODULATION_TABLE_NV 0x9331 -#define GL_COVERAGE_MODULATION_NV 0x9332 -#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333 - -typedef void (GLAPIENTRY * PFNGLCOVERAGEMODULATIONNVPROC) (GLenum components); -typedef void (GLAPIENTRY * PFNGLCOVERAGEMODULATIONTABLENVPROC) (GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLGETCOVERAGEMODULATIONTABLENVPROC) (GLsizei bufsize, GLfloat* v); -typedef void (GLAPIENTRY * PFNGLRASTERSAMPLESEXTPROC) (GLuint samples, GLboolean fixedsamplelocations); - -#define glCoverageModulationNV GLEW_GET_FUN(__glewCoverageModulationNV) -#define glCoverageModulationTableNV GLEW_GET_FUN(__glewCoverageModulationTableNV) -#define glGetCoverageModulationTableNV GLEW_GET_FUN(__glewGetCoverageModulationTableNV) -#define glRasterSamplesEXT GLEW_GET_FUN(__glewRasterSamplesEXT) - -#define GLEW_EXT_raster_multisample GLEW_GET_VAR(__GLEW_EXT_raster_multisample) - -#endif /* GL_EXT_raster_multisample */ - -/* ------------------------- GL_EXT_rescale_normal ------------------------- */ - -#ifndef GL_EXT_rescale_normal -#define GL_EXT_rescale_normal 1 - -#define GL_RESCALE_NORMAL_EXT 0x803A - -#define GLEW_EXT_rescale_normal GLEW_GET_VAR(__GLEW_EXT_rescale_normal) - -#endif /* GL_EXT_rescale_normal */ - -/* -------------------------- GL_EXT_scene_marker -------------------------- */ - -#ifndef GL_EXT_scene_marker -#define GL_EXT_scene_marker 1 - -typedef void (GLAPIENTRY * PFNGLBEGINSCENEEXTPROC) (void); -typedef void (GLAPIENTRY * PFNGLENDSCENEEXTPROC) (void); - -#define glBeginSceneEXT GLEW_GET_FUN(__glewBeginSceneEXT) -#define glEndSceneEXT GLEW_GET_FUN(__glewEndSceneEXT) - -#define GLEW_EXT_scene_marker GLEW_GET_VAR(__GLEW_EXT_scene_marker) - -#endif /* GL_EXT_scene_marker */ - -/* ------------------------- GL_EXT_secondary_color ------------------------ */ - -#ifndef GL_EXT_secondary_color -#define GL_EXT_secondary_color 1 - -#define GL_COLOR_SUM_EXT 0x8458 -#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D -#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E - -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer); - -#define glSecondaryColor3bEXT GLEW_GET_FUN(__glewSecondaryColor3bEXT) -#define glSecondaryColor3bvEXT GLEW_GET_FUN(__glewSecondaryColor3bvEXT) -#define glSecondaryColor3dEXT GLEW_GET_FUN(__glewSecondaryColor3dEXT) -#define glSecondaryColor3dvEXT GLEW_GET_FUN(__glewSecondaryColor3dvEXT) -#define glSecondaryColor3fEXT GLEW_GET_FUN(__glewSecondaryColor3fEXT) -#define glSecondaryColor3fvEXT GLEW_GET_FUN(__glewSecondaryColor3fvEXT) -#define glSecondaryColor3iEXT GLEW_GET_FUN(__glewSecondaryColor3iEXT) -#define glSecondaryColor3ivEXT GLEW_GET_FUN(__glewSecondaryColor3ivEXT) -#define glSecondaryColor3sEXT GLEW_GET_FUN(__glewSecondaryColor3sEXT) -#define glSecondaryColor3svEXT GLEW_GET_FUN(__glewSecondaryColor3svEXT) -#define glSecondaryColor3ubEXT GLEW_GET_FUN(__glewSecondaryColor3ubEXT) -#define glSecondaryColor3ubvEXT GLEW_GET_FUN(__glewSecondaryColor3ubvEXT) -#define glSecondaryColor3uiEXT GLEW_GET_FUN(__glewSecondaryColor3uiEXT) -#define glSecondaryColor3uivEXT GLEW_GET_FUN(__glewSecondaryColor3uivEXT) -#define glSecondaryColor3usEXT GLEW_GET_FUN(__glewSecondaryColor3usEXT) -#define glSecondaryColor3usvEXT GLEW_GET_FUN(__glewSecondaryColor3usvEXT) -#define glSecondaryColorPointerEXT GLEW_GET_FUN(__glewSecondaryColorPointerEXT) - -#define GLEW_EXT_secondary_color GLEW_GET_VAR(__GLEW_EXT_secondary_color) - -#endif /* GL_EXT_secondary_color */ - -/* --------------------- GL_EXT_separate_shader_objects -------------------- */ - -#ifndef GL_EXT_separate_shader_objects -#define GL_EXT_separate_shader_objects 1 - -#define GL_ACTIVE_PROGRAM_EXT 0x8B8D - -typedef void (GLAPIENTRY * PFNGLACTIVEPROGRAMEXTPROC) (GLuint program); -typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar* string); -typedef void (GLAPIENTRY * PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program); - -#define glActiveProgramEXT GLEW_GET_FUN(__glewActiveProgramEXT) -#define glCreateShaderProgramEXT GLEW_GET_FUN(__glewCreateShaderProgramEXT) -#define glUseShaderProgramEXT GLEW_GET_FUN(__glewUseShaderProgramEXT) - -#define GLEW_EXT_separate_shader_objects GLEW_GET_VAR(__GLEW_EXT_separate_shader_objects) - -#endif /* GL_EXT_separate_shader_objects */ - -/* --------------------- GL_EXT_separate_specular_color -------------------- */ - -#ifndef GL_EXT_separate_specular_color -#define GL_EXT_separate_specular_color 1 - -#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8 -#define GL_SINGLE_COLOR_EXT 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA - -#define GLEW_EXT_separate_specular_color GLEW_GET_VAR(__GLEW_EXT_separate_specular_color) - -#endif /* GL_EXT_separate_specular_color */ - -/* ------------------- GL_EXT_shader_image_load_formatted ------------------ */ - -#ifndef GL_EXT_shader_image_load_formatted -#define GL_EXT_shader_image_load_formatted 1 - -#define GLEW_EXT_shader_image_load_formatted GLEW_GET_VAR(__GLEW_EXT_shader_image_load_formatted) - -#endif /* GL_EXT_shader_image_load_formatted */ - -/* --------------------- GL_EXT_shader_image_load_store -------------------- */ - -#ifndef GL_EXT_shader_image_load_store -#define GL_EXT_shader_image_load_store 1 - -#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001 -#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT 0x00000002 -#define GL_UNIFORM_BARRIER_BIT_EXT 0x00000004 -#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT 0x00000008 -#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020 -#define GL_COMMAND_BARRIER_BIT_EXT 0x00000040 -#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT 0x00000080 -#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100 -#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT 0x00000200 -#define GL_FRAMEBUFFER_BARRIER_BIT_EXT 0x00000400 -#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800 -#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000 -#define GL_MAX_IMAGE_UNITS_EXT 0x8F38 -#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39 -#define GL_IMAGE_BINDING_NAME_EXT 0x8F3A -#define GL_IMAGE_BINDING_LEVEL_EXT 0x8F3B -#define GL_IMAGE_BINDING_LAYERED_EXT 0x8F3C -#define GL_IMAGE_BINDING_LAYER_EXT 0x8F3D -#define GL_IMAGE_BINDING_ACCESS_EXT 0x8F3E -#define GL_IMAGE_1D_EXT 0x904C -#define GL_IMAGE_2D_EXT 0x904D -#define GL_IMAGE_3D_EXT 0x904E -#define GL_IMAGE_2D_RECT_EXT 0x904F -#define GL_IMAGE_CUBE_EXT 0x9050 -#define GL_IMAGE_BUFFER_EXT 0x9051 -#define GL_IMAGE_1D_ARRAY_EXT 0x9052 -#define GL_IMAGE_2D_ARRAY_EXT 0x9053 -#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054 -#define GL_IMAGE_2D_MULTISAMPLE_EXT 0x9055 -#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056 -#define GL_INT_IMAGE_1D_EXT 0x9057 -#define GL_INT_IMAGE_2D_EXT 0x9058 -#define GL_INT_IMAGE_3D_EXT 0x9059 -#define GL_INT_IMAGE_2D_RECT_EXT 0x905A -#define GL_INT_IMAGE_CUBE_EXT 0x905B -#define GL_INT_IMAGE_BUFFER_EXT 0x905C -#define GL_INT_IMAGE_1D_ARRAY_EXT 0x905D -#define GL_INT_IMAGE_2D_ARRAY_EXT 0x905E -#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F -#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT 0x9060 -#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061 -#define GL_UNSIGNED_INT_IMAGE_1D_EXT 0x9062 -#define GL_UNSIGNED_INT_IMAGE_2D_EXT 0x9063 -#define GL_UNSIGNED_INT_IMAGE_3D_EXT 0x9064 -#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065 -#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT 0x9066 -#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067 -#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068 -#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069 -#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C -#define GL_MAX_IMAGE_SAMPLES_EXT 0x906D -#define GL_IMAGE_BINDING_FORMAT_EXT 0x906E -#define GL_ALL_BARRIER_BITS_EXT 0xFFFFFFFF - -typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format); -typedef void (GLAPIENTRY * PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers); - -#define glBindImageTextureEXT GLEW_GET_FUN(__glewBindImageTextureEXT) -#define glMemoryBarrierEXT GLEW_GET_FUN(__glewMemoryBarrierEXT) - -#define GLEW_EXT_shader_image_load_store GLEW_GET_VAR(__GLEW_EXT_shader_image_load_store) - -#endif /* GL_EXT_shader_image_load_store */ - -/* ----------------------- GL_EXT_shader_integer_mix ----------------------- */ - -#ifndef GL_EXT_shader_integer_mix -#define GL_EXT_shader_integer_mix 1 - -#define GLEW_EXT_shader_integer_mix GLEW_GET_VAR(__GLEW_EXT_shader_integer_mix) - -#endif /* GL_EXT_shader_integer_mix */ - -/* -------------------------- GL_EXT_shadow_funcs -------------------------- */ - -#ifndef GL_EXT_shadow_funcs -#define GL_EXT_shadow_funcs 1 - -#define GLEW_EXT_shadow_funcs GLEW_GET_VAR(__GLEW_EXT_shadow_funcs) - -#endif /* GL_EXT_shadow_funcs */ - -/* --------------------- GL_EXT_shared_texture_palette --------------------- */ - -#ifndef GL_EXT_shared_texture_palette -#define GL_EXT_shared_texture_palette 1 - -#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB - -#define GLEW_EXT_shared_texture_palette GLEW_GET_VAR(__GLEW_EXT_shared_texture_palette) - -#endif /* GL_EXT_shared_texture_palette */ - -/* ------------------------- GL_EXT_sparse_texture2 ------------------------ */ - -#ifndef GL_EXT_sparse_texture2 -#define GL_EXT_sparse_texture2 1 - -#define GLEW_EXT_sparse_texture2 GLEW_GET_VAR(__GLEW_EXT_sparse_texture2) - -#endif /* GL_EXT_sparse_texture2 */ - -/* ------------------------ GL_EXT_stencil_clear_tag ----------------------- */ - -#ifndef GL_EXT_stencil_clear_tag -#define GL_EXT_stencil_clear_tag 1 - -#define GL_STENCIL_TAG_BITS_EXT 0x88F2 -#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3 - -#define GLEW_EXT_stencil_clear_tag GLEW_GET_VAR(__GLEW_EXT_stencil_clear_tag) - -#endif /* GL_EXT_stencil_clear_tag */ - -/* ------------------------ GL_EXT_stencil_two_side ------------------------ */ - -#ifndef GL_EXT_stencil_two_side -#define GL_EXT_stencil_two_side 1 - -#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 -#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 - -typedef void (GLAPIENTRY * PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); - -#define glActiveStencilFaceEXT GLEW_GET_FUN(__glewActiveStencilFaceEXT) - -#define GLEW_EXT_stencil_two_side GLEW_GET_VAR(__GLEW_EXT_stencil_two_side) - -#endif /* GL_EXT_stencil_two_side */ - -/* -------------------------- GL_EXT_stencil_wrap -------------------------- */ - -#ifndef GL_EXT_stencil_wrap -#define GL_EXT_stencil_wrap 1 - -#define GL_INCR_WRAP_EXT 0x8507 -#define GL_DECR_WRAP_EXT 0x8508 - -#define GLEW_EXT_stencil_wrap GLEW_GET_VAR(__GLEW_EXT_stencil_wrap) - -#endif /* GL_EXT_stencil_wrap */ - -/* --------------------------- GL_EXT_subtexture --------------------------- */ - -#ifndef GL_EXT_subtexture -#define GL_EXT_subtexture 1 - -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); - -#define glTexSubImage1DEXT GLEW_GET_FUN(__glewTexSubImage1DEXT) -#define glTexSubImage2DEXT GLEW_GET_FUN(__glewTexSubImage2DEXT) -#define glTexSubImage3DEXT GLEW_GET_FUN(__glewTexSubImage3DEXT) - -#define GLEW_EXT_subtexture GLEW_GET_VAR(__GLEW_EXT_subtexture) - -#endif /* GL_EXT_subtexture */ - -/* ----------------------------- GL_EXT_texture ---------------------------- */ - -#ifndef GL_EXT_texture -#define GL_EXT_texture 1 - -#define GL_ALPHA4_EXT 0x803B -#define GL_ALPHA8_EXT 0x803C -#define GL_ALPHA12_EXT 0x803D -#define GL_ALPHA16_EXT 0x803E -#define GL_LUMINANCE4_EXT 0x803F -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE12_EXT 0x8041 -#define GL_LUMINANCE16_EXT 0x8042 -#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 -#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 -#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 -#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 -#define GL_INTENSITY_EXT 0x8049 -#define GL_INTENSITY4_EXT 0x804A -#define GL_INTENSITY8_EXT 0x804B -#define GL_INTENSITY12_EXT 0x804C -#define GL_INTENSITY16_EXT 0x804D -#define GL_RGB2_EXT 0x804E -#define GL_RGB4_EXT 0x804F -#define GL_RGB5_EXT 0x8050 -#define GL_RGB8_EXT 0x8051 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB12_EXT 0x8053 -#define GL_RGB16_EXT 0x8054 -#define GL_RGBA2_EXT 0x8055 -#define GL_RGBA4_EXT 0x8056 -#define GL_RGB5_A1_EXT 0x8057 -#define GL_RGBA8_EXT 0x8058 -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGBA12_EXT 0x805A -#define GL_RGBA16_EXT 0x805B -#define GL_TEXTURE_RED_SIZE_EXT 0x805C -#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D -#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E -#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 -#define GL_REPLACE_EXT 0x8062 -#define GL_PROXY_TEXTURE_1D_EXT 0x8063 -#define GL_PROXY_TEXTURE_2D_EXT 0x8064 - -#define GLEW_EXT_texture GLEW_GET_VAR(__GLEW_EXT_texture) - -#endif /* GL_EXT_texture */ - -/* ---------------------------- GL_EXT_texture3D --------------------------- */ - -#ifndef GL_EXT_texture3D -#define GL_EXT_texture3D 1 - -#define GL_PACK_SKIP_IMAGES_EXT 0x806B -#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C -#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D -#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E -#define GL_TEXTURE_3D_EXT 0x806F -#define GL_PROXY_TEXTURE_3D_EXT 0x8070 -#define GL_TEXTURE_DEPTH_EXT 0x8071 -#define GL_TEXTURE_WRAP_R_EXT 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 - -typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); - -#define glTexImage3DEXT GLEW_GET_FUN(__glewTexImage3DEXT) - -#define GLEW_EXT_texture3D GLEW_GET_VAR(__GLEW_EXT_texture3D) - -#endif /* GL_EXT_texture3D */ - -/* -------------------------- GL_EXT_texture_array ------------------------- */ - -#ifndef GL_EXT_texture_array -#define GL_EXT_texture_array 1 - -#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E -#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF -#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 -#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); - -#define glFramebufferTextureLayerEXT GLEW_GET_FUN(__glewFramebufferTextureLayerEXT) - -#define GLEW_EXT_texture_array GLEW_GET_VAR(__GLEW_EXT_texture_array) - -#endif /* GL_EXT_texture_array */ - -/* ---------------------- GL_EXT_texture_buffer_object --------------------- */ - -#ifndef GL_EXT_texture_buffer_object -#define GL_EXT_texture_buffer_object 1 - -#define GL_TEXTURE_BUFFER_EXT 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_EXT 0x8C2E - -typedef void (GLAPIENTRY * PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer); - -#define glTexBufferEXT GLEW_GET_FUN(__glewTexBufferEXT) - -#define GLEW_EXT_texture_buffer_object GLEW_GET_VAR(__GLEW_EXT_texture_buffer_object) - -#endif /* GL_EXT_texture_buffer_object */ - -/* -------------------- GL_EXT_texture_compression_dxt1 -------------------- */ - -#ifndef GL_EXT_texture_compression_dxt1 -#define GL_EXT_texture_compression_dxt1 1 - -#define GLEW_EXT_texture_compression_dxt1 GLEW_GET_VAR(__GLEW_EXT_texture_compression_dxt1) - -#endif /* GL_EXT_texture_compression_dxt1 */ - -/* -------------------- GL_EXT_texture_compression_latc -------------------- */ - -#ifndef GL_EXT_texture_compression_latc -#define GL_EXT_texture_compression_latc 1 - -#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 -#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 -#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72 -#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73 - -#define GLEW_EXT_texture_compression_latc GLEW_GET_VAR(__GLEW_EXT_texture_compression_latc) - -#endif /* GL_EXT_texture_compression_latc */ - -/* -------------------- GL_EXT_texture_compression_rgtc -------------------- */ - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_EXT_texture_compression_rgtc 1 - -#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC -#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD -#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE - -#define GLEW_EXT_texture_compression_rgtc GLEW_GET_VAR(__GLEW_EXT_texture_compression_rgtc) - -#endif /* GL_EXT_texture_compression_rgtc */ - -/* -------------------- GL_EXT_texture_compression_s3tc -------------------- */ - -#ifndef GL_EXT_texture_compression_s3tc -#define GL_EXT_texture_compression_s3tc 1 - -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 - -#define GLEW_EXT_texture_compression_s3tc GLEW_GET_VAR(__GLEW_EXT_texture_compression_s3tc) - -#endif /* GL_EXT_texture_compression_s3tc */ - -/* ------------------------ GL_EXT_texture_cube_map ------------------------ */ - -#ifndef GL_EXT_texture_cube_map -#define GL_EXT_texture_cube_map 1 - -#define GL_NORMAL_MAP_EXT 0x8511 -#define GL_REFLECTION_MAP_EXT 0x8512 -#define GL_TEXTURE_CUBE_MAP_EXT 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C - -#define GLEW_EXT_texture_cube_map GLEW_GET_VAR(__GLEW_EXT_texture_cube_map) - -#endif /* GL_EXT_texture_cube_map */ - -/* ----------------------- GL_EXT_texture_edge_clamp ----------------------- */ - -#ifndef GL_EXT_texture_edge_clamp -#define GL_EXT_texture_edge_clamp 1 - -#define GL_CLAMP_TO_EDGE_EXT 0x812F - -#define GLEW_EXT_texture_edge_clamp GLEW_GET_VAR(__GLEW_EXT_texture_edge_clamp) - -#endif /* GL_EXT_texture_edge_clamp */ - -/* --------------------------- GL_EXT_texture_env -------------------------- */ - -#ifndef GL_EXT_texture_env -#define GL_EXT_texture_env 1 - -#define GLEW_EXT_texture_env GLEW_GET_VAR(__GLEW_EXT_texture_env) - -#endif /* GL_EXT_texture_env */ - -/* ------------------------- GL_EXT_texture_env_add ------------------------ */ - -#ifndef GL_EXT_texture_env_add -#define GL_EXT_texture_env_add 1 - -#define GLEW_EXT_texture_env_add GLEW_GET_VAR(__GLEW_EXT_texture_env_add) - -#endif /* GL_EXT_texture_env_add */ - -/* ----------------------- GL_EXT_texture_env_combine ---------------------- */ - -#ifndef GL_EXT_texture_env_combine -#define GL_EXT_texture_env_combine 1 - -#define GL_COMBINE_EXT 0x8570 -#define GL_COMBINE_RGB_EXT 0x8571 -#define GL_COMBINE_ALPHA_EXT 0x8572 -#define GL_RGB_SCALE_EXT 0x8573 -#define GL_ADD_SIGNED_EXT 0x8574 -#define GL_INTERPOLATE_EXT 0x8575 -#define GL_CONSTANT_EXT 0x8576 -#define GL_PRIMARY_COLOR_EXT 0x8577 -#define GL_PREVIOUS_EXT 0x8578 -#define GL_SOURCE0_RGB_EXT 0x8580 -#define GL_SOURCE1_RGB_EXT 0x8581 -#define GL_SOURCE2_RGB_EXT 0x8582 -#define GL_SOURCE0_ALPHA_EXT 0x8588 -#define GL_SOURCE1_ALPHA_EXT 0x8589 -#define GL_SOURCE2_ALPHA_EXT 0x858A -#define GL_OPERAND0_RGB_EXT 0x8590 -#define GL_OPERAND1_RGB_EXT 0x8591 -#define GL_OPERAND2_RGB_EXT 0x8592 -#define GL_OPERAND0_ALPHA_EXT 0x8598 -#define GL_OPERAND1_ALPHA_EXT 0x8599 -#define GL_OPERAND2_ALPHA_EXT 0x859A - -#define GLEW_EXT_texture_env_combine GLEW_GET_VAR(__GLEW_EXT_texture_env_combine) - -#endif /* GL_EXT_texture_env_combine */ - -/* ------------------------ GL_EXT_texture_env_dot3 ------------------------ */ - -#ifndef GL_EXT_texture_env_dot3 -#define GL_EXT_texture_env_dot3 1 - -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 - -#define GLEW_EXT_texture_env_dot3 GLEW_GET_VAR(__GLEW_EXT_texture_env_dot3) - -#endif /* GL_EXT_texture_env_dot3 */ - -/* ------------------- GL_EXT_texture_filter_anisotropic ------------------- */ - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 - -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF - -#define GLEW_EXT_texture_filter_anisotropic GLEW_GET_VAR(__GLEW_EXT_texture_filter_anisotropic) - -#endif /* GL_EXT_texture_filter_anisotropic */ - -/* ---------------------- GL_EXT_texture_filter_minmax --------------------- */ - -#ifndef GL_EXT_texture_filter_minmax -#define GL_EXT_texture_filter_minmax 1 - -#define GL_TEXTURE_REDUCTION_MODE_EXT 0x9366 -#define GL_WEIGHTED_AVERAGE_EXT 0x9367 - -#define GLEW_EXT_texture_filter_minmax GLEW_GET_VAR(__GLEW_EXT_texture_filter_minmax) - -#endif /* GL_EXT_texture_filter_minmax */ - -/* ------------------------- GL_EXT_texture_integer ------------------------ */ - -#ifndef GL_EXT_texture_integer -#define GL_EXT_texture_integer 1 - -#define GL_RGBA32UI_EXT 0x8D70 -#define GL_RGB32UI_EXT 0x8D71 -#define GL_ALPHA32UI_EXT 0x8D72 -#define GL_INTENSITY32UI_EXT 0x8D73 -#define GL_LUMINANCE32UI_EXT 0x8D74 -#define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 -#define GL_RGBA16UI_EXT 0x8D76 -#define GL_RGB16UI_EXT 0x8D77 -#define GL_ALPHA16UI_EXT 0x8D78 -#define GL_INTENSITY16UI_EXT 0x8D79 -#define GL_LUMINANCE16UI_EXT 0x8D7A -#define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B -#define GL_RGBA8UI_EXT 0x8D7C -#define GL_RGB8UI_EXT 0x8D7D -#define GL_ALPHA8UI_EXT 0x8D7E -#define GL_INTENSITY8UI_EXT 0x8D7F -#define GL_LUMINANCE8UI_EXT 0x8D80 -#define GL_LUMINANCE_ALPHA8UI_EXT 0x8D81 -#define GL_RGBA32I_EXT 0x8D82 -#define GL_RGB32I_EXT 0x8D83 -#define GL_ALPHA32I_EXT 0x8D84 -#define GL_INTENSITY32I_EXT 0x8D85 -#define GL_LUMINANCE32I_EXT 0x8D86 -#define GL_LUMINANCE_ALPHA32I_EXT 0x8D87 -#define GL_RGBA16I_EXT 0x8D88 -#define GL_RGB16I_EXT 0x8D89 -#define GL_ALPHA16I_EXT 0x8D8A -#define GL_INTENSITY16I_EXT 0x8D8B -#define GL_LUMINANCE16I_EXT 0x8D8C -#define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D -#define GL_RGBA8I_EXT 0x8D8E -#define GL_RGB8I_EXT 0x8D8F -#define GL_ALPHA8I_EXT 0x8D90 -#define GL_INTENSITY8I_EXT 0x8D91 -#define GL_LUMINANCE8I_EXT 0x8D92 -#define GL_LUMINANCE_ALPHA8I_EXT 0x8D93 -#define GL_RED_INTEGER_EXT 0x8D94 -#define GL_GREEN_INTEGER_EXT 0x8D95 -#define GL_BLUE_INTEGER_EXT 0x8D96 -#define GL_ALPHA_INTEGER_EXT 0x8D97 -#define GL_RGB_INTEGER_EXT 0x8D98 -#define GL_RGBA_INTEGER_EXT 0x8D99 -#define GL_BGR_INTEGER_EXT 0x8D9A -#define GL_BGRA_INTEGER_EXT 0x8D9B -#define GL_LUMINANCE_INTEGER_EXT 0x8D9C -#define GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D -#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E - -typedef void (GLAPIENTRY * PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha); -typedef void (GLAPIENTRY * PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params); - -#define glClearColorIiEXT GLEW_GET_FUN(__glewClearColorIiEXT) -#define glClearColorIuiEXT GLEW_GET_FUN(__glewClearColorIuiEXT) -#define glGetTexParameterIivEXT GLEW_GET_FUN(__glewGetTexParameterIivEXT) -#define glGetTexParameterIuivEXT GLEW_GET_FUN(__glewGetTexParameterIuivEXT) -#define glTexParameterIivEXT GLEW_GET_FUN(__glewTexParameterIivEXT) -#define glTexParameterIuivEXT GLEW_GET_FUN(__glewTexParameterIuivEXT) - -#define GLEW_EXT_texture_integer GLEW_GET_VAR(__GLEW_EXT_texture_integer) - -#endif /* GL_EXT_texture_integer */ - -/* ------------------------ GL_EXT_texture_lod_bias ------------------------ */ - -#ifndef GL_EXT_texture_lod_bias -#define GL_EXT_texture_lod_bias 1 - -#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD -#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 -#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 - -#define GLEW_EXT_texture_lod_bias GLEW_GET_VAR(__GLEW_EXT_texture_lod_bias) - -#endif /* GL_EXT_texture_lod_bias */ - -/* ---------------------- GL_EXT_texture_mirror_clamp ---------------------- */ - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_EXT_texture_mirror_clamp 1 - -#define GL_MIRROR_CLAMP_EXT 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 -#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 - -#define GLEW_EXT_texture_mirror_clamp GLEW_GET_VAR(__GLEW_EXT_texture_mirror_clamp) - -#endif /* GL_EXT_texture_mirror_clamp */ - -/* ------------------------- GL_EXT_texture_object ------------------------- */ - -#ifndef GL_EXT_texture_object -#define GL_EXT_texture_object 1 - -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A - -typedef GLboolean (GLAPIENTRY * PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint* textures, GLboolean* residences); -typedef void (GLAPIENTRY * PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture); -typedef void (GLAPIENTRY * PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint* textures); -typedef void (GLAPIENTRY * PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint* textures); -typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREEXTPROC) (GLuint texture); -typedef void (GLAPIENTRY * PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint* textures, const GLclampf* priorities); - -#define glAreTexturesResidentEXT GLEW_GET_FUN(__glewAreTexturesResidentEXT) -#define glBindTextureEXT GLEW_GET_FUN(__glewBindTextureEXT) -#define glDeleteTexturesEXT GLEW_GET_FUN(__glewDeleteTexturesEXT) -#define glGenTexturesEXT GLEW_GET_FUN(__glewGenTexturesEXT) -#define glIsTextureEXT GLEW_GET_FUN(__glewIsTextureEXT) -#define glPrioritizeTexturesEXT GLEW_GET_FUN(__glewPrioritizeTexturesEXT) - -#define GLEW_EXT_texture_object GLEW_GET_VAR(__GLEW_EXT_texture_object) - -#endif /* GL_EXT_texture_object */ - -/* --------------------- GL_EXT_texture_perturb_normal --------------------- */ - -#ifndef GL_EXT_texture_perturb_normal -#define GL_EXT_texture_perturb_normal 1 - -#define GL_PERTURB_EXT 0x85AE -#define GL_TEXTURE_NORMAL_EXT 0x85AF - -typedef void (GLAPIENTRY * PFNGLTEXTURENORMALEXTPROC) (GLenum mode); - -#define glTextureNormalEXT GLEW_GET_FUN(__glewTextureNormalEXT) - -#define GLEW_EXT_texture_perturb_normal GLEW_GET_VAR(__GLEW_EXT_texture_perturb_normal) - -#endif /* GL_EXT_texture_perturb_normal */ - -/* ------------------------ GL_EXT_texture_rectangle ----------------------- */ - -#ifndef GL_EXT_texture_rectangle -#define GL_EXT_texture_rectangle 1 - -#define GL_TEXTURE_RECTANGLE_EXT 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_EXT 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_EXT 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT 0x84F8 - -#define GLEW_EXT_texture_rectangle GLEW_GET_VAR(__GLEW_EXT_texture_rectangle) - -#endif /* GL_EXT_texture_rectangle */ - -/* -------------------------- GL_EXT_texture_sRGB -------------------------- */ - -#ifndef GL_EXT_texture_sRGB -#define GL_EXT_texture_sRGB 1 - -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB8_EXT 0x8C41 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 -#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 -#define GL_SLUMINANCE_EXT 0x8C46 -#define GL_SLUMINANCE8_EXT 0x8C47 -#define GL_COMPRESSED_SRGB_EXT 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 -#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B -#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F - -#define GLEW_EXT_texture_sRGB GLEW_GET_VAR(__GLEW_EXT_texture_sRGB) - -#endif /* GL_EXT_texture_sRGB */ - -/* ----------------------- GL_EXT_texture_sRGB_decode ---------------------- */ - -#ifndef GL_EXT_texture_sRGB_decode -#define GL_EXT_texture_sRGB_decode 1 - -#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48 -#define GL_DECODE_EXT 0x8A49 -#define GL_SKIP_DECODE_EXT 0x8A4A - -#define GLEW_EXT_texture_sRGB_decode GLEW_GET_VAR(__GLEW_EXT_texture_sRGB_decode) - -#endif /* GL_EXT_texture_sRGB_decode */ - -/* --------------------- GL_EXT_texture_shared_exponent -------------------- */ - -#ifndef GL_EXT_texture_shared_exponent -#define GL_EXT_texture_shared_exponent 1 - -#define GL_RGB9_E5_EXT 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E -#define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F - -#define GLEW_EXT_texture_shared_exponent GLEW_GET_VAR(__GLEW_EXT_texture_shared_exponent) - -#endif /* GL_EXT_texture_shared_exponent */ - -/* -------------------------- GL_EXT_texture_snorm ------------------------- */ - -#ifndef GL_EXT_texture_snorm -#define GL_EXT_texture_snorm 1 - -#define GL_RED_SNORM 0x8F90 -#define GL_RG_SNORM 0x8F91 -#define GL_RGB_SNORM 0x8F92 -#define GL_RGBA_SNORM 0x8F93 -#define GL_R8_SNORM 0x8F94 -#define GL_RG8_SNORM 0x8F95 -#define GL_RGB8_SNORM 0x8F96 -#define GL_RGBA8_SNORM 0x8F97 -#define GL_R16_SNORM 0x8F98 -#define GL_RG16_SNORM 0x8F99 -#define GL_RGB16_SNORM 0x8F9A -#define GL_RGBA16_SNORM 0x8F9B -#define GL_SIGNED_NORMALIZED 0x8F9C -#define GL_ALPHA_SNORM 0x9010 -#define GL_LUMINANCE_SNORM 0x9011 -#define GL_LUMINANCE_ALPHA_SNORM 0x9012 -#define GL_INTENSITY_SNORM 0x9013 -#define GL_ALPHA8_SNORM 0x9014 -#define GL_LUMINANCE8_SNORM 0x9015 -#define GL_LUMINANCE8_ALPHA8_SNORM 0x9016 -#define GL_INTENSITY8_SNORM 0x9017 -#define GL_ALPHA16_SNORM 0x9018 -#define GL_LUMINANCE16_SNORM 0x9019 -#define GL_LUMINANCE16_ALPHA16_SNORM 0x901A -#define GL_INTENSITY16_SNORM 0x901B - -#define GLEW_EXT_texture_snorm GLEW_GET_VAR(__GLEW_EXT_texture_snorm) - -#endif /* GL_EXT_texture_snorm */ - -/* ------------------------- GL_EXT_texture_swizzle ------------------------ */ - -#ifndef GL_EXT_texture_swizzle -#define GL_EXT_texture_swizzle 1 - -#define GL_TEXTURE_SWIZZLE_R_EXT 0x8E42 -#define GL_TEXTURE_SWIZZLE_G_EXT 0x8E43 -#define GL_TEXTURE_SWIZZLE_B_EXT 0x8E44 -#define GL_TEXTURE_SWIZZLE_A_EXT 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA_EXT 0x8E46 - -#define GLEW_EXT_texture_swizzle GLEW_GET_VAR(__GLEW_EXT_texture_swizzle) - -#endif /* GL_EXT_texture_swizzle */ - -/* --------------------------- GL_EXT_timer_query -------------------------- */ - -#ifndef GL_EXT_timer_query -#define GL_EXT_timer_query 1 - -#define GL_TIME_ELAPSED_EXT 0x88BF - -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params); - -#define glGetQueryObjecti64vEXT GLEW_GET_FUN(__glewGetQueryObjecti64vEXT) -#define glGetQueryObjectui64vEXT GLEW_GET_FUN(__glewGetQueryObjectui64vEXT) - -#define GLEW_EXT_timer_query GLEW_GET_VAR(__GLEW_EXT_timer_query) - -#endif /* GL_EXT_timer_query */ - -/* ----------------------- GL_EXT_transform_feedback ----------------------- */ - -#ifndef GL_EXT_transform_feedback -#define GL_EXT_transform_feedback 1 - -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85 -#define GL_PRIMITIVES_GENERATED_EXT 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88 -#define GL_RASTERIZER_DISCARD_EXT 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B -#define GL_INTERLEAVED_ATTRIBS_EXT 0x8C8C -#define GL_SEPARATE_ATTRIBS_EXT 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F - -typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar * const* varyings, GLenum bufferMode); - -#define glBeginTransformFeedbackEXT GLEW_GET_FUN(__glewBeginTransformFeedbackEXT) -#define glBindBufferBaseEXT GLEW_GET_FUN(__glewBindBufferBaseEXT) -#define glBindBufferOffsetEXT GLEW_GET_FUN(__glewBindBufferOffsetEXT) -#define glBindBufferRangeEXT GLEW_GET_FUN(__glewBindBufferRangeEXT) -#define glEndTransformFeedbackEXT GLEW_GET_FUN(__glewEndTransformFeedbackEXT) -#define glGetTransformFeedbackVaryingEXT GLEW_GET_FUN(__glewGetTransformFeedbackVaryingEXT) -#define glTransformFeedbackVaryingsEXT GLEW_GET_FUN(__glewTransformFeedbackVaryingsEXT) - -#define GLEW_EXT_transform_feedback GLEW_GET_VAR(__GLEW_EXT_transform_feedback) - -#endif /* GL_EXT_transform_feedback */ - -/* -------------------------- GL_EXT_vertex_array -------------------------- */ - -#ifndef GL_EXT_vertex_array -#define GL_EXT_vertex_array 1 - -#define GL_DOUBLE_EXT 0x140A -#define GL_VERTEX_ARRAY_EXT 0x8074 -#define GL_NORMAL_ARRAY_EXT 0x8075 -#define GL_COLOR_ARRAY_EXT 0x8076 -#define GL_INDEX_ARRAY_EXT 0x8077 -#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 -#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 -#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A -#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B -#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C -#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D -#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E -#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F -#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 -#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 -#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 -#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 -#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 -#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 -#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 -#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 -#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A -#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B -#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C -#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D -#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E -#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F -#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 -#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 - -typedef void (GLAPIENTRY * PFNGLARRAYELEMENTEXTPROC) (GLint i); -typedef void (GLAPIENTRY * PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer); -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean* pointer); -typedef void (GLAPIENTRY * PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer); -typedef void (GLAPIENTRY * PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer); -typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer); - -#define glArrayElementEXT GLEW_GET_FUN(__glewArrayElementEXT) -#define glColorPointerEXT GLEW_GET_FUN(__glewColorPointerEXT) -#define glDrawArraysEXT GLEW_GET_FUN(__glewDrawArraysEXT) -#define glEdgeFlagPointerEXT GLEW_GET_FUN(__glewEdgeFlagPointerEXT) -#define glIndexPointerEXT GLEW_GET_FUN(__glewIndexPointerEXT) -#define glNormalPointerEXT GLEW_GET_FUN(__glewNormalPointerEXT) -#define glTexCoordPointerEXT GLEW_GET_FUN(__glewTexCoordPointerEXT) -#define glVertexPointerEXT GLEW_GET_FUN(__glewVertexPointerEXT) - -#define GLEW_EXT_vertex_array GLEW_GET_VAR(__GLEW_EXT_vertex_array) - -#endif /* GL_EXT_vertex_array */ - -/* ------------------------ GL_EXT_vertex_array_bgra ----------------------- */ - -#ifndef GL_EXT_vertex_array_bgra -#define GL_EXT_vertex_array_bgra 1 - -#define GL_BGRA 0x80E1 - -#define GLEW_EXT_vertex_array_bgra GLEW_GET_VAR(__GLEW_EXT_vertex_array_bgra) - -#endif /* GL_EXT_vertex_array_bgra */ - -/* ----------------------- GL_EXT_vertex_attrib_64bit ---------------------- */ - -#ifndef GL_EXT_vertex_attrib_64bit -#define GL_EXT_vertex_attrib_64bit 1 - -#define GL_DOUBLE_MAT2_EXT 0x8F46 -#define GL_DOUBLE_MAT3_EXT 0x8F47 -#define GL_DOUBLE_MAT4_EXT 0x8F48 -#define GL_DOUBLE_MAT2x3_EXT 0x8F49 -#define GL_DOUBLE_MAT2x4_EXT 0x8F4A -#define GL_DOUBLE_MAT3x2_EXT 0x8F4B -#define GL_DOUBLE_MAT3x4_EXT 0x8F4C -#define GL_DOUBLE_MAT4x2_EXT 0x8F4D -#define GL_DOUBLE_MAT4x3_EXT 0x8F4E -#define GL_DOUBLE_VEC2_EXT 0x8FFC -#define GL_DOUBLE_VEC3_EXT 0x8FFD -#define GL_DOUBLE_VEC4_EXT 0x8FFE - -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); - -#define glGetVertexAttribLdvEXT GLEW_GET_FUN(__glewGetVertexAttribLdvEXT) -#define glVertexArrayVertexAttribLOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribLOffsetEXT) -#define glVertexAttribL1dEXT GLEW_GET_FUN(__glewVertexAttribL1dEXT) -#define glVertexAttribL1dvEXT GLEW_GET_FUN(__glewVertexAttribL1dvEXT) -#define glVertexAttribL2dEXT GLEW_GET_FUN(__glewVertexAttribL2dEXT) -#define glVertexAttribL2dvEXT GLEW_GET_FUN(__glewVertexAttribL2dvEXT) -#define glVertexAttribL3dEXT GLEW_GET_FUN(__glewVertexAttribL3dEXT) -#define glVertexAttribL3dvEXT GLEW_GET_FUN(__glewVertexAttribL3dvEXT) -#define glVertexAttribL4dEXT GLEW_GET_FUN(__glewVertexAttribL4dEXT) -#define glVertexAttribL4dvEXT GLEW_GET_FUN(__glewVertexAttribL4dvEXT) -#define glVertexAttribLPointerEXT GLEW_GET_FUN(__glewVertexAttribLPointerEXT) - -#define GLEW_EXT_vertex_attrib_64bit GLEW_GET_VAR(__GLEW_EXT_vertex_attrib_64bit) - -#endif /* GL_EXT_vertex_attrib_64bit */ - -/* -------------------------- GL_EXT_vertex_shader ------------------------- */ - -#ifndef GL_EXT_vertex_shader -#define GL_EXT_vertex_shader 1 - -#define GL_VERTEX_SHADER_EXT 0x8780 -#define GL_VERTEX_SHADER_BINDING_EXT 0x8781 -#define GL_OP_INDEX_EXT 0x8782 -#define GL_OP_NEGATE_EXT 0x8783 -#define GL_OP_DOT3_EXT 0x8784 -#define GL_OP_DOT4_EXT 0x8785 -#define GL_OP_MUL_EXT 0x8786 -#define GL_OP_ADD_EXT 0x8787 -#define GL_OP_MADD_EXT 0x8788 -#define GL_OP_FRAC_EXT 0x8789 -#define GL_OP_MAX_EXT 0x878A -#define GL_OP_MIN_EXT 0x878B -#define GL_OP_SET_GE_EXT 0x878C -#define GL_OP_SET_LT_EXT 0x878D -#define GL_OP_CLAMP_EXT 0x878E -#define GL_OP_FLOOR_EXT 0x878F -#define GL_OP_ROUND_EXT 0x8790 -#define GL_OP_EXP_BASE_2_EXT 0x8791 -#define GL_OP_LOG_BASE_2_EXT 0x8792 -#define GL_OP_POWER_EXT 0x8793 -#define GL_OP_RECIP_EXT 0x8794 -#define GL_OP_RECIP_SQRT_EXT 0x8795 -#define GL_OP_SUB_EXT 0x8796 -#define GL_OP_CROSS_PRODUCT_EXT 0x8797 -#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798 -#define GL_OP_MOV_EXT 0x8799 -#define GL_OUTPUT_VERTEX_EXT 0x879A -#define GL_OUTPUT_COLOR0_EXT 0x879B -#define GL_OUTPUT_COLOR1_EXT 0x879C -#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D -#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E -#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F -#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0 -#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1 -#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2 -#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3 -#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4 -#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5 -#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 -#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7 -#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8 -#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9 -#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA -#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB -#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC -#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD -#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE -#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF -#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0 -#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1 -#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2 -#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3 -#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4 -#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5 -#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6 -#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7 -#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8 -#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9 -#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA -#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB -#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC -#define GL_OUTPUT_FOG_EXT 0x87BD -#define GL_SCALAR_EXT 0x87BE -#define GL_VECTOR_EXT 0x87BF -#define GL_MATRIX_EXT 0x87C0 -#define GL_VARIANT_EXT 0x87C1 -#define GL_INVARIANT_EXT 0x87C2 -#define GL_LOCAL_CONSTANT_EXT 0x87C3 -#define GL_LOCAL_EXT 0x87C4 -#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5 -#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6 -#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7 -#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8 -#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9 -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CC -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CD -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE -#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF -#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0 -#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1 -#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2 -#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3 -#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4 -#define GL_X_EXT 0x87D5 -#define GL_Y_EXT 0x87D6 -#define GL_Z_EXT 0x87D7 -#define GL_W_EXT 0x87D8 -#define GL_NEGATIVE_X_EXT 0x87D9 -#define GL_NEGATIVE_Y_EXT 0x87DA -#define GL_NEGATIVE_Z_EXT 0x87DB -#define GL_NEGATIVE_W_EXT 0x87DC -#define GL_ZERO_EXT 0x87DD -#define GL_ONE_EXT 0x87DE -#define GL_NEGATIVE_ONE_EXT 0x87DF -#define GL_NORMALIZED_RANGE_EXT 0x87E0 -#define GL_FULL_RANGE_EXT 0x87E1 -#define GL_CURRENT_VERTEX_EXT 0x87E2 -#define GL_MVP_MATRIX_EXT 0x87E3 -#define GL_VARIANT_VALUE_EXT 0x87E4 -#define GL_VARIANT_DATATYPE_EXT 0x87E5 -#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6 -#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7 -#define GL_VARIANT_ARRAY_EXT 0x87E8 -#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9 -#define GL_INVARIANT_VALUE_EXT 0x87EA -#define GL_INVARIANT_DATATYPE_EXT 0x87EB -#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC -#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED - -typedef void (GLAPIENTRY * PFNGLBEGINVERTEXSHADEREXTPROC) (void); -typedef GLuint (GLAPIENTRY * PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value); -typedef GLuint (GLAPIENTRY * PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value); -typedef GLuint (GLAPIENTRY * PFNGLBINDPARAMETEREXTPROC) (GLenum value); -typedef GLuint (GLAPIENTRY * PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value); -typedef GLuint (GLAPIENTRY * PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value); -typedef void (GLAPIENTRY * PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLENDVERTEXSHADEREXTPROC) (void); -typedef void (GLAPIENTRY * PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef GLuint (GLAPIENTRY * PFNGLGENSYMBOLSEXTPROC) (GLenum dataType, GLenum storageType, GLenum range, GLuint components); -typedef GLuint (GLAPIENTRY * PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range); -typedef void (GLAPIENTRY * PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (GLAPIENTRY * PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (GLAPIENTRY * PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (GLAPIENTRY * PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (GLAPIENTRY * PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (GLAPIENTRY * PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (GLAPIENTRY * PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, void **data); -typedef void (GLAPIENTRY * PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef GLboolean (GLAPIENTRY * PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap); -typedef void (GLAPIENTRY * PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, void *addr); -typedef void (GLAPIENTRY * PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, void *addr); -typedef void (GLAPIENTRY * PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1); -typedef void (GLAPIENTRY * PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -typedef void (GLAPIENTRY * PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -typedef void (GLAPIENTRY * PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (GLAPIENTRY * PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, void *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTBVEXTPROC) (GLuint id, GLbyte *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTDVEXTPROC) (GLuint id, GLdouble *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTFVEXTPROC) (GLuint id, GLfloat *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTIVEXTPROC) (GLuint id, GLint *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTSVEXTPROC) (GLuint id, GLshort *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTUBVEXTPROC) (GLuint id, GLubyte *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTUIVEXTPROC) (GLuint id, GLuint *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTUSVEXTPROC) (GLuint id, GLushort *addr); -typedef void (GLAPIENTRY * PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); - -#define glBeginVertexShaderEXT GLEW_GET_FUN(__glewBeginVertexShaderEXT) -#define glBindLightParameterEXT GLEW_GET_FUN(__glewBindLightParameterEXT) -#define glBindMaterialParameterEXT GLEW_GET_FUN(__glewBindMaterialParameterEXT) -#define glBindParameterEXT GLEW_GET_FUN(__glewBindParameterEXT) -#define glBindTexGenParameterEXT GLEW_GET_FUN(__glewBindTexGenParameterEXT) -#define glBindTextureUnitParameterEXT GLEW_GET_FUN(__glewBindTextureUnitParameterEXT) -#define glBindVertexShaderEXT GLEW_GET_FUN(__glewBindVertexShaderEXT) -#define glDeleteVertexShaderEXT GLEW_GET_FUN(__glewDeleteVertexShaderEXT) -#define glDisableVariantClientStateEXT GLEW_GET_FUN(__glewDisableVariantClientStateEXT) -#define glEnableVariantClientStateEXT GLEW_GET_FUN(__glewEnableVariantClientStateEXT) -#define glEndVertexShaderEXT GLEW_GET_FUN(__glewEndVertexShaderEXT) -#define glExtractComponentEXT GLEW_GET_FUN(__glewExtractComponentEXT) -#define glGenSymbolsEXT GLEW_GET_FUN(__glewGenSymbolsEXT) -#define glGenVertexShadersEXT GLEW_GET_FUN(__glewGenVertexShadersEXT) -#define glGetInvariantBooleanvEXT GLEW_GET_FUN(__glewGetInvariantBooleanvEXT) -#define glGetInvariantFloatvEXT GLEW_GET_FUN(__glewGetInvariantFloatvEXT) -#define glGetInvariantIntegervEXT GLEW_GET_FUN(__glewGetInvariantIntegervEXT) -#define glGetLocalConstantBooleanvEXT GLEW_GET_FUN(__glewGetLocalConstantBooleanvEXT) -#define glGetLocalConstantFloatvEXT GLEW_GET_FUN(__glewGetLocalConstantFloatvEXT) -#define glGetLocalConstantIntegervEXT GLEW_GET_FUN(__glewGetLocalConstantIntegervEXT) -#define glGetVariantBooleanvEXT GLEW_GET_FUN(__glewGetVariantBooleanvEXT) -#define glGetVariantFloatvEXT GLEW_GET_FUN(__glewGetVariantFloatvEXT) -#define glGetVariantIntegervEXT GLEW_GET_FUN(__glewGetVariantIntegervEXT) -#define glGetVariantPointervEXT GLEW_GET_FUN(__glewGetVariantPointervEXT) -#define glInsertComponentEXT GLEW_GET_FUN(__glewInsertComponentEXT) -#define glIsVariantEnabledEXT GLEW_GET_FUN(__glewIsVariantEnabledEXT) -#define glSetInvariantEXT GLEW_GET_FUN(__glewSetInvariantEXT) -#define glSetLocalConstantEXT GLEW_GET_FUN(__glewSetLocalConstantEXT) -#define glShaderOp1EXT GLEW_GET_FUN(__glewShaderOp1EXT) -#define glShaderOp2EXT GLEW_GET_FUN(__glewShaderOp2EXT) -#define glShaderOp3EXT GLEW_GET_FUN(__glewShaderOp3EXT) -#define glSwizzleEXT GLEW_GET_FUN(__glewSwizzleEXT) -#define glVariantPointerEXT GLEW_GET_FUN(__glewVariantPointerEXT) -#define glVariantbvEXT GLEW_GET_FUN(__glewVariantbvEXT) -#define glVariantdvEXT GLEW_GET_FUN(__glewVariantdvEXT) -#define glVariantfvEXT GLEW_GET_FUN(__glewVariantfvEXT) -#define glVariantivEXT GLEW_GET_FUN(__glewVariantivEXT) -#define glVariantsvEXT GLEW_GET_FUN(__glewVariantsvEXT) -#define glVariantubvEXT GLEW_GET_FUN(__glewVariantubvEXT) -#define glVariantuivEXT GLEW_GET_FUN(__glewVariantuivEXT) -#define glVariantusvEXT GLEW_GET_FUN(__glewVariantusvEXT) -#define glWriteMaskEXT GLEW_GET_FUN(__glewWriteMaskEXT) - -#define GLEW_EXT_vertex_shader GLEW_GET_VAR(__GLEW_EXT_vertex_shader) - -#endif /* GL_EXT_vertex_shader */ - -/* ------------------------ GL_EXT_vertex_weighting ------------------------ */ - -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 - -#define GL_MODELVIEW0_STACK_DEPTH_EXT 0x0BA3 -#define GL_MODELVIEW0_MATRIX_EXT 0x0BA6 -#define GL_MODELVIEW0_EXT 0x1700 -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 - -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, void *pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight); -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFVEXTPROC) (GLfloat* weight); - -#define glVertexWeightPointerEXT GLEW_GET_FUN(__glewVertexWeightPointerEXT) -#define glVertexWeightfEXT GLEW_GET_FUN(__glewVertexWeightfEXT) -#define glVertexWeightfvEXT GLEW_GET_FUN(__glewVertexWeightfvEXT) - -#define GLEW_EXT_vertex_weighting GLEW_GET_VAR(__GLEW_EXT_vertex_weighting) - -#endif /* GL_EXT_vertex_weighting */ - -/* ------------------------ GL_EXT_window_rectangles ----------------------- */ - -#ifndef GL_EXT_window_rectangles -#define GL_EXT_window_rectangles 1 - -#define GL_INCLUSIVE_EXT 0x8F10 -#define GL_EXCLUSIVE_EXT 0x8F11 -#define GL_WINDOW_RECTANGLE_EXT 0x8F12 -#define GL_WINDOW_RECTANGLE_MODE_EXT 0x8F13 -#define GL_MAX_WINDOW_RECTANGLES_EXT 0x8F14 -#define GL_NUM_WINDOW_RECTANGLES_EXT 0x8F15 - -typedef void (GLAPIENTRY * PFNGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint box[]); - -#define glWindowRectanglesEXT GLEW_GET_FUN(__glewWindowRectanglesEXT) - -#define GLEW_EXT_window_rectangles GLEW_GET_VAR(__GLEW_EXT_window_rectangles) - -#endif /* GL_EXT_window_rectangles */ - -/* ------------------------- GL_EXT_x11_sync_object ------------------------ */ - -#ifndef GL_EXT_x11_sync_object -#define GL_EXT_x11_sync_object 1 - -#define GL_SYNC_X11_FENCE_EXT 0x90E1 - -typedef GLsync (GLAPIENTRY * PFNGLIMPORTSYNCEXTPROC) (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags); - -#define glImportSyncEXT GLEW_GET_FUN(__glewImportSyncEXT) - -#define GLEW_EXT_x11_sync_object GLEW_GET_VAR(__GLEW_EXT_x11_sync_object) - -#endif /* GL_EXT_x11_sync_object */ - -/* ---------------------- GL_GREMEDY_frame_terminator ---------------------- */ - -#ifndef GL_GREMEDY_frame_terminator -#define GL_GREMEDY_frame_terminator 1 - -typedef void (GLAPIENTRY * PFNGLFRAMETERMINATORGREMEDYPROC) (void); - -#define glFrameTerminatorGREMEDY GLEW_GET_FUN(__glewFrameTerminatorGREMEDY) - -#define GLEW_GREMEDY_frame_terminator GLEW_GET_VAR(__GLEW_GREMEDY_frame_terminator) - -#endif /* GL_GREMEDY_frame_terminator */ - -/* ------------------------ GL_GREMEDY_string_marker ----------------------- */ - -#ifndef GL_GREMEDY_string_marker -#define GL_GREMEDY_string_marker 1 - -typedef void (GLAPIENTRY * PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const void *string); - -#define glStringMarkerGREMEDY GLEW_GET_FUN(__glewStringMarkerGREMEDY) - -#define GLEW_GREMEDY_string_marker GLEW_GET_VAR(__GLEW_GREMEDY_string_marker) - -#endif /* GL_GREMEDY_string_marker */ - -/* --------------------- GL_HP_convolution_border_modes -------------------- */ - -#ifndef GL_HP_convolution_border_modes -#define GL_HP_convolution_border_modes 1 - -#define GLEW_HP_convolution_border_modes GLEW_GET_VAR(__GLEW_HP_convolution_border_modes) - -#endif /* GL_HP_convolution_border_modes */ - -/* ------------------------- GL_HP_image_transform ------------------------- */ - -#ifndef GL_HP_image_transform -#define GL_HP_image_transform 1 - -typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, const GLfloat param); -typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, const GLint param); -typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params); - -#define glGetImageTransformParameterfvHP GLEW_GET_FUN(__glewGetImageTransformParameterfvHP) -#define glGetImageTransformParameterivHP GLEW_GET_FUN(__glewGetImageTransformParameterivHP) -#define glImageTransformParameterfHP GLEW_GET_FUN(__glewImageTransformParameterfHP) -#define glImageTransformParameterfvHP GLEW_GET_FUN(__glewImageTransformParameterfvHP) -#define glImageTransformParameteriHP GLEW_GET_FUN(__glewImageTransformParameteriHP) -#define glImageTransformParameterivHP GLEW_GET_FUN(__glewImageTransformParameterivHP) - -#define GLEW_HP_image_transform GLEW_GET_VAR(__GLEW_HP_image_transform) - -#endif /* GL_HP_image_transform */ - -/* -------------------------- GL_HP_occlusion_test ------------------------- */ - -#ifndef GL_HP_occlusion_test -#define GL_HP_occlusion_test 1 - -#define GLEW_HP_occlusion_test GLEW_GET_VAR(__GLEW_HP_occlusion_test) - -#endif /* GL_HP_occlusion_test */ - -/* ------------------------- GL_HP_texture_lighting ------------------------ */ - -#ifndef GL_HP_texture_lighting -#define GL_HP_texture_lighting 1 - -#define GLEW_HP_texture_lighting GLEW_GET_VAR(__GLEW_HP_texture_lighting) - -#endif /* GL_HP_texture_lighting */ - -/* --------------------------- GL_IBM_cull_vertex -------------------------- */ - -#ifndef GL_IBM_cull_vertex -#define GL_IBM_cull_vertex 1 - -#define GL_CULL_VERTEX_IBM 103050 - -#define GLEW_IBM_cull_vertex GLEW_GET_VAR(__GLEW_IBM_cull_vertex) - -#endif /* GL_IBM_cull_vertex */ - -/* ---------------------- GL_IBM_multimode_draw_arrays --------------------- */ - -#ifndef GL_IBM_multimode_draw_arrays -#define GL_IBM_multimode_draw_arrays 1 - -typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum* mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount, GLint modestride); - -#define glMultiModeDrawArraysIBM GLEW_GET_FUN(__glewMultiModeDrawArraysIBM) -#define glMultiModeDrawElementsIBM GLEW_GET_FUN(__glewMultiModeDrawElementsIBM) - -#define GLEW_IBM_multimode_draw_arrays GLEW_GET_VAR(__GLEW_IBM_multimode_draw_arrays) - -#endif /* GL_IBM_multimode_draw_arrays */ - -/* ------------------------- GL_IBM_rasterpos_clip ------------------------- */ - -#ifndef GL_IBM_rasterpos_clip -#define GL_IBM_rasterpos_clip 1 - -#define GL_RASTER_POSITION_UNCLIPPED_IBM 103010 - -#define GLEW_IBM_rasterpos_clip GLEW_GET_VAR(__GLEW_IBM_rasterpos_clip) - -#endif /* GL_IBM_rasterpos_clip */ - -/* --------------------------- GL_IBM_static_data -------------------------- */ - -#ifndef GL_IBM_static_data -#define GL_IBM_static_data 1 - -#define GL_ALL_STATIC_DATA_IBM 103060 -#define GL_STATIC_VERTEX_ARRAY_IBM 103061 - -#define GLEW_IBM_static_data GLEW_GET_VAR(__GLEW_IBM_static_data) - -#endif /* GL_IBM_static_data */ - -/* --------------------- GL_IBM_texture_mirrored_repeat -------------------- */ - -#ifndef GL_IBM_texture_mirrored_repeat -#define GL_IBM_texture_mirrored_repeat 1 - -#define GL_MIRRORED_REPEAT_IBM 0x8370 - -#define GLEW_IBM_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_IBM_texture_mirrored_repeat) - -#endif /* GL_IBM_texture_mirrored_repeat */ - -/* ----------------------- GL_IBM_vertex_array_lists ----------------------- */ - -#ifndef GL_IBM_vertex_array_lists -#define GL_IBM_vertex_array_lists 1 - -#define GL_VERTEX_ARRAY_LIST_IBM 103070 -#define GL_NORMAL_ARRAY_LIST_IBM 103071 -#define GL_COLOR_ARRAY_LIST_IBM 103072 -#define GL_INDEX_ARRAY_LIST_IBM 103073 -#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074 -#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075 -#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076 -#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077 -#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 -#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081 -#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082 -#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083 -#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084 -#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085 -#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086 -#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087 - -typedef void (GLAPIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean ** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride); - -#define glColorPointerListIBM GLEW_GET_FUN(__glewColorPointerListIBM) -#define glEdgeFlagPointerListIBM GLEW_GET_FUN(__glewEdgeFlagPointerListIBM) -#define glFogCoordPointerListIBM GLEW_GET_FUN(__glewFogCoordPointerListIBM) -#define glIndexPointerListIBM GLEW_GET_FUN(__glewIndexPointerListIBM) -#define glNormalPointerListIBM GLEW_GET_FUN(__glewNormalPointerListIBM) -#define glSecondaryColorPointerListIBM GLEW_GET_FUN(__glewSecondaryColorPointerListIBM) -#define glTexCoordPointerListIBM GLEW_GET_FUN(__glewTexCoordPointerListIBM) -#define glVertexPointerListIBM GLEW_GET_FUN(__glewVertexPointerListIBM) - -#define GLEW_IBM_vertex_array_lists GLEW_GET_VAR(__GLEW_IBM_vertex_array_lists) - -#endif /* GL_IBM_vertex_array_lists */ - -/* -------------------------- GL_INGR_color_clamp -------------------------- */ - -#ifndef GL_INGR_color_clamp -#define GL_INGR_color_clamp 1 - -#define GL_RED_MIN_CLAMP_INGR 0x8560 -#define GL_GREEN_MIN_CLAMP_INGR 0x8561 -#define GL_BLUE_MIN_CLAMP_INGR 0x8562 -#define GL_ALPHA_MIN_CLAMP_INGR 0x8563 -#define GL_RED_MAX_CLAMP_INGR 0x8564 -#define GL_GREEN_MAX_CLAMP_INGR 0x8565 -#define GL_BLUE_MAX_CLAMP_INGR 0x8566 -#define GL_ALPHA_MAX_CLAMP_INGR 0x8567 - -#define GLEW_INGR_color_clamp GLEW_GET_VAR(__GLEW_INGR_color_clamp) - -#endif /* GL_INGR_color_clamp */ - -/* ------------------------- GL_INGR_interlace_read ------------------------ */ - -#ifndef GL_INGR_interlace_read -#define GL_INGR_interlace_read 1 - -#define GL_INTERLACE_READ_INGR 0x8568 - -#define GLEW_INGR_interlace_read GLEW_GET_VAR(__GLEW_INGR_interlace_read) - -#endif /* GL_INGR_interlace_read */ - -/* ------------------ GL_INTEL_conservative_rasterization ------------------ */ - -#ifndef GL_INTEL_conservative_rasterization -#define GL_INTEL_conservative_rasterization 1 - -#define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE - -#define GLEW_INTEL_conservative_rasterization GLEW_GET_VAR(__GLEW_INTEL_conservative_rasterization) - -#endif /* GL_INTEL_conservative_rasterization */ - -/* ------------------- GL_INTEL_fragment_shader_ordering ------------------- */ - -#ifndef GL_INTEL_fragment_shader_ordering -#define GL_INTEL_fragment_shader_ordering 1 - -#define GLEW_INTEL_fragment_shader_ordering GLEW_GET_VAR(__GLEW_INTEL_fragment_shader_ordering) - -#endif /* GL_INTEL_fragment_shader_ordering */ - -/* ----------------------- GL_INTEL_framebuffer_CMAA ----------------------- */ - -#ifndef GL_INTEL_framebuffer_CMAA -#define GL_INTEL_framebuffer_CMAA 1 - -#define GLEW_INTEL_framebuffer_CMAA GLEW_GET_VAR(__GLEW_INTEL_framebuffer_CMAA) - -#endif /* GL_INTEL_framebuffer_CMAA */ - -/* -------------------------- GL_INTEL_map_texture ------------------------- */ - -#ifndef GL_INTEL_map_texture -#define GL_INTEL_map_texture 1 - -#define GL_LAYOUT_DEFAULT_INTEL 0 -#define GL_LAYOUT_LINEAR_INTEL 1 -#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2 -#define GL_TEXTURE_MEMORY_LAYOUT_INTEL 0x83FF - -typedef void * (GLAPIENTRY * PFNGLMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level, GLbitfield access, GLint* stride, GLenum *layout); -typedef void (GLAPIENTRY * PFNGLSYNCTEXTUREINTELPROC) (GLuint texture); -typedef void (GLAPIENTRY * PFNGLUNMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level); - -#define glMapTexture2DINTEL GLEW_GET_FUN(__glewMapTexture2DINTEL) -#define glSyncTextureINTEL GLEW_GET_FUN(__glewSyncTextureINTEL) -#define glUnmapTexture2DINTEL GLEW_GET_FUN(__glewUnmapTexture2DINTEL) - -#define GLEW_INTEL_map_texture GLEW_GET_VAR(__GLEW_INTEL_map_texture) - -#endif /* GL_INTEL_map_texture */ - -/* ------------------------ GL_INTEL_parallel_arrays ----------------------- */ - -#ifndef GL_INTEL_parallel_arrays -#define GL_INTEL_parallel_arrays 1 - -#define GL_PARALLEL_ARRAYS_INTEL 0x83F4 -#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5 -#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6 -#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7 -#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8 - -typedef void (GLAPIENTRY * PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer); -typedef void (GLAPIENTRY * PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const void** pointer); -typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer); - -#define glColorPointervINTEL GLEW_GET_FUN(__glewColorPointervINTEL) -#define glNormalPointervINTEL GLEW_GET_FUN(__glewNormalPointervINTEL) -#define glTexCoordPointervINTEL GLEW_GET_FUN(__glewTexCoordPointervINTEL) -#define glVertexPointervINTEL GLEW_GET_FUN(__glewVertexPointervINTEL) - -#define GLEW_INTEL_parallel_arrays GLEW_GET_VAR(__GLEW_INTEL_parallel_arrays) - -#endif /* GL_INTEL_parallel_arrays */ - -/* ----------------------- GL_INTEL_performance_query ---------------------- */ - -#ifndef GL_INTEL_performance_query -#define GL_INTEL_performance_query 1 - -#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x0000 -#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x0001 -#define GL_PERFQUERY_DONOT_FLUSH_INTEL 0x83F9 -#define GL_PERFQUERY_FLUSH_INTEL 0x83FA -#define GL_PERFQUERY_WAIT_INTEL 0x83FB -#define GL_PERFQUERY_COUNTER_EVENT_INTEL 0x94F0 -#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1 -#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2 -#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3 -#define GL_PERFQUERY_COUNTER_RAW_INTEL 0x94F4 -#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5 -#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8 -#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9 -#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA -#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB -#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC -#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD -#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE -#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF -#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500 - -typedef void (GLAPIENTRY * PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle); -typedef void (GLAPIENTRY * PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, GLuint* queryHandle); -typedef void (GLAPIENTRY * PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle); -typedef void (GLAPIENTRY * PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle); -typedef void (GLAPIENTRY * PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint* queryId); -typedef void (GLAPIENTRY * PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint* nextQueryId); -typedef void (GLAPIENTRY * PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar* counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue); -typedef void (GLAPIENTRY * PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten); -typedef void (GLAPIENTRY * PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar* queryName, GLuint *queryId); -typedef void (GLAPIENTRY * PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar* queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask); - -#define glBeginPerfQueryINTEL GLEW_GET_FUN(__glewBeginPerfQueryINTEL) -#define glCreatePerfQueryINTEL GLEW_GET_FUN(__glewCreatePerfQueryINTEL) -#define glDeletePerfQueryINTEL GLEW_GET_FUN(__glewDeletePerfQueryINTEL) -#define glEndPerfQueryINTEL GLEW_GET_FUN(__glewEndPerfQueryINTEL) -#define glGetFirstPerfQueryIdINTEL GLEW_GET_FUN(__glewGetFirstPerfQueryIdINTEL) -#define glGetNextPerfQueryIdINTEL GLEW_GET_FUN(__glewGetNextPerfQueryIdINTEL) -#define glGetPerfCounterInfoINTEL GLEW_GET_FUN(__glewGetPerfCounterInfoINTEL) -#define glGetPerfQueryDataINTEL GLEW_GET_FUN(__glewGetPerfQueryDataINTEL) -#define glGetPerfQueryIdByNameINTEL GLEW_GET_FUN(__glewGetPerfQueryIdByNameINTEL) -#define glGetPerfQueryInfoINTEL GLEW_GET_FUN(__glewGetPerfQueryInfoINTEL) - -#define GLEW_INTEL_performance_query GLEW_GET_VAR(__GLEW_INTEL_performance_query) - -#endif /* GL_INTEL_performance_query */ - -/* ------------------------ GL_INTEL_texture_scissor ----------------------- */ - -#ifndef GL_INTEL_texture_scissor -#define GL_INTEL_texture_scissor 1 - -typedef void (GLAPIENTRY * PFNGLTEXSCISSORFUNCINTELPROC) (GLenum target, GLenum lfunc, GLenum hfunc); -typedef void (GLAPIENTRY * PFNGLTEXSCISSORINTELPROC) (GLenum target, GLclampf tlow, GLclampf thigh); - -#define glTexScissorFuncINTEL GLEW_GET_FUN(__glewTexScissorFuncINTEL) -#define glTexScissorINTEL GLEW_GET_FUN(__glewTexScissorINTEL) - -#define GLEW_INTEL_texture_scissor GLEW_GET_VAR(__GLEW_INTEL_texture_scissor) - -#endif /* GL_INTEL_texture_scissor */ - -/* --------------------- GL_KHR_blend_equation_advanced -------------------- */ - -#ifndef GL_KHR_blend_equation_advanced -#define GL_KHR_blend_equation_advanced 1 - -#define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 -#define GL_MULTIPLY_KHR 0x9294 -#define GL_SCREEN_KHR 0x9295 -#define GL_OVERLAY_KHR 0x9296 -#define GL_DARKEN_KHR 0x9297 -#define GL_LIGHTEN_KHR 0x9298 -#define GL_COLORDODGE_KHR 0x9299 -#define GL_COLORBURN_KHR 0x929A -#define GL_HARDLIGHT_KHR 0x929B -#define GL_SOFTLIGHT_KHR 0x929C -#define GL_DIFFERENCE_KHR 0x929E -#define GL_EXCLUSION_KHR 0x92A0 -#define GL_HSL_HUE_KHR 0x92AD -#define GL_HSL_SATURATION_KHR 0x92AE -#define GL_HSL_COLOR_KHR 0x92AF -#define GL_HSL_LUMINOSITY_KHR 0x92B0 - -typedef void (GLAPIENTRY * PFNGLBLENDBARRIERKHRPROC) (void); - -#define glBlendBarrierKHR GLEW_GET_FUN(__glewBlendBarrierKHR) - -#define GLEW_KHR_blend_equation_advanced GLEW_GET_VAR(__GLEW_KHR_blend_equation_advanced) - -#endif /* GL_KHR_blend_equation_advanced */ - -/* ---------------- GL_KHR_blend_equation_advanced_coherent ---------------- */ - -#ifndef GL_KHR_blend_equation_advanced_coherent -#define GL_KHR_blend_equation_advanced_coherent 1 - -#define GLEW_KHR_blend_equation_advanced_coherent GLEW_GET_VAR(__GLEW_KHR_blend_equation_advanced_coherent) - -#endif /* GL_KHR_blend_equation_advanced_coherent */ - -/* ---------------------- GL_KHR_context_flush_control --------------------- */ - -#ifndef GL_KHR_context_flush_control -#define GL_KHR_context_flush_control 1 - -#define GL_CONTEXT_RELEASE_BEHAVIOR 0x82FB -#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC - -#define GLEW_KHR_context_flush_control GLEW_GET_VAR(__GLEW_KHR_context_flush_control) - -#endif /* GL_KHR_context_flush_control */ - -/* ------------------------------ GL_KHR_debug ----------------------------- */ - -#ifndef GL_KHR_debug -#define GL_KHR_debug 1 - -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 -#define GL_DEBUG_SOURCE_API 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A -#define GL_DEBUG_SOURCE_OTHER 0x824B -#define GL_DEBUG_TYPE_ERROR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 -#define GL_DEBUG_TYPE_OTHER 0x8251 -#define GL_DEBUG_TYPE_MARKER 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D -#define GL_BUFFER 0x82E0 -#define GL_SHADER 0x82E1 -#define GL_PROGRAM 0x82E2 -#define GL_QUERY 0x82E3 -#define GL_PROGRAM_PIPELINE 0x82E4 -#define GL_SAMPLER 0x82E6 -#define GL_DISPLAY_LIST 0x82E7 -#define GL_MAX_LABEL_LENGTH 0x82E8 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145 -#define GL_DEBUG_SEVERITY_HIGH 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 -#define GL_DEBUG_SEVERITY_LOW 0x9148 -#define GL_DEBUG_OUTPUT 0x92E0 - -typedef void (GLAPIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam); - -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf); -typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog); -typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar *label); -typedef void (GLAPIENTRY * PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei* length, GLchar *label); -typedef void (GLAPIENTRY * PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar* label); -typedef void (GLAPIENTRY * PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar* label); -typedef void (GLAPIENTRY * PFNGLPOPDEBUGGROUPPROC) (void); -typedef void (GLAPIENTRY * PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar * message); - -#define glDebugMessageCallback GLEW_GET_FUN(__glewDebugMessageCallback) -#define glDebugMessageControl GLEW_GET_FUN(__glewDebugMessageControl) -#define glDebugMessageInsert GLEW_GET_FUN(__glewDebugMessageInsert) -#define glGetDebugMessageLog GLEW_GET_FUN(__glewGetDebugMessageLog) -#define glGetObjectLabel GLEW_GET_FUN(__glewGetObjectLabel) -#define glGetObjectPtrLabel GLEW_GET_FUN(__glewGetObjectPtrLabel) -#define glObjectLabel GLEW_GET_FUN(__glewObjectLabel) -#define glObjectPtrLabel GLEW_GET_FUN(__glewObjectPtrLabel) -#define glPopDebugGroup GLEW_GET_FUN(__glewPopDebugGroup) -#define glPushDebugGroup GLEW_GET_FUN(__glewPushDebugGroup) - -#define GLEW_KHR_debug GLEW_GET_VAR(__GLEW_KHR_debug) - -#endif /* GL_KHR_debug */ - -/* ---------------------------- GL_KHR_no_error ---------------------------- */ - -#ifndef GL_KHR_no_error -#define GL_KHR_no_error 1 - -#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008 - -#define GLEW_KHR_no_error GLEW_GET_VAR(__GLEW_KHR_no_error) - -#endif /* GL_KHR_no_error */ - -/* ------------------ GL_KHR_robust_buffer_access_behavior ----------------- */ - -#ifndef GL_KHR_robust_buffer_access_behavior -#define GL_KHR_robust_buffer_access_behavior 1 - -#define GLEW_KHR_robust_buffer_access_behavior GLEW_GET_VAR(__GLEW_KHR_robust_buffer_access_behavior) - -#endif /* GL_KHR_robust_buffer_access_behavior */ - -/* --------------------------- GL_KHR_robustness --------------------------- */ - -#ifndef GL_KHR_robustness -#define GL_KHR_robustness 1 - -#define GL_CONTEXT_LOST 0x0507 -#define GL_LOSE_CONTEXT_ON_RESET 0x8252 -#define GL_GUILTY_CONTEXT_RESET 0x8253 -#define GL_INNOCENT_CONTEXT_RESET 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY 0x8256 -#define GL_NO_RESET_NOTIFICATION 0x8261 -#define GL_CONTEXT_ROBUST_ACCESS 0x90F3 - -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMFVPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint* params); -typedef void (GLAPIENTRY * PFNGLREADNPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); - -#define glGetnUniformfv GLEW_GET_FUN(__glewGetnUniformfv) -#define glGetnUniformiv GLEW_GET_FUN(__glewGetnUniformiv) -#define glGetnUniformuiv GLEW_GET_FUN(__glewGetnUniformuiv) -#define glReadnPixels GLEW_GET_FUN(__glewReadnPixels) - -#define GLEW_KHR_robustness GLEW_GET_VAR(__GLEW_KHR_robustness) - -#endif /* GL_KHR_robustness */ - -/* ------------------ GL_KHR_texture_compression_astc_hdr ------------------ */ - -#ifndef GL_KHR_texture_compression_astc_hdr -#define GL_KHR_texture_compression_astc_hdr 1 - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - -#define GLEW_KHR_texture_compression_astc_hdr GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_hdr) - -#endif /* GL_KHR_texture_compression_astc_hdr */ - -/* ------------------ GL_KHR_texture_compression_astc_ldr ------------------ */ - -#ifndef GL_KHR_texture_compression_astc_ldr -#define GL_KHR_texture_compression_astc_ldr 1 - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - -#define GLEW_KHR_texture_compression_astc_ldr GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_ldr) - -#endif /* GL_KHR_texture_compression_astc_ldr */ - -/* --------------- GL_KHR_texture_compression_astc_sliced_3d --------------- */ - -#ifndef GL_KHR_texture_compression_astc_sliced_3d -#define GL_KHR_texture_compression_astc_sliced_3d 1 - -#define GLEW_KHR_texture_compression_astc_sliced_3d GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_sliced_3d) - -#endif /* GL_KHR_texture_compression_astc_sliced_3d */ - -/* -------------------------- GL_KTX_buffer_region ------------------------- */ - -#ifndef GL_KTX_buffer_region -#define GL_KTX_buffer_region 1 - -#define GL_KTX_FRONT_REGION 0x0 -#define GL_KTX_BACK_REGION 0x1 -#define GL_KTX_Z_REGION 0x2 -#define GL_KTX_STENCIL_REGION 0x3 - -typedef GLuint (GLAPIENTRY * PFNGLBUFFERREGIONENABLEDPROC) (void); -typedef void (GLAPIENTRY * PFNGLDELETEBUFFERREGIONPROC) (GLenum region); -typedef void (GLAPIENTRY * PFNGLDRAWBUFFERREGIONPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height, GLint xDest, GLint yDest); -typedef GLuint (GLAPIENTRY * PFNGLNEWBUFFERREGIONPROC) (GLenum region); -typedef void (GLAPIENTRY * PFNGLREADBUFFERREGIONPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height); - -#define glBufferRegionEnabled GLEW_GET_FUN(__glewBufferRegionEnabled) -#define glDeleteBufferRegion GLEW_GET_FUN(__glewDeleteBufferRegion) -#define glDrawBufferRegion GLEW_GET_FUN(__glewDrawBufferRegion) -#define glNewBufferRegion GLEW_GET_FUN(__glewNewBufferRegion) -#define glReadBufferRegion GLEW_GET_FUN(__glewReadBufferRegion) - -#define GLEW_KTX_buffer_region GLEW_GET_VAR(__GLEW_KTX_buffer_region) - -#endif /* GL_KTX_buffer_region */ - -/* ------------------------- GL_MESAX_texture_stack ------------------------ */ - -#ifndef GL_MESAX_texture_stack -#define GL_MESAX_texture_stack 1 - -#define GL_TEXTURE_1D_STACK_MESAX 0x8759 -#define GL_TEXTURE_2D_STACK_MESAX 0x875A -#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B -#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C -#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D -#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E - -#define GLEW_MESAX_texture_stack GLEW_GET_VAR(__GLEW_MESAX_texture_stack) - -#endif /* GL_MESAX_texture_stack */ - -/* -------------------------- GL_MESA_pack_invert -------------------------- */ - -#ifndef GL_MESA_pack_invert -#define GL_MESA_pack_invert 1 - -#define GL_PACK_INVERT_MESA 0x8758 - -#define GLEW_MESA_pack_invert GLEW_GET_VAR(__GLEW_MESA_pack_invert) - -#endif /* GL_MESA_pack_invert */ - -/* ------------------------- GL_MESA_resize_buffers ------------------------ */ - -#ifndef GL_MESA_resize_buffers -#define GL_MESA_resize_buffers 1 - -typedef void (GLAPIENTRY * PFNGLRESIZEBUFFERSMESAPROC) (void); - -#define glResizeBuffersMESA GLEW_GET_FUN(__glewResizeBuffersMESA) - -#define GLEW_MESA_resize_buffers GLEW_GET_VAR(__GLEW_MESA_resize_buffers) - -#endif /* GL_MESA_resize_buffers */ - -/* -------------------- GL_MESA_shader_integer_functions ------------------- */ - -#ifndef GL_MESA_shader_integer_functions -#define GL_MESA_shader_integer_functions 1 - -#define GLEW_MESA_shader_integer_functions GLEW_GET_VAR(__GLEW_MESA_shader_integer_functions) - -#endif /* GL_MESA_shader_integer_functions */ - -/* --------------------------- GL_MESA_window_pos -------------------------- */ - -#ifndef GL_MESA_window_pos -#define GL_MESA_window_pos 1 - -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVMESAPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVMESAPROC) (const GLshort* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVMESAPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVMESAPROC) (const GLshort* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IVMESAPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort* p); - -#define glWindowPos2dMESA GLEW_GET_FUN(__glewWindowPos2dMESA) -#define glWindowPos2dvMESA GLEW_GET_FUN(__glewWindowPos2dvMESA) -#define glWindowPos2fMESA GLEW_GET_FUN(__glewWindowPos2fMESA) -#define glWindowPos2fvMESA GLEW_GET_FUN(__glewWindowPos2fvMESA) -#define glWindowPos2iMESA GLEW_GET_FUN(__glewWindowPos2iMESA) -#define glWindowPos2ivMESA GLEW_GET_FUN(__glewWindowPos2ivMESA) -#define glWindowPos2sMESA GLEW_GET_FUN(__glewWindowPos2sMESA) -#define glWindowPos2svMESA GLEW_GET_FUN(__glewWindowPos2svMESA) -#define glWindowPos3dMESA GLEW_GET_FUN(__glewWindowPos3dMESA) -#define glWindowPos3dvMESA GLEW_GET_FUN(__glewWindowPos3dvMESA) -#define glWindowPos3fMESA GLEW_GET_FUN(__glewWindowPos3fMESA) -#define glWindowPos3fvMESA GLEW_GET_FUN(__glewWindowPos3fvMESA) -#define glWindowPos3iMESA GLEW_GET_FUN(__glewWindowPos3iMESA) -#define glWindowPos3ivMESA GLEW_GET_FUN(__glewWindowPos3ivMESA) -#define glWindowPos3sMESA GLEW_GET_FUN(__glewWindowPos3sMESA) -#define glWindowPos3svMESA GLEW_GET_FUN(__glewWindowPos3svMESA) -#define glWindowPos4dMESA GLEW_GET_FUN(__glewWindowPos4dMESA) -#define glWindowPos4dvMESA GLEW_GET_FUN(__glewWindowPos4dvMESA) -#define glWindowPos4fMESA GLEW_GET_FUN(__glewWindowPos4fMESA) -#define glWindowPos4fvMESA GLEW_GET_FUN(__glewWindowPos4fvMESA) -#define glWindowPos4iMESA GLEW_GET_FUN(__glewWindowPos4iMESA) -#define glWindowPos4ivMESA GLEW_GET_FUN(__glewWindowPos4ivMESA) -#define glWindowPos4sMESA GLEW_GET_FUN(__glewWindowPos4sMESA) -#define glWindowPos4svMESA GLEW_GET_FUN(__glewWindowPos4svMESA) - -#define GLEW_MESA_window_pos GLEW_GET_VAR(__GLEW_MESA_window_pos) - -#endif /* GL_MESA_window_pos */ - -/* ------------------------- GL_MESA_ycbcr_texture ------------------------- */ - -#ifndef GL_MESA_ycbcr_texture -#define GL_MESA_ycbcr_texture 1 - -#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB -#define GL_YCBCR_MESA 0x8757 - -#define GLEW_MESA_ycbcr_texture GLEW_GET_VAR(__GLEW_MESA_ycbcr_texture) - -#endif /* GL_MESA_ycbcr_texture */ - -/* ----------- GL_NVX_blend_equation_advanced_multi_draw_buffers ----------- */ - -#ifndef GL_NVX_blend_equation_advanced_multi_draw_buffers -#define GL_NVX_blend_equation_advanced_multi_draw_buffers 1 - -#define GLEW_NVX_blend_equation_advanced_multi_draw_buffers GLEW_GET_VAR(__GLEW_NVX_blend_equation_advanced_multi_draw_buffers) - -#endif /* GL_NVX_blend_equation_advanced_multi_draw_buffers */ - -/* ----------------------- GL_NVX_conditional_render ----------------------- */ - -#ifndef GL_NVX_conditional_render -#define GL_NVX_conditional_render 1 - -typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERNVXPROC) (void); - -#define glBeginConditionalRenderNVX GLEW_GET_FUN(__glewBeginConditionalRenderNVX) -#define glEndConditionalRenderNVX GLEW_GET_FUN(__glewEndConditionalRenderNVX) - -#define GLEW_NVX_conditional_render GLEW_GET_VAR(__GLEW_NVX_conditional_render) - -#endif /* GL_NVX_conditional_render */ - -/* ------------------------- GL_NVX_gpu_memory_info ------------------------ */ - -#ifndef GL_NVX_gpu_memory_info -#define GL_NVX_gpu_memory_info 1 - -#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047 -#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048 -#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049 -#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A -#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B - -#define GLEW_NVX_gpu_memory_info GLEW_GET_VAR(__GLEW_NVX_gpu_memory_info) - -#endif /* GL_NVX_gpu_memory_info */ - -/* ---------------------- GL_NVX_linked_gpu_multicast ---------------------- */ - -#ifndef GL_NVX_linked_gpu_multicast -#define GL_NVX_linked_gpu_multicast 1 - -#define GL_LGPU_SEPARATE_STORAGE_BIT_NVX 0x0800 -#define GL_MAX_LGPU_GPUS_NVX 0x92BA - -typedef void (GLAPIENTRY * PFNGLLGPUCOPYIMAGESUBDATANVXPROC) (GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GLAPIENTRY * PFNGLLGPUINTERLOCKNVXPROC) (void); -typedef void (GLAPIENTRY * PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); - -#define glLGPUCopyImageSubDataNVX GLEW_GET_FUN(__glewLGPUCopyImageSubDataNVX) -#define glLGPUInterlockNVX GLEW_GET_FUN(__glewLGPUInterlockNVX) -#define glLGPUNamedBufferSubDataNVX GLEW_GET_FUN(__glewLGPUNamedBufferSubDataNVX) - -#define GLEW_NVX_linked_gpu_multicast GLEW_GET_VAR(__GLEW_NVX_linked_gpu_multicast) - -#endif /* GL_NVX_linked_gpu_multicast */ - -/* ------------------- GL_NV_bindless_multi_draw_indirect ------------------ */ - -#ifndef GL_NV_bindless_multi_draw_indirect -#define GL_NV_bindless_multi_draw_indirect 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); - -#define glMultiDrawArraysIndirectBindlessNV GLEW_GET_FUN(__glewMultiDrawArraysIndirectBindlessNV) -#define glMultiDrawElementsIndirectBindlessNV GLEW_GET_FUN(__glewMultiDrawElementsIndirectBindlessNV) - -#define GLEW_NV_bindless_multi_draw_indirect GLEW_GET_VAR(__GLEW_NV_bindless_multi_draw_indirect) - -#endif /* GL_NV_bindless_multi_draw_indirect */ - -/* ---------------- GL_NV_bindless_multi_draw_indirect_count --------------- */ - -#ifndef GL_NV_bindless_multi_draw_indirect_count -#define GL_NV_bindless_multi_draw_indirect_count 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, const void *indirect, GLintptr drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount); - -#define glMultiDrawArraysIndirectBindlessCountNV GLEW_GET_FUN(__glewMultiDrawArraysIndirectBindlessCountNV) -#define glMultiDrawElementsIndirectBindlessCountNV GLEW_GET_FUN(__glewMultiDrawElementsIndirectBindlessCountNV) - -#define GLEW_NV_bindless_multi_draw_indirect_count GLEW_GET_VAR(__GLEW_NV_bindless_multi_draw_indirect_count) - -#endif /* GL_NV_bindless_multi_draw_indirect_count */ - -/* ------------------------- GL_NV_bindless_texture ------------------------ */ - -#ifndef GL_NV_bindless_texture -#define GL_NV_bindless_texture 1 - -typedef GLuint64 (GLAPIENTRY * PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format); -typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture); -typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler); -typedef GLboolean (GLAPIENTRY * PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle); -typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access); -typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* values); -typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value); -typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64* value); - -#define glGetImageHandleNV GLEW_GET_FUN(__glewGetImageHandleNV) -#define glGetTextureHandleNV GLEW_GET_FUN(__glewGetTextureHandleNV) -#define glGetTextureSamplerHandleNV GLEW_GET_FUN(__glewGetTextureSamplerHandleNV) -#define glIsImageHandleResidentNV GLEW_GET_FUN(__glewIsImageHandleResidentNV) -#define glIsTextureHandleResidentNV GLEW_GET_FUN(__glewIsTextureHandleResidentNV) -#define glMakeImageHandleNonResidentNV GLEW_GET_FUN(__glewMakeImageHandleNonResidentNV) -#define glMakeImageHandleResidentNV GLEW_GET_FUN(__glewMakeImageHandleResidentNV) -#define glMakeTextureHandleNonResidentNV GLEW_GET_FUN(__glewMakeTextureHandleNonResidentNV) -#define glMakeTextureHandleResidentNV GLEW_GET_FUN(__glewMakeTextureHandleResidentNV) -#define glProgramUniformHandleui64NV GLEW_GET_FUN(__glewProgramUniformHandleui64NV) -#define glProgramUniformHandleui64vNV GLEW_GET_FUN(__glewProgramUniformHandleui64vNV) -#define glUniformHandleui64NV GLEW_GET_FUN(__glewUniformHandleui64NV) -#define glUniformHandleui64vNV GLEW_GET_FUN(__glewUniformHandleui64vNV) - -#define GLEW_NV_bindless_texture GLEW_GET_VAR(__GLEW_NV_bindless_texture) - -#endif /* GL_NV_bindless_texture */ - -/* --------------------- GL_NV_blend_equation_advanced --------------------- */ - -#ifndef GL_NV_blend_equation_advanced -#define GL_NV_blend_equation_advanced 1 - -#define GL_XOR_NV 0x1506 -#define GL_RED_NV 0x1903 -#define GL_GREEN_NV 0x1904 -#define GL_BLUE_NV 0x1905 -#define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280 -#define GL_BLEND_OVERLAP_NV 0x9281 -#define GL_UNCORRELATED_NV 0x9282 -#define GL_DISJOINT_NV 0x9283 -#define GL_CONJOINT_NV 0x9284 -#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 -#define GL_SRC_NV 0x9286 -#define GL_DST_NV 0x9287 -#define GL_SRC_OVER_NV 0x9288 -#define GL_DST_OVER_NV 0x9289 -#define GL_SRC_IN_NV 0x928A -#define GL_DST_IN_NV 0x928B -#define GL_SRC_OUT_NV 0x928C -#define GL_DST_OUT_NV 0x928D -#define GL_SRC_ATOP_NV 0x928E -#define GL_DST_ATOP_NV 0x928F -#define GL_PLUS_NV 0x9291 -#define GL_PLUS_DARKER_NV 0x9292 -#define GL_MULTIPLY_NV 0x9294 -#define GL_SCREEN_NV 0x9295 -#define GL_OVERLAY_NV 0x9296 -#define GL_DARKEN_NV 0x9297 -#define GL_LIGHTEN_NV 0x9298 -#define GL_COLORDODGE_NV 0x9299 -#define GL_COLORBURN_NV 0x929A -#define GL_HARDLIGHT_NV 0x929B -#define GL_SOFTLIGHT_NV 0x929C -#define GL_DIFFERENCE_NV 0x929E -#define GL_MINUS_NV 0x929F -#define GL_EXCLUSION_NV 0x92A0 -#define GL_CONTRAST_NV 0x92A1 -#define GL_INVERT_RGB_NV 0x92A3 -#define GL_LINEARDODGE_NV 0x92A4 -#define GL_LINEARBURN_NV 0x92A5 -#define GL_VIVIDLIGHT_NV 0x92A6 -#define GL_LINEARLIGHT_NV 0x92A7 -#define GL_PINLIGHT_NV 0x92A8 -#define GL_HARDMIX_NV 0x92A9 -#define GL_HSL_HUE_NV 0x92AD -#define GL_HSL_SATURATION_NV 0x92AE -#define GL_HSL_COLOR_NV 0x92AF -#define GL_HSL_LUMINOSITY_NV 0x92B0 -#define GL_PLUS_CLAMPED_NV 0x92B1 -#define GL_PLUS_CLAMPED_ALPHA_NV 0x92B2 -#define GL_MINUS_CLAMPED_NV 0x92B3 -#define GL_INVERT_OVG_NV 0x92B4 - -typedef void (GLAPIENTRY * PFNGLBLENDBARRIERNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint value); - -#define glBlendBarrierNV GLEW_GET_FUN(__glewBlendBarrierNV) -#define glBlendParameteriNV GLEW_GET_FUN(__glewBlendParameteriNV) - -#define GLEW_NV_blend_equation_advanced GLEW_GET_VAR(__GLEW_NV_blend_equation_advanced) - -#endif /* GL_NV_blend_equation_advanced */ - -/* ----------------- GL_NV_blend_equation_advanced_coherent ---------------- */ - -#ifndef GL_NV_blend_equation_advanced_coherent -#define GL_NV_blend_equation_advanced_coherent 1 - -#define GLEW_NV_blend_equation_advanced_coherent GLEW_GET_VAR(__GLEW_NV_blend_equation_advanced_coherent) - -#endif /* GL_NV_blend_equation_advanced_coherent */ - -/* --------------------------- GL_NV_blend_square -------------------------- */ - -#ifndef GL_NV_blend_square -#define GL_NV_blend_square 1 - -#define GLEW_NV_blend_square GLEW_GET_VAR(__GLEW_NV_blend_square) - -#endif /* GL_NV_blend_square */ - -/* ----------------------- GL_NV_clip_space_w_scaling ---------------------- */ - -#ifndef GL_NV_clip_space_w_scaling -#define GL_NV_clip_space_w_scaling 1 - -#define GL_VIEWPORT_POSITION_W_SCALE_NV 0x937C -#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D -#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E - -typedef void (GLAPIENTRY * PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff); - -#define glViewportPositionWScaleNV GLEW_GET_FUN(__glewViewportPositionWScaleNV) - -#define GLEW_NV_clip_space_w_scaling GLEW_GET_VAR(__GLEW_NV_clip_space_w_scaling) - -#endif /* GL_NV_clip_space_w_scaling */ - -/* --------------------------- GL_NV_command_list -------------------------- */ - -#ifndef GL_NV_command_list -#define GL_NV_command_list 1 - -#define GL_TERMINATE_SEQUENCE_COMMAND_NV 0x0000 -#define GL_NOP_COMMAND_NV 0x0001 -#define GL_DRAW_ELEMENTS_COMMAND_NV 0x0002 -#define GL_DRAW_ARRAYS_COMMAND_NV 0x0003 -#define GL_DRAW_ELEMENTS_STRIP_COMMAND_NV 0x0004 -#define GL_DRAW_ARRAYS_STRIP_COMMAND_NV 0x0005 -#define GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV 0x0006 -#define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007 -#define GL_ELEMENT_ADDRESS_COMMAND_NV 0x0008 -#define GL_ATTRIBUTE_ADDRESS_COMMAND_NV 0x0009 -#define GL_UNIFORM_ADDRESS_COMMAND_NV 0x000a -#define GL_BLEND_COLOR_COMMAND_NV 0x000b -#define GL_STENCIL_REF_COMMAND_NV 0x000c -#define GL_LINE_WIDTH_COMMAND_NV 0x000d -#define GL_POLYGON_OFFSET_COMMAND_NV 0x000e -#define GL_ALPHA_REF_COMMAND_NV 0x000f -#define GL_VIEWPORT_COMMAND_NV 0x0010 -#define GL_SCISSOR_COMMAND_NV 0x0011 -#define GL_FRONT_FACE_COMMAND_NV 0x0012 - -typedef void (GLAPIENTRY * PFNGLCALLCOMMANDLISTNVPROC) (GLuint list); -typedef void (GLAPIENTRY * PFNGLCOMMANDLISTSEGMENTSNVPROC) (GLuint list, GLuint segments); -typedef void (GLAPIENTRY * PFNGLCOMPILECOMMANDLISTNVPROC) (GLuint list); -typedef void (GLAPIENTRY * PFNGLCREATECOMMANDLISTSNVPROC) (GLsizei n, GLuint* lists); -typedef void (GLAPIENTRY * PFNGLCREATESTATESNVPROC) (GLsizei n, GLuint* states); -typedef void (GLAPIENTRY * PFNGLDELETECOMMANDLISTSNVPROC) (GLsizei n, const GLuint* lists); -typedef void (GLAPIENTRY * PFNGLDELETESTATESNVPROC) (GLsizei n, const GLuint* states); -typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSADDRESSNVPROC) (GLenum primitiveMode, const GLuint64* indirects, const GLsizei* sizes, GLuint count); -typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSNVPROC) (GLenum primitiveMode, GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, GLuint count); -typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC) (const GLuint64* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count); -typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSSTATESNVPROC) (GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count); -typedef GLuint (GLAPIENTRY * PFNGLGETCOMMANDHEADERNVPROC) (GLenum tokenID, GLuint size); -typedef GLushort (GLAPIENTRY * PFNGLGETSTAGEINDEXNVPROC) (GLenum shadertype); -typedef GLboolean (GLAPIENTRY * PFNGLISCOMMANDLISTNVPROC) (GLuint list); -typedef GLboolean (GLAPIENTRY * PFNGLISSTATENVPROC) (GLuint state); -typedef void (GLAPIENTRY * PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC) (GLuint list, GLuint segment, const void** indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count); -typedef void (GLAPIENTRY * PFNGLSTATECAPTURENVPROC) (GLuint state, GLenum mode); - -#define glCallCommandListNV GLEW_GET_FUN(__glewCallCommandListNV) -#define glCommandListSegmentsNV GLEW_GET_FUN(__glewCommandListSegmentsNV) -#define glCompileCommandListNV GLEW_GET_FUN(__glewCompileCommandListNV) -#define glCreateCommandListsNV GLEW_GET_FUN(__glewCreateCommandListsNV) -#define glCreateStatesNV GLEW_GET_FUN(__glewCreateStatesNV) -#define glDeleteCommandListsNV GLEW_GET_FUN(__glewDeleteCommandListsNV) -#define glDeleteStatesNV GLEW_GET_FUN(__glewDeleteStatesNV) -#define glDrawCommandsAddressNV GLEW_GET_FUN(__glewDrawCommandsAddressNV) -#define glDrawCommandsNV GLEW_GET_FUN(__glewDrawCommandsNV) -#define glDrawCommandsStatesAddressNV GLEW_GET_FUN(__glewDrawCommandsStatesAddressNV) -#define glDrawCommandsStatesNV GLEW_GET_FUN(__glewDrawCommandsStatesNV) -#define glGetCommandHeaderNV GLEW_GET_FUN(__glewGetCommandHeaderNV) -#define glGetStageIndexNV GLEW_GET_FUN(__glewGetStageIndexNV) -#define glIsCommandListNV GLEW_GET_FUN(__glewIsCommandListNV) -#define glIsStateNV GLEW_GET_FUN(__glewIsStateNV) -#define glListDrawCommandsStatesClientNV GLEW_GET_FUN(__glewListDrawCommandsStatesClientNV) -#define glStateCaptureNV GLEW_GET_FUN(__glewStateCaptureNV) - -#define GLEW_NV_command_list GLEW_GET_VAR(__GLEW_NV_command_list) - -#endif /* GL_NV_command_list */ - -/* ------------------------- GL_NV_compute_program5 ------------------------ */ - -#ifndef GL_NV_compute_program5 -#define GL_NV_compute_program5 1 - -#define GL_COMPUTE_PROGRAM_NV 0x90FB -#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC - -#define GLEW_NV_compute_program5 GLEW_GET_VAR(__GLEW_NV_compute_program5) - -#endif /* GL_NV_compute_program5 */ - -/* ------------------------ GL_NV_conditional_render ----------------------- */ - -#ifndef GL_NV_conditional_render -#define GL_NV_conditional_render 1 - -#define GL_QUERY_WAIT_NV 0x8E13 -#define GL_QUERY_NO_WAIT_NV 0x8E14 -#define GL_QUERY_BY_REGION_WAIT_NV 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT_NV 0x8E16 - -typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode); -typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERNVPROC) (void); - -#define glBeginConditionalRenderNV GLEW_GET_FUN(__glewBeginConditionalRenderNV) -#define glEndConditionalRenderNV GLEW_GET_FUN(__glewEndConditionalRenderNV) - -#define GLEW_NV_conditional_render GLEW_GET_VAR(__GLEW_NV_conditional_render) - -#endif /* GL_NV_conditional_render */ - -/* ----------------------- GL_NV_conservative_raster ----------------------- */ - -#ifndef GL_NV_conservative_raster -#define GL_NV_conservative_raster 1 - -#define GL_CONSERVATIVE_RASTERIZATION_NV 0x9346 -#define GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV 0x9347 -#define GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV 0x9348 -#define GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV 0x9349 - -typedef void (GLAPIENTRY * PFNGLSUBPIXELPRECISIONBIASNVPROC) (GLuint xbits, GLuint ybits); - -#define glSubpixelPrecisionBiasNV GLEW_GET_FUN(__glewSubpixelPrecisionBiasNV) - -#define GLEW_NV_conservative_raster GLEW_GET_VAR(__GLEW_NV_conservative_raster) - -#endif /* GL_NV_conservative_raster */ - -/* -------------------- GL_NV_conservative_raster_dilate ------------------- */ - -#ifndef GL_NV_conservative_raster_dilate -#define GL_NV_conservative_raster_dilate 1 - -#define GL_CONSERVATIVE_RASTER_DILATE_NV 0x9379 -#define GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV 0x937A -#define GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV 0x937B - -typedef void (GLAPIENTRY * PFNGLCONSERVATIVERASTERPARAMETERFNVPROC) (GLenum pname, GLfloat value); - -#define glConservativeRasterParameterfNV GLEW_GET_FUN(__glewConservativeRasterParameterfNV) - -#define GLEW_NV_conservative_raster_dilate GLEW_GET_VAR(__GLEW_NV_conservative_raster_dilate) - -#endif /* GL_NV_conservative_raster_dilate */ - -/* -------------- GL_NV_conservative_raster_pre_snap_triangles ------------- */ - -#ifndef GL_NV_conservative_raster_pre_snap_triangles -#define GL_NV_conservative_raster_pre_snap_triangles 1 - -#define GL_CONSERVATIVE_RASTER_MODE_NV 0x954D -#define GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV 0x954E -#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV 0x954F - -typedef void (GLAPIENTRY * PFNGLCONSERVATIVERASTERPARAMETERINVPROC) (GLenum pname, GLint param); - -#define glConservativeRasterParameteriNV GLEW_GET_FUN(__glewConservativeRasterParameteriNV) - -#define GLEW_NV_conservative_raster_pre_snap_triangles GLEW_GET_VAR(__GLEW_NV_conservative_raster_pre_snap_triangles) - -#endif /* GL_NV_conservative_raster_pre_snap_triangles */ - -/* ----------------------- GL_NV_copy_depth_to_color ----------------------- */ - -#ifndef GL_NV_copy_depth_to_color -#define GL_NV_copy_depth_to_color 1 - -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F - -#define GLEW_NV_copy_depth_to_color GLEW_GET_VAR(__GLEW_NV_copy_depth_to_color) - -#endif /* GL_NV_copy_depth_to_color */ - -/* ---------------------------- GL_NV_copy_image --------------------------- */ - -#ifndef GL_NV_copy_image -#define GL_NV_copy_image 1 - -typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); - -#define glCopyImageSubDataNV GLEW_GET_FUN(__glewCopyImageSubDataNV) - -#define GLEW_NV_copy_image GLEW_GET_VAR(__GLEW_NV_copy_image) - -#endif /* GL_NV_copy_image */ - -/* -------------------------- GL_NV_deep_texture3D ------------------------- */ - -#ifndef GL_NV_deep_texture3D -#define GL_NV_deep_texture3D 1 - -#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0 -#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV 0x90D1 - -#define GLEW_NV_deep_texture3D GLEW_GET_VAR(__GLEW_NV_deep_texture3D) - -#endif /* GL_NV_deep_texture3D */ - -/* ------------------------ GL_NV_depth_buffer_float ----------------------- */ - -#ifndef GL_NV_depth_buffer_float -#define GL_NV_depth_buffer_float 1 - -#define GL_DEPTH_COMPONENT32F_NV 0x8DAB -#define GL_DEPTH32F_STENCIL8_NV 0x8DAC -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD -#define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF - -typedef void (GLAPIENTRY * PFNGLCLEARDEPTHDNVPROC) (GLdouble depth); -typedef void (GLAPIENTRY * PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar); - -#define glClearDepthdNV GLEW_GET_FUN(__glewClearDepthdNV) -#define glDepthBoundsdNV GLEW_GET_FUN(__glewDepthBoundsdNV) -#define glDepthRangedNV GLEW_GET_FUN(__glewDepthRangedNV) - -#define GLEW_NV_depth_buffer_float GLEW_GET_VAR(__GLEW_NV_depth_buffer_float) - -#endif /* GL_NV_depth_buffer_float */ - -/* --------------------------- GL_NV_depth_clamp --------------------------- */ - -#ifndef GL_NV_depth_clamp -#define GL_NV_depth_clamp 1 - -#define GL_DEPTH_CLAMP_NV 0x864F - -#define GLEW_NV_depth_clamp GLEW_GET_VAR(__GLEW_NV_depth_clamp) - -#endif /* GL_NV_depth_clamp */ - -/* ---------------------- GL_NV_depth_range_unclamped ---------------------- */ - -#ifndef GL_NV_depth_range_unclamped -#define GL_NV_depth_range_unclamped 1 - -#define GL_SAMPLE_COUNT_BITS_NV 0x8864 -#define GL_CURRENT_SAMPLE_COUNT_QUERY_NV 0x8865 -#define GL_QUERY_RESULT_NV 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_NV 0x8867 -#define GL_SAMPLE_COUNT_NV 0x8914 - -#define GLEW_NV_depth_range_unclamped GLEW_GET_VAR(__GLEW_NV_depth_range_unclamped) - -#endif /* GL_NV_depth_range_unclamped */ - -/* --------------------------- GL_NV_draw_texture -------------------------- */ - -#ifndef GL_NV_draw_texture -#define GL_NV_draw_texture 1 - -typedef void (GLAPIENTRY * PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); - -#define glDrawTextureNV GLEW_GET_FUN(__glewDrawTextureNV) - -#define GLEW_NV_draw_texture GLEW_GET_VAR(__GLEW_NV_draw_texture) - -#endif /* GL_NV_draw_texture */ - -/* ------------------------ GL_NV_draw_vulkan_image ------------------------ */ - -#ifndef GL_NV_draw_vulkan_image -#define GL_NV_draw_vulkan_image 1 - -typedef void (APIENTRY *GLVULKANPROCNV)(void); - -typedef void (GLAPIENTRY * PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); -typedef GLVULKANPROCNV (GLAPIENTRY * PFNGLGETVKPROCADDRNVPROC) (const GLchar* name); -typedef void (GLAPIENTRY * PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence); -typedef void (GLAPIENTRY * PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore); -typedef void (GLAPIENTRY * PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore); - -#define glDrawVkImageNV GLEW_GET_FUN(__glewDrawVkImageNV) -#define glGetVkProcAddrNV GLEW_GET_FUN(__glewGetVkProcAddrNV) -#define glSignalVkFenceNV GLEW_GET_FUN(__glewSignalVkFenceNV) -#define glSignalVkSemaphoreNV GLEW_GET_FUN(__glewSignalVkSemaphoreNV) -#define glWaitVkSemaphoreNV GLEW_GET_FUN(__glewWaitVkSemaphoreNV) - -#define GLEW_NV_draw_vulkan_image GLEW_GET_VAR(__GLEW_NV_draw_vulkan_image) - -#endif /* GL_NV_draw_vulkan_image */ - -/* ---------------------------- GL_NV_evaluators --------------------------- */ - -#ifndef GL_NV_evaluators -#define GL_NV_evaluators 1 - -#define GL_EVAL_2D_NV 0x86C0 -#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_MAP_TESSELLATION_NV 0x86C2 -#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 -#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 -#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 -#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF -#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5 -#define GL_MAX_MAP_TESSELLATION_NV 0x86D6 -#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7 - -typedef void (GLAPIENTRY * PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); -typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points); -typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points); -typedef void (GLAPIENTRY * PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint* params); - -#define glEvalMapsNV GLEW_GET_FUN(__glewEvalMapsNV) -#define glGetMapAttribParameterfvNV GLEW_GET_FUN(__glewGetMapAttribParameterfvNV) -#define glGetMapAttribParameterivNV GLEW_GET_FUN(__glewGetMapAttribParameterivNV) -#define glGetMapControlPointsNV GLEW_GET_FUN(__glewGetMapControlPointsNV) -#define glGetMapParameterfvNV GLEW_GET_FUN(__glewGetMapParameterfvNV) -#define glGetMapParameterivNV GLEW_GET_FUN(__glewGetMapParameterivNV) -#define glMapControlPointsNV GLEW_GET_FUN(__glewMapControlPointsNV) -#define glMapParameterfvNV GLEW_GET_FUN(__glewMapParameterfvNV) -#define glMapParameterivNV GLEW_GET_FUN(__glewMapParameterivNV) - -#define GLEW_NV_evaluators GLEW_GET_VAR(__GLEW_NV_evaluators) - -#endif /* GL_NV_evaluators */ - -/* ----------------------- GL_NV_explicit_multisample ---------------------- */ - -#ifndef GL_NV_explicit_multisample -#define GL_NV_explicit_multisample 1 - -#define GL_SAMPLE_POSITION_NV 0x8E50 -#define GL_SAMPLE_MASK_NV 0x8E51 -#define GL_SAMPLE_MASK_VALUE_NV 0x8E52 -#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53 -#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54 -#define GL_TEXTURE_RENDERBUFFER_NV 0x8E55 -#define GL_SAMPLER_RENDERBUFFER_NV 0x8E56 -#define GL_INT_SAMPLER_RENDERBUFFER_NV 0x8E57 -#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58 -#define GL_MAX_SAMPLE_MASK_WORDS_NV 0x8E59 - -typedef void (GLAPIENTRY * PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat* val); -typedef void (GLAPIENTRY * PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask); -typedef void (GLAPIENTRY * PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer); - -#define glGetMultisamplefvNV GLEW_GET_FUN(__glewGetMultisamplefvNV) -#define glSampleMaskIndexedNV GLEW_GET_FUN(__glewSampleMaskIndexedNV) -#define glTexRenderbufferNV GLEW_GET_FUN(__glewTexRenderbufferNV) - -#define GLEW_NV_explicit_multisample GLEW_GET_VAR(__GLEW_NV_explicit_multisample) - -#endif /* GL_NV_explicit_multisample */ - -/* ------------------------------ GL_NV_fence ------------------------------ */ - -#ifndef GL_NV_fence -#define GL_NV_fence 1 - -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 - -typedef void (GLAPIENTRY * PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint* fences); -typedef void (GLAPIENTRY * PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (GLAPIENTRY * PFNGLGENFENCESNVPROC) (GLsizei n, GLuint* fences); -typedef void (GLAPIENTRY * PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISFENCENVPROC) (GLuint fence); -typedef void (GLAPIENTRY * PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCENVPROC) (GLuint fence); - -#define glDeleteFencesNV GLEW_GET_FUN(__glewDeleteFencesNV) -#define glFinishFenceNV GLEW_GET_FUN(__glewFinishFenceNV) -#define glGenFencesNV GLEW_GET_FUN(__glewGenFencesNV) -#define glGetFenceivNV GLEW_GET_FUN(__glewGetFenceivNV) -#define glIsFenceNV GLEW_GET_FUN(__glewIsFenceNV) -#define glSetFenceNV GLEW_GET_FUN(__glewSetFenceNV) -#define glTestFenceNV GLEW_GET_FUN(__glewTestFenceNV) - -#define GLEW_NV_fence GLEW_GET_VAR(__GLEW_NV_fence) - -#endif /* GL_NV_fence */ - -/* -------------------------- GL_NV_fill_rectangle ------------------------- */ - -#ifndef GL_NV_fill_rectangle -#define GL_NV_fill_rectangle 1 - -#define GL_FILL_RECTANGLE_NV 0x933C - -#define GLEW_NV_fill_rectangle GLEW_GET_VAR(__GLEW_NV_fill_rectangle) - -#endif /* GL_NV_fill_rectangle */ - -/* --------------------------- GL_NV_float_buffer -------------------------- */ - -#ifndef GL_NV_float_buffer -#define GL_NV_float_buffer 1 - -#define GL_FLOAT_R_NV 0x8880 -#define GL_FLOAT_RG_NV 0x8881 -#define GL_FLOAT_RGB_NV 0x8882 -#define GL_FLOAT_RGBA_NV 0x8883 -#define GL_FLOAT_R16_NV 0x8884 -#define GL_FLOAT_R32_NV 0x8885 -#define GL_FLOAT_RG16_NV 0x8886 -#define GL_FLOAT_RG32_NV 0x8887 -#define GL_FLOAT_RGB16_NV 0x8888 -#define GL_FLOAT_RGB32_NV 0x8889 -#define GL_FLOAT_RGBA16_NV 0x888A -#define GL_FLOAT_RGBA32_NV 0x888B -#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C -#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D -#define GL_FLOAT_RGBA_MODE_NV 0x888E - -#define GLEW_NV_float_buffer GLEW_GET_VAR(__GLEW_NV_float_buffer) - -#endif /* GL_NV_float_buffer */ - -/* --------------------------- GL_NV_fog_distance -------------------------- */ - -#ifndef GL_NV_fog_distance -#define GL_NV_fog_distance 1 - -#define GL_FOG_DISTANCE_MODE_NV 0x855A -#define GL_EYE_RADIAL_NV 0x855B -#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C - -#define GLEW_NV_fog_distance GLEW_GET_VAR(__GLEW_NV_fog_distance) - -#endif /* GL_NV_fog_distance */ - -/* -------------------- GL_NV_fragment_coverage_to_color ------------------- */ - -#ifndef GL_NV_fragment_coverage_to_color -#define GL_NV_fragment_coverage_to_color 1 - -#define GL_FRAGMENT_COVERAGE_TO_COLOR_NV 0x92DD -#define GL_FRAGMENT_COVERAGE_COLOR_NV 0x92DE - -typedef void (GLAPIENTRY * PFNGLFRAGMENTCOVERAGECOLORNVPROC) (GLuint color); - -#define glFragmentCoverageColorNV GLEW_GET_FUN(__glewFragmentCoverageColorNV) - -#define GLEW_NV_fragment_coverage_to_color GLEW_GET_VAR(__GLEW_NV_fragment_coverage_to_color) - -#endif /* GL_NV_fragment_coverage_to_color */ - -/* ------------------------- GL_NV_fragment_program ------------------------ */ - -#ifndef GL_NV_fragment_program -#define GL_NV_fragment_program 1 - -#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868 -#define GL_FRAGMENT_PROGRAM_NV 0x8870 -#define GL_MAX_TEXTURE_COORDS_NV 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872 -#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873 -#define GL_PROGRAM_ERROR_STRING_NV 0x8874 - -typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble *params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLdouble v[]); -typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLfloat v[]); - -#define glGetProgramNamedParameterdvNV GLEW_GET_FUN(__glewGetProgramNamedParameterdvNV) -#define glGetProgramNamedParameterfvNV GLEW_GET_FUN(__glewGetProgramNamedParameterfvNV) -#define glProgramNamedParameter4dNV GLEW_GET_FUN(__glewProgramNamedParameter4dNV) -#define glProgramNamedParameter4dvNV GLEW_GET_FUN(__glewProgramNamedParameter4dvNV) -#define glProgramNamedParameter4fNV GLEW_GET_FUN(__glewProgramNamedParameter4fNV) -#define glProgramNamedParameter4fvNV GLEW_GET_FUN(__glewProgramNamedParameter4fvNV) - -#define GLEW_NV_fragment_program GLEW_GET_VAR(__GLEW_NV_fragment_program) - -#endif /* GL_NV_fragment_program */ - -/* ------------------------ GL_NV_fragment_program2 ------------------------ */ - -#ifndef GL_NV_fragment_program2 -#define GL_NV_fragment_program2 1 - -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 -#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 -#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7 -#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8 - -#define GLEW_NV_fragment_program2 GLEW_GET_VAR(__GLEW_NV_fragment_program2) - -#endif /* GL_NV_fragment_program2 */ - -/* ------------------------ GL_NV_fragment_program4 ------------------------ */ - -#ifndef GL_NV_fragment_program4 -#define GL_NV_fragment_program4 1 - -#define GLEW_NV_fragment_program4 GLEW_GET_VAR(__GLEW_NV_fragment_program4) - -#endif /* GL_NV_fragment_program4 */ - -/* --------------------- GL_NV_fragment_program_option --------------------- */ - -#ifndef GL_NV_fragment_program_option -#define GL_NV_fragment_program_option 1 - -#define GLEW_NV_fragment_program_option GLEW_GET_VAR(__GLEW_NV_fragment_program_option) - -#endif /* GL_NV_fragment_program_option */ - -/* -------------------- GL_NV_fragment_shader_interlock -------------------- */ - -#ifndef GL_NV_fragment_shader_interlock -#define GL_NV_fragment_shader_interlock 1 - -#define GLEW_NV_fragment_shader_interlock GLEW_GET_VAR(__GLEW_NV_fragment_shader_interlock) - -#endif /* GL_NV_fragment_shader_interlock */ - -/* -------------------- GL_NV_framebuffer_mixed_samples -------------------- */ - -#ifndef GL_NV_framebuffer_mixed_samples -#define GL_NV_framebuffer_mixed_samples 1 - -#define GL_COLOR_SAMPLES_NV 0x8E20 -#define GL_RASTER_MULTISAMPLE_EXT 0x9327 -#define GL_RASTER_SAMPLES_EXT 0x9328 -#define GL_MAX_RASTER_SAMPLES_EXT 0x9329 -#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A -#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B -#define GL_EFFECTIVE_RASTER_SAMPLES_EXT 0x932C -#define GL_DEPTH_SAMPLES_NV 0x932D -#define GL_STENCIL_SAMPLES_NV 0x932E -#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F -#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330 -#define GL_COVERAGE_MODULATION_TABLE_NV 0x9331 -#define GL_COVERAGE_MODULATION_NV 0x9332 -#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333 - -#define GLEW_NV_framebuffer_mixed_samples GLEW_GET_VAR(__GLEW_NV_framebuffer_mixed_samples) - -#endif /* GL_NV_framebuffer_mixed_samples */ - -/* ----------------- GL_NV_framebuffer_multisample_coverage ---------------- */ - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_NV_framebuffer_multisample_coverage 1 - -#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB -#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 -#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 -#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 - -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); - -#define glRenderbufferStorageMultisampleCoverageNV GLEW_GET_FUN(__glewRenderbufferStorageMultisampleCoverageNV) - -#define GLEW_NV_framebuffer_multisample_coverage GLEW_GET_VAR(__GLEW_NV_framebuffer_multisample_coverage) - -#endif /* GL_NV_framebuffer_multisample_coverage */ - -/* ------------------------ GL_NV_geometry_program4 ------------------------ */ - -#ifndef GL_NV_geometry_program4 -#define GL_NV_geometry_program4 1 - -#define GL_GEOMETRY_PROGRAM_NV 0x8C26 -#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27 -#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28 - -typedef void (GLAPIENTRY * PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit); - -#define glProgramVertexLimitNV GLEW_GET_FUN(__glewProgramVertexLimitNV) - -#define GLEW_NV_geometry_program4 GLEW_GET_VAR(__GLEW_NV_geometry_program4) - -#endif /* GL_NV_geometry_program4 */ - -/* ------------------------- GL_NV_geometry_shader4 ------------------------ */ - -#ifndef GL_NV_geometry_shader4 -#define GL_NV_geometry_shader4 1 - -#define GLEW_NV_geometry_shader4 GLEW_GET_VAR(__GLEW_NV_geometry_shader4) - -#endif /* GL_NV_geometry_shader4 */ - -/* ------------------- GL_NV_geometry_shader_passthrough ------------------- */ - -#ifndef GL_NV_geometry_shader_passthrough -#define GL_NV_geometry_shader_passthrough 1 - -#define GLEW_NV_geometry_shader_passthrough GLEW_GET_VAR(__GLEW_NV_geometry_shader_passthrough) - -#endif /* GL_NV_geometry_shader_passthrough */ - -/* -------------------------- GL_NV_gpu_multicast -------------------------- */ - -#ifndef GL_NV_gpu_multicast -#define GL_NV_gpu_multicast 1 - -#define GL_PER_GPU_STORAGE_BIT_NV 0x0800 -#define GL_MULTICAST_GPUS_NV 0x92BA -#define GL_PER_GPU_STORAGE_NV 0x9548 -#define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9549 -#define GL_RENDER_GPU_MASK_NV 0x9558 - -typedef void (GLAPIENTRY * PFNGLMULTICASTBARRIERNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLMULTICASTBLITFRAMEBUFFERNVPROC) (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef void (GLAPIENTRY * PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); -typedef void (GLAPIENTRY * PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC) (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLMULTICASTCOPYIMAGESUBDATANVPROC) (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); -typedef void (GLAPIENTRY * PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint gpu, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLMULTICASTWAITSYNCNVPROC) (GLuint signalGpu, GLbitfield waitGpuMask); -typedef void (GLAPIENTRY * PFNGLRENDERGPUMASKNVPROC) (GLbitfield mask); - -#define glMulticastBarrierNV GLEW_GET_FUN(__glewMulticastBarrierNV) -#define glMulticastBlitFramebufferNV GLEW_GET_FUN(__glewMulticastBlitFramebufferNV) -#define glMulticastBufferSubDataNV GLEW_GET_FUN(__glewMulticastBufferSubDataNV) -#define glMulticastCopyBufferSubDataNV GLEW_GET_FUN(__glewMulticastCopyBufferSubDataNV) -#define glMulticastCopyImageSubDataNV GLEW_GET_FUN(__glewMulticastCopyImageSubDataNV) -#define glMulticastFramebufferSampleLocationsfvNV GLEW_GET_FUN(__glewMulticastFramebufferSampleLocationsfvNV) -#define glMulticastGetQueryObjecti64vNV GLEW_GET_FUN(__glewMulticastGetQueryObjecti64vNV) -#define glMulticastGetQueryObjectivNV GLEW_GET_FUN(__glewMulticastGetQueryObjectivNV) -#define glMulticastGetQueryObjectui64vNV GLEW_GET_FUN(__glewMulticastGetQueryObjectui64vNV) -#define glMulticastGetQueryObjectuivNV GLEW_GET_FUN(__glewMulticastGetQueryObjectuivNV) -#define glMulticastWaitSyncNV GLEW_GET_FUN(__glewMulticastWaitSyncNV) -#define glRenderGpuMaskNV GLEW_GET_FUN(__glewRenderGpuMaskNV) - -#define GLEW_NV_gpu_multicast GLEW_GET_VAR(__GLEW_NV_gpu_multicast) - -#endif /* GL_NV_gpu_multicast */ - -/* --------------------------- GL_NV_gpu_program4 -------------------------- */ - -#ifndef GL_NV_gpu_program4 -#define GL_NV_gpu_program4 1 - -#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 -#define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 -#define GL_PROGRAM_RESULT_COMPONENTS_NV 0x8907 -#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908 -#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909 -#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5 -#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6 - -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); - -#define glProgramEnvParameterI4iNV GLEW_GET_FUN(__glewProgramEnvParameterI4iNV) -#define glProgramEnvParameterI4ivNV GLEW_GET_FUN(__glewProgramEnvParameterI4ivNV) -#define glProgramEnvParameterI4uiNV GLEW_GET_FUN(__glewProgramEnvParameterI4uiNV) -#define glProgramEnvParameterI4uivNV GLEW_GET_FUN(__glewProgramEnvParameterI4uivNV) -#define glProgramEnvParametersI4ivNV GLEW_GET_FUN(__glewProgramEnvParametersI4ivNV) -#define glProgramEnvParametersI4uivNV GLEW_GET_FUN(__glewProgramEnvParametersI4uivNV) -#define glProgramLocalParameterI4iNV GLEW_GET_FUN(__glewProgramLocalParameterI4iNV) -#define glProgramLocalParameterI4ivNV GLEW_GET_FUN(__glewProgramLocalParameterI4ivNV) -#define glProgramLocalParameterI4uiNV GLEW_GET_FUN(__glewProgramLocalParameterI4uiNV) -#define glProgramLocalParameterI4uivNV GLEW_GET_FUN(__glewProgramLocalParameterI4uivNV) -#define glProgramLocalParametersI4ivNV GLEW_GET_FUN(__glewProgramLocalParametersI4ivNV) -#define glProgramLocalParametersI4uivNV GLEW_GET_FUN(__glewProgramLocalParametersI4uivNV) - -#define GLEW_NV_gpu_program4 GLEW_GET_VAR(__GLEW_NV_gpu_program4) - -#endif /* GL_NV_gpu_program4 */ - -/* --------------------------- GL_NV_gpu_program5 -------------------------- */ - -#ifndef GL_NV_gpu_program5 -#define GL_NV_gpu_program5 1 - -#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C -#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5F - -#define GLEW_NV_gpu_program5 GLEW_GET_VAR(__GLEW_NV_gpu_program5) - -#endif /* GL_NV_gpu_program5 */ - -/* -------------------- GL_NV_gpu_program5_mem_extended -------------------- */ - -#ifndef GL_NV_gpu_program5_mem_extended -#define GL_NV_gpu_program5_mem_extended 1 - -#define GLEW_NV_gpu_program5_mem_extended GLEW_GET_VAR(__GLEW_NV_gpu_program5_mem_extended) - -#endif /* GL_NV_gpu_program5_mem_extended */ - -/* ------------------------- GL_NV_gpu_program_fp64 ------------------------ */ - -#ifndef GL_NV_gpu_program_fp64 -#define GL_NV_gpu_program_fp64 1 - -#define GLEW_NV_gpu_program_fp64 GLEW_GET_VAR(__GLEW_NV_gpu_program_fp64) - -#endif /* GL_NV_gpu_program_fp64 */ - -/* --------------------------- GL_NV_gpu_shader5 --------------------------- */ - -#ifndef GL_NV_gpu_shader5 -#define GL_NV_gpu_shader5 1 - -#define GL_INT64_NV 0x140E -#define GL_UNSIGNED_INT64_NV 0x140F -#define GL_INT8_NV 0x8FE0 -#define GL_INT8_VEC2_NV 0x8FE1 -#define GL_INT8_VEC3_NV 0x8FE2 -#define GL_INT8_VEC4_NV 0x8FE3 -#define GL_INT16_NV 0x8FE4 -#define GL_INT16_VEC2_NV 0x8FE5 -#define GL_INT16_VEC3_NV 0x8FE6 -#define GL_INT16_VEC4_NV 0x8FE7 -#define GL_INT64_VEC2_NV 0x8FE9 -#define GL_INT64_VEC3_NV 0x8FEA -#define GL_INT64_VEC4_NV 0x8FEB -#define GL_UNSIGNED_INT8_NV 0x8FEC -#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED -#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE -#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF -#define GL_UNSIGNED_INT16_NV 0x8FF0 -#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1 -#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2 -#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3 -#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5 -#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6 -#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7 -#define GL_FLOAT16_NV 0x8FF8 -#define GL_FLOAT16_VEC2_NV 0x8FF9 -#define GL_FLOAT16_VEC3_NV 0x8FFA -#define GL_FLOAT16_VEC4_NV 0x8FFB - -typedef void (GLAPIENTRY * PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); - -#define glGetUniformi64vNV GLEW_GET_FUN(__glewGetUniformi64vNV) -#define glGetUniformui64vNV GLEW_GET_FUN(__glewGetUniformui64vNV) -#define glProgramUniform1i64NV GLEW_GET_FUN(__glewProgramUniform1i64NV) -#define glProgramUniform1i64vNV GLEW_GET_FUN(__glewProgramUniform1i64vNV) -#define glProgramUniform1ui64NV GLEW_GET_FUN(__glewProgramUniform1ui64NV) -#define glProgramUniform1ui64vNV GLEW_GET_FUN(__glewProgramUniform1ui64vNV) -#define glProgramUniform2i64NV GLEW_GET_FUN(__glewProgramUniform2i64NV) -#define glProgramUniform2i64vNV GLEW_GET_FUN(__glewProgramUniform2i64vNV) -#define glProgramUniform2ui64NV GLEW_GET_FUN(__glewProgramUniform2ui64NV) -#define glProgramUniform2ui64vNV GLEW_GET_FUN(__glewProgramUniform2ui64vNV) -#define glProgramUniform3i64NV GLEW_GET_FUN(__glewProgramUniform3i64NV) -#define glProgramUniform3i64vNV GLEW_GET_FUN(__glewProgramUniform3i64vNV) -#define glProgramUniform3ui64NV GLEW_GET_FUN(__glewProgramUniform3ui64NV) -#define glProgramUniform3ui64vNV GLEW_GET_FUN(__glewProgramUniform3ui64vNV) -#define glProgramUniform4i64NV GLEW_GET_FUN(__glewProgramUniform4i64NV) -#define glProgramUniform4i64vNV GLEW_GET_FUN(__glewProgramUniform4i64vNV) -#define glProgramUniform4ui64NV GLEW_GET_FUN(__glewProgramUniform4ui64NV) -#define glProgramUniform4ui64vNV GLEW_GET_FUN(__glewProgramUniform4ui64vNV) -#define glUniform1i64NV GLEW_GET_FUN(__glewUniform1i64NV) -#define glUniform1i64vNV GLEW_GET_FUN(__glewUniform1i64vNV) -#define glUniform1ui64NV GLEW_GET_FUN(__glewUniform1ui64NV) -#define glUniform1ui64vNV GLEW_GET_FUN(__glewUniform1ui64vNV) -#define glUniform2i64NV GLEW_GET_FUN(__glewUniform2i64NV) -#define glUniform2i64vNV GLEW_GET_FUN(__glewUniform2i64vNV) -#define glUniform2ui64NV GLEW_GET_FUN(__glewUniform2ui64NV) -#define glUniform2ui64vNV GLEW_GET_FUN(__glewUniform2ui64vNV) -#define glUniform3i64NV GLEW_GET_FUN(__glewUniform3i64NV) -#define glUniform3i64vNV GLEW_GET_FUN(__glewUniform3i64vNV) -#define glUniform3ui64NV GLEW_GET_FUN(__glewUniform3ui64NV) -#define glUniform3ui64vNV GLEW_GET_FUN(__glewUniform3ui64vNV) -#define glUniform4i64NV GLEW_GET_FUN(__glewUniform4i64NV) -#define glUniform4i64vNV GLEW_GET_FUN(__glewUniform4i64vNV) -#define glUniform4ui64NV GLEW_GET_FUN(__glewUniform4ui64NV) -#define glUniform4ui64vNV GLEW_GET_FUN(__glewUniform4ui64vNV) - -#define GLEW_NV_gpu_shader5 GLEW_GET_VAR(__GLEW_NV_gpu_shader5) - -#endif /* GL_NV_gpu_shader5 */ - -/* ---------------------------- GL_NV_half_float --------------------------- */ - -#ifndef GL_NV_half_float -#define GL_NV_half_float 1 - -#define GL_HALF_FLOAT_NV 0x140B - -typedef unsigned short GLhalf; - -typedef void (GLAPIENTRY * PFNGLCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue); -typedef void (GLAPIENTRY * PFNGLCOLOR3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLCOLOR4HNVPROC) (GLhalf red, GLhalf green, GLhalf blue, GLhalf alpha); -typedef void (GLAPIENTRY * PFNGLCOLOR4HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLFOGCOORDHNVPROC) (GLhalf fog); -typedef void (GLAPIENTRY * PFNGLFOGCOORDHVNVPROC) (const GLhalf* fog); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalf s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalf s, GLhalf t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r, GLhalf q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLNORMAL3HNVPROC) (GLhalf nx, GLhalf ny, GLhalf nz); -typedef void (GLAPIENTRY * PFNGLNORMAL3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD1HNVPROC) (GLhalf s); -typedef void (GLAPIENTRY * PFNGLTEXCOORD1HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2HNVPROC) (GLhalf s, GLhalf t); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD3HNVPROC) (GLhalf s, GLhalf t, GLhalf r); -typedef void (GLAPIENTRY * PFNGLTEXCOORD3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4HNVPROC) (GLhalf s, GLhalf t, GLhalf r, GLhalf q); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEX2HNVPROC) (GLhalf x, GLhalf y); -typedef void (GLAPIENTRY * PFNGLVERTEX2HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEX3HNVPROC) (GLhalf x, GLhalf y, GLhalf z); -typedef void (GLAPIENTRY * PFNGLVERTEX3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEX4HNVPROC) (GLhalf x, GLhalf y, GLhalf z, GLhalf w); -typedef void (GLAPIENTRY * PFNGLVERTEX4HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalf x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalf x, GLhalf y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z, GLhalf w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHNVPROC) (GLhalf weight); -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalf* weight); - -#define glColor3hNV GLEW_GET_FUN(__glewColor3hNV) -#define glColor3hvNV GLEW_GET_FUN(__glewColor3hvNV) -#define glColor4hNV GLEW_GET_FUN(__glewColor4hNV) -#define glColor4hvNV GLEW_GET_FUN(__glewColor4hvNV) -#define glFogCoordhNV GLEW_GET_FUN(__glewFogCoordhNV) -#define glFogCoordhvNV GLEW_GET_FUN(__glewFogCoordhvNV) -#define glMultiTexCoord1hNV GLEW_GET_FUN(__glewMultiTexCoord1hNV) -#define glMultiTexCoord1hvNV GLEW_GET_FUN(__glewMultiTexCoord1hvNV) -#define glMultiTexCoord2hNV GLEW_GET_FUN(__glewMultiTexCoord2hNV) -#define glMultiTexCoord2hvNV GLEW_GET_FUN(__glewMultiTexCoord2hvNV) -#define glMultiTexCoord3hNV GLEW_GET_FUN(__glewMultiTexCoord3hNV) -#define glMultiTexCoord3hvNV GLEW_GET_FUN(__glewMultiTexCoord3hvNV) -#define glMultiTexCoord4hNV GLEW_GET_FUN(__glewMultiTexCoord4hNV) -#define glMultiTexCoord4hvNV GLEW_GET_FUN(__glewMultiTexCoord4hvNV) -#define glNormal3hNV GLEW_GET_FUN(__glewNormal3hNV) -#define glNormal3hvNV GLEW_GET_FUN(__glewNormal3hvNV) -#define glSecondaryColor3hNV GLEW_GET_FUN(__glewSecondaryColor3hNV) -#define glSecondaryColor3hvNV GLEW_GET_FUN(__glewSecondaryColor3hvNV) -#define glTexCoord1hNV GLEW_GET_FUN(__glewTexCoord1hNV) -#define glTexCoord1hvNV GLEW_GET_FUN(__glewTexCoord1hvNV) -#define glTexCoord2hNV GLEW_GET_FUN(__glewTexCoord2hNV) -#define glTexCoord2hvNV GLEW_GET_FUN(__glewTexCoord2hvNV) -#define glTexCoord3hNV GLEW_GET_FUN(__glewTexCoord3hNV) -#define glTexCoord3hvNV GLEW_GET_FUN(__glewTexCoord3hvNV) -#define glTexCoord4hNV GLEW_GET_FUN(__glewTexCoord4hNV) -#define glTexCoord4hvNV GLEW_GET_FUN(__glewTexCoord4hvNV) -#define glVertex2hNV GLEW_GET_FUN(__glewVertex2hNV) -#define glVertex2hvNV GLEW_GET_FUN(__glewVertex2hvNV) -#define glVertex3hNV GLEW_GET_FUN(__glewVertex3hNV) -#define glVertex3hvNV GLEW_GET_FUN(__glewVertex3hvNV) -#define glVertex4hNV GLEW_GET_FUN(__glewVertex4hNV) -#define glVertex4hvNV GLEW_GET_FUN(__glewVertex4hvNV) -#define glVertexAttrib1hNV GLEW_GET_FUN(__glewVertexAttrib1hNV) -#define glVertexAttrib1hvNV GLEW_GET_FUN(__glewVertexAttrib1hvNV) -#define glVertexAttrib2hNV GLEW_GET_FUN(__glewVertexAttrib2hNV) -#define glVertexAttrib2hvNV GLEW_GET_FUN(__glewVertexAttrib2hvNV) -#define glVertexAttrib3hNV GLEW_GET_FUN(__glewVertexAttrib3hNV) -#define glVertexAttrib3hvNV GLEW_GET_FUN(__glewVertexAttrib3hvNV) -#define glVertexAttrib4hNV GLEW_GET_FUN(__glewVertexAttrib4hNV) -#define glVertexAttrib4hvNV GLEW_GET_FUN(__glewVertexAttrib4hvNV) -#define glVertexAttribs1hvNV GLEW_GET_FUN(__glewVertexAttribs1hvNV) -#define glVertexAttribs2hvNV GLEW_GET_FUN(__glewVertexAttribs2hvNV) -#define glVertexAttribs3hvNV GLEW_GET_FUN(__glewVertexAttribs3hvNV) -#define glVertexAttribs4hvNV GLEW_GET_FUN(__glewVertexAttribs4hvNV) -#define glVertexWeighthNV GLEW_GET_FUN(__glewVertexWeighthNV) -#define glVertexWeighthvNV GLEW_GET_FUN(__glewVertexWeighthvNV) - -#define GLEW_NV_half_float GLEW_GET_VAR(__GLEW_NV_half_float) - -#endif /* GL_NV_half_float */ - -/* ------------------- GL_NV_internalformat_sample_query ------------------- */ - -#ifndef GL_NV_internalformat_sample_query -#define GL_NV_internalformat_sample_query 1 - -#define GL_MULTISAMPLES_NV 0x9371 -#define GL_SUPERSAMPLE_SCALE_X_NV 0x9372 -#define GL_SUPERSAMPLE_SCALE_Y_NV 0x9373 -#define GL_CONFORMANT_NV 0x9374 - -typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATSAMPLEIVNVPROC) (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint* params); - -#define glGetInternalformatSampleivNV GLEW_GET_FUN(__glewGetInternalformatSampleivNV) - -#define GLEW_NV_internalformat_sample_query GLEW_GET_VAR(__GLEW_NV_internalformat_sample_query) - -#endif /* GL_NV_internalformat_sample_query */ - -/* ------------------------ GL_NV_light_max_exponent ----------------------- */ - -#ifndef GL_NV_light_max_exponent -#define GL_NV_light_max_exponent 1 - -#define GL_MAX_SHININESS_NV 0x8504 -#define GL_MAX_SPOT_EXPONENT_NV 0x8505 - -#define GLEW_NV_light_max_exponent GLEW_GET_VAR(__GLEW_NV_light_max_exponent) - -#endif /* GL_NV_light_max_exponent */ - -/* ----------------------- GL_NV_multisample_coverage ---------------------- */ - -#ifndef GL_NV_multisample_coverage -#define GL_NV_multisample_coverage 1 - -#define GL_COLOR_SAMPLES_NV 0x8E20 - -#define GLEW_NV_multisample_coverage GLEW_GET_VAR(__GLEW_NV_multisample_coverage) - -#endif /* GL_NV_multisample_coverage */ - -/* --------------------- GL_NV_multisample_filter_hint --------------------- */ - -#ifndef GL_NV_multisample_filter_hint -#define GL_NV_multisample_filter_hint 1 - -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 - -#define GLEW_NV_multisample_filter_hint GLEW_GET_VAR(__GLEW_NV_multisample_filter_hint) - -#endif /* GL_NV_multisample_filter_hint */ - -/* ------------------------- GL_NV_occlusion_query ------------------------- */ - -#ifndef GL_NV_occlusion_query -#define GL_NV_occlusion_query 1 - -#define GL_PIXEL_COUNTER_BITS_NV 0x8864 -#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 -#define GL_PIXEL_COUNT_NV 0x8866 -#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 - -typedef void (GLAPIENTRY * PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id); - -#define glBeginOcclusionQueryNV GLEW_GET_FUN(__glewBeginOcclusionQueryNV) -#define glDeleteOcclusionQueriesNV GLEW_GET_FUN(__glewDeleteOcclusionQueriesNV) -#define glEndOcclusionQueryNV GLEW_GET_FUN(__glewEndOcclusionQueryNV) -#define glGenOcclusionQueriesNV GLEW_GET_FUN(__glewGenOcclusionQueriesNV) -#define glGetOcclusionQueryivNV GLEW_GET_FUN(__glewGetOcclusionQueryivNV) -#define glGetOcclusionQueryuivNV GLEW_GET_FUN(__glewGetOcclusionQueryuivNV) -#define glIsOcclusionQueryNV GLEW_GET_FUN(__glewIsOcclusionQueryNV) - -#define GLEW_NV_occlusion_query GLEW_GET_VAR(__GLEW_NV_occlusion_query) - -#endif /* GL_NV_occlusion_query */ - -/* ----------------------- GL_NV_packed_depth_stencil ---------------------- */ - -#ifndef GL_NV_packed_depth_stencil -#define GL_NV_packed_depth_stencil 1 - -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA - -#define GLEW_NV_packed_depth_stencil GLEW_GET_VAR(__GLEW_NV_packed_depth_stencil) - -#endif /* GL_NV_packed_depth_stencil */ - -/* --------------------- GL_NV_parameter_buffer_object --------------------- */ - -#ifndef GL_NV_parameter_buffer_object -#define GL_NV_parameter_buffer_object 1 - -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0 -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1 -#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 -#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3 -#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4 - -typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); - -#define glProgramBufferParametersIivNV GLEW_GET_FUN(__glewProgramBufferParametersIivNV) -#define glProgramBufferParametersIuivNV GLEW_GET_FUN(__glewProgramBufferParametersIuivNV) -#define glProgramBufferParametersfvNV GLEW_GET_FUN(__glewProgramBufferParametersfvNV) - -#define GLEW_NV_parameter_buffer_object GLEW_GET_VAR(__GLEW_NV_parameter_buffer_object) - -#endif /* GL_NV_parameter_buffer_object */ - -/* --------------------- GL_NV_parameter_buffer_object2 -------------------- */ - -#ifndef GL_NV_parameter_buffer_object2 -#define GL_NV_parameter_buffer_object2 1 - -#define GLEW_NV_parameter_buffer_object2 GLEW_GET_VAR(__GLEW_NV_parameter_buffer_object2) - -#endif /* GL_NV_parameter_buffer_object2 */ - -/* -------------------------- GL_NV_path_rendering ------------------------- */ - -#ifndef GL_NV_path_rendering -#define GL_NV_path_rendering 1 - -#define GL_CLOSE_PATH_NV 0x00 -#define GL_BOLD_BIT_NV 0x01 -#define GL_GLYPH_WIDTH_BIT_NV 0x01 -#define GL_GLYPH_HEIGHT_BIT_NV 0x02 -#define GL_ITALIC_BIT_NV 0x02 -#define GL_MOVE_TO_NV 0x02 -#define GL_RELATIVE_MOVE_TO_NV 0x03 -#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04 -#define GL_LINE_TO_NV 0x04 -#define GL_RELATIVE_LINE_TO_NV 0x05 -#define GL_HORIZONTAL_LINE_TO_NV 0x06 -#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07 -#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08 -#define GL_VERTICAL_LINE_TO_NV 0x08 -#define GL_RELATIVE_VERTICAL_LINE_TO_NV 0x09 -#define GL_QUADRATIC_CURVE_TO_NV 0x0A -#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B -#define GL_CUBIC_CURVE_TO_NV 0x0C -#define GL_RELATIVE_CUBIC_CURVE_TO_NV 0x0D -#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0E -#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F -#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10 -#define GL_SMOOTH_CUBIC_CURVE_TO_NV 0x10 -#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11 -#define GL_SMALL_CCW_ARC_TO_NV 0x12 -#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV 0x13 -#define GL_SMALL_CW_ARC_TO_NV 0x14 -#define GL_RELATIVE_SMALL_CW_ARC_TO_NV 0x15 -#define GL_LARGE_CCW_ARC_TO_NV 0x16 -#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV 0x17 -#define GL_LARGE_CW_ARC_TO_NV 0x18 -#define GL_RELATIVE_LARGE_CW_ARC_TO_NV 0x19 -#define GL_CONIC_CURVE_TO_NV 0x1A -#define GL_RELATIVE_CONIC_CURVE_TO_NV 0x1B -#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20 -#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40 -#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80 -#define GL_ROUNDED_RECT_NV 0xE8 -#define GL_RELATIVE_ROUNDED_RECT_NV 0xE9 -#define GL_ROUNDED_RECT2_NV 0xEA -#define GL_RELATIVE_ROUNDED_RECT2_NV 0xEB -#define GL_ROUNDED_RECT4_NV 0xEC -#define GL_RELATIVE_ROUNDED_RECT4_NV 0xED -#define GL_ROUNDED_RECT8_NV 0xEE -#define GL_RELATIVE_ROUNDED_RECT8_NV 0xEF -#define GL_RESTART_PATH_NV 0xF0 -#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV 0xF2 -#define GL_DUP_LAST_CUBIC_CURVE_TO_NV 0xF4 -#define GL_RECT_NV 0xF6 -#define GL_RELATIVE_RECT_NV 0xF7 -#define GL_CIRCULAR_CCW_ARC_TO_NV 0xF8 -#define GL_CIRCULAR_CW_ARC_TO_NV 0xFA -#define GL_CIRCULAR_TANGENT_ARC_TO_NV 0xFC -#define GL_ARC_TO_NV 0xFE -#define GL_RELATIVE_ARC_TO_NV 0xFF -#define GL_GLYPH_HAS_KERNING_BIT_NV 0x100 -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PATH_FORMAT_SVG_NV 0x9070 -#define GL_PATH_FORMAT_PS_NV 0x9071 -#define GL_STANDARD_FONT_NAME_NV 0x9072 -#define GL_SYSTEM_FONT_NAME_NV 0x9073 -#define GL_FILE_NAME_NV 0x9074 -#define GL_PATH_STROKE_WIDTH_NV 0x9075 -#define GL_PATH_END_CAPS_NV 0x9076 -#define GL_PATH_INITIAL_END_CAP_NV 0x9077 -#define GL_PATH_TERMINAL_END_CAP_NV 0x9078 -#define GL_PATH_JOIN_STYLE_NV 0x9079 -#define GL_PATH_MITER_LIMIT_NV 0x907A -#define GL_PATH_DASH_CAPS_NV 0x907B -#define GL_PATH_INITIAL_DASH_CAP_NV 0x907C -#define GL_PATH_TERMINAL_DASH_CAP_NV 0x907D -#define GL_PATH_DASH_OFFSET_NV 0x907E -#define GL_PATH_CLIENT_LENGTH_NV 0x907F -#define GL_PATH_FILL_MODE_NV 0x9080 -#define GL_PATH_FILL_MASK_NV 0x9081 -#define GL_PATH_FILL_COVER_MODE_NV 0x9082 -#define GL_PATH_STROKE_COVER_MODE_NV 0x9083 -#define GL_PATH_STROKE_MASK_NV 0x9084 -#define GL_PATH_STROKE_BOUND_NV 0x9086 -#define GL_COUNT_UP_NV 0x9088 -#define GL_COUNT_DOWN_NV 0x9089 -#define GL_PATH_OBJECT_BOUNDING_BOX_NV 0x908A -#define GL_CONVEX_HULL_NV 0x908B -#define GL_BOUNDING_BOX_NV 0x908D -#define GL_TRANSLATE_X_NV 0x908E -#define GL_TRANSLATE_Y_NV 0x908F -#define GL_TRANSLATE_2D_NV 0x9090 -#define GL_TRANSLATE_3D_NV 0x9091 -#define GL_AFFINE_2D_NV 0x9092 -#define GL_AFFINE_3D_NV 0x9094 -#define GL_TRANSPOSE_AFFINE_2D_NV 0x9096 -#define GL_TRANSPOSE_AFFINE_3D_NV 0x9098 -#define GL_UTF8_NV 0x909A -#define GL_UTF16_NV 0x909B -#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C -#define GL_PATH_COMMAND_COUNT_NV 0x909D -#define GL_PATH_COORD_COUNT_NV 0x909E -#define GL_PATH_DASH_ARRAY_COUNT_NV 0x909F -#define GL_PATH_COMPUTED_LENGTH_NV 0x90A0 -#define GL_PATH_FILL_BOUNDING_BOX_NV 0x90A1 -#define GL_PATH_STROKE_BOUNDING_BOX_NV 0x90A2 -#define GL_SQUARE_NV 0x90A3 -#define GL_ROUND_NV 0x90A4 -#define GL_TRIANGULAR_NV 0x90A5 -#define GL_BEVEL_NV 0x90A6 -#define GL_MITER_REVERT_NV 0x90A7 -#define GL_MITER_TRUNCATE_NV 0x90A8 -#define GL_SKIP_MISSING_GLYPH_NV 0x90A9 -#define GL_USE_MISSING_GLYPH_NV 0x90AA -#define GL_PATH_ERROR_POSITION_NV 0x90AB -#define GL_PATH_FOG_GEN_MODE_NV 0x90AC -#define GL_ACCUM_ADJACENT_PAIRS_NV 0x90AD -#define GL_ADJACENT_PAIRS_NV 0x90AE -#define GL_FIRST_TO_REST_NV 0x90AF -#define GL_PATH_GEN_MODE_NV 0x90B0 -#define GL_PATH_GEN_COEFF_NV 0x90B1 -#define GL_PATH_GEN_COLOR_FORMAT_NV 0x90B2 -#define GL_PATH_GEN_COMPONENTS_NV 0x90B3 -#define GL_PATH_DASH_OFFSET_RESET_NV 0x90B4 -#define GL_MOVE_TO_RESETS_NV 0x90B5 -#define GL_MOVE_TO_CONTINUES_NV 0x90B6 -#define GL_PATH_STENCIL_FUNC_NV 0x90B7 -#define GL_PATH_STENCIL_REF_NV 0x90B8 -#define GL_PATH_STENCIL_VALUE_MASK_NV 0x90B9 -#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD -#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE -#define GL_PATH_COVER_DEPTH_FUNC_NV 0x90BF -#define GL_FONT_GLYPHS_AVAILABLE_NV 0x9368 -#define GL_FONT_TARGET_UNAVAILABLE_NV 0x9369 -#define GL_FONT_UNAVAILABLE_NV 0x936A -#define GL_FONT_UNINTELLIGIBLE_NV 0x936B -#define GL_STANDARD_FONT_FORMAT_NV 0x936C -#define GL_FRAGMENT_INPUT_NV 0x936D -#define GL_FONT_X_MIN_BOUNDS_BIT_NV 0x00010000 -#define GL_FONT_Y_MIN_BOUNDS_BIT_NV 0x00020000 -#define GL_FONT_X_MAX_BOUNDS_BIT_NV 0x00040000 -#define GL_FONT_Y_MAX_BOUNDS_BIT_NV 0x00080000 -#define GL_FONT_UNITS_PER_EM_BIT_NV 0x00100000 -#define GL_FONT_ASCENDER_BIT_NV 0x00200000 -#define GL_FONT_DESCENDER_BIT_NV 0x00400000 -#define GL_FONT_HEIGHT_BIT_NV 0x00800000 -#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV 0x01000000 -#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000 -#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000 -#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000 -#define GL_FONT_HAS_KERNING_BIT_NV 0x10000000 -#define GL_FONT_NUM_GLYPH_INDICES_BIT_NV 0x20000000 - -typedef void (GLAPIENTRY * PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath); -typedef void (GLAPIENTRY * PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode); -typedef void (GLAPIENTRY * PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode); -typedef void (GLAPIENTRY * PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range); -typedef GLuint (GLAPIENTRY * PFNGLGENPATHSNVPROC) (GLsizei range); -typedef void (GLAPIENTRY * PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat* value); -typedef void (GLAPIENTRY * PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint* value); -typedef void (GLAPIENTRY * PFNGLGETPATHCOMMANDSNVPROC) (GLuint path, GLubyte* commands); -typedef void (GLAPIENTRY * PFNGLGETPATHCOORDSNVPROC) (GLuint path, GLfloat* coords); -typedef void (GLAPIENTRY * PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat* dashArray); -typedef GLfloat (GLAPIENTRY * PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments); -typedef void (GLAPIENTRY * PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat* metrics); -typedef void (GLAPIENTRY * PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics); -typedef void (GLAPIENTRY * PFNGLGETPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, GLfloat* value); -typedef void (GLAPIENTRY * PFNGLGETPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, GLint* value); -typedef void (GLAPIENTRY * PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing); -typedef void (GLAPIENTRY * PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat* value); -typedef void (GLAPIENTRY * PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint* value); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum* props, GLsizei bufSize, GLsizei *length, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight); -typedef GLboolean (GLAPIENTRY * PFNGLISPATHNVPROC) (GLuint path); -typedef GLboolean (GLAPIENTRY * PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y); -typedef GLboolean (GLAPIENTRY * PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLMATRIXLOAD3X2FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOAD3X3FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULT3X2FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULT3X3FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat* coeffs); -typedef void (GLAPIENTRY * PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void*coords); -typedef void (GLAPIENTRY * PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords); -typedef void (GLAPIENTRY * PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum zfunc); -typedef void (GLAPIENTRY * PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat* dashArray); -typedef void (GLAPIENTRY * PFNGLPATHFOGGENNVPROC) (GLenum genMode); -typedef GLenum (GLAPIENTRY * PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale); -typedef GLenum (GLAPIENTRY * PFNGLPATHGLYPHINDEXRANGENVPROC) (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]); -typedef void (GLAPIENTRY * PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale); -typedef void (GLAPIENTRY * PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void*charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale); -typedef GLenum (GLAPIENTRY * PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale); -typedef void (GLAPIENTRY * PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value); -typedef void (GLAPIENTRY * PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value); -typedef void (GLAPIENTRY * PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units); -typedef void (GLAPIENTRY * PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask); -typedef void (GLAPIENTRY * PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const void *pathString); -typedef void (GLAPIENTRY * PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void*coords); -typedef void (GLAPIENTRY * PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords); -typedef void (GLAPIENTRY * PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat* coeffs); -typedef GLboolean (GLAPIENTRY * PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat* x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY); -typedef void (GLAPIENTRY * PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat* coeffs); -typedef void (GLAPIENTRY * PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode); -typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask, GLenum coverMode); -typedef void (GLAPIENTRY * PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat* transformValues); -typedef void (GLAPIENTRY * PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint paths[], const GLfloat weights[]); - -#define glCopyPathNV GLEW_GET_FUN(__glewCopyPathNV) -#define glCoverFillPathInstancedNV GLEW_GET_FUN(__glewCoverFillPathInstancedNV) -#define glCoverFillPathNV GLEW_GET_FUN(__glewCoverFillPathNV) -#define glCoverStrokePathInstancedNV GLEW_GET_FUN(__glewCoverStrokePathInstancedNV) -#define glCoverStrokePathNV GLEW_GET_FUN(__glewCoverStrokePathNV) -#define glDeletePathsNV GLEW_GET_FUN(__glewDeletePathsNV) -#define glGenPathsNV GLEW_GET_FUN(__glewGenPathsNV) -#define glGetPathColorGenfvNV GLEW_GET_FUN(__glewGetPathColorGenfvNV) -#define glGetPathColorGenivNV GLEW_GET_FUN(__glewGetPathColorGenivNV) -#define glGetPathCommandsNV GLEW_GET_FUN(__glewGetPathCommandsNV) -#define glGetPathCoordsNV GLEW_GET_FUN(__glewGetPathCoordsNV) -#define glGetPathDashArrayNV GLEW_GET_FUN(__glewGetPathDashArrayNV) -#define glGetPathLengthNV GLEW_GET_FUN(__glewGetPathLengthNV) -#define glGetPathMetricRangeNV GLEW_GET_FUN(__glewGetPathMetricRangeNV) -#define glGetPathMetricsNV GLEW_GET_FUN(__glewGetPathMetricsNV) -#define glGetPathParameterfvNV GLEW_GET_FUN(__glewGetPathParameterfvNV) -#define glGetPathParameterivNV GLEW_GET_FUN(__glewGetPathParameterivNV) -#define glGetPathSpacingNV GLEW_GET_FUN(__glewGetPathSpacingNV) -#define glGetPathTexGenfvNV GLEW_GET_FUN(__glewGetPathTexGenfvNV) -#define glGetPathTexGenivNV GLEW_GET_FUN(__glewGetPathTexGenivNV) -#define glGetProgramResourcefvNV GLEW_GET_FUN(__glewGetProgramResourcefvNV) -#define glInterpolatePathsNV GLEW_GET_FUN(__glewInterpolatePathsNV) -#define glIsPathNV GLEW_GET_FUN(__glewIsPathNV) -#define glIsPointInFillPathNV GLEW_GET_FUN(__glewIsPointInFillPathNV) -#define glIsPointInStrokePathNV GLEW_GET_FUN(__glewIsPointInStrokePathNV) -#define glMatrixLoad3x2fNV GLEW_GET_FUN(__glewMatrixLoad3x2fNV) -#define glMatrixLoad3x3fNV GLEW_GET_FUN(__glewMatrixLoad3x3fNV) -#define glMatrixLoadTranspose3x3fNV GLEW_GET_FUN(__glewMatrixLoadTranspose3x3fNV) -#define glMatrixMult3x2fNV GLEW_GET_FUN(__glewMatrixMult3x2fNV) -#define glMatrixMult3x3fNV GLEW_GET_FUN(__glewMatrixMult3x3fNV) -#define glMatrixMultTranspose3x3fNV GLEW_GET_FUN(__glewMatrixMultTranspose3x3fNV) -#define glPathColorGenNV GLEW_GET_FUN(__glewPathColorGenNV) -#define glPathCommandsNV GLEW_GET_FUN(__glewPathCommandsNV) -#define glPathCoordsNV GLEW_GET_FUN(__glewPathCoordsNV) -#define glPathCoverDepthFuncNV GLEW_GET_FUN(__glewPathCoverDepthFuncNV) -#define glPathDashArrayNV GLEW_GET_FUN(__glewPathDashArrayNV) -#define glPathFogGenNV GLEW_GET_FUN(__glewPathFogGenNV) -#define glPathGlyphIndexArrayNV GLEW_GET_FUN(__glewPathGlyphIndexArrayNV) -#define glPathGlyphIndexRangeNV GLEW_GET_FUN(__glewPathGlyphIndexRangeNV) -#define glPathGlyphRangeNV GLEW_GET_FUN(__glewPathGlyphRangeNV) -#define glPathGlyphsNV GLEW_GET_FUN(__glewPathGlyphsNV) -#define glPathMemoryGlyphIndexArrayNV GLEW_GET_FUN(__glewPathMemoryGlyphIndexArrayNV) -#define glPathParameterfNV GLEW_GET_FUN(__glewPathParameterfNV) -#define glPathParameterfvNV GLEW_GET_FUN(__glewPathParameterfvNV) -#define glPathParameteriNV GLEW_GET_FUN(__glewPathParameteriNV) -#define glPathParameterivNV GLEW_GET_FUN(__glewPathParameterivNV) -#define glPathStencilDepthOffsetNV GLEW_GET_FUN(__glewPathStencilDepthOffsetNV) -#define glPathStencilFuncNV GLEW_GET_FUN(__glewPathStencilFuncNV) -#define glPathStringNV GLEW_GET_FUN(__glewPathStringNV) -#define glPathSubCommandsNV GLEW_GET_FUN(__glewPathSubCommandsNV) -#define glPathSubCoordsNV GLEW_GET_FUN(__glewPathSubCoordsNV) -#define glPathTexGenNV GLEW_GET_FUN(__glewPathTexGenNV) -#define glPointAlongPathNV GLEW_GET_FUN(__glewPointAlongPathNV) -#define glProgramPathFragmentInputGenNV GLEW_GET_FUN(__glewProgramPathFragmentInputGenNV) -#define glStencilFillPathInstancedNV GLEW_GET_FUN(__glewStencilFillPathInstancedNV) -#define glStencilFillPathNV GLEW_GET_FUN(__glewStencilFillPathNV) -#define glStencilStrokePathInstancedNV GLEW_GET_FUN(__glewStencilStrokePathInstancedNV) -#define glStencilStrokePathNV GLEW_GET_FUN(__glewStencilStrokePathNV) -#define glStencilThenCoverFillPathInstancedNV GLEW_GET_FUN(__glewStencilThenCoverFillPathInstancedNV) -#define glStencilThenCoverFillPathNV GLEW_GET_FUN(__glewStencilThenCoverFillPathNV) -#define glStencilThenCoverStrokePathInstancedNV GLEW_GET_FUN(__glewStencilThenCoverStrokePathInstancedNV) -#define glStencilThenCoverStrokePathNV GLEW_GET_FUN(__glewStencilThenCoverStrokePathNV) -#define glTransformPathNV GLEW_GET_FUN(__glewTransformPathNV) -#define glWeightPathsNV GLEW_GET_FUN(__glewWeightPathsNV) - -#define GLEW_NV_path_rendering GLEW_GET_VAR(__GLEW_NV_path_rendering) - -#endif /* GL_NV_path_rendering */ - -/* -------------------- GL_NV_path_rendering_shared_edge ------------------- */ - -#ifndef GL_NV_path_rendering_shared_edge -#define GL_NV_path_rendering_shared_edge 1 - -#define GL_SHARED_EDGE_NV 0xC0 - -#define GLEW_NV_path_rendering_shared_edge GLEW_GET_VAR(__GLEW_NV_path_rendering_shared_edge) - -#endif /* GL_NV_path_rendering_shared_edge */ - -/* ------------------------- GL_NV_pixel_data_range ------------------------ */ - -#ifndef GL_NV_pixel_data_range -#define GL_NV_pixel_data_range 1 - -#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878 -#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879 -#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A -#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B -#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C -#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D - -typedef void (GLAPIENTRY * PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, void *pointer); - -#define glFlushPixelDataRangeNV GLEW_GET_FUN(__glewFlushPixelDataRangeNV) -#define glPixelDataRangeNV GLEW_GET_FUN(__glewPixelDataRangeNV) - -#define GLEW_NV_pixel_data_range GLEW_GET_VAR(__GLEW_NV_pixel_data_range) - -#endif /* GL_NV_pixel_data_range */ - -/* --------------------------- GL_NV_point_sprite -------------------------- */ - -#ifndef GL_NV_point_sprite -#define GL_NV_point_sprite 1 - -#define GL_POINT_SPRITE_NV 0x8861 -#define GL_COORD_REPLACE_NV 0x8862 -#define GL_POINT_SPRITE_R_MODE_NV 0x8863 - -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint* params); - -#define glPointParameteriNV GLEW_GET_FUN(__glewPointParameteriNV) -#define glPointParameterivNV GLEW_GET_FUN(__glewPointParameterivNV) - -#define GLEW_NV_point_sprite GLEW_GET_VAR(__GLEW_NV_point_sprite) - -#endif /* GL_NV_point_sprite */ - -/* -------------------------- GL_NV_present_video -------------------------- */ - -#ifndef GL_NV_present_video -#define GL_NV_present_video 1 - -#define GL_FRAME_NV 0x8E26 -#define GL_FIELDS_NV 0x8E27 -#define GL_CURRENT_TIME_NV 0x8E28 -#define GL_NUM_FILL_STREAMS_NV 0x8E29 -#define GL_PRESENT_TIME_NV 0x8E2A -#define GL_PRESENT_DURATION_NV 0x8E2B - -typedef void (GLAPIENTRY * PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3); -typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1); - -#define glGetVideoi64vNV GLEW_GET_FUN(__glewGetVideoi64vNV) -#define glGetVideoivNV GLEW_GET_FUN(__glewGetVideoivNV) -#define glGetVideoui64vNV GLEW_GET_FUN(__glewGetVideoui64vNV) -#define glGetVideouivNV GLEW_GET_FUN(__glewGetVideouivNV) -#define glPresentFrameDualFillNV GLEW_GET_FUN(__glewPresentFrameDualFillNV) -#define glPresentFrameKeyedNV GLEW_GET_FUN(__glewPresentFrameKeyedNV) - -#define GLEW_NV_present_video GLEW_GET_VAR(__GLEW_NV_present_video) - -#endif /* GL_NV_present_video */ - -/* ------------------------ GL_NV_primitive_restart ------------------------ */ - -#ifndef GL_NV_primitive_restart -#define GL_NV_primitive_restart 1 - -#define GL_PRIMITIVE_RESTART_NV 0x8558 -#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 - -typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTNVPROC) (void); - -#define glPrimitiveRestartIndexNV GLEW_GET_FUN(__glewPrimitiveRestartIndexNV) -#define glPrimitiveRestartNV GLEW_GET_FUN(__glewPrimitiveRestartNV) - -#define GLEW_NV_primitive_restart GLEW_GET_VAR(__GLEW_NV_primitive_restart) - -#endif /* GL_NV_primitive_restart */ - -/* ------------------------ GL_NV_register_combiners ----------------------- */ - -#ifndef GL_NV_register_combiners -#define GL_NV_register_combiners 1 - -#define GL_REGISTER_COMBINERS_NV 0x8522 -#define GL_VARIABLE_A_NV 0x8523 -#define GL_VARIABLE_B_NV 0x8524 -#define GL_VARIABLE_C_NV 0x8525 -#define GL_VARIABLE_D_NV 0x8526 -#define GL_VARIABLE_E_NV 0x8527 -#define GL_VARIABLE_F_NV 0x8528 -#define GL_VARIABLE_G_NV 0x8529 -#define GL_CONSTANT_COLOR0_NV 0x852A -#define GL_CONSTANT_COLOR1_NV 0x852B -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_SPARE0_NV 0x852E -#define GL_SPARE1_NV 0x852F -#define GL_DISCARD_NV 0x8530 -#define GL_E_TIMES_F_NV 0x8531 -#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 -#define GL_UNSIGNED_IDENTITY_NV 0x8536 -#define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_EXPAND_NORMAL_NV 0x8538 -#define GL_EXPAND_NEGATE_NV 0x8539 -#define GL_HALF_BIAS_NORMAL_NV 0x853A -#define GL_HALF_BIAS_NEGATE_NV 0x853B -#define GL_SIGNED_IDENTITY_NV 0x853C -#define GL_SIGNED_NEGATE_NV 0x853D -#define GL_SCALE_BY_TWO_NV 0x853E -#define GL_SCALE_BY_FOUR_NV 0x853F -#define GL_SCALE_BY_ONE_HALF_NV 0x8540 -#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541 -#define GL_COMBINER_INPUT_NV 0x8542 -#define GL_COMBINER_MAPPING_NV 0x8543 -#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544 -#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545 -#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546 -#define GL_COMBINER_MUX_SUM_NV 0x8547 -#define GL_COMBINER_SCALE_NV 0x8548 -#define GL_COMBINER_BIAS_NV 0x8549 -#define GL_COMBINER_AB_OUTPUT_NV 0x854A -#define GL_COMBINER_CD_OUTPUT_NV 0x854B -#define GL_COMBINER_SUM_OUTPUT_NV 0x854C -#define GL_MAX_GENERAL_COMBINERS_NV 0x854D -#define GL_NUM_GENERAL_COMBINERS_NV 0x854E -#define GL_COLOR_SUM_CLAMP_NV 0x854F -#define GL_COMBINER0_NV 0x8550 -#define GL_COMBINER1_NV 0x8551 -#define GL_COMBINER2_NV 0x8552 -#define GL_COMBINER3_NV 0x8553 -#define GL_COMBINER4_NV 0x8554 -#define GL_COMBINER5_NV 0x8555 -#define GL_COMBINER6_NV 0x8556 -#define GL_COMBINER7_NV 0x8557 - -typedef void (GLAPIENTRY * PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (GLAPIENTRY * PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint* params); - -#define glCombinerInputNV GLEW_GET_FUN(__glewCombinerInputNV) -#define glCombinerOutputNV GLEW_GET_FUN(__glewCombinerOutputNV) -#define glCombinerParameterfNV GLEW_GET_FUN(__glewCombinerParameterfNV) -#define glCombinerParameterfvNV GLEW_GET_FUN(__glewCombinerParameterfvNV) -#define glCombinerParameteriNV GLEW_GET_FUN(__glewCombinerParameteriNV) -#define glCombinerParameterivNV GLEW_GET_FUN(__glewCombinerParameterivNV) -#define glFinalCombinerInputNV GLEW_GET_FUN(__glewFinalCombinerInputNV) -#define glGetCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetCombinerInputParameterfvNV) -#define glGetCombinerInputParameterivNV GLEW_GET_FUN(__glewGetCombinerInputParameterivNV) -#define glGetCombinerOutputParameterfvNV GLEW_GET_FUN(__glewGetCombinerOutputParameterfvNV) -#define glGetCombinerOutputParameterivNV GLEW_GET_FUN(__glewGetCombinerOutputParameterivNV) -#define glGetFinalCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterfvNV) -#define glGetFinalCombinerInputParameterivNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterivNV) - -#define GLEW_NV_register_combiners GLEW_GET_VAR(__GLEW_NV_register_combiners) - -#endif /* GL_NV_register_combiners */ - -/* ----------------------- GL_NV_register_combiners2 ----------------------- */ - -#ifndef GL_NV_register_combiners2 -#define GL_NV_register_combiners2 1 - -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 - -typedef void (GLAPIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat* params); - -#define glCombinerStageParameterfvNV GLEW_GET_FUN(__glewCombinerStageParameterfvNV) -#define glGetCombinerStageParameterfvNV GLEW_GET_FUN(__glewGetCombinerStageParameterfvNV) - -#define GLEW_NV_register_combiners2 GLEW_GET_VAR(__GLEW_NV_register_combiners2) - -#endif /* GL_NV_register_combiners2 */ - -/* ------------------ GL_NV_robustness_video_memory_purge ------------------ */ - -#ifndef GL_NV_robustness_video_memory_purge -#define GL_NV_robustness_video_memory_purge 1 - -#define GL_EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C -#define GL_PURGED_CONTEXT_RESET_NV 0x92BB - -#define GLEW_NV_robustness_video_memory_purge GLEW_GET_VAR(__GLEW_NV_robustness_video_memory_purge) - -#endif /* GL_NV_robustness_video_memory_purge */ - -/* ------------------------- GL_NV_sample_locations ------------------------ */ - -#ifndef GL_NV_sample_locations -#define GL_NV_sample_locations 1 - -#define GL_SAMPLE_LOCATION_NV 0x8E50 -#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV 0x933D -#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV 0x933E -#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV 0x933F -#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV 0x9340 -#define GL_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9341 -#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV 0x9342 -#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV 0x9343 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v); - -#define glFramebufferSampleLocationsfvNV GLEW_GET_FUN(__glewFramebufferSampleLocationsfvNV) -#define glNamedFramebufferSampleLocationsfvNV GLEW_GET_FUN(__glewNamedFramebufferSampleLocationsfvNV) - -#define GLEW_NV_sample_locations GLEW_GET_VAR(__GLEW_NV_sample_locations) - -#endif /* GL_NV_sample_locations */ - -/* ------------------ GL_NV_sample_mask_override_coverage ------------------ */ - -#ifndef GL_NV_sample_mask_override_coverage -#define GL_NV_sample_mask_override_coverage 1 - -#define GLEW_NV_sample_mask_override_coverage GLEW_GET_VAR(__GLEW_NV_sample_mask_override_coverage) - -#endif /* GL_NV_sample_mask_override_coverage */ - -/* ---------------------- GL_NV_shader_atomic_counters --------------------- */ - -#ifndef GL_NV_shader_atomic_counters -#define GL_NV_shader_atomic_counters 1 - -#define GLEW_NV_shader_atomic_counters GLEW_GET_VAR(__GLEW_NV_shader_atomic_counters) - -#endif /* GL_NV_shader_atomic_counters */ - -/* ----------------------- GL_NV_shader_atomic_float ----------------------- */ - -#ifndef GL_NV_shader_atomic_float -#define GL_NV_shader_atomic_float 1 - -#define GLEW_NV_shader_atomic_float GLEW_GET_VAR(__GLEW_NV_shader_atomic_float) - -#endif /* GL_NV_shader_atomic_float */ - -/* ---------------------- GL_NV_shader_atomic_float64 ---------------------- */ - -#ifndef GL_NV_shader_atomic_float64 -#define GL_NV_shader_atomic_float64 1 - -#define GLEW_NV_shader_atomic_float64 GLEW_GET_VAR(__GLEW_NV_shader_atomic_float64) - -#endif /* GL_NV_shader_atomic_float64 */ - -/* -------------------- GL_NV_shader_atomic_fp16_vector -------------------- */ - -#ifndef GL_NV_shader_atomic_fp16_vector -#define GL_NV_shader_atomic_fp16_vector 1 - -#define GLEW_NV_shader_atomic_fp16_vector GLEW_GET_VAR(__GLEW_NV_shader_atomic_fp16_vector) - -#endif /* GL_NV_shader_atomic_fp16_vector */ - -/* ----------------------- GL_NV_shader_atomic_int64 ----------------------- */ - -#ifndef GL_NV_shader_atomic_int64 -#define GL_NV_shader_atomic_int64 1 - -#define GLEW_NV_shader_atomic_int64 GLEW_GET_VAR(__GLEW_NV_shader_atomic_int64) - -#endif /* GL_NV_shader_atomic_int64 */ - -/* ------------------------ GL_NV_shader_buffer_load ----------------------- */ - -#ifndef GL_NV_shader_buffer_load -#define GL_NV_shader_buffer_load 1 - -#define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D -#define GL_GPU_ADDRESS_NV 0x8F34 -#define GL_MAX_SHADER_BUFFER_ADDRESS_NV 0x8F35 - -typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT* result); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT* params); -typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERRESIDENTNVPROC) (GLenum target); -typedef GLboolean (GLAPIENTRY * PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access); -typedef void (GLAPIENTRY * PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value); -typedef void (GLAPIENTRY * PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); - -#define glGetBufferParameterui64vNV GLEW_GET_FUN(__glewGetBufferParameterui64vNV) -#define glGetIntegerui64vNV GLEW_GET_FUN(__glewGetIntegerui64vNV) -#define glGetNamedBufferParameterui64vNV GLEW_GET_FUN(__glewGetNamedBufferParameterui64vNV) -#define glIsBufferResidentNV GLEW_GET_FUN(__glewIsBufferResidentNV) -#define glIsNamedBufferResidentNV GLEW_GET_FUN(__glewIsNamedBufferResidentNV) -#define glMakeBufferNonResidentNV GLEW_GET_FUN(__glewMakeBufferNonResidentNV) -#define glMakeBufferResidentNV GLEW_GET_FUN(__glewMakeBufferResidentNV) -#define glMakeNamedBufferNonResidentNV GLEW_GET_FUN(__glewMakeNamedBufferNonResidentNV) -#define glMakeNamedBufferResidentNV GLEW_GET_FUN(__glewMakeNamedBufferResidentNV) -#define glProgramUniformui64NV GLEW_GET_FUN(__glewProgramUniformui64NV) -#define glProgramUniformui64vNV GLEW_GET_FUN(__glewProgramUniformui64vNV) -#define glUniformui64NV GLEW_GET_FUN(__glewUniformui64NV) -#define glUniformui64vNV GLEW_GET_FUN(__glewUniformui64vNV) - -#define GLEW_NV_shader_buffer_load GLEW_GET_VAR(__GLEW_NV_shader_buffer_load) - -#endif /* GL_NV_shader_buffer_load */ - -/* ------------------- GL_NV_shader_storage_buffer_object ------------------ */ - -#ifndef GL_NV_shader_storage_buffer_object -#define GL_NV_shader_storage_buffer_object 1 - -#define GLEW_NV_shader_storage_buffer_object GLEW_GET_VAR(__GLEW_NV_shader_storage_buffer_object) - -#endif /* GL_NV_shader_storage_buffer_object */ - -/* ----------------------- GL_NV_shader_thread_group ----------------------- */ - -#ifndef GL_NV_shader_thread_group -#define GL_NV_shader_thread_group 1 - -#define GL_WARP_SIZE_NV 0x9339 -#define GL_WARPS_PER_SM_NV 0x933A -#define GL_SM_COUNT_NV 0x933B - -#define GLEW_NV_shader_thread_group GLEW_GET_VAR(__GLEW_NV_shader_thread_group) - -#endif /* GL_NV_shader_thread_group */ - -/* ---------------------- GL_NV_shader_thread_shuffle ---------------------- */ - -#ifndef GL_NV_shader_thread_shuffle -#define GL_NV_shader_thread_shuffle 1 - -#define GLEW_NV_shader_thread_shuffle GLEW_GET_VAR(__GLEW_NV_shader_thread_shuffle) - -#endif /* GL_NV_shader_thread_shuffle */ - -/* ---------------------- GL_NV_stereo_view_rendering ---------------------- */ - -#ifndef GL_NV_stereo_view_rendering -#define GL_NV_stereo_view_rendering 1 - -#define GLEW_NV_stereo_view_rendering GLEW_GET_VAR(__GLEW_NV_stereo_view_rendering) - -#endif /* GL_NV_stereo_view_rendering */ - -/* ---------------------- GL_NV_tessellation_program5 ---------------------- */ - -#ifndef GL_NV_tessellation_program5 -#define GL_NV_tessellation_program5 1 - -#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8 -#define GL_TESS_CONTROL_PROGRAM_NV 0x891E -#define GL_TESS_EVALUATION_PROGRAM_NV 0x891F -#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74 -#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75 - -#define GLEW_NV_tessellation_program5 GLEW_GET_VAR(__GLEW_NV_tessellation_program5) - -#endif /* GL_NV_tessellation_program5 */ - -/* -------------------------- GL_NV_texgen_emboss -------------------------- */ - -#ifndef GL_NV_texgen_emboss -#define GL_NV_texgen_emboss 1 - -#define GL_EMBOSS_LIGHT_NV 0x855D -#define GL_EMBOSS_CONSTANT_NV 0x855E -#define GL_EMBOSS_MAP_NV 0x855F - -#define GLEW_NV_texgen_emboss GLEW_GET_VAR(__GLEW_NV_texgen_emboss) - -#endif /* GL_NV_texgen_emboss */ - -/* ------------------------ GL_NV_texgen_reflection ------------------------ */ - -#ifndef GL_NV_texgen_reflection -#define GL_NV_texgen_reflection 1 - -#define GL_NORMAL_MAP_NV 0x8511 -#define GL_REFLECTION_MAP_NV 0x8512 - -#define GLEW_NV_texgen_reflection GLEW_GET_VAR(__GLEW_NV_texgen_reflection) - -#endif /* GL_NV_texgen_reflection */ - -/* ------------------------- GL_NV_texture_barrier ------------------------- */ - -#ifndef GL_NV_texture_barrier -#define GL_NV_texture_barrier 1 - -typedef void (GLAPIENTRY * PFNGLTEXTUREBARRIERNVPROC) (void); - -#define glTextureBarrierNV GLEW_GET_FUN(__glewTextureBarrierNV) - -#define GLEW_NV_texture_barrier GLEW_GET_VAR(__GLEW_NV_texture_barrier) - -#endif /* GL_NV_texture_barrier */ - -/* --------------------- GL_NV_texture_compression_vtc --------------------- */ - -#ifndef GL_NV_texture_compression_vtc -#define GL_NV_texture_compression_vtc 1 - -#define GLEW_NV_texture_compression_vtc GLEW_GET_VAR(__GLEW_NV_texture_compression_vtc) - -#endif /* GL_NV_texture_compression_vtc */ - -/* ----------------------- GL_NV_texture_env_combine4 ---------------------- */ - -#ifndef GL_NV_texture_env_combine4 -#define GL_NV_texture_env_combine4 1 - -#define GL_COMBINE4_NV 0x8503 -#define GL_SOURCE3_RGB_NV 0x8583 -#define GL_SOURCE3_ALPHA_NV 0x858B -#define GL_OPERAND3_RGB_NV 0x8593 -#define GL_OPERAND3_ALPHA_NV 0x859B - -#define GLEW_NV_texture_env_combine4 GLEW_GET_VAR(__GLEW_NV_texture_env_combine4) - -#endif /* GL_NV_texture_env_combine4 */ - -/* ---------------------- GL_NV_texture_expand_normal ---------------------- */ - -#ifndef GL_NV_texture_expand_normal -#define GL_NV_texture_expand_normal 1 - -#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F - -#define GLEW_NV_texture_expand_normal GLEW_GET_VAR(__GLEW_NV_texture_expand_normal) - -#endif /* GL_NV_texture_expand_normal */ - -/* ----------------------- GL_NV_texture_multisample ----------------------- */ - -#ifndef GL_NV_texture_multisample -#define GL_NV_texture_multisample 1 - -#define GL_TEXTURE_COVERAGE_SAMPLES_NV 0x9045 -#define GL_TEXTURE_COLOR_SAMPLES_NV 0x9046 - -typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations); - -#define glTexImage2DMultisampleCoverageNV GLEW_GET_FUN(__glewTexImage2DMultisampleCoverageNV) -#define glTexImage3DMultisampleCoverageNV GLEW_GET_FUN(__glewTexImage3DMultisampleCoverageNV) -#define glTextureImage2DMultisampleCoverageNV GLEW_GET_FUN(__glewTextureImage2DMultisampleCoverageNV) -#define glTextureImage2DMultisampleNV GLEW_GET_FUN(__glewTextureImage2DMultisampleNV) -#define glTextureImage3DMultisampleCoverageNV GLEW_GET_FUN(__glewTextureImage3DMultisampleCoverageNV) -#define glTextureImage3DMultisampleNV GLEW_GET_FUN(__glewTextureImage3DMultisampleNV) - -#define GLEW_NV_texture_multisample GLEW_GET_VAR(__GLEW_NV_texture_multisample) - -#endif /* GL_NV_texture_multisample */ - -/* ------------------------ GL_NV_texture_rectangle ------------------------ */ - -#ifndef GL_NV_texture_rectangle -#define GL_NV_texture_rectangle 1 - -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 - -#define GLEW_NV_texture_rectangle GLEW_GET_VAR(__GLEW_NV_texture_rectangle) - -#endif /* GL_NV_texture_rectangle */ - -/* -------------------------- GL_NV_texture_shader ------------------------- */ - -#ifndef GL_NV_texture_shader -#define GL_NV_texture_shader 1 - -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_2D_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_2D_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F - -#define GLEW_NV_texture_shader GLEW_GET_VAR(__GLEW_NV_texture_shader) - -#endif /* GL_NV_texture_shader */ - -/* ------------------------- GL_NV_texture_shader2 ------------------------- */ - -#ifndef GL_NV_texture_shader2 -#define GL_NV_texture_shader2 1 - -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D - -#define GLEW_NV_texture_shader2 GLEW_GET_VAR(__GLEW_NV_texture_shader2) - -#endif /* GL_NV_texture_shader2 */ - -/* ------------------------- GL_NV_texture_shader3 ------------------------- */ - -#ifndef GL_NV_texture_shader3 -#define GL_NV_texture_shader3 1 - -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 -#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854 -#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857 -#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858 -#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859 -#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A -#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B -#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C -#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D -#define GL_HILO8_NV 0x885E -#define GL_SIGNED_HILO8_NV 0x885F -#define GL_FORCE_BLUE_TO_ONE_NV 0x8860 - -#define GLEW_NV_texture_shader3 GLEW_GET_VAR(__GLEW_NV_texture_shader3) - -#endif /* GL_NV_texture_shader3 */ - -/* ------------------------ GL_NV_transform_feedback ----------------------- */ - -#ifndef GL_NV_transform_feedback -#define GL_NV_transform_feedback 1 - -#define GL_BACK_PRIMARY_COLOR_NV 0x8C77 -#define GL_BACK_SECONDARY_COLOR_NV 0x8C78 -#define GL_TEXTURE_COORD_NV 0x8C79 -#define GL_CLIP_DISTANCE_NV 0x8C7A -#define GL_VERTEX_ID_NV 0x8C7B -#define GL_PRIMITIVE_ID_NV 0x8C7C -#define GL_GENERIC_ATTRIB_NV 0x8C7D -#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV 0x8C7E -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80 -#define GL_ACTIVE_VARYINGS_NV 0x8C81 -#define GL_ACTIVE_VARYING_MAX_LENGTH_NV 0x8C82 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85 -#define GL_TRANSFORM_FEEDBACK_RECORD_NV 0x8C86 -#define GL_PRIMITIVES_GENERATED_NV 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88 -#define GL_RASTERIZER_DISCARD_NV 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B -#define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C -#define GL_SEPARATE_ATTRIBS_NV 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F - -typedef void (GLAPIENTRY * PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name); -typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location); -typedef GLint (GLAPIENTRY * PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); - -#define glActiveVaryingNV GLEW_GET_FUN(__glewActiveVaryingNV) -#define glBeginTransformFeedbackNV GLEW_GET_FUN(__glewBeginTransformFeedbackNV) -#define glBindBufferBaseNV GLEW_GET_FUN(__glewBindBufferBaseNV) -#define glBindBufferOffsetNV GLEW_GET_FUN(__glewBindBufferOffsetNV) -#define glBindBufferRangeNV GLEW_GET_FUN(__glewBindBufferRangeNV) -#define glEndTransformFeedbackNV GLEW_GET_FUN(__glewEndTransformFeedbackNV) -#define glGetActiveVaryingNV GLEW_GET_FUN(__glewGetActiveVaryingNV) -#define glGetTransformFeedbackVaryingNV GLEW_GET_FUN(__glewGetTransformFeedbackVaryingNV) -#define glGetVaryingLocationNV GLEW_GET_FUN(__glewGetVaryingLocationNV) -#define glTransformFeedbackAttribsNV GLEW_GET_FUN(__glewTransformFeedbackAttribsNV) -#define glTransformFeedbackVaryingsNV GLEW_GET_FUN(__glewTransformFeedbackVaryingsNV) - -#define GLEW_NV_transform_feedback GLEW_GET_VAR(__GLEW_NV_transform_feedback) - -#endif /* GL_NV_transform_feedback */ - -/* ----------------------- GL_NV_transform_feedback2 ----------------------- */ - -#ifndef GL_NV_transform_feedback2 -#define GL_NV_transform_feedback2 1 - -#define GL_TRANSFORM_FEEDBACK_NV 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING_NV 0x8E25 - -typedef void (GLAPIENTRY * PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id); -typedef void (GLAPIENTRY * PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint* ids); -typedef GLboolean (GLAPIENTRY * PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void); - -#define glBindTransformFeedbackNV GLEW_GET_FUN(__glewBindTransformFeedbackNV) -#define glDeleteTransformFeedbacksNV GLEW_GET_FUN(__glewDeleteTransformFeedbacksNV) -#define glDrawTransformFeedbackNV GLEW_GET_FUN(__glewDrawTransformFeedbackNV) -#define glGenTransformFeedbacksNV GLEW_GET_FUN(__glewGenTransformFeedbacksNV) -#define glIsTransformFeedbackNV GLEW_GET_FUN(__glewIsTransformFeedbackNV) -#define glPauseTransformFeedbackNV GLEW_GET_FUN(__glewPauseTransformFeedbackNV) -#define glResumeTransformFeedbackNV GLEW_GET_FUN(__glewResumeTransformFeedbackNV) - -#define GLEW_NV_transform_feedback2 GLEW_GET_VAR(__GLEW_NV_transform_feedback2) - -#endif /* GL_NV_transform_feedback2 */ - -/* ------------------ GL_NV_uniform_buffer_unified_memory ------------------ */ - -#ifndef GL_NV_uniform_buffer_unified_memory -#define GL_NV_uniform_buffer_unified_memory 1 - -#define GL_UNIFORM_BUFFER_UNIFIED_NV 0x936E -#define GL_UNIFORM_BUFFER_ADDRESS_NV 0x936F -#define GL_UNIFORM_BUFFER_LENGTH_NV 0x9370 - -#define GLEW_NV_uniform_buffer_unified_memory GLEW_GET_VAR(__GLEW_NV_uniform_buffer_unified_memory) - -#endif /* GL_NV_uniform_buffer_unified_memory */ - -/* -------------------------- GL_NV_vdpau_interop -------------------------- */ - -#ifndef GL_NV_vdpau_interop -#define GL_NV_vdpau_interop 1 - -#define GL_SURFACE_STATE_NV 0x86EB -#define GL_SURFACE_REGISTERED_NV 0x86FD -#define GL_SURFACE_MAPPED_NV 0x8700 -#define GL_WRITE_DISCARD_NV 0x88BE - -typedef GLintptr GLvdpauSurfaceNV; - -typedef void (GLAPIENTRY * PFNGLVDPAUFININVPROC) (void); -typedef void (GLAPIENTRY * PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei* length, GLint *values); -typedef void (GLAPIENTRY * PFNGLVDPAUINITNVPROC) (const void* vdpDevice, const void*getProcAddress); -typedef void (GLAPIENTRY * PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface); -typedef void (GLAPIENTRY * PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV* surfaces); -typedef GLvdpauSurfaceNV (GLAPIENTRY * PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef GLvdpauSurfaceNV (GLAPIENTRY * PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef void (GLAPIENTRY * PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access); -typedef void (GLAPIENTRY * PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV* surfaces); -typedef void (GLAPIENTRY * PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface); - -#define glVDPAUFiniNV GLEW_GET_FUN(__glewVDPAUFiniNV) -#define glVDPAUGetSurfaceivNV GLEW_GET_FUN(__glewVDPAUGetSurfaceivNV) -#define glVDPAUInitNV GLEW_GET_FUN(__glewVDPAUInitNV) -#define glVDPAUIsSurfaceNV GLEW_GET_FUN(__glewVDPAUIsSurfaceNV) -#define glVDPAUMapSurfacesNV GLEW_GET_FUN(__glewVDPAUMapSurfacesNV) -#define glVDPAURegisterOutputSurfaceNV GLEW_GET_FUN(__glewVDPAURegisterOutputSurfaceNV) -#define glVDPAURegisterVideoSurfaceNV GLEW_GET_FUN(__glewVDPAURegisterVideoSurfaceNV) -#define glVDPAUSurfaceAccessNV GLEW_GET_FUN(__glewVDPAUSurfaceAccessNV) -#define glVDPAUUnmapSurfacesNV GLEW_GET_FUN(__glewVDPAUUnmapSurfacesNV) -#define glVDPAUUnregisterSurfaceNV GLEW_GET_FUN(__glewVDPAUUnregisterSurfaceNV) - -#define GLEW_NV_vdpau_interop GLEW_GET_VAR(__GLEW_NV_vdpau_interop) - -#endif /* GL_NV_vdpau_interop */ - -/* ------------------------ GL_NV_vertex_array_range ----------------------- */ - -#ifndef GL_NV_vertex_array_range -#define GL_NV_vertex_array_range 1 - -#define GL_VERTEX_ARRAY_RANGE_NV 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E -#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521 - -typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, void *pointer); - -#define glFlushVertexArrayRangeNV GLEW_GET_FUN(__glewFlushVertexArrayRangeNV) -#define glVertexArrayRangeNV GLEW_GET_FUN(__glewVertexArrayRangeNV) - -#define GLEW_NV_vertex_array_range GLEW_GET_VAR(__GLEW_NV_vertex_array_range) - -#endif /* GL_NV_vertex_array_range */ - -/* ----------------------- GL_NV_vertex_array_range2 ----------------------- */ - -#ifndef GL_NV_vertex_array_range2 -#define GL_NV_vertex_array_range2 1 - -#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533 - -#define GLEW_NV_vertex_array_range2 GLEW_GET_VAR(__GLEW_NV_vertex_array_range2) - -#endif /* GL_NV_vertex_array_range2 */ - -/* ------------------- GL_NV_vertex_attrib_integer_64bit ------------------- */ - -#ifndef GL_NV_vertex_attrib_integer_64bit -#define GL_NV_vertex_attrib_integer_64bit 1 - -#define GL_INT64_NV 0x140E -#define GL_UNSIGNED_INT64_NV 0x140F - -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT* params); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); - -#define glGetVertexAttribLi64vNV GLEW_GET_FUN(__glewGetVertexAttribLi64vNV) -#define glGetVertexAttribLui64vNV GLEW_GET_FUN(__glewGetVertexAttribLui64vNV) -#define glVertexAttribL1i64NV GLEW_GET_FUN(__glewVertexAttribL1i64NV) -#define glVertexAttribL1i64vNV GLEW_GET_FUN(__glewVertexAttribL1i64vNV) -#define glVertexAttribL1ui64NV GLEW_GET_FUN(__glewVertexAttribL1ui64NV) -#define glVertexAttribL1ui64vNV GLEW_GET_FUN(__glewVertexAttribL1ui64vNV) -#define glVertexAttribL2i64NV GLEW_GET_FUN(__glewVertexAttribL2i64NV) -#define glVertexAttribL2i64vNV GLEW_GET_FUN(__glewVertexAttribL2i64vNV) -#define glVertexAttribL2ui64NV GLEW_GET_FUN(__glewVertexAttribL2ui64NV) -#define glVertexAttribL2ui64vNV GLEW_GET_FUN(__glewVertexAttribL2ui64vNV) -#define glVertexAttribL3i64NV GLEW_GET_FUN(__glewVertexAttribL3i64NV) -#define glVertexAttribL3i64vNV GLEW_GET_FUN(__glewVertexAttribL3i64vNV) -#define glVertexAttribL3ui64NV GLEW_GET_FUN(__glewVertexAttribL3ui64NV) -#define glVertexAttribL3ui64vNV GLEW_GET_FUN(__glewVertexAttribL3ui64vNV) -#define glVertexAttribL4i64NV GLEW_GET_FUN(__glewVertexAttribL4i64NV) -#define glVertexAttribL4i64vNV GLEW_GET_FUN(__glewVertexAttribL4i64vNV) -#define glVertexAttribL4ui64NV GLEW_GET_FUN(__glewVertexAttribL4ui64NV) -#define glVertexAttribL4ui64vNV GLEW_GET_FUN(__glewVertexAttribL4ui64vNV) -#define glVertexAttribLFormatNV GLEW_GET_FUN(__glewVertexAttribLFormatNV) - -#define GLEW_NV_vertex_attrib_integer_64bit GLEW_GET_VAR(__GLEW_NV_vertex_attrib_integer_64bit) - -#endif /* GL_NV_vertex_attrib_integer_64bit */ - -/* ------------------- GL_NV_vertex_buffer_unified_memory ------------------ */ - -#ifndef GL_NV_vertex_buffer_unified_memory -#define GL_NV_vertex_buffer_unified_memory 1 - -#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E -#define GL_ELEMENT_ARRAY_UNIFIED_NV 0x8F1F -#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20 -#define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21 -#define GL_NORMAL_ARRAY_ADDRESS_NV 0x8F22 -#define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23 -#define GL_INDEX_ARRAY_ADDRESS_NV 0x8F24 -#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25 -#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV 0x8F26 -#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27 -#define GL_FOG_COORD_ARRAY_ADDRESS_NV 0x8F28 -#define GL_ELEMENT_ARRAY_ADDRESS_NV 0x8F29 -#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A -#define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B -#define GL_NORMAL_ARRAY_LENGTH_NV 0x8F2C -#define GL_COLOR_ARRAY_LENGTH_NV 0x8F2D -#define GL_INDEX_ARRAY_LENGTH_NV 0x8F2E -#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV 0x8F2F -#define GL_EDGE_FLAG_ARRAY_LENGTH_NV 0x8F30 -#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31 -#define GL_FOG_COORD_ARRAY_LENGTH_NV 0x8F32 -#define GL_ELEMENT_ARRAY_LENGTH_NV 0x8F33 -#define GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40 -#define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41 -#define GL_DRAW_INDIRECT_LENGTH_NV 0x8F42 - -typedef void (GLAPIENTRY * PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); -typedef void (GLAPIENTRY * PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT result[]); -typedef void (GLAPIENTRY * PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); - -#define glBufferAddressRangeNV GLEW_GET_FUN(__glewBufferAddressRangeNV) -#define glColorFormatNV GLEW_GET_FUN(__glewColorFormatNV) -#define glEdgeFlagFormatNV GLEW_GET_FUN(__glewEdgeFlagFormatNV) -#define glFogCoordFormatNV GLEW_GET_FUN(__glewFogCoordFormatNV) -#define glGetIntegerui64i_vNV GLEW_GET_FUN(__glewGetIntegerui64i_vNV) -#define glIndexFormatNV GLEW_GET_FUN(__glewIndexFormatNV) -#define glNormalFormatNV GLEW_GET_FUN(__glewNormalFormatNV) -#define glSecondaryColorFormatNV GLEW_GET_FUN(__glewSecondaryColorFormatNV) -#define glTexCoordFormatNV GLEW_GET_FUN(__glewTexCoordFormatNV) -#define glVertexAttribFormatNV GLEW_GET_FUN(__glewVertexAttribFormatNV) -#define glVertexAttribIFormatNV GLEW_GET_FUN(__glewVertexAttribIFormatNV) -#define glVertexFormatNV GLEW_GET_FUN(__glewVertexFormatNV) - -#define GLEW_NV_vertex_buffer_unified_memory GLEW_GET_VAR(__GLEW_NV_vertex_buffer_unified_memory) - -#endif /* GL_NV_vertex_buffer_unified_memory */ - -/* -------------------------- GL_NV_vertex_program ------------------------- */ - -#ifndef GL_NV_vertex_program -#define GL_NV_vertex_program 1 - -#define GL_VERTEX_PROGRAM_NV 0x8620 -#define GL_VERTEX_STATE_PROGRAM_NV 0x8621 -#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623 -#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624 -#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625 -#define GL_CURRENT_ATTRIB_NV 0x8626 -#define GL_PROGRAM_LENGTH_NV 0x8627 -#define GL_PROGRAM_STRING_NV 0x8628 -#define GL_MODELVIEW_PROJECTION_NV 0x8629 -#define GL_IDENTITY_NV 0x862A -#define GL_INVERSE_NV 0x862B -#define GL_TRANSPOSE_NV 0x862C -#define GL_INVERSE_TRANSPOSE_NV 0x862D -#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E -#define GL_MAX_TRACK_MATRICES_NV 0x862F -#define GL_MATRIX0_NV 0x8630 -#define GL_MATRIX1_NV 0x8631 -#define GL_MATRIX2_NV 0x8632 -#define GL_MATRIX3_NV 0x8633 -#define GL_MATRIX4_NV 0x8634 -#define GL_MATRIX5_NV 0x8635 -#define GL_MATRIX6_NV 0x8636 -#define GL_MATRIX7_NV 0x8637 -#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640 -#define GL_CURRENT_MATRIX_NV 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643 -#define GL_PROGRAM_PARAMETER_NV 0x8644 -#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645 -#define GL_PROGRAM_TARGET_NV 0x8646 -#define GL_PROGRAM_RESIDENT_NV 0x8647 -#define GL_TRACK_MATRIX_NV 0x8648 -#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649 -#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A -#define GL_PROGRAM_ERROR_POSITION_NV 0x864B -#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650 -#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651 -#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652 -#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653 -#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654 -#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655 -#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656 -#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657 -#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658 -#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659 -#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A -#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B -#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C -#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D -#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E -#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F -#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660 -#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661 -#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662 -#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663 -#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664 -#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665 -#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666 -#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667 -#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668 -#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669 -#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A -#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B -#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C -#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D -#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E -#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F -#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670 -#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671 -#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672 -#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673 -#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674 -#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675 -#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676 -#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677 -#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678 -#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 -#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A -#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B -#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C -#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D -#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E -#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F - -typedef GLboolean (GLAPIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint* ids, GLboolean *residences); -typedef void (GLAPIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte* program); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, void** pointer); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte* program); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei num, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei num, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei n, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei n, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei n, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei n, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei n, const GLubyte* v); - -#define glAreProgramsResidentNV GLEW_GET_FUN(__glewAreProgramsResidentNV) -#define glBindProgramNV GLEW_GET_FUN(__glewBindProgramNV) -#define glDeleteProgramsNV GLEW_GET_FUN(__glewDeleteProgramsNV) -#define glExecuteProgramNV GLEW_GET_FUN(__glewExecuteProgramNV) -#define glGenProgramsNV GLEW_GET_FUN(__glewGenProgramsNV) -#define glGetProgramParameterdvNV GLEW_GET_FUN(__glewGetProgramParameterdvNV) -#define glGetProgramParameterfvNV GLEW_GET_FUN(__glewGetProgramParameterfvNV) -#define glGetProgramStringNV GLEW_GET_FUN(__glewGetProgramStringNV) -#define glGetProgramivNV GLEW_GET_FUN(__glewGetProgramivNV) -#define glGetTrackMatrixivNV GLEW_GET_FUN(__glewGetTrackMatrixivNV) -#define glGetVertexAttribPointervNV GLEW_GET_FUN(__glewGetVertexAttribPointervNV) -#define glGetVertexAttribdvNV GLEW_GET_FUN(__glewGetVertexAttribdvNV) -#define glGetVertexAttribfvNV GLEW_GET_FUN(__glewGetVertexAttribfvNV) -#define glGetVertexAttribivNV GLEW_GET_FUN(__glewGetVertexAttribivNV) -#define glIsProgramNV GLEW_GET_FUN(__glewIsProgramNV) -#define glLoadProgramNV GLEW_GET_FUN(__glewLoadProgramNV) -#define glProgramParameter4dNV GLEW_GET_FUN(__glewProgramParameter4dNV) -#define glProgramParameter4dvNV GLEW_GET_FUN(__glewProgramParameter4dvNV) -#define glProgramParameter4fNV GLEW_GET_FUN(__glewProgramParameter4fNV) -#define glProgramParameter4fvNV GLEW_GET_FUN(__glewProgramParameter4fvNV) -#define glProgramParameters4dvNV GLEW_GET_FUN(__glewProgramParameters4dvNV) -#define glProgramParameters4fvNV GLEW_GET_FUN(__glewProgramParameters4fvNV) -#define glRequestResidentProgramsNV GLEW_GET_FUN(__glewRequestResidentProgramsNV) -#define glTrackMatrixNV GLEW_GET_FUN(__glewTrackMatrixNV) -#define glVertexAttrib1dNV GLEW_GET_FUN(__glewVertexAttrib1dNV) -#define glVertexAttrib1dvNV GLEW_GET_FUN(__glewVertexAttrib1dvNV) -#define glVertexAttrib1fNV GLEW_GET_FUN(__glewVertexAttrib1fNV) -#define glVertexAttrib1fvNV GLEW_GET_FUN(__glewVertexAttrib1fvNV) -#define glVertexAttrib1sNV GLEW_GET_FUN(__glewVertexAttrib1sNV) -#define glVertexAttrib1svNV GLEW_GET_FUN(__glewVertexAttrib1svNV) -#define glVertexAttrib2dNV GLEW_GET_FUN(__glewVertexAttrib2dNV) -#define glVertexAttrib2dvNV GLEW_GET_FUN(__glewVertexAttrib2dvNV) -#define glVertexAttrib2fNV GLEW_GET_FUN(__glewVertexAttrib2fNV) -#define glVertexAttrib2fvNV GLEW_GET_FUN(__glewVertexAttrib2fvNV) -#define glVertexAttrib2sNV GLEW_GET_FUN(__glewVertexAttrib2sNV) -#define glVertexAttrib2svNV GLEW_GET_FUN(__glewVertexAttrib2svNV) -#define glVertexAttrib3dNV GLEW_GET_FUN(__glewVertexAttrib3dNV) -#define glVertexAttrib3dvNV GLEW_GET_FUN(__glewVertexAttrib3dvNV) -#define glVertexAttrib3fNV GLEW_GET_FUN(__glewVertexAttrib3fNV) -#define glVertexAttrib3fvNV GLEW_GET_FUN(__glewVertexAttrib3fvNV) -#define glVertexAttrib3sNV GLEW_GET_FUN(__glewVertexAttrib3sNV) -#define glVertexAttrib3svNV GLEW_GET_FUN(__glewVertexAttrib3svNV) -#define glVertexAttrib4dNV GLEW_GET_FUN(__glewVertexAttrib4dNV) -#define glVertexAttrib4dvNV GLEW_GET_FUN(__glewVertexAttrib4dvNV) -#define glVertexAttrib4fNV GLEW_GET_FUN(__glewVertexAttrib4fNV) -#define glVertexAttrib4fvNV GLEW_GET_FUN(__glewVertexAttrib4fvNV) -#define glVertexAttrib4sNV GLEW_GET_FUN(__glewVertexAttrib4sNV) -#define glVertexAttrib4svNV GLEW_GET_FUN(__glewVertexAttrib4svNV) -#define glVertexAttrib4ubNV GLEW_GET_FUN(__glewVertexAttrib4ubNV) -#define glVertexAttrib4ubvNV GLEW_GET_FUN(__glewVertexAttrib4ubvNV) -#define glVertexAttribPointerNV GLEW_GET_FUN(__glewVertexAttribPointerNV) -#define glVertexAttribs1dvNV GLEW_GET_FUN(__glewVertexAttribs1dvNV) -#define glVertexAttribs1fvNV GLEW_GET_FUN(__glewVertexAttribs1fvNV) -#define glVertexAttribs1svNV GLEW_GET_FUN(__glewVertexAttribs1svNV) -#define glVertexAttribs2dvNV GLEW_GET_FUN(__glewVertexAttribs2dvNV) -#define glVertexAttribs2fvNV GLEW_GET_FUN(__glewVertexAttribs2fvNV) -#define glVertexAttribs2svNV GLEW_GET_FUN(__glewVertexAttribs2svNV) -#define glVertexAttribs3dvNV GLEW_GET_FUN(__glewVertexAttribs3dvNV) -#define glVertexAttribs3fvNV GLEW_GET_FUN(__glewVertexAttribs3fvNV) -#define glVertexAttribs3svNV GLEW_GET_FUN(__glewVertexAttribs3svNV) -#define glVertexAttribs4dvNV GLEW_GET_FUN(__glewVertexAttribs4dvNV) -#define glVertexAttribs4fvNV GLEW_GET_FUN(__glewVertexAttribs4fvNV) -#define glVertexAttribs4svNV GLEW_GET_FUN(__glewVertexAttribs4svNV) -#define glVertexAttribs4ubvNV GLEW_GET_FUN(__glewVertexAttribs4ubvNV) - -#define GLEW_NV_vertex_program GLEW_GET_VAR(__GLEW_NV_vertex_program) - -#endif /* GL_NV_vertex_program */ - -/* ------------------------ GL_NV_vertex_program1_1 ------------------------ */ - -#ifndef GL_NV_vertex_program1_1 -#define GL_NV_vertex_program1_1 1 - -#define GLEW_NV_vertex_program1_1 GLEW_GET_VAR(__GLEW_NV_vertex_program1_1) - -#endif /* GL_NV_vertex_program1_1 */ - -/* ------------------------- GL_NV_vertex_program2 ------------------------- */ - -#ifndef GL_NV_vertex_program2 -#define GL_NV_vertex_program2 1 - -#define GLEW_NV_vertex_program2 GLEW_GET_VAR(__GLEW_NV_vertex_program2) - -#endif /* GL_NV_vertex_program2 */ - -/* ---------------------- GL_NV_vertex_program2_option --------------------- */ - -#ifndef GL_NV_vertex_program2_option -#define GL_NV_vertex_program2_option 1 - -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 - -#define GLEW_NV_vertex_program2_option GLEW_GET_VAR(__GLEW_NV_vertex_program2_option) - -#endif /* GL_NV_vertex_program2_option */ - -/* ------------------------- GL_NV_vertex_program3 ------------------------- */ - -#ifndef GL_NV_vertex_program3 -#define GL_NV_vertex_program3 1 - -#define MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C - -#define GLEW_NV_vertex_program3 GLEW_GET_VAR(__GLEW_NV_vertex_program3) - -#endif /* GL_NV_vertex_program3 */ - -/* ------------------------- GL_NV_vertex_program4 ------------------------- */ - -#ifndef GL_NV_vertex_program4 -#define GL_NV_vertex_program4 1 - -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD - -#define GLEW_NV_vertex_program4 GLEW_GET_VAR(__GLEW_NV_vertex_program4) - -#endif /* GL_NV_vertex_program4 */ - -/* -------------------------- GL_NV_video_capture -------------------------- */ - -#ifndef GL_NV_video_capture -#define GL_NV_video_capture 1 - -#define GL_VIDEO_BUFFER_NV 0x9020 -#define GL_VIDEO_BUFFER_BINDING_NV 0x9021 -#define GL_FIELD_UPPER_NV 0x9022 -#define GL_FIELD_LOWER_NV 0x9023 -#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024 -#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025 -#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026 -#define GL_LAST_VIDEO_CAPTURE_STATUS_NV 0x9027 -#define GL_VIDEO_BUFFER_PITCH_NV 0x9028 -#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029 -#define GL_VIDEO_COLOR_CONVERSION_MAX_NV 0x902A -#define GL_VIDEO_COLOR_CONVERSION_MIN_NV 0x902B -#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C -#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D -#define GL_PARTIAL_SUCCESS_NV 0x902E -#define GL_SUCCESS_NV 0x902F -#define GL_FAILURE_NV 0x9030 -#define GL_YCBYCR8_422_NV 0x9031 -#define GL_YCBAYCR8A_4224_NV 0x9032 -#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV 0x9033 -#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034 -#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV 0x9035 -#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036 -#define GL_Z4Y12Z4CB12Z4CR12_444_NV 0x9037 -#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV 0x9038 -#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV 0x9039 -#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A -#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B -#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C - -typedef void (GLAPIENTRY * PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (GLAPIENTRY * PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset); -typedef void (GLAPIENTRY * PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture); -typedef void (GLAPIENTRY * PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint* params); -typedef GLenum (GLAPIENTRY * PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint* sequence_num, GLuint64EXT *capture_time); -typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint* params); - -#define glBeginVideoCaptureNV GLEW_GET_FUN(__glewBeginVideoCaptureNV) -#define glBindVideoCaptureStreamBufferNV GLEW_GET_FUN(__glewBindVideoCaptureStreamBufferNV) -#define glBindVideoCaptureStreamTextureNV GLEW_GET_FUN(__glewBindVideoCaptureStreamTextureNV) -#define glEndVideoCaptureNV GLEW_GET_FUN(__glewEndVideoCaptureNV) -#define glGetVideoCaptureStreamdvNV GLEW_GET_FUN(__glewGetVideoCaptureStreamdvNV) -#define glGetVideoCaptureStreamfvNV GLEW_GET_FUN(__glewGetVideoCaptureStreamfvNV) -#define glGetVideoCaptureStreamivNV GLEW_GET_FUN(__glewGetVideoCaptureStreamivNV) -#define glGetVideoCaptureivNV GLEW_GET_FUN(__glewGetVideoCaptureivNV) -#define glVideoCaptureNV GLEW_GET_FUN(__glewVideoCaptureNV) -#define glVideoCaptureStreamParameterdvNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterdvNV) -#define glVideoCaptureStreamParameterfvNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterfvNV) -#define glVideoCaptureStreamParameterivNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterivNV) - -#define GLEW_NV_video_capture GLEW_GET_VAR(__GLEW_NV_video_capture) - -#endif /* GL_NV_video_capture */ - -/* ------------------------- GL_NV_viewport_array2 ------------------------- */ - -#ifndef GL_NV_viewport_array2 -#define GL_NV_viewport_array2 1 - -#define GLEW_NV_viewport_array2 GLEW_GET_VAR(__GLEW_NV_viewport_array2) - -#endif /* GL_NV_viewport_array2 */ - -/* ------------------------- GL_NV_viewport_swizzle ------------------------ */ - -#ifndef GL_NV_viewport_swizzle -#define GL_NV_viewport_swizzle 1 - -#define GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV 0x9350 -#define GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV 0x9351 -#define GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV 0x9352 -#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV 0x9353 -#define GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV 0x9354 -#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV 0x9355 -#define GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV 0x9356 -#define GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV 0x9357 -#define GL_VIEWPORT_SWIZZLE_X_NV 0x9358 -#define GL_VIEWPORT_SWIZZLE_Y_NV 0x9359 -#define GL_VIEWPORT_SWIZZLE_Z_NV 0x935A -#define GL_VIEWPORT_SWIZZLE_W_NV 0x935B - -typedef void (GLAPIENTRY * PFNGLVIEWPORTSWIZZLENVPROC) (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew); - -#define glViewportSwizzleNV GLEW_GET_FUN(__glewViewportSwizzleNV) - -#define GLEW_NV_viewport_swizzle GLEW_GET_VAR(__GLEW_NV_viewport_swizzle) - -#endif /* GL_NV_viewport_swizzle */ - -/* ------------------------ GL_OES_byte_coordinates ------------------------ */ - -#ifndef GL_OES_byte_coordinates -#define GL_OES_byte_coordinates 1 - -#define GLEW_OES_byte_coordinates GLEW_GET_VAR(__GLEW_OES_byte_coordinates) - -#endif /* GL_OES_byte_coordinates */ - -/* ------------------- GL_OES_compressed_paletted_texture ------------------ */ - -#ifndef GL_OES_compressed_paletted_texture -#define GL_OES_compressed_paletted_texture 1 - -#define GL_PALETTE4_RGB8_OES 0x8B90 -#define GL_PALETTE4_RGBA8_OES 0x8B91 -#define GL_PALETTE4_R5_G6_B5_OES 0x8B92 -#define GL_PALETTE4_RGBA4_OES 0x8B93 -#define GL_PALETTE4_RGB5_A1_OES 0x8B94 -#define GL_PALETTE8_RGB8_OES 0x8B95 -#define GL_PALETTE8_RGBA8_OES 0x8B96 -#define GL_PALETTE8_R5_G6_B5_OES 0x8B97 -#define GL_PALETTE8_RGBA4_OES 0x8B98 -#define GL_PALETTE8_RGB5_A1_OES 0x8B99 - -#define GLEW_OES_compressed_paletted_texture GLEW_GET_VAR(__GLEW_OES_compressed_paletted_texture) - -#endif /* GL_OES_compressed_paletted_texture */ - -/* --------------------------- GL_OES_read_format -------------------------- */ - -#ifndef GL_OES_read_format -#define GL_OES_read_format 1 - -#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B - -#define GLEW_OES_read_format GLEW_GET_VAR(__GLEW_OES_read_format) - -#endif /* GL_OES_read_format */ - -/* ------------------------ GL_OES_single_precision ------------------------ */ - -#ifndef GL_OES_single_precision -#define GL_OES_single_precision 1 - -typedef void (GLAPIENTRY * PFNGLCLEARDEPTHFOESPROC) (GLclampf depth); -typedef void (GLAPIENTRY * PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat* equation); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f); -typedef void (GLAPIENTRY * PFNGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); -typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat* equation); -typedef void (GLAPIENTRY * PFNGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); - -#define glClearDepthfOES GLEW_GET_FUN(__glewClearDepthfOES) -#define glClipPlanefOES GLEW_GET_FUN(__glewClipPlanefOES) -#define glDepthRangefOES GLEW_GET_FUN(__glewDepthRangefOES) -#define glFrustumfOES GLEW_GET_FUN(__glewFrustumfOES) -#define glGetClipPlanefOES GLEW_GET_FUN(__glewGetClipPlanefOES) -#define glOrthofOES GLEW_GET_FUN(__glewOrthofOES) - -#define GLEW_OES_single_precision GLEW_GET_VAR(__GLEW_OES_single_precision) - -#endif /* GL_OES_single_precision */ - -/* ---------------------------- GL_OML_interlace --------------------------- */ - -#ifndef GL_OML_interlace -#define GL_OML_interlace 1 - -#define GL_INTERLACE_OML 0x8980 -#define GL_INTERLACE_READ_OML 0x8981 - -#define GLEW_OML_interlace GLEW_GET_VAR(__GLEW_OML_interlace) - -#endif /* GL_OML_interlace */ - -/* ---------------------------- GL_OML_resample ---------------------------- */ - -#ifndef GL_OML_resample -#define GL_OML_resample 1 - -#define GL_PACK_RESAMPLE_OML 0x8984 -#define GL_UNPACK_RESAMPLE_OML 0x8985 -#define GL_RESAMPLE_REPLICATE_OML 0x8986 -#define GL_RESAMPLE_ZERO_FILL_OML 0x8987 -#define GL_RESAMPLE_AVERAGE_OML 0x8988 -#define GL_RESAMPLE_DECIMATE_OML 0x8989 - -#define GLEW_OML_resample GLEW_GET_VAR(__GLEW_OML_resample) - -#endif /* GL_OML_resample */ - -/* ---------------------------- GL_OML_subsample --------------------------- */ - -#ifndef GL_OML_subsample -#define GL_OML_subsample 1 - -#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 -#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 - -#define GLEW_OML_subsample GLEW_GET_VAR(__GLEW_OML_subsample) - -#endif /* GL_OML_subsample */ - -/* ---------------------------- GL_OVR_multiview --------------------------- */ - -#ifndef GL_OVR_multiview -#define GL_OVR_multiview 1 - -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630 -#define GL_MAX_VIEWS_OVR 0x9631 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632 -#define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); - -#define glFramebufferTextureMultiviewOVR GLEW_GET_FUN(__glewFramebufferTextureMultiviewOVR) - -#define GLEW_OVR_multiview GLEW_GET_VAR(__GLEW_OVR_multiview) - -#endif /* GL_OVR_multiview */ - -/* --------------------------- GL_OVR_multiview2 --------------------------- */ - -#ifndef GL_OVR_multiview2 -#define GL_OVR_multiview2 1 - -#define GLEW_OVR_multiview2 GLEW_GET_VAR(__GLEW_OVR_multiview2) - -#endif /* GL_OVR_multiview2 */ - -/* --------------------------- GL_PGI_misc_hints --------------------------- */ - -#ifndef GL_PGI_misc_hints -#define GL_PGI_misc_hints 1 - -#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 107000 -#define GL_CONSERVE_MEMORY_HINT_PGI 107005 -#define GL_RECLAIM_MEMORY_HINT_PGI 107006 -#define GL_NATIVE_GRAPHICS_HANDLE_PGI 107010 -#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 107011 -#define GL_NATIVE_GRAPHICS_END_HINT_PGI 107012 -#define GL_ALWAYS_FAST_HINT_PGI 107020 -#define GL_ALWAYS_SOFT_HINT_PGI 107021 -#define GL_ALLOW_DRAW_OBJ_HINT_PGI 107022 -#define GL_ALLOW_DRAW_WIN_HINT_PGI 107023 -#define GL_ALLOW_DRAW_FRG_HINT_PGI 107024 -#define GL_ALLOW_DRAW_MEM_HINT_PGI 107025 -#define GL_STRICT_DEPTHFUNC_HINT_PGI 107030 -#define GL_STRICT_LIGHTING_HINT_PGI 107031 -#define GL_STRICT_SCISSOR_HINT_PGI 107032 -#define GL_FULL_STIPPLE_HINT_PGI 107033 -#define GL_CLIP_NEAR_HINT_PGI 107040 -#define GL_CLIP_FAR_HINT_PGI 107041 -#define GL_WIDE_LINE_HINT_PGI 107042 -#define GL_BACK_NORMALS_HINT_PGI 107043 - -#define GLEW_PGI_misc_hints GLEW_GET_VAR(__GLEW_PGI_misc_hints) - -#endif /* GL_PGI_misc_hints */ - -/* -------------------------- GL_PGI_vertex_hints -------------------------- */ - -#ifndef GL_PGI_vertex_hints -#define GL_PGI_vertex_hints 1 - -#define GL_VERTEX23_BIT_PGI 0x00000004 -#define GL_VERTEX4_BIT_PGI 0x00000008 -#define GL_COLOR3_BIT_PGI 0x00010000 -#define GL_COLOR4_BIT_PGI 0x00020000 -#define GL_EDGEFLAG_BIT_PGI 0x00040000 -#define GL_INDEX_BIT_PGI 0x00080000 -#define GL_MAT_AMBIENT_BIT_PGI 0x00100000 -#define GL_VERTEX_DATA_HINT_PGI 107050 -#define GL_VERTEX_CONSISTENT_HINT_PGI 107051 -#define GL_MATERIAL_SIDE_HINT_PGI 107052 -#define GL_MAX_VERTEX_HINT_PGI 107053 -#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000 -#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000 -#define GL_MAT_EMISSION_BIT_PGI 0x00800000 -#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000 -#define GL_MAT_SHININESS_BIT_PGI 0x02000000 -#define GL_MAT_SPECULAR_BIT_PGI 0x04000000 -#define GL_NORMAL_BIT_PGI 0x08000000 -#define GL_TEXCOORD1_BIT_PGI 0x10000000 -#define GL_TEXCOORD2_BIT_PGI 0x20000000 -#define GL_TEXCOORD3_BIT_PGI 0x40000000 -#define GL_TEXCOORD4_BIT_PGI 0x80000000 - -#define GLEW_PGI_vertex_hints GLEW_GET_VAR(__GLEW_PGI_vertex_hints) - -#endif /* GL_PGI_vertex_hints */ - -/* ---------------------- GL_REGAL_ES1_0_compatibility --------------------- */ - -#ifndef GL_REGAL_ES1_0_compatibility -#define GL_REGAL_ES1_0_compatibility 1 - -typedef int GLclampx; - -typedef void (GLAPIENTRY * PFNGLALPHAFUNCXPROC) (GLenum func, GLclampx ref); -typedef void (GLAPIENTRY * PFNGLCLEARCOLORXPROC) (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); -typedef void (GLAPIENTRY * PFNGLCLEARDEPTHXPROC) (GLclampx depth); -typedef void (GLAPIENTRY * PFNGLCOLOR4XPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEXPROC) (GLclampx zNear, GLclampx zFar); -typedef void (GLAPIENTRY * PFNGLFOGXPROC) (GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLFOGXVPROC) (GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLFRUSTUMFPROC) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); -typedef void (GLAPIENTRY * PFNGLFRUSTUMXPROC) (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); -typedef void (GLAPIENTRY * PFNGLLIGHTMODELXPROC) (GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLLIGHTMODELXVPROC) (GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLLIGHTXPROC) (GLenum light, GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLLIGHTXVPROC) (GLenum light, GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLLINEWIDTHXPROC) (GLfixed width); -typedef void (GLAPIENTRY * PFNGLLOADMATRIXXPROC) (const GLfixed* m); -typedef void (GLAPIENTRY * PFNGLMATERIALXPROC) (GLenum face, GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLMATERIALXVPROC) (GLenum face, GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLMULTMATRIXXPROC) (const GLfixed* m); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4XPROC) (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); -typedef void (GLAPIENTRY * PFNGLNORMAL3XPROC) (GLfixed nx, GLfixed ny, GLfixed nz); -typedef void (GLAPIENTRY * PFNGLORTHOFPROC) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); -typedef void (GLAPIENTRY * PFNGLORTHOXPROC) (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); -typedef void (GLAPIENTRY * PFNGLPOINTSIZEXPROC) (GLfixed size); -typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETXPROC) (GLfixed factor, GLfixed units); -typedef void (GLAPIENTRY * PFNGLROTATEXPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z); -typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEXPROC) (GLclampx value, GLboolean invert); -typedef void (GLAPIENTRY * PFNGLSCALEXPROC) (GLfixed x, GLfixed y, GLfixed z); -typedef void (GLAPIENTRY * PFNGLTEXENVXPROC) (GLenum target, GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLTEXENVXVPROC) (GLenum target, GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERXPROC) (GLenum target, GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLTRANSLATEXPROC) (GLfixed x, GLfixed y, GLfixed z); - -#define glAlphaFuncx GLEW_GET_FUN(__glewAlphaFuncx) -#define glClearColorx GLEW_GET_FUN(__glewClearColorx) -#define glClearDepthx GLEW_GET_FUN(__glewClearDepthx) -#define glColor4x GLEW_GET_FUN(__glewColor4x) -#define glDepthRangex GLEW_GET_FUN(__glewDepthRangex) -#define glFogx GLEW_GET_FUN(__glewFogx) -#define glFogxv GLEW_GET_FUN(__glewFogxv) -#define glFrustumf GLEW_GET_FUN(__glewFrustumf) -#define glFrustumx GLEW_GET_FUN(__glewFrustumx) -#define glLightModelx GLEW_GET_FUN(__glewLightModelx) -#define glLightModelxv GLEW_GET_FUN(__glewLightModelxv) -#define glLightx GLEW_GET_FUN(__glewLightx) -#define glLightxv GLEW_GET_FUN(__glewLightxv) -#define glLineWidthx GLEW_GET_FUN(__glewLineWidthx) -#define glLoadMatrixx GLEW_GET_FUN(__glewLoadMatrixx) -#define glMaterialx GLEW_GET_FUN(__glewMaterialx) -#define glMaterialxv GLEW_GET_FUN(__glewMaterialxv) -#define glMultMatrixx GLEW_GET_FUN(__glewMultMatrixx) -#define glMultiTexCoord4x GLEW_GET_FUN(__glewMultiTexCoord4x) -#define glNormal3x GLEW_GET_FUN(__glewNormal3x) -#define glOrthof GLEW_GET_FUN(__glewOrthof) -#define glOrthox GLEW_GET_FUN(__glewOrthox) -#define glPointSizex GLEW_GET_FUN(__glewPointSizex) -#define glPolygonOffsetx GLEW_GET_FUN(__glewPolygonOffsetx) -#define glRotatex GLEW_GET_FUN(__glewRotatex) -#define glSampleCoveragex GLEW_GET_FUN(__glewSampleCoveragex) -#define glScalex GLEW_GET_FUN(__glewScalex) -#define glTexEnvx GLEW_GET_FUN(__glewTexEnvx) -#define glTexEnvxv GLEW_GET_FUN(__glewTexEnvxv) -#define glTexParameterx GLEW_GET_FUN(__glewTexParameterx) -#define glTranslatex GLEW_GET_FUN(__glewTranslatex) - -#define GLEW_REGAL_ES1_0_compatibility GLEW_GET_VAR(__GLEW_REGAL_ES1_0_compatibility) - -#endif /* GL_REGAL_ES1_0_compatibility */ - -/* ---------------------- GL_REGAL_ES1_1_compatibility --------------------- */ - -#ifndef GL_REGAL_ES1_1_compatibility -#define GL_REGAL_ES1_1_compatibility 1 - -typedef void (GLAPIENTRY * PFNGLCLIPPLANEFPROC) (GLenum plane, const GLfloat* equation); -typedef void (GLAPIENTRY * PFNGLCLIPPLANEXPROC) (GLenum plane, const GLfixed* equation); -typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEFPROC) (GLenum pname, GLfloat eqn[4]); -typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEXPROC) (GLenum pname, GLfixed eqn[4]); -typedef void (GLAPIENTRY * PFNGLGETFIXEDVPROC) (GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLGETLIGHTXVPROC) (GLenum light, GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLGETMATERIALXVPROC) (GLenum face, GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLGETTEXENVXVPROC) (GLenum env, GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERXVPROC) (GLenum target, GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERXPROC) (GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERXVPROC) (GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLPOINTSIZEPOINTEROESPROC) (GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERXVPROC) (GLenum target, GLenum pname, const GLfixed* params); - -#define glClipPlanef GLEW_GET_FUN(__glewClipPlanef) -#define glClipPlanex GLEW_GET_FUN(__glewClipPlanex) -#define glGetClipPlanef GLEW_GET_FUN(__glewGetClipPlanef) -#define glGetClipPlanex GLEW_GET_FUN(__glewGetClipPlanex) -#define glGetFixedv GLEW_GET_FUN(__glewGetFixedv) -#define glGetLightxv GLEW_GET_FUN(__glewGetLightxv) -#define glGetMaterialxv GLEW_GET_FUN(__glewGetMaterialxv) -#define glGetTexEnvxv GLEW_GET_FUN(__glewGetTexEnvxv) -#define glGetTexParameterxv GLEW_GET_FUN(__glewGetTexParameterxv) -#define glPointParameterx GLEW_GET_FUN(__glewPointParameterx) -#define glPointParameterxv GLEW_GET_FUN(__glewPointParameterxv) -#define glPointSizePointerOES GLEW_GET_FUN(__glewPointSizePointerOES) -#define glTexParameterxv GLEW_GET_FUN(__glewTexParameterxv) - -#define GLEW_REGAL_ES1_1_compatibility GLEW_GET_VAR(__GLEW_REGAL_ES1_1_compatibility) - -#endif /* GL_REGAL_ES1_1_compatibility */ - -/* ---------------------------- GL_REGAL_enable ---------------------------- */ - -#ifndef GL_REGAL_enable -#define GL_REGAL_enable 1 - -#define GL_ERROR_REGAL 0x9322 -#define GL_DEBUG_REGAL 0x9323 -#define GL_LOG_REGAL 0x9324 -#define GL_EMULATION_REGAL 0x9325 -#define GL_DRIVER_REGAL 0x9326 -#define GL_MISSING_REGAL 0x9360 -#define GL_TRACE_REGAL 0x9361 -#define GL_CACHE_REGAL 0x9362 -#define GL_CODE_REGAL 0x9363 -#define GL_STATISTICS_REGAL 0x9364 - -#define GLEW_REGAL_enable GLEW_GET_VAR(__GLEW_REGAL_enable) - -#endif /* GL_REGAL_enable */ - -/* ------------------------- GL_REGAL_error_string ------------------------- */ - -#ifndef GL_REGAL_error_string -#define GL_REGAL_error_string 1 - -typedef const GLchar* (GLAPIENTRY * PFNGLERRORSTRINGREGALPROC) (GLenum error); - -#define glErrorStringREGAL GLEW_GET_FUN(__glewErrorStringREGAL) - -#define GLEW_REGAL_error_string GLEW_GET_VAR(__GLEW_REGAL_error_string) - -#endif /* GL_REGAL_error_string */ - -/* ------------------------ GL_REGAL_extension_query ----------------------- */ - -#ifndef GL_REGAL_extension_query -#define GL_REGAL_extension_query 1 - -typedef GLboolean (GLAPIENTRY * PFNGLGETEXTENSIONREGALPROC) (const GLchar* ext); -typedef GLboolean (GLAPIENTRY * PFNGLISSUPPORTEDREGALPROC) (const GLchar* ext); - -#define glGetExtensionREGAL GLEW_GET_FUN(__glewGetExtensionREGAL) -#define glIsSupportedREGAL GLEW_GET_FUN(__glewIsSupportedREGAL) - -#define GLEW_REGAL_extension_query GLEW_GET_VAR(__GLEW_REGAL_extension_query) - -#endif /* GL_REGAL_extension_query */ - -/* ------------------------------ GL_REGAL_log ----------------------------- */ - -#ifndef GL_REGAL_log -#define GL_REGAL_log 1 - -#define GL_LOG_ERROR_REGAL 0x9319 -#define GL_LOG_WARNING_REGAL 0x931A -#define GL_LOG_INFO_REGAL 0x931B -#define GL_LOG_APP_REGAL 0x931C -#define GL_LOG_DRIVER_REGAL 0x931D -#define GL_LOG_INTERNAL_REGAL 0x931E -#define GL_LOG_DEBUG_REGAL 0x931F -#define GL_LOG_STATUS_REGAL 0x9320 -#define GL_LOG_HTTP_REGAL 0x9321 - -typedef void (APIENTRY *GLLOGPROCREGAL)(GLenum stream, GLsizei length, const GLchar *message, void *context); - -typedef void (GLAPIENTRY * PFNGLLOGMESSAGECALLBACKREGALPROC) (GLLOGPROCREGAL callback); - -#define glLogMessageCallbackREGAL GLEW_GET_FUN(__glewLogMessageCallbackREGAL) - -#define GLEW_REGAL_log GLEW_GET_VAR(__GLEW_REGAL_log) - -#endif /* GL_REGAL_log */ - -/* ------------------------- GL_REGAL_proc_address ------------------------- */ - -#ifndef GL_REGAL_proc_address -#define GL_REGAL_proc_address 1 - -typedef void * (GLAPIENTRY * PFNGLGETPROCADDRESSREGALPROC) (const GLchar *name); - -#define glGetProcAddressREGAL GLEW_GET_FUN(__glewGetProcAddressREGAL) - -#define GLEW_REGAL_proc_address GLEW_GET_VAR(__GLEW_REGAL_proc_address) - -#endif /* GL_REGAL_proc_address */ - -/* ----------------------- GL_REND_screen_coordinates ---------------------- */ - -#ifndef GL_REND_screen_coordinates -#define GL_REND_screen_coordinates 1 - -#define GL_SCREEN_COORDINATES_REND 0x8490 -#define GL_INVERTED_SCREEN_W_REND 0x8491 - -#define GLEW_REND_screen_coordinates GLEW_GET_VAR(__GLEW_REND_screen_coordinates) - -#endif /* GL_REND_screen_coordinates */ - -/* ------------------------------- GL_S3_s3tc ------------------------------ */ - -#ifndef GL_S3_s3tc -#define GL_S3_s3tc 1 - -#define GL_RGB_S3TC 0x83A0 -#define GL_RGB4_S3TC 0x83A1 -#define GL_RGBA_S3TC 0x83A2 -#define GL_RGBA4_S3TC 0x83A3 -#define GL_RGBA_DXT5_S3TC 0x83A4 -#define GL_RGBA4_DXT5_S3TC 0x83A5 - -#define GLEW_S3_s3tc GLEW_GET_VAR(__GLEW_S3_s3tc) - -#endif /* GL_S3_s3tc */ - -/* -------------------------- GL_SGIS_color_range -------------------------- */ - -#ifndef GL_SGIS_color_range -#define GL_SGIS_color_range 1 - -#define GL_EXTENDED_RANGE_SGIS 0x85A5 -#define GL_MIN_RED_SGIS 0x85A6 -#define GL_MAX_RED_SGIS 0x85A7 -#define GL_MIN_GREEN_SGIS 0x85A8 -#define GL_MAX_GREEN_SGIS 0x85A9 -#define GL_MIN_BLUE_SGIS 0x85AA -#define GL_MAX_BLUE_SGIS 0x85AB -#define GL_MIN_ALPHA_SGIS 0x85AC -#define GL_MAX_ALPHA_SGIS 0x85AD - -#define GLEW_SGIS_color_range GLEW_GET_VAR(__GLEW_SGIS_color_range) - -#endif /* GL_SGIS_color_range */ - -/* ------------------------- GL_SGIS_detail_texture ------------------------ */ - -#ifndef GL_SGIS_detail_texture -#define GL_SGIS_detail_texture 1 - -typedef void (GLAPIENTRY * PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points); -typedef void (GLAPIENTRY * PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat* points); - -#define glDetailTexFuncSGIS GLEW_GET_FUN(__glewDetailTexFuncSGIS) -#define glGetDetailTexFuncSGIS GLEW_GET_FUN(__glewGetDetailTexFuncSGIS) - -#define GLEW_SGIS_detail_texture GLEW_GET_VAR(__GLEW_SGIS_detail_texture) - -#endif /* GL_SGIS_detail_texture */ - -/* -------------------------- GL_SGIS_fog_function ------------------------- */ - -#ifndef GL_SGIS_fog_function -#define GL_SGIS_fog_function 1 - -typedef void (GLAPIENTRY * PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat* points); -typedef void (GLAPIENTRY * PFNGLGETFOGFUNCSGISPROC) (GLfloat* points); - -#define glFogFuncSGIS GLEW_GET_FUN(__glewFogFuncSGIS) -#define glGetFogFuncSGIS GLEW_GET_FUN(__glewGetFogFuncSGIS) - -#define GLEW_SGIS_fog_function GLEW_GET_VAR(__GLEW_SGIS_fog_function) - -#endif /* GL_SGIS_fog_function */ - -/* ------------------------ GL_SGIS_generate_mipmap ------------------------ */ - -#ifndef GL_SGIS_generate_mipmap -#define GL_SGIS_generate_mipmap 1 - -#define GL_GENERATE_MIPMAP_SGIS 0x8191 -#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 - -#define GLEW_SGIS_generate_mipmap GLEW_GET_VAR(__GLEW_SGIS_generate_mipmap) - -#endif /* GL_SGIS_generate_mipmap */ - -/* -------------------------- GL_SGIS_multisample -------------------------- */ - -#ifndef GL_SGIS_multisample -#define GL_SGIS_multisample 1 - -#define GL_MULTISAMPLE_SGIS 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F -#define GL_SAMPLE_MASK_SGIS 0x80A0 -#define GL_1PASS_SGIS 0x80A1 -#define GL_2PASS_0_SGIS 0x80A2 -#define GL_2PASS_1_SGIS 0x80A3 -#define GL_4PASS_0_SGIS 0x80A4 -#define GL_4PASS_1_SGIS 0x80A5 -#define GL_4PASS_2_SGIS 0x80A6 -#define GL_4PASS_3_SGIS 0x80A7 -#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 -#define GL_SAMPLES_SGIS 0x80A9 -#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA -#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB -#define GL_SAMPLE_PATTERN_SGIS 0x80AC - -typedef void (GLAPIENTRY * PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert); -typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern); - -#define glSampleMaskSGIS GLEW_GET_FUN(__glewSampleMaskSGIS) -#define glSamplePatternSGIS GLEW_GET_FUN(__glewSamplePatternSGIS) - -#define GLEW_SGIS_multisample GLEW_GET_VAR(__GLEW_SGIS_multisample) - -#endif /* GL_SGIS_multisample */ - -/* ------------------------- GL_SGIS_pixel_texture ------------------------- */ - -#ifndef GL_SGIS_pixel_texture -#define GL_SGIS_pixel_texture 1 - -#define GLEW_SGIS_pixel_texture GLEW_GET_VAR(__GLEW_SGIS_pixel_texture) - -#endif /* GL_SGIS_pixel_texture */ - -/* ----------------------- GL_SGIS_point_line_texgen ----------------------- */ - -#ifndef GL_SGIS_point_line_texgen -#define GL_SGIS_point_line_texgen 1 - -#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0 -#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1 -#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2 -#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3 -#define GL_EYE_POINT_SGIS 0x81F4 -#define GL_OBJECT_POINT_SGIS 0x81F5 -#define GL_EYE_LINE_SGIS 0x81F6 -#define GL_OBJECT_LINE_SGIS 0x81F7 - -#define GLEW_SGIS_point_line_texgen GLEW_GET_VAR(__GLEW_SGIS_point_line_texgen) - -#endif /* GL_SGIS_point_line_texgen */ - -/* ------------------------ GL_SGIS_sharpen_texture ------------------------ */ - -#ifndef GL_SGIS_sharpen_texture -#define GL_SGIS_sharpen_texture 1 - -typedef void (GLAPIENTRY * PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat* points); -typedef void (GLAPIENTRY * PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points); - -#define glGetSharpenTexFuncSGIS GLEW_GET_FUN(__glewGetSharpenTexFuncSGIS) -#define glSharpenTexFuncSGIS GLEW_GET_FUN(__glewSharpenTexFuncSGIS) - -#define GLEW_SGIS_sharpen_texture GLEW_GET_VAR(__GLEW_SGIS_sharpen_texture) - -#endif /* GL_SGIS_sharpen_texture */ - -/* --------------------------- GL_SGIS_texture4D --------------------------- */ - -#ifndef GL_SGIS_texture4D -#define GL_SGIS_texture4D 1 - -typedef void (GLAPIENTRY * PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLenum format, GLenum type, const void *pixels); - -#define glTexImage4DSGIS GLEW_GET_FUN(__glewTexImage4DSGIS) -#define glTexSubImage4DSGIS GLEW_GET_FUN(__glewTexSubImage4DSGIS) - -#define GLEW_SGIS_texture4D GLEW_GET_VAR(__GLEW_SGIS_texture4D) - -#endif /* GL_SGIS_texture4D */ - -/* ---------------------- GL_SGIS_texture_border_clamp --------------------- */ - -#ifndef GL_SGIS_texture_border_clamp -#define GL_SGIS_texture_border_clamp 1 - -#define GL_CLAMP_TO_BORDER_SGIS 0x812D - -#define GLEW_SGIS_texture_border_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_border_clamp) - -#endif /* GL_SGIS_texture_border_clamp */ - -/* ----------------------- GL_SGIS_texture_edge_clamp ---------------------- */ - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_SGIS_texture_edge_clamp 1 - -#define GL_CLAMP_TO_EDGE_SGIS 0x812F - -#define GLEW_SGIS_texture_edge_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_edge_clamp) - -#endif /* GL_SGIS_texture_edge_clamp */ - -/* ------------------------ GL_SGIS_texture_filter4 ------------------------ */ - -#ifndef GL_SGIS_texture_filter4 -#define GL_SGIS_texture_filter4 1 - -typedef void (GLAPIENTRY * PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat* weights); -typedef void (GLAPIENTRY * PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat* weights); - -#define glGetTexFilterFuncSGIS GLEW_GET_FUN(__glewGetTexFilterFuncSGIS) -#define glTexFilterFuncSGIS GLEW_GET_FUN(__glewTexFilterFuncSGIS) - -#define GLEW_SGIS_texture_filter4 GLEW_GET_VAR(__GLEW_SGIS_texture_filter4) - -#endif /* GL_SGIS_texture_filter4 */ - -/* -------------------------- GL_SGIS_texture_lod -------------------------- */ - -#ifndef GL_SGIS_texture_lod -#define GL_SGIS_texture_lod 1 - -#define GL_TEXTURE_MIN_LOD_SGIS 0x813A -#define GL_TEXTURE_MAX_LOD_SGIS 0x813B -#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C -#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D - -#define GLEW_SGIS_texture_lod GLEW_GET_VAR(__GLEW_SGIS_texture_lod) - -#endif /* GL_SGIS_texture_lod */ - -/* ------------------------- GL_SGIS_texture_select ------------------------ */ - -#ifndef GL_SGIS_texture_select -#define GL_SGIS_texture_select 1 - -#define GLEW_SGIS_texture_select GLEW_GET_VAR(__GLEW_SGIS_texture_select) - -#endif /* GL_SGIS_texture_select */ - -/* ----------------------------- GL_SGIX_async ----------------------------- */ - -#ifndef GL_SGIX_async -#define GL_SGIX_async 1 - -#define GL_ASYNC_MARKER_SGIX 0x8329 - -typedef void (GLAPIENTRY * PFNGLASYNCMARKERSGIXPROC) (GLuint marker); -typedef void (GLAPIENTRY * PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range); -typedef GLint (GLAPIENTRY * PFNGLFINISHASYNCSGIXPROC) (GLuint* markerp); -typedef GLuint (GLAPIENTRY * PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range); -typedef GLboolean (GLAPIENTRY * PFNGLISASYNCMARKERSGIXPROC) (GLuint marker); -typedef GLint (GLAPIENTRY * PFNGLPOLLASYNCSGIXPROC) (GLuint* markerp); - -#define glAsyncMarkerSGIX GLEW_GET_FUN(__glewAsyncMarkerSGIX) -#define glDeleteAsyncMarkersSGIX GLEW_GET_FUN(__glewDeleteAsyncMarkersSGIX) -#define glFinishAsyncSGIX GLEW_GET_FUN(__glewFinishAsyncSGIX) -#define glGenAsyncMarkersSGIX GLEW_GET_FUN(__glewGenAsyncMarkersSGIX) -#define glIsAsyncMarkerSGIX GLEW_GET_FUN(__glewIsAsyncMarkerSGIX) -#define glPollAsyncSGIX GLEW_GET_FUN(__glewPollAsyncSGIX) - -#define GLEW_SGIX_async GLEW_GET_VAR(__GLEW_SGIX_async) - -#endif /* GL_SGIX_async */ - -/* ------------------------ GL_SGIX_async_histogram ------------------------ */ - -#ifndef GL_SGIX_async_histogram -#define GL_SGIX_async_histogram 1 - -#define GL_ASYNC_HISTOGRAM_SGIX 0x832C -#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D - -#define GLEW_SGIX_async_histogram GLEW_GET_VAR(__GLEW_SGIX_async_histogram) - -#endif /* GL_SGIX_async_histogram */ - -/* -------------------------- GL_SGIX_async_pixel -------------------------- */ - -#ifndef GL_SGIX_async_pixel -#define GL_SGIX_async_pixel 1 - -#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C -#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D -#define GL_ASYNC_READ_PIXELS_SGIX 0x835E -#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F -#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360 -#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361 - -#define GLEW_SGIX_async_pixel GLEW_GET_VAR(__GLEW_SGIX_async_pixel) - -#endif /* GL_SGIX_async_pixel */ - -/* ----------------------- GL_SGIX_blend_alpha_minmax ---------------------- */ - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_SGIX_blend_alpha_minmax 1 - -#define GL_ALPHA_MIN_SGIX 0x8320 -#define GL_ALPHA_MAX_SGIX 0x8321 - -#define GLEW_SGIX_blend_alpha_minmax GLEW_GET_VAR(__GLEW_SGIX_blend_alpha_minmax) - -#endif /* GL_SGIX_blend_alpha_minmax */ - -/* ---------------------------- GL_SGIX_clipmap ---------------------------- */ - -#ifndef GL_SGIX_clipmap -#define GL_SGIX_clipmap 1 - -#define GLEW_SGIX_clipmap GLEW_GET_VAR(__GLEW_SGIX_clipmap) - -#endif /* GL_SGIX_clipmap */ - -/* ---------------------- GL_SGIX_convolution_accuracy --------------------- */ - -#ifndef GL_SGIX_convolution_accuracy -#define GL_SGIX_convolution_accuracy 1 - -#define GL_CONVOLUTION_HINT_SGIX 0x8316 - -#define GLEW_SGIX_convolution_accuracy GLEW_GET_VAR(__GLEW_SGIX_convolution_accuracy) - -#endif /* GL_SGIX_convolution_accuracy */ - -/* ------------------------- GL_SGIX_depth_texture ------------------------- */ - -#ifndef GL_SGIX_depth_texture -#define GL_SGIX_depth_texture 1 - -#define GL_DEPTH_COMPONENT16_SGIX 0x81A5 -#define GL_DEPTH_COMPONENT24_SGIX 0x81A6 -#define GL_DEPTH_COMPONENT32_SGIX 0x81A7 - -#define GLEW_SGIX_depth_texture GLEW_GET_VAR(__GLEW_SGIX_depth_texture) - -#endif /* GL_SGIX_depth_texture */ - -/* -------------------------- GL_SGIX_flush_raster ------------------------- */ - -#ifndef GL_SGIX_flush_raster -#define GL_SGIX_flush_raster 1 - -typedef void (GLAPIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void); - -#define glFlushRasterSGIX GLEW_GET_FUN(__glewFlushRasterSGIX) - -#define GLEW_SGIX_flush_raster GLEW_GET_VAR(__GLEW_SGIX_flush_raster) - -#endif /* GL_SGIX_flush_raster */ - -/* --------------------------- GL_SGIX_fog_offset -------------------------- */ - -#ifndef GL_SGIX_fog_offset -#define GL_SGIX_fog_offset 1 - -#define GL_FOG_OFFSET_SGIX 0x8198 -#define GL_FOG_OFFSET_VALUE_SGIX 0x8199 - -#define GLEW_SGIX_fog_offset GLEW_GET_VAR(__GLEW_SGIX_fog_offset) - -#endif /* GL_SGIX_fog_offset */ - -/* -------------------------- GL_SGIX_fog_texture -------------------------- */ - -#ifndef GL_SGIX_fog_texture -#define GL_SGIX_fog_texture 1 - -typedef void (GLAPIENTRY * PFNGLTEXTUREFOGSGIXPROC) (GLenum pname); - -#define glTextureFogSGIX GLEW_GET_FUN(__glewTextureFogSGIX) - -#define GLEW_SGIX_fog_texture GLEW_GET_VAR(__GLEW_SGIX_fog_texture) - -#endif /* GL_SGIX_fog_texture */ - -/* ------------------- GL_SGIX_fragment_specular_lighting ------------------ */ - -#ifndef GL_SGIX_fragment_specular_lighting -#define GL_SGIX_fragment_specular_lighting 1 - -typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, const GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, const GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum value, GLfloat* data); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum value, GLint* data); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* data); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* data); - -#define glFragmentColorMaterialSGIX GLEW_GET_FUN(__glewFragmentColorMaterialSGIX) -#define glFragmentLightModelfSGIX GLEW_GET_FUN(__glewFragmentLightModelfSGIX) -#define glFragmentLightModelfvSGIX GLEW_GET_FUN(__glewFragmentLightModelfvSGIX) -#define glFragmentLightModeliSGIX GLEW_GET_FUN(__glewFragmentLightModeliSGIX) -#define glFragmentLightModelivSGIX GLEW_GET_FUN(__glewFragmentLightModelivSGIX) -#define glFragmentLightfSGIX GLEW_GET_FUN(__glewFragmentLightfSGIX) -#define glFragmentLightfvSGIX GLEW_GET_FUN(__glewFragmentLightfvSGIX) -#define glFragmentLightiSGIX GLEW_GET_FUN(__glewFragmentLightiSGIX) -#define glFragmentLightivSGIX GLEW_GET_FUN(__glewFragmentLightivSGIX) -#define glFragmentMaterialfSGIX GLEW_GET_FUN(__glewFragmentMaterialfSGIX) -#define glFragmentMaterialfvSGIX GLEW_GET_FUN(__glewFragmentMaterialfvSGIX) -#define glFragmentMaterialiSGIX GLEW_GET_FUN(__glewFragmentMaterialiSGIX) -#define glFragmentMaterialivSGIX GLEW_GET_FUN(__glewFragmentMaterialivSGIX) -#define glGetFragmentLightfvSGIX GLEW_GET_FUN(__glewGetFragmentLightfvSGIX) -#define glGetFragmentLightivSGIX GLEW_GET_FUN(__glewGetFragmentLightivSGIX) -#define glGetFragmentMaterialfvSGIX GLEW_GET_FUN(__glewGetFragmentMaterialfvSGIX) -#define glGetFragmentMaterialivSGIX GLEW_GET_FUN(__glewGetFragmentMaterialivSGIX) - -#define GLEW_SGIX_fragment_specular_lighting GLEW_GET_VAR(__GLEW_SGIX_fragment_specular_lighting) - -#endif /* GL_SGIX_fragment_specular_lighting */ - -/* --------------------------- GL_SGIX_framezoom --------------------------- */ - -#ifndef GL_SGIX_framezoom -#define GL_SGIX_framezoom 1 - -typedef void (GLAPIENTRY * PFNGLFRAMEZOOMSGIXPROC) (GLint factor); - -#define glFrameZoomSGIX GLEW_GET_FUN(__glewFrameZoomSGIX) - -#define GLEW_SGIX_framezoom GLEW_GET_VAR(__GLEW_SGIX_framezoom) - -#endif /* GL_SGIX_framezoom */ - -/* --------------------------- GL_SGIX_interlace --------------------------- */ - -#ifndef GL_SGIX_interlace -#define GL_SGIX_interlace 1 - -#define GL_INTERLACE_SGIX 0x8094 - -#define GLEW_SGIX_interlace GLEW_GET_VAR(__GLEW_SGIX_interlace) - -#endif /* GL_SGIX_interlace */ - -/* ------------------------- GL_SGIX_ir_instrument1 ------------------------ */ - -#ifndef GL_SGIX_ir_instrument1 -#define GL_SGIX_ir_instrument1 1 - -#define GLEW_SGIX_ir_instrument1 GLEW_GET_VAR(__GLEW_SGIX_ir_instrument1) - -#endif /* GL_SGIX_ir_instrument1 */ - -/* ------------------------- GL_SGIX_list_priority ------------------------- */ - -#ifndef GL_SGIX_list_priority -#define GL_SGIX_list_priority 1 - -#define GLEW_SGIX_list_priority GLEW_GET_VAR(__GLEW_SGIX_list_priority) - -#endif /* GL_SGIX_list_priority */ - -/* ------------------------- GL_SGIX_pixel_texture ------------------------- */ - -#ifndef GL_SGIX_pixel_texture -#define GL_SGIX_pixel_texture 1 - -typedef void (GLAPIENTRY * PFNGLPIXELTEXGENSGIXPROC) (GLenum mode); - -#define glPixelTexGenSGIX GLEW_GET_FUN(__glewPixelTexGenSGIX) - -#define GLEW_SGIX_pixel_texture GLEW_GET_VAR(__GLEW_SGIX_pixel_texture) - -#endif /* GL_SGIX_pixel_texture */ - -/* ----------------------- GL_SGIX_pixel_texture_bits ---------------------- */ - -#ifndef GL_SGIX_pixel_texture_bits -#define GL_SGIX_pixel_texture_bits 1 - -#define GLEW_SGIX_pixel_texture_bits GLEW_GET_VAR(__GLEW_SGIX_pixel_texture_bits) - -#endif /* GL_SGIX_pixel_texture_bits */ - -/* ------------------------ GL_SGIX_reference_plane ------------------------ */ - -#ifndef GL_SGIX_reference_plane -#define GL_SGIX_reference_plane 1 - -typedef void (GLAPIENTRY * PFNGLREFERENCEPLANESGIXPROC) (const GLdouble* equation); - -#define glReferencePlaneSGIX GLEW_GET_FUN(__glewReferencePlaneSGIX) - -#define GLEW_SGIX_reference_plane GLEW_GET_VAR(__GLEW_SGIX_reference_plane) - -#endif /* GL_SGIX_reference_plane */ - -/* ---------------------------- GL_SGIX_resample --------------------------- */ - -#ifndef GL_SGIX_resample -#define GL_SGIX_resample 1 - -#define GL_PACK_RESAMPLE_SGIX 0x842E -#define GL_UNPACK_RESAMPLE_SGIX 0x842F -#define GL_RESAMPLE_DECIMATE_SGIX 0x8430 -#define GL_RESAMPLE_REPLICATE_SGIX 0x8433 -#define GL_RESAMPLE_ZERO_FILL_SGIX 0x8434 - -#define GLEW_SGIX_resample GLEW_GET_VAR(__GLEW_SGIX_resample) - -#endif /* GL_SGIX_resample */ - -/* ----------------------------- GL_SGIX_shadow ---------------------------- */ - -#ifndef GL_SGIX_shadow -#define GL_SGIX_shadow 1 - -#define GL_TEXTURE_COMPARE_SGIX 0x819A -#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B -#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C -#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D - -#define GLEW_SGIX_shadow GLEW_GET_VAR(__GLEW_SGIX_shadow) - -#endif /* GL_SGIX_shadow */ - -/* ------------------------- GL_SGIX_shadow_ambient ------------------------ */ - -#ifndef GL_SGIX_shadow_ambient -#define GL_SGIX_shadow_ambient 1 - -#define GL_SHADOW_AMBIENT_SGIX 0x80BF - -#define GLEW_SGIX_shadow_ambient GLEW_GET_VAR(__GLEW_SGIX_shadow_ambient) - -#endif /* GL_SGIX_shadow_ambient */ - -/* ----------------------------- GL_SGIX_sprite ---------------------------- */ - -#ifndef GL_SGIX_sprite -#define GL_SGIX_sprite 1 - -typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, GLint* params); - -#define glSpriteParameterfSGIX GLEW_GET_FUN(__glewSpriteParameterfSGIX) -#define glSpriteParameterfvSGIX GLEW_GET_FUN(__glewSpriteParameterfvSGIX) -#define glSpriteParameteriSGIX GLEW_GET_FUN(__glewSpriteParameteriSGIX) -#define glSpriteParameterivSGIX GLEW_GET_FUN(__glewSpriteParameterivSGIX) - -#define GLEW_SGIX_sprite GLEW_GET_VAR(__GLEW_SGIX_sprite) - -#endif /* GL_SGIX_sprite */ - -/* ----------------------- GL_SGIX_tag_sample_buffer ----------------------- */ - -#ifndef GL_SGIX_tag_sample_buffer -#define GL_SGIX_tag_sample_buffer 1 - -typedef void (GLAPIENTRY * PFNGLTAGSAMPLEBUFFERSGIXPROC) (void); - -#define glTagSampleBufferSGIX GLEW_GET_FUN(__glewTagSampleBufferSGIX) - -#define GLEW_SGIX_tag_sample_buffer GLEW_GET_VAR(__GLEW_SGIX_tag_sample_buffer) - -#endif /* GL_SGIX_tag_sample_buffer */ - -/* ------------------------ GL_SGIX_texture_add_env ------------------------ */ - -#ifndef GL_SGIX_texture_add_env -#define GL_SGIX_texture_add_env 1 - -#define GLEW_SGIX_texture_add_env GLEW_GET_VAR(__GLEW_SGIX_texture_add_env) - -#endif /* GL_SGIX_texture_add_env */ - -/* -------------------- GL_SGIX_texture_coordinate_clamp ------------------- */ - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_SGIX_texture_coordinate_clamp 1 - -#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 -#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A -#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B - -#define GLEW_SGIX_texture_coordinate_clamp GLEW_GET_VAR(__GLEW_SGIX_texture_coordinate_clamp) - -#endif /* GL_SGIX_texture_coordinate_clamp */ - -/* ------------------------ GL_SGIX_texture_lod_bias ----------------------- */ - -#ifndef GL_SGIX_texture_lod_bias -#define GL_SGIX_texture_lod_bias 1 - -#define GLEW_SGIX_texture_lod_bias GLEW_GET_VAR(__GLEW_SGIX_texture_lod_bias) - -#endif /* GL_SGIX_texture_lod_bias */ - -/* ---------------------- GL_SGIX_texture_multi_buffer --------------------- */ - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_SGIX_texture_multi_buffer 1 - -#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E - -#define GLEW_SGIX_texture_multi_buffer GLEW_GET_VAR(__GLEW_SGIX_texture_multi_buffer) - -#endif /* GL_SGIX_texture_multi_buffer */ - -/* ------------------------- GL_SGIX_texture_range ------------------------- */ - -#ifndef GL_SGIX_texture_range -#define GL_SGIX_texture_range 1 - -#define GL_RGB_SIGNED_SGIX 0x85E0 -#define GL_RGBA_SIGNED_SGIX 0x85E1 -#define GL_ALPHA_SIGNED_SGIX 0x85E2 -#define GL_LUMINANCE_SIGNED_SGIX 0x85E3 -#define GL_INTENSITY_SIGNED_SGIX 0x85E4 -#define GL_LUMINANCE_ALPHA_SIGNED_SGIX 0x85E5 -#define GL_RGB16_SIGNED_SGIX 0x85E6 -#define GL_RGBA16_SIGNED_SGIX 0x85E7 -#define GL_ALPHA16_SIGNED_SGIX 0x85E8 -#define GL_LUMINANCE16_SIGNED_SGIX 0x85E9 -#define GL_INTENSITY16_SIGNED_SGIX 0x85EA -#define GL_LUMINANCE16_ALPHA16_SIGNED_SGIX 0x85EB -#define GL_RGB_EXTENDED_RANGE_SGIX 0x85EC -#define GL_RGBA_EXTENDED_RANGE_SGIX 0x85ED -#define GL_ALPHA_EXTENDED_RANGE_SGIX 0x85EE -#define GL_LUMINANCE_EXTENDED_RANGE_SGIX 0x85EF -#define GL_INTENSITY_EXTENDED_RANGE_SGIX 0x85F0 -#define GL_LUMINANCE_ALPHA_EXTENDED_RANGE_SGIX 0x85F1 -#define GL_RGB16_EXTENDED_RANGE_SGIX 0x85F2 -#define GL_RGBA16_EXTENDED_RANGE_SGIX 0x85F3 -#define GL_ALPHA16_EXTENDED_RANGE_SGIX 0x85F4 -#define GL_LUMINANCE16_EXTENDED_RANGE_SGIX 0x85F5 -#define GL_INTENSITY16_EXTENDED_RANGE_SGIX 0x85F6 -#define GL_LUMINANCE16_ALPHA16_EXTENDED_RANGE_SGIX 0x85F7 -#define GL_MIN_LUMINANCE_SGIS 0x85F8 -#define GL_MAX_LUMINANCE_SGIS 0x85F9 -#define GL_MIN_INTENSITY_SGIS 0x85FA -#define GL_MAX_INTENSITY_SGIS 0x85FB - -#define GLEW_SGIX_texture_range GLEW_GET_VAR(__GLEW_SGIX_texture_range) - -#endif /* GL_SGIX_texture_range */ - -/* ----------------------- GL_SGIX_texture_scale_bias ---------------------- */ - -#ifndef GL_SGIX_texture_scale_bias -#define GL_SGIX_texture_scale_bias 1 - -#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179 -#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A -#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B -#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C - -#define GLEW_SGIX_texture_scale_bias GLEW_GET_VAR(__GLEW_SGIX_texture_scale_bias) - -#endif /* GL_SGIX_texture_scale_bias */ - -/* ------------------------- GL_SGIX_vertex_preclip ------------------------ */ - -#ifndef GL_SGIX_vertex_preclip -#define GL_SGIX_vertex_preclip 1 - -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF - -#define GLEW_SGIX_vertex_preclip GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip) - -#endif /* GL_SGIX_vertex_preclip */ - -/* ---------------------- GL_SGIX_vertex_preclip_hint ---------------------- */ - -#ifndef GL_SGIX_vertex_preclip_hint -#define GL_SGIX_vertex_preclip_hint 1 - -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF - -#define GLEW_SGIX_vertex_preclip_hint GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip_hint) - -#endif /* GL_SGIX_vertex_preclip_hint */ - -/* ----------------------------- GL_SGIX_ycrcb ----------------------------- */ - -#ifndef GL_SGIX_ycrcb -#define GL_SGIX_ycrcb 1 - -#define GLEW_SGIX_ycrcb GLEW_GET_VAR(__GLEW_SGIX_ycrcb) - -#endif /* GL_SGIX_ycrcb */ - -/* -------------------------- GL_SGI_color_matrix -------------------------- */ - -#ifndef GL_SGI_color_matrix -#define GL_SGI_color_matrix 1 - -#define GL_COLOR_MATRIX_SGI 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB - -#define GLEW_SGI_color_matrix GLEW_GET_VAR(__GLEW_SGI_color_matrix) - -#endif /* GL_SGI_color_matrix */ - -/* --------------------------- GL_SGI_color_table -------------------------- */ - -#ifndef GL_SGI_color_table -#define GL_SGI_color_table 1 - -#define GL_COLOR_TABLE_SGI 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 -#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 -#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 -#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 -#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 -#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF - -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table); -typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, void *table); - -#define glColorTableParameterfvSGI GLEW_GET_FUN(__glewColorTableParameterfvSGI) -#define glColorTableParameterivSGI GLEW_GET_FUN(__glewColorTableParameterivSGI) -#define glColorTableSGI GLEW_GET_FUN(__glewColorTableSGI) -#define glCopyColorTableSGI GLEW_GET_FUN(__glewCopyColorTableSGI) -#define glGetColorTableParameterfvSGI GLEW_GET_FUN(__glewGetColorTableParameterfvSGI) -#define glGetColorTableParameterivSGI GLEW_GET_FUN(__glewGetColorTableParameterivSGI) -#define glGetColorTableSGI GLEW_GET_FUN(__glewGetColorTableSGI) - -#define GLEW_SGI_color_table GLEW_GET_VAR(__GLEW_SGI_color_table) - -#endif /* GL_SGI_color_table */ - -/* ----------------------- GL_SGI_texture_color_table ---------------------- */ - -#ifndef GL_SGI_texture_color_table -#define GL_SGI_texture_color_table 1 - -#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC -#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD - -#define GLEW_SGI_texture_color_table GLEW_GET_VAR(__GLEW_SGI_texture_color_table) - -#endif /* GL_SGI_texture_color_table */ - -/* ------------------------- GL_SUNX_constant_data ------------------------- */ - -#ifndef GL_SUNX_constant_data -#define GL_SUNX_constant_data 1 - -#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 -#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6 - -typedef void (GLAPIENTRY * PFNGLFINISHTEXTURESUNXPROC) (void); - -#define glFinishTextureSUNX GLEW_GET_FUN(__glewFinishTextureSUNX) - -#define GLEW_SUNX_constant_data GLEW_GET_VAR(__GLEW_SUNX_constant_data) - -#endif /* GL_SUNX_constant_data */ - -/* -------------------- GL_SUN_convolution_border_modes -------------------- */ - -#ifndef GL_SUN_convolution_border_modes -#define GL_SUN_convolution_border_modes 1 - -#define GL_WRAP_BORDER_SUN 0x81D4 - -#define GLEW_SUN_convolution_border_modes GLEW_GET_VAR(__GLEW_SUN_convolution_border_modes) - -#endif /* GL_SUN_convolution_border_modes */ - -/* -------------------------- GL_SUN_global_alpha -------------------------- */ - -#ifndef GL_SUN_global_alpha -#define GL_SUN_global_alpha 1 - -#define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA - -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor); - -#define glGlobalAlphaFactorbSUN GLEW_GET_FUN(__glewGlobalAlphaFactorbSUN) -#define glGlobalAlphaFactordSUN GLEW_GET_FUN(__glewGlobalAlphaFactordSUN) -#define glGlobalAlphaFactorfSUN GLEW_GET_FUN(__glewGlobalAlphaFactorfSUN) -#define glGlobalAlphaFactoriSUN GLEW_GET_FUN(__glewGlobalAlphaFactoriSUN) -#define glGlobalAlphaFactorsSUN GLEW_GET_FUN(__glewGlobalAlphaFactorsSUN) -#define glGlobalAlphaFactorubSUN GLEW_GET_FUN(__glewGlobalAlphaFactorubSUN) -#define glGlobalAlphaFactoruiSUN GLEW_GET_FUN(__glewGlobalAlphaFactoruiSUN) -#define glGlobalAlphaFactorusSUN GLEW_GET_FUN(__glewGlobalAlphaFactorusSUN) - -#define GLEW_SUN_global_alpha GLEW_GET_VAR(__GLEW_SUN_global_alpha) - -#endif /* GL_SUN_global_alpha */ - -/* --------------------------- GL_SUN_mesh_array --------------------------- */ - -#ifndef GL_SUN_mesh_array -#define GL_SUN_mesh_array 1 - -#define GL_QUAD_MESH_SUN 0x8614 -#define GL_TRIANGLE_MESH_SUN 0x8615 - -#define GLEW_SUN_mesh_array GLEW_GET_VAR(__GLEW_SUN_mesh_array) - -#endif /* GL_SUN_mesh_array */ - -/* ------------------------ GL_SUN_read_video_pixels ----------------------- */ - -#ifndef GL_SUN_read_video_pixels -#define GL_SUN_read_video_pixels 1 - -typedef void (GLAPIENTRY * PFNGLREADVIDEOPIXELSSUNPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels); - -#define glReadVideoPixelsSUN GLEW_GET_FUN(__glewReadVideoPixelsSUN) - -#define GLEW_SUN_read_video_pixels GLEW_GET_VAR(__GLEW_SUN_read_video_pixels) - -#endif /* GL_SUN_read_video_pixels */ - -/* --------------------------- GL_SUN_slice_accum -------------------------- */ - -#ifndef GL_SUN_slice_accum -#define GL_SUN_slice_accum 1 - -#define GL_SLICE_ACCUM_SUN 0x85CC - -#define GLEW_SUN_slice_accum GLEW_GET_VAR(__GLEW_SUN_slice_accum) - -#endif /* GL_SUN_slice_accum */ - -/* -------------------------- GL_SUN_triangle_list ------------------------- */ - -#ifndef GL_SUN_triangle_list -#define GL_SUN_triangle_list 1 - -#define GL_RESTART_SUN 0x01 -#define GL_REPLACE_MIDDLE_SUN 0x02 -#define GL_REPLACE_OLDEST_SUN 0x03 -#define GL_TRIANGLE_LIST_SUN 0x81D7 -#define GL_REPLACEMENT_CODE_SUN 0x81D8 -#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0 -#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1 -#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2 -#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3 -#define GL_R1UI_V3F_SUN 0x85C4 -#define GL_R1UI_C4UB_V3F_SUN 0x85C5 -#define GL_R1UI_C3F_V3F_SUN 0x85C6 -#define GL_R1UI_N3F_V3F_SUN 0x85C7 -#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8 -#define GL_R1UI_T2F_V3F_SUN 0x85C9 -#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA -#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB - -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte* code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint* code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort* code); - -#define glReplacementCodePointerSUN GLEW_GET_FUN(__glewReplacementCodePointerSUN) -#define glReplacementCodeubSUN GLEW_GET_FUN(__glewReplacementCodeubSUN) -#define glReplacementCodeubvSUN GLEW_GET_FUN(__glewReplacementCodeubvSUN) -#define glReplacementCodeuiSUN GLEW_GET_FUN(__glewReplacementCodeuiSUN) -#define glReplacementCodeuivSUN GLEW_GET_FUN(__glewReplacementCodeuivSUN) -#define glReplacementCodeusSUN GLEW_GET_FUN(__glewReplacementCodeusSUN) -#define glReplacementCodeusvSUN GLEW_GET_FUN(__glewReplacementCodeusvSUN) - -#define GLEW_SUN_triangle_list GLEW_GET_VAR(__GLEW_SUN_triangle_list) - -#endif /* GL_SUN_triangle_list */ - -/* ----------------------------- GL_SUN_vertex ----------------------------- */ - -#ifndef GL_SUN_vertex -#define GL_SUN_vertex 1 - -typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte* c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte* c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint* rc, const GLubyte *c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat* tc, const GLubyte *c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *v); - -#define glColor3fVertex3fSUN GLEW_GET_FUN(__glewColor3fVertex3fSUN) -#define glColor3fVertex3fvSUN GLEW_GET_FUN(__glewColor3fVertex3fvSUN) -#define glColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fSUN) -#define glColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fvSUN) -#define glColor4ubVertex2fSUN GLEW_GET_FUN(__glewColor4ubVertex2fSUN) -#define glColor4ubVertex2fvSUN GLEW_GET_FUN(__glewColor4ubVertex2fvSUN) -#define glColor4ubVertex3fSUN GLEW_GET_FUN(__glewColor4ubVertex3fSUN) -#define glColor4ubVertex3fvSUN GLEW_GET_FUN(__glewColor4ubVertex3fvSUN) -#define glNormal3fVertex3fSUN GLEW_GET_FUN(__glewNormal3fVertex3fSUN) -#define glNormal3fVertex3fvSUN GLEW_GET_FUN(__glewNormal3fVertex3fvSUN) -#define glReplacementCodeuiColor3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fSUN) -#define glReplacementCodeuiColor3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fvSUN) -#define glReplacementCodeuiColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fSUN) -#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fvSUN) -#define glReplacementCodeuiColor4ubVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fSUN) -#define glReplacementCodeuiColor4ubVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fvSUN) -#define glReplacementCodeuiNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fSUN) -#define glReplacementCodeuiNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fvSUN) -#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN) -#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN) -#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN) -#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN) -#define glReplacementCodeuiTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fSUN) -#define glReplacementCodeuiTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fvSUN) -#define glReplacementCodeuiVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fSUN) -#define glReplacementCodeuiVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fvSUN) -#define glTexCoord2fColor3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fSUN) -#define glTexCoord2fColor3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fvSUN) -#define glTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fSUN) -#define glTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fvSUN) -#define glTexCoord2fColor4ubVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fSUN) -#define glTexCoord2fColor4ubVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fvSUN) -#define glTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fSUN) -#define glTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fvSUN) -#define glTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fSUN) -#define glTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fvSUN) -#define glTexCoord4fColor4fNormal3fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fSUN) -#define glTexCoord4fColor4fNormal3fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fvSUN) -#define glTexCoord4fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fSUN) -#define glTexCoord4fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fvSUN) - -#define GLEW_SUN_vertex GLEW_GET_VAR(__GLEW_SUN_vertex) - -#endif /* GL_SUN_vertex */ - -/* -------------------------- GL_WIN_phong_shading ------------------------- */ - -#ifndef GL_WIN_phong_shading -#define GL_WIN_phong_shading 1 - -#define GL_PHONG_WIN 0x80EA -#define GL_PHONG_HINT_WIN 0x80EB - -#define GLEW_WIN_phong_shading GLEW_GET_VAR(__GLEW_WIN_phong_shading) - -#endif /* GL_WIN_phong_shading */ - -/* -------------------------- GL_WIN_specular_fog -------------------------- */ - -#ifndef GL_WIN_specular_fog -#define GL_WIN_specular_fog 1 - -#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC - -#define GLEW_WIN_specular_fog GLEW_GET_VAR(__GLEW_WIN_specular_fog) - -#endif /* GL_WIN_specular_fog */ - -/* ---------------------------- GL_WIN_swap_hint --------------------------- */ - -#ifndef GL_WIN_swap_hint -#define GL_WIN_swap_hint 1 - -typedef void (GLAPIENTRY * PFNGLADDSWAPHINTRECTWINPROC) (GLint x, GLint y, GLsizei width, GLsizei height); - -#define glAddSwapHintRectWIN GLEW_GET_FUN(__glewAddSwapHintRectWIN) - -#define GLEW_WIN_swap_hint GLEW_GET_VAR(__GLEW_WIN_swap_hint) - -#endif /* GL_WIN_swap_hint */ - -/* ------------------------------------------------------------------------- */ - - - -GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D; -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements; -GLEW_FUN_EXPORT PFNGLTEXIMAGE3DPROC __glewTexImage3D; -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D; - -GLEW_FUN_EXPORT PFNGLACTIVETEXTUREPROC __glewActiveTexture; -GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage; -GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd; -GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf; -GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd; -GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv; -GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage; - -GLEW_FUN_EXPORT PFNGLBLENDCOLORPROC __glewBlendColor; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONPROC __glewBlendEquation; -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate; -GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer; -GLEW_FUN_EXPORT PFNGLFOGCOORDDPROC __glewFogCoordd; -GLEW_FUN_EXPORT PFNGLFOGCOORDDVPROC __glewFogCoorddv; -GLEW_FUN_EXPORT PFNGLFOGCOORDFPROC __glewFogCoordf; -GLEW_FUN_EXPORT PFNGLFOGCOORDFVPROC __glewFogCoordfv; -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFPROC __glewPointParameterf; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIPROC __glewPointParameteri; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIVPROC __glewPointParameteriv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DPROC __glewWindowPos2d; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FPROC __glewWindowPos2f; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IPROC __glewWindowPos2i; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SPROC __glewWindowPos2s; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DPROC __glewWindowPos3d; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FPROC __glewWindowPos3f; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IPROC __glewWindowPos3i; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SPROC __glewWindowPos3s; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv; - -GLEW_FUN_EXPORT PFNGLBEGINQUERYPROC __glewBeginQuery; -GLEW_FUN_EXPORT PFNGLBINDBUFFERPROC __glewBindBuffer; -GLEW_FUN_EXPORT PFNGLBUFFERDATAPROC __glewBufferData; -GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAPROC __glewBufferSubData; -GLEW_FUN_EXPORT PFNGLDELETEBUFFERSPROC __glewDeleteBuffers; -GLEW_FUN_EXPORT PFNGLDELETEQUERIESPROC __glewDeleteQueries; -GLEW_FUN_EXPORT PFNGLENDQUERYPROC __glewEndQuery; -GLEW_FUN_EXPORT PFNGLGENBUFFERSPROC __glewGenBuffers; -GLEW_FUN_EXPORT PFNGLGENQUERIESPROC __glewGenQueries; -GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv; -GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv; -GLEW_FUN_EXPORT PFNGLGETQUERYIVPROC __glewGetQueryiv; -GLEW_FUN_EXPORT PFNGLISBUFFERPROC __glewIsBuffer; -GLEW_FUN_EXPORT PFNGLISQUERYPROC __glewIsQuery; -GLEW_FUN_EXPORT PFNGLMAPBUFFERPROC __glewMapBuffer; -GLEW_FUN_EXPORT PFNGLUNMAPBUFFERPROC __glewUnmapBuffer; - -GLEW_FUN_EXPORT PFNGLATTACHSHADERPROC __glewAttachShader; -GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate; -GLEW_FUN_EXPORT PFNGLCOMPILESHADERPROC __glewCompileShader; -GLEW_FUN_EXPORT PFNGLCREATEPROGRAMPROC __glewCreateProgram; -GLEW_FUN_EXPORT PFNGLCREATESHADERPROC __glewCreateShader; -GLEW_FUN_EXPORT PFNGLDELETEPROGRAMPROC __glewDeleteProgram; -GLEW_FUN_EXPORT PFNGLDELETESHADERPROC __glewDeleteShader; -GLEW_FUN_EXPORT PFNGLDETACHSHADERPROC __glewDetachShader; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray; -GLEW_FUN_EXPORT PFNGLDRAWBUFFERSPROC __glewDrawBuffers; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray; -GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform; -GLEW_FUN_EXPORT PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders; -GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation; -GLEW_FUN_EXPORT PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog; -GLEW_FUN_EXPORT PFNGLGETPROGRAMIVPROC __glewGetProgramiv; -GLEW_FUN_EXPORT PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog; -GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEPROC __glewGetShaderSource; -GLEW_FUN_EXPORT PFNGLGETSHADERIVPROC __glewGetShaderiv; -GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation; -GLEW_FUN_EXPORT PFNGLGETUNIFORMFVPROC __glewGetUniformfv; -GLEW_FUN_EXPORT PFNGLGETUNIFORMIVPROC __glewGetUniformiv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv; -GLEW_FUN_EXPORT PFNGLISPROGRAMPROC __glewIsProgram; -GLEW_FUN_EXPORT PFNGLISSHADERPROC __glewIsShader; -GLEW_FUN_EXPORT PFNGLLINKPROGRAMPROC __glewLinkProgram; -GLEW_FUN_EXPORT PFNGLSHADERSOURCEPROC __glewShaderSource; -GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate; -GLEW_FUN_EXPORT PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate; -GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate; -GLEW_FUN_EXPORT PFNGLUNIFORM1FPROC __glewUniform1f; -GLEW_FUN_EXPORT PFNGLUNIFORM1FVPROC __glewUniform1fv; -GLEW_FUN_EXPORT PFNGLUNIFORM1IPROC __glewUniform1i; -GLEW_FUN_EXPORT PFNGLUNIFORM1IVPROC __glewUniform1iv; -GLEW_FUN_EXPORT PFNGLUNIFORM2FPROC __glewUniform2f; -GLEW_FUN_EXPORT PFNGLUNIFORM2FVPROC __glewUniform2fv; -GLEW_FUN_EXPORT PFNGLUNIFORM2IPROC __glewUniform2i; -GLEW_FUN_EXPORT PFNGLUNIFORM2IVPROC __glewUniform2iv; -GLEW_FUN_EXPORT PFNGLUNIFORM3FPROC __glewUniform3f; -GLEW_FUN_EXPORT PFNGLUNIFORM3FVPROC __glewUniform3fv; -GLEW_FUN_EXPORT PFNGLUNIFORM3IPROC __glewUniform3i; -GLEW_FUN_EXPORT PFNGLUNIFORM3IVPROC __glewUniform3iv; -GLEW_FUN_EXPORT PFNGLUNIFORM4FPROC __glewUniform4f; -GLEW_FUN_EXPORT PFNGLUNIFORM4FVPROC __glewUniform4fv; -GLEW_FUN_EXPORT PFNGLUNIFORM4IPROC __glewUniform4i; -GLEW_FUN_EXPORT PFNGLUNIFORM4IVPROC __glewUniform4iv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv; -GLEW_FUN_EXPORT PFNGLUSEPROGRAMPROC __glewUseProgram; -GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPROC __glewValidateProgram; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer; - -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X3FVPROC __glewUniformMatrix2x3fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X4FVPROC __glewUniformMatrix2x4fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X2FVPROC __glewUniformMatrix3x2fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X4FVPROC __glewUniformMatrix3x4fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X2FVPROC __glewUniformMatrix4x2fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X3FVPROC __glewUniformMatrix4x3fv; - -GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERPROC __glewBeginConditionalRender; -GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKPROC __glewBeginTransformFeedback; -GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONPROC __glewBindFragDataLocation; -GLEW_FUN_EXPORT PFNGLCLAMPCOLORPROC __glewClampColor; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERFIPROC __glewClearBufferfi; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERFVPROC __glewClearBufferfv; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERIVPROC __glewClearBufferiv; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERUIVPROC __glewClearBufferuiv; -GLEW_FUN_EXPORT PFNGLCOLORMASKIPROC __glewColorMaski; -GLEW_FUN_EXPORT PFNGLDISABLEIPROC __glewDisablei; -GLEW_FUN_EXPORT PFNGLENABLEIPROC __glewEnablei; -GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERPROC __glewEndConditionalRender; -GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKPROC __glewEndTransformFeedback; -GLEW_FUN_EXPORT PFNGLGETBOOLEANI_VPROC __glewGetBooleani_v; -GLEW_FUN_EXPORT PFNGLGETFRAGDATALOCATIONPROC __glewGetFragDataLocation; -GLEW_FUN_EXPORT PFNGLGETSTRINGIPROC __glewGetStringi; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIIVPROC __glewGetTexParameterIiv; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIUIVPROC __glewGetTexParameterIuiv; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGPROC __glewGetTransformFeedbackVarying; -GLEW_FUN_EXPORT PFNGLGETUNIFORMUIVPROC __glewGetUniformuiv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIIVPROC __glewGetVertexAttribIiv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIUIVPROC __glewGetVertexAttribIuiv; -GLEW_FUN_EXPORT PFNGLISENABLEDIPROC __glewIsEnabledi; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERIIVPROC __glewTexParameterIiv; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERIUIVPROC __glewTexParameterIuiv; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSPROC __glewTransformFeedbackVaryings; -GLEW_FUN_EXPORT PFNGLUNIFORM1UIPROC __glewUniform1ui; -GLEW_FUN_EXPORT PFNGLUNIFORM1UIVPROC __glewUniform1uiv; -GLEW_FUN_EXPORT PFNGLUNIFORM2UIPROC __glewUniform2ui; -GLEW_FUN_EXPORT PFNGLUNIFORM2UIVPROC __glewUniform2uiv; -GLEW_FUN_EXPORT PFNGLUNIFORM3UIPROC __glewUniform3ui; -GLEW_FUN_EXPORT PFNGLUNIFORM3UIVPROC __glewUniform3uiv; -GLEW_FUN_EXPORT PFNGLUNIFORM4UIPROC __glewUniform4ui; -GLEW_FUN_EXPORT PFNGLUNIFORM4UIVPROC __glewUniform4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IPROC __glewVertexAttribI1i; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IVPROC __glewVertexAttribI1iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIPROC __glewVertexAttribI1ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIVPROC __glewVertexAttribI1uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IPROC __glewVertexAttribI2i; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IVPROC __glewVertexAttribI2iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIPROC __glewVertexAttribI2ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIVPROC __glewVertexAttribI2uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IPROC __glewVertexAttribI3i; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IVPROC __glewVertexAttribI3iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIPROC __glewVertexAttribI3ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIVPROC __glewVertexAttribI3uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4BVPROC __glewVertexAttribI4bv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IPROC __glewVertexAttribI4i; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IVPROC __glewVertexAttribI4iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4SVPROC __glewVertexAttribI4sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UBVPROC __glewVertexAttribI4ubv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIPROC __glewVertexAttribI4ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIVPROC __glewVertexAttribI4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4USVPROC __glewVertexAttribI4usv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIPOINTERPROC __glewVertexAttribIPointer; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDPROC __glewDrawArraysInstanced; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDPROC __glewDrawElementsInstanced; -GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXPROC __glewPrimitiveRestartIndex; -GLEW_FUN_EXPORT PFNGLTEXBUFFERPROC __glewTexBuffer; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREPROC __glewFramebufferTexture; -GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERI64VPROC __glewGetBufferParameteri64v; -GLEW_FUN_EXPORT PFNGLGETINTEGER64I_VPROC __glewGetInteger64i_v; - -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORPROC __glewVertexAttribDivisor; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEIPROC __glewBlendEquationSeparatei; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONIPROC __glewBlendEquationi; -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIPROC __glewBlendFuncSeparatei; -GLEW_FUN_EXPORT PFNGLBLENDFUNCIPROC __glewBlendFunci; -GLEW_FUN_EXPORT PFNGLMINSAMPLESHADINGPROC __glewMinSampleShading; - -GLEW_FUN_EXPORT PFNGLGETGRAPHICSRESETSTATUSPROC __glewGetGraphicsResetStatus; -GLEW_FUN_EXPORT PFNGLGETNCOMPRESSEDTEXIMAGEPROC __glewGetnCompressedTexImage; -GLEW_FUN_EXPORT PFNGLGETNTEXIMAGEPROC __glewGetnTexImage; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMDVPROC __glewGetnUniformdv; - -GLEW_FUN_EXPORT PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX; - -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKAMDPROC __glewDebugMessageCallbackAMD; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEENABLEAMDPROC __glewDebugMessageEnableAMD; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTAMDPROC __glewDebugMessageInsertAMD; -GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGAMDPROC __glewGetDebugMessageLogAMD; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONINDEXEDAMDPROC __glewBlendEquationIndexedAMD; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC __glewBlendEquationSeparateIndexedAMD; -GLEW_FUN_EXPORT PFNGLBLENDFUNCINDEXEDAMDPROC __glewBlendFuncIndexedAMD; -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC __glewBlendFuncSeparateIndexedAMD; - -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPARAMETERIAMDPROC __glewVertexAttribParameteriAMD; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC __glewMultiDrawArraysIndirectAMD; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC __glewMultiDrawElementsIndirectAMD; - -GLEW_FUN_EXPORT PFNGLDELETENAMESAMDPROC __glewDeleteNamesAMD; -GLEW_FUN_EXPORT PFNGLGENNAMESAMDPROC __glewGenNamesAMD; -GLEW_FUN_EXPORT PFNGLISNAMEAMDPROC __glewIsNameAMD; - -GLEW_FUN_EXPORT PFNGLQUERYOBJECTPARAMETERUIAMDPROC __glewQueryObjectParameteruiAMD; - -GLEW_FUN_EXPORT PFNGLBEGINPERFMONITORAMDPROC __glewBeginPerfMonitorAMD; -GLEW_FUN_EXPORT PFNGLDELETEPERFMONITORSAMDPROC __glewDeletePerfMonitorsAMD; -GLEW_FUN_EXPORT PFNGLENDPERFMONITORAMDPROC __glewEndPerfMonitorAMD; -GLEW_FUN_EXPORT PFNGLGENPERFMONITORSAMDPROC __glewGenPerfMonitorsAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERDATAAMDPROC __glewGetPerfMonitorCounterDataAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERINFOAMDPROC __glewGetPerfMonitorCounterInfoAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC __glewGetPerfMonitorCounterStringAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERSAMDPROC __glewGetPerfMonitorCountersAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORGROUPSTRINGAMDPROC __glewGetPerfMonitorGroupStringAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORGROUPSAMDPROC __glewGetPerfMonitorGroupsAMD; -GLEW_FUN_EXPORT PFNGLSELECTPERFMONITORCOUNTERSAMDPROC __glewSelectPerfMonitorCountersAMD; - -GLEW_FUN_EXPORT PFNGLSETMULTISAMPLEFVAMDPROC __glewSetMultisamplefvAMD; - -GLEW_FUN_EXPORT PFNGLTEXSTORAGESPARSEAMDPROC __glewTexStorageSparseAMD; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGESPARSEAMDPROC __glewTextureStorageSparseAMD; - -GLEW_FUN_EXPORT PFNGLSTENCILOPVALUEAMDPROC __glewStencilOpValueAMD; - -GLEW_FUN_EXPORT PFNGLTESSELLATIONFACTORAMDPROC __glewTessellationFactorAMD; -GLEW_FUN_EXPORT PFNGLTESSELLATIONMODEAMDPROC __glewTessellationModeAMD; - -GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFERANGLEPROC __glewBlitFramebufferANGLE; - -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC __glewRenderbufferStorageMultisampleANGLE; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDANGLEPROC __glewDrawArraysInstancedANGLE; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDANGLEPROC __glewDrawElementsInstancedANGLE; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORANGLEPROC __glewVertexAttribDivisorANGLE; - -GLEW_FUN_EXPORT PFNGLBEGINQUERYANGLEPROC __glewBeginQueryANGLE; -GLEW_FUN_EXPORT PFNGLDELETEQUERIESANGLEPROC __glewDeleteQueriesANGLE; -GLEW_FUN_EXPORT PFNGLENDQUERYANGLEPROC __glewEndQueryANGLE; -GLEW_FUN_EXPORT PFNGLGENQUERIESANGLEPROC __glewGenQueriesANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VANGLEPROC __glewGetQueryObjecti64vANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVANGLEPROC __glewGetQueryObjectivANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VANGLEPROC __glewGetQueryObjectui64vANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVANGLEPROC __glewGetQueryObjectuivANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYIVANGLEPROC __glewGetQueryivANGLE; -GLEW_FUN_EXPORT PFNGLISQUERYANGLEPROC __glewIsQueryANGLE; -GLEW_FUN_EXPORT PFNGLQUERYCOUNTERANGLEPROC __glewQueryCounterANGLE; - -GLEW_FUN_EXPORT PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC __glewGetTranslatedShaderSourceANGLE; - -GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE; -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE; -GLEW_FUN_EXPORT PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE; -GLEW_FUN_EXPORT PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE; - -GLEW_FUN_EXPORT PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE; -GLEW_FUN_EXPORT PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE; -GLEW_FUN_EXPORT PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE; -GLEW_FUN_EXPORT PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE; -GLEW_FUN_EXPORT PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE; -GLEW_FUN_EXPORT PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE; -GLEW_FUN_EXPORT PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE; -GLEW_FUN_EXPORT PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE; - -GLEW_FUN_EXPORT PFNGLBUFFERPARAMETERIAPPLEPROC __glewBufferParameteriAPPLE; -GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC __glewFlushMappedBufferRangeAPPLE; - -GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERIVAPPLEPROC __glewGetObjectParameterivAPPLE; -GLEW_FUN_EXPORT PFNGLOBJECTPURGEABLEAPPLEPROC __glewObjectPurgeableAPPLE; -GLEW_FUN_EXPORT PFNGLOBJECTUNPURGEABLEAPPLEPROC __glewObjectUnpurgeableAPPLE; - -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE; -GLEW_FUN_EXPORT PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE; - -GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE; -GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE; -GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE; -GLEW_FUN_EXPORT PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE; - -GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE; - -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBAPPLEPROC __glewDisableVertexAttribAPPLE; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBAPPLEPROC __glewEnableVertexAttribAPPLE; -GLEW_FUN_EXPORT PFNGLISVERTEXATTRIBENABLEDAPPLEPROC __glewIsVertexAttribEnabledAPPLE; -GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB1DAPPLEPROC __glewMapVertexAttrib1dAPPLE; -GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB1FAPPLEPROC __glewMapVertexAttrib1fAPPLE; -GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB2DAPPLEPROC __glewMapVertexAttrib2dAPPLE; -GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB2FAPPLEPROC __glewMapVertexAttrib2fAPPLE; - -GLEW_FUN_EXPORT PFNGLCLEARDEPTHFPROC __glewClearDepthf; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEFPROC __glewDepthRangef; -GLEW_FUN_EXPORT PFNGLGETSHADERPRECISIONFORMATPROC __glewGetShaderPrecisionFormat; -GLEW_FUN_EXPORT PFNGLRELEASESHADERCOMPILERPROC __glewReleaseShaderCompiler; -GLEW_FUN_EXPORT PFNGLSHADERBINARYPROC __glewShaderBinary; - -GLEW_FUN_EXPORT PFNGLMEMORYBARRIERBYREGIONPROC __glewMemoryBarrierByRegion; - -GLEW_FUN_EXPORT PFNGLPRIMITIVEBOUNDINGBOXARBPROC __glewPrimitiveBoundingBoxARB; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC __glewDrawArraysInstancedBaseInstance; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC __glewDrawElementsInstancedBaseInstance; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC __glewDrawElementsInstancedBaseVertexBaseInstance; - -GLEW_FUN_EXPORT PFNGLGETIMAGEHANDLEARBPROC __glewGetImageHandleARB; -GLEW_FUN_EXPORT PFNGLGETTEXTUREHANDLEARBPROC __glewGetTextureHandleARB; -GLEW_FUN_EXPORT PFNGLGETTEXTURESAMPLERHANDLEARBPROC __glewGetTextureSamplerHandleARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLUI64VARBPROC __glewGetVertexAttribLui64vARB; -GLEW_FUN_EXPORT PFNGLISIMAGEHANDLERESIDENTARBPROC __glewIsImageHandleResidentARB; -GLEW_FUN_EXPORT PFNGLISTEXTUREHANDLERESIDENTARBPROC __glewIsTextureHandleResidentARB; -GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC __glewMakeImageHandleNonResidentARB; -GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLERESIDENTARBPROC __glewMakeImageHandleResidentARB; -GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC __glewMakeTextureHandleNonResidentARB; -GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLERESIDENTARBPROC __glewMakeTextureHandleResidentARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC __glewProgramUniformHandleui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC __glewProgramUniformHandleui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64ARBPROC __glewUniformHandleui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64VARBPROC __glewUniformHandleui64vARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64ARBPROC __glewVertexAttribL1ui64ARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64VARBPROC __glewVertexAttribL1ui64vARB; - -GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONINDEXEDPROC __glewBindFragDataLocationIndexed; -GLEW_FUN_EXPORT PFNGLGETFRAGDATAINDEXPROC __glewGetFragDataIndex; - -GLEW_FUN_EXPORT PFNGLBUFFERSTORAGEPROC __glewBufferStorage; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSTORAGEEXTPROC __glewNamedBufferStorageEXT; - -GLEW_FUN_EXPORT PFNGLCREATESYNCFROMCLEVENTARBPROC __glewCreateSyncFromCLeventARB; - -GLEW_FUN_EXPORT PFNGLCLEARBUFFERDATAPROC __glewClearBufferData; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERSUBDATAPROC __glewClearBufferSubData; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERDATAEXTPROC __glewClearNamedBufferDataEXT; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC __glewClearNamedBufferSubDataEXT; - -GLEW_FUN_EXPORT PFNGLCLEARTEXIMAGEPROC __glewClearTexImage; -GLEW_FUN_EXPORT PFNGLCLEARTEXSUBIMAGEPROC __glewClearTexSubImage; - -GLEW_FUN_EXPORT PFNGLCLIPCONTROLPROC __glewClipControl; - -GLEW_FUN_EXPORT PFNGLCLAMPCOLORARBPROC __glewClampColorARB; - -GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEPROC __glewDispatchCompute; -GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEINDIRECTPROC __glewDispatchComputeIndirect; - -GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC __glewDispatchComputeGroupSizeARB; - -GLEW_FUN_EXPORT PFNGLCOPYBUFFERSUBDATAPROC __glewCopyBufferSubData; - -GLEW_FUN_EXPORT PFNGLCOPYIMAGESUBDATAPROC __glewCopyImageSubData; - -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKARBPROC __glewDebugMessageCallbackARB; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECONTROLARBPROC __glewDebugMessageControlARB; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTARBPROC __glewDebugMessageInsertARB; -GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGARBPROC __glewGetDebugMessageLogARB; - -GLEW_FUN_EXPORT PFNGLBINDTEXTUREUNITPROC __glewBindTextureUnit; -GLEW_FUN_EXPORT PFNGLBLITNAMEDFRAMEBUFFERPROC __glewBlitNamedFramebuffer; -GLEW_FUN_EXPORT PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC __glewCheckNamedFramebufferStatus; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERDATAPROC __glewClearNamedBufferData; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERSUBDATAPROC __glewClearNamedBufferSubData; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERFIPROC __glewClearNamedFramebufferfi; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERFVPROC __glewClearNamedFramebufferfv; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERIVPROC __glewClearNamedFramebufferiv; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC __glewClearNamedFramebufferuiv; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC __glewCompressedTextureSubImage1D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC __glewCompressedTextureSubImage2D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC __glewCompressedTextureSubImage3D; -GLEW_FUN_EXPORT PFNGLCOPYNAMEDBUFFERSUBDATAPROC __glewCopyNamedBufferSubData; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE1DPROC __glewCopyTextureSubImage1D; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE2DPROC __glewCopyTextureSubImage2D; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE3DPROC __glewCopyTextureSubImage3D; -GLEW_FUN_EXPORT PFNGLCREATEBUFFERSPROC __glewCreateBuffers; -GLEW_FUN_EXPORT PFNGLCREATEFRAMEBUFFERSPROC __glewCreateFramebuffers; -GLEW_FUN_EXPORT PFNGLCREATEPROGRAMPIPELINESPROC __glewCreateProgramPipelines; -GLEW_FUN_EXPORT PFNGLCREATEQUERIESPROC __glewCreateQueries; -GLEW_FUN_EXPORT PFNGLCREATERENDERBUFFERSPROC __glewCreateRenderbuffers; -GLEW_FUN_EXPORT PFNGLCREATESAMPLERSPROC __glewCreateSamplers; -GLEW_FUN_EXPORT PFNGLCREATETEXTURESPROC __glewCreateTextures; -GLEW_FUN_EXPORT PFNGLCREATETRANSFORMFEEDBACKSPROC __glewCreateTransformFeedbacks; -GLEW_FUN_EXPORT PFNGLCREATEVERTEXARRAYSPROC __glewCreateVertexArrays; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYATTRIBPROC __glewDisableVertexArrayAttrib; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYATTRIBPROC __glewEnableVertexArrayAttrib; -GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC __glewFlushMappedNamedBufferRange; -GLEW_FUN_EXPORT PFNGLGENERATETEXTUREMIPMAPPROC __glewGenerateTextureMipmap; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC __glewGetCompressedTextureImage; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERI64VPROC __glewGetNamedBufferParameteri64v; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERIVPROC __glewGetNamedBufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPOINTERVPROC __glewGetNamedBufferPointerv; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERSUBDATAPROC __glewGetNamedBufferSubData; -GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetNamedFramebufferAttachmentParameteriv; -GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC __glewGetNamedFramebufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC __glewGetNamedRenderbufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTI64VPROC __glewGetQueryBufferObjecti64v; -GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTIVPROC __glewGetQueryBufferObjectiv; -GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTUI64VPROC __glewGetQueryBufferObjectui64v; -GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTUIVPROC __glewGetQueryBufferObjectuiv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREIMAGEPROC __glewGetTextureImage; -GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERFVPROC __glewGetTextureLevelParameterfv; -GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERIVPROC __glewGetTextureLevelParameteriv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIIVPROC __glewGetTextureParameterIiv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIUIVPROC __glewGetTextureParameterIuiv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERFVPROC __glewGetTextureParameterfv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIVPROC __glewGetTextureParameteriv; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKI64_VPROC __glewGetTransformFeedbacki64_v; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKI_VPROC __glewGetTransformFeedbacki_v; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKIVPROC __glewGetTransformFeedbackiv; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINDEXED64IVPROC __glewGetVertexArrayIndexed64iv; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINDEXEDIVPROC __glewGetVertexArrayIndexediv; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYIVPROC __glewGetVertexArrayiv; -GLEW_FUN_EXPORT PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC __glewInvalidateNamedFramebufferData; -GLEW_FUN_EXPORT PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC __glewInvalidateNamedFramebufferSubData; -GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERPROC __glewMapNamedBuffer; -GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERRANGEPROC __glewMapNamedBufferRange; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERDATAPROC __glewNamedBufferData; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSTORAGEPROC __glewNamedBufferStorage; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSUBDATAPROC __glewNamedBufferSubData; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC __glewNamedFramebufferDrawBuffer; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC __glewNamedFramebufferDrawBuffers; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC __glewNamedFramebufferParameteri; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC __glewNamedFramebufferReadBuffer; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC __glewNamedFramebufferRenderbuffer; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREPROC __glewNamedFramebufferTexture; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC __glewNamedFramebufferTextureLayer; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEPROC __glewNamedRenderbufferStorage; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewNamedRenderbufferStorageMultisample; -GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERPROC __glewTextureBuffer; -GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERRANGEPROC __glewTextureBufferRange; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIIVPROC __glewTextureParameterIiv; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIUIVPROC __glewTextureParameterIuiv; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFPROC __glewTextureParameterf; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFVPROC __glewTextureParameterfv; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIPROC __glewTextureParameteri; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIVPROC __glewTextureParameteriv; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE1DPROC __glewTextureStorage1D; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DPROC __glewTextureStorage2D; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC __glewTextureStorage2DMultisample; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DPROC __glewTextureStorage3D; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC __glewTextureStorage3DMultisample; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE1DPROC __glewTextureSubImage1D; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE2DPROC __glewTextureSubImage2D; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE3DPROC __glewTextureSubImage3D; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC __glewTransformFeedbackBufferBase; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC __glewTransformFeedbackBufferRange; -GLEW_FUN_EXPORT PFNGLUNMAPNAMEDBUFFERPROC __glewUnmapNamedBuffer; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBBINDINGPROC __glewVertexArrayAttribBinding; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBFORMATPROC __glewVertexArrayAttribFormat; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBIFORMATPROC __glewVertexArrayAttribIFormat; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBLFORMATPROC __glewVertexArrayAttribLFormat; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYBINDINGDIVISORPROC __glewVertexArrayBindingDivisor; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYELEMENTBUFFERPROC __glewVertexArrayElementBuffer; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXBUFFERPROC __glewVertexArrayVertexBuffer; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXBUFFERSPROC __glewVertexArrayVertexBuffers; - -GLEW_FUN_EXPORT PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEIARBPROC __glewBlendEquationSeparateiARB; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONIARBPROC __glewBlendEquationiARB; -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIARBPROC __glewBlendFuncSeparateiARB; -GLEW_FUN_EXPORT PFNGLBLENDFUNCIARBPROC __glewBlendFunciARB; - -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSBASEVERTEXPROC __glewDrawElementsBaseVertex; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __glewDrawElementsInstancedBaseVertex; -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC __glewDrawRangeElementsBaseVertex; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC __glewMultiDrawElementsBaseVertex; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINDIRECTPROC __glewDrawArraysIndirect; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINDIRECTPROC __glewDrawElementsIndirect; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERPARAMETERIPROC __glewFramebufferParameteri; -GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVPROC __glewGetFramebufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC __glewGetNamedFramebufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC __glewNamedFramebufferParameteriEXT; - -GLEW_FUN_EXPORT PFNGLBINDFRAMEBUFFERPROC __glewBindFramebuffer; -GLEW_FUN_EXPORT PFNGLBINDRENDERBUFFERPROC __glewBindRenderbuffer; -GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFERPROC __glewBlitFramebuffer; -GLEW_FUN_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSPROC __glewCheckFramebufferStatus; -GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers; -GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERPROC __glewFramebufferTextureLayer; -GLEW_FUN_EXPORT PFNGLGENFRAMEBUFFERSPROC __glewGenFramebuffers; -GLEW_FUN_EXPORT PFNGLGENRENDERBUFFERSPROC __glewGenRenderbuffers; -GLEW_FUN_EXPORT PFNGLGENERATEMIPMAPPROC __glewGenerateMipmap; -GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetFramebufferAttachmentParameteriv; -GLEW_FUN_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVPROC __glewGetRenderbufferParameteriv; -GLEW_FUN_EXPORT PFNGLISFRAMEBUFFERPROC __glewIsFramebuffer; -GLEW_FUN_EXPORT PFNGLISRENDERBUFFERPROC __glewIsRenderbuffer; -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEPROC __glewRenderbufferStorage; -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewRenderbufferStorageMultisample; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREARBPROC __glewFramebufferTextureARB; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREFACEARBPROC __glewFramebufferTextureFaceARB; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERARBPROC __glewFramebufferTextureLayerARB; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIARBPROC __glewProgramParameteriARB; - -GLEW_FUN_EXPORT PFNGLGETPROGRAMBINARYPROC __glewGetProgramBinary; -GLEW_FUN_EXPORT PFNGLPROGRAMBINARYPROC __glewProgramBinary; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIPROC __glewProgramParameteri; - -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC __glewGetCompressedTextureSubImage; -GLEW_FUN_EXPORT PFNGLGETTEXTURESUBIMAGEPROC __glewGetTextureSubImage; - -GLEW_FUN_EXPORT PFNGLSPECIALIZESHADERARBPROC __glewSpecializeShaderARB; - -GLEW_FUN_EXPORT PFNGLGETUNIFORMDVPROC __glewGetUniformdv; -GLEW_FUN_EXPORT PFNGLUNIFORM1DPROC __glewUniform1d; -GLEW_FUN_EXPORT PFNGLUNIFORM1DVPROC __glewUniform1dv; -GLEW_FUN_EXPORT PFNGLUNIFORM2DPROC __glewUniform2d; -GLEW_FUN_EXPORT PFNGLUNIFORM2DVPROC __glewUniform2dv; -GLEW_FUN_EXPORT PFNGLUNIFORM3DPROC __glewUniform3d; -GLEW_FUN_EXPORT PFNGLUNIFORM3DVPROC __glewUniform3dv; -GLEW_FUN_EXPORT PFNGLUNIFORM4DPROC __glewUniform4d; -GLEW_FUN_EXPORT PFNGLUNIFORM4DVPROC __glewUniform4dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2DVPROC __glewUniformMatrix2dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X3DVPROC __glewUniformMatrix2x3dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X4DVPROC __glewUniformMatrix2x4dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3DVPROC __glewUniformMatrix3dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X2DVPROC __glewUniformMatrix3x2dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X4DVPROC __glewUniformMatrix3x4dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4DVPROC __glewUniformMatrix4dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X2DVPROC __glewUniformMatrix4x2dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X3DVPROC __glewUniformMatrix4x3dv; - -GLEW_FUN_EXPORT PFNGLGETUNIFORMI64VARBPROC __glewGetUniformi64vARB; -GLEW_FUN_EXPORT PFNGLGETUNIFORMUI64VARBPROC __glewGetUniformui64vARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMI64VARBPROC __glewGetnUniformi64vARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMUI64VARBPROC __glewGetnUniformui64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64ARBPROC __glewProgramUniform1i64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64VARBPROC __glewProgramUniform1i64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64ARBPROC __glewProgramUniform1ui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64VARBPROC __glewProgramUniform1ui64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64ARBPROC __glewProgramUniform2i64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64VARBPROC __glewProgramUniform2i64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64ARBPROC __glewProgramUniform2ui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64VARBPROC __glewProgramUniform2ui64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64ARBPROC __glewProgramUniform3i64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64VARBPROC __glewProgramUniform3i64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64ARBPROC __glewProgramUniform3ui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64VARBPROC __glewProgramUniform3ui64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64ARBPROC __glewProgramUniform4i64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64VARBPROC __glewProgramUniform4i64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64ARBPROC __glewProgramUniform4ui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64VARBPROC __glewProgramUniform4ui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1I64ARBPROC __glewUniform1i64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1I64VARBPROC __glewUniform1i64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1UI64ARBPROC __glewUniform1ui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1UI64VARBPROC __glewUniform1ui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2I64ARBPROC __glewUniform2i64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2I64VARBPROC __glewUniform2i64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2UI64ARBPROC __glewUniform2ui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2UI64VARBPROC __glewUniform2ui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3I64ARBPROC __glewUniform3i64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3I64VARBPROC __glewUniform3i64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3UI64ARBPROC __glewUniform3ui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3UI64VARBPROC __glewUniform3ui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4I64ARBPROC __glewUniform4i64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4I64VARBPROC __glewUniform4i64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4UI64ARBPROC __glewUniform4ui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4UI64VARBPROC __glewUniform4ui64vARB; - -GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEPROC __glewColorSubTable; -GLEW_FUN_EXPORT PFNGLCOLORTABLEPROC __glewColorTable; -GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv; -GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv; -GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable; -GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable; -GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D; -GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPROC __glewGetColorTable; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPROC __glewGetHistogram; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv; -GLEW_FUN_EXPORT PFNGLGETMINMAXPROC __glewGetMinmax; -GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv; -GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv; -GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter; -GLEW_FUN_EXPORT PFNGLHISTOGRAMPROC __glewHistogram; -GLEW_FUN_EXPORT PFNGLMINMAXPROC __glewMinmax; -GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMPROC __glewResetHistogram; -GLEW_FUN_EXPORT PFNGLRESETMINMAXPROC __glewResetMinmax; -GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC __glewMultiDrawArraysIndirectCountARB; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC __glewMultiDrawElementsIndirectCountARB; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDARBPROC __glewDrawArraysInstancedARB; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDARBPROC __glewDrawElementsInstancedARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORARBPROC __glewVertexAttribDivisorARB; - -GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATIVPROC __glewGetInternalformativ; - -GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATI64VPROC __glewGetInternalformati64v; - -GLEW_FUN_EXPORT PFNGLINVALIDATEBUFFERDATAPROC __glewInvalidateBufferData; -GLEW_FUN_EXPORT PFNGLINVALIDATEBUFFERSUBDATAPROC __glewInvalidateBufferSubData; -GLEW_FUN_EXPORT PFNGLINVALIDATEFRAMEBUFFERPROC __glewInvalidateFramebuffer; -GLEW_FUN_EXPORT PFNGLINVALIDATESUBFRAMEBUFFERPROC __glewInvalidateSubFramebuffer; -GLEW_FUN_EXPORT PFNGLINVALIDATETEXIMAGEPROC __glewInvalidateTexImage; -GLEW_FUN_EXPORT PFNGLINVALIDATETEXSUBIMAGEPROC __glewInvalidateTexSubImage; - -GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEPROC __glewFlushMappedBufferRange; -GLEW_FUN_EXPORT PFNGLMAPBUFFERRANGEPROC __glewMapBufferRange; - -GLEW_FUN_EXPORT PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB; -GLEW_FUN_EXPORT PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB; -GLEW_FUN_EXPORT PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB; -GLEW_FUN_EXPORT PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB; -GLEW_FUN_EXPORT PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB; - -GLEW_FUN_EXPORT PFNGLBINDBUFFERSBASEPROC __glewBindBuffersBase; -GLEW_FUN_EXPORT PFNGLBINDBUFFERSRANGEPROC __glewBindBuffersRange; -GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTURESPROC __glewBindImageTextures; -GLEW_FUN_EXPORT PFNGLBINDSAMPLERSPROC __glewBindSamplers; -GLEW_FUN_EXPORT PFNGLBINDTEXTURESPROC __glewBindTextures; -GLEW_FUN_EXPORT PFNGLBINDVERTEXBUFFERSPROC __glewBindVertexBuffers; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTPROC __glewMultiDrawArraysIndirect; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTPROC __glewMultiDrawElementsIndirect; - -GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB; - -GLEW_FUN_EXPORT PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB; -GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB; - -GLEW_FUN_EXPORT PFNGLBEGINQUERYARBPROC __glewBeginQueryARB; -GLEW_FUN_EXPORT PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB; -GLEW_FUN_EXPORT PFNGLENDQUERYARBPROC __glewEndQueryARB; -GLEW_FUN_EXPORT PFNGLGENQUERIESARBPROC __glewGenQueriesARB; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB; -GLEW_FUN_EXPORT PFNGLGETQUERYIVARBPROC __glewGetQueryivARB; -GLEW_FUN_EXPORT PFNGLISQUERYARBPROC __glewIsQueryARB; - -GLEW_FUN_EXPORT PFNGLMAXSHADERCOMPILERTHREADSARBPROC __glewMaxShaderCompilerThreadsARB; - -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB; - -GLEW_FUN_EXPORT PFNGLGETPROGRAMINTERFACEIVPROC __glewGetProgramInterfaceiv; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEINDEXPROC __glewGetProgramResourceIndex; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONPROC __glewGetProgramResourceLocation; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC __glewGetProgramResourceLocationIndex; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCENAMEPROC __glewGetProgramResourceName; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEIVPROC __glewGetProgramResourceiv; - -GLEW_FUN_EXPORT PFNGLPROVOKINGVERTEXPROC __glewProvokingVertex; - -GLEW_FUN_EXPORT PFNGLGETGRAPHICSRESETSTATUSARBPROC __glewGetGraphicsResetStatusARB; -GLEW_FUN_EXPORT PFNGLGETNCOLORTABLEARBPROC __glewGetnColorTableARB; -GLEW_FUN_EXPORT PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC __glewGetnCompressedTexImageARB; -GLEW_FUN_EXPORT PFNGLGETNCONVOLUTIONFILTERARBPROC __glewGetnConvolutionFilterARB; -GLEW_FUN_EXPORT PFNGLGETNHISTOGRAMARBPROC __glewGetnHistogramARB; -GLEW_FUN_EXPORT PFNGLGETNMAPDVARBPROC __glewGetnMapdvARB; -GLEW_FUN_EXPORT PFNGLGETNMAPFVARBPROC __glewGetnMapfvARB; -GLEW_FUN_EXPORT PFNGLGETNMAPIVARBPROC __glewGetnMapivARB; -GLEW_FUN_EXPORT PFNGLGETNMINMAXARBPROC __glewGetnMinmaxARB; -GLEW_FUN_EXPORT PFNGLGETNPIXELMAPFVARBPROC __glewGetnPixelMapfvARB; -GLEW_FUN_EXPORT PFNGLGETNPIXELMAPUIVARBPROC __glewGetnPixelMapuivARB; -GLEW_FUN_EXPORT PFNGLGETNPIXELMAPUSVARBPROC __glewGetnPixelMapusvARB; -GLEW_FUN_EXPORT PFNGLGETNPOLYGONSTIPPLEARBPROC __glewGetnPolygonStippleARB; -GLEW_FUN_EXPORT PFNGLGETNSEPARABLEFILTERARBPROC __glewGetnSeparableFilterARB; -GLEW_FUN_EXPORT PFNGLGETNTEXIMAGEARBPROC __glewGetnTexImageARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMDVARBPROC __glewGetnUniformdvARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMFVARBPROC __glewGetnUniformfvARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMIVARBPROC __glewGetnUniformivARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMUIVARBPROC __glewGetnUniformuivARB; -GLEW_FUN_EXPORT PFNGLREADNPIXELSARBPROC __glewReadnPixelsARB; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC __glewFramebufferSampleLocationsfvARB; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC __glewNamedFramebufferSampleLocationsfvARB; - -GLEW_FUN_EXPORT PFNGLMINSAMPLESHADINGARBPROC __glewMinSampleShadingARB; - -GLEW_FUN_EXPORT PFNGLBINDSAMPLERPROC __glewBindSampler; -GLEW_FUN_EXPORT PFNGLDELETESAMPLERSPROC __glewDeleteSamplers; -GLEW_FUN_EXPORT PFNGLGENSAMPLERSPROC __glewGenSamplers; -GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIIVPROC __glewGetSamplerParameterIiv; -GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIUIVPROC __glewGetSamplerParameterIuiv; -GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERFVPROC __glewGetSamplerParameterfv; -GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIVPROC __glewGetSamplerParameteriv; -GLEW_FUN_EXPORT PFNGLISSAMPLERPROC __glewIsSampler; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIIVPROC __glewSamplerParameterIiv; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIUIVPROC __glewSamplerParameterIuiv; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERFPROC __glewSamplerParameterf; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERFVPROC __glewSamplerParameterfv; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIPROC __glewSamplerParameteri; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIVPROC __glewSamplerParameteriv; - -GLEW_FUN_EXPORT PFNGLACTIVESHADERPROGRAMPROC __glewActiveShaderProgram; -GLEW_FUN_EXPORT PFNGLBINDPROGRAMPIPELINEPROC __glewBindProgramPipeline; -GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMVPROC __glewCreateShaderProgramv; -GLEW_FUN_EXPORT PFNGLDELETEPROGRAMPIPELINESPROC __glewDeleteProgramPipelines; -GLEW_FUN_EXPORT PFNGLGENPROGRAMPIPELINESPROC __glewGenProgramPipelines; -GLEW_FUN_EXPORT PFNGLGETPROGRAMPIPELINEINFOLOGPROC __glewGetProgramPipelineInfoLog; -GLEW_FUN_EXPORT PFNGLGETPROGRAMPIPELINEIVPROC __glewGetProgramPipelineiv; -GLEW_FUN_EXPORT PFNGLISPROGRAMPIPELINEPROC __glewIsProgramPipeline; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DPROC __glewProgramUniform1d; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DVPROC __glewProgramUniform1dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FPROC __glewProgramUniform1f; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FVPROC __glewProgramUniform1fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IPROC __glewProgramUniform1i; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IVPROC __glewProgramUniform1iv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIPROC __glewProgramUniform1ui; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIVPROC __glewProgramUniform1uiv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DPROC __glewProgramUniform2d; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DVPROC __glewProgramUniform2dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FPROC __glewProgramUniform2f; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FVPROC __glewProgramUniform2fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IPROC __glewProgramUniform2i; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IVPROC __glewProgramUniform2iv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIPROC __glewProgramUniform2ui; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIVPROC __glewProgramUniform2uiv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DPROC __glewProgramUniform3d; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DVPROC __glewProgramUniform3dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FPROC __glewProgramUniform3f; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FVPROC __glewProgramUniform3fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IPROC __glewProgramUniform3i; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IVPROC __glewProgramUniform3iv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIPROC __glewProgramUniform3ui; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIVPROC __glewProgramUniform3uiv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DPROC __glewProgramUniform4d; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DVPROC __glewProgramUniform4dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FPROC __glewProgramUniform4f; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FVPROC __glewProgramUniform4fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IPROC __glewProgramUniform4i; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IVPROC __glewProgramUniform4iv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIPROC __glewProgramUniform4ui; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIVPROC __glewProgramUniform4uiv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2DVPROC __glewProgramUniformMatrix2dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVPROC __glewProgramUniformMatrix2fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC __glewProgramUniformMatrix2x3dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC __glewProgramUniformMatrix2x3fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC __glewProgramUniformMatrix2x4dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC __glewProgramUniformMatrix2x4fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3DVPROC __glewProgramUniformMatrix3dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVPROC __glewProgramUniformMatrix3fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC __glewProgramUniformMatrix3x2dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC __glewProgramUniformMatrix3x2fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC __glewProgramUniformMatrix3x4dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC __glewProgramUniformMatrix3x4fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4DVPROC __glewProgramUniformMatrix4dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVPROC __glewProgramUniformMatrix4fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC __glewProgramUniformMatrix4x2dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC __glewProgramUniformMatrix4x2fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC __glewProgramUniformMatrix4x3dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC __glewProgramUniformMatrix4x3fv; -GLEW_FUN_EXPORT PFNGLUSEPROGRAMSTAGESPROC __glewUseProgramStages; -GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPIPELINEPROC __glewValidateProgramPipeline; - -GLEW_FUN_EXPORT PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __glewGetActiveAtomicCounterBufferiv; - -GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTUREPROC __glewBindImageTexture; -GLEW_FUN_EXPORT PFNGLMEMORYBARRIERPROC __glewMemoryBarrier; - -GLEW_FUN_EXPORT PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB; -GLEW_FUN_EXPORT PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB; -GLEW_FUN_EXPORT PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB; -GLEW_FUN_EXPORT PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB; -GLEW_FUN_EXPORT PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB; -GLEW_FUN_EXPORT PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB; -GLEW_FUN_EXPORT PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB; -GLEW_FUN_EXPORT PFNGLGETHANDLEARBPROC __glewGetHandleARB; -GLEW_FUN_EXPORT PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB; -GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB; -GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB; -GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB; -GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB; -GLEW_FUN_EXPORT PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB; -GLEW_FUN_EXPORT PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB; -GLEW_FUN_EXPORT PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB; -GLEW_FUN_EXPORT PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1FARBPROC __glewUniform1fARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1IARBPROC __glewUniform1iARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2FARBPROC __glewUniform2fARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2IARBPROC __glewUniform2iARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3FARBPROC __glewUniform3fARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3IARBPROC __glewUniform3iARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4FARBPROC __glewUniform4fARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4IARBPROC __glewUniform4iARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB; -GLEW_FUN_EXPORT PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB; -GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB; - -GLEW_FUN_EXPORT PFNGLSHADERSTORAGEBLOCKBINDINGPROC __glewShaderStorageBlockBinding; - -GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINENAMEPROC __glewGetActiveSubroutineName; -GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC __glewGetActiveSubroutineUniformName; -GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC __glewGetActiveSubroutineUniformiv; -GLEW_FUN_EXPORT PFNGLGETPROGRAMSTAGEIVPROC __glewGetProgramStageiv; -GLEW_FUN_EXPORT PFNGLGETSUBROUTINEINDEXPROC __glewGetSubroutineIndex; -GLEW_FUN_EXPORT PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC __glewGetSubroutineUniformLocation; -GLEW_FUN_EXPORT PFNGLGETUNIFORMSUBROUTINEUIVPROC __glewGetUniformSubroutineuiv; -GLEW_FUN_EXPORT PFNGLUNIFORMSUBROUTINESUIVPROC __glewUniformSubroutinesuiv; - -GLEW_FUN_EXPORT PFNGLCOMPILESHADERINCLUDEARBPROC __glewCompileShaderIncludeARB; -GLEW_FUN_EXPORT PFNGLDELETENAMEDSTRINGARBPROC __glewDeleteNamedStringARB; -GLEW_FUN_EXPORT PFNGLGETNAMEDSTRINGARBPROC __glewGetNamedStringARB; -GLEW_FUN_EXPORT PFNGLGETNAMEDSTRINGIVARBPROC __glewGetNamedStringivARB; -GLEW_FUN_EXPORT PFNGLISNAMEDSTRINGARBPROC __glewIsNamedStringARB; -GLEW_FUN_EXPORT PFNGLNAMEDSTRINGARBPROC __glewNamedStringARB; - -GLEW_FUN_EXPORT PFNGLBUFFERPAGECOMMITMENTARBPROC __glewBufferPageCommitmentARB; - -GLEW_FUN_EXPORT PFNGLTEXPAGECOMMITMENTARBPROC __glewTexPageCommitmentARB; -GLEW_FUN_EXPORT PFNGLTEXTUREPAGECOMMITMENTEXTPROC __glewTexturePageCommitmentEXT; - -GLEW_FUN_EXPORT PFNGLCLIENTWAITSYNCPROC __glewClientWaitSync; -GLEW_FUN_EXPORT PFNGLDELETESYNCPROC __glewDeleteSync; -GLEW_FUN_EXPORT PFNGLFENCESYNCPROC __glewFenceSync; -GLEW_FUN_EXPORT PFNGLGETINTEGER64VPROC __glewGetInteger64v; -GLEW_FUN_EXPORT PFNGLGETSYNCIVPROC __glewGetSynciv; -GLEW_FUN_EXPORT PFNGLISSYNCPROC __glewIsSync; -GLEW_FUN_EXPORT PFNGLWAITSYNCPROC __glewWaitSync; - -GLEW_FUN_EXPORT PFNGLPATCHPARAMETERFVPROC __glewPatchParameterfv; -GLEW_FUN_EXPORT PFNGLPATCHPARAMETERIPROC __glewPatchParameteri; - -GLEW_FUN_EXPORT PFNGLTEXTUREBARRIERPROC __glewTextureBarrier; - -GLEW_FUN_EXPORT PFNGLTEXBUFFERARBPROC __glewTexBufferARB; - -GLEW_FUN_EXPORT PFNGLTEXBUFFERRANGEPROC __glewTexBufferRange; -GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERRANGEEXTPROC __glewTextureBufferRangeEXT; - -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB; - -GLEW_FUN_EXPORT PFNGLGETMULTISAMPLEFVPROC __glewGetMultisamplefv; -GLEW_FUN_EXPORT PFNGLSAMPLEMASKIPROC __glewSampleMaski; -GLEW_FUN_EXPORT PFNGLTEXIMAGE2DMULTISAMPLEPROC __glewTexImage2DMultisample; -GLEW_FUN_EXPORT PFNGLTEXIMAGE3DMULTISAMPLEPROC __glewTexImage3DMultisample; - -GLEW_FUN_EXPORT PFNGLTEXSTORAGE1DPROC __glewTexStorage1D; -GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DPROC __glewTexStorage2D; -GLEW_FUN_EXPORT PFNGLTEXSTORAGE3DPROC __glewTexStorage3D; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE1DEXTPROC __glewTextureStorage1DEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DEXTPROC __glewTextureStorage2DEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DEXTPROC __glewTextureStorage3DEXT; - -GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DMULTISAMPLEPROC __glewTexStorage2DMultisample; -GLEW_FUN_EXPORT PFNGLTEXSTORAGE3DMULTISAMPLEPROC __glewTexStorage3DMultisample; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC __glewTextureStorage2DMultisampleEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC __glewTextureStorage3DMultisampleEXT; - -GLEW_FUN_EXPORT PFNGLTEXTUREVIEWPROC __glewTextureView; - -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VPROC __glewGetQueryObjecti64v; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VPROC __glewGetQueryObjectui64v; -GLEW_FUN_EXPORT PFNGLQUERYCOUNTERPROC __glewQueryCounter; - -GLEW_FUN_EXPORT PFNGLBINDTRANSFORMFEEDBACKPROC __glewBindTransformFeedback; -GLEW_FUN_EXPORT PFNGLDELETETRANSFORMFEEDBACKSPROC __glewDeleteTransformFeedbacks; -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKPROC __glewDrawTransformFeedback; -GLEW_FUN_EXPORT PFNGLGENTRANSFORMFEEDBACKSPROC __glewGenTransformFeedbacks; -GLEW_FUN_EXPORT PFNGLISTRANSFORMFEEDBACKPROC __glewIsTransformFeedback; -GLEW_FUN_EXPORT PFNGLPAUSETRANSFORMFEEDBACKPROC __glewPauseTransformFeedback; -GLEW_FUN_EXPORT PFNGLRESUMETRANSFORMFEEDBACKPROC __glewResumeTransformFeedback; - -GLEW_FUN_EXPORT PFNGLBEGINQUERYINDEXEDPROC __glewBeginQueryIndexed; -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC __glewDrawTransformFeedbackStream; -GLEW_FUN_EXPORT PFNGLENDQUERYINDEXEDPROC __glewEndQueryIndexed; -GLEW_FUN_EXPORT PFNGLGETQUERYINDEXEDIVPROC __glewGetQueryIndexediv; - -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC __glewDrawTransformFeedbackInstanced; -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC __glewDrawTransformFeedbackStreamInstanced; - -GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB; -GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB; -GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB; -GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB; - -GLEW_FUN_EXPORT PFNGLBINDBUFFERBASEPROC __glewBindBufferBase; -GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGEPROC __glewBindBufferRange; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC __glewGetActiveUniformBlockName; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMBLOCKIVPROC __glewGetActiveUniformBlockiv; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMNAMEPROC __glewGetActiveUniformName; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMSIVPROC __glewGetActiveUniformsiv; -GLEW_FUN_EXPORT PFNGLGETINTEGERI_VPROC __glewGetIntegeri_v; -GLEW_FUN_EXPORT PFNGLGETUNIFORMBLOCKINDEXPROC __glewGetUniformBlockIndex; -GLEW_FUN_EXPORT PFNGLGETUNIFORMINDICESPROC __glewGetUniformIndices; -GLEW_FUN_EXPORT PFNGLUNIFORMBLOCKBINDINGPROC __glewUniformBlockBinding; - -GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYPROC __glewBindVertexArray; -GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSPROC __glewDeleteVertexArrays; -GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSPROC __glewGenVertexArrays; -GLEW_FUN_EXPORT PFNGLISVERTEXARRAYPROC __glewIsVertexArray; - -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLDVPROC __glewGetVertexAttribLdv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DPROC __glewVertexAttribL1d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DVPROC __glewVertexAttribL1dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DPROC __glewVertexAttribL2d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DVPROC __glewVertexAttribL2dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DPROC __glewVertexAttribL3d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DVPROC __glewVertexAttribL3dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DPROC __glewVertexAttribL4d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DVPROC __glewVertexAttribL4dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLPOINTERPROC __glewVertexAttribLPointer; - -GLEW_FUN_EXPORT PFNGLBINDVERTEXBUFFERPROC __glewBindVertexBuffer; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC __glewVertexArrayBindVertexBufferEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC __glewVertexArrayVertexAttribBindingEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC __glewVertexArrayVertexAttribFormatEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC __glewVertexArrayVertexAttribIFormatEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC __glewVertexArrayVertexAttribLFormatEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC __glewVertexArrayVertexBindingDivisorEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBBINDINGPROC __glewVertexAttribBinding; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBFORMATPROC __glewVertexAttribFormat; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIFORMATPROC __glewVertexAttribIFormat; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLFORMATPROC __glewVertexAttribLFormat; -GLEW_FUN_EXPORT PFNGLVERTEXBINDINGDIVISORPROC __glewVertexBindingDivisor; - -GLEW_FUN_EXPORT PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB; -GLEW_FUN_EXPORT PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB; -GLEW_FUN_EXPORT PFNGLWEIGHTBVARBPROC __glewWeightbvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTDVARBPROC __glewWeightdvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTFVARBPROC __glewWeightfvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTIVARBPROC __glewWeightivARB; -GLEW_FUN_EXPORT PFNGLWEIGHTSVARBPROC __glewWeightsvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTUBVARBPROC __glewWeightubvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTUIVARBPROC __glewWeightuivARB; -GLEW_FUN_EXPORT PFNGLWEIGHTUSVARBPROC __glewWeightusvARB; - -GLEW_FUN_EXPORT PFNGLBINDBUFFERARBPROC __glewBindBufferARB; -GLEW_FUN_EXPORT PFNGLBUFFERDATAARBPROC __glewBufferDataARB; -GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB; -GLEW_FUN_EXPORT PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB; -GLEW_FUN_EXPORT PFNGLGENBUFFERSARBPROC __glewGenBuffersARB; -GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB; -GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB; -GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB; -GLEW_FUN_EXPORT PFNGLISBUFFERARBPROC __glewIsBufferARB; -GLEW_FUN_EXPORT PFNGLMAPBUFFERARBPROC __glewMapBufferARB; -GLEW_FUN_EXPORT PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB; - -GLEW_FUN_EXPORT PFNGLBINDPROGRAMARBPROC __glewBindProgramARB; -GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB; -GLEW_FUN_EXPORT PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB; -GLEW_FUN_EXPORT PFNGLISPROGRAMARBPROC __glewIsProgramARB; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB; -GLEW_FUN_EXPORT PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB; - -GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB; -GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB; -GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB; - -GLEW_FUN_EXPORT PFNGLCOLORP3UIPROC __glewColorP3ui; -GLEW_FUN_EXPORT PFNGLCOLORP3UIVPROC __glewColorP3uiv; -GLEW_FUN_EXPORT PFNGLCOLORP4UIPROC __glewColorP4ui; -GLEW_FUN_EXPORT PFNGLCOLORP4UIVPROC __glewColorP4uiv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP1UIPROC __glewMultiTexCoordP1ui; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP1UIVPROC __glewMultiTexCoordP1uiv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP2UIPROC __glewMultiTexCoordP2ui; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP2UIVPROC __glewMultiTexCoordP2uiv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP3UIPROC __glewMultiTexCoordP3ui; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP3UIVPROC __glewMultiTexCoordP3uiv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP4UIPROC __glewMultiTexCoordP4ui; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP4UIVPROC __glewMultiTexCoordP4uiv; -GLEW_FUN_EXPORT PFNGLNORMALP3UIPROC __glewNormalP3ui; -GLEW_FUN_EXPORT PFNGLNORMALP3UIVPROC __glewNormalP3uiv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORP3UIPROC __glewSecondaryColorP3ui; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORP3UIVPROC __glewSecondaryColorP3uiv; -GLEW_FUN_EXPORT PFNGLTEXCOORDP1UIPROC __glewTexCoordP1ui; -GLEW_FUN_EXPORT PFNGLTEXCOORDP1UIVPROC __glewTexCoordP1uiv; -GLEW_FUN_EXPORT PFNGLTEXCOORDP2UIPROC __glewTexCoordP2ui; -GLEW_FUN_EXPORT PFNGLTEXCOORDP2UIVPROC __glewTexCoordP2uiv; -GLEW_FUN_EXPORT PFNGLTEXCOORDP3UIPROC __glewTexCoordP3ui; -GLEW_FUN_EXPORT PFNGLTEXCOORDP3UIVPROC __glewTexCoordP3uiv; -GLEW_FUN_EXPORT PFNGLTEXCOORDP4UIPROC __glewTexCoordP4ui; -GLEW_FUN_EXPORT PFNGLTEXCOORDP4UIVPROC __glewTexCoordP4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP1UIPROC __glewVertexAttribP1ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP1UIVPROC __glewVertexAttribP1uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP2UIPROC __glewVertexAttribP2ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP2UIVPROC __glewVertexAttribP2uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP3UIPROC __glewVertexAttribP3ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP3UIVPROC __glewVertexAttribP3uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP4UIPROC __glewVertexAttribP4ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP4UIVPROC __glewVertexAttribP4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXP2UIPROC __glewVertexP2ui; -GLEW_FUN_EXPORT PFNGLVERTEXP2UIVPROC __glewVertexP2uiv; -GLEW_FUN_EXPORT PFNGLVERTEXP3UIPROC __glewVertexP3ui; -GLEW_FUN_EXPORT PFNGLVERTEXP3UIVPROC __glewVertexP3uiv; -GLEW_FUN_EXPORT PFNGLVERTEXP4UIPROC __glewVertexP4ui; -GLEW_FUN_EXPORT PFNGLVERTEXP4UIVPROC __glewVertexP4uiv; - -GLEW_FUN_EXPORT PFNGLDEPTHRANGEARRAYVPROC __glewDepthRangeArrayv; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEINDEXEDPROC __glewDepthRangeIndexed; -GLEW_FUN_EXPORT PFNGLGETDOUBLEI_VPROC __glewGetDoublei_v; -GLEW_FUN_EXPORT PFNGLGETFLOATI_VPROC __glewGetFloati_v; -GLEW_FUN_EXPORT PFNGLSCISSORARRAYVPROC __glewScissorArrayv; -GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDPROC __glewScissorIndexed; -GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDVPROC __glewScissorIndexedv; -GLEW_FUN_EXPORT PFNGLVIEWPORTARRAYVPROC __glewViewportArrayv; -GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFPROC __glewViewportIndexedf; -GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFVPROC __glewViewportIndexedfv; - -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB; - -GLEW_FUN_EXPORT PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI; - -GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI; -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI; -GLEW_FUN_EXPORT PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI; - -GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI; -GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI; -GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI; -GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI; - -GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI; -GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI; -GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI; -GLEW_FUN_EXPORT PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI; -GLEW_FUN_EXPORT PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI; -GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI; -GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI; -GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI; -GLEW_FUN_EXPORT PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI; -GLEW_FUN_EXPORT PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI; -GLEW_FUN_EXPORT PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI; -GLEW_FUN_EXPORT PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI; -GLEW_FUN_EXPORT PFNGLSAMPLEMAPATIPROC __glewSampleMapATI; -GLEW_FUN_EXPORT PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI; - -GLEW_FUN_EXPORT PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI; -GLEW_FUN_EXPORT PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI; - -GLEW_FUN_EXPORT PFNGLPNTRIANGLESFATIPROC __glewPNTrianglesfATI; -GLEW_FUN_EXPORT PFNGLPNTRIANGLESIATIPROC __glewPNTrianglesiATI; - -GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI; -GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI; - -GLEW_FUN_EXPORT PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI; -GLEW_FUN_EXPORT PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI; -GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI; -GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI; -GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI; -GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI; -GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI; -GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI; -GLEW_FUN_EXPORT PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI; -GLEW_FUN_EXPORT PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI; -GLEW_FUN_EXPORT PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI; -GLEW_FUN_EXPORT PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI; - -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI; - -GLEW_FUN_EXPORT PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI; -GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI; -GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1DATIPROC __glewVertexStream1dATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1DVATIPROC __glewVertexStream1dvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1FATIPROC __glewVertexStream1fATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1FVATIPROC __glewVertexStream1fvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1IATIPROC __glewVertexStream1iATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1IVATIPROC __glewVertexStream1ivATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1SATIPROC __glewVertexStream1sATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1SVATIPROC __glewVertexStream1svATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI; - -GLEW_FUN_EXPORT PFNGLGETUNIFORMBUFFERSIZEEXTPROC __glewGetUniformBufferSizeEXT; -GLEW_FUN_EXPORT PFNGLGETUNIFORMOFFSETEXTPROC __glewGetUniformOffsetEXT; -GLEW_FUN_EXPORT PFNGLUNIFORMBUFFEREXTPROC __glewUniformBufferEXT; - -GLEW_FUN_EXPORT PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT; - -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT; - -GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT; -GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT; - -GLEW_FUN_EXPORT PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT; -GLEW_FUN_EXPORT PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT; - -GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT; -GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT; -GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT; - -GLEW_FUN_EXPORT PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT; -GLEW_FUN_EXPORT PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT; - -GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT; - -GLEW_FUN_EXPORT PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT; -GLEW_FUN_EXPORT PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT; - -GLEW_FUN_EXPORT PFNGLGETOBJECTLABELEXTPROC __glewGetObjectLabelEXT; -GLEW_FUN_EXPORT PFNGLLABELOBJECTEXTPROC __glewLabelObjectEXT; - -GLEW_FUN_EXPORT PFNGLINSERTEVENTMARKEREXTPROC __glewInsertEventMarkerEXT; -GLEW_FUN_EXPORT PFNGLPOPGROUPMARKEREXTPROC __glewPopGroupMarkerEXT; -GLEW_FUN_EXPORT PFNGLPUSHGROUPMARKEREXTPROC __glewPushGroupMarkerEXT; - -GLEW_FUN_EXPORT PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT; - -GLEW_FUN_EXPORT PFNGLBINDMULTITEXTUREEXTPROC __glewBindMultiTextureEXT; -GLEW_FUN_EXPORT PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC __glewCheckNamedFramebufferStatusEXT; -GLEW_FUN_EXPORT PFNGLCLIENTATTRIBDEFAULTEXTPROC __glewClientAttribDefaultEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC __glewCompressedMultiTexImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC __glewCompressedMultiTexImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC __glewCompressedMultiTexImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC __glewCompressedMultiTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC __glewCompressedMultiTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC __glewCompressedMultiTexSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC __glewCompressedTextureImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC __glewCompressedTextureImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC __glewCompressedTextureImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC __glewCompressedTextureSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC __glewCompressedTextureSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC __glewCompressedTextureSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXIMAGE1DEXTPROC __glewCopyMultiTexImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXIMAGE2DEXTPROC __glewCopyMultiTexImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC __glewCopyMultiTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC __glewCopyMultiTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC __glewCopyMultiTexSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTUREIMAGE1DEXTPROC __glewCopyTextureImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTUREIMAGE2DEXTPROC __glewCopyTextureImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC __glewCopyTextureSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC __glewCopyTextureSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC __glewCopyTextureSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC __glewDisableClientStateIndexedEXT; -GLEW_FUN_EXPORT PFNGLDISABLECLIENTSTATEIEXTPROC __glewDisableClientStateiEXT; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC __glewDisableVertexArrayAttribEXT; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYEXTPROC __glewDisableVertexArrayEXT; -GLEW_FUN_EXPORT PFNGLENABLECLIENTSTATEINDEXEDEXTPROC __glewEnableClientStateIndexedEXT; -GLEW_FUN_EXPORT PFNGLENABLECLIENTSTATEIEXTPROC __glewEnableClientStateiEXT; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYATTRIBEXTPROC __glewEnableVertexArrayAttribEXT; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYEXTPROC __glewEnableVertexArrayEXT; -GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC __glewFlushMappedNamedBufferRangeEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC __glewFramebufferDrawBufferEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC __glewFramebufferDrawBuffersEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERREADBUFFEREXTPROC __glewFramebufferReadBufferEXT; -GLEW_FUN_EXPORT PFNGLGENERATEMULTITEXMIPMAPEXTPROC __glewGenerateMultiTexMipmapEXT; -GLEW_FUN_EXPORT PFNGLGENERATETEXTUREMIPMAPEXTPROC __glewGenerateTextureMipmapEXT; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC __glewGetCompressedMultiTexImageEXT; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC __glewGetCompressedTextureImageEXT; -GLEW_FUN_EXPORT PFNGLGETDOUBLEINDEXEDVEXTPROC __glewGetDoubleIndexedvEXT; -GLEW_FUN_EXPORT PFNGLGETDOUBLEI_VEXTPROC __glewGetDoublei_vEXT; -GLEW_FUN_EXPORT PFNGLGETFLOATINDEXEDVEXTPROC __glewGetFloatIndexedvEXT; -GLEW_FUN_EXPORT PFNGLGETFLOATI_VEXTPROC __glewGetFloati_vEXT; -GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC __glewGetFramebufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXENVFVEXTPROC __glewGetMultiTexEnvfvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXENVIVEXTPROC __glewGetMultiTexEnvivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXGENDVEXTPROC __glewGetMultiTexGendvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXGENFVEXTPROC __glewGetMultiTexGenfvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXGENIVEXTPROC __glewGetMultiTexGenivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXIMAGEEXTPROC __glewGetMultiTexImageEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC __glewGetMultiTexLevelParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC __glewGetMultiTexLevelParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIIVEXTPROC __glewGetMultiTexParameterIivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIUIVEXTPROC __glewGetMultiTexParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERFVEXTPROC __glewGetMultiTexParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIVEXTPROC __glewGetMultiTexParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC __glewGetNamedBufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPOINTERVEXTPROC __glewGetNamedBufferPointervEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERSUBDATAEXTPROC __glewGetNamedBufferSubDataEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetNamedFramebufferAttachmentParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC __glewGetNamedProgramLocalParameterIivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC __glewGetNamedProgramLocalParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC __glewGetNamedProgramLocalParameterdvEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC __glewGetNamedProgramLocalParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMSTRINGEXTPROC __glewGetNamedProgramStringEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMIVEXTPROC __glewGetNamedProgramivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC __glewGetNamedRenderbufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETPOINTERINDEXEDVEXTPROC __glewGetPointerIndexedvEXT; -GLEW_FUN_EXPORT PFNGLGETPOINTERI_VEXTPROC __glewGetPointeri_vEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREIMAGEEXTPROC __glewGetTextureImageEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC __glewGetTextureLevelParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC __glewGetTextureLevelParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIIVEXTPROC __glewGetTextureParameterIivEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIUIVEXTPROC __glewGetTextureParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERFVEXTPROC __glewGetTextureParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIVEXTPROC __glewGetTextureParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC __glewGetVertexArrayIntegeri_vEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINTEGERVEXTPROC __glewGetVertexArrayIntegervEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC __glewGetVertexArrayPointeri_vEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYPOINTERVEXTPROC __glewGetVertexArrayPointervEXT; -GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFEREXTPROC __glewMapNamedBufferEXT; -GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERRANGEEXTPROC __glewMapNamedBufferRangeEXT; -GLEW_FUN_EXPORT PFNGLMATRIXFRUSTUMEXTPROC __glewMatrixFrustumEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADIDENTITYEXTPROC __glewMatrixLoadIdentityEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSEDEXTPROC __glewMatrixLoadTransposedEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSEFEXTPROC __glewMatrixLoadTransposefEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADDEXTPROC __glewMatrixLoaddEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADFEXTPROC __glewMatrixLoadfEXT; -GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSEDEXTPROC __glewMatrixMultTransposedEXT; -GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSEFEXTPROC __glewMatrixMultTransposefEXT; -GLEW_FUN_EXPORT PFNGLMATRIXMULTDEXTPROC __glewMatrixMultdEXT; -GLEW_FUN_EXPORT PFNGLMATRIXMULTFEXTPROC __glewMatrixMultfEXT; -GLEW_FUN_EXPORT PFNGLMATRIXORTHOEXTPROC __glewMatrixOrthoEXT; -GLEW_FUN_EXPORT PFNGLMATRIXPOPEXTPROC __glewMatrixPopEXT; -GLEW_FUN_EXPORT PFNGLMATRIXPUSHEXTPROC __glewMatrixPushEXT; -GLEW_FUN_EXPORT PFNGLMATRIXROTATEDEXTPROC __glewMatrixRotatedEXT; -GLEW_FUN_EXPORT PFNGLMATRIXROTATEFEXTPROC __glewMatrixRotatefEXT; -GLEW_FUN_EXPORT PFNGLMATRIXSCALEDEXTPROC __glewMatrixScaledEXT; -GLEW_FUN_EXPORT PFNGLMATRIXSCALEFEXTPROC __glewMatrixScalefEXT; -GLEW_FUN_EXPORT PFNGLMATRIXTRANSLATEDEXTPROC __glewMatrixTranslatedEXT; -GLEW_FUN_EXPORT PFNGLMATRIXTRANSLATEFEXTPROC __glewMatrixTranslatefEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXBUFFEREXTPROC __glewMultiTexBufferEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDPOINTEREXTPROC __glewMultiTexCoordPointerEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXENVFEXTPROC __glewMultiTexEnvfEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXENVFVEXTPROC __glewMultiTexEnvfvEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXENVIEXTPROC __glewMultiTexEnviEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXENVIVEXTPROC __glewMultiTexEnvivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENDEXTPROC __glewMultiTexGendEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENDVEXTPROC __glewMultiTexGendvEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENFEXTPROC __glewMultiTexGenfEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENFVEXTPROC __glewMultiTexGenfvEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENIEXTPROC __glewMultiTexGeniEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENIVEXTPROC __glewMultiTexGenivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE1DEXTPROC __glewMultiTexImage1DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE2DEXTPROC __glewMultiTexImage2DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE3DEXTPROC __glewMultiTexImage3DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIIVEXTPROC __glewMultiTexParameterIivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIUIVEXTPROC __glewMultiTexParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERFEXTPROC __glewMultiTexParameterfEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERFVEXTPROC __glewMultiTexParameterfvEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIEXTPROC __glewMultiTexParameteriEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIVEXTPROC __glewMultiTexParameterivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXRENDERBUFFEREXTPROC __glewMultiTexRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE1DEXTPROC __glewMultiTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE2DEXTPROC __glewMultiTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE3DEXTPROC __glewMultiTexSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERDATAEXTPROC __glewNamedBufferDataEXT; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSUBDATAEXTPROC __glewNamedBufferSubDataEXT; -GLEW_FUN_EXPORT PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC __glewNamedCopyBufferSubDataEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC __glewNamedFramebufferRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC __glewNamedFramebufferTexture1DEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC __glewNamedFramebufferTexture2DEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC __glewNamedFramebufferTexture3DEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC __glewNamedFramebufferTextureEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC __glewNamedFramebufferTextureFaceEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC __glewNamedFramebufferTextureLayerEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC __glewNamedProgramLocalParameter4dEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC __glewNamedProgramLocalParameter4dvEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC __glewNamedProgramLocalParameter4fEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC __glewNamedProgramLocalParameter4fvEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC __glewNamedProgramLocalParameterI4iEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC __glewNamedProgramLocalParameterI4ivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC __glewNamedProgramLocalParameterI4uiEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC __glewNamedProgramLocalParameterI4uivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC __glewNamedProgramLocalParameters4fvEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC __glewNamedProgramLocalParametersI4ivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC __glewNamedProgramLocalParametersI4uivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMSTRINGEXTPROC __glewNamedProgramStringEXT; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC __glewNamedRenderbufferStorageEXT; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC __glewNamedRenderbufferStorageMultisampleCoverageEXT; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewNamedRenderbufferStorageMultisampleEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FEXTPROC __glewProgramUniform1fEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FVEXTPROC __glewProgramUniform1fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IEXTPROC __glewProgramUniform1iEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IVEXTPROC __glewProgramUniform1ivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIEXTPROC __glewProgramUniform1uiEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIVEXTPROC __glewProgramUniform1uivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FEXTPROC __glewProgramUniform2fEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FVEXTPROC __glewProgramUniform2fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IEXTPROC __glewProgramUniform2iEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IVEXTPROC __glewProgramUniform2ivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIEXTPROC __glewProgramUniform2uiEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIVEXTPROC __glewProgramUniform2uivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FEXTPROC __glewProgramUniform3fEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FVEXTPROC __glewProgramUniform3fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IEXTPROC __glewProgramUniform3iEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IVEXTPROC __glewProgramUniform3ivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIEXTPROC __glewProgramUniform3uiEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIVEXTPROC __glewProgramUniform3uivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FEXTPROC __glewProgramUniform4fEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FVEXTPROC __glewProgramUniform4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IEXTPROC __glewProgramUniform4iEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IVEXTPROC __glewProgramUniform4ivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIEXTPROC __glewProgramUniform4uiEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIVEXTPROC __glewProgramUniform4uivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC __glewProgramUniformMatrix2fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __glewProgramUniformMatrix2x3fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __glewProgramUniformMatrix2x4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC __glewProgramUniformMatrix3fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __glewProgramUniformMatrix3x2fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __glewProgramUniformMatrix3x4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __glewProgramUniformMatrix4x2fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __glewProgramUniformMatrix4x3fvEXT; -GLEW_FUN_EXPORT PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC __glewPushClientAttribDefaultEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREBUFFEREXTPROC __glewTextureBufferEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE1DEXTPROC __glewTextureImage1DEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DEXTPROC __glewTextureImage2DEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DEXTPROC __glewTextureImage3DEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIIVEXTPROC __glewTextureParameterIivEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIUIVEXTPROC __glewTextureParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFEXTPROC __glewTextureParameterfEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFVEXTPROC __glewTextureParameterfvEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIEXTPROC __glewTextureParameteriEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIVEXTPROC __glewTextureParameterivEXT; -GLEW_FUN_EXPORT PFNGLTEXTURERENDERBUFFEREXTPROC __glewTextureRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE1DEXTPROC __glewTextureSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE2DEXTPROC __glewTextureSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE3DEXTPROC __glewTextureSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLUNMAPNAMEDBUFFEREXTPROC __glewUnmapNamedBufferEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYCOLOROFFSETEXTPROC __glewVertexArrayColorOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC __glewVertexArrayEdgeFlagOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC __glewVertexArrayFogCoordOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYINDEXOFFSETEXTPROC __glewVertexArrayIndexOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC __glewVertexArrayMultiTexCoordOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYNORMALOFFSETEXTPROC __glewVertexArrayNormalOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC __glewVertexArraySecondaryColorOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC __glewVertexArrayTexCoordOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC __glewVertexArrayVertexAttribDivisorEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC __glewVertexArrayVertexAttribIOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC __glewVertexArrayVertexAttribOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC __glewVertexArrayVertexOffsetEXT; - -GLEW_FUN_EXPORT PFNGLCOLORMASKINDEXEDEXTPROC __glewColorMaskIndexedEXT; -GLEW_FUN_EXPORT PFNGLDISABLEINDEXEDEXTPROC __glewDisableIndexedEXT; -GLEW_FUN_EXPORT PFNGLENABLEINDEXEDEXTPROC __glewEnableIndexedEXT; -GLEW_FUN_EXPORT PFNGLGETBOOLEANINDEXEDVEXTPROC __glewGetBooleanIndexedvEXT; -GLEW_FUN_EXPORT PFNGLGETINTEGERINDEXEDVEXTPROC __glewGetIntegerIndexedvEXT; -GLEW_FUN_EXPORT PFNGLISENABLEDINDEXEDEXTPROC __glewIsEnabledIndexedEXT; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDEXTPROC __glewDrawArraysInstancedEXT; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDEXTPROC __glewDrawElementsInstancedEXT; - -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT; - -GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT; -GLEW_FUN_EXPORT PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT; -GLEW_FUN_EXPORT PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT; -GLEW_FUN_EXPORT PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT; -GLEW_FUN_EXPORT PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT; - -GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT; -GLEW_FUN_EXPORT PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT; - -GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT; - -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT; - -GLEW_FUN_EXPORT PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT; -GLEW_FUN_EXPORT PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT; -GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT; -GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT; -GLEW_FUN_EXPORT PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT; -GLEW_FUN_EXPORT PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT; -GLEW_FUN_EXPORT PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT; -GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT; -GLEW_FUN_EXPORT PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREEXTPROC __glewFramebufferTextureEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC __glewFramebufferTextureFaceEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIEXTPROC __glewProgramParameteriEXT; - -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERS4FVEXTPROC __glewProgramEnvParameters4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC __glewProgramLocalParameters4fvEXT; - -GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONEXTPROC __glewBindFragDataLocationEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGDATALOCATIONEXTPROC __glewGetFragDataLocationEXT; -GLEW_FUN_EXPORT PFNGLGETUNIFORMUIVEXTPROC __glewGetUniformuivEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIIVEXTPROC __glewGetVertexAttribIivEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIUIVEXTPROC __glewGetVertexAttribIuivEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM1UIEXTPROC __glewUniform1uiEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM1UIVEXTPROC __glewUniform1uivEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM2UIEXTPROC __glewUniform2uiEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM2UIVEXTPROC __glewUniform2uivEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM3UIEXTPROC __glewUniform3uiEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM3UIVEXTPROC __glewUniform3uivEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM4UIEXTPROC __glewUniform4uiEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM4UIVEXTPROC __glewUniform4uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IEXTPROC __glewVertexAttribI1iEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IVEXTPROC __glewVertexAttribI1ivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIEXTPROC __glewVertexAttribI1uiEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIVEXTPROC __glewVertexAttribI1uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IEXTPROC __glewVertexAttribI2iEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IVEXTPROC __glewVertexAttribI2ivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIEXTPROC __glewVertexAttribI2uiEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIVEXTPROC __glewVertexAttribI2uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IEXTPROC __glewVertexAttribI3iEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IVEXTPROC __glewVertexAttribI3ivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIEXTPROC __glewVertexAttribI3uiEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIVEXTPROC __glewVertexAttribI3uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4BVEXTPROC __glewVertexAttribI4bvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IEXTPROC __glewVertexAttribI4iEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IVEXTPROC __glewVertexAttribI4ivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4SVEXTPROC __glewVertexAttribI4svEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UBVEXTPROC __glewVertexAttribI4ubvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIEXTPROC __glewVertexAttribI4uiEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIVEXTPROC __glewVertexAttribI4uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4USVEXTPROC __glewVertexAttribI4usvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIPOINTEREXTPROC __glewVertexAttribIPointerEXT; - -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT; -GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT; -GLEW_FUN_EXPORT PFNGLHISTOGRAMEXTPROC __glewHistogramEXT; -GLEW_FUN_EXPORT PFNGLMINMAXEXTPROC __glewMinmaxEXT; -GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT; -GLEW_FUN_EXPORT PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT; - -GLEW_FUN_EXPORT PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT; - -GLEW_FUN_EXPORT PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT; - -GLEW_FUN_EXPORT PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT; -GLEW_FUN_EXPORT PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT; - -GLEW_FUN_EXPORT PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT; -GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT; - -GLEW_FUN_EXPORT PFNGLCOLORTABLEEXTPROC __glewColorTableEXT; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT; - -GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT; -GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT; -GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT; -GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT; -GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT; - -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT; - -GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT; - -GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETCLAMPEXTPROC __glewPolygonOffsetClampEXT; - -GLEW_FUN_EXPORT PFNGLPROVOKINGVERTEXEXTPROC __glewProvokingVertexEXT; - -GLEW_FUN_EXPORT PFNGLCOVERAGEMODULATIONNVPROC __glewCoverageModulationNV; -GLEW_FUN_EXPORT PFNGLCOVERAGEMODULATIONTABLENVPROC __glewCoverageModulationTableNV; -GLEW_FUN_EXPORT PFNGLGETCOVERAGEMODULATIONTABLENVPROC __glewGetCoverageModulationTableNV; -GLEW_FUN_EXPORT PFNGLRASTERSAMPLESEXTPROC __glewRasterSamplesEXT; - -GLEW_FUN_EXPORT PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT; -GLEW_FUN_EXPORT PFNGLENDSCENEEXTPROC __glewEndSceneEXT; - -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT; - -GLEW_FUN_EXPORT PFNGLACTIVEPROGRAMEXTPROC __glewActiveProgramEXT; -GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMEXTPROC __glewCreateShaderProgramEXT; -GLEW_FUN_EXPORT PFNGLUSESHADERPROGRAMEXTPROC __glewUseShaderProgramEXT; - -GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTUREEXTPROC __glewBindImageTextureEXT; -GLEW_FUN_EXPORT PFNGLMEMORYBARRIEREXTPROC __glewMemoryBarrierEXT; - -GLEW_FUN_EXPORT PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT; - -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT; - -GLEW_FUN_EXPORT PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC __glewFramebufferTextureLayerEXT; - -GLEW_FUN_EXPORT PFNGLTEXBUFFEREXTPROC __glewTexBufferEXT; - -GLEW_FUN_EXPORT PFNGLCLEARCOLORIIEXTPROC __glewClearColorIiEXT; -GLEW_FUN_EXPORT PFNGLCLEARCOLORIUIEXTPROC __glewClearColorIuiEXT; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIIVEXTPROC __glewGetTexParameterIivEXT; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIUIVEXTPROC __glewGetTexParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERIIVEXTPROC __glewTexParameterIivEXT; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERIUIVEXTPROC __glewTexParameterIuivEXT; - -GLEW_FUN_EXPORT PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT; -GLEW_FUN_EXPORT PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT; -GLEW_FUN_EXPORT PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT; -GLEW_FUN_EXPORT PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT; -GLEW_FUN_EXPORT PFNGLISTEXTUREEXTPROC __glewIsTextureEXT; -GLEW_FUN_EXPORT PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT; - -GLEW_FUN_EXPORT PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT; - -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VEXTPROC __glewGetQueryObjecti64vEXT; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VEXTPROC __glewGetQueryObjectui64vEXT; - -GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKEXTPROC __glewBeginTransformFeedbackEXT; -GLEW_FUN_EXPORT PFNGLBINDBUFFERBASEEXTPROC __glewBindBufferBaseEXT; -GLEW_FUN_EXPORT PFNGLBINDBUFFEROFFSETEXTPROC __glewBindBufferOffsetEXT; -GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGEEXTPROC __glewBindBufferRangeEXT; -GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKEXTPROC __glewEndTransformFeedbackEXT; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC __glewGetTransformFeedbackVaryingEXT; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC __glewTransformFeedbackVaryingsEXT; - -GLEW_FUN_EXPORT PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT; -GLEW_FUN_EXPORT PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT; -GLEW_FUN_EXPORT PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT; -GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT; -GLEW_FUN_EXPORT PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT; -GLEW_FUN_EXPORT PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT; -GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT; -GLEW_FUN_EXPORT PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT; - -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLDVEXTPROC __glewGetVertexAttribLdvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC __glewVertexArrayVertexAttribLOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DEXTPROC __glewVertexAttribL1dEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DVEXTPROC __glewVertexAttribL1dvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DEXTPROC __glewVertexAttribL2dEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DVEXTPROC __glewVertexAttribL2dvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DEXTPROC __glewVertexAttribL3dEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DVEXTPROC __glewVertexAttribL3dvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DEXTPROC __glewVertexAttribL4dEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DVEXTPROC __glewVertexAttribL4dvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLPOINTEREXTPROC __glewVertexAttribLPointerEXT; - -GLEW_FUN_EXPORT PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT; -GLEW_FUN_EXPORT PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT; -GLEW_FUN_EXPORT PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT; -GLEW_FUN_EXPORT PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT; -GLEW_FUN_EXPORT PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT; -GLEW_FUN_EXPORT PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT; -GLEW_FUN_EXPORT PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT; -GLEW_FUN_EXPORT PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT; -GLEW_FUN_EXPORT PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT; -GLEW_FUN_EXPORT PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT; -GLEW_FUN_EXPORT PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT; -GLEW_FUN_EXPORT PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT; -GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT; -GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT; -GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT; -GLEW_FUN_EXPORT PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT; -GLEW_FUN_EXPORT PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT; -GLEW_FUN_EXPORT PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT; -GLEW_FUN_EXPORT PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT; -GLEW_FUN_EXPORT PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT; -GLEW_FUN_EXPORT PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT; -GLEW_FUN_EXPORT PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT; -GLEW_FUN_EXPORT PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT; -GLEW_FUN_EXPORT PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT; -GLEW_FUN_EXPORT PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT; -GLEW_FUN_EXPORT PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT; -GLEW_FUN_EXPORT PFNGLSWIZZLEEXTPROC __glewSwizzleEXT; -GLEW_FUN_EXPORT PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT; -GLEW_FUN_EXPORT PFNGLVARIANTBVEXTPROC __glewVariantbvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTDVEXTPROC __glewVariantdvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTFVEXTPROC __glewVariantfvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTIVEXTPROC __glewVariantivEXT; -GLEW_FUN_EXPORT PFNGLVARIANTSVEXTPROC __glewVariantsvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT; -GLEW_FUN_EXPORT PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT; -GLEW_FUN_EXPORT PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT; - -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT; -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT; -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT; - -GLEW_FUN_EXPORT PFNGLWINDOWRECTANGLESEXTPROC __glewWindowRectanglesEXT; - -GLEW_FUN_EXPORT PFNGLIMPORTSYNCEXTPROC __glewImportSyncEXT; - -GLEW_FUN_EXPORT PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY; - -GLEW_FUN_EXPORT PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY; - -GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP; -GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP; -GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP; -GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP; -GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP; -GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP; - -GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM; -GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM; - -GLEW_FUN_EXPORT PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM; -GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM; -GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM; -GLEW_FUN_EXPORT PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM; -GLEW_FUN_EXPORT PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM; -GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM; -GLEW_FUN_EXPORT PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM; - -GLEW_FUN_EXPORT PFNGLMAPTEXTURE2DINTELPROC __glewMapTexture2DINTEL; -GLEW_FUN_EXPORT PFNGLSYNCTEXTUREINTELPROC __glewSyncTextureINTEL; -GLEW_FUN_EXPORT PFNGLUNMAPTEXTURE2DINTELPROC __glewUnmapTexture2DINTEL; - -GLEW_FUN_EXPORT PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL; -GLEW_FUN_EXPORT PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL; -GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL; -GLEW_FUN_EXPORT PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL; - -GLEW_FUN_EXPORT PFNGLBEGINPERFQUERYINTELPROC __glewBeginPerfQueryINTEL; -GLEW_FUN_EXPORT PFNGLCREATEPERFQUERYINTELPROC __glewCreatePerfQueryINTEL; -GLEW_FUN_EXPORT PFNGLDELETEPERFQUERYINTELPROC __glewDeletePerfQueryINTEL; -GLEW_FUN_EXPORT PFNGLENDPERFQUERYINTELPROC __glewEndPerfQueryINTEL; -GLEW_FUN_EXPORT PFNGLGETFIRSTPERFQUERYIDINTELPROC __glewGetFirstPerfQueryIdINTEL; -GLEW_FUN_EXPORT PFNGLGETNEXTPERFQUERYIDINTELPROC __glewGetNextPerfQueryIdINTEL; -GLEW_FUN_EXPORT PFNGLGETPERFCOUNTERINFOINTELPROC __glewGetPerfCounterInfoINTEL; -GLEW_FUN_EXPORT PFNGLGETPERFQUERYDATAINTELPROC __glewGetPerfQueryDataINTEL; -GLEW_FUN_EXPORT PFNGLGETPERFQUERYIDBYNAMEINTELPROC __glewGetPerfQueryIdByNameINTEL; -GLEW_FUN_EXPORT PFNGLGETPERFQUERYINFOINTELPROC __glewGetPerfQueryInfoINTEL; - -GLEW_FUN_EXPORT PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL; -GLEW_FUN_EXPORT PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL; - -GLEW_FUN_EXPORT PFNGLBLENDBARRIERKHRPROC __glewBlendBarrierKHR; - -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKPROC __glewDebugMessageCallback; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECONTROLPROC __glewDebugMessageControl; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTPROC __glewDebugMessageInsert; -GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGPROC __glewGetDebugMessageLog; -GLEW_FUN_EXPORT PFNGLGETOBJECTLABELPROC __glewGetObjectLabel; -GLEW_FUN_EXPORT PFNGLGETOBJECTPTRLABELPROC __glewGetObjectPtrLabel; -GLEW_FUN_EXPORT PFNGLOBJECTLABELPROC __glewObjectLabel; -GLEW_FUN_EXPORT PFNGLOBJECTPTRLABELPROC __glewObjectPtrLabel; -GLEW_FUN_EXPORT PFNGLPOPDEBUGGROUPPROC __glewPopDebugGroup; -GLEW_FUN_EXPORT PFNGLPUSHDEBUGGROUPPROC __glewPushDebugGroup; - -GLEW_FUN_EXPORT PFNGLGETNUNIFORMFVPROC __glewGetnUniformfv; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMIVPROC __glewGetnUniformiv; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMUIVPROC __glewGetnUniformuiv; -GLEW_FUN_EXPORT PFNGLREADNPIXELSPROC __glewReadnPixels; - -GLEW_FUN_EXPORT PFNGLBUFFERREGIONENABLEDPROC __glewBufferRegionEnabled; -GLEW_FUN_EXPORT PFNGLDELETEBUFFERREGIONPROC __glewDeleteBufferRegion; -GLEW_FUN_EXPORT PFNGLDRAWBUFFERREGIONPROC __glewDrawBufferRegion; -GLEW_FUN_EXPORT PFNGLNEWBUFFERREGIONPROC __glewNewBufferRegion; -GLEW_FUN_EXPORT PFNGLREADBUFFERREGIONPROC __glewReadBufferRegion; - -GLEW_FUN_EXPORT PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA; - -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA; - -GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERNVXPROC __glewBeginConditionalRenderNVX; -GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERNVXPROC __glewEndConditionalRenderNVX; - -GLEW_FUN_EXPORT PFNGLLGPUCOPYIMAGESUBDATANVXPROC __glewLGPUCopyImageSubDataNVX; -GLEW_FUN_EXPORT PFNGLLGPUINTERLOCKNVXPROC __glewLGPUInterlockNVX; -GLEW_FUN_EXPORT PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC __glewLGPUNamedBufferSubDataNVX; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC __glewMultiDrawArraysIndirectBindlessNV; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC __glewMultiDrawElementsIndirectBindlessNV; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC __glewMultiDrawArraysIndirectBindlessCountNV; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC __glewMultiDrawElementsIndirectBindlessCountNV; - -GLEW_FUN_EXPORT PFNGLGETIMAGEHANDLENVPROC __glewGetImageHandleNV; -GLEW_FUN_EXPORT PFNGLGETTEXTUREHANDLENVPROC __glewGetTextureHandleNV; -GLEW_FUN_EXPORT PFNGLGETTEXTURESAMPLERHANDLENVPROC __glewGetTextureSamplerHandleNV; -GLEW_FUN_EXPORT PFNGLISIMAGEHANDLERESIDENTNVPROC __glewIsImageHandleResidentNV; -GLEW_FUN_EXPORT PFNGLISTEXTUREHANDLERESIDENTNVPROC __glewIsTextureHandleResidentNV; -GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC __glewMakeImageHandleNonResidentNV; -GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLERESIDENTNVPROC __glewMakeImageHandleResidentNV; -GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC __glewMakeTextureHandleNonResidentNV; -GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLERESIDENTNVPROC __glewMakeTextureHandleResidentNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC __glewProgramUniformHandleui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC __glewProgramUniformHandleui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64NVPROC __glewUniformHandleui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64VNVPROC __glewUniformHandleui64vNV; - -GLEW_FUN_EXPORT PFNGLBLENDBARRIERNVPROC __glewBlendBarrierNV; -GLEW_FUN_EXPORT PFNGLBLENDPARAMETERINVPROC __glewBlendParameteriNV; - -GLEW_FUN_EXPORT PFNGLVIEWPORTPOSITIONWSCALENVPROC __glewViewportPositionWScaleNV; - -GLEW_FUN_EXPORT PFNGLCALLCOMMANDLISTNVPROC __glewCallCommandListNV; -GLEW_FUN_EXPORT PFNGLCOMMANDLISTSEGMENTSNVPROC __glewCommandListSegmentsNV; -GLEW_FUN_EXPORT PFNGLCOMPILECOMMANDLISTNVPROC __glewCompileCommandListNV; -GLEW_FUN_EXPORT PFNGLCREATECOMMANDLISTSNVPROC __glewCreateCommandListsNV; -GLEW_FUN_EXPORT PFNGLCREATESTATESNVPROC __glewCreateStatesNV; -GLEW_FUN_EXPORT PFNGLDELETECOMMANDLISTSNVPROC __glewDeleteCommandListsNV; -GLEW_FUN_EXPORT PFNGLDELETESTATESNVPROC __glewDeleteStatesNV; -GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSADDRESSNVPROC __glewDrawCommandsAddressNV; -GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSNVPROC __glewDrawCommandsNV; -GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC __glewDrawCommandsStatesAddressNV; -GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSSTATESNVPROC __glewDrawCommandsStatesNV; -GLEW_FUN_EXPORT PFNGLGETCOMMANDHEADERNVPROC __glewGetCommandHeaderNV; -GLEW_FUN_EXPORT PFNGLGETSTAGEINDEXNVPROC __glewGetStageIndexNV; -GLEW_FUN_EXPORT PFNGLISCOMMANDLISTNVPROC __glewIsCommandListNV; -GLEW_FUN_EXPORT PFNGLISSTATENVPROC __glewIsStateNV; -GLEW_FUN_EXPORT PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC __glewListDrawCommandsStatesClientNV; -GLEW_FUN_EXPORT PFNGLSTATECAPTURENVPROC __glewStateCaptureNV; - -GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERNVPROC __glewBeginConditionalRenderNV; -GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERNVPROC __glewEndConditionalRenderNV; - -GLEW_FUN_EXPORT PFNGLSUBPIXELPRECISIONBIASNVPROC __glewSubpixelPrecisionBiasNV; - -GLEW_FUN_EXPORT PFNGLCONSERVATIVERASTERPARAMETERFNVPROC __glewConservativeRasterParameterfNV; - -GLEW_FUN_EXPORT PFNGLCONSERVATIVERASTERPARAMETERINVPROC __glewConservativeRasterParameteriNV; - -GLEW_FUN_EXPORT PFNGLCOPYIMAGESUBDATANVPROC __glewCopyImageSubDataNV; - -GLEW_FUN_EXPORT PFNGLCLEARDEPTHDNVPROC __glewClearDepthdNV; -GLEW_FUN_EXPORT PFNGLDEPTHBOUNDSDNVPROC __glewDepthBoundsdNV; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEDNVPROC __glewDepthRangedNV; - -GLEW_FUN_EXPORT PFNGLDRAWTEXTURENVPROC __glewDrawTextureNV; - -GLEW_FUN_EXPORT PFNGLDRAWVKIMAGENVPROC __glewDrawVkImageNV; -GLEW_FUN_EXPORT PFNGLGETVKPROCADDRNVPROC __glewGetVkProcAddrNV; -GLEW_FUN_EXPORT PFNGLSIGNALVKFENCENVPROC __glewSignalVkFenceNV; -GLEW_FUN_EXPORT PFNGLSIGNALVKSEMAPHORENVPROC __glewSignalVkSemaphoreNV; -GLEW_FUN_EXPORT PFNGLWAITVKSEMAPHORENVPROC __glewWaitVkSemaphoreNV; - -GLEW_FUN_EXPORT PFNGLEVALMAPSNVPROC __glewEvalMapsNV; -GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV; -GLEW_FUN_EXPORT PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV; -GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV; -GLEW_FUN_EXPORT PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV; -GLEW_FUN_EXPORT PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV; -GLEW_FUN_EXPORT PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV; - -GLEW_FUN_EXPORT PFNGLGETMULTISAMPLEFVNVPROC __glewGetMultisamplefvNV; -GLEW_FUN_EXPORT PFNGLSAMPLEMASKINDEXEDNVPROC __glewSampleMaskIndexedNV; -GLEW_FUN_EXPORT PFNGLTEXRENDERBUFFERNVPROC __glewTexRenderbufferNV; - -GLEW_FUN_EXPORT PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV; -GLEW_FUN_EXPORT PFNGLFINISHFENCENVPROC __glewFinishFenceNV; -GLEW_FUN_EXPORT PFNGLGENFENCESNVPROC __glewGenFencesNV; -GLEW_FUN_EXPORT PFNGLGETFENCEIVNVPROC __glewGetFenceivNV; -GLEW_FUN_EXPORT PFNGLISFENCENVPROC __glewIsFenceNV; -GLEW_FUN_EXPORT PFNGLSETFENCENVPROC __glewSetFenceNV; -GLEW_FUN_EXPORT PFNGLTESTFENCENVPROC __glewTestFenceNV; - -GLEW_FUN_EXPORT PFNGLFRAGMENTCOVERAGECOLORNVPROC __glewFragmentCoverageColorNV; - -GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV; -GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV; -GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV; - -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC __glewRenderbufferStorageMultisampleCoverageNV; - -GLEW_FUN_EXPORT PFNGLPROGRAMVERTEXLIMITNVPROC __glewProgramVertexLimitNV; - -GLEW_FUN_EXPORT PFNGLMULTICASTBARRIERNVPROC __glewMulticastBarrierNV; -GLEW_FUN_EXPORT PFNGLMULTICASTBLITFRAMEBUFFERNVPROC __glewMulticastBlitFramebufferNV; -GLEW_FUN_EXPORT PFNGLMULTICASTBUFFERSUBDATANVPROC __glewMulticastBufferSubDataNV; -GLEW_FUN_EXPORT PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC __glewMulticastCopyBufferSubDataNV; -GLEW_FUN_EXPORT PFNGLMULTICASTCOPYIMAGESUBDATANVPROC __glewMulticastCopyImageSubDataNV; -GLEW_FUN_EXPORT PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewMulticastFramebufferSampleLocationsfvNV; -GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC __glewMulticastGetQueryObjecti64vNV; -GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTIVNVPROC __glewMulticastGetQueryObjectivNV; -GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC __glewMulticastGetQueryObjectui64vNV; -GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC __glewMulticastGetQueryObjectuivNV; -GLEW_FUN_EXPORT PFNGLMULTICASTWAITSYNCNVPROC __glewMulticastWaitSyncNV; -GLEW_FUN_EXPORT PFNGLRENDERGPUMASKNVPROC __glewRenderGpuMaskNV; - -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4INVPROC __glewProgramEnvParameterI4iNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4IVNVPROC __glewProgramEnvParameterI4ivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4UINVPROC __glewProgramEnvParameterI4uiNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4UIVNVPROC __glewProgramEnvParameterI4uivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERSI4IVNVPROC __glewProgramEnvParametersI4ivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC __glewProgramEnvParametersI4uivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4INVPROC __glewProgramLocalParameterI4iNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC __glewProgramLocalParameterI4ivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4UINVPROC __glewProgramLocalParameterI4uiNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC __glewProgramLocalParameterI4uivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC __glewProgramLocalParametersI4ivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC __glewProgramLocalParametersI4uivNV; - -GLEW_FUN_EXPORT PFNGLGETUNIFORMI64VNVPROC __glewGetUniformi64vNV; -GLEW_FUN_EXPORT PFNGLGETUNIFORMUI64VNVPROC __glewGetUniformui64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64NVPROC __glewProgramUniform1i64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64VNVPROC __glewProgramUniform1i64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64NVPROC __glewProgramUniform1ui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64VNVPROC __glewProgramUniform1ui64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64NVPROC __glewProgramUniform2i64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64VNVPROC __glewProgramUniform2i64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64NVPROC __glewProgramUniform2ui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64VNVPROC __glewProgramUniform2ui64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64NVPROC __glewProgramUniform3i64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64VNVPROC __glewProgramUniform3i64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64NVPROC __glewProgramUniform3ui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64VNVPROC __glewProgramUniform3ui64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64NVPROC __glewProgramUniform4i64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64VNVPROC __glewProgramUniform4i64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64NVPROC __glewProgramUniform4ui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64VNVPROC __glewProgramUniform4ui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM1I64NVPROC __glewUniform1i64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM1I64VNVPROC __glewUniform1i64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM1UI64NVPROC __glewUniform1ui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM1UI64VNVPROC __glewUniform1ui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM2I64NVPROC __glewUniform2i64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM2I64VNVPROC __glewUniform2i64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM2UI64NVPROC __glewUniform2ui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM2UI64VNVPROC __glewUniform2ui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM3I64NVPROC __glewUniform3i64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM3I64VNVPROC __glewUniform3i64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM3UI64NVPROC __glewUniform3ui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM3UI64VNVPROC __glewUniform3ui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM4I64NVPROC __glewUniform4i64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM4I64VNVPROC __glewUniform4i64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM4UI64NVPROC __glewUniform4ui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM4UI64VNVPROC __glewUniform4ui64vNV; - -GLEW_FUN_EXPORT PFNGLCOLOR3HNVPROC __glewColor3hNV; -GLEW_FUN_EXPORT PFNGLCOLOR3HVNVPROC __glewColor3hvNV; -GLEW_FUN_EXPORT PFNGLCOLOR4HNVPROC __glewColor4hNV; -GLEW_FUN_EXPORT PFNGLCOLOR4HVNVPROC __glewColor4hvNV; -GLEW_FUN_EXPORT PFNGLFOGCOORDHNVPROC __glewFogCoordhNV; -GLEW_FUN_EXPORT PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV; -GLEW_FUN_EXPORT PFNGLNORMAL3HNVPROC __glewNormal3hNV; -GLEW_FUN_EXPORT PFNGLNORMAL3HVNVPROC __glewNormal3hvNV; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV; -GLEW_FUN_EXPORT PFNGLVERTEX2HNVPROC __glewVertex2hNV; -GLEW_FUN_EXPORT PFNGLVERTEX2HVNVPROC __glewVertex2hvNV; -GLEW_FUN_EXPORT PFNGLVERTEX3HNVPROC __glewVertex3hNV; -GLEW_FUN_EXPORT PFNGLVERTEX3HVNVPROC __glewVertex3hvNV; -GLEW_FUN_EXPORT PFNGLVERTEX4HNVPROC __glewVertex4hNV; -GLEW_FUN_EXPORT PFNGLVERTEX4HVNVPROC __glewVertex4hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV; -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV; - -GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATSAMPLEIVNVPROC __glewGetInternalformatSampleivNV; - -GLEW_FUN_EXPORT PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV; -GLEW_FUN_EXPORT PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV; -GLEW_FUN_EXPORT PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV; -GLEW_FUN_EXPORT PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV; -GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV; -GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV; -GLEW_FUN_EXPORT PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV; - -GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC __glewProgramBufferParametersIivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC __glewProgramBufferParametersIuivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC __glewProgramBufferParametersfvNV; - -GLEW_FUN_EXPORT PFNGLCOPYPATHNVPROC __glewCopyPathNV; -GLEW_FUN_EXPORT PFNGLCOVERFILLPATHINSTANCEDNVPROC __glewCoverFillPathInstancedNV; -GLEW_FUN_EXPORT PFNGLCOVERFILLPATHNVPROC __glewCoverFillPathNV; -GLEW_FUN_EXPORT PFNGLCOVERSTROKEPATHINSTANCEDNVPROC __glewCoverStrokePathInstancedNV; -GLEW_FUN_EXPORT PFNGLCOVERSTROKEPATHNVPROC __glewCoverStrokePathNV; -GLEW_FUN_EXPORT PFNGLDELETEPATHSNVPROC __glewDeletePathsNV; -GLEW_FUN_EXPORT PFNGLGENPATHSNVPROC __glewGenPathsNV; -GLEW_FUN_EXPORT PFNGLGETPATHCOLORGENFVNVPROC __glewGetPathColorGenfvNV; -GLEW_FUN_EXPORT PFNGLGETPATHCOLORGENIVNVPROC __glewGetPathColorGenivNV; -GLEW_FUN_EXPORT PFNGLGETPATHCOMMANDSNVPROC __glewGetPathCommandsNV; -GLEW_FUN_EXPORT PFNGLGETPATHCOORDSNVPROC __glewGetPathCoordsNV; -GLEW_FUN_EXPORT PFNGLGETPATHDASHARRAYNVPROC __glewGetPathDashArrayNV; -GLEW_FUN_EXPORT PFNGLGETPATHLENGTHNVPROC __glewGetPathLengthNV; -GLEW_FUN_EXPORT PFNGLGETPATHMETRICRANGENVPROC __glewGetPathMetricRangeNV; -GLEW_FUN_EXPORT PFNGLGETPATHMETRICSNVPROC __glewGetPathMetricsNV; -GLEW_FUN_EXPORT PFNGLGETPATHPARAMETERFVNVPROC __glewGetPathParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETPATHPARAMETERIVNVPROC __glewGetPathParameterivNV; -GLEW_FUN_EXPORT PFNGLGETPATHSPACINGNVPROC __glewGetPathSpacingNV; -GLEW_FUN_EXPORT PFNGLGETPATHTEXGENFVNVPROC __glewGetPathTexGenfvNV; -GLEW_FUN_EXPORT PFNGLGETPATHTEXGENIVNVPROC __glewGetPathTexGenivNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEFVNVPROC __glewGetProgramResourcefvNV; -GLEW_FUN_EXPORT PFNGLINTERPOLATEPATHSNVPROC __glewInterpolatePathsNV; -GLEW_FUN_EXPORT PFNGLISPATHNVPROC __glewIsPathNV; -GLEW_FUN_EXPORT PFNGLISPOINTINFILLPATHNVPROC __glewIsPointInFillPathNV; -GLEW_FUN_EXPORT PFNGLISPOINTINSTROKEPATHNVPROC __glewIsPointInStrokePathNV; -GLEW_FUN_EXPORT PFNGLMATRIXLOAD3X2FNVPROC __glewMatrixLoad3x2fNV; -GLEW_FUN_EXPORT PFNGLMATRIXLOAD3X3FNVPROC __glewMatrixLoad3x3fNV; -GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC __glewMatrixLoadTranspose3x3fNV; -GLEW_FUN_EXPORT PFNGLMATRIXMULT3X2FNVPROC __glewMatrixMult3x2fNV; -GLEW_FUN_EXPORT PFNGLMATRIXMULT3X3FNVPROC __glewMatrixMult3x3fNV; -GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC __glewMatrixMultTranspose3x3fNV; -GLEW_FUN_EXPORT PFNGLPATHCOLORGENNVPROC __glewPathColorGenNV; -GLEW_FUN_EXPORT PFNGLPATHCOMMANDSNVPROC __glewPathCommandsNV; -GLEW_FUN_EXPORT PFNGLPATHCOORDSNVPROC __glewPathCoordsNV; -GLEW_FUN_EXPORT PFNGLPATHCOVERDEPTHFUNCNVPROC __glewPathCoverDepthFuncNV; -GLEW_FUN_EXPORT PFNGLPATHDASHARRAYNVPROC __glewPathDashArrayNV; -GLEW_FUN_EXPORT PFNGLPATHFOGGENNVPROC __glewPathFogGenNV; -GLEW_FUN_EXPORT PFNGLPATHGLYPHINDEXARRAYNVPROC __glewPathGlyphIndexArrayNV; -GLEW_FUN_EXPORT PFNGLPATHGLYPHINDEXRANGENVPROC __glewPathGlyphIndexRangeNV; -GLEW_FUN_EXPORT PFNGLPATHGLYPHRANGENVPROC __glewPathGlyphRangeNV; -GLEW_FUN_EXPORT PFNGLPATHGLYPHSNVPROC __glewPathGlyphsNV; -GLEW_FUN_EXPORT PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC __glewPathMemoryGlyphIndexArrayNV; -GLEW_FUN_EXPORT PFNGLPATHPARAMETERFNVPROC __glewPathParameterfNV; -GLEW_FUN_EXPORT PFNGLPATHPARAMETERFVNVPROC __glewPathParameterfvNV; -GLEW_FUN_EXPORT PFNGLPATHPARAMETERINVPROC __glewPathParameteriNV; -GLEW_FUN_EXPORT PFNGLPATHPARAMETERIVNVPROC __glewPathParameterivNV; -GLEW_FUN_EXPORT PFNGLPATHSTENCILDEPTHOFFSETNVPROC __glewPathStencilDepthOffsetNV; -GLEW_FUN_EXPORT PFNGLPATHSTENCILFUNCNVPROC __glewPathStencilFuncNV; -GLEW_FUN_EXPORT PFNGLPATHSTRINGNVPROC __glewPathStringNV; -GLEW_FUN_EXPORT PFNGLPATHSUBCOMMANDSNVPROC __glewPathSubCommandsNV; -GLEW_FUN_EXPORT PFNGLPATHSUBCOORDSNVPROC __glewPathSubCoordsNV; -GLEW_FUN_EXPORT PFNGLPATHTEXGENNVPROC __glewPathTexGenNV; -GLEW_FUN_EXPORT PFNGLPOINTALONGPATHNVPROC __glewPointAlongPathNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC __glewProgramPathFragmentInputGenNV; -GLEW_FUN_EXPORT PFNGLSTENCILFILLPATHINSTANCEDNVPROC __glewStencilFillPathInstancedNV; -GLEW_FUN_EXPORT PFNGLSTENCILFILLPATHNVPROC __glewStencilFillPathNV; -GLEW_FUN_EXPORT PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC __glewStencilStrokePathInstancedNV; -GLEW_FUN_EXPORT PFNGLSTENCILSTROKEPATHNVPROC __glewStencilStrokePathNV; -GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC __glewStencilThenCoverFillPathInstancedNV; -GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERFILLPATHNVPROC __glewStencilThenCoverFillPathNV; -GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC __glewStencilThenCoverStrokePathInstancedNV; -GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC __glewStencilThenCoverStrokePathNV; -GLEW_FUN_EXPORT PFNGLTRANSFORMPATHNVPROC __glewTransformPathNV; -GLEW_FUN_EXPORT PFNGLWEIGHTPATHSNVPROC __glewWeightPathsNV; - -GLEW_FUN_EXPORT PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV; -GLEW_FUN_EXPORT PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV; - -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV; - -GLEW_FUN_EXPORT PFNGLGETVIDEOI64VNVPROC __glewGetVideoi64vNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOIVNVPROC __glewGetVideoivNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOUI64VNVPROC __glewGetVideoui64vNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV; -GLEW_FUN_EXPORT PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV; -GLEW_FUN_EXPORT PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV; - -GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV; -GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV; - -GLEW_FUN_EXPORT PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV; -GLEW_FUN_EXPORT PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV; -GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV; -GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV; -GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV; -GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV; -GLEW_FUN_EXPORT PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV; -GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV; - -GLEW_FUN_EXPORT PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewFramebufferSampleLocationsfvNV; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewNamedFramebufferSampleLocationsfvNV; - -GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERUI64VNVPROC __glewGetBufferParameterui64vNV; -GLEW_FUN_EXPORT PFNGLGETINTEGERUI64VNVPROC __glewGetIntegerui64vNV; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC __glewGetNamedBufferParameterui64vNV; -GLEW_FUN_EXPORT PFNGLISBUFFERRESIDENTNVPROC __glewIsBufferResidentNV; -GLEW_FUN_EXPORT PFNGLISNAMEDBUFFERRESIDENTNVPROC __glewIsNamedBufferResidentNV; -GLEW_FUN_EXPORT PFNGLMAKEBUFFERNONRESIDENTNVPROC __glewMakeBufferNonResidentNV; -GLEW_FUN_EXPORT PFNGLMAKEBUFFERRESIDENTNVPROC __glewMakeBufferResidentNV; -GLEW_FUN_EXPORT PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC __glewMakeNamedBufferNonResidentNV; -GLEW_FUN_EXPORT PFNGLMAKENAMEDBUFFERRESIDENTNVPROC __glewMakeNamedBufferResidentNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMUI64NVPROC __glewProgramUniformui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMUI64VNVPROC __glewProgramUniformui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORMUI64NVPROC __glewUniformui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORMUI64VNVPROC __glewUniformui64vNV; - -GLEW_FUN_EXPORT PFNGLTEXTUREBARRIERNVPROC __glewTextureBarrierNV; - -GLEW_FUN_EXPORT PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTexImage2DMultisampleCoverageNV; -GLEW_FUN_EXPORT PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTexImage3DMultisampleCoverageNV; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTextureImage2DMultisampleCoverageNV; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC __glewTextureImage2DMultisampleNV; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTextureImage3DMultisampleCoverageNV; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC __glewTextureImage3DMultisampleNV; - -GLEW_FUN_EXPORT PFNGLACTIVEVARYINGNVPROC __glewActiveVaryingNV; -GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKNVPROC __glewBeginTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLBINDBUFFERBASENVPROC __glewBindBufferBaseNV; -GLEW_FUN_EXPORT PFNGLBINDBUFFEROFFSETNVPROC __glewBindBufferOffsetNV; -GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGENVPROC __glewBindBufferRangeNV; -GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKNVPROC __glewEndTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLGETACTIVEVARYINGNVPROC __glewGetActiveVaryingNV; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC __glewGetTransformFeedbackVaryingNV; -GLEW_FUN_EXPORT PFNGLGETVARYINGLOCATIONNVPROC __glewGetVaryingLocationNV; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC __glewTransformFeedbackAttribsNV; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC __glewTransformFeedbackVaryingsNV; - -GLEW_FUN_EXPORT PFNGLBINDTRANSFORMFEEDBACKNVPROC __glewBindTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLDELETETRANSFORMFEEDBACKSNVPROC __glewDeleteTransformFeedbacksNV; -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKNVPROC __glewDrawTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLGENTRANSFORMFEEDBACKSNVPROC __glewGenTransformFeedbacksNV; -GLEW_FUN_EXPORT PFNGLISTRANSFORMFEEDBACKNVPROC __glewIsTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLPAUSETRANSFORMFEEDBACKNVPROC __glewPauseTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLRESUMETRANSFORMFEEDBACKNVPROC __glewResumeTransformFeedbackNV; - -GLEW_FUN_EXPORT PFNGLVDPAUFININVPROC __glewVDPAUFiniNV; -GLEW_FUN_EXPORT PFNGLVDPAUGETSURFACEIVNVPROC __glewVDPAUGetSurfaceivNV; -GLEW_FUN_EXPORT PFNGLVDPAUINITNVPROC __glewVDPAUInitNV; -GLEW_FUN_EXPORT PFNGLVDPAUISSURFACENVPROC __glewVDPAUIsSurfaceNV; -GLEW_FUN_EXPORT PFNGLVDPAUMAPSURFACESNVPROC __glewVDPAUMapSurfacesNV; -GLEW_FUN_EXPORT PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC __glewVDPAURegisterOutputSurfaceNV; -GLEW_FUN_EXPORT PFNGLVDPAUREGISTERVIDEOSURFACENVPROC __glewVDPAURegisterVideoSurfaceNV; -GLEW_FUN_EXPORT PFNGLVDPAUSURFACEACCESSNVPROC __glewVDPAUSurfaceAccessNV; -GLEW_FUN_EXPORT PFNGLVDPAUUNMAPSURFACESNVPROC __glewVDPAUUnmapSurfacesNV; -GLEW_FUN_EXPORT PFNGLVDPAUUNREGISTERSURFACENVPROC __glewVDPAUUnregisterSurfaceNV; - -GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV; - -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLI64VNVPROC __glewGetVertexAttribLi64vNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLUI64VNVPROC __glewGetVertexAttribLui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1I64NVPROC __glewVertexAttribL1i64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1I64VNVPROC __glewVertexAttribL1i64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64NVPROC __glewVertexAttribL1ui64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64VNVPROC __glewVertexAttribL1ui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2I64NVPROC __glewVertexAttribL2i64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2I64VNVPROC __glewVertexAttribL2i64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2UI64NVPROC __glewVertexAttribL2ui64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2UI64VNVPROC __glewVertexAttribL2ui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3I64NVPROC __glewVertexAttribL3i64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3I64VNVPROC __glewVertexAttribL3i64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3UI64NVPROC __glewVertexAttribL3ui64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3UI64VNVPROC __glewVertexAttribL3ui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4I64NVPROC __glewVertexAttribL4i64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4I64VNVPROC __glewVertexAttribL4i64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4UI64NVPROC __glewVertexAttribL4ui64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4UI64VNVPROC __glewVertexAttribL4ui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLFORMATNVPROC __glewVertexAttribLFormatNV; - -GLEW_FUN_EXPORT PFNGLBUFFERADDRESSRANGENVPROC __glewBufferAddressRangeNV; -GLEW_FUN_EXPORT PFNGLCOLORFORMATNVPROC __glewColorFormatNV; -GLEW_FUN_EXPORT PFNGLEDGEFLAGFORMATNVPROC __glewEdgeFlagFormatNV; -GLEW_FUN_EXPORT PFNGLFOGCOORDFORMATNVPROC __glewFogCoordFormatNV; -GLEW_FUN_EXPORT PFNGLGETINTEGERUI64I_VNVPROC __glewGetIntegerui64i_vNV; -GLEW_FUN_EXPORT PFNGLINDEXFORMATNVPROC __glewIndexFormatNV; -GLEW_FUN_EXPORT PFNGLNORMALFORMATNVPROC __glewNormalFormatNV; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORFORMATNVPROC __glewSecondaryColorFormatNV; -GLEW_FUN_EXPORT PFNGLTEXCOORDFORMATNVPROC __glewTexCoordFormatNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBFORMATNVPROC __glewVertexAttribFormatNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIFORMATNVPROC __glewVertexAttribIFormatNV; -GLEW_FUN_EXPORT PFNGLVERTEXFORMATNVPROC __glewVertexFormatNV; - -GLEW_FUN_EXPORT PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV; -GLEW_FUN_EXPORT PFNGLBINDPROGRAMNVPROC __glewBindProgramNV; -GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV; -GLEW_FUN_EXPORT PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV; -GLEW_FUN_EXPORT PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV; -GLEW_FUN_EXPORT PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV; -GLEW_FUN_EXPORT PFNGLISPROGRAMNVPROC __glewIsProgramNV; -GLEW_FUN_EXPORT PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV; -GLEW_FUN_EXPORT PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV; -GLEW_FUN_EXPORT PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV; - -GLEW_FUN_EXPORT PFNGLBEGINVIDEOCAPTURENVPROC __glewBeginVideoCaptureNV; -GLEW_FUN_EXPORT PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC __glewBindVideoCaptureStreamBufferNV; -GLEW_FUN_EXPORT PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC __glewBindVideoCaptureStreamTextureNV; -GLEW_FUN_EXPORT PFNGLENDVIDEOCAPTURENVPROC __glewEndVideoCaptureNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMDVNVPROC __glewGetVideoCaptureStreamdvNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMFVNVPROC __glewGetVideoCaptureStreamfvNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMIVNVPROC __glewGetVideoCaptureStreamivNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTUREIVNVPROC __glewGetVideoCaptureivNV; -GLEW_FUN_EXPORT PFNGLVIDEOCAPTURENVPROC __glewVideoCaptureNV; -GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC __glewVideoCaptureStreamParameterdvNV; -GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC __glewVideoCaptureStreamParameterfvNV; -GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC __glewVideoCaptureStreamParameterivNV; - -GLEW_FUN_EXPORT PFNGLVIEWPORTSWIZZLENVPROC __glewViewportSwizzleNV; - -GLEW_FUN_EXPORT PFNGLCLEARDEPTHFOESPROC __glewClearDepthfOES; -GLEW_FUN_EXPORT PFNGLCLIPPLANEFOESPROC __glewClipPlanefOES; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEFOESPROC __glewDepthRangefOES; -GLEW_FUN_EXPORT PFNGLFRUSTUMFOESPROC __glewFrustumfOES; -GLEW_FUN_EXPORT PFNGLGETCLIPPLANEFOESPROC __glewGetClipPlanefOES; -GLEW_FUN_EXPORT PFNGLORTHOFOESPROC __glewOrthofOES; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC __glewFramebufferTextureMultiviewOVR; - -GLEW_FUN_EXPORT PFNGLALPHAFUNCXPROC __glewAlphaFuncx; -GLEW_FUN_EXPORT PFNGLCLEARCOLORXPROC __glewClearColorx; -GLEW_FUN_EXPORT PFNGLCLEARDEPTHXPROC __glewClearDepthx; -GLEW_FUN_EXPORT PFNGLCOLOR4XPROC __glewColor4x; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEXPROC __glewDepthRangex; -GLEW_FUN_EXPORT PFNGLFOGXPROC __glewFogx; -GLEW_FUN_EXPORT PFNGLFOGXVPROC __glewFogxv; -GLEW_FUN_EXPORT PFNGLFRUSTUMFPROC __glewFrustumf; -GLEW_FUN_EXPORT PFNGLFRUSTUMXPROC __glewFrustumx; -GLEW_FUN_EXPORT PFNGLLIGHTMODELXPROC __glewLightModelx; -GLEW_FUN_EXPORT PFNGLLIGHTMODELXVPROC __glewLightModelxv; -GLEW_FUN_EXPORT PFNGLLIGHTXPROC __glewLightx; -GLEW_FUN_EXPORT PFNGLLIGHTXVPROC __glewLightxv; -GLEW_FUN_EXPORT PFNGLLINEWIDTHXPROC __glewLineWidthx; -GLEW_FUN_EXPORT PFNGLLOADMATRIXXPROC __glewLoadMatrixx; -GLEW_FUN_EXPORT PFNGLMATERIALXPROC __glewMaterialx; -GLEW_FUN_EXPORT PFNGLMATERIALXVPROC __glewMaterialxv; -GLEW_FUN_EXPORT PFNGLMULTMATRIXXPROC __glewMultMatrixx; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4XPROC __glewMultiTexCoord4x; -GLEW_FUN_EXPORT PFNGLNORMAL3XPROC __glewNormal3x; -GLEW_FUN_EXPORT PFNGLORTHOFPROC __glewOrthof; -GLEW_FUN_EXPORT PFNGLORTHOXPROC __glewOrthox; -GLEW_FUN_EXPORT PFNGLPOINTSIZEXPROC __glewPointSizex; -GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETXPROC __glewPolygonOffsetx; -GLEW_FUN_EXPORT PFNGLROTATEXPROC __glewRotatex; -GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEXPROC __glewSampleCoveragex; -GLEW_FUN_EXPORT PFNGLSCALEXPROC __glewScalex; -GLEW_FUN_EXPORT PFNGLTEXENVXPROC __glewTexEnvx; -GLEW_FUN_EXPORT PFNGLTEXENVXVPROC __glewTexEnvxv; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERXPROC __glewTexParameterx; -GLEW_FUN_EXPORT PFNGLTRANSLATEXPROC __glewTranslatex; - -GLEW_FUN_EXPORT PFNGLCLIPPLANEFPROC __glewClipPlanef; -GLEW_FUN_EXPORT PFNGLCLIPPLANEXPROC __glewClipPlanex; -GLEW_FUN_EXPORT PFNGLGETCLIPPLANEFPROC __glewGetClipPlanef; -GLEW_FUN_EXPORT PFNGLGETCLIPPLANEXPROC __glewGetClipPlanex; -GLEW_FUN_EXPORT PFNGLGETFIXEDVPROC __glewGetFixedv; -GLEW_FUN_EXPORT PFNGLGETLIGHTXVPROC __glewGetLightxv; -GLEW_FUN_EXPORT PFNGLGETMATERIALXVPROC __glewGetMaterialxv; -GLEW_FUN_EXPORT PFNGLGETTEXENVXVPROC __glewGetTexEnvxv; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERXVPROC __glewGetTexParameterxv; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERXPROC __glewPointParameterx; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERXVPROC __glewPointParameterxv; -GLEW_FUN_EXPORT PFNGLPOINTSIZEPOINTEROESPROC __glewPointSizePointerOES; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERXVPROC __glewTexParameterxv; - -GLEW_FUN_EXPORT PFNGLERRORSTRINGREGALPROC __glewErrorStringREGAL; - -GLEW_FUN_EXPORT PFNGLGETEXTENSIONREGALPROC __glewGetExtensionREGAL; -GLEW_FUN_EXPORT PFNGLISSUPPORTEDREGALPROC __glewIsSupportedREGAL; - -GLEW_FUN_EXPORT PFNGLLOGMESSAGECALLBACKREGALPROC __glewLogMessageCallbackREGAL; - -GLEW_FUN_EXPORT PFNGLGETPROCADDRESSREGALPROC __glewGetProcAddressREGAL; - -GLEW_FUN_EXPORT PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS; -GLEW_FUN_EXPORT PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS; - -GLEW_FUN_EXPORT PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS; -GLEW_FUN_EXPORT PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS; - -GLEW_FUN_EXPORT PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS; -GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS; - -GLEW_FUN_EXPORT PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS; -GLEW_FUN_EXPORT PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS; - -GLEW_FUN_EXPORT PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS; -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS; - -GLEW_FUN_EXPORT PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS; -GLEW_FUN_EXPORT PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS; - -GLEW_FUN_EXPORT PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX; -GLEW_FUN_EXPORT PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX; -GLEW_FUN_EXPORT PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX; -GLEW_FUN_EXPORT PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX; -GLEW_FUN_EXPORT PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX; -GLEW_FUN_EXPORT PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX; - -GLEW_FUN_EXPORT PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX; - -GLEW_FUN_EXPORT PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX; - -GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX; - -GLEW_FUN_EXPORT PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX; - -GLEW_FUN_EXPORT PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX; - -GLEW_FUN_EXPORT PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX; - -GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX; -GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX; -GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX; -GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX; - -GLEW_FUN_EXPORT PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX; - -GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI; -GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI; -GLEW_FUN_EXPORT PFNGLCOLORTABLESGIPROC __glewColorTableSGI; -GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI; - -GLEW_FUN_EXPORT PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX; - -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN; - -GLEW_FUN_EXPORT PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN; - -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN; - -GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN; - -GLEW_FUN_EXPORT PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_3; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_4; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_5; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_2_0; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_2_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_0; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_2; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_3; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_0; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_2; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_3; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_4; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_5; -GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_tbuffer; -GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_texture_compression_FXT1; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_blend_minmax_factor; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_conservative_depth; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_debug_output; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_depth_clamp_separate; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_draw_buffers_blend; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_gcn_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_gpu_shader_int64; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_interleaved_elements; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_multi_draw_indirect; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_name_gen_delete; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_occlusion_query_event; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_performance_monitor; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_pinned_memory; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_query_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_sample_positions; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_seamless_cubemap_per_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_atomic_counter_ops; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_explicit_vertex_parameter; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_stencil_export; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_stencil_value_export; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_trinary_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_sparse_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_stencil_operation_extended; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_texture_texture4; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_transform_feedback3_lines_triangles; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_transform_feedback4; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_layer; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_tessellator; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_viewport_index; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_depth_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_framebuffer_blit; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_framebuffer_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_instanced_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_pack_reverse_row_order; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_program_binary; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_compression_dxt1; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_compression_dxt3; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_compression_dxt5; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_usage; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_timer_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_translated_shader_source; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_aux_depth_stencil; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_client_storage; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_element_array; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_fence; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_float_pixels; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_flush_buffer_range; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_object_purgeable; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_pixel_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_rgb_422; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_row_bytes; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_specular_vector; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_texture_range; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_transform_hint; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_object; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_range; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_program_evaluators; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_ycbcr_422; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES2_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_1_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_2_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_arrays_of_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_base_instance; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_bindless_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_blend_func_extended; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_buffer_storage; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_cl_event; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clear_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clear_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clip_control; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_color_buffer_float; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compressed_texture_pixel_storage; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compute_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compute_variable_group_size; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_conditional_render_inverted; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_conservative_depth; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_copy_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_copy_image; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_cull_distance; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_debug_output; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_buffer_float; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_derivative_control; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_direct_state_access; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_buffers; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_buffers_blend; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_elements_base_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_indirect; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_instanced; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_enhanced_layouts; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_explicit_attrib_location; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_explicit_uniform_location; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_coord_conventions; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_layer_viewport; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program_shadow; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_shader_interlock; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_no_attachments; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_sRGB; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_geometry_shader4; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_get_program_binary; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_get_texture_sub_image; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gl_spirv; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader5; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader_fp64; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader_int64; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_half_float_pixel; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_half_float_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_imaging; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_indirect_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_instanced_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_internalformat_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_internalformat_query2; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_invalidate_subdata; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_map_buffer_alignment; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_map_buffer_range; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_matrix_palette; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multi_bind; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multi_draw_indirect; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multitexture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_occlusion_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_occlusion_query2; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_parallel_shader_compile; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_pipeline_statistics_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_pixel_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_sprite; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_post_depth_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_program_interface_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_provoking_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_query_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robust_buffer_access_behavior; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness_application_isolation; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness_share_group_isolation; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sample_locations; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sample_shading; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sampler_objects; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_seamless_cube_map; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_seamless_cubemap_per_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_separate_shader_objects; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_atomic_counter_ops; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_atomic_counters; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_ballot; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_bit_encoding; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_clock; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_draw_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_group_vote; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_image_load_store; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_image_size; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_objects; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_precision; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_stencil_export; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_storage_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_subroutine; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_texture_image_samples; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_texture_lod; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_viewport_layer_array; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_100; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_420pack; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_include; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_packing; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow_ambient; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_texture2; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_texture_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_stencil_texturing; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sync; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_tessellation_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_barrier; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_border_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_object_rgb32; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_range; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression_bptc; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression_rgtc; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_cube_map; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_cube_map_array; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_add; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_combine; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_crossbar; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_dot3; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_filter_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_float; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_gather; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_mirror_clamp_to_edge; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_mirrored_repeat; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_non_power_of_two; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_query_levels; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_query_lod; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rectangle; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rg; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rgb10_a2ui; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_stencil8; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_storage; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_storage_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_swizzle; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_view; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_timer_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback2; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback3; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback_instanced; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback_overflow_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transpose_matrix; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_uniform_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_array_bgra; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_array_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_attrib_64bit; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_attrib_binding; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_blend; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_program; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_type_10f_11f_11f_rev; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_type_2_10_10_10_rev; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_viewport_array; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_window_pos; -GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_point_sprites; -GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_combine3; -GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_route; -GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_vertex_shader_output_point_size; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_draw_buffers; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_element_array; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_envmap_bumpmap; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_fragment_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_map_object_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_meminfo; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_pn_triangles; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_separate_stencil; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_shader_texture_lod; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_text_fragment_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_compression_3dc; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_env_combine3; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_float; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_mirror_once; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_array_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_attrib_array_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_streams; -GLEW_VAR_EXPORT GLboolean __GLEW_EGL_NV_robustness_video_memory_purge; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_422_pixels; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_Cg_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_abgr; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_bgra; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_bindable_uniform; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_color; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_equation_separate; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_func_separate; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_logic_op; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_subtract; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_clip_volume_hint; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cmyka; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_color_subtable; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_compiled_vertex_array; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_convolution; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_coordinate_frame; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_copy_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cull_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_label; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_marker; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_depth_bounds_test; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_direct_state_access; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_buffers2; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_instanced; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_range_elements; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fog_coord; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fragment_lighting; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_blit; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_multisample_blit_scaled; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_sRGB; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_geometry_shader4; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_gpu_program_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_gpu_shader4; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_histogram; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_array_formats; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_func; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_material; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_light_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_misc_attribute; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multi_draw_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_depth_stencil; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_float; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_pixels; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_paletted_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform_color_table; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_point_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_polygon_offset; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_polygon_offset_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_post_depth_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_provoking_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_raster_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_rescale_normal; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_scene_marker; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_secondary_color; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_shader_objects; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_specular_color; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_formatted; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_store; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_integer_mix; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shadow_funcs; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shared_texture_palette; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_sparse_texture2; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_clear_tag; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_two_side; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_wrap; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_subtexture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture3D; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_array; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_dxt1; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_latc; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_rgtc; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_s3tc; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_cube_map; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_edge_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_add; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_combine; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_dot3; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_filter_anisotropic; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_filter_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_integer; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_lod_bias; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_mirror_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_object; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_perturb_normal; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_rectangle; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB_decode; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_shared_exponent; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_snorm; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_swizzle; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_timer_query; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_transform_feedback; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array_bgra; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_attrib_64bit; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_weighting; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_window_rectangles; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_x11_sync_object; -GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_frame_terminator; -GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_string_marker; -GLEW_VAR_EXPORT GLboolean __GLEW_HP_convolution_border_modes; -GLEW_VAR_EXPORT GLboolean __GLEW_HP_image_transform; -GLEW_VAR_EXPORT GLboolean __GLEW_HP_occlusion_test; -GLEW_VAR_EXPORT GLboolean __GLEW_HP_texture_lighting; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_cull_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_multimode_draw_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_rasterpos_clip; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_static_data; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_texture_mirrored_repeat; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_vertex_array_lists; -GLEW_VAR_EXPORT GLboolean __GLEW_INGR_color_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_INGR_interlace_read; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_conservative_rasterization; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_fragment_shader_ordering; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_framebuffer_CMAA; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_map_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_parallel_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_performance_query; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_texture_scissor; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_blend_equation_advanced; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_blend_equation_advanced_coherent; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_context_flush_control; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_debug; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_no_error; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_robust_buffer_access_behavior; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_robustness; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_hdr; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_ldr; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_sliced_3d; -GLEW_VAR_EXPORT GLboolean __GLEW_KTX_buffer_region; -GLEW_VAR_EXPORT GLboolean __GLEW_MESAX_texture_stack; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_pack_invert; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_resize_buffers; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_shader_integer_functions; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_window_pos; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_ycbcr_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_NVX_blend_equation_advanced_multi_draw_buffers; -GLEW_VAR_EXPORT GLboolean __GLEW_NVX_conditional_render; -GLEW_VAR_EXPORT GLboolean __GLEW_NVX_gpu_memory_info; -GLEW_VAR_EXPORT GLboolean __GLEW_NVX_linked_gpu_multicast; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_multi_draw_indirect; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_multi_draw_indirect_count; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_equation_advanced; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_equation_advanced_coherent; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_square; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_clip_space_w_scaling; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_command_list; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_compute_program5; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_conditional_render; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_conservative_raster; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_conservative_raster_dilate; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_conservative_raster_pre_snap_triangles; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_depth_to_color; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_image; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_deep_texture3D; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_buffer_float; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_range_unclamped; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_draw_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_draw_vulkan_image; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_evaluators; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_explicit_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fence; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fill_rectangle; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_float_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fog_distance; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_coverage_to_color; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program_option; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_shader_interlock; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_framebuffer_mixed_samples; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_framebuffer_multisample_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_program4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_shader4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_shader_passthrough; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_multicast; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program5; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program5_mem_extended; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program_fp64; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_shader5; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_half_float; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_internalformat_sample_query; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_light_max_exponent; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_multisample_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_multisample_filter_hint; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_occlusion_query; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_packed_depth_stencil; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_parameter_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_parameter_buffer_object2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_path_rendering; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_path_rendering_shared_edge; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_pixel_data_range; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_point_sprite; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_present_video; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_primitive_restart; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_robustness_video_memory_purge; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_sample_locations; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_sample_mask_override_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_counters; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_float; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_float64; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_fp16_vector; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_int64; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_buffer_load; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_storage_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_thread_group; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_thread_shuffle; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_stereo_view_rendering; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_tessellation_program5; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_emboss; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_reflection; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_barrier; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_compression_vtc; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_env_combine4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_expand_normal; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_rectangle; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader3; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_transform_feedback; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_transform_feedback2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_uniform_buffer_unified_memory; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vdpau_interop; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_attrib_integer_64bit; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_buffer_unified_memory; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program1_1; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2_option; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program3; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_video_capture; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_viewport_array2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_viewport_swizzle; -GLEW_VAR_EXPORT GLboolean __GLEW_OES_byte_coordinates; -GLEW_VAR_EXPORT GLboolean __GLEW_OES_compressed_paletted_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_OES_read_format; -GLEW_VAR_EXPORT GLboolean __GLEW_OES_single_precision; -GLEW_VAR_EXPORT GLboolean __GLEW_OML_interlace; -GLEW_VAR_EXPORT GLboolean __GLEW_OML_resample; -GLEW_VAR_EXPORT GLboolean __GLEW_OML_subsample; -GLEW_VAR_EXPORT GLboolean __GLEW_OVR_multiview; -GLEW_VAR_EXPORT GLboolean __GLEW_OVR_multiview2; -GLEW_VAR_EXPORT GLboolean __GLEW_PGI_misc_hints; -GLEW_VAR_EXPORT GLboolean __GLEW_PGI_vertex_hints; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_ES1_0_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_ES1_1_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_enable; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_error_string; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_extension_query; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_log; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_proc_address; -GLEW_VAR_EXPORT GLboolean __GLEW_REND_screen_coordinates; -GLEW_VAR_EXPORT GLboolean __GLEW_S3_s3tc; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_color_range; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_detail_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_fog_function; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_generate_mipmap; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_pixel_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_point_line_texgen; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_sharpen_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture4D; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_border_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_edge_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_filter4; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_lod; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_select; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_histogram; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_pixel; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_blend_alpha_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_clipmap; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_convolution_accuracy; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_depth_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_flush_raster; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_offset; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fragment_specular_lighting; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_framezoom; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_interlace; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ir_instrument1; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_list_priority; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture_bits; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_reference_plane; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_resample; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow_ambient; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_sprite; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_tag_sample_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_add_env; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_coordinate_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_lod_bias; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_multi_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_range; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_scale_bias; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip_hint; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ycrcb; -GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_matrix; -GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_table; -GLEW_VAR_EXPORT GLboolean __GLEW_SGI_texture_color_table; -GLEW_VAR_EXPORT GLboolean __GLEW_SUNX_constant_data; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_convolution_border_modes; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_global_alpha; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_mesh_array; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_read_video_pixels; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_slice_accum; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_triangle_list; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_WIN_phong_shading; -GLEW_VAR_EXPORT GLboolean __GLEW_WIN_specular_fog; -GLEW_VAR_EXPORT GLboolean __GLEW_WIN_swap_hint; -/* ------------------------------------------------------------------------- */ - -/* error codes */ -#define GLEW_OK 0 -#define GLEW_NO_ERROR 0 -#define GLEW_ERROR_NO_GL_VERSION 1 /* missing GL version */ -#define GLEW_ERROR_GL_VERSION_10_ONLY 2 /* Need at least OpenGL 1.1 */ -#define GLEW_ERROR_GLX_VERSION_11_ONLY 3 /* Need at least GLX 1.2 */ - -/* string codes */ -#define GLEW_VERSION 1 -#define GLEW_VERSION_MAJOR 2 -#define GLEW_VERSION_MINOR 3 -#define GLEW_VERSION_MICRO 4 - -/* ------------------------------------------------------------------------- */ - -/* GLEW version info */ - -/* -VERSION 2.0.0 -VERSION_MAJOR 2 -VERSION_MINOR 0 -VERSION_MICRO 0 -*/ - -/* API */ -GLEWAPI GLenum GLEWAPIENTRY glewInit (void); -GLEWAPI GLboolean GLEWAPIENTRY glewIsSupported (const char *name); -#define glewIsExtensionSupported(x) glewIsSupported(x) - -#ifndef GLEW_GET_VAR -#define GLEW_GET_VAR(x) (*(const GLboolean*)&x) -#endif - -#ifndef GLEW_GET_FUN -#define GLEW_GET_FUN(x) x -#endif - -GLEWAPI GLboolean glewExperimental; -GLEWAPI GLboolean GLEWAPIENTRY glewGetExtension (const char *name); -GLEWAPI const GLubyte * GLEWAPIENTRY glewGetErrorString (GLenum error); -GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name); - -#ifdef __cplusplus -} -#endif - -#ifdef GLEW_APIENTRY_DEFINED -#undef GLEW_APIENTRY_DEFINED -#undef APIENTRY -#endif - -#ifdef GLEW_CALLBACK_DEFINED -#undef GLEW_CALLBACK_DEFINED -#undef CALLBACK -#endif - -#ifdef GLEW_WINGDIAPI_DEFINED -#undef GLEW_WINGDIAPI_DEFINED -#undef WINGDIAPI -#endif - -#undef GLAPI -/* #undef GLEWAPI */ - -#endif /* __glew_h__ */ diff --git a/opengl/glew32.lib b/opengl/glew32.lib deleted file mode 100644 index 24793a72a5f7573aa111aca87058ebf67f53f448..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631602 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

Z!Q2s@ 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%0A(z6*bJq9Vmn3!x?&#Awc#8kRpm!qYex$ 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 diff --git a/opengl/glext.h b/opengl/glext.h deleted file mode 100644 index 7bb8e6e7..00000000 --- a/opengl/glext.h +++ /dev/null @@ -1,6495 +0,0 @@ -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** License Applicability. Except to the extent portions of this file are -** made subject to an alternative license as permitted in the SGI Free -** Software License B, Version 1.1 (the "License"), the contents of this -** file are subject only to the provisions of the License. You may not use -** this file except in compliance with the License. You may obtain a copy -** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** -** http://oss.sgi.com/projects/FreeB -** -** Note that, as provided in the License, the Software is distributed on an -** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** -** Original Code. The Original Code is: OpenGL Sample Implementation, -** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc. -** Copyright in any portions created by third parties is as indicated -** elsewhere herein. All Rights Reserved. -** -** Additional Notice Provisions: This software was created using the -** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has -** not been independently verified as being compliant with the OpenGL(R) -** version 1.2.1 Specification. -*/ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif - -/*************************************************************/ - -/* Header file version number, required by OpenGL ABI for Linux */ -/* glext.h last updated 2005/06/20 */ -/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */ -#define GL_GLEXT_VERSION 29 - -#ifndef GL_VERSION_1_2 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_RESCALE_NORMAL 0x803A -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#endif - -#ifndef GL_ARB_imaging -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CONSTANT_BORDER 0x8151 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 -#endif - -#ifndef GL_VERSION_1_3 -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_MULTISAMPLE_BIT 0x20000000 -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_CLAMP_TO_BORDER 0x812D -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_SUBTRACT 0x84E7 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#endif - -#ifndef GL_VERSION_1_4 -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#define GL_COMPARE_R_TO_TEXTURE 0x884E -#endif - -#ifndef GL_VERSION_1_5 -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 -#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE -#define GL_FOG_COORD GL_FOG_COORDINATE -#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE -#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE -#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE -#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER -#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING -#define GL_SRC0_RGB GL_SOURCE0_RGB -#define GL_SRC1_RGB GL_SOURCE1_RGB -#define GL_SRC2_RGB GL_SOURCE2_RGB -#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA -#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA -#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA -#endif - -#ifndef GL_VERSION_2_0 -#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_COORDS 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif - -#ifndef GL_ARB_multisample -#define GL_MULTISAMPLE_ARB 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F -#define GL_SAMPLE_COVERAGE_ARB 0x80A0 -#define GL_SAMPLE_BUFFERS_ARB 0x80A8 -#define GL_SAMPLES_ARB 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB -#define GL_MULTISAMPLE_BIT_ARB 0x20000000 -#endif - -#ifndef GL_ARB_texture_env_add -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_NORMAL_MAP_ARB 0x8511 -#define GL_REFLECTION_MAP_ARB 0x8512 -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C -#endif - -#ifndef GL_ARB_texture_compression -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 -#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB -#define GL_COMPRESSED_INTENSITY_ARB 0x84EC -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 -#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_CLAMP_TO_BORDER_ARB 0x812D -#endif - -#ifndef GL_ARB_point_parameters -#define GL_POINT_SIZE_MIN_ARB 0x8126 -#define GL_POINT_SIZE_MAX_ARB 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 -#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 -#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 -#define GL_VERTEX_BLEND_ARB 0x86A7 -#define GL_CURRENT_WEIGHT_ARB 0x86A8 -#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 -#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA -#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB -#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC -#define GL_WEIGHT_ARRAY_ARB 0x86AD -#define GL_MODELVIEW0_ARB 0x1700 -#define GL_MODELVIEW1_ARB 0x850A -#define GL_MODELVIEW2_ARB 0x8722 -#define GL_MODELVIEW3_ARB 0x8723 -#define GL_MODELVIEW4_ARB 0x8724 -#define GL_MODELVIEW5_ARB 0x8725 -#define GL_MODELVIEW6_ARB 0x8726 -#define GL_MODELVIEW7_ARB 0x8727 -#define GL_MODELVIEW8_ARB 0x8728 -#define GL_MODELVIEW9_ARB 0x8729 -#define GL_MODELVIEW10_ARB 0x872A -#define GL_MODELVIEW11_ARB 0x872B -#define GL_MODELVIEW12_ARB 0x872C -#define GL_MODELVIEW13_ARB 0x872D -#define GL_MODELVIEW14_ARB 0x872E -#define GL_MODELVIEW15_ARB 0x872F -#define GL_MODELVIEW16_ARB 0x8730 -#define GL_MODELVIEW17_ARB 0x8731 -#define GL_MODELVIEW18_ARB 0x8732 -#define GL_MODELVIEW19_ARB 0x8733 -#define GL_MODELVIEW20_ARB 0x8734 -#define GL_MODELVIEW21_ARB 0x8735 -#define GL_MODELVIEW22_ARB 0x8736 -#define GL_MODELVIEW23_ARB 0x8737 -#define GL_MODELVIEW24_ARB 0x8738 -#define GL_MODELVIEW25_ARB 0x8739 -#define GL_MODELVIEW26_ARB 0x873A -#define GL_MODELVIEW27_ARB 0x873B -#define GL_MODELVIEW28_ARB 0x873C -#define GL_MODELVIEW29_ARB 0x873D -#define GL_MODELVIEW30_ARB 0x873E -#define GL_MODELVIEW31_ARB 0x873F -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_MATRIX_PALETTE_ARB 0x8840 -#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 -#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 -#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 -#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 -#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 -#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 -#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 -#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 -#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_COMBINE_ARB 0x8570 -#define GL_COMBINE_RGB_ARB 0x8571 -#define GL_COMBINE_ALPHA_ARB 0x8572 -#define GL_SOURCE0_RGB_ARB 0x8580 -#define GL_SOURCE1_RGB_ARB 0x8581 -#define GL_SOURCE2_RGB_ARB 0x8582 -#define GL_SOURCE0_ALPHA_ARB 0x8588 -#define GL_SOURCE1_ALPHA_ARB 0x8589 -#define GL_SOURCE2_ALPHA_ARB 0x858A -#define GL_OPERAND0_RGB_ARB 0x8590 -#define GL_OPERAND1_RGB_ARB 0x8591 -#define GL_OPERAND2_RGB_ARB 0x8592 -#define GL_OPERAND0_ALPHA_ARB 0x8598 -#define GL_OPERAND1_ALPHA_ARB 0x8599 -#define GL_OPERAND2_ALPHA_ARB 0x859A -#define GL_RGB_SCALE_ARB 0x8573 -#define GL_ADD_SIGNED_ARB 0x8574 -#define GL_INTERPOLATE_ARB 0x8575 -#define GL_SUBTRACT_ARB 0x84E7 -#define GL_CONSTANT_ARB 0x8576 -#define GL_PRIMARY_COLOR_ARB 0x8577 -#define GL_PREVIOUS_ARB 0x8578 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_DOT3_RGB_ARB 0x86AE -#define GL_DOT3_RGBA_ARB 0x86AF -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_ARB 0x8370 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_DEPTH_COMPONENT16_ARB 0x81A5 -#define GL_DEPTH_COMPONENT24_ARB 0x81A6 -#define GL_DEPTH_COMPONENT32_ARB 0x81A7 -#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A -#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B -#endif - -#ifndef GL_ARB_shadow -#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C -#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D -#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF -#endif - -#ifndef GL_ARB_window_pos -#endif - -#ifndef GL_ARB_vertex_program -#define GL_COLOR_SUM_ARB 0x8458 -#define GL_VERTEX_PROGRAM_ARB 0x8620 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 -#define GL_PROGRAM_LENGTH_ARB 0x8627 -#define GL_PROGRAM_STRING_ARB 0x8628 -#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E -#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F -#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 -#define GL_CURRENT_MATRIX_ARB 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 -#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B -#define GL_PROGRAM_BINDING_ARB 0x8677 -#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A -#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 -#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -#define GL_PROGRAM_FORMAT_ARB 0x8876 -#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 -#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 -#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 -#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 -#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 -#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 -#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 -#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 -#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 -#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 -#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA -#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB -#define GL_PROGRAM_ATTRIBS_ARB 0x88AC -#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD -#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE -#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF -#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 -#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 -#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 -#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 -#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 -#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 -#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 -#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 -#define GL_MATRIX0_ARB 0x88C0 -#define GL_MATRIX1_ARB 0x88C1 -#define GL_MATRIX2_ARB 0x88C2 -#define GL_MATRIX3_ARB 0x88C3 -#define GL_MATRIX4_ARB 0x88C4 -#define GL_MATRIX5_ARB 0x88C5 -#define GL_MATRIX6_ARB 0x88C6 -#define GL_MATRIX7_ARB 0x88C7 -#define GL_MATRIX8_ARB 0x88C8 -#define GL_MATRIX9_ARB 0x88C9 -#define GL_MATRIX10_ARB 0x88CA -#define GL_MATRIX11_ARB 0x88CB -#define GL_MATRIX12_ARB 0x88CC -#define GL_MATRIX13_ARB 0x88CD -#define GL_MATRIX14_ARB 0x88CE -#define GL_MATRIX15_ARB 0x88CF -#define GL_MATRIX16_ARB 0x88D0 -#define GL_MATRIX17_ARB 0x88D1 -#define GL_MATRIX18_ARB 0x88D2 -#define GL_MATRIX19_ARB 0x88D3 -#define GL_MATRIX20_ARB 0x88D4 -#define GL_MATRIX21_ARB 0x88D5 -#define GL_MATRIX22_ARB 0x88D6 -#define GL_MATRIX23_ARB 0x88D7 -#define GL_MATRIX24_ARB 0x88D8 -#define GL_MATRIX25_ARB 0x88D9 -#define GL_MATRIX26_ARB 0x88DA -#define GL_MATRIX27_ARB 0x88DB -#define GL_MATRIX28_ARB 0x88DC -#define GL_MATRIX29_ARB 0x88DD -#define GL_MATRIX30_ARB 0x88DE -#define GL_MATRIX31_ARB 0x88DF -#endif - -#ifndef GL_ARB_fragment_program -#define GL_FRAGMENT_PROGRAM_ARB 0x8804 -#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 -#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 -#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 -#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 -#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 -#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A -#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B -#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C -#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D -#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E -#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F -#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 -#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_BUFFER_SIZE_ARB 0x8764 -#define GL_BUFFER_USAGE_ARB 0x8765 -#define GL_ARRAY_BUFFER_ARB 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 -#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F -#define GL_READ_ONLY_ARB 0x88B8 -#define GL_WRITE_ONLY_ARB 0x88B9 -#define GL_READ_WRITE_ARB 0x88BA -#define GL_BUFFER_ACCESS_ARB 0x88BB -#define GL_BUFFER_MAPPED_ARB 0x88BC -#define GL_BUFFER_MAP_POINTER_ARB 0x88BD -#define GL_STREAM_DRAW_ARB 0x88E0 -#define GL_STREAM_READ_ARB 0x88E1 -#define GL_STREAM_COPY_ARB 0x88E2 -#define GL_STATIC_DRAW_ARB 0x88E4 -#define GL_STATIC_READ_ARB 0x88E5 -#define GL_STATIC_COPY_ARB 0x88E6 -#define GL_DYNAMIC_DRAW_ARB 0x88E8 -#define GL_DYNAMIC_READ_ARB 0x88E9 -#define GL_DYNAMIC_COPY_ARB 0x88EA -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_QUERY_COUNTER_BITS_ARB 0x8864 -#define GL_CURRENT_QUERY_ARB 0x8865 -#define GL_QUERY_RESULT_ARB 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 -#define GL_SAMPLES_PASSED_ARB 0x8914 -#endif - -#ifndef GL_ARB_shader_objects -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 -#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 -#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 -#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 -#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D -#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 -#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#endif - -#ifndef GL_ARB_point_sprite -#define GL_POINT_SPRITE_ARB 0x8861 -#define GL_COORD_REPLACE_ARB 0x8862 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 -#define GL_DRAW_BUFFER0_ARB 0x8825 -#define GL_DRAW_BUFFER1_ARB 0x8826 -#define GL_DRAW_BUFFER2_ARB 0x8827 -#define GL_DRAW_BUFFER3_ARB 0x8828 -#define GL_DRAW_BUFFER4_ARB 0x8829 -#define GL_DRAW_BUFFER5_ARB 0x882A -#define GL_DRAW_BUFFER6_ARB 0x882B -#define GL_DRAW_BUFFER7_ARB 0x882C -#define GL_DRAW_BUFFER8_ARB 0x882D -#define GL_DRAW_BUFFER9_ARB 0x882E -#define GL_DRAW_BUFFER10_ARB 0x882F -#define GL_DRAW_BUFFER11_ARB 0x8830 -#define GL_DRAW_BUFFER12_ARB 0x8831 -#define GL_DRAW_BUFFER13_ARB 0x8832 -#define GL_DRAW_BUFFER14_ARB 0x8833 -#define GL_DRAW_BUFFER15_ARB 0x8834 -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_RGBA_FLOAT_MODE_ARB 0x8820 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -#define GL_FIXED_ONLY_ARB 0x891D -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_HALF_FLOAT_ARB 0x140B -#endif - -#ifndef GL_ARB_texture_float -#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 -#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 -#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 -#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 -#define GL_RGBA32F_ARB 0x8814 -#define GL_RGB32F_ARB 0x8815 -#define GL_ALPHA32F_ARB 0x8816 -#define GL_INTENSITY32F_ARB 0x8817 -#define GL_LUMINANCE32F_ARB 0x8818 -#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 -#define GL_RGBA16F_ARB 0x881A -#define GL_RGB16F_ARB 0x881B -#define GL_ALPHA16F_ARB 0x881C -#define GL_INTENSITY16F_ARB 0x881D -#define GL_LUMINANCE16F_ARB 0x881E -#define GL_LUMINANCE_ALPHA16F_ARB 0x881F -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF -#endif - -#ifndef GL_EXT_abgr -#define GL_ABGR_EXT 0x8000 -#endif - -#ifndef GL_EXT_blend_color -#define GL_CONSTANT_COLOR_EXT 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 -#define GL_CONSTANT_ALPHA_EXT 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 -#define GL_BLEND_COLOR_EXT 0x8005 -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_POLYGON_OFFSET_EXT 0x8037 -#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 -#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 -#endif - -#ifndef GL_EXT_texture -#define GL_ALPHA4_EXT 0x803B -#define GL_ALPHA8_EXT 0x803C -#define GL_ALPHA12_EXT 0x803D -#define GL_ALPHA16_EXT 0x803E -#define GL_LUMINANCE4_EXT 0x803F -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE12_EXT 0x8041 -#define GL_LUMINANCE16_EXT 0x8042 -#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 -#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 -#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 -#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 -#define GL_INTENSITY_EXT 0x8049 -#define GL_INTENSITY4_EXT 0x804A -#define GL_INTENSITY8_EXT 0x804B -#define GL_INTENSITY12_EXT 0x804C -#define GL_INTENSITY16_EXT 0x804D -#define GL_RGB2_EXT 0x804E -#define GL_RGB4_EXT 0x804F -#define GL_RGB5_EXT 0x8050 -#define GL_RGB8_EXT 0x8051 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB12_EXT 0x8053 -#define GL_RGB16_EXT 0x8054 -#define GL_RGBA2_EXT 0x8055 -#define GL_RGBA4_EXT 0x8056 -#define GL_RGB5_A1_EXT 0x8057 -#define GL_RGBA8_EXT 0x8058 -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGBA12_EXT 0x805A -#define GL_RGBA16_EXT 0x805B -#define GL_TEXTURE_RED_SIZE_EXT 0x805C -#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D -#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E -#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 -#define GL_REPLACE_EXT 0x8062 -#define GL_PROXY_TEXTURE_1D_EXT 0x8063 -#define GL_PROXY_TEXTURE_2D_EXT 0x8064 -#define GL_TEXTURE_TOO_LARGE_EXT 0x8065 -#endif - -#ifndef GL_EXT_texture3D -#define GL_PACK_SKIP_IMAGES_EXT 0x806B -#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C -#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D -#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E -#define GL_TEXTURE_3D_EXT 0x806F -#define GL_PROXY_TEXTURE_3D_EXT 0x8070 -#define GL_TEXTURE_DEPTH_EXT 0x8071 -#define GL_TEXTURE_WRAP_R_EXT 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_FILTER4_SGIS 0x8146 -#define GL_TEXTURE_FILTER4_SIZE_SGIS 0x8147 -#endif - -#ifndef GL_EXT_subtexture -#endif - -#ifndef GL_EXT_copy_texture -#endif - -#ifndef GL_EXT_histogram -#define GL_HISTOGRAM_EXT 0x8024 -#define GL_PROXY_HISTOGRAM_EXT 0x8025 -#define GL_HISTOGRAM_WIDTH_EXT 0x8026 -#define GL_HISTOGRAM_FORMAT_EXT 0x8027 -#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C -#define GL_HISTOGRAM_SINK_EXT 0x802D -#define GL_MINMAX_EXT 0x802E -#define GL_MINMAX_FORMAT_EXT 0x802F -#define GL_MINMAX_SINK_EXT 0x8030 -#define GL_TABLE_TOO_LARGE_EXT 0x8031 -#endif - -#ifndef GL_EXT_convolution -#define GL_CONVOLUTION_1D_EXT 0x8010 -#define GL_CONVOLUTION_2D_EXT 0x8011 -#define GL_SEPARABLE_2D_EXT 0x8012 -#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 -#define GL_REDUCE_EXT 0x8016 -#define GL_CONVOLUTION_FORMAT_EXT 0x8017 -#define GL_CONVOLUTION_WIDTH_EXT 0x8018 -#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 -#endif - -#ifndef GL_SGI_color_matrix -#define GL_COLOR_MATRIX_SGI 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB -#endif - -#ifndef GL_SGI_color_table -#define GL_COLOR_TABLE_SGI 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 -#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 -#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 -#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 -#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 -#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_PIXEL_TEXTURE_SGIS 0x8353 -#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354 -#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355 -#define GL_PIXEL_GROUP_COLOR_SGIS 0x8356 -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_PIXEL_TEX_GEN_SGIX 0x8139 -#define GL_PIXEL_TEX_GEN_MODE_SGIX 0x832B -#endif - -#ifndef GL_SGIS_texture4D -#define GL_PACK_SKIP_VOLUMES_SGIS 0x8130 -#define GL_PACK_IMAGE_DEPTH_SGIS 0x8131 -#define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 -#define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 -#define GL_TEXTURE_4D_SGIS 0x8134 -#define GL_PROXY_TEXTURE_4D_SGIS 0x8135 -#define GL_TEXTURE_4DSIZE_SGIS 0x8136 -#define GL_TEXTURE_WRAP_Q_SGIS 0x8137 -#define GL_MAX_4D_TEXTURE_SIZE_SGIS 0x8138 -#define GL_TEXTURE_4D_BINDING_SGIS 0x814F -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC -#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD -#endif - -#ifndef GL_EXT_cmyka -#define GL_CMYK_EXT 0x800C -#define GL_CMYKA_EXT 0x800D -#define GL_PACK_CMYK_HINT_EXT 0x800E -#define GL_UNPACK_CMYK_HINT_EXT 0x800F -#endif - -#ifndef GL_EXT_texture_object -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_DETAIL_TEXTURE_2D_SGIS 0x8095 -#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096 -#define GL_LINEAR_DETAIL_SGIS 0x8097 -#define GL_LINEAR_DETAIL_ALPHA_SGIS 0x8098 -#define GL_LINEAR_DETAIL_COLOR_SGIS 0x8099 -#define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A -#define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B -#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_LINEAR_SHARPEN_SGIS 0x80AD -#define GL_LINEAR_SHARPEN_ALPHA_SGIS 0x80AE -#define GL_LINEAR_SHARPEN_COLOR_SGIS 0x80AF -#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0 -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_TEXTURE_MIN_LOD_SGIS 0x813A -#define GL_TEXTURE_MAX_LOD_SGIS 0x813B -#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C -#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D -#endif - -#ifndef GL_SGIS_multisample -#define GL_MULTISAMPLE_SGIS 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F -#define GL_SAMPLE_MASK_SGIS 0x80A0 -#define GL_1PASS_SGIS 0x80A1 -#define GL_2PASS_0_SGIS 0x80A2 -#define GL_2PASS_1_SGIS 0x80A3 -#define GL_4PASS_0_SGIS 0x80A4 -#define GL_4PASS_1_SGIS 0x80A5 -#define GL_4PASS_2_SGIS 0x80A6 -#define GL_4PASS_3_SGIS 0x80A7 -#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 -#define GL_SAMPLES_SGIS 0x80A9 -#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA -#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB -#define GL_SAMPLE_PATTERN_SGIS 0x80AC -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_RESCALE_NORMAL_EXT 0x803A -#endif - -#ifndef GL_EXT_vertex_array -#define GL_VERTEX_ARRAY_EXT 0x8074 -#define GL_NORMAL_ARRAY_EXT 0x8075 -#define GL_COLOR_ARRAY_EXT 0x8076 -#define GL_INDEX_ARRAY_EXT 0x8077 -#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 -#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 -#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A -#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B -#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C -#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D -#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E -#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F -#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 -#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 -#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 -#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 -#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 -#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 -#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 -#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 -#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A -#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B -#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C -#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D -#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E -#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F -#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 -#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 -#endif - -#ifndef GL_EXT_misc_attribute -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_GENERATE_MIPMAP_SGIS 0x8191 -#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 -#define GL_TEXTURE_CLIPMAP_CENTER_SGIX 0x8171 -#define GL_TEXTURE_CLIPMAP_FRAME_SGIX 0x8172 -#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX 0x8173 -#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174 -#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175 -#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX 0x8176 -#define GL_MAX_CLIPMAP_DEPTH_SGIX 0x8177 -#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178 -#define GL_NEAREST_CLIPMAP_NEAREST_SGIX 0x844D -#define GL_NEAREST_CLIPMAP_LINEAR_SGIX 0x844E -#define GL_LINEAR_CLIPMAP_NEAREST_SGIX 0x844F -#endif - -#ifndef GL_SGIX_shadow -#define GL_TEXTURE_COMPARE_SGIX 0x819A -#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B -#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C -#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_CLAMP_TO_EDGE_SGIS 0x812F -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_CLAMP_TO_BORDER_SGIS 0x812D -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#define GL_BLEND_EQUATION_EXT 0x8009 -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_FUNC_SUBTRACT_EXT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B -#endif - -#ifndef GL_EXT_blend_logic_op -#endif - -#ifndef GL_SGIX_interlace -#define GL_INTERLACE_SGIX 0x8094 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E -#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F -#define GL_PIXEL_TILE_WIDTH_SGIX 0x8140 -#define GL_PIXEL_TILE_HEIGHT_SGIX 0x8141 -#define GL_PIXEL_TILE_GRID_WIDTH_SGIX 0x8142 -#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX 0x8143 -#define GL_PIXEL_TILE_GRID_DEPTH_SGIX 0x8144 -#define GL_PIXEL_TILE_CACHE_SIZE_SGIX 0x8145 -#endif - -#ifndef GL_SGIS_texture_select -#define GL_DUAL_ALPHA4_SGIS 0x8110 -#define GL_DUAL_ALPHA8_SGIS 0x8111 -#define GL_DUAL_ALPHA12_SGIS 0x8112 -#define GL_DUAL_ALPHA16_SGIS 0x8113 -#define GL_DUAL_LUMINANCE4_SGIS 0x8114 -#define GL_DUAL_LUMINANCE8_SGIS 0x8115 -#define GL_DUAL_LUMINANCE12_SGIS 0x8116 -#define GL_DUAL_LUMINANCE16_SGIS 0x8117 -#define GL_DUAL_INTENSITY4_SGIS 0x8118 -#define GL_DUAL_INTENSITY8_SGIS 0x8119 -#define GL_DUAL_INTENSITY12_SGIS 0x811A -#define GL_DUAL_INTENSITY16_SGIS 0x811B -#define GL_DUAL_LUMINANCE_ALPHA4_SGIS 0x811C -#define GL_DUAL_LUMINANCE_ALPHA8_SGIS 0x811D -#define GL_QUAD_ALPHA4_SGIS 0x811E -#define GL_QUAD_ALPHA8_SGIS 0x811F -#define GL_QUAD_LUMINANCE4_SGIS 0x8120 -#define GL_QUAD_LUMINANCE8_SGIS 0x8121 -#define GL_QUAD_INTENSITY4_SGIS 0x8122 -#define GL_QUAD_INTENSITY8_SGIS 0x8123 -#define GL_DUAL_TEXTURE_SELECT_SGIS 0x8124 -#define GL_QUAD_TEXTURE_SELECT_SGIS 0x8125 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SPRITE_SGIX 0x8148 -#define GL_SPRITE_MODE_SGIX 0x8149 -#define GL_SPRITE_AXIS_SGIX 0x814A -#define GL_SPRITE_TRANSLATION_SGIX 0x814B -#define GL_SPRITE_AXIAL_SGIX 0x814C -#define GL_SPRITE_OBJECT_ALIGNED_SGIX 0x814D -#define GL_SPRITE_EYE_ALIGNED_SGIX 0x814E -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E -#endif - -#ifndef GL_EXT_point_parameters -#define GL_POINT_SIZE_MIN_EXT 0x8126 -#define GL_POINT_SIZE_MAX_EXT 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 -#define GL_DISTANCE_ATTENUATION_EXT 0x8129 -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_POINT_SIZE_MIN_SGIS 0x8126 -#define GL_POINT_SIZE_MAX_SGIS 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128 -#define GL_DISTANCE_ATTENUATION_SGIS 0x8129 -#endif - -#ifndef GL_SGIX_instruments -#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180 -#define GL_INSTRUMENT_MEASUREMENTS_SGIX 0x8181 -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179 -#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A -#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B -#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C -#endif - -#ifndef GL_SGIX_framezoom -#define GL_FRAMEZOOM_SGIX 0x818B -#define GL_FRAMEZOOM_FACTOR_SGIX 0x818C -#define GL_MAX_FRAMEZOOM_FACTOR_SGIX 0x818D -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#endif - -#ifndef GL_FfdMaskSGIX -#define GL_TEXTURE_DEFORMATION_BIT_SGIX 0x00000001 -#define GL_GEOMETRY_DEFORMATION_BIT_SGIX 0x00000002 -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_GEOMETRY_DEFORMATION_SGIX 0x8194 -#define GL_TEXTURE_DEFORMATION_SGIX 0x8195 -#define GL_DEFORMATIONS_MASK_SGIX 0x8196 -#define GL_MAX_DEFORMATION_ORDER_SGIX 0x8197 -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_REFERENCE_PLANE_SGIX 0x817D -#define GL_REFERENCE_PLANE_EQUATION_SGIX 0x817E -#endif - -#ifndef GL_SGIX_flush_raster -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_DEPTH_COMPONENT16_SGIX 0x81A5 -#define GL_DEPTH_COMPONENT24_SGIX 0x81A6 -#define GL_DEPTH_COMPONENT32_SGIX 0x81A7 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_FOG_FUNC_SGIS 0x812A -#define GL_FOG_FUNC_POINTS_SGIS 0x812B -#define GL_MAX_FOG_FUNC_POINTS_SGIS 0x812C -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_FOG_OFFSET_SGIX 0x8198 -#define GL_FOG_OFFSET_VALUE_SGIX 0x8199 -#endif - -#ifndef GL_HP_image_transform -#define GL_IMAGE_SCALE_X_HP 0x8155 -#define GL_IMAGE_SCALE_Y_HP 0x8156 -#define GL_IMAGE_TRANSLATE_X_HP 0x8157 -#define GL_IMAGE_TRANSLATE_Y_HP 0x8158 -#define GL_IMAGE_ROTATE_ANGLE_HP 0x8159 -#define GL_IMAGE_ROTATE_ORIGIN_X_HP 0x815A -#define GL_IMAGE_ROTATE_ORIGIN_Y_HP 0x815B -#define GL_IMAGE_MAG_FILTER_HP 0x815C -#define GL_IMAGE_MIN_FILTER_HP 0x815D -#define GL_IMAGE_CUBIC_WEIGHT_HP 0x815E -#define GL_CUBIC_HP 0x815F -#define GL_AVERAGE_HP 0x8160 -#define GL_IMAGE_TRANSFORM_2D_HP 0x8161 -#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162 -#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163 -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_IGNORE_BORDER_HP 0x8150 -#define GL_CONSTANT_BORDER_HP 0x8151 -#define GL_REPLICATE_BORDER_HP 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR_HP 0x8154 -#endif - -#ifndef GL_INGR_palette_buffer -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_TEXTURE_ENV_BIAS_SGIX 0x80BE -#endif - -#ifndef GL_EXT_color_subtable -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_VERTEX_DATA_HINT_PGI 0x1A22A -#define GL_VERTEX_CONSISTENT_HINT_PGI 0x1A22B -#define GL_MATERIAL_SIDE_HINT_PGI 0x1A22C -#define GL_MAX_VERTEX_HINT_PGI 0x1A22D -#define GL_COLOR3_BIT_PGI 0x00010000 -#define GL_COLOR4_BIT_PGI 0x00020000 -#define GL_EDGEFLAG_BIT_PGI 0x00040000 -#define GL_INDEX_BIT_PGI 0x00080000 -#define GL_MAT_AMBIENT_BIT_PGI 0x00100000 -#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000 -#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000 -#define GL_MAT_EMISSION_BIT_PGI 0x00800000 -#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000 -#define GL_MAT_SHININESS_BIT_PGI 0x02000000 -#define GL_MAT_SPECULAR_BIT_PGI 0x04000000 -#define GL_NORMAL_BIT_PGI 0x08000000 -#define GL_TEXCOORD1_BIT_PGI 0x10000000 -#define GL_TEXCOORD2_BIT_PGI 0x20000000 -#define GL_TEXCOORD3_BIT_PGI 0x40000000 -#define GL_TEXCOORD4_BIT_PGI 0x80000000 -#define GL_VERTEX23_BIT_PGI 0x00000004 -#define GL_VERTEX4_BIT_PGI 0x00000008 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 0x1A1F8 -#define GL_CONSERVE_MEMORY_HINT_PGI 0x1A1FD -#define GL_RECLAIM_MEMORY_HINT_PGI 0x1A1FE -#define GL_NATIVE_GRAPHICS_HANDLE_PGI 0x1A202 -#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203 -#define GL_NATIVE_GRAPHICS_END_HINT_PGI 0x1A204 -#define GL_ALWAYS_FAST_HINT_PGI 0x1A20C -#define GL_ALWAYS_SOFT_HINT_PGI 0x1A20D -#define GL_ALLOW_DRAW_OBJ_HINT_PGI 0x1A20E -#define GL_ALLOW_DRAW_WIN_HINT_PGI 0x1A20F -#define GL_ALLOW_DRAW_FRG_HINT_PGI 0x1A210 -#define GL_ALLOW_DRAW_MEM_HINT_PGI 0x1A211 -#define GL_STRICT_DEPTHFUNC_HINT_PGI 0x1A216 -#define GL_STRICT_LIGHTING_HINT_PGI 0x1A217 -#define GL_STRICT_SCISSOR_HINT_PGI 0x1A218 -#define GL_FULL_STIPPLE_HINT_PGI 0x1A219 -#define GL_CLIP_NEAR_HINT_PGI 0x1A220 -#define GL_CLIP_FAR_HINT_PGI 0x1A221 -#define GL_WIDE_LINE_HINT_PGI 0x1A222 -#define GL_BACK_NORMALS_HINT_PGI 0x1A223 -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_LIST_PRIORITY_SGIX 0x8182 -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_IR_INSTRUMENT1_SGIX 0x817F -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_CALLIGRAPHIC_FRAGMENT_SGIX 0x8183 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_TEXTURE_LOD_BIAS_S_SGIX 0x818E -#define GL_TEXTURE_LOD_BIAS_T_SGIX 0x818F -#define GL_TEXTURE_LOD_BIAS_R_SGIX 0x8190 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SHADOW_AMBIENT_SGIX 0x80BF -#endif - -#ifndef GL_EXT_index_texture -#endif - -#ifndef GL_EXT_index_material -#define GL_INDEX_MATERIAL_EXT 0x81B8 -#define GL_INDEX_MATERIAL_PARAMETER_EXT 0x81B9 -#define GL_INDEX_MATERIAL_FACE_EXT 0x81BA -#endif - -#ifndef GL_EXT_index_func -#define GL_INDEX_TEST_EXT 0x81B5 -#define GL_INDEX_TEST_FUNC_EXT 0x81B6 -#define GL_INDEX_TEST_REF_EXT 0x81B7 -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_IUI_V2F_EXT 0x81AD -#define GL_IUI_V3F_EXT 0x81AE -#define GL_IUI_N3F_V2F_EXT 0x81AF -#define GL_IUI_N3F_V3F_EXT 0x81B0 -#define GL_T2F_IUI_V2F_EXT 0x81B1 -#define GL_T2F_IUI_V3F_EXT 0x81B2 -#define GL_T2F_IUI_N3F_V2F_EXT 0x81B3 -#define GL_T2F_IUI_N3F_V3F_EXT 0x81B4 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8 -#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9 -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_CULL_VERTEX_EXT 0x81AA -#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB -#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_YCRCB_422_SGIX 0x81BB -#define GL_YCRCB_444_SGIX 0x81BC -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_FRAGMENT_LIGHTING_SGIX 0x8400 -#define GL_FRAGMENT_COLOR_MATERIAL_SGIX 0x8401 -#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402 -#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403 -#define GL_MAX_FRAGMENT_LIGHTS_SGIX 0x8404 -#define GL_MAX_ACTIVE_LIGHTS_SGIX 0x8405 -#define GL_CURRENT_RASTER_NORMAL_SGIX 0x8406 -#define GL_LIGHT_ENV_MODE_SGIX 0x8407 -#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408 -#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409 -#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A -#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B -#define GL_FRAGMENT_LIGHT0_SGIX 0x840C -#define GL_FRAGMENT_LIGHT1_SGIX 0x840D -#define GL_FRAGMENT_LIGHT2_SGIX 0x840E -#define GL_FRAGMENT_LIGHT3_SGIX 0x840F -#define GL_FRAGMENT_LIGHT4_SGIX 0x8410 -#define GL_FRAGMENT_LIGHT5_SGIX 0x8411 -#define GL_FRAGMENT_LIGHT6_SGIX 0x8412 -#define GL_FRAGMENT_LIGHT7_SGIX 0x8413 -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_RASTER_POSITION_UNCLIPPED_IBM 0x19262 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_TEXTURE_LIGHTING_MODE_HP 0x8167 -#define GL_TEXTURE_POST_SPECULAR_HP 0x8168 -#define GL_TEXTURE_PRE_SPECULAR_HP 0x8169 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 -#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 -#endif - -#ifndef GL_WIN_phong_shading -#define GL_PHONG_WIN 0x80EA -#define GL_PHONG_HINT_WIN 0x80EB -#endif - -#ifndef GL_WIN_specular_fog -#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC -#endif - -#ifndef GL_EXT_light_texture -#define GL_FRAGMENT_MATERIAL_EXT 0x8349 -#define GL_FRAGMENT_NORMAL_EXT 0x834A -#define GL_FRAGMENT_COLOR_EXT 0x834C -#define GL_ATTENUATION_EXT 0x834D -#define GL_SHADOW_ATTENUATION_EXT 0x834E -#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F -#define GL_TEXTURE_LIGHT_EXT 0x8350 -#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351 -#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352 -/* reuse GL_FRAGMENT_DEPTH_EXT */ -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_ALPHA_MIN_SGIX 0x8320 -#define GL_ALPHA_MAX_SGIX 0x8321 -#endif - -#ifndef GL_SGIX_impact_pixel_texture -#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX 0x8184 -#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX 0x8185 -#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX 0x8186 -#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187 -#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188 -#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX 0x8189 -#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX 0x818A -#endif - -#ifndef GL_EXT_bgra -#define GL_BGR_EXT 0x80E0 -#define GL_BGRA_EXT 0x80E1 -#endif - -#ifndef GL_SGIX_async -#define GL_ASYNC_MARKER_SGIX 0x8329 -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C -#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D -#define GL_ASYNC_READ_PIXELS_SGIX 0x835E -#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F -#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360 -#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_ASYNC_HISTOGRAM_SGIX 0x832C -#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D -#endif - -#ifndef GL_INTEL_texture_scissor -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_PARALLEL_ARRAYS_INTEL 0x83F4 -#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5 -#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6 -#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7 -#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8 -#endif - -#ifndef GL_HP_occlusion_test -#define GL_OCCLUSION_TEST_HP 0x8165 -#define GL_OCCLUSION_TEST_RESULT_HP 0x8166 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330 -#define GL_PIXEL_MAG_FILTER_EXT 0x8331 -#define GL_PIXEL_MIN_FILTER_EXT 0x8332 -#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333 -#define GL_CUBIC_EXT 0x8334 -#define GL_AVERAGE_EXT 0x8335 -#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336 -#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337 -#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338 -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8 -#define GL_SINGLE_COLOR_EXT 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA -#endif - -#ifndef GL_EXT_secondary_color -#define GL_COLOR_SUM_EXT 0x8458 -#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D -#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_PERTURB_EXT 0x85AE -#define GL_TEXTURE_NORMAL_EXT 0x85AF -#endif - -#ifndef GL_EXT_multi_draw_arrays -#endif - -#ifndef GL_EXT_fog_coord -#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 -#define GL_FOG_COORDINATE_EXT 0x8451 -#define GL_FRAGMENT_DEPTH_EXT 0x8452 -#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 -#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_SCREEN_COORDINATES_REND 0x8490 -#define GL_INVERTED_SCREEN_W_REND 0x8491 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_TANGENT_ARRAY_EXT 0x8439 -#define GL_BINORMAL_ARRAY_EXT 0x843A -#define GL_CURRENT_TANGENT_EXT 0x843B -#define GL_CURRENT_BINORMAL_EXT 0x843C -#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E -#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F -#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440 -#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441 -#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442 -#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443 -#define GL_MAP1_TANGENT_EXT 0x8444 -#define GL_MAP2_TANGENT_EXT 0x8445 -#define GL_MAP1_BINORMAL_EXT 0x8446 -#define GL_MAP2_BINORMAL_EXT 0x8447 -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_COMBINE_EXT 0x8570 -#define GL_COMBINE_RGB_EXT 0x8571 -#define GL_COMBINE_ALPHA_EXT 0x8572 -#define GL_RGB_SCALE_EXT 0x8573 -#define GL_ADD_SIGNED_EXT 0x8574 -#define GL_INTERPOLATE_EXT 0x8575 -#define GL_CONSTANT_EXT 0x8576 -#define GL_PRIMARY_COLOR_EXT 0x8577 -#define GL_PREVIOUS_EXT 0x8578 -#define GL_SOURCE0_RGB_EXT 0x8580 -#define GL_SOURCE1_RGB_EXT 0x8581 -#define GL_SOURCE2_RGB_EXT 0x8582 -#define GL_SOURCE0_ALPHA_EXT 0x8588 -#define GL_SOURCE1_ALPHA_EXT 0x8589 -#define GL_SOURCE2_ALPHA_EXT 0x858A -#define GL_OPERAND0_RGB_EXT 0x8590 -#define GL_OPERAND1_RGB_EXT 0x8591 -#define GL_OPERAND2_RGB_EXT 0x8592 -#define GL_OPERAND0_ALPHA_EXT 0x8598 -#define GL_OPERAND1_ALPHA_EXT 0x8599 -#define GL_OPERAND2_ALPHA_EXT 0x859A -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_TRANSFORM_HINT_APPLE 0x85B1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_FOG_SCALE_SGIX 0x81FC -#define GL_FOG_SCALE_VALUE_SGIX 0x81FD -#endif - -#ifndef GL_SUNX_constant_data -#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 -#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6 -#endif - -#ifndef GL_SUN_global_alpha -#define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA -#endif - -#ifndef GL_SUN_triangle_list -#define GL_RESTART_SUN 0x0001 -#define GL_REPLACE_MIDDLE_SUN 0x0002 -#define GL_REPLACE_OLDEST_SUN 0x0003 -#define GL_TRIANGLE_LIST_SUN 0x81D7 -#define GL_REPLACEMENT_CODE_SUN 0x81D8 -#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0 -#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1 -#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2 -#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3 -#define GL_R1UI_V3F_SUN 0x85C4 -#define GL_R1UI_C4UB_V3F_SUN 0x85C5 -#define GL_R1UI_C3F_V3F_SUN 0x85C6 -#define GL_R1UI_N3F_V3F_SUN 0x85C7 -#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8 -#define GL_R1UI_T2F_V3F_SUN 0x85C9 -#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA -#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB -#endif - -#ifndef GL_SUN_vertex -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_BLEND_DST_RGB_EXT 0x80C8 -#define GL_BLEND_SRC_RGB_EXT 0x80C9 -#define GL_BLEND_DST_ALPHA_EXT 0x80CA -#define GL_BLEND_SRC_ALPHA_EXT 0x80CB -#endif - -#ifndef GL_INGR_color_clamp -#define GL_RED_MIN_CLAMP_INGR 0x8560 -#define GL_GREEN_MIN_CLAMP_INGR 0x8561 -#define GL_BLUE_MIN_CLAMP_INGR 0x8562 -#define GL_ALPHA_MIN_CLAMP_INGR 0x8563 -#define GL_RED_MAX_CLAMP_INGR 0x8564 -#define GL_GREEN_MAX_CLAMP_INGR 0x8565 -#define GL_BLUE_MAX_CLAMP_INGR 0x8566 -#define GL_ALPHA_MAX_CLAMP_INGR 0x8567 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INTERLACE_READ_INGR 0x8568 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_INCR_WRAP_EXT 0x8507 -#define GL_DECR_WRAP_EXT 0x8508 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_422_EXT 0x80CC -#define GL_422_REV_EXT 0x80CD -#define GL_422_AVERAGE_EXT 0x80CE -#define GL_422_REV_AVERAGE_EXT 0x80CF -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NORMAL_MAP_NV 0x8511 -#define GL_REFLECTION_MAP_NV 0x8512 -#endif - -#ifndef GL_EXT_texture_cube_map -#define GL_NORMAL_MAP_EXT 0x8511 -#define GL_REFLECTION_MAP_EXT 0x8512 -#define GL_TEXTURE_CUBE_MAP_EXT 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_WRAP_BORDER_SUN 0x81D4 -#endif - -#ifndef GL_EXT_texture_env_add -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD -#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 -#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_MODELVIEW0_STACK_DEPTH_EXT GL_MODELVIEW_STACK_DEPTH -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW0_MATRIX_EXT GL_MODELVIEW_MATRIX -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW0_EXT GL_MODELVIEW -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_MAX_SHININESS_NV 0x8504 -#define GL_MAX_SPOT_EXPONENT_NV 0x8505 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_NV 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E -#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521 -#endif - -#ifndef GL_NV_register_combiners -#define GL_REGISTER_COMBINERS_NV 0x8522 -#define GL_VARIABLE_A_NV 0x8523 -#define GL_VARIABLE_B_NV 0x8524 -#define GL_VARIABLE_C_NV 0x8525 -#define GL_VARIABLE_D_NV 0x8526 -#define GL_VARIABLE_E_NV 0x8527 -#define GL_VARIABLE_F_NV 0x8528 -#define GL_VARIABLE_G_NV 0x8529 -#define GL_CONSTANT_COLOR0_NV 0x852A -#define GL_CONSTANT_COLOR1_NV 0x852B -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_SPARE0_NV 0x852E -#define GL_SPARE1_NV 0x852F -#define GL_DISCARD_NV 0x8530 -#define GL_E_TIMES_F_NV 0x8531 -#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 -#define GL_UNSIGNED_IDENTITY_NV 0x8536 -#define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_EXPAND_NORMAL_NV 0x8538 -#define GL_EXPAND_NEGATE_NV 0x8539 -#define GL_HALF_BIAS_NORMAL_NV 0x853A -#define GL_HALF_BIAS_NEGATE_NV 0x853B -#define GL_SIGNED_IDENTITY_NV 0x853C -#define GL_SIGNED_NEGATE_NV 0x853D -#define GL_SCALE_BY_TWO_NV 0x853E -#define GL_SCALE_BY_FOUR_NV 0x853F -#define GL_SCALE_BY_ONE_HALF_NV 0x8540 -#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541 -#define GL_COMBINER_INPUT_NV 0x8542 -#define GL_COMBINER_MAPPING_NV 0x8543 -#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544 -#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545 -#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546 -#define GL_COMBINER_MUX_SUM_NV 0x8547 -#define GL_COMBINER_SCALE_NV 0x8548 -#define GL_COMBINER_BIAS_NV 0x8549 -#define GL_COMBINER_AB_OUTPUT_NV 0x854A -#define GL_COMBINER_CD_OUTPUT_NV 0x854B -#define GL_COMBINER_SUM_OUTPUT_NV 0x854C -#define GL_MAX_GENERAL_COMBINERS_NV 0x854D -#define GL_NUM_GENERAL_COMBINERS_NV 0x854E -#define GL_COLOR_SUM_CLAMP_NV 0x854F -#define GL_COMBINER0_NV 0x8550 -#define GL_COMBINER1_NV 0x8551 -#define GL_COMBINER2_NV 0x8552 -#define GL_COMBINER3_NV 0x8553 -#define GL_COMBINER4_NV 0x8554 -#define GL_COMBINER5_NV 0x8555 -#define GL_COMBINER6_NV 0x8556 -#define GL_COMBINER7_NV 0x8557 -/* reuse GL_TEXTURE0_ARB */ -/* reuse GL_TEXTURE1_ARB */ -/* reuse GL_ZERO */ -/* reuse GL_NONE */ -/* reuse GL_FOG */ -#endif - -#ifndef GL_NV_fog_distance -#define GL_FOG_DISTANCE_MODE_NV 0x855A -#define GL_EYE_RADIAL_NV 0x855B -#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C -/* reuse GL_EYE_PLANE */ -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_EMBOSS_LIGHT_NV 0x855D -#define GL_EMBOSS_CONSTANT_NV 0x855E -#define GL_EMBOSS_MAP_NV 0x855F -#endif - -#ifndef GL_NV_blend_square -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_COMBINE4_NV 0x8503 -#define GL_SOURCE3_RGB_NV 0x8583 -#define GL_SOURCE3_ALPHA_NV 0x858B -#define GL_OPERAND3_RGB_NV 0x8593 -#define GL_OPERAND3_ALPHA_NV 0x859B -#endif - -#ifndef GL_MESA_resize_buffers -#endif - -#ifndef GL_MESA_window_pos -#endif - -#ifndef GL_EXT_texture_compression_s3tc -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_CULL_VERTEX_IBM 103050 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_VERTEX_ARRAY_LIST_IBM 103070 -#define GL_NORMAL_ARRAY_LIST_IBM 103071 -#define GL_COLOR_ARRAY_LIST_IBM 103072 -#define GL_INDEX_ARRAY_LIST_IBM 103073 -#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074 -#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075 -#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076 -#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077 -#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 -#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081 -#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082 -#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083 -#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084 -#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085 -#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086 -#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087 -#endif - -#ifndef GL_SGIX_subsample -#define GL_PACK_SUBSAMPLE_RATE_SGIX 0x85A0 -#define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 -#define GL_PIXEL_SUBSAMPLE_4444_SGIX 0x85A2 -#define GL_PIXEL_SUBSAMPLE_2424_SGIX 0x85A3 -#define GL_PIXEL_SUBSAMPLE_4242_SGIX 0x85A4 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_YCRCB_SGIX 0x8318 -#define GL_YCRCBA_SGIX 0x8319 -#endif - -#ifndef GL_SGI_depth_pass_instrument -#define GL_DEPTH_PASS_INSTRUMENT_SGIX 0x8310 -#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311 -#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 -#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_MULTISAMPLE_3DFX 0x86B2 -#define GL_SAMPLE_BUFFERS_3DFX 0x86B3 -#define GL_SAMPLES_3DFX 0x86B4 -#define GL_MULTISAMPLE_BIT_3DFX 0x20000000 -#endif - -#ifndef GL_3DFX_tbuffer -#endif - -#ifndef GL_EXT_multisample -#define GL_MULTISAMPLE_EXT 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F -#define GL_SAMPLE_MASK_EXT 0x80A0 -#define GL_1PASS_EXT 0x80A1 -#define GL_2PASS_0_EXT 0x80A2 -#define GL_2PASS_1_EXT 0x80A3 -#define GL_4PASS_0_EXT 0x80A4 -#define GL_4PASS_1_EXT 0x80A5 -#define GL_4PASS_2_EXT 0x80A6 -#define GL_4PASS_3_EXT 0x80A7 -#define GL_SAMPLE_BUFFERS_EXT 0x80A8 -#define GL_SAMPLES_EXT 0x80A9 -#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA -#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB -#define GL_SAMPLE_PATTERN_EXT 0x80AC -#define GL_MULTISAMPLE_BIT_EXT 0x20000000 -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_CONVOLUTION_HINT_SGIX 0x8316 -#endif - -#ifndef GL_SGIX_resample -#define GL_PACK_RESAMPLE_SGIX 0x842C -#define GL_UNPACK_RESAMPLE_SGIX 0x842D -#define GL_RESAMPLE_REPLICATE_SGIX 0x842E -#define GL_RESAMPLE_ZERO_FILL_SGIX 0x842F -#define GL_RESAMPLE_DECIMATE_SGIX 0x8430 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0 -#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1 -#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2 -#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3 -#define GL_EYE_POINT_SGIS 0x81F4 -#define GL_OBJECT_POINT_SGIS 0x81F5 -#define GL_EYE_LINE_SGIS 0x81F6 -#define GL_OBJECT_LINE_SGIS 0x81F7 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_TEXTURE_COLOR_WRITEMASK_SGIS 0x81EF -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_MIRROR_CLAMP_ATI 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 -#endif - -#ifndef GL_NV_fence -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -#endif - -#ifndef GL_IBM_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_IBM 0x8370 -#endif - -#ifndef GL_NV_evaluators -#define GL_EVAL_2D_NV 0x86C0 -#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_MAP_TESSELLATION_NV 0x86C2 -#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 -#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 -#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 -#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF -#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5 -#define GL_MAX_MAP_TESSELLATION_NV 0x86D6 -#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7 -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 -#endif - -#ifndef GL_NV_texture_compression_vtc -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 -#endif - -#ifndef GL_NV_texture_shader -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV -#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV -#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533 -#endif - -#ifndef GL_NV_vertex_program -#define GL_VERTEX_PROGRAM_NV 0x8620 -#define GL_VERTEX_STATE_PROGRAM_NV 0x8621 -#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623 -#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624 -#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625 -#define GL_CURRENT_ATTRIB_NV 0x8626 -#define GL_PROGRAM_LENGTH_NV 0x8627 -#define GL_PROGRAM_STRING_NV 0x8628 -#define GL_MODELVIEW_PROJECTION_NV 0x8629 -#define GL_IDENTITY_NV 0x862A -#define GL_INVERSE_NV 0x862B -#define GL_TRANSPOSE_NV 0x862C -#define GL_INVERSE_TRANSPOSE_NV 0x862D -#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E -#define GL_MAX_TRACK_MATRICES_NV 0x862F -#define GL_MATRIX0_NV 0x8630 -#define GL_MATRIX1_NV 0x8631 -#define GL_MATRIX2_NV 0x8632 -#define GL_MATRIX3_NV 0x8633 -#define GL_MATRIX4_NV 0x8634 -#define GL_MATRIX5_NV 0x8635 -#define GL_MATRIX6_NV 0x8636 -#define GL_MATRIX7_NV 0x8637 -#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640 -#define GL_CURRENT_MATRIX_NV 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643 -#define GL_PROGRAM_PARAMETER_NV 0x8644 -#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645 -#define GL_PROGRAM_TARGET_NV 0x8646 -#define GL_PROGRAM_RESIDENT_NV 0x8647 -#define GL_TRACK_MATRIX_NV 0x8648 -#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649 -#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A -#define GL_PROGRAM_ERROR_POSITION_NV 0x864B -#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650 -#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651 -#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652 -#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653 -#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654 -#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655 -#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656 -#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657 -#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658 -#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659 -#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A -#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B -#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C -#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D -#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E -#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F -#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660 -#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661 -#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662 -#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663 -#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664 -#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665 -#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666 -#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667 -#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668 -#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669 -#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A -#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B -#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C -#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D -#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E -#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F -#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670 -#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671 -#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672 -#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673 -#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674 -#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675 -#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676 -#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677 -#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678 -#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 -#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A -#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B -#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C -#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D -#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E -#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 -#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A -#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SCALEBIAS_HINT_SGIX 0x8322 -#endif - -#ifndef GL_OML_interlace -#define GL_INTERLACE_OML 0x8980 -#define GL_INTERLACE_READ_OML 0x8981 -#endif - -#ifndef GL_OML_subsample -#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 -#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 -#endif - -#ifndef GL_OML_resample -#define GL_PACK_RESAMPLE_OML 0x8984 -#define GL_UNPACK_RESAMPLE_OML 0x8985 -#define GL_RESAMPLE_REPLICATE_OML 0x8986 -#define GL_RESAMPLE_ZERO_FILL_OML 0x8987 -#define GL_RESAMPLE_AVERAGE_OML 0x8988 -#define GL_RESAMPLE_DECIMATE_OML 0x8989 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_BUMP_ROT_MATRIX_ATI 0x8775 -#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 -#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 -#define GL_BUMP_TEX_UNITS_ATI 0x8778 -#define GL_DUDV_ATI 0x8779 -#define GL_DU8DV8_ATI 0x877A -#define GL_BUMP_ENVMAP_ATI 0x877B -#define GL_BUMP_TARGET_ATI 0x877C -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_FRAGMENT_SHADER_ATI 0x8920 -#define GL_REG_0_ATI 0x8921 -#define GL_REG_1_ATI 0x8922 -#define GL_REG_2_ATI 0x8923 -#define GL_REG_3_ATI 0x8924 -#define GL_REG_4_ATI 0x8925 -#define GL_REG_5_ATI 0x8926 -#define GL_REG_6_ATI 0x8927 -#define GL_REG_7_ATI 0x8928 -#define GL_REG_8_ATI 0x8929 -#define GL_REG_9_ATI 0x892A -#define GL_REG_10_ATI 0x892B -#define GL_REG_11_ATI 0x892C -#define GL_REG_12_ATI 0x892D -#define GL_REG_13_ATI 0x892E -#define GL_REG_14_ATI 0x892F -#define GL_REG_15_ATI 0x8930 -#define GL_REG_16_ATI 0x8931 -#define GL_REG_17_ATI 0x8932 -#define GL_REG_18_ATI 0x8933 -#define GL_REG_19_ATI 0x8934 -#define GL_REG_20_ATI 0x8935 -#define GL_REG_21_ATI 0x8936 -#define GL_REG_22_ATI 0x8937 -#define GL_REG_23_ATI 0x8938 -#define GL_REG_24_ATI 0x8939 -#define GL_REG_25_ATI 0x893A -#define GL_REG_26_ATI 0x893B -#define GL_REG_27_ATI 0x893C -#define GL_REG_28_ATI 0x893D -#define GL_REG_29_ATI 0x893E -#define GL_REG_30_ATI 0x893F -#define GL_REG_31_ATI 0x8940 -#define GL_CON_0_ATI 0x8941 -#define GL_CON_1_ATI 0x8942 -#define GL_CON_2_ATI 0x8943 -#define GL_CON_3_ATI 0x8944 -#define GL_CON_4_ATI 0x8945 -#define GL_CON_5_ATI 0x8946 -#define GL_CON_6_ATI 0x8947 -#define GL_CON_7_ATI 0x8948 -#define GL_CON_8_ATI 0x8949 -#define GL_CON_9_ATI 0x894A -#define GL_CON_10_ATI 0x894B -#define GL_CON_11_ATI 0x894C -#define GL_CON_12_ATI 0x894D -#define GL_CON_13_ATI 0x894E -#define GL_CON_14_ATI 0x894F -#define GL_CON_15_ATI 0x8950 -#define GL_CON_16_ATI 0x8951 -#define GL_CON_17_ATI 0x8952 -#define GL_CON_18_ATI 0x8953 -#define GL_CON_19_ATI 0x8954 -#define GL_CON_20_ATI 0x8955 -#define GL_CON_21_ATI 0x8956 -#define GL_CON_22_ATI 0x8957 -#define GL_CON_23_ATI 0x8958 -#define GL_CON_24_ATI 0x8959 -#define GL_CON_25_ATI 0x895A -#define GL_CON_26_ATI 0x895B -#define GL_CON_27_ATI 0x895C -#define GL_CON_28_ATI 0x895D -#define GL_CON_29_ATI 0x895E -#define GL_CON_30_ATI 0x895F -#define GL_CON_31_ATI 0x8960 -#define GL_MOV_ATI 0x8961 -#define GL_ADD_ATI 0x8963 -#define GL_MUL_ATI 0x8964 -#define GL_SUB_ATI 0x8965 -#define GL_DOT3_ATI 0x8966 -#define GL_DOT4_ATI 0x8967 -#define GL_MAD_ATI 0x8968 -#define GL_LERP_ATI 0x8969 -#define GL_CND_ATI 0x896A -#define GL_CND0_ATI 0x896B -#define GL_DOT2_ADD_ATI 0x896C -#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D -#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E -#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F -#define GL_NUM_PASSES_ATI 0x8970 -#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971 -#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972 -#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973 -#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974 -#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 -#define GL_SWIZZLE_STR_ATI 0x8976 -#define GL_SWIZZLE_STQ_ATI 0x8977 -#define GL_SWIZZLE_STR_DR_ATI 0x8978 -#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 -#define GL_SWIZZLE_STRQ_ATI 0x897A -#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B -#define GL_RED_BIT_ATI 0x00000001 -#define GL_GREEN_BIT_ATI 0x00000002 -#define GL_BLUE_BIT_ATI 0x00000004 -#define GL_2X_BIT_ATI 0x00000001 -#define GL_4X_BIT_ATI 0x00000002 -#define GL_8X_BIT_ATI 0x00000004 -#define GL_HALF_BIT_ATI 0x00000008 -#define GL_QUARTER_BIT_ATI 0x00000010 -#define GL_EIGHTH_BIT_ATI 0x00000020 -#define GL_SATURATE_BIT_ATI 0x00000040 -#define GL_COMP_BIT_ATI 0x00000002 -#define GL_NEGATE_BIT_ATI 0x00000004 -#define GL_BIAS_BIT_ATI 0x00000008 -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_PN_TRIANGLES_ATI 0x87F0 -#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 -#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 -#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 -#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4 -#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5 -#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6 -#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 -#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8 -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_STATIC_ATI 0x8760 -#define GL_DYNAMIC_ATI 0x8761 -#define GL_PRESERVE_ATI 0x8762 -#define GL_DISCARD_ATI 0x8763 -#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764 -#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765 -#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766 -#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767 -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_VERTEX_SHADER_EXT 0x8780 -#define GL_VERTEX_SHADER_BINDING_EXT 0x8781 -#define GL_OP_INDEX_EXT 0x8782 -#define GL_OP_NEGATE_EXT 0x8783 -#define GL_OP_DOT3_EXT 0x8784 -#define GL_OP_DOT4_EXT 0x8785 -#define GL_OP_MUL_EXT 0x8786 -#define GL_OP_ADD_EXT 0x8787 -#define GL_OP_MADD_EXT 0x8788 -#define GL_OP_FRAC_EXT 0x8789 -#define GL_OP_MAX_EXT 0x878A -#define GL_OP_MIN_EXT 0x878B -#define GL_OP_SET_GE_EXT 0x878C -#define GL_OP_SET_LT_EXT 0x878D -#define GL_OP_CLAMP_EXT 0x878E -#define GL_OP_FLOOR_EXT 0x878F -#define GL_OP_ROUND_EXT 0x8790 -#define GL_OP_EXP_BASE_2_EXT 0x8791 -#define GL_OP_LOG_BASE_2_EXT 0x8792 -#define GL_OP_POWER_EXT 0x8793 -#define GL_OP_RECIP_EXT 0x8794 -#define GL_OP_RECIP_SQRT_EXT 0x8795 -#define GL_OP_SUB_EXT 0x8796 -#define GL_OP_CROSS_PRODUCT_EXT 0x8797 -#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798 -#define GL_OP_MOV_EXT 0x8799 -#define GL_OUTPUT_VERTEX_EXT 0x879A -#define GL_OUTPUT_COLOR0_EXT 0x879B -#define GL_OUTPUT_COLOR1_EXT 0x879C -#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D -#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E -#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F -#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0 -#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1 -#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2 -#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3 -#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4 -#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5 -#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 -#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7 -#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8 -#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9 -#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA -#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB -#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC -#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD -#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE -#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF -#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0 -#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1 -#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2 -#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3 -#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4 -#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5 -#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6 -#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7 -#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8 -#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9 -#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA -#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB -#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC -#define GL_OUTPUT_FOG_EXT 0x87BD -#define GL_SCALAR_EXT 0x87BE -#define GL_VECTOR_EXT 0x87BF -#define GL_MATRIX_EXT 0x87C0 -#define GL_VARIANT_EXT 0x87C1 -#define GL_INVARIANT_EXT 0x87C2 -#define GL_LOCAL_CONSTANT_EXT 0x87C3 -#define GL_LOCAL_EXT 0x87C4 -#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5 -#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6 -#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7 -#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8 -#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9 -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE -#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF -#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0 -#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1 -#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2 -#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3 -#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4 -#define GL_X_EXT 0x87D5 -#define GL_Y_EXT 0x87D6 -#define GL_Z_EXT 0x87D7 -#define GL_W_EXT 0x87D8 -#define GL_NEGATIVE_X_EXT 0x87D9 -#define GL_NEGATIVE_Y_EXT 0x87DA -#define GL_NEGATIVE_Z_EXT 0x87DB -#define GL_NEGATIVE_W_EXT 0x87DC -#define GL_ZERO_EXT 0x87DD -#define GL_ONE_EXT 0x87DE -#define GL_NEGATIVE_ONE_EXT 0x87DF -#define GL_NORMALIZED_RANGE_EXT 0x87E0 -#define GL_FULL_RANGE_EXT 0x87E1 -#define GL_CURRENT_VERTEX_EXT 0x87E2 -#define GL_MVP_MATRIX_EXT 0x87E3 -#define GL_VARIANT_VALUE_EXT 0x87E4 -#define GL_VARIANT_DATATYPE_EXT 0x87E5 -#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6 -#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7 -#define GL_VARIANT_ARRAY_EXT 0x87E8 -#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9 -#define GL_INVARIANT_VALUE_EXT 0x87EA -#define GL_INVARIANT_DATATYPE_EXT 0x87EB -#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC -#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_MAX_VERTEX_STREAMS_ATI 0x876B -#define GL_VERTEX_STREAM0_ATI 0x876C -#define GL_VERTEX_STREAM1_ATI 0x876D -#define GL_VERTEX_STREAM2_ATI 0x876E -#define GL_VERTEX_STREAM3_ATI 0x876F -#define GL_VERTEX_STREAM4_ATI 0x8770 -#define GL_VERTEX_STREAM5_ATI 0x8771 -#define GL_VERTEX_STREAM6_ATI 0x8772 -#define GL_VERTEX_STREAM7_ATI 0x8773 -#define GL_VERTEX_SOURCE_ATI 0x8774 -#endif - -#ifndef GL_ATI_element_array -#define GL_ELEMENT_ARRAY_ATI 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A -#endif - -#ifndef GL_SUN_mesh_array -#define GL_QUAD_MESH_SUN 0x8614 -#define GL_TRIANGLE_MESH_SUN 0x8615 -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SLICE_ACCUM_SUN 0x85CC -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_DEPTH_CLAMP_NV 0x864F -#endif - -#ifndef GL_NV_occlusion_query -#define GL_PIXEL_COUNTER_BITS_NV 0x8864 -#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 -#define GL_PIXEL_COUNT_NV 0x8866 -#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 -#endif - -#ifndef GL_NV_point_sprite -#define GL_POINT_SPRITE_NV 0x8861 -#define GL_COORD_REPLACE_NV 0x8862 -#define GL_POINT_SPRITE_R_MODE_NV 0x8863 -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 -#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854 -#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857 -#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858 -#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859 -#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A -#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B -#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C -#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D -#define GL_HILO8_NV 0x885E -#define GL_SIGNED_HILO8_NV 0x885F -#define GL_FORCE_BLUE_TO_ONE_NV 0x8860 -#endif - -#ifndef GL_NV_vertex_program1_1 -#endif - -#ifndef GL_EXT_shadow_funcs -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 -#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 -#endif - -#ifndef GL_APPLE_element_array -#define GL_ELEMENT_ARRAY_APPLE 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x876A -#endif - -#ifndef GL_APPLE_fence -#define GL_DRAW_PIXELS_APPLE 0x8A0A -#define GL_FENCE_APPLE 0x8A0B -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E -#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F -#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521 -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_YCBCR_422_APPLE 0x85B9 -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - -#ifndef GL_S3_s3tc -#define GL_RGB_S3TC 0x83A0 -#define GL_RGB4_S3TC 0x83A1 -#define GL_RGBA_S3TC 0x83A2 -#define GL_RGBA4_S3TC 0x83A3 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ATI 0x8824 -#define GL_DRAW_BUFFER0_ATI 0x8825 -#define GL_DRAW_BUFFER1_ATI 0x8826 -#define GL_DRAW_BUFFER2_ATI 0x8827 -#define GL_DRAW_BUFFER3_ATI 0x8828 -#define GL_DRAW_BUFFER4_ATI 0x8829 -#define GL_DRAW_BUFFER5_ATI 0x882A -#define GL_DRAW_BUFFER6_ATI 0x882B -#define GL_DRAW_BUFFER7_ATI 0x882C -#define GL_DRAW_BUFFER8_ATI 0x882D -#define GL_DRAW_BUFFER9_ATI 0x882E -#define GL_DRAW_BUFFER10_ATI 0x882F -#define GL_DRAW_BUFFER11_ATI 0x8830 -#define GL_DRAW_BUFFER12_ATI 0x8831 -#define GL_DRAW_BUFFER13_ATI 0x8832 -#define GL_DRAW_BUFFER14_ATI 0x8833 -#define GL_DRAW_BUFFER15_ATI 0x8834 -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 -#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_MODULATE_ADD_ATI 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 -#define GL_MODULATE_SUBTRACT_ATI 0x8746 -#endif - -#ifndef GL_ATI_texture_float -#define GL_RGBA_FLOAT32_ATI 0x8814 -#define GL_RGB_FLOAT32_ATI 0x8815 -#define GL_ALPHA_FLOAT32_ATI 0x8816 -#define GL_INTENSITY_FLOAT32_ATI 0x8817 -#define GL_LUMINANCE_FLOAT32_ATI 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819 -#define GL_RGBA_FLOAT16_ATI 0x881A -#define GL_RGB_FLOAT16_ATI 0x881B -#define GL_ALPHA_FLOAT16_ATI 0x881C -#define GL_INTENSITY_FLOAT16_ATI 0x881D -#define GL_LUMINANCE_FLOAT16_ATI 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F -#endif - -#ifndef GL_NV_float_buffer -#define GL_FLOAT_R_NV 0x8880 -#define GL_FLOAT_RG_NV 0x8881 -#define GL_FLOAT_RGB_NV 0x8882 -#define GL_FLOAT_RGBA_NV 0x8883 -#define GL_FLOAT_R16_NV 0x8884 -#define GL_FLOAT_R32_NV 0x8885 -#define GL_FLOAT_RG16_NV 0x8886 -#define GL_FLOAT_RG32_NV 0x8887 -#define GL_FLOAT_RGB16_NV 0x8888 -#define GL_FLOAT_RGB32_NV 0x8889 -#define GL_FLOAT_RGBA16_NV 0x888A -#define GL_FLOAT_RGBA32_NV 0x888B -#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C -#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D -#define GL_FLOAT_RGBA_MODE_NV 0x888E -#endif - -#ifndef GL_NV_fragment_program -#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868 -#define GL_FRAGMENT_PROGRAM_NV 0x8870 -#define GL_MAX_TEXTURE_COORDS_NV 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872 -#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873 -#define GL_PROGRAM_ERROR_STRING_NV 0x8874 -#endif - -#ifndef GL_NV_half_float -#define GL_HALF_FLOAT_NV 0x140B -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878 -#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879 -#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A -#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B -#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C -#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D -#endif - -#ifndef GL_NV_primitive_restart -#define GL_PRIMITIVE_RESTART_NV 0x8558 -#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F -#endif - -#ifndef GL_NV_vertex_program2 -#endif - -#ifndef GL_ATI_map_object_buffer -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_STENCIL_BACK_FUNC_ATI 0x8800 -#define GL_STENCIL_BACK_FAIL_ATI 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#endif - -#ifndef GL_OES_read_format -#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 -#define GL_DEPTH_BOUNDS_EXT 0x8891 -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_MIRROR_CLAMP_EXT 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 -#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_BLEND_EQUATION_RGB_EXT GL_BLEND_EQUATION -#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D -#endif - -#ifndef GL_MESA_pack_invert -#define GL_PACK_INVERT_MESA 0x8758 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB -#define GL_YCBCR_MESA 0x8757 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF -#endif - -#ifndef GL_NV_fragment_program_option -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 -#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 -#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7 -#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8 -#endif - -#ifndef GL_NV_vertex_program2_option -/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ -/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */ -#endif - -#ifndef GL_NV_vertex_program3 -/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 -#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 -#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 -#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 -#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 -#define GL_FRAMEBUFFER_EXT 0x8D40 -#define GL_RENDERBUFFER_EXT 0x8D41 -#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 -#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 -#define GL_STENCIL_INDEX1_EXT 0x8D46 -#define GL_STENCIL_INDEX4_EXT 0x8D47 -#define GL_STENCIL_INDEX8_EXT 0x8D48 -#define GL_STENCIL_INDEX16_EXT 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 -#endif - -#ifndef GL_GREMEDY_string_marker -#endif - - -/*************************************************************/ - -#include -#ifndef GL_VERSION_2_0 -/* GL type for program/shader text */ -typedef char GLchar; /* native character */ -#endif - -#ifndef GL_VERSION_1_5 -/* GL types for handling large vertex buffer objects */ -typedef ptrdiff_t GLintptr; -typedef ptrdiff_t GLsizeiptr; -#endif - -#ifndef GL_ARB_vertex_buffer_object -/* GL types for handling large vertex buffer objects */ -typedef ptrdiff_t GLintptrARB; -typedef ptrdiff_t GLsizeiptrARB; -#endif - -#ifndef GL_ARB_shader_objects -/* GL types for handling shader object handles and program/shader text */ -typedef char GLcharARB; /* native character */ -typedef unsigned int GLhandleARB; /* shader object handle */ -#endif - -/* GL types for "half" precision (s10e5) float data in host memory */ -#ifndef GL_ARB_half_float_pixel -typedef unsigned short GLhalfARB; -#endif - -#ifndef GL_NV_half_float -typedef unsigned short GLhalfNV; -#endif - -#ifndef GL_VERSION_1_2 -#define GL_VERSION_1_2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf); -GLAPI void APIENTRY glBlendEquation (GLenum); -GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *); -GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei); -GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint); -GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *); -GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *); -GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean); -GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean); -GLAPI void APIENTRY glResetHistogram (GLenum); -GLAPI void APIENTRY glResetMinmax (GLenum); -GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target); -typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_VERSION_1_3 -#define GL_VERSION_1_3 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTexture (GLenum); -GLAPI void APIENTRY glClientActiveTexture (GLenum); -GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble); -GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat); -GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint); -GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort); -GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *); -GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *); -GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *); -GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *); -GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *); -GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean); -GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_VERSION_1_4 -#define GL_VERSION_1_4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glFogCoordf (GLfloat); -GLAPI void APIENTRY glFogCoordfv (const GLfloat *); -GLAPI void APIENTRY glFogCoordd (GLdouble); -GLAPI void APIENTRY glFogCoorddv (const GLdouble *); -GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei); -GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); -GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *); -GLAPI void APIENTRY glPointParameteri (GLenum, GLint); -GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *); -GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *); -GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *); -GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *); -GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint); -GLAPI void APIENTRY glSecondaryColor3iv (const GLint *); -GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *); -GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *); -GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *); -GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort); -GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *); -GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos2dv (const GLdouble *); -GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos2fv (const GLfloat *); -GLAPI void APIENTRY glWindowPos2i (GLint, GLint); -GLAPI void APIENTRY glWindowPos2iv (const GLint *); -GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort); -GLAPI void APIENTRY glWindowPos2sv (const GLshort *); -GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos3dv (const GLdouble *); -GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos3fv (const GLfloat *); -GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos3iv (const GLint *); -GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos3sv (const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v); -#endif - -#ifndef GL_VERSION_1_5 -#define GL_VERSION_1_5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsQuery (GLuint); -GLAPI void APIENTRY glBeginQuery (GLenum, GLuint); -GLAPI void APIENTRY glEndQuery (GLenum); -GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *); -GLAPI void APIENTRY glBindBuffer (GLenum, GLuint); -GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsBuffer (GLuint); -GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum); -GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *); -GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *); -GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum); -GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum); -GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_VERSION_2_0 -#define GL_VERSION_2_0 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum); -GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *); -GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint); -GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint); -GLAPI void APIENTRY glAttachShader (GLuint, GLuint); -GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *); -GLAPI void APIENTRY glCompileShader (GLuint); -GLAPI GLuint APIENTRY glCreateProgram (void); -GLAPI GLuint APIENTRY glCreateShader (GLenum); -GLAPI void APIENTRY glDeleteProgram (GLuint); -GLAPI void APIENTRY glDeleteShader (GLuint); -GLAPI void APIENTRY glDetachShader (GLuint, GLuint); -GLAPI void APIENTRY glDisableVertexAttribArray (GLuint); -GLAPI void APIENTRY glEnableVertexAttribArray (GLuint); -GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *); -GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *); -GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *); -GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *); -GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *); -GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *); -GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *); -GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *); -GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *); -GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *); -GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *); -GLAPI GLboolean APIENTRY glIsProgram (GLuint); -GLAPI GLboolean APIENTRY glIsShader (GLuint); -GLAPI void APIENTRY glLinkProgram (GLuint); -GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *); -GLAPI void APIENTRY glUseProgram (GLuint); -GLAPI void APIENTRY glUniform1f (GLint, GLfloat); -GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform1i (GLint, GLint); -GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint); -GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glValidateProgram (GLuint); -GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble); -GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat); -GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort); -GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs); -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask); -typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name); -typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader); -typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type); -typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program); -typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); -typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_ARB_multitexture -#define GL_ARB_multitexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTextureARB (GLenum); -GLAPI void APIENTRY glClientActiveTextureARB (GLenum); -GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble); -GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat); -GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint); -GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort); -GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_ARB_transpose_matrix 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *); -GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *); -GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *); -GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -#endif - -#ifndef GL_ARB_multisample -#define GL_ARB_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); -#endif - -#ifndef GL_ARB_texture_env_add -#define GL_ARB_texture_env_add 1 -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_ARB_texture_cube_map 1 -#endif - -#ifndef GL_ARB_texture_compression -#define GL_ARB_texture_compression 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_ARB_texture_border_clamp 1 -#endif - -#ifndef GL_ARB_point_parameters -#define GL_ARB_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_ARB_vertex_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *); -GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *); -GLAPI void APIENTRY glWeightivARB (GLint, const GLint *); -GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *); -GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *); -GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *); -GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *); -GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *); -GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glVertexBlendARB (GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights); -typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights); -typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights); -typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights); -typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights); -typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights); -typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count); -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_ARB_matrix_palette 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint); -GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *); -GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *); -GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *); -GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index); -typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_ARB_texture_env_combine 1 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#define GL_ARB_texture_env_crossbar 1 -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_ARB_texture_env_dot3 1 -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_ARB_texture_mirrored_repeat 1 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_ARB_depth_texture 1 -#endif - -#ifndef GL_ARB_shadow -#define GL_ARB_shadow 1 -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_ARB_shadow_ambient 1 -#endif - -#ifndef GL_ARB_window_pos -#define GL_ARB_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *); -GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *); -GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint); -GLAPI void APIENTRY glWindowPos2ivARB (const GLint *); -GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort); -GLAPI void APIENTRY glWindowPos2svARB (const GLshort *); -GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *); -GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *); -GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos3ivARB (const GLint *); -GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos3svARB (const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v); -#endif - -#ifndef GL_ARB_vertex_program -#define GL_ARB_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble); -GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat); -GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort); -GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); -GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint); -GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint); -GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint); -GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *); -GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *); -GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *); -GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *); -GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *); -GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *); -GLAPI GLboolean APIENTRY glIsProgramARB (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string); -typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program); -#endif - -#ifndef GL_ARB_fragment_program -#define GL_ARB_fragment_program 1 -/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */ -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_ARB_vertex_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint); -GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsBufferARB (GLuint); -GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum); -GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *); -GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *); -GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum); -GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum); -GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_ARB_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsQueryARB (GLuint); -GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint); -GLAPI void APIENTRY glEndQueryARB (GLenum); -GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_ARB_shader_objects -#define GL_ARB_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB); -GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum); -GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB); -GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum); -GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *); -GLAPI void APIENTRY glCompileShaderARB (GLhandleARB); -GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void); -GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB); -GLAPI void APIENTRY glLinkProgramARB (GLhandleARB); -GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB); -GLAPI void APIENTRY glValidateProgramARB (GLhandleARB); -GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat); -GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform1iARB (GLint, GLint); -GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint); -GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *); -GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *); -GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *); -GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *); -GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *); -GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); -GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *); -GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *); -GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj); -typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType); -typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length); -typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void); -typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj); -typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); -typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_ARB_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *); -GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); -GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_ARB_fragment_shader 1 -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_ARB_shading_language_100 1 -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#define GL_ARB_texture_non_power_of_two 1 -#endif - -#ifndef GL_ARB_point_sprite -#define GL_ARB_point_sprite 1 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#define GL_ARB_fragment_program_shadow 1 -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_ARB_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_ARB_texture_rectangle 1 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_ARB_color_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClampColorARB (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_ARB_half_float_pixel 1 -#endif - -#ifndef GL_ARB_texture_float -#define GL_ARB_texture_float 1 -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_ARB_pixel_buffer_object 1 -#endif - -#ifndef GL_EXT_abgr -#define GL_EXT_abgr 1 -#endif - -#ifndef GL_EXT_blend_color -#define GL_EXT_blend_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_EXT_polygon_offset 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias); -#endif - -#ifndef GL_EXT_texture -#define GL_EXT_texture 1 -#endif - -#ifndef GL_EXT_texture3D -#define GL_EXT_texture3D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_SGIS_texture_filter4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights); -typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); -#endif - -#ifndef GL_EXT_subtexture -#define GL_EXT_subtexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_EXT_copy_texture -#define GL_EXT_copy_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint); -GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint); -GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei); -GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_histogram -#define GL_EXT_histogram 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean); -GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean); -GLAPI void APIENTRY glResetHistogramEXT (GLenum); -GLAPI void APIENTRY glResetMinmaxEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target); -#endif - -#ifndef GL_EXT_convolution -#define GL_EXT_convolution 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint); -GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *); -GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -#endif - -#ifndef GL_EXT_color_matrix -#define GL_EXT_color_matrix 1 -#endif - -#ifndef GL_SGI_color_table -#define GL_SGI_color_table 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params); -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_SGIX_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenSGIX (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode); -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_SGIS_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint); -GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *); -GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat); -GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *); -GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *); -GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIS_texture4D -#define GL_SGIS_texture4D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_SGI_texture_color_table 1 -#endif - -#ifndef GL_EXT_cmyka -#define GL_EXT_cmyka 1 -#endif - -#ifndef GL_EXT_texture_object -#define GL_EXT_texture_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *); -GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint); -GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint); -GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures); -typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures); -typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture); -typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities); -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_SGIS_detail_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *); -GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_SGIS_sharpen_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *); -GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_EXT_packed_pixels 1 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_SGIS_texture_lod 1 -#endif - -#ifndef GL_SGIS_multisample -#define GL_SGIS_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean); -GLAPI void APIENTRY glSamplePatternSGIS (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern); -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_EXT_rescale_normal 1 -#endif - -#ifndef GL_EXT_vertex_array -#define GL_EXT_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glArrayElementEXT (GLint); -GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei); -GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *); -GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *); -GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i); -typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer); -typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params); -typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_misc_attribute -#define GL_EXT_misc_attribute 1 -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_SGIS_generate_mipmap 1 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_SGIX_clipmap 1 -#endif - -#ifndef GL_SGIX_shadow -#define GL_SGIX_shadow 1 -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_SGIS_texture_edge_clamp 1 -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_SGIS_texture_border_clamp 1 -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_EXT_blend_subtract 1 -#endif - -#ifndef GL_EXT_blend_logic_op -#define GL_EXT_blend_logic_op 1 -#endif - -#ifndef GL_SGIX_interlace -#define GL_SGIX_interlace 1 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_SGIX_pixel_tiles 1 -#endif - -#ifndef GL_SGIX_texture_select -#define GL_SGIX_texture_select 1 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SGIX_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat); -GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *); -GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint); -GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_SGIX_texture_multi_buffer 1 -#endif - -#ifndef GL_EXT_point_parameters -#define GL_EXT_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_SGIS_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIX_instruments -#define GL_SGIX_instruments 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLint APIENTRY glGetInstrumentsSGIX (void); -GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *); -GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *); -GLAPI void APIENTRY glReadInstrumentsSGIX (GLint); -GLAPI void APIENTRY glStartInstrumentsSGIX (void); -GLAPI void APIENTRY glStopInstrumentsSGIX (GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer); -typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p); -typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker); -typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker); -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_SGIX_texture_scale_bias 1 -#endif - -#ifndef GL_SGIX_framezoom -#define GL_SGIX_framezoom 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFrameZoomSGIX (GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor); -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#define GL_SGIX_tag_sample_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTagSampleBufferSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_SGIX_polynomial_ffd 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *); -GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *); -GLAPI void APIENTRY glDeformSGIX (GLbitfield); -GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); -typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask); -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_SGIX_reference_plane 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation); -#endif - -#ifndef GL_SGIX_flush_raster -#define GL_SGIX_flush_raster 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushRasterSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_SGIX_depth_texture 1 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_SGIS_fog_function 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *); -GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points); -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_SGIX_fog_offset 1 -#endif - -#ifndef GL_HP_image_transform -#define GL_HP_image_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint); -GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_HP_convolution_border_modes 1 -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_SGIX_texture_add_env 1 -#endif - -#ifndef GL_EXT_color_subtable -#define GL_EXT_color_subtable 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_PGI_vertex_hints 1 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PGI_misc_hints 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glHintPGI (GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode); -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_EXT_paletted_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_EXT_clip_volume_hint 1 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_SGIX_list_priority 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat); -GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *); -GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint); -GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_SGIX_ir_instrument1 1 -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_SGIX_calligraphic_fragment 1 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_SGIX_texture_lod_bias 1 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SGIX_shadow_ambient 1 -#endif - -#ifndef GL_EXT_index_texture -#define GL_EXT_index_texture 1 -#endif - -#ifndef GL_EXT_index_material -#define GL_EXT_index_material 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_EXT_index_func -#define GL_EXT_index_func 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref); -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_EXT_index_array_formats 1 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_EXT_compiled_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei); -GLAPI void APIENTRY glUnlockArraysEXT (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void); -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_EXT_cull_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *); -GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_SGIX_ycrcb 1 -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_SGIX_fragment_lighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum); -GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint); -GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat); -GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *); -GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint); -GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *); -GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint); -GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_IBM_rasterpos_clip 1 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_HP_texture_lighting 1 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_EXT_draw_range_elements 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -#endif - -#ifndef GL_WIN_phong_shading -#define GL_WIN_phong_shading 1 -#endif - -#ifndef GL_WIN_specular_fog -#define GL_WIN_specular_fog 1 -#endif - -#ifndef GL_EXT_light_texture -#define GL_EXT_light_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glApplyTextureEXT (GLenum); -GLAPI void APIENTRY glTextureLightEXT (GLenum); -GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_SGIX_blend_alpha_minmax 1 -#endif - -#ifndef GL_EXT_bgra -#define GL_EXT_bgra 1 -#endif - -#ifndef GL_SGIX_async -#define GL_SGIX_async 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint); -GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *); -GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *); -GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei); -GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei); -GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker); -typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp); -typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp); -typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range); -typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range); -typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker); -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_SGIX_async_pixel 1 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_SGIX_async_histogram 1 -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_INTEL_parallel_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *); -GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *); -GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *); -GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -#endif - -#ifndef GL_HP_occlusion_test -#define GL_HP_occlusion_test 1 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_EXT_pixel_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint); -GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#define GL_EXT_pixel_transform_color_table 1 -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_EXT_shared_texture_palette 1 -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_EXT_separate_specular_color 1 -#endif - -#ifndef GL_EXT_secondary_color -#define GL_EXT_secondary_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *); -GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *); -GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *); -GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint); -GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *); -GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *); -GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *); -GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *); -GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort); -GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *); -GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_EXT_texture_perturb_normal 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureNormalEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei); -GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_fog_coord -#define GL_EXT_fog_coord 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogCoordfEXT (GLfloat); -GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *); -GLAPI void APIENTRY glFogCoorddEXT (GLdouble); -GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *); -GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_REND_screen_coordinates 1 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_EXT_coordinate_frame 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *); -GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *); -GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *); -GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint); -GLAPI void APIENTRY glTangent3ivEXT (const GLint *); -GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glTangent3svEXT (const GLshort *); -GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *); -GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *); -GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *); -GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint); -GLAPI void APIENTRY glBinormal3ivEXT (const GLint *); -GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glBinormal3svEXT (const GLshort *); -GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz); -typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz); -typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz); -typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz); -typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz); -typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz); -typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz); -typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz); -typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz); -typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz); -typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_EXT_texture_env_combine 1 -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_APPLE_specular_vector 1 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_APPLE_transform_hint 1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_SGIX_fog_scale 1 -#endif - -#ifndef GL_SUNX_constant_data -#define GL_SUNX_constant_data 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFinishTextureSUNX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void); -#endif - -#ifndef GL_SUN_global_alpha -#define GL_SUN_global_alpha 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte); -GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort); -GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint); -GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat); -GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble); -GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte); -GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort); -GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor); -#endif - -#ifndef GL_SUN_triangle_list -#define GL_SUN_triangle_list 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint); -GLAPI void APIENTRY glReplacementCodeusSUN (GLushort); -GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte); -GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *); -GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *); -GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *); -GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer); -#endif - -#ifndef GL_SUN_vertex -#define GL_SUN_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat); -GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_EXT_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_blend_func_separate -#define GL_INGR_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_color_clamp -#define GL_INGR_color_clamp 1 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INGR_interlace_read 1 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_EXT_stencil_wrap 1 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_EXT_422_pixels 1 -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NV_texgen_reflection 1 -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_SUN_convolution_border_modes 1 -#endif - -#ifndef GL_EXT_texture_env_add -#define GL_EXT_texture_env_add 1 -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_EXT_texture_lod_bias 1 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexWeightfEXT (GLfloat); -GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *); -GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_NV_light_max_exponent 1 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_NV_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushVertexArrayRangeNV (void); -GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void); -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer); -#endif - -#ifndef GL_NV_register_combiners -#define GL_NV_register_combiners 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *); -GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat); -GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *); -GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint); -GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean); -GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params); -#endif - -#ifndef GL_NV_fog_distance -#define GL_NV_fog_distance 1 -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_NV_texgen_emboss 1 -#endif - -#ifndef GL_NV_blend_square -#define GL_NV_blend_square 1 -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_NV_texture_env_combine4 1 -#endif - -#ifndef GL_MESA_resize_buffers -#define GL_MESA_resize_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glResizeBuffersMESA (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void); -#endif - -#ifndef GL_MESA_window_pos -#define GL_MESA_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *); -GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *); -GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint); -GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *); -GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort); -GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *); -GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *); -GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *); -GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *); -GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *); -GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *); -GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *); -GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *); -GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v); -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_IBM_cull_vertex 1 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#define GL_IBM_multimode_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint); -GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride); -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_IBM_vertex_array_lists 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint); -GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -#endif - -#ifndef GL_SGIX_subsample -#define GL_SGIX_subsample 1 -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_SGIX_ycrcba 1 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#define GL_SGIX_ycrcb_subsample 1 -#endif - -#ifndef GL_SGIX_depth_pass_instrument -#define GL_SGIX_depth_pass_instrument 1 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_3DFX_texture_compression_FXT1 1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_3DFX_multisample 1 -#endif - -#ifndef GL_3DFX_tbuffer -#define GL_3DFX_tbuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTbufferMask3DFX (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask); -#endif - -#ifndef GL_EXT_multisample -#define GL_EXT_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean); -GLAPI void APIENTRY glSamplePatternEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern); -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_SGIX_vertex_preclip 1 -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_SGIX_convolution_accuracy 1 -#endif - -#ifndef GL_SGIX_resample -#define GL_SGIX_resample 1 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_SGIS_point_line_texgen 1 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_SGIS_texture_color_mask 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -#endif - -#ifndef GL_SGIX_igloo_interface -#define GL_SGIX_igloo_interface 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params); -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_EXT_texture_env_dot3 1 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_ATI_texture_mirror_once 1 -#endif - -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsFenceNV (GLuint); -GLAPI GLboolean APIENTRY glTestFenceNV (GLuint); -GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glFinishFenceNV (GLuint); -GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -#endif - -#ifndef GL_NV_evaluators -#define GL_NV_evaluators 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *); -GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *); -GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_NV_packed_depth_stencil 1 -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_NV_register_combiners2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_NV_texture_compression_vtc -#define GL_NV_texture_compression_vtc 1 -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_NV_texture_rectangle 1 -#endif - -#ifndef GL_NV_texture_shader -#define GL_NV_texture_shader 1 -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_NV_texture_shader2 1 -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_NV_vertex_array_range2 1 -#endif - -#ifndef GL_NV_vertex_program -#define GL_NV_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *); -GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint); -GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *); -GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *); -GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *); -GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *); -GLAPI GLboolean APIENTRY glIsProgramNV (GLuint); -GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *); -GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *); -GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *); -GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum); -GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble); -GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat); -GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort); -GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params); -typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program); -typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v); -typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_SGIX_texture_coordinate_clamp 1 -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SGIX_scalebias_hint 1 -#endif - -#ifndef GL_OML_interlace -#define GL_OML_interlace 1 -#endif - -#ifndef GL_OML_subsample -#define GL_OML_subsample 1 -#endif - -#ifndef GL_OML_resample -#define GL_OML_resample 1 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_NV_copy_depth_to_color 1 -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_ATI_envmap_bumpmap 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *); -GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *); -GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_ATI_fragment_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint); -GLAPI void APIENTRY glBindFragmentShaderATI (GLuint); -GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint); -GLAPI void APIENTRY glBeginFragmentShaderATI (void); -GLAPI void APIENTRY glEndFragmentShaderATI (void); -GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum); -GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum); -GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range); -typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle); -typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value); -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_ATI_pn_triangles 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint); -GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_ATI_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum); -GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint); -GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum); -GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glFreeObjectBufferATI (GLuint); -GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint); -GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint); -GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage); -typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params); -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_EXT_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginVertexShaderEXT (void); -GLAPI void APIENTRY glEndVertexShaderEXT (void); -GLAPI void APIENTRY glBindVertexShaderEXT (GLuint); -GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint); -GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint); -GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint); -GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint); -GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint); -GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint); -GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *); -GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *); -GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *); -GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *); -GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *); -GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *); -GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *); -GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *); -GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *); -GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *); -GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *); -GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint); -GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint); -GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum); -GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum); -GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum); -GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum); -GLAPI GLuint APIENTRY glBindParameterEXT (GLenum); -GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum); -GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *); -GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *); -GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *); -GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *); -GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range); -typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1); -typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components); -typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr); -typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr); -typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr); -typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr); -typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr); -typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr); -typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr); -typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr); -typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr); -typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value); -typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap); -typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data); -typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_ATI_vertex_streams 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort); -GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint); -GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat); -GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble); -GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort); -GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint); -GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *); -GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum); -GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint); -GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_element_array -#define GL_ATI_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *); -GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei); -GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count); -#endif - -#ifndef GL_SUN_mesh_array -#define GL_SUN_mesh_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width); -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SUN_slice_accum 1 -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_NV_multisample_filter_hint 1 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_NV_depth_clamp 1 -#endif - -#ifndef GL_NV_occlusion_query -#define GL_NV_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint); -GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint); -GLAPI void APIENTRY glEndOcclusionQueryNV (void); -GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_NV_point_sprite -#define GL_NV_point_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint); -GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_NV_texture_shader3 1 -#endif - -#ifndef GL_NV_vertex_program1_1 -#define GL_NV_vertex_program1_1 1 -#endif - -#ifndef GL_EXT_shadow_funcs -#define GL_EXT_shadow_funcs 1 -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_EXT_stencil_two_side 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_ATI_text_fragment_shader 1 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_APPLE_client_storage 1 -#endif - -#ifndef GL_APPLE_element_array -#define GL_APPLE_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *); -GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei); -GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei); -GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei); -GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); -#endif - -#ifndef GL_APPLE_fence -#define GL_APPLE_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *); -GLAPI void APIENTRY glSetFenceAPPLE (GLuint); -GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint); -GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint); -GLAPI void APIENTRY glFinishFenceAPPLE (GLuint); -GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint); -GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences); -typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name); -typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name); -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_APPLE_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint); -GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array); -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays); -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays); -typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array); -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_APPLE_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *); -GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *); -GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_APPLE_ycbcr_422 1 -#endif - -#ifndef GL_S3_s3tc -#define GL_S3_s3tc 1 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_ATI_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_ATI_pixel_format_float 1 -/* This is really a WGL extension, but defines some associated GL enums. - * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string. - */ -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_ATI_texture_env_combine3 1 -#endif - -#ifndef GL_ATI_texture_float -#define GL_ATI_texture_float 1 -#endif - -#ifndef GL_NV_float_buffer -#define GL_NV_float_buffer 1 -#endif - -#ifndef GL_NV_fragment_program -#define GL_NV_fragment_program 1 -/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *); -GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *); -GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); -#endif - -#ifndef GL_NV_half_float -#define GL_NV_half_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *); -GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *); -GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *); -GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV); -GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *); -GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *); -GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *); -GLAPI void APIENTRY glFogCoordhNV (GLhalfNV); -GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *); -GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV); -GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); -typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); -typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s); -typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog); -typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_NV_pixel_data_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *); -GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target); -#endif - -#ifndef GL_NV_primitive_restart -#define GL_NV_primitive_restart 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPrimitiveRestartNV (void); -GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void); -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index); -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_NV_texture_expand_normal 1 -#endif - -#ifndef GL_NV_vertex_program2 -#define GL_NV_vertex_program2 1 -#endif - -#ifndef GL_ATI_map_object_buffer -#define GL_ATI_map_object_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint); -GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer); -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_ATI_separate_stencil 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#define GL_ATI_vertex_attrib_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint); -GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params); -#endif - -#ifndef GL_OES_read_format -#define GL_OES_read_format 1 -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_EXT_depth_bounds_test 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax); -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_EXT_texture_mirror_clamp 1 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_EXT_blend_equation_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha); -#endif - -#ifndef GL_MESA_pack_invert -#define GL_MESA_pack_invert 1 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_MESA_ycbcr_texture 1 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_EXT_pixel_buffer_object 1 -#endif - -#ifndef GL_NV_fragment_program_option -#define GL_NV_fragment_program_option 1 -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_NV_fragment_program2 1 -#endif - -#ifndef GL_NV_vertex_program2_option -#define GL_NV_vertex_program2_option 1 -#endif - -#ifndef GL_NV_vertex_program3 -#define GL_NV_vertex_program3 1 -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_EXT_framebuffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint); -GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint); -GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *); -GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei); -GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *); -GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint); -GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint); -GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *); -GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum); -GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint); -GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint); -GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint); -GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint); -GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGenerateMipmapEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer); -typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer); -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer); -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers); -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers); -typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target); -#endif - -#ifndef GL_GREMEDY_string_marker -#define GL_GREMEDY_string_marker 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string); -#endif - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/opengl/glut32.lib b/opengl/glut32.lib deleted file mode 100644 index 494cad96eeeebbde33e6d77baa881c4483df9bbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13824 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 CmU5~9 diff --git a/opengl/wglew.h b/opengl/wglew.h deleted file mode 100644 index 71ee0f30..00000000 --- a/opengl/wglew.h +++ /dev/null @@ -1,1427 +0,0 @@ -/* -** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2015, Nigel Stewart -** Copyright (C) 2002-2008, Milan Ikits -** Copyright (C) 2002-2008, Marcelo E. Magallon -** Copyright (C) 2002, Lev Povalahev -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are met: -** -** * Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** * The name of the author may be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -** THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* -** Copyright (c) 2007 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -#ifndef __wglew_h__ -#define __wglew_h__ -#define __WGLEW_H__ - -#ifdef __wglext_h_ -#error wglext.h included before wglew.h -#endif - -#define __wglext_h_ - -#if !defined(WINAPI) -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN 1 -# endif -#include -# undef WIN32_LEAN_AND_MEAN -#endif - -/* - * GLEW_STATIC needs to be set when using the static version. - * GLEW_BUILD is set when building the DLL version. - */ -#ifdef GLEW_STATIC -# define GLEWAPI extern -#else -# ifdef GLEW_BUILD -# define GLEWAPI extern __declspec(dllexport) -# else -# define GLEWAPI extern __declspec(dllimport) -# endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* -------------------------- WGL_3DFX_multisample ------------------------- */ - -#ifndef WGL_3DFX_multisample -#define WGL_3DFX_multisample 1 - -#define WGL_SAMPLE_BUFFERS_3DFX 0x2060 -#define WGL_SAMPLES_3DFX 0x2061 - -#define WGLEW_3DFX_multisample WGLEW_GET_VAR(__WGLEW_3DFX_multisample) - -#endif /* WGL_3DFX_multisample */ - -/* ------------------------- WGL_3DL_stereo_control ------------------------ */ - -#ifndef WGL_3DL_stereo_control -#define WGL_3DL_stereo_control 1 - -#define WGL_STEREO_EMITTER_ENABLE_3DL 0x2055 -#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056 -#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057 -#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058 - -typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState); - -#define wglSetStereoEmitterState3DL WGLEW_GET_FUN(__wglewSetStereoEmitterState3DL) - -#define WGLEW_3DL_stereo_control WGLEW_GET_VAR(__WGLEW_3DL_stereo_control) - -#endif /* WGL_3DL_stereo_control */ - -/* ------------------------ WGL_AMD_gpu_association ------------------------ */ - -#ifndef WGL_AMD_gpu_association -#define WGL_AMD_gpu_association 1 - -#define WGL_GPU_VENDOR_AMD 0x1F00 -#define WGL_GPU_RENDERER_STRING_AMD 0x1F01 -#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02 -#define WGL_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2 -#define WGL_GPU_RAM_AMD 0x21A3 -#define WGL_GPU_CLOCK_AMD 0x21A4 -#define WGL_GPU_NUM_PIPES_AMD 0x21A5 -#define WGL_GPU_NUM_SIMD_AMD 0x21A6 -#define WGL_GPU_NUM_RB_AMD 0x21A7 -#define WGL_GPU_NUM_SPI_AMD 0x21A8 - -typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id); -typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int* attribList); -typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc); -typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc); -typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void); -typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT* ids); -typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, INT property, GLenum dataType, UINT size, void* data); -typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc); - -#define wglBlitContextFramebufferAMD WGLEW_GET_FUN(__wglewBlitContextFramebufferAMD) -#define wglCreateAssociatedContextAMD WGLEW_GET_FUN(__wglewCreateAssociatedContextAMD) -#define wglCreateAssociatedContextAttribsAMD WGLEW_GET_FUN(__wglewCreateAssociatedContextAttribsAMD) -#define wglDeleteAssociatedContextAMD WGLEW_GET_FUN(__wglewDeleteAssociatedContextAMD) -#define wglGetContextGPUIDAMD WGLEW_GET_FUN(__wglewGetContextGPUIDAMD) -#define wglGetCurrentAssociatedContextAMD WGLEW_GET_FUN(__wglewGetCurrentAssociatedContextAMD) -#define wglGetGPUIDsAMD WGLEW_GET_FUN(__wglewGetGPUIDsAMD) -#define wglGetGPUInfoAMD WGLEW_GET_FUN(__wglewGetGPUInfoAMD) -#define wglMakeAssociatedContextCurrentAMD WGLEW_GET_FUN(__wglewMakeAssociatedContextCurrentAMD) - -#define WGLEW_AMD_gpu_association WGLEW_GET_VAR(__WGLEW_AMD_gpu_association) - -#endif /* WGL_AMD_gpu_association */ - -/* ------------------------- WGL_ARB_buffer_region ------------------------- */ - -#ifndef WGL_ARB_buffer_region -#define WGL_ARB_buffer_region 1 - -#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001 -#define WGL_BACK_COLOR_BUFFER_BIT_ARB 0x00000002 -#define WGL_DEPTH_BUFFER_BIT_ARB 0x00000004 -#define WGL_STENCIL_BUFFER_BIT_ARB 0x00000008 - -typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType); -typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion); -typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); -typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height); - -#define wglCreateBufferRegionARB WGLEW_GET_FUN(__wglewCreateBufferRegionARB) -#define wglDeleteBufferRegionARB WGLEW_GET_FUN(__wglewDeleteBufferRegionARB) -#define wglRestoreBufferRegionARB WGLEW_GET_FUN(__wglewRestoreBufferRegionARB) -#define wglSaveBufferRegionARB WGLEW_GET_FUN(__wglewSaveBufferRegionARB) - -#define WGLEW_ARB_buffer_region WGLEW_GET_VAR(__WGLEW_ARB_buffer_region) - -#endif /* WGL_ARB_buffer_region */ - -/* --------------------- WGL_ARB_context_flush_control --------------------- */ - -#ifndef WGL_ARB_context_flush_control -#define WGL_ARB_context_flush_control 1 - -#define WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0x0000 -#define WGL_CONTEXT_RELEASE_BEHAVIOR_ARB 0x2097 -#define WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB 0x2098 - -#define WGLEW_ARB_context_flush_control WGLEW_GET_VAR(__WGLEW_ARB_context_flush_control) - -#endif /* WGL_ARB_context_flush_control */ - -/* ------------------------- WGL_ARB_create_context ------------------------ */ - -#ifndef WGL_ARB_create_context -#define WGL_ARB_create_context 1 - -#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 -#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 -#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 -#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 -#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 -#define WGL_CONTEXT_FLAGS_ARB 0x2094 -#define ERROR_INVALID_VERSION_ARB 0x2095 -#define ERROR_INVALID_PROFILE_ARB 0x2096 - -typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int* attribList); - -#define wglCreateContextAttribsARB WGLEW_GET_FUN(__wglewCreateContextAttribsARB) - -#define WGLEW_ARB_create_context WGLEW_GET_VAR(__WGLEW_ARB_create_context) - -#endif /* WGL_ARB_create_context */ - -/* --------------------- WGL_ARB_create_context_profile -------------------- */ - -#ifndef WGL_ARB_create_context_profile -#define WGL_ARB_create_context_profile 1 - -#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 -#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 -#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 - -#define WGLEW_ARB_create_context_profile WGLEW_GET_VAR(__WGLEW_ARB_create_context_profile) - -#endif /* WGL_ARB_create_context_profile */ - -/* ------------------- WGL_ARB_create_context_robustness ------------------- */ - -#ifndef WGL_ARB_create_context_robustness -#define WGL_ARB_create_context_robustness 1 - -#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004 -#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 -#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 -#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261 - -#define WGLEW_ARB_create_context_robustness WGLEW_GET_VAR(__WGLEW_ARB_create_context_robustness) - -#endif /* WGL_ARB_create_context_robustness */ - -/* ----------------------- WGL_ARB_extensions_string ----------------------- */ - -#ifndef WGL_ARB_extensions_string -#define WGL_ARB_extensions_string 1 - -typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc); - -#define wglGetExtensionsStringARB WGLEW_GET_FUN(__wglewGetExtensionsStringARB) - -#define WGLEW_ARB_extensions_string WGLEW_GET_VAR(__WGLEW_ARB_extensions_string) - -#endif /* WGL_ARB_extensions_string */ - -/* ------------------------ WGL_ARB_framebuffer_sRGB ----------------------- */ - -#ifndef WGL_ARB_framebuffer_sRGB -#define WGL_ARB_framebuffer_sRGB 1 - -#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9 - -#define WGLEW_ARB_framebuffer_sRGB WGLEW_GET_VAR(__WGLEW_ARB_framebuffer_sRGB) - -#endif /* WGL_ARB_framebuffer_sRGB */ - -/* ----------------------- WGL_ARB_make_current_read ----------------------- */ - -#ifndef WGL_ARB_make_current_read -#define WGL_ARB_make_current_read 1 - -#define ERROR_INVALID_PIXEL_TYPE_ARB 0x2043 -#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054 - -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (VOID); -typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); - -#define wglGetCurrentReadDCARB WGLEW_GET_FUN(__wglewGetCurrentReadDCARB) -#define wglMakeContextCurrentARB WGLEW_GET_FUN(__wglewMakeContextCurrentARB) - -#define WGLEW_ARB_make_current_read WGLEW_GET_VAR(__WGLEW_ARB_make_current_read) - -#endif /* WGL_ARB_make_current_read */ - -/* -------------------------- WGL_ARB_multisample -------------------------- */ - -#ifndef WGL_ARB_multisample -#define WGL_ARB_multisample 1 - -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 - -#define WGLEW_ARB_multisample WGLEW_GET_VAR(__WGLEW_ARB_multisample) - -#endif /* WGL_ARB_multisample */ - -/* ---------------------------- WGL_ARB_pbuffer ---------------------------- */ - -#ifndef WGL_ARB_pbuffer -#define WGL_ARB_pbuffer 1 - -#define WGL_DRAW_TO_PBUFFER_ARB 0x202D -#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E -#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F -#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030 -#define WGL_PBUFFER_LARGEST_ARB 0x2033 -#define WGL_PBUFFER_WIDTH_ARB 0x2034 -#define WGL_PBUFFER_HEIGHT_ARB 0x2035 -#define WGL_PBUFFER_LOST_ARB 0x2036 - -DECLARE_HANDLE(HPBUFFERARB); - -typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList); -typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer); -typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer); -typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int* piValue); -typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC); - -#define wglCreatePbufferARB WGLEW_GET_FUN(__wglewCreatePbufferARB) -#define wglDestroyPbufferARB WGLEW_GET_FUN(__wglewDestroyPbufferARB) -#define wglGetPbufferDCARB WGLEW_GET_FUN(__wglewGetPbufferDCARB) -#define wglQueryPbufferARB WGLEW_GET_FUN(__wglewQueryPbufferARB) -#define wglReleasePbufferDCARB WGLEW_GET_FUN(__wglewReleasePbufferDCARB) - -#define WGLEW_ARB_pbuffer WGLEW_GET_VAR(__WGLEW_ARB_pbuffer) - -#endif /* WGL_ARB_pbuffer */ - -/* -------------------------- WGL_ARB_pixel_format ------------------------- */ - -#ifndef WGL_ARB_pixel_format -#define WGL_ARB_pixel_format 1 - -#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 -#define WGL_DRAW_TO_WINDOW_ARB 0x2001 -#define WGL_DRAW_TO_BITMAP_ARB 0x2002 -#define WGL_ACCELERATION_ARB 0x2003 -#define WGL_NEED_PALETTE_ARB 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006 -#define WGL_SWAP_METHOD_ARB 0x2007 -#define WGL_NUMBER_OVERLAYS_ARB 0x2008 -#define WGL_NUMBER_UNDERLAYS_ARB 0x2009 -#define WGL_TRANSPARENT_ARB 0x200A -#define WGL_SHARE_DEPTH_ARB 0x200C -#define WGL_SHARE_STENCIL_ARB 0x200D -#define WGL_SHARE_ACCUM_ARB 0x200E -#define WGL_SUPPORT_GDI_ARB 0x200F -#define WGL_SUPPORT_OPENGL_ARB 0x2010 -#define WGL_DOUBLE_BUFFER_ARB 0x2011 -#define WGL_STEREO_ARB 0x2012 -#define WGL_PIXEL_TYPE_ARB 0x2013 -#define WGL_COLOR_BITS_ARB 0x2014 -#define WGL_RED_BITS_ARB 0x2015 -#define WGL_RED_SHIFT_ARB 0x2016 -#define WGL_GREEN_BITS_ARB 0x2017 -#define WGL_GREEN_SHIFT_ARB 0x2018 -#define WGL_BLUE_BITS_ARB 0x2019 -#define WGL_BLUE_SHIFT_ARB 0x201A -#define WGL_ALPHA_BITS_ARB 0x201B -#define WGL_ALPHA_SHIFT_ARB 0x201C -#define WGL_ACCUM_BITS_ARB 0x201D -#define WGL_ACCUM_RED_BITS_ARB 0x201E -#define WGL_ACCUM_GREEN_BITS_ARB 0x201F -#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 -#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 -#define WGL_DEPTH_BITS_ARB 0x2022 -#define WGL_STENCIL_BITS_ARB 0x2023 -#define WGL_AUX_BUFFERS_ARB 0x2024 -#define WGL_NO_ACCELERATION_ARB 0x2025 -#define WGL_GENERIC_ACCELERATION_ARB 0x2026 -#define WGL_FULL_ACCELERATION_ARB 0x2027 -#define WGL_SWAP_EXCHANGE_ARB 0x2028 -#define WGL_SWAP_COPY_ARB 0x2029 -#define WGL_SWAP_UNDEFINED_ARB 0x202A -#define WGL_TYPE_RGBA_ARB 0x202B -#define WGL_TYPE_COLORINDEX_ARB 0x202C -#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037 -#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038 -#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039 -#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A -#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B - -typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, FLOAT *pfValues); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, int *piValues); - -#define wglChoosePixelFormatARB WGLEW_GET_FUN(__wglewChoosePixelFormatARB) -#define wglGetPixelFormatAttribfvARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvARB) -#define wglGetPixelFormatAttribivARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribivARB) - -#define WGLEW_ARB_pixel_format WGLEW_GET_VAR(__WGLEW_ARB_pixel_format) - -#endif /* WGL_ARB_pixel_format */ - -/* ----------------------- WGL_ARB_pixel_format_float ---------------------- */ - -#ifndef WGL_ARB_pixel_format_float -#define WGL_ARB_pixel_format_float 1 - -#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0 - -#define WGLEW_ARB_pixel_format_float WGLEW_GET_VAR(__WGLEW_ARB_pixel_format_float) - -#endif /* WGL_ARB_pixel_format_float */ - -/* ------------------------- WGL_ARB_render_texture ------------------------ */ - -#ifndef WGL_ARB_render_texture -#define WGL_ARB_render_texture 1 - -#define WGL_BIND_TO_TEXTURE_RGB_ARB 0x2070 -#define WGL_BIND_TO_TEXTURE_RGBA_ARB 0x2071 -#define WGL_TEXTURE_FORMAT_ARB 0x2072 -#define WGL_TEXTURE_TARGET_ARB 0x2073 -#define WGL_MIPMAP_TEXTURE_ARB 0x2074 -#define WGL_TEXTURE_RGB_ARB 0x2075 -#define WGL_TEXTURE_RGBA_ARB 0x2076 -#define WGL_NO_TEXTURE_ARB 0x2077 -#define WGL_TEXTURE_CUBE_MAP_ARB 0x2078 -#define WGL_TEXTURE_1D_ARB 0x2079 -#define WGL_TEXTURE_2D_ARB 0x207A -#define WGL_MIPMAP_LEVEL_ARB 0x207B -#define WGL_CUBE_MAP_FACE_ARB 0x207C -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080 -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081 -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082 -#define WGL_FRONT_LEFT_ARB 0x2083 -#define WGL_FRONT_RIGHT_ARB 0x2084 -#define WGL_BACK_LEFT_ARB 0x2085 -#define WGL_BACK_RIGHT_ARB 0x2086 -#define WGL_AUX0_ARB 0x2087 -#define WGL_AUX1_ARB 0x2088 -#define WGL_AUX2_ARB 0x2089 -#define WGL_AUX3_ARB 0x208A -#define WGL_AUX4_ARB 0x208B -#define WGL_AUX5_ARB 0x208C -#define WGL_AUX6_ARB 0x208D -#define WGL_AUX7_ARB 0x208E -#define WGL_AUX8_ARB 0x208F -#define WGL_AUX9_ARB 0x2090 - -typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); -typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); -typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int* piAttribList); - -#define wglBindTexImageARB WGLEW_GET_FUN(__wglewBindTexImageARB) -#define wglReleaseTexImageARB WGLEW_GET_FUN(__wglewReleaseTexImageARB) -#define wglSetPbufferAttribARB WGLEW_GET_FUN(__wglewSetPbufferAttribARB) - -#define WGLEW_ARB_render_texture WGLEW_GET_VAR(__WGLEW_ARB_render_texture) - -#endif /* WGL_ARB_render_texture */ - -/* ---------------- WGL_ARB_robustness_application_isolation --------------- */ - -#ifndef WGL_ARB_robustness_application_isolation -#define WGL_ARB_robustness_application_isolation 1 - -#define WGL_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008 - -#define WGLEW_ARB_robustness_application_isolation WGLEW_GET_VAR(__WGLEW_ARB_robustness_application_isolation) - -#endif /* WGL_ARB_robustness_application_isolation */ - -/* ---------------- WGL_ARB_robustness_share_group_isolation --------------- */ - -#ifndef WGL_ARB_robustness_share_group_isolation -#define WGL_ARB_robustness_share_group_isolation 1 - -#define WGL_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008 - -#define WGLEW_ARB_robustness_share_group_isolation WGLEW_GET_VAR(__WGLEW_ARB_robustness_share_group_isolation) - -#endif /* WGL_ARB_robustness_share_group_isolation */ - -/* ----------------------- WGL_ATI_pixel_format_float ---------------------- */ - -#ifndef WGL_ATI_pixel_format_float -#define WGL_ATI_pixel_format_float 1 - -#define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0 -#define GL_RGBA_FLOAT_MODE_ATI 0x8820 -#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 - -#define WGLEW_ATI_pixel_format_float WGLEW_GET_VAR(__WGLEW_ATI_pixel_format_float) - -#endif /* WGL_ATI_pixel_format_float */ - -/* -------------------- WGL_ATI_render_texture_rectangle ------------------- */ - -#ifndef WGL_ATI_render_texture_rectangle -#define WGL_ATI_render_texture_rectangle 1 - -#define WGL_TEXTURE_RECTANGLE_ATI 0x21A5 - -#define WGLEW_ATI_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_ATI_render_texture_rectangle) - -#endif /* WGL_ATI_render_texture_rectangle */ - -/* ------------------- WGL_EXT_create_context_es2_profile ------------------ */ - -#ifndef WGL_EXT_create_context_es2_profile -#define WGL_EXT_create_context_es2_profile 1 - -#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 - -#define WGLEW_EXT_create_context_es2_profile WGLEW_GET_VAR(__WGLEW_EXT_create_context_es2_profile) - -#endif /* WGL_EXT_create_context_es2_profile */ - -/* ------------------- WGL_EXT_create_context_es_profile ------------------- */ - -#ifndef WGL_EXT_create_context_es_profile -#define WGL_EXT_create_context_es_profile 1 - -#define WGL_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004 - -#define WGLEW_EXT_create_context_es_profile WGLEW_GET_VAR(__WGLEW_EXT_create_context_es_profile) - -#endif /* WGL_EXT_create_context_es_profile */ - -/* -------------------------- WGL_EXT_depth_float -------------------------- */ - -#ifndef WGL_EXT_depth_float -#define WGL_EXT_depth_float 1 - -#define WGL_DEPTH_FLOAT_EXT 0x2040 - -#define WGLEW_EXT_depth_float WGLEW_GET_VAR(__WGLEW_EXT_depth_float) - -#endif /* WGL_EXT_depth_float */ - -/* ---------------------- WGL_EXT_display_color_table ---------------------- */ - -#ifndef WGL_EXT_display_color_table -#define WGL_EXT_display_color_table 1 - -typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef void (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (GLushort* table, GLuint length); - -#define wglBindDisplayColorTableEXT WGLEW_GET_FUN(__wglewBindDisplayColorTableEXT) -#define wglCreateDisplayColorTableEXT WGLEW_GET_FUN(__wglewCreateDisplayColorTableEXT) -#define wglDestroyDisplayColorTableEXT WGLEW_GET_FUN(__wglewDestroyDisplayColorTableEXT) -#define wglLoadDisplayColorTableEXT WGLEW_GET_FUN(__wglewLoadDisplayColorTableEXT) - -#define WGLEW_EXT_display_color_table WGLEW_GET_VAR(__WGLEW_EXT_display_color_table) - -#endif /* WGL_EXT_display_color_table */ - -/* ----------------------- WGL_EXT_extensions_string ----------------------- */ - -#ifndef WGL_EXT_extensions_string -#define WGL_EXT_extensions_string 1 - -typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void); - -#define wglGetExtensionsStringEXT WGLEW_GET_FUN(__wglewGetExtensionsStringEXT) - -#define WGLEW_EXT_extensions_string WGLEW_GET_VAR(__WGLEW_EXT_extensions_string) - -#endif /* WGL_EXT_extensions_string */ - -/* ------------------------ WGL_EXT_framebuffer_sRGB ----------------------- */ - -#ifndef WGL_EXT_framebuffer_sRGB -#define WGL_EXT_framebuffer_sRGB 1 - -#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9 - -#define WGLEW_EXT_framebuffer_sRGB WGLEW_GET_VAR(__WGLEW_EXT_framebuffer_sRGB) - -#endif /* WGL_EXT_framebuffer_sRGB */ - -/* ----------------------- WGL_EXT_make_current_read ----------------------- */ - -#ifndef WGL_EXT_make_current_read -#define WGL_EXT_make_current_read 1 - -#define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043 - -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (VOID); -typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); - -#define wglGetCurrentReadDCEXT WGLEW_GET_FUN(__wglewGetCurrentReadDCEXT) -#define wglMakeContextCurrentEXT WGLEW_GET_FUN(__wglewMakeContextCurrentEXT) - -#define WGLEW_EXT_make_current_read WGLEW_GET_VAR(__WGLEW_EXT_make_current_read) - -#endif /* WGL_EXT_make_current_read */ - -/* -------------------------- WGL_EXT_multisample -------------------------- */ - -#ifndef WGL_EXT_multisample -#define WGL_EXT_multisample 1 - -#define WGL_SAMPLE_BUFFERS_EXT 0x2041 -#define WGL_SAMPLES_EXT 0x2042 - -#define WGLEW_EXT_multisample WGLEW_GET_VAR(__WGLEW_EXT_multisample) - -#endif /* WGL_EXT_multisample */ - -/* ---------------------------- WGL_EXT_pbuffer ---------------------------- */ - -#ifndef WGL_EXT_pbuffer -#define WGL_EXT_pbuffer 1 - -#define WGL_DRAW_TO_PBUFFER_EXT 0x202D -#define WGL_MAX_PBUFFER_PIXELS_EXT 0x202E -#define WGL_MAX_PBUFFER_WIDTH_EXT 0x202F -#define WGL_MAX_PBUFFER_HEIGHT_EXT 0x2030 -#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT 0x2031 -#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032 -#define WGL_PBUFFER_LARGEST_EXT 0x2033 -#define WGL_PBUFFER_WIDTH_EXT 0x2034 -#define WGL_PBUFFER_HEIGHT_EXT 0x2035 - -DECLARE_HANDLE(HPBUFFEREXT); - -typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList); -typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer); -typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer); -typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int* piValue); -typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC); - -#define wglCreatePbufferEXT WGLEW_GET_FUN(__wglewCreatePbufferEXT) -#define wglDestroyPbufferEXT WGLEW_GET_FUN(__wglewDestroyPbufferEXT) -#define wglGetPbufferDCEXT WGLEW_GET_FUN(__wglewGetPbufferDCEXT) -#define wglQueryPbufferEXT WGLEW_GET_FUN(__wglewQueryPbufferEXT) -#define wglReleasePbufferDCEXT WGLEW_GET_FUN(__wglewReleasePbufferDCEXT) - -#define WGLEW_EXT_pbuffer WGLEW_GET_VAR(__WGLEW_EXT_pbuffer) - -#endif /* WGL_EXT_pbuffer */ - -/* -------------------------- WGL_EXT_pixel_format ------------------------- */ - -#ifndef WGL_EXT_pixel_format -#define WGL_EXT_pixel_format 1 - -#define WGL_NUMBER_PIXEL_FORMATS_EXT 0x2000 -#define WGL_DRAW_TO_WINDOW_EXT 0x2001 -#define WGL_DRAW_TO_BITMAP_EXT 0x2002 -#define WGL_ACCELERATION_EXT 0x2003 -#define WGL_NEED_PALETTE_EXT 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_EXT 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_EXT 0x2006 -#define WGL_SWAP_METHOD_EXT 0x2007 -#define WGL_NUMBER_OVERLAYS_EXT 0x2008 -#define WGL_NUMBER_UNDERLAYS_EXT 0x2009 -#define WGL_TRANSPARENT_EXT 0x200A -#define WGL_TRANSPARENT_VALUE_EXT 0x200B -#define WGL_SHARE_DEPTH_EXT 0x200C -#define WGL_SHARE_STENCIL_EXT 0x200D -#define WGL_SHARE_ACCUM_EXT 0x200E -#define WGL_SUPPORT_GDI_EXT 0x200F -#define WGL_SUPPORT_OPENGL_EXT 0x2010 -#define WGL_DOUBLE_BUFFER_EXT 0x2011 -#define WGL_STEREO_EXT 0x2012 -#define WGL_PIXEL_TYPE_EXT 0x2013 -#define WGL_COLOR_BITS_EXT 0x2014 -#define WGL_RED_BITS_EXT 0x2015 -#define WGL_RED_SHIFT_EXT 0x2016 -#define WGL_GREEN_BITS_EXT 0x2017 -#define WGL_GREEN_SHIFT_EXT 0x2018 -#define WGL_BLUE_BITS_EXT 0x2019 -#define WGL_BLUE_SHIFT_EXT 0x201A -#define WGL_ALPHA_BITS_EXT 0x201B -#define WGL_ALPHA_SHIFT_EXT 0x201C -#define WGL_ACCUM_BITS_EXT 0x201D -#define WGL_ACCUM_RED_BITS_EXT 0x201E -#define WGL_ACCUM_GREEN_BITS_EXT 0x201F -#define WGL_ACCUM_BLUE_BITS_EXT 0x2020 -#define WGL_ACCUM_ALPHA_BITS_EXT 0x2021 -#define WGL_DEPTH_BITS_EXT 0x2022 -#define WGL_STENCIL_BITS_EXT 0x2023 -#define WGL_AUX_BUFFERS_EXT 0x2024 -#define WGL_NO_ACCELERATION_EXT 0x2025 -#define WGL_GENERIC_ACCELERATION_EXT 0x2026 -#define WGL_FULL_ACCELERATION_EXT 0x2027 -#define WGL_SWAP_EXCHANGE_EXT 0x2028 -#define WGL_SWAP_COPY_EXT 0x2029 -#define WGL_SWAP_UNDEFINED_EXT 0x202A -#define WGL_TYPE_RGBA_EXT 0x202B -#define WGL_TYPE_COLORINDEX_EXT 0x202C - -typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, FLOAT *pfValues); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues); - -#define wglChoosePixelFormatEXT WGLEW_GET_FUN(__wglewChoosePixelFormatEXT) -#define wglGetPixelFormatAttribfvEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvEXT) -#define wglGetPixelFormatAttribivEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribivEXT) - -#define WGLEW_EXT_pixel_format WGLEW_GET_VAR(__WGLEW_EXT_pixel_format) - -#endif /* WGL_EXT_pixel_format */ - -/* ------------------- WGL_EXT_pixel_format_packed_float ------------------- */ - -#ifndef WGL_EXT_pixel_format_packed_float -#define WGL_EXT_pixel_format_packed_float 1 - -#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8 - -#define WGLEW_EXT_pixel_format_packed_float WGLEW_GET_VAR(__WGLEW_EXT_pixel_format_packed_float) - -#endif /* WGL_EXT_pixel_format_packed_float */ - -/* -------------------------- WGL_EXT_swap_control ------------------------- */ - -#ifndef WGL_EXT_swap_control -#define WGL_EXT_swap_control 1 - -typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void); -typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval); - -#define wglGetSwapIntervalEXT WGLEW_GET_FUN(__wglewGetSwapIntervalEXT) -#define wglSwapIntervalEXT WGLEW_GET_FUN(__wglewSwapIntervalEXT) - -#define WGLEW_EXT_swap_control WGLEW_GET_VAR(__WGLEW_EXT_swap_control) - -#endif /* WGL_EXT_swap_control */ - -/* ----------------------- WGL_EXT_swap_control_tear ----------------------- */ - -#ifndef WGL_EXT_swap_control_tear -#define WGL_EXT_swap_control_tear 1 - -#define WGLEW_EXT_swap_control_tear WGLEW_GET_VAR(__WGLEW_EXT_swap_control_tear) - -#endif /* WGL_EXT_swap_control_tear */ - -/* --------------------- WGL_I3D_digital_video_control --------------------- */ - -#ifndef WGL_I3D_digital_video_control -#define WGL_I3D_digital_video_control 1 - -#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050 -#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051 -#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052 -#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053 - -typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue); -typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue); - -#define wglGetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewGetDigitalVideoParametersI3D) -#define wglSetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewSetDigitalVideoParametersI3D) - -#define WGLEW_I3D_digital_video_control WGLEW_GET_VAR(__WGLEW_I3D_digital_video_control) - -#endif /* WGL_I3D_digital_video_control */ - -/* ----------------------------- WGL_I3D_gamma ----------------------------- */ - -#ifndef WGL_I3D_gamma -#define WGL_I3D_gamma 1 - -#define WGL_GAMMA_TABLE_SIZE_I3D 0x204E -#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D 0x204F - -typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT* puRed, USHORT *puGreen, USHORT *puBlue); -typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue); -typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT* puRed, const USHORT *puGreen, const USHORT *puBlue); -typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue); - -#define wglGetGammaTableI3D WGLEW_GET_FUN(__wglewGetGammaTableI3D) -#define wglGetGammaTableParametersI3D WGLEW_GET_FUN(__wglewGetGammaTableParametersI3D) -#define wglSetGammaTableI3D WGLEW_GET_FUN(__wglewSetGammaTableI3D) -#define wglSetGammaTableParametersI3D WGLEW_GET_FUN(__wglewSetGammaTableParametersI3D) - -#define WGLEW_I3D_gamma WGLEW_GET_VAR(__WGLEW_I3D_gamma) - -#endif /* WGL_I3D_gamma */ - -/* ---------------------------- WGL_I3D_genlock ---------------------------- */ - -#ifndef WGL_I3D_genlock -#define WGL_I3D_genlock 1 - -#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044 -#define WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D 0x2045 -#define WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D 0x2046 -#define WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D 0x2047 -#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048 -#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049 -#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A -#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B -#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C - -typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC); -typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC); -typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT* uRate); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT* uDelay); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT* uEdge); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT* uSource); -typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL* pFlag); -typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT* uMaxLineDelay, UINT *uMaxPixelDelay); - -#define wglDisableGenlockI3D WGLEW_GET_FUN(__wglewDisableGenlockI3D) -#define wglEnableGenlockI3D WGLEW_GET_FUN(__wglewEnableGenlockI3D) -#define wglGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGenlockSampleRateI3D) -#define wglGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGenlockSourceDelayI3D) -#define wglGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGenlockSourceEdgeI3D) -#define wglGenlockSourceI3D WGLEW_GET_FUN(__wglewGenlockSourceI3D) -#define wglGetGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGetGenlockSampleRateI3D) -#define wglGetGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGetGenlockSourceDelayI3D) -#define wglGetGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGetGenlockSourceEdgeI3D) -#define wglGetGenlockSourceI3D WGLEW_GET_FUN(__wglewGetGenlockSourceI3D) -#define wglIsEnabledGenlockI3D WGLEW_GET_FUN(__wglewIsEnabledGenlockI3D) -#define wglQueryGenlockMaxSourceDelayI3D WGLEW_GET_FUN(__wglewQueryGenlockMaxSourceDelayI3D) - -#define WGLEW_I3D_genlock WGLEW_GET_VAR(__WGLEW_I3D_genlock) - -#endif /* WGL_I3D_genlock */ - -/* -------------------------- WGL_I3D_image_buffer ------------------------- */ - -#ifndef WGL_I3D_image_buffer -#define WGL_I3D_image_buffer 1 - -#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001 -#define WGL_IMAGE_BUFFER_LOCK_I3D 0x00000002 - -typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, HANDLE* pEvent, LPVOID *pAddress, DWORD *pSize, UINT count); -typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags); -typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress); -typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, LPVOID* pAddress, UINT count); - -#define wglAssociateImageBufferEventsI3D WGLEW_GET_FUN(__wglewAssociateImageBufferEventsI3D) -#define wglCreateImageBufferI3D WGLEW_GET_FUN(__wglewCreateImageBufferI3D) -#define wglDestroyImageBufferI3D WGLEW_GET_FUN(__wglewDestroyImageBufferI3D) -#define wglReleaseImageBufferEventsI3D WGLEW_GET_FUN(__wglewReleaseImageBufferEventsI3D) - -#define WGLEW_I3D_image_buffer WGLEW_GET_VAR(__WGLEW_I3D_image_buffer) - -#endif /* WGL_I3D_image_buffer */ - -/* ------------------------ WGL_I3D_swap_frame_lock ------------------------ */ - -#ifndef WGL_I3D_swap_frame_lock -#define WGL_I3D_swap_frame_lock 1 - -typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (VOID); -typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (VOID); -typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL* pFlag); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL* pFlag); - -#define wglDisableFrameLockI3D WGLEW_GET_FUN(__wglewDisableFrameLockI3D) -#define wglEnableFrameLockI3D WGLEW_GET_FUN(__wglewEnableFrameLockI3D) -#define wglIsEnabledFrameLockI3D WGLEW_GET_FUN(__wglewIsEnabledFrameLockI3D) -#define wglQueryFrameLockMasterI3D WGLEW_GET_FUN(__wglewQueryFrameLockMasterI3D) - -#define WGLEW_I3D_swap_frame_lock WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_lock) - -#endif /* WGL_I3D_swap_frame_lock */ - -/* ------------------------ WGL_I3D_swap_frame_usage ----------------------- */ - -#ifndef WGL_I3D_swap_frame_usage -#define WGL_I3D_swap_frame_usage 1 - -typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float* pUsage); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD* pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); - -#define wglBeginFrameTrackingI3D WGLEW_GET_FUN(__wglewBeginFrameTrackingI3D) -#define wglEndFrameTrackingI3D WGLEW_GET_FUN(__wglewEndFrameTrackingI3D) -#define wglGetFrameUsageI3D WGLEW_GET_FUN(__wglewGetFrameUsageI3D) -#define wglQueryFrameTrackingI3D WGLEW_GET_FUN(__wglewQueryFrameTrackingI3D) - -#define WGLEW_I3D_swap_frame_usage WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_usage) - -#endif /* WGL_I3D_swap_frame_usage */ - -/* --------------------------- WGL_NV_DX_interop --------------------------- */ - -#ifndef WGL_NV_DX_interop -#define WGL_NV_DX_interop 1 - -#define WGL_ACCESS_READ_ONLY_NV 0x0000 -#define WGL_ACCESS_READ_WRITE_NV 0x0001 -#define WGL_ACCESS_WRITE_DISCARD_NV 0x0002 - -typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice); -typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects); -typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access); -typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void* dxDevice); -typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void* dxObject, GLuint name, GLenum type, GLenum access); -typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void* dxObject, HANDLE shareHandle); -typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects); -typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject); - -#define wglDXCloseDeviceNV WGLEW_GET_FUN(__wglewDXCloseDeviceNV) -#define wglDXLockObjectsNV WGLEW_GET_FUN(__wglewDXLockObjectsNV) -#define wglDXObjectAccessNV WGLEW_GET_FUN(__wglewDXObjectAccessNV) -#define wglDXOpenDeviceNV WGLEW_GET_FUN(__wglewDXOpenDeviceNV) -#define wglDXRegisterObjectNV WGLEW_GET_FUN(__wglewDXRegisterObjectNV) -#define wglDXSetResourceShareHandleNV WGLEW_GET_FUN(__wglewDXSetResourceShareHandleNV) -#define wglDXUnlockObjectsNV WGLEW_GET_FUN(__wglewDXUnlockObjectsNV) -#define wglDXUnregisterObjectNV WGLEW_GET_FUN(__wglewDXUnregisterObjectNV) - -#define WGLEW_NV_DX_interop WGLEW_GET_VAR(__WGLEW_NV_DX_interop) - -#endif /* WGL_NV_DX_interop */ - -/* --------------------------- WGL_NV_DX_interop2 -------------------------- */ - -#ifndef WGL_NV_DX_interop2 -#define WGL_NV_DX_interop2 1 - -#define WGLEW_NV_DX_interop2 WGLEW_GET_VAR(__WGLEW_NV_DX_interop2) - -#endif /* WGL_NV_DX_interop2 */ - -/* --------------------------- WGL_NV_copy_image --------------------------- */ - -#ifndef WGL_NV_copy_image -#define WGL_NV_copy_image 1 - -typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); - -#define wglCopyImageSubDataNV WGLEW_GET_FUN(__wglewCopyImageSubDataNV) - -#define WGLEW_NV_copy_image WGLEW_GET_VAR(__WGLEW_NV_copy_image) - -#endif /* WGL_NV_copy_image */ - -/* ------------------------ WGL_NV_delay_before_swap ----------------------- */ - -#ifndef WGL_NV_delay_before_swap -#define WGL_NV_delay_before_swap 1 - -typedef BOOL (WINAPI * PFNWGLDELAYBEFORESWAPNVPROC) (HDC hDC, GLfloat seconds); - -#define wglDelayBeforeSwapNV WGLEW_GET_FUN(__wglewDelayBeforeSwapNV) - -#define WGLEW_NV_delay_before_swap WGLEW_GET_VAR(__WGLEW_NV_delay_before_swap) - -#endif /* WGL_NV_delay_before_swap */ - -/* -------------------------- WGL_NV_float_buffer -------------------------- */ - -#ifndef WGL_NV_float_buffer -#define WGL_NV_float_buffer 1 - -#define WGL_FLOAT_COMPONENTS_NV 0x20B0 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4 -#define WGL_TEXTURE_FLOAT_R_NV 0x20B5 -#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6 -#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7 -#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8 - -#define WGLEW_NV_float_buffer WGLEW_GET_VAR(__WGLEW_NV_float_buffer) - -#endif /* WGL_NV_float_buffer */ - -/* -------------------------- WGL_NV_gpu_affinity -------------------------- */ - -#ifndef WGL_NV_gpu_affinity -#define WGL_NV_gpu_affinity 1 - -#define WGL_ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0 -#define WGL_ERROR_MISSING_AFFINITY_MASK_NV 0x20D1 - -DECLARE_HANDLE(HGPUNV); -typedef struct _GPU_DEVICE { - DWORD cb; - CHAR DeviceName[32]; - CHAR DeviceString[128]; - DWORD Flags; - RECT rcVirtualScreen; -} GPU_DEVICE, *PGPU_DEVICE; - -typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList); -typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc); -typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice); -typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu); -typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu); - -#define wglCreateAffinityDCNV WGLEW_GET_FUN(__wglewCreateAffinityDCNV) -#define wglDeleteDCNV WGLEW_GET_FUN(__wglewDeleteDCNV) -#define wglEnumGpuDevicesNV WGLEW_GET_FUN(__wglewEnumGpuDevicesNV) -#define wglEnumGpusFromAffinityDCNV WGLEW_GET_FUN(__wglewEnumGpusFromAffinityDCNV) -#define wglEnumGpusNV WGLEW_GET_FUN(__wglewEnumGpusNV) - -#define WGLEW_NV_gpu_affinity WGLEW_GET_VAR(__WGLEW_NV_gpu_affinity) - -#endif /* WGL_NV_gpu_affinity */ - -/* ---------------------- WGL_NV_multisample_coverage ---------------------- */ - -#ifndef WGL_NV_multisample_coverage -#define WGL_NV_multisample_coverage 1 - -#define WGL_COVERAGE_SAMPLES_NV 0x2042 -#define WGL_COLOR_SAMPLES_NV 0x20B9 - -#define WGLEW_NV_multisample_coverage WGLEW_GET_VAR(__WGLEW_NV_multisample_coverage) - -#endif /* WGL_NV_multisample_coverage */ - -/* -------------------------- WGL_NV_present_video ------------------------- */ - -#ifndef WGL_NV_present_video -#define WGL_NV_present_video 1 - -#define WGL_NUM_VIDEO_SLOTS_NV 0x20F0 - -DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV); - -typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDc, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int* piAttribList); -typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDc, HVIDEOOUTPUTDEVICENV* phDeviceList); -typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int* piValue); - -#define wglBindVideoDeviceNV WGLEW_GET_FUN(__wglewBindVideoDeviceNV) -#define wglEnumerateVideoDevicesNV WGLEW_GET_FUN(__wglewEnumerateVideoDevicesNV) -#define wglQueryCurrentContextNV WGLEW_GET_FUN(__wglewQueryCurrentContextNV) - -#define WGLEW_NV_present_video WGLEW_GET_VAR(__WGLEW_NV_present_video) - -#endif /* WGL_NV_present_video */ - -/* ---------------------- WGL_NV_render_depth_texture ---------------------- */ - -#ifndef WGL_NV_render_depth_texture -#define WGL_NV_render_depth_texture 1 - -#define WGL_NO_TEXTURE_ARB 0x2077 -#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4 -#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5 -#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6 -#define WGL_DEPTH_COMPONENT_NV 0x20A7 - -#define WGLEW_NV_render_depth_texture WGLEW_GET_VAR(__WGLEW_NV_render_depth_texture) - -#endif /* WGL_NV_render_depth_texture */ - -/* -------------------- WGL_NV_render_texture_rectangle -------------------- */ - -#ifndef WGL_NV_render_texture_rectangle -#define WGL_NV_render_texture_rectangle 1 - -#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1 -#define WGL_TEXTURE_RECTANGLE_NV 0x20A2 - -#define WGLEW_NV_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_NV_render_texture_rectangle) - -#endif /* WGL_NV_render_texture_rectangle */ - -/* --------------------------- WGL_NV_swap_group --------------------------- */ - -#ifndef WGL_NV_swap_group -#define WGL_NV_swap_group 1 - -typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier); -typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint* count); -typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint* maxGroups, GLuint *maxBarriers); -typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint* group, GLuint *barrier); -typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC); - -#define wglBindSwapBarrierNV WGLEW_GET_FUN(__wglewBindSwapBarrierNV) -#define wglJoinSwapGroupNV WGLEW_GET_FUN(__wglewJoinSwapGroupNV) -#define wglQueryFrameCountNV WGLEW_GET_FUN(__wglewQueryFrameCountNV) -#define wglQueryMaxSwapGroupsNV WGLEW_GET_FUN(__wglewQueryMaxSwapGroupsNV) -#define wglQuerySwapGroupNV WGLEW_GET_FUN(__wglewQuerySwapGroupNV) -#define wglResetFrameCountNV WGLEW_GET_FUN(__wglewResetFrameCountNV) - -#define WGLEW_NV_swap_group WGLEW_GET_VAR(__WGLEW_NV_swap_group) - -#endif /* WGL_NV_swap_group */ - -/* ----------------------- WGL_NV_vertex_array_range ----------------------- */ - -#ifndef WGL_NV_vertex_array_range -#define WGL_NV_vertex_array_range 1 - -typedef void * (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority); -typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer); - -#define wglAllocateMemoryNV WGLEW_GET_FUN(__wglewAllocateMemoryNV) -#define wglFreeMemoryNV WGLEW_GET_FUN(__wglewFreeMemoryNV) - -#define WGLEW_NV_vertex_array_range WGLEW_GET_VAR(__WGLEW_NV_vertex_array_range) - -#endif /* WGL_NV_vertex_array_range */ - -/* -------------------------- WGL_NV_video_capture ------------------------- */ - -#ifndef WGL_NV_video_capture -#define WGL_NV_video_capture 1 - -#define WGL_UNIQUE_ID_NV 0x20CE -#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF - -DECLARE_HANDLE(HVIDEOINPUTDEVICENV); - -typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice); -typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV* phDeviceList); -typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int* piValue); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); - -#define wglBindVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewBindVideoCaptureDeviceNV) -#define wglEnumerateVideoCaptureDevicesNV WGLEW_GET_FUN(__wglewEnumerateVideoCaptureDevicesNV) -#define wglLockVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewLockVideoCaptureDeviceNV) -#define wglQueryVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewQueryVideoCaptureDeviceNV) -#define wglReleaseVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewReleaseVideoCaptureDeviceNV) - -#define WGLEW_NV_video_capture WGLEW_GET_VAR(__WGLEW_NV_video_capture) - -#endif /* WGL_NV_video_capture */ - -/* -------------------------- WGL_NV_video_output -------------------------- */ - -#ifndef WGL_NV_video_output -#define WGL_NV_video_output 1 - -#define WGL_BIND_TO_VIDEO_RGB_NV 0x20C0 -#define WGL_BIND_TO_VIDEO_RGBA_NV 0x20C1 -#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2 -#define WGL_VIDEO_OUT_COLOR_NV 0x20C3 -#define WGL_VIDEO_OUT_ALPHA_NV 0x20C4 -#define WGL_VIDEO_OUT_DEPTH_NV 0x20C5 -#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 -#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 -#define WGL_VIDEO_OUT_FRAME 0x20C8 -#define WGL_VIDEO_OUT_FIELD_1 0x20C9 -#define WGL_VIDEO_OUT_FIELD_2 0x20CA -#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2 0x20CB -#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1 0x20CC - -DECLARE_HANDLE(HPVIDEODEV); - -typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer); -typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV* hVideoDevice); -typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long* pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer); -typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long* pulCounterPbuffer, BOOL bBlock); - -#define wglBindVideoImageNV WGLEW_GET_FUN(__wglewBindVideoImageNV) -#define wglGetVideoDeviceNV WGLEW_GET_FUN(__wglewGetVideoDeviceNV) -#define wglGetVideoInfoNV WGLEW_GET_FUN(__wglewGetVideoInfoNV) -#define wglReleaseVideoDeviceNV WGLEW_GET_FUN(__wglewReleaseVideoDeviceNV) -#define wglReleaseVideoImageNV WGLEW_GET_FUN(__wglewReleaseVideoImageNV) -#define wglSendPbufferToVideoNV WGLEW_GET_FUN(__wglewSendPbufferToVideoNV) - -#define WGLEW_NV_video_output WGLEW_GET_VAR(__WGLEW_NV_video_output) - -#endif /* WGL_NV_video_output */ - -/* -------------------------- WGL_OML_sync_control ------------------------- */ - -#ifndef WGL_OML_sync_control -#define WGL_OML_sync_control 1 - -typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32* numerator, INT32 *denominator); -typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64* ust, INT64 *msc, INT64 *sbc); -typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); -typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); -typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64* ust, INT64 *msc, INT64 *sbc); -typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64* ust, INT64 *msc, INT64 *sbc); - -#define wglGetMscRateOML WGLEW_GET_FUN(__wglewGetMscRateOML) -#define wglGetSyncValuesOML WGLEW_GET_FUN(__wglewGetSyncValuesOML) -#define wglSwapBuffersMscOML WGLEW_GET_FUN(__wglewSwapBuffersMscOML) -#define wglSwapLayerBuffersMscOML WGLEW_GET_FUN(__wglewSwapLayerBuffersMscOML) -#define wglWaitForMscOML WGLEW_GET_FUN(__wglewWaitForMscOML) -#define wglWaitForSbcOML WGLEW_GET_FUN(__wglewWaitForSbcOML) - -#define WGLEW_OML_sync_control WGLEW_GET_VAR(__WGLEW_OML_sync_control) - -#endif /* WGL_OML_sync_control */ - -/* ------------------------------------------------------------------------- */ - -#define WGLEW_FUN_EXPORT GLEW_FUN_EXPORT -#define WGLEW_VAR_EXPORT GLEW_VAR_EXPORT - -WGLEW_FUN_EXPORT PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL; - -WGLEW_FUN_EXPORT PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC __wglewBlitContextFramebufferAMD; -WGLEW_FUN_EXPORT PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC __wglewCreateAssociatedContextAMD; -WGLEW_FUN_EXPORT PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC __wglewCreateAssociatedContextAttribsAMD; -WGLEW_FUN_EXPORT PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC __wglewDeleteAssociatedContextAMD; -WGLEW_FUN_EXPORT PFNWGLGETCONTEXTGPUIDAMDPROC __wglewGetContextGPUIDAMD; -WGLEW_FUN_EXPORT PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC __wglewGetCurrentAssociatedContextAMD; -WGLEW_FUN_EXPORT PFNWGLGETGPUIDSAMDPROC __wglewGetGPUIDsAMD; -WGLEW_FUN_EXPORT PFNWGLGETGPUINFOAMDPROC __wglewGetGPUInfoAMD; -WGLEW_FUN_EXPORT PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC __wglewMakeAssociatedContextCurrentAMD; - -WGLEW_FUN_EXPORT PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB; -WGLEW_FUN_EXPORT PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB; -WGLEW_FUN_EXPORT PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB; -WGLEW_FUN_EXPORT PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB; - -WGLEW_FUN_EXPORT PFNWGLCREATECONTEXTATTRIBSARBPROC __wglewCreateContextAttribsARB; - -WGLEW_FUN_EXPORT PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB; - -WGLEW_FUN_EXPORT PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB; -WGLEW_FUN_EXPORT PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB; - -WGLEW_FUN_EXPORT PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB; -WGLEW_FUN_EXPORT PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB; -WGLEW_FUN_EXPORT PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB; -WGLEW_FUN_EXPORT PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB; -WGLEW_FUN_EXPORT PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB; - -WGLEW_FUN_EXPORT PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB; -WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB; -WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB; - -WGLEW_FUN_EXPORT PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB; -WGLEW_FUN_EXPORT PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB; -WGLEW_FUN_EXPORT PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB; - -WGLEW_FUN_EXPORT PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT; -WGLEW_FUN_EXPORT PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT; -WGLEW_FUN_EXPORT PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT; -WGLEW_FUN_EXPORT PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT; - -WGLEW_FUN_EXPORT PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT; - -WGLEW_FUN_EXPORT PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT; -WGLEW_FUN_EXPORT PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT; - -WGLEW_FUN_EXPORT PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT; -WGLEW_FUN_EXPORT PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT; -WGLEW_FUN_EXPORT PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT; -WGLEW_FUN_EXPORT PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT; -WGLEW_FUN_EXPORT PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT; - -WGLEW_FUN_EXPORT PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT; -WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT; -WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT; - -WGLEW_FUN_EXPORT PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT; -WGLEW_FUN_EXPORT PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT; - -WGLEW_FUN_EXPORT PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D; -WGLEW_FUN_EXPORT PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D; - -WGLEW_FUN_EXPORT PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D; -WGLEW_FUN_EXPORT PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D; -WGLEW_FUN_EXPORT PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D; -WGLEW_FUN_EXPORT PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D; - -WGLEW_FUN_EXPORT PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D; -WGLEW_FUN_EXPORT PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D; -WGLEW_FUN_EXPORT PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D; -WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D; -WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D; -WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D; -WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D; -WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D; -WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D; -WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D; -WGLEW_FUN_EXPORT PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D; -WGLEW_FUN_EXPORT PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D; - -WGLEW_FUN_EXPORT PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D; -WGLEW_FUN_EXPORT PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D; -WGLEW_FUN_EXPORT PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D; -WGLEW_FUN_EXPORT PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D; - -WGLEW_FUN_EXPORT PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D; -WGLEW_FUN_EXPORT PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D; -WGLEW_FUN_EXPORT PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D; -WGLEW_FUN_EXPORT PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D; - -WGLEW_FUN_EXPORT PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D; -WGLEW_FUN_EXPORT PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D; -WGLEW_FUN_EXPORT PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D; -WGLEW_FUN_EXPORT PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D; - -WGLEW_FUN_EXPORT PFNWGLDXCLOSEDEVICENVPROC __wglewDXCloseDeviceNV; -WGLEW_FUN_EXPORT PFNWGLDXLOCKOBJECTSNVPROC __wglewDXLockObjectsNV; -WGLEW_FUN_EXPORT PFNWGLDXOBJECTACCESSNVPROC __wglewDXObjectAccessNV; -WGLEW_FUN_EXPORT PFNWGLDXOPENDEVICENVPROC __wglewDXOpenDeviceNV; -WGLEW_FUN_EXPORT PFNWGLDXREGISTEROBJECTNVPROC __wglewDXRegisterObjectNV; -WGLEW_FUN_EXPORT PFNWGLDXSETRESOURCESHAREHANDLENVPROC __wglewDXSetResourceShareHandleNV; -WGLEW_FUN_EXPORT PFNWGLDXUNLOCKOBJECTSNVPROC __wglewDXUnlockObjectsNV; -WGLEW_FUN_EXPORT PFNWGLDXUNREGISTEROBJECTNVPROC __wglewDXUnregisterObjectNV; - -WGLEW_FUN_EXPORT PFNWGLCOPYIMAGESUBDATANVPROC __wglewCopyImageSubDataNV; - -WGLEW_FUN_EXPORT PFNWGLDELAYBEFORESWAPNVPROC __wglewDelayBeforeSwapNV; - -WGLEW_FUN_EXPORT PFNWGLCREATEAFFINITYDCNVPROC __wglewCreateAffinityDCNV; -WGLEW_FUN_EXPORT PFNWGLDELETEDCNVPROC __wglewDeleteDCNV; -WGLEW_FUN_EXPORT PFNWGLENUMGPUDEVICESNVPROC __wglewEnumGpuDevicesNV; -WGLEW_FUN_EXPORT PFNWGLENUMGPUSFROMAFFINITYDCNVPROC __wglewEnumGpusFromAffinityDCNV; -WGLEW_FUN_EXPORT PFNWGLENUMGPUSNVPROC __wglewEnumGpusNV; - -WGLEW_FUN_EXPORT PFNWGLBINDVIDEODEVICENVPROC __wglewBindVideoDeviceNV; -WGLEW_FUN_EXPORT PFNWGLENUMERATEVIDEODEVICESNVPROC __wglewEnumerateVideoDevicesNV; -WGLEW_FUN_EXPORT PFNWGLQUERYCURRENTCONTEXTNVPROC __wglewQueryCurrentContextNV; - -WGLEW_FUN_EXPORT PFNWGLBINDSWAPBARRIERNVPROC __wglewBindSwapBarrierNV; -WGLEW_FUN_EXPORT PFNWGLJOINSWAPGROUPNVPROC __wglewJoinSwapGroupNV; -WGLEW_FUN_EXPORT PFNWGLQUERYFRAMECOUNTNVPROC __wglewQueryFrameCountNV; -WGLEW_FUN_EXPORT PFNWGLQUERYMAXSWAPGROUPSNVPROC __wglewQueryMaxSwapGroupsNV; -WGLEW_FUN_EXPORT PFNWGLQUERYSWAPGROUPNVPROC __wglewQuerySwapGroupNV; -WGLEW_FUN_EXPORT PFNWGLRESETFRAMECOUNTNVPROC __wglewResetFrameCountNV; - -WGLEW_FUN_EXPORT PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV; -WGLEW_FUN_EXPORT PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV; - -WGLEW_FUN_EXPORT PFNWGLBINDVIDEOCAPTUREDEVICENVPROC __wglewBindVideoCaptureDeviceNV; -WGLEW_FUN_EXPORT PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC __wglewEnumerateVideoCaptureDevicesNV; -WGLEW_FUN_EXPORT PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC __wglewLockVideoCaptureDeviceNV; -WGLEW_FUN_EXPORT PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC __wglewQueryVideoCaptureDeviceNV; -WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC __wglewReleaseVideoCaptureDeviceNV; - -WGLEW_FUN_EXPORT PFNWGLBINDVIDEOIMAGENVPROC __wglewBindVideoImageNV; -WGLEW_FUN_EXPORT PFNWGLGETVIDEODEVICENVPROC __wglewGetVideoDeviceNV; -WGLEW_FUN_EXPORT PFNWGLGETVIDEOINFONVPROC __wglewGetVideoInfoNV; -WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEODEVICENVPROC __wglewReleaseVideoDeviceNV; -WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEOIMAGENVPROC __wglewReleaseVideoImageNV; -WGLEW_FUN_EXPORT PFNWGLSENDPBUFFERTOVIDEONVPROC __wglewSendPbufferToVideoNV; - -WGLEW_FUN_EXPORT PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML; -WGLEW_FUN_EXPORT PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML; -WGLEW_FUN_EXPORT PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML; -WGLEW_FUN_EXPORT PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML; -WGLEW_FUN_EXPORT PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML; -WGLEW_FUN_EXPORT PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML; -WGLEW_VAR_EXPORT GLboolean __WGLEW_3DFX_multisample; -WGLEW_VAR_EXPORT GLboolean __WGLEW_3DL_stereo_control; -WGLEW_VAR_EXPORT GLboolean __WGLEW_AMD_gpu_association; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_buffer_region; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_context_flush_control; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_profile; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_robustness; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_extensions_string; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_framebuffer_sRGB; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_make_current_read; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_multisample; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pbuffer; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pixel_format; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pixel_format_float; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_render_texture; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_robustness_application_isolation; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_robustness_share_group_isolation; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_pixel_format_float; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_render_texture_rectangle; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es2_profile; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es_profile; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_depth_float; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_display_color_table; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_extensions_string; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_framebuffer_sRGB; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_make_current_read; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_multisample; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pbuffer; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pixel_format; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pixel_format_packed_float; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_swap_control; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_swap_control_tear; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_digital_video_control; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_gamma; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_genlock; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_image_buffer; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_swap_frame_lock; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_swap_frame_usage; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop2; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_copy_image; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_delay_before_swap; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_float_buffer; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_gpu_affinity; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_multisample_coverage; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_present_video; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_render_depth_texture; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_render_texture_rectangle; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_swap_group; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_vertex_array_range; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_capture; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_output; -WGLEW_VAR_EXPORT GLboolean __WGLEW_OML_sync_control; -/* ------------------------------------------------------------------------- */ - -GLEWAPI GLenum GLEWAPIENTRY wglewInit (); -GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name); - -#ifndef WGLEW_GET_VAR -#define WGLEW_GET_VAR(x) (*(const GLboolean*)&x) -#endif - -#ifndef WGLEW_GET_FUN -#define WGLEW_GET_FUN(x) x -#endif - -GLEWAPI GLboolean GLEWAPIENTRY wglewGetExtension (const char *name); - -#ifdef __cplusplus -} -#endif - -#undef GLEWAPI - -#endif /* __wglew_h__ */ diff --git a/opengl/wglext.h b/opengl/wglext.h deleted file mode 100644 index 3fe2e2df..00000000 --- a/opengl/wglext.h +++ /dev/null @@ -1,929 +0,0 @@ -#ifndef __wglext_h_ -#define __wglext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright (c) 2007-2010 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Function declaration macros - to move into glplatform.h */ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif - -/*************************************************************/ - -/* Header file version number */ -/* wglext.h last updated 2011/04/13 */ -/* Current version at http://www.opengl.org/registry/ */ -#define WGL_WGLEXT_VERSION 23 - -#ifndef WGL_ARB_buffer_region -#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001 -#define WGL_BACK_COLOR_BUFFER_BIT_ARB 0x00000002 -#define WGL_DEPTH_BUFFER_BIT_ARB 0x00000004 -#define WGL_STENCIL_BUFFER_BIT_ARB 0x00000008 -#endif - -#ifndef WGL_ARB_multisample -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 -#endif - -#ifndef WGL_ARB_extensions_string -#endif - -#ifndef WGL_ARB_pixel_format -#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 -#define WGL_DRAW_TO_WINDOW_ARB 0x2001 -#define WGL_DRAW_TO_BITMAP_ARB 0x2002 -#define WGL_ACCELERATION_ARB 0x2003 -#define WGL_NEED_PALETTE_ARB 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006 -#define WGL_SWAP_METHOD_ARB 0x2007 -#define WGL_NUMBER_OVERLAYS_ARB 0x2008 -#define WGL_NUMBER_UNDERLAYS_ARB 0x2009 -#define WGL_TRANSPARENT_ARB 0x200A -#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037 -#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038 -#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039 -#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A -#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B -#define WGL_SHARE_DEPTH_ARB 0x200C -#define WGL_SHARE_STENCIL_ARB 0x200D -#define WGL_SHARE_ACCUM_ARB 0x200E -#define WGL_SUPPORT_GDI_ARB 0x200F -#define WGL_SUPPORT_OPENGL_ARB 0x2010 -#define WGL_DOUBLE_BUFFER_ARB 0x2011 -#define WGL_STEREO_ARB 0x2012 -#define WGL_PIXEL_TYPE_ARB 0x2013 -#define WGL_COLOR_BITS_ARB 0x2014 -#define WGL_RED_BITS_ARB 0x2015 -#define WGL_RED_SHIFT_ARB 0x2016 -#define WGL_GREEN_BITS_ARB 0x2017 -#define WGL_GREEN_SHIFT_ARB 0x2018 -#define WGL_BLUE_BITS_ARB 0x2019 -#define WGL_BLUE_SHIFT_ARB 0x201A -#define WGL_ALPHA_BITS_ARB 0x201B -#define WGL_ALPHA_SHIFT_ARB 0x201C -#define WGL_ACCUM_BITS_ARB 0x201D -#define WGL_ACCUM_RED_BITS_ARB 0x201E -#define WGL_ACCUM_GREEN_BITS_ARB 0x201F -#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 -#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 -#define WGL_DEPTH_BITS_ARB 0x2022 -#define WGL_STENCIL_BITS_ARB 0x2023 -#define WGL_AUX_BUFFERS_ARB 0x2024 -#define WGL_NO_ACCELERATION_ARB 0x2025 -#define WGL_GENERIC_ACCELERATION_ARB 0x2026 -#define WGL_FULL_ACCELERATION_ARB 0x2027 -#define WGL_SWAP_EXCHANGE_ARB 0x2028 -#define WGL_SWAP_COPY_ARB 0x2029 -#define WGL_SWAP_UNDEFINED_ARB 0x202A -#define WGL_TYPE_RGBA_ARB 0x202B -#define WGL_TYPE_COLORINDEX_ARB 0x202C -#endif - -#ifndef WGL_ARB_make_current_read -#define ERROR_INVALID_PIXEL_TYPE_ARB 0x2043 -#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054 -#endif - -#ifndef WGL_ARB_pbuffer -#define WGL_DRAW_TO_PBUFFER_ARB 0x202D -#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E -#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F -#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030 -#define WGL_PBUFFER_LARGEST_ARB 0x2033 -#define WGL_PBUFFER_WIDTH_ARB 0x2034 -#define WGL_PBUFFER_HEIGHT_ARB 0x2035 -#define WGL_PBUFFER_LOST_ARB 0x2036 -#endif - -#ifndef WGL_ARB_render_texture -#define WGL_BIND_TO_TEXTURE_RGB_ARB 0x2070 -#define WGL_BIND_TO_TEXTURE_RGBA_ARB 0x2071 -#define WGL_TEXTURE_FORMAT_ARB 0x2072 -#define WGL_TEXTURE_TARGET_ARB 0x2073 -#define WGL_MIPMAP_TEXTURE_ARB 0x2074 -#define WGL_TEXTURE_RGB_ARB 0x2075 -#define WGL_TEXTURE_RGBA_ARB 0x2076 -#define WGL_NO_TEXTURE_ARB 0x2077 -#define WGL_TEXTURE_CUBE_MAP_ARB 0x2078 -#define WGL_TEXTURE_1D_ARB 0x2079 -#define WGL_TEXTURE_2D_ARB 0x207A -#define WGL_MIPMAP_LEVEL_ARB 0x207B -#define WGL_CUBE_MAP_FACE_ARB 0x207C -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080 -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081 -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082 -#define WGL_FRONT_LEFT_ARB 0x2083 -#define WGL_FRONT_RIGHT_ARB 0x2084 -#define WGL_BACK_LEFT_ARB 0x2085 -#define WGL_BACK_RIGHT_ARB 0x2086 -#define WGL_AUX0_ARB 0x2087 -#define WGL_AUX1_ARB 0x2088 -#define WGL_AUX2_ARB 0x2089 -#define WGL_AUX3_ARB 0x208A -#define WGL_AUX4_ARB 0x208B -#define WGL_AUX5_ARB 0x208C -#define WGL_AUX6_ARB 0x208D -#define WGL_AUX7_ARB 0x208E -#define WGL_AUX8_ARB 0x208F -#define WGL_AUX9_ARB 0x2090 -#endif - -#ifndef WGL_ARB_pixel_format_float -#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0 -#endif - -#ifndef WGL_ARB_framebuffer_sRGB -#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9 -#endif - -#ifndef WGL_ARB_create_context -#define WGL_CONTEXT_DEBUG_BIT_ARB 0x00000001 -#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 -#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 -#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 -#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 -#define WGL_CONTEXT_FLAGS_ARB 0x2094 -#define ERROR_INVALID_VERSION_ARB 0x2095 -#endif - -#ifndef WGL_ARB_create_context_profile -#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 -#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 -#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 -#define ERROR_INVALID_PROFILE_ARB 0x2096 -#endif - -#ifndef WGL_ARB_create_context_robustness -#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004 -#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 -#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 -#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261 -#endif - -#ifndef WGL_EXT_make_current_read -#define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043 -#endif - -#ifndef WGL_EXT_pixel_format -#define WGL_NUMBER_PIXEL_FORMATS_EXT 0x2000 -#define WGL_DRAW_TO_WINDOW_EXT 0x2001 -#define WGL_DRAW_TO_BITMAP_EXT 0x2002 -#define WGL_ACCELERATION_EXT 0x2003 -#define WGL_NEED_PALETTE_EXT 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_EXT 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_EXT 0x2006 -#define WGL_SWAP_METHOD_EXT 0x2007 -#define WGL_NUMBER_OVERLAYS_EXT 0x2008 -#define WGL_NUMBER_UNDERLAYS_EXT 0x2009 -#define WGL_TRANSPARENT_EXT 0x200A -#define WGL_TRANSPARENT_VALUE_EXT 0x200B -#define WGL_SHARE_DEPTH_EXT 0x200C -#define WGL_SHARE_STENCIL_EXT 0x200D -#define WGL_SHARE_ACCUM_EXT 0x200E -#define WGL_SUPPORT_GDI_EXT 0x200F -#define WGL_SUPPORT_OPENGL_EXT 0x2010 -#define WGL_DOUBLE_BUFFER_EXT 0x2011 -#define WGL_STEREO_EXT 0x2012 -#define WGL_PIXEL_TYPE_EXT 0x2013 -#define WGL_COLOR_BITS_EXT 0x2014 -#define WGL_RED_BITS_EXT 0x2015 -#define WGL_RED_SHIFT_EXT 0x2016 -#define WGL_GREEN_BITS_EXT 0x2017 -#define WGL_GREEN_SHIFT_EXT 0x2018 -#define WGL_BLUE_BITS_EXT 0x2019 -#define WGL_BLUE_SHIFT_EXT 0x201A -#define WGL_ALPHA_BITS_EXT 0x201B -#define WGL_ALPHA_SHIFT_EXT 0x201C -#define WGL_ACCUM_BITS_EXT 0x201D -#define WGL_ACCUM_RED_BITS_EXT 0x201E -#define WGL_ACCUM_GREEN_BITS_EXT 0x201F -#define WGL_ACCUM_BLUE_BITS_EXT 0x2020 -#define WGL_ACCUM_ALPHA_BITS_EXT 0x2021 -#define WGL_DEPTH_BITS_EXT 0x2022 -#define WGL_STENCIL_BITS_EXT 0x2023 -#define WGL_AUX_BUFFERS_EXT 0x2024 -#define WGL_NO_ACCELERATION_EXT 0x2025 -#define WGL_GENERIC_ACCELERATION_EXT 0x2026 -#define WGL_FULL_ACCELERATION_EXT 0x2027 -#define WGL_SWAP_EXCHANGE_EXT 0x2028 -#define WGL_SWAP_COPY_EXT 0x2029 -#define WGL_SWAP_UNDEFINED_EXT 0x202A -#define WGL_TYPE_RGBA_EXT 0x202B -#define WGL_TYPE_COLORINDEX_EXT 0x202C -#endif - -#ifndef WGL_EXT_pbuffer -#define WGL_DRAW_TO_PBUFFER_EXT 0x202D -#define WGL_MAX_PBUFFER_PIXELS_EXT 0x202E -#define WGL_MAX_PBUFFER_WIDTH_EXT 0x202F -#define WGL_MAX_PBUFFER_HEIGHT_EXT 0x2030 -#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT 0x2031 -#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032 -#define WGL_PBUFFER_LARGEST_EXT 0x2033 -#define WGL_PBUFFER_WIDTH_EXT 0x2034 -#define WGL_PBUFFER_HEIGHT_EXT 0x2035 -#endif - -#ifndef WGL_EXT_depth_float -#define WGL_DEPTH_FLOAT_EXT 0x2040 -#endif - -#ifndef WGL_3DFX_multisample -#define WGL_SAMPLE_BUFFERS_3DFX 0x2060 -#define WGL_SAMPLES_3DFX 0x2061 -#endif - -#ifndef WGL_EXT_multisample -#define WGL_SAMPLE_BUFFERS_EXT 0x2041 -#define WGL_SAMPLES_EXT 0x2042 -#endif - -#ifndef WGL_I3D_digital_video_control -#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050 -#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051 -#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052 -#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053 -#endif - -#ifndef WGL_I3D_gamma -#define WGL_GAMMA_TABLE_SIZE_I3D 0x204E -#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D 0x204F -#endif - -#ifndef WGL_I3D_genlock -#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044 -#define WGL_GENLOCK_SOURCE_EXTENAL_SYNC_I3D 0x2045 -#define WGL_GENLOCK_SOURCE_EXTENAL_FIELD_I3D 0x2046 -#define WGL_GENLOCK_SOURCE_EXTENAL_TTL_I3D 0x2047 -#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048 -#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049 -#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A -#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B -#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C -#endif - -#ifndef WGL_I3D_image_buffer -#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001 -#define WGL_IMAGE_BUFFER_LOCK_I3D 0x00000002 -#endif - -#ifndef WGL_I3D_swap_frame_lock -#endif - -#ifndef WGL_NV_render_depth_texture -#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4 -#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5 -#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6 -#define WGL_DEPTH_COMPONENT_NV 0x20A7 -#endif - -#ifndef WGL_NV_render_texture_rectangle -#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1 -#define WGL_TEXTURE_RECTANGLE_NV 0x20A2 -#endif - -#ifndef WGL_ATI_pixel_format_float -#define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0 -#endif - -#ifndef WGL_NV_float_buffer -#define WGL_FLOAT_COMPONENTS_NV 0x20B0 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4 -#define WGL_TEXTURE_FLOAT_R_NV 0x20B5 -#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6 -#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7 -#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8 -#endif - -#ifndef WGL_3DL_stereo_control -#define WGL_STEREO_EMITTER_ENABLE_3DL 0x2055 -#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056 -#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057 -#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058 -#endif - -#ifndef WGL_EXT_pixel_format_packed_float -#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8 -#endif - -#ifndef WGL_EXT_framebuffer_sRGB -#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9 -#endif - -#ifndef WGL_NV_present_video -#define WGL_NUM_VIDEO_SLOTS_NV 0x20F0 -#endif - -#ifndef WGL_NV_video_out -#define WGL_BIND_TO_VIDEO_RGB_NV 0x20C0 -#define WGL_BIND_TO_VIDEO_RGBA_NV 0x20C1 -#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2 -#define WGL_VIDEO_OUT_COLOR_NV 0x20C3 -#define WGL_VIDEO_OUT_ALPHA_NV 0x20C4 -#define WGL_VIDEO_OUT_DEPTH_NV 0x20C5 -#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 -#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 -#define WGL_VIDEO_OUT_FRAME 0x20C8 -#define WGL_VIDEO_OUT_FIELD_1 0x20C9 -#define WGL_VIDEO_OUT_FIELD_2 0x20CA -#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2 0x20CB -#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1 0x20CC -#endif - -#ifndef WGL_NV_swap_group -#endif - -#ifndef WGL_NV_gpu_affinity -#define WGL_ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0 -#define WGL_ERROR_MISSING_AFFINITY_MASK_NV 0x20D1 -#endif - -#ifndef WGL_AMD_gpu_association -#define WGL_GPU_VENDOR_AMD 0x1F00 -#define WGL_GPU_RENDERER_STRING_AMD 0x1F01 -#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02 -#define WGL_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2 -#define WGL_GPU_RAM_AMD 0x21A3 -#define WGL_GPU_CLOCK_AMD 0x21A4 -#define WGL_GPU_NUM_PIPES_AMD 0x21A5 -#define WGL_GPU_NUM_SIMD_AMD 0x21A6 -#define WGL_GPU_NUM_RB_AMD 0x21A7 -#define WGL_GPU_NUM_SPI_AMD 0x21A8 -#endif - -#ifndef WGL_NV_video_capture -#define WGL_UNIQUE_ID_NV 0x20CE -#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF -#endif - -#ifndef WGL_NV_copy_image -#endif - -#ifndef WGL_NV_multisample_coverage -#define WGL_COVERAGE_SAMPLES_NV 0x2042 -#define WGL_COLOR_SAMPLES_NV 0x20B9 -#endif - -#ifndef WGL_EXT_create_context_es2_profile -#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 -#endif - -#ifndef WGL_NV_DX_interop -#define WGL_ACCESS_READ_ONLY_NV 0x00000000 -#define WGL_ACCESS_READ_WRITE_NV 0x00000001 -#define WGL_ACCESS_WRITE_DISCARD_NV 0x00000002 -#endif - - -/*************************************************************/ - -#ifndef WGL_ARB_pbuffer -DECLARE_HANDLE(HPBUFFERARB); -#endif -#ifndef WGL_EXT_pbuffer -DECLARE_HANDLE(HPBUFFEREXT); -#endif -#ifndef WGL_NV_present_video -DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV); -#endif -#ifndef WGL_NV_video_output -DECLARE_HANDLE(HPVIDEODEV); -#endif -#ifndef WGL_NV_gpu_affinity -DECLARE_HANDLE(HPGPUNV); -DECLARE_HANDLE(HGPUNV); - -typedef struct _GPU_DEVICE { - DWORD cb; - CHAR DeviceName[32]; - CHAR DeviceString[128]; - DWORD Flags; - RECT rcVirtualScreen; -} GPU_DEVICE, *PGPU_DEVICE; -#endif -#ifndef WGL_NV_video_capture -DECLARE_HANDLE(HVIDEOINPUTDEVICENV); -#endif - -#ifndef WGL_ARB_buffer_region -#define WGL_ARB_buffer_region 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern HANDLE WINAPI wglCreateBufferRegionARB (HDC hDC, int iLayerPlane, UINT uType); -extern VOID WINAPI wglDeleteBufferRegionARB (HANDLE hRegion); -extern BOOL WINAPI wglSaveBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height); -extern BOOL WINAPI wglRestoreBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType); -typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion); -typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height); -typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); -#endif - -#ifndef WGL_ARB_multisample -#define WGL_ARB_multisample 1 -#endif - -#ifndef WGL_ARB_extensions_string -#define WGL_ARB_extensions_string 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern const char * WINAPI wglGetExtensionsStringARB (HDC hdc); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc); -#endif - -#ifndef WGL_ARB_pixel_format -#define WGL_ARB_pixel_format 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); -extern BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); -extern BOOL WINAPI wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); -typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#endif - -#ifndef WGL_ARB_make_current_read -#define WGL_ARB_make_current_read 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglMakeContextCurrentARB (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -extern HDC WINAPI wglGetCurrentReadDCARB (void); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void); -#endif - -#ifndef WGL_ARB_pbuffer -#define WGL_ARB_pbuffer 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern HPBUFFERARB WINAPI wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); -extern HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB hPbuffer); -extern int WINAPI wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); -extern BOOL WINAPI wglDestroyPbufferARB (HPBUFFERARB hPbuffer); -extern BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); -typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer); -typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC); -typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer); -typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); -#endif - -#ifndef WGL_ARB_render_texture -#define WGL_ARB_render_texture 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); -extern BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); -extern BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); -typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); -typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList); -#endif - -#ifndef WGL_ARB_pixel_format_float -#define WGL_ARB_pixel_format_float 1 -#endif - -#ifndef WGL_ARB_framebuffer_sRGB -#define WGL_ARB_framebuffer_sRGB 1 -#endif - -#ifndef WGL_ARB_create_context -#define WGL_ARB_create_context 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern HGLRC WINAPI wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int *attribList); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList); -#endif - -#ifndef WGL_ARB_create_context_profile -#define WGL_ARB_create_context_profile 1 -#endif - -#ifndef WGL_ARB_create_context_robustness -#define WGL_ARB_create_context_robustness 1 -#endif - -#ifndef WGL_EXT_display_color_table -#define WGL_EXT_display_color_table 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort id); -extern GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *table, GLuint length); -extern GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort id); -extern VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort id); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length); -typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id); -#endif - -#ifndef WGL_EXT_extensions_string -#define WGL_EXT_extensions_string 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern const char * WINAPI wglGetExtensionsStringEXT (void); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void); -#endif - -#ifndef WGL_EXT_make_current_read -#define WGL_EXT_make_current_read 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglMakeContextCurrentEXT (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -extern HDC WINAPI wglGetCurrentReadDCEXT (void); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void); -#endif - -#ifndef WGL_EXT_pbuffer -#define WGL_EXT_pbuffer 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); -extern HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT hPbuffer); -extern int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT hPbuffer, HDC hDC); -extern BOOL WINAPI wglDestroyPbufferEXT (HPBUFFEREXT hPbuffer); -extern BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); -typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer); -typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC); -typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer); -typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue); -#endif - -#ifndef WGL_EXT_pixel_format -#define WGL_EXT_pixel_format 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); -extern BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); -extern BOOL WINAPI wglChoosePixelFormatEXT (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); -typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#endif - -#ifndef WGL_EXT_swap_control -#define WGL_EXT_swap_control 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglSwapIntervalEXT (int interval); -extern int WINAPI wglGetSwapIntervalEXT (void); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval); -typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void); -#endif - -#ifndef WGL_EXT_depth_float -#define WGL_EXT_depth_float 1 -#endif - -#ifndef WGL_NV_vertex_array_range -#define WGL_NV_vertex_array_range 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern void* WINAPI wglAllocateMemoryNV (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); -extern void WINAPI wglFreeMemoryNV (void *pointer); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef void* (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); -typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer); -#endif - -#ifndef WGL_3DFX_multisample -#define WGL_3DFX_multisample 1 -#endif - -#ifndef WGL_EXT_multisample -#define WGL_EXT_multisample 1 -#endif - -#ifndef WGL_OML_sync_control -#define WGL_OML_sync_control 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetSyncValuesOML (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc); -extern BOOL WINAPI wglGetMscRateOML (HDC hdc, INT32 *numerator, INT32 *denominator); -extern INT64 WINAPI wglSwapBuffersMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); -extern INT64 WINAPI wglSwapLayerBuffersMscOML (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); -extern BOOL WINAPI wglWaitForMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc); -extern BOOL WINAPI wglWaitForSbcOML (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc); -typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator); -typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); -typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); -typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc); -typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc); -#endif - -#ifndef WGL_I3D_digital_video_control -#define WGL_I3D_digital_video_control 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC hDC, int iAttribute, int *piValue); -extern BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC hDC, int iAttribute, const int *piValue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue); -typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue); -#endif - -#ifndef WGL_I3D_gamma -#define WGL_I3D_gamma 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetGammaTableParametersI3D (HDC hDC, int iAttribute, int *piValue); -extern BOOL WINAPI wglSetGammaTableParametersI3D (HDC hDC, int iAttribute, const int *piValue); -extern BOOL WINAPI wglGetGammaTableI3D (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue); -extern BOOL WINAPI wglSetGammaTableI3D (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue); -typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue); -typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue); -typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue); -#endif - -#ifndef WGL_I3D_genlock -#define WGL_I3D_genlock 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglEnableGenlockI3D (HDC hDC); -extern BOOL WINAPI wglDisableGenlockI3D (HDC hDC); -extern BOOL WINAPI wglIsEnabledGenlockI3D (HDC hDC, BOOL *pFlag); -extern BOOL WINAPI wglGenlockSourceI3D (HDC hDC, UINT uSource); -extern BOOL WINAPI wglGetGenlockSourceI3D (HDC hDC, UINT *uSource); -extern BOOL WINAPI wglGenlockSourceEdgeI3D (HDC hDC, UINT uEdge); -extern BOOL WINAPI wglGetGenlockSourceEdgeI3D (HDC hDC, UINT *uEdge); -extern BOOL WINAPI wglGenlockSampleRateI3D (HDC hDC, UINT uRate); -extern BOOL WINAPI wglGetGenlockSampleRateI3D (HDC hDC, UINT *uRate); -extern BOOL WINAPI wglGenlockSourceDelayI3D (HDC hDC, UINT uDelay); -extern BOOL WINAPI wglGetGenlockSourceDelayI3D (HDC hDC, UINT *uDelay); -extern BOOL WINAPI wglQueryGenlockMaxSourceDelayI3D (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC); -typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC); -typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL *pFlag); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT *uSource); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT *uEdge); -typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay); -typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay); -#endif - -#ifndef WGL_I3D_image_buffer -#define WGL_I3D_image_buffer 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern LPVOID WINAPI wglCreateImageBufferI3D (HDC hDC, DWORD dwSize, UINT uFlags); -extern BOOL WINAPI wglDestroyImageBufferI3D (HDC hDC, LPVOID pAddress); -extern BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count); -extern BOOL WINAPI wglReleaseImageBufferEventsI3D (HDC hDC, const LPVOID *pAddress, UINT count); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags); -typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress); -typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count); -typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count); -#endif - -#ifndef WGL_I3D_swap_frame_lock -#define WGL_I3D_swap_frame_lock 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglEnableFrameLockI3D (void); -extern BOOL WINAPI wglDisableFrameLockI3D (void); -extern BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *pFlag); -extern BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *pFlag); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag); -#endif - -#ifndef WGL_I3D_swap_frame_usage -#define WGL_I3D_swap_frame_usage 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetFrameUsageI3D (float *pUsage); -extern BOOL WINAPI wglBeginFrameTrackingI3D (void); -extern BOOL WINAPI wglEndFrameTrackingI3D (void); -extern BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage); -typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); -#endif - -#ifndef WGL_ATI_pixel_format_float -#define WGL_ATI_pixel_format_float 1 -#endif - -#ifndef WGL_NV_float_buffer -#define WGL_NV_float_buffer 1 -#endif - -#ifndef WGL_3DL_stereo_control -#define WGL_3DL_stereo_control 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglSetStereoEmitterState3DL (HDC hDC, UINT uState); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState); -#endif - -#ifndef WGL_EXT_pixel_format_packed_float -#define WGL_EXT_pixel_format_packed_float 1 -#endif - -#ifndef WGL_EXT_framebuffer_sRGB -#define WGL_EXT_framebuffer_sRGB 1 -#endif - -#ifndef WGL_NV_present_video -#define WGL_NV_present_video 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern int WINAPI wglEnumerateVideoDevicesNV (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList); -extern BOOL WINAPI wglBindVideoDeviceNV (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); -extern BOOL WINAPI wglQueryCurrentContextNV (int iAttribute, int *piValue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList); -typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); -typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int *piValue); -#endif - -#ifndef WGL_NV_video_output -#define WGL_NV_video_output 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetVideoDeviceNV (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice); -extern BOOL WINAPI wglReleaseVideoDeviceNV (HPVIDEODEV hVideoDevice); -extern BOOL WINAPI wglBindVideoImageNV (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer); -extern BOOL WINAPI wglReleaseVideoImageNV (HPBUFFERARB hPbuffer, int iVideoBuffer); -extern BOOL WINAPI wglSendPbufferToVideoNV (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock); -extern BOOL WINAPI wglGetVideoInfoNV (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice); -typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer); -typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock); -typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); -#endif - -#ifndef WGL_NV_swap_group -#define WGL_NV_swap_group 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglJoinSwapGroupNV (HDC hDC, GLuint group); -extern BOOL WINAPI wglBindSwapBarrierNV (GLuint group, GLuint barrier); -extern BOOL WINAPI wglQuerySwapGroupNV (HDC hDC, GLuint *group, GLuint *barrier); -extern BOOL WINAPI wglQueryMaxSwapGroupsNV (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers); -extern BOOL WINAPI wglQueryFrameCountNV (HDC hDC, GLuint *count); -extern BOOL WINAPI wglResetFrameCountNV (HDC hDC); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group); -typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier); -typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint *group, GLuint *barrier); -typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint *count); -typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC); -#endif - -#ifndef WGL_NV_gpu_affinity -#define WGL_NV_gpu_affinity 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglEnumGpusNV (UINT iGpuIndex, HGPUNV *phGpu); -extern BOOL WINAPI wglEnumGpuDevicesNV (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice); -extern HDC WINAPI wglCreateAffinityDCNV (const HGPUNV *phGpuList); -extern BOOL WINAPI wglEnumGpusFromAffinityDCNV (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu); -extern BOOL WINAPI wglDeleteDCNV (HDC hdc); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu); -typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice); -typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList); -typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu); -typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc); -#endif - -#ifndef WGL_AMD_gpu_association -#define WGL_AMD_gpu_association 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern UINT WINAPI wglGetGPUIDsAMD (UINT maxCount, UINT *ids); -extern INT WINAPI wglGetGPUInfoAMD (UINT id, int property, GLenum dataType, UINT size, void *data); -extern UINT WINAPI wglGetContextGPUIDAMD (HGLRC hglrc); -extern HGLRC WINAPI wglCreateAssociatedContextAMD (UINT id); -extern HGLRC WINAPI wglCreateAssociatedContextAttribsAMD (UINT id, HGLRC hShareContext, const int *attribList); -extern BOOL WINAPI wglDeleteAssociatedContextAMD (HGLRC hglrc); -extern BOOL WINAPI wglMakeAssociatedContextCurrentAMD (HGLRC hglrc); -extern HGLRC WINAPI wglGetCurrentAssociatedContextAMD (void); -extern VOID WINAPI wglBlitContextFramebufferAMD (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT *ids); -typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, int property, GLenum dataType, UINT size, void *data); -typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc); -typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id); -typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int *attribList); -typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc); -typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc); -typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void); -typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif - -#ifndef WGL_NV_video_capture -#define WGL_NV_video_capture 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglBindVideoCaptureDeviceNV (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice); -extern UINT WINAPI wglEnumerateVideoCaptureDevicesNV (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList); -extern BOOL WINAPI wglLockVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -extern BOOL WINAPI wglQueryVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue); -extern BOOL WINAPI wglReleaseVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice); -typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList); -typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -#endif - -#ifndef WGL_NV_copy_image -#define WGL_NV_copy_image 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif - -#ifndef WGL_NV_multisample_coverage -#define WGL_NV_multisample_coverage 1 -#endif - -#ifndef WGL_NV_DX_interop -#define WGL_NV_DX_interop 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglDXSetResourceShareHandleNV (void *dxObject, HANDLE shareHandle); -extern HANDLE WINAPI wglDXOpenDeviceNV (void *dxDevice); -extern BOOL WINAPI wglDXCloseDeviceNV (HANDLE hDevice); -extern HANDLE WINAPI wglDXRegisterObjectNV (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access); -extern BOOL WINAPI wglDXUnregisterObjectNV (HANDLE hDevice, HANDLE hObject); -extern BOOL WINAPI wglDXObjectAccessNV (HANDLE hObject, GLenum access); -extern BOOL WINAPI wglDXLockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects); -extern BOOL WINAPI wglDXUnlockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void *dxObject, HANDLE shareHandle); -typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void *dxDevice); -typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice); -typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access); -typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject); -typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access); -typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); -typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); -#endif - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/parser.cpp b/parser.cpp index 46cd8701..8d1076e1 100644 --- a/parser.cpp +++ b/parser.cpp @@ -65,7 +65,7 @@ cParser::~cParser() } // methods -bool cParser::getTokens(int Count, bool ToLower, const char *Break) +bool cParser::getTokens(unsigned int Count, bool ToLower, const char *Break) { /* if (LoadTraction==true) @@ -78,7 +78,7 @@ bool cParser::getTokens(int Count, bool ToLower, const char *Break) this->str(""); this->clear(); */ - for (int i = 0; i < Count; ++i) + for (unsigned int i = 0; i < Count; ++i) { std::string token = readToken(ToLower, Break); if( true == token.empty() ) { diff --git a/parser.h b/parser.h index 5b5d3256..a790a3ee 100644 --- a/parser.h +++ b/parser.h @@ -77,7 +77,7 @@ class cParser //: public std::stringstream { return !mStream->fail(); }; - bool getTokens(int Count = 1, bool ToLower = true, const char *Break = "\n\t ;"); + bool getTokens(unsigned int Count = 1, bool ToLower = true, const char *Break = "\n\t ;"); // returns percentage of file processed so far int getProgress() const; // add custom definition of text which should be ignored when retrieving tokens diff --git a/python/include/Python-ast.h b/python/include/Python-ast.h deleted file mode 100644 index 3f35bbb6..00000000 --- a/python/include/Python-ast.h +++ /dev/null @@ -1,535 +0,0 @@ -/* File automatically generated by Parser/asdl_c.py. */ - -#include "asdl.h" - -typedef struct _mod *mod_ty; - -typedef struct _stmt *stmt_ty; - -typedef struct _expr *expr_ty; - -typedef enum _expr_context { Load=1, Store=2, Del=3, AugLoad=4, AugStore=5, - Param=6 } expr_context_ty; - -typedef struct _slice *slice_ty; - -typedef enum _boolop { And=1, Or=2 } boolop_ty; - -typedef enum _operator { Add=1, Sub=2, Mult=3, Div=4, Mod=5, Pow=6, LShift=7, - RShift=8, BitOr=9, BitXor=10, BitAnd=11, FloorDiv=12 } - operator_ty; - -typedef enum _unaryop { Invert=1, Not=2, UAdd=3, USub=4 } unaryop_ty; - -typedef enum _cmpop { Eq=1, NotEq=2, Lt=3, LtE=4, Gt=5, GtE=6, Is=7, IsNot=8, - In=9, NotIn=10 } cmpop_ty; - -typedef struct _comprehension *comprehension_ty; - -typedef struct _excepthandler *excepthandler_ty; - -typedef struct _arguments *arguments_ty; - -typedef struct _keyword *keyword_ty; - -typedef struct _alias *alias_ty; - - -enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3, - Suite_kind=4}; -struct _mod { - enum _mod_kind kind; - union { - struct { - asdl_seq *body; - } Module; - - struct { - asdl_seq *body; - } Interactive; - - struct { - expr_ty body; - } Expression; - - struct { - asdl_seq *body; - } Suite; - - } v; -}; - -enum _stmt_kind {FunctionDef_kind=1, ClassDef_kind=2, Return_kind=3, - Delete_kind=4, Assign_kind=5, AugAssign_kind=6, Print_kind=7, - For_kind=8, While_kind=9, If_kind=10, With_kind=11, - Raise_kind=12, TryExcept_kind=13, TryFinally_kind=14, - Assert_kind=15, Import_kind=16, ImportFrom_kind=17, - Exec_kind=18, Global_kind=19, Expr_kind=20, Pass_kind=21, - Break_kind=22, Continue_kind=23}; -struct _stmt { - enum _stmt_kind kind; - union { - struct { - identifier name; - arguments_ty args; - asdl_seq *body; - asdl_seq *decorator_list; - } FunctionDef; - - struct { - identifier name; - asdl_seq *bases; - asdl_seq *body; - asdl_seq *decorator_list; - } ClassDef; - - struct { - expr_ty value; - } Return; - - struct { - asdl_seq *targets; - } Delete; - - struct { - asdl_seq *targets; - expr_ty value; - } Assign; - - struct { - expr_ty target; - operator_ty op; - expr_ty value; - } AugAssign; - - struct { - expr_ty dest; - asdl_seq *values; - bool nl; - } Print; - - struct { - expr_ty target; - expr_ty iter; - asdl_seq *body; - asdl_seq *orelse; - } For; - - struct { - expr_ty test; - asdl_seq *body; - asdl_seq *orelse; - } While; - - struct { - expr_ty test; - asdl_seq *body; - asdl_seq *orelse; - } If; - - struct { - expr_ty context_expr; - expr_ty optional_vars; - asdl_seq *body; - } With; - - struct { - expr_ty type; - expr_ty inst; - expr_ty tback; - } Raise; - - struct { - asdl_seq *body; - asdl_seq *handlers; - asdl_seq *orelse; - } TryExcept; - - struct { - asdl_seq *body; - asdl_seq *finalbody; - } TryFinally; - - struct { - expr_ty test; - expr_ty msg; - } Assert; - - struct { - asdl_seq *names; - } Import; - - struct { - identifier module; - asdl_seq *names; - int level; - } ImportFrom; - - struct { - expr_ty body; - expr_ty globals; - expr_ty locals; - } Exec; - - struct { - asdl_seq *names; - } Global; - - struct { - expr_ty value; - } Expr; - - } v; - int lineno; - int col_offset; -}; - -enum _expr_kind {BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4, - IfExp_kind=5, Dict_kind=6, Set_kind=7, ListComp_kind=8, - SetComp_kind=9, DictComp_kind=10, GeneratorExp_kind=11, - Yield_kind=12, Compare_kind=13, Call_kind=14, Repr_kind=15, - Num_kind=16, Str_kind=17, Attribute_kind=18, - Subscript_kind=19, Name_kind=20, List_kind=21, Tuple_kind=22}; -struct _expr { - enum _expr_kind kind; - union { - struct { - boolop_ty op; - asdl_seq *values; - } BoolOp; - - struct { - expr_ty left; - operator_ty op; - expr_ty right; - } BinOp; - - struct { - unaryop_ty op; - expr_ty operand; - } UnaryOp; - - struct { - arguments_ty args; - expr_ty body; - } Lambda; - - struct { - expr_ty test; - expr_ty body; - expr_ty orelse; - } IfExp; - - struct { - asdl_seq *keys; - asdl_seq *values; - } Dict; - - struct { - asdl_seq *elts; - } Set; - - struct { - expr_ty elt; - asdl_seq *generators; - } ListComp; - - struct { - expr_ty elt; - asdl_seq *generators; - } SetComp; - - struct { - expr_ty key; - expr_ty value; - asdl_seq *generators; - } DictComp; - - struct { - expr_ty elt; - asdl_seq *generators; - } GeneratorExp; - - struct { - expr_ty value; - } Yield; - - struct { - expr_ty left; - asdl_int_seq *ops; - asdl_seq *comparators; - } Compare; - - struct { - expr_ty func; - asdl_seq *args; - asdl_seq *keywords; - expr_ty starargs; - expr_ty kwargs; - } Call; - - struct { - expr_ty value; - } Repr; - - struct { - object n; - } Num; - - struct { - string s; - } Str; - - struct { - expr_ty value; - identifier attr; - expr_context_ty ctx; - } Attribute; - - struct { - expr_ty value; - slice_ty slice; - expr_context_ty ctx; - } Subscript; - - struct { - identifier id; - expr_context_ty ctx; - } Name; - - struct { - asdl_seq *elts; - expr_context_ty ctx; - } List; - - struct { - asdl_seq *elts; - expr_context_ty ctx; - } Tuple; - - } v; - int lineno; - int col_offset; -}; - -enum _slice_kind {Ellipsis_kind=1, Slice_kind=2, ExtSlice_kind=3, Index_kind=4}; -struct _slice { - enum _slice_kind kind; - union { - struct { - expr_ty lower; - expr_ty upper; - expr_ty step; - } Slice; - - struct { - asdl_seq *dims; - } ExtSlice; - - struct { - expr_ty value; - } Index; - - } v; -}; - -struct _comprehension { - expr_ty target; - expr_ty iter; - asdl_seq *ifs; -}; - -enum _excepthandler_kind {ExceptHandler_kind=1}; -struct _excepthandler { - enum _excepthandler_kind kind; - union { - struct { - expr_ty type; - expr_ty name; - asdl_seq *body; - } ExceptHandler; - - } v; - int lineno; - int col_offset; -}; - -struct _arguments { - asdl_seq *args; - identifier vararg; - identifier kwarg; - asdl_seq *defaults; -}; - -struct _keyword { - identifier arg; - expr_ty value; -}; - -struct _alias { - identifier name; - identifier asname; -}; - - -#define Module(a0, a1) _Py_Module(a0, a1) -mod_ty _Py_Module(asdl_seq * body, PyArena *arena); -#define Interactive(a0, a1) _Py_Interactive(a0, a1) -mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena); -#define Expression(a0, a1) _Py_Expression(a0, a1) -mod_ty _Py_Expression(expr_ty body, PyArena *arena); -#define Suite(a0, a1) _Py_Suite(a0, a1) -mod_ty _Py_Suite(asdl_seq * body, PyArena *arena); -#define FunctionDef(a0, a1, a2, a3, a4, a5, a6) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6) -stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body, - asdl_seq * decorator_list, int lineno, int col_offset, - PyArena *arena); -#define ClassDef(a0, a1, a2, a3, a4, a5, a6) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6) -stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * body, - asdl_seq * decorator_list, int lineno, int col_offset, - PyArena *arena); -#define Return(a0, a1, a2, a3) _Py_Return(a0, a1, a2, a3) -stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, PyArena *arena); -#define Delete(a0, a1, a2, a3) _Py_Delete(a0, a1, a2, a3) -stmt_ty _Py_Delete(asdl_seq * targets, int lineno, int col_offset, PyArena - *arena); -#define Assign(a0, a1, a2, a3, a4) _Py_Assign(a0, a1, a2, a3, a4) -stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, int lineno, int - col_offset, PyArena *arena); -#define AugAssign(a0, a1, a2, a3, a4, a5) _Py_AugAssign(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int - lineno, int col_offset, PyArena *arena); -#define Print(a0, a1, a2, a3, a4, a5) _Py_Print(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_Print(expr_ty dest, asdl_seq * values, bool nl, int lineno, int - col_offset, PyArena *arena); -#define For(a0, a1, a2, a3, a4, a5, a6) _Py_For(a0, a1, a2, a3, a4, a5, a6) -stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * - orelse, int lineno, int col_offset, PyArena *arena); -#define While(a0, a1, a2, a3, a4, a5) _Py_While(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, - int col_offset, PyArena *arena); -#define If(a0, a1, a2, a3, a4, a5) _Py_If(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, - int col_offset, PyArena *arena); -#define With(a0, a1, a2, a3, a4, a5) _Py_With(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_With(expr_ty context_expr, expr_ty optional_vars, asdl_seq * body, - int lineno, int col_offset, PyArena *arena); -#define Raise(a0, a1, a2, a3, a4, a5) _Py_Raise(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_Raise(expr_ty type, expr_ty inst, expr_ty tback, int lineno, int - col_offset, PyArena *arena); -#define TryExcept(a0, a1, a2, a3, a4, a5) _Py_TryExcept(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_TryExcept(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse, - int lineno, int col_offset, PyArena *arena); -#define TryFinally(a0, a1, a2, a3, a4) _Py_TryFinally(a0, a1, a2, a3, a4) -stmt_ty _Py_TryFinally(asdl_seq * body, asdl_seq * finalbody, int lineno, int - col_offset, PyArena *arena); -#define Assert(a0, a1, a2, a3, a4) _Py_Assert(a0, a1, a2, a3, a4) -stmt_ty _Py_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, - PyArena *arena); -#define Import(a0, a1, a2, a3) _Py_Import(a0, a1, a2, a3) -stmt_ty _Py_Import(asdl_seq * names, int lineno, int col_offset, PyArena - *arena); -#define ImportFrom(a0, a1, a2, a3, a4, a5) _Py_ImportFrom(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_ImportFrom(identifier module, asdl_seq * names, int level, int - lineno, int col_offset, PyArena *arena); -#define Exec(a0, a1, a2, a3, a4, a5) _Py_Exec(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_Exec(expr_ty body, expr_ty globals, expr_ty locals, int lineno, int - col_offset, PyArena *arena); -#define Global(a0, a1, a2, a3) _Py_Global(a0, a1, a2, a3) -stmt_ty _Py_Global(asdl_seq * names, int lineno, int col_offset, PyArena - *arena); -#define Expr(a0, a1, a2, a3) _Py_Expr(a0, a1, a2, a3) -stmt_ty _Py_Expr(expr_ty value, int lineno, int col_offset, PyArena *arena); -#define Pass(a0, a1, a2) _Py_Pass(a0, a1, a2) -stmt_ty _Py_Pass(int lineno, int col_offset, PyArena *arena); -#define Break(a0, a1, a2) _Py_Break(a0, a1, a2) -stmt_ty _Py_Break(int lineno, int col_offset, PyArena *arena); -#define Continue(a0, a1, a2) _Py_Continue(a0, a1, a2) -stmt_ty _Py_Continue(int lineno, int col_offset, PyArena *arena); -#define BoolOp(a0, a1, a2, a3, a4) _Py_BoolOp(a0, a1, a2, a3, a4) -expr_ty _Py_BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset, - PyArena *arena); -#define BinOp(a0, a1, a2, a3, a4, a5) _Py_BinOp(a0, a1, a2, a3, a4, a5) -expr_ty _Py_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int - col_offset, PyArena *arena); -#define UnaryOp(a0, a1, a2, a3, a4) _Py_UnaryOp(a0, a1, a2, a3, a4) -expr_ty _Py_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset, - PyArena *arena); -#define Lambda(a0, a1, a2, a3, a4) _Py_Lambda(a0, a1, a2, a3, a4) -expr_ty _Py_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset, - PyArena *arena); -#define IfExp(a0, a1, a2, a3, a4, a5) _Py_IfExp(a0, a1, a2, a3, a4, a5) -expr_ty _Py_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int - col_offset, PyArena *arena); -#define Dict(a0, a1, a2, a3, a4) _Py_Dict(a0, a1, a2, a3, a4) -expr_ty _Py_Dict(asdl_seq * keys, asdl_seq * values, int lineno, int - col_offset, PyArena *arena); -#define Set(a0, a1, a2, a3) _Py_Set(a0, a1, a2, a3) -expr_ty _Py_Set(asdl_seq * elts, int lineno, int col_offset, PyArena *arena); -#define ListComp(a0, a1, a2, a3, a4) _Py_ListComp(a0, a1, a2, a3, a4) -expr_ty _Py_ListComp(expr_ty elt, asdl_seq * generators, int lineno, int - col_offset, PyArena *arena); -#define SetComp(a0, a1, a2, a3, a4) _Py_SetComp(a0, a1, a2, a3, a4) -expr_ty _Py_SetComp(expr_ty elt, asdl_seq * generators, int lineno, int - col_offset, PyArena *arena); -#define DictComp(a0, a1, a2, a3, a4, a5) _Py_DictComp(a0, a1, a2, a3, a4, a5) -expr_ty _Py_DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int - lineno, int col_offset, PyArena *arena); -#define GeneratorExp(a0, a1, a2, a3, a4) _Py_GeneratorExp(a0, a1, a2, a3, a4) -expr_ty _Py_GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int - col_offset, PyArena *arena); -#define Yield(a0, a1, a2, a3) _Py_Yield(a0, a1, a2, a3) -expr_ty _Py_Yield(expr_ty value, int lineno, int col_offset, PyArena *arena); -#define Compare(a0, a1, a2, a3, a4, a5) _Py_Compare(a0, a1, a2, a3, a4, a5) -expr_ty _Py_Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators, - int lineno, int col_offset, PyArena *arena); -#define Call(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Call(a0, a1, a2, a3, a4, a5, a6, a7) -expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty - starargs, expr_ty kwargs, int lineno, int col_offset, PyArena - *arena); -#define Repr(a0, a1, a2, a3) _Py_Repr(a0, a1, a2, a3) -expr_ty _Py_Repr(expr_ty value, int lineno, int col_offset, PyArena *arena); -#define Num(a0, a1, a2, a3) _Py_Num(a0, a1, a2, a3) -expr_ty _Py_Num(object n, int lineno, int col_offset, PyArena *arena); -#define Str(a0, a1, a2, a3) _Py_Str(a0, a1, a2, a3) -expr_ty _Py_Str(string s, int lineno, int col_offset, PyArena *arena); -#define Attribute(a0, a1, a2, a3, a4, a5) _Py_Attribute(a0, a1, a2, a3, a4, a5) -expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int - lineno, int col_offset, PyArena *arena); -#define Subscript(a0, a1, a2, a3, a4, a5) _Py_Subscript(a0, a1, a2, a3, a4, a5) -expr_ty _Py_Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int - lineno, int col_offset, PyArena *arena); -#define Name(a0, a1, a2, a3, a4) _Py_Name(a0, a1, a2, a3, a4) -expr_ty _Py_Name(identifier id, expr_context_ty ctx, int lineno, int - col_offset, PyArena *arena); -#define List(a0, a1, a2, a3, a4) _Py_List(a0, a1, a2, a3, a4) -expr_ty _Py_List(asdl_seq * elts, expr_context_ty ctx, int lineno, int - col_offset, PyArena *arena); -#define Tuple(a0, a1, a2, a3, a4) _Py_Tuple(a0, a1, a2, a3, a4) -expr_ty _Py_Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int - col_offset, PyArena *arena); -#define Ellipsis(a0) _Py_Ellipsis(a0) -slice_ty _Py_Ellipsis(PyArena *arena); -#define Slice(a0, a1, a2, a3) _Py_Slice(a0, a1, a2, a3) -slice_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena); -#define ExtSlice(a0, a1) _Py_ExtSlice(a0, a1) -slice_ty _Py_ExtSlice(asdl_seq * dims, PyArena *arena); -#define Index(a0, a1) _Py_Index(a0, a1) -slice_ty _Py_Index(expr_ty value, PyArena *arena); -#define comprehension(a0, a1, a2, a3) _Py_comprehension(a0, a1, a2, a3) -comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq * - ifs, PyArena *arena); -#define ExceptHandler(a0, a1, a2, a3, a4, a5) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5) -excepthandler_ty _Py_ExceptHandler(expr_ty type, expr_ty name, asdl_seq * body, - int lineno, int col_offset, PyArena *arena); -#define arguments(a0, a1, a2, a3, a4) _Py_arguments(a0, a1, a2, a3, a4) -arguments_ty _Py_arguments(asdl_seq * args, identifier vararg, identifier - kwarg, asdl_seq * defaults, PyArena *arena); -#define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2) -keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena); -#define alias(a0, a1, a2) _Py_alias(a0, a1, a2) -alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena); - -PyObject* PyAST_mod2obj(mod_ty t); -mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode); -int PyAST_Check(PyObject* obj); diff --git a/python/include/Python.h b/python/include/Python.h deleted file mode 100644 index 775412b8..00000000 --- a/python/include/Python.h +++ /dev/null @@ -1,178 +0,0 @@ -#ifndef Py_PYTHON_H -#define Py_PYTHON_H -/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */ - -/* Include nearly all Python header files */ - -#include "patchlevel.h" -#include "pyconfig.h" -#include "pymacconfig.h" - -/* Cyclic gc is always enabled, starting with release 2.3a1. Supply the - * old symbol for the benefit of extension modules written before then - * that may be conditionalizing on it. The core doesn't use it anymore. - */ -#ifndef WITH_CYCLE_GC -#define WITH_CYCLE_GC 1 -#endif - -#include - -#ifndef UCHAR_MAX -#error "Something's broken. UCHAR_MAX should be defined in limits.h." -#endif - -#if UCHAR_MAX != 255 -#error "Python's source code assumes C's unsigned char is an 8-bit type." -#endif - -#if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE) -#define _SGI_MP_SOURCE -#endif - -#include -#ifndef NULL -# error "Python.h requires that stdio.h define NULL." -#endif - -#include -#ifdef HAVE_ERRNO_H -#include -#endif -#include -#ifdef HAVE_UNISTD_H -#include -#endif - -/* For size_t? */ -#ifdef HAVE_STDDEF_H -#include -#endif - -/* CAUTION: Build setups should ensure that NDEBUG is defined on the - * compiler command line when building Python in release mode; else - * assert() calls won't be removed. - */ -#include - -#include "pyport.h" - -/* pyconfig.h or pyport.h may or may not define DL_IMPORT */ -#ifndef DL_IMPORT /* declarations for DLL import/export */ -#define DL_IMPORT(RTYPE) RTYPE -#endif -#ifndef DL_EXPORT /* declarations for DLL import/export */ -#define DL_EXPORT(RTYPE) RTYPE -#endif - -/* Debug-mode build with pymalloc implies PYMALLOC_DEBUG. - * PYMALLOC_DEBUG is in error if pymalloc is not in use. - */ -#if defined(Py_DEBUG) && defined(WITH_PYMALLOC) && !defined(PYMALLOC_DEBUG) -#define PYMALLOC_DEBUG -#endif -#if defined(PYMALLOC_DEBUG) && !defined(WITH_PYMALLOC) -#error "PYMALLOC_DEBUG requires WITH_PYMALLOC" -#endif -#include "pymath.h" -#include "pymem.h" - -#include "object.h" -#include "objimpl.h" - -#include "pydebug.h" - -#include "unicodeobject.h" -#include "intobject.h" -#include "boolobject.h" -#include "longobject.h" -#include "floatobject.h" -#ifndef WITHOUT_COMPLEX -#include "complexobject.h" -#endif -#include "rangeobject.h" -#include "stringobject.h" -#include "memoryobject.h" -#include "bufferobject.h" -#include "bytesobject.h" -#include "bytearrayobject.h" -#include "tupleobject.h" -#include "listobject.h" -#include "dictobject.h" -#include "enumobject.h" -#include "setobject.h" -#include "methodobject.h" -#include "moduleobject.h" -#include "funcobject.h" -#include "classobject.h" -#include "fileobject.h" -#include "cobject.h" -#include "pycapsule.h" -#include "traceback.h" -#include "sliceobject.h" -#include "cellobject.h" -#include "iterobject.h" -#include "genobject.h" -#include "descrobject.h" -#include "warnings.h" -#include "weakrefobject.h" - -#include "codecs.h" -#include "pyerrors.h" - -#include "pystate.h" - -#include "pyarena.h" -#include "modsupport.h" -#include "pythonrun.h" -#include "ceval.h" -#include "sysmodule.h" -#include "intrcheck.h" -#include "import.h" - -#include "abstract.h" - -#include "compile.h" -#include "eval.h" - -#include "pyctype.h" -#include "pystrtod.h" -#include "pystrcmp.h" -#include "dtoa.h" - -/* _Py_Mangle is defined in compile.c */ -PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name); - -/* PyArg_GetInt is deprecated and should not be used, use PyArg_Parse(). */ -#define PyArg_GetInt(v, a) PyArg_Parse((v), "i", (a)) - -/* PyArg_NoArgs should not be necessary. - Set ml_flags in the PyMethodDef to METH_NOARGS. */ -#define PyArg_NoArgs(v) PyArg_Parse(v, "") - -/* Argument must be a char or an int in [-128, 127] or [0, 255]. */ -#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff)) - -#include "pyfpe.h" - -/* These definitions must match corresponding definitions in graminit.h. - There's code in compile.c that checks that they are the same. */ -#define Py_single_input 256 -#define Py_file_input 257 -#define Py_eval_input 258 - -#ifdef HAVE_PTH -/* GNU pth user-space thread support */ -#include -#endif - -/* Define macros for inline documentation. */ -#define PyDoc_VAR(name) static char name[] -#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str) -#ifdef WITH_DOC_STRINGS -#define PyDoc_STR(str) str -#else -#define PyDoc_STR(str) "" -#endif - -#endif /* !Py_PYTHON_H */ diff --git a/python/include/abstract.h b/python/include/abstract.h deleted file mode 100644 index a3774238..00000000 --- a/python/include/abstract.h +++ /dev/null @@ -1,1396 +0,0 @@ -#ifndef Py_ABSTRACTOBJECT_H -#define Py_ABSTRACTOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef PY_SSIZE_T_CLEAN -#define PyObject_CallFunction _PyObject_CallFunction_SizeT -#define PyObject_CallMethod _PyObject_CallMethod_SizeT -#endif - -/* Abstract Object Interface (many thanks to Jim Fulton) */ - -/* - PROPOSAL: A Generic Python Object Interface for Python C Modules - -Problem - - Python modules written in C that must access Python objects must do - so through routines whose interfaces are described by a set of - include files. Unfortunately, these routines vary according to the - object accessed. To use these routines, the C programmer must check - the type of the object being used and must call a routine based on - the object type. For example, to access an element of a sequence, - the programmer must determine whether the sequence is a list or a - tuple: - - if(is_tupleobject(o)) - e=gettupleitem(o,i) - else if(is_listitem(o)) - e=getlistitem(o,i) - - If the programmer wants to get an item from another type of object - that provides sequence behavior, there is no clear way to do it - correctly. - - The persistent programmer may peruse object.h and find that the - _typeobject structure provides a means of invoking up to (currently - about) 41 special operators. So, for example, a routine can get an - item from any object that provides sequence behavior. However, to - use this mechanism, the programmer must make their code dependent on - the current Python implementation. - - Also, certain semantics, especially memory management semantics, may - differ by the type of object being used. Unfortunately, these - semantics are not clearly described in the current include files. - An abstract interface providing more consistent semantics is needed. - -Proposal - - I propose the creation of a standard interface (with an associated - library of routines and/or macros) for generically obtaining the - services of Python objects. This proposal can be viewed as one - components of a Python C interface consisting of several components. - - From the viewpoint of C access to Python services, we have (as - suggested by Guido in off-line discussions): - - - "Very high level layer": two or three functions that let you exec or - eval arbitrary Python code given as a string in a module whose name is - given, passing C values in and getting C values out using - mkvalue/getargs style format strings. This does not require the user - to declare any variables of type "PyObject *". This should be enough - to write a simple application that gets Python code from the user, - execs it, and returns the output or errors. (Error handling must also - be part of this API.) - - - "Abstract objects layer": which is the subject of this proposal. - It has many functions operating on objects, and lest you do many - things from C that you can also write in Python, without going - through the Python parser. - - - "Concrete objects layer": This is the public type-dependent - interface provided by the standard built-in types, such as floats, - strings, and lists. This interface exists and is currently - documented by the collection of include files provided with the - Python distributions. - - From the point of view of Python accessing services provided by C - modules: - - - "Python module interface": this interface consist of the basic - routines used to define modules and their members. Most of the - current extensions-writing guide deals with this interface. - - - "Built-in object interface": this is the interface that a new - built-in type must provide and the mechanisms and rules that a - developer of a new built-in type must use and follow. - - This proposal is a "first-cut" that is intended to spur - discussion. See especially the lists of notes. - - The Python C object interface will provide four protocols: object, - numeric, sequence, and mapping. Each protocol consists of a - collection of related operations. If an operation that is not - provided by a particular type is invoked, then a standard exception, - NotImplementedError is raised with a operation name as an argument. - In addition, for convenience this interface defines a set of - constructors for building objects of built-in types. This is needed - so new objects can be returned from C functions that otherwise treat - objects generically. - -Memory Management - - For all of the functions described in this proposal, if a function - retains a reference to a Python object passed as an argument, then the - function will increase the reference count of the object. It is - unnecessary for the caller to increase the reference count of an - argument in anticipation of the object's retention. - - All Python objects returned from functions should be treated as new - objects. Functions that return objects assume that the caller will - retain a reference and the reference count of the object has already - been incremented to account for this fact. A caller that does not - retain a reference to an object that is returned from a function - must decrement the reference count of the object (using - DECREF(object)) to prevent memory leaks. - - Note that the behavior mentioned here is different from the current - behavior for some objects (e.g. lists and tuples) when certain - type-specific routines are called directly (e.g. setlistitem). The - proposed abstraction layer will provide a consistent memory - management interface, correcting for inconsistent behavior for some - built-in types. - -Protocols - -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ - -/* Object Protocol: */ - - /* Implemented elsewhere: - - int PyObject_Print(PyObject *o, FILE *fp, int flags); - - Print an object, o, on file, fp. Returns -1 on - error. The flags argument is used to enable certain printing - options. The only option currently supported is Py_Print_RAW. - - (What should be said about Py_Print_RAW?) - - */ - - /* Implemented elsewhere: - - int PyObject_HasAttrString(PyObject *o, char *attr_name); - - Returns 1 if o has the attribute attr_name, and 0 otherwise. - This is equivalent to the Python expression: - hasattr(o,attr_name). - - This function always succeeds. - - */ - - /* Implemented elsewhere: - - PyObject* PyObject_GetAttrString(PyObject *o, char *attr_name); - - Retrieve an attributed named attr_name form object o. - Returns the attribute value on success, or NULL on failure. - This is the equivalent of the Python expression: o.attr_name. - - */ - - /* Implemented elsewhere: - - int PyObject_HasAttr(PyObject *o, PyObject *attr_name); - - Returns 1 if o has the attribute attr_name, and 0 otherwise. - This is equivalent to the Python expression: - hasattr(o,attr_name). - - This function always succeeds. - - */ - - /* Implemented elsewhere: - - PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name); - - Retrieve an attributed named attr_name form object o. - Returns the attribute value on success, or NULL on failure. - This is the equivalent of the Python expression: o.attr_name. - - */ - - - /* Implemented elsewhere: - - int PyObject_SetAttrString(PyObject *o, char *attr_name, PyObject *v); - - Set the value of the attribute named attr_name, for object o, - to the value, v. Returns -1 on failure. This is - the equivalent of the Python statement: o.attr_name=v. - - */ - - /* Implemented elsewhere: - - int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v); - - Set the value of the attribute named attr_name, for object o, - to the value, v. Returns -1 on failure. This is - the equivalent of the Python statement: o.attr_name=v. - - */ - - /* implemented as a macro: - - int PyObject_DelAttrString(PyObject *o, char *attr_name); - - Delete attribute named attr_name, for object o. Returns - -1 on failure. This is the equivalent of the Python - statement: del o.attr_name. - - */ -#define PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A),NULL) - - /* implemented as a macro: - - int PyObject_DelAttr(PyObject *o, PyObject *attr_name); - - Delete attribute named attr_name, for object o. Returns -1 - on failure. This is the equivalent of the Python - statement: del o.attr_name. - - */ -#define PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A),NULL) - - PyAPI_FUNC(int) PyObject_Cmp(PyObject *o1, PyObject *o2, int *result); - - /* - Compare the values of o1 and o2 using a routine provided by - o1, if one exists, otherwise with a routine provided by o2. - The result of the comparison is returned in result. Returns - -1 on failure. This is the equivalent of the Python - statement: result=cmp(o1,o2). - - */ - - /* Implemented elsewhere: - - int PyObject_Compare(PyObject *o1, PyObject *o2); - - Compare the values of o1 and o2 using a routine provided by - o1, if one exists, otherwise with a routine provided by o2. - Returns the result of the comparison on success. On error, - the value returned is undefined. This is equivalent to the - Python expression: cmp(o1,o2). - - */ - - /* Implemented elsewhere: - - PyObject *PyObject_Repr(PyObject *o); - - Compute the string representation of object, o. Returns the - string representation on success, NULL on failure. This is - the equivalent of the Python expression: repr(o). - - Called by the repr() built-in function and by reverse quotes. - - */ - - /* Implemented elsewhere: - - PyObject *PyObject_Str(PyObject *o); - - Compute the string representation of object, o. Returns the - string representation on success, NULL on failure. This is - the equivalent of the Python expression: str(o).) - - Called by the str() built-in function and by the print - statement. - - */ - - /* Implemented elsewhere: - - PyObject *PyObject_Unicode(PyObject *o); - - Compute the unicode representation of object, o. Returns the - unicode representation on success, NULL on failure. This is - the equivalent of the Python expression: unistr(o).) - - Called by the unistr() built-in function. - - */ - - /* Declared elsewhere - - PyAPI_FUNC(int) PyCallable_Check(PyObject *o); - - Determine if the object, o, is callable. Return 1 if the - object is callable and 0 otherwise. - - This function always succeeds. - - */ - - - - PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object, - PyObject *args, PyObject *kw); - - /* - Call a callable Python object, callable_object, with - arguments and keywords arguments. The 'args' argument can not be - NULL, but the 'kw' argument can be NULL. - - */ - - PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object, - PyObject *args); - - /* - Call a callable Python object, callable_object, with - arguments given by the tuple, args. If no arguments are - needed, then args may be NULL. Returns the result of the - call on success, or NULL on failure. This is the equivalent - of the Python expression: apply(o,args). - - */ - - PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object, - char *format, ...); - - /* - Call a callable Python object, callable_object, with a - variable number of C arguments. The C arguments are described - using a mkvalue-style format string. The format may be NULL, - indicating that no arguments are provided. Returns the - result of the call on success, or NULL on failure. This is - the equivalent of the Python expression: apply(o,args). - - */ - - - PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, char *m, - char *format, ...); - - /* - Call the method named m of object o with a variable number of - C arguments. The C arguments are described by a mkvalue - format string. The format may be NULL, indicating that no - arguments are provided. Returns the result of the call on - success, or NULL on failure. This is the equivalent of the - Python expression: o.method(args). - */ - - PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable, - char *format, ...); - PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o, - char *name, - char *format, ...); - - PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable, - ...); - - /* - Call a callable Python object, callable_object, with a - variable number of C arguments. The C arguments are provided - as PyObject * values, terminated by a NULL. Returns the - result of the call on success, or NULL on failure. This is - the equivalent of the Python expression: apply(o,args). - */ - - - PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o, - PyObject *m, ...); - - /* - Call the method named m of object o with a variable number of - C arguments. The C arguments are provided as PyObject * - values, terminated by NULL. Returns the result of the call - on success, or NULL on failure. This is the equivalent of - the Python expression: o.method(args). - */ - - - /* Implemented elsewhere: - - long PyObject_Hash(PyObject *o); - - Compute and return the hash, hash_value, of an object, o. On - failure, return -1. This is the equivalent of the Python - expression: hash(o). - - */ - - - /* Implemented elsewhere: - - int PyObject_IsTrue(PyObject *o); - - Returns 1 if the object, o, is considered to be true, 0 if o is - considered to be false and -1 on failure. This is equivalent to the - Python expression: not not o - - */ - - /* Implemented elsewhere: - - int PyObject_Not(PyObject *o); - - Returns 0 if the object, o, is considered to be true, 1 if o is - considered to be false and -1 on failure. This is equivalent to the - Python expression: not o - - */ - - PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o); - - /* - On success, returns a type object corresponding to the object - type of object o. On failure, returns NULL. This is - equivalent to the Python expression: type(o). - */ - - PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o); - - /* - Return the size of object o. If the object, o, provides - both sequence and mapping protocols, the sequence size is - returned. On error, -1 is returned. This is the equivalent - to the Python expression: len(o). - - */ - - /* For DLL compatibility */ -#undef PyObject_Length - PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o); -#define PyObject_Length PyObject_Size - - PyAPI_FUNC(Py_ssize_t) _PyObject_LengthHint(PyObject *o, Py_ssize_t); - - /* - Guess the size of object o using len(o) or o.__length_hint__(). - If neither of those return a non-negative value, then return the - default value. If one of the calls fails, this function returns -1. - */ - - PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key); - - /* - Return element of o corresponding to the object, key, or NULL - on failure. This is the equivalent of the Python expression: - o[key]. - - */ - - PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v); - - /* - Map the object, key, to the value, v. Returns - -1 on failure. This is the equivalent of the Python - statement: o[key]=v. - */ - - PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, char *key); - - /* - Remove the mapping for object, key, from the object *o. - Returns -1 on failure. This is equivalent to - the Python statement: del o[key]. - */ - - PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key); - - /* - Delete the mapping for key from *o. Returns -1 on failure. - This is the equivalent of the Python statement: del o[key]. - */ - - PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj, - const char **buffer, - Py_ssize_t *buffer_len); - - /* - Takes an arbitrary object which must support the (character, - single segment) buffer interface and returns a pointer to a - read-only memory location useable as character based input - for subsequent processing. - - 0 is returned on success. buffer and buffer_len are only - set in case no error occurs. Otherwise, -1 is returned and - an exception set. - - */ - - PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj); - - /* - Checks whether an arbitrary object supports the (character, - single segment) buffer interface. Returns 1 on success, 0 - on failure. - - */ - - PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj, - const void **buffer, - Py_ssize_t *buffer_len); - - /* - Same as PyObject_AsCharBuffer() except that this API expects - (readable, single segment) buffer interface and returns a - pointer to a read-only memory location which can contain - arbitrary data. - - 0 is returned on success. buffer and buffer_len are only - set in case no error occurs. Otherwise, -1 is returned and - an exception set. - - */ - - PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj, - void **buffer, - Py_ssize_t *buffer_len); - - /* - Takes an arbitrary object which must support the (writeable, - single segment) buffer interface and returns a pointer to a - writeable memory location in buffer of size buffer_len. - - 0 is returned on success. buffer and buffer_len are only - set in case no error occurs. Otherwise, -1 is returned and - an exception set. - - */ - - /* new buffer API */ - -#define PyObject_CheckBuffer(obj) \ - (((obj)->ob_type->tp_as_buffer != NULL) && \ - (PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_NEWBUFFER)) && \ - ((obj)->ob_type->tp_as_buffer->bf_getbuffer != NULL)) - - /* Return 1 if the getbuffer function is available, otherwise - return 0 */ - - PyAPI_FUNC(int) PyObject_GetBuffer(PyObject *obj, Py_buffer *view, - int flags); - - /* This is a C-API version of the getbuffer function call. It checks - to make sure object has the required function pointer and issues the - call. Returns -1 and raises an error on failure and returns 0 on - success - */ - - - PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices); - - /* Get the memory area pointed to by the indices for the buffer given. - Note that view->ndim is the assumed size of indices - */ - - PyAPI_FUNC(int) PyBuffer_SizeFromFormat(const char *); - - /* Return the implied itemsize of the data-format area from a - struct-style description */ - - - - PyAPI_FUNC(int) PyBuffer_ToContiguous(void *buf, Py_buffer *view, - Py_ssize_t len, char fort); - - PyAPI_FUNC(int) PyBuffer_FromContiguous(Py_buffer *view, void *buf, - Py_ssize_t len, char fort); - - - /* Copy len bytes of data from the contiguous chunk of memory - pointed to by buf into the buffer exported by obj. Return - 0 on success and return -1 and raise a PyBuffer_Error on - error (i.e. the object does not have a buffer interface or - it is not working). - - If fort is 'F' and the object is multi-dimensional, - then the data will be copied into the array in - Fortran-style (first dimension varies the fastest). If - fort is 'C', then the data will be copied into the array - in C-style (last dimension varies the fastest). If fort - is 'A', then it does not matter and the copy will be made - in whatever way is more efficient. - - */ - - PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src); - - /* Copy the data from the src buffer to the buffer of destination - */ - - PyAPI_FUNC(int) PyBuffer_IsContiguous(Py_buffer *view, char fort); - - - PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims, - Py_ssize_t *shape, - Py_ssize_t *strides, - int itemsize, - char fort); - - /* Fill the strides array with byte-strides of a contiguous - (Fortran-style if fort is 'F' or C-style otherwise) - array of the given shape with the given number of bytes - per element. - */ - - PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf, - Py_ssize_t len, int readonly, - int flags); - - /* Fills in a buffer-info structure correctly for an exporter - that can only share a contiguous chunk of memory of - "unsigned bytes" of the given length. Returns 0 on success - and -1 (with raising an error) on error. - */ - - PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view); - - /* Releases a Py_buffer obtained from getbuffer ParseTuple's s*. - */ - - PyAPI_FUNC(PyObject *) PyObject_Format(PyObject* obj, - PyObject *format_spec); - /* - Takes an arbitrary object and returns the result of - calling obj.__format__(format_spec). - */ - -/* Iterators */ - - PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *); - /* Takes an object and returns an iterator for it. - This is typically a new iterator but if the argument - is an iterator, this returns itself. */ - -#define PyIter_Check(obj) \ - (PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_ITER) && \ - (obj)->ob_type->tp_iternext != NULL && \ - (obj)->ob_type->tp_iternext != &_PyObject_NextNotImplemented) - - PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *); - /* Takes an iterator object and calls its tp_iternext slot, - returning the next value. If the iterator is exhausted, - this returns NULL without setting an exception. - NULL with an exception means an error occurred. */ - -/* Number Protocol:*/ - - PyAPI_FUNC(int) PyNumber_Check(PyObject *o); - - /* - Returns 1 if the object, o, provides numeric protocols, and - false otherwise. - - This function always succeeds. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2); - - /* - Returns the result of adding o1 and o2, or null on failure. - This is the equivalent of the Python expression: o1+o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2); - - /* - Returns the result of subtracting o2 from o1, or null on - failure. This is the equivalent of the Python expression: - o1-o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2); - - /* - Returns the result of multiplying o1 and o2, or null on - failure. This is the equivalent of the Python expression: - o1*o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Divide(PyObject *o1, PyObject *o2); - - /* - Returns the result of dividing o1 by o2, or null on failure. - This is the equivalent of the Python expression: o1/o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2); - - /* - Returns the result of dividing o1 by o2 giving an integral result, - or null on failure. - This is the equivalent of the Python expression: o1//o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2); - - /* - Returns the result of dividing o1 by o2 giving a float result, - or null on failure. - This is the equivalent of the Python expression: o1/o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2); - - /* - Returns the remainder of dividing o1 by o2, or null on - failure. This is the equivalent of the Python expression: - o1%o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2); - - /* - See the built-in function divmod. Returns NULL on failure. - This is the equivalent of the Python expression: - divmod(o1,o2). - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2, - PyObject *o3); - - /* - See the built-in function pow. Returns NULL on failure. - This is the equivalent of the Python expression: - pow(o1,o2,o3), where o3 is optional. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o); - - /* - Returns the negation of o on success, or null on failure. - This is the equivalent of the Python expression: -o. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o); - - /* - Returns the (what?) of o on success, or NULL on failure. - This is the equivalent of the Python expression: +o. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o); - - /* - Returns the absolute value of o, or null on failure. This is - the equivalent of the Python expression: abs(o). - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o); - - /* - Returns the bitwise negation of o on success, or NULL on - failure. This is the equivalent of the Python expression: - ~o. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2); - - /* - Returns the result of left shifting o1 by o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1 << o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2); - - /* - Returns the result of right shifting o1 by o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1 >> o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2); - - /* - Returns the result of bitwise and of o1 and o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1&o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2); - - /* - Returns the bitwise exclusive or of o1 by o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1^o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2); - - /* - Returns the result of bitwise or on o1 and o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1|o2. - - */ - - /* Implemented elsewhere: - - int PyNumber_Coerce(PyObject **p1, PyObject **p2); - - This function takes the addresses of two variables of type - PyObject*. - - If the objects pointed to by *p1 and *p2 have the same type, - increment their reference count and return 0 (success). - If the objects can be converted to a common numeric type, - replace *p1 and *p2 by their converted value (with 'new' - reference counts), and return 0. - If no conversion is possible, or if some other error occurs, - return -1 (failure) and don't increment the reference counts. - The call PyNumber_Coerce(&o1, &o2) is equivalent to the Python - statement o1, o2 = coerce(o1, o2). - - */ - -#define PyIndex_Check(obj) \ - ((obj)->ob_type->tp_as_number != NULL && \ - PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_INDEX) && \ - (obj)->ob_type->tp_as_number->nb_index != NULL) - - PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o); - - /* - Returns the object converted to a Python long or int - or NULL with an error raised on failure. - */ - - PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc); - - /* - Returns the Integral instance converted to an int. The - instance is expected to be int or long or have an __int__ - method. Steals integral's reference. error_format will be - used to create the TypeError if integral isn't actually an - Integral instance. error_format should be a format string - that can accept a char* naming integral's type. - */ - - PyAPI_FUNC(PyObject *) _PyNumber_ConvertIntegralToInt( - PyObject *integral, - const char* error_format); - - /* - Returns the object converted to Py_ssize_t by going through - PyNumber_Index first. If an overflow error occurs while - converting the int-or-long to Py_ssize_t, then the second argument - is the error-type to return. If it is NULL, then the overflow error - is cleared and the value is clipped. - */ - - PyAPI_FUNC(PyObject *) PyNumber_Int(PyObject *o); - - /* - Returns the o converted to an integer object on success, or - NULL on failure. This is the equivalent of the Python - expression: int(o). - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o); - - /* - Returns the o converted to a long integer object on success, - or NULL on failure. This is the equivalent of the Python - expression: long(o). - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o); - - /* - Returns the o converted to a float object on success, or NULL - on failure. This is the equivalent of the Python expression: - float(o). - */ - -/* In-place variants of (some of) the above number protocol functions */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2); - - /* - Returns the result of adding o2 to o1, possibly in-place, or null - on failure. This is the equivalent of the Python expression: - o1 += o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2); - - /* - Returns the result of subtracting o2 from o1, possibly in-place or - null on failure. This is the equivalent of the Python expression: - o1 -= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2); - - /* - Returns the result of multiplying o1 by o2, possibly in-place, or - null on failure. This is the equivalent of the Python expression: - o1 *= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceDivide(PyObject *o1, PyObject *o2); - - /* - Returns the result of dividing o1 by o2, possibly in-place, or null - on failure. This is the equivalent of the Python expression: - o1 /= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1, - PyObject *o2); - - /* - Returns the result of dividing o1 by o2 giving an integral result, - possibly in-place, or null on failure. - This is the equivalent of the Python expression: - o1 /= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1, - PyObject *o2); - - /* - Returns the result of dividing o1 by o2 giving a float result, - possibly in-place, or null on failure. - This is the equivalent of the Python expression: - o1 /= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2); - - /* - Returns the remainder of dividing o1 by o2, possibly in-place, or - null on failure. This is the equivalent of the Python expression: - o1 %= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2, - PyObject *o3); - - /* - Returns the result of raising o1 to the power of o2, possibly - in-place, or null on failure. This is the equivalent of the Python - expression: o1 **= o2, or pow(o1, o2, o3) if o3 is present. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2); - - /* - Returns the result of left shifting o1 by o2, possibly in-place, or - null on failure. This is the equivalent of the Python expression: - o1 <<= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2); - - /* - Returns the result of right shifting o1 by o2, possibly in-place or - null on failure. This is the equivalent of the Python expression: - o1 >>= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2); - - /* - Returns the result of bitwise and of o1 and o2, possibly in-place, - or null on failure. This is the equivalent of the Python - expression: o1 &= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2); - - /* - Returns the bitwise exclusive or of o1 by o2, possibly in-place, or - null on failure. This is the equivalent of the Python expression: - o1 ^= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2); - - /* - Returns the result of bitwise or of o1 and o2, possibly in-place, - or null on failure. This is the equivalent of the Python - expression: o1 |= o2. - - */ - - - PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base); - - /* - Returns the integer n converted to a string with a base, with a base - marker of 0b, 0o or 0x prefixed if applicable. - If n is not an int object, it is converted with PyNumber_Index first. - */ - - -/* Sequence protocol:*/ - - PyAPI_FUNC(int) PySequence_Check(PyObject *o); - - /* - Return 1 if the object provides sequence protocol, and zero - otherwise. - - This function always succeeds. - - */ - - PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o); - - /* - Return the size of sequence object o, or -1 on failure. - - */ - - /* For DLL compatibility */ -#undef PySequence_Length - PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o); -#define PySequence_Length PySequence_Size - - - PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2); - - /* - Return the concatenation of o1 and o2 on success, and NULL on - failure. This is the equivalent of the Python - expression: o1+o2. - - */ - - PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count); - - /* - Return the result of repeating sequence object o count times, - or NULL on failure. This is the equivalent of the Python - expression: o1*count. - - */ - - PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i); - - /* - Return the ith element of o, or NULL on failure. This is the - equivalent of the Python expression: o[i]. - */ - - PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2); - - /* - Return the slice of sequence object o between i1 and i2, or - NULL on failure. This is the equivalent of the Python - expression: o[i1:i2]. - - */ - - PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v); - - /* - Assign object v to the ith element of o. Returns - -1 on failure. This is the equivalent of the Python - statement: o[i]=v. - - */ - - PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i); - - /* - Delete the ith element of object v. Returns - -1 on failure. This is the equivalent of the Python - statement: del o[i]. - */ - - PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2, - PyObject *v); - - /* - Assign the sequence object, v, to the slice in sequence - object, o, from i1 to i2. Returns -1 on failure. This is the - equivalent of the Python statement: o[i1:i2]=v. - */ - - PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2); - - /* - Delete the slice in sequence object, o, from i1 to i2. - Returns -1 on failure. This is the equivalent of the Python - statement: del o[i1:i2]. - */ - - PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o); - - /* - Returns the sequence, o, as a tuple on success, and NULL on failure. - This is equivalent to the Python expression: tuple(o) - */ - - - PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o); - /* - Returns the sequence, o, as a list on success, and NULL on failure. - This is equivalent to the Python expression: list(o) - */ - - PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m); - /* - Returns the sequence, o, as a tuple, unless it's already a - tuple or list. Use PySequence_Fast_GET_ITEM to access the - members of this list, and PySequence_Fast_GET_SIZE to get its length. - - Returns NULL on failure. If the object does not support iteration, - raises a TypeError exception with m as the message text. - */ - -#define PySequence_Fast_GET_SIZE(o) \ - (PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o)) - /* - Return the size of o, assuming that o was returned by - PySequence_Fast and is not NULL. - */ - -#define PySequence_Fast_GET_ITEM(o, i)\ - (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i)) - /* - Return the ith element of o, assuming that o was returned by - PySequence_Fast, and that i is within bounds. - */ - -#define PySequence_ITEM(o, i)\ - ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) ) - /* Assume tp_as_sequence and sq_item exist and that i does not - need to be corrected for a negative index - */ - -#define PySequence_Fast_ITEMS(sf) \ - (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \ - : ((PyTupleObject *)(sf))->ob_item) - /* Return a pointer to the underlying item array for - an object retured by PySequence_Fast */ - - PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value); - - /* - Return the number of occurrences on value on o, that is, - return the number of keys for which o[key]==value. On - failure, return -1. This is equivalent to the Python - expression: o.count(value). - */ - - PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob); - /* - Return -1 if error; 1 if ob in seq; 0 if ob not in seq. - Use __contains__ if possible, else _PySequence_IterSearch(). - */ - -#define PY_ITERSEARCH_COUNT 1 -#define PY_ITERSEARCH_INDEX 2 -#define PY_ITERSEARCH_CONTAINS 3 - PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq, - PyObject *obj, int operation); - /* - Iterate over seq. Result depends on the operation: - PY_ITERSEARCH_COUNT: return # of times obj appears in seq; -1 if - error. - PY_ITERSEARCH_INDEX: return 0-based index of first occurrence of - obj in seq; set ValueError and return -1 if none found; - also return -1 on error. - PY_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on - error. - */ - -/* For DLL-level backwards compatibility */ -#undef PySequence_In - PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value); - -/* For source-level backwards compatibility */ -#define PySequence_In PySequence_Contains - - /* - Determine if o contains value. If an item in o is equal to - X, return 1, otherwise return 0. On error, return -1. This - is equivalent to the Python expression: value in o. - */ - - PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value); - - /* - Return the first index for which o[i]=value. On error, - return -1. This is equivalent to the Python - expression: o.index(value). - */ - -/* In-place versions of some of the above Sequence functions. */ - - PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2); - - /* - Append o2 to o1, in-place when possible. Return the resulting - object, which could be o1, or NULL on failure. This is the - equivalent of the Python expression: o1 += o2. - - */ - - PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count); - - /* - Repeat o1 by count, in-place when possible. Return the resulting - object, which could be o1, or NULL on failure. This is the - equivalent of the Python expression: o1 *= count. - - */ - -/* Mapping protocol:*/ - - PyAPI_FUNC(int) PyMapping_Check(PyObject *o); - - /* - Return 1 if the object provides mapping protocol, and zero - otherwise. - - This function always succeeds. - */ - - PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o); - - /* - Returns the number of keys in object o on success, and -1 on - failure. For objects that do not provide sequence protocol, - this is equivalent to the Python expression: len(o). - */ - - /* For DLL compatibility */ -#undef PyMapping_Length - PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o); -#define PyMapping_Length PyMapping_Size - - - /* implemented as a macro: - - int PyMapping_DelItemString(PyObject *o, char *key); - - Remove the mapping for object, key, from the object *o. - Returns -1 on failure. This is equivalent to - the Python statement: del o[key]. - */ -#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K)) - - /* implemented as a macro: - - int PyMapping_DelItem(PyObject *o, PyObject *key); - - Remove the mapping for object, key, from the object *o. - Returns -1 on failure. This is equivalent to - the Python statement: del o[key]. - */ -#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K)) - - PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, char *key); - - /* - On success, return 1 if the mapping object has the key, key, - and 0 otherwise. This is equivalent to the Python expression: - o.has_key(key). - - This function always succeeds. - */ - - PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key); - - /* - Return 1 if the mapping object has the key, key, - and 0 otherwise. This is equivalent to the Python expression: - o.has_key(key). - - This function always succeeds. - - */ - - /* Implemented as macro: - - PyObject *PyMapping_Keys(PyObject *o); - - On success, return a list of the keys in object o. On - failure, return NULL. This is equivalent to the Python - expression: o.keys(). - */ -#define PyMapping_Keys(O) PyObject_CallMethod(O,"keys",NULL) - - /* Implemented as macro: - - PyObject *PyMapping_Values(PyObject *o); - - On success, return a list of the values in object o. On - failure, return NULL. This is equivalent to the Python - expression: o.values(). - */ -#define PyMapping_Values(O) PyObject_CallMethod(O,"values",NULL) - - /* Implemented as macro: - - PyObject *PyMapping_Items(PyObject *o); - - On success, return a list of the items in object o, where - each item is a tuple containing a key-value pair. On - failure, return NULL. This is equivalent to the Python - expression: o.items(). - - */ -#define PyMapping_Items(O) PyObject_CallMethod(O,"items",NULL) - - PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o, char *key); - - /* - Return element of o corresponding to the object, key, or NULL - on failure. This is the equivalent of the Python expression: - o[key]. - */ - - PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, char *key, - PyObject *value); - - /* - Map the object, key, to the value, v. Returns - -1 on failure. This is the equivalent of the Python - statement: o[key]=v. - */ - - -PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass); - /* isinstance(object, typeorclass) */ - -PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass); - /* issubclass(object, typeorclass) */ - - -PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls); - -PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls); - - -/* For internal use by buffer API functions */ -PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index, - const Py_ssize_t *shape); -PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index, - const Py_ssize_t *shape); - - -#ifdef __cplusplus -} -#endif -#endif /* Py_ABSTRACTOBJECT_H */ diff --git a/python/include/asdl.h b/python/include/asdl.h deleted file mode 100644 index 84e837e7..00000000 --- a/python/include/asdl.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef Py_ASDL_H -#define Py_ASDL_H - -typedef PyObject * identifier; -typedef PyObject * string; -typedef PyObject * object; - -#ifndef __cplusplus -typedef enum {false, true} bool; -#endif - -/* It would be nice if the code generated by asdl_c.py was completely - independent of Python, but it is a goal the requires too much work - at this stage. So, for example, I'll represent identifiers as - interned Python strings. -*/ - -/* XXX A sequence should be typed so that its use can be typechecked. */ - -typedef struct { - int size; - void *elements[1]; -} asdl_seq; - -typedef struct { - int size; - int elements[1]; -} asdl_int_seq; - -asdl_seq *asdl_seq_new(int size, PyArena *arena); -asdl_int_seq *asdl_int_seq_new(int size, PyArena *arena); - -#define asdl_seq_GET(S, I) (S)->elements[(I)] -#define asdl_seq_LEN(S) ((S) == NULL ? 0 : (S)->size) -#ifdef Py_DEBUG -#define asdl_seq_SET(S, I, V) { \ - int _asdl_i = (I); \ - assert((S) && _asdl_i < (S)->size); \ - (S)->elements[_asdl_i] = (V); \ -} -#else -#define asdl_seq_SET(S, I, V) (S)->elements[I] = (V) -#endif - -#endif /* !Py_ASDL_H */ diff --git a/python/include/ast.h b/python/include/ast.h deleted file mode 100644 index cc14b7fd..00000000 --- a/python/include/ast.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef Py_AST_H -#define Py_AST_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(mod_ty) PyAST_FromNode(const node *, PyCompilerFlags *flags, - const char *, PyArena *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_AST_H */ diff --git a/python/include/bitset.h b/python/include/bitset.h deleted file mode 100644 index faeb4191..00000000 --- a/python/include/bitset.h +++ /dev/null @@ -1,32 +0,0 @@ - -#ifndef Py_BITSET_H -#define Py_BITSET_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Bitset interface */ - -#define BYTE char - -typedef BYTE *bitset; - -bitset newbitset(int nbits); -void delbitset(bitset bs); -#define testbit(ss, ibit) (((ss)[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0) -int addbit(bitset bs, int ibit); /* Returns 0 if already set */ -int samebitset(bitset bs1, bitset bs2, int nbits); -void mergebitset(bitset bs1, bitset bs2, int nbits); - -#define BITSPERBYTE (8*sizeof(BYTE)) -#define NBYTES(nbits) (((nbits) + BITSPERBYTE - 1) / BITSPERBYTE) - -#define BIT2BYTE(ibit) ((ibit) / BITSPERBYTE) -#define BIT2SHIFT(ibit) ((ibit) % BITSPERBYTE) -#define BIT2MASK(ibit) (1 << BIT2SHIFT(ibit)) -#define BYTE2BIT(ibyte) ((ibyte) * BITSPERBYTE) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_BITSET_H */ diff --git a/python/include/boolobject.h b/python/include/boolobject.h deleted file mode 100644 index 74e854f7..00000000 --- a/python/include/boolobject.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Boolean object interface */ - -#ifndef Py_BOOLOBJECT_H -#define Py_BOOLOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -typedef PyIntObject PyBoolObject; - -PyAPI_DATA(PyTypeObject) PyBool_Type; - -#define PyBool_Check(x) (Py_TYPE(x) == &PyBool_Type) - -/* Py_False and Py_True are the only two bools in existence. -Don't forget to apply Py_INCREF() when returning either!!! */ - -/* Don't use these directly */ -PyAPI_DATA(PyIntObject) _Py_ZeroStruct, _Py_TrueStruct; - -/* Use these macros */ -#define Py_False ((PyObject *) &_Py_ZeroStruct) -#define Py_True ((PyObject *) &_Py_TrueStruct) - -/* Macros for returning Py_True or Py_False, respectively */ -#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True -#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False - -/* Function to return a bool from a C long */ -PyAPI_FUNC(PyObject *) PyBool_FromLong(long); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_BOOLOBJECT_H */ diff --git a/python/include/bufferobject.h b/python/include/bufferobject.h deleted file mode 100644 index 6dd83458..00000000 --- a/python/include/bufferobject.h +++ /dev/null @@ -1,33 +0,0 @@ - -/* Buffer object interface */ - -/* Note: the object's structure is private */ - -#ifndef Py_BUFFEROBJECT_H -#define Py_BUFFEROBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -PyAPI_DATA(PyTypeObject) PyBuffer_Type; - -#define PyBuffer_Check(op) (Py_TYPE(op) == &PyBuffer_Type) - -#define Py_END_OF_BUFFER (-1) - -PyAPI_FUNC(PyObject *) PyBuffer_FromObject(PyObject *base, - Py_ssize_t offset, Py_ssize_t size); -PyAPI_FUNC(PyObject *) PyBuffer_FromReadWriteObject(PyObject *base, - Py_ssize_t offset, - Py_ssize_t size); - -PyAPI_FUNC(PyObject *) PyBuffer_FromMemory(void *ptr, Py_ssize_t size); -PyAPI_FUNC(PyObject *) PyBuffer_FromReadWriteMemory(void *ptr, Py_ssize_t size); - -PyAPI_FUNC(PyObject *) PyBuffer_New(Py_ssize_t size); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_BUFFEROBJECT_H */ diff --git a/python/include/bytearrayobject.h b/python/include/bytearrayobject.h deleted file mode 100644 index e1281a62..00000000 --- a/python/include/bytearrayobject.h +++ /dev/null @@ -1,57 +0,0 @@ -/* ByteArray object interface */ - -#ifndef Py_BYTEARRAYOBJECT_H -#define Py_BYTEARRAYOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/* Type PyByteArrayObject represents a mutable array of bytes. - * The Python API is that of a sequence; - * the bytes are mapped to ints in [0, 256). - * Bytes are not characters; they may be used to encode characters. - * The only way to go between bytes and str/unicode is via encoding - * and decoding. - * For the convenience of C programmers, the bytes type is considered - * to contain a char pointer, not an unsigned char pointer. - */ - -/* Object layout */ -typedef struct { - PyObject_VAR_HEAD - /* XXX(nnorwitz): should ob_exports be Py_ssize_t? */ - int ob_exports; /* how many buffer exports */ - Py_ssize_t ob_alloc; /* How many bytes allocated */ - char *ob_bytes; -} PyByteArrayObject; - -/* Type object */ -PyAPI_DATA(PyTypeObject) PyByteArray_Type; -PyAPI_DATA(PyTypeObject) PyByteArrayIter_Type; - -/* Type check macros */ -#define PyByteArray_Check(self) PyObject_TypeCheck(self, &PyByteArray_Type) -#define PyByteArray_CheckExact(self) (Py_TYPE(self) == &PyByteArray_Type) - -/* Direct API functions */ -PyAPI_FUNC(PyObject *) PyByteArray_FromObject(PyObject *); -PyAPI_FUNC(PyObject *) PyByteArray_Concat(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyByteArray_FromStringAndSize(const char *, Py_ssize_t); -PyAPI_FUNC(Py_ssize_t) PyByteArray_Size(PyObject *); -PyAPI_FUNC(char *) PyByteArray_AsString(PyObject *); -PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t); - -/* Macros, trading safety for speed */ -#define PyByteArray_AS_STRING(self) \ - (assert(PyByteArray_Check(self)), \ - Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_bytes : _PyByteArray_empty_string) -#define PyByteArray_GET_SIZE(self) (assert(PyByteArray_Check(self)),Py_SIZE(self)) - -PyAPI_DATA(char) _PyByteArray_empty_string[]; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_BYTEARRAYOBJECT_H */ diff --git a/python/include/bytes_methods.h b/python/include/bytes_methods.h deleted file mode 100644 index 41256662..00000000 --- a/python/include/bytes_methods.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef Py_BYTES_CTYPE_H -#define Py_BYTES_CTYPE_H - -/* - * The internal implementation behind PyString (bytes) and PyBytes (buffer) - * methods of the given names, they operate on ASCII byte strings. - */ -extern PyObject* _Py_bytes_isspace(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_isalpha(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_isalnum(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_isdigit(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_islower(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_isupper(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len); - -/* These store their len sized answer in the given preallocated *result arg. */ -extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len); -extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len); -extern void _Py_bytes_title(char *result, char *s, Py_ssize_t len); -extern void _Py_bytes_capitalize(char *result, char *s, Py_ssize_t len); -extern void _Py_bytes_swapcase(char *result, char *s, Py_ssize_t len); - -/* Shared __doc__ strings. */ -extern const char _Py_isspace__doc__[]; -extern const char _Py_isalpha__doc__[]; -extern const char _Py_isalnum__doc__[]; -extern const char _Py_isdigit__doc__[]; -extern const char _Py_islower__doc__[]; -extern const char _Py_isupper__doc__[]; -extern const char _Py_istitle__doc__[]; -extern const char _Py_lower__doc__[]; -extern const char _Py_upper__doc__[]; -extern const char _Py_title__doc__[]; -extern const char _Py_capitalize__doc__[]; -extern const char _Py_swapcase__doc__[]; - -/* These are left in for backward compatibility and will be removed - in 2.8/3.2 */ -#define ISLOWER(c) Py_ISLOWER(c) -#define ISUPPER(c) Py_ISUPPER(c) -#define ISALPHA(c) Py_ISALPHA(c) -#define ISDIGIT(c) Py_ISDIGIT(c) -#define ISXDIGIT(c) Py_ISXDIGIT(c) -#define ISALNUM(c) Py_ISALNUM(c) -#define ISSPACE(c) Py_ISSPACE(c) - -#undef islower -#define islower(c) undefined_islower(c) -#undef isupper -#define isupper(c) undefined_isupper(c) -#undef isalpha -#define isalpha(c) undefined_isalpha(c) -#undef isdigit -#define isdigit(c) undefined_isdigit(c) -#undef isxdigit -#define isxdigit(c) undefined_isxdigit(c) -#undef isalnum -#define isalnum(c) undefined_isalnum(c) -#undef isspace -#define isspace(c) undefined_isspace(c) - -/* These are left in for backward compatibility and will be removed - in 2.8/3.2 */ -#define TOLOWER(c) Py_TOLOWER(c) -#define TOUPPER(c) Py_TOUPPER(c) - -#undef tolower -#define tolower(c) undefined_tolower(c) -#undef toupper -#define toupper(c) undefined_toupper(c) - -/* this is needed because some docs are shared from the .o, not static */ -#define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str) - -#endif /* !Py_BYTES_CTYPE_H */ diff --git a/python/include/bytesobject.h b/python/include/bytesobject.h deleted file mode 100644 index 1083da9c..00000000 --- a/python/include/bytesobject.h +++ /dev/null @@ -1,27 +0,0 @@ -#define PyBytesObject PyStringObject -#define PyBytes_Type PyString_Type - -#define PyBytes_Check PyString_Check -#define PyBytes_CheckExact PyString_CheckExact -#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED -#define PyBytes_AS_STRING PyString_AS_STRING -#define PyBytes_GET_SIZE PyString_GET_SIZE -#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS - -#define PyBytes_FromStringAndSize PyString_FromStringAndSize -#define PyBytes_FromString PyString_FromString -#define PyBytes_FromFormatV PyString_FromFormatV -#define PyBytes_FromFormat PyString_FromFormat -#define PyBytes_Size PyString_Size -#define PyBytes_AsString PyString_AsString -#define PyBytes_Repr PyString_Repr -#define PyBytes_Concat PyString_Concat -#define PyBytes_ConcatAndDel PyString_ConcatAndDel -#define _PyBytes_Resize _PyString_Resize -#define _PyBytes_Eq _PyString_Eq -#define PyBytes_Format PyString_Format -#define _PyBytes_FormatLong _PyString_FormatLong -#define PyBytes_DecodeEscape PyString_DecodeEscape -#define _PyBytes_Join _PyString_Join -#define PyBytes_AsStringAndSize PyString_AsStringAndSize -#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping diff --git a/python/include/cStringIO.h b/python/include/cStringIO.h deleted file mode 100644 index 6ca44a83..00000000 --- a/python/include/cStringIO.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef Py_CSTRINGIO_H -#define Py_CSTRINGIO_H -#ifdef __cplusplus -extern "C" { -#endif -/* - - This header provides access to cStringIO objects from C. - Functions are provided for calling cStringIO objects and - macros are provided for testing whether you have cStringIO - objects. - - Before calling any of the functions or macros, you must initialize - the routines with: - - PycString_IMPORT - - This would typically be done in your init function. - -*/ - -#define PycStringIO_CAPSULE_NAME "cStringIO.cStringIO_CAPI" - -#define PycString_IMPORT \ - PycStringIO = ((struct PycStringIO_CAPI*)PyCapsule_Import(\ - PycStringIO_CAPSULE_NAME, 0)) - -/* Basic functions to manipulate cStringIO objects from C */ - -static struct PycStringIO_CAPI { - - /* Read a string from an input object. If the last argument - is -1, the remainder will be read. - */ - int(*cread)(PyObject *, char **, Py_ssize_t); - - /* Read a line from an input object. Returns the length of the read - line as an int and a pointer inside the object buffer as char** (so - the caller doesn't have to provide its own buffer as destination). - */ - int(*creadline)(PyObject *, char **); - - /* Write a string to an output object*/ - int(*cwrite)(PyObject *, const char *, Py_ssize_t); - - /* Get the output object as a Python string (returns new reference). */ - PyObject *(*cgetvalue)(PyObject *); - - /* Create a new output object */ - PyObject *(*NewOutput)(int); - - /* Create an input object from a Python string - (copies the Python string reference). - */ - PyObject *(*NewInput)(PyObject *); - - /* The Python types for cStringIO input and output objects. - Note that you can do input on an output object. - */ - PyTypeObject *InputType, *OutputType; - -} *PycStringIO; - -/* These can be used to test if you have one */ -#define PycStringIO_InputCheck(O) \ - (Py_TYPE(O)==PycStringIO->InputType) -#define PycStringIO_OutputCheck(O) \ - (Py_TYPE(O)==PycStringIO->OutputType) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CSTRINGIO_H */ diff --git a/python/include/cellobject.h b/python/include/cellobject.h deleted file mode 100644 index c927ee5d..00000000 --- a/python/include/cellobject.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Cell object interface */ - -#ifndef Py_CELLOBJECT_H -#define Py_CELLOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - PyObject *ob_ref; /* Content of the cell or NULL when empty */ -} PyCellObject; - -PyAPI_DATA(PyTypeObject) PyCell_Type; - -#define PyCell_Check(op) (Py_TYPE(op) == &PyCell_Type) - -PyAPI_FUNC(PyObject *) PyCell_New(PyObject *); -PyAPI_FUNC(PyObject *) PyCell_Get(PyObject *); -PyAPI_FUNC(int) PyCell_Set(PyObject *, PyObject *); - -#define PyCell_GET(op) (((PyCellObject *)(op))->ob_ref) -#define PyCell_SET(op, v) (((PyCellObject *)(op))->ob_ref = v) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_TUPLEOBJECT_H */ diff --git a/python/include/ceval.h b/python/include/ceval.h deleted file mode 100644 index 0e8bd2ab..00000000 --- a/python/include/ceval.h +++ /dev/null @@ -1,153 +0,0 @@ -#ifndef Py_CEVAL_H -#define Py_CEVAL_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Interface to random parts in ceval.c */ - -PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords( - PyObject *, PyObject *, PyObject *); - -/* Inline this */ -#define PyEval_CallObject(func,arg) \ - PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL) - -PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj, - const char *format, ...); -PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj, - const char *methodname, - const char *format, ...); - -PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *); -PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *); - -struct _frame; /* Avoid including frameobject.h */ - -PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void); -PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void); -PyAPI_FUNC(PyObject *) PyEval_GetLocals(void); -PyAPI_FUNC(struct _frame *) PyEval_GetFrame(void); -PyAPI_FUNC(int) PyEval_GetRestricted(void); - -/* Look at the current frame's (if any) code's co_flags, and turn on - the corresponding compiler flags in cf->cf_flags. Return 1 if any - flag was set, else return 0. */ -PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf); - -PyAPI_FUNC(int) Py_FlushLine(void); - -PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg); -PyAPI_FUNC(int) Py_MakePendingCalls(void); - -/* Protection against deeply nested recursive calls */ -PyAPI_FUNC(void) Py_SetRecursionLimit(int); -PyAPI_FUNC(int) Py_GetRecursionLimit(void); - -#define Py_EnterRecursiveCall(where) \ - (_Py_MakeRecCheck(PyThreadState_GET()->recursion_depth) && \ - _Py_CheckRecursiveCall(where)) -#define Py_LeaveRecursiveCall() \ - (--PyThreadState_GET()->recursion_depth) -PyAPI_FUNC(int) _Py_CheckRecursiveCall(char *where); -PyAPI_DATA(int) _Py_CheckRecursionLimit; -#ifdef USE_STACKCHECK -# define _Py_MakeRecCheck(x) (++(x) > --_Py_CheckRecursionLimit) -#else -# define _Py_MakeRecCheck(x) (++(x) > _Py_CheckRecursionLimit) -#endif - -PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *); -PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *); - -PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *); -PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *); -PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc); - -/* this used to be handled on a per-thread basis - now just two globals */ -PyAPI_DATA(volatile int) _Py_Ticker; -PyAPI_DATA(int) _Py_CheckInterval; - -/* Interface for threads. - - A module that plans to do a blocking system call (or something else - that lasts a long time and doesn't touch Python data) can allow other - threads to run as follows: - - ...preparations here... - Py_BEGIN_ALLOW_THREADS - ...blocking system call here... - Py_END_ALLOW_THREADS - ...interpret result here... - - The Py_BEGIN_ALLOW_THREADS/Py_END_ALLOW_THREADS pair expands to a - {}-surrounded block. - To leave the block in the middle (e.g., with return), you must insert - a line containing Py_BLOCK_THREADS before the return, e.g. - - if (...premature_exit...) { - Py_BLOCK_THREADS - PyErr_SetFromErrno(PyExc_IOError); - return NULL; - } - - An alternative is: - - Py_BLOCK_THREADS - if (...premature_exit...) { - PyErr_SetFromErrno(PyExc_IOError); - return NULL; - } - Py_UNBLOCK_THREADS - - For convenience, that the value of 'errno' is restored across - Py_END_ALLOW_THREADS and Py_BLOCK_THREADS. - - WARNING: NEVER NEST CALLS TO Py_BEGIN_ALLOW_THREADS AND - Py_END_ALLOW_THREADS!!! - - The function PyEval_InitThreads() should be called only from - initthread() in "threadmodule.c". - - Note that not yet all candidates have been converted to use this - mechanism! -*/ - -PyAPI_FUNC(PyThreadState *) PyEval_SaveThread(void); -PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *); - -#ifdef WITH_THREAD - -PyAPI_FUNC(int) PyEval_ThreadsInitialized(void); -PyAPI_FUNC(void) PyEval_InitThreads(void); -PyAPI_FUNC(void) PyEval_AcquireLock(void); -PyAPI_FUNC(void) PyEval_ReleaseLock(void); -PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate); -PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate); -PyAPI_FUNC(void) PyEval_ReInitThreads(void); - -#define Py_BEGIN_ALLOW_THREADS { \ - PyThreadState *_save; \ - _save = PyEval_SaveThread(); -#define Py_BLOCK_THREADS PyEval_RestoreThread(_save); -#define Py_UNBLOCK_THREADS _save = PyEval_SaveThread(); -#define Py_END_ALLOW_THREADS PyEval_RestoreThread(_save); \ - } - -#else /* !WITH_THREAD */ - -#define Py_BEGIN_ALLOW_THREADS { -#define Py_BLOCK_THREADS -#define Py_UNBLOCK_THREADS -#define Py_END_ALLOW_THREADS } - -#endif /* !WITH_THREAD */ - -PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *); - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CEVAL_H */ diff --git a/python/include/classobject.h b/python/include/classobject.h deleted file mode 100644 index bc03e0d0..00000000 --- a/python/include/classobject.h +++ /dev/null @@ -1,83 +0,0 @@ - -/* Class object interface */ - -/* Revealing some structures (not for general use) */ - -#ifndef Py_CLASSOBJECT_H -#define Py_CLASSOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - PyObject *cl_bases; /* A tuple of class objects */ - PyObject *cl_dict; /* A dictionary */ - PyObject *cl_name; /* A string */ - /* The following three are functions or NULL */ - PyObject *cl_getattr; - PyObject *cl_setattr; - PyObject *cl_delattr; - PyObject *cl_weakreflist; /* List of weak references */ -} PyClassObject; - -typedef struct { - PyObject_HEAD - PyClassObject *in_class; /* The class object */ - PyObject *in_dict; /* A dictionary */ - PyObject *in_weakreflist; /* List of weak references */ -} PyInstanceObject; - -typedef struct { - PyObject_HEAD - PyObject *im_func; /* The callable object implementing the method */ - PyObject *im_self; /* The instance it is bound to, or NULL */ - PyObject *im_class; /* The class that asked for the method */ - PyObject *im_weakreflist; /* List of weak references */ -} PyMethodObject; - -PyAPI_DATA(PyTypeObject) PyClass_Type, PyInstance_Type, PyMethod_Type; - -#define PyClass_Check(op) ((op)->ob_type == &PyClass_Type) -#define PyInstance_Check(op) ((op)->ob_type == &PyInstance_Type) -#define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type) - -PyAPI_FUNC(PyObject *) PyClass_New(PyObject *, PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyInstance_New(PyObject *, PyObject *, - PyObject *); -PyAPI_FUNC(PyObject *) PyInstance_NewRaw(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *, PyObject *); - -PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *); -PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *); -PyAPI_FUNC(PyObject *) PyMethod_Class(PyObject *); - -/* Look up attribute with name (a string) on instance object pinst, using - * only the instance and base class dicts. If a descriptor is found in - * a class dict, the descriptor is returned without calling it. - * Returns NULL if nothing found, else a borrowed reference to the - * value associated with name in the dict in which name was found. - * The point of this routine is that it never calls arbitrary Python - * code, so is always "safe": all it does is dict lookups. The function - * can't fail, never sets an exception, and NULL is not an error (it just - * means "not found"). - */ -PyAPI_FUNC(PyObject *) _PyInstance_Lookup(PyObject *pinst, PyObject *name); - -/* Macros for direct access to these values. Type checks are *not* - done, so use with care. */ -#define PyMethod_GET_FUNCTION(meth) \ - (((PyMethodObject *)meth) -> im_func) -#define PyMethod_GET_SELF(meth) \ - (((PyMethodObject *)meth) -> im_self) -#define PyMethod_GET_CLASS(meth) \ - (((PyMethodObject *)meth) -> im_class) - -PyAPI_FUNC(int) PyClass_IsSubclass(PyObject *, PyObject *); - -PyAPI_FUNC(int) PyMethod_ClearFreeList(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CLASSOBJECT_H */ diff --git a/python/include/cobject.h b/python/include/cobject.h deleted file mode 100644 index ad3cd9c9..00000000 --- a/python/include/cobject.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - CObjects are marked Pending Deprecation as of Python 2.7. - The full schedule for 2.x is as follows: - - CObjects are marked Pending Deprecation in Python 2.7. - - CObjects will be marked Deprecated in Python 2.8 - (if there is one). - - CObjects will be removed in Python 2.9 (if there is one). - - Additionally, for the Python 3.x series: - - CObjects were marked Deprecated in Python 3.1. - - CObjects will be removed in Python 3.2. - - You should switch all use of CObjects to capsules. Capsules - have a safer and more consistent API. For more information, - see Include/pycapsule.h, or read the "Capsules" topic in - the "Python/C API Reference Manual". - - Python 2.7 no longer uses CObjects itself; all objects which - were formerly CObjects are now capsules. Note that this change - does not by itself break binary compatibility with extensions - built for previous versions of Python--PyCObject_AsVoidPtr() - has been changed to also understand capsules. - -*/ - -/* original file header comment follows: */ - -/* C objects to be exported from one extension module to another. - - C objects are used for communication between extension modules. - They provide a way for an extension module to export a C interface - to other extension modules, so that extension modules can use the - Python import mechanism to link to one another. - -*/ - -#ifndef Py_COBJECT_H -#define Py_COBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyCObject_Type; - -#define PyCObject_Check(op) (Py_TYPE(op) == &PyCObject_Type) - -/* Create a PyCObject from a pointer to a C object and an optional - destructor function. If the second argument is non-null, then it - will be called with the first argument if and when the PyCObject is - destroyed. - -*/ -PyAPI_FUNC(PyObject *) PyCObject_FromVoidPtr( - void *cobj, void (*destruct)(void*)); - - -/* Create a PyCObject from a pointer to a C object, a description object, - and an optional destructor function. If the third argument is non-null, - then it will be called with the first and second arguments if and when - the PyCObject is destroyed. -*/ -PyAPI_FUNC(PyObject *) PyCObject_FromVoidPtrAndDesc( - void *cobj, void *desc, void (*destruct)(void*,void*)); - -/* Retrieve a pointer to a C object from a PyCObject. */ -PyAPI_FUNC(void *) PyCObject_AsVoidPtr(PyObject *); - -/* Retrieve a pointer to a description object from a PyCObject. */ -PyAPI_FUNC(void *) PyCObject_GetDesc(PyObject *); - -/* Import a pointer to a C object from a module using a PyCObject. */ -PyAPI_FUNC(void *) PyCObject_Import(char *module_name, char *cobject_name); - -/* Modify a C object. Fails (==0) if object has a destructor. */ -PyAPI_FUNC(int) PyCObject_SetVoidPtr(PyObject *self, void *cobj); - - -typedef struct { - PyObject_HEAD - void *cobject; - void *desc; - void (*destructor)(void *); -} PyCObject; - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_COBJECT_H */ diff --git a/python/include/code.h b/python/include/code.h deleted file mode 100644 index 38b29580..00000000 --- a/python/include/code.h +++ /dev/null @@ -1,107 +0,0 @@ -/* Definitions for bytecode */ - -#ifndef Py_CODE_H -#define Py_CODE_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Bytecode object */ -typedef struct { - PyObject_HEAD - int co_argcount; /* #arguments, except *args */ - int co_nlocals; /* #local variables */ - int co_stacksize; /* #entries needed for evaluation stack */ - int co_flags; /* CO_..., see below */ - PyObject *co_code; /* instruction opcodes */ - PyObject *co_consts; /* list (constants used) */ - PyObject *co_names; /* list of strings (names used) */ - PyObject *co_varnames; /* tuple of strings (local variable names) */ - PyObject *co_freevars; /* tuple of strings (free variable names) */ - PyObject *co_cellvars; /* tuple of strings (cell variable names) */ - /* The rest doesn't count for hash/cmp */ - PyObject *co_filename; /* string (where it was loaded from) */ - PyObject *co_name; /* string (name, for reference) */ - int co_firstlineno; /* first source line number */ - PyObject *co_lnotab; /* string (encoding addr<->lineno mapping) See - Objects/lnotab_notes.txt for details. */ - void *co_zombieframe; /* for optimization only (see frameobject.c) */ - PyObject *co_weakreflist; /* to support weakrefs to code objects */ -} PyCodeObject; - -/* Masks for co_flags above */ -#define CO_OPTIMIZED 0x0001 -#define CO_NEWLOCALS 0x0002 -#define CO_VARARGS 0x0004 -#define CO_VARKEYWORDS 0x0008 -#define CO_NESTED 0x0010 -#define CO_GENERATOR 0x0020 -/* The CO_NOFREE flag is set if there are no free or cell variables. - This information is redundant, but it allows a single flag test - to determine whether there is any extra work to be done when the - call frame it setup. -*/ -#define CO_NOFREE 0x0040 - -#if 0 -/* This is no longer used. Stopped defining in 2.5, do not re-use. */ -#define CO_GENERATOR_ALLOWED 0x1000 -#endif -#define CO_FUTURE_DIVISION 0x2000 -#define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */ -#define CO_FUTURE_WITH_STATEMENT 0x8000 -#define CO_FUTURE_PRINT_FUNCTION 0x10000 -#define CO_FUTURE_UNICODE_LITERALS 0x20000 - -/* This should be defined if a future statement modifies the syntax. - For example, when a keyword is added. -*/ -#if 1 -#define PY_PARSER_REQUIRES_FUTURE_KEYWORD -#endif - -#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */ - -PyAPI_DATA(PyTypeObject) PyCode_Type; - -#define PyCode_Check(op) (Py_TYPE(op) == &PyCode_Type) -#define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars)) - -/* Public interface */ -PyAPI_FUNC(PyCodeObject *) PyCode_New( - int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *, - PyObject *, PyObject *, PyObject *, PyObject *, int, PyObject *); - /* same as struct above */ - -/* Creates a new empty code object with the specified source location. */ -PyAPI_FUNC(PyCodeObject *) -PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno); - -/* Return the line number associated with the specified bytecode index - in this code object. If you just need the line number of a frame, - use PyFrame_GetLineNumber() instead. */ -PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int); - -/* for internal use only */ -#define _PyCode_GETCODEPTR(co, pp) \ - ((*Py_TYPE((co)->co_code)->tp_as_buffer->bf_getreadbuffer) \ - ((co)->co_code, 0, (void **)(pp))) - -typedef struct _addr_pair { - int ap_lower; - int ap_upper; -} PyAddrPair; - -/* Update *bounds to describe the first and one-past-the-last instructions in the - same line as lasti. Return the number of that line. -*/ -PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co, - int lasti, PyAddrPair *bounds); - -PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts, - PyObject *names, PyObject *lineno_obj); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CODE_H */ diff --git a/python/include/codecs.h b/python/include/codecs.h deleted file mode 100644 index c038c6a9..00000000 --- a/python/include/codecs.h +++ /dev/null @@ -1,167 +0,0 @@ -#ifndef Py_CODECREGISTRY_H -#define Py_CODECREGISTRY_H -#ifdef __cplusplus -extern "C" { -#endif - -/* ------------------------------------------------------------------------ - - Python Codec Registry and support functions - - -Written by Marc-Andre Lemburg (mal@lemburg.com). - -Copyright (c) Corporation for National Research Initiatives. - - ------------------------------------------------------------------------ */ - -/* Register a new codec search function. - - As side effect, this tries to load the encodings package, if not - yet done, to make sure that it is always first in the list of - search functions. - - The search_function's refcount is incremented by this function. */ - -PyAPI_FUNC(int) PyCodec_Register( - PyObject *search_function - ); - -/* Codec register lookup API. - - Looks up the given encoding and returns a CodecInfo object with - function attributes which implement the different aspects of - processing the encoding. - - The encoding string is looked up converted to all lower-case - characters. This makes encodings looked up through this mechanism - effectively case-insensitive. - - If no codec is found, a KeyError is set and NULL returned. - - As side effect, this tries to load the encodings package, if not - yet done. This is part of the lazy load strategy for the encodings - package. - - */ - -PyAPI_FUNC(PyObject *) _PyCodec_Lookup( - const char *encoding - ); - -/* Generic codec based encoding API. - - object is passed through the encoder function found for the given - encoding using the error handling method defined by errors. errors - may be NULL to use the default method defined for the codec. - - Raises a LookupError in case no encoder can be found. - - */ - -PyAPI_FUNC(PyObject *) PyCodec_Encode( - PyObject *object, - const char *encoding, - const char *errors - ); - -/* Generic codec based decoding API. - - object is passed through the decoder function found for the given - encoding using the error handling method defined by errors. errors - may be NULL to use the default method defined for the codec. - - Raises a LookupError in case no encoder can be found. - - */ - -PyAPI_FUNC(PyObject *) PyCodec_Decode( - PyObject *object, - const char *encoding, - const char *errors - ); - -/* --- Codec Lookup APIs -------------------------------------------------- - - All APIs return a codec object with incremented refcount and are - based on _PyCodec_Lookup(). The same comments w/r to the encoding - name also apply to these APIs. - -*/ - -/* Get an encoder function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_Encoder( - const char *encoding - ); - -/* Get a decoder function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_Decoder( - const char *encoding - ); - -/* Get a IncrementalEncoder object for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_IncrementalEncoder( - const char *encoding, - const char *errors - ); - -/* Get a IncrementalDecoder object function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_IncrementalDecoder( - const char *encoding, - const char *errors - ); - -/* Get a StreamReader factory function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_StreamReader( - const char *encoding, - PyObject *stream, - const char *errors - ); - -/* Get a StreamWriter factory function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_StreamWriter( - const char *encoding, - PyObject *stream, - const char *errors - ); - -/* Unicode encoding error handling callback registry API */ - -/* Register the error handling callback function error under the given - name. This function will be called by the codec when it encounters - unencodable characters/undecodable bytes and doesn't know the - callback name, when name is specified as the error parameter - in the call to the encode/decode function. - Return 0 on success, -1 on error */ -PyAPI_FUNC(int) PyCodec_RegisterError(const char *name, PyObject *error); - -/* Lookup the error handling callback function registered under the given - name. As a special case NULL can be passed, in which case - the error handling callback for "strict" will be returned. */ -PyAPI_FUNC(PyObject *) PyCodec_LookupError(const char *name); - -/* raise exc as an exception */ -PyAPI_FUNC(PyObject *) PyCodec_StrictErrors(PyObject *exc); - -/* ignore the unicode error, skipping the faulty input */ -PyAPI_FUNC(PyObject *) PyCodec_IgnoreErrors(PyObject *exc); - -/* replace the unicode encode error with ? or U+FFFD */ -PyAPI_FUNC(PyObject *) PyCodec_ReplaceErrors(PyObject *exc); - -/* replace the unicode encode error with XML character references */ -PyAPI_FUNC(PyObject *) PyCodec_XMLCharRefReplaceErrors(PyObject *exc); - -/* replace the unicode encode error with backslash escapes (\x, \u and \U) */ -PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CODECREGISTRY_H */ diff --git a/python/include/compile.h b/python/include/compile.h deleted file mode 100644 index 61001016..00000000 --- a/python/include/compile.h +++ /dev/null @@ -1,40 +0,0 @@ - -#ifndef Py_COMPILE_H -#define Py_COMPILE_H - -#include "code.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* Public interface */ -struct _node; /* Declare the existence of this type */ -PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *); - -/* Future feature support */ - -typedef struct { - int ff_features; /* flags set by future statements */ - int ff_lineno; /* line number of last future statement */ -} PyFutureFeatures; - -#define FUTURE_NESTED_SCOPES "nested_scopes" -#define FUTURE_GENERATORS "generators" -#define FUTURE_DIVISION "division" -#define FUTURE_ABSOLUTE_IMPORT "absolute_import" -#define FUTURE_WITH_STATEMENT "with_statement" -#define FUTURE_PRINT_FUNCTION "print_function" -#define FUTURE_UNICODE_LITERALS "unicode_literals" - - -struct _mod; /* Declare the existence of this type */ -PyAPI_FUNC(PyCodeObject *) PyAST_Compile(struct _mod *, const char *, - PyCompilerFlags *, PyArena *); -PyAPI_FUNC(PyFutureFeatures *) PyFuture_FromAST(struct _mod *, const char *); - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_COMPILE_H */ diff --git a/python/include/complexobject.h b/python/include/complexobject.h deleted file mode 100644 index c9a9500f..00000000 --- a/python/include/complexobject.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Complex number structure */ - -#ifndef Py_COMPLEXOBJECT_H -#define Py_COMPLEXOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - double real; - double imag; -} Py_complex; - -/* Operations on complex numbers from complexmodule.c */ - -#define c_sum _Py_c_sum -#define c_diff _Py_c_diff -#define c_neg _Py_c_neg -#define c_prod _Py_c_prod -#define c_quot _Py_c_quot -#define c_pow _Py_c_pow -#define c_abs _Py_c_abs - -PyAPI_FUNC(Py_complex) c_sum(Py_complex, Py_complex); -PyAPI_FUNC(Py_complex) c_diff(Py_complex, Py_complex); -PyAPI_FUNC(Py_complex) c_neg(Py_complex); -PyAPI_FUNC(Py_complex) c_prod(Py_complex, Py_complex); -PyAPI_FUNC(Py_complex) c_quot(Py_complex, Py_complex); -PyAPI_FUNC(Py_complex) c_pow(Py_complex, Py_complex); -PyAPI_FUNC(double) c_abs(Py_complex); - - -/* Complex object interface */ - -/* -PyComplexObject represents a complex number with double-precision -real and imaginary parts. -*/ - -typedef struct { - PyObject_HEAD - Py_complex cval; -} PyComplexObject; - -PyAPI_DATA(PyTypeObject) PyComplex_Type; - -#define PyComplex_Check(op) PyObject_TypeCheck(op, &PyComplex_Type) -#define PyComplex_CheckExact(op) (Py_TYPE(op) == &PyComplex_Type) - -PyAPI_FUNC(PyObject *) PyComplex_FromCComplex(Py_complex); -PyAPI_FUNC(PyObject *) PyComplex_FromDoubles(double real, double imag); - -PyAPI_FUNC(double) PyComplex_RealAsDouble(PyObject *op); -PyAPI_FUNC(double) PyComplex_ImagAsDouble(PyObject *op); -PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyComplex_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_COMPLEXOBJECT_H */ diff --git a/python/include/datetime.h b/python/include/datetime.h deleted file mode 100644 index 47abe5cb..00000000 --- a/python/include/datetime.h +++ /dev/null @@ -1,239 +0,0 @@ -/* datetime.h - */ - -#ifndef DATETIME_H -#define DATETIME_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Fields are packed into successive bytes, each viewed as unsigned and - * big-endian, unless otherwise noted: - * - * byte offset - * 0 year 2 bytes, 1-9999 - * 2 month 1 byte, 1-12 - * 3 day 1 byte, 1-31 - * 4 hour 1 byte, 0-23 - * 5 minute 1 byte, 0-59 - * 6 second 1 byte, 0-59 - * 7 usecond 3 bytes, 0-999999 - * 10 - */ - -/* # of bytes for year, month, and day. */ -#define _PyDateTime_DATE_DATASIZE 4 - -/* # of bytes for hour, minute, second, and usecond. */ -#define _PyDateTime_TIME_DATASIZE 6 - -/* # of bytes for year, month, day, hour, minute, second, and usecond. */ -#define _PyDateTime_DATETIME_DATASIZE 10 - - -typedef struct -{ - PyObject_HEAD - long hashcode; /* -1 when unknown */ - int days; /* -MAX_DELTA_DAYS <= days <= MAX_DELTA_DAYS */ - int seconds; /* 0 <= seconds < 24*3600 is invariant */ - int microseconds; /* 0 <= microseconds < 1000000 is invariant */ -} PyDateTime_Delta; - -typedef struct -{ - PyObject_HEAD /* a pure abstract base clase */ -} PyDateTime_TZInfo; - - -/* The datetime and time types have hashcodes, and an optional tzinfo member, - * present if and only if hastzinfo is true. - */ -#define _PyTZINFO_HEAD \ - PyObject_HEAD \ - long hashcode; \ - char hastzinfo; /* boolean flag */ - -/* No _PyDateTime_BaseTZInfo is allocated; it's just to have something - * convenient to cast to, when getting at the hastzinfo member of objects - * starting with _PyTZINFO_HEAD. - */ -typedef struct -{ - _PyTZINFO_HEAD -} _PyDateTime_BaseTZInfo; - -/* All time objects are of PyDateTime_TimeType, but that can be allocated - * in two ways, with or without a tzinfo member. Without is the same as - * tzinfo == None, but consumes less memory. _PyDateTime_BaseTime is an - * internal struct used to allocate the right amount of space for the - * "without" case. - */ -#define _PyDateTime_TIMEHEAD \ - _PyTZINFO_HEAD \ - unsigned char data[_PyDateTime_TIME_DATASIZE]; - -typedef struct -{ - _PyDateTime_TIMEHEAD -} _PyDateTime_BaseTime; /* hastzinfo false */ - -typedef struct -{ - _PyDateTime_TIMEHEAD - PyObject *tzinfo; -} PyDateTime_Time; /* hastzinfo true */ - - -/* All datetime objects are of PyDateTime_DateTimeType, but that can be - * allocated in two ways too, just like for time objects above. In addition, - * the plain date type is a base class for datetime, so it must also have - * a hastzinfo member (although it's unused there). - */ -typedef struct -{ - _PyTZINFO_HEAD - unsigned char data[_PyDateTime_DATE_DATASIZE]; -} PyDateTime_Date; - -#define _PyDateTime_DATETIMEHEAD \ - _PyTZINFO_HEAD \ - unsigned char data[_PyDateTime_DATETIME_DATASIZE]; - -typedef struct -{ - _PyDateTime_DATETIMEHEAD -} _PyDateTime_BaseDateTime; /* hastzinfo false */ - -typedef struct -{ - _PyDateTime_DATETIMEHEAD - PyObject *tzinfo; -} PyDateTime_DateTime; /* hastzinfo true */ - - -/* Apply for date and datetime instances. */ -#define PyDateTime_GET_YEAR(o) ((((PyDateTime_Date*)o)->data[0] << 8) | \ - ((PyDateTime_Date*)o)->data[1]) -#define PyDateTime_GET_MONTH(o) (((PyDateTime_Date*)o)->data[2]) -#define PyDateTime_GET_DAY(o) (((PyDateTime_Date*)o)->data[3]) - -#define PyDateTime_DATE_GET_HOUR(o) (((PyDateTime_DateTime*)o)->data[4]) -#define PyDateTime_DATE_GET_MINUTE(o) (((PyDateTime_DateTime*)o)->data[5]) -#define PyDateTime_DATE_GET_SECOND(o) (((PyDateTime_DateTime*)o)->data[6]) -#define PyDateTime_DATE_GET_MICROSECOND(o) \ - ((((PyDateTime_DateTime*)o)->data[7] << 16) | \ - (((PyDateTime_DateTime*)o)->data[8] << 8) | \ - ((PyDateTime_DateTime*)o)->data[9]) - -/* Apply for time instances. */ -#define PyDateTime_TIME_GET_HOUR(o) (((PyDateTime_Time*)o)->data[0]) -#define PyDateTime_TIME_GET_MINUTE(o) (((PyDateTime_Time*)o)->data[1]) -#define PyDateTime_TIME_GET_SECOND(o) (((PyDateTime_Time*)o)->data[2]) -#define PyDateTime_TIME_GET_MICROSECOND(o) \ - ((((PyDateTime_Time*)o)->data[3] << 16) | \ - (((PyDateTime_Time*)o)->data[4] << 8) | \ - ((PyDateTime_Time*)o)->data[5]) - - -/* Define structure for C API. */ -typedef struct { - /* type objects */ - PyTypeObject *DateType; - PyTypeObject *DateTimeType; - PyTypeObject *TimeType; - PyTypeObject *DeltaType; - PyTypeObject *TZInfoType; - - /* constructors */ - PyObject *(*Date_FromDate)(int, int, int, PyTypeObject*); - PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int, - PyObject*, PyTypeObject*); - PyObject *(*Time_FromTime)(int, int, int, int, PyObject*, PyTypeObject*); - PyObject *(*Delta_FromDelta)(int, int, int, int, PyTypeObject*); - - /* constructors for the DB API */ - PyObject *(*DateTime_FromTimestamp)(PyObject*, PyObject*, PyObject*); - PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*); - -} PyDateTime_CAPI; - -#define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI" - - -/* "magic" constant used to partially protect against developer mistakes. */ -#define DATETIME_API_MAGIC 0x414548d5 - -#ifdef Py_BUILD_CORE - -/* Macros for type checking when building the Python core. */ -#define PyDate_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateType) -#define PyDate_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateType) - -#define PyDateTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateTimeType) -#define PyDateTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateTimeType) - -#define PyTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeType) -#define PyTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TimeType) - -#define PyDelta_Check(op) PyObject_TypeCheck(op, &PyDateTime_DeltaType) -#define PyDelta_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DeltaType) - -#define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType) -#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TZInfoType) - -#else - -/* Define global variable for the C API and a macro for setting it. */ -static PyDateTime_CAPI *PyDateTimeAPI = NULL; - -#define PyDateTime_IMPORT \ - PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0) - -/* Macros for type checking when not building the Python core. */ -#define PyDate_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateType) -#define PyDate_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateType) - -#define PyDateTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateTimeType) -#define PyDateTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateTimeType) - -#define PyTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TimeType) -#define PyTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TimeType) - -#define PyDelta_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DeltaType) -#define PyDelta_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DeltaType) - -#define PyTZInfo_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TZInfoType) -#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TZInfoType) - -/* Macros for accessing constructors in a simplified fashion. */ -#define PyDate_FromDate(year, month, day) \ - PyDateTimeAPI->Date_FromDate(year, month, day, PyDateTimeAPI->DateType) - -#define PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, usec) \ - PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, \ - min, sec, usec, Py_None, PyDateTimeAPI->DateTimeType) - -#define PyTime_FromTime(hour, minute, second, usecond) \ - PyDateTimeAPI->Time_FromTime(hour, minute, second, usecond, \ - Py_None, PyDateTimeAPI->TimeType) - -#define PyDelta_FromDSU(days, seconds, useconds) \ - PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \ - PyDateTimeAPI->DeltaType) - -/* Macros supporting the DB API. */ -#define PyDateTime_FromTimestamp(args) \ - PyDateTimeAPI->DateTime_FromTimestamp( \ - (PyObject*) (PyDateTimeAPI->DateTimeType), args, NULL) - -#define PyDate_FromTimestamp(args) \ - PyDateTimeAPI->Date_FromTimestamp( \ - (PyObject*) (PyDateTimeAPI->DateType), args) - -#endif /* Py_BUILD_CORE */ - -#ifdef __cplusplus -} -#endif -#endif diff --git a/python/include/descrobject.h b/python/include/descrobject.h deleted file mode 100644 index b542732b..00000000 --- a/python/include/descrobject.h +++ /dev/null @@ -1,94 +0,0 @@ -/* Descriptors */ -#ifndef Py_DESCROBJECT_H -#define Py_DESCROBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef PyObject *(*getter)(PyObject *, void *); -typedef int (*setter)(PyObject *, PyObject *, void *); - -typedef struct PyGetSetDef { - char *name; - getter get; - setter set; - char *doc; - void *closure; -} PyGetSetDef; - -typedef PyObject *(*wrapperfunc)(PyObject *self, PyObject *args, - void *wrapped); - -typedef PyObject *(*wrapperfunc_kwds)(PyObject *self, PyObject *args, - void *wrapped, PyObject *kwds); - -struct wrapperbase { - char *name; - int offset; - void *function; - wrapperfunc wrapper; - char *doc; - int flags; - PyObject *name_strobj; -}; - -/* Flags for above struct */ -#define PyWrapperFlag_KEYWORDS 1 /* wrapper function takes keyword args */ - -/* Various kinds of descriptor objects */ - -#define PyDescr_COMMON \ - PyObject_HEAD \ - PyTypeObject *d_type; \ - PyObject *d_name - -typedef struct { - PyDescr_COMMON; -} PyDescrObject; - -typedef struct { - PyDescr_COMMON; - PyMethodDef *d_method; -} PyMethodDescrObject; - -typedef struct { - PyDescr_COMMON; - struct PyMemberDef *d_member; -} PyMemberDescrObject; - -typedef struct { - PyDescr_COMMON; - PyGetSetDef *d_getset; -} PyGetSetDescrObject; - -typedef struct { - PyDescr_COMMON; - struct wrapperbase *d_base; - void *d_wrapped; /* This can be any function pointer */ -} PyWrapperDescrObject; - -PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type; -PyAPI_DATA(PyTypeObject) PyDictProxy_Type; -PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type; -PyAPI_DATA(PyTypeObject) PyMemberDescr_Type; - -PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *); -PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *); -PyAPI_FUNC(PyObject *) PyDescr_NewMember(PyTypeObject *, - struct PyMemberDef *); -PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *, - struct PyGetSetDef *); -PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *, - struct wrapperbase *, void *); -#define PyDescr_IsData(d) (Py_TYPE(d)->tp_descr_set != NULL) - -PyAPI_FUNC(PyObject *) PyDictProxy_New(PyObject *); -PyAPI_FUNC(PyObject *) PyWrapper_New(PyObject *, PyObject *); - - -PyAPI_DATA(PyTypeObject) PyProperty_Type; -#ifdef __cplusplus -} -#endif -#endif /* !Py_DESCROBJECT_H */ - diff --git a/python/include/dictobject.h b/python/include/dictobject.h deleted file mode 100644 index ece01c64..00000000 --- a/python/include/dictobject.h +++ /dev/null @@ -1,156 +0,0 @@ -#ifndef Py_DICTOBJECT_H -#define Py_DICTOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Dictionary object type -- mapping from hashable object to object */ - -/* The distribution includes a separate file, Objects/dictnotes.txt, - describing explorations into dictionary design and optimization. - It covers typical dictionary use patterns, the parameters for - tuning dictionaries, and several ideas for possible optimizations. -*/ - -/* -There are three kinds of slots in the table: - -1. Unused. me_key == me_value == NULL - Does not hold an active (key, value) pair now and never did. Unused can - transition to Active upon key insertion. This is the only case in which - me_key is NULL, and is each slot's initial state. - -2. Active. me_key != NULL and me_key != dummy and me_value != NULL - Holds an active (key, value) pair. Active can transition to Dummy upon - key deletion. This is the only case in which me_value != NULL. - -3. Dummy. me_key == dummy and me_value == NULL - Previously held an active (key, value) pair, but that was deleted and an - active pair has not yet overwritten the slot. Dummy can transition to - Active upon key insertion. Dummy slots cannot be made Unused again - (cannot have me_key set to NULL), else the probe sequence in case of - collision would have no way to know they were once active. - -Note: .popitem() abuses the me_hash field of an Unused or Dummy slot to -hold a search finger. The me_hash field of Unused or Dummy slots has no -meaning otherwise. -*/ - -/* PyDict_MINSIZE is the minimum size of a dictionary. This many slots are - * allocated directly in the dict object (in the ma_smalltable member). - * It must be a power of 2, and at least 4. 8 allows dicts with no more - * than 5 active entries to live in ma_smalltable (and so avoid an - * additional malloc); instrumentation suggested this suffices for the - * majority of dicts (consisting mostly of usually-small instance dicts and - * usually-small dicts created to pass keyword arguments). - */ -#define PyDict_MINSIZE 8 - -typedef struct { - /* Cached hash code of me_key. Note that hash codes are C longs. - * We have to use Py_ssize_t instead because dict_popitem() abuses - * me_hash to hold a search finger. - */ - Py_ssize_t me_hash; - PyObject *me_key; - PyObject *me_value; -} PyDictEntry; - -/* -To ensure the lookup algorithm terminates, there must be at least one Unused -slot (NULL key) in the table. -The value ma_fill is the number of non-NULL keys (sum of Active and Dummy); -ma_used is the number of non-NULL, non-dummy keys (== the number of non-NULL -values == the number of Active items). -To avoid slowing down lookups on a near-full table, we resize the table when -it's two-thirds full. -*/ -typedef struct _dictobject PyDictObject; -struct _dictobject { - PyObject_HEAD - Py_ssize_t ma_fill; /* # Active + # Dummy */ - Py_ssize_t ma_used; /* # Active */ - - /* The table contains ma_mask + 1 slots, and that's a power of 2. - * We store the mask instead of the size because the mask is more - * frequently needed. - */ - Py_ssize_t ma_mask; - - /* ma_table points to ma_smalltable for small tables, else to - * additional malloc'ed memory. ma_table is never NULL! This rule - * saves repeated runtime null-tests in the workhorse getitem and - * setitem calls. - */ - PyDictEntry *ma_table; - PyDictEntry *(*ma_lookup)(PyDictObject *mp, PyObject *key, long hash); - PyDictEntry ma_smalltable[PyDict_MINSIZE]; -}; - -PyAPI_DATA(PyTypeObject) PyDict_Type; -PyAPI_DATA(PyTypeObject) PyDictIterKey_Type; -PyAPI_DATA(PyTypeObject) PyDictIterValue_Type; -PyAPI_DATA(PyTypeObject) PyDictIterItem_Type; -PyAPI_DATA(PyTypeObject) PyDictKeys_Type; -PyAPI_DATA(PyTypeObject) PyDictItems_Type; -PyAPI_DATA(PyTypeObject) PyDictValues_Type; - -#define PyDict_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_DICT_SUBCLASS) -#define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type) -#define PyDictKeys_Check(op) (Py_TYPE(op) == &PyDictKeys_Type) -#define PyDictItems_Check(op) (Py_TYPE(op) == &PyDictItems_Type) -#define PyDictValues_Check(op) (Py_TYPE(op) == &PyDictValues_Type) -/* This excludes Values, since they are not sets. */ -# define PyDictViewSet_Check(op) \ - (PyDictKeys_Check(op) || PyDictItems_Check(op)) - -PyAPI_FUNC(PyObject *) PyDict_New(void); -PyAPI_FUNC(PyObject *) PyDict_GetItem(PyObject *mp, PyObject *key); -PyAPI_FUNC(int) PyDict_SetItem(PyObject *mp, PyObject *key, PyObject *item); -PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key); -PyAPI_FUNC(void) PyDict_Clear(PyObject *mp); -PyAPI_FUNC(int) PyDict_Next( - PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value); -PyAPI_FUNC(int) _PyDict_Next( - PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, long *hash); -PyAPI_FUNC(PyObject *) PyDict_Keys(PyObject *mp); -PyAPI_FUNC(PyObject *) PyDict_Values(PyObject *mp); -PyAPI_FUNC(PyObject *) PyDict_Items(PyObject *mp); -PyAPI_FUNC(Py_ssize_t) PyDict_Size(PyObject *mp); -PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp); -PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key); -PyAPI_FUNC(int) _PyDict_Contains(PyObject *mp, PyObject *key, long hash); -PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused); -PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp); - -/* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */ -PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other); - -/* PyDict_Merge updates/merges from a mapping object (an object that - supports PyMapping_Keys() and PyObject_GetItem()). If override is true, - the last occurrence of a key wins, else the first. The Python - dict.update(other) is equivalent to PyDict_Merge(dict, other, 1). -*/ -PyAPI_FUNC(int) PyDict_Merge(PyObject *mp, - PyObject *other, - int override); - -/* PyDict_MergeFromSeq2 updates/merges from an iterable object producing - iterable objects of length 2. If override is true, the last occurrence - of a key wins, else the first. The Python dict constructor dict(seq2) - is equivalent to dict={}; PyDict_MergeFromSeq(dict, seq2, 1). -*/ -PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d, - PyObject *seq2, - int override); - -PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key); -PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item); -PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_DICTOBJECT_H */ diff --git a/python/include/dtoa.h b/python/include/dtoa.h deleted file mode 100644 index 9b434b77..00000000 --- a/python/include/dtoa.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef PY_NO_SHORT_FLOAT_REPR -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(double) _Py_dg_strtod(const char *str, char **ptr); -PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits, - int *decpt, int *sign, char **rve); -PyAPI_FUNC(void) _Py_dg_freedtoa(char *s); - - -#ifdef __cplusplus -} -#endif -#endif diff --git a/python/include/enumobject.h b/python/include/enumobject.h deleted file mode 100644 index c14dbfc8..00000000 --- a/python/include/enumobject.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef Py_ENUMOBJECT_H -#define Py_ENUMOBJECT_H - -/* Enumerate Object */ - -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyEnum_Type; -PyAPI_DATA(PyTypeObject) PyReversed_Type; - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_ENUMOBJECT_H */ diff --git a/python/include/errcode.h b/python/include/errcode.h deleted file mode 100644 index becec80c..00000000 --- a/python/include/errcode.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef Py_ERRCODE_H -#define Py_ERRCODE_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Error codes passed around between file input, tokenizer, parser and - interpreter. This is necessary so we can turn them into Python - exceptions at a higher level. Note that some errors have a - slightly different meaning when passed from the tokenizer to the - parser than when passed from the parser to the interpreter; e.g. - the parser only returns E_EOF when it hits EOF immediately, and it - never returns E_OK. */ - -#define E_OK 10 /* No error */ -#define E_EOF 11 /* End Of File */ -#define E_INTR 12 /* Interrupted */ -#define E_TOKEN 13 /* Bad token */ -#define E_SYNTAX 14 /* Syntax error */ -#define E_NOMEM 15 /* Ran out of memory */ -#define E_DONE 16 /* Parsing complete */ -#define E_ERROR 17 /* Execution error */ -#define E_TABSPACE 18 /* Inconsistent mixing of tabs and spaces */ -#define E_OVERFLOW 19 /* Node had too many children */ -#define E_TOODEEP 20 /* Too many indentation levels */ -#define E_DEDENT 21 /* No matching outer block for dedent */ -#define E_DECODE 22 /* Error in decoding into Unicode */ -#define E_EOFS 23 /* EOF in triple-quoted string */ -#define E_EOLS 24 /* EOL in single-quoted string */ -#define E_LINECONT 25 /* Unexpected characters after a line continuation */ - -#ifdef __cplusplus -} -#endif -#endif /* !Py_ERRCODE_H */ diff --git a/python/include/eval.h b/python/include/eval.h deleted file mode 100644 index b78dfe0f..00000000 --- a/python/include/eval.h +++ /dev/null @@ -1,25 +0,0 @@ - -/* Interface to execute compiled code */ - -#ifndef Py_EVAL_H -#define Py_EVAL_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(PyObject *) PyEval_EvalCode(PyCodeObject *, PyObject *, PyObject *); - -PyAPI_FUNC(PyObject *) PyEval_EvalCodeEx(PyCodeObject *co, - PyObject *globals, - PyObject *locals, - PyObject **args, int argc, - PyObject **kwds, int kwdc, - PyObject **defs, int defc, - PyObject *closure); - -PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_EVAL_H */ diff --git a/python/include/fileobject.h b/python/include/fileobject.h deleted file mode 100644 index 1b540f90..00000000 --- a/python/include/fileobject.h +++ /dev/null @@ -1,97 +0,0 @@ - -/* File object interface */ - -#ifndef Py_FILEOBJECT_H -#define Py_FILEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - FILE *f_fp; - PyObject *f_name; - PyObject *f_mode; - int (*f_close)(FILE *); - int f_softspace; /* Flag used by 'print' command */ - int f_binary; /* Flag which indicates whether the file is - open in binary (1) or text (0) mode */ - char* f_buf; /* Allocated readahead buffer */ - char* f_bufend; /* Points after last occupied position */ - char* f_bufptr; /* Current buffer position */ - char *f_setbuf; /* Buffer for setbuf(3) and setvbuf(3) */ - int f_univ_newline; /* Handle any newline convention */ - int f_newlinetypes; /* Types of newlines seen */ - int f_skipnextlf; /* Skip next \n */ - PyObject *f_encoding; - PyObject *f_errors; - PyObject *weakreflist; /* List of weak references */ - int unlocked_count; /* Num. currently running sections of code - using f_fp with the GIL released. */ - int readable; - int writable; -} PyFileObject; - -PyAPI_DATA(PyTypeObject) PyFile_Type; - -#define PyFile_Check(op) PyObject_TypeCheck(op, &PyFile_Type) -#define PyFile_CheckExact(op) (Py_TYPE(op) == &PyFile_Type) - -PyAPI_FUNC(PyObject *) PyFile_FromString(char *, char *); -PyAPI_FUNC(void) PyFile_SetBufSize(PyObject *, int); -PyAPI_FUNC(int) PyFile_SetEncoding(PyObject *, const char *); -PyAPI_FUNC(int) PyFile_SetEncodingAndErrors(PyObject *, const char *, char *errors); -PyAPI_FUNC(PyObject *) PyFile_FromFile(FILE *, char *, char *, - int (*)(FILE *)); -PyAPI_FUNC(FILE *) PyFile_AsFile(PyObject *); -PyAPI_FUNC(void) PyFile_IncUseCount(PyFileObject *); -PyAPI_FUNC(void) PyFile_DecUseCount(PyFileObject *); -PyAPI_FUNC(PyObject *) PyFile_Name(PyObject *); -PyAPI_FUNC(PyObject *) PyFile_GetLine(PyObject *, int); -PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int); -PyAPI_FUNC(int) PyFile_SoftSpace(PyObject *, int); -PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *); -PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *); - -/* The default encoding used by the platform file system APIs - If non-NULL, this is different than the default encoding for strings -*/ -PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding; - -/* Routines to replace fread() and fgets() which accept any of \r, \n - or \r\n as line terminators. -*/ -#define PY_STDIOTEXTMODE "b" -char *Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *); -size_t Py_UniversalNewlineFread(char *, size_t, FILE *, PyObject *); - -/* A routine to do sanity checking on the file mode string. returns - non-zero on if an exception occurred -*/ -int _PyFile_SanitizeMode(char *mode); - -#if defined _MSC_VER && _MSC_VER >= 1400 -/* A routine to check if a file descriptor is valid on Windows. Returns 0 - * and sets errno to EBADF if it isn't. This is to avoid Assertions - * from various functions in the Windows CRT beginning with - * Visual Studio 2005 - */ -int _PyVerify_fd(int fd); -#elif defined _MSC_VER && _MSC_VER >= 1200 -/* fdopen doesn't set errno EBADF and crashes for large fd on debug build */ -#define _PyVerify_fd(fd) (_get_osfhandle(fd) >= 0) -#else -#define _PyVerify_fd(A) (1) /* dummy */ -#endif - -/* A routine to check if a file descriptor can be select()-ed. */ -#ifdef HAVE_SELECT - #define _PyIsSelectable_fd(FD) (((FD) >= 0) && ((FD) < FD_SETSIZE)) -#else - #define _PyIsSelectable_fd(FD) (1) -#endif /* HAVE_SELECT */ - -#ifdef __cplusplus -} -#endif -#endif /* !Py_FILEOBJECT_H */ diff --git a/python/include/floatobject.h b/python/include/floatobject.h deleted file mode 100644 index 54e88256..00000000 --- a/python/include/floatobject.h +++ /dev/null @@ -1,140 +0,0 @@ - -/* Float object interface */ - -/* -PyFloatObject represents a (double precision) floating point number. -*/ - -#ifndef Py_FLOATOBJECT_H -#define Py_FLOATOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - double ob_fval; -} PyFloatObject; - -PyAPI_DATA(PyTypeObject) PyFloat_Type; - -#define PyFloat_Check(op) PyObject_TypeCheck(op, &PyFloat_Type) -#define PyFloat_CheckExact(op) (Py_TYPE(op) == &PyFloat_Type) - -/* The str() precision PyFloat_STR_PRECISION is chosen so that in most cases, - the rounding noise created by various operations is suppressed, while - giving plenty of precision for practical use. */ - -#define PyFloat_STR_PRECISION 12 - -#ifdef Py_NAN -#define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN) -#endif - -#define Py_RETURN_INF(sign) do \ - if (copysign(1., sign) == 1.) { \ - return PyFloat_FromDouble(Py_HUGE_VAL); \ - } else { \ - return PyFloat_FromDouble(-Py_HUGE_VAL); \ - } while(0) - -PyAPI_FUNC(double) PyFloat_GetMax(void); -PyAPI_FUNC(double) PyFloat_GetMin(void); -PyAPI_FUNC(PyObject *) PyFloat_GetInfo(void); - -/* Return Python float from string PyObject. Second argument ignored on - input, and, if non-NULL, NULL is stored into *junk (this tried to serve a - purpose once but can't be made to work as intended). */ -PyAPI_FUNC(PyObject *) PyFloat_FromString(PyObject*, char** junk); - -/* Return Python float from C double. */ -PyAPI_FUNC(PyObject *) PyFloat_FromDouble(double); - -/* Extract C double from Python float. The macro version trades safety for - speed. */ -PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *); -#define PyFloat_AS_DOUBLE(op) (((PyFloatObject *)(op))->ob_fval) - -/* Write repr(v) into the char buffer argument, followed by null byte. The - buffer must be "big enough"; >= 100 is very safe. - PyFloat_AsReprString(buf, x) strives to print enough digits so that - PyFloat_FromString(buf) then reproduces x exactly. */ -PyAPI_FUNC(void) PyFloat_AsReprString(char*, PyFloatObject *v); - -/* Write str(v) into the char buffer argument, followed by null byte. The - buffer must be "big enough"; >= 100 is very safe. Note that it's - unusual to be able to get back the float you started with from - PyFloat_AsString's result -- use PyFloat_AsReprString() if you want to - preserve precision across conversions. */ -PyAPI_FUNC(void) PyFloat_AsString(char*, PyFloatObject *v); - -/* _PyFloat_{Pack,Unpack}{4,8} - * - * The struct and pickle (at least) modules need an efficient platform- - * independent way to store floating-point values as byte strings. - * The Pack routines produce a string from a C double, and the Unpack - * routines produce a C double from such a string. The suffix (4 or 8) - * specifies the number of bytes in the string. - * - * On platforms that appear to use (see _PyFloat_Init()) IEEE-754 formats - * these functions work by copying bits. On other platforms, the formats the - * 4- byte format is identical to the IEEE-754 single precision format, and - * the 8-byte format to the IEEE-754 double precision format, although the - * packing of INFs and NaNs (if such things exist on the platform) isn't - * handled correctly, and attempting to unpack a string containing an IEEE - * INF or NaN will raise an exception. - * - * On non-IEEE platforms with more precision, or larger dynamic range, than - * 754 supports, not all values can be packed; on non-IEEE platforms with less - * precision, or smaller dynamic range, not all values can be unpacked. What - * happens in such cases is partly accidental (alas). - */ - -/* The pack routines write 4 or 8 bytes, starting at p. le is a bool - * argument, true if you want the string in little-endian format (exponent - * last, at p+3 or p+7), false if you want big-endian format (exponent - * first, at p). - * Return value: 0 if all is OK, -1 if error (and an exception is - * set, most likely OverflowError). - * There are two problems on non-IEEE platforms: - * 1): What this does is undefined if x is a NaN or infinity. - * 2): -0.0 and +0.0 produce the same string. - */ -PyAPI_FUNC(int) _PyFloat_Pack4(double x, unsigned char *p, int le); -PyAPI_FUNC(int) _PyFloat_Pack8(double x, unsigned char *p, int le); - -/* Used to get the important decimal digits of a double */ -PyAPI_FUNC(int) _PyFloat_Digits(char *buf, double v, int *signum); -PyAPI_FUNC(void) _PyFloat_DigitsInit(void); - -/* The unpack routines read 4 or 8 bytes, starting at p. le is a bool - * argument, true if the string is in little-endian format (exponent - * last, at p+3 or p+7), false if big-endian (exponent first, at p). - * Return value: The unpacked double. On error, this is -1.0 and - * PyErr_Occurred() is true (and an exception is set, most likely - * OverflowError). Note that on a non-IEEE platform this will refuse - * to unpack a string that represents a NaN or infinity. - */ -PyAPI_FUNC(double) _PyFloat_Unpack4(const unsigned char *p, int le); -PyAPI_FUNC(double) _PyFloat_Unpack8(const unsigned char *p, int le); - -/* free list api */ -PyAPI_FUNC(int) PyFloat_ClearFreeList(void); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyFloat_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -/* Round a C double x to the closest multiple of 10**-ndigits. Returns a - Python float on success, or NULL (with an appropriate exception set) on - failure. Used in builtin_round in bltinmodule.c. */ -PyAPI_FUNC(PyObject *) _Py_double_round(double x, int ndigits); - - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_FLOATOBJECT_H */ diff --git a/python/include/frameobject.h b/python/include/frameobject.h deleted file mode 100644 index 17e7679a..00000000 --- a/python/include/frameobject.h +++ /dev/null @@ -1,89 +0,0 @@ - -/* Frame object interface */ - -#ifndef Py_FRAMEOBJECT_H -#define Py_FRAMEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - int b_type; /* what kind of block this is */ - int b_handler; /* where to jump to find handler */ - int b_level; /* value stack level to pop to */ -} PyTryBlock; - -typedef struct _frame { - PyObject_VAR_HEAD - struct _frame *f_back; /* previous frame, or NULL */ - PyCodeObject *f_code; /* code segment */ - PyObject *f_builtins; /* builtin symbol table (PyDictObject) */ - PyObject *f_globals; /* global symbol table (PyDictObject) */ - PyObject *f_locals; /* local symbol table (any mapping) */ - PyObject **f_valuestack; /* points after the last local */ - /* Next free slot in f_valuestack. Frame creation sets to f_valuestack. - Frame evaluation usually NULLs it, but a frame that yields sets it - to the current stack top. */ - PyObject **f_stacktop; - PyObject *f_trace; /* Trace function */ - - /* If an exception is raised in this frame, the next three are used to - * record the exception info (if any) originally in the thread state. See - * comments before set_exc_info() -- it's not obvious. - * Invariant: if _type is NULL, then so are _value and _traceback. - * Desired invariant: all three are NULL, or all three are non-NULL. That - * one isn't currently true, but "should be". - */ - PyObject *f_exc_type, *f_exc_value, *f_exc_traceback; - - PyThreadState *f_tstate; - int f_lasti; /* Last instruction if called */ - /* Call PyFrame_GetLineNumber() instead of reading this field - directly. As of 2.3 f_lineno is only valid when tracing is - active (i.e. when f_trace is set). At other times we use - PyCode_Addr2Line to calculate the line from the current - bytecode index. */ - int f_lineno; /* Current line number */ - int f_iblock; /* index in f_blockstack */ - PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */ - PyObject *f_localsplus[1]; /* locals+stack, dynamically sized */ -} PyFrameObject; - - -/* Standard object interface */ - -PyAPI_DATA(PyTypeObject) PyFrame_Type; - -#define PyFrame_Check(op) ((op)->ob_type == &PyFrame_Type) -#define PyFrame_IsRestricted(f) \ - ((f)->f_builtins != (f)->f_tstate->interp->builtins) - -PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *, - PyObject *, PyObject *); - - -/* The rest of the interface is specific for frame objects */ - -/* Block management functions */ - -PyAPI_FUNC(void) PyFrame_BlockSetup(PyFrameObject *, int, int, int); -PyAPI_FUNC(PyTryBlock *) PyFrame_BlockPop(PyFrameObject *); - -/* Extend the value stack */ - -PyAPI_FUNC(PyObject **) PyFrame_ExtendStack(PyFrameObject *, int, int); - -/* Conversions between "fast locals" and locals in dictionary */ - -PyAPI_FUNC(void) PyFrame_LocalsToFast(PyFrameObject *, int); -PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *); - -PyAPI_FUNC(int) PyFrame_ClearFreeList(void); - -/* Return the line of code the frame is currently executing. */ -PyAPI_FUNC(int) PyFrame_GetLineNumber(PyFrameObject *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_FRAMEOBJECT_H */ diff --git a/python/include/funcobject.h b/python/include/funcobject.h deleted file mode 100644 index eb19f4c3..00000000 --- a/python/include/funcobject.h +++ /dev/null @@ -1,76 +0,0 @@ - -/* Function object interface */ - -#ifndef Py_FUNCOBJECT_H -#define Py_FUNCOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Function objects and code objects should not be confused with each other: - * - * Function objects are created by the execution of the 'def' statement. - * They reference a code object in their func_code attribute, which is a - * purely syntactic object, i.e. nothing more than a compiled version of some - * source code lines. There is one code object per source code "fragment", - * but each code object can be referenced by zero or many function objects - * depending only on how many times the 'def' statement in the source was - * executed so far. - */ - -typedef struct { - PyObject_HEAD - PyObject *func_code; /* A code object */ - PyObject *func_globals; /* A dictionary (other mappings won't do) */ - PyObject *func_defaults; /* NULL or a tuple */ - PyObject *func_closure; /* NULL or a tuple of cell objects */ - PyObject *func_doc; /* The __doc__ attribute, can be anything */ - PyObject *func_name; /* The __name__ attribute, a string object */ - PyObject *func_dict; /* The __dict__ attribute, a dict or NULL */ - PyObject *func_weakreflist; /* List of weak references */ - PyObject *func_module; /* The __module__ attribute, can be anything */ - - /* Invariant: - * func_closure contains the bindings for func_code->co_freevars, so - * PyTuple_Size(func_closure) == PyCode_GetNumFree(func_code) - * (func_closure may be NULL if PyCode_GetNumFree(func_code) == 0). - */ -} PyFunctionObject; - -PyAPI_DATA(PyTypeObject) PyFunction_Type; - -#define PyFunction_Check(op) (Py_TYPE(op) == &PyFunction_Type) - -PyAPI_FUNC(PyObject *) PyFunction_New(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetCode(PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetGlobals(PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetModule(PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetDefaults(PyObject *); -PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetClosure(PyObject *); -PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *); - -/* Macros for direct access to these values. Type checks are *not* - done, so use with care. */ -#define PyFunction_GET_CODE(func) \ - (((PyFunctionObject *)func) -> func_code) -#define PyFunction_GET_GLOBALS(func) \ - (((PyFunctionObject *)func) -> func_globals) -#define PyFunction_GET_MODULE(func) \ - (((PyFunctionObject *)func) -> func_module) -#define PyFunction_GET_DEFAULTS(func) \ - (((PyFunctionObject *)func) -> func_defaults) -#define PyFunction_GET_CLOSURE(func) \ - (((PyFunctionObject *)func) -> func_closure) - -/* The classmethod and staticmethod types lives here, too */ -PyAPI_DATA(PyTypeObject) PyClassMethod_Type; -PyAPI_DATA(PyTypeObject) PyStaticMethod_Type; - -PyAPI_FUNC(PyObject *) PyClassMethod_New(PyObject *); -PyAPI_FUNC(PyObject *) PyStaticMethod_New(PyObject *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_FUNCOBJECT_H */ diff --git a/python/include/genobject.h b/python/include/genobject.h deleted file mode 100644 index 135561b7..00000000 --- a/python/include/genobject.h +++ /dev/null @@ -1,40 +0,0 @@ - -/* Generator object interface */ - -#ifndef Py_GENOBJECT_H -#define Py_GENOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -struct _frame; /* Avoid including frameobject.h */ - -typedef struct { - PyObject_HEAD - /* The gi_ prefix is intended to remind of generator-iterator. */ - - /* Note: gi_frame can be NULL if the generator is "finished" */ - struct _frame *gi_frame; - - /* True if generator is being executed. */ - int gi_running; - - /* The code object backing the generator */ - PyObject *gi_code; - - /* List of weak reference. */ - PyObject *gi_weakreflist; -} PyGenObject; - -PyAPI_DATA(PyTypeObject) PyGen_Type; - -#define PyGen_Check(op) PyObject_TypeCheck(op, &PyGen_Type) -#define PyGen_CheckExact(op) (Py_TYPE(op) == &PyGen_Type) - -PyAPI_FUNC(PyObject *) PyGen_New(struct _frame *); -PyAPI_FUNC(int) PyGen_NeedsFinalizing(PyGenObject *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_GENOBJECT_H */ diff --git a/python/include/graminit.h b/python/include/graminit.h deleted file mode 100644 index 40d531e8..00000000 --- a/python/include/graminit.h +++ /dev/null @@ -1,87 +0,0 @@ -/* Generated by Parser/pgen */ - -#define single_input 256 -#define file_input 257 -#define eval_input 258 -#define decorator 259 -#define decorators 260 -#define decorated 261 -#define funcdef 262 -#define parameters 263 -#define varargslist 264 -#define fpdef 265 -#define fplist 266 -#define stmt 267 -#define simple_stmt 268 -#define small_stmt 269 -#define expr_stmt 270 -#define augassign 271 -#define print_stmt 272 -#define del_stmt 273 -#define pass_stmt 274 -#define flow_stmt 275 -#define break_stmt 276 -#define continue_stmt 277 -#define return_stmt 278 -#define yield_stmt 279 -#define raise_stmt 280 -#define import_stmt 281 -#define import_name 282 -#define import_from 283 -#define import_as_name 284 -#define dotted_as_name 285 -#define import_as_names 286 -#define dotted_as_names 287 -#define dotted_name 288 -#define global_stmt 289 -#define exec_stmt 290 -#define assert_stmt 291 -#define compound_stmt 292 -#define if_stmt 293 -#define while_stmt 294 -#define for_stmt 295 -#define try_stmt 296 -#define with_stmt 297 -#define with_item 298 -#define except_clause 299 -#define suite 300 -#define testlist_safe 301 -#define old_test 302 -#define old_lambdef 303 -#define test 304 -#define or_test 305 -#define and_test 306 -#define not_test 307 -#define comparison 308 -#define comp_op 309 -#define expr 310 -#define xor_expr 311 -#define and_expr 312 -#define shift_expr 313 -#define arith_expr 314 -#define term 315 -#define factor 316 -#define power 317 -#define atom 318 -#define listmaker 319 -#define testlist_comp 320 -#define lambdef 321 -#define trailer 322 -#define subscriptlist 323 -#define subscript 324 -#define sliceop 325 -#define exprlist 326 -#define testlist 327 -#define dictorsetmaker 328 -#define classdef 329 -#define arglist 330 -#define argument 331 -#define list_iter 332 -#define list_for 333 -#define list_if 334 -#define comp_iter 335 -#define comp_for 336 -#define comp_if 337 -#define testlist1 338 -#define encoding_decl 339 -#define yield_expr 340 diff --git a/python/include/grammar.h b/python/include/grammar.h deleted file mode 100644 index 8426da30..00000000 --- a/python/include/grammar.h +++ /dev/null @@ -1,93 +0,0 @@ - -/* Grammar interface */ - -#ifndef Py_GRAMMAR_H -#define Py_GRAMMAR_H -#ifdef __cplusplus -extern "C" { -#endif - -#include "bitset.h" /* Sigh... */ - -/* A label of an arc */ - -typedef struct { - int lb_type; - char *lb_str; -} label; - -#define EMPTY 0 /* Label number 0 is by definition the empty label */ - -/* A list of labels */ - -typedef struct { - int ll_nlabels; - label *ll_label; -} labellist; - -/* An arc from one state to another */ - -typedef struct { - short a_lbl; /* Label of this arc */ - short a_arrow; /* State where this arc goes to */ -} arc; - -/* A state in a DFA */ - -typedef struct { - int s_narcs; - arc *s_arc; /* Array of arcs */ - - /* Optional accelerators */ - int s_lower; /* Lowest label index */ - int s_upper; /* Highest label index */ - int *s_accel; /* Accelerator */ - int s_accept; /* Nonzero for accepting state */ -} state; - -/* A DFA */ - -typedef struct { - int d_type; /* Non-terminal this represents */ - char *d_name; /* For printing */ - int d_initial; /* Initial state */ - int d_nstates; - state *d_state; /* Array of states */ - bitset d_first; -} dfa; - -/* A grammar */ - -typedef struct { - int g_ndfas; - dfa *g_dfa; /* Array of DFAs */ - labellist g_ll; - int g_start; /* Start symbol of the grammar */ - int g_accel; /* Set if accelerators present */ -} grammar; - -/* FUNCTIONS */ - -grammar *newgrammar(int start); -dfa *adddfa(grammar *g, int type, char *name); -int addstate(dfa *d); -void addarc(dfa *d, int from, int to, int lbl); -dfa *PyGrammar_FindDFA(grammar *g, int type); - -int addlabel(labellist *ll, int type, char *str); -int findlabel(labellist *ll, int type, char *str); -char *PyGrammar_LabelRepr(label *lb); -void translatelabels(grammar *g); - -void addfirstsets(grammar *g); - -void PyGrammar_AddAccelerators(grammar *g); -void PyGrammar_RemoveAccelerators(grammar *); - -void printgrammar(grammar *g, FILE *fp); -void printnonterminals(grammar *g, FILE *fp); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_GRAMMAR_H */ diff --git a/python/include/import.h b/python/include/import.h deleted file mode 100644 index 1b7fe0a7..00000000 --- a/python/include/import.h +++ /dev/null @@ -1,71 +0,0 @@ - -/* Module definition and import interface */ - -#ifndef Py_IMPORT_H -#define Py_IMPORT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(long) PyImport_GetMagicNumber(void); -PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(char *name, PyObject *co); -PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx( - char *name, PyObject *co, char *pathname); -PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void); -PyAPI_FUNC(PyObject *) PyImport_AddModule(const char *name); -PyAPI_FUNC(PyObject *) PyImport_ImportModule(const char *name); -PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(const char *); -PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(char *name, - PyObject *globals, PyObject *locals, PyObject *fromlist, int level); - -#define PyImport_ImportModuleEx(n, g, l, f) \ - PyImport_ImportModuleLevel(n, g, l, f, -1) - -PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path); -PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name); -PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m); -PyAPI_FUNC(void) PyImport_Cleanup(void); -PyAPI_FUNC(int) PyImport_ImportFrozenModule(char *); - -#ifdef WITH_THREAD -PyAPI_FUNC(void) _PyImport_AcquireLock(void); -PyAPI_FUNC(int) _PyImport_ReleaseLock(void); -#else -#define _PyImport_AcquireLock() -#define _PyImport_ReleaseLock() 1 -#endif - -PyAPI_FUNC(struct filedescr *) _PyImport_FindModule( - const char *, PyObject *, char *, size_t, FILE **, PyObject **); -PyAPI_FUNC(int) _PyImport_IsScript(struct filedescr *); -PyAPI_FUNC(void) _PyImport_ReInitLock(void); - -PyAPI_FUNC(PyObject *)_PyImport_FindExtension(char *, char *); -PyAPI_FUNC(PyObject *)_PyImport_FixupExtension(char *, char *); - -struct _inittab { - char *name; - void (*initfunc)(void); -}; - -PyAPI_DATA(PyTypeObject) PyNullImporter_Type; -PyAPI_DATA(struct _inittab *) PyImport_Inittab; - -PyAPI_FUNC(int) PyImport_AppendInittab(const char *name, void (*initfunc)(void)); -PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab); - -struct _frozen { - char *name; - unsigned char *code; - int size; -}; - -/* Embedding apps may change this pointer to point to their favorite - collection of frozen modules: */ - -PyAPI_DATA(struct _frozen *) PyImport_FrozenModules; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_IMPORT_H */ diff --git a/python/include/intobject.h b/python/include/intobject.h deleted file mode 100644 index 78746a63..00000000 --- a/python/include/intobject.h +++ /dev/null @@ -1,80 +0,0 @@ - -/* Integer object interface */ - -/* -PyIntObject represents a (long) integer. This is an immutable object; -an integer cannot change its value after creation. - -There are functions to create new integer objects, to test an object -for integer-ness, and to get the integer value. The latter functions -returns -1 and sets errno to EBADF if the object is not an PyIntObject. -None of the functions should be applied to nil objects. - -The type PyIntObject is (unfortunately) exposed here so we can declare -_Py_TrueStruct and _Py_ZeroStruct in boolobject.h; don't use this. -*/ - -#ifndef Py_INTOBJECT_H -#define Py_INTOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - long ob_ival; -} PyIntObject; - -PyAPI_DATA(PyTypeObject) PyInt_Type; - -#define PyInt_Check(op) \ - PyType_FastSubclass((op)->ob_type, Py_TPFLAGS_INT_SUBCLASS) -#define PyInt_CheckExact(op) ((op)->ob_type == &PyInt_Type) - -PyAPI_FUNC(PyObject *) PyInt_FromString(char*, char**, int); -#ifdef Py_USING_UNICODE -PyAPI_FUNC(PyObject *) PyInt_FromUnicode(Py_UNICODE*, Py_ssize_t, int); -#endif -PyAPI_FUNC(PyObject *) PyInt_FromLong(long); -PyAPI_FUNC(PyObject *) PyInt_FromSize_t(size_t); -PyAPI_FUNC(PyObject *) PyInt_FromSsize_t(Py_ssize_t); -PyAPI_FUNC(long) PyInt_AsLong(PyObject *); -PyAPI_FUNC(Py_ssize_t) PyInt_AsSsize_t(PyObject *); -PyAPI_FUNC(unsigned long) PyInt_AsUnsignedLongMask(PyObject *); -#ifdef HAVE_LONG_LONG -PyAPI_FUNC(unsigned PY_LONG_LONG) PyInt_AsUnsignedLongLongMask(PyObject *); -#endif - -PyAPI_FUNC(long) PyInt_GetMax(void); - -/* Macro, trading safety for speed */ -#define PyInt_AS_LONG(op) (((PyIntObject *)(op))->ob_ival) - -/* These aren't really part of the Int object, but they're handy; the protos - * are necessary for systems that need the magic of PyAPI_FUNC and that want - * to have stropmodule as a dynamically loaded module instead of building it - * into the main Python shared library/DLL. Guido thinks I'm weird for - * building it this way. :-) [cjh] - */ -PyAPI_FUNC(unsigned long) PyOS_strtoul(char *, char **, int); -PyAPI_FUNC(long) PyOS_strtol(char *, char **, int); - -/* free list api */ -PyAPI_FUNC(int) PyInt_ClearFreeList(void); - -/* Convert an integer to the given base. Returns a string. - If base is 2, 8 or 16, add the proper prefix '0b', '0o' or '0x'. - If newstyle is zero, then use the pre-2.6 behavior of octal having - a leading "0" */ -PyAPI_FUNC(PyObject*) _PyInt_Format(PyIntObject* v, int base, int newstyle); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyInt_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_INTOBJECT_H */ diff --git a/python/include/intrcheck.h b/python/include/intrcheck.h deleted file mode 100644 index 3b67ed0d..00000000 --- a/python/include/intrcheck.h +++ /dev/null @@ -1,15 +0,0 @@ - -#ifndef Py_INTRCHECK_H -#define Py_INTRCHECK_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(int) PyOS_InterruptOccurred(void); -PyAPI_FUNC(void) PyOS_InitInterrupts(void); -PyAPI_FUNC(void) PyOS_AfterFork(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_INTRCHECK_H */ diff --git a/python/include/iterobject.h b/python/include/iterobject.h deleted file mode 100644 index 4bd19c29..00000000 --- a/python/include/iterobject.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef Py_ITEROBJECT_H -#define Py_ITEROBJECT_H -/* Iterators (the basic kind, over a sequence) */ -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PySeqIter_Type; - -#define PySeqIter_Check(op) (Py_TYPE(op) == &PySeqIter_Type) - -PyAPI_FUNC(PyObject *) PySeqIter_New(PyObject *); - -PyAPI_DATA(PyTypeObject) PyCallIter_Type; - -#define PyCallIter_Check(op) (Py_TYPE(op) == &PyCallIter_Type) - -PyAPI_FUNC(PyObject *) PyCallIter_New(PyObject *, PyObject *); -#ifdef __cplusplus -} -#endif -#endif /* !Py_ITEROBJECT_H */ - diff --git a/python/include/listobject.h b/python/include/listobject.h deleted file mode 100644 index c4458733..00000000 --- a/python/include/listobject.h +++ /dev/null @@ -1,68 +0,0 @@ - -/* List object interface */ - -/* -Another generally useful object type is an list of object pointers. -This is a mutable type: the list items can be changed, and items can be -added or removed. Out-of-range indices or non-list objects are ignored. - -*** WARNING *** PyList_SetItem does not increment the new item's reference -count, but does decrement the reference count of the item it replaces, -if not nil. It does *decrement* the reference count if it is *not* -inserted in the list. Similarly, PyList_GetItem does not increment the -returned item's reference count. -*/ - -#ifndef Py_LISTOBJECT_H -#define Py_LISTOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_VAR_HEAD - /* Vector of pointers to list elements. list[0] is ob_item[0], etc. */ - PyObject **ob_item; - - /* ob_item contains space for 'allocated' elements. The number - * currently in use is ob_size. - * Invariants: - * 0 <= ob_size <= allocated - * len(list) == ob_size - * ob_item == NULL implies ob_size == allocated == 0 - * list.sort() temporarily sets allocated to -1 to detect mutations. - * - * Items must normally not be NULL, except during construction when - * the list is not yet visible outside the function that builds it. - */ - Py_ssize_t allocated; -} PyListObject; - -PyAPI_DATA(PyTypeObject) PyList_Type; - -#define PyList_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS) -#define PyList_CheckExact(op) (Py_TYPE(op) == &PyList_Type) - -PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size); -PyAPI_FUNC(Py_ssize_t) PyList_Size(PyObject *); -PyAPI_FUNC(PyObject *) PyList_GetItem(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyList_SetItem(PyObject *, Py_ssize_t, PyObject *); -PyAPI_FUNC(int) PyList_Insert(PyObject *, Py_ssize_t, PyObject *); -PyAPI_FUNC(int) PyList_Append(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyList_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t); -PyAPI_FUNC(int) PyList_SetSlice(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *); -PyAPI_FUNC(int) PyList_Sort(PyObject *); -PyAPI_FUNC(int) PyList_Reverse(PyObject *); -PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *); -PyAPI_FUNC(PyObject *) _PyList_Extend(PyListObject *, PyObject *); - -/* Macro, trading safety for speed */ -#define PyList_GET_ITEM(op, i) (((PyListObject *)(op))->ob_item[i]) -#define PyList_SET_ITEM(op, i, v) (((PyListObject *)(op))->ob_item[i] = (v)) -#define PyList_GET_SIZE(op) Py_SIZE(op) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_LISTOBJECT_H */ diff --git a/python/include/longintrepr.h b/python/include/longintrepr.h deleted file mode 100644 index 6425c30f..00000000 --- a/python/include/longintrepr.h +++ /dev/null @@ -1,103 +0,0 @@ -#ifndef Py_LONGINTREPR_H -#define Py_LONGINTREPR_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* This is published for the benefit of "friend" marshal.c only. */ - -/* Parameters of the long integer representation. There are two different - sets of parameters: one set for 30-bit digits, stored in an unsigned 32-bit - integer type, and one set for 15-bit digits with each digit stored in an - unsigned short. The value of PYLONG_BITS_IN_DIGIT, defined either at - configure time or in pyport.h, is used to decide which digit size to use. - - Type 'digit' should be able to hold 2*PyLong_BASE-1, and type 'twodigits' - should be an unsigned integer type able to hold all integers up to - PyLong_BASE*PyLong_BASE-1. x_sub assumes that 'digit' is an unsigned type, - and that overflow is handled by taking the result modulo 2**N for some N > - PyLong_SHIFT. The majority of the code doesn't care about the precise - value of PyLong_SHIFT, but there are some notable exceptions: - - - long_pow() requires that PyLong_SHIFT be divisible by 5 - - - PyLong_{As,From}ByteArray require that PyLong_SHIFT be at least 8 - - - long_hash() requires that PyLong_SHIFT is *strictly* less than the number - of bits in an unsigned long, as do the PyLong <-> long (or unsigned long) - conversion functions - - - the long <-> size_t/Py_ssize_t conversion functions expect that - PyLong_SHIFT is strictly less than the number of bits in a size_t - - - the marshal code currently expects that PyLong_SHIFT is a multiple of 15 - - The values 15 and 30 should fit all of the above requirements, on any - platform. -*/ - -#if PYLONG_BITS_IN_DIGIT == 30 -#if !(defined HAVE_UINT64_T && defined HAVE_UINT32_T && \ - defined HAVE_INT64_T && defined HAVE_INT32_T) -#error "30-bit long digits requested, but the necessary types are not available on this platform" -#endif -typedef PY_UINT32_T digit; -typedef PY_INT32_T sdigit; /* signed variant of digit */ -typedef PY_UINT64_T twodigits; -typedef PY_INT64_T stwodigits; /* signed variant of twodigits */ -#define PyLong_SHIFT 30 -#define _PyLong_DECIMAL_SHIFT 9 /* max(e such that 10**e fits in a digit) */ -#define _PyLong_DECIMAL_BASE ((digit)1000000000) /* 10 ** DECIMAL_SHIFT */ -#elif PYLONG_BITS_IN_DIGIT == 15 -typedef unsigned short digit; -typedef short sdigit; /* signed variant of digit */ -typedef unsigned long twodigits; -typedef long stwodigits; /* signed variant of twodigits */ -#define PyLong_SHIFT 15 -#define _PyLong_DECIMAL_SHIFT 4 /* max(e such that 10**e fits in a digit) */ -#define _PyLong_DECIMAL_BASE ((digit)10000) /* 10 ** DECIMAL_SHIFT */ -#else -#error "PYLONG_BITS_IN_DIGIT should be 15 or 30" -#endif -#define PyLong_BASE ((digit)1 << PyLong_SHIFT) -#define PyLong_MASK ((digit)(PyLong_BASE - 1)) - -/* b/w compatibility with Python 2.5 */ -#define SHIFT PyLong_SHIFT -#define BASE PyLong_BASE -#define MASK PyLong_MASK - -#if PyLong_SHIFT % 5 != 0 -#error "longobject.c requires that PyLong_SHIFT be divisible by 5" -#endif - -/* Long integer representation. - The absolute value of a number is equal to - SUM(for i=0 through abs(ob_size)-1) ob_digit[i] * 2**(SHIFT*i) - Negative numbers are represented with ob_size < 0; - zero is represented by ob_size == 0. - In a normalized number, ob_digit[abs(ob_size)-1] (the most significant - digit) is never zero. Also, in all cases, for all valid i, - 0 <= ob_digit[i] <= MASK. - The allocation function takes care of allocating extra memory - so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available. - - CAUTION: Generic code manipulating subtypes of PyVarObject has to - aware that longs abuse ob_size's sign bit. -*/ - -struct _longobject { - PyObject_VAR_HEAD - digit ob_digit[1]; -}; - -PyAPI_FUNC(PyLongObject *) _PyLong_New(Py_ssize_t); - -/* Return a copy of src. */ -PyAPI_FUNC(PyObject *) _PyLong_Copy(PyLongObject *src); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_LONGINTREPR_H */ diff --git a/python/include/longobject.h b/python/include/longobject.h deleted file mode 100644 index 2b404612..00000000 --- a/python/include/longobject.h +++ /dev/null @@ -1,134 +0,0 @@ -#ifndef Py_LONGOBJECT_H -#define Py_LONGOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Long (arbitrary precision) integer object interface */ - -typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */ - -PyAPI_DATA(PyTypeObject) PyLong_Type; - -#define PyLong_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LONG_SUBCLASS) -#define PyLong_CheckExact(op) (Py_TYPE(op) == &PyLong_Type) - -PyAPI_FUNC(PyObject *) PyLong_FromLong(long); -PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLong(unsigned long); -PyAPI_FUNC(PyObject *) PyLong_FromDouble(double); -PyAPI_FUNC(PyObject *) PyLong_FromSize_t(size_t); -PyAPI_FUNC(PyObject *) PyLong_FromSsize_t(Py_ssize_t); -PyAPI_FUNC(long) PyLong_AsLong(PyObject *); -PyAPI_FUNC(long) PyLong_AsLongAndOverflow(PyObject *, int *); -PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLong(PyObject *); -PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLongMask(PyObject *); -PyAPI_FUNC(Py_ssize_t) PyLong_AsSsize_t(PyObject *); -PyAPI_FUNC(PyObject *) PyLong_GetInfo(void); - -/* For use by intobject.c only */ -#define _PyLong_AsSsize_t PyLong_AsSsize_t -#define _PyLong_FromSize_t PyLong_FromSize_t -#define _PyLong_FromSsize_t PyLong_FromSsize_t -PyAPI_DATA(int) _PyLong_DigitValue[256]; - -/* _PyLong_Frexp returns a double x and an exponent e such that the - true value is approximately equal to x * 2**e. e is >= 0. x is - 0.0 if and only if the input is 0 (in which case, e and x are both - zeroes); otherwise, 0.5 <= abs(x) < 1.0. On overflow, which is - possible if the number of bits doesn't fit into a Py_ssize_t, sets - OverflowError and returns -1.0 for x, 0 for e. */ -PyAPI_FUNC(double) _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e); - -PyAPI_FUNC(double) PyLong_AsDouble(PyObject *); -PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *); -PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *); - -#ifdef HAVE_LONG_LONG -PyAPI_FUNC(PyObject *) PyLong_FromLongLong(PY_LONG_LONG); -PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG); -PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLong(PyObject *); -PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *); -PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *); -PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLongAndOverflow(PyObject *, int *); -#endif /* HAVE_LONG_LONG */ - -PyAPI_FUNC(PyObject *) PyLong_FromString(char *, char **, int); -#ifdef Py_USING_UNICODE -PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int); -#endif - -/* _PyLong_Sign. Return 0 if v is 0, -1 if v < 0, +1 if v > 0. - v must not be NULL, and must be a normalized long. - There are no error cases. -*/ -PyAPI_FUNC(int) _PyLong_Sign(PyObject *v); - - -/* _PyLong_NumBits. Return the number of bits needed to represent the - absolute value of a long. For example, this returns 1 for 1 and -1, 2 - for 2 and -2, and 2 for 3 and -3. It returns 0 for 0. - v must not be NULL, and must be a normalized long. - (size_t)-1 is returned and OverflowError set if the true result doesn't - fit in a size_t. -*/ -PyAPI_FUNC(size_t) _PyLong_NumBits(PyObject *v); - -/* _PyLong_FromByteArray: View the n unsigned bytes as a binary integer in - base 256, and return a Python long with the same numeric value. - If n is 0, the integer is 0. Else: - If little_endian is 1/true, bytes[n-1] is the MSB and bytes[0] the LSB; - else (little_endian is 0/false) bytes[0] is the MSB and bytes[n-1] the - LSB. - If is_signed is 0/false, view the bytes as a non-negative integer. - If is_signed is 1/true, view the bytes as a 2's-complement integer, - non-negative if bit 0x80 of the MSB is clear, negative if set. - Error returns: - + Return NULL with the appropriate exception set if there's not - enough memory to create the Python long. -*/ -PyAPI_FUNC(PyObject *) _PyLong_FromByteArray( - const unsigned char* bytes, size_t n, - int little_endian, int is_signed); - -/* _PyLong_AsByteArray: Convert the least-significant 8*n bits of long - v to a base-256 integer, stored in array bytes. Normally return 0, - return -1 on error. - If little_endian is 1/true, store the MSB at bytes[n-1] and the LSB at - bytes[0]; else (little_endian is 0/false) store the MSB at bytes[0] and - the LSB at bytes[n-1]. - If is_signed is 0/false, it's an error if v < 0; else (v >= 0) n bytes - are filled and there's nothing special about bit 0x80 of the MSB. - If is_signed is 1/true, bytes is filled with the 2's-complement - representation of v's value. Bit 0x80 of the MSB is the sign bit. - Error returns (-1): - + is_signed is 0 and v < 0. TypeError is set in this case, and bytes - isn't altered. - + n isn't big enough to hold the full mathematical value of v. For - example, if is_signed is 0 and there are more digits in the v than - fit in n; or if is_signed is 1, v < 0, and n is just 1 bit shy of - being large enough to hold a sign bit. OverflowError is set in this - case, but bytes holds the least-signficant n bytes of the true value. -*/ -PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v, - unsigned char* bytes, size_t n, - int little_endian, int is_signed); - -/* _PyLong_Format: Convert the long to a string object with given base, - appending a base prefix of 0[box] if base is 2, 8 or 16. - Add a trailing "L" if addL is non-zero. - If newstyle is zero, then use the pre-2.6 behavior of octal having - a leading "0", instead of the prefix "0o" */ -PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *aa, int base, int addL, int newstyle); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyLong_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_LONGOBJECT_H */ diff --git a/python/include/marshal.h b/python/include/marshal.h deleted file mode 100644 index 411fdca3..00000000 --- a/python/include/marshal.h +++ /dev/null @@ -1,25 +0,0 @@ - -/* Interface for marshal.c */ - -#ifndef Py_MARSHAL_H -#define Py_MARSHAL_H -#ifdef __cplusplus -extern "C" { -#endif - -#define Py_MARSHAL_VERSION 2 - -PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *, int); -PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *, int); -PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *, int); - -PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *); -PyAPI_FUNC(int) PyMarshal_ReadShortFromFile(FILE *); -PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromFile(FILE *); -PyAPI_FUNC(PyObject *) PyMarshal_ReadLastObjectFromFile(FILE *); -PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(char *, Py_ssize_t); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MARSHAL_H */ diff --git a/python/include/memoryobject.h b/python/include/memoryobject.h deleted file mode 100644 index bf0b621a..00000000 --- a/python/include/memoryobject.h +++ /dev/null @@ -1,74 +0,0 @@ -/* Memory view object. In Python this is available as "memoryview". */ - -#ifndef Py_MEMORYOBJECT_H -#define Py_MEMORYOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyMemoryView_Type; - -#define PyMemoryView_Check(op) (Py_TYPE(op) == &PyMemoryView_Type) - -/* Get a pointer to the underlying Py_buffer of a memoryview object. */ -#define PyMemoryView_GET_BUFFER(op) (&((PyMemoryViewObject *)(op))->view) -/* Get a pointer to the PyObject from which originates a memoryview object. */ -#define PyMemoryView_GET_BASE(op) (((PyMemoryViewObject *)(op))->view.obj) - - -PyAPI_FUNC(PyObject *) PyMemoryView_GetContiguous(PyObject *base, - int buffertype, - char fort); - - /* Return a contiguous chunk of memory representing the buffer - from an object in a memory view object. If a copy is made then the - base object for the memory view will be a *new* bytes object. - - Otherwise, the base-object will be the object itself and no - data-copying will be done. - - The buffertype argument can be PyBUF_READ, PyBUF_WRITE, - PyBUF_SHADOW to determine whether the returned buffer - should be READONLY, WRITABLE, or set to update the - original buffer if a copy must be made. If buffertype is - PyBUF_WRITE and the buffer is not contiguous an error will - be raised. In this circumstance, the user can use - PyBUF_SHADOW to ensure that a a writable temporary - contiguous buffer is returned. The contents of this - contiguous buffer will be copied back into the original - object after the memoryview object is deleted as long as - the original object is writable and allows setting an - exclusive write lock. If this is not allowed by the - original object, then a BufferError is raised. - - If the object is multi-dimensional and if fortran is 'F', - the first dimension of the underlying array will vary the - fastest in the buffer. If fortran is 'C', then the last - dimension will vary the fastest (C-style contiguous). If - fortran is 'A', then it does not matter and you will get - whatever the object decides is more efficient. - - A new reference is returned that must be DECREF'd when finished. - */ - -PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base); - -PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info); - /* create new if bufptr is NULL - will be a new bytesobject in base */ - - -/* The struct is declared here so that macros can work, but it shouldn't - be considered public. Don't access those fields directly, use the macros - and functions instead! */ -typedef struct { - PyObject_HEAD - PyObject *base; - Py_buffer view; -} PyMemoryViewObject; - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MEMORYOBJECT_H */ diff --git a/python/include/metagrammar.h b/python/include/metagrammar.h deleted file mode 100644 index 15c8ef8f..00000000 --- a/python/include/metagrammar.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef Py_METAGRAMMAR_H -#define Py_METAGRAMMAR_H -#ifdef __cplusplus -extern "C" { -#endif - - -#define MSTART 256 -#define RULE 257 -#define RHS 258 -#define ALT 259 -#define ITEM 260 -#define ATOM 261 - -#ifdef __cplusplus -} -#endif -#endif /* !Py_METAGRAMMAR_H */ diff --git a/python/include/methodobject.h b/python/include/methodobject.h deleted file mode 100644 index 6e160b63..00000000 --- a/python/include/methodobject.h +++ /dev/null @@ -1,93 +0,0 @@ - -/* Method object interface */ - -#ifndef Py_METHODOBJECT_H -#define Py_METHODOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* This is about the type 'builtin_function_or_method', - not Python methods in user-defined classes. See classobject.h - for the latter. */ - -PyAPI_DATA(PyTypeObject) PyCFunction_Type; - -#define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type) - -typedef PyObject *(*PyCFunction)(PyObject *, PyObject *); -typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *, - PyObject *); -typedef PyObject *(*PyNoArgsFunction)(PyObject *); - -PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *); -PyAPI_FUNC(PyObject *) PyCFunction_GetSelf(PyObject *); -PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *); - -/* Macros for direct access to these values. Type checks are *not* - done, so use with care. */ -#define PyCFunction_GET_FUNCTION(func) \ - (((PyCFunctionObject *)func) -> m_ml -> ml_meth) -#define PyCFunction_GET_SELF(func) \ - (((PyCFunctionObject *)func) -> m_self) -#define PyCFunction_GET_FLAGS(func) \ - (((PyCFunctionObject *)func) -> m_ml -> ml_flags) -PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *); - -struct PyMethodDef { - const char *ml_name; /* The name of the built-in function/method */ - PyCFunction ml_meth; /* The C function that implements it */ - int ml_flags; /* Combination of METH_xxx flags, which mostly - describe the args expected by the C func */ - const char *ml_doc; /* The __doc__ attribute, or NULL */ -}; -typedef struct PyMethodDef PyMethodDef; - -PyAPI_FUNC(PyObject *) Py_FindMethod(PyMethodDef[], PyObject *, const char *); - -#define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL) -PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *, - PyObject *); - -/* Flag passed to newmethodobject */ -#define METH_OLDARGS 0x0000 -#define METH_VARARGS 0x0001 -#define METH_KEYWORDS 0x0002 -/* METH_NOARGS and METH_O must not be combined with the flags above. */ -#define METH_NOARGS 0x0004 -#define METH_O 0x0008 - -/* METH_CLASS and METH_STATIC are a little different; these control - the construction of methods for a class. These cannot be used for - functions in modules. */ -#define METH_CLASS 0x0010 -#define METH_STATIC 0x0020 - -/* METH_COEXIST allows a method to be entered eventhough a slot has - already filled the entry. When defined, the flag allows a separate - method, "__contains__" for example, to coexist with a defined - slot like sq_contains. */ - -#define METH_COEXIST 0x0040 - -typedef struct PyMethodChain { - PyMethodDef *methods; /* Methods of this type */ - struct PyMethodChain *link; /* NULL or base type */ -} PyMethodChain; - -PyAPI_FUNC(PyObject *) Py_FindMethodInChain(PyMethodChain *, PyObject *, - const char *); - -typedef struct { - PyObject_HEAD - PyMethodDef *m_ml; /* Description of the C function to call */ - PyObject *m_self; /* Passed as 'self' arg to the C func, can be NULL */ - PyObject *m_module; /* The __module__ attribute, can be anything */ -} PyCFunctionObject; - -PyAPI_FUNC(int) PyCFunction_ClearFreeList(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_METHODOBJECT_H */ diff --git a/python/include/modsupport.h b/python/include/modsupport.h deleted file mode 100644 index d4dddef0..00000000 --- a/python/include/modsupport.h +++ /dev/null @@ -1,134 +0,0 @@ - -#ifndef Py_MODSUPPORT_H -#define Py_MODSUPPORT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Module support interface */ - -#include - -/* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier - to mean Py_ssize_t */ -#ifdef PY_SSIZE_T_CLEAN -#define PyArg_Parse _PyArg_Parse_SizeT -#define PyArg_ParseTuple _PyArg_ParseTuple_SizeT -#define PyArg_ParseTupleAndKeywords _PyArg_ParseTupleAndKeywords_SizeT -#define PyArg_VaParse _PyArg_VaParse_SizeT -#define PyArg_VaParseTupleAndKeywords _PyArg_VaParseTupleAndKeywords_SizeT -#define Py_BuildValue _Py_BuildValue_SizeT -#define Py_VaBuildValue _Py_VaBuildValue_SizeT -#else -PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list); -#endif - -PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); -PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3); -PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, - const char *, char **, ...); -PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...); -PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...); -PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...); -PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw); - -PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); -PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *, - const char *, char **, va_list); -PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list); - -PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *); -PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long); -PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *); -#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c) -#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c) - -#define PYTHON_API_VERSION 1013 -#define PYTHON_API_STRING "1013" -/* The API version is maintained (independently from the Python version) - so we can detect mismatches between the interpreter and dynamically - loaded modules. These are diagnosed by an error message but - the module is still loaded (because the mismatch can only be tested - after loading the module). The error message is intended to - explain the core dump a few seconds later. - - The symbol PYTHON_API_STRING defines the same value as a string - literal. *** PLEASE MAKE SURE THE DEFINITIONS MATCH. *** - - Please add a line or two to the top of this log for each API - version change: - - 22-Feb-2006 MvL 1013 PEP 353 - long indices for sequence lengths - - 19-Aug-2002 GvR 1012 Changes to string object struct for - interning changes, saving 3 bytes. - - 17-Jul-2001 GvR 1011 Descr-branch, just to be on the safe side - - 25-Jan-2001 FLD 1010 Parameters added to PyCode_New() and - PyFrame_New(); Python 2.1a2 - - 14-Mar-2000 GvR 1009 Unicode API added - - 3-Jan-1999 GvR 1007 Decided to change back! (Don't reuse 1008!) - - 3-Dec-1998 GvR 1008 Python 1.5.2b1 - - 18-Jan-1997 GvR 1007 string interning and other speedups - - 11-Oct-1996 GvR renamed Py_Ellipses to Py_Ellipsis :-( - - 30-Jul-1996 GvR Slice and ellipses syntax added - - 23-Jul-1996 GvR For 1.4 -- better safe than sorry this time :-) - - 7-Nov-1995 GvR Keyword arguments (should've been done at 1.3 :-( ) - - 10-Jan-1995 GvR Renamed globals to new naming scheme - - 9-Jan-1995 GvR Initial version (incompatible with older API) -*/ - -#ifdef MS_WINDOWS -/* Special defines for Windows versions used to live here. Things - have changed, and the "Version" is now in a global string variable. - Reason for this is that this for easier branding of a "custom DLL" - without actually needing a recompile. */ -#endif /* MS_WINDOWS */ - -#if SIZEOF_SIZE_T != SIZEOF_INT -/* On a 64-bit system, rename the Py_InitModule4 so that 2.4 - modules cannot get loaded into a 2.5 interpreter */ -#define Py_InitModule4 Py_InitModule4_64 -#endif - -#ifdef Py_TRACE_REFS - /* When we are tracing reference counts, rename Py_InitModule4 so - modules compiled with incompatible settings will generate a - link-time error. */ - #if SIZEOF_SIZE_T != SIZEOF_INT - #undef Py_InitModule4 - #define Py_InitModule4 Py_InitModule4TraceRefs_64 - #else - #define Py_InitModule4 Py_InitModule4TraceRefs - #endif -#endif - -PyAPI_FUNC(PyObject *) Py_InitModule4(const char *name, PyMethodDef *methods, - const char *doc, PyObject *self, - int apiver); - -#define Py_InitModule(name, methods) \ - Py_InitModule4(name, methods, (char *)NULL, (PyObject *)NULL, \ - PYTHON_API_VERSION) - -#define Py_InitModule3(name, methods, doc) \ - Py_InitModule4(name, methods, doc, (PyObject *)NULL, \ - PYTHON_API_VERSION) - -PyAPI_DATA(char *) _Py_PackageContext; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MODSUPPORT_H */ diff --git a/python/include/moduleobject.h b/python/include/moduleobject.h deleted file mode 100644 index b387f5bf..00000000 --- a/python/include/moduleobject.h +++ /dev/null @@ -1,24 +0,0 @@ - -/* Module object interface */ - -#ifndef Py_MODULEOBJECT_H -#define Py_MODULEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyModule_Type; - -#define PyModule_Check(op) PyObject_TypeCheck(op, &PyModule_Type) -#define PyModule_CheckExact(op) (Py_TYPE(op) == &PyModule_Type) - -PyAPI_FUNC(PyObject *) PyModule_New(const char *); -PyAPI_FUNC(PyObject *) PyModule_GetDict(PyObject *); -PyAPI_FUNC(char *) PyModule_GetName(PyObject *); -PyAPI_FUNC(char *) PyModule_GetFilename(PyObject *); -PyAPI_FUNC(void) _PyModule_Clear(PyObject *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MODULEOBJECT_H */ diff --git a/python/include/node.h b/python/include/node.h deleted file mode 100644 index e23e709f..00000000 --- a/python/include/node.h +++ /dev/null @@ -1,40 +0,0 @@ - -/* Parse tree node interface */ - -#ifndef Py_NODE_H -#define Py_NODE_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct _node { - short n_type; - char *n_str; - int n_lineno; - int n_col_offset; - int n_nchildren; - struct _node *n_child; -} node; - -PyAPI_FUNC(node *) PyNode_New(int type); -PyAPI_FUNC(int) PyNode_AddChild(node *n, int type, - char *str, int lineno, int col_offset); -PyAPI_FUNC(void) PyNode_Free(node *n); - -/* Node access functions */ -#define NCH(n) ((n)->n_nchildren) - -#define CHILD(n, i) (&(n)->n_child[i]) -#define RCHILD(n, i) (CHILD(n, NCH(n) + i)) -#define TYPE(n) ((n)->n_type) -#define STR(n) ((n)->n_str) - -/* Assert that the type of a node is what we expect */ -#define REQ(n, type) assert(TYPE(n) == (type)) - -PyAPI_FUNC(void) PyNode_ListTree(node *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_NODE_H */ diff --git a/python/include/object.h b/python/include/object.h deleted file mode 100644 index edcd3fc2..00000000 --- a/python/include/object.h +++ /dev/null @@ -1,996 +0,0 @@ -#ifndef Py_OBJECT_H -#define Py_OBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Object and type object interface */ - -/* -Objects are structures allocated on the heap. Special rules apply to -the use of objects to ensure they are properly garbage-collected. -Objects are never allocated statically or on the stack; they must be -accessed through special macros and functions only. (Type objects are -exceptions to the first rule; the standard types are represented by -statically initialized type objects, although work on type/class unification -for Python 2.2 made it possible to have heap-allocated type objects too). - -An object has a 'reference count' that is increased or decreased when a -pointer to the object is copied or deleted; when the reference count -reaches zero there are no references to the object left and it can be -removed from the heap. - -An object has a 'type' that determines what it represents and what kind -of data it contains. An object's type is fixed when it is created. -Types themselves are represented as objects; an object contains a -pointer to the corresponding type object. The type itself has a type -pointer pointing to the object representing the type 'type', which -contains a pointer to itself!). - -Objects do not float around in memory; once allocated an object keeps -the same size and address. Objects that must hold variable-size data -can contain pointers to variable-size parts of the object. Not all -objects of the same type have the same size; but the size cannot change -after allocation. (These restrictions are made so a reference to an -object can be simply a pointer -- moving an object would require -updating all the pointers, and changing an object's size would require -moving it if there was another object right next to it.) - -Objects are always accessed through pointers of the type 'PyObject *'. -The type 'PyObject' is a structure that only contains the reference count -and the type pointer. The actual memory allocated for an object -contains other data that can only be accessed after casting the pointer -to a pointer to a longer structure type. This longer type must start -with the reference count and type fields; the macro PyObject_HEAD should be -used for this (to accommodate for future changes). The implementation -of a particular object type can cast the object pointer to the proper -type and back. - -A standard interface exists for objects that contain an array of items -whose size is determined when the object is allocated. -*/ - -/* Py_DEBUG implies Py_TRACE_REFS. */ -#if defined(Py_DEBUG) && !defined(Py_TRACE_REFS) -#define Py_TRACE_REFS -#endif - -/* Py_TRACE_REFS implies Py_REF_DEBUG. */ -#if defined(Py_TRACE_REFS) && !defined(Py_REF_DEBUG) -#define Py_REF_DEBUG -#endif - -#ifdef Py_TRACE_REFS -/* Define pointers to support a doubly-linked list of all live heap objects. */ -#define _PyObject_HEAD_EXTRA \ - struct _object *_ob_next; \ - struct _object *_ob_prev; - -#define _PyObject_EXTRA_INIT 0, 0, - -#else -#define _PyObject_HEAD_EXTRA -#define _PyObject_EXTRA_INIT -#endif - -/* PyObject_HEAD defines the initial segment of every PyObject. */ -#define PyObject_HEAD \ - _PyObject_HEAD_EXTRA \ - Py_ssize_t ob_refcnt; \ - struct _typeobject *ob_type; - -#define PyObject_HEAD_INIT(type) \ - _PyObject_EXTRA_INIT \ - 1, type, - -#define PyVarObject_HEAD_INIT(type, size) \ - PyObject_HEAD_INIT(type) size, - -/* PyObject_VAR_HEAD defines the initial segment of all variable-size - * container objects. These end with a declaration of an array with 1 - * element, but enough space is malloc'ed so that the array actually - * has room for ob_size elements. Note that ob_size is an element count, - * not necessarily a byte count. - */ -#define PyObject_VAR_HEAD \ - PyObject_HEAD \ - Py_ssize_t ob_size; /* Number of items in variable part */ -#define Py_INVALID_SIZE (Py_ssize_t)-1 - -/* Nothing is actually declared to be a PyObject, but every pointer to - * a Python object can be cast to a PyObject*. This is inheritance built - * by hand. Similarly every pointer to a variable-size Python object can, - * in addition, be cast to PyVarObject*. - */ -typedef struct _object { - PyObject_HEAD -} PyObject; - -typedef struct { - PyObject_VAR_HEAD -} PyVarObject; - -#define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt) -#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) -#define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size) - -/* -Type objects contain a string containing the type name (to help somewhat -in debugging), the allocation parameters (see PyObject_New() and -PyObject_NewVar()), -and methods for accessing objects of the type. Methods are optional, a -nil pointer meaning that particular kind of access is not available for -this type. The Py_DECREF() macro uses the tp_dealloc method without -checking for a nil pointer; it should always be implemented except if -the implementation can guarantee that the reference count will never -reach zero (e.g., for statically allocated type objects). - -NB: the methods for certain type groups are now contained in separate -method blocks. -*/ - -typedef PyObject * (*unaryfunc)(PyObject *); -typedef PyObject * (*binaryfunc)(PyObject *, PyObject *); -typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *); -typedef int (*inquiry)(PyObject *); -typedef Py_ssize_t (*lenfunc)(PyObject *); -typedef int (*coercion)(PyObject **, PyObject **); -typedef PyObject *(*intargfunc)(PyObject *, int) Py_DEPRECATED(2.5); -typedef PyObject *(*intintargfunc)(PyObject *, int, int) Py_DEPRECATED(2.5); -typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t); -typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t); -typedef int(*intobjargproc)(PyObject *, int, PyObject *); -typedef int(*intintobjargproc)(PyObject *, int, int, PyObject *); -typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *); -typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *); -typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *); - - - -/* int-based buffer interface */ -typedef int (*getreadbufferproc)(PyObject *, int, void **); -typedef int (*getwritebufferproc)(PyObject *, int, void **); -typedef int (*getsegcountproc)(PyObject *, int *); -typedef int (*getcharbufferproc)(PyObject *, int, char **); -/* ssize_t-based buffer interface */ -typedef Py_ssize_t (*readbufferproc)(PyObject *, Py_ssize_t, void **); -typedef Py_ssize_t (*writebufferproc)(PyObject *, Py_ssize_t, void **); -typedef Py_ssize_t (*segcountproc)(PyObject *, Py_ssize_t *); -typedef Py_ssize_t (*charbufferproc)(PyObject *, Py_ssize_t, char **); - - -/* Py3k buffer interface */ -typedef struct bufferinfo { - void *buf; - PyObject *obj; /* owned reference */ - Py_ssize_t len; - Py_ssize_t itemsize; /* This is Py_ssize_t so it can be - pointed to by strides in simple case.*/ - int readonly; - int ndim; - char *format; - Py_ssize_t *shape; - Py_ssize_t *strides; - Py_ssize_t *suboffsets; - Py_ssize_t smalltable[2]; /* static store for shape and strides of - mono-dimensional buffers. */ - void *internal; -} Py_buffer; - -typedef int (*getbufferproc)(PyObject *, Py_buffer *, int); -typedef void (*releasebufferproc)(PyObject *, Py_buffer *); - - /* Flags for getting buffers */ -#define PyBUF_SIMPLE 0 -#define PyBUF_WRITABLE 0x0001 -/* we used to include an E, backwards compatible alias */ -#define PyBUF_WRITEABLE PyBUF_WRITABLE -#define PyBUF_FORMAT 0x0004 -#define PyBUF_ND 0x0008 -#define PyBUF_STRIDES (0x0010 | PyBUF_ND) -#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES) -#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES) -#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES) -#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES) - -#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE) -#define PyBUF_CONTIG_RO (PyBUF_ND) - -#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE) -#define PyBUF_STRIDED_RO (PyBUF_STRIDES) - -#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT) -#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT) - -#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT) -#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT) - - -#define PyBUF_READ 0x100 -#define PyBUF_WRITE 0x200 -#define PyBUF_SHADOW 0x400 -/* end Py3k buffer interface */ - -typedef int (*objobjproc)(PyObject *, PyObject *); -typedef int (*visitproc)(PyObject *, void *); -typedef int (*traverseproc)(PyObject *, visitproc, void *); - -typedef struct { - /* For numbers without flag bit Py_TPFLAGS_CHECKTYPES set, all - arguments are guaranteed to be of the object's type (modulo - coercion hacks -- i.e. if the type's coercion function - returns other types, then these are allowed as well). Numbers that - have the Py_TPFLAGS_CHECKTYPES flag bit set should check *both* - arguments for proper type and implement the necessary conversions - in the slot functions themselves. */ - - binaryfunc nb_add; - binaryfunc nb_subtract; - binaryfunc nb_multiply; - binaryfunc nb_divide; - binaryfunc nb_remainder; - binaryfunc nb_divmod; - ternaryfunc nb_power; - unaryfunc nb_negative; - unaryfunc nb_positive; - unaryfunc nb_absolute; - inquiry nb_nonzero; - unaryfunc nb_invert; - binaryfunc nb_lshift; - binaryfunc nb_rshift; - binaryfunc nb_and; - binaryfunc nb_xor; - binaryfunc nb_or; - coercion nb_coerce; - unaryfunc nb_int; - unaryfunc nb_long; - unaryfunc nb_float; - unaryfunc nb_oct; - unaryfunc nb_hex; - /* Added in release 2.0 */ - binaryfunc nb_inplace_add; - binaryfunc nb_inplace_subtract; - binaryfunc nb_inplace_multiply; - binaryfunc nb_inplace_divide; - binaryfunc nb_inplace_remainder; - ternaryfunc nb_inplace_power; - binaryfunc nb_inplace_lshift; - binaryfunc nb_inplace_rshift; - binaryfunc nb_inplace_and; - binaryfunc nb_inplace_xor; - binaryfunc nb_inplace_or; - - /* Added in release 2.2 */ - /* The following require the Py_TPFLAGS_HAVE_CLASS flag */ - binaryfunc nb_floor_divide; - binaryfunc nb_true_divide; - binaryfunc nb_inplace_floor_divide; - binaryfunc nb_inplace_true_divide; - - /* Added in release 2.5 */ - unaryfunc nb_index; -} PyNumberMethods; - -typedef struct { - lenfunc sq_length; - binaryfunc sq_concat; - ssizeargfunc sq_repeat; - ssizeargfunc sq_item; - ssizessizeargfunc sq_slice; - ssizeobjargproc sq_ass_item; - ssizessizeobjargproc sq_ass_slice; - objobjproc sq_contains; - /* Added in release 2.0 */ - binaryfunc sq_inplace_concat; - ssizeargfunc sq_inplace_repeat; -} PySequenceMethods; - -typedef struct { - lenfunc mp_length; - binaryfunc mp_subscript; - objobjargproc mp_ass_subscript; -} PyMappingMethods; - -typedef struct { - readbufferproc bf_getreadbuffer; - writebufferproc bf_getwritebuffer; - segcountproc bf_getsegcount; - charbufferproc bf_getcharbuffer; - getbufferproc bf_getbuffer; - releasebufferproc bf_releasebuffer; -} PyBufferProcs; - - -typedef void (*freefunc)(void *); -typedef void (*destructor)(PyObject *); -typedef int (*printfunc)(PyObject *, FILE *, int); -typedef PyObject *(*getattrfunc)(PyObject *, char *); -typedef PyObject *(*getattrofunc)(PyObject *, PyObject *); -typedef int (*setattrfunc)(PyObject *, char *, PyObject *); -typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *); -typedef int (*cmpfunc)(PyObject *, PyObject *); -typedef PyObject *(*reprfunc)(PyObject *); -typedef long (*hashfunc)(PyObject *); -typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int); -typedef PyObject *(*getiterfunc) (PyObject *); -typedef PyObject *(*iternextfunc) (PyObject *); -typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *); -typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *); -typedef int (*initproc)(PyObject *, PyObject *, PyObject *); -typedef PyObject *(*newfunc)(struct _typeobject *, PyObject *, PyObject *); -typedef PyObject *(*allocfunc)(struct _typeobject *, Py_ssize_t); - -typedef struct _typeobject { - PyObject_VAR_HEAD - const char *tp_name; /* For printing, in format "." */ - Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */ - - /* Methods to implement standard operations */ - - destructor tp_dealloc; - printfunc tp_print; - getattrfunc tp_getattr; - setattrfunc tp_setattr; - cmpfunc tp_compare; - reprfunc tp_repr; - - /* Method suites for standard classes */ - - PyNumberMethods *tp_as_number; - PySequenceMethods *tp_as_sequence; - PyMappingMethods *tp_as_mapping; - - /* More standard operations (here for binary compatibility) */ - - hashfunc tp_hash; - ternaryfunc tp_call; - reprfunc tp_str; - getattrofunc tp_getattro; - setattrofunc tp_setattro; - - /* Functions to access object as input/output buffer */ - PyBufferProcs *tp_as_buffer; - - /* Flags to define presence of optional/expanded features */ - long tp_flags; - - const char *tp_doc; /* Documentation string */ - - /* Assigned meaning in release 2.0 */ - /* call function for all accessible objects */ - traverseproc tp_traverse; - - /* delete references to contained objects */ - inquiry tp_clear; - - /* Assigned meaning in release 2.1 */ - /* rich comparisons */ - richcmpfunc tp_richcompare; - - /* weak reference enabler */ - Py_ssize_t tp_weaklistoffset; - - /* Added in release 2.2 */ - /* Iterators */ - getiterfunc tp_iter; - iternextfunc tp_iternext; - - /* Attribute descriptor and subclassing stuff */ - struct PyMethodDef *tp_methods; - struct PyMemberDef *tp_members; - struct PyGetSetDef *tp_getset; - struct _typeobject *tp_base; - PyObject *tp_dict; - descrgetfunc tp_descr_get; - descrsetfunc tp_descr_set; - Py_ssize_t tp_dictoffset; - initproc tp_init; - allocfunc tp_alloc; - newfunc tp_new; - freefunc tp_free; /* Low-level free-memory routine */ - inquiry tp_is_gc; /* For PyObject_IS_GC */ - PyObject *tp_bases; - PyObject *tp_mro; /* method resolution order */ - PyObject *tp_cache; - PyObject *tp_subclasses; - PyObject *tp_weaklist; - destructor tp_del; - - /* Type attribute cache version tag. Added in version 2.6 */ - unsigned int tp_version_tag; - -#ifdef COUNT_ALLOCS - /* these must be last and never explicitly initialized */ - Py_ssize_t tp_allocs; - Py_ssize_t tp_frees; - Py_ssize_t tp_maxalloc; - struct _typeobject *tp_prev; - struct _typeobject *tp_next; -#endif -} PyTypeObject; - - -/* The *real* layout of a type object when allocated on the heap */ -typedef struct _heaptypeobject { - /* Note: there's a dependency on the order of these members - in slotptr() in typeobject.c . */ - PyTypeObject ht_type; - PyNumberMethods as_number; - PyMappingMethods as_mapping; - PySequenceMethods as_sequence; /* as_sequence comes after as_mapping, - so that the mapping wins when both - the mapping and the sequence define - a given operator (e.g. __getitem__). - see add_operators() in typeobject.c . */ - PyBufferProcs as_buffer; - PyObject *ht_name, *ht_slots; - /* here are optional user slots, followed by the members. */ -} PyHeapTypeObject; - -/* access macro to the members which are floating "behind" the object */ -#define PyHeapType_GET_MEMBERS(etype) \ - ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize)) - - -/* Generic type check */ -PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *); -#define PyObject_TypeCheck(ob, tp) \ - (Py_TYPE(ob) == (tp) || PyType_IsSubtype(Py_TYPE(ob), (tp))) - -PyAPI_DATA(PyTypeObject) PyType_Type; /* built-in 'type' */ -PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */ -PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */ - -#define PyType_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS) -#define PyType_CheckExact(op) (Py_TYPE(op) == &PyType_Type) - -PyAPI_FUNC(int) PyType_Ready(PyTypeObject *); -PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t); -PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *, - PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *); -PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, char *, PyObject **); -PyAPI_FUNC(unsigned int) PyType_ClearCache(void); -PyAPI_FUNC(void) PyType_Modified(PyTypeObject *); - -/* Generic operations on objects */ -PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int); -PyAPI_FUNC(void) _PyObject_Dump(PyObject *); -PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *); -PyAPI_FUNC(PyObject *) _PyObject_Str(PyObject *); -PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *); -#define PyObject_Bytes PyObject_Str -#ifdef Py_USING_UNICODE -PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *); -#endif -PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int); -PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int); -PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *); -PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *); -PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *); -PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *); -PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *); -PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *); -PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *); -PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *); -PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *); -PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *); -PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *, - PyObject *, PyObject *); -PyAPI_FUNC(long) PyObject_Hash(PyObject *); -PyAPI_FUNC(long) PyObject_HashNotImplemented(PyObject *); -PyAPI_FUNC(int) PyObject_IsTrue(PyObject *); -PyAPI_FUNC(int) PyObject_Not(PyObject *); -PyAPI_FUNC(int) PyCallable_Check(PyObject *); -PyAPI_FUNC(int) PyNumber_Coerce(PyObject **, PyObject **); -PyAPI_FUNC(int) PyNumber_CoerceEx(PyObject **, PyObject **); - -PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *); - -/* A slot function whose address we need to compare */ -extern int _PyObject_SlotCompare(PyObject *, PyObject *); -/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes - dict as the last parameter. */ -PyAPI_FUNC(PyObject *) -_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *); -PyAPI_FUNC(int) -_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *, - PyObject *, PyObject *); - - -/* PyObject_Dir(obj) acts like Python __builtin__.dir(obj), returning a - list of strings. PyObject_Dir(NULL) is like __builtin__.dir(), - returning the names of the current locals. In this case, if there are - no current locals, NULL is returned, and PyErr_Occurred() is false. -*/ -PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *); - - -/* Helpers for printing recursive container types */ -PyAPI_FUNC(int) Py_ReprEnter(PyObject *); -PyAPI_FUNC(void) Py_ReprLeave(PyObject *); - -/* Helpers for hash functions */ -PyAPI_FUNC(long) _Py_HashDouble(double); -PyAPI_FUNC(long) _Py_HashPointer(void*); - -typedef struct { - long prefix; - long suffix; -} _Py_HashSecret_t; -PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret; - -#ifdef Py_DEBUG -PyAPI_DATA(int) _Py_HashSecret_Initialized; -#endif - -/* Helper for passing objects to printf and the like */ -#define PyObject_REPR(obj) PyString_AS_STRING(PyObject_Repr(obj)) - -/* Flag bits for printing: */ -#define Py_PRINT_RAW 1 /* No string quotes etc. */ - -/* -`Type flags (tp_flags) - -These flags are used to extend the type structure in a backwards-compatible -fashion. Extensions can use the flags to indicate (and test) when a given -type structure contains a new feature. The Python core will use these when -introducing new functionality between major revisions (to avoid mid-version -changes in the PYTHON_API_VERSION). - -Arbitration of the flag bit positions will need to be coordinated among -all extension writers who publically release their extensions (this will -be fewer than you might expect!).. - -Python 1.5.2 introduced the bf_getcharbuffer slot into PyBufferProcs. - -Type definitions should use Py_TPFLAGS_DEFAULT for their tp_flags value. - -Code can use PyType_HasFeature(type_ob, flag_value) to test whether the -given type object has a specified feature. - -NOTE: when building the core, Py_TPFLAGS_DEFAULT includes -Py_TPFLAGS_HAVE_VERSION_TAG; outside the core, it doesn't. This is so -that extensions that modify tp_dict of their own types directly don't -break, since this was allowed in 2.5. In 3.0 they will have to -manually remove this flag though! -*/ - -/* PyBufferProcs contains bf_getcharbuffer */ -#define Py_TPFLAGS_HAVE_GETCHARBUFFER (1L<<0) - -/* PySequenceMethods contains sq_contains */ -#define Py_TPFLAGS_HAVE_SEQUENCE_IN (1L<<1) - -/* This is here for backwards compatibility. Extensions that use the old GC - * API will still compile but the objects will not be tracked by the GC. */ -#define Py_TPFLAGS_GC 0 /* used to be (1L<<2) */ - -/* PySequenceMethods and PyNumberMethods contain in-place operators */ -#define Py_TPFLAGS_HAVE_INPLACEOPS (1L<<3) - -/* PyNumberMethods do their own coercion */ -#define Py_TPFLAGS_CHECKTYPES (1L<<4) - -/* tp_richcompare is defined */ -#define Py_TPFLAGS_HAVE_RICHCOMPARE (1L<<5) - -/* Objects which are weakly referencable if their tp_weaklistoffset is >0 */ -#define Py_TPFLAGS_HAVE_WEAKREFS (1L<<6) - -/* tp_iter is defined */ -#define Py_TPFLAGS_HAVE_ITER (1L<<7) - -/* New members introduced by Python 2.2 exist */ -#define Py_TPFLAGS_HAVE_CLASS (1L<<8) - -/* Set if the type object is dynamically allocated */ -#define Py_TPFLAGS_HEAPTYPE (1L<<9) - -/* Set if the type allows subclassing */ -#define Py_TPFLAGS_BASETYPE (1L<<10) - -/* Set if the type is 'ready' -- fully initialized */ -#define Py_TPFLAGS_READY (1L<<12) - -/* Set while the type is being 'readied', to prevent recursive ready calls */ -#define Py_TPFLAGS_READYING (1L<<13) - -/* Objects support garbage collection (see objimp.h) */ -#define Py_TPFLAGS_HAVE_GC (1L<<14) - -/* These two bits are preserved for Stackless Python, next after this is 17 */ -#ifdef STACKLESS -#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3L<<15) -#else -#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0 -#endif - -/* Objects support nb_index in PyNumberMethods */ -#define Py_TPFLAGS_HAVE_INDEX (1L<<17) - -/* Objects support type attribute cache */ -#define Py_TPFLAGS_HAVE_VERSION_TAG (1L<<18) -#define Py_TPFLAGS_VALID_VERSION_TAG (1L<<19) - -/* Type is abstract and cannot be instantiated */ -#define Py_TPFLAGS_IS_ABSTRACT (1L<<20) - -/* Has the new buffer protocol */ -#define Py_TPFLAGS_HAVE_NEWBUFFER (1L<<21) - -/* These flags are used to determine if a type is a subclass. */ -#define Py_TPFLAGS_INT_SUBCLASS (1L<<23) -#define Py_TPFLAGS_LONG_SUBCLASS (1L<<24) -#define Py_TPFLAGS_LIST_SUBCLASS (1L<<25) -#define Py_TPFLAGS_TUPLE_SUBCLASS (1L<<26) -#define Py_TPFLAGS_STRING_SUBCLASS (1L<<27) -#define Py_TPFLAGS_UNICODE_SUBCLASS (1L<<28) -#define Py_TPFLAGS_DICT_SUBCLASS (1L<<29) -#define Py_TPFLAGS_BASE_EXC_SUBCLASS (1L<<30) -#define Py_TPFLAGS_TYPE_SUBCLASS (1L<<31) - -#define Py_TPFLAGS_DEFAULT_EXTERNAL ( \ - Py_TPFLAGS_HAVE_GETCHARBUFFER | \ - Py_TPFLAGS_HAVE_SEQUENCE_IN | \ - Py_TPFLAGS_HAVE_INPLACEOPS | \ - Py_TPFLAGS_HAVE_RICHCOMPARE | \ - Py_TPFLAGS_HAVE_WEAKREFS | \ - Py_TPFLAGS_HAVE_ITER | \ - Py_TPFLAGS_HAVE_CLASS | \ - Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | \ - Py_TPFLAGS_HAVE_INDEX | \ - 0) -#define Py_TPFLAGS_DEFAULT_CORE (Py_TPFLAGS_DEFAULT_EXTERNAL | \ - Py_TPFLAGS_HAVE_VERSION_TAG) - -#ifdef Py_BUILD_CORE -#define Py_TPFLAGS_DEFAULT Py_TPFLAGS_DEFAULT_CORE -#else -#define Py_TPFLAGS_DEFAULT Py_TPFLAGS_DEFAULT_EXTERNAL -#endif - -#define PyType_HasFeature(t,f) (((t)->tp_flags & (f)) != 0) -#define PyType_FastSubclass(t,f) PyType_HasFeature(t,f) - - -/* -The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement -reference counts. Py_DECREF calls the object's deallocator function when -the refcount falls to 0; for -objects that don't contain references to other objects or heap memory -this can be the standard function free(). Both macros can be used -wherever a void expression is allowed. The argument must not be a -NULL pointer. If it may be NULL, use Py_XINCREF/Py_XDECREF instead. -The macro _Py_NewReference(op) initialize reference counts to 1, and -in special builds (Py_REF_DEBUG, Py_TRACE_REFS) performs additional -bookkeeping appropriate to the special build. - -We assume that the reference count field can never overflow; this can -be proven when the size of the field is the same as the pointer size, so -we ignore the possibility. Provided a C int is at least 32 bits (which -is implicitly assumed in many parts of this code), that's enough for -about 2**31 references to an object. - -XXX The following became out of date in Python 2.2, but I'm not sure -XXX what the full truth is now. Certainly, heap-allocated type objects -XXX can and should be deallocated. -Type objects should never be deallocated; the type pointer in an object -is not considered to be a reference to the type object, to save -complications in the deallocation function. (This is actually a -decision that's up to the implementer of each new type so if you want, -you can count such references to the type object.) - -*** WARNING*** The Py_DECREF macro must have a side-effect-free argument -since it may evaluate its argument multiple times. (The alternative -would be to mace it a proper function or assign it to a global temporary -variable first, both of which are slower; and in a multi-threaded -environment the global variable trick is not safe.) -*/ - -/* First define a pile of simple helper macros, one set per special - * build symbol. These either expand to the obvious things, or to - * nothing at all when the special mode isn't in effect. The main - * macros can later be defined just once then, yet expand to different - * things depending on which special build options are and aren't in effect. - * Trust me : while painful, this is 20x easier to understand than, - * e.g, defining _Py_NewReference five different times in a maze of nested - * #ifdefs (we used to do that -- it was impenetrable). - */ -#ifdef Py_REF_DEBUG -PyAPI_DATA(Py_ssize_t) _Py_RefTotal; -PyAPI_FUNC(void) _Py_NegativeRefcount(const char *fname, - int lineno, PyObject *op); -PyAPI_FUNC(PyObject *) _PyDict_Dummy(void); -PyAPI_FUNC(PyObject *) _PySet_Dummy(void); -PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void); -#define _Py_INC_REFTOTAL _Py_RefTotal++ -#define _Py_DEC_REFTOTAL _Py_RefTotal-- -#define _Py_REF_DEBUG_COMMA , -#define _Py_CHECK_REFCNT(OP) \ -{ if (((PyObject*)OP)->ob_refcnt < 0) \ - _Py_NegativeRefcount(__FILE__, __LINE__, \ - (PyObject *)(OP)); \ -} -#else -#define _Py_INC_REFTOTAL -#define _Py_DEC_REFTOTAL -#define _Py_REF_DEBUG_COMMA -#define _Py_CHECK_REFCNT(OP) /* a semicolon */; -#endif /* Py_REF_DEBUG */ - -#ifdef COUNT_ALLOCS -PyAPI_FUNC(void) inc_count(PyTypeObject *); -PyAPI_FUNC(void) dec_count(PyTypeObject *); -#define _Py_INC_TPALLOCS(OP) inc_count(Py_TYPE(OP)) -#define _Py_INC_TPFREES(OP) dec_count(Py_TYPE(OP)) -#define _Py_DEC_TPFREES(OP) Py_TYPE(OP)->tp_frees-- -#define _Py_COUNT_ALLOCS_COMMA , -#else -#define _Py_INC_TPALLOCS(OP) -#define _Py_INC_TPFREES(OP) -#define _Py_DEC_TPFREES(OP) -#define _Py_COUNT_ALLOCS_COMMA -#endif /* COUNT_ALLOCS */ - -#ifdef Py_TRACE_REFS -/* Py_TRACE_REFS is such major surgery that we call external routines. */ -PyAPI_FUNC(void) _Py_NewReference(PyObject *); -PyAPI_FUNC(void) _Py_ForgetReference(PyObject *); -PyAPI_FUNC(void) _Py_Dealloc(PyObject *); -PyAPI_FUNC(void) _Py_PrintReferences(FILE *); -PyAPI_FUNC(void) _Py_PrintReferenceAddresses(FILE *); -PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force); - -#else -/* Without Py_TRACE_REFS, there's little enough to do that we expand code - * inline. - */ -#define _Py_NewReference(op) ( \ - _Py_INC_TPALLOCS(op) _Py_COUNT_ALLOCS_COMMA \ - _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA \ - Py_REFCNT(op) = 1) - -#define _Py_ForgetReference(op) _Py_INC_TPFREES(op) - -#define _Py_Dealloc(op) ( \ - _Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA \ - (*Py_TYPE(op)->tp_dealloc)((PyObject *)(op))) -#endif /* !Py_TRACE_REFS */ - -#define Py_INCREF(op) ( \ - _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA \ - ((PyObject*)(op))->ob_refcnt++) - -#define Py_DECREF(op) \ - do { \ - if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \ - --((PyObject*)(op))->ob_refcnt != 0) \ - _Py_CHECK_REFCNT(op) \ - else \ - _Py_Dealloc((PyObject *)(op)); \ - } while (0) - -/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear - * and tp_dealloc implementatons. - * - * Note that "the obvious" code can be deadly: - * - * Py_XDECREF(op); - * op = NULL; - * - * Typically, `op` is something like self->containee, and `self` is done - * using its `containee` member. In the code sequence above, suppose - * `containee` is non-NULL with a refcount of 1. Its refcount falls to - * 0 on the first line, which can trigger an arbitrary amount of code, - * possibly including finalizers (like __del__ methods or weakref callbacks) - * coded in Python, which in turn can release the GIL and allow other threads - * to run, etc. Such code may even invoke methods of `self` again, or cause - * cyclic gc to trigger, but-- oops! --self->containee still points to the - * object being torn down, and it may be in an insane state while being torn - * down. This has in fact been a rich historic source of miserable (rare & - * hard-to-diagnose) segfaulting (and other) bugs. - * - * The safe way is: - * - * Py_CLEAR(op); - * - * That arranges to set `op` to NULL _before_ decref'ing, so that any code - * triggered as a side-effect of `op` getting torn down no longer believes - * `op` points to a valid object. - * - * There are cases where it's safe to use the naive code, but they're brittle. - * For example, if `op` points to a Python integer, you know that destroying - * one of those can't cause problems -- but in part that relies on that - * Python integers aren't currently weakly referencable. Best practice is - * to use Py_CLEAR() even if you can't think of a reason for why you need to. - */ -#define Py_CLEAR(op) \ - do { \ - if (op) { \ - PyObject *_py_tmp = (PyObject *)(op); \ - (op) = NULL; \ - Py_DECREF(_py_tmp); \ - } \ - } while (0) - -/* Macros to use in case the object pointer may be NULL: */ -#define Py_XINCREF(op) do { if ((op) == NULL) ; else Py_INCREF(op); } while (0) -#define Py_XDECREF(op) do { if ((op) == NULL) ; else Py_DECREF(op); } while (0) - -/* -These are provided as conveniences to Python runtime embedders, so that -they can have object code that is not dependent on Python compilation flags. -*/ -PyAPI_FUNC(void) Py_IncRef(PyObject *); -PyAPI_FUNC(void) Py_DecRef(PyObject *); - -/* -_Py_NoneStruct is an object of undefined type which can be used in contexts -where NULL (nil) is not suitable (since NULL often means 'error'). - -Don't forget to apply Py_INCREF() when returning this value!!! -*/ -PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */ -#define Py_None (&_Py_NoneStruct) - -/* Macro for returning Py_None from a function */ -#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None - -/* -Py_NotImplemented is a singleton used to signal that an operation is -not implemented for a given type combination. -*/ -PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */ -#define Py_NotImplemented (&_Py_NotImplementedStruct) - -/* Rich comparison opcodes */ -#define Py_LT 0 -#define Py_LE 1 -#define Py_EQ 2 -#define Py_NE 3 -#define Py_GT 4 -#define Py_GE 5 - -/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE. - * Defined in object.c. - */ -PyAPI_DATA(int) _Py_SwappedOp[]; - -/* -Define staticforward and statichere for source compatibility with old -C extensions. - -The staticforward define was needed to support certain broken C -compilers (notably SCO ODT 3.0, perhaps early AIX as well) botched the -static keyword when it was used with a forward declaration of a static -initialized structure. Standard C allows the forward declaration with -static, and we've decided to stop catering to broken C compilers. -(In fact, we expect that the compilers are all fixed eight years later.) -*/ - -#define staticforward static -#define statichere static - - -/* -More conventions -================ - -Argument Checking ------------------ - -Functions that take objects as arguments normally don't check for nil -arguments, but they do check the type of the argument, and return an -error if the function doesn't apply to the type. - -Failure Modes -------------- - -Functions may fail for a variety of reasons, including running out of -memory. This is communicated to the caller in two ways: an error string -is set (see errors.h), and the function result differs: functions that -normally return a pointer return NULL for failure, functions returning -an integer return -1 (which could be a legal return value too!), and -other functions return 0 for success and -1 for failure. -Callers should always check for errors before using the result. If -an error was set, the caller must either explicitly clear it, or pass -the error on to its caller. - -Reference Counts ----------------- - -It takes a while to get used to the proper usage of reference counts. - -Functions that create an object set the reference count to 1; such new -objects must be stored somewhere or destroyed again with Py_DECREF(). -Some functions that 'store' objects, such as PyTuple_SetItem() and -PyList_SetItem(), -don't increment the reference count of the object, since the most -frequent use is to store a fresh object. Functions that 'retrieve' -objects, such as PyTuple_GetItem() and PyDict_GetItemString(), also -don't increment -the reference count, since most frequently the object is only looked at -quickly. Thus, to retrieve an object and store it again, the caller -must call Py_INCREF() explicitly. - -NOTE: functions that 'consume' a reference count, like -PyList_SetItem(), consume the reference even if the object wasn't -successfully stored, to simplify error handling. - -It seems attractive to make other functions that take an object as -argument consume a reference count; however, this may quickly get -confusing (even the current practice is already confusing). Consider -it carefully, it may save lots of calls to Py_INCREF() and Py_DECREF() at -times. -*/ - - -/* Trashcan mechanism, thanks to Christian Tismer. - -When deallocating a container object, it's possible to trigger an unbounded -chain of deallocations, as each Py_DECREF in turn drops the refcount on "the -next" object in the chain to 0. This can easily lead to stack faults, and -especially in threads (which typically have less stack space to work with). - -A container object that participates in cyclic gc can avoid this by -bracketing the body of its tp_dealloc function with a pair of macros: - -static void -mytype_dealloc(mytype *p) -{ - ... declarations go here ... - - PyObject_GC_UnTrack(p); // must untrack first - Py_TRASHCAN_SAFE_BEGIN(p) - ... The body of the deallocator goes here, including all calls ... - ... to Py_DECREF on contained objects. ... - Py_TRASHCAN_SAFE_END(p) -} - -CAUTION: Never return from the middle of the body! If the body needs to -"get out early", put a label immediately before the Py_TRASHCAN_SAFE_END -call, and goto it. Else the call-depth counter (see below) will stay -above 0 forever, and the trashcan will never get emptied. - -How it works: The BEGIN macro increments a call-depth counter. So long -as this counter is small, the body of the deallocator is run directly without -further ado. But if the counter gets large, it instead adds p to a list of -objects to be deallocated later, skips the body of the deallocator, and -resumes execution after the END macro. The tp_dealloc routine then returns -without deallocating anything (and so unbounded call-stack depth is avoided). - -When the call stack finishes unwinding again, code generated by the END macro -notices this, and calls another routine to deallocate all the objects that -may have been added to the list of deferred deallocations. In effect, a -chain of N deallocations is broken into N / PyTrash_UNWIND_LEVEL pieces, -with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL. -*/ - -PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*); -PyAPI_FUNC(void) _PyTrash_destroy_chain(void); -PyAPI_DATA(int) _PyTrash_delete_nesting; -PyAPI_DATA(PyObject *) _PyTrash_delete_later; - -#define PyTrash_UNWIND_LEVEL 50 - -#define Py_TRASHCAN_SAFE_BEGIN(op) \ - if (_PyTrash_delete_nesting < PyTrash_UNWIND_LEVEL) { \ - ++_PyTrash_delete_nesting; - /* The body of the deallocator is here. */ -#define Py_TRASHCAN_SAFE_END(op) \ - --_PyTrash_delete_nesting; \ - if (_PyTrash_delete_later && _PyTrash_delete_nesting <= 0) \ - _PyTrash_destroy_chain(); \ - } \ - else \ - _PyTrash_deposit_object((PyObject*)op); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_OBJECT_H */ diff --git a/python/include/objimpl.h b/python/include/objimpl.h deleted file mode 100644 index 55e83ece..00000000 --- a/python/include/objimpl.h +++ /dev/null @@ -1,354 +0,0 @@ -/* The PyObject_ memory family: high-level object memory interfaces. - See pymem.h for the low-level PyMem_ family. -*/ - -#ifndef Py_OBJIMPL_H -#define Py_OBJIMPL_H - -#include "pymem.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* BEWARE: - - Each interface exports both functions and macros. Extension modules should - use the functions, to ensure binary compatibility across Python versions. - Because the Python implementation is free to change internal details, and - the macros may (or may not) expose details for speed, if you do use the - macros you must recompile your extensions with each Python release. - - Never mix calls to PyObject_ memory functions with calls to the platform - malloc/realloc/ calloc/free, or with calls to PyMem_. -*/ - -/* -Functions and macros for modules that implement new object types. - - - PyObject_New(type, typeobj) allocates memory for a new object of the given - type, and initializes part of it. 'type' must be the C structure type used - to represent the object, and 'typeobj' the address of the corresponding - type object. Reference count and type pointer are filled in; the rest of - the bytes of the object are *undefined*! The resulting expression type is - 'type *'. The size of the object is determined by the tp_basicsize field - of the type object. - - - PyObject_NewVar(type, typeobj, n) is similar but allocates a variable-size - object with room for n items. In addition to the refcount and type pointer - fields, this also fills in the ob_size field. - - - PyObject_Del(op) releases the memory allocated for an object. It does not - run a destructor -- it only frees the memory. PyObject_Free is identical. - - - PyObject_Init(op, typeobj) and PyObject_InitVar(op, typeobj, n) don't - allocate memory. Instead of a 'type' parameter, they take a pointer to a - new object (allocated by an arbitrary allocator), and initialize its object - header fields. - -Note that objects created with PyObject_{New, NewVar} are allocated using the -specialized Python allocator (implemented in obmalloc.c), if WITH_PYMALLOC is -enabled. In addition, a special debugging allocator is used if PYMALLOC_DEBUG -is also #defined. - -In case a specific form of memory management is needed (for example, if you -must use the platform malloc heap(s), or shared memory, or C++ local storage or -operator new), you must first allocate the object with your custom allocator, -then pass its pointer to PyObject_{Init, InitVar} for filling in its Python- -specific fields: reference count, type pointer, possibly others. You should -be aware that Python no control over these objects because they don't -cooperate with the Python memory manager. Such objects may not be eligible -for automatic garbage collection and you have to make sure that they are -released accordingly whenever their destructor gets called (cf. the specific -form of memory management you're using). - -Unless you have specific memory management requirements, use -PyObject_{New, NewVar, Del}. -*/ - -/* - * Raw object memory interface - * =========================== - */ - -/* Functions to call the same malloc/realloc/free as used by Python's - object allocator. If WITH_PYMALLOC is enabled, these may differ from - the platform malloc/realloc/free. The Python object allocator is - designed for fast, cache-conscious allocation of many "small" objects, - and with low hidden memory overhead. - - PyObject_Malloc(0) returns a unique non-NULL pointer if possible. - - PyObject_Realloc(NULL, n) acts like PyObject_Malloc(n). - PyObject_Realloc(p != NULL, 0) does not return NULL, or free the memory - at p. - - Returned pointers must be checked for NULL explicitly; no action is - performed on failure other than to return NULL (no warning it printed, no - exception is set, etc). - - For allocating objects, use PyObject_{New, NewVar} instead whenever - possible. The PyObject_{Malloc, Realloc, Free} family is exposed - so that you can exploit Python's small-block allocator for non-object - uses. If you must use these routines to allocate object memory, make sure - the object gets initialized via PyObject_{Init, InitVar} after obtaining - the raw memory. -*/ -PyAPI_FUNC(void *) PyObject_Malloc(size_t); -PyAPI_FUNC(void *) PyObject_Realloc(void *, size_t); -PyAPI_FUNC(void) PyObject_Free(void *); - - -/* Macros */ -#ifdef WITH_PYMALLOC -#ifdef PYMALLOC_DEBUG /* WITH_PYMALLOC && PYMALLOC_DEBUG */ -PyAPI_FUNC(void *) _PyObject_DebugMalloc(size_t nbytes); -PyAPI_FUNC(void *) _PyObject_DebugRealloc(void *p, size_t nbytes); -PyAPI_FUNC(void) _PyObject_DebugFree(void *p); -PyAPI_FUNC(void) _PyObject_DebugDumpAddress(const void *p); -PyAPI_FUNC(void) _PyObject_DebugCheckAddress(const void *p); -PyAPI_FUNC(void) _PyObject_DebugMallocStats(void); -PyAPI_FUNC(void *) _PyObject_DebugMallocApi(char api, size_t nbytes); -PyAPI_FUNC(void *) _PyObject_DebugReallocApi(char api, void *p, size_t nbytes); -PyAPI_FUNC(void) _PyObject_DebugFreeApi(char api, void *p); -PyAPI_FUNC(void) _PyObject_DebugCheckAddressApi(char api, const void *p); -PyAPI_FUNC(void *) _PyMem_DebugMalloc(size_t nbytes); -PyAPI_FUNC(void *) _PyMem_DebugRealloc(void *p, size_t nbytes); -PyAPI_FUNC(void) _PyMem_DebugFree(void *p); -#define PyObject_MALLOC _PyObject_DebugMalloc -#define PyObject_Malloc _PyObject_DebugMalloc -#define PyObject_REALLOC _PyObject_DebugRealloc -#define PyObject_Realloc _PyObject_DebugRealloc -#define PyObject_FREE _PyObject_DebugFree -#define PyObject_Free _PyObject_DebugFree - -#else /* WITH_PYMALLOC && ! PYMALLOC_DEBUG */ -#define PyObject_MALLOC PyObject_Malloc -#define PyObject_REALLOC PyObject_Realloc -#define PyObject_FREE PyObject_Free -#endif - -#else /* ! WITH_PYMALLOC */ -#define PyObject_MALLOC PyMem_MALLOC -#define PyObject_REALLOC PyMem_REALLOC -#define PyObject_FREE PyMem_FREE - -#endif /* WITH_PYMALLOC */ - -#define PyObject_Del PyObject_Free -#define PyObject_DEL PyObject_FREE - -/* for source compatibility with 2.2 */ -#define _PyObject_Del PyObject_Free - -/* - * Generic object allocator interface - * ================================== - */ - -/* Functions */ -PyAPI_FUNC(PyObject *) PyObject_Init(PyObject *, PyTypeObject *); -PyAPI_FUNC(PyVarObject *) PyObject_InitVar(PyVarObject *, - PyTypeObject *, Py_ssize_t); -PyAPI_FUNC(PyObject *) _PyObject_New(PyTypeObject *); -PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t); - -#define PyObject_New(type, typeobj) \ - ( (type *) _PyObject_New(typeobj) ) -#define PyObject_NewVar(type, typeobj, n) \ - ( (type *) _PyObject_NewVar((typeobj), (n)) ) - -/* Macros trading binary compatibility for speed. See also pymem.h. - Note that these macros expect non-NULL object pointers.*/ -#define PyObject_INIT(op, typeobj) \ - ( Py_TYPE(op) = (typeobj), _Py_NewReference((PyObject *)(op)), (op) ) -#define PyObject_INIT_VAR(op, typeobj, size) \ - ( Py_SIZE(op) = (size), PyObject_INIT((op), (typeobj)) ) - -#define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize ) - -/* _PyObject_VAR_SIZE returns the number of bytes (as size_t) allocated for a - vrbl-size object with nitems items, exclusive of gc overhead (if any). The - value is rounded up to the closest multiple of sizeof(void *), in order to - ensure that pointer fields at the end of the object are correctly aligned - for the platform (this is of special importance for subclasses of, e.g., - str or long, so that pointers can be stored after the embedded data). - - Note that there's no memory wastage in doing this, as malloc has to - return (at worst) pointer-aligned memory anyway. -*/ -#if ((SIZEOF_VOID_P - 1) & SIZEOF_VOID_P) != 0 -# error "_PyObject_VAR_SIZE requires SIZEOF_VOID_P be a power of 2" -#endif - -#define _PyObject_VAR_SIZE(typeobj, nitems) \ - (size_t) \ - ( ( (typeobj)->tp_basicsize + \ - (nitems)*(typeobj)->tp_itemsize + \ - (SIZEOF_VOID_P - 1) \ - ) & ~(SIZEOF_VOID_P - 1) \ - ) - -#define PyObject_NEW(type, typeobj) \ -( (type *) PyObject_Init( \ - (PyObject *) PyObject_MALLOC( _PyObject_SIZE(typeobj) ), (typeobj)) ) - -#define PyObject_NEW_VAR(type, typeobj, n) \ -( (type *) PyObject_InitVar( \ - (PyVarObject *) PyObject_MALLOC(_PyObject_VAR_SIZE((typeobj),(n)) ),\ - (typeobj), (n)) ) - -/* This example code implements an object constructor with a custom - allocator, where PyObject_New is inlined, and shows the important - distinction between two steps (at least): - 1) the actual allocation of the object storage; - 2) the initialization of the Python specific fields - in this storage with PyObject_{Init, InitVar}. - - PyObject * - YourObject_New(...) - { - PyObject *op; - - op = (PyObject *) Your_Allocator(_PyObject_SIZE(YourTypeStruct)); - if (op == NULL) - return PyErr_NoMemory(); - - PyObject_Init(op, &YourTypeStruct); - - op->ob_field = value; - ... - return op; - } - - Note that in C++, the use of the new operator usually implies that - the 1st step is performed automatically for you, so in a C++ class - constructor you would start directly with PyObject_Init/InitVar -*/ - -/* - * Garbage Collection Support - * ========================== - */ - -/* C equivalent of gc.collect(). */ -PyAPI_FUNC(Py_ssize_t) PyGC_Collect(void); - -/* Test if a type has a GC head */ -#define PyType_IS_GC(t) PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC) - -/* Test if an object has a GC head */ -#define PyObject_IS_GC(o) (PyType_IS_GC(Py_TYPE(o)) && \ - (Py_TYPE(o)->tp_is_gc == NULL || Py_TYPE(o)->tp_is_gc(o))) - -PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); -#define PyObject_GC_Resize(type, op, n) \ - ( (type *) _PyObject_GC_Resize((PyVarObject *)(op), (n)) ) - -/* for source compatibility with 2.2 */ -#define _PyObject_GC_Del PyObject_GC_Del - -/* GC information is stored BEFORE the object structure. */ -typedef union _gc_head { - struct { - union _gc_head *gc_next; - union _gc_head *gc_prev; - Py_ssize_t gc_refs; - } gc; - long double dummy; /* force worst-case alignment */ -} PyGC_Head; - -extern PyGC_Head *_PyGC_generation0; - -#define _Py_AS_GC(o) ((PyGC_Head *)(o)-1) - -#define _PyGC_REFS_UNTRACKED (-2) -#define _PyGC_REFS_REACHABLE (-3) -#define _PyGC_REFS_TENTATIVELY_UNREACHABLE (-4) - -/* Tell the GC to track this object. NB: While the object is tracked the - * collector it must be safe to call the ob_traverse method. */ -#define _PyObject_GC_TRACK(o) do { \ - PyGC_Head *g = _Py_AS_GC(o); \ - if (g->gc.gc_refs != _PyGC_REFS_UNTRACKED) \ - Py_FatalError("GC object already tracked"); \ - g->gc.gc_refs = _PyGC_REFS_REACHABLE; \ - g->gc.gc_next = _PyGC_generation0; \ - g->gc.gc_prev = _PyGC_generation0->gc.gc_prev; \ - g->gc.gc_prev->gc.gc_next = g; \ - _PyGC_generation0->gc.gc_prev = g; \ - } while (0); - -/* Tell the GC to stop tracking this object. - * gc_next doesn't need to be set to NULL, but doing so is a good - * way to provoke memory errors if calling code is confused. - */ -#define _PyObject_GC_UNTRACK(o) do { \ - PyGC_Head *g = _Py_AS_GC(o); \ - assert(g->gc.gc_refs != _PyGC_REFS_UNTRACKED); \ - g->gc.gc_refs = _PyGC_REFS_UNTRACKED; \ - g->gc.gc_prev->gc.gc_next = g->gc.gc_next; \ - g->gc.gc_next->gc.gc_prev = g->gc.gc_prev; \ - g->gc.gc_next = NULL; \ - } while (0); - -/* True if the object is currently tracked by the GC. */ -#define _PyObject_GC_IS_TRACKED(o) \ - ((_Py_AS_GC(o))->gc.gc_refs != _PyGC_REFS_UNTRACKED) - -/* True if the object may be tracked by the GC in the future, or already is. - This can be useful to implement some optimizations. */ -#define _PyObject_GC_MAY_BE_TRACKED(obj) \ - (PyObject_IS_GC(obj) && \ - (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj))) - - -PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t); -PyAPI_FUNC(PyObject *) _PyObject_GC_New(PyTypeObject *); -PyAPI_FUNC(PyVarObject *) _PyObject_GC_NewVar(PyTypeObject *, Py_ssize_t); -PyAPI_FUNC(void) PyObject_GC_Track(void *); -PyAPI_FUNC(void) PyObject_GC_UnTrack(void *); -PyAPI_FUNC(void) PyObject_GC_Del(void *); - -#define PyObject_GC_New(type, typeobj) \ - ( (type *) _PyObject_GC_New(typeobj) ) -#define PyObject_GC_NewVar(type, typeobj, n) \ - ( (type *) _PyObject_GC_NewVar((typeobj), (n)) ) - - -/* Utility macro to help write tp_traverse functions. - * To use this macro, the tp_traverse function must name its arguments - * "visit" and "arg". This is intended to keep tp_traverse functions - * looking as much alike as possible. - */ -#define Py_VISIT(op) \ - do { \ - if (op) { \ - int vret = visit((PyObject *)(op), arg); \ - if (vret) \ - return vret; \ - } \ - } while (0) - -/* This is here for the sake of backwards compatibility. Extensions that - * use the old GC API will still compile but the objects will not be - * tracked by the GC. */ -#define PyGC_HEAD_SIZE 0 -#define PyObject_GC_Init(op) -#define PyObject_GC_Fini(op) -#define PyObject_AS_GC(op) (op) -#define PyObject_FROM_GC(op) (op) - - -/* Test if a type supports weak references */ -#define PyType_SUPPORTS_WEAKREFS(t) \ - (PyType_HasFeature((t), Py_TPFLAGS_HAVE_WEAKREFS) \ - && ((t)->tp_weaklistoffset > 0)) - -#define PyObject_GET_WEAKREFS_LISTPTR(o) \ - ((PyObject **) (((char *) (o)) + Py_TYPE(o)->tp_weaklistoffset)) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_OBJIMPL_H */ diff --git a/python/include/opcode.h b/python/include/opcode.h deleted file mode 100644 index 9764109a..00000000 --- a/python/include/opcode.h +++ /dev/null @@ -1,162 +0,0 @@ -#ifndef Py_OPCODE_H -#define Py_OPCODE_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Instruction opcodes for compiled code */ - -#define STOP_CODE 0 -#define POP_TOP 1 -#define ROT_TWO 2 -#define ROT_THREE 3 -#define DUP_TOP 4 -#define ROT_FOUR 5 -#define NOP 9 - -#define UNARY_POSITIVE 10 -#define UNARY_NEGATIVE 11 -#define UNARY_NOT 12 -#define UNARY_CONVERT 13 - -#define UNARY_INVERT 15 - -#define BINARY_POWER 19 - -#define BINARY_MULTIPLY 20 -#define BINARY_DIVIDE 21 -#define BINARY_MODULO 22 -#define BINARY_ADD 23 -#define BINARY_SUBTRACT 24 -#define BINARY_SUBSCR 25 -#define BINARY_FLOOR_DIVIDE 26 -#define BINARY_TRUE_DIVIDE 27 -#define INPLACE_FLOOR_DIVIDE 28 -#define INPLACE_TRUE_DIVIDE 29 - -#define SLICE 30 -/* Also uses 31-33 */ - -#define STORE_SLICE 40 -/* Also uses 41-43 */ - -#define DELETE_SLICE 50 -/* Also uses 51-53 */ - -#define STORE_MAP 54 -#define INPLACE_ADD 55 -#define INPLACE_SUBTRACT 56 -#define INPLACE_MULTIPLY 57 -#define INPLACE_DIVIDE 58 -#define INPLACE_MODULO 59 -#define STORE_SUBSCR 60 -#define DELETE_SUBSCR 61 - -#define BINARY_LSHIFT 62 -#define BINARY_RSHIFT 63 -#define BINARY_AND 64 -#define BINARY_XOR 65 -#define BINARY_OR 66 -#define INPLACE_POWER 67 -#define GET_ITER 68 - -#define PRINT_EXPR 70 -#define PRINT_ITEM 71 -#define PRINT_NEWLINE 72 -#define PRINT_ITEM_TO 73 -#define PRINT_NEWLINE_TO 74 -#define INPLACE_LSHIFT 75 -#define INPLACE_RSHIFT 76 -#define INPLACE_AND 77 -#define INPLACE_XOR 78 -#define INPLACE_OR 79 -#define BREAK_LOOP 80 -#define WITH_CLEANUP 81 -#define LOAD_LOCALS 82 -#define RETURN_VALUE 83 -#define IMPORT_STAR 84 -#define EXEC_STMT 85 -#define YIELD_VALUE 86 -#define POP_BLOCK 87 -#define END_FINALLY 88 -#define BUILD_CLASS 89 - -#define HAVE_ARGUMENT 90 /* Opcodes from here have an argument: */ - -#define STORE_NAME 90 /* Index in name list */ -#define DELETE_NAME 91 /* "" */ -#define UNPACK_SEQUENCE 92 /* Number of sequence items */ -#define FOR_ITER 93 -#define LIST_APPEND 94 - -#define STORE_ATTR 95 /* Index in name list */ -#define DELETE_ATTR 96 /* "" */ -#define STORE_GLOBAL 97 /* "" */ -#define DELETE_GLOBAL 98 /* "" */ -#define DUP_TOPX 99 /* number of items to duplicate */ -#define LOAD_CONST 100 /* Index in const list */ -#define LOAD_NAME 101 /* Index in name list */ -#define BUILD_TUPLE 102 /* Number of tuple items */ -#define BUILD_LIST 103 /* Number of list items */ -#define BUILD_SET 104 /* Number of set items */ -#define BUILD_MAP 105 /* Always zero for now */ -#define LOAD_ATTR 106 /* Index in name list */ -#define COMPARE_OP 107 /* Comparison operator */ -#define IMPORT_NAME 108 /* Index in name list */ -#define IMPORT_FROM 109 /* Index in name list */ -#define JUMP_FORWARD 110 /* Number of bytes to skip */ - -#define JUMP_IF_FALSE_OR_POP 111 /* Target byte offset from beginning - of code */ -#define JUMP_IF_TRUE_OR_POP 112 /* "" */ -#define JUMP_ABSOLUTE 113 /* "" */ -#define POP_JUMP_IF_FALSE 114 /* "" */ -#define POP_JUMP_IF_TRUE 115 /* "" */ - -#define LOAD_GLOBAL 116 /* Index in name list */ - -#define CONTINUE_LOOP 119 /* Start of loop (absolute) */ -#define SETUP_LOOP 120 /* Target address (relative) */ -#define SETUP_EXCEPT 121 /* "" */ -#define SETUP_FINALLY 122 /* "" */ - -#define LOAD_FAST 124 /* Local variable number */ -#define STORE_FAST 125 /* Local variable number */ -#define DELETE_FAST 126 /* Local variable number */ - -#define RAISE_VARARGS 130 /* Number of raise arguments (1, 2 or 3) */ -/* CALL_FUNCTION_XXX opcodes defined below depend on this definition */ -#define CALL_FUNCTION 131 /* #args + (#kwargs<<8) */ -#define MAKE_FUNCTION 132 /* #defaults */ -#define BUILD_SLICE 133 /* Number of items */ - -#define MAKE_CLOSURE 134 /* #free vars */ -#define LOAD_CLOSURE 135 /* Load free variable from closure */ -#define LOAD_DEREF 136 /* Load and dereference from closure cell */ -#define STORE_DEREF 137 /* Store into cell */ - -/* The next 3 opcodes must be contiguous and satisfy - (CALL_FUNCTION_VAR - CALL_FUNCTION) & 3 == 1 */ -#define CALL_FUNCTION_VAR 140 /* #args + (#kwargs<<8) */ -#define CALL_FUNCTION_KW 141 /* #args + (#kwargs<<8) */ -#define CALL_FUNCTION_VAR_KW 142 /* #args + (#kwargs<<8) */ - -#define SETUP_WITH 143 - -/* Support for opargs more than 16 bits long */ -#define EXTENDED_ARG 145 - -#define SET_ADD 146 -#define MAP_ADD 147 - - -enum cmp_op {PyCmp_LT=Py_LT, PyCmp_LE=Py_LE, PyCmp_EQ=Py_EQ, PyCmp_NE=Py_NE, PyCmp_GT=Py_GT, PyCmp_GE=Py_GE, - PyCmp_IN, PyCmp_NOT_IN, PyCmp_IS, PyCmp_IS_NOT, PyCmp_EXC_MATCH, PyCmp_BAD}; - -#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_OPCODE_H */ diff --git a/python/include/osdefs.h b/python/include/osdefs.h deleted file mode 100644 index 69376593..00000000 --- a/python/include/osdefs.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef Py_OSDEFS_H -#define Py_OSDEFS_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Operating system dependencies */ - -/* Mod by chrish: QNX has WATCOM, but isn't DOS */ -#if !defined(__QNX__) -#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2) -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#define MAXPATHLEN 260 -#define SEP '/' -#define ALTSEP '\\' -#else -#define SEP '\\' -#define ALTSEP '/' -#define MAXPATHLEN 256 -#endif -#define DELIM ';' -#endif -#endif - -#ifdef RISCOS -#define SEP '.' -#define MAXPATHLEN 256 -#define DELIM ',' -#endif - - -/* Filename separator */ -#ifndef SEP -#define SEP '/' -#endif - -/* Max pathname length */ -#ifndef MAXPATHLEN -#if defined(PATH_MAX) && PATH_MAX > 1024 -#define MAXPATHLEN PATH_MAX -#else -#define MAXPATHLEN 1024 -#endif -#endif - -/* Search path entry delimiter */ -#ifndef DELIM -#define DELIM ':' -#endif - -#ifdef __cplusplus -} -#endif -#endif /* !Py_OSDEFS_H */ diff --git a/python/include/parsetok.h b/python/include/parsetok.h deleted file mode 100644 index ec1eb6ff..00000000 --- a/python/include/parsetok.h +++ /dev/null @@ -1,64 +0,0 @@ - -/* Parser-tokenizer link interface */ - -#ifndef Py_PARSETOK_H -#define Py_PARSETOK_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - int error; - const char *filename; - int lineno; - int offset; - char *text; - int token; - int expected; -} perrdetail; - -#if 0 -#define PyPARSE_YIELD_IS_KEYWORD 0x0001 -#endif - -#define PyPARSE_DONT_IMPLY_DEDENT 0x0002 - -#if 0 -#define PyPARSE_WITH_IS_KEYWORD 0x0003 -#endif - -#define PyPARSE_PRINT_IS_FUNCTION 0x0004 -#define PyPARSE_UNICODE_LITERALS 0x0008 - - - -PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int, - perrdetail *); -PyAPI_FUNC(node *) PyParser_ParseFile (FILE *, const char *, grammar *, int, - char *, char *, perrdetail *); - -PyAPI_FUNC(node *) PyParser_ParseStringFlags(const char *, grammar *, int, - perrdetail *, int); -PyAPI_FUNC(node *) PyParser_ParseFileFlags(FILE *, const char *, grammar *, - int, char *, char *, - perrdetail *, int); -PyAPI_FUNC(node *) PyParser_ParseFileFlagsEx(FILE *, const char *, grammar *, - int, char *, char *, - perrdetail *, int *); - -PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(const char *, - const char *, - grammar *, int, - perrdetail *, int); -PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilenameEx(const char *, - const char *, - grammar *, int, - perrdetail *, int *); - -/* Note that he following function is defined in pythonrun.c not parsetok.c. */ -PyAPI_FUNC(void) PyParser_SetError(perrdetail *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PARSETOK_H */ diff --git a/python/include/patchlevel.h b/python/include/patchlevel.h deleted file mode 100644 index 0a05696c..00000000 --- a/python/include/patchlevel.h +++ /dev/null @@ -1,43 +0,0 @@ - -/* Newfangled version identification scheme. - - This scheme was added in Python 1.5.2b2; before that time, only PATCHLEVEL - was available. To test for presence of the scheme, test for - defined(PY_MAJOR_VERSION). - - When the major or minor version changes, the VERSION variable in - configure.in must also be changed. - - There is also (independent) API version information in modsupport.h. -*/ - -/* Values for PY_RELEASE_LEVEL */ -#define PY_RELEASE_LEVEL_ALPHA 0xA -#define PY_RELEASE_LEVEL_BETA 0xB -#define PY_RELEASE_LEVEL_GAMMA 0xC /* For release candidates */ -#define PY_RELEASE_LEVEL_FINAL 0xF /* Serial should be 0 here */ - /* Higher for patch releases */ - -/* Version parsed out into numeric values */ -/*--start constants--*/ -#define PY_MAJOR_VERSION 2 -#define PY_MINOR_VERSION 7 -#define PY_MICRO_VERSION 3 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL -#define PY_RELEASE_SERIAL 0 - -/* Version as a string */ -#define PY_VERSION "2.7.3" -/*--end constants--*/ - -/* Subversion Revision number of this file (not of the repository). Empty - since Mercurial migration. */ -#define PY_PATCHLEVEL_REVISION "" - -/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. - Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */ -#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \ - (PY_MINOR_VERSION << 16) | \ - (PY_MICRO_VERSION << 8) | \ - (PY_RELEASE_LEVEL << 4) | \ - (PY_RELEASE_SERIAL << 0)) diff --git a/python/include/pgen.h b/python/include/pgen.h deleted file mode 100644 index 8a325ed0..00000000 --- a/python/include/pgen.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef Py_PGEN_H -#define Py_PGEN_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Parser generator interface */ - -extern grammar *meta_grammar(void); - -struct _node; -extern grammar *pgen(struct _node *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PGEN_H */ diff --git a/python/include/pgenheaders.h b/python/include/pgenheaders.h deleted file mode 100644 index 2049ae32..00000000 --- a/python/include/pgenheaders.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef Py_PGENHEADERS_H -#define Py_PGENHEADERS_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Include files and extern declarations used by most of the parser. */ - -#include "Python.h" - -PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); -PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); - -#define addarc _Py_addarc -#define addbit _Py_addbit -#define adddfa _Py_adddfa -#define addfirstsets _Py_addfirstsets -#define addlabel _Py_addlabel -#define addstate _Py_addstate -#define delbitset _Py_delbitset -#define dumptree _Py_dumptree -#define findlabel _Py_findlabel -#define mergebitset _Py_mergebitset -#define meta_grammar _Py_meta_grammar -#define newbitset _Py_newbitset -#define newgrammar _Py_newgrammar -#define pgen _Py_pgen -#define printgrammar _Py_printgrammar -#define printnonterminals _Py_printnonterminals -#define printtree _Py_printtree -#define samebitset _Py_samebitset -#define showtree _Py_showtree -#define tok_dump _Py_tok_dump -#define translatelabels _Py_translatelabels - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PGENHEADERS_H */ diff --git a/python/include/py_curses.h b/python/include/py_curses.h deleted file mode 100644 index 657816cb..00000000 --- a/python/include/py_curses.h +++ /dev/null @@ -1,176 +0,0 @@ - -#ifndef Py_CURSES_H -#define Py_CURSES_H - -#ifdef __APPLE__ -/* -** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards -** against multiple definition of wchar_t. -*/ -#ifdef _BSD_WCHAR_T_DEFINED_ -#define _WCHAR_T -#endif - -/* the following define is necessary for OS X 10.6; without it, the - Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python - can't get at the WINDOW flags field. */ -#define NCURSES_OPAQUE 0 -#endif /* __APPLE__ */ - -#ifdef __FreeBSD__ -/* -** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards -** against multiple definition of wchar_t and wint_t. -*/ -#ifdef _XOPEN_SOURCE_EXTENDED -#ifndef __FreeBSD_version -#include -#endif -#if __FreeBSD_version >= 500000 -#ifndef __wchar_t -#define __wchar_t -#endif -#ifndef __wint_t -#define __wint_t -#endif -#else -#ifndef _WCHAR_T -#define _WCHAR_T -#endif -#ifndef _WINT_T -#define _WINT_T -#endif -#endif -#endif -#endif - -#ifdef HAVE_NCURSES_H -#include -#else -#include -#ifdef HAVE_TERM_H -/* for tigetstr, which is not declared in SysV curses */ -#include -#endif -#endif - -#ifdef HAVE_NCURSES_H -/* configure was checking , but we will - use , which has all these features. */ -#ifndef WINDOW_HAS_FLAGS -#define WINDOW_HAS_FLAGS 1 -#endif -#ifndef MVWDELCH_IS_EXPRESSION -#define MVWDELCH_IS_EXPRESSION 1 -#endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define PyCurses_API_pointers 4 - -/* Type declarations */ - -typedef struct { - PyObject_HEAD - WINDOW *win; -} PyCursesWindowObject; - -#define PyCursesWindow_Check(v) (Py_TYPE(v) == &PyCursesWindow_Type) - -#define PyCurses_CAPSULE_NAME "_curses._C_API" - - -#ifdef CURSES_MODULE -/* This section is used when compiling _cursesmodule.c */ - -#else -/* This section is used in modules that use the _cursesmodule API */ - -static void **PyCurses_API; - -#define PyCursesWindow_Type (*(PyTypeObject *) PyCurses_API[0]) -#define PyCursesSetupTermCalled {if (! ((int (*)(void))PyCurses_API[1]) () ) return NULL;} -#define PyCursesInitialised {if (! ((int (*)(void))PyCurses_API[2]) () ) return NULL;} -#define PyCursesInitialisedColor {if (! ((int (*)(void))PyCurses_API[3]) () ) return NULL;} - -#define import_curses() \ - PyCurses_API = (void **)PyCapsule_Import(PyCurses_CAPSULE_NAME, 1); - -#endif - -/* general error messages */ -static char *catchall_ERR = "curses function returned ERR"; -static char *catchall_NULL = "curses function returned NULL"; - -/* Function Prototype Macros - They are ugly but very, very useful. ;-) - - X - function name - TYPE - parameter Type - ERGSTR - format string for construction of the return value - PARSESTR - format string for argument parsing - */ - -#define NoArgNoReturnFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - return PyCursesCheckERR(X(), # X); } - -#define NoArgOrFlagNoReturnFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \ -{ \ - int flag = 0; \ - PyCursesInitialised \ - switch(PyTuple_Size(args)) { \ - case 0: \ - return PyCursesCheckERR(X(), # X); \ - case 1: \ - if (!PyArg_ParseTuple(args, "i;True(1) or False(0)", &flag)) return NULL; \ - if (flag) return PyCursesCheckERR(X(), # X); \ - else return PyCursesCheckERR(no ## X (), # X); \ - default: \ - PyErr_SetString(PyExc_TypeError, # X " requires 0 or 1 arguments"); \ - return NULL; } } - -#define NoArgReturnIntFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - return PyInt_FromLong((long) X()); } - - -#define NoArgReturnStringFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - return PyString_FromString(X()); } - -#define NoArgTrueFalseFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - if (X () == FALSE) { \ - Py_INCREF(Py_False); \ - return Py_False; \ - } \ - Py_INCREF(Py_True); \ - return Py_True; } - -#define NoArgNoReturnVoidFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - X(); \ - Py_INCREF(Py_None); \ - return Py_None; } - -#ifdef __cplusplus -} -#endif - -#endif /* !defined(Py_CURSES_H) */ - - diff --git a/python/include/pyarena.h b/python/include/pyarena.h deleted file mode 100644 index 5f193fec..00000000 --- a/python/include/pyarena.h +++ /dev/null @@ -1,62 +0,0 @@ -/* An arena-like memory interface for the compiler. - */ - -#ifndef Py_PYARENA_H -#define Py_PYARENA_H - -#ifdef __cplusplus -extern "C" { -#endif - - typedef struct _arena PyArena; - - /* PyArena_New() and PyArena_Free() create a new arena and free it, - respectively. Once an arena has been created, it can be used - to allocate memory via PyArena_Malloc(). Pointers to PyObject can - also be registered with the arena via PyArena_AddPyObject(), and the - arena will ensure that the PyObjects stay alive at least until - PyArena_Free() is called. When an arena is freed, all the memory it - allocated is freed, the arena releases internal references to registered - PyObject*, and none of its pointers are valid. - XXX (tim) What does "none of its pointers are valid" mean? Does it - XXX mean that pointers previously obtained via PyArena_Malloc() are - XXX no longer valid? (That's clearly true, but not sure that's what - XXX the text is trying to say.) - - PyArena_New() returns an arena pointer. On error, it - returns a negative number and sets an exception. - XXX (tim): Not true. On error, PyArena_New() actually returns NULL, - XXX and looks like it may or may not set an exception (e.g., if the - XXX internal PyList_New(0) returns NULL, PyArena_New() passes that on - XXX and an exception is set; OTOH, if the internal - XXX block_new(DEFAULT_BLOCK_SIZE) returns NULL, that's passed on but - XXX an exception is not set in that case). - */ - PyAPI_FUNC(PyArena *) PyArena_New(void); - PyAPI_FUNC(void) PyArena_Free(PyArena *); - - /* Mostly like malloc(), return the address of a block of memory spanning - * `size` bytes, or return NULL (without setting an exception) if enough - * new memory can't be obtained. Unlike malloc(0), PyArena_Malloc() with - * size=0 does not guarantee to return a unique pointer (the pointer - * returned may equal one or more other pointers obtained from - * PyArena_Malloc()). - * Note that pointers obtained via PyArena_Malloc() must never be passed to - * the system free() or realloc(), or to any of Python's similar memory- - * management functions. PyArena_Malloc()-obtained pointers remain valid - * until PyArena_Free(ar) is called, at which point all pointers obtained - * from the arena `ar` become invalid simultaneously. - */ - PyAPI_FUNC(void *) PyArena_Malloc(PyArena *, size_t size); - - /* This routine isn't a proper arena allocation routine. It takes - * a PyObject* and records it so that it can be DECREFed when the - * arena is freed. - */ - PyAPI_FUNC(int) PyArena_AddPyObject(PyArena *, PyObject *); - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_PYARENA_H */ diff --git a/python/include/pycapsule.h b/python/include/pycapsule.h deleted file mode 100644 index cd682fc7..00000000 --- a/python/include/pycapsule.h +++ /dev/null @@ -1,56 +0,0 @@ - -/* Capsule objects let you wrap a C "void *" pointer in a Python - object. They're a way of passing data through the Python interpreter - without creating your own custom type. - - Capsules are used for communication between extension modules. - They provide a way for an extension module to export a C interface - to other extension modules, so that extension modules can use the - Python import mechanism to link to one another. - - For more information, please see "c-api/capsule.html" in the - documentation. -*/ - -#ifndef Py_CAPSULE_H -#define Py_CAPSULE_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyCapsule_Type; - -typedef void (*PyCapsule_Destructor)(PyObject *); - -#define PyCapsule_CheckExact(op) (Py_TYPE(op) == &PyCapsule_Type) - - -PyAPI_FUNC(PyObject *) PyCapsule_New( - void *pointer, - const char *name, - PyCapsule_Destructor destructor); - -PyAPI_FUNC(void *) PyCapsule_GetPointer(PyObject *capsule, const char *name); - -PyAPI_FUNC(PyCapsule_Destructor) PyCapsule_GetDestructor(PyObject *capsule); - -PyAPI_FUNC(const char *) PyCapsule_GetName(PyObject *capsule); - -PyAPI_FUNC(void *) PyCapsule_GetContext(PyObject *capsule); - -PyAPI_FUNC(int) PyCapsule_IsValid(PyObject *capsule, const char *name); - -PyAPI_FUNC(int) PyCapsule_SetPointer(PyObject *capsule, void *pointer); - -PyAPI_FUNC(int) PyCapsule_SetDestructor(PyObject *capsule, PyCapsule_Destructor destructor); - -PyAPI_FUNC(int) PyCapsule_SetName(PyObject *capsule, const char *name); - -PyAPI_FUNC(int) PyCapsule_SetContext(PyObject *capsule, void *context); - -PyAPI_FUNC(void *) PyCapsule_Import(const char *name, int no_block); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CAPSULE_H */ diff --git a/python/include/pyconfig.h b/python/include/pyconfig.h deleted file mode 100644 index 1cfc59b8..00000000 --- a/python/include/pyconfig.h +++ /dev/null @@ -1,759 +0,0 @@ -#ifndef Py_CONFIG_H -#define Py_CONFIG_H - -/* pyconfig.h. NOT Generated automatically by configure. - -This is a manually maintained version used for the Watcom, -Borland and Microsoft Visual C++ compilers. It is a -standard part of the Python distribution. - -WINDOWS DEFINES: -The code specific to Windows should be wrapped around one of -the following #defines - -MS_WIN64 - Code specific to the MS Win64 API -MS_WIN32 - Code specific to the MS Win32 (and Win64) API (obsolete, this covers all supported APIs) -MS_WINDOWS - Code specific to Windows, but all versions. -MS_WINCE - Code specific to Windows CE -Py_ENABLE_SHARED - Code if the Python core is built as a DLL. - -Also note that neither "_M_IX86" or "_MSC_VER" should be used for -any purpose other than "Windows Intel x86 specific" and "Microsoft -compiler specific". Therefore, these should be very rare. - - -NOTE: The following symbols are deprecated: -NT, USE_DL_EXPORT, USE_DL_IMPORT, DL_EXPORT, DL_IMPORT -MS_CORE_DLL. - -WIN32 is still required for the locale module. - -*/ - -#ifdef _WIN32_WCE -#define MS_WINCE -#endif - -/* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */ -#ifdef USE_DL_EXPORT -# define Py_BUILD_CORE -#endif /* USE_DL_EXPORT */ - -/* Visual Studio 2005 introduces deprecation warnings for - "insecure" and POSIX functions. The insecure functions should - be replaced by *_s versions (according to Microsoft); the - POSIX functions by _* versions (which, according to Microsoft, - would be ISO C conforming). Neither renaming is feasible, so - we just silence the warnings. */ - -#ifndef _CRT_SECURE_NO_DEPRECATE -#define _CRT_SECURE_NO_DEPRECATE 1 -#endif -#ifndef _CRT_NONSTDC_NO_DEPRECATE -#define _CRT_NONSTDC_NO_DEPRECATE 1 -#endif - -/* Windows CE does not have these */ -#ifndef MS_WINCE -#define HAVE_IO_H -#define HAVE_SYS_UTIME_H -#define HAVE_TEMPNAM -#define HAVE_TMPFILE -#define HAVE_TMPNAM -#define HAVE_CLOCK -#define HAVE_STRERROR -#endif - -#ifdef HAVE_IO_H -#include -#endif - -#define HAVE_HYPOT -#define HAVE_STRFTIME -#define DONT_HAVE_SIG_ALARM -#define DONT_HAVE_SIG_PAUSE -#define LONG_BIT 32 -#define WORD_BIT 32 -#define PREFIX "" -#define EXEC_PREFIX "" - -#define MS_WIN32 /* only support win32 and greater. */ -#define MS_WINDOWS -#ifndef PYTHONPATH -# define PYTHONPATH ".\\DLLs;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk" -#endif -#define NT_THREADS -#define WITH_THREAD -#ifndef NETSCAPE_PI -#define USE_SOCKET -#endif - -/* CE6 doesn't have strdup() but _strdup(). Assume the same for earlier versions. */ -#if defined(MS_WINCE) -# include -# define strdup _strdup -#endif - -#ifdef MS_WINCE -/* Windows CE does not support environment variables */ -#define getenv(v) (NULL) -#define environ (NULL) -#endif - -/* Compiler specific defines */ - -/* ------------------------------------------------------------------------*/ -/* Microsoft C defines _MSC_VER */ -#ifdef _MSC_VER - -/* We want COMPILER to expand to a string containing _MSC_VER's *value*. - * This is horridly tricky, because the stringization operator only works - * on macro arguments, and doesn't evaluate macros passed *as* arguments. - * Attempts simpler than the following appear doomed to produce "_MSC_VER" - * literally in the string. - */ -#define _Py_PASTE_VERSION(SUFFIX) \ - ("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]") -/* e.g., this produces, after compile-time string catenation, - * ("[MSC v.1200 32 bit (Intel)]") - * - * _Py_STRINGIZE(_MSC_VER) expands to - * _Py_STRINGIZE1((_MSC_VER)) expands to - * _Py_STRINGIZE2(_MSC_VER) but as this call is the result of token-pasting - * it's scanned again for macros and so further expands to (under MSVC 6) - * _Py_STRINGIZE2(1200) which then expands to - * "1200" - */ -#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X)) -#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X -#define _Py_STRINGIZE2(X) #X - -/* MSVC defines _WINxx to differentiate the windows platform types - - Note that for compatibility reasons _WIN32 is defined on Win32 - *and* on Win64. For the same reasons, in Python, MS_WIN32 is - defined on Win32 *and* Win64. Win32 only code must therefore be - guarded as follows: - #if defined(MS_WIN32) && !defined(MS_WIN64) - Some modules are disabled on Itanium processors, therefore we - have MS_WINI64 set for those targets, otherwise MS_WINX64 -*/ -#ifdef _WIN64 -#define MS_WIN64 -#endif - -/* set the COMPILER */ -#ifdef MS_WIN64 -#if defined(_M_IA64) -#define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)") -#define MS_WINI64 -#elif defined(_M_X64) || defined(_M_AMD64) -#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)") -#define MS_WINX64 -#else -#define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)") -#endif -#endif /* MS_WIN64 */ - -/* set the version macros for the windows headers */ -#ifdef MS_WINX64 -/* 64 bit only runs on XP or greater */ -#define Py_WINVER _WIN32_WINNT_WINXP -#define Py_NTDDI NTDDI_WINXP -#else -/* Python 2.6+ requires Windows 2000 or greater */ -#ifdef _WIN32_WINNT_WIN2K -#define Py_WINVER _WIN32_WINNT_WIN2K -#else -#define Py_WINVER 0x0500 -#endif -#define Py_NTDDI NTDDI_WIN2KSP4 -#endif - -/* We only set these values when building Python - we don't want to force - these values on extensions, as that will affect the prototypes and - structures exposed in the Windows headers. Even when building Python, we - allow a single source file to override this - they may need access to - structures etc so it can optionally use new Windows features if it - determines at runtime they are available. -*/ -#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE) -#ifndef NTDDI_VERSION -#define NTDDI_VERSION Py_NTDDI -#endif -#ifndef WINVER -#define WINVER Py_WINVER -#endif -#ifndef _WIN32_WINNT -#define _WIN32_WINNT Py_WINVER -#endif -#endif - -/* _W64 is not defined for VC6 or eVC4 */ -#ifndef _W64 -#define _W64 -#endif - -/* Define like size_t, omitting the "unsigned" */ -#ifdef MS_WIN64 -typedef __int64 ssize_t; -#else -typedef _W64 int ssize_t; -#endif -#define HAVE_SSIZE_T 1 - -#if defined(MS_WIN32) && !defined(MS_WIN64) -#ifdef _M_IX86 -#define COMPILER _Py_PASTE_VERSION("32 bit (Intel)") -#else -#define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)") -#endif -#endif /* MS_WIN32 && !MS_WIN64 */ - -typedef int pid_t; - -#include -#define Py_IS_NAN _isnan -#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X)) -#define Py_IS_FINITE(X) _finite(X) -#define copysign _copysign -#define hypot _hypot - -#endif /* _MSC_VER */ - -/* define some ANSI types that are not defined in earlier Win headers */ -#if defined(_MSC_VER) && _MSC_VER >= 1200 -/* This file only exists in VC 6.0 or higher */ -#include -#endif - -/* ------------------------------------------------------------------------*/ -/* The Borland compiler defines __BORLANDC__ */ -/* XXX These defines are likely incomplete, but should be easy to fix. */ -#ifdef __BORLANDC__ -#define COMPILER "[Borland]" - -#ifdef _WIN32 -/* tested with BCC 5.5 (__BORLANDC__ >= 0x0550) - */ - -typedef int pid_t; -/* BCC55 seems to understand __declspec(dllimport), it is used in its - own header files (winnt.h, ...) - so we can do nothing and get the default*/ - -#undef HAVE_SYS_UTIME_H -#define HAVE_UTIME_H -#define HAVE_DIRENT_H - -/* rename a few functions for the Borland compiler */ -#include -#define _chsize chsize -#define _setmode setmode - -#else /* !_WIN32 */ -#error "Only Win32 and later are supported" -#endif /* !_WIN32 */ - -#endif /* BORLANDC */ - -/* ------------------------------------------------------------------------*/ -/* egcs/gnu-win32 defines __GNUC__ and _WIN32 */ -#if defined(__GNUC__) && defined(_WIN32) -/* XXX These defines are likely incomplete, but should be easy to fix. - They should be complete enough to build extension modules. */ -/* Suggested by Rene Liebscher to avoid a GCC 2.91.* - bug that requires structure imports. More recent versions of the - compiler don't exhibit this bug. -*/ -#if (__GNUC__==2) && (__GNUC_MINOR__<=91) -#warning "Please use an up-to-date version of gcc! (>2.91 recommended)" -#endif - -#define COMPILER "[gcc]" -#define hypot _hypot -#define PY_LONG_LONG long long -#define PY_LLONG_MIN LLONG_MIN -#define PY_LLONG_MAX LLONG_MAX -#define PY_ULLONG_MAX ULLONG_MAX -#endif /* GNUC */ - -/* ------------------------------------------------------------------------*/ -/* lcc-win32 defines __LCC__ */ -#if defined(__LCC__) -/* XXX These defines are likely incomplete, but should be easy to fix. - They should be complete enough to build extension modules. */ - -#define COMPILER "[lcc-win32]" -typedef int pid_t; -/* __declspec() is supported here too - do nothing to get the defaults */ - -#endif /* LCC */ - -/* ------------------------------------------------------------------------*/ -/* End of compilers - finish up */ - -#ifndef NO_STDIO_H -# include -#endif - -/* 64 bit ints are usually spelt __int64 unless compiler has overridden */ -#define HAVE_LONG_LONG 1 -#ifndef PY_LONG_LONG -# define PY_LONG_LONG __int64 -# define PY_LLONG_MAX _I64_MAX -# define PY_LLONG_MIN _I64_MIN -# define PY_ULLONG_MAX _UI64_MAX -#endif - -/* For Windows the Python core is in a DLL by default. Test -Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ -#if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) -# define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ -# define MS_COREDLL /* deprecated old symbol */ -#endif /* !MS_NO_COREDLL && ... */ - -/* All windows compilers that use this header support __declspec */ -#define HAVE_DECLSPEC_DLL - -/* For an MSVC DLL, we can nominate the .lib files used by extensions */ -#ifdef MS_COREDLL -# ifndef Py_BUILD_CORE /* not building the core - must be an ext */ -# if defined(_MSC_VER) - /* So MSVC users need not specify the .lib file in - their Makefile (other compilers are generally - taken care of by distutils.) */ -# ifdef _DEBUG -# pragma comment(lib,"python27_d.lib") -# else -# pragma comment(lib,"python27.lib") -# endif /* _DEBUG */ -# endif /* _MSC_VER */ -# endif /* Py_BUILD_CORE */ -#endif /* MS_COREDLL */ - -#if defined(MS_WIN64) -/* maintain "win32" sys.platform for backward compatibility of Python code, - the Win64 API should be close enough to the Win32 API to make this - preferable */ -# define PLATFORM "win32" -# define SIZEOF_VOID_P 8 -# define SIZEOF_TIME_T 8 -# define SIZEOF_OFF_T 4 -# define SIZEOF_FPOS_T 8 -# define SIZEOF_HKEY 8 -# define SIZEOF_SIZE_T 8 -/* configure.in defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG, - sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t). - On Win64 the second condition is not true, but if fpos_t replaces off_t - then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64 - should define this. */ -# define HAVE_LARGEFILE_SUPPORT -#elif defined(MS_WIN32) -# define PLATFORM "win32" -# define HAVE_LARGEFILE_SUPPORT -# define SIZEOF_VOID_P 4 -# define SIZEOF_OFF_T 4 -# define SIZEOF_FPOS_T 8 -# define SIZEOF_HKEY 4 -# define SIZEOF_SIZE_T 4 - /* MS VS2005 changes time_t to an 64-bit type on all platforms */ -# if defined(_MSC_VER) && _MSC_VER >= 1400 -# define SIZEOF_TIME_T 8 -# else -# define SIZEOF_TIME_T 4 -# endif -#endif - -#ifdef _DEBUG -# define Py_DEBUG -#endif - - -#ifdef MS_WIN32 - -#define SIZEOF_SHORT 2 -#define SIZEOF_INT 4 -#define SIZEOF_LONG 4 -#define SIZEOF_LONG_LONG 8 -#define SIZEOF_DOUBLE 8 -#define SIZEOF_FLOAT 4 - -/* VC 7.1 has them and VC 6.0 does not. VC 6.0 has a version number of 1200. - Microsoft eMbedded Visual C++ 4.0 has a version number of 1201 and doesn't - define these. - If some compiler does not provide them, modify the #if appropriately. */ -#if defined(_MSC_VER) -#if _MSC_VER > 1300 -#define HAVE_UINTPTR_T 1 -#define HAVE_INTPTR_T 1 -#else -/* VC6, VS 2002 and eVC4 don't support the C99 LL suffix for 64-bit integer literals */ -#define Py_LL(x) x##I64 -#endif /* _MSC_VER > 1200 */ -#endif /* _MSC_VER */ - -#endif - -/* define signed and unsigned exact-width 32-bit and 64-bit types, used in the - implementation of Python long integers. */ -#ifndef PY_UINT32_T -#if SIZEOF_INT == 4 -#define HAVE_UINT32_T 1 -#define PY_UINT32_T unsigned int -#elif SIZEOF_LONG == 4 -#define HAVE_UINT32_T 1 -#define PY_UINT32_T unsigned long -#endif -#endif - -#ifndef PY_UINT64_T -#if SIZEOF_LONG_LONG == 8 -#define HAVE_UINT64_T 1 -#define PY_UINT64_T unsigned PY_LONG_LONG -#endif -#endif - -#ifndef PY_INT32_T -#if SIZEOF_INT == 4 -#define HAVE_INT32_T 1 -#define PY_INT32_T int -#elif SIZEOF_LONG == 4 -#define HAVE_INT32_T 1 -#define PY_INT32_T long -#endif -#endif - -#ifndef PY_INT64_T -#if SIZEOF_LONG_LONG == 8 -#define HAVE_INT64_T 1 -#define PY_INT64_T PY_LONG_LONG -#endif -#endif - -/* Fairly standard from here! */ - -/* Define to 1 if you have the `copysign' function. */ -#define HAVE_COPYSIGN 1 - -/* Define to 1 if you have the `isinf' macro. */ -#define HAVE_DECL_ISINF 1 - -/* Define to 1 if you have the `isnan' function. */ -#define HAVE_DECL_ISNAN 1 - -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* #undef _ALL_SOURCE */ -#endif - -/* Define to empty if the keyword does not work. */ -/* #define const */ - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_CONIO_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_DIRECT_H 1 -#endif - -/* Define if you have dirent.h. */ -/* #define DIRENT 1 */ - -/* Define to the type of elements in the array set by `getgroups'. - Usually this is either `int' or `gid_t'. */ -/* #undef GETGROUPS_T */ - -/* Define to `int' if doesn't define. */ -/* #undef gid_t */ - -/* Define if your struct tm has tm_zone. */ -/* #undef HAVE_TM_ZONE */ - -/* Define if you don't have tm_zone but do have the external array - tzname. */ -#define HAVE_TZNAME - -/* Define to `int' if doesn't define. */ -/* #undef mode_t */ - -/* Define if you don't have dirent.h, but have ndir.h. */ -/* #undef NDIR */ - -/* Define to `long' if doesn't define. */ -/* #undef off_t */ - -/* Define to `int' if doesn't define. */ -/* #undef pid_t */ - -/* Define if the system does not provide POSIX.1 features except - with this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define as the return type of signal handlers (int or void). */ -#define RETSIGTYPE void - -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if you don't have dirent.h, but have sys/dir.h. */ -/* #undef SYSDIR */ - -/* Define if you don't have dirent.h, but have sys/ndir.h. */ -/* #undef SYSNDIR */ - -/* Define if you can safely include both and . */ -/* #undef TIME_WITH_SYS_TIME */ - -/* Define if your declares struct tm. */ -/* #define TM_IN_SYS_TIME 1 */ - -/* Define to `int' if doesn't define. */ -/* #undef uid_t */ - -/* Define if the closedir function returns void instead of int. */ -/* #undef VOID_CLOSEDIR */ - -/* Define if getpgrp() must be called as getpgrp(0) - and (consequently) setpgrp() as setpgrp(0, 0). */ -/* #undef GETPGRP_HAVE_ARGS */ - -/* Define this if your time.h defines altzone */ -/* #define HAVE_ALTZONE */ - -/* Define if you have the putenv function. */ -#ifndef MS_WINCE -#define HAVE_PUTENV -#endif - -/* Define if your compiler supports function prototypes */ -#define HAVE_PROTOTYPES - -/* Define if you can safely include both and - (which you can't on SCO ODT 3.0). */ -/* #undef SYS_SELECT_WITH_SYS_TIME */ - -/* Define if you want documentation strings in extension modules */ -#define WITH_DOC_STRINGS 1 - -/* Define if you want to compile in rudimentary thread support */ -/* #undef WITH_THREAD */ - -/* Define if you want to use the GNU readline library */ -/* #define WITH_READLINE 1 */ - -/* Define if you want to have a Unicode type. */ -#define Py_USING_UNICODE - -/* Define as the size of the unicode type. */ -/* This is enough for unicodeobject.h to do the "right thing" on Windows. */ -#define Py_UNICODE_SIZE 2 - -/* Use Python's own small-block memory-allocator. */ -#define WITH_PYMALLOC 1 - -/* Define if you have clock. */ -/* #define HAVE_CLOCK */ - -/* Define when any dynamic module loading is enabled */ -#define HAVE_DYNAMIC_LOADING - -/* Define if you have ftime. */ -#ifndef MS_WINCE -#define HAVE_FTIME -#endif - -/* Define if you have getpeername. */ -#define HAVE_GETPEERNAME - -/* Define if you have getpgrp. */ -/* #undef HAVE_GETPGRP */ - -/* Define if you have getpid. */ -#ifndef MS_WINCE -#define HAVE_GETPID -#endif - -/* Define if you have gettimeofday. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define if you have getwd. */ -/* #undef HAVE_GETWD */ - -/* Define if you have lstat. */ -/* #undef HAVE_LSTAT */ - -/* Define if you have the mktime function. */ -#define HAVE_MKTIME - -/* Define if you have nice. */ -/* #undef HAVE_NICE */ - -/* Define if you have readlink. */ -/* #undef HAVE_READLINK */ - -/* Define if you have select. */ -/* #undef HAVE_SELECT */ - -/* Define if you have setpgid. */ -/* #undef HAVE_SETPGID */ - -/* Define if you have setpgrp. */ -/* #undef HAVE_SETPGRP */ - -/* Define if you have setsid. */ -/* #undef HAVE_SETSID */ - -/* Define if you have setvbuf. */ -#define HAVE_SETVBUF - -/* Define if you have siginterrupt. */ -/* #undef HAVE_SIGINTERRUPT */ - -/* Define if you have symlink. */ -/* #undef HAVE_SYMLINK */ - -/* Define if you have tcgetpgrp. */ -/* #undef HAVE_TCGETPGRP */ - -/* Define if you have tcsetpgrp. */ -/* #undef HAVE_TCSETPGRP */ - -/* Define if you have times. */ -/* #undef HAVE_TIMES */ - -/* Define if you have uname. */ -/* #undef HAVE_UNAME */ - -/* Define if you have waitpid. */ -/* #undef HAVE_WAITPID */ - -/* Define to 1 if you have the `wcscoll' function. */ -#ifndef MS_WINCE -#define HAVE_WCSCOLL 1 -#endif - -/* Define if the zlib library has inflateCopy */ -#define HAVE_ZLIB_COPY 1 - -/* Define if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_ERRNO_H 1 -#endif - -/* Define if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_FCNTL_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_PROCESS_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_SIGNAL_H 1 -#endif - -/* Define if you have the prototypes. */ -#define HAVE_STDARG_PROTOTYPES - -/* Define if you have the header file. */ -#define HAVE_STDDEF_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_AUDIOIO_H */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_PARAM_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_SELECT_H 1 */ - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_SYS_STAT_H 1 -#endif - -/* Define if you have the header file. */ -/* #define HAVE_SYS_TIME_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_TIMES_H 1 */ - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_SYS_TYPES_H 1 -#endif - -/* Define if you have the header file. */ -/* #define HAVE_SYS_UN_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_UTIME_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_UTSNAME_H 1 */ - -/* Define if you have the header file. */ -/* #undef HAVE_THREAD_H */ - -/* Define if you have the header file. */ -/* #define HAVE_UNISTD_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_UTIME_H 1 */ - -/* Define if the compiler provides a wchar.h header file. */ -#define HAVE_WCHAR_H 1 - -/* Define if you have the dl library (-ldl). */ -/* #undef HAVE_LIBDL */ - -/* Define if you have the mpc library (-lmpc). */ -/* #undef HAVE_LIBMPC */ - -/* Define if you have the nsl library (-lnsl). */ -#define HAVE_LIBNSL 1 - -/* Define if you have the seq library (-lseq). */ -/* #undef HAVE_LIBSEQ */ - -/* Define if you have the socket library (-lsocket). */ -#define HAVE_LIBSOCKET 1 - -/* Define if you have the sun library (-lsun). */ -/* #undef HAVE_LIBSUN */ - -/* Define if you have the termcap library (-ltermcap). */ -/* #undef HAVE_LIBTERMCAP */ - -/* Define if you have the termlib library (-ltermlib). */ -/* #undef HAVE_LIBTERMLIB */ - -/* Define if you have the thread library (-lthread). */ -/* #undef HAVE_LIBTHREAD */ - -/* WinSock does not use a bitmask in select, and uses - socket handles greater than FD_SETSIZE */ -#define Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE - -/* Define if C doubles are 64-bit IEEE 754 binary format, stored with the - least significant byte first */ -#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1 - -#endif /* !Py_CONFIG_H */ diff --git a/python/include/pyctype.h b/python/include/pyctype.h deleted file mode 100644 index 673cf2eb..00000000 --- a/python/include/pyctype.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef PYCTYPE_H -#define PYCTYPE_H - -#define PY_CTF_LOWER 0x01 -#define PY_CTF_UPPER 0x02 -#define PY_CTF_ALPHA (PY_CTF_LOWER|PY_CTF_UPPER) -#define PY_CTF_DIGIT 0x04 -#define PY_CTF_ALNUM (PY_CTF_ALPHA|PY_CTF_DIGIT) -#define PY_CTF_SPACE 0x08 -#define PY_CTF_XDIGIT 0x10 - -PyAPI_DATA(const unsigned int) _Py_ctype_table[256]; - -/* Unlike their C counterparts, the following macros are not meant to - * handle an int with any of the values [EOF, 0-UCHAR_MAX]. The argument - * must be a signed/unsigned char. */ -#define Py_ISLOWER(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_LOWER) -#define Py_ISUPPER(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_UPPER) -#define Py_ISALPHA(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALPHA) -#define Py_ISDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_DIGIT) -#define Py_ISXDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_XDIGIT) -#define Py_ISALNUM(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALNUM) -#define Py_ISSPACE(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_SPACE) - -PyAPI_DATA(const unsigned char) _Py_ctype_tolower[256]; -PyAPI_DATA(const unsigned char) _Py_ctype_toupper[256]; - -#define Py_TOLOWER(c) (_Py_ctype_tolower[Py_CHARMASK(c)]) -#define Py_TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)]) - -#endif /* !PYCTYPE_H */ diff --git a/python/include/pydebug.h b/python/include/pydebug.h deleted file mode 100644 index 0f45960f..00000000 --- a/python/include/pydebug.h +++ /dev/null @@ -1,41 +0,0 @@ - -#ifndef Py_PYDEBUG_H -#define Py_PYDEBUG_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(int) Py_DebugFlag; -PyAPI_DATA(int) Py_VerboseFlag; -PyAPI_DATA(int) Py_InteractiveFlag; -PyAPI_DATA(int) Py_InspectFlag; -PyAPI_DATA(int) Py_OptimizeFlag; -PyAPI_DATA(int) Py_NoSiteFlag; -PyAPI_DATA(int) Py_BytesWarningFlag; -PyAPI_DATA(int) Py_UseClassExceptionsFlag; -PyAPI_DATA(int) Py_FrozenFlag; -PyAPI_DATA(int) Py_TabcheckFlag; -PyAPI_DATA(int) Py_UnicodeFlag; -PyAPI_DATA(int) Py_IgnoreEnvironmentFlag; -PyAPI_DATA(int) Py_DivisionWarningFlag; -PyAPI_DATA(int) Py_DontWriteBytecodeFlag; -PyAPI_DATA(int) Py_NoUserSiteDirectory; -/* _XXX Py_QnewFlag should go away in 3.0. It's true iff -Qnew is passed, - on the command line, and is used in 2.2 by ceval.c to make all "/" divisions - true divisions (which they will be in 3.0). */ -PyAPI_DATA(int) _Py_QnewFlag; -/* Warn about 3.x issues */ -PyAPI_DATA(int) Py_Py3kWarningFlag; -PyAPI_DATA(int) Py_HashRandomizationFlag; - -/* this is a wrapper around getenv() that pays attention to - Py_IgnoreEnvironmentFlag. It should be used for getting variables like - PYTHONPATH and PYTHONHOME from the environment */ -#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s)) - -PyAPI_FUNC(void) Py_FatalError(const char *message); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYDEBUG_H */ diff --git a/python/include/pyerrors.h b/python/include/pyerrors.h deleted file mode 100644 index dbe3bfa5..00000000 --- a/python/include/pyerrors.h +++ /dev/null @@ -1,328 +0,0 @@ -#ifndef Py_ERRORS_H -#define Py_ERRORS_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Error objects */ - -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; -} PyBaseExceptionObject; - -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *msg; - PyObject *filename; - PyObject *lineno; - PyObject *offset; - PyObject *text; - PyObject *print_file_and_line; -} PySyntaxErrorObject; - -#ifdef Py_USING_UNICODE -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *encoding; - PyObject *object; - Py_ssize_t start; - Py_ssize_t end; - PyObject *reason; -} PyUnicodeErrorObject; -#endif - -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *code; -} PySystemExitObject; - -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *myerrno; - PyObject *strerror; - PyObject *filename; -} PyEnvironmentErrorObject; - -#ifdef MS_WINDOWS -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *myerrno; - PyObject *strerror; - PyObject *filename; - PyObject *winerror; -} PyWindowsErrorObject; -#endif - -/* Error handling definitions */ - -PyAPI_FUNC(void) PyErr_SetNone(PyObject *); -PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *); -PyAPI_FUNC(void) PyErr_SetString(PyObject *, const char *); -PyAPI_FUNC(PyObject *) PyErr_Occurred(void); -PyAPI_FUNC(void) PyErr_Clear(void); -PyAPI_FUNC(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **); -PyAPI_FUNC(void) PyErr_Restore(PyObject *, PyObject *, PyObject *); - -#ifdef Py_DEBUG -#define _PyErr_OCCURRED() PyErr_Occurred() -#else -#define _PyErr_OCCURRED() (_PyThreadState_Current->curexc_type) -#endif - -/* Error testing and normalization */ -PyAPI_FUNC(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *); -PyAPI_FUNC(int) PyErr_ExceptionMatches(PyObject *); -PyAPI_FUNC(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**); - -/* */ - -#define PyExceptionClass_Check(x) \ - (PyClass_Check((x)) || (PyType_Check((x)) && \ - PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS))) - -#define PyExceptionInstance_Check(x) \ - (PyInstance_Check((x)) || \ - PyType_FastSubclass((x)->ob_type, Py_TPFLAGS_BASE_EXC_SUBCLASS)) - -#define PyExceptionClass_Name(x) \ - (PyClass_Check((x)) \ - ? PyString_AS_STRING(((PyClassObject*)(x))->cl_name) \ - : (char *)(((PyTypeObject*)(x))->tp_name)) - -#define PyExceptionInstance_Class(x) \ - ((PyInstance_Check((x)) \ - ? (PyObject*)((PyInstanceObject*)(x))->in_class \ - : (PyObject*)((x)->ob_type))) - - -/* Predefined exceptions */ - -PyAPI_DATA(PyObject *) PyExc_BaseException; -PyAPI_DATA(PyObject *) PyExc_Exception; -PyAPI_DATA(PyObject *) PyExc_StopIteration; -PyAPI_DATA(PyObject *) PyExc_GeneratorExit; -PyAPI_DATA(PyObject *) PyExc_StandardError; -PyAPI_DATA(PyObject *) PyExc_ArithmeticError; -PyAPI_DATA(PyObject *) PyExc_LookupError; - -PyAPI_DATA(PyObject *) PyExc_AssertionError; -PyAPI_DATA(PyObject *) PyExc_AttributeError; -PyAPI_DATA(PyObject *) PyExc_EOFError; -PyAPI_DATA(PyObject *) PyExc_FloatingPointError; -PyAPI_DATA(PyObject *) PyExc_EnvironmentError; -PyAPI_DATA(PyObject *) PyExc_IOError; -PyAPI_DATA(PyObject *) PyExc_OSError; -PyAPI_DATA(PyObject *) PyExc_ImportError; -PyAPI_DATA(PyObject *) PyExc_IndexError; -PyAPI_DATA(PyObject *) PyExc_KeyError; -PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt; -PyAPI_DATA(PyObject *) PyExc_MemoryError; -PyAPI_DATA(PyObject *) PyExc_NameError; -PyAPI_DATA(PyObject *) PyExc_OverflowError; -PyAPI_DATA(PyObject *) PyExc_RuntimeError; -PyAPI_DATA(PyObject *) PyExc_NotImplementedError; -PyAPI_DATA(PyObject *) PyExc_SyntaxError; -PyAPI_DATA(PyObject *) PyExc_IndentationError; -PyAPI_DATA(PyObject *) PyExc_TabError; -PyAPI_DATA(PyObject *) PyExc_ReferenceError; -PyAPI_DATA(PyObject *) PyExc_SystemError; -PyAPI_DATA(PyObject *) PyExc_SystemExit; -PyAPI_DATA(PyObject *) PyExc_TypeError; -PyAPI_DATA(PyObject *) PyExc_UnboundLocalError; -PyAPI_DATA(PyObject *) PyExc_UnicodeError; -PyAPI_DATA(PyObject *) PyExc_UnicodeEncodeError; -PyAPI_DATA(PyObject *) PyExc_UnicodeDecodeError; -PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError; -PyAPI_DATA(PyObject *) PyExc_ValueError; -PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError; -#ifdef MS_WINDOWS -PyAPI_DATA(PyObject *) PyExc_WindowsError; -#endif -#ifdef __VMS -PyAPI_DATA(PyObject *) PyExc_VMSError; -#endif - -PyAPI_DATA(PyObject *) PyExc_BufferError; - -PyAPI_DATA(PyObject *) PyExc_MemoryErrorInst; -PyAPI_DATA(PyObject *) PyExc_RecursionErrorInst; - -/* Predefined warning categories */ -PyAPI_DATA(PyObject *) PyExc_Warning; -PyAPI_DATA(PyObject *) PyExc_UserWarning; -PyAPI_DATA(PyObject *) PyExc_DeprecationWarning; -PyAPI_DATA(PyObject *) PyExc_PendingDeprecationWarning; -PyAPI_DATA(PyObject *) PyExc_SyntaxWarning; -PyAPI_DATA(PyObject *) PyExc_RuntimeWarning; -PyAPI_DATA(PyObject *) PyExc_FutureWarning; -PyAPI_DATA(PyObject *) PyExc_ImportWarning; -PyAPI_DATA(PyObject *) PyExc_UnicodeWarning; -PyAPI_DATA(PyObject *) PyExc_BytesWarning; - - -/* Convenience functions */ - -PyAPI_FUNC(int) PyErr_BadArgument(void); -PyAPI_FUNC(PyObject *) PyErr_NoMemory(void); -PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *); -PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject( - PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename( - PyObject *, const char *); -#ifdef MS_WINDOWS -PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename( - PyObject *, const Py_UNICODE *); -#endif /* MS_WINDOWS */ - -PyAPI_FUNC(PyObject *) PyErr_Format(PyObject *, const char *, ...) - Py_GCC_ATTRIBUTE((format(printf, 2, 3))); - -#ifdef MS_WINDOWS -PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilenameObject( - int, const char *); -PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename( - int, const char *); -PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename( - int, const Py_UNICODE *); -PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int); -PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject( - PyObject *,int, PyObject *); -PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename( - PyObject *,int, const char *); -PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename( - PyObject *,int, const Py_UNICODE *); -PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int); -#endif /* MS_WINDOWS */ - -/* Export the old function so that the existing API remains available: */ -PyAPI_FUNC(void) PyErr_BadInternalCall(void); -PyAPI_FUNC(void) _PyErr_BadInternalCall(char *filename, int lineno); -/* Mask the old API with a call to the new API for code compiled under - Python 2.0: */ -#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__) - -/* Function to create a new exception */ -PyAPI_FUNC(PyObject *) PyErr_NewException( - char *name, PyObject *base, PyObject *dict); -PyAPI_FUNC(PyObject *) PyErr_NewExceptionWithDoc( - char *name, char *doc, PyObject *base, PyObject *dict); -PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *); - -/* In sigcheck.c or signalmodule.c */ -PyAPI_FUNC(int) PyErr_CheckSignals(void); -PyAPI_FUNC(void) PyErr_SetInterrupt(void); - -/* In signalmodule.c */ -int PySignal_SetWakeupFd(int fd); - -/* Support for adding program text to SyntaxErrors */ -PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int); -PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int); - -#ifdef Py_USING_UNICODE -/* The following functions are used to create and modify unicode - exceptions from C */ - -/* create a UnicodeDecodeError object */ -PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create( - const char *, const char *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); - -/* create a UnicodeEncodeError object */ -PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create( - const char *, const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); - -/* create a UnicodeTranslateError object */ -PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create( - const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); - -/* get the encoding attribute */ -PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetEncoding(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetEncoding(PyObject *); - -/* get the object attribute */ -PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetObject(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetObject(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetObject(PyObject *); - -/* get the value of the start attribute (the int * may not be NULL) - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_GetStart(PyObject *, Py_ssize_t *); -PyAPI_FUNC(int) PyUnicodeDecodeError_GetStart(PyObject *, Py_ssize_t *); -PyAPI_FUNC(int) PyUnicodeTranslateError_GetStart(PyObject *, Py_ssize_t *); - -/* assign a new value to the start attribute - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_SetStart(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyUnicodeDecodeError_SetStart(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyUnicodeTranslateError_SetStart(PyObject *, Py_ssize_t); - -/* get the value of the end attribute (the int *may not be NULL) - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_GetEnd(PyObject *, Py_ssize_t *); -PyAPI_FUNC(int) PyUnicodeDecodeError_GetEnd(PyObject *, Py_ssize_t *); -PyAPI_FUNC(int) PyUnicodeTranslateError_GetEnd(PyObject *, Py_ssize_t *); - -/* assign a new value to the end attribute - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_SetEnd(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyUnicodeDecodeError_SetEnd(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyUnicodeTranslateError_SetEnd(PyObject *, Py_ssize_t); - -/* get the value of the reason attribute */ -PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetReason(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetReason(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetReason(PyObject *); - -/* assign a new value to the reason attribute - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_SetReason( - PyObject *, const char *); -PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason( - PyObject *, const char *); -PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason( - PyObject *, const char *); -#endif - - -/* These APIs aren't really part of the error implementation, but - often needed to format error messages; the native C lib APIs are - not available on all platforms, which is why we provide emulations - for those platforms in Python/mysnprintf.c, - WARNING: The return value of snprintf varies across platforms; do - not rely on any particular behavior; eventually the C99 defn may - be reliable. -*/ -#if defined(MS_WIN32) && !defined(HAVE_SNPRINTF) -# define HAVE_SNPRINTF -# define snprintf _snprintf -# define vsnprintf _vsnprintf -#endif - -#include -PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 3, 4))); -PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va) - Py_GCC_ATTRIBUTE((format(printf, 3, 0))); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_ERRORS_H */ diff --git a/python/include/pyexpat.h b/python/include/pyexpat.h deleted file mode 100644 index 5340ef5f..00000000 --- a/python/include/pyexpat.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Stuff to export relevant 'expat' entry points from pyexpat to other - * parser modules, such as cElementTree. */ - -/* note: you must import expat.h before importing this module! */ - -#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0" -#define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" - -struct PyExpat_CAPI -{ - char* magic; /* set to PyExpat_CAPI_MAGIC */ - int size; /* set to sizeof(struct PyExpat_CAPI) */ - int MAJOR_VERSION; - int MINOR_VERSION; - int MICRO_VERSION; - /* pointers to selected expat functions. add new functions at - the end, if needed */ - const XML_LChar * (*ErrorString)(enum XML_Error code); - enum XML_Error (*GetErrorCode)(XML_Parser parser); - XML_Size (*GetErrorColumnNumber)(XML_Parser parser); - XML_Size (*GetErrorLineNumber)(XML_Parser parser); - enum XML_Status (*Parse)( - XML_Parser parser, const char *s, int len, int isFinal); - XML_Parser (*ParserCreate_MM)( - const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, - const XML_Char *namespaceSeparator); - void (*ParserFree)(XML_Parser parser); - void (*SetCharacterDataHandler)( - XML_Parser parser, XML_CharacterDataHandler handler); - void (*SetCommentHandler)( - XML_Parser parser, XML_CommentHandler handler); - void (*SetDefaultHandlerExpand)( - XML_Parser parser, XML_DefaultHandler handler); - void (*SetElementHandler)( - XML_Parser parser, XML_StartElementHandler start, - XML_EndElementHandler end); - void (*SetNamespaceDeclHandler)( - XML_Parser parser, XML_StartNamespaceDeclHandler start, - XML_EndNamespaceDeclHandler end); - void (*SetProcessingInstructionHandler)( - XML_Parser parser, XML_ProcessingInstructionHandler handler); - void (*SetUnknownEncodingHandler)( - XML_Parser parser, XML_UnknownEncodingHandler handler, - void *encodingHandlerData); - void (*SetUserData)(XML_Parser parser, void *userData); - /* always add new stuff to the end! */ -}; - diff --git a/python/include/pyfpe.h b/python/include/pyfpe.h deleted file mode 100644 index 19110ab0..00000000 --- a/python/include/pyfpe.h +++ /dev/null @@ -1,176 +0,0 @@ -#ifndef Py_PYFPE_H -#define Py_PYFPE_H -#ifdef __cplusplus -extern "C" { -#endif -/* - --------------------------------------------------------------------- - / Copyright (c) 1996. \ - | The Regents of the University of California. | - | All rights reserved. | - | | - | Permission to use, copy, modify, and distribute this software for | - | any purpose without fee is hereby granted, provided that this en- | - | tire notice is included in all copies of any software which is or | - | includes a copy or modification of this software and in all | - | copies of the supporting documentation for such software. | - | | - | This work was produced at the University of California, Lawrence | - | Livermore National Laboratory under contract no. W-7405-ENG-48 | - | between the U.S. Department of Energy and The Regents of the | - | University of California for the operation of UC LLNL. | - | | - | DISCLAIMER | - | | - | This software was prepared as an account of work sponsored by an | - | agency of the United States Government. Neither the United States | - | Government nor the University of California nor any of their em- | - | ployees, makes any warranty, express or implied, or assumes any | - | liability or responsibility for the accuracy, completeness, or | - | usefulness of any information, apparatus, product, or process | - | disclosed, or represents that its use would not infringe | - | privately-owned rights. Reference herein to any specific commer- | - | cial products, process, or service by trade name, trademark, | - | manufacturer, or otherwise, does not necessarily constitute or | - | imply its endorsement, recommendation, or favoring by the United | - | States Government or the University of California. The views and | - | opinions of authors expressed herein do not necessarily state or | - | reflect those of the United States Government or the University | - | of California, and shall not be used for advertising or product | - \ endorsement purposes. / - --------------------------------------------------------------------- -*/ - -/* - * Define macros for handling SIGFPE. - * Lee Busby, LLNL, November, 1996 - * busby1@llnl.gov - * - ********************************************* - * Overview of the system for handling SIGFPE: - * - * This file (Include/pyfpe.h) defines a couple of "wrapper" macros for - * insertion into your Python C code of choice. Their proper use is - * discussed below. The file Python/pyfpe.c defines a pair of global - * variables PyFPE_jbuf and PyFPE_counter which are used by the signal - * handler for SIGFPE to decide if a particular exception was protected - * by the macros. The signal handler itself, and code for enabling the - * generation of SIGFPE in the first place, is in a (new) Python module - * named fpectl. This module is standard in every respect. It can be loaded - * either statically or dynamically as you choose, and like any other - * Python module, has no effect until you import it. - * - * In the general case, there are three steps toward handling SIGFPE in any - * Python code: - * - * 1) Add the *_PROTECT macros to your C code as required to protect - * dangerous floating point sections. - * - * 2) Turn on the inclusion of the code by adding the ``--with-fpectl'' - * flag at the time you run configure. If the fpectl or other modules - * which use the *_PROTECT macros are to be dynamically loaded, be - * sure they are compiled with WANT_SIGFPE_HANDLER defined. - * - * 3) When python is built and running, import fpectl, and execute - * fpectl.turnon_sigfpe(). This sets up the signal handler and enables - * generation of SIGFPE whenever an exception occurs. From this point - * on, any properly trapped SIGFPE should result in the Python - * FloatingPointError exception. - * - * Step 1 has been done already for the Python kernel code, and should be - * done soon for the NumPy array package. Step 2 is usually done once at - * python install time. Python's behavior with respect to SIGFPE is not - * changed unless you also do step 3. Thus you can control this new - * facility at compile time, or run time, or both. - * - ******************************** - * Using the macros in your code: - * - * static PyObject *foobar(PyObject *self,PyObject *args) - * { - * .... - * PyFPE_START_PROTECT("Error in foobar", return 0) - * result = dangerous_op(somearg1, somearg2, ...); - * PyFPE_END_PROTECT(result) - * .... - * } - * - * If a floating point error occurs in dangerous_op, foobar returns 0 (NULL), - * after setting the associated value of the FloatingPointError exception to - * "Error in foobar". ``Dangerous_op'' can be a single operation, or a block - * of code, function calls, or any combination, so long as no alternate - * return is possible before the PyFPE_END_PROTECT macro is reached. - * - * The macros can only be used in a function context where an error return - * can be recognized as signaling a Python exception. (Generally, most - * functions that return a PyObject * will qualify.) - * - * Guido's original design suggestion for PyFPE_START_PROTECT and - * PyFPE_END_PROTECT had them open and close a local block, with a locally - * defined jmp_buf and jmp_buf pointer. This would allow recursive nesting - * of the macros. The Ansi C standard makes it clear that such local - * variables need to be declared with the "volatile" type qualifier to keep - * setjmp from corrupting their values. Some current implementations seem - * to be more restrictive. For example, the HPUX man page for setjmp says - * - * Upon the return from a setjmp() call caused by a longjmp(), the - * values of any non-static local variables belonging to the routine - * from which setjmp() was called are undefined. Code which depends on - * such values is not guaranteed to be portable. - * - * I therefore decided on a more limited form of nesting, using a counter - * variable (PyFPE_counter) to keep track of any recursion. If an exception - * occurs in an ``inner'' pair of macros, the return will apparently - * come from the outermost level. - * - */ - -#ifdef WANT_SIGFPE_HANDLER -#include -#include -#include -extern jmp_buf PyFPE_jbuf; -extern int PyFPE_counter; -extern double PyFPE_dummy(void *); - -#define PyFPE_START_PROTECT(err_string, leave_stmt) \ -if (!PyFPE_counter++ && setjmp(PyFPE_jbuf)) { \ - PyErr_SetString(PyExc_FloatingPointError, err_string); \ - PyFPE_counter = 0; \ - leave_stmt; \ -} - -/* - * This (following) is a heck of a way to decrement a counter. However, - * unless the macro argument is provided, code optimizers will sometimes move - * this statement so that it gets executed *before* the unsafe expression - * which we're trying to protect. That pretty well messes things up, - * of course. - * - * If the expression(s) you're trying to protect don't happen to return a - * value, you will need to manufacture a dummy result just to preserve the - * correct ordering of statements. Note that the macro passes the address - * of its argument (so you need to give it something which is addressable). - * If your expression returns multiple results, pass the last such result - * to PyFPE_END_PROTECT. - * - * Note that PyFPE_dummy returns a double, which is cast to int. - * This seeming insanity is to tickle the Floating Point Unit (FPU). - * If an exception has occurred in a preceding floating point operation, - * some architectures (notably Intel 80x86) will not deliver the interrupt - * until the *next* floating point operation. This is painful if you've - * already decremented PyFPE_counter. - */ -#define PyFPE_END_PROTECT(v) PyFPE_counter -= (int)PyFPE_dummy(&(v)); - -#else - -#define PyFPE_START_PROTECT(err_string, leave_stmt) -#define PyFPE_END_PROTECT(v) - -#endif - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYFPE_H */ diff --git a/python/include/pygetopt.h b/python/include/pygetopt.h deleted file mode 100644 index 9860d360..00000000 --- a/python/include/pygetopt.h +++ /dev/null @@ -1,18 +0,0 @@ - -#ifndef Py_PYGETOPT_H -#define Py_PYGETOPT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(int) _PyOS_opterr; -PyAPI_DATA(int) _PyOS_optind; -PyAPI_DATA(char *) _PyOS_optarg; - -PyAPI_FUNC(void) _PyOS_ResetGetOpt(void); -PyAPI_FUNC(int) _PyOS_GetOpt(int argc, char **argv, char *optstring); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYGETOPT_H */ diff --git a/python/include/pymacconfig.h b/python/include/pymacconfig.h deleted file mode 100644 index 24e7b8da..00000000 --- a/python/include/pymacconfig.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef PYMACCONFIG_H -#define PYMACCONFIG_H - /* - * This file moves some of the autoconf magic to compile-time - * when building on MacOSX. This is needed for building 4-way - * universal binaries and for 64-bit universal binaries because - * the values redefined below aren't configure-time constant but - * only compile-time constant in these scenarios. - */ - -#if defined(__APPLE__) - -# undef SIZEOF_LONG -# undef SIZEOF_PTHREAD_T -# undef SIZEOF_SIZE_T -# undef SIZEOF_TIME_T -# undef SIZEOF_VOID_P -# undef SIZEOF__BOOL -# undef SIZEOF_UINTPTR_T -# undef SIZEOF_PTHREAD_T -# undef WORDS_BIGENDIAN -# undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 -# undef DOUBLE_IS_BIG_ENDIAN_IEEE754 -# undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 -# undef HAVE_GCC_ASM_FOR_X87 - -# undef VA_LIST_IS_ARRAY -# if defined(__LP64__) && defined(__x86_64__) -# define VA_LIST_IS_ARRAY 1 -# endif - -# undef HAVE_LARGEFILE_SUPPORT -# ifndef __LP64__ -# define HAVE_LARGEFILE_SUPPORT 1 -# endif - -# undef SIZEOF_LONG -# ifdef __LP64__ -# define SIZEOF__BOOL 1 -# define SIZEOF__BOOL 1 -# define SIZEOF_LONG 8 -# define SIZEOF_PTHREAD_T 8 -# define SIZEOF_SIZE_T 8 -# define SIZEOF_TIME_T 8 -# define SIZEOF_VOID_P 8 -# define SIZEOF_UINTPTR_T 8 -# define SIZEOF_PTHREAD_T 8 -# else -# ifdef __ppc__ -# define SIZEOF__BOOL 4 -# else -# define SIZEOF__BOOL 1 -# endif -# define SIZEOF_LONG 4 -# define SIZEOF_PTHREAD_T 4 -# define SIZEOF_SIZE_T 4 -# define SIZEOF_TIME_T 4 -# define SIZEOF_VOID_P 4 -# define SIZEOF_UINTPTR_T 4 -# define SIZEOF_PTHREAD_T 4 -# endif - -# if defined(__LP64__) - /* MacOSX 10.4 (the first release to support 64-bit code - * at all) only supports 64-bit in the UNIX layer. - * Therefore surpress the toolbox-glue in 64-bit mode. - */ - - /* In 64-bit mode setpgrp always has no argments, in 32-bit - * mode that depends on the compilation environment - */ -# undef SETPGRP_HAVE_ARG - -# endif - -#ifdef __BIG_ENDIAN__ -#define WORDS_BIGENDIAN 1 -#define DOUBLE_IS_BIG_ENDIAN_IEEE754 -#else -#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 -#endif /* __BIG_ENDIAN */ - -#ifdef __i386__ -# define HAVE_GCC_ASM_FOR_X87 -#endif - - /* - * The definition in pyconfig.h is only valid on the OS release - * where configure ran on and not necessarily for all systems where - * the executable can be used on. - * - * Specifically: OSX 10.4 has limited supported for '%zd', while - * 10.5 has full support for '%zd'. A binary built on 10.5 won't - * work properly on 10.4 unless we surpress the definition - * of PY_FORMAT_SIZE_T - */ -#undef PY_FORMAT_SIZE_T - - -#endif /* defined(_APPLE__) */ - -#endif /* PYMACCONFIG_H */ diff --git a/python/include/pymactoolbox.h b/python/include/pymactoolbox.h deleted file mode 100644 index fd159752..00000000 --- a/python/include/pymactoolbox.h +++ /dev/null @@ -1,217 +0,0 @@ -/* -** pymactoolbox.h - globals defined in mactoolboxglue.c -*/ -#ifndef Py_PYMACTOOLBOX_H -#define Py_PYMACTOOLBOX_H -#ifdef __cplusplus - extern "C" { -#endif - -#include - -#ifndef __LP64__ -#include -#endif /* !__LP64__ */ - -/* -** Helper routines for error codes and such. -*/ -char *PyMac_StrError(int); /* strerror with mac errors */ -extern PyObject *PyMac_OSErrException; /* Exception for OSErr */ -PyObject *PyMac_GetOSErrException(void); /* Initialize & return it */ -PyObject *PyErr_Mac(PyObject *, int); /* Exception with a mac error */ -PyObject *PyMac_Error(OSErr); /* Uses PyMac_GetOSErrException */ -#ifndef __LP64__ -extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert - fsspec->path */ -#endif /* __LP64__ */ - -/* -** These conversion routines are defined in mactoolboxglue.c itself. -*/ -int PyMac_GetOSType(PyObject *, OSType *); /* argument parser for OSType */ -PyObject *PyMac_BuildOSType(OSType); /* Convert OSType to PyObject */ - -PyObject *PyMac_BuildNumVersion(NumVersion);/* Convert NumVersion to PyObject */ - -int PyMac_GetStr255(PyObject *, Str255); /* argument parser for Str255 */ -PyObject *PyMac_BuildStr255(Str255); /* Convert Str255 to PyObject */ -PyObject *PyMac_BuildOptStr255(Str255); /* Convert Str255 to PyObject, - NULL to None */ - -int PyMac_GetRect(PyObject *, Rect *); /* argument parser for Rect */ -PyObject *PyMac_BuildRect(Rect *); /* Convert Rect to PyObject */ - -int PyMac_GetPoint(PyObject *, Point *); /* argument parser for Point */ -PyObject *PyMac_BuildPoint(Point); /* Convert Point to PyObject */ - -int PyMac_GetEventRecord(PyObject *, EventRecord *); /* argument parser for - EventRecord */ -PyObject *PyMac_BuildEventRecord(EventRecord *); /* Convert EventRecord to - PyObject */ - -int PyMac_GetFixed(PyObject *, Fixed *); /* argument parser for Fixed */ -PyObject *PyMac_BuildFixed(Fixed); /* Convert Fixed to PyObject */ -int PyMac_Getwide(PyObject *, wide *); /* argument parser for wide */ -PyObject *PyMac_Buildwide(wide *); /* Convert wide to PyObject */ - -/* -** The rest of the routines are implemented by extension modules. If they are -** dynamically loaded mactoolboxglue will contain a stub implementation of the -** routine, which imports the module, whereupon the module's init routine will -** communicate the routine pointer back to the stub. -** If USE_TOOLBOX_OBJECT_GLUE is not defined there is no glue code, and the -** extension modules simply declare the routine. This is the case for static -** builds (and could be the case for MacPython CFM builds, because CFM extension -** modules can reference each other without problems). -*/ - -#ifdef USE_TOOLBOX_OBJECT_GLUE -/* -** These macros are used in the module init code. If we use toolbox object glue -** it sets the function pointer to point to the real function. -*/ -#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) { \ - extern PyObject *(*PyMacGluePtr_##rtn)(object); \ - PyMacGluePtr_##rtn = _##rtn; \ -} -#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) { \ - extern int (*PyMacGluePtr_##rtn)(PyObject *, object *); \ - PyMacGluePtr_##rtn = _##rtn; \ -} -#else -/* -** If we don't use toolbox object glue the init macros are empty. Moreover, we define -** _xxx_New to be the same as xxx_New, and the code in mactoolboxglue isn't included. -*/ -#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) -#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) -#endif /* USE_TOOLBOX_OBJECT_GLUE */ - -/* macfs exports */ -#ifndef __LP64__ -int PyMac_GetFSSpec(PyObject *, FSSpec *); /* argument parser for FSSpec */ -PyObject *PyMac_BuildFSSpec(FSSpec *); /* Convert FSSpec to PyObject */ -#endif /* !__LP64__ */ - -int PyMac_GetFSRef(PyObject *, FSRef *); /* argument parser for FSRef */ -PyObject *PyMac_BuildFSRef(FSRef *); /* Convert FSRef to PyObject */ - -/* AE exports */ -extern PyObject *AEDesc_New(AppleEvent *); /* XXXX Why passed by address?? */ -extern PyObject *AEDesc_NewBorrowed(AppleEvent *); -extern int AEDesc_Convert(PyObject *, AppleEvent *); - -/* Cm exports */ -extern PyObject *CmpObj_New(Component); -extern int CmpObj_Convert(PyObject *, Component *); -extern PyObject *CmpInstObj_New(ComponentInstance); -extern int CmpInstObj_Convert(PyObject *, ComponentInstance *); - -/* Ctl exports */ -#ifndef __LP64__ -extern PyObject *CtlObj_New(ControlHandle); -extern int CtlObj_Convert(PyObject *, ControlHandle *); -#endif /* !__LP64__ */ - -/* Dlg exports */ -#ifndef __LP64__ -extern PyObject *DlgObj_New(DialogPtr); -extern int DlgObj_Convert(PyObject *, DialogPtr *); -extern PyObject *DlgObj_WhichDialog(DialogPtr); -#endif /* !__LP64__ */ - -/* Drag exports */ -#ifndef __LP64__ -extern PyObject *DragObj_New(DragReference); -extern int DragObj_Convert(PyObject *, DragReference *); -#endif /* !__LP64__ */ - -/* List exports */ -#ifndef __LP64__ -extern PyObject *ListObj_New(ListHandle); -extern int ListObj_Convert(PyObject *, ListHandle *); -#endif /* !__LP64__ */ - -/* Menu exports */ -#ifndef __LP64__ -extern PyObject *MenuObj_New(MenuHandle); -extern int MenuObj_Convert(PyObject *, MenuHandle *); -#endif /* !__LP64__ */ - -/* Qd exports */ -#ifndef __LP64__ -extern PyObject *GrafObj_New(GrafPtr); -extern int GrafObj_Convert(PyObject *, GrafPtr *); -extern PyObject *BMObj_New(BitMapPtr); -extern int BMObj_Convert(PyObject *, BitMapPtr *); -extern PyObject *QdRGB_New(RGBColor *); -extern int QdRGB_Convert(PyObject *, RGBColor *); -#endif /* !__LP64__ */ - -/* Qdoffs exports */ -#ifndef __LP64__ -extern PyObject *GWorldObj_New(GWorldPtr); -extern int GWorldObj_Convert(PyObject *, GWorldPtr *); -#endif /* !__LP64__ */ - -/* Qt exports */ -#ifndef __LP64__ -extern PyObject *TrackObj_New(Track); -extern int TrackObj_Convert(PyObject *, Track *); -extern PyObject *MovieObj_New(Movie); -extern int MovieObj_Convert(PyObject *, Movie *); -extern PyObject *MovieCtlObj_New(MovieController); -extern int MovieCtlObj_Convert(PyObject *, MovieController *); -extern PyObject *TimeBaseObj_New(TimeBase); -extern int TimeBaseObj_Convert(PyObject *, TimeBase *); -extern PyObject *UserDataObj_New(UserData); -extern int UserDataObj_Convert(PyObject *, UserData *); -extern PyObject *MediaObj_New(Media); -extern int MediaObj_Convert(PyObject *, Media *); -#endif /* !__LP64__ */ - -/* Res exports */ -extern PyObject *ResObj_New(Handle); -extern int ResObj_Convert(PyObject *, Handle *); -extern PyObject *OptResObj_New(Handle); -extern int OptResObj_Convert(PyObject *, Handle *); - -/* TE exports */ -#ifndef __LP64__ -extern PyObject *TEObj_New(TEHandle); -extern int TEObj_Convert(PyObject *, TEHandle *); -#endif /* !__LP64__ */ - -/* Win exports */ -#ifndef __LP64__ -extern PyObject *WinObj_New(WindowPtr); -extern int WinObj_Convert(PyObject *, WindowPtr *); -extern PyObject *WinObj_WhichWindow(WindowPtr); -#endif /* !__LP64__ */ - -/* CF exports */ -extern PyObject *CFObj_New(CFTypeRef); -extern int CFObj_Convert(PyObject *, CFTypeRef *); -extern PyObject *CFTypeRefObj_New(CFTypeRef); -extern int CFTypeRefObj_Convert(PyObject *, CFTypeRef *); -extern PyObject *CFStringRefObj_New(CFStringRef); -extern int CFStringRefObj_Convert(PyObject *, CFStringRef *); -extern PyObject *CFMutableStringRefObj_New(CFMutableStringRef); -extern int CFMutableStringRefObj_Convert(PyObject *, CFMutableStringRef *); -extern PyObject *CFArrayRefObj_New(CFArrayRef); -extern int CFArrayRefObj_Convert(PyObject *, CFArrayRef *); -extern PyObject *CFMutableArrayRefObj_New(CFMutableArrayRef); -extern int CFMutableArrayRefObj_Convert(PyObject *, CFMutableArrayRef *); -extern PyObject *CFDictionaryRefObj_New(CFDictionaryRef); -extern int CFDictionaryRefObj_Convert(PyObject *, CFDictionaryRef *); -extern PyObject *CFMutableDictionaryRefObj_New(CFMutableDictionaryRef); -extern int CFMutableDictionaryRefObj_Convert(PyObject *, CFMutableDictionaryRef *); -extern PyObject *CFURLRefObj_New(CFURLRef); -extern int CFURLRefObj_Convert(PyObject *, CFURLRef *); -extern int OptionalCFURLRefObj_Convert(PyObject *, CFURLRef *); - -#ifdef __cplusplus - } -#endif -#endif diff --git a/python/include/pymath.h b/python/include/pymath.h deleted file mode 100644 index f77ce930..00000000 --- a/python/include/pymath.h +++ /dev/null @@ -1,192 +0,0 @@ -#ifndef Py_PYMATH_H -#define Py_PYMATH_H - -#include "pyconfig.h" /* include for defines */ - -/************************************************************************** -Symbols and macros to supply platform-independent interfaces to mathematical -functions and constants -**************************************************************************/ - -/* Python provides implementations for copysign, round and hypot in - * Python/pymath.c just in case your math library doesn't provide the - * functions. - * - *Note: PC/pyconfig.h defines copysign as _copysign - */ -#ifndef HAVE_COPYSIGN -extern double copysign(double, double); -#endif - -#ifndef HAVE_ROUND -extern double round(double); -#endif - -#ifndef HAVE_HYPOT -extern double hypot(double, double); -#endif - -/* extra declarations */ -#ifndef _MSC_VER -#ifndef __STDC__ -//extern double fmod (double, double); -//extern double frexp (double, int *); -//extern double ldexp (double, int); -//extern double modf (double, double *); -//extern double pow(double, double); -#endif /* __STDC__ */ -#endif /* _MSC_VER */ - -#ifdef _OSF_SOURCE -/* OSF1 5.1 doesn't make these available with XOPEN_SOURCE_EXTENDED defined */ -extern int finite(double); -extern double copysign(double, double); -#endif - -/* High precision defintion of pi and e (Euler) - * The values are taken from libc6's math.h. - */ -#ifndef Py_MATH_PIl -#define Py_MATH_PIl 3.1415926535897932384626433832795029L -#endif -#ifndef Py_MATH_PI -#define Py_MATH_PI 3.14159265358979323846 -#endif - -#ifndef Py_MATH_El -#define Py_MATH_El 2.7182818284590452353602874713526625L -#endif - -#ifndef Py_MATH_E -#define Py_MATH_E 2.7182818284590452354 -#endif - -/* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU - register and into a 64-bit memory location, rounding from extended - precision to double precision in the process. On other platforms it does - nothing. */ - -/* we take double rounding as evidence of x87 usage */ -#ifndef Py_FORCE_DOUBLE -# ifdef X87_DOUBLE_ROUNDING -PyAPI_FUNC(double) _Py_force_double(double); -# define Py_FORCE_DOUBLE(X) (_Py_force_double(X)) -# else -# define Py_FORCE_DOUBLE(X) (X) -# endif -#endif - -#ifdef HAVE_GCC_ASM_FOR_X87 -PyAPI_FUNC(unsigned short) _Py_get_387controlword(void); -PyAPI_FUNC(void) _Py_set_387controlword(unsigned short); -#endif - -/* Py_IS_NAN(X) - * Return 1 if float or double arg is a NaN, else 0. - * Caution: - * X is evaluated more than once. - * This may not work on all platforms. Each platform has *some* - * way to spell this, though -- override in pyconfig.h if you have - * a platform where it doesn't work. - * Note: PC/pyconfig.h defines Py_IS_NAN as _isnan - */ -#ifndef Py_IS_NAN -#if defined HAVE_DECL_ISNAN && HAVE_DECL_ISNAN == 1 -#define Py_IS_NAN(X) isnan(X) -#else -#define Py_IS_NAN(X) ((X) != (X)) -#endif -#endif - -/* Py_IS_INFINITY(X) - * Return 1 if float or double arg is an infinity, else 0. - * Caution: - * X is evaluated more than once. - * This implementation may set the underflow flag if |X| is very small; - * it really can't be implemented correctly (& easily) before C99. - * Override in pyconfig.h if you have a better spelling on your platform. - * Py_FORCE_DOUBLE is used to avoid getting false negatives from a - * non-infinite value v sitting in an 80-bit x87 register such that - * v becomes infinite when spilled from the register to 64-bit memory. - * Note: PC/pyconfig.h defines Py_IS_INFINITY as _isinf - */ -#ifndef Py_IS_INFINITY -# if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1 -# define Py_IS_INFINITY(X) isinf(X) -# else -# define Py_IS_INFINITY(X) ((X) && \ - (Py_FORCE_DOUBLE(X)*0.5 == Py_FORCE_DOUBLE(X))) -# endif -#endif - -/* Py_IS_FINITE(X) - * Return 1 if float or double arg is neither infinite nor NAN, else 0. - * Some compilers (e.g. VisualStudio) have intrisics for this, so a special - * macro for this particular test is useful - * Note: PC/pyconfig.h defines Py_IS_FINITE as _finite - */ -#ifndef Py_IS_FINITE -#if defined HAVE_DECL_ISFINITE && HAVE_DECL_ISFINITE == 1 -#define Py_IS_FINITE(X) isfinite(X) -#elif defined HAVE_FINITE -#define Py_IS_FINITE(X) finite(X) -#else -#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X)) -#endif -#endif - -/* HUGE_VAL is supposed to expand to a positive double infinity. Python - * uses Py_HUGE_VAL instead because some platforms are broken in this - * respect. We used to embed code in pyport.h to try to worm around that, - * but different platforms are broken in conflicting ways. If you're on - * a platform where HUGE_VAL is defined incorrectly, fiddle your Python - * config to #define Py_HUGE_VAL to something that works on your platform. - */ -#ifndef Py_HUGE_VAL -#define Py_HUGE_VAL HUGE_VAL -#endif - -/* Py_NAN - * A value that evaluates to a NaN. On IEEE 754 platforms INF*0 or - * INF/INF works. Define Py_NO_NAN in pyconfig.h if your platform - * doesn't support NaNs. - */ -#if !defined(Py_NAN) && !defined(Py_NO_NAN) -#define Py_NAN (Py_HUGE_VAL * 0.) -#endif - -/* Py_OVERFLOWED(X) - * Return 1 iff a libm function overflowed. Set errno to 0 before calling - * a libm function, and invoke this macro after, passing the function - * result. - * Caution: - * This isn't reliable. C99 no longer requires libm to set errno under - * any exceptional condition, but does require +- HUGE_VAL return - * values on overflow. A 754 box *probably* maps HUGE_VAL to a - * double infinity, and we're cool if that's so, unless the input - * was an infinity and an infinity is the expected result. A C89 - * system sets errno to ERANGE, so we check for that too. We're - * out of luck if a C99 754 box doesn't map HUGE_VAL to +Inf, or - * if the returned result is a NaN, or if a C89 box returns HUGE_VAL - * in non-overflow cases. - * X is evaluated more than once. - * Some platforms have better way to spell this, so expect some #ifdef'ery. - * - * OpenBSD uses 'isinf()' because a compiler bug on that platform causes - * the longer macro version to be mis-compiled. This isn't optimal, and - * should be removed once a newer compiler is available on that platform. - * The system that had the failure was running OpenBSD 3.2 on Intel, with - * gcc 2.95.3. - * - * According to Tim's checkin, the FreeBSD systems use isinf() to work - * around a FPE bug on that platform. - */ -#if defined(__FreeBSD__) || defined(__OpenBSD__) -#define Py_OVERFLOWED(X) isinf(X) -#else -#define Py_OVERFLOWED(X) ((X) != 0.0 && (errno == ERANGE || \ - (X) == Py_HUGE_VAL || \ - (X) == -Py_HUGE_VAL)) -#endif - -#endif /* Py_PYMATH_H */ diff --git a/python/include/pymem.h b/python/include/pymem.h deleted file mode 100644 index 10b5bea5..00000000 --- a/python/include/pymem.h +++ /dev/null @@ -1,122 +0,0 @@ -/* The PyMem_ family: low-level memory allocation interfaces. - See objimpl.h for the PyObject_ memory family. -*/ - -#ifndef Py_PYMEM_H -#define Py_PYMEM_H - -#include "pyport.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* BEWARE: - - Each interface exports both functions and macros. Extension modules should - use the functions, to ensure binary compatibility across Python versions. - Because the Python implementation is free to change internal details, and - the macros may (or may not) expose details for speed, if you do use the - macros you must recompile your extensions with each Python release. - - Never mix calls to PyMem_ with calls to the platform malloc/realloc/ - calloc/free. For example, on Windows different DLLs may end up using - different heaps, and if you use PyMem_Malloc you'll get the memory from the - heap used by the Python DLL; it could be a disaster if you free()'ed that - directly in your own extension. Using PyMem_Free instead ensures Python - can return the memory to the proper heap. As another example, in - PYMALLOC_DEBUG mode, Python wraps all calls to all PyMem_ and PyObject_ - memory functions in special debugging wrappers that add additional - debugging info to dynamic memory blocks. The system routines have no idea - what to do with that stuff, and the Python wrappers have no idea what to do - with raw blocks obtained directly by the system routines then. - - The GIL must be held when using these APIs. -*/ - -/* - * Raw memory interface - * ==================== - */ - -/* Functions - - Functions supplying platform-independent semantics for malloc/realloc/ - free. These functions make sure that allocating 0 bytes returns a distinct - non-NULL pointer (whenever possible -- if we're flat out of memory, NULL - may be returned), even if the platform malloc and realloc don't. - Returned pointers must be checked for NULL explicitly. No action is - performed on failure (no exception is set, no warning is printed, etc). -*/ - -PyAPI_FUNC(void *) PyMem_Malloc(size_t); -PyAPI_FUNC(void *) PyMem_Realloc(void *, size_t); -PyAPI_FUNC(void) PyMem_Free(void *); - -/* Starting from Python 1.6, the wrappers Py_{Malloc,Realloc,Free} are - no longer supported. They used to call PyErr_NoMemory() on failure. */ - -/* Macros. */ -#ifdef PYMALLOC_DEBUG -/* Redirect all memory operations to Python's debugging allocator. */ -#define PyMem_MALLOC _PyMem_DebugMalloc -#define PyMem_REALLOC _PyMem_DebugRealloc -#define PyMem_FREE _PyMem_DebugFree - -#else /* ! PYMALLOC_DEBUG */ - -/* PyMem_MALLOC(0) means malloc(1). Some systems would return NULL - for malloc(0), which would be treated as an error. Some platforms - would return a pointer with no memory behind it, which would break - pymalloc. To solve these problems, allocate an extra byte. */ -/* Returns NULL to indicate error if a negative size or size larger than - Py_ssize_t can represent is supplied. Helps prevents security holes. */ -#define PyMem_MALLOC(n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \ - : malloc((n) ? (n) : 1)) -#define PyMem_REALLOC(p, n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \ - : realloc((p), (n) ? (n) : 1)) -#define PyMem_FREE free - -#endif /* PYMALLOC_DEBUG */ - -/* - * Type-oriented memory interface - * ============================== - * - * Allocate memory for n objects of the given type. Returns a new pointer - * or NULL if the request was too large or memory allocation failed. Use - * these macros rather than doing the multiplication yourself so that proper - * overflow checking is always done. - */ - -#define PyMem_New(type, n) \ - ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ - ( (type *) PyMem_Malloc((n) * sizeof(type)) ) ) -#define PyMem_NEW(type, n) \ - ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ - ( (type *) PyMem_MALLOC((n) * sizeof(type)) ) ) - -/* - * The value of (p) is always clobbered by this macro regardless of success. - * The caller MUST check if (p) is NULL afterwards and deal with the memory - * error if so. This means the original value of (p) MUST be saved for the - * caller's memory error handler to not lose track of it. - */ -#define PyMem_Resize(p, type, n) \ - ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ - (type *) PyMem_Realloc((p), (n) * sizeof(type)) ) -#define PyMem_RESIZE(p, type, n) \ - ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ - (type *) PyMem_REALLOC((p), (n) * sizeof(type)) ) - -/* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used - * anymore. They're just confusing aliases for PyMem_{Free,FREE} now. - */ -#define PyMem_Del PyMem_Free -#define PyMem_DEL PyMem_FREE - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_PYMEM_H */ diff --git a/python/include/pyport.h b/python/include/pyport.h deleted file mode 100644 index 693d0935..00000000 --- a/python/include/pyport.h +++ /dev/null @@ -1,904 +0,0 @@ -#ifndef Py_PYPORT_H -#define Py_PYPORT_H - -#include "pyconfig.h" /* include for defines */ - -/* Some versions of HP-UX & Solaris need inttypes.h for int32_t, - INT32_MAX, etc. */ -#ifdef HAVE_INTTYPES_H -#include -#endif - -#ifdef HAVE_STDINT_H -#include -#endif - -/************************************************************************** -Symbols and macros to supply platform-independent interfaces to basic -C language & library operations whose spellings vary across platforms. - -Please try to make documentation here as clear as possible: by definition, -the stuff here is trying to illuminate C's darkest corners. - -Config #defines referenced here: - -SIGNED_RIGHT_SHIFT_ZERO_FILLS -Meaning: To be defined iff i>>j does not extend the sign bit when i is a - signed integral type and i < 0. -Used in: Py_ARITHMETIC_RIGHT_SHIFT - -Py_DEBUG -Meaning: Extra checks compiled in for debug mode. -Used in: Py_SAFE_DOWNCAST - -HAVE_UINTPTR_T -Meaning: The C9X type uintptr_t is supported by the compiler -Used in: Py_uintptr_t - -HAVE_LONG_LONG -Meaning: The compiler supports the C type "long long" -Used in: PY_LONG_LONG - -**************************************************************************/ - - -/* For backward compatibility only. Obsolete, do not use. */ -#ifdef HAVE_PROTOTYPES -#define Py_PROTO(x) x -#else -#define Py_PROTO(x) () -#endif -#ifndef Py_FPROTO -#define Py_FPROTO(x) Py_PROTO(x) -#endif - -/* typedefs for some C9X-defined synonyms for integral types. - * - * The names in Python are exactly the same as the C9X names, except with a - * Py_ prefix. Until C9X is universally implemented, this is the only way - * to ensure that Python gets reliable names that don't conflict with names - * in non-Python code that are playing their own tricks to define the C9X - * names. - * - * NOTE: don't go nuts here! Python has no use for *most* of the C9X - * integral synonyms. Only define the ones we actually need. - */ - -#ifdef HAVE_LONG_LONG -#ifndef PY_LONG_LONG -#define PY_LONG_LONG long long -#if defined(LLONG_MAX) -/* If LLONG_MAX is defined in limits.h, use that. */ -#define PY_LLONG_MIN LLONG_MIN -#define PY_LLONG_MAX LLONG_MAX -#define PY_ULLONG_MAX ULLONG_MAX -#elif defined(__LONG_LONG_MAX__) -/* Otherwise, if GCC has a builtin define, use that. */ -#define PY_LLONG_MAX __LONG_LONG_MAX__ -#define PY_LLONG_MIN (-PY_LLONG_MAX-1) -#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL) -#else -/* Otherwise, rely on two's complement. */ -#define PY_ULLONG_MAX (~0ULL) -#define PY_LLONG_MAX ((long long)(PY_ULLONG_MAX>>1)) -#define PY_LLONG_MIN (-PY_LLONG_MAX-1) -#endif /* LLONG_MAX */ -#endif -#endif /* HAVE_LONG_LONG */ - -/* a build with 30-bit digits for Python long integers needs an exact-width - * 32-bit unsigned integer type to store those digits. (We could just use - * type 'unsigned long', but that would be wasteful on a system where longs - * are 64-bits.) On Unix systems, the autoconf macro AC_TYPE_UINT32_T defines - * uint32_t to be such a type unless stdint.h or inttypes.h defines uint32_t. - * However, it doesn't set HAVE_UINT32_T, so we do that here. - */ -#if (defined UINT32_MAX || defined uint32_t) -#ifndef PY_UINT32_T -#define HAVE_UINT32_T 1 -#define PY_UINT32_T uint32_t -#endif -#endif - -/* Macros for a 64-bit unsigned integer type; used for type 'twodigits' in the - * long integer implementation, when 30-bit digits are enabled. - */ -#if (defined UINT64_MAX || defined uint64_t) -#ifndef PY_UINT64_T -#define HAVE_UINT64_T 1 -#define PY_UINT64_T uint64_t -#endif -#endif - -/* Signed variants of the above */ -#if (defined INT32_MAX || defined int32_t) -#ifndef PY_INT32_T -#define HAVE_INT32_T 1 -#define PY_INT32_T int32_t -#endif -#endif -#if (defined INT64_MAX || defined int64_t) -#ifndef PY_INT64_T -#define HAVE_INT64_T 1 -#define PY_INT64_T int64_t -#endif -#endif - -/* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all - the necessary integer types are available, and we're on a 64-bit platform - (as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */ - -#ifndef PYLONG_BITS_IN_DIGIT -#if (defined HAVE_UINT64_T && defined HAVE_INT64_T && \ - defined HAVE_UINT32_T && defined HAVE_INT32_T && SIZEOF_VOID_P >= 8) -#define PYLONG_BITS_IN_DIGIT 30 -#else -#define PYLONG_BITS_IN_DIGIT 15 -#endif -#endif - -/* uintptr_t is the C9X name for an unsigned integral type such that a - * legitimate void* can be cast to uintptr_t and then back to void* again - * without loss of information. Similarly for intptr_t, wrt a signed - * integral type. - */ -#ifdef HAVE_UINTPTR_T -typedef uintptr_t Py_uintptr_t; -typedef intptr_t Py_intptr_t; - -#elif SIZEOF_VOID_P <= SIZEOF_INT -typedef unsigned int Py_uintptr_t; -typedef int Py_intptr_t; - -#elif SIZEOF_VOID_P <= SIZEOF_LONG -typedef unsigned long Py_uintptr_t; -typedef long Py_intptr_t; - -#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P <= SIZEOF_LONG_LONG) -typedef unsigned PY_LONG_LONG Py_uintptr_t; -typedef PY_LONG_LONG Py_intptr_t; - -#else -# error "Python needs a typedef for Py_uintptr_t in pyport.h." -#endif /* HAVE_UINTPTR_T */ - -/* Py_ssize_t is a signed integral type such that sizeof(Py_ssize_t) == - * sizeof(size_t). C99 doesn't define such a thing directly (size_t is an - * unsigned integral type). See PEP 353 for details. - */ -#ifdef HAVE_SSIZE_T -typedef ssize_t Py_ssize_t; -#elif SIZEOF_VOID_P == SIZEOF_SIZE_T -typedef Py_intptr_t Py_ssize_t; -#else -# error "Python needs a typedef for Py_ssize_t in pyport.h." -#endif - -/* Largest possible value of size_t. - SIZE_MAX is part of C99, so it might be defined on some - platforms. If it is not defined, (size_t)-1 is a portable - definition for C89, due to the way signed->unsigned - conversion is defined. */ -#ifdef SIZE_MAX -#define PY_SIZE_MAX SIZE_MAX -#else -#define PY_SIZE_MAX ((size_t)-1) -#endif - -/* Largest positive value of type Py_ssize_t. */ -#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1)) -/* Smallest negative value of type Py_ssize_t. */ -#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1) - -#if SIZEOF_PID_T > SIZEOF_LONG -# error "Python doesn't support sizeof(pid_t) > sizeof(long)" -#endif - -/* PY_FORMAT_SIZE_T is a platform-specific modifier for use in a printf - * format to convert an argument with the width of a size_t or Py_ssize_t. - * C99 introduced "z" for this purpose, but not all platforms support that; - * e.g., MS compilers use "I" instead. - * - * These "high level" Python format functions interpret "z" correctly on - * all platforms (Python interprets the format string itself, and does whatever - * the platform C requires to convert a size_t/Py_ssize_t argument): - * - * PyString_FromFormat - * PyErr_Format - * PyString_FromFormatV - * - * Lower-level uses require that you interpolate the correct format modifier - * yourself (e.g., calling printf, fprintf, sprintf, PyOS_snprintf); for - * example, - * - * Py_ssize_t index; - * fprintf(stderr, "index %" PY_FORMAT_SIZE_T "d sucks\n", index); - * - * That will expand to %ld, or %Id, or to something else correct for a - * Py_ssize_t on the platform. - */ -#ifndef PY_FORMAT_SIZE_T -# if SIZEOF_SIZE_T == SIZEOF_INT && !defined(__APPLE__) -# define PY_FORMAT_SIZE_T "" -# elif SIZEOF_SIZE_T == SIZEOF_LONG -# define PY_FORMAT_SIZE_T "l" -# elif defined(MS_WINDOWS) -# define PY_FORMAT_SIZE_T "I" -# else -# error "This platform's pyconfig.h needs to define PY_FORMAT_SIZE_T" -# endif -#endif - -/* PY_FORMAT_LONG_LONG is analogous to PY_FORMAT_SIZE_T above, but for - * the long long type instead of the size_t type. It's only available - * when HAVE_LONG_LONG is defined. The "high level" Python format - * functions listed above will interpret "lld" or "llu" correctly on - * all platforms. - */ -#ifdef HAVE_LONG_LONG -# ifndef PY_FORMAT_LONG_LONG -# if defined(MS_WIN64) || defined(MS_WINDOWS) -# define PY_FORMAT_LONG_LONG "I64" -# else -# error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG" -# endif -# endif -#endif - -/* Py_LOCAL can be used instead of static to get the fastest possible calling - * convention for functions that are local to a given module. - * - * Py_LOCAL_INLINE does the same thing, and also explicitly requests inlining, - * for platforms that support that. - * - * If PY_LOCAL_AGGRESSIVE is defined before python.h is included, more - * "aggressive" inlining/optimizaion is enabled for the entire module. This - * may lead to code bloat, and may slow things down for those reasons. It may - * also lead to errors, if the code relies on pointer aliasing. Use with - * care. - * - * NOTE: You can only use this for functions that are entirely local to a - * module; functions that are exported via method tables, callbacks, etc, - * should keep using static. - */ - -#undef USE_INLINE /* XXX - set via configure? */ - -#if defined(_MSC_VER) -#if defined(PY_LOCAL_AGGRESSIVE) -/* enable more aggressive optimization for visual studio */ -#pragma optimize("agtw", on) -#endif -/* ignore warnings if the compiler decides not to inline a function */ -#pragma warning(disable: 4710) -/* fastest possible local call under MSVC */ -#define Py_LOCAL(type) static type -#define Py_LOCAL_INLINE(type) static __inline type -#elif defined(USE_INLINE) -#define Py_LOCAL(type) static type -#define Py_LOCAL_INLINE(type) static inline type -#else -#define Py_LOCAL(type) static type -#define Py_LOCAL_INLINE(type) static type -#endif - -/* Py_MEMCPY can be used instead of memcpy in cases where the copied blocks - * are often very short. While most platforms have highly optimized code for - * large transfers, the setup costs for memcpy are often quite high. MEMCPY - * solves this by doing short copies "in line". - */ - -#if defined(_MSC_VER) -#define Py_MEMCPY(target, source, length) do { \ - size_t i_, n_ = (length); \ - char *t_ = (void*) (target); \ - const char *s_ = (void*) (source); \ - if (n_ >= 16) \ - memcpy(t_, s_, n_); \ - else \ - for (i_ = 0; i_ < n_; i_++) \ - t_[i_] = s_[i_]; \ - } while (0) -#else -#define Py_MEMCPY memcpy -#endif - -#include - -#ifdef HAVE_IEEEFP_H -#include /* needed for 'finite' declaration on some platforms */ -#endif - -#include /* Moved here from the math section, before extern "C" */ - -/******************************************** - * WRAPPER FOR and/or * - ********************************************/ - -#ifdef TIME_WITH_SYS_TIME -#include -#include -#else /* !TIME_WITH_SYS_TIME */ -#ifdef HAVE_SYS_TIME_H -#include -#else /* !HAVE_SYS_TIME_H */ -#include -#endif /* !HAVE_SYS_TIME_H */ -#endif /* !TIME_WITH_SYS_TIME */ - - -/****************************** - * WRAPPER FOR * - ******************************/ - -/* NB caller must include */ - -#ifdef HAVE_SYS_SELECT_H - -#include - -#endif /* !HAVE_SYS_SELECT_H */ - -/******************************* - * stat() and fstat() fiddling * - *******************************/ - -/* We expect that stat and fstat exist on most systems. - * It's confirmed on Unix, Mac and Windows. - * If you don't have them, add - * #define DONT_HAVE_STAT - * and/or - * #define DONT_HAVE_FSTAT - * to your pyconfig.h. Python code beyond this should check HAVE_STAT and - * HAVE_FSTAT instead. - * Also - * #define HAVE_SYS_STAT_H - * if exists on your platform, and - * #define HAVE_STAT_H - * if does. - */ -#ifndef DONT_HAVE_STAT -#define HAVE_STAT -#endif - -#ifndef DONT_HAVE_FSTAT -#define HAVE_FSTAT -#endif - -#ifdef RISCOS -#include -#include "unixstuff.h" -#endif - -#ifdef HAVE_SYS_STAT_H -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#include -#endif -#include -#elif defined(HAVE_STAT_H) -#include -#endif - -#if defined(PYCC_VACPP) -/* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */ -#define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG) -#endif - -#ifndef S_ISREG -#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) -#endif - -#ifndef S_ISDIR -#define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR) -#endif - - -#ifdef __cplusplus -/* Move this down here since some C++ #include's don't like to be included - inside an extern "C" */ -extern "C" { -#endif - - -/* Py_ARITHMETIC_RIGHT_SHIFT - * C doesn't define whether a right-shift of a signed integer sign-extends - * or zero-fills. Here a macro to force sign extension: - * Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) - * Return I >> J, forcing sign extension. Arithmetically, return the - * floor of I/2**J. - * Requirements: - * I should have signed integer type. In the terminology of C99, this can - * be either one of the five standard signed integer types (signed char, - * short, int, long, long long) or an extended signed integer type. - * J is an integer >= 0 and strictly less than the number of bits in the - * type of I (because C doesn't define what happens for J outside that - * range either). - * TYPE used to specify the type of I, but is now ignored. It's been left - * in for backwards compatibility with versions <= 2.6 or 3.0. - * Caution: - * I may be evaluated more than once. - */ -#ifdef SIGNED_RIGHT_SHIFT_ZERO_FILLS -#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) \ - ((I) < 0 ? -1-((-1-(I)) >> (J)) : (I) >> (J)) -#else -#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) ((I) >> (J)) -#endif - -/* Py_FORCE_EXPANSION(X) - * "Simply" returns its argument. However, macro expansions within the - * argument are evaluated. This unfortunate trickery is needed to get - * token-pasting to work as desired in some cases. - */ -#define Py_FORCE_EXPANSION(X) X - -/* Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) - * Cast VALUE to type NARROW from type WIDE. In Py_DEBUG mode, this - * assert-fails if any information is lost. - * Caution: - * VALUE may be evaluated more than once. - */ -#ifdef Py_DEBUG -#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) \ - (assert((WIDE)(NARROW)(VALUE) == (VALUE)), (NARROW)(VALUE)) -#else -#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) (NARROW)(VALUE) -#endif - -/* Py_SET_ERRNO_ON_MATH_ERROR(x) - * If a libm function did not set errno, but it looks like the result - * overflowed or not-a-number, set errno to ERANGE or EDOM. Set errno - * to 0 before calling a libm function, and invoke this macro after, - * passing the function result. - * Caution: - * This isn't reliable. See Py_OVERFLOWED comments. - * X is evaluated more than once. - */ -#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__hpux) && defined(__ia64)) -#define _Py_SET_EDOM_FOR_NAN(X) if (isnan(X)) errno = EDOM; -#else -#define _Py_SET_EDOM_FOR_NAN(X) ; -#endif -#define Py_SET_ERRNO_ON_MATH_ERROR(X) \ - do { \ - if (errno == 0) { \ - if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \ - errno = ERANGE; \ - else _Py_SET_EDOM_FOR_NAN(X) \ - } \ - } while(0) - -/* Py_SET_ERANGE_ON_OVERFLOW(x) - * An alias of Py_SET_ERRNO_ON_MATH_ERROR for backward-compatibility. - */ -#define Py_SET_ERANGE_IF_OVERFLOW(X) Py_SET_ERRNO_ON_MATH_ERROR(X) - -/* Py_ADJUST_ERANGE1(x) - * Py_ADJUST_ERANGE2(x, y) - * Set errno to 0 before calling a libm function, and invoke one of these - * macros after, passing the function result(s) (Py_ADJUST_ERANGE2 is useful - * for functions returning complex results). This makes two kinds of - * adjustments to errno: (A) If it looks like the platform libm set - * errno=ERANGE due to underflow, clear errno. (B) If it looks like the - * platform libm overflowed but didn't set errno, force errno to ERANGE. In - * effect, we're trying to force a useful implementation of C89 errno - * behavior. - * Caution: - * This isn't reliable. See Py_OVERFLOWED comments. - * X and Y may be evaluated more than once. - */ -#define Py_ADJUST_ERANGE1(X) \ - do { \ - if (errno == 0) { \ - if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \ - errno = ERANGE; \ - } \ - else if (errno == ERANGE && (X) == 0.0) \ - errno = 0; \ - } while(0) - -#define Py_ADJUST_ERANGE2(X, Y) \ - do { \ - if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL || \ - (Y) == Py_HUGE_VAL || (Y) == -Py_HUGE_VAL) { \ - if (errno == 0) \ - errno = ERANGE; \ - } \ - else if (errno == ERANGE) \ - errno = 0; \ - } while(0) - -/* The functions _Py_dg_strtod and _Py_dg_dtoa in Python/dtoa.c (which are - * required to support the short float repr introduced in Python 3.1) require - * that the floating-point unit that's being used for arithmetic operations - * on C doubles is set to use 53-bit precision. It also requires that the - * FPU rounding mode is round-half-to-even, but that's less often an issue. - * - * If your FPU isn't already set to 53-bit precision/round-half-to-even, and - * you want to make use of _Py_dg_strtod and _Py_dg_dtoa, then you should - * - * #define HAVE_PY_SET_53BIT_PRECISION 1 - * - * and also give appropriate definitions for the following three macros: - * - * _PY_SET_53BIT_PRECISION_START : store original FPU settings, and - * set FPU to 53-bit precision/round-half-to-even - * _PY_SET_53BIT_PRECISION_END : restore original FPU settings - * _PY_SET_53BIT_PRECISION_HEADER : any variable declarations needed to - * use the two macros above. - * - * The macros are designed to be used within a single C function: see - * Python/pystrtod.c for an example of their use. - */ - -/* get and set x87 control word for gcc/x86 */ -#ifdef HAVE_GCC_ASM_FOR_X87 -#define HAVE_PY_SET_53BIT_PRECISION 1 -/* _Py_get/set_387controlword functions are defined in Python/pymath.c */ -#define _Py_SET_53BIT_PRECISION_HEADER \ - unsigned short old_387controlword, new_387controlword -#define _Py_SET_53BIT_PRECISION_START \ - do { \ - old_387controlword = _Py_get_387controlword(); \ - new_387controlword = (old_387controlword & ~0x0f00) | 0x0200; \ - if (new_387controlword != old_387controlword) \ - _Py_set_387controlword(new_387controlword); \ - } while (0) -#define _Py_SET_53BIT_PRECISION_END \ - if (new_387controlword != old_387controlword) \ - _Py_set_387controlword(old_387controlword) -#endif - -/* default definitions are empty */ -#ifndef HAVE_PY_SET_53BIT_PRECISION -#define _Py_SET_53BIT_PRECISION_HEADER -#define _Py_SET_53BIT_PRECISION_START -#define _Py_SET_53BIT_PRECISION_END -#endif - -/* If we can't guarantee 53-bit precision, don't use the code - in Python/dtoa.c, but fall back to standard code. This - means that repr of a float will be long (17 sig digits). - - Realistically, there are two things that could go wrong: - - (1) doubles aren't IEEE 754 doubles, or - (2) we're on x86 with the rounding precision set to 64-bits - (extended precision), and we don't know how to change - the rounding precision. - */ - -#if !defined(DOUBLE_IS_LITTLE_ENDIAN_IEEE754) && \ - !defined(DOUBLE_IS_BIG_ENDIAN_IEEE754) && \ - !defined(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754) -#define PY_NO_SHORT_FLOAT_REPR -#endif - -/* double rounding is symptomatic of use of extended precision on x86. If - we're seeing double rounding, and we don't have any mechanism available for - changing the FPU rounding precision, then don't use Python/dtoa.c. */ -#if defined(X87_DOUBLE_ROUNDING) && !defined(HAVE_PY_SET_53BIT_PRECISION) -#define PY_NO_SHORT_FLOAT_REPR -#endif - -/* Py_DEPRECATED(version) - * Declare a variable, type, or function deprecated. - * Usage: - * extern int old_var Py_DEPRECATED(2.3); - * typedef int T1 Py_DEPRECATED(2.4); - * extern int x() Py_DEPRECATED(2.5); - */ -#if defined(__GNUC__) && ((__GNUC__ >= 4) || \ - (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)) -#define Py_DEPRECATED(VERSION_UNUSED) __attribute__((__deprecated__)) -#else -#define Py_DEPRECATED(VERSION_UNUSED) -#endif - -/************************************************************************** -Prototypes that are missing from the standard include files on some systems -(and possibly only some versions of such systems.) - -Please be conservative with adding new ones, document them and enclose them -in platform-specific #ifdefs. -**************************************************************************/ - -#ifdef SOLARIS -/* Unchecked */ -extern int gethostname(char *, int); -#endif - -#ifdef __BEOS__ -/* Unchecked */ -/* It's in the libs, but not the headers... - [cjh] */ -int shutdown( int, int ); -#endif - -#ifdef HAVE__GETPTY -#include /* we need to import mode_t */ -extern char * _getpty(int *, int, mode_t, int); -#endif - -/* On QNX 6, struct termio must be declared by including sys/termio.h - if TCGETA, TCSETA, TCSETAW, or TCSETAF are used. sys/termio.h must - be included before termios.h or it will generate an error. */ -#ifdef HAVE_SYS_TERMIO_H -#include -#endif - -#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) -#if !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) && !defined(HAVE_UTIL_H) -/* BSDI does not supply a prototype for the 'openpty' and 'forkpty' - functions, even though they are included in libutil. */ -#include -extern int openpty(int *, int *, char *, struct termios *, struct winsize *); -extern pid_t forkpty(int *, char *, struct termios *, struct winsize *); -#endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */ -#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */ - - -/* These are pulled from various places. It isn't obvious on what platforms - they are necessary, nor what the exact prototype should look like (which - is likely to vary between platforms!) If you find you need one of these - declarations, please move them to a platform-specific block and include - proper prototypes. */ -#if 0 - -/* From Modules/resource.c */ -extern int getrusage(); -extern int getpagesize(); - -/* From Python/sysmodule.c and Modules/posixmodule.c */ -extern int fclose(FILE *); - -/* From Modules/posixmodule.c */ -extern int fdatasync(int); -#endif /* 0 */ - - -/* On 4.4BSD-descendants, ctype functions serves the whole range of - * wchar_t character set rather than single byte code points only. - * This characteristic can break some operations of string object - * including str.upper() and str.split() on UTF-8 locales. This - * workaround was provided by Tim Robbins of FreeBSD project. - */ - -#ifdef __FreeBSD__ -#include -#if __FreeBSD_version > 500039 -# define _PY_PORT_CTYPE_UTF8_ISSUE -#endif -#endif - - -#if defined(__APPLE__) -# define _PY_PORT_CTYPE_UTF8_ISSUE -#endif - -#ifdef _PY_PORT_CTYPE_UTF8_ISSUE -#include -#include -#undef isalnum -#define isalnum(c) iswalnum(btowc(c)) -#undef isalpha -#define isalpha(c) iswalpha(btowc(c)) -#undef islower -#define islower(c) iswlower(btowc(c)) -#undef isspace -#define isspace(c) iswspace(btowc(c)) -#undef isupper -#define isupper(c) iswupper(btowc(c)) -#undef tolower -#define tolower(c) towlower(btowc(c)) -#undef toupper -#define toupper(c) towupper(btowc(c)) -#endif - - -/* Declarations for symbol visibility. - - PyAPI_FUNC(type): Declares a public Python API function and return type - PyAPI_DATA(type): Declares public Python data and its type - PyMODINIT_FUNC: A Python module init function. If these functions are - inside the Python core, they are private to the core. - If in an extension module, it may be declared with - external linkage depending on the platform. - - As a number of platforms support/require "__declspec(dllimport/dllexport)", - we support a HAVE_DECLSPEC_DLL macro to save duplication. -*/ - -/* - All windows ports, except cygwin, are handled in PC/pyconfig.h. - - BeOS and cygwin are the only other autoconf platform requiring special - linkage handling and both of these use __declspec(). -*/ -#if defined(__CYGWIN__) || defined(__BEOS__) -# define HAVE_DECLSPEC_DLL -#endif - -/* only get special linkage if built as shared or platform is Cygwin */ -#if defined(Py_ENABLE_SHARED) || defined(__CYGWIN__) -# if defined(HAVE_DECLSPEC_DLL) -# ifdef Py_BUILD_CORE -# define PyAPI_FUNC(RTYPE) __declspec(dllexport) RTYPE -# define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE - /* module init functions inside the core need no external linkage */ - /* except for Cygwin to handle embedding (FIXME: BeOS too?) */ -# if defined(__CYGWIN__) -# define PyMODINIT_FUNC __declspec(dllexport) void -# else /* __CYGWIN__ */ -# define PyMODINIT_FUNC void -# endif /* __CYGWIN__ */ -# else /* Py_BUILD_CORE */ - /* Building an extension module, or an embedded situation */ - /* public Python functions and data are imported */ - /* Under Cygwin, auto-import functions to prevent compilation */ - /* failures similar to those described at the bottom of 4.1: */ - /* http://docs.python.org/extending/windows.html#a-cookbook-approach */ -# if !defined(__CYGWIN__) -# define PyAPI_FUNC(RTYPE) __declspec(dllimport) RTYPE -# endif /* !__CYGWIN__ */ -# define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE - /* module init functions outside the core must be exported */ -# if defined(__cplusplus) -# define PyMODINIT_FUNC extern "C" __declspec(dllexport) void -# else /* __cplusplus */ -# define PyMODINIT_FUNC __declspec(dllexport) void -# endif /* __cplusplus */ -# endif /* Py_BUILD_CORE */ -# endif /* HAVE_DECLSPEC */ -#endif /* Py_ENABLE_SHARED */ - -/* If no external linkage macros defined by now, create defaults */ -#ifndef PyAPI_FUNC -# define PyAPI_FUNC(RTYPE) RTYPE -#endif -#ifndef PyAPI_DATA -# define PyAPI_DATA(RTYPE) extern RTYPE -#endif -#ifndef PyMODINIT_FUNC -# if defined(__cplusplus) -# define PyMODINIT_FUNC extern "C" void -# else /* __cplusplus */ -# define PyMODINIT_FUNC void -# endif /* __cplusplus */ -#endif - -/* Deprecated DL_IMPORT and DL_EXPORT macros */ -#if defined(Py_ENABLE_SHARED) && defined (HAVE_DECLSPEC_DLL) -# if defined(Py_BUILD_CORE) -# define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE -# define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -# else -# define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE -# define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -# endif -#endif -#ifndef DL_EXPORT -# define DL_EXPORT(RTYPE) RTYPE -#endif -#ifndef DL_IMPORT -# define DL_IMPORT(RTYPE) RTYPE -#endif -/* End of deprecated DL_* macros */ - -/* If the fd manipulation macros aren't defined, - here is a set that should do the job */ - -#if 0 /* disabled and probably obsolete */ - -#ifndef FD_SETSIZE -#define FD_SETSIZE 256 -#endif - -#ifndef FD_SET - -typedef long fd_mask; - -#define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ -#ifndef howmany -#define howmany(x, y) (((x)+((y)-1))/(y)) -#endif /* howmany */ - -typedef struct fd_set { - fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)]; -} fd_set; - -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) -#define FD_ZERO(p) memset((char *)(p), '\0', sizeof(*(p))) - -#endif /* FD_SET */ - -#endif /* fd manipulation macros */ - - -/* limits.h constants that may be missing */ - -#ifndef INT_MAX -#define INT_MAX 2147483647 -#endif - -#ifndef LONG_MAX -#if SIZEOF_LONG == 4 -#define LONG_MAX 0X7FFFFFFFL -#elif SIZEOF_LONG == 8 -#define LONG_MAX 0X7FFFFFFFFFFFFFFFL -#else -#error "could not set LONG_MAX in pyport.h" -#endif -#endif - -#ifndef LONG_MIN -#define LONG_MIN (-LONG_MAX-1) -#endif - -#ifndef LONG_BIT -#define LONG_BIT (8 * SIZEOF_LONG) -#endif - -#if LONG_BIT != 8 * SIZEOF_LONG -/* 04-Oct-2000 LONG_BIT is apparently (mis)defined as 64 on some recent - * 32-bit platforms using gcc. We try to catch that here at compile-time - * rather than waiting for integer multiplication to trigger bogus - * overflows. - */ -#error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." -#endif - -#ifdef __cplusplus -} -#endif - -/* - * Hide GCC attributes from compilers that don't support them. - */ -#if (!defined(__GNUC__) || __GNUC__ < 2 || \ - (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ) && \ - !defined(RISCOS) -#define Py_GCC_ATTRIBUTE(x) -#else -#define Py_GCC_ATTRIBUTE(x) __attribute__(x) -#endif - -/* - * Add PyArg_ParseTuple format where available. - */ -#ifdef HAVE_ATTRIBUTE_FORMAT_PARSETUPLE -#define Py_FORMAT_PARSETUPLE(func,p1,p2) __attribute__((format(func,p1,p2))) -#else -#define Py_FORMAT_PARSETUPLE(func,p1,p2) -#endif - -/* - * Specify alignment on compilers that support it. - */ -#if defined(__GNUC__) && __GNUC__ >= 3 -#define Py_ALIGNED(x) __attribute__((aligned(x))) -#else -#define Py_ALIGNED(x) -#endif - -/* Eliminate end-of-loop code not reached warnings from SunPro C - * when using do{...}while(0) macros - */ -#ifdef __SUNPRO_C -#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED) -#endif - -/* - * Older Microsoft compilers don't support the C99 long long literal suffixes, - * so these will be defined in PC/pyconfig.h for those compilers. - */ -#ifndef Py_LL -#define Py_LL(x) x##LL -#endif - -#ifndef Py_ULL -#define Py_ULL(x) Py_LL(x##U) -#endif - -#endif /* Py_PYPORT_H */ diff --git a/python/include/pystate.h b/python/include/pystate.h deleted file mode 100644 index 8d74940f..00000000 --- a/python/include/pystate.h +++ /dev/null @@ -1,197 +0,0 @@ - -/* Thread and interpreter state structures and their interfaces */ - - -#ifndef Py_PYSTATE_H -#define Py_PYSTATE_H -#ifdef __cplusplus -extern "C" { -#endif - -/* State shared between threads */ - -struct _ts; /* Forward */ -struct _is; /* Forward */ - -typedef struct _is { - - struct _is *next; - struct _ts *tstate_head; - - PyObject *modules; - PyObject *sysdict; - PyObject *builtins; - PyObject *modules_reloading; - - PyObject *codec_search_path; - PyObject *codec_search_cache; - PyObject *codec_error_registry; - -#ifdef HAVE_DLOPEN - int dlopenflags; -#endif -#ifdef WITH_TSC - int tscdump; -#endif - -} PyInterpreterState; - - -/* State unique per thread */ - -struct _frame; /* Avoid including frameobject.h */ - -/* Py_tracefunc return -1 when raising an exception, or 0 for success. */ -typedef int (*Py_tracefunc)(PyObject *, struct _frame *, int, PyObject *); - -/* The following values are used for 'what' for tracefunc functions: */ -#define PyTrace_CALL 0 -#define PyTrace_EXCEPTION 1 -#define PyTrace_LINE 2 -#define PyTrace_RETURN 3 -#define PyTrace_C_CALL 4 -#define PyTrace_C_EXCEPTION 5 -#define PyTrace_C_RETURN 6 - -typedef struct _ts { - /* See Python/ceval.c for comments explaining most fields */ - - struct _ts *next; - PyInterpreterState *interp; - - struct _frame *frame; - int recursion_depth; - /* 'tracing' keeps track of the execution depth when tracing/profiling. - This is to prevent the actual trace/profile code from being recorded in - the trace/profile. */ - int tracing; - int use_tracing; - - Py_tracefunc c_profilefunc; - Py_tracefunc c_tracefunc; - PyObject *c_profileobj; - PyObject *c_traceobj; - - PyObject *curexc_type; - PyObject *curexc_value; - PyObject *curexc_traceback; - - PyObject *exc_type; - PyObject *exc_value; - PyObject *exc_traceback; - - PyObject *dict; /* Stores per-thread state */ - - /* tick_counter is incremented whenever the check_interval ticker - * reaches zero. The purpose is to give a useful measure of the number - * of interpreted bytecode instructions in a given thread. This - * extremely lightweight statistic collector may be of interest to - * profilers (like psyco.jit()), although nothing in the core uses it. - */ - int tick_counter; - - int gilstate_counter; - - PyObject *async_exc; /* Asynchronous exception to raise */ - long thread_id; /* Thread id where this tstate was created */ - - /* XXX signal handlers should also be here */ - -} PyThreadState; - - -PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void); -PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *); -PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *); - -PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *); -PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *); -PyAPI_FUNC(void) _PyThreadState_Init(PyThreadState *); -PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *); -PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); -#ifdef WITH_THREAD -PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); -#endif - -PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); -PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *); -PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void); -PyAPI_FUNC(int) PyThreadState_SetAsyncExc(long, PyObject *); - - -/* Variable and macro for in-line access to current thread state */ - -PyAPI_DATA(PyThreadState *) _PyThreadState_Current; - -#ifdef Py_DEBUG -#define PyThreadState_GET() PyThreadState_Get() -#else -#define PyThreadState_GET() (_PyThreadState_Current) -#endif - -typedef - enum {PyGILState_LOCKED, PyGILState_UNLOCKED} - PyGILState_STATE; - -/* Ensure that the current thread is ready to call the Python - C API, regardless of the current state of Python, or of its - thread lock. This may be called as many times as desired - by a thread so long as each call is matched with a call to - PyGILState_Release(). In general, other thread-state APIs may - be used between _Ensure() and _Release() calls, so long as the - thread-state is restored to its previous state before the Release(). - For example, normal use of the Py_BEGIN_ALLOW_THREADS/ - Py_END_ALLOW_THREADS macros are acceptable. - - The return value is an opaque "handle" to the thread state when - PyGILState_Ensure() was called, and must be passed to - PyGILState_Release() to ensure Python is left in the same state. Even - though recursive calls are allowed, these handles can *not* be shared - - each unique call to PyGILState_Ensure must save the handle for its - call to PyGILState_Release. - - When the function returns, the current thread will hold the GIL. - - Failure is a fatal error. -*/ -PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure(void); - -/* Release any resources previously acquired. After this call, Python's - state will be the same as it was prior to the corresponding - PyGILState_Ensure() call (but generally this state will be unknown to - the caller, hence the use of the GILState API.) - - Every call to PyGILState_Ensure must be matched by a call to - PyGILState_Release on the same thread. -*/ -PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE); - -/* Helper/diagnostic function - get the current thread state for - this thread. May return NULL if no GILState API has been used - on the current thread. Note that the main thread always has such a - thread-state, even if no auto-thread-state call has been made - on the main thread. -*/ -PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void); - -/* The implementation of sys._current_frames() Returns a dict mapping - thread id to that thread's current frame. -*/ -PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void); - -/* Routines for advanced debuggers, requested by David Beazley. - Don't use unless you know what you are doing! */ -PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void); -PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *); -PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *); -PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *); - -typedef struct _frame *(*PyThreadFrameGetter)(PyThreadState *self_); - -/* hook for PyEval_GetFrame(), requested for Psyco */ -PyAPI_DATA(PyThreadFrameGetter) _PyThreadState_GetFrame; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYSTATE_H */ diff --git a/python/include/pystrcmp.h b/python/include/pystrcmp.h deleted file mode 100644 index 369c7e77..00000000 --- a/python/include/pystrcmp.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef Py_STRCMP_H -#define Py_STRCMP_H - -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t); -PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *); - -#if defined(MS_WINDOWS) || defined(PYOS_OS2) -#define PyOS_strnicmp strnicmp -#define PyOS_stricmp stricmp -#else -#define PyOS_strnicmp PyOS_mystrnicmp -#define PyOS_stricmp PyOS_mystricmp -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_STRCMP_H */ diff --git a/python/include/pystrtod.h b/python/include/pystrtod.h deleted file mode 100644 index eec434f1..00000000 --- a/python/include/pystrtod.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef Py_STRTOD_H -#define Py_STRTOD_H - -#ifdef __cplusplus -extern "C" { -#endif - - -PyAPI_FUNC(double) PyOS_ascii_strtod(const char *str, char **ptr); -PyAPI_FUNC(double) PyOS_ascii_atof(const char *str); - -/* Deprecated in 2.7 and 3.1. Will disappear in 2.8 (if it exists) and 3.2 */ -PyAPI_FUNC(char *) PyOS_ascii_formatd(char *buffer, size_t buf_len, - const char *format, double d); -PyAPI_FUNC(double) PyOS_string_to_double(const char *str, - char **endptr, - PyObject *overflow_exception); - -/* The caller is responsible for calling PyMem_Free to free the buffer - that's is returned. */ -PyAPI_FUNC(char *) PyOS_double_to_string(double val, - char format_code, - int precision, - int flags, - int *type); - -PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr); - - -/* PyOS_double_to_string's "flags" parameter can be set to 0 or more of: */ -#define Py_DTSF_SIGN 0x01 /* always add the sign */ -#define Py_DTSF_ADD_DOT_0 0x02 /* if the result is an integer add ".0" */ -#define Py_DTSF_ALT 0x04 /* "alternate" formatting. it's format_code - specific */ - -/* PyOS_double_to_string's "type", if non-NULL, will be set to one of: */ -#define Py_DTST_FINITE 0 -#define Py_DTST_INFINITE 1 -#define Py_DTST_NAN 2 - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_STRTOD_H */ diff --git a/python/include/pythonrun.h b/python/include/pythonrun.h deleted file mode 100644 index 6bfc1750..00000000 --- a/python/include/pythonrun.h +++ /dev/null @@ -1,181 +0,0 @@ - -/* Interfaces to parse and execute pieces of python code */ - -#ifndef Py_PYTHONRUN_H -#define Py_PYTHONRUN_H -#ifdef __cplusplus -extern "C" { -#endif - -#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \ - CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \ - CO_FUTURE_UNICODE_LITERALS) -#define PyCF_MASK_OBSOLETE (CO_NESTED) -#define PyCF_SOURCE_IS_UTF8 0x0100 -#define PyCF_DONT_IMPLY_DEDENT 0x0200 -#define PyCF_ONLY_AST 0x0400 - -typedef struct { - int cf_flags; /* bitmask of CO_xxx flags relevant to future */ -} PyCompilerFlags; - -PyAPI_FUNC(void) Py_SetProgramName(char *); -PyAPI_FUNC(char *) Py_GetProgramName(void); - -PyAPI_FUNC(void) Py_SetPythonHome(char *); -PyAPI_FUNC(char *) Py_GetPythonHome(void); - -PyAPI_FUNC(void) Py_Initialize(void); -PyAPI_FUNC(void) Py_InitializeEx(int); -PyAPI_FUNC(void) Py_Finalize(void); -PyAPI_FUNC(int) Py_IsInitialized(void); -PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void); -PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *); - -PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_AnyFileExFlags(FILE *, const char *, int, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_SimpleFileExFlags(FILE *, const char *, int, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_InteractiveOneFlags(FILE *, const char *, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(FILE *, const char *, PyCompilerFlags *); - -PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(const char *, const char *, - int, PyCompilerFlags *flags, - PyArena *); -PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(FILE *, const char *, int, - char *, char *, - PyCompilerFlags *, int *, - PyArena *); -#define PyParser_SimpleParseString(S, B) \ - PyParser_SimpleParseStringFlags(S, B, 0) -#define PyParser_SimpleParseFile(FP, S, B) \ - PyParser_SimpleParseFileFlags(FP, S, B, 0) -PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int, - int); -PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *, - int, int); - -PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *, - PyObject *, PyCompilerFlags *); - -PyAPI_FUNC(PyObject *) PyRun_FileExFlags(FILE *, const char *, int, - PyObject *, PyObject *, int, - PyCompilerFlags *); - -#define Py_CompileString(str, p, s) Py_CompileStringFlags(str, p, s, NULL) -PyAPI_FUNC(PyObject *) Py_CompileStringFlags(const char *, const char *, int, - PyCompilerFlags *); -PyAPI_FUNC(struct symtable *) Py_SymtableString(const char *, const char *, int); - -PyAPI_FUNC(void) PyErr_Print(void); -PyAPI_FUNC(void) PyErr_PrintEx(int); -PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *); - -PyAPI_FUNC(int) Py_AtExit(void (*func)(void)); - -PyAPI_FUNC(void) Py_Exit(int); - -PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *); - -/* Bootstrap */ -PyAPI_FUNC(int) Py_Main(int argc, char **argv); - -/* Use macros for a bunch of old variants */ -#define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL) -#define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL) -#define PyRun_AnyFileEx(fp, name, closeit) \ - PyRun_AnyFileExFlags(fp, name, closeit, NULL) -#define PyRun_AnyFileFlags(fp, name, flags) \ - PyRun_AnyFileExFlags(fp, name, 0, flags) -#define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL) -#define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL) -#define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL) -#define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL) -#define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL) -#define PyRun_File(fp, p, s, g, l) \ - PyRun_FileExFlags(fp, p, s, g, l, 0, NULL) -#define PyRun_FileEx(fp, p, s, g, l, c) \ - PyRun_FileExFlags(fp, p, s, g, l, c, NULL) -#define PyRun_FileFlags(fp, p, s, g, l, flags) \ - PyRun_FileExFlags(fp, p, s, g, l, 0, flags) - -/* In getpath.c */ -PyAPI_FUNC(char *) Py_GetProgramFullPath(void); -PyAPI_FUNC(char *) Py_GetPrefix(void); -PyAPI_FUNC(char *) Py_GetExecPrefix(void); -PyAPI_FUNC(char *) Py_GetPath(void); - -/* In their own files */ -PyAPI_FUNC(const char *) Py_GetVersion(void); -PyAPI_FUNC(const char *) Py_GetPlatform(void); -PyAPI_FUNC(const char *) Py_GetCopyright(void); -PyAPI_FUNC(const char *) Py_GetCompiler(void); -PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -PyAPI_FUNC(const char *) _Py_svnversion(void); -PyAPI_FUNC(const char *) Py_SubversionRevision(void); -PyAPI_FUNC(const char *) Py_SubversionShortBranch(void); -PyAPI_FUNC(const char *) _Py_hgidentifier(void); -PyAPI_FUNC(const char *) _Py_hgversion(void); - -/* Internal -- various one-time initializations */ -PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void); -PyAPI_FUNC(PyObject *) _PySys_Init(void); -PyAPI_FUNC(void) _PyImport_Init(void); -PyAPI_FUNC(void) _PyExc_Init(void); -PyAPI_FUNC(void) _PyImportHooks_Init(void); -PyAPI_FUNC(int) _PyFrame_Init(void); -PyAPI_FUNC(int) _PyInt_Init(void); -PyAPI_FUNC(int) _PyLong_Init(void); -PyAPI_FUNC(void) _PyFloat_Init(void); -PyAPI_FUNC(int) PyByteArray_Init(void); -PyAPI_FUNC(void) _PyRandom_Init(void); - -/* Various internal finalizers */ -PyAPI_FUNC(void) _PyExc_Fini(void); -PyAPI_FUNC(void) _PyImport_Fini(void); -PyAPI_FUNC(void) PyMethod_Fini(void); -PyAPI_FUNC(void) PyFrame_Fini(void); -PyAPI_FUNC(void) PyCFunction_Fini(void); -PyAPI_FUNC(void) PyDict_Fini(void); -PyAPI_FUNC(void) PyTuple_Fini(void); -PyAPI_FUNC(void) PyList_Fini(void); -PyAPI_FUNC(void) PySet_Fini(void); -PyAPI_FUNC(void) PyString_Fini(void); -PyAPI_FUNC(void) PyInt_Fini(void); -PyAPI_FUNC(void) PyFloat_Fini(void); -PyAPI_FUNC(void) PyOS_FiniInterrupts(void); -PyAPI_FUNC(void) PyByteArray_Fini(void); - -/* Stuff with no proper home (yet) */ -PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *); -PyAPI_DATA(int) (*PyOS_InputHook)(void); -PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, char *); -PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState; - -/* Stack size, in "pointers" (so we get extra safety margins - on 64-bit platforms). On a 32-bit platform, this translates - to a 8k margin. */ -#define PYOS_STACK_MARGIN 2048 - -#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1300 -/* Enable stack checking under Microsoft C */ -#define USE_STACKCHECK -#endif - -#ifdef USE_STACKCHECK -/* Check that we aren't overflowing our stack */ -PyAPI_FUNC(int) PyOS_CheckStack(void); -#endif - -/* Signals */ -typedef void (*PyOS_sighandler_t)(int); -PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int); -PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t); - -/* Random */ -PyAPI_FUNC(int) _PyOS_URandom (void *buffer, Py_ssize_t size); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYTHONRUN_H */ diff --git a/python/include/pythread.h b/python/include/pythread.h deleted file mode 100644 index dfd61575..00000000 --- a/python/include/pythread.h +++ /dev/null @@ -1,41 +0,0 @@ - -#ifndef Py_PYTHREAD_H -#define Py_PYTHREAD_H - -typedef void *PyThread_type_lock; -typedef void *PyThread_type_sema; - -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(void) PyThread_init_thread(void); -PyAPI_FUNC(long) PyThread_start_new_thread(void (*)(void *), void *); -PyAPI_FUNC(void) PyThread_exit_thread(void); -PyAPI_FUNC(long) PyThread_get_thread_ident(void); - -PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void); -PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock); -PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int); -#define WAIT_LOCK 1 -#define NOWAIT_LOCK 0 -PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock); - -PyAPI_FUNC(size_t) PyThread_get_stacksize(void); -PyAPI_FUNC(int) PyThread_set_stacksize(size_t); - -/* Thread Local Storage (TLS) API */ -PyAPI_FUNC(int) PyThread_create_key(void); -PyAPI_FUNC(void) PyThread_delete_key(int); -PyAPI_FUNC(int) PyThread_set_key_value(int, void *); -PyAPI_FUNC(void *) PyThread_get_key_value(int); -PyAPI_FUNC(void) PyThread_delete_key_value(int key); - -/* Cleanup after a fork */ -PyAPI_FUNC(void) PyThread_ReInitTLS(void); - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_PYTHREAD_H */ diff --git a/python/include/rangeobject.h b/python/include/rangeobject.h deleted file mode 100644 index 36c9cee5..00000000 --- a/python/include/rangeobject.h +++ /dev/null @@ -1,28 +0,0 @@ - -/* Range object interface */ - -#ifndef Py_RANGEOBJECT_H -#define Py_RANGEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* This is about the type 'xrange', not the built-in function range(), which - returns regular lists. */ - -/* -A range object represents an integer range. This is an immutable object; -a range cannot change its value after creation. - -Range objects behave like the corresponding tuple objects except that -they are represented by a start, stop, and step datamembers. -*/ - -PyAPI_DATA(PyTypeObject) PyRange_Type; - -#define PyRange_Check(op) (Py_TYPE(op) == &PyRange_Type) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_RANGEOBJECT_H */ diff --git a/python/include/setobject.h b/python/include/setobject.h deleted file mode 100644 index 52b07d52..00000000 --- a/python/include/setobject.h +++ /dev/null @@ -1,99 +0,0 @@ -/* Set object interface */ - -#ifndef Py_SETOBJECT_H -#define Py_SETOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* -There are three kinds of slots in the table: - -1. Unused: key == NULL -2. Active: key != NULL and key != dummy -3. Dummy: key == dummy - -Note: .pop() abuses the hash field of an Unused or Dummy slot to -hold a search finger. The hash field of Unused or Dummy slots has -no meaning otherwise. -*/ - -#define PySet_MINSIZE 8 - -typedef struct { - long hash; /* cached hash code for the entry key */ - PyObject *key; -} setentry; - - -/* -This data structure is shared by set and frozenset objects. -*/ - -typedef struct _setobject PySetObject; -struct _setobject { - PyObject_HEAD - - Py_ssize_t fill; /* # Active + # Dummy */ - Py_ssize_t used; /* # Active */ - - /* The table contains mask + 1 slots, and that's a power of 2. - * We store the mask instead of the size because the mask is more - * frequently needed. - */ - Py_ssize_t mask; - - /* table points to smalltable for small tables, else to - * additional malloc'ed memory. table is never NULL! This rule - * saves repeated runtime null-tests. - */ - setentry *table; - setentry *(*lookup)(PySetObject *so, PyObject *key, long hash); - setentry smalltable[PySet_MINSIZE]; - - long hash; /* only used by frozenset objects */ - PyObject *weakreflist; /* List of weak references */ -}; - -PyAPI_DATA(PyTypeObject) PySet_Type; -PyAPI_DATA(PyTypeObject) PyFrozenSet_Type; - -/* Invariants for frozensets: - * data is immutable. - * hash is the hash of the frozenset or -1 if not computed yet. - * Invariants for sets: - * hash is -1 - */ - -#define PyFrozenSet_CheckExact(ob) (Py_TYPE(ob) == &PyFrozenSet_Type) -#define PyAnySet_CheckExact(ob) \ - (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type) -#define PyAnySet_Check(ob) \ - (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type || \ - PyType_IsSubtype(Py_TYPE(ob), &PySet_Type) || \ - PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type)) -#define PySet_Check(ob) \ - (Py_TYPE(ob) == &PySet_Type || \ - PyType_IsSubtype(Py_TYPE(ob), &PySet_Type)) -#define PyFrozenSet_Check(ob) \ - (Py_TYPE(ob) == &PyFrozenSet_Type || \ - PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type)) - -PyAPI_FUNC(PyObject *) PySet_New(PyObject *); -PyAPI_FUNC(PyObject *) PyFrozenSet_New(PyObject *); -PyAPI_FUNC(Py_ssize_t) PySet_Size(PyObject *anyset); -#define PySet_GET_SIZE(so) (((PySetObject *)(so))->used) -PyAPI_FUNC(int) PySet_Clear(PyObject *set); -PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key); -PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key); -PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key); -PyAPI_FUNC(int) _PySet_Next(PyObject *set, Py_ssize_t *pos, PyObject **key); -PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, long *hash); -PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set); -PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_SETOBJECT_H */ diff --git a/python/include/sliceobject.h b/python/include/sliceobject.h deleted file mode 100644 index 8ab62dd4..00000000 --- a/python/include/sliceobject.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef Py_SLICEOBJECT_H -#define Py_SLICEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* The unique ellipsis object "..." */ - -PyAPI_DATA(PyObject) _Py_EllipsisObject; /* Don't use this directly */ - -#define Py_Ellipsis (&_Py_EllipsisObject) - -/* Slice object interface */ - -/* - -A slice object containing start, stop, and step data members (the -names are from range). After much talk with Guido, it was decided to -let these be any arbitrary python type. Py_None stands for omitted values. -*/ - -typedef struct { - PyObject_HEAD - PyObject *start, *stop, *step; /* not NULL */ -} PySliceObject; - -PyAPI_DATA(PyTypeObject) PySlice_Type; -PyAPI_DATA(PyTypeObject) PyEllipsis_Type; - -#define PySlice_Check(op) (Py_TYPE(op) == &PySlice_Type) - -PyAPI_FUNC(PyObject *) PySlice_New(PyObject* start, PyObject* stop, - PyObject* step); -PyAPI_FUNC(PyObject *) _PySlice_FromIndices(Py_ssize_t start, Py_ssize_t stop); -PyAPI_FUNC(int) PySlice_GetIndices(PySliceObject *r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); -PyAPI_FUNC(int) PySlice_GetIndicesEx(PySliceObject *r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, - Py_ssize_t *step, Py_ssize_t *slicelength); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_SLICEOBJECT_H */ diff --git a/python/include/stringobject.h b/python/include/stringobject.h deleted file mode 100644 index 18b5b411..00000000 --- a/python/include/stringobject.h +++ /dev/null @@ -1,210 +0,0 @@ - -/* String (str/bytes) object interface */ - -#ifndef Py_STRINGOBJECT_H -#define Py_STRINGOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/* -Type PyStringObject represents a character string. An extra zero byte is -reserved at the end to ensure it is zero-terminated, but a size is -present so strings with null bytes in them can be represented. This -is an immutable object type. - -There are functions to create new string objects, to test -an object for string-ness, and to get the -string value. The latter function returns a null pointer -if the object is not of the proper type. -There is a variant that takes an explicit size as well as a -variant that assumes a zero-terminated string. Note that none of the -functions should be applied to nil objects. -*/ - -/* Caching the hash (ob_shash) saves recalculation of a string's hash value. - Interning strings (ob_sstate) tries to ensure that only one string - object with a given value exists, so equality tests can be one pointer - comparison. This is generally restricted to strings that "look like" - Python identifiers, although the intern() builtin can be used to force - interning of any string. - Together, these sped the interpreter by up to 20%. */ - -typedef struct { - PyObject_VAR_HEAD - long ob_shash; - int ob_sstate; - char ob_sval[1]; - - /* Invariants: - * ob_sval contains space for 'ob_size+1' elements. - * ob_sval[ob_size] == 0. - * ob_shash is the hash of the string or -1 if not computed yet. - * ob_sstate != 0 iff the string object is in stringobject.c's - * 'interned' dictionary; in this case the two references - * from 'interned' to this object are *not counted* in ob_refcnt. - */ -} PyStringObject; - -#define SSTATE_NOT_INTERNED 0 -#define SSTATE_INTERNED_MORTAL 1 -#define SSTATE_INTERNED_IMMORTAL 2 - -PyAPI_DATA(PyTypeObject) PyBaseString_Type; -PyAPI_DATA(PyTypeObject) PyString_Type; - -#define PyString_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_STRING_SUBCLASS) -#define PyString_CheckExact(op) (Py_TYPE(op) == &PyString_Type) - -PyAPI_FUNC(PyObject *) PyString_FromStringAndSize(const char *, Py_ssize_t); -PyAPI_FUNC(PyObject *) PyString_FromString(const char *); -PyAPI_FUNC(PyObject *) PyString_FromFormatV(const char*, va_list) - Py_GCC_ATTRIBUTE((format(printf, 1, 0))); -PyAPI_FUNC(PyObject *) PyString_FromFormat(const char*, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); -PyAPI_FUNC(Py_ssize_t) PyString_Size(PyObject *); -PyAPI_FUNC(char *) PyString_AsString(PyObject *); -PyAPI_FUNC(PyObject *) PyString_Repr(PyObject *, int); -PyAPI_FUNC(void) PyString_Concat(PyObject **, PyObject *); -PyAPI_FUNC(void) PyString_ConcatAndDel(PyObject **, PyObject *); -PyAPI_FUNC(int) _PyString_Resize(PyObject **, Py_ssize_t); -PyAPI_FUNC(int) _PyString_Eq(PyObject *, PyObject*); -PyAPI_FUNC(PyObject *) PyString_Format(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) _PyString_FormatLong(PyObject*, int, int, - int, char**, int*); -PyAPI_FUNC(PyObject *) PyString_DecodeEscape(const char *, Py_ssize_t, - const char *, Py_ssize_t, - const char *); - -PyAPI_FUNC(void) PyString_InternInPlace(PyObject **); -PyAPI_FUNC(void) PyString_InternImmortal(PyObject **); -PyAPI_FUNC(PyObject *) PyString_InternFromString(const char *); -PyAPI_FUNC(void) _Py_ReleaseInternedStrings(void); - -/* Use only if you know it's a string */ -#define PyString_CHECK_INTERNED(op) (((PyStringObject *)(op))->ob_sstate) - -/* Macro, trading safety for speed */ -#define PyString_AS_STRING(op) (((PyStringObject *)(op))->ob_sval) -#define PyString_GET_SIZE(op) Py_SIZE(op) - -/* _PyString_Join(sep, x) is like sep.join(x). sep must be PyStringObject*, - x must be an iterable object. */ -PyAPI_FUNC(PyObject *) _PyString_Join(PyObject *sep, PyObject *x); - -/* --- Generic Codecs ----------------------------------------------------- */ - -/* Create an object by decoding the encoded string s of the - given size. */ - -PyAPI_FUNC(PyObject*) PyString_Decode( - const char *s, /* encoded string */ - Py_ssize_t size, /* size of buffer */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a char buffer of the given size and returns a - Python object. */ - -PyAPI_FUNC(PyObject*) PyString_Encode( - const char *s, /* string char buffer */ - Py_ssize_t size, /* number of chars to encode */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a string object and returns the result as Python - object. */ - -PyAPI_FUNC(PyObject*) PyString_AsEncodedObject( - PyObject *str, /* string object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a string object and returns the result as Python string - object. - - If the codec returns an Unicode object, the object is converted - back to a string using the default encoding. - - DEPRECATED - use PyString_AsEncodedObject() instead. */ - -PyAPI_FUNC(PyObject*) PyString_AsEncodedString( - PyObject *str, /* string object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Decodes a string object and returns the result as Python - object. */ - -PyAPI_FUNC(PyObject*) PyString_AsDecodedObject( - PyObject *str, /* string object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Decodes a string object and returns the result as Python string - object. - - If the codec returns an Unicode object, the object is converted - back to a string using the default encoding. - - DEPRECATED - use PyString_AsDecodedObject() instead. */ - -PyAPI_FUNC(PyObject*) PyString_AsDecodedString( - PyObject *str, /* string object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Provides access to the internal data buffer and size of a string - object or the default encoded version of an Unicode object. Passing - NULL as *len parameter will force the string buffer to be - 0-terminated (passing a string with embedded NULL characters will - cause an exception). */ - -PyAPI_FUNC(int) PyString_AsStringAndSize( - register PyObject *obj, /* string or Unicode object */ - register char **s, /* pointer to buffer variable */ - register Py_ssize_t *len /* pointer to length variable or NULL - (only possible for 0-terminated - strings) */ - ); - - -/* Using the current locale, insert the thousands grouping - into the string pointed to by buffer. For the argument descriptions, - see Objects/stringlib/localeutil.h */ -PyAPI_FUNC(Py_ssize_t) _PyString_InsertThousandsGroupingLocale(char *buffer, - Py_ssize_t n_buffer, - char *digits, - Py_ssize_t n_digits, - Py_ssize_t min_width); - -/* Using explicit passed-in values, insert the thousands grouping - into the string pointed to by buffer. For the argument descriptions, - see Objects/stringlib/localeutil.h */ -PyAPI_FUNC(Py_ssize_t) _PyString_InsertThousandsGrouping(char *buffer, - Py_ssize_t n_buffer, - char *digits, - Py_ssize_t n_digits, - Py_ssize_t min_width, - const char *grouping, - const char *thousands_sep); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyBytes_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_STRINGOBJECT_H */ diff --git a/python/include/structmember.h b/python/include/structmember.h deleted file mode 100644 index fe5b44ea..00000000 --- a/python/include/structmember.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef Py_STRUCTMEMBER_H -#define Py_STRUCTMEMBER_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Interface to map C struct members to Python object attributes */ - -#include /* For offsetof */ - -/* The offsetof() macro calculates the offset of a structure member - in its structure. Unfortunately this cannot be written down - portably, hence it is provided by a Standard C header file. - For pre-Standard C compilers, here is a version that usually works - (but watch out!): */ - -#ifndef offsetof -#define offsetof(type, member) ( (int) & ((type*)0) -> member ) -#endif - -/* An array of memberlist structures defines the name, type and offset - of selected members of a C structure. These can be read by - PyMember_Get() and set by PyMember_Set() (except if their READONLY flag - is set). The array must be terminated with an entry whose name - pointer is NULL. */ - -struct memberlist { - /* Obsolete version, for binary backwards compatibility */ - char *name; - int type; - int offset; - int flags; -}; - -typedef struct PyMemberDef { - /* Current version, use this */ - char *name; - int type; - Py_ssize_t offset; - int flags; - char *doc; -} PyMemberDef; - -/* Types */ -#define T_SHORT 0 -#define T_INT 1 -#define T_LONG 2 -#define T_FLOAT 3 -#define T_DOUBLE 4 -#define T_STRING 5 -#define T_OBJECT 6 -/* XXX the ordering here is weird for binary compatibility */ -#define T_CHAR 7 /* 1-character string */ -#define T_BYTE 8 /* 8-bit signed int */ -/* unsigned variants: */ -#define T_UBYTE 9 -#define T_USHORT 10 -#define T_UINT 11 -#define T_ULONG 12 - -/* Added by Jack: strings contained in the structure */ -#define T_STRING_INPLACE 13 - -/* Added by Lillo: bools contained in the structure (assumed char) */ -#define T_BOOL 14 - -#define T_OBJECT_EX 16 /* Like T_OBJECT, but raises AttributeError - when the value is NULL, instead of - converting to None. */ -#ifdef HAVE_LONG_LONG -#define T_LONGLONG 17 -#define T_ULONGLONG 18 -#endif /* HAVE_LONG_LONG */ - -#define T_PYSSIZET 19 /* Py_ssize_t */ - - -/* Flags */ -#define READONLY 1 -#define RO READONLY /* Shorthand */ -#define READ_RESTRICTED 2 -#define PY_WRITE_RESTRICTED 4 -#define RESTRICTED (READ_RESTRICTED | PY_WRITE_RESTRICTED) - - -/* Obsolete API, for binary backwards compatibility */ -PyAPI_FUNC(PyObject *) PyMember_Get(const char *, struct memberlist *, const char *); -PyAPI_FUNC(int) PyMember_Set(char *, struct memberlist *, const char *, PyObject *); - -/* Current API, use this */ -PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *); -PyAPI_FUNC(int) PyMember_SetOne(char *, struct PyMemberDef *, PyObject *); - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_STRUCTMEMBER_H */ diff --git a/python/include/structseq.h b/python/include/structseq.h deleted file mode 100644 index e662916f..00000000 --- a/python/include/structseq.h +++ /dev/null @@ -1,41 +0,0 @@ - -/* Tuple object interface */ - -#ifndef Py_STRUCTSEQ_H -#define Py_STRUCTSEQ_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct PyStructSequence_Field { - char *name; - char *doc; -} PyStructSequence_Field; - -typedef struct PyStructSequence_Desc { - char *name; - char *doc; - struct PyStructSequence_Field *fields; - int n_in_sequence; -} PyStructSequence_Desc; - -extern char* PyStructSequence_UnnamedField; - -PyAPI_FUNC(void) PyStructSequence_InitType(PyTypeObject *type, - PyStructSequence_Desc *desc); - -PyAPI_FUNC(PyObject *) PyStructSequence_New(PyTypeObject* type); - -typedef struct { - PyObject_VAR_HEAD - PyObject *ob_item[1]; -} PyStructSequence; - -/* Macro, *only* to be used to fill in brand new objects */ -#define PyStructSequence_SET_ITEM(op, i, v) \ - (((PyStructSequence *)(op))->ob_item[i] = v) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_STRUCTSEQ_H */ diff --git a/python/include/symtable.h b/python/include/symtable.h deleted file mode 100644 index e0a0be41..00000000 --- a/python/include/symtable.h +++ /dev/null @@ -1,98 +0,0 @@ -#ifndef Py_SYMTABLE_H -#define Py_SYMTABLE_H - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock } - _Py_block_ty; - -struct _symtable_entry; - -struct symtable { - const char *st_filename; /* name of file being compiled */ - struct _symtable_entry *st_cur; /* current symbol table entry */ - struct _symtable_entry *st_top; /* module entry */ - PyObject *st_symbols; /* dictionary of symbol table entries */ - PyObject *st_stack; /* stack of namespace info */ - PyObject *st_global; /* borrowed ref to MODULE in st_symbols */ - int st_nblocks; /* number of blocks */ - PyObject *st_private; /* name of current class or NULL */ - PyFutureFeatures *st_future; /* module's future features */ -}; - -typedef struct _symtable_entry { - PyObject_HEAD - PyObject *ste_id; /* int: key in st_symbols */ - PyObject *ste_symbols; /* dict: name to flags */ - PyObject *ste_name; /* string: name of block */ - PyObject *ste_varnames; /* list of variable names */ - PyObject *ste_children; /* list of child ids */ - _Py_block_ty ste_type; /* module, class, or function */ - int ste_unoptimized; /* false if namespace is optimized */ - int ste_nested; /* true if block is nested */ - unsigned ste_free : 1; /* true if block has free variables */ - unsigned ste_child_free : 1; /* true if a child block has free vars, - including free refs to globals */ - unsigned ste_generator : 1; /* true if namespace is a generator */ - unsigned ste_varargs : 1; /* true if block has varargs */ - unsigned ste_varkeywords : 1; /* true if block has varkeywords */ - unsigned ste_returns_value : 1; /* true if namespace uses return with - an argument */ - int ste_lineno; /* first line of block */ - int ste_opt_lineno; /* lineno of last exec or import * */ - int ste_tmpname; /* counter for listcomp temp vars */ - struct symtable *ste_table; -} PySTEntryObject; - -PyAPI_DATA(PyTypeObject) PySTEntry_Type; - -#define PySTEntry_Check(op) (Py_TYPE(op) == &PySTEntry_Type) - -PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *); - -PyAPI_FUNC(struct symtable *) PySymtable_Build(mod_ty, const char *, - PyFutureFeatures *); -PyAPI_FUNC(PySTEntryObject *) PySymtable_Lookup(struct symtable *, void *); - -PyAPI_FUNC(void) PySymtable_Free(struct symtable *); - -/* Flags for def-use information */ - -#define DEF_GLOBAL 1 /* global stmt */ -#define DEF_LOCAL 2 /* assignment in code block */ -#define DEF_PARAM 2<<1 /* formal parameter */ -#define USE 2<<2 /* name is used */ -#define DEF_FREE 2<<3 /* name used but not defined in nested block */ -#define DEF_FREE_CLASS 2<<4 /* free variable from class's method */ -#define DEF_IMPORT 2<<5 /* assignment occurred via import */ - -#define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT) - -/* GLOBAL_EXPLICIT and GLOBAL_IMPLICIT are used internally by the symbol - table. GLOBAL is returned from PyST_GetScope() for either of them. - It is stored in ste_symbols at bits 12-14. -*/ -#define SCOPE_OFF 11 -#define SCOPE_MASK 7 - -#define LOCAL 1 -#define GLOBAL_EXPLICIT 2 -#define GLOBAL_IMPLICIT 3 -#define FREE 4 -#define CELL 5 - -/* The following three names are used for the ste_unoptimized bit field */ -#define OPT_IMPORT_STAR 1 -#define OPT_EXEC 2 -#define OPT_BARE_EXEC 4 -#define OPT_TOPLEVEL 8 /* top-level names, including eval and exec */ - -#define GENERATOR 1 -#define GENERATOR_EXPRESSION 2 - -#ifdef __cplusplus -} -#endif -#endif /* !Py_SYMTABLE_H */ diff --git a/python/include/sysmodule.h b/python/include/sysmodule.h deleted file mode 100644 index 16af1196..00000000 --- a/python/include/sysmodule.h +++ /dev/null @@ -1,32 +0,0 @@ - -/* System module interface */ - -#ifndef Py_SYSMODULE_H -#define Py_SYSMODULE_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(PyObject *) PySys_GetObject(char *); -PyAPI_FUNC(int) PySys_SetObject(char *, PyObject *); -PyAPI_FUNC(FILE *) PySys_GetFile(char *, FILE *); -PyAPI_FUNC(void) PySys_SetArgv(int, char **); -PyAPI_FUNC(void) PySys_SetArgvEx(int, char **, int); -PyAPI_FUNC(void) PySys_SetPath(char *); - -PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); -PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); - -PyAPI_DATA(PyObject *) _PySys_TraceFunc, *_PySys_ProfileFunc; -PyAPI_DATA(int) _PySys_CheckInterval; - -PyAPI_FUNC(void) PySys_ResetWarnOptions(void); -PyAPI_FUNC(void) PySys_AddWarnOption(char *); -PyAPI_FUNC(int) PySys_HasWarnOptions(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_SYSMODULE_H */ diff --git a/python/include/timefuncs.h b/python/include/timefuncs.h deleted file mode 100644 index 553142db..00000000 --- a/python/include/timefuncs.h +++ /dev/null @@ -1,23 +0,0 @@ -/* timefuncs.h - */ - -/* Utility function related to timemodule.c. */ - -#ifndef TIMEFUNCS_H -#define TIMEFUNCS_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Cast double x to time_t, but raise ValueError if x is too large - * to fit in a time_t. ValueError is set on return iff the return - * value is (time_t)-1 and PyErr_Occurred(). - */ -PyAPI_FUNC(time_t) _PyTime_DoubleToTimet(double x); - - -#ifdef __cplusplus -} -#endif -#endif /* TIMEFUNCS_H */ diff --git a/python/include/token.h b/python/include/token.h deleted file mode 100644 index 72659ac0..00000000 --- a/python/include/token.h +++ /dev/null @@ -1,85 +0,0 @@ - -/* Token types */ - -#ifndef Py_TOKEN_H -#define Py_TOKEN_H -#ifdef __cplusplus -extern "C" { -#endif - -#undef TILDE /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */ - -#define ENDMARKER 0 -#define NAME 1 -#define NUMBER 2 -#define STRING 3 -#define NEWLINE 4 -#define INDENT 5 -#define DEDENT 6 -#define LPAR 7 -#define RPAR 8 -#define LSQB 9 -#define RSQB 10 -#define COLON 11 -#define COMMA 12 -#define SEMI 13 -#define PLUS 14 -#define MINUS 15 -#define STAR 16 -#define SLASH 17 -#define VBAR 18 -#define AMPER 19 -#define LESS 20 -#define GREATER 21 -#define EQUAL 22 -#define DOT 23 -#define PERCENT 24 -#define BACKQUOTE 25 -#define LBRACE 26 -#define RBRACE 27 -#define EQEQUAL 28 -#define NOTEQUAL 29 -#define LESSEQUAL 30 -#define GREATEREQUAL 31 -#define TILDE 32 -#define CIRCUMFLEX 33 -#define LEFTSHIFT 34 -#define RIGHTSHIFT 35 -#define DOUBLESTAR 36 -#define PLUSEQUAL 37 -#define MINEQUAL 38 -#define STAREQUAL 39 -#define SLASHEQUAL 40 -#define PERCENTEQUAL 41 -#define AMPEREQUAL 42 -#define VBAREQUAL 43 -#define CIRCUMFLEXEQUAL 44 -#define LEFTSHIFTEQUAL 45 -#define RIGHTSHIFTEQUAL 46 -#define DOUBLESTAREQUAL 47 -#define DOUBLESLASH 48 -#define DOUBLESLASHEQUAL 49 -#define AT 50 -/* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */ -#define OP 51 -#define ERRORTOKEN 52 -#define N_TOKENS 53 - -/* Special definitions for cooperation with parser */ - -#define NT_OFFSET 256 - -#define ISTERMINAL(x) ((x) < NT_OFFSET) -#define ISNONTERMINAL(x) ((x) >= NT_OFFSET) -#define ISEOF(x) ((x) == ENDMARKER) - - -PyAPI_DATA(char *) _PyParser_TokenNames[]; /* Token names */ -PyAPI_FUNC(int) PyToken_OneChar(int); -PyAPI_FUNC(int) PyToken_TwoChars(int, int); -PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_TOKEN_H */ diff --git a/python/include/traceback.h b/python/include/traceback.h deleted file mode 100644 index e7943dae..00000000 --- a/python/include/traceback.h +++ /dev/null @@ -1,31 +0,0 @@ - -#ifndef Py_TRACEBACK_H -#define Py_TRACEBACK_H -#ifdef __cplusplus -extern "C" { -#endif - -struct _frame; - -/* Traceback interface */ - -typedef struct _traceback { - PyObject_HEAD - struct _traceback *tb_next; - struct _frame *tb_frame; - int tb_lasti; - int tb_lineno; -} PyTracebackObject; - -PyAPI_FUNC(int) PyTraceBack_Here(struct _frame *); -PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *); -PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, const char *, int, int); - -/* Reveal traceback type so we can typecheck traceback objects */ -PyAPI_DATA(PyTypeObject) PyTraceBack_Type; -#define PyTraceBack_Check(v) (Py_TYPE(v) == &PyTraceBack_Type) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_TRACEBACK_H */ diff --git a/python/include/tupleobject.h b/python/include/tupleobject.h deleted file mode 100644 index a5ab7332..00000000 --- a/python/include/tupleobject.h +++ /dev/null @@ -1,61 +0,0 @@ - -/* Tuple object interface */ - -#ifndef Py_TUPLEOBJECT_H -#define Py_TUPLEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* -Another generally useful object type is a tuple of object pointers. -For Python, this is an immutable type. C code can change the tuple items -(but not their number), and even use tuples are general-purpose arrays of -object references, but in general only brand new tuples should be mutated, -not ones that might already have been exposed to Python code. - -*** WARNING *** PyTuple_SetItem does not increment the new item's reference -count, but does decrement the reference count of the item it replaces, -if not nil. It does *decrement* the reference count if it is *not* -inserted in the tuple. Similarly, PyTuple_GetItem does not increment the -returned item's reference count. -*/ - -typedef struct { - PyObject_VAR_HEAD - PyObject *ob_item[1]; - - /* ob_item contains space for 'ob_size' elements. - * Items must normally not be NULL, except during construction when - * the tuple is not yet visible outside the function that builds it. - */ -} PyTupleObject; - -PyAPI_DATA(PyTypeObject) PyTuple_Type; - -#define PyTuple_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TUPLE_SUBCLASS) -#define PyTuple_CheckExact(op) (Py_TYPE(op) == &PyTuple_Type) - -PyAPI_FUNC(PyObject *) PyTuple_New(Py_ssize_t size); -PyAPI_FUNC(Py_ssize_t) PyTuple_Size(PyObject *); -PyAPI_FUNC(PyObject *) PyTuple_GetItem(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyTuple_SetItem(PyObject *, Py_ssize_t, PyObject *); -PyAPI_FUNC(PyObject *) PyTuple_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t); -PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t); -PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...); -PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *); - -/* Macro, trading safety for speed */ -#define PyTuple_GET_ITEM(op, i) (((PyTupleObject *)(op))->ob_item[i]) -#define PyTuple_GET_SIZE(op) Py_SIZE(op) - -/* Macro, *only* to be used to fill in brand new tuples */ -#define PyTuple_SET_ITEM(op, i, v) (((PyTupleObject *)(op))->ob_item[i] = v) - -PyAPI_FUNC(int) PyTuple_ClearFreeList(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_TUPLEOBJECT_H */ diff --git a/python/include/ucnhash.h b/python/include/ucnhash.h deleted file mode 100644 index 69b7774a..00000000 --- a/python/include/ucnhash.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Unicode name database interface */ - -#ifndef Py_UCNHASH_H -#define Py_UCNHASH_H -#ifdef __cplusplus -extern "C" { -#endif - -/* revised ucnhash CAPI interface (exported through a "wrapper") */ - -#define PyUnicodeData_CAPSULE_NAME "unicodedata.ucnhash_CAPI" - -typedef struct { - - /* Size of this struct */ - int size; - - /* Get name for a given character code. Returns non-zero if - success, zero if not. Does not set Python exceptions. - If self is NULL, data come from the default version of the database. - If it is not NULL, it should be a unicodedata.ucd_X_Y_Z object */ - int (*getname)(PyObject *self, Py_UCS4 code, char* buffer, int buflen); - - /* Get character code for a given name. Same error handling - as for getname. */ - int (*getcode)(PyObject *self, const char* name, int namelen, Py_UCS4* code); - -} _PyUnicode_Name_CAPI; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_UCNHASH_H */ diff --git a/python/include/unicodeobject.h b/python/include/unicodeobject.h deleted file mode 100644 index 9ab724aa..00000000 --- a/python/include/unicodeobject.h +++ /dev/null @@ -1,1413 +0,0 @@ -#ifndef Py_UNICODEOBJECT_H -#define Py_UNICODEOBJECT_H - -#include - -/* - -Unicode implementation based on original code by Fredrik Lundh, -modified by Marc-Andre Lemburg (mal@lemburg.com) according to the -Unicode Integration Proposal (see file Misc/unicode.txt). - -Copyright (c) Corporation for National Research Initiatives. - - - Original header: - -------------------------------------------------------------------- - - * Yet another Unicode string type for Python. This type supports the - * 16-bit Basic Multilingual Plane (BMP) only. - * - * Written by Fredrik Lundh, January 1999. - * - * Copyright (c) 1999 by Secret Labs AB. - * Copyright (c) 1999 by Fredrik Lundh. - * - * fredrik@pythonware.com - * http://www.pythonware.com - * - * -------------------------------------------------------------------- - * This Unicode String Type is - * - * Copyright (c) 1999 by Secret Labs AB - * Copyright (c) 1999 by Fredrik Lundh - * - * By obtaining, using, and/or copying this software and/or its - * associated documentation, you agree that you have read, understood, - * and will comply with the following terms and conditions: - * - * Permission to use, copy, modify, and distribute this software and its - * associated documentation for any purpose and without fee is hereby - * granted, provided that the above copyright notice appears in all - * copies, and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of Secret Labs - * AB or the author not be used in advertising or publicity pertaining to - * distribution of the software without specific, written prior - * permission. - * - * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * -------------------------------------------------------------------- */ - -#include - -/* === Internal API ======================================================= */ - -/* --- Internal Unicode Format -------------------------------------------- */ - -#ifndef Py_USING_UNICODE - -#define PyUnicode_Check(op) 0 -#define PyUnicode_CheckExact(op) 0 - -#else - -/* FIXME: MvL's new implementation assumes that Py_UNICODE_SIZE is - properly set, but the default rules below doesn't set it. I'll - sort this out some other day -- fredrik@pythonware.com */ - -#ifndef Py_UNICODE_SIZE -#error Must define Py_UNICODE_SIZE -#endif - -/* Setting Py_UNICODE_WIDE enables UCS-4 storage. Otherwise, Unicode - strings are stored as UCS-2 (with limited support for UTF-16) */ - -#if Py_UNICODE_SIZE >= 4 -#define Py_UNICODE_WIDE -#endif - -/* Set these flags if the platform has "wchar.h", "wctype.h" and the - wchar_t type is a 16-bit unsigned type */ -/* #define HAVE_WCHAR_H */ -/* #define HAVE_USABLE_WCHAR_T */ - -/* Defaults for various platforms */ -#ifndef PY_UNICODE_TYPE - -/* Windows has a usable wchar_t type (unless we're using UCS-4) */ -# if defined(MS_WIN32) && Py_UNICODE_SIZE == 2 -# define HAVE_USABLE_WCHAR_T -# define PY_UNICODE_TYPE wchar_t -# endif - -# if defined(Py_UNICODE_WIDE) -# define PY_UNICODE_TYPE Py_UCS4 -# endif - -#endif - -/* If the compiler provides a wchar_t type we try to support it - through the interface functions PyUnicode_FromWideChar() and - PyUnicode_AsWideChar(). */ - -#ifdef HAVE_USABLE_WCHAR_T -# ifndef HAVE_WCHAR_H -# define HAVE_WCHAR_H -# endif -#endif - -#ifdef HAVE_WCHAR_H -/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */ -# ifdef _HAVE_BSDI -# include -# endif -# include -#endif - -/* - * Use this typedef when you need to represent a UTF-16 surrogate pair - * as single unsigned integer. - */ -#if SIZEOF_INT >= 4 -typedef unsigned int Py_UCS4; -#elif SIZEOF_LONG >= 4 -typedef unsigned long Py_UCS4; -#endif - -/* Py_UNICODE is the native Unicode storage format (code unit) used by - Python and represents a single Unicode element in the Unicode - type. */ - -typedef PY_UNICODE_TYPE Py_UNICODE; - -/* --- UCS-2/UCS-4 Name Mangling ------------------------------------------ */ - -/* Unicode API names are mangled to assure that UCS-2 and UCS-4 builds - produce different external names and thus cause import errors in - case Python interpreters and extensions with mixed compiled in - Unicode width assumptions are combined. */ - -#ifndef Py_UNICODE_WIDE - -# define PyUnicode_AsASCIIString PyUnicodeUCS2_AsASCIIString -# define PyUnicode_AsCharmapString PyUnicodeUCS2_AsCharmapString -# define PyUnicode_AsEncodedObject PyUnicodeUCS2_AsEncodedObject -# define PyUnicode_AsEncodedString PyUnicodeUCS2_AsEncodedString -# define PyUnicode_AsLatin1String PyUnicodeUCS2_AsLatin1String -# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS2_AsRawUnicodeEscapeString -# define PyUnicode_AsUTF32String PyUnicodeUCS2_AsUTF32String -# define PyUnicode_AsUTF16String PyUnicodeUCS2_AsUTF16String -# define PyUnicode_AsUTF8String PyUnicodeUCS2_AsUTF8String -# define PyUnicode_AsUnicode PyUnicodeUCS2_AsUnicode -# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS2_AsUnicodeEscapeString -# define PyUnicode_AsWideChar PyUnicodeUCS2_AsWideChar -# define PyUnicode_ClearFreeList PyUnicodeUCS2_ClearFreelist -# define PyUnicode_Compare PyUnicodeUCS2_Compare -# define PyUnicode_Concat PyUnicodeUCS2_Concat -# define PyUnicode_Contains PyUnicodeUCS2_Contains -# define PyUnicode_Count PyUnicodeUCS2_Count -# define PyUnicode_Decode PyUnicodeUCS2_Decode -# define PyUnicode_DecodeASCII PyUnicodeUCS2_DecodeASCII -# define PyUnicode_DecodeCharmap PyUnicodeUCS2_DecodeCharmap -# define PyUnicode_DecodeLatin1 PyUnicodeUCS2_DecodeLatin1 -# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS2_DecodeRawUnicodeEscape -# define PyUnicode_DecodeUTF32 PyUnicodeUCS2_DecodeUTF32 -# define PyUnicode_DecodeUTF32Stateful PyUnicodeUCS2_DecodeUTF32Stateful -# define PyUnicode_DecodeUTF16 PyUnicodeUCS2_DecodeUTF16 -# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS2_DecodeUTF16Stateful -# define PyUnicode_DecodeUTF8 PyUnicodeUCS2_DecodeUTF8 -# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS2_DecodeUTF8Stateful -# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS2_DecodeUnicodeEscape -# define PyUnicode_Encode PyUnicodeUCS2_Encode -# define PyUnicode_EncodeASCII PyUnicodeUCS2_EncodeASCII -# define PyUnicode_EncodeCharmap PyUnicodeUCS2_EncodeCharmap -# define PyUnicode_EncodeDecimal PyUnicodeUCS2_EncodeDecimal -# define PyUnicode_EncodeLatin1 PyUnicodeUCS2_EncodeLatin1 -# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS2_EncodeRawUnicodeEscape -# define PyUnicode_EncodeUTF32 PyUnicodeUCS2_EncodeUTF32 -# define PyUnicode_EncodeUTF16 PyUnicodeUCS2_EncodeUTF16 -# define PyUnicode_EncodeUTF8 PyUnicodeUCS2_EncodeUTF8 -# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS2_EncodeUnicodeEscape -# define PyUnicode_Find PyUnicodeUCS2_Find -# define PyUnicode_Format PyUnicodeUCS2_Format -# define PyUnicode_FromEncodedObject PyUnicodeUCS2_FromEncodedObject -# define PyUnicode_FromFormat PyUnicodeUCS2_FromFormat -# define PyUnicode_FromFormatV PyUnicodeUCS2_FromFormatV -# define PyUnicode_FromObject PyUnicodeUCS2_FromObject -# define PyUnicode_FromOrdinal PyUnicodeUCS2_FromOrdinal -# define PyUnicode_FromString PyUnicodeUCS2_FromString -# define PyUnicode_FromStringAndSize PyUnicodeUCS2_FromStringAndSize -# define PyUnicode_FromUnicode PyUnicodeUCS2_FromUnicode -# define PyUnicode_FromWideChar PyUnicodeUCS2_FromWideChar -# define PyUnicode_GetDefaultEncoding PyUnicodeUCS2_GetDefaultEncoding -# define PyUnicode_GetMax PyUnicodeUCS2_GetMax -# define PyUnicode_GetSize PyUnicodeUCS2_GetSize -# define PyUnicode_Join PyUnicodeUCS2_Join -# define PyUnicode_Partition PyUnicodeUCS2_Partition -# define PyUnicode_RPartition PyUnicodeUCS2_RPartition -# define PyUnicode_RSplit PyUnicodeUCS2_RSplit -# define PyUnicode_Replace PyUnicodeUCS2_Replace -# define PyUnicode_Resize PyUnicodeUCS2_Resize -# define PyUnicode_RichCompare PyUnicodeUCS2_RichCompare -# define PyUnicode_SetDefaultEncoding PyUnicodeUCS2_SetDefaultEncoding -# define PyUnicode_Split PyUnicodeUCS2_Split -# define PyUnicode_Splitlines PyUnicodeUCS2_Splitlines -# define PyUnicode_Tailmatch PyUnicodeUCS2_Tailmatch -# define PyUnicode_Translate PyUnicodeUCS2_Translate -# define PyUnicode_TranslateCharmap PyUnicodeUCS2_TranslateCharmap -# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS2_AsDefaultEncodedString -# define _PyUnicode_Fini _PyUnicodeUCS2_Fini -# define _PyUnicode_Init _PyUnicodeUCS2_Init -# define _PyUnicode_IsAlpha _PyUnicodeUCS2_IsAlpha -# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS2_IsDecimalDigit -# define _PyUnicode_IsDigit _PyUnicodeUCS2_IsDigit -# define _PyUnicode_IsLinebreak _PyUnicodeUCS2_IsLinebreak -# define _PyUnicode_IsLowercase _PyUnicodeUCS2_IsLowercase -# define _PyUnicode_IsNumeric _PyUnicodeUCS2_IsNumeric -# define _PyUnicode_IsTitlecase _PyUnicodeUCS2_IsTitlecase -# define _PyUnicode_IsUppercase _PyUnicodeUCS2_IsUppercase -# define _PyUnicode_IsWhitespace _PyUnicodeUCS2_IsWhitespace -# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS2_ToDecimalDigit -# define _PyUnicode_ToDigit _PyUnicodeUCS2_ToDigit -# define _PyUnicode_ToLowercase _PyUnicodeUCS2_ToLowercase -# define _PyUnicode_ToNumeric _PyUnicodeUCS2_ToNumeric -# define _PyUnicode_ToTitlecase _PyUnicodeUCS2_ToTitlecase -# define _PyUnicode_ToUppercase _PyUnicodeUCS2_ToUppercase - -#else - -# define PyUnicode_AsASCIIString PyUnicodeUCS4_AsASCIIString -# define PyUnicode_AsCharmapString PyUnicodeUCS4_AsCharmapString -# define PyUnicode_AsEncodedObject PyUnicodeUCS4_AsEncodedObject -# define PyUnicode_AsEncodedString PyUnicodeUCS4_AsEncodedString -# define PyUnicode_AsLatin1String PyUnicodeUCS4_AsLatin1String -# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS4_AsRawUnicodeEscapeString -# define PyUnicode_AsUTF32String PyUnicodeUCS4_AsUTF32String -# define PyUnicode_AsUTF16String PyUnicodeUCS4_AsUTF16String -# define PyUnicode_AsUTF8String PyUnicodeUCS4_AsUTF8String -# define PyUnicode_AsUnicode PyUnicodeUCS4_AsUnicode -# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS4_AsUnicodeEscapeString -# define PyUnicode_AsWideChar PyUnicodeUCS4_AsWideChar -# define PyUnicode_ClearFreeList PyUnicodeUCS4_ClearFreelist -# define PyUnicode_Compare PyUnicodeUCS4_Compare -# define PyUnicode_Concat PyUnicodeUCS4_Concat -# define PyUnicode_Contains PyUnicodeUCS4_Contains -# define PyUnicode_Count PyUnicodeUCS4_Count -# define PyUnicode_Decode PyUnicodeUCS4_Decode -# define PyUnicode_DecodeASCII PyUnicodeUCS4_DecodeASCII -# define PyUnicode_DecodeCharmap PyUnicodeUCS4_DecodeCharmap -# define PyUnicode_DecodeLatin1 PyUnicodeUCS4_DecodeLatin1 -# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS4_DecodeRawUnicodeEscape -# define PyUnicode_DecodeUTF32 PyUnicodeUCS4_DecodeUTF32 -# define PyUnicode_DecodeUTF32Stateful PyUnicodeUCS4_DecodeUTF32Stateful -# define PyUnicode_DecodeUTF16 PyUnicodeUCS4_DecodeUTF16 -# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS4_DecodeUTF16Stateful -# define PyUnicode_DecodeUTF8 PyUnicodeUCS4_DecodeUTF8 -# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS4_DecodeUTF8Stateful -# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS4_DecodeUnicodeEscape -# define PyUnicode_Encode PyUnicodeUCS4_Encode -# define PyUnicode_EncodeASCII PyUnicodeUCS4_EncodeASCII -# define PyUnicode_EncodeCharmap PyUnicodeUCS4_EncodeCharmap -# define PyUnicode_EncodeDecimal PyUnicodeUCS4_EncodeDecimal -# define PyUnicode_EncodeLatin1 PyUnicodeUCS4_EncodeLatin1 -# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS4_EncodeRawUnicodeEscape -# define PyUnicode_EncodeUTF32 PyUnicodeUCS4_EncodeUTF32 -# define PyUnicode_EncodeUTF16 PyUnicodeUCS4_EncodeUTF16 -# define PyUnicode_EncodeUTF8 PyUnicodeUCS4_EncodeUTF8 -# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS4_EncodeUnicodeEscape -# define PyUnicode_Find PyUnicodeUCS4_Find -# define PyUnicode_Format PyUnicodeUCS4_Format -# define PyUnicode_FromEncodedObject PyUnicodeUCS4_FromEncodedObject -# define PyUnicode_FromFormat PyUnicodeUCS4_FromFormat -# define PyUnicode_FromFormatV PyUnicodeUCS4_FromFormatV -# define PyUnicode_FromObject PyUnicodeUCS4_FromObject -# define PyUnicode_FromOrdinal PyUnicodeUCS4_FromOrdinal -# define PyUnicode_FromString PyUnicodeUCS4_FromString -# define PyUnicode_FromStringAndSize PyUnicodeUCS4_FromStringAndSize -# define PyUnicode_FromUnicode PyUnicodeUCS4_FromUnicode -# define PyUnicode_FromWideChar PyUnicodeUCS4_FromWideChar -# define PyUnicode_GetDefaultEncoding PyUnicodeUCS4_GetDefaultEncoding -# define PyUnicode_GetMax PyUnicodeUCS4_GetMax -# define PyUnicode_GetSize PyUnicodeUCS4_GetSize -# define PyUnicode_Join PyUnicodeUCS4_Join -# define PyUnicode_Partition PyUnicodeUCS4_Partition -# define PyUnicode_RPartition PyUnicodeUCS4_RPartition -# define PyUnicode_RSplit PyUnicodeUCS4_RSplit -# define PyUnicode_Replace PyUnicodeUCS4_Replace -# define PyUnicode_Resize PyUnicodeUCS4_Resize -# define PyUnicode_RichCompare PyUnicodeUCS4_RichCompare -# define PyUnicode_SetDefaultEncoding PyUnicodeUCS4_SetDefaultEncoding -# define PyUnicode_Split PyUnicodeUCS4_Split -# define PyUnicode_Splitlines PyUnicodeUCS4_Splitlines -# define PyUnicode_Tailmatch PyUnicodeUCS4_Tailmatch -# define PyUnicode_Translate PyUnicodeUCS4_Translate -# define PyUnicode_TranslateCharmap PyUnicodeUCS4_TranslateCharmap -# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS4_AsDefaultEncodedString -# define _PyUnicode_Fini _PyUnicodeUCS4_Fini -# define _PyUnicode_Init _PyUnicodeUCS4_Init -# define _PyUnicode_IsAlpha _PyUnicodeUCS4_IsAlpha -# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS4_IsDecimalDigit -# define _PyUnicode_IsDigit _PyUnicodeUCS4_IsDigit -# define _PyUnicode_IsLinebreak _PyUnicodeUCS4_IsLinebreak -# define _PyUnicode_IsLowercase _PyUnicodeUCS4_IsLowercase -# define _PyUnicode_IsNumeric _PyUnicodeUCS4_IsNumeric -# define _PyUnicode_IsTitlecase _PyUnicodeUCS4_IsTitlecase -# define _PyUnicode_IsUppercase _PyUnicodeUCS4_IsUppercase -# define _PyUnicode_IsWhitespace _PyUnicodeUCS4_IsWhitespace -# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS4_ToDecimalDigit -# define _PyUnicode_ToDigit _PyUnicodeUCS4_ToDigit -# define _PyUnicode_ToLowercase _PyUnicodeUCS4_ToLowercase -# define _PyUnicode_ToNumeric _PyUnicodeUCS4_ToNumeric -# define _PyUnicode_ToTitlecase _PyUnicodeUCS4_ToTitlecase -# define _PyUnicode_ToUppercase _PyUnicodeUCS4_ToUppercase - - -#endif - -/* --- Internal Unicode Operations ---------------------------------------- */ - -/* If you want Python to use the compiler's wctype.h functions instead - of the ones supplied with Python, define WANT_WCTYPE_FUNCTIONS or - configure Python using --with-wctype-functions. This reduces the - interpreter's code size. */ - -#if defined(HAVE_USABLE_WCHAR_T) && defined(WANT_WCTYPE_FUNCTIONS) - -#include - -#define Py_UNICODE_ISSPACE(ch) iswspace(ch) - -#define Py_UNICODE_ISLOWER(ch) iswlower(ch) -#define Py_UNICODE_ISUPPER(ch) iswupper(ch) -#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch) -#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch) - -#define Py_UNICODE_TOLOWER(ch) towlower(ch) -#define Py_UNICODE_TOUPPER(ch) towupper(ch) -#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch) - -#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch) -#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch) -#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch) - -#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch) -#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch) -#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch) - -#define Py_UNICODE_ISALPHA(ch) iswalpha(ch) - -#else - -/* Since splitting on whitespace is an important use case, and - whitespace in most situations is solely ASCII whitespace, we - optimize for the common case by using a quick look-up table - _Py_ascii_whitespace (see below) with an inlined check. - - */ -#define Py_UNICODE_ISSPACE(ch) \ - ((ch) < 128U ? _Py_ascii_whitespace[(ch)] : _PyUnicode_IsWhitespace(ch)) - -#define Py_UNICODE_ISLOWER(ch) _PyUnicode_IsLowercase(ch) -#define Py_UNICODE_ISUPPER(ch) _PyUnicode_IsUppercase(ch) -#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch) -#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch) - -#define Py_UNICODE_TOLOWER(ch) _PyUnicode_ToLowercase(ch) -#define Py_UNICODE_TOUPPER(ch) _PyUnicode_ToUppercase(ch) -#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch) - -#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch) -#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch) -#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch) - -#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch) -#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch) -#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch) - -#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch) - -#endif - -#define Py_UNICODE_ISALNUM(ch) \ - (Py_UNICODE_ISALPHA(ch) || \ - Py_UNICODE_ISDECIMAL(ch) || \ - Py_UNICODE_ISDIGIT(ch) || \ - Py_UNICODE_ISNUMERIC(ch)) - -#define Py_UNICODE_COPY(target, source, length) \ - Py_MEMCPY((target), (source), (length)*sizeof(Py_UNICODE)) - -#define Py_UNICODE_FILL(target, value, length) \ - do {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\ - for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\ - } while (0) - -/* Check if substring matches at given offset. the offset must be - valid, and the substring must not be empty */ - -#define Py_UNICODE_MATCH(string, offset, substring) \ - ((*((string)->str + (offset)) == *((substring)->str)) && \ - ((*((string)->str + (offset) + (substring)->length-1) == *((substring)->str + (substring)->length-1))) && \ - !memcmp((string)->str + (offset), (substring)->str, (substring)->length*sizeof(Py_UNICODE))) - -#ifdef __cplusplus -extern "C" { -#endif - -/* --- Unicode Type ------------------------------------------------------- */ - -typedef struct { - PyObject_HEAD - Py_ssize_t length; /* Length of raw Unicode data in buffer */ - Py_UNICODE *str; /* Raw Unicode buffer */ - long hash; /* Hash value; -1 if not set */ - PyObject *defenc; /* (Default) Encoded version as Python - string, or NULL; this is used for - implementing the buffer protocol */ -} PyUnicodeObject; - -PyAPI_DATA(PyTypeObject) PyUnicode_Type; - -#define PyUnicode_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_UNICODE_SUBCLASS) -#define PyUnicode_CheckExact(op) (Py_TYPE(op) == &PyUnicode_Type) - -/* Fast access macros */ -#define PyUnicode_GET_SIZE(op) \ - (((PyUnicodeObject *)(op))->length) -#define PyUnicode_GET_DATA_SIZE(op) \ - (((PyUnicodeObject *)(op))->length * sizeof(Py_UNICODE)) -#define PyUnicode_AS_UNICODE(op) \ - (((PyUnicodeObject *)(op))->str) -#define PyUnicode_AS_DATA(op) \ - ((const char *)((PyUnicodeObject *)(op))->str) - -/* --- Constants ---------------------------------------------------------- */ - -/* This Unicode character will be used as replacement character during - decoding if the errors argument is set to "replace". Note: the - Unicode character U+FFFD is the official REPLACEMENT CHARACTER in - Unicode 3.0. */ - -#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UNICODE) 0xFFFD) - -/* === Public API ========================================================= */ - -/* --- Plain Py_UNICODE --------------------------------------------------- */ - -/* Create a Unicode Object from the Py_UNICODE buffer u of the given - size. - - u may be NULL which causes the contents to be undefined. It is the - user's responsibility to fill in the needed data afterwards. Note - that modifying the Unicode object contents after construction is - only allowed if u was set to NULL. - - The buffer is copied into the new object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode( - const Py_UNICODE *u, /* Unicode buffer */ - Py_ssize_t size /* size of buffer */ - ); - -/* Similar to PyUnicode_FromUnicode(), but u points to Latin-1 encoded bytes */ -PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize( - const char *u, /* char buffer */ - Py_ssize_t size /* size of buffer */ - ); - -/* Similar to PyUnicode_FromUnicode(), but u points to null-terminated - Latin-1 encoded bytes */ -PyAPI_FUNC(PyObject*) PyUnicode_FromString( - const char *u /* string */ - ); - -/* Return a read-only pointer to the Unicode object's internal - Py_UNICODE buffer. */ - -PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode( - PyObject *unicode /* Unicode object */ - ); - -/* Get the length of the Unicode object. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize( - PyObject *unicode /* Unicode object */ - ); - -/* Get the maximum ordinal for a Unicode character. */ -PyAPI_FUNC(Py_UNICODE) PyUnicode_GetMax(void); - -/* Resize an already allocated Unicode object to the new size length. - - *unicode is modified to point to the new (resized) object and 0 - returned on success. - - This API may only be called by the function which also called the - Unicode constructor. The refcount on the object must be 1. Otherwise, - an error is returned. - - Error handling is implemented as follows: an exception is set, -1 - is returned and *unicode left untouched. - -*/ - -PyAPI_FUNC(int) PyUnicode_Resize( - PyObject **unicode, /* Pointer to the Unicode object */ - Py_ssize_t length /* New length */ - ); - -/* Coerce obj to an Unicode object and return a reference with - *incremented* refcount. - - Coercion is done in the following way: - - 1. String and other char buffer compatible objects are decoded - under the assumptions that they contain data using the current - default encoding. Decoding is done in "strict" mode. - - 2. All other objects (including Unicode objects) raise an - exception. - - The API returns NULL in case of an error. The caller is responsible - for decref'ing the returned objects. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject( - register PyObject *obj, /* Object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Coerce obj to an Unicode object and return a reference with - *incremented* refcount. - - Unicode objects are passed back as-is (subclasses are converted to - true Unicode objects), all other objects are delegated to - PyUnicode_FromEncodedObject(obj, NULL, "strict") which results in - using the default encoding as basis for decoding the object. - - The API returns NULL in case of an error. The caller is responsible - for decref'ing the returned objects. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_FromObject( - register PyObject *obj /* Object */ - ); - -PyAPI_FUNC(PyObject *) PyUnicode_FromFormatV(const char*, va_list); -PyAPI_FUNC(PyObject *) PyUnicode_FromFormat(const char*, ...); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyUnicode_FormatAdvanced(PyObject *obj, - Py_UNICODE *format_spec, - Py_ssize_t format_spec_len); - -/* --- wchar_t support for platforms which support it --------------------- */ - -#ifdef HAVE_WCHAR_H - -/* Create a Unicode Object from the whcar_t buffer w of the given - size. - - The buffer is copied into the new object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar( - register const wchar_t *w, /* wchar_t buffer */ - Py_ssize_t size /* size of buffer */ - ); - -/* Copies the Unicode Object contents into the wchar_t buffer w. At - most size wchar_t characters are copied. - - Note that the resulting wchar_t string may or may not be - 0-terminated. It is the responsibility of the caller to make sure - that the wchar_t string is 0-terminated in case this is required by - the application. - - Returns the number of wchar_t characters copied (excluding a - possibly trailing 0-termination character) or -1 in case of an - error. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar( - PyUnicodeObject *unicode, /* Unicode object */ - register wchar_t *w, /* wchar_t buffer */ - Py_ssize_t size /* size of buffer */ - ); - -#endif - -/* --- Unicode ordinals --------------------------------------------------- */ - -/* Create a Unicode Object from the given Unicode code point ordinal. - - The ordinal must be in range(0x10000) on narrow Python builds - (UCS2), and range(0x110000) on wide builds (UCS4). A ValueError is - raised in case it is not. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal); - -/* --- Free-list management ----------------------------------------------- */ - -/* Clear the free list used by the Unicode implementation. - - This can be used to release memory used for objects on the free - list back to the Python memory allocator. - -*/ - -PyAPI_FUNC(int) PyUnicode_ClearFreeList(void); - -/* === Builtin Codecs ===================================================== - - Many of these APIs take two arguments encoding and errors. These - parameters encoding and errors have the same semantics as the ones - of the builtin unicode() API. - - Setting encoding to NULL causes the default encoding to be used. - - Error handling is set by errors which may also be set to NULL - meaning to use the default handling defined for the codec. Default - error handling for all builtin codecs is "strict" (ValueErrors are - raised). - - The codecs all use a similar interface. Only deviation from the - generic ones are documented. - -*/ - -/* --- Manage the default encoding ---------------------------------------- */ - -/* Return a Python string holding the default encoded value of the - Unicode object. - - The resulting string is cached in the Unicode object for subsequent - usage by this function. The cached version is needed to implement - the character buffer interface and will live (at least) as long as - the Unicode object itself. - - The refcount of the string is *not* incremented. - - *** Exported for internal use by the interpreter only !!! *** - -*/ - -PyAPI_FUNC(PyObject *) _PyUnicode_AsDefaultEncodedString( - PyObject *, const char *); - -/* Returns the currently active default encoding. - - The default encoding is currently implemented as run-time settable - process global. This may change in future versions of the - interpreter to become a parameter which is managed on a per-thread - basis. - - */ - -PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void); - -/* Sets the currently active default encoding. - - Returns 0 on success, -1 in case of an error. - - */ - -PyAPI_FUNC(int) PyUnicode_SetDefaultEncoding( - const char *encoding /* Encoding name in standard form */ - ); - -/* --- Generic Codecs ----------------------------------------------------- */ - -/* Create a Unicode object by decoding the encoded string s of the - given size. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Decode( - const char *s, /* encoded string */ - Py_ssize_t size, /* size of buffer */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a Py_UNICODE buffer of the given size and returns a - Python string object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Encode( - const Py_UNICODE *s, /* Unicode char buffer */ - Py_ssize_t size, /* number of Py_UNICODE chars to encode */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a Unicode object and returns the result as Python - object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject( - PyObject *unicode, /* Unicode object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a Unicode object and returns the result as Python string - object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString( - PyObject *unicode, /* Unicode object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap( - PyObject* string /* 256 character map */ - ); - - -/* --- UTF-7 Codecs ------------------------------------------------------- */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7( - const char *string, /* UTF-7 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful( - const char *string, /* UTF-7 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* number of Py_UNICODE chars to encode */ - int base64SetO, /* Encode RFC2152 Set O characters in base64 */ - int base64WhiteSpace, /* Encode whitespace (sp, ht, nl, cr) in base64 */ - const char *errors /* error handling */ - ); - -/* --- UTF-8 Codecs ------------------------------------------------------- */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8( - const char *string, /* UTF-8 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful( - const char *string, /* UTF-8 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* number of Py_UNICODE chars to encode */ - const char *errors /* error handling */ - ); - -/* --- UTF-32 Codecs ------------------------------------------------------ */ - -/* Decodes length bytes from a UTF-32 encoded buffer string and returns - the corresponding Unicode object. - - errors (if non-NULL) defines the error handling. It defaults - to "strict". - - If byteorder is non-NULL, the decoder starts decoding using the - given byte order: - - *byteorder == -1: little endian - *byteorder == 0: native order - *byteorder == 1: big endian - - In native mode, the first four bytes of the stream are checked for a - BOM mark. If found, the BOM mark is analysed, the byte order - adjusted and the BOM skipped. In the other modes, no BOM mark - interpretation is done. After completion, *byteorder is set to the - current byte order at the end of input data. - - If byteorder is NULL, the codec starts in native order mode. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32( - const char *string, /* UTF-32 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - int *byteorder /* pointer to byteorder to use - 0=native;-1=LE,1=BE; updated on - exit */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32Stateful( - const char *string, /* UTF-32 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - int *byteorder, /* pointer to byteorder to use - 0=native;-1=LE,1=BE; updated on - exit */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -/* Returns a Python string using the UTF-32 encoding in native byte - order. The string always starts with a BOM mark. */ - -PyAPI_FUNC(PyObject*) PyUnicode_AsUTF32String( - PyObject *unicode /* Unicode object */ - ); - -/* Returns a Python string object holding the UTF-32 encoded value of - the Unicode data. - - If byteorder is not 0, output is written according to the following - byte order: - - byteorder == -1: little endian - byteorder == 0: native byte order (writes a BOM mark) - byteorder == 1: big endian - - If byteorder is 0, the output string will always start with the - Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is - prepended. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF32( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* number of Py_UNICODE chars to encode */ - const char *errors, /* error handling */ - int byteorder /* byteorder to use 0=BOM+native;-1=LE,1=BE */ - ); - -/* --- UTF-16 Codecs ------------------------------------------------------ */ - -/* Decodes length bytes from a UTF-16 encoded buffer string and returns - the corresponding Unicode object. - - errors (if non-NULL) defines the error handling. It defaults - to "strict". - - If byteorder is non-NULL, the decoder starts decoding using the - given byte order: - - *byteorder == -1: little endian - *byteorder == 0: native order - *byteorder == 1: big endian - - In native mode, the first two bytes of the stream are checked for a - BOM mark. If found, the BOM mark is analysed, the byte order - adjusted and the BOM skipped. In the other modes, no BOM mark - interpretation is done. After completion, *byteorder is set to the - current byte order at the end of input data. - - If byteorder is NULL, the codec starts in native order mode. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16( - const char *string, /* UTF-16 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - int *byteorder /* pointer to byteorder to use - 0=native;-1=LE,1=BE; updated on - exit */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful( - const char *string, /* UTF-16 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - int *byteorder, /* pointer to byteorder to use - 0=native;-1=LE,1=BE; updated on - exit */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -/* Returns a Python string using the UTF-16 encoding in native byte - order. The string always starts with a BOM mark. */ - -PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String( - PyObject *unicode /* Unicode object */ - ); - -/* Returns a Python string object holding the UTF-16 encoded value of - the Unicode data. - - If byteorder is not 0, output is written according to the following - byte order: - - byteorder == -1: little endian - byteorder == 0: native byte order (writes a BOM mark) - byteorder == 1: big endian - - If byteorder is 0, the output string will always start with the - Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is - prepended. - - Note that Py_UNICODE data is being interpreted as UTF-16 reduced to - UCS-2. This trick makes it possible to add full UTF-16 capabilities - at a later point without compromising the APIs. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* number of Py_UNICODE chars to encode */ - const char *errors, /* error handling */ - int byteorder /* byteorder to use 0=BOM+native;-1=LE,1=BE */ - ); - -/* --- Unicode-Escape Codecs ---------------------------------------------- */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape( - const char *string, /* Unicode-Escape encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length /* Number of Py_UNICODE chars to encode */ - ); - -/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape( - const char *string, /* Raw-Unicode-Escape encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length /* Number of Py_UNICODE chars to encode */ - ); - -/* --- Unicode Internal Codec --------------------------------------------- - - Only for internal use in _codecsmodule.c */ - -PyObject *_PyUnicode_DecodeUnicodeInternal( - const char *string, - Py_ssize_t length, - const char *errors - ); - -/* --- Latin-1 Codecs ----------------------------------------------------- - - Note: Latin-1 corresponds to the first 256 Unicode ordinals. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1( - const char *string, /* Latin-1 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - const char *errors /* error handling */ - ); - -/* --- ASCII Codecs ------------------------------------------------------- - - Only 7-bit ASCII data is excepted. All other codes generate errors. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII( - const char *string, /* ASCII encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - const char *errors /* error handling */ - ); - -/* --- Character Map Codecs ----------------------------------------------- - - This codec uses mappings to encode and decode characters. - - Decoding mappings must map single string characters to single - Unicode characters, integers (which are then interpreted as Unicode - ordinals) or None (meaning "undefined mapping" and causing an - error). - - Encoding mappings must map single Unicode characters to single - string characters, integers (which are then interpreted as Latin-1 - ordinals) or None (meaning "undefined mapping" and causing an - error). - - If a character lookup fails with a LookupError, the character is - copied as-is meaning that its ordinal value will be interpreted as - Unicode or Latin-1 ordinal resp. Because of this mappings only need - to contain those mappings which map characters to different code - points. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap( - const char *string, /* Encoded string */ - Py_ssize_t length, /* size of string */ - PyObject *mapping, /* character mapping - (char ordinal -> unicode ordinal) */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString( - PyObject *unicode, /* Unicode object */ - PyObject *mapping /* character mapping - (unicode ordinal -> char ordinal) */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - PyObject *mapping, /* character mapping - (unicode ordinal -> char ordinal) */ - const char *errors /* error handling */ - ); - -/* Translate a Py_UNICODE buffer of the given length by applying a - character mapping table to it and return the resulting Unicode - object. - - The mapping table must map Unicode ordinal integers to Unicode - ordinal integers or None (causing deletion of the character). - - Mapping tables may be dictionaries or sequences. Unmapped character - ordinals (ones which cause a LookupError) are left untouched and - are copied as-is. - -*/ - -PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - PyObject *table, /* Translate table */ - const char *errors /* error handling */ - ); - -#ifdef MS_WIN32 - -/* --- MBCS codecs for Windows -------------------------------------------- */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS( - const char *string, /* MBCS encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful( - const char *string, /* MBCS encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - const char *errors /* error handling */ - ); - -#endif /* MS_WIN32 */ - -/* --- Decimal Encoder ---------------------------------------------------- */ - -/* Takes a Unicode string holding a decimal value and writes it into - an output buffer using standard ASCII digit codes. - - The output buffer has to provide at least length+1 bytes of storage - area. The output string is 0-terminated. - - The encoder converts whitespace to ' ', decimal characters to their - corresponding ASCII digit and all other Latin-1 characters except - \0 as-is. Characters outside this range (Unicode ordinals 1-256) - are treated as errors. This includes embedded NULL bytes. - - Error handling is defined by the errors argument: - - NULL or "strict": raise a ValueError - "ignore": ignore the wrong characters (these are not copied to the - output buffer) - "replace": replaces illegal characters with '?' - - Returns 0 on success, -1 on failure. - -*/ - -PyAPI_FUNC(int) PyUnicode_EncodeDecimal( - Py_UNICODE *s, /* Unicode buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - char *output, /* Output buffer; must have size >= length */ - const char *errors /* error handling */ - ); - -/* --- Methods & Slots ---------------------------------------------------- - - These are capable of handling Unicode objects and strings on input - (we refer to them as strings in the descriptions) and return - Unicode objects or integers as apporpriate. */ - -/* Concat two strings giving a new Unicode string. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Concat( - PyObject *left, /* Left string */ - PyObject *right /* Right string */ - ); - -/* Split a string giving a list of Unicode strings. - - If sep is NULL, splitting will be done at all whitespace - substrings. Otherwise, splits occur at the given separator. - - At most maxsplit splits will be done. If negative, no limit is set. - - Separators are not included in the resulting list. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_Split( - PyObject *s, /* String to split */ - PyObject *sep, /* String separator */ - Py_ssize_t maxsplit /* Maxsplit count */ - ); - -/* Dito, but split at line breaks. - - CRLF is considered to be one line break. Line breaks are not - included in the resulting list. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Splitlines( - PyObject *s, /* String to split */ - int keepends /* If true, line end markers are included */ - ); - -/* Partition a string using a given separator. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Partition( - PyObject *s, /* String to partition */ - PyObject *sep /* String separator */ - ); - -/* Partition a string using a given separator, searching from the end of the - string. */ - -PyAPI_FUNC(PyObject*) PyUnicode_RPartition( - PyObject *s, /* String to partition */ - PyObject *sep /* String separator */ - ); - -/* Split a string giving a list of Unicode strings. - - If sep is NULL, splitting will be done at all whitespace - substrings. Otherwise, splits occur at the given separator. - - At most maxsplit splits will be done. But unlike PyUnicode_Split - PyUnicode_RSplit splits from the end of the string. If negative, - no limit is set. - - Separators are not included in the resulting list. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_RSplit( - PyObject *s, /* String to split */ - PyObject *sep, /* String separator */ - Py_ssize_t maxsplit /* Maxsplit count */ - ); - -/* Translate a string by applying a character mapping table to it and - return the resulting Unicode object. - - The mapping table must map Unicode ordinal integers to Unicode - ordinal integers or None (causing deletion of the character). - - Mapping tables may be dictionaries or sequences. Unmapped character - ordinals (ones which cause a LookupError) are left untouched and - are copied as-is. - -*/ - -PyAPI_FUNC(PyObject *) PyUnicode_Translate( - PyObject *str, /* String */ - PyObject *table, /* Translate table */ - const char *errors /* error handling */ - ); - -/* Join a sequence of strings using the given separator and return - the resulting Unicode string. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Join( - PyObject *separator, /* Separator string */ - PyObject *seq /* Sequence object */ - ); - -/* Return 1 if substr matches str[start:end] at the given tail end, 0 - otherwise. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch( - PyObject *str, /* String */ - PyObject *substr, /* Prefix or Suffix string */ - Py_ssize_t start, /* Start index */ - Py_ssize_t end, /* Stop index */ - int direction /* Tail end: -1 prefix, +1 suffix */ - ); - -/* Return the first position of substr in str[start:end] using the - given search direction or -1 if not found. -2 is returned in case - an error occurred and an exception is set. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_Find( - PyObject *str, /* String */ - PyObject *substr, /* Substring to find */ - Py_ssize_t start, /* Start index */ - Py_ssize_t end, /* Stop index */ - int direction /* Find direction: +1 forward, -1 backward */ - ); - -/* Count the number of occurrences of substr in str[start:end]. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_Count( - PyObject *str, /* String */ - PyObject *substr, /* Substring to count */ - Py_ssize_t start, /* Start index */ - Py_ssize_t end /* Stop index */ - ); - -/* Replace at most maxcount occurrences of substr in str with replstr - and return the resulting Unicode object. */ - -PyAPI_FUNC(PyObject *) PyUnicode_Replace( - PyObject *str, /* String */ - PyObject *substr, /* Substring to find */ - PyObject *replstr, /* Substring to replace */ - Py_ssize_t maxcount /* Max. number of replacements to apply; - -1 = all */ - ); - -/* Compare two strings and return -1, 0, 1 for less than, equal, - greater than resp. */ - -PyAPI_FUNC(int) PyUnicode_Compare( - PyObject *left, /* Left string */ - PyObject *right /* Right string */ - ); - -/* Rich compare two strings and return one of the following: - - - NULL in case an exception was raised - - Py_True or Py_False for successfuly comparisons - - Py_NotImplemented in case the type combination is unknown - - Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in - case the conversion of the arguments to Unicode fails with a - UnicodeDecodeError. - - Possible values for op: - - Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE - -*/ - -PyAPI_FUNC(PyObject *) PyUnicode_RichCompare( - PyObject *left, /* Left string */ - PyObject *right, /* Right string */ - int op /* Operation: Py_EQ, Py_NE, Py_GT, etc. */ - ); - -/* Apply a argument tuple or dictionary to a format string and return - the resulting Unicode string. */ - -PyAPI_FUNC(PyObject *) PyUnicode_Format( - PyObject *format, /* Format string */ - PyObject *args /* Argument tuple or dictionary */ - ); - -/* Checks whether element is contained in container and return 1/0 - accordingly. - - element has to coerce to an one element Unicode string. -1 is - returned in case of an error. */ - -PyAPI_FUNC(int) PyUnicode_Contains( - PyObject *container, /* Container string */ - PyObject *element /* Element string */ - ); - -/* Externally visible for str.strip(unicode) */ -PyAPI_FUNC(PyObject *) _PyUnicode_XStrip( - PyUnicodeObject *self, - int striptype, - PyObject *sepobj - ); - -/* === Characters Type APIs =============================================== */ - -/* Helper array used by Py_UNICODE_ISSPACE(). */ - -PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[]; - -/* These should not be used directly. Use the Py_UNICODE_IS* and - Py_UNICODE_TO* macros instead. - - These APIs are implemented in Objects/unicodectype.c. - -*/ - -PyAPI_FUNC(int) _PyUnicode_IsLowercase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsUppercase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsTitlecase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsWhitespace( - const Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsLinebreak( - const Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToLowercase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToUppercase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToTitlecase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_ToDecimalDigit( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_ToDigit( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(double) _PyUnicode_ToNumeric( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsDecimalDigit( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsDigit( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsNumeric( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsAlpha( - Py_UNICODE ch /* Unicode character */ - ); - -#ifdef __cplusplus -} -#endif -#endif /* Py_USING_UNICODE */ -#endif /* !Py_UNICODEOBJECT_H */ diff --git a/python/include/warnings.h b/python/include/warnings.h deleted file mode 100644 index 0818d7a1..00000000 --- a/python/include/warnings.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef Py_WARNINGS_H -#define Py_WARNINGS_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(void) _PyWarnings_Init(void); - -PyAPI_FUNC(int) PyErr_WarnEx(PyObject *, const char *, Py_ssize_t); -PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *, const char *, int, - const char *, PyObject *); - -#define PyErr_WarnPy3k(msg, stacklevel) \ - (Py_Py3kWarningFlag ? PyErr_WarnEx(PyExc_DeprecationWarning, msg, stacklevel) : 0) - -/* DEPRECATED: Use PyErr_WarnEx() instead. */ -#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_WARNINGS_H */ - diff --git a/python/include/weakrefobject.h b/python/include/weakrefobject.h deleted file mode 100644 index f15c9d9c..00000000 --- a/python/include/weakrefobject.h +++ /dev/null @@ -1,75 +0,0 @@ -/* Weak references objects for Python. */ - -#ifndef Py_WEAKREFOBJECT_H -#define Py_WEAKREFOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -typedef struct _PyWeakReference PyWeakReference; - -/* PyWeakReference is the base struct for the Python ReferenceType, ProxyType, - * and CallableProxyType. - */ -struct _PyWeakReference { - PyObject_HEAD - - /* The object to which this is a weak reference, or Py_None if none. - * Note that this is a stealth reference: wr_object's refcount is - * not incremented to reflect this pointer. - */ - PyObject *wr_object; - - /* A callable to invoke when wr_object dies, or NULL if none. */ - PyObject *wr_callback; - - /* A cache for wr_object's hash code. As usual for hashes, this is -1 - * if the hash code isn't known yet. - */ - long hash; - - /* If wr_object is weakly referenced, wr_object has a doubly-linked NULL- - * terminated list of weak references to it. These are the list pointers. - * If wr_object goes away, wr_object is set to Py_None, and these pointers - * have no meaning then. - */ - PyWeakReference *wr_prev; - PyWeakReference *wr_next; -}; - -PyAPI_DATA(PyTypeObject) _PyWeakref_RefType; -PyAPI_DATA(PyTypeObject) _PyWeakref_ProxyType; -PyAPI_DATA(PyTypeObject) _PyWeakref_CallableProxyType; - -#define PyWeakref_CheckRef(op) PyObject_TypeCheck(op, &_PyWeakref_RefType) -#define PyWeakref_CheckRefExact(op) \ - (Py_TYPE(op) == &_PyWeakref_RefType) -#define PyWeakref_CheckProxy(op) \ - ((Py_TYPE(op) == &_PyWeakref_ProxyType) || \ - (Py_TYPE(op) == &_PyWeakref_CallableProxyType)) - -/* This macro calls PyWeakref_CheckRef() last since that can involve a - function call; this makes it more likely that the function call - will be avoided. */ -#define PyWeakref_Check(op) \ - (PyWeakref_CheckRef(op) || PyWeakref_CheckProxy(op)) - - -PyAPI_FUNC(PyObject *) PyWeakref_NewRef(PyObject *ob, - PyObject *callback); -PyAPI_FUNC(PyObject *) PyWeakref_NewProxy(PyObject *ob, - PyObject *callback); -PyAPI_FUNC(PyObject *) PyWeakref_GetObject(PyObject *ref); - -PyAPI_FUNC(Py_ssize_t) _PyWeakref_GetWeakrefCount(PyWeakReference *head); - -PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self); - -#define PyWeakref_GET_OBJECT(ref) (((PyWeakReference *)(ref))->wr_object) - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_WEAKREFOBJECT_H */ diff --git a/python/libs/_bsddb.lib b/python/libs/_bsddb.lib deleted file mode 100644 index 9f840ed9bdf28d0ae3c4e273067c601ab82d5dee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1888 zcmcIlPj3=I6#p%MTG)8NKS^VvaZQ@27X)@`OJc}YYa;0u2&LyOu+?&CAuT5D$%{wB z#jjxe3?6$n9z6H~ntq5Lt?$jwz)(TK;3P9|-kZ1c-tYaHefX?#)Y>naPp#3BwQVO; zu=81GRGyJ+b~Pt=yC#4|z_7+gZ4p}mcw?>@1Dv_MmbGGKM(ga<6Il!j1$lc z14zVxA~BZ>K%XXohk*#rr zBZ{w|-&agVO(+>?I@oKzeY3nBvVcpQ4~mi0Me2FF9W;84<(xXYLz{0j&!r$r)J5h@ z>a9pIZqVi@&2uFn>cTpU5WR_{keXq2FsMhko#F)Wbv#%hd2(y3-8$+VcV73b$F(Px zS1NCc(`yUc;t%-(s$Q{6(aM=##Lx(N(CQp?$<^e^M_gSgbNmGl_ALU1*ad{Q`${6P zv7M-rIIKeg40Q5C3CkbwA_w0NtVxbZ1XWu9rOM`2B{`=s=zq_Mh${IaJY)aHS4kj_ zhKp7uwvuv{d{T_0TqXY_`_ts~KKU^5kQ?ed!teUM&f1355R%`C1O%LCl;t TCqLfKU9w})%Xsa7q*?j}^C)V` diff --git a/python/libs/_ctypes.lib b/python/libs/_ctypes.lib deleted file mode 100644 index 7cc4d0fa78d967534be6584b96c85221e6433e39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1714 zcmcIlzfaph6#i_7A2AFOurMIG5)yO?3ATYq2suEdM3@AbFq<@?B?BaaAi>1K$X1E} zp!^SPSvz#-&_95Gf)(Dg@37O7k|27K@9ur~?(Ti>zPo%_t)A2l*YpLWyJSt%%H&Kt zYj)!qVP;KB^!9ZCLx6GvXdNK&01OxS^ZnxXPT8yYo1bAJebG8Nh3}X4 zT=#DWTndkHyi(XJZTXw|N}gskj#^Y5H`>pO#EpR&SP_E+QMgfnjs`rCQ5X&=L4k?{ z{WRMB4P0Iexi{A^OX=1{J)rg4X;?XVO#8a4X!vn^RURWgqr{7flCB?oKKnYm8=63# zI@i(=t%KBhx>2vTtFw!8Xo@;N>AM#Ir3Vf&9pSemV2o4ekv{3ixC5i3Qagbpn-~+P z#-!#jnHnLC*WU2(;owwA$_|}ABZm?R$ngwKA{P4)5c${;Qsny;FR}Y&Nu2$DNkg>nn%#ag+Ea*w fX4JCf{|f(q@a1$Bezm5Fol5Uk_d6dwhtQt@uX{o3 diff --git a/python/libs/_ctypes_test.lib b/python/libs/_ctypes_test.lib deleted file mode 100644 index 2307e980d1be892a660617779938b074e7e74925..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21680 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 diff --git a/python/libs/_elementtree.lib b/python/libs/_elementtree.lib deleted file mode 100644 index 4217b7eadfd1ebfb294017fd92508a246bbd708d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1878 zcmcIlPfrs;6#wnE0^M+Ekl=}AQH*-&zwII>h7?6(VQEPzHvF4duwul`n=NTs>BK9` zPFgqR3CSkyw4_P~fCqp+4TRT;JO?JOxVvt4b1Ppcx@+&Y-xji4#eBhay+g0=9r=FC z^WeI<9mna{!f8;gtyKK5liP6DR*S2&tyXW+a8&bydgzyo?bTA(t1!7Wtpn>soRfc7 z6T(es&=ICDM0VWOztKIoJreOA2Zv_urOIZ>2!<}!{9J_*SIJd59)bZo*^QQ?h4AC+ zS$<9frYLgMv{=>K{j|Th-DZLJL|iCF&KX4C#A?;DUtUb9rCB0=QvV|bA(}HtTuQwq zDaH&DVY*N0u{;Cwl9Gl;h%k$2uba>CFgi&Kd?+_oi=51C)+(*WabwRnpBG-3PByn8 zR(l45xY)=C(B0H05v7sfK~(QmWKE?}Z<5)OlP|cwR+sWVZfvIx<$VSamLDjI@RQ99 zDM^}jNPv!x-IcKXDG##o>A;HQc+&Ba#=E0-2o}dgPs+ACFNmY*0zKb_m2B%^^i;)C zcL<=zQc_0GH^s=A(ewXMF-n%_$&!CQcVkyxYI!*jyLRRMrW@Kh9~`?|D$iEoVq|jV x1zVu<(n`*HzZ4_q`;YM`aeYj;-!CpZur&G4##QTR{IWd}eohVe%kPaw@A#w2$P z>NzGd4@t=fGOPsgmm6z1&wPB28-pB_~&J>rSk&;Kcq#KH& z-r8+bxaouMxV#jHyoZV7Ga;ypfQq;&8ikKNS)%dSh7`E6@p~H9Px7FNPY2#=i6;{w zjrXgk;Z;k)&tLU$V3?{}eyHd;#+$39p_Y0>qFP+ha}yn cqW4CZqQn0u+@XQNuh$cWZ}i$bpUfES-<}&png9R* diff --git a/python/libs/_msi.lib b/python/libs/_msi.lib deleted file mode 100644 index ca2b30f6ffc4c8907352a646711e10e62c5f63bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1664 zcmb_dPfHt75dZCN8k42apq`3_6a?E#n(S`0f=IL$8e9{J@w~>wKYNG?8bL35@#w8r zPagaTo;{WxiueKiBn6#$d6UFSXaaf5&U^El**AaQ%-fF(mBZ@(qWvZLa%5cBOV7L6 zjPnvtYc}JEV9N&Z1~AS5>k5e61JNmdgCM`QUM!V^mG2whO8ND2u@nULqYyz**!2C^ zQk=86EiC`oEUX4AOXVd}59>`L2VtxId1p1W*KXJA2)TV`09O`pPs~(Qg#iO5BJ@~f zcUb@Xd)g;53OCg}tw|jJ%ewcq>%VVU_;qtpj8Y6SiiL)es_kqa?@e#CSzwVCm%`{d zhs1I!tW{c-X-7npwD?W$qXsA?$RT~F^=35;KI*^piXP)RB=1a`-yzN{Vths%)C?vP zV+8PKJXjn*8D9&lhmE7gZY%kz^f~G03#&@{4|z*Gf5;n9O{rCaC>0uEVuGw!8}%l+ z89(`nrzbJS`aIY#6B2C>P@e7!qT*sJmLMMM5P*(Owu>F(UJeZy4MajU!{(x*CVO4KDi)!_=t)p0G1p1C?kf9ivrCZ9mx3&fVn7__6D zxz`=_Ko;6(J9I~7B~4s`+)=%wr=vW!T$vAM&IBY PYC^>oL(dJauL#)B%X210 diff --git a/python/libs/_multiprocessing.lib b/python/libs/_multiprocessing.lib deleted file mode 100644 index 4fc7827582c28c715998cf0be7b89ae1d7201a24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1950 zcmcIl&2HL25dLha0#*;GjdF=nxlz9Qyz{^w0h375G5HXQ_y>fW&IjZPxqsg^Zkj*z_~nEdGbF@lKk3Kz0`yBNBxVt371Lo*U*c(kDokbd8@t9&pKQ8~ZoAjs@9VEB zi@IGbZHW1S;W25vkUv1D!jlrz6K%*AwjD*)Xtz2Pe*E+cZf@kpyp|ist3qa>0C)%v zrNzU`J4U1>%RXelA0O-1!uCb(MB}dmt3u;JMU(pbF?tMsN^*?Jri_&rp3ElIW7Cxv zEyoqGqd8NgSm!?@pJZF%Tko}pH+ILL JDfCXzegjG~g_-~W diff --git a/python/libs/_socket.lib b/python/libs/_socket.lib deleted file mode 100644 index f795f14707c53759adc9f6d4f16892fe395c96eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1920 zcmcIl&2G~`5dQ2WO_Oqn3>OYaMydo{LK53hO9(koB%-=W<)*#5sgu%xila72<-~;} zH=Y61SK!to7Y-bF0A8ZkGGp&1&L2%GSb2YDc6N8Z*>A^ppR|sH!>9R&`e-Q|hFP)= zt6Uk?mxNeelM{P+09in}0Ma^;*#(x);+oZHO7s2N=2pXN`s**YpL?~fX2bLSlQ4MG z>BINyJFYuvfDghVo^QU~sc-n})n=7ebdP$}yzTY}n~Vr!^WpyMPCy3@Y=mNA#P$$z zh9F-kfSv|+NjO^qG>QRzP@p1>OjJ|k?KQAZgLoAxj^#MS*)fcxU+leaM`5_?woTg* z_r8~Rl@z{z{n%I`{L6%wAs5@7{dcccw__2g(%_R6MDL*Rtk`Y0`mNQ9oVrDWA5?z} zMT&X{rE_8TNT_jx2A5Q&9qS$F=PLCYax7v+uz^9{!_5NU1@Fg&Epn&YW;ZwvPr`$~ ze&2hbyS4g8G&|PtVZ4wxAWBE00=0bUStL$@6NE=S@-=t*8JFZ=d>pUf!p^CXkR2d$ z_fTpgaJ(WVH747T0s|XssA0X%jVQc3U<-*m6&|(MBHT=(K{h053vj);stN1RUgyb-OdOvpe(c%&aG0R}X62Z|s*&H)UPd%gnj? zY_40M(PGw})!e2H;0a)y0M!syzX(3pkEzxe1hP|jIHt3fA8HLwDL1E*>0M0ESL3lO>6f77p zk)WSN{vU(q;i&IHtZysb{9I>j4`s!h>)`PX3qMc4mPZKF5Md)S()FzmN1vwF+9I$> z%r_DATtI3u9o4I?>Qqja#)$bv-=$X26`_F4nYMeS)fi!h{D~cl1vqCW&7(-Nh+)Yc zgL;n9)F3JOKqfXx9zR`)Y6p$O#>bZPqB8CH#nQ4`y)g`v%p3Ut%9-L)G*a?N7k5KZ z)Ec`@3O9ND9amT4koPcgd?o~S0ZvNPnKvrwjl+sZSoxr>nC~8#HR!ETH?t> zK;z@;sejdy%V)29*f&g7Ek9Ir9OK>9QddizAyzG}Xt`QWMbI->%m1l@UNSpDQT+A6 zvE!A}OPA$l@E8(X-ue5%k>O`|agUpONSO d)uK0}OVQ!~6Yfyo;MZ$h;TyW~&c`zb`w#4;LaqP+ diff --git a/python/libs/_ssl.lib b/python/libs/_ssl.lib deleted file mode 100644 index 176c166fd4cd3b507dc1159348034a8a3da0a438..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1664 zcmb_dOG^S#6#iz$OeILNRTLNm)y8yY>;Vz>f}}~qY(1Iw5Go}NYEzq*?b^0#(NAdI zx*(z-&@Tzey?m;kAd{zSMv_19&55*ek+-1|1%H46@s)|E)c3 z5gCOWDPI&+9RFqAo^AN=Xa-&$uG3zM!AG&s&?1Gs-Lr$Str`m~(Beiha!w$)6e$*R z)!dk=M1!<=ruRbvloBKmeUf_95(XdjC%sCK@dUz8I?es?GYcP|5eGGnP_UN(-i!x} z{pSN4#r$chQrfSECo+>^Cz)Co(qE*Hc>a(#pqdh^AW4z!SI50#?J=AOHXW diff --git a/python/libs/_testcapi.lib b/python/libs/_testcapi.lib deleted file mode 100644 index ae59b09416ba16e0c8dc257ad0b92b93e6dc5f9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1748 zcmcIlOHbQC5dLgaN-Q2x;aU+85^xE5*a!qdrhwE4lb{f|nlz8%10(_?!HG+c-1raa zkLZPCZyY#~J3l0yadwk9(2$^ZEbs2jj(6vq`F1_Co~Z0Jjopv03&Bet3} zCe*kgCysRh9{{BWXmuKff#EX0j+5Hk&t!AX_RhgpHnpG2WF5yVU3i6j)rI4v4{iIU z3vOCIO^@8y!}PARy_wsjZ`{)=HD|8Zazd9nFcPzkWQd^D6ripFVZu}%_Mt(6iXnP5 zir`(C`U$)jZke@c^}0v^->Qxoi;FrP>$aldckM@Jf^dxxJ`yEbEPcEDK6lVmfh`)` zN=5V*!e63pG4JK)5^`#a1`qT;3j?JI7Gn3pZ&{czP6LJZlYVTs5V=>WpF)ULjI}Dr zpyn|d{zz6{k%fIiSD*IW!g=MQQuZPX*~N&RO7Hr!UCk)z{2?y@Die>0h0IDC1@?he zsGL?Q-q6(@8V$K2f5XB7s*tcPzz_LET6}=KlO`<&`;Y-GAG2*?`z$v?cy(Y+Xxynd zqV}Dn>OmMi0J;yxBsxxkt*Aa@e)$1%n6ERY=ufqq4#p&Dxzn`{3j;#Q{B%L z#$PX=f%CS~zCGkgd!h}RrG7ncJx-b_Q^kbjlh!F6C(V#{_Is3y=>Ktk`^o7vZQX;8 egJ#uOm46-nyYMl!6~4o`bbO0-UHO6Kq5lDp)K3-w diff --git a/python/libs/_tkinter.lib b/python/libs/_tkinter.lib deleted file mode 100644 index 6d8865d5c3c442c37db57cd1ee1a23a5f0980190..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1732 zcmcIlPfrt35dZCNMYl?a7ghJ{x``*mFd2it>K z%DV6WZGkUh(lrR)uUD4CrG;RDwnY1F8V;gZY|t;=8HLwFL1E*_08T9+MR+zw6f77p zk)oeP{_lh5_NZ?_tZysZ{@i42w`Ikf@8R(c3qOy)R>uj`C}ATqvd!(SPrK7=T@hF$ z=9>t5E+Mm+jhgkiK3$NdNn(D{_ggFIicmuCMBB}3HO84Ce`3dC3C@X0^90f?VoY+! zpq^nO^N^H$AQPLU4>H-4mLDoQj`8|xX{x2(kf;_{v|KI6BIuc`<^NQ{AentaQT+44 zv6GcDNS77nK#0nNH`T=|i3%GYO;dz{nW)ASkb_R%`WO;r-gXT6wiztp&}mHiDqC z?)(2c@r}F#Uwv`CvK%bT*XJp^v(+Q9-RX;u)g&=udx$tikoPp;zyOX&85rnKV#2;30n~<7TB<>~kK8W4j0IP^a-BGOQvklbXSJ zHcdLO#f`n0{l_bv)=u|x_ha9BR(o#w<;t?~{v(Jt;zM45s6;)DEJ@-Q&EyX7THUQ4 zVa)9R#Knc$ilezPC><(Q4-hanl|>}Q;0$GPIfe`fV~Rry+n=zIjaLVXQsY6#63N7b zi6w@alo_@=8)1ennDIw|VrcQqXbaa+M3~_yD>LJlQsl_Yxc3vk%UM1p0M|Ymi7Qr8 zZ`g*Z?$Te{U~sVU6}#asg-l@j@m-3x$X#-ko#RfGBFB5H>|LrkNt?!!FKHzm^(a~V WAHWyU*Z5_6B(fSs_-3nnYhD8Cg&CRv diff --git a/python/libs/omf_python27.lib b/python/libs/omf_python27.lib deleted file mode 100644 index a239e707b981d84b19020d7722542ba0076efbbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103936 zcmd_TdzhtFbthZ|6E9dIA|fC+xyc|RAOVLkq^YiMEA)-7YFb2c=JYvlR~`G*ImNkj zS9yue7-FeI7~?p`5JU19$1%qE8OQi}8$%rQ^NM_i7{e&yjTkj(lsLxQthLwLd#~T# z`#sh9d-{2(D)w)^YpuQZ+H0?UdH4I>=_&i~=)+H(dO~B@+NSx1#!P>CrPHnc&H6=C zQ-63=TKxExwb4?)cgf|?YInQS@WhW_{R>l5BVl{^xT#~6-9AHJ(>9ps$R3PsombSwsYT$s@CYk>sLCaMG!b2UwHZ)&wlFgu~XB5 z|CT{jjn*%8jIk6rKHhU=`r895X8>P+r|{L zVN=H!ukUoaZ$Jj}P6c@>$2+WivDY=tVI>{4v9PvMHH^Iy2;`8x61XzF z*@?A1m}-7B==2sH|Em-J1}gD4aEt`fMGik{>WO5(Yx@0egM-nwesA%-^-G<_G5~lV zn>_W1(_H(TvJE3Nmv3(k)(H<}cs`{zCA9 z$p7@IQ_)_#t7d!epfjqZBKNFscSf5`1rnbIHA?u+2GOp=9Ilrys(x<+`Gp$S$QR02 zCGsUd&=%NQjdt}ry-_t7<@Svr)Hb$XB#49h;ipbLCE9mx7`^e<^{bs>YhaLZLa?ai z@Gh*1*i-Tmtq%?1H<)}RmI8OmMH}uHG{wMwI@E-puw%;M6Q@q#_FWrQn+AjC z+8p_g8&V#%ewAz9G78+ETzdYUqI}A~vB`z$-r}(({sFD!A1Llt{wGWwZ}q1vzSnAw zzOnvXr+o$4D&z5jUo(2é-z2Ai$gb2hh{=20eVz)QO-!54zIRuU+5d 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�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 a`mgZ+gDGjrg~IpaAqz>q1L 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 Z^(Wy!2G^yd@q6`I_|}8q+a9Q9^EdzPI3)l8 diff --git a/python/libs/unicodedata.lib b/python/libs/unicodedata.lib deleted file mode 100644 index d6e6f64a751d5974bbf5e930207755acbdb28528..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1782 zcmcIl%}(1u5dLiQ(^yE23gTADNRencgd~n5kN}xKi3pRR5H7u#H0H+#NCZKmr(Sa8 z)_17H3vff?*lQ0QcmVFa0n9kN#5go0h_2<`nQzCQ`DSMAiMh&g^#%8fpc2`!nmP`4~aiUGPbisFsjdJVs84no9}^&j5!Yt^z+v!ZT0x}#|L^SfCbC4L`>Ck-X(?S4Pq zPi(bRV3mY(sfg7^d@1R3;Sw3SHAcc;y6*%)>4J^awXn+x7;zFb@+a*Ww_#kXw2mXj zDn3R?O=2`YOgO)j2V2F?K5h8bOvy<~NQ ioOf-?elu&CBC!Vld-%XQ3V+eq5r5MsPB?q6I0 diff --git a/python/libs/winsound.lib b/python/libs/winsound.lib deleted file mode 100644 index efa8af838b879719d4d92fc30c50367828852c4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1732 zcmcIlPfrt35dZCNLAoKN5pPDbBqYkEw%x6QF{J!4v0-URSrTqb?W*j7wt*7y#KogG z?;QCMp17J24j%jfei58`eM7hWt)xz~^WMyx_hx=?W?rY>)OQ=(^Y#m;pYpEj<>uUC z-tE`tw3v5i^=!)qFaj7yfOSgK6fnBUUl^8G*Q&K3TzjUI-RwOT5!2){Hx1gMR6sQFuKR6gG|w;M4+AglBV9!GZx3 zDf(ID|2}x`j{0WA0yEqG5;3;Bvf|D4@c4#>pT}RT6NG7uun`&A=)?Q{Pt)sN5m=H zUp)=4S_;MdMGyOisjB6NijHHvzFH!+)MJTiaYf73ax8)#xmx~D6%3NuCltkv500Iz zltH?zFe|U%mMvZOn>=*$eEq%M(q%=tDy~NEvLq$C%o9D^{SrZs!@b`@?(`{n9$qba buXHIo{C~n7>KpueJy!U}F1_=~jKTg38>dN! diff --git a/python_var_doc.md b/python_var_doc.md new file mode 100644 index 00000000..2f24dcbb --- /dev/null +++ b/python_var_doc.md @@ -0,0 +1,17 @@ +| nazwa | typ |opis | +|------------------------|-------|------------------------------------------------------------| +| direction | int | kiernek jazdy (-1: do tyu, 0: aden, 1: do przodu) | +| slipping_wheels | bool | polizg | +| converter | bool | dziaanie przetwornicy | +| main_ctrl_actual_pos | int | numer pozycji nastawnika (wskanik RList) | +| scnd_ctrl_actual_pos | int | numer pozycji bocznika (wskanik MotorParam) | +| fuse | bool | wycznik szybki (bezpiecznik nadmiarowy) | +| converter_overload | bool | wycznik nadmiarowy przetwornicy i ogrzewania | +| voltage | float | napicie w sieci | +| velocity | float | aktualna prdko | +| im | float | prd silnika | +| compress | bool | dziaanie sprarki | +| hours | int | aktualny czas | +| minutes | int | aktualny czas | +| seconds | int | aktualny czas | +| velocity_desired | float | prdkos zadana | diff --git a/stdafx.h b/stdafx.h index 8c369415..9ca277e9 100644 --- a/stdafx.h +++ b/stdafx.h @@ -23,7 +23,6 @@ #include #include #undef NOMINMAX -#include // stl #include #include @@ -58,8 +57,8 @@ #include #include -#include "opengl/glew.h" -#include "opengl/wglew.h" +#include "GL/glew.h" +#include "GL/wglew.h" //m7todo: jest tu bo nie chciao mi si wpycha do wszystkich plikw #include \ No newline at end of file diff --git a/windows.cpp b/windows.cpp new file mode 100644 index 00000000..3a24c7e7 --- /dev/null +++ b/windows.cpp @@ -0,0 +1,46 @@ +#include "stdafx.h" + +#pragma warning (disable: 4091) +#include + +LONG CALLBACK unhandled_handler(::EXCEPTION_POINTERS* e) +{ + auto hDbgHelp = ::LoadLibraryA("dbghelp"); + if (hDbgHelp == nullptr) + return EXCEPTION_CONTINUE_SEARCH; + auto pMiniDumpWriteDump = (decltype(&MiniDumpWriteDump))::GetProcAddress(hDbgHelp, "MiniDumpWriteDump"); + if (pMiniDumpWriteDump == nullptr) + return EXCEPTION_CONTINUE_SEARCH; + + char name[MAX_PATH]; + { + auto nameEnd = name + ::GetModuleFileNameA(::GetModuleHandleA(0), name, MAX_PATH); + ::SYSTEMTIME t; + ::GetSystemTime(&t); + wsprintfA(nameEnd - strlen(".exe"), + "_crashdump_%4d%02d%02d_%02d%02d%02d.dmp", + t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond); + } + + auto hFile = ::CreateFileA(name, GENERIC_WRITE, FILE_SHARE_READ, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hFile == INVALID_HANDLE_VALUE) + return EXCEPTION_CONTINUE_SEARCH; + + ::MINIDUMP_EXCEPTION_INFORMATION exceptionInfo; + exceptionInfo.ThreadId = ::GetCurrentThreadId(); + exceptionInfo.ExceptionPointers = e; + exceptionInfo.ClientPointers = FALSE; + + auto dumped = pMiniDumpWriteDump( + ::GetCurrentProcess(), + ::GetCurrentProcessId(), + hFile, + ::MINIDUMP_TYPE(::MiniDumpWithIndirectlyReferencedMemory | ::MiniDumpScanMemory), + e ? &exceptionInfo : nullptr, + nullptr, + nullptr); + + ::CloseHandle(hFile); + + return EXCEPTION_CONTINUE_SEARCH; +} \ No newline at end of file From 20f95c5f3b1f857044e17ca00b50d43e1f7aeaf4 Mon Sep 17 00:00:00 2001 From: VB Date: Tue, 14 Feb 2017 19:47:58 +0100 Subject: [PATCH 009/426] fix --- Ground.cpp | 2 +- Texture.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index d0e6efcc..05d0c7b6f 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -938,7 +938,7 @@ void TSubRect::Sort() */ //... // przeglądanie listy i tworzenie obiektów renderujących dla danej tekstury - GLuint t = 0; // pomocniczy kod tekstury + int t = 0; // pomocniczy kod tekstury n1 = nMeshed; // lista obiektów przetwarzanych na statyczne siatki while (n1) { // dla każdej tekstury powinny istnieć co najmniej dwa obiekty, ale dla DL nie ma to znaczenia diff --git a/Texture.h b/Texture.h index fd0a2fe9..6d0e5b32 100644 --- a/Texture.h +++ b/Texture.h @@ -25,7 +25,7 @@ struct opengl_texture { void load(); void create(); // members - GLuint id{ -1 }; // associated GL resource + GLuint id{ (GLuint)-1 }; // associated GL resource bool has_alpha{ false }; // indicates the texture has alpha channel bool is_ready{ false }; // indicates the texture was processed and is ready for use std::string traits; // requested texture attributes: wrapping modes etc From 7c98a177da8ff3b0b797cfa3cf7aaaad54ebfd78 Mon Sep 17 00:00:00 2001 From: VB Date: Tue, 14 Feb 2017 21:17:22 +0100 Subject: [PATCH 010/426] =?UTF-8?q?co=C5=9B=20by=C5=82o=20=C5=BAle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model3d.cpp | 4084 +++++++++++++++++++++++++-------------------------- Model3d.h | 741 +++++----- 2 files changed, 2405 insertions(+), 2420 deletions(-) diff --git a/Model3d.cpp b/Model3d.cpp index 333c3f27..519a235b 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -7,8 +7,8 @@ obtain one at http://mozilla.org/MPL/2.0/. */ /* - MaSzyna EU07 locomotive simulator - Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others +MaSzyna EU07 locomotive simulator +Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others */ @@ -27,7 +27,7 @@ http://mozilla.org/MPL/2.0/. using namespace Mtable; double TSubModel::fSquareDist = 0; -size_t TSubModel::iInstance; // numer renderowanego egzemplarza obiektu +int TSubModel::iInstance; // numer renderowanego egzemplarza obiektu texture_manager::size_type *TSubModel::ReplacableSkinId = NULL; int TSubModel::iAlpha = 0x30300030; // maska do testowania flag tekstur wymiennych TModel3d *TSubModel::pRoot; // Ra: tymczasowo wskaźnik na model widoczny z submodelu @@ -49,2108 +49,2096 @@ TSubModelInfo *TSubModelInfo::pTable = NULL; // tabele obiektów pomocniczych char *TStringPack::String(int n) { // zwraca wskaźnik do łańcucha o podanym numerze - if (index ? n < (index[1] >> 2) - 2 : false) - return data + 8 + index[n + 2]; // indeks upraszcza kwestię wyszukiwania - // jak nie ma indeksu, to trzeba szukać - int max = *((int *)(data + 4)); // długość obszaru łańcuchów - char *ptr = data + 8; // począek obszaru łańcuchów - for (int i = 0; i < n; ++i) - { // wyszukiwanie łańcuchów nie jest zbyt optymalne, ale nie musi być - while (*ptr) - ++ptr; // wyszukiwanie zera - ++ptr; // pominięcie zera - if (ptr > data + max) - return NULL; // zbyt wysoki numer - } - return ptr; + if (index ? n < (index[1] >> 2) - 2 : false) + return data + 8 + index[n + 2]; // indeks upraszcza kwestię wyszukiwania + // jak nie ma indeksu, to trzeba szukać + int max = *((int *)(data + 4)); // długość obszaru łańcuchów + char *ptr = data + 8; // począek obszaru łańcuchów + for (int i = 0; i < n; ++i) + { // wyszukiwanie łańcuchów nie jest zbyt optymalne, ale nie musi być + while (*ptr) + ++ptr; // wyszukiwanie zera + ++ptr; // pominięcie zera + if (ptr > data + max) + return NULL; // zbyt wysoki numer + } + return ptr; }; TSubModel::TSubModel() { - ZeroMemory(this, sizeof(TSubModel)); // istotne przy zapisywaniu wersji binarnej - FirstInit(); + ZeroMemory(this, sizeof(TSubModel)); // istotne przy zapisywaniu wersji binarnej + FirstInit(); }; void TSubModel::FirstInit() { - eType = TP_ROTATOR; - Vertices = NULL; - uiDisplayList = 0; - iNumVerts = -1; // do sprawdzenia - iVboPtr = -1; - fLight = -1.0; //świetcenie wyłączone - v_RotateAxis = float3(0, 0, 0); - v_TransVector = float3(0, 0, 0); - f_Angle = 0; - b_Anim = at_None; - b_aAnim = at_None; - fVisible = 0.0; // zawsze widoczne - iVisible = 1; - fMatrix = NULL; // to samo co iMatrix=0; - Next = NULL; - Child = NULL; - TextureID = 0; - // TexAlpha=false; - iFlags = 0x0200; // bit 9=1: submodel został utworzony a nie ustawiony na - // wczytany plik - // TexHash=false; - // Hits=NULL; - // CollisionPts=NULL; - // CollisionPtsCount=0; - Opacity = 1.0; // przy wczytywaniu modeli było dzielone przez 100... - bWire = false; - fWireSize = 0; - fNearAttenStart = 40; - fNearAttenEnd = 80; - bUseNearAtten = false; - iFarAttenDecay = 0; - fFarDecayRadius = 100; - fCosFalloffAngle = 0.5; // 120°? - fCosHotspotAngle = 0.3f; // 145°? - fCosViewAngle = 0; - fSquareMaxDist = 10000 * 10000; // 10km - fSquareMinDist = 0; - iName = -1; // brak nazwy - iTexture = 0; // brak tekstury - // asName=""; - // asTexture=""; - pName = pTexture = NULL; - f4Ambient[0] = f4Ambient[1] = f4Ambient[2] = f4Ambient[3] = 1.0; //{1,1,1,1}; - f4Diffuse[0] = f4Diffuse[1] = f4Diffuse[2] = f4Diffuse[3] = 1.0; //{1,1,1,1}; - f4Specular[0] = f4Specular[1] = f4Specular[2] = 0.0; - f4Specular[3] = 1.0; //{0,0,0,1}; - f4Emision[0] = f4Emision[1] = f4Emision[2] = f4Emision[3] = 1.0; - smLetter = NULL; // używany tylko roboczo dla TP_TEXT, do przyspieszenia wyświetlania + eType = TP_ROTATOR; + Vertices = NULL; + uiDisplayList = 0; + iNumVerts = -1; // do sprawdzenia + iVboPtr = -1; + fLight = -1.0; //świetcenie wyłączone + v_RotateAxis = float3(0, 0, 0); + v_TransVector = float3(0, 0, 0); + f_Angle = 0; + b_Anim = at_None; + b_aAnim = at_None; + fVisible = 0.0; // zawsze widoczne + iVisible = 1; + fMatrix = NULL; // to samo co iMatrix=0; + Next = NULL; + Child = NULL; + TextureID = 0; + // TexAlpha=false; + iFlags = 0x0200; // bit 9=1: submodel został utworzony a nie ustawiony na + // wczytany plik + // TexHash=false; + // Hits=NULL; + // CollisionPts=NULL; + // CollisionPtsCount=0; + Opacity = 1.0; // przy wczytywaniu modeli było dzielone przez 100... + bWire = false; + fWireSize = 0; + fNearAttenStart = 40; + fNearAttenEnd = 80; + bUseNearAtten = false; + iFarAttenDecay = 0; + fFarDecayRadius = 100.0f; + fCosFalloffAngle = 0.5f; // 120°? + fCosHotspotAngle = 0.3f; // 145°? + fCosViewAngle = 0; + fSquareMaxDist = 10000 * 10000; // 10km + fSquareMinDist = 0; + iName = -1; // brak nazwy + iTexture = 0; // brak tekstury + // asName=""; + // asTexture=""; + pName = pTexture = NULL; + f4Ambient[0] = f4Ambient[1] = f4Ambient[2] = f4Ambient[3] = 1.0; //{1,1,1,1}; + f4Diffuse[0] = f4Diffuse[1] = f4Diffuse[2] = f4Diffuse[3] = 1.0; //{1,1,1,1}; + f4Specular[0] = f4Specular[1] = f4Specular[2] = 0.0; + f4Specular[3] = 1.0; //{0,0,0,1}; + f4Emision[0] = f4Emision[1] = f4Emision[2] = f4Emision[3] = 1.0; + smLetter = NULL; // używany tylko roboczo dla TP_TEXT, do przyspieszenia wyświetlania }; TSubModel::~TSubModel() { - if (uiDisplayList) - glDeleteLists(uiDisplayList, 1); - if (iFlags & 0x0200) - { // wczytany z pliku tekstowego musi sam posprzątać - // SafeDeleteArray(Indices); - SafeDelete(Next); - SafeDelete(Child); - delete fMatrix; // własny transform trzeba usunąć (zawsze jeden) - delete[] Vertices; - delete[] pTexture; - delete[] pName; - } - /* - else - {//wczytano z pliku binarnego (nie jest właścicielem tablic) - } - */ - delete[] smLetter; // używany tylko roboczo dla TP_TEXT, do przyspieszenia - // wyświetlania + if (uiDisplayList) + glDeleteLists(uiDisplayList, 1); + if (iFlags & 0x0200) + { // wczytany z pliku tekstowego musi sam posprzątać + // SafeDeleteArray(Indices); + SafeDelete(Next); + SafeDelete(Child); + delete fMatrix; // własny transform trzeba usunąć (zawsze jeden) + delete[] Vertices; + delete[] pTexture; + delete[] pName; + } + /* + else + {//wczytano z pliku binarnego (nie jest właścicielem tablic) + } + */ + delete[] smLetter; // używany tylko roboczo dla TP_TEXT, do przyspieszenia + // wyświetlania }; void TSubModel::TextureNameSet(const char *n) { // ustawienie nazwy submodelu, o - // ile nie jest wczytany z E3D - if (iFlags & 0x0200) - { // tylko jeżeli submodel zosta utworzony przez new - delete[] pTexture; // usunięcie poprzedniej - size_t i = strlen(n); - if (i) - { // utworzenie nowej - pTexture = new char[i + 1]; - strcpy(pTexture, n); - } - else - pTexture = NULL; - } + // ile nie jest wczytany z E3D + if (iFlags & 0x0200) + { // tylko jeżeli submodel zosta utworzony przez new + delete[] pTexture; // usunięcie poprzedniej + int i = strlen(n); + if (i) + { // utworzenie nowej + pTexture = new char[i + 1]; + strcpy(pTexture, n); + } + else + pTexture = NULL; + } }; void TSubModel::NameSet(const char *n) { // ustawienie nazwy submodelu, o ile - // nie jest wczytany z E3D - if (iFlags & 0x0200) - { // tylko jeżeli submodel zosta utworzony przez new - delete[] pName; // usunięcie poprzedniej - size_t i = strlen(n); - if (i) - { // utworzenie nowej - pName = new char[i + 1]; - strcpy(pName, n); - } - else - pName = NULL; - } + // nie jest wczytany z E3D + if (iFlags & 0x0200) + { // tylko jeżeli submodel zosta utworzony przez new + delete[] pName; // usunięcie poprzedniej + int i = strlen(n); + if (i) + { // utworzenie nowej + pName = new char[i + 1]; + strcpy(pName, n); + } + else + pName = NULL; + } }; // int TSubModel::SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 // *pt,GLVERTEX // *Vertices) int TSubModel::SeekFaceNormal(unsigned int *Masks, int f, unsigned int dwMask, float3 *pt, - float8 *Vertices) + float8 *Vertices) { // szukanie punktu stycznego - // do (pt), zwraca numer - // wierzchołka, a nie trójkąta - int iNumFaces = iNumVerts / 3; // bo maska powierzchni jest jedna na trójkąt - // GLVERTEX *p; //roboczy wskaźnik - float8 *p; // roboczy wskaźnik - for (int i = f; i < iNumFaces; ++i) // pętla po trójkątach, od trójkąta (f) - if (Masks[i] & dwMask) // jeśli wspólna maska powierzchni - { - p = Vertices + 3 * i; - if (p->Point == *pt) - return 3 * i; - if ((++p)->Point == *pt) - return 3 * i + 1; - if ((++p)->Point == *pt) - return 3 * i + 2; - } - return -1; // nie znaleziono stycznego wierzchołka + // do (pt), zwraca numer + // wierzchołka, a nie trójkąta + int iNumFaces = iNumVerts / 3; // bo maska powierzchni jest jedna na trójkąt + // GLVERTEX *p; //roboczy wskaźnik + float8 *p; // roboczy wskaźnik + for (int i = f; i < iNumFaces; ++i) // pętla po trójkątach, od trójkąta (f) + if (Masks[i] & dwMask) // jeśli wspólna maska powierzchni + { + p = Vertices + 3 * i; + if (p->Point == *pt) + return 3 * i; + if ((++p)->Point == *pt) + return 3 * i + 1; + if ((++p)->Point == *pt) + return 3 * i + 2; + } + return -1; // nie znaleziono stycznego wierzchołka } -float emm1[] = {1, 1, 1, 0}; -float emm2[] = {0, 0, 0, 1}; +float emm1[] = { 1, 1, 1, 0 }; +float emm2[] = { 0, 0, 0, 1 }; inline double readIntAsDouble(cParser &parser, int base = 255) { - int value = parser.getToken(false); - return (static_cast(value) / base); + int value = parser.getToken(false); + return (static_cast(value) / base); }; template inline void readColor(cParser &parser, ColorT *color) { - double discard; - parser.getTokens(4, false); - parser >> discard >> color[0] >> color[1] >> color[2]; + double discard; + parser.getTokens(4, false); + parser >> discard >> color[0] >> color[1] >> color[2]; }; inline void readColor(cParser &parser, int &color) { - int r, g, b, discard; - parser.getTokens(4, false); - parser >> discard >> r >> g >> b; - color = r + (g << 8) + (b << 16); + int r, g, b, discard; + parser.getTokens(4, false); + parser >> discard >> r >> g >> b; + color = r + (g << 8) + (b << 16); }; /* inline void readMatrix(cParser& parser,matrix4x4& matrix) {//Ra: wczytanie transforma - for (int x=0;x<=3;x++) //wiersze - for (int y=0;y<=3;y++) //kolumny - parser.getToken(matrix(x)[y]); +for (int x=0;x<=3;x++) //wiersze +for (int y=0;y<=3;y++) //kolumny +parser.getToken(matrix(x)[y]); }; */ inline void readMatrix(cParser &parser, float4x4 &matrix) { // Ra: wczytanie transforma - parser.getTokens(16, false); - for (int x = 0; x <= 3; ++x) // wiersze - for (int y = 0; y <= 3; ++y) // kolumny - parser >> matrix(x)[y]; + parser.getTokens(16, false); + for (int x = 0; x <= 3; ++x) // wiersze + for (int y = 0; y <= 3; ++y) // kolumny + parser >> matrix(x)[y]; }; int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) { // Ra: VBO tworzone na poziomie modelu, a nie submodeli - iNumVerts = 0; - iVboPtr = Pos; // pozycja w VBO - // TMaterialColorf Ambient,Diffuse,Specular; - // GLuint TextureID; - // char *extName; - if (!parser.expectToken("type:")) - Error("Model type parse failure!"); - { - std::string type = parser.getToken(); - if (type == "mesh") - eType = GL_TRIANGLES; // submodel - trójkaty - else if (type == "point") - eType = GL_POINTS; // co to niby jest? - else if (type == "freespotlight") - eType = TP_FREESPOTLIGHT; //światełko - else if (type == "text") - eType = TP_TEXT; // wyświetlacz tekstowy (generator napisów) - else if (type == "stars") - eType = TP_STARS; // wiele punktów świetlnych - }; - parser.ignoreToken(); - std::string token; - // parser.getToken(token1); //ze zmianą na małe! - parser.getTokens(1, false); // nazwa submodelu bez zmieny na małe - parser >> token; - NameSet(token.c_str()); - if (dynamic) - { // dla pojazdu, blokujemy załączone submodele, które mogą być - // nieobsługiwane - if (token.find("_on") + 3 == token.length()) // jeśli nazwa kończy się na "_on" - iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z obiektem "_off" - } - else // dla pozostałych modeli blokujemy zapalone światła, które mogą być - // nieobsługiwane - if (token.compare(0, 8, "Light_On") == 0) // jeśli nazwa zaczyna się od "Light_On" - iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z obiektem - // "Light_Off" + iNumVerts = 0; + iVboPtr = Pos; // pozycja w VBO + // TMaterialColorf Ambient,Diffuse,Specular; + // GLuint TextureID; + // char *extName; + if (!parser.expectToken("type:")) + Error("Model type parse failure!"); + { + std::string type = parser.getToken(); + if (type == "mesh") + eType = GL_TRIANGLES; // submodel - trójkaty + else if (type == "point") + eType = GL_POINTS; // co to niby jest? + else if (type == "freespotlight") + eType = TP_FREESPOTLIGHT; //światełko + else if (type == "text") + eType = TP_TEXT; // wyświetlacz tekstowy (generator napisów) + else if (type == "stars") + eType = TP_STARS; // wiele punktów świetlnych + }; + parser.ignoreToken(); + std::string token; + // parser.getToken(token1); //ze zmianą na małe! + parser.getTokens(1, false); // nazwa submodelu bez zmieny na małe + parser >> token; + NameSet(token.c_str()); + if (dynamic) + { // dla pojazdu, blokujemy załączone submodele, które mogą być + // nieobsługiwane + if (token.find("_on") + 3 == token.length()) // jeśli nazwa kończy się na "_on" + iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z obiektem "_off" + } + else // dla pozostałych modeli blokujemy zapalone światła, które mogą być + // nieobsługiwane + if (token.compare(0, 8, "Light_On") == 0) // jeśli nazwa zaczyna się od "Light_On" + iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z obiektem + // "Light_Off" - if (parser.expectToken("anim:")) // Ra: ta informacja by się przydała! - { // rodzaj animacji - std::string type = parser.getToken(); - if (type != "false") - { - iFlags |= 0x4000; // jak animacja, to trzeba przechowywać macierz zawsze - if (type == "seconds_jump") - b_Anim = b_aAnim = at_SecondsJump; // sekundy z przeskokiem - else if (type == "minutes_jump") - b_Anim = b_aAnim = at_MinutesJump; // minuty z przeskokiem - else if (type == "hours_jump") - b_Anim = b_aAnim = at_HoursJump; // godziny z przeskokiem - else if (type == "hours24_jump") - b_Anim = b_aAnim = at_Hours24Jump; // godziny z przeskokiem - else if (type == "seconds") - b_Anim = b_aAnim = at_Seconds; // minuty płynnie - else if (type == "minutes") - b_Anim = b_aAnim = at_Minutes; // minuty płynnie - else if (type == "hours") - b_Anim = b_aAnim = at_Hours; // godziny płynnie - else if (type == "hours24") - b_Anim = b_aAnim = at_Hours24; // godziny płynnie - else if (type == "billboard") - b_Anim = b_aAnim = at_Billboard; // obrót w pionie do kamery - else if (type == "wind") - b_Anim = b_aAnim = at_Wind; // ruch pod wpływem wiatru - else if (type == "sky") - b_Anim = b_aAnim = at_Sky; // aniamacja nieba - else if (type == "ik") - b_Anim = b_aAnim = at_IK; // IK: zadający - else if (type == "ik11") - b_Anim = b_aAnim = at_IK11; // IK: kierunkowany - else if (type == "ik21") - b_Anim = b_aAnim = at_IK21; // IK: kierunkowany - else if (type == "ik22") - b_Anim = b_aAnim = at_IK22; // IK: kierunkowany - else if (type == "digital") - b_Anim = b_aAnim = at_Digital; // licznik mechaniczny - else if (type == "digiclk") - b_Anim = b_aAnim = at_DigiClk; // zegar cyfrowy - else - b_Anim = b_aAnim = at_Undefined; // nieznana forma animacji - } - } - if (eType < TP_ROTATOR) - readColor(parser, f4Ambient); // ignoruje token przed - readColor(parser, f4Diffuse); - if (eType < TP_ROTATOR) - readColor(parser, f4Specular); - parser.ignoreTokens(1); // zignorowanie nazwy "SelfIllum:" - { - std::string light = parser.getToken(); - if (light == "true") - fLight = 2.0; // zawsze świeci - else if (light == "false") - fLight = -1.0; // zawsze ciemy - else - fLight = std::stod(light); - }; - if (eType == TP_FREESPOTLIGHT) - { - if (!parser.expectToken("nearattenstart:")) - { - Error("Model light parse failure!"); - } - std::string discard; - parser.getTokens(13, false); - parser >> fNearAttenStart >> discard >> fNearAttenEnd >> discard >> bUseNearAtten >> - discard >> iFarAttenDecay >> discard >> fFarDecayRadius >> discard >> - fCosFalloffAngle // kąt liczony dla średnicy, a nie promienia - >> discard >> fCosHotspotAngle; // kąt liczony dla średnicy, a nie promienia - fCosFalloffAngle = cos(DegToRad(0.5 * fCosFalloffAngle)); - fCosHotspotAngle = cos(DegToRad(0.5 * fCosHotspotAngle)); - iNumVerts = 1; - iFlags |= 0x4010; // rysowane w cyklu nieprzezroczystych, macierz musi - // zostać bez zmiany - } - else if (eType < TP_ROTATOR) - { - std::string discard; - parser.getTokens(5, false); - parser >> discard >> bWire >> discard >> fWireSize >> discard; - Opacity = readIntAsDouble(parser, - 100.0f); // wymagane jest 0 dla szyb, 100 idzie w nieprzezroczyste - if (Opacity > 1.0f) - Opacity *= 0.01f; // w 2013 był błąd i aby go obejść, trzeba było wpisać 10000.0 - if ((Global::iConvertModels & 1) == 0) // dla zgodności wstecz - Opacity = 0.0; // wszystko idzie w przezroczyste albo zależnie od tekstury - if (!parser.expectToken("map:")) - Error("Model map parse failure!"); - std::string texture = parser.getToken(); - if (texture == "none") - { // rysowanie podanym kolorem - TextureID = 0; - iFlags |= 0x10; // rysowane w cyklu nieprzezroczystych - } - else if (texture.find("replacableskin") != texture.npos) - { // McZapkie-060702: zmienialne skory modelu - TextureID = -1; - iFlags |= (Opacity < 1.0) ? 1 : 0x10; // zmienna tekstura 1 - } - else if (texture == "-1") - { - TextureID = -1; - iFlags |= (Opacity < 1.0) ? 1 : 0x10; // zmienna tekstura 1 - } - else if (texture == "-2") - { - TextureID = -2; - iFlags |= (Opacity < 1.0) ? 2 : 0x10; // zmienna tekstura 2 - } - else if (texture == "-3") - { - TextureID = -3; - iFlags |= (Opacity < 1.0) ? 4 : 0x10; // zmienna tekstura 3 - } - else if (texture == "-4") - { - TextureID = -4; - iFlags |= (Opacity < 1.0) ? 8 : 0x10; // zmienna tekstura 4 - } - else - { // jeśli tylko nazwa pliku, to dawać bieżącą ścieżkę do tekstur - // asTexture=AnsiString(texture.c_str()); //zapamiętanie nazwy tekstury - TextureNameSet(texture.c_str()); - if (texture.find_first_of("/\\") == texture.npos) - texture.insert(0, Global::asCurrentTexturePath.c_str()); - TextureID = TextureManager.GetTextureId( texture, szTexturePath ); - // TexAlpha=TTexturesManager::GetAlpha(TextureID); - // iFlags|=TexAlpha?0x20:0x10; //0x10-nieprzezroczysta, 0x20-przezroczysta - if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity - // 0! - iFlags |= TextureManager.Texture(TextureID).has_alpha ? - 0x20 : - 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta - else - iFlags |= 0x10; // normalnie nieprzezroczyste - // renderowanie w cyklu przezroczystych tylko jeśli: - // 1. Opacity=0 (przejściowo <1, czy tam <100) oraz - // 2. tekstura ma przezroczystość - }; - } - else - iFlags |= 0x10; + if (parser.expectToken("anim:")) // Ra: ta informacja by się przydała! + { // rodzaj animacji + std::string type = parser.getToken(); + if (type != "false") + { + iFlags |= 0x4000; // jak animacja, to trzeba przechowywać macierz zawsze + if (type == "seconds_jump") + b_Anim = b_aAnim = at_SecondsJump; // sekundy z przeskokiem + else if (type == "minutes_jump") + b_Anim = b_aAnim = at_MinutesJump; // minuty z przeskokiem + else if (type == "hours_jump") + b_Anim = b_aAnim = at_HoursJump; // godziny z przeskokiem + else if (type == "hours24_jump") + b_Anim = b_aAnim = at_Hours24Jump; // godziny z przeskokiem + else if (type == "seconds") + b_Anim = b_aAnim = at_Seconds; // minuty płynnie + else if (type == "minutes") + b_Anim = b_aAnim = at_Minutes; // minuty płynnie + else if (type == "hours") + b_Anim = b_aAnim = at_Hours; // godziny płynnie + else if (type == "hours24") + b_Anim = b_aAnim = at_Hours24; // godziny płynnie + else if (type == "billboard") + b_Anim = b_aAnim = at_Billboard; // obrót w pionie do kamery + else if (type == "wind") + b_Anim = b_aAnim = at_Wind; // ruch pod wpływem wiatru + else if (type == "sky") + b_Anim = b_aAnim = at_Sky; // aniamacja nieba + else if (type == "ik") + b_Anim = b_aAnim = at_IK; // IK: zadający + else if (type == "ik11") + b_Anim = b_aAnim = at_IK11; // IK: kierunkowany + else if (type == "ik21") + b_Anim = b_aAnim = at_IK21; // IK: kierunkowany + else if (type == "ik22") + b_Anim = b_aAnim = at_IK22; // IK: kierunkowany + else if (type == "digital") + b_Anim = b_aAnim = at_Digital; // licznik mechaniczny + else if (type == "digiclk") + b_Anim = b_aAnim = at_DigiClk; // zegar cyfrowy + else + b_Anim = b_aAnim = at_Undefined; // nieznana forma animacji + } + } + if (eType < TP_ROTATOR) + readColor(parser, f4Ambient); // ignoruje token przed + readColor(parser, f4Diffuse); + if (eType < TP_ROTATOR) + readColor(parser, f4Specular); + parser.ignoreTokens(1); // zignorowanie nazwy "SelfIllum:" + { + std::string light = parser.getToken(); + if (light == "true") + fLight = 2.0; // zawsze świeci + else if (light == "false") + fLight = -1.0; // zawsze ciemy + else + fLight = std::stod(light); + }; + if (eType == TP_FREESPOTLIGHT) + { + if (!parser.expectToken("nearattenstart:")) + { + Error("Model light parse failure!"); + } + std::string discard; + parser.getTokens(13, false); + parser >> fNearAttenStart >> discard >> fNearAttenEnd >> discard >> bUseNearAtten >> + discard >> iFarAttenDecay >> discard >> fFarDecayRadius >> discard >> + fCosFalloffAngle // kąt liczony dla średnicy, a nie promienia + >> discard >> fCosHotspotAngle; // kąt liczony dla średnicy, a nie promienia + fCosFalloffAngle = cos(DegToRad(0.5 * fCosFalloffAngle)); + fCosHotspotAngle = cos(DegToRad(0.5 * fCosHotspotAngle)); + iNumVerts = 1; + iFlags |= 0x4010; // rysowane w cyklu nieprzezroczystych, macierz musi + // zostać bez zmiany + } + else if (eType < TP_ROTATOR) + { + std::string discard; + parser.getTokens(5, false); + parser >> discard >> bWire >> discard >> fWireSize >> discard; + Opacity = readIntAsDouble(parser, + 100.0f); // wymagane jest 0 dla szyb, 100 idzie w nieprzezroczyste + if (Opacity > 1.0) + Opacity *= 0.01; // w 2013 był błąd i aby go obejść, trzeba było wpisać 10000.0 + if ((Global::iConvertModels & 1) == 0) // dla zgodności wstecz + Opacity = 0.0; // wszystko idzie w przezroczyste albo zależnie od tekstury + if (!parser.expectToken("map:")) + Error("Model map parse failure!"); + std::string texture = parser.getToken(); + if (texture == "none") + { // rysowanie podanym kolorem + TextureID = 0; + iFlags |= 0x10; // rysowane w cyklu nieprzezroczystych + } + else if (texture.find("replacableskin") != texture.npos) + { // McZapkie-060702: zmienialne skory modelu + TextureID = -1; + iFlags |= (Opacity < 1.0) ? 1 : 0x10; // zmienna tekstura 1 + } + else if (texture == "-1") + { + TextureID = -1; + iFlags |= (Opacity < 1.0) ? 1 : 0x10; // zmienna tekstura 1 + } + else if (texture == "-2") + { + TextureID = -2; + iFlags |= (Opacity < 1.0) ? 2 : 0x10; // zmienna tekstura 2 + } + else if (texture == "-3") + { + TextureID = -3; + iFlags |= (Opacity < 1.0) ? 4 : 0x10; // zmienna tekstura 3 + } + else if (texture == "-4") + { + TextureID = -4; + iFlags |= (Opacity < 1.0) ? 8 : 0x10; // zmienna tekstura 4 + } + else + { // jeśli tylko nazwa pliku, to dawać bieżącą ścieżkę do tekstur + // asTexture=AnsiString(texture.c_str()); //zapamiętanie nazwy tekstury + TextureNameSet(texture.c_str()); + if (texture.find_first_of("/\\") == texture.npos) + texture.insert(0, Global::asCurrentTexturePath.c_str()); + TextureID = TextureManager.GetTextureId(texture, szTexturePath); + // TexAlpha=TTexturesManager::GetAlpha(TextureID); + // iFlags|=TexAlpha?0x20:0x10; //0x10-nieprzezroczysta, 0x20-przezroczysta + if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity + // 0! + iFlags |= TextureManager.Texture(TextureID).has_alpha ? + 0x20 : + 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta + else + iFlags |= 0x10; // normalnie nieprzezroczyste + // renderowanie w cyklu przezroczystych tylko jeśli: + // 1. Opacity=0 (przejściowo <1, czy tam <100) oraz + // 2. tekstura ma przezroczystość + }; + } + else + iFlags |= 0x10; - std::string discard; - parser.getTokens(5, false); - parser >> discard >> fSquareMaxDist >> discard >> fSquareMinDist >> discard; + std::string discard; + parser.getTokens(5, false); + parser >> discard >> fSquareMaxDist >> discard >> fSquareMinDist >> discard; - if (fSquareMaxDist >= 0.0) - { - fSquareMaxDist *= fSquareMaxDist; - } - else - { - fSquareMaxDist = 15000 * 15000; - } // 15km to więcej, niż się obecnie wyświetla - fSquareMinDist *= fSquareMinDist; - fMatrix = new float4x4(); - readMatrix(parser, *fMatrix); // wczytanie transform - if (!fMatrix->IdentityIs()) - iFlags |= 0x8000; // transform niejedynkowy - trzeba go przechować - int iNumFaces; // ilość trójkątów - unsigned int *sg; // maski przynależności trójkątów do powierzchni - if (eType < TP_ROTATOR) - { // wczytywanie wierzchołków - parser.getTokens(2, false); - parser >> discard >> token; - // Ra 15-01: to wczytać jako tekst - jeśli pierwszy znak zawiera "*", to - // dalej będzie nazwa wcześniejszego submodelu, z którego należy wziąć - // wierzchołki - // zapewni to jakąś zgodność wstecz, bo zamiast liczby będzie ciąg, którego - // wartość powinna być uznana jako zerowa - // parser.getToken(iNumVerts); - if (token[0] == '*') - { // jeśli pierwszy znak jest gwiazdką, poszukać - // submodelu o nazwie bez tej gwiazdki i wziąć z - // niego wierzchołki - Error("Verticles reference not yet supported!"); - } - else - { // normalna lista wierzchołków - iNumVerts = atoi(token.c_str()); - if (iNumVerts % 3) - { - iNumVerts = 0; - Error("Mesh error, (iNumVertices=" + std::to_string(iNumVerts) + ")%3<>0"); - return 0; - } - // Vertices=new GLVERTEX[iNumVerts]; - if (iNumVerts) - { - Vertices = new float8[iNumVerts]; - iNumFaces = iNumVerts / 3; - sg = new unsigned int[iNumFaces]; // maski powierzchni: 0 oznacza brak - // użredniania wektorów normalnych - int *wsp = new int[iNumVerts]; // z którego wierzchołka kopiować wektor - // normalny - int maska = 0; - for (int i = 0; i < iNumVerts; i++) - { // Ra: z konwersją na układ scenerii - będzie wydajniejsze - // wyświetlanie - wsp[i] = -1; // wektory normalne nie są policzone dla tego wierzchołka - if ((i % 3) == 0) - { // jeśli będzie maska -1, to dalej będą - // wierzchołki z wektorami normalnymi, podanymi - // jawnie - maska = parser.getToken(false); // maska powierzchni trójkąta - sg[i / 3] = (maska == -1) ? 0 : maska; // dla maski -1 będzie 0, - // czyli nie ma wspólnych - // wektorów normalnych - } - parser.getTokens(3, false); - parser >> Vertices[i].Point.x >> Vertices[i].Point.y >> Vertices[i].Point.z; - if (maska == -1) - { // jeśli wektory normalne podane jawnie - parser.getTokens(3, false); - parser >> Vertices[i].Normal.x >> Vertices[i].Normal.y >> - Vertices[i].Normal.z; - wsp[i] = i; // wektory normalne "są już policzone" - } - parser.getTokens(2, false); - parser >> Vertices[i].tu >> Vertices[i].tv; - if (i % 3 == 2) // jeżeli wczytano 3 punkty - { - if (Vertices[i].Point == Vertices[i - 1].Point || - Vertices[i - 1].Point == Vertices[i - 2].Point || - Vertices[i - 2].Point == Vertices[i].Point) - { // jeżeli punkty się nakładają na siebie - --iNumFaces; // o jeden trójkąt mniej - iNumVerts -= 3; // czyli o 3 wierzchołki - i -= 3; // wczytanie kolejnego w to miejsce - WriteLog(std::string("Degenerated triangle ignored in: \"") + pName + - "\", verticle " + std::to_string(i)); - } - if (i > 0) // jeśli pierwszy trójkąt będzie zdegenerowany, to - // zostanie usunięty i nie ma co sprawdzać - if (((Vertices[i].Point - Vertices[i - 1].Point).Length() > 1000.0) || - ((Vertices[i - 1].Point - Vertices[i - 2].Point).Length() > - 1000.0) || - ((Vertices[i - 2].Point - Vertices[i].Point).Length() > 1000.0)) - { // jeżeli są dalej niż 2km od siebie //Ra 15-01: - // obiekt wstawiany nie powinien być większy niż - // 300m (trójkąty terenu w E3D mogą mieć 1.5km) - --iNumFaces; // o jeden trójkąt mniej - iNumVerts -= 3; // czyli o 3 wierzchołki - i -= 3; // wczytanie kolejnego w to miejsce - WriteLog(std::string("Too large triangle ignored in: \"") + pName + - "\""); - } - } - } - int i; // indeks dla trójkątów - float3 *n = new float3[iNumFaces]; // tablica wektorów normalnych dla trójkątów - for (i = 0; i < iNumFaces; i++) // pętla po trójkątach - będzie - // szybciej, jak wstępnie przeliczymy - // normalne trójkątów - n[i] = SafeNormalize( - CrossProduct(Vertices[i * 3].Point - Vertices[i * 3 + 1].Point, - Vertices[i * 3].Point - Vertices[i * 3 + 2].Point)); - int v; // indeks dla wierzchołków - int f; // numer trójkąta stycznego - float3 norm; // roboczy wektor normalny - for (v = 0; v < iNumVerts; v++) - { // pętla po wierzchołkach trójkątów - if (wsp[v] >= 0) // jeśli już był liczony wektor normalny z użyciem - // tego wierzchołka - Vertices[v].Normal = - Vertices[wsp[v]].Normal; // to wystarczy skopiować policzony wcześniej - else - { // inaczej musimy dopiero policzyć - i = v / 3; // numer trójkąta - norm = float3(0, 0, 0); // liczenie zaczynamy od zera - f = v; // zaczynamy dodawanie wektorów normalnych od własnego - while (f >= 0) - { // sumowanie z wektorem normalnym sąsiada (włącznie - // ze sobą) - wsp[f] = v; // informacja, że w tym wierzchołku jest już policzony - // wektor normalny - norm += n[f / 3]; - f = SeekFaceNormal(sg, f / 3 + 1, sg[i], &Vertices[v].Point, - Vertices); // i szukanie od kolejnego trójkąta - } - // Ra 15-01: należało by jeszcze uwzględnić skalowanie wprowadzane - // przez transformy, aby normalne po przeskalowaniu były jednostkowe - Vertices[v].Normal = - SafeNormalize(norm); // przepisanie do wierzchołka trójkąta - } - } - delete[] wsp; - delete[] n; - delete[] sg; - } - else // gdy brak wierzchołków - { - eType = TP_ROTATOR; // submodel pomocniczy, ma tylko macierz przekształcenia - iVboPtr = iNumVerts = 0; // dla formalności - } - } // obsługa submodelu z własną listą wierzchołków - } - else if (eType == TP_STARS) - { // punkty świecące dookólnie - składnia jak - // dla smt_Mesh - std::string discard; - parser.getTokens(2, false); - parser >> discard >> iNumVerts; - // Vertices=new GLVERTEX[iNumVerts]; - Vertices = new float8[iNumVerts]; - int i, j; - for (i = 0; i < iNumVerts; i++) - { - if (i % 3 == 0) - { - parser.ignoreToken(); // maska powierzchni trójkąta - } - parser.getTokens(5, false); - parser >> Vertices[i].Point.x >> Vertices[i].Point.y >> Vertices[i].Point.z >> - j // zakodowany kolor - >> discard; - Vertices[i].Normal.x = ((j)&0xFF) / 255.0; // R - Vertices[i].Normal.y = ((j >> 8) & 0xFF) / 255.0; // G - Vertices[i].Normal.z = ((j >> 16) & 0xFF) / 255.0; // B - } - } - // Visible=true; //się potem wyłączy w razie potrzeby - // iFlags|=0x0200; //wczytano z pliku tekstowego (jest właścicielem tablic) - if (iNumVerts < 1) - iFlags &= ~0x3F; // cykl renderowania uzależniony od potomnych - return iNumVerts; // do określenia wielkości VBO + if (fSquareMaxDist >= 0.0) + { + fSquareMaxDist *= fSquareMaxDist; + } + else + { + fSquareMaxDist = 15000 * 15000; + } // 15km to więcej, niż się obecnie wyświetla + fSquareMinDist *= fSquareMinDist; + fMatrix = new float4x4(); + readMatrix(parser, *fMatrix); // wczytanie transform + if (!fMatrix->IdentityIs()) + iFlags |= 0x8000; // transform niejedynkowy - trzeba go przechować + int iNumFaces; // ilość trójkątów + unsigned int *sg; // maski przynależności trójkątów do powierzchni + if (eType < TP_ROTATOR) + { // wczytywanie wierzchołków + parser.getTokens(2, false); + parser >> discard >> token; + // Ra 15-01: to wczytać jako tekst - jeśli pierwszy znak zawiera "*", to + // dalej będzie nazwa wcześniejszego submodelu, z którego należy wziąć + // wierzchołki + // zapewni to jakąś zgodność wstecz, bo zamiast liczby będzie ciąg, którego + // wartość powinna być uznana jako zerowa + // parser.getToken(iNumVerts); + if (token[0] == '*') + { // jeśli pierwszy znak jest gwiazdką, poszukać + // submodelu o nazwie bez tej gwiazdki i wziąć z + // niego wierzchołki + Error("Verticles reference not yet supported!"); + } + else + { // normalna lista wierzchołków + iNumVerts = atoi(token.c_str()); + if (iNumVerts % 3) + { + iNumVerts = 0; + Error("Mesh error, (iNumVertices=" + std::to_string(iNumVerts) + ")%3<>0"); + return 0; + } + // Vertices=new GLVERTEX[iNumVerts]; + if (iNumVerts) + { + Vertices = new float8[iNumVerts]; + iNumFaces = iNumVerts / 3; + sg = new unsigned int[iNumFaces]; // maski powierzchni: 0 oznacza brak + // użredniania wektorów normalnych + int *wsp = new int[iNumVerts]; // z którego wierzchołka kopiować wektor + // normalny + int maska = 0; + for (int i = 0; i < iNumVerts; i++) + { // Ra: z konwersją na układ scenerii - będzie wydajniejsze + // wyświetlanie + wsp[i] = -1; // wektory normalne nie są policzone dla tego wierzchołka + if ((i % 3) == 0) + { // jeśli będzie maska -1, to dalej będą + // wierzchołki z wektorami normalnymi, podanymi + // jawnie + maska = parser.getToken(false); // maska powierzchni trójkąta + sg[i / 3] = (maska == -1) ? 0 : maska; // dla maski -1 będzie 0, + // czyli nie ma wspólnych + // wektorów normalnych + } + parser.getTokens(3, false); + parser >> Vertices[i].Point.x >> Vertices[i].Point.y >> Vertices[i].Point.z; + if (maska == -1) + { // jeśli wektory normalne podane jawnie + parser.getTokens(3, false); + parser >> Vertices[i].Normal.x >> Vertices[i].Normal.y >> + Vertices[i].Normal.z; + wsp[i] = i; // wektory normalne "są już policzone" + } + parser.getTokens(2, false); + parser >> Vertices[i].tu >> Vertices[i].tv; + if (i % 3 == 2) // jeżeli wczytano 3 punkty + { + if (Vertices[i].Point == Vertices[i - 1].Point || + Vertices[i - 1].Point == Vertices[i - 2].Point || + Vertices[i - 2].Point == Vertices[i].Point) + { // jeżeli punkty się nakładają na siebie + --iNumFaces; // o jeden trójkąt mniej + iNumVerts -= 3; // czyli o 3 wierzchołki + i -= 3; // wczytanie kolejnego w to miejsce + WriteLog(std::string("Degenerated triangle ignored in: \"") + pName + + "\", verticle " + std::to_string(i)); + } + if (i > 0) // jeśli pierwszy trójkąt będzie zdegenerowany, to + // zostanie usunięty i nie ma co sprawdzać + if (((Vertices[i].Point - Vertices[i - 1].Point).Length() > 1000.0) || + ((Vertices[i - 1].Point - Vertices[i - 2].Point).Length() > + 1000.0) || + ((Vertices[i - 2].Point - Vertices[i].Point).Length() > 1000.0)) + { // jeżeli są dalej niż 2km od siebie //Ra 15-01: + // obiekt wstawiany nie powinien być większy niż + // 300m (trójkąty terenu w E3D mogą mieć 1.5km) + --iNumFaces; // o jeden trójkąt mniej + iNumVerts -= 3; // czyli o 3 wierzchołki + i -= 3; // wczytanie kolejnego w to miejsce + WriteLog(std::string("Too large triangle ignored in: \"") + pName + + "\""); + } + } + } + int i; // indeks dla trójkątów + float3 *n = new float3[iNumFaces]; // tablica wektorów normalnych dla trójkątów + for (i = 0; i < iNumFaces; i++) // pętla po trójkątach - będzie + // szybciej, jak wstępnie przeliczymy + // normalne trójkątów + n[i] = SafeNormalize( + CrossProduct(Vertices[i * 3].Point - Vertices[i * 3 + 1].Point, + Vertices[i * 3].Point - Vertices[i * 3 + 2].Point)); + int v; // indeks dla wierzchołków + int f; // numer trójkąta stycznego + float3 norm; // roboczy wektor normalny + for (v = 0; v < iNumVerts; v++) + { // pętla po wierzchołkach trójkątów + if (wsp[v] >= 0) // jeśli już był liczony wektor normalny z użyciem + // tego wierzchołka + Vertices[v].Normal = + Vertices[wsp[v]].Normal; // to wystarczy skopiować policzony wcześniej + else + { // inaczej musimy dopiero policzyć + i = v / 3; // numer trójkąta + norm = float3(0, 0, 0); // liczenie zaczynamy od zera + f = v; // zaczynamy dodawanie wektorów normalnych od własnego + while (f >= 0) + { // sumowanie z wektorem normalnym sąsiada (włącznie + // ze sobą) + wsp[f] = v; // informacja, że w tym wierzchołku jest już policzony + // wektor normalny + norm += n[f / 3]; + f = SeekFaceNormal(sg, f / 3 + 1, sg[i], &Vertices[v].Point, + Vertices); // i szukanie od kolejnego trójkąta + } + // Ra 15-01: należało by jeszcze uwzględnić skalowanie wprowadzane + // przez transformy, aby normalne po przeskalowaniu były jednostkowe + Vertices[v].Normal = + SafeNormalize(norm); // przepisanie do wierzchołka trójkąta + } + } + delete[] wsp; + delete[] n; + delete[] sg; + } + else // gdy brak wierzchołków + { + eType = TP_ROTATOR; // submodel pomocniczy, ma tylko macierz przekształcenia + iVboPtr = iNumVerts = 0; // dla formalności + } + } // obsługa submodelu z własną listą wierzchołków + } + else if (eType == TP_STARS) + { // punkty świecące dookólnie - składnia jak + // dla smt_Mesh + std::string discard; + parser.getTokens(2, false); + parser >> discard >> iNumVerts; + // Vertices=new GLVERTEX[iNumVerts]; + Vertices = new float8[iNumVerts]; + int i, j; + for (i = 0; i < iNumVerts; i++) + { + if (i % 3 == 0) + { + parser.ignoreToken(); // maska powierzchni trójkąta + } + parser.getTokens(5, false); + parser >> Vertices[i].Point.x >> Vertices[i].Point.y >> Vertices[i].Point.z >> + j // zakodowany kolor + >> discard; + Vertices[i].Normal.x = ((j) & 0xFF) / 255.0; // R + Vertices[i].Normal.y = ((j >> 8) & 0xFF) / 255.0; // G + Vertices[i].Normal.z = ((j >> 16) & 0xFF) / 255.0; // B + } + } + // Visible=true; //się potem wyłączy w razie potrzeby + // iFlags|=0x0200; //wczytano z pliku tekstowego (jest właścicielem tablic) + if (iNumVerts < 1) + iFlags &= ~0x3F; // cykl renderowania uzależniony od potomnych + return iNumVerts; // do określenia wielkości VBO }; int TSubModel::TriangleAdd(TModel3d *m, texture_manager::size_type tex, int tri) { // dodanie trójkątów do submodelu, używane - // przy tworzeniu E3D terenu - TSubModel *s = this; - while (s ? (s->TextureID != tex) : false) - { // szukanie submodelu o danej teksturze - if (s == this) - s = Child; - else - s = s->Next; - } - if (!s) - { - if (TextureID <= 0) - s = this; // użycie głównego - else - { // dodanie nowego submodelu do listy potomnych - s = new TSubModel(); - m->AddTo(this, s); - } - // s->asTexture=AnsiString(TTexturesManager::GetName(tex).c_str()); - s->TextureNameSet(TextureManager.Texture(tex).name.c_str()); - s->TextureID = tex; - s->eType = GL_TRIANGLES; - // iAnimOwner=0; //roboczy wskaźnik na wierzchołek - } - if (s->iNumVerts < 0) - s->iNumVerts = tri; // bo na początku jest -1, czyli że nie wiadomo - else - s->iNumVerts += tri; // aktualizacja ilości wierzchołków - return s->iNumVerts - tri; // zwraca pozycję tych trójkątów w submodelu + // przy tworzeniu E3D terenu + TSubModel *s = this; + while (s ? (s->TextureID != tex) : false) + { // szukanie submodelu o danej teksturze + if (s == this) + s = Child; + else + s = s->Next; + } + if (!s) + { + if (TextureID <= 0) + s = this; // użycie głównego + else + { // dodanie nowego submodelu do listy potomnych + s = new TSubModel(); + m->AddTo(this, s); + } + // s->asTexture=AnsiString(TTexturesManager::GetName(tex).c_str()); + s->TextureNameSet(TextureManager.Texture(tex).name.c_str()); + s->TextureID = tex; + s->eType = GL_TRIANGLES; + // iAnimOwner=0; //roboczy wskaźnik na wierzchołek + } + if (s->iNumVerts < 0) + s->iNumVerts = tri; // bo na początku jest -1, czyli że nie wiadomo + else + s->iNumVerts += tri; // aktualizacja ilości wierzchołków + return s->iNumVerts - tri; // zwraca pozycję tych trójkątów w submodelu }; float8 *TSubModel::TrianglePtr(int tex, int pos, int *la, int *ld, int *ls) { // zwraca wskaźnik do wypełnienia tabeli wierzchołków, używane - // przy tworzeniu E3D terenu - TSubModel *s = this; - while (s ? s->TextureID != tex : false) - { // szukanie submodelu o danej teksturze - if (s == this) - s = Child; - else - s = s->Next; - } - if (!s) - return NULL; // coś nie tak poszło - if (!s->Vertices) - { // utworznie tabeli trójkątów - s->Vertices = new float8[s->iNumVerts]; - // iVboPtr=pos; //pozycja submodelu w tabeli wierzchołków - // pos+=iNumVerts; //rezerwacja miejsca w tabeli - s->iVboPtr = iInstance; // pozycja submodelu w tabeli wierzchołków - iInstance += s->iNumVerts; // pozycja dla następnego - } - s->ColorsSet(la, ld, ls); // ustawienie kolorów świateł - return s->Vertices + pos; // wskaźnik na wolne miejsce w tabeli wierzchołków + // przy tworzeniu E3D terenu + TSubModel *s = this; + while (s ? s->TextureID != tex : false) + { // szukanie submodelu o danej teksturze + if (s == this) + s = Child; + else + s = s->Next; + } + if (!s) + return NULL; // coś nie tak poszło + if (!s->Vertices) + { // utworznie tabeli trójkątów + s->Vertices = new float8[s->iNumVerts]; + // iVboPtr=pos; //pozycja submodelu w tabeli wierzchołków + // pos+=iNumVerts; //rezerwacja miejsca w tabeli + s->iVboPtr = iInstance; // pozycja submodelu w tabeli wierzchołków + iInstance += s->iNumVerts; // pozycja dla następnego + } + s->ColorsSet(la, ld, ls); // ustawienie kolorów świateł + return s->Vertices + pos; // wskaźnik na wolne miejsce w tabeli wierzchołków }; void TSubModel::DisplayLists() { // utworznie po jednej skompilowanej liście dla - // każdego submodelu - if (Global::bUseVBO) - return; // Ra: przy VBO to się nie przyda - // iFlags|=0x4000; //wyłączenie przeliczania wierzchołków, bo nie są zachowane - if (eType < TP_ROTATOR) - { - if (iNumVerts > 0) - { - uiDisplayList = glGenLists(1); - glNewList(uiDisplayList, GL_COMPILE); - glColor3fv(f4Diffuse); // McZapkie-240702: zamiast ub + // każdego submodelu + if (Global::bUseVBO) + return; // Ra: przy VBO to się nie przyda + // iFlags|=0x4000; //wyłączenie przeliczania wierzchołków, bo nie są zachowane + if (eType < TP_ROTATOR) + { + if (iNumVerts > 0) + { + uiDisplayList = glGenLists(1); + glNewList(uiDisplayList, GL_COMPILE); + glColor3fv(f4Diffuse); // McZapkie-240702: zamiast ub #ifdef USE_VERTEX_ARRAYS - // ShaXbee-121209: przekazywanie wierzcholkow hurtem - glVertexPointer(3, GL_DOUBLE, sizeof(GLVERTEX), &Vertices[0].Point.x); - glNormalPointer(GL_DOUBLE, sizeof(GLVERTEX), &Vertices[0].Normal.x); - glTexCoordPointer(2, GL_FLOAT, sizeof(GLVERTEX), &Vertices[0].tu); - glDrawArrays(eType, 0, iNumVerts); + // ShaXbee-121209: przekazywanie wierzcholkow hurtem + glVertexPointer(3, GL_DOUBLE, sizeof(GLVERTEX), &Vertices[0].Point.x); + glNormalPointer(GL_DOUBLE, sizeof(GLVERTEX), &Vertices[0].Normal.x); + glTexCoordPointer(2, GL_FLOAT, sizeof(GLVERTEX), &Vertices[0].tu); + glDrawArrays(eType, 0, iNumVerts); #else - glBegin(eType); - for (int i = 0; i < iNumVerts; i++) - { - /* - glNormal3dv(&Vertices[i].Normal.x); - glTexCoord2f(Vertices[i].tu,Vertices[i].tv); - glVertex3dv(&Vertices[i].Point.x); - */ - glNormal3fv(&Vertices[i].Normal.x); - glTexCoord2f(Vertices[i].tu, Vertices[i].tv); - glVertex3fv(&Vertices[i].Point.x); - }; - glEnd(); + glBegin(eType); + for (int i = 0; i < iNumVerts; i++) + { + /* + glNormal3dv(&Vertices[i].Normal.x); + glTexCoord2f(Vertices[i].tu,Vertices[i].tv); + glVertex3dv(&Vertices[i].Point.x); + */ + glNormal3fv(&Vertices[i].Normal.x); + glTexCoord2f(Vertices[i].tu, Vertices[i].tv); + glVertex3fv(&Vertices[i].Point.x); + }; + glEnd(); #endif - glEndList(); - } - } - else if (eType == TP_FREESPOTLIGHT) - { - uiDisplayList = glGenLists(1); - glNewList(uiDisplayList, GL_COMPILE); - TextureManager.Bind(0); - // if (eType==smt_FreeSpotLight) - // { - // if (iFarAttenDecay==0) - // glColor3f(Diffuse[0],Diffuse[1],Diffuse[2]); - // } - // else - // TODO: poprawic zeby dzialalo - // glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); - glColorMaterial(GL_FRONT, GL_EMISSION); - glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly - glBegin(GL_POINTS); - glVertex3f(0, 0, 0); - glEnd(); - glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - glEndList(); - } - else if (eType == TP_STARS) - { // punkty świecące dookólnie - uiDisplayList = glGenLists(1); - glNewList(uiDisplayList, GL_COMPILE); - TextureManager.Bind(0); // tekstury nie ma - glColorMaterial(GL_FRONT, GL_EMISSION); - glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly - glBegin(GL_POINTS); - for (int i = 0; i < iNumVerts; i++) - { - glColor3f(Vertices[i].Normal.x, Vertices[i].Normal.y, Vertices[i].Normal.z); - // glVertex3dv(&Vertices[i].Point.x); - glVertex3fv(&Vertices[i].Point.x); - }; - glEnd(); - glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - glEndList(); - } - // SafeDeleteArray(Vertices); //przy VBO muszą zostać do załadowania całego - // modelu - if (Child) - Child->DisplayLists(); - if (Next) - Next->DisplayLists(); + glEndList(); + } + } + else if (eType == TP_FREESPOTLIGHT) + { + uiDisplayList = glGenLists(1); + glNewList(uiDisplayList, GL_COMPILE); + TextureManager.Bind(0); + // if (eType==smt_FreeSpotLight) + // { + // if (iFarAttenDecay==0) + // glColor3f(Diffuse[0],Diffuse[1],Diffuse[2]); + // } + // else + // TODO: poprawic zeby dzialalo + // glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); + glColorMaterial(GL_FRONT, GL_EMISSION); + glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly + glBegin(GL_POINTS); + glVertex3f(0, 0, 0); + glEnd(); + glEnable(GL_LIGHTING); + glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); + glMaterialfv(GL_FRONT, GL_EMISSION, emm2); + glEndList(); + } + else if (eType == TP_STARS) + { // punkty świecące dookólnie + uiDisplayList = glGenLists(1); + glNewList(uiDisplayList, GL_COMPILE); + TextureManager.Bind(0); // tekstury nie ma + glColorMaterial(GL_FRONT, GL_EMISSION); + glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly + glBegin(GL_POINTS); + for (int i = 0; i < iNumVerts; i++) + { + glColor3f(Vertices[i].Normal.x, Vertices[i].Normal.y, Vertices[i].Normal.z); + // glVertex3dv(&Vertices[i].Point.x); + glVertex3fv(&Vertices[i].Point.x); + }; + glEnd(); + glEnable(GL_LIGHTING); + glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); + glMaterialfv(GL_FRONT, GL_EMISSION, emm2); + glEndList(); + } + // SafeDeleteArray(Vertices); //przy VBO muszą zostać do załadowania całego + // modelu + if (Child) + Child->DisplayLists(); + if (Next) + Next->DisplayLists(); }; void TSubModel::InitialRotate(bool doit) { // konwersja układu współrzędnych na zgodny ze scenerią - if (iFlags & 0xC000) // jeśli jest animacja albo niejednostkowy transform - { // niejednostkowy transform jest mnożony i wystarczy zabawy - if (doit) - { // obrót lewostronny - if (!fMatrix) // macierzy może nie być w dodanym "bananie" - { - fMatrix = new float4x4(); // tworzy macierz o przypadkowej zawartości - fMatrix->Identity(); // a zaczynamy obracanie od jednostkowej - } - iFlags |= 0x8000; // po obróceniu będzie raczej niejedynkowy matrix - fMatrix->InitialRotate(); // zmiana znaku X oraz zamiana Y i Z - if (fMatrix->IdentityIs()) - iFlags &= ~0x8000; // jednak jednostkowa po obróceniu - } - if (Child) - Child->InitialRotate(false); // potomnych nie obracamy już, tylko - // ewentualnie optymalizujemy - else if (Global::iConvertModels & 2) // optymalizacja jest opcjonalna - if ((iFlags & 0xC000) == 0x8000) // o ile nie ma animacji - { // jak nie ma potomnych, można wymnożyć przez transform i wyjedynkować - // go - float4x4 *mat = GetMatrix(); // transform submodelu - if (Vertices) - { - for (int i = 0; i < iNumVerts; ++i) - Vertices[i].Point = (*mat) * Vertices[i].Point; - (*mat)(3)[0] = (*mat)(3)[1] = (*mat)(3)[2] = - 0.0; // zerujemy przesunięcie przed obracaniem normalnych - if (eType != TP_STARS) // gwiazdki mają kolory zamiast normalnych, to - // ich wtedy nie ruszamy - for (int i = 0; i < iNumVerts; ++i) - Vertices[i].Normal = SafeNormalize((*mat) * Vertices[i].Normal); - } - mat->Identity(); // jedynkowanie transformu po przeliczeniu wierzchołków - iFlags &= ~0x8000; // transform jedynkowy - } - } - else // jak jest jednostkowy i nie ma animacji - if (doit) - { // jeśli jest jednostkowy transform, to przeliczamy - // wierzchołki, a mnożenie podajemy dalej - double t; - if (Vertices) - for (int i = 0; i < iNumVerts; ++i) - { - Vertices[i].Point.x = -Vertices[i].Point.x; // zmiana znaku X - t = Vertices[i].Point.y; // zamiana Y i Z - Vertices[i].Point.y = Vertices[i].Point.z; - Vertices[i].Point.z = t; - // wektory normalne również trzeba przekształcić, bo się źle oświetlają - Vertices[i].Normal.x = -Vertices[i].Normal.x; // zmiana znaku X - t = Vertices[i].Normal.y; // zamiana Y i Z - Vertices[i].Normal.y = Vertices[i].Normal.z; - Vertices[i].Normal.z = t; - } - if (Child) - Child->InitialRotate(doit); // potomne ewentualnie obrócimy - } - if (Next) - Next->InitialRotate(doit); + if (iFlags & 0xC000) // jeśli jest animacja albo niejednostkowy transform + { // niejednostkowy transform jest mnożony i wystarczy zabawy + if (doit) + { // obrót lewostronny + if (!fMatrix) // macierzy może nie być w dodanym "bananie" + { + fMatrix = new float4x4(); // tworzy macierz o przypadkowej zawartości + fMatrix->Identity(); // a zaczynamy obracanie od jednostkowej + } + iFlags |= 0x8000; // po obróceniu będzie raczej niejedynkowy matrix + fMatrix->InitialRotate(); // zmiana znaku X oraz zamiana Y i Z + if (fMatrix->IdentityIs()) + iFlags &= ~0x8000; // jednak jednostkowa po obróceniu + } + if (Child) + Child->InitialRotate(false); // potomnych nie obracamy już, tylko + // ewentualnie optymalizujemy + else if (Global::iConvertModels & 2) // optymalizacja jest opcjonalna + if ((iFlags & 0xC000) == 0x8000) // o ile nie ma animacji + { // jak nie ma potomnych, można wymnożyć przez transform i wyjedynkować + // go + float4x4 *mat = GetMatrix(); // transform submodelu + if (Vertices) + { + for (int i = 0; i < iNumVerts; ++i) + Vertices[i].Point = (*mat) * Vertices[i].Point; + (*mat)(3)[0] = (*mat)(3)[1] = (*mat)(3)[2] = + 0.0; // zerujemy przesunięcie przed obracaniem normalnych + if (eType != TP_STARS) // gwiazdki mają kolory zamiast normalnych, to + // ich wtedy nie ruszamy + for (int i = 0; i < iNumVerts; ++i) + Vertices[i].Normal = SafeNormalize((*mat) * Vertices[i].Normal); + } + mat->Identity(); // jedynkowanie transformu po przeliczeniu wierzchołków + iFlags &= ~0x8000; // transform jedynkowy + } + } + else // jak jest jednostkowy i nie ma animacji + if (doit) + { // jeśli jest jednostkowy transform, to przeliczamy + // wierzchołki, a mnożenie podajemy dalej + double t; + if (Vertices) + for (int i = 0; i < iNumVerts; ++i) + { + Vertices[i].Point.x = -Vertices[i].Point.x; // zmiana znaku X + t = Vertices[i].Point.y; // zamiana Y i Z + Vertices[i].Point.y = Vertices[i].Point.z; + Vertices[i].Point.z = t; + // wektory normalne również trzeba przekształcić, bo się źle oświetlają + Vertices[i].Normal.x = -Vertices[i].Normal.x; // zmiana znaku X + t = Vertices[i].Normal.y; // zamiana Y i Z + Vertices[i].Normal.y = Vertices[i].Normal.z; + Vertices[i].Normal.z = t; + } + if (Child) + Child->InitialRotate(doit); // potomne ewentualnie obrócimy + } + if (Next) + Next->InitialRotate(doit); }; void TSubModel::ChildAdd(TSubModel *SubModel) { // dodanie submodelu potemnego (uzależnionego) - // Ra: zmiana kolejności, żeby kolejne móc renderować po aktualnym (było - // przed) - if (SubModel) - SubModel->NextAdd(Child); // Ra: zmiana kolejności renderowania - Child = SubModel; + // Ra: zmiana kolejności, żeby kolejne móc renderować po aktualnym (było + // przed) + if (SubModel) + SubModel->NextAdd(Child); // Ra: zmiana kolejności renderowania + Child = SubModel; }; void TSubModel::NextAdd(TSubModel *SubModel) { // dodanie submodelu kolejnego (wspólny przodek) - if (Next) - Next->NextAdd(SubModel); - else - Next = SubModel; + if (Next) + Next->NextAdd(SubModel); + else + Next = SubModel; }; int TSubModel::FlagsCheck() { // analiza koniecznych zmian pomiędzy submodelami - // samo pomijanie glBindTexture() nie poprawi wydajności - // ale można sprawdzić, czy można w ogóle pominąć kod do tekstur (sprawdzanie - // replaceskin) - int i = 0; - if (Child) - { // Child jest renderowany po danym submodelu - if (Child->TextureID) // o ile ma teksturę - if (Child->TextureID != TextureID) // i jest ona inna niż rodzica - Child->iFlags |= 0x80; // to trzeba sprawdzać, jak z teksturami jest - i = Child->FlagsCheck(); - iFlags |= 0x00FF0000 & ((i << 16) | (i) | (i >> 8)); // potomny, rodzeństwo i dzieci - if (eType == TP_TEXT) - { // wyłączenie renderowania Next dla znaków - // wyświetlacza tekstowego - TSubModel *p = Child; - while (p) - { - p->iFlags &= 0xC0FFFFFF; - p = p->Next; - } - } - } - if (Next) - { // Next jest renderowany po danym submodelu (kolejność odwrócona - // po wczytaniu T3D) - if (TextureID) // o ile dany ma teksturę - if ((TextureID != Next->TextureID) || - (i & 0x00800000)) // a ma inną albo dzieci zmieniają - iFlags |= 0x80; // to dany submodel musi sobie ją ustawiać - i = Next->FlagsCheck(); - iFlags |= 0xFF000000 & ((i << 24) | (i << 8) | (i)); // następny, kolejne i ich dzieci - // tekstury nie ustawiamy tylko wtedy, gdy jest taka sama jak Next i jego - // dzieci nie zmieniają - } - return iFlags; + // samo pomijanie glBindTexture() nie poprawi wydajności + // ale można sprawdzić, czy można w ogóle pominąć kod do tekstur (sprawdzanie + // replaceskin) + int i = 0; + if (Child) + { // Child jest renderowany po danym submodelu + if (Child->TextureID) // o ile ma teksturę + if (Child->TextureID != TextureID) // i jest ona inna niż rodzica + Child->iFlags |= 0x80; // to trzeba sprawdzać, jak z teksturami jest + i = Child->FlagsCheck(); + iFlags |= 0x00FF0000 & ((i << 16) | (i) | (i >> 8)); // potomny, rodzeństwo i dzieci + if (eType == TP_TEXT) + { // wyłączenie renderowania Next dla znaków + // wyświetlacza tekstowego + TSubModel *p = Child; + while (p) + { + p->iFlags &= 0xC0FFFFFF; + p = p->Next; + } + } + } + if (Next) + { // Next jest renderowany po danym submodelu (kolejność odwrócona + // po wczytaniu T3D) + if (TextureID) // o ile dany ma teksturę + if ((TextureID != Next->TextureID) || + (i & 0x00800000)) // a ma inną albo dzieci zmieniają + iFlags |= 0x80; // to dany submodel musi sobie ją ustawiać + i = Next->FlagsCheck(); + iFlags |= 0xFF000000 & ((i << 24) | (i << 8) | (i)); // następny, kolejne i ich dzieci + // tekstury nie ustawiamy tylko wtedy, gdy jest taka sama jak Next i jego + // dzieci nie zmieniają + } + return iFlags; }; void TSubModel::SetRotate(float3 vNewRotateAxis, float fNewAngle) { // obrócenie submodelu wg podanej - // osi (np. wskazówki w kabinie) - v_RotateAxis = vNewRotateAxis; - f_Angle = fNewAngle; - if (fNewAngle != 0.0) - { - b_Anim = at_Rotate; - b_aAnim = at_Rotate; - } - iAnimOwner = iInstance; // zapamiętanie czyja jest animacja + // osi (np. wskazówki w kabinie) + v_RotateAxis = vNewRotateAxis; + f_Angle = fNewAngle; + if (fNewAngle != 0.0) + { + b_Anim = at_Rotate; + b_aAnim = at_Rotate; + } + iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } void TSubModel::SetRotateXYZ(float3 vNewAngles) { // obrócenie submodelu o - // podane kąty wokół osi - // lokalnego układu - v_Angles = vNewAngles; - b_Anim = at_RotateXYZ; - b_aAnim = at_RotateXYZ; - iAnimOwner = iInstance; // zapamiętanie czyja jest animacja + // podane kąty wokół osi + // lokalnego układu + v_Angles = vNewAngles; + b_Anim = at_RotateXYZ; + b_aAnim = at_RotateXYZ; + iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } void TSubModel::SetRotateXYZ(vector3 vNewAngles) { // obrócenie submodelu o - // podane kąty wokół osi - // lokalnego układu - v_Angles.x = vNewAngles.x; - v_Angles.y = vNewAngles.y; - v_Angles.z = vNewAngles.z; - b_Anim = at_RotateXYZ; - b_aAnim = at_RotateXYZ; - iAnimOwner = iInstance; // zapamiętanie czyja jest animacja + // podane kąty wokół osi + // lokalnego układu + v_Angles.x = vNewAngles.x; + v_Angles.y = vNewAngles.y; + v_Angles.z = vNewAngles.z; + b_Anim = at_RotateXYZ; + b_aAnim = at_RotateXYZ; + iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } void TSubModel::SetTranslate(float3 vNewTransVector) { // przesunięcie submodelu (np. w kabinie) - v_TransVector = vNewTransVector; - b_Anim = at_Translate; - b_aAnim = at_Translate; - iAnimOwner = iInstance; // zapamiętanie czyja jest animacja + v_TransVector = vNewTransVector; + b_Anim = at_Translate; + b_aAnim = at_Translate; + iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } void TSubModel::SetTranslate(vector3 vNewTransVector) { // przesunięcie submodelu (np. w kabinie) - v_TransVector.x = vNewTransVector.x; - v_TransVector.y = vNewTransVector.y; - v_TransVector.z = vNewTransVector.z; - b_Anim = at_Translate; - b_aAnim = at_Translate; - iAnimOwner = iInstance; // zapamiętanie czyja jest animacja + v_TransVector.x = vNewTransVector.x; + v_TransVector.y = vNewTransVector.y; + v_TransVector.z = vNewTransVector.z; + b_Anim = at_Translate; + b_aAnim = at_Translate; + iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } void TSubModel::SetRotateIK1(float3 vNewAngles) { // obrócenie submodelu o - // podane kąty wokół osi - // lokalnego układu - v_Angles = vNewAngles; - iAnimOwner = iInstance; // zapamiętanie czyja jest animacja + // podane kąty wokół osi + // lokalnego układu + v_Angles = vNewAngles; + iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } struct ToLower { - char operator()(char input) - { - return tolower(input); - } + char operator()(char input) + { + return tolower(input); + } }; TSubModel *TSubModel::GetFromName(std::string const &search, bool i) { - return GetFromName(search.c_str(), i); + return GetFromName(search.c_str(), i); }; TSubModel *TSubModel::GetFromName(char const *search, bool i) { - TSubModel *result; - // std::transform(search.begin(),search.end(),search.begin(),ToLower()); - // search=search.LowerCase(); - // AnsiString name=AnsiString(); - if (pName && search) - if ((i ? stricmp(pName, search) : strcmp(pName, search)) == 0) - return this; - else if (pName == search) - return this; // oba NULL - if (Next) - { - result = Next->GetFromName(search); - if (result) - return result; - } - if (Child) - { - result = Child->GetFromName(search); - if (result) - return result; - } - return NULL; + TSubModel *result; + // std::transform(search.begin(),search.end(),search.begin(),ToLower()); + // search=search.LowerCase(); + // AnsiString name=AnsiString(); + if (pName && search) + if ((i ? stricmp(pName, search) : strcmp(pName, search)) == 0) + return this; + else if (pName == search) + return this; // oba NULL + if (Next) + { + result = Next->GetFromName(search); + if (result) + return result; + } + if (Child) + { + result = Child->GetFromName(search); + if (result) + return result; + } + return NULL; }; // WORD hbIndices[18]={3,0,1,5,4,2,1,0,4,1,5,3,2,3,5,2,4,0}; void TSubModel::RaAnimation(TAnimType a) { // wykonanie animacji niezależnie od renderowania - switch (a) - { // korekcja położenia, jeśli submodel jest animowany - case at_Translate: // Ra: było "true" - if (iAnimOwner != iInstance) - break; // cudza animacja - glTranslatef(v_TransVector.x, v_TransVector.y, v_TransVector.z); - break; - case at_Rotate: // Ra: było "true" - if (iAnimOwner != iInstance) - break; // cudza animacja - glRotatef(f_Angle, v_RotateAxis.x, v_RotateAxis.y, v_RotateAxis.z); - break; - case at_RotateXYZ: - if (iAnimOwner != iInstance) - break; // cudza animacja - glTranslatef(v_TransVector.x, v_TransVector.y, v_TransVector.z); - glRotatef(v_Angles.x, 1.0, 0.0, 0.0); - glRotatef(v_Angles.y, 0.0, 1.0, 0.0); - glRotatef(v_Angles.z, 0.0, 0.0, 1.0); - break; - case at_SecondsJump: // sekundy z przeskokiem - glRotatef(floor(GlobalTime->mr) * 6.0, 0.0, 1.0, 0.0); - break; - case at_MinutesJump: // minuty z przeskokiem - glRotatef(GlobalTime->mm * 6.0, 0.0, 1.0, 0.0); - break; - case at_HoursJump: // godziny skokowo 12h/360° - glRotatef(GlobalTime->hh * 30.0 * 0.5, 0.0, 1.0, 0.0); - break; - case at_Hours24Jump: // godziny skokowo 24h/360° - glRotatef(GlobalTime->hh * 15.0 * 0.25, 0.0, 1.0, 0.0); - break; - case at_Seconds: // sekundy płynnie - glRotatef(GlobalTime->mr * 6.0, 0.0, 1.0, 0.0); - break; - case at_Minutes: // minuty płynnie - glRotatef(GlobalTime->mm * 6.0 + GlobalTime->mr * 0.1, 0.0, 1.0, 0.0); - break; - case at_Hours: // godziny płynnie 12h/360° - // glRotatef(GlobalTime->hh*30.0+GlobalTime->mm*0.5+GlobalTime->mr/120.0,0.0,1.0,0.0); - glRotatef(2.0 * Global::fTimeAngleDeg, 0.0, 1.0, 0.0); - break; - case at_Hours24: // godziny płynnie 24h/360° - // glRotatef(GlobalTime->hh*15.0+GlobalTime->mm*0.25+GlobalTime->mr/240.0,0.0,1.0,0.0); - glRotatef(Global::fTimeAngleDeg, 0.0, 1.0, 0.0); - break; - case at_Billboard: // obrót w pionie do kamery - { - matrix4x4 mat; // potrzebujemy współrzędne przesunięcia środka układu - // współrzędnych submodelu - glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); // pobranie aktualnej matrycy - float3 gdzie = float3(mat[3][0], mat[3][1], - mat[3][2]); // początek układu współrzędnych submodelu względem kamery - glLoadIdentity(); // macierz jedynkowa - glTranslatef(gdzie.x, gdzie.y, gdzie.z); // początek układu zostaje bez - // zmian - glRotated(atan2(gdzie.x, gdzie.z) * 180.0 / M_PI, 0.0, 1.0, - 0.0); // jedynie obracamy w pionie o kąt - } - break; - case at_Wind: // ruch pod wpływem wiatru (wiatr będziemy liczyć potem...) - glRotated(1.5 * sin(M_PI * GlobalTime->mr / 6.0), 0.0, 1.0, 0.0); - break; - case at_Sky: // animacja nieba - glRotated(Global::fLatitudeDeg, 1.0, 0.0, 0.0); // ustawienie osi OY na północ - // glRotatef(Global::fTimeAngleDeg,0.0,1.0,0.0); //obrót dobowy osi OX - glRotated(-fmod(Global::fTimeAngleDeg, 360.0), 0.0, 1.0, 0.0); // obrót dobowy osi OX - break; - case at_IK11: // ostatni element animacji szkieletowej (podudzie, stopa) - glRotatef(v_Angles.z, 0.0, 1.0, 0.0); // obrót względem osi pionowej - // (azymut) - glRotatef(v_Angles.x, 1.0, 0.0, 0.0); // obrót względem poziomu (deklinacja) - break; - case at_DigiClk: // animacja zegara cyfrowego - { // ustawienie animacji w submodelach potomnych - TSubModel *sm = ChildGet(); - do - { // pętla po submodelach potomnych i obracanie ich o kąt zależy od czasu - if (sm->pName) - { // musi mieć niepustą nazwę - if ((sm->pName[0]) >= '0') - if ((sm->pName[0]) <= '5') // zegarek ma 6 cyfr maksymalnie - sm->SetRotate(float3(0, 1, 0), - -Global::fClockAngleDeg[(sm->pName[0]) - '0']); - } - sm = sm->NextGet(); - } while (sm); - } - break; - } - if (mAnimMatrix) // można by to dać np. do at_Translate - { - glMultMatrixf(mAnimMatrix->readArray()); - mAnimMatrix = NULL; // jak animator będzie potrzebował, to ustawi ponownie - } + switch (a) + { // korekcja położenia, jeśli submodel jest animowany + case at_Translate: // Ra: było "true" + if (iAnimOwner != iInstance) + break; // cudza animacja + glTranslatef(v_TransVector.x, v_TransVector.y, v_TransVector.z); + break; + case at_Rotate: // Ra: było "true" + if (iAnimOwner != iInstance) + break; // cudza animacja + glRotatef(f_Angle, v_RotateAxis.x, v_RotateAxis.y, v_RotateAxis.z); + break; + case at_RotateXYZ: + if (iAnimOwner != iInstance) + break; // cudza animacja + glTranslatef(v_TransVector.x, v_TransVector.y, v_TransVector.z); + glRotatef(v_Angles.x, 1.0, 0.0, 0.0); + glRotatef(v_Angles.y, 0.0, 1.0, 0.0); + glRotatef(v_Angles.z, 0.0, 0.0, 1.0); + break; + case at_SecondsJump: // sekundy z przeskokiem + glRotatef(floor(GlobalTime->mr) * 6.0, 0.0, 1.0, 0.0); + break; + case at_MinutesJump: // minuty z przeskokiem + glRotatef(GlobalTime->mm * 6.0, 0.0, 1.0, 0.0); + break; + case at_HoursJump: // godziny skokowo 12h/360° + glRotatef(GlobalTime->hh * 30.0 * 0.5, 0.0, 1.0, 0.0); + break; + case at_Hours24Jump: // godziny skokowo 24h/360° + glRotatef(GlobalTime->hh * 15.0 * 0.25, 0.0, 1.0, 0.0); + break; + case at_Seconds: // sekundy płynnie + glRotatef(GlobalTime->mr * 6.0, 0.0, 1.0, 0.0); + break; + case at_Minutes: // minuty płynnie + glRotatef(GlobalTime->mm * 6.0 + GlobalTime->mr * 0.1, 0.0, 1.0, 0.0); + break; + case at_Hours: // godziny płynnie 12h/360° + // glRotatef(GlobalTime->hh*30.0+GlobalTime->mm*0.5+GlobalTime->mr/120.0,0.0,1.0,0.0); + glRotatef(2.0 * Global::fTimeAngleDeg, 0.0, 1.0, 0.0); + break; + case at_Hours24: // godziny płynnie 24h/360° + // glRotatef(GlobalTime->hh*15.0+GlobalTime->mm*0.25+GlobalTime->mr/240.0,0.0,1.0,0.0); + glRotatef(Global::fTimeAngleDeg, 0.0, 1.0, 0.0); + break; + case at_Billboard: // obrót w pionie do kamery + { + matrix4x4 mat; // potrzebujemy współrzędne przesunięcia środka układu + // współrzędnych submodelu + glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); // pobranie aktualnej matrycy + float3 gdzie = float3(mat[3][0], mat[3][1], + mat[3][2]); // początek układu współrzędnych submodelu względem kamery + glLoadIdentity(); // macierz jedynkowa + glTranslatef(gdzie.x, gdzie.y, gdzie.z); // początek układu zostaje bez + // zmian + glRotated(atan2(gdzie.x, gdzie.z) * 180.0 / M_PI, 0.0, 1.0, + 0.0); // jedynie obracamy w pionie o kąt + } + break; + case at_Wind: // ruch pod wpływem wiatru (wiatr będziemy liczyć potem...) + glRotated(1.5 * sin(M_PI * GlobalTime->mr / 6.0), 0.0, 1.0, 0.0); + break; + case at_Sky: // animacja nieba + glRotated(Global::fLatitudeDeg, 1.0, 0.0, 0.0); // ustawienie osi OY na północ + // glRotatef(Global::fTimeAngleDeg,0.0,1.0,0.0); //obrót dobowy osi OX + glRotated(-fmod(Global::fTimeAngleDeg, 360.0), 0.0, 1.0, 0.0); // obrót dobowy osi OX + break; + case at_IK11: // ostatni element animacji szkieletowej (podudzie, stopa) + glRotatef(v_Angles.z, 0.0, 1.0, 0.0); // obrót względem osi pionowej + // (azymut) + glRotatef(v_Angles.x, 1.0, 0.0, 0.0); // obrót względem poziomu (deklinacja) + break; + case at_DigiClk: // animacja zegara cyfrowego + { // ustawienie animacji w submodelach potomnych + TSubModel *sm = ChildGet(); + do + { // pętla po submodelach potomnych i obracanie ich o kąt zależy od czasu + if (sm->pName) + { // musi mieć niepustą nazwę + if ((sm->pName[0]) >= '0') + if ((sm->pName[0]) <= '5') // zegarek ma 6 cyfr maksymalnie + sm->SetRotate(float3(0, 1, 0), + -Global::fClockAngleDeg[(sm->pName[0]) - '0']); + } + sm = sm->NextGet(); + } while (sm); + } + break; + } + if (mAnimMatrix) // można by to dać np. do at_Translate + { + glMultMatrixf(mAnimMatrix->readArray()); + mAnimMatrix = NULL; // jak animator będzie potrzebował, to ustawi ponownie + } }; void TSubModel::RenderDL() { // główna procedura renderowania przez DL - if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) - { - if (iFlags & 0xC000) - { - glPushMatrix(); - if (fMatrix) - glMultMatrixf(fMatrix->readArray()); - if (b_Anim) - RaAnimation(b_Anim); - } - if (eType < TP_ROTATOR) - { // renderowanie obiektów OpenGL - if (iAlpha & iFlags & 0x1F) // rysuj gdy element nieprzezroczysty - { - if (TextureID < 0) // && (ReplacableSkinId!=0)) - { // zmienialne skóry - TextureManager.Bind(ReplacableSkinId[-TextureID]); - // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury - } - else - TextureManager.Bind(TextureID); // również 0 - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glCallList(uiDisplayList); // tylko dla siatki - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - else - glCallList(uiDisplayList); // tylko dla siatki - } - } - else if (eType == TP_FREESPOTLIGHT) - { // wersja DL - matrix4x4 mat; // macierz opisuje układ renderowania względem kamery - glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); - // kąt między kierunkiem światła a współrzędnymi kamery - vector3 gdzie = mat * vector3(0, 0, 0); // pozycja punktu świecącego względem kamery - fCosViewAngle = DotProduct(Normalize(mat * vector3(0, 0, 1) - gdzie), Normalize(gdzie)); - if (fCosViewAngle > fCosFalloffAngle) // kąt większy niż maksymalny stożek swiatła - { - double Distdimm = 1.0; - if (fCosViewAngle < - fCosHotspotAngle) // zmniejszona jasność między Hotspot a Falloff - if (fCosFalloffAngle < fCosHotspotAngle) - Distdimm = 1.0 - - (fCosHotspotAngle - fCosViewAngle) / - (fCosHotspotAngle - fCosFalloffAngle); - glColor3f(f4Diffuse[0] * Distdimm, f4Diffuse[1] * Distdimm, - f4Diffuse[2] * Distdimm); - /* TODO: poprawic to zeby dzialalo - if (iFarAttenDecay>0) - switch (iFarAttenDecay) - { - case 1: - Distdimm=fFarDecayRadius/(1+sqrt(fSquareDist)); - //dorobic od kata - break; - case 2: - Distdimm=fFarDecayRadius/(1+fSquareDist); - //dorobic od kata - break; - } - if (Distdimm>1) - Distdimm=1; - glColor3f(Diffuse[0]*Distdimm,Diffuse[1]*Distdimm,Diffuse[2]*Distdimm); - */ - // glPopMatrix(); - // return; - glCallList(uiDisplayList); // wyświetlenie warunkowe - } - } - else if (eType == TP_STARS) - { - // glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty swiecace sie - // blendowaly - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glCallList(uiDisplayList); // narysuj naraz wszystkie punkty z DL - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - } - if (Child != NULL) - if (iAlpha & iFlags & 0x001F0000) - Child->RenderDL(); - if (iFlags & 0xC000) - glPopMatrix(); - } - if (b_Anim < at_SecondsJump) - b_Anim = at_None; // wyłączenie animacji dla kolejnego użycia subm - if (Next) - if (iAlpha & iFlags & 0x1F000000) - Next->RenderDL(); // dalsze rekurencyjnie + if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) + { + if (iFlags & 0xC000) + { + glPushMatrix(); + if (fMatrix) + glMultMatrixf(fMatrix->readArray()); + if (b_Anim) + RaAnimation(b_Anim); + } + if (eType < TP_ROTATOR) + { // renderowanie obiektów OpenGL + if (iAlpha & iFlags & 0x1F) // rysuj gdy element nieprzezroczysty + { + if (TextureID < 0) // && (ReplacableSkinId!=0)) + { // zmienialne skóry + TextureManager.Bind(ReplacableSkinId[-TextureID]); + // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury + } + else + TextureManager.Bind(TextureID); // również 0 + if (Global::fLuminance < fLight) + { + glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo + glCallList(uiDisplayList); // tylko dla siatki + glMaterialfv(GL_FRONT, GL_EMISSION, emm2); + } + else + glCallList(uiDisplayList); // tylko dla siatki + } + } + else if (eType == TP_FREESPOTLIGHT) + { // wersja DL + matrix4x4 mat; // macierz opisuje układ renderowania względem kamery + glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); + // kąt między kierunkiem światła a współrzędnymi kamery + vector3 gdzie = mat * vector3(0, 0, 0); // pozycja punktu świecącego względem kamery + fCosViewAngle = DotProduct(Normalize(mat * vector3(0, 0, 1) - gdzie), Normalize(gdzie)); + if (fCosViewAngle > fCosFalloffAngle) // kąt większy niż maksymalny stożek swiatła + { + double Distdimm = 1.0; + if (fCosViewAngle < + fCosHotspotAngle) // zmniejszona jasność między Hotspot a Falloff + if (fCosFalloffAngle < fCosHotspotAngle) + Distdimm = 1.0 - + (fCosHotspotAngle - fCosViewAngle) / + (fCosHotspotAngle - fCosFalloffAngle); + glColor3f(f4Diffuse[0] * Distdimm, f4Diffuse[1] * Distdimm, + f4Diffuse[2] * Distdimm); + /* TODO: poprawic to zeby dzialalo + if (iFarAttenDecay>0) + switch (iFarAttenDecay) + { + case 1: + Distdimm=fFarDecayRadius/(1+sqrt(fSquareDist)); + //dorobic od kata + break; + case 2: + Distdimm=fFarDecayRadius/(1+fSquareDist); + //dorobic od kata + break; + } + if (Distdimm>1) + Distdimm=1; + glColor3f(Diffuse[0]*Distdimm,Diffuse[1]*Distdimm,Diffuse[2]*Distdimm); + */ + // glPopMatrix(); + // return; + glCallList(uiDisplayList); // wyświetlenie warunkowe + } + } + else if (eType == TP_STARS) + { + // glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty swiecace sie + // blendowaly + if (Global::fLuminance < fLight) + { + glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo + glCallList(uiDisplayList); // narysuj naraz wszystkie punkty z DL + glMaterialfv(GL_FRONT, GL_EMISSION, emm2); + } + } + if (Child != NULL) + if (iAlpha & iFlags & 0x001F0000) + Child->RenderDL(); + if (iFlags & 0xC000) + glPopMatrix(); + } + if (b_Anim < at_SecondsJump) + b_Anim = at_None; // wyłączenie animacji dla kolejnego użycia subm + if (Next) + if (iAlpha & iFlags & 0x1F000000) + Next->RenderDL(); // dalsze rekurencyjnie }; // Render void TSubModel::RenderAlphaDL() { // renderowanie przezroczystych przez DL - if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) - { - if (iFlags & 0xC000) - { - glPushMatrix(); - if (fMatrix) - glMultMatrixf(fMatrix->readArray()); - if (b_aAnim) - RaAnimation(b_aAnim); - } - if (eType < TP_ROTATOR) - { // renderowanie obiektów OpenGL - if (iAlpha & iFlags & 0x2F) // rysuj gdy element przezroczysty - { - if (TextureID < 0) // && (ReplacableSkinId!=0)) - { // zmienialne skóry - TextureManager.Bind(ReplacableSkinId[-TextureID]); - // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury - } - else - TextureManager.Bind(TextureID); // również 0 - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glCallList(uiDisplayList); // tylko dla siatki - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - else - glCallList(uiDisplayList); // tylko dla siatki - } - } - else if (eType == TP_FREESPOTLIGHT) - { - // dorobić aureolę! - } - if (Child != NULL) - if (eType == TP_TEXT) - { // tekst renderujemy w specjalny sposób, zamiast - // submodeli z łańcucha Child - size_t i, j = pasText->size(); - TSubModel *p; - if (!smLetter) - { // jeśli nie ma tablicy, to ją stworzyć; miejsce - // nieodpowiednie, ale tymczasowo - // może być - smLetter = new TSubModel *[256]; // tablica wskaźników submodeli dla - // wyświetlania tekstu - ZeroMemory(smLetter, 256 * sizeof(TSubModel *)); // wypełnianie zerami - p = Child; - while (p) - { - smLetter[*p->pName] = p; - p = p->Next; // kolejny znak - } - } - for (i = 1; i <= j; ++i) - { - p = smLetter[(*pasText)[i]]; // znak do wyświetlenia - if (p) - { // na razie tylko jako przezroczyste - p->RenderAlphaDL(); - if (p->fMatrix) - glMultMatrixf(p->fMatrix->readArray()); // przesuwanie widoku - } - } - } - else if (iAlpha & iFlags & 0x002F0000) - Child->RenderAlphaDL(); - if (iFlags & 0xC000) - glPopMatrix(); - } - if (b_aAnim < at_SecondsJump) - b_aAnim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu - if (Next != NULL) - if (iAlpha & iFlags & 0x2F000000) - Next->RenderAlphaDL(); + if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) + { + if (iFlags & 0xC000) + { + glPushMatrix(); + if (fMatrix) + glMultMatrixf(fMatrix->readArray()); + if (b_aAnim) + RaAnimation(b_aAnim); + } + if (eType < TP_ROTATOR) + { // renderowanie obiektów OpenGL + if (iAlpha & iFlags & 0x2F) // rysuj gdy element przezroczysty + { + if (TextureID < 0) // && (ReplacableSkinId!=0)) + { // zmienialne skóry + TextureManager.Bind(ReplacableSkinId[-TextureID]); + // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury + } + else + TextureManager.Bind(TextureID); // również 0 + if (Global::fLuminance < fLight) + { + glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo + glCallList(uiDisplayList); // tylko dla siatki + glMaterialfv(GL_FRONT, GL_EMISSION, emm2); + } + else + glCallList(uiDisplayList); // tylko dla siatki + } + } + else if (eType == TP_FREESPOTLIGHT) + { + // dorobić aureolę! + } + if (Child != NULL) + if (eType == TP_TEXT) + { // tekst renderujemy w specjalny sposób, zamiast + // submodeli z łańcucha Child + int i, j = pasText->size(); + TSubModel *p; + if (!smLetter) + { // jeśli nie ma tablicy, to ją stworzyć; miejsce + // nieodpowiednie, ale tymczasowo + // może być + smLetter = new TSubModel *[256]; // tablica wskaźników submodeli dla + // wyświetlania tekstu + ZeroMemory(smLetter, 256 * sizeof(TSubModel *)); // wypełnianie zerami + p = Child; + while (p) + { + smLetter[*p->pName] = p; + p = p->Next; // kolejny znak + } + } + for (i = 1; i <= j; ++i) + { + p = smLetter[(*pasText)[i]]; // znak do wyświetlenia + if (p) + { // na razie tylko jako przezroczyste + p->RenderAlphaDL(); + if (p->fMatrix) + glMultMatrixf(p->fMatrix->readArray()); // przesuwanie widoku + } + } + } + else if (iAlpha & iFlags & 0x002F0000) + Child->RenderAlphaDL(); + if (iFlags & 0xC000) + glPopMatrix(); + } + if (b_aAnim < at_SecondsJump) + b_aAnim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu + if (Next != NULL) + if (iAlpha & iFlags & 0x2F000000) + Next->RenderAlphaDL(); }; // RenderAlpha void TSubModel::RenderVBO() { // główna procedura renderowania przez VBO - if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) - { - if (iFlags & 0xC000) - { - glPushMatrix(); - if (fMatrix) - glMultMatrixf(fMatrix->readArray()); - if (b_Anim) - RaAnimation(b_Anim); - } - if (eType < TP_ROTATOR) - { // renderowanie obiektów OpenGL - if (iAlpha & iFlags & 0x1F) // rysuj gdy element nieprzezroczysty - { - if (TextureID < 0) // && (ReplacableSkinId!=0)) - { // zmienialne skóry - TextureManager.Bind(ReplacableSkinId[-TextureID]); - // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury - } - else - TextureManager.Bind(TextureID); // również 0 - glColor3fv(f4Diffuse); // McZapkie-240702: zamiast ub - // glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,f4Diffuse); //to samo, - // co glColor - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glDrawArrays(eType, (GLint)iVboPtr, - iNumVerts); // narysuj naraz wszystkie trójkąty z VBO - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - else - glDrawArrays(eType, (GLint)iVboPtr, - iNumVerts); // narysuj naraz wszystkie trójkąty z VBO - } - } - else if (eType == TP_FREESPOTLIGHT) - { // wersja VBO - matrix4x4 mat; // macierz opisuje układ renderowania względem kamery - glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); - // kąt między kierunkiem światła a współrzędnymi kamery - vector3 gdzie = mat * vector3(0, 0, 0); // pozycja punktu świecącego względem kamery - fCosViewAngle = DotProduct(Normalize(mat * vector3(0, 0, 1) - gdzie), Normalize(gdzie)); - if (fCosViewAngle > fCosFalloffAngle) // kąt większy niż maksymalny stożek swiatła - { - double Distdimm = 1.0; - if (fCosViewAngle < - fCosHotspotAngle) // zmniejszona jasność między Hotspot a Falloff - if (fCosFalloffAngle < fCosHotspotAngle) - Distdimm = 1.0 - - (fCosHotspotAngle - fCosViewAngle) / - (fCosHotspotAngle - fCosFalloffAngle); + if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) + { + if (iFlags & 0xC000) + { + glPushMatrix(); + if (fMatrix) + glMultMatrixf(fMatrix->readArray()); + if (b_Anim) + RaAnimation(b_Anim); + } + if (eType < TP_ROTATOR) + { // renderowanie obiektów OpenGL + if (iAlpha & iFlags & 0x1F) // rysuj gdy element nieprzezroczysty + { + if (TextureID < 0) // && (ReplacableSkinId!=0)) + { // zmienialne skóry + TextureManager.Bind(ReplacableSkinId[-TextureID]); + // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury + } + else + TextureManager.Bind(TextureID); // również 0 + glColor3fv(f4Diffuse); // McZapkie-240702: zamiast ub + // glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,f4Diffuse); //to samo, + // co glColor + if (Global::fLuminance < fLight) + { + glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo + glDrawArrays(eType, iVboPtr, + iNumVerts); // narysuj naraz wszystkie trójkąty z VBO + glMaterialfv(GL_FRONT, GL_EMISSION, emm2); + } + else + glDrawArrays(eType, iVboPtr, + iNumVerts); // narysuj naraz wszystkie trójkąty z VBO + } + } + else if (eType == TP_FREESPOTLIGHT) + { // wersja VBO + matrix4x4 mat; // macierz opisuje układ renderowania względem kamery + glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); + // kąt między kierunkiem światła a współrzędnymi kamery + vector3 gdzie = mat * vector3(0, 0, 0); // pozycja punktu świecącego względem kamery + fCosViewAngle = DotProduct(Normalize(mat * vector3(0, 0, 1) - gdzie), Normalize(gdzie)); + if (fCosViewAngle > fCosFalloffAngle) // kąt większy niż maksymalny stożek swiatła + { + double Distdimm = 1.0; + if (fCosViewAngle < + fCosHotspotAngle) // zmniejszona jasność między Hotspot a Falloff + if (fCosFalloffAngle < fCosHotspotAngle) + Distdimm = 1.0 - + (fCosHotspotAngle - fCosViewAngle) / + (fCosHotspotAngle - fCosFalloffAngle); - /* TODO: poprawic to zeby dzialalo + /* TODO: poprawic to zeby dzialalo - 2- Inverse (Applies inverse decay. The formula is luminance=R0/R, where - R0 is - the radial source of the light if no attenuation is - used, or the Near End - value of the light if Attenuation is used. R is the - radial distance of the - illuminated surface from R0.) + 2- Inverse (Applies inverse decay. The formula is luminance=R0/R, where + R0 is + the radial source of the light if no attenuation is + used, or the Near End + value of the light if Attenuation is used. R is the + radial distance of the + illuminated surface from R0.) - 3- Inverse Square (Applies inverse-square decay. The formula for this is - (R0/R)^2. - This is actually the "real-world" decay of light, but - you might find it too dim - in the world of computer graphics.) + 3- Inverse Square (Applies inverse-square decay. The formula for this is + (R0/R)^2. + This is actually the "real-world" decay of light, but + you might find it too dim + in the world of computer graphics.) - .DecayRadius -- The distance over which the decay occurs. + .DecayRadius -- The distance over which the decay occurs. - if (iFarAttenDecay>0) - switch (iFarAttenDecay) - { - case 1: - Distdimm=fFarDecayRadius/(1+sqrt(fSquareDist)); - //dorobic od kata - break; - case 2: - Distdimm=fFarDecayRadius/(1+fSquareDist); - //dorobic od kata - break; - } - if (Distdimm>1) - Distdimm=1; + if (iFarAttenDecay>0) + switch (iFarAttenDecay) + { + case 1: + Distdimm=fFarDecayRadius/(1+sqrt(fSquareDist)); + //dorobic od kata + break; + case 2: + Distdimm=fFarDecayRadius/(1+fSquareDist); + //dorobic od kata + break; + } + if (Distdimm>1) + Distdimm=1; - */ - TextureManager.Bind(0); // nie teksturować - // glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); - // glColorMaterial(GL_FRONT,GL_EMISSION); - float color[4] = {(float)(f4Diffuse[0] * Distdimm), (float)(f4Diffuse[1] * Distdimm), - (float)(f4Diffuse[2] * Distdimm, 0)}; - // glColor3f(f4Diffuse[0]*Distdimm,f4Diffuse[1]*Distdimm,f4Diffuse[2]*Distdimm); - glColorMaterial(GL_FRONT, GL_EMISSION); - glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie - // blendowaly - glColor3fv(color); // inaczej są białe - glMaterialfv(GL_FRONT, GL_EMISSION, color); - glDrawArrays(GL_POINTS, (GLint)iVboPtr, iNumVerts); // narysuj wierzchołek z - // VBO - glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); // co ma ustawiać glColor - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); // bez tego słupy się świecą - } - } - else if (eType == TP_STARS) - { - // glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty swiecace sie - // blendowaly - if (Global::fLuminance < fLight) - { // Ra: pewnie można by to zrobić - // lepiej, bez powtarzania StartVBO() - pRoot->EndVBO(); // Ra: to też nie jest zbyt ładne - if (pRoot->StartColorVBO()) - { // wyświetlanie kolorowych punktów zamiast - // trójkątów - TextureManager.Bind(0); // tekstury nie ma - glColorMaterial(GL_FRONT, GL_EMISSION); - glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie - // blendowaly - // glMaterialfv(GL_FRONT,GL_EMISSION,f4Diffuse); //zeby swiecilo na - // kolorowo - glDrawArrays(GL_POINTS, (GLint)iVboPtr, - iNumVerts); // narysuj naraz wszystkie punkty z VBO - glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); - // glMaterialfv(GL_FRONT,GL_EMISSION,emm2); - pRoot->EndVBO(); - pRoot->StartVBO(); - } - } - } - /*Ra: tu coś jest bez sensu... - else - { - glBindTexture(GL_TEXTURE_2D, 0); - // if (eType==smt_FreeSpotLight) - // { - // if (iFarAttenDecay==0) - // glColor3f(Diffuse[0],Diffuse[1],Diffuse[2]); - // } - // else - //TODO: poprawic zeby dzialalo - glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); - glColorMaterial(GL_FRONT,GL_EMISSION); - glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty - swiecace sie blendowaly - //glBegin(GL_POINTS); - glDrawArrays(GL_POINTS,iVboPtr,iNumVerts); //narysuj - wierzchołek z VBO - // glVertex3f(0,0,0); - //glEnd(); - glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT,GL_AMBIENT_AND_DIFFUSE); - glMaterialfv(GL_FRONT,GL_EMISSION,emm2); - //glEndList(); - } - */ - if (Child != NULL) - if (iAlpha & iFlags & 0x001F0000) - Child->RenderVBO(); - if (iFlags & 0xC000) - glPopMatrix(); - } - if (b_Anim < at_SecondsJump) - b_Anim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu - if (Next) - if (iAlpha & iFlags & 0x1F000000) - Next->RenderVBO(); // dalsze rekurencyjnie + */ + TextureManager.Bind(0); // nie teksturować + // glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); + // glColorMaterial(GL_FRONT,GL_EMISSION); + float color[4] = { (float)(f4Diffuse[0] * Distdimm), (float)(f4Diffuse[1] * Distdimm), + (float)(f4Diffuse[2] * Distdimm), 0 }; + // glColor3f(f4Diffuse[0]*Distdimm,f4Diffuse[1]*Distdimm,f4Diffuse[2]*Distdimm); + glColorMaterial(GL_FRONT, GL_EMISSION); + glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie + // blendowaly + glColor3fv(color); // inaczej są białe + glMaterialfv(GL_FRONT, GL_EMISSION, color); + glDrawArrays(GL_POINTS, iVboPtr, iNumVerts); // narysuj wierzchołek z + // VBO + glEnable(GL_LIGHTING); + glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); // co ma ustawiać glColor + glMaterialfv(GL_FRONT, GL_EMISSION, emm2); // bez tego słupy się świecą + } + } + else if (eType == TP_STARS) + { + // glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty swiecace sie + // blendowaly + if (Global::fLuminance < fLight) + { // Ra: pewnie można by to zrobić + // lepiej, bez powtarzania StartVBO() + pRoot->EndVBO(); // Ra: to też nie jest zbyt ładne + if (pRoot->StartColorVBO()) + { // wyświetlanie kolorowych punktów zamiast + // trójkątów + TextureManager.Bind(0); // tekstury nie ma + glColorMaterial(GL_FRONT, GL_EMISSION); + glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie + // blendowaly + // glMaterialfv(GL_FRONT,GL_EMISSION,f4Diffuse); //zeby swiecilo na + // kolorowo + glDrawArrays(GL_POINTS, iVboPtr, + iNumVerts); // narysuj naraz wszystkie punkty z VBO + glEnable(GL_LIGHTING); + glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); + // glMaterialfv(GL_FRONT,GL_EMISSION,emm2); + pRoot->EndVBO(); + pRoot->StartVBO(); + } + } + } + /*Ra: tu coś jest bez sensu... + else + { + glBindTexture(GL_TEXTURE_2D, 0); + // if (eType==smt_FreeSpotLight) + // { + // if (iFarAttenDecay==0) + // glColor3f(Diffuse[0],Diffuse[1],Diffuse[2]); + // } + // else + //TODO: poprawic zeby dzialalo + glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); + glColorMaterial(GL_FRONT,GL_EMISSION); + glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty + swiecace sie blendowaly + //glBegin(GL_POINTS); + glDrawArrays(GL_POINTS,iVboPtr,iNumVerts); //narysuj + wierzchołek z VBO + // glVertex3f(0,0,0); + //glEnd(); + glEnable(GL_LIGHTING); + glColorMaterial(GL_FRONT,GL_AMBIENT_AND_DIFFUSE); + glMaterialfv(GL_FRONT,GL_EMISSION,emm2); + //glEndList(); + } + */ + if (Child != NULL) + if (iAlpha & iFlags & 0x001F0000) + Child->RenderVBO(); + if (iFlags & 0xC000) + glPopMatrix(); + } + if (b_Anim < at_SecondsJump) + b_Anim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu + if (Next) + if (iAlpha & iFlags & 0x1F000000) + Next->RenderVBO(); // dalsze rekurencyjnie }; // RaRender void TSubModel::RenderAlphaVBO() { // renderowanie przezroczystych przez VBO - if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) - { - if (iFlags & 0xC000) - { - glPushMatrix(); // zapamiętanie matrycy - if (fMatrix) - glMultMatrixf(fMatrix->readArray()); - if (b_aAnim) - RaAnimation(b_aAnim); - } - glColor3fv(f4Diffuse); - if (eType < TP_ROTATOR) - { // renderowanie obiektów OpenGL - if (iAlpha & iFlags & 0x2F) // rysuj gdy element przezroczysty - { - if (TextureID < 0) // && (ReplacableSkinId!=0)) - { // zmienialne skory - TextureManager.Bind(ReplacableSkinId[-TextureID]); - // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury - } - else - TextureManager.Bind(TextureID); // również 0 - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glDrawArrays(eType, (GLint)iVboPtr, - iNumVerts); // narysuj naraz wszystkie trójkąty z VBO - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - else - glDrawArrays(eType, (GLint)iVboPtr, - iNumVerts); // narysuj naraz wszystkie trójkąty z VBO - } - } - else if (eType == TP_FREESPOTLIGHT) - { - // dorobić aureolę! - } - if (Child) - if (iAlpha & iFlags & 0x002F0000) - Child->RenderAlphaVBO(); - if (iFlags & 0xC000) - glPopMatrix(); - } - if (b_aAnim < at_SecondsJump) - b_aAnim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu - if (Next) - if (iAlpha & iFlags & 0x2F000000) - Next->RenderAlphaVBO(); + if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) + { + if (iFlags & 0xC000) + { + glPushMatrix(); // zapamiętanie matrycy + if (fMatrix) + glMultMatrixf(fMatrix->readArray()); + if (b_aAnim) + RaAnimation(b_aAnim); + } + glColor3fv(f4Diffuse); + if (eType < TP_ROTATOR) + { // renderowanie obiektów OpenGL + if (iAlpha & iFlags & 0x2F) // rysuj gdy element przezroczysty + { + if (TextureID < 0) // && (ReplacableSkinId!=0)) + { // zmienialne skory + TextureManager.Bind(ReplacableSkinId[-TextureID]); + // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury + } + else + TextureManager.Bind(TextureID); // również 0 + if (Global::fLuminance < fLight) + { + glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo + glDrawArrays(eType, iVboPtr, + iNumVerts); // narysuj naraz wszystkie trójkąty z VBO + glMaterialfv(GL_FRONT, GL_EMISSION, emm2); + } + else + glDrawArrays(eType, iVboPtr, + iNumVerts); // narysuj naraz wszystkie trójkąty z VBO + } + } + else if (eType == TP_FREESPOTLIGHT) + { + // dorobić aureolę! + } + if (Child) + if (iAlpha & iFlags & 0x002F0000) + Child->RenderAlphaVBO(); + if (iFlags & 0xC000) + glPopMatrix(); + } + if (b_aAnim < at_SecondsJump) + b_aAnim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu + if (Next) + if (iAlpha & iFlags & 0x2F000000) + Next->RenderAlphaVBO(); }; // RaRenderAlpha -//--------------------------------------------------------------------------- + //--------------------------------------------------------------------------- void TSubModel::RaArrayFill(CVertNormTex *Vert) { // wypełnianie tablic VBO - if (Child) - Child->RaArrayFill(Vert); - if ((eType < TP_ROTATOR) || (eType == TP_STARS)) - for (int i = 0; i < iNumVerts; ++i) - { - Vert[iVboPtr + i].x = Vertices[i].Point.x; - Vert[iVboPtr + i].y = Vertices[i].Point.y; - Vert[iVboPtr + i].z = Vertices[i].Point.z; - Vert[iVboPtr + i].nx = Vertices[i].Normal.x; - Vert[iVboPtr + i].ny = Vertices[i].Normal.y; - Vert[iVboPtr + i].nz = Vertices[i].Normal.z; - Vert[iVboPtr + i].u = Vertices[i].tu; - Vert[iVboPtr + i].v = Vertices[i].tv; - } - else if (eType == TP_FREESPOTLIGHT) - Vert[iVboPtr].x = Vert[iVboPtr].y = Vert[iVboPtr].z = 0.0; - if (Next) - Next->RaArrayFill(Vert); + if (Child) + Child->RaArrayFill(Vert); + if ((eType < TP_ROTATOR) || (eType == TP_STARS)) + for (int i = 0; i < iNumVerts; ++i) + { + Vert[iVboPtr + i].x = Vertices[i].Point.x; + Vert[iVboPtr + i].y = Vertices[i].Point.y; + Vert[iVboPtr + i].z = Vertices[i].Point.z; + Vert[iVboPtr + i].nx = Vertices[i].Normal.x; + Vert[iVboPtr + i].ny = Vertices[i].Normal.y; + Vert[iVboPtr + i].nz = Vertices[i].Normal.z; + Vert[iVboPtr + i].u = Vertices[i].tu; + Vert[iVboPtr + i].v = Vertices[i].tv; + } + else if (eType == TP_FREESPOTLIGHT) + Vert[iVboPtr].x = Vert[iVboPtr].y = Vert[iVboPtr].z = 0.0; + if (Next) + Next->RaArrayFill(Vert); }; void TSubModel::Info() { // zapisanie informacji o submodelu do obiektu - // pomocniczego - TSubModelInfo *info = TSubModelInfo::pTable + TSubModelInfo::iCurrent; - info->pSubModel = this; - if (fMatrix && (iFlags & 0x8000)) // ma matrycę i jest ona niejednostkowa - info->iTransform = info->iTotalTransforms++; - if (TextureID > 0) - { // jeśli ma teksturę niewymienną - for (int i = 0; i < info->iCurrent; ++i) - if (TextureID == info->pTable[i].pSubModel->TextureID) // porównanie z wcześniejszym - { - info->iTexture = info->pTable[i].iTexture; // taki jaki już był - break; // koniec sprawdzania - } - if (info->iTexture < 0) // jeśli nie znaleziono we wcześniejszych - { - info->iTexture = ++info->iTotalTextures; // przydzielenie numeru tekstury - // w pliku (od 1) - std::string t(pTexture); - // trim extension - size_t kropka = t.rfind('.'); - if (kropka != std::string::npos && - (t.substr(kropka) == ".tga" || t.substr(kropka) == ".dds")) - { - t.erase(t.rfind('.')); - } - if (t != std::string(pTexture)) - { // jeśli się zmieniło - // pName=new char[token.length()+1]; //nie ma sensu skracać tabeli - strcpy(pTexture, t.c_str()); - } - info->iTextureLen = (int)(t.size() + 1); // przygotowanie do zapisania, z zerem na końcu - } - } - else - info->iTexture = TextureID; // nie ma albo wymienna - // if (asName.Length()) - if (pName) - { - info->iName = info->iTotalNames++; // przydzielenie numeru nazwy w pliku (od 0) - info->iNameLen = (int)(strlen(pName) + 1); // z zerem na końcu - } - ++info->iCurrent; // przejście do kolejnego obiektu pomocniczego - if (Child) - { - info->iChild = info->iCurrent; - Child->Info(); - } - if (Next) - { - info->iNext = info->iCurrent; - Next->Info(); - } + // pomocniczego + TSubModelInfo *info = TSubModelInfo::pTable + TSubModelInfo::iCurrent; + info->pSubModel = this; + if (fMatrix && (iFlags & 0x8000)) // ma matrycę i jest ona niejednostkowa + info->iTransform = info->iTotalTransforms++; + if (TextureID > 0) + { // jeśli ma teksturę niewymienną + for (int i = 0; i < info->iCurrent; ++i) + if (TextureID == info->pTable[i].pSubModel->TextureID) // porównanie z wcześniejszym + { + info->iTexture = info->pTable[i].iTexture; // taki jaki już był + break; // koniec sprawdzania + } + if (info->iTexture < 0) // jeśli nie znaleziono we wcześniejszych + { + info->iTexture = ++info->iTotalTextures; // przydzielenie numeru tekstury + // w pliku (od 1) + std::string t(pTexture); + // trim extension + size_t kropka = t.rfind('.'); + if (kropka != std::string::npos && + (t.substr(kropka) == ".tga" || t.substr(kropka) == ".dds")) + { + t.erase(t.rfind('.')); + } + if (t != std::string(pTexture)) + { // jeśli się zmieniło + // pName=new char[token.length()+1]; //nie ma sensu skracać tabeli + strcpy(pTexture, t.c_str()); + } + info->iTextureLen = t.size() + 1; // przygotowanie do zapisania, z zerem na końcu + } + } + else + info->iTexture = TextureID; // nie ma albo wymienna + // if (asName.Length()) + if (pName) + { + info->iName = info->iTotalNames++; // przydzielenie numeru nazwy w pliku (od 0) + info->iNameLen = strlen(pName) + 1; // z zerem na końcu + } + ++info->iCurrent; // przejście do kolejnego obiektu pomocniczego + if (Child) + { + info->iChild = info->iCurrent; + Child->Info(); + } + if (Next) + { + info->iNext = info->iCurrent; + Next->Info(); + } }; void TSubModel::InfoSet(TSubModelInfo *info) { // ustawienie danych wg obiektu - // pomocniczego do zapisania w - // pliku - int ile = (char *)&uiDisplayList - (char *)&eType; // ilość bajtów pomiędzy tymi zmiennymi - ZeroMemory(this, sizeof(TSubModel)); // zerowaie całości - CopyMemory(this, info->pSubModel, ile); // skopiowanie pamięci 1:1 - iTexture = info->iTexture; // numer nazwy tekstury, a nie numer w OpenGL - TextureID = info->iTexture; // numer tekstury w OpenGL - iName = info->iName; // numer nazwy w obszarze nazw - iMatrix = info->iTransform; // numer macierzy - Next = (TSubModel *)info->iNext; // numer następnego - Child = (TSubModel *)info->iChild; // numer potomnego - iFlags &= ~0x200; // nie jest wczytany z tekstowego - // asTexture=asName=""; - pTexture = pName = NULL; + // pomocniczego do zapisania w + // pliku + int ile = (char *)&uiDisplayList - (char *)&eType; // ilość bajtów pomiędzy tymi zmiennymi + ZeroMemory(this, sizeof(TSubModel)); // zerowaie całości + CopyMemory(this, info->pSubModel, ile); // skopiowanie pamięci 1:1 + iTexture = info->iTexture; // numer nazwy tekstury, a nie numer w OpenGL + TextureID = info->iTexture; // numer tekstury w OpenGL + iName = info->iName; // numer nazwy w obszarze nazw + iMatrix = info->iTransform; // numer macierzy + Next = (TSubModel *)info->iNext; // numer następnego + Child = (TSubModel *)info->iChild; // numer potomnego + iFlags &= ~0x200; // nie jest wczytany z tekstowego + // asTexture=asName=""; + pTexture = pName = NULL; }; void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, TStringPack *t, TStringPack *n, - bool dynamic) + bool dynamic) { // ustawienie wskaźników w submodelu - iVisible = 1; // tymczasowo używane - Child = ((size_t)Child > 0) ? s + (size_t)Child : NULL; // zerowy nie może być potomnym - Next = ((size_t)Next > 0) ? s + (size_t)Next : NULL; // zerowy nie może być następnym - fMatrix = ((iMatrix >= 0) && m) ? m + iMatrix : NULL; - // if (n&&(iName>=0)) asName=AnsiString(n->String(iName)); else asName=""; - if (n && (iName >= 0)) - { - pName = n->String(iName); - std::string name(pName); - if (false == name.empty()) - { // jeśli dany submodel jest zgaszonym światłem, to - // domyślnie go ukrywamy - if ((name.size() >= 8) && (name.substr(0, 8) == "Light_On")) - { // jeśli jest światłem numerowanym - iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z - } - // obiektem "Light_Off" - else if (dynamic) - { // inaczej wyłączało smugę w latarniach - if ((name.size() >= 3) && (name.substr(name.size() - 3, 3) == "_on")) - { // jeśli jest kontrolką w stanie zapalonym - iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z - } - } - // obiektem "_off" - } - } - else - pName = NULL; - if (iTexture > 0) - { // obsługa stałej tekstury - // TextureID=TTexturesManager::GetTextureID(t->String(TextureID)); - // asTexture=AnsiString(t->String(iTexture)); - pTexture = t->String(iTexture); - std::string tex = pTexture; - if (tex.find_last_of("/\\") == std::string::npos) - tex.insert(0, Global::asCurrentTexturePath); - TextureID = TextureManager.GetTextureId( tex, szTexturePath ); - // TexAlpha=TTexturesManager::GetAlpha(TextureID); //zmienna robocza - // ustawienie cyklu przezroczyste/nieprzezroczyste zależnie od własności - // stałej tekstury - // iFlags=(iFlags&~0x30)|(TTexturesManager::GetAlpha(TextureID)?0x20:0x10); - // //0x10-nieprzezroczysta, 0x20-przezroczysta - if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity 0! - iFlags |= TextureManager.Texture(TextureID).has_alpha ? - 0x20 : - 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta - else - iFlags |= 0x10; // normalnie nieprzezroczyste - } - b_aAnim = b_Anim; // skopiowanie animacji do drugiego cyklu - iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem - // tablic) - Vertices = v + iVboPtr; - // if (!iNumVerts) eType=-1; //tymczasowo zmiana typu, żeby się nie - // renderowało na siłę + iVisible = 1; // tymczasowo używane + Child = ((int)Child > 0) ? s + (int)Child : NULL; // zerowy nie może być potomnym + Next = ((int)Next > 0) ? s + (int)Next : NULL; // zerowy nie może być następnym + fMatrix = ((iMatrix >= 0) && m) ? m + iMatrix : NULL; + // if (n&&(iName>=0)) asName=AnsiString(n->String(iName)); else asName=""; + if (n && (iName >= 0)) + { + pName = n->String(iName); + std::string name(pName); + if (false == name.empty()) + { // jeśli dany submodel jest zgaszonym światłem, to + // domyślnie go ukrywamy + if ((name.size() >= 8) && (name.substr(0, 8) == "Light_On")) + { // jeśli jest światłem numerowanym + iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z + } + // obiektem "Light_Off" + else if (dynamic) + { // inaczej wyłączało smugę w latarniach + if ((name.size() >= 3) && (name.substr(name.size() - 3, 3) == "_on")) + { // jeśli jest kontrolką w stanie zapalonym + iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z + } + } + // obiektem "_off" + } + } + else + pName = NULL; + if (iTexture > 0) + { // obsługa stałej tekstury + // TextureID=TTexturesManager::GetTextureID(t->String(TextureID)); + // asTexture=AnsiString(t->String(iTexture)); + pTexture = t->String(iTexture); + std::string tex = pTexture; + if (tex.find_last_of("/\\") == std::string::npos) + tex.insert(0, Global::asCurrentTexturePath); + TextureID = TextureManager.GetTextureId(tex, szTexturePath); + // TexAlpha=TTexturesManager::GetAlpha(TextureID); //zmienna robocza + // ustawienie cyklu przezroczyste/nieprzezroczyste zależnie od własności + // stałej tekstury + // iFlags=(iFlags&~0x30)|(TTexturesManager::GetAlpha(TextureID)?0x20:0x10); + // //0x10-nieprzezroczysta, 0x20-przezroczysta + if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity 0! + iFlags |= TextureManager.Texture(TextureID).has_alpha ? + 0x20 : + 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta + else + iFlags |= 0x10; // normalnie nieprzezroczyste + } + b_aAnim = b_Anim; // skopiowanie animacji do drugiego cyklu + iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem + // tablic) + Vertices = v + iVboPtr; + // if (!iNumVerts) eType=-1; //tymczasowo zmiana typu, żeby się nie + // renderowało na siłę }; void TSubModel::AdjustDist() { // aktualizacja odległości faz LoD, zależna od - // rozdzielczości pionowej oraz multisamplingu - if (fSquareMaxDist > 0.0) - fSquareMaxDist *= Global::fDistanceFactor; - if (fSquareMinDist > 0.0) - fSquareMinDist *= Global::fDistanceFactor; - // if (fNearAttenStart>0.0) fNearAttenStart*=Global::fDistanceFactor; - // if (fNearAttenEnd>0.0) fNearAttenEnd*=Global::fDistanceFactor; - if (Child) - Child->AdjustDist(); - if (Next) - Next->AdjustDist(); + // rozdzielczości pionowej oraz multisamplingu + if (fSquareMaxDist > 0.0) + fSquareMaxDist *= Global::fDistanceFactor; + if (fSquareMinDist > 0.0) + fSquareMinDist *= Global::fDistanceFactor; + // if (fNearAttenStart>0.0) fNearAttenStart*=Global::fDistanceFactor; + // if (fNearAttenEnd>0.0) fNearAttenEnd*=Global::fDistanceFactor; + if (Child) + Child->AdjustDist(); + if (Next) + Next->AdjustDist(); }; void TSubModel::ColorsSet(int *a, int *d, int *s) { // ustawienie kolorów dla modelu terenu - int i; - if (a) - for (i = 0; i < 4; ++i) - f4Ambient[i] = a[i] / 255.0; - if (d) - for (i = 0; i < 4; ++i) - f4Diffuse[i] = d[i] / 255.0; - if (s) - for (i = 0; i < 4; ++i) - f4Specular[i] = s[i] / 255.0; + int i; + if (a) + for (i = 0; i < 4; ++i) + f4Ambient[i] = a[i] / 255.0; + if (d) + for (i = 0; i < 4; ++i) + f4Diffuse[i] = d[i] / 255.0; + if (s) + for (i = 0; i < 4; ++i) + f4Specular[i] = s[i] / 255.0; }; void TSubModel::ParentMatrix(float4x4 *m) { // pobranie transformacji względem wstawienia modelu - // jeśli nie zostało wykonane Init() (tzn. zaraz po wczytaniu T3D), to - // dodatkowy obrót - // obrót T3D jest wymagany np. do policzenia wysokości pantografów - *m = float4x4(*fMatrix); // skopiowanie, bo będziemy mnożyć - // m(3)[1]=m[3][1]+0.054; //w górę o wysokość ślizgu (na razie tak) - TSubModel *sm = this; - while (sm->Parent) - { // przenieść tę funkcję do modelu - if (sm->Parent->GetMatrix()) - *m = *sm->Parent->GetMatrix() * *m; - sm = sm->Parent; - } - // dla ostatniego może być potrzebny dodatkowy obrót, jeśli wczytano z T3D, a - // nie obrócono jeszcze + // jeśli nie zostało wykonane Init() (tzn. zaraz po wczytaniu T3D), to + // dodatkowy obrót + // obrót T3D jest wymagany np. do policzenia wysokości pantografów + *m = float4x4(*fMatrix); // skopiowanie, bo będziemy mnożyć + // m(3)[1]=m[3][1]+0.054; //w górę o wysokość ślizgu (na razie tak) + TSubModel *sm = this; + while (sm->Parent) + { // przenieść tę funkcję do modelu + if (sm->Parent->GetMatrix()) + *m = *sm->Parent->GetMatrix() * *m; + sm = sm->Parent; + } + // dla ostatniego może być potrzebny dodatkowy obrót, jeśli wczytano z T3D, a + // nie obrócono jeszcze }; float TSubModel::MaxY(const float4x4 &m) { // obliczenie maksymalnej wysokości, - // na początek ślizgu w pantografie - if (eType != 4) - return 0; // tylko dla trójkątów liczymy - if (iNumVerts < 1) - return 0; - if (!Vertices) - return 0; - float y, - my = m[0][1] * Vertices[0].Point.x + m[1][1] * Vertices[0].Point.y + - m[2][1] * Vertices[0].Point.z + m[3][1]; - for (int i = 1; i < iNumVerts; ++i) - { - y = m[0][1] * Vertices[i].Point.x + m[1][1] * Vertices[i].Point.y + - m[2][1] * Vertices[i].Point.z + m[3][1]; - if (my < y) - my = y; - } - return my; + // na początek ślizgu w pantografie + if (eType != 4) + return 0; // tylko dla trójkątów liczymy + if (iNumVerts < 1) + return 0; + if (!Vertices) + return 0; + float y, + my = m[0][1] * Vertices[0].Point.x + m[1][1] * Vertices[0].Point.y + + m[2][1] * Vertices[0].Point.z + m[3][1]; + for (int i = 1; i < iNumVerts; ++i) + { + y = m[0][1] * Vertices[i].Point.x + m[1][1] * Vertices[i].Point.y + + m[2][1] * Vertices[i].Point.z + m[3][1]; + if (my < y) + my = y; + } + return my; }; //--------------------------------------------------------------------------- TModel3d::TModel3d() { - // Materials=NULL; - // MaterialsCount=0; - Root = NULL; - iFlags = 0; - iSubModelsCount = 0; - iModel = NULL; // tylko jak wczytany model binarny - iNumVerts = 0; // nie ma jeszcze wierzchołków + // Materials=NULL; + // MaterialsCount=0; + Root = NULL; + iFlags = 0; + iSubModelsCount = 0; + iModel = NULL; // tylko jak wczytany model binarny + iNumVerts = 0; // nie ma jeszcze wierzchołków }; /* - TModel3d::TModel3d(char *FileName) +TModel3d::TModel3d(char *FileName) { // Root=NULL; // Materials=NULL; // MaterialsCount=0; - Root=NULL; - SubModelsCount=0; - iFlags=0; - LoadFromFile(FileName); +Root=NULL; +SubModelsCount=0; +iFlags=0; +LoadFromFile(FileName); }; */ TModel3d::~TModel3d() { - // SafeDeleteArray(Materials); - if (iFlags & 0x0200) - { // wczytany z pliku tekstowego, submodele sprzątają - // same - SafeDelete(Root); // submodele się usuną rekurencyjnie - } - else - { // wczytano z pliku binarnego (jest właścicielem tablic) - m_pVNT = NULL; // nie usuwać tego, bo wskazuje na iModel - Root = NULL; - delete[] iModel; // usuwamy cały wczytany plik i to wystarczy - } - // później się jeszcze usuwa obiekt z którego dziedziczymy tabelę VBO + // SafeDeleteArray(Materials); + if (iFlags & 0x0200) + { // wczytany z pliku tekstowego, submodele sprzątają + // same + SafeDelete(Root); // submodele się usuną rekurencyjnie + } + else + { // wczytano z pliku binarnego (jest właścicielem tablic) + m_pVNT = NULL; // nie usuwać tego, bo wskazuje na iModel + Root = NULL; + delete[] iModel; // usuwamy cały wczytany plik i to wystarczy + } + // później się jeszcze usuwa obiekt z którego dziedziczymy tabelę VBO }; TSubModel *TModel3d::AddToNamed(const char *Name, TSubModel *SubModel) { - TSubModel *sm = Name ? GetFromName(Name) : NULL; - AddTo(sm, SubModel); // szukanie nadrzędnego - return sm; // zwracamy wskaźnik do nadrzędnego submodelu + TSubModel *sm = Name ? GetFromName(Name) : NULL; + AddTo(sm, SubModel); // szukanie nadrzędnego + return sm; // zwracamy wskaźnik do nadrzędnego submodelu }; void TModel3d::AddTo(TSubModel *tmp, TSubModel *SubModel) { // jedyny poprawny sposób dodawania - // submodeli, inaczej mogą zginąć - // przy zapisie E3D - if (tmp) - { // jeśli znaleziony, podłączamy mu jako potomny - tmp->ChildAdd(SubModel); - } - else - { // jeśli nie znaleziony, podczepiamy do łańcucha głównego - SubModel->NextAdd(Root); // Ra: zmiana kolejności renderowania wymusza zmianę tu - Root = SubModel; - } - ++iSubModelsCount; // teraz jest o 1 submodel więcej - iFlags |= 0x0200; // submodele są oddzielne + // submodeli, inaczej mogą zginąć + // przy zapisie E3D + if (tmp) + { // jeśli znaleziony, podłączamy mu jako potomny + tmp->ChildAdd(SubModel); + } + else + { // jeśli nie znaleziony, podczepiamy do łańcucha głównego + SubModel->NextAdd(Root); // Ra: zmiana kolejności renderowania wymusza zmianę tu + Root = SubModel; + } + ++iSubModelsCount; // teraz jest o 1 submodel więcej + iFlags |= 0x0200; // submodele są oddzielne }; TSubModel *TModel3d::GetFromName(const char *sName) { // wyszukanie submodelu po nazwie - if (!sName) - return Root; // potrzebne do terenu z E3D - if (iFlags & 0x0200) // wczytany z pliku tekstowego, wyszukiwanie rekurencyjne - return Root ? Root->GetFromName(sName) : NULL; - else // wczytano z pliku binarnego, można wyszukać iteracyjnie - { - // for (int i=0;iGetFromName(sName) : NULL; - } + if (!sName) + return Root; // potrzebne do terenu z E3D + if (iFlags & 0x0200) // wczytany z pliku tekstowego, wyszukiwanie rekurencyjne + return Root ? Root->GetFromName(sName) : NULL; + else // wczytano z pliku binarnego, można wyszukać iteracyjnie + { + // for (int i=0;iGetFromName(sName) : NULL; + } }; /* TMaterial* TModel3d::GetMaterialFromName(char *sName) { - AnsiString tmp=AnsiString(sName).Trim(); - for (int i=0; i 0) : false; // brak pliku albo problem z wczytaniem - if (false == result) - { - ErrorLog("Failed to load 3d model \"" + FileName + "\""); - } - return result; + asBinary = name + ".e3d"; + if (FileExists(asBinary)) + { + LoadFromBinFile(asBinary, dynamic); + asBinary = ""; // wyłączenie zapisu + Init(); + } + else + { + if (FileExists(name + ".t3d")) + { + LoadFromTextFile(FileName, dynamic); // wczytanie tekstowego + if (!dynamic) // pojazdy dopiero po ustawieniu animacji + Init(); // generowanie siatek i zapis E3D + } + } + bool const result = + Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem + if (false == result) + { + ErrorLog("Failed to load 3d model \"" + FileName + "\""); + } + return result; }; void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) { // wczytanie modelu z pliku binarnego - if (sizeof(TSubModel) != 256) - { - std::cout << "E3D files unsupported in current build" << std::endl; - exit(-1); + WriteLog("Loading - binary model: " + FileName); + int i = 0, j, k, ch, size; + + /* TFileStream *fs = new TFileStream(AnsiString(FileName), fmOpenRead); + size = fs->Size >> 2; + iModel = new int[size]; // ten wskaźnik musi być w modelu, aby zwolnić pamięć + fs->Read(iModel, fs->Size); // wczytanie pliku + delete fs; + */ { + std::ifstream file(FileName, std::ios::binary | std::ios::ate); + file.unsetf(std::ios::skipws); + size = file.tellg(); // ios::ate already positioned us at the end of the file + iModel = new int[size >> 2]; // ten wskaźnik musi być w modelu, aby zwolnić pamięć + file.seekg(0, std::ios::beg); // rewind the caret afterwards + file.read(reinterpret_cast(iModel), size); } - - WriteLog("Loading - binary model: " + FileName); - int i = 0, j, k, ch, size; - - /* TFileStream *fs = new TFileStream(AnsiString(FileName), fmOpenRead); - size = fs->Size >> 2; - iModel = new int[size]; // ten wskaźnik musi być w modelu, aby zwolnić pamięć - fs->Read(iModel, fs->Size); // wczytanie pliku - delete fs; -*/ { - std::ifstream file(FileName, std::ios::binary | std::ios::ate); - file.unsetf(std::ios::skipws); - size = file.tellg(); // ios::ate already positioned us at the end of the file - iModel = new int[size >> 2]; // ten wskaźnik musi być w modelu, aby zwolnić pamięć - file.seekg(0, std::ios::beg); // rewind the caret afterwards - file.read(reinterpret_cast(iModel), size); - } - float4x4 *m = NULL; // transformy - // zestaw kromek: - while ((i << 2) < size) // w pliku może być kilka modeli - { - ch = iModel[i]; // nazwa kromki - j = i + (iModel[i + 1] >> 2); // początek następnej kromki - if (ch == MAKE_ID4('E', '3', 'D', '0')) // główna: 'E3D0',len,pod-kromki - { // tylko tę kromkę znamy, może kiedyś jeszcze DOF się zrobi - i += 2; - while (i < j) - { // przetwarzanie kromek wewnętrznych - ch = iModel[i]; // nazwa kromki - k = (iModel[i + 1] >> 2); // długość aktualnej kromki - switch (ch) - { - case MAKE_ID4('M', 'D', 'L', - '0'): // zmienne modelu: 'E3D0',len,(informacje o modelu) - break; - case MAKE_ID4('V', 'N', 'T', - '0'): // wierzchołki: 'VNT0',len,(32 bajty na wierzchołek) - iNumVerts = (k - 2) >> 3; - m_nVertexCount = iNumVerts; - m_pVNT = (CVertNormTex *)(iModel + i + 2); - break; - case MAKE_ID4('S', 'U', 'B', '0'): // submodele: 'SUB0',len,(256 bajtów na submodel) - iSubModelsCount = (k - 2) / 64; - Root = - (TSubModel *)(iModel + i + 2); // numery na wskaźniki przetworzymy później - break; - case MAKE_ID4('S', 'U', 'B', '1'): // submodele: 'SUB1',len,(320 bajtów na submodel) - iSubModelsCount = (k - 2) / 80; - Root = - (TSubModel *)(iModel + i + 2); // numery na wskaźniki przetworzymy później - for (ch = 1; ch < iSubModelsCount; - ++ch) // trzeba przesunąć bliżej, bo 256 wystarczy - MoveMemory(((char *)Root) + 256 * ch, ((char *)Root) + 320 * ch, 256); - break; - case MAKE_ID4('T', 'R', 'A', '0'): // transformy: 'TRA0',len,(64 bajty na transform) - m = (float4x4 *)(iModel + i + 2); // tabela transformów - break; - case MAKE_ID4('T', 'R', 'A', - '1'): // transformy: 'TRA1',len,(128 bajtów na transform) - m = (float4x4 *)(iModel + i + 2); // tabela transformów - for (ch = 0; ch < ((k - 2) >> 1); ++ch) - *(((float *)m) + ch) = *(((double *)m) + ch); // przepisanie double do float - break; - case MAKE_ID4('I', 'D', 'X', - '1'): // indeksy 1B: 'IDX2',len,(po bajcie na numer wierzchołka) - break; - case MAKE_ID4('I', 'D', 'X', - '2'): // indeksy 2B: 'IDX2',len,(po 2 bajty na numer wierzchołka) - break; - case MAKE_ID4('I', 'D', 'X', - '4'): // indeksy 4B: 'IDX4',len,(po 4 bajty na numer wierzchołka) - break; - case MAKE_ID4('T', 'E', 'X', - '0'): // tekstury: 'TEX0',len,(łańcuchy zakończone zerem - pliki - // tekstur) - Textures.Init((char *)(iModel + i)); //łącznie z nagłówkiem - break; - case MAKE_ID4('T', 'I', 'X', '0'): // indeks nazw tekstur - Textures.InitIndex((int *)(iModel + i)); //łącznie z nagłówkiem - break; - case MAKE_ID4('N', 'A', 'M', - '0'): // nazwy: 'NAM0',len,(łańcuchy zakończone zerem - nazwy - // submodeli) - Names.Init((char *)(iModel + i)); //łącznie z nagłówkiem - break; - case MAKE_ID4('N', 'I', 'X', '0'): // indeks nazw submodeli - Names.InitIndex((int *)(iModel + i)); //łącznie z nagłówkiem - break; - } - i += k; // przejście do kolejnej kromki - } - } - i = j; - } - for (i = 0; i < iSubModelsCount; ++i) - { // aktualizacja wskaźników w submodelach - Root[i].BinInit(Root, m, (float8 *)m_pVNT, &Textures, &Names, dynamic); - if (Root[i].ChildGet()) - Root[i].ChildGet()->Parent = Root + i; // wpisanie wskaźnika nadrzędnego do potmnego - if (Root[i].NextGet()) - Root[i].NextGet()->Parent = - Root[i].Parent; // skopiowanie wskaźnika nadrzędnego do kolejnego - } - iFlags &= ~0x0200; - return; + float4x4 *m = NULL; // transformy + // zestaw kromek: + while ((i << 2) < size) // w pliku może być kilka modeli + { + ch = iModel[i]; // nazwa kromki + j = i + (iModel[i + 1] >> 2); // początek następnej kromki + if (ch == MAKE_ID4('E', '3', 'D', '0')) // główna: 'E3D0',len,pod-kromki + { // tylko tę kromkę znamy, może kiedyś jeszcze DOF się zrobi + i += 2; + while (i < j) + { // przetwarzanie kromek wewnętrznych + ch = iModel[i]; // nazwa kromki + k = (iModel[i + 1] >> 2); // długość aktualnej kromki + switch (ch) + { + case MAKE_ID4('M', 'D', 'L', + '0'): // zmienne modelu: 'E3D0',len,(informacje o modelu) + break; + case MAKE_ID4('V', 'N', 'T', + '0'): // wierzchołki: 'VNT0',len,(32 bajty na wierzchołek) + iNumVerts = (k - 2) >> 3; + m_nVertexCount = iNumVerts; + m_pVNT = (CVertNormTex *)(iModel + i + 2); + break; + case MAKE_ID4('S', 'U', 'B', '0'): // submodele: 'SUB0',len,(256 bajtów na submodel) + iSubModelsCount = (k - 2) / 64; + Root = + (TSubModel *)(iModel + i + 2); // numery na wskaźniki przetworzymy później + break; + case MAKE_ID4('S', 'U', 'B', '1'): // submodele: 'SUB1',len,(320 bajtów na submodel) + iSubModelsCount = (k - 2) / 80; + Root = + (TSubModel *)(iModel + i + 2); // numery na wskaźniki przetworzymy później + for (ch = 1; ch < iSubModelsCount; + ++ch) // trzeba przesunąć bliżej, bo 256 wystarczy + MoveMemory(((char *)Root) + 256 * ch, ((char *)Root) + 320 * ch, 256); + break; + case MAKE_ID4('T', 'R', 'A', '0'): // transformy: 'TRA0',len,(64 bajty na transform) + m = (float4x4 *)(iModel + i + 2); // tabela transformów + break; + case MAKE_ID4('T', 'R', 'A', + '1'): // transformy: 'TRA1',len,(128 bajtów na transform) + m = (float4x4 *)(iModel + i + 2); // tabela transformów + for (ch = 0; ch < ((k - 2) >> 1); ++ch) + *(((float *)m) + ch) = *(((double *)m) + ch); // przepisanie double do float + break; + case MAKE_ID4('I', 'D', 'X', + '1'): // indeksy 1B: 'IDX2',len,(po bajcie na numer wierzchołka) + break; + case MAKE_ID4('I', 'D', 'X', + '2'): // indeksy 2B: 'IDX2',len,(po 2 bajty na numer wierzchołka) + break; + case MAKE_ID4('I', 'D', 'X', + '4'): // indeksy 4B: 'IDX4',len,(po 4 bajty na numer wierzchołka) + break; + case MAKE_ID4('T', 'E', 'X', + '0'): // tekstury: 'TEX0',len,(łańcuchy zakończone zerem - pliki + // tekstur) + Textures.Init((char *)(iModel + i)); //łącznie z nagłówkiem + break; + case MAKE_ID4('T', 'I', 'X', '0'): // indeks nazw tekstur + Textures.InitIndex((int *)(iModel + i)); //łącznie z nagłówkiem + break; + case MAKE_ID4('N', 'A', 'M', + '0'): // nazwy: 'NAM0',len,(łańcuchy zakończone zerem - nazwy + // submodeli) + Names.Init((char *)(iModel + i)); //łącznie z nagłówkiem + break; + case MAKE_ID4('N', 'I', 'X', '0'): // indeks nazw submodeli + Names.InitIndex((int *)(iModel + i)); //łącznie z nagłówkiem + break; + } + i += k; // przejście do kolejnej kromki + } + } + i = j; + } + for (i = 0; i < iSubModelsCount; ++i) + { // aktualizacja wskaźników w submodelach + Root[i].BinInit(Root, m, (float8 *)m_pVNT, &Textures, &Names, dynamic); + if (Root[i].ChildGet()) + Root[i].ChildGet()->Parent = Root + i; // wpisanie wskaźnika nadrzędnego do potmnego + if (Root[i].NextGet()) + Root[i].NextGet()->Parent = + Root[i].Parent; // skopiowanie wskaźnika nadrzędnego do kolejnego + } + iFlags &= ~0x0200; + return; }; void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic) { // wczytanie submodelu z pliku tekstowego - WriteLog("Loading - text model: " + FileName); - iFlags |= 0x0200; // wczytano z pliku tekstowego (właścicielami tablic są submodle) - cParser parser(FileName, cParser::buffer_FILE); // Ra: tu powinno być "models\\"... - TSubModel *SubModel; - std::string token = parser.getToken(); - iNumVerts = 0; // w konstruktorze to jest - while (token != "" || parser.eof()) - { - std::string parent; - // parser.getToken(parent); - parser.getTokens(1, false); // nazwa submodelu nadrzędnego bez zmieny na małe - parser >> parent; - if (parent == "") - break; - SubModel = new TSubModel(); - iNumVerts += SubModel->Load(parser, this, iNumVerts, dynamic); - SubModel->Parent = AddToNamed( - parent.c_str(), SubModel); // będzie potrzebne do wyliczenia pozycji, np. pantografu - // iSubModelsCount++; - parser.getTokens(); - parser >> token; - } - // Ra: od wersji 334 przechylany jest cały model, a nie tylko pierwszy - // submodel - // ale bujanie kabiny nadal używa bananów :( od 393 przywrócone, ale z - // dodatkowym warunkiem - if (Global::iConvertModels & 4) - { // automatyczne banany czasem psuły przechylanie kabin... - if (dynamic && Root) - { - if (Root->NextGet()) // jeśli ma jakiekolwiek kolejne - { // dynamic musi mieć "banana", bo tylko pierwszy obiekt jest animowany, - // a następne nie - SubModel = new TSubModel(); // utworzenie pustego - SubModel->ChildAdd(Root); - Root = SubModel; - ++iSubModelsCount; - } - Root->WillBeAnimated(); // bo z tym jest dużo problemów - } - } + WriteLog("Loading - text model: " + FileName); + iFlags |= 0x0200; // wczytano z pliku tekstowego (właścicielami tablic są submodle) + cParser parser(FileName, cParser::buffer_FILE); // Ra: tu powinno być "models\\"... + TSubModel *SubModel; + std::string token = parser.getToken(); + iNumVerts = 0; // w konstruktorze to jest + while (token != "" || parser.eof()) + { + std::string parent; + // parser.getToken(parent); + parser.getTokens(1, false); // nazwa submodelu nadrzędnego bez zmieny na małe + parser >> parent; + if (parent == "") + break; + SubModel = new TSubModel(); + iNumVerts += SubModel->Load(parser, this, iNumVerts, dynamic); + SubModel->Parent = AddToNamed( + parent.c_str(), SubModel); // będzie potrzebne do wyliczenia pozycji, np. pantografu + // iSubModelsCount++; + parser.getTokens(); + parser >> token; + } + // Ra: od wersji 334 przechylany jest cały model, a nie tylko pierwszy + // submodel + // ale bujanie kabiny nadal używa bananów :( od 393 przywrócone, ale z + // dodatkowym warunkiem + if (Global::iConvertModels & 4) + { // automatyczne banany czasem psuły przechylanie kabin... + if (dynamic && Root) + { + if (Root->NextGet()) // jeśli ma jakiekolwiek kolejne + { // dynamic musi mieć "banana", bo tylko pierwszy obiekt jest animowany, + // a następne nie + SubModel = new TSubModel(); // utworzenie pustego + SubModel->ChildAdd(Root); + Root = SubModel; + ++iSubModelsCount; + } + Root->WillBeAnimated(); // bo z tym jest dużo problemów + } + } } void TModel3d::Init() { // obrócenie początkowe układu współrzędnych, dla - // pojazdów wykonywane po analizie animacji - if (iFlags & 0x8000) - return; // operacje zostały już wykonane - if (Root) - { - if (iFlags & 0x0200) // jeśli wczytano z pliku tekstowego - { // jest jakiś dziwny błąd, że obkręcany ma być tylko ostatni submodel - // głównego łańcucha - // TSubModel *p=Root; - // do - //{p->InitialRotate(true); //ostatniemu należy się konwersja układu - // współrzędnych - // p=p->NextGet(); - //} - // while (p->NextGet()) - // Root->InitialRotate(false); //a poprzednim tylko optymalizacja - Root->InitialRotate(true); // argumet określa, czy wykonać pierwotny obrót - } - iFlags |= Root->FlagsCheck() | 0x8000; // flagi całego modelu - if (false == asBinary.empty()) // jeśli jest podana nazwa - { - if (Global::iConvertModels) // i włączony zapis - SaveToBinFile(asBinary.c_str()); // utworzy tablicę (m_pVNT) - asBinary = ""; // zablokowanie powtórnego zapisu - } - if (iNumVerts) - { - if (Global::fDistanceFactor != - 1.0) // trochę zaoszczędzi czasu na modelach z wieloma submocelami - Root->AdjustDist(); // aktualizacja odległości faz LoD, zależnie od - // rozdzielczości pionowej oraz multisamplingu - if (Global::bUseVBO) - { - if (!m_pVNT) // jeśli nie ma jeszcze tablicy (wczytano z pliku - // tekstowego) - { // tworzenie tymczasowej tablicy z wierzchołkami całego modelu - MakeArray(iNumVerts); // tworzenie tablic dla VBO - Root->RaArrayFill(m_pVNT); // wypełnianie tablicy - BuildVBOs(); // tworzenie VBO i usuwanie tablicy z pamięci - } - else - BuildVBOs(false); // tworzenie VBO bez usuwania tablicy z pamięci - } - else - { // przygotowanie skompilowanych siatek dla DisplayLists - Root->DisplayLists(); // tworzenie skompilowanej listy dla submodelu - } - // if (Root->TextureID) //o ile ma teksturę - // Root->iFlags|=0x80; //konieczność ustawienia tekstury - } - } + // pojazdów wykonywane po analizie animacji + if (iFlags & 0x8000) + return; // operacje zostały już wykonane + if (Root) + { + if (iFlags & 0x0200) // jeśli wczytano z pliku tekstowego + { // jest jakiś dziwny błąd, że obkręcany ma być tylko ostatni submodel + // głównego łańcucha + // TSubModel *p=Root; + // do + //{p->InitialRotate(true); //ostatniemu należy się konwersja układu + // współrzędnych + // p=p->NextGet(); + //} + // while (p->NextGet()) + // Root->InitialRotate(false); //a poprzednim tylko optymalizacja + Root->InitialRotate(true); // argumet określa, czy wykonać pierwotny obrót + } + iFlags |= Root->FlagsCheck() | 0x8000; // flagi całego modelu + if (false == asBinary.empty()) // jeśli jest podana nazwa + { + if (Global::iConvertModels) // i włączony zapis + SaveToBinFile(asBinary.c_str()); // utworzy tablicę (m_pVNT) + asBinary = ""; // zablokowanie powtórnego zapisu + } + if (iNumVerts) + { + if (Global::fDistanceFactor != + 1.0) // trochę zaoszczędzi czasu na modelach z wieloma submocelami + Root->AdjustDist(); // aktualizacja odległości faz LoD, zależnie od + // rozdzielczości pionowej oraz multisamplingu + if (Global::bUseVBO) + { + if (!m_pVNT) // jeśli nie ma jeszcze tablicy (wczytano z pliku + // tekstowego) + { // tworzenie tymczasowej tablicy z wierzchołkami całego modelu + MakeArray(iNumVerts); // tworzenie tablic dla VBO + Root->RaArrayFill(m_pVNT); // wypełnianie tablicy + BuildVBOs(); // tworzenie VBO i usuwanie tablicy z pamięci + } + else + BuildVBOs(false); // tworzenie VBO bez usuwania tablicy z pamięci + } + else + { // przygotowanie skompilowanych siatek dla DisplayLists + Root->DisplayLists(); // tworzenie skompilowanej listy dla submodelu + } + // if (Root->TextureID) //o ile ma teksturę + // Root->iFlags|=0x80; //konieczność ustawienia tekstury + } + } }; void TModel3d::SaveToBinFile(char const *FileName) { // zapis modelu binarnego - if (sizeof(TSubModel) != 256) + WriteLog("Saving E3D binary model."); + int i, zero = 0; + TSubModelInfo *info = new TSubModelInfo[iSubModelsCount]; + info->Reset(); + Root->Info(); // zebranie informacji o submodelach + int len; //łączna długość pliku + int sub; // ilość submodeli (w bajtach) + int tra; // wielkość obszaru transformów + int vnt; // wielkość obszaru wierzchołków + int tex = 0; // wielkość obszaru nazw tekstur + int nam = 0; // wielkość obszaru nazw submodeli + sub = 8 + sizeof(TSubModel) * iSubModelsCount; + tra = info->iTotalTransforms ? 8 + 64 * info->iTotalTransforms : 0; + vnt = 8 + 32 * iNumVerts; + for (i = 0; i < iSubModelsCount; ++i) { - std::cout << "E3D files unsupported in current build" << std::endl; - exit(-1); + tex += info[i].iTextureLen; + nam += info[i].iNameLen; } + if (tex) + tex += 9; // 8 na nagłówek i jeden ciąg pusty (tylko znacznik końca) + if (nam) + nam += 8; + len = 8 + sub + tra + vnt + tex + ((-tex) & 3) + nam + ((-nam) & 3); + TSubModel *roboczy = new TSubModel(); // bufor używany do zapisywania + // AnsiString *asN=&roboczy->asName,*asT=&roboczy->asTexture; + // roboczy->FirstInit(); //żeby delete nie usuwało czego nie powinno + /* TFileStream *fs = new TFileStream(AnsiString(FileName), fmCreate); + */ { + std::ofstream file(FileName, std::ios::binary); + file.unsetf(std::ios::skipws); + file.write("E3D0", 4); // kromka główna + file.write(reinterpret_cast(&len), 4); - WriteLog("Saving E3D binary model."); - int i, zero = 0; - TSubModelInfo *info = new TSubModelInfo[iSubModelsCount]; - info->Reset(); - Root->Info(); // zebranie informacji o submodelach - int len; //łączna długość pliku - int sub; // ilość submodeli (w bajtach) - int tra; // wielkość obszaru transformów - int vnt; // wielkość obszaru wierzchołków - int tex = 0; // wielkość obszaru nazw tekstur - int nam = 0; // wielkość obszaru nazw submodeli - sub = 8 + sizeof(TSubModel) * iSubModelsCount; - tra = info->iTotalTransforms ? 8 + 64 * info->iTotalTransforms : 0; - vnt = 8 + 32 * iNumVerts; - for (i = 0; i < iSubModelsCount; ++i) - { - tex += info[i].iTextureLen; - nam += info[i].iNameLen; - } - if (tex) - tex += 9; // 8 na nagłówek i jeden ciąg pusty (tylko znacznik końca) - if (nam) - nam += 8; - len = 8 + sub + tra + vnt + tex + ((-tex) & 3) + nam + ((-nam) & 3); - TSubModel *roboczy = new TSubModel(); // bufor używany do zapisywania - // AnsiString *asN=&roboczy->asName,*asT=&roboczy->asTexture; - // roboczy->FirstInit(); //żeby delete nie usuwało czego nie powinno - /* TFileStream *fs = new TFileStream(AnsiString(FileName), fmCreate); -*/ { - std::ofstream file(FileName, std::ios::binary); - file.unsetf(std::ios::skipws); - file.write("E3D0", 4); // kromka główna - file.write(reinterpret_cast(&len), 4); - - file.write("SUB0", 4); // dane submodeli - file.write(reinterpret_cast(&sub), 4); - for (i = 0; i < iSubModelsCount; ++i) - { - roboczy->InfoSet(info + i); - file.write(reinterpret_cast(roboczy), - sizeof(TSubModel)); // zapis jednego submodelu - } - if (tra) - { // zapis transformów - file.write("TRA0", 4); // transformy - file.write(reinterpret_cast(&tra), 4); - for (i = 0; i < iSubModelsCount; ++i) - if (info[i].iTransform >= 0) - file.write(reinterpret_cast(info[i].pSubModel->GetMatrix()), 16 * 4); - } - { // zapis wierzchołków - MakeArray(iNumVerts); // tworzenie tablic dla VBO - Root->RaArrayFill(m_pVNT); // wypełnianie tablicy - file.write("VNT0", 4); // wierzchołki - file.write(reinterpret_cast(&vnt), 4); - file.write(reinterpret_cast(m_pVNT), 32 * iNumVerts); - } - if (tex) // może być jeden submodel ze zmienną teksturą i nazwy nie będzie - { // zapis nazw tekstur - file.write("TEX0", 4); // nazwy tekstur - i = (tex + 3) & ~3; // zaokrąglenie w górę - file.write(reinterpret_cast(&i), 4); - file.write(reinterpret_cast(&zero), - 1); // ciąg o numerze zero nie jest używany, ma tylko znacznik końca - for (i = 0; i < iSubModelsCount; ++i) - if (info[i].iTextureLen) - file.write(info[i].pSubModel->pTexture, info[i].iTextureLen); - if ((-tex) & 3) - file.write(reinterpret_cast(&zero), - ((-tex) & 3)); // wyrównanie do wielokrotności 4 bajtów - } - if (nam) // może być jeden anonimowy submodel w modelu - { // zapis nazw submodeli - file.write("NAM0", 4); // nazwy submodeli - i = (nam + 3) & ~3; // zaokrąglenie w górę - file.write(reinterpret_cast(&i), 4); - for (i = 0; i < iSubModelsCount; ++i) - if (info[i].iNameLen) - file.write(info[i].pSubModel->pName, info[i].iNameLen); - if ((-nam) & 3) - file.write(reinterpret_cast(&zero), - ((-nam) & 3)); // wyrównanie do wielokrotności 4 bajtów - } - } // file autocloses on getting out of scope - // roboczy->FirstInit(); //żeby delete nie usuwało czego nie powinno - // roboczy->iFlags=0; //żeby delete nie usuwało czego nie powinno - // roboczy->asName)=asN; - //&roboczy->asTexture=asT; - delete roboczy; - delete[] info; + file.write("SUB0", 4); // dane submodeli + file.write(reinterpret_cast(&sub), 4); + for (i = 0; i < iSubModelsCount; ++i) + { + roboczy->InfoSet(info + i); + file.write(reinterpret_cast(roboczy), + sizeof(TSubModel)); // zapis jednego submodelu + } + if (tra) + { // zapis transformów + file.write("TRA0", 4); // transformy + file.write(reinterpret_cast(&tra), 4); + for (i = 0; i < iSubModelsCount; ++i) + if (info[i].iTransform >= 0) + file.write(reinterpret_cast(info[i].pSubModel->GetMatrix()), 16 * 4); + } + { // zapis wierzchołków + MakeArray(iNumVerts); // tworzenie tablic dla VBO + Root->RaArrayFill(m_pVNT); // wypełnianie tablicy + file.write("VNT0", 4); // wierzchołki + file.write(reinterpret_cast(&vnt), 4); + file.write(reinterpret_cast(m_pVNT), 32 * iNumVerts); + } + if (tex) // może być jeden submodel ze zmienną teksturą i nazwy nie będzie + { // zapis nazw tekstur + file.write("TEX0", 4); // nazwy tekstur + i = (tex + 3) & ~3; // zaokrąglenie w górę + file.write(reinterpret_cast(&i), 4); + file.write(reinterpret_cast(&zero), + 1); // ciąg o numerze zero nie jest używany, ma tylko znacznik końca + for (i = 0; i < iSubModelsCount; ++i) + if (info[i].iTextureLen) + file.write(info[i].pSubModel->pTexture, info[i].iTextureLen); + if ((-tex) & 3) + file.write(reinterpret_cast(&zero), + ((-tex) & 3)); // wyrównanie do wielokrotności 4 bajtów + } + if (nam) // może być jeden anonimowy submodel w modelu + { // zapis nazw submodeli + file.write("NAM0", 4); // nazwy submodeli + i = (nam + 3) & ~3; // zaokrąglenie w górę + file.write(reinterpret_cast(&i), 4); + for (i = 0; i < iSubModelsCount; ++i) + if (info[i].iNameLen) + file.write(info[i].pSubModel->pName, info[i].iNameLen); + if ((-nam) & 3) + file.write(reinterpret_cast(&zero), + ((-nam) & 3)); // wyrównanie do wielokrotności 4 bajtów + } + } // file autocloses on getting out of scope + // roboczy->FirstInit(); //żeby delete nie usuwało czego nie powinno + // roboczy->iFlags=0; //żeby delete nie usuwało czego nie powinno + // roboczy->asName)=asN; + //&roboczy->asTexture=asT; + delete roboczy; + delete[] info; }; void TModel3d::BreakHierarhy() { - Error("Not implemented yet :("); + Error("Not implemented yet :("); }; /* @@ -2159,52 +2147,52 @@ ReplacableSkinId,int iAlpha) { // glColor3f(1.0f,1.0f,1.0f); // glColor3f(0.0f,0.0f,0.0f); - glPushMatrix(); +glPushMatrix(); - glTranslated(pPosition.x,pPosition.y,pPosition.z); - if (fAngle!=0) - glRotatef(fAngle,0,1,0); +glTranslated(pPosition.x,pPosition.y,pPosition.z); +if (fAngle!=0) +glRotatef(fAngle,0,1,0); /* - matrix4x4 Identity; - Identity.Identity(); +matrix4x4 Identity; +Identity.Identity(); - matrix4x4 CurrentMatrix; - glGetdoublev(GL_MODELVIEW_MATRIX,CurrentMatrix.getArray()); - vector3 pos=vector3(0,0,0); - pos=CurrentMatrix*pos; - fSquareDist=SquareMagnitude(pos); - * / - fSquareDist=SquareMagnitude(pPosition-Global::GetCameraPosition()); +matrix4x4 CurrentMatrix; +glGetdoublev(GL_MODELVIEW_MATRIX,CurrentMatrix.getArray()); +vector3 pos=vector3(0,0,0); +pos=CurrentMatrix*pos; +fSquareDist=SquareMagnitude(pos); +* / +fSquareDist=SquareMagnitude(pPosition-Global::GetCameraPosition()); #ifdef _DEBUG - if (Root) - Root->Render(ReplacableSkinId,iAlpha); +if (Root) +Root->Render(ReplacableSkinId,iAlpha); #else - Root->Render(ReplacableSkinId,iAlpha); +Root->Render(ReplacableSkinId,iAlpha); #endif - glPopMatrix(); +glPopMatrix(); }; */ void TModel3d::Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) { - iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste - if (iAlpha & iFlags & 0x1F1F001F) // czy w ogóle jest co robić w tym cyklu? - { - TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderDL(); - } + iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste + if (iAlpha & iFlags & 0x1F1F001F) // czy w ogóle jest co robić w tym cyklu? + { + TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! + Root->ReplacableSet(ReplacableSkinId, iAlpha); + Root->RenderDL(); + } }; void TModel3d::RenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) { - if (iAlpha & iFlags & 0x2F2F002F) - { - TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderAlphaDL(); - } + if (iAlpha & iFlags & 0x2F2F002F) + { + TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! + Root->ReplacableSet(ReplacableSkinId, iAlpha); + Root->RenderAlphaDL(); + } }; /* @@ -2214,61 +2202,61 @@ iAlpha) { // glColor3f(1.0f,1.0f,1.0f); // glColor3f(0.0f,0.0f,0.0f); - glPushMatrix(); //zapamiętanie matrycy przekształcenia - glTranslated(pPosition.x,pPosition.y,pPosition.z); - if (fAngle!=0) - glRotatef(fAngle,0,1,0); +glPushMatrix(); //zapamiętanie matrycy przekształcenia +glTranslated(pPosition.x,pPosition.y,pPosition.z); +if (fAngle!=0) +glRotatef(fAngle,0,1,0); /* - matrix4x4 Identity; - Identity.Identity(); +matrix4x4 Identity; +Identity.Identity(); - matrix4x4 CurrentMatrix; - glGetdoublev(GL_MODELVIEW_MATRIX,CurrentMatrix.getArray()); - vector3 pos=vector3(0,0,0); - pos=CurrentMatrix*pos; - fSquareDist=SquareMagnitude(pos); +matrix4x4 CurrentMatrix; +glGetdoublev(GL_MODELVIEW_MATRIX,CurrentMatrix.getArray()); +vector3 pos=vector3(0,0,0); +pos=CurrentMatrix*pos; +fSquareDist=SquareMagnitude(pos); */ /* - fSquareDist=SquareMagnitude(pPosition-Global::GetCameraPosition()); //zmienna +fSquareDist=SquareMagnitude(pPosition-Global::GetCameraPosition()); //zmienna globalna! - if (StartVBO()) - {//odwrócenie flag, aby wyłapać nieprzezroczyste - Root->ReplacableSet(ReplacableSkinId,iAlpha^0x0F0F000F); - Root->RaRender(); - EndVBO(); - } - glPopMatrix(); //przywrócenie ustawień przekształcenia +if (StartVBO()) +{//odwrócenie flag, aby wyłapać nieprzezroczyste +Root->ReplacableSet(ReplacableSkinId,iAlpha^0x0F0F000F); +Root->RaRender(); +EndVBO(); +} +glPopMatrix(); //przywrócenie ustawień przekształcenia }; */ -void TModel3d::RaRender( double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha ) +void TModel3d::RaRender(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // renderowanie specjalne, np. kabiny - iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste - if (iAlpha & iFlags & 0x1F1F001F) // czy w ogóle jest co robić w tym cyklu? - { - TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! - if (StartVBO()) - { // odwrócenie flag, aby wyłapać nieprzezroczyste - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->pRoot = this; - Root->RenderVBO(); - EndVBO(); - } - } + iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste + if (iAlpha & iFlags & 0x1F1F001F) // czy w ogóle jest co robić w tym cyklu? + { + TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! + if (StartVBO()) + { // odwrócenie flag, aby wyłapać nieprzezroczyste + Root->ReplacableSet(ReplacableSkinId, iAlpha); + Root->pRoot = this; + Root->RenderVBO(); + EndVBO(); + } + } }; void TModel3d::RaRenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // renderowanie specjalne, np. kabiny - if (iAlpha & iFlags & 0x2F2F002F) // czy w ogóle jest co robić w tym cyklu? - { - TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! - if (StartVBO()) - { - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderAlphaVBO(); - EndVBO(); - } - } + if (iAlpha & iFlags & 0x2F2F002F) // czy w ogóle jest co robić w tym cyklu? + { + TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! + if (StartVBO()) + { + Root->ReplacableSet(ReplacableSkinId, iAlpha); + Root->RenderAlphaVBO(); + EndVBO(); + } + } }; /* @@ -2276,18 +2264,18 @@ void TModel3d::RaRenderAlpha(vector3 pPosition,double fAngle,GLuint *ReplacableSkinId,int iAlpha) { - glPushMatrix(); - glTranslatef(pPosition.x,pPosition.y,pPosition.z); - if (fAngle!=0) - glRotatef(fAngle,0,1,0); - fSquareDist=SquareMagnitude(pPosition-Global::GetCameraPosition()); //zmienna +glPushMatrix(); +glTranslatef(pPosition.x,pPosition.y,pPosition.z); +if (fAngle!=0) +glRotatef(fAngle,0,1,0); +fSquareDist=SquareMagnitude(pPosition-Global::GetCameraPosition()); //zmienna globalna! - if (StartVBO()) - {Root->ReplacableSet(ReplacableSkinId,iAlpha); - Root->RaRenderAlpha(); - EndVBO(); - } - glPopMatrix(); +if (StartVBO()) +{Root->ReplacableSet(ReplacableSkinId,iAlpha); +Root->RaRenderAlpha(); +EndVBO(); +} +glPopMatrix(); }; */ @@ -2297,78 +2285,78 @@ globalna! void TModel3d::Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // nieprzezroczyste, Display List - glPushMatrix(); - glTranslated(vPosition->x, vPosition->y, vPosition->z); - if (vAngle->y != 0.0) - glRotated(vAngle->y, 0.0, 1.0, 0.0); - if (vAngle->x != 0.0) - glRotated(vAngle->x, 1.0, 0.0, 0.0); - if (vAngle->z != 0.0) - glRotated(vAngle->z, 0.0, 0.0, 1.0); - TSubModel::fSquareDist = - SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! - // odwrócenie flag, aby wyłapać nieprzezroczyste - Root->ReplacableSet(ReplacableSkinId, iAlpha ^ 0x0F0F000F); - Root->RenderDL(); - glPopMatrix(); + glPushMatrix(); + glTranslated(vPosition->x, vPosition->y, vPosition->z); + if (vAngle->y != 0.0) + glRotated(vAngle->y, 0.0, 1.0, 0.0); + if (vAngle->x != 0.0) + glRotated(vAngle->x, 1.0, 0.0, 0.0); + if (vAngle->z != 0.0) + glRotated(vAngle->z, 0.0, 0.0, 1.0); + TSubModel::fSquareDist = + SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! + // odwrócenie flag, aby wyłapać nieprzezroczyste + Root->ReplacableSet(ReplacableSkinId, iAlpha ^ 0x0F0F000F); + Root->RenderDL(); + glPopMatrix(); }; void TModel3d::RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, - int iAlpha) + int iAlpha) { // przezroczyste, Display List - glPushMatrix(); - glTranslated(vPosition->x, vPosition->y, vPosition->z); - if (vAngle->y != 0.0) - glRotated(vAngle->y, 0.0, 1.0, 0.0); - if (vAngle->x != 0.0) - glRotated(vAngle->x, 1.0, 0.0, 0.0); - if (vAngle->z != 0.0) - glRotated(vAngle->z, 0.0, 0.0, 1.0); - TSubModel::fSquareDist = - SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderAlphaDL(); - glPopMatrix(); + glPushMatrix(); + glTranslated(vPosition->x, vPosition->y, vPosition->z); + if (vAngle->y != 0.0) + glRotated(vAngle->y, 0.0, 1.0, 0.0); + if (vAngle->x != 0.0) + glRotated(vAngle->x, 1.0, 0.0, 0.0); + if (vAngle->z != 0.0) + glRotated(vAngle->z, 0.0, 0.0, 1.0); + TSubModel::fSquareDist = + SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! + Root->ReplacableSet(ReplacableSkinId, iAlpha); + Root->RenderAlphaDL(); + glPopMatrix(); }; -void TModel3d::RaRender( vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha ) +void TModel3d::RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // nieprzezroczyste, VBO - glPushMatrix(); - glTranslated(vPosition->x, vPosition->y, vPosition->z); - if (vAngle->y != 0.0) - glRotated(vAngle->y, 0.0, 1.0, 0.0); - if (vAngle->x != 0.0) - glRotated(vAngle->x, 1.0, 0.0, 0.0); - if (vAngle->z != 0.0) - glRotated(vAngle->z, 0.0, 0.0, 1.0); - TSubModel::fSquareDist = - SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! - if (StartVBO()) - { // odwrócenie flag, aby wyłapać nieprzezroczyste - Root->ReplacableSet(ReplacableSkinId, iAlpha ^ 0x0F0F000F); - Root->RenderVBO(); - EndVBO(); - } - glPopMatrix(); + glPushMatrix(); + glTranslated(vPosition->x, vPosition->y, vPosition->z); + if (vAngle->y != 0.0) + glRotated(vAngle->y, 0.0, 1.0, 0.0); + if (vAngle->x != 0.0) + glRotated(vAngle->x, 1.0, 0.0, 0.0); + if (vAngle->z != 0.0) + glRotated(vAngle->z, 0.0, 0.0, 1.0); + TSubModel::fSquareDist = + SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! + if (StartVBO()) + { // odwrócenie flag, aby wyłapać nieprzezroczyste + Root->ReplacableSet(ReplacableSkinId, iAlpha ^ 0x0F0F000F); + Root->RenderVBO(); + EndVBO(); + } + glPopMatrix(); }; void TModel3d::RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, - int iAlpha) + int iAlpha) { // przezroczyste, VBO - glPushMatrix(); - glTranslated(vPosition->x, vPosition->y, vPosition->z); - if (vAngle->y != 0.0) - glRotated(vAngle->y, 0.0, 1.0, 0.0); - if (vAngle->x != 0.0) - glRotated(vAngle->x, 1.0, 0.0, 0.0); - if (vAngle->z != 0.0) - glRotated(vAngle->z, 0.0, 0.0, 1.0); - TSubModel::fSquareDist = - SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! - if (StartVBO()) - { - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderAlphaVBO(); - EndVBO(); - } - glPopMatrix(); + glPushMatrix(); + glTranslated(vPosition->x, vPosition->y, vPosition->z); + if (vAngle->y != 0.0) + glRotated(vAngle->y, 0.0, 1.0, 0.0); + if (vAngle->x != 0.0) + glRotated(vAngle->x, 1.0, 0.0, 0.0); + if (vAngle->z != 0.0) + glRotated(vAngle->z, 0.0, 0.0, 1.0); + TSubModel::fSquareDist = + SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! + if (StartVBO()) + { + Root->ReplacableSet(ReplacableSkinId, iAlpha); + Root->RenderAlphaVBO(); + EndVBO(); + } + glPopMatrix(); }; //----------------------------------------------------------------------------- @@ -2377,49 +2365,49 @@ void TModel3d::RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manage int TModel3d::TerrainCount() { // zliczanie kwadratów kilometrowych (główna - // linia po Next) do tworznia tablicy - int i = 0; - TSubModel *r = Root; - while (r) - { - r = r->NextGet(); - ++i; - } - return i; + // linia po Next) do tworznia tablicy + int i = 0; + TSubModel *r = Root; + while (r) + { + r = r->NextGet(); + ++i; + } + return i; }; TSubModel *TModel3d::TerrainSquare(int n) { // pobieranie wskaźnika do submodelu (n) - int i = 0; - TSubModel *r = Root; - while (i < n) - { - r = r->NextGet(); - ++i; - } - r->UnFlagNext(); // blokowanie wyświetlania po Next głównej listy - return r; + int i = 0; + TSubModel *r = Root; + while (i < n) + { + r = r->NextGet(); + ++i; + } + r->UnFlagNext(); // blokowanie wyświetlania po Next głównej listy + return r; }; void TModel3d::TerrainRenderVBO(int n) { // renderowanie terenu z VBO - glPushMatrix(); - // glTranslated(vPosition->x,vPosition->y,vPosition->z); - // if (vAngle->y!=0.0) glRotated(vAngle->y,0.0,1.0,0.0); - // if (vAngle->x!=0.0) glRotated(vAngle->x,1.0,0.0,0.0); - // if (vAngle->z!=0.0) glRotated(vAngle->z,0.0,0.0,1.0); - // TSubModel::fSquareDist=SquareMagnitude(*vPosition-Global::GetCameraPosition()); - // //zmienna globalna! - if (StartVBO()) - { // odwrócenie flag, aby wyłapać nieprzezroczyste - // Root->ReplacableSet(ReplacableSkinId,iAlpha^0x0F0F000F); - TSubModel *r = Root; - while (r) - { - if (r->iVisible == - n) // tylko jeśli ma być widoczny w danej ramce (problem dla 0==false) - r->RenderVBO(); // sub kolejne (Next) się nie wyrenderują - r = r->NextGet(); - } - EndVBO(); - } - glPopMatrix(); + glPushMatrix(); + // glTranslated(vPosition->x,vPosition->y,vPosition->z); + // if (vAngle->y!=0.0) glRotated(vAngle->y,0.0,1.0,0.0); + // if (vAngle->x!=0.0) glRotated(vAngle->x,1.0,0.0,0.0); + // if (vAngle->z!=0.0) glRotated(vAngle->z,0.0,0.0,1.0); + // TSubModel::fSquareDist=SquareMagnitude(*vPosition-Global::GetCameraPosition()); + // //zmienna globalna! + if (StartVBO()) + { // odwrócenie flag, aby wyłapać nieprzezroczyste + // Root->ReplacableSet(ReplacableSkinId,iAlpha^0x0F0F000F); + TSubModel *r = Root; + while (r) + { + if (r->iVisible == + n) // tylko jeśli ma być widoczny w danej ramce (problem dla 0==false) + r->RenderVBO(); // sub kolejne (Next) się nie wyrenderują + r = r->NextGet(); + } + EndVBO(); + } + glPopMatrix(); }; diff --git a/Model3d.h b/Model3d.h index 4c8ae461..c6321d46 100644 --- a/Model3d.h +++ b/Model3d.h @@ -21,109 +21,109 @@ using namespace Math3D; struct GLVERTEX { - vector3 Point; - vector3 Normal; - float tu, tv; + vector3 Point; + vector3 Normal; + float tu, tv; }; class TStringPack { - char *data; - //+0 - 4 bajty: typ kromki - //+4 - 4 bajty: długość łącznie z nagłówkiem - //+8 - obszar łańcuchów znakowych, każdy zakończony zerem - int *index; - //+0 - 4 bajty: typ kromki - //+4 - 4 bajty: długość łącznie z nagłówkiem - //+8 - tabela indeksów - public: - char *String(int n); - char *StringAt(int n) - { - return data + 9 + n; - }; - TStringPack() - { - data = NULL; - index = NULL; - }; - void Init(char *d) - { - data = d; - }; - void InitIndex(int *i) - { - index = i; - }; + char *data; + //+0 - 4 bajty: typ kromki + //+4 - 4 bajty: długość łącznie z nagłówkiem + //+8 - obszar łańcuchów znakowych, każdy zakończony zerem + int *index; + //+0 - 4 bajty: typ kromki + //+4 - 4 bajty: długość łącznie z nagłówkiem + //+8 - tabela indeksów +public: + char *String(int n); + char *StringAt(int n) + { + return data + 9 + n; + }; + TStringPack() + { + data = NULL; + index = NULL; + }; + void Init(char *d) + { + data = d; + }; + void InitIndex(int *i) + { + index = i; + }; }; class TMaterialColor { - public: - TMaterialColor(){}; - TMaterialColor(char V) - { - r = g = b = V; - }; - // TMaterialColor(double R, double G, double B) - TMaterialColor(char R, char G, char B) - { - r = R; - g = G; - b = B; - }; +public: + TMaterialColor() {}; + TMaterialColor(char V) + { + r = g = b = V; + }; + // TMaterialColor(double R, double G, double B) + TMaterialColor(char R, char G, char B) + { + r = R; + g = G; + b = B; + }; - char r, g, b; + char r, g, b; }; /* struct TMaterial { - int ID; - AnsiString Name; +int ID; +AnsiString Name; //McZapkie-240702: lepiej uzywac wartosci float do opisu koloru bo funkcje opengl chyba tego na ogol uzywaja - float Ambient[4]; - float Diffuse[4]; - float Specular[4]; - float Transparency; - GLuint TextureID; +float Ambient[4]; +float Diffuse[4]; +float Specular[4]; +float Transparency; +GLuint TextureID; }; */ /* struct THitBoxContainer { - TPlane Planes[6]; - int Index; - inline void Reset() { Planes[0]= TPlane(vector3(0,0,0),0.0f); }; - inline bool Inside(vector3 Point) - { - bool Hit= true; +TPlane Planes[6]; +int Index; +inline void Reset() { Planes[0]= TPlane(vector3(0,0,0),0.0f); }; +inline bool Inside(vector3 Point) +{ +bool Hit= true; - if (Planes[0].Defined()) - for (int i=0; i<6; i++) - { - if (Planes[i].GetSide(Point)>0) - { - Hit= false; - break; - }; +if (Planes[0].Defined()) +for (int i=0; i<6; i++) +{ +if (Planes[i].GetSide(Point)>0) +{ +Hit= false; +break; +}; - } - else return(false); - return(Hit); - }; +} +else return(false); +return(Hit); +}; }; */ /* Ra: tego nie będziemy już używać, bo można wycisnąć więcej typedef enum {smt_Unknown, //nieznany - smt_Mesh, //siatka - smt_Point, - smt_FreeSpotLight, //punkt świetlny - smt_Text, //generator tekstu - smt_Stars //wiele punktów świetlnych +smt_Mesh, //siatka +smt_Point, +smt_FreeSpotLight, //punkt świetlny +smt_Text, //generator tekstu +smt_Stars //wiele punktów świetlnych } TSubModelType; */ // Ra: specjalne typy submodeli, poza tym GL_TRIANGLES itp. @@ -134,28 +134,28 @@ const int TP_TEXT = 259; enum TAnimType // rodzaj animacji { - at_None, // brak - at_Rotate, // obrót względem wektora o kąt - at_RotateXYZ, // obrót względem osi o kąty - at_Translate, // przesunięcie - at_SecondsJump, // sekundy z przeskokiem - at_MinutesJump, // minuty z przeskokiem - at_HoursJump, // godziny z przeskokiem 12h/360° - at_Hours24Jump, // godziny z przeskokiem 24h/360° - at_Seconds, // sekundy płynnie - at_Minutes, // minuty płynnie - at_Hours, // godziny płynnie 12h/360° - at_Hours24, // godziny płynnie 24h/360° - at_Billboard, // obrót w pionie do kamery - at_Wind, // ruch pod wpływem wiatru - at_Sky, // animacja nieba - at_IK = 0x100, // odwrotna kinematyka - submodel sterujący (np. staw skokowy) - at_IK11 = 0x101, // odwrotna kinematyka - submodel nadrzędny do sterowango (np. stopa) - at_IK21 = 0x102, // odwrotna kinematyka - submodel nadrzędny do sterowango (np. podudzie) - at_IK22 = 0x103, // odwrotna kinematyka - submodel nadrzędny do nadrzędnego sterowango (np. udo) - at_Digital = 0x200, // dziesięciocyfrowy licznik mechaniczny (z cylindrami) - at_DigiClk = 0x201, // zegar cyfrowy jako licznik na dziesięciościanach - at_Undefined = 0x800000FF // animacja chwilowo nieokreślona + at_None, // brak + at_Rotate, // obrót względem wektora o kąt + at_RotateXYZ, // obrót względem osi o kąty + at_Translate, // przesunięcie + at_SecondsJump, // sekundy z przeskokiem + at_MinutesJump, // minuty z przeskokiem + at_HoursJump, // godziny z przeskokiem 12h/360° + at_Hours24Jump, // godziny z przeskokiem 24h/360° + at_Seconds, // sekundy płynnie + at_Minutes, // minuty płynnie + at_Hours, // godziny płynnie 12h/360° + at_Hours24, // godziny płynnie 24h/360° + at_Billboard, // obrót w pionie do kamery + at_Wind, // ruch pod wpływem wiatru + at_Sky, // animacja nieba + at_IK = 0x100, // odwrotna kinematyka - submodel sterujący (np. staw skokowy) + at_IK11 = 0x101, // odwrotna kinematyka - submodel nadrzędny do sterowango (np. stopa) + at_IK21 = 0x102, // odwrotna kinematyka - submodel nadrzędny do sterowango (np. podudzie) + at_IK22 = 0x103, // odwrotna kinematyka - submodel nadrzędny do nadrzędnego sterowango (np. udo) + at_Digital = 0x200, // dziesięciocyfrowy licznik mechaniczny (z cylindrami) + at_DigiClk = 0x201, // zegar cyfrowy jako licznik na dziesięciościanach + at_Undefined = 0x800000FF // animacja chwilowo nieokreślona }; class TModel3d; @@ -163,293 +163,290 @@ class TSubModelInfo; class TSubModel { // klasa submodelu - pojedyncza siatka, punkt świetlny albo grupa punktów - // Ra: ta klasa ma mieć wielkość 256 bajtów, aby pokryła się z formatem binarnym - // Ra: nie przestawiać zmiennych, bo wczytują się z pliku binarnego! - private: - TSubModel *Next; - TSubModel *Child; - int eType; // Ra: modele binarne dają więcej możliwości niż mesh złożony z trójkątów - int iName; // numer łańcucha z nazwą submodelu, albo -1 gdy anonimowy - public: // chwilowo - TAnimType b_Anim; + // Ra: ta klasa ma mieć wielkość 256 bajtów, aby pokryła się z formatem binarnym + // Ra: nie przestawiać zmiennych, bo wczytują się z pliku binarnego! +private: + TSubModel *Next; + TSubModel *Child; + int eType; // Ra: modele binarne dają więcej możliwości niż mesh złożony z trójkątów + int iName; // numer łańcucha z nazwą submodelu, albo -1 gdy anonimowy +public: // chwilowo + TAnimType b_Anim; - private: - int iFlags; // flagi informacyjne: - // bit 0: =1 faza rysowania zależy od wymiennej tekstury 0 - // bit 1: =1 faza rysowania zależy od wymiennej tekstury 1 - // bit 2: =1 faza rysowania zależy od wymiennej tekstury 2 - // bit 3: =1 faza rysowania zależy od wymiennej tekstury 3 - // bit 4: =1 rysowany w fazie nieprzezroczystych (stała tekstura albo brak) - // bit 5: =1 rysowany w fazie przezroczystych (stała tekstura) - // bit 7: =1 ta sama tekstura, co poprzedni albo nadrzędny - // bit 8: =1 wierzchołki wyświetlane z indeksów - // bit 9: =1 wczytano z pliku tekstowego (jest właścicielem tablic) - // bit 13: =1 wystarczy przesunięcie zamiast mnożenia macierzy (trzy jedynki) - // bit 14: =1 wymagane przechowanie macierzy (animacje) - // bit 15: =1 wymagane przechowanie macierzy (transform niejedynkowy) - union - { // transform, nie każdy submodel musi mieć - float4x4 *fMatrix; // pojedyncza precyzja wystarcza - // matrix4x4 *dMatrix; //do testu macierz podwójnej precyzji - int iMatrix; // w pliku binarnym jest numer matrycy - }; - int iNumVerts; // ilość wierzchołków (1 dla FreeSpotLight) - size_t iVboPtr; // początek na liście wierzchołków albo indeksów - int iTexture; // numer nazwy tekstury, -1 wymienna, 0 brak - float fVisible; // próg jasności światła do załączenia submodelu - float fLight; // próg jasności światła do zadziałania selfillum - float f4Ambient[4]; - float f4Diffuse[4]; // float ze względu na glMaterialfv() - float f4Specular[4]; - float f4Emision[4]; - float fWireSize; // nie używane, ale wczytywane - float fSquareMaxDist; - float fSquareMinDist; - // McZapkie-050702: parametry dla swiatla: - float fNearAttenStart; - float fNearAttenEnd; - bool bUseNearAtten; // te 3 zmienne okreslaja rysowanie aureoli wokol zrodla swiatla - int iFarAttenDecay; // ta zmienna okresla typ zaniku natezenia swiatla (0:brak, 1,2: potega 1/R) - float fFarDecayRadius; // normalizacja j.w. - float fCosFalloffAngle; // cosinus kąta stożka pod którym widać światło - float fCosHotspotAngle; // cosinus kąta stożka pod którym widać aureolę i zwiększone natężenie - // światła - float fCosViewAngle; // cos kata pod jakim sie teraz patrzy - // Ra: dalej są zmienne robocze, można je przestawiać z zachowaniem rozmiaru klasy - texture_manager::size_type TextureID; // numer tekstury, -1 wymienna, 0 brak - bool bWire; // nie używane, ale wczytywane - // short TexAlpha; //Ra: nie używane już - GLuint uiDisplayList; // roboczy numer listy wyświetlania - float Opacity; // nie używane, ale wczytywane - // ABu: te same zmienne, ale zdublowane dla Render i RenderAlpha, - // bo sie chrzanilo przemieszczanie obiektow. - // Ra: już się nie chrzani - float f_Angle; - float3 v_RotateAxis; - float3 v_Angles; - - public: // chwilowo - float3 v_TransVector; - float8 *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO - size_t iAnimOwner; // roboczy numer egzemplarza, który ustawił animację - TAnimType b_aAnim; // kody animacji oddzielnie, bo zerowane - public: - float4x4 *mAnimMatrix; // macierz do animacji kwaternionowych (należy do AnimContainer) +private: + int iFlags; // flagi informacyjne: + // bit 0: =1 faza rysowania zależy od wymiennej tekstury 0 + // bit 1: =1 faza rysowania zależy od wymiennej tekstury 1 + // bit 2: =1 faza rysowania zależy od wymiennej tekstury 2 + // bit 3: =1 faza rysowania zależy od wymiennej tekstury 3 + // bit 4: =1 rysowany w fazie nieprzezroczystych (stała tekstura albo brak) + // bit 5: =1 rysowany w fazie przezroczystych (stała tekstura) + // bit 7: =1 ta sama tekstura, co poprzedni albo nadrzędny + // bit 8: =1 wierzchołki wyświetlane z indeksów + // bit 9: =1 wczytano z pliku tekstowego (jest właścicielem tablic) + // bit 13: =1 wystarczy przesunięcie zamiast mnożenia macierzy (trzy jedynki) + // bit 14: =1 wymagane przechowanie macierzy (animacje) + // bit 15: =1 wymagane przechowanie macierzy (transform niejedynkowy) + union + { // transform, nie każdy submodel musi mieć + float4x4 *fMatrix; // pojedyncza precyzja wystarcza + // matrix4x4 *dMatrix; //do testu macierz podwójnej precyzji + int iMatrix; // w pliku binarnym jest numer matrycy + }; + int iNumVerts; // ilość wierzchołków (1 dla FreeSpotLight) + int iVboPtr; // początek na liście wierzchołków albo indeksów + int iTexture; // numer nazwy tekstury, -1 wymienna, 0 brak + float fVisible; // próg jasności światła do załączenia submodelu + float fLight; // próg jasności światła do zadziałania selfillum + float f4Ambient[4]; + float f4Diffuse[4]; // float ze względu na glMaterialfv() + float f4Specular[4]; + float f4Emision[4]; + float fWireSize; // nie używane, ale wczytywane + float fSquareMaxDist; + float fSquareMinDist; + // McZapkie-050702: parametry dla swiatla: + float fNearAttenStart; + float fNearAttenEnd; + bool bUseNearAtten; // te 3 zmienne okreslaja rysowanie aureoli wokol zrodla swiatla + int iFarAttenDecay; // ta zmienna okresla typ zaniku natezenia swiatla (0:brak, 1,2: potega 1/R) + float fFarDecayRadius; // normalizacja j.w. + float fCosFalloffAngle; // cosinus kąta stożka pod którym widać światło + float fCosHotspotAngle; // cosinus kąta stożka pod którym widać aureolę i zwiększone natężenie + // światła + float fCosViewAngle; // cos kata pod jakim sie teraz patrzy + // Ra: dalej są zmienne robocze, można je przestawiać z zachowaniem rozmiaru klasy + texture_manager::size_type TextureID; // numer tekstury, -1 wymienna, 0 brak + bool bWire; // nie używane, ale wczytywane + // short TexAlpha; //Ra: nie używane już + GLuint uiDisplayList; // roboczy numer listy wyświetlania + float Opacity; // nie używane, ale wczytywane + // ABu: te same zmienne, ale zdublowane dla Render i RenderAlpha, + // bo sie chrzanilo przemieszczanie obiektow. + // Ra: już się nie chrzani + float f_Angle; + float3 v_RotateAxis; + float3 v_Angles; - char space[8]; +public: // chwilowo + float3 v_TransVector; + float8 *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO + int iAnimOwner; // roboczy numer egzemplarza, który ustawił animację + TAnimType b_aAnim; // kody animacji oddzielnie, bo zerowane +public: + float4x4 *mAnimMatrix; // macierz do animacji kwaternionowych (należy do AnimContainer) + char space[8]; // wolne miejsce na przyszłe zmienne (zmniejszyć w miarę potrzeby) +public: + TSubModel ** + smLetter; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) + TSubModel *Parent; // nadrzędny, np. do wymnażania macierzy + int iVisible; // roboczy stan widoczności + // AnsiString asTexture; //robocza nazwa tekstury do zapisania w pliku binarnym + // AnsiString asName; //robocza nazwa + char *pTexture; // robocza nazwa tekstury do zapisania w pliku binarnym + char *pName; // robocza nazwa +private: + // int SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 *pt,GLVERTEX + // *Vertices); + int SeekFaceNormal(unsigned int *Masks, int f, unsigned int dwMask, float3 *pt, float8 *Vertices); + void RaAnimation(TAnimType a); - public: - TSubModel ** - smLetter; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) - TSubModel *Parent; // nadrzędny, np. do wymnażania macierzy - int iVisible; // roboczy stan widoczności - // AnsiString asTexture; //robocza nazwa tekstury do zapisania w pliku binarnym - // AnsiString asName; //robocza nazwa - char *pTexture; // robocza nazwa tekstury do zapisania w pliku binarnym - char *pName; // robocza nazwa - private: - // int SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 *pt,GLVERTEX - // *Vertices); - int SeekFaceNormal(unsigned int *Masks, int f, unsigned int dwMask, float3 *pt, float8 *Vertices); - void RaAnimation(TAnimType a); - - public: - static size_t iInstance; // identyfikator egzemplarza, który aktualnie renderuje model - static texture_manager::size_type *ReplacableSkinId; - static int iAlpha; // maska bitowa dla danego przebiegu - static double fSquareDist; - static TModel3d *pRoot; - static std::string *pasText; // tekst dla wyświetlacza (!!!! do przemyślenia) - TSubModel(); - ~TSubModel(); - void FirstInit(); - int Load(cParser &Parser, TModel3d *Model, int Pos, bool dynamic); - void ChildAdd(TSubModel *SubModel); - void NextAdd(TSubModel *SubModel); - TSubModel * NextGet() - { - return Next; - }; - TSubModel * ChildGet() - { - return Child; - }; - int TriangleAdd(TModel3d *m, texture_manager::size_type tex, int tri); - float8 * TrianglePtr(int tex, int pos, int *la, int *ld, int *ls); - // float8* TrianglePtr(const char *tex,int tri); - // void SetRotate(vector3 vNewRotateAxis,float fNewAngle); - void SetRotate(float3 vNewRotateAxis, float fNewAngle); - void SetRotateXYZ(vector3 vNewAngles); - void SetRotateXYZ(float3 vNewAngles); - void SetTranslate(vector3 vNewTransVector); - void SetTranslate(float3 vNewTransVector); - void SetRotateIK1(float3 vNewAngles); - TSubModel * GetFromName(std::string const &search, bool i = true); - TSubModel * GetFromName(char const *search, bool i = true); - void RenderDL(); - void RenderAlphaDL(); - void RenderVBO(); - void RenderAlphaVBO(); - // inline matrix4x4* GetMatrix() {return dMatrix;}; - inline float4x4 * GetMatrix() - { - return fMatrix; - }; - // matrix4x4* GetTransform() {return Matrix;}; - inline void Hide() - { - iVisible = 0; - }; - void RaArrayFill(CVertNormTex *Vert); - // void Render(); - int FlagsCheck(); - void WillBeAnimated() - { - if (this) - iFlags |= 0x4000; - }; - void InitialRotate(bool doit); - void DisplayLists(); - void Info(); - void InfoSet(TSubModelInfo *info); - void BinInit(TSubModel *s, float4x4 *m, float8 *v, TStringPack *t, TStringPack *n = NULL, - bool dynamic = false); - void ReplacableSet(texture_manager::size_type *r, int a) - { - ReplacableSkinId = r; - iAlpha = a; - }; - void TextureNameSet(const char *n); - void NameSet(const char *n); - // Ra: funkcje do budowania terenu z E3D - int Flags() - { - return iFlags; - }; - void UnFlagNext() - { - iFlags &= 0x00FFFFFF; - }; - void ColorsSet(int *a, int *d, int *s); - inline float3 Translation1Get() - { - return fMatrix ? *(fMatrix->TranslationGet()) + v_TransVector : v_TransVector; - } - inline float3 Translation2Get() - { - return *(fMatrix->TranslationGet()) + Child->Translation1Get(); - } - int GetTextureId() - { - return TextureID; - } - void ParentMatrix(float4x4 *m); - float MaxY(const float4x4 &m); - void AdjustDist(); +public: + static int iInstance; // identyfikator egzemplarza, który aktualnie renderuje model + static texture_manager::size_type *ReplacableSkinId; + static int iAlpha; // maska bitowa dla danego przebiegu + static double fSquareDist; + static TModel3d *pRoot; + static std::string *pasText; // tekst dla wyświetlacza (!!!! do przemyślenia) + TSubModel(); + ~TSubModel(); + void FirstInit(); + int Load(cParser &Parser, TModel3d *Model, int Pos, bool dynamic); + void ChildAdd(TSubModel *SubModel); + void NextAdd(TSubModel *SubModel); + TSubModel * NextGet() + { + return Next; + }; + TSubModel * ChildGet() + { + return Child; + }; + int TriangleAdd(TModel3d *m, texture_manager::size_type tex, int tri); + float8 * TrianglePtr(int tex, int pos, int *la, int *ld, int *ls); + // float8* TrianglePtr(const char *tex,int tri); + // void SetRotate(vector3 vNewRotateAxis,float fNewAngle); + void SetRotate(float3 vNewRotateAxis, float fNewAngle); + void SetRotateXYZ(vector3 vNewAngles); + void SetRotateXYZ(float3 vNewAngles); + void SetTranslate(vector3 vNewTransVector); + void SetTranslate(float3 vNewTransVector); + void SetRotateIK1(float3 vNewAngles); + TSubModel * GetFromName(std::string const &search, bool i = true); + TSubModel * GetFromName(char const *search, bool i = true); + void RenderDL(); + void RenderAlphaDL(); + void RenderVBO(); + void RenderAlphaVBO(); + // inline matrix4x4* GetMatrix() {return dMatrix;}; + inline float4x4 * GetMatrix() + { + return fMatrix; + }; + // matrix4x4* GetTransform() {return Matrix;}; + inline void Hide() + { + iVisible = 0; + }; + void RaArrayFill(CVertNormTex *Vert); + // void Render(); + int FlagsCheck(); + void WillBeAnimated() + { + if (this) + iFlags |= 0x4000; + }; + void InitialRotate(bool doit); + void DisplayLists(); + void Info(); + void InfoSet(TSubModelInfo *info); + void BinInit(TSubModel *s, float4x4 *m, float8 *v, TStringPack *t, TStringPack *n = NULL, + bool dynamic = false); + void ReplacableSet(texture_manager::size_type *r, int a) + { + ReplacableSkinId = r; + iAlpha = a; + }; + void TextureNameSet(const char *n); + void NameSet(const char *n); + // Ra: funkcje do budowania terenu z E3D + int Flags() + { + return iFlags; + }; + void UnFlagNext() + { + iFlags &= 0x00FFFFFF; + }; + void ColorsSet(int *a, int *d, int *s); + inline float3 Translation1Get() + { + return fMatrix ? *(fMatrix->TranslationGet()) + v_TransVector : v_TransVector; + } + inline float3 Translation2Get() + { + return *(fMatrix->TranslationGet()) + Child->Translation1Get(); + } + int GetTextureId() + { + return TextureID; + } + void ParentMatrix(float4x4 *m); + float MaxY(const float4x4 &m); + void AdjustDist(); }; class TSubModelInfo { // klasa z informacjami o submodelach, do tworzenia pliku binarnego - public: - TSubModel *pSubModel; // wskaźnik na submodel - int iTransform; // numer transformu (-1 gdy brak) - int iName; // numer nazwy - int iTexture; // numer tekstury - int iNameLen; // długość nazwy - int iTextureLen; // długość tekstury - size_t iNext, iChild; // numer następnego i potomnego - static int iTotalTransforms; // ilość transformów - static int iTotalNames; // ilość nazw - static int iTotalTextures; // ilość tekstur - static int iCurrent; // aktualny obiekt - static TSubModelInfo *pTable; // tabele obiektów pomocniczych - TSubModelInfo() - { - pSubModel = NULL; - iTransform = iName = iTexture = -1; - iNext = iChild = -1; // nie ma - iNameLen = iTextureLen = 0; - } - void Reset() - { - pTable = this; // ustawienie wskaźnika tabeli obiektów - iTotalTransforms = iTotalNames = iTotalTextures = iCurrent = 0; // zerowanie liczników - } - ~TSubModelInfo(){}; +public: + TSubModel *pSubModel; // wskaźnik na submodel + int iTransform; // numer transformu (-1 gdy brak) + int iName; // numer nazwy + int iTexture; // numer tekstury + int iNameLen; // długość nazwy + int iTextureLen; // długość tekstury + int iNext, iChild; // numer następnego i potomnego + static int iTotalTransforms; // ilość transformów + static int iTotalNames; // ilość nazw + static int iTotalTextures; // ilość tekstur + static int iCurrent; // aktualny obiekt + static TSubModelInfo *pTable; // tabele obiektów pomocniczych + TSubModelInfo() + { + pSubModel = NULL; + iTransform = iName = iTexture = iNext = iChild = -1; // nie ma + iNameLen = iTextureLen = 0; + } + void Reset() + { + pTable = this; // ustawienie wskaźnika tabeli obiektów + iTotalTransforms = iTotalNames = iTotalTextures = iCurrent = 0; // zerowanie liczników + } + ~TSubModelInfo() {}; }; class TModel3d : public CMesh { - private: - // TMaterial *Materials; - // int MaterialsCount; //Ra: nie używane - // bool TractionPart; //Ra: nie używane - TSubModel *Root; // drzewo submodeli - int iFlags; // Ra: czy submodele mają przezroczyste tekstury - public: // Ra: tymczasowo - int iNumVerts; // ilość wierzchołków (gdy nie ma VBO, to m_nVertexCount=0) - private: - TStringPack Textures; // nazwy tekstur - TStringPack Names; // nazwy submodeli - int *iModel; // zawartość pliku binarnego - int iSubModelsCount; // Ra: używane do tworzenia binarnych - std::string asBinary; // nazwa pod którą zapisać model binarny - public: - inline TSubModel * GetSMRoot() - { - return (Root); - }; - // double Radius; //Ra: nie używane - TModel3d(); - TModel3d(char *FileName); - ~TModel3d(); - TSubModel * GetFromName(const char *sName); - // TMaterial* GetMaterialFromName(char *sName); - TSubModel * AddToNamed(const char *Name, TSubModel *SubModel); - void AddTo(TSubModel *tmp, TSubModel *SubModel); - void LoadFromTextFile(std::string const &FileName, bool dynamic); - void LoadFromBinFile(std::string const &FileName, bool dynamic); - bool LoadFromFile(std::string const &FileName, bool dynamic); - void SaveToBinFile(char const *FileName); - void BreakHierarhy(); - // renderowanie specjalne - void Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RaRender(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RaRenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - // jeden kąt obrotu - void Render(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RenderAlpha(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RaRender(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RaRenderAlpha(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - // trzy kąty obrotu - void Render( vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RenderAlpha( vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RaRender( vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RaRenderAlpha( vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - // inline int GetSubModelsCount() { return (SubModelsCount); }; - int Flags() - { - return iFlags; - }; - void Init(); - char * NameGet() - { - return Root ? Root->pName : NULL; - }; - int TerrainCount(); - TSubModel * TerrainSquare(int n); - void TerrainRenderVBO(int n); +private: + // TMaterial *Materials; + // int MaterialsCount; //Ra: nie używane + // bool TractionPart; //Ra: nie używane + TSubModel *Root; // drzewo submodeli + int iFlags; // Ra: czy submodele mają przezroczyste tekstury +public: // Ra: tymczasowo + int iNumVerts; // ilość wierzchołków (gdy nie ma VBO, to m_nVertexCount=0) +private: + TStringPack Textures; // nazwy tekstur + TStringPack Names; // nazwy submodeli + int *iModel; // zawartość pliku binarnego + int iSubModelsCount; // Ra: używane do tworzenia binarnych + std::string asBinary; // nazwa pod którą zapisać model binarny +public: + inline TSubModel * GetSMRoot() + { + return (Root); + }; + // double Radius; //Ra: nie używane + TModel3d(); + TModel3d(char *FileName); + ~TModel3d(); + TSubModel * GetFromName(const char *sName); + // TMaterial* GetMaterialFromName(char *sName); + TSubModel * AddToNamed(const char *Name, TSubModel *SubModel); + void AddTo(TSubModel *tmp, TSubModel *SubModel); + void LoadFromTextFile(std::string const &FileName, bool dynamic); + void LoadFromBinFile(std::string const &FileName, bool dynamic); + bool LoadFromFile(std::string const &FileName, bool dynamic); + void SaveToBinFile(char const *FileName); + void BreakHierarhy(); + // renderowanie specjalne + void Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); + void RenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + void RaRender(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); + void RaRenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + // jeden kąt obrotu + void Render(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + void RenderAlpha(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + void RaRender(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + void RaRenderAlpha(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + // trzy kąty obrotu + void Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + void RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + void RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + void RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, + int iAlpha = 0x30300030); + // inline int GetSubModelsCount() { return (SubModelsCount); }; + int Flags() + { + return iFlags; + }; + void Init(); + char * NameGet() + { + return Root ? Root->pName : NULL; + }; + int TerrainCount(); + TSubModel * TerrainSquare(int n); + void TerrainRenderVBO(int n); }; //--------------------------------------------------------------------------- From e24ad4449e96b99ed38dc4d5db869bdb2c6b4e6c Mon Sep 17 00:00:00 2001 From: VB Date: Wed, 15 Feb 2017 17:30:38 +0100 Subject: [PATCH 011/426] minimum 1.4 gl --- World.cpp | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/World.cpp b/World.cpp index 3cc3bfb6..99f4c026 100644 --- a/World.cpp +++ b/World.cpp @@ -188,15 +188,12 @@ bool TWorld::Init(GLFWwindow *w) std::string glver = ((char *)glGetString(GL_VERSION)); WriteLog("OpenGL Version:"); WriteLog(glver); - if ((glver == "1.5.1") || (glver == "1.5.2")) - { - Error("Niekompatybilna wersja openGL - dwuwymiarowy tekst nie bedzie wyswietlany!"); - WriteLog("WARNING! This OpenGL version is not fully compatible with simulator!"); - WriteLog("UWAGA! Ta wersja OpenGL nie jest w pelni kompatybilna z symulatorem!"); - Global::detonatoryOK = false; - } - else - Global::detonatoryOK = true; + if (!GLEW_VERSION_1_4) + { + std::cout << "required opengl >=1.4" << std::endl; + return false; + } + // Ra: umieszczone w EU07.cpp jakoś nie chce działać while( glver.rfind( '.' ) > glver.find( '.' ) ) { glver = glver.substr( 0, glver.rfind( '.' ) - 1 ); // obcięcie od drugiej kropki @@ -225,15 +222,6 @@ bool TWorld::Init(GLFWwindow *w) WriteLog((char *)glGetString(GL_EXTENSIONS)); if (GLEW_ARB_vertex_buffer_object) // czy jest VBO w karcie graficznej { - if( std::string( (char *)glGetString(GL_VENDOR) ).find("Intel") != std::string::npos ) // wymuszenie tylko dla kart Intel - { // karty Intel nie nadają się do grafiki 3D, ale robimy wyjątek, bo to w końcu symulator - Global::iMultisampling = - 0; // to robi problemy na "Intel(R) HD Graphics Family" - czarny ekran - if (Global::fOpenGL >= - 1.4) // 1.4 miało obsługę VBO, ale bez opcji modyfikacji fragmentu bufora - Global::bUseVBO = true; // VBO włączane tylko, jeśli jest obsługa oraz nie ustawiono - // niższego numeru - } if (Global::bUseVBO) WriteLog("Ra: The VBO is found and will be used."); else From 013a6f055960b1d0bf7cd08ffaf9a879556d1c73 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 15 Feb 2017 22:57:48 +0100 Subject: [PATCH 012/426] light wrapper object --- DynObj.cpp | 69 +++------- Globals.cpp | 4 + Globals.h | 53 +++++++ Ground.cpp | 112 ++++++++++----- Track.cpp | 6 + Traction.cpp | 24 +++- World.cpp | 95 +++++++++++-- World.h | 2 + maszyna.vcxproj | 2 + maszyna.vcxproj.filters | 6 + sky.cpp | 21 ++- sun.cpp | 298 ++++++++++++++++++++++++++++++++++++++++ sun.h | 99 +++++++++++++ 13 files changed, 682 insertions(+), 109 deletions(-) create mode 100644 sun.cpp create mode 100644 sun.h diff --git a/DynObj.cpp b/DynObj.cpp index 9dba3343..0442e7a7 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3771,6 +3771,8 @@ void TDynamicObject::Render() glTranslated(vPosition.x, vPosition.y, vPosition.z); // standardowe przesunięcie względem początku scenerii glMultMatrixd(mMatrix.getArray()); +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this if (fShade > 0.0) { // Ra: zmiana oswietlenia w tunelu, wykopie GLfloat ambientLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; @@ -3787,6 +3789,7 @@ void TDynamicObject::Render() glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseLight); glLightfv(GL_LIGHT0, GL_SPECULAR, specularLight); } +#endif if (Global::bUseVBO) { // wersja VBO if (mdLowPolyInt) @@ -3819,6 +3822,8 @@ void TDynamicObject::Render() // ma byc wyswietlana // ABu: tylko w trybie FreeFly, zwykly tryb w world.cpp // Ra: świetła są ustawione dla zewnętrza danego pojazdu +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-mplement this // oswietlenie kabiny GLfloat ambientCabLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; GLfloat diffuseCabLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; @@ -3854,20 +3859,25 @@ void TDynamicObject::Render() glLightfv(GL_LIGHT0, GL_AMBIENT, ambientCabLight); glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseCabLight); glLightfv(GL_LIGHT0, GL_SPECULAR, specularCabLight); +#endif if (Global::bUseVBO) mdKabina->RaRender(ObjSqrDist, 0); else mdKabina->Render(ObjSqrDist, 0); +#ifdef EU07_USE_OLD_LIGHTING_MODEL glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); +#endif } - if (fShade != 0.0) // tylko jeśli było zmieniane +#ifdef EU07_USE_OLD_LIGHTING_MODEL + if( fShade != 0.0 ) // tylko jeśli było zmieniane { // przywrócenie standardowego oświetlenia glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); } +#endif glPopMatrix(); if (btnOn) TurnOff(); // przywrócenie domyślnych pozycji submodeli @@ -4265,6 +4275,8 @@ void TDynamicObject::RenderAlpha() glTranslated(vPosition.x, vPosition.y, vPosition.z); // standardowe przesunięcie względem początku scenerii glMultMatrixd(mMatrix.getArray()); +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this if (fShade > 0.0) { // Ra: zmiana oswietlenia w tunelu, wykopie GLfloat ambientLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; @@ -4281,6 +4293,7 @@ void TDynamicObject::RenderAlpha() glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseLight); glLightfv(GL_LIGHT0, GL_SPECULAR, specularLight); } +#endif if (Global::bUseVBO) { // wersja VBO if (mdLowPolyInt) @@ -4303,63 +4316,15 @@ void TDynamicObject::RenderAlpha() // if (mdPrzedsionek) //Ra: przedsionków tu wcześniej nie było - włączyć? // mdPrzedsionek->RenderAlpha(ObjSqrDist,ReplacableSkinID,iAlpha); } - /* skoro false to można wyciąc - //ABu: Tylko w trybie freefly - if (false)//((mdKabina!=mdModel) && bDisplayCab && FreeFlyModeFlag) - { - //oswietlenie kabiny - GLfloat ambientCabLight[4]= { 0.5f, 0.5f, 0.5f, 1.0f }; - GLfloat diffuseCabLight[4]= { 0.5f, 0.5f, 0.5f, 1.0f }; - GLfloat specularCabLight[4]= { 0.5f, 0.5f, 0.5f, 1.0f }; - for (int li=0; li<3; li++) - { - ambientCabLight[li]= Global::ambientDayLight[li]*0.9; - diffuseCabLight[li]= Global::diffuseDayLight[li]*0.5; - specularCabLight[li]= Global::specularDayLight[li]*0.5; - } - switch (MyTrack->eEnvironment) - { - case e_canyon: - { - for (int li=0; li<3; li++) - { - diffuseCabLight[li]*= 0.6; - specularCabLight[li]*= 0.8; - } - } - break; - case e_tunnel: - { - for (int li=0; li<3; li++) - { - ambientCabLight[li]*= 0.3; - diffuseCabLight[li]*= 0.1; - specularCabLight[li]*= 0.2; - } - } - break; - } - // dorobic swiatlo od drugiej strony szyby - - glLightfv(GL_LIGHT0,GL_AMBIENT,ambientCabLight); - glLightfv(GL_LIGHT0,GL_DIFFUSE,diffuseCabLight); - glLightfv(GL_LIGHT0,GL_SPECULAR,specularCabLight); - - mdKabina->RenderAlpha(ObjSqrDist,0); - //smierdzi - // mdModel->RenderAlpha(SquareMagnitude(Global::pCameraPosition-pos),0); - - glLightfv(GL_LIGHT0,GL_AMBIENT,Global::ambientDayLight); - glLightfv(GL_LIGHT0,GL_DIFFUSE,Global::diffuseDayLight); - glLightfv(GL_LIGHT0,GL_SPECULAR,Global::specularDayLight); - } - */ +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this if (fShade != 0.0) // tylko jeśli było zmieniane { // przywrócenie standardowego oświetlenia glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); } +#endif glPopMatrix(); if (btnOn) TurnOff(); // przywrócenie domyślnych pozycji submodeli diff --git a/Globals.cpp b/Globals.cpp index 348fa827..fcd165a6 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -90,12 +90,16 @@ double Global::fFogEnd = 2000; float Global::Background[3] = {0.2, 0.4, 0.33}; GLfloat Global::AtmoColor[] = {0.423f, 0.702f, 1.0f}; GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; +#ifdef EU07_USE_OLD_LIGHTING_MODEL GLfloat Global::ambientDayLight[] = {0.40f, 0.40f, 0.45f, 1.0f}; // robocze GLfloat Global::diffuseDayLight[] = {0.55f, 0.54f, 0.50f, 1.0f}; GLfloat Global::specularDayLight[] = {0.95f, 0.94f, 0.90f, 1.0f}; GLfloat Global::ambientLight[] = {0.80f, 0.80f, 0.85f, 1.0f}; // stałe GLfloat Global::diffuseLight[] = {0.85f, 0.85f, 0.80f, 1.0f}; GLfloat Global::specularLight[] = {0.95f, 0.94f, 0.90f, 1.0f}; +#else +opengl_light Global::DayLight; +#endif GLfloat Global::whiteLight[] = {1.00f, 1.00f, 1.00f, 1.0f}; GLfloat Global::noLight[] = {0.00f, 0.00f, 0.00f, 1.0f}; GLfloat Global::darkLight[] = {0.03f, 0.03f, 0.03f, 1.0f}; //śladowe diff --git a/Globals.h b/Globals.h index 2793ed30..e20c581a 100644 --- a/Globals.h +++ b/Globals.h @@ -120,6 +120,53 @@ class cParser; // nowy (powolny!) parser class TEvent; class TTextSound; +// bare-bones render controller, in lack of anything better yet +struct opengl_renderer { + + GLenum static const sunlight{ GL_LIGHT0 }; + GLenum static const ambientlight{ GL_LIGHT1 }; + + enum class rendermode { + color + }; + + rendermode renderpass{ rendermode::color }; +}; + +struct opengl_light { + + GLuint id{ -1 }; + Math3D::vector3 direction; + GLfloat position[ 4 ]; // 4th parameter specifies directional(0) or omni-directional(1) light source + GLfloat ambient[ 4 ]; + GLfloat diffuse[ 4 ]; + GLfloat specular[ 4 ]; + + opengl_light() { + position[ 0 ] = position[ 1 ] = position[ 2 ] = 0.0f; position[ 3 ] = 1.0f; + ambient[ 0 ] = ambient[ 1 ] = ambient[ 2 ] = ambient[ 3 ] = 1.0f; + diffuse[ 0 ] = diffuse[ 1 ] = diffuse[ 2 ] = diffuse[ 3 ] = 1.0f; + specular[ 0 ] = specular[ 1 ] = specular[ 2 ] = specular[ 3 ] = 1.0f; + } + + inline + void apply_intensity() { + + glLightfv( id, GL_AMBIENT, ambient ); + glLightfv( id, GL_DIFFUSE, diffuse ); + glLightfv( id, GL_SPECULAR, specular ); + } + inline + void apply_angle() { + + glLightfv( id, GL_POSITION, position ); + if( position[ 3 ] == 1.0f ) { + GLfloat directionarray[] = { direction.x, direction.y, direction.z }; + glLightfv( id, GL_SPOT_DIRECTION, directionarray ); + } + } +}; + class TTranscript { // klasa obsługująca linijkę napisu do dźwięku public: @@ -220,12 +267,18 @@ class Global static GLfloat AtmoColor[]; static GLfloat FogColor[]; // static bool bTimeChange; +#ifdef EU07_USE_OLD_LIGHTING_MODEL + static opengl_light AmbientLight; + static GLfloat ambientDayLight[]; static GLfloat diffuseDayLight[]; static GLfloat specularDayLight[]; static GLfloat ambientLight[]; static GLfloat diffuseLight[]; static GLfloat specularLight[]; +#else + static opengl_light DayLight; +#endif static GLfloat whiteLight[]; static GLfloat noLight[]; static GLfloat darkLight[]; diff --git a/Ground.cpp b/Ground.cpp index b1d55d3c..5afdccca 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -327,9 +327,15 @@ void TGroundNode::RenderVBO() if (linealpha > 255) linealpha = 255; float r, g, b; - r = floor(Diffuse[0] * Global::ambientDayLight[0]); // w zaleznosci od koloru swiatla - g = floor(Diffuse[1] * Global::ambientDayLight[1]); - b = floor(Diffuse[2] * Global::ambientDayLight[2]); +#ifdef EU07_USE_OLD_LIGHTING_MODEL + r = floor( Diffuse[ 0 ] * Global::ambientDayLight[ 0 ] ); // w zaleznosci od koloru swiatla + g = floor( Diffuse[ 1 ] * Global::ambientDayLight[ 1 ] ); + b = floor( Diffuse[ 2 ] * Global::ambientDayLight[ 2 ] ); +#else + r = floor( Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ); // w zaleznosci od koloru swiatla + g = floor( Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ); + b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); +#endif glColor4ub(r, g, b, linealpha); // przezroczystosc dalekiej linii // glDisable(GL_LIGHTING); //nie powinny świecić glDrawArrays(iType, iVboPtr, iNumPts); // rysowanie linii @@ -388,9 +394,15 @@ void TGroundNode::RenderAlphaVBO() float linealpha = 255000 * fLineThickness / (mgn + 1.0); if (linealpha > 255) linealpha = 255; - r = Diffuse[0] * Global::ambientDayLight[0]; // w zaleznosci od koloru swiatla - g = Diffuse[1] * Global::ambientDayLight[1]; - b = Diffuse[2] * Global::ambientDayLight[2]; +#ifdef EU07_USE_OLD_LIGHTING_MODEL + r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla + g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; + b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; +#else + r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla + g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; + b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; +#endif glColor4ub(r, g, b, linealpha); // przezroczystosc dalekiej linii // glDisable(GL_LIGHTING); //nie powinny świecić glDrawArrays(iType, iVboPtr, iNumPts); // rysowanie linii @@ -583,9 +595,15 @@ void TGroundNode::RenderDL() // if (iNumPts) { // wszelkie linie są rysowane na samym końcu float r, g, b; - r = Diffuse[0] * Global::ambientDayLight[0]; // w zaleznosci od koloru swiatla - g = Diffuse[1] * Global::ambientDayLight[1]; - b = Diffuse[2] * Global::ambientDayLight[2]; +#ifdef EU07_USE_OLD_LIGHTING_MODEL + r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla + g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; + b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; +#else + r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla + g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; + b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; +#endif glColor4ub(r, g, b, 1.0); glCallList(DisplayListID); // glColor4fv(Diffuse); //przywrócenie koloru @@ -659,9 +677,15 @@ void TGroundNode::RenderAlphaDL() float linealpha = 255000 * fLineThickness / (mgn + 1.0); if (linealpha > 255) linealpha = 255; - r = Diffuse[0] * Global::ambientDayLight[0]; // w zaleznosci od koloru swiatla - g = Diffuse[1] * Global::ambientDayLight[1]; - b = Diffuse[2] * Global::ambientDayLight[2]; +#ifdef EU07_USE_OLD_LIGHTING_MODEL + r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla + g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; + b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; +#else + r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla + g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; + b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; +#endif glColor4ub(r, g, b, linealpha); // przezroczystosc dalekiej linii glCallList(DisplayListID); } @@ -2454,15 +2478,20 @@ void TGround::FirstInit() else glDisable(GL_FOG); glDisable(GL_LIGHTING); +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO, TBD: re-implement this glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); // daylight position glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); // kolor wszechobceny glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); // kolor padający glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); // kolor odbity // musi być tutaj, bo wcześniej nie mieliśmy wartości światła +#endif /* if (Global::fMoveLight >= 0.0) // albo tak, albo niech ustala minimum ciemności w nocy { */ +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO, TBD: re-implement this Global::fLuminance = // obliczenie luminacji "światła w ciemności" +0.150 * Global::ambientDayLight[0] // R + 0.295 * Global::ambientDayLight[1] // G @@ -2472,6 +2501,7 @@ void TGround::FirstInit() Global::ambientDayLight[i] *= 0.1 / Global::fLuminance; // ograniczenie jasności w nocy glLightModelfv(GL_LIGHT_MODEL_AMBIENT, Global::ambientDayLight); +#endif /* } else if (Global::bDoubleAmbient) // Ra: wcześniej było ambient dawane na obydwa światła @@ -2837,6 +2867,7 @@ bool TGround::Init(std::string asFile, HDC hDC) else if (str == "light") { // Ra: ustawianie światła przeniesione do FirstInit WriteLog("Scenery light definition"); +#ifdef EU07_USE_OLD_LIGHTING_MODEL vector3 lp; parser.getTokens(); parser >> lp.x; @@ -2848,27 +2879,44 @@ bool TGround::Init(std::string asFile, HDC hDC) Global::lightPos[0] = lp.x; // daylight position Global::lightPos[1] = lp.y; Global::lightPos[2] = lp.z; - parser.getTokens(); - parser >> Global::ambientDayLight[0]; // kolor wszechobceny - parser.getTokens(); - parser >> Global::ambientDayLight[1]; - parser.getTokens(); - parser >> Global::ambientDayLight[2]; - - parser.getTokens(); - parser >> Global::diffuseDayLight[0]; // kolor padający - parser.getTokens(); - parser >> Global::diffuseDayLight[1]; - parser.getTokens(); - parser >> Global::diffuseDayLight[2]; - - parser.getTokens(); - parser >> Global::specularDayLight[0]; // kolor odbity - parser.getTokens(); - parser >> Global::specularDayLight[1]; - parser.getTokens(); - parser >> Global::specularDayLight[2]; +#else + parser.getTokens(3, false); + parser + >> Global::DayLight.direction.x + >> Global::DayLight.direction.y + >> Global::DayLight.direction.z;; + Global::DayLight.direction.Normalize(); +#endif + parser.getTokens(9, false); +#ifdef EU07_USE_OLD_LIGHTING_MODEL + parser + >> Global::ambientDayLight[ 0 ] + >> Global::ambientDayLight[ 1 ] + >> Global::ambientDayLight[ 2 ] + >> Global::diffuseDayLight[ 0 ] + >> Global::diffuseDayLight[ 1 ] + >> Global::diffuseDayLight[ 2 ] + >> Global::specularDayLight[ 0 ] + >> Global::specularDayLight[ 1 ] + >> Global::specularDayLight[ 2 ]; +#else +/* + parser + // kolor wszechobceny + >> Global::DayLight.ambient[0] + >> Global::DayLight.ambient[1] + >> Global::DayLight.ambient[2] + // kolor padający + >> Global::DayLight.diffuse[0] + >> Global::DayLight.diffuse[1] + >> Global::DayLight.diffuse[2] + // kolor odbity + >> Global::DayLight.specular[0] + >> Global::DayLight.specular[1] + >> Global::DayLight.specular[2]; +*/ +#endif do { parser.getTokens(); diff --git a/Track.cpp b/Track.cpp index d36b4016..10eab7a7 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2583,6 +2583,8 @@ void TTrack::RaRenderVBO(int iPtr) void TTrack::EnvironmentSet() { // ustawienie zmienionego światła glColor3f(1.0f, 1.0f, 1.0f); // Ra: potrzebne to? +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this if (eEnvironment) { // McZapkie-310702: zmiana oswietlenia w tunelu, wykopie GLfloat ambientLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; @@ -2614,10 +2616,13 @@ void TTrack::EnvironmentSet() break; } } +#endif }; void TTrack::EnvironmentReset() { // przywrócenie domyślnego światła +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this switch (eEnvironment) { // przywrócenie globalnych ustawień światła, o ile było zmienione case e_canyon: // wykop @@ -2626,6 +2631,7 @@ void TTrack::EnvironmentReset() glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); } +#endif }; void TTrack::RenderDyn() diff --git a/Traction.cpp b/Traction.cpp index c9a2bdf2..e5a17614 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -323,9 +323,15 @@ void TTraction::RenderDL(float mgn) // McZapkie: mgn to odleglosc od obserwatora g *= 0.6; b *= 0.6; } - r *= Global::ambientDayLight[0]; // w zaleźności od koloru swiatła - g *= Global::ambientDayLight[1]; - b *= Global::ambientDayLight[2]; +#ifdef EU07_USE_OLD_LIGHTING_MODEL + r *= Global::ambientDayLight[ 0 ]; // w zaleźności od koloru swiatła + g *= Global::ambientDayLight[ 1 ]; + b *= Global::ambientDayLight[ 2 ]; +#else + r *= Global::DayLight.ambient[ 0 ]; // w zaleźności od koloru swiatła + g *= Global::DayLight.ambient[ 1 ]; + b *= Global::DayLight.ambient[2]; +#endif if (linealpha > 1.0) linealpha = 1.0; // trzeba ograniczyć do <=1 glColor4f(r, g, b, linealpha); @@ -527,9 +533,15 @@ void TTraction::RenderVBO(float mgn, int iPtr) b = 0.0; break; //żółte z podłączonym zasilaniem z obu stron } - r = r * Global::ambientDayLight[0]; // w zaleznosci od koloru swiatla - g = g * Global::ambientDayLight[1]; - b = b * Global::ambientDayLight[2]; +#ifdef EU07_USE_OLD_LIGHTING_MODEL + r *= Global::ambientDayLight[ 0 ]; // w zaleźności od koloru swiatła + g *= Global::ambientDayLight[ 1 ]; + b *= Global::ambientDayLight[ 2 ]; +#else + r *= Global::DayLight.ambient[ 0 ]; // w zaleźności od koloru swiatła + g *= Global::DayLight.ambient[ 1 ]; + b *= Global::DayLight.ambient[ 2 ]; +#endif if (linealpha > 1.0) linealpha = 1.0; // trzeba ograniczyć do <=1 glColor4f(r, g, b, linealpha); diff --git a/World.cpp b/World.cpp index c0188625..ed342300 100644 --- a/World.cpp +++ b/World.cpp @@ -347,7 +347,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) // glLineWidth(2.0f); WriteLog("glPointSize(2.0f);"); glPointSize(2.0f); - +#ifdef EU07_USE_OLD_LIGHTING_MODEL // ----------- LIGHTING SETUP ----------- // Light values and coordinates @@ -359,7 +359,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Global::lightPos[3] = 0.0f; // Ra: światła by sensowniej było ustawiać po wczytaniu scenerii - + // TODO: re-implement this // Ra: szczątkowe światło rozproszone - żeby było cokolwiek widać w ciemności WriteLog("glLightModelfv(GL_LIGHT_MODEL_AMBIENT,darkLight);"); glLightModelfv(GL_LIGHT_MODEL_AMBIENT, Global::darkLight); @@ -375,7 +375,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); WriteLog("glEnable(GL_LIGHT0);"); glEnable(GL_LIGHT0); - +#endif // glColor() ma zmieniać kolor wybrany w glColorMaterial() WriteLog("glEnable(GL_COLOR_MATERIAL);"); glEnable(GL_COLOR_MATERIAL); @@ -470,13 +470,22 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) SetForegroundWindow(hWnd); WriteLog("Sound Init"); + glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + glDisable( GL_DEPTH_TEST ); // Disables depth testing +#ifndef EU07_USE_OLD_LIGHTING_MODEL + glEnable( GL_LIGHTING ); + glEnable( GL_LIGHT0 ); +#endif + glLoadIdentity(); // glColor4f(0.3f,0.0f,0.0f,0.0f); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glTranslatef(0.0f, 0.0f, -0.50f); // glRasterPos2f(-0.25f, -0.10f); - glDisable(GL_DEPTH_TEST); // Disables depth testing - glColor3f(3.0f, 3.0f, 3.0f); +#ifdef EU07_USE_OLD_LIGHTING_MODEL + glColor3f( 3.0f, 3.0f, 3.0f ); +#else + glColor3f( 1.0f, 1.0f, 1.0f ); +#endif auto logo = TextureManager.GetTextureId( "logo", szTexturePath, 6 ); TextureManager.Bind(logo); // Select our texture @@ -492,7 +501,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glVertex3f(-0.28f, 0.22f, 0.0f); // top left of the texture and quad glEnd(); //~logo; Ra: to jest bez sensu zapis - glColor3f(0.0f, 0.0f, 100.0f); + glColor3f(0.0f, 0.0f, 1.0f); if (Global::detonatoryOK) { glRasterPos2f(-0.25f, -0.09f); @@ -502,7 +511,6 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) } SwapBuffers(hDC); // Swap Buffers (Double Buffering) - glEnable(GL_LIGHTING); /*-----------------------Sound Initialization-----------------------*/ TSoundsManager::Init(hWnd); // TSoundsManager::LoadSounds( "" ); @@ -562,8 +570,26 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) } SwapBuffers(hDC); // Swap Buffers (Double Buffering) +#ifndef EU07_USE_OLD_LIGHTING_MODEL + // setup lighting +// GLfloat ambient[] = { 0.65f, 0.65f, 0.65f, 0.5f }; + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + + Global::DayLight.id = opengl_renderer::sunlight; + // directional light + // TODO, TBD: test omni-directional variant + Global::DayLight.position[ 3 ] = 1.0f; + ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0 ); + // rgb value for 5780 kelvin + Global::DayLight.diffuse[ 0 ] = 255.0 / 255.0; + Global::DayLight.diffuse[ 1 ] = 242.0 / 255.0; + Global::DayLight.diffuse[ 2 ] = 231.0 / 255.0; +#endif + Ground.Init(Global::SceneryFile, hDC); // Global::tSinceStart= 0; + Sun.init(); Clouds.Init(); WriteLog("Ground init OK"); if (Global::detonatoryOK) @@ -1401,6 +1427,7 @@ void TWorld::Update_Lights() { return; } +#ifdef EU07_USE_OLD_LIGHTING_MODEL // double a=Global::fTimeAngleDeg/180.0*M_PI-M_PI; //kąt godzinny w radianach double a = fmod( Global::fTimeAngleDeg, 360.0 ) / 180.0 * M_PI - M_PI; // kąt godzinny w radianach @@ -1478,7 +1505,32 @@ void TWorld::Update_Lights() { +0.150 * ( Global::diffuseDayLight[ 0 ] + Global::ambientDayLight[ 0 ] ) // R + 0.295 * ( Global::diffuseDayLight[ 1 ] + Global::ambientDayLight[ 1 ] ) // G + 0.055 * ( Global::diffuseDayLight[ 2 ] + Global::ambientDayLight[ 2 ] ); // B - +#else + Sun.update(); + auto const position = Sun.getPosition(); + Global::DayLight.position[0] = position.x; + Global::DayLight.position[1] = position.y; + Global::DayLight.position[2] = position.z; + auto const direction = -1.0 * Sun.getDirection(); + Global::DayLight.direction = direction; + auto const intensity = std::min( 2.0f * Sun.getIntensity(), 1.0f ); + + Global::DayLight.diffuse[ 0 ] = 255.0 / 255.0 * intensity; + Global::DayLight.diffuse[ 1 ] = 242.0 / 255.0 * intensity; + Global::DayLight.diffuse[ 2 ] = 231.0 / 255.0 * intensity; +// Global::DayLight.diffuse[ 3 ] = 1.0f;// std::min( 0.15f + intensity, 1.0f ); + Global::DayLight.ambient[ 0 ] = 205.0 / 255.0 * intensity * 0.75f; + Global::DayLight.ambient[ 1 ] = 217.0 / 255.0 * intensity * 0.75f; + Global::DayLight.ambient[ 2 ] = 231.0 / 255.0 * intensity * 0.75f; +// Global::DayLight.ambient[ 3 ] = 1.0f; + /* + // Global::DayLight.ambient[ 3 ] = intensity; + GLfloat ambient[] = { 0.1f + 0.5f * intensity, 0.1f + 0.5f * intensity, 0.1f + 0.5f * intensity, 0.5f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); +*/ + Global::fLuminance = intensity; +#endif + vector3 sky = vector3( Global::AtmoColor[ 0 ], Global::AtmoColor[ 1 ], Global::AtmoColor[ 2 ] ); if( Global::fLuminance < 0.25 ) { // przyspieszenie zachodu/wschodu sky *= 4.0 * Global::fLuminance; // nocny kolor nieba @@ -1503,14 +1555,20 @@ bool TWorld::Render() glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glLoadIdentity(); Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii - glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); - if (!Global::bWireFrame) - { // bez nieba w trybie rysowania linii - glDisable(GL_FOG); + if( !Global::bWireFrame ) { // bez nieba w trybie rysowania linii + glDisable( GL_FOG ); Clouds.Render(); - glEnable(GL_FOG); + glEnable( GL_FOG ); } + +#ifdef EU07_USE_OLD_LIGHTING_MODEL + glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); +#else + Sun.render( Camera.Pos ); + Global::DayLight.apply_angle(); + Global::DayLight.apply_intensity(); +#endif if (Global::bUseVBO) { // renderowanie przez VBO if (!Ground.RenderVBO(Camera.Pos)) @@ -1693,7 +1751,10 @@ TWorld::Render_Cab() { glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone if( dynamic->mdKabina ) // bo mogła zniknąć przy przechodzeniu do innego pojazdu - { // oswietlenie kabiny + { +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this + // oswietlenie kabiny GLfloat ambientCabLight[ 4 ] = { 0.5f, 0.5f, 0.5f, 1.0f }; GLfloat diffuseCabLight[ 4 ] = { 0.5f, 0.5f, 0.5f, 1.0f }; GLfloat specularCabLight[ 4 ] = { 0.5f, 0.5f, 0.5f, 1.0f }; @@ -1773,6 +1834,7 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_AMBIENT, ambientCabLight ); glLightfv( GL_LIGHT0, GL_DIFFUSE, diffuseCabLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, specularCabLight ); +#endif if( Global::bUseVBO ) { // renderowanie z użyciem VBO dynamic->mdKabina->RaRender( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); dynamic->mdKabina->RaRenderAlpha( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); @@ -1781,10 +1843,13 @@ TWorld::Render_Cab() { dynamic->mdKabina->Render( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); dynamic->mdKabina->RenderAlpha( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); } +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this // przywrócenie standardowych, bo zawsze są zmieniane glLightfv( GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight ); glLightfv( GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, Global::specularDayLight ); +#endif } glPopMatrix(); } diff --git a/World.h b/World.h index f710a515..61742e6b 100644 --- a/World.h +++ b/World.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "Camera.h" #include "Ground.h" #include "sky.h" +#include "sun.h" #include "mczapkie/mover.h" class TWorld @@ -53,6 +54,7 @@ class TWorld GLuint base; // numer DL dla znaków w napisach texture_manager::size_type light; // numer tekstury dla smugi TSky Clouds; + cSun Sun; TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury TMoverParameters *mvControlled; // wskaźnik na człon silnikowy, do wyświetlania jego parametrów int iCheckFPS; // kiedy znów sprawdzić FPS, żeby wyłączać optymalizacji od razu do zera diff --git a/maszyna.vcxproj b/maszyna.vcxproj index 2797b436..e15e29cf 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -128,6 +128,7 @@ Create Create + @@ -186,6 +187,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index fed256d5..994b2526 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -189,6 +189,9 @@ Source Files + + Source Files + @@ -365,6 +368,9 @@ Header Files\console + + Header Files + diff --git a/sky.cpp b/sky.cpp index fd622f47..0febec09 100644 --- a/sky.cpp +++ b/sky.cpp @@ -32,13 +32,22 @@ void TSky::Init() void TSky::Render() { +#ifndef EU07_USE_OLD_LIGHTING_MODEL + return; +#endif if (mdCloud) { // jeśli jest model nieba + glDisable(GL_DEPTH_TEST); + glDepthMask( GL_FALSE ); glPushMatrix(); - // glDisable(GL_DEPTH_TEST); glTranslatef(Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z); +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this glLightfv(GL_LIGHT0, GL_POSITION, lightPos); +#else + glDisable( GL_LIGHTING ); +#endif if (Global::bUseVBO) { // renderowanie z VBO mdCloud->RaRender(100, 0); @@ -49,11 +58,15 @@ void TSky::Render() mdCloud->Render(100, 0); mdCloud->RenderAlpha(100, 0); } - // glEnable(GL_DEPTH_TEST); - glClear(GL_DEPTH_BUFFER_BIT); - // glEnable(GL_LIGHTING); glPopMatrix(); +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); +#else + glEnable( GL_LIGHTING ); +#endif + glDepthMask( GL_TRUE ); + glEnable( GL_DEPTH_TEST ); } }; diff --git a/sun.cpp b/sun.cpp new file mode 100644 index 00000000..4d21f62d --- /dev/null +++ b/sun.cpp @@ -0,0 +1,298 @@ + +#include "stdafx.h" +#include "sun.h" +#include "globals.h" +#include "mtable.h" + +////////////////////////////////////////////////////////////////////////////////////////// +// cSun -- class responsible for dynamic calculation of position and intensity of the Sun, + +cSun::cSun() { + + setLocation( 19.00f, 52.00f ); // default location roughly in centre of Poland + m_observer.press = 1013.0; // surface pressure, millibars + m_observer.temp = 15.0; // ambient dry-bulb temperature, degrees C + + TIME_ZONE_INFORMATION timezoneinfo; // TODO: timezone dependant on geographic location + ::GetTimeZoneInformation( &timezoneinfo ); + m_observer.timezone = -timezoneinfo.Bias / 60.0f; +} + +cSun::~cSun() { gluDeleteQuadric( sunsphere ); } + +void +cSun::init() { + + sunsphere = gluNewQuadric(); + gluQuadricNormals( sunsphere, GLU_SMOOTH ); +} + +void +cSun::update() { + + move(); + Math3D::vector3 position( 0.0f, 0.0f, -2000.0f ); + position.RotateX( (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); + position.RotateY( (float)( ( 90.0 - m_body.hrang ) * ( M_PI / 180.0 ) ) ); + + m_position = position; +} + +void +cSun::render( Math3D::vector3 const &Origin ) { + +/* + glLightfv(GL_LIGHT0, GL_POSITION, position.getVector() ); // sun + + GLfloat LightPosition[]= { 10.0f, 50.0f, -5.0f, 1.0f }; // ambient + glLightfv(GL_LIGHT1, GL_POSITION, LightPosition ); +*/ + glDisable(GL_LIGHTING); + glDisable(GL_FOG); + glColor4f( 255.0f/255.0f, 242.0f/255.0f, 231.0f/255.0f, 1.f ); + // debug line to locate the sun easier + Math3D::vector3 position = m_position + Origin; + glBegin( GL_LINES ); + glVertex3f( position.x, position.y, position.z ); + glVertex3f( position.x, 0.0f, position.z ); + glEnd(); + glPushMatrix(); + glTranslatef( position.x, position.y, position.z ); + // radius is a result of scaling true distance down to 2km -- it's scaled by equal ratio + gluSphere( sunsphere, (float)(m_body.distance * 9.359157), 12, 12 ); + glPopMatrix(); + glEnable(GL_FOG); + glEnable(GL_LIGHTING); +} + +Math3D::vector3 +cSun::getDirection() { + + Math3D::vector3 position( 0.f, 0.f, -1.f ); + position.RotateX( (float)(m_body.elevref * (M_PI/180.0)) ); + position.RotateY( (float)((90.0 - m_body.hrang) * (M_PI/180.0)) ); + position.Normalize(); + return position; +} + +float +cSun::getAngle() { + + return (float)m_body.elevref; +} + +float cSun::getIntensity() { + + irradiance(); + return (float)( m_body.etr/ 1399.0 ); // arbitrary scaling factor taken from etrn value +} + +void cSun::setLocation( float const Longitude, float const Latitude ) { + + // convert fraction from geographical base of 6o minutes + m_observer.longitude = (int)Longitude + (Longitude - (int)(Longitude)) * 100.0 / 60.0; + m_observer.latitude = (int)Latitude + (Latitude - (int)(Latitude)) * 100.0 / 60.0 ; +} + +void cSun::setTemperature( float const Temperature ) { + + m_observer.temp = Temperature; +} + +void cSun::setPressure( float const Pressure ) { + + m_observer.press = Pressure; +} + +void cSun::move() { + + static double degrad = 57.295779513; // converts from radians to degrees + static double raddeg = 0.0174532925; // converts from degrees to radians + + SYSTEMTIME localtime; // time for the calculation + time( &localtime ); + + double ut = localtime.wHour + + localtime.wMinute / 60.0 // too low resolution, noticeable skips + + localtime.wSecond / 3600.0; // good enough in normal circumstances +/* + + localtime.wMilliseconds / 3600000.0; // for really smooth movement +*/ + double daynumber = 367 * localtime.wYear + - 7 * ( localtime.wYear + ( localtime.wMonth + 9 ) /12 ) / 4 + + 275 * localtime.wMonth / 9 + + localtime.wDay + - 730530 + + (ut / 24.0); + + // Universal Coordinated (Greenwich standard) time + m_observer.utime = ut * 3600.0; + m_observer.utime = m_observer.utime / 3600.0 - m_observer.timezone; + + // mean longitude + m_body.mnlong = 280.460 + 0.9856474 * daynumber; + m_body.mnlong -= 360.0 * (int) ( m_body.mnlong / 360.0 ); // clamp the range to 0-360 + if( m_body.mnlong < 0.0 ) m_body.mnlong += 360.0; + + // mean anomaly + m_body.mnanom = 357.528 + 0.9856003 * daynumber; + m_body.mnanom -= 360.0 * (int) ( m_body.mnanom / 360.0 ); // clamp the range to 0-360 + if( m_body.mnanom < 0.0 ) m_body.mnanom += 360.0; + + // ecliptic longitude + m_body.eclong = m_body.mnlong + + 1.915 * sin( m_body.mnanom * raddeg ) + + 0.020 * sin ( 2.0 * m_body.mnanom * raddeg ); + m_body.eclong -= 360.0 * (int)( m_body.eclong / 360.0 ); + if( m_body.eclong < 0.0 ) m_body.eclong += 360.0; // clamp the range to 0-360 + + // obliquity of the ecliptic + m_body.ecobli = 23.439 - 4.0e-07 * daynumber; + + // declination + m_body.declin = degrad * asin( sin (m_body.ecobli * raddeg) * sin (m_body.eclong * raddeg) ); + + // right ascension + double top = cos ( raddeg * m_body.ecobli ) * sin ( raddeg * m_body.eclong ); + double bottom = cos ( raddeg * m_body.eclong ); + + m_body.rascen = degrad * atan2( top, bottom ); + if( m_body.rascen < 0.0 ) m_body.rascen += 360.0; // (make it a positive angle) + + // Greenwich mean sidereal time + m_observer.gmst = 6.697375 + 0.0657098242 * daynumber + m_observer.utime; + + m_observer.gmst -= 24.0 * (int)( m_observer.gmst / 24.0 ); + if( m_observer.gmst < 0.0 ) m_observer.gmst += 24.0; + + // local mean sidereal time + m_observer.lmst = m_observer.gmst * 15.0 + m_observer.longitude; + + m_observer.lmst -= 360.0 * (int)( m_observer.lmst / 360.0 ); + if( m_observer.lmst < 0.0 ) m_observer.lmst += 360.0; + + // hour angle + m_body.hrang = m_observer.lmst - m_body.rascen; + + if( m_body.hrang < -180.0 ) m_body.hrang += 360.0; // (force it between -180 and 180 degrees) + else if( m_body.hrang > 180.0 ) m_body.hrang -= 360.0; + + double cz; // cosine of the solar zenith angle + + double tdatcd = cos( raddeg * m_body.declin ); + double tdatch = cos( raddeg * m_body.hrang ); + double tdatcl = cos( raddeg * m_observer.latitude ); + double tdatsd = sin( raddeg * m_body.declin ); + double tdatsl = sin( raddeg * m_observer.latitude ); + + cz = tdatsd * tdatsl + tdatcd * tdatcl * tdatch; + + // (watch out for the roundoff errors) + if( fabs (cz) > 1.0 ) { cz >= 0.0 ? cz = 1.0 : cz = -1.0; } + + m_body.zenetr = acos( cz ) * degrad; + m_body.elevetr = 90.0 - m_body.zenetr; + refract(); + + // additional calculations for proper object sizing. + // orbit eccentricity + double e = 0.016709 - 1.151e-9 * daynumber; + // eccentric anomaly + double E = m_body.mnanom + e * degrad * sin(m_body.mnanom) * ( 1.0 + e * cos(m_body.mnanom) ); + double xv = cos(E) - e; + double yv = sqrt(1.0 - e*e) * sin(E); + m_body.distance = sqrt( xv*xv + yv*yv ); +} + +void cSun::refract() { + + static double raddeg = 0.0174532925; // converts from degrees to radians + + double prestemp; // temporary pressure/temperature correction + double refcor; // temporary refraction correction + double tanelev; // tangent of the solar elevation angle + + // if the sun is near zenith, the algorithm bombs; refraction near 0. + if( m_body.elevetr > 85.0 ) + refcor = 0.0; + else { + + tanelev = tan( raddeg * m_body.elevetr ); + if( m_body.elevetr >= 5.0 ) + refcor = 58.1 / tanelev + - 0.07 / pow( tanelev, 3 ) + + 0.000086 / pow( tanelev, 5 ); + else if( m_body.elevetr >= -0.575 ) + refcor = 1735.0 + + m_body.elevetr * ( -518.2 + m_body.elevetr * + ( 103.4 + m_body.elevetr * ( -12.79 + m_body.elevetr * 0.711 ) ) ); + else + refcor = -20.774 / tanelev; + + prestemp = ( m_observer.press * 283.0 ) / ( 1013.0 * ( 273.0 + m_observer.temp ) ); + refcor *= prestemp / 3600.0; + } + + // refracted solar elevation angle + m_body.elevref = m_body.elevetr + refcor; + + // refracted solar zenith angle + m_body.zenref = 90.0 - m_body.elevref; +} + +void cSun::irradiance() { + + static double degrad = 57.295779513; // converts from radians to degrees + static double raddeg = 0.0174532925; // converts from degrees to radians + + SYSTEMTIME localtime; // time for the calculation + time( &localtime ); + + m_body.dayang = ( yearday( localtime.wDay, localtime.wMonth, localtime.wYear ) - 1 ) * 360.0 / 365.0; + double sd = sin( raddeg * m_body.dayang ); // sine of the day angle + double cd = cos( raddeg * m_body.dayang ); // cosine of the day angle or delination + m_body.erv = 1.000110 + 0.034221*cd + 0.001280*sd; + double d2 = 2.0 * m_body.dayang; + double c2 = cos( raddeg * d2 ); + double s2 = sin( raddeg * d2 ); + m_body.erv += 0.000719*c2 + 0.000077*s2; + + double solcon = 1367.0; // Solar constant, 1367 W/sq m + + m_body.coszen = cos( raddeg * m_body.zenref ); + if( m_body.coszen > 0.0 ) { + m_body.etrn = solcon * m_body.erv; + m_body.etr = m_body.etrn * m_body.coszen; + } + else { + m_body.etrn = 0.0; + m_body.etr = 0.0; + } +} + +int cSun::yearday( int Day, const int Month, const int Year ) { + + char daytab[ 2 ][ 13 ] = { + { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, + { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } + }; + int i, leap; + + leap = ( Year%4 == 0 ) && ( Year%100 != 0 ) || ( Year%400 == 0 ); + for( i = 1; i < Month; ++i ) + Day += daytab[ leap ][ i ]; + + return Day; +} + +// obtains current time for calculations +void +cSun::time( SYSTEMTIME *Time ) { + + ::GetLocalTime( Time ); + // NOTE: we're currently using local time to determine day/month/year + // TODO: enter scenario-defined day/month/year instead. + Time->wHour = GlobalTime->hh; + Time->wMinute = GlobalTime->mm; + Time->wSecond = std::floor( GlobalTime->mr ); +} diff --git a/sun.h b/sun.h new file mode 100644 index 00000000..8863795e --- /dev/null +++ b/sun.h @@ -0,0 +1,99 @@ +#pragma once + +#include "windows.h" +#include "opengl/glew.h" +#include "opengl/wglew.h" +#include "dumb3d.h" + + +////////////////////////////////////////////////////////////////////////////////////////// +// cSun -- class responsible for dynamic calculation of position and intensity of the Sun, +// given current weather, time and geographic location. + +class cSun { + +public: +// types: + +// methods: + void init(); + void update(); + void render( Math3D::vector3 const &Origin ); + // returns location of the sun in the 3d scene + Math3D::vector3 getPosition() { return m_position; } + // returns vector pointing at the sun + Math3D::vector3 getDirection(); + // returns current elevation above horizon + float getAngle(); + // returns current intensity of the sun + float getIntensity(); + // sets current geographic location + void setLocation( float const Longitude, float const Latitude ); + // sets ambient temperature in degrees C. + void setTemperature( float const Temperature ); + // sets surface pressure in milibars + void setPressure( float const Pressure ); + +// constructors: + cSun(); + +// deconstructor: + ~cSun(); + +// members: + +protected: +// types: + +// methods: + // calculates sun position on the sky given specified time and location + void move(); + // calculates position adjustment due to refraction + void refract(); + // calculates light intensity at current moment + void irradiance(); + // calculates day of year from given date + int yearday( int Day, int const Month, int const Year ); + // obtains current time for calculations + void time( SYSTEMTIME *Time ); + +// members: + GLUquadricObj *sunsphere; // temporary handler for sun positioning test + + struct celestialbody { // main planet parameters + + double dayang; // day angle (daynum*360/year-length) degrees + double mnlong; // mean longitude, degrees + double mnanom; // mean anomaly, degrees + double eclong; // ecliptic longitude, degrees. + double ecobli; // obliquity of ecliptic. + double declin; // declination--zenith angle of solar noon at equator, degrees NORTH. + double rascen; // right ascension, degrees + double hrang; // hour angle--hour of sun from solar noon, degrees WEST + double zenetr; // solar zenith angle, no atmospheric correction (= ETR) + double zenref; // solar zenith angle, deg. from zenith, refracted + double coszen; // cosine of refraction corrected solar zenith angle + double elevetr; // solar elevation, no atmospheric correction (= ETR) + double elevref; // solar elevation angle, deg. from horizon, refracted. + double distance; // distance from earth in AUs + double erv; // earth radius vector (multiplied to solar constant) + double etr; // extraterrestrial (top-of-atmosphere) W/sq m global horizontal solar irradiance + double etrn; // extraterrestrial (top-of-atmosphere) W/sq m direct normal solar irradiance + }; + + struct observer { // weather, time and position data in observer's location + + double latitude; // latitude, degrees north (south negative) + double longitude; // longitude, degrees east (west negative) + double utime; // universal (Greenwich) standard time + double timezone; // time zone, east (west negative). USA: Mountain = -7, Central = -6, etc. + double gmst; // Greenwich mean sidereal time, hours + double lmst; // local mean sidereal time, degrees + double temp; // ambient dry-bulb temperature, degrees C, used for refraction correction + double press; // surface pressure, millibars, used for refraction correction and ampress + }; + + celestialbody m_body; + observer m_observer; + Math3D::vector3 m_position; +}; From 197fa21f989ff70a9d58cf2d5b6697cf2a336e35 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 17 Feb 2017 22:47:21 +0100 Subject: [PATCH 013/426] point light size increase, changed movement scheme control in the cab --- Driver.cpp | 4 + DynObj.cpp | 28 ++---- Model3d.cpp | 2 +- Train.cpp | 282 ++++++++++++++++++++++++++-------------------------- World.cpp | 6 +- 5 files changed, 157 insertions(+), 165 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 57ec94a6..bd5bede7 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1171,6 +1171,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN iDrivigFlags |= moveSemaphorFound; //jeśli z przodu to dajemy falgę, że jest d_to_next_sem = Min0R(sSpeedTable[i].fDist, d_to_next_sem); } + if( sSpeedTable[ i ].fDist <= d_to_next_sem ) + { + VelSignalNext = sSpeedTable[ i ].fVelNext; + } } else if (sSpeedTable[i].iFlags & spRoadVel) { // to W6 diff --git a/DynObj.cpp b/DynObj.cpp index 9dba3343..0bdfc85b 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3100,7 +3100,11 @@ bool TDynamicObject::Update(double dt, double dt1) dDOMoveLen = GetdMoveLen() + MoverParameters->ComputeMovement(dt, dt1, ts, tp, tmpTraction, l, r); // yB: zeby zawsze wrzucalo w jedna strone zakretu +/* + // this seemed to have opposite effect, if anything -- the sway direction would be affected + // by the 'direction' of the track, making the sway go sometimes inward, sometimes outward MoverParameters->AccN *= -ABuGetDirection(); +*/ // if (dDOMoveLen!=0.0) //Ra: nie może być, bo blokuje Event0 Move(dDOMoveLen); if (!bEnabled) // usuwane pojazdy nie mają toru @@ -3530,24 +3534,24 @@ bool TDynamicObject::Update(double dt, double dt1) // NBMX Obsluga drzwi, MC: zuniwersalnione if ((dDoorMoveL < MoverParameters->DoorMaxShiftL) && (MoverParameters->DoorLeftOpened)) { - rsDoorOpen.Play(vol, 0, MechInside, vPosition); + rsDoorOpen.Play(1, 0, MechInside, vPosition); dDoorMoveL += dt1 * 0.5 * MoverParameters->DoorOpenSpeed; } if ((dDoorMoveL > 0) && (!MoverParameters->DoorLeftOpened)) { - rsDoorClose.Play(vol, 0, MechInside, vPosition); + rsDoorClose.Play(1, 0, MechInside, vPosition); dDoorMoveL -= dt1 * MoverParameters->DoorCloseSpeed; if (dDoorMoveL < 0) dDoorMoveL = 0; } if ((dDoorMoveR < MoverParameters->DoorMaxShiftR) && (MoverParameters->DoorRightOpened)) { - rsDoorOpen.Play(vol, 0, MechInside, vPosition); + rsDoorOpen.Play(1, 0, MechInside, vPosition); dDoorMoveR += dt1 * 0.5 * MoverParameters->DoorOpenSpeed; } if ((dDoorMoveR > 0) && (!MoverParameters->DoorRightOpened)) { - rsDoorClose.Play(vol, 0, MechInside, vPosition); + rsDoorClose.Play(1, 0, MechInside, vPosition); dDoorMoveR -= dt1 * MoverParameters->DoorCloseSpeed; if (dDoorMoveR < 0) dDoorMoveR = 0; @@ -5357,10 +5361,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, token, 50, GetPosition().x, GetPosition().y, GetPosition().z, true ); - sPantUp.AM = 50000; - sPantUp.AA = -1 * ( 105 - Random( 10 ) ) / 100; - sPantUp.FM = 1.0; - sPantUp.FA = 0.0; } else if( token == "pantographdown:" ) { @@ -5370,10 +5370,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, token, 50, GetPosition().x, GetPosition().y, GetPosition().z, true ); - sPantDown.AM = 50000; - sPantDown.AA = -1 * ( 105 - Random( 10 ) ) / 100; - sPantDown.FM = 1.0; - sPantDown.FA = 0.0; } else if( token == "compressor:" ) { @@ -5404,10 +5400,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, token, 50, GetPosition().x, GetPosition().y, GetPosition().z, true ); - rsDoorOpen.AM = 50000; - rsDoorOpen.AA = -1 * ( 105 - Random( 10 ) ) / 100; - rsDoorOpen.FM = 1.0; - rsDoorOpen.FA = 0.0; } else if( token == "doorclose:" ) { @@ -5417,10 +5409,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, token, 50, GetPosition().x, GetPosition().y, GetPosition().z, true ); - rsDoorClose.AM = 50000; - rsDoorClose.AA = -1 * ( 105 - Random( 10 ) ) / 100; - rsDoorClose.FM = 1.0; - rsDoorClose.FA = 0.0; } else if( token == "sand:" ) { diff --git a/Model3d.cpp b/Model3d.cpp index 4071db89..fec5b563 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -726,7 +726,7 @@ void TSubModel::DisplayLists() glColorMaterial(GL_FRONT, GL_EMISSION); glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly glBegin(GL_POINTS); - glVertex3f(0, 0, 0); + glVertex3f( 0.0f, 0.0f, -0.025f ); // shift point towards the viewer, to avoid z-fighting with the light polygons glEnd(); glEnable(GL_LIGHTING); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); diff --git a/Train.cpp b/Train.cpp index e557dcbe..66599599 100644 --- a/Train.cpp +++ b/Train.cpp @@ -24,6 +24,7 @@ http://mozilla.org/MPL/2.0/. #include "Console.h" #include "McZapkie\hamulce.h" #include "McZapkie\MOVER.h" +#include "Camera.h" //--------------------------------------------------------------------------- using namespace Timer; @@ -891,56 +892,56 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || if (false == (mvOccupied->LightsPosNo > 0)) { if ((GetAsyncKeyState(VK_CONTROL) < 0) && - (ggRearLeftLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu + (ggRearRightLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu. + // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view + // TODO: do it a more elegant way. preferably along with the rest of the controlling code { - //------------------------------ if (mvOccupied->ActiveCab == 1) { // kabina 1 - if (((DynamicObject->iLights[1]) & 3) == 0) + if (((DynamicObject->iLights[1]) & 48) == 0) { - DynamicObject->iLights[1] |= 1; + DynamicObject->iLights[1] |= 16; dsbSwitch->SetVolume(DSBVOLUME_MAX); dsbSwitch->Play(0, 0, 0); - ggRearLeftLightButton.PutValue(1); + ggRearRightLightButton.PutValue(1); } - if (((DynamicObject->iLights[1]) & 3) == 2) + if (((DynamicObject->iLights[1]) & 48) == 32) { - DynamicObject->iLights[1] &= (255 - 2); + DynamicObject->iLights[1] &= (255 - 32); dsbSwitch->SetVolume(DSBVOLUME_MAX); dsbSwitch->Play(0, 0, 0); - if (ggRearLeftEndLightButton.SubModel) + if (ggRearRightEndLightButton.SubModel) { - ggRearLeftEndLightButton.PutValue(0); - ggRearLeftLightButton.PutValue(0); + ggRearRightEndLightButton.PutValue(0); + ggRearRightLightButton.PutValue(0); } else - ggRearLeftLightButton.PutValue(0); + ggRearRightLightButton.PutValue(0); } } else { // kabina -1 - if (((DynamicObject->iLights[0]) & 3) == 0) + if (((DynamicObject->iLights[0]) & 48) == 0) { - DynamicObject->iLights[0] |= 1; + DynamicObject->iLights[0] |= 16; dsbSwitch->SetVolume(DSBVOLUME_MAX); dsbSwitch->Play(0, 0, 0); - ggRearLeftLightButton.PutValue(1); + ggRearRightLightButton.PutValue(1); } - if (((DynamicObject->iLights[0]) & 3) == 2) + if (((DynamicObject->iLights[0]) & 48) == 32) { - DynamicObject->iLights[0] &= (255 - 2); + DynamicObject->iLights[0] &= (255 - 32); dsbSwitch->SetVolume(DSBVOLUME_MAX); dsbSwitch->Play(0, 0, 0); - if (ggRearLeftEndLightButton.SubModel) + if (ggRearRightEndLightButton.SubModel) { - ggRearLeftEndLightButton.PutValue(0); - ggRearLeftLightButton.PutValue(0); + ggRearRightEndLightButton.PutValue(0); + ggRearRightLightButton.PutValue(0); } else - ggRearLeftLightButton.PutValue(0); + ggRearRightLightButton.PutValue(0); } } - //---------------------- } else { @@ -1066,53 +1067,46 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || if (false == (mvOccupied->LightsPosNo > 0)) { if ((GetAsyncKeyState(VK_CONTROL) < 0) && - (ggRearRightLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu + (ggRearLeftLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu + // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view + // TODO: do it a more elegant way. preferably along with the rest of the controlling code { - //------------------------------ - if (mvOccupied->ActiveCab == 1) - { // kabina 1 - if (((DynamicObject->iLights[1]) & 48) == 0) - { - DynamicObject->iLights[1] |= 16; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearRightLightButton.PutValue(1); + if( mvOccupied->ActiveCab == 1 ) { // kabina 1 + if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 0 ) { + DynamicObject->iLights[ 1 ] |= 1; + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + ggRearLeftLightButton.PutValue( 1 ); } - if (((DynamicObject->iLights[1]) & 48) == 32) - { - DynamicObject->iLights[1] &= (255 - 32); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRearRightEndLightButton.SubModel) - { - ggRearRightEndLightButton.PutValue(0); - ggRearRightLightButton.PutValue(0); + if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 2 ) { + DynamicObject->iLights[ 1 ] &= ( 255 - 2 ); + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + if( ggRearLeftEndLightButton.SubModel ) { + ggRearLeftEndLightButton.PutValue( 0 ); + ggRearLeftLightButton.PutValue( 0 ); } else - ggRearRightLightButton.PutValue(0); + ggRearLeftLightButton.PutValue( 0 ); } } - else - { // kabina -1 - if (((DynamicObject->iLights[0]) & 48) == 0) - { - DynamicObject->iLights[0] |= 16; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearRightLightButton.PutValue(1); + else { // kabina -1 + if( ( ( DynamicObject->iLights[ 0 ] ) & 3 ) == 0 ) { + DynamicObject->iLights[ 0 ] |= 1; + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + ggRearLeftLightButton.PutValue( 1 ); } - if (((DynamicObject->iLights[0]) & 48) == 32) - { - DynamicObject->iLights[0] &= (255 - 32); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRearRightEndLightButton.SubModel) - { - ggRearRightEndLightButton.PutValue(0); - ggRearRightLightButton.PutValue(0); + if( ( ( DynamicObject->iLights[ 0 ] ) & 3 ) == 2 ) { + DynamicObject->iLights[ 0 ] &= ( 255 - 2 ); + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + if( ggRearLeftEndLightButton.SubModel ) { + ggRearLeftEndLightButton.PutValue( 0 ); + ggRearLeftLightButton.PutValue( 0 ); } else - ggRearRightLightButton.PutValue(0); + ggRearLeftLightButton.PutValue( 0 ); } } } //------------------------------ @@ -2099,52 +2093,46 @@ if { if ((GetAsyncKeyState(VK_CONTROL) < 0) && (ggRearLeftLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu + // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view + // TODO: do it a more elegant way. preferably along with the rest of the controlling code { //------------------------------ - if (mvOccupied->ActiveCab == 1) - { // kabina 1 - if (((DynamicObject->iLights[1]) & 3) == 0) - { - DynamicObject->iLights[1] |= 2; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRearLeftEndLightButton.SubModel) - { - ggRearLeftEndLightButton.PutValue(1); - ggRearLeftLightButton.PutValue(0); + if( mvOccupied->ActiveCab == 1 ) { // kabina 1 (od strony 0) + if( ( ( DynamicObject->iLights[ 1 ] ) & 48 ) == 0 ) { + DynamicObject->iLights[ 1 ] |= 32; + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + if( ggRearRightEndLightButton.SubModel ) { + ggRearRightEndLightButton.PutValue( 1 ); + ggRearRightLightButton.PutValue( 0 ); } else - ggRearLeftLightButton.PutValue(-1); + ggRearRightLightButton.PutValue( -1 ); } - if (((DynamicObject->iLights[1]) & 3) == 1) - { - DynamicObject->iLights[1] &= (255 - 1); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearLeftLightButton.PutValue(0); + if( ( ( DynamicObject->iLights[ 1 ] ) & 48 ) == 16 ) { + DynamicObject->iLights[ 1 ] &= ( 255 - 16 ); + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + ggRearRightLightButton.PutValue( 0 ); } } - else - { // kabina -1 - if (((DynamicObject->iLights[0]) & 3) == 0) - { - DynamicObject->iLights[0] |= 2; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRearLeftEndLightButton.SubModel) - { - ggRearLeftEndLightButton.PutValue(1); - ggRearLeftLightButton.PutValue(0); + else { // kabina -1 + if( ( ( DynamicObject->iLights[ 0 ] ) & 48 ) == 0 ) { + DynamicObject->iLights[ 0 ] |= 32; + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + if( ggRearRightEndLightButton.SubModel ) { + ggRearRightEndLightButton.PutValue( 1 ); + ggRearRightLightButton.PutValue( 0 ); } else - ggRearLeftLightButton.PutValue(-1); + ggRearRightLightButton.PutValue( -1 ); } - if (((DynamicObject->iLights[1]) & 3) == 1) - { - DynamicObject->iLights[1] &= (255 - 1); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggLeftLightButton.PutValue(0); + if( ( ( DynamicObject->iLights[ 0 ] ) & 48 ) == 16 ) { + DynamicObject->iLights[ 0 ] &= ( 255 - 16 ); + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + ggRearRightLightButton.PutValue( 0 ); } } } //------------------------------ @@ -2272,52 +2260,46 @@ if { if ((GetAsyncKeyState(VK_CONTROL) < 0) && (ggRearRightLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu + // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view + // TODO: do it a more elegant way. preferably along with the rest of the controlling code { //------------------------------ - if (mvOccupied->ActiveCab == 1) - { // kabina 1 (od strony 0) - if (((DynamicObject->iLights[1]) & 48) == 0) - { - DynamicObject->iLights[1] |= 32; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRearRightEndLightButton.SubModel) - { - ggRearRightEndLightButton.PutValue(1); - ggRearRightLightButton.PutValue(0); + if( mvOccupied->ActiveCab == 1 ) { // kabina 1 + if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 0 ) { + DynamicObject->iLights[ 1 ] |= 2; + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + if( ggRearLeftEndLightButton.SubModel ) { + ggRearLeftEndLightButton.PutValue( 1 ); + ggRearLeftLightButton.PutValue( 0 ); } else - ggRearRightLightButton.PutValue(-1); + ggRearLeftLightButton.PutValue( -1 ); } - if (((DynamicObject->iLights[1]) & 48) == 16) - { - DynamicObject->iLights[1] &= (255 - 16); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearRightLightButton.PutValue(0); + if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 1 ) { + DynamicObject->iLights[ 1 ] &= ( 255 - 1 ); + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + ggRearLeftLightButton.PutValue( 0 ); } } - else - { // kabina -1 - if (((DynamicObject->iLights[0]) & 48) == 0) - { - DynamicObject->iLights[0] |= 32; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRearRightEndLightButton.SubModel) - { - ggRearRightEndLightButton.PutValue(1); - ggRearRightLightButton.PutValue(0); + else { // kabina -1 + if( ( ( DynamicObject->iLights[ 0 ] ) & 3 ) == 0 ) { + DynamicObject->iLights[ 0 ] |= 2; + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + if( ggRearLeftEndLightButton.SubModel ) { + ggRearLeftEndLightButton.PutValue( 1 ); + ggRearLeftLightButton.PutValue( 0 ); } else - ggRearRightLightButton.PutValue(-1); + ggRearLeftLightButton.PutValue( -1 ); } - if (((DynamicObject->iLights[0]) & 48) == 16) - { - DynamicObject->iLights[0] &= (255 - 16); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearRightLightButton.PutValue(0); + if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 1 ) { + DynamicObject->iLights[ 1 ] &= ( 255 - 1 ); + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + ggLeftLightButton.PutValue( 0 ); } } } //------------------------------ @@ -2402,17 +2384,25 @@ if { // McZapkie: poruszanie sie po kabinie, w updatemechpos zawarte sa wiezy - // double dt=Timer::GetDeltaTime(); - if (mvOccupied->ActiveCab < 0) - fMechCroach = -0.5; - else - fMechCroach = 0.5; + auto step = 60.0f * Timer::GetDeltaTime(); + auto const camerayaw = Global::pCamera->Yaw; + Math3D::vector3 direction( 0.0f, 0.0f, step ); + direction.RotateY( camerayaw ); + Math3D::vector3 right( -step, 0.0f, 0.0f ); + right.RotateY( camerayaw ); + // auto right = Math3D::CrossProduct( direction, Math3D::vector3( 0.0f, 1.0f, 0.0f ) ); + + if( mvOccupied->ActiveCab < 0 ) { + + direction *= -1.0f; + right *= -1.0f; + } // if (!GetAsyncKeyState(VK_SHIFT)<0) // bez shifta if (!Console::Pressed(VK_CONTROL)) // gdy [Ctrl] zwolniony (dodatkowe widoki) { if (cKey == Global::Keys[k_MechLeft]) { - vMechMovement.x += fMechCroach; + vMechMovement -= right; if (DynamicObject->Mechanik) if (!FreeFlyModeFlag) //żeby nie mieszać obserwując z zewnątrz DynamicObject->Mechanik->RouteSwitch( @@ -2420,7 +2410,7 @@ if } else if (cKey == Global::Keys[k_MechRight]) { - vMechMovement.x -= fMechCroach; + vMechMovement += right; if (DynamicObject->Mechanik) if (!FreeFlyModeFlag) //żeby nie mieszać obserwując z zewnątrz DynamicObject->Mechanik->RouteSwitch( @@ -2428,7 +2418,7 @@ if } else if (cKey == Global::Keys[k_MechBackward]) { - vMechMovement.z -= fMechCroach; + vMechMovement -= direction; // if (DynamicObject->Mechanik) // if (!FreeFlyModeFlag) //żeby nie mieszać obserwując z zewnątrz // DynamicObject->Mechanik->RouteSwitch(0); //na skrzyżowaniu stanie @@ -2436,16 +2426,16 @@ if } else if (cKey == Global::Keys[k_MechForward]) { - vMechMovement.z += fMechCroach; + vMechMovement += direction; if (DynamicObject->Mechanik) if (!FreeFlyModeFlag) //żeby nie mieszać obserwując z zewnątrz DynamicObject->Mechanik->RouteSwitch( 3); // na skrzyżowaniu pojedzie prosto } else if (cKey == Global::Keys[k_MechUp]) - pMechOffset.y += 0.2; // McZapkie-120302 - wstawanie + pMechOffset.y += 0.25; // McZapkie-120302 - wstawanie else if (cKey == Global::Keys[k_MechDown]) - pMechOffset.y -= 0.2; // McZapkie-120302 - siadanie + pMechOffset.y -= 0.25; // McZapkie-120302 - siadanie } } @@ -5994,6 +5984,10 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { btLampkaHamienie.Load(Parser, DynamicObject->mdKabina); } + else if( Label == "i-dynamicbrake:" ) { + + btLampkaED.Load( Parser, DynamicObject->mdKabina ); + } else if (Label == "i-braking-ezt:") { btLampkaHamowanie1zes.Load(Parser, DynamicObject->mdKabina); @@ -6334,6 +6328,10 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con // hunter-091012: przyciemnienie swiatla w kabinie ggCabLightDimButton.Load(Parser, DynamicObject->mdKabina); } + else if( Label == "battery_sw:" ) { + + ggBatteryButton.Load( Parser, DynamicObject->mdKabina ); + } // ABu 090305: uniwersalne przyciski lub inne rzeczy else if (Label == "universal1:") { diff --git a/World.cpp b/World.cpp index c0188625..df7d559b 100644 --- a/World.cpp +++ b/World.cpp @@ -345,8 +345,10 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("glLineWidth(1.0f);"); glLineWidth(1.0f); // glLineWidth(2.0f); - WriteLog("glPointSize(2.0f);"); - glPointSize(2.0f); + WriteLog("glPointSize(3.0f);"); + glPointSize(3.0f); +// glHint( GL_POINT_SMOOTH_HINT, GL_NICEST ); // Really Nice Perspective Calculations +// glEnable( GL_POINT_SMOOTH ); // ----------- LIGHTING SETUP ----------- // Light values and coordinates From a1942ce77130bfb9ac6114caf10fc76e0c72e157 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 18 Feb 2017 18:15:39 +0100 Subject: [PATCH 014/426] support for config-specified day of the year --- Globals.cpp | 13 +------------ Texture.cpp | 5 +++++ World.cpp | 6 +++--- parser.cpp | 1 + sun.cpp | 22 +++++++++++++++++++++- sun.h | 2 ++ 6 files changed, 33 insertions(+), 16 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index fcd165a6..837eb88b 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -552,18 +552,7 @@ void Global::ConfigParse(cParser &Parser) std::tm *localtime = std::localtime(&timenow); Global::fMoveLight = localtime->tm_yday + 1; // numer bieżącego dnia w roku } - if (fMoveLight > 0.f) // tu jest nadal zwiększone o 1 - { // obliczenie deklinacji wg: - // http://naturalfrequency.com/Tregenza_Sharples/Daylight_Algorithms/algorithm_1_11.htm - // Spencer J W Fourier series representation of the position of the sun Search 2 (5) - // 172 (1971) - Global::fMoveLight = - M_PI / 182.5 * (Global::fMoveLight - 1.0); // numer dnia w postaci kąta - fSunDeclination = - 0.006918 - 0.3999120 * std::cos(fMoveLight) + 0.0702570 * std::sin(fMoveLight) - - 0.0067580 * std::cos(2 * fMoveLight) + 0.0009070 * std::sin(2 * fMoveLight) - - 0.0026970 * std::cos(3 * fMoveLight) + 0.0014800 * std::sin(3 * fMoveLight); - } + // TODO: calculate lights single time here for static setup. or get rid of static setup } else if (token == "smoothtraction") { diff --git a/Texture.cpp b/Texture.cpp index fb9a4dd0..71c94f9e 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -505,6 +505,11 @@ opengl_texture::set_filtering() { ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); + if( GLEW_EXT_texture_filter_anisotropic ) { + // anisotropic filtering + ::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, 16.0f ); + } + bool sharpen{ false }; for( auto const &trait : traits ) { diff --git a/World.cpp b/World.cpp index ed342300..c8670ffb 100644 --- a/World.cpp +++ b/World.cpp @@ -1513,14 +1513,14 @@ void TWorld::Update_Lights() { Global::DayLight.position[2] = position.z; auto const direction = -1.0 * Sun.getDirection(); Global::DayLight.direction = direction; - auto const intensity = std::min( 2.0f * Sun.getIntensity(), 1.0f ); + auto const intensity = std::min( 2.0f * Sun.getIntensity(), 1.25f ); Global::DayLight.diffuse[ 0 ] = 255.0 / 255.0 * intensity; Global::DayLight.diffuse[ 1 ] = 242.0 / 255.0 * intensity; Global::DayLight.diffuse[ 2 ] = 231.0 / 255.0 * intensity; // Global::DayLight.diffuse[ 3 ] = 1.0f;// std::min( 0.15f + intensity, 1.0f ); - Global::DayLight.ambient[ 0 ] = 205.0 / 255.0 * intensity * 0.75f; - Global::DayLight.ambient[ 1 ] = 217.0 / 255.0 * intensity * 0.75f; + Global::DayLight.ambient[ 0 ] = 155.0 / 255.0 * intensity * 0.75f; + Global::DayLight.ambient[ 1 ] = 192.0 / 255.0 * intensity * 0.75f; Global::DayLight.ambient[ 2 ] = 231.0 / 255.0 * intensity * 0.75f; // Global::DayLight.ambient[ 3 ] = 1.0f; /* diff --git a/parser.cpp b/parser.cpp index 46cd8701..9276a063 100644 --- a/parser.cpp +++ b/parser.cpp @@ -67,6 +67,7 @@ cParser::~cParser() // methods bool cParser::getTokens(int Count, bool ToLower, const char *Break) { + tokens.clear(); // emulates old parser behaviour. TODO, TBD: allow manual reset? /* if (LoadTraction==true) trtest="niemaproblema"; //wczytywać diff --git a/sun.cpp b/sun.cpp index 4d21f62d..e571a0a7 100644 --- a/sun.cpp +++ b/sun.cpp @@ -285,13 +285,33 @@ int cSun::yearday( int Day, const int Month, const int Year ) { return Day; } +void cSun::daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ) { + + WORD daytab[ 2 ][ 13 ] = { + { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, + { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } + }; + + int leap = ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ); + WORD idx = 1; + while( (idx < 13) && ( Yearday <= daytab[ leap ][ idx ] )) { + + ++idx; + } + Month = idx + 1; + Day = Yearday - daytab[ leap ][ idx ]; +} + // obtains current time for calculations void cSun::time( SYSTEMTIME *Time ) { ::GetLocalTime( Time ); // NOTE: we're currently using local time to determine day/month/year - // TODO: enter scenario-defined day/month/year instead. + if( Global::fMoveLight > 0.0 ) { + // TODO: enter scenario-defined day/month/year instead. + daymonth( Time->wDay, Time->wMonth, Time->wYear, static_cast(Global::fMoveLight) ); + } Time->wHour = GlobalTime->hh; Time->wMinute = GlobalTime->mm; Time->wSecond = std::floor( GlobalTime->mr ); diff --git a/sun.h b/sun.h index 8863795e..74349599 100644 --- a/sun.h +++ b/sun.h @@ -54,6 +54,8 @@ protected: void irradiance(); // calculates day of year from given date int yearday( int Day, int const Month, int const Year ); + // calculates day and month from given day of year + void daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ); // obtains current time for calculations void time( SYSTEMTIME *Time ); From 7e0aeb1bfa5e1018b9f76ad929950292481fecf6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 18 Feb 2017 18:53:02 +0100 Subject: [PATCH 015/426] anisotropic filtering support --- Globals.cpp | 8 +++++++- Globals.h | 1 + Texture.cpp | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Globals.cpp b/Globals.cpp index 14f3968f..c5e613fc 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -130,6 +130,7 @@ bool Global::bAdjustScreenFreq = true; bool Global::bEnableTraction = true; bool Global::bLoadTraction = true; bool Global::bLiveTraction = true; +float Global::AnisotropicFiltering = 8.0f; // requested level of anisotropic filtering. TODO: move it to renderer object int Global::iDefaultFiltering = 9; // domyślne rozmywanie tekstur TGA bez alfa int Global::iBallastFiltering = 9; // domyślne rozmywanie tekstur podsypki int Global::iRailProFiltering = 5; // domyślne rozmywanie tekstur szyn @@ -465,7 +466,12 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(1, false); Parser >> Global::iDynamicFiltering; } - else if (token == "usevbo") + else if( token == "anisotropicfiltering" ) { + + Parser.getTokens( 1, false ); + Parser >> Global::AnisotropicFiltering; + } + else if( token == "usevbo" ) { Parser.getTokens(); diff --git a/Globals.h b/Globals.h index c2b2b708..d63af985 100644 --- a/Globals.h +++ b/Globals.h @@ -237,6 +237,7 @@ class Global static std::string asSky; static bool bnewAirCouplers; // Ra: nowe zmienne globalne + static float AnisotropicFiltering; // requested level of anisotropic filtering. TODO: move it to renderer object static int iDefaultFiltering; // domyślne rozmywanie tekstur TGA static int iBallastFiltering; // domyślne rozmywanie tekstury podsypki static int iRailProFiltering; // domyślne rozmywanie tekstury szyn diff --git a/Texture.cpp b/Texture.cpp index fb9a4dd0..b2f15340 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -505,6 +505,11 @@ opengl_texture::set_filtering() { ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); + if( GLEW_EXT_texture_filter_anisotropic ) { + // anisotropic filtering + ::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, Global::AnisotropicFiltering ); + } + bool sharpen{ false }; for( auto const &trait : traits ) { From 8ae135375e675772c1ac4a9694eab522490098d0 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 19 Feb 2017 16:24:10 +0100 Subject: [PATCH 016/426] feature: camera zoom --- DynObj.cpp | 4 ++-- EU07.cpp | 6 +++-- Gauge.cpp | 18 ++++++++------- Globals.cpp | 3 +++ Globals.h | 3 +++ Ground.cpp | 4 ++-- World.cpp | 63 +++++++++++++++++++++++++++++++++++++---------------- 7 files changed, 68 insertions(+), 33 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 0bdfc85b..ed0de3ae 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3710,7 +3710,7 @@ void TDynamicObject::Render() // zmienne renderme = false; // przeklejka - double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition); + double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition) / Global::ZoomFactor; // koniec przeklejki if (ObjSqrDist < 500) // jak jest blisko - do 70m modelrotate = 0.01; // mały kąt, żeby nie znikało @@ -3737,7 +3737,7 @@ void TDynamicObject::Render() { TSubModel::iInstance = (int)this; //żeby nie robić cudzych animacji // AnsiString asLoadName=""; - double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition); + double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition) / Global::ZoomFactor; ABuLittleUpdate(ObjSqrDist); // ustawianie zmiennych submodeli dla wspólnego modelu // Cone(vCoulpler[0],modelRot.z,0); diff --git a/EU07.cpp b/EU07.cpp index 3a071cd3..b02ef876 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -85,17 +85,19 @@ int InitGL(GLvoid) // All Setup For OpenGL Goes Here GLvoid ReSizeGLScene(GLsizei width, GLsizei height) // resize and initialize the GL Window { - WindowWidth = width; - WindowHeight = height; + Global::ScreenWidth = WindowWidth = width; + Global::ScreenHeight = WindowHeight = height; if (height == 0) // prevent a divide by zero by height = 1; // making height equal one glViewport(0, 0, width, height); // Reset The Current Viewport +/* glMatrixMode(GL_PROJECTION); // select the Projection Matrix glLoadIdentity(); // reset the Projection Matrix // calculate the aspect ratio of the window gluPerspective(45.0f, (GLdouble)width / (GLdouble)height, 0.2f, 2500.0f); glMatrixMode(GL_MODELVIEW); // select the Modelview Matrix glLoadIdentity(); // reset the Modelview Matrix +*/ } //--------------------------------------------------------------------------- diff --git a/Gauge.cpp b/Gauge.cpp index 04091419..b9870eab 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -175,14 +175,16 @@ void TGauge::Update() */ std::string n( "000000000" + std::to_string( static_cast( std::floor( fValue ) ) ) ); if( n.length() > 10 ) { n.erase( 0, n.length() - 10 ); } // also dumb but should work for now do - { // pętla po submodelach potomnych i obracanie ich o kąt zależy od - // cyfry w (fValue) - if (sm->pName) - { // musi mieć niepustą nazwę - if (sm->pName[0] >= '0') - if (sm->pName[0] <= '9') - sm->SetRotate(float3(0, 1, 0), - -36.0 * (n['0' + 10 - sm->pName[0]] - '0')); + { // pętla po submodelach potomnych i obracanie ich o kąt zależy od cyfry w (fValue) + if( sm->pName ) { + // musi mieć niepustą nazwę + if( ( sm->pName[ 0 ] >= '0' ) + && ( sm->pName[ 0 ] <= '9' ) ) { + + sm->SetRotate( + float3( 0, 1, 0 ), + -36.0 * ( n[ '0' + 9 - sm->pName[ 0 ] ] - '0' ) ); + } } sm = sm->NextGet(); } while (sm); diff --git a/Globals.cpp b/Globals.cpp index c5e613fc..3e0c0f9b 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -49,6 +49,9 @@ bool Global::bOpenGL_1_5 = false; // czy są dostępne funkcje OpenGL 1.5 double Global::fLuminance = 1.0; // jasność światła do automatycznego zapalania int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki HWND Global::hWnd = NULL; // uchwyt okna +int Global::ScreenWidth = 1; +int Global::ScreenHeight = 1; +float Global::ZoomFactor = 1.0f; int Global::iCameraLast = -1; std::string Global::asRelease = "16.0.1172.482"; std::string Global::asVersion = diff --git a/Globals.h b/Globals.h index d63af985..c4970efe 100644 --- a/Globals.h +++ b/Globals.h @@ -253,6 +253,9 @@ class Global static double fLuminance; // jasność światła do automatycznego zapalania static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji static HWND hWnd; // uchwyt okna + static int ScreenWidth; // current window dimensions. TODO: move it to renderer + static int ScreenHeight; + static float ZoomFactor; // determines current camera zoom level. TODO: move it to the renderer static int iCameraLast; static std::string asRelease; // numer static std::string asVersion; // z opisem diff --git a/Ground.cpp b/Ground.cpp index b1d55d3c..bfd4a344 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -555,7 +555,7 @@ void TGroundNode::RenderDL() return smTerrain->RenderDL(); } // if (pTriGroup) if (pTriGroup!=this) return; //wyświetla go inny obiekt - double mgn = SquareMagnitude(pCenter - Global::pCameraPosition); + double mgn = SquareMagnitude(pCenter - Global::pCameraPosition) / Global::ZoomFactor; if ((mgn > fSquareRadius) || (mgn < fSquareMinRadius)) // McZapkie-070602: nie rysuj odleglych // obiektow ale sprawdzaj wyzwalacz // zdarzen @@ -615,7 +615,7 @@ void TGroundNode::RenderAlphaDL() // i jezeli tak to odpowiedni GL_GREATER w przeciwnym wypadku standardowy 0.04 // if (pTriGroup) if (pTriGroup!=this) return; //wyświetla go inny obiekt - double mgn = SquareMagnitude(pCenter - Global::pCameraPosition); + double mgn = SquareMagnitude(pCenter - Global::pCameraPosition) / Global::ZoomFactor; float r, g, b; if (mgn < fSquareMinRadius) return; diff --git a/World.cpp b/World.cpp index df7d559b..5e47971c 100644 --- a/World.cpp +++ b/World.cpp @@ -485,21 +485,21 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glBegin(GL_QUADS); // Drawing using triangles glTexCoord2f(0.0f, 0.0f); - glVertex3f(-0.28f, -0.22f, 0.0f); // bottom left of the texture and quad + glVertex3f(-1.0f, -1.0f, 0.0f); // bottom left of the texture and quad glTexCoord2f(1.0f, 0.0f); - glVertex3f(0.28f, -0.22f, 0.0f); // bottom right of the texture and quad + glVertex3f(1.0f, -1.0f, 0.0f); // bottom right of the texture and quad glTexCoord2f(1.0f, 1.0f); - glVertex3f(0.28f, 0.22f, 0.0f); // top right of the texture and quad + glVertex3f(1.0f, 1.0f, 0.0f); // top right of the texture and quad glTexCoord2f(0.0f, 1.0f); - glVertex3f(-0.28f, 0.22f, 0.0f); // top left of the texture and quad + glVertex3f(-1.0f, 1.0f, 0.0f); // top left of the texture and quad glEnd(); //~logo; Ra: to jest bez sensu zapis glColor3f(0.0f, 0.0f, 100.0f); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.09f); + glRasterPos2f(-0.85f, -0.25f); glPrint("Uruchamianie / Initializing..."); - glRasterPos2f(-0.25f, -0.10f); + glRasterPos2f(-0.85f, -0.30f); glPrint("Dzwiek / Sound..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -512,7 +512,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Sound Init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.11f); + glRasterPos2f(-0.25f, -0.30f); glPrint("OK."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -523,7 +523,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Textures init"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.12f); + glRasterPos2f(-0.85f, -0.35f); glPrint("Tekstury / Textures..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -533,7 +533,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Textures init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.13f); + glRasterPos2f(-0.25f, -0.35f); glPrint("OK."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -541,7 +541,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Models init"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.14f); + glRasterPos2f(-0.85f, -0.40f); glPrint("Modele / Models..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -551,7 +551,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Models init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.15f); + glRasterPos2f(-0.25f, -0.40f); glPrint("OK."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -559,7 +559,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Ground init"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.16f); + glRasterPos2f(-0.85f, -0.45f); glPrint("Sceneria / Scenery (please wait)..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -570,7 +570,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Ground init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.17f); + glRasterPos2f(-0.25f, -0.45f); glPrint("OK."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -587,7 +587,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) char buff[255] = "Player train init: "; if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.18f); + glRasterPos2f(-0.85f, -0.50f); glPrint("Przygotowanie kabiny do sterowania..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -608,7 +608,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Player train init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.19f); + glRasterPos2f(-0.25f, -0.50f); glPrint("OK."); } FollowView(); @@ -620,7 +620,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.20f); + glRasterPos2f(-0.85f, -0.50f); glPrint("Blad inicjalizacji sterowanego pojazdu!"); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -636,7 +636,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Error("Player train not exist!"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.20f); + glRasterPos2f(-0.85f, -0.55f); glPrint("Wybrany pojazd nie istnieje w scenerii!"); } } @@ -984,7 +984,7 @@ void TWorld::OnKeyUp(int cKey) void TWorld::OnMouseMove(double x, double y) { // McZapkie:060503-definicja obracania myszy - Camera.OnCursorMove(x * Global::fMouseXScale, -y * Global::fMouseYScale); + Camera.OnCursorMove(x * Global::fMouseXScale / Global::ZoomFactor, -y * Global::fMouseYScale / Global::ZoomFactor); } void TWorld::InOutKey() @@ -1299,8 +1299,19 @@ TWorld::Update_Camera( double const Deltatime ) { if( FreeFlyModeFlag ) Camera.RaLook(); // jednorazowe przestawienie kamery } - else if( Console::Pressed( VK_RBUTTON ) ) //||Console::Pressed(VK_F4)) + else if( Console::Pressed( VK_RBUTTON ) ) { //||Console::Pressed(VK_F4)) FollowView( false ); // bez wyciszania dźwięków + } + else if( true == Console::Pressed( VK_MBUTTON ) ) { + // middle mouse button controls zoom. + Global::ZoomFactor = std::min( 4.5f, Global::ZoomFactor + 15.0f * static_cast(Deltatime) ); + } + else if( false == Console::Pressed( VK_MBUTTON ) ) { + // reset zoom level if the button is no longer held down. + // NOTE: yes, this is terrible way to go about it. it'll do for now. + Global::ZoomFactor = std::max( 1.0f, Global::ZoomFactor - 15.0f * static_cast( Deltatime ) ); + } + /* else if( Global::iTextMode == -1 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy WriteLog( "Number of textures used: " + std::to_string( Global::iTextures ) ); @@ -1502,6 +1513,12 @@ bool TWorld::Render() // glColor3b(255, 0, 255); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glDepthFunc( GL_LEQUAL ); + + glMatrixMode( GL_PROJECTION ); // select the Projection Matrix + glLoadIdentity(); // reset the Projection Matrix + // 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 ); + glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glLoadIdentity(); Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii @@ -1794,6 +1811,14 @@ TWorld::Render_Cab() { void TWorld::Render_UI() { + // set the UI mode projection. TODO: rework it all into somethinig more elegant... eventually + glMatrixMode( GL_PROJECTION ); // select the Projection Matrix + glLoadIdentity(); // reset the Projection Matrix + // calculate the aspect ratio of the window + gluPerspective( 45.0f, (GLdouble)Global::ScreenWidth / (GLdouble)Global::ScreenHeight, 0.2f, 2500.0f ); + glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix + glLoadIdentity(); + if( DebugModeFlag && !Global::iTextMode ) { OutText1 = " FPS: "; OutText1 += to_string( Timer::GetFPS(), 2 ); From 1ea207b60fabc14959a03c3531dad6eaa53dfe16 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 20 Feb 2017 16:17:04 +0100 Subject: [PATCH 017/426] field of view setting, t3d loader fix --- Globals.cpp | 9 +++++++++ Globals.h | 1 + Model3d.cpp | 3 +++ World.cpp | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Globals.cpp b/Globals.cpp index 3e0c0f9b..e841346a 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -52,6 +52,7 @@ HWND Global::hWnd = NULL; // uchwyt okna int Global::ScreenWidth = 1; int Global::ScreenHeight = 1; float Global::ZoomFactor = 1.0f; +float Global::FieldOfView = 45.0f; int Global::iCameraLast = -1; std::string Global::asRelease = "16.0.1172.482"; std::string Global::asVersion = @@ -261,6 +262,14 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); 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") { diff --git a/Globals.h b/Globals.h index c4970efe..ff7fef81 100644 --- a/Globals.h +++ b/Globals.h @@ -256,6 +256,7 @@ class Global static int ScreenWidth; // current window dimensions. TODO: move it to renderer static int ScreenHeight; 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 std::string asRelease; // numer static std::string asVersion; // z opisem diff --git a/Model3d.cpp b/Model3d.cpp index fec5b563..22b956b5 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -219,6 +219,9 @@ template inline void readColor(cParser &parser, ColorT *color) double discard; parser.getTokens(4, false); 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) diff --git a/World.cpp b/World.cpp index 5e47971c..ee9eb1bd 100644 --- a/World.cpp +++ b/World.cpp @@ -1517,7 +1517,7 @@ bool TWorld::Render() glMatrixMode( GL_PROJECTION ); // select the Projection Matrix glLoadIdentity(); // reset the Projection Matrix // 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 glLoadIdentity(); From b73fec0c5aa25302dff157d0807c3a7aa88eca50 Mon Sep 17 00:00:00 2001 From: VB Date: Mon, 20 Feb 2017 19:03:27 +0100 Subject: [PATCH 018/426] x64 --- AnimModel.cpp | 2 +- AnimModel.h | 4 +- CMakeLists.txt | 1 + Float3d.cpp | 13 ++ Float3d.h | 2 + Gauge.cpp | 4 +- Model3d.cpp | 482 ++++++++++++++++++++++++++----------------------- Model3d.h | 66 ++----- PyInt.cpp | 5 +- Texture.cpp | 76 +++++++- Texture.h | 6 + VBO.cpp | 15 ++ VBO.h | 2 + World.cpp | 10 +- sn_utils.cpp | 72 ++++++++ sn_utils.h | 12 ++ 16 files changed, 479 insertions(+), 293 deletions(-) create mode 100644 sn_utils.cpp create mode 100644 sn_utils.h diff --git a/AnimModel.cpp b/AnimModel.cpp index 80f7f93e..afc175b3 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -546,7 +546,7 @@ TAnimContainer * TAnimModel::GetContainer(char *pName) TAnimContainer *pCurrent; for (pCurrent = pRoot; pCurrent != NULL; pCurrent = pCurrent->pNext) // if (pCurrent->GetName()==pName) - if (stricmp(pCurrent->NameGet(), pName) == 0) + if (std::string(pName) == pCurrent->NameGet()) return pCurrent; return AddContainer(pName); } diff --git a/AnimModel.h b/AnimModel.h index bc688a5d..5c2899b2 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -81,9 +81,9 @@ class TAnimContainer // std::string(pSubModel?pSubModel->asName.c_str():""); }; // std::string inline GetName() { return std::string(pSubModel?pSubModel->pName:""); // }; - char * NameGet() + std::string NameGet() { - return (pSubModel ? pSubModel->pName : NULL); + return (pSubModel ? pSubModel->pName : ""); }; // void SetRotateAnim(vector3 vNewRotateAxis, double fNewDesiredAngle, double // fNewRotateSpeed, bool bResetAngle=false); diff --git a/CMakeLists.txt b/CMakeLists.txt index 3dda5e50..653ee241 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,7 @@ set(SOURCES "PyInt.cpp" "RealSound.cpp" "ResourceManager.cpp" +"sn_utils.cpp" "Segment.cpp" "sky.cpp" "Sound.cpp" diff --git a/Float3d.cpp b/Float3d.cpp index 2f82507e..f7af9899 100644 --- a/Float3d.cpp +++ b/Float3d.cpp @@ -9,9 +9,22 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "float3d.h" +#include "sn_utils.h" //--------------------------------------------------------------------------- +void float4x4::deserialize_float32(std::istream &s) +{ + for (size_t i = 0; i < 16; i++) + e[i] = sn_utils::ld_float32(s); +} + +void float4x4::deserialize_float64(std::istream &s) +{ + for (size_t i = 0; i < 16; i++) + e[i] = (float)sn_utils::ld_float64(s); +} + void float4x4::Quaternion(float4 *q) { // konwersja kwaternionu obrotu na macierz obrotu float xx = q->x * q->x, yy = q->y * q->y, zz = q->z * q->z; diff --git a/Float3d.h b/Float3d.h index c3ee39a7..7aa8312b 100644 --- a/Float3d.h +++ b/Float3d.h @@ -187,6 +187,8 @@ class float4x4 float e[16]; public: + void deserialize_float32(std::istream &s); + void deserialize_float64(std::istream &s); float4x4(void){}; float4x4(float f[16]) { diff --git a/Gauge.cpp b/Gauge.cpp index 541deeb3..90e66f6b 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -60,7 +60,7 @@ void TGauge::Init(TSubModel *NewSubModel, TGaugeType eNewType, double fNewScale, do { // pętla po submodelach potomnych i obracanie ich o kąt zależy od // cyfry w (fValue) - if (sm->pName) + if (sm->pName.size()) { // musi mieć niepustą nazwę if (sm->pName[0] >= '0') if (sm->pName[0] <= '9') @@ -177,7 +177,7 @@ void TGauge::Update() do { // pętla po submodelach potomnych i obracanie ich o kąt zależy od // cyfry w (fValue) - if (sm->pName) + if (sm->pName.size()) { // musi mieć niepustą nazwę if (sm->pName[0] >= '0') if (sm->pName[0] <= '9') diff --git a/Model3d.cpp b/Model3d.cpp index 519a235b..1a9dff1c 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -22,12 +22,13 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others #include "Texture.h" #include "Timer.h" #include "mtable.h" +#include "sn_utils.h" //--------------------------------------------------------------------------- using namespace Mtable; double TSubModel::fSquareDist = 0; -int TSubModel::iInstance; // numer renderowanego egzemplarza obiektu +size_t TSubModel::iInstance; // numer renderowanego egzemplarza obiektu texture_manager::size_type *TSubModel::ReplacableSkinId = NULL; int TSubModel::iAlpha = 0x30300030; // maska do testowania flag tekstur wymiennych TModel3d *TSubModel::pRoot; // Ra: tymczasowo wskaźnik na model widoczny z submodelu @@ -47,24 +48,6 @@ int TSubModelInfo::iTotalTextures = 0; // długość obszaru tekstur int TSubModelInfo::iCurrent = 0; // aktualny obiekt TSubModelInfo *TSubModelInfo::pTable = NULL; // tabele obiektów pomocniczych -char *TStringPack::String(int n) -{ // zwraca wskaźnik do łańcucha o podanym numerze - if (index ? n < (index[1] >> 2) - 2 : false) - return data + 8 + index[n + 2]; // indeks upraszcza kwestię wyszukiwania - // jak nie ma indeksu, to trzeba szukać - int max = *((int *)(data + 4)); // długość obszaru łańcuchów - char *ptr = data + 8; // począek obszaru łańcuchów - for (int i = 0; i < n; ++i) - { // wyszukiwanie łańcuchów nie jest zbyt optymalne, ale nie musi być - while (*ptr) - ++ptr; // wyszukiwanie zera - ++ptr; // pominięcie zera - if (ptr > data + max) - return NULL; // zbyt wysoki numer - } - return ptr; -}; - TSubModel::TSubModel() { ZeroMemory(this, sizeof(TSubModel)); // istotne przy zapisywaniu wersji binarnej @@ -114,7 +97,8 @@ void TSubModel::FirstInit() iTexture = 0; // brak tekstury // asName=""; // asTexture=""; - pName = pTexture = NULL; + pName = ""; + pTexture = ""; f4Ambient[0] = f4Ambient[1] = f4Ambient[2] = f4Ambient[3] = 1.0; //{1,1,1,1}; f4Diffuse[0] = f4Diffuse[1] = f4Diffuse[2] = f4Diffuse[3] = 1.0; //{1,1,1,1}; f4Specular[0] = f4Specular[1] = f4Specular[2] = 0.0; @@ -134,8 +118,6 @@ TSubModel::~TSubModel() SafeDelete(Child); delete fMatrix; // własny transform trzeba usunąć (zawsze jeden) delete[] Vertices; - delete[] pTexture; - delete[] pName; } /* else @@ -151,15 +133,7 @@ void TSubModel::TextureNameSet(const char *n) // ile nie jest wczytany z E3D if (iFlags & 0x0200) { // tylko jeżeli submodel zosta utworzony przez new - delete[] pTexture; // usunięcie poprzedniej - int i = strlen(n); - if (i) - { // utworzenie nowej - pTexture = new char[i + 1]; - strcpy(pTexture, n); - } - else - pTexture = NULL; + pTexture = std::string(n); } }; @@ -167,17 +141,7 @@ void TSubModel::NameSet(const char *n) { // ustawienie nazwy submodelu, o ile // nie jest wczytany z E3D if (iFlags & 0x0200) - { // tylko jeżeli submodel zosta utworzony przez new - delete[] pName; // usunięcie poprzedniej - int i = strlen(n); - if (i) - { // utworzenie nowej - pName = new char[i + 1]; - strcpy(pName, n); - } - else - pName = NULL; - } + pName = std::string(n); }; // int TSubModel::SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 @@ -368,8 +332,8 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) parser >> discard >> bWire >> discard >> fWireSize >> discard; Opacity = readIntAsDouble(parser, 100.0f); // wymagane jest 0 dla szyb, 100 idzie w nieprzezroczyste - if (Opacity > 1.0) - Opacity *= 0.01; // w 2013 był błąd i aby go obejść, trzeba było wpisać 10000.0 + if (Opacity > 1.0f) + Opacity *= 0.01f; // w 2013 był błąd i aby go obejść, trzeba było wpisać 10000.0 if ((Global::iConvertModels & 1) == 0) // dla zgodności wstecz Opacity = 0.0; // wszystko idzie w przezroczyste albo zależnie od tekstury if (!parser.expectToken("map:")) @@ -961,11 +925,15 @@ TSubModel *TSubModel::GetFromName(char const *search, bool i) // std::transform(search.begin(),search.end(),search.begin(),ToLower()); // search=search.LowerCase(); // AnsiString name=AnsiString(); - if (pName && search) - if ((i ? stricmp(pName, search) : strcmp(pName, search)) == 0) + std::string search_lc = std::string(search); + if (i) + std::transform(search_lc.begin(), search_lc.end(), search_lc.begin(), ::tolower); + std::string pName_lc = pName; + if (i) + std::transform(pName_lc.begin(), pName_lc.end(), pName_lc.begin(), ::tolower); + if (pName.size() && search) + if (pName_lc == search_lc) return this; - else if (pName == search) - return this; // oba NULL if (Next) { result = Next->GetFromName(search); @@ -1063,7 +1031,7 @@ void TSubModel::RaAnimation(TAnimType a) TSubModel *sm = ChildGet(); do { // pętla po submodelach potomnych i obracanie ich o kąt zależy od czasu - if (sm->pName) + if (sm->pName.size()) { // musi mieć niepustą nazwę if ((sm->pName[0]) >= '0') if ((sm->pName[0]) <= '5') // zegarek ma 6 cyfr maksymalnie @@ -1220,7 +1188,7 @@ void TSubModel::RenderAlphaDL() if (eType == TP_TEXT) { // tekst renderujemy w specjalny sposób, zamiast // submodeli z łańcucha Child - int i, j = pasText->size(); + size_t i, j = pasText->size(); TSubModel *p; if (!smLetter) { // jeśli nie ma tablicy, to ją stworzyć; miejsce @@ -1232,7 +1200,7 @@ void TSubModel::RenderAlphaDL() p = Child; while (p) { - smLetter[*p->pName] = p; + smLetter[p->pName[0]] = p; p = p->Next; // kolejny znak } } @@ -1288,12 +1256,12 @@ void TSubModel::RenderVBO() if (Global::fLuminance < fLight) { glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glDrawArrays(eType, iVboPtr, + glDrawArrays(eType, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie trójkąty z VBO glMaterialfv(GL_FRONT, GL_EMISSION, emm2); } else - glDrawArrays(eType, iVboPtr, + glDrawArrays(eType, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie trójkąty z VBO } } @@ -1359,7 +1327,7 @@ void TSubModel::RenderVBO() // blendowaly glColor3fv(color); // inaczej są białe glMaterialfv(GL_FRONT, GL_EMISSION, color); - glDrawArrays(GL_POINTS, iVboPtr, iNumVerts); // narysuj wierzchołek z + glDrawArrays(GL_POINTS, (GLint)iVboPtr, iNumVerts); // narysuj wierzchołek z // VBO glEnable(GL_LIGHTING); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); // co ma ustawiać glColor @@ -1383,7 +1351,7 @@ void TSubModel::RenderVBO() // blendowaly // glMaterialfv(GL_FRONT,GL_EMISSION,f4Diffuse); //zeby swiecilo na // kolorowo - glDrawArrays(GL_POINTS, iVboPtr, + glDrawArrays(GL_POINTS, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie punkty z VBO glEnable(GL_LIGHTING); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); @@ -1459,12 +1427,12 @@ void TSubModel::RenderAlphaVBO() if (Global::fLuminance < fLight) { glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glDrawArrays(eType, iVboPtr, + glDrawArrays(eType, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie trójkąty z VBO glMaterialfv(GL_FRONT, GL_EMISSION, emm2); } else - glDrawArrays(eType, iVboPtr, + glDrawArrays(eType, (GLint)iVboPtr, iNumVerts); // narysuj naraz wszystkie trójkąty z VBO } } @@ -1539,18 +1507,18 @@ void TSubModel::Info() if (t != std::string(pTexture)) { // jeśli się zmieniło // pName=new char[token.length()+1]; //nie ma sensu skracać tabeli - strcpy(pTexture, t.c_str()); + pTexture = t; } - info->iTextureLen = t.size() + 1; // przygotowanie do zapisania, z zerem na końcu + info->iTextureLen = (int)t.size() + 1; // przygotowanie do zapisania, z zerem na końcu } } else info->iTexture = TextureID; // nie ma albo wymienna // if (asName.Length()) - if (pName) + if (pName.size()) { info->iName = info->iTotalNames++; // przydzielenie numeru nazwy w pliku (od 0) - info->iNameLen = strlen(pName) + 1; // z zerem na końcu + info->iNameLen = (int)pName.size() + 1; // z zerem na końcu } ++info->iCurrent; // przejście do kolejnego obiektu pomocniczego if (Child) @@ -1576,73 +1544,14 @@ void TSubModel::InfoSet(TSubModelInfo *info) TextureID = info->iTexture; // numer tekstury w OpenGL iName = info->iName; // numer nazwy w obszarze nazw iMatrix = info->iTransform; // numer macierzy - Next = (TSubModel *)info->iNext; // numer następnego - Child = (TSubModel *)info->iChild; // numer potomnego + iNext = info->iNext; // numer następnego + iChild = info->iChild; // numer potomnego iFlags &= ~0x200; // nie jest wczytany z tekstowego // asTexture=asName=""; - pTexture = pName = NULL; + pTexture = ""; + pName = ""; }; -void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, TStringPack *t, TStringPack *n, - bool dynamic) -{ // ustawienie wskaźników w submodelu - iVisible = 1; // tymczasowo używane - Child = ((int)Child > 0) ? s + (int)Child : NULL; // zerowy nie może być potomnym - Next = ((int)Next > 0) ? s + (int)Next : NULL; // zerowy nie może być następnym - fMatrix = ((iMatrix >= 0) && m) ? m + iMatrix : NULL; - // if (n&&(iName>=0)) asName=AnsiString(n->String(iName)); else asName=""; - if (n && (iName >= 0)) - { - pName = n->String(iName); - std::string name(pName); - if (false == name.empty()) - { // jeśli dany submodel jest zgaszonym światłem, to - // domyślnie go ukrywamy - if ((name.size() >= 8) && (name.substr(0, 8) == "Light_On")) - { // jeśli jest światłem numerowanym - iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z - } - // obiektem "Light_Off" - else if (dynamic) - { // inaczej wyłączało smugę w latarniach - if ((name.size() >= 3) && (name.substr(name.size() - 3, 3) == "_on")) - { // jeśli jest kontrolką w stanie zapalonym - iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z - } - } - // obiektem "_off" - } - } - else - pName = NULL; - if (iTexture > 0) - { // obsługa stałej tekstury - // TextureID=TTexturesManager::GetTextureID(t->String(TextureID)); - // asTexture=AnsiString(t->String(iTexture)); - pTexture = t->String(iTexture); - std::string tex = pTexture; - if (tex.find_last_of("/\\") == std::string::npos) - tex.insert(0, Global::asCurrentTexturePath); - TextureID = TextureManager.GetTextureId(tex, szTexturePath); - // TexAlpha=TTexturesManager::GetAlpha(TextureID); //zmienna robocza - // ustawienie cyklu przezroczyste/nieprzezroczyste zależnie od własności - // stałej tekstury - // iFlags=(iFlags&~0x30)|(TTexturesManager::GetAlpha(TextureID)?0x20:0x10); - // //0x10-nieprzezroczysta, 0x20-przezroczysta - if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity 0! - iFlags |= TextureManager.Texture(TextureID).has_alpha ? - 0x20 : - 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta - else - iFlags |= 0x10; // normalnie nieprzezroczyste - } - b_aAnim = b_Anim; // skopiowanie animacji do drugiego cyklu - iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem - // tablic) - Vertices = v + iVboPtr; - // if (!iNumVerts) eType=-1; //tymczasowo zmiana typu, żeby się nie - // renderowało na siłę -}; void TSubModel::AdjustDist() { // aktualizacja odległości faz LoD, zależna od // rozdzielczości pionowej oraz multisamplingu @@ -1834,112 +1743,227 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) return result; }; +// E3D deserialization +// http://rainsted.com/pl/Format_binarny_modeli_-_E3D + +void TSubModel::deserialize(std::istream &s) +{ + iNext = sn_utils::ld_int32(s); + iChild = sn_utils::ld_int32(s); + + eType = sn_utils::ld_int32(s); + iName = sn_utils::ld_int32(s); + + b_Anim = (TAnimType)sn_utils::ld_int32(s); + + iFlags = sn_utils::ld_int32(s); + iMatrix = sn_utils::ld_int32(s); + + iNumVerts = sn_utils::ld_int32(s); + tVboPtr = sn_utils::ld_int32(s); + iTexture = sn_utils::ld_int32(s); + + fVisible = sn_utils::ld_float32(s); + fLight = sn_utils::ld_float32(s); + + for (size_t i = 0; i < 4; i++) + f4Ambient[i] = sn_utils::ld_float32(s); + + for (size_t i = 0; i < 4; i++) + f4Diffuse[i] = sn_utils::ld_float32(s); + + for (size_t i = 0; i < 4; i++) + f4Specular[i] = sn_utils::ld_float32(s); + + for (size_t i = 0; i < 4; i++) + f4Emision[i] = sn_utils::ld_float32(s); + + fWireSize = sn_utils::ld_float32(s); + fSquareMaxDist = sn_utils::ld_float32(s); + fSquareMinDist = sn_utils::ld_float32(s); + + fNearAttenStart = sn_utils::ld_float32(s); + fNearAttenEnd = sn_utils::ld_float32(s); + bUseNearAtten = sn_utils::ld_uint32(s) != 0; + iFarAttenDecay = sn_utils::ld_int32(s); + fFarDecayRadius = sn_utils::ld_float32(s); + fCosFalloffAngle = sn_utils::ld_float32(s); + fCosHotspotAngle = sn_utils::ld_float32(s); + fCosViewAngle = sn_utils::ld_float32(s); +} + +void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) +{ + m_pVNT = nullptr; + Root = nullptr; + float4x4 *tm = nullptr; + + std::streampos end = s.tellg() + (std::streampos)size; + + while (s.tellg() < end) + { + uint32_t type = sn_utils::ld_uint32(s); + uint32_t size = sn_utils::ld_uint32(s) - 8; + std::streampos end = s.tellg() + (std::streampos)size; + + if (type == MAKE_ID4('V', 'N', 'T', '0')) + { + if (m_pVNT != nullptr) + throw std::runtime_error("e3d: duplicated VNT chunk"); + + size_t vt_cnt = size / 32; + iNumVerts = (int)vt_cnt; + m_nVertexCount = (int)vt_cnt; + m_pVNT = new CVertNormTex[vt_cnt]; + for (size_t i = 0; i < vt_cnt; i++) + m_pVNT[i].deserialize(s); + } + else if ((type & 0x00FFFFFF) == MAKE_ID4('S', 'U', 'B', 0)) + { + if (Root != nullptr) + throw std::runtime_error("e3d: duplicated SUB chunk"); + + size_t sm_size = 256 + 64 * (((type & 0xFF000000) >> 24) - '0'); + size_t sm_cnt = size / sm_size; + iSubModelsCount = (int)sm_cnt; + Root = new TSubModel[sm_cnt]; + size_t pos = s.tellg(); + for (size_t i = 0; i < sm_cnt; i++) + { + s.seekg(pos + sm_size * i); + Root[i].deserialize(s); + } + } + else if (type == MAKE_ID4('T', 'R', 'A', '0')) + { + if (tm != nullptr) + throw std::runtime_error("e3d: duplicated TRA chunk"); + size_t t_cnt = size / 64; + + tm = new float4x4[t_cnt]; + for (size_t i = 0; i < t_cnt; i++) + tm[i].deserialize_float32(s); + } + else if (type == MAKE_ID4('T', 'R', 'A', '1')) + { + if (tm != nullptr) + throw std::runtime_error("e3d: duplicated TRA chunk"); + size_t t_cnt = size / 128; + + tm = new float4x4[t_cnt]; + for (size_t i = 0; i < t_cnt; i++) + tm[i].deserialize_float64(s); + } + else if (type == MAKE_ID4('T', 'E', 'X', '0')) + { + if (Textures.size()) + throw std::runtime_error("e3d: duplicated TEX chunk"); + while (s.tellg() < end) + Textures.push_back(sn_utils::d_str(s)); + } + else if (type == MAKE_ID4('N', 'A', 'M', '0')) + { + if (Names.size()) + throw std::runtime_error("e3d: duplicated NAM chunk"); + while (s.tellg() < end) + Names.push_back(sn_utils::d_str(s)); + } + + s.seekg(end); + } + + if (!Root) + throw std::runtime_error("e3d: no submodels"); + + if (!m_pVNT) + throw std::runtime_error("e3d: no vertices"); + + for (size_t i = 0; (int)i < iSubModelsCount; i++) + { + Root[i].BinInit(Root, tm, (float8*)m_pVNT, &Textures, &Names, dynamic); + + if (Root[i].ChildGet()) + Root[i].ChildGet()->Parent = &Root[i]; + if (Root[i].NextGet()) + Root[i].NextGet()->Parent = Root[i].Parent; + } +} + +void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, + std::vector *t, std::vector *n, bool dynamic) +{ // ustawienie wskaźników w submodelu + iVisible = 1; // tymczasowo używane + Child = (iChild > 0) ? s + iChild : nullptr; // zerowy nie może być potomnym + Next = (iNext > 0) ? s + iNext : nullptr; // zerowy nie może być następnym + fMatrix = ((iMatrix >= 0) && m) ? m + iMatrix : nullptr; + if (n->size() && (iName >= 0)) + { + pName = n->at(iName); + if (!pName.empty()) + { // jeśli dany submodel jest zgaszonym światłem, to + // domyślnie go ukrywamy + if ((pName.size() >= 8) && (pName.substr(0, 8) == "Light_On")) + { // jeśli jest światłem numerowanym + iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z + } + // obiektem "Light_Off" + else if (dynamic) + { // inaczej wyłączało smugę w latarniach + if ((pName.size() >= 3) && (pName.substr(pName.size() - 3, 3) == "_on")) + { // jeśli jest kontrolką w stanie zapalonym + iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z + } + } + // obiektem "_off" + } + } + else + pName = ""; + if (iTexture > 0) + { // obsługa stałej tekstury + // TextureID=TTexturesManager::GetTextureID(t->String(TextureID)); + // asTexture=AnsiString(t->String(iTexture)); + pTexture = t->at(iTexture); + if (pTexture.find_last_of("/\\") == std::string::npos) + pTexture.insert(0, Global::asCurrentTexturePath); + TextureID = TextureManager.GetTextureId(pTexture, szTexturePath); + // TexAlpha=TTexturesManager::GetAlpha(TextureID); //zmienna robocza + // ustawienie cyklu przezroczyste/nieprzezroczyste zależnie od własności + // stałej tekstury + // iFlags=(iFlags&~0x30)|(TTexturesManager::GetAlpha(TextureID)?0x20:0x10); + // //0x10-nieprzezroczysta, 0x20-przezroczysta + if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity 0! + iFlags |= TextureManager.Texture(TextureID).has_alpha ? + 0x20 : + 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta + else + iFlags |= 0x10; // normalnie nieprzezroczyste + } + else + TextureID = iTexture; + b_aAnim = b_Anim; // skopiowanie animacji do drugiego cyklu + iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem + // tablic) + iVboPtr = tVboPtr; + Vertices = v + iVboPtr; + // if (!iNumVerts) eType=-1; //tymczasowo zmiana typu, żeby się nie + // renderowało na siłę +}; + void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) { // wczytanie modelu z pliku binarnego WriteLog("Loading - binary model: " + FileName); - int i = 0, j, k, ch, size; + + std::ifstream file(FileName, std::ios::binary); - /* TFileStream *fs = new TFileStream(AnsiString(FileName), fmOpenRead); - size = fs->Size >> 2; - iModel = new int[size]; // ten wskaźnik musi być w modelu, aby zwolnić pamięć - fs->Read(iModel, fs->Size); // wczytanie pliku - delete fs; - */ { - std::ifstream file(FileName, std::ios::binary | std::ios::ate); - file.unsetf(std::ios::skipws); - size = file.tellg(); // ios::ate already positioned us at the end of the file - iModel = new int[size >> 2]; // ten wskaźnik musi być w modelu, aby zwolnić pamięć - file.seekg(0, std::ios::beg); // rewind the caret afterwards - file.read(reinterpret_cast(iModel), size); - } - float4x4 *m = NULL; // transformy - // zestaw kromek: - while ((i << 2) < size) // w pliku może być kilka modeli - { - ch = iModel[i]; // nazwa kromki - j = i + (iModel[i + 1] >> 2); // początek następnej kromki - if (ch == MAKE_ID4('E', '3', 'D', '0')) // główna: 'E3D0',len,pod-kromki - { // tylko tę kromkę znamy, może kiedyś jeszcze DOF się zrobi - i += 2; - while (i < j) - { // przetwarzanie kromek wewnętrznych - ch = iModel[i]; // nazwa kromki - k = (iModel[i + 1] >> 2); // długość aktualnej kromki - switch (ch) - { - case MAKE_ID4('M', 'D', 'L', - '0'): // zmienne modelu: 'E3D0',len,(informacje o modelu) - break; - case MAKE_ID4('V', 'N', 'T', - '0'): // wierzchołki: 'VNT0',len,(32 bajty na wierzchołek) - iNumVerts = (k - 2) >> 3; - m_nVertexCount = iNumVerts; - m_pVNT = (CVertNormTex *)(iModel + i + 2); - break; - case MAKE_ID4('S', 'U', 'B', '0'): // submodele: 'SUB0',len,(256 bajtów na submodel) - iSubModelsCount = (k - 2) / 64; - Root = - (TSubModel *)(iModel + i + 2); // numery na wskaźniki przetworzymy później - break; - case MAKE_ID4('S', 'U', 'B', '1'): // submodele: 'SUB1',len,(320 bajtów na submodel) - iSubModelsCount = (k - 2) / 80; - Root = - (TSubModel *)(iModel + i + 2); // numery na wskaźniki przetworzymy później - for (ch = 1; ch < iSubModelsCount; - ++ch) // trzeba przesunąć bliżej, bo 256 wystarczy - MoveMemory(((char *)Root) + 256 * ch, ((char *)Root) + 320 * ch, 256); - break; - case MAKE_ID4('T', 'R', 'A', '0'): // transformy: 'TRA0',len,(64 bajty na transform) - m = (float4x4 *)(iModel + i + 2); // tabela transformów - break; - case MAKE_ID4('T', 'R', 'A', - '1'): // transformy: 'TRA1',len,(128 bajtów na transform) - m = (float4x4 *)(iModel + i + 2); // tabela transformów - for (ch = 0; ch < ((k - 2) >> 1); ++ch) - *(((float *)m) + ch) = *(((double *)m) + ch); // przepisanie double do float - break; - case MAKE_ID4('I', 'D', 'X', - '1'): // indeksy 1B: 'IDX2',len,(po bajcie na numer wierzchołka) - break; - case MAKE_ID4('I', 'D', 'X', - '2'): // indeksy 2B: 'IDX2',len,(po 2 bajty na numer wierzchołka) - break; - case MAKE_ID4('I', 'D', 'X', - '4'): // indeksy 4B: 'IDX4',len,(po 4 bajty na numer wierzchołka) - break; - case MAKE_ID4('T', 'E', 'X', - '0'): // tekstury: 'TEX0',len,(łańcuchy zakończone zerem - pliki - // tekstur) - Textures.Init((char *)(iModel + i)); //łącznie z nagłówkiem - break; - case MAKE_ID4('T', 'I', 'X', '0'): // indeks nazw tekstur - Textures.InitIndex((int *)(iModel + i)); //łącznie z nagłówkiem - break; - case MAKE_ID4('N', 'A', 'M', - '0'): // nazwy: 'NAM0',len,(łańcuchy zakończone zerem - nazwy - // submodeli) - Names.Init((char *)(iModel + i)); //łącznie z nagłówkiem - break; - case MAKE_ID4('N', 'I', 'X', '0'): // indeks nazw submodeli - Names.InitIndex((int *)(iModel + i)); //łącznie z nagłówkiem - break; - } - i += k; // przejście do kolejnej kromki - } - } - i = j; - } - for (i = 0; i < iSubModelsCount; ++i) - { // aktualizacja wskaźników w submodelach - Root[i].BinInit(Root, m, (float8 *)m_pVNT, &Textures, &Names, dynamic); - if (Root[i].ChildGet()) - Root[i].ChildGet()->Parent = Root + i; // wpisanie wskaźnika nadrzędnego do potmnego - if (Root[i].NextGet()) - Root[i].NextGet()->Parent = - Root[i].Parent; // skopiowanie wskaźnika nadrzędnego do kolejnego - } - iFlags &= ~0x0200; - return; + uint32_t type = sn_utils::ld_uint32(file); + uint32_t size = sn_utils::ld_uint32(file) - 8; + + if (type != MAKE_ID4('E', '3', 'D', '0')) + throw std::runtime_error("e3d: unknown main chunk"); + + deserialize(file, size, dynamic); + file.close(); }; void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic) @@ -2084,7 +2108,7 @@ void TModel3d::SaveToBinFile(char const *FileName) { roboczy->InfoSet(info + i); file.write(reinterpret_cast(roboczy), - sizeof(TSubModel)); // zapis jednego submodelu + 256); // zapis jednego submodelu } if (tra) { // zapis transformów @@ -2110,7 +2134,7 @@ void TModel3d::SaveToBinFile(char const *FileName) 1); // ciąg o numerze zero nie jest używany, ma tylko znacznik końca for (i = 0; i < iSubModelsCount; ++i) if (info[i].iTextureLen) - file.write(info[i].pSubModel->pTexture, info[i].iTextureLen); + file.write(info[i].pSubModel->pTexture.c_str(), info[i].iTextureLen); if ((-tex) & 3) file.write(reinterpret_cast(&zero), ((-tex) & 3)); // wyrównanie do wielokrotności 4 bajtów @@ -2122,7 +2146,7 @@ void TModel3d::SaveToBinFile(char const *FileName) file.write(reinterpret_cast(&i), 4); for (i = 0; i < iSubModelsCount; ++i) if (info[i].iNameLen) - file.write(info[i].pSubModel->pName, info[i].iNameLen); + file.write(info[i].pSubModel->pName.c_str(), info[i].iNameLen); if ((-nam) & 3) file.write(reinterpret_cast(&zero), ((-nam) & 3)); // wyrównanie do wielokrotności 4 bajtów diff --git a/Model3d.h b/Model3d.h index c6321d46..1a98ac58 100644 --- a/Model3d.h +++ b/Model3d.h @@ -26,37 +26,6 @@ struct GLVERTEX float tu, tv; }; -class TStringPack -{ - char *data; - //+0 - 4 bajty: typ kromki - //+4 - 4 bajty: długość łącznie z nagłówkiem - //+8 - obszar łańcuchów znakowych, każdy zakończony zerem - int *index; - //+0 - 4 bajty: typ kromki - //+4 - 4 bajty: długość łącznie z nagłówkiem - //+8 - tabela indeksów -public: - char *String(int n); - char *StringAt(int n) - { - return data + 9 + n; - }; - TStringPack() - { - data = NULL; - index = NULL; - }; - void Init(char *d) - { - data = d; - }; - void InitIndex(int *i) - { - index = i; - }; -}; - class TMaterialColor { public: @@ -163,11 +132,10 @@ class TSubModelInfo; class TSubModel { // klasa submodelu - pojedyncza siatka, punkt świetlny albo grupa punktów - // Ra: ta klasa ma mieć wielkość 256 bajtów, aby pokryła się z formatem binarnym - // Ra: nie przestawiać zmiennych, bo wczytują się z pliku binarnego! + //m7todo: zrobić normalną serializację private: - TSubModel *Next; - TSubModel *Child; + int iNext; + int iChild; int eType; // Ra: modele binarne dają więcej możliwości niż mesh złożony z trójkątów int iName; // numer łańcucha z nazwą submodelu, albo -1 gdy anonimowy public: // chwilowo @@ -194,7 +162,7 @@ private: int iMatrix; // w pliku binarnym jest numer matrycy }; int iNumVerts; // ilość wierzchołków (1 dla FreeSpotLight) - int iVboPtr; // początek na liście wierzchołków albo indeksów + int tVboPtr; // początek na liście wierzchołków albo indeksów int iTexture; // numer nazwy tekstury, -1 wymienna, 0 brak float fVisible; // próg jasności światła do załączenia submodelu float fLight; // próg jasności światła do zadziałania selfillum @@ -215,7 +183,10 @@ private: float fCosHotspotAngle; // cosinus kąta stożka pod którym widać aureolę i zwiększone natężenie // światła float fCosViewAngle; // cos kata pod jakim sie teraz patrzy - // Ra: dalej są zmienne robocze, można je przestawiać z zachowaniem rozmiaru klasy + + TSubModel *Next; + TSubModel *Child; + intptr_t iVboPtr; texture_manager::size_type TextureID; // numer tekstury, -1 wymienna, 0 brak bool bWire; // nie używane, ale wczytywane // short TexAlpha; //Ra: nie używane już @@ -231,7 +202,7 @@ private: public: // chwilowo float3 v_TransVector; float8 *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO - int iAnimOwner; // roboczy numer egzemplarza, który ustawił animację + size_t iAnimOwner; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim; // kody animacji oddzielnie, bo zerowane public: float4x4 *mAnimMatrix; // macierz do animacji kwaternionowych (należy do AnimContainer) @@ -243,8 +214,8 @@ public: int iVisible; // roboczy stan widoczności // AnsiString asTexture; //robocza nazwa tekstury do zapisania w pliku binarnym // AnsiString asName; //robocza nazwa - char *pTexture; // robocza nazwa tekstury do zapisania w pliku binarnym - char *pName; // robocza nazwa + std::string pTexture; // robocza nazwa tekstury do zapisania w pliku binarnym + std::string pName; // robocza nazwa private: // int SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 *pt,GLVERTEX // *Vertices); @@ -252,7 +223,7 @@ private: void RaAnimation(TAnimType a); public: - static int iInstance; // identyfikator egzemplarza, który aktualnie renderuje model + static size_t iInstance; // identyfikator egzemplarza, który aktualnie renderuje model static texture_manager::size_type *ReplacableSkinId; static int iAlpha; // maska bitowa dla danego przebiegu static double fSquareDist; @@ -310,8 +281,8 @@ public: void DisplayLists(); void Info(); void InfoSet(TSubModelInfo *info); - void BinInit(TSubModel *s, float4x4 *m, float8 *v, TStringPack *t, TStringPack *n = NULL, - bool dynamic = false); + void BinInit(TSubModel *s, float4x4 *m, float8 *v, + std::vector *t, std::vector *n, bool dynamic); void ReplacableSet(texture_manager::size_type *r, int a) { ReplacableSkinId = r; @@ -344,6 +315,8 @@ public: void ParentMatrix(float4x4 *m); float MaxY(const float4x4 &m); void AdjustDist(); + + void deserialize(std::istream &s); }; class TSubModelInfo @@ -386,8 +359,8 @@ private: public: // Ra: tymczasowo int iNumVerts; // ilość wierzchołków (gdy nie ma VBO, to m_nVertexCount=0) private: - TStringPack Textures; // nazwy tekstur - TStringPack Names; // nazwy submodeli + std::vector Textures; // nazwy tekstur + std::vector Names; // nazwy submodeli int *iModel; // zawartość pliku binarnego int iSubModelsCount; // Ra: używane do tworzenia binarnych std::string asBinary; // nazwa pod którą zapisać model binarny @@ -440,13 +413,14 @@ public: return iFlags; }; void Init(); - char * NameGet() + std::string NameGet() { return Root ? Root->pName : NULL; }; int TerrainCount(); TSubModel * TerrainSquare(int n); void TerrainRenderVBO(int n); + void deserialize(std::istream &s, size_t size, bool dynamic); }; //--------------------------------------------------------------------------- diff --git a/PyInt.cpp b/PyInt.cpp index d1cf3341..7550316b 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -13,7 +13,10 @@ TPythonInterpreter *TPythonInterpreter::_instance = NULL; TPythonInterpreter::TPythonInterpreter() { WriteLog("Loading Python ..."); - Py_SetPythonHome("python"); + if (sizeof(void*) == 8) + Py_SetPythonHome("python64"); + else + Py_SetPythonHome("python"); Py_Initialize(); _main = PyImport_ImportModule("__main__"); if (_main == NULL) diff --git a/Texture.cpp b/Texture.cpp index cfd10232..a0a7b8c1 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -25,6 +25,7 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "Usefull.h" #include "TextureDDS.h" +#include "sn_utils.h" texture_manager TextureManager; @@ -124,6 +125,70 @@ opengl_texture::load_BMP() { return; } +DDCOLORKEY opengl_texture::deserialize_ddck(std::istream &s) +{ + DDCOLORKEY ddck; + + ddck.dwColorSpaceLowValue = sn_utils::ld_uint32(s); + ddck.dwColorSpaceHighValue = sn_utils::ld_uint32(s); + + return ddck; +} + +DDPIXELFORMAT opengl_texture::deserialize_ddpf(std::istream &s) +{ + DDPIXELFORMAT ddpf; + + ddpf.dwSize = sn_utils::ld_uint32(s); + ddpf.dwFlags = sn_utils::ld_uint32(s); + ddpf.dwFourCC = sn_utils::ld_uint32(s); + ddpf.dwRGBBitCount = sn_utils::ld_uint32(s); + ddpf.dwRBitMask = sn_utils::ld_uint32(s); + ddpf.dwGBitMask = sn_utils::ld_uint32(s); + ddpf.dwBBitMask = sn_utils::ld_uint32(s); + ddpf.dwRGBAlphaBitMask = sn_utils::ld_uint32(s); + + return ddpf; +} + +DDSCAPS2 opengl_texture::deserialize_ddscaps(std::istream &s) +{ + DDSCAPS2 ddsc; + + ddsc.dwCaps = sn_utils::ld_uint32(s); + ddsc.dwCaps2 = sn_utils::ld_uint32(s); + ddsc.dwCaps3 = sn_utils::ld_uint32(s); + ddsc.dwCaps4 = sn_utils::ld_uint32(s); + + return ddsc; +} + +DDSURFACEDESC2 opengl_texture::deserialize_ddsd(std::istream &s) +{ + DDSURFACEDESC2 ddsd; + + ddsd.dwSize = sn_utils::ld_uint32(s); + ddsd.dwFlags = sn_utils::ld_uint32(s); + ddsd.dwHeight = sn_utils::ld_uint32(s); + ddsd.dwWidth = sn_utils::ld_uint32(s); + ddsd.lPitch = sn_utils::ld_uint32(s); + ddsd.dwBackBufferCount = sn_utils::ld_uint32(s); + ddsd.dwMipMapCount = sn_utils::ld_uint32(s); + ddsd.dwAlphaBitDepth = sn_utils::ld_uint32(s); + ddsd.dwReserved = sn_utils::ld_uint32(s); + sn_utils::ld_uint32(s); + ddsd.lpSurface = nullptr; + ddsd.ddckCKDestOverlay = deserialize_ddck(s); + ddsd.ddckCKDestBlt = deserialize_ddck(s); + ddsd.ddckCKSrcOverlay = deserialize_ddck(s); + ddsd.ddckCKSrcBlt = deserialize_ddck(s); + ddsd.ddpfPixelFormat = deserialize_ddpf(s); + ddsd.ddsCaps = deserialize_ddscaps(s); + ddsd.dwTextureStage = sn_utils::ld_uint32(s); + + return ddsd; +} + void opengl_texture::load_DDS() { @@ -142,9 +207,8 @@ opengl_texture::load_DDS() { return; } - DDSURFACEDESC2 ddsd; - file.read((char *)&ddsd, sizeof(ddsd)); - filesize -= sizeof( ddsd ); + DDSURFACEDESC2 ddsd = deserialize_ddsd(file); + filesize -= 124; // // This .dds loader supports the loading of compressed formats DXT1, DXT3 @@ -195,7 +259,7 @@ opengl_texture::load_DDS() { return; } - int datasize = filesize - offset; + size_t datasize = filesize - offset; /* // this approach loads only the first mipmap and relies on graphics card to fill the rest data_mapcount = 1; @@ -473,7 +537,7 @@ opengl_texture::create() { ::glCompressedTexImage2D( GL_TEXTURE_2D, maplevel, data_format, datawidth, dataheight, 0, - datasize, (GLubyte *)&data[0] + dataoffset ); + datasize, (GLubyte *)&data[dataoffset] ); dataoffset += datasize; datawidth = std::max( datawidth / 2, 1 ); @@ -653,7 +717,7 @@ texture_manager::GetTextureId( std::string Filename, std::string const &Dir, int traits += '#'; } texture.traits = traits; - auto const textureindex = m_textures.size(); + auto const textureindex = (texture_manager::size_type)m_textures.size(); m_textures.emplace_back( texture ); m_texturemappings.emplace( filename, textureindex ); diff --git a/Texture.h b/Texture.h index 6d0e5b32..944c2da9 100644 --- a/Texture.h +++ b/Texture.h @@ -9,6 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include +#include #include #include "GL/glew.h" @@ -20,6 +22,10 @@ enum class resource_state { }; struct opengl_texture { + static DDSURFACEDESC2 deserialize_ddsd(std::istream&); + static DDCOLORKEY deserialize_ddck(std::istream&); + static DDPIXELFORMAT deserialize_ddpf(std::istream&); + static DDSCAPS2 deserialize_ddscaps(std::istream&); // methods void load(); diff --git a/VBO.cpp b/VBO.cpp index 8a033389..2f1902fd 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -11,8 +11,23 @@ http://mozilla.org/MPL/2.0/. #include "VBO.h" #include "GL/glew.h" #include "usefull.h" +#include "sn_utils.h" //--------------------------------------------------------------------------- +void CVertNormTex::deserialize(std::istream &s) +{ + x = sn_utils::ld_float32(s); + y = sn_utils::ld_float32(s); + z = sn_utils::ld_float32(s); + + nx = sn_utils::ld_float32(s); + ny = sn_utils::ld_float32(s); + nz = sn_utils::ld_float32(s); + + u = sn_utils::ld_float32(s); + v = sn_utils::ld_float32(s); +} + CMesh::CMesh() { // utworzenie pustego obiektu m_pVNT = nullptr; diff --git a/VBO.h b/VBO.h index 368563be..b93e1e13 100644 --- a/VBO.h +++ b/VBO.h @@ -21,6 +21,8 @@ class CVertNormTex float nz = 0.0; // Z wektora normalnego float u = 0.0; // U mapowania float v = 0.0; // V mapowania + + void deserialize(std::istream &s); }; class CMesh diff --git a/World.cpp b/World.cpp index 99f4c026..2d83718f 100644 --- a/World.cpp +++ b/World.cpp @@ -391,10 +391,6 @@ bool TWorld::Init(GLFWwindow *w) glFogi(GL_FOG_MODE, GL_LINEAR); // Fog Mode WriteLog("glFogfv(GL_FOG_COLOR, FogColor);"); glFogfv(GL_FOG_COLOR, FogColor); // Set Fog Color - // glFogf(GL_FOG_DENSITY, 0.594f); // How Dense Will The - //Fog - // Be - // glHint(GL_FOG_HINT, GL_NICEST); // Fog Hint Value WriteLog("glFogf(GL_FOG_START, 1000.0f);"); glFogf(GL_FOG_START, 10.0f); // Fog Start Depth WriteLog("glFogf(GL_FOG_END, 2000.0f);"); @@ -1879,8 +1875,10 @@ TWorld::Render_UI() { glDepthFunc( GL_ALWAYS ); glDisable( GL_LIGHTING ); - glfwSetWindowTitle(window, ("EU07++NG: " + Controlled->MoverParameters->Name).c_str()); - glfwSetWindowTitle(window, ("EU07++NG: " + Global::SceneryFile).c_str()); + if (Controlled) + glfwSetWindowTitle(window, ("EU07++NG: " + Controlled->MoverParameters->Name).c_str()); + else + glfwSetWindowTitle(window, ("EU07++NG: " + Global::SceneryFile).c_str()); TextureManager.Bind(0); glColor4f( 1.0f, 0.0f, 0.0f, 1.0f ); diff --git a/sn_utils.cpp b/sn_utils.cpp new file mode 100644 index 00000000..5fa6a990 --- /dev/null +++ b/sn_utils.cpp @@ -0,0 +1,72 @@ +#include "stdafx.h" +#include "sn_utils.h" + +// sanity checks +static_assert(std::numeric_limits::is_iec559, "IEEE754 required"); +static_assert(sizeof(float) == 4, "Float must be 4 bytes"); +static_assert(sizeof(double) == 8, "Double must be 8 bytes"); +static_assert(-1 == ~0, "Two's complement required"); + +// deserialize little endian uint16 +uint16_t sn_utils::ld_uint16(std::istream &s) +{ + uint8_t buf[2]; + s.read((char*)buf, 2); + uint16_t v = (buf[1] << 8) | buf[0]; + return reinterpret_cast(v); +} + +// deserialize little endian uint32 +uint32_t sn_utils::ld_uint32(std::istream &s) +{ + uint8_t buf[4]; + s.read((char*)buf, 4); + uint32_t v = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; + return reinterpret_cast(v); +} + +// deserialize little endian int32 +int32_t sn_utils::ld_int32(std::istream &s) +{ + uint8_t buf[4]; + s.read((char*)buf, 4); + uint32_t v = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; + return reinterpret_cast(v); +} + +// deserialize little endian ieee754 float32 +float sn_utils::ld_float32(std::istream &s) +{ + uint8_t buf[4]; + s.read((char*)buf, 4); + uint32_t v = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0]; + return reinterpret_cast(v); +} + +// deserialize little endian ieee754 float64 +double sn_utils::ld_float64(std::istream &s) +{ + uint8_t buf[8]; + s.read((char*)buf, 8); + uint64_t v = ((uint64_t)buf[7] << 56) | ((uint64_t)buf[6] << 48) | + ((uint64_t)buf[5] << 40) | ((uint64_t)buf[4] << 32) | + ((uint64_t)buf[3] << 24) | ((uint64_t)buf[2] << 16) | + ((uint64_t)buf[1] << 8) | (uint64_t)buf[0]; + return reinterpret_cast(v); +} + +// deserialize null-terminated string +std::string sn_utils::d_str(std::istream &s) +{ + std::string r; + r.reserve(32); + char buf[1]; + while (true) + { + s.read(buf, 1); + if (buf[0] == 0) + break; + r.push_back(buf[0]); + } + return r; +} \ No newline at end of file diff --git a/sn_utils.h b/sn_utils.h new file mode 100644 index 00000000..95dc2bdf --- /dev/null +++ b/sn_utils.h @@ -0,0 +1,12 @@ +#include + +class sn_utils +{ +public: + static uint16_t ld_uint16(std::istream &s); + static uint32_t ld_uint32(std::istream &s); + static int32_t ld_int32(std::istream &s); + static float ld_float32(std::istream &s); + static double ld_float64(std::istream &s); + static std::string d_str(std::istream &s); +}; \ No newline at end of file From 64e3e8102d3704c422406c257c84ee38a0ca1401 Mon Sep 17 00:00:00 2001 From: VB Date: Mon, 20 Feb 2017 19:45:36 +0100 Subject: [PATCH 019/426] aa --- Model3d.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Model3d.cpp b/Model3d.cpp index f4259054..8e60e1e6 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1540,6 +1540,7 @@ void TSubModel::InfoSet(TSubModelInfo *info) int ile = (char *)&uiDisplayList - (char *)&eType; // ilość bajtów pomiędzy tymi zmiennymi ZeroMemory(this, sizeof(TSubModel)); // zerowaie całości CopyMemory(this, info->pSubModel, ile); // skopiowanie pamięci 1:1 + tVboPtr = (int)info->pSubModel->iVboPtr; iTexture = info->iTexture; // numer nazwy tekstury, a nie numer w OpenGL TextureID = info->iTexture; // numer tekstury w OpenGL iName = info->iName; // numer nazwy w obszarze nazw From 1e4cdda367d199e9fe72a00d8ff782eaa64a3b37 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 21 Feb 2017 17:12:52 +0100 Subject: [PATCH 020/426] basic renderer types. texture manager moved to renderer --- AnimModel.cpp | 6 +-- DynObj.cpp | 34 +++++++------- Globals.h | 48 +------------------- Ground.cpp | 14 +++--- Model3d.cpp | 36 +++++++-------- PyInt.cpp | 3 +- Segment.cpp | 2 +- Texture.cpp | 11 ++--- Texture.h | 2 - Track.cpp | 50 ++++++++++----------- Traction.cpp | 6 +-- World.cpp | 16 +++---- maszyna.vcxproj | 2 + maszyna.vcxproj.filters | 6 +++ renderer.cpp | 15 +++++++ renderer.h | 99 +++++++++++++++++++++++++++++++++++++++++ 16 files changed, 210 insertions(+), 140 deletions(-) create mode 100644 renderer.cpp create mode 100644 renderer.h diff --git a/AnimModel.cpp b/AnimModel.cpp index f19210f3..c61267de 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -22,7 +22,7 @@ http://mozilla.org/MPL/2.0/. #include "Timer.h" #include "MdlMngr.h" // McZapkie: -#include "Texture.h" +#include "renderer.h" //--------------------------------------------------------------------------- TAnimContainer *TAnimModel::acAnimList = NULL; @@ -449,9 +449,9 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable asText = asReplacableTexture.substr(1, asReplacableTexture.length() - 1); // zapamiętanie tekstu else if (asReplacableTexture != "none") ReplacableSkinId[1] = - TextureManager.GetTextureId( asReplacableTexture, "" ); + GfxRenderer.GetTextureId( asReplacableTexture, "" ); if( ( ReplacableSkinId[ 1 ] != 0 ) - && ( TextureManager.Texture( ReplacableSkinId[ 1 ] ).has_alpha ) ) { + && ( GfxRenderer.Texture( ReplacableSkinId[ 1 ] ).has_alpha ) ) { // tekstura z kanałem alfa - nie renderować w cyklu nieprzezroczystych iTexAlpha = 0x31310031; } diff --git a/DynObj.cpp b/DynObj.cpp index 0442e7a7..1f4f5c21 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -21,7 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "Usefull.h" // McZapkie-260202 #include "Globals.h" -#include "Texture.h" +#include "renderer.h" #include "AirCoupler.h" #include "TractionPower.h" @@ -4389,7 +4389,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, Global::asCurrentTexturePath + ReplacableSkin; // skory tez z dynamic/... std::string x = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie if (!x.empty()) - ReplacableSkinID[4] = TextureManager.GetTextureId( Global::asCurrentTexturePath + "nowhere", "", 9); + ReplacableSkinID[4] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + "nowhere", "", 9); /* if ((i = ReplacableSkin.Pos("|")) > 0) // replacable dzielone { @@ -4452,21 +4452,21 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, */ if (iMultiTex > 0) { // jeśli model ma 4 tekstury - ReplacableSkinID[1] = TextureManager.GetTextureId( + ReplacableSkinID[1] = GfxRenderer.GetTextureId( ReplacableSkin + ",1", "", Global::iDynamicFiltering); if (ReplacableSkinID[1]) { // pierwsza z zestawu znaleziona - ReplacableSkinID[2] = TextureManager.GetTextureId( + ReplacableSkinID[2] = GfxRenderer.GetTextureId( ReplacableSkin + ",2", "", Global::iDynamicFiltering); if (ReplacableSkinID[2]) { iMultiTex = 2; // już są dwie - ReplacableSkinID[3] = TextureManager.GetTextureId( + ReplacableSkinID[3] = GfxRenderer.GetTextureId( ReplacableSkin + ",3", "", Global::iDynamicFiltering); if (ReplacableSkinID[3]) { iMultiTex = 3; // a teraz nawet trzy - ReplacableSkinID[4] = TextureManager.GetTextureId( + ReplacableSkinID[4] = GfxRenderer.GetTextureId( ReplacableSkin + ",4", "", Global::iDynamicFiltering); if (ReplacableSkinID[4]) iMultiTex = 4; // jak są cztery, to blokujemy podmianę tekstury @@ -4477,14 +4477,14 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, else { // zestaw nie zadziałał, próbujemy normanie iMultiTex = 0; - ReplacableSkinID[1] = TextureManager.GetTextureId( + ReplacableSkinID[1] = GfxRenderer.GetTextureId( ReplacableSkin, "", Global::iDynamicFiltering); } } else - ReplacableSkinID[1] = TextureManager.GetTextureId( + ReplacableSkinID[1] = GfxRenderer.GetTextureId( ReplacableSkin, "", Global::iDynamicFiltering); - if (TextureManager.Texture(ReplacableSkinID[1]).has_alpha) + if (GfxRenderer.Texture(ReplacableSkinID[1]).has_alpha) iAlpha = 0x31310031; // tekstura -1 z kanałem alfa - nie renderować w cyklu // nieprzezroczystych else @@ -4492,17 +4492,17 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // renderować w // cyklu przezroczystych if (ReplacableSkinID[2]) - if (TextureManager.Texture(ReplacableSkinID[2]).has_alpha) + if (GfxRenderer.Texture(ReplacableSkinID[2]).has_alpha) iAlpha |= 0x02020002; // tekstura -2 z kanałem alfa - nie renderować // w cyklu // nieprzezroczystych if (ReplacableSkinID[3]) - if (TextureManager.Texture(ReplacableSkinID[3]).has_alpha) + if (GfxRenderer.Texture(ReplacableSkinID[3]).has_alpha) iAlpha |= 0x04040004; // tekstura -3 z kanałem alfa - nie renderować // w cyklu // nieprzezroczystych if (ReplacableSkinID[4]) - if (TextureManager.Texture(ReplacableSkinID[4]).has_alpha) + if (GfxRenderer.Texture(ReplacableSkinID[4]).has_alpha) iAlpha |= 0x08080008; // tekstura -4 z kanałem alfa - nie renderować // w cyklu // nieprzezroczystych @@ -5831,13 +5831,13 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) std::string x = TextureTest(asBaseDir + numer + "@" + MoverParameters->TypeName); if (!x.empty()) { - ReplacableSkinID[4] = TextureManager.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się return; } x = TextureTest(asBaseDir + numer ); if (!x.empty()) { - ReplacableSkinID[4] = TextureManager.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się return; } if (to.empty()) @@ -5845,17 +5845,17 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) x = TextureTest(asBaseDir + to + "@" + MoverParameters->TypeName); // w pierwszej kolejności z nazwą FIZ/MMD if (!x.empty()) { - ReplacableSkinID[4] = TextureManager.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się return; } x = TextureTest(asBaseDir + to); // na razie prymitywnie if (!x.empty()) - ReplacableSkinID[4] = TextureManager.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się else { x = TextureTest(asBaseDir + "nowhere"); // jak nie znalazł dedykowanej, to niech daje nowhere if (!x.empty()) - ReplacableSkinID[4] = TextureManager.GetTextureId( x, "", 9); + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); } // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa // tekstury nr 4 diff --git a/Globals.h b/Globals.h index e20c581a..eb63d7b9 100644 --- a/Globals.h +++ b/Globals.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include #include +#include "renderer.h" #include "opengl/glew.h" #include "dumb3d.h" @@ -120,53 +121,6 @@ class cParser; // nowy (powolny!) parser class TEvent; class TTextSound; -// bare-bones render controller, in lack of anything better yet -struct opengl_renderer { - - GLenum static const sunlight{ GL_LIGHT0 }; - GLenum static const ambientlight{ GL_LIGHT1 }; - - enum class rendermode { - color - }; - - rendermode renderpass{ rendermode::color }; -}; - -struct opengl_light { - - GLuint id{ -1 }; - Math3D::vector3 direction; - GLfloat position[ 4 ]; // 4th parameter specifies directional(0) or omni-directional(1) light source - GLfloat ambient[ 4 ]; - GLfloat diffuse[ 4 ]; - GLfloat specular[ 4 ]; - - opengl_light() { - position[ 0 ] = position[ 1 ] = position[ 2 ] = 0.0f; position[ 3 ] = 1.0f; - ambient[ 0 ] = ambient[ 1 ] = ambient[ 2 ] = ambient[ 3 ] = 1.0f; - diffuse[ 0 ] = diffuse[ 1 ] = diffuse[ 2 ] = diffuse[ 3 ] = 1.0f; - specular[ 0 ] = specular[ 1 ] = specular[ 2 ] = specular[ 3 ] = 1.0f; - } - - inline - void apply_intensity() { - - glLightfv( id, GL_AMBIENT, ambient ); - glLightfv( id, GL_DIFFUSE, diffuse ); - glLightfv( id, GL_SPECULAR, specular ); - } - inline - void apply_angle() { - - glLightfv( id, GL_POSITION, position ); - if( position[ 3 ] == 1.0f ) { - GLfloat directionarray[] = { direction.x, direction.y, direction.z }; - glLightfv( id, GL_SPOT_DIRECTION, directionarray ); - } - } -}; - class TTranscript { // klasa obsługująca linijkę napisu do dźwięku public: diff --git a/Ground.cpp b/Ground.cpp index 5afdccca..f863ce6d 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -23,7 +23,7 @@ http://mozilla.org/MPL/2.0/. #include "Logs.h" #include "usefull.h" #include "Timer.h" -#include "Texture.h" +#include "renderer.h" #include "Event.h" #include "EvLaunch.h" #include "TractionPower.h" @@ -276,7 +276,7 @@ void TGroundNode::RaRenderVBO() { // renderowanie z domyslnego bufora VBO glColor3ub(Diffuse[0], Diffuse[1], Diffuse[2]); if (TextureID) - TextureManager.Bind(TextureID); // Ustaw aktywną teksturę + GfxRenderer.Bind(TextureID); // Ustaw aktywną teksturę glDrawArrays(iType, iVboPtr, iNumVerts); // Narysuj naraz wszystkie trójkąty } @@ -457,7 +457,7 @@ void TGroundNode::Compile(bool many) #ifdef USE_VERTEX_ARRAYS glVertexPointer(3, GL_DOUBLE, sizeof(vector3), &Points[0].x); #endif - TextureManager.Bind(0); + GfxRenderer.Bind(0); #ifdef USE_VERTEX_ARRAYS glDrawArrays(iType, 0, iNumPts); #else @@ -478,7 +478,7 @@ void TGroundNode::Compile(bool many) glTexCoordPointer(2, GL_FLOAT, sizeof(TGroundVertex), &tri->Vertices[0].tu); #endif glColor3ub(tri->Diffuse[0], tri->Diffuse[1], tri->Diffuse[2]); - TextureManager.Bind(Global::bWireFrame ? 0 : tri->TextureID); + GfxRenderer.Bind(Global::bWireFrame ? 0 : tri->TextureID); #ifdef USE_VERTEX_ARRAYS glDrawArrays(Global::bWireFrame ? GL_LINE_LOOP : tri->iType, 0, tri->iNumVerts); #else @@ -506,7 +506,7 @@ void TGroundNode::Compile(bool many) else if (iType == TP_MESH) { // grupa ze wspólną teksturą - wrzucanie do wspólnego Display List if (TextureID) - TextureManager.Bind(TextureID); // Ustaw aktywną teksturę + GfxRenderer.Bind(TextureID); // Ustaw aktywną teksturę TGroundNode *n = nNode; while (n ? n->TextureID == TextureID : false) { // wszystkie obiekty o tej samej testurze @@ -2133,8 +2133,8 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->PROBLEND = false; } #endif - tmp->TextureID = TextureManager.GetTextureId( str, szTexturePath ); - tmp->iFlags = TextureManager.Texture(tmp->TextureID).has_alpha ? 0x220 : 0x210; // z usuwaniem + tmp->TextureID = GfxRenderer.GetTextureId( str, szTexturePath ); + tmp->iFlags = GfxRenderer.Texture(tmp->TextureID).has_alpha ? 0x220 : 0x210; // z usuwaniem if (((tmp->iType == GL_TRIANGLES) && (tmp->iFlags & 0x10)) ? Global::pTerrainCompact->TerrainLoaded() : false) diff --git a/Model3d.cpp b/Model3d.cpp index 4071db89..b7bde3c0 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "mczapkie/mctools.h" #include "Usefull.h" -#include "Texture.h" +#include "renderer.h" #include "Timer.h" #include "mtable.h" //--------------------------------------------------------------------------- @@ -411,12 +411,12 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) TextureNameSet(texture.c_str()); if (texture.find_first_of("/\\") == texture.npos) texture.insert(0, Global::asCurrentTexturePath.c_str()); - TextureID = TextureManager.GetTextureId( texture, szTexturePath ); + TextureID = GfxRenderer.GetTextureId( texture, szTexturePath ); // TexAlpha=TTexturesManager::GetAlpha(TextureID); // iFlags|=TexAlpha?0x20:0x10; //0x10-nieprzezroczysta, 0x20-przezroczysta if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity // 0! - iFlags |= TextureManager.Texture(TextureID).has_alpha ? + iFlags |= GfxRenderer.Texture(TextureID).has_alpha ? 0x20 : 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta else @@ -636,7 +636,7 @@ int TSubModel::TriangleAdd(TModel3d *m, texture_manager::size_type tex, int tri) m->AddTo(this, s); } // s->asTexture=AnsiString(TTexturesManager::GetName(tex).c_str()); - s->TextureNameSet(TextureManager.Texture(tex).name.c_str()); + s->TextureNameSet(GfxRenderer.Texture(tex).name.c_str()); s->TextureID = tex; s->eType = GL_TRIANGLES; // iAnimOwner=0; //roboczy wskaźnik na wierzchołek @@ -714,7 +714,7 @@ void TSubModel::DisplayLists() { uiDisplayList = glGenLists(1); glNewList(uiDisplayList, GL_COMPILE); - TextureManager.Bind(0); + GfxRenderer.Bind(0); // if (eType==smt_FreeSpotLight) // { // if (iFarAttenDecay==0) @@ -737,7 +737,7 @@ void TSubModel::DisplayLists() { // punkty świecące dookólnie uiDisplayList = glGenLists(1); glNewList(uiDisplayList, GL_COMPILE); - TextureManager.Bind(0); // tekstury nie ma + GfxRenderer.Bind(0); // tekstury nie ma glColorMaterial(GL_FRONT, GL_EMISSION); glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly glBegin(GL_POINTS); @@ -1100,11 +1100,11 @@ void TSubModel::RenderDL() { if (TextureID < 0) // && (ReplacableSkinId!=0)) { // zmienialne skóry - TextureManager.Bind(ReplacableSkinId[-TextureID]); + GfxRenderer.Bind(ReplacableSkinId[-TextureID]); // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury } else - TextureManager.Bind(TextureID); // również 0 + GfxRenderer.Bind(TextureID); // również 0 if (Global::fLuminance < fLight) { glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo @@ -1197,11 +1197,11 @@ void TSubModel::RenderAlphaDL() { if (TextureID < 0) // && (ReplacableSkinId!=0)) { // zmienialne skóry - TextureManager.Bind(ReplacableSkinId[-TextureID]); + GfxRenderer.Bind(ReplacableSkinId[-TextureID]); // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury } else - TextureManager.Bind(TextureID); // również 0 + GfxRenderer.Bind(TextureID); // również 0 if (Global::fLuminance < fLight) { glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo @@ -1278,11 +1278,11 @@ void TSubModel::RenderVBO() { if (TextureID < 0) // && (ReplacableSkinId!=0)) { // zmienialne skóry - TextureManager.Bind(ReplacableSkinId[-TextureID]); + GfxRenderer.Bind(ReplacableSkinId[-TextureID]); // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury } else - TextureManager.Bind(TextureID); // również 0 + GfxRenderer.Bind(TextureID); // również 0 glColor3fv(f4Diffuse); // McZapkie-240702: zamiast ub // glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,f4Diffuse); //to samo, // co glColor @@ -1349,7 +1349,7 @@ void TSubModel::RenderVBO() Distdimm=1; */ - TextureManager.Bind(0); // nie teksturować + GfxRenderer.Bind(0); // nie teksturować // glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); // glColorMaterial(GL_FRONT,GL_EMISSION); float color[4] = {f4Diffuse[0] * Distdimm, f4Diffuse[1] * Distdimm, @@ -1378,7 +1378,7 @@ void TSubModel::RenderVBO() if (pRoot->StartColorVBO()) { // wyświetlanie kolorowych punktów zamiast // trójkątów - TextureManager.Bind(0); // tekstury nie ma + GfxRenderer.Bind(0); // tekstury nie ma glColorMaterial(GL_FRONT, GL_EMISSION); glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie // blendowaly @@ -1452,11 +1452,11 @@ void TSubModel::RenderAlphaVBO() { if (TextureID < 0) // && (ReplacableSkinId!=0)) { // zmienialne skory - TextureManager.Bind(ReplacableSkinId[-TextureID]); + GfxRenderer.Bind(ReplacableSkinId[-TextureID]); // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury } else - TextureManager.Bind(TextureID); // również 0 + GfxRenderer.Bind(TextureID); // również 0 if (Global::fLuminance < fLight) { glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo @@ -1624,14 +1624,14 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, TStringPack *t, TS std::string tex = pTexture; if (tex.find_last_of("/\\") == std::string::npos) tex.insert(0, Global::asCurrentTexturePath); - TextureID = TextureManager.GetTextureId( tex, szTexturePath ); + TextureID = GfxRenderer.GetTextureId( tex, szTexturePath ); // TexAlpha=TTexturesManager::GetAlpha(TextureID); //zmienna robocza // ustawienie cyklu przezroczyste/nieprzezroczyste zależnie od własności // stałej tekstury // iFlags=(iFlags&~0x30)|(TTexturesManager::GetAlpha(TextureID)?0x20:0x10); // //0x10-nieprzezroczysta, 0x20-przezroczysta if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity 0! - iFlags |= TextureManager.Texture(TextureID).has_alpha ? + iFlags |= GfxRenderer.Texture(TextureID).has_alpha ? 0x20 : 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta else diff --git a/PyInt.cpp b/PyInt.cpp index b3cdb28a..43d9c975 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -1,5 +1,6 @@ #include "stdafx.h" #include "PyInt.h" +#include "renderer.h" #include "Train.h" #include "Logs.h" //#include @@ -453,7 +454,7 @@ void TPythonScreens::init(cParser &parser, TModel3d *model, std::string const &n WriteLog( "Python Screen: submodel " + subModelName + " not found - Ignoring screen" ); return; // nie ma takiego sub modelu w danej kabinie pomijamy } - int textureId = TextureManager.Texture(subModel->GetTextureId()).id; + int textureId = GfxRenderer.Texture(subModel->GetTextureId()).id; if (textureId <= 0) { WriteLog( "Python Screen: invalid texture id " + std::to_string(textureId) + " - Ignoring screen" ); diff --git a/Segment.cpp b/Segment.cpp index daaf7356..21f66a41 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -641,7 +641,7 @@ void TSegment::RenderSwitchRail(const vector6 *ShapePoints1, const vector6 *Shap void TSegment::Render() { vector3 pt; - TextureManager.Bind(0); + GfxRenderer.Bind(0); int i; if (bCurve) { diff --git a/Texture.cpp b/Texture.cpp index 71c94f9e..249bbe2e 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -14,19 +14,14 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "Texture.h" +#include "texture.h" #include -#include -#include #include "opengl/glew.h" -#include "Globals.h" +#include "usefull.h" +#include "globals.h" #include "logs.h" -#include "Usefull.h" -#include "TextureDDS.h" - -texture_manager TextureManager; texture_manager::texture_manager() { diff --git a/Texture.h b/Texture.h index 168bdfe1..8e036ffc 100644 --- a/Texture.h +++ b/Texture.h @@ -97,5 +97,3 @@ private: index_map m_texturemappings; size_type m_activetexture{ 0 }; // last i.e. currently bound texture }; - -extern texture_manager TextureManager; \ No newline at end of file diff --git a/Track.cpp b/Track.cpp index 10eab7a7..e0d6f27a 100644 --- a/Track.cpp +++ b/Track.cpp @@ -17,7 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "Globals.h" #include "Logs.h" #include "Usefull.h" -#include "Texture.h" +#include "renderer.h" #include "Timer.h" #include "Ground.h" #include "parser.h" @@ -508,7 +508,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) parser->getTokens(); *parser >> token; str = token; // railtex - TextureID1 = (str == "none" ? 0 : TextureManager.GetTextureId( + TextureID1 = (str == "none" ? 0 : GfxRenderer.GetTextureId( str, szTexturePath, (iCategoryFlag & 1) ? Global::iRailProFiltering : Global::iBallastFiltering)); @@ -519,7 +519,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) parser->getTokens(); *parser >> token; str = token; // sub || railtex - TextureID2 = (str == "none" ? 0 : TextureManager.GetTextureId( + TextureID2 = (str == "none" ? 0 : GfxRenderer.GetTextureId( str, szTexturePath, (eType == tt_Normal) ? Global::iBallastFiltering : Global::iRailProFiltering)); @@ -579,12 +579,12 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) if (TextureID1 && fTexLength) { // dla drogi trzeba ustalić proporcje boków nawierzchni float w, h; - TextureManager.Bind(TextureID1); + GfxRenderer.Bind(TextureID1); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h); if (h != 0.0) fTexRatio1 = w / h; // proporcja boków - TextureManager.Bind(TextureID2); + GfxRenderer.Bind(TextureID2); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h); if (h != 0.0) @@ -1299,14 +1299,14 @@ void TTrack::Compile(GLuint tex) } } if (!tex) - TextureManager.Bind( TextureID2 ); + GfxRenderer.Bind( TextureID2 ); Segment->RenderLoft(bpts1, iTrapezoid ? -4 : 4, fTexLength); } if (TextureID1) if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) { // szyny if (!tex) - TextureManager.Bind( TextureID1 ); + GfxRenderer.Bind( TextureID1 ); Segment->RenderLoft(rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); Segment->RenderLoft(rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); } @@ -1345,7 +1345,7 @@ void TTrack::Compile(GLuint tex) // McZapkie-130302 - poprawione rysowanie szyn if (SwitchExtension->RightSwitch) { // zwrotnica prawa - TextureManager.Bind( TextureID1 ); + GfxRenderer.Bind( TextureID1 ); SwitchExtension->Segments[0]->RenderLoft(rpts1, nnumPts, fTexLength, 2); // prawa szyna za iglicą SwitchExtension->Segments[0]->RenderSwitchRail( @@ -1354,7 +1354,7 @@ void TTrack::Compile(GLuint tex) SwitchExtension->Segments[0]->RenderLoft( rpts2, nnumPts, fTexLength); // lewa szyna normalnie cała if (TextureID2 != TextureID1) // nie wiadomo, czy OpenGL to optymalizuje - TextureManager.Bind( TextureID2 ); + GfxRenderer.Bind( TextureID2 ); SwitchExtension->Segments[1]->RenderLoft( rpts1, nnumPts, fTexLength); // prawa szyna normalna cała SwitchExtension->Segments[1]->RenderLoft(rpts2, nnumPts, fTexLength, @@ -1365,7 +1365,7 @@ void TTrack::Compile(GLuint tex) } else { // lewa kiedyś działała lepiej niż prawa - TextureManager.Bind( TextureID1 ); + GfxRenderer.Bind( TextureID1 ); SwitchExtension->Segments[0]->RenderLoft( rpts1, nnumPts, fTexLength); // prawa szyna normalna cała SwitchExtension->Segments[0]->RenderLoft(rpts2, nnumPts, fTexLength, @@ -1374,7 +1374,7 @@ void TTrack::Compile(GLuint tex) rpts2, rpts4, nnumPts, fTexLength, 2, -SwitchExtension->fOffset2); // lewa iglica if (TextureID2 != TextureID1) // nie wiadomo, czy OpenGL to optymalizuje - TextureManager.Bind( TextureID2 ); + GfxRenderer.Bind( TextureID2 ); SwitchExtension->Segments[1]->RenderLoft(rpts1, nnumPts, fTexLength, 2); // prawa szyna za iglicą SwitchExtension->Segments[1]->RenderSwitchRail( @@ -1422,7 +1422,7 @@ void TTrack::Compile(GLuint tex) if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) { // tworzenie trójkątów nawierzchni szosy if (!tex) - TextureManager.Bind( TextureID1 ); + GfxRenderer.Bind( TextureID1 ); Segment->RenderLoft(bpts1, iTrapezoid ? -2 : 2, fTexLength); } if (TextureID2) @@ -1430,7 +1430,7 @@ void TTrack::Compile(GLuint tex) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak // w Midtown Madness 2?) if (!tex) - TextureManager.Bind( TextureID2 ); + GfxRenderer.Bind( TextureID2 ); vector6 rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony if (fTexHeight1 >= 0.0) @@ -1610,7 +1610,7 @@ void TTrack::Compile(GLuint tex) // Midtown Madness 2?) if (TextureID2) if (!tex) - TextureManager.Bind( TextureID2 ); + GfxRenderer.Bind( TextureID2 ); vector6 rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony // Ra 2014-07: trzeba to przerobić na pętlę i pobierać profile (przynajmniej 2..4) z @@ -1755,7 +1755,7 @@ void TTrack::Compile(GLuint tex) if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) { if (!tex) - TextureManager.Bind( TextureID1 ); + GfxRenderer.Bind( TextureID1 ); glBegin(GL_TRIANGLE_FAN); // takie kółeczko będzie glNormal3f(0, 1, 0); glTexCoord2f(0.5, 0.5); //środek tekstury na środku skrzyżowania @@ -1787,7 +1787,7 @@ void TTrack::Compile(GLuint tex) if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) { if (!tex) - TextureManager.Bind( TextureID1 ); + GfxRenderer.Bind( TextureID1 ); Segment->RenderLoft(bpts1, numPts, fTexLength); } if (TextureID2) @@ -1799,7 +1799,7 @@ void TTrack::Compile(GLuint tex) vector6 rpts2[3] = {vector6(-fHTW, 0.0, 1.0), vector6(-fHTW - side, 0.0, 0.5), vector6(-rozp, -fTexHeight1, 0.0)}; // Ra: po kiego 0.1? if (!tex) - TextureManager.Bind( TextureID2 ); // brzeg rzeki + GfxRenderer.Bind( TextureID2 ); // brzeg rzeki Segment->RenderLoft(rpts1, 3, fTexLength); Segment->RenderLoft(rpts2, 3, fTexLength); } @@ -2473,7 +2473,7 @@ void TTrack::RaRenderVBO(int iPtr) if (TextureID1) if ((seg = SwitchExtension->Segments[0]->RaSegCount()) > 0) { - TextureManager.Bind( TextureID1 ); // szyny + + GfxRenderer.Bind( TextureID1 ); // szyny + for (i = 0; i < seg; ++i) glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24); iPtr += 24 * seg; // pominięcie lewej szyny @@ -2484,7 +2484,7 @@ void TTrack::RaRenderVBO(int iPtr) if (TextureID2) if ((seg = SwitchExtension->Segments[1]->RaSegCount()) > 0) { - TextureManager.Bind( TextureID2 ); // szyny - + GfxRenderer.Bind( TextureID2 ); // szyny - for (i = 0; i < seg; ++i) glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24); iPtr += 24 * seg; // pominięcie lewej szyny @@ -2498,14 +2498,14 @@ void TTrack::RaRenderVBO(int iPtr) { if (TextureID2) { - TextureManager.Bind( TextureID2 ); // podsypka + GfxRenderer.Bind( TextureID2 ); // podsypka for (i = 0; i < seg; ++i) glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 8 * i, 8); iPtr += 8 * seg; // pominięcie podsypki } if (TextureID1) { - TextureManager.Bind( TextureID1 ); // szyny + GfxRenderer.Bind( TextureID1 ); // szyny for (i = 0; i < seg; ++i) glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24); iPtr += 24 * seg; // pominięcie lewej szyny @@ -2520,7 +2520,7 @@ void TTrack::RaRenderVBO(int iPtr) { if (TextureID1) { - TextureManager.Bind( TextureID1 ); // nawierzchnia + GfxRenderer.Bind( TextureID1 ); // nawierzchnia for (i = 0; i < seg; ++i) { glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 4); @@ -2529,7 +2529,7 @@ void TTrack::RaRenderVBO(int iPtr) } if (TextureID2) { - TextureManager.Bind( TextureID2 ); // pobocze + GfxRenderer.Bind( TextureID2 ); // pobocze if (fTexHeight1 >= 0.0) { // normalna droga z poboczem for (i = 0; i < seg; ++i) @@ -2558,7 +2558,7 @@ void TTrack::RaRenderVBO(int iPtr) { if (TextureID1) { - TextureManager.Bind( TextureID1 ); // nawierzchnia + GfxRenderer.Bind( TextureID1 ); // nawierzchnia for (i = 0; i < seg; ++i) { glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 4); @@ -2567,7 +2567,7 @@ void TTrack::RaRenderVBO(int iPtr) } if (TextureID2) { - TextureManager.Bind( TextureID2 ); // pobocze + GfxRenderer.Bind( TextureID2 ); // pobocze for (i = 0; i < seg; ++i) glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6); iPtr += 6 * seg; // pominięcie lewego pobocza diff --git a/Traction.cpp b/Traction.cpp index e5a17614..9328e3e1 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "mctools.h" #include "TractionPower.h" -#include "Texture.h" +#include "renderer.h" //--------------------------------------------------------------------------- /* @@ -116,7 +116,7 @@ void TTraction::Optimize() uiDisplayList = glGenLists(1); glNewList(uiDisplayList, GL_COMPILE); - TextureManager.Bind(0); + GfxRenderer.Bind(0); // glColor3ub(0,0,0); McZapkie: to do render // glPushMatrix(); @@ -469,7 +469,7 @@ void TTraction::RenderVBO(float mgn, int iPtr) { // renderowanie z użyciem VBO if (Wires != 0 && !TestFlag(DamageFlag, 128)) // rysuj jesli sa druty i nie zerwana { - TextureManager.Bind(0); + GfxRenderer.Bind(0); glDisable(GL_LIGHTING); // aby nie używało wektorów normalnych do kolorowania glColor4f(0, 0, 0, 1); // jak nieznany kolor to czarne nieprzezroczyste if (!Global::bSmoothTraction) diff --git a/World.cpp b/World.cpp index c8670ffb..b2988ba0 100644 --- a/World.cpp +++ b/World.cpp @@ -21,7 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "Globals.h" #include "Logs.h" #include "MdlMngr.h" -#include "Texture.h" +#include "renderer.h" #include "Timer.h" #include "mtable.h" #include "Sound.h" @@ -487,8 +487,8 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glColor3f( 1.0f, 1.0f, 1.0f ); #endif - auto logo = TextureManager.GetTextureId( "logo", szTexturePath, 6 ); - TextureManager.Bind(logo); // Select our texture + auto logo = GfxRenderer.GetTextureId( "logo", szTexturePath, 6 ); + GfxRenderer.Bind(logo); // Select our texture glBegin(GL_QUADS); // Drawing using triangles glTexCoord2f(0.0f, 0.0f); @@ -688,9 +688,9 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) // glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); //{Texture blends with object // background} if (Global::bOldSmudge == true) - light = TextureManager.GetTextureId( "smuga.tga", szTexturePath ); + light = GfxRenderer.GetTextureId( "smuga.tga", szTexturePath ); else - light = TextureManager.GetTextureId( "smuga2.tga", szTexturePath ); + light = GfxRenderer.GetTextureId( "smuga2.tga", szTexturePath ); // Camera.Reset(); Timer::ResetTimers(); WriteLog( "Load time: " + @@ -1661,7 +1661,7 @@ TWorld::Render_Cab() { glDisable( GL_DEPTH_TEST ); glDisable( GL_LIGHTING ); glDisable( GL_FOG ); - TextureManager.Bind( light ); // Select our texture + GfxRenderer.Bind( light ); // Select our texture glBegin( GL_QUADS ); float fSmudge = dynamic->MoverParameters->DimHalf.y + 7; // gdzie zaczynać smugę @@ -1703,7 +1703,7 @@ TWorld::Render_Cab() { glDisable( GL_LIGHTING ); glDisable( GL_FOG ); //glColor4f(0.15f, 0.15f, 0.15f, 0.25f); - TextureManager.Bind( light ); // Select our texture + GfxRenderer.Bind( light ); // Select our texture //float ddl = (0.15*Global::diffuseDayLight[0]+0.295*Global::diffuseDayLight[1]+0.055*Global::diffuseDayLight[2]); //0.24:0 glBegin( GL_QUADS ); float fSmudge = dynamic->MoverParameters->DimHalf.y + 7; // gdzie zaczynać smugę @@ -2011,7 +2011,7 @@ TWorld::Render_UI() { SetWindowText( hWnd, Controlled->MoverParameters->Name.c_str() ); else SetWindowText( hWnd, Global::SceneryFile.c_str() ); // nazwa scenerii - TextureManager.Bind( 0 ); + GfxRenderer.Bind( 0 ); glColor4f( 1.0f, 0.0f, 0.0f, 1.0f ); glLoadIdentity(); glTranslatef( 0.0f, 0.0f, -0.50f ); diff --git a/maszyna.vcxproj b/maszyna.vcxproj index e15e29cf..3ea50446 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -119,6 +119,7 @@ + @@ -180,6 +181,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 994b2526..c0530acf 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -192,6 +192,9 @@ Source Files + + Source Files + @@ -371,6 +374,9 @@ Header Files + + Header Files + diff --git a/renderer.cpp b/renderer.cpp new file mode 100644 index 00000000..13fdb85b --- /dev/null +++ b/renderer.cpp @@ -0,0 +1,15 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "renderer.h" + +opengl_renderer GfxRenderer; + +//--------------------------------------------------------------------------- diff --git a/renderer.h b/renderer.h new file mode 100644 index 00000000..deabb54e --- /dev/null +++ b/renderer.h @@ -0,0 +1,99 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "opengl/glew.h" +#include "texture.h" +#include "dumb3d.h" + +struct opengl_light { + + GLuint id{ -1 }; + Math3D::vector3 direction; + GLfloat position[ 4 ]; // 4th parameter specifies directional(0) or omni-directional(1) light source + GLfloat ambient[ 4 ]; + GLfloat diffuse[ 4 ]; + GLfloat specular[ 4 ]; + + opengl_light() { + position[ 0 ] = position[ 1 ] = position[ 2 ] = 0.0f; position[ 3 ] = 1.0f; + ambient[ 0 ] = ambient[ 1 ] = ambient[ 2 ] = ambient[ 3 ] = 1.0f; + diffuse[ 0 ] = diffuse[ 1 ] = diffuse[ 2 ] = diffuse[ 3 ] = 1.0f; + specular[ 0 ] = specular[ 1 ] = specular[ 2 ] = specular[ 3 ] = 1.0f; + } + + inline + void apply_intensity() { + + glLightfv( id, GL_AMBIENT, ambient ); + glLightfv( id, GL_DIFFUSE, diffuse ); + glLightfv( id, GL_SPECULAR, specular ); + } + inline + void apply_angle() { + + glLightfv( id, GL_POSITION, position ); + if( position[ 3 ] == 1.0f ) { + GLfloat directionarray[] = { direction.x, direction.y, direction.z }; + glLightfv( id, GL_SPOT_DIRECTION, directionarray ); + } + } +}; + +// encapsulates basic rendering setup. +// for modern opengl this translates to a specific collection of glsl shaders, +// for legacy opengl this is combination of blending modes, active texture units etc +struct opengl_technique { + +}; + +// a collection of parameters for the rendering setup. +// for modern opengl this translates to set of attributes for the active shaders, +// for legacy opengl this is basically just texture(s) assigned to geometry +struct opengl_material { + +}; + +// bare-bones render controller, in lack of anything better yet +class opengl_renderer { + +public: + GLenum static const sunlight{ GL_LIGHT0 }; +// GLenum static const ambientlight{ GL_LIGHT1 }; + + texture_manager::size_type + GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ) { + + return m_textures.GetTextureId( Filename, Dir, Filter, Loadnow ); + } + void + Bind( texture_manager::size_type const Id ) { + // temporary until we separate the renderer + m_textures.Bind( Id ); + } + opengl_texture & + Texture( texture_manager::size_type const Id ) { + + return m_textures.Texture( Id ); + } + +private: + enum class rendermode { + color + }; + + rendermode renderpass{ rendermode::color }; + + texture_manager m_textures; +}; + +extern opengl_renderer GfxRenderer; + +//--------------------------------------------------------------------------- From 62e97669627257e9dc711afe4eca5d0e831a4808 Mon Sep 17 00:00:00 2001 From: VB Date: Tue, 21 Feb 2017 17:53:24 +0100 Subject: [PATCH 021/426] lowercase vehicle name, tweaks --- EU07.cpp | 24 ++++++++++-------------- World.cpp | 3 --- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index eb98cd0f..9cdf0f7c 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -38,13 +38,7 @@ void window_resize_callback(GLFWwindow *window, int w, int h) { Global::ScreenWidth = w; Global::ScreenHeight = h; - glViewport(0, 0, w, h); // Reset The Current Viewport - 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 + glViewport(0, 0, w, h); } void cursor_pos_callback(GLFWwindow *window, double x, double y) @@ -132,12 +126,14 @@ int main(int argc, char *argv[]) else Global::iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity } - else if (argc <= i + 1) - continue; - else if (token == "-s") + else if (i + 1 < argc && token == "-s") Global::SceneryFile = std::string(argv[++i]); - else if (token == "-v") - Global::asHumanCtrlVehicle = std::string(argv[++i]); + else if (i + 1 < argc && token == "-v") + { + std::string v(argv[++i]); + std::transform(v.begin(), v.end(), v.begin(), ::tolower); + Global::asHumanCtrlVehicle = v; + } else { 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 // fullwindow creation when resolution is the same GLFWmonitor *monitor = glfwGetPrimaryMonitor(); @@ -158,6 +152,8 @@ int main(int argc, char *argv[]) glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); + glfwWindowHint(GLFW_SAMPLES, Global::iMultisampling); + GLFWwindow *window = glfwCreateWindow(Global::iWindowWidth, Global::iWindowHeight, "EU07++NG", Global::bFullScreen ? monitor : nullptr, nullptr); diff --git a/World.cpp b/World.cpp index 9d85ab32..e56c8af0 100644 --- a/World.cpp +++ b/World.cpp @@ -174,9 +174,6 @@ bool TWorld::Init(GLFWwindow *w) Global::detonatoryOK = true; WriteLog("Starting MaSzyna rail vehicle simulator."); 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("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"); From 3e68e4921bef996ca431cdb76a42961b74bc4221 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 23 Feb 2017 03:55:54 +0100 Subject: [PATCH 022/426] skydome object --- Float3d.h | 11 +- Model3d.cpp | 3 +- World.cpp | 97 ++++++++---- World.h | 2 + color.h | 118 ++++++++++++++ maszyna.vcxproj | 3 + maszyna.vcxproj.filters | 9 ++ sky.cpp | 14 -- skydome.cpp | 332 ++++++++++++++++++++++++++++++++++++++++ skydome.h | 60 ++++++++ sun.cpp | 4 +- sun.h | 2 +- 12 files changed, 601 insertions(+), 54 deletions(-) create mode 100644 color.h create mode 100644 skydome.cpp create mode 100644 skydome.h diff --git a/Float3d.h b/Float3d.h index c3ee39a7..fcb5afc3 100644 --- a/Float3d.h +++ b/Float3d.h @@ -53,7 +53,10 @@ double inline float3::Length() const { return sqrt(x * x + y * y + z * z); }; -inline float3 operator/(const float3 &v, double k) +inline float3 operator*( float3 const &v, float const k ) { + return float3( v.x * k, v.y * k, v.z * k ); +}; +inline float3 operator/( float3 const &v, float const k ) { return float3(v.x / k, v.y / k, v.z / k); }; @@ -67,10 +70,14 @@ inline float3 SafeNormalize(const float3 &v) retVal = v / l; return retVal; }; -inline float3 CrossProduct(const float3 &v1, const float3 &v2) +inline float3 CrossProduct( float3 const &v1, float3 const &v2 ) { return float3(v1.y * v2.z - v1.z * v2.y, v2.x * v1.z - v2.z * v1.x, v1.x * v2.y - v1.y * v2.x); } +inline float DotProduct( float3 const &v1, float3 const &v2 ) { + + return v1.x * v2.x + v1.y * v2.y + v1.z * v2.z; +} class float4 { // kwaternion obrotu diff --git a/Model3d.cpp b/Model3d.cpp index ce590cff..eb55533d 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1808,7 +1808,8 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) // wczytanie modelu z pliku std::string name = ToLower(FileName); // trim extension if needed - if (name.substr(name.rfind('.')) == ".t3d") + if( ( name.rfind( '.' ) != std::string::npos ) + && ( name.substr( name.rfind( '.' ) ) == ".t3d" ) ) { name.erase(name.rfind('.')); } diff --git a/World.cpp b/World.cpp index 5160d07c..025857b8 100644 --- a/World.cpp +++ b/World.cpp @@ -31,6 +31,7 @@ http://mozilla.org/MPL/2.0/. #include "Train.h" #include "Driver.h" #include "Console.h" +#include "color.h" #define TEXTURE_FILTER_CONTROL_EXT 0x8500 #define TEXTURE_LOD_BIAS_EXT 0x8501 @@ -1434,11 +1435,12 @@ TWorld::Update_Camera( double const Deltatime ) { void TWorld::Update_Lights() { +#ifdef EU07_USE_OLD_LIGHTING_MODEL + if( Global::fMoveLight < 0.0 ) { return; } -#ifdef EU07_USE_OLD_LIGHTING_MODEL // double a=Global::fTimeAngleDeg/180.0*M_PI-M_PI; //kąt godzinny w radianach double a = fmod( Global::fTimeAngleDeg, 360.0 ) / 180.0 * M_PI - M_PI; // kąt godzinny w radianach @@ -1516,32 +1518,7 @@ void TWorld::Update_Lights() { +0.150 * ( Global::diffuseDayLight[ 0 ] + Global::ambientDayLight[ 0 ] ) // R + 0.295 * ( Global::diffuseDayLight[ 1 ] + Global::ambientDayLight[ 1 ] ) // G + 0.055 * ( Global::diffuseDayLight[ 2 ] + Global::ambientDayLight[ 2 ] ); // B -#else - Sun.update(); - auto const position = Sun.getPosition(); - Global::DayLight.position[0] = position.x; - Global::DayLight.position[1] = position.y; - Global::DayLight.position[2] = position.z; - auto const direction = -1.0 * Sun.getDirection(); - Global::DayLight.direction = direction; - auto const intensity = std::min( 2.0f * Sun.getIntensity(), 1.25f ); - Global::DayLight.diffuse[ 0 ] = 255.0 / 255.0 * intensity; - Global::DayLight.diffuse[ 1 ] = 242.0 / 255.0 * intensity; - Global::DayLight.diffuse[ 2 ] = 231.0 / 255.0 * intensity; -// Global::DayLight.diffuse[ 3 ] = 1.0f;// std::min( 0.15f + intensity, 1.0f ); - Global::DayLight.ambient[ 0 ] = 155.0 / 255.0 * intensity * 0.75f; - Global::DayLight.ambient[ 1 ] = 192.0 / 255.0 * intensity * 0.75f; - Global::DayLight.ambient[ 2 ] = 231.0 / 255.0 * intensity * 0.75f; -// Global::DayLight.ambient[ 3 ] = 1.0f; - /* - // Global::DayLight.ambient[ 3 ] = intensity; - GLfloat ambient[] = { 0.1f + 0.5f * intensity, 0.1f + 0.5f * intensity, 0.1f + 0.5f * intensity, 0.5f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); -*/ - Global::fLuminance = intensity; -#endif - vector3 sky = vector3( Global::AtmoColor[ 0 ], Global::AtmoColor[ 1 ], Global::AtmoColor[ 2 ] ); if( Global::fLuminance < 0.25 ) { // przyspieszenie zachodu/wschodu sky *= 4.0 * Global::fLuminance; // nocny kolor nieba @@ -1554,7 +1531,45 @@ void TWorld::Update_Lights() { else { glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły } - glClearColor( sky.x, sky.y, sky.z, 0.0 ); // kolor nieba +#else + Sun.update(); + auto const position = Sun.getPosition(); + // update skydome with current sun position + SkyDome.Update( position ); + auto const skydomecolour = SkyDome.GetAverageColor(); + auto const skydomehsv = RGBtoHSV( skydomecolour ); + // update sunlight object + Global::DayLight.position[0] = position.x; + Global::DayLight.position[1] = position.y; + Global::DayLight.position[2] = position.z; + + Global::DayLight.direction = -1.0 * Sun.getDirection(); + + auto const intensity = std::min( 0.05f + Sun.getIntensity() + skydomehsv.z, 1.25f ); + + Global::DayLight.diffuse[ 0 ] = intensity * 255.0f / 255.0f; + Global::DayLight.diffuse[ 1 ] = intensity * 242.0f / 255.0f; + Global::DayLight.diffuse[ 2 ] = intensity * 231.0f / 255.0f; +// Global::DayLight.diffuse[ 3 ] = 1.0f;// std::min( 0.15f + intensity, 1.0f ); + Global::DayLight.ambient[ 0 ] = skydomecolour.x; + Global::DayLight.ambient[ 1 ] = skydomecolour.y; + Global::DayLight.ambient[ 2 ] = skydomecolour.z; +/* + Global::DayLight.ambient[ 0 ] = 155.0 / 255.0 * intensity * 0.75f; + Global::DayLight.ambient[ 1 ] = 192.0 / 255.0 * intensity * 0.75f; + Global::DayLight.ambient[ 2 ] = 231.0 / 255.0 * intensity * 0.75f; +*/ +// Global::DayLight.ambient[ 3 ] = 1.0f; + + Global::fLuminance = intensity; + + Global::FogColor[ 0 ] = skydomecolour.x; + Global::FogColor[ 1 ] = skydomecolour.y; + Global::FogColor[ 2 ] = skydomecolour.z; + glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły +#endif + + glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 1.0f ); // kolor nieba } bool TWorld::Render() @@ -1574,18 +1589,32 @@ bool TWorld::Render() Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii if( !Global::bWireFrame ) { // bez nieba w trybie rysowania linii + + glDisable( GL_LIGHTING ); glDisable( GL_FOG ); - Clouds.Render(); - glEnable( GL_FOG ); - } + glDisable( GL_DEPTH_TEST ); + glDepthMask( GL_FALSE ); + glPushMatrix(); + glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); + + SkyDome.Render(); +// Clouds.Render(); #ifdef EU07_USE_OLD_LIGHTING_MODEL - glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); + glLightfv( GL_LIGHT0, GL_POSITION, Global::lightPos ); #else - Sun.render( Camera.Pos ); - Global::DayLight.apply_angle(); - Global::DayLight.apply_intensity(); + Sun.render(); + Global::DayLight.apply_angle(); + Global::DayLight.apply_intensity(); #endif + + glPopMatrix(); + glDepthMask( GL_TRUE ); + glEnable( GL_DEPTH_TEST ); + glEnable( GL_FOG ); + glEnable( GL_LIGHTING ); + } + if (Global::bUseVBO) { // renderowanie przez VBO if (!Ground.RenderVBO(Camera.Pos)) diff --git a/World.h b/World.h index 61742e6b..7a409460 100644 --- a/World.h +++ b/World.h @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "Ground.h" #include "sky.h" #include "sun.h" +#include "skydome.h" #include "mczapkie/mover.h" class TWorld @@ -54,6 +55,7 @@ class TWorld GLuint base; // numer DL dla znaków w napisach texture_manager::size_type light; // numer tekstury dla smugi TSky Clouds; + CSkyDome SkyDome; cSun Sun; TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury TMoverParameters *mvControlled; // wskaźnik na człon silnikowy, do wyświetlania jego parametrów diff --git a/color.h b/color.h new file mode 100644 index 00000000..e3e879e8 --- /dev/null +++ b/color.h @@ -0,0 +1,118 @@ +#pragma once + +#include "float3d.h" + +inline +float3 +XYZtoRGB( float3 const &XYZ ) { + + // M^-1 for Adobe RGB from http://www.brucelindbloom.com/Eqn_RGB_XYZ_Matrix.html +// float const mi[ 3 ][ 3 ] = { 2.041369, -0.969266, 0.0134474, -0.5649464, 1.8760108, -0.1183897, -0.3446944, 0.041556, 1.0154096 }; + // m^-1 for sRGB: + float const mi[ 3 ][ 3 ] = { 3.240479, -0.969256, 0.055648, -1.53715, 1.875991, -0.204043, -0.49853, 0.041556, 1.057311 }; + + return float3{ + XYZ.x*mi[ 0 ][ 0 ] + XYZ.y*mi[ 1 ][ 0 ] + XYZ.z*mi[ 2 ][ 0 ], + XYZ.x*mi[ 0 ][ 1 ] + XYZ.y*mi[ 1 ][ 1 ] + XYZ.z*mi[ 2 ][ 1 ], + XYZ.x*mi[ 0 ][ 2 ] + XYZ.y*mi[ 1 ][ 2 ] + XYZ.z*mi[ 2 ][ 2 ] }; +} + +inline +float3 +RGBtoHSV( float3 const &RGB ) { + + float3 hsv; + + float const max = std::max( std::max( RGB.x, RGB.y ), RGB.z ); + float const min = std::min( std::min( RGB.x, RGB.y ), RGB.z ); + float const delta = max - min; + + hsv.z = max; // v + if( delta < 0.00001 ) { + hsv.y = 0; + hsv.x = 0; // undefined, maybe nan? + return hsv; + } + if( max > 0.0 ) { // NOTE: if Max is == 0, this divide would cause a crash + hsv.y = ( delta / max ); // s + } + else { + // if max is 0, then r = g = b = 0 + // s = 0, v is undefined + hsv.y = 0.0; + hsv.x = NAN; // its now undefined + return hsv; + } + if( RGB.x >= max ) // > is bogus, just keeps compilor happy + hsv.x = ( RGB.y - RGB.z ) / delta; // between yellow & magenta + else + if( RGB.y >= max ) + hsv.x = 2.0 + ( RGB.y - RGB.x ) / delta; // between cyan & yellow + else + hsv.x = 4.0 + ( RGB.x - RGB.y ) / delta; // between magenta & cyan + + hsv.x *= 60.0; // degrees + + if( hsv.x < 0.0 ) + hsv.x += 360.0; + + return hsv; +} + +inline +float3 +HSVtoRGB( float3 const &HSV ) { + + float3 rgb; + + if( HSV.y <= 0.0 ) { // < is bogus, just shuts up warnings + rgb.x = HSV.z; + rgb.y = HSV.z; + rgb.z = HSV.z; + return rgb; + } + float hh = HSV.x; + if( hh >= 360.0 ) hh = 0.0; + hh /= 60.0; + int const i = (int)hh; + float const ff = hh - i; + float const p = HSV.z * ( 1.0 - HSV.y ); + float const q = HSV.z * ( 1.0 - ( HSV.y * ff ) ); + float const t = HSV.z * ( 1.0 - ( HSV.y * ( 1.0 - ff ) ) ); + + switch( i ) { + case 0: + rgb.x = HSV.z; + rgb.y = t; + rgb.z = p; + break; + case 1: + rgb.x = q; + rgb.y = HSV.z; + rgb.z = p; + break; + case 2: + rgb.x = p; + rgb.y = HSV.z; + rgb.z = t; + break; + + case 3: + rgb.x = p; + rgb.y = q; + rgb.z = HSV.z; + break; + case 4: + rgb.x = t; + rgb.y = p; + rgb.z = HSV.z; + break; + case 5: + default: + rgb.x = HSV.z; + rgb.y = p; + rgb.z = q; + break; + } + return rgb; +} diff --git a/maszyna.vcxproj b/maszyna.vcxproj index 3ea50446..be008947 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -123,6 +123,7 @@ + @@ -149,6 +150,7 @@ + @@ -186,6 +188,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index c0530acf..4b343051 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -195,6 +195,9 @@ Source Files + + Source Files + @@ -377,6 +380,12 @@ Header Files + + Header Files + + + Header Files + diff --git a/sky.cpp b/sky.cpp index 0febec09..710adbdb 100644 --- a/sky.cpp +++ b/sky.cpp @@ -32,21 +32,11 @@ void TSky::Init() void TSky::Render() { -#ifndef EU07_USE_OLD_LIGHTING_MODEL - return; -#endif if (mdCloud) { // jeśli jest model nieba - glDisable(GL_DEPTH_TEST); - glDepthMask( GL_FALSE ); - glPushMatrix(); - glTranslatef(Global::pCameraPosition.x, Global::pCameraPosition.y, - Global::pCameraPosition.z); #ifdef EU07_USE_OLD_LIGHTING_MODEL // TODO: re-implement this glLightfv(GL_LIGHT0, GL_POSITION, lightPos); -#else - glDisable( GL_LIGHTING ); #endif if (Global::bUseVBO) { // renderowanie z VBO @@ -62,11 +52,7 @@ void TSky::Render() #ifdef EU07_USE_OLD_LIGHTING_MODEL // TODO: re-implement this glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); -#else - glEnable( GL_LIGHTING ); #endif - glDepthMask( GL_TRUE ); - glEnable( GL_DEPTH_TEST ); } }; diff --git a/skydome.cpp b/skydome.cpp new file mode 100644 index 00000000..c84113c5 --- /dev/null +++ b/skydome.cpp @@ -0,0 +1,332 @@ +//******************************************************************************// +// NightShine Engine // +// Sky : Gradient SkyDome Class // +//******************************************************************************// +// sky gradient based on "A practical analytic model for daylight" +// by A. J. Preetham Peter Shirley Brian Smits (University of Utah) + +#include "stdafx.h" +#include "opengl/glew.h" +#include "skydome.h" +#include "color.h" + +//******************************************************************************// + +float CSkyDome::m_distributionluminance[ 5 ][ 2 ] = { // Perez distributions + { 0.17872f , -1.46303f }, // a = darkening or brightening of the horizon + { -0.35540f , 0.42749f }, // b = luminance gradient near the horizon, + { -0.02266f , 5.32505f }, // c = relative intensity of the circumsolar region + { 0.12064f , -2.57705f }, // d = width of the circumsolar region + { -0.06696f , 0.37027f } // e = relative backscattered light + }; +float CSkyDome::m_distributionxcomp[ 5 ][ 2 ] = { + { -0.01925f , -0.25922f }, + { -0.06651f , 0.00081f }, + { -0.00041f , 0.21247f }, + { -0.06409f , -0.89887f }, + { -0.00325f , 0.04517f } + }; +float CSkyDome::m_distributionycomp[ 5 ][ 2 ] = { + { -0.01669f , -0.26078f }, + { -0.09495f , 0.00921f }, + { -0.00792f , 0.21023f }, + { -0.04405f , -1.65369f }, + { -0.01092f , 0.05291f } + }; + +float CSkyDome::m_zenithxmatrix[ 3 ][ 4 ] = { + { 0.00165f, -0.00375f, 0.00209f, 0.00000f }, + { -0.02903f, 0.06377f, -0.03202f, 0.00394f }, + { 0.11693f, -0.21196f, 0.06052f, 0.25886f } + }; +float CSkyDome::m_zenithymatrix[ 3 ][ 4 ] = { + { 0.00275f, -0.00610f, 0.00317f, 0.00000f }, + { -0.04214f, 0.08970f, -0.04153f, 0.00516f }, + { 0.15346f, -0.26756f, 0.06670f, 0.26688f } + }; + +//******************************************************************************// + +float clamp( float const Value, float const Min, float const Max ) { + + float value = Value; + if( value < Min ) { value = Min; } + if( value > Max ) { value = Max; } + return value; +} + +float interpolate( float const First, float const Second, float const Factor ) { + + return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); +} + +//******************************************************************************// + +CSkyDome::CSkyDome (int const Tesselation) : + m_tesselation( Tesselation ) { + +// SetSunPosition( Math3D::vector3(75.0f, 0.0f, 0.0f) ); + SetTurbidity( 3.5f ); + SetExposure( true, 16.0f ); + SetOvercastFactor( 0.08f ); + SetGammaCorrection( 2.2f ); + Generate(); +} + +CSkyDome::~CSkyDome() { +} + +//******************************************************************************// + +void CSkyDome::Generate() { + // radius of dome + float const radius = 1.0f; // 100.0f; + + // create geometry chunk + int const latitudes = m_tesselation / 2; + int const longitudes = m_tesselation; + + 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 lat1 = M_PI * ( -0.5f + (float)( i + 1 ) / latitudes ); + float z1 = std::sin( lat1 ); + float zr1 = std::cos( lat1 ); + + // quad strip + for( int j = 0; j <= longitudes / 2; ++j ) { + + 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 - 0.1f, 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 - 0.1f, z1 ) * radius ); +// m_normals.emplace_back( float3( -x * zr1, -y * zr1, -z1 ) ); + m_colours.emplace_back( float3( 0.75f, 0.75f, 0.75f ) ); + } + } +} + +//******************************************************************************// + +void CSkyDome::Update( Math3D::vector3 const &Sun ) { + + if( true == SetSunPosition( Sun ) ) { + // build colors if there's a change in sun position + RebuildColors(); + } +} + +// render skydome to screen +void CSkyDome::Render() { + + int const latitudes = m_tesselation / 2; + int const longitudes = m_tesselation; + int idx = 0; + + for( int i = 0; i < latitudes; ++i ) { + + ::glBegin( GL_QUAD_STRIP ); + for( int j = 0; j <= longitudes / 2; ++j ) { + + ::glColor3f( m_colours[ idx ].x, m_colours[ idx ].y, m_colours[ idx ].z ); +// ::glNormal3f( m_normals[ idx ].x, m_normals[ idx ].y, m_normals[ idx ].z ); + ::glVertex3f( m_vertices[ idx ].x, m_vertices[ idx ].y, m_vertices[ idx ].z ); + ++idx; + ::glColor3f( m_colours[ idx ].x, m_colours[ idx ].y, m_colours[ idx ].z ); +// ::glNormal3f( m_normals[ idx ].x, m_normals[ idx ].y, m_normals[ idx ].z ); + ::glVertex3f( m_vertices[ idx ].x, m_vertices[ idx ].y, m_vertices[ idx ].z ); + ++idx; + } + glEnd(); + } +} + +//******************************************************************************// + +bool CSkyDome::SetSunPosition( Math3D::vector3 const &Direction ) { + + auto sundirection = SafeNormalize( float3( Direction.x, Direction.y, Direction.z) ); + if( sundirection == m_sundirection ) { + + return false; + } + + m_sundirection = sundirection; + m_thetasun = std::acosf( m_sundirection.y ); + m_phisun = std::atan2( m_sundirection.z , m_sundirection.x ); + + return true; +} + + +void CSkyDome::SetTurbidity( float const Turbidity ) { + + m_turbidity = clamp( Turbidity, 1.0f, 512.0f ); +} + +void CSkyDome::SetExposure( bool const Linearexposure, float const Expfactor ) { + + m_linearexpcontrol = Linearexposure; + m_expfactor = 1.0f / clamp( Expfactor, 1.0f, std::numeric_limits::infinity() ); +} + +void CSkyDome::SetGammaCorrection( float const Gamma ) { + + m_gammacorrection = 1.0f / clamp( Gamma, std::numeric_limits::epsilon(), std::numeric_limits::infinity() ); +} + +void CSkyDome::SetOvercastFactor( float const Overcast ) { + + m_overcast = clamp( Overcast, 0.0f, 1.0f ); +} + +//******************************************************************************// + +void CSkyDome::GetPerez( float *Perez, float Distribution[ 5 ][ 2 ], const float Turbidity ) { + + Perez[ 0 ] = Distribution[ 0 ][ 0 ] * Turbidity + Distribution[ 0 ][ 1 ]; + Perez[ 1 ] = Distribution[ 1 ][ 0 ] * Turbidity + Distribution[ 1 ][ 1 ]; + Perez[ 2 ] = Distribution[ 2 ][ 0 ] * Turbidity + Distribution[ 2 ][ 1 ]; + Perez[ 3 ] = Distribution[ 3 ][ 0 ] * Turbidity + Distribution[ 3 ][ 1 ]; + Perez[ 4 ] = Distribution[ 4 ][ 0 ] * Turbidity + Distribution[ 4 ][ 1 ]; +} + +float CSkyDome::GetZenith( float Zenithmatrix[ 3 ][ 4 ], const float Theta, const float Turbidity ) { + + const float theta2 = Theta*Theta; + const float theta3 = Theta*theta2; + + return ( Zenithmatrix[0][0] * theta3 + Zenithmatrix[0][1] * theta2 + Zenithmatrix[0][2] * Theta + Zenithmatrix[0][3]) * Turbidity * Turbidity + + ( Zenithmatrix[1][0] * theta3 + Zenithmatrix[1][1] * theta2 + Zenithmatrix[1][2] * Theta + Zenithmatrix[1][3]) * Turbidity + + ( Zenithmatrix[2][0] * theta3 + Zenithmatrix[2][1] * theta2 + Zenithmatrix[2][2] * Theta + Zenithmatrix[2][3]); + +} + +//******************************************************************************// + +float CSkyDome::PerezFunctionO1( float Perezcoeffs[ 5 ], const float Thetasun, const float Zenithval ) { + + const float val = ( 1.0f + Perezcoeffs[ 0 ] * std::exp( Perezcoeffs[ 1 ] ) ) * + ( 1.0f + Perezcoeffs[ 2 ] * std::exp( Perezcoeffs[ 3 ] * Thetasun ) + Perezcoeffs[ 4 ] * std::pow( std::cos( Thetasun ), 2 ) ); + + return Zenithval / val; +} + +float CSkyDome::PerezFunctionO2( float Perezcoeffs[ 5 ], const float Icostheta, const float Gamma, const float Cosgamma2, const float Zenithval ) { + // iCosTheta = 1.0f / cosf(theta) + // cosGamma2 = SQR( cosf( gamma ) ) + return Zenithval * ( 1.0f + Perezcoeffs[ 0 ] * std::exp( Perezcoeffs[ 1 ] * Icostheta ) ) * + ( 1.0f + Perezcoeffs[ 2 ] * std::exp( Perezcoeffs[ 3 ] * Gamma ) + Perezcoeffs[ 4 ] * Cosgamma2 ); +} + +//******************************************************************************// +void CSkyDome::RebuildColors() { + + // get zenith luminance + float const chi = ( (4.0f / 9.0f) - (m_turbidity / 120.0f) ) * ( M_PI - (2.0f * m_thetasun) ); + float zenithluminance = ( (4.0453f * m_turbidity) - 4.9710f ) * std::tan( chi ) - (0.2155f * m_turbidity) + 2.4192f; + + // get x / y zenith + float zenithx = GetZenith( m_zenithxmatrix, m_thetasun, m_turbidity ); + float zenithy = GetZenith( m_zenithymatrix, m_thetasun, m_turbidity ); + + // get perez function parametrs + float perezluminance[5], perezx[5], perezy[5]; + GetPerez( perezluminance, m_distributionluminance, m_turbidity ); + GetPerez( perezx, m_distributionxcomp, m_turbidity ); + GetPerez( perezy, m_distributionycomp, m_turbidity ); + + // make some precalculation + zenithx = PerezFunctionO1( perezx, m_thetasun, zenithx ); + zenithy = PerezFunctionO1( perezy, m_thetasun, zenithy ); + zenithluminance = PerezFunctionO1( perezluminance, m_thetasun, zenithluminance ); + + // start with fresh average for the new pass + float3 averagecolor{ 0.0f, 0.0f, 0.0f }; + + // trough all vertices + float3 vertex; + float3 color, colorconverter; + + for ( unsigned int i = 0; i < m_vertices.size(); ++i ) { + // grab it + vertex = SafeNormalize( m_vertices[ i ] ); + + // angle between sun and vertex + const float gamma = std::acos( DotProduct( vertex, m_sundirection ) ); + + // warning : major hack!!! .. i had to do something with values under horizon + //vertex.y = Clamp( vertex.y, 0.05f, 1.0f ); + if ( vertex.y < 0.05f ) vertex.y = 0.05f; + +// from paper: +// const float theta = arccos( vertex.y ); +// const float iCosTheta = 1.0f / cosf( theta ); +// optimized: +// iCosTheta = +// = 1.0f / cosf( arccos( vertex.y ) ); +// = 1.0f / vertex.y; + float const icostheta = 1.0f / vertex.y; + float const cosgamma2 = std::pow( std::cos( gamma ), 2 ); + + // Compute x,y values + float const x = PerezFunctionO2( perezx, icostheta, gamma, cosgamma2, zenithx ); + float const y = PerezFunctionO2( perezy, icostheta, gamma, cosgamma2, zenithy ); + + // luminance(Y) for clear & overcast sky + float const yclear = PerezFunctionO2( perezluminance, icostheta, gamma, cosgamma2, zenithluminance ); + float const yover = ( 1.0f + 2.0f * vertex.y ) / 3.0f; + + float const Y = interpolate( yclear, yover, m_overcast ); + float const X = (x / y) * Y; + float const Z = ((1.0f - x - y) / y) * Y; + + colorconverter = float3( X, Y, Z ); + color = XYZtoRGB( colorconverter ); + + colorconverter = RGBtoHSV(color); + if ( m_linearexpcontrol ) { + // linear scale + colorconverter.z *= m_expfactor; + } else { + // exp scale + colorconverter.z = 1.0f - exp( -m_expfactor * colorconverter.z ); + } + color = HSVtoRGB(colorconverter); +/* + // gamma control + color.x = std::pow( color.x, m_gammacorrection ); + color.x = std::pow( color.y, m_gammacorrection ); + color.x = std::pow( color.z, m_gammacorrection ); +*/ + // crude correction for the times where the model breaks (late night) + // TODO: use proper night sky calculation for these times instead + if( ( color.x <= 0.0f ) + && ( color.y <= 0.0f ) ) { + // darken the sky as the sun goes deeper below the horizon + // 15:50:75 is picture-based night sky colour. it may not be accurate but looks 'right enough' + color.z = 0.75f * std::max( color.z + m_sundirection.y, 0.075f ); + color.x = 0.20f * color.z; + color.y = 0.65f * color.z; + } + + // save + m_colours[ i ] = color; + averagecolor += color; + } + + m_averagecolour = averagecolor / m_vertices.size(); + m_averagecolour.x = std::max( m_averagecolour.x, 0.0f ); + m_averagecolour.y = std::max( m_averagecolour.y, 0.0f ); + m_averagecolour.z = std::max( m_averagecolour.z, 0.0f ); +} + +//******************************************************************************// diff --git a/skydome.h b/skydome.h new file mode 100644 index 00000000..df0125e4 --- /dev/null +++ b/skydome.h @@ -0,0 +1,60 @@ +#pragma once + +#include "dumb3d.h" +#include "float3d.h" + +// sky gradient based on "A practical analytic model for daylight" +// by A. J. Preetham Peter Shirley Brian Smits (University of Utah) + +class CSkyDome { +public: + CSkyDome( int const Tesselation = 54 ); + ~CSkyDome(); + void Generate(); + void RebuildColors(); + + bool SetSunPosition( Math3D::vector3 const &Direction ); + + void SetTurbidity( const float Turbidity = 5.0f ); + void SetExposure( const bool Linearexposure, const float Expfactor ); + void SetOvercastFactor( const float Overcast = 0.0f ); + void SetGammaCorrection( const float Gamma = 2.2f ); + + // update skydome + void Update( Math3D::vector3 const &Sun ); + // render skydome to screen + void Render(); + + // retrieves average colour of the sky dome + float3 GetAverageColor() { return m_averagecolour; } + +private: + // shading parametrs + float3 m_sundirection; + float m_thetasun, m_phisun; + float m_turbidity; + bool m_linearexpcontrol; + float m_expfactor; + float m_overcast; + float m_gammacorrection; + float3 m_averagecolour; + + // data + int const m_tesselation; + std::vector m_vertices; + std::vector m_normals; + std::vector m_colours; + + static float m_distributionluminance[ 5 ][ 2 ]; + static float m_distributionxcomp[ 5 ][ 2 ]; + static float m_distributionycomp[ 5 ][ 2 ]; + + static float m_zenithxmatrix[ 3 ][ 4 ]; + static float m_zenithymatrix[ 3 ][ 4 ]; + + // coloring + void GetPerez( float *Perez, float Distribution[ 5 ][ 2 ], const float Turbidity ); + float GetZenith( float Zenithmatrix[ 3 ][ 4 ], const float Theta, const float Turbidity ); + float PerezFunctionO1( float Perezcoeffs[ 5 ], const float Thetasun, const float Zenithval ); + float PerezFunctionO2( float Perezcoeffs[ 5 ], const float Icostheta, const float Gamma, const float Cosgamma2, const float Zenithval ); +}; diff --git a/sun.cpp b/sun.cpp index e571a0a7..78fd9e4f 100644 --- a/sun.cpp +++ b/sun.cpp @@ -39,7 +39,7 @@ cSun::update() { } void -cSun::render( Math3D::vector3 const &Origin ) { +cSun::render() { /* glLightfv(GL_LIGHT0, GL_POSITION, position.getVector() ); // sun @@ -51,7 +51,7 @@ cSun::render( Math3D::vector3 const &Origin ) { glDisable(GL_FOG); glColor4f( 255.0f/255.0f, 242.0f/255.0f, 231.0f/255.0f, 1.f ); // debug line to locate the sun easier - Math3D::vector3 position = m_position + Origin; + Math3D::vector3 position = m_position; glBegin( GL_LINES ); glVertex3f( position.x, position.y, position.z ); glVertex3f( position.x, 0.0f, position.z ); diff --git a/sun.h b/sun.h index 74349599..c64543f1 100644 --- a/sun.h +++ b/sun.h @@ -18,7 +18,7 @@ public: // methods: void init(); void update(); - void render( Math3D::vector3 const &Origin ); + void render(); // returns location of the sun in the 3d scene Math3D::vector3 getPosition() { return m_position; } // returns vector pointing at the sun From 1b0e151fbf2c3e1c9502e688c7746c4cb2844eb1 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 24 Feb 2017 01:22:06 +0100 Subject: [PATCH 023/426] stars object, interrior lighting level as accessible parameter for dynamic object --- DynObj.cpp | 23 +++++- DynObj.h | 17 ++-- Globals.cpp | 1 + Globals.h | 1 + Model3d.cpp | 15 ++-- Train.cpp | 34 ++++++++ World.cpp | 168 ++++++++++++++++++++++++---------------- World.h | 23 +++++- color.h | 4 +- maszyna.vcxproj | 2 + maszyna.vcxproj.filters | 6 ++ skydome.cpp | 1 + stars.cpp | 28 +++++++ stars.h | 33 ++++++++ 14 files changed, 266 insertions(+), 90 deletions(-) create mode 100644 stars.cpp create mode 100644 stars.h diff --git a/DynObj.cpp b/DynObj.cpp index 6e49fb7d..18784aeb 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3807,9 +3807,26 @@ void TDynamicObject::Render() } else { // wersja Display Lists - if (mdLowPolyInt) - if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) - mdLowPolyInt->Render(ObjSqrDist, ReplacableSkinID, iAlpha); + if( mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab ) { + // enable cab light if needed + if( InteriorLightLevel > 0.0f ) { + + // crude way to light the cabin, until we have something more complete in place + auto const cablight = InteriorLight * InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } + + mdLowPolyInt->Render( ObjSqrDist, ReplacableSkinID, iAlpha ); + + if( InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } + } + } mdModel->Render(ObjSqrDist, ReplacableSkinID, iAlpha); if (mdLoad) // renderowanie nieprzezroczystego ładunku mdLoad->Render(ObjSqrDist, ReplacableSkinID, iAlpha); diff --git a/DynObj.h b/DynObj.h index bda873a7..2c675cc0 100644 --- a/DynObj.h +++ b/DynObj.h @@ -140,11 +140,10 @@ class TAnim //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -class TDynamicObject -{ // klasa pojazdu - private: // położenie pojazdu w świecie oraz parametry ruchu +class TDynamicObject { // klasa pojazdu +private: // położenie pojazdu w świecie oraz parametry ruchu vector3 vPosition; // Ra: pozycja pojazdu liczona zaraz po przesunięciu - vector3 vCoulpler[2]; // współrzędne sprzęgów do liczenia zderzeń czołowych + vector3 vCoulpler[ 2 ]; // współrzędne sprzęgów do liczenia zderzeń czołowych vector3 vUp, vFront, vLeft; // wektory jednostkowe ustawienia pojazdu int iDirection; // kierunek pojazdu względem czoła składu (1=zgodny,0=przeciwny) TTrackShape ts; // parametry toru przekazywane do fizyki @@ -156,10 +155,10 @@ class TDynamicObject float fAxleDist; // rozstaw wózków albo osi do liczenia proporcji zacienienia vector3 modelRot; // obrot pudła względem świata - do przeanalizowania, czy potrzebne!!! // bool bCameraNear; //blisko kamer są potrzebne dodatkowe obliczenia szczegółów - TDynamicObject * ABuFindNearestObject(TTrack *Track, TDynamicObject *MyPointer, - int &CouplNr); + TDynamicObject * ABuFindNearestObject( TTrack *Track, TDynamicObject *MyPointer, + int &CouplNr ); - public: // parametry położenia pojazdu dostępne publicznie +public: // parametry położenia pojazdu dostępne publicznie std::string asTrack; // nazwa toru początkowego; wywalić? std::string asDestination; // dokąd pojazd ma być kierowany "(stacja):(tor)" matrix4x4 mMatrix; // macierz przekształcenia do renderowania modeli @@ -175,12 +174,14 @@ class TDynamicObject private: // returns type of the nearest functional power source present in the trainset - public: // modele składowe pojazdu +public: // modele składowe pojazdu TModel3d *mdModel; // model pudła TModel3d *mdLoad; // model zmiennego ładunku TModel3d *mdPrzedsionek; // model przedsionków dla EZT - może użyć mdLoad zamiast? TModel3d *mdKabina; // model kabiny dla użytkownika; McZapkie-030303: to z train.h TModel3d *mdLowPolyInt; // ABu 010305: wnetrze lowpoly + float3 InteriorLight{ 0.9f * 255.0f / 255.0f, 0.9f * 216.0f / 255.0f, 0.9f * 176.0f / 255.0f }; // tungsten light. TODO: allow definition of light type? + float InteriorLightLevel{ 0.0f }; // current level of interior lighting float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) private: // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe diff --git a/Globals.cpp b/Globals.cpp index 8285f434..3e68f5e7 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -47,6 +47,7 @@ double Global::fOpenGL = 0.0; // wersja OpenGL - do sprawdzania obecności rozsz bool Global::bOpenGL_1_5 = false; // czy są dostępne funkcje OpenGL 1.5 */ double Global::fLuminance = 1.0; // jasność światła do automatycznego zapalania +float Global::SunAngle = 0.0f; int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki HWND Global::hWnd = NULL; // uchwyt okna int Global::ScreenWidth = 1; diff --git a/Globals.h b/Globals.h index a9ca3c85..c46932e1 100644 --- a/Globals.h +++ b/Globals.h @@ -258,6 +258,7 @@ class Global static bool bOpenGL_1_5; // czy są dostępne funkcje OpenGL 1.5 */ static double fLuminance; // jasność światła do automatycznego zapalania + static float SunAngle; // angle of the sun relative to horizon static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji static HWND hWnd; // uchwyt okna static int ScreenWidth; // current window dimensions. TODO: move it to renderer diff --git a/Model3d.cpp b/Model3d.cpp index eb55533d..3ac52358 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -742,7 +742,7 @@ void TSubModel::DisplayLists() glNewList(uiDisplayList, GL_COMPILE); GfxRenderer.Bind(0); // tekstury nie ma glColorMaterial(GL_FRONT, GL_EMISSION); - glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly +// glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly glBegin(GL_POINTS); for (int i = 0; i < iNumVerts; i++) { @@ -751,7 +751,7 @@ void TSubModel::DisplayLists() glVertex3fv(&Vertices[i].Point.x); }; glEnd(); - glEnable(GL_LIGHTING); +// glEnable(GL_LIGHTING); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); glMaterialfv(GL_FRONT, GL_EMISSION, emm2); glEndList(); @@ -816,10 +816,13 @@ void TSubModel::InitialRotate(bool doit) Vertices[i].Point.y = Vertices[i].Point.z; Vertices[i].Point.z = t; // wektory normalne również trzeba przekształcić, bo się źle oświetlają - Vertices[i].Normal.x = -Vertices[i].Normal.x; // zmiana znaku X - t = Vertices[i].Normal.y; // zamiana Y i Z - Vertices[i].Normal.y = Vertices[i].Normal.z; - Vertices[i].Normal.z = t; + if( eType != TP_STARS ) { + // gwiazdki mają kolory zamiast normalnych, to // ich wtedy nie ruszamy + Vertices[ i ].Normal.x = -Vertices[ i ].Normal.x; // zmiana znaku X + t = Vertices[ i ].Normal.y; // zamiana Y i Z + Vertices[ i ].Normal.y = Vertices[ i ].Normal.z; + Vertices[ i ].Normal.z = t; + } } if (Child) Child->InitialRotate(doit); // potomne ewentualnie obrócimy diff --git a/Train.cpp b/Train.cpp index 66599599..ce35b35c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5001,6 +5001,40 @@ bool TTrain::Update( double const Deltatime ) btHaslerBrakes.Turn(DynamicObject->MoverParameters->BrakePress > 0.4); // ciśnienie w cylindrach btHaslerCurrent.Turn(DynamicObject->MoverParameters->Im != 0.0); // prąd na silnikach + // calculate current level of interior illumination + // TODO: organize it along with rest of train update in a more sensible arrangement + switch( iCabLightFlag ) // Ra: uzeleżnic od napięcia w obwodzie sterowania + { // hunter-091012: uzaleznienie jasnosci od przetwornicy + case 0: { + //światło wewnętrzne zgaszone + DynamicObject->InteriorLightLevel = 0.0f; + break; + } + case 1: { + //światło wewnętrzne przygaszone (255 216 176) + if( mvOccupied->ConverterFlag == true ) { + // jasnosc dla zalaczonej przetwornicy + DynamicObject->InteriorLightLevel = 0.75f; + } + else { + DynamicObject->InteriorLightLevel = 0.375f; + } + break; + } + case 2: { + //światło wewnętrzne zapalone (255 216 176) + if( mvOccupied->ConverterFlag == + true ) // jasnosc dla zalaczonej przetwornicy + { + DynamicObject->InteriorLightLevel = 1.0f; + } + else { + DynamicObject->InteriorLightLevel = 0.5f; + } + break; + } + } + m_updated = true; return true; //(DynamicObject->Update(dt)); } // koniec update diff --git a/World.cpp b/World.cpp index 025857b8..e216d765 100644 --- a/World.cpp +++ b/World.cpp @@ -590,8 +590,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Ground.Init(Global::SceneryFile, hDC); // Global::tSinceStart= 0; - Sun.init(); - Clouds.Init(); + Environment.init(); WriteLog("Ground init OK"); if (Global::detonatoryOK) { @@ -1195,7 +1194,7 @@ bool TWorld::Update() Global::fClockAngleDeg[4] = 36.0 * (GlobalTime->hh % 10); // jednostki godzin Global::fClockAngleDeg[5] = 36.0 * (GlobalTime->hh / 10); // dziesiątki godzin - Update_Lights(); + Update_Environment(); } // koniec działań niewykonywanych podczas pauzy // poprzednie jakoś tam działało double dt = Timer::GetDeltaRenderTime(); // nie uwzględnia pauzowania ani mnożenia czasu @@ -1433,7 +1432,7 @@ TWorld::Update_Camera( double const Deltatime ) { } } -void TWorld::Update_Lights() { +void TWorld::Update_Environment() { #ifdef EU07_USE_OLD_LIGHTING_MODEL @@ -1532,44 +1531,8 @@ void TWorld::Update_Lights() { glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły } #else - Sun.update(); - auto const position = Sun.getPosition(); - // update skydome with current sun position - SkyDome.Update( position ); - auto const skydomecolour = SkyDome.GetAverageColor(); - auto const skydomehsv = RGBtoHSV( skydomecolour ); - // update sunlight object - Global::DayLight.position[0] = position.x; - Global::DayLight.position[1] = position.y; - Global::DayLight.position[2] = position.z; - - Global::DayLight.direction = -1.0 * Sun.getDirection(); - - auto const intensity = std::min( 0.05f + Sun.getIntensity() + skydomehsv.z, 1.25f ); - - Global::DayLight.diffuse[ 0 ] = intensity * 255.0f / 255.0f; - Global::DayLight.diffuse[ 1 ] = intensity * 242.0f / 255.0f; - Global::DayLight.diffuse[ 2 ] = intensity * 231.0f / 255.0f; -// Global::DayLight.diffuse[ 3 ] = 1.0f;// std::min( 0.15f + intensity, 1.0f ); - Global::DayLight.ambient[ 0 ] = skydomecolour.x; - Global::DayLight.ambient[ 1 ] = skydomecolour.y; - Global::DayLight.ambient[ 2 ] = skydomecolour.z; -/* - Global::DayLight.ambient[ 0 ] = 155.0 / 255.0 * intensity * 0.75f; - Global::DayLight.ambient[ 1 ] = 192.0 / 255.0 * intensity * 0.75f; - Global::DayLight.ambient[ 2 ] = 231.0 / 255.0 * intensity * 0.75f; -*/ -// Global::DayLight.ambient[ 3 ] = 1.0f; - - Global::fLuminance = intensity; - - Global::FogColor[ 0 ] = skydomecolour.x; - Global::FogColor[ 1 ] = skydomecolour.y; - Global::FogColor[ 2 ] = skydomecolour.z; - glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły + Environment.update(); #endif - - glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 1.0f ); // kolor nieba } bool TWorld::Render() @@ -1588,31 +1551,9 @@ bool TWorld::Render() glLoadIdentity(); Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii - if( !Global::bWireFrame ) { // bez nieba w trybie rysowania linii - - glDisable( GL_LIGHTING ); - glDisable( GL_FOG ); - glDisable( GL_DEPTH_TEST ); - glDepthMask( GL_FALSE ); - glPushMatrix(); - glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); - - SkyDome.Render(); -// Clouds.Render(); - -#ifdef EU07_USE_OLD_LIGHTING_MODEL - glLightfv( GL_LIGHT0, GL_POSITION, Global::lightPos ); -#else - Sun.render(); - Global::DayLight.apply_angle(); - Global::DayLight.apply_intensity(); -#endif - - glPopMatrix(); - glDepthMask( GL_TRUE ); - glEnable( GL_DEPTH_TEST ); - glEnable( GL_FOG ); - glEnable( GL_LIGHTING ); + if( !Global::bWireFrame ) { + // bez nieba w trybie rysowania linii + Environment.render(); } if (Global::bUseVBO) @@ -1759,7 +1700,7 @@ TWorld::Render_Cab() { float z = i * i * i * 0.01f;//25/4; //float C = (36 - i*0.5)*0.005*(1.5 - sqrt(ddl)); float C = ( 36 - i*0.5 )*0.005*sqrt( ( 1 / sqrt( Global::fLuminance + 0.015 ) ) - 1 ) * frontlightstrength; - glColor4f( C, C, C, 0.35f );// *frontlightstrength ); + glColor4f( C, C, C, 1.0f );// *frontlightstrength ); glTexCoord2f( 0, 0 ); glVertex3f( -10 / 2 - 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); glTexCoord2f( 1, 0 ); glVertex3f( 10 / 2 + 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); glTexCoord2f( 1, 1 ); glVertex3f( 10 / 2 + 2 * i / 4, -5.0 - 0.5*z, 13 + 1.7*z / 3 ); @@ -1880,6 +1821,13 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_AMBIENT, ambientCabLight ); glLightfv( GL_LIGHT0, GL_DIFFUSE, diffuseCabLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, specularCabLight ); +#else + if( dynamic->InteriorLightLevel > 0.0f ) { + + // crude way to light the cabin, until we have something more complete in place + auto const cablight = dynamic->InteriorLight * dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } #endif if( Global::bUseVBO ) { // renderowanie z użyciem VBO dynamic->mdKabina->RaRender( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); @@ -1895,6 +1843,12 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight ); glLightfv( GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, Global::specularDayLight ); +#else + if( dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } #endif } glPopMatrix(); @@ -2365,6 +2319,8 @@ TWorld::Render_UI() { " " + std::string( "S SEE NEN NWW SW" ) .substr( 1 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); + // current luminance level + OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); } // OutText3= AnsiString(" Online documentation (PL, ENG, DE, soon CZ): // http://www.eu07.pl"); @@ -3060,3 +3016,81 @@ void TWorld::CabChange(TDynamicObject *old, TDynamicObject *now) Global::changeDynObj = now; // uruchomienie protezy }; //--------------------------------------------------------------------------- + +void +world_environment::init() { + + m_sun.init(); + m_stars.init(); + m_clouds.Init(); +} + +void +world_environment::update() { + + // move sun... + m_sun.update(); + auto const position = m_sun.getPosition(); + // ...update the global data to match new sun state... + Global::SunAngle = m_sun.getAngle(); + Global::DayLight.position[ 0 ] = position.x; + Global::DayLight.position[ 1 ] = position.y; + Global::DayLight.position[ 2 ] = position.z; + Global::DayLight.direction = -1.0 * m_sun.getDirection(); + // ...update skydome to match the current sun position as well... + m_skydome.Update( position ); + // ...retrieve current sky colour and brightness... + auto const skydomecolour = m_skydome.GetAverageColor(); + auto const skydomehsv = RGBtoHSV( skydomecolour ); + auto const intensity = std::min( 0.05f + m_sun.getIntensity() + skydomehsv.z, 1.25f ); + // ...update light colours and intensity. + // NOTE: intensity combines intensity of the sun and the light reflected by the sky dome + // it'd be more technically correct to have just the intensity of the sun here, + // but whether it'd _look_ better is something to be tested + Global::DayLight.diffuse[ 0 ] = intensity * 255.0f / 255.0f; + Global::DayLight.diffuse[ 1 ] = intensity * 242.0f / 255.0f; + Global::DayLight.diffuse[ 2 ] = intensity * 231.0f / 255.0f; + + Global::DayLight.ambient[ 0 ] = skydomecolour.x; + Global::DayLight.ambient[ 1 ] = skydomecolour.y; + Global::DayLight.ambient[ 2 ] = skydomecolour.z; + + Global::fLuminance = intensity; + + // update the fog. setting it to match the average colour of the sky dome is cheap + // but quite effective way to make the distant items blend with background better + Global::FogColor[ 0 ] = skydomecolour.x; + Global::FogColor[ 1 ] = skydomecolour.y; + Global::FogColor[ 2 ] = skydomecolour.z; + ::glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły + + ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 1.0f ); // kolor nieba +} + +void +world_environment::render() { + + ::glDisable( GL_LIGHTING ); + ::glDisable( GL_FOG ); + ::glDisable( GL_DEPTH_TEST ); + ::glDepthMask( GL_FALSE ); + ::glPushMatrix(); + ::glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); + + m_skydome.Render(); + m_stars.render(); +// m_clouds.Render(); + + if( DebugModeFlag == true ) { + // mark sun position for easier debugging + m_sun.render(); + } + Global::DayLight.apply_angle(); + Global::DayLight.apply_intensity(); + + ::glPopMatrix(); + ::glDepthMask( GL_TRUE ); + ::glEnable( GL_DEPTH_TEST ); + ::glEnable( GL_FOG ); + ::glEnable( GL_LIGHTING ); +} diff --git a/World.h b/World.h index 7a409460..eb5f3dde 100644 --- a/World.h +++ b/World.h @@ -14,9 +14,25 @@ http://mozilla.org/MPL/2.0/. #include "Ground.h" #include "sky.h" #include "sun.h" +#include "stars.h" #include "skydome.h" #include "mczapkie/mover.h" +// wrapper for environment elements -- sky, sun, stars, clouds etc +class world_environment { + +public: + void init(); + void update(); + void render(); + +private: + CSkyDome m_skydome; + cStars m_stars; + cSun m_sun; + TSky m_clouds; +}; + class TWorld { void InOutKey(); @@ -42,21 +58,19 @@ class TWorld std::string OutText2; std::string OutText3; std::string OutText4; - void Update_Lights(); + void Update_Environment(); void Update_Camera( const double Deltatime ); bool Render(); void Render_Cab(); void Render_UI(); TCamera Camera; TGround Ground; + world_environment Environment; TTrain *Train; TDynamicObject *pDynamicNearest; bool Paused; GLuint base; // numer DL dla znaków w napisach texture_manager::size_type light; // numer tekstury dla smugi - TSky Clouds; - CSkyDome SkyDome; - cSun Sun; TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury TMoverParameters *mvControlled; // wskaźnik na człon silnikowy, do wyświetlania jego parametrów int iCheckFPS; // kiedy znów sprawdzić FPS, żeby wyłączać optymalizacji od razu do zera @@ -72,5 +86,6 @@ class TWorld void CreateE3D(std::string const &dir = "", bool dyn = false); void CabChange(TDynamicObject *old, TDynamicObject *now); }; + //--------------------------------------------------------------------------- diff --git a/color.h b/color.h index e3e879e8..68890616 100644 --- a/color.h +++ b/color.h @@ -7,9 +7,9 @@ float3 XYZtoRGB( float3 const &XYZ ) { // M^-1 for Adobe RGB from http://www.brucelindbloom.com/Eqn_RGB_XYZ_Matrix.html -// float const mi[ 3 ][ 3 ] = { 2.041369, -0.969266, 0.0134474, -0.5649464, 1.8760108, -0.1183897, -0.3446944, 0.041556, 1.0154096 }; + float const mi[ 3 ][ 3 ] = { 2.041369, -0.969266, 0.0134474, -0.5649464, 1.8760108, -0.1183897, -0.3446944, 0.041556, 1.0154096 }; // m^-1 for sRGB: - float const mi[ 3 ][ 3 ] = { 3.240479, -0.969256, 0.055648, -1.53715, 1.875991, -0.204043, -0.49853, 0.041556, 1.057311 }; +// float const mi[ 3 ][ 3 ] = { 3.240479, -0.969256, 0.055648, -1.53715, 1.875991, -0.204043, -0.49853, 0.041556, 1.057311 }; return float3{ XYZ.x*mi[ 0 ][ 0 ] + XYZ.y*mi[ 1 ][ 0 ] + XYZ.z*mi[ 2 ][ 0 ], diff --git a/maszyna.vcxproj b/maszyna.vcxproj index be008947..3cd10c56 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -126,6 +126,7 @@ + Create Create @@ -191,6 +192,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 4b343051..e38ea0db 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -198,6 +198,9 @@ Source Files + + Source Files + @@ -386,6 +389,9 @@ Header Files + + Header Files + diff --git a/skydome.cpp b/skydome.cpp index c84113c5..cf9e7064 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -316,6 +316,7 @@ void CSkyDome::RebuildColors() { color.z = 0.75f * std::max( color.z + m_sundirection.y, 0.075f ); color.x = 0.20f * color.z; color.y = 0.65f * color.z; + color = color * ( 1.15f - vertex.y ); // simple gradient, darkening towards the top } // save diff --git a/stars.cpp b/stars.cpp new file mode 100644 index 00000000..451d6aa0 --- /dev/null +++ b/stars.cpp @@ -0,0 +1,28 @@ + +#include "stdafx.h" +#include "stars.h" +#include "globals.h" + +////////////////////////////////////////////////////////////////////////////////////////// +// cStars -- simple starfield model, simulating appearance of starry sky + +void +cStars::init() { + + m_stars.LoadFromFile( "models\\skydome_stars.t3d", false ); +} + +void +cStars::render() { + + ::glPushMatrix(); + + ::glRotatef( m_latitude, 1.0f, 0.0f, 0.0f ); // ustawienie osi OY na północ + ::glRotatef( -std::fmod( Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX + + ::glPointSize( 2.0f ); + m_stars.Render( 1.0 ); + ::glPointSize( 3.0f ); + + ::glPopMatrix(); +} \ No newline at end of file diff --git a/stars.h b/stars.h new file mode 100644 index 00000000..d5eb7989 --- /dev/null +++ b/stars.h @@ -0,0 +1,33 @@ +#pragma once + +#include "Model3d.h" + + +////////////////////////////////////////////////////////////////////////////////////////// +// cStars -- simple starfield model, simulating appearance of starry sky + +class cStars { + +public: +// types: + +// methods: + void init(); + void render(); + +// constructors: + +// deconstructor: + +// members: + +private: +// types: + +// methods: + +// members: + float m_longitude{ 19.0f }; // geograpic coordinates hardcoded roughly to Poland location, for the time being + float m_latitude{ 52.0f }; + TModel3d m_stars; +}; From fc49fc5fad081111423fb5424a19e407b0bdd0a0 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 24 Feb 2017 01:27:11 +0100 Subject: [PATCH 024/426] Revert "stars object, interrior lighting level as accessible parameter for dynamic object" This reverts commit 1b0e151fbf2c3e1c9502e688c7746c4cb2844eb1. --- DynObj.cpp | 23 +----- DynObj.h | 17 ++-- Globals.cpp | 1 - Globals.h | 1 - Model3d.cpp | 15 ++-- Train.cpp | 34 -------- World.cpp | 168 ++++++++++++++++------------------------ World.h | 23 +----- color.h | 4 +- maszyna.vcxproj | 2 - maszyna.vcxproj.filters | 6 -- skydome.cpp | 1 - stars.cpp | 28 ------- stars.h | 33 -------- 14 files changed, 90 insertions(+), 266 deletions(-) delete mode 100644 stars.cpp delete mode 100644 stars.h diff --git a/DynObj.cpp b/DynObj.cpp index 18784aeb..6e49fb7d 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3807,26 +3807,9 @@ void TDynamicObject::Render() } else { // wersja Display Lists - if( mdLowPolyInt ) { - // low poly interior - if( FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab ) { - // enable cab light if needed - if( InteriorLightLevel > 0.0f ) { - - // crude way to light the cabin, until we have something more complete in place - auto const cablight = InteriorLight * InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } - - mdLowPolyInt->Render( ObjSqrDist, ReplacableSkinID, iAlpha ); - - if( InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - } - } - } + if (mdLowPolyInt) + if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) + mdLowPolyInt->Render(ObjSqrDist, ReplacableSkinID, iAlpha); mdModel->Render(ObjSqrDist, ReplacableSkinID, iAlpha); if (mdLoad) // renderowanie nieprzezroczystego ładunku mdLoad->Render(ObjSqrDist, ReplacableSkinID, iAlpha); diff --git a/DynObj.h b/DynObj.h index 2c675cc0..bda873a7 100644 --- a/DynObj.h +++ b/DynObj.h @@ -140,10 +140,11 @@ class TAnim //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -class TDynamicObject { // klasa pojazdu -private: // położenie pojazdu w świecie oraz parametry ruchu +class TDynamicObject +{ // klasa pojazdu + private: // położenie pojazdu w świecie oraz parametry ruchu vector3 vPosition; // Ra: pozycja pojazdu liczona zaraz po przesunięciu - vector3 vCoulpler[ 2 ]; // współrzędne sprzęgów do liczenia zderzeń czołowych + vector3 vCoulpler[2]; // współrzędne sprzęgów do liczenia zderzeń czołowych vector3 vUp, vFront, vLeft; // wektory jednostkowe ustawienia pojazdu int iDirection; // kierunek pojazdu względem czoła składu (1=zgodny,0=przeciwny) TTrackShape ts; // parametry toru przekazywane do fizyki @@ -155,10 +156,10 @@ private: // położenie pojazdu w świecie oraz parametry ruchu float fAxleDist; // rozstaw wózków albo osi do liczenia proporcji zacienienia vector3 modelRot; // obrot pudła względem świata - do przeanalizowania, czy potrzebne!!! // bool bCameraNear; //blisko kamer są potrzebne dodatkowe obliczenia szczegółów - TDynamicObject * ABuFindNearestObject( TTrack *Track, TDynamicObject *MyPointer, - int &CouplNr ); + TDynamicObject * ABuFindNearestObject(TTrack *Track, TDynamicObject *MyPointer, + int &CouplNr); -public: // parametry położenia pojazdu dostępne publicznie + public: // parametry położenia pojazdu dostępne publicznie std::string asTrack; // nazwa toru początkowego; wywalić? std::string asDestination; // dokąd pojazd ma być kierowany "(stacja):(tor)" matrix4x4 mMatrix; // macierz przekształcenia do renderowania modeli @@ -174,14 +175,12 @@ public: // parametry położenia pojazdu dostępne publicznie private: // returns type of the nearest functional power source present in the trainset -public: // modele składowe pojazdu + public: // modele składowe pojazdu TModel3d *mdModel; // model pudła TModel3d *mdLoad; // model zmiennego ładunku TModel3d *mdPrzedsionek; // model przedsionków dla EZT - może użyć mdLoad zamiast? TModel3d *mdKabina; // model kabiny dla użytkownika; McZapkie-030303: to z train.h TModel3d *mdLowPolyInt; // ABu 010305: wnetrze lowpoly - float3 InteriorLight{ 0.9f * 255.0f / 255.0f, 0.9f * 216.0f / 255.0f, 0.9f * 176.0f / 255.0f }; // tungsten light. TODO: allow definition of light type? - float InteriorLightLevel{ 0.0f }; // current level of interior lighting float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) private: // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe diff --git a/Globals.cpp b/Globals.cpp index 3e68f5e7..8285f434 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -47,7 +47,6 @@ double Global::fOpenGL = 0.0; // wersja OpenGL - do sprawdzania obecności rozsz bool Global::bOpenGL_1_5 = false; // czy są dostępne funkcje OpenGL 1.5 */ double Global::fLuminance = 1.0; // jasność światła do automatycznego zapalania -float Global::SunAngle = 0.0f; int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki HWND Global::hWnd = NULL; // uchwyt okna int Global::ScreenWidth = 1; diff --git a/Globals.h b/Globals.h index c46932e1..a9ca3c85 100644 --- a/Globals.h +++ b/Globals.h @@ -258,7 +258,6 @@ class Global static bool bOpenGL_1_5; // czy są dostępne funkcje OpenGL 1.5 */ static double fLuminance; // jasność światła do automatycznego zapalania - static float SunAngle; // angle of the sun relative to horizon static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji static HWND hWnd; // uchwyt okna static int ScreenWidth; // current window dimensions. TODO: move it to renderer diff --git a/Model3d.cpp b/Model3d.cpp index 3ac52358..eb55533d 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -742,7 +742,7 @@ void TSubModel::DisplayLists() glNewList(uiDisplayList, GL_COMPILE); GfxRenderer.Bind(0); // tekstury nie ma glColorMaterial(GL_FRONT, GL_EMISSION); -// glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly + glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly glBegin(GL_POINTS); for (int i = 0; i < iNumVerts; i++) { @@ -751,7 +751,7 @@ void TSubModel::DisplayLists() glVertex3fv(&Vertices[i].Point.x); }; glEnd(); -// glEnable(GL_LIGHTING); + glEnable(GL_LIGHTING); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); glMaterialfv(GL_FRONT, GL_EMISSION, emm2); glEndList(); @@ -816,13 +816,10 @@ void TSubModel::InitialRotate(bool doit) Vertices[i].Point.y = Vertices[i].Point.z; Vertices[i].Point.z = t; // wektory normalne również trzeba przekształcić, bo się źle oświetlają - if( eType != TP_STARS ) { - // gwiazdki mają kolory zamiast normalnych, to // ich wtedy nie ruszamy - Vertices[ i ].Normal.x = -Vertices[ i ].Normal.x; // zmiana znaku X - t = Vertices[ i ].Normal.y; // zamiana Y i Z - Vertices[ i ].Normal.y = Vertices[ i ].Normal.z; - Vertices[ i ].Normal.z = t; - } + Vertices[i].Normal.x = -Vertices[i].Normal.x; // zmiana znaku X + t = Vertices[i].Normal.y; // zamiana Y i Z + Vertices[i].Normal.y = Vertices[i].Normal.z; + Vertices[i].Normal.z = t; } if (Child) Child->InitialRotate(doit); // potomne ewentualnie obrócimy diff --git a/Train.cpp b/Train.cpp index ce35b35c..66599599 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5001,40 +5001,6 @@ bool TTrain::Update( double const Deltatime ) btHaslerBrakes.Turn(DynamicObject->MoverParameters->BrakePress > 0.4); // ciśnienie w cylindrach btHaslerCurrent.Turn(DynamicObject->MoverParameters->Im != 0.0); // prąd na silnikach - // calculate current level of interior illumination - // TODO: organize it along with rest of train update in a more sensible arrangement - switch( iCabLightFlag ) // Ra: uzeleżnic od napięcia w obwodzie sterowania - { // hunter-091012: uzaleznienie jasnosci od przetwornicy - case 0: { - //światło wewnętrzne zgaszone - DynamicObject->InteriorLightLevel = 0.0f; - break; - } - case 1: { - //światło wewnętrzne przygaszone (255 216 176) - if( mvOccupied->ConverterFlag == true ) { - // jasnosc dla zalaczonej przetwornicy - DynamicObject->InteriorLightLevel = 0.75f; - } - else { - DynamicObject->InteriorLightLevel = 0.375f; - } - break; - } - case 2: { - //światło wewnętrzne zapalone (255 216 176) - if( mvOccupied->ConverterFlag == - true ) // jasnosc dla zalaczonej przetwornicy - { - DynamicObject->InteriorLightLevel = 1.0f; - } - else { - DynamicObject->InteriorLightLevel = 0.5f; - } - break; - } - } - m_updated = true; return true; //(DynamicObject->Update(dt)); } // koniec update diff --git a/World.cpp b/World.cpp index e216d765..025857b8 100644 --- a/World.cpp +++ b/World.cpp @@ -590,7 +590,8 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Ground.Init(Global::SceneryFile, hDC); // Global::tSinceStart= 0; - Environment.init(); + Sun.init(); + Clouds.Init(); WriteLog("Ground init OK"); if (Global::detonatoryOK) { @@ -1194,7 +1195,7 @@ bool TWorld::Update() Global::fClockAngleDeg[4] = 36.0 * (GlobalTime->hh % 10); // jednostki godzin Global::fClockAngleDeg[5] = 36.0 * (GlobalTime->hh / 10); // dziesiątki godzin - Update_Environment(); + Update_Lights(); } // koniec działań niewykonywanych podczas pauzy // poprzednie jakoś tam działało double dt = Timer::GetDeltaRenderTime(); // nie uwzględnia pauzowania ani mnożenia czasu @@ -1432,7 +1433,7 @@ TWorld::Update_Camera( double const Deltatime ) { } } -void TWorld::Update_Environment() { +void TWorld::Update_Lights() { #ifdef EU07_USE_OLD_LIGHTING_MODEL @@ -1531,8 +1532,44 @@ void TWorld::Update_Environment() { glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły } #else - Environment.update(); + Sun.update(); + auto const position = Sun.getPosition(); + // update skydome with current sun position + SkyDome.Update( position ); + auto const skydomecolour = SkyDome.GetAverageColor(); + auto const skydomehsv = RGBtoHSV( skydomecolour ); + // update sunlight object + Global::DayLight.position[0] = position.x; + Global::DayLight.position[1] = position.y; + Global::DayLight.position[2] = position.z; + + Global::DayLight.direction = -1.0 * Sun.getDirection(); + + auto const intensity = std::min( 0.05f + Sun.getIntensity() + skydomehsv.z, 1.25f ); + + Global::DayLight.diffuse[ 0 ] = intensity * 255.0f / 255.0f; + Global::DayLight.diffuse[ 1 ] = intensity * 242.0f / 255.0f; + Global::DayLight.diffuse[ 2 ] = intensity * 231.0f / 255.0f; +// Global::DayLight.diffuse[ 3 ] = 1.0f;// std::min( 0.15f + intensity, 1.0f ); + Global::DayLight.ambient[ 0 ] = skydomecolour.x; + Global::DayLight.ambient[ 1 ] = skydomecolour.y; + Global::DayLight.ambient[ 2 ] = skydomecolour.z; +/* + Global::DayLight.ambient[ 0 ] = 155.0 / 255.0 * intensity * 0.75f; + Global::DayLight.ambient[ 1 ] = 192.0 / 255.0 * intensity * 0.75f; + Global::DayLight.ambient[ 2 ] = 231.0 / 255.0 * intensity * 0.75f; +*/ +// Global::DayLight.ambient[ 3 ] = 1.0f; + + Global::fLuminance = intensity; + + Global::FogColor[ 0 ] = skydomecolour.x; + Global::FogColor[ 1 ] = skydomecolour.y; + Global::FogColor[ 2 ] = skydomecolour.z; + glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły #endif + + glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 1.0f ); // kolor nieba } bool TWorld::Render() @@ -1551,9 +1588,31 @@ bool TWorld::Render() glLoadIdentity(); Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii - if( !Global::bWireFrame ) { - // bez nieba w trybie rysowania linii - Environment.render(); + if( !Global::bWireFrame ) { // bez nieba w trybie rysowania linii + + glDisable( GL_LIGHTING ); + glDisable( GL_FOG ); + glDisable( GL_DEPTH_TEST ); + glDepthMask( GL_FALSE ); + glPushMatrix(); + glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); + + SkyDome.Render(); +// Clouds.Render(); + +#ifdef EU07_USE_OLD_LIGHTING_MODEL + glLightfv( GL_LIGHT0, GL_POSITION, Global::lightPos ); +#else + Sun.render(); + Global::DayLight.apply_angle(); + Global::DayLight.apply_intensity(); +#endif + + glPopMatrix(); + glDepthMask( GL_TRUE ); + glEnable( GL_DEPTH_TEST ); + glEnable( GL_FOG ); + glEnable( GL_LIGHTING ); } if (Global::bUseVBO) @@ -1700,7 +1759,7 @@ TWorld::Render_Cab() { float z = i * i * i * 0.01f;//25/4; //float C = (36 - i*0.5)*0.005*(1.5 - sqrt(ddl)); float C = ( 36 - i*0.5 )*0.005*sqrt( ( 1 / sqrt( Global::fLuminance + 0.015 ) ) - 1 ) * frontlightstrength; - glColor4f( C, C, C, 1.0f );// *frontlightstrength ); + glColor4f( C, C, C, 0.35f );// *frontlightstrength ); glTexCoord2f( 0, 0 ); glVertex3f( -10 / 2 - 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); glTexCoord2f( 1, 0 ); glVertex3f( 10 / 2 + 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); glTexCoord2f( 1, 1 ); glVertex3f( 10 / 2 + 2 * i / 4, -5.0 - 0.5*z, 13 + 1.7*z / 3 ); @@ -1821,13 +1880,6 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_AMBIENT, ambientCabLight ); glLightfv( GL_LIGHT0, GL_DIFFUSE, diffuseCabLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, specularCabLight ); -#else - if( dynamic->InteriorLightLevel > 0.0f ) { - - // crude way to light the cabin, until we have something more complete in place - auto const cablight = dynamic->InteriorLight * dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } #endif if( Global::bUseVBO ) { // renderowanie z użyciem VBO dynamic->mdKabina->RaRender( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); @@ -1843,12 +1895,6 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight ); glLightfv( GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, Global::specularDayLight ); -#else - if( dynamic->InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - } #endif } glPopMatrix(); @@ -2319,8 +2365,6 @@ TWorld::Render_UI() { " " + std::string( "S SEE NEN NWW SW" ) .substr( 1 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); - // current luminance level - OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); } // OutText3= AnsiString(" Online documentation (PL, ENG, DE, soon CZ): // http://www.eu07.pl"); @@ -3016,81 +3060,3 @@ void TWorld::CabChange(TDynamicObject *old, TDynamicObject *now) Global::changeDynObj = now; // uruchomienie protezy }; //--------------------------------------------------------------------------- - -void -world_environment::init() { - - m_sun.init(); - m_stars.init(); - m_clouds.Init(); -} - -void -world_environment::update() { - - // move sun... - m_sun.update(); - auto const position = m_sun.getPosition(); - // ...update the global data to match new sun state... - Global::SunAngle = m_sun.getAngle(); - Global::DayLight.position[ 0 ] = position.x; - Global::DayLight.position[ 1 ] = position.y; - Global::DayLight.position[ 2 ] = position.z; - Global::DayLight.direction = -1.0 * m_sun.getDirection(); - // ...update skydome to match the current sun position as well... - m_skydome.Update( position ); - // ...retrieve current sky colour and brightness... - auto const skydomecolour = m_skydome.GetAverageColor(); - auto const skydomehsv = RGBtoHSV( skydomecolour ); - auto const intensity = std::min( 0.05f + m_sun.getIntensity() + skydomehsv.z, 1.25f ); - // ...update light colours and intensity. - // NOTE: intensity combines intensity of the sun and the light reflected by the sky dome - // it'd be more technically correct to have just the intensity of the sun here, - // but whether it'd _look_ better is something to be tested - Global::DayLight.diffuse[ 0 ] = intensity * 255.0f / 255.0f; - Global::DayLight.diffuse[ 1 ] = intensity * 242.0f / 255.0f; - Global::DayLight.diffuse[ 2 ] = intensity * 231.0f / 255.0f; - - Global::DayLight.ambient[ 0 ] = skydomecolour.x; - Global::DayLight.ambient[ 1 ] = skydomecolour.y; - Global::DayLight.ambient[ 2 ] = skydomecolour.z; - - Global::fLuminance = intensity; - - // update the fog. setting it to match the average colour of the sky dome is cheap - // but quite effective way to make the distant items blend with background better - Global::FogColor[ 0 ] = skydomecolour.x; - Global::FogColor[ 1 ] = skydomecolour.y; - Global::FogColor[ 2 ] = skydomecolour.z; - ::glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły - - ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 1.0f ); // kolor nieba -} - -void -world_environment::render() { - - ::glDisable( GL_LIGHTING ); - ::glDisable( GL_FOG ); - ::glDisable( GL_DEPTH_TEST ); - ::glDepthMask( GL_FALSE ); - ::glPushMatrix(); - ::glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); - - m_skydome.Render(); - m_stars.render(); -// m_clouds.Render(); - - if( DebugModeFlag == true ) { - // mark sun position for easier debugging - m_sun.render(); - } - Global::DayLight.apply_angle(); - Global::DayLight.apply_intensity(); - - ::glPopMatrix(); - ::glDepthMask( GL_TRUE ); - ::glEnable( GL_DEPTH_TEST ); - ::glEnable( GL_FOG ); - ::glEnable( GL_LIGHTING ); -} diff --git a/World.h b/World.h index eb5f3dde..7a409460 100644 --- a/World.h +++ b/World.h @@ -14,25 +14,9 @@ http://mozilla.org/MPL/2.0/. #include "Ground.h" #include "sky.h" #include "sun.h" -#include "stars.h" #include "skydome.h" #include "mczapkie/mover.h" -// wrapper for environment elements -- sky, sun, stars, clouds etc -class world_environment { - -public: - void init(); - void update(); - void render(); - -private: - CSkyDome m_skydome; - cStars m_stars; - cSun m_sun; - TSky m_clouds; -}; - class TWorld { void InOutKey(); @@ -58,19 +42,21 @@ class TWorld std::string OutText2; std::string OutText3; std::string OutText4; - void Update_Environment(); + void Update_Lights(); void Update_Camera( const double Deltatime ); bool Render(); void Render_Cab(); void Render_UI(); TCamera Camera; TGround Ground; - world_environment Environment; TTrain *Train; TDynamicObject *pDynamicNearest; bool Paused; GLuint base; // numer DL dla znaków w napisach texture_manager::size_type light; // numer tekstury dla smugi + TSky Clouds; + CSkyDome SkyDome; + cSun Sun; TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury TMoverParameters *mvControlled; // wskaźnik na człon silnikowy, do wyświetlania jego parametrów int iCheckFPS; // kiedy znów sprawdzić FPS, żeby wyłączać optymalizacji od razu do zera @@ -86,6 +72,5 @@ class TWorld void CreateE3D(std::string const &dir = "", bool dyn = false); void CabChange(TDynamicObject *old, TDynamicObject *now); }; - //--------------------------------------------------------------------------- diff --git a/color.h b/color.h index 68890616..e3e879e8 100644 --- a/color.h +++ b/color.h @@ -7,9 +7,9 @@ float3 XYZtoRGB( float3 const &XYZ ) { // M^-1 for Adobe RGB from http://www.brucelindbloom.com/Eqn_RGB_XYZ_Matrix.html - float const mi[ 3 ][ 3 ] = { 2.041369, -0.969266, 0.0134474, -0.5649464, 1.8760108, -0.1183897, -0.3446944, 0.041556, 1.0154096 }; +// float const mi[ 3 ][ 3 ] = { 2.041369, -0.969266, 0.0134474, -0.5649464, 1.8760108, -0.1183897, -0.3446944, 0.041556, 1.0154096 }; // m^-1 for sRGB: -// float const mi[ 3 ][ 3 ] = { 3.240479, -0.969256, 0.055648, -1.53715, 1.875991, -0.204043, -0.49853, 0.041556, 1.057311 }; + float const mi[ 3 ][ 3 ] = { 3.240479, -0.969256, 0.055648, -1.53715, 1.875991, -0.204043, -0.49853, 0.041556, 1.057311 }; return float3{ XYZ.x*mi[ 0 ][ 0 ] + XYZ.y*mi[ 1 ][ 0 ] + XYZ.z*mi[ 2 ][ 0 ], diff --git a/maszyna.vcxproj b/maszyna.vcxproj index 3cd10c56..be008947 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -126,7 +126,6 @@ - Create Create @@ -192,7 +191,6 @@ - diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index e38ea0db..4b343051 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -198,9 +198,6 @@ Source Files - - Source Files - @@ -389,9 +386,6 @@ Header Files - - Header Files - diff --git a/skydome.cpp b/skydome.cpp index cf9e7064..c84113c5 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -316,7 +316,6 @@ void CSkyDome::RebuildColors() { color.z = 0.75f * std::max( color.z + m_sundirection.y, 0.075f ); color.x = 0.20f * color.z; color.y = 0.65f * color.z; - color = color * ( 1.15f - vertex.y ); // simple gradient, darkening towards the top } // save diff --git a/stars.cpp b/stars.cpp deleted file mode 100644 index 451d6aa0..00000000 --- a/stars.cpp +++ /dev/null @@ -1,28 +0,0 @@ - -#include "stdafx.h" -#include "stars.h" -#include "globals.h" - -////////////////////////////////////////////////////////////////////////////////////////// -// cStars -- simple starfield model, simulating appearance of starry sky - -void -cStars::init() { - - m_stars.LoadFromFile( "models\\skydome_stars.t3d", false ); -} - -void -cStars::render() { - - ::glPushMatrix(); - - ::glRotatef( m_latitude, 1.0f, 0.0f, 0.0f ); // ustawienie osi OY na północ - ::glRotatef( -std::fmod( Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX - - ::glPointSize( 2.0f ); - m_stars.Render( 1.0 ); - ::glPointSize( 3.0f ); - - ::glPopMatrix(); -} \ No newline at end of file diff --git a/stars.h b/stars.h deleted file mode 100644 index d5eb7989..00000000 --- a/stars.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -#include "Model3d.h" - - -////////////////////////////////////////////////////////////////////////////////////////// -// cStars -- simple starfield model, simulating appearance of starry sky - -class cStars { - -public: -// types: - -// methods: - void init(); - void render(); - -// constructors: - -// deconstructor: - -// members: - -private: -// types: - -// methods: - -// members: - float m_longitude{ 19.0f }; // geograpic coordinates hardcoded roughly to Poland location, for the time being - float m_latitude{ 52.0f }; - TModel3d m_stars; -}; From 4dcb87906fede2dd287bba8ab60eaf4c0034587e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 24 Feb 2017 01:22:06 +0100 Subject: [PATCH 025/426] stars object, interrior lighting level as accessible parameter for dynamic object --- DynObj.cpp | 23 +++++- DynObj.h | 17 ++-- Globals.cpp | 1 + Globals.h | 1 + Model3d.cpp | 15 ++-- Train.cpp | 34 ++++++++ World.cpp | 168 ++++++++++++++++++++++++---------------- World.h | 23 +++++- color.h | 4 +- maszyna.vcxproj | 2 + maszyna.vcxproj.filters | 6 ++ skydome.cpp | 10 +-- stars.cpp | 28 +++++++ stars.h | 33 ++++++++ 14 files changed, 268 insertions(+), 97 deletions(-) create mode 100644 stars.cpp create mode 100644 stars.h diff --git a/DynObj.cpp b/DynObj.cpp index 6e49fb7d..18784aeb 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3807,9 +3807,26 @@ void TDynamicObject::Render() } else { // wersja Display Lists - if (mdLowPolyInt) - if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) - mdLowPolyInt->Render(ObjSqrDist, ReplacableSkinID, iAlpha); + if( mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab ) { + // enable cab light if needed + if( InteriorLightLevel > 0.0f ) { + + // crude way to light the cabin, until we have something more complete in place + auto const cablight = InteriorLight * InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } + + mdLowPolyInt->Render( ObjSqrDist, ReplacableSkinID, iAlpha ); + + if( InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } + } + } mdModel->Render(ObjSqrDist, ReplacableSkinID, iAlpha); if (mdLoad) // renderowanie nieprzezroczystego ładunku mdLoad->Render(ObjSqrDist, ReplacableSkinID, iAlpha); diff --git a/DynObj.h b/DynObj.h index bda873a7..2c675cc0 100644 --- a/DynObj.h +++ b/DynObj.h @@ -140,11 +140,10 @@ class TAnim //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -class TDynamicObject -{ // klasa pojazdu - private: // położenie pojazdu w świecie oraz parametry ruchu +class TDynamicObject { // klasa pojazdu +private: // położenie pojazdu w świecie oraz parametry ruchu vector3 vPosition; // Ra: pozycja pojazdu liczona zaraz po przesunięciu - vector3 vCoulpler[2]; // współrzędne sprzęgów do liczenia zderzeń czołowych + vector3 vCoulpler[ 2 ]; // współrzędne sprzęgów do liczenia zderzeń czołowych vector3 vUp, vFront, vLeft; // wektory jednostkowe ustawienia pojazdu int iDirection; // kierunek pojazdu względem czoła składu (1=zgodny,0=przeciwny) TTrackShape ts; // parametry toru przekazywane do fizyki @@ -156,10 +155,10 @@ class TDynamicObject float fAxleDist; // rozstaw wózków albo osi do liczenia proporcji zacienienia vector3 modelRot; // obrot pudła względem świata - do przeanalizowania, czy potrzebne!!! // bool bCameraNear; //blisko kamer są potrzebne dodatkowe obliczenia szczegółów - TDynamicObject * ABuFindNearestObject(TTrack *Track, TDynamicObject *MyPointer, - int &CouplNr); + TDynamicObject * ABuFindNearestObject( TTrack *Track, TDynamicObject *MyPointer, + int &CouplNr ); - public: // parametry położenia pojazdu dostępne publicznie +public: // parametry położenia pojazdu dostępne publicznie std::string asTrack; // nazwa toru początkowego; wywalić? std::string asDestination; // dokąd pojazd ma być kierowany "(stacja):(tor)" matrix4x4 mMatrix; // macierz przekształcenia do renderowania modeli @@ -175,12 +174,14 @@ class TDynamicObject private: // returns type of the nearest functional power source present in the trainset - public: // modele składowe pojazdu +public: // modele składowe pojazdu TModel3d *mdModel; // model pudła TModel3d *mdLoad; // model zmiennego ładunku TModel3d *mdPrzedsionek; // model przedsionków dla EZT - może użyć mdLoad zamiast? TModel3d *mdKabina; // model kabiny dla użytkownika; McZapkie-030303: to z train.h TModel3d *mdLowPolyInt; // ABu 010305: wnetrze lowpoly + float3 InteriorLight{ 0.9f * 255.0f / 255.0f, 0.9f * 216.0f / 255.0f, 0.9f * 176.0f / 255.0f }; // tungsten light. TODO: allow definition of light type? + float InteriorLightLevel{ 0.0f }; // current level of interior lighting float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) private: // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe diff --git a/Globals.cpp b/Globals.cpp index 8285f434..3e68f5e7 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -47,6 +47,7 @@ double Global::fOpenGL = 0.0; // wersja OpenGL - do sprawdzania obecności rozsz bool Global::bOpenGL_1_5 = false; // czy są dostępne funkcje OpenGL 1.5 */ double Global::fLuminance = 1.0; // jasność światła do automatycznego zapalania +float Global::SunAngle = 0.0f; int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki HWND Global::hWnd = NULL; // uchwyt okna int Global::ScreenWidth = 1; diff --git a/Globals.h b/Globals.h index a9ca3c85..c46932e1 100644 --- a/Globals.h +++ b/Globals.h @@ -258,6 +258,7 @@ class Global static bool bOpenGL_1_5; // czy są dostępne funkcje OpenGL 1.5 */ static double fLuminance; // jasność światła do automatycznego zapalania + static float SunAngle; // angle of the sun relative to horizon static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji static HWND hWnd; // uchwyt okna static int ScreenWidth; // current window dimensions. TODO: move it to renderer diff --git a/Model3d.cpp b/Model3d.cpp index eb55533d..3ac52358 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -742,7 +742,7 @@ void TSubModel::DisplayLists() glNewList(uiDisplayList, GL_COMPILE); GfxRenderer.Bind(0); // tekstury nie ma glColorMaterial(GL_FRONT, GL_EMISSION); - glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly +// glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly glBegin(GL_POINTS); for (int i = 0; i < iNumVerts; i++) { @@ -751,7 +751,7 @@ void TSubModel::DisplayLists() glVertex3fv(&Vertices[i].Point.x); }; glEnd(); - glEnable(GL_LIGHTING); +// glEnable(GL_LIGHTING); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); glMaterialfv(GL_FRONT, GL_EMISSION, emm2); glEndList(); @@ -816,10 +816,13 @@ void TSubModel::InitialRotate(bool doit) Vertices[i].Point.y = Vertices[i].Point.z; Vertices[i].Point.z = t; // wektory normalne również trzeba przekształcić, bo się źle oświetlają - Vertices[i].Normal.x = -Vertices[i].Normal.x; // zmiana znaku X - t = Vertices[i].Normal.y; // zamiana Y i Z - Vertices[i].Normal.y = Vertices[i].Normal.z; - Vertices[i].Normal.z = t; + if( eType != TP_STARS ) { + // gwiazdki mają kolory zamiast normalnych, to // ich wtedy nie ruszamy + Vertices[ i ].Normal.x = -Vertices[ i ].Normal.x; // zmiana znaku X + t = Vertices[ i ].Normal.y; // zamiana Y i Z + Vertices[ i ].Normal.y = Vertices[ i ].Normal.z; + Vertices[ i ].Normal.z = t; + } } if (Child) Child->InitialRotate(doit); // potomne ewentualnie obrócimy diff --git a/Train.cpp b/Train.cpp index 66599599..ce35b35c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5001,6 +5001,40 @@ bool TTrain::Update( double const Deltatime ) btHaslerBrakes.Turn(DynamicObject->MoverParameters->BrakePress > 0.4); // ciśnienie w cylindrach btHaslerCurrent.Turn(DynamicObject->MoverParameters->Im != 0.0); // prąd na silnikach + // calculate current level of interior illumination + // TODO: organize it along with rest of train update in a more sensible arrangement + switch( iCabLightFlag ) // Ra: uzeleżnic od napięcia w obwodzie sterowania + { // hunter-091012: uzaleznienie jasnosci od przetwornicy + case 0: { + //światło wewnętrzne zgaszone + DynamicObject->InteriorLightLevel = 0.0f; + break; + } + case 1: { + //światło wewnętrzne przygaszone (255 216 176) + if( mvOccupied->ConverterFlag == true ) { + // jasnosc dla zalaczonej przetwornicy + DynamicObject->InteriorLightLevel = 0.75f; + } + else { + DynamicObject->InteriorLightLevel = 0.375f; + } + break; + } + case 2: { + //światło wewnętrzne zapalone (255 216 176) + if( mvOccupied->ConverterFlag == + true ) // jasnosc dla zalaczonej przetwornicy + { + DynamicObject->InteriorLightLevel = 1.0f; + } + else { + DynamicObject->InteriorLightLevel = 0.5f; + } + break; + } + } + m_updated = true; return true; //(DynamicObject->Update(dt)); } // koniec update diff --git a/World.cpp b/World.cpp index 025857b8..e216d765 100644 --- a/World.cpp +++ b/World.cpp @@ -590,8 +590,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Ground.Init(Global::SceneryFile, hDC); // Global::tSinceStart= 0; - Sun.init(); - Clouds.Init(); + Environment.init(); WriteLog("Ground init OK"); if (Global::detonatoryOK) { @@ -1195,7 +1194,7 @@ bool TWorld::Update() Global::fClockAngleDeg[4] = 36.0 * (GlobalTime->hh % 10); // jednostki godzin Global::fClockAngleDeg[5] = 36.0 * (GlobalTime->hh / 10); // dziesiątki godzin - Update_Lights(); + Update_Environment(); } // koniec działań niewykonywanych podczas pauzy // poprzednie jakoś tam działało double dt = Timer::GetDeltaRenderTime(); // nie uwzględnia pauzowania ani mnożenia czasu @@ -1433,7 +1432,7 @@ TWorld::Update_Camera( double const Deltatime ) { } } -void TWorld::Update_Lights() { +void TWorld::Update_Environment() { #ifdef EU07_USE_OLD_LIGHTING_MODEL @@ -1532,44 +1531,8 @@ void TWorld::Update_Lights() { glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły } #else - Sun.update(); - auto const position = Sun.getPosition(); - // update skydome with current sun position - SkyDome.Update( position ); - auto const skydomecolour = SkyDome.GetAverageColor(); - auto const skydomehsv = RGBtoHSV( skydomecolour ); - // update sunlight object - Global::DayLight.position[0] = position.x; - Global::DayLight.position[1] = position.y; - Global::DayLight.position[2] = position.z; - - Global::DayLight.direction = -1.0 * Sun.getDirection(); - - auto const intensity = std::min( 0.05f + Sun.getIntensity() + skydomehsv.z, 1.25f ); - - Global::DayLight.diffuse[ 0 ] = intensity * 255.0f / 255.0f; - Global::DayLight.diffuse[ 1 ] = intensity * 242.0f / 255.0f; - Global::DayLight.diffuse[ 2 ] = intensity * 231.0f / 255.0f; -// Global::DayLight.diffuse[ 3 ] = 1.0f;// std::min( 0.15f + intensity, 1.0f ); - Global::DayLight.ambient[ 0 ] = skydomecolour.x; - Global::DayLight.ambient[ 1 ] = skydomecolour.y; - Global::DayLight.ambient[ 2 ] = skydomecolour.z; -/* - Global::DayLight.ambient[ 0 ] = 155.0 / 255.0 * intensity * 0.75f; - Global::DayLight.ambient[ 1 ] = 192.0 / 255.0 * intensity * 0.75f; - Global::DayLight.ambient[ 2 ] = 231.0 / 255.0 * intensity * 0.75f; -*/ -// Global::DayLight.ambient[ 3 ] = 1.0f; - - Global::fLuminance = intensity; - - Global::FogColor[ 0 ] = skydomecolour.x; - Global::FogColor[ 1 ] = skydomecolour.y; - Global::FogColor[ 2 ] = skydomecolour.z; - glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły + Environment.update(); #endif - - glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 1.0f ); // kolor nieba } bool TWorld::Render() @@ -1588,31 +1551,9 @@ bool TWorld::Render() glLoadIdentity(); Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii - if( !Global::bWireFrame ) { // bez nieba w trybie rysowania linii - - glDisable( GL_LIGHTING ); - glDisable( GL_FOG ); - glDisable( GL_DEPTH_TEST ); - glDepthMask( GL_FALSE ); - glPushMatrix(); - glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); - - SkyDome.Render(); -// Clouds.Render(); - -#ifdef EU07_USE_OLD_LIGHTING_MODEL - glLightfv( GL_LIGHT0, GL_POSITION, Global::lightPos ); -#else - Sun.render(); - Global::DayLight.apply_angle(); - Global::DayLight.apply_intensity(); -#endif - - glPopMatrix(); - glDepthMask( GL_TRUE ); - glEnable( GL_DEPTH_TEST ); - glEnable( GL_FOG ); - glEnable( GL_LIGHTING ); + if( !Global::bWireFrame ) { + // bez nieba w trybie rysowania linii + Environment.render(); } if (Global::bUseVBO) @@ -1759,7 +1700,7 @@ TWorld::Render_Cab() { float z = i * i * i * 0.01f;//25/4; //float C = (36 - i*0.5)*0.005*(1.5 - sqrt(ddl)); float C = ( 36 - i*0.5 )*0.005*sqrt( ( 1 / sqrt( Global::fLuminance + 0.015 ) ) - 1 ) * frontlightstrength; - glColor4f( C, C, C, 0.35f );// *frontlightstrength ); + glColor4f( C, C, C, 1.0f );// *frontlightstrength ); glTexCoord2f( 0, 0 ); glVertex3f( -10 / 2 - 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); glTexCoord2f( 1, 0 ); glVertex3f( 10 / 2 + 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); glTexCoord2f( 1, 1 ); glVertex3f( 10 / 2 + 2 * i / 4, -5.0 - 0.5*z, 13 + 1.7*z / 3 ); @@ -1880,6 +1821,13 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_AMBIENT, ambientCabLight ); glLightfv( GL_LIGHT0, GL_DIFFUSE, diffuseCabLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, specularCabLight ); +#else + if( dynamic->InteriorLightLevel > 0.0f ) { + + // crude way to light the cabin, until we have something more complete in place + auto const cablight = dynamic->InteriorLight * dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } #endif if( Global::bUseVBO ) { // renderowanie z użyciem VBO dynamic->mdKabina->RaRender( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); @@ -1895,6 +1843,12 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight ); glLightfv( GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, Global::specularDayLight ); +#else + if( dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } #endif } glPopMatrix(); @@ -2365,6 +2319,8 @@ TWorld::Render_UI() { " " + std::string( "S SEE NEN NWW SW" ) .substr( 1 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); + // current luminance level + OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); } // OutText3= AnsiString(" Online documentation (PL, ENG, DE, soon CZ): // http://www.eu07.pl"); @@ -3060,3 +3016,81 @@ void TWorld::CabChange(TDynamicObject *old, TDynamicObject *now) Global::changeDynObj = now; // uruchomienie protezy }; //--------------------------------------------------------------------------- + +void +world_environment::init() { + + m_sun.init(); + m_stars.init(); + m_clouds.Init(); +} + +void +world_environment::update() { + + // move sun... + m_sun.update(); + auto const position = m_sun.getPosition(); + // ...update the global data to match new sun state... + Global::SunAngle = m_sun.getAngle(); + Global::DayLight.position[ 0 ] = position.x; + Global::DayLight.position[ 1 ] = position.y; + Global::DayLight.position[ 2 ] = position.z; + Global::DayLight.direction = -1.0 * m_sun.getDirection(); + // ...update skydome to match the current sun position as well... + m_skydome.Update( position ); + // ...retrieve current sky colour and brightness... + auto const skydomecolour = m_skydome.GetAverageColor(); + auto const skydomehsv = RGBtoHSV( skydomecolour ); + auto const intensity = std::min( 0.05f + m_sun.getIntensity() + skydomehsv.z, 1.25f ); + // ...update light colours and intensity. + // NOTE: intensity combines intensity of the sun and the light reflected by the sky dome + // it'd be more technically correct to have just the intensity of the sun here, + // but whether it'd _look_ better is something to be tested + Global::DayLight.diffuse[ 0 ] = intensity * 255.0f / 255.0f; + Global::DayLight.diffuse[ 1 ] = intensity * 242.0f / 255.0f; + Global::DayLight.diffuse[ 2 ] = intensity * 231.0f / 255.0f; + + Global::DayLight.ambient[ 0 ] = skydomecolour.x; + Global::DayLight.ambient[ 1 ] = skydomecolour.y; + Global::DayLight.ambient[ 2 ] = skydomecolour.z; + + Global::fLuminance = intensity; + + // update the fog. setting it to match the average colour of the sky dome is cheap + // but quite effective way to make the distant items blend with background better + Global::FogColor[ 0 ] = skydomecolour.x; + Global::FogColor[ 1 ] = skydomecolour.y; + Global::FogColor[ 2 ] = skydomecolour.z; + ::glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły + + ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 1.0f ); // kolor nieba +} + +void +world_environment::render() { + + ::glDisable( GL_LIGHTING ); + ::glDisable( GL_FOG ); + ::glDisable( GL_DEPTH_TEST ); + ::glDepthMask( GL_FALSE ); + ::glPushMatrix(); + ::glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); + + m_skydome.Render(); + m_stars.render(); +// m_clouds.Render(); + + if( DebugModeFlag == true ) { + // mark sun position for easier debugging + m_sun.render(); + } + Global::DayLight.apply_angle(); + Global::DayLight.apply_intensity(); + + ::glPopMatrix(); + ::glDepthMask( GL_TRUE ); + ::glEnable( GL_DEPTH_TEST ); + ::glEnable( GL_FOG ); + ::glEnable( GL_LIGHTING ); +} diff --git a/World.h b/World.h index 7a409460..eb5f3dde 100644 --- a/World.h +++ b/World.h @@ -14,9 +14,25 @@ http://mozilla.org/MPL/2.0/. #include "Ground.h" #include "sky.h" #include "sun.h" +#include "stars.h" #include "skydome.h" #include "mczapkie/mover.h" +// wrapper for environment elements -- sky, sun, stars, clouds etc +class world_environment { + +public: + void init(); + void update(); + void render(); + +private: + CSkyDome m_skydome; + cStars m_stars; + cSun m_sun; + TSky m_clouds; +}; + class TWorld { void InOutKey(); @@ -42,21 +58,19 @@ class TWorld std::string OutText2; std::string OutText3; std::string OutText4; - void Update_Lights(); + void Update_Environment(); void Update_Camera( const double Deltatime ); bool Render(); void Render_Cab(); void Render_UI(); TCamera Camera; TGround Ground; + world_environment Environment; TTrain *Train; TDynamicObject *pDynamicNearest; bool Paused; GLuint base; // numer DL dla znaków w napisach texture_manager::size_type light; // numer tekstury dla smugi - TSky Clouds; - CSkyDome SkyDome; - cSun Sun; TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury TMoverParameters *mvControlled; // wskaźnik na człon silnikowy, do wyświetlania jego parametrów int iCheckFPS; // kiedy znów sprawdzić FPS, żeby wyłączać optymalizacji od razu do zera @@ -72,5 +86,6 @@ class TWorld void CreateE3D(std::string const &dir = "", bool dyn = false); void CabChange(TDynamicObject *old, TDynamicObject *now); }; + //--------------------------------------------------------------------------- diff --git a/color.h b/color.h index e3e879e8..68890616 100644 --- a/color.h +++ b/color.h @@ -7,9 +7,9 @@ float3 XYZtoRGB( float3 const &XYZ ) { // M^-1 for Adobe RGB from http://www.brucelindbloom.com/Eqn_RGB_XYZ_Matrix.html -// float const mi[ 3 ][ 3 ] = { 2.041369, -0.969266, 0.0134474, -0.5649464, 1.8760108, -0.1183897, -0.3446944, 0.041556, 1.0154096 }; + float const mi[ 3 ][ 3 ] = { 2.041369, -0.969266, 0.0134474, -0.5649464, 1.8760108, -0.1183897, -0.3446944, 0.041556, 1.0154096 }; // m^-1 for sRGB: - float const mi[ 3 ][ 3 ] = { 3.240479, -0.969256, 0.055648, -1.53715, 1.875991, -0.204043, -0.49853, 0.041556, 1.057311 }; +// float const mi[ 3 ][ 3 ] = { 3.240479, -0.969256, 0.055648, -1.53715, 1.875991, -0.204043, -0.49853, 0.041556, 1.057311 }; return float3{ XYZ.x*mi[ 0 ][ 0 ] + XYZ.y*mi[ 1 ][ 0 ] + XYZ.z*mi[ 2 ][ 0 ], diff --git a/maszyna.vcxproj b/maszyna.vcxproj index be008947..3cd10c56 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -126,6 +126,7 @@ + Create Create @@ -191,6 +192,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 4b343051..e38ea0db 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -198,6 +198,9 @@ Source Files + + Source Files + @@ -386,6 +389,9 @@ Header Files + + Header Files + diff --git a/skydome.cpp b/skydome.cpp index c84113c5..34c0d96f 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -1,16 +1,11 @@ -//******************************************************************************// -// NightShine Engine // -// Sky : Gradient SkyDome Class // -//******************************************************************************// -// sky gradient based on "A practical analytic model for daylight" -// by A. J. Preetham Peter Shirley Brian Smits (University of Utah) #include "stdafx.h" #include "opengl/glew.h" #include "skydome.h" #include "color.h" -//******************************************************************************// +// sky gradient based on "A practical analytic model for daylight" +// by A. J. Preetham Peter Shirley Brian Smits (University of Utah) float CSkyDome::m_distributionluminance[ 5 ][ 2 ] = { // Perez distributions { 0.17872f , -1.46303f }, // a = darkening or brightening of the horizon @@ -316,6 +311,7 @@ void CSkyDome::RebuildColors() { color.z = 0.75f * std::max( color.z + m_sundirection.y, 0.075f ); color.x = 0.20f * color.z; color.y = 0.65f * color.z; + color = color * ( 1.15f - vertex.y ); // simple gradient, darkening towards the top } // save diff --git a/stars.cpp b/stars.cpp new file mode 100644 index 00000000..451d6aa0 --- /dev/null +++ b/stars.cpp @@ -0,0 +1,28 @@ + +#include "stdafx.h" +#include "stars.h" +#include "globals.h" + +////////////////////////////////////////////////////////////////////////////////////////// +// cStars -- simple starfield model, simulating appearance of starry sky + +void +cStars::init() { + + m_stars.LoadFromFile( "models\\skydome_stars.t3d", false ); +} + +void +cStars::render() { + + ::glPushMatrix(); + + ::glRotatef( m_latitude, 1.0f, 0.0f, 0.0f ); // ustawienie osi OY na północ + ::glRotatef( -std::fmod( Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX + + ::glPointSize( 2.0f ); + m_stars.Render( 1.0 ); + ::glPointSize( 3.0f ); + + ::glPopMatrix(); +} \ No newline at end of file diff --git a/stars.h b/stars.h new file mode 100644 index 00000000..d5eb7989 --- /dev/null +++ b/stars.h @@ -0,0 +1,33 @@ +#pragma once + +#include "Model3d.h" + + +////////////////////////////////////////////////////////////////////////////////////////// +// cStars -- simple starfield model, simulating appearance of starry sky + +class cStars { + +public: +// types: + +// methods: + void init(); + void render(); + +// constructors: + +// deconstructor: + +// members: + +private: +// types: + +// methods: + +// members: + float m_longitude{ 19.0f }; // geograpic coordinates hardcoded roughly to Poland location, for the time being + float m_latitude{ 52.0f }; + TModel3d m_stars; +}; From 493340e6027118c08af8ec440ac21d08d934b4cf Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 25 Feb 2017 21:02:27 +0100 Subject: [PATCH 026/426] working vehicle spotlights --- EU07.cpp | 6 + Globals.cpp | 2 + Globals.h | 4 + Model3d.cpp | 3 +- Segment.cpp | 95 +++++++++++++ World.cpp | 399 +++++++++++++++++++++++++++++----------------------- World.h | 1 + dumb3d.h | 5 + renderer.h | 12 +- sky.cpp | 2 +- sun.cpp | 8 +- 11 files changed, 353 insertions(+), 184 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index b02ef876..4265784f 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -511,6 +511,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, // handle for this window if (DebugModeFlag) { // siatki wyświetlane tyko w trybie testowym Global::bWireFrame = !Global::bWireFrame; + if( true == Global::bWireFrame ) { + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + } + else { + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + } ++Global::iReCompile; // odświeżyć siatki // Ra: jeszcze usunąć siatki ze skompilowanych obiektów! } diff --git a/Globals.cpp b/Globals.cpp index 3e68f5e7..996b6936 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -104,6 +104,8 @@ GLfloat Global::diffuseLight[] = {0.85f, 0.85f, 0.80f, 1.0f}; GLfloat Global::specularLight[] = {0.95f, 0.94f, 0.90f, 1.0f}; #else opengl_light Global::DayLight; +opengl_light Global::VehicleLight; +opengl_light Global::VehicleLightRear; #endif GLfloat Global::whiteLight[] = {1.00f, 1.00f, 1.00f, 1.0f}; GLfloat Global::noLight[] = {0.00f, 0.00f, 0.00f, 1.0f}; diff --git a/Globals.h b/Globals.h index c46932e1..f2b1650b 100644 --- a/Globals.h +++ b/Globals.h @@ -231,7 +231,11 @@ class Global static GLfloat diffuseLight[]; static GLfloat specularLight[]; #else + // TODO: put these things in the renderer static opengl_light DayLight; + // TODO: possibly create a pool of few lights which can be attached to nearby vehicles + static opengl_light VehicleLight; + static opengl_light VehicleLightRear; #endif static GLfloat whiteLight[]; static GLfloat noLight[]; diff --git a/Model3d.cpp b/Model3d.cpp index 3ac52358..994862b5 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -278,7 +278,8 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) if (dynamic) { // dla pojazdu, blokujemy załączone submodele, które mogą być // nieobsługiwane - if (token.find("_on") + 3 == token.length()) // jeśli nazwa kończy się na "_on" + if ( (token.size() >= 3) + && (token.find("_on") + 3 == token.length())) // jeśli nazwa kończy się na "_on" iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z obiektem "_off" } else // dla pozostałych modeli blokujemy zapalone światła, które mogą być diff --git a/Segment.cpp b/Segment.cpp index 21f66a41..9ed6dbfe 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -21,6 +21,11 @@ http://mozilla.org/MPL/2.0/. // 101206 Ra: trapezoidalne drogi // 110806 Ra: odwrócone mapowanie wzdłuż - Point1 == 1.0 +float Interpolate( float const First, float const Second, float const Factor ) { + + return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); +} + std::string Where(vector3 p) { // zamiana współrzędnych na tekst, używana w błędach return std::to_string(p.x) + " " + std::to_string(p.y) + " " + std::to_string(p.z); @@ -116,7 +121,11 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI fStoop = atan2((Point2.y - Point1.y), fLength); // pochylenie toru prostego, żeby nie liczyć wielokrotnie SafeDeleteArray(fTsBuffer); +/* if ((bCurve) && (fStep > 0)) +*/ + // we're enforcing sub-division of even straight track, to have dense enough mesh for the spotlight to work with + if( fStep > 0 ) { // Ra: prosty dostanie podział, jak ma różną przechyłkę na końcach double s = 0; int i = 0; @@ -454,6 +463,7 @@ void TSegment::RenderLoft(const vector6 *ShapePoints, int iNumShapePoints, doubl } } else +#ifdef EU07_USE_OLD_LIGHTING_MODEL { // gdy prosty, nie modyfikujemy wektora kierunkowego i poprzecznego pos1 = FastGetPoint((fStep * iSkip) / fLength); pos2 = FastGetPoint_1(); @@ -498,6 +508,91 @@ void TSegment::RenderLoft(const vector6 *ShapePoints, int iNumShapePoints, doubl } glEnd(); } +#else +{ + Math3D::vector3 const pos0 = FastGetPoint( ( fStep * iSkip ) / fLength ); + Math3D::vector3 const pos1 = FastGetPoint_1(); + dir = GetDirection(); + Math3D::vector3 const parallel = Normalize( vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny + + Math3D::vector3 startnormal0, startnormal1, endnormal0, endnormal1; + Math3D::vector3 startvertex0, startvertex1, endvertex0, endvertex1; + float startuv0, startuv1, enduv0, enduv1; + + for( j = 0; j < iNumShapePoints - 1; ++j ) { + + startnormal0 = ShapePoints[ j ].n.x * parallel; + startnormal0.y += ShapePoints[ j ].n.y; + startvertex0 = parallel * ShapePoints[ j ].x + pos0; + startvertex0.y += ShapePoints[ j ].y; + startuv0 = ShapePoints[ j ].z; + startnormal1 = ShapePoints[ j + 1 ].n.x * parallel; + startnormal1.y += ShapePoints[ j + 1 ].n.y; + startvertex1 = parallel * ShapePoints[ j + 1 ].x + pos0; + startvertex1.y += ShapePoints[ j + 1 ].y; + startuv1 = ShapePoints[ j + 1 ].z; + + if( trapez == false ) { + // single profile throughout + endnormal0 = startnormal0; + endvertex0 = startvertex0 + ( pos1 - pos0 ); + enduv0 = startuv0; + endnormal1 = startnormal1; + endvertex1 = startvertex1 + ( pos1 - pos0 ); + enduv1 = startuv1; + } + else { + // end profile is different + endnormal0 = ShapePoints[ j + iNumShapePoints ].n.x * parallel; + endnormal0.y += ShapePoints[ j + iNumShapePoints ].n.y; + endvertex0 = parallel * ShapePoints[ j + iNumShapePoints ].x + pos1; // odsunięcie + endvertex0.y += ShapePoints[ j + iNumShapePoints ].y; // wysokość + enduv0 = ShapePoints[ j + iNumShapePoints ].z; + endnormal1 = ShapePoints[ j + iNumShapePoints + 1 ].n.x * parallel; + endnormal1.y += ShapePoints[ j + iNumShapePoints + 1 ].n.y; + endvertex1 = parallel * ShapePoints[ j + iNumShapePoints + 1 ].x + pos1; // odsunięcie + endvertex1.y += ShapePoints[ j + iNumShapePoints + 1 ].y; // wysokość + enduv1 = ShapePoints[ j + iNumShapePoints + 1 ].z; + } + // now build strips, lerping from start to endpoint + step = 10.0; // arbitrary segment size for straights + float s = 0.0, + t = 0.0, + uv = 0.0; + glBegin( GL_TRIANGLE_STRIP ); + while( s < fLength ) { + + t = s / fLength; + uv = s / fTextureLength; + + auto const normal1lerp = Interpolate( startnormal1, endnormal1, t ); + glNormal3dv( &normal1lerp.x ); + auto const uv1lerp = Interpolate( startuv1, enduv1, t ); + glTexCoord2f( uv1lerp, uv ); + auto const vertex1lerp = Interpolate( startvertex1, endvertex1, t ); + glVertex3dv( &vertex1lerp.x ); + + auto const normal0lerp = Interpolate( startnormal0, endnormal0, t ); + glNormal3dv( &normal0lerp.x ); + auto const uv0lerp = Interpolate( startuv0, enduv0, t ); + glTexCoord2f( uv0lerp, uv ); + auto const vertex0lerp = Interpolate( startvertex0, endvertex0, t ); + glVertex3dv( &vertex0lerp.x ); + + s += step; + } + // add ending vertex pair if needed + glNormal3dv( &endnormal1.x ); + glTexCoord2f( enduv1, fLength / fTextureLength ); + glVertex3dv( &endvertex1.x ); + glNormal3dv( &endnormal0.x ); + glTexCoord2f( enduv0, fLength / fTextureLength ); + glVertex3dv( &endvertex0.x ); + + glEnd(); + } +} +#endif }; void TSegment::RenderSwitchRail(const vector6 *ShapePoints1, const vector6 *ShapePoints2, diff --git a/World.cpp b/World.cpp index e216d765..9839e026 100644 --- a/World.cpp +++ b/World.cpp @@ -264,89 +264,34 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Max texture size: " + std::to_string(Global::iMaxTextureSize)); } /*-----------------------Render Initialization----------------------*/ - if (Global::fOpenGL >= 1.2) // poniższe nie działa w 1.1 - glTexEnvf(TEXTURE_FILTER_CONTROL_EXT, TEXTURE_LOD_BIAS_EXT, -1); - GLfloat FogColor[] = {1.0f, 1.0f, 1.0f, 1.0f}; - glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear screen and depth buffer + glMatrixMode( GL_PROJECTION ); + glLoadIdentity(); + glMatrixMode( GL_MODELVIEW ); glLoadIdentity(); - // WriteLog("glClearColor (FogColor[0], FogColor[1], FogColor[2], 0.0); "); - // glClearColor (1.0, 0.0, 0.0, 0.0); // Background Color - // glClearColor (FogColor[0], FogColor[1], FogColor[2], 0.0); - // Background // Color - glClearColor(Global::Background[0], Global::Background[1], Global::Background[2], 1.0); // Background Color - WriteLog("glFogfv(GL_FOG_COLOR, FogColor);"); - glFogfv(GL_FOG_COLOR, FogColor); // Set Fog Color + glClearDepth( 1.0f ); // ZBuffer Value + glClearColor( 51.0f / 255.0f, 106.0f / 255.0f, 85.0f / 255.0f, 1.0f ); // Background Color + glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); // Clear screen and depth buffer - WriteLog("glClearDepth(1.0f); "); - glClearDepth(1.0f); // ZBuffer Value - - // glEnable(GL_NORMALIZE); - // glEnable(GL_RESCALE_NORMAL); - - // glEnable(GL_CULL_FACE); - WriteLog("glEnable(GL_TEXTURE_2D);"); glEnable(GL_TEXTURE_2D); // Enable Texture Mapping - WriteLog("glShadeModel(GL_SMOOTH);"); glShadeModel(GL_SMOOTH); // Enable Smooth Shading - WriteLog("glEnable(GL_DEPTH_TEST);"); glEnable(GL_DEPTH_TEST); // McZapkie:261102-uruchomienie polprzezroczystosci (na razie linie) pod kierunkiem Marcina // if (Global::bRenderAlpha) //Ra: wywalam tę flagę { - WriteLog("glEnable(GL_BLEND);"); glEnable(GL_BLEND); - WriteLog("glEnable(GL_ALPHA_TEST);"); glEnable(GL_ALPHA_TEST); - WriteLog("glAlphaFunc(GL_GREATER,0.04);"); glAlphaFunc(GL_GREATER, 0.04); - WriteLog("glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);"); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - WriteLog("glDepthFunc(GL_LEQUAL);"); glDepthFunc(GL_LEQUAL); } - /* - else - { - WriteLog("glEnable(GL_ALPHA_TEST);"); - glEnable(GL_ALPHA_TEST); - WriteLog("glAlphaFunc(GL_GREATER,0.5);"); - glAlphaFunc(GL_GREATER,0.5); - WriteLog("glDepthFunc(GL_LEQUAL);"); - glDepthFunc(GL_LEQUAL); - WriteLog("glDisable(GL_BLEND);"); - glDisable(GL_BLEND); - } - */ - /* zakomentowanie to co bylo kiedys mieszane - WriteLog("glEnable(GL_ALPHA_TEST);"); - glEnable(GL_ALPHA_TEST);//glGetIntegerv() - WriteLog("glAlphaFunc(GL_GREATER,0.5);"); - // glAlphaFunc(GL_LESS,0.5); - glAlphaFunc(GL_GREATER,0.5); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE); - WriteLog("glDepthFunc(GL_LEQUAL);"); - glDepthFunc(GL_LEQUAL);//EQUAL); - // The Type Of Depth Testing To Do - // glEnable(GL_BLEND); - // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - */ - WriteLog("glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);"); glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // Really Nice Perspective Calculations - - WriteLog("glPolygonMode(GL_FRONT, GL_FILL);"); glPolygonMode(GL_FRONT, GL_FILL); - WriteLog("glFrontFace(GL_CCW);"); glFrontFace(GL_CCW); // Counter clock-wise polygons face out - WriteLog("glEnable(GL_CULL_FACE); "); glEnable(GL_CULL_FACE); // Cull back-facing triangles - WriteLog("glLineWidth(1.0f);"); glLineWidth(1.0f); - // glLineWidth(2.0f); - WriteLog("glPointSize(3.0f);"); glPointSize(3.0f); #ifdef EU07_USE_OLD_LIGHTING_MODEL // ----------- LIGHTING SETUP ----------- @@ -378,39 +323,18 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glEnable(GL_LIGHT0); #endif // glColor() ma zmieniać kolor wybrany w glColorMaterial() - WriteLog("glEnable(GL_COLOR_MATERIAL);"); glEnable(GL_COLOR_MATERIAL); - WriteLog("glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE);"); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); + glColor4fv(Global::whiteLight); - // WriteLog("glMaterialfv( GL_FRONT, GL_AMBIENT, whiteLight );"); - // glMaterialfv( GL_FRONT, GL_AMBIENT, Global::whiteLight ); - - WriteLog("glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, whiteLight );"); - glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, Global::whiteLight); - - /* - WriteLog("glMaterialfv( GL_FRONT, GL_SPECULAR, noLight );"); - glMaterialfv( GL_FRONT, GL_SPECULAR, Global::noLight ); - */ - - WriteLog("glEnable(GL_LIGHTING);"); glEnable(GL_LIGHTING); - WriteLog("glFogi(GL_FOG_MODE, GL_LINEAR);"); glFogi(GL_FOG_MODE, GL_LINEAR); // Fog Mode - WriteLog("glFogfv(GL_FOG_COLOR, FogColor);"); + GLfloat FogColor[] = { 1.0f, 1.0f, 1.0f, 1.0f }; glFogfv(GL_FOG_COLOR, FogColor); // Set Fog Color - // glFogf(GL_FOG_DENSITY, 0.594f); // How Dense Will The - //Fog - // Be - // glHint(GL_FOG_HINT, GL_NICEST); // Fog Hint Value - WriteLog("glFogf(GL_FOG_START, 1000.0f);"); glFogf(GL_FOG_START, 10.0f); // Fog Start Depth - WriteLog("glFogf(GL_FOG_END, 2000.0f);"); glFogf(GL_FOG_END, 200.0f); // Fog End Depth - WriteLog("glEnable(GL_FOG);"); glEnable(GL_FOG); // Enables GL_FOG // Ra: ustawienia testowe @@ -480,7 +404,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glLoadIdentity(); // glColor4f(0.3f,0.0f,0.0f,0.0f); - glTranslatef(0.0f, 0.0f, -0.50f); +// glTranslatef(0.0f, 0.0f, -0.50f); // glRasterPos2f(-0.25f, -0.10f); #ifdef EU07_USE_OLD_LIGHTING_MODEL glColor3f( 3.0f, 3.0f, 3.0f ); @@ -491,23 +415,25 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) auto logo = GfxRenderer.GetTextureId( "logo", szTexturePath, 6 ); GfxRenderer.Bind(logo); // Select our texture + float const widthratio = ( 4.0f / 3.0f ) / ( (float)Global::iWindowWidth / Global::iWindowHeight ); + glBegin(GL_QUADS); // Drawing using triangles glTexCoord2f(0.0f, 0.0f); - glVertex3f(-1.0f, -1.0f, 0.0f); // bottom left of the texture and quad + glVertex2f( -widthratio, -1.0f ); // bottom left of the texture and quad glTexCoord2f(1.0f, 0.0f); - glVertex3f(1.0f, -1.0f, 0.0f); // bottom right of the texture and quad + glVertex2f(widthratio, -1.0f); // bottom right of the texture and quad glTexCoord2f(1.0f, 1.0f); - glVertex3f(1.0f, 1.0f, 0.0f); // top right of the texture and quad + glVertex2f(widthratio, 1.0f); // top right of the texture and quad glTexCoord2f(0.0f, 1.0f); - glVertex3f(-1.0f, 1.0f, 0.0f); // top left of the texture and quad + glVertex2f( -widthratio, 1.0f ); // top left of the texture and quad glEnd(); //~logo; Ra: to jest bez sensu zapis glColor3f(0.0f, 0.0f, 1.0f); if (Global::detonatoryOK) { - glRasterPos2f(-0.85f, -0.25f); + glRasterPos2f(-0.85f * widthratio, -0.25f); glPrint("Uruchamianie / Initializing..."); - glRasterPos2f(-0.85f, -0.30f); + glRasterPos2f(-0.85f * widthratio, -0.30f); glPrint("Dzwiek / Sound..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -519,7 +445,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Sound Init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.30f); + glRasterPos2f(-0.25f * widthratio, -0.30f); glPrint("OK."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -530,7 +456,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Textures init"); if (Global::detonatoryOK) { - glRasterPos2f(-0.85f, -0.35f); + glRasterPos2f(-0.85f * widthratio, -0.35f); glPrint("Tekstury / Textures..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -540,7 +466,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Textures init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.35f); + glRasterPos2f( -0.25f * widthratio, -0.35f ); glPrint("OK."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -548,7 +474,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Models init"); if (Global::detonatoryOK) { - glRasterPos2f(-0.85f, -0.40f); + glRasterPos2f( -0.85f * widthratio, -0.40f ); glPrint("Modele / Models..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -558,7 +484,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Models init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.40f); + glRasterPos2f( -0.25f * widthratio, -0.40f ); glPrint("OK."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -566,7 +492,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Ground init"); if (Global::detonatoryOK) { - glRasterPos2f(-0.85f, -0.45f); + glRasterPos2f( -0.85f * widthratio, -0.45f ); glPrint("Sceneria / Scenery (please wait)..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -586,6 +512,25 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Global::DayLight.diffuse[ 0 ] = 255.0 / 255.0; Global::DayLight.diffuse[ 1 ] = 242.0 / 255.0; Global::DayLight.diffuse[ 2 ] = 231.0 / 255.0; + + Global::VehicleLight.id = opengl_renderer::vehiclelight; + // directional light + Global::VehicleLight.position[ 3 ] = 1.0f; + ::glLightf( opengl_renderer::vehiclelight, GL_SPOT_CUTOFF, 20.0f ); + ::glLightf( opengl_renderer::vehiclelight, GL_SPOT_EXPONENT, 10.0f ); + ::glLightf( opengl_renderer::vehiclelight, GL_CONSTANT_ATTENUATION, 0.0f ); + ::glLightf( opengl_renderer::vehiclelight, GL_LINEAR_ATTENUATION, 0.035f ); + // halogen light. TODO: allow light type definition + Global::VehicleLight.diffuse[ 0 ] = 255.0 / 255.0; + Global::VehicleLight.diffuse[ 1 ] = 241.0 / 255.0; + Global::VehicleLight.diffuse[ 2 ] = 224.0 / 255.0; + // rear light + Global::VehicleLightRear = Global::VehicleLight; + Global::VehicleLightRear.id = opengl_renderer::vehiclelightrear; + ::glLightf( opengl_renderer::vehiclelightrear, GL_SPOT_CUTOFF, 20.0f ); + ::glLightf( opengl_renderer::vehiclelightrear, GL_SPOT_EXPONENT, 10.0f ); + ::glLightf( opengl_renderer::vehiclelightrear, GL_CONSTANT_ATTENUATION, 0.0f ); + ::glLightf( opengl_renderer::vehiclelightrear, GL_LINEAR_ATTENUATION, 0.035f ); #endif Ground.Init(Global::SceneryFile, hDC); @@ -594,7 +539,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Ground init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.45f); + glRasterPos2f( -0.25f * widthratio, -0.45f ); glPrint("OK."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -611,7 +556,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) char buff[255] = "Player train init: "; if (Global::detonatoryOK) { - glRasterPos2f(-0.85f, -0.50f); + glRasterPos2f( -0.85f * widthratio, -0.50f ); glPrint("Przygotowanie kabiny do sterowania..."); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -632,7 +577,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog("Player train init OK"); if (Global::detonatoryOK) { - glRasterPos2f(-0.25f, -0.50f); + glRasterPos2f( -0.25f * widthratio, -0.50f ); glPrint("OK."); } FollowView(); @@ -644,7 +589,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie if (Global::detonatoryOK) { - glRasterPos2f(-0.85f, -0.50f); + glRasterPos2f( -0.85f * widthratio, -0.50f ); glPrint("Blad inicjalizacji sterowanego pojazdu!"); } SwapBuffers(hDC); // Swap Buffers (Double Buffering) @@ -660,7 +605,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Error("Player train not exist!"); if (Global::detonatoryOK) { - glRasterPos2f(-0.85f, -0.55f); + glRasterPos2f( -0.85f * widthratio, -0.55f ); glPrint("Wybrany pojazd nie istnieje w scenerii!"); } } @@ -790,59 +735,97 @@ void TWorld::OnKeyDown(int cKey) } else if ((cKey >= VK_F1) ? (cKey <= VK_F12) : false) { - switch (cKey) - { - case VK_F1: // czas i relacja - case VK_F3: - case VK_F5: // przesiadka do innego pojazdu - case VK_F8: // FPS - case VK_F9: // wersja, typ wyświetlania, błędy OpenGL - case VK_F10: - if (Global::iTextMode == cKey) - Global::iTextMode = - (Global::iPause && (cKey != VK_F1) ? VK_F1 : - 0); // wyłączenie napisów, chyba że pauza - else - Global::iTextMode = cKey; - break; - case VK_F2: // parametry pojazdu - if (Global::iTextMode == cKey) // jeśli kolejne naciśnięcie - ++Global::iScreenMode[cKey - VK_F1]; // kolejny ekran - else - { // pierwsze naciśnięcie daje pierwszy (tzn. zerowy) ekran - Global::iTextMode = cKey; - Global::iScreenMode[cKey - VK_F1] = 0; - } - break; - case VK_F12: // coś tam jeszcze - if (Console::Pressed(VK_CONTROL) && Console::Pressed(VK_SHIFT)) - DebugModeFlag = !DebugModeFlag; // taka opcjonalna funkcja, może się czasem przydać - /* //Ra 2F1P: teraz włączanie i wyłączanie klawiszami cyfrowymi po użyciu [F12] - else if (Console::Pressed(VK_SHIFT)) - {//odpalenie logu w razie "W" - if ((Global::iWriteLogEnabled&2)==0) //nie było okienka - {//otwarcie okna - AllocConsole(); - SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE),FOREGROUND_GREEN); - } - Global::iWriteLogEnabled|=3; - } */ - else - Global::iTextMode = cKey; - break; - case VK_F4: - InOutKey(); - break; - case VK_F6: - if (DebugModeFlag) - { // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! - // Global::iViewMode=VK_F6; - if (Console::Pressed(VK_CONTROL)) - Global::fTimeSpeed = (Console::Pressed(VK_SHIFT) ? 10.0 : 5.0); + switch (cKey) { + + case VK_F1: { + // czas i relacja + if( Global::iTextMode == cKey ) + Global::iTextMode = + ( Global::iPause && ( cKey != VK_F1 ) ? + VK_F1 : + 0 ); // wyłączenie napisów, chyba że pauza else - Global::fTimeSpeed = (Console::Pressed(VK_SHIFT) ? 2.0 : 1.0); + Global::iTextMode = cKey; + // advance world clock in debug mode + if( DebugModeFlag ) { + if( Console::Pressed( VK_CONTROL ) ) { + // ctrl-f3 + GlobalTime->UpdateMTableTime( 20.0 * 60.0 ); + } + else if( Console::Pressed( VK_SHIFT ) ) { + // shift-f3 + GlobalTime->UpdateMTableTime( 5.0 * 60.0 ); + } + } + break; + } + case VK_F2: { + // parametry pojazdu + if( Global::iTextMode == cKey ) { + // jeśli kolejne naciśnięcie + ++Global::iScreenMode[ cKey - VK_F1 ]; // kolejny ekran + } + else { + // pierwsze naciśnięcie daje pierwszy (tzn. zerowy) ekran + Global::iTextMode = cKey; + Global::iScreenMode[ cKey - VK_F1 ] = 0; + } + break; + } + case VK_F3: { + Global::iTextMode = cKey; + break; + } + case VK_F4: { + InOutKey(); + break; + } + case VK_F5: { + // przesiadka do innego pojazdu + Global::iTextMode = cKey; + break; + } + case VK_F6: { + Global::iTextMode = cKey; + // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! + if( DebugModeFlag ) { + + if( Console::Pressed( VK_CONTROL ) ) { Global::fTimeSpeed = ( Console::Pressed( VK_SHIFT ) ? 60.0 : 20.0 ); } + else { Global::fTimeSpeed = ( Console::Pressed( VK_SHIFT ) ? 5.0 : 1.0 ); } + } + break; + } + case VK_F8: { + Global::iTextMode = cKey; + // FPS + break; + } + case VK_F9: { + Global::iTextMode = cKey; + // wersja, typ wyświetlania, błędy OpenGL + break; + } + case VK_F10: { + if( Global::iTextMode == cKey ) { + Global::iTextMode = + ( Global::iPause && ( cKey != VK_F1 ) ? + VK_F1 : + 0 ); // wyłączenie napisów, chyba że pauza + } + else { + Global::iTextMode = cKey; + } + break; + } + case VK_F12: { + // coś tam jeszcze + if( Console::Pressed( VK_CONTROL ) + && Console::Pressed( VK_SHIFT ) ) + DebugModeFlag = !DebugModeFlag; // taka opcjonalna funkcja, może się czasem przydać + else + Global::iTextMode = cKey; + break; } - break; } // if (cKey!=VK_F4) return; // nie są przekazywane do pojazdu wcale @@ -1181,7 +1164,8 @@ bool TWorld::Update() iCheckFPS = 0.25 * Timer::GetFPS(); // tak za 0.25 sekundy sprawdzić ponownie (jeszcze przycina?) } Timer::UpdateTimers(Global::iPause); - if (!Global::iPause) + if( (Global::iPause == false) + || (m_init == false) ) { // jak pauza, to nie ma po co tego przeliczać GlobalTime->UpdateMTableTime(Timer::GetDeltaTime()); // McZapkie-300302: czas rozkladowy // Ra 2014-07: przeliczenie kąta czasu (do animacji zależnych od czasu) @@ -1278,13 +1262,24 @@ bool TWorld::Update() // przy 0.25 smuga gaśnie o 6:37 w Quarku, a mogłaby już 5:40 // Ra 2014-12: przy 0.15 się skarżyli, że nie widać smug => zmieniłem na 0.25 // changed light activation threshold to 0.5, paired with strength reduction in daylight - if (Train) // jeśli nie usunięty + if( Train ) { + // jeśli nie usunięty Global::bSmudge = ( FreeFlyModeFlag ? false : ( Train->Dynamic()->fShade <= 0.0 ? - (Global::fLuminance <= 0.5) : - (Train->Dynamic()->fShade * Global::fLuminance <= 0.5) ) ); + ( Global::fLuminance <= 0.5 ) : + ( Train->Dynamic()->fShade * Global::fLuminance <= 0.5 ) ) ); + + // match the vehicle light position with new position of the vehicle + Global::VehicleLight.set_position( Train->Dynamic()->GetPosition() + ( Train->Dynamic()->VectorFront() * Train->Dynamic()->GetLength() * 0.45 ) ); + Global::VehicleLight.direction = Train->Dynamic()->VectorFront(); + Global::VehicleLightRear.set_position( Train->Dynamic()->GetPosition() - ( Train->Dynamic()->VectorFront() * Train->Dynamic()->GetLength() * 0.45 ) ); + Global::VehicleLightRear.direction = Train->Dynamic()->VectorFront(); + Global::VehicleLightRear.direction.RotateY( M_PI ); + } + + m_init = true; if (!Render()) return false; @@ -1556,6 +1551,51 @@ bool TWorld::Render() Environment.render(); } + // enable vehicle light, if it's present and on + if( nullptr != Train ) { + + auto const &frontlights = Train->Controlled()->iLights[ 0 ]; + int const frontlightcount = 0 + + ( ( frontlights & 1 ) ? 1 : 0 ) + + ( ( frontlights & 4 ) ? 1 : 0 ) + + ( ( frontlights & 16 ) ? 1 : 0 ); + + if( frontlightcount > 0 ) { + // halogen light. TODO: allow light type definition + Global::VehicleLight.ambient[ 0 ] = 0.15f * 255.0 * frontlightcount / 255.0; + Global::VehicleLight.ambient[ 1 ] = 0.15f * 241.0 * frontlightcount / 255.0; + Global::VehicleLight.ambient[ 2 ] = 0.15f * 224.0 * frontlightcount / 255.0; + + ::glLightf( opengl_renderer::vehiclelight, GL_LINEAR_ATTENUATION, 0.3f / pow(frontlightcount, 2) ); + glEnable( GfxRenderer.vehiclelight ); + Global::VehicleLight.apply_intensity(); + Global::VehicleLight.apply_angle(); + } + else { + glDisable( GfxRenderer.vehiclelight ); + } + auto const &rearlights = Train->Controlled()->iLights[ 1 ]; + int const rearlightcount = 0 + + ( ( rearlights & 1 ) ? 1 : 0 ) + + ( ( rearlights & 4 ) ? 1 : 0 ) + + ( ( rearlights & 16 ) ? 1 : 0 ); + + if( rearlightcount > 0 ) { + // halogen light. TODO: allow light type definition + Global::VehicleLightRear.ambient[ 0 ] = 0.15f * 255.0 * rearlightcount / 255.0; + Global::VehicleLightRear.ambient[ 1 ] = 0.15f * 241.0 * rearlightcount / 255.0; + Global::VehicleLightRear.ambient[ 2 ] = 0.15f * 224.0 * rearlightcount / 255.0; + + ::glLightf( opengl_renderer::vehiclelightrear, GL_LINEAR_ATTENUATION, 0.3f / pow( rearlightcount, 2 ) ); + glEnable( GfxRenderer.vehiclelightrear ); + Global::VehicleLightRear.apply_intensity(); + Global::VehicleLightRear.apply_angle(); + } + else { + glDisable( GfxRenderer.vehiclelightrear ); + } + } + if (Global::bUseVBO) { // renderowanie przez VBO if (!Ground.RenderVBO(Camera.Pos)) @@ -1618,10 +1658,11 @@ TWorld::Render_Cab() { glLoadIdentity(); // zacząć od macierzy jedynkowej Camera.SetCabMatrix( pos ); // widok z kamery po przesunięciu glMultMatrixd( dynamic->mMatrix.getArray() ); // ta macierz nie ma przesunięcia - +/* //*yB: moje smuuugi 1 if( Global::bSmudge ) { // Ra: uwzględniłem zacienienie pojazdu przy zapalaniu smug - // 1. warunek na smugę wyznaczyc wcześniej + + // 1. warunek na smugę wyznaczyc wcześniej // 2. jeśli smuga włączona, nie renderować pojazdu użytkownika w DynObj // 3. jeśli smuga właczona, wyrenderować pojazd użytkownia po dodaniu smugi do sceny auto const &frontlights = Train->Controlled()->iLights[ 0 ]; @@ -1694,24 +1735,25 @@ TWorld::Render_Cab() { //float ddl = (0.15*Global::diffuseDayLight[0]+0.295*Global::diffuseDayLight[1]+0.055*Global::diffuseDayLight[2]); //0.24:0 glBegin( GL_QUADS ); float fSmudge = dynamic->MoverParameters->DimHalf.y + 7; // gdzie zaczynać smugę - if( frontlightstrength > 0.f ) { // wystarczy jeden zapalony z przodu - + if( frontlightstrength > 0.f ) { + // wystarczy jeden zapalony z przodu for( int i = 15; i <= 35; i++ ) { float z = i * i * i * 0.01f;//25/4; //float C = (36 - i*0.5)*0.005*(1.5 - sqrt(ddl)); float C = ( 36 - i*0.5 )*0.005*sqrt( ( 1 / sqrt( Global::fLuminance + 0.015 ) ) - 1 ) * frontlightstrength; glColor4f( C, C, C, 1.0f );// *frontlightstrength ); - glTexCoord2f( 0, 0 ); glVertex3f( -10 / 2 - 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); - glTexCoord2f( 1, 0 ); glVertex3f( 10 / 2 + 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); - glTexCoord2f( 1, 1 ); glVertex3f( 10 / 2 + 2 * i / 4, -5.0 - 0.5*z, 13 + 1.7*z / 3 ); + glTexCoord2f( 0, 0 ); glVertex3f( -10 / 2 - 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); + glTexCoord2f( 1, 0 ); glVertex3f( 10 / 2 + 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); + glTexCoord2f( 1, 1 ); glVertex3f( 10 / 2 + 2 * i / 4, -5.0 - 0.5*z, 13 + 1.7*z / 3 ); glTexCoord2f( 0, 1 ); glVertex3f( -10 / 2 - 2 * i / 4, -5.0 - 0.5*z, 13 + 1.7*z / 3 ); } } - if( rearlightstrength > 0.f ) { // wystarczy jeden zapalony z tyłu + if( rearlightstrength > 0.f ) { + // wystarczy jeden zapalony z tyłu for( int i = 15; i <= 35; i++ ) { float z = i * i * i * 0.01f;//25/4; float C = ( 36 - i*0.5 )*0.005*sqrt( ( 1 / sqrt( Global::fLuminance + 0.015 ) ) - 1 ) * rearlightstrength; - glColor4f( C, C, C, 0.35f );// *rearlightstrength ); + glColor4f( C, C, C, 1.0f );// *rearlightstrength ); glTexCoord2f( 0, 0 ); glVertex3f( 10 / 2 + 2 * i / 4, 6.0 + 0.3*z, -13 - 1.7*z / 3 ); glTexCoord2f( 1, 0 ); glVertex3f( -10 / 2 - 2 * i / 4, 6.0 + 0.3*z, -13 - 1.7*z / 3 ); glTexCoord2f( 1, 1 ); glVertex3f( -10 / 2 - 2 * i / 4, -5.0 - 0.5*z, -13 - 1.7*z / 3 ); @@ -1728,15 +1770,18 @@ TWorld::Render_Cab() { glEnable( GL_FOG ); } } +*/ glEnable( GL_LIGHTING ); // po renderowaniu smugi jest to wyłączone // Ra: pojazd użytkownika należało by renderować po smudze, aby go nie rozświetlała + Global::bSmudge = false; // aby model użytkownika się teraz wyrenderował dynamic->Render(); dynamic->RenderAlpha(); // przezroczyste fragmenty pojazdów na torach - } // yB: moje smuuugi 1 - koniec*/ +/* + } // yB: moje smuuugi 1 - koniec else - glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone - + glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone. TODO: have the wires render take care of its own shit +*/ if( dynamic->mdKabina ) // bo mogła zniknąć przy przechodzeniu do innego pojazdu { #ifdef EU07_USE_OLD_LIGHTING_MODEL @@ -1822,6 +1867,10 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_DIFFUSE, diffuseCabLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, specularCabLight ); #else + // cab shouldn't get affected by the vehicle light, so we disable it here + ::glDisable( GfxRenderer.vehiclelight ); + ::glDisable( GfxRenderer.vehiclelightrear ); + if( dynamic->InteriorLightLevel > 0.0f ) { // crude way to light the cabin, until we have something more complete in place @@ -1866,9 +1915,9 @@ TWorld::Render_UI() { glLoadIdentity(); if( DebugModeFlag && !Global::iTextMode ) { - OutText1 = " FPS: "; + OutText1 = "FPS: "; OutText1 += to_string( Timer::GetFPS(), 2 ); - OutText1 += Global::iSlowMotion ? "s" : "n"; + OutText1 += Global::iSlowMotion ? "(s)" : "(n)"; OutText1 += ( Timer::GetDeltaTime() >= 0.2 ) ? "!" : " "; // if (GetDeltaTime()>=0.2) //Ra: to za bardzo miota tekstem! @@ -1883,7 +1932,7 @@ TWorld::Render_UI() { if( Global::iTextMode == VK_F8 ) { Global::iViewMode = VK_F8; - OutText1 = " FPS: "; + OutText1 = "FPS: "; OutText1 += to_string( Timer::GetFPS(), 2 ); //OutText1 += sprintf(); if( Global::iSlowMotion ) @@ -2318,7 +2367,7 @@ TWorld::Render_UI() { OutText1 += " " + std::string( "S SEE NEN NWW SW" ) - .substr( 1 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); + .substr( 0 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); // current luminance level OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); } @@ -3033,9 +3082,7 @@ world_environment::update() { auto const position = m_sun.getPosition(); // ...update the global data to match new sun state... Global::SunAngle = m_sun.getAngle(); - Global::DayLight.position[ 0 ] = position.x; - Global::DayLight.position[ 1 ] = position.y; - Global::DayLight.position[ 2 ] = position.z; + Global::DayLight.set_position( position ); Global::DayLight.direction = -1.0 * m_sun.getDirection(); // ...update skydome to match the current sun position as well... m_skydome.Update( position ); diff --git a/World.h b/World.h index eb5f3dde..cfdff5b5 100644 --- a/World.h +++ b/World.h @@ -81,6 +81,7 @@ class TWorld double VelPrev; // poprzednia prędkość int tprev; // poprzedni czas double Acc; // przyspieszenie styczne + bool m_init{ false }; // indicates whether initial update of the world was performed public: void ModifyTGA(std::string const &dir = ""); void CreateE3D(std::string const &dir = "", bool dyn = false); diff --git a/dumb3d.h b/dumb3d.h index 0ed4f67f..0d93b8e3 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -415,6 +415,11 @@ inline vector3 CrossProduct(const vector3 &v1, const vector3 &v2) return vector3(v1.y * v2.z - v1.z * v2.y, v2.x * v1.z - v2.z * v1.x, v1.x * v2.y - v1.y * v2.x); } +inline vector3 Interpolate( vector3 const &First, vector3 const &Second, float const Factor ) { + + return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); +} + inline vector3 operator*(const matrix4x4 &m, const vector3 &v) { return vector3(v.x * m[0][0] + v.y * m[1][0] + v.z * m[2][0] + m[3][0], diff --git a/renderer.h b/renderer.h index deabb54e..69e39ca7 100644 --- a/renderer.h +++ b/renderer.h @@ -24,7 +24,7 @@ struct opengl_light { opengl_light() { position[ 0 ] = position[ 1 ] = position[ 2 ] = 0.0f; position[ 3 ] = 1.0f; - ambient[ 0 ] = ambient[ 1 ] = ambient[ 2 ] = ambient[ 3 ] = 1.0f; + ambient[ 0 ] = ambient[ 1 ] = ambient[ 2 ] = 0.0f; ambient[ 3 ] = 1.0f; diffuse[ 0 ] = diffuse[ 1 ] = diffuse[ 2 ] = diffuse[ 3 ] = 1.0f; specular[ 0 ] = specular[ 1 ] = specular[ 2 ] = specular[ 3 ] = 1.0f; } @@ -45,6 +45,13 @@ struct opengl_light { glLightfv( id, GL_SPOT_DIRECTION, directionarray ); } } + inline + void set_position( Math3D::vector3 const &Position ) { + + position[ 0 ] = Position.x; + position[ 1 ] = Position.y; + position[ 2 ] = Position.z; + } }; // encapsulates basic rendering setup. @@ -66,7 +73,8 @@ class opengl_renderer { public: GLenum static const sunlight{ GL_LIGHT0 }; -// GLenum static const ambientlight{ GL_LIGHT1 }; + GLenum static const vehiclelight{ GL_LIGHT1 }; + GLenum static const vehiclelightrear{ GL_LIGHT2 }; texture_manager::size_type GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ) { diff --git a/sky.cpp b/sky.cpp index 710adbdb..c6766f44 100644 --- a/sky.cpp +++ b/sky.cpp @@ -48,8 +48,8 @@ void TSky::Render() mdCloud->Render(100, 0); mdCloud->RenderAlpha(100, 0); } - glPopMatrix(); #ifdef EU07_USE_OLD_LIGHTING_MODEL + glPopMatrix(); // TODO: re-implement this glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); #endif diff --git a/sun.cpp b/sun.cpp index 78fd9e4f..b21ef312 100644 --- a/sun.cpp +++ b/sun.cpp @@ -32,8 +32,8 @@ cSun::update() { move(); Math3D::vector3 position( 0.0f, 0.0f, -2000.0f ); - position.RotateX( (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); - position.RotateY( (float)( ( 90.0 - m_body.hrang ) * ( M_PI / 180.0 ) ) ); + position.RotateX( (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); + position.RotateY( (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); m_position = position; } @@ -69,8 +69,8 @@ Math3D::vector3 cSun::getDirection() { Math3D::vector3 position( 0.f, 0.f, -1.f ); - position.RotateX( (float)(m_body.elevref * (M_PI/180.0)) ); - position.RotateY( (float)((90.0 - m_body.hrang) * (M_PI/180.0)) ); + position.RotateX( (float)( m_body.elevref * (M_PI/180.0)) ); + position.RotateY( (float)( -m_body.hrang * (M_PI/180.0)) ); position.Normalize(); return position; } From bd588b87b398e89b5b04fc73edf4cdcb190aa40e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 26 Feb 2017 00:20:18 +0100 Subject: [PATCH 027/426] tint ability for the clouds object --- World.cpp | 25 +++++++++++++++---------- sky.cpp | 18 ++++++++++++------ sky.h | 3 ++- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/World.cpp b/World.cpp index 9839e026..35e79974 100644 --- a/World.cpp +++ b/World.cpp @@ -738,16 +738,8 @@ void TWorld::OnKeyDown(int cKey) switch (cKey) { case VK_F1: { - // czas i relacja - if( Global::iTextMode == cKey ) - Global::iTextMode = - ( Global::iPause && ( cKey != VK_F1 ) ? - VK_F1 : - 0 ); // wyłączenie napisów, chyba że pauza - else - Global::iTextMode = cKey; - // advance world clock in debug mode if( DebugModeFlag ) { + // additional time speedup keys in debug mode if( Console::Pressed( VK_CONTROL ) ) { // ctrl-f3 GlobalTime->UpdateMTableTime( 20.0 * 60.0 ); @@ -757,6 +749,19 @@ void TWorld::OnKeyDown(int cKey) GlobalTime->UpdateMTableTime( 5.0 * 60.0 ); } } + if( ( false == Console::Pressed( VK_CONTROL ) ) + && ( false == Console::Pressed( VK_SHIFT ) ) ) { + // czas i relacja + if( Global::iTextMode == cKey ) { + // wyłączenie napisów, chyba że pauza + Global::iTextMode = + ( Global::iPause && ( cKey != VK_F1 ) ? + VK_F1 : + 0 ); + } + else + Global::iTextMode = cKey; + } break; } case VK_F2: { @@ -3126,7 +3131,7 @@ world_environment::render() { m_skydome.Render(); m_stars.render(); -// m_clouds.Render(); + m_clouds.Render( m_skydome.GetAverageColor() * 2.5f ); if( DebugModeFlag == true ) { // mark sun position for easier debugging diff --git a/sky.cpp b/sky.cpp index c6766f44..78932cf7 100644 --- a/sky.cpp +++ b/sky.cpp @@ -22,21 +22,22 @@ TSky::TSky(){}; void TSky::Init() { - WriteLog(Global::asSky.c_str()); - WriteLog("init"); + WriteLog( "Clouds init" ); if ((Global::asSky != "1") && (Global::asSky != "0")) - // { - mdCloud = TModelsManager::GetModel(Global::asSky.c_str()); - // } + mdCloud = TModelsManager::GetModel( Global::asSky ); }; -void TSky::Render() +void TSky::Render( float3 const &Tint ) { if (mdCloud) { // jeśli jest model nieba #ifdef EU07_USE_OLD_LIGHTING_MODEL // TODO: re-implement this glLightfv(GL_LIGHT0, GL_POSITION, lightPos); +#else + ::glEnable( GL_LIGHTING ); + ::glDisable( GL_LIGHT0 ); + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &Tint.x ); #endif if (Global::bUseVBO) { // renderowanie z VBO @@ -52,6 +53,11 @@ void TSky::Render() glPopMatrix(); // TODO: re-implement this glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); +#else + GLfloat noambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, noambient ); + ::glEnable( GL_LIGHT0 ); + ::glDisable( GL_LIGHTING ); #endif } }; diff --git a/sky.h b/sky.h index 709c2887..1117957a 100644 --- a/sky.h +++ b/sky.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "Model3d.h" +#include "Float3d.h" class TSky { @@ -21,7 +22,7 @@ class TSky TSky(); ~TSky(); void Init(); - void Render(); + void Render( float3 const &Tint = float3(1.0f, 1.0f, 1.0f) ); }; //--------------------------------------------------------------------------- From 0752024d4724f87ae86eafd68af9f075ad2bc05e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 26 Feb 2017 16:44:42 +0100 Subject: [PATCH 028/426] manual tweaks/overrides in skydome colour model --- Float3d.h | 5 +++++ World.cpp | 8 +++++--- skydome.cpp | 34 +++++++++++++++++++++++++--------- skydome.h | 2 +- 4 files changed, 36 insertions(+), 13 deletions(-) diff --git a/Float3d.h b/Float3d.h index fcb5afc3..e9504e94 100644 --- a/Float3d.h +++ b/Float3d.h @@ -79,6 +79,11 @@ inline float DotProduct( float3 const &v1, float3 const &v2 ) { return v1.x * v2.x + v1.y * v2.y + v1.z * v2.z; } +inline float3 Interpolate( float3 const &First, float3 const &Second, float const Factor ) { + + return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); +} + class float4 { // kwaternion obrotu public: diff --git a/World.cpp b/World.cpp index 35e79974..940ee222 100644 --- a/World.cpp +++ b/World.cpp @@ -1565,7 +1565,8 @@ bool TWorld::Render() ( ( frontlights & 4 ) ? 1 : 0 ) + ( ( frontlights & 16 ) ? 1 : 0 ); - if( frontlightcount > 0 ) { + if( ( true == Train->Controlled()->Battery ) + && ( frontlightcount > 0 ) ) { // halogen light. TODO: allow light type definition Global::VehicleLight.ambient[ 0 ] = 0.15f * 255.0 * frontlightcount / 255.0; Global::VehicleLight.ambient[ 1 ] = 0.15f * 241.0 * frontlightcount / 255.0; @@ -1585,7 +1586,8 @@ bool TWorld::Render() ( ( rearlights & 4 ) ? 1 : 0 ) + ( ( rearlights & 16 ) ? 1 : 0 ); - if( rearlightcount > 0 ) { + if( ( true == Train->Controlled()->Battery ) + && ( rearlightcount > 0 ) ) { // halogen light. TODO: allow light type definition Global::VehicleLightRear.ambient[ 0 ] = 0.15f * 255.0 * rearlightcount / 255.0; Global::VehicleLightRear.ambient[ 1 ] = 0.15f * 241.0 * rearlightcount / 255.0; @@ -3094,7 +3096,7 @@ world_environment::update() { // ...retrieve current sky colour and brightness... auto const skydomecolour = m_skydome.GetAverageColor(); auto const skydomehsv = RGBtoHSV( skydomecolour ); - auto const intensity = std::min( 0.05f + m_sun.getIntensity() + skydomehsv.z, 1.25f ); + auto const intensity = std::min( 1.15f * (0.05f + m_sun.getIntensity() + skydomehsv.z), 1.25f ); // ...update light colours and intensity. // NOTE: intensity combines intensity of the sun and the light reflected by the sky dome // it'd be more technically correct to have just the intensity of the sun here, diff --git a/skydome.cpp b/skydome.cpp index 34c0d96f..e57bd043 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -61,9 +61,9 @@ CSkyDome::CSkyDome (int const Tesselation) : m_tesselation( Tesselation ) { // SetSunPosition( Math3D::vector3(75.0f, 0.0f, 0.0f) ); - SetTurbidity( 3.5f ); - SetExposure( true, 16.0f ); - SetOvercastFactor( 0.08f ); + SetTurbidity( 3.0f ); + SetExposure( true, 20.0f ); + SetOvercastFactor( 0.05f ); SetGammaCorrection( 2.2f ); Generate(); } @@ -75,7 +75,8 @@ CSkyDome::~CSkyDome() { void CSkyDome::Generate() { // radius of dome - float const radius = 1.0f; // 100.0f; + float const radius = 1.0f; + 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; @@ -98,11 +99,11 @@ void CSkyDome::Generate() { float x = std::cos( longitude ); float y = std::sin( longitude ); - m_vertices.emplace_back( float3( x * zr0, y * zr0 - 0.1f, z0 ) * radius ); + 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 - 0.1f, z1 ) * radius ); + 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 ) ); } @@ -156,7 +157,7 @@ bool CSkyDome::SetSunPosition( Math3D::vector3 const &Direction ) { m_sundirection = sundirection; m_thetasun = std::acosf( m_sundirection.y ); - m_phisun = std::atan2( m_sundirection.z , m_sundirection.x ); + m_phisun = std::atan2( m_sundirection.z, m_sundirection.x ); return true; } @@ -249,7 +250,7 @@ void CSkyDome::RebuildColors() { // trough all vertices float3 vertex; - float3 color, colorconverter; + float3 color, colorconverter, shiftedcolor; for ( unsigned int i = 0; i < m_vertices.size(); ++i ) { // grab it @@ -295,9 +296,24 @@ void CSkyDome::RebuildColors() { // exp scale colorconverter.z = 1.0f - exp( -m_expfactor * colorconverter.z ); } + + // override the hue, based on sun height above the horizon. crude way to deal with model shortcomings + // correction begins when the sun is higher than 10 degrees above the horizon, and fully in effect at 10+15 degrees + auto const degreesabovehorizon = 90.0f - m_thetasun * ( 180.0f / M_PI ); + auto const sunbasedphase = clamp( (1.0f / 15.0f) * ( degreesabovehorizon - 10.0f ), 0.0f, 1.0f ); + // correction is applied in linear manner from the bottom, becomes fully in effect for vertices with y = 0.50 + auto const heightbasedphase = clamp( vertex.y * 2.0f, 0.0f, 1.0f ); + // this height-based factor is reduced the farther the sky is up in the sky + float const shiftfactor = clamp( interpolate(heightbasedphase, sunbasedphase, sunbasedphase), 0.0f, 1.0f ); + // h = 210 makes for 'typical' sky tone + shiftedcolor = float3( 210.0f, colorconverter.y, colorconverter.z ); + shiftedcolor = HSVtoRGB( shiftedcolor ); + color = HSVtoRGB(colorconverter); + + color = Interpolate( color, shiftedcolor, shiftfactor ); /* - // gamma control + // gamma control color.x = std::pow( color.x, m_gammacorrection ); color.x = std::pow( color.y, m_gammacorrection ); color.x = std::pow( color.z, m_gammacorrection ); diff --git a/skydome.h b/skydome.h index df0125e4..0fcfb329 100644 --- a/skydome.h +++ b/skydome.h @@ -42,7 +42,7 @@ private: // data int const m_tesselation; std::vector m_vertices; - std::vector m_normals; +// std::vector m_normals; std::vector m_colours; static float m_distributionluminance[ 5 ][ 2 ]; From fcf74abfa20df7f34acff6a10174a95ba5a4ccdb Mon Sep 17 00:00:00 2001 From: VB Date: Sun, 26 Feb 2017 18:40:00 +0100 Subject: [PATCH 029/426] serializacja e3d --- Float3d.cpp | 6 + Float3d.h | 17 ++- Model3d.cpp | 350 +++++++++++++++++++++++++-------------------------- Model3d.h | 40 +----- VBO.cpp | 14 +++ VBO.h | 3 +- sn_utils.cpp | 60 +++++++++ sn_utils.h | 19 ++- 8 files changed, 284 insertions(+), 225 deletions(-) diff --git a/Float3d.cpp b/Float3d.cpp index f7af9899..e2f37d7c 100644 --- a/Float3d.cpp +++ b/Float3d.cpp @@ -25,6 +25,12 @@ void float4x4::deserialize_float64(std::istream &s) e[i] = (float)sn_utils::ld_float64(s); } +void float4x4::serialize_float32(std::ostream &s) +{ + for (size_t i = 0; i < 16; i++) + sn_utils::ls_float32(s, e[i]); +} + void float4x4::Quaternion(float4 *q) { // konwersja kwaternionu obrotu na macierz obrotu float xx = q->x * q->x, yy = q->y * q->y, zz = q->z * q->z; diff --git a/Float3d.h b/Float3d.h index 7aa8312b..72076d33 100644 --- a/Float3d.h +++ b/Float3d.h @@ -184,11 +184,12 @@ struct float8 class float4x4 { // macierz transformacji pojedynczej precyzji +public: float e[16]; - public: - void deserialize_float32(std::istream &s); - void deserialize_float64(std::istream &s); + void deserialize_float32(std::istream&); + void deserialize_float64(std::istream&); + void serialize_float32(std::ostream&); float4x4(void){}; float4x4(float f[16]) { @@ -282,6 +283,16 @@ inline float4x4 &float4x4::Rotation(double angle, float3 axis) return *this; }; +inline bool operator==(const float4x4& v1, const float4x4& v2) +{ + for (size_t i = 0; i < 16; i++) + { + if (v1.e[i] != v2.e[i]) + return false; + } + return true; +} + inline float4x4 operator*(const float4x4 &m1, const float4x4 &m2) { // iloczyn macierzy float4x4 retVal; diff --git a/Model3d.cpp b/Model3d.cpp index 8e60e1e6..afe27b9e 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -42,12 +42,6 @@ std::string *TSubModel::pasText; // 0x3F3F003F - wszystkie wymienne tekstury używane w danym cyklu // Ale w TModel3d okerśla przezroczystość tekstur wymiennych! -int TSubModelInfo::iTotalTransforms = 0; // ilość transformów -int TSubModelInfo::iTotalNames = 0; // długość obszaru nazw -int TSubModelInfo::iTotalTextures = 0; // długość obszaru tekstur -int TSubModelInfo::iCurrent = 0; // aktualny obiekt -TSubModelInfo *TSubModelInfo::pTable = NULL; // tabele obiektów pomocniczych - TSubModel::TSubModel() { ZeroMemory(this, sizeof(TSubModel)); // istotne przy zapisywaniu wersji binarnej @@ -1477,82 +1471,6 @@ void TSubModel::RaArrayFill(CVertNormTex *Vert) Next->RaArrayFill(Vert); }; -void TSubModel::Info() -{ // zapisanie informacji o submodelu do obiektu - // pomocniczego - TSubModelInfo *info = TSubModelInfo::pTable + TSubModelInfo::iCurrent; - info->pSubModel = this; - if (fMatrix && (iFlags & 0x8000)) // ma matrycę i jest ona niejednostkowa - info->iTransform = info->iTotalTransforms++; - if (TextureID > 0) - { // jeśli ma teksturę niewymienną - for (int i = 0; i < info->iCurrent; ++i) - if (TextureID == info->pTable[i].pSubModel->TextureID) // porównanie z wcześniejszym - { - info->iTexture = info->pTable[i].iTexture; // taki jaki już był - break; // koniec sprawdzania - } - if (info->iTexture < 0) // jeśli nie znaleziono we wcześniejszych - { - info->iTexture = ++info->iTotalTextures; // przydzielenie numeru tekstury - // w pliku (od 1) - std::string t(pTexture); - // trim extension - size_t kropka = t.rfind('.'); - if (kropka != std::string::npos && - (t.substr(kropka) == ".tga" || t.substr(kropka) == ".dds")) - { - t.erase(t.rfind('.')); - } - if (t != std::string(pTexture)) - { // jeśli się zmieniło - // pName=new char[token.length()+1]; //nie ma sensu skracać tabeli - pTexture = t; - } - info->iTextureLen = (int)t.size() + 1; // przygotowanie do zapisania, z zerem na końcu - } - } - else - info->iTexture = TextureID; // nie ma albo wymienna - // if (asName.Length()) - if (pName.size()) - { - info->iName = info->iTotalNames++; // przydzielenie numeru nazwy w pliku (od 0) - info->iNameLen = (int)pName.size() + 1; // z zerem na końcu - } - ++info->iCurrent; // przejście do kolejnego obiektu pomocniczego - if (Child) - { - info->iChild = info->iCurrent; - Child->Info(); - } - if (Next) - { - info->iNext = info->iCurrent; - Next->Info(); - } -}; - -void TSubModel::InfoSet(TSubModelInfo *info) -{ // ustawienie danych wg obiektu - // pomocniczego do zapisania w - // pliku - int ile = (char *)&uiDisplayList - (char *)&eType; // ilość bajtów pomiędzy tymi zmiennymi - ZeroMemory(this, sizeof(TSubModel)); // zerowaie całości - CopyMemory(this, info->pSubModel, ile); // skopiowanie pamięci 1:1 - tVboPtr = (int)info->pSubModel->iVboPtr; - iTexture = info->iTexture; // numer nazwy tekstury, a nie numer w OpenGL - TextureID = info->iTexture; // numer tekstury w OpenGL - iName = info->iName; // numer nazwy w obszarze nazw - iMatrix = info->iTransform; // numer macierzy - iNext = info->iNext; // numer następnego - iChild = info->iChild; // numer potomnego - iFlags &= ~0x200; // nie jest wczytany z tekstowego - // asTexture=asName=""; - pTexture = ""; - pName = ""; -}; - void TSubModel::AdjustDist() { // aktualizacja odległości faz LoD, zależna od // rozdzielczości pionowej oraz multisamplingu @@ -1744,9 +1662,173 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) return result; }; -// E3D deserialization +// E3D serialization // http://rainsted.com/pl/Format_binarny_modeli_-_E3D + +//m7todo: wymyślić lepszą nazwę +template +size_t get_container_pos(L &list, T o) +{ + auto i = std::find(list.begin(), list.end(), o); + if (i == list.end()) + { + list.push_back(o); + return list.size() - 1; + } + else + { + return std::distance(list.begin(), i); + } +} + +//m7todo: za dużo argumentów, może przenieść do osobnej +//klasy serializera mającej własny stan, albo zrobić +//strukturę TModel3d::SerializerContext? +void TSubModel::serialize(std::ostream &s, + std::vector &models, + std::vector &names, + std::vector &textures, + std::vector &transforms) +{ + size_t end = (size_t)s.tellp() + 256; + + if (!Next) + sn_utils::ls_int32(s, -1); + else + sn_utils::ls_int32(s, (int32_t)get_container_pos(models, Next)); + if (!Child) + sn_utils::ls_int32(s, -1); + else + sn_utils::ls_int32(s, (int32_t)get_container_pos(models, Child)); + + sn_utils::ls_int32(s, eType); + if (pName.size() == 0) + sn_utils::ls_int32(s, -1); + else + sn_utils::ls_int32(s, (int32_t)get_container_pos(names, pName)); + sn_utils::ls_int32(s, (int)b_Anim); + + sn_utils::ls_int32(s, iFlags); + sn_utils::ls_int32(s, (int32_t)get_container_pos(transforms, *fMatrix)); + + sn_utils::ls_int32(s, iNumVerts); + sn_utils::ls_int32(s, (int)iVboPtr); + if (TextureID <= 0) + sn_utils::ls_int32(s, TextureID); + else + sn_utils::ls_int32(s, (int32_t)get_container_pos(textures, pTexture)); + + sn_utils::ls_float32(s, fVisible); + sn_utils::ls_float32(s, fLight); + + for (size_t i = 0; i < 4; i++) + sn_utils::ls_float32(s, f4Ambient[i]); + for (size_t i = 0; i < 4; i++) + sn_utils::ls_float32(s, f4Diffuse[i]); + for (size_t i = 0; i < 4; i++) + sn_utils::ls_float32(s, f4Specular[i]); + for (size_t i = 0; i < 4; i++) + sn_utils::ls_float32(s, f4Emision[i]); + + sn_utils::ls_float32(s, fWireSize); + sn_utils::ls_float32(s, fSquareMaxDist); + sn_utils::ls_float32(s, fSquareMinDist); + + sn_utils::ls_float32(s, fNearAttenStart); + sn_utils::ls_float32(s, fNearAttenEnd); + sn_utils::ls_uint32(s, bUseNearAtten ? 1 : 0); + + sn_utils::ls_int32(s, iFarAttenDecay); + sn_utils::ls_float32(s, fFarDecayRadius); + sn_utils::ls_float32(s, fCosFalloffAngle); + sn_utils::ls_float32(s, fCosHotspotAngle); + sn_utils::ls_float32(s, fCosViewAngle); + + size_t fill = end - s.tellp(); + for (size_t i = 0; i < fill; i++) + s.put(0); +} + +void TModel3d::SaveToBinFile(char const *FileName) +{ + WriteLog("saving e3d model.."); + + //m7todo: można by zoptymalizować robiąc unordered_map + //na wyszukiwanie numerów już dodanych stringów i osobno + //vector na wskaźniki do stringów w kolejności numeracji + //tylko czy potrzeba? + std::vector models; + models.push_back(Root); + std::vector names; + std::vector textures; + textures.push_back(""); + std::vector transforms; + + std::ofstream s(FileName, std::ios::binary); + + sn_utils::ls_uint32(s, MAKE_ID4('E', '3', 'D', '0')); + size_t e3d_spos = s.tellp(); + sn_utils::ls_uint32(s, 0); + + { + sn_utils::ls_uint32(s, MAKE_ID4('S', 'U', 'B', '0')); + size_t sub_spos = s.tellp(); + sn_utils::ls_uint32(s, 0); + for (size_t i = 0; i < models.size(); i++) + models[i]->serialize(s, models, names, textures, transforms); + size_t pos = s.tellp(); + s.seekp(sub_spos); + sn_utils::ls_uint32(s, (uint32_t)(4 + pos - sub_spos)); + s.seekp(pos); + } + + sn_utils::ls_uint32(s, MAKE_ID4('T', 'R', 'A', '0')); + sn_utils::ls_uint32(s, 8 + (uint32_t)transforms.size() * 64); + for (size_t i = 0; i < transforms.size(); i++) + transforms[i].serialize_float32(s); + + MakeArray(iNumVerts); + Root->RaArrayFill(m_pVNT); + sn_utils::ls_uint32(s, MAKE_ID4('V', 'N', 'T', '0')); + sn_utils::ls_uint32(s, 8 + iNumVerts * 32); + for (size_t i = 0; i < iNumVerts; i++) + m_pVNT[i].serialize(s); + + if (textures.size()) + { + sn_utils::ls_uint32(s, MAKE_ID4('T', 'E', 'X', '0')); + size_t tex_spos = s.tellp(); + sn_utils::ls_uint32(s, 0); + for (size_t i = 0; i < textures.size(); i++) + sn_utils::s_str(s, textures[i]); + size_t pos = s.tellp(); + s.seekp(tex_spos); + sn_utils::ls_uint32(s, (uint32_t)(4 + pos - tex_spos)); + s.seekp(pos); + } + + if (names.size()) + { + sn_utils::ls_uint32(s, MAKE_ID4('N', 'A', 'M', '0')); + size_t nam_spos = s.tellp(); + sn_utils::ls_uint32(s, 0); + for (size_t i = 0; i < names.size(); i++) + sn_utils::s_str(s, names[i]); + size_t pos = s.tellp(); + s.seekp(nam_spos); + sn_utils::ls_uint32(s, (uint32_t)(4 + pos - nam_spos)); + s.seekp(pos); + } + + size_t end = s.tellp(); + s.seekp(e3d_spos); + sn_utils::ls_uint32(s, (uint32_t)(4 + end - e3d_spos)); + s.close(); + + WriteLog("..done."); +} + void TSubModel::deserialize(std::istream &s) { iNext = sn_utils::ld_int32(s); @@ -1769,13 +1851,10 @@ void TSubModel::deserialize(std::istream &s) for (size_t i = 0; i < 4; i++) f4Ambient[i] = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; i++) f4Diffuse[i] = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; i++) f4Specular[i] = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; i++) f4Emision[i] = sn_utils::ld_float32(s); @@ -1893,6 +1972,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, std::vector *t, std::vector *n, bool dynamic) { // ustawienie wskaźników w submodelu + //m7todo: brzydko iVisible = 1; // tymczasowo używane Child = (iChild > 0) ? s + iChild : nullptr; // zerowy nie może być potomnym Next = (iNext > 0) ? s + iNext : nullptr; // zerowy nie może być następnym @@ -1953,7 +2033,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) { // wczytanie modelu z pliku binarnego - WriteLog("Loading - binary model: " + FileName); + WriteLog("loading e3d model " + FileName + " .."); std::ifstream file(FileName, std::ios::binary); @@ -1965,6 +2045,8 @@ void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) deserialize(file, size, dynamic); file.close(); + + WriteLog("..done."); }; void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic) @@ -2067,100 +2149,6 @@ void TModel3d::Init() } }; -void TModel3d::SaveToBinFile(char const *FileName) -{ // zapis modelu binarnego - WriteLog("Saving E3D binary model."); - int i, zero = 0; - TSubModelInfo *info = new TSubModelInfo[iSubModelsCount]; - info->Reset(); - Root->Info(); // zebranie informacji o submodelach - int len; //łączna długość pliku - int sub; // ilość submodeli (w bajtach) - int tra; // wielkość obszaru transformów - int vnt; // wielkość obszaru wierzchołków - int tex = 0; // wielkość obszaru nazw tekstur - int nam = 0; // wielkość obszaru nazw submodeli - sub = 8 + sizeof(TSubModel) * iSubModelsCount; - tra = info->iTotalTransforms ? 8 + 64 * info->iTotalTransforms : 0; - vnt = 8 + 32 * iNumVerts; - for (i = 0; i < iSubModelsCount; ++i) - { - tex += info[i].iTextureLen; - nam += info[i].iNameLen; - } - if (tex) - tex += 9; // 8 na nagłówek i jeden ciąg pusty (tylko znacznik końca) - if (nam) - nam += 8; - len = 8 + sub + tra + vnt + tex + ((-tex) & 3) + nam + ((-nam) & 3); - TSubModel *roboczy = new TSubModel(); // bufor używany do zapisywania - // AnsiString *asN=&roboczy->asName,*asT=&roboczy->asTexture; - // roboczy->FirstInit(); //żeby delete nie usuwało czego nie powinno - /* TFileStream *fs = new TFileStream(AnsiString(FileName), fmCreate); - */ { - std::ofstream file(FileName, std::ios::binary); - file.unsetf(std::ios::skipws); - file.write("E3D0", 4); // kromka główna - file.write(reinterpret_cast(&len), 4); - - file.write("SUB0", 4); // dane submodeli - file.write(reinterpret_cast(&sub), 4); - for (i = 0; i < iSubModelsCount; ++i) - { - roboczy->InfoSet(info + i); - file.write(reinterpret_cast(roboczy), - 256); // zapis jednego submodelu - } - if (tra) - { // zapis transformów - file.write("TRA0", 4); // transformy - file.write(reinterpret_cast(&tra), 4); - for (i = 0; i < iSubModelsCount; ++i) - if (info[i].iTransform >= 0) - file.write(reinterpret_cast(info[i].pSubModel->GetMatrix()), 16 * 4); - } - { // zapis wierzchołków - MakeArray(iNumVerts); // tworzenie tablic dla VBO - Root->RaArrayFill(m_pVNT); // wypełnianie tablicy - file.write("VNT0", 4); // wierzchołki - file.write(reinterpret_cast(&vnt), 4); - file.write(reinterpret_cast(m_pVNT), 32 * iNumVerts); - } - if (tex) // może być jeden submodel ze zmienną teksturą i nazwy nie będzie - { // zapis nazw tekstur - file.write("TEX0", 4); // nazwy tekstur - i = (tex + 3) & ~3; // zaokrąglenie w górę - file.write(reinterpret_cast(&i), 4); - file.write(reinterpret_cast(&zero), - 1); // ciąg o numerze zero nie jest używany, ma tylko znacznik końca - for (i = 0; i < iSubModelsCount; ++i) - if (info[i].iTextureLen) - file.write(info[i].pSubModel->pTexture.c_str(), info[i].iTextureLen); - if ((-tex) & 3) - file.write(reinterpret_cast(&zero), - ((-tex) & 3)); // wyrównanie do wielokrotności 4 bajtów - } - if (nam) // może być jeden anonimowy submodel w modelu - { // zapis nazw submodeli - file.write("NAM0", 4); // nazwy submodeli - i = (nam + 3) & ~3; // zaokrąglenie w górę - file.write(reinterpret_cast(&i), 4); - for (i = 0; i < iSubModelsCount; ++i) - if (info[i].iNameLen) - file.write(info[i].pSubModel->pName.c_str(), info[i].iNameLen); - if ((-nam) & 3) - file.write(reinterpret_cast(&zero), - ((-nam) & 3)); // wyrównanie do wielokrotności 4 bajtów - } - } // file autocloses on getting out of scope - // roboczy->FirstInit(); //żeby delete nie usuwało czego nie powinno - // roboczy->iFlags=0; //żeby delete nie usuwało czego nie powinno - // roboczy->asName)=asN; - //&roboczy->asTexture=asT; - delete roboczy; - delete[] info; -}; - void TModel3d::BreakHierarhy() { Error("Not implemented yet :("); diff --git a/Model3d.h b/Model3d.h index 1a98ac58..54d99f4a 100644 --- a/Model3d.h +++ b/Model3d.h @@ -128,7 +128,6 @@ enum TAnimType // rodzaj animacji }; class TModel3d; -class TSubModelInfo; class TSubModel { // klasa submodelu - pojedyncza siatka, punkt świetlny albo grupa punktów @@ -206,7 +205,6 @@ public: // chwilowo TAnimType b_aAnim; // kody animacji oddzielnie, bo zerowane public: float4x4 *mAnimMatrix; // macierz do animacji kwaternionowych (należy do AnimContainer) - char space[8]; // wolne miejsce na przyszłe zmienne (zmniejszyć w miarę potrzeby) public: TSubModel ** smLetter; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) @@ -279,8 +277,6 @@ public: }; void InitialRotate(bool doit); void DisplayLists(); - void Info(); - void InfoSet(TSubModelInfo *info); void BinInit(TSubModel *s, float4x4 *m, float8 *v, std::vector *t, std::vector *n, bool dynamic); void ReplacableSet(texture_manager::size_type *r, int a) @@ -316,36 +312,12 @@ public: float MaxY(const float4x4 &m); void AdjustDist(); - void deserialize(std::istream &s); -}; - -class TSubModelInfo -{ // klasa z informacjami o submodelach, do tworzenia pliku binarnego -public: - TSubModel *pSubModel; // wskaźnik na submodel - int iTransform; // numer transformu (-1 gdy brak) - int iName; // numer nazwy - int iTexture; // numer tekstury - int iNameLen; // długość nazwy - int iTextureLen; // długość tekstury - int iNext, iChild; // numer następnego i potomnego - static int iTotalTransforms; // ilość transformów - static int iTotalNames; // ilość nazw - static int iTotalTextures; // ilość tekstur - static int iCurrent; // aktualny obiekt - static TSubModelInfo *pTable; // tabele obiektów pomocniczych - TSubModelInfo() - { - pSubModel = NULL; - iTransform = iName = iTexture = iNext = iChild = -1; // nie ma - iNameLen = iTextureLen = 0; - } - void Reset() - { - pTable = this; // ustawienie wskaźnika tabeli obiektów - iTotalTransforms = iTotalNames = iTotalTextures = iCurrent = 0; // zerowanie liczników - } - ~TSubModelInfo() {}; + void deserialize(std::istream&); + void TSubModel::serialize(std::ostream&, + std::vector&, + std::vector&, + std::vector&, + std::vector&); }; class TModel3d : public CMesh diff --git a/VBO.cpp b/VBO.cpp index 2f1902fd..cd9483d3 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -28,6 +28,20 @@ void CVertNormTex::deserialize(std::istream &s) v = sn_utils::ld_float32(s); } +void CVertNormTex::serialize(std::ostream &s) +{ + sn_utils::ls_float32(s, x); + sn_utils::ls_float32(s, y); + sn_utils::ls_float32(s, z); + + sn_utils::ls_float32(s, nx); + sn_utils::ls_float32(s, ny); + sn_utils::ls_float32(s, nz); + + sn_utils::ls_float32(s, u); + sn_utils::ls_float32(s, v); +} + CMesh::CMesh() { // utworzenie pustego obiektu m_pVNT = nullptr; diff --git a/VBO.h b/VBO.h index b93e1e13..3c0ec334 100644 --- a/VBO.h +++ b/VBO.h @@ -22,7 +22,8 @@ class CVertNormTex float u = 0.0; // U mapowania float v = 0.0; // V mapowania - void deserialize(std::istream &s); + void deserialize(std::istream&); + void serialize(std::ostream&); }; class CMesh diff --git a/sn_utils.cpp b/sn_utils.cpp index 5fa6a990..31d3b025 100644 --- a/sn_utils.cpp +++ b/sn_utils.cpp @@ -69,4 +69,64 @@ std::string sn_utils::d_str(std::istream &s) r.push_back(buf[0]); } return r; +} + +void sn_utils::ls_uint16(std::ostream &s, uint16_t v) +{ + uint8_t buf[2]; + buf[0] = v; + buf[1] = v >> 8; + s.write((char*)buf, 2); +} + +void sn_utils::ls_uint32(std::ostream &s, uint32_t v) +{ + uint8_t buf[4]; + buf[0] = v; + buf[1] = v >> 8; + buf[2] = v >> 16; + buf[3] = v >> 24; + s.write((char*)buf, 4); +} + +void sn_utils::ls_int32(std::ostream &s, int32_t v) +{ + uint8_t buf[4]; + buf[0] = v; + buf[1] = v >> 8; + buf[2] = v >> 16; + buf[3] = v >> 24; + s.write((char*)buf, 4); +} + +void sn_utils::ls_float32(std::ostream &s, float t) +{ + uint32_t v = reinterpret_cast(t); + uint8_t buf[4]; + buf[0] = v; + buf[1] = v >> 8; + buf[2] = v >> 16; + buf[3] = v >> 24; + s.write((char*)buf, 4); +} + +void sn_utils::ls_float64(std::ostream &s, double t) +{ + uint64_t v = reinterpret_cast(t); + uint8_t buf[8]; + buf[0] = v; + buf[1] = v >> 8; + buf[2] = v >> 16; + buf[3] = v >> 24; + buf[4] = v >> 32; + buf[5] = v >> 40; + buf[6] = v >> 48; + buf[7] = v >> 56; + s.write((char*)buf, 8); +} + +void sn_utils::s_str(std::ostream &s, std::string v) +{ + const char* buf = v.c_str(); + s.write(buf, v.size() + 1); } \ No newline at end of file diff --git a/sn_utils.h b/sn_utils.h index 95dc2bdf..8ec68259 100644 --- a/sn_utils.h +++ b/sn_utils.h @@ -3,10 +3,17 @@ class sn_utils { public: - static uint16_t ld_uint16(std::istream &s); - static uint32_t ld_uint32(std::istream &s); - static int32_t ld_int32(std::istream &s); - static float ld_float32(std::istream &s); - static double ld_float64(std::istream &s); - static std::string d_str(std::istream &s); + static uint16_t ld_uint16(std::istream&); + static uint32_t ld_uint32(std::istream&); + static int32_t ld_int32(std::istream&); + static float ld_float32(std::istream&); + static double ld_float64(std::istream&); + static std::string d_str(std::istream&); + + static void ls_uint16(std::ostream&, uint16_t); + static void ls_uint32(std::ostream&, uint32_t); + static void ls_int32(std::ostream&, int32_t); + static void ls_float32(std::ostream&, float); + static void ls_float64(std::ostream&, double); + static void s_str(std::ostream&, std::string); }; \ No newline at end of file From 80b8da6749c2e333acbb71d220e5fdc5010b65be Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 27 Feb 2017 02:58:38 +0100 Subject: [PATCH 030/426] dynamically assigned render lights --- DynObj.cpp | 2 + DynObj.h | 6 +-- EU07.cpp | 3 ++ Globals.cpp | 12 +++-- Globals.h | 4 +- Ground.cpp | 101 ++++++++++++++++++++++++------------ Ground.h | 8 ++- World.cpp | 110 +++------------------------------------- dumb3d.h | 10 +++- lightarray.cpp | 75 +++++++++++++++++++++++++++ lightarray.h | 45 ++++++++++++++++ maszyna.vcxproj | 4 +- maszyna.vcxproj.filters | 6 +++ renderer.cpp | 78 ++++++++++++++++++++++++++++ renderer.h | 34 ++++++++++--- sky.cpp | 4 +- 16 files changed, 344 insertions(+), 158 deletions(-) create mode 100644 lightarray.cpp create mode 100644 lightarray.h diff --git a/DynObj.cpp b/DynObj.cpp index 18784aeb..6ff5fb66 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3760,12 +3760,14 @@ void TDynamicObject::Render() // double ObjDist= SquareMagnitude(Global::pCameraPosition-pos); if (this == Global::pUserDynamic) { // specjalne ustawienie, aby nie trzęsło +#ifdef EU07_USE_OLD_LIGHTING_MODEL if (Global::bSmudge) { // jak jest widoczna smuga, to pojazd renderować po // wyrenderowaniu smugi glPopMatrix(); // a to trzeba zebrać przed wyjściem return; } +#endif // if (Global::pWorld->) //tu trzeba by ustawić animacje na modelu // zewnętrznym glLoadIdentity(); // zacząć od macierzy jedynkowej diff --git a/DynObj.h b/DynObj.h index 2c675cc0..b5ff3e04 100644 --- a/DynObj.h +++ b/DynObj.h @@ -420,7 +420,7 @@ public: // modele składowe pojazdu void Render(); void RenderAlpha(); void RenderSounds(); - inline vector3 GetPosition() + inline vector3 GetPosition() const { return vPosition; }; @@ -436,7 +436,7 @@ public: // modele składowe pojazdu { return iAxleFirst ? Axle1.pPosition : Axle0.pPosition; }; - inline vector3 VectorFront() + inline vector3 VectorFront() const { return vFront; }; @@ -456,7 +456,7 @@ public: // modele składowe pojazdu { return MoverParameters->Vel; }; - inline double GetLength() + inline double GetLength() const { return MoverParameters->Dim.L; }; diff --git a/EU07.cpp b/EU07.cpp index 4265784f..1f0e01b9 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -718,6 +718,9 @@ int WINAPI WinMain(HINSTANCE hInstance, // instance fullscreen)) return 0; // quit if window was not created SetForegroundWindow(hWnd); + + GfxRenderer.Init(); + // McZapkie: proba przeplukania klawiatury Console *pConsole = new Console(); // Ra: nie wiem, czy ma to sens, ale jakoś zainicjowac trzeba while (Console::Pressed(VK_F10)) diff --git a/Globals.cpp b/Globals.cpp index 36a331af..532ace49 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -104,8 +104,7 @@ GLfloat Global::diffuseLight[] = {0.85f, 0.85f, 0.80f, 1.0f}; GLfloat Global::specularLight[] = {0.95f, 0.94f, 0.90f, 1.0f}; #else opengl_light Global::DayLight; -opengl_light Global::VehicleLight; -opengl_light Global::VehicleLightRear; +int Global::DynamicLightCount{ 3 }; #endif GLfloat Global::whiteLight[] = {1.00f, 1.00f, 1.00f, 1.0f}; GLfloat Global::noLight[] = {0.00f, 0.00f, 0.00f, 1.0f}; @@ -577,7 +576,14 @@ void Global::ConfigParse(cParser &Parser) std::tm *localtime = std::localtime(&timenow); Global::fMoveLight = localtime->tm_yday + 1; // numer bieżącego dnia w roku } - // TODO: calculate lights single time here for static setup. or get rid of static setup + } + else if( token == "dynamiclights" ) { + // number of dynamic lights in the scene + Parser.getTokens( 1, false ); + Parser >> Global::DynamicLightCount; + // clamp the light number + Global::DynamicLightCount = std::min( 7, Global::DynamicLightCount ); // max 8 lights per opengl specs, and one used for sun + Global::DynamicLightCount = std::max( 1, Global::DynamicLightCount ); // at least one light for controlled vehicle } else if (token == "smoothtraction") { diff --git a/Globals.h b/Globals.h index 2690f9a0..0236006e 100644 --- a/Globals.h +++ b/Globals.h @@ -233,9 +233,7 @@ class Global #else // TODO: put these things in the renderer static opengl_light DayLight; - // TODO: possibly create a pool of few lights which can be attached to nearby vehicles - static opengl_light VehicleLight; - static opengl_light VehicleLightRear; + static int DynamicLightCount; #endif static GLfloat whiteLight[]; static GLfloat noLight[]; diff --git a/Ground.cpp b/Ground.cpp index d8185741..5a298282 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1841,29 +1841,20 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) case TP_DYNAMIC: tmp->DynamicObject = new TDynamicObject(); // tmp->DynamicObject->Load(Parser); - parser->getTokens(); - *parser >> token; - str1 = token; // katalog - // McZapkie: doszedl parametr ze zmienialna skora - parser->getTokens(); - *parser >> token; - Skin = token; // tekstura wymienna - parser->getTokens(); - *parser >> token; - str3 = token; // McZapkie-131102: model w MMD + parser->getTokens(3); + *parser + >> str1 // katalog + >> Skin // tekstura wymienna + >> str3; // McZapkie-131102: model w MMD if (bTrainSet) { // jeśli pojazd jest umieszczony w składzie str = asTrainSetTrack; - parser->getTokens(); - *parser >> tf1; // Ra: -1 oznacza odwrotne wstawienie, normalnie w składzie 0 - parser->getTokens(); - *parser >> token; - DriverType = token; // McZapkie:010303 - w przyszlosci rozne - // konfiguracje mechanik/pomocnik itp + parser->getTokens(3); + *parser + >> tf1 // Ra: -1 oznacza odwrotne wstawienie, normalnie w składzie 0 + >> DriverType // McZapkie:010303 - w przyszlosci rozne konfiguracje mechanik/pomocnik itp + >> str4; tf3 = fTrainSetVel; // prędkość - parser->getTokens(); - *parser >> token; - str4 = token; int2 = str4.find("."); // yB: wykorzystuje tutaj zmienna, ktora potem bedzie ladunkiem if (int2 != string::npos) // yB: jesli znalazl kropke, to ja przetwarza jako parametry { @@ -1892,17 +1883,12 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) fTrainSetDist = 0; // zerowanie dodatkowego przesunięcia asTrainName = ""; // puste oznacza jazdę pojedynczego bez rozkładu, "none" jest dla // składu (trainset) - parser->getTokens(); - *parser >> token; - str = token; // track - parser->getTokens(); - *parser >> tf1; // Ra: -1 oznacza odwrotne wstawienie - parser->getTokens(); - *parser >> token; - DriverType = token; // McZapkie:010303: obsada - parser->getTokens(); - *parser >> - tf3; // prędkość, niektórzy wpisują tu "3" jako sprzęg, żeby nie było tabliczki + parser->getTokens(4); + *parser + >> str // track + >> tf1 // Ra: -1 oznacza odwrotne wstawienie + >> DriverType // McZapkie:010303: obsada + >> tf3; // prędkość, niektórzy wpisują tu "3" jako sprzęg, żeby nie było tabliczki iTrainSetWehicleNumber = 0; TempConnectionType[iTrainSetWehicleNumber] = 3; // likwidacja tabliczki na końcu? } @@ -1911,8 +1897,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) if (int2 > 0) { // jeżeli ładunku jest więcej niż 0, to rozpoznajemy jego typ parser->getTokens(); - *parser >> token; - str2 = token; // LoadType + *parser >> str2; // LoadType if (str2 == "enddynamic") // idiotoodporność: ładunek bez podanego typu { str2 = ""; @@ -1986,6 +1971,16 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } if (token.compare("enddynamic") != 0) Error("enddynamic statement missing"); +/* + if( tmp->DynamicObject->MoverParameters->LightPowerSource.SourceType != TPowerSource::NotDefined ) { + // if the vehicle has defined light source, it can (potentially) emit light, so add it to the light array +*/ + if( tmp->DynamicObject->MoverParameters->SecuritySystem.SystemType != 0 ) { + // we check for presence of security system, as a way to determine whether the vehicle is a controllable engine + // NOTE: this isn't 100% precise, e.g. middle EZT module comes with security system, while it has no lights + m_lights.insert( tmp->DynamicObject ); + } + break; case TP_MODEL: if (rmin < 0) @@ -4558,6 +4553,25 @@ bool TGround::Update(double dt, int iter) return true; }; +// updates scene lights array +void +TGround::Update_Lights() { + + m_lights.update(); + // arrange the light array from closest to farthest from current position of the camera + auto const camera = Global::pCameraPosition; + std::sort( + m_lights.data.begin(), + m_lights.data.end(), + [&]( light_array::light_record const &Left, light_array::light_record const &Right ) { + // move lights which are off at the end... + if( Left.intensity == 0.0f ) { return false; } + if( Right.intensity == 0.0f ) { return true; } + // ...otherwise prefer closer and/or brigher light sources + return ((camera - Left.position).LengthSquared() * (1.0f - Left.intensity)) < ((camera - Right.position).LengthSquared() * (1.0f - Right.intensity)); + } ); +} + // Winger 170204 - szukanie trakcji nad pantografami bool TGround::GetTraction(TDynamicObject *model) { // aktualizacja drutu zasilającego dla każdego pantografu, żeby odczytać napięcie @@ -4808,6 +4822,27 @@ bool TGround::GetTraction(TDynamicObject *model) return true; }; +bool +TGround::Render( Math3D::vector3 const &Camera ) { + + GfxRenderer.Update_Lights( m_lights ); + + if( Global::bUseVBO ) { // renderowanie przez VBO + if( !RenderVBO( Camera ) ) + return false; + if( !RenderAlphaVBO( Camera ) ) + return false; + } + else { // renderowanie przez Display List + if( !RenderDL( Camera ) ) + return false; + if( !RenderAlphaDL( Camera ) ) + return false; + } + + return true; +} + bool TGround::RenderDL(vector3 pPosition) { // renderowanie scenerii z Display List - faza nieprzezroczystych glDisable(GL_BLEND); @@ -5339,6 +5374,8 @@ void TGround::DynamicRemove(TDynamicObject *dyn) node = (*n); // zapamiętanie węzła, aby go usunąć (*n) = node->nNext; // pominięcie na liście Global::TrainDelete(d); + // remove potential entries in the light array + m_lights.remove( d ); d = d->Next(); // przejście do kolejnego pojazdu, póki jeszcze jest delete node; // usuwanie fizyczne z pamięci } diff --git a/Ground.h b/Ground.h index b78023d6..41f1672d 100644 --- a/Ground.h +++ b/Ground.h @@ -16,7 +16,9 @@ http://mozilla.org/MPL/2.0/. #include "ResourceManager.h" #include "Texture.h" #include "dumb3d.h" +#include "Float3d.h" #include "Names.h" +#include "lightarray.h" using namespace Math3D; @@ -303,11 +305,11 @@ class TGround TNames *sTracks = nullptr; // posortowane nazwy torów i eventów #else typedef std::unordered_map event_map; -// typedef std::unordered_map groundnode_map; event_map m_eventmap; -// groundnode_map m_memcellmap, m_modelmap, m_trackmap; TNames m_trackmap; #endif + light_array m_lights; // collection of dynamic light sources present in the scene + private: // metody prywatne bool EventConditon(TEvent *e); @@ -350,8 +352,10 @@ class TGround void MoveGroundNode(vector3 pPosition); void UpdatePhys(double dt, int iter); // aktualizacja fizyki stałym krokiem bool Update(double dt, int iter); // aktualizacja przesunięć zgodna z FPS + void Update_Lights(); // updates scene lights array bool AddToQuery(TEvent *Event, TDynamicObject *Node); bool GetTraction(TDynamicObject *model); + bool Render( Math3D::vector3 const &Camera ); bool RenderDL(vector3 pPosition); bool RenderAlphaDL(vector3 pPosition); bool RenderVBO(vector3 pPosition); diff --git a/World.cpp b/World.cpp index 940ee222..9fd96101 100644 --- a/World.cpp +++ b/World.cpp @@ -512,25 +512,6 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Global::DayLight.diffuse[ 0 ] = 255.0 / 255.0; Global::DayLight.diffuse[ 1 ] = 242.0 / 255.0; Global::DayLight.diffuse[ 2 ] = 231.0 / 255.0; - - Global::VehicleLight.id = opengl_renderer::vehiclelight; - // directional light - Global::VehicleLight.position[ 3 ] = 1.0f; - ::glLightf( opengl_renderer::vehiclelight, GL_SPOT_CUTOFF, 20.0f ); - ::glLightf( opengl_renderer::vehiclelight, GL_SPOT_EXPONENT, 10.0f ); - ::glLightf( opengl_renderer::vehiclelight, GL_CONSTANT_ATTENUATION, 0.0f ); - ::glLightf( opengl_renderer::vehiclelight, GL_LINEAR_ATTENUATION, 0.035f ); - // halogen light. TODO: allow light type definition - Global::VehicleLight.diffuse[ 0 ] = 255.0 / 255.0; - Global::VehicleLight.diffuse[ 1 ] = 241.0 / 255.0; - Global::VehicleLight.diffuse[ 2 ] = 224.0 / 255.0; - // rear light - Global::VehicleLightRear = Global::VehicleLight; - Global::VehicleLightRear.id = opengl_renderer::vehiclelightrear; - ::glLightf( opengl_renderer::vehiclelightrear, GL_SPOT_CUTOFF, 20.0f ); - ::glLightf( opengl_renderer::vehiclelightrear, GL_SPOT_EXPONENT, 10.0f ); - ::glLightf( opengl_renderer::vehiclelightrear, GL_CONSTANT_ATTENUATION, 0.0f ); - ::glLightf( opengl_renderer::vehiclelightrear, GL_LINEAR_ATTENUATION, 0.035f ); #endif Ground.Init(Global::SceneryFile, hDC); @@ -1256,6 +1237,8 @@ bool TWorld::Update() Ground.CheckQuery(); + Ground.Update_Lights(); + if( Train != nullptr ) { TSubModel::iInstance = reinterpret_cast( Train->Dynamic() ); Train->Update( dt ); @@ -1275,13 +1258,6 @@ bool TWorld::Update() ( Train->Dynamic()->fShade <= 0.0 ? ( Global::fLuminance <= 0.5 ) : ( Train->Dynamic()->fShade * Global::fLuminance <= 0.5 ) ) ); - - // match the vehicle light position with new position of the vehicle - Global::VehicleLight.set_position( Train->Dynamic()->GetPosition() + ( Train->Dynamic()->VectorFront() * Train->Dynamic()->GetLength() * 0.45 ) ); - Global::VehicleLight.direction = Train->Dynamic()->VectorFront(); - Global::VehicleLightRear.set_position( Train->Dynamic()->GetPosition() - ( Train->Dynamic()->VectorFront() * Train->Dynamic()->GetLength() * 0.45 ) ); - Global::VehicleLightRear.direction = Train->Dynamic()->VectorFront(); - Global::VehicleLightRear.direction.RotateY( M_PI ); } m_init = true; @@ -1556,78 +1532,11 @@ bool TWorld::Render() Environment.render(); } - // enable vehicle light, if it's present and on - if( nullptr != Train ) { + if( false == Ground.Render( Camera.Pos ) ) { return false; } - auto const &frontlights = Train->Controlled()->iLights[ 0 ]; - int const frontlightcount = 0 + - ( ( frontlights & 1 ) ? 1 : 0 ) + - ( ( frontlights & 4 ) ? 1 : 0 ) + - ( ( frontlights & 16 ) ? 1 : 0 ); - - if( ( true == Train->Controlled()->Battery ) - && ( frontlightcount > 0 ) ) { - // halogen light. TODO: allow light type definition - Global::VehicleLight.ambient[ 0 ] = 0.15f * 255.0 * frontlightcount / 255.0; - Global::VehicleLight.ambient[ 1 ] = 0.15f * 241.0 * frontlightcount / 255.0; - Global::VehicleLight.ambient[ 2 ] = 0.15f * 224.0 * frontlightcount / 255.0; - - ::glLightf( opengl_renderer::vehiclelight, GL_LINEAR_ATTENUATION, 0.3f / pow(frontlightcount, 2) ); - glEnable( GfxRenderer.vehiclelight ); - Global::VehicleLight.apply_intensity(); - Global::VehicleLight.apply_angle(); - } - else { - glDisable( GfxRenderer.vehiclelight ); - } - auto const &rearlights = Train->Controlled()->iLights[ 1 ]; - int const rearlightcount = 0 + - ( ( rearlights & 1 ) ? 1 : 0 ) + - ( ( rearlights & 4 ) ? 1 : 0 ) + - ( ( rearlights & 16 ) ? 1 : 0 ); - - if( ( true == Train->Controlled()->Battery ) - && ( rearlightcount > 0 ) ) { - // halogen light. TODO: allow light type definition - Global::VehicleLightRear.ambient[ 0 ] = 0.15f * 255.0 * rearlightcount / 255.0; - Global::VehicleLightRear.ambient[ 1 ] = 0.15f * 241.0 * rearlightcount / 255.0; - Global::VehicleLightRear.ambient[ 2 ] = 0.15f * 224.0 * rearlightcount / 255.0; - - ::glLightf( opengl_renderer::vehiclelightrear, GL_LINEAR_ATTENUATION, 0.3f / pow( rearlightcount, 2 ) ); - glEnable( GfxRenderer.vehiclelightrear ); - Global::VehicleLightRear.apply_intensity(); - Global::VehicleLightRear.apply_angle(); - } - else { - glDisable( GfxRenderer.vehiclelightrear ); - } - } - - if (Global::bUseVBO) - { // renderowanie przez VBO - if (!Ground.RenderVBO(Camera.Pos)) - return false; - if (!Ground.RenderAlphaVBO(Camera.Pos)) - return false; - } - else - { // renderowanie przez Display List - if (!Ground.RenderDL(Camera.Pos)) - return false; - if (!Ground.RenderAlphaDL(Camera.Pos)) - return false; - } -/* - TSubModel::iInstance = (int)(Train ? Train->Dynamic() : 0); //żeby nie robić cudzych animacji - // if (Camera.Type==tp_Follow) - if (Train) - Train->Update(); -*/ Render_Cab(); Render_UI(); -// glFlush(); - // Global::bReCompile=false; //Ra: już zrobiona rekompilacja ResourceManager::Sweep( Timer::GetSimulationTime() ); return true; @@ -1652,6 +1561,7 @@ TWorld::Render_Cab() { // ABu: Rendering kabiny jako ostatniej, zeby bylo widac przez szyby, tylko w widoku ze srodka return; } + /* // ABu: Rendering kabiny jako ostatniej, zeby bylo widac przez szyby, tylko w widoku ze srodka if( ( Train->Dynamic()->mdKabina != Train->Dynamic()->mdModel ) && @@ -1777,18 +1687,18 @@ TWorld::Render_Cab() { glEnable( GL_FOG ); } } -*/ + glEnable( GL_LIGHTING ); // po renderowaniu smugi jest to wyłączone // Ra: pojazd użytkownika należało by renderować po smudze, aby go nie rozświetlała Global::bSmudge = false; // aby model użytkownika się teraz wyrenderował dynamic->Render(); dynamic->RenderAlpha(); // przezroczyste fragmenty pojazdów na torach -/* + } // yB: moje smuuugi 1 - koniec else - glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone. TODO: have the wires render take care of its own shit -*/ +*/ glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone. TODO: have the wires render take care of its own shit + if( dynamic->mdKabina ) // bo mogła zniknąć przy przechodzeniu do innego pojazdu { #ifdef EU07_USE_OLD_LIGHTING_MODEL @@ -1874,10 +1784,6 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_DIFFUSE, diffuseCabLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, specularCabLight ); #else - // cab shouldn't get affected by the vehicle light, so we disable it here - ::glDisable( GfxRenderer.vehiclelight ); - ::glDisable( GfxRenderer.vehiclelightrear ); - if( dynamic->InteriorLightLevel > 0.0f ) { // crude way to light the cabin, until we have something more complete in place diff --git a/dumb3d.h b/dumb3d.h index 0d93b8e3..23dd5ce5 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -83,7 +83,8 @@ class vector3 void inline Normalize(); void inline SafeNormalize(); - double inline Length(); + double inline Length() const; + double inline LengthSquared() const; void inline Zero() { x = y = z = 0.0; @@ -435,11 +436,16 @@ void inline vector3::Normalize() z *= il; } -double inline vector3::Length() +double inline vector3::Length() const { return SQRT_FUNCTION(x * x + y * y + z * z); } +double inline vector3::LengthSquared() const { + + return ( x * x + y * y + z * z ); +} + inline bool operator==(const matrix4x4 &m1, const matrix4x4 &m2) { for (int x = 0; x < 4; ++x) diff --git a/lightarray.cpp b/lightarray.cpp new file mode 100644 index 00000000..6ad61a7f --- /dev/null +++ b/lightarray.cpp @@ -0,0 +1,75 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +/* + MaSzyna EU07 locomotive simulator + Copyright (C) 2001-2004 Marcin Wozniak and others + +*/ + +#include "stdafx.h" +#include "lightarray.h" +#include "dynobj.h" + +void +light_array::insert( TDynamicObject const *Owner ) { + + // we're only storing lights for locos, which have two sets of lights, front and rear + // for a more generic role this function would have to be tweaked to add vehicle type-specific light combinations + data.emplace_back( Owner, 0 ); + data.emplace_back( Owner, 1 ); +} + +void +light_array::remove( TDynamicObject const *Owner ) { + + data.erase( + std::remove_if( + data.begin(), + data.end(), + [=]( light_record const &light ){ return light.owner == Owner; } ), + data.end() ); +} + +// updates records in the collection +void +light_array::update() { + + for( auto &light : data ) { + // update light parameters to match current data of the owner + if( light.index == 0 ) { + // front light set + light.position = light.owner->GetPosition() + ( light.owner->VectorFront() * light.owner->GetLength() * 0.45 ); + light.direction = light.owner->VectorFront(); + } + else { + // rear light set + light.position = light.owner->GetPosition() - ( light.owner->VectorFront() * light.owner->GetLength() * 0.45 ); + light.direction = light.owner->VectorFront(); + light.direction.x = -light.direction.x; + light.direction.z = -light.direction.z; + } + // determine intensity of this light set + if( true == light.owner->MoverParameters->Battery ) { + // with battery on, the intensity depends on the state of activated switches + auto const &lightbits = light.owner->iLights[ light.index ]; + light.count = 0 + + ( ( lightbits & 1 ) ? 1 : 0 ) + + ( ( lightbits & 4 ) ? 1 : 0 ) + + ( ( lightbits & 16 ) ? 1 : 0 ); + + light.intensity = 0.15f * light.count; // TODO: intensity can be affected further by dim switch or other factors + } + else { + // with battery off the lights are off + light.intensity = 0.0f; + light.count = 0; + } + } +} diff --git a/lightarray.h b/lightarray.h new file mode 100644 index 00000000..34b317d9 --- /dev/null +++ b/lightarray.h @@ -0,0 +1,45 @@ +#pragma once + +#include +#include "dumb3d.h" +#include "float3d.h" +#include "dynobj.h" + +// collection of virtual light sources present in the scene +// used by the renderer to determine most suitable placement for actual light sources during render +struct light_array { + +public: +// types + struct light_record { + + light_record( TDynamicObject const *Owner, int const Lightindex) : + owner(Owner), index(Lightindex) + {}; + + TDynamicObject const *owner; // the object in world which 'carries' the light + int index{ -1 }; // 0: front lights, 1: rear lights + Math3D::vector3 position; // position of the light in 3d scene + Math3D::vector3 direction; // direction of the light in 3d scene + float3 color{ 255.0f / 255.0f, 241.0f / 255.0f, 224.0f / 255.0f }; // color of the light, default is halogen light + float intensity{ 0.0f }; // (combined) intensity of the light(s) + int count{ 0 }; // number (or pattern) of active light(s) + }; + +// methods + // adds records for lights of specified owner to the collection + void + insert( TDynamicObject const *Owner ); + // removes records for lights of specified owner from the collection + void + remove( TDynamicObject const *Owner ); + // updates records in the collection + void + update(); + +// types + typedef std::vector lightrecord_array; + +// members + lightrecord_array data; +}; diff --git a/maszyna.vcxproj b/maszyna.vcxproj index 0f287655..b9d71414 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -104,6 +104,7 @@ + @@ -166,6 +167,7 @@ + @@ -222,4 +224,4 @@ - + \ No newline at end of file diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index e38ea0db..e124aab2 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -201,6 +201,9 @@ Source Files + + Source Files + @@ -392,6 +395,9 @@ Header Files + + Header Files + diff --git a/renderer.cpp b/renderer.cpp index 13fdb85b..809560cc 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -9,7 +9,85 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "renderer.h" +#include "globals.h" opengl_renderer GfxRenderer; +void +opengl_renderer::Init() { + + // create dynamic light pool + for( int idx = 0; idx < Global::DynamicLightCount; ++idx ) { + + opengl_light light; + light.id = GL_LIGHT1 + idx; + + light.position[ 3 ] = 1.0f; + ::glLightf( light.id, GL_SPOT_CUTOFF, 20.0f ); + ::glLightf( light.id, GL_SPOT_EXPONENT, 10.0f ); + ::glLightf( light.id, GL_CONSTANT_ATTENUATION, 0.0f ); + ::glLightf( light.id, GL_LINEAR_ATTENUATION, 0.035f ); + + m_lights.emplace_back( light ); + } +} + +void +opengl_renderer::Update_Lights( light_array const &Lights ) { + + int const count = std::min( m_lights.size(), Lights.data.size() ); + if( count == 0 ) { return; } + + auto renderlight = m_lights.begin(); + + for( auto const &scenelight : Lights.data ) { + + if( renderlight == m_lights.end() ) { + // we ran out of lights to assign + break; + } + if( scenelight.intensity == 0.0f ) { + // all lights past this one are bound to be off + break; + } + if( ( Global::pCameraPosition - scenelight.position ).Length() > 1000.0f ) { + // we don't care about lights past arbitrary limit of 1 km. + // but there could still be weaker lights which are closer, so keep looking + continue; + } + // if the light passed tests so far, it's good enough + renderlight->set_position( scenelight.position ); + renderlight->direction = scenelight.direction; + + renderlight->diffuse[ 0 ] = scenelight.color.x; + renderlight->diffuse[ 1 ] = scenelight.color.y; + renderlight->diffuse[ 2 ] = scenelight.color.z; + renderlight->ambient[ 0 ] = scenelight.color.x * scenelight.intensity; + renderlight->ambient[ 1 ] = scenelight.color.y * scenelight.intensity; + renderlight->ambient[ 2 ] = scenelight.color.z * scenelight.intensity; + + ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, 0.3f / std::pow( scenelight.count, 2 ) ); + ::glEnable( renderlight->id ); + + renderlight->apply_intensity(); + renderlight->apply_angle(); + + ++renderlight; + } + + while( renderlight != m_lights.end() ) { + // if we went through all scene lights and there's still opengl lights remaining, kill these + ::glDisable( renderlight->id ); + ++renderlight; + } +} + +void +opengl_renderer::Disable_Lights() { + + for( int idx = 0; idx < m_lights.size() + 1; ++idx ) { + + ::glDisable( GL_LIGHT0 + idx ); + } +} //--------------------------------------------------------------------------- diff --git a/renderer.h b/renderer.h index 69e39ca7..ed0c3ba5 100644 --- a/renderer.h +++ b/renderer.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "opengl/glew.h" #include "texture.h" +#include "lightarray.h" #include "dumb3d.h" struct opengl_light { @@ -23,10 +24,10 @@ struct opengl_light { GLfloat specular[ 4 ]; opengl_light() { - position[ 0 ] = position[ 1 ] = position[ 2 ] = 0.0f; position[ 3 ] = 1.0f; - ambient[ 0 ] = ambient[ 1 ] = ambient[ 2 ] = 0.0f; ambient[ 3 ] = 1.0f; - diffuse[ 0 ] = diffuse[ 1 ] = diffuse[ 2 ] = diffuse[ 3 ] = 1.0f; - specular[ 0 ] = specular[ 1 ] = specular[ 2 ] = specular[ 3 ] = 1.0f; + position[ 0 ] = position[ 1 ] = position[ 2 ] = 0.0f; position[ 3 ] = 1.0f; // 0,0,0,1 + ambient[ 0 ] = ambient[ 1 ] = ambient[ 2 ] = 0.0f; ambient[ 3 ] = 1.0f; // 0,0,0,1 + diffuse[ 0 ] = diffuse[ 1 ] = diffuse[ 2 ] = diffuse[ 3 ] = 1.0f; // 1,1,1,1 + specular[ 0 ] = specular[ 1 ] = specular[ 2 ] = specular[ 3 ] = 1.0f; // 1,1,1,1 } inline @@ -72,33 +73,50 @@ struct opengl_material { class opengl_renderer { public: - GLenum static const sunlight{ GL_LIGHT0 }; - GLenum static const vehiclelight{ GL_LIGHT1 }; - GLenum static const vehiclelightrear{ GL_LIGHT2 }; +// types + +// methods + void + Init(); + + void + Update_Lights( light_array const &Lights ); + + void + Disable_Lights(); texture_manager::size_type GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ) { return m_textures.GetTextureId( Filename, Dir, Filter, Loadnow ); } + void Bind( texture_manager::size_type const Id ) { // temporary until we separate the renderer m_textures.Bind( Id ); } + opengl_texture & Texture( texture_manager::size_type const Id ) { return m_textures.Texture( Id ); } +// members + GLenum static const sunlight{ GL_LIGHT0 }; + private: +// types enum class rendermode { color }; + typedef std::vector opengllight_array; + +// members rendermode renderpass{ rendermode::color }; - + opengllight_array m_lights; texture_manager m_textures; }; diff --git a/sky.cpp b/sky.cpp index 78932cf7..7c3aa79f 100644 --- a/sky.cpp +++ b/sky.cpp @@ -36,7 +36,7 @@ void TSky::Render( float3 const &Tint ) glLightfv(GL_LIGHT0, GL_POSITION, lightPos); #else ::glEnable( GL_LIGHTING ); - ::glDisable( GL_LIGHT0 ); + GfxRenderer.Disable_Lights(); ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &Tint.x ); #endif if (Global::bUseVBO) @@ -56,7 +56,7 @@ void TSky::Render( float3 const &Tint ) #else GLfloat noambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, noambient ); - ::glEnable( GL_LIGHT0 ); + ::glEnable( GL_LIGHT0 ); // other lights will be enabled during lights update ::glDisable( GL_LIGHTING ); #endif } From 8336e782e8a0ca73a96eec60d071df64eb581e46 Mon Sep 17 00:00:00 2001 From: VB Date: Mon, 27 Feb 2017 12:59:21 +0100 Subject: [PATCH 031/426] =?UTF-8?q?poprawne=20=C5=82adowanie=20opacity=20z?= =?UTF-8?q?=20e3d,=20wy=C5=82=C4=85czenie=20glfw=20auto=20iconify?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EU07.cpp | 1 + Model3d.cpp | 11 ----------- Model3d.h | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 9cdf0f7c..25bcf955 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -152,6 +152,7 @@ int main(int argc, char *argv[]) glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); + glfwWindowHint(GLFW_AUTO_ICONIFY, GLFW_FALSE); glfwWindowHint(GLFW_SAMPLES, Global::iMultisampling); GLFWwindow *window = diff --git a/Model3d.cpp b/Model3d.cpp index 7c7c65ff..5deba44c 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -2015,17 +2015,6 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, if (pTexture.find_last_of("/\\") == std::string::npos) pTexture.insert(0, Global::asCurrentTexturePath); TextureID = GfxRenderer.GetTextureId(pTexture, szTexturePath); - // TexAlpha=TTexturesManager::GetAlpha(TextureID); //zmienna robocza - // ustawienie cyklu przezroczyste/nieprzezroczyste zależnie od własności - // stałej tekstury - // iFlags=(iFlags&~0x30)|(TTexturesManager::GetAlpha(TextureID)?0x20:0x10); - // //0x10-nieprzezroczysta, 0x20-przezroczysta - if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity 0! - iFlags |= GfxRenderer.Texture(TextureID).has_alpha ? - 0x20 : - 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta - else - iFlags |= 0x10; // normalnie nieprzezroczyste } else TextureID = iTexture; diff --git a/Model3d.h b/Model3d.h index 54d99f4a..a67bd66f 100644 --- a/Model3d.h +++ b/Model3d.h @@ -190,7 +190,7 @@ private: bool bWire; // nie używane, ale wczytywane // short TexAlpha; //Ra: nie używane już GLuint uiDisplayList; // roboczy numer listy wyświetlania - float Opacity; // nie używane, ale wczytywane + float Opacity; // nie używane, ale wczytywane //m7todo: wywalić to // ABu: te same zmienne, ale zdublowane dla Render i RenderAlpha, // bo sie chrzanilo przemieszczanie obiektow. // Ra: już się nie chrzani From c49b774864ce497b88d37fccdd7082403a7e4b26 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 27 Feb 2017 13:24:34 +0100 Subject: [PATCH 032/426] light "fix" for multi-unit trains --- lightarray.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lightarray.cpp b/lightarray.cpp index 6ad61a7f..7f5a717d 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "lightarray.h" #include "dynobj.h" +#include "driver.h" void light_array::insert( TDynamicObject const *Owner ) { @@ -65,6 +66,16 @@ light_array::update() { ( ( lightbits & 16 ) ? 1 : 0 ); light.intensity = 0.15f * light.count; // TODO: intensity can be affected further by dim switch or other factors + + // crude catch for unmanned modules which share the light state with the controlled unit. + // why don't they get their own light bits btw ._. + // TODO, TBD: have separate light bits for each vehicle, so this override isn't necessary + if( ( light.owner->Controller == AIdriver ) + && ( light.owner->Mechanik == nullptr ) ) { + + light.intensity = 0.0f; + light.count = 0; + } } else { // with battery off the lights are off From 82109b03be4ebcf2782e0b08cddbd670c3f26f69 Mon Sep 17 00:00:00 2001 From: VB Date: Mon, 27 Feb 2017 13:51:07 +0100 Subject: [PATCH 033/426] ups --- EU07.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/EU07.cpp b/EU07.cpp index 25bcf955..d3516074 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -195,6 +195,7 @@ int main(int argc, char *argv[]) return -1; } + GfxRenderer.Init(); Console *pConsole = new Console(); // Ra: nie wiem, czy ma to sens, ale jakoś zainicjowac trzeba if (!joyGetNumDevs()) From 5a8c158dcaa94bc9fa71fd461093ecb0875d2dc0 Mon Sep 17 00:00:00 2001 From: VB Date: Mon, 27 Feb 2017 17:48:26 +0100 Subject: [PATCH 034/426] =?UTF-8?q?przywr=C3=B3cenie=20auto=20iconify,=20f?= =?UTF-8?q?ix=20f1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EU07.cpp | 1 - World.cpp | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index d3516074..2ddaf4da 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -152,7 +152,6 @@ int main(int argc, char *argv[]) glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); - glfwWindowHint(GLFW_AUTO_ICONIFY, GLFW_FALSE); glfwWindowHint(GLFW_SAMPLES, Global::iMultisampling); GLFWwindow *window = diff --git a/World.cpp b/World.cpp index 9cf8263b..3ec2d46a 100644 --- a/World.cpp +++ b/World.cpp @@ -675,8 +675,8 @@ void TWorld::OnKeyDown(int cKey) GlobalTime->UpdateMTableTime( 5.0 * 60.0 ); } } - if( (Global::ctrlState) - && (Global::shiftState) ) { + if( (!Global::ctrlState) + && (!Global::shiftState) ) { // czas i relacja if( Global::iTextMode == cKey ) { // wyłączenie napisów, chyba że pauza @@ -789,7 +789,7 @@ void TWorld::OnKeyDown(int cKey) // else if (cKey=='3') Global::iWriteLogEnabled^=4; //wypisywanie nazw torów } } - else if (cKey == 3) //[Ctrl]+[Break] + else if (Global::ctrlState && GLFW_KEY_PAUSE) //[Ctrl]+[Break] { // hamowanie wszystkich pojazdów w okolicy if (Controlled->MoverParameters->Radio) Ground.RadioStop(Camera.Pos); From 58b183d4627f87f5e31265fc424a5025c5e4ccb8 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 28 Feb 2017 17:33:54 +0100 Subject: [PATCH 035/426] support for K type brakes, tweaks to external camera positioning --- DynObj.h | 4 +- Globals.cpp | 3 + McZapkie/Mover.cpp | 187 +++++++++++++++++++++++---------------------- World.cpp | 46 ++++++----- World.h | 4 +- 5 files changed, 131 insertions(+), 113 deletions(-) diff --git a/DynObj.h b/DynObj.h index b5ff3e04..e90f60ee 100644 --- a/DynObj.h +++ b/DynObj.h @@ -444,7 +444,7 @@ public: // modele składowe pojazdu { return vUp; }; - inline vector3 VectorLeft() + inline vector3 VectorLeft() const { return vLeft; }; @@ -460,7 +460,7 @@ public: // modele składowe pojazdu { return MoverParameters->Dim.L; }; - inline double GetWidth() + inline double GetWidth() const { return MoverParameters->Dim.W; }; diff --git a/Globals.cpp b/Globals.cpp index 532ace49..fd40e5b1 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -495,7 +495,10 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> token; +/* Global::bUseVBO = (token == "yes"); +*/ + Global::bUseVBO = false; // temporarily disabled until render paths are sorted out } else if (token == "feedbackmode") { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 065df7a5..89c47a26 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3005,98 +3005,105 @@ void TMoverParameters::UpdatePipePressure(double dt) // if (Hamulec is typeid(TWest)) return 0; - switch (BrakeValve) - { - case W: - { - if (BrakeLocHandle != NoHandle) + switch (BrakeValve) { + + case K: + case W: { + + if( BrakeLocHandle != NoHandle ) { + LocBrakePress = LocHandle->GetCP(); + + //(Hamulec as TWest).SetLBP(LocBrakePress); + Hamulec->SetLBP( LocBrakePress ); + } + if( MBPM < 2 ) + //(Hamulec as TWest).PLC(MaxBrakePress[LoadFlag]) + Hamulec->PLC( MaxBrakePress[ LoadFlag ] ); + else + //(Hamulec as TWest).PLC(TotalMass); + Hamulec->PLC( TotalMass ); + break; + } + + case LSt: + case EStED: { + + LocBrakePress = LocHandle->GetCP(); + for( int b = 0; b < 2; b++ ) + if( ( ( TrainType & ( dt_ET41 | dt_ET42 ) ) != 0 ) && + ( Couplers[ b ].Connected != NULL ) ) // nie podoba mi się to rozwiązanie, chyba trzeba + // dodać jakiś wpis do fizyki na to + if( ( ( Couplers[ b ].Connected->TrainType & ( dt_ET41 | dt_ET42 ) ) != 0 ) && + ( ( Couplers[ b ].CouplingFlag & 36 ) == 36 ) ) + LocBrakePress = Max0R( Couplers[ b ].Connected->LocHandle->GetCP(), LocBrakePress ); + + //if ((DynamicBrakeFlag) && (EngineType == ElectricInductionMotor)) + //{ + // //if (Vel > 10) + // // LocBrakePress = 0; + // //else if (Vel > 5) + // // LocBrakePress = (10 - Vel) / 5 * LocBrakePress; + //} + + //(Hamulec as TLSt).SetLBP(LocBrakePress); + Hamulec->SetLBP( LocBrakePress ); + if( ( BrakeValve == EStED ) ) + if( MBPM < 2 ) + Hamulec->PLC( MaxBrakePress[ LoadFlag ] ); + else + Hamulec->PLC( TotalMass ); + break; + } + + case CV1_L_TR: { LocBrakePress = LocHandle->GetCP(); - - //(Hamulec as TWest).SetLBP(LocBrakePress); - Hamulec->SetLBP(LocBrakePress); + //(Hamulec as TCV1L_TR).SetLBP(LocBrakePress); + Hamulec->SetLBP( LocBrakePress ); + break; } - if (MBPM < 2) - //(Hamulec as TWest).PLC(MaxBrakePress[LoadFlag]) - Hamulec->PLC(MaxBrakePress[LoadFlag]); - else - //(Hamulec as TWest).PLC(TotalMass); - Hamulec->PLC(TotalMass); - break; - } - case LSt: - case EStED: - { - LocBrakePress = LocHandle->GetCP(); - for (int b = 0; b < 2; b++) - if (((TrainType & (dt_ET41 | dt_ET42)) != 0) && - (Couplers[b].Connected != NULL)) // nie podoba mi się to rozwiązanie, chyba trzeba - // dodać jakiś wpis do fizyki na to - if (((Couplers[b].Connected->TrainType & (dt_ET41 | dt_ET42)) != 0) && - ((Couplers[b].CouplingFlag & 36) == 36)) - LocBrakePress = Max0R(Couplers[b].Connected->LocHandle->GetCP(), LocBrakePress); - - //if ((DynamicBrakeFlag) && (EngineType == ElectricInductionMotor)) - //{ - // //if (Vel > 10) - // // LocBrakePress = 0; - // //else if (Vel > 5) - // // LocBrakePress = (10 - Vel) / 5 * LocBrakePress; - //} - - //(Hamulec as TLSt).SetLBP(LocBrakePress); - Hamulec->SetLBP(LocBrakePress); - if ((BrakeValve == EStED)) - if (MBPM < 2) - Hamulec->PLC(MaxBrakePress[LoadFlag]); - else - Hamulec->PLC(TotalMass); - break; - } - - case CV1_L_TR: - { - LocBrakePress = LocHandle->GetCP(); - //(Hamulec as TCV1L_TR).SetLBP(LocBrakePress); - Hamulec->SetLBP(LocBrakePress); - break; - } - - case EP2: - { - Hamulec->PLC(TotalMass); - break; - } - case ESt3AL2: - case NESt3: - case ESt4: - case ESt3: - { - if (MBPM < 2) - //(Hamulec as TNESt3).PLC(MaxBrakePress[LoadFlag]) - Hamulec->PLC(MaxBrakePress[LoadFlag]); - else - //(Hamulec as TNESt3).PLC(TotalMass); - Hamulec->PLC(TotalMass); - LocBrakePress = LocHandle->GetCP(); - //(Hamulec as TNESt3).SetLBP(LocBrakePress); - Hamulec->SetLBP(LocBrakePress); - break; - } - case KE: - { - LocBrakePress = LocHandle->GetCP(); - //(Hamulec as TKE).SetLBP(LocBrakePress); - Hamulec->SetLBP(LocBrakePress); - if (MBPM < 2) - //(Hamulec as TKE).PLC(MaxBrakePress[LoadFlag]) - Hamulec->PLC(MaxBrakePress[LoadFlag]); - else - //(Hamulec as TKE).PLC(TotalMass); - Hamulec->PLC(TotalMass); - break; - } + case EP2: + { + Hamulec->PLC( TotalMass ); + break; + } + case ESt3AL2: + case NESt3: + case ESt4: + case ESt3: + { + if( MBPM < 2 ) + //(Hamulec as TNESt3).PLC(MaxBrakePress[LoadFlag]) + Hamulec->PLC( MaxBrakePress[ LoadFlag ] ); + else + //(Hamulec as TNESt3).PLC(TotalMass); + Hamulec->PLC( TotalMass ); + LocBrakePress = LocHandle->GetCP(); + //(Hamulec as TNESt3).SetLBP(LocBrakePress); + Hamulec->SetLBP( LocBrakePress ); + break; + } + case KE: + { + LocBrakePress = LocHandle->GetCP(); + //(Hamulec as TKE).SetLBP(LocBrakePress); + Hamulec->SetLBP( LocBrakePress ); + if( MBPM < 2 ) + //(Hamulec as TKE).PLC(MaxBrakePress[LoadFlag]) + Hamulec->PLC( MaxBrakePress[ LoadFlag ] ); + else + //(Hamulec as TKE).PLC(TotalMass); + Hamulec->PLC( TotalMass ); + break; + } + default: + { + // unsupported brake valve type, we should never land here +// ErrorLog( "Unsupported brake valve type (" + std::to_string( BrakeValve ) + ") in " + TypeName ); +// ::PostQuitMessage( 0 ); + break; + } } // switch if ((BrakeHandle == FVel6) && (ActiveCab != 0)) @@ -7252,8 +7259,8 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) } if ( ( true == TestFlag( BrakeDelays, bdelay_G ) ) - && ( false == TestFlag(BrakeDelays, bdelay_R) ) - || ( Power > 1.0 ) ) // ustalanie srednicy przewodu glownego (lokomotywa lub napędowy + && ( ( false == TestFlag(BrakeDelays, bdelay_R ) ) + || ( Power > 1.0 ) ) ) // ustalanie srednicy przewodu glownego (lokomotywa lub napędowy Spg = 0.792; else Spg = 0.507; diff --git a/World.cpp b/World.cpp index 9fd96101..7f986aa4 100644 --- a/World.cpp +++ b/World.cpp @@ -763,7 +763,8 @@ void TWorld::OnKeyDown(int cKey) break; } case VK_F4: { - InOutKey(); + + InOutKey( !Console::Pressed( VK_SHIFT ) ); // distant view with Shift, short distance step out otherwise break; } case VK_F5: { @@ -980,7 +981,7 @@ void TWorld::OnMouseMove(double x, double y) Camera.OnCursorMove(x * Global::fMouseXScale / Global::ZoomFactor, -y * Global::fMouseYScale / Global::ZoomFactor); } -void TWorld::InOutKey() +void TWorld::InOutKey( bool const Near ) { // przełączenie widoku z kabiny na zewnętrzny i odwrotnie FreeFlyModeFlag = !FreeFlyModeFlag; // zmiana widoku if (FreeFlyModeFlag) @@ -990,7 +991,7 @@ void TWorld::InOutKey() { // Train->Dynamic()->ABuSetModelShake(vector3(0,0,0)); Train->Silence(); // wyłączenie dźwięków kabiny Train->Dynamic()->bDisplayCab = false; - DistantView(); + DistantView( Near ); } } else @@ -1010,26 +1011,33 @@ void TWorld::InOutKey() } }; -void TWorld::DistantView() +// places camera outside the controlled vehicle, or nearest if nothing is under control +// depending on provided switch the view is placed right outside, or at medium distance +void TWorld::DistantView( bool const Near ) { // ustawienie widoku pojazdu z zewnątrz - if (Controlled) // jest pojazd do prowadzenia? - { // na prowadzony + + TDynamicObject const *vehicle{ nullptr }; + if( nullptr != Controlled ) { vehicle = Controlled; } + else if( nullptr != pDynamicNearest ) { vehicle = pDynamicNearest; } + else { return; } + + if( true == Near ) { + Camera.Pos = - Controlled->GetPosition() + - (Controlled->MoverParameters->ActiveCab >= 0 ? 30 : -30) * Controlled->VectorFront() + - vector3(0, 5, 0); - Camera.LookAt = Controlled->GetPosition(); - Camera.RaLook(); // jednorazowe przestawienie kamery + vector3( Camera.Pos.x, vehicle->GetPosition().y, Camera.Pos.z ) + + vehicle->VectorLeft() * vehicle->MoverParameters->ActiveCab * vehicle->GetWidth() + + vector3( 1.25 * vehicle->MoverParameters->ActiveCab, 1.6, 0.0 ); } - else if (pDynamicNearest) // jeśli jest pojazd wykryty blisko - { // patrzenie na najbliższy pojazd - Camera.Pos = pDynamicNearest->GetPosition() + - (pDynamicNearest->MoverParameters->ActiveCab >= 0 ? 30 : -30) * - pDynamicNearest->VectorFront() + - vector3(0, 5, 0); - Camera.LookAt = pDynamicNearest->GetPosition(); - Camera.RaLook(); // jednorazowe przestawienie kamery + else { + + Camera.Pos = + vehicle->GetPosition() + + vehicle->VectorFront() * vehicle->MoverParameters->ActiveCab * 50.0 + + vector3( -10.0, 1.6, 0.0 ); } + + Camera.LookAt = vehicle->GetPosition(); + Camera.RaLook(); // jednorazowe przestawienie kamery }; void TWorld::FollowView(bool wycisz) diff --git a/World.h b/World.h index cfdff5b5..d018041e 100644 --- a/World.h +++ b/World.h @@ -35,9 +35,9 @@ private: class TWorld { - void InOutKey(); + void InOutKey( bool const Near = true ); void FollowView(bool wycisz = true); - void DistantView(); + void DistantView( bool const Near = false ); public: bool Init(HWND NhWnd, HDC hDC); From 146d6b036d60f40497be0db653ff5f31a8adc30d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 2 Mar 2017 04:28:56 +0100 Subject: [PATCH 036/426] glfw integration --- .gitignore | 1 + Camera.cpp | 38 +- Console.cpp | 7 +- DirectX/DSOUND.LIB | Bin 1536 -> 0 bytes DynObj.h | 2 +- EU07.cpp | 838 +- Globals.cpp | 194 +- Globals.h | 9 +- Ground.cpp | 37 +- Ground.h | 4 +- Model3d.h | 2 +- Segment.cpp | 1 - Texture.cpp | 2 +- Texture.h | 2 +- TextureDDS.h | 2 +- Track.h | 2 +- Traction.h | 2 +- Train.cpp | 132 +- TrkFoll.h | 4 +- VBO.cpp | 1 - World.cpp | 530 +- World.h | 10 +- geometry.h | 2 +- lightarray.cpp | 9 +- maszyna.vcxproj | 19 +- maszyna.vcxproj.filters | 25 - opengl/ARB_Multisample.cpp | 4 +- opengl/GLUT.H | 711 - opengl/glew.c | 12180 ----------------- opengl/glew.h | 20113 ----------------------------- opengl/glew32.lib | Bin 631602 -> 0 bytes opengl/glew32s.lib | Bin 2141998 -> 0 bytes opengl/glext.h | 6495 ---------- opengl/glut32.lib | Bin 13824 -> 0 bytes opengl/wglew.h | 1427 -- opengl/wglext.h | 929 -- python/include/Python-ast.h | 535 - python/include/Python.h | 178 - python/include/abstract.h | 1396 -- python/include/asdl.h | 45 - python/include/ast.h | 13 - python/include/bitset.h | 32 - python/include/boolobject.h | 36 - python/include/bufferobject.h | 33 - python/include/bytearrayobject.h | 57 - python/include/bytes_methods.h | 75 - python/include/bytesobject.h | 27 - python/include/cStringIO.h | 73 - python/include/cellobject.h | 28 - python/include/ceval.h | 153 - python/include/classobject.h | 83 - python/include/cobject.h | 89 - python/include/code.h | 107 - python/include/codecs.h | 167 - python/include/compile.h | 40 - python/include/complexobject.h | 66 - python/include/datetime.h | 239 - python/include/descrobject.h | 94 - python/include/dictobject.h | 156 - python/include/dtoa.h | 15 - python/include/enumobject.h | 17 - python/include/errcode.h | 36 - python/include/eval.h | 25 - python/include/fileobject.h | 97 - python/include/floatobject.h | 140 - python/include/frameobject.h | 89 - python/include/funcobject.h | 76 - python/include/genobject.h | 40 - python/include/graminit.h | 87 - python/include/grammar.h | 93 - python/include/import.h | 71 - python/include/intobject.h | 80 - python/include/intrcheck.h | 15 - python/include/iterobject.h | 23 - python/include/listobject.h | 68 - python/include/longintrepr.h | 103 - python/include/longobject.h | 134 - python/include/marshal.h | 25 - python/include/memoryobject.h | 74 - python/include/metagrammar.h | 18 - python/include/methodobject.h | 93 - python/include/modsupport.h | 134 - python/include/moduleobject.h | 24 - python/include/node.h | 40 - python/include/object.h | 996 -- python/include/objimpl.h | 354 - python/include/opcode.h | 162 - python/include/osdefs.h | 55 - python/include/parsetok.h | 64 - python/include/patchlevel.h | 43 - python/include/pgen.h | 18 - python/include/pgenheaders.h | 42 - python/include/py_curses.h | 176 - python/include/pyarena.h | 62 - python/include/pycapsule.h | 56 - python/include/pyconfig.h | 759 -- python/include/pyctype.h | 31 - python/include/pydebug.h | 41 - python/include/pyerrors.h | 328 - python/include/pyexpat.h | 48 - python/include/pyfpe.h | 176 - python/include/pygetopt.h | 18 - python/include/pymacconfig.h | 102 - python/include/pymactoolbox.h | 217 - python/include/pymath.h | 192 - python/include/pymem.h | 122 - python/include/pyport.h | 904 -- python/include/pystate.h | 197 - python/include/pystrcmp.h | 23 - python/include/pystrtod.h | 45 - python/include/pythonrun.h | 181 - python/include/pythread.h | 41 - python/include/rangeobject.h | 28 - python/include/setobject.h | 99 - python/include/sliceobject.h | 44 - python/include/stringobject.h | 210 - python/include/structmember.h | 99 - python/include/structseq.h | 41 - python/include/symtable.h | 98 - python/include/sysmodule.h | 32 - python/include/timefuncs.h | 23 - python/include/token.h | 85 - python/include/traceback.h | 31 - python/include/tupleobject.h | 61 - python/include/ucnhash.h | 33 - python/include/unicodeobject.h | 1413 -- python/include/warnings.h | 23 - python/include/weakrefobject.h | 75 - python/libs/_bsddb.lib | Bin 1888 -> 0 bytes python/libs/_ctypes.lib | Bin 1714 -> 0 bytes python/libs/_ctypes_test.lib | Bin 21680 -> 0 bytes python/libs/_elementtree.lib | Bin 1878 -> 0 bytes python/libs/_hashlib.lib | Bin 1732 -> 0 bytes python/libs/_msi.lib | Bin 1664 -> 0 bytes python/libs/_multiprocessing.lib | Bin 1950 -> 0 bytes python/libs/_socket.lib | Bin 1920 -> 0 bytes python/libs/_sqlite3.lib | Bin 1732 -> 0 bytes python/libs/_ssl.lib | Bin 1664 -> 0 bytes python/libs/_testcapi.lib | Bin 1748 -> 0 bytes python/libs/_tkinter.lib | Bin 1732 -> 0 bytes python/libs/bz2.lib | Bin 1646 -> 0 bytes python/libs/omf_python27.lib | Bin 103936 -> 0 bytes python/libs/pyexpat.lib | Bin 1714 -> 0 bytes python/libs/python27.lib | Bin 231346 -> 0 bytes python/libs/select.lib | Bin 1698 -> 0 bytes python/libs/unicodedata.lib | Bin 1782 -> 0 bytes python/libs/winsound.lib | Bin 1732 -> 0 bytes renderer.cpp | 6 +- renderer.h | 2 +- skydome.cpp | 68 +- skydome.h | 4 + stdafx.h | 8 + sun.h | 4 +- 153 files changed, 691 insertions(+), 56322 deletions(-) delete mode 100644 DirectX/DSOUND.LIB delete mode 100644 opengl/GLUT.H delete mode 100644 opengl/glew.c delete mode 100644 opengl/glew.h delete mode 100644 opengl/glew32.lib delete mode 100644 opengl/glew32s.lib delete mode 100644 opengl/glext.h delete mode 100644 opengl/glut32.lib delete mode 100644 opengl/wglew.h delete mode 100644 opengl/wglext.h delete mode 100644 python/include/Python-ast.h delete mode 100644 python/include/Python.h delete mode 100644 python/include/abstract.h delete mode 100644 python/include/asdl.h delete mode 100644 python/include/ast.h delete mode 100644 python/include/bitset.h delete mode 100644 python/include/boolobject.h delete mode 100644 python/include/bufferobject.h delete mode 100644 python/include/bytearrayobject.h delete mode 100644 python/include/bytes_methods.h delete mode 100644 python/include/bytesobject.h delete mode 100644 python/include/cStringIO.h delete mode 100644 python/include/cellobject.h delete mode 100644 python/include/ceval.h delete mode 100644 python/include/classobject.h delete mode 100644 python/include/cobject.h delete mode 100644 python/include/code.h delete mode 100644 python/include/codecs.h delete mode 100644 python/include/compile.h delete mode 100644 python/include/complexobject.h delete mode 100644 python/include/datetime.h delete mode 100644 python/include/descrobject.h delete mode 100644 python/include/dictobject.h delete mode 100644 python/include/dtoa.h delete mode 100644 python/include/enumobject.h delete mode 100644 python/include/errcode.h delete mode 100644 python/include/eval.h delete mode 100644 python/include/fileobject.h delete mode 100644 python/include/floatobject.h delete mode 100644 python/include/frameobject.h delete mode 100644 python/include/funcobject.h delete mode 100644 python/include/genobject.h delete mode 100644 python/include/graminit.h delete mode 100644 python/include/grammar.h delete mode 100644 python/include/import.h delete mode 100644 python/include/intobject.h delete mode 100644 python/include/intrcheck.h delete mode 100644 python/include/iterobject.h delete mode 100644 python/include/listobject.h delete mode 100644 python/include/longintrepr.h delete mode 100644 python/include/longobject.h delete mode 100644 python/include/marshal.h delete mode 100644 python/include/memoryobject.h delete mode 100644 python/include/metagrammar.h delete mode 100644 python/include/methodobject.h delete mode 100644 python/include/modsupport.h delete mode 100644 python/include/moduleobject.h delete mode 100644 python/include/node.h delete mode 100644 python/include/object.h delete mode 100644 python/include/objimpl.h delete mode 100644 python/include/opcode.h delete mode 100644 python/include/osdefs.h delete mode 100644 python/include/parsetok.h delete mode 100644 python/include/patchlevel.h delete mode 100644 python/include/pgen.h delete mode 100644 python/include/pgenheaders.h delete mode 100644 python/include/py_curses.h delete mode 100644 python/include/pyarena.h delete mode 100644 python/include/pycapsule.h delete mode 100644 python/include/pyconfig.h delete mode 100644 python/include/pyctype.h delete mode 100644 python/include/pydebug.h delete mode 100644 python/include/pyerrors.h delete mode 100644 python/include/pyexpat.h delete mode 100644 python/include/pyfpe.h delete mode 100644 python/include/pygetopt.h delete mode 100644 python/include/pymacconfig.h delete mode 100644 python/include/pymactoolbox.h delete mode 100644 python/include/pymath.h delete mode 100644 python/include/pymem.h delete mode 100644 python/include/pyport.h delete mode 100644 python/include/pystate.h delete mode 100644 python/include/pystrcmp.h delete mode 100644 python/include/pystrtod.h delete mode 100644 python/include/pythonrun.h delete mode 100644 python/include/pythread.h delete mode 100644 python/include/rangeobject.h delete mode 100644 python/include/setobject.h delete mode 100644 python/include/sliceobject.h delete mode 100644 python/include/stringobject.h delete mode 100644 python/include/structmember.h delete mode 100644 python/include/structseq.h delete mode 100644 python/include/symtable.h delete mode 100644 python/include/sysmodule.h delete mode 100644 python/include/timefuncs.h delete mode 100644 python/include/token.h delete mode 100644 python/include/traceback.h delete mode 100644 python/include/tupleobject.h delete mode 100644 python/include/ucnhash.h delete mode 100644 python/include/unicodeobject.h delete mode 100644 python/include/warnings.h delete mode 100644 python/include/weakrefobject.h delete mode 100644 python/libs/_bsddb.lib delete mode 100644 python/libs/_ctypes.lib delete mode 100644 python/libs/_ctypes_test.lib delete mode 100644 python/libs/_elementtree.lib delete mode 100644 python/libs/_hashlib.lib delete mode 100644 python/libs/_msi.lib delete mode 100644 python/libs/_multiprocessing.lib delete mode 100644 python/libs/_socket.lib delete mode 100644 python/libs/_sqlite3.lib delete mode 100644 python/libs/_ssl.lib delete mode 100644 python/libs/_testcapi.lib delete mode 100644 python/libs/_tkinter.lib delete mode 100644 python/libs/bz2.lib delete mode 100644 python/libs/omf_python27.lib delete mode 100644 python/libs/pyexpat.lib delete mode 100644 python/libs/python27.lib delete mode 100644 python/libs/select.lib delete mode 100644 python/libs/unicodedata.lib delete mode 100644 python/libs/winsound.lib diff --git a/.gitignore b/.gitignore index 5fe4d243..0d2bd761 100644 --- a/.gitignore +++ b/.gitignore @@ -67,4 +67,5 @@ Debug/ tmp/ bin/ ipch/ +ref/ *.aps diff --git a/Camera.cpp b/Camera.cpp index 4c20b7e5..951fdc22 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -61,8 +61,8 @@ void TCamera::OnCursorMove(double x, double y) void TCamera::Update() { // ABu: zmiana i uniezaleznienie predkosci od FPS - double a = (Console::Pressed(VK_SHIFT) ? 5.00 : 1.00); - if (Console::Pressed(VK_CONTROL)) + double a = ( Global::shiftState ? 5.00 : 1.00); + if (Global::ctrlState) a = a * 100; // OldVelocity=Velocity; if (FreeFlyModeFlag == true) @@ -75,40 +75,6 @@ void TCamera::Update() Velocity.y += a; if (Console::Pressed(Global::Keys[k_MechDown])) Velocity.y -= a; - // McZapkie-170402: zeby nie bylo konfliktow - /* - if (Console::Pressed(VkKeyScan('d'))) - Velocity.x+= a*Timer::GetDeltaTime(); - if (Console::Pressed(VkKeyScan('a'))) - Velocity.x-= a*Timer::GetDeltaTime(); - if (Console::Pressed(VkKeyScan('w'))) - Velocity.z-= a*Timer::GetDeltaTime(); - if (Console::Pressed(VkKeyScan('s'))) - Velocity.z+= a*Timer::GetDeltaTime(); - - if (Console::Pressed(VK_NUMPAD4) || Console::Pressed(VK_NUMPAD7) || - Console::Pressed(VK_NUMPAD1)) - Yaw+= +1*M_PI*Timer::GetDeltaTime(); - - if (Console::Pressed(VK_NUMPAD6) || Console::Pressed(VK_NUMPAD9) || - Console::Pressed(VK_NUMPAD3)) - Yaw+= -1*M_PI*Timer::GetDeltaTime(); - - if (Pressed(VK_NUMPAD2) || Console::Pressed(VK_NUMPAD1) || - Console::Pressed(VK_NUMPAD3)) - Pitch+= -1*M_PI*Timer::GetDeltaTime(); - - if (Console::Pressed(VK_NUMPAD8) || Console::Pressed(VK_NUMPAD7) || - Console::Pressed(VK_NUMPAD9)) - Pitch+= +1*M_PI*Timer::GetDeltaTime(); - if (Console::Pressed(VkKeyScan('.'))) - Roll+= -1*M_PI*Timer::GetDeltaTime(); - if (Console::Pressed(VkKeyScan(','))) - Roll+= +1*M_PI*Timer::GetDeltaTime(); - - if (Console::Pressed(VK_NUMPAD5)) - Pitch=Roll= 0.0f; - */ // McZapkie-170402: poruszanie i rozgladanie we free takie samo jak w follow if (Console::Pressed(Global::Keys[k_MechRight])) diff --git a/Console.cpp b/Console.cpp index d29f6f02..1879dde1 100644 --- a/Console.cpp +++ b/Console.cpp @@ -356,7 +356,10 @@ void Console::BitsUpdate(int mask) bool Console::Pressed(int x) { // na razie tak - czyta się tylko klawiatura - return Global::bActive && (GetKeyState(x) < 0); + if( glfwGetKey( Global::window, x ) == GLFW_TRUE ) + return true; + else + return false; }; void Console::ValueSet(int x, double y) @@ -453,7 +456,7 @@ void Console::Update() else { // błąd komunikacji - zapauzować symulację? if (!(Global::iPause & 8)) // jeśli jeszcze nie oflagowana - Global::iTextMode = VK_F1; // pokazanie czasu/pauzy + Global::iTextMode = GLFW_KEY_F1; // pokazanie czasu/pauzy Global::iPause |= 8; // tak??? PoKeys55[0]->Connect(); // próba ponownego podłączenia } diff --git a/DirectX/DSOUND.LIB b/DirectX/DSOUND.LIB deleted file mode 100644 index 6bae0a24fc001692ebfe8aab1efadd286149a089..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmeys%fP_Gz`)1=0sk7L7$jUWi&B$Ig7ZuBQk)YDN=l1Tor_WvOHvPYXfrS@U}VIp zfXgM=Kh)1fFC{03jp0BC8w0~{W(J0mE+!xWwV*+cK?c)&*Syl))FPl2j_MuyU_0V_>?uqc zB$F8#mP1TtW++6M+#t>%iew%lpg21;z-D5XMKYI(fg55j3qt|ITzL54FhBe=KJ$@7 zgqh(B#C%qUd@SY*GVr_Pt-Qc;y}08E_X>!14?|d8r|JY?KKL F0RYk&9bEtb diff --git a/DynObj.h b/DynObj.h index e90f60ee..b3a48742 100644 --- a/DynObj.h +++ b/DynObj.h @@ -473,7 +473,7 @@ public: // modele składowe pojazdu // McZapkie-260202 void LoadMMediaFile(std::string BaseDir, std::string TypeName, std::string ReplacableSkin); - inline double ABuGetDirection() // ABu. + inline double ABuGetDirection() const // ABu. { return (Axle1.GetTrack() == MyTrack ? Axle1.GetDirection() : Axle0.GetDirection()); }; diff --git a/EU07.cpp b/EU07.cpp index 1f0e01b9..56c0b148 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -21,10 +21,6 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include //_clear87() itp. -#include "opengl/glew.h" -#include "opengl/wglew.h" -#include "opengl/ARB_Multisample.h" - #include "Globals.h" #include "Logs.h" #include "Console.h" @@ -32,484 +28,73 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "World.h" #include "Mover.h" +#pragma comment( lib, "glfw3dll.lib" ) #pragma comment( lib, "glew32.lib" ) -#pragma comment( lib, "glu32.lib" ) #pragma comment( lib, "opengl32.lib" ) +#pragma comment( lib, "glu32.lib" ) #pragma comment( lib, "dsound.lib" ) #pragma comment( lib, "winmm.lib" ) #pragma comment( lib, "setupapi.lib" ) #pragma comment( lib, "python27.lib" ) #pragma comment (lib, "dbghelp.lib") -HDC hDC = NULL; // Private GDI Device Context -HGLRC hRC = NULL; // Permanent Rendering Context -HWND hWnd = NULL; // Holds Our Window Handle +#ifdef _MSC_VER +#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") +#endif TWorld World; - -// bool active=TRUE; //window active flag set to TRUE by default -bool fullscreen = TRUE; // fullscreen flag set to fullscreen mode by default -int WindowWidth = 800; -int WindowHeight = 600; -int Bpp = 32; - -LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); // Declaration For WndProc - -//#include "dbgForm.h" -//--------------------------------------------------------------------------- - -int InitGL(GLvoid) // All Setup For OpenGL Goes Here -{ -// _clear87(); -// _control87(MCW_EM, MCW_EM); - glewInit(); - - if( !GLEW_VERSION_1_4 ) { - // experimental: require at least openGL 1.4 - Error( "This application requires openGL version 1.4 (or better)" ); - return 0; - } - - // hunter-271211: przeniesione - // AllocConsole(); - // SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE),FOREGROUND_GREEN); - - // ShaXbee-121209: Wlaczenie obslugi tablic wierzcholkow - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_NORMAL_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów - return World.Init(hWnd, hDC); // true jeśli wszystko pójdzie dobrze -} -//--------------------------------------------------------------------------- - -GLvoid ReSizeGLScene(GLsizei width, GLsizei height) // resize and initialize the GL Window -{ - Global::ScreenWidth = WindowWidth = width; - Global::ScreenHeight = WindowHeight = height; - if (height == 0) // prevent a divide by zero by - height = 1; // making height equal one - glViewport(0, 0, width, height); // Reset The Current Viewport -/* - glMatrixMode(GL_PROJECTION); // select the Projection Matrix - glLoadIdentity(); // reset the Projection Matrix - // calculate the aspect ratio of the window - gluPerspective(45.0f, (GLdouble)width / (GLdouble)height, 0.2f, 2500.0f); - glMatrixMode(GL_MODELVIEW); // select the Modelview Matrix - glLoadIdentity(); // reset the Modelview Matrix -*/ -} - -//--------------------------------------------------------------------------- -GLvoid KillGLWindow(GLvoid) // properly kill the window -{ - if (hRC) // Do We Have A Rendering Context? - { - if (!wglMakeCurrent(NULL, NULL)) // are we able to release the DC and RC contexts? - { - ErrorLog("Fail: window releasing"); - MessageBox(NULL, "Release of DC and RC failed.", "SHUTDOWN ERROR", - MB_OK | MB_ICONINFORMATION); - } - - if (!wglDeleteContext(hRC)) // are we able to delete the RC? - { - ErrorLog("Fail: rendering context releasing"); - MessageBox(NULL, "Release rendering context failed.", "SHUTDOWN ERROR", - MB_OK | MB_ICONINFORMATION); - } - hRC = NULL; // set RC to NULL - } - - if (hDC && !ReleaseDC(hWnd, hDC)) // are we able to release the DC? - { - ErrorLog("Fail: device context releasing"); - MessageBox(NULL, "Release device context failed.", "SHUTDOWN ERROR", - MB_OK | MB_ICONINFORMATION); - hDC = NULL; // set DC to NULL - } - - if (hWnd && !DestroyWindow(hWnd)) // are we able to destroy the window? - { - ErrorLog("Fail: window destroying"); - MessageBox(NULL, "Could not release hWnd.", "SHUTDOWN ERROR", MB_OK | MB_ICONINFORMATION); - hWnd = NULL; // set hWnd to NULL - } - - if (fullscreen) // Are We In Fullscreen Mode? - { - ChangeDisplaySettings(NULL, 0); // if so switch back to the desktop - ShowCursor(TRUE); // show mouse pointer - } - // KillFont(); -} - -/* This code creates our OpenGL Window. Parameters are: * - * title - title to appear at the top of the window * - * width - width of the GL Window or fullscreen mode * - * height - height of the GL Window or fullscreen mode * - * bits - number of bits to use for color (8/16/24/32) * - * fullscreenflag - use fullscreen mode (TRUE) or windowed mode (FALSE) */ - -BOOL CreateGLWindow(char *title, int width, int height, int bits, bool fullscreenflag) -{ - GLuint PixelFormat; // holds the results after searching for a match - HINSTANCE hInstance; // holds the instance of the application - WNDCLASS wc; // windows class structure - DWORD dwExStyle; // window extended style - DWORD dwStyle; // window style - RECT WindowRect; // grabs rectangle upper left / lower right values - WindowRect.left = (long)0; // set left value to 0 - WindowRect.right = (long)width; // set right value to requested width - WindowRect.top = (long)0; // set top value to 0 - WindowRect.bottom = (long)height; // set bottom value to requested height - - fullscreen = fullscreenflag; // set the global fullscreen flag - - hInstance = GetModuleHandle(NULL); // grab an instance for our window - wc.style = CS_HREDRAW | CS_VREDRAW | CS_OWNDC; // redraw on size, and own DC for window. - wc.lpfnWndProc = (WNDPROC)WndProc; // wndproc handles messages - wc.cbClsExtra = 0; // no extra window data - wc.cbWndExtra = 0; // no extra window data - wc.hInstance = hInstance; // set the instance - wc.hIcon = LoadIcon(NULL, IDI_WINLOGO); // load the default icon - wc.hCursor = LoadCursor(NULL, IDC_ARROW); // load the arrow pointer - wc.hbrBackground = NULL; // no background required for GL - wc.lpszMenuName = NULL; // we don't want a menu - wc.lpszClassName = "EU07"; // nazwa okna do komunikacji zdalnej - // // Set The Class Name - - if (!arbMultisampleSupported) // tylko dla pierwszego okna - if (!RegisterClass(&wc)) // Attempt To Register The Window Class - { - ErrorLog("Fail: window class registeration"); - MessageBox(NULL, "Failed to register the window class.", "ERROR", - MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - if (fullscreen) // Attempt Fullscreen Mode? - { - DEVMODE dmScreenSettings; // device mode - memset(&dmScreenSettings, 0, sizeof(dmScreenSettings)); // makes sure memory's cleared - dmScreenSettings.dmSize = sizeof(dmScreenSettings); // size of the devmode structure - - // tolaris-240403: poprawka na odswiezanie monitora - // locate primary monitor... - if (Global::bAdjustScreenFreq) - { - POINT point; - point.x = 0; - point.y = 0; - MONITORINFOEX monitorinfo; - monitorinfo.cbSize = sizeof(MONITORINFOEX); - ::GetMonitorInfo(::MonitorFromPoint(point, MONITOR_DEFAULTTOPRIMARY), &monitorinfo); - // ..and query for highest supported refresh rate - unsigned int refreshrate = 0; - int i = 0; - while (::EnumDisplaySettings(monitorinfo.szDevice, i, &dmScreenSettings)) - { - if (i > 0) - if (dmScreenSettings.dmPelsWidth == (unsigned int)width) - if (dmScreenSettings.dmPelsHeight == (unsigned int)height) - if (dmScreenSettings.dmBitsPerPel == (unsigned int)bits) - if (dmScreenSettings.dmDisplayFrequency > refreshrate) - refreshrate = dmScreenSettings.dmDisplayFrequency; - ++i; - } - // fill refresh rate info for screen mode change - dmScreenSettings.dmDisplayFrequency = refreshrate; - dmScreenSettings.dmFields = DM_DISPLAYFREQUENCY; - } - dmScreenSettings.dmPelsWidth = width; // selected screen width - dmScreenSettings.dmPelsHeight = height; // selected screen height - dmScreenSettings.dmBitsPerPel = bits; // selected bits per pixel - dmScreenSettings.dmFields = - dmScreenSettings.dmFields | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT; - - // Try to set selected mode and get results. NOTE: CDS_FULLSCREEN gets rid of start bar. - if (ChangeDisplaySettings(&dmScreenSettings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) - { - // If the mode fails, offer two options. Quit or use windowed mode. - ErrorLog("Fail: full screen"); - if (MessageBox(NULL, "The requested fullscreen mode is not supported by\nyour video " - "card. Use windowed mode instead?", - "EU07", MB_YESNO | MB_ICONEXCLAMATION) == IDYES) - { - fullscreen = FALSE; // Windowed Mode Selected. Fullscreen = FALSE - } - else - { - // Pop Up A Message Box Letting User Know The Program Is Closing. - Error("Program will now close."); - return FALSE; // Return FALSE - } - } - } - - if (fullscreen) // Are We Still In Fullscreen Mode? - { - dwExStyle = WS_EX_APPWINDOW; // Window Extended Style - dwStyle = WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; // Windows Style - ShowCursor(FALSE); // Hide Mouse Pointer - } - else - { - dwExStyle = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE; // Window Extended Style - dwStyle = WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; // Windows Style - } - - AdjustWindowRectEx(&WindowRect, dwStyle, FALSE, - dwExStyle); // Adjust Window To True Requested Size - - // Create The Window - if (NULL == - (hWnd = CreateWindowEx(dwExStyle, // Extended Style For The Window - "EU07", // Class Name - title, // Window Title - dwStyle | // Defined Window Style - WS_CLIPSIBLINGS | // Required Window Style - WS_CLIPCHILDREN, // Required Window Style - 0, - 0, // Window Position - WindowRect.right - WindowRect.left, // Calculate Window Width - WindowRect.bottom - WindowRect.top, // Calculate Window Height - NULL, // No Parent Window - NULL, // No Menu - hInstance, // Instance - NULL))) // Dont Pass Anything To WM_CREATE - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: window creation"); - MessageBox(NULL, "Window creation error.", "ERROR", MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - static PIXELFORMATDESCRIPTOR pfd = // pfd Tells Windows How We Want Things To Be - { - sizeof(PIXELFORMATDESCRIPTOR), // Size Of This Pixel Format Descriptor - 1, // Version Number - PFD_DRAW_TO_WINDOW | // Format Must Support Window - PFD_SUPPORT_OPENGL | // Format Must Support OpenGL - PFD_DOUBLEBUFFER, // Must Support Double Buffering - PFD_TYPE_RGBA, // Request An RGBA Format - bits, // Select Our Color Depth - 0, - 0, 0, 0, 0, 0, // Color Bits Ignored - 0, // No Alpha Buffer - 0, // Shift Bit Ignored - 0, // No Accumulation Buffer - 0, 0, 0, 0, // Accumulation Bits Ignored - 24, // 32Bit Z-Buffer (Depth Buffer) - 0, // No Stencil Buffer - 0, // No Auxiliary Buffer - PFD_MAIN_PLANE, // Main Drawing Layer - 0, // Reserved - 0, 0, 0 // Layer Masks Ignored - }; - - if (NULL == (hDC = GetDC(hWnd))) // Did We Get A Device Context? - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: device context"); - MessageBox(NULL, "Can't create a GL device context.", "ERROR", MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - /* - Our first pass, Multisampling hasn't been created yet, so we create a window normally - If it is supported, then we're on our second pass - that means we want to use our pixel format for sampling - so set PixelFormat to arbMultiSampleformat instead - */ - if (!arbMultisampleSupported) - { - if (NULL == (PixelFormat = - ChoosePixelFormat(hDC, &pfd))) // Did Windows Find A Matching Pixel Format? - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: pixelformat"); - MessageBox(NULL, "Can't find a suitable pixelformat.", "ERROR", - MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - } - else - PixelFormat = arbMultisampleFormat; - - if (!SetPixelFormat(hDC, PixelFormat, &pfd)) // Are We Able To Set The Pixel Format? - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: pixelformat"); - MessageBox(NULL, "Can't set the pixelformat.", "ERROR", MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - if (NULL == (hRC = wglCreateContext(hDC))) // Are We Able To Get A Rendering Context? - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: OpenGL rendering context creation"); - MessageBox(NULL, "Can't create a GL rendering context.", "ERROR", - MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - if (!wglMakeCurrent(hDC, hRC)) // Try To Activate The Rendering Context - { - KillGLWindow(); // Reset The Display - ErrorLog("Fail: OpenGL rendering context activation"); - MessageBox(NULL, "Can't activate the GL rendering context.", "ERROR", - MB_OK | MB_ICONEXCLAMATION); - return FALSE; // Return FALSE - } - - /* - Now that our window is created, we want to queary what samples are available - we call our InitMultiSample window - if we return a valid context, we want to destroy our current window - and create a new one using the multisample interface. - */ - if (Global::iMultisampling) - if (!arbMultisampleSupported) - if ((Global::iMultisampling = - InitMultisample(hInstance, hWnd, pfd, 1 << Global::iMultisampling)) != 0) - { - // WriteConsoleOnly("Opening second window for multisampling of - // "+AnsiString(Global::iMultisampling)+" samples."); - KillGLWindow(); // reset the display - return CreateGLWindow(title, width, height, bits, fullscreenflag); // rekurencja - } - - ShowWindow(hWnd, SW_SHOW); // show the window - SetForegroundWindow(hWnd); // slightly higher priority - SetFocus(hWnd); // sets keyboard focus to the window - ReSizeGLScene(width, height); // set up our perspective GL screen - - if (!InitGL()) // initialize our newly created GL Window - { - KillGLWindow(); // reset the display - ErrorLog("Fail: OpenGL initialization"); - MessageBox(NULL, "Initialization Failed.", "ERROR", MB_OK | MB_ICONEXCLAMATION); - return FALSE; // return FALSE - } - return TRUE; // success -} - -static int mx = 0, my = 0; -static POINT mouse; - -static int test = 0; -/**/ -// ************ Globals ************ -// -#define MYDISPLAY 1 - PCOPYDATASTRUCT pDane; -LRESULT CALLBACK WndProc(HWND hWnd, // handle for this window - UINT uMsg, // message for this window - WPARAM wParam, // additional message information - LPARAM lParam) // additional message information +void window_resize_callback( GLFWwindow *window, int w, int h ) { - RECT rect; - switch (uMsg) // check for windows messages - { - case WM_PASTE: //[Ctrl]+[V] potrzebujemy do innych celów - return 0; - case WM_COPYDATA: // obsługa danych przesłanych przez program sterujący - pDane = (PCOPYDATASTRUCT)lParam; - if (pDane->dwData == 'EU07') // sygnatura danych - World.OnCommandGet((DaneRozkaz *)(pDane->lpData)); - break; - case WM_ACTIVATE: // watch for window activate message - // case WM_ACTIVATEAPP: - { // Ra: uzależnienie aktywności od bycia na wierzchu - Global::bActive = (LOWORD(wParam) != WA_INACTIVE); - if (Global::bInactivePause) // jeśli ma być pauzowanie okna w tle - if (Global::bActive) - Global::iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie - else - Global::iPause |= 4; // włączenie pauzy, gdy nieaktywy - if (Global::bActive) - SetCursorPos(mx, my); - ShowCursor(!Global::bActive); - /* - if (!HIWORD(wParam)) //check minimization state - active=TRUE; //program is active - else - active=FALSE; //program is no longer active - */ - return 0; // return to the message loop - } - case WM_SYSCOMMAND: // intercept system commands - { - switch (wParam) // check system calls - { - case 61696: // F10 - World.OnKeyDown(VK_F10); - return 0; - case SC_SCREENSAVE: // screensaver trying to start? - case SC_MONITORPOWER: // monitor trying to enter powersave? - return 0; // prevent from happening - } - break; // exit + Global::ScreenWidth = w; + Global::ScreenHeight = h; + ::glViewport( 0, 0, w, h ); +} + +void cursor_pos_callback( GLFWwindow *window, double x, double y ) +{ + World.OnMouseMove( x * 0.005, y * 0.01 ); + ::glfwSetCursorPos( window, 0.0, 0.0 ); +} + +void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) +{ + Global::shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; + Global::ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; + + if( ( key == GLFW_KEY_LEFT_SHIFT ) + || ( key == GLFW_KEY_LEFT_CONTROL ) + || ( key == GLFW_KEY_LEFT_ALT ) + || ( key == GLFW_KEY_RIGHT_SHIFT ) + || ( key == GLFW_KEY_RIGHT_CONTROL ) + || ( key == GLFW_KEY_RIGHT_ALT ) ) { + // don't bother passing these + return; } - case WM_CLOSE: // did we receive a close message? + + if( action == GLFW_PRESS || action == GLFW_REPEAT ) { - PostQuitMessage(0); // send a quit message [Alt]+[F4] - return 0; // jump back - } - case WM_MOUSEMOVE: - { - // mx= 100;//Global::iWindowWidth/2; - // my= 100;//Global::iWindowHeight/2; - // SetCursorPos(Global::iWindowWidth/2,Global::iWindowHeight/2); - // m_x= LOWORD(lParam); - // m_y= HIWORD(lParam); - GetCursorPos(&mouse); - if (Global::bActive && ((mouse.x != mx) || (mouse.y != my))) + World.OnKeyDown( key ); + + switch( key ) { - World.OnMouseMove(double(mouse.x - mx) * 0.005, double(mouse.y - my) * 0.01); - SetCursorPos(mx, my); - } - return 0; // jump back - } - case WM_KEYUP: - if (Global::bActive) - { - World.OnKeyUp(wParam); - return 0; - } - case WM_KEYDOWN: - if (Global::bActive) - { - if (wParam != 17) // bo naciśnięcia [Ctrl] nie ma po co przekazywać - if (wParam != 145) //[Scroll Lock] też nie - World.OnKeyDown(wParam); - switch (wParam) - { - case VK_ESCAPE: //[Esc] pauzuje tylko bez Debugmode - if (DebugModeFlag) + case GLFW_KEY_ESCAPE: { + //[Esc] pauzuje tylko bez Debugmode + if( DebugModeFlag ) break; - case 19: //[Pause] - if (Global::iPause & 1) // jeśli pauza startowa + + if( Global::iPause & 1 ) // jeśli pauza startowa Global::iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować - else if (!(Global::iMultiplayer & 2)) // w multiplayerze pauza nie ma sensu - if (!Console::Pressed(VK_CONTROL)) // z [Ctrl] to radiostop jest - // Ra: poniższe nie ma sensu, bo brak komunikacji natychmiast zapauzuje - // ponownie - // if (Global::iPause&8) //jeśli pauza związana z brakiem komunikacji z - // PoKeys - // Global::iPause&=~10; //odpauzowanie pauzy PoKeys (chyba nic nie da) i - // ewentualnie klawiszowej również - // else + else if( !( Global::iMultiplayer & 2 ) ) // w multiplayerze pauza nie ma sensu + if( !Global::ctrlState ) // z [Ctrl] to radiostop jest Global::iPause ^= 2; // zmiana stanu zapauzowania - if (Global::iPause) // jak pauza - Global::iTextMode = VK_F1; // to wyświetlić zegar i informację + if( Global::iPause ) // jak pauza + Global::iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację break; - case VK_F7: - if (DebugModeFlag) - { // siatki wyświetlane tyko w trybie testowym + } + case GLFW_KEY_F7: + if( DebugModeFlag ) { // siatki wyświetlane tyko w trybie testowym Global::bWireFrame = !Global::bWireFrame; if( true == Global::bWireFrame ) { glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); @@ -521,69 +106,52 @@ LRESULT CALLBACK WndProc(HWND hWnd, // handle for this window // Ra: jeszcze usunąć siatki ze skompilowanych obiektów! } break; - } } - return 0; // jump back - case WM_CHAR: + } + else if( action == GLFW_RELEASE ) { - /* - switch ((TCHAR) wParam) - { - // case 'q': - // done= true; - // KillGLWindow(); - // PostQuitMessage(0); - // DestroyWindow( hWnd ); - // break; - }; - */ - return 0; + World.OnKeyUp( key ); } - case WM_SIZE: // resize the OpenGL window - { - ReSizeGLScene(LOWORD(lParam), HIWORD(lParam)); // LoWord=Width, HiWord=Height - if (GetWindowRect(hWnd, &rect)) - { // Ra: zmiana rozmiaru okna bez przesuwania myszy - // mx=WindowWidth/2+rect.left; // horizontal position - // my=WindowHeight/2+rect.top; // vertical position - // SetCursorPos(mx,my); - } - return 0; // jump back - } - case WM_MOVE: // przesuwanie okna? - { - mx = WindowWidth / 2 + LOWORD(lParam); // horizontal position - my = WindowHeight / 2 + HIWORD(lParam); // vertical position - // SetCursorPos(mx,my); - break; - } - case WM_PAINT: - { // odrysowanie okna - break; - } - // case WM_ERASEBKGND: //Process this message to keep Windows from erasing background. - case MM_JOY1BUTTONDOWN: - { - // WriteLog("Joystick button "+AnsiString(wParam)); - break; - } - case WM_CREATE: - /* Capture the joystick. If this fails, beep and display - * error, then quit. - */ - if (joySetCapture(hWnd, JOYSTICKID1, 0, FALSE)) - { - // MessageBeep(MB_ICONEXCLAMATION); - // MessageBox(hWnd,"Couldn't capture the joystick",NULL,MB_OK|MB_ICONEXCLAMATION); - // return -1; - } - break; - } - // pass all unhandled messages to DefWindowProc - return DefWindowProc(hWnd, uMsg, wParam, lParam); -}; +} + +void focus_callback( GLFWwindow *window, int focus ) +{ + if( Global::bInactivePause ) // jeśli ma być pauzowanie okna w tle + if( focus ) + Global::iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie + else + Global::iPause |= 4; // włączenie pauzy, gdy nieaktywy +} #ifdef _WINDOWS + +extern "C" +{ + GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); +} + +HWND Hwnd; +WNDPROC BaseWindowProc; + +LRESULT APIENTRY WndProc( HWND hWnd, // handle for this window + UINT uMsg, // message for this window + WPARAM wParam, // additional message information + LPARAM lParam) // additional message information +{ + switch( uMsg ) // check for windows messages + { + case WM_COPYDATA: { + // obsługa danych przesłanych przez program sterujący + pDane = (PCOPYDATASTRUCT)lParam; + if( pDane->dwData == 'EU07' ) // sygnatura danych + World.OnCommandGet( (DaneRozkaz *)( pDane->lpData ) ); + break; + } + } + // pass all unhandled messages to DefWindowProc + return CallWindowProc( BaseWindowProc, Hwnd, uMsg, wParam, lParam ); +}; + void make_minidump( ::EXCEPTION_POINTERS* e ) { auto hDbgHelp = ::LoadLibraryA( "dbghelp" ); @@ -632,14 +200,11 @@ LONG CALLBACK unhandled_handler( ::EXCEPTION_POINTERS* e ) { } #endif -int WINAPI WinMain(HINSTANCE hInstance, // instance - HINSTANCE hPrevInstance, // previous instance - LPSTR lpCmdLine, // command line parameters - int nCmdShow) // window show state -{ +int main( int argc, char *argv[] ) { + #if defined(_MSC_VER) && defined (_DEBUG) // memory leaks - _CrtSetDbgFlag( _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ) | _CRTDBG_LEAK_CHECK_DF ); + _CrtSetDbgFlag( _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ) | _CRTDBG_LEAK_CHECK_DF ); // floating point operation errors auto state = _clearfp(); state = _control87( 0, 0 ); @@ -650,138 +215,133 @@ int WINAPI WinMain(HINSTANCE hInstance, // instance ::SetUnhandledExceptionFilter( unhandled_handler ); #endif - MSG msg; // windows message structure - BOOL done = FALSE; // bool variable to exit loop - fullscreen = true; - DeleteFile("errors.txt"); // usunięcie starego - Global::LoadIniFile("eu07.ini"); // teraz dopiero można przejrzeć plik z ustawieniami - Global::InitKeys("keys.ini"); // wczytanie mapowania klawiszy - jest na stałe + if( !glfwInit() ) + return -1; - // hunter-271211: ukrywanie konsoli - if (Global::iWriteLogEnabled & 2) - { + DeleteFile( "errors.txt" ); + Global::LoadIniFile( "eu07.ini" ); + Global::InitKeys(); + + // hunter-271211: ukrywanie konsoli + if( Global::iWriteLogEnabled & 2 ) { AllocConsole(); - SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN); + SetConsoleTextAttribute( GetStdHandle( STD_OUTPUT_HANDLE ), FOREGROUND_GREEN ); } - std::string commandline( lpCmdLine ); // parametry uruchomienia - if( false == commandline.empty() ) - { // analizowanie parametrďż˝w - cParser parser( commandline ); - std::string token; - do { - parser.getTokens(); - token.clear(); - parser >> token; - if( token == "-s" ) - { // nazwa scenerii - parser.getTokens(); - parser >> Global::SceneryFile; - } - else if( token == "-v") - { // nazwa wybranego pojazdu - parser.getTokens(); - parser >> Global::asHumanCtrlVehicle; - } - else if( token == "-modifytga" ) - { // wykonanie modyfikacji wszystkich plików TGA - Global::iModifyTGA = -1; // specjalny tryb wykonania totalnej modyfikacji - } - else if( token == "-e3d" ) - { // wygenerowanie wszystkich plików E3D - if (Global::iConvertModels > 0) - Global::iConvertModels = -Global::iConvertModels; // specjalny tryb - else - Global::iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity - } + for( int i = 1; i < argc; i++ ) { + std::string token( argv[ i ] ); + + if( token == "-modifytga" ) + Global::iModifyTGA = -1; + else if( token == "-e3d" ) { + if( Global::iConvertModels > 0 ) + Global::iConvertModels = -Global::iConvertModels; else - Error( - "Program usage: EU07 [-s sceneryfilepath] [-v vehiclename] [-modifytga] [-e3d]", - !Global::iWriteLogEnabled); - } - while( false == token.empty() ); + Global::iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity + } + else if( i + 1 < argc && token == "-s" ) + Global::SceneryFile = std::string( argv[ ++i ] ); + else if( i + 1 < argc && token == "-v" ) { + std::string v( argv[ ++i ] ); + std::transform( v.begin(), v.end(), v.begin(), ::tolower ); + Global::asHumanCtrlVehicle = v; + } + else { + std::cout << "usage: " << std::string( argv[ 0 ] ) << " [-s sceneryfilepath] " + << "[-v vehiclename] [-modifytga] [-e3d]" << std::endl; + return -1; + } } - /* MC: usunalem tymczasowo bo sie gryzlo z nowym parserem - 8.6.2003 - AnsiString csp=AnsiString(Global::szSceneryFile); - csp=csp.Delete(csp.Pos(AnsiString(strrchr(Global::szSceneryFile,'/')))+1,csp.Length()); - Global::asCurrentSceneryPath=csp; - */ - fullscreen = Global::bFullScreen; - WindowWidth = Global::iWindowWidth; - WindowHeight = Global::iWindowHeight; - Bpp = Global::iBpp; - if (Bpp != 32) - Bpp = 16; - // create our OpenGL window - if (!CreateGLWindow(const_cast(Global::asHumanCtrlVehicle.c_str()), WindowWidth, WindowHeight, Bpp, - fullscreen)) - return 0; // quit if window was not created - SetForegroundWindow(hWnd); + // match requested video mode to current to allow for + // fullwindow creation when resolution is the same + GLFWmonitor *monitor = glfwGetPrimaryMonitor(); + const GLFWvidmode *vmode = glfwGetVideoMode( monitor ); + + glfwWindowHint( GLFW_RED_BITS, vmode->redBits ); + glfwWindowHint( GLFW_GREEN_BITS, vmode->greenBits ); + glfwWindowHint( GLFW_BLUE_BITS, vmode->blueBits ); + glfwWindowHint( GLFW_REFRESH_RATE, vmode->refreshRate ); + + glfwWindowHint( GLFW_AUTO_ICONIFY, GLFW_FALSE ); + glfwWindowHint( GLFW_SAMPLES, 1 << Global::iMultisampling ); + + if( Global::bFullScreen ) { + // match screen dimensions with selected monitor, for 'borderless window' in fullscreen mode + Global::iWindowWidth = vmode->width; + Global::iWindowHeight = vmode->height; + } + + GLFWwindow *window = + glfwCreateWindow( Global::iWindowWidth, Global::iWindowHeight, + "EU07", Global::bFullScreen ? monitor : nullptr, nullptr ); + + if( !window ) { + std::cout << "failed to create window" << std::endl; + return -1; + } + glfwMakeContextCurrent( window ); + glfwSwapInterval( 0 ); //vsync // NOTE: disabled, as slight drop below refresh rate seems to cause drastic drop in framerate + glfwSetInputMode( window, GLFW_CURSOR, GLFW_CURSOR_DISABLED ); //capture cursor + glfwSetCursorPos( window, 0.0, 0.0 ); + glfwSetFramebufferSizeCallback( window, window_resize_callback ); + glfwSetCursorPosCallback( window, cursor_pos_callback ); + glfwSetKeyCallback( window, key_callback ); + glfwSetWindowFocusCallback( window, focus_callback ); + { + int width, height; + glfwGetFramebufferSize( window, &width, &height ); + window_resize_callback( window, width, height ); + } + + if( glewInit() != GLEW_OK ) { + std::cout << "failed to init GLEW" << std::endl; + return -1; + } + +#ifdef _WINDOWS + // setup wrapper for base glfw window proc, to handle copydata messages + Hwnd = glfwGetWin32Window( window ); + BaseWindowProc = (WNDPROC)::SetWindowLongPtr( Hwnd, GWLP_WNDPROC, (LONG)WndProc ); + // switch off the topmost flag + ::SetWindowPos( Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); +#endif GfxRenderer.Init(); - // McZapkie: proba przeplukania klawiatury + Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów + if( !World.Init( window ) ) { + std::cout << "failed to init TWorld" << std::endl; + return -1; + } + Console *pConsole = new Console(); // Ra: nie wiem, czy ma to sens, ale jakoś zainicjowac trzeba - while (Console::Pressed(VK_F10)) - Error("Keyboard buffer problem - press F10"); // na Windows 98 lubi się to pojawiać - int iOldSpeed, iOldDelay; - SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &iOldSpeed, 0); - SystemParametersInfo(SPI_GETKEYBOARDDELAY, 0, &iOldDelay, 0); - SystemParametersInfo(SPI_SETKEYBOARDSPEED, 20, NULL, 0); - // SystemParametersInfo(SPI_SETKEYBOARDDELAY,10,NULL,0); - if (!joyGetNumDevs()) - WriteLog("No joystick"); - if (Global::iModifyTGA < 0) - { // tylko modyfikacja TGA, bez uruchamiania symulacji + + if( !joyGetNumDevs() ) + WriteLog( "No joystick" ); + if( Global::iModifyTGA < 0 ) { // tylko modyfikacja TGA, bez uruchamiania symulacji Global::iMaxTextureSize = 64; //żeby nie zamulać pamięci World.ModifyTGA(); // rekurencyjne przeglądanie katalogów } - else - { - if (Global::iConvertModels < 0) - { + else { + if( Global::iConvertModels < 0 ) { Global::iConvertModels = -Global::iConvertModels; - World.CreateE3D("models\\"); // rekurencyjne przeglądanie katalogów - World.CreateE3D("dynamic\\", true); + World.CreateE3D( "models\\" ); // rekurencyjne przeglądanie katalogów + World.CreateE3D( "dynamic\\", true ); } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć - // else - //{//główna pętla programu + Console::On(); // włączenie konsoli - while (!done) // loop that runs while done=FALSE - { - if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) // is there a message waiting? - { - if (msg.message == WM_QUIT) // have we received a quit message? - done = TRUE; // if so - else // if not, deal with window messages - { - // if (msg.message==WM_CHAR) - // World.OnKeyDown(msg.wParam); - TranslateMessage(&msg); // translate the message - DispatchMessage(&msg); // dispatch the message - } - } - else // if there are no messages - { - // draw the scene, watch for quit messages - // DrawGLScene() - // if (!pause) - // if (Global::bInactivePause?Global::bActive:true) //tak nie, bo spada z góry - if (World.Update()) // Was There A Quit Received? - SwapBuffers(hDC); // Swap Buffers (Double Buffering) - else - done = true; //[F10] or DrawGLScene signalled a quit - } + while( !glfwWindowShouldClose( window ) && World.Update() ) { + glfwSwapBuffers( window ); + glfwPollEvents(); } Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) } - SystemParametersInfo(SPI_SETKEYBOARDSPEED, iOldSpeed, NULL, 0); - SystemParametersInfo(SPI_SETKEYBOARDDELAY, iOldDelay, NULL, 0); - delete pConsole; // deaktywania sterownika - TPythonInterpreter::killInstance(); - // shutdown - KillGLWindow(); // kill the window - return (msg.wParam); // exit the program + TPythonInterpreter::killInstance(); + delete pConsole; + + glfwDestroyWindow( window ); + glfwTerminate(); + return 0; } diff --git a/Globals.cpp b/Globals.cpp index fd40e5b1..e33296eb 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -49,7 +49,9 @@ bool Global::bOpenGL_1_5 = false; // czy są dostępne funkcje OpenGL 1.5 double Global::fLuminance = 1.0; // jasność światła do automatycznego zapalania float Global::SunAngle = 0.0f; int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki -HWND Global::hWnd = NULL; // uchwyt okna +GLFWwindow *Global::window; +bool Global::shiftState; +bool Global::ctrlState; int Global::ScreenWidth = 1; int Global::ScreenHeight = 1; float Global::ZoomFactor = 1.0f; @@ -956,7 +958,7 @@ void Global::ConfigParse(cParser &Parser) fFpsMax = fFpsAverage + fFpsDeviation; // górna granica FPS, przy której promień scenerii będzie zwiększany if (iPause) - iTextMode = VK_F1; // jak pauza, to pokazać zegar + iTextMode = GLFW_KEY_F1; // jak pauza, to pokazać zegar /* this won't execute anymore with the old parser removed // TBD: remove, or launch depending on passed flag? if (qp) @@ -979,131 +981,93 @@ void Global::ConfigParse(cParser &Parser) */ } -void Global::InitKeys(std::string asFileName) -{ - // if (FileExists(asFileName)) - // { - // Error("Chwilowo plik keys.ini nie jest obsługiwany. Ładuję standardowe - // ustawienia.\nKeys.ini file is temporarily not functional, loading default keymap..."); - /* TQueryParserComp *Parser; - Parser=new TQueryParserComp(NULL); - Parser->LoadStringToParse(asFileName); +void Global::InitKeys() { + Keys[ k_IncMainCtrl ] = GLFW_KEY_KP_ADD; + Keys[ k_IncMainCtrlFAST ] = GLFW_KEY_KP_ADD; + Keys[ k_DecMainCtrl ] = GLFW_KEY_KP_SUBTRACT; + Keys[ k_DecMainCtrlFAST ] = GLFW_KEY_KP_SUBTRACT; + Keys[ k_IncScndCtrl ] = GLFW_KEY_KP_DIVIDE; + Keys[ k_IncScndCtrlFAST ] = GLFW_KEY_KP_DIVIDE; + Keys[ k_DecScndCtrl ] = GLFW_KEY_KP_MULTIPLY; + Keys[ k_DecScndCtrlFAST ] = GLFW_KEY_KP_MULTIPLY; - for (int keycount=0; keycountGetNextSymbol().ToInt(); - } + Keys[ k_IncLocalBrakeLevel ] = GLFW_KEY_KP_1; + Keys[ k_DecLocalBrakeLevel ] = GLFW_KEY_KP_7; + Keys[ k_IncBrakeLevel ] = GLFW_KEY_KP_3; + Keys[ k_DecBrakeLevel ] = GLFW_KEY_KP_9; + Keys[ k_Releaser ] = GLFW_KEY_KP_6; + Keys[ k_EmergencyBrake ] = GLFW_KEY_KP_0; + Keys[ k_Brake3 ] = GLFW_KEY_KP_8; + Keys[ k_Brake2 ] = GLFW_KEY_KP_5; + Keys[ k_Brake1 ] = GLFW_KEY_KP_2; + Keys[ k_Brake0 ] = GLFW_KEY_KP_4; + Keys[ k_WaveBrake ] = GLFW_KEY_KP_DECIMAL; - delete Parser; - */ - // } - // else - { - Keys[k_IncMainCtrl] = VK_ADD; - Keys[k_IncMainCtrlFAST] = VK_ADD; - Keys[k_DecMainCtrl] = VK_SUBTRACT; - Keys[k_DecMainCtrlFAST] = VK_SUBTRACT; - Keys[k_IncScndCtrl] = VK_DIVIDE; - Keys[k_IncScndCtrlFAST] = VK_DIVIDE; - Keys[k_DecScndCtrl] = VK_MULTIPLY; - Keys[k_DecScndCtrlFAST] = VK_MULTIPLY; - ///*NORMALNE - Keys[k_IncLocalBrakeLevel] = VK_NUMPAD1; // VK_NUMPAD7; - // Keys[k_IncLocalBrakeLevelFAST]=VK_END; //VK_HOME; - Keys[k_DecLocalBrakeLevel] = VK_NUMPAD7; // VK_NUMPAD1; - // Keys[k_DecLocalBrakeLevelFAST]=VK_HOME; //VK_END; - Keys[k_IncBrakeLevel] = VK_NUMPAD3; // VK_NUMPAD9; - Keys[k_DecBrakeLevel] = VK_NUMPAD9; // VK_NUMPAD3; - Keys[k_Releaser] = VK_NUMPAD6; - Keys[k_EmergencyBrake] = VK_NUMPAD0; - Keys[k_Brake3] = VK_NUMPAD8; - Keys[k_Brake2] = VK_NUMPAD5; - Keys[k_Brake1] = VK_NUMPAD2; - Keys[k_Brake0] = VK_NUMPAD4; - Keys[k_WaveBrake] = VK_DECIMAL; - //*/ - /*MOJE - Keys[k_IncLocalBrakeLevel]=VK_NUMPAD3; //VK_NUMPAD7; - Keys[k_IncLocalBrakeLevelFAST]=VK_NUMPAD3; //VK_HOME; - Keys[k_DecLocalBrakeLevel]=VK_DECIMAL; //VK_NUMPAD1; - Keys[k_DecLocalBrakeLevelFAST]=VK_DECIMAL; //VK_END; - Keys[k_IncBrakeLevel]=VK_NUMPAD6; //VK_NUMPAD9; - Keys[k_DecBrakeLevel]=VK_NUMPAD9; //VK_NUMPAD3; - Keys[k_Releaser]=VK_NUMPAD5; - Keys[k_EmergencyBrake]=VK_NUMPAD0; - Keys[k_Brake3]=VK_NUMPAD2; - Keys[k_Brake2]=VK_NUMPAD1; - Keys[k_Brake1]=VK_NUMPAD4; - Keys[k_Brake0]=VK_NUMPAD7; - Keys[k_WaveBrake]=VK_NUMPAD8; - */ - Keys[k_AntiSlipping] = VK_RETURN; - Keys[k_Sand] = VkKeyScan('s'); - Keys[k_Main] = VkKeyScan('m'); - Keys[k_Active] = VkKeyScan('w'); - Keys[k_Battery] = VkKeyScan('j'); - Keys[k_DirectionForward] = VkKeyScan('d'); - Keys[k_DirectionBackward] = VkKeyScan('r'); - Keys[k_Fuse] = VkKeyScan('n'); - Keys[k_Compressor] = VkKeyScan('c'); - Keys[k_Converter] = VkKeyScan('x'); - Keys[k_MaxCurrent] = VkKeyScan('f'); - Keys[k_CurrentAutoRelay] = VkKeyScan('g'); - Keys[k_BrakeProfile] = VkKeyScan('b'); - Keys[k_CurrentNext] = VkKeyScan('z'); + Keys[ k_AntiSlipping ] = GLFW_KEY_KP_ENTER; + Keys[ k_Sand ] = 'S'; + Keys[ k_Main ] = 'M'; + Keys[ k_Active ] = 'W'; + Keys[ k_Battery ] = 'J'; + Keys[ k_DirectionForward ] = 'D'; + Keys[ k_DirectionBackward ] = 'R'; + Keys[ k_Fuse ] = 'N'; + Keys[ k_Compressor ] = 'C'; + Keys[ k_Converter ] = 'X'; + Keys[ k_MaxCurrent ] = 'F'; + Keys[ k_CurrentAutoRelay ] = 'G'; + Keys[ k_BrakeProfile ] = 'B'; + Keys[ k_CurrentNext ] = 'Z'; - Keys[k_Czuwak] = VkKeyScan(' '); - Keys[k_Horn] = VkKeyScan('a'); - Keys[k_Horn2] = VkKeyScan('a'); + Keys[ k_Czuwak ] = ' '; + Keys[ k_Horn ] = 'A'; + Keys[ k_Horn2 ] = 'A'; - Keys[k_FailedEngineCutOff] = VkKeyScan('e'); + Keys[ k_FailedEngineCutOff ] = 'E'; - Keys[k_MechUp] = VK_PRIOR; - Keys[k_MechDown] = VK_NEXT; - Keys[k_MechLeft] = VK_LEFT; - Keys[k_MechRight] = VK_RIGHT; - Keys[k_MechForward] = VK_UP; - Keys[k_MechBackward] = VK_DOWN; + Keys[ k_MechUp ] = GLFW_KEY_PAGE_UP; + Keys[ k_MechDown ] = GLFW_KEY_PAGE_DOWN; + Keys[ k_MechLeft ] = GLFW_KEY_LEFT; + Keys[ k_MechRight ] = GLFW_KEY_RIGHT; + Keys[ k_MechForward ] = GLFW_KEY_UP; + Keys[ k_MechBackward ] = GLFW_KEY_DOWN; - Keys[k_CabForward] = VK_HOME; - Keys[k_CabBackward] = VK_END; + Keys[ k_CabForward ] = GLFW_KEY_HOME; + Keys[ k_CabBackward ] = GLFW_KEY_END; - Keys[k_Couple] = VK_INSERT; - Keys[k_DeCouple] = VK_DELETE; + Keys[ k_Couple ] = GLFW_KEY_INSERT; + Keys[ k_DeCouple ] = GLFW_KEY_DELETE; - Keys[k_ProgramQuit] = VK_F10; - // Keys[k_ProgramPause]=VK_F3; - Keys[k_ProgramHelp] = VK_F1; - // Keys[k_FreeFlyMode]=VK_F4; - Keys[k_WalkMode] = VK_F5; + Keys[ k_ProgramQuit ] = GLFW_KEY_F10; + Keys[ k_ProgramHelp ] = GLFW_KEY_F1; + Keys[ k_WalkMode ] = GLFW_KEY_F5; - Keys[k_OpenLeft] = VkKeyScan(','); - Keys[k_OpenRight] = VkKeyScan('.'); - Keys[k_CloseLeft] = VkKeyScan(','); - Keys[k_CloseRight] = VkKeyScan('.'); - Keys[k_DepartureSignal] = VkKeyScan('/'); + Keys[ k_OpenLeft ] = ','; + Keys[ k_OpenRight ] = '.'; + Keys[ k_CloseLeft ] = ','; + Keys[ k_CloseRight ] = '.'; + Keys[ k_DepartureSignal ] = '/'; - // Winger 160204 - obsluga pantografow - Keys[k_PantFrontUp] = VkKeyScan('p'); // Ra: zamieniony przedni z tylnym - Keys[k_PantFrontDown] = VkKeyScan('p'); - Keys[k_PantRearUp] = VkKeyScan('o'); - Keys[k_PantRearDown] = VkKeyScan('o'); - // Winger 020304 - ogrzewanie - Keys[k_Heating] = VkKeyScan('h'); - Keys[k_LeftSign] = VkKeyScan('y'); - Keys[k_UpperSign] = VkKeyScan('u'); - Keys[k_RightSign] = VkKeyScan('i'); - Keys[k_EndSign] = VkKeyScan('t'); + // Winger 160204 - obsluga pantografow + Keys[ k_PantFrontUp ] = 'P'; // Ra: zamieniony przedni z tylnym + Keys[ k_PantFrontDown ] = 'P'; + Keys[ k_PantRearUp ] = 'O'; + Keys[ k_PantRearDown ] = 'O'; + // Winger 020304 - ogrzewanie + Keys[ k_Heating ] = 'H'; + Keys[ k_LeftSign ] = 'Y'; + Keys[ k_UpperSign ] = 'U'; + Keys[ k_RightSign ] = 'I'; + Keys[ k_EndSign ] = 'T'; - Keys[k_SmallCompressor] = VkKeyScan('v'); - Keys[k_StLinOff] = VkKeyScan('l'); - // ABu 090305 - przyciski uniwersalne, do roznych bajerow :) - Keys[k_Univ1] = VkKeyScan('['); - Keys[k_Univ2] = VkKeyScan(']'); - Keys[k_Univ3] = VkKeyScan(';'); - Keys[k_Univ4] = VkKeyScan('\''); - } + Keys[ k_SmallCompressor ] = 'V'; + Keys[ k_StLinOff ] = 'L'; + // ABu 090305 - przyciski uniwersalne, do roznych bajerow :) + Keys[ k_Univ1 ] = '['; + Keys[ k_Univ2 ] = ']'; + Keys[ k_Univ3 ] = ';'; + Keys[ k_Univ4 ] = '\''; } + /* vector3 Global::GetCameraPosition() { diff --git a/Globals.h b/Globals.h index 0236006e..b415c9dc 100644 --- a/Globals.h +++ b/Globals.h @@ -12,7 +12,8 @@ http://mozilla.org/MPL/2.0/. #include #include #include "renderer.h" -#include "opengl/glew.h" +#include "gl/glew.h" +#include "glfw/glfw3.h" #include "dumb3d.h" // definicje klawiszy @@ -208,7 +209,7 @@ class Global // McZapkie-170602: zewnetrzna definicja pojazdu uzytkownika static std::string asHumanCtrlVehicle; static void LoadIniFile(std::string asFileName); - static void InitKeys(std::string asFileName); + static void InitKeys(); inline static Math3D::vector3 GetCameraPosition() { return pCameraPosition; @@ -262,7 +263,9 @@ class Global static double fLuminance; // jasność światła do automatycznego zapalania static float SunAngle; // angle of the sun relative to horizon static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji - static HWND hWnd; // uchwyt okna + static GLFWwindow *window; + static bool shiftState; //m7todo: brzydko + static bool ctrlState; static int ScreenWidth; // current window dimensions. TODO: move it to renderer static int ScreenHeight; static float ZoomFactor; // determines current camera zoom level. TODO: move it to the renderer diff --git a/Ground.cpp b/Ground.cpp index 5a298282..3fc43f6e 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -16,9 +16,6 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Ground.h" -#include "opengl/glew.h" -#include "opengl/glut.h" - #include "Globals.h" #include "Logs.h" #include "usefull.h" @@ -43,6 +40,11 @@ http://mozilla.org/MPL/2.0/. #define _PROBLEND 1 //--------------------------------------------------------------------------- +extern "C" +{ + GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); //m7todo: potrzebne do directsound +} + bool bCondition; // McZapkie: do testowania warunku na event multiple string LogComment; @@ -312,7 +314,7 @@ void TGroundNode::RenderVBO() if (EvLaunch->Render()) if ((EvLaunch->dRadius < 0) || (mgn < EvLaunch->dRadius)) { - if (Console::Pressed(VK_SHIFT) && EvLaunch->Event2 != NULL) + if (Global::shiftState && EvLaunch->Event2 != NULL) Global::AddToQuery(EvLaunch->Event2, NULL); else if (EvLaunch->Event1 != NULL) Global::AddToQuery(EvLaunch->Event1, NULL); @@ -549,7 +551,7 @@ void TGroundNode::RenderHidden() if ((EvLaunch->dRadius < 0) || (mgn < EvLaunch->dRadius)) { WriteLog("Eventlauncher " + asName); - if (Console::Pressed(VK_SHIFT) && (EvLaunch->Event2)) + if (Global::shiftState && (EvLaunch->Event2)) Global::AddToQuery(EvLaunch->Event2, NULL); else if (EvLaunch->Event1) Global::AddToQuery(EvLaunch->Event1, NULL); @@ -2506,11 +2508,11 @@ void TGround::FirstInit() WriteLog("FirstInit is done"); }; -bool TGround::Init(std::string asFile, HDC hDC) +bool TGround::Init(std::string File) { // główne wczytywanie scenerii - if (ToLower(asFile).substr(0, 7) == "scenery") - asFile = asFile.erase(0, 8); // Ra: usunięcie niepotrzebnych znaków - zgodność wstecz z 2003 - WriteLog("Loading scenery from " + asFile); + if (ToLower(File).substr(0, 7) == "scenery") + File = File.erase(0, 8); // Ra: usunięcie niepotrzebnych znaków - zgodność wstecz z 2003 + WriteLog("Loading scenery from " + File); Global::pGround = this; // pTrain=NULL; pOrigin = aRotate = vector3(0, 0, 0); // zerowanie przesunięcia i obrotu @@ -2518,7 +2520,7 @@ bool TGround::Init(std::string asFile, HDC hDC) // TFileStream *fs; // int size; std::string subpath = Global::asCurrentSceneryPath; // "scenery/"; - cParser parser(asFile, cParser::buffer_FILE, subpath, Global::bLoadTraction); + cParser parser(File, cParser::buffer_FILE, subpath, Global::bLoadTraction); std::string token; /* @@ -5037,6 +5039,7 @@ bool TGround::RenderAlphaVBO(vector3 pPosition) return true; }; +#ifdef _WINDOWS //--------------------------------------------------------------------------- void TGround::Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) { // wysłanie komunikatu do sterującego @@ -5060,7 +5063,7 @@ void TGround::WyslijEvent(const std::string &e, const std::string &d) cData.dwData = 'EU07'; // sygnatura cData.cbData = 12 + i + j; // 8+dwa liczniki i dwa zera kończące cData.lpData = &r; - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + e + " sent" ); }; //--------------------------------------------------------------------------- @@ -5077,7 +5080,7 @@ void TGround::WyslijUszkodzenia(const std::string &t, char fl) cData.dwData = 'EU07'; // sygnatura cData.cbData = 11 + i; // 8+licznik i zero kończące cData.lpData = &r; - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); }; //--------------------------------------------------------------------------- @@ -5093,7 +5096,7 @@ void TGround::WyslijString(const std::string &t, int n) cData.dwData = 'EU07'; // sygnatura cData.cbData = 10 + i; // 8+licznik i zero kończące cData.lpData = &r; - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); }; //--------------------------------------------------------------------------- @@ -5172,7 +5175,7 @@ void TGround::WyslijNamiary(TGroundNode *t) cData.cbData = 10 + i + j; // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); // WriteLog("Ramka poszla!"); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t->asName + " sent"); }; @@ -5215,7 +5218,7 @@ void TGround::WyslijObsadzone() cData.cbData = 8 + 1984; // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " obsadzone" + " sent"); } @@ -5239,8 +5242,10 @@ void TGround::WyslijParam(int nr, int fl) cData.dwData = 'EU07'; // sygnatura cData.cbData = 12 + i; // 12+rozmiar danych cData.lpData = &r; - Navigate("TEU07SRK", WM_COPYDATA, (WPARAM)Global::hWnd, (LPARAM)&cData); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); }; +#endif + //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- diff --git a/Ground.h b/Ground.h index 41f1672d..0bcc7522 100644 --- a/Ground.h +++ b/Ground.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "opengl/glew.h" +#include "gl/glew.h" #include "VBO.h" #include "Classes.h" #include "ResourceManager.h" @@ -323,7 +323,7 @@ class TGround TGround(); ~TGround(); void Free(); - bool Init(std::string asFile, HDC hDC); + bool Init( std::string File ); void FirstInit(); void InitTracks(); void InitTraction(); diff --git a/Model3d.h b/Model3d.h index 9f1cb3e0..efb00404 100644 --- a/Model3d.h +++ b/Model3d.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #ifndef Model3dH #define Model3dH -#include "opengl/glew.h" +#include "gl/glew.h" #include "Parser.h" #include "dumb3d.h" #include "Float3d.h" diff --git a/Segment.cpp b/Segment.cpp index 9ed6dbfe..f83d1935 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -9,7 +9,6 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Segment.h" -#include "opengl/glew.h" #include "Globals.h" #include "Logs.h" diff --git a/Texture.cpp b/Texture.cpp index 8ce0761c..a8b8027f 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -17,7 +17,6 @@ http://mozilla.org/MPL/2.0/. #include "texture.h" #include -#include "opengl/glew.h" #include "usefull.h" #include "globals.h" @@ -639,6 +638,7 @@ texture_manager::GetTextureId( std::string Filename, std::string const &Dir, int if( true == filename.empty() ) { // there's nothing matching in the databank nor on the disk, report failure + ErrorLog( "Texture file missing: \"" + Filename + "\"" ); return npos; } diff --git a/Texture.h b/Texture.h index 70148630..115ee426 100644 --- a/Texture.h +++ b/Texture.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "opengl/glew.h" +#include "gl/glew.h" enum class resource_state { none, diff --git a/TextureDDS.h b/TextureDDS.h index 543e67d8..66dcc2e4 100644 --- a/TextureDDS.h +++ b/TextureDDS.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #ifndef TEXTURE_DDS_H #define TEXTURE_DDS_H 1 -#include "opengl/glew.h" +#include "gl/glew.h" #pragma hdrstop diff --git a/Track.h b/Track.h index 0d3d9e5e..f8f1678b 100644 --- a/Track.h +++ b/Track.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "opengl/glew.h" +#include "gl/glew.h" #include "ResourceManager.h" #include "Segment.h" #include "Texture.h" diff --git a/Traction.h b/Traction.h index 75e72374..e63a4e11 100644 --- a/Traction.h +++ b/Traction.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "opengl/glew.h" +#include "gl/glew.h" #include "VBO.h" #include "dumb3d.h" diff --git a/Train.cpp b/Train.cpp index ec438634..7e69f63d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -394,7 +394,7 @@ void TTrain::OnKeyDown(int cKey) // isEztOer=(mvControlled->TrainType==dt_EZT)&&(mvControlled->Mains)&&(mvOccupied->BrakeSubsystem==ss_ESt)&&(mvControlled->ActiveDir!=0); // isEztOer=((mvControlled->TrainType==dt_EZT)&&(mvControlled->Battery==true)&&(mvControlled->EpFuse==true)&&(mvOccupied->BrakeSubsystem==Oerlikon)&&(mvControlled->ActiveDir!=0)); - if (GetAsyncKeyState(VK_SHIFT) < 0) + if (Global::shiftState) { // wciśnięty [Shift] if (cKey == Global::Keys[k_IncMainCtrlFAST]) // McZapkie-200702: szybkie // przelaczanie na poz. @@ -409,7 +409,7 @@ void TTrain::OnKeyDown(int cKey) else if (cKey == Global::Keys[k_DirectionBackward]) { if (mvOccupied->Radio == false) - if (GetAsyncKeyState(VK_CONTROL) >= 0) + if (Global::ctrlState) { dsbSwitch->SetVolume(DSBVOLUME_MAX); dsbSwitch->Play(0, 0, 0); @@ -561,7 +561,7 @@ void TTrain::OnKeyDown(int cKey) int CouplNr = -2; if (!FreeFlyModeFlag) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if (mvOccupied->BrakeDelaySwitch(bdelay_R + bdelay_M)) { dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); @@ -588,7 +588,7 @@ void TTrain::OnKeyDown(int cKey) } if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R + bdelay_M)) { dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); @@ -658,7 +658,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || { // Ra: dźwięk, gdy razem z [Shift] if ((mvControlled->TrainType & dt_EZT) ? mvControlled == mvOccupied : !mvOccupied->ActiveCab) // tylko w maszynowym - if (Console::Pressed(VK_CONTROL)) // z [Ctrl] + if (Global::ctrlState) // z [Ctrl] mvControlled->bPantKurek3 = true; // zbiornik pantografu połączony // jest ze zbiornikiem głównym // (pompowanie nie ma sensu) @@ -671,7 +671,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || dsbSwitch->Play(0, 0, 0); // dźwięk tylko po naciśnięciu klawisza } } - else if (cKey == VkKeyScan('q')) // ze Shiftem - włączenie AI + else if (cKey == GLFW_KEY_Q) // ze Shiftem - włączenie AI { // McZapkie-240302 - wlaczanie automatycznego pilota (zadziala tylko w // trybie debugmode) if (DynamicObject->Mechanik) @@ -760,7 +760,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // przyciemnienia pod Univ4) else if (cKey == Global::Keys[k_Univ3]) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { if (bCabLight == false) //(ggCabLightButton.GetValue()==0) { @@ -788,7 +788,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // hunter-091012: dzwiek dla przyciemnienia swiatelka w kabinie else if (cKey == Global::Keys[k_Univ4]) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { if (bCabLightDim == false) //(ggCabLightDimButton.GetValue()==0) { @@ -891,7 +891,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || { if (false == (mvOccupied->LightsPosNo > 0)) { - if ((GetAsyncKeyState(VK_CONTROL) < 0) && + if ((Global::ctrlState) && (ggRearRightLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu. // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view // TODO: do it a more elegant way. preferably along with the rest of the controlling code @@ -1011,7 +1011,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || SetLights(); } } - else if ((GetAsyncKeyState(VK_CONTROL) < 0) && + else if ((Global::ctrlState) && (ggRearUpperLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu { //------------------------------ @@ -1066,7 +1066,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || { if (false == (mvOccupied->LightsPosNo > 0)) { - if ((GetAsyncKeyState(VK_CONTROL) < 0) && + if ((Global::ctrlState) && (ggRearLeftLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view // TODO: do it a more elegant way. preferably along with the rest of the controlling code @@ -1238,7 +1238,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // World.cpp if (!FreeFlyModeFlag) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if ((mvOccupied->LocalBrake == ManualBrake) || (mvOccupied->MBrake == true)) { mvOccupied->IncManualBrakeLevel(1); @@ -1256,7 +1256,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // World.cpp if (!FreeFlyModeFlag) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) if ((mvOccupied->LocalBrake == ManualBrake) || (mvOccupied->MBrake == true)) mvOccupied->DecManualBrakeLevel(1); else @@ -1350,7 +1350,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(mvOccupied->BrakeCtrlPosNo / 2 + (mvOccupied->BrakeHandle == FV4a ? 1 : 0)); - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState) mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos(bh_NP)); // yB: czy ten stos funkcji nie // powinien być jako oddzielna @@ -1369,7 +1369,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } else if (cKey == Global::Keys[k_Brake0]) { - if (Console::Pressed(VK_CONTROL)) + if( Global::ctrlState ) { mvOccupied->BrakeCtrlPos2 = 0; // wyrownaj kapturek } @@ -1431,7 +1431,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || else if (cKey == Global::Keys[k_Fuse]) //--------------- { - if (GetAsyncKeyState(VK_CONTROL) < 0) // z controlem + if( Global::ctrlState ) // z controlem { ggConverterFuseButton.PutValue(1); // hunter-261211 if ((mvControlled->Mains == false) && (ggConverterButton.GetValue() == 0) && @@ -1472,7 +1472,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } else if (cKey == Global::Keys[k_DirectionBackward]) // r { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if( Global::ctrlState ) { // wciśnięty [Ctrl] if (mvOccupied->Radio == true) { @@ -1554,7 +1554,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || int CouplNr = -2; if (!FreeFlyModeFlag) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if( Global::ctrlState ) if (mvOccupied->BrakeDelaySwitch(bdelay_R)) { dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); @@ -1581,7 +1581,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if( Global::ctrlState ) if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R)) { dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); @@ -1646,7 +1646,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || { // Ra: bez [Shift] też dać dźwięk if ((mvControlled->TrainType & dt_EZT) ? mvControlled == mvOccupied : !mvOccupied->ActiveCab) // tylko w maszynowym - if (Console::Pressed(VK_CONTROL)) // z [Ctrl] + if (Global::ctrlState) // z [Ctrl] mvControlled->bPantKurek3 = false; // zbiornik pantografu połączony jest z małą sprężarką // (pompowanie ma sens, ale potem trzeba przełączyć) @@ -1661,7 +1661,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } // McZapkie-240302 - wylaczanie automatycznego pilota (w trybie ~debugmode // mozna tylko raz) - else if (cKey == VkKeyScan('q')) // bez Shift + else if (cKey == GLFW_KEY_Q) // bez Shift { if (DynamicObject->Mechanik) DynamicObject->Mechanik->TakeControl(false); @@ -1983,7 +1983,7 @@ if // przyciemnienia pod Univ4) else if (cKey == Global::Keys[k_Univ3]) { - if (Console::Pressed(VK_CONTROL)) + if( Global::ctrlState ) { if (bCabLight == true) //(ggCabLightButton.GetValue()!=0) { @@ -2010,7 +2010,7 @@ if // hunter-091012: dzwiek dla przyciemnienia swiatelka w kabinie else if (cKey == Global::Keys[k_Univ4]) { - if (Console::Pressed(VK_CONTROL)) + if( Global::ctrlState ) { if (bCabLightDim == true) //(ggCabLightDimButton.GetValue()!=0) { @@ -2091,7 +2091,7 @@ if { if (false == (mvOccupied->LightsPosNo > 0)) { - if ((GetAsyncKeyState(VK_CONTROL) < 0) && + if( ( Global::ctrlState ) && (ggRearLeftLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view // TODO: do it a more elegant way. preferably along with the rest of the controlling code @@ -2204,7 +2204,7 @@ if SetLights(); } } - else if ((GetAsyncKeyState(VK_CONTROL) < 0) && + else if( ( Global::ctrlState ) && (ggRearUpperLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu { //------------------------------ @@ -2258,7 +2258,7 @@ if { if (false == (mvOccupied->LightsPosNo > 0)) { - if ((GetAsyncKeyState(VK_CONTROL) < 0) && + if( ( Global::ctrlState ) && (ggRearRightLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view // TODO: do it a more elegant way. preferably along with the rest of the controlling code @@ -2384,7 +2384,7 @@ if { // McZapkie: poruszanie sie po kabinie, w updatemechpos zawarte sa wiezy - auto step = 60.0f * Timer::GetDeltaTime(); + auto step = 1.5f; auto const camerayaw = Global::pCamera->Yaw; Math3D::vector3 direction( 0.0f, 0.0f, step ); direction.RotateY( camerayaw ); @@ -2398,7 +2398,7 @@ if right *= -1.0f; } // if (!GetAsyncKeyState(VK_SHIFT)<0) // bez shifta - if (!Console::Pressed(VK_CONTROL)) // gdy [Ctrl] zwolniony (dodatkowe widoki) + if( !Global::ctrlState ) // gdy [Ctrl] zwolniony (dodatkowe widoki) { if (cKey == Global::Keys[k_MechLeft]) { @@ -2443,7 +2443,7 @@ if if (DebugModeFlag) { // przesuwanie składu o 100m TDynamicObject *d = DynamicObject; - if (cKey == VkKeyScan('[')) + if (cKey == GLFW_KEY_LEFT_BRACKET) { while (d) { @@ -2457,7 +2457,7 @@ if d = d->Prev(); // w drugą stronę też } } - else if (cKey == VkKeyScan(']')) + else if (cKey == GLFW_KEY_RIGHT_BRACKET) { while (d) { @@ -2472,12 +2472,12 @@ if } } } - if (cKey == VkKeyScan('-')) + if (cKey == GLFW_KEY_MINUS) { // zmniejszenie numeru kanału radiowego if (iRadioChannel > 0) --iRadioChannel; // 0=wyłączony } - else if (cKey == VkKeyScan('=')) + else if (cKey == GLFW_KEY_EQUAL) { // zmniejszenie numeru kanału radiowego if (iRadioChannel < 8) ++iRadioChannel; // 0=wyłączony @@ -2487,7 +2487,7 @@ if void TTrain::OnKeyUp(int cKey) { // zwolnienie klawisza - if (GetAsyncKeyState(VK_SHIFT) < 0) + if (Global::shiftState) { // wciśnięty [Shift] } else @@ -2548,6 +2548,7 @@ void TTrain::UpdateMechPosition(double dt) // shake *= 1.25; } vMechVelocity -= (shake + vMechVelocity * 100) * (fMechSpringX + fMechSpringY + fMechSpringZ) / (200); +// vMechVelocity -= vMechVelocity * iVel * dt; // shake *= 0.95 * dt; // shake damping // McZapkie: @@ -2558,15 +2559,15 @@ void TTrain::UpdateMechPosition(double dt) vMechVelocity.y = -vMechVelocity.y; // ABu011104: 5*pMechShake.y, zeby ladnie pudlem rzucalo :) pNewMechPosition = pMechOffset + vector3(1.5 * pMechShake.x, 2.0 * pMechShake.y, 1.5 * pMechShake.z); - vMechMovement = 0.5 * vMechMovement; +// vMechMovement = 0.5 * vMechMovement; } else { // hamowanie rzucania przy spadku FPS pMechShake -= pMechShake * std::min(dt, 1.0); // po tym chyba potrafią zostać jakieś ułamki, które powodują zjazd pMechOffset += vMechMovement * dt; - vMechVelocity.y = 0.5 * vMechVelocity.y; + vMechVelocity.y -= vMechVelocity.y * 50.0 * dt; pNewMechPosition = pMechOffset + vector3(pMechShake.x, 5 * pMechShake.y, pMechShake.z); - vMechMovement = 0.5 * vMechMovement; +// vMechMovement = 0.5 * vMechMovement; } // numer kabiny (-1: kabina B) if (DynamicObject->Mechanik) // może nie być? @@ -2613,6 +2614,13 @@ void TTrain::UpdateMechPosition(double dt) pMechPosition = DynamicObject->mMatrix * pNewMechPosition; // położenie względem środka pojazdu w układzie scenerii pMechPosition += DynamicObject->GetPosition(); + + // framerate-independent speed reduction that doesn't break at high framerates... + vMechMovement -= vMechMovement * 50.0 * dt; + if( vMechMovement.LengthSquared() < 0.01 ) { + vMechMovement = Math3D::vector3(); + } + }; bool TTrain::Update( double const Deltatime ) @@ -4195,7 +4203,7 @@ bool TTrain::Update( double const Deltatime ) if (Console::Pressed(Global::Keys[k_Horn])) { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { SetFlag(mvOccupied->WarningSignal, 2); mvOccupied->WarningSignal &= (255 - 1); @@ -4226,7 +4234,7 @@ bool TTrain::Update( double const Deltatime ) //---------------- // hunter-141211: wyl. szybki zalaczony i wylaczony przeniesiony z // OnKeyPress() - if (Console::Pressed(VK_SHIFT) && Console::Pressed(Global::Keys[k_Main])) + if (Global::shiftState && Console::Pressed(Global::Keys[k_Main])) { fMainRelayTimer += dt; ggMainOnButton.PutValue(1); @@ -4260,7 +4268,7 @@ bool TTrain::Update( double const Deltatime ) } //--- - if (!Console::Pressed(VK_SHIFT) && Console::Pressed(Global::Keys[k_Main])) + if (!Global::shiftState && Console::Pressed(Global::Keys[k_Main])) { ggMainOffButton.PutValue(1); if (mvControlled->MainSwitch(false)) @@ -4399,7 +4407,7 @@ bool TTrain::Update( double const Deltatime ) ggAntiSlipButton.UpdateValue(0); //----------------- // hunter-261211: przetwornica i sprezarka - if (Console::Pressed(VK_SHIFT) && + if (Global::shiftState && Console::Pressed(Global::Keys[k_Converter])) // NBMX 14-09-2003: przetwornica wl { //(mvControlled->CompressorPower<2) ggConverterButton.PutValue(1); @@ -4425,14 +4433,14 @@ bool TTrain::Update( double const Deltatime ) // if ( // Console::Pressed(VK_SHIFT)&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) // ) //NBMX 14-09-2003: sprezarka wl - if (Console::Pressed(VK_SHIFT) && Console::Pressed(Global::Keys[k_Compressor]) && + if (Global::shiftState && Console::Pressed(Global::Keys[k_Compressor]) && (mvControlled->CompressorPower < 2)) // hunter-091012: tak jest poprawnie { // hunter-110212: poprawka dla EZT ggCompressorButton.PutValue(1); mvControlled->CompressorSwitch(true); } - if (!Console::Pressed(VK_SHIFT) && + if (!Global::shiftState && Console::Pressed(Global::Keys[k_Converter])) // NBMX 14-09-2003: przetwornica wl { ggConverterButton.PutValue(0); @@ -4445,7 +4453,7 @@ bool TTrain::Update( double const Deltatime ) // if ( // !Console::Pressed(VK_SHIFT)&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) // ) //NBMX 14-09-2003: sprezarka wl - if (!Console::Pressed(VK_SHIFT) && Console::Pressed(Global::Keys[k_Compressor]) && + if (!Global::shiftState && Console::Pressed(Global::Keys[k_Compressor]) && (mvControlled->CompressorPower < 2)) // hunter-091012: tak jest poprawnie { // hunter-110212: poprawka dla EZT ggCompressorButton.PutValue(0); @@ -4504,7 +4512,7 @@ bool TTrain::Update( double const Deltatime ) if (!DebugModeFlag) { if (ggUniversal1Button.SubModel) - if (Console::Pressed(VK_SHIFT)) + if( Global::shiftState ) ggUniversal1Button.IncValue(dt / 2); else ggUniversal1Button.DecValue(dt / 2); @@ -4520,7 +4528,7 @@ bool TTrain::Update( double const Deltatime ) if (!DebugModeFlag) { if (ggUniversal2Button.SubModel) - if (Console::Pressed(VK_SHIFT)) + if( Global::shiftState ) ggUniversal2Button.IncValue(dt / 2); else ggUniversal2Button.DecValue(dt / 2); @@ -4530,9 +4538,9 @@ bool TTrain::Update( double const Deltatime ) // hunter-091012: zrobione z uwzglednieniem przelacznika swiatla if (Console::Pressed(Global::Keys[k_Univ3])) { - if (Console::Pressed(VK_SHIFT)) + if( Global::shiftState ) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { bCabLight = true; if (ggCabLightButton.SubModel) @@ -4555,7 +4563,7 @@ bool TTrain::Update( double const Deltatime ) } else { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { bCabLight = false; if (ggCabLightButton.SubModel) @@ -4659,9 +4667,9 @@ bool TTrain::Update( double const Deltatime ) // swiatla if (Console::Pressed(Global::Keys[k_Univ4])) { - if (Console::Pressed(VK_SHIFT)) + if( Global::shiftState ) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { bCabLightDim = true; if (ggCabLightDimButton.SubModel) @@ -4677,7 +4685,7 @@ bool TTrain::Update( double const Deltatime ) } else { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { bCabLightDim = false; if (ggCabLightDimButton.SubModel) @@ -4717,7 +4725,7 @@ bool TTrain::Update( double const Deltatime ) // ((mvOccupied->BrakeHandle==FV4a)&&(Console::Pressed(Global::Keys[k_IncBrakeLevel]))) if ((Console::Pressed(Global::Keys[k_IncBrakeLevel]))) { - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { // mvOccupied->BrakeCtrlPos2-=dt/20.0; // if (mvOccupied->BrakeCtrlPos2<-1.5) mvOccupied->BrakeCtrlPos2=-1.5; @@ -4732,7 +4740,7 @@ bool TTrain::Update( double const Deltatime ) // ((mvOccupied->BrakeHandle==FV4a)&&(Console::Pressed(Global::Keys[k_DecBrakeLevel]))) if ((Console::Pressed(Global::Keys[k_DecBrakeLevel]))) { - if (Console::Pressed(VK_CONTROL)) + if( Global::ctrlState ) { // mvOccupied->BrakeCtrlPos2+=(mvOccupied->BrakeCtrlPos2>2?0:dt/20.0); // if (mvOccupied->BrakeCtrlPos2<-3) mvOccupied->BrakeCtrlPos2=-3; @@ -4748,7 +4756,7 @@ bool TTrain::Update( double const Deltatime ) if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_IncBrakeLevel]))) { - if (Console::Pressed(VK_CONTROL)) + if( Global::ctrlState ) { mvOccupied->BrakeCtrlPos2 -= dt / 20.0; if (mvOccupied->BrakeCtrlPos2 < -1.5) @@ -4765,7 +4773,7 @@ bool TTrain::Update( double const Deltatime ) if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_DecBrakeLevel]))) { - if (Console::Pressed(VK_CONTROL)) + if( Global::ctrlState ) { mvOccupied->BrakeCtrlPos2 += (mvOccupied->BrakeCtrlPos2 > 2 ? 0 : dt / 20.0); if (mvOccupied->BrakeCtrlPos2 < -3) @@ -4818,7 +4826,7 @@ bool TTrain::Update( double const Deltatime ) if (Console::Pressed(Global::Keys[k_Main])) //[] { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) ggMainButton.PutValue(1); else ggMainButton.PutValue(0); @@ -4843,7 +4851,7 @@ bool TTrain::Update( double const Deltatime ) } else { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { // if (Console::Pressed(k_CurrentNext)) { // Ra: było pod VK_F3 @@ -4858,7 +4866,7 @@ bool TTrain::Update( double const Deltatime ) { // if (Console::Pressed(k_CurrentNext)) { // Ra: było pod VK_F3 - if (Console::Pressed(VK_CONTROL)) + if (Global::ctrlState) { if ((mvOccupied->EpFuseSwitch(false))) { @@ -4887,7 +4895,7 @@ bool TTrain::Update( double const Deltatime ) // Winger 010304 PantAllDownButton if (Console::Pressed(Global::Keys[k_PantFrontUp])) { - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) ggPantFrontButton.PutValue(1); else ggPantAllDownButton.PutValue(1); @@ -4900,7 +4908,7 @@ bool TTrain::Update( double const Deltatime ) if (Console::Pressed(Global::Keys[k_PantRearUp])) { - if (Console::Pressed(VK_SHIFT)) + if( Global::shiftState ) ggPantRearButton.PutValue(1); else ggPantFrontButtonOff.PutValue(1); @@ -5041,10 +5049,10 @@ bool TTrain::Update( double const Deltatime ) //światło wewnętrzne przygaszone (255 216 176) if( mvOccupied->ConverterFlag == true ) { // jasnosc dla zalaczonej przetwornicy - DynamicObject->InteriorLightLevel = 0.75f; + DynamicObject->InteriorLightLevel = 0.4f; } else { - DynamicObject->InteriorLightLevel = 0.375f; + DynamicObject->InteriorLightLevel = 0.2f; } break; } diff --git a/TrkFoll.h b/TrkFoll.h index 5400e935..5723ccb1 100644 --- a/TrkFoll.h +++ b/TrkFoll.h @@ -34,7 +34,7 @@ class TTrackFollower ~TTrackFollower(); TTrack * SetCurrentTrack(TTrack *pTrack, int end); bool Move(double fDistance, bool bPrimary); - inline TTrack * GetTrack() + inline TTrack * GetTrack() const { return pCurrentTrack; }; @@ -43,7 +43,7 @@ class TTrackFollower return vAngles.x; }; // przechyłka policzona przy ustalaniu pozycji //{return pCurrentSegment->GetRoll(fCurrentDistance)*fDirection;}; //zamiast liczyć można pobrać - inline double GetDirection() + inline double GetDirection() const { return fDirection; }; // zwrot na torze diff --git a/VBO.cpp b/VBO.cpp index 07e8dc01..6b8777bf 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -9,7 +9,6 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "VBO.h" -#include "opengl/glew.h" #include "usefull.h" //--------------------------------------------------------------------------- diff --git a/World.cpp b/World.cpp index 7f986aa4..bd325e09 100644 --- a/World.cpp +++ b/World.cpp @@ -15,9 +15,6 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "World.h" -#include "opengl/glew.h" -#include "opengl/glut.h" - #include "Globals.h" #include "Logs.h" #include "MdlMngr.h" @@ -45,6 +42,11 @@ TDynamicObject *Controlled = NULL; // pojazd, który prowadzimy const double fTimeMax = 1.00; //[s] maksymalny czas aktualizacji w jednek klatce +extern "C" +{ + GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); //m7todo: potrzebne do directsound +} + TWorld::TWorld() { // randomize(); @@ -90,10 +92,11 @@ void TWorld::TrainDelete(TDynamicObject *d) Global::pUserDynamic = NULL; // tego też nie ma }; -GLvoid TWorld::glPrint(const char *txt) // custom GL "Print" routine +GLvoid TWorld::glPrint( std::string const &Text ) // custom GL "Print" routine { // wypisywanie tekstu 2D na ekranie - if (!txt) + if (true == Text.empty()) return; +/* if (Global::bGlutFont) { // tekst generowany przez GLUT int i, len = strlen(txt); @@ -101,10 +104,11 @@ GLvoid TWorld::glPrint(const char *txt) // custom GL "Print" routine glutBitmapCharacterDLL(GLUT_BITMAP_8_BY_13, txt[i]); // funkcja linkowana dynamicznie } else +*/ { // generowanie przez Display Lists glPushAttrib(GL_LIST_BIT); // pushes the display list bits glListBase(base - 32); // sets the base character to 32 - glCallLists(strlen(txt), GL_UNSIGNED_BYTE, txt); // draws the display list text + glCallLists(Text.size(), GL_UNSIGNED_BYTE, Text.c_str()); // draws the display list text glPopAttrib(); // pops the display list bits } } @@ -164,10 +168,12 @@ BOOL GetDisplayMonitorInfo(int nDeviceIndex, LPSTR lpszMonitorInfo) } */ -bool TWorld::Init(HWND NhWnd, HDC hDC) -{ - auto timestart = std::chrono::system_clock::now(); - Global::hWnd = NhWnd; // do WM_COPYDATA +bool TWorld::Init( GLFWwindow *w ) { + + auto timestart = std::chrono::system_clock::now(); + + window = w; + Global::window = w; // do WM_COPYDATA Global::pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań Global::detonatoryOK = true; WriteLog("Starting MaSzyna rail vehicle simulator."); @@ -187,15 +193,11 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) std::string glver = ((char *)glGetString(GL_VERSION)); WriteLog("OpenGL Version:"); WriteLog(glver); - if ((glver == "1.5.1") || (glver == "1.5.2")) - { - Error("Niekompatybilna wersja openGL - dwuwymiarowy tekst nie bedzie wyswietlany!"); - WriteLog("WARNING! This OpenGL version is not fully compatible with simulator!"); - WriteLog("UWAGA! Ta wersja OpenGL nie jest w pelni kompatybilna z symulatorem!"); - Global::detonatoryOK = false; + if( !GLEW_VERSION_1_4 ) { + std::cout << "required opengl >= 1.4" << std::endl; + return false; } - else - Global::detonatoryOK = true; + // Ra: umieszczone w EU07.cpp jakoś nie chce działać while( glver.rfind( '.' ) > glver.find( '.' ) ) { glver = glver.substr( 0, glver.rfind( '.' ) - 1 ); // obcięcie od drugiej kropki @@ -224,15 +226,6 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) WriteLog((char *)glGetString(GL_EXTENSIONS)); if (GLEW_ARB_vertex_buffer_object) // czy jest VBO w karcie graficznej { - if( std::string( (char *)glGetString(GL_VENDOR) ).find("Intel") != std::string::npos ) // wymuszenie tylko dla kart Intel - { // karty Intel nie nadają się do grafiki 3D, ale robimy wyjątek, bo to w końcu symulator - Global::iMultisampling = - 0; // to robi problemy na "Intel(R) HD Graphics Family" - czarny ekran - if (Global::fOpenGL >= - 1.4) // 1.4 miało obsługę VBO, ale bez opcji modyfikacji fragmentu bufora - Global::bUseVBO = true; // VBO włączane tylko, jeśli jest obsługa oraz nie ustawiono - // niższego numeru - } if (Global::bUseVBO) WriteLog("Ra: The VBO is found and will be used."); else @@ -270,7 +263,7 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glLoadIdentity(); glClearDepth( 1.0f ); // ZBuffer Value - glClearColor( 51.0f / 255.0f, 106.0f / 255.0f, 85.0f / 255.0f, 1.0f ); // Background Color + glClearColor( 51.0f / 255.0f, 102.0f / 255.0f, 85.0f / 255.0f, 1.0f ); // Background Color glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); // Clear screen and depth buffer glEnable(GL_TEXTURE_2D); // Enable Texture Mapping @@ -344,55 +337,35 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) /*--------------------Render Initialization End---------------------*/ WriteLog("Font init"); // początek inicjacji fontów 2D - if (Global::bGlutFont) // jeśli wybrano GLUT font, próbujemy zlinkować GLUT32.DLL - { - UINT mode = SetErrorMode(SEM_NOOPENFILEERRORBOX); // aby nie wrzeszczał, że znaleźć nie może - hinstGLUT32 = LoadLibrary(TEXT("GLUT32.DLL")); // get a handle to the DLL module - SetErrorMode(mode); - // If the handle is valid, try to get the function address. - if (hinstGLUT32) - glutBitmapCharacterDLL = - (FglutBitmapCharacter)GetProcAddress(hinstGLUT32, "glutBitmapCharacter"); - else - WriteLog("Missed GLUT32.DLL."); - if (glutBitmapCharacterDLL) - WriteLog("Used font from GLUT32.DLL."); - else - Global::bGlutFont = false; // nie udało się, trzeba spróbować na Display List - } - if (!Global::bGlutFont) - { // jeśli bezGLUTowy font - HFONT font; // Windows Font ID - base = glGenLists(96); // storage for 96 characters - font = CreateFont(-15, // height of font - 0, // width of font - 0, // angle of escapement - 0, // orientation angle - FW_BOLD, // font weight - FALSE, // italic - FALSE, // underline - FALSE, // strikeout - ANSI_CHARSET, // character set identifier - OUT_TT_PRECIS, // output precision - CLIP_DEFAULT_PRECIS, // clipping precision - ANTIALIASED_QUALITY, // output quality - FF_DONTCARE | DEFAULT_PITCH, // family and pitch - "Courier New"); // font name - SelectObject(hDC, font); // selects the font we want - wglUseFontBitmapsA(hDC, 32, 96, base); // builds 96 characters starting at character 32 - WriteLog("Display Lists font used."); //+AnsiString(glGetError()) - } + HFONT font; // Windows Font ID + base = ::glGenLists(96); // storage for 96 characters + HDC hDC = ::GetDC( glfwGetWin32Window( window ) ); + font = ::CreateFont( -MulDiv( 10, ::GetDeviceCaps( hDC, LOGPIXELSY ), 72 ), // height of font + 0, // width of font + 0, // angle of escapement + 0, // orientation angle + (Global::bGlutFont ? FW_MEDIUM : FW_HEAVY), // font weight + FALSE, // italic + FALSE, // underline + FALSE, // strikeout + DEFAULT_CHARSET, // character set identifier + OUT_DEFAULT_PRECIS, // output precision + CLIP_DEFAULT_PRECIS, // clipping precision + (Global::bGlutFont ? CLEARTYPE_QUALITY : PROOF_QUALITY), // output quality + DEFAULT_PITCH | FF_DONTCARE, // family and pitch + "Lucida Console"); // font name + ::SelectObject(hDC, font); // selects the font we want + ::wglUseFontBitmapsA(hDC, 32, 96, base); // builds 96 characters starting at character 32 + WriteLog("Display Lists font used."); //+AnsiString(glGetError()) WriteLog("Font init OK"); //+AnsiString(glGetError()) Timer::ResetTimers(); - hWnd = NhWnd; glColor4f(1.0f, 3.0f, 3.0f, 0.0f); // SwapBuffers(hDC); // Swap Buffers (Double Buffering) // glClear(GL_COLOR_BUFFER_BIT); // glFlush(); - SetForegroundWindow(hWnd); WriteLog("Sound Init"); glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); @@ -427,75 +400,46 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) glTexCoord2f(0.0f, 1.0f); glVertex2f( -widthratio, 1.0f ); // top left of the texture and quad glEnd(); - //~logo; Ra: to jest bez sensu zapis - glColor3f(0.0f, 0.0f, 1.0f); - if (Global::detonatoryOK) - { - glRasterPos2f(-0.85f * widthratio, -0.25f); - glPrint("Uruchamianie / Initializing..."); - glRasterPos2f(-0.85f * widthratio, -0.30f); - glPrint("Dzwiek / Sound..."); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + + glColor3f(0.0f, 0.0f, 0.0f); + glRasterPos2f(-0.85f * widthratio, -0.25f); + glPrint("Uruchamianie / Initializing..."); + glfwSwapBuffers( window ); /*-----------------------Sound Initialization-----------------------*/ - TSoundsManager::Init(hWnd); - // TSoundsManager::LoadSounds( "" ); - /*---------------------Sound Initialization End---------------------*/ + glRasterPos2f( -0.85f * widthratio, -0.30f ); + glPrint( "Dzwiek / Sound..." ); + + TSoundsManager::Init( glfwGetWin32Window( window ) ); WriteLog("Sound Init OK"); - if (Global::detonatoryOK) - { - glRasterPos2f(-0.25f * widthratio, -0.30f); - glPrint("OK."); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glRasterPos2f(-0.25f * widthratio, -0.30f); + glPrint("OK."); + glfwSwapBuffers( window ); + /*---------------------Sound Initialization End---------------------*/ - int i; - - Paused = true; WriteLog("Textures init"); - if (Global::detonatoryOK) - { - glRasterPos2f(-0.85f * widthratio, -0.35f); - glPrint("Tekstury / Textures..."); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) -/* - TTexturesManager.Init(); -*/ + glRasterPos2f(-0.85f * widthratio, -0.35f); + glPrint("Tekstury / Textures..."); + glfwSwapBuffers( window ); WriteLog("Textures init OK"); - if (Global::detonatoryOK) - { - glRasterPos2f( -0.25f * widthratio, -0.35f ); - glPrint("OK."); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glRasterPos2f( -0.25f * widthratio, -0.35f ); + glPrint("OK."); + glfwSwapBuffers( window ); WriteLog("Models init"); - if (Global::detonatoryOK) - { - glRasterPos2f( -0.85f * widthratio, -0.40f ); - glPrint("Modele / Models..."); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) - // McZapkie: dodalem sciezke zeby mozna bylo definiowac skad brac modele ale to malo eleganckie - // TModelsManager::LoadModels(asModelsPatch); + glRasterPos2f( -0.85f * widthratio, -0.40f ); + glPrint("Modele / Models..."); + glfwSwapBuffers( window ); TModelsManager::Init(); WriteLog("Models init OK"); - if (Global::detonatoryOK) - { - glRasterPos2f( -0.25f * widthratio, -0.40f ); - glPrint("OK."); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glRasterPos2f( -0.25f * widthratio, -0.40f ); + glPrint("OK."); + glfwSwapBuffers( window ); WriteLog("Ground init"); - if (Global::detonatoryOK) - { - glRasterPos2f( -0.85f * widthratio, -0.45f ); - glPrint("Sceneria / Scenery (please wait)..."); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glRasterPos2f( -0.85f * widthratio, -0.45f ); + glPrint("Sceneria / Scenery (please wait)..."); + glfwSwapBuffers( window ); #ifndef EU07_USE_OLD_LIGHTING_MODEL // setup lighting @@ -514,16 +458,14 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Global::DayLight.diffuse[ 2 ] = 231.0 / 255.0; #endif - Ground.Init(Global::SceneryFile, hDC); + Ground.Init(Global::SceneryFile); // Global::tSinceStart= 0; Environment.init(); WriteLog("Ground init OK"); - if (Global::detonatoryOK) - { - glRasterPos2f( -0.25f * widthratio, -0.45f ); - glPrint("OK."); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glRasterPos2f( -0.25f * widthratio, -0.45f ); + glColor3f( 0.0f, 0.0f, 0.0f ); + glPrint( "OK." ); + glfwSwapBuffers( window ); // TTrack *Track=Ground.FindGroundNode("train_start",TP_TRACK)->pTrack; @@ -535,12 +477,10 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) Camera.Init(Global::pFreeCameraInit[0], Global::pFreeCameraInitAngle[0]); char buff[255] = "Player train init: "; - if (Global::detonatoryOK) - { - glRasterPos2f( -0.85f * widthratio, -0.50f ); - glPrint("Przygotowanie kabiny do sterowania..."); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glRasterPos2f( -0.85f * widthratio, -0.50f ); + glColor3f( 0.0f, 0.0f, 0.0f ); + glPrint( "Przygotowanie kabiny do sterowania..." ); + glfwSwapBuffers( window ); strcat(buff, Global::asHumanCtrlVehicle.c_str()); WriteLog(buff); @@ -556,24 +496,20 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) mvControlled = Controlled->ControlledFind()->MoverParameters; Global::pUserDynamic = Controlled; // renerowanie pojazdu względem kabiny WriteLog("Player train init OK"); - if (Global::detonatoryOK) - { - glRasterPos2f( -0.25f * widthratio, -0.50f ); - glPrint("OK."); - } + glRasterPos2f( -0.25f * widthratio, -0.50f ); + glColor3f( 0.0f, 0.0f, 0.0f ); + glPrint( "OK." ); FollowView(); - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glfwSwapBuffers( window ); } else { Error("Player train init failed!"); FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie - if (Global::detonatoryOK) - { - glRasterPos2f( -0.85f * widthratio, -0.50f ); - glPrint("Blad inicjalizacji sterowanego pojazdu!"); - } - SwapBuffers(hDC); // Swap Buffers (Double Buffering) + glRasterPos2f( -0.85f * widthratio, -0.50f ); + glColor3f( 0.0f, 0.0f, 0.0f ); + glPrint( "Blad inicjalizacji sterowanego pojazdu!" ); + glfwSwapBuffers( window ); Controlled = NULL; mvControlled = NULL; Camera.Type = tp_Free; @@ -584,14 +520,12 @@ bool TWorld::Init(HWND NhWnd, HDC hDC) if (Global::asHumanCtrlVehicle != "ghostview") { Error("Player train not exist!"); - if (Global::detonatoryOK) - { - glRasterPos2f( -0.85f * widthratio, -0.55f ); - glPrint("Wybrany pojazd nie istnieje w scenerii!"); - } + glRasterPos2f( -0.85f * widthratio, -0.55f ); + glColor3f( 0.0f, 0.0f, 0.0f ); + glPrint( "Wybrany pojazd nie istnieje w scenerii!" ); } FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie - SwapBuffers(hDC); // swap buffers (double buffering) + glfwSwapBuffers( window ); Controlled = NULL; mvControlled = NULL; Camera.Type = tp_Free; @@ -636,44 +570,10 @@ void TWorld::OnKeyDown(int cKey) // na każdy kod wirtualny niech przypadają 4 bajty: 2 dla naciśnięcia i 2 dla zwolnienia // powtórzone 256 razy da 1kB na każdy stan przełączników, łącznie będzie 4kB pierwszej tabeli // przekodowania - if (!Global::iPause) - { // podczas pauzy klawisze nie działają - std::string info = "Key pressed: ["; - if (Console::Pressed(VK_SHIFT)) - info += "Shift]+["; - if (Console::Pressed(VK_CONTROL)) - info += "Ctrl]+["; - if (cKey > 192) // coś tam jeszcze ciekawego jest? - { - if (cKey < 255) // 255 to [Fn] w laptopach - WriteLog(info + (char)(cKey - 128) + "]"); - } - else if (cKey >= 186) - WriteLog(info + std::string(";=,-./~").substr(cKey - 186, 1) + "]"); - else if (cKey > 123) // coś tam jeszcze ciekawego jest? - WriteLog(info + std::to_string(cKey) + "]"); // numer klawisza - else if (cKey >= 112) // funkcyjne - WriteLog(info + "F" + std::to_string(cKey - 111) + "]"); - else if (cKey >= 96) - WriteLog(info + "Num" + std::string("0123456789*+?-./").substr(cKey - 96, 1) + "]"); - else if (((cKey >= '0') && (cKey <= '9')) || ((cKey >= 'A') && (cKey <= 'Z')) || - (cKey == ' ')) - WriteLog(info + (char)(cKey) + "]"); - else if (cKey == '-') - WriteLog(info + "Insert]"); - else if (cKey == '.') - WriteLog(info + "Delete]"); - else if (cKey == '$') - WriteLog(info + "Home]"); - else if (cKey == '#') - WriteLog(info + "End]"); - else if (cKey > 'Z') //żeby nie logować kursorów - WriteLog(info + std::to_string(cKey) + "]"); // numer klawisza - } if ((cKey <= '9') ? (cKey >= '0') : false) // klawisze cyfrowe { int i = cKey - '0'; // numer klawisza - if (Console::Pressed(VK_SHIFT)) + if (Global::shiftState) { // z [Shift] uruchomienie eventu if (!Global::iPause) // podczas pauzy klawisze nie działają if (KeyEvents[i]) @@ -681,8 +581,8 @@ void TWorld::OnKeyDown(int cKey) } else // zapamiętywanie kamery może działać podczas pauzy if (FreeFlyModeFlag) // w trybie latania można przeskakiwać do ustawionych kamer - if ((Global::iTextMode != VK_F12) && - (Global::iTextMode != VK_F3)) // ograniczamy użycie kamer + if( ( Global::iTextMode != GLFW_KEY_F12 ) && + ( Global::iTextMode != GLFW_KEY_F3 ) ) // ograniczamy użycie kamer { if ((!Global::pFreeCameraInit[i].x && !Global::pFreeCameraInit[i].y && !Global::pFreeCameraInit[i].z)) @@ -714,30 +614,30 @@ void TWorld::OnKeyDown(int cKey) } // będzie jeszcze załączanie sprzęgów z [Ctrl] } - else if ((cKey >= VK_F1) ? (cKey <= VK_F12) : false) + else if( ( cKey >= GLFW_KEY_F1 ) && ( cKey <= GLFW_KEY_F12 ) ) { switch (cKey) { - case VK_F1: { + case GLFW_KEY_F1: { if( DebugModeFlag ) { // additional time speedup keys in debug mode - if( Console::Pressed( VK_CONTROL ) ) { + if( Global::ctrlState ) { // ctrl-f3 GlobalTime->UpdateMTableTime( 20.0 * 60.0 ); } - else if( Console::Pressed( VK_SHIFT ) ) { + else if( Global::shiftState ) { // shift-f3 GlobalTime->UpdateMTableTime( 5.0 * 60.0 ); } } - if( ( false == Console::Pressed( VK_CONTROL ) ) - && ( false == Console::Pressed( VK_SHIFT ) ) ) { + if( ( false == Global::ctrlState ) + && ( false == Global::shiftState ) ) { // czas i relacja if( Global::iTextMode == cKey ) { // wyłączenie napisów, chyba że pauza Global::iTextMode = - ( Global::iPause && ( cKey != VK_F1 ) ? - VK_F1 : + ( Global::iPause && ( cKey != GLFW_KEY_F1 ) ? + GLFW_KEY_F1 : 0 ); } else @@ -745,58 +645,58 @@ void TWorld::OnKeyDown(int cKey) } break; } - case VK_F2: { + case GLFW_KEY_F2: { // parametry pojazdu if( Global::iTextMode == cKey ) { // jeśli kolejne naciśnięcie - ++Global::iScreenMode[ cKey - VK_F1 ]; // kolejny ekran + ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; // kolejny ekran } else { // pierwsze naciśnięcie daje pierwszy (tzn. zerowy) ekran Global::iTextMode = cKey; - Global::iScreenMode[ cKey - VK_F1 ] = 0; + Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; } break; } - case VK_F3: { + case GLFW_KEY_F3: { Global::iTextMode = cKey; break; } - case VK_F4: { + case GLFW_KEY_F4: { - InOutKey( !Console::Pressed( VK_SHIFT ) ); // distant view with Shift, short distance step out otherwise + InOutKey( !Global::shiftState ); // distant view with Shift, short distance step out otherwise break; } - case VK_F5: { + case GLFW_KEY_F5: { // przesiadka do innego pojazdu Global::iTextMode = cKey; break; } - case VK_F6: { + case GLFW_KEY_F6: { Global::iTextMode = cKey; // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! if( DebugModeFlag ) { - if( Console::Pressed( VK_CONTROL ) ) { Global::fTimeSpeed = ( Console::Pressed( VK_SHIFT ) ? 60.0 : 20.0 ); } - else { Global::fTimeSpeed = ( Console::Pressed( VK_SHIFT ) ? 5.0 : 1.0 ); } + if( Global::ctrlState ) { Global::fTimeSpeed = ( Global::shiftState ? 60.0 : 20.0 ); } + else { Global::fTimeSpeed = ( Global::shiftState ? 5.0 : 1.0 ); } } break; } - case VK_F8: { + case GLFW_KEY_F8: { Global::iTextMode = cKey; // FPS break; } - case VK_F9: { + case GLFW_KEY_F9: { Global::iTextMode = cKey; // wersja, typ wyświetlania, błędy OpenGL break; } - case VK_F10: { + case GLFW_KEY_F10: { if( Global::iTextMode == cKey ) { Global::iTextMode = - ( Global::iPause && ( cKey != VK_F1 ) ? - VK_F1 : + ( Global::iPause && ( cKey != GLFW_KEY_F1 ) ? + GLFW_KEY_F1 : 0 ); // wyłączenie napisów, chyba że pauza } else { @@ -804,10 +704,10 @@ void TWorld::OnKeyDown(int cKey) } break; } - case VK_F12: { + case GLFW_KEY_F12: { // coś tam jeszcze - if( Console::Pressed( VK_CONTROL ) - && Console::Pressed( VK_SHIFT ) ) + if( Global::ctrlState + && Global::shiftState ) DebugModeFlag = !DebugModeFlag; // taka opcjonalna funkcja, może się czasem przydać else Global::iTextMode = cKey; @@ -817,7 +717,7 @@ void TWorld::OnKeyDown(int cKey) // if (cKey!=VK_F4) return; // nie są przekazywane do pojazdu wcale } - if (Global::iTextMode == VK_F10) // wyświetlone napisy klawiszem F10 + if( Global::iTextMode == GLFW_KEY_F10 ) // wyświetlone napisy klawiszem F10 { // i potwierdzenie if( cKey == 'Y' ) { // flaga wyjścia z programu @@ -826,9 +726,9 @@ void TWorld::OnKeyDown(int cKey) } return; // nie przekazujemy do pociągu } - else if ((Global::iTextMode == VK_F12) ? (cKey >= '0') && (cKey <= '9') : false) + else if ((Global::iTextMode == GLFW_KEY_F12) ? (cKey >= '0') && (cKey <= '9') : false) { // tryb konfiguracji debugmode (przestawianie kamery już wyłączone - if (!Console::Pressed(VK_SHIFT)) // bez [Shift] + if (!Global::shiftState) // bez [Shift] { if (cKey == '1') Global::iWriteLogEnabled ^= 1; // włącz/wyłącz logowanie do pliku @@ -862,7 +762,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) // z ctrl odcinanie + if (Global::ctrlState < 0) // z ctrl odcinanie { temp->MoverParameters->BrakeStatus ^= 128; } @@ -879,8 +779,8 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (Console::Pressed(VK_SHIFT) ? temp->MoverParameters->IncBrakeMult() : - temp->MoverParameters->DecBrakeMult()) + if (Global::shiftState ? temp->MoverParameters->IncBrakeMult() : + temp->MoverParameters->DecBrakeMult()) if (Train) { // dźwięk oczywiście jest w kabinie Train->dsbSwitch->SetVolume(DSBVOLUME_MAX); @@ -902,9 +802,9 @@ void TWorld::OnKeyDown(int cKey) CouplNr = 0; // z [-1,1] zrobić [0,1] int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę // tapety pulpitu :/ - if (GetAsyncKeyState(VK_SHIFT) < 0) // z [Shift] zapalanie + if (Global::shiftState < 0) // z [Shift] zapalanie set = mask = 64; // bez [Ctrl] założyć tabliczki - else if (GetAsyncKeyState(VK_CONTROL) < 0) + else if (Global::ctrlState < 0) set = mask = 2 + 32; // z [Ctrl] zapalić światła czerwone else mask = 2 + 32 + 64; // wyłączanie ściąga wszystko @@ -924,7 +824,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState < 0) if ((temp->MoverParameters->LocalBrake == ManualBrake) || (temp->MoverParameters->MBrake == true)) temp->MoverParameters->IncManualBrakeLevel(1); @@ -944,7 +844,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (GetAsyncKeyState(VK_CONTROL) < 0) + if (Global::ctrlState < 0) if ((temp->MoverParameters->LocalBrake == ManualBrake) || (temp->MoverParameters->MBrake == true)) temp->MoverParameters->DecManualBrakeLevel(1); @@ -1021,19 +921,25 @@ void TWorld::DistantView( bool const Near ) else if( nullptr != pDynamicNearest ) { vehicle = pDynamicNearest; } else { return; } + auto const cab = + ( vehicle->MoverParameters->ActiveCab == 0 ? + 1 : + vehicle->MoverParameters->ActiveCab ); + auto const left = vehicle->VectorLeft() * cab; + if( true == Near ) { Camera.Pos = vector3( Camera.Pos.x, vehicle->GetPosition().y, Camera.Pos.z ) - + vehicle->VectorLeft() * vehicle->MoverParameters->ActiveCab * vehicle->GetWidth() - + vector3( 1.25 * vehicle->MoverParameters->ActiveCab, 1.6, 0.0 ); + + left * vehicle->GetWidth() + + vector3( 1.25 * left.x, 1.6, 1.25 * left.z ); } else { Camera.Pos = vehicle->GetPosition() + vehicle->VectorFront() * vehicle->MoverParameters->ActiveCab * 50.0 - + vector3( -10.0, 1.6, 0.0 ); + + vector3( -10.0 * left.x, 1.6, -10.0 * left.z ); } Camera.LookAt = vehicle->GetPosition(); @@ -1157,7 +1063,7 @@ bool TWorld::Update() */ iCheckFPS = 0.25 * Timer::GetFPS(); // tak za 0.25 sekundy sprawdzić ponownie (jeszcze przycina?) } - Timer::UpdateTimers(Global::iPause); + Timer::UpdateTimers(Global::iPause != 0); if( (Global::iPause == false) || (m_init == false) ) { // jak pauza, to nie ma po co tego przeliczać @@ -1193,20 +1099,7 @@ bool TWorld::Update() int n = int(iter); // ile kroków jako int fTimeBuffer -= iter * fMaxDt; // reszta czasu na potem (do bufora) if (n > 20) - n = 20; // Ra: jeżeli FPS jest zatrważająco niski, to fizyka nie może zająć całkowicie -// procesora -#if 0 - Ground.UpdatePhys(fMaxDt,n); //Ra: teraz czas kroku jest (względnie) stały - if (DebugModeFlag) - if (Global::bActive) //nie przyspieszać, gdy jedzie w tle :) - if (GetAsyncKeyState(VK_ESCAPE)<0) - {//yB dodał przyspieszacz fizyki - Ground.UpdatePhys(fMaxDt,n); - Ground.UpdatePhys(fMaxDt,n); - Ground.UpdatePhys(fMaxDt,n); - Ground.UpdatePhys(fMaxDt,n); //w sumie 5 razy - } -#endif + n = 20; // Ra: jeżeli FPS jest zatrważająco niski, to fizyka nie może zająć całkowicie procesora } // awaria PoKeys mogła włączyć pauzę - przekazać informację if (Global::iMultiplayer) // dajemy znać do serwera o wykonaniu @@ -1229,10 +1122,11 @@ bool TWorld::Update() // blablabla // Ground.UpdatePhys(dt,n); //na razie tu //2014-12: yB przeniósł do Ground.Update() :( Ground.Update(dt, n); // tu zrobić tylko coklatkową aktualizację przesunięć + if (DebugModeFlag) if (Global::bActive) // nie przyspieszać, gdy jedzie w tle :) - if (GetAsyncKeyState(VK_ESCAPE) < 0) - { // yB dodał przyspieszacz fizyki + if( Console::Pressed( GLFW_KEY_ESCAPE ) ) { + // yB dodał przyspieszacz fizyki Ground.Update(dt, n); Ground.Update(dt, n); Ground.Update(dt, n); @@ -1278,56 +1172,54 @@ bool TWorld::Update() void TWorld::Update_Camera( double const Deltatime ) { - // Console::Update(); //tu jest zależne od FPS, co nie jest korzystne - if( Global::bActive ) { // obsługa ruchu kamery tylko gdy okno jest aktywne - if( Console::Pressed( VK_LBUTTON ) ) { - Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe - // if (!FreeFlyModeFlag) //jeśli wewnątrz - patrzymy do tyłu - // Camera.LookAt=Train->pMechPosition-Normalize(Train->GetDirection())*10; - if( Controlled ? LengthSquared3( Controlled->GetPosition() - Camera.Pos ) < 2250000 : - false ) // gdy bliżej niż 1.5km - Camera.LookAt = Controlled->GetPosition(); - else { - TDynamicObject *d = - Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m - if( !d ) - d = Ground.DynamicNearest( Camera.Pos, - 1000 ); // dalej szukanie, jesli bliżej nie ma - if( d && pDynamicNearest ) // jeśli jakiś jest znaleziony wcześniej - if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > - LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) - d = pDynamicNearest; // jeśli najbliższy nie jest 10 razy bliżej niż - // poprzedni najbliższy, zostaje poprzedni - if( d ) - pDynamicNearest = d; // zmiana na nowy, jeśli coś znaleziony niepusty - if( pDynamicNearest ) - Camera.LookAt = pDynamicNearest->GetPosition(); - } - if( FreeFlyModeFlag ) - Camera.RaLook(); // jednorazowe przestawienie kamery - } - else if( Console::Pressed( VK_RBUTTON ) ) { //||Console::Pressed(VK_F4)) - FollowView( false ); // bez wyciszania dźwięków - } - else if( true == Console::Pressed( VK_MBUTTON ) ) { - // middle mouse button controls zoom. - Global::ZoomFactor = std::min( 4.5f, Global::ZoomFactor + 15.0f * static_cast(Deltatime) ); - } - else if( false == Console::Pressed( VK_MBUTTON ) ) { - // reset zoom level if the button is no longer held down. - // NOTE: yes, this is terrible way to go about it. it'll do for now. - Global::ZoomFactor = std::max( 1.0f, Global::ZoomFactor - 15.0f * static_cast( Deltatime ) ); - } -/* - else if( Global::iTextMode == -1 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy - WriteLog( "Number of textures used: " + std::to_string( Global::iTextures ) ); - return false; + if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_LEFT ) == GLFW_PRESS ) { + Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe + // if (!FreeFlyModeFlag) //jeśli wewnątrz - patrzymy do tyłu + // Camera.LookAt=Train->pMechPosition-Normalize(Train->GetDirection())*10; + if( Controlled ? LengthSquared3( Controlled->GetPosition() - Camera.Pos ) < 2250000 : + false ) // gdy bliżej niż 1.5km + Camera.LookAt = Controlled->GetPosition(); + else { + TDynamicObject *d = + Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m + if( !d ) + d = Ground.DynamicNearest( Camera.Pos, + 1000 ); // dalej szukanie, jesli bliżej nie ma + if( d && pDynamicNearest ) // jeśli jakiś jest znaleziony wcześniej + if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > + LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) + d = pDynamicNearest; // jeśli najbliższy nie jest 10 razy bliżej niż + // poprzedni najbliższy, zostaje poprzedni + if( d ) + pDynamicNearest = d; // zmiana na nowy, jeśli coś znaleziony niepusty + if( pDynamicNearest ) + Camera.LookAt = pDynamicNearest->GetPosition(); } -*/ - Camera.Update(); // uwzględnienie ruchu wywołanego klawiszami - } // koniec bloku pomijanego przy nieaktywnym oknie + if( FreeFlyModeFlag ) + Camera.RaLook(); // jednorazowe przestawienie kamery + } + else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_RIGHT ) == GLFW_PRESS ) { //||Console::Pressed(VK_F4)) + FollowView( false ); // bez wyciszania dźwięków + } + else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_MIDDLE ) == GLFW_PRESS ) { + // middle mouse button controls zoom. + Global::ZoomFactor = std::min( 4.5f, Global::ZoomFactor + 15.0f * static_cast( Deltatime ) ); + } + else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_MIDDLE ) != GLFW_PRESS ) { + // reset zoom level if the button is no longer held down. + // NOTE: yes, this is terrible way to go about it. it'll do for now. + Global::ZoomFactor = std::max( 1.0f, Global::ZoomFactor - 15.0f * static_cast( Deltatime ) ); + } + + /* + else if( Global::iTextMode == -1 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy + WriteLog( "Number of textures used: " + std::to_string( Global::iTextures ) ); + return false; + } + */ + Camera.Update(); // uwzględnienie ruchu wywołanego klawiszami if( Camera.Type == tp_Follow ) { if( Train ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery @@ -1338,26 +1230,17 @@ TWorld::Update_Camera( double const Deltatime ) { tempangle = Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); modelrotate = atan2( -tempangle.x, tempangle.z ); - if( Console::Pressed( VK_CONTROL ) ? ( Console::Pressed( Global::Keys[ k_MechLeft ] ) || + if( Global::ctrlState ? ( Console::Pressed( Global::Keys[ k_MechLeft ] ) || Console::Pressed( Global::Keys[ k_MechRight ] ) ) : false ) { // jeśli lusterko lewe albo prawe (bez rzucania na razie) bool lr = Console::Pressed( Global::Keys[ k_MechLeft ] ); -#if 0 - Camera.Pos = Train->MirrorPosition( lr ); //robocza wartość - if( Controlled->MoverParameters->ActiveCab<0 ) lr = !lr; //w drugiej kabinie odwrotnie jest środek - Camera.LookAt = Controlled->GetPosition() + vector3( lr ? 2.0 : -2.0, Camera.Pos.y, 0 ); //trochę na zewnątrz, użyć szerokości pojazdu - //Camera.LookAt=Train->pMechPosition+Train->GetDirection()*Train->Dynamic()->MoverParameters->ActiveCab; - Camera.Pos += Controlled->GetPosition(); - //Camera.RaLook(); //jednorazowe przestawienie kamery - Camera.Yaw = 0; //odchylenie na bok od Camera.LookAt -#else // Camera.Yaw powinno być wyzerowane, aby po powrocie patrzeć do przodu Camera.Pos = Controlled->GetPosition() + Train->MirrorPosition( lr ); // pozycja lusterka Camera.Yaw = 0; // odchylenie na bok od Camera.LookAt if( Train->Dynamic()->MoverParameters->ActiveCab == 0 ) Camera.LookAt = Camera.Pos - Train->GetDirection(); // gdy w korytarzu - else if( Console::Pressed( VK_SHIFT ) ) { // patrzenie w bok przez szybę + else if( Global::shiftState ) { // patrzenie w bok przez szybę Camera.LookAt = Camera.Pos - ( lr ? -1 : 1 ) * Train->Dynamic()->VectorLeft() * Train->Dynamic()->MoverParameters->ActiveCab; @@ -1371,7 +1254,6 @@ TWorld::Update_Camera( double const Deltatime ) { Global::SetCameraRotation( M_PI - modelrotate ); // tu już trzeba uwzględnić lusterka } -#endif Camera.Roll = atan( Train->pMechShake.x * Train->fMechRoll ); // hustanie kamery na boki Camera.Pitch = @@ -1529,7 +1411,7 @@ bool TWorld::Render() glMatrixMode( GL_PROJECTION ); // select the Projection Matrix glLoadIdentity(); // reset the Projection Matrix // calculate the aspect ratio of the window - gluPerspective( Global::FieldOfView / Global::ZoomFactor, (GLdouble)Global::ScreenWidth / (GLdouble)Global::ScreenHeight, 0.1f * Global::ZoomFactor, 2500.0f * Global::ZoomFactor ); + gluPerspective( Global::FieldOfView / Global::ZoomFactor, (GLdouble)Global::ScreenWidth / std::max((GLdouble)Global::ScreenHeight, 1.0), 0.1f * Global::ZoomFactor, 2500.0f * Global::ZoomFactor ); glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glLoadIdentity(); @@ -1831,7 +1713,7 @@ TWorld::Render_UI() { glMatrixMode( GL_PROJECTION ); // select the Projection Matrix glLoadIdentity(); // reset the Projection Matrix // calculate the aspect ratio of the window - gluPerspective( 45.0f, (GLdouble)Global::ScreenWidth / (GLdouble)Global::ScreenHeight, 0.2f, 2500.0f ); + gluPerspective( 45.0f, (GLdouble)Global::ScreenWidth / std::max((GLdouble)Global::ScreenHeight, 1.0), 0.2f, 2500.0f ); glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix glLoadIdentity(); @@ -1851,8 +1733,8 @@ TWorld::Render_UI() { if (Console::Pressed(VK_F6)) {Global::slowmotion=false;};*/ - if( Global::iTextMode == VK_F8 ) { - Global::iViewMode = VK_F8; + if( Global::iTextMode == GLFW_KEY_F8 ) { + Global::iViewMode = GLFW_KEY_F8; OutText1 = "FPS: "; OutText1 += to_string( Timer::GetFPS(), 2 ); //OutText1 += sprintf(); @@ -1986,15 +1868,15 @@ TWorld::Render_UI() { glDepthFunc( GL_ALWAYS ); glDisable( GL_LIGHTING ); if( Controlled ) - SetWindowText( hWnd, Controlled->MoverParameters->Name.c_str() ); + glfwSetWindowTitle( window, Controlled->MoverParameters->Name.c_str() ); else - SetWindowText( hWnd, Global::SceneryFile.c_str() ); // nazwa scenerii + glfwSetWindowTitle( window, Global::SceneryFile.c_str() ); // nazwa scenerii GfxRenderer.Bind( 0 ); glColor4f( 1.0f, 0.0f, 0.0f, 1.0f ); glLoadIdentity(); glTranslatef( 0.0f, 0.0f, -0.50f ); - if( Global::iTextMode == VK_F1 ) { // tekst pokazywany po wciśnięciu [F1] + if( Global::iTextMode == GLFW_KEY_F1 ) { // tekst pokazywany po wciśnięciu [F1] // Global::iViewMode=VK_F1; glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy białym OutText1 = @@ -2019,16 +1901,16 @@ TWorld::Render_UI() { OutText3 = ""; // Pomoc w sterowaniu - [F9]"; // OutText3=AnsiString(Global::pCameraRotationDeg); //kąt kamery względem północy } - else if( Global::iTextMode == VK_F12 ) { // opcje włączenia i wyłączenia logowania + else if( Global::iTextMode == GLFW_KEY_F12 ) { // opcje włączenia i wyłączenia logowania OutText1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); OutText2 = "[1] log.txt " + std::string( ( Global::iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); OutText3 = "[2] Console " + std::string( ( Global::iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); } - else if( Global::iTextMode == VK_F2 ) { // ABu: info dla najblizszego pojazdu! + else if( Global::iTextMode == GLFW_KEY_F2 ) { // ABu: info dla najblizszego pojazdu! TDynamicObject *tmp = FreeFlyModeFlag ? Ground.DynamicNearest( Camera.Pos ) : Controlled; // w trybie latania lokalizujemy wg mapy if( tmp ) { - if( Global::iScreenMode[ Global::iTextMode - VK_F1 ] == 0 ) { // jeśli domyślny ekran po pierwszym naciśnięciu + if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 0 ) { // jeśli domyślny ekran po pierwszym naciśnięciu OutText3 = ""; OutText1 = "Vehicle name: " + tmp->MoverParameters->Name; // yB OutText1+="; d: "+FloatToStrF(tmp->ABuGetDirection(),ffFixed,2,0); @@ -2222,7 +2104,7 @@ TWorld::Render_UI() { tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) : std::string( "NULL" ) ); - if( Console::Pressed( VK_F2 ) ) { + if( Console::Pressed( GLFW_KEY_F2 ) ) { WriteLog( OutText1 ); WriteLog( OutText2 ); WriteLog( OutText3 ); @@ -2297,7 +2179,7 @@ TWorld::Render_UI() { // OutText3="enrot="+FloatToStrF(Controlled->MoverParameters->enrot,ffFixed,6,2); // OutText3="; n="+FloatToStrF(Controlled->MoverParameters->n,ffFixed,6,2); } // koniec treści podstawowego ekranu FK_V2 - else if( Global::iTextMode == VK_F5 ) { // przesiadka do innego pojazdu + else if( Global::iTextMode == GLFW_KEY_F5 ) { // przesiadka do innego pojazdu if( FreeFlyModeFlag ) // jeśli tryb latania { TDynamicObject *tmp = Ground.DynamicNearest( Camera.Pos, 50, true ); //łapiemy z obsadą @@ -2354,7 +2236,7 @@ TWorld::Render_UI() { } */ } - else if( Global::iTextMode == VK_F10 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy + else if( Global::iTextMode == GLFW_KEY_F10 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy // Global::iViewMode=VK_F10; // return false; OutText1 = ( "To quit press [Y] key." ); @@ -2553,7 +2435,7 @@ TWorld::Render_UI() { if( Global::detonatoryOK ) { // if (Console::Pressed(VK_F9)) ShowHints(); //to nie działa prawidłowo - prosili wyłączyć - if( Global::iTextMode == VK_F9 ) { // informacja o wersji, sposobie wyświetlania i błędach OpenGL + if( Global::iTextMode == GLFW_KEY_F9 ) { // informacja o wersji, sposobie wyświetlania i błędach OpenGL // Global::iViewMode=VK_F9; OutText1 = Global::asVersion; // informacja o wersji OutText2 = std::string( "Rendering mode: " ) + ( Global::bUseVBO ? "VBO" : "Display Lists" ); @@ -2566,7 +2448,7 @@ TWorld::Render_UI() { Global::Bezogonkow( ( (char *)gluErrorString( err ) ) ); } } - if( Global::iTextMode == VK_F3 ) { // wyświetlenie rozkładu jazdy, na razie jakkolwiek + if( Global::iTextMode == GLFW_KEY_F3 ) { // wyświetlenie rozkładu jazdy, na razie jakkolwiek TDynamicObject *tmp = FreeFlyModeFlag ? Ground.DynamicNearest( Camera.Pos ) : Controlled; // w trybie latania lokalizujemy wg mapy @@ -3038,6 +2920,8 @@ world_environment::update() { void world_environment::render() { + GfxRenderer.Bind( 0 ); + ::glDisable( GL_LIGHTING ); ::glDisable( GL_FOG ); ::glDisable( GL_DEPTH_TEST ); diff --git a/World.h b/World.h index d018041e..bdc394b9 100644 --- a/World.h +++ b/World.h @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "stars.h" #include "skydome.h" #include "mczapkie/mover.h" +#include "glfw/glfw3.h" // wrapper for environment elements -- sky, sun, stars, clouds etc class world_environment { @@ -40,9 +41,10 @@ class TWorld void DistantView( bool const Near = false ); public: - bool Init(HWND NhWnd, HDC hDC); - HWND hWnd; - GLvoid glPrint(const char *fmt); + bool Init( GLFWwindow *w ); + bool InitPerformed() { return m_init; } + GLFWwindow *window; + GLvoid glPrint(std::string const &Text); void OnKeyDown(int cKey); void OnKeyUp(int cKey); // void UpdateWindow(); @@ -68,7 +70,7 @@ class TWorld world_environment Environment; TTrain *Train; TDynamicObject *pDynamicNearest; - bool Paused; + bool Paused{ true }; GLuint base; // numer DL dla znaków w napisach texture_manager::size_type light; // numer tekstury dla smugi TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury diff --git a/geometry.h b/geometry.h index 5cdd2ec3..12cee7c5 100644 --- a/geometry.h +++ b/geometry.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #ifndef GeometryH #define GeometryH -#include "opengl/glew.h" +#include "gl/glew.h" #include "dumb3d.h" using namespace Math3D; //--------------------------------------------------------------------------- diff --git a/lightarray.cpp b/lightarray.cpp index 7f5a717d..3ab1c448 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -65,7 +65,14 @@ light_array::update() { ( ( lightbits & 4 ) ? 1 : 0 ) + ( ( lightbits & 16 ) ? 1 : 0 ); - light.intensity = 0.15f * light.count; // TODO: intensity can be affected further by dim switch or other factors + if( light.count > 0 ) { + // TODO: intensity can be affected further by dim switch or other factors + light.intensity = std::max( 0.0f, std::log( (float)light.count + 1.0f ) ); +// light.intensity = std::max( 0.0f, std::log( (float)light.count + 3.0f ) ); + } + else { + light.intensity = 0.0f; + } // crude catch for unmanned modules which share the light state with the controlled unit. // why don't they get their own light bits btw ._. diff --git a/maszyna.vcxproj b/maszyna.vcxproj index b9d71414..dae5517e 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -51,7 +51,7 @@ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) Level3 ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) Use true false @@ -60,8 +60,8 @@ MachineX86 true + $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories) Windows - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) @@ -70,17 +70,17 @@ MultiThreadedDLL Level3 ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)opengl;$(SolutionDir)python/include;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) Use true MachineX86 true - Windows true true - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)opengl;$(SolutionDir)python/libs;%(AdditionalLibraryDirectories) + $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories) + Windows @@ -116,7 +116,6 @@ - @@ -179,12 +178,8 @@ - - - - @@ -217,10 +212,6 @@ - - - - diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index e124aab2..147a4d11 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -13,18 +13,12 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - {d91dfdb6-7d84-4b52-a16a-bad302b45e3c} - {fafd38ab-4c2a-48c8-8e66-ad0d928573b3} {2d73d7b2-5252-499c-963a-88fa3cb1af53} - - {aec51dd3-af67-4f08-9dcb-889f673ad7c9} - {36684428-8a48-435f-bca4-a24d9bfe2587} @@ -156,9 +150,6 @@ Source Files - - Source Files\opengl - Source Files\mczapkie @@ -206,12 +197,6 @@ - - Header Files\opengl - - - Header Files\opengl - Header Files @@ -266,9 +251,6 @@ Header Files - - Header Files - Header Files @@ -341,9 +323,6 @@ Header Files - - Header Files\opengl - Header Files @@ -409,8 +388,4 @@ Resource Files - - - - \ No newline at end of file diff --git a/opengl/ARB_Multisample.cpp b/opengl/ARB_Multisample.cpp index 0c58a540..f5b2e7eb 100644 --- a/opengl/ARB_Multisample.cpp +++ b/opengl/ARB_Multisample.cpp @@ -10,8 +10,8 @@ #include "stdafx.h" #include "arb_multisample.h" -#include "glew.h" -#include "wglew.h" +#include "gl/glew.h" +#include "gl/wglew.h" // Declairations We'll Use #define WGL_SAMPLE_BUFFERS_ARB 0x2041 diff --git a/opengl/GLUT.H b/opengl/GLUT.H deleted file mode 100644 index 525e5511..00000000 --- a/opengl/GLUT.H +++ /dev/null @@ -1,711 +0,0 @@ -#ifndef __glut_h__ -#define __glut_h__ - -/* Copyright (c) Mark J. Kilgard, 1994, 1995, 1996, 1998. */ - -/* This program is freely distributable without licensing fees and is - provided without guarantee or warrantee expressed or implied. This - program is -not- in the public domain. */ - -#if defined(_WIN32) - -/* GLUT 3.7 now tries to avoid including - to avoid name space pollution, but Win32's - needs APIENTRY and WINGDIAPI defined properly. */ -# if 0 - /* This would put tons of macros and crap in our clean name space. */ -# define WIN32_LEAN_AND_MEAN -# include -# else - /* XXX This is from Win32's */ -# ifndef APIENTRY -# define GLUT_APIENTRY_DEFINED -# if (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__) -# define APIENTRY __stdcall -# else -# define APIENTRY -# endif -# endif - /* XXX This is from Win32's */ -# ifndef CALLBACK -# if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS) -# define CALLBACK __stdcall -# else -# define CALLBACK -# endif -# endif - /* XXX This is from Win32's and */ -# ifndef WINGDIAPI -# define GLUT_WINGDIAPI_DEFINED -# define WINGDIAPI __declspec(dllimport) -# endif - /* XXX This is from Win32's */ -# ifndef _WCHAR_T_DEFINED -typedef unsigned short wchar_t; -# define _WCHAR_T_DEFINED -# endif -# endif - -#define GLUT_BUILDING_LIB /* disable automatic library usage for GLUT */ -/* To disable automatic library usage for GLUT, define GLUT_NO_LIB_PRAGMA - in your compile preprocessor options. */ -# if !defined(GLUT_BUILDING_LIB) && !defined(GLUT_NO_LIB_PRAGMA) -# pragma comment (lib, "winmm.lib") /* link with Windows MultiMedia lib */ -/* To enable automatic SGI OpenGL for Windows library usage for GLUT, - define GLUT_USE_SGI_OPENGL in your compile preprocessor options. */ -# ifdef GLUT_USE_SGI_OPENGL -# pragma comment (lib, "opengl.lib") /* link with SGI OpenGL for Windows lib */ -# pragma comment (lib, "glu.lib") /* link with SGI OpenGL Utility lib */ -# pragma comment (lib, "glut.lib") /* link with Win32 GLUT for SGI OpenGL lib */ -# else -# pragma comment (lib, "opengl32.lib") /* link with Microsoft OpenGL lib */ -# pragma comment (lib, "glu32.lib") /* link with Microsoft OpenGL Utility lib */ -# pragma comment (lib, "glut32.lib") /* link with Win32 GLUT lib */ -# endif -# endif - -/* To disable supression of annoying warnings about floats being promoted - to doubles, define GLUT_NO_WARNING_DISABLE in your compile preprocessor - options. */ -# ifndef GLUT_NO_WARNING_DISABLE -# pragma warning (disable:4244) /* Disable bogus VC++ 4.2 conversion warnings. */ -# pragma warning (disable:4305) /* VC++ 5.0 version of above warning. */ -# endif - -/* Win32 has an annoying issue where there are multiple C run-time - libraries (CRTs). If the executable is linked with a different CRT - from the GLUT DLL, the GLUT DLL will not share the same CRT static - data seen by the executable. In particular, atexit callbacks registered - in the executable will not be called if GLUT calls its (different) - exit routine). GLUT is typically built with the - "/MD" option (the CRT with multithreading DLL support), but the Visual - C++ linker default is "/ML" (the single threaded CRT). - - One workaround to this issue is requiring users to always link with - the same CRT as GLUT is compiled with. That requires users supply a - non-standard option. GLUT 3.7 has its own built-in workaround where - the executable's "exit" function pointer is covertly passed to GLUT. - GLUT then calls the executable's exit function pointer to ensure that - any "atexit" calls registered by the application are called if GLUT - needs to exit. - - Note that the __glut*WithExit routines should NEVER be called directly. - To avoid the atexit workaround, #define GLUT_DISABLE_ATEXIT_HACK. */ - -/* XXX This is from Win32's */ -# if !defined(_MSC_VER) && !defined(__cdecl) - /* Define __cdecl for non-Microsoft compilers. */ -# define __cdecl -# define GLUT_DEFINED___CDECL -# endif -# ifndef _CRTIMP -# ifdef _NTSDK - /* Definition compatible with NT SDK */ -# define _CRTIMP -# else - /* Current definition */ -# ifdef _DLL -# define _CRTIMP __declspec(dllimport) -# else -# define _CRTIMP -# endif -# endif -# define GLUT_DEFINED__CRTIMP -# endif - -/* GLUT API entry point declarations for Win32. */ -# ifdef GLUT_BUILDING_LIB -# define GLUTAPI __declspec(dllexport) -# else -# ifdef _DLL -# define GLUTAPI __declspec(dllimport) -# else -# define GLUTAPI extern -# endif -# endif - -/* GLUT callback calling convention for Win32. */ -# define GLUTCALLBACK __cdecl - -#endif /* _WIN32 */ - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(_WIN32) -# ifndef GLUT_BUILDING_LIB -//extern _CRTIMP void __cdecl exit(int); -# endif -#else -/* non-Win32 case. */ -/* Define APIENTRY and CALLBACK to nothing if we aren't on Win32. */ -# define APIENTRY -# define GLUT_APIENTRY_DEFINED -# define CALLBACK -/* Define GLUTAPI and GLUTCALLBACK as below if we aren't on Win32. */ -# define GLUTAPI extern -# define GLUTCALLBACK -/* Prototype exit for the non-Win32 case (see above). */ -extern void exit(int); -#endif - -/** - GLUT API revision history: - - GLUT_API_VERSION is updated to reflect incompatible GLUT - API changes (interface changes, semantic changes, deletions, - or additions). - - GLUT_API_VERSION=1 First public release of GLUT. 11/29/94 - - GLUT_API_VERSION=2 Added support for OpenGL/GLX multisampling, - extension. Supports new input devices like tablet, dial and button - box, and Spaceball. Easy to query OpenGL extensions. - - GLUT_API_VERSION=3 glutMenuStatus added. - - GLUT_API_VERSION=4 glutInitDisplayString, glutWarpPointer, - glutBitmapLength, glutStrokeLength, glutWindowStatusFunc, dynamic - video resize subAPI, glutPostWindowRedisplay, glutKeyboardUpFunc, - glutSpecialUpFunc, glutIgnoreKeyRepeat, glutSetKeyRepeat, - glutJoystickFunc, glutForceJoystickFunc (NOT FINALIZED!). -**/ -#ifndef GLUT_API_VERSION /* allow this to be overriden */ -#define GLUT_API_VERSION 3 -#endif - -/** - GLUT implementation revision history: - - GLUT_XLIB_IMPLEMENTATION is updated to reflect both GLUT - API revisions and implementation revisions (ie, bug fixes). - - GLUT_XLIB_IMPLEMENTATION=1 mjk's first public release of - GLUT Xlib-based implementation. 11/29/94 - - GLUT_XLIB_IMPLEMENTATION=2 mjk's second public release of - GLUT Xlib-based implementation providing GLUT version 2 - interfaces. - - GLUT_XLIB_IMPLEMENTATION=3 mjk's GLUT 2.2 images. 4/17/95 - - GLUT_XLIB_IMPLEMENTATION=4 mjk's GLUT 2.3 images. 6/?/95 - - GLUT_XLIB_IMPLEMENTATION=5 mjk's GLUT 3.0 images. 10/?/95 - - GLUT_XLIB_IMPLEMENTATION=7 mjk's GLUT 3.1+ with glutWarpPoitner. 7/24/96 - - GLUT_XLIB_IMPLEMENTATION=8 mjk's GLUT 3.1+ with glutWarpPoitner - and video resize. 1/3/97 - - GLUT_XLIB_IMPLEMENTATION=9 mjk's GLUT 3.4 release with early GLUT 4 routines. - - GLUT_XLIB_IMPLEMENTATION=11 Mesa 2.5's GLUT 3.6 release. - - GLUT_XLIB_IMPLEMENTATION=12 mjk's GLUT 3.6 release with early GLUT 4 routines + signal handling. - - GLUT_XLIB_IMPLEMENTATION=13 mjk's GLUT 3.7 beta with GameGLUT support. - - GLUT_XLIB_IMPLEMENTATION=14 mjk's GLUT 3.7 beta with f90gl friend interface. - - GLUT_XLIB_IMPLEMENTATION=15 mjk's GLUT 3.7 beta sync'ed with Mesa -**/ -#ifndef GLUT_XLIB_IMPLEMENTATION /* Allow this to be overriden. */ -#define GLUT_XLIB_IMPLEMENTATION 15 -#endif - -/* Display mode bit masks. */ -#define GLUT_RGB 0 -#define GLUT_RGBA GLUT_RGB -#define GLUT_INDEX 1 -#define GLUT_SINGLE 0 -#define GLUT_DOUBLE 2 -#define GLUT_ACCUM 4 -#define GLUT_ALPHA 8 -#define GLUT_DEPTH 16 -#define GLUT_STENCIL 32 -#if (GLUT_API_VERSION >= 2) -#define GLUT_MULTISAMPLE 128 -#define GLUT_STEREO 256 -#endif -#if (GLUT_API_VERSION >= 3) -#define GLUT_LUMINANCE 512 -#endif - -/* Mouse buttons. */ -#define GLUT_LEFT_BUTTON 0 -#define GLUT_MIDDLE_BUTTON 1 -#define GLUT_RIGHT_BUTTON 2 - -/* Mouse button state. */ -#define GLUT_DOWN 0 -#define GLUT_UP 1 - -#if (GLUT_API_VERSION >= 2) -/* function keys */ -#define GLUT_KEY_F1 1 -#define GLUT_KEY_F2 2 -#define GLUT_KEY_F3 3 -#define GLUT_KEY_F4 4 -#define GLUT_KEY_F5 5 -#define GLUT_KEY_F6 6 -#define GLUT_KEY_F7 7 -#define GLUT_KEY_F8 8 -#define GLUT_KEY_F9 9 -#define GLUT_KEY_F10 10 -#define GLUT_KEY_F11 11 -#define GLUT_KEY_F12 12 -/* directional keys */ -#define GLUT_KEY_LEFT 100 -#define GLUT_KEY_UP 101 -#define GLUT_KEY_RIGHT 102 -#define GLUT_KEY_DOWN 103 -#define GLUT_KEY_PAGE_UP 104 -#define GLUT_KEY_PAGE_DOWN 105 -#define GLUT_KEY_HOME 106 -#define GLUT_KEY_END 107 -#define GLUT_KEY_INSERT 108 -#endif - -/* Entry/exit state. */ -#define GLUT_LEFT 0 -#define GLUT_ENTERED 1 - -/* Menu usage state. */ -#define GLUT_MENU_NOT_IN_USE 0 -#define GLUT_MENU_IN_USE 1 - -/* Visibility state. */ -#define GLUT_NOT_VISIBLE 0 -#define GLUT_VISIBLE 1 - -/* Window status state. */ -#define GLUT_HIDDEN 0 -#define GLUT_FULLY_RETAINED 1 -#define GLUT_PARTIALLY_RETAINED 2 -#define GLUT_FULLY_COVERED 3 - -/* Color index component selection values. */ -#define GLUT_RED 0 -#define GLUT_GREEN 1 -#define GLUT_BLUE 2 - -#if defined(_WIN32) -/* Stroke font constants (use these in GLUT program). */ -#define GLUT_STROKE_ROMAN ((void*)0) -#define GLUT_STROKE_MONO_ROMAN ((void*)1) - -/* Bitmap font constants (use these in GLUT program). */ -#define GLUT_BITMAP_9_BY_15 ((void*)2) -#define GLUT_BITMAP_8_BY_13 ((void*)3) -#define GLUT_BITMAP_TIMES_ROMAN_10 ((void*)4) -#define GLUT_BITMAP_TIMES_ROMAN_24 ((void*)5) -#if (GLUT_API_VERSION >= 3) -#define GLUT_BITMAP_HELVETICA_10 ((void*)6) -#define GLUT_BITMAP_HELVETICA_12 ((void*)7) -#define GLUT_BITMAP_HELVETICA_18 ((void*)8) -#endif -#else -/* Stroke font opaque addresses (use constants instead in source code). */ -GLUTAPI void *glutStrokeRoman; -GLUTAPI void *glutStrokeMonoRoman; - -/* Stroke font constants (use these in GLUT program). */ -#define GLUT_STROKE_ROMAN (&glutStrokeRoman) -#define GLUT_STROKE_MONO_ROMAN (&glutStrokeMonoRoman) - -/* Bitmap font opaque addresses (use constants instead in source code). */ -GLUTAPI void *glutBitmap9By15; -GLUTAPI void *glutBitmap8By13; -GLUTAPI void *glutBitmapTimesRoman10; -GLUTAPI void *glutBitmapTimesRoman24; -GLUTAPI void *glutBitmapHelvetica10; -GLUTAPI void *glutBitmapHelvetica12; -GLUTAPI void *glutBitmapHelvetica18; - -/* Bitmap font constants (use these in GLUT program). */ -#define GLUT_BITMAP_9_BY_15 (&glutBitmap9By15) -#define GLUT_BITMAP_8_BY_13 (&glutBitmap8By13) -#define GLUT_BITMAP_TIMES_ROMAN_10 (&glutBitmapTimesRoman10) -#define GLUT_BITMAP_TIMES_ROMAN_24 (&glutBitmapTimesRoman24) -#if (GLUT_API_VERSION >= 3) -#define GLUT_BITMAP_HELVETICA_10 (&glutBitmapHelvetica10) -#define GLUT_BITMAP_HELVETICA_12 (&glutBitmapHelvetica12) -#define GLUT_BITMAP_HELVETICA_18 (&glutBitmapHelvetica18) -#endif -#endif - -/* glutGet parameters. */ -#define GLUT_WINDOW_X ((GLenum) 100) -#define GLUT_WINDOW_Y ((GLenum) 101) -#define GLUT_WINDOW_WIDTH ((GLenum) 102) -#define GLUT_WINDOW_HEIGHT ((GLenum) 103) -#define GLUT_WINDOW_BUFFER_SIZE ((GLenum) 104) -#define GLUT_WINDOW_STENCIL_SIZE ((GLenum) 105) -#define GLUT_WINDOW_DEPTH_SIZE ((GLenum) 106) -#define GLUT_WINDOW_RED_SIZE ((GLenum) 107) -#define GLUT_WINDOW_GREEN_SIZE ((GLenum) 108) -#define GLUT_WINDOW_BLUE_SIZE ((GLenum) 109) -#define GLUT_WINDOW_ALPHA_SIZE ((GLenum) 110) -#define GLUT_WINDOW_ACCUM_RED_SIZE ((GLenum) 111) -#define GLUT_WINDOW_ACCUM_GREEN_SIZE ((GLenum) 112) -#define GLUT_WINDOW_ACCUM_BLUE_SIZE ((GLenum) 113) -#define GLUT_WINDOW_ACCUM_ALPHA_SIZE ((GLenum) 114) -#define GLUT_WINDOW_DOUBLEBUFFER ((GLenum) 115) -#define GLUT_WINDOW_RGBA ((GLenum) 116) -#define GLUT_WINDOW_PARENT ((GLenum) 117) -#define GLUT_WINDOW_NUM_CHILDREN ((GLenum) 118) -#define GLUT_WINDOW_COLORMAP_SIZE ((GLenum) 119) -#if (GLUT_API_VERSION >= 2) -#define GLUT_WINDOW_NUM_SAMPLES ((GLenum) 120) -#define GLUT_WINDOW_STEREO ((GLenum) 121) -#endif -#if (GLUT_API_VERSION >= 3) -#define GLUT_WINDOW_CURSOR ((GLenum) 122) -#endif -#define GLUT_SCREEN_WIDTH ((GLenum) 200) -#define GLUT_SCREEN_HEIGHT ((GLenum) 201) -#define GLUT_SCREEN_WIDTH_MM ((GLenum) 202) -#define GLUT_SCREEN_HEIGHT_MM ((GLenum) 203) -#define GLUT_MENU_NUM_ITEMS ((GLenum) 300) -#define GLUT_DISPLAY_MODE_POSSIBLE ((GLenum) 400) -#define GLUT_INIT_WINDOW_X ((GLenum) 500) -#define GLUT_INIT_WINDOW_Y ((GLenum) 501) -#define GLUT_INIT_WINDOW_WIDTH ((GLenum) 502) -#define GLUT_INIT_WINDOW_HEIGHT ((GLenum) 503) -#define GLUT_INIT_DISPLAY_MODE ((GLenum) 504) -#if (GLUT_API_VERSION >= 2) -#define GLUT_ELAPSED_TIME ((GLenum) 700) -#endif -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13) -#define GLUT_WINDOW_FORMAT_ID ((GLenum) 123) -#endif - -#if (GLUT_API_VERSION >= 2) -/* glutDeviceGet parameters. */ -#define GLUT_HAS_KEYBOARD ((GLenum) 600) -#define GLUT_HAS_MOUSE ((GLenum) 601) -#define GLUT_HAS_SPACEBALL ((GLenum) 602) -#define GLUT_HAS_DIAL_AND_BUTTON_BOX ((GLenum) 603) -#define GLUT_HAS_TABLET ((GLenum) 604) -#define GLUT_NUM_MOUSE_BUTTONS ((GLenum) 605) -#define GLUT_NUM_SPACEBALL_BUTTONS ((GLenum) 606) -#define GLUT_NUM_BUTTON_BOX_BUTTONS ((GLenum) 607) -#define GLUT_NUM_DIALS ((GLenum) 608) -#define GLUT_NUM_TABLET_BUTTONS ((GLenum) 609) -#endif -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13) -#define GLUT_DEVICE_IGNORE_KEY_REPEAT ((GLenum) 610) -#define GLUT_DEVICE_KEY_REPEAT ((GLenum) 611) -#define GLUT_HAS_JOYSTICK ((GLenum) 612) -#define GLUT_OWNS_JOYSTICK ((GLenum) 613) -#define GLUT_JOYSTICK_BUTTONS ((GLenum) 614) -#define GLUT_JOYSTICK_AXES ((GLenum) 615) -#define GLUT_JOYSTICK_POLL_RATE ((GLenum) 616) -#endif - -#if (GLUT_API_VERSION >= 3) -/* glutLayerGet parameters. */ -#define GLUT_OVERLAY_POSSIBLE ((GLenum) 800) -#define GLUT_LAYER_IN_USE ((GLenum) 801) -#define GLUT_HAS_OVERLAY ((GLenum) 802) -#define GLUT_TRANSPARENT_INDEX ((GLenum) 803) -#define GLUT_NORMAL_DAMAGED ((GLenum) 804) -#define GLUT_OVERLAY_DAMAGED ((GLenum) 805) - -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -/* glutVideoResizeGet parameters. */ -#define GLUT_VIDEO_RESIZE_POSSIBLE ((GLenum) 900) -#define GLUT_VIDEO_RESIZE_IN_USE ((GLenum) 901) -#define GLUT_VIDEO_RESIZE_X_DELTA ((GLenum) 902) -#define GLUT_VIDEO_RESIZE_Y_DELTA ((GLenum) 903) -#define GLUT_VIDEO_RESIZE_WIDTH_DELTA ((GLenum) 904) -#define GLUT_VIDEO_RESIZE_HEIGHT_DELTA ((GLenum) 905) -#define GLUT_VIDEO_RESIZE_X ((GLenum) 906) -#define GLUT_VIDEO_RESIZE_Y ((GLenum) 907) -#define GLUT_VIDEO_RESIZE_WIDTH ((GLenum) 908) -#define GLUT_VIDEO_RESIZE_HEIGHT ((GLenum) 909) -#endif - -/* glutUseLayer parameters. */ -#define GLUT_NORMAL ((GLenum) 0) -#define GLUT_OVERLAY ((GLenum) 1) - -/* glutGetModifiers return mask. */ -#define GLUT_ACTIVE_SHIFT 1 -#define GLUT_ACTIVE_CTRL 2 -#define GLUT_ACTIVE_ALT 4 - -/* glutSetCursor parameters. */ -/* Basic arrows. */ -#define GLUT_CURSOR_RIGHT_ARROW 0 -#define GLUT_CURSOR_LEFT_ARROW 1 -/* Symbolic cursor shapes. */ -#define GLUT_CURSOR_INFO 2 -#define GLUT_CURSOR_DESTROY 3 -#define GLUT_CURSOR_HELP 4 -#define GLUT_CURSOR_CYCLE 5 -#define GLUT_CURSOR_SPRAY 6 -#define GLUT_CURSOR_WAIT 7 -#define GLUT_CURSOR_TEXT 8 -#define GLUT_CURSOR_CROSSHAIR 9 -/* Directional cursors. */ -#define GLUT_CURSOR_UP_DOWN 10 -#define GLUT_CURSOR_LEFT_RIGHT 11 -/* Sizing cursors. */ -#define GLUT_CURSOR_TOP_SIDE 12 -#define GLUT_CURSOR_BOTTOM_SIDE 13 -#define GLUT_CURSOR_LEFT_SIDE 14 -#define GLUT_CURSOR_RIGHT_SIDE 15 -#define GLUT_CURSOR_TOP_LEFT_CORNER 16 -#define GLUT_CURSOR_TOP_RIGHT_CORNER 17 -#define GLUT_CURSOR_BOTTOM_RIGHT_CORNER 18 -#define GLUT_CURSOR_BOTTOM_LEFT_CORNER 19 -/* Inherit from parent window. */ -#define GLUT_CURSOR_INHERIT 100 -/* Blank cursor. */ -#define GLUT_CURSOR_NONE 101 -/* Fullscreen crosshair (if available). */ -#define GLUT_CURSOR_FULL_CROSSHAIR 102 -#endif - -/* GLUT initialization sub-API. */ -GLUTAPI void APIENTRY glutInit(int *argcp, char **argv); -#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) -GLUTAPI void APIENTRY __glutInitWithExit(int *argcp, char **argv, void (__cdecl *exitfunc)(int)); -#ifndef GLUT_BUILDING_LIB -static void APIENTRY glutInit_ATEXIT_HACK(int *argcp, char **argv) { __glutInitWithExit(argcp, argv, exit); } -#define glutInit glutInit_ATEXIT_HACK -#endif -#endif -GLUTAPI void APIENTRY glutInitDisplayMode(unsigned int mode); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -GLUTAPI void APIENTRY glutInitDisplayString(const char *string); -#endif -GLUTAPI void APIENTRY glutInitWindowPosition(int x, int y); -GLUTAPI void APIENTRY glutInitWindowSize(int width, int height); -GLUTAPI void APIENTRY glutMainLoop(void); - -/* GLUT window sub-API. */ -GLUTAPI int APIENTRY glutCreateWindow(const char *title); -#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) -GLUTAPI int APIENTRY __glutCreateWindowWithExit(const char *title, void (__cdecl *exitfunc)(int)); -#ifndef GLUT_BUILDING_LIB -static int APIENTRY glutCreateWindow_ATEXIT_HACK(const char *title) { return __glutCreateWindowWithExit(title, exit); } -#define glutCreateWindow glutCreateWindow_ATEXIT_HACK -#endif -#endif -GLUTAPI int APIENTRY glutCreateSubWindow(int win, int x, int y, int width, int height); -GLUTAPI void APIENTRY glutDestroyWindow(int win); -GLUTAPI void APIENTRY glutPostRedisplay(void); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11) -GLUTAPI void APIENTRY glutPostWindowRedisplay(int win); -#endif -GLUTAPI void APIENTRY glutSwapBuffers(void); -GLUTAPI int APIENTRY glutGetWindow(void); -GLUTAPI void APIENTRY glutSetWindow(int win); -GLUTAPI void APIENTRY glutSetWindowTitle(const char *title); -GLUTAPI void APIENTRY glutSetIconTitle(const char *title); -GLUTAPI void APIENTRY glutPositionWindow(int x, int y); -GLUTAPI void APIENTRY glutReshapeWindow(int width, int height); -GLUTAPI void APIENTRY glutPopWindow(void); -GLUTAPI void APIENTRY glutPushWindow(void); -GLUTAPI void APIENTRY glutIconifyWindow(void); -GLUTAPI void APIENTRY glutShowWindow(void); -GLUTAPI void APIENTRY glutHideWindow(void); -#if (GLUT_API_VERSION >= 3) -GLUTAPI void APIENTRY glutFullScreen(void); -GLUTAPI void APIENTRY glutSetCursor(int cursor); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -GLUTAPI void APIENTRY glutWarpPointer(int x, int y); -#endif - -/* GLUT overlay sub-API. */ -GLUTAPI void APIENTRY glutEstablishOverlay(void); -GLUTAPI void APIENTRY glutRemoveOverlay(void); -GLUTAPI void APIENTRY glutUseLayer(GLenum layer); -GLUTAPI void APIENTRY glutPostOverlayRedisplay(void); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 11) -GLUTAPI void APIENTRY glutPostWindowOverlayRedisplay(int win); -#endif -GLUTAPI void APIENTRY glutShowOverlay(void); -GLUTAPI void APIENTRY glutHideOverlay(void); -#endif - -/* GLUT menu sub-API. */ -GLUTAPI int APIENTRY glutCreateMenu(void (GLUTCALLBACK *func)(int)); -#if defined(_WIN32) && !defined(GLUT_DISABLE_ATEXIT_HACK) -GLUTAPI int APIENTRY __glutCreateMenuWithExit(void (GLUTCALLBACK *func)(int), void (__cdecl *exitfunc)(int)); -#ifndef GLUT_BUILDING_LIB -static int APIENTRY glutCreateMenu_ATEXIT_HACK(void (GLUTCALLBACK *func)(int)) { return __glutCreateMenuWithExit(func, exit); } -#define glutCreateMenu glutCreateMenu_ATEXIT_HACK -#endif -#endif -GLUTAPI void APIENTRY glutDestroyMenu(int menu); -GLUTAPI int APIENTRY glutGetMenu(void); -GLUTAPI void APIENTRY glutSetMenu(int menu); -GLUTAPI void APIENTRY glutAddMenuEntry(const char *label, int value); -GLUTAPI void APIENTRY glutAddSubMenu(const char *label, int submenu); -GLUTAPI void APIENTRY glutChangeToMenuEntry(int item, const char *label, int value); -GLUTAPI void APIENTRY glutChangeToSubMenu(int item, const char *label, int submenu); -GLUTAPI void APIENTRY glutRemoveMenuItem(int item); -GLUTAPI void APIENTRY glutAttachMenu(int button); -GLUTAPI void APIENTRY glutDetachMenu(int button); - -/* GLUT window callback sub-API. */ -GLUTAPI void APIENTRY glutDisplayFunc(void (GLUTCALLBACK *func)(void)); -GLUTAPI void APIENTRY glutReshapeFunc(void (GLUTCALLBACK *func)(int width, int height)); -GLUTAPI void APIENTRY glutKeyboardFunc(void (GLUTCALLBACK *func)(unsigned char key, int x, int y)); -GLUTAPI void APIENTRY glutMouseFunc(void (GLUTCALLBACK *func)(int button, int state, int x, int y)); -GLUTAPI void APIENTRY glutMotionFunc(void (GLUTCALLBACK *func)(int x, int y)); -GLUTAPI void APIENTRY glutPassiveMotionFunc(void (GLUTCALLBACK *func)(int x, int y)); -GLUTAPI void APIENTRY glutEntryFunc(void (GLUTCALLBACK *func)(int state)); -GLUTAPI void APIENTRY glutVisibilityFunc(void (GLUTCALLBACK *func)(int state)); -GLUTAPI void APIENTRY glutIdleFunc(void (GLUTCALLBACK *func)(void)); -GLUTAPI void APIENTRY glutTimerFunc(unsigned int millis, void (GLUTCALLBACK *func)(int value), int value); -GLUTAPI void APIENTRY glutMenuStateFunc(void (GLUTCALLBACK *func)(int state)); -#if (GLUT_API_VERSION >= 2) -GLUTAPI void APIENTRY glutSpecialFunc(void (GLUTCALLBACK *func)(int key, int x, int y)); -GLUTAPI void APIENTRY glutSpaceballMotionFunc(void (GLUTCALLBACK *func)(int x, int y, int z)); -GLUTAPI void APIENTRY glutSpaceballRotateFunc(void (GLUTCALLBACK *func)(int x, int y, int z)); -GLUTAPI void APIENTRY glutSpaceballButtonFunc(void (GLUTCALLBACK *func)(int button, int state)); -GLUTAPI void APIENTRY glutButtonBoxFunc(void (GLUTCALLBACK *func)(int button, int state)); -GLUTAPI void APIENTRY glutDialsFunc(void (GLUTCALLBACK *func)(int dial, int value)); -GLUTAPI void APIENTRY glutTabletMotionFunc(void (GLUTCALLBACK *func)(int x, int y)); -GLUTAPI void APIENTRY glutTabletButtonFunc(void (GLUTCALLBACK *func)(int button, int state, int x, int y)); -#if (GLUT_API_VERSION >= 3) -GLUTAPI void APIENTRY glutMenuStatusFunc(void (GLUTCALLBACK *func)(int status, int x, int y)); -GLUTAPI void APIENTRY glutOverlayDisplayFunc(void (GLUTCALLBACK *func)(void)); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -GLUTAPI void APIENTRY glutWindowStatusFunc(void (GLUTCALLBACK *func)(int state)); -#endif -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13) -GLUTAPI void APIENTRY glutKeyboardUpFunc(void (GLUTCALLBACK *func)(unsigned char key, int x, int y)); -GLUTAPI void APIENTRY glutSpecialUpFunc(void (GLUTCALLBACK *func)(int key, int x, int y)); -GLUTAPI void APIENTRY glutJoystickFunc(void (GLUTCALLBACK *func)(unsigned int buttonMask, int x, int y, int z), int pollInterval); -#endif -#endif -#endif - -/* GLUT color index sub-API. */ -GLUTAPI void APIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue); -GLUTAPI GLfloat APIENTRY glutGetColor(int ndx, int component); -GLUTAPI void APIENTRY glutCopyColormap(int win); - -/* GLUT state retrieval sub-API. */ -GLUTAPI int APIENTRY glutGet(GLenum type); -GLUTAPI int APIENTRY glutDeviceGet(GLenum type); -#if (GLUT_API_VERSION >= 2) -/* GLUT extension support sub-API */ -GLUTAPI int APIENTRY glutExtensionSupported(const char *name); -#endif -#if (GLUT_API_VERSION >= 3) -GLUTAPI int APIENTRY glutGetModifiers(void); -GLUTAPI int APIENTRY glutLayerGet(GLenum type); -#endif - -/* GLUT font sub-API */ -GLUTAPI void APIENTRY glutBitmapCharacter(void *font, int character); -GLUTAPI int APIENTRY glutBitmapWidth(void *font, int character); -GLUTAPI void APIENTRY glutStrokeCharacter(void *font, int character); -GLUTAPI int APIENTRY glutStrokeWidth(void *font, int character); -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -GLUTAPI int APIENTRY glutBitmapLength(void *font, const unsigned char *string); -GLUTAPI int APIENTRY glutStrokeLength(void *font, const unsigned char *string); -#endif - -/* GLUT pre-built models sub-API */ -GLUTAPI void APIENTRY glutWireSphere(GLdouble radius, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutSolidSphere(GLdouble radius, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutWireCone(GLdouble base, GLdouble height, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutSolidCone(GLdouble base, GLdouble height, GLint slices, GLint stacks); -GLUTAPI void APIENTRY glutWireCube(GLdouble size); -GLUTAPI void APIENTRY glutSolidCube(GLdouble size); -GLUTAPI void APIENTRY glutWireTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); -GLUTAPI void APIENTRY glutSolidTorus(GLdouble innerRadius, GLdouble outerRadius, GLint sides, GLint rings); -GLUTAPI void APIENTRY glutWireDodecahedron(void); -GLUTAPI void APIENTRY glutSolidDodecahedron(void); -GLUTAPI void APIENTRY glutWireTeapot(GLdouble size); -GLUTAPI void APIENTRY glutSolidTeapot(GLdouble size); -GLUTAPI void APIENTRY glutWireOctahedron(void); -GLUTAPI void APIENTRY glutSolidOctahedron(void); -GLUTAPI void APIENTRY glutWireTetrahedron(void); -GLUTAPI void APIENTRY glutSolidTetrahedron(void); -GLUTAPI void APIENTRY glutWireIcosahedron(void); -GLUTAPI void APIENTRY glutSolidIcosahedron(void); - -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 9) -/* GLUT video resize sub-API. */ -GLUTAPI int APIENTRY glutVideoResizeGet(GLenum param); -GLUTAPI void APIENTRY glutSetupVideoResizing(void); -GLUTAPI void APIENTRY glutStopVideoResizing(void); -GLUTAPI void APIENTRY glutVideoResize(int x, int y, int width, int height); -GLUTAPI void APIENTRY glutVideoPan(int x, int y, int width, int height); - -/* GLUT debugging sub-API. */ -GLUTAPI void APIENTRY glutReportErrors(void); -#endif - -#if (GLUT_API_VERSION >= 4 || GLUT_XLIB_IMPLEMENTATION >= 13) -/* GLUT device control sub-API. */ -/* glutSetKeyRepeat modes. */ -#define GLUT_KEY_REPEAT_OFF 0 -#define GLUT_KEY_REPEAT_ON 1 -#define GLUT_KEY_REPEAT_DEFAULT 2 - -/* Joystick button masks. */ -#define GLUT_JOYSTICK_BUTTON_A 1 -#define GLUT_JOYSTICK_BUTTON_B 2 -#define GLUT_JOYSTICK_BUTTON_C 4 -#define GLUT_JOYSTICK_BUTTON_D 8 - -GLUTAPI void APIENTRY glutIgnoreKeyRepeat(int ignore); -GLUTAPI void APIENTRY glutSetKeyRepeat(int repeatMode); -GLUTAPI void APIENTRY glutForceJoystickFunc(void); - -/* GLUT game mode sub-API. */ -/* glutGameModeGet. */ -#define GLUT_GAME_MODE_ACTIVE ((GLenum) 0) -#define GLUT_GAME_MODE_POSSIBLE ((GLenum) 1) -#define GLUT_GAME_MODE_WIDTH ((GLenum) 2) -#define GLUT_GAME_MODE_HEIGHT ((GLenum) 3) -#define GLUT_GAME_MODE_PIXEL_DEPTH ((GLenum) 4) -#define GLUT_GAME_MODE_REFRESH_RATE ((GLenum) 5) -#define GLUT_GAME_MODE_DISPLAY_CHANGED ((GLenum) 6) - -GLUTAPI void APIENTRY glutGameModeString(const char *string); -GLUTAPI int APIENTRY glutEnterGameMode(void); -GLUTAPI void APIENTRY glutLeaveGameMode(void); -GLUTAPI int APIENTRY glutGameModeGet(GLenum mode); -#endif - -#ifdef __cplusplus -} - -#endif - -#ifdef GLUT_APIENTRY_DEFINED -# undef GLUT_APIENTRY_DEFINED -# undef APIENTRY -#endif - -#ifdef GLUT_WINGDIAPI_DEFINED -# undef GLUT_WINGDIAPI_DEFINED -# undef WINGDIAPI -#endif - -#ifdef GLUT_DEFINED___CDECL -# undef GLUT_DEFINED___CDECL -# undef __cdecl -#endif - -#ifdef GLUT_DEFINED__CRTIMP -# undef GLUT_DEFINED__CRTIMP -# undef _CRTIMP -#endif - -#endif /* __glut_h__ */ diff --git a/opengl/glew.c b/opengl/glew.c deleted file mode 100644 index 539c61f4..00000000 --- a/opengl/glew.c +++ /dev/null @@ -1,12180 +0,0 @@ -/* -** The OpenGL Extension Wrangler Library -** Copyright (C) 2002-2008, Milan Ikits -** Copyright (C) 2002-2008, Marcelo E. Magallon -** Copyright (C) 2002, Lev Povalahev -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are met: -** -** * Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** * The name of the author may be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -** THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#include "OPENGL/glew.h" -#if defined(_WIN32) -# include "OPENGL/wglew.h" -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) -# include "OPENGL/glxew.h" -#endif - -/* - * Define glewGetContext and related helper macros. - */ -#ifdef GLEW_MX -# define glewGetContext() ctx -# ifdef _WIN32 -# define GLEW_CONTEXT_ARG_DEF_INIT GLEWContext* ctx -# define GLEW_CONTEXT_ARG_VAR_INIT ctx -# define wglewGetContext() ctx -# define WGLEW_CONTEXT_ARG_DEF_INIT WGLEWContext* ctx -# define WGLEW_CONTEXT_ARG_DEF_LIST WGLEWContext* ctx -# else /* _WIN32 */ -# define GLEW_CONTEXT_ARG_DEF_INIT void -# define GLEW_CONTEXT_ARG_VAR_INIT -# define glxewGetContext() ctx -# define GLXEW_CONTEXT_ARG_DEF_INIT void -# define GLXEW_CONTEXT_ARG_DEF_LIST GLXEWContext* ctx -# endif /* _WIN32 */ -# define GLEW_CONTEXT_ARG_DEF_LIST GLEWContext* ctx -#else /* GLEW_MX */ -# define GLEW_CONTEXT_ARG_DEF_INIT void -# define GLEW_CONTEXT_ARG_VAR_INIT -# define GLEW_CONTEXT_ARG_DEF_LIST void -# define WGLEW_CONTEXT_ARG_DEF_INIT void -# define WGLEW_CONTEXT_ARG_DEF_LIST void -# define GLXEW_CONTEXT_ARG_DEF_INIT void -# define GLXEW_CONTEXT_ARG_DEF_LIST void -#endif /* GLEW_MX */ - -#if defined(__APPLE__) -#include -#include -#include - -void* NSGLGetProcAddress (const GLubyte *name) -{ - static const struct mach_header* image = NULL; - NSSymbol symbol; - char* symbolName; - if (NULL == image) - { - image = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", NSADDIMAGE_OPTION_RETURN_ON_ERROR); - } - /* prepend a '_' for the Unix C symbol mangling convention */ - symbolName = malloc(strlen((const char*)name) + 2); - strcpy(symbolName+1, (const char*)name); - symbolName[0] = '_'; - symbol = NULL; - /* if (NSIsSymbolNameDefined(symbolName)) - symbol = NSLookupAndBindSymbol(symbolName); */ - symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL; - free(symbolName); - return symbol ? NSAddressOfSymbol(symbol) : NULL; -} -#endif /* __APPLE__ */ - -#if defined(__sgi) || defined (__sun) -#include -#include -#include - -void* dlGetProcAddress (const GLubyte* name) -{ - static void* h = NULL; - static void* gpa; - - if (h == NULL) - { - if ((h = dlopen(NULL, RTLD_LAZY | RTLD_LOCAL)) == NULL) return NULL; - gpa = dlsym(h, "glXGetProcAddress"); - } - - if (gpa != NULL) - return ((void*(*)(const GLubyte*))gpa)(name); - else - return dlsym(h, (const char*)name); -} -#endif /* __sgi || __sun */ - -/* - * Define glewGetProcAddress. - */ -#if defined(_WIN32) -# define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) -#else -# if defined(__APPLE__) -# define glewGetProcAddress(name) NSGLGetProcAddress(name) -# else -# if defined(__sgi) || defined(__sun) -# define glewGetProcAddress(name) dlGetProcAddress(name) -# else /* __linux */ -# define glewGetProcAddress(name) (*glXGetProcAddressARB)(name) -# endif -# endif -#endif - -/* - * Define GLboolean const cast. - */ -#define CONST_CAST(x) (*(GLboolean*)&x) - -/* - * GLEW, just like OpenGL or GLU, does not rely on the standard C library. - * These functions implement the functionality required in this file. - */ -static GLuint _glewStrLen (const GLubyte* s) -{ - GLuint i=0; - if (s == NULL) return 0; - while (s[i] != '\0') i++; - return i; -} - -static GLuint _glewStrCLen (const GLubyte* s, GLubyte c) -{ - GLuint i=0; - if (s == NULL) return 0; - while (s[i] != '\0' && s[i] != c) i++; - return (s[i] == '\0' || s[i] == c) ? i : 0; -} - -static GLboolean _glewStrSame (const GLubyte* a, const GLubyte* b, GLuint n) -{ - GLuint i=0; - if(a == NULL || b == NULL) - return (a == NULL && b == NULL && n == 0) ? GL_TRUE : GL_FALSE; - while (i < n && a[i] != '\0' && b[i] != '\0' && a[i] == b[i]) i++; - return i == n ? GL_TRUE : GL_FALSE; -} - -static GLboolean _glewStrSame1 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) -{ - while (*na > 0 && (**a == ' ' || **a == '\n' || **a == '\r' || **a == '\t')) - { - (*a)++; - (*na)--; - } - if(*na >= nb) - { - GLuint i=0; - while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++; - if(i == nb) - { - *a = *a + nb; - *na = *na - nb; - return GL_TRUE; - } - } - return GL_FALSE; -} - -static GLboolean _glewStrSame2 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) -{ - if(*na >= nb) - { - GLuint i=0; - while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++; - if(i == nb) - { - *a = *a + nb; - *na = *na - nb; - return GL_TRUE; - } - } - return GL_FALSE; -} - -static GLboolean _glewStrSame3 (GLubyte** a, GLuint* na, const GLubyte* b, GLuint nb) -{ - if(*na >= nb) - { - GLuint i=0; - while (i < nb && (*a)+i != NULL && b+i != NULL && (*a)[i] == b[i]) i++; - if (i == nb && (*na == nb || (*a)[i] == ' ' || (*a)[i] == '\n' || (*a)[i] == '\r' || (*a)[i] == '\t')) - { - *a = *a + nb; - *na = *na - nb; - return GL_TRUE; - } - } - return GL_FALSE; -} - -#if !defined(_WIN32) || !defined(GLEW_MX) - -PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D = NULL; -PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements = NULL; -PFNGLTEXIMAGE3DPROC __glewTexImage3D = NULL; -PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D = NULL; - -PFNGLACTIVETEXTUREPROC __glewActiveTexture = NULL; -PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture = NULL; -PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D = NULL; -PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D = NULL; -PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D = NULL; -PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage = NULL; -PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd = NULL; -PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf = NULL; -PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd = NULL; -PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf = NULL; -PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d = NULL; -PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv = NULL; -PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f = NULL; -PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv = NULL; -PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i = NULL; -PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv = NULL; -PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s = NULL; -PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv = NULL; -PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d = NULL; -PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv = NULL; -PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f = NULL; -PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv = NULL; -PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i = NULL; -PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv = NULL; -PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s = NULL; -PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv = NULL; -PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d = NULL; -PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv = NULL; -PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f = NULL; -PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv = NULL; -PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i = NULL; -PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv = NULL; -PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s = NULL; -PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv = NULL; -PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d = NULL; -PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv = NULL; -PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f = NULL; -PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv = NULL; -PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i = NULL; -PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv = NULL; -PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s = NULL; -PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv = NULL; -PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage = NULL; - -PFNGLBLENDCOLORPROC __glewBlendColor = NULL; -PFNGLBLENDEQUATIONPROC __glewBlendEquation = NULL; -PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate = NULL; -PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer = NULL; -PFNGLFOGCOORDDPROC __glewFogCoordd = NULL; -PFNGLFOGCOORDDVPROC __glewFogCoorddv = NULL; -PFNGLFOGCOORDFPROC __glewFogCoordf = NULL; -PFNGLFOGCOORDFVPROC __glewFogCoordfv = NULL; -PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays = NULL; -PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements = NULL; -PFNGLPOINTPARAMETERFPROC __glewPointParameterf = NULL; -PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv = NULL; -PFNGLPOINTPARAMETERIPROC __glewPointParameteri = NULL; -PFNGLPOINTPARAMETERIVPROC __glewPointParameteriv = NULL; -PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b = NULL; -PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv = NULL; -PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d = NULL; -PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv = NULL; -PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f = NULL; -PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv = NULL; -PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i = NULL; -PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv = NULL; -PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s = NULL; -PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv = NULL; -PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub = NULL; -PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv = NULL; -PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui = NULL; -PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv = NULL; -PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us = NULL; -PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv = NULL; -PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer = NULL; -PFNGLWINDOWPOS2DPROC __glewWindowPos2d = NULL; -PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv = NULL; -PFNGLWINDOWPOS2FPROC __glewWindowPos2f = NULL; -PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv = NULL; -PFNGLWINDOWPOS2IPROC __glewWindowPos2i = NULL; -PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv = NULL; -PFNGLWINDOWPOS2SPROC __glewWindowPos2s = NULL; -PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv = NULL; -PFNGLWINDOWPOS3DPROC __glewWindowPos3d = NULL; -PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv = NULL; -PFNGLWINDOWPOS3FPROC __glewWindowPos3f = NULL; -PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv = NULL; -PFNGLWINDOWPOS3IPROC __glewWindowPos3i = NULL; -PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv = NULL; -PFNGLWINDOWPOS3SPROC __glewWindowPos3s = NULL; -PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv = NULL; - -PFNGLBEGINQUERYPROC __glewBeginQuery = NULL; -PFNGLBINDBUFFERPROC __glewBindBuffer = NULL; -PFNGLBUFFERDATAPROC __glewBufferData = NULL; -PFNGLBUFFERSUBDATAPROC __glewBufferSubData = NULL; -PFNGLDELETEBUFFERSPROC __glewDeleteBuffers = NULL; -PFNGLDELETEQUERIESPROC __glewDeleteQueries = NULL; -PFNGLENDQUERYPROC __glewEndQuery = NULL; -PFNGLGENBUFFERSPROC __glewGenBuffers = NULL; -PFNGLGENQUERIESPROC __glewGenQueries = NULL; -PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv = NULL; -PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv = NULL; -PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData = NULL; -PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv = NULL; -PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv = NULL; -PFNGLGETQUERYIVPROC __glewGetQueryiv = NULL; -PFNGLISBUFFERPROC __glewIsBuffer = NULL; -PFNGLISQUERYPROC __glewIsQuery = NULL; -PFNGLMAPBUFFERPROC __glewMapBuffer = NULL; -PFNGLUNMAPBUFFERPROC __glewUnmapBuffer = NULL; - -PFNGLATTACHSHADERPROC __glewAttachShader = NULL; -PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation = NULL; -PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate = NULL; -PFNGLCOMPILESHADERPROC __glewCompileShader = NULL; -PFNGLCREATEPROGRAMPROC __glewCreateProgram = NULL; -PFNGLCREATESHADERPROC __glewCreateShader = NULL; -PFNGLDELETEPROGRAMPROC __glewDeleteProgram = NULL; -PFNGLDELETESHADERPROC __glewDeleteShader = NULL; -PFNGLDETACHSHADERPROC __glewDetachShader = NULL; -PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray = NULL; -PFNGLDRAWBUFFERSPROC __glewDrawBuffers = NULL; -PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray = NULL; -PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib = NULL; -PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform = NULL; -PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders = NULL; -PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation = NULL; -PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog = NULL; -PFNGLGETPROGRAMIVPROC __glewGetProgramiv = NULL; -PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog = NULL; -PFNGLGETSHADERSOURCEPROC __glewGetShaderSource = NULL; -PFNGLGETSHADERIVPROC __glewGetShaderiv = NULL; -PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation = NULL; -PFNGLGETUNIFORMFVPROC __glewGetUniformfv = NULL; -PFNGLGETUNIFORMIVPROC __glewGetUniformiv = NULL; -PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv = NULL; -PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv = NULL; -PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv = NULL; -PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv = NULL; -PFNGLISPROGRAMPROC __glewIsProgram = NULL; -PFNGLISSHADERPROC __glewIsShader = NULL; -PFNGLLINKPROGRAMPROC __glewLinkProgram = NULL; -PFNGLSHADERSOURCEPROC __glewShaderSource = NULL; -PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate = NULL; -PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate = NULL; -PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate = NULL; -PFNGLUNIFORM1FPROC __glewUniform1f = NULL; -PFNGLUNIFORM1FVPROC __glewUniform1fv = NULL; -PFNGLUNIFORM1IPROC __glewUniform1i = NULL; -PFNGLUNIFORM1IVPROC __glewUniform1iv = NULL; -PFNGLUNIFORM2FPROC __glewUniform2f = NULL; -PFNGLUNIFORM2FVPROC __glewUniform2fv = NULL; -PFNGLUNIFORM2IPROC __glewUniform2i = NULL; -PFNGLUNIFORM2IVPROC __glewUniform2iv = NULL; -PFNGLUNIFORM3FPROC __glewUniform3f = NULL; -PFNGLUNIFORM3FVPROC __glewUniform3fv = NULL; -PFNGLUNIFORM3IPROC __glewUniform3i = NULL; -PFNGLUNIFORM3IVPROC __glewUniform3iv = NULL; -PFNGLUNIFORM4FPROC __glewUniform4f = NULL; -PFNGLUNIFORM4FVPROC __glewUniform4fv = NULL; -PFNGLUNIFORM4IPROC __glewUniform4i = NULL; -PFNGLUNIFORM4IVPROC __glewUniform4iv = NULL; -PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv = NULL; -PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv = NULL; -PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv = NULL; -PFNGLUSEPROGRAMPROC __glewUseProgram = NULL; -PFNGLVALIDATEPROGRAMPROC __glewValidateProgram = NULL; -PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d = NULL; -PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv = NULL; -PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f = NULL; -PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv = NULL; -PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s = NULL; -PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv = NULL; -PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d = NULL; -PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv = NULL; -PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f = NULL; -PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv = NULL; -PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s = NULL; -PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv = NULL; -PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d = NULL; -PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv = NULL; -PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f = NULL; -PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv = NULL; -PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s = NULL; -PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv = NULL; -PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv = NULL; -PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv = NULL; -PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv = NULL; -PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub = NULL; -PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv = NULL; -PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv = NULL; -PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv = NULL; -PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv = NULL; -PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d = NULL; -PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv = NULL; -PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f = NULL; -PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv = NULL; -PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv = NULL; -PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s = NULL; -PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv = NULL; -PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv = NULL; -PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv = NULL; -PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv = NULL; -PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer = NULL; - -PFNGLUNIFORMMATRIX2X3FVPROC __glewUniformMatrix2x3fv = NULL; -PFNGLUNIFORMMATRIX2X4FVPROC __glewUniformMatrix2x4fv = NULL; -PFNGLUNIFORMMATRIX3X2FVPROC __glewUniformMatrix3x2fv = NULL; -PFNGLUNIFORMMATRIX3X4FVPROC __glewUniformMatrix3x4fv = NULL; -PFNGLUNIFORMMATRIX4X2FVPROC __glewUniformMatrix4x2fv = NULL; -PFNGLUNIFORMMATRIX4X3FVPROC __glewUniformMatrix4x3fv = NULL; - -PFNGLBEGINCONDITIONALRENDERPROC __glewBeginConditionalRender = NULL; -PFNGLBEGINTRANSFORMFEEDBACKPROC __glewBeginTransformFeedback = NULL; -PFNGLBINDBUFFERBASEPROC __glewBindBufferBase = NULL; -PFNGLBINDBUFFERRANGEPROC __glewBindBufferRange = NULL; -PFNGLBINDFRAGDATALOCATIONPROC __glewBindFragDataLocation = NULL; -PFNGLCLAMPCOLORPROC __glewClampColor = NULL; -PFNGLCLEARBUFFERFIPROC __glewClearBufferfi = NULL; -PFNGLCLEARBUFFERFVPROC __glewClearBufferfv = NULL; -PFNGLCLEARBUFFERIVPROC __glewClearBufferiv = NULL; -PFNGLCLEARBUFFERUIVPROC __glewClearBufferuiv = NULL; -PFNGLCOLORMASKIPROC __glewColorMaski = NULL; -PFNGLDISABLEIPROC __glewDisablei = NULL; -PFNGLENABLEIPROC __glewEnablei = NULL; -PFNGLENDCONDITIONALRENDERPROC __glewEndConditionalRender = NULL; -PFNGLENDTRANSFORMFEEDBACKPROC __glewEndTransformFeedback = NULL; -PFNGLGETBOOLEANI_VPROC __glewGetBooleani_v = NULL; -PFNGLGETFRAGDATALOCATIONPROC __glewGetFragDataLocation = NULL; -PFNGLGETINTEGERI_VPROC __glewGetIntegeri_v = NULL; -PFNGLGETSTRINGIPROC __glewGetStringi = NULL; -PFNGLGETTEXPARAMETERIIVPROC __glewGetTexParameterIiv = NULL; -PFNGLGETTEXPARAMETERIUIVPROC __glewGetTexParameterIuiv = NULL; -PFNGLGETTRANSFORMFEEDBACKVARYINGPROC __glewGetTransformFeedbackVarying = NULL; -PFNGLGETUNIFORMUIVPROC __glewGetUniformuiv = NULL; -PFNGLGETVERTEXATTRIBIIVPROC __glewGetVertexAttribIiv = NULL; -PFNGLGETVERTEXATTRIBIUIVPROC __glewGetVertexAttribIuiv = NULL; -PFNGLISENABLEDIPROC __glewIsEnabledi = NULL; -PFNGLTEXPARAMETERIIVPROC __glewTexParameterIiv = NULL; -PFNGLTEXPARAMETERIUIVPROC __glewTexParameterIuiv = NULL; -PFNGLTRANSFORMFEEDBACKVARYINGSPROC __glewTransformFeedbackVaryings = NULL; -PFNGLUNIFORM1UIPROC __glewUniform1ui = NULL; -PFNGLUNIFORM1UIVPROC __glewUniform1uiv = NULL; -PFNGLUNIFORM2UIPROC __glewUniform2ui = NULL; -PFNGLUNIFORM2UIVPROC __glewUniform2uiv = NULL; -PFNGLUNIFORM3UIPROC __glewUniform3ui = NULL; -PFNGLUNIFORM3UIVPROC __glewUniform3uiv = NULL; -PFNGLUNIFORM4UIPROC __glewUniform4ui = NULL; -PFNGLUNIFORM4UIVPROC __glewUniform4uiv = NULL; -PFNGLVERTEXATTRIBI1IPROC __glewVertexAttribI1i = NULL; -PFNGLVERTEXATTRIBI1IVPROC __glewVertexAttribI1iv = NULL; -PFNGLVERTEXATTRIBI1UIPROC __glewVertexAttribI1ui = NULL; -PFNGLVERTEXATTRIBI1UIVPROC __glewVertexAttribI1uiv = NULL; -PFNGLVERTEXATTRIBI2IPROC __glewVertexAttribI2i = NULL; -PFNGLVERTEXATTRIBI2IVPROC __glewVertexAttribI2iv = NULL; -PFNGLVERTEXATTRIBI2UIPROC __glewVertexAttribI2ui = NULL; -PFNGLVERTEXATTRIBI2UIVPROC __glewVertexAttribI2uiv = NULL; -PFNGLVERTEXATTRIBI3IPROC __glewVertexAttribI3i = NULL; -PFNGLVERTEXATTRIBI3IVPROC __glewVertexAttribI3iv = NULL; -PFNGLVERTEXATTRIBI3UIPROC __glewVertexAttribI3ui = NULL; -PFNGLVERTEXATTRIBI3UIVPROC __glewVertexAttribI3uiv = NULL; -PFNGLVERTEXATTRIBI4BVPROC __glewVertexAttribI4bv = NULL; -PFNGLVERTEXATTRIBI4IPROC __glewVertexAttribI4i = NULL; -PFNGLVERTEXATTRIBI4IVPROC __glewVertexAttribI4iv = NULL; -PFNGLVERTEXATTRIBI4SVPROC __glewVertexAttribI4sv = NULL; -PFNGLVERTEXATTRIBI4UBVPROC __glewVertexAttribI4ubv = NULL; -PFNGLVERTEXATTRIBI4UIPROC __glewVertexAttribI4ui = NULL; -PFNGLVERTEXATTRIBI4UIVPROC __glewVertexAttribI4uiv = NULL; -PFNGLVERTEXATTRIBI4USVPROC __glewVertexAttribI4usv = NULL; -PFNGLVERTEXATTRIBIPOINTERPROC __glewVertexAttribIPointer = NULL; - -PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX = NULL; - -PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE = NULL; -PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE = NULL; -PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE = NULL; -PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE = NULL; -PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE = NULL; - -PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE = NULL; -PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE = NULL; -PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE = NULL; -PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE = NULL; -PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE = NULL; -PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE = NULL; -PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE = NULL; -PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE = NULL; - -PFNGLBUFFERPARAMETERIAPPLEPROC __glewBufferParameteriAPPLE = NULL; -PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC __glewFlushMappedBufferRangeAPPLE = NULL; - -PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE = NULL; -PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE = NULL; - -PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE = NULL; -PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE = NULL; -PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE = NULL; -PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE = NULL; - -PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE = NULL; -PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE = NULL; -PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE = NULL; - -PFNGLCLAMPCOLORARBPROC __glewClampColorARB = NULL; - -PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB = NULL; - -PFNGLDRAWARRAYSINSTANCEDARBPROC __glewDrawArraysInstancedARB = NULL; -PFNGLDRAWELEMENTSINSTANCEDARBPROC __glewDrawElementsInstancedARB = NULL; - -PFNGLBINDFRAMEBUFFERPROC __glewBindFramebuffer = NULL; -PFNGLBINDRENDERBUFFERPROC __glewBindRenderbuffer = NULL; -PFNGLBLITFRAMEBUFFERPROC __glewBlitFramebuffer = NULL; -PFNGLCHECKFRAMEBUFFERSTATUSPROC __glewCheckFramebufferStatus = NULL; -PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers = NULL; -PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers = NULL; -PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer = NULL; -PFNGLFRAMEBUFFERTEXTURLAYERPROC __glewFramebufferTexturLayer = NULL; -PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D = NULL; -PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D = NULL; -PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D = NULL; -PFNGLGENFRAMEBUFFERSPROC __glewGenFramebuffers = NULL; -PFNGLGENRENDERBUFFERSPROC __glewGenRenderbuffers = NULL; -PFNGLGENERATEMIPMAPPROC __glewGenerateMipmap = NULL; -PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetFramebufferAttachmentParameteriv = NULL; -PFNGLGETRENDERBUFFERPARAMETERIVPROC __glewGetRenderbufferParameteriv = NULL; -PFNGLISFRAMEBUFFERPROC __glewIsFramebuffer = NULL; -PFNGLISRENDERBUFFERPROC __glewIsRenderbuffer = NULL; -PFNGLRENDERBUFFERSTORAGEPROC __glewRenderbufferStorage = NULL; -PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewRenderbufferStorageMultisample = NULL; - -PFNGLFRAMEBUFFERTEXTUREARBPROC __glewFramebufferTextureARB = NULL; -PFNGLFRAMEBUFFERTEXTUREFACEARBPROC __glewFramebufferTextureFaceARB = NULL; -PFNGLFRAMEBUFFERTEXTURELAYERARBPROC __glewFramebufferTextureLayerARB = NULL; -PFNGLPROGRAMPARAMETERIARBPROC __glewProgramParameteriARB = NULL; - -PFNGLCOLORSUBTABLEPROC __glewColorSubTable = NULL; -PFNGLCOLORTABLEPROC __glewColorTable = NULL; -PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv = NULL; -PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv = NULL; -PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D = NULL; -PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D = NULL; -PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf = NULL; -PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv = NULL; -PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri = NULL; -PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv = NULL; -PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable = NULL; -PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable = NULL; -PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D = NULL; -PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D = NULL; -PFNGLGETCOLORTABLEPROC __glewGetColorTable = NULL; -PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv = NULL; -PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv = NULL; -PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter = NULL; -PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv = NULL; -PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv = NULL; -PFNGLGETHISTOGRAMPROC __glewGetHistogram = NULL; -PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv = NULL; -PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv = NULL; -PFNGLGETMINMAXPROC __glewGetMinmax = NULL; -PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv = NULL; -PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv = NULL; -PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter = NULL; -PFNGLHISTOGRAMPROC __glewHistogram = NULL; -PFNGLMINMAXPROC __glewMinmax = NULL; -PFNGLRESETHISTOGRAMPROC __glewResetHistogram = NULL; -PFNGLRESETMINMAXPROC __glewResetMinmax = NULL; -PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D = NULL; - -PFNGLVERTEXATTRIBDIVISORARBPROC __glewVertexAttribDivisorARB = NULL; - -PFNGLFLUSHMAPPEDBUFFERRANGEPROC __glewFlushMappedBufferRange = NULL; -PFNGLMAPBUFFERRANGEPROC __glewMapBufferRange = NULL; - -PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB = NULL; -PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB = NULL; -PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB = NULL; -PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB = NULL; -PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB = NULL; - -PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB = NULL; - -PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB = NULL; -PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB = NULL; -PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB = NULL; -PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB = NULL; -PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB = NULL; -PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB = NULL; -PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB = NULL; -PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB = NULL; -PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB = NULL; -PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB = NULL; -PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB = NULL; -PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB = NULL; -PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB = NULL; -PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB = NULL; -PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB = NULL; -PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB = NULL; -PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB = NULL; -PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB = NULL; -PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB = NULL; -PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB = NULL; -PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB = NULL; -PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB = NULL; -PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB = NULL; -PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB = NULL; -PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB = NULL; -PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB = NULL; -PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB = NULL; -PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB = NULL; -PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB = NULL; -PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB = NULL; -PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB = NULL; -PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB = NULL; -PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB = NULL; -PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB = NULL; - -PFNGLBEGINQUERYARBPROC __glewBeginQueryARB = NULL; -PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB = NULL; -PFNGLENDQUERYARBPROC __glewEndQueryARB = NULL; -PFNGLGENQUERIESARBPROC __glewGenQueriesARB = NULL; -PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB = NULL; -PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB = NULL; -PFNGLGETQUERYIVARBPROC __glewGetQueryivARB = NULL; -PFNGLISQUERYARBPROC __glewIsQueryARB = NULL; - -PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB = NULL; -PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB = NULL; - -PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB = NULL; -PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB = NULL; -PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB = NULL; -PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB = NULL; -PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB = NULL; -PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB = NULL; -PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB = NULL; -PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB = NULL; -PFNGLGETHANDLEARBPROC __glewGetHandleARB = NULL; -PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB = NULL; -PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB = NULL; -PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB = NULL; -PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB = NULL; -PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB = NULL; -PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB = NULL; -PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB = NULL; -PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB = NULL; -PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB = NULL; -PFNGLUNIFORM1FARBPROC __glewUniform1fARB = NULL; -PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB = NULL; -PFNGLUNIFORM1IARBPROC __glewUniform1iARB = NULL; -PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB = NULL; -PFNGLUNIFORM2FARBPROC __glewUniform2fARB = NULL; -PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB = NULL; -PFNGLUNIFORM2IARBPROC __glewUniform2iARB = NULL; -PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB = NULL; -PFNGLUNIFORM3FARBPROC __glewUniform3fARB = NULL; -PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB = NULL; -PFNGLUNIFORM3IARBPROC __glewUniform3iARB = NULL; -PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB = NULL; -PFNGLUNIFORM4FARBPROC __glewUniform4fARB = NULL; -PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB = NULL; -PFNGLUNIFORM4IARBPROC __glewUniform4iARB = NULL; -PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB = NULL; -PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB = NULL; -PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB = NULL; -PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB = NULL; -PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB = NULL; -PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB = NULL; - -PFNGLTEXBUFFERARBPROC __glewTexBufferARB = NULL; - -PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB = NULL; -PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB = NULL; -PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB = NULL; -PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB = NULL; -PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB = NULL; - -PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB = NULL; -PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB = NULL; -PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB = NULL; -PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB = NULL; - -PFNGLBINDVERTEXARRAYPROC __glewBindVertexArray = NULL; -PFNGLDELETEVERTEXARRAYSPROC __glewDeleteVertexArrays = NULL; -PFNGLGENVERTEXARRAYSPROC __glewGenVertexArrays = NULL; -PFNGLISVERTEXARRAYPROC __glewIsVertexArray = NULL; - -PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB = NULL; -PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB = NULL; -PFNGLWEIGHTBVARBPROC __glewWeightbvARB = NULL; -PFNGLWEIGHTDVARBPROC __glewWeightdvARB = NULL; -PFNGLWEIGHTFVARBPROC __glewWeightfvARB = NULL; -PFNGLWEIGHTIVARBPROC __glewWeightivARB = NULL; -PFNGLWEIGHTSVARBPROC __glewWeightsvARB = NULL; -PFNGLWEIGHTUBVARBPROC __glewWeightubvARB = NULL; -PFNGLWEIGHTUIVARBPROC __glewWeightuivARB = NULL; -PFNGLWEIGHTUSVARBPROC __glewWeightusvARB = NULL; - -PFNGLBINDBUFFERARBPROC __glewBindBufferARB = NULL; -PFNGLBUFFERDATAARBPROC __glewBufferDataARB = NULL; -PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB = NULL; -PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB = NULL; -PFNGLGENBUFFERSARBPROC __glewGenBuffersARB = NULL; -PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB = NULL; -PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB = NULL; -PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB = NULL; -PFNGLISBUFFERARBPROC __glewIsBufferARB = NULL; -PFNGLMAPBUFFERARBPROC __glewMapBufferARB = NULL; -PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB = NULL; - -PFNGLBINDPROGRAMARBPROC __glewBindProgramARB = NULL; -PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB = NULL; -PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB = NULL; -PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB = NULL; -PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB = NULL; -PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB = NULL; -PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB = NULL; -PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB = NULL; -PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB = NULL; -PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB = NULL; -PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB = NULL; -PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB = NULL; -PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB = NULL; -PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB = NULL; -PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB = NULL; -PFNGLISPROGRAMARBPROC __glewIsProgramARB = NULL; -PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB = NULL; -PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB = NULL; -PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB = NULL; -PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB = NULL; -PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB = NULL; -PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB = NULL; -PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB = NULL; -PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB = NULL; -PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB = NULL; -PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB = NULL; -PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB = NULL; -PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB = NULL; -PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB = NULL; -PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB = NULL; -PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB = NULL; -PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB = NULL; -PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB = NULL; -PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB = NULL; -PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB = NULL; -PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB = NULL; -PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB = NULL; -PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB = NULL; -PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB = NULL; -PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB = NULL; -PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB = NULL; -PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB = NULL; -PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB = NULL; -PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB = NULL; -PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB = NULL; -PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB = NULL; -PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB = NULL; -PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB = NULL; -PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB = NULL; -PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB = NULL; -PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB = NULL; -PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB = NULL; -PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB = NULL; -PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB = NULL; -PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB = NULL; -PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB = NULL; -PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB = NULL; -PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB = NULL; -PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB = NULL; - -PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB = NULL; -PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB = NULL; -PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB = NULL; - -PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB = NULL; -PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB = NULL; -PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB = NULL; -PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB = NULL; -PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB = NULL; -PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB = NULL; -PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB = NULL; -PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB = NULL; -PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB = NULL; -PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB = NULL; -PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB = NULL; -PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB = NULL; -PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB = NULL; -PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB = NULL; -PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB = NULL; -PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB = NULL; - -PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI = NULL; - -PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI = NULL; -PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI = NULL; -PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI = NULL; - -PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI = NULL; -PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI = NULL; -PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI = NULL; -PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI = NULL; - -PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI = NULL; -PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI = NULL; -PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI = NULL; -PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI = NULL; -PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI = NULL; -PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI = NULL; -PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI = NULL; -PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI = NULL; -PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI = NULL; -PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI = NULL; -PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI = NULL; -PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI = NULL; -PFNGLSAMPLEMAPATIPROC __glewSampleMapATI = NULL; -PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI = NULL; - -PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI = NULL; -PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI = NULL; - -PFNGLPNTRIANGLESFATIPROC __glPNTrianglewesfATI = NULL; -PFNGLPNTRIANGLESIATIPROC __glPNTrianglewesiATI = NULL; - -PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI = NULL; -PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI = NULL; - -PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI = NULL; -PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI = NULL; -PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI = NULL; -PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI = NULL; -PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI = NULL; -PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI = NULL; -PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI = NULL; -PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI = NULL; -PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI = NULL; -PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI = NULL; -PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI = NULL; -PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI = NULL; - -PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI = NULL; -PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI = NULL; -PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI = NULL; - -PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI = NULL; -PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI = NULL; -PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI = NULL; -PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI = NULL; -PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI = NULL; -PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI = NULL; -PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI = NULL; -PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI = NULL; -PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI = NULL; -PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI = NULL; -PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI = NULL; -PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI = NULL; -PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI = NULL; -PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI = NULL; -PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI = NULL; -PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI = NULL; -PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI = NULL; -PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI = NULL; -PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI = NULL; -PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI = NULL; -PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI = NULL; -PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI = NULL; -PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI = NULL; -PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI = NULL; -PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI = NULL; -PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI = NULL; -PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI = NULL; -PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI = NULL; -PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI = NULL; -PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI = NULL; -PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI = NULL; -PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI = NULL; -PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI = NULL; -PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI = NULL; -PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI = NULL; -PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI = NULL; -PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI = NULL; - -PFNGLGETUNIFORMBUFFERSIZEEXTPROC __glewGetUniformBufferSizeEXT = NULL; -PFNGLGETUNIFORMOFFSETEXTPROC __glewGetUniformOffsetEXT = NULL; -PFNGLUNIFORMBUFFEREXTPROC __glewUniformBufferEXT = NULL; - -PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT = NULL; - -PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT = NULL; - -PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT = NULL; - -PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT = NULL; - -PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT = NULL; -PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT = NULL; - -PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT = NULL; -PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT = NULL; - -PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT = NULL; -PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT = NULL; -PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT = NULL; -PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT = NULL; -PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT = NULL; -PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT = NULL; -PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT = NULL; -PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT = NULL; -PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT = NULL; -PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT = NULL; -PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT = NULL; -PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT = NULL; -PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT = NULL; - -PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT = NULL; -PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT = NULL; - -PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT = NULL; -PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT = NULL; -PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT = NULL; -PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT = NULL; -PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT = NULL; - -PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT = NULL; -PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT = NULL; - -PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT = NULL; - -PFNGLBINDMULTITEXTUREEXTPROC __glewBindMultiTextureEXT = NULL; -PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC __glewCheckNamedFramebufferStatusEXT = NULL; -PFNGLCLIENTATTRIBDEFAULTEXTPROC __glewClientAttribDefaultEXT = NULL; -PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC __glewCompressedMultiTexImage1DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC __glewCompressedMultiTexImage2DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC __glewCompressedMultiTexImage3DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC __glewCompressedMultiTexSubImage1DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC __glewCompressedMultiTexSubImage2DEXT = NULL; -PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC __glewCompressedMultiTexSubImage3DEXT = NULL; -PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC __glewCompressedTextureImage1DEXT = NULL; -PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC __glewCompressedTextureImage2DEXT = NULL; -PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC __glewCompressedTextureImage3DEXT = NULL; -PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC __glewCompressedTextureSubImage1DEXT = NULL; -PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC __glewCompressedTextureSubImage2DEXT = NULL; -PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC __glewCompressedTextureSubImage3DEXT = NULL; -PFNGLCOPYMULTITEXIMAGE1DEXTPROC __glewCopyMultiTexImage1DEXT = NULL; -PFNGLCOPYMULTITEXIMAGE2DEXTPROC __glewCopyMultiTexImage2DEXT = NULL; -PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC __glewCopyMultiTexSubImage1DEXT = NULL; -PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC __glewCopyMultiTexSubImage2DEXT = NULL; -PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC __glewCopyMultiTexSubImage3DEXT = NULL; -PFNGLCOPYTEXTUREIMAGE1DEXTPROC __glewCopyTextureImage1DEXT = NULL; -PFNGLCOPYTEXTUREIMAGE2DEXTPROC __glewCopyTextureImage2DEXT = NULL; -PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC __glewCopyTextureSubImage1DEXT = NULL; -PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC __glewCopyTextureSubImage2DEXT = NULL; -PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC __glewCopyTextureSubImage3DEXT = NULL; -PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC __glewDisableClientStateIndexedEXT = NULL; -PFNGLENABLECLIENTSTATEINDEXEDEXTPROC __glewEnableClientStateIndexedEXT = NULL; -PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC __glewFramebufferDrawBufferEXT = NULL; -PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC __glewFramebufferDrawBuffersEXT = NULL; -PFNGLFRAMEBUFFERREADBUFFEREXTPROC __glewFramebufferReadBufferEXT = NULL; -PFNGLGENERATEMULTITEXMIPMAPEXTPROC __glewGenerateMultiTexMipmapEXT = NULL; -PFNGLGENERATETEXTUREMIPMAPEXTPROC __glewGenerateTextureMipmapEXT = NULL; -PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC __glewGetCompressedMultiTexImageEXT = NULL; -PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC __glewGetCompressedTextureImageEXT = NULL; -PFNGLGETDOUBLEINDEXEDVEXTPROC __glewGetDoubleIndexedvEXT = NULL; -PFNGLGETFLOATINDEXEDVEXTPROC __glewGetFloatIndexedvEXT = NULL; -PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC __glewGetFramebufferParameterivEXT = NULL; -PFNGLGETMULTITEXENVFVEXTPROC __glewGetMultiTexEnvfvEXT = NULL; -PFNGLGETMULTITEXENVIVEXTPROC __glewGetMultiTexEnvivEXT = NULL; -PFNGLGETMULTITEXGENDVEXTPROC __glewGetMultiTexGendvEXT = NULL; -PFNGLGETMULTITEXGENFVEXTPROC __glewGetMultiTexGenfvEXT = NULL; -PFNGLGETMULTITEXGENIVEXTPROC __glewGetMultiTexGenivEXT = NULL; -PFNGLGETMULTITEXIMAGEEXTPROC __glewGetMultiTexImageEXT = NULL; -PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC __glewGetMultiTexLevelParameterfvEXT = NULL; -PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC __glewGetMultiTexLevelParameterivEXT = NULL; -PFNGLGETMULTITEXPARAMETERIIVEXTPROC __glewGetMultiTexParameterIivEXT = NULL; -PFNGLGETMULTITEXPARAMETERIUIVEXTPROC __glewGetMultiTexParameterIuivEXT = NULL; -PFNGLGETMULTITEXPARAMETERFVEXTPROC __glewGetMultiTexParameterfvEXT = NULL; -PFNGLGETMULTITEXPARAMETERIVEXTPROC __glewGetMultiTexParameterivEXT = NULL; -PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC __glewGetNamedBufferParameterivEXT = NULL; -PFNGLGETNAMEDBUFFERPOINTERVEXTPROC __glewGetNamedBufferPointervEXT = NULL; -PFNGLGETNAMEDBUFFERSUBDATAEXTPROC __glewGetNamedBufferSubDataEXT = NULL; -PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetNamedFramebufferAttachmentParameterivEXT = NULL; -PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC __glewGetNamedProgramLocalParameterIivEXT = NULL; -PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC __glewGetNamedProgramLocalParameterIuivEXT = NULL; -PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC __glewGetNamedProgramLocalParameterdvEXT = NULL; -PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC __glewGetNamedProgramLocalParameterfvEXT = NULL; -PFNGLGETNAMEDPROGRAMSTRINGEXTPROC __glewGetNamedProgramStringEXT = NULL; -PFNGLGETNAMEDPROGRAMIVEXTPROC __glewGetNamedProgramivEXT = NULL; -PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC __glewGetNamedRenderbufferParameterivEXT = NULL; -PFNGLGETPOINTERINDEXEDVEXTPROC __glewGetPointerIndexedvEXT = NULL; -PFNGLGETTEXTUREIMAGEEXTPROC __glewGetTextureImageEXT = NULL; -PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC __glewGetTextureLevelParameterfvEXT = NULL; -PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC __glewGetTextureLevelParameterivEXT = NULL; -PFNGLGETTEXTUREPARAMETERIIVEXTPROC __glewGetTextureParameterIivEXT = NULL; -PFNGLGETTEXTUREPARAMETERIUIVEXTPROC __glewGetTextureParameterIuivEXT = NULL; -PFNGLGETTEXTUREPARAMETERFVEXTPROC __glewGetTextureParameterfvEXT = NULL; -PFNGLGETTEXTUREPARAMETERIVEXTPROC __glewGetTextureParameterivEXT = NULL; -PFNGLMAPNAMEDBUFFEREXTPROC __glewMapNamedBufferEXT = NULL; -PFNGLMATRIXFRUSTUMEXTPROC __glewMatrixFrustumEXT = NULL; -PFNGLMATRIXLOADIDENTITYEXTPROC __glewMatrixLoadIdentityEXT = NULL; -PFNGLMATRIXLOADTRANSPOSEDEXTPROC __glewMatrixLoadTransposedEXT = NULL; -PFNGLMATRIXLOADTRANSPOSEFEXTPROC __glewMatrixLoadTransposefEXT = NULL; -PFNGLMATRIXLOADDEXTPROC __glewMatrixLoaddEXT = NULL; -PFNGLMATRIXLOADFEXTPROC __glewMatrixLoadfEXT = NULL; -PFNGLMATRIXMULTTRANSPOSEDEXTPROC __glewMatrixMultTransposedEXT = NULL; -PFNGLMATRIXMULTTRANSPOSEFEXTPROC __glewMatrixMultTransposefEXT = NULL; -PFNGLMATRIXMULTDEXTPROC __glewMatrixMultdEXT = NULL; -PFNGLMATRIXMULTFEXTPROC __glewMatrixMultfEXT = NULL; -PFNGLMATRIXORTHOEXTPROC __glewMatrixOrthoEXT = NULL; -PFNGLMATRIXPOPEXTPROC __glewMatrixPopEXT = NULL; -PFNGLMATRIXPUSHEXTPROC __glewMatrixPushEXT = NULL; -PFNGLMATRIXROTATEDEXTPROC __glewMatrixRotatedEXT = NULL; -PFNGLMATRIXROTATEFEXTPROC __glewMatrixRotatefEXT = NULL; -PFNGLMATRIXSCALEDEXTPROC __glewMatrixScaledEXT = NULL; -PFNGLMATRIXSCALEFEXTPROC __glewMatrixScalefEXT = NULL; -PFNGLMATRIXTRANSLATEDEXTPROC __glewMatrixTranslatedEXT = NULL; -PFNGLMATRIXTRANSLATEFEXTPROC __glewMatrixTranslatefEXT = NULL; -PFNGLMULTITEXBUFFEREXTPROC __glewMultiTexBufferEXT = NULL; -PFNGLMULTITEXCOORDPOINTEREXTPROC __glewMultiTexCoordPointerEXT = NULL; -PFNGLMULTITEXENVFEXTPROC __glewMultiTexEnvfEXT = NULL; -PFNGLMULTITEXENVFVEXTPROC __glewMultiTexEnvfvEXT = NULL; -PFNGLMULTITEXENVIEXTPROC __glewMultiTexEnviEXT = NULL; -PFNGLMULTITEXENVIVEXTPROC __glewMultiTexEnvivEXT = NULL; -PFNGLMULTITEXGENDEXTPROC __glewMultiTexGendEXT = NULL; -PFNGLMULTITEXGENDVEXTPROC __glewMultiTexGendvEXT = NULL; -PFNGLMULTITEXGENFEXTPROC __glewMultiTexGenfEXT = NULL; -PFNGLMULTITEXGENFVEXTPROC __glewMultiTexGenfvEXT = NULL; -PFNGLMULTITEXGENIEXTPROC __glewMultiTexGeniEXT = NULL; -PFNGLMULTITEXGENIVEXTPROC __glewMultiTexGenivEXT = NULL; -PFNGLMULTITEXIMAGE1DEXTPROC __glewMultiTexImage1DEXT = NULL; -PFNGLMULTITEXIMAGE2DEXTPROC __glewMultiTexImage2DEXT = NULL; -PFNGLMULTITEXIMAGE3DEXTPROC __glewMultiTexImage3DEXT = NULL; -PFNGLMULTITEXPARAMETERIIVEXTPROC __glewMultiTexParameterIivEXT = NULL; -PFNGLMULTITEXPARAMETERIUIVEXTPROC __glewMultiTexParameterIuivEXT = NULL; -PFNGLMULTITEXPARAMETERFEXTPROC __glewMultiTexParameterfEXT = NULL; -PFNGLMULTITEXPARAMETERFVEXTPROC __glewMultiTexParameterfvEXT = NULL; -PFNGLMULTITEXPARAMETERIEXTPROC __glewMultiTexParameteriEXT = NULL; -PFNGLMULTITEXPARAMETERIVEXTPROC __glewMultiTexParameterivEXT = NULL; -PFNGLMULTITEXRENDERBUFFEREXTPROC __glewMultiTexRenderbufferEXT = NULL; -PFNGLMULTITEXSUBIMAGE1DEXTPROC __glewMultiTexSubImage1DEXT = NULL; -PFNGLMULTITEXSUBIMAGE2DEXTPROC __glewMultiTexSubImage2DEXT = NULL; -PFNGLMULTITEXSUBIMAGE3DEXTPROC __glewMultiTexSubImage3DEXT = NULL; -PFNGLNAMEDBUFFERDATAEXTPROC __glewNamedBufferDataEXT = NULL; -PFNGLNAMEDBUFFERSUBDATAEXTPROC __glewNamedBufferSubDataEXT = NULL; -PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC __glewNamedFramebufferRenderbufferEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC __glewNamedFramebufferTexture1DEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC __glewNamedFramebufferTexture2DEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC __glewNamedFramebufferTexture3DEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC __glewNamedFramebufferTextureEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC __glewNamedFramebufferTextureFaceEXT = NULL; -PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC __glewNamedFramebufferTextureLayerEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC __glewNamedProgramLocalParameter4dEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC __glewNamedProgramLocalParameter4dvEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC __glewNamedProgramLocalParameter4fEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC __glewNamedProgramLocalParameter4fvEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC __glewNamedProgramLocalParameterI4iEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC __glewNamedProgramLocalParameterI4ivEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC __glewNamedProgramLocalParameterI4uiEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC __glewNamedProgramLocalParameterI4uivEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC __glewNamedProgramLocalParameters4fvEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC __glewNamedProgramLocalParametersI4ivEXT = NULL; -PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC __glewNamedProgramLocalParametersI4uivEXT = NULL; -PFNGLNAMEDPROGRAMSTRINGEXTPROC __glewNamedProgramStringEXT = NULL; -PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC __glewNamedRenderbufferStorageEXT = NULL; -PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC __glewNamedRenderbufferStorageMultisampleCoverageEXT = NULL; -PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewNamedRenderbufferStorageMultisampleEXT = NULL; -PFNGLPROGRAMUNIFORM1FEXTPROC __glewProgramUniform1fEXT = NULL; -PFNGLPROGRAMUNIFORM1FVEXTPROC __glewProgramUniform1fvEXT = NULL; -PFNGLPROGRAMUNIFORM1IEXTPROC __glewProgramUniform1iEXT = NULL; -PFNGLPROGRAMUNIFORM1IVEXTPROC __glewProgramUniform1ivEXT = NULL; -PFNGLPROGRAMUNIFORM1UIEXTPROC __glewProgramUniform1uiEXT = NULL; -PFNGLPROGRAMUNIFORM1UIVEXTPROC __glewProgramUniform1uivEXT = NULL; -PFNGLPROGRAMUNIFORM2FEXTPROC __glewProgramUniform2fEXT = NULL; -PFNGLPROGRAMUNIFORM2FVEXTPROC __glewProgramUniform2fvEXT = NULL; -PFNGLPROGRAMUNIFORM2IEXTPROC __glewProgramUniform2iEXT = NULL; -PFNGLPROGRAMUNIFORM2IVEXTPROC __glewProgramUniform2ivEXT = NULL; -PFNGLPROGRAMUNIFORM2UIEXTPROC __glewProgramUniform2uiEXT = NULL; -PFNGLPROGRAMUNIFORM2UIVEXTPROC __glewProgramUniform2uivEXT = NULL; -PFNGLPROGRAMUNIFORM3FEXTPROC __glewProgramUniform3fEXT = NULL; -PFNGLPROGRAMUNIFORM3FVEXTPROC __glewProgramUniform3fvEXT = NULL; -PFNGLPROGRAMUNIFORM3IEXTPROC __glewProgramUniform3iEXT = NULL; -PFNGLPROGRAMUNIFORM3IVEXTPROC __glewProgramUniform3ivEXT = NULL; -PFNGLPROGRAMUNIFORM3UIEXTPROC __glewProgramUniform3uiEXT = NULL; -PFNGLPROGRAMUNIFORM3UIVEXTPROC __glewProgramUniform3uivEXT = NULL; -PFNGLPROGRAMUNIFORM4FEXTPROC __glewProgramUniform4fEXT = NULL; -PFNGLPROGRAMUNIFORM4FVEXTPROC __glewProgramUniform4fvEXT = NULL; -PFNGLPROGRAMUNIFORM4IEXTPROC __glewProgramUniform4iEXT = NULL; -PFNGLPROGRAMUNIFORM4IVEXTPROC __glewProgramUniform4ivEXT = NULL; -PFNGLPROGRAMUNIFORM4UIEXTPROC __glewProgramUniform4uiEXT = NULL; -PFNGLPROGRAMUNIFORM4UIVEXTPROC __glewProgramUniform4uivEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC __glewProgramUniformMatrix2fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __glewProgramUniformMatrix2x3fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __glewProgramUniformMatrix2x4fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC __glewProgramUniformMatrix3fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __glewProgramUniformMatrix3x2fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __glewProgramUniformMatrix3x4fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __glewProgramUniformMatrix4x2fvEXT = NULL; -PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __glewProgramUniformMatrix4x3fvEXT = NULL; -PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC __glewPushClientAttribDefaultEXT = NULL; -PFNGLTEXTUREBUFFEREXTPROC __glewTextureBufferEXT = NULL; -PFNGLTEXTUREIMAGE1DEXTPROC __glewTextureImage1DEXT = NULL; -PFNGLTEXTUREIMAGE2DEXTPROC __glewTextureImage2DEXT = NULL; -PFNGLTEXTUREIMAGE3DEXTPROC __glewTextureImage3DEXT = NULL; -PFNGLTEXTUREPARAMETERIIVEXTPROC __glewTextureParameterIivEXT = NULL; -PFNGLTEXTUREPARAMETERIUIVEXTPROC __glewTextureParameterIuivEXT = NULL; -PFNGLTEXTUREPARAMETERFEXTPROC __glewTextureParameterfEXT = NULL; -PFNGLTEXTUREPARAMETERFVEXTPROC __glewTextureParameterfvEXT = NULL; -PFNGLTEXTUREPARAMETERIEXTPROC __glewTextureParameteriEXT = NULL; -PFNGLTEXTUREPARAMETERIVEXTPROC __glewTextureParameterivEXT = NULL; -PFNGLTEXTURERENDERBUFFEREXTPROC __glewTextureRenderbufferEXT = NULL; -PFNGLTEXTURESUBIMAGE1DEXTPROC __glewTextureSubImage1DEXT = NULL; -PFNGLTEXTURESUBIMAGE2DEXTPROC __glewTextureSubImage2DEXT = NULL; -PFNGLTEXTURESUBIMAGE3DEXTPROC __glewTextureSubImage3DEXT = NULL; -PFNGLUNMAPNAMEDBUFFEREXTPROC __glewUnmapNamedBufferEXT = NULL; - -PFNGLCOLORMASKINDEXEDEXTPROC __glewColorMaskIndexedEXT = NULL; -PFNGLDISABLEINDEXEDEXTPROC __glewDisableIndexedEXT = NULL; -PFNGLENABLEINDEXEDEXTPROC __glewEnableIndexedEXT = NULL; -PFNGLGETBOOLEANINDEXEDVEXTPROC __glewGetBooleanIndexedvEXT = NULL; -PFNGLGETINTEGERINDEXEDVEXTPROC __glewGetIntegerIndexedvEXT = NULL; -PFNGLISENABLEDINDEXEDEXTPROC __glewIsEnabledIndexedEXT = NULL; - -PFNGLDRAWARRAYSINSTANCEDEXTPROC __glewDrawArraysInstancedEXT = NULL; -PFNGLDRAWELEMENTSINSTANCEDEXTPROC __glewDrawElementsInstancedEXT = NULL; - -PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT = NULL; - -PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT = NULL; -PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT = NULL; -PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT = NULL; -PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT = NULL; -PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT = NULL; - -PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT = NULL; -PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT = NULL; -PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT = NULL; -PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT = NULL; -PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT = NULL; -PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT = NULL; -PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT = NULL; -PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT = NULL; -PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT = NULL; -PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT = NULL; -PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT = NULL; -PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT = NULL; -PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT = NULL; -PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT = NULL; -PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT = NULL; -PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT = NULL; -PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT = NULL; -PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT = NULL; - -PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT = NULL; - -PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT = NULL; - -PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT = NULL; -PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT = NULL; -PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT = NULL; -PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT = NULL; -PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT = NULL; -PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT = NULL; -PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT = NULL; -PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT = NULL; -PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT = NULL; -PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT = NULL; -PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT = NULL; -PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT = NULL; -PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT = NULL; -PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT = NULL; -PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT = NULL; -PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT = NULL; -PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT = NULL; - -PFNGLFRAMEBUFFERTEXTUREEXTPROC __glewFramebufferTextureEXT = NULL; -PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC __glewFramebufferTextureFaceEXT = NULL; -PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC __glewFramebufferTextureLayerEXT = NULL; -PFNGLPROGRAMPARAMETERIEXTPROC __glewProgramParameteriEXT = NULL; - -PFNGLPROGRAMENVPARAMETERS4FVEXTPROC __glewProgramEnvParameters4fvEXT = NULL; -PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC __glewProgramLocalParameters4fvEXT = NULL; - -PFNGLBINDFRAGDATALOCATIONEXTPROC __glewBindFragDataLocationEXT = NULL; -PFNGLGETFRAGDATALOCATIONEXTPROC __glewGetFragDataLocationEXT = NULL; -PFNGLGETUNIFORMUIVEXTPROC __glewGetUniformuivEXT = NULL; -PFNGLGETVERTEXATTRIBIIVEXTPROC __glewGetVertexAttribIivEXT = NULL; -PFNGLGETVERTEXATTRIBIUIVEXTPROC __glewGetVertexAttribIuivEXT = NULL; -PFNGLUNIFORM1UIEXTPROC __glewUniform1uiEXT = NULL; -PFNGLUNIFORM1UIVEXTPROC __glewUniform1uivEXT = NULL; -PFNGLUNIFORM2UIEXTPROC __glewUniform2uiEXT = NULL; -PFNGLUNIFORM2UIVEXTPROC __glewUniform2uivEXT = NULL; -PFNGLUNIFORM3UIEXTPROC __glewUniform3uiEXT = NULL; -PFNGLUNIFORM3UIVEXTPROC __glewUniform3uivEXT = NULL; -PFNGLUNIFORM4UIEXTPROC __glewUniform4uiEXT = NULL; -PFNGLUNIFORM4UIVEXTPROC __glewUniform4uivEXT = NULL; -PFNGLVERTEXATTRIBI1IEXTPROC __glewVertexAttribI1iEXT = NULL; -PFNGLVERTEXATTRIBI1IVEXTPROC __glewVertexAttribI1ivEXT = NULL; -PFNGLVERTEXATTRIBI1UIEXTPROC __glewVertexAttribI1uiEXT = NULL; -PFNGLVERTEXATTRIBI1UIVEXTPROC __glewVertexAttribI1uivEXT = NULL; -PFNGLVERTEXATTRIBI2IEXTPROC __glewVertexAttribI2iEXT = NULL; -PFNGLVERTEXATTRIBI2IVEXTPROC __glewVertexAttribI2ivEXT = NULL; -PFNGLVERTEXATTRIBI2UIEXTPROC __glewVertexAttribI2uiEXT = NULL; -PFNGLVERTEXATTRIBI2UIVEXTPROC __glewVertexAttribI2uivEXT = NULL; -PFNGLVERTEXATTRIBI3IEXTPROC __glewVertexAttribI3iEXT = NULL; -PFNGLVERTEXATTRIBI3IVEXTPROC __glewVertexAttribI3ivEXT = NULL; -PFNGLVERTEXATTRIBI3UIEXTPROC __glewVertexAttribI3uiEXT = NULL; -PFNGLVERTEXATTRIBI3UIVEXTPROC __glewVertexAttribI3uivEXT = NULL; -PFNGLVERTEXATTRIBI4BVEXTPROC __glewVertexAttribI4bvEXT = NULL; -PFNGLVERTEXATTRIBI4IEXTPROC __glewVertexAttribI4iEXT = NULL; -PFNGLVERTEXATTRIBI4IVEXTPROC __glewVertexAttribI4ivEXT = NULL; -PFNGLVERTEXATTRIBI4SVEXTPROC __glewVertexAttribI4svEXT = NULL; -PFNGLVERTEXATTRIBI4UBVEXTPROC __glewVertexAttribI4ubvEXT = NULL; -PFNGLVERTEXATTRIBI4UIEXTPROC __glewVertexAttribI4uiEXT = NULL; -PFNGLVERTEXATTRIBI4UIVEXTPROC __glewVertexAttribI4uivEXT = NULL; -PFNGLVERTEXATTRIBI4USVEXTPROC __glewVertexAttribI4usvEXT = NULL; -PFNGLVERTEXATTRIBIPOINTEREXTPROC __glewVertexAttribIPointerEXT = NULL; - -PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT = NULL; -PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT = NULL; -PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT = NULL; -PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT = NULL; -PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT = NULL; -PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT = NULL; -PFNGLHISTOGRAMEXTPROC __glewHistogramEXT = NULL; -PFNGLMINMAXEXTPROC __glewMinmaxEXT = NULL; -PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT = NULL; -PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT = NULL; - -PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT = NULL; - -PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT = NULL; - -PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT = NULL; -PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT = NULL; -PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT = NULL; - -PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT = NULL; -PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT = NULL; - -PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT = NULL; -PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT = NULL; - -PFNGLCOLORTABLEEXTPROC __glewColorTableEXT = NULL; -PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT = NULL; -PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT = NULL; -PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT = NULL; - -PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT = NULL; -PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT = NULL; -PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT = NULL; -PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT = NULL; -PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT = NULL; -PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT = NULL; - -PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT = NULL; -PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT = NULL; - -PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT = NULL; - -PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT = NULL; -PFNGLENDSCENEEXTPROC __glewEndSceneEXT = NULL; - -PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT = NULL; -PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT = NULL; -PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT = NULL; -PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT = NULL; -PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT = NULL; -PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT = NULL; -PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT = NULL; -PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT = NULL; -PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT = NULL; -PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT = NULL; -PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT = NULL; -PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT = NULL; -PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT = NULL; -PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT = NULL; -PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT = NULL; -PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT = NULL; -PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT = NULL; - -PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT = NULL; - -PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT = NULL; -PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT = NULL; -PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT = NULL; - -PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT = NULL; - -PFNGLTEXBUFFEREXTPROC __glewTexBufferEXT = NULL; - -PFNGLCLEARCOLORIIEXTPROC __glewClearColorIiEXT = NULL; -PFNGLCLEARCOLORIUIEXTPROC __glewClearColorIuiEXT = NULL; -PFNGLGETTEXPARAMETERIIVEXTPROC __glewGetTexParameterIivEXT = NULL; -PFNGLGETTEXPARAMETERIUIVEXTPROC __glewGetTexParameterIuivEXT = NULL; -PFNGLTEXPARAMETERIIVEXTPROC __glewTexParameterIivEXT = NULL; -PFNGLTEXPARAMETERIUIVEXTPROC __glewTexParameterIuivEXT = NULL; - -PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT = NULL; -PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT = NULL; -PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT = NULL; -PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT = NULL; -PFNGLISTEXTUREEXTPROC __glewIsTextureEXT = NULL; -PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT = NULL; - -PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT = NULL; - -//PFNGLGETQUERYOBJECTI64VEXTPROC __glewGetQueryObjecti64vEXT = NULL; -//PFNGLGETQUERYOBJECTUI64VEXTPROC __glewGetQueryObjectui64vEXT = NULL; - -PFNGLBEGINTRANSFORMFEEDBACKEXTPROC __glewBeginTransformFeedbackEXT = NULL; -PFNGLBINDBUFFERBASEEXTPROC __glewBindBufferBaseEXT = NULL; -PFNGLBINDBUFFEROFFSETEXTPROC __glewBindBufferOffsetEXT = NULL; -PFNGLBINDBUFFERRANGEEXTPROC __glewBindBufferRangeEXT = NULL; -PFNGLENDTRANSFORMFEEDBACKEXTPROC __glewEndTransformFeedbackEXT = NULL; -PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC __glewGetTransformFeedbackVaryingEXT = NULL; -PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC __glewTransformFeedbackVaryingsEXT = NULL; - -PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT = NULL; -PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT = NULL; -PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT = NULL; -PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT = NULL; -PFNGLGETPOINTERVEXTPROC __glewGetPointervEXT = NULL; -PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT = NULL; -PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT = NULL; -PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT = NULL; -PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT = NULL; - -PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT = NULL; -PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT = NULL; -PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT = NULL; -PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT = NULL; -PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT = NULL; -PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT = NULL; -PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT = NULL; -PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT = NULL; -PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT = NULL; -PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT = NULL; -PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT = NULL; -PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT = NULL; -PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT = NULL; -PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT = NULL; -PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT = NULL; -PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT = NULL; -PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT = NULL; -PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT = NULL; -PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT = NULL; -PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT = NULL; -PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT = NULL; -PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT = NULL; -PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT = NULL; -PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT = NULL; -PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT = NULL; -PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT = NULL; -PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT = NULL; -PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT = NULL; -PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT = NULL; -PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT = NULL; -PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT = NULL; -PFNGLSWIZZLEEXTPROC __glewSwizzleEXT = NULL; -PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT = NULL; -PFNGLVARIANTBVEXTPROC __glewVariantbvEXT = NULL; -PFNGLVARIANTDVEXTPROC __glewVariantdvEXT = NULL; -PFNGLVARIANTFVEXTPROC __glewVariantfvEXT = NULL; -PFNGLVARIANTIVEXTPROC __glewVariantivEXT = NULL; -PFNGLVARIANTSVEXTPROC __glewVariantsvEXT = NULL; -PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT = NULL; -PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT = NULL; -PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT = NULL; -PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT = NULL; - -PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT = NULL; -PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT = NULL; -PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT = NULL; - -PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY = NULL; - -PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY = NULL; - -PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP = NULL; -PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP = NULL; -PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP = NULL; -PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP = NULL; -PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP = NULL; -PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP = NULL; - -PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM = NULL; -PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM = NULL; - -PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM = NULL; -PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM = NULL; -PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM = NULL; -PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM = NULL; -PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM = NULL; -PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM = NULL; -PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM = NULL; -PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM = NULL; - -PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL = NULL; -PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL = NULL; -PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL = NULL; -PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL = NULL; - -PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL = NULL; -PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL = NULL; - -PFNGLBUFFERREGIONENABLEDEXTPROC __glewBufferRegionEnabledEXT = NULL; -PFNGLDELETEBUFFERREGIONEXTPROC __glewDeleteBufferRegionEXT = NULL; -PFNGLDRAWBUFFERREGIONEXTPROC __glewDrawBufferRegionEXT = NULL; -PFNGLNEWBUFFERREGIONEXTPROC __glewNewBufferRegionEXT = NULL; -PFNGLREADBUFFERREGIONEXTPROC __glewReadBufferRegionEXT = NULL; - -PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA = NULL; - -PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA = NULL; -PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA = NULL; -PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA = NULL; -PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA = NULL; -PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA = NULL; -PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA = NULL; -PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA = NULL; -PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA = NULL; -PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA = NULL; -PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA = NULL; -PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA = NULL; -PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA = NULL; -PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA = NULL; -PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA = NULL; -PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA = NULL; -PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA = NULL; -PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA = NULL; -PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA = NULL; -PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA = NULL; -PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA = NULL; -PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA = NULL; -PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA = NULL; -PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA = NULL; -PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA = NULL; - -PFNGLBEGINCONDITIONALRENDERNVPROC __glewBeginConditionalRenderNV = NULL; -PFNGLENDCONDITIONALRENDERNVPROC __glewEndConditionalRenderNV = NULL; - -PFNGLCLEARDEPTHDNVPROC __glewClearDepthdNV = NULL; -PFNGLDEPTHBOUNDSDNVPROC __glewDepthBoundsdNV = NULL; -PFNGLDEPTHRANGEDNVPROC __glewDepthRangedNV = NULL; - -PFNGLEVALMAPSNVPROC __glewEvalMapsNV = NULL; -PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV = NULL; -PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV = NULL; -PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV = NULL; -PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV = NULL; -PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV = NULL; -PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV = NULL; -PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV = NULL; -PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV = NULL; - -PFNGLGETMULTISAMPLEFVNVPROC __glewGetMultisamplefvNV = NULL; -PFNGLSAMPLEMASKINDEXEDNVPROC __glewSampleMaskIndexedNV = NULL; -PFNGLTEXRENDERBUFFERNVPROC __glewTexRenderbufferNV = NULL; - -PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV = NULL; -PFNGLFINISHFENCENVPROC __glewFinishFenceNV = NULL; -PFNGLGENFENCESNVPROC __glewGenFencesNV = NULL; -PFNGLGETFENCEIVNVPROC __glewGetFenceivNV = NULL; -PFNGLISFENCENVPROC __glewIsFenceNV = NULL; -PFNGLSETFENCENVPROC __glewSetFenceNV = NULL; -PFNGLTESTFENCENVPROC __glewTestFenceNV = NULL; - -PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV = NULL; -PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV = NULL; -PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV = NULL; -PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV = NULL; -PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV = NULL; -PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV = NULL; - -PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC __glewRenderbufferStorageMultisampleCoverageNV = NULL; - -PFNGLPROGRAMVERTEXLIMITNVPROC __glewProgramVertexLimitNV = NULL; - -PFNGLPROGRAMENVPARAMETERI4INVPROC __glewProgramEnvParameterI4iNV = NULL; -PFNGLPROGRAMENVPARAMETERI4IVNVPROC __glewProgramEnvParameterI4ivNV = NULL; -PFNGLPROGRAMENVPARAMETERI4UINVPROC __glewProgramEnvParameterI4uiNV = NULL; -PFNGLPROGRAMENVPARAMETERI4UIVNVPROC __glewProgramEnvParameterI4uivNV = NULL; -PFNGLPROGRAMENVPARAMETERSI4IVNVPROC __glewProgramEnvParametersI4ivNV = NULL; -PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC __glewProgramEnvParametersI4uivNV = NULL; -PFNGLPROGRAMLOCALPARAMETERI4INVPROC __glewProgramLocalParameterI4iNV = NULL; -PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC __glewProgramLocalParameterI4ivNV = NULL; -PFNGLPROGRAMLOCALPARAMETERI4UINVPROC __glewProgramLocalParameterI4uiNV = NULL; -PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC __glewProgramLocalParameterI4uivNV = NULL; -PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC __glewProgramLocalParametersI4ivNV = NULL; -PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC __glewProgramLocalParametersI4uivNV = NULL; - -PFNGLCOLOR3HNVPROC __glewColor3hNV = NULL; -PFNGLCOLOR3HVNVPROC __glewColor3hvNV = NULL; -PFNGLCOLOR4HNVPROC __glewColor4hNV = NULL; -PFNGLCOLOR4HVNVPROC __glewColor4hvNV = NULL; -PFNGLFOGCOORDHNVPROC __glewFogCoordhNV = NULL; -PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV = NULL; -PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV = NULL; -PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV = NULL; -PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV = NULL; -PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV = NULL; -PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV = NULL; -PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV = NULL; -PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV = NULL; -PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV = NULL; -PFNGLNORMAL3HNVPROC __glewNormal3hNV = NULL; -PFNGLNORMAL3HVNVPROC __glewNormal3hvNV = NULL; -PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV = NULL; -PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV = NULL; -PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV = NULL; -PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV = NULL; -PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV = NULL; -PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV = NULL; -PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV = NULL; -PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV = NULL; -PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV = NULL; -PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV = NULL; -PFNGLVERTEX2HNVPROC __glewVertex2hNV = NULL; -PFNGLVERTEX2HVNVPROC __glewVertex2hvNV = NULL; -PFNGLVERTEX3HNVPROC __glewVertex3hNV = NULL; -PFNGLVERTEX3HVNVPROC __glewVertex3hvNV = NULL; -PFNGLVERTEX4HNVPROC __glewVertex4hNV = NULL; -PFNGLVERTEX4HVNVPROC __glewVertex4hvNV = NULL; -PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV = NULL; -PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV = NULL; -PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV = NULL; -PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV = NULL; -PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV = NULL; -PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV = NULL; -PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV = NULL; -PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV = NULL; -PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV = NULL; -PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV = NULL; -PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV = NULL; -PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV = NULL; -PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV = NULL; -PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV = NULL; - -PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV = NULL; -PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV = NULL; -PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV = NULL; -PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV = NULL; -PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV = NULL; -PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV = NULL; -PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV = NULL; - -PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC __glewProgramBufferParametersIivNV = NULL; -PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC __glewProgramBufferParametersIuivNV = NULL; -PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC __glewProgramBufferParametersfvNV = NULL; - -PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV = NULL; -PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV = NULL; - -PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV = NULL; -PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV = NULL; - -//PFNGLGETVIDEOI64VNVPROC __glewGetVideoi64vNV = NULL; -PFNGLGETVIDEOIVNVPROC __glewGetVideoivNV = NULL; -//PFNGLGETVIDEOUI64VNVPROC __glewGetVideoui64vNV = NULL; -PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV = NULL; -//PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV = NULL; -//PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV = NULL; -PFNGLVIDEOPARAMETERIVNVPROC __glewVideoParameterivNV = NULL; - -PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV = NULL; -PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV = NULL; - -PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV = NULL; -PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV = NULL; -PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV = NULL; -PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV = NULL; -PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV = NULL; -PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV = NULL; -PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV = NULL; -PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV = NULL; -PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV = NULL; -PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV = NULL; -PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV = NULL; -PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV = NULL; -PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV = NULL; - -PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV = NULL; -PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV = NULL; - -PFNGLACTIVEVARYINGNVPROC __glewActiveVaryingNV = NULL; -PFNGLBEGINTRANSFORMFEEDBACKNVPROC __glewBeginTransformFeedbackNV = NULL; -PFNGLBINDBUFFERBASENVPROC __glewBindBufferBaseNV = NULL; -PFNGLBINDBUFFEROFFSETNVPROC __glewBindBufferOffsetNV = NULL; -PFNGLBINDBUFFERRANGENVPROC __glewBindBufferRangeNV = NULL; -PFNGLENDTRANSFORMFEEDBACKNVPROC __glewEndTransformFeedbackNV = NULL; -PFNGLGETACTIVEVARYINGNVPROC __glewGetActiveVaryingNV = NULL; -PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC __glewGetTransformFeedbackVaryingNV = NULL; -PFNGLGETVARYINGLOCATIONNVPROC __glewGetVaryingLocationNV = NULL; -PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC __glewTransformFeedbackAttribsNV = NULL; -PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC __glewTransformFeedbackVaryingsNV = NULL; - -PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV = NULL; -PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV = NULL; - -PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV = NULL; -PFNGLBINDPROGRAMNVPROC __glewBindProgramNV = NULL; -PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV = NULL; -PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV = NULL; -PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV = NULL; -PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV = NULL; -PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV = NULL; -PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV = NULL; -PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV = NULL; -PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV = NULL; -PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV = NULL; -PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV = NULL; -PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV = NULL; -PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV = NULL; -PFNGLISPROGRAMNVPROC __glewIsProgramNV = NULL; -PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV = NULL; -PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV = NULL; -PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV = NULL; -PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV = NULL; -PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV = NULL; -PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV = NULL; -PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV = NULL; -PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV = NULL; -PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV = NULL; -PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV = NULL; -PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV = NULL; -PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV = NULL; -PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV = NULL; -PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV = NULL; -PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV = NULL; -PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV = NULL; -PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV = NULL; -PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV = NULL; -PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV = NULL; -PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV = NULL; -PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV = NULL; -PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV = NULL; -PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV = NULL; -PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV = NULL; -PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV = NULL; -PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV = NULL; -PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV = NULL; -PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV = NULL; -PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV = NULL; -PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV = NULL; -PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV = NULL; -PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV = NULL; -PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV = NULL; -PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV = NULL; -PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV = NULL; -PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV = NULL; -PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV = NULL; -PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV = NULL; -PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV = NULL; -PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV = NULL; -PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV = NULL; -PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV = NULL; -PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV = NULL; -PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV = NULL; -PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV = NULL; -PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV = NULL; -PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV = NULL; -PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV = NULL; -PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV = NULL; - -PFNGLCLEARDEPTHFOESPROC __glewClearDepthfOES = NULL; -PFNGLCLIPPLANEFOESPROC __glewClipPlanefOES = NULL; -PFNGLDEPTHRANGEFOESPROC __glewDepthRangefOES = NULL; -PFNGLFRUSTUMFOESPROC __glewFrustumfOES = NULL; -PFNGLGETCLIPPLANEFOESPROC __glewGetClipPlanefOES = NULL; -PFNGLORTHOFOESPROC __glewOrthofOES = NULL; - -PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS = NULL; -PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS = NULL; - -PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS = NULL; -PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS = NULL; - -PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS = NULL; -PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS = NULL; - -PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS = NULL; -PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS = NULL; - -PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS = NULL; -PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS = NULL; - -PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS = NULL; -PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS = NULL; - -PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX = NULL; -PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX = NULL; -PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX = NULL; -PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX = NULL; -PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX = NULL; -PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX = NULL; - -PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX = NULL; - -PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX = NULL; - -PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX = NULL; -PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX = NULL; -PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX = NULL; -PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX = NULL; -PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX = NULL; -PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX = NULL; -PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX = NULL; -PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX = NULL; -PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX = NULL; -PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX = NULL; -PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX = NULL; -PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX = NULL; -PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX = NULL; -PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX = NULL; -PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX = NULL; -PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX = NULL; -PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX = NULL; - -PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX = NULL; - -PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX = NULL; - -PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX = NULL; - -PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX = NULL; -PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX = NULL; -PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX = NULL; -PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX = NULL; - -PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX = NULL; - -PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI = NULL; -PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI = NULL; -PFNGLCOLORTABLESGIPROC __glewColorTableSGI = NULL; -PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI = NULL; -PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI = NULL; -PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI = NULL; -PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI = NULL; - -PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX = NULL; - -PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN = NULL; -PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN = NULL; -PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN = NULL; -PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN = NULL; -PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN = NULL; -PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN = NULL; -PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN = NULL; -PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN = NULL; - -PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN = NULL; - -PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN = NULL; -PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN = NULL; -PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN = NULL; -PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN = NULL; -PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN = NULL; -PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN = NULL; -PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN = NULL; - -PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN = NULL; -PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN = NULL; -PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN = NULL; -PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN = NULL; -PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN = NULL; -PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN = NULL; -PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN = NULL; -PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN = NULL; -PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN = NULL; -PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN = NULL; -PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN = NULL; -PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN = NULL; -PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN = NULL; -PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN = NULL; -PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN = NULL; -PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN = NULL; -PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN = NULL; -PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN = NULL; -PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN = NULL; -PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN = NULL; -PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN = NULL; -PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN = NULL; -PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN = NULL; -PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN = NULL; -PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN = NULL; -PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN = NULL; - -PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN = NULL; - -#endif /* !WIN32 || !GLEW_MX */ - -#if !defined(GLEW_MX) - -GLboolean __GLEW_VERSION_1_1 = GL_FALSE; -GLboolean __GLEW_VERSION_1_2 = GL_FALSE; -GLboolean __GLEW_VERSION_1_3 = GL_FALSE; -GLboolean __GLEW_VERSION_1_4 = GL_FALSE; -GLboolean __GLEW_VERSION_1_5 = GL_FALSE; -GLboolean __GLEW_VERSION_2_0 = GL_FALSE; -GLboolean __GLEW_VERSION_2_1 = GL_FALSE; -GLboolean __GLEW_VERSION_3_0 = GL_FALSE; -GLboolean __GLEW_3DFX_multisample = GL_FALSE; -GLboolean __GLEW_3DFX_tbuffer = GL_FALSE; -GLboolean __GLEW_3DFX_texture_compression_FXT1 = GL_FALSE; -GLboolean __GLEW_APPLE_client_storage = GL_FALSE; -GLboolean __GLEW_APPLE_element_array = GL_FALSE; -GLboolean __GLEW_APPLE_fence = GL_FALSE; -GLboolean __GLEW_APPLE_float_pixels = GL_FALSE; -GLboolean __GLEW_APPLE_flush_buffer_range = GL_FALSE; -GLboolean __GLEW_APPLE_pixel_buffer = GL_FALSE; -GLboolean __GLEW_APPLE_specular_vector = GL_FALSE; -GLboolean __GLEW_APPLE_texture_range = GL_FALSE; -GLboolean __GLEW_APPLE_transform_hint = GL_FALSE; -GLboolean __GLEW_APPLE_vertex_array_object = GL_FALSE; -GLboolean __GLEW_APPLE_vertex_array_range = GL_FALSE; -GLboolean __GLEW_APPLE_ycbcr_422 = GL_FALSE; -GLboolean __GLEW_ARB_color_buffer_float = GL_FALSE; -GLboolean __GLEW_ARB_depth_buffer_float = GL_FALSE; -GLboolean __GLEW_ARB_depth_texture = GL_FALSE; -GLboolean __GLEW_ARB_draw_buffers = GL_FALSE; -GLboolean __GLEW_ARB_draw_instanced = GL_FALSE; -GLboolean __GLEW_ARB_fragment_program = GL_FALSE; -GLboolean __GLEW_ARB_fragment_program_shadow = GL_FALSE; -GLboolean __GLEW_ARB_fragment_shader = GL_FALSE; -GLboolean __GLEW_ARB_framebuffer_object = GL_FALSE; -GLboolean __GLEW_ARB_framebuffer_sRGB = GL_FALSE; -GLboolean __GLEW_ARB_geometry_shader4 = GL_FALSE; -GLboolean __GLEW_ARB_half_float_pixel = GL_FALSE; -GLboolean __GLEW_ARB_half_float_vertex = GL_FALSE; -GLboolean __GLEW_ARB_imaging = GL_FALSE; -GLboolean __GLEW_ARB_instanced_arrays = GL_FALSE; -GLboolean __GLEW_ARB_map_buffer_range = GL_FALSE; -GLboolean __GLEW_ARB_matrix_palette = GL_FALSE; -GLboolean __GLEW_ARB_multisample = GL_FALSE; -GLboolean __GLEW_ARB_multitexture = GL_FALSE; -GLboolean __GLEW_ARB_occlusion_query = GL_FALSE; -GLboolean __GLEW_ARB_pixel_buffer_object = GL_FALSE; -GLboolean __GLEW_ARB_point_parameters = GL_FALSE; -GLboolean __GLEW_ARB_point_sprite = GL_FALSE; -GLboolean __GLEW_ARB_shader_objects = GL_FALSE; -GLboolean __GLEW_ARB_shading_language_100 = GL_FALSE; -GLboolean __GLEW_ARB_shadow = GL_FALSE; -GLboolean __GLEW_ARB_shadow_ambient = GL_FALSE; -GLboolean __GLEW_ARB_texture_border_clamp = GL_FALSE; -GLboolean __GLEW_ARB_texture_buffer_object = GL_FALSE; -GLboolean __GLEW_ARB_texture_compression = GL_FALSE; -GLboolean __GLEW_ARB_texture_compression_rgtc = GL_FALSE; -GLboolean __GLEW_ARB_texture_cube_map = GL_FALSE; -GLboolean __GLEW_ARB_texture_env_add = GL_FALSE; -GLboolean __GLEW_ARB_texture_env_combine = GL_FALSE; -GLboolean __GLEW_ARB_texture_env_crossbar = GL_FALSE; -GLboolean __GLEW_ARB_texture_env_dot3 = GL_FALSE; -GLboolean __GLEW_ARB_texture_float = GL_FALSE; -GLboolean __GLEW_ARB_texture_mirrored_repeat = GL_FALSE; -GLboolean __GLEW_ARB_texture_non_power_of_two = GL_FALSE; -GLboolean __GLEW_ARB_texture_rectangle = GL_FALSE; -GLboolean __GLEW_ARB_texture_rg = GL_FALSE; -GLboolean __GLEW_ARB_transpose_matrix = GL_FALSE; -GLboolean __GLEW_ARB_vertex_array_object = GL_FALSE; -GLboolean __GLEW_ARB_vertex_blend = GL_FALSE; -GLboolean __GLEW_ARB_vertex_buffer_object = GL_FALSE; -GLboolean __GLEW_ARB_vertex_program = GL_FALSE; -GLboolean __GLEW_ARB_vertex_shader = GL_FALSE; -GLboolean __GLEW_ARB_window_pos = GL_FALSE; -GLboolean __GLEW_ATIX_point_sprites = GL_FALSE; -GLboolean __GLEW_ATIX_texture_env_combine3 = GL_FALSE; -GLboolean __GLEW_ATIX_texture_env_route = GL_FALSE; -GLboolean __GLEW_ATIX_vertex_shader_output_point_size = GL_FALSE; -GLboolean __GLEW_ATI_draw_buffers = GL_FALSE; -GLboolean __GLEW_ATI_element_array = GL_FALSE; -GLboolean __GLEW_ATI_envmap_bumpmap = GL_FALSE; -GLboolean __GLEW_ATI_fragment_shader = GL_FALSE; -GLboolean __GLEW_ATI_map_object_buffer = GL_FALSE; -GLboolean __GLEW_ATI_pn_triangles = GL_FALSE; -GLboolean __GLEW_ATI_separate_stencil = GL_FALSE; -GLboolean __GLEW_ATI_shader_texture_lod = GL_FALSE; -GLboolean __GLEW_ATI_text_fragment_shader = GL_FALSE; -GLboolean __GLEW_ATI_texture_compression_3dc = GL_FALSE; -GLboolean __GLEW_ATI_texture_env_combine3 = GL_FALSE; -GLboolean __GLEW_ATI_texture_float = GL_FALSE; -GLboolean __GLEW_ATI_texture_mirror_once = GL_FALSE; -GLboolean __GLEW_ATI_vertex_array_object = GL_FALSE; -GLboolean __GLEW_ATI_vertex_attrib_array_object = GL_FALSE; -GLboolean __GLEW_ATI_vertex_streams = GL_FALSE; -GLboolean __GLEW_EXT_422_pixels = GL_FALSE; -GLboolean __GLEW_EXT_Cg_shader = GL_FALSE; -GLboolean __GLEW_EXT_abgr = GL_FALSE; -GLboolean __GLEW_EXT_bgra = GL_FALSE; -GLboolean __GLEW_EXT_bindable_uniform = GL_FALSE; -GLboolean __GLEW_EXT_blend_color = GL_FALSE; -GLboolean __GLEW_EXT_blend_equation_separate = GL_FALSE; -GLboolean __GLEW_EXT_blend_func_separate = GL_FALSE; -GLboolean __GLEW_EXT_blend_logic_op = GL_FALSE; -GLboolean __GLEW_EXT_blend_minmax = GL_FALSE; -GLboolean __GLEW_EXT_blend_subtract = GL_FALSE; -GLboolean __GLEW_EXT_clip_volume_hint = GL_FALSE; -GLboolean __GLEW_EXT_cmyka = GL_FALSE; -GLboolean __GLEW_EXT_color_subtable = GL_FALSE; -GLboolean __GLEW_EXT_compiled_vertex_array = GL_FALSE; -GLboolean __GLEW_EXT_convolution = GL_FALSE; -GLboolean __GLEW_EXT_coordinate_frame = GL_FALSE; -GLboolean __GLEW_EXT_copy_texture = GL_FALSE; -GLboolean __GLEW_EXT_cull_vertex = GL_FALSE; -GLboolean __GLEW_EXT_depth_bounds_test = GL_FALSE; -GLboolean __GLEW_EXT_direct_state_access = GL_FALSE; -GLboolean __GLEW_EXT_draw_buffers2 = GL_FALSE; -GLboolean __GLEW_EXT_draw_instanced = GL_FALSE; -GLboolean __GLEW_EXT_draw_range_elements = GL_FALSE; -GLboolean __GLEW_EXT_fog_coord = GL_FALSE; -GLboolean __GLEW_EXT_fragment_lighting = GL_FALSE; -GLboolean __GLEW_EXT_framebuffer_blit = GL_FALSE; -GLboolean __GLEW_EXT_framebuffer_multisample = GL_FALSE; -GLboolean __GLEW_EXT_framebuffer_object = GL_FALSE; -GLboolean __GLEW_EXT_framebuffer_sRGB = GL_FALSE; -GLboolean __GLEW_EXT_geometry_shader4 = GL_FALSE; -GLboolean __GLEW_EXT_gpu_program_parameters = GL_FALSE; -GLboolean __GLEW_EXT_gpu_shader4 = GL_FALSE; -GLboolean __GLEW_EXT_histogram = GL_FALSE; -GLboolean __GLEW_EXT_index_array_formats = GL_FALSE; -GLboolean __GLEW_EXT_index_func = GL_FALSE; -GLboolean __GLEW_EXT_index_material = GL_FALSE; -GLboolean __GLEW_EXT_index_texture = GL_FALSE; -GLboolean __GLEW_EXT_light_texture = GL_FALSE; -GLboolean __GLEW_EXT_misc_attribute = GL_FALSE; -GLboolean __GLEW_EXT_multi_draw_arrays = GL_FALSE; -GLboolean __GLEW_EXT_multisample = GL_FALSE; -GLboolean __GLEW_EXT_packed_depth_stencil = GL_FALSE; -GLboolean __GLEW_EXT_packed_float = GL_FALSE; -GLboolean __GLEW_EXT_packed_pixels = GL_FALSE; -GLboolean __GLEW_EXT_paletted_texture = GL_FALSE; -GLboolean __GLEW_EXT_pixel_buffer_object = GL_FALSE; -GLboolean __GLEW_EXT_pixel_transform = GL_FALSE; -GLboolean __GLEW_EXT_pixel_transform_color_table = GL_FALSE; -GLboolean __GLEW_EXT_point_parameters = GL_FALSE; -GLboolean __GLEW_EXT_polygon_offset = GL_FALSE; -GLboolean __GLEW_EXT_rescale_normal = GL_FALSE; -GLboolean __GLEW_EXT_scene_marker = GL_FALSE; -GLboolean __GLEW_EXT_secondary_color = GL_FALSE; -GLboolean __GLEW_EXT_separate_specular_color = GL_FALSE; -GLboolean __GLEW_EXT_shadow_funcs = GL_FALSE; -GLboolean __GLEW_EXT_shared_texture_palette = GL_FALSE; -GLboolean __GLEW_EXT_stencil_clear_tag = GL_FALSE; -GLboolean __GLEW_EXT_stencil_two_side = GL_FALSE; -GLboolean __GLEW_EXT_stencil_wrap = GL_FALSE; -GLboolean __GLEW_EXT_subtexture = GL_FALSE; -GLboolean __GLEW_EXT_texture = GL_FALSE; -GLboolean __GLEW_EXT_texture3D = GL_FALSE; -GLboolean __GLEW_EXT_texture_array = GL_FALSE; -GLboolean __GLEW_EXT_texture_buffer_object = GL_FALSE; -GLboolean __GLEW_EXT_texture_compression_dxt1 = GL_FALSE; -GLboolean __GLEW_EXT_texture_compression_latc = GL_FALSE; -GLboolean __GLEW_EXT_texture_compression_rgtc = GL_FALSE; -GLboolean __GLEW_EXT_texture_compression_s3tc = GL_FALSE; -GLboolean __GLEW_EXT_texture_cube_map = GL_FALSE; -GLboolean __GLEW_EXT_texture_edge_clamp = GL_FALSE; -GLboolean __GLEW_EXT_texture_env = GL_FALSE; -GLboolean __GLEW_EXT_texture_env_add = GL_FALSE; -GLboolean __GLEW_EXT_texture_env_combine = GL_FALSE; -GLboolean __GLEW_EXT_texture_env_dot3 = GL_FALSE; -GLboolean __GLEW_EXT_texture_filter_anisotropic = GL_FALSE; -GLboolean __GLEW_EXT_texture_integer = GL_FALSE; -GLboolean __GLEW_EXT_texture_lod_bias = GL_FALSE; -GLboolean __GLEW_EXT_texture_mirror_clamp = GL_FALSE; -GLboolean __GLEW_EXT_texture_object = GL_FALSE; -GLboolean __GLEW_EXT_texture_perturb_normal = GL_FALSE; -GLboolean __GLEW_EXT_texture_rectangle = GL_FALSE; -GLboolean __GLEW_EXT_texture_sRGB = GL_FALSE; -GLboolean __GLEW_EXT_texture_shared_exponent = GL_FALSE; -GLboolean __GLEW_EXT_texture_swizzle = GL_FALSE; -GLboolean __GLEW_EXT_timer_query = GL_FALSE; -GLboolean __GLEW_EXT_transform_feedback = GL_FALSE; -GLboolean __GLEW_EXT_vertex_array = GL_FALSE; -GLboolean __GLEW_EXT_vertex_array_bgra = GL_FALSE; -GLboolean __GLEW_EXT_vertex_shader = GL_FALSE; -GLboolean __GLEW_EXT_vertex_weighting = GL_FALSE; -GLboolean __GLEW_GREMEDY_frame_terminator = GL_FALSE; -GLboolean __GLEW_GREMEDY_string_marker = GL_FALSE; -GLboolean __GLEW_HP_convolution_border_modes = GL_FALSE; -GLboolean __GLEW_HP_image_transform = GL_FALSE; -GLboolean __GLEW_HP_occlusion_test = GL_FALSE; -GLboolean __GLEW_HP_texture_lighting = GL_FALSE; -GLboolean __GLEW_IBM_cull_vertex = GL_FALSE; -GLboolean __GLEW_IBM_multimode_draw_arrays = GL_FALSE; -GLboolean __GLEW_IBM_rasterpos_clip = GL_FALSE; -GLboolean __GLEW_IBM_static_data = GL_FALSE; -GLboolean __GLEW_IBM_texture_mirrored_repeat = GL_FALSE; -GLboolean __GLEW_IBM_vertex_array_lists = GL_FALSE; -GLboolean __GLEW_INGR_color_clamp = GL_FALSE; -GLboolean __GLEW_INGR_interlace_read = GL_FALSE; -GLboolean __GLEW_INTEL_parallel_arrays = GL_FALSE; -GLboolean __GLEW_INTEL_texture_scissor = GL_FALSE; -GLboolean __GLEW_KTX_buffer_region = GL_FALSE; -GLboolean __GLEW_MESAX_texture_stack = GL_FALSE; -GLboolean __GLEW_MESA_pack_invert = GL_FALSE; -GLboolean __GLEW_MESA_resize_buffers = GL_FALSE; -GLboolean __GLEW_MESA_window_pos = GL_FALSE; -GLboolean __GLEW_MESA_ycbcr_texture = GL_FALSE; -GLboolean __GLEW_NV_blend_square = GL_FALSE; -GLboolean __GLEW_NV_conditional_render = GL_FALSE; -GLboolean __GLEW_NV_copy_depth_to_color = GL_FALSE; -GLboolean __GLEW_NV_depth_buffer_float = GL_FALSE; -GLboolean __GLEW_NV_depth_clamp = GL_FALSE; -GLboolean __GLEW_NV_depth_range_unclamped = GL_FALSE; -GLboolean __GLEW_NV_evaluators = GL_FALSE; -GLboolean __GLEW_NV_explicit_multisample = GL_FALSE; -GLboolean __GLEW_NV_fence = GL_FALSE; -GLboolean __GLEW_NV_float_buffer = GL_FALSE; -GLboolean __GLEW_NV_fog_distance = GL_FALSE; -GLboolean __GLEW_NV_fragment_program = GL_FALSE; -GLboolean __GLEW_NV_fragment_program2 = GL_FALSE; -GLboolean __GLEW_NV_fragment_program4 = GL_FALSE; -GLboolean __GLEW_NV_fragment_program_option = GL_FALSE; -GLboolean __GLEW_NV_framebuffer_multisample_coverage = GL_FALSE; -GLboolean __GLEW_NV_geometry_program4 = GL_FALSE; -GLboolean __GLEW_NV_geometry_shader4 = GL_FALSE; -GLboolean __GLEW_NV_gpu_program4 = GL_FALSE; -GLboolean __GLEW_NV_half_float = GL_FALSE; -GLboolean __GLEW_NV_light_max_exponent = GL_FALSE; -GLboolean __GLEW_NV_multisample_filter_hint = GL_FALSE; -GLboolean __GLEW_NV_occlusion_query = GL_FALSE; -GLboolean __GLEW_NV_packed_depth_stencil = GL_FALSE; -GLboolean __GLEW_NV_parameter_buffer_object = GL_FALSE; -GLboolean __GLEW_NV_pixel_data_range = GL_FALSE; -GLboolean __GLEW_NV_point_sprite = GL_FALSE; -GLboolean __GLEW_NV_present_video = GL_FALSE; -GLboolean __GLEW_NV_primitive_restart = GL_FALSE; -GLboolean __GLEW_NV_register_combiners = GL_FALSE; -GLboolean __GLEW_NV_register_combiners2 = GL_FALSE; -GLboolean __GLEW_NV_texgen_emboss = GL_FALSE; -GLboolean __GLEW_NV_texgen_reflection = GL_FALSE; -GLboolean __GLEW_NV_texture_compression_vtc = GL_FALSE; -GLboolean __GLEW_NV_texture_env_combine4 = GL_FALSE; -GLboolean __GLEW_NV_texture_expand_normal = GL_FALSE; -GLboolean __GLEW_NV_texture_rectangle = GL_FALSE; -GLboolean __GLEW_NV_texture_shader = GL_FALSE; -GLboolean __GLEW_NV_texture_shader2 = GL_FALSE; -GLboolean __GLEW_NV_texture_shader3 = GL_FALSE; -GLboolean __GLEW_NV_transform_feedback = GL_FALSE; -GLboolean __GLEW_NV_vertex_array_range = GL_FALSE; -GLboolean __GLEW_NV_vertex_array_range2 = GL_FALSE; -GLboolean __GLEW_NV_vertex_program = GL_FALSE; -GLboolean __GLEW_NV_vertex_program1_1 = GL_FALSE; -GLboolean __GLEW_NV_vertex_program2 = GL_FALSE; -GLboolean __GLEW_NV_vertex_program2_option = GL_FALSE; -GLboolean __GLEW_NV_vertex_program3 = GL_FALSE; -GLboolean __GLEW_NV_vertex_program4 = GL_FALSE; -GLboolean __GLEW_OES_byte_coordinates = GL_FALSE; -GLboolean __GLEW_OES_compressed_paletted_texture = GL_FALSE; -GLboolean __GLEW_OES_read_format = GL_FALSE; -GLboolean __GLEW_OES_single_precision = GL_FALSE; -GLboolean __GLEW_OML_interlace = GL_FALSE; -GLboolean __GLEW_OML_resample = GL_FALSE; -GLboolean __GLEW_OML_subsample = GL_FALSE; -GLboolean __GLEW_PGI_misc_hints = GL_FALSE; -GLboolean __GLEW_PGI_vertex_hints = GL_FALSE; -GLboolean __GLEW_REND_screen_coordinates = GL_FALSE; -GLboolean __GLEW_S3_s3tc = GL_FALSE; -GLboolean __GLEW_SGIS_color_range = GL_FALSE; -GLboolean __GLEW_SGIS_detail_texture = GL_FALSE; -GLboolean __GLEW_SGIS_fog_function = GL_FALSE; -GLboolean __GLEW_SGIS_generate_mipmap = GL_FALSE; -GLboolean __GLEW_SGIS_multisample = GL_FALSE; -GLboolean __GLEW_SGIS_pixel_texture = GL_FALSE; -GLboolean __GLEW_SGIS_point_line_texgen = GL_FALSE; -GLboolean __GLEW_SGIS_sharpen_texture = GL_FALSE; -GLboolean __GLEW_SGIS_texture4D = GL_FALSE; -GLboolean __GLEW_SGIS_texture_border_clamp = GL_FALSE; -GLboolean __GLEW_SGIS_texture_edge_clamp = GL_FALSE; -GLboolean __GLEW_SGIS_texture_filter4 = GL_FALSE; -GLboolean __GLEW_SGIS_texture_lod = GL_FALSE; -GLboolean __GLEW_SGIS_texture_select = GL_FALSE; -GLboolean __GLEW_SGIX_async = GL_FALSE; -GLboolean __GLEW_SGIX_async_histogram = GL_FALSE; -GLboolean __GLEW_SGIX_async_pixel = GL_FALSE; -GLboolean __GLEW_SGIX_blend_alpha_minmax = GL_FALSE; -GLboolean __GLEW_SGIX_clipmap = GL_FALSE; -GLboolean __GLEW_SGIX_convolution_accuracy = GL_FALSE; -GLboolean __GLEW_SGIX_depth_texture = GL_FALSE; -GLboolean __GLEW_SGIX_flush_raster = GL_FALSE; -GLboolean __GLEW_SGIX_fog_offset = GL_FALSE; -GLboolean __GLEW_SGIX_fog_texture = GL_FALSE; -GLboolean __GLEW_SGIX_fragment_specular_lighting = GL_FALSE; -GLboolean __GLEW_SGIX_framezoom = GL_FALSE; -GLboolean __GLEW_SGIX_interlace = GL_FALSE; -GLboolean __GLEW_SGIX_ir_instrument1 = GL_FALSE; -GLboolean __GLEW_SGIX_list_priority = GL_FALSE; -GLboolean __GLEW_SGIX_pixel_texture = GL_FALSE; -GLboolean __GLEW_SGIX_pixel_texture_bits = GL_FALSE; -GLboolean __GLEW_SGIX_reference_plane = GL_FALSE; -GLboolean __GLEW_SGIX_resample = GL_FALSE; -GLboolean __GLEW_SGIX_shadow = GL_FALSE; -GLboolean __GLEW_SGIX_shadow_ambient = GL_FALSE; -GLboolean __GLEW_SGIX_sprite = GL_FALSE; -GLboolean __GLEW_SGIX_tag_sample_buffer = GL_FALSE; -GLboolean __GLEW_SGIX_texture_add_env = GL_FALSE; -GLboolean __GLEW_SGIX_texture_coordinate_clamp = GL_FALSE; -GLboolean __GLEW_SGIX_texture_lod_bias = GL_FALSE; -GLboolean __GLEW_SGIX_texture_multi_buffer = GL_FALSE; -GLboolean __GLEW_SGIX_texture_range = GL_FALSE; -GLboolean __GLEW_SGIX_texture_scale_bias = GL_FALSE; -GLboolean __GLEW_SGIX_vertex_preclip = GL_FALSE; -GLboolean __GLEW_SGIX_vertex_preclip_hint = GL_FALSE; -GLboolean __GLEW_SGIX_ycrcb = GL_FALSE; -GLboolean __GLEW_SGI_color_matrix = GL_FALSE; -GLboolean __GLEW_SGI_color_table = GL_FALSE; -GLboolean __GLEW_SGI_texture_color_table = GL_FALSE; -GLboolean __GLEW_SUNX_constant_data = GL_FALSE; -GLboolean __GLEW_SUN_convolution_border_modes = GL_FALSE; -GLboolean __GLEW_SUN_global_alpha = GL_FALSE; -GLboolean __GLEW_SUN_mesh_array = GL_FALSE; -GLboolean __GLEW_SUN_read_video_pixels = GL_FALSE; -GLboolean __GLEW_SUN_slice_accum = GL_FALSE; -GLboolean __GLEW_SUN_triangle_list = GL_FALSE; -GLboolean __GLEW_SUN_vertex = GL_FALSE; -GLboolean __GLEW_WIN_phong_shading = GL_FALSE; -GLboolean __GLEW_WIN_specular_fog = GL_FALSE; -GLboolean __GLEW_WIN_swap_hint = GL_FALSE; - -#endif /* !GLEW_MX */ - -#ifdef GL_VERSION_1_2 - -static GLboolean _glewInit_GL_VERSION_1_2 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCopyTexSubImage3D = (PFNGLCOPYTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3D")) == NULL) || r; - r = ((glDrawRangeElements = (PFNGLDRAWRANGEELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElements")) == NULL) || r; - r = ((glTexImage3D = (PFNGLTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexImage3D")) == NULL) || r; - r = ((glTexSubImage3D = (PFNGLTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3D")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_1_2 */ - -#ifdef GL_VERSION_1_3 - -static GLboolean _glewInit_GL_VERSION_1_3 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glActiveTexture = (PFNGLACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glActiveTexture")) == NULL) || r; - r = ((glClientActiveTexture = (PFNGLCLIENTACTIVETEXTUREPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTexture")) == NULL) || r; - r = ((glCompressedTexImage1D = (PFNGLCOMPRESSEDTEXIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1D")) == NULL) || r; - r = ((glCompressedTexImage2D = (PFNGLCOMPRESSEDTEXIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2D")) == NULL) || r; - r = ((glCompressedTexImage3D = (PFNGLCOMPRESSEDTEXIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3D")) == NULL) || r; - r = ((glCompressedTexSubImage1D = (PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1D")) == NULL) || r; - r = ((glCompressedTexSubImage2D = (PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2D")) == NULL) || r; - r = ((glCompressedTexSubImage3D = (PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3D")) == NULL) || r; - r = ((glGetCompressedTexImage = (PFNGLGETCOMPRESSEDTEXIMAGEPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImage")) == NULL) || r; - r = ((glLoadTransposeMatrixd = (PFNGLLOADTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixd")) == NULL) || r; - r = ((glLoadTransposeMatrixf = (PFNGLLOADTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixf")) == NULL) || r; - r = ((glMultTransposeMatrixd = (PFNGLMULTTRANSPOSEMATRIXDPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixd")) == NULL) || r; - r = ((glMultTransposeMatrixf = (PFNGLMULTTRANSPOSEMATRIXFPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixf")) == NULL) || r; - r = ((glMultiTexCoord1d = (PFNGLMULTITEXCOORD1DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1d")) == NULL) || r; - r = ((glMultiTexCoord1dv = (PFNGLMULTITEXCOORD1DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dv")) == NULL) || r; - r = ((glMultiTexCoord1f = (PFNGLMULTITEXCOORD1FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1f")) == NULL) || r; - r = ((glMultiTexCoord1fv = (PFNGLMULTITEXCOORD1FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fv")) == NULL) || r; - r = ((glMultiTexCoord1i = (PFNGLMULTITEXCOORD1IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1i")) == NULL) || r; - r = ((glMultiTexCoord1iv = (PFNGLMULTITEXCOORD1IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iv")) == NULL) || r; - r = ((glMultiTexCoord1s = (PFNGLMULTITEXCOORD1SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1s")) == NULL) || r; - r = ((glMultiTexCoord1sv = (PFNGLMULTITEXCOORD1SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sv")) == NULL) || r; - r = ((glMultiTexCoord2d = (PFNGLMULTITEXCOORD2DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2d")) == NULL) || r; - r = ((glMultiTexCoord2dv = (PFNGLMULTITEXCOORD2DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dv")) == NULL) || r; - r = ((glMultiTexCoord2f = (PFNGLMULTITEXCOORD2FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2f")) == NULL) || r; - r = ((glMultiTexCoord2fv = (PFNGLMULTITEXCOORD2FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fv")) == NULL) || r; - r = ((glMultiTexCoord2i = (PFNGLMULTITEXCOORD2IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2i")) == NULL) || r; - r = ((glMultiTexCoord2iv = (PFNGLMULTITEXCOORD2IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iv")) == NULL) || r; - r = ((glMultiTexCoord2s = (PFNGLMULTITEXCOORD2SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2s")) == NULL) || r; - r = ((glMultiTexCoord2sv = (PFNGLMULTITEXCOORD2SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sv")) == NULL) || r; - r = ((glMultiTexCoord3d = (PFNGLMULTITEXCOORD3DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3d")) == NULL) || r; - r = ((glMultiTexCoord3dv = (PFNGLMULTITEXCOORD3DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dv")) == NULL) || r; - r = ((glMultiTexCoord3f = (PFNGLMULTITEXCOORD3FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3f")) == NULL) || r; - r = ((glMultiTexCoord3fv = (PFNGLMULTITEXCOORD3FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fv")) == NULL) || r; - r = ((glMultiTexCoord3i = (PFNGLMULTITEXCOORD3IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3i")) == NULL) || r; - r = ((glMultiTexCoord3iv = (PFNGLMULTITEXCOORD3IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iv")) == NULL) || r; - r = ((glMultiTexCoord3s = (PFNGLMULTITEXCOORD3SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3s")) == NULL) || r; - r = ((glMultiTexCoord3sv = (PFNGLMULTITEXCOORD3SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sv")) == NULL) || r; - r = ((glMultiTexCoord4d = (PFNGLMULTITEXCOORD4DPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4d")) == NULL) || r; - r = ((glMultiTexCoord4dv = (PFNGLMULTITEXCOORD4DVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dv")) == NULL) || r; - r = ((glMultiTexCoord4f = (PFNGLMULTITEXCOORD4FPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4f")) == NULL) || r; - r = ((glMultiTexCoord4fv = (PFNGLMULTITEXCOORD4FVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fv")) == NULL) || r; - r = ((glMultiTexCoord4i = (PFNGLMULTITEXCOORD4IPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4i")) == NULL) || r; - r = ((glMultiTexCoord4iv = (PFNGLMULTITEXCOORD4IVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iv")) == NULL) || r; - r = ((glMultiTexCoord4s = (PFNGLMULTITEXCOORD4SPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4s")) == NULL) || r; - r = ((glMultiTexCoord4sv = (PFNGLMULTITEXCOORD4SVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sv")) == NULL) || r; - r = ((glSampleCoverage = (PFNGLSAMPLECOVERAGEPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverage")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_1_3 */ - -#ifdef GL_VERSION_1_4 - -static GLboolean _glewInit_GL_VERSION_1_4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendColor = (PFNGLBLENDCOLORPROC)glewGetProcAddress((const GLubyte*)"glBlendColor")) == NULL) || r; - r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r; - r = ((glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparate")) == NULL) || r; - r = ((glFogCoordPointer = (PFNGLFOGCOORDPOINTERPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointer")) == NULL) || r; - r = ((glFogCoordd = (PFNGLFOGCOORDDPROC)glewGetProcAddress((const GLubyte*)"glFogCoordd")) == NULL) || r; - r = ((glFogCoorddv = (PFNGLFOGCOORDDVPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddv")) == NULL) || r; - r = ((glFogCoordf = (PFNGLFOGCOORDFPROC)glewGetProcAddress((const GLubyte*)"glFogCoordf")) == NULL) || r; - r = ((glFogCoordfv = (PFNGLFOGCOORDFVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfv")) == NULL) || r; - r = ((glMultiDrawArrays = (PFNGLMULTIDRAWARRAYSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArrays")) == NULL) || r; - r = ((glMultiDrawElements = (PFNGLMULTIDRAWELEMENTSPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElements")) == NULL) || r; - r = ((glPointParameterf = (PFNGLPOINTPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glPointParameterf")) == NULL) || r; - r = ((glPointParameterfv = (PFNGLPOINTPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfv")) == NULL) || r; - r = ((glPointParameteri = (PFNGLPOINTPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glPointParameteri")) == NULL) || r; - r = ((glPointParameteriv = (PFNGLPOINTPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glPointParameteriv")) == NULL) || r; - r = ((glSecondaryColor3b = (PFNGLSECONDARYCOLOR3BPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3b")) == NULL) || r; - r = ((glSecondaryColor3bv = (PFNGLSECONDARYCOLOR3BVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bv")) == NULL) || r; - r = ((glSecondaryColor3d = (PFNGLSECONDARYCOLOR3DPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3d")) == NULL) || r; - r = ((glSecondaryColor3dv = (PFNGLSECONDARYCOLOR3DVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dv")) == NULL) || r; - r = ((glSecondaryColor3f = (PFNGLSECONDARYCOLOR3FPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3f")) == NULL) || r; - r = ((glSecondaryColor3fv = (PFNGLSECONDARYCOLOR3FVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fv")) == NULL) || r; - r = ((glSecondaryColor3i = (PFNGLSECONDARYCOLOR3IPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3i")) == NULL) || r; - r = ((glSecondaryColor3iv = (PFNGLSECONDARYCOLOR3IVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iv")) == NULL) || r; - r = ((glSecondaryColor3s = (PFNGLSECONDARYCOLOR3SPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3s")) == NULL) || r; - r = ((glSecondaryColor3sv = (PFNGLSECONDARYCOLOR3SVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sv")) == NULL) || r; - r = ((glSecondaryColor3ub = (PFNGLSECONDARYCOLOR3UBPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ub")) == NULL) || r; - r = ((glSecondaryColor3ubv = (PFNGLSECONDARYCOLOR3UBVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubv")) == NULL) || r; - r = ((glSecondaryColor3ui = (PFNGLSECONDARYCOLOR3UIPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ui")) == NULL) || r; - r = ((glSecondaryColor3uiv = (PFNGLSECONDARYCOLOR3UIVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiv")) == NULL) || r; - r = ((glSecondaryColor3us = (PFNGLSECONDARYCOLOR3USPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3us")) == NULL) || r; - r = ((glSecondaryColor3usv = (PFNGLSECONDARYCOLOR3USVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usv")) == NULL) || r; - r = ((glSecondaryColorPointer = (PFNGLSECONDARYCOLORPOINTERPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointer")) == NULL) || r; - r = ((glWindowPos2d = (PFNGLWINDOWPOS2DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2d")) == NULL) || r; - r = ((glWindowPos2dv = (PFNGLWINDOWPOS2DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dv")) == NULL) || r; - r = ((glWindowPos2f = (PFNGLWINDOWPOS2FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2f")) == NULL) || r; - r = ((glWindowPos2fv = (PFNGLWINDOWPOS2FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fv")) == NULL) || r; - r = ((glWindowPos2i = (PFNGLWINDOWPOS2IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2i")) == NULL) || r; - r = ((glWindowPos2iv = (PFNGLWINDOWPOS2IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iv")) == NULL) || r; - r = ((glWindowPos2s = (PFNGLWINDOWPOS2SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2s")) == NULL) || r; - r = ((glWindowPos2sv = (PFNGLWINDOWPOS2SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sv")) == NULL) || r; - r = ((glWindowPos3d = (PFNGLWINDOWPOS3DPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3d")) == NULL) || r; - r = ((glWindowPos3dv = (PFNGLWINDOWPOS3DVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dv")) == NULL) || r; - r = ((glWindowPos3f = (PFNGLWINDOWPOS3FPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3f")) == NULL) || r; - r = ((glWindowPos3fv = (PFNGLWINDOWPOS3FVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fv")) == NULL) || r; - r = ((glWindowPos3i = (PFNGLWINDOWPOS3IPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3i")) == NULL) || r; - r = ((glWindowPos3iv = (PFNGLWINDOWPOS3IVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iv")) == NULL) || r; - r = ((glWindowPos3s = (PFNGLWINDOWPOS3SPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3s")) == NULL) || r; - r = ((glWindowPos3sv = (PFNGLWINDOWPOS3SVPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sv")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_1_4 */ - -#ifdef GL_VERSION_1_5 - -static GLboolean _glewInit_GL_VERSION_1_5 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginQuery = (PFNGLBEGINQUERYPROC)glewGetProcAddress((const GLubyte*)"glBeginQuery")) == NULL) || r; - r = ((glBindBuffer = (PFNGLBINDBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindBuffer")) == NULL) || r; - r = ((glBufferData = (PFNGLBUFFERDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferData")) == NULL) || r; - r = ((glBufferSubData = (PFNGLBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glBufferSubData")) == NULL) || r; - r = ((glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffers")) == NULL) || r; - r = ((glDeleteQueries = (PFNGLDELETEQUERIESPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueries")) == NULL) || r; - r = ((glEndQuery = (PFNGLENDQUERYPROC)glewGetProcAddress((const GLubyte*)"glEndQuery")) == NULL) || r; - r = ((glGenBuffers = (PFNGLGENBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenBuffers")) == NULL) || r; - r = ((glGenQueries = (PFNGLGENQUERIESPROC)glewGetProcAddress((const GLubyte*)"glGenQueries")) == NULL) || r; - r = ((glGetBufferParameteriv = (PFNGLGETBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameteriv")) == NULL) || r; - r = ((glGetBufferPointerv = (PFNGLGETBUFFERPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointerv")) == NULL) || r; - r = ((glGetBufferSubData = (PFNGLGETBUFFERSUBDATAPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubData")) == NULL) || r; - r = ((glGetQueryObjectiv = (PFNGLGETQUERYOBJECTIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectiv")) == NULL) || r; - r = ((glGetQueryObjectuiv = (PFNGLGETQUERYOBJECTUIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuiv")) == NULL) || r; - r = ((glGetQueryiv = (PFNGLGETQUERYIVPROC)glewGetProcAddress((const GLubyte*)"glGetQueryiv")) == NULL) || r; - r = ((glIsBuffer = (PFNGLISBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsBuffer")) == NULL) || r; - r = ((glIsQuery = (PFNGLISQUERYPROC)glewGetProcAddress((const GLubyte*)"glIsQuery")) == NULL) || r; - r = ((glMapBuffer = (PFNGLMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glMapBuffer")) == NULL) || r; - r = ((glUnmapBuffer = (PFNGLUNMAPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glUnmapBuffer")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_1_5 */ - -#ifdef GL_VERSION_2_0 - -static GLboolean _glewInit_GL_VERSION_2_0 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAttachShader = (PFNGLATTACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glAttachShader")) == NULL) || r; - r = ((glBindAttribLocation = (PFNGLBINDATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocation")) == NULL) || r; - r = ((glBlendEquationSeparate = (PFNGLBLENDEQUATIONSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparate")) == NULL) || r; - r = ((glCompileShader = (PFNGLCOMPILESHADERPROC)glewGetProcAddress((const GLubyte*)"glCompileShader")) == NULL) || r; - r = ((glCreateProgram = (PFNGLCREATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glCreateProgram")) == NULL) || r; - r = ((glCreateShader = (PFNGLCREATESHADERPROC)glewGetProcAddress((const GLubyte*)"glCreateShader")) == NULL) || r; - r = ((glDeleteProgram = (PFNGLDELETEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgram")) == NULL) || r; - r = ((glDeleteShader = (PFNGLDELETESHADERPROC)glewGetProcAddress((const GLubyte*)"glDeleteShader")) == NULL) || r; - r = ((glDetachShader = (PFNGLDETACHSHADERPROC)glewGetProcAddress((const GLubyte*)"glDetachShader")) == NULL) || r; - r = ((glDisableVertexAttribArray = (PFNGLDISABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArray")) == NULL) || r; - r = ((glDrawBuffers = (PFNGLDRAWBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffers")) == NULL) || r; - r = ((glEnableVertexAttribArray = (PFNGLENABLEVERTEXATTRIBARRAYPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArray")) == NULL) || r; - r = ((glGetActiveAttrib = (PFNGLGETACTIVEATTRIBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttrib")) == NULL) || r; - r = ((glGetActiveUniform = (PFNGLGETACTIVEUNIFORMPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniform")) == NULL) || r; - r = ((glGetAttachedShaders = (PFNGLGETATTACHEDSHADERSPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedShaders")) == NULL) || r; - r = ((glGetAttribLocation = (PFNGLGETATTRIBLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocation")) == NULL) || r; - r = ((glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetProgramInfoLog")) == NULL) || r; - r = ((glGetProgramiv = (PFNGLGETPROGRAMIVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramiv")) == NULL) || r; - r = ((glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC)glewGetProcAddress((const GLubyte*)"glGetShaderInfoLog")) == NULL) || r; - r = ((glGetShaderSource = (PFNGLGETSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSource")) == NULL) || r; - r = ((glGetShaderiv = (PFNGLGETSHADERIVPROC)glewGetProcAddress((const GLubyte*)"glGetShaderiv")) == NULL) || r; - r = ((glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocation")) == NULL) || r; - r = ((glGetUniformfv = (PFNGLGETUNIFORMFVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfv")) == NULL) || r; - r = ((glGetUniformiv = (PFNGLGETUNIFORMIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformiv")) == NULL) || r; - r = ((glGetVertexAttribPointerv = (PFNGLGETVERTEXATTRIBPOINTERVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointerv")) == NULL) || r; - r = ((glGetVertexAttribdv = (PFNGLGETVERTEXATTRIBDVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdv")) == NULL) || r; - r = ((glGetVertexAttribfv = (PFNGLGETVERTEXATTRIBFVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfv")) == NULL) || r; - r = ((glGetVertexAttribiv = (PFNGLGETVERTEXATTRIBIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribiv")) == NULL) || r; - r = ((glIsProgram = (PFNGLISPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glIsProgram")) == NULL) || r; - r = ((glIsShader = (PFNGLISSHADERPROC)glewGetProcAddress((const GLubyte*)"glIsShader")) == NULL) || r; - r = ((glLinkProgram = (PFNGLLINKPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glLinkProgram")) == NULL) || r; - r = ((glShaderSource = (PFNGLSHADERSOURCEPROC)glewGetProcAddress((const GLubyte*)"glShaderSource")) == NULL) || r; - r = ((glStencilFuncSeparate = (PFNGLSTENCILFUNCSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparate")) == NULL) || r; - r = ((glStencilMaskSeparate = (PFNGLSTENCILMASKSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilMaskSeparate")) == NULL) || r; - r = ((glStencilOpSeparate = (PFNGLSTENCILOPSEPARATEPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparate")) == NULL) || r; - r = ((glUniform1f = (PFNGLUNIFORM1FPROC)glewGetProcAddress((const GLubyte*)"glUniform1f")) == NULL) || r; - r = ((glUniform1fv = (PFNGLUNIFORM1FVPROC)glewGetProcAddress((const GLubyte*)"glUniform1fv")) == NULL) || r; - r = ((glUniform1i = (PFNGLUNIFORM1IPROC)glewGetProcAddress((const GLubyte*)"glUniform1i")) == NULL) || r; - r = ((glUniform1iv = (PFNGLUNIFORM1IVPROC)glewGetProcAddress((const GLubyte*)"glUniform1iv")) == NULL) || r; - r = ((glUniform2f = (PFNGLUNIFORM2FPROC)glewGetProcAddress((const GLubyte*)"glUniform2f")) == NULL) || r; - r = ((glUniform2fv = (PFNGLUNIFORM2FVPROC)glewGetProcAddress((const GLubyte*)"glUniform2fv")) == NULL) || r; - r = ((glUniform2i = (PFNGLUNIFORM2IPROC)glewGetProcAddress((const GLubyte*)"glUniform2i")) == NULL) || r; - r = ((glUniform2iv = (PFNGLUNIFORM2IVPROC)glewGetProcAddress((const GLubyte*)"glUniform2iv")) == NULL) || r; - r = ((glUniform3f = (PFNGLUNIFORM3FPROC)glewGetProcAddress((const GLubyte*)"glUniform3f")) == NULL) || r; - r = ((glUniform3fv = (PFNGLUNIFORM3FVPROC)glewGetProcAddress((const GLubyte*)"glUniform3fv")) == NULL) || r; - r = ((glUniform3i = (PFNGLUNIFORM3IPROC)glewGetProcAddress((const GLubyte*)"glUniform3i")) == NULL) || r; - r = ((glUniform3iv = (PFNGLUNIFORM3IVPROC)glewGetProcAddress((const GLubyte*)"glUniform3iv")) == NULL) || r; - r = ((glUniform4f = (PFNGLUNIFORM4FPROC)glewGetProcAddress((const GLubyte*)"glUniform4f")) == NULL) || r; - r = ((glUniform4fv = (PFNGLUNIFORM4FVPROC)glewGetProcAddress((const GLubyte*)"glUniform4fv")) == NULL) || r; - r = ((glUniform4i = (PFNGLUNIFORM4IPROC)glewGetProcAddress((const GLubyte*)"glUniform4i")) == NULL) || r; - r = ((glUniform4iv = (PFNGLUNIFORM4IVPROC)glewGetProcAddress((const GLubyte*)"glUniform4iv")) == NULL) || r; - r = ((glUniformMatrix2fv = (PFNGLUNIFORMMATRIX2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fv")) == NULL) || r; - r = ((glUniformMatrix3fv = (PFNGLUNIFORMMATRIX3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fv")) == NULL) || r; - r = ((glUniformMatrix4fv = (PFNGLUNIFORMMATRIX4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fv")) == NULL) || r; - r = ((glUseProgram = (PFNGLUSEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glUseProgram")) == NULL) || r; - r = ((glValidateProgram = (PFNGLVALIDATEPROGRAMPROC)glewGetProcAddress((const GLubyte*)"glValidateProgram")) == NULL) || r; - r = ((glVertexAttrib1d = (PFNGLVERTEXATTRIB1DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1d")) == NULL) || r; - r = ((glVertexAttrib1dv = (PFNGLVERTEXATTRIB1DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dv")) == NULL) || r; - r = ((glVertexAttrib1f = (PFNGLVERTEXATTRIB1FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1f")) == NULL) || r; - r = ((glVertexAttrib1fv = (PFNGLVERTEXATTRIB1FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fv")) == NULL) || r; - r = ((glVertexAttrib1s = (PFNGLVERTEXATTRIB1SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1s")) == NULL) || r; - r = ((glVertexAttrib1sv = (PFNGLVERTEXATTRIB1SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sv")) == NULL) || r; - r = ((glVertexAttrib2d = (PFNGLVERTEXATTRIB2DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2d")) == NULL) || r; - r = ((glVertexAttrib2dv = (PFNGLVERTEXATTRIB2DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dv")) == NULL) || r; - r = ((glVertexAttrib2f = (PFNGLVERTEXATTRIB2FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2f")) == NULL) || r; - r = ((glVertexAttrib2fv = (PFNGLVERTEXATTRIB2FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fv")) == NULL) || r; - r = ((glVertexAttrib2s = (PFNGLVERTEXATTRIB2SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2s")) == NULL) || r; - r = ((glVertexAttrib2sv = (PFNGLVERTEXATTRIB2SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sv")) == NULL) || r; - r = ((glVertexAttrib3d = (PFNGLVERTEXATTRIB3DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3d")) == NULL) || r; - r = ((glVertexAttrib3dv = (PFNGLVERTEXATTRIB3DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dv")) == NULL) || r; - r = ((glVertexAttrib3f = (PFNGLVERTEXATTRIB3FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3f")) == NULL) || r; - r = ((glVertexAttrib3fv = (PFNGLVERTEXATTRIB3FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fv")) == NULL) || r; - r = ((glVertexAttrib3s = (PFNGLVERTEXATTRIB3SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3s")) == NULL) || r; - r = ((glVertexAttrib3sv = (PFNGLVERTEXATTRIB3SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sv")) == NULL) || r; - r = ((glVertexAttrib4Nbv = (PFNGLVERTEXATTRIB4NBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nbv")) == NULL) || r; - r = ((glVertexAttrib4Niv = (PFNGLVERTEXATTRIB4NIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Niv")) == NULL) || r; - r = ((glVertexAttrib4Nsv = (PFNGLVERTEXATTRIB4NSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nsv")) == NULL) || r; - r = ((glVertexAttrib4Nub = (PFNGLVERTEXATTRIB4NUBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nub")) == NULL) || r; - r = ((glVertexAttrib4Nubv = (PFNGLVERTEXATTRIB4NUBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nubv")) == NULL) || r; - r = ((glVertexAttrib4Nuiv = (PFNGLVERTEXATTRIB4NUIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nuiv")) == NULL) || r; - r = ((glVertexAttrib4Nusv = (PFNGLVERTEXATTRIB4NUSVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4Nusv")) == NULL) || r; - r = ((glVertexAttrib4bv = (PFNGLVERTEXATTRIB4BVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bv")) == NULL) || r; - r = ((glVertexAttrib4d = (PFNGLVERTEXATTRIB4DPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4d")) == NULL) || r; - r = ((glVertexAttrib4dv = (PFNGLVERTEXATTRIB4DVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dv")) == NULL) || r; - r = ((glVertexAttrib4f = (PFNGLVERTEXATTRIB4FPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4f")) == NULL) || r; - r = ((glVertexAttrib4fv = (PFNGLVERTEXATTRIB4FVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fv")) == NULL) || r; - r = ((glVertexAttrib4iv = (PFNGLVERTEXATTRIB4IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4iv")) == NULL) || r; - r = ((glVertexAttrib4s = (PFNGLVERTEXATTRIB4SPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4s")) == NULL) || r; - r = ((glVertexAttrib4sv = (PFNGLVERTEXATTRIB4SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sv")) == NULL) || r; - r = ((glVertexAttrib4ubv = (PFNGLVERTEXATTRIB4UBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubv")) == NULL) || r; - r = ((glVertexAttrib4uiv = (PFNGLVERTEXATTRIB4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uiv")) == NULL) || r; - r = ((glVertexAttrib4usv = (PFNGLVERTEXATTRIB4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usv")) == NULL) || r; - r = ((glVertexAttribPointer = (PFNGLVERTEXATTRIBPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointer")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_2_0 */ - -#ifdef GL_VERSION_2_1 - -static GLboolean _glewInit_GL_VERSION_2_1 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glUniformMatrix2x3fv = (PFNGLUNIFORMMATRIX2X3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x3fv")) == NULL) || r; - r = ((glUniformMatrix2x4fv = (PFNGLUNIFORMMATRIX2X4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2x4fv")) == NULL) || r; - r = ((glUniformMatrix3x2fv = (PFNGLUNIFORMMATRIX3X2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x2fv")) == NULL) || r; - r = ((glUniformMatrix3x4fv = (PFNGLUNIFORMMATRIX3X4FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3x4fv")) == NULL) || r; - r = ((glUniformMatrix4x2fv = (PFNGLUNIFORMMATRIX4X2FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x2fv")) == NULL) || r; - r = ((glUniformMatrix4x3fv = (PFNGLUNIFORMMATRIX4X3FVPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4x3fv")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_2_1 */ - -#ifdef GL_VERSION_3_0 - -static GLboolean _glewInit_GL_VERSION_3_0 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginConditionalRender = (PFNGLBEGINCONDITIONALRENDERPROC)glewGetProcAddress((const GLubyte*)"glBeginConditionalRender")) == NULL) || r; - r = ((glBeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedback")) == NULL) || r; - r = ((glBindBufferBase = (PFNGLBINDBUFFERBASEPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBase")) == NULL) || r; - r = ((glBindBufferRange = (PFNGLBINDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRange")) == NULL) || r; - r = ((glBindFragDataLocation = (PFNGLBINDFRAGDATALOCATIONPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocation")) == NULL) || r; - r = ((glClampColor = (PFNGLCLAMPCOLORPROC)glewGetProcAddress((const GLubyte*)"glClampColor")) == NULL) || r; - r = ((glClearBufferfi = (PFNGLCLEARBUFFERFIPROC)glewGetProcAddress((const GLubyte*)"glClearBufferfi")) == NULL) || r; - r = ((glClearBufferfv = (PFNGLCLEARBUFFERFVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferfv")) == NULL) || r; - r = ((glClearBufferiv = (PFNGLCLEARBUFFERIVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferiv")) == NULL) || r; - r = ((glClearBufferuiv = (PFNGLCLEARBUFFERUIVPROC)glewGetProcAddress((const GLubyte*)"glClearBufferuiv")) == NULL) || r; - r = ((glColorMaski = (PFNGLCOLORMASKIPROC)glewGetProcAddress((const GLubyte*)"glColorMaski")) == NULL) || r; - r = ((glDisablei = (PFNGLDISABLEIPROC)glewGetProcAddress((const GLubyte*)"glDisablei")) == NULL) || r; - r = ((glEnablei = (PFNGLENABLEIPROC)glewGetProcAddress((const GLubyte*)"glEnablei")) == NULL) || r; - r = ((glEndConditionalRender = (PFNGLENDCONDITIONALRENDERPROC)glewGetProcAddress((const GLubyte*)"glEndConditionalRender")) == NULL) || r; - r = ((glEndTransformFeedback = (PFNGLENDTRANSFORMFEEDBACKPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedback")) == NULL) || r; - r = ((glGetBooleani_v = (PFNGLGETBOOLEANI_VPROC)glewGetProcAddress((const GLubyte*)"glGetBooleani_v")) == NULL) || r; - r = ((glGetFragDataLocation = (PFNGLGETFRAGDATALOCATIONPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataLocation")) == NULL) || r; - r = ((glGetIntegeri_v = (PFNGLGETINTEGERI_VPROC)glewGetProcAddress((const GLubyte*)"glGetIntegeri_v")) == NULL) || r; - r = ((glGetStringi = (PFNGLGETSTRINGIPROC)glewGetProcAddress((const GLubyte*)"glGetStringi")) == NULL) || r; - r = ((glGetTexParameterIiv = (PFNGLGETTEXPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIiv")) == NULL) || r; - r = ((glGetTexParameterIuiv = (PFNGLGETTEXPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIuiv")) == NULL) || r; - r = ((glGetTransformFeedbackVarying = (PFNGLGETTRANSFORMFEEDBACKVARYINGPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVarying")) == NULL) || r; - r = ((glGetUniformuiv = (PFNGLGETUNIFORMUIVPROC)glewGetProcAddress((const GLubyte*)"glGetUniformuiv")) == NULL) || r; - r = ((glGetVertexAttribIiv = (PFNGLGETVERTEXATTRIBIIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIiv")) == NULL) || r; - r = ((glGetVertexAttribIuiv = (PFNGLGETVERTEXATTRIBIUIVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIuiv")) == NULL) || r; - r = ((glIsEnabledi = (PFNGLISENABLEDIPROC)glewGetProcAddress((const GLubyte*)"glIsEnabledi")) == NULL) || r; - r = ((glTexParameterIiv = (PFNGLTEXPARAMETERIIVPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIiv")) == NULL) || r; - r = ((glTexParameterIuiv = (PFNGLTEXPARAMETERIUIVPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIuiv")) == NULL) || r; - r = ((glTransformFeedbackVaryings = (PFNGLTRANSFORMFEEDBACKVARYINGSPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryings")) == NULL) || r; - r = ((glUniform1ui = (PFNGLUNIFORM1UIPROC)glewGetProcAddress((const GLubyte*)"glUniform1ui")) == NULL) || r; - r = ((glUniform1uiv = (PFNGLUNIFORM1UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform1uiv")) == NULL) || r; - r = ((glUniform2ui = (PFNGLUNIFORM2UIPROC)glewGetProcAddress((const GLubyte*)"glUniform2ui")) == NULL) || r; - r = ((glUniform2uiv = (PFNGLUNIFORM2UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform2uiv")) == NULL) || r; - r = ((glUniform3ui = (PFNGLUNIFORM3UIPROC)glewGetProcAddress((const GLubyte*)"glUniform3ui")) == NULL) || r; - r = ((glUniform3uiv = (PFNGLUNIFORM3UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform3uiv")) == NULL) || r; - r = ((glUniform4ui = (PFNGLUNIFORM4UIPROC)glewGetProcAddress((const GLubyte*)"glUniform4ui")) == NULL) || r; - r = ((glUniform4uiv = (PFNGLUNIFORM4UIVPROC)glewGetProcAddress((const GLubyte*)"glUniform4uiv")) == NULL) || r; - r = ((glVertexAttribI1i = (PFNGLVERTEXATTRIBI1IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1i")) == NULL) || r; - r = ((glVertexAttribI1iv = (PFNGLVERTEXATTRIBI1IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1iv")) == NULL) || r; - r = ((glVertexAttribI1ui = (PFNGLVERTEXATTRIBI1UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1ui")) == NULL) || r; - r = ((glVertexAttribI1uiv = (PFNGLVERTEXATTRIBI1UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uiv")) == NULL) || r; - r = ((glVertexAttribI2i = (PFNGLVERTEXATTRIBI2IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2i")) == NULL) || r; - r = ((glVertexAttribI2iv = (PFNGLVERTEXATTRIBI2IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2iv")) == NULL) || r; - r = ((glVertexAttribI2ui = (PFNGLVERTEXATTRIBI2UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2ui")) == NULL) || r; - r = ((glVertexAttribI2uiv = (PFNGLVERTEXATTRIBI2UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uiv")) == NULL) || r; - r = ((glVertexAttribI3i = (PFNGLVERTEXATTRIBI3IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3i")) == NULL) || r; - r = ((glVertexAttribI3iv = (PFNGLVERTEXATTRIBI3IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3iv")) == NULL) || r; - r = ((glVertexAttribI3ui = (PFNGLVERTEXATTRIBI3UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3ui")) == NULL) || r; - r = ((glVertexAttribI3uiv = (PFNGLVERTEXATTRIBI3UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uiv")) == NULL) || r; - r = ((glVertexAttribI4bv = (PFNGLVERTEXATTRIBI4BVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4bv")) == NULL) || r; - r = ((glVertexAttribI4i = (PFNGLVERTEXATTRIBI4IPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4i")) == NULL) || r; - r = ((glVertexAttribI4iv = (PFNGLVERTEXATTRIBI4IVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4iv")) == NULL) || r; - r = ((glVertexAttribI4sv = (PFNGLVERTEXATTRIBI4SVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4sv")) == NULL) || r; - r = ((glVertexAttribI4ubv = (PFNGLVERTEXATTRIBI4UBVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ubv")) == NULL) || r; - r = ((glVertexAttribI4ui = (PFNGLVERTEXATTRIBI4UIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ui")) == NULL) || r; - r = ((glVertexAttribI4uiv = (PFNGLVERTEXATTRIBI4UIVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uiv")) == NULL) || r; - r = ((glVertexAttribI4usv = (PFNGLVERTEXATTRIBI4USVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4usv")) == NULL) || r; - r = ((glVertexAttribIPointer = (PFNGLVERTEXATTRIBIPOINTERPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIPointer")) == NULL) || r; - - return r; -} - -#endif /* GL_VERSION_3_0 */ - -#ifdef GL_3DFX_multisample - -#endif /* GL_3DFX_multisample */ - -#ifdef GL_3DFX_tbuffer - -static GLboolean _glewInit_GL_3DFX_tbuffer (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTbufferMask3DFX = (PFNGLTBUFFERMASK3DFXPROC)glewGetProcAddress((const GLubyte*)"glTbufferMask3DFX")) == NULL) || r; - - return r; -} - -#endif /* GL_3DFX_tbuffer */ - -#ifdef GL_3DFX_texture_compression_FXT1 - -#endif /* GL_3DFX_texture_compression_FXT1 */ - -#ifdef GL_APPLE_client_storage - -#endif /* GL_APPLE_client_storage */ - -#ifdef GL_APPLE_element_array - -static GLboolean _glewInit_GL_APPLE_element_array (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawElementArrayAPPLE = (PFNGLDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayAPPLE")) == NULL) || r; - r = ((glDrawRangeElementArrayAPPLE = (PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayAPPLE")) == NULL) || r; - r = ((glElementPointerAPPLE = (PFNGLELEMENTPOINTERAPPLEPROC)glewGetProcAddress((const GLubyte*)"glElementPointerAPPLE")) == NULL) || r; - r = ((glMultiDrawElementArrayAPPLE = (PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementArrayAPPLE")) == NULL) || r; - r = ((glMultiDrawRangeElementArrayAPPLE = (PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawRangeElementArrayAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_element_array */ - -#ifdef GL_APPLE_fence - -static GLboolean _glewInit_GL_APPLE_fence (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDeleteFencesAPPLE = (PFNGLDELETEFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesAPPLE")) == NULL) || r; - r = ((glFinishFenceAPPLE = (PFNGLFINISHFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceAPPLE")) == NULL) || r; - r = ((glFinishObjectAPPLE = (PFNGLFINISHOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFinishObjectAPPLE")) == NULL) || r; - r = ((glGenFencesAPPLE = (PFNGLGENFENCESAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenFencesAPPLE")) == NULL) || r; - r = ((glIsFenceAPPLE = (PFNGLISFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsFenceAPPLE")) == NULL) || r; - r = ((glSetFenceAPPLE = (PFNGLSETFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glSetFenceAPPLE")) == NULL) || r; - r = ((glTestFenceAPPLE = (PFNGLTESTFENCEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestFenceAPPLE")) == NULL) || r; - r = ((glTestObjectAPPLE = (PFNGLTESTOBJECTAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTestObjectAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_fence */ - -#ifdef GL_APPLE_float_pixels - -#endif /* GL_APPLE_float_pixels */ - -#ifdef GL_APPLE_flush_buffer_range - -static GLboolean _glewInit_GL_APPLE_flush_buffer_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBufferParameteriAPPLE = (PFNGLBUFFERPARAMETERIAPPLEPROC)glewGetProcAddress((const GLubyte*)"glBufferParameteriAPPLE")) == NULL) || r; - r = ((glFlushMappedBufferRangeAPPLE = (PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedBufferRangeAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_flush_buffer_range */ - -#ifdef GL_APPLE_pixel_buffer - -#endif /* GL_APPLE_pixel_buffer */ - -#ifdef GL_APPLE_specular_vector - -#endif /* GL_APPLE_specular_vector */ - -#ifdef GL_APPLE_texture_range - -static GLboolean _glewInit_GL_APPLE_texture_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetTexParameterPointervAPPLE = (PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterPointervAPPLE")) == NULL) || r; - r = ((glTextureRangeAPPLE = (PFNGLTEXTURERANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glTextureRangeAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_texture_range */ - -#ifdef GL_APPLE_transform_hint - -#endif /* GL_APPLE_transform_hint */ - -#ifdef GL_APPLE_vertex_array_object - -static GLboolean _glewInit_GL_APPLE_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindVertexArrayAPPLE = (PFNGLBINDVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArrayAPPLE")) == NULL) || r; - r = ((glDeleteVertexArraysAPPLE = (PFNGLDELETEVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArraysAPPLE")) == NULL) || r; - r = ((glGenVertexArraysAPPLE = (PFNGLGENVERTEXARRAYSAPPLEPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArraysAPPLE")) == NULL) || r; - r = ((glIsVertexArrayAPPLE = (PFNGLISVERTEXARRAYAPPLEPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArrayAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_vertex_array_object */ - -#ifdef GL_APPLE_vertex_array_range - -static GLboolean _glewInit_GL_APPLE_vertex_array_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushVertexArrayRangeAPPLE = (PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeAPPLE")) == NULL) || r; - r = ((glVertexArrayParameteriAPPLE = (PFNGLVERTEXARRAYPARAMETERIAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayParameteriAPPLE")) == NULL) || r; - r = ((glVertexArrayRangeAPPLE = (PFNGLVERTEXARRAYRANGEAPPLEPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeAPPLE")) == NULL) || r; - - return r; -} - -#endif /* GL_APPLE_vertex_array_range */ - -#ifdef GL_APPLE_ycbcr_422 - -#endif /* GL_APPLE_ycbcr_422 */ - -#ifdef GL_ARB_color_buffer_float - -static GLboolean _glewInit_GL_ARB_color_buffer_float (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClampColorARB = (PFNGLCLAMPCOLORARBPROC)glewGetProcAddress((const GLubyte*)"glClampColorARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_color_buffer_float */ - -#ifdef GL_ARB_depth_buffer_float - -#endif /* GL_ARB_depth_buffer_float */ - -#ifdef GL_ARB_depth_texture - -#endif /* GL_ARB_depth_texture */ - -#ifdef GL_ARB_draw_buffers - -static GLboolean _glewInit_GL_ARB_draw_buffers (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawBuffersARB = (PFNGLDRAWBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_draw_buffers */ - -#ifdef GL_ARB_draw_instanced - -static GLboolean _glewInit_GL_ARB_draw_instanced (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawArraysInstancedARB = (PFNGLDRAWARRAYSINSTANCEDARBPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedARB")) == NULL) || r; - r = ((glDrawElementsInstancedARB = (PFNGLDRAWELEMENTSINSTANCEDARBPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_draw_instanced */ - -#ifdef GL_ARB_fragment_program - -#endif /* GL_ARB_fragment_program */ - -#ifdef GL_ARB_fragment_program_shadow - -#endif /* GL_ARB_fragment_program_shadow */ - -#ifdef GL_ARB_fragment_shader - -#endif /* GL_ARB_fragment_shader */ - -#ifdef GL_ARB_framebuffer_object - -static GLboolean _glewInit_GL_ARB_framebuffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindFramebuffer = (PFNGLBINDFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindFramebuffer")) == NULL) || r; - r = ((glBindRenderbuffer = (PFNGLBINDRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBindRenderbuffer")) == NULL) || r; - r = ((glBlitFramebuffer = (PFNGLBLITFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebuffer")) == NULL) || r; - r = ((glCheckFramebufferStatus = (PFNGLCHECKFRAMEBUFFERSTATUSPROC)glewGetProcAddress((const GLubyte*)"glCheckFramebufferStatus")) == NULL) || r; - r = ((glDeleteFramebuffers = (PFNGLDELETEFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffers")) == NULL) || r; - r = ((glDeleteRenderbuffers = (PFNGLDELETERENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffers")) == NULL) || r; - r = ((glFramebufferRenderbuffer = (PFNGLFRAMEBUFFERRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbuffer")) == NULL) || r; - r = ((glFramebufferTexturLayer = (PFNGLFRAMEBUFFERTEXTURLAYERPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexturLayer")) == NULL) || r; - r = ((glFramebufferTexture1D = (PFNGLFRAMEBUFFERTEXTURE1DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1D")) == NULL) || r; - r = ((glFramebufferTexture2D = (PFNGLFRAMEBUFFERTEXTURE2DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2D")) == NULL) || r; - r = ((glFramebufferTexture3D = (PFNGLFRAMEBUFFERTEXTURE3DPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3D")) == NULL) || r; - r = ((glGenFramebuffers = (PFNGLGENFRAMEBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenFramebuffers")) == NULL) || r; - r = ((glGenRenderbuffers = (PFNGLGENRENDERBUFFERSPROC)glewGetProcAddress((const GLubyte*)"glGenRenderbuffers")) == NULL) || r; - r = ((glGenerateMipmap = (PFNGLGENERATEMIPMAPPROC)glewGetProcAddress((const GLubyte*)"glGenerateMipmap")) == NULL) || r; - r = ((glGetFramebufferAttachmentParameteriv = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferAttachmentParameteriv")) == NULL) || r; - r = ((glGetRenderbufferParameteriv = (PFNGLGETRENDERBUFFERPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetRenderbufferParameteriv")) == NULL) || r; - r = ((glIsFramebuffer = (PFNGLISFRAMEBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsFramebuffer")) == NULL) || r; - r = ((glIsRenderbuffer = (PFNGLISRENDERBUFFERPROC)glewGetProcAddress((const GLubyte*)"glIsRenderbuffer")) == NULL) || r; - r = ((glRenderbufferStorage = (PFNGLRENDERBUFFERSTORAGEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorage")) == NULL) || r; - r = ((glRenderbufferStorageMultisample = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisample")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_framebuffer_object */ - -#ifdef GL_ARB_framebuffer_sRGB - -#endif /* GL_ARB_framebuffer_sRGB */ - -#ifdef GL_ARB_geometry_shader4 - -static GLboolean _glewInit_GL_ARB_geometry_shader4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFramebufferTextureARB = (PFNGLFRAMEBUFFERTEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureARB")) == NULL) || r; - r = ((glFramebufferTextureFaceARB = (PFNGLFRAMEBUFFERTEXTUREFACEARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureFaceARB")) == NULL) || r; - r = ((glFramebufferTextureLayerARB = (PFNGLFRAMEBUFFERTEXTURELAYERARBPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayerARB")) == NULL) || r; - r = ((glProgramParameteriARB = (PFNGLPROGRAMPARAMETERIARBPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteriARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_geometry_shader4 */ - -#ifdef GL_ARB_half_float_pixel - -#endif /* GL_ARB_half_float_pixel */ - -#ifdef GL_ARB_half_float_vertex - -#endif /* GL_ARB_half_float_vertex */ - -#ifdef GL_ARB_imaging - -static GLboolean _glewInit_GL_ARB_imaging (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendEquation = (PFNGLBLENDEQUATIONPROC)glewGetProcAddress((const GLubyte*)"glBlendEquation")) == NULL) || r; - r = ((glColorSubTable = (PFNGLCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorSubTable")) == NULL) || r; - r = ((glColorTable = (PFNGLCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glColorTable")) == NULL) || r; - r = ((glColorTableParameterfv = (PFNGLCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfv")) == NULL) || r; - r = ((glColorTableParameteriv = (PFNGLCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameteriv")) == NULL) || r; - r = ((glConvolutionFilter1D = (PFNGLCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1D")) == NULL) || r; - r = ((glConvolutionFilter2D = (PFNGLCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2D")) == NULL) || r; - r = ((glConvolutionParameterf = (PFNGLCONVOLUTIONPARAMETERFPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterf")) == NULL) || r; - r = ((glConvolutionParameterfv = (PFNGLCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfv")) == NULL) || r; - r = ((glConvolutionParameteri = (PFNGLCONVOLUTIONPARAMETERIPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteri")) == NULL) || r; - r = ((glConvolutionParameteriv = (PFNGLCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriv")) == NULL) || r; - r = ((glCopyColorSubTable = (PFNGLCOPYCOLORSUBTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTable")) == NULL) || r; - r = ((glCopyColorTable = (PFNGLCOPYCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTable")) == NULL) || r; - r = ((glCopyConvolutionFilter1D = (PFNGLCOPYCONVOLUTIONFILTER1DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1D")) == NULL) || r; - r = ((glCopyConvolutionFilter2D = (PFNGLCOPYCONVOLUTIONFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2D")) == NULL) || r; - r = ((glGetColorTable = (PFNGLGETCOLORTABLEPROC)glewGetProcAddress((const GLubyte*)"glGetColorTable")) == NULL) || r; - r = ((glGetColorTableParameterfv = (PFNGLGETCOLORTABLEPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfv")) == NULL) || r; - r = ((glGetColorTableParameteriv = (PFNGLGETCOLORTABLEPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameteriv")) == NULL) || r; - r = ((glGetConvolutionFilter = (PFNGLGETCONVOLUTIONFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilter")) == NULL) || r; - r = ((glGetConvolutionParameterfv = (PFNGLGETCONVOLUTIONPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfv")) == NULL) || r; - r = ((glGetConvolutionParameteriv = (PFNGLGETCONVOLUTIONPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameteriv")) == NULL) || r; - r = ((glGetHistogram = (PFNGLGETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glGetHistogram")) == NULL) || r; - r = ((glGetHistogramParameterfv = (PFNGLGETHISTOGRAMPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfv")) == NULL) || r; - r = ((glGetHistogramParameteriv = (PFNGLGETHISTOGRAMPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameteriv")) == NULL) || r; - r = ((glGetMinmax = (PFNGLGETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glGetMinmax")) == NULL) || r; - r = ((glGetMinmaxParameterfv = (PFNGLGETMINMAXPARAMETERFVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfv")) == NULL) || r; - r = ((glGetMinmaxParameteriv = (PFNGLGETMINMAXPARAMETERIVPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameteriv")) == NULL) || r; - r = ((glGetSeparableFilter = (PFNGLGETSEPARABLEFILTERPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilter")) == NULL) || r; - r = ((glHistogram = (PFNGLHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glHistogram")) == NULL) || r; - r = ((glMinmax = (PFNGLMINMAXPROC)glewGetProcAddress((const GLubyte*)"glMinmax")) == NULL) || r; - r = ((glResetHistogram = (PFNGLRESETHISTOGRAMPROC)glewGetProcAddress((const GLubyte*)"glResetHistogram")) == NULL) || r; - r = ((glResetMinmax = (PFNGLRESETMINMAXPROC)glewGetProcAddress((const GLubyte*)"glResetMinmax")) == NULL) || r; - r = ((glSeparableFilter2D = (PFNGLSEPARABLEFILTER2DPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2D")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_imaging */ - -#ifdef GL_ARB_instanced_arrays - -static GLboolean _glewInit_GL_ARB_instanced_arrays (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glVertexAttribDivisorARB = (PFNGLVERTEXATTRIBDIVISORARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribDivisorARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_instanced_arrays */ - -#ifdef GL_ARB_map_buffer_range - -static GLboolean _glewInit_GL_ARB_map_buffer_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glFlushMappedBufferRange")) == NULL) || r; - r = ((glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)glewGetProcAddress((const GLubyte*)"glMapBufferRange")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_map_buffer_range */ - -#ifdef GL_ARB_matrix_palette - -static GLboolean _glewInit_GL_ARB_matrix_palette (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCurrentPaletteMatrixARB = (PFNGLCURRENTPALETTEMATRIXARBPROC)glewGetProcAddress((const GLubyte*)"glCurrentPaletteMatrixARB")) == NULL) || r; - r = ((glMatrixIndexPointerARB = (PFNGLMATRIXINDEXPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexPointerARB")) == NULL) || r; - r = ((glMatrixIndexubvARB = (PFNGLMATRIXINDEXUBVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexubvARB")) == NULL) || r; - r = ((glMatrixIndexuivARB = (PFNGLMATRIXINDEXUIVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexuivARB")) == NULL) || r; - r = ((glMatrixIndexusvARB = (PFNGLMATRIXINDEXUSVARBPROC)glewGetProcAddress((const GLubyte*)"glMatrixIndexusvARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_matrix_palette */ - -#ifdef GL_ARB_multisample - -static GLboolean _glewInit_GL_ARB_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSampleCoverageARB = (PFNGLSAMPLECOVERAGEARBPROC)glewGetProcAddress((const GLubyte*)"glSampleCoverageARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_multisample */ - -#ifdef GL_ARB_multitexture - -static GLboolean _glewInit_GL_ARB_multitexture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glActiveTextureARB = (PFNGLACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glActiveTextureARB")) == NULL) || r; - r = ((glClientActiveTextureARB = (PFNGLCLIENTACTIVETEXTUREARBPROC)glewGetProcAddress((const GLubyte*)"glClientActiveTextureARB")) == NULL) || r; - r = ((glMultiTexCoord1dARB = (PFNGLMULTITEXCOORD1DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dARB")) == NULL) || r; - r = ((glMultiTexCoord1dvARB = (PFNGLMULTITEXCOORD1DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1dvARB")) == NULL) || r; - r = ((glMultiTexCoord1fARB = (PFNGLMULTITEXCOORD1FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fARB")) == NULL) || r; - r = ((glMultiTexCoord1fvARB = (PFNGLMULTITEXCOORD1FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1fvARB")) == NULL) || r; - r = ((glMultiTexCoord1iARB = (PFNGLMULTITEXCOORD1IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1iARB")) == NULL) || r; - r = ((glMultiTexCoord1ivARB = (PFNGLMULTITEXCOORD1IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1ivARB")) == NULL) || r; - r = ((glMultiTexCoord1sARB = (PFNGLMULTITEXCOORD1SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1sARB")) == NULL) || r; - r = ((glMultiTexCoord1svARB = (PFNGLMULTITEXCOORD1SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1svARB")) == NULL) || r; - r = ((glMultiTexCoord2dARB = (PFNGLMULTITEXCOORD2DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dARB")) == NULL) || r; - r = ((glMultiTexCoord2dvARB = (PFNGLMULTITEXCOORD2DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2dvARB")) == NULL) || r; - r = ((glMultiTexCoord2fARB = (PFNGLMULTITEXCOORD2FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fARB")) == NULL) || r; - r = ((glMultiTexCoord2fvARB = (PFNGLMULTITEXCOORD2FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2fvARB")) == NULL) || r; - r = ((glMultiTexCoord2iARB = (PFNGLMULTITEXCOORD2IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2iARB")) == NULL) || r; - r = ((glMultiTexCoord2ivARB = (PFNGLMULTITEXCOORD2IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2ivARB")) == NULL) || r; - r = ((glMultiTexCoord2sARB = (PFNGLMULTITEXCOORD2SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2sARB")) == NULL) || r; - r = ((glMultiTexCoord2svARB = (PFNGLMULTITEXCOORD2SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2svARB")) == NULL) || r; - r = ((glMultiTexCoord3dARB = (PFNGLMULTITEXCOORD3DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dARB")) == NULL) || r; - r = ((glMultiTexCoord3dvARB = (PFNGLMULTITEXCOORD3DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3dvARB")) == NULL) || r; - r = ((glMultiTexCoord3fARB = (PFNGLMULTITEXCOORD3FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fARB")) == NULL) || r; - r = ((glMultiTexCoord3fvARB = (PFNGLMULTITEXCOORD3FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3fvARB")) == NULL) || r; - r = ((glMultiTexCoord3iARB = (PFNGLMULTITEXCOORD3IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3iARB")) == NULL) || r; - r = ((glMultiTexCoord3ivARB = (PFNGLMULTITEXCOORD3IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3ivARB")) == NULL) || r; - r = ((glMultiTexCoord3sARB = (PFNGLMULTITEXCOORD3SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3sARB")) == NULL) || r; - r = ((glMultiTexCoord3svARB = (PFNGLMULTITEXCOORD3SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3svARB")) == NULL) || r; - r = ((glMultiTexCoord4dARB = (PFNGLMULTITEXCOORD4DARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dARB")) == NULL) || r; - r = ((glMultiTexCoord4dvARB = (PFNGLMULTITEXCOORD4DVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4dvARB")) == NULL) || r; - r = ((glMultiTexCoord4fARB = (PFNGLMULTITEXCOORD4FARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fARB")) == NULL) || r; - r = ((glMultiTexCoord4fvARB = (PFNGLMULTITEXCOORD4FVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4fvARB")) == NULL) || r; - r = ((glMultiTexCoord4iARB = (PFNGLMULTITEXCOORD4IARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4iARB")) == NULL) || r; - r = ((glMultiTexCoord4ivARB = (PFNGLMULTITEXCOORD4IVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4ivARB")) == NULL) || r; - r = ((glMultiTexCoord4sARB = (PFNGLMULTITEXCOORD4SARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4sARB")) == NULL) || r; - r = ((glMultiTexCoord4svARB = (PFNGLMULTITEXCOORD4SVARBPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4svARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_multitexture */ - -#ifdef GL_ARB_occlusion_query - -static GLboolean _glewInit_GL_ARB_occlusion_query (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginQueryARB = (PFNGLBEGINQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glBeginQueryARB")) == NULL) || r; - r = ((glDeleteQueriesARB = (PFNGLDELETEQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteQueriesARB")) == NULL) || r; - r = ((glEndQueryARB = (PFNGLENDQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glEndQueryARB")) == NULL) || r; - r = ((glGenQueriesARB = (PFNGLGENQUERIESARBPROC)glewGetProcAddress((const GLubyte*)"glGenQueriesARB")) == NULL) || r; - r = ((glGetQueryObjectivARB = (PFNGLGETQUERYOBJECTIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectivARB")) == NULL) || r; - r = ((glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectuivARB")) == NULL) || r; - r = ((glGetQueryivARB = (PFNGLGETQUERYIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetQueryivARB")) == NULL) || r; - r = ((glIsQueryARB = (PFNGLISQUERYARBPROC)glewGetProcAddress((const GLubyte*)"glIsQueryARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_occlusion_query */ - -#ifdef GL_ARB_pixel_buffer_object - -#endif /* GL_ARB_pixel_buffer_object */ - -#ifdef GL_ARB_point_parameters - -static GLboolean _glewInit_GL_ARB_point_parameters (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPointParameterfARB = (PFNGLPOINTPARAMETERFARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfARB")) == NULL) || r; - r = ((glPointParameterfvARB = (PFNGLPOINTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_point_parameters */ - -#ifdef GL_ARB_point_sprite - -#endif /* GL_ARB_point_sprite */ - -#ifdef GL_ARB_shader_objects - -static GLboolean _glewInit_GL_ARB_shader_objects (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAttachObjectARB = (PFNGLATTACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glAttachObjectARB")) == NULL) || r; - r = ((glCompileShaderARB = (PFNGLCOMPILESHADERARBPROC)glewGetProcAddress((const GLubyte*)"glCompileShaderARB")) == NULL) || r; - r = ((glCreateProgramObjectARB = (PFNGLCREATEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateProgramObjectARB")) == NULL) || r; - r = ((glCreateShaderObjectARB = (PFNGLCREATESHADEROBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glCreateShaderObjectARB")) == NULL) || r; - r = ((glDeleteObjectARB = (PFNGLDELETEOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteObjectARB")) == NULL) || r; - r = ((glDetachObjectARB = (PFNGLDETACHOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glDetachObjectARB")) == NULL) || r; - r = ((glGetActiveUniformARB = (PFNGLGETACTIVEUNIFORMARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveUniformARB")) == NULL) || r; - r = ((glGetAttachedObjectsARB = (PFNGLGETATTACHEDOBJECTSARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttachedObjectsARB")) == NULL) || r; - r = ((glGetHandleARB = (PFNGLGETHANDLEARBPROC)glewGetProcAddress((const GLubyte*)"glGetHandleARB")) == NULL) || r; - r = ((glGetInfoLogARB = (PFNGLGETINFOLOGARBPROC)glewGetProcAddress((const GLubyte*)"glGetInfoLogARB")) == NULL) || r; - r = ((glGetObjectParameterfvARB = (PFNGLGETOBJECTPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterfvARB")) == NULL) || r; - r = ((glGetObjectParameterivARB = (PFNGLGETOBJECTPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetObjectParameterivARB")) == NULL) || r; - r = ((glGetShaderSourceARB = (PFNGLGETSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glGetShaderSourceARB")) == NULL) || r; - r = ((glGetUniformLocationARB = (PFNGLGETUNIFORMLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformLocationARB")) == NULL) || r; - r = ((glGetUniformfvARB = (PFNGLGETUNIFORMFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformfvARB")) == NULL) || r; - r = ((glGetUniformivARB = (PFNGLGETUNIFORMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetUniformivARB")) == NULL) || r; - r = ((glLinkProgramARB = (PFNGLLINKPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glLinkProgramARB")) == NULL) || r; - r = ((glShaderSourceARB = (PFNGLSHADERSOURCEARBPROC)glewGetProcAddress((const GLubyte*)"glShaderSourceARB")) == NULL) || r; - r = ((glUniform1fARB = (PFNGLUNIFORM1FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fARB")) == NULL) || r; - r = ((glUniform1fvARB = (PFNGLUNIFORM1FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1fvARB")) == NULL) || r; - r = ((glUniform1iARB = (PFNGLUNIFORM1IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1iARB")) == NULL) || r; - r = ((glUniform1ivARB = (PFNGLUNIFORM1IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform1ivARB")) == NULL) || r; - r = ((glUniform2fARB = (PFNGLUNIFORM2FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fARB")) == NULL) || r; - r = ((glUniform2fvARB = (PFNGLUNIFORM2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2fvARB")) == NULL) || r; - r = ((glUniform2iARB = (PFNGLUNIFORM2IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2iARB")) == NULL) || r; - r = ((glUniform2ivARB = (PFNGLUNIFORM2IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform2ivARB")) == NULL) || r; - r = ((glUniform3fARB = (PFNGLUNIFORM3FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fARB")) == NULL) || r; - r = ((glUniform3fvARB = (PFNGLUNIFORM3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3fvARB")) == NULL) || r; - r = ((glUniform3iARB = (PFNGLUNIFORM3IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3iARB")) == NULL) || r; - r = ((glUniform3ivARB = (PFNGLUNIFORM3IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform3ivARB")) == NULL) || r; - r = ((glUniform4fARB = (PFNGLUNIFORM4FARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fARB")) == NULL) || r; - r = ((glUniform4fvARB = (PFNGLUNIFORM4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4fvARB")) == NULL) || r; - r = ((glUniform4iARB = (PFNGLUNIFORM4IARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4iARB")) == NULL) || r; - r = ((glUniform4ivARB = (PFNGLUNIFORM4IVARBPROC)glewGetProcAddress((const GLubyte*)"glUniform4ivARB")) == NULL) || r; - r = ((glUniformMatrix2fvARB = (PFNGLUNIFORMMATRIX2FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix2fvARB")) == NULL) || r; - r = ((glUniformMatrix3fvARB = (PFNGLUNIFORMMATRIX3FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix3fvARB")) == NULL) || r; - r = ((glUniformMatrix4fvARB = (PFNGLUNIFORMMATRIX4FVARBPROC)glewGetProcAddress((const GLubyte*)"glUniformMatrix4fvARB")) == NULL) || r; - r = ((glUseProgramObjectARB = (PFNGLUSEPROGRAMOBJECTARBPROC)glewGetProcAddress((const GLubyte*)"glUseProgramObjectARB")) == NULL) || r; - r = ((glValidateProgramARB = (PFNGLVALIDATEPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glValidateProgramARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_shader_objects */ - -#ifdef GL_ARB_shading_language_100 - -#endif /* GL_ARB_shading_language_100 */ - -#ifdef GL_ARB_shadow - -#endif /* GL_ARB_shadow */ - -#ifdef GL_ARB_shadow_ambient - -#endif /* GL_ARB_shadow_ambient */ - -#ifdef GL_ARB_texture_border_clamp - -#endif /* GL_ARB_texture_border_clamp */ - -#ifdef GL_ARB_texture_buffer_object - -static GLboolean _glewInit_GL_ARB_texture_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexBufferARB = (PFNGLTEXBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glTexBufferARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_texture_buffer_object */ - -#ifdef GL_ARB_texture_compression - -static GLboolean _glewInit_GL_ARB_texture_compression (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCompressedTexImage1DARB = (PFNGLCOMPRESSEDTEXIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage1DARB")) == NULL) || r; - r = ((glCompressedTexImage2DARB = (PFNGLCOMPRESSEDTEXIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage2DARB")) == NULL) || r; - r = ((glCompressedTexImage3DARB = (PFNGLCOMPRESSEDTEXIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexImage3DARB")) == NULL) || r; - r = ((glCompressedTexSubImage1DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage1DARB")) == NULL) || r; - r = ((glCompressedTexSubImage2DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage2DARB")) == NULL) || r; - r = ((glCompressedTexSubImage3DARB = (PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC)glewGetProcAddress((const GLubyte*)"glCompressedTexSubImage3DARB")) == NULL) || r; - r = ((glGetCompressedTexImageARB = (PFNGLGETCOMPRESSEDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTexImageARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_texture_compression */ - -#ifdef GL_ARB_texture_compression_rgtc - -#endif /* GL_ARB_texture_compression_rgtc */ - -#ifdef GL_ARB_texture_cube_map - -#endif /* GL_ARB_texture_cube_map */ - -#ifdef GL_ARB_texture_env_add - -#endif /* GL_ARB_texture_env_add */ - -#ifdef GL_ARB_texture_env_combine - -#endif /* GL_ARB_texture_env_combine */ - -#ifdef GL_ARB_texture_env_crossbar - -#endif /* GL_ARB_texture_env_crossbar */ - -#ifdef GL_ARB_texture_env_dot3 - -#endif /* GL_ARB_texture_env_dot3 */ - -#ifdef GL_ARB_texture_float - -#endif /* GL_ARB_texture_float */ - -#ifdef GL_ARB_texture_mirrored_repeat - -#endif /* GL_ARB_texture_mirrored_repeat */ - -#ifdef GL_ARB_texture_non_power_of_two - -#endif /* GL_ARB_texture_non_power_of_two */ - -#ifdef GL_ARB_texture_rectangle - -#endif /* GL_ARB_texture_rectangle */ - -#ifdef GL_ARB_texture_rg - -#endif /* GL_ARB_texture_rg */ - -#ifdef GL_ARB_transpose_matrix - -static GLboolean _glewInit_GL_ARB_transpose_matrix (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glLoadTransposeMatrixdARB = (PFNGLLOADTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixdARB")) == NULL) || r; - r = ((glLoadTransposeMatrixfARB = (PFNGLLOADTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glLoadTransposeMatrixfARB")) == NULL) || r; - r = ((glMultTransposeMatrixdARB = (PFNGLMULTTRANSPOSEMATRIXDARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixdARB")) == NULL) || r; - r = ((glMultTransposeMatrixfARB = (PFNGLMULTTRANSPOSEMATRIXFARBPROC)glewGetProcAddress((const GLubyte*)"glMultTransposeMatrixfARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_transpose_matrix */ - -#ifdef GL_ARB_vertex_array_object - -static GLboolean _glewInit_GL_ARB_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)glewGetProcAddress((const GLubyte*)"glBindVertexArray")) == NULL) || r; - r = ((glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexArrays")) == NULL) || r; - r = ((glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)glewGetProcAddress((const GLubyte*)"glGenVertexArrays")) == NULL) || r; - r = ((glIsVertexArray = (PFNGLISVERTEXARRAYPROC)glewGetProcAddress((const GLubyte*)"glIsVertexArray")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_array_object */ - -#ifdef GL_ARB_vertex_blend - -static GLboolean _glewInit_GL_ARB_vertex_blend (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glVertexBlendARB = (PFNGLVERTEXBLENDARBPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendARB")) == NULL) || r; - r = ((glWeightPointerARB = (PFNGLWEIGHTPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glWeightPointerARB")) == NULL) || r; - r = ((glWeightbvARB = (PFNGLWEIGHTBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightbvARB")) == NULL) || r; - r = ((glWeightdvARB = (PFNGLWEIGHTDVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightdvARB")) == NULL) || r; - r = ((glWeightfvARB = (PFNGLWEIGHTFVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightfvARB")) == NULL) || r; - r = ((glWeightivARB = (PFNGLWEIGHTIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightivARB")) == NULL) || r; - r = ((glWeightsvARB = (PFNGLWEIGHTSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightsvARB")) == NULL) || r; - r = ((glWeightubvARB = (PFNGLWEIGHTUBVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightubvARB")) == NULL) || r; - r = ((glWeightuivARB = (PFNGLWEIGHTUIVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightuivARB")) == NULL) || r; - r = ((glWeightusvARB = (PFNGLWEIGHTUSVARBPROC)glewGetProcAddress((const GLubyte*)"glWeightusvARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_blend */ - -#ifdef GL_ARB_vertex_buffer_object - -static GLboolean _glewInit_GL_ARB_vertex_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindBufferARB = (PFNGLBINDBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glBindBufferARB")) == NULL) || r; - r = ((glBufferDataARB = (PFNGLBUFFERDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferDataARB")) == NULL) || r; - r = ((glBufferSubDataARB = (PFNGLBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glBufferSubDataARB")) == NULL) || r; - r = ((glDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteBuffersARB")) == NULL) || r; - r = ((glGenBuffersARB = (PFNGLGENBUFFERSARBPROC)glewGetProcAddress((const GLubyte*)"glGenBuffersARB")) == NULL) || r; - r = ((glGetBufferParameterivARB = (PFNGLGETBUFFERPARAMETERIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferParameterivARB")) == NULL) || r; - r = ((glGetBufferPointervARB = (PFNGLGETBUFFERPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferPointervARB")) == NULL) || r; - r = ((glGetBufferSubDataARB = (PFNGLGETBUFFERSUBDATAARBPROC)glewGetProcAddress((const GLubyte*)"glGetBufferSubDataARB")) == NULL) || r; - r = ((glIsBufferARB = (PFNGLISBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glIsBufferARB")) == NULL) || r; - r = ((glMapBufferARB = (PFNGLMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glMapBufferARB")) == NULL) || r; - r = ((glUnmapBufferARB = (PFNGLUNMAPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"glUnmapBufferARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_buffer_object */ - -#ifdef GL_ARB_vertex_program - -static GLboolean _glewInit_GL_ARB_vertex_program (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindProgramARB = (PFNGLBINDPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glBindProgramARB")) == NULL) || r; - r = ((glDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsARB")) == NULL) || r; - r = ((glDisableVertexAttribArrayARB = (PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glDisableVertexAttribArrayARB")) == NULL) || r; - r = ((glEnableVertexAttribArrayARB = (PFNGLENABLEVERTEXATTRIBARRAYARBPROC)glewGetProcAddress((const GLubyte*)"glEnableVertexAttribArrayARB")) == NULL) || r; - r = ((glGenProgramsARB = (PFNGLGENPROGRAMSARBPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsARB")) == NULL) || r; - r = ((glGetProgramEnvParameterdvARB = (PFNGLGETPROGRAMENVPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterdvARB")) == NULL) || r; - r = ((glGetProgramEnvParameterfvARB = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramEnvParameterfvARB")) == NULL) || r; - r = ((glGetProgramLocalParameterdvARB = (PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterdvARB")) == NULL) || r; - r = ((glGetProgramLocalParameterfvARB = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramLocalParameterfvARB")) == NULL) || r; - r = ((glGetProgramStringARB = (PFNGLGETPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringARB")) == NULL) || r; - r = ((glGetProgramivARB = (PFNGLGETPROGRAMIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivARB")) == NULL) || r; - r = ((glGetVertexAttribPointervARB = (PFNGLGETVERTEXATTRIBPOINTERVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervARB")) == NULL) || r; - r = ((glGetVertexAttribdvARB = (PFNGLGETVERTEXATTRIBDVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvARB")) == NULL) || r; - r = ((glGetVertexAttribfvARB = (PFNGLGETVERTEXATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvARB")) == NULL) || r; - r = ((glGetVertexAttribivARB = (PFNGLGETVERTEXATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivARB")) == NULL) || r; - r = ((glIsProgramARB = (PFNGLISPROGRAMARBPROC)glewGetProcAddress((const GLubyte*)"glIsProgramARB")) == NULL) || r; - r = ((glProgramEnvParameter4dARB = (PFNGLPROGRAMENVPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dARB")) == NULL) || r; - r = ((glProgramEnvParameter4dvARB = (PFNGLPROGRAMENVPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4dvARB")) == NULL) || r; - r = ((glProgramEnvParameter4fARB = (PFNGLPROGRAMENVPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fARB")) == NULL) || r; - r = ((glProgramEnvParameter4fvARB = (PFNGLPROGRAMENVPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameter4fvARB")) == NULL) || r; - r = ((glProgramLocalParameter4dARB = (PFNGLPROGRAMLOCALPARAMETER4DARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dARB")) == NULL) || r; - r = ((glProgramLocalParameter4dvARB = (PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4dvARB")) == NULL) || r; - r = ((glProgramLocalParameter4fARB = (PFNGLPROGRAMLOCALPARAMETER4FARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fARB")) == NULL) || r; - r = ((glProgramLocalParameter4fvARB = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameter4fvARB")) == NULL) || r; - r = ((glProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"glProgramStringARB")) == NULL) || r; - r = ((glVertexAttrib1dARB = (PFNGLVERTEXATTRIB1DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dARB")) == NULL) || r; - r = ((glVertexAttrib1dvARB = (PFNGLVERTEXATTRIB1DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvARB")) == NULL) || r; - r = ((glVertexAttrib1fARB = (PFNGLVERTEXATTRIB1FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fARB")) == NULL) || r; - r = ((glVertexAttrib1fvARB = (PFNGLVERTEXATTRIB1FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvARB")) == NULL) || r; - r = ((glVertexAttrib1sARB = (PFNGLVERTEXATTRIB1SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sARB")) == NULL) || r; - r = ((glVertexAttrib1svARB = (PFNGLVERTEXATTRIB1SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svARB")) == NULL) || r; - r = ((glVertexAttrib2dARB = (PFNGLVERTEXATTRIB2DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dARB")) == NULL) || r; - r = ((glVertexAttrib2dvARB = (PFNGLVERTEXATTRIB2DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvARB")) == NULL) || r; - r = ((glVertexAttrib2fARB = (PFNGLVERTEXATTRIB2FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fARB")) == NULL) || r; - r = ((glVertexAttrib2fvARB = (PFNGLVERTEXATTRIB2FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvARB")) == NULL) || r; - r = ((glVertexAttrib2sARB = (PFNGLVERTEXATTRIB2SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sARB")) == NULL) || r; - r = ((glVertexAttrib2svARB = (PFNGLVERTEXATTRIB2SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svARB")) == NULL) || r; - r = ((glVertexAttrib3dARB = (PFNGLVERTEXATTRIB3DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dARB")) == NULL) || r; - r = ((glVertexAttrib3dvARB = (PFNGLVERTEXATTRIB3DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvARB")) == NULL) || r; - r = ((glVertexAttrib3fARB = (PFNGLVERTEXATTRIB3FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fARB")) == NULL) || r; - r = ((glVertexAttrib3fvARB = (PFNGLVERTEXATTRIB3FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvARB")) == NULL) || r; - r = ((glVertexAttrib3sARB = (PFNGLVERTEXATTRIB3SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sARB")) == NULL) || r; - r = ((glVertexAttrib3svARB = (PFNGLVERTEXATTRIB3SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svARB")) == NULL) || r; - r = ((glVertexAttrib4NbvARB = (PFNGLVERTEXATTRIB4NBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NbvARB")) == NULL) || r; - r = ((glVertexAttrib4NivARB = (PFNGLVERTEXATTRIB4NIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NivARB")) == NULL) || r; - r = ((glVertexAttrib4NsvARB = (PFNGLVERTEXATTRIB4NSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NsvARB")) == NULL) || r; - r = ((glVertexAttrib4NubARB = (PFNGLVERTEXATTRIB4NUBARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubARB")) == NULL) || r; - r = ((glVertexAttrib4NubvARB = (PFNGLVERTEXATTRIB4NUBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NubvARB")) == NULL) || r; - r = ((glVertexAttrib4NuivARB = (PFNGLVERTEXATTRIB4NUIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NuivARB")) == NULL) || r; - r = ((glVertexAttrib4NusvARB = (PFNGLVERTEXATTRIB4NUSVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4NusvARB")) == NULL) || r; - r = ((glVertexAttrib4bvARB = (PFNGLVERTEXATTRIB4BVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4bvARB")) == NULL) || r; - r = ((glVertexAttrib4dARB = (PFNGLVERTEXATTRIB4DARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dARB")) == NULL) || r; - r = ((glVertexAttrib4dvARB = (PFNGLVERTEXATTRIB4DVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvARB")) == NULL) || r; - r = ((glVertexAttrib4fARB = (PFNGLVERTEXATTRIB4FARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fARB")) == NULL) || r; - r = ((glVertexAttrib4fvARB = (PFNGLVERTEXATTRIB4FVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvARB")) == NULL) || r; - r = ((glVertexAttrib4ivARB = (PFNGLVERTEXATTRIB4IVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ivARB")) == NULL) || r; - r = ((glVertexAttrib4sARB = (PFNGLVERTEXATTRIB4SARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sARB")) == NULL) || r; - r = ((glVertexAttrib4svARB = (PFNGLVERTEXATTRIB4SVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svARB")) == NULL) || r; - r = ((glVertexAttrib4ubvARB = (PFNGLVERTEXATTRIB4UBVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvARB")) == NULL) || r; - r = ((glVertexAttrib4uivARB = (PFNGLVERTEXATTRIB4UIVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4uivARB")) == NULL) || r; - r = ((glVertexAttrib4usvARB = (PFNGLVERTEXATTRIB4USVARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4usvARB")) == NULL) || r; - r = ((glVertexAttribPointerARB = (PFNGLVERTEXATTRIBPOINTERARBPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_program */ - -#ifdef GL_ARB_vertex_shader - -static GLboolean _glewInit_GL_ARB_vertex_shader (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindAttribLocationARB = (PFNGLBINDATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glBindAttribLocationARB")) == NULL) || r; - r = ((glGetActiveAttribARB = (PFNGLGETACTIVEATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"glGetActiveAttribARB")) == NULL) || r; - r = ((glGetAttribLocationARB = (PFNGLGETATTRIBLOCATIONARBPROC)glewGetProcAddress((const GLubyte*)"glGetAttribLocationARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_vertex_shader */ - -#ifdef GL_ARB_window_pos - -static GLboolean _glewInit_GL_ARB_window_pos (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glWindowPos2dARB = (PFNGLWINDOWPOS2DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dARB")) == NULL) || r; - r = ((glWindowPos2dvARB = (PFNGLWINDOWPOS2DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvARB")) == NULL) || r; - r = ((glWindowPos2fARB = (PFNGLWINDOWPOS2FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fARB")) == NULL) || r; - r = ((glWindowPos2fvARB = (PFNGLWINDOWPOS2FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvARB")) == NULL) || r; - r = ((glWindowPos2iARB = (PFNGLWINDOWPOS2IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iARB")) == NULL) || r; - r = ((glWindowPos2ivARB = (PFNGLWINDOWPOS2IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivARB")) == NULL) || r; - r = ((glWindowPos2sARB = (PFNGLWINDOWPOS2SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sARB")) == NULL) || r; - r = ((glWindowPos2svARB = (PFNGLWINDOWPOS2SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svARB")) == NULL) || r; - r = ((glWindowPos3dARB = (PFNGLWINDOWPOS3DARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dARB")) == NULL) || r; - r = ((glWindowPos3dvARB = (PFNGLWINDOWPOS3DVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvARB")) == NULL) || r; - r = ((glWindowPos3fARB = (PFNGLWINDOWPOS3FARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fARB")) == NULL) || r; - r = ((glWindowPos3fvARB = (PFNGLWINDOWPOS3FVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvARB")) == NULL) || r; - r = ((glWindowPos3iARB = (PFNGLWINDOWPOS3IARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iARB")) == NULL) || r; - r = ((glWindowPos3ivARB = (PFNGLWINDOWPOS3IVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivARB")) == NULL) || r; - r = ((glWindowPos3sARB = (PFNGLWINDOWPOS3SARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sARB")) == NULL) || r; - r = ((glWindowPos3svARB = (PFNGLWINDOWPOS3SVARBPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svARB")) == NULL) || r; - - return r; -} - -#endif /* GL_ARB_window_pos */ - -#ifdef GL_ATIX_point_sprites - -#endif /* GL_ATIX_point_sprites */ - -#ifdef GL_ATIX_texture_env_combine3 - -#endif /* GL_ATIX_texture_env_combine3 */ - -#ifdef GL_ATIX_texture_env_route - -#endif /* GL_ATIX_texture_env_route */ - -#ifdef GL_ATIX_vertex_shader_output_point_size - -#endif /* GL_ATIX_vertex_shader_output_point_size */ - -#ifdef GL_ATI_draw_buffers - -static GLboolean _glewInit_GL_ATI_draw_buffers (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawBuffersATI = (PFNGLDRAWBUFFERSATIPROC)glewGetProcAddress((const GLubyte*)"glDrawBuffersATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_draw_buffers */ - -#ifdef GL_ATI_element_array - -static GLboolean _glewInit_GL_ATI_element_array (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawElementArrayATI = (PFNGLDRAWELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawElementArrayATI")) == NULL) || r; - r = ((glDrawRangeElementArrayATI = (PFNGLDRAWRANGEELEMENTARRAYATIPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementArrayATI")) == NULL) || r; - r = ((glElementPointerATI = (PFNGLELEMENTPOINTERATIPROC)glewGetProcAddress((const GLubyte*)"glElementPointerATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_element_array */ - -#ifdef GL_ATI_envmap_bumpmap - -static GLboolean _glewInit_GL_ATI_envmap_bumpmap (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetTexBumpParameterfvATI = (PFNGLGETTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterfvATI")) == NULL) || r; - r = ((glGetTexBumpParameterivATI = (PFNGLGETTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetTexBumpParameterivATI")) == NULL) || r; - r = ((glTexBumpParameterfvATI = (PFNGLTEXBUMPPARAMETERFVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterfvATI")) == NULL) || r; - r = ((glTexBumpParameterivATI = (PFNGLTEXBUMPPARAMETERIVATIPROC)glewGetProcAddress((const GLubyte*)"glTexBumpParameterivATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_envmap_bumpmap */ - -#ifdef GL_ATI_fragment_shader - -static GLboolean _glewInit_GL_ATI_fragment_shader (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAlphaFragmentOp1ATI = (PFNGLALPHAFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp1ATI")) == NULL) || r; - r = ((glAlphaFragmentOp2ATI = (PFNGLALPHAFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp2ATI")) == NULL) || r; - r = ((glAlphaFragmentOp3ATI = (PFNGLALPHAFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glAlphaFragmentOp3ATI")) == NULL) || r; - r = ((glBeginFragmentShaderATI = (PFNGLBEGINFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBeginFragmentShaderATI")) == NULL) || r; - r = ((glBindFragmentShaderATI = (PFNGLBINDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glBindFragmentShaderATI")) == NULL) || r; - r = ((glColorFragmentOp1ATI = (PFNGLCOLORFRAGMENTOP1ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp1ATI")) == NULL) || r; - r = ((glColorFragmentOp2ATI = (PFNGLCOLORFRAGMENTOP2ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp2ATI")) == NULL) || r; - r = ((glColorFragmentOp3ATI = (PFNGLCOLORFRAGMENTOP3ATIPROC)glewGetProcAddress((const GLubyte*)"glColorFragmentOp3ATI")) == NULL) || r; - r = ((glDeleteFragmentShaderATI = (PFNGLDELETEFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glDeleteFragmentShaderATI")) == NULL) || r; - r = ((glEndFragmentShaderATI = (PFNGLENDFRAGMENTSHADERATIPROC)glewGetProcAddress((const GLubyte*)"glEndFragmentShaderATI")) == NULL) || r; - r = ((glGenFragmentShadersATI = (PFNGLGENFRAGMENTSHADERSATIPROC)glewGetProcAddress((const GLubyte*)"glGenFragmentShadersATI")) == NULL) || r; - r = ((glPassTexCoordATI = (PFNGLPASSTEXCOORDATIPROC)glewGetProcAddress((const GLubyte*)"glPassTexCoordATI")) == NULL) || r; - r = ((glSampleMapATI = (PFNGLSAMPLEMAPATIPROC)glewGetProcAddress((const GLubyte*)"glSampleMapATI")) == NULL) || r; - r = ((glSetFragmentShaderConstantATI = (PFNGLSETFRAGMENTSHADERCONSTANTATIPROC)glewGetProcAddress((const GLubyte*)"glSetFragmentShaderConstantATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_fragment_shader */ - -#ifdef GL_ATI_map_object_buffer - -static GLboolean _glewInit_GL_ATI_map_object_buffer (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glMapObjectBufferATI = (PFNGLMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glMapObjectBufferATI")) == NULL) || r; - r = ((glUnmapObjectBufferATI = (PFNGLUNMAPOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUnmapObjectBufferATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_map_object_buffer */ - -#ifdef GL_ATI_pn_triangles - -static GLboolean _glewInit_GL_ATI_pn_triangles (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPNTrianglesfATI = (PFNGLPNTRIANGLESFATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesfATI")) == NULL) || r; - r = ((glPNTrianglesiATI = (PFNGLPNTRIANGLESIATIPROC)glewGetProcAddress((const GLubyte*)"glPNTrianglesiATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_pn_triangles */ - -#ifdef GL_ATI_separate_stencil - -static GLboolean _glewInit_GL_ATI_separate_stencil (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glStencilFuncSeparateATI = (PFNGLSTENCILFUNCSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilFuncSeparateATI")) == NULL) || r; - r = ((glStencilOpSeparateATI = (PFNGLSTENCILOPSEPARATEATIPROC)glewGetProcAddress((const GLubyte*)"glStencilOpSeparateATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_separate_stencil */ - -#ifdef GL_ATI_shader_texture_lod - -#endif /* GL_ATI_shader_texture_lod */ - -#ifdef GL_ATI_text_fragment_shader - -#endif /* GL_ATI_text_fragment_shader */ - -#ifdef GL_ATI_texture_compression_3dc - -#endif /* GL_ATI_texture_compression_3dc */ - -#ifdef GL_ATI_texture_env_combine3 - -#endif /* GL_ATI_texture_env_combine3 */ - -#ifdef GL_ATI_texture_float - -#endif /* GL_ATI_texture_float */ - -#ifdef GL_ATI_texture_mirror_once - -#endif /* GL_ATI_texture_mirror_once */ - -#ifdef GL_ATI_vertex_array_object - -static GLboolean _glewInit_GL_ATI_vertex_array_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glArrayObjectATI = (PFNGLARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glArrayObjectATI")) == NULL) || r; - r = ((glFreeObjectBufferATI = (PFNGLFREEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glFreeObjectBufferATI")) == NULL) || r; - r = ((glGetArrayObjectfvATI = (PFNGLGETARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectfvATI")) == NULL) || r; - r = ((glGetArrayObjectivATI = (PFNGLGETARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetArrayObjectivATI")) == NULL) || r; - r = ((glGetObjectBufferfvATI = (PFNGLGETOBJECTBUFFERFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferfvATI")) == NULL) || r; - r = ((glGetObjectBufferivATI = (PFNGLGETOBJECTBUFFERIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetObjectBufferivATI")) == NULL) || r; - r = ((glGetVariantArrayObjectfvATI = (PFNGLGETVARIANTARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectfvATI")) == NULL) || r; - r = ((glGetVariantArrayObjectivATI = (PFNGLGETVARIANTARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVariantArrayObjectivATI")) == NULL) || r; - r = ((glIsObjectBufferATI = (PFNGLISOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glIsObjectBufferATI")) == NULL) || r; - r = ((glNewObjectBufferATI = (PFNGLNEWOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glNewObjectBufferATI")) == NULL) || r; - r = ((glUpdateObjectBufferATI = (PFNGLUPDATEOBJECTBUFFERATIPROC)glewGetProcAddress((const GLubyte*)"glUpdateObjectBufferATI")) == NULL) || r; - r = ((glVariantArrayObjectATI = (PFNGLVARIANTARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVariantArrayObjectATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_vertex_array_object */ - -#ifdef GL_ATI_vertex_attrib_array_object - -static GLboolean _glewInit_GL_ATI_vertex_attrib_array_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetVertexAttribArrayObjectfvATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectfvATI")) == NULL) || r; - r = ((glGetVertexAttribArrayObjectivATI = (PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribArrayObjectivATI")) == NULL) || r; - r = ((glVertexAttribArrayObjectATI = (PFNGLVERTEXATTRIBARRAYOBJECTATIPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribArrayObjectATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_vertex_attrib_array_object */ - -#ifdef GL_ATI_vertex_streams - -static GLboolean _glewInit_GL_ATI_vertex_streams (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClientActiveVertexStreamATI = (PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC)glewGetProcAddress((const GLubyte*)"glClientActiveVertexStreamATI")) == NULL) || r; - r = ((glNormalStream3bATI = (PFNGLNORMALSTREAM3BATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bATI")) == NULL) || r; - r = ((glNormalStream3bvATI = (PFNGLNORMALSTREAM3BVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3bvATI")) == NULL) || r; - r = ((glNormalStream3dATI = (PFNGLNORMALSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dATI")) == NULL) || r; - r = ((glNormalStream3dvATI = (PFNGLNORMALSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3dvATI")) == NULL) || r; - r = ((glNormalStream3fATI = (PFNGLNORMALSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fATI")) == NULL) || r; - r = ((glNormalStream3fvATI = (PFNGLNORMALSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3fvATI")) == NULL) || r; - r = ((glNormalStream3iATI = (PFNGLNORMALSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3iATI")) == NULL) || r; - r = ((glNormalStream3ivATI = (PFNGLNORMALSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3ivATI")) == NULL) || r; - r = ((glNormalStream3sATI = (PFNGLNORMALSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3sATI")) == NULL) || r; - r = ((glNormalStream3svATI = (PFNGLNORMALSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glNormalStream3svATI")) == NULL) || r; - r = ((glVertexBlendEnvfATI = (PFNGLVERTEXBLENDENVFATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnvfATI")) == NULL) || r; - r = ((glVertexBlendEnviATI = (PFNGLVERTEXBLENDENVIATIPROC)glewGetProcAddress((const GLubyte*)"glVertexBlendEnviATI")) == NULL) || r; - r = ((glVertexStream2dATI = (PFNGLVERTEXSTREAM2DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dATI")) == NULL) || r; - r = ((glVertexStream2dvATI = (PFNGLVERTEXSTREAM2DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2dvATI")) == NULL) || r; - r = ((glVertexStream2fATI = (PFNGLVERTEXSTREAM2FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fATI")) == NULL) || r; - r = ((glVertexStream2fvATI = (PFNGLVERTEXSTREAM2FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2fvATI")) == NULL) || r; - r = ((glVertexStream2iATI = (PFNGLVERTEXSTREAM2IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2iATI")) == NULL) || r; - r = ((glVertexStream2ivATI = (PFNGLVERTEXSTREAM2IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2ivATI")) == NULL) || r; - r = ((glVertexStream2sATI = (PFNGLVERTEXSTREAM2SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2sATI")) == NULL) || r; - r = ((glVertexStream2svATI = (PFNGLVERTEXSTREAM2SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream2svATI")) == NULL) || r; - r = ((glVertexStream3dATI = (PFNGLVERTEXSTREAM3DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dATI")) == NULL) || r; - r = ((glVertexStream3dvATI = (PFNGLVERTEXSTREAM3DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3dvATI")) == NULL) || r; - r = ((glVertexStream3fATI = (PFNGLVERTEXSTREAM3FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fATI")) == NULL) || r; - r = ((glVertexStream3fvATI = (PFNGLVERTEXSTREAM3FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3fvATI")) == NULL) || r; - r = ((glVertexStream3iATI = (PFNGLVERTEXSTREAM3IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3iATI")) == NULL) || r; - r = ((glVertexStream3ivATI = (PFNGLVERTEXSTREAM3IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3ivATI")) == NULL) || r; - r = ((glVertexStream3sATI = (PFNGLVERTEXSTREAM3SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3sATI")) == NULL) || r; - r = ((glVertexStream3svATI = (PFNGLVERTEXSTREAM3SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream3svATI")) == NULL) || r; - r = ((glVertexStream4dATI = (PFNGLVERTEXSTREAM4DATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dATI")) == NULL) || r; - r = ((glVertexStream4dvATI = (PFNGLVERTEXSTREAM4DVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4dvATI")) == NULL) || r; - r = ((glVertexStream4fATI = (PFNGLVERTEXSTREAM4FATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fATI")) == NULL) || r; - r = ((glVertexStream4fvATI = (PFNGLVERTEXSTREAM4FVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4fvATI")) == NULL) || r; - r = ((glVertexStream4iATI = (PFNGLVERTEXSTREAM4IATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4iATI")) == NULL) || r; - r = ((glVertexStream4ivATI = (PFNGLVERTEXSTREAM4IVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4ivATI")) == NULL) || r; - r = ((glVertexStream4sATI = (PFNGLVERTEXSTREAM4SATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4sATI")) == NULL) || r; - r = ((glVertexStream4svATI = (PFNGLVERTEXSTREAM4SVATIPROC)glewGetProcAddress((const GLubyte*)"glVertexStream4svATI")) == NULL) || r; - - return r; -} - -#endif /* GL_ATI_vertex_streams */ - -#ifdef GL_EXT_422_pixels - -#endif /* GL_EXT_422_pixels */ - -#ifdef GL_EXT_Cg_shader - -#endif /* GL_EXT_Cg_shader */ - -#ifdef GL_EXT_abgr - -#endif /* GL_EXT_abgr */ - -#ifdef GL_EXT_bgra - -#endif /* GL_EXT_bgra */ - -#ifdef GL_EXT_bindable_uniform - -static GLboolean _glewInit_GL_EXT_bindable_uniform (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetUniformBufferSizeEXT = (PFNGLGETUNIFORMBUFFERSIZEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformBufferSizeEXT")) == NULL) || r; - r = ((glGetUniformOffsetEXT = (PFNGLGETUNIFORMOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformOffsetEXT")) == NULL) || r; - r = ((glUniformBufferEXT = (PFNGLUNIFORMBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glUniformBufferEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_bindable_uniform */ - -#ifdef GL_EXT_blend_color - -static GLboolean _glewInit_GL_EXT_blend_color (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendColorEXT = (PFNGLBLENDCOLOREXTPROC)glewGetProcAddress((const GLubyte*)"glBlendColorEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_blend_color */ - -#ifdef GL_EXT_blend_equation_separate - -static GLboolean _glewInit_GL_EXT_blend_equation_separate (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendEquationSeparateEXT = (PFNGLBLENDEQUATIONSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationSeparateEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_blend_equation_separate */ - -#ifdef GL_EXT_blend_func_separate - -static GLboolean _glewInit_GL_EXT_blend_func_separate (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendFuncSeparateEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_blend_func_separate */ - -#ifdef GL_EXT_blend_logic_op - -#endif /* GL_EXT_blend_logic_op */ - -#ifdef GL_EXT_blend_minmax - -static GLboolean _glewInit_GL_EXT_blend_minmax (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlendEquationEXT = (PFNGLBLENDEQUATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glBlendEquationEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_blend_minmax */ - -#ifdef GL_EXT_blend_subtract - -#endif /* GL_EXT_blend_subtract */ - -#ifdef GL_EXT_clip_volume_hint - -#endif /* GL_EXT_clip_volume_hint */ - -#ifdef GL_EXT_cmyka - -#endif /* GL_EXT_cmyka */ - -#ifdef GL_EXT_color_subtable - -static GLboolean _glewInit_GL_EXT_color_subtable (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorSubTableEXT = (PFNGLCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorSubTableEXT")) == NULL) || r; - r = ((glCopyColorSubTableEXT = (PFNGLCOPYCOLORSUBTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyColorSubTableEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_color_subtable */ - -#ifdef GL_EXT_compiled_vertex_array - -static GLboolean _glewInit_GL_EXT_compiled_vertex_array (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glLockArraysEXT = (PFNGLLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glLockArraysEXT")) == NULL) || r; - r = ((glUnlockArraysEXT = (PFNGLUNLOCKARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glUnlockArraysEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_compiled_vertex_array */ - -#ifdef GL_EXT_convolution - -static GLboolean _glewInit_GL_EXT_convolution (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glConvolutionFilter1DEXT = (PFNGLCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter1DEXT")) == NULL) || r; - r = ((glConvolutionFilter2DEXT = (PFNGLCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionFilter2DEXT")) == NULL) || r; - r = ((glConvolutionParameterfEXT = (PFNGLCONVOLUTIONPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfEXT")) == NULL) || r; - r = ((glConvolutionParameterfvEXT = (PFNGLCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterfvEXT")) == NULL) || r; - r = ((glConvolutionParameteriEXT = (PFNGLCONVOLUTIONPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameteriEXT")) == NULL) || r; - r = ((glConvolutionParameterivEXT = (PFNGLCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glConvolutionParameterivEXT")) == NULL) || r; - r = ((glCopyConvolutionFilter1DEXT = (PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter1DEXT")) == NULL) || r; - r = ((glCopyConvolutionFilter2DEXT = (PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyConvolutionFilter2DEXT")) == NULL) || r; - r = ((glGetConvolutionFilterEXT = (PFNGLGETCONVOLUTIONFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionFilterEXT")) == NULL) || r; - r = ((glGetConvolutionParameterfvEXT = (PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterfvEXT")) == NULL) || r; - r = ((glGetConvolutionParameterivEXT = (PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetConvolutionParameterivEXT")) == NULL) || r; - r = ((glGetSeparableFilterEXT = (PFNGLGETSEPARABLEFILTEREXTPROC)glewGetProcAddress((const GLubyte*)"glGetSeparableFilterEXT")) == NULL) || r; - r = ((glSeparableFilter2DEXT = (PFNGLSEPARABLEFILTER2DEXTPROC)glewGetProcAddress((const GLubyte*)"glSeparableFilter2DEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_convolution */ - -#ifdef GL_EXT_coordinate_frame - -static GLboolean _glewInit_GL_EXT_coordinate_frame (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBinormalPointerEXT = (PFNGLBINORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glBinormalPointerEXT")) == NULL) || r; - r = ((glTangentPointerEXT = (PFNGLTANGENTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTangentPointerEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_coordinate_frame */ - -#ifdef GL_EXT_copy_texture - -static GLboolean _glewInit_GL_EXT_copy_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCopyTexImage1DEXT = (PFNGLCOPYTEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage1DEXT")) == NULL) || r; - r = ((glCopyTexImage2DEXT = (PFNGLCOPYTEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexImage2DEXT")) == NULL) || r; - r = ((glCopyTexSubImage1DEXT = (PFNGLCOPYTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage1DEXT")) == NULL) || r; - r = ((glCopyTexSubImage2DEXT = (PFNGLCOPYTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage2DEXT")) == NULL) || r; - r = ((glCopyTexSubImage3DEXT = (PFNGLCOPYTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTexSubImage3DEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_copy_texture */ - -#ifdef GL_EXT_cull_vertex - -static GLboolean _glewInit_GL_EXT_cull_vertex (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCullParameterdvEXT = (PFNGLCULLPARAMETERDVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterdvEXT")) == NULL) || r; - r = ((glCullParameterfvEXT = (PFNGLCULLPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glCullParameterfvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_cull_vertex */ - -#ifdef GL_EXT_depth_bounds_test - -static GLboolean _glewInit_GL_EXT_depth_bounds_test (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDepthBoundsEXT = (PFNGLDEPTHBOUNDSEXTPROC)glewGetProcAddress((const GLubyte*)"glDepthBoundsEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_depth_bounds_test */ - -#ifdef GL_EXT_direct_state_access - -static GLboolean _glewInit_GL_EXT_direct_state_access (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindMultiTextureEXT = (PFNGLBINDMULTITEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindMultiTextureEXT")) == NULL) || r; - r = ((glCheckNamedFramebufferStatusEXT = (PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC)glewGetProcAddress((const GLubyte*)"glCheckNamedFramebufferStatusEXT")) == NULL) || r; - r = ((glClientAttribDefaultEXT = (PFNGLCLIENTATTRIBDEFAULTEXTPROC)glewGetProcAddress((const GLubyte*)"glClientAttribDefaultEXT")) == NULL) || r; - r = ((glCompressedMultiTexImage1DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage1DEXT")) == NULL) || r; - r = ((glCompressedMultiTexImage2DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage2DEXT")) == NULL) || r; - r = ((glCompressedMultiTexImage3DEXT = (PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexImage3DEXT")) == NULL) || r; - r = ((glCompressedMultiTexSubImage1DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage1DEXT")) == NULL) || r; - r = ((glCompressedMultiTexSubImage2DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage2DEXT")) == NULL) || r; - r = ((glCompressedMultiTexSubImage3DEXT = (PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedMultiTexSubImage3DEXT")) == NULL) || r; - r = ((glCompressedTextureImage1DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage1DEXT")) == NULL) || r; - r = ((glCompressedTextureImage2DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage2DEXT")) == NULL) || r; - r = ((glCompressedTextureImage3DEXT = (PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureImage3DEXT")) == NULL) || r; - r = ((glCompressedTextureSubImage1DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage1DEXT")) == NULL) || r; - r = ((glCompressedTextureSubImage2DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage2DEXT")) == NULL) || r; - r = ((glCompressedTextureSubImage3DEXT = (PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCompressedTextureSubImage3DEXT")) == NULL) || r; - r = ((glCopyMultiTexImage1DEXT = (PFNGLCOPYMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexImage1DEXT")) == NULL) || r; - r = ((glCopyMultiTexImage2DEXT = (PFNGLCOPYMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexImage2DEXT")) == NULL) || r; - r = ((glCopyMultiTexSubImage1DEXT = (PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage1DEXT")) == NULL) || r; - r = ((glCopyMultiTexSubImage2DEXT = (PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage2DEXT")) == NULL) || r; - r = ((glCopyMultiTexSubImage3DEXT = (PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyMultiTexSubImage3DEXT")) == NULL) || r; - r = ((glCopyTextureImage1DEXT = (PFNGLCOPYTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureImage1DEXT")) == NULL) || r; - r = ((glCopyTextureImage2DEXT = (PFNGLCOPYTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureImage2DEXT")) == NULL) || r; - r = ((glCopyTextureSubImage1DEXT = (PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage1DEXT")) == NULL) || r; - r = ((glCopyTextureSubImage2DEXT = (PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage2DEXT")) == NULL) || r; - r = ((glCopyTextureSubImage3DEXT = (PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glCopyTextureSubImage3DEXT")) == NULL) || r; - r = ((glDisableClientStateIndexedEXT = (PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableClientStateIndexedEXT")) == NULL) || r; - r = ((glEnableClientStateIndexedEXT = (PFNGLENABLECLIENTSTATEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableClientStateIndexedEXT")) == NULL) || r; - r = ((glFramebufferDrawBufferEXT = (PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferDrawBufferEXT")) == NULL) || r; - r = ((glFramebufferDrawBuffersEXT = (PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferDrawBuffersEXT")) == NULL) || r; - r = ((glFramebufferReadBufferEXT = (PFNGLFRAMEBUFFERREADBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferReadBufferEXT")) == NULL) || r; - r = ((glGenerateMultiTexMipmapEXT = (PFNGLGENERATEMULTITEXMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateMultiTexMipmapEXT")) == NULL) || r; - r = ((glGenerateTextureMipmapEXT = (PFNGLGENERATETEXTUREMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateTextureMipmapEXT")) == NULL) || r; - r = ((glGetCompressedMultiTexImageEXT = (PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedMultiTexImageEXT")) == NULL) || r; - r = ((glGetCompressedTextureImageEXT = (PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetCompressedTextureImageEXT")) == NULL) || r; - r = ((glGetDoubleIndexedvEXT = (PFNGLGETDOUBLEINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetDoubleIndexedvEXT")) == NULL) || r; - r = ((glGetFloatIndexedvEXT = (PFNGLGETFLOATINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFloatIndexedvEXT")) == NULL) || r; - r = ((glGetFramebufferParameterivEXT = (PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferParameterivEXT")) == NULL) || r; - r = ((glGetMultiTexEnvfvEXT = (PFNGLGETMULTITEXENVFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexEnvfvEXT")) == NULL) || r; - r = ((glGetMultiTexEnvivEXT = (PFNGLGETMULTITEXENVIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexEnvivEXT")) == NULL) || r; - r = ((glGetMultiTexGendvEXT = (PFNGLGETMULTITEXGENDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGendvEXT")) == NULL) || r; - r = ((glGetMultiTexGenfvEXT = (PFNGLGETMULTITEXGENFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGenfvEXT")) == NULL) || r; - r = ((glGetMultiTexGenivEXT = (PFNGLGETMULTITEXGENIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexGenivEXT")) == NULL) || r; - r = ((glGetMultiTexImageEXT = (PFNGLGETMULTITEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexImageEXT")) == NULL) || r; - r = ((glGetMultiTexLevelParameterfvEXT = (PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexLevelParameterfvEXT")) == NULL) || r; - r = ((glGetMultiTexLevelParameterivEXT = (PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexLevelParameterivEXT")) == NULL) || r; - r = ((glGetMultiTexParameterIivEXT = (PFNGLGETMULTITEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterIivEXT")) == NULL) || r; - r = ((glGetMultiTexParameterIuivEXT = (PFNGLGETMULTITEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterIuivEXT")) == NULL) || r; - r = ((glGetMultiTexParameterfvEXT = (PFNGLGETMULTITEXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterfvEXT")) == NULL) || r; - r = ((glGetMultiTexParameterivEXT = (PFNGLGETMULTITEXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMultiTexParameterivEXT")) == NULL) || r; - r = ((glGetNamedBufferParameterivEXT = (PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferParameterivEXT")) == NULL) || r; - r = ((glGetNamedBufferPointervEXT = (PFNGLGETNAMEDBUFFERPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferPointervEXT")) == NULL) || r; - r = ((glGetNamedBufferSubDataEXT = (PFNGLGETNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedBufferSubDataEXT")) == NULL) || r; - r = ((glGetNamedFramebufferAttachmentParameterivEXT = (PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedFramebufferAttachmentParameterivEXT")) == NULL) || r; - r = ((glGetNamedProgramLocalParameterIivEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterIivEXT")) == NULL) || r; - r = ((glGetNamedProgramLocalParameterIuivEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterIuivEXT")) == NULL) || r; - r = ((glGetNamedProgramLocalParameterdvEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterdvEXT")) == NULL) || r; - r = ((glGetNamedProgramLocalParameterfvEXT = (PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramLocalParameterfvEXT")) == NULL) || r; - r = ((glGetNamedProgramStringEXT = (PFNGLGETNAMEDPROGRAMSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramStringEXT")) == NULL) || r; - r = ((glGetNamedProgramivEXT = (PFNGLGETNAMEDPROGRAMIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedProgramivEXT")) == NULL) || r; - r = ((glGetNamedRenderbufferParameterivEXT = (PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetNamedRenderbufferParameterivEXT")) == NULL) || r; - r = ((glGetPointerIndexedvEXT = (PFNGLGETPOINTERINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPointerIndexedvEXT")) == NULL) || r; - r = ((glGetTextureImageEXT = (PFNGLGETTEXTUREIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureImageEXT")) == NULL) || r; - r = ((glGetTextureLevelParameterfvEXT = (PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameterfvEXT")) == NULL) || r; - r = ((glGetTextureLevelParameterivEXT = (PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureLevelParameterivEXT")) == NULL) || r; - r = ((glGetTextureParameterIivEXT = (PFNGLGETTEXTUREPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIivEXT")) == NULL) || r; - r = ((glGetTextureParameterIuivEXT = (PFNGLGETTEXTUREPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterIuivEXT")) == NULL) || r; - r = ((glGetTextureParameterfvEXT = (PFNGLGETTEXTUREPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterfvEXT")) == NULL) || r; - r = ((glGetTextureParameterivEXT = (PFNGLGETTEXTUREPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTextureParameterivEXT")) == NULL) || r; - r = ((glMapNamedBufferEXT = (PFNGLMAPNAMEDBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMapNamedBufferEXT")) == NULL) || r; - r = ((glMatrixFrustumEXT = (PFNGLMATRIXFRUSTUMEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixFrustumEXT")) == NULL) || r; - r = ((glMatrixLoadIdentityEXT = (PFNGLMATRIXLOADIDENTITYEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadIdentityEXT")) == NULL) || r; - r = ((glMatrixLoadTransposedEXT = (PFNGLMATRIXLOADTRANSPOSEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadTransposedEXT")) == NULL) || r; - r = ((glMatrixLoadTransposefEXT = (PFNGLMATRIXLOADTRANSPOSEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadTransposefEXT")) == NULL) || r; - r = ((glMatrixLoaddEXT = (PFNGLMATRIXLOADDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoaddEXT")) == NULL) || r; - r = ((glMatrixLoadfEXT = (PFNGLMATRIXLOADFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixLoadfEXT")) == NULL) || r; - r = ((glMatrixMultTransposedEXT = (PFNGLMATRIXMULTTRANSPOSEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultTransposedEXT")) == NULL) || r; - r = ((glMatrixMultTransposefEXT = (PFNGLMATRIXMULTTRANSPOSEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultTransposefEXT")) == NULL) || r; - r = ((glMatrixMultdEXT = (PFNGLMATRIXMULTDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultdEXT")) == NULL) || r; - r = ((glMatrixMultfEXT = (PFNGLMATRIXMULTFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixMultfEXT")) == NULL) || r; - r = ((glMatrixOrthoEXT = (PFNGLMATRIXORTHOEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixOrthoEXT")) == NULL) || r; - r = ((glMatrixPopEXT = (PFNGLMATRIXPOPEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixPopEXT")) == NULL) || r; - r = ((glMatrixPushEXT = (PFNGLMATRIXPUSHEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixPushEXT")) == NULL) || r; - r = ((glMatrixRotatedEXT = (PFNGLMATRIXROTATEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixRotatedEXT")) == NULL) || r; - r = ((glMatrixRotatefEXT = (PFNGLMATRIXROTATEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixRotatefEXT")) == NULL) || r; - r = ((glMatrixScaledEXT = (PFNGLMATRIXSCALEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixScaledEXT")) == NULL) || r; - r = ((glMatrixScalefEXT = (PFNGLMATRIXSCALEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixScalefEXT")) == NULL) || r; - r = ((glMatrixTranslatedEXT = (PFNGLMATRIXTRANSLATEDEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixTranslatedEXT")) == NULL) || r; - r = ((glMatrixTranslatefEXT = (PFNGLMATRIXTRANSLATEFEXTPROC)glewGetProcAddress((const GLubyte*)"glMatrixTranslatefEXT")) == NULL) || r; - r = ((glMultiTexBufferEXT = (PFNGLMULTITEXBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexBufferEXT")) == NULL) || r; - r = ((glMultiTexCoordPointerEXT = (PFNGLMULTITEXCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoordPointerEXT")) == NULL) || r; - r = ((glMultiTexEnvfEXT = (PFNGLMULTITEXENVFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvfEXT")) == NULL) || r; - r = ((glMultiTexEnvfvEXT = (PFNGLMULTITEXENVFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvfvEXT")) == NULL) || r; - r = ((glMultiTexEnviEXT = (PFNGLMULTITEXENVIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnviEXT")) == NULL) || r; - r = ((glMultiTexEnvivEXT = (PFNGLMULTITEXENVIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexEnvivEXT")) == NULL) || r; - r = ((glMultiTexGendEXT = (PFNGLMULTITEXGENDEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGendEXT")) == NULL) || r; - r = ((glMultiTexGendvEXT = (PFNGLMULTITEXGENDVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGendvEXT")) == NULL) || r; - r = ((glMultiTexGenfEXT = (PFNGLMULTITEXGENFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenfEXT")) == NULL) || r; - r = ((glMultiTexGenfvEXT = (PFNGLMULTITEXGENFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenfvEXT")) == NULL) || r; - r = ((glMultiTexGeniEXT = (PFNGLMULTITEXGENIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGeniEXT")) == NULL) || r; - r = ((glMultiTexGenivEXT = (PFNGLMULTITEXGENIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexGenivEXT")) == NULL) || r; - r = ((glMultiTexImage1DEXT = (PFNGLMULTITEXIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage1DEXT")) == NULL) || r; - r = ((glMultiTexImage2DEXT = (PFNGLMULTITEXIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage2DEXT")) == NULL) || r; - r = ((glMultiTexImage3DEXT = (PFNGLMULTITEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexImage3DEXT")) == NULL) || r; - r = ((glMultiTexParameterIivEXT = (PFNGLMULTITEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterIivEXT")) == NULL) || r; - r = ((glMultiTexParameterIuivEXT = (PFNGLMULTITEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterIuivEXT")) == NULL) || r; - r = ((glMultiTexParameterfEXT = (PFNGLMULTITEXPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterfEXT")) == NULL) || r; - r = ((glMultiTexParameterfvEXT = (PFNGLMULTITEXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterfvEXT")) == NULL) || r; - r = ((glMultiTexParameteriEXT = (PFNGLMULTITEXPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameteriEXT")) == NULL) || r; - r = ((glMultiTexParameterivEXT = (PFNGLMULTITEXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexParameterivEXT")) == NULL) || r; - r = ((glMultiTexRenderbufferEXT = (PFNGLMULTITEXRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexRenderbufferEXT")) == NULL) || r; - r = ((glMultiTexSubImage1DEXT = (PFNGLMULTITEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage1DEXT")) == NULL) || r; - r = ((glMultiTexSubImage2DEXT = (PFNGLMULTITEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage2DEXT")) == NULL) || r; - r = ((glMultiTexSubImage3DEXT = (PFNGLMULTITEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiTexSubImage3DEXT")) == NULL) || r; - r = ((glNamedBufferDataEXT = (PFNGLNAMEDBUFFERDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferDataEXT")) == NULL) || r; - r = ((glNamedBufferSubDataEXT = (PFNGLNAMEDBUFFERSUBDATAEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedBufferSubDataEXT")) == NULL) || r; - r = ((glNamedFramebufferRenderbufferEXT = (PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferRenderbufferEXT")) == NULL) || r; - r = ((glNamedFramebufferTexture1DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture1DEXT")) == NULL) || r; - r = ((glNamedFramebufferTexture2DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture2DEXT")) == NULL) || r; - r = ((glNamedFramebufferTexture3DEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTexture3DEXT")) == NULL) || r; - r = ((glNamedFramebufferTextureEXT = (PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureEXT")) == NULL) || r; - r = ((glNamedFramebufferTextureFaceEXT = (PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureFaceEXT")) == NULL) || r; - r = ((glNamedFramebufferTextureLayerEXT = (PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC)glewGetProcAddress((const GLubyte*)"glNamedFramebufferTextureLayerEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameter4dEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4dEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameter4dvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4dvEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameter4fEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4fEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameter4fvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameter4fvEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameterI4iEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4iEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameterI4ivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4ivEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameterI4uiEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4uiEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameterI4uivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameterI4uivEXT")) == NULL) || r; - r = ((glNamedProgramLocalParameters4fvEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParameters4fvEXT")) == NULL) || r; - r = ((glNamedProgramLocalParametersI4ivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParametersI4ivEXT")) == NULL) || r; - r = ((glNamedProgramLocalParametersI4uivEXT = (PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramLocalParametersI4uivEXT")) == NULL) || r; - r = ((glNamedProgramStringEXT = (PFNGLNAMEDPROGRAMSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedProgramStringEXT")) == NULL) || r; - r = ((glNamedRenderbufferStorageEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageEXT")) == NULL) || r; - r = ((glNamedRenderbufferStorageMultisampleCoverageEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageMultisampleCoverageEXT")) == NULL) || r; - r = ((glNamedRenderbufferStorageMultisampleEXT = (PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glNamedRenderbufferStorageMultisampleEXT")) == NULL) || r; - r = ((glProgramUniform1fEXT = (PFNGLPROGRAMUNIFORM1FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fEXT")) == NULL) || r; - r = ((glProgramUniform1fvEXT = (PFNGLPROGRAMUNIFORM1FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1fvEXT")) == NULL) || r; - r = ((glProgramUniform1iEXT = (PFNGLPROGRAMUNIFORM1IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1iEXT")) == NULL) || r; - r = ((glProgramUniform1ivEXT = (PFNGLPROGRAMUNIFORM1IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1ivEXT")) == NULL) || r; - r = ((glProgramUniform1uiEXT = (PFNGLPROGRAMUNIFORM1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uiEXT")) == NULL) || r; - r = ((glProgramUniform1uivEXT = (PFNGLPROGRAMUNIFORM1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform1uivEXT")) == NULL) || r; - r = ((glProgramUniform2fEXT = (PFNGLPROGRAMUNIFORM2FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fEXT")) == NULL) || r; - r = ((glProgramUniform2fvEXT = (PFNGLPROGRAMUNIFORM2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2fvEXT")) == NULL) || r; - r = ((glProgramUniform2iEXT = (PFNGLPROGRAMUNIFORM2IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2iEXT")) == NULL) || r; - r = ((glProgramUniform2ivEXT = (PFNGLPROGRAMUNIFORM2IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2ivEXT")) == NULL) || r; - r = ((glProgramUniform2uiEXT = (PFNGLPROGRAMUNIFORM2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uiEXT")) == NULL) || r; - r = ((glProgramUniform2uivEXT = (PFNGLPROGRAMUNIFORM2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform2uivEXT")) == NULL) || r; - r = ((glProgramUniform3fEXT = (PFNGLPROGRAMUNIFORM3FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fEXT")) == NULL) || r; - r = ((glProgramUniform3fvEXT = (PFNGLPROGRAMUNIFORM3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3fvEXT")) == NULL) || r; - r = ((glProgramUniform3iEXT = (PFNGLPROGRAMUNIFORM3IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3iEXT")) == NULL) || r; - r = ((glProgramUniform3ivEXT = (PFNGLPROGRAMUNIFORM3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3ivEXT")) == NULL) || r; - r = ((glProgramUniform3uiEXT = (PFNGLPROGRAMUNIFORM3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uiEXT")) == NULL) || r; - r = ((glProgramUniform3uivEXT = (PFNGLPROGRAMUNIFORM3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform3uivEXT")) == NULL) || r; - r = ((glProgramUniform4fEXT = (PFNGLPROGRAMUNIFORM4FEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fEXT")) == NULL) || r; - r = ((glProgramUniform4fvEXT = (PFNGLPROGRAMUNIFORM4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4fvEXT")) == NULL) || r; - r = ((glProgramUniform4iEXT = (PFNGLPROGRAMUNIFORM4IEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4iEXT")) == NULL) || r; - r = ((glProgramUniform4ivEXT = (PFNGLPROGRAMUNIFORM4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4ivEXT")) == NULL) || r; - r = ((glProgramUniform4uiEXT = (PFNGLPROGRAMUNIFORM4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uiEXT")) == NULL) || r; - r = ((glProgramUniform4uivEXT = (PFNGLPROGRAMUNIFORM4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniform4uivEXT")) == NULL) || r; - r = ((glProgramUniformMatrix2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix2x3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x3fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix2x4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix2x4fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix3x2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x2fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix3x4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix3x4fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix4fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix4x2fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x2fvEXT")) == NULL) || r; - r = ((glProgramUniformMatrix4x3fvEXT = (PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramUniformMatrix4x3fvEXT")) == NULL) || r; - r = ((glPushClientAttribDefaultEXT = (PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC)glewGetProcAddress((const GLubyte*)"glPushClientAttribDefaultEXT")) == NULL) || r; - r = ((glTextureBufferEXT = (PFNGLTEXTUREBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTextureBufferEXT")) == NULL) || r; - r = ((glTextureImage1DEXT = (PFNGLTEXTUREIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage1DEXT")) == NULL) || r; - r = ((glTextureImage2DEXT = (PFNGLTEXTUREIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage2DEXT")) == NULL) || r; - r = ((glTextureImage3DEXT = (PFNGLTEXTUREIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureImage3DEXT")) == NULL) || r; - r = ((glTextureParameterIivEXT = (PFNGLTEXTUREPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIivEXT")) == NULL) || r; - r = ((glTextureParameterIuivEXT = (PFNGLTEXTUREPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterIuivEXT")) == NULL) || r; - r = ((glTextureParameterfEXT = (PFNGLTEXTUREPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterfEXT")) == NULL) || r; - r = ((glTextureParameterfvEXT = (PFNGLTEXTUREPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterfvEXT")) == NULL) || r; - r = ((glTextureParameteriEXT = (PFNGLTEXTUREPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameteriEXT")) == NULL) || r; - r = ((glTextureParameterivEXT = (PFNGLTEXTUREPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureParameterivEXT")) == NULL) || r; - r = ((glTextureRenderbufferEXT = (PFNGLTEXTURERENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTextureRenderbufferEXT")) == NULL) || r; - r = ((glTextureSubImage1DEXT = (PFNGLTEXTURESUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage1DEXT")) == NULL) || r; - r = ((glTextureSubImage2DEXT = (PFNGLTEXTURESUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage2DEXT")) == NULL) || r; - r = ((glTextureSubImage3DEXT = (PFNGLTEXTURESUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureSubImage3DEXT")) == NULL) || r; - r = ((glUnmapNamedBufferEXT = (PFNGLUNMAPNAMEDBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glUnmapNamedBufferEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_direct_state_access */ - -#ifdef GL_EXT_draw_buffers2 - -static GLboolean _glewInit_GL_EXT_draw_buffers2 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorMaskIndexedEXT = (PFNGLCOLORMASKINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glColorMaskIndexedEXT")) == NULL) || r; - r = ((glDisableIndexedEXT = (PFNGLDISABLEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableIndexedEXT")) == NULL) || r; - r = ((glEnableIndexedEXT = (PFNGLENABLEINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableIndexedEXT")) == NULL) || r; - r = ((glGetBooleanIndexedvEXT = (PFNGLGETBOOLEANINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetBooleanIndexedvEXT")) == NULL) || r; - r = ((glGetIntegerIndexedvEXT = (PFNGLGETINTEGERINDEXEDVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetIntegerIndexedvEXT")) == NULL) || r; - r = ((glIsEnabledIndexedEXT = (PFNGLISENABLEDINDEXEDEXTPROC)glewGetProcAddress((const GLubyte*)"glIsEnabledIndexedEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_draw_buffers2 */ - -#ifdef GL_EXT_draw_instanced - -static GLboolean _glewInit_GL_EXT_draw_instanced (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawArraysInstancedEXT = (PFNGLDRAWARRAYSINSTANCEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysInstancedEXT")) == NULL) || r; - r = ((glDrawElementsInstancedEXT = (PFNGLDRAWELEMENTSINSTANCEDEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawElementsInstancedEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_draw_instanced */ - -#ifdef GL_EXT_draw_range_elements - -static GLboolean _glewInit_GL_EXT_draw_range_elements (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDrawRangeElementsEXT = (PFNGLDRAWRANGEELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawRangeElementsEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_draw_range_elements */ - -#ifdef GL_EXT_fog_coord - -static GLboolean _glewInit_GL_EXT_fog_coord (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFogCoordPointerEXT = (PFNGLFOGCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerEXT")) == NULL) || r; - r = ((glFogCoorddEXT = (PFNGLFOGCOORDDEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddEXT")) == NULL) || r; - r = ((glFogCoorddvEXT = (PFNGLFOGCOORDDVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoorddvEXT")) == NULL) || r; - r = ((glFogCoordfEXT = (PFNGLFOGCOORDFEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfEXT")) == NULL) || r; - r = ((glFogCoordfvEXT = (PFNGLFOGCOORDFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFogCoordfvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_fog_coord */ - -#ifdef GL_EXT_fragment_lighting - -static GLboolean _glewInit_GL_EXT_fragment_lighting (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFragmentColorMaterialEXT = (PFNGLFRAGMENTCOLORMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialEXT")) == NULL) || r; - r = ((glFragmentLightModelfEXT = (PFNGLFRAGMENTLIGHTMODELFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfEXT")) == NULL) || r; - r = ((glFragmentLightModelfvEXT = (PFNGLFRAGMENTLIGHTMODELFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvEXT")) == NULL) || r; - r = ((glFragmentLightModeliEXT = (PFNGLFRAGMENTLIGHTMODELIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliEXT")) == NULL) || r; - r = ((glFragmentLightModelivEXT = (PFNGLFRAGMENTLIGHTMODELIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivEXT")) == NULL) || r; - r = ((glFragmentLightfEXT = (PFNGLFRAGMENTLIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfEXT")) == NULL) || r; - r = ((glFragmentLightfvEXT = (PFNGLFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvEXT")) == NULL) || r; - r = ((glFragmentLightiEXT = (PFNGLFRAGMENTLIGHTIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiEXT")) == NULL) || r; - r = ((glFragmentLightivEXT = (PFNGLFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivEXT")) == NULL) || r; - r = ((glFragmentMaterialfEXT = (PFNGLFRAGMENTMATERIALFEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfEXT")) == NULL) || r; - r = ((glFragmentMaterialfvEXT = (PFNGLFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvEXT")) == NULL) || r; - r = ((glFragmentMaterialiEXT = (PFNGLFRAGMENTMATERIALIEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiEXT")) == NULL) || r; - r = ((glFragmentMaterialivEXT = (PFNGLFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivEXT")) == NULL) || r; - r = ((glGetFragmentLightfvEXT = (PFNGLGETFRAGMENTLIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvEXT")) == NULL) || r; - r = ((glGetFragmentLightivEXT = (PFNGLGETFRAGMENTLIGHTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivEXT")) == NULL) || r; - r = ((glGetFragmentMaterialfvEXT = (PFNGLGETFRAGMENTMATERIALFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvEXT")) == NULL) || r; - r = ((glGetFragmentMaterialivEXT = (PFNGLGETFRAGMENTMATERIALIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivEXT")) == NULL) || r; - r = ((glLightEnviEXT = (PFNGLLIGHTENVIEXTPROC)glewGetProcAddress((const GLubyte*)"glLightEnviEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_fragment_lighting */ - -#ifdef GL_EXT_framebuffer_blit - -static GLboolean _glewInit_GL_EXT_framebuffer_blit (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBlitFramebufferEXT = (PFNGLBLITFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBlitFramebufferEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_framebuffer_blit */ - -#ifdef GL_EXT_framebuffer_multisample - -static GLboolean _glewInit_GL_EXT_framebuffer_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glRenderbufferStorageMultisampleEXT = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_framebuffer_multisample */ - -#ifdef GL_EXT_framebuffer_object - -static GLboolean _glewInit_GL_EXT_framebuffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindFramebufferEXT")) == NULL) || r; - r = ((glBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindRenderbufferEXT")) == NULL) || r; - r = ((glCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)glewGetProcAddress((const GLubyte*)"glCheckFramebufferStatusEXT")) == NULL) || r; - r = ((glDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteFramebuffersEXT")) == NULL) || r; - r = ((glDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteRenderbuffersEXT")) == NULL) || r; - r = ((glFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferRenderbufferEXT")) == NULL) || r; - r = ((glFramebufferTexture1DEXT = (PFNGLFRAMEBUFFERTEXTURE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture1DEXT")) == NULL) || r; - r = ((glFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture2DEXT")) == NULL) || r; - r = ((glFramebufferTexture3DEXT = (PFNGLFRAMEBUFFERTEXTURE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTexture3DEXT")) == NULL) || r; - r = ((glGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenFramebuffersEXT")) == NULL) || r; - r = ((glGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenRenderbuffersEXT")) == NULL) || r; - r = ((glGenerateMipmapEXT = (PFNGLGENERATEMIPMAPEXTPROC)glewGetProcAddress((const GLubyte*)"glGenerateMipmapEXT")) == NULL) || r; - r = ((glGetFramebufferAttachmentParameterivEXT = (PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFramebufferAttachmentParameterivEXT")) == NULL) || r; - r = ((glGetRenderbufferParameterivEXT = (PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetRenderbufferParameterivEXT")) == NULL) || r; - r = ((glIsFramebufferEXT = (PFNGLISFRAMEBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsFramebufferEXT")) == NULL) || r; - r = ((glIsRenderbufferEXT = (PFNGLISRENDERBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glIsRenderbufferEXT")) == NULL) || r; - r = ((glRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_framebuffer_object */ - -#ifdef GL_EXT_framebuffer_sRGB - -#endif /* GL_EXT_framebuffer_sRGB */ - -#ifdef GL_EXT_geometry_shader4 - -static GLboolean _glewInit_GL_EXT_geometry_shader4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFramebufferTextureEXT = (PFNGLFRAMEBUFFERTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureEXT")) == NULL) || r; - r = ((glFramebufferTextureFaceEXT = (PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureFaceEXT")) == NULL) || r; - r = ((glFramebufferTextureLayerEXT = (PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC)glewGetProcAddress((const GLubyte*)"glFramebufferTextureLayerEXT")) == NULL) || r; - r = ((glProgramParameteriEXT = (PFNGLPROGRAMPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramParameteriEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_geometry_shader4 */ - -#ifdef GL_EXT_gpu_program_parameters - -static GLboolean _glewInit_GL_EXT_gpu_program_parameters (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glProgramEnvParameters4fvEXT = (PFNGLPROGRAMENVPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameters4fvEXT")) == NULL) || r; - r = ((glProgramLocalParameters4fvEXT = (PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameters4fvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_gpu_program_parameters */ - -#ifdef GL_EXT_gpu_shader4 - -static GLboolean _glewInit_GL_EXT_gpu_shader4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBindFragDataLocationEXT = (PFNGLBINDFRAGDATALOCATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glBindFragDataLocationEXT")) == NULL) || r; - r = ((glGetFragDataLocationEXT = (PFNGLGETFRAGDATALOCATIONEXTPROC)glewGetProcAddress((const GLubyte*)"glGetFragDataLocationEXT")) == NULL) || r; - r = ((glGetUniformuivEXT = (PFNGLGETUNIFORMUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetUniformuivEXT")) == NULL) || r; - r = ((glGetVertexAttribIivEXT = (PFNGLGETVERTEXATTRIBIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIivEXT")) == NULL) || r; - r = ((glGetVertexAttribIuivEXT = (PFNGLGETVERTEXATTRIBIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribIuivEXT")) == NULL) || r; - r = ((glUniform1uiEXT = (PFNGLUNIFORM1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform1uiEXT")) == NULL) || r; - r = ((glUniform1uivEXT = (PFNGLUNIFORM1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform1uivEXT")) == NULL) || r; - r = ((glUniform2uiEXT = (PFNGLUNIFORM2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform2uiEXT")) == NULL) || r; - r = ((glUniform2uivEXT = (PFNGLUNIFORM2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform2uivEXT")) == NULL) || r; - r = ((glUniform3uiEXT = (PFNGLUNIFORM3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform3uiEXT")) == NULL) || r; - r = ((glUniform3uivEXT = (PFNGLUNIFORM3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform3uivEXT")) == NULL) || r; - r = ((glUniform4uiEXT = (PFNGLUNIFORM4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform4uiEXT")) == NULL) || r; - r = ((glUniform4uivEXT = (PFNGLUNIFORM4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glUniform4uivEXT")) == NULL) || r; - r = ((glVertexAttribI1iEXT = (PFNGLVERTEXATTRIBI1IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1iEXT")) == NULL) || r; - r = ((glVertexAttribI1ivEXT = (PFNGLVERTEXATTRIBI1IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1ivEXT")) == NULL) || r; - r = ((glVertexAttribI1uiEXT = (PFNGLVERTEXATTRIBI1UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uiEXT")) == NULL) || r; - r = ((glVertexAttribI1uivEXT = (PFNGLVERTEXATTRIBI1UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI1uivEXT")) == NULL) || r; - r = ((glVertexAttribI2iEXT = (PFNGLVERTEXATTRIBI2IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2iEXT")) == NULL) || r; - r = ((glVertexAttribI2ivEXT = (PFNGLVERTEXATTRIBI2IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2ivEXT")) == NULL) || r; - r = ((glVertexAttribI2uiEXT = (PFNGLVERTEXATTRIBI2UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uiEXT")) == NULL) || r; - r = ((glVertexAttribI2uivEXT = (PFNGLVERTEXATTRIBI2UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI2uivEXT")) == NULL) || r; - r = ((glVertexAttribI3iEXT = (PFNGLVERTEXATTRIBI3IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3iEXT")) == NULL) || r; - r = ((glVertexAttribI3ivEXT = (PFNGLVERTEXATTRIBI3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3ivEXT")) == NULL) || r; - r = ((glVertexAttribI3uiEXT = (PFNGLVERTEXATTRIBI3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uiEXT")) == NULL) || r; - r = ((glVertexAttribI3uivEXT = (PFNGLVERTEXATTRIBI3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI3uivEXT")) == NULL) || r; - r = ((glVertexAttribI4bvEXT = (PFNGLVERTEXATTRIBI4BVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4bvEXT")) == NULL) || r; - r = ((glVertexAttribI4iEXT = (PFNGLVERTEXATTRIBI4IEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4iEXT")) == NULL) || r; - r = ((glVertexAttribI4ivEXT = (PFNGLVERTEXATTRIBI4IVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ivEXT")) == NULL) || r; - r = ((glVertexAttribI4svEXT = (PFNGLVERTEXATTRIBI4SVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4svEXT")) == NULL) || r; - r = ((glVertexAttribI4ubvEXT = (PFNGLVERTEXATTRIBI4UBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4ubvEXT")) == NULL) || r; - r = ((glVertexAttribI4uiEXT = (PFNGLVERTEXATTRIBI4UIEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uiEXT")) == NULL) || r; - r = ((glVertexAttribI4uivEXT = (PFNGLVERTEXATTRIBI4UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4uivEXT")) == NULL) || r; - r = ((glVertexAttribI4usvEXT = (PFNGLVERTEXATTRIBI4USVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribI4usvEXT")) == NULL) || r; - r = ((glVertexAttribIPointerEXT = (PFNGLVERTEXATTRIBIPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribIPointerEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_gpu_shader4 */ - -#ifdef GL_EXT_histogram - -static GLboolean _glewInit_GL_EXT_histogram (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetHistogramEXT = (PFNGLGETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramEXT")) == NULL) || r; - r = ((glGetHistogramParameterfvEXT = (PFNGLGETHISTOGRAMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterfvEXT")) == NULL) || r; - r = ((glGetHistogramParameterivEXT = (PFNGLGETHISTOGRAMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetHistogramParameterivEXT")) == NULL) || r; - r = ((glGetMinmaxEXT = (PFNGLGETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxEXT")) == NULL) || r; - r = ((glGetMinmaxParameterfvEXT = (PFNGLGETMINMAXPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterfvEXT")) == NULL) || r; - r = ((glGetMinmaxParameterivEXT = (PFNGLGETMINMAXPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetMinmaxParameterivEXT")) == NULL) || r; - r = ((glHistogramEXT = (PFNGLHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glHistogramEXT")) == NULL) || r; - r = ((glMinmaxEXT = (PFNGLMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glMinmaxEXT")) == NULL) || r; - r = ((glResetHistogramEXT = (PFNGLRESETHISTOGRAMEXTPROC)glewGetProcAddress((const GLubyte*)"glResetHistogramEXT")) == NULL) || r; - r = ((glResetMinmaxEXT = (PFNGLRESETMINMAXEXTPROC)glewGetProcAddress((const GLubyte*)"glResetMinmaxEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_histogram */ - -#ifdef GL_EXT_index_array_formats - -#endif /* GL_EXT_index_array_formats */ - -#ifdef GL_EXT_index_func - -static GLboolean _glewInit_GL_EXT_index_func (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glIndexFuncEXT = (PFNGLINDEXFUNCEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexFuncEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_index_func */ - -#ifdef GL_EXT_index_material - -static GLboolean _glewInit_GL_EXT_index_material (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glIndexMaterialEXT = (PFNGLINDEXMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glIndexMaterialEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_index_material */ - -#ifdef GL_EXT_index_texture - -#endif /* GL_EXT_index_texture */ - -#ifdef GL_EXT_light_texture - -static GLboolean _glewInit_GL_EXT_light_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glApplyTextureEXT = (PFNGLAPPLYTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glApplyTextureEXT")) == NULL) || r; - r = ((glTextureLightEXT = (PFNGLTEXTURELIGHTEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureLightEXT")) == NULL) || r; - r = ((glTextureMaterialEXT = (PFNGLTEXTUREMATERIALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureMaterialEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_light_texture */ - -#ifdef GL_EXT_misc_attribute - -#endif /* GL_EXT_misc_attribute */ - -#ifdef GL_EXT_multi_draw_arrays - -static GLboolean _glewInit_GL_EXT_multi_draw_arrays (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glMultiDrawArraysEXT = (PFNGLMULTIDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawArraysEXT")) == NULL) || r; - r = ((glMultiDrawElementsEXT = (PFNGLMULTIDRAWELEMENTSEXTPROC)glewGetProcAddress((const GLubyte*)"glMultiDrawElementsEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_multi_draw_arrays */ - -#ifdef GL_EXT_multisample - -static GLboolean _glewInit_GL_EXT_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSampleMaskEXT = (PFNGLSAMPLEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskEXT")) == NULL) || r; - r = ((glSamplePatternEXT = (PFNGLSAMPLEPATTERNEXTPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_multisample */ - -#ifdef GL_EXT_packed_depth_stencil - -#endif /* GL_EXT_packed_depth_stencil */ - -#ifdef GL_EXT_packed_float - -#endif /* GL_EXT_packed_float */ - -#ifdef GL_EXT_packed_pixels - -#endif /* GL_EXT_packed_pixels */ - -#ifdef GL_EXT_paletted_texture - -static GLboolean _glewInit_GL_EXT_paletted_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorTableEXT = (PFNGLCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glColorTableEXT")) == NULL) || r; - r = ((glGetColorTableEXT = (PFNGLGETCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableEXT")) == NULL) || r; - r = ((glGetColorTableParameterfvEXT = (PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvEXT")) == NULL) || r; - r = ((glGetColorTableParameterivEXT = (PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_paletted_texture */ - -#ifdef GL_EXT_pixel_buffer_object - -#endif /* GL_EXT_pixel_buffer_object */ - -#ifdef GL_EXT_pixel_transform - -static GLboolean _glewInit_GL_EXT_pixel_transform (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetPixelTransformParameterfvEXT = (PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterfvEXT")) == NULL) || r; - r = ((glGetPixelTransformParameterivEXT = (PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPixelTransformParameterivEXT")) == NULL) || r; - r = ((glPixelTransformParameterfEXT = (PFNGLPIXELTRANSFORMPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfEXT")) == NULL) || r; - r = ((glPixelTransformParameterfvEXT = (PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterfvEXT")) == NULL) || r; - r = ((glPixelTransformParameteriEXT = (PFNGLPIXELTRANSFORMPARAMETERIEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameteriEXT")) == NULL) || r; - r = ((glPixelTransformParameterivEXT = (PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC)glewGetProcAddress((const GLubyte*)"glPixelTransformParameterivEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_pixel_transform */ - -#ifdef GL_EXT_pixel_transform_color_table - -#endif /* GL_EXT_pixel_transform_color_table */ - -#ifdef GL_EXT_point_parameters - -static GLboolean _glewInit_GL_EXT_point_parameters (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPointParameterfEXT = (PFNGLPOINTPARAMETERFEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfEXT")) == NULL) || r; - r = ((glPointParameterfvEXT = (PFNGLPOINTPARAMETERFVEXTPROC)glewGetProcAddress((const GLubyte*)"glPointParameterfvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_point_parameters */ - -#ifdef GL_EXT_polygon_offset - -static GLboolean _glewInit_GL_EXT_polygon_offset (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPolygonOffsetEXT = (PFNGLPOLYGONOFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glPolygonOffsetEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_polygon_offset */ - -#ifdef GL_EXT_rescale_normal - -#endif /* GL_EXT_rescale_normal */ - -#ifdef GL_EXT_scene_marker - -static GLboolean _glewInit_GL_EXT_scene_marker (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginSceneEXT = (PFNGLBEGINSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glBeginSceneEXT")) == NULL) || r; - r = ((glEndSceneEXT = (PFNGLENDSCENEEXTPROC)glewGetProcAddress((const GLubyte*)"glEndSceneEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_scene_marker */ - -#ifdef GL_EXT_secondary_color - -static GLboolean _glewInit_GL_EXT_secondary_color (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSecondaryColor3bEXT = (PFNGLSECONDARYCOLOR3BEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bEXT")) == NULL) || r; - r = ((glSecondaryColor3bvEXT = (PFNGLSECONDARYCOLOR3BVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3bvEXT")) == NULL) || r; - r = ((glSecondaryColor3dEXT = (PFNGLSECONDARYCOLOR3DEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dEXT")) == NULL) || r; - r = ((glSecondaryColor3dvEXT = (PFNGLSECONDARYCOLOR3DVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3dvEXT")) == NULL) || r; - r = ((glSecondaryColor3fEXT = (PFNGLSECONDARYCOLOR3FEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fEXT")) == NULL) || r; - r = ((glSecondaryColor3fvEXT = (PFNGLSECONDARYCOLOR3FVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3fvEXT")) == NULL) || r; - r = ((glSecondaryColor3iEXT = (PFNGLSECONDARYCOLOR3IEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3iEXT")) == NULL) || r; - r = ((glSecondaryColor3ivEXT = (PFNGLSECONDARYCOLOR3IVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ivEXT")) == NULL) || r; - r = ((glSecondaryColor3sEXT = (PFNGLSECONDARYCOLOR3SEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3sEXT")) == NULL) || r; - r = ((glSecondaryColor3svEXT = (PFNGLSECONDARYCOLOR3SVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3svEXT")) == NULL) || r; - r = ((glSecondaryColor3ubEXT = (PFNGLSECONDARYCOLOR3UBEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubEXT")) == NULL) || r; - r = ((glSecondaryColor3ubvEXT = (PFNGLSECONDARYCOLOR3UBVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3ubvEXT")) == NULL) || r; - r = ((glSecondaryColor3uiEXT = (PFNGLSECONDARYCOLOR3UIEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uiEXT")) == NULL) || r; - r = ((glSecondaryColor3uivEXT = (PFNGLSECONDARYCOLOR3UIVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3uivEXT")) == NULL) || r; - r = ((glSecondaryColor3usEXT = (PFNGLSECONDARYCOLOR3USEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usEXT")) == NULL) || r; - r = ((glSecondaryColor3usvEXT = (PFNGLSECONDARYCOLOR3USVEXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3usvEXT")) == NULL) || r; - r = ((glSecondaryColorPointerEXT = (PFNGLSECONDARYCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_secondary_color */ - -#ifdef GL_EXT_separate_specular_color - -#endif /* GL_EXT_separate_specular_color */ - -#ifdef GL_EXT_shadow_funcs - -#endif /* GL_EXT_shadow_funcs */ - -#ifdef GL_EXT_shared_texture_palette - -#endif /* GL_EXT_shared_texture_palette */ - -#ifdef GL_EXT_stencil_clear_tag - -#endif /* GL_EXT_stencil_clear_tag */ - -#ifdef GL_EXT_stencil_two_side - -static GLboolean _glewInit_GL_EXT_stencil_two_side (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glActiveStencilFaceEXT = (PFNGLACTIVESTENCILFACEEXTPROC)glewGetProcAddress((const GLubyte*)"glActiveStencilFaceEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_stencil_two_side */ - -#ifdef GL_EXT_stencil_wrap - -#endif /* GL_EXT_stencil_wrap */ - -#ifdef GL_EXT_subtexture - -static GLboolean _glewInit_GL_EXT_subtexture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexSubImage1DEXT = (PFNGLTEXSUBIMAGE1DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage1DEXT")) == NULL) || r; - r = ((glTexSubImage2DEXT = (PFNGLTEXSUBIMAGE2DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage2DEXT")) == NULL) || r; - r = ((glTexSubImage3DEXT = (PFNGLTEXSUBIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage3DEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_subtexture */ - -#ifdef GL_EXT_texture - -#endif /* GL_EXT_texture */ - -#ifdef GL_EXT_texture3D - -static GLboolean _glewInit_GL_EXT_texture3D (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexImage3DEXT = (PFNGLTEXIMAGE3DEXTPROC)glewGetProcAddress((const GLubyte*)"glTexImage3DEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture3D */ - -#ifdef GL_EXT_texture_array - -#endif /* GL_EXT_texture_array */ - -#ifdef GL_EXT_texture_buffer_object - -static GLboolean _glewInit_GL_EXT_texture_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexBufferEXT = (PFNGLTEXBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"glTexBufferEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture_buffer_object */ - -#ifdef GL_EXT_texture_compression_dxt1 - -#endif /* GL_EXT_texture_compression_dxt1 */ - -#ifdef GL_EXT_texture_compression_latc - -#endif /* GL_EXT_texture_compression_latc */ - -#ifdef GL_EXT_texture_compression_rgtc - -#endif /* GL_EXT_texture_compression_rgtc */ - -#ifdef GL_EXT_texture_compression_s3tc - -#endif /* GL_EXT_texture_compression_s3tc */ - -#ifdef GL_EXT_texture_cube_map - -#endif /* GL_EXT_texture_cube_map */ - -#ifdef GL_EXT_texture_edge_clamp - -#endif /* GL_EXT_texture_edge_clamp */ - -#ifdef GL_EXT_texture_env - -#endif /* GL_EXT_texture_env */ - -#ifdef GL_EXT_texture_env_add - -#endif /* GL_EXT_texture_env_add */ - -#ifdef GL_EXT_texture_env_combine - -#endif /* GL_EXT_texture_env_combine */ - -#ifdef GL_EXT_texture_env_dot3 - -#endif /* GL_EXT_texture_env_dot3 */ - -#ifdef GL_EXT_texture_filter_anisotropic - -#endif /* GL_EXT_texture_filter_anisotropic */ - -#ifdef GL_EXT_texture_integer - -static GLboolean _glewInit_GL_EXT_texture_integer (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClearColorIiEXT = (PFNGLCLEARCOLORIIEXTPROC)glewGetProcAddress((const GLubyte*)"glClearColorIiEXT")) == NULL) || r; - r = ((glClearColorIuiEXT = (PFNGLCLEARCOLORIUIEXTPROC)glewGetProcAddress((const GLubyte*)"glClearColorIuiEXT")) == NULL) || r; - r = ((glGetTexParameterIivEXT = (PFNGLGETTEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIivEXT")) == NULL) || r; - r = ((glGetTexParameterIuivEXT = (PFNGLGETTEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTexParameterIuivEXT")) == NULL) || r; - r = ((glTexParameterIivEXT = (PFNGLTEXPARAMETERIIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIivEXT")) == NULL) || r; - r = ((glTexParameterIuivEXT = (PFNGLTEXPARAMETERIUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glTexParameterIuivEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture_integer */ - -#ifdef GL_EXT_texture_lod_bias - -#endif /* GL_EXT_texture_lod_bias */ - -#ifdef GL_EXT_texture_mirror_clamp - -#endif /* GL_EXT_texture_mirror_clamp */ - -#ifdef GL_EXT_texture_object - -static GLboolean _glewInit_GL_EXT_texture_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAreTexturesResidentEXT = (PFNGLARETEXTURESRESIDENTEXTPROC)glewGetProcAddress((const GLubyte*)"glAreTexturesResidentEXT")) == NULL) || r; - r = ((glBindTextureEXT = (PFNGLBINDTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureEXT")) == NULL) || r; - r = ((glDeleteTexturesEXT = (PFNGLDELETETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteTexturesEXT")) == NULL) || r; - r = ((glGenTexturesEXT = (PFNGLGENTEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glGenTexturesEXT")) == NULL) || r; - r = ((glIsTextureEXT = (PFNGLISTEXTUREEXTPROC)glewGetProcAddress((const GLubyte*)"glIsTextureEXT")) == NULL) || r; - r = ((glPrioritizeTexturesEXT = (PFNGLPRIORITIZETEXTURESEXTPROC)glewGetProcAddress((const GLubyte*)"glPrioritizeTexturesEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture_object */ - -#ifdef GL_EXT_texture_perturb_normal - -static GLboolean _glewInit_GL_EXT_texture_perturb_normal (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTextureNormalEXT = (PFNGLTEXTURENORMALEXTPROC)glewGetProcAddress((const GLubyte*)"glTextureNormalEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_texture_perturb_normal */ - -#ifdef GL_EXT_texture_rectangle - -#endif /* GL_EXT_texture_rectangle */ - -#ifdef GL_EXT_texture_sRGB - -#endif /* GL_EXT_texture_sRGB */ - -#ifdef GL_EXT_texture_shared_exponent - -#endif /* GL_EXT_texture_shared_exponent */ - -#ifdef GL_EXT_texture_swizzle - -#endif /* GL_EXT_texture_swizzle */ - -#ifdef GL_EXT_timer_query - -static GLboolean _glewInit_GL_EXT_timer_query (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - -// r = ((glGetQueryObjecti64vEXT = (PFNGLGETQUERYOBJECTI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjecti64vEXT")) == NULL) || r; -// r = ((glGetQueryObjectui64vEXT = (PFNGLGETQUERYOBJECTUI64VEXTPROC)glewGetProcAddress((const GLubyte*)"glGetQueryObjectui64vEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_timer_query */ - -#ifdef GL_EXT_transform_feedback - -static GLboolean _glewInit_GL_EXT_transform_feedback (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginTransformFeedbackEXT = (PFNGLBEGINTRANSFORMFEEDBACKEXTPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedbackEXT")) == NULL) || r; - r = ((glBindBufferBaseEXT = (PFNGLBINDBUFFERBASEEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBaseEXT")) == NULL) || r; - r = ((glBindBufferOffsetEXT = (PFNGLBINDBUFFEROFFSETEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferOffsetEXT")) == NULL) || r; - r = ((glBindBufferRangeEXT = (PFNGLBINDBUFFERRANGEEXTPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRangeEXT")) == NULL) || r; - r = ((glEndTransformFeedbackEXT = (PFNGLENDTRANSFORMFEEDBACKEXTPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedbackEXT")) == NULL) || r; - r = ((glGetTransformFeedbackVaryingEXT = (PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVaryingEXT")) == NULL) || r; - r = ((glTransformFeedbackVaryingsEXT = (PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryingsEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_transform_feedback */ - -#ifdef GL_EXT_vertex_array - -static GLboolean _glewInit_GL_EXT_vertex_array (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glArrayElementEXT = (PFNGLARRAYELEMENTEXTPROC)glewGetProcAddress((const GLubyte*)"glArrayElementEXT")) == NULL) || r; - r = ((glColorPointerEXT = (PFNGLCOLORPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glColorPointerEXT")) == NULL) || r; - r = ((glDrawArraysEXT = (PFNGLDRAWARRAYSEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawArraysEXT")) == NULL) || r; - r = ((glEdgeFlagPointerEXT = (PFNGLEDGEFLAGPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerEXT")) == NULL) || r; - r = ((glGetPointervEXT = (PFNGLGETPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetPointervEXT")) == NULL) || r; - r = ((glIndexPointerEXT = (PFNGLINDEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerEXT")) == NULL) || r; - r = ((glNormalPointerEXT = (PFNGLNORMALPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerEXT")) == NULL) || r; - r = ((glTexCoordPointerEXT = (PFNGLTEXCOORDPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerEXT")) == NULL) || r; - r = ((glVertexPointerEXT = (PFNGLVERTEXPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_vertex_array */ - -#ifdef GL_EXT_vertex_array_bgra - -#endif /* GL_EXT_vertex_array_bgra */ - -#ifdef GL_EXT_vertex_shader - -static GLboolean _glewInit_GL_EXT_vertex_shader (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginVertexShaderEXT = (PFNGLBEGINVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBeginVertexShaderEXT")) == NULL) || r; - r = ((glBindLightParameterEXT = (PFNGLBINDLIGHTPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindLightParameterEXT")) == NULL) || r; - r = ((glBindMaterialParameterEXT = (PFNGLBINDMATERIALPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindMaterialParameterEXT")) == NULL) || r; - r = ((glBindParameterEXT = (PFNGLBINDPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindParameterEXT")) == NULL) || r; - r = ((glBindTexGenParameterEXT = (PFNGLBINDTEXGENPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTexGenParameterEXT")) == NULL) || r; - r = ((glBindTextureUnitParameterEXT = (PFNGLBINDTEXTUREUNITPARAMETEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindTextureUnitParameterEXT")) == NULL) || r; - r = ((glBindVertexShaderEXT = (PFNGLBINDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glBindVertexShaderEXT")) == NULL) || r; - r = ((glDeleteVertexShaderEXT = (PFNGLDELETEVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteVertexShaderEXT")) == NULL) || r; - r = ((glDisableVariantClientStateEXT = (PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glDisableVariantClientStateEXT")) == NULL) || r; - r = ((glEnableVariantClientStateEXT = (PFNGLENABLEVARIANTCLIENTSTATEEXTPROC)glewGetProcAddress((const GLubyte*)"glEnableVariantClientStateEXT")) == NULL) || r; - r = ((glEndVertexShaderEXT = (PFNGLENDVERTEXSHADEREXTPROC)glewGetProcAddress((const GLubyte*)"glEndVertexShaderEXT")) == NULL) || r; - r = ((glExtractComponentEXT = (PFNGLEXTRACTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glExtractComponentEXT")) == NULL) || r; - r = ((glGenSymbolsEXT = (PFNGLGENSYMBOLSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenSymbolsEXT")) == NULL) || r; - r = ((glGenVertexShadersEXT = (PFNGLGENVERTEXSHADERSEXTPROC)glewGetProcAddress((const GLubyte*)"glGenVertexShadersEXT")) == NULL) || r; - r = ((glGetInvariantBooleanvEXT = (PFNGLGETINVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantBooleanvEXT")) == NULL) || r; - r = ((glGetInvariantFloatvEXT = (PFNGLGETINVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantFloatvEXT")) == NULL) || r; - r = ((glGetInvariantIntegervEXT = (PFNGLGETINVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetInvariantIntegervEXT")) == NULL) || r; - r = ((glGetLocalConstantBooleanvEXT = (PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantBooleanvEXT")) == NULL) || r; - r = ((glGetLocalConstantFloatvEXT = (PFNGLGETLOCALCONSTANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantFloatvEXT")) == NULL) || r; - r = ((glGetLocalConstantIntegervEXT = (PFNGLGETLOCALCONSTANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetLocalConstantIntegervEXT")) == NULL) || r; - r = ((glGetVariantBooleanvEXT = (PFNGLGETVARIANTBOOLEANVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantBooleanvEXT")) == NULL) || r; - r = ((glGetVariantFloatvEXT = (PFNGLGETVARIANTFLOATVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantFloatvEXT")) == NULL) || r; - r = ((glGetVariantIntegervEXT = (PFNGLGETVARIANTINTEGERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantIntegervEXT")) == NULL) || r; - r = ((glGetVariantPointervEXT = (PFNGLGETVARIANTPOINTERVEXTPROC)glewGetProcAddress((const GLubyte*)"glGetVariantPointervEXT")) == NULL) || r; - r = ((glInsertComponentEXT = (PFNGLINSERTCOMPONENTEXTPROC)glewGetProcAddress((const GLubyte*)"glInsertComponentEXT")) == NULL) || r; - r = ((glIsVariantEnabledEXT = (PFNGLISVARIANTENABLEDEXTPROC)glewGetProcAddress((const GLubyte*)"glIsVariantEnabledEXT")) == NULL) || r; - r = ((glSetInvariantEXT = (PFNGLSETINVARIANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetInvariantEXT")) == NULL) || r; - r = ((glSetLocalConstantEXT = (PFNGLSETLOCALCONSTANTEXTPROC)glewGetProcAddress((const GLubyte*)"glSetLocalConstantEXT")) == NULL) || r; - r = ((glShaderOp1EXT = (PFNGLSHADEROP1EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp1EXT")) == NULL) || r; - r = ((glShaderOp2EXT = (PFNGLSHADEROP2EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp2EXT")) == NULL) || r; - r = ((glShaderOp3EXT = (PFNGLSHADEROP3EXTPROC)glewGetProcAddress((const GLubyte*)"glShaderOp3EXT")) == NULL) || r; - r = ((glSwizzleEXT = (PFNGLSWIZZLEEXTPROC)glewGetProcAddress((const GLubyte*)"glSwizzleEXT")) == NULL) || r; - r = ((glVariantPointerEXT = (PFNGLVARIANTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVariantPointerEXT")) == NULL) || r; - r = ((glVariantbvEXT = (PFNGLVARIANTBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantbvEXT")) == NULL) || r; - r = ((glVariantdvEXT = (PFNGLVARIANTDVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantdvEXT")) == NULL) || r; - r = ((glVariantfvEXT = (PFNGLVARIANTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantfvEXT")) == NULL) || r; - r = ((glVariantivEXT = (PFNGLVARIANTIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantivEXT")) == NULL) || r; - r = ((glVariantsvEXT = (PFNGLVARIANTSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantsvEXT")) == NULL) || r; - r = ((glVariantubvEXT = (PFNGLVARIANTUBVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantubvEXT")) == NULL) || r; - r = ((glVariantuivEXT = (PFNGLVARIANTUIVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantuivEXT")) == NULL) || r; - r = ((glVariantusvEXT = (PFNGLVARIANTUSVEXTPROC)glewGetProcAddress((const GLubyte*)"glVariantusvEXT")) == NULL) || r; - r = ((glWriteMaskEXT = (PFNGLWRITEMASKEXTPROC)glewGetProcAddress((const GLubyte*)"glWriteMaskEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_vertex_shader */ - -#ifdef GL_EXT_vertex_weighting - -static GLboolean _glewInit_GL_EXT_vertex_weighting (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glVertexWeightPointerEXT = (PFNGLVERTEXWEIGHTPOINTEREXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightPointerEXT")) == NULL) || r; - r = ((glVertexWeightfEXT = (PFNGLVERTEXWEIGHTFEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfEXT")) == NULL) || r; - r = ((glVertexWeightfvEXT = (PFNGLVERTEXWEIGHTFVEXTPROC)glewGetProcAddress((const GLubyte*)"glVertexWeightfvEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_EXT_vertex_weighting */ - -#ifdef GL_GREMEDY_frame_terminator - -static GLboolean _glewInit_GL_GREMEDY_frame_terminator (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFrameTerminatorGREMEDY = (PFNGLFRAMETERMINATORGREMEDYPROC)glewGetProcAddress((const GLubyte*)"glFrameTerminatorGREMEDY")) == NULL) || r; - - return r; -} - -#endif /* GL_GREMEDY_frame_terminator */ - -#ifdef GL_GREMEDY_string_marker - -static GLboolean _glewInit_GL_GREMEDY_string_marker (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glStringMarkerGREMEDY = (PFNGLSTRINGMARKERGREMEDYPROC)glewGetProcAddress((const GLubyte*)"glStringMarkerGREMEDY")) == NULL) || r; - - return r; -} - -#endif /* GL_GREMEDY_string_marker */ - -#ifdef GL_HP_convolution_border_modes - -#endif /* GL_HP_convolution_border_modes */ - -#ifdef GL_HP_image_transform - -static GLboolean _glewInit_GL_HP_image_transform (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetImageTransformParameterfvHP = (PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterfvHP")) == NULL) || r; - r = ((glGetImageTransformParameterivHP = (PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glGetImageTransformParameterivHP")) == NULL) || r; - r = ((glImageTransformParameterfHP = (PFNGLIMAGETRANSFORMPARAMETERFHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfHP")) == NULL) || r; - r = ((glImageTransformParameterfvHP = (PFNGLIMAGETRANSFORMPARAMETERFVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterfvHP")) == NULL) || r; - r = ((glImageTransformParameteriHP = (PFNGLIMAGETRANSFORMPARAMETERIHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameteriHP")) == NULL) || r; - r = ((glImageTransformParameterivHP = (PFNGLIMAGETRANSFORMPARAMETERIVHPPROC)glewGetProcAddress((const GLubyte*)"glImageTransformParameterivHP")) == NULL) || r; - - return r; -} - -#endif /* GL_HP_image_transform */ - -#ifdef GL_HP_occlusion_test - -#endif /* GL_HP_occlusion_test */ - -#ifdef GL_HP_texture_lighting - -#endif /* GL_HP_texture_lighting */ - -#ifdef GL_IBM_cull_vertex - -#endif /* GL_IBM_cull_vertex */ - -#ifdef GL_IBM_multimode_draw_arrays - -static GLboolean _glewInit_GL_IBM_multimode_draw_arrays (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glMultiModeDrawArraysIBM = (PFNGLMULTIMODEDRAWARRAYSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawArraysIBM")) == NULL) || r; - r = ((glMultiModeDrawElementsIBM = (PFNGLMULTIMODEDRAWELEMENTSIBMPROC)glewGetProcAddress((const GLubyte*)"glMultiModeDrawElementsIBM")) == NULL) || r; - - return r; -} - -#endif /* GL_IBM_multimode_draw_arrays */ - -#ifdef GL_IBM_rasterpos_clip - -#endif /* GL_IBM_rasterpos_clip */ - -#ifdef GL_IBM_static_data - -#endif /* GL_IBM_static_data */ - -#ifdef GL_IBM_texture_mirrored_repeat - -#endif /* GL_IBM_texture_mirrored_repeat */ - -#ifdef GL_IBM_vertex_array_lists - -static GLboolean _glewInit_GL_IBM_vertex_array_lists (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorPointerListIBM = (PFNGLCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glColorPointerListIBM")) == NULL) || r; - r = ((glEdgeFlagPointerListIBM = (PFNGLEDGEFLAGPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glEdgeFlagPointerListIBM")) == NULL) || r; - r = ((glFogCoordPointerListIBM = (PFNGLFOGCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glFogCoordPointerListIBM")) == NULL) || r; - r = ((glIndexPointerListIBM = (PFNGLINDEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glIndexPointerListIBM")) == NULL) || r; - r = ((glNormalPointerListIBM = (PFNGLNORMALPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glNormalPointerListIBM")) == NULL) || r; - r = ((glSecondaryColorPointerListIBM = (PFNGLSECONDARYCOLORPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColorPointerListIBM")) == NULL) || r; - r = ((glTexCoordPointerListIBM = (PFNGLTEXCOORDPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointerListIBM")) == NULL) || r; - r = ((glVertexPointerListIBM = (PFNGLVERTEXPOINTERLISTIBMPROC)glewGetProcAddress((const GLubyte*)"glVertexPointerListIBM")) == NULL) || r; - - return r; -} - -#endif /* GL_IBM_vertex_array_lists */ - -#ifdef GL_INGR_color_clamp - -#endif /* GL_INGR_color_clamp */ - -#ifdef GL_INGR_interlace_read - -#endif /* GL_INGR_interlace_read */ - -#ifdef GL_INTEL_parallel_arrays - -static GLboolean _glewInit_GL_INTEL_parallel_arrays (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorPointervINTEL = (PFNGLCOLORPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glColorPointervINTEL")) == NULL) || r; - r = ((glNormalPointervINTEL = (PFNGLNORMALPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glNormalPointervINTEL")) == NULL) || r; - r = ((glTexCoordPointervINTEL = (PFNGLTEXCOORDPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glTexCoordPointervINTEL")) == NULL) || r; - r = ((glVertexPointervINTEL = (PFNGLVERTEXPOINTERVINTELPROC)glewGetProcAddress((const GLubyte*)"glVertexPointervINTEL")) == NULL) || r; - - return r; -} - -#endif /* GL_INTEL_parallel_arrays */ - -#ifdef GL_INTEL_texture_scissor - -static GLboolean _glewInit_GL_INTEL_texture_scissor (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexScissorFuncINTEL = (PFNGLTEXSCISSORFUNCINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorFuncINTEL")) == NULL) || r; - r = ((glTexScissorINTEL = (PFNGLTEXSCISSORINTELPROC)glewGetProcAddress((const GLubyte*)"glTexScissorINTEL")) == NULL) || r; - - return r; -} - -#endif /* GL_INTEL_texture_scissor */ - -#ifdef GL_KTX_buffer_region - -static GLboolean _glewInit_GL_KTX_buffer_region (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBufferRegionEnabledEXT = (PFNGLBUFFERREGIONENABLEDEXTPROC)glewGetProcAddress((const GLubyte*)"glBufferRegionEnabledEXT")) == NULL) || r; - r = ((glDeleteBufferRegionEXT = (PFNGLDELETEBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glDeleteBufferRegionEXT")) == NULL) || r; - r = ((glDrawBufferRegionEXT = (PFNGLDRAWBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glDrawBufferRegionEXT")) == NULL) || r; - r = ((glNewBufferRegionEXT = (PFNGLNEWBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glNewBufferRegionEXT")) == NULL) || r; - r = ((glReadBufferRegionEXT = (PFNGLREADBUFFERREGIONEXTPROC)glewGetProcAddress((const GLubyte*)"glReadBufferRegionEXT")) == NULL) || r; - - return r; -} - -#endif /* GL_KTX_buffer_region */ - -#ifdef GL_MESAX_texture_stack - -#endif /* GL_MESAX_texture_stack */ - -#ifdef GL_MESA_pack_invert - -#endif /* GL_MESA_pack_invert */ - -#ifdef GL_MESA_resize_buffers - -static GLboolean _glewInit_GL_MESA_resize_buffers (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glResizeBuffersMESA = (PFNGLRESIZEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glResizeBuffersMESA")) == NULL) || r; - - return r; -} - -#endif /* GL_MESA_resize_buffers */ - -#ifdef GL_MESA_window_pos - -static GLboolean _glewInit_GL_MESA_window_pos (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glWindowPos2dMESA = (PFNGLWINDOWPOS2DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dMESA")) == NULL) || r; - r = ((glWindowPos2dvMESA = (PFNGLWINDOWPOS2DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2dvMESA")) == NULL) || r; - r = ((glWindowPos2fMESA = (PFNGLWINDOWPOS2FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fMESA")) == NULL) || r; - r = ((glWindowPos2fvMESA = (PFNGLWINDOWPOS2FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2fvMESA")) == NULL) || r; - r = ((glWindowPos2iMESA = (PFNGLWINDOWPOS2IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2iMESA")) == NULL) || r; - r = ((glWindowPos2ivMESA = (PFNGLWINDOWPOS2IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2ivMESA")) == NULL) || r; - r = ((glWindowPos2sMESA = (PFNGLWINDOWPOS2SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2sMESA")) == NULL) || r; - r = ((glWindowPos2svMESA = (PFNGLWINDOWPOS2SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos2svMESA")) == NULL) || r; - r = ((glWindowPos3dMESA = (PFNGLWINDOWPOS3DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dMESA")) == NULL) || r; - r = ((glWindowPos3dvMESA = (PFNGLWINDOWPOS3DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3dvMESA")) == NULL) || r; - r = ((glWindowPos3fMESA = (PFNGLWINDOWPOS3FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fMESA")) == NULL) || r; - r = ((glWindowPos3fvMESA = (PFNGLWINDOWPOS3FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3fvMESA")) == NULL) || r; - r = ((glWindowPos3iMESA = (PFNGLWINDOWPOS3IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3iMESA")) == NULL) || r; - r = ((glWindowPos3ivMESA = (PFNGLWINDOWPOS3IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3ivMESA")) == NULL) || r; - r = ((glWindowPos3sMESA = (PFNGLWINDOWPOS3SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3sMESA")) == NULL) || r; - r = ((glWindowPos3svMESA = (PFNGLWINDOWPOS3SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos3svMESA")) == NULL) || r; - r = ((glWindowPos4dMESA = (PFNGLWINDOWPOS4DMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dMESA")) == NULL) || r; - r = ((glWindowPos4dvMESA = (PFNGLWINDOWPOS4DVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4dvMESA")) == NULL) || r; - r = ((glWindowPos4fMESA = (PFNGLWINDOWPOS4FMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fMESA")) == NULL) || r; - r = ((glWindowPos4fvMESA = (PFNGLWINDOWPOS4FVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4fvMESA")) == NULL) || r; - r = ((glWindowPos4iMESA = (PFNGLWINDOWPOS4IMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4iMESA")) == NULL) || r; - r = ((glWindowPos4ivMESA = (PFNGLWINDOWPOS4IVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4ivMESA")) == NULL) || r; - r = ((glWindowPos4sMESA = (PFNGLWINDOWPOS4SMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4sMESA")) == NULL) || r; - r = ((glWindowPos4svMESA = (PFNGLWINDOWPOS4SVMESAPROC)glewGetProcAddress((const GLubyte*)"glWindowPos4svMESA")) == NULL) || r; - - return r; -} - -#endif /* GL_MESA_window_pos */ - -#ifdef GL_MESA_ycbcr_texture - -#endif /* GL_MESA_ycbcr_texture */ - -#ifdef GL_NV_blend_square - -#endif /* GL_NV_blend_square */ - -#ifdef GL_NV_conditional_render - -static GLboolean _glewInit_GL_NV_conditional_render (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginConditionalRenderNV = (PFNGLBEGINCONDITIONALRENDERNVPROC)glewGetProcAddress((const GLubyte*)"glBeginConditionalRenderNV")) == NULL) || r; - r = ((glEndConditionalRenderNV = (PFNGLENDCONDITIONALRENDERNVPROC)glewGetProcAddress((const GLubyte*)"glEndConditionalRenderNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_conditional_render */ - -#ifdef GL_NV_copy_depth_to_color - -#endif /* GL_NV_copy_depth_to_color */ - -#ifdef GL_NV_depth_buffer_float - -static GLboolean _glewInit_GL_NV_depth_buffer_float (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClearDepthdNV = (PFNGLCLEARDEPTHDNVPROC)glewGetProcAddress((const GLubyte*)"glClearDepthdNV")) == NULL) || r; - r = ((glDepthBoundsdNV = (PFNGLDEPTHBOUNDSDNVPROC)glewGetProcAddress((const GLubyte*)"glDepthBoundsdNV")) == NULL) || r; - r = ((glDepthRangedNV = (PFNGLDEPTHRANGEDNVPROC)glewGetProcAddress((const GLubyte*)"glDepthRangedNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_depth_buffer_float */ - -#ifdef GL_NV_depth_clamp - -#endif /* GL_NV_depth_clamp */ - -#ifdef GL_NV_depth_range_unclamped - -#endif /* GL_NV_depth_range_unclamped */ - -#ifdef GL_NV_evaluators - -static GLboolean _glewInit_GL_NV_evaluators (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glEvalMapsNV = (PFNGLEVALMAPSNVPROC)glewGetProcAddress((const GLubyte*)"glEvalMapsNV")) == NULL) || r; - r = ((glGetMapAttribParameterfvNV = (PFNGLGETMAPATTRIBPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterfvNV")) == NULL) || r; - r = ((glGetMapAttribParameterivNV = (PFNGLGETMAPATTRIBPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapAttribParameterivNV")) == NULL) || r; - r = ((glGetMapControlPointsNV = (PFNGLGETMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapControlPointsNV")) == NULL) || r; - r = ((glGetMapParameterfvNV = (PFNGLGETMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterfvNV")) == NULL) || r; - r = ((glGetMapParameterivNV = (PFNGLGETMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMapParameterivNV")) == NULL) || r; - r = ((glMapControlPointsNV = (PFNGLMAPCONTROLPOINTSNVPROC)glewGetProcAddress((const GLubyte*)"glMapControlPointsNV")) == NULL) || r; - r = ((glMapParameterfvNV = (PFNGLMAPPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterfvNV")) == NULL) || r; - r = ((glMapParameterivNV = (PFNGLMAPPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glMapParameterivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_evaluators */ - -#ifdef GL_NV_explicit_multisample - -static GLboolean _glewInit_GL_NV_explicit_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetMultisamplefvNV = (PFNGLGETMULTISAMPLEFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetMultisamplefvNV")) == NULL) || r; - r = ((glSampleMaskIndexedNV = (PFNGLSAMPLEMASKINDEXEDNVPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskIndexedNV")) == NULL) || r; - r = ((glTexRenderbufferNV = (PFNGLTEXRENDERBUFFERNVPROC)glewGetProcAddress((const GLubyte*)"glTexRenderbufferNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_explicit_multisample */ - -#ifdef GL_NV_fence - -static GLboolean _glewInit_GL_NV_fence (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDeleteFencesNV = (PFNGLDELETEFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteFencesNV")) == NULL) || r; - r = ((glFinishFenceNV = (PFNGLFINISHFENCENVPROC)glewGetProcAddress((const GLubyte*)"glFinishFenceNV")) == NULL) || r; - r = ((glGenFencesNV = (PFNGLGENFENCESNVPROC)glewGetProcAddress((const GLubyte*)"glGenFencesNV")) == NULL) || r; - r = ((glGetFenceivNV = (PFNGLGETFENCEIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFenceivNV")) == NULL) || r; - r = ((glIsFenceNV = (PFNGLISFENCENVPROC)glewGetProcAddress((const GLubyte*)"glIsFenceNV")) == NULL) || r; - r = ((glSetFenceNV = (PFNGLSETFENCENVPROC)glewGetProcAddress((const GLubyte*)"glSetFenceNV")) == NULL) || r; - r = ((glTestFenceNV = (PFNGLTESTFENCENVPROC)glewGetProcAddress((const GLubyte*)"glTestFenceNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_fence */ - -#ifdef GL_NV_float_buffer - -#endif /* GL_NV_float_buffer */ - -#ifdef GL_NV_fog_distance - -#endif /* GL_NV_fog_distance */ - -#ifdef GL_NV_fragment_program - -static GLboolean _glewInit_GL_NV_fragment_program (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetProgramNamedParameterdvNV = (PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterdvNV")) == NULL) || r; - r = ((glGetProgramNamedParameterfvNV = (PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramNamedParameterfvNV")) == NULL) || r; - r = ((glProgramNamedParameter4dNV = (PFNGLPROGRAMNAMEDPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dNV")) == NULL) || r; - r = ((glProgramNamedParameter4dvNV = (PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4dvNV")) == NULL) || r; - r = ((glProgramNamedParameter4fNV = (PFNGLPROGRAMNAMEDPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fNV")) == NULL) || r; - r = ((glProgramNamedParameter4fvNV = (PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramNamedParameter4fvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_fragment_program */ - -#ifdef GL_NV_fragment_program2 - -#endif /* GL_NV_fragment_program2 */ - -#ifdef GL_NV_fragment_program4 - -#endif /* GL_NV_fragment_program4 */ - -#ifdef GL_NV_fragment_program_option - -#endif /* GL_NV_fragment_program_option */ - -#ifdef GL_NV_framebuffer_multisample_coverage - -static GLboolean _glewInit_GL_NV_framebuffer_multisample_coverage (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glRenderbufferStorageMultisampleCoverageNV = (PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC)glewGetProcAddress((const GLubyte*)"glRenderbufferStorageMultisampleCoverageNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_framebuffer_multisample_coverage */ - -#ifdef GL_NV_geometry_program4 - -static GLboolean _glewInit_GL_NV_geometry_program4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glProgramVertexLimitNV = (PFNGLPROGRAMVERTEXLIMITNVPROC)glewGetProcAddress((const GLubyte*)"glProgramVertexLimitNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_geometry_program4 */ - -#ifdef GL_NV_geometry_shader4 - -#endif /* GL_NV_geometry_shader4 */ - -#ifdef GL_NV_gpu_program4 - -static GLboolean _glewInit_GL_NV_gpu_program4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glProgramEnvParameterI4iNV = (PFNGLPROGRAMENVPARAMETERI4INVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4iNV")) == NULL) || r; - r = ((glProgramEnvParameterI4ivNV = (PFNGLPROGRAMENVPARAMETERI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4ivNV")) == NULL) || r; - r = ((glProgramEnvParameterI4uiNV = (PFNGLPROGRAMENVPARAMETERI4UINVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4uiNV")) == NULL) || r; - r = ((glProgramEnvParameterI4uivNV = (PFNGLPROGRAMENVPARAMETERI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParameterI4uivNV")) == NULL) || r; - r = ((glProgramEnvParametersI4ivNV = (PFNGLPROGRAMENVPARAMETERSI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParametersI4ivNV")) == NULL) || r; - r = ((glProgramEnvParametersI4uivNV = (PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramEnvParametersI4uivNV")) == NULL) || r; - r = ((glProgramLocalParameterI4iNV = (PFNGLPROGRAMLOCALPARAMETERI4INVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4iNV")) == NULL) || r; - r = ((glProgramLocalParameterI4ivNV = (PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4ivNV")) == NULL) || r; - r = ((glProgramLocalParameterI4uiNV = (PFNGLPROGRAMLOCALPARAMETERI4UINVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4uiNV")) == NULL) || r; - r = ((glProgramLocalParameterI4uivNV = (PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParameterI4uivNV")) == NULL) || r; - r = ((glProgramLocalParametersI4ivNV = (PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParametersI4ivNV")) == NULL) || r; - r = ((glProgramLocalParametersI4uivNV = (PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramLocalParametersI4uivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_gpu_program4 */ - -#ifdef GL_NV_half_float - -static GLboolean _glewInit_GL_NV_half_float (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColor3hNV = (PFNGLCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hNV")) == NULL) || r; - r = ((glColor3hvNV = (PFNGLCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor3hvNV")) == NULL) || r; - r = ((glColor4hNV = (PFNGLCOLOR4HNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hNV")) == NULL) || r; - r = ((glColor4hvNV = (PFNGLCOLOR4HVNVPROC)glewGetProcAddress((const GLubyte*)"glColor4hvNV")) == NULL) || r; - r = ((glFogCoordhNV = (PFNGLFOGCOORDHNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhNV")) == NULL) || r; - r = ((glFogCoordhvNV = (PFNGLFOGCOORDHVNVPROC)glewGetProcAddress((const GLubyte*)"glFogCoordhvNV")) == NULL) || r; - r = ((glMultiTexCoord1hNV = (PFNGLMULTITEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hNV")) == NULL) || r; - r = ((glMultiTexCoord1hvNV = (PFNGLMULTITEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord1hvNV")) == NULL) || r; - r = ((glMultiTexCoord2hNV = (PFNGLMULTITEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hNV")) == NULL) || r; - r = ((glMultiTexCoord2hvNV = (PFNGLMULTITEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord2hvNV")) == NULL) || r; - r = ((glMultiTexCoord3hNV = (PFNGLMULTITEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hNV")) == NULL) || r; - r = ((glMultiTexCoord3hvNV = (PFNGLMULTITEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord3hvNV")) == NULL) || r; - r = ((glMultiTexCoord4hNV = (PFNGLMULTITEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hNV")) == NULL) || r; - r = ((glMultiTexCoord4hvNV = (PFNGLMULTITEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glMultiTexCoord4hvNV")) == NULL) || r; - r = ((glNormal3hNV = (PFNGLNORMAL3HNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hNV")) == NULL) || r; - r = ((glNormal3hvNV = (PFNGLNORMAL3HVNVPROC)glewGetProcAddress((const GLubyte*)"glNormal3hvNV")) == NULL) || r; - r = ((glSecondaryColor3hNV = (PFNGLSECONDARYCOLOR3HNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hNV")) == NULL) || r; - r = ((glSecondaryColor3hvNV = (PFNGLSECONDARYCOLOR3HVNVPROC)glewGetProcAddress((const GLubyte*)"glSecondaryColor3hvNV")) == NULL) || r; - r = ((glTexCoord1hNV = (PFNGLTEXCOORD1HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hNV")) == NULL) || r; - r = ((glTexCoord1hvNV = (PFNGLTEXCOORD1HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord1hvNV")) == NULL) || r; - r = ((glTexCoord2hNV = (PFNGLTEXCOORD2HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hNV")) == NULL) || r; - r = ((glTexCoord2hvNV = (PFNGLTEXCOORD2HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2hvNV")) == NULL) || r; - r = ((glTexCoord3hNV = (PFNGLTEXCOORD3HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hNV")) == NULL) || r; - r = ((glTexCoord3hvNV = (PFNGLTEXCOORD3HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord3hvNV")) == NULL) || r; - r = ((glTexCoord4hNV = (PFNGLTEXCOORD4HNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hNV")) == NULL) || r; - r = ((glTexCoord4hvNV = (PFNGLTEXCOORD4HVNVPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4hvNV")) == NULL) || r; - r = ((glVertex2hNV = (PFNGLVERTEX2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hNV")) == NULL) || r; - r = ((glVertex2hvNV = (PFNGLVERTEX2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex2hvNV")) == NULL) || r; - r = ((glVertex3hNV = (PFNGLVERTEX3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hNV")) == NULL) || r; - r = ((glVertex3hvNV = (PFNGLVERTEX3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex3hvNV")) == NULL) || r; - r = ((glVertex4hNV = (PFNGLVERTEX4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hNV")) == NULL) || r; - r = ((glVertex4hvNV = (PFNGLVERTEX4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertex4hvNV")) == NULL) || r; - r = ((glVertexAttrib1hNV = (PFNGLVERTEXATTRIB1HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hNV")) == NULL) || r; - r = ((glVertexAttrib1hvNV = (PFNGLVERTEXATTRIB1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1hvNV")) == NULL) || r; - r = ((glVertexAttrib2hNV = (PFNGLVERTEXATTRIB2HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hNV")) == NULL) || r; - r = ((glVertexAttrib2hvNV = (PFNGLVERTEXATTRIB2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2hvNV")) == NULL) || r; - r = ((glVertexAttrib3hNV = (PFNGLVERTEXATTRIB3HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hNV")) == NULL) || r; - r = ((glVertexAttrib3hvNV = (PFNGLVERTEXATTRIB3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3hvNV")) == NULL) || r; - r = ((glVertexAttrib4hNV = (PFNGLVERTEXATTRIB4HNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hNV")) == NULL) || r; - r = ((glVertexAttrib4hvNV = (PFNGLVERTEXATTRIB4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4hvNV")) == NULL) || r; - r = ((glVertexAttribs1hvNV = (PFNGLVERTEXATTRIBS1HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1hvNV")) == NULL) || r; - r = ((glVertexAttribs2hvNV = (PFNGLVERTEXATTRIBS2HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2hvNV")) == NULL) || r; - r = ((glVertexAttribs3hvNV = (PFNGLVERTEXATTRIBS3HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3hvNV")) == NULL) || r; - r = ((glVertexAttribs4hvNV = (PFNGLVERTEXATTRIBS4HVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4hvNV")) == NULL) || r; - r = ((glVertexWeighthNV = (PFNGLVERTEXWEIGHTHNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthNV")) == NULL) || r; - r = ((glVertexWeighthvNV = (PFNGLVERTEXWEIGHTHVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexWeighthvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_half_float */ - -#ifdef GL_NV_light_max_exponent - -#endif /* GL_NV_light_max_exponent */ - -#ifdef GL_NV_multisample_filter_hint - -#endif /* GL_NV_multisample_filter_hint */ - -#ifdef GL_NV_occlusion_query - -static GLboolean _glewInit_GL_NV_occlusion_query (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glBeginOcclusionQueryNV = (PFNGLBEGINOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glBeginOcclusionQueryNV")) == NULL) || r; - r = ((glDeleteOcclusionQueriesNV = (PFNGLDELETEOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteOcclusionQueriesNV")) == NULL) || r; - r = ((glEndOcclusionQueryNV = (PFNGLENDOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glEndOcclusionQueryNV")) == NULL) || r; - r = ((glGenOcclusionQueriesNV = (PFNGLGENOCCLUSIONQUERIESNVPROC)glewGetProcAddress((const GLubyte*)"glGenOcclusionQueriesNV")) == NULL) || r; - r = ((glGetOcclusionQueryivNV = (PFNGLGETOCCLUSIONQUERYIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryivNV")) == NULL) || r; - r = ((glGetOcclusionQueryuivNV = (PFNGLGETOCCLUSIONQUERYUIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetOcclusionQueryuivNV")) == NULL) || r; - r = ((glIsOcclusionQueryNV = (PFNGLISOCCLUSIONQUERYNVPROC)glewGetProcAddress((const GLubyte*)"glIsOcclusionQueryNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_occlusion_query */ - -#ifdef GL_NV_packed_depth_stencil - -#endif /* GL_NV_packed_depth_stencil */ - -#ifdef GL_NV_parameter_buffer_object - -static GLboolean _glewInit_GL_NV_parameter_buffer_object (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glProgramBufferParametersIivNV = (PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersIivNV")) == NULL) || r; - r = ((glProgramBufferParametersIuivNV = (PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersIuivNV")) == NULL) || r; - r = ((glProgramBufferParametersfvNV = (PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramBufferParametersfvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_parameter_buffer_object */ - -#ifdef GL_NV_pixel_data_range - -static GLboolean _glewInit_GL_NV_pixel_data_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushPixelDataRangeNV = (PFNGLFLUSHPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushPixelDataRangeNV")) == NULL) || r; - r = ((glPixelDataRangeNV = (PFNGLPIXELDATARANGENVPROC)glewGetProcAddress((const GLubyte*)"glPixelDataRangeNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_pixel_data_range */ - -#ifdef GL_NV_point_sprite - -static GLboolean _glewInit_GL_NV_point_sprite (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPointParameteriNV = (PFNGLPOINTPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glPointParameteriNV")) == NULL) || r; - r = ((glPointParameterivNV = (PFNGLPOINTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glPointParameterivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_point_sprite */ - -#ifdef GL_NV_present_video - -static GLboolean _glewInit_GL_NV_present_video (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - -// r = ((glGetVideoi64vNV = (PFNGLGETVIDEOI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoi64vNV")) == NULL) || r; - r = ((glGetVideoivNV = (PFNGLGETVIDEOIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoivNV")) == NULL) || r; -// r = ((glGetVideoui64vNV = (PFNGLGETVIDEOUI64VNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideoui64vNV")) == NULL) || r; - r = ((glGetVideouivNV = (PFNGLGETVIDEOUIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVideouivNV")) == NULL) || r; -// r = ((glPresentFrameDualFillNV = (PFNGLPRESENTFRAMEDUALFILLNVPROC)glewGetProcAddress((const GLubyte*)"glPresentFrameDualFillNV")) == NULL) || r; -// r = ((glPresentFrameKeyedNV = (PFNGLPRESENTFRAMEKEYEDNVPROC)glewGetProcAddress((const GLubyte*)"glPresentFrameKeyedNV")) == NULL) || r; - r = ((glVideoParameterivNV = (PFNGLVIDEOPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glVideoParameterivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_present_video */ - -#ifdef GL_NV_primitive_restart - -static GLboolean _glewInit_GL_NV_primitive_restart (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPrimitiveRestartIndexNV = (PFNGLPRIMITIVERESTARTINDEXNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartIndexNV")) == NULL) || r; - r = ((glPrimitiveRestartNV = (PFNGLPRIMITIVERESTARTNVPROC)glewGetProcAddress((const GLubyte*)"glPrimitiveRestartNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_primitive_restart */ - -#ifdef GL_NV_register_combiners - -static GLboolean _glewInit_GL_NV_register_combiners (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCombinerInputNV = (PFNGLCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerInputNV")) == NULL) || r; - r = ((glCombinerOutputNV = (PFNGLCOMBINEROUTPUTNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerOutputNV")) == NULL) || r; - r = ((glCombinerParameterfNV = (PFNGLCOMBINERPARAMETERFNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfNV")) == NULL) || r; - r = ((glCombinerParameterfvNV = (PFNGLCOMBINERPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterfvNV")) == NULL) || r; - r = ((glCombinerParameteriNV = (PFNGLCOMBINERPARAMETERINVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameteriNV")) == NULL) || r; - r = ((glCombinerParameterivNV = (PFNGLCOMBINERPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerParameterivNV")) == NULL) || r; - r = ((glFinalCombinerInputNV = (PFNGLFINALCOMBINERINPUTNVPROC)glewGetProcAddress((const GLubyte*)"glFinalCombinerInputNV")) == NULL) || r; - r = ((glGetCombinerInputParameterfvNV = (PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterfvNV")) == NULL) || r; - r = ((glGetCombinerInputParameterivNV = (PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerInputParameterivNV")) == NULL) || r; - r = ((glGetCombinerOutputParameterfvNV = (PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterfvNV")) == NULL) || r; - r = ((glGetCombinerOutputParameterivNV = (PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerOutputParameterivNV")) == NULL) || r; - r = ((glGetFinalCombinerInputParameterfvNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterfvNV")) == NULL) || r; - r = ((glGetFinalCombinerInputParameterivNV = (PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetFinalCombinerInputParameterivNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_register_combiners */ - -#ifdef GL_NV_register_combiners2 - -static GLboolean _glewInit_GL_NV_register_combiners2 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glCombinerStageParameterfvNV = (PFNGLCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glCombinerStageParameterfvNV")) == NULL) || r; - r = ((glGetCombinerStageParameterfvNV = (PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetCombinerStageParameterfvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_register_combiners2 */ - -#ifdef GL_NV_texgen_emboss - -#endif /* GL_NV_texgen_emboss */ - -#ifdef GL_NV_texgen_reflection - -#endif /* GL_NV_texgen_reflection */ - -#ifdef GL_NV_texture_compression_vtc - -#endif /* GL_NV_texture_compression_vtc */ - -#ifdef GL_NV_texture_env_combine4 - -#endif /* GL_NV_texture_env_combine4 */ - -#ifdef GL_NV_texture_expand_normal - -#endif /* GL_NV_texture_expand_normal */ - -#ifdef GL_NV_texture_rectangle - -#endif /* GL_NV_texture_rectangle */ - -#ifdef GL_NV_texture_shader - -#endif /* GL_NV_texture_shader */ - -#ifdef GL_NV_texture_shader2 - -#endif /* GL_NV_texture_shader2 */ - -#ifdef GL_NV_texture_shader3 - -#endif /* GL_NV_texture_shader3 */ - -#ifdef GL_NV_transform_feedback - -static GLboolean _glewInit_GL_NV_transform_feedback (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glActiveVaryingNV = (PFNGLACTIVEVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glActiveVaryingNV")) == NULL) || r; - r = ((glBeginTransformFeedbackNV = (PFNGLBEGINTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glBeginTransformFeedbackNV")) == NULL) || r; - r = ((glBindBufferBaseNV = (PFNGLBINDBUFFERBASENVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferBaseNV")) == NULL) || r; - r = ((glBindBufferOffsetNV = (PFNGLBINDBUFFEROFFSETNVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferOffsetNV")) == NULL) || r; - r = ((glBindBufferRangeNV = (PFNGLBINDBUFFERRANGENVPROC)glewGetProcAddress((const GLubyte*)"glBindBufferRangeNV")) == NULL) || r; - r = ((glEndTransformFeedbackNV = (PFNGLENDTRANSFORMFEEDBACKNVPROC)glewGetProcAddress((const GLubyte*)"glEndTransformFeedbackNV")) == NULL) || r; - r = ((glGetActiveVaryingNV = (PFNGLGETACTIVEVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetActiveVaryingNV")) == NULL) || r; - r = ((glGetTransformFeedbackVaryingNV = (PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetTransformFeedbackVaryingNV")) == NULL) || r; - r = ((glGetVaryingLocationNV = (PFNGLGETVARYINGLOCATIONNVPROC)glewGetProcAddress((const GLubyte*)"glGetVaryingLocationNV")) == NULL) || r; - r = ((glTransformFeedbackAttribsNV = (PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackAttribsNV")) == NULL) || r; - r = ((glTransformFeedbackVaryingsNV = (PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC)glewGetProcAddress((const GLubyte*)"glTransformFeedbackVaryingsNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_transform_feedback */ - -#ifdef GL_NV_vertex_array_range - -static GLboolean _glewInit_GL_NV_vertex_array_range (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushVertexArrayRangeNV = (PFNGLFLUSHVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glFlushVertexArrayRangeNV")) == NULL) || r; - r = ((glVertexArrayRangeNV = (PFNGLVERTEXARRAYRANGENVPROC)glewGetProcAddress((const GLubyte*)"glVertexArrayRangeNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_vertex_array_range */ - -#ifdef GL_NV_vertex_array_range2 - -#endif /* GL_NV_vertex_array_range2 */ - -#ifdef GL_NV_vertex_program - -static GLboolean _glewInit_GL_NV_vertex_program (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAreProgramsResidentNV = (PFNGLAREPROGRAMSRESIDENTNVPROC)glewGetProcAddress((const GLubyte*)"glAreProgramsResidentNV")) == NULL) || r; - r = ((glBindProgramNV = (PFNGLBINDPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glBindProgramNV")) == NULL) || r; - r = ((glDeleteProgramsNV = (PFNGLDELETEPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glDeleteProgramsNV")) == NULL) || r; - r = ((glExecuteProgramNV = (PFNGLEXECUTEPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glExecuteProgramNV")) == NULL) || r; - r = ((glGenProgramsNV = (PFNGLGENPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glGenProgramsNV")) == NULL) || r; - r = ((glGetProgramParameterdvNV = (PFNGLGETPROGRAMPARAMETERDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterdvNV")) == NULL) || r; - r = ((glGetProgramParameterfvNV = (PFNGLGETPROGRAMPARAMETERFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramParameterfvNV")) == NULL) || r; - r = ((glGetProgramStringNV = (PFNGLGETPROGRAMSTRINGNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramStringNV")) == NULL) || r; - r = ((glGetProgramivNV = (PFNGLGETPROGRAMIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetProgramivNV")) == NULL) || r; - r = ((glGetTrackMatrixivNV = (PFNGLGETTRACKMATRIXIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetTrackMatrixivNV")) == NULL) || r; - r = ((glGetVertexAttribPointervNV = (PFNGLGETVERTEXATTRIBPOINTERVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribPointervNV")) == NULL) || r; - r = ((glGetVertexAttribdvNV = (PFNGLGETVERTEXATTRIBDVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribdvNV")) == NULL) || r; - r = ((glGetVertexAttribfvNV = (PFNGLGETVERTEXATTRIBFVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribfvNV")) == NULL) || r; - r = ((glGetVertexAttribivNV = (PFNGLGETVERTEXATTRIBIVNVPROC)glewGetProcAddress((const GLubyte*)"glGetVertexAttribivNV")) == NULL) || r; - r = ((glIsProgramNV = (PFNGLISPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glIsProgramNV")) == NULL) || r; - r = ((glLoadProgramNV = (PFNGLLOADPROGRAMNVPROC)glewGetProcAddress((const GLubyte*)"glLoadProgramNV")) == NULL) || r; - r = ((glProgramParameter4dNV = (PFNGLPROGRAMPARAMETER4DNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dNV")) == NULL) || r; - r = ((glProgramParameter4dvNV = (PFNGLPROGRAMPARAMETER4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4dvNV")) == NULL) || r; - r = ((glProgramParameter4fNV = (PFNGLPROGRAMPARAMETER4FNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fNV")) == NULL) || r; - r = ((glProgramParameter4fvNV = (PFNGLPROGRAMPARAMETER4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameter4fvNV")) == NULL) || r; - r = ((glProgramParameters4dvNV = (PFNGLPROGRAMPARAMETERS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4dvNV")) == NULL) || r; - r = ((glProgramParameters4fvNV = (PFNGLPROGRAMPARAMETERS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glProgramParameters4fvNV")) == NULL) || r; - r = ((glRequestResidentProgramsNV = (PFNGLREQUESTRESIDENTPROGRAMSNVPROC)glewGetProcAddress((const GLubyte*)"glRequestResidentProgramsNV")) == NULL) || r; - r = ((glTrackMatrixNV = (PFNGLTRACKMATRIXNVPROC)glewGetProcAddress((const GLubyte*)"glTrackMatrixNV")) == NULL) || r; - r = ((glVertexAttrib1dNV = (PFNGLVERTEXATTRIB1DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dNV")) == NULL) || r; - r = ((glVertexAttrib1dvNV = (PFNGLVERTEXATTRIB1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1dvNV")) == NULL) || r; - r = ((glVertexAttrib1fNV = (PFNGLVERTEXATTRIB1FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fNV")) == NULL) || r; - r = ((glVertexAttrib1fvNV = (PFNGLVERTEXATTRIB1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1fvNV")) == NULL) || r; - r = ((glVertexAttrib1sNV = (PFNGLVERTEXATTRIB1SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1sNV")) == NULL) || r; - r = ((glVertexAttrib1svNV = (PFNGLVERTEXATTRIB1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib1svNV")) == NULL) || r; - r = ((glVertexAttrib2dNV = (PFNGLVERTEXATTRIB2DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dNV")) == NULL) || r; - r = ((glVertexAttrib2dvNV = (PFNGLVERTEXATTRIB2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2dvNV")) == NULL) || r; - r = ((glVertexAttrib2fNV = (PFNGLVERTEXATTRIB2FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fNV")) == NULL) || r; - r = ((glVertexAttrib2fvNV = (PFNGLVERTEXATTRIB2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2fvNV")) == NULL) || r; - r = ((glVertexAttrib2sNV = (PFNGLVERTEXATTRIB2SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2sNV")) == NULL) || r; - r = ((glVertexAttrib2svNV = (PFNGLVERTEXATTRIB2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib2svNV")) == NULL) || r; - r = ((glVertexAttrib3dNV = (PFNGLVERTEXATTRIB3DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dNV")) == NULL) || r; - r = ((glVertexAttrib3dvNV = (PFNGLVERTEXATTRIB3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3dvNV")) == NULL) || r; - r = ((glVertexAttrib3fNV = (PFNGLVERTEXATTRIB3FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fNV")) == NULL) || r; - r = ((glVertexAttrib3fvNV = (PFNGLVERTEXATTRIB3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3fvNV")) == NULL) || r; - r = ((glVertexAttrib3sNV = (PFNGLVERTEXATTRIB3SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3sNV")) == NULL) || r; - r = ((glVertexAttrib3svNV = (PFNGLVERTEXATTRIB3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib3svNV")) == NULL) || r; - r = ((glVertexAttrib4dNV = (PFNGLVERTEXATTRIB4DNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dNV")) == NULL) || r; - r = ((glVertexAttrib4dvNV = (PFNGLVERTEXATTRIB4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4dvNV")) == NULL) || r; - r = ((glVertexAttrib4fNV = (PFNGLVERTEXATTRIB4FNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fNV")) == NULL) || r; - r = ((glVertexAttrib4fvNV = (PFNGLVERTEXATTRIB4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4fvNV")) == NULL) || r; - r = ((glVertexAttrib4sNV = (PFNGLVERTEXATTRIB4SNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4sNV")) == NULL) || r; - r = ((glVertexAttrib4svNV = (PFNGLVERTEXATTRIB4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4svNV")) == NULL) || r; - r = ((glVertexAttrib4ubNV = (PFNGLVERTEXATTRIB4UBNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubNV")) == NULL) || r; - r = ((glVertexAttrib4ubvNV = (PFNGLVERTEXATTRIB4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttrib4ubvNV")) == NULL) || r; - r = ((glVertexAttribPointerNV = (PFNGLVERTEXATTRIBPOINTERNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribPointerNV")) == NULL) || r; - r = ((glVertexAttribs1dvNV = (PFNGLVERTEXATTRIBS1DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1dvNV")) == NULL) || r; - r = ((glVertexAttribs1fvNV = (PFNGLVERTEXATTRIBS1FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1fvNV")) == NULL) || r; - r = ((glVertexAttribs1svNV = (PFNGLVERTEXATTRIBS1SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs1svNV")) == NULL) || r; - r = ((glVertexAttribs2dvNV = (PFNGLVERTEXATTRIBS2DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2dvNV")) == NULL) || r; - r = ((glVertexAttribs2fvNV = (PFNGLVERTEXATTRIBS2FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2fvNV")) == NULL) || r; - r = ((glVertexAttribs2svNV = (PFNGLVERTEXATTRIBS2SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs2svNV")) == NULL) || r; - r = ((glVertexAttribs3dvNV = (PFNGLVERTEXATTRIBS3DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3dvNV")) == NULL) || r; - r = ((glVertexAttribs3fvNV = (PFNGLVERTEXATTRIBS3FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3fvNV")) == NULL) || r; - r = ((glVertexAttribs3svNV = (PFNGLVERTEXATTRIBS3SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs3svNV")) == NULL) || r; - r = ((glVertexAttribs4dvNV = (PFNGLVERTEXATTRIBS4DVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4dvNV")) == NULL) || r; - r = ((glVertexAttribs4fvNV = (PFNGLVERTEXATTRIBS4FVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4fvNV")) == NULL) || r; - r = ((glVertexAttribs4svNV = (PFNGLVERTEXATTRIBS4SVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4svNV")) == NULL) || r; - r = ((glVertexAttribs4ubvNV = (PFNGLVERTEXATTRIBS4UBVNVPROC)glewGetProcAddress((const GLubyte*)"glVertexAttribs4ubvNV")) == NULL) || r; - - return r; -} - -#endif /* GL_NV_vertex_program */ - -#ifdef GL_NV_vertex_program1_1 - -#endif /* GL_NV_vertex_program1_1 */ - -#ifdef GL_NV_vertex_program2 - -#endif /* GL_NV_vertex_program2 */ - -#ifdef GL_NV_vertex_program2_option - -#endif /* GL_NV_vertex_program2_option */ - -#ifdef GL_NV_vertex_program3 - -#endif /* GL_NV_vertex_program3 */ - -#ifdef GL_NV_vertex_program4 - -#endif /* GL_NV_vertex_program4 */ - -#ifdef GL_OES_byte_coordinates - -#endif /* GL_OES_byte_coordinates */ - -#ifdef GL_OES_compressed_paletted_texture - -#endif /* GL_OES_compressed_paletted_texture */ - -#ifdef GL_OES_read_format - -#endif /* GL_OES_read_format */ - -#ifdef GL_OES_single_precision - -static GLboolean _glewInit_GL_OES_single_precision (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glClearDepthfOES = (PFNGLCLEARDEPTHFOESPROC)glewGetProcAddress((const GLubyte*)"glClearDepthfOES")) == NULL) || r; - r = ((glClipPlanefOES = (PFNGLCLIPPLANEFOESPROC)glewGetProcAddress((const GLubyte*)"glClipPlanefOES")) == NULL) || r; - r = ((glDepthRangefOES = (PFNGLDEPTHRANGEFOESPROC)glewGetProcAddress((const GLubyte*)"glDepthRangefOES")) == NULL) || r; - r = ((glFrustumfOES = (PFNGLFRUSTUMFOESPROC)glewGetProcAddress((const GLubyte*)"glFrustumfOES")) == NULL) || r; - r = ((glGetClipPlanefOES = (PFNGLGETCLIPPLANEFOESPROC)glewGetProcAddress((const GLubyte*)"glGetClipPlanefOES")) == NULL) || r; - r = ((glOrthofOES = (PFNGLORTHOFOESPROC)glewGetProcAddress((const GLubyte*)"glOrthofOES")) == NULL) || r; - - return r; -} - -#endif /* GL_OES_single_precision */ - -#ifdef GL_OML_interlace - -#endif /* GL_OML_interlace */ - -#ifdef GL_OML_resample - -#endif /* GL_OML_resample */ - -#ifdef GL_OML_subsample - -#endif /* GL_OML_subsample */ - -#ifdef GL_PGI_misc_hints - -#endif /* GL_PGI_misc_hints */ - -#ifdef GL_PGI_vertex_hints - -#endif /* GL_PGI_vertex_hints */ - -#ifdef GL_REND_screen_coordinates - -#endif /* GL_REND_screen_coordinates */ - -#ifdef GL_S3_s3tc - -#endif /* GL_S3_s3tc */ - -#ifdef GL_SGIS_color_range - -#endif /* GL_SGIS_color_range */ - -#ifdef GL_SGIS_detail_texture - -static GLboolean _glewInit_GL_SGIS_detail_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glDetailTexFuncSGIS = (PFNGLDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glDetailTexFuncSGIS")) == NULL) || r; - r = ((glGetDetailTexFuncSGIS = (PFNGLGETDETAILTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetDetailTexFuncSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_detail_texture */ - -#ifdef GL_SGIS_fog_function - -static GLboolean _glewInit_GL_SGIS_fog_function (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFogFuncSGIS = (PFNGLFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glFogFuncSGIS")) == NULL) || r; - r = ((glGetFogFuncSGIS = (PFNGLGETFOGFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetFogFuncSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_fog_function */ - -#ifdef GL_SGIS_generate_mipmap - -#endif /* GL_SGIS_generate_mipmap */ - -#ifdef GL_SGIS_multisample - -static GLboolean _glewInit_GL_SGIS_multisample (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSampleMaskSGIS = (PFNGLSAMPLEMASKSGISPROC)glewGetProcAddress((const GLubyte*)"glSampleMaskSGIS")) == NULL) || r; - r = ((glSamplePatternSGIS = (PFNGLSAMPLEPATTERNSGISPROC)glewGetProcAddress((const GLubyte*)"glSamplePatternSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_multisample */ - -#ifdef GL_SGIS_pixel_texture - -#endif /* GL_SGIS_pixel_texture */ - -#ifdef GL_SGIS_point_line_texgen - -#endif /* GL_SGIS_point_line_texgen */ - -#ifdef GL_SGIS_sharpen_texture - -static GLboolean _glewInit_GL_SGIS_sharpen_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetSharpenTexFuncSGIS = (PFNGLGETSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetSharpenTexFuncSGIS")) == NULL) || r; - r = ((glSharpenTexFuncSGIS = (PFNGLSHARPENTEXFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glSharpenTexFuncSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_sharpen_texture */ - -#ifdef GL_SGIS_texture4D - -static GLboolean _glewInit_GL_SGIS_texture4D (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTexImage4DSGIS = (PFNGLTEXIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexImage4DSGIS")) == NULL) || r; - r = ((glTexSubImage4DSGIS = (PFNGLTEXSUBIMAGE4DSGISPROC)glewGetProcAddress((const GLubyte*)"glTexSubImage4DSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_texture4D */ - -#ifdef GL_SGIS_texture_border_clamp - -#endif /* GL_SGIS_texture_border_clamp */ - -#ifdef GL_SGIS_texture_edge_clamp - -#endif /* GL_SGIS_texture_edge_clamp */ - -#ifdef GL_SGIS_texture_filter4 - -static GLboolean _glewInit_GL_SGIS_texture_filter4 (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGetTexFilterFuncSGIS = (PFNGLGETTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glGetTexFilterFuncSGIS")) == NULL) || r; - r = ((glTexFilterFuncSGIS = (PFNGLTEXFILTERFUNCSGISPROC)glewGetProcAddress((const GLubyte*)"glTexFilterFuncSGIS")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIS_texture_filter4 */ - -#ifdef GL_SGIS_texture_lod - -#endif /* GL_SGIS_texture_lod */ - -#ifdef GL_SGIS_texture_select - -#endif /* GL_SGIS_texture_select */ - -#ifdef GL_SGIX_async - -static GLboolean _glewInit_GL_SGIX_async (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAsyncMarkerSGIX = (PFNGLASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glAsyncMarkerSGIX")) == NULL) || r; - r = ((glDeleteAsyncMarkersSGIX = (PFNGLDELETEASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glDeleteAsyncMarkersSGIX")) == NULL) || r; - r = ((glFinishAsyncSGIX = (PFNGLFINISHASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glFinishAsyncSGIX")) == NULL) || r; - r = ((glGenAsyncMarkersSGIX = (PFNGLGENASYNCMARKERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glGenAsyncMarkersSGIX")) == NULL) || r; - r = ((glIsAsyncMarkerSGIX = (PFNGLISASYNCMARKERSGIXPROC)glewGetProcAddress((const GLubyte*)"glIsAsyncMarkerSGIX")) == NULL) || r; - r = ((glPollAsyncSGIX = (PFNGLPOLLASYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glPollAsyncSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_async */ - -#ifdef GL_SGIX_async_histogram - -#endif /* GL_SGIX_async_histogram */ - -#ifdef GL_SGIX_async_pixel - -#endif /* GL_SGIX_async_pixel */ - -#ifdef GL_SGIX_blend_alpha_minmax - -#endif /* GL_SGIX_blend_alpha_minmax */ - -#ifdef GL_SGIX_clipmap - -#endif /* GL_SGIX_clipmap */ - -#ifdef GL_SGIX_convolution_accuracy - -#endif /* GL_SGIX_convolution_accuracy */ - -#ifdef GL_SGIX_depth_texture - -#endif /* GL_SGIX_depth_texture */ - -#ifdef GL_SGIX_flush_raster - -static GLboolean _glewInit_GL_SGIX_flush_raster (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFlushRasterSGIX = (PFNGLFLUSHRASTERSGIXPROC)glewGetProcAddress((const GLubyte*)"glFlushRasterSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_flush_raster */ - -#ifdef GL_SGIX_fog_offset - -#endif /* GL_SGIX_fog_offset */ - -#ifdef GL_SGIX_fog_texture - -static GLboolean _glewInit_GL_SGIX_fog_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTextureFogSGIX = (PFNGLTEXTUREFOGSGIXPROC)glewGetProcAddress((const GLubyte*)"glTextureFogSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_fog_texture */ - -#ifdef GL_SGIX_fragment_specular_lighting - -static GLboolean _glewInit_GL_SGIX_fragment_specular_lighting (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFragmentColorMaterialSGIX = (PFNGLFRAGMENTCOLORMATERIALSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentColorMaterialSGIX")) == NULL) || r; - r = ((glFragmentLightModelfSGIX = (PFNGLFRAGMENTLIGHTMODELFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfSGIX")) == NULL) || r; - r = ((glFragmentLightModelfvSGIX = (PFNGLFRAGMENTLIGHTMODELFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelfvSGIX")) == NULL) || r; - r = ((glFragmentLightModeliSGIX = (PFNGLFRAGMENTLIGHTMODELISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModeliSGIX")) == NULL) || r; - r = ((glFragmentLightModelivSGIX = (PFNGLFRAGMENTLIGHTMODELIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightModelivSGIX")) == NULL) || r; - r = ((glFragmentLightfSGIX = (PFNGLFRAGMENTLIGHTFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfSGIX")) == NULL) || r; - r = ((glFragmentLightfvSGIX = (PFNGLFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightfvSGIX")) == NULL) || r; - r = ((glFragmentLightiSGIX = (PFNGLFRAGMENTLIGHTISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightiSGIX")) == NULL) || r; - r = ((glFragmentLightivSGIX = (PFNGLFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentLightivSGIX")) == NULL) || r; - r = ((glFragmentMaterialfSGIX = (PFNGLFRAGMENTMATERIALFSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfSGIX")) == NULL) || r; - r = ((glFragmentMaterialfvSGIX = (PFNGLFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialfvSGIX")) == NULL) || r; - r = ((glFragmentMaterialiSGIX = (PFNGLFRAGMENTMATERIALISGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialiSGIX")) == NULL) || r; - r = ((glFragmentMaterialivSGIX = (PFNGLFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glFragmentMaterialivSGIX")) == NULL) || r; - r = ((glGetFragmentLightfvSGIX = (PFNGLGETFRAGMENTLIGHTFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightfvSGIX")) == NULL) || r; - r = ((glGetFragmentLightivSGIX = (PFNGLGETFRAGMENTLIGHTIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentLightivSGIX")) == NULL) || r; - r = ((glGetFragmentMaterialfvSGIX = (PFNGLGETFRAGMENTMATERIALFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialfvSGIX")) == NULL) || r; - r = ((glGetFragmentMaterialivSGIX = (PFNGLGETFRAGMENTMATERIALIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glGetFragmentMaterialivSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_fragment_specular_lighting */ - -#ifdef GL_SGIX_framezoom - -static GLboolean _glewInit_GL_SGIX_framezoom (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFrameZoomSGIX = (PFNGLFRAMEZOOMSGIXPROC)glewGetProcAddress((const GLubyte*)"glFrameZoomSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_framezoom */ - -#ifdef GL_SGIX_interlace - -#endif /* GL_SGIX_interlace */ - -#ifdef GL_SGIX_ir_instrument1 - -#endif /* GL_SGIX_ir_instrument1 */ - -#ifdef GL_SGIX_list_priority - -#endif /* GL_SGIX_list_priority */ - -#ifdef GL_SGIX_pixel_texture - -static GLboolean _glewInit_GL_SGIX_pixel_texture (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glPixelTexGenSGIX = (PFNGLPIXELTEXGENSGIXPROC)glewGetProcAddress((const GLubyte*)"glPixelTexGenSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_pixel_texture */ - -#ifdef GL_SGIX_pixel_texture_bits - -#endif /* GL_SGIX_pixel_texture_bits */ - -#ifdef GL_SGIX_reference_plane - -static GLboolean _glewInit_GL_SGIX_reference_plane (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glReferencePlaneSGIX = (PFNGLREFERENCEPLANESGIXPROC)glewGetProcAddress((const GLubyte*)"glReferencePlaneSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_reference_plane */ - -#ifdef GL_SGIX_resample - -#endif /* GL_SGIX_resample */ - -#ifdef GL_SGIX_shadow - -#endif /* GL_SGIX_shadow */ - -#ifdef GL_SGIX_shadow_ambient - -#endif /* GL_SGIX_shadow_ambient */ - -#ifdef GL_SGIX_sprite - -static GLboolean _glewInit_GL_SGIX_sprite (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glSpriteParameterfSGIX = (PFNGLSPRITEPARAMETERFSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfSGIX")) == NULL) || r; - r = ((glSpriteParameterfvSGIX = (PFNGLSPRITEPARAMETERFVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterfvSGIX")) == NULL) || r; - r = ((glSpriteParameteriSGIX = (PFNGLSPRITEPARAMETERISGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameteriSGIX")) == NULL) || r; - r = ((glSpriteParameterivSGIX = (PFNGLSPRITEPARAMETERIVSGIXPROC)glewGetProcAddress((const GLubyte*)"glSpriteParameterivSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_sprite */ - -#ifdef GL_SGIX_tag_sample_buffer - -static GLboolean _glewInit_GL_SGIX_tag_sample_buffer (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glTagSampleBufferSGIX = (PFNGLTAGSAMPLEBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glTagSampleBufferSGIX")) == NULL) || r; - - return r; -} - -#endif /* GL_SGIX_tag_sample_buffer */ - -#ifdef GL_SGIX_texture_add_env - -#endif /* GL_SGIX_texture_add_env */ - -#ifdef GL_SGIX_texture_coordinate_clamp - -#endif /* GL_SGIX_texture_coordinate_clamp */ - -#ifdef GL_SGIX_texture_lod_bias - -#endif /* GL_SGIX_texture_lod_bias */ - -#ifdef GL_SGIX_texture_multi_buffer - -#endif /* GL_SGIX_texture_multi_buffer */ - -#ifdef GL_SGIX_texture_range - -#endif /* GL_SGIX_texture_range */ - -#ifdef GL_SGIX_texture_scale_bias - -#endif /* GL_SGIX_texture_scale_bias */ - -#ifdef GL_SGIX_vertex_preclip - -#endif /* GL_SGIX_vertex_preclip */ - -#ifdef GL_SGIX_vertex_preclip_hint - -#endif /* GL_SGIX_vertex_preclip_hint */ - -#ifdef GL_SGIX_ycrcb - -#endif /* GL_SGIX_ycrcb */ - -#ifdef GL_SGI_color_matrix - -#endif /* GL_SGI_color_matrix */ - -#ifdef GL_SGI_color_table - -static GLboolean _glewInit_GL_SGI_color_table (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColorTableParameterfvSGI = (PFNGLCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterfvSGI")) == NULL) || r; - r = ((glColorTableParameterivSGI = (PFNGLCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableParameterivSGI")) == NULL) || r; - r = ((glColorTableSGI = (PFNGLCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glColorTableSGI")) == NULL) || r; - r = ((glCopyColorTableSGI = (PFNGLCOPYCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glCopyColorTableSGI")) == NULL) || r; - r = ((glGetColorTableParameterfvSGI = (PFNGLGETCOLORTABLEPARAMETERFVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterfvSGI")) == NULL) || r; - r = ((glGetColorTableParameterivSGI = (PFNGLGETCOLORTABLEPARAMETERIVSGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableParameterivSGI")) == NULL) || r; - r = ((glGetColorTableSGI = (PFNGLGETCOLORTABLESGIPROC)glewGetProcAddress((const GLubyte*)"glGetColorTableSGI")) == NULL) || r; - - return r; -} - -#endif /* GL_SGI_color_table */ - -#ifdef GL_SGI_texture_color_table - -#endif /* GL_SGI_texture_color_table */ - -#ifdef GL_SUNX_constant_data - -static GLboolean _glewInit_GL_SUNX_constant_data (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glFinishTextureSUNX = (PFNGLFINISHTEXTURESUNXPROC)glewGetProcAddress((const GLubyte*)"glFinishTextureSUNX")) == NULL) || r; - - return r; -} - -#endif /* GL_SUNX_constant_data */ - -#ifdef GL_SUN_convolution_border_modes - -#endif /* GL_SUN_convolution_border_modes */ - -#ifdef GL_SUN_global_alpha - -static GLboolean _glewInit_GL_SUN_global_alpha (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glGlobalAlphaFactorbSUN = (PFNGLGLOBALALPHAFACTORBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorbSUN")) == NULL) || r; - r = ((glGlobalAlphaFactordSUN = (PFNGLGLOBALALPHAFACTORDSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactordSUN")) == NULL) || r; - r = ((glGlobalAlphaFactorfSUN = (PFNGLGLOBALALPHAFACTORFSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorfSUN")) == NULL) || r; - r = ((glGlobalAlphaFactoriSUN = (PFNGLGLOBALALPHAFACTORISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoriSUN")) == NULL) || r; - r = ((glGlobalAlphaFactorsSUN = (PFNGLGLOBALALPHAFACTORSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorsSUN")) == NULL) || r; - r = ((glGlobalAlphaFactorubSUN = (PFNGLGLOBALALPHAFACTORUBSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorubSUN")) == NULL) || r; - r = ((glGlobalAlphaFactoruiSUN = (PFNGLGLOBALALPHAFACTORUISUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactoruiSUN")) == NULL) || r; - r = ((glGlobalAlphaFactorusSUN = (PFNGLGLOBALALPHAFACTORUSSUNPROC)glewGetProcAddress((const GLubyte*)"glGlobalAlphaFactorusSUN")) == NULL) || r; - - return r; -} - -#endif /* GL_SUN_global_alpha */ - -#ifdef GL_SUN_mesh_array - -#endif /* GL_SUN_mesh_array */ - -#ifdef GL_SUN_read_video_pixels - -static GLboolean _glewInit_GL_SUN_read_video_pixels (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glReadVideoPixelsSUN = (PFNGLREADVIDEOPIXELSSUNPROC)glewGetProcAddress((const GLubyte*)"glReadVideoPixelsSUN")) == NULL) || r; - - return r; -} - -#endif /* GL_SUN_read_video_pixels */ - -#ifdef GL_SUN_slice_accum - -#endif /* GL_SUN_slice_accum */ - -#ifdef GL_SUN_triangle_list - -static GLboolean _glewInit_GL_SUN_triangle_list (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glReplacementCodePointerSUN = (PFNGLREPLACEMENTCODEPOINTERSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodePointerSUN")) == NULL) || r; - r = ((glReplacementCodeubSUN = (PFNGLREPLACEMENTCODEUBSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubSUN")) == NULL) || r; - r = ((glReplacementCodeubvSUN = (PFNGLREPLACEMENTCODEUBVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeubvSUN")) == NULL) || r; - r = ((glReplacementCodeuiSUN = (PFNGLREPLACEMENTCODEUISUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiSUN")) == NULL) || r; - r = ((glReplacementCodeuivSUN = (PFNGLREPLACEMENTCODEUIVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuivSUN")) == NULL) || r; - r = ((glReplacementCodeusSUN = (PFNGLREPLACEMENTCODEUSSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusSUN")) == NULL) || r; - r = ((glReplacementCodeusvSUN = (PFNGLREPLACEMENTCODEUSVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeusvSUN")) == NULL) || r; - - return r; -} - -#endif /* GL_SUN_triangle_list */ - -#ifdef GL_SUN_vertex - -static GLboolean _glewInit_GL_SUN_vertex (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glColor3fVertex3fSUN = (PFNGLCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fSUN")) == NULL) || r; - r = ((glColor3fVertex3fvSUN = (PFNGLCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor3fVertex3fvSUN")) == NULL) || r; - r = ((glColor4fNormal3fVertex3fSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glColor4fNormal3fVertex3fvSUN = (PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glColor4ubVertex2fSUN = (PFNGLCOLOR4UBVERTEX2FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fSUN")) == NULL) || r; - r = ((glColor4ubVertex2fvSUN = (PFNGLCOLOR4UBVERTEX2FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex2fvSUN")) == NULL) || r; - r = ((glColor4ubVertex3fSUN = (PFNGLCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fSUN")) == NULL) || r; - r = ((glColor4ubVertex3fvSUN = (PFNGLCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glColor4ubVertex3fvSUN")) == NULL) || r; - r = ((glNormal3fVertex3fSUN = (PFNGLNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fSUN")) == NULL) || r; - r = ((glNormal3fVertex3fvSUN = (PFNGLNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor4ubVertex3fSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiColor4ubVertex3fvSUN = (PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiColor4ubVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fVertex3fSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiTexCoord2fVertex3fvSUN = (PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiTexCoord2fVertex3fvSUN")) == NULL) || r; - r = ((glReplacementCodeuiVertex3fSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fSUN")) == NULL) || r; - r = ((glReplacementCodeuiVertex3fvSUN = (PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glReplacementCodeuiVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fColor3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fColor3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor3fVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fColor4fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fColor4fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fColor4ubVertex3fSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fColor4ubVertex3fvSUN = (PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fColor4ubVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fNormal3fVertex3fSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fNormal3fVertex3fvSUN = (PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fNormal3fVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord2fVertex3fSUN = (PFNGLTEXCOORD2FVERTEX3FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fSUN")) == NULL) || r; - r = ((glTexCoord2fVertex3fvSUN = (PFNGLTEXCOORD2FVERTEX3FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord2fVertex3fvSUN")) == NULL) || r; - r = ((glTexCoord4fColor4fNormal3fVertex4fSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fSUN")) == NULL) || r; - r = ((glTexCoord4fColor4fNormal3fVertex4fvSUN = (PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fColor4fNormal3fVertex4fvSUN")) == NULL) || r; - r = ((glTexCoord4fVertex4fSUN = (PFNGLTEXCOORD4FVERTEX4FSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fSUN")) == NULL) || r; - r = ((glTexCoord4fVertex4fvSUN = (PFNGLTEXCOORD4FVERTEX4FVSUNPROC)glewGetProcAddress((const GLubyte*)"glTexCoord4fVertex4fvSUN")) == NULL) || r; - - return r; -} - -#endif /* GL_SUN_vertex */ - -#ifdef GL_WIN_phong_shading - -#endif /* GL_WIN_phong_shading */ - -#ifdef GL_WIN_specular_fog - -#endif /* GL_WIN_specular_fog */ - -#ifdef GL_WIN_swap_hint - -static GLboolean _glewInit_GL_WIN_swap_hint (GLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glAddSwapHintRectWIN = (PFNGLADDSWAPHINTRECTWINPROC)glewGetProcAddress((const GLubyte*)"glAddSwapHintRectWIN")) == NULL) || r; - - return r; -} - -#endif /* GL_WIN_swap_hint */ - -/* ------------------------------------------------------------------------- */ - -/* - * Search for name in the extensions string. Use of strstr() - * is not sufficient because extension names can be prefixes of - * other extension names. Could use strtok() but the constant - * string returned by glGetString might be in read-only memory. - */ -GLboolean glewGetExtension (const char* name) -{ - GLubyte* p; - GLubyte* end; - GLuint len = _glewStrLen((const GLubyte*)name); - p = (GLubyte*)glGetString(GL_EXTENSIONS); - if (0 == p) return GL_FALSE; - end = p + _glewStrLen(p); - while (p < end) - { - GLuint n = _glewStrCLen(p, ' '); - if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE; - p += n+1; - } - return GL_FALSE; -} - -/* ------------------------------------------------------------------------- */ - -#ifndef GLEW_MX -static -#endif -GLenum glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) -{ - const GLubyte* s; - GLuint dot, major, minor; - /* query opengl version */ - s = glGetString(GL_VERSION); - dot = _glewStrCLen(s, '.'); - major = dot-1; - minor = dot+1; - if (dot == 0 || s[minor] == '\0') - return GLEW_ERROR_NO_GL_VERSION; - if (s[major] == '1' && s[minor] == '0') - { - return GLEW_ERROR_GL_VERSION_10_ONLY; - } - else - { - CONST_CAST(GLEW_VERSION_1_1) = GL_TRUE; - if (s[major] >= '2') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_5) = GL_TRUE; - CONST_CAST(GLEW_VERSION_2_0) = GL_TRUE; - if (s[minor] >= '1') - { - CONST_CAST(GLEW_VERSION_2_1) = GL_TRUE; - } - } - else - { - if (s[minor] >= '5') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_5) = GL_TRUE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - if (s[minor] == '4') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_4) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - if (s[minor] == '3') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - if (s[minor] == '2') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLEW_VERSION_1_3) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - if (s[minor] < '2') - { - CONST_CAST(GLEW_VERSION_1_2) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_3) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_4) = GL_FALSE; - CONST_CAST(GLEW_VERSION_1_5) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_0) = GL_FALSE; - CONST_CAST(GLEW_VERSION_2_1) = GL_FALSE; - } - } - } - /* initialize extensions */ -#ifdef GL_VERSION_1_2 - if (glewExperimental || GLEW_VERSION_1_2) CONST_CAST(GLEW_VERSION_1_2) = !_glewInit_GL_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_1_2 */ -#ifdef GL_VERSION_1_3 - if (glewExperimental || GLEW_VERSION_1_3) CONST_CAST(GLEW_VERSION_1_3) = !_glewInit_GL_VERSION_1_3(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_1_3 */ -#ifdef GL_VERSION_1_4 - if (glewExperimental || GLEW_VERSION_1_4) CONST_CAST(GLEW_VERSION_1_4) = !_glewInit_GL_VERSION_1_4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_1_4 */ -#ifdef GL_VERSION_1_5 - if (glewExperimental || GLEW_VERSION_1_5) CONST_CAST(GLEW_VERSION_1_5) = !_glewInit_GL_VERSION_1_5(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_1_5 */ -#ifdef GL_VERSION_2_0 - if (glewExperimental || GLEW_VERSION_2_0) CONST_CAST(GLEW_VERSION_2_0) = !_glewInit_GL_VERSION_2_0(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_2_0 */ -#ifdef GL_VERSION_2_1 - if (glewExperimental || GLEW_VERSION_2_1) CONST_CAST(GLEW_VERSION_2_1) = !_glewInit_GL_VERSION_2_1(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_2_1 */ -#ifdef GL_VERSION_3_0 - if (glewExperimental || GLEW_VERSION_3_0) CONST_CAST(GLEW_VERSION_3_0) = !_glewInit_GL_VERSION_3_0(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_VERSION_3_0 */ -#ifdef GL_3DFX_multisample - CONST_CAST(GLEW_3DFX_multisample) = glewGetExtension("GL_3DFX_multisample"); -#endif /* GL_3DFX_multisample */ -#ifdef GL_3DFX_tbuffer - CONST_CAST(GLEW_3DFX_tbuffer) = glewGetExtension("GL_3DFX_tbuffer"); - if (glewExperimental || GLEW_3DFX_tbuffer) CONST_CAST(GLEW_3DFX_tbuffer) = !_glewInit_GL_3DFX_tbuffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_3DFX_tbuffer */ -#ifdef GL_3DFX_texture_compression_FXT1 - CONST_CAST(GLEW_3DFX_texture_compression_FXT1) = glewGetExtension("GL_3DFX_texture_compression_FXT1"); -#endif /* GL_3DFX_texture_compression_FXT1 */ -#ifdef GL_APPLE_client_storage - CONST_CAST(GLEW_APPLE_client_storage) = glewGetExtension("GL_APPLE_client_storage"); -#endif /* GL_APPLE_client_storage */ -#ifdef GL_APPLE_element_array - CONST_CAST(GLEW_APPLE_element_array) = glewGetExtension("GL_APPLE_element_array"); - if (glewExperimental || GLEW_APPLE_element_array) CONST_CAST(GLEW_APPLE_element_array) = !_glewInit_GL_APPLE_element_array(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_element_array */ -#ifdef GL_APPLE_fence - CONST_CAST(GLEW_APPLE_fence) = glewGetExtension("GL_APPLE_fence"); - if (glewExperimental || GLEW_APPLE_fence) CONST_CAST(GLEW_APPLE_fence) = !_glewInit_GL_APPLE_fence(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_fence */ -#ifdef GL_APPLE_float_pixels - CONST_CAST(GLEW_APPLE_float_pixels) = glewGetExtension("GL_APPLE_float_pixels"); -#endif /* GL_APPLE_float_pixels */ -#ifdef GL_APPLE_flush_buffer_range - CONST_CAST(GLEW_APPLE_flush_buffer_range) = glewGetExtension("GL_APPLE_flush_buffer_range"); - if (glewExperimental || GLEW_APPLE_flush_buffer_range) CONST_CAST(GLEW_APPLE_flush_buffer_range) = !_glewInit_GL_APPLE_flush_buffer_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_flush_buffer_range */ -#ifdef GL_APPLE_pixel_buffer - CONST_CAST(GLEW_APPLE_pixel_buffer) = glewGetExtension("GL_APPLE_pixel_buffer"); -#endif /* GL_APPLE_pixel_buffer */ -#ifdef GL_APPLE_specular_vector - CONST_CAST(GLEW_APPLE_specular_vector) = glewGetExtension("GL_APPLE_specular_vector"); -#endif /* GL_APPLE_specular_vector */ -#ifdef GL_APPLE_texture_range - CONST_CAST(GLEW_APPLE_texture_range) = glewGetExtension("GL_APPLE_texture_range"); - if (glewExperimental || GLEW_APPLE_texture_range) CONST_CAST(GLEW_APPLE_texture_range) = !_glewInit_GL_APPLE_texture_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_texture_range */ -#ifdef GL_APPLE_transform_hint - CONST_CAST(GLEW_APPLE_transform_hint) = glewGetExtension("GL_APPLE_transform_hint"); -#endif /* GL_APPLE_transform_hint */ -#ifdef GL_APPLE_vertex_array_object - CONST_CAST(GLEW_APPLE_vertex_array_object) = glewGetExtension("GL_APPLE_vertex_array_object"); - if (glewExperimental || GLEW_APPLE_vertex_array_object) CONST_CAST(GLEW_APPLE_vertex_array_object) = !_glewInit_GL_APPLE_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_vertex_array_object */ -#ifdef GL_APPLE_vertex_array_range - CONST_CAST(GLEW_APPLE_vertex_array_range) = glewGetExtension("GL_APPLE_vertex_array_range"); - if (glewExperimental || GLEW_APPLE_vertex_array_range) CONST_CAST(GLEW_APPLE_vertex_array_range) = !_glewInit_GL_APPLE_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_APPLE_vertex_array_range */ -#ifdef GL_APPLE_ycbcr_422 - CONST_CAST(GLEW_APPLE_ycbcr_422) = glewGetExtension("GL_APPLE_ycbcr_422"); -#endif /* GL_APPLE_ycbcr_422 */ -#ifdef GL_ARB_color_buffer_float - CONST_CAST(GLEW_ARB_color_buffer_float) = glewGetExtension("GL_ARB_color_buffer_float"); - if (glewExperimental || GLEW_ARB_color_buffer_float) CONST_CAST(GLEW_ARB_color_buffer_float) = !_glewInit_GL_ARB_color_buffer_float(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_color_buffer_float */ -#ifdef GL_ARB_depth_buffer_float - CONST_CAST(GLEW_ARB_depth_buffer_float) = glewGetExtension("GL_ARB_depth_buffer_float"); -#endif /* GL_ARB_depth_buffer_float */ -#ifdef GL_ARB_depth_texture - CONST_CAST(GLEW_ARB_depth_texture) = glewGetExtension("GL_ARB_depth_texture"); -#endif /* GL_ARB_depth_texture */ -#ifdef GL_ARB_draw_buffers - CONST_CAST(GLEW_ARB_draw_buffers) = glewGetExtension("GL_ARB_draw_buffers"); - if (glewExperimental || GLEW_ARB_draw_buffers) CONST_CAST(GLEW_ARB_draw_buffers) = !_glewInit_GL_ARB_draw_buffers(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_draw_buffers */ -#ifdef GL_ARB_draw_instanced - CONST_CAST(GLEW_ARB_draw_instanced) = glewGetExtension("GL_ARB_draw_instanced"); - if (glewExperimental || GLEW_ARB_draw_instanced) CONST_CAST(GLEW_ARB_draw_instanced) = !_glewInit_GL_ARB_draw_instanced(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_draw_instanced */ -#ifdef GL_ARB_fragment_program - CONST_CAST(GLEW_ARB_fragment_program) = glewGetExtension("GL_ARB_fragment_program"); -#endif /* GL_ARB_fragment_program */ -#ifdef GL_ARB_fragment_program_shadow - CONST_CAST(GLEW_ARB_fragment_program_shadow) = glewGetExtension("GL_ARB_fragment_program_shadow"); -#endif /* GL_ARB_fragment_program_shadow */ -#ifdef GL_ARB_fragment_shader - CONST_CAST(GLEW_ARB_fragment_shader) = glewGetExtension("GL_ARB_fragment_shader"); -#endif /* GL_ARB_fragment_shader */ -#ifdef GL_ARB_framebuffer_object - CONST_CAST(GLEW_ARB_framebuffer_object) = glewGetExtension("GL_ARB_framebuffer_object"); - if (glewExperimental || GLEW_ARB_framebuffer_object) CONST_CAST(GLEW_ARB_framebuffer_object) = !_glewInit_GL_ARB_framebuffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_framebuffer_object */ -#ifdef GL_ARB_framebuffer_sRGB - CONST_CAST(GLEW_ARB_framebuffer_sRGB) = glewGetExtension("GL_ARB_framebuffer_sRGB"); -#endif /* GL_ARB_framebuffer_sRGB */ -#ifdef GL_ARB_geometry_shader4 - CONST_CAST(GLEW_ARB_geometry_shader4) = glewGetExtension("GL_ARB_geometry_shader4"); - if (glewExperimental || GLEW_ARB_geometry_shader4) CONST_CAST(GLEW_ARB_geometry_shader4) = !_glewInit_GL_ARB_geometry_shader4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_geometry_shader4 */ -#ifdef GL_ARB_half_float_pixel - CONST_CAST(GLEW_ARB_half_float_pixel) = glewGetExtension("GL_ARB_half_float_pixel"); -#endif /* GL_ARB_half_float_pixel */ -#ifdef GL_ARB_half_float_vertex - CONST_CAST(GLEW_ARB_half_float_vertex) = glewGetExtension("GL_ARB_half_float_vertex"); -#endif /* GL_ARB_half_float_vertex */ -#ifdef GL_ARB_imaging - CONST_CAST(GLEW_ARB_imaging) = glewGetExtension("GL_ARB_imaging"); - if (glewExperimental || GLEW_ARB_imaging) CONST_CAST(GLEW_ARB_imaging) = !_glewInit_GL_ARB_imaging(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_imaging */ -#ifdef GL_ARB_instanced_arrays - CONST_CAST(GLEW_ARB_instanced_arrays) = glewGetExtension("GL_ARB_instanced_arrays"); - if (glewExperimental || GLEW_ARB_instanced_arrays) CONST_CAST(GLEW_ARB_instanced_arrays) = !_glewInit_GL_ARB_instanced_arrays(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_instanced_arrays */ -#ifdef GL_ARB_map_buffer_range - CONST_CAST(GLEW_ARB_map_buffer_range) = glewGetExtension("GL_ARB_map_buffer_range"); - if (glewExperimental || GLEW_ARB_map_buffer_range) CONST_CAST(GLEW_ARB_map_buffer_range) = !_glewInit_GL_ARB_map_buffer_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_map_buffer_range */ -#ifdef GL_ARB_matrix_palette - CONST_CAST(GLEW_ARB_matrix_palette) = glewGetExtension("GL_ARB_matrix_palette"); - if (glewExperimental || GLEW_ARB_matrix_palette) CONST_CAST(GLEW_ARB_matrix_palette) = !_glewInit_GL_ARB_matrix_palette(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_matrix_palette */ -#ifdef GL_ARB_multisample - CONST_CAST(GLEW_ARB_multisample) = glewGetExtension("GL_ARB_multisample"); - if (glewExperimental || GLEW_ARB_multisample) CONST_CAST(GLEW_ARB_multisample) = !_glewInit_GL_ARB_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_multisample */ -#ifdef GL_ARB_multitexture - CONST_CAST(GLEW_ARB_multitexture) = glewGetExtension("GL_ARB_multitexture"); - if (glewExperimental || GLEW_ARB_multitexture) CONST_CAST(GLEW_ARB_multitexture) = !_glewInit_GL_ARB_multitexture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_multitexture */ -#ifdef GL_ARB_occlusion_query - CONST_CAST(GLEW_ARB_occlusion_query) = glewGetExtension("GL_ARB_occlusion_query"); - if (glewExperimental || GLEW_ARB_occlusion_query) CONST_CAST(GLEW_ARB_occlusion_query) = !_glewInit_GL_ARB_occlusion_query(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_occlusion_query */ -#ifdef GL_ARB_pixel_buffer_object - CONST_CAST(GLEW_ARB_pixel_buffer_object) = glewGetExtension("GL_ARB_pixel_buffer_object"); -#endif /* GL_ARB_pixel_buffer_object */ -#ifdef GL_ARB_point_parameters - CONST_CAST(GLEW_ARB_point_parameters) = glewGetExtension("GL_ARB_point_parameters"); - if (glewExperimental || GLEW_ARB_point_parameters) CONST_CAST(GLEW_ARB_point_parameters) = !_glewInit_GL_ARB_point_parameters(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_point_parameters */ -#ifdef GL_ARB_point_sprite - CONST_CAST(GLEW_ARB_point_sprite) = glewGetExtension("GL_ARB_point_sprite"); -#endif /* GL_ARB_point_sprite */ -#ifdef GL_ARB_shader_objects - CONST_CAST(GLEW_ARB_shader_objects) = glewGetExtension("GL_ARB_shader_objects"); - if (glewExperimental || GLEW_ARB_shader_objects) CONST_CAST(GLEW_ARB_shader_objects) = !_glewInit_GL_ARB_shader_objects(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_shader_objects */ -#ifdef GL_ARB_shading_language_100 - CONST_CAST(GLEW_ARB_shading_language_100) = glewGetExtension("GL_ARB_shading_language_100"); -#endif /* GL_ARB_shading_language_100 */ -#ifdef GL_ARB_shadow - CONST_CAST(GLEW_ARB_shadow) = glewGetExtension("GL_ARB_shadow"); -#endif /* GL_ARB_shadow */ -#ifdef GL_ARB_shadow_ambient - CONST_CAST(GLEW_ARB_shadow_ambient) = glewGetExtension("GL_ARB_shadow_ambient"); -#endif /* GL_ARB_shadow_ambient */ -#ifdef GL_ARB_texture_border_clamp - CONST_CAST(GLEW_ARB_texture_border_clamp) = glewGetExtension("GL_ARB_texture_border_clamp"); -#endif /* GL_ARB_texture_border_clamp */ -#ifdef GL_ARB_texture_buffer_object - CONST_CAST(GLEW_ARB_texture_buffer_object) = glewGetExtension("GL_ARB_texture_buffer_object"); - if (glewExperimental || GLEW_ARB_texture_buffer_object) CONST_CAST(GLEW_ARB_texture_buffer_object) = !_glewInit_GL_ARB_texture_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_texture_buffer_object */ -#ifdef GL_ARB_texture_compression - CONST_CAST(GLEW_ARB_texture_compression) = glewGetExtension("GL_ARB_texture_compression"); - if (glewExperimental || GLEW_ARB_texture_compression) CONST_CAST(GLEW_ARB_texture_compression) = !_glewInit_GL_ARB_texture_compression(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_texture_compression */ -#ifdef GL_ARB_texture_compression_rgtc - CONST_CAST(GLEW_ARB_texture_compression_rgtc) = glewGetExtension("GL_ARB_texture_compression_rgtc"); -#endif /* GL_ARB_texture_compression_rgtc */ -#ifdef GL_ARB_texture_cube_map - CONST_CAST(GLEW_ARB_texture_cube_map) = glewGetExtension("GL_ARB_texture_cube_map"); -#endif /* GL_ARB_texture_cube_map */ -#ifdef GL_ARB_texture_env_add - CONST_CAST(GLEW_ARB_texture_env_add) = glewGetExtension("GL_ARB_texture_env_add"); -#endif /* GL_ARB_texture_env_add */ -#ifdef GL_ARB_texture_env_combine - CONST_CAST(GLEW_ARB_texture_env_combine) = glewGetExtension("GL_ARB_texture_env_combine"); -#endif /* GL_ARB_texture_env_combine */ -#ifdef GL_ARB_texture_env_crossbar - CONST_CAST(GLEW_ARB_texture_env_crossbar) = glewGetExtension("GL_ARB_texture_env_crossbar"); -#endif /* GL_ARB_texture_env_crossbar */ -#ifdef GL_ARB_texture_env_dot3 - CONST_CAST(GLEW_ARB_texture_env_dot3) = glewGetExtension("GL_ARB_texture_env_dot3"); -#endif /* GL_ARB_texture_env_dot3 */ -#ifdef GL_ARB_texture_float - CONST_CAST(GLEW_ARB_texture_float) = glewGetExtension("GL_ARB_texture_float"); -#endif /* GL_ARB_texture_float */ -#ifdef GL_ARB_texture_mirrored_repeat - CONST_CAST(GLEW_ARB_texture_mirrored_repeat) = glewGetExtension("GL_ARB_texture_mirrored_repeat"); -#endif /* GL_ARB_texture_mirrored_repeat */ -#ifdef GL_ARB_texture_non_power_of_two - CONST_CAST(GLEW_ARB_texture_non_power_of_two) = glewGetExtension("GL_ARB_texture_non_power_of_two"); -#endif /* GL_ARB_texture_non_power_of_two */ -#ifdef GL_ARB_texture_rectangle - CONST_CAST(GLEW_ARB_texture_rectangle) = glewGetExtension("GL_ARB_texture_rectangle"); -#endif /* GL_ARB_texture_rectangle */ -#ifdef GL_ARB_texture_rg - CONST_CAST(GLEW_ARB_texture_rg) = glewGetExtension("GL_ARB_texture_rg"); -#endif /* GL_ARB_texture_rg */ -#ifdef GL_ARB_transpose_matrix - CONST_CAST(GLEW_ARB_transpose_matrix) = glewGetExtension("GL_ARB_transpose_matrix"); - if (glewExperimental || GLEW_ARB_transpose_matrix) CONST_CAST(GLEW_ARB_transpose_matrix) = !_glewInit_GL_ARB_transpose_matrix(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_transpose_matrix */ -#ifdef GL_ARB_vertex_array_object - CONST_CAST(GLEW_ARB_vertex_array_object) = glewGetExtension("GL_ARB_vertex_array_object"); - if (glewExperimental || GLEW_ARB_vertex_array_object) CONST_CAST(GLEW_ARB_vertex_array_object) = !_glewInit_GL_ARB_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_array_object */ -#ifdef GL_ARB_vertex_blend - CONST_CAST(GLEW_ARB_vertex_blend) = glewGetExtension("GL_ARB_vertex_blend"); - if (glewExperimental || GLEW_ARB_vertex_blend) CONST_CAST(GLEW_ARB_vertex_blend) = !_glewInit_GL_ARB_vertex_blend(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_blend */ -#ifdef GL_ARB_vertex_buffer_object - CONST_CAST(GLEW_ARB_vertex_buffer_object) = glewGetExtension("GL_ARB_vertex_buffer_object"); - if (glewExperimental || GLEW_ARB_vertex_buffer_object) CONST_CAST(GLEW_ARB_vertex_buffer_object) = !_glewInit_GL_ARB_vertex_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_buffer_object */ -#ifdef GL_ARB_vertex_program - CONST_CAST(GLEW_ARB_vertex_program) = glewGetExtension("GL_ARB_vertex_program"); - if (glewExperimental || GLEW_ARB_vertex_program) CONST_CAST(GLEW_ARB_vertex_program) = !_glewInit_GL_ARB_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_program */ -#ifdef GL_ARB_vertex_shader - CONST_CAST(GLEW_ARB_vertex_shader) = glewGetExtension("GL_ARB_vertex_shader"); - if (glewExperimental || GLEW_ARB_vertex_shader) CONST_CAST(GLEW_ARB_vertex_shader) = !_glewInit_GL_ARB_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_vertex_shader */ -#ifdef GL_ARB_window_pos - CONST_CAST(GLEW_ARB_window_pos) = glewGetExtension("GL_ARB_window_pos"); - if (glewExperimental || GLEW_ARB_window_pos) CONST_CAST(GLEW_ARB_window_pos) = !_glewInit_GL_ARB_window_pos(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ARB_window_pos */ -#ifdef GL_ATIX_point_sprites - CONST_CAST(GLEW_ATIX_point_sprites) = glewGetExtension("GL_ATIX_point_sprites"); -#endif /* GL_ATIX_point_sprites */ -#ifdef GL_ATIX_texture_env_combine3 - CONST_CAST(GLEW_ATIX_texture_env_combine3) = glewGetExtension("GL_ATIX_texture_env_combine3"); -#endif /* GL_ATIX_texture_env_combine3 */ -#ifdef GL_ATIX_texture_env_route - CONST_CAST(GLEW_ATIX_texture_env_route) = glewGetExtension("GL_ATIX_texture_env_route"); -#endif /* GL_ATIX_texture_env_route */ -#ifdef GL_ATIX_vertex_shader_output_point_size - CONST_CAST(GLEW_ATIX_vertex_shader_output_point_size) = glewGetExtension("GL_ATIX_vertex_shader_output_point_size"); -#endif /* GL_ATIX_vertex_shader_output_point_size */ -#ifdef GL_ATI_draw_buffers - CONST_CAST(GLEW_ATI_draw_buffers) = glewGetExtension("GL_ATI_draw_buffers"); - if (glewExperimental || GLEW_ATI_draw_buffers) CONST_CAST(GLEW_ATI_draw_buffers) = !_glewInit_GL_ATI_draw_buffers(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_draw_buffers */ -#ifdef GL_ATI_element_array - CONST_CAST(GLEW_ATI_element_array) = glewGetExtension("GL_ATI_element_array"); - if (glewExperimental || GLEW_ATI_element_array) CONST_CAST(GLEW_ATI_element_array) = !_glewInit_GL_ATI_element_array(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_element_array */ -#ifdef GL_ATI_envmap_bumpmap - CONST_CAST(GLEW_ATI_envmap_bumpmap) = glewGetExtension("GL_ATI_envmap_bumpmap"); - if (glewExperimental || GLEW_ATI_envmap_bumpmap) CONST_CAST(GLEW_ATI_envmap_bumpmap) = !_glewInit_GL_ATI_envmap_bumpmap(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_envmap_bumpmap */ -#ifdef GL_ATI_fragment_shader - CONST_CAST(GLEW_ATI_fragment_shader) = glewGetExtension("GL_ATI_fragment_shader"); - if (glewExperimental || GLEW_ATI_fragment_shader) CONST_CAST(GLEW_ATI_fragment_shader) = !_glewInit_GL_ATI_fragment_shader(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_fragment_shader */ -#ifdef GL_ATI_map_object_buffer - CONST_CAST(GLEW_ATI_map_object_buffer) = glewGetExtension("GL_ATI_map_object_buffer"); - if (glewExperimental || GLEW_ATI_map_object_buffer) CONST_CAST(GLEW_ATI_map_object_buffer) = !_glewInit_GL_ATI_map_object_buffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_map_object_buffer */ -#ifdef GL_ATI_pn_triangles - CONST_CAST(GLEW_ATI_pn_triangles) = glewGetExtension("GL_ATI_pn_triangles"); - if (glewExperimental || GLEW_ATI_pn_triangles) CONST_CAST(GLEW_ATI_pn_triangles) = !_glewInit_GL_ATI_pn_triangles(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_pn_triangles */ -#ifdef GL_ATI_separate_stencil - CONST_CAST(GLEW_ATI_separate_stencil) = glewGetExtension("GL_ATI_separate_stencil"); - if (glewExperimental || GLEW_ATI_separate_stencil) CONST_CAST(GLEW_ATI_separate_stencil) = !_glewInit_GL_ATI_separate_stencil(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_separate_stencil */ -#ifdef GL_ATI_shader_texture_lod - CONST_CAST(GLEW_ATI_shader_texture_lod) = glewGetExtension("GL_ATI_shader_texture_lod"); -#endif /* GL_ATI_shader_texture_lod */ -#ifdef GL_ATI_text_fragment_shader - CONST_CAST(GLEW_ATI_text_fragment_shader) = glewGetExtension("GL_ATI_text_fragment_shader"); -#endif /* GL_ATI_text_fragment_shader */ -#ifdef GL_ATI_texture_compression_3dc - CONST_CAST(GLEW_ATI_texture_compression_3dc) = glewGetExtension("GL_ATI_texture_compression_3dc"); -#endif /* GL_ATI_texture_compression_3dc */ -#ifdef GL_ATI_texture_env_combine3 - CONST_CAST(GLEW_ATI_texture_env_combine3) = glewGetExtension("GL_ATI_texture_env_combine3"); -#endif /* GL_ATI_texture_env_combine3 */ -#ifdef GL_ATI_texture_float - CONST_CAST(GLEW_ATI_texture_float) = glewGetExtension("GL_ATI_texture_float"); -#endif /* GL_ATI_texture_float */ -#ifdef GL_ATI_texture_mirror_once - CONST_CAST(GLEW_ATI_texture_mirror_once) = glewGetExtension("GL_ATI_texture_mirror_once"); -#endif /* GL_ATI_texture_mirror_once */ -#ifdef GL_ATI_vertex_array_object - CONST_CAST(GLEW_ATI_vertex_array_object) = glewGetExtension("GL_ATI_vertex_array_object"); - if (glewExperimental || GLEW_ATI_vertex_array_object) CONST_CAST(GLEW_ATI_vertex_array_object) = !_glewInit_GL_ATI_vertex_array_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_vertex_array_object */ -#ifdef GL_ATI_vertex_attrib_array_object - CONST_CAST(GLEW_ATI_vertex_attrib_array_object) = glewGetExtension("GL_ATI_vertex_attrib_array_object"); - if (glewExperimental || GLEW_ATI_vertex_attrib_array_object) CONST_CAST(GLEW_ATI_vertex_attrib_array_object) = !_glewInit_GL_ATI_vertex_attrib_array_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_vertex_attrib_array_object */ -#ifdef GL_ATI_vertex_streams - CONST_CAST(GLEW_ATI_vertex_streams) = glewGetExtension("GL_ATI_vertex_streams"); - if (glewExperimental || GLEW_ATI_vertex_streams) CONST_CAST(GLEW_ATI_vertex_streams) = !_glewInit_GL_ATI_vertex_streams(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_ATI_vertex_streams */ -#ifdef GL_EXT_422_pixels - CONST_CAST(GLEW_EXT_422_pixels) = glewGetExtension("GL_EXT_422_pixels"); -#endif /* GL_EXT_422_pixels */ -#ifdef GL_EXT_Cg_shader - CONST_CAST(GLEW_EXT_Cg_shader) = glewGetExtension("GL_EXT_Cg_shader"); -#endif /* GL_EXT_Cg_shader */ -#ifdef GL_EXT_abgr - CONST_CAST(GLEW_EXT_abgr) = glewGetExtension("GL_EXT_abgr"); -#endif /* GL_EXT_abgr */ -#ifdef GL_EXT_bgra - CONST_CAST(GLEW_EXT_bgra) = glewGetExtension("GL_EXT_bgra"); -#endif /* GL_EXT_bgra */ -#ifdef GL_EXT_bindable_uniform - CONST_CAST(GLEW_EXT_bindable_uniform) = glewGetExtension("GL_EXT_bindable_uniform"); - if (glewExperimental || GLEW_EXT_bindable_uniform) CONST_CAST(GLEW_EXT_bindable_uniform) = !_glewInit_GL_EXT_bindable_uniform(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_bindable_uniform */ -#ifdef GL_EXT_blend_color - CONST_CAST(GLEW_EXT_blend_color) = glewGetExtension("GL_EXT_blend_color"); - if (glewExperimental || GLEW_EXT_blend_color) CONST_CAST(GLEW_EXT_blend_color) = !_glewInit_GL_EXT_blend_color(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_blend_color */ -#ifdef GL_EXT_blend_equation_separate - CONST_CAST(GLEW_EXT_blend_equation_separate) = glewGetExtension("GL_EXT_blend_equation_separate"); - if (glewExperimental || GLEW_EXT_blend_equation_separate) CONST_CAST(GLEW_EXT_blend_equation_separate) = !_glewInit_GL_EXT_blend_equation_separate(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_blend_equation_separate */ -#ifdef GL_EXT_blend_func_separate - CONST_CAST(GLEW_EXT_blend_func_separate) = glewGetExtension("GL_EXT_blend_func_separate"); - if (glewExperimental || GLEW_EXT_blend_func_separate) CONST_CAST(GLEW_EXT_blend_func_separate) = !_glewInit_GL_EXT_blend_func_separate(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_blend_func_separate */ -#ifdef GL_EXT_blend_logic_op - CONST_CAST(GLEW_EXT_blend_logic_op) = glewGetExtension("GL_EXT_blend_logic_op"); -#endif /* GL_EXT_blend_logic_op */ -#ifdef GL_EXT_blend_minmax - CONST_CAST(GLEW_EXT_blend_minmax) = glewGetExtension("GL_EXT_blend_minmax"); - if (glewExperimental || GLEW_EXT_blend_minmax) CONST_CAST(GLEW_EXT_blend_minmax) = !_glewInit_GL_EXT_blend_minmax(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_blend_minmax */ -#ifdef GL_EXT_blend_subtract - CONST_CAST(GLEW_EXT_blend_subtract) = glewGetExtension("GL_EXT_blend_subtract"); -#endif /* GL_EXT_blend_subtract */ -#ifdef GL_EXT_clip_volume_hint - CONST_CAST(GLEW_EXT_clip_volume_hint) = glewGetExtension("GL_EXT_clip_volume_hint"); -#endif /* GL_EXT_clip_volume_hint */ -#ifdef GL_EXT_cmyka - CONST_CAST(GLEW_EXT_cmyka) = glewGetExtension("GL_EXT_cmyka"); -#endif /* GL_EXT_cmyka */ -#ifdef GL_EXT_color_subtable - CONST_CAST(GLEW_EXT_color_subtable) = glewGetExtension("GL_EXT_color_subtable"); - if (glewExperimental || GLEW_EXT_color_subtable) CONST_CAST(GLEW_EXT_color_subtable) = !_glewInit_GL_EXT_color_subtable(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_color_subtable */ -#ifdef GL_EXT_compiled_vertex_array - CONST_CAST(GLEW_EXT_compiled_vertex_array) = glewGetExtension("GL_EXT_compiled_vertex_array"); - if (glewExperimental || GLEW_EXT_compiled_vertex_array) CONST_CAST(GLEW_EXT_compiled_vertex_array) = !_glewInit_GL_EXT_compiled_vertex_array(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_compiled_vertex_array */ -#ifdef GL_EXT_convolution - CONST_CAST(GLEW_EXT_convolution) = glewGetExtension("GL_EXT_convolution"); - if (glewExperimental || GLEW_EXT_convolution) CONST_CAST(GLEW_EXT_convolution) = !_glewInit_GL_EXT_convolution(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_convolution */ -#ifdef GL_EXT_coordinate_frame - CONST_CAST(GLEW_EXT_coordinate_frame) = glewGetExtension("GL_EXT_coordinate_frame"); - if (glewExperimental || GLEW_EXT_coordinate_frame) CONST_CAST(GLEW_EXT_coordinate_frame) = !_glewInit_GL_EXT_coordinate_frame(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_coordinate_frame */ -#ifdef GL_EXT_copy_texture - CONST_CAST(GLEW_EXT_copy_texture) = glewGetExtension("GL_EXT_copy_texture"); - if (glewExperimental || GLEW_EXT_copy_texture) CONST_CAST(GLEW_EXT_copy_texture) = !_glewInit_GL_EXT_copy_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_copy_texture */ -#ifdef GL_EXT_cull_vertex - CONST_CAST(GLEW_EXT_cull_vertex) = glewGetExtension("GL_EXT_cull_vertex"); - if (glewExperimental || GLEW_EXT_cull_vertex) CONST_CAST(GLEW_EXT_cull_vertex) = !_glewInit_GL_EXT_cull_vertex(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_cull_vertex */ -#ifdef GL_EXT_depth_bounds_test - CONST_CAST(GLEW_EXT_depth_bounds_test) = glewGetExtension("GL_EXT_depth_bounds_test"); - if (glewExperimental || GLEW_EXT_depth_bounds_test) CONST_CAST(GLEW_EXT_depth_bounds_test) = !_glewInit_GL_EXT_depth_bounds_test(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_depth_bounds_test */ -#ifdef GL_EXT_direct_state_access - CONST_CAST(GLEW_EXT_direct_state_access) = glewGetExtension("GL_EXT_direct_state_access"); - if (glewExperimental || GLEW_EXT_direct_state_access) CONST_CAST(GLEW_EXT_direct_state_access) = !_glewInit_GL_EXT_direct_state_access(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_direct_state_access */ -#ifdef GL_EXT_draw_buffers2 - CONST_CAST(GLEW_EXT_draw_buffers2) = glewGetExtension("GL_EXT_draw_buffers2"); - if (glewExperimental || GLEW_EXT_draw_buffers2) CONST_CAST(GLEW_EXT_draw_buffers2) = !_glewInit_GL_EXT_draw_buffers2(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_draw_buffers2 */ -#ifdef GL_EXT_draw_instanced - CONST_CAST(GLEW_EXT_draw_instanced) = glewGetExtension("GL_EXT_draw_instanced"); - if (glewExperimental || GLEW_EXT_draw_instanced) CONST_CAST(GLEW_EXT_draw_instanced) = !_glewInit_GL_EXT_draw_instanced(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_draw_instanced */ -#ifdef GL_EXT_draw_range_elements - CONST_CAST(GLEW_EXT_draw_range_elements) = glewGetExtension("GL_EXT_draw_range_elements"); - if (glewExperimental || GLEW_EXT_draw_range_elements) CONST_CAST(GLEW_EXT_draw_range_elements) = !_glewInit_GL_EXT_draw_range_elements(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_draw_range_elements */ -#ifdef GL_EXT_fog_coord - CONST_CAST(GLEW_EXT_fog_coord) = glewGetExtension("GL_EXT_fog_coord"); - if (glewExperimental || GLEW_EXT_fog_coord) CONST_CAST(GLEW_EXT_fog_coord) = !_glewInit_GL_EXT_fog_coord(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_fog_coord */ -#ifdef GL_EXT_fragment_lighting - CONST_CAST(GLEW_EXT_fragment_lighting) = glewGetExtension("GL_EXT_fragment_lighting"); - if (glewExperimental || GLEW_EXT_fragment_lighting) CONST_CAST(GLEW_EXT_fragment_lighting) = !_glewInit_GL_EXT_fragment_lighting(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_fragment_lighting */ -#ifdef GL_EXT_framebuffer_blit - CONST_CAST(GLEW_EXT_framebuffer_blit) = glewGetExtension("GL_EXT_framebuffer_blit"); - if (glewExperimental || GLEW_EXT_framebuffer_blit) CONST_CAST(GLEW_EXT_framebuffer_blit) = !_glewInit_GL_EXT_framebuffer_blit(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_framebuffer_blit */ -#ifdef GL_EXT_framebuffer_multisample - CONST_CAST(GLEW_EXT_framebuffer_multisample) = glewGetExtension("GL_EXT_framebuffer_multisample"); - if (glewExperimental || GLEW_EXT_framebuffer_multisample) CONST_CAST(GLEW_EXT_framebuffer_multisample) = !_glewInit_GL_EXT_framebuffer_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_framebuffer_multisample */ -#ifdef GL_EXT_framebuffer_object - CONST_CAST(GLEW_EXT_framebuffer_object) = glewGetExtension("GL_EXT_framebuffer_object"); - if (glewExperimental || GLEW_EXT_framebuffer_object) CONST_CAST(GLEW_EXT_framebuffer_object) = !_glewInit_GL_EXT_framebuffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_framebuffer_object */ -#ifdef GL_EXT_framebuffer_sRGB - CONST_CAST(GLEW_EXT_framebuffer_sRGB) = glewGetExtension("GL_EXT_framebuffer_sRGB"); -#endif /* GL_EXT_framebuffer_sRGB */ -#ifdef GL_EXT_geometry_shader4 - CONST_CAST(GLEW_EXT_geometry_shader4) = glewGetExtension("GL_EXT_geometry_shader4"); - if (glewExperimental || GLEW_EXT_geometry_shader4) CONST_CAST(GLEW_EXT_geometry_shader4) = !_glewInit_GL_EXT_geometry_shader4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_geometry_shader4 */ -#ifdef GL_EXT_gpu_program_parameters - CONST_CAST(GLEW_EXT_gpu_program_parameters) = glewGetExtension("GL_EXT_gpu_program_parameters"); - if (glewExperimental || GLEW_EXT_gpu_program_parameters) CONST_CAST(GLEW_EXT_gpu_program_parameters) = !_glewInit_GL_EXT_gpu_program_parameters(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_gpu_program_parameters */ -#ifdef GL_EXT_gpu_shader4 - CONST_CAST(GLEW_EXT_gpu_shader4) = glewGetExtension("GL_EXT_gpu_shader4"); - if (glewExperimental || GLEW_EXT_gpu_shader4) CONST_CAST(GLEW_EXT_gpu_shader4) = !_glewInit_GL_EXT_gpu_shader4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_gpu_shader4 */ -#ifdef GL_EXT_histogram - CONST_CAST(GLEW_EXT_histogram) = glewGetExtension("GL_EXT_histogram"); - if (glewExperimental || GLEW_EXT_histogram) CONST_CAST(GLEW_EXT_histogram) = !_glewInit_GL_EXT_histogram(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_histogram */ -#ifdef GL_EXT_index_array_formats - CONST_CAST(GLEW_EXT_index_array_formats) = glewGetExtension("GL_EXT_index_array_formats"); -#endif /* GL_EXT_index_array_formats */ -#ifdef GL_EXT_index_func - CONST_CAST(GLEW_EXT_index_func) = glewGetExtension("GL_EXT_index_func"); - if (glewExperimental || GLEW_EXT_index_func) CONST_CAST(GLEW_EXT_index_func) = !_glewInit_GL_EXT_index_func(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_index_func */ -#ifdef GL_EXT_index_material - CONST_CAST(GLEW_EXT_index_material) = glewGetExtension("GL_EXT_index_material"); - if (glewExperimental || GLEW_EXT_index_material) CONST_CAST(GLEW_EXT_index_material) = !_glewInit_GL_EXT_index_material(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_index_material */ -#ifdef GL_EXT_index_texture - CONST_CAST(GLEW_EXT_index_texture) = glewGetExtension("GL_EXT_index_texture"); -#endif /* GL_EXT_index_texture */ -#ifdef GL_EXT_light_texture - CONST_CAST(GLEW_EXT_light_texture) = glewGetExtension("GL_EXT_light_texture"); - if (glewExperimental || GLEW_EXT_light_texture) CONST_CAST(GLEW_EXT_light_texture) = !_glewInit_GL_EXT_light_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_light_texture */ -#ifdef GL_EXT_misc_attribute - CONST_CAST(GLEW_EXT_misc_attribute) = glewGetExtension("GL_EXT_misc_attribute"); -#endif /* GL_EXT_misc_attribute */ -#ifdef GL_EXT_multi_draw_arrays - CONST_CAST(GLEW_EXT_multi_draw_arrays) = glewGetExtension("GL_EXT_multi_draw_arrays"); - if (glewExperimental || GLEW_EXT_multi_draw_arrays) CONST_CAST(GLEW_EXT_multi_draw_arrays) = !_glewInit_GL_EXT_multi_draw_arrays(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_multi_draw_arrays */ -#ifdef GL_EXT_multisample - CONST_CAST(GLEW_EXT_multisample) = glewGetExtension("GL_EXT_multisample"); - if (glewExperimental || GLEW_EXT_multisample) CONST_CAST(GLEW_EXT_multisample) = !_glewInit_GL_EXT_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_multisample */ -#ifdef GL_EXT_packed_depth_stencil - CONST_CAST(GLEW_EXT_packed_depth_stencil) = glewGetExtension("GL_EXT_packed_depth_stencil"); -#endif /* GL_EXT_packed_depth_stencil */ -#ifdef GL_EXT_packed_float - CONST_CAST(GLEW_EXT_packed_float) = glewGetExtension("GL_EXT_packed_float"); -#endif /* GL_EXT_packed_float */ -#ifdef GL_EXT_packed_pixels - CONST_CAST(GLEW_EXT_packed_pixels) = glewGetExtension("GL_EXT_packed_pixels"); -#endif /* GL_EXT_packed_pixels */ -#ifdef GL_EXT_paletted_texture - CONST_CAST(GLEW_EXT_paletted_texture) = glewGetExtension("GL_EXT_paletted_texture"); - if (glewExperimental || GLEW_EXT_paletted_texture) CONST_CAST(GLEW_EXT_paletted_texture) = !_glewInit_GL_EXT_paletted_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_paletted_texture */ -#ifdef GL_EXT_pixel_buffer_object - CONST_CAST(GLEW_EXT_pixel_buffer_object) = glewGetExtension("GL_EXT_pixel_buffer_object"); -#endif /* GL_EXT_pixel_buffer_object */ -#ifdef GL_EXT_pixel_transform - CONST_CAST(GLEW_EXT_pixel_transform) = glewGetExtension("GL_EXT_pixel_transform"); - if (glewExperimental || GLEW_EXT_pixel_transform) CONST_CAST(GLEW_EXT_pixel_transform) = !_glewInit_GL_EXT_pixel_transform(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_pixel_transform */ -#ifdef GL_EXT_pixel_transform_color_table - CONST_CAST(GLEW_EXT_pixel_transform_color_table) = glewGetExtension("GL_EXT_pixel_transform_color_table"); -#endif /* GL_EXT_pixel_transform_color_table */ -#ifdef GL_EXT_point_parameters - CONST_CAST(GLEW_EXT_point_parameters) = glewGetExtension("GL_EXT_point_parameters"); - if (glewExperimental || GLEW_EXT_point_parameters) CONST_CAST(GLEW_EXT_point_parameters) = !_glewInit_GL_EXT_point_parameters(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_point_parameters */ -#ifdef GL_EXT_polygon_offset - CONST_CAST(GLEW_EXT_polygon_offset) = glewGetExtension("GL_EXT_polygon_offset"); - if (glewExperimental || GLEW_EXT_polygon_offset) CONST_CAST(GLEW_EXT_polygon_offset) = !_glewInit_GL_EXT_polygon_offset(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_polygon_offset */ -#ifdef GL_EXT_rescale_normal - CONST_CAST(GLEW_EXT_rescale_normal) = glewGetExtension("GL_EXT_rescale_normal"); -#endif /* GL_EXT_rescale_normal */ -#ifdef GL_EXT_scene_marker - CONST_CAST(GLEW_EXT_scene_marker) = glewGetExtension("GL_EXT_scene_marker"); - if (glewExperimental || GLEW_EXT_scene_marker) CONST_CAST(GLEW_EXT_scene_marker) = !_glewInit_GL_EXT_scene_marker(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_scene_marker */ -#ifdef GL_EXT_secondary_color - CONST_CAST(GLEW_EXT_secondary_color) = glewGetExtension("GL_EXT_secondary_color"); - if (glewExperimental || GLEW_EXT_secondary_color) CONST_CAST(GLEW_EXT_secondary_color) = !_glewInit_GL_EXT_secondary_color(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_secondary_color */ -#ifdef GL_EXT_separate_specular_color - CONST_CAST(GLEW_EXT_separate_specular_color) = glewGetExtension("GL_EXT_separate_specular_color"); -#endif /* GL_EXT_separate_specular_color */ -#ifdef GL_EXT_shadow_funcs - CONST_CAST(GLEW_EXT_shadow_funcs) = glewGetExtension("GL_EXT_shadow_funcs"); -#endif /* GL_EXT_shadow_funcs */ -#ifdef GL_EXT_shared_texture_palette - CONST_CAST(GLEW_EXT_shared_texture_palette) = glewGetExtension("GL_EXT_shared_texture_palette"); -#endif /* GL_EXT_shared_texture_palette */ -#ifdef GL_EXT_stencil_clear_tag - CONST_CAST(GLEW_EXT_stencil_clear_tag) = glewGetExtension("GL_EXT_stencil_clear_tag"); -#endif /* GL_EXT_stencil_clear_tag */ -#ifdef GL_EXT_stencil_two_side - CONST_CAST(GLEW_EXT_stencil_two_side) = glewGetExtension("GL_EXT_stencil_two_side"); - if (glewExperimental || GLEW_EXT_stencil_two_side) CONST_CAST(GLEW_EXT_stencil_two_side) = !_glewInit_GL_EXT_stencil_two_side(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_stencil_two_side */ -#ifdef GL_EXT_stencil_wrap - CONST_CAST(GLEW_EXT_stencil_wrap) = glewGetExtension("GL_EXT_stencil_wrap"); -#endif /* GL_EXT_stencil_wrap */ -#ifdef GL_EXT_subtexture - CONST_CAST(GLEW_EXT_subtexture) = glewGetExtension("GL_EXT_subtexture"); - if (glewExperimental || GLEW_EXT_subtexture) CONST_CAST(GLEW_EXT_subtexture) = !_glewInit_GL_EXT_subtexture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_subtexture */ -#ifdef GL_EXT_texture - CONST_CAST(GLEW_EXT_texture) = glewGetExtension("GL_EXT_texture"); -#endif /* GL_EXT_texture */ -#ifdef GL_EXT_texture3D - CONST_CAST(GLEW_EXT_texture3D) = glewGetExtension("GL_EXT_texture3D"); - if (glewExperimental || GLEW_EXT_texture3D) CONST_CAST(GLEW_EXT_texture3D) = !_glewInit_GL_EXT_texture3D(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture3D */ -#ifdef GL_EXT_texture_array - CONST_CAST(GLEW_EXT_texture_array) = glewGetExtension("GL_EXT_texture_array"); -#endif /* GL_EXT_texture_array */ -#ifdef GL_EXT_texture_buffer_object - CONST_CAST(GLEW_EXT_texture_buffer_object) = glewGetExtension("GL_EXT_texture_buffer_object"); - if (glewExperimental || GLEW_EXT_texture_buffer_object) CONST_CAST(GLEW_EXT_texture_buffer_object) = !_glewInit_GL_EXT_texture_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture_buffer_object */ -#ifdef GL_EXT_texture_compression_dxt1 - CONST_CAST(GLEW_EXT_texture_compression_dxt1) = glewGetExtension("GL_EXT_texture_compression_dxt1"); -#endif /* GL_EXT_texture_compression_dxt1 */ -#ifdef GL_EXT_texture_compression_latc - CONST_CAST(GLEW_EXT_texture_compression_latc) = glewGetExtension("GL_EXT_texture_compression_latc"); -#endif /* GL_EXT_texture_compression_latc */ -#ifdef GL_EXT_texture_compression_rgtc - CONST_CAST(GLEW_EXT_texture_compression_rgtc) = glewGetExtension("GL_EXT_texture_compression_rgtc"); -#endif /* GL_EXT_texture_compression_rgtc */ -#ifdef GL_EXT_texture_compression_s3tc - CONST_CAST(GLEW_EXT_texture_compression_s3tc) = glewGetExtension("GL_EXT_texture_compression_s3tc"); -#endif /* GL_EXT_texture_compression_s3tc */ -#ifdef GL_EXT_texture_cube_map - CONST_CAST(GLEW_EXT_texture_cube_map) = glewGetExtension("GL_EXT_texture_cube_map"); -#endif /* GL_EXT_texture_cube_map */ -#ifdef GL_EXT_texture_edge_clamp - CONST_CAST(GLEW_EXT_texture_edge_clamp) = glewGetExtension("GL_EXT_texture_edge_clamp"); -#endif /* GL_EXT_texture_edge_clamp */ -#ifdef GL_EXT_texture_env - CONST_CAST(GLEW_EXT_texture_env) = glewGetExtension("GL_EXT_texture_env"); -#endif /* GL_EXT_texture_env */ -#ifdef GL_EXT_texture_env_add - CONST_CAST(GLEW_EXT_texture_env_add) = glewGetExtension("GL_EXT_texture_env_add"); -#endif /* GL_EXT_texture_env_add */ -#ifdef GL_EXT_texture_env_combine - CONST_CAST(GLEW_EXT_texture_env_combine) = glewGetExtension("GL_EXT_texture_env_combine"); -#endif /* GL_EXT_texture_env_combine */ -#ifdef GL_EXT_texture_env_dot3 - CONST_CAST(GLEW_EXT_texture_env_dot3) = glewGetExtension("GL_EXT_texture_env_dot3"); -#endif /* GL_EXT_texture_env_dot3 */ -#ifdef GL_EXT_texture_filter_anisotropic - CONST_CAST(GLEW_EXT_texture_filter_anisotropic) = glewGetExtension("GL_EXT_texture_filter_anisotropic"); -#endif /* GL_EXT_texture_filter_anisotropic */ -#ifdef GL_EXT_texture_integer - CONST_CAST(GLEW_EXT_texture_integer) = glewGetExtension("GL_EXT_texture_integer"); - if (glewExperimental || GLEW_EXT_texture_integer) CONST_CAST(GLEW_EXT_texture_integer) = !_glewInit_GL_EXT_texture_integer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture_integer */ -#ifdef GL_EXT_texture_lod_bias - CONST_CAST(GLEW_EXT_texture_lod_bias) = glewGetExtension("GL_EXT_texture_lod_bias"); -#endif /* GL_EXT_texture_lod_bias */ -#ifdef GL_EXT_texture_mirror_clamp - CONST_CAST(GLEW_EXT_texture_mirror_clamp) = glewGetExtension("GL_EXT_texture_mirror_clamp"); -#endif /* GL_EXT_texture_mirror_clamp */ -#ifdef GL_EXT_texture_object - CONST_CAST(GLEW_EXT_texture_object) = glewGetExtension("GL_EXT_texture_object"); - if (glewExperimental || GLEW_EXT_texture_object) CONST_CAST(GLEW_EXT_texture_object) = !_glewInit_GL_EXT_texture_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture_object */ -#ifdef GL_EXT_texture_perturb_normal - CONST_CAST(GLEW_EXT_texture_perturb_normal) = glewGetExtension("GL_EXT_texture_perturb_normal"); - if (glewExperimental || GLEW_EXT_texture_perturb_normal) CONST_CAST(GLEW_EXT_texture_perturb_normal) = !_glewInit_GL_EXT_texture_perturb_normal(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_texture_perturb_normal */ -#ifdef GL_EXT_texture_rectangle - CONST_CAST(GLEW_EXT_texture_rectangle) = glewGetExtension("GL_EXT_texture_rectangle"); -#endif /* GL_EXT_texture_rectangle */ -#ifdef GL_EXT_texture_sRGB - CONST_CAST(GLEW_EXT_texture_sRGB) = glewGetExtension("GL_EXT_texture_sRGB"); -#endif /* GL_EXT_texture_sRGB */ -#ifdef GL_EXT_texture_shared_exponent - CONST_CAST(GLEW_EXT_texture_shared_exponent) = glewGetExtension("GL_EXT_texture_shared_exponent"); -#endif /* GL_EXT_texture_shared_exponent */ -#ifdef GL_EXT_texture_swizzle - CONST_CAST(GLEW_EXT_texture_swizzle) = glewGetExtension("GL_EXT_texture_swizzle"); -#endif /* GL_EXT_texture_swizzle */ -#ifdef GL_EXT_timer_query - CONST_CAST(GLEW_EXT_timer_query) = glewGetExtension("GL_EXT_timer_query"); - if (glewExperimental || GLEW_EXT_timer_query) CONST_CAST(GLEW_EXT_timer_query) = !_glewInit_GL_EXT_timer_query(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_timer_query */ -#ifdef GL_EXT_transform_feedback - CONST_CAST(GLEW_EXT_transform_feedback) = glewGetExtension("GL_EXT_transform_feedback"); - if (glewExperimental || GLEW_EXT_transform_feedback) CONST_CAST(GLEW_EXT_transform_feedback) = !_glewInit_GL_EXT_transform_feedback(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_transform_feedback */ -#ifdef GL_EXT_vertex_array - CONST_CAST(GLEW_EXT_vertex_array) = glewGetExtension("GL_EXT_vertex_array"); - if (glewExperimental || GLEW_EXT_vertex_array) CONST_CAST(GLEW_EXT_vertex_array) = !_glewInit_GL_EXT_vertex_array(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_vertex_array */ -#ifdef GL_EXT_vertex_array_bgra - CONST_CAST(GLEW_EXT_vertex_array_bgra) = glewGetExtension("GL_EXT_vertex_array_bgra"); -#endif /* GL_EXT_vertex_array_bgra */ -#ifdef GL_EXT_vertex_shader - CONST_CAST(GLEW_EXT_vertex_shader) = glewGetExtension("GL_EXT_vertex_shader"); - if (glewExperimental || GLEW_EXT_vertex_shader) CONST_CAST(GLEW_EXT_vertex_shader) = !_glewInit_GL_EXT_vertex_shader(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_vertex_shader */ -#ifdef GL_EXT_vertex_weighting - CONST_CAST(GLEW_EXT_vertex_weighting) = glewGetExtension("GL_EXT_vertex_weighting"); - if (glewExperimental || GLEW_EXT_vertex_weighting) CONST_CAST(GLEW_EXT_vertex_weighting) = !_glewInit_GL_EXT_vertex_weighting(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_EXT_vertex_weighting */ -#ifdef GL_GREMEDY_frame_terminator - CONST_CAST(GLEW_GREMEDY_frame_terminator) = glewGetExtension("GL_GREMEDY_frame_terminator"); - if (glewExperimental || GLEW_GREMEDY_frame_terminator) CONST_CAST(GLEW_GREMEDY_frame_terminator) = !_glewInit_GL_GREMEDY_frame_terminator(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_GREMEDY_frame_terminator */ -#ifdef GL_GREMEDY_string_marker - CONST_CAST(GLEW_GREMEDY_string_marker) = glewGetExtension("GL_GREMEDY_string_marker"); - if (glewExperimental || GLEW_GREMEDY_string_marker) CONST_CAST(GLEW_GREMEDY_string_marker) = !_glewInit_GL_GREMEDY_string_marker(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_GREMEDY_string_marker */ -#ifdef GL_HP_convolution_border_modes - CONST_CAST(GLEW_HP_convolution_border_modes) = glewGetExtension("GL_HP_convolution_border_modes"); -#endif /* GL_HP_convolution_border_modes */ -#ifdef GL_HP_image_transform - CONST_CAST(GLEW_HP_image_transform) = glewGetExtension("GL_HP_image_transform"); - if (glewExperimental || GLEW_HP_image_transform) CONST_CAST(GLEW_HP_image_transform) = !_glewInit_GL_HP_image_transform(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_HP_image_transform */ -#ifdef GL_HP_occlusion_test - CONST_CAST(GLEW_HP_occlusion_test) = glewGetExtension("GL_HP_occlusion_test"); -#endif /* GL_HP_occlusion_test */ -#ifdef GL_HP_texture_lighting - CONST_CAST(GLEW_HP_texture_lighting) = glewGetExtension("GL_HP_texture_lighting"); -#endif /* GL_HP_texture_lighting */ -#ifdef GL_IBM_cull_vertex - CONST_CAST(GLEW_IBM_cull_vertex) = glewGetExtension("GL_IBM_cull_vertex"); -#endif /* GL_IBM_cull_vertex */ -#ifdef GL_IBM_multimode_draw_arrays - CONST_CAST(GLEW_IBM_multimode_draw_arrays) = glewGetExtension("GL_IBM_multimode_draw_arrays"); - if (glewExperimental || GLEW_IBM_multimode_draw_arrays) CONST_CAST(GLEW_IBM_multimode_draw_arrays) = !_glewInit_GL_IBM_multimode_draw_arrays(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_IBM_multimode_draw_arrays */ -#ifdef GL_IBM_rasterpos_clip - CONST_CAST(GLEW_IBM_rasterpos_clip) = glewGetExtension("GL_IBM_rasterpos_clip"); -#endif /* GL_IBM_rasterpos_clip */ -#ifdef GL_IBM_static_data - CONST_CAST(GLEW_IBM_static_data) = glewGetExtension("GL_IBM_static_data"); -#endif /* GL_IBM_static_data */ -#ifdef GL_IBM_texture_mirrored_repeat - CONST_CAST(GLEW_IBM_texture_mirrored_repeat) = glewGetExtension("GL_IBM_texture_mirrored_repeat"); -#endif /* GL_IBM_texture_mirrored_repeat */ -#ifdef GL_IBM_vertex_array_lists - CONST_CAST(GLEW_IBM_vertex_array_lists) = glewGetExtension("GL_IBM_vertex_array_lists"); - if (glewExperimental || GLEW_IBM_vertex_array_lists) CONST_CAST(GLEW_IBM_vertex_array_lists) = !_glewInit_GL_IBM_vertex_array_lists(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_IBM_vertex_array_lists */ -#ifdef GL_INGR_color_clamp - CONST_CAST(GLEW_INGR_color_clamp) = glewGetExtension("GL_INGR_color_clamp"); -#endif /* GL_INGR_color_clamp */ -#ifdef GL_INGR_interlace_read - CONST_CAST(GLEW_INGR_interlace_read) = glewGetExtension("GL_INGR_interlace_read"); -#endif /* GL_INGR_interlace_read */ -#ifdef GL_INTEL_parallel_arrays - CONST_CAST(GLEW_INTEL_parallel_arrays) = glewGetExtension("GL_INTEL_parallel_arrays"); - if (glewExperimental || GLEW_INTEL_parallel_arrays) CONST_CAST(GLEW_INTEL_parallel_arrays) = !_glewInit_GL_INTEL_parallel_arrays(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_INTEL_parallel_arrays */ -#ifdef GL_INTEL_texture_scissor - CONST_CAST(GLEW_INTEL_texture_scissor) = glewGetExtension("GL_INTEL_texture_scissor"); - if (glewExperimental || GLEW_INTEL_texture_scissor) CONST_CAST(GLEW_INTEL_texture_scissor) = !_glewInit_GL_INTEL_texture_scissor(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_INTEL_texture_scissor */ -#ifdef GL_KTX_buffer_region - CONST_CAST(GLEW_KTX_buffer_region) = glewGetExtension("GL_KTX_buffer_region"); - if (glewExperimental || GLEW_KTX_buffer_region) CONST_CAST(GLEW_KTX_buffer_region) = !_glewInit_GL_KTX_buffer_region(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_KTX_buffer_region */ -#ifdef GL_MESAX_texture_stack - CONST_CAST(GLEW_MESAX_texture_stack) = glewGetExtension("GL_MESAX_texture_stack"); -#endif /* GL_MESAX_texture_stack */ -#ifdef GL_MESA_pack_invert - CONST_CAST(GLEW_MESA_pack_invert) = glewGetExtension("GL_MESA_pack_invert"); -#endif /* GL_MESA_pack_invert */ -#ifdef GL_MESA_resize_buffers - CONST_CAST(GLEW_MESA_resize_buffers) = glewGetExtension("GL_MESA_resize_buffers"); - if (glewExperimental || GLEW_MESA_resize_buffers) CONST_CAST(GLEW_MESA_resize_buffers) = !_glewInit_GL_MESA_resize_buffers(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_MESA_resize_buffers */ -#ifdef GL_MESA_window_pos - CONST_CAST(GLEW_MESA_window_pos) = glewGetExtension("GL_MESA_window_pos"); - if (glewExperimental || GLEW_MESA_window_pos) CONST_CAST(GLEW_MESA_window_pos) = !_glewInit_GL_MESA_window_pos(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_MESA_window_pos */ -#ifdef GL_MESA_ycbcr_texture - CONST_CAST(GLEW_MESA_ycbcr_texture) = glewGetExtension("GL_MESA_ycbcr_texture"); -#endif /* GL_MESA_ycbcr_texture */ -#ifdef GL_NV_blend_square - CONST_CAST(GLEW_NV_blend_square) = glewGetExtension("GL_NV_blend_square"); -#endif /* GL_NV_blend_square */ -#ifdef GL_NV_conditional_render - CONST_CAST(GLEW_NV_conditional_render) = glewGetExtension("GL_NV_conditional_render"); - if (glewExperimental || GLEW_NV_conditional_render) CONST_CAST(GLEW_NV_conditional_render) = !_glewInit_GL_NV_conditional_render(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_conditional_render */ -#ifdef GL_NV_copy_depth_to_color - CONST_CAST(GLEW_NV_copy_depth_to_color) = glewGetExtension("GL_NV_copy_depth_to_color"); -#endif /* GL_NV_copy_depth_to_color */ -#ifdef GL_NV_depth_buffer_float - CONST_CAST(GLEW_NV_depth_buffer_float) = glewGetExtension("GL_NV_depth_buffer_float"); - if (glewExperimental || GLEW_NV_depth_buffer_float) CONST_CAST(GLEW_NV_depth_buffer_float) = !_glewInit_GL_NV_depth_buffer_float(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_depth_buffer_float */ -#ifdef GL_NV_depth_clamp - CONST_CAST(GLEW_NV_depth_clamp) = glewGetExtension("GL_NV_depth_clamp"); -#endif /* GL_NV_depth_clamp */ -#ifdef GL_NV_depth_range_unclamped - CONST_CAST(GLEW_NV_depth_range_unclamped) = glewGetExtension("GL_NV_depth_range_unclamped"); -#endif /* GL_NV_depth_range_unclamped */ -#ifdef GL_NV_evaluators - CONST_CAST(GLEW_NV_evaluators) = glewGetExtension("GL_NV_evaluators"); - if (glewExperimental || GLEW_NV_evaluators) CONST_CAST(GLEW_NV_evaluators) = !_glewInit_GL_NV_evaluators(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_evaluators */ -#ifdef GL_NV_explicit_multisample - CONST_CAST(GLEW_NV_explicit_multisample) = glewGetExtension("GL_NV_explicit_multisample"); - if (glewExperimental || GLEW_NV_explicit_multisample) CONST_CAST(GLEW_NV_explicit_multisample) = !_glewInit_GL_NV_explicit_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_explicit_multisample */ -#ifdef GL_NV_fence - CONST_CAST(GLEW_NV_fence) = glewGetExtension("GL_NV_fence"); - if (glewExperimental || GLEW_NV_fence) CONST_CAST(GLEW_NV_fence) = !_glewInit_GL_NV_fence(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_fence */ -#ifdef GL_NV_float_buffer - CONST_CAST(GLEW_NV_float_buffer) = glewGetExtension("GL_NV_float_buffer"); -#endif /* GL_NV_float_buffer */ -#ifdef GL_NV_fog_distance - CONST_CAST(GLEW_NV_fog_distance) = glewGetExtension("GL_NV_fog_distance"); -#endif /* GL_NV_fog_distance */ -#ifdef GL_NV_fragment_program - CONST_CAST(GLEW_NV_fragment_program) = glewGetExtension("GL_NV_fragment_program"); - if (glewExperimental || GLEW_NV_fragment_program) CONST_CAST(GLEW_NV_fragment_program) = !_glewInit_GL_NV_fragment_program(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_fragment_program */ -#ifdef GL_NV_fragment_program2 - CONST_CAST(GLEW_NV_fragment_program2) = glewGetExtension("GL_NV_fragment_program2"); -#endif /* GL_NV_fragment_program2 */ -#ifdef GL_NV_fragment_program4 - CONST_CAST(GLEW_NV_fragment_program4) = glewGetExtension("GL_NV_fragment_program4"); -#endif /* GL_NV_fragment_program4 */ -#ifdef GL_NV_fragment_program_option - CONST_CAST(GLEW_NV_fragment_program_option) = glewGetExtension("GL_NV_fragment_program_option"); -#endif /* GL_NV_fragment_program_option */ -#ifdef GL_NV_framebuffer_multisample_coverage - CONST_CAST(GLEW_NV_framebuffer_multisample_coverage) = glewGetExtension("GL_NV_framebuffer_multisample_coverage"); - if (glewExperimental || GLEW_NV_framebuffer_multisample_coverage) CONST_CAST(GLEW_NV_framebuffer_multisample_coverage) = !_glewInit_GL_NV_framebuffer_multisample_coverage(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_framebuffer_multisample_coverage */ -#ifdef GL_NV_geometry_program4 - CONST_CAST(GLEW_NV_geometry_program4) = glewGetExtension("GL_NV_geometry_program4"); - if (glewExperimental || GLEW_NV_geometry_program4) CONST_CAST(GLEW_NV_geometry_program4) = !_glewInit_GL_NV_geometry_program4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_geometry_program4 */ -#ifdef GL_NV_geometry_shader4 - CONST_CAST(GLEW_NV_geometry_shader4) = glewGetExtension("GL_NV_geometry_shader4"); -#endif /* GL_NV_geometry_shader4 */ -#ifdef GL_NV_gpu_program4 - CONST_CAST(GLEW_NV_gpu_program4) = glewGetExtension("GL_NV_gpu_program4"); - if (glewExperimental || GLEW_NV_gpu_program4) CONST_CAST(GLEW_NV_gpu_program4) = !_glewInit_GL_NV_gpu_program4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_gpu_program4 */ -#ifdef GL_NV_half_float - CONST_CAST(GLEW_NV_half_float) = glewGetExtension("GL_NV_half_float"); - if (glewExperimental || GLEW_NV_half_float) CONST_CAST(GLEW_NV_half_float) = !_glewInit_GL_NV_half_float(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_half_float */ -#ifdef GL_NV_light_max_exponent - CONST_CAST(GLEW_NV_light_max_exponent) = glewGetExtension("GL_NV_light_max_exponent"); -#endif /* GL_NV_light_max_exponent */ -#ifdef GL_NV_multisample_filter_hint - CONST_CAST(GLEW_NV_multisample_filter_hint) = glewGetExtension("GL_NV_multisample_filter_hint"); -#endif /* GL_NV_multisample_filter_hint */ -#ifdef GL_NV_occlusion_query - CONST_CAST(GLEW_NV_occlusion_query) = glewGetExtension("GL_NV_occlusion_query"); - if (glewExperimental || GLEW_NV_occlusion_query) CONST_CAST(GLEW_NV_occlusion_query) = !_glewInit_GL_NV_occlusion_query(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_occlusion_query */ -#ifdef GL_NV_packed_depth_stencil - CONST_CAST(GLEW_NV_packed_depth_stencil) = glewGetExtension("GL_NV_packed_depth_stencil"); -#endif /* GL_NV_packed_depth_stencil */ -#ifdef GL_NV_parameter_buffer_object - CONST_CAST(GLEW_NV_parameter_buffer_object) = glewGetExtension("GL_NV_parameter_buffer_object"); - if (glewExperimental || GLEW_NV_parameter_buffer_object) CONST_CAST(GLEW_NV_parameter_buffer_object) = !_glewInit_GL_NV_parameter_buffer_object(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_parameter_buffer_object */ -#ifdef GL_NV_pixel_data_range - CONST_CAST(GLEW_NV_pixel_data_range) = glewGetExtension("GL_NV_pixel_data_range"); - if (glewExperimental || GLEW_NV_pixel_data_range) CONST_CAST(GLEW_NV_pixel_data_range) = !_glewInit_GL_NV_pixel_data_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_pixel_data_range */ -#ifdef GL_NV_point_sprite - CONST_CAST(GLEW_NV_point_sprite) = glewGetExtension("GL_NV_point_sprite"); - if (glewExperimental || GLEW_NV_point_sprite) CONST_CAST(GLEW_NV_point_sprite) = !_glewInit_GL_NV_point_sprite(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_point_sprite */ -#ifdef GL_NV_present_video - CONST_CAST(GLEW_NV_present_video) = glewGetExtension("GL_NV_present_video"); - if (glewExperimental || GLEW_NV_present_video) CONST_CAST(GLEW_NV_present_video) = !_glewInit_GL_NV_present_video(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_present_video */ -#ifdef GL_NV_primitive_restart - CONST_CAST(GLEW_NV_primitive_restart) = glewGetExtension("GL_NV_primitive_restart"); - if (glewExperimental || GLEW_NV_primitive_restart) CONST_CAST(GLEW_NV_primitive_restart) = !_glewInit_GL_NV_primitive_restart(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_primitive_restart */ -#ifdef GL_NV_register_combiners - CONST_CAST(GLEW_NV_register_combiners) = glewGetExtension("GL_NV_register_combiners"); - if (glewExperimental || GLEW_NV_register_combiners) CONST_CAST(GLEW_NV_register_combiners) = !_glewInit_GL_NV_register_combiners(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_register_combiners */ -#ifdef GL_NV_register_combiners2 - CONST_CAST(GLEW_NV_register_combiners2) = glewGetExtension("GL_NV_register_combiners2"); - if (glewExperimental || GLEW_NV_register_combiners2) CONST_CAST(GLEW_NV_register_combiners2) = !_glewInit_GL_NV_register_combiners2(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_register_combiners2 */ -#ifdef GL_NV_texgen_emboss - CONST_CAST(GLEW_NV_texgen_emboss) = glewGetExtension("GL_NV_texgen_emboss"); -#endif /* GL_NV_texgen_emboss */ -#ifdef GL_NV_texgen_reflection - CONST_CAST(GLEW_NV_texgen_reflection) = glewGetExtension("GL_NV_texgen_reflection"); -#endif /* GL_NV_texgen_reflection */ -#ifdef GL_NV_texture_compression_vtc - CONST_CAST(GLEW_NV_texture_compression_vtc) = glewGetExtension("GL_NV_texture_compression_vtc"); -#endif /* GL_NV_texture_compression_vtc */ -#ifdef GL_NV_texture_env_combine4 - CONST_CAST(GLEW_NV_texture_env_combine4) = glewGetExtension("GL_NV_texture_env_combine4"); -#endif /* GL_NV_texture_env_combine4 */ -#ifdef GL_NV_texture_expand_normal - CONST_CAST(GLEW_NV_texture_expand_normal) = glewGetExtension("GL_NV_texture_expand_normal"); -#endif /* GL_NV_texture_expand_normal */ -#ifdef GL_NV_texture_rectangle - CONST_CAST(GLEW_NV_texture_rectangle) = glewGetExtension("GL_NV_texture_rectangle"); -#endif /* GL_NV_texture_rectangle */ -#ifdef GL_NV_texture_shader - CONST_CAST(GLEW_NV_texture_shader) = glewGetExtension("GL_NV_texture_shader"); -#endif /* GL_NV_texture_shader */ -#ifdef GL_NV_texture_shader2 - CONST_CAST(GLEW_NV_texture_shader2) = glewGetExtension("GL_NV_texture_shader2"); -#endif /* GL_NV_texture_shader2 */ -#ifdef GL_NV_texture_shader3 - CONST_CAST(GLEW_NV_texture_shader3) = glewGetExtension("GL_NV_texture_shader3"); -#endif /* GL_NV_texture_shader3 */ -#ifdef GL_NV_transform_feedback - CONST_CAST(GLEW_NV_transform_feedback) = glewGetExtension("GL_NV_transform_feedback"); - if (glewExperimental || GLEW_NV_transform_feedback) CONST_CAST(GLEW_NV_transform_feedback) = !_glewInit_GL_NV_transform_feedback(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_transform_feedback */ -#ifdef GL_NV_vertex_array_range - CONST_CAST(GLEW_NV_vertex_array_range) = glewGetExtension("GL_NV_vertex_array_range"); - if (glewExperimental || GLEW_NV_vertex_array_range) CONST_CAST(GLEW_NV_vertex_array_range) = !_glewInit_GL_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_vertex_array_range */ -#ifdef GL_NV_vertex_array_range2 - CONST_CAST(GLEW_NV_vertex_array_range2) = glewGetExtension("GL_NV_vertex_array_range2"); -#endif /* GL_NV_vertex_array_range2 */ -#ifdef GL_NV_vertex_program - CONST_CAST(GLEW_NV_vertex_program) = glewGetExtension("GL_NV_vertex_program"); - if (glewExperimental || GLEW_NV_vertex_program) CONST_CAST(GLEW_NV_vertex_program) = !_glewInit_GL_NV_vertex_program(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_NV_vertex_program */ -#ifdef GL_NV_vertex_program1_1 - CONST_CAST(GLEW_NV_vertex_program1_1) = glewGetExtension("GL_NV_vertex_program1_1"); -#endif /* GL_NV_vertex_program1_1 */ -#ifdef GL_NV_vertex_program2 - CONST_CAST(GLEW_NV_vertex_program2) = glewGetExtension("GL_NV_vertex_program2"); -#endif /* GL_NV_vertex_program2 */ -#ifdef GL_NV_vertex_program2_option - CONST_CAST(GLEW_NV_vertex_program2_option) = glewGetExtension("GL_NV_vertex_program2_option"); -#endif /* GL_NV_vertex_program2_option */ -#ifdef GL_NV_vertex_program3 - CONST_CAST(GLEW_NV_vertex_program3) = glewGetExtension("GL_NV_vertex_program3"); -#endif /* GL_NV_vertex_program3 */ -#ifdef GL_NV_vertex_program4 - CONST_CAST(GLEW_NV_vertex_program4) = glewGetExtension("GL_NV_vertex_program4"); -#endif /* GL_NV_vertex_program4 */ -#ifdef GL_OES_byte_coordinates - CONST_CAST(GLEW_OES_byte_coordinates) = glewGetExtension("GL_OES_byte_coordinates"); -#endif /* GL_OES_byte_coordinates */ -#ifdef GL_OES_compressed_paletted_texture - CONST_CAST(GLEW_OES_compressed_paletted_texture) = glewGetExtension("GL_OES_compressed_paletted_texture"); -#endif /* GL_OES_compressed_paletted_texture */ -#ifdef GL_OES_read_format - CONST_CAST(GLEW_OES_read_format) = glewGetExtension("GL_OES_read_format"); -#endif /* GL_OES_read_format */ -#ifdef GL_OES_single_precision - CONST_CAST(GLEW_OES_single_precision) = glewGetExtension("GL_OES_single_precision"); - if (glewExperimental || GLEW_OES_single_precision) CONST_CAST(GLEW_OES_single_precision) = !_glewInit_GL_OES_single_precision(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_OES_single_precision */ -#ifdef GL_OML_interlace - CONST_CAST(GLEW_OML_interlace) = glewGetExtension("GL_OML_interlace"); -#endif /* GL_OML_interlace */ -#ifdef GL_OML_resample - CONST_CAST(GLEW_OML_resample) = glewGetExtension("GL_OML_resample"); -#endif /* GL_OML_resample */ -#ifdef GL_OML_subsample - CONST_CAST(GLEW_OML_subsample) = glewGetExtension("GL_OML_subsample"); -#endif /* GL_OML_subsample */ -#ifdef GL_PGI_misc_hints - CONST_CAST(GLEW_PGI_misc_hints) = glewGetExtension("GL_PGI_misc_hints"); -#endif /* GL_PGI_misc_hints */ -#ifdef GL_PGI_vertex_hints - CONST_CAST(GLEW_PGI_vertex_hints) = glewGetExtension("GL_PGI_vertex_hints"); -#endif /* GL_PGI_vertex_hints */ -#ifdef GL_REND_screen_coordinates - CONST_CAST(GLEW_REND_screen_coordinates) = glewGetExtension("GL_REND_screen_coordinates"); -#endif /* GL_REND_screen_coordinates */ -#ifdef GL_S3_s3tc - CONST_CAST(GLEW_S3_s3tc) = glewGetExtension("GL_S3_s3tc"); -#endif /* GL_S3_s3tc */ -#ifdef GL_SGIS_color_range - CONST_CAST(GLEW_SGIS_color_range) = glewGetExtension("GL_SGIS_color_range"); -#endif /* GL_SGIS_color_range */ -#ifdef GL_SGIS_detail_texture - CONST_CAST(GLEW_SGIS_detail_texture) = glewGetExtension("GL_SGIS_detail_texture"); - if (glewExperimental || GLEW_SGIS_detail_texture) CONST_CAST(GLEW_SGIS_detail_texture) = !_glewInit_GL_SGIS_detail_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_detail_texture */ -#ifdef GL_SGIS_fog_function - CONST_CAST(GLEW_SGIS_fog_function) = glewGetExtension("GL_SGIS_fog_function"); - if (glewExperimental || GLEW_SGIS_fog_function) CONST_CAST(GLEW_SGIS_fog_function) = !_glewInit_GL_SGIS_fog_function(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_fog_function */ -#ifdef GL_SGIS_generate_mipmap - CONST_CAST(GLEW_SGIS_generate_mipmap) = glewGetExtension("GL_SGIS_generate_mipmap"); -#endif /* GL_SGIS_generate_mipmap */ -#ifdef GL_SGIS_multisample - CONST_CAST(GLEW_SGIS_multisample) = glewGetExtension("GL_SGIS_multisample"); - if (glewExperimental || GLEW_SGIS_multisample) CONST_CAST(GLEW_SGIS_multisample) = !_glewInit_GL_SGIS_multisample(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_multisample */ -#ifdef GL_SGIS_pixel_texture - CONST_CAST(GLEW_SGIS_pixel_texture) = glewGetExtension("GL_SGIS_pixel_texture"); -#endif /* GL_SGIS_pixel_texture */ -#ifdef GL_SGIS_point_line_texgen - CONST_CAST(GLEW_SGIS_point_line_texgen) = glewGetExtension("GL_SGIS_point_line_texgen"); -#endif /* GL_SGIS_point_line_texgen */ -#ifdef GL_SGIS_sharpen_texture - CONST_CAST(GLEW_SGIS_sharpen_texture) = glewGetExtension("GL_SGIS_sharpen_texture"); - if (glewExperimental || GLEW_SGIS_sharpen_texture) CONST_CAST(GLEW_SGIS_sharpen_texture) = !_glewInit_GL_SGIS_sharpen_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_sharpen_texture */ -#ifdef GL_SGIS_texture4D - CONST_CAST(GLEW_SGIS_texture4D) = glewGetExtension("GL_SGIS_texture4D"); - if (glewExperimental || GLEW_SGIS_texture4D) CONST_CAST(GLEW_SGIS_texture4D) = !_glewInit_GL_SGIS_texture4D(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_texture4D */ -#ifdef GL_SGIS_texture_border_clamp - CONST_CAST(GLEW_SGIS_texture_border_clamp) = glewGetExtension("GL_SGIS_texture_border_clamp"); -#endif /* GL_SGIS_texture_border_clamp */ -#ifdef GL_SGIS_texture_edge_clamp - CONST_CAST(GLEW_SGIS_texture_edge_clamp) = glewGetExtension("GL_SGIS_texture_edge_clamp"); -#endif /* GL_SGIS_texture_edge_clamp */ -#ifdef GL_SGIS_texture_filter4 - CONST_CAST(GLEW_SGIS_texture_filter4) = glewGetExtension("GL_SGIS_texture_filter4"); - if (glewExperimental || GLEW_SGIS_texture_filter4) CONST_CAST(GLEW_SGIS_texture_filter4) = !_glewInit_GL_SGIS_texture_filter4(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIS_texture_filter4 */ -#ifdef GL_SGIS_texture_lod - CONST_CAST(GLEW_SGIS_texture_lod) = glewGetExtension("GL_SGIS_texture_lod"); -#endif /* GL_SGIS_texture_lod */ -#ifdef GL_SGIS_texture_select - CONST_CAST(GLEW_SGIS_texture_select) = glewGetExtension("GL_SGIS_texture_select"); -#endif /* GL_SGIS_texture_select */ -#ifdef GL_SGIX_async - CONST_CAST(GLEW_SGIX_async) = glewGetExtension("GL_SGIX_async"); - if (glewExperimental || GLEW_SGIX_async) CONST_CAST(GLEW_SGIX_async) = !_glewInit_GL_SGIX_async(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_async */ -#ifdef GL_SGIX_async_histogram - CONST_CAST(GLEW_SGIX_async_histogram) = glewGetExtension("GL_SGIX_async_histogram"); -#endif /* GL_SGIX_async_histogram */ -#ifdef GL_SGIX_async_pixel - CONST_CAST(GLEW_SGIX_async_pixel) = glewGetExtension("GL_SGIX_async_pixel"); -#endif /* GL_SGIX_async_pixel */ -#ifdef GL_SGIX_blend_alpha_minmax - CONST_CAST(GLEW_SGIX_blend_alpha_minmax) = glewGetExtension("GL_SGIX_blend_alpha_minmax"); -#endif /* GL_SGIX_blend_alpha_minmax */ -#ifdef GL_SGIX_clipmap - CONST_CAST(GLEW_SGIX_clipmap) = glewGetExtension("GL_SGIX_clipmap"); -#endif /* GL_SGIX_clipmap */ -#ifdef GL_SGIX_convolution_accuracy - CONST_CAST(GLEW_SGIX_convolution_accuracy) = glewGetExtension("GL_SGIX_convolution_accuracy"); -#endif /* GL_SGIX_convolution_accuracy */ -#ifdef GL_SGIX_depth_texture - CONST_CAST(GLEW_SGIX_depth_texture) = glewGetExtension("GL_SGIX_depth_texture"); -#endif /* GL_SGIX_depth_texture */ -#ifdef GL_SGIX_flush_raster - CONST_CAST(GLEW_SGIX_flush_raster) = glewGetExtension("GL_SGIX_flush_raster"); - if (glewExperimental || GLEW_SGIX_flush_raster) CONST_CAST(GLEW_SGIX_flush_raster) = !_glewInit_GL_SGIX_flush_raster(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_flush_raster */ -#ifdef GL_SGIX_fog_offset - CONST_CAST(GLEW_SGIX_fog_offset) = glewGetExtension("GL_SGIX_fog_offset"); -#endif /* GL_SGIX_fog_offset */ -#ifdef GL_SGIX_fog_texture - CONST_CAST(GLEW_SGIX_fog_texture) = glewGetExtension("GL_SGIX_fog_texture"); - if (glewExperimental || GLEW_SGIX_fog_texture) CONST_CAST(GLEW_SGIX_fog_texture) = !_glewInit_GL_SGIX_fog_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_fog_texture */ -#ifdef GL_SGIX_fragment_specular_lighting - CONST_CAST(GLEW_SGIX_fragment_specular_lighting) = glewGetExtension("GL_SGIX_fragment_specular_lighting"); - if (glewExperimental || GLEW_SGIX_fragment_specular_lighting) CONST_CAST(GLEW_SGIX_fragment_specular_lighting) = !_glewInit_GL_SGIX_fragment_specular_lighting(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_fragment_specular_lighting */ -#ifdef GL_SGIX_framezoom - CONST_CAST(GLEW_SGIX_framezoom) = glewGetExtension("GL_SGIX_framezoom"); - if (glewExperimental || GLEW_SGIX_framezoom) CONST_CAST(GLEW_SGIX_framezoom) = !_glewInit_GL_SGIX_framezoom(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_framezoom */ -#ifdef GL_SGIX_interlace - CONST_CAST(GLEW_SGIX_interlace) = glewGetExtension("GL_SGIX_interlace"); -#endif /* GL_SGIX_interlace */ -#ifdef GL_SGIX_ir_instrument1 - CONST_CAST(GLEW_SGIX_ir_instrument1) = glewGetExtension("GL_SGIX_ir_instrument1"); -#endif /* GL_SGIX_ir_instrument1 */ -#ifdef GL_SGIX_list_priority - CONST_CAST(GLEW_SGIX_list_priority) = glewGetExtension("GL_SGIX_list_priority"); -#endif /* GL_SGIX_list_priority */ -#ifdef GL_SGIX_pixel_texture - CONST_CAST(GLEW_SGIX_pixel_texture) = glewGetExtension("GL_SGIX_pixel_texture"); - if (glewExperimental || GLEW_SGIX_pixel_texture) CONST_CAST(GLEW_SGIX_pixel_texture) = !_glewInit_GL_SGIX_pixel_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_pixel_texture */ -#ifdef GL_SGIX_pixel_texture_bits - CONST_CAST(GLEW_SGIX_pixel_texture_bits) = glewGetExtension("GL_SGIX_pixel_texture_bits"); -#endif /* GL_SGIX_pixel_texture_bits */ -#ifdef GL_SGIX_reference_plane - CONST_CAST(GLEW_SGIX_reference_plane) = glewGetExtension("GL_SGIX_reference_plane"); - if (glewExperimental || GLEW_SGIX_reference_plane) CONST_CAST(GLEW_SGIX_reference_plane) = !_glewInit_GL_SGIX_reference_plane(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_reference_plane */ -#ifdef GL_SGIX_resample - CONST_CAST(GLEW_SGIX_resample) = glewGetExtension("GL_SGIX_resample"); -#endif /* GL_SGIX_resample */ -#ifdef GL_SGIX_shadow - CONST_CAST(GLEW_SGIX_shadow) = glewGetExtension("GL_SGIX_shadow"); -#endif /* GL_SGIX_shadow */ -#ifdef GL_SGIX_shadow_ambient - CONST_CAST(GLEW_SGIX_shadow_ambient) = glewGetExtension("GL_SGIX_shadow_ambient"); -#endif /* GL_SGIX_shadow_ambient */ -#ifdef GL_SGIX_sprite - CONST_CAST(GLEW_SGIX_sprite) = glewGetExtension("GL_SGIX_sprite"); - if (glewExperimental || GLEW_SGIX_sprite) CONST_CAST(GLEW_SGIX_sprite) = !_glewInit_GL_SGIX_sprite(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_sprite */ -#ifdef GL_SGIX_tag_sample_buffer - CONST_CAST(GLEW_SGIX_tag_sample_buffer) = glewGetExtension("GL_SGIX_tag_sample_buffer"); - if (glewExperimental || GLEW_SGIX_tag_sample_buffer) CONST_CAST(GLEW_SGIX_tag_sample_buffer) = !_glewInit_GL_SGIX_tag_sample_buffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGIX_tag_sample_buffer */ -#ifdef GL_SGIX_texture_add_env - CONST_CAST(GLEW_SGIX_texture_add_env) = glewGetExtension("GL_SGIX_texture_add_env"); -#endif /* GL_SGIX_texture_add_env */ -#ifdef GL_SGIX_texture_coordinate_clamp - CONST_CAST(GLEW_SGIX_texture_coordinate_clamp) = glewGetExtension("GL_SGIX_texture_coordinate_clamp"); -#endif /* GL_SGIX_texture_coordinate_clamp */ -#ifdef GL_SGIX_texture_lod_bias - CONST_CAST(GLEW_SGIX_texture_lod_bias) = glewGetExtension("GL_SGIX_texture_lod_bias"); -#endif /* GL_SGIX_texture_lod_bias */ -#ifdef GL_SGIX_texture_multi_buffer - CONST_CAST(GLEW_SGIX_texture_multi_buffer) = glewGetExtension("GL_SGIX_texture_multi_buffer"); -#endif /* GL_SGIX_texture_multi_buffer */ -#ifdef GL_SGIX_texture_range - CONST_CAST(GLEW_SGIX_texture_range) = glewGetExtension("GL_SGIX_texture_range"); -#endif /* GL_SGIX_texture_range */ -#ifdef GL_SGIX_texture_scale_bias - CONST_CAST(GLEW_SGIX_texture_scale_bias) = glewGetExtension("GL_SGIX_texture_scale_bias"); -#endif /* GL_SGIX_texture_scale_bias */ -#ifdef GL_SGIX_vertex_preclip - CONST_CAST(GLEW_SGIX_vertex_preclip) = glewGetExtension("GL_SGIX_vertex_preclip"); -#endif /* GL_SGIX_vertex_preclip */ -#ifdef GL_SGIX_vertex_preclip_hint - CONST_CAST(GLEW_SGIX_vertex_preclip_hint) = glewGetExtension("GL_SGIX_vertex_preclip_hint"); -#endif /* GL_SGIX_vertex_preclip_hint */ -#ifdef GL_SGIX_ycrcb - CONST_CAST(GLEW_SGIX_ycrcb) = glewGetExtension("GL_SGIX_ycrcb"); -#endif /* GL_SGIX_ycrcb */ -#ifdef GL_SGI_color_matrix - CONST_CAST(GLEW_SGI_color_matrix) = glewGetExtension("GL_SGI_color_matrix"); -#endif /* GL_SGI_color_matrix */ -#ifdef GL_SGI_color_table - CONST_CAST(GLEW_SGI_color_table) = glewGetExtension("GL_SGI_color_table"); - if (glewExperimental || GLEW_SGI_color_table) CONST_CAST(GLEW_SGI_color_table) = !_glewInit_GL_SGI_color_table(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SGI_color_table */ -#ifdef GL_SGI_texture_color_table - CONST_CAST(GLEW_SGI_texture_color_table) = glewGetExtension("GL_SGI_texture_color_table"); -#endif /* GL_SGI_texture_color_table */ -#ifdef GL_SUNX_constant_data - CONST_CAST(GLEW_SUNX_constant_data) = glewGetExtension("GL_SUNX_constant_data"); - if (glewExperimental || GLEW_SUNX_constant_data) CONST_CAST(GLEW_SUNX_constant_data) = !_glewInit_GL_SUNX_constant_data(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUNX_constant_data */ -#ifdef GL_SUN_convolution_border_modes - CONST_CAST(GLEW_SUN_convolution_border_modes) = glewGetExtension("GL_SUN_convolution_border_modes"); -#endif /* GL_SUN_convolution_border_modes */ -#ifdef GL_SUN_global_alpha - CONST_CAST(GLEW_SUN_global_alpha) = glewGetExtension("GL_SUN_global_alpha"); - if (glewExperimental || GLEW_SUN_global_alpha) CONST_CAST(GLEW_SUN_global_alpha) = !_glewInit_GL_SUN_global_alpha(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUN_global_alpha */ -#ifdef GL_SUN_mesh_array - CONST_CAST(GLEW_SUN_mesh_array) = glewGetExtension("GL_SUN_mesh_array"); -#endif /* GL_SUN_mesh_array */ -#ifdef GL_SUN_read_video_pixels - CONST_CAST(GLEW_SUN_read_video_pixels) = glewGetExtension("GL_SUN_read_video_pixels"); - if (glewExperimental || GLEW_SUN_read_video_pixels) CONST_CAST(GLEW_SUN_read_video_pixels) = !_glewInit_GL_SUN_read_video_pixels(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUN_read_video_pixels */ -#ifdef GL_SUN_slice_accum - CONST_CAST(GLEW_SUN_slice_accum) = glewGetExtension("GL_SUN_slice_accum"); -#endif /* GL_SUN_slice_accum */ -#ifdef GL_SUN_triangle_list - CONST_CAST(GLEW_SUN_triangle_list) = glewGetExtension("GL_SUN_triangle_list"); - if (glewExperimental || GLEW_SUN_triangle_list) CONST_CAST(GLEW_SUN_triangle_list) = !_glewInit_GL_SUN_triangle_list(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUN_triangle_list */ -#ifdef GL_SUN_vertex - CONST_CAST(GLEW_SUN_vertex) = glewGetExtension("GL_SUN_vertex"); - if (glewExperimental || GLEW_SUN_vertex) CONST_CAST(GLEW_SUN_vertex) = !_glewInit_GL_SUN_vertex(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_SUN_vertex */ -#ifdef GL_WIN_phong_shading - CONST_CAST(GLEW_WIN_phong_shading) = glewGetExtension("GL_WIN_phong_shading"); -#endif /* GL_WIN_phong_shading */ -#ifdef GL_WIN_specular_fog - CONST_CAST(GLEW_WIN_specular_fog) = glewGetExtension("GL_WIN_specular_fog"); -#endif /* GL_WIN_specular_fog */ -#ifdef GL_WIN_swap_hint - CONST_CAST(GLEW_WIN_swap_hint) = glewGetExtension("GL_WIN_swap_hint"); - if (glewExperimental || GLEW_WIN_swap_hint) CONST_CAST(GLEW_WIN_swap_hint) = !_glewInit_GL_WIN_swap_hint(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GL_WIN_swap_hint */ - - return GLEW_OK; -} - - -#if defined(_WIN32) - -#if !defined(GLEW_MX) - -PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL; - -PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB = NULL; -PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB = NULL; -PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB = NULL; -PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB = NULL; - -PFNWGLCREATECONTEXTATTRIBSARBPROC __wglewCreateContextAttribsARB = NULL; - -PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB = NULL; - -PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB = NULL; -PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB = NULL; - -PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB = NULL; -PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB = NULL; -PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB = NULL; -PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB = NULL; -PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB = NULL; - -PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB = NULL; -PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB = NULL; -PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB = NULL; - -PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB = NULL; -PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB = NULL; -PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB = NULL; - -PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT = NULL; -PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT = NULL; -PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT = NULL; -PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT = NULL; - -PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT = NULL; - -PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT = NULL; -PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT = NULL; - -PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT = NULL; -PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT = NULL; -PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT = NULL; -PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT = NULL; -PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT = NULL; - -PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT = NULL; -PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT = NULL; -PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT = NULL; - -PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT = NULL; -PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT = NULL; - -PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D = NULL; -PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D = NULL; - -PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D = NULL; -PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D = NULL; -PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D = NULL; -PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D = NULL; - -PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D = NULL; -PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D = NULL; -PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D = NULL; -PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D = NULL; -PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D = NULL; -PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D = NULL; -PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D = NULL; -PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D = NULL; -PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D = NULL; -PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D = NULL; -PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D = NULL; -PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D = NULL; - -PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D = NULL; -PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D = NULL; -PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D = NULL; -PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D = NULL; - -PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D = NULL; -PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D = NULL; -PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D = NULL; -PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D = NULL; - -PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D = NULL; -PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D = NULL; -PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D = NULL; -PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D = NULL; - -PFNWGLCREATEAFFINITYDCNVPROC __wglewCreateAffinityDCNV = NULL; -PFNWGLDELETEDCNVPROC __wglewDeleteDCNV = NULL; -PFNWGLENUMGPUDEVICESNVPROC __wglewEnumGpuDevicesNV = NULL; -PFNWGLENUMGPUSFROMAFFINITYDCNVPROC __wglewEnumGpusFromAffinityDCNV = NULL; -PFNWGLENUMGPUSNVPROC __wglewEnumGpusNV = NULL; - -PFNWGLBINDVIDEODEVICENVPROC __wglewBindVideoDeviceNV = NULL; -PFNWGLENUMERATEVIDEODEVICESNVPROC __wglewEnumerateVideoDevicesNV = NULL; -PFNWGLQUERYCURRENTCONTEXTNVPROC __wglewQueryCurrentContextNV = NULL; - -PFNWGLBINDSWAPBARRIERNVPROC __wglewBindSwapBarrierNV = NULL; -PFNWGLJOINSWAPGROUPNVPROC __wglewJoinSwapGroupNV = NULL; -PFNWGLQUERYFRAMECOUNTNVPROC __wglewQueryFrameCountNV = NULL; -PFNWGLQUERYMAXSWAPGROUPSNVPROC __wglewQueryMaxSwapGroupsNV = NULL; -PFNWGLQUERYSWAPGROUPNVPROC __wglewQuerySwapGroupNV = NULL; -PFNWGLRESETFRAMECOUNTNVPROC __wglewResetFrameCountNV = NULL; - -PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV = NULL; -PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV = NULL; - -PFNWGLBINDVIDEOIMAGENVPROC __wglewBindVideoImageNV = NULL; -PFNWGLGETVIDEODEVICENVPROC __wglewGetVideoDeviceNV = NULL; -PFNWGLGETVIDEOINFONVPROC __wglewGetVideoInfoNV = NULL; -PFNWGLRELEASEVIDEODEVICENVPROC __wglewReleaseVideoDeviceNV = NULL; -PFNWGLRELEASEVIDEOIMAGENVPROC __wglewReleaseVideoImageNV = NULL; -PFNWGLSENDPBUFFERTOVIDEONVPROC __wglewSendPbufferToVideoNV = NULL; - -PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML = NULL; -PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML = NULL; -PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML = NULL; -PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML = NULL; -PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML = NULL; -PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML = NULL; -GLboolean __WGLEW_3DFX_multisample = GL_FALSE; -GLboolean __WGLEW_3DL_stereo_control = GL_FALSE; -GLboolean __WGLEW_ARB_buffer_region = GL_FALSE; -GLboolean __WGLEW_ARB_create_context = GL_FALSE; -GLboolean __WGLEW_ARB_extensions_string = GL_FALSE; -GLboolean __WGLEW_ARB_framebuffer_sRGB = GL_FALSE; -GLboolean __WGLEW_ARB_make_current_read = GL_FALSE; -GLboolean __WGLEW_ARB_multisample = GL_FALSE; -GLboolean __WGLEW_ARB_pbuffer = GL_FALSE; -GLboolean __WGLEW_ARB_pixel_format = GL_FALSE; -GLboolean __WGLEW_ARB_pixel_format_float = GL_FALSE; -GLboolean __WGLEW_ARB_render_texture = GL_FALSE; -GLboolean __WGLEW_ATI_pixel_format_float = GL_FALSE; -GLboolean __WGLEW_ATI_render_texture_rectangle = GL_FALSE; -GLboolean __WGLEW_EXT_depth_float = GL_FALSE; -GLboolean __WGLEW_EXT_display_color_table = GL_FALSE; -GLboolean __WGLEW_EXT_extensions_string = GL_FALSE; -GLboolean __WGLEW_EXT_framebuffer_sRGB = GL_FALSE; -GLboolean __WGLEW_EXT_make_current_read = GL_FALSE; -GLboolean __WGLEW_EXT_multisample = GL_FALSE; -GLboolean __WGLEW_EXT_pbuffer = GL_FALSE; -GLboolean __WGLEW_EXT_pixel_format = GL_FALSE; -GLboolean __WGLEW_EXT_pixel_format_packed_float = GL_FALSE; -GLboolean __WGLEW_EXT_swap_control = GL_FALSE; -GLboolean __WGLEW_I3D_digital_video_control = GL_FALSE; -GLboolean __WGLEW_I3D_gamma = GL_FALSE; -GLboolean __WGLEW_I3D_genlock = GL_FALSE; -GLboolean __WGLEW_I3D_image_buffer = GL_FALSE; -GLboolean __WGLEW_I3D_swap_frame_lock = GL_FALSE; -GLboolean __WGLEW_I3D_swap_frame_usage = GL_FALSE; -GLboolean __WGLEW_NV_float_buffer = GL_FALSE; -GLboolean __WGLEW_NV_gpu_affinity = GL_FALSE; -GLboolean __WGLEW_NV_present_video = GL_FALSE; -GLboolean __WGLEW_NV_render_depth_texture = GL_FALSE; -GLboolean __WGLEW_NV_render_texture_rectangle = GL_FALSE; -GLboolean __WGLEW_NV_swap_group = GL_FALSE; -GLboolean __WGLEW_NV_vertex_array_range = GL_FALSE; -GLboolean __WGLEW_NV_video_output = GL_FALSE; -GLboolean __WGLEW_OML_sync_control = GL_FALSE; - -#endif /* !GLEW_MX */ - -#ifdef WGL_3DFX_multisample - -#endif /* WGL_3DFX_multisample */ - -#ifdef WGL_3DL_stereo_control - -static GLboolean _glewInit_WGL_3DL_stereo_control (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglSetStereoEmitterState3DL = (PFNWGLSETSTEREOEMITTERSTATE3DLPROC)glewGetProcAddress((const GLubyte*)"wglSetStereoEmitterState3DL")) == NULL) || r; - - return r; -} - -#endif /* WGL_3DL_stereo_control */ - -#ifdef WGL_ARB_buffer_region - -static GLboolean _glewInit_WGL_ARB_buffer_region (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreateBufferRegionARB = (PFNWGLCREATEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglCreateBufferRegionARB")) == NULL) || r; - r = ((wglDeleteBufferRegionARB = (PFNWGLDELETEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglDeleteBufferRegionARB")) == NULL) || r; - r = ((wglRestoreBufferRegionARB = (PFNWGLRESTOREBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglRestoreBufferRegionARB")) == NULL) || r; - r = ((wglSaveBufferRegionARB = (PFNWGLSAVEBUFFERREGIONARBPROC)glewGetProcAddress((const GLubyte*)"wglSaveBufferRegionARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_buffer_region */ - -#ifdef WGL_ARB_create_context - -static GLboolean _glewInit_WGL_ARB_create_context (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)glewGetProcAddress((const GLubyte*)"wglCreateContextAttribsARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_create_context */ - -#ifdef WGL_ARB_extensions_string - -static GLboolean _glewInit_WGL_ARB_extensions_string (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_extensions_string */ - -#ifdef WGL_ARB_framebuffer_sRGB - -#endif /* WGL_ARB_framebuffer_sRGB */ - -#ifdef WGL_ARB_make_current_read - -static GLboolean _glewInit_WGL_ARB_make_current_read (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetCurrentReadDCARB = (PFNWGLGETCURRENTREADDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCARB")) == NULL) || r; - r = ((wglMakeContextCurrentARB = (PFNWGLMAKECONTEXTCURRENTARBPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_make_current_read */ - -#ifdef WGL_ARB_multisample - -#endif /* WGL_ARB_multisample */ - -#ifdef WGL_ARB_pbuffer - -static GLboolean _glewInit_WGL_ARB_pbuffer (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreatePbufferARB = (PFNWGLCREATEPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferARB")) == NULL) || r; - r = ((wglDestroyPbufferARB = (PFNWGLDESTROYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferARB")) == NULL) || r; - r = ((wglGetPbufferDCARB = (PFNWGLGETPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCARB")) == NULL) || r; - r = ((wglQueryPbufferARB = (PFNWGLQUERYPBUFFERARBPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferARB")) == NULL) || r; - r = ((wglReleasePbufferDCARB = (PFNWGLRELEASEPBUFFERDCARBPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_pbuffer */ - -#ifdef WGL_ARB_pixel_format - -static GLboolean _glewInit_WGL_ARB_pixel_format (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglChoosePixelFormatARB = (PFNWGLCHOOSEPIXELFORMATARBPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatARB")) == NULL) || r; - r = ((wglGetPixelFormatAttribfvARB = (PFNWGLGETPIXELFORMATATTRIBFVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvARB")) == NULL) || r; - r = ((wglGetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_pixel_format */ - -#ifdef WGL_ARB_pixel_format_float - -#endif /* WGL_ARB_pixel_format_float */ - -#ifdef WGL_ARB_render_texture - -static GLboolean _glewInit_WGL_ARB_render_texture (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindTexImageARB = (PFNWGLBINDTEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglBindTexImageARB")) == NULL) || r; - r = ((wglReleaseTexImageARB = (PFNWGLRELEASETEXIMAGEARBPROC)glewGetProcAddress((const GLubyte*)"wglReleaseTexImageARB")) == NULL) || r; - r = ((wglSetPbufferAttribARB = (PFNWGLSETPBUFFERATTRIBARBPROC)glewGetProcAddress((const GLubyte*)"wglSetPbufferAttribARB")) == NULL) || r; - - return r; -} - -#endif /* WGL_ARB_render_texture */ - -#ifdef WGL_ATI_pixel_format_float - -#endif /* WGL_ATI_pixel_format_float */ - -#ifdef WGL_ATI_render_texture_rectangle - -#endif /* WGL_ATI_render_texture_rectangle */ - -#ifdef WGL_EXT_depth_float - -#endif /* WGL_EXT_depth_float */ - -#ifdef WGL_EXT_display_color_table - -static GLboolean _glewInit_WGL_EXT_display_color_table (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindDisplayColorTableEXT = (PFNWGLBINDDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglBindDisplayColorTableEXT")) == NULL) || r; - r = ((wglCreateDisplayColorTableEXT = (PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglCreateDisplayColorTableEXT")) == NULL) || r; - r = ((wglDestroyDisplayColorTableEXT = (PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyDisplayColorTableEXT")) == NULL) || r; - r = ((wglLoadDisplayColorTableEXT = (PFNWGLLOADDISPLAYCOLORTABLEEXTPROC)glewGetProcAddress((const GLubyte*)"wglLoadDisplayColorTableEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_display_color_table */ - -#ifdef WGL_EXT_extensions_string - -static GLboolean _glewInit_WGL_EXT_extensions_string (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_extensions_string */ - -#ifdef WGL_EXT_framebuffer_sRGB - -#endif /* WGL_EXT_framebuffer_sRGB */ - -#ifdef WGL_EXT_make_current_read - -static GLboolean _glewInit_WGL_EXT_make_current_read (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetCurrentReadDCEXT = (PFNWGLGETCURRENTREADDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetCurrentReadDCEXT")) == NULL) || r; - r = ((wglMakeContextCurrentEXT = (PFNWGLMAKECONTEXTCURRENTEXTPROC)glewGetProcAddress((const GLubyte*)"wglMakeContextCurrentEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_make_current_read */ - -#ifdef WGL_EXT_multisample - -#endif /* WGL_EXT_multisample */ - -#ifdef WGL_EXT_pbuffer - -static GLboolean _glewInit_WGL_EXT_pbuffer (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreatePbufferEXT = (PFNWGLCREATEPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglCreatePbufferEXT")) == NULL) || r; - r = ((wglDestroyPbufferEXT = (PFNWGLDESTROYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglDestroyPbufferEXT")) == NULL) || r; - r = ((wglGetPbufferDCEXT = (PFNWGLGETPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPbufferDCEXT")) == NULL) || r; - r = ((wglQueryPbufferEXT = (PFNWGLQUERYPBUFFEREXTPROC)glewGetProcAddress((const GLubyte*)"wglQueryPbufferEXT")) == NULL) || r; - r = ((wglReleasePbufferDCEXT = (PFNWGLRELEASEPBUFFERDCEXTPROC)glewGetProcAddress((const GLubyte*)"wglReleasePbufferDCEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_pbuffer */ - -#ifdef WGL_EXT_pixel_format - -static GLboolean _glewInit_WGL_EXT_pixel_format (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglChoosePixelFormatEXT = (PFNWGLCHOOSEPIXELFORMATEXTPROC)glewGetProcAddress((const GLubyte*)"wglChoosePixelFormatEXT")) == NULL) || r; - r = ((wglGetPixelFormatAttribfvEXT = (PFNWGLGETPIXELFORMATATTRIBFVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribfvEXT")) == NULL) || r; - r = ((wglGetPixelFormatAttribivEXT = (PFNWGLGETPIXELFORMATATTRIBIVEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetPixelFormatAttribivEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_pixel_format */ - -#ifdef WGL_EXT_pixel_format_packed_float - -#endif /* WGL_EXT_pixel_format_packed_float */ - -#ifdef WGL_EXT_swap_control - -static GLboolean _glewInit_WGL_EXT_swap_control (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetSwapIntervalEXT = (PFNWGLGETSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetSwapIntervalEXT")) == NULL) || r; - r = ((wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)glewGetProcAddress((const GLubyte*)"wglSwapIntervalEXT")) == NULL) || r; - - return r; -} - -#endif /* WGL_EXT_swap_control */ - -#ifdef WGL_I3D_digital_video_control - -static GLboolean _glewInit_WGL_I3D_digital_video_control (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetDigitalVideoParametersI3D = (PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetDigitalVideoParametersI3D")) == NULL) || r; - r = ((wglSetDigitalVideoParametersI3D = (PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetDigitalVideoParametersI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_digital_video_control */ - -#ifdef WGL_I3D_gamma - -static GLboolean _glewInit_WGL_I3D_gamma (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetGammaTableI3D = (PFNWGLGETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableI3D")) == NULL) || r; - r = ((wglGetGammaTableParametersI3D = (PFNWGLGETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGammaTableParametersI3D")) == NULL) || r; - r = ((wglSetGammaTableI3D = (PFNWGLSETGAMMATABLEI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableI3D")) == NULL) || r; - r = ((wglSetGammaTableParametersI3D = (PFNWGLSETGAMMATABLEPARAMETERSI3DPROC)glewGetProcAddress((const GLubyte*)"wglSetGammaTableParametersI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_gamma */ - -#ifdef WGL_I3D_genlock - -static GLboolean _glewInit_WGL_I3D_genlock (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglDisableGenlockI3D = (PFNWGLDISABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableGenlockI3D")) == NULL) || r; - r = ((wglEnableGenlockI3D = (PFNWGLENABLEGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableGenlockI3D")) == NULL) || r; - r = ((wglGenlockSampleRateI3D = (PFNWGLGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSampleRateI3D")) == NULL) || r; - r = ((wglGenlockSourceDelayI3D = (PFNWGLGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceDelayI3D")) == NULL) || r; - r = ((wglGenlockSourceEdgeI3D = (PFNWGLGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceEdgeI3D")) == NULL) || r; - r = ((wglGenlockSourceI3D = (PFNWGLGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGenlockSourceI3D")) == NULL) || r; - r = ((wglGetGenlockSampleRateI3D = (PFNWGLGETGENLOCKSAMPLERATEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSampleRateI3D")) == NULL) || r; - r = ((wglGetGenlockSourceDelayI3D = (PFNWGLGETGENLOCKSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceDelayI3D")) == NULL) || r; - r = ((wglGetGenlockSourceEdgeI3D = (PFNWGLGETGENLOCKSOURCEEDGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceEdgeI3D")) == NULL) || r; - r = ((wglGetGenlockSourceI3D = (PFNWGLGETGENLOCKSOURCEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetGenlockSourceI3D")) == NULL) || r; - r = ((wglIsEnabledGenlockI3D = (PFNWGLISENABLEDGENLOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledGenlockI3D")) == NULL) || r; - r = ((wglQueryGenlockMaxSourceDelayI3D = (PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryGenlockMaxSourceDelayI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_genlock */ - -#ifdef WGL_I3D_image_buffer - -static GLboolean _glewInit_WGL_I3D_image_buffer (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglAssociateImageBufferEventsI3D = (PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglAssociateImageBufferEventsI3D")) == NULL) || r; - r = ((wglCreateImageBufferI3D = (PFNWGLCREATEIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglCreateImageBufferI3D")) == NULL) || r; - r = ((wglDestroyImageBufferI3D = (PFNWGLDESTROYIMAGEBUFFERI3DPROC)glewGetProcAddress((const GLubyte*)"wglDestroyImageBufferI3D")) == NULL) || r; - r = ((wglReleaseImageBufferEventsI3D = (PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC)glewGetProcAddress((const GLubyte*)"wglReleaseImageBufferEventsI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_image_buffer */ - -#ifdef WGL_I3D_swap_frame_lock - -static GLboolean _glewInit_WGL_I3D_swap_frame_lock (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglDisableFrameLockI3D = (PFNWGLDISABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglDisableFrameLockI3D")) == NULL) || r; - r = ((wglEnableFrameLockI3D = (PFNWGLENABLEFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglEnableFrameLockI3D")) == NULL) || r; - r = ((wglIsEnabledFrameLockI3D = (PFNWGLISENABLEDFRAMELOCKI3DPROC)glewGetProcAddress((const GLubyte*)"wglIsEnabledFrameLockI3D")) == NULL) || r; - r = ((wglQueryFrameLockMasterI3D = (PFNWGLQUERYFRAMELOCKMASTERI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameLockMasterI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_swap_frame_lock */ - -#ifdef WGL_I3D_swap_frame_usage - -static GLboolean _glewInit_WGL_I3D_swap_frame_usage (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBeginFrameTrackingI3D = (PFNWGLBEGINFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglBeginFrameTrackingI3D")) == NULL) || r; - r = ((wglEndFrameTrackingI3D = (PFNWGLENDFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglEndFrameTrackingI3D")) == NULL) || r; - r = ((wglGetFrameUsageI3D = (PFNWGLGETFRAMEUSAGEI3DPROC)glewGetProcAddress((const GLubyte*)"wglGetFrameUsageI3D")) == NULL) || r; - r = ((wglQueryFrameTrackingI3D = (PFNWGLQUERYFRAMETRACKINGI3DPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameTrackingI3D")) == NULL) || r; - - return r; -} - -#endif /* WGL_I3D_swap_frame_usage */ - -#ifdef WGL_NV_float_buffer - -#endif /* WGL_NV_float_buffer */ - -#ifdef WGL_NV_gpu_affinity - -static GLboolean _glewInit_WGL_NV_gpu_affinity (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglCreateAffinityDCNV = (PFNWGLCREATEAFFINITYDCNVPROC)glewGetProcAddress((const GLubyte*)"wglCreateAffinityDCNV")) == NULL) || r; - r = ((wglDeleteDCNV = (PFNWGLDELETEDCNVPROC)glewGetProcAddress((const GLubyte*)"wglDeleteDCNV")) == NULL) || r; - r = ((wglEnumGpuDevicesNV = (PFNWGLENUMGPUDEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpuDevicesNV")) == NULL) || r; - r = ((wglEnumGpusFromAffinityDCNV = (PFNWGLENUMGPUSFROMAFFINITYDCNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpusFromAffinityDCNV")) == NULL) || r; - r = ((wglEnumGpusNV = (PFNWGLENUMGPUSNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumGpusNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_gpu_affinity */ - -#ifdef WGL_NV_present_video - -static GLboolean _glewInit_WGL_NV_present_video (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindVideoDeviceNV = (PFNWGLBINDVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoDeviceNV")) == NULL) || r; - r = ((wglEnumerateVideoDevicesNV = (PFNWGLENUMERATEVIDEODEVICESNVPROC)glewGetProcAddress((const GLubyte*)"wglEnumerateVideoDevicesNV")) == NULL) || r; - r = ((wglQueryCurrentContextNV = (PFNWGLQUERYCURRENTCONTEXTNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryCurrentContextNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_present_video */ - -#ifdef WGL_NV_render_depth_texture - -#endif /* WGL_NV_render_depth_texture */ - -#ifdef WGL_NV_render_texture_rectangle - -#endif /* WGL_NV_render_texture_rectangle */ - -#ifdef WGL_NV_swap_group - -static GLboolean _glewInit_WGL_NV_swap_group (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindSwapBarrierNV = (PFNWGLBINDSWAPBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"wglBindSwapBarrierNV")) == NULL) || r; - r = ((wglJoinSwapGroupNV = (PFNWGLJOINSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"wglJoinSwapGroupNV")) == NULL) || r; - r = ((wglQueryFrameCountNV = (PFNWGLQUERYFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryFrameCountNV")) == NULL) || r; - r = ((wglQueryMaxSwapGroupsNV = (PFNWGLQUERYMAXSWAPGROUPSNVPROC)glewGetProcAddress((const GLubyte*)"wglQueryMaxSwapGroupsNV")) == NULL) || r; - r = ((wglQuerySwapGroupNV = (PFNWGLQUERYSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"wglQuerySwapGroupNV")) == NULL) || r; - r = ((wglResetFrameCountNV = (PFNWGLRESETFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"wglResetFrameCountNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_swap_group */ - -#ifdef WGL_NV_vertex_array_range - -static GLboolean _glewInit_WGL_NV_vertex_array_range (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglAllocateMemoryNV = (PFNWGLALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglAllocateMemoryNV")) == NULL) || r; - r = ((wglFreeMemoryNV = (PFNWGLFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"wglFreeMemoryNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_vertex_array_range */ - -#ifdef WGL_NV_video_output - -static GLboolean _glewInit_WGL_NV_video_output (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglBindVideoImageNV = (PFNWGLBINDVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"wglBindVideoImageNV")) == NULL) || r; - r = ((wglGetVideoDeviceNV = (PFNWGLGETVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglGetVideoDeviceNV")) == NULL) || r; - r = ((wglGetVideoInfoNV = (PFNWGLGETVIDEOINFONVPROC)glewGetProcAddress((const GLubyte*)"wglGetVideoInfoNV")) == NULL) || r; - r = ((wglReleaseVideoDeviceNV = (PFNWGLRELEASEVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoDeviceNV")) == NULL) || r; - r = ((wglReleaseVideoImageNV = (PFNWGLRELEASEVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"wglReleaseVideoImageNV")) == NULL) || r; - r = ((wglSendPbufferToVideoNV = (PFNWGLSENDPBUFFERTOVIDEONVPROC)glewGetProcAddress((const GLubyte*)"wglSendPbufferToVideoNV")) == NULL) || r; - - return r; -} - -#endif /* WGL_NV_video_output */ - -#ifdef WGL_OML_sync_control - -static GLboolean _glewInit_WGL_OML_sync_control (WGLEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((wglGetMscRateOML = (PFNWGLGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetMscRateOML")) == NULL) || r; - r = ((wglGetSyncValuesOML = (PFNWGLGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"wglGetSyncValuesOML")) == NULL) || r; - r = ((wglSwapBuffersMscOML = (PFNWGLSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapBuffersMscOML")) == NULL) || r; - r = ((wglSwapLayerBuffersMscOML = (PFNWGLSWAPLAYERBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglSwapLayerBuffersMscOML")) == NULL) || r; - r = ((wglWaitForMscOML = (PFNWGLWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForMscOML")) == NULL) || r; - r = ((wglWaitForSbcOML = (PFNWGLWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"wglWaitForSbcOML")) == NULL) || r; - - return r; -} - -#endif /* WGL_OML_sync_control */ - -/* ------------------------------------------------------------------------- */ - -static PFNWGLGETEXTENSIONSSTRINGARBPROC _wglewGetExtensionsStringARB = NULL; -static PFNWGLGETEXTENSIONSSTRINGEXTPROC _wglewGetExtensionsStringEXT = NULL; - -GLboolean wglewGetExtension (const char* name) -{ - GLubyte* p; - GLubyte* end; - GLuint len = _glewStrLen((const GLubyte*)name); - if (_wglewGetExtensionsStringARB == NULL) - if (_wglewGetExtensionsStringEXT == NULL) - return GL_FALSE; - else - p = (GLubyte*)_wglewGetExtensionsStringEXT(); - else - p = (GLubyte*)_wglewGetExtensionsStringARB(wglGetCurrentDC()); - if (0 == p) return GL_FALSE; - end = p + _glewStrLen(p); - while (p < end) - { - GLuint n = _glewStrCLen(p, ' '); - if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE; - p += n+1; - } - return GL_FALSE; -} - -GLenum wglewContextInit (WGLEW_CONTEXT_ARG_DEF_LIST) -{ - GLboolean crippled; - /* find wgl extension string query functions */ - _wglewGetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringARB"); - _wglewGetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)glewGetProcAddress((const GLubyte*)"wglGetExtensionsStringEXT"); - /* initialize extensions */ - crippled = _wglewGetExtensionsStringARB == NULL && _wglewGetExtensionsStringEXT == NULL; -#ifdef WGL_3DFX_multisample - CONST_CAST(WGLEW_3DFX_multisample) = wglewGetExtension("WGL_3DFX_multisample"); -#endif /* WGL_3DFX_multisample */ -#ifdef WGL_3DL_stereo_control - CONST_CAST(WGLEW_3DL_stereo_control) = wglewGetExtension("WGL_3DL_stereo_control"); - if (glewExperimental || WGLEW_3DL_stereo_control|| crippled) CONST_CAST(WGLEW_3DL_stereo_control)= !_glewInit_WGL_3DL_stereo_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_3DL_stereo_control */ -#ifdef WGL_ARB_buffer_region - CONST_CAST(WGLEW_ARB_buffer_region) = wglewGetExtension("WGL_ARB_buffer_region"); - if (glewExperimental || WGLEW_ARB_buffer_region|| crippled) CONST_CAST(WGLEW_ARB_buffer_region)= !_glewInit_WGL_ARB_buffer_region(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_buffer_region */ -#ifdef WGL_ARB_create_context - CONST_CAST(WGLEW_ARB_create_context) = wglewGetExtension("WGL_ARB_create_context"); - if (glewExperimental || WGLEW_ARB_create_context|| crippled) CONST_CAST(WGLEW_ARB_create_context)= !_glewInit_WGL_ARB_create_context(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_create_context */ -#ifdef WGL_ARB_extensions_string - CONST_CAST(WGLEW_ARB_extensions_string) = wglewGetExtension("WGL_ARB_extensions_string"); - if (glewExperimental || WGLEW_ARB_extensions_string|| crippled) CONST_CAST(WGLEW_ARB_extensions_string)= !_glewInit_WGL_ARB_extensions_string(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_extensions_string */ -#ifdef WGL_ARB_framebuffer_sRGB - CONST_CAST(WGLEW_ARB_framebuffer_sRGB) = wglewGetExtension("WGL_ARB_framebuffer_sRGB"); -#endif /* WGL_ARB_framebuffer_sRGB */ -#ifdef WGL_ARB_make_current_read - CONST_CAST(WGLEW_ARB_make_current_read) = wglewGetExtension("WGL_ARB_make_current_read"); - if (glewExperimental || WGLEW_ARB_make_current_read|| crippled) CONST_CAST(WGLEW_ARB_make_current_read)= !_glewInit_WGL_ARB_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_make_current_read */ -#ifdef WGL_ARB_multisample - CONST_CAST(WGLEW_ARB_multisample) = wglewGetExtension("WGL_ARB_multisample"); -#endif /* WGL_ARB_multisample */ -#ifdef WGL_ARB_pbuffer - CONST_CAST(WGLEW_ARB_pbuffer) = wglewGetExtension("WGL_ARB_pbuffer"); - if (glewExperimental || WGLEW_ARB_pbuffer|| crippled) CONST_CAST(WGLEW_ARB_pbuffer)= !_glewInit_WGL_ARB_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_pbuffer */ -#ifdef WGL_ARB_pixel_format - CONST_CAST(WGLEW_ARB_pixel_format) = wglewGetExtension("WGL_ARB_pixel_format"); - if (glewExperimental || WGLEW_ARB_pixel_format|| crippled) CONST_CAST(WGLEW_ARB_pixel_format)= !_glewInit_WGL_ARB_pixel_format(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_pixel_format */ -#ifdef WGL_ARB_pixel_format_float - CONST_CAST(WGLEW_ARB_pixel_format_float) = wglewGetExtension("WGL_ARB_pixel_format_float"); -#endif /* WGL_ARB_pixel_format_float */ -#ifdef WGL_ARB_render_texture - CONST_CAST(WGLEW_ARB_render_texture) = wglewGetExtension("WGL_ARB_render_texture"); - if (glewExperimental || WGLEW_ARB_render_texture|| crippled) CONST_CAST(WGLEW_ARB_render_texture)= !_glewInit_WGL_ARB_render_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_ARB_render_texture */ -#ifdef WGL_ATI_pixel_format_float - CONST_CAST(WGLEW_ATI_pixel_format_float) = wglewGetExtension("WGL_ATI_pixel_format_float"); -#endif /* WGL_ATI_pixel_format_float */ -#ifdef WGL_ATI_render_texture_rectangle - CONST_CAST(WGLEW_ATI_render_texture_rectangle) = wglewGetExtension("WGL_ATI_render_texture_rectangle"); -#endif /* WGL_ATI_render_texture_rectangle */ -#ifdef WGL_EXT_depth_float - CONST_CAST(WGLEW_EXT_depth_float) = wglewGetExtension("WGL_EXT_depth_float"); -#endif /* WGL_EXT_depth_float */ -#ifdef WGL_EXT_display_color_table - CONST_CAST(WGLEW_EXT_display_color_table) = wglewGetExtension("WGL_EXT_display_color_table"); - if (glewExperimental || WGLEW_EXT_display_color_table|| crippled) CONST_CAST(WGLEW_EXT_display_color_table)= !_glewInit_WGL_EXT_display_color_table(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_display_color_table */ -#ifdef WGL_EXT_extensions_string - CONST_CAST(WGLEW_EXT_extensions_string) = wglewGetExtension("WGL_EXT_extensions_string"); - if (glewExperimental || WGLEW_EXT_extensions_string|| crippled) CONST_CAST(WGLEW_EXT_extensions_string)= !_glewInit_WGL_EXT_extensions_string(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_extensions_string */ -#ifdef WGL_EXT_framebuffer_sRGB - CONST_CAST(WGLEW_EXT_framebuffer_sRGB) = wglewGetExtension("WGL_EXT_framebuffer_sRGB"); -#endif /* WGL_EXT_framebuffer_sRGB */ -#ifdef WGL_EXT_make_current_read - CONST_CAST(WGLEW_EXT_make_current_read) = wglewGetExtension("WGL_EXT_make_current_read"); - if (glewExperimental || WGLEW_EXT_make_current_read|| crippled) CONST_CAST(WGLEW_EXT_make_current_read)= !_glewInit_WGL_EXT_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_make_current_read */ -#ifdef WGL_EXT_multisample - CONST_CAST(WGLEW_EXT_multisample) = wglewGetExtension("WGL_EXT_multisample"); -#endif /* WGL_EXT_multisample */ -#ifdef WGL_EXT_pbuffer - CONST_CAST(WGLEW_EXT_pbuffer) = wglewGetExtension("WGL_EXT_pbuffer"); - if (glewExperimental || WGLEW_EXT_pbuffer|| crippled) CONST_CAST(WGLEW_EXT_pbuffer)= !_glewInit_WGL_EXT_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_pbuffer */ -#ifdef WGL_EXT_pixel_format - CONST_CAST(WGLEW_EXT_pixel_format) = wglewGetExtension("WGL_EXT_pixel_format"); - if (glewExperimental || WGLEW_EXT_pixel_format|| crippled) CONST_CAST(WGLEW_EXT_pixel_format)= !_glewInit_WGL_EXT_pixel_format(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_pixel_format */ -#ifdef WGL_EXT_pixel_format_packed_float - CONST_CAST(WGLEW_EXT_pixel_format_packed_float) = wglewGetExtension("WGL_EXT_pixel_format_packed_float"); -#endif /* WGL_EXT_pixel_format_packed_float */ -#ifdef WGL_EXT_swap_control - CONST_CAST(WGLEW_EXT_swap_control) = wglewGetExtension("WGL_EXT_swap_control"); - if (glewExperimental || WGLEW_EXT_swap_control|| crippled) CONST_CAST(WGLEW_EXT_swap_control)= !_glewInit_WGL_EXT_swap_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_EXT_swap_control */ -#ifdef WGL_I3D_digital_video_control - CONST_CAST(WGLEW_I3D_digital_video_control) = wglewGetExtension("WGL_I3D_digital_video_control"); - if (glewExperimental || WGLEW_I3D_digital_video_control|| crippled) CONST_CAST(WGLEW_I3D_digital_video_control)= !_glewInit_WGL_I3D_digital_video_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_digital_video_control */ -#ifdef WGL_I3D_gamma - CONST_CAST(WGLEW_I3D_gamma) = wglewGetExtension("WGL_I3D_gamma"); - if (glewExperimental || WGLEW_I3D_gamma|| crippled) CONST_CAST(WGLEW_I3D_gamma)= !_glewInit_WGL_I3D_gamma(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_gamma */ -#ifdef WGL_I3D_genlock - CONST_CAST(WGLEW_I3D_genlock) = wglewGetExtension("WGL_I3D_genlock"); - if (glewExperimental || WGLEW_I3D_genlock|| crippled) CONST_CAST(WGLEW_I3D_genlock)= !_glewInit_WGL_I3D_genlock(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_genlock */ -#ifdef WGL_I3D_image_buffer - CONST_CAST(WGLEW_I3D_image_buffer) = wglewGetExtension("WGL_I3D_image_buffer"); - if (glewExperimental || WGLEW_I3D_image_buffer|| crippled) CONST_CAST(WGLEW_I3D_image_buffer)= !_glewInit_WGL_I3D_image_buffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_image_buffer */ -#ifdef WGL_I3D_swap_frame_lock - CONST_CAST(WGLEW_I3D_swap_frame_lock) = wglewGetExtension("WGL_I3D_swap_frame_lock"); - if (glewExperimental || WGLEW_I3D_swap_frame_lock|| crippled) CONST_CAST(WGLEW_I3D_swap_frame_lock)= !_glewInit_WGL_I3D_swap_frame_lock(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_swap_frame_lock */ -#ifdef WGL_I3D_swap_frame_usage - CONST_CAST(WGLEW_I3D_swap_frame_usage) = wglewGetExtension("WGL_I3D_swap_frame_usage"); - if (glewExperimental || WGLEW_I3D_swap_frame_usage|| crippled) CONST_CAST(WGLEW_I3D_swap_frame_usage)= !_glewInit_WGL_I3D_swap_frame_usage(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_I3D_swap_frame_usage */ -#ifdef WGL_NV_float_buffer - CONST_CAST(WGLEW_NV_float_buffer) = wglewGetExtension("WGL_NV_float_buffer"); -#endif /* WGL_NV_float_buffer */ -#ifdef WGL_NV_gpu_affinity - CONST_CAST(WGLEW_NV_gpu_affinity) = wglewGetExtension("WGL_NV_gpu_affinity"); - if (glewExperimental || WGLEW_NV_gpu_affinity|| crippled) CONST_CAST(WGLEW_NV_gpu_affinity)= !_glewInit_WGL_NV_gpu_affinity(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_gpu_affinity */ -#ifdef WGL_NV_present_video - CONST_CAST(WGLEW_NV_present_video) = wglewGetExtension("WGL_NV_present_video"); - if (glewExperimental || WGLEW_NV_present_video|| crippled) CONST_CAST(WGLEW_NV_present_video)= !_glewInit_WGL_NV_present_video(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_present_video */ -#ifdef WGL_NV_render_depth_texture - CONST_CAST(WGLEW_NV_render_depth_texture) = wglewGetExtension("WGL_NV_render_depth_texture"); -#endif /* WGL_NV_render_depth_texture */ -#ifdef WGL_NV_render_texture_rectangle - CONST_CAST(WGLEW_NV_render_texture_rectangle) = wglewGetExtension("WGL_NV_render_texture_rectangle"); -#endif /* WGL_NV_render_texture_rectangle */ -#ifdef WGL_NV_swap_group - CONST_CAST(WGLEW_NV_swap_group) = wglewGetExtension("WGL_NV_swap_group"); - if (glewExperimental || WGLEW_NV_swap_group|| crippled) CONST_CAST(WGLEW_NV_swap_group)= !_glewInit_WGL_NV_swap_group(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_swap_group */ -#ifdef WGL_NV_vertex_array_range - CONST_CAST(WGLEW_NV_vertex_array_range) = wglewGetExtension("WGL_NV_vertex_array_range"); - if (glewExperimental || WGLEW_NV_vertex_array_range|| crippled) CONST_CAST(WGLEW_NV_vertex_array_range)= !_glewInit_WGL_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_vertex_array_range */ -#ifdef WGL_NV_video_output - CONST_CAST(WGLEW_NV_video_output) = wglewGetExtension("WGL_NV_video_output"); - if (glewExperimental || WGLEW_NV_video_output|| crippled) CONST_CAST(WGLEW_NV_video_output)= !_glewInit_WGL_NV_video_output(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_NV_video_output */ -#ifdef WGL_OML_sync_control - CONST_CAST(WGLEW_OML_sync_control) = wglewGetExtension("WGL_OML_sync_control"); - if (glewExperimental || WGLEW_OML_sync_control|| crippled) CONST_CAST(WGLEW_OML_sync_control)= !_glewInit_WGL_OML_sync_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* WGL_OML_sync_control */ - - return GLEW_OK; -} - -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) - -PFNGLXGETCURRENTDISPLAYPROC __glewXGetCurrentDisplay = NULL; - -PFNGLXCHOOSEFBCONFIGPROC __glewXChooseFBConfig = NULL; -PFNGLXCREATENEWCONTEXTPROC __glewXCreateNewContext = NULL; -PFNGLXCREATEPBUFFERPROC __glewXCreatePbuffer = NULL; -PFNGLXCREATEPIXMAPPROC __glewXCreatePixmap = NULL; -PFNGLXCREATEWINDOWPROC __glewXCreateWindow = NULL; -PFNGLXDESTROYPBUFFERPROC __glewXDestroyPbuffer = NULL; -PFNGLXDESTROYPIXMAPPROC __glewXDestroyPixmap = NULL; -PFNGLXDESTROYWINDOWPROC __glewXDestroyWindow = NULL; -PFNGLXGETCURRENTREADDRAWABLEPROC __glewXGetCurrentReadDrawable = NULL; -PFNGLXGETFBCONFIGATTRIBPROC __glewXGetFBConfigAttrib = NULL; -PFNGLXGETFBCONFIGSPROC __glewXGetFBConfigs = NULL; -PFNGLXGETSELECTEDEVENTPROC __glewXGetSelectedEvent = NULL; -PFNGLXGETVISUALFROMFBCONFIGPROC __glewXGetVisualFromFBConfig = NULL; -PFNGLXMAKECONTEXTCURRENTPROC __glewXMakeContextCurrent = NULL; -PFNGLXQUERYCONTEXTPROC __glewXQueryContext = NULL; -PFNGLXQUERYDRAWABLEPROC __glewXQueryDrawable = NULL; -PFNGLXSELECTEVENTPROC __glewXSelectEvent = NULL; - -PFNGLXCREATECONTEXTATTRIBSARBPROC __glewXCreateContextAttribsARB = NULL; - -PFNGLXBINDTEXIMAGEATIPROC __glewXBindTexImageATI = NULL; -PFNGLXDRAWABLEATTRIBATIPROC __glewXDrawableAttribATI = NULL; -PFNGLXRELEASETEXIMAGEATIPROC __glewXReleaseTexImageATI = NULL; - -PFNGLXFREECONTEXTEXTPROC __glewXFreeContextEXT = NULL; -PFNGLXGETCONTEXTIDEXTPROC __glewXGetContextIDEXT = NULL; -PFNGLXIMPORTCONTEXTEXTPROC __glewXImportContextEXT = NULL; -PFNGLXQUERYCONTEXTINFOEXTPROC __glewXQueryContextInfoEXT = NULL; - -PFNGLXBINDTEXIMAGEEXTPROC __glewXBindTexImageEXT = NULL; -PFNGLXRELEASETEXIMAGEEXTPROC __glewXReleaseTexImageEXT = NULL; - -PFNGLXGETAGPOFFSETMESAPROC __glewXGetAGPOffsetMESA = NULL; - -PFNGLXCOPYSUBBUFFERMESAPROC __glewXCopySubBufferMESA = NULL; - -PFNGLXCREATEGLXPIXMAPMESAPROC __glewXCreateGLXPixmapMESA = NULL; - -PFNGLXRELEASEBUFFERSMESAPROC __glewXReleaseBuffersMESA = NULL; - -PFNGLXSET3DFXMODEMESAPROC __glewXSet3DfxModeMESA = NULL; - -PFNGLXBINDVIDEODEVICENVPROC __glewXBindVideoDeviceNV = NULL; -PFNGLXENUMERATEVIDEODEVICESNVPROC __glewXEnumerateVideoDevicesNV = NULL; - -PFNGLXBINDSWAPBARRIERNVPROC __glewXBindSwapBarrierNV = NULL; -PFNGLXJOINSWAPGROUPNVPROC __glewXJoinSwapGroupNV = NULL; -PFNGLXQUERYFRAMECOUNTNVPROC __glewXQueryFrameCountNV = NULL; -PFNGLXQUERYMAXSWAPGROUPSNVPROC __glewXQueryMaxSwapGroupsNV = NULL; -PFNGLXQUERYSWAPGROUPNVPROC __glewXQuerySwapGroupNV = NULL; -PFNGLXRESETFRAMECOUNTNVPROC __glewXResetFrameCountNV = NULL; - -PFNGLXALLOCATEMEMORYNVPROC __glewXAllocateMemoryNV = NULL; -PFNGLXFREEMEMORYNVPROC __glewXFreeMemoryNV = NULL; - -PFNGLXBINDVIDEOIMAGENVPROC __glewXBindVideoImageNV = NULL; -PFNGLXGETVIDEODEVICENVPROC __glewXGetVideoDeviceNV = NULL; -PFNGLXGETVIDEOINFONVPROC __glewXGetVideoInfoNV = NULL; -PFNGLXRELEASEVIDEODEVICENVPROC __glewXReleaseVideoDeviceNV = NULL; -PFNGLXRELEASEVIDEOIMAGENVPROC __glewXReleaseVideoImageNV = NULL; -PFNGLXSENDPBUFFERTOVIDEONVPROC __glewXSendPbufferToVideoNV = NULL; - -#ifdef GLX_OML_sync_control -PFNGLXGETMSCRATEOMLPROC __glewXGetMscRateOML = NULL; -PFNGLXGETSYNCVALUESOMLPROC __glewXGetSyncValuesOML = NULL; -PFNGLXSWAPBUFFERSMSCOMLPROC __glewXSwapBuffersMscOML = NULL; -PFNGLXWAITFORMSCOMLPROC __glewXWaitForMscOML = NULL; -PFNGLXWAITFORSBCOMLPROC __glewXWaitForSbcOML = NULL; -#endif - -PFNGLXCHOOSEFBCONFIGSGIXPROC __glewXChooseFBConfigSGIX = NULL; -PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC __glewXCreateContextWithConfigSGIX = NULL; -PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC __glewXCreateGLXPixmapWithConfigSGIX = NULL; -PFNGLXGETFBCONFIGATTRIBSGIXPROC __glewXGetFBConfigAttribSGIX = NULL; -PFNGLXGETFBCONFIGFROMVISUALSGIXPROC __glewXGetFBConfigFromVisualSGIX = NULL; -PFNGLXGETVISUALFROMFBCONFIGSGIXPROC __glewXGetVisualFromFBConfigSGIX = NULL; - -PFNGLXBINDHYPERPIPESGIXPROC __glewXBindHyperpipeSGIX = NULL; -PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC __glewXDestroyHyperpipeConfigSGIX = NULL; -PFNGLXHYPERPIPEATTRIBSGIXPROC __glewXHyperpipeAttribSGIX = NULL; -PFNGLXHYPERPIPECONFIGSGIXPROC __glewXHyperpipeConfigSGIX = NULL; -PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC __glewXQueryHyperpipeAttribSGIX = NULL; -PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC __glewXQueryHyperpipeBestAttribSGIX = NULL; -PFNGLXQUERYHYPERPIPECONFIGSGIXPROC __glewXQueryHyperpipeConfigSGIX = NULL; -PFNGLXQUERYHYPERPIPENETWORKSGIXPROC __glewXQueryHyperpipeNetworkSGIX = NULL; - -PFNGLXCREATEGLXPBUFFERSGIXPROC __glewXCreateGLXPbufferSGIX = NULL; -PFNGLXDESTROYGLXPBUFFERSGIXPROC __glewXDestroyGLXPbufferSGIX = NULL; -PFNGLXGETSELECTEDEVENTSGIXPROC __glewXGetSelectedEventSGIX = NULL; -PFNGLXQUERYGLXPBUFFERSGIXPROC __glewXQueryGLXPbufferSGIX = NULL; -PFNGLXSELECTEVENTSGIXPROC __glewXSelectEventSGIX = NULL; - -PFNGLXBINDSWAPBARRIERSGIXPROC __glewXBindSwapBarrierSGIX = NULL; -PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC __glewXQueryMaxSwapBarriersSGIX = NULL; - -PFNGLXJOINSWAPGROUPSGIXPROC __glewXJoinSwapGroupSGIX = NULL; - -PFNGLXBINDCHANNELTOWINDOWSGIXPROC __glewXBindChannelToWindowSGIX = NULL; -PFNGLXCHANNELRECTSGIXPROC __glewXChannelRectSGIX = NULL; -PFNGLXCHANNELRECTSYNCSGIXPROC __glewXChannelRectSyncSGIX = NULL; -PFNGLXQUERYCHANNELDELTASSGIXPROC __glewXQueryChannelDeltasSGIX = NULL; -PFNGLXQUERYCHANNELRECTSGIXPROC __glewXQueryChannelRectSGIX = NULL; - -PFNGLXCUSHIONSGIPROC __glewXCushionSGI = NULL; - -PFNGLXGETCURRENTREADDRAWABLESGIPROC __glewXGetCurrentReadDrawableSGI = NULL; -PFNGLXMAKECURRENTREADSGIPROC __glewXMakeCurrentReadSGI = NULL; - -PFNGLXSWAPINTERVALSGIPROC __glewXSwapIntervalSGI = NULL; - -PFNGLXGETVIDEOSYNCSGIPROC __glewXGetVideoSyncSGI = NULL; -PFNGLXWAITVIDEOSYNCSGIPROC __glewXWaitVideoSyncSGI = NULL; - -PFNGLXGETTRANSPARENTINDEXSUNPROC __glewXGetTransparentIndexSUN = NULL; - -PFNGLXGETVIDEORESIZESUNPROC __glewXGetVideoResizeSUN = NULL; -PFNGLXVIDEORESIZESUNPROC __glewXVideoResizeSUN = NULL; - -#if !defined(GLEW_MX) - -GLboolean __GLXEW_VERSION_1_0 = GL_FALSE; -GLboolean __GLXEW_VERSION_1_1 = GL_FALSE; -GLboolean __GLXEW_VERSION_1_2 = GL_FALSE; -GLboolean __GLXEW_VERSION_1_3 = GL_FALSE; -GLboolean __GLXEW_VERSION_1_4 = GL_FALSE; -GLboolean __GLXEW_3DFX_multisample = GL_FALSE; -GLboolean __GLXEW_ARB_create_context = GL_FALSE; -GLboolean __GLXEW_ARB_fbconfig_float = GL_FALSE; -GLboolean __GLXEW_ARB_framebuffer_sRGB = GL_FALSE; -GLboolean __GLXEW_ARB_get_proc_address = GL_FALSE; -GLboolean __GLXEW_ARB_multisample = GL_FALSE; -GLboolean __GLXEW_ATI_pixel_format_float = GL_FALSE; -GLboolean __GLXEW_ATI_render_texture = GL_FALSE; -GLboolean __GLXEW_EXT_fbconfig_packed_float = GL_FALSE; -GLboolean __GLXEW_EXT_framebuffer_sRGB = GL_FALSE; -GLboolean __GLXEW_EXT_import_context = GL_FALSE; -GLboolean __GLXEW_EXT_scene_marker = GL_FALSE; -GLboolean __GLXEW_EXT_texture_from_pixmap = GL_FALSE; -GLboolean __GLXEW_EXT_visual_info = GL_FALSE; -GLboolean __GLXEW_EXT_visual_rating = GL_FALSE; -GLboolean __GLXEW_MESA_agp_offset = GL_FALSE; -GLboolean __GLXEW_MESA_copy_sub_buffer = GL_FALSE; -GLboolean __GLXEW_MESA_pixmap_colormap = GL_FALSE; -GLboolean __GLXEW_MESA_release_buffers = GL_FALSE; -GLboolean __GLXEW_MESA_set_3dfx_mode = GL_FALSE; -GLboolean __GLXEW_NV_float_buffer = GL_FALSE; -GLboolean __GLXEW_NV_present_video = GL_FALSE; -GLboolean __GLXEW_NV_swap_group = GL_FALSE; -GLboolean __GLXEW_NV_vertex_array_range = GL_FALSE; -GLboolean __GLXEW_NV_video_output = GL_FALSE; -GLboolean __GLXEW_OML_swap_method = GL_FALSE; -#ifdef GLX_OML_sync_control -GLboolean __GLXEW_OML_sync_control = GL_FALSE; -#endif -GLboolean __GLXEW_SGIS_blended_overlay = GL_FALSE; -GLboolean __GLXEW_SGIS_color_range = GL_FALSE; -GLboolean __GLXEW_SGIS_multisample = GL_FALSE; -GLboolean __GLXEW_SGIS_shared_multisample = GL_FALSE; -GLboolean __GLXEW_SGIX_fbconfig = GL_FALSE; -GLboolean __GLXEW_SGIX_hyperpipe = GL_FALSE; -GLboolean __GLXEW_SGIX_pbuffer = GL_FALSE; -GLboolean __GLXEW_SGIX_swap_barrier = GL_FALSE; -GLboolean __GLXEW_SGIX_swap_group = GL_FALSE; -GLboolean __GLXEW_SGIX_video_resize = GL_FALSE; -GLboolean __GLXEW_SGIX_visual_select_group = GL_FALSE; -GLboolean __GLXEW_SGI_cushion = GL_FALSE; -GLboolean __GLXEW_SGI_make_current_read = GL_FALSE; -GLboolean __GLXEW_SGI_swap_control = GL_FALSE; -GLboolean __GLXEW_SGI_video_sync = GL_FALSE; -GLboolean __GLXEW_SUN_get_transparent_index = GL_FALSE; -GLboolean __GLXEW_SUN_video_resize = GL_FALSE; - -#endif /* !GLEW_MX */ - -#ifdef GLX_VERSION_1_2 - -static GLboolean _glewInit_GLX_VERSION_1_2 (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r; - - return r; -} - -#endif /* GLX_VERSION_1_2 */ - -#ifdef GLX_VERSION_1_3 - -static GLboolean _glewInit_GLX_VERSION_1_3 (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXChooseFBConfig = (PFNGLXCHOOSEFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfig")) == NULL) || r; - r = ((glXCreateNewContext = (PFNGLXCREATENEWCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXCreateNewContext")) == NULL) || r; - r = ((glXCreatePbuffer = (PFNGLXCREATEPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXCreatePbuffer")) == NULL) || r; - r = ((glXCreatePixmap = (PFNGLXCREATEPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXCreatePixmap")) == NULL) || r; - r = ((glXCreateWindow = (PFNGLXCREATEWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXCreateWindow")) == NULL) || r; - r = ((glXDestroyPbuffer = (PFNGLXDESTROYPBUFFERPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPbuffer")) == NULL) || r; - r = ((glXDestroyPixmap = (PFNGLXDESTROYPIXMAPPROC)glewGetProcAddress((const GLubyte*)"glXDestroyPixmap")) == NULL) || r; - r = ((glXDestroyWindow = (PFNGLXDESTROYWINDOWPROC)glewGetProcAddress((const GLubyte*)"glXDestroyWindow")) == NULL) || r; - r = ((glXGetCurrentReadDrawable = (PFNGLXGETCURRENTREADDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawable")) == NULL) || r; - r = ((glXGetFBConfigAttrib = (PFNGLXGETFBCONFIGATTRIBPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttrib")) == NULL) || r; - r = ((glXGetFBConfigs = (PFNGLXGETFBCONFIGSPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigs")) == NULL) || r; - r = ((glXGetSelectedEvent = (PFNGLXGETSELECTEDEVENTPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEvent")) == NULL) || r; - r = ((glXGetVisualFromFBConfig = (PFNGLXGETVISUALFROMFBCONFIGPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfig")) == NULL) || r; - r = ((glXMakeContextCurrent = (PFNGLXMAKECONTEXTCURRENTPROC)glewGetProcAddress((const GLubyte*)"glXMakeContextCurrent")) == NULL) || r; - r = ((glXQueryContext = (PFNGLXQUERYCONTEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContext")) == NULL) || r; - r = ((glXQueryDrawable = (PFNGLXQUERYDRAWABLEPROC)glewGetProcAddress((const GLubyte*)"glXQueryDrawable")) == NULL) || r; - r = ((glXSelectEvent = (PFNGLXSELECTEVENTPROC)glewGetProcAddress((const GLubyte*)"glXSelectEvent")) == NULL) || r; - - return r; -} - -#endif /* GLX_VERSION_1_3 */ - -#ifdef GLX_VERSION_1_4 - -#endif /* GLX_VERSION_1_4 */ - -#ifdef GLX_3DFX_multisample - -#endif /* GLX_3DFX_multisample */ - -#ifdef GLX_ARB_create_context - -static GLboolean _glewInit_GLX_ARB_create_context (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)glewGetProcAddress((const GLubyte*)"glXCreateContextAttribsARB")) == NULL) || r; - - return r; -} - -#endif /* GLX_ARB_create_context */ - -#ifdef GLX_ARB_fbconfig_float - -#endif /* GLX_ARB_fbconfig_float */ - -#ifdef GLX_ARB_framebuffer_sRGB - -#endif /* GLX_ARB_framebuffer_sRGB */ - -#ifdef GLX_ARB_get_proc_address - -#endif /* GLX_ARB_get_proc_address */ - -#ifdef GLX_ARB_multisample - -#endif /* GLX_ARB_multisample */ - -#ifdef GLX_ATI_pixel_format_float - -#endif /* GLX_ATI_pixel_format_float */ - -#ifdef GLX_ATI_render_texture - -static GLboolean _glewInit_GLX_ATI_render_texture (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindTexImageATI = (PFNGLXBINDTEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXBindTexImageATI")) == NULL) || r; - r = ((glXDrawableAttribATI = (PFNGLXDRAWABLEATTRIBATIPROC)glewGetProcAddress((const GLubyte*)"glXDrawableAttribATI")) == NULL) || r; - r = ((glXReleaseTexImageATI = (PFNGLXRELEASETEXIMAGEATIPROC)glewGetProcAddress((const GLubyte*)"glXReleaseTexImageATI")) == NULL) || r; - - return r; -} - -#endif /* GLX_ATI_render_texture */ - -#ifdef GLX_EXT_fbconfig_packed_float - -#endif /* GLX_EXT_fbconfig_packed_float */ - -#ifdef GLX_EXT_framebuffer_sRGB - -#endif /* GLX_EXT_framebuffer_sRGB */ - -#ifdef GLX_EXT_import_context - -static GLboolean _glewInit_GLX_EXT_import_context (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXFreeContextEXT = (PFNGLXFREECONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXFreeContextEXT")) == NULL) || r; - r = ((glXGetContextIDEXT = (PFNGLXGETCONTEXTIDEXTPROC)glewGetProcAddress((const GLubyte*)"glXGetContextIDEXT")) == NULL) || r; - r = ((glXImportContextEXT = (PFNGLXIMPORTCONTEXTEXTPROC)glewGetProcAddress((const GLubyte*)"glXImportContextEXT")) == NULL) || r; - r = ((glXQueryContextInfoEXT = (PFNGLXQUERYCONTEXTINFOEXTPROC)glewGetProcAddress((const GLubyte*)"glXQueryContextInfoEXT")) == NULL) || r; - - return r; -} - -#endif /* GLX_EXT_import_context */ - -#ifdef GLX_EXT_scene_marker - -#endif /* GLX_EXT_scene_marker */ - -#ifdef GLX_EXT_texture_from_pixmap - -static GLboolean _glewInit_GLX_EXT_texture_from_pixmap (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindTexImageEXT = (PFNGLXBINDTEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glXBindTexImageEXT")) == NULL) || r; - r = ((glXReleaseTexImageEXT = (PFNGLXRELEASETEXIMAGEEXTPROC)glewGetProcAddress((const GLubyte*)"glXReleaseTexImageEXT")) == NULL) || r; - - return r; -} - -#endif /* GLX_EXT_texture_from_pixmap */ - -#ifdef GLX_EXT_visual_info - -#endif /* GLX_EXT_visual_info */ - -#ifdef GLX_EXT_visual_rating - -#endif /* GLX_EXT_visual_rating */ - -#ifdef GLX_MESA_agp_offset - -static GLboolean _glewInit_GLX_MESA_agp_offset (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetAGPOffsetMESA = (PFNGLXGETAGPOFFSETMESAPROC)glewGetProcAddress((const GLubyte*)"glXGetAGPOffsetMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_agp_offset */ - -#ifdef GLX_MESA_copy_sub_buffer - -static GLboolean _glewInit_GLX_MESA_copy_sub_buffer (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCopySubBufferMESA = (PFNGLXCOPYSUBBUFFERMESAPROC)glewGetProcAddress((const GLubyte*)"glXCopySubBufferMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_copy_sub_buffer */ - -#ifdef GLX_MESA_pixmap_colormap - -static GLboolean _glewInit_GLX_MESA_pixmap_colormap (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCreateGLXPixmapMESA = (PFNGLXCREATEGLXPIXMAPMESAPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_pixmap_colormap */ - -#ifdef GLX_MESA_release_buffers - -static GLboolean _glewInit_GLX_MESA_release_buffers (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXReleaseBuffersMESA = (PFNGLXRELEASEBUFFERSMESAPROC)glewGetProcAddress((const GLubyte*)"glXReleaseBuffersMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_release_buffers */ - -#ifdef GLX_MESA_set_3dfx_mode - -static GLboolean _glewInit_GLX_MESA_set_3dfx_mode (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXSet3DfxModeMESA = (PFNGLXSET3DFXMODEMESAPROC)glewGetProcAddress((const GLubyte*)"glXSet3DfxModeMESA")) == NULL) || r; - - return r; -} - -#endif /* GLX_MESA_set_3dfx_mode */ - -#ifdef GLX_NV_float_buffer - -#endif /* GLX_NV_float_buffer */ - -#ifdef GLX_NV_present_video - -static GLboolean _glewInit_GLX_NV_present_video (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindVideoDeviceNV = (PFNGLXBINDVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoDeviceNV")) == NULL) || r; - r = ((glXEnumerateVideoDevicesNV = (PFNGLXENUMERATEVIDEODEVICESNVPROC)glewGetProcAddress((const GLubyte*)"glXEnumerateVideoDevicesNV")) == NULL) || r; - - return r; -} - -#endif /* GLX_NV_present_video */ - -#ifdef GLX_NV_swap_group - -static GLboolean _glewInit_GLX_NV_swap_group (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindSwapBarrierNV = (PFNGLXBINDSWAPBARRIERNVPROC)glewGetProcAddress((const GLubyte*)"glXBindSwapBarrierNV")) == NULL) || r; - r = ((glXJoinSwapGroupNV = (PFNGLXJOINSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"glXJoinSwapGroupNV")) == NULL) || r; - r = ((glXQueryFrameCountNV = (PFNGLXQUERYFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glXQueryFrameCountNV")) == NULL) || r; - r = ((glXQueryMaxSwapGroupsNV = (PFNGLXQUERYMAXSWAPGROUPSNVPROC)glewGetProcAddress((const GLubyte*)"glXQueryMaxSwapGroupsNV")) == NULL) || r; - r = ((glXQuerySwapGroupNV = (PFNGLXQUERYSWAPGROUPNVPROC)glewGetProcAddress((const GLubyte*)"glXQuerySwapGroupNV")) == NULL) || r; - r = ((glXResetFrameCountNV = (PFNGLXRESETFRAMECOUNTNVPROC)glewGetProcAddress((const GLubyte*)"glXResetFrameCountNV")) == NULL) || r; - - return r; -} - -#endif /* GLX_NV_swap_group */ - -#ifdef GLX_NV_vertex_array_range - -static GLboolean _glewInit_GLX_NV_vertex_array_range (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXAllocateMemoryNV = (PFNGLXALLOCATEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXAllocateMemoryNV")) == NULL) || r; - r = ((glXFreeMemoryNV = (PFNGLXFREEMEMORYNVPROC)glewGetProcAddress((const GLubyte*)"glXFreeMemoryNV")) == NULL) || r; - - return r; -} - -#endif /* GLX_NV_vertex_array_range */ - -#ifdef GLX_NV_video_output - -static GLboolean _glewInit_GLX_NV_video_output (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindVideoImageNV = (PFNGLXBINDVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"glXBindVideoImageNV")) == NULL) || r; - r = ((glXGetVideoDeviceNV = (PFNGLXGETVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoDeviceNV")) == NULL) || r; - r = ((glXGetVideoInfoNV = (PFNGLXGETVIDEOINFONVPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoInfoNV")) == NULL) || r; - r = ((glXReleaseVideoDeviceNV = (PFNGLXRELEASEVIDEODEVICENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoDeviceNV")) == NULL) || r; - r = ((glXReleaseVideoImageNV = (PFNGLXRELEASEVIDEOIMAGENVPROC)glewGetProcAddress((const GLubyte*)"glXReleaseVideoImageNV")) == NULL) || r; - r = ((glXSendPbufferToVideoNV = (PFNGLXSENDPBUFFERTOVIDEONVPROC)glewGetProcAddress((const GLubyte*)"glXSendPbufferToVideoNV")) == NULL) || r; - - return r; -} - -#endif /* GLX_NV_video_output */ - -#ifdef GLX_OML_swap_method - -#endif /* GLX_OML_swap_method */ - -#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -#include - -static GLboolean _glewInit_GLX_OML_sync_control (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetMscRateOML = (PFNGLXGETMSCRATEOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetMscRateOML")) == NULL) || r; - r = ((glXGetSyncValuesOML = (PFNGLXGETSYNCVALUESOMLPROC)glewGetProcAddress((const GLubyte*)"glXGetSyncValuesOML")) == NULL) || r; - r = ((glXSwapBuffersMscOML = (PFNGLXSWAPBUFFERSMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXSwapBuffersMscOML")) == NULL) || r; - r = ((glXWaitForMscOML = (PFNGLXWAITFORMSCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForMscOML")) == NULL) || r; - r = ((glXWaitForSbcOML = (PFNGLXWAITFORSBCOMLPROC)glewGetProcAddress((const GLubyte*)"glXWaitForSbcOML")) == NULL) || r; - - return r; -} - -#endif /* GLX_OML_sync_control */ - -#ifdef GLX_SGIS_blended_overlay - -#endif /* GLX_SGIS_blended_overlay */ - -#ifdef GLX_SGIS_color_range - -#endif /* GLX_SGIS_color_range */ - -#ifdef GLX_SGIS_multisample - -#endif /* GLX_SGIS_multisample */ - -#ifdef GLX_SGIS_shared_multisample - -#endif /* GLX_SGIS_shared_multisample */ - -#ifdef GLX_SGIX_fbconfig - -static GLboolean _glewInit_GLX_SGIX_fbconfig (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXChooseFBConfigSGIX = (PFNGLXCHOOSEFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChooseFBConfigSGIX")) == NULL) || r; - r = ((glXCreateContextWithConfigSGIX = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateContextWithConfigSGIX")) == NULL) || r; - r = ((glXCreateGLXPixmapWithConfigSGIX = (PFNGLXCREATEGLXPIXMAPWITHCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPixmapWithConfigSGIX")) == NULL) || r; - r = ((glXGetFBConfigAttribSGIX = (PFNGLXGETFBCONFIGATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigAttribSGIX")) == NULL) || r; - r = ((glXGetFBConfigFromVisualSGIX = (PFNGLXGETFBCONFIGFROMVISUALSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetFBConfigFromVisualSGIX")) == NULL) || r; - r = ((glXGetVisualFromFBConfigSGIX = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetVisualFromFBConfigSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_fbconfig */ - -#ifdef GLX_SGIX_hyperpipe - -static GLboolean _glewInit_GLX_SGIX_hyperpipe (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindHyperpipeSGIX = (PFNGLXBINDHYPERPIPESGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindHyperpipeSGIX")) == NULL) || r; - r = ((glXDestroyHyperpipeConfigSGIX = (PFNGLXDESTROYHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXDestroyHyperpipeConfigSGIX")) == NULL) || r; - r = ((glXHyperpipeAttribSGIX = (PFNGLXHYPERPIPEATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXHyperpipeAttribSGIX")) == NULL) || r; - r = ((glXHyperpipeConfigSGIX = (PFNGLXHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXHyperpipeConfigSGIX")) == NULL) || r; - r = ((glXQueryHyperpipeAttribSGIX = (PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeAttribSGIX")) == NULL) || r; - r = ((glXQueryHyperpipeBestAttribSGIX = (PFNGLXQUERYHYPERPIPEBESTATTRIBSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeBestAttribSGIX")) == NULL) || r; - r = ((glXQueryHyperpipeConfigSGIX = (PFNGLXQUERYHYPERPIPECONFIGSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeConfigSGIX")) == NULL) || r; - r = ((glXQueryHyperpipeNetworkSGIX = (PFNGLXQUERYHYPERPIPENETWORKSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryHyperpipeNetworkSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_hyperpipe */ - -#ifdef GLX_SGIX_pbuffer - -static GLboolean _glewInit_GLX_SGIX_pbuffer (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCreateGLXPbufferSGIX = (PFNGLXCREATEGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXCreateGLXPbufferSGIX")) == NULL) || r; - r = ((glXDestroyGLXPbufferSGIX = (PFNGLXDESTROYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXDestroyGLXPbufferSGIX")) == NULL) || r; - r = ((glXGetSelectedEventSGIX = (PFNGLXGETSELECTEDEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXGetSelectedEventSGIX")) == NULL) || r; - r = ((glXQueryGLXPbufferSGIX = (PFNGLXQUERYGLXPBUFFERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryGLXPbufferSGIX")) == NULL) || r; - r = ((glXSelectEventSGIX = (PFNGLXSELECTEVENTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXSelectEventSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_pbuffer */ - -#ifdef GLX_SGIX_swap_barrier - -static GLboolean _glewInit_GLX_SGIX_swap_barrier (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindSwapBarrierSGIX = (PFNGLXBINDSWAPBARRIERSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindSwapBarrierSGIX")) == NULL) || r; - r = ((glXQueryMaxSwapBarriersSGIX = (PFNGLXQUERYMAXSWAPBARRIERSSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryMaxSwapBarriersSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_swap_barrier */ - -#ifdef GLX_SGIX_swap_group - -static GLboolean _glewInit_GLX_SGIX_swap_group (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXJoinSwapGroupSGIX = (PFNGLXJOINSWAPGROUPSGIXPROC)glewGetProcAddress((const GLubyte*)"glXJoinSwapGroupSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_swap_group */ - -#ifdef GLX_SGIX_video_resize - -static GLboolean _glewInit_GLX_SGIX_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXBindChannelToWindowSGIX = (PFNGLXBINDCHANNELTOWINDOWSGIXPROC)glewGetProcAddress((const GLubyte*)"glXBindChannelToWindowSGIX")) == NULL) || r; - r = ((glXChannelRectSGIX = (PFNGLXCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSGIX")) == NULL) || r; - r = ((glXChannelRectSyncSGIX = (PFNGLXCHANNELRECTSYNCSGIXPROC)glewGetProcAddress((const GLubyte*)"glXChannelRectSyncSGIX")) == NULL) || r; - r = ((glXQueryChannelDeltasSGIX = (PFNGLXQUERYCHANNELDELTASSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelDeltasSGIX")) == NULL) || r; - r = ((glXQueryChannelRectSGIX = (PFNGLXQUERYCHANNELRECTSGIXPROC)glewGetProcAddress((const GLubyte*)"glXQueryChannelRectSGIX")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGIX_video_resize */ - -#ifdef GLX_SGIX_visual_select_group - -#endif /* GLX_SGIX_visual_select_group */ - -#ifdef GLX_SGI_cushion - -static GLboolean _glewInit_GLX_SGI_cushion (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXCushionSGI = (PFNGLXCUSHIONSGIPROC)glewGetProcAddress((const GLubyte*)"glXCushionSGI")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGI_cushion */ - -#ifdef GLX_SGI_make_current_read - -static GLboolean _glewInit_GLX_SGI_make_current_read (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetCurrentReadDrawableSGI = (PFNGLXGETCURRENTREADDRAWABLESGIPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentReadDrawableSGI")) == NULL) || r; - r = ((glXMakeCurrentReadSGI = (PFNGLXMAKECURRENTREADSGIPROC)glewGetProcAddress((const GLubyte*)"glXMakeCurrentReadSGI")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGI_make_current_read */ - -#ifdef GLX_SGI_swap_control - -static GLboolean _glewInit_GLX_SGI_swap_control (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)glewGetProcAddress((const GLubyte*)"glXSwapIntervalSGI")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGI_swap_control */ - -#ifdef GLX_SGI_video_sync - -static GLboolean _glewInit_GLX_SGI_video_sync (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetVideoSyncSGI = (PFNGLXGETVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoSyncSGI")) == NULL) || r; - r = ((glXWaitVideoSyncSGI = (PFNGLXWAITVIDEOSYNCSGIPROC)glewGetProcAddress((const GLubyte*)"glXWaitVideoSyncSGI")) == NULL) || r; - - return r; -} - -#endif /* GLX_SGI_video_sync */ - -#ifdef GLX_SUN_get_transparent_index - -static GLboolean _glewInit_GLX_SUN_get_transparent_index (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetTransparentIndexSUN = (PFNGLXGETTRANSPARENTINDEXSUNPROC)glewGetProcAddress((const GLubyte*)"glXGetTransparentIndexSUN")) == NULL) || r; - - return r; -} - -#endif /* GLX_SUN_get_transparent_index */ - -#ifdef GLX_SUN_video_resize - -static GLboolean _glewInit_GLX_SUN_video_resize (GLXEW_CONTEXT_ARG_DEF_INIT) -{ - GLboolean r = GL_FALSE; - - r = ((glXGetVideoResizeSUN = (PFNGLXGETVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXGetVideoResizeSUN")) == NULL) || r; - r = ((glXVideoResizeSUN = (PFNGLXVIDEORESIZESUNPROC)glewGetProcAddress((const GLubyte*)"glXVideoResizeSUN")) == NULL) || r; - - return r; -} - -#endif /* GLX_SUN_video_resize */ - -/* ------------------------------------------------------------------------ */ - -GLboolean glxewGetExtension (const char* name) -{ - GLubyte* p; - GLubyte* end; - GLuint len = _glewStrLen((const GLubyte*)name); -/* if (glXQueryExtensionsString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; */ -/* p = (GLubyte*)glXQueryExtensionsString(glXGetCurrentDisplay(), DefaultScreen(glXGetCurrentDisplay())); */ - if (glXGetClientString == NULL || glXGetCurrentDisplay == NULL) return GL_FALSE; - p = (GLubyte*)glXGetClientString(glXGetCurrentDisplay(), GLX_EXTENSIONS); - if (0 == p) return GL_FALSE; - end = p + _glewStrLen(p); - while (p < end) - { - GLuint n = _glewStrCLen(p, ' '); - if (len == n && _glewStrSame((const GLubyte*)name, p, n)) return GL_TRUE; - p += n+1; - } - return GL_FALSE; -} - -GLenum glxewContextInit (GLXEW_CONTEXT_ARG_DEF_LIST) -{ - int major, minor; - /* initialize core GLX 1.2 */ - if (_glewInit_GLX_VERSION_1_2(GLEW_CONTEXT_ARG_VAR_INIT)) return GLEW_ERROR_GLX_VERSION_11_ONLY; - /* initialize flags */ - CONST_CAST(GLXEW_VERSION_1_0) = GL_TRUE; - CONST_CAST(GLXEW_VERSION_1_1) = GL_TRUE; - CONST_CAST(GLXEW_VERSION_1_2) = GL_TRUE; - CONST_CAST(GLXEW_VERSION_1_3) = GL_TRUE; - CONST_CAST(GLXEW_VERSION_1_4) = GL_TRUE; - /* query GLX version */ - glXQueryVersion(glXGetCurrentDisplay(), &major, &minor); - if (major == 1 && minor <= 3) - { - switch (minor) - { - case 3: - CONST_CAST(GLXEW_VERSION_1_4) = GL_FALSE; - break; - case 2: - CONST_CAST(GLXEW_VERSION_1_4) = GL_FALSE; - CONST_CAST(GLXEW_VERSION_1_3) = GL_FALSE; - break; - default: - return GLEW_ERROR_GLX_VERSION_11_ONLY; - break; - } - } - /* initialize extensions */ -#ifdef GLX_VERSION_1_3 - if (glewExperimental || GLXEW_VERSION_1_3) CONST_CAST(GLXEW_VERSION_1_3) = !_glewInit_GLX_VERSION_1_3(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_VERSION_1_3 */ -#ifdef GLX_3DFX_multisample - CONST_CAST(GLXEW_3DFX_multisample) = glxewGetExtension("GLX_3DFX_multisample"); -#endif /* GLX_3DFX_multisample */ -#ifdef GLX_ARB_create_context - CONST_CAST(GLXEW_ARB_create_context) = glxewGetExtension("GLX_ARB_create_context"); - if (glewExperimental || GLXEW_ARB_create_context) CONST_CAST(GLXEW_ARB_create_context) = !_glewInit_GLX_ARB_create_context(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_ARB_create_context */ -#ifdef GLX_ARB_fbconfig_float - CONST_CAST(GLXEW_ARB_fbconfig_float) = glxewGetExtension("GLX_ARB_fbconfig_float"); -#endif /* GLX_ARB_fbconfig_float */ -#ifdef GLX_ARB_framebuffer_sRGB - CONST_CAST(GLXEW_ARB_framebuffer_sRGB) = glxewGetExtension("GLX_ARB_framebuffer_sRGB"); -#endif /* GLX_ARB_framebuffer_sRGB */ -#ifdef GLX_ARB_get_proc_address - CONST_CAST(GLXEW_ARB_get_proc_address) = glxewGetExtension("GLX_ARB_get_proc_address"); -#endif /* GLX_ARB_get_proc_address */ -#ifdef GLX_ARB_multisample - CONST_CAST(GLXEW_ARB_multisample) = glxewGetExtension("GLX_ARB_multisample"); -#endif /* GLX_ARB_multisample */ -#ifdef GLX_ATI_pixel_format_float - CONST_CAST(GLXEW_ATI_pixel_format_float) = glxewGetExtension("GLX_ATI_pixel_format_float"); -#endif /* GLX_ATI_pixel_format_float */ -#ifdef GLX_ATI_render_texture - CONST_CAST(GLXEW_ATI_render_texture) = glxewGetExtension("GLX_ATI_render_texture"); - if (glewExperimental || GLXEW_ATI_render_texture) CONST_CAST(GLXEW_ATI_render_texture) = !_glewInit_GLX_ATI_render_texture(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_ATI_render_texture */ -#ifdef GLX_EXT_fbconfig_packed_float - CONST_CAST(GLXEW_EXT_fbconfig_packed_float) = glxewGetExtension("GLX_EXT_fbconfig_packed_float"); -#endif /* GLX_EXT_fbconfig_packed_float */ -#ifdef GLX_EXT_framebuffer_sRGB - CONST_CAST(GLXEW_EXT_framebuffer_sRGB) = glxewGetExtension("GLX_EXT_framebuffer_sRGB"); -#endif /* GLX_EXT_framebuffer_sRGB */ -#ifdef GLX_EXT_import_context - CONST_CAST(GLXEW_EXT_import_context) = glxewGetExtension("GLX_EXT_import_context"); - if (glewExperimental || GLXEW_EXT_import_context) CONST_CAST(GLXEW_EXT_import_context) = !_glewInit_GLX_EXT_import_context(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_EXT_import_context */ -#ifdef GLX_EXT_scene_marker - CONST_CAST(GLXEW_EXT_scene_marker) = glxewGetExtension("GLX_EXT_scene_marker"); -#endif /* GLX_EXT_scene_marker */ -#ifdef GLX_EXT_texture_from_pixmap - CONST_CAST(GLXEW_EXT_texture_from_pixmap) = glxewGetExtension("GLX_EXT_texture_from_pixmap"); - if (glewExperimental || GLXEW_EXT_texture_from_pixmap) CONST_CAST(GLXEW_EXT_texture_from_pixmap) = !_glewInit_GLX_EXT_texture_from_pixmap(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_EXT_texture_from_pixmap */ -#ifdef GLX_EXT_visual_info - CONST_CAST(GLXEW_EXT_visual_info) = glxewGetExtension("GLX_EXT_visual_info"); -#endif /* GLX_EXT_visual_info */ -#ifdef GLX_EXT_visual_rating - CONST_CAST(GLXEW_EXT_visual_rating) = glxewGetExtension("GLX_EXT_visual_rating"); -#endif /* GLX_EXT_visual_rating */ -#ifdef GLX_MESA_agp_offset - CONST_CAST(GLXEW_MESA_agp_offset) = glxewGetExtension("GLX_MESA_agp_offset"); - if (glewExperimental || GLXEW_MESA_agp_offset) CONST_CAST(GLXEW_MESA_agp_offset) = !_glewInit_GLX_MESA_agp_offset(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_agp_offset */ -#ifdef GLX_MESA_copy_sub_buffer - CONST_CAST(GLXEW_MESA_copy_sub_buffer) = glxewGetExtension("GLX_MESA_copy_sub_buffer"); - if (glewExperimental || GLXEW_MESA_copy_sub_buffer) CONST_CAST(GLXEW_MESA_copy_sub_buffer) = !_glewInit_GLX_MESA_copy_sub_buffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_copy_sub_buffer */ -#ifdef GLX_MESA_pixmap_colormap - CONST_CAST(GLXEW_MESA_pixmap_colormap) = glxewGetExtension("GLX_MESA_pixmap_colormap"); - if (glewExperimental || GLXEW_MESA_pixmap_colormap) CONST_CAST(GLXEW_MESA_pixmap_colormap) = !_glewInit_GLX_MESA_pixmap_colormap(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_pixmap_colormap */ -#ifdef GLX_MESA_release_buffers - CONST_CAST(GLXEW_MESA_release_buffers) = glxewGetExtension("GLX_MESA_release_buffers"); - if (glewExperimental || GLXEW_MESA_release_buffers) CONST_CAST(GLXEW_MESA_release_buffers) = !_glewInit_GLX_MESA_release_buffers(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_release_buffers */ -#ifdef GLX_MESA_set_3dfx_mode - CONST_CAST(GLXEW_MESA_set_3dfx_mode) = glxewGetExtension("GLX_MESA_set_3dfx_mode"); - if (glewExperimental || GLXEW_MESA_set_3dfx_mode) CONST_CAST(GLXEW_MESA_set_3dfx_mode) = !_glewInit_GLX_MESA_set_3dfx_mode(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_MESA_set_3dfx_mode */ -#ifdef GLX_NV_float_buffer - CONST_CAST(GLXEW_NV_float_buffer) = glxewGetExtension("GLX_NV_float_buffer"); -#endif /* GLX_NV_float_buffer */ -#ifdef GLX_NV_present_video - CONST_CAST(GLXEW_NV_present_video) = glxewGetExtension("GLX_NV_present_video"); - if (glewExperimental || GLXEW_NV_present_video) CONST_CAST(GLXEW_NV_present_video) = !_glewInit_GLX_NV_present_video(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_NV_present_video */ -#ifdef GLX_NV_swap_group - CONST_CAST(GLXEW_NV_swap_group) = glxewGetExtension("GLX_NV_swap_group"); - if (glewExperimental || GLXEW_NV_swap_group) CONST_CAST(GLXEW_NV_swap_group) = !_glewInit_GLX_NV_swap_group(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_NV_swap_group */ -#ifdef GLX_NV_vertex_array_range - CONST_CAST(GLXEW_NV_vertex_array_range) = glxewGetExtension("GLX_NV_vertex_array_range"); - if (glewExperimental || GLXEW_NV_vertex_array_range) CONST_CAST(GLXEW_NV_vertex_array_range) = !_glewInit_GLX_NV_vertex_array_range(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_NV_vertex_array_range */ -#ifdef GLX_NV_video_output - CONST_CAST(GLXEW_NV_video_output) = glxewGetExtension("GLX_NV_video_output"); - if (glewExperimental || GLXEW_NV_video_output) CONST_CAST(GLXEW_NV_video_output) = !_glewInit_GLX_NV_video_output(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_NV_video_output */ -#ifdef GLX_OML_swap_method - CONST_CAST(GLXEW_OML_swap_method) = glxewGetExtension("GLX_OML_swap_method"); -#endif /* GLX_OML_swap_method */ -#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -#include - CONST_CAST(GLXEW_OML_sync_control) = glxewGetExtension("GLX_OML_sync_control"); - if (glewExperimental || GLXEW_OML_sync_control) CONST_CAST(GLXEW_OML_sync_control) = !_glewInit_GLX_OML_sync_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_OML_sync_control */ -#ifdef GLX_SGIS_blended_overlay - CONST_CAST(GLXEW_SGIS_blended_overlay) = glxewGetExtension("GLX_SGIS_blended_overlay"); -#endif /* GLX_SGIS_blended_overlay */ -#ifdef GLX_SGIS_color_range - CONST_CAST(GLXEW_SGIS_color_range) = glxewGetExtension("GLX_SGIS_color_range"); -#endif /* GLX_SGIS_color_range */ -#ifdef GLX_SGIS_multisample - CONST_CAST(GLXEW_SGIS_multisample) = glxewGetExtension("GLX_SGIS_multisample"); -#endif /* GLX_SGIS_multisample */ -#ifdef GLX_SGIS_shared_multisample - CONST_CAST(GLXEW_SGIS_shared_multisample) = glxewGetExtension("GLX_SGIS_shared_multisample"); -#endif /* GLX_SGIS_shared_multisample */ -#ifdef GLX_SGIX_fbconfig - CONST_CAST(GLXEW_SGIX_fbconfig) = glxewGetExtension("GLX_SGIX_fbconfig"); - if (glewExperimental || GLXEW_SGIX_fbconfig) CONST_CAST(GLXEW_SGIX_fbconfig) = !_glewInit_GLX_SGIX_fbconfig(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_fbconfig */ -#ifdef GLX_SGIX_hyperpipe - CONST_CAST(GLXEW_SGIX_hyperpipe) = glxewGetExtension("GLX_SGIX_hyperpipe"); - if (glewExperimental || GLXEW_SGIX_hyperpipe) CONST_CAST(GLXEW_SGIX_hyperpipe) = !_glewInit_GLX_SGIX_hyperpipe(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_hyperpipe */ -#ifdef GLX_SGIX_pbuffer - CONST_CAST(GLXEW_SGIX_pbuffer) = glxewGetExtension("GLX_SGIX_pbuffer"); - if (glewExperimental || GLXEW_SGIX_pbuffer) CONST_CAST(GLXEW_SGIX_pbuffer) = !_glewInit_GLX_SGIX_pbuffer(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_pbuffer */ -#ifdef GLX_SGIX_swap_barrier - CONST_CAST(GLXEW_SGIX_swap_barrier) = glxewGetExtension("GLX_SGIX_swap_barrier"); - if (glewExperimental || GLXEW_SGIX_swap_barrier) CONST_CAST(GLXEW_SGIX_swap_barrier) = !_glewInit_GLX_SGIX_swap_barrier(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_swap_barrier */ -#ifdef GLX_SGIX_swap_group - CONST_CAST(GLXEW_SGIX_swap_group) = glxewGetExtension("GLX_SGIX_swap_group"); - if (glewExperimental || GLXEW_SGIX_swap_group) CONST_CAST(GLXEW_SGIX_swap_group) = !_glewInit_GLX_SGIX_swap_group(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_swap_group */ -#ifdef GLX_SGIX_video_resize - CONST_CAST(GLXEW_SGIX_video_resize) = glxewGetExtension("GLX_SGIX_video_resize"); - if (glewExperimental || GLXEW_SGIX_video_resize) CONST_CAST(GLXEW_SGIX_video_resize) = !_glewInit_GLX_SGIX_video_resize(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGIX_video_resize */ -#ifdef GLX_SGIX_visual_select_group - CONST_CAST(GLXEW_SGIX_visual_select_group) = glxewGetExtension("GLX_SGIX_visual_select_group"); -#endif /* GLX_SGIX_visual_select_group */ -#ifdef GLX_SGI_cushion - CONST_CAST(GLXEW_SGI_cushion) = glxewGetExtension("GLX_SGI_cushion"); - if (glewExperimental || GLXEW_SGI_cushion) CONST_CAST(GLXEW_SGI_cushion) = !_glewInit_GLX_SGI_cushion(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGI_cushion */ -#ifdef GLX_SGI_make_current_read - CONST_CAST(GLXEW_SGI_make_current_read) = glxewGetExtension("GLX_SGI_make_current_read"); - if (glewExperimental || GLXEW_SGI_make_current_read) CONST_CAST(GLXEW_SGI_make_current_read) = !_glewInit_GLX_SGI_make_current_read(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGI_make_current_read */ -#ifdef GLX_SGI_swap_control - CONST_CAST(GLXEW_SGI_swap_control) = glxewGetExtension("GLX_SGI_swap_control"); - if (glewExperimental || GLXEW_SGI_swap_control) CONST_CAST(GLXEW_SGI_swap_control) = !_glewInit_GLX_SGI_swap_control(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGI_swap_control */ -#ifdef GLX_SGI_video_sync - CONST_CAST(GLXEW_SGI_video_sync) = glxewGetExtension("GLX_SGI_video_sync"); - if (glewExperimental || GLXEW_SGI_video_sync) CONST_CAST(GLXEW_SGI_video_sync) = !_glewInit_GLX_SGI_video_sync(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SGI_video_sync */ -#ifdef GLX_SUN_get_transparent_index - CONST_CAST(GLXEW_SUN_get_transparent_index) = glxewGetExtension("GLX_SUN_get_transparent_index"); - if (glewExperimental || GLXEW_SUN_get_transparent_index) CONST_CAST(GLXEW_SUN_get_transparent_index) = !_glewInit_GLX_SUN_get_transparent_index(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SUN_get_transparent_index */ -#ifdef GLX_SUN_video_resize - CONST_CAST(GLXEW_SUN_video_resize) = glxewGetExtension("GLX_SUN_video_resize"); - if (glewExperimental || GLXEW_SUN_video_resize) CONST_CAST(GLXEW_SUN_video_resize) = !_glewInit_GLX_SUN_video_resize(GLEW_CONTEXT_ARG_VAR_INIT); -#endif /* GLX_SUN_video_resize */ - - return GLEW_OK; -} - -#endif /* !__APPLE__ || GLEW_APPLE_GLX */ - -/* ------------------------------------------------------------------------ */ - -const GLubyte* glewGetErrorString (GLenum error) -{ - static const GLubyte* _glewErrorString[] = - { - (const GLubyte*)"No error", - (const GLubyte*)"Missing GL version", - (const GLubyte*)"GL 1.1 and up are not supported", - (const GLubyte*)"GLX 1.2 and up are not supported", - (const GLubyte*)"Unknown error" - }; - const int max_error = sizeof(_glewErrorString)/sizeof(*_glewErrorString) - 1; - return _glewErrorString[(int)error > max_error ? max_error : (int)error]; -} - -const GLubyte* glewGetString (GLenum name) -{ - static const GLubyte* _glewString[] = - { - (const GLubyte*)NULL, - (const GLubyte*)"1.5.1", - (const GLubyte*)"1", - (const GLubyte*)"5", - (const GLubyte*)"1" - }; - const int max_string = sizeof(_glewString)/sizeof(*_glewString) - 1; - return _glewString[(int)name > max_string ? 0 : (int)name]; -} - -/* ------------------------------------------------------------------------ */ - -GLboolean glewExperimental = GL_FALSE; - -#if !defined(GLEW_MX) - -#if defined(_WIN32) -extern GLenum wglewContextInit (void); -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */ -extern GLenum glxewContextInit (void); -#endif /* _WIN32 */ - -GLenum glewInit () -{ - GLenum r; - if ( (r = glewContextInit())!=NULL ) return r; -#if defined(_WIN32) - return wglewContextInit(); -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) /* _UNIX */ - return glxewContextInit(); -#else - return r; -#endif /* _WIN32 */ -} - -#endif /* !GLEW_MX */ -#ifdef GLEW_MX -GLboolean glewContextIsSupported (GLEWContext* ctx, const char* name) -#else -GLboolean glewIsSupported (const char* name) -#endif -{ - GLubyte* pos = (GLubyte*)name; - GLuint len = _glewStrLen(pos); - GLboolean ret = GL_TRUE; - while (ret && len > 0) - { - if (_glewStrSame1(&pos, &len, (const GLubyte*)"GL_", 3)) - { - if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8)) - { -#ifdef GL_VERSION_1_2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3)) - { - ret = GLEW_VERSION_1_2; - continue; - } -#endif -#ifdef GL_VERSION_1_3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3)) - { - ret = GLEW_VERSION_1_3; - continue; - } -#endif -#ifdef GL_VERSION_1_4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3)) - { - ret = GLEW_VERSION_1_4; - continue; - } -#endif -#ifdef GL_VERSION_1_5 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_5", 3)) - { - ret = GLEW_VERSION_1_5; - continue; - } -#endif -#ifdef GL_VERSION_2_0 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"2_0", 3)) - { - ret = GLEW_VERSION_2_0; - continue; - } -#endif -#ifdef GL_VERSION_2_1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"2_1", 3)) - { - ret = GLEW_VERSION_2_1; - continue; - } -#endif -#ifdef GL_VERSION_3_0 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"3_0", 3)) - { - ret = GLEW_VERSION_3_0; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5)) - { -#ifdef GL_3DFX_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLEW_3DFX_multisample; - continue; - } -#endif -#ifdef GL_3DFX_tbuffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"tbuffer", 7)) - { - ret = GLEW_3DFX_tbuffer; - continue; - } -#endif -#ifdef GL_3DFX_texture_compression_FXT1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_FXT1", 24)) - { - ret = GLEW_3DFX_texture_compression_FXT1; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"APPLE_", 6)) - { -#ifdef GL_APPLE_client_storage - if (_glewStrSame3(&pos, &len, (const GLubyte*)"client_storage", 14)) - { - ret = GLEW_APPLE_client_storage; - continue; - } -#endif -#ifdef GL_APPLE_element_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13)) - { - ret = GLEW_APPLE_element_array; - continue; - } -#endif -#ifdef GL_APPLE_fence - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5)) - { - ret = GLEW_APPLE_fence; - continue; - } -#endif -#ifdef GL_APPLE_float_pixels - if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_pixels", 12)) - { - ret = GLEW_APPLE_float_pixels; - continue; - } -#endif -#ifdef GL_APPLE_flush_buffer_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"flush_buffer_range", 18)) - { - ret = GLEW_APPLE_flush_buffer_range; - continue; - } -#endif -#ifdef GL_APPLE_pixel_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer", 12)) - { - ret = GLEW_APPLE_pixel_buffer; - continue; - } -#endif -#ifdef GL_APPLE_specular_vector - if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_vector", 15)) - { - ret = GLEW_APPLE_specular_vector; - continue; - } -#endif -#ifdef GL_APPLE_texture_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13)) - { - ret = GLEW_APPLE_texture_range; - continue; - } -#endif -#ifdef GL_APPLE_transform_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_hint", 14)) - { - ret = GLEW_APPLE_transform_hint; - continue; - } -#endif -#ifdef GL_APPLE_vertex_array_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19)) - { - ret = GLEW_APPLE_vertex_array_object; - continue; - } -#endif -#ifdef GL_APPLE_vertex_array_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18)) - { - ret = GLEW_APPLE_vertex_array_range; - continue; - } -#endif -#ifdef GL_APPLE_ycbcr_422 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_422", 9)) - { - ret = GLEW_APPLE_ycbcr_422; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4)) - { -#ifdef GL_ARB_color_buffer_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_buffer_float", 18)) - { - ret = GLEW_ARB_color_buffer_float; - continue; - } -#endif -#ifdef GL_ARB_depth_buffer_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_buffer_float", 18)) - { - ret = GLEW_ARB_depth_buffer_float; - continue; - } -#endif -#ifdef GL_ARB_depth_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13)) - { - ret = GLEW_ARB_depth_texture; - continue; - } -#endif -#ifdef GL_ARB_draw_buffers - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12)) - { - ret = GLEW_ARB_draw_buffers; - continue; - } -#endif -#ifdef GL_ARB_draw_instanced - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_instanced", 14)) - { - ret = GLEW_ARB_draw_instanced; - continue; - } -#endif -#ifdef GL_ARB_fragment_program - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16)) - { - ret = GLEW_ARB_fragment_program; - continue; - } -#endif -#ifdef GL_ARB_fragment_program_shadow - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_shadow", 23)) - { - ret = GLEW_ARB_fragment_program_shadow; - continue; - } -#endif -#ifdef GL_ARB_fragment_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15)) - { - ret = GLEW_ARB_fragment_shader; - continue; - } -#endif -#ifdef GL_ARB_framebuffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_object", 18)) - { - ret = GLEW_ARB_framebuffer_object; - continue; - } -#endif -#ifdef GL_ARB_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = GLEW_ARB_framebuffer_sRGB; - continue; - } -#endif -#ifdef GL_ARB_geometry_shader4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16)) - { - ret = GLEW_ARB_geometry_shader4; - continue; - } -#endif -#ifdef GL_ARB_half_float_pixel - if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float_pixel", 16)) - { - ret = GLEW_ARB_half_float_pixel; - continue; - } -#endif -#ifdef GL_ARB_half_float_vertex - if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float_vertex", 17)) - { - ret = GLEW_ARB_half_float_vertex; - continue; - } -#endif -#ifdef GL_ARB_imaging - if (_glewStrSame3(&pos, &len, (const GLubyte*)"imaging", 7)) - { - ret = GLEW_ARB_imaging; - continue; - } -#endif -#ifdef GL_ARB_instanced_arrays - if (_glewStrSame3(&pos, &len, (const GLubyte*)"instanced_arrays", 16)) - { - ret = GLEW_ARB_instanced_arrays; - continue; - } -#endif -#ifdef GL_ARB_map_buffer_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_buffer_range", 16)) - { - ret = GLEW_ARB_map_buffer_range; - continue; - } -#endif -#ifdef GL_ARB_matrix_palette - if (_glewStrSame3(&pos, &len, (const GLubyte*)"matrix_palette", 14)) - { - ret = GLEW_ARB_matrix_palette; - continue; - } -#endif -#ifdef GL_ARB_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLEW_ARB_multisample; - continue; - } -#endif -#ifdef GL_ARB_multitexture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multitexture", 12)) - { - ret = GLEW_ARB_multitexture; - continue; - } -#endif -#ifdef GL_ARB_occlusion_query - if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15)) - { - ret = GLEW_ARB_occlusion_query; - continue; - } -#endif -#ifdef GL_ARB_pixel_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19)) - { - ret = GLEW_ARB_pixel_buffer_object; - continue; - } -#endif -#ifdef GL_ARB_point_parameters - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16)) - { - ret = GLEW_ARB_point_parameters; - continue; - } -#endif -#ifdef GL_ARB_point_sprite - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12)) - { - ret = GLEW_ARB_point_sprite; - continue; - } -#endif -#ifdef GL_ARB_shader_objects - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_objects", 14)) - { - ret = GLEW_ARB_shader_objects; - continue; - } -#endif -#ifdef GL_ARB_shading_language_100 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shading_language_100", 20)) - { - ret = GLEW_ARB_shading_language_100; - continue; - } -#endif -#ifdef GL_ARB_shadow - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6)) - { - ret = GLEW_ARB_shadow; - continue; - } -#endif -#ifdef GL_ARB_shadow_ambient - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14)) - { - ret = GLEW_ARB_shadow_ambient; - continue; - } -#endif -#ifdef GL_ARB_texture_border_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20)) - { - ret = GLEW_ARB_texture_border_clamp; - continue; - } -#endif -#ifdef GL_ARB_texture_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object", 21)) - { - ret = GLEW_ARB_texture_buffer_object; - continue; - } -#endif -#ifdef GL_ARB_texture_compression - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression", 19)) - { - ret = GLEW_ARB_texture_compression; - continue; - } -#endif -#ifdef GL_ARB_texture_compression_rgtc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_rgtc", 24)) - { - ret = GLEW_ARB_texture_compression_rgtc; - continue; - } -#endif -#ifdef GL_ARB_texture_cube_map - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16)) - { - ret = GLEW_ARB_texture_cube_map; - continue; - } -#endif -#ifdef GL_ARB_texture_env_add - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15)) - { - ret = GLEW_ARB_texture_env_add; - continue; - } -#endif -#ifdef GL_ARB_texture_env_combine - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19)) - { - ret = GLEW_ARB_texture_env_combine; - continue; - } -#endif -#ifdef GL_ARB_texture_env_crossbar - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_crossbar", 20)) - { - ret = GLEW_ARB_texture_env_crossbar; - continue; - } -#endif -#ifdef GL_ARB_texture_env_dot3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16)) - { - ret = GLEW_ARB_texture_env_dot3; - continue; - } -#endif -#ifdef GL_ARB_texture_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13)) - { - ret = GLEW_ARB_texture_float; - continue; - } -#endif -#ifdef GL_ARB_texture_mirrored_repeat - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23)) - { - ret = GLEW_ARB_texture_mirrored_repeat; - continue; - } -#endif -#ifdef GL_ARB_texture_non_power_of_two - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_non_power_of_two", 24)) - { - ret = GLEW_ARB_texture_non_power_of_two; - continue; - } -#endif -#ifdef GL_ARB_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17)) - { - ret = GLEW_ARB_texture_rectangle; - continue; - } -#endif -#ifdef GL_ARB_texture_rg - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rg", 10)) - { - ret = GLEW_ARB_texture_rg; - continue; - } -#endif -#ifdef GL_ARB_transpose_matrix - if (_glewStrSame3(&pos, &len, (const GLubyte*)"transpose_matrix", 16)) - { - ret = GLEW_ARB_transpose_matrix; - continue; - } -#endif -#ifdef GL_ARB_vertex_array_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19)) - { - ret = GLEW_ARB_vertex_array_object; - continue; - } -#endif -#ifdef GL_ARB_vertex_blend - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_blend", 12)) - { - ret = GLEW_ARB_vertex_blend; - continue; - } -#endif -#ifdef GL_ARB_vertex_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_buffer_object", 20)) - { - ret = GLEW_ARB_vertex_buffer_object; - continue; - } -#endif -#ifdef GL_ARB_vertex_program - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14)) - { - ret = GLEW_ARB_vertex_program; - continue; - } -#endif -#ifdef GL_ARB_vertex_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13)) - { - ret = GLEW_ARB_vertex_shader; - continue; - } -#endif -#ifdef GL_ARB_window_pos - if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10)) - { - ret = GLEW_ARB_window_pos; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATIX_", 5)) - { -#ifdef GL_ATIX_point_sprites - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprites", 13)) - { - ret = GLEW_ATIX_point_sprites; - continue; - } -#endif -#ifdef GL_ATIX_texture_env_combine3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20)) - { - ret = GLEW_ATIX_texture_env_combine3; - continue; - } -#endif -#ifdef GL_ATIX_texture_env_route - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_route", 17)) - { - ret = GLEW_ATIX_texture_env_route; - continue; - } -#endif -#ifdef GL_ATIX_vertex_shader_output_point_size - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader_output_point_size", 31)) - { - ret = GLEW_ATIX_vertex_shader_output_point_size; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4)) - { -#ifdef GL_ATI_draw_buffers - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers", 12)) - { - ret = GLEW_ATI_draw_buffers; - continue; - } -#endif -#ifdef GL_ATI_element_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"element_array", 13)) - { - ret = GLEW_ATI_element_array; - continue; - } -#endif -#ifdef GL_ATI_envmap_bumpmap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"envmap_bumpmap", 14)) - { - ret = GLEW_ATI_envmap_bumpmap; - continue; - } -#endif -#ifdef GL_ATI_fragment_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_shader", 15)) - { - ret = GLEW_ATI_fragment_shader; - continue; - } -#endif -#ifdef GL_ATI_map_object_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"map_object_buffer", 17)) - { - ret = GLEW_ATI_map_object_buffer; - continue; - } -#endif -#ifdef GL_ATI_pn_triangles - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pn_triangles", 12)) - { - ret = GLEW_ATI_pn_triangles; - continue; - } -#endif -#ifdef GL_ATI_separate_stencil - if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_stencil", 16)) - { - ret = GLEW_ATI_separate_stencil; - continue; - } -#endif -#ifdef GL_ATI_shader_texture_lod - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shader_texture_lod", 18)) - { - ret = GLEW_ATI_shader_texture_lod; - continue; - } -#endif -#ifdef GL_ATI_text_fragment_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"text_fragment_shader", 20)) - { - ret = GLEW_ATI_text_fragment_shader; - continue; - } -#endif -#ifdef GL_ATI_texture_compression_3dc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_3dc", 23)) - { - ret = GLEW_ATI_texture_compression_3dc; - continue; - } -#endif -#ifdef GL_ATI_texture_env_combine3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine3", 20)) - { - ret = GLEW_ATI_texture_env_combine3; - continue; - } -#endif -#ifdef GL_ATI_texture_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_float", 13)) - { - ret = GLEW_ATI_texture_float; - continue; - } -#endif -#ifdef GL_ATI_texture_mirror_once - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_once", 19)) - { - ret = GLEW_ATI_texture_mirror_once; - continue; - } -#endif -#ifdef GL_ATI_vertex_array_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_object", 19)) - { - ret = GLEW_ATI_vertex_array_object; - continue; - } -#endif -#ifdef GL_ATI_vertex_attrib_array_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_attrib_array_object", 26)) - { - ret = GLEW_ATI_vertex_attrib_array_object; - continue; - } -#endif -#ifdef GL_ATI_vertex_streams - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_streams", 14)) - { - ret = GLEW_ATI_vertex_streams; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4)) - { -#ifdef GL_EXT_422_pixels - if (_glewStrSame3(&pos, &len, (const GLubyte*)"422_pixels", 10)) - { - ret = GLEW_EXT_422_pixels; - continue; - } -#endif -#ifdef GL_EXT_Cg_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"Cg_shader", 9)) - { - ret = GLEW_EXT_Cg_shader; - continue; - } -#endif -#ifdef GL_EXT_abgr - if (_glewStrSame3(&pos, &len, (const GLubyte*)"abgr", 4)) - { - ret = GLEW_EXT_abgr; - continue; - } -#endif -#ifdef GL_EXT_bgra - if (_glewStrSame3(&pos, &len, (const GLubyte*)"bgra", 4)) - { - ret = GLEW_EXT_bgra; - continue; - } -#endif -#ifdef GL_EXT_bindable_uniform - if (_glewStrSame3(&pos, &len, (const GLubyte*)"bindable_uniform", 16)) - { - ret = GLEW_EXT_bindable_uniform; - continue; - } -#endif -#ifdef GL_EXT_blend_color - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_color", 11)) - { - ret = GLEW_EXT_blend_color; - continue; - } -#endif -#ifdef GL_EXT_blend_equation_separate - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_equation_separate", 23)) - { - ret = GLEW_EXT_blend_equation_separate; - continue; - } -#endif -#ifdef GL_EXT_blend_func_separate - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_func_separate", 19)) - { - ret = GLEW_EXT_blend_func_separate; - continue; - } -#endif -#ifdef GL_EXT_blend_logic_op - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_logic_op", 14)) - { - ret = GLEW_EXT_blend_logic_op; - continue; - } -#endif -#ifdef GL_EXT_blend_minmax - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_minmax", 12)) - { - ret = GLEW_EXT_blend_minmax; - continue; - } -#endif -#ifdef GL_EXT_blend_subtract - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_subtract", 14)) - { - ret = GLEW_EXT_blend_subtract; - continue; - } -#endif -#ifdef GL_EXT_clip_volume_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"clip_volume_hint", 16)) - { - ret = GLEW_EXT_clip_volume_hint; - continue; - } -#endif -#ifdef GL_EXT_cmyka - if (_glewStrSame3(&pos, &len, (const GLubyte*)"cmyka", 5)) - { - ret = GLEW_EXT_cmyka; - continue; - } -#endif -#ifdef GL_EXT_color_subtable - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_subtable", 14)) - { - ret = GLEW_EXT_color_subtable; - continue; - } -#endif -#ifdef GL_EXT_compiled_vertex_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"compiled_vertex_array", 21)) - { - ret = GLEW_EXT_compiled_vertex_array; - continue; - } -#endif -#ifdef GL_EXT_convolution - if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution", 11)) - { - ret = GLEW_EXT_convolution; - continue; - } -#endif -#ifdef GL_EXT_coordinate_frame - if (_glewStrSame3(&pos, &len, (const GLubyte*)"coordinate_frame", 16)) - { - ret = GLEW_EXT_coordinate_frame; - continue; - } -#endif -#ifdef GL_EXT_copy_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_texture", 12)) - { - ret = GLEW_EXT_copy_texture; - continue; - } -#endif -#ifdef GL_EXT_cull_vertex - if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11)) - { - ret = GLEW_EXT_cull_vertex; - continue; - } -#endif -#ifdef GL_EXT_depth_bounds_test - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_bounds_test", 17)) - { - ret = GLEW_EXT_depth_bounds_test; - continue; - } -#endif -#ifdef GL_EXT_direct_state_access - if (_glewStrSame3(&pos, &len, (const GLubyte*)"direct_state_access", 19)) - { - ret = GLEW_EXT_direct_state_access; - continue; - } -#endif -#ifdef GL_EXT_draw_buffers2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_buffers2", 13)) - { - ret = GLEW_EXT_draw_buffers2; - continue; - } -#endif -#ifdef GL_EXT_draw_instanced - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_instanced", 14)) - { - ret = GLEW_EXT_draw_instanced; - continue; - } -#endif -#ifdef GL_EXT_draw_range_elements - if (_glewStrSame3(&pos, &len, (const GLubyte*)"draw_range_elements", 19)) - { - ret = GLEW_EXT_draw_range_elements; - continue; - } -#endif -#ifdef GL_EXT_fog_coord - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_coord", 9)) - { - ret = GLEW_EXT_fog_coord; - continue; - } -#endif -#ifdef GL_EXT_fragment_lighting - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_lighting", 17)) - { - ret = GLEW_EXT_fragment_lighting; - continue; - } -#endif -#ifdef GL_EXT_framebuffer_blit - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_blit", 16)) - { - ret = GLEW_EXT_framebuffer_blit; - continue; - } -#endif -#ifdef GL_EXT_framebuffer_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample", 23)) - { - ret = GLEW_EXT_framebuffer_multisample; - continue; - } -#endif -#ifdef GL_EXT_framebuffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_object", 18)) - { - ret = GLEW_EXT_framebuffer_object; - continue; - } -#endif -#ifdef GL_EXT_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = GLEW_EXT_framebuffer_sRGB; - continue; - } -#endif -#ifdef GL_EXT_geometry_shader4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16)) - { - ret = GLEW_EXT_geometry_shader4; - continue; - } -#endif -#ifdef GL_EXT_gpu_program_parameters - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program_parameters", 22)) - { - ret = GLEW_EXT_gpu_program_parameters; - continue; - } -#endif -#ifdef GL_EXT_gpu_shader4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_shader4", 11)) - { - ret = GLEW_EXT_gpu_shader4; - continue; - } -#endif -#ifdef GL_EXT_histogram - if (_glewStrSame3(&pos, &len, (const GLubyte*)"histogram", 9)) - { - ret = GLEW_EXT_histogram; - continue; - } -#endif -#ifdef GL_EXT_index_array_formats - if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_array_formats", 19)) - { - ret = GLEW_EXT_index_array_formats; - continue; - } -#endif -#ifdef GL_EXT_index_func - if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_func", 10)) - { - ret = GLEW_EXT_index_func; - continue; - } -#endif -#ifdef GL_EXT_index_material - if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_material", 14)) - { - ret = GLEW_EXT_index_material; - continue; - } -#endif -#ifdef GL_EXT_index_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"index_texture", 13)) - { - ret = GLEW_EXT_index_texture; - continue; - } -#endif -#ifdef GL_EXT_light_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_texture", 13)) - { - ret = GLEW_EXT_light_texture; - continue; - } -#endif -#ifdef GL_EXT_misc_attribute - if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_attribute", 14)) - { - ret = GLEW_EXT_misc_attribute; - continue; - } -#endif -#ifdef GL_EXT_multi_draw_arrays - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multi_draw_arrays", 17)) - { - ret = GLEW_EXT_multi_draw_arrays; - continue; - } -#endif -#ifdef GL_EXT_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLEW_EXT_multisample; - continue; - } -#endif -#ifdef GL_EXT_packed_depth_stencil - if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20)) - { - ret = GLEW_EXT_packed_depth_stencil; - continue; - } -#endif -#ifdef GL_EXT_packed_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_float", 12)) - { - ret = GLEW_EXT_packed_float; - continue; - } -#endif -#ifdef GL_EXT_packed_pixels - if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_pixels", 13)) - { - ret = GLEW_EXT_packed_pixels; - continue; - } -#endif -#ifdef GL_EXT_paletted_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"paletted_texture", 16)) - { - ret = GLEW_EXT_paletted_texture; - continue; - } -#endif -#ifdef GL_EXT_pixel_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_buffer_object", 19)) - { - ret = GLEW_EXT_pixel_buffer_object; - continue; - } -#endif -#ifdef GL_EXT_pixel_transform - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform", 15)) - { - ret = GLEW_EXT_pixel_transform; - continue; - } -#endif -#ifdef GL_EXT_pixel_transform_color_table - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_transform_color_table", 27)) - { - ret = GLEW_EXT_pixel_transform_color_table; - continue; - } -#endif -#ifdef GL_EXT_point_parameters - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_parameters", 16)) - { - ret = GLEW_EXT_point_parameters; - continue; - } -#endif -#ifdef GL_EXT_polygon_offset - if (_glewStrSame3(&pos, &len, (const GLubyte*)"polygon_offset", 14)) - { - ret = GLEW_EXT_polygon_offset; - continue; - } -#endif -#ifdef GL_EXT_rescale_normal - if (_glewStrSame3(&pos, &len, (const GLubyte*)"rescale_normal", 14)) - { - ret = GLEW_EXT_rescale_normal; - continue; - } -#endif -#ifdef GL_EXT_scene_marker - if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12)) - { - ret = GLEW_EXT_scene_marker; - continue; - } -#endif -#ifdef GL_EXT_secondary_color - if (_glewStrSame3(&pos, &len, (const GLubyte*)"secondary_color", 15)) - { - ret = GLEW_EXT_secondary_color; - continue; - } -#endif -#ifdef GL_EXT_separate_specular_color - if (_glewStrSame3(&pos, &len, (const GLubyte*)"separate_specular_color", 23)) - { - ret = GLEW_EXT_separate_specular_color; - continue; - } -#endif -#ifdef GL_EXT_shadow_funcs - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_funcs", 12)) - { - ret = GLEW_EXT_shadow_funcs; - continue; - } -#endif -#ifdef GL_EXT_shared_texture_palette - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_texture_palette", 22)) - { - ret = GLEW_EXT_shared_texture_palette; - continue; - } -#endif -#ifdef GL_EXT_stencil_clear_tag - if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_clear_tag", 17)) - { - ret = GLEW_EXT_stencil_clear_tag; - continue; - } -#endif -#ifdef GL_EXT_stencil_two_side - if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_two_side", 16)) - { - ret = GLEW_EXT_stencil_two_side; - continue; - } -#endif -#ifdef GL_EXT_stencil_wrap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"stencil_wrap", 12)) - { - ret = GLEW_EXT_stencil_wrap; - continue; - } -#endif -#ifdef GL_EXT_subtexture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"subtexture", 10)) - { - ret = GLEW_EXT_subtexture; - continue; - } -#endif -#ifdef GL_EXT_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture", 7)) - { - ret = GLEW_EXT_texture; - continue; - } -#endif -#ifdef GL_EXT_texture3D - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture3D", 9)) - { - ret = GLEW_EXT_texture3D; - continue; - } -#endif -#ifdef GL_EXT_texture_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_array", 13)) - { - ret = GLEW_EXT_texture_array; - continue; - } -#endif -#ifdef GL_EXT_texture_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_buffer_object", 21)) - { - ret = GLEW_EXT_texture_buffer_object; - continue; - } -#endif -#ifdef GL_EXT_texture_compression_dxt1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_dxt1", 24)) - { - ret = GLEW_EXT_texture_compression_dxt1; - continue; - } -#endif -#ifdef GL_EXT_texture_compression_latc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_latc", 24)) - { - ret = GLEW_EXT_texture_compression_latc; - continue; - } -#endif -#ifdef GL_EXT_texture_compression_rgtc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_rgtc", 24)) - { - ret = GLEW_EXT_texture_compression_rgtc; - continue; - } -#endif -#ifdef GL_EXT_texture_compression_s3tc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_s3tc", 24)) - { - ret = GLEW_EXT_texture_compression_s3tc; - continue; - } -#endif -#ifdef GL_EXT_texture_cube_map - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_cube_map", 16)) - { - ret = GLEW_EXT_texture_cube_map; - continue; - } -#endif -#ifdef GL_EXT_texture_edge_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18)) - { - ret = GLEW_EXT_texture_edge_clamp; - continue; - } -#endif -#ifdef GL_EXT_texture_env - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env", 11)) - { - ret = GLEW_EXT_texture_env; - continue; - } -#endif -#ifdef GL_EXT_texture_env_add - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_add", 15)) - { - ret = GLEW_EXT_texture_env_add; - continue; - } -#endif -#ifdef GL_EXT_texture_env_combine - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine", 19)) - { - ret = GLEW_EXT_texture_env_combine; - continue; - } -#endif -#ifdef GL_EXT_texture_env_dot3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_dot3", 16)) - { - ret = GLEW_EXT_texture_env_dot3; - continue; - } -#endif -#ifdef GL_EXT_texture_filter_anisotropic - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter_anisotropic", 26)) - { - ret = GLEW_EXT_texture_filter_anisotropic; - continue; - } -#endif -#ifdef GL_EXT_texture_integer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_integer", 15)) - { - ret = GLEW_EXT_texture_integer; - continue; - } -#endif -#ifdef GL_EXT_texture_lod_bias - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16)) - { - ret = GLEW_EXT_texture_lod_bias; - continue; - } -#endif -#ifdef GL_EXT_texture_mirror_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirror_clamp", 20)) - { - ret = GLEW_EXT_texture_mirror_clamp; - continue; - } -#endif -#ifdef GL_EXT_texture_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_object", 14)) - { - ret = GLEW_EXT_texture_object; - continue; - } -#endif -#ifdef GL_EXT_texture_perturb_normal - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_perturb_normal", 22)) - { - ret = GLEW_EXT_texture_perturb_normal; - continue; - } -#endif -#ifdef GL_EXT_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17)) - { - ret = GLEW_EXT_texture_rectangle; - continue; - } -#endif -#ifdef GL_EXT_texture_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_sRGB", 12)) - { - ret = GLEW_EXT_texture_sRGB; - continue; - } -#endif -#ifdef GL_EXT_texture_shared_exponent - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shared_exponent", 23)) - { - ret = GLEW_EXT_texture_shared_exponent; - continue; - } -#endif -#ifdef GL_EXT_texture_swizzle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_swizzle", 15)) - { - ret = GLEW_EXT_texture_swizzle; - continue; - } -#endif -#ifdef GL_EXT_timer_query - if (_glewStrSame3(&pos, &len, (const GLubyte*)"timer_query", 11)) - { - ret = GLEW_EXT_timer_query; - continue; - } -#endif -#ifdef GL_EXT_transform_feedback - if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback", 18)) - { - ret = GLEW_EXT_transform_feedback; - continue; - } -#endif -#ifdef GL_EXT_vertex_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array", 12)) - { - ret = GLEW_EXT_vertex_array; - continue; - } -#endif -#ifdef GL_EXT_vertex_array_bgra - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_bgra", 17)) - { - ret = GLEW_EXT_vertex_array_bgra; - continue; - } -#endif -#ifdef GL_EXT_vertex_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_shader", 13)) - { - ret = GLEW_EXT_vertex_shader; - continue; - } -#endif -#ifdef GL_EXT_vertex_weighting - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_weighting", 16)) - { - ret = GLEW_EXT_vertex_weighting; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"GREMEDY_", 8)) - { -#ifdef GL_GREMEDY_frame_terminator - if (_glewStrSame3(&pos, &len, (const GLubyte*)"frame_terminator", 16)) - { - ret = GLEW_GREMEDY_frame_terminator; - continue; - } -#endif -#ifdef GL_GREMEDY_string_marker - if (_glewStrSame3(&pos, &len, (const GLubyte*)"string_marker", 13)) - { - ret = GLEW_GREMEDY_string_marker; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"HP_", 3)) - { -#ifdef GL_HP_convolution_border_modes - if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24)) - { - ret = GLEW_HP_convolution_border_modes; - continue; - } -#endif -#ifdef GL_HP_image_transform - if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_transform", 15)) - { - ret = GLEW_HP_image_transform; - continue; - } -#endif -#ifdef GL_HP_occlusion_test - if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_test", 14)) - { - ret = GLEW_HP_occlusion_test; - continue; - } -#endif -#ifdef GL_HP_texture_lighting - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lighting", 16)) - { - ret = GLEW_HP_texture_lighting; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"IBM_", 4)) - { -#ifdef GL_IBM_cull_vertex - if (_glewStrSame3(&pos, &len, (const GLubyte*)"cull_vertex", 11)) - { - ret = GLEW_IBM_cull_vertex; - continue; - } -#endif -#ifdef GL_IBM_multimode_draw_arrays - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multimode_draw_arrays", 21)) - { - ret = GLEW_IBM_multimode_draw_arrays; - continue; - } -#endif -#ifdef GL_IBM_rasterpos_clip - if (_glewStrSame3(&pos, &len, (const GLubyte*)"rasterpos_clip", 14)) - { - ret = GLEW_IBM_rasterpos_clip; - continue; - } -#endif -#ifdef GL_IBM_static_data - if (_glewStrSame3(&pos, &len, (const GLubyte*)"static_data", 11)) - { - ret = GLEW_IBM_static_data; - continue; - } -#endif -#ifdef GL_IBM_texture_mirrored_repeat - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_mirrored_repeat", 23)) - { - ret = GLEW_IBM_texture_mirrored_repeat; - continue; - } -#endif -#ifdef GL_IBM_vertex_array_lists - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_lists", 18)) - { - ret = GLEW_IBM_vertex_array_lists; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"INGR_", 5)) - { -#ifdef GL_INGR_color_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_clamp", 11)) - { - ret = GLEW_INGR_color_clamp; - continue; - } -#endif -#ifdef GL_INGR_interlace_read - if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace_read", 14)) - { - ret = GLEW_INGR_interlace_read; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"INTEL_", 6)) - { -#ifdef GL_INTEL_parallel_arrays - if (_glewStrSame3(&pos, &len, (const GLubyte*)"parallel_arrays", 15)) - { - ret = GLEW_INTEL_parallel_arrays; - continue; - } -#endif -#ifdef GL_INTEL_texture_scissor - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scissor", 15)) - { - ret = GLEW_INTEL_texture_scissor; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"KTX_", 4)) - { -#ifdef GL_KTX_buffer_region - if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13)) - { - ret = GLEW_KTX_buffer_region; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESAX_", 6)) - { -#ifdef GL_MESAX_texture_stack - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_stack", 13)) - { - ret = GLEW_MESAX_texture_stack; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5)) - { -#ifdef GL_MESA_pack_invert - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pack_invert", 11)) - { - ret = GLEW_MESA_pack_invert; - continue; - } -#endif -#ifdef GL_MESA_resize_buffers - if (_glewStrSame3(&pos, &len, (const GLubyte*)"resize_buffers", 14)) - { - ret = GLEW_MESA_resize_buffers; - continue; - } -#endif -#ifdef GL_MESA_window_pos - if (_glewStrSame3(&pos, &len, (const GLubyte*)"window_pos", 10)) - { - ret = GLEW_MESA_window_pos; - continue; - } -#endif -#ifdef GL_MESA_ycbcr_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycbcr_texture", 13)) - { - ret = GLEW_MESA_ycbcr_texture; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3)) - { -#ifdef GL_NV_blend_square - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_square", 12)) - { - ret = GLEW_NV_blend_square; - continue; - } -#endif -#ifdef GL_NV_conditional_render - if (_glewStrSame3(&pos, &len, (const GLubyte*)"conditional_render", 18)) - { - ret = GLEW_NV_conditional_render; - continue; - } -#endif -#ifdef GL_NV_copy_depth_to_color - if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_depth_to_color", 19)) - { - ret = GLEW_NV_copy_depth_to_color; - continue; - } -#endif -#ifdef GL_NV_depth_buffer_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_buffer_float", 18)) - { - ret = GLEW_NV_depth_buffer_float; - continue; - } -#endif -#ifdef GL_NV_depth_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_clamp", 11)) - { - ret = GLEW_NV_depth_clamp; - continue; - } -#endif -#ifdef GL_NV_depth_range_unclamped - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_range_unclamped", 21)) - { - ret = GLEW_NV_depth_range_unclamped; - continue; - } -#endif -#ifdef GL_NV_evaluators - if (_glewStrSame3(&pos, &len, (const GLubyte*)"evaluators", 10)) - { - ret = GLEW_NV_evaluators; - continue; - } -#endif -#ifdef GL_NV_explicit_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"explicit_multisample", 20)) - { - ret = GLEW_NV_explicit_multisample; - continue; - } -#endif -#ifdef GL_NV_fence - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fence", 5)) - { - ret = GLEW_NV_fence; - continue; - } -#endif -#ifdef GL_NV_float_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12)) - { - ret = GLEW_NV_float_buffer; - continue; - } -#endif -#ifdef GL_NV_fog_distance - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_distance", 12)) - { - ret = GLEW_NV_fog_distance; - continue; - } -#endif -#ifdef GL_NV_fragment_program - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program", 16)) - { - ret = GLEW_NV_fragment_program; - continue; - } -#endif -#ifdef GL_NV_fragment_program2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program2", 17)) - { - ret = GLEW_NV_fragment_program2; - continue; - } -#endif -#ifdef GL_NV_fragment_program4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program4", 17)) - { - ret = GLEW_NV_fragment_program4; - continue; - } -#endif -#ifdef GL_NV_fragment_program_option - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_program_option", 23)) - { - ret = GLEW_NV_fragment_program_option; - continue; - } -#endif -#ifdef GL_NV_framebuffer_multisample_coverage - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_multisample_coverage", 32)) - { - ret = GLEW_NV_framebuffer_multisample_coverage; - continue; - } -#endif -#ifdef GL_NV_geometry_program4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_program4", 17)) - { - ret = GLEW_NV_geometry_program4; - continue; - } -#endif -#ifdef GL_NV_geometry_shader4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"geometry_shader4", 16)) - { - ret = GLEW_NV_geometry_shader4; - continue; - } -#endif -#ifdef GL_NV_gpu_program4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_program4", 12)) - { - ret = GLEW_NV_gpu_program4; - continue; - } -#endif -#ifdef GL_NV_half_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"half_float", 10)) - { - ret = GLEW_NV_half_float; - continue; - } -#endif -#ifdef GL_NV_light_max_exponent - if (_glewStrSame3(&pos, &len, (const GLubyte*)"light_max_exponent", 18)) - { - ret = GLEW_NV_light_max_exponent; - continue; - } -#endif -#ifdef GL_NV_multisample_filter_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample_filter_hint", 23)) - { - ret = GLEW_NV_multisample_filter_hint; - continue; - } -#endif -#ifdef GL_NV_occlusion_query - if (_glewStrSame3(&pos, &len, (const GLubyte*)"occlusion_query", 15)) - { - ret = GLEW_NV_occlusion_query; - continue; - } -#endif -#ifdef GL_NV_packed_depth_stencil - if (_glewStrSame3(&pos, &len, (const GLubyte*)"packed_depth_stencil", 20)) - { - ret = GLEW_NV_packed_depth_stencil; - continue; - } -#endif -#ifdef GL_NV_parameter_buffer_object - if (_glewStrSame3(&pos, &len, (const GLubyte*)"parameter_buffer_object", 23)) - { - ret = GLEW_NV_parameter_buffer_object; - continue; - } -#endif -#ifdef GL_NV_pixel_data_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_data_range", 16)) - { - ret = GLEW_NV_pixel_data_range; - continue; - } -#endif -#ifdef GL_NV_point_sprite - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_sprite", 12)) - { - ret = GLEW_NV_point_sprite; - continue; - } -#endif -#ifdef GL_NV_present_video - if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13)) - { - ret = GLEW_NV_present_video; - continue; - } -#endif -#ifdef GL_NV_primitive_restart - if (_glewStrSame3(&pos, &len, (const GLubyte*)"primitive_restart", 17)) - { - ret = GLEW_NV_primitive_restart; - continue; - } -#endif -#ifdef GL_NV_register_combiners - if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners", 18)) - { - ret = GLEW_NV_register_combiners; - continue; - } -#endif -#ifdef GL_NV_register_combiners2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"register_combiners2", 19)) - { - ret = GLEW_NV_register_combiners2; - continue; - } -#endif -#ifdef GL_NV_texgen_emboss - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_emboss", 13)) - { - ret = GLEW_NV_texgen_emboss; - continue; - } -#endif -#ifdef GL_NV_texgen_reflection - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texgen_reflection", 17)) - { - ret = GLEW_NV_texgen_reflection; - continue; - } -#endif -#ifdef GL_NV_texture_compression_vtc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_compression_vtc", 23)) - { - ret = GLEW_NV_texture_compression_vtc; - continue; - } -#endif -#ifdef GL_NV_texture_env_combine4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_env_combine4", 20)) - { - ret = GLEW_NV_texture_env_combine4; - continue; - } -#endif -#ifdef GL_NV_texture_expand_normal - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_expand_normal", 21)) - { - ret = GLEW_NV_texture_expand_normal; - continue; - } -#endif -#ifdef GL_NV_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_rectangle", 17)) - { - ret = GLEW_NV_texture_rectangle; - continue; - } -#endif -#ifdef GL_NV_texture_shader - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader", 14)) - { - ret = GLEW_NV_texture_shader; - continue; - } -#endif -#ifdef GL_NV_texture_shader2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader2", 15)) - { - ret = GLEW_NV_texture_shader2; - continue; - } -#endif -#ifdef GL_NV_texture_shader3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_shader3", 15)) - { - ret = GLEW_NV_texture_shader3; - continue; - } -#endif -#ifdef GL_NV_transform_feedback - if (_glewStrSame3(&pos, &len, (const GLubyte*)"transform_feedback", 18)) - { - ret = GLEW_NV_transform_feedback; - continue; - } -#endif -#ifdef GL_NV_vertex_array_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18)) - { - ret = GLEW_NV_vertex_array_range; - continue; - } -#endif -#ifdef GL_NV_vertex_array_range2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range2", 19)) - { - ret = GLEW_NV_vertex_array_range2; - continue; - } -#endif -#ifdef GL_NV_vertex_program - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program", 14)) - { - ret = GLEW_NV_vertex_program; - continue; - } -#endif -#ifdef GL_NV_vertex_program1_1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program1_1", 17)) - { - ret = GLEW_NV_vertex_program1_1; - continue; - } -#endif -#ifdef GL_NV_vertex_program2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2", 15)) - { - ret = GLEW_NV_vertex_program2; - continue; - } -#endif -#ifdef GL_NV_vertex_program2_option - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program2_option", 22)) - { - ret = GLEW_NV_vertex_program2_option; - continue; - } -#endif -#ifdef GL_NV_vertex_program3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program3", 15)) - { - ret = GLEW_NV_vertex_program3; - continue; - } -#endif -#ifdef GL_NV_vertex_program4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_program4", 15)) - { - ret = GLEW_NV_vertex_program4; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"OES_", 4)) - { -#ifdef GL_OES_byte_coordinates - if (_glewStrSame3(&pos, &len, (const GLubyte*)"byte_coordinates", 16)) - { - ret = GLEW_OES_byte_coordinates; - continue; - } -#endif -#ifdef GL_OES_compressed_paletted_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"compressed_paletted_texture", 27)) - { - ret = GLEW_OES_compressed_paletted_texture; - continue; - } -#endif -#ifdef GL_OES_read_format - if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_format", 11)) - { - ret = GLEW_OES_read_format; - continue; - } -#endif -#ifdef GL_OES_single_precision - if (_glewStrSame3(&pos, &len, (const GLubyte*)"single_precision", 16)) - { - ret = GLEW_OES_single_precision; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4)) - { -#ifdef GL_OML_interlace - if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9)) - { - ret = GLEW_OML_interlace; - continue; - } -#endif -#ifdef GL_OML_resample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8)) - { - ret = GLEW_OML_resample; - continue; - } -#endif -#ifdef GL_OML_subsample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"subsample", 9)) - { - ret = GLEW_OML_subsample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"PGI_", 4)) - { -#ifdef GL_PGI_misc_hints - if (_glewStrSame3(&pos, &len, (const GLubyte*)"misc_hints", 10)) - { - ret = GLEW_PGI_misc_hints; - continue; - } -#endif -#ifdef GL_PGI_vertex_hints - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_hints", 12)) - { - ret = GLEW_PGI_vertex_hints; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"REND_", 5)) - { -#ifdef GL_REND_screen_coordinates - if (_glewStrSame3(&pos, &len, (const GLubyte*)"screen_coordinates", 18)) - { - ret = GLEW_REND_screen_coordinates; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"S3_", 3)) - { -#ifdef GL_S3_s3tc - if (_glewStrSame3(&pos, &len, (const GLubyte*)"s3tc", 4)) - { - ret = GLEW_S3_s3tc; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5)) - { -#ifdef GL_SGIS_color_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11)) - { - ret = GLEW_SGIS_color_range; - continue; - } -#endif -#ifdef GL_SGIS_detail_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"detail_texture", 14)) - { - ret = GLEW_SGIS_detail_texture; - continue; - } -#endif -#ifdef GL_SGIS_fog_function - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_function", 12)) - { - ret = GLEW_SGIS_fog_function; - continue; - } -#endif -#ifdef GL_SGIS_generate_mipmap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"generate_mipmap", 15)) - { - ret = GLEW_SGIS_generate_mipmap; - continue; - } -#endif -#ifdef GL_SGIS_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLEW_SGIS_multisample; - continue; - } -#endif -#ifdef GL_SGIS_pixel_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13)) - { - ret = GLEW_SGIS_pixel_texture; - continue; - } -#endif -#ifdef GL_SGIS_point_line_texgen - if (_glewStrSame3(&pos, &len, (const GLubyte*)"point_line_texgen", 17)) - { - ret = GLEW_SGIS_point_line_texgen; - continue; - } -#endif -#ifdef GL_SGIS_sharpen_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"sharpen_texture", 15)) - { - ret = GLEW_SGIS_sharpen_texture; - continue; - } -#endif -#ifdef GL_SGIS_texture4D - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture4D", 9)) - { - ret = GLEW_SGIS_texture4D; - continue; - } -#endif -#ifdef GL_SGIS_texture_border_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_border_clamp", 20)) - { - ret = GLEW_SGIS_texture_border_clamp; - continue; - } -#endif -#ifdef GL_SGIS_texture_edge_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_edge_clamp", 18)) - { - ret = GLEW_SGIS_texture_edge_clamp; - continue; - } -#endif -#ifdef GL_SGIS_texture_filter4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_filter4", 15)) - { - ret = GLEW_SGIS_texture_filter4; - continue; - } -#endif -#ifdef GL_SGIS_texture_lod - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod", 11)) - { - ret = GLEW_SGIS_texture_lod; - continue; - } -#endif -#ifdef GL_SGIS_texture_select - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_select", 14)) - { - ret = GLEW_SGIS_texture_select; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5)) - { -#ifdef GL_SGIX_async - if (_glewStrSame3(&pos, &len, (const GLubyte*)"async", 5)) - { - ret = GLEW_SGIX_async; - continue; - } -#endif -#ifdef GL_SGIX_async_histogram - if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_histogram", 15)) - { - ret = GLEW_SGIX_async_histogram; - continue; - } -#endif -#ifdef GL_SGIX_async_pixel - if (_glewStrSame3(&pos, &len, (const GLubyte*)"async_pixel", 11)) - { - ret = GLEW_SGIX_async_pixel; - continue; - } -#endif -#ifdef GL_SGIX_blend_alpha_minmax - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blend_alpha_minmax", 18)) - { - ret = GLEW_SGIX_blend_alpha_minmax; - continue; - } -#endif -#ifdef GL_SGIX_clipmap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"clipmap", 7)) - { - ret = GLEW_SGIX_clipmap; - continue; - } -#endif -#ifdef GL_SGIX_convolution_accuracy - if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_accuracy", 20)) - { - ret = GLEW_SGIX_convolution_accuracy; - continue; - } -#endif -#ifdef GL_SGIX_depth_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_texture", 13)) - { - ret = GLEW_SGIX_depth_texture; - continue; - } -#endif -#ifdef GL_SGIX_flush_raster - if (_glewStrSame3(&pos, &len, (const GLubyte*)"flush_raster", 12)) - { - ret = GLEW_SGIX_flush_raster; - continue; - } -#endif -#ifdef GL_SGIX_fog_offset - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_offset", 10)) - { - ret = GLEW_SGIX_fog_offset; - continue; - } -#endif -#ifdef GL_SGIX_fog_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fog_texture", 11)) - { - ret = GLEW_SGIX_fog_texture; - continue; - } -#endif -#ifdef GL_SGIX_fragment_specular_lighting - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fragment_specular_lighting", 26)) - { - ret = GLEW_SGIX_fragment_specular_lighting; - continue; - } -#endif -#ifdef GL_SGIX_framezoom - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framezoom", 9)) - { - ret = GLEW_SGIX_framezoom; - continue; - } -#endif -#ifdef GL_SGIX_interlace - if (_glewStrSame3(&pos, &len, (const GLubyte*)"interlace", 9)) - { - ret = GLEW_SGIX_interlace; - continue; - } -#endif -#ifdef GL_SGIX_ir_instrument1 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"ir_instrument1", 14)) - { - ret = GLEW_SGIX_ir_instrument1; - continue; - } -#endif -#ifdef GL_SGIX_list_priority - if (_glewStrSame3(&pos, &len, (const GLubyte*)"list_priority", 13)) - { - ret = GLEW_SGIX_list_priority; - continue; - } -#endif -#ifdef GL_SGIX_pixel_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture", 13)) - { - ret = GLEW_SGIX_pixel_texture; - continue; - } -#endif -#ifdef GL_SGIX_pixel_texture_bits - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_texture_bits", 18)) - { - ret = GLEW_SGIX_pixel_texture_bits; - continue; - } -#endif -#ifdef GL_SGIX_reference_plane - if (_glewStrSame3(&pos, &len, (const GLubyte*)"reference_plane", 15)) - { - ret = GLEW_SGIX_reference_plane; - continue; - } -#endif -#ifdef GL_SGIX_resample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"resample", 8)) - { - ret = GLEW_SGIX_resample; - continue; - } -#endif -#ifdef GL_SGIX_shadow - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow", 6)) - { - ret = GLEW_SGIX_shadow; - continue; - } -#endif -#ifdef GL_SGIX_shadow_ambient - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shadow_ambient", 14)) - { - ret = GLEW_SGIX_shadow_ambient; - continue; - } -#endif -#ifdef GL_SGIX_sprite - if (_glewStrSame3(&pos, &len, (const GLubyte*)"sprite", 6)) - { - ret = GLEW_SGIX_sprite; - continue; - } -#endif -#ifdef GL_SGIX_tag_sample_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"tag_sample_buffer", 17)) - { - ret = GLEW_SGIX_tag_sample_buffer; - continue; - } -#endif -#ifdef GL_SGIX_texture_add_env - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_add_env", 15)) - { - ret = GLEW_SGIX_texture_add_env; - continue; - } -#endif -#ifdef GL_SGIX_texture_coordinate_clamp - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_coordinate_clamp", 24)) - { - ret = GLEW_SGIX_texture_coordinate_clamp; - continue; - } -#endif -#ifdef GL_SGIX_texture_lod_bias - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_lod_bias", 16)) - { - ret = GLEW_SGIX_texture_lod_bias; - continue; - } -#endif -#ifdef GL_SGIX_texture_multi_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_multi_buffer", 20)) - { - ret = GLEW_SGIX_texture_multi_buffer; - continue; - } -#endif -#ifdef GL_SGIX_texture_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_range", 13)) - { - ret = GLEW_SGIX_texture_range; - continue; - } -#endif -#ifdef GL_SGIX_texture_scale_bias - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_scale_bias", 18)) - { - ret = GLEW_SGIX_texture_scale_bias; - continue; - } -#endif -#ifdef GL_SGIX_vertex_preclip - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip", 14)) - { - ret = GLEW_SGIX_vertex_preclip; - continue; - } -#endif -#ifdef GL_SGIX_vertex_preclip_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_preclip_hint", 19)) - { - ret = GLEW_SGIX_vertex_preclip_hint; - continue; - } -#endif -#ifdef GL_SGIX_ycrcb - if (_glewStrSame3(&pos, &len, (const GLubyte*)"ycrcb", 5)) - { - ret = GLEW_SGIX_ycrcb; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4)) - { -#ifdef GL_SGI_color_matrix - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_matrix", 12)) - { - ret = GLEW_SGI_color_matrix; - continue; - } -#endif -#ifdef GL_SGI_color_table - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_table", 11)) - { - ret = GLEW_SGI_color_table; - continue; - } -#endif -#ifdef GL_SGI_texture_color_table - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_color_table", 19)) - { - ret = GLEW_SGI_texture_color_table; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUNX_", 5)) - { -#ifdef GL_SUNX_constant_data - if (_glewStrSame3(&pos, &len, (const GLubyte*)"constant_data", 13)) - { - ret = GLEW_SUNX_constant_data; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4)) - { -#ifdef GL_SUN_convolution_border_modes - if (_glewStrSame3(&pos, &len, (const GLubyte*)"convolution_border_modes", 24)) - { - ret = GLEW_SUN_convolution_border_modes; - continue; - } -#endif -#ifdef GL_SUN_global_alpha - if (_glewStrSame3(&pos, &len, (const GLubyte*)"global_alpha", 12)) - { - ret = GLEW_SUN_global_alpha; - continue; - } -#endif -#ifdef GL_SUN_mesh_array - if (_glewStrSame3(&pos, &len, (const GLubyte*)"mesh_array", 10)) - { - ret = GLEW_SUN_mesh_array; - continue; - } -#endif -#ifdef GL_SUN_read_video_pixels - if (_glewStrSame3(&pos, &len, (const GLubyte*)"read_video_pixels", 17)) - { - ret = GLEW_SUN_read_video_pixels; - continue; - } -#endif -#ifdef GL_SUN_slice_accum - if (_glewStrSame3(&pos, &len, (const GLubyte*)"slice_accum", 11)) - { - ret = GLEW_SUN_slice_accum; - continue; - } -#endif -#ifdef GL_SUN_triangle_list - if (_glewStrSame3(&pos, &len, (const GLubyte*)"triangle_list", 13)) - { - ret = GLEW_SUN_triangle_list; - continue; - } -#endif -#ifdef GL_SUN_vertex - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex", 6)) - { - ret = GLEW_SUN_vertex; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"WIN_", 4)) - { -#ifdef GL_WIN_phong_shading - if (_glewStrSame3(&pos, &len, (const GLubyte*)"phong_shading", 13)) - { - ret = GLEW_WIN_phong_shading; - continue; - } -#endif -#ifdef GL_WIN_specular_fog - if (_glewStrSame3(&pos, &len, (const GLubyte*)"specular_fog", 12)) - { - ret = GLEW_WIN_specular_fog; - continue; - } -#endif -#ifdef GL_WIN_swap_hint - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_hint", 9)) - { - ret = GLEW_WIN_swap_hint; - continue; - } -#endif - } - } - ret = (len == 0); - } - return ret; -} - -#if defined(_WIN32) - -#if defined(GLEW_MX) -GLboolean wglewContextIsSupported (WGLEWContext* ctx, const char* name) -#else -GLboolean wglewIsSupported (const char* name) -#endif -{ - GLubyte* pos = (GLubyte*)name; - GLuint len = _glewStrLen(pos); - GLboolean ret = GL_TRUE; - while (ret && len > 0) - { - if (_glewStrSame1(&pos, &len, (const GLubyte*)"WGL_", 4)) - { - if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5)) - { -#ifdef WGL_3DFX_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = WGLEW_3DFX_multisample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DL_", 4)) - { -#ifdef WGL_3DL_stereo_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"stereo_control", 14)) - { - ret = WGLEW_3DL_stereo_control; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4)) - { -#ifdef WGL_ARB_buffer_region - if (_glewStrSame3(&pos, &len, (const GLubyte*)"buffer_region", 13)) - { - ret = WGLEW_ARB_buffer_region; - continue; - } -#endif -#ifdef WGL_ARB_create_context - if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context", 14)) - { - ret = WGLEW_ARB_create_context; - continue; - } -#endif -#ifdef WGL_ARB_extensions_string - if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17)) - { - ret = WGLEW_ARB_extensions_string; - continue; - } -#endif -#ifdef WGL_ARB_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = WGLEW_ARB_framebuffer_sRGB; - continue; - } -#endif -#ifdef WGL_ARB_make_current_read - if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17)) - { - ret = WGLEW_ARB_make_current_read; - continue; - } -#endif -#ifdef WGL_ARB_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = WGLEW_ARB_multisample; - continue; - } -#endif -#ifdef WGL_ARB_pbuffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7)) - { - ret = WGLEW_ARB_pbuffer; - continue; - } -#endif -#ifdef WGL_ARB_pixel_format - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12)) - { - ret = WGLEW_ARB_pixel_format; - continue; - } -#endif -#ifdef WGL_ARB_pixel_format_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18)) - { - ret = WGLEW_ARB_pixel_format_float; - continue; - } -#endif -#ifdef WGL_ARB_render_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14)) - { - ret = WGLEW_ARB_render_texture; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4)) - { -#ifdef WGL_ATI_pixel_format_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18)) - { - ret = WGLEW_ATI_pixel_format_float; - continue; - } -#endif -#ifdef WGL_ATI_render_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24)) - { - ret = WGLEW_ATI_render_texture_rectangle; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4)) - { -#ifdef WGL_EXT_depth_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"depth_float", 11)) - { - ret = WGLEW_EXT_depth_float; - continue; - } -#endif -#ifdef WGL_EXT_display_color_table - if (_glewStrSame3(&pos, &len, (const GLubyte*)"display_color_table", 19)) - { - ret = WGLEW_EXT_display_color_table; - continue; - } -#endif -#ifdef WGL_EXT_extensions_string - if (_glewStrSame3(&pos, &len, (const GLubyte*)"extensions_string", 17)) - { - ret = WGLEW_EXT_extensions_string; - continue; - } -#endif -#ifdef WGL_EXT_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = WGLEW_EXT_framebuffer_sRGB; - continue; - } -#endif -#ifdef WGL_EXT_make_current_read - if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17)) - { - ret = WGLEW_EXT_make_current_read; - continue; - } -#endif -#ifdef WGL_EXT_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = WGLEW_EXT_multisample; - continue; - } -#endif -#ifdef WGL_EXT_pbuffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7)) - { - ret = WGLEW_EXT_pbuffer; - continue; - } -#endif -#ifdef WGL_EXT_pixel_format - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format", 12)) - { - ret = WGLEW_EXT_pixel_format; - continue; - } -#endif -#ifdef WGL_EXT_pixel_format_packed_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_packed_float", 25)) - { - ret = WGLEW_EXT_pixel_format_packed_float; - continue; - } -#endif -#ifdef WGL_EXT_swap_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12)) - { - ret = WGLEW_EXT_swap_control; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"I3D_", 4)) - { -#ifdef WGL_I3D_digital_video_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"digital_video_control", 21)) - { - ret = WGLEW_I3D_digital_video_control; - continue; - } -#endif -#ifdef WGL_I3D_gamma - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gamma", 5)) - { - ret = WGLEW_I3D_gamma; - continue; - } -#endif -#ifdef WGL_I3D_genlock - if (_glewStrSame3(&pos, &len, (const GLubyte*)"genlock", 7)) - { - ret = WGLEW_I3D_genlock; - continue; - } -#endif -#ifdef WGL_I3D_image_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"image_buffer", 12)) - { - ret = WGLEW_I3D_image_buffer; - continue; - } -#endif -#ifdef WGL_I3D_swap_frame_lock - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_lock", 15)) - { - ret = WGLEW_I3D_swap_frame_lock; - continue; - } -#endif -#ifdef WGL_I3D_swap_frame_usage - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_frame_usage", 16)) - { - ret = WGLEW_I3D_swap_frame_usage; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3)) - { -#ifdef WGL_NV_float_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12)) - { - ret = WGLEW_NV_float_buffer; - continue; - } -#endif -#ifdef WGL_NV_gpu_affinity - if (_glewStrSame3(&pos, &len, (const GLubyte*)"gpu_affinity", 12)) - { - ret = WGLEW_NV_gpu_affinity; - continue; - } -#endif -#ifdef WGL_NV_present_video - if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13)) - { - ret = WGLEW_NV_present_video; - continue; - } -#endif -#ifdef WGL_NV_render_depth_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_depth_texture", 20)) - { - ret = WGLEW_NV_render_depth_texture; - continue; - } -#endif -#ifdef WGL_NV_render_texture_rectangle - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture_rectangle", 24)) - { - ret = WGLEW_NV_render_texture_rectangle; - continue; - } -#endif -#ifdef WGL_NV_swap_group - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10)) - { - ret = WGLEW_NV_swap_group; - continue; - } -#endif -#ifdef WGL_NV_vertex_array_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18)) - { - ret = WGLEW_NV_vertex_array_range; - continue; - } -#endif -#ifdef WGL_NV_video_output - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_output", 12)) - { - ret = WGLEW_NV_video_output; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4)) - { -#ifdef WGL_OML_sync_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12)) - { - ret = WGLEW_OML_sync_control; - continue; - } -#endif - } - } - ret = (len == 0); - } - return ret; -} - -#elif !defined(__APPLE__) || defined(GLEW_APPLE_GLX) - -#if defined(GLEW_MX) -GLboolean glxewContextIsSupported (GLXEWContext* ctx, const char* name) -#else -GLboolean glxewIsSupported (const char* name) -#endif -{ - GLubyte* pos = (GLubyte*)name; - GLuint len = _glewStrLen(pos); - GLboolean ret = GL_TRUE; - while (ret && len > 0) - { - if(_glewStrSame1(&pos, &len, (const GLubyte*)"GLX_", 4)) - { - if (_glewStrSame2(&pos, &len, (const GLubyte*)"VERSION_", 8)) - { -#ifdef GLX_VERSION_1_2 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_2", 3)) - { - ret = GLXEW_VERSION_1_2; - continue; - } -#endif -#ifdef GLX_VERSION_1_3 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_3", 3)) - { - ret = GLXEW_VERSION_1_3; - continue; - } -#endif -#ifdef GLX_VERSION_1_4 - if (_glewStrSame3(&pos, &len, (const GLubyte*)"1_4", 3)) - { - ret = GLXEW_VERSION_1_4; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"3DFX_", 5)) - { -#ifdef GLX_3DFX_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLXEW_3DFX_multisample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ARB_", 4)) - { -#ifdef GLX_ARB_create_context - if (_glewStrSame3(&pos, &len, (const GLubyte*)"create_context", 14)) - { - ret = GLXEW_ARB_create_context; - continue; - } -#endif -#ifdef GLX_ARB_fbconfig_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig_float", 14)) - { - ret = GLXEW_ARB_fbconfig_float; - continue; - } -#endif -#ifdef GLX_ARB_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = GLXEW_ARB_framebuffer_sRGB; - continue; - } -#endif -#ifdef GLX_ARB_get_proc_address - if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_proc_address", 16)) - { - ret = GLXEW_ARB_get_proc_address; - continue; - } -#endif -#ifdef GLX_ARB_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLXEW_ARB_multisample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"ATI_", 4)) - { -#ifdef GLX_ATI_pixel_format_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixel_format_float", 18)) - { - ret = GLXEW_ATI_pixel_format_float; - continue; - } -#endif -#ifdef GLX_ATI_render_texture - if (_glewStrSame3(&pos, &len, (const GLubyte*)"render_texture", 14)) - { - ret = GLXEW_ATI_render_texture; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"EXT_", 4)) - { -#ifdef GLX_EXT_fbconfig_packed_float - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig_packed_float", 21)) - { - ret = GLXEW_EXT_fbconfig_packed_float; - continue; - } -#endif -#ifdef GLX_EXT_framebuffer_sRGB - if (_glewStrSame3(&pos, &len, (const GLubyte*)"framebuffer_sRGB", 16)) - { - ret = GLXEW_EXT_framebuffer_sRGB; - continue; - } -#endif -#ifdef GLX_EXT_import_context - if (_glewStrSame3(&pos, &len, (const GLubyte*)"import_context", 14)) - { - ret = GLXEW_EXT_import_context; - continue; - } -#endif -#ifdef GLX_EXT_scene_marker - if (_glewStrSame3(&pos, &len, (const GLubyte*)"scene_marker", 12)) - { - ret = GLXEW_EXT_scene_marker; - continue; - } -#endif -#ifdef GLX_EXT_texture_from_pixmap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"texture_from_pixmap", 19)) - { - ret = GLXEW_EXT_texture_from_pixmap; - continue; - } -#endif -#ifdef GLX_EXT_visual_info - if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_info", 11)) - { - ret = GLXEW_EXT_visual_info; - continue; - } -#endif -#ifdef GLX_EXT_visual_rating - if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_rating", 13)) - { - ret = GLXEW_EXT_visual_rating; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"MESA_", 5)) - { -#ifdef GLX_MESA_agp_offset - if (_glewStrSame3(&pos, &len, (const GLubyte*)"agp_offset", 10)) - { - ret = GLXEW_MESA_agp_offset; - continue; - } -#endif -#ifdef GLX_MESA_copy_sub_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"copy_sub_buffer", 15)) - { - ret = GLXEW_MESA_copy_sub_buffer; - continue; - } -#endif -#ifdef GLX_MESA_pixmap_colormap - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pixmap_colormap", 15)) - { - ret = GLXEW_MESA_pixmap_colormap; - continue; - } -#endif -#ifdef GLX_MESA_release_buffers - if (_glewStrSame3(&pos, &len, (const GLubyte*)"release_buffers", 15)) - { - ret = GLXEW_MESA_release_buffers; - continue; - } -#endif -#ifdef GLX_MESA_set_3dfx_mode - if (_glewStrSame3(&pos, &len, (const GLubyte*)"set_3dfx_mode", 13)) - { - ret = GLXEW_MESA_set_3dfx_mode; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"NV_", 3)) - { -#ifdef GLX_NV_float_buffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"float_buffer", 12)) - { - ret = GLXEW_NV_float_buffer; - continue; - } -#endif -#ifdef GLX_NV_present_video - if (_glewStrSame3(&pos, &len, (const GLubyte*)"present_video", 13)) - { - ret = GLXEW_NV_present_video; - continue; - } -#endif -#ifdef GLX_NV_swap_group - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10)) - { - ret = GLXEW_NV_swap_group; - continue; - } -#endif -#ifdef GLX_NV_vertex_array_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"vertex_array_range", 18)) - { - ret = GLXEW_NV_vertex_array_range; - continue; - } -#endif -#ifdef GLX_NV_video_output - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_output", 12)) - { - ret = GLXEW_NV_video_output; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"OML_", 4)) - { -#ifdef GLX_OML_swap_method - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_method", 11)) - { - ret = GLXEW_OML_swap_method; - continue; - } -#endif -#if defined(GLX_OML_sync_control) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) -#include - if (_glewStrSame3(&pos, &len, (const GLubyte*)"sync_control", 12)) - { - ret = GLXEW_OML_sync_control; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIS_", 5)) - { -#ifdef GLX_SGIS_blended_overlay - if (_glewStrSame3(&pos, &len, (const GLubyte*)"blended_overlay", 15)) - { - ret = GLXEW_SGIS_blended_overlay; - continue; - } -#endif -#ifdef GLX_SGIS_color_range - if (_glewStrSame3(&pos, &len, (const GLubyte*)"color_range", 11)) - { - ret = GLXEW_SGIS_color_range; - continue; - } -#endif -#ifdef GLX_SGIS_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"multisample", 11)) - { - ret = GLXEW_SGIS_multisample; - continue; - } -#endif -#ifdef GLX_SGIS_shared_multisample - if (_glewStrSame3(&pos, &len, (const GLubyte*)"shared_multisample", 18)) - { - ret = GLXEW_SGIS_shared_multisample; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGIX_", 5)) - { -#ifdef GLX_SGIX_fbconfig - if (_glewStrSame3(&pos, &len, (const GLubyte*)"fbconfig", 8)) - { - ret = GLXEW_SGIX_fbconfig; - continue; - } -#endif -#ifdef GLX_SGIX_hyperpipe - if (_glewStrSame3(&pos, &len, (const GLubyte*)"hyperpipe", 9)) - { - ret = GLXEW_SGIX_hyperpipe; - continue; - } -#endif -#ifdef GLX_SGIX_pbuffer - if (_glewStrSame3(&pos, &len, (const GLubyte*)"pbuffer", 7)) - { - ret = GLXEW_SGIX_pbuffer; - continue; - } -#endif -#ifdef GLX_SGIX_swap_barrier - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_barrier", 12)) - { - ret = GLXEW_SGIX_swap_barrier; - continue; - } -#endif -#ifdef GLX_SGIX_swap_group - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_group", 10)) - { - ret = GLXEW_SGIX_swap_group; - continue; - } -#endif -#ifdef GLX_SGIX_video_resize - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12)) - { - ret = GLXEW_SGIX_video_resize; - continue; - } -#endif -#ifdef GLX_SGIX_visual_select_group - if (_glewStrSame3(&pos, &len, (const GLubyte*)"visual_select_group", 19)) - { - ret = GLXEW_SGIX_visual_select_group; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SGI_", 4)) - { -#ifdef GLX_SGI_cushion - if (_glewStrSame3(&pos, &len, (const GLubyte*)"cushion", 7)) - { - ret = GLXEW_SGI_cushion; - continue; - } -#endif -#ifdef GLX_SGI_make_current_read - if (_glewStrSame3(&pos, &len, (const GLubyte*)"make_current_read", 17)) - { - ret = GLXEW_SGI_make_current_read; - continue; - } -#endif -#ifdef GLX_SGI_swap_control - if (_glewStrSame3(&pos, &len, (const GLubyte*)"swap_control", 12)) - { - ret = GLXEW_SGI_swap_control; - continue; - } -#endif -#ifdef GLX_SGI_video_sync - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_sync", 10)) - { - ret = GLXEW_SGI_video_sync; - continue; - } -#endif - } - if (_glewStrSame2(&pos, &len, (const GLubyte*)"SUN_", 4)) - { -#ifdef GLX_SUN_get_transparent_index - if (_glewStrSame3(&pos, &len, (const GLubyte*)"get_transparent_index", 21)) - { - ret = GLXEW_SUN_get_transparent_index; - continue; - } -#endif -#ifdef GLX_SUN_video_resize - if (_glewStrSame3(&pos, &len, (const GLubyte*)"video_resize", 12)) - { - ret = GLXEW_SUN_video_resize; - continue; - } -#endif - } - } - ret = (len == 0); - } - return ret; -} - -#endif /* _WIN32 */ diff --git a/opengl/glew.h b/opengl/glew.h deleted file mode 100644 index fae0c216..00000000 --- a/opengl/glew.h +++ /dev/null @@ -1,20113 +0,0 @@ -/* -** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2015, Nigel Stewart -** Copyright (C) 2002-2008, Milan Ikits -** Copyright (C) 2002-2008, Marcelo E. Magallon -** Copyright (C) 2002, Lev Povalahev -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are met: -** -** * Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** * The name of the author may be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -** THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - * Mesa 3-D graphics library - * Version: 7.0 - * - * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/* -** Copyright (c) 2007 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -#ifndef __glew_h__ -#define __glew_h__ -#define __GLEW_H__ - -#if defined(__gl_h_) || defined(__GL_H__) || defined(_GL_H) || defined(__X_GL_H) -#error gl.h included before glew.h -#endif -#if defined(__gl2_h_) -#error gl2.h included before glew.h -#endif -#if defined(__gltypes_h_) -#error gltypes.h included before glew.h -#endif -#if defined(__REGAL_H__) -#error Regal.h included before glew.h -#endif -#if defined(__glext_h_) || defined(__GLEXT_H_) -#error glext.h included before glew.h -#endif -#if defined(__gl_ATI_h_) -#error glATI.h included before glew.h -#endif - -#define __gl_h_ -#define __gl2_h_ -#define __GL_H__ -#define _GL_H -#define __gltypes_h_ -#define __REGAL_H__ -#define __X_GL_H -#define __glext_h_ -#define __GLEXT_H_ -#define __gl_ATI_h_ - -#if defined(_WIN32) - -/* - * GLEW does not include to avoid name space pollution. - * GL needs GLAPI and GLAPIENTRY, GLU needs APIENTRY, CALLBACK, and wchar_t - * defined properly. - */ -/* and */ -#ifdef APIENTRY -# ifndef GLAPIENTRY -# define GLAPIENTRY APIENTRY -# endif -# ifndef GLEWAPIENTRY -# define GLEWAPIENTRY APIENTRY -# endif -#else -#define GLEW_APIENTRY_DEFINED -# if defined(__MINGW32__) || defined(__CYGWIN__) || (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) || defined(__BORLANDC__) -# define APIENTRY __stdcall -# ifndef GLAPIENTRY -# define GLAPIENTRY __stdcall -# endif -# ifndef GLEWAPIENTRY -# define GLEWAPIENTRY __stdcall -# endif -# else -# define APIENTRY -# endif -#endif -#ifndef GLAPI -# if defined(__MINGW32__) || defined(__CYGWIN__) -# define GLAPI extern -# endif -#endif -/* */ -#ifndef CALLBACK -#define GLEW_CALLBACK_DEFINED -# if defined(__MINGW32__) || defined(__CYGWIN__) -# define CALLBACK __attribute__ ((__stdcall__)) -# elif (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_ALPHA) || defined(_M_PPC)) && !defined(MIDL_PASS) -# define CALLBACK __stdcall -# else -# define CALLBACK -# endif -#endif -/* and */ -#ifndef WINGDIAPI -#define GLEW_WINGDIAPI_DEFINED -#define WINGDIAPI __declspec(dllimport) -#endif -/* */ -#if (defined(_MSC_VER) || defined(__BORLANDC__)) && !defined(_WCHAR_T_DEFINED) -typedef unsigned short wchar_t; -# define _WCHAR_T_DEFINED -#endif -/* */ -#if !defined(_W64) -# if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && defined(_MSC_VER) && _MSC_VER >= 1300 -# define _W64 __w64 -# else -# define _W64 -# endif -#endif -#if !defined(_PTRDIFF_T_DEFINED) && !defined(_PTRDIFF_T_) && !defined(__MINGW64__) -# ifdef _WIN64 -typedef __int64 ptrdiff_t; -# else -typedef _W64 int ptrdiff_t; -# endif -# define _PTRDIFF_T_DEFINED -# define _PTRDIFF_T_ -#endif - -#ifndef GLAPI -# if defined(__MINGW32__) || defined(__CYGWIN__) -# define GLAPI extern -# else -# define GLAPI WINGDIAPI -# endif -#endif - -/* - * GLEW_STATIC is defined for static library. - * GLEW_BUILD is defined for building the DLL library. - */ - -#ifdef GLEW_STATIC -# define GLEWAPI extern -#else -# ifdef GLEW_BUILD -# define GLEWAPI extern __declspec(dllexport) -# else -# define GLEWAPI extern __declspec(dllimport) -# endif -#endif - -#else /* _UNIX */ - -/* - * Needed for ptrdiff_t in turn needed by VBO. This is defined by ISO - * C. On my system, this amounts to _3 lines_ of included code, all of - * them pretty much harmless. If you know of a way of detecting 32 vs - * 64 _targets_ at compile time you are free to replace this with - * something that's portable. For now, _this_ is the portable solution. - * (mem, 2004-01-04) - */ - -#include - -/* SGI MIPSPro doesn't like stdint.h in C++ mode */ -/* ID: 3376260 Solaris 9 has inttypes.h, but not stdint.h */ - -#if (defined(__sgi) || defined(__sun)) && !defined(__GNUC__) -#include -#else -#include -#endif - -#define GLEW_APIENTRY_DEFINED -#define APIENTRY - -/* - * GLEW_STATIC is defined for static library. - */ - -#ifdef GLEW_STATIC -# define GLEWAPI extern -#else -# if defined(__GNUC__) && __GNUC__>=4 -# define GLEWAPI extern __attribute__ ((visibility("default"))) -# elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) -# define GLEWAPI extern __global -# else -# define GLEWAPI extern -# endif -#endif - -/* */ -#ifndef GLAPI -#define GLAPI extern -#endif - -#endif /* _WIN32 */ - -#ifndef GLAPIENTRY -#define GLAPIENTRY -#endif - -#ifndef GLEWAPIENTRY -#define GLEWAPIENTRY -#endif - -#define GLEW_VAR_EXPORT GLEWAPI -#define GLEW_FUN_EXPORT GLEWAPI - -#ifdef __cplusplus -extern "C" { -#endif - -/* ----------------------------- GL_VERSION_1_1 ---------------------------- */ - -#ifndef GL_VERSION_1_1 -#define GL_VERSION_1_1 1 - -typedef unsigned int GLenum; -typedef unsigned int GLbitfield; -typedef unsigned int GLuint; -typedef int GLint; -typedef int GLsizei; -typedef unsigned char GLboolean; -typedef signed char GLbyte; -typedef short GLshort; -typedef unsigned char GLubyte; -typedef unsigned short GLushort; -typedef unsigned long GLulong; -typedef float GLfloat; -typedef float GLclampf; -typedef double GLdouble; -typedef double GLclampd; -typedef void GLvoid; -#if defined(_MSC_VER) && _MSC_VER < 1400 -typedef __int64 GLint64EXT; -typedef unsigned __int64 GLuint64EXT; -#elif defined(_MSC_VER) || defined(__BORLANDC__) -typedef signed long long GLint64EXT; -typedef unsigned long long GLuint64EXT; -#else -# if defined(__MINGW32__) || defined(__CYGWIN__) -#include -# endif -typedef int64_t GLint64EXT; -typedef uint64_t GLuint64EXT; -#endif -typedef GLint64EXT GLint64; -typedef GLuint64EXT GLuint64; -typedef struct __GLsync *GLsync; - -typedef char GLchar; - -#define GL_ZERO 0 -#define GL_FALSE 0 -#define GL_LOGIC_OP 0x0BF1 -#define GL_NONE 0 -#define GL_TEXTURE_COMPONENTS 0x1003 -#define GL_NO_ERROR 0 -#define GL_POINTS 0x0000 -#define GL_CURRENT_BIT 0x00000001 -#define GL_TRUE 1 -#define GL_ONE 1 -#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001 -#define GL_LINES 0x0001 -#define GL_LINE_LOOP 0x0002 -#define GL_POINT_BIT 0x00000002 -#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 -#define GL_LINE_STRIP 0x0003 -#define GL_LINE_BIT 0x00000004 -#define GL_TRIANGLES 0x0004 -#define GL_TRIANGLE_STRIP 0x0005 -#define GL_TRIANGLE_FAN 0x0006 -#define GL_QUADS 0x0007 -#define GL_QUAD_STRIP 0x0008 -#define GL_POLYGON_BIT 0x00000008 -#define GL_POLYGON 0x0009 -#define GL_POLYGON_STIPPLE_BIT 0x00000010 -#define GL_PIXEL_MODE_BIT 0x00000020 -#define GL_LIGHTING_BIT 0x00000040 -#define GL_FOG_BIT 0x00000080 -#define GL_DEPTH_BUFFER_BIT 0x00000100 -#define GL_ACCUM 0x0100 -#define GL_LOAD 0x0101 -#define GL_RETURN 0x0102 -#define GL_MULT 0x0103 -#define GL_ADD 0x0104 -#define GL_NEVER 0x0200 -#define GL_ACCUM_BUFFER_BIT 0x00000200 -#define GL_LESS 0x0201 -#define GL_EQUAL 0x0202 -#define GL_LEQUAL 0x0203 -#define GL_GREATER 0x0204 -#define GL_NOTEQUAL 0x0205 -#define GL_GEQUAL 0x0206 -#define GL_ALWAYS 0x0207 -#define GL_SRC_COLOR 0x0300 -#define GL_ONE_MINUS_SRC_COLOR 0x0301 -#define GL_SRC_ALPHA 0x0302 -#define GL_ONE_MINUS_SRC_ALPHA 0x0303 -#define GL_DST_ALPHA 0x0304 -#define GL_ONE_MINUS_DST_ALPHA 0x0305 -#define GL_DST_COLOR 0x0306 -#define GL_ONE_MINUS_DST_COLOR 0x0307 -#define GL_SRC_ALPHA_SATURATE 0x0308 -#define GL_STENCIL_BUFFER_BIT 0x00000400 -#define GL_FRONT_LEFT 0x0400 -#define GL_FRONT_RIGHT 0x0401 -#define GL_BACK_LEFT 0x0402 -#define GL_BACK_RIGHT 0x0403 -#define GL_FRONT 0x0404 -#define GL_BACK 0x0405 -#define GL_LEFT 0x0406 -#define GL_RIGHT 0x0407 -#define GL_FRONT_AND_BACK 0x0408 -#define GL_AUX0 0x0409 -#define GL_AUX1 0x040A -#define GL_AUX2 0x040B -#define GL_AUX3 0x040C -#define GL_INVALID_ENUM 0x0500 -#define GL_INVALID_VALUE 0x0501 -#define GL_INVALID_OPERATION 0x0502 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 -#define GL_OUT_OF_MEMORY 0x0505 -#define GL_2D 0x0600 -#define GL_3D 0x0601 -#define GL_3D_COLOR 0x0602 -#define GL_3D_COLOR_TEXTURE 0x0603 -#define GL_4D_COLOR_TEXTURE 0x0604 -#define GL_PASS_THROUGH_TOKEN 0x0700 -#define GL_POINT_TOKEN 0x0701 -#define GL_LINE_TOKEN 0x0702 -#define GL_POLYGON_TOKEN 0x0703 -#define GL_BITMAP_TOKEN 0x0704 -#define GL_DRAW_PIXEL_TOKEN 0x0705 -#define GL_COPY_PIXEL_TOKEN 0x0706 -#define GL_LINE_RESET_TOKEN 0x0707 -#define GL_EXP 0x0800 -#define GL_VIEWPORT_BIT 0x00000800 -#define GL_EXP2 0x0801 -#define GL_CW 0x0900 -#define GL_CCW 0x0901 -#define GL_COEFF 0x0A00 -#define GL_ORDER 0x0A01 -#define GL_DOMAIN 0x0A02 -#define GL_CURRENT_COLOR 0x0B00 -#define GL_CURRENT_INDEX 0x0B01 -#define GL_CURRENT_NORMAL 0x0B02 -#define GL_CURRENT_TEXTURE_COORDS 0x0B03 -#define GL_CURRENT_RASTER_COLOR 0x0B04 -#define GL_CURRENT_RASTER_INDEX 0x0B05 -#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06 -#define GL_CURRENT_RASTER_POSITION 0x0B07 -#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08 -#define GL_CURRENT_RASTER_DISTANCE 0x0B09 -#define GL_POINT_SMOOTH 0x0B10 -#define GL_POINT_SIZE 0x0B11 -#define GL_POINT_SIZE_RANGE 0x0B12 -#define GL_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_LINE_SMOOTH 0x0B20 -#define GL_LINE_WIDTH 0x0B21 -#define GL_LINE_WIDTH_RANGE 0x0B22 -#define GL_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_LINE_STIPPLE 0x0B24 -#define GL_LINE_STIPPLE_PATTERN 0x0B25 -#define GL_LINE_STIPPLE_REPEAT 0x0B26 -#define GL_LIST_MODE 0x0B30 -#define GL_MAX_LIST_NESTING 0x0B31 -#define GL_LIST_BASE 0x0B32 -#define GL_LIST_INDEX 0x0B33 -#define GL_POLYGON_MODE 0x0B40 -#define GL_POLYGON_SMOOTH 0x0B41 -#define GL_POLYGON_STIPPLE 0x0B42 -#define GL_EDGE_FLAG 0x0B43 -#define GL_CULL_FACE 0x0B44 -#define GL_CULL_FACE_MODE 0x0B45 -#define GL_FRONT_FACE 0x0B46 -#define GL_LIGHTING 0x0B50 -#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51 -#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52 -#define GL_LIGHT_MODEL_AMBIENT 0x0B53 -#define GL_SHADE_MODEL 0x0B54 -#define GL_COLOR_MATERIAL_FACE 0x0B55 -#define GL_COLOR_MATERIAL_PARAMETER 0x0B56 -#define GL_COLOR_MATERIAL 0x0B57 -#define GL_FOG 0x0B60 -#define GL_FOG_INDEX 0x0B61 -#define GL_FOG_DENSITY 0x0B62 -#define GL_FOG_START 0x0B63 -#define GL_FOG_END 0x0B64 -#define GL_FOG_MODE 0x0B65 -#define GL_FOG_COLOR 0x0B66 -#define GL_DEPTH_RANGE 0x0B70 -#define GL_DEPTH_TEST 0x0B71 -#define GL_DEPTH_WRITEMASK 0x0B72 -#define GL_DEPTH_CLEAR_VALUE 0x0B73 -#define GL_DEPTH_FUNC 0x0B74 -#define GL_ACCUM_CLEAR_VALUE 0x0B80 -#define GL_STENCIL_TEST 0x0B90 -#define GL_STENCIL_CLEAR_VALUE 0x0B91 -#define GL_STENCIL_FUNC 0x0B92 -#define GL_STENCIL_VALUE_MASK 0x0B93 -#define GL_STENCIL_FAIL 0x0B94 -#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 -#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 -#define GL_STENCIL_REF 0x0B97 -#define GL_STENCIL_WRITEMASK 0x0B98 -#define GL_MATRIX_MODE 0x0BA0 -#define GL_NORMALIZE 0x0BA1 -#define GL_VIEWPORT 0x0BA2 -#define GL_MODELVIEW_STACK_DEPTH 0x0BA3 -#define GL_PROJECTION_STACK_DEPTH 0x0BA4 -#define GL_TEXTURE_STACK_DEPTH 0x0BA5 -#define GL_MODELVIEW_MATRIX 0x0BA6 -#define GL_PROJECTION_MATRIX 0x0BA7 -#define GL_TEXTURE_MATRIX 0x0BA8 -#define GL_ATTRIB_STACK_DEPTH 0x0BB0 -#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 -#define GL_ALPHA_TEST 0x0BC0 -#define GL_ALPHA_TEST_FUNC 0x0BC1 -#define GL_ALPHA_TEST_REF 0x0BC2 -#define GL_DITHER 0x0BD0 -#define GL_BLEND_DST 0x0BE0 -#define GL_BLEND_SRC 0x0BE1 -#define GL_BLEND 0x0BE2 -#define GL_LOGIC_OP_MODE 0x0BF0 -#define GL_INDEX_LOGIC_OP 0x0BF1 -#define GL_COLOR_LOGIC_OP 0x0BF2 -#define GL_AUX_BUFFERS 0x0C00 -#define GL_DRAW_BUFFER 0x0C01 -#define GL_READ_BUFFER 0x0C02 -#define GL_SCISSOR_BOX 0x0C10 -#define GL_SCISSOR_TEST 0x0C11 -#define GL_INDEX_CLEAR_VALUE 0x0C20 -#define GL_INDEX_WRITEMASK 0x0C21 -#define GL_COLOR_CLEAR_VALUE 0x0C22 -#define GL_COLOR_WRITEMASK 0x0C23 -#define GL_INDEX_MODE 0x0C30 -#define GL_RGBA_MODE 0x0C31 -#define GL_DOUBLEBUFFER 0x0C32 -#define GL_STEREO 0x0C33 -#define GL_RENDER_MODE 0x0C40 -#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 -#define GL_POINT_SMOOTH_HINT 0x0C51 -#define GL_LINE_SMOOTH_HINT 0x0C52 -#define GL_POLYGON_SMOOTH_HINT 0x0C53 -#define GL_FOG_HINT 0x0C54 -#define GL_TEXTURE_GEN_S 0x0C60 -#define GL_TEXTURE_GEN_T 0x0C61 -#define GL_TEXTURE_GEN_R 0x0C62 -#define GL_TEXTURE_GEN_Q 0x0C63 -#define GL_PIXEL_MAP_I_TO_I 0x0C70 -#define GL_PIXEL_MAP_S_TO_S 0x0C71 -#define GL_PIXEL_MAP_I_TO_R 0x0C72 -#define GL_PIXEL_MAP_I_TO_G 0x0C73 -#define GL_PIXEL_MAP_I_TO_B 0x0C74 -#define GL_PIXEL_MAP_I_TO_A 0x0C75 -#define GL_PIXEL_MAP_R_TO_R 0x0C76 -#define GL_PIXEL_MAP_G_TO_G 0x0C77 -#define GL_PIXEL_MAP_B_TO_B 0x0C78 -#define GL_PIXEL_MAP_A_TO_A 0x0C79 -#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0 -#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1 -#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2 -#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3 -#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4 -#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5 -#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6 -#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7 -#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8 -#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9 -#define GL_UNPACK_SWAP_BYTES 0x0CF0 -#define GL_UNPACK_LSB_FIRST 0x0CF1 -#define GL_UNPACK_ROW_LENGTH 0x0CF2 -#define GL_UNPACK_SKIP_ROWS 0x0CF3 -#define GL_UNPACK_SKIP_PIXELS 0x0CF4 -#define GL_UNPACK_ALIGNMENT 0x0CF5 -#define GL_PACK_SWAP_BYTES 0x0D00 -#define GL_PACK_LSB_FIRST 0x0D01 -#define GL_PACK_ROW_LENGTH 0x0D02 -#define GL_PACK_SKIP_ROWS 0x0D03 -#define GL_PACK_SKIP_PIXELS 0x0D04 -#define GL_PACK_ALIGNMENT 0x0D05 -#define GL_MAP_COLOR 0x0D10 -#define GL_MAP_STENCIL 0x0D11 -#define GL_INDEX_SHIFT 0x0D12 -#define GL_INDEX_OFFSET 0x0D13 -#define GL_RED_SCALE 0x0D14 -#define GL_RED_BIAS 0x0D15 -#define GL_ZOOM_X 0x0D16 -#define GL_ZOOM_Y 0x0D17 -#define GL_GREEN_SCALE 0x0D18 -#define GL_GREEN_BIAS 0x0D19 -#define GL_BLUE_SCALE 0x0D1A -#define GL_BLUE_BIAS 0x0D1B -#define GL_ALPHA_SCALE 0x0D1C -#define GL_ALPHA_BIAS 0x0D1D -#define GL_DEPTH_SCALE 0x0D1E -#define GL_DEPTH_BIAS 0x0D1F -#define GL_MAX_EVAL_ORDER 0x0D30 -#define GL_MAX_LIGHTS 0x0D31 -#define GL_MAX_CLIP_PLANES 0x0D32 -#define GL_MAX_TEXTURE_SIZE 0x0D33 -#define GL_MAX_PIXEL_MAP_TABLE 0x0D34 -#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35 -#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36 -#define GL_MAX_NAME_STACK_DEPTH 0x0D37 -#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38 -#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39 -#define GL_MAX_VIEWPORT_DIMS 0x0D3A -#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B -#define GL_SUBPIXEL_BITS 0x0D50 -#define GL_INDEX_BITS 0x0D51 -#define GL_RED_BITS 0x0D52 -#define GL_GREEN_BITS 0x0D53 -#define GL_BLUE_BITS 0x0D54 -#define GL_ALPHA_BITS 0x0D55 -#define GL_DEPTH_BITS 0x0D56 -#define GL_STENCIL_BITS 0x0D57 -#define GL_ACCUM_RED_BITS 0x0D58 -#define GL_ACCUM_GREEN_BITS 0x0D59 -#define GL_ACCUM_BLUE_BITS 0x0D5A -#define GL_ACCUM_ALPHA_BITS 0x0D5B -#define GL_NAME_STACK_DEPTH 0x0D70 -#define GL_AUTO_NORMAL 0x0D80 -#define GL_MAP1_COLOR_4 0x0D90 -#define GL_MAP1_INDEX 0x0D91 -#define GL_MAP1_NORMAL 0x0D92 -#define GL_MAP1_TEXTURE_COORD_1 0x0D93 -#define GL_MAP1_TEXTURE_COORD_2 0x0D94 -#define GL_MAP1_TEXTURE_COORD_3 0x0D95 -#define GL_MAP1_TEXTURE_COORD_4 0x0D96 -#define GL_MAP1_VERTEX_3 0x0D97 -#define GL_MAP1_VERTEX_4 0x0D98 -#define GL_MAP2_COLOR_4 0x0DB0 -#define GL_MAP2_INDEX 0x0DB1 -#define GL_MAP2_NORMAL 0x0DB2 -#define GL_MAP2_TEXTURE_COORD_1 0x0DB3 -#define GL_MAP2_TEXTURE_COORD_2 0x0DB4 -#define GL_MAP2_TEXTURE_COORD_3 0x0DB5 -#define GL_MAP2_TEXTURE_COORD_4 0x0DB6 -#define GL_MAP2_VERTEX_3 0x0DB7 -#define GL_MAP2_VERTEX_4 0x0DB8 -#define GL_MAP1_GRID_DOMAIN 0x0DD0 -#define GL_MAP1_GRID_SEGMENTS 0x0DD1 -#define GL_MAP2_GRID_DOMAIN 0x0DD2 -#define GL_MAP2_GRID_SEGMENTS 0x0DD3 -#define GL_TEXTURE_1D 0x0DE0 -#define GL_TEXTURE_2D 0x0DE1 -#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0 -#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1 -#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2 -#define GL_SELECTION_BUFFER_POINTER 0x0DF3 -#define GL_SELECTION_BUFFER_SIZE 0x0DF4 -#define GL_TEXTURE_WIDTH 0x1000 -#define GL_TRANSFORM_BIT 0x00001000 -#define GL_TEXTURE_HEIGHT 0x1001 -#define GL_TEXTURE_INTERNAL_FORMAT 0x1003 -#define GL_TEXTURE_BORDER_COLOR 0x1004 -#define GL_TEXTURE_BORDER 0x1005 -#define GL_DONT_CARE 0x1100 -#define GL_FASTEST 0x1101 -#define GL_NICEST 0x1102 -#define GL_AMBIENT 0x1200 -#define GL_DIFFUSE 0x1201 -#define GL_SPECULAR 0x1202 -#define GL_POSITION 0x1203 -#define GL_SPOT_DIRECTION 0x1204 -#define GL_SPOT_EXPONENT 0x1205 -#define GL_SPOT_CUTOFF 0x1206 -#define GL_CONSTANT_ATTENUATION 0x1207 -#define GL_LINEAR_ATTENUATION 0x1208 -#define GL_QUADRATIC_ATTENUATION 0x1209 -#define GL_COMPILE 0x1300 -#define GL_COMPILE_AND_EXECUTE 0x1301 -#define GL_BYTE 0x1400 -#define GL_UNSIGNED_BYTE 0x1401 -#define GL_SHORT 0x1402 -#define GL_UNSIGNED_SHORT 0x1403 -#define GL_INT 0x1404 -#define GL_UNSIGNED_INT 0x1405 -#define GL_FLOAT 0x1406 -#define GL_2_BYTES 0x1407 -#define GL_3_BYTES 0x1408 -#define GL_4_BYTES 0x1409 -#define GL_DOUBLE 0x140A -#define GL_CLEAR 0x1500 -#define GL_AND 0x1501 -#define GL_AND_REVERSE 0x1502 -#define GL_COPY 0x1503 -#define GL_AND_INVERTED 0x1504 -#define GL_NOOP 0x1505 -#define GL_XOR 0x1506 -#define GL_OR 0x1507 -#define GL_NOR 0x1508 -#define GL_EQUIV 0x1509 -#define GL_INVERT 0x150A -#define GL_OR_REVERSE 0x150B -#define GL_COPY_INVERTED 0x150C -#define GL_OR_INVERTED 0x150D -#define GL_NAND 0x150E -#define GL_SET 0x150F -#define GL_EMISSION 0x1600 -#define GL_SHININESS 0x1601 -#define GL_AMBIENT_AND_DIFFUSE 0x1602 -#define GL_COLOR_INDEXES 0x1603 -#define GL_MODELVIEW 0x1700 -#define GL_PROJECTION 0x1701 -#define GL_TEXTURE 0x1702 -#define GL_COLOR 0x1800 -#define GL_DEPTH 0x1801 -#define GL_STENCIL 0x1802 -#define GL_COLOR_INDEX 0x1900 -#define GL_STENCIL_INDEX 0x1901 -#define GL_DEPTH_COMPONENT 0x1902 -#define GL_RED 0x1903 -#define GL_GREEN 0x1904 -#define GL_BLUE 0x1905 -#define GL_ALPHA 0x1906 -#define GL_RGB 0x1907 -#define GL_RGBA 0x1908 -#define GL_LUMINANCE 0x1909 -#define GL_LUMINANCE_ALPHA 0x190A -#define GL_BITMAP 0x1A00 -#define GL_POINT 0x1B00 -#define GL_LINE 0x1B01 -#define GL_FILL 0x1B02 -#define GL_RENDER 0x1C00 -#define GL_FEEDBACK 0x1C01 -#define GL_SELECT 0x1C02 -#define GL_FLAT 0x1D00 -#define GL_SMOOTH 0x1D01 -#define GL_KEEP 0x1E00 -#define GL_REPLACE 0x1E01 -#define GL_INCR 0x1E02 -#define GL_DECR 0x1E03 -#define GL_VENDOR 0x1F00 -#define GL_RENDERER 0x1F01 -#define GL_VERSION 0x1F02 -#define GL_EXTENSIONS 0x1F03 -#define GL_S 0x2000 -#define GL_ENABLE_BIT 0x00002000 -#define GL_T 0x2001 -#define GL_R 0x2002 -#define GL_Q 0x2003 -#define GL_MODULATE 0x2100 -#define GL_DECAL 0x2101 -#define GL_TEXTURE_ENV_MODE 0x2200 -#define GL_TEXTURE_ENV_COLOR 0x2201 -#define GL_TEXTURE_ENV 0x2300 -#define GL_EYE_LINEAR 0x2400 -#define GL_OBJECT_LINEAR 0x2401 -#define GL_SPHERE_MAP 0x2402 -#define GL_TEXTURE_GEN_MODE 0x2500 -#define GL_OBJECT_PLANE 0x2501 -#define GL_EYE_PLANE 0x2502 -#define GL_NEAREST 0x2600 -#define GL_LINEAR 0x2601 -#define GL_NEAREST_MIPMAP_NEAREST 0x2700 -#define GL_LINEAR_MIPMAP_NEAREST 0x2701 -#define GL_NEAREST_MIPMAP_LINEAR 0x2702 -#define GL_LINEAR_MIPMAP_LINEAR 0x2703 -#define GL_TEXTURE_MAG_FILTER 0x2800 -#define GL_TEXTURE_MIN_FILTER 0x2801 -#define GL_TEXTURE_WRAP_S 0x2802 -#define GL_TEXTURE_WRAP_T 0x2803 -#define GL_CLAMP 0x2900 -#define GL_REPEAT 0x2901 -#define GL_POLYGON_OFFSET_UNITS 0x2A00 -#define GL_POLYGON_OFFSET_POINT 0x2A01 -#define GL_POLYGON_OFFSET_LINE 0x2A02 -#define GL_R3_G3_B2 0x2A10 -#define GL_V2F 0x2A20 -#define GL_V3F 0x2A21 -#define GL_C4UB_V2F 0x2A22 -#define GL_C4UB_V3F 0x2A23 -#define GL_C3F_V3F 0x2A24 -#define GL_N3F_V3F 0x2A25 -#define GL_C4F_N3F_V3F 0x2A26 -#define GL_T2F_V3F 0x2A27 -#define GL_T4F_V4F 0x2A28 -#define GL_T2F_C4UB_V3F 0x2A29 -#define GL_T2F_C3F_V3F 0x2A2A -#define GL_T2F_N3F_V3F 0x2A2B -#define GL_T2F_C4F_N3F_V3F 0x2A2C -#define GL_T4F_C4F_N3F_V4F 0x2A2D -#define GL_CLIP_PLANE0 0x3000 -#define GL_CLIP_PLANE1 0x3001 -#define GL_CLIP_PLANE2 0x3002 -#define GL_CLIP_PLANE3 0x3003 -#define GL_CLIP_PLANE4 0x3004 -#define GL_CLIP_PLANE5 0x3005 -#define GL_LIGHT0 0x4000 -#define GL_COLOR_BUFFER_BIT 0x00004000 -#define GL_LIGHT1 0x4001 -#define GL_LIGHT2 0x4002 -#define GL_LIGHT3 0x4003 -#define GL_LIGHT4 0x4004 -#define GL_LIGHT5 0x4005 -#define GL_LIGHT6 0x4006 -#define GL_LIGHT7 0x4007 -#define GL_HINT_BIT 0x00008000 -#define GL_POLYGON_OFFSET_FILL 0x8037 -#define GL_POLYGON_OFFSET_FACTOR 0x8038 -#define GL_ALPHA4 0x803B -#define GL_ALPHA8 0x803C -#define GL_ALPHA12 0x803D -#define GL_ALPHA16 0x803E -#define GL_LUMINANCE4 0x803F -#define GL_LUMINANCE8 0x8040 -#define GL_LUMINANCE12 0x8041 -#define GL_LUMINANCE16 0x8042 -#define GL_LUMINANCE4_ALPHA4 0x8043 -#define GL_LUMINANCE6_ALPHA2 0x8044 -#define GL_LUMINANCE8_ALPHA8 0x8045 -#define GL_LUMINANCE12_ALPHA4 0x8046 -#define GL_LUMINANCE12_ALPHA12 0x8047 -#define GL_LUMINANCE16_ALPHA16 0x8048 -#define GL_INTENSITY 0x8049 -#define GL_INTENSITY4 0x804A -#define GL_INTENSITY8 0x804B -#define GL_INTENSITY12 0x804C -#define GL_INTENSITY16 0x804D -#define GL_RGB4 0x804F -#define GL_RGB5 0x8050 -#define GL_RGB8 0x8051 -#define GL_RGB10 0x8052 -#define GL_RGB12 0x8053 -#define GL_RGB16 0x8054 -#define GL_RGBA2 0x8055 -#define GL_RGBA4 0x8056 -#define GL_RGB5_A1 0x8057 -#define GL_RGBA8 0x8058 -#define GL_RGB10_A2 0x8059 -#define GL_RGBA12 0x805A -#define GL_RGBA16 0x805B -#define GL_TEXTURE_RED_SIZE 0x805C -#define GL_TEXTURE_GREEN_SIZE 0x805D -#define GL_TEXTURE_BLUE_SIZE 0x805E -#define GL_TEXTURE_ALPHA_SIZE 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE 0x8061 -#define GL_PROXY_TEXTURE_1D 0x8063 -#define GL_PROXY_TEXTURE_2D 0x8064 -#define GL_TEXTURE_PRIORITY 0x8066 -#define GL_TEXTURE_RESIDENT 0x8067 -#define GL_TEXTURE_BINDING_1D 0x8068 -#define GL_TEXTURE_BINDING_2D 0x8069 -#define GL_VERTEX_ARRAY 0x8074 -#define GL_NORMAL_ARRAY 0x8075 -#define GL_COLOR_ARRAY 0x8076 -#define GL_INDEX_ARRAY 0x8077 -#define GL_TEXTURE_COORD_ARRAY 0x8078 -#define GL_EDGE_FLAG_ARRAY 0x8079 -#define GL_VERTEX_ARRAY_SIZE 0x807A -#define GL_VERTEX_ARRAY_TYPE 0x807B -#define GL_VERTEX_ARRAY_STRIDE 0x807C -#define GL_NORMAL_ARRAY_TYPE 0x807E -#define GL_NORMAL_ARRAY_STRIDE 0x807F -#define GL_COLOR_ARRAY_SIZE 0x8081 -#define GL_COLOR_ARRAY_TYPE 0x8082 -#define GL_COLOR_ARRAY_STRIDE 0x8083 -#define GL_INDEX_ARRAY_TYPE 0x8085 -#define GL_INDEX_ARRAY_STRIDE 0x8086 -#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A -#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C -#define GL_VERTEX_ARRAY_POINTER 0x808E -#define GL_NORMAL_ARRAY_POINTER 0x808F -#define GL_COLOR_ARRAY_POINTER 0x8090 -#define GL_INDEX_ARRAY_POINTER 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093 -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_EVAL_BIT 0x00010000 -#define GL_LIST_BIT 0x00020000 -#define GL_TEXTURE_BIT 0x00040000 -#define GL_SCISSOR_BIT 0x00080000 -#define GL_ALL_ATTRIB_BITS 0x000fffff -#define GL_CLIENT_ALL_ATTRIB_BITS 0xffffffff - -GLAPI void GLAPIENTRY glAccum (GLenum op, GLfloat value); -GLAPI void GLAPIENTRY glAlphaFunc (GLenum func, GLclampf ref); -GLAPI GLboolean GLAPIENTRY glAreTexturesResident (GLsizei n, const GLuint *textures, GLboolean *residences); -GLAPI void GLAPIENTRY glArrayElement (GLint i); -GLAPI void GLAPIENTRY glBegin (GLenum mode); -GLAPI void GLAPIENTRY glBindTexture (GLenum target, GLuint texture); -GLAPI void GLAPIENTRY glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap); -GLAPI void GLAPIENTRY glBlendFunc (GLenum sfactor, GLenum dfactor); -GLAPI void GLAPIENTRY glCallList (GLuint list); -GLAPI void GLAPIENTRY glCallLists (GLsizei n, GLenum type, const void *lists); -GLAPI void GLAPIENTRY glClear (GLbitfield mask); -GLAPI void GLAPIENTRY glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GLAPI void GLAPIENTRY glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -GLAPI void GLAPIENTRY glClearDepth (GLclampd depth); -GLAPI void GLAPIENTRY glClearIndex (GLfloat c); -GLAPI void GLAPIENTRY glClearStencil (GLint s); -GLAPI void GLAPIENTRY glClipPlane (GLenum plane, const GLdouble *equation); -GLAPI void GLAPIENTRY glColor3b (GLbyte red, GLbyte green, GLbyte blue); -GLAPI void GLAPIENTRY glColor3bv (const GLbyte *v); -GLAPI void GLAPIENTRY glColor3d (GLdouble red, GLdouble green, GLdouble blue); -GLAPI void GLAPIENTRY glColor3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glColor3f (GLfloat red, GLfloat green, GLfloat blue); -GLAPI void GLAPIENTRY glColor3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glColor3i (GLint red, GLint green, GLint blue); -GLAPI void GLAPIENTRY glColor3iv (const GLint *v); -GLAPI void GLAPIENTRY glColor3s (GLshort red, GLshort green, GLshort blue); -GLAPI void GLAPIENTRY glColor3sv (const GLshort *v); -GLAPI void GLAPIENTRY glColor3ub (GLubyte red, GLubyte green, GLubyte blue); -GLAPI void GLAPIENTRY glColor3ubv (const GLubyte *v); -GLAPI void GLAPIENTRY glColor3ui (GLuint red, GLuint green, GLuint blue); -GLAPI void GLAPIENTRY glColor3uiv (const GLuint *v); -GLAPI void GLAPIENTRY glColor3us (GLushort red, GLushort green, GLushort blue); -GLAPI void GLAPIENTRY glColor3usv (const GLushort *v); -GLAPI void GLAPIENTRY glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha); -GLAPI void GLAPIENTRY glColor4bv (const GLbyte *v); -GLAPI void GLAPIENTRY glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha); -GLAPI void GLAPIENTRY glColor4dv (const GLdouble *v); -GLAPI void GLAPIENTRY glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -GLAPI void GLAPIENTRY glColor4fv (const GLfloat *v); -GLAPI void GLAPIENTRY glColor4i (GLint red, GLint green, GLint blue, GLint alpha); -GLAPI void GLAPIENTRY glColor4iv (const GLint *v); -GLAPI void GLAPIENTRY glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha); -GLAPI void GLAPIENTRY glColor4sv (const GLshort *v); -GLAPI void GLAPIENTRY glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha); -GLAPI void GLAPIENTRY glColor4ubv (const GLubyte *v); -GLAPI void GLAPIENTRY glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha); -GLAPI void GLAPIENTRY glColor4uiv (const GLuint *v); -GLAPI void GLAPIENTRY glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha); -GLAPI void GLAPIENTRY glColor4usv (const GLushort *v); -GLAPI void GLAPIENTRY glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -GLAPI void GLAPIENTRY glColorMaterial (GLenum face, GLenum mode); -GLAPI void GLAPIENTRY glColorPointer (GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); -GLAPI void GLAPIENTRY glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border); -GLAPI void GLAPIENTRY glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -GLAPI void GLAPIENTRY glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -GLAPI void GLAPIENTRY glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void GLAPIENTRY glCullFace (GLenum mode); -GLAPI void GLAPIENTRY glDeleteLists (GLuint list, GLsizei range); -GLAPI void GLAPIENTRY glDeleteTextures (GLsizei n, const GLuint *textures); -GLAPI void GLAPIENTRY glDepthFunc (GLenum func); -GLAPI void GLAPIENTRY glDepthMask (GLboolean flag); -GLAPI void GLAPIENTRY glDepthRange (GLclampd zNear, GLclampd zFar); -GLAPI void GLAPIENTRY glDisable (GLenum cap); -GLAPI void GLAPIENTRY glDisableClientState (GLenum array); -GLAPI void GLAPIENTRY glDrawArrays (GLenum mode, GLint first, GLsizei count); -GLAPI void GLAPIENTRY glDrawBuffer (GLenum mode); -GLAPI void GLAPIENTRY glDrawElements (GLenum mode, GLsizei count, GLenum type, const void *indices); -GLAPI void GLAPIENTRY glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glEdgeFlag (GLboolean flag); -GLAPI void GLAPIENTRY glEdgeFlagPointer (GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glEdgeFlagv (const GLboolean *flag); -GLAPI void GLAPIENTRY glEnable (GLenum cap); -GLAPI void GLAPIENTRY glEnableClientState (GLenum array); -GLAPI void GLAPIENTRY glEnd (void); -GLAPI void GLAPIENTRY glEndList (void); -GLAPI void GLAPIENTRY glEvalCoord1d (GLdouble u); -GLAPI void GLAPIENTRY glEvalCoord1dv (const GLdouble *u); -GLAPI void GLAPIENTRY glEvalCoord1f (GLfloat u); -GLAPI void GLAPIENTRY glEvalCoord1fv (const GLfloat *u); -GLAPI void GLAPIENTRY glEvalCoord2d (GLdouble u, GLdouble v); -GLAPI void GLAPIENTRY glEvalCoord2dv (const GLdouble *u); -GLAPI void GLAPIENTRY glEvalCoord2f (GLfloat u, GLfloat v); -GLAPI void GLAPIENTRY glEvalCoord2fv (const GLfloat *u); -GLAPI void GLAPIENTRY glEvalMesh1 (GLenum mode, GLint i1, GLint i2); -GLAPI void GLAPIENTRY glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2); -GLAPI void GLAPIENTRY glEvalPoint1 (GLint i); -GLAPI void GLAPIENTRY glEvalPoint2 (GLint i, GLint j); -GLAPI void GLAPIENTRY glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer); -GLAPI void GLAPIENTRY glFinish (void); -GLAPI void GLAPIENTRY glFlush (void); -GLAPI void GLAPIENTRY glFogf (GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glFogfv (GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glFogi (GLenum pname, GLint param); -GLAPI void GLAPIENTRY glFogiv (GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glFrontFace (GLenum mode); -GLAPI void GLAPIENTRY glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI GLuint GLAPIENTRY glGenLists (GLsizei range); -GLAPI void GLAPIENTRY glGenTextures (GLsizei n, GLuint *textures); -GLAPI void GLAPIENTRY glGetBooleanv (GLenum pname, GLboolean *params); -GLAPI void GLAPIENTRY glGetClipPlane (GLenum plane, GLdouble *equation); -GLAPI void GLAPIENTRY glGetDoublev (GLenum pname, GLdouble *params); -GLAPI GLenum GLAPIENTRY glGetError (void); -GLAPI void GLAPIENTRY glGetFloatv (GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetIntegerv (GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetLightfv (GLenum light, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetLightiv (GLenum light, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetMapdv (GLenum target, GLenum query, GLdouble *v); -GLAPI void GLAPIENTRY glGetMapfv (GLenum target, GLenum query, GLfloat *v); -GLAPI void GLAPIENTRY glGetMapiv (GLenum target, GLenum query, GLint *v); -GLAPI void GLAPIENTRY glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetMaterialiv (GLenum face, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetPixelMapfv (GLenum map, GLfloat *values); -GLAPI void GLAPIENTRY glGetPixelMapuiv (GLenum map, GLuint *values); -GLAPI void GLAPIENTRY glGetPixelMapusv (GLenum map, GLushort *values); -GLAPI void GLAPIENTRY glGetPointerv (GLenum pname, void* *params); -GLAPI void GLAPIENTRY glGetPolygonStipple (GLubyte *mask); -GLAPI const GLubyte * GLAPIENTRY glGetString (GLenum name); -GLAPI void GLAPIENTRY glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetTexEnviv (GLenum target, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params); -GLAPI void GLAPIENTRY glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetTexGeniv (GLenum coord, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, void *pixels); -GLAPI void GLAPIENTRY glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params); -GLAPI void GLAPIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint *params); -GLAPI void GLAPIENTRY glHint (GLenum target, GLenum mode); -GLAPI void GLAPIENTRY glIndexMask (GLuint mask); -GLAPI void GLAPIENTRY glIndexPointer (GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glIndexd (GLdouble c); -GLAPI void GLAPIENTRY glIndexdv (const GLdouble *c); -GLAPI void GLAPIENTRY glIndexf (GLfloat c); -GLAPI void GLAPIENTRY glIndexfv (const GLfloat *c); -GLAPI void GLAPIENTRY glIndexi (GLint c); -GLAPI void GLAPIENTRY glIndexiv (const GLint *c); -GLAPI void GLAPIENTRY glIndexs (GLshort c); -GLAPI void GLAPIENTRY glIndexsv (const GLshort *c); -GLAPI void GLAPIENTRY glIndexub (GLubyte c); -GLAPI void GLAPIENTRY glIndexubv (const GLubyte *c); -GLAPI void GLAPIENTRY glInitNames (void); -GLAPI void GLAPIENTRY glInterleavedArrays (GLenum format, GLsizei stride, const void *pointer); -GLAPI GLboolean GLAPIENTRY glIsEnabled (GLenum cap); -GLAPI GLboolean GLAPIENTRY glIsList (GLuint list); -GLAPI GLboolean GLAPIENTRY glIsTexture (GLuint texture); -GLAPI void GLAPIENTRY glLightModelf (GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glLightModelfv (GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glLightModeli (GLenum pname, GLint param); -GLAPI void GLAPIENTRY glLightModeliv (GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glLightf (GLenum light, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glLightfv (GLenum light, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glLighti (GLenum light, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glLightiv (GLenum light, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glLineStipple (GLint factor, GLushort pattern); -GLAPI void GLAPIENTRY glLineWidth (GLfloat width); -GLAPI void GLAPIENTRY glListBase (GLuint base); -GLAPI void GLAPIENTRY glLoadIdentity (void); -GLAPI void GLAPIENTRY glLoadMatrixd (const GLdouble *m); -GLAPI void GLAPIENTRY glLoadMatrixf (const GLfloat *m); -GLAPI void GLAPIENTRY glLoadName (GLuint name); -GLAPI void GLAPIENTRY glLogicOp (GLenum opcode); -GLAPI void GLAPIENTRY glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points); -GLAPI void GLAPIENTRY glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points); -GLAPI void GLAPIENTRY glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points); -GLAPI void GLAPIENTRY glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points); -GLAPI void GLAPIENTRY glMapGrid1d (GLint un, GLdouble u1, GLdouble u2); -GLAPI void GLAPIENTRY glMapGrid1f (GLint un, GLfloat u1, GLfloat u2); -GLAPI void GLAPIENTRY glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2); -GLAPI void GLAPIENTRY glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2); -GLAPI void GLAPIENTRY glMaterialf (GLenum face, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glMaterialfv (GLenum face, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glMateriali (GLenum face, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glMaterialiv (GLenum face, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glMatrixMode (GLenum mode); -GLAPI void GLAPIENTRY glMultMatrixd (const GLdouble *m); -GLAPI void GLAPIENTRY glMultMatrixf (const GLfloat *m); -GLAPI void GLAPIENTRY glNewList (GLuint list, GLenum mode); -GLAPI void GLAPIENTRY glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz); -GLAPI void GLAPIENTRY glNormal3bv (const GLbyte *v); -GLAPI void GLAPIENTRY glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz); -GLAPI void GLAPIENTRY glNormal3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz); -GLAPI void GLAPIENTRY glNormal3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glNormal3i (GLint nx, GLint ny, GLint nz); -GLAPI void GLAPIENTRY glNormal3iv (const GLint *v); -GLAPI void GLAPIENTRY glNormal3s (GLshort nx, GLshort ny, GLshort nz); -GLAPI void GLAPIENTRY glNormal3sv (const GLshort *v); -GLAPI void GLAPIENTRY glNormalPointer (GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar); -GLAPI void GLAPIENTRY glPassThrough (GLfloat token); -GLAPI void GLAPIENTRY glPixelMapfv (GLenum map, GLsizei mapsize, const GLfloat *values); -GLAPI void GLAPIENTRY glPixelMapuiv (GLenum map, GLsizei mapsize, const GLuint *values); -GLAPI void GLAPIENTRY glPixelMapusv (GLenum map, GLsizei mapsize, const GLushort *values); -GLAPI void GLAPIENTRY glPixelStoref (GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glPixelStorei (GLenum pname, GLint param); -GLAPI void GLAPIENTRY glPixelTransferf (GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glPixelTransferi (GLenum pname, GLint param); -GLAPI void GLAPIENTRY glPixelZoom (GLfloat xfactor, GLfloat yfactor); -GLAPI void GLAPIENTRY glPointSize (GLfloat size); -GLAPI void GLAPIENTRY glPolygonMode (GLenum face, GLenum mode); -GLAPI void GLAPIENTRY glPolygonOffset (GLfloat factor, GLfloat units); -GLAPI void GLAPIENTRY glPolygonStipple (const GLubyte *mask); -GLAPI void GLAPIENTRY glPopAttrib (void); -GLAPI void GLAPIENTRY glPopClientAttrib (void); -GLAPI void GLAPIENTRY glPopMatrix (void); -GLAPI void GLAPIENTRY glPopName (void); -GLAPI void GLAPIENTRY glPrioritizeTextures (GLsizei n, const GLuint *textures, const GLclampf *priorities); -GLAPI void GLAPIENTRY glPushAttrib (GLbitfield mask); -GLAPI void GLAPIENTRY glPushClientAttrib (GLbitfield mask); -GLAPI void GLAPIENTRY glPushMatrix (void); -GLAPI void GLAPIENTRY glPushName (GLuint name); -GLAPI void GLAPIENTRY glRasterPos2d (GLdouble x, GLdouble y); -GLAPI void GLAPIENTRY glRasterPos2dv (const GLdouble *v); -GLAPI void GLAPIENTRY glRasterPos2f (GLfloat x, GLfloat y); -GLAPI void GLAPIENTRY glRasterPos2fv (const GLfloat *v); -GLAPI void GLAPIENTRY glRasterPos2i (GLint x, GLint y); -GLAPI void GLAPIENTRY glRasterPos2iv (const GLint *v); -GLAPI void GLAPIENTRY glRasterPos2s (GLshort x, GLshort y); -GLAPI void GLAPIENTRY glRasterPos2sv (const GLshort *v); -GLAPI void GLAPIENTRY glRasterPos3d (GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glRasterPos3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glRasterPos3f (GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glRasterPos3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glRasterPos3i (GLint x, GLint y, GLint z); -GLAPI void GLAPIENTRY glRasterPos3iv (const GLint *v); -GLAPI void GLAPIENTRY glRasterPos3s (GLshort x, GLshort y, GLshort z); -GLAPI void GLAPIENTRY glRasterPos3sv (const GLshort *v); -GLAPI void GLAPIENTRY glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void GLAPIENTRY glRasterPos4dv (const GLdouble *v); -GLAPI void GLAPIENTRY glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void GLAPIENTRY glRasterPos4fv (const GLfloat *v); -GLAPI void GLAPIENTRY glRasterPos4i (GLint x, GLint y, GLint z, GLint w); -GLAPI void GLAPIENTRY glRasterPos4iv (const GLint *v); -GLAPI void GLAPIENTRY glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void GLAPIENTRY glRasterPos4sv (const GLshort *v); -GLAPI void GLAPIENTRY glReadBuffer (GLenum mode); -GLAPI void GLAPIENTRY glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void *pixels); -GLAPI void GLAPIENTRY glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2); -GLAPI void GLAPIENTRY glRectdv (const GLdouble *v1, const GLdouble *v2); -GLAPI void GLAPIENTRY glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2); -GLAPI void GLAPIENTRY glRectfv (const GLfloat *v1, const GLfloat *v2); -GLAPI void GLAPIENTRY glRecti (GLint x1, GLint y1, GLint x2, GLint y2); -GLAPI void GLAPIENTRY glRectiv (const GLint *v1, const GLint *v2); -GLAPI void GLAPIENTRY glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2); -GLAPI void GLAPIENTRY glRectsv (const GLshort *v1, const GLshort *v2); -GLAPI GLint GLAPIENTRY glRenderMode (GLenum mode); -GLAPI void GLAPIENTRY glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glScaled (GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glScalef (GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height); -GLAPI void GLAPIENTRY glSelectBuffer (GLsizei size, GLuint *buffer); -GLAPI void GLAPIENTRY glShadeModel (GLenum mode); -GLAPI void GLAPIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask); -GLAPI void GLAPIENTRY glStencilMask (GLuint mask); -GLAPI void GLAPIENTRY glStencilOp (GLenum fail, GLenum zfail, GLenum zpass); -GLAPI void GLAPIENTRY glTexCoord1d (GLdouble s); -GLAPI void GLAPIENTRY glTexCoord1dv (const GLdouble *v); -GLAPI void GLAPIENTRY glTexCoord1f (GLfloat s); -GLAPI void GLAPIENTRY glTexCoord1fv (const GLfloat *v); -GLAPI void GLAPIENTRY glTexCoord1i (GLint s); -GLAPI void GLAPIENTRY glTexCoord1iv (const GLint *v); -GLAPI void GLAPIENTRY glTexCoord1s (GLshort s); -GLAPI void GLAPIENTRY glTexCoord1sv (const GLshort *v); -GLAPI void GLAPIENTRY glTexCoord2d (GLdouble s, GLdouble t); -GLAPI void GLAPIENTRY glTexCoord2dv (const GLdouble *v); -GLAPI void GLAPIENTRY glTexCoord2f (GLfloat s, GLfloat t); -GLAPI void GLAPIENTRY glTexCoord2fv (const GLfloat *v); -GLAPI void GLAPIENTRY glTexCoord2i (GLint s, GLint t); -GLAPI void GLAPIENTRY glTexCoord2iv (const GLint *v); -GLAPI void GLAPIENTRY glTexCoord2s (GLshort s, GLshort t); -GLAPI void GLAPIENTRY glTexCoord2sv (const GLshort *v); -GLAPI void GLAPIENTRY glTexCoord3d (GLdouble s, GLdouble t, GLdouble r); -GLAPI void GLAPIENTRY glTexCoord3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glTexCoord3f (GLfloat s, GLfloat t, GLfloat r); -GLAPI void GLAPIENTRY glTexCoord3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glTexCoord3i (GLint s, GLint t, GLint r); -GLAPI void GLAPIENTRY glTexCoord3iv (const GLint *v); -GLAPI void GLAPIENTRY glTexCoord3s (GLshort s, GLshort t, GLshort r); -GLAPI void GLAPIENTRY glTexCoord3sv (const GLshort *v); -GLAPI void GLAPIENTRY glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q); -GLAPI void GLAPIENTRY glTexCoord4dv (const GLdouble *v); -GLAPI void GLAPIENTRY glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q); -GLAPI void GLAPIENTRY glTexCoord4fv (const GLfloat *v); -GLAPI void GLAPIENTRY glTexCoord4i (GLint s, GLint t, GLint r, GLint q); -GLAPI void GLAPIENTRY glTexCoord4iv (const GLint *v); -GLAPI void GLAPIENTRY glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q); -GLAPI void GLAPIENTRY glTexCoord4sv (const GLshort *v); -GLAPI void GLAPIENTRY glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glTexEnvf (GLenum target, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glTexEnvi (GLenum target, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glTexEnviv (GLenum target, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glTexGend (GLenum coord, GLenum pname, GLdouble param); -GLAPI void GLAPIENTRY glTexGendv (GLenum coord, GLenum pname, const GLdouble *params); -GLAPI void GLAPIENTRY glTexGenf (GLenum coord, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glTexGenfv (GLenum coord, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glTexGeni (GLenum coord, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glTexGeniv (GLenum coord, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glTexParameterf (GLenum target, GLenum pname, GLfloat param); -GLAPI void GLAPIENTRY glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params); -GLAPI void GLAPIENTRY glTexParameteri (GLenum target, GLenum pname, GLint param); -GLAPI void GLAPIENTRY glTexParameteriv (GLenum target, GLenum pname, const GLint *params); -GLAPI void GLAPIENTRY glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -GLAPI void GLAPIENTRY glTranslated (GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glTranslatef (GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glVertex2d (GLdouble x, GLdouble y); -GLAPI void GLAPIENTRY glVertex2dv (const GLdouble *v); -GLAPI void GLAPIENTRY glVertex2f (GLfloat x, GLfloat y); -GLAPI void GLAPIENTRY glVertex2fv (const GLfloat *v); -GLAPI void GLAPIENTRY glVertex2i (GLint x, GLint y); -GLAPI void GLAPIENTRY glVertex2iv (const GLint *v); -GLAPI void GLAPIENTRY glVertex2s (GLshort x, GLshort y); -GLAPI void GLAPIENTRY glVertex2sv (const GLshort *v); -GLAPI void GLAPIENTRY glVertex3d (GLdouble x, GLdouble y, GLdouble z); -GLAPI void GLAPIENTRY glVertex3dv (const GLdouble *v); -GLAPI void GLAPIENTRY glVertex3f (GLfloat x, GLfloat y, GLfloat z); -GLAPI void GLAPIENTRY glVertex3fv (const GLfloat *v); -GLAPI void GLAPIENTRY glVertex3i (GLint x, GLint y, GLint z); -GLAPI void GLAPIENTRY glVertex3iv (const GLint *v); -GLAPI void GLAPIENTRY glVertex3s (GLshort x, GLshort y, GLshort z); -GLAPI void GLAPIENTRY glVertex3sv (const GLshort *v); -GLAPI void GLAPIENTRY glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -GLAPI void GLAPIENTRY glVertex4dv (const GLdouble *v); -GLAPI void GLAPIENTRY glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void GLAPIENTRY glVertex4fv (const GLfloat *v); -GLAPI void GLAPIENTRY glVertex4i (GLint x, GLint y, GLint z, GLint w); -GLAPI void GLAPIENTRY glVertex4iv (const GLint *v); -GLAPI void GLAPIENTRY glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w); -GLAPI void GLAPIENTRY glVertex4sv (const GLshort *v); -GLAPI void GLAPIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const void *pointer); -GLAPI void GLAPIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height); - -#define GLEW_VERSION_1_1 GLEW_GET_VAR(__GLEW_VERSION_1_1) - -#endif /* GL_VERSION_1_1 */ - -/* ---------------------------------- GLU ---------------------------------- */ - -#ifndef GLEW_NO_GLU -# ifdef __APPLE__ -# include -# if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) -# define GLEW_NO_GLU -# endif -# endif -#endif - -#ifndef GLEW_NO_GLU -/* this is where we can safely include GLU */ -# if defined(__APPLE__) && defined(__MACH__) -# include -# else -# include -# endif -#endif - -/* ----------------------------- GL_VERSION_1_2 ---------------------------- */ - -#ifndef GL_VERSION_1_2 -#define GL_VERSION_1_2 1 - -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_RESCALE_NORMAL 0x803A -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E - -typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices); -typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); - -#define glCopyTexSubImage3D GLEW_GET_FUN(__glewCopyTexSubImage3D) -#define glDrawRangeElements GLEW_GET_FUN(__glewDrawRangeElements) -#define glTexImage3D GLEW_GET_FUN(__glewTexImage3D) -#define glTexSubImage3D GLEW_GET_FUN(__glewTexSubImage3D) - -#define GLEW_VERSION_1_2 GLEW_GET_VAR(__GLEW_VERSION_1_2) - -#endif /* GL_VERSION_1_2 */ - -/* ---------------------------- GL_VERSION_1_2_1 --------------------------- */ - -#ifndef GL_VERSION_1_2_1 -#define GL_VERSION_1_2_1 1 - -#define GLEW_VERSION_1_2_1 GLEW_GET_VAR(__GLEW_VERSION_1_2_1) - -#endif /* GL_VERSION_1_2_1 */ - -/* ----------------------------- GL_VERSION_1_3 ---------------------------- */ - -#ifndef GL_VERSION_1_3 -#define GL_VERSION_1_3 1 - -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_CLAMP_TO_BORDER 0x812D -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_SUBTRACT 0x84E7 -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#define GL_MULTISAMPLE_BIT 0x20000000 - -typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREPROC) (GLenum texture); -typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, void *img); -typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble m[16]); -typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat m[16]); -typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble m[16]); -typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat m[16]); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); - -#define glActiveTexture GLEW_GET_FUN(__glewActiveTexture) -#define glClientActiveTexture GLEW_GET_FUN(__glewClientActiveTexture) -#define glCompressedTexImage1D GLEW_GET_FUN(__glewCompressedTexImage1D) -#define glCompressedTexImage2D GLEW_GET_FUN(__glewCompressedTexImage2D) -#define glCompressedTexImage3D GLEW_GET_FUN(__glewCompressedTexImage3D) -#define glCompressedTexSubImage1D GLEW_GET_FUN(__glewCompressedTexSubImage1D) -#define glCompressedTexSubImage2D GLEW_GET_FUN(__glewCompressedTexSubImage2D) -#define glCompressedTexSubImage3D GLEW_GET_FUN(__glewCompressedTexSubImage3D) -#define glGetCompressedTexImage GLEW_GET_FUN(__glewGetCompressedTexImage) -#define glLoadTransposeMatrixd GLEW_GET_FUN(__glewLoadTransposeMatrixd) -#define glLoadTransposeMatrixf GLEW_GET_FUN(__glewLoadTransposeMatrixf) -#define glMultTransposeMatrixd GLEW_GET_FUN(__glewMultTransposeMatrixd) -#define glMultTransposeMatrixf GLEW_GET_FUN(__glewMultTransposeMatrixf) -#define glMultiTexCoord1d GLEW_GET_FUN(__glewMultiTexCoord1d) -#define glMultiTexCoord1dv GLEW_GET_FUN(__glewMultiTexCoord1dv) -#define glMultiTexCoord1f GLEW_GET_FUN(__glewMultiTexCoord1f) -#define glMultiTexCoord1fv GLEW_GET_FUN(__glewMultiTexCoord1fv) -#define glMultiTexCoord1i GLEW_GET_FUN(__glewMultiTexCoord1i) -#define glMultiTexCoord1iv GLEW_GET_FUN(__glewMultiTexCoord1iv) -#define glMultiTexCoord1s GLEW_GET_FUN(__glewMultiTexCoord1s) -#define glMultiTexCoord1sv GLEW_GET_FUN(__glewMultiTexCoord1sv) -#define glMultiTexCoord2d GLEW_GET_FUN(__glewMultiTexCoord2d) -#define glMultiTexCoord2dv GLEW_GET_FUN(__glewMultiTexCoord2dv) -#define glMultiTexCoord2f GLEW_GET_FUN(__glewMultiTexCoord2f) -#define glMultiTexCoord2fv GLEW_GET_FUN(__glewMultiTexCoord2fv) -#define glMultiTexCoord2i GLEW_GET_FUN(__glewMultiTexCoord2i) -#define glMultiTexCoord2iv GLEW_GET_FUN(__glewMultiTexCoord2iv) -#define glMultiTexCoord2s GLEW_GET_FUN(__glewMultiTexCoord2s) -#define glMultiTexCoord2sv GLEW_GET_FUN(__glewMultiTexCoord2sv) -#define glMultiTexCoord3d GLEW_GET_FUN(__glewMultiTexCoord3d) -#define glMultiTexCoord3dv GLEW_GET_FUN(__glewMultiTexCoord3dv) -#define glMultiTexCoord3f GLEW_GET_FUN(__glewMultiTexCoord3f) -#define glMultiTexCoord3fv GLEW_GET_FUN(__glewMultiTexCoord3fv) -#define glMultiTexCoord3i GLEW_GET_FUN(__glewMultiTexCoord3i) -#define glMultiTexCoord3iv GLEW_GET_FUN(__glewMultiTexCoord3iv) -#define glMultiTexCoord3s GLEW_GET_FUN(__glewMultiTexCoord3s) -#define glMultiTexCoord3sv GLEW_GET_FUN(__glewMultiTexCoord3sv) -#define glMultiTexCoord4d GLEW_GET_FUN(__glewMultiTexCoord4d) -#define glMultiTexCoord4dv GLEW_GET_FUN(__glewMultiTexCoord4dv) -#define glMultiTexCoord4f GLEW_GET_FUN(__glewMultiTexCoord4f) -#define glMultiTexCoord4fv GLEW_GET_FUN(__glewMultiTexCoord4fv) -#define glMultiTexCoord4i GLEW_GET_FUN(__glewMultiTexCoord4i) -#define glMultiTexCoord4iv GLEW_GET_FUN(__glewMultiTexCoord4iv) -#define glMultiTexCoord4s GLEW_GET_FUN(__glewMultiTexCoord4s) -#define glMultiTexCoord4sv GLEW_GET_FUN(__glewMultiTexCoord4sv) -#define glSampleCoverage GLEW_GET_FUN(__glewSampleCoverage) - -#define GLEW_VERSION_1_3 GLEW_GET_VAR(__GLEW_VERSION_1_3) - -#endif /* GL_VERSION_1_3 */ - -/* ----------------------------- GL_VERSION_1_4 ---------------------------- */ - -#ifndef GL_VERSION_1_4 -#define GL_VERSION_1_4 1 - -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#define GL_COMPARE_R_TO_TEXTURE 0x884E - -typedef void (GLAPIENTRY * PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONPROC) (GLenum mode); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLFOGCOORDDPROC) (GLdouble coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDDVPROC) (const GLdouble *coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFPROC) (GLfloat coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFVPROC) (const GLfloat *coord); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const* indices, GLsizei drawcount); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVPROC) (const GLdouble *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVPROC) (const GLfloat *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IPROC) (GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVPROC) (const GLint *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVPROC) (const GLshort *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVPROC) (const GLdouble *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVPROC) (const GLfloat *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVPROC) (const GLint *p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVPROC) (const GLshort *p); - -#define glBlendColor GLEW_GET_FUN(__glewBlendColor) -#define glBlendEquation GLEW_GET_FUN(__glewBlendEquation) -#define glBlendFuncSeparate GLEW_GET_FUN(__glewBlendFuncSeparate) -#define glFogCoordPointer GLEW_GET_FUN(__glewFogCoordPointer) -#define glFogCoordd GLEW_GET_FUN(__glewFogCoordd) -#define glFogCoorddv GLEW_GET_FUN(__glewFogCoorddv) -#define glFogCoordf GLEW_GET_FUN(__glewFogCoordf) -#define glFogCoordfv GLEW_GET_FUN(__glewFogCoordfv) -#define glMultiDrawArrays GLEW_GET_FUN(__glewMultiDrawArrays) -#define glMultiDrawElements GLEW_GET_FUN(__glewMultiDrawElements) -#define glPointParameterf GLEW_GET_FUN(__glewPointParameterf) -#define glPointParameterfv GLEW_GET_FUN(__glewPointParameterfv) -#define glPointParameteri GLEW_GET_FUN(__glewPointParameteri) -#define glPointParameteriv GLEW_GET_FUN(__glewPointParameteriv) -#define glSecondaryColor3b GLEW_GET_FUN(__glewSecondaryColor3b) -#define glSecondaryColor3bv GLEW_GET_FUN(__glewSecondaryColor3bv) -#define glSecondaryColor3d GLEW_GET_FUN(__glewSecondaryColor3d) -#define glSecondaryColor3dv GLEW_GET_FUN(__glewSecondaryColor3dv) -#define glSecondaryColor3f GLEW_GET_FUN(__glewSecondaryColor3f) -#define glSecondaryColor3fv GLEW_GET_FUN(__glewSecondaryColor3fv) -#define glSecondaryColor3i GLEW_GET_FUN(__glewSecondaryColor3i) -#define glSecondaryColor3iv GLEW_GET_FUN(__glewSecondaryColor3iv) -#define glSecondaryColor3s GLEW_GET_FUN(__glewSecondaryColor3s) -#define glSecondaryColor3sv GLEW_GET_FUN(__glewSecondaryColor3sv) -#define glSecondaryColor3ub GLEW_GET_FUN(__glewSecondaryColor3ub) -#define glSecondaryColor3ubv GLEW_GET_FUN(__glewSecondaryColor3ubv) -#define glSecondaryColor3ui GLEW_GET_FUN(__glewSecondaryColor3ui) -#define glSecondaryColor3uiv GLEW_GET_FUN(__glewSecondaryColor3uiv) -#define glSecondaryColor3us GLEW_GET_FUN(__glewSecondaryColor3us) -#define glSecondaryColor3usv GLEW_GET_FUN(__glewSecondaryColor3usv) -#define glSecondaryColorPointer GLEW_GET_FUN(__glewSecondaryColorPointer) -#define glWindowPos2d GLEW_GET_FUN(__glewWindowPos2d) -#define glWindowPos2dv GLEW_GET_FUN(__glewWindowPos2dv) -#define glWindowPos2f GLEW_GET_FUN(__glewWindowPos2f) -#define glWindowPos2fv GLEW_GET_FUN(__glewWindowPos2fv) -#define glWindowPos2i GLEW_GET_FUN(__glewWindowPos2i) -#define glWindowPos2iv GLEW_GET_FUN(__glewWindowPos2iv) -#define glWindowPos2s GLEW_GET_FUN(__glewWindowPos2s) -#define glWindowPos2sv GLEW_GET_FUN(__glewWindowPos2sv) -#define glWindowPos3d GLEW_GET_FUN(__glewWindowPos3d) -#define glWindowPos3dv GLEW_GET_FUN(__glewWindowPos3dv) -#define glWindowPos3f GLEW_GET_FUN(__glewWindowPos3f) -#define glWindowPos3fv GLEW_GET_FUN(__glewWindowPos3fv) -#define glWindowPos3i GLEW_GET_FUN(__glewWindowPos3i) -#define glWindowPos3iv GLEW_GET_FUN(__glewWindowPos3iv) -#define glWindowPos3s GLEW_GET_FUN(__glewWindowPos3s) -#define glWindowPos3sv GLEW_GET_FUN(__glewWindowPos3sv) - -#define GLEW_VERSION_1_4 GLEW_GET_VAR(__GLEW_VERSION_1_4) - -#endif /* GL_VERSION_1_4 */ - -/* ----------------------------- GL_VERSION_1_5 ---------------------------- */ - -#ifndef GL_VERSION_1_5 -#define GL_VERSION_1_5 1 - -#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE -#define GL_FOG_COORD GL_FOG_COORDINATE -#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING -#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER -#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE -#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE -#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE -#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA -#define GL_SRC0_RGB GL_SOURCE0_RGB -#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA -#define GL_SRC1_RGB GL_SOURCE1_RGB -#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA -#define GL_SRC2_RGB GL_SOURCE2_RGB -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 - -typedef ptrdiff_t GLintptr; -typedef ptrdiff_t GLsizeiptr; - -typedef void (GLAPIENTRY * PFNGLBEGINQUERYPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const void* data, GLenum usage); -typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const void* data); -typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLENDQUERYPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGENBUFFERSPROC) (GLsizei n, GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLGENQUERIESPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, void** params); -typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, void* data); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERPROC) (GLuint buffer); -typedef GLboolean (GLAPIENTRY * PFNGLISQUERYPROC) (GLuint id); -typedef void* (GLAPIENTRY * PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); -typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERPROC) (GLenum target); - -#define glBeginQuery GLEW_GET_FUN(__glewBeginQuery) -#define glBindBuffer GLEW_GET_FUN(__glewBindBuffer) -#define glBufferData GLEW_GET_FUN(__glewBufferData) -#define glBufferSubData GLEW_GET_FUN(__glewBufferSubData) -#define glDeleteBuffers GLEW_GET_FUN(__glewDeleteBuffers) -#define glDeleteQueries GLEW_GET_FUN(__glewDeleteQueries) -#define glEndQuery GLEW_GET_FUN(__glewEndQuery) -#define glGenBuffers GLEW_GET_FUN(__glewGenBuffers) -#define glGenQueries GLEW_GET_FUN(__glewGenQueries) -#define glGetBufferParameteriv GLEW_GET_FUN(__glewGetBufferParameteriv) -#define glGetBufferPointerv GLEW_GET_FUN(__glewGetBufferPointerv) -#define glGetBufferSubData GLEW_GET_FUN(__glewGetBufferSubData) -#define glGetQueryObjectiv GLEW_GET_FUN(__glewGetQueryObjectiv) -#define glGetQueryObjectuiv GLEW_GET_FUN(__glewGetQueryObjectuiv) -#define glGetQueryiv GLEW_GET_FUN(__glewGetQueryiv) -#define glIsBuffer GLEW_GET_FUN(__glewIsBuffer) -#define glIsQuery GLEW_GET_FUN(__glewIsQuery) -#define glMapBuffer GLEW_GET_FUN(__glewMapBuffer) -#define glUnmapBuffer GLEW_GET_FUN(__glewUnmapBuffer) - -#define GLEW_VERSION_1_5 GLEW_GET_VAR(__GLEW_VERSION_1_5) - -#endif /* GL_VERSION_1_5 */ - -/* ----------------------------- GL_VERSION_2_0 ---------------------------- */ - -#ifndef GL_VERSION_2_0 -#define GL_VERSION_2_0 1 - -#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_COORDS 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 - -typedef void (GLAPIENTRY * PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha); -typedef void (GLAPIENTRY * PFNGLCOMPILESHADERPROC) (GLuint shader); -typedef GLuint (GLAPIENTRY * PFNGLCREATEPROGRAMPROC) (void); -typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROC) (GLenum type); -typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLDELETESHADERPROC) (GLuint shader); -typedef void (GLAPIENTRY * PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum* bufs); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei maxLength, GLsizei* length, GLint* size, GLenum* type, GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei* count, GLuint* shaders); -typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLchar* infoLog); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei* length, GLchar* infoLog); -typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEPROC) (GLuint obj, GLsizei maxLength, GLsizei* length, GLchar* source); -typedef void (GLAPIENTRY * PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint* param); -typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, void** pointer); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPROC) (GLuint program); -typedef GLboolean (GLAPIENTRY * PFNGLISSHADERPROC) (GLuint shader); -typedef void (GLAPIENTRY * PFNGLLINKPROGRAMPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar *const* string, const GLint* length); -typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (GLAPIENTRY * PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1IPROC) (GLint location, GLint v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUSEPROGRAMPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* pointer); - -#define glAttachShader GLEW_GET_FUN(__glewAttachShader) -#define glBindAttribLocation GLEW_GET_FUN(__glewBindAttribLocation) -#define glBlendEquationSeparate GLEW_GET_FUN(__glewBlendEquationSeparate) -#define glCompileShader GLEW_GET_FUN(__glewCompileShader) -#define glCreateProgram GLEW_GET_FUN(__glewCreateProgram) -#define glCreateShader GLEW_GET_FUN(__glewCreateShader) -#define glDeleteProgram GLEW_GET_FUN(__glewDeleteProgram) -#define glDeleteShader GLEW_GET_FUN(__glewDeleteShader) -#define glDetachShader GLEW_GET_FUN(__glewDetachShader) -#define glDisableVertexAttribArray GLEW_GET_FUN(__glewDisableVertexAttribArray) -#define glDrawBuffers GLEW_GET_FUN(__glewDrawBuffers) -#define glEnableVertexAttribArray GLEW_GET_FUN(__glewEnableVertexAttribArray) -#define glGetActiveAttrib GLEW_GET_FUN(__glewGetActiveAttrib) -#define glGetActiveUniform GLEW_GET_FUN(__glewGetActiveUniform) -#define glGetAttachedShaders GLEW_GET_FUN(__glewGetAttachedShaders) -#define glGetAttribLocation GLEW_GET_FUN(__glewGetAttribLocation) -#define glGetProgramInfoLog GLEW_GET_FUN(__glewGetProgramInfoLog) -#define glGetProgramiv GLEW_GET_FUN(__glewGetProgramiv) -#define glGetShaderInfoLog GLEW_GET_FUN(__glewGetShaderInfoLog) -#define glGetShaderSource GLEW_GET_FUN(__glewGetShaderSource) -#define glGetShaderiv GLEW_GET_FUN(__glewGetShaderiv) -#define glGetUniformLocation GLEW_GET_FUN(__glewGetUniformLocation) -#define glGetUniformfv GLEW_GET_FUN(__glewGetUniformfv) -#define glGetUniformiv GLEW_GET_FUN(__glewGetUniformiv) -#define glGetVertexAttribPointerv GLEW_GET_FUN(__glewGetVertexAttribPointerv) -#define glGetVertexAttribdv GLEW_GET_FUN(__glewGetVertexAttribdv) -#define glGetVertexAttribfv GLEW_GET_FUN(__glewGetVertexAttribfv) -#define glGetVertexAttribiv GLEW_GET_FUN(__glewGetVertexAttribiv) -#define glIsProgram GLEW_GET_FUN(__glewIsProgram) -#define glIsShader GLEW_GET_FUN(__glewIsShader) -#define glLinkProgram GLEW_GET_FUN(__glewLinkProgram) -#define glShaderSource GLEW_GET_FUN(__glewShaderSource) -#define glStencilFuncSeparate GLEW_GET_FUN(__glewStencilFuncSeparate) -#define glStencilMaskSeparate GLEW_GET_FUN(__glewStencilMaskSeparate) -#define glStencilOpSeparate GLEW_GET_FUN(__glewStencilOpSeparate) -#define glUniform1f GLEW_GET_FUN(__glewUniform1f) -#define glUniform1fv GLEW_GET_FUN(__glewUniform1fv) -#define glUniform1i GLEW_GET_FUN(__glewUniform1i) -#define glUniform1iv GLEW_GET_FUN(__glewUniform1iv) -#define glUniform2f GLEW_GET_FUN(__glewUniform2f) -#define glUniform2fv GLEW_GET_FUN(__glewUniform2fv) -#define glUniform2i GLEW_GET_FUN(__glewUniform2i) -#define glUniform2iv GLEW_GET_FUN(__glewUniform2iv) -#define glUniform3f GLEW_GET_FUN(__glewUniform3f) -#define glUniform3fv GLEW_GET_FUN(__glewUniform3fv) -#define glUniform3i GLEW_GET_FUN(__glewUniform3i) -#define glUniform3iv GLEW_GET_FUN(__glewUniform3iv) -#define glUniform4f GLEW_GET_FUN(__glewUniform4f) -#define glUniform4fv GLEW_GET_FUN(__glewUniform4fv) -#define glUniform4i GLEW_GET_FUN(__glewUniform4i) -#define glUniform4iv GLEW_GET_FUN(__glewUniform4iv) -#define glUniformMatrix2fv GLEW_GET_FUN(__glewUniformMatrix2fv) -#define glUniformMatrix3fv GLEW_GET_FUN(__glewUniformMatrix3fv) -#define glUniformMatrix4fv GLEW_GET_FUN(__glewUniformMatrix4fv) -#define glUseProgram GLEW_GET_FUN(__glewUseProgram) -#define glValidateProgram GLEW_GET_FUN(__glewValidateProgram) -#define glVertexAttrib1d GLEW_GET_FUN(__glewVertexAttrib1d) -#define glVertexAttrib1dv GLEW_GET_FUN(__glewVertexAttrib1dv) -#define glVertexAttrib1f GLEW_GET_FUN(__glewVertexAttrib1f) -#define glVertexAttrib1fv GLEW_GET_FUN(__glewVertexAttrib1fv) -#define glVertexAttrib1s GLEW_GET_FUN(__glewVertexAttrib1s) -#define glVertexAttrib1sv GLEW_GET_FUN(__glewVertexAttrib1sv) -#define glVertexAttrib2d GLEW_GET_FUN(__glewVertexAttrib2d) -#define glVertexAttrib2dv GLEW_GET_FUN(__glewVertexAttrib2dv) -#define glVertexAttrib2f GLEW_GET_FUN(__glewVertexAttrib2f) -#define glVertexAttrib2fv GLEW_GET_FUN(__glewVertexAttrib2fv) -#define glVertexAttrib2s GLEW_GET_FUN(__glewVertexAttrib2s) -#define glVertexAttrib2sv GLEW_GET_FUN(__glewVertexAttrib2sv) -#define glVertexAttrib3d GLEW_GET_FUN(__glewVertexAttrib3d) -#define glVertexAttrib3dv GLEW_GET_FUN(__glewVertexAttrib3dv) -#define glVertexAttrib3f GLEW_GET_FUN(__glewVertexAttrib3f) -#define glVertexAttrib3fv GLEW_GET_FUN(__glewVertexAttrib3fv) -#define glVertexAttrib3s GLEW_GET_FUN(__glewVertexAttrib3s) -#define glVertexAttrib3sv GLEW_GET_FUN(__glewVertexAttrib3sv) -#define glVertexAttrib4Nbv GLEW_GET_FUN(__glewVertexAttrib4Nbv) -#define glVertexAttrib4Niv GLEW_GET_FUN(__glewVertexAttrib4Niv) -#define glVertexAttrib4Nsv GLEW_GET_FUN(__glewVertexAttrib4Nsv) -#define glVertexAttrib4Nub GLEW_GET_FUN(__glewVertexAttrib4Nub) -#define glVertexAttrib4Nubv GLEW_GET_FUN(__glewVertexAttrib4Nubv) -#define glVertexAttrib4Nuiv GLEW_GET_FUN(__glewVertexAttrib4Nuiv) -#define glVertexAttrib4Nusv GLEW_GET_FUN(__glewVertexAttrib4Nusv) -#define glVertexAttrib4bv GLEW_GET_FUN(__glewVertexAttrib4bv) -#define glVertexAttrib4d GLEW_GET_FUN(__glewVertexAttrib4d) -#define glVertexAttrib4dv GLEW_GET_FUN(__glewVertexAttrib4dv) -#define glVertexAttrib4f GLEW_GET_FUN(__glewVertexAttrib4f) -#define glVertexAttrib4fv GLEW_GET_FUN(__glewVertexAttrib4fv) -#define glVertexAttrib4iv GLEW_GET_FUN(__glewVertexAttrib4iv) -#define glVertexAttrib4s GLEW_GET_FUN(__glewVertexAttrib4s) -#define glVertexAttrib4sv GLEW_GET_FUN(__glewVertexAttrib4sv) -#define glVertexAttrib4ubv GLEW_GET_FUN(__glewVertexAttrib4ubv) -#define glVertexAttrib4uiv GLEW_GET_FUN(__glewVertexAttrib4uiv) -#define glVertexAttrib4usv GLEW_GET_FUN(__glewVertexAttrib4usv) -#define glVertexAttribPointer GLEW_GET_FUN(__glewVertexAttribPointer) - -#define GLEW_VERSION_2_0 GLEW_GET_VAR(__GLEW_VERSION_2_0) - -#endif /* GL_VERSION_2_0 */ - -/* ----------------------------- GL_VERSION_2_1 ---------------------------- */ - -#ifndef GL_VERSION_2_1 -#define GL_VERSION_2_1 1 - -#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F -#define GL_PIXEL_PACK_BUFFER 0x88EB -#define GL_PIXEL_UNPACK_BUFFER 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF -#define GL_FLOAT_MAT2x3 0x8B65 -#define GL_FLOAT_MAT2x4 0x8B66 -#define GL_FLOAT_MAT3x2 0x8B67 -#define GL_FLOAT_MAT3x4 0x8B68 -#define GL_FLOAT_MAT4x2 0x8B69 -#define GL_FLOAT_MAT4x3 0x8B6A -#define GL_SRGB 0x8C40 -#define GL_SRGB8 0x8C41 -#define GL_SRGB_ALPHA 0x8C42 -#define GL_SRGB8_ALPHA8 0x8C43 -#define GL_SLUMINANCE_ALPHA 0x8C44 -#define GL_SLUMINANCE8_ALPHA8 0x8C45 -#define GL_SLUMINANCE 0x8C46 -#define GL_SLUMINANCE8 0x8C47 -#define GL_COMPRESSED_SRGB 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 -#define GL_COMPRESSED_SLUMINANCE 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B - -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); - -#define glUniformMatrix2x3fv GLEW_GET_FUN(__glewUniformMatrix2x3fv) -#define glUniformMatrix2x4fv GLEW_GET_FUN(__glewUniformMatrix2x4fv) -#define glUniformMatrix3x2fv GLEW_GET_FUN(__glewUniformMatrix3x2fv) -#define glUniformMatrix3x4fv GLEW_GET_FUN(__glewUniformMatrix3x4fv) -#define glUniformMatrix4x2fv GLEW_GET_FUN(__glewUniformMatrix4x2fv) -#define glUniformMatrix4x3fv GLEW_GET_FUN(__glewUniformMatrix4x3fv) - -#define GLEW_VERSION_2_1 GLEW_GET_VAR(__GLEW_VERSION_2_1) - -#endif /* GL_VERSION_2_1 */ - -/* ----------------------------- GL_VERSION_3_0 ---------------------------- */ - -#ifndef GL_VERSION_3_0 -#define GL_VERSION_3_0 1 - -#define GL_CLIP_DISTANCE0 GL_CLIP_PLANE0 -#define GL_CLIP_DISTANCE1 GL_CLIP_PLANE1 -#define GL_CLIP_DISTANCE2 GL_CLIP_PLANE2 -#define GL_CLIP_DISTANCE3 GL_CLIP_PLANE3 -#define GL_CLIP_DISTANCE4 GL_CLIP_PLANE4 -#define GL_CLIP_DISTANCE5 GL_CLIP_PLANE5 -#define GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE_ARB -#define GL_MAX_CLIP_DISTANCES GL_MAX_CLIP_PLANES -#define GL_MAX_VARYING_COMPONENTS GL_MAX_VARYING_FLOATS -#define GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 -#define GL_MAJOR_VERSION 0x821B -#define GL_MINOR_VERSION 0x821C -#define GL_NUM_EXTENSIONS 0x821D -#define GL_CONTEXT_FLAGS 0x821E -#define GL_DEPTH_BUFFER 0x8223 -#define GL_STENCIL_BUFFER 0x8224 -#define GL_RGBA32F 0x8814 -#define GL_RGB32F 0x8815 -#define GL_RGBA16F 0x881A -#define GL_RGB16F 0x881B -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD -#define GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF -#define GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 -#define GL_CLAMP_VERTEX_COLOR 0x891A -#define GL_CLAMP_FRAGMENT_COLOR 0x891B -#define GL_CLAMP_READ_COLOR 0x891C -#define GL_FIXED_ONLY 0x891D -#define GL_TEXTURE_RED_TYPE 0x8C10 -#define GL_TEXTURE_GREEN_TYPE 0x8C11 -#define GL_TEXTURE_BLUE_TYPE 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE 0x8C16 -#define GL_TEXTURE_1D_ARRAY 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY 0x8C19 -#define GL_TEXTURE_2D_ARRAY 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D -#define GL_R11F_G11F_B10F 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B -#define GL_RGB9_E5 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E -#define GL_TEXTURE_SHARED_SIZE 0x8C3F -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 -#define GL_PRIMITIVES_GENERATED 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 -#define GL_RASTERIZER_DISCARD 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B -#define GL_INTERLEAVED_ATTRIBS 0x8C8C -#define GL_SEPARATE_ATTRIBS 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F -#define GL_RGBA32UI 0x8D70 -#define GL_RGB32UI 0x8D71 -#define GL_RGBA16UI 0x8D76 -#define GL_RGB16UI 0x8D77 -#define GL_RGBA8UI 0x8D7C -#define GL_RGB8UI 0x8D7D -#define GL_RGBA32I 0x8D82 -#define GL_RGB32I 0x8D83 -#define GL_RGBA16I 0x8D88 -#define GL_RGB16I 0x8D89 -#define GL_RGBA8I 0x8D8E -#define GL_RGB8I 0x8D8F -#define GL_RED_INTEGER 0x8D94 -#define GL_GREEN_INTEGER 0x8D95 -#define GL_BLUE_INTEGER 0x8D96 -#define GL_ALPHA_INTEGER 0x8D97 -#define GL_RGB_INTEGER 0x8D98 -#define GL_RGBA_INTEGER 0x8D99 -#define GL_BGR_INTEGER 0x8D9A -#define GL_BGRA_INTEGER 0x8D9B -#define GL_SAMPLER_1D_ARRAY 0x8DC0 -#define GL_SAMPLER_2D_ARRAY 0x8DC1 -#define GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW 0x8DC5 -#define GL_UNSIGNED_INT_VEC2 0x8DC6 -#define GL_UNSIGNED_INT_VEC3 0x8DC7 -#define GL_UNSIGNED_INT_VEC4 0x8DC8 -#define GL_INT_SAMPLER_1D 0x8DC9 -#define GL_INT_SAMPLER_2D 0x8DCA -#define GL_INT_SAMPLER_3D 0x8DCB -#define GL_INT_SAMPLER_CUBE 0x8DCC -#define GL_INT_SAMPLER_1D_ARRAY 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY 0x8DCF -#define GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7 -#define GL_QUERY_WAIT 0x8E13 -#define GL_QUERY_NO_WAIT 0x8E14 -#define GL_QUERY_BY_REGION_WAIT 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT 0x8E16 - -typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERPROC) (GLuint id, GLenum mode); -typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKPROC) (GLenum primitiveMode); -typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONPROC) (GLuint program, GLuint colorNumber, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLCLAMPCOLORPROC) (GLenum target, GLenum clamp); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERFIPROC) (GLenum buffer, GLint drawBuffer, GLfloat depth, GLint stencil); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERFVPROC) (GLenum buffer, GLint drawBuffer, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERIVPROC) (GLenum buffer, GLint drawBuffer, const GLint* value); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERUIVPROC) (GLenum buffer, GLint drawBuffer, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLCOLORMASKIPROC) (GLuint buf, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -typedef void (GLAPIENTRY * PFNGLDISABLEIPROC) (GLenum cap, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEIPROC) (GLenum cap, GLuint index); -typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERPROC) (void); -typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETBOOLEANI_VPROC) (GLenum pname, GLuint index, GLboolean* data); -typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATALOCATIONPROC) (GLuint program, const GLchar* name); -typedef const GLubyte* (GLAPIENTRY * PFNGLGETSTRINGIPROC) (GLenum name, GLuint index); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMUIVPROC) (GLuint program, GLint location, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIIVPROC) (GLuint index, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIUIVPROC) (GLuint index, GLenum pname, GLuint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDIPROC) (GLenum cap, GLuint index); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIIVPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIUIVPROC) (GLenum target, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSPROC) (GLuint program, GLsizei count, const GLchar *const* varyings, GLenum bufferMode); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UIPROC) (GLint location, GLuint v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UIVPROC) (GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UIPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UIVPROC) (GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UIVPROC) (GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UIPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UIVPROC) (GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IPROC) (GLuint index, GLint v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IVPROC) (GLuint index, const GLint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIPROC) (GLuint index, GLuint v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIVPROC) (GLuint index, const GLuint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IPROC) (GLuint index, GLint v0, GLint v1); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IVPROC) (GLuint index, const GLint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIPROC) (GLuint index, GLuint v0, GLuint v1); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIVPROC) (GLuint index, const GLuint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IPROC) (GLuint index, GLint v0, GLint v1, GLint v2); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IVPROC) (GLuint index, const GLint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIPROC) (GLuint index, GLuint v0, GLuint v1, GLuint v2); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIVPROC) (GLuint index, const GLuint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4BVPROC) (GLuint index, const GLbyte* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IPROC) (GLuint index, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IVPROC) (GLuint index, const GLint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4SVPROC) (GLuint index, const GLshort* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UBVPROC) (GLuint index, const GLubyte* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIPROC) (GLuint index, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIVPROC) (GLuint index, const GLuint* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4USVPROC) (GLuint index, const GLushort* v0); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void*pointer); - -#define glBeginConditionalRender GLEW_GET_FUN(__glewBeginConditionalRender) -#define glBeginTransformFeedback GLEW_GET_FUN(__glewBeginTransformFeedback) -#define glBindFragDataLocation GLEW_GET_FUN(__glewBindFragDataLocation) -#define glClampColor GLEW_GET_FUN(__glewClampColor) -#define glClearBufferfi GLEW_GET_FUN(__glewClearBufferfi) -#define glClearBufferfv GLEW_GET_FUN(__glewClearBufferfv) -#define glClearBufferiv GLEW_GET_FUN(__glewClearBufferiv) -#define glClearBufferuiv GLEW_GET_FUN(__glewClearBufferuiv) -#define glColorMaski GLEW_GET_FUN(__glewColorMaski) -#define glDisablei GLEW_GET_FUN(__glewDisablei) -#define glEnablei GLEW_GET_FUN(__glewEnablei) -#define glEndConditionalRender GLEW_GET_FUN(__glewEndConditionalRender) -#define glEndTransformFeedback GLEW_GET_FUN(__glewEndTransformFeedback) -#define glGetBooleani_v GLEW_GET_FUN(__glewGetBooleani_v) -#define glGetFragDataLocation GLEW_GET_FUN(__glewGetFragDataLocation) -#define glGetStringi GLEW_GET_FUN(__glewGetStringi) -#define glGetTexParameterIiv GLEW_GET_FUN(__glewGetTexParameterIiv) -#define glGetTexParameterIuiv GLEW_GET_FUN(__glewGetTexParameterIuiv) -#define glGetTransformFeedbackVarying GLEW_GET_FUN(__glewGetTransformFeedbackVarying) -#define glGetUniformuiv GLEW_GET_FUN(__glewGetUniformuiv) -#define glGetVertexAttribIiv GLEW_GET_FUN(__glewGetVertexAttribIiv) -#define glGetVertexAttribIuiv GLEW_GET_FUN(__glewGetVertexAttribIuiv) -#define glIsEnabledi GLEW_GET_FUN(__glewIsEnabledi) -#define glTexParameterIiv GLEW_GET_FUN(__glewTexParameterIiv) -#define glTexParameterIuiv GLEW_GET_FUN(__glewTexParameterIuiv) -#define glTransformFeedbackVaryings GLEW_GET_FUN(__glewTransformFeedbackVaryings) -#define glUniform1ui GLEW_GET_FUN(__glewUniform1ui) -#define glUniform1uiv GLEW_GET_FUN(__glewUniform1uiv) -#define glUniform2ui GLEW_GET_FUN(__glewUniform2ui) -#define glUniform2uiv GLEW_GET_FUN(__glewUniform2uiv) -#define glUniform3ui GLEW_GET_FUN(__glewUniform3ui) -#define glUniform3uiv GLEW_GET_FUN(__glewUniform3uiv) -#define glUniform4ui GLEW_GET_FUN(__glewUniform4ui) -#define glUniform4uiv GLEW_GET_FUN(__glewUniform4uiv) -#define glVertexAttribI1i GLEW_GET_FUN(__glewVertexAttribI1i) -#define glVertexAttribI1iv GLEW_GET_FUN(__glewVertexAttribI1iv) -#define glVertexAttribI1ui GLEW_GET_FUN(__glewVertexAttribI1ui) -#define glVertexAttribI1uiv GLEW_GET_FUN(__glewVertexAttribI1uiv) -#define glVertexAttribI2i GLEW_GET_FUN(__glewVertexAttribI2i) -#define glVertexAttribI2iv GLEW_GET_FUN(__glewVertexAttribI2iv) -#define glVertexAttribI2ui GLEW_GET_FUN(__glewVertexAttribI2ui) -#define glVertexAttribI2uiv GLEW_GET_FUN(__glewVertexAttribI2uiv) -#define glVertexAttribI3i GLEW_GET_FUN(__glewVertexAttribI3i) -#define glVertexAttribI3iv GLEW_GET_FUN(__glewVertexAttribI3iv) -#define glVertexAttribI3ui GLEW_GET_FUN(__glewVertexAttribI3ui) -#define glVertexAttribI3uiv GLEW_GET_FUN(__glewVertexAttribI3uiv) -#define glVertexAttribI4bv GLEW_GET_FUN(__glewVertexAttribI4bv) -#define glVertexAttribI4i GLEW_GET_FUN(__glewVertexAttribI4i) -#define glVertexAttribI4iv GLEW_GET_FUN(__glewVertexAttribI4iv) -#define glVertexAttribI4sv GLEW_GET_FUN(__glewVertexAttribI4sv) -#define glVertexAttribI4ubv GLEW_GET_FUN(__glewVertexAttribI4ubv) -#define glVertexAttribI4ui GLEW_GET_FUN(__glewVertexAttribI4ui) -#define glVertexAttribI4uiv GLEW_GET_FUN(__glewVertexAttribI4uiv) -#define glVertexAttribI4usv GLEW_GET_FUN(__glewVertexAttribI4usv) -#define glVertexAttribIPointer GLEW_GET_FUN(__glewVertexAttribIPointer) - -#define GLEW_VERSION_3_0 GLEW_GET_VAR(__GLEW_VERSION_3_0) - -#endif /* GL_VERSION_3_0 */ - -/* ----------------------------- GL_VERSION_3_1 ---------------------------- */ - -#ifndef GL_VERSION_3_1 -#define GL_VERSION_3_1 1 - -#define GL_TEXTURE_RECTANGLE 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8 -#define GL_SAMPLER_2D_RECT 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW 0x8B64 -#define GL_TEXTURE_BUFFER 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT 0x8C2E -#define GL_SAMPLER_BUFFER 0x8DC2 -#define GL_INT_SAMPLER_2D_RECT 0x8DCD -#define GL_INT_SAMPLER_BUFFER 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8 -#define GL_RED_SNORM 0x8F90 -#define GL_RG_SNORM 0x8F91 -#define GL_RGB_SNORM 0x8F92 -#define GL_RGBA_SNORM 0x8F93 -#define GL_R8_SNORM 0x8F94 -#define GL_RG8_SNORM 0x8F95 -#define GL_RGB8_SNORM 0x8F96 -#define GL_RGBA8_SNORM 0x8F97 -#define GL_R16_SNORM 0x8F98 -#define GL_RG16_SNORM 0x8F99 -#define GL_RGB16_SNORM 0x8F9A -#define GL_RGBA16_SNORM 0x8F9B -#define GL_SIGNED_NORMALIZED 0x8F9C -#define GL_PRIMITIVE_RESTART 0x8F9D -#define GL_PRIMITIVE_RESTART_INDEX 0x8F9E -#define GL_BUFFER_ACCESS_FLAGS 0x911F -#define GL_BUFFER_MAP_LENGTH 0x9120 -#define GL_BUFFER_MAP_OFFSET 0x9121 - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalFormat, GLuint buffer); - -#define glDrawArraysInstanced GLEW_GET_FUN(__glewDrawArraysInstanced) -#define glDrawElementsInstanced GLEW_GET_FUN(__glewDrawElementsInstanced) -#define glPrimitiveRestartIndex GLEW_GET_FUN(__glewPrimitiveRestartIndex) -#define glTexBuffer GLEW_GET_FUN(__glewTexBuffer) - -#define GLEW_VERSION_3_1 GLEW_GET_VAR(__GLEW_VERSION_3_1) - -#endif /* GL_VERSION_3_1 */ - -/* ----------------------------- GL_VERSION_3_2 ---------------------------- */ - -#ifndef GL_VERSION_3_2 -#define GL_VERSION_3_2 1 - -#define GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 -#define GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 -#define GL_LINES_ADJACENCY 0x000A -#define GL_LINE_STRIP_ADJACENCY 0x000B -#define GL_TRIANGLES_ADJACENCY 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY 0x000D -#define GL_PROGRAM_POINT_SIZE 0x8642 -#define GL_GEOMETRY_VERTICES_OUT 0x8916 -#define GL_GEOMETRY_INPUT_TYPE 0x8917 -#define GL_GEOMETRY_OUTPUT_TYPE 0x8918 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8 -#define GL_GEOMETRY_SHADER 0x8DD9 -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1 -#define GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122 -#define GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123 -#define GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124 -#define GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125 -#define GL_CONTEXT_PROFILE_MASK 0x9126 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERI64VPROC) (GLenum target, GLenum value, GLint64 * data); -typedef void (GLAPIENTRY * PFNGLGETINTEGER64I_VPROC) (GLenum pname, GLuint index, GLint64 * data); - -#define glFramebufferTexture GLEW_GET_FUN(__glewFramebufferTexture) -#define glGetBufferParameteri64v GLEW_GET_FUN(__glewGetBufferParameteri64v) -#define glGetInteger64i_v GLEW_GET_FUN(__glewGetInteger64i_v) - -#define GLEW_VERSION_3_2 GLEW_GET_VAR(__GLEW_VERSION_3_2) - -#endif /* GL_VERSION_3_2 */ - -/* ----------------------------- GL_VERSION_3_3 ---------------------------- */ - -#ifndef GL_VERSION_3_3 -#define GL_VERSION_3_3 1 - -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR 0x88FE -#define GL_RGB10_A2UI 0x906F - -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORPROC) (GLuint index, GLuint divisor); - -#define glVertexAttribDivisor GLEW_GET_FUN(__glewVertexAttribDivisor) - -#define GLEW_VERSION_3_3 GLEW_GET_VAR(__GLEW_VERSION_3_3) - -#endif /* GL_VERSION_3_3 */ - -/* ----------------------------- GL_VERSION_4_0 ---------------------------- */ - -#ifndef GL_VERSION_4_0 -#define GL_VERSION_4_0 1 - -#define GL_SAMPLE_SHADING 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE 0x8C37 -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET 0x8E5F -#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS 0x8F9F -#define GL_TEXTURE_CUBE_MAP_ARRAY 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY 0x900F - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEIPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONIPROC) (GLuint buf, GLenum mode); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCIPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGPROC) (GLclampf value); - -#define glBlendEquationSeparatei GLEW_GET_FUN(__glewBlendEquationSeparatei) -#define glBlendEquationi GLEW_GET_FUN(__glewBlendEquationi) -#define glBlendFuncSeparatei GLEW_GET_FUN(__glewBlendFuncSeparatei) -#define glBlendFunci GLEW_GET_FUN(__glewBlendFunci) -#define glMinSampleShading GLEW_GET_FUN(__glewMinSampleShading) - -#define GLEW_VERSION_4_0 GLEW_GET_VAR(__GLEW_VERSION_4_0) - -#endif /* GL_VERSION_4_0 */ - -/* ----------------------------- GL_VERSION_4_1 ---------------------------- */ - -#ifndef GL_VERSION_4_1 -#define GL_VERSION_4_1 1 - -#define GLEW_VERSION_4_1 GLEW_GET_VAR(__GLEW_VERSION_4_1) - -#endif /* GL_VERSION_4_1 */ - -/* ----------------------------- GL_VERSION_4_2 ---------------------------- */ - -#ifndef GL_VERSION_4_2 -#define GL_VERSION_4_2 1 - -#define GL_TRANSFORM_FEEDBACK_PAUSED 0x8E23 -#define GL_TRANSFORM_FEEDBACK_ACTIVE 0x8E24 -#define GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C -#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D -#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E -#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F -#define GL_COPY_READ_BUFFER_BINDING 0x8F36 -#define GL_COPY_WRITE_BUFFER_BINDING 0x8F37 - -#define GLEW_VERSION_4_2 GLEW_GET_VAR(__GLEW_VERSION_4_2) - -#endif /* GL_VERSION_4_2 */ - -/* ----------------------------- GL_VERSION_4_3 ---------------------------- */ - -#ifndef GL_VERSION_4_3 -#define GL_VERSION_4_3 1 - -#define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9 -#define GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E - -#define GLEW_VERSION_4_3 GLEW_GET_VAR(__GLEW_VERSION_4_3) - -#endif /* GL_VERSION_4_3 */ - -/* ----------------------------- GL_VERSION_4_4 ---------------------------- */ - -#ifndef GL_VERSION_4_4 -#define GL_VERSION_4_4 1 - -#define GL_PRIMITIVE_RESTART_FOR_PATCHES_SUPPORTED 0x8221 -#define GL_MAX_VERTEX_ATTRIB_STRIDE 0x82E5 -#define GL_TEXTURE_BUFFER_BINDING 0x8C2A - -#define GLEW_VERSION_4_4 GLEW_GET_VAR(__GLEW_VERSION_4_4) - -#endif /* GL_VERSION_4_4 */ - -/* ----------------------------- GL_VERSION_4_5 ---------------------------- */ - -#ifndef GL_VERSION_4_5 -#define GL_VERSION_4_5 1 - -#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT 0x00000004 - -typedef GLenum (GLAPIENTRY * PFNGLGETGRAPHICSRESETSTATUSPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETNCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint lod, GLsizei bufSize, GLvoid *pixels); -typedef void (GLAPIENTRY * PFNGLGETNTEXIMAGEPROC) (GLenum tex, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *pixels); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMDVPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble *params); - -#define glGetGraphicsResetStatus GLEW_GET_FUN(__glewGetGraphicsResetStatus) -#define glGetnCompressedTexImage GLEW_GET_FUN(__glewGetnCompressedTexImage) -#define glGetnTexImage GLEW_GET_FUN(__glewGetnTexImage) -#define glGetnUniformdv GLEW_GET_FUN(__glewGetnUniformdv) - -#define GLEW_VERSION_4_5 GLEW_GET_VAR(__GLEW_VERSION_4_5) - -#endif /* GL_VERSION_4_5 */ - -/* -------------------------- GL_3DFX_multisample -------------------------- */ - -#ifndef GL_3DFX_multisample -#define GL_3DFX_multisample 1 - -#define GL_MULTISAMPLE_3DFX 0x86B2 -#define GL_SAMPLE_BUFFERS_3DFX 0x86B3 -#define GL_SAMPLES_3DFX 0x86B4 -#define GL_MULTISAMPLE_BIT_3DFX 0x20000000 - -#define GLEW_3DFX_multisample GLEW_GET_VAR(__GLEW_3DFX_multisample) - -#endif /* GL_3DFX_multisample */ - -/* ---------------------------- GL_3DFX_tbuffer ---------------------------- */ - -#ifndef GL_3DFX_tbuffer -#define GL_3DFX_tbuffer 1 - -typedef void (GLAPIENTRY * PFNGLTBUFFERMASK3DFXPROC) (GLuint mask); - -#define glTbufferMask3DFX GLEW_GET_FUN(__glewTbufferMask3DFX) - -#define GLEW_3DFX_tbuffer GLEW_GET_VAR(__GLEW_3DFX_tbuffer) - -#endif /* GL_3DFX_tbuffer */ - -/* -------------------- GL_3DFX_texture_compression_FXT1 ------------------- */ - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_3DFX_texture_compression_FXT1 1 - -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 -#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 - -#define GLEW_3DFX_texture_compression_FXT1 GLEW_GET_VAR(__GLEW_3DFX_texture_compression_FXT1) - -#endif /* GL_3DFX_texture_compression_FXT1 */ - -/* ----------------------- GL_AMD_blend_minmax_factor ---------------------- */ - -#ifndef GL_AMD_blend_minmax_factor -#define GL_AMD_blend_minmax_factor 1 - -#define GL_FACTOR_MIN_AMD 0x901C -#define GL_FACTOR_MAX_AMD 0x901D - -#define GLEW_AMD_blend_minmax_factor GLEW_GET_VAR(__GLEW_AMD_blend_minmax_factor) - -#endif /* GL_AMD_blend_minmax_factor */ - -/* ----------------------- GL_AMD_conservative_depth ----------------------- */ - -#ifndef GL_AMD_conservative_depth -#define GL_AMD_conservative_depth 1 - -#define GLEW_AMD_conservative_depth GLEW_GET_VAR(__GLEW_AMD_conservative_depth) - -#endif /* GL_AMD_conservative_depth */ - -/* -------------------------- GL_AMD_debug_output -------------------------- */ - -#ifndef GL_AMD_debug_output -#define GL_AMD_debug_output 1 - -#define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_AMD 0x9147 -#define GL_DEBUG_SEVERITY_LOW_AMD 0x9148 -#define GL_DEBUG_CATEGORY_API_ERROR_AMD 0x9149 -#define GL_DEBUG_CATEGORY_WINDOW_SYSTEM_AMD 0x914A -#define GL_DEBUG_CATEGORY_DEPRECATION_AMD 0x914B -#define GL_DEBUG_CATEGORY_UNDEFINED_BEHAVIOR_AMD 0x914C -#define GL_DEBUG_CATEGORY_PERFORMANCE_AMD 0x914D -#define GL_DEBUG_CATEGORY_SHADER_COMPILER_AMD 0x914E -#define GL_DEBUG_CATEGORY_APPLICATION_AMD 0x914F -#define GL_DEBUG_CATEGORY_OTHER_AMD 0x9150 - -typedef void (GLAPIENTRY *GLDEBUGPROCAMD)(GLuint id, GLenum category, GLenum severity, GLsizei length, const GLchar* message, void* userParam); - -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKAMDPROC) (GLDEBUGPROCAMD callback, void *userParam); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEENABLEAMDPROC) (GLenum category, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTAMDPROC) (GLenum category, GLenum severity, GLuint id, GLsizei length, const GLchar* buf); -typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei bufsize, GLenum* categories, GLuint* severities, GLuint* ids, GLsizei* lengths, GLchar* message); - -#define glDebugMessageCallbackAMD GLEW_GET_FUN(__glewDebugMessageCallbackAMD) -#define glDebugMessageEnableAMD GLEW_GET_FUN(__glewDebugMessageEnableAMD) -#define glDebugMessageInsertAMD GLEW_GET_FUN(__glewDebugMessageInsertAMD) -#define glGetDebugMessageLogAMD GLEW_GET_FUN(__glewGetDebugMessageLogAMD) - -#define GLEW_AMD_debug_output GLEW_GET_VAR(__GLEW_AMD_debug_output) - -#endif /* GL_AMD_debug_output */ - -/* ---------------------- GL_AMD_depth_clamp_separate ---------------------- */ - -#ifndef GL_AMD_depth_clamp_separate -#define GL_AMD_depth_clamp_separate 1 - -#define GL_DEPTH_CLAMP_NEAR_AMD 0x901E -#define GL_DEPTH_CLAMP_FAR_AMD 0x901F - -#define GLEW_AMD_depth_clamp_separate GLEW_GET_VAR(__GLEW_AMD_depth_clamp_separate) - -#endif /* GL_AMD_depth_clamp_separate */ - -/* ----------------------- GL_AMD_draw_buffers_blend ----------------------- */ - -#ifndef GL_AMD_draw_buffers_blend -#define GL_AMD_draw_buffers_blend 1 - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONINDEXEDAMDPROC) (GLuint buf, GLenum mode); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCINDEXEDAMDPROC) (GLuint buf, GLenum src, GLenum dst); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); - -#define glBlendEquationIndexedAMD GLEW_GET_FUN(__glewBlendEquationIndexedAMD) -#define glBlendEquationSeparateIndexedAMD GLEW_GET_FUN(__glewBlendEquationSeparateIndexedAMD) -#define glBlendFuncIndexedAMD GLEW_GET_FUN(__glewBlendFuncIndexedAMD) -#define glBlendFuncSeparateIndexedAMD GLEW_GET_FUN(__glewBlendFuncSeparateIndexedAMD) - -#define GLEW_AMD_draw_buffers_blend GLEW_GET_VAR(__GLEW_AMD_draw_buffers_blend) - -#endif /* GL_AMD_draw_buffers_blend */ - -/* --------------------------- GL_AMD_gcn_shader --------------------------- */ - -#ifndef GL_AMD_gcn_shader -#define GL_AMD_gcn_shader 1 - -#define GLEW_AMD_gcn_shader GLEW_GET_VAR(__GLEW_AMD_gcn_shader) - -#endif /* GL_AMD_gcn_shader */ - -/* ------------------------ GL_AMD_gpu_shader_int64 ------------------------ */ - -#ifndef GL_AMD_gpu_shader_int64 -#define GL_AMD_gpu_shader_int64 1 - -#define GLEW_AMD_gpu_shader_int64 GLEW_GET_VAR(__GLEW_AMD_gpu_shader_int64) - -#endif /* GL_AMD_gpu_shader_int64 */ - -/* ---------------------- GL_AMD_interleaved_elements ---------------------- */ - -#ifndef GL_AMD_interleaved_elements -#define GL_AMD_interleaved_elements 1 - -#define GL_RED 0x1903 -#define GL_GREEN 0x1904 -#define GL_BLUE 0x1905 -#define GL_ALPHA 0x1906 -#define GL_RG8UI 0x8238 -#define GL_RG16UI 0x823A -#define GL_RGBA8UI 0x8D7C -#define GL_VERTEX_ELEMENT_SWIZZLE_AMD 0x91A4 -#define GL_VERTEX_ID_SWIZZLE_AMD 0x91A5 - -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPARAMETERIAMDPROC) (GLuint index, GLenum pname, GLint param); - -#define glVertexAttribParameteriAMD GLEW_GET_FUN(__glewVertexAttribParameteriAMD) - -#define GLEW_AMD_interleaved_elements GLEW_GET_VAR(__GLEW_AMD_interleaved_elements) - -#endif /* GL_AMD_interleaved_elements */ - -/* ----------------------- GL_AMD_multi_draw_indirect ---------------------- */ - -#ifndef GL_AMD_multi_draw_indirect -#define GL_AMD_multi_draw_indirect 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride); - -#define glMultiDrawArraysIndirectAMD GLEW_GET_FUN(__glewMultiDrawArraysIndirectAMD) -#define glMultiDrawElementsIndirectAMD GLEW_GET_FUN(__glewMultiDrawElementsIndirectAMD) - -#define GLEW_AMD_multi_draw_indirect GLEW_GET_VAR(__GLEW_AMD_multi_draw_indirect) - -#endif /* GL_AMD_multi_draw_indirect */ - -/* ------------------------- GL_AMD_name_gen_delete ------------------------ */ - -#ifndef GL_AMD_name_gen_delete -#define GL_AMD_name_gen_delete 1 - -#define GL_DATA_BUFFER_AMD 0x9151 -#define GL_PERFORMANCE_MONITOR_AMD 0x9152 -#define GL_QUERY_OBJECT_AMD 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_AMD 0x9154 -#define GL_SAMPLER_OBJECT_AMD 0x9155 - -typedef void (GLAPIENTRY * PFNGLDELETENAMESAMDPROC) (GLenum identifier, GLuint num, const GLuint* names); -typedef void (GLAPIENTRY * PFNGLGENNAMESAMDPROC) (GLenum identifier, GLuint num, GLuint* names); -typedef GLboolean (GLAPIENTRY * PFNGLISNAMEAMDPROC) (GLenum identifier, GLuint name); - -#define glDeleteNamesAMD GLEW_GET_FUN(__glewDeleteNamesAMD) -#define glGenNamesAMD GLEW_GET_FUN(__glewGenNamesAMD) -#define glIsNameAMD GLEW_GET_FUN(__glewIsNameAMD) - -#define GLEW_AMD_name_gen_delete GLEW_GET_VAR(__GLEW_AMD_name_gen_delete) - -#endif /* GL_AMD_name_gen_delete */ - -/* ---------------------- GL_AMD_occlusion_query_event --------------------- */ - -#ifndef GL_AMD_occlusion_query_event -#define GL_AMD_occlusion_query_event 1 - -#define GL_QUERY_DEPTH_PASS_EVENT_BIT_AMD 0x00000001 -#define GL_QUERY_DEPTH_FAIL_EVENT_BIT_AMD 0x00000002 -#define GL_QUERY_STENCIL_FAIL_EVENT_BIT_AMD 0x00000004 -#define GL_QUERY_DEPTH_BOUNDS_FAIL_EVENT_BIT_AMD 0x00000008 -#define GL_OCCLUSION_QUERY_EVENT_MASK_AMD 0x874F -#define GL_QUERY_ALL_EVENT_BITS_AMD 0xFFFFFFFF - -typedef void (GLAPIENTRY * PFNGLQUERYOBJECTPARAMETERUIAMDPROC) (GLenum target, GLuint id, GLenum pname, GLuint param); - -#define glQueryObjectParameteruiAMD GLEW_GET_FUN(__glewQueryObjectParameteruiAMD) - -#define GLEW_AMD_occlusion_query_event GLEW_GET_VAR(__GLEW_AMD_occlusion_query_event) - -#endif /* GL_AMD_occlusion_query_event */ - -/* ----------------------- GL_AMD_performance_monitor ---------------------- */ - -#ifndef GL_AMD_performance_monitor -#define GL_AMD_performance_monitor 1 - -#define GL_COUNTER_TYPE_AMD 0x8BC0 -#define GL_COUNTER_RANGE_AMD 0x8BC1 -#define GL_UNSIGNED_INT64_AMD 0x8BC2 -#define GL_PERCENTAGE_AMD 0x8BC3 -#define GL_PERFMON_RESULT_AVAILABLE_AMD 0x8BC4 -#define GL_PERFMON_RESULT_SIZE_AMD 0x8BC5 -#define GL_PERFMON_RESULT_AMD 0x8BC6 - -typedef void (GLAPIENTRY * PFNGLBEGINPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GLAPIENTRY * PFNGLDELETEPERFMONITORSAMDPROC) (GLsizei n, GLuint* monitors); -typedef void (GLAPIENTRY * PFNGLENDPERFMONITORAMDPROC) (GLuint monitor); -typedef void (GLAPIENTRY * PFNGLGENPERFMONITORSAMDPROC) (GLsizei n, GLuint* monitors); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monitor, GLenum pname, GLsizei dataSize, GLuint* data, GLint *bytesWritten); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERINFOAMDPROC) (GLuint group, GLuint counter, GLenum pname, void *data); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC) (GLuint group, GLuint counter, GLsizei bufSize, GLsizei* length, GLchar *counterString); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORCOUNTERSAMDPROC) (GLuint group, GLint* numCounters, GLint *maxActiveCounters, GLsizei countersSize, GLuint *counters); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORGROUPSTRINGAMDPROC) (GLuint group, GLsizei bufSize, GLsizei* length, GLchar *groupString); -typedef void (GLAPIENTRY * PFNGLGETPERFMONITORGROUPSAMDPROC) (GLint* numGroups, GLsizei groupsSize, GLuint *groups); -typedef void (GLAPIENTRY * PFNGLSELECTPERFMONITORCOUNTERSAMDPROC) (GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint* counterList); - -#define glBeginPerfMonitorAMD GLEW_GET_FUN(__glewBeginPerfMonitorAMD) -#define glDeletePerfMonitorsAMD GLEW_GET_FUN(__glewDeletePerfMonitorsAMD) -#define glEndPerfMonitorAMD GLEW_GET_FUN(__glewEndPerfMonitorAMD) -#define glGenPerfMonitorsAMD GLEW_GET_FUN(__glewGenPerfMonitorsAMD) -#define glGetPerfMonitorCounterDataAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterDataAMD) -#define glGetPerfMonitorCounterInfoAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterInfoAMD) -#define glGetPerfMonitorCounterStringAMD GLEW_GET_FUN(__glewGetPerfMonitorCounterStringAMD) -#define glGetPerfMonitorCountersAMD GLEW_GET_FUN(__glewGetPerfMonitorCountersAMD) -#define glGetPerfMonitorGroupStringAMD GLEW_GET_FUN(__glewGetPerfMonitorGroupStringAMD) -#define glGetPerfMonitorGroupsAMD GLEW_GET_FUN(__glewGetPerfMonitorGroupsAMD) -#define glSelectPerfMonitorCountersAMD GLEW_GET_FUN(__glewSelectPerfMonitorCountersAMD) - -#define GLEW_AMD_performance_monitor GLEW_GET_VAR(__GLEW_AMD_performance_monitor) - -#endif /* GL_AMD_performance_monitor */ - -/* -------------------------- GL_AMD_pinned_memory ------------------------- */ - -#ifndef GL_AMD_pinned_memory -#define GL_AMD_pinned_memory 1 - -#define GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD 0x9160 - -#define GLEW_AMD_pinned_memory GLEW_GET_VAR(__GLEW_AMD_pinned_memory) - -#endif /* GL_AMD_pinned_memory */ - -/* ----------------------- GL_AMD_query_buffer_object ---------------------- */ - -#ifndef GL_AMD_query_buffer_object -#define GL_AMD_query_buffer_object 1 - -#define GL_QUERY_BUFFER_AMD 0x9192 -#define GL_QUERY_BUFFER_BINDING_AMD 0x9193 -#define GL_QUERY_RESULT_NO_WAIT_AMD 0x9194 - -#define GLEW_AMD_query_buffer_object GLEW_GET_VAR(__GLEW_AMD_query_buffer_object) - -#endif /* GL_AMD_query_buffer_object */ - -/* ------------------------ GL_AMD_sample_positions ------------------------ */ - -#ifndef GL_AMD_sample_positions -#define GL_AMD_sample_positions 1 - -#define GL_SUBSAMPLE_DISTANCE_AMD 0x883F - -typedef void (GLAPIENTRY * PFNGLSETMULTISAMPLEFVAMDPROC) (GLenum pname, GLuint index, const GLfloat* val); - -#define glSetMultisamplefvAMD GLEW_GET_FUN(__glewSetMultisamplefvAMD) - -#define GLEW_AMD_sample_positions GLEW_GET_VAR(__GLEW_AMD_sample_positions) - -#endif /* GL_AMD_sample_positions */ - -/* ------------------ GL_AMD_seamless_cubemap_per_texture ------------------ */ - -#ifndef GL_AMD_seamless_cubemap_per_texture -#define GL_AMD_seamless_cubemap_per_texture 1 - -#define GL_TEXTURE_CUBE_MAP_SEAMLESS_ARB 0x884F - -#define GLEW_AMD_seamless_cubemap_per_texture GLEW_GET_VAR(__GLEW_AMD_seamless_cubemap_per_texture) - -#endif /* GL_AMD_seamless_cubemap_per_texture */ - -/* -------------------- GL_AMD_shader_atomic_counter_ops ------------------- */ - -#ifndef GL_AMD_shader_atomic_counter_ops -#define GL_AMD_shader_atomic_counter_ops 1 - -#define GLEW_AMD_shader_atomic_counter_ops GLEW_GET_VAR(__GLEW_AMD_shader_atomic_counter_ops) - -#endif /* GL_AMD_shader_atomic_counter_ops */ - -/* ---------------- GL_AMD_shader_explicit_vertex_parameter ---------------- */ - -#ifndef GL_AMD_shader_explicit_vertex_parameter -#define GL_AMD_shader_explicit_vertex_parameter 1 - -#define GLEW_AMD_shader_explicit_vertex_parameter GLEW_GET_VAR(__GLEW_AMD_shader_explicit_vertex_parameter) - -#endif /* GL_AMD_shader_explicit_vertex_parameter */ - -/* ---------------------- GL_AMD_shader_stencil_export --------------------- */ - -#ifndef GL_AMD_shader_stencil_export -#define GL_AMD_shader_stencil_export 1 - -#define GLEW_AMD_shader_stencil_export GLEW_GET_VAR(__GLEW_AMD_shader_stencil_export) - -#endif /* GL_AMD_shader_stencil_export */ - -/* ------------------- GL_AMD_shader_stencil_value_export ------------------ */ - -#ifndef GL_AMD_shader_stencil_value_export -#define GL_AMD_shader_stencil_value_export 1 - -#define GLEW_AMD_shader_stencil_value_export GLEW_GET_VAR(__GLEW_AMD_shader_stencil_value_export) - -#endif /* GL_AMD_shader_stencil_value_export */ - -/* ---------------------- GL_AMD_shader_trinary_minmax --------------------- */ - -#ifndef GL_AMD_shader_trinary_minmax -#define GL_AMD_shader_trinary_minmax 1 - -#define GLEW_AMD_shader_trinary_minmax GLEW_GET_VAR(__GLEW_AMD_shader_trinary_minmax) - -#endif /* GL_AMD_shader_trinary_minmax */ - -/* ------------------------- GL_AMD_sparse_texture ------------------------- */ - -#ifndef GL_AMD_sparse_texture -#define GL_AMD_sparse_texture 1 - -#define GL_TEXTURE_STORAGE_SPARSE_BIT_AMD 0x00000001 -#define GL_VIRTUAL_PAGE_SIZE_X_AMD 0x9195 -#define GL_VIRTUAL_PAGE_SIZE_Y_AMD 0x9196 -#define GL_VIRTUAL_PAGE_SIZE_Z_AMD 0x9197 -#define GL_MAX_SPARSE_TEXTURE_SIZE_AMD 0x9198 -#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199 -#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A -#define GL_MIN_SPARSE_LEVEL_AMD 0x919B -#define GL_MIN_LOD_WARNING_AMD 0x919C - -typedef void (GLAPIENTRY * PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags); - -#define glTexStorageSparseAMD GLEW_GET_FUN(__glewTexStorageSparseAMD) -#define glTextureStorageSparseAMD GLEW_GET_FUN(__glewTextureStorageSparseAMD) - -#define GLEW_AMD_sparse_texture GLEW_GET_VAR(__GLEW_AMD_sparse_texture) - -#endif /* GL_AMD_sparse_texture */ - -/* ------------------- GL_AMD_stencil_operation_extended ------------------- */ - -#ifndef GL_AMD_stencil_operation_extended -#define GL_AMD_stencil_operation_extended 1 - -#define GL_SET_AMD 0x874A -#define GL_REPLACE_VALUE_AMD 0x874B -#define GL_STENCIL_OP_VALUE_AMD 0x874C -#define GL_STENCIL_BACK_OP_VALUE_AMD 0x874D - -typedef void (GLAPIENTRY * PFNGLSTENCILOPVALUEAMDPROC) (GLenum face, GLuint value); - -#define glStencilOpValueAMD GLEW_GET_FUN(__glewStencilOpValueAMD) - -#define GLEW_AMD_stencil_operation_extended GLEW_GET_VAR(__GLEW_AMD_stencil_operation_extended) - -#endif /* GL_AMD_stencil_operation_extended */ - -/* ------------------------ GL_AMD_texture_texture4 ------------------------ */ - -#ifndef GL_AMD_texture_texture4 -#define GL_AMD_texture_texture4 1 - -#define GLEW_AMD_texture_texture4 GLEW_GET_VAR(__GLEW_AMD_texture_texture4) - -#endif /* GL_AMD_texture_texture4 */ - -/* --------------- GL_AMD_transform_feedback3_lines_triangles -------------- */ - -#ifndef GL_AMD_transform_feedback3_lines_triangles -#define GL_AMD_transform_feedback3_lines_triangles 1 - -#define GLEW_AMD_transform_feedback3_lines_triangles GLEW_GET_VAR(__GLEW_AMD_transform_feedback3_lines_triangles) - -#endif /* GL_AMD_transform_feedback3_lines_triangles */ - -/* ----------------------- GL_AMD_transform_feedback4 ---------------------- */ - -#ifndef GL_AMD_transform_feedback4 -#define GL_AMD_transform_feedback4 1 - -#define GL_STREAM_RASTERIZATION_AMD 0x91A0 - -#define GLEW_AMD_transform_feedback4 GLEW_GET_VAR(__GLEW_AMD_transform_feedback4) - -#endif /* GL_AMD_transform_feedback4 */ - -/* ----------------------- GL_AMD_vertex_shader_layer ---------------------- */ - -#ifndef GL_AMD_vertex_shader_layer -#define GL_AMD_vertex_shader_layer 1 - -#define GLEW_AMD_vertex_shader_layer GLEW_GET_VAR(__GLEW_AMD_vertex_shader_layer) - -#endif /* GL_AMD_vertex_shader_layer */ - -/* -------------------- GL_AMD_vertex_shader_tessellator ------------------- */ - -#ifndef GL_AMD_vertex_shader_tessellator -#define GL_AMD_vertex_shader_tessellator 1 - -#define GL_SAMPLER_BUFFER_AMD 0x9001 -#define GL_INT_SAMPLER_BUFFER_AMD 0x9002 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_AMD 0x9003 -#define GL_TESSELLATION_MODE_AMD 0x9004 -#define GL_TESSELLATION_FACTOR_AMD 0x9005 -#define GL_DISCRETE_AMD 0x9006 -#define GL_CONTINUOUS_AMD 0x9007 - -typedef void (GLAPIENTRY * PFNGLTESSELLATIONFACTORAMDPROC) (GLfloat factor); -typedef void (GLAPIENTRY * PFNGLTESSELLATIONMODEAMDPROC) (GLenum mode); - -#define glTessellationFactorAMD GLEW_GET_FUN(__glewTessellationFactorAMD) -#define glTessellationModeAMD GLEW_GET_FUN(__glewTessellationModeAMD) - -#define GLEW_AMD_vertex_shader_tessellator GLEW_GET_VAR(__GLEW_AMD_vertex_shader_tessellator) - -#endif /* GL_AMD_vertex_shader_tessellator */ - -/* ------------------ GL_AMD_vertex_shader_viewport_index ------------------ */ - -#ifndef GL_AMD_vertex_shader_viewport_index -#define GL_AMD_vertex_shader_viewport_index 1 - -#define GLEW_AMD_vertex_shader_viewport_index GLEW_GET_VAR(__GLEW_AMD_vertex_shader_viewport_index) - -#endif /* GL_AMD_vertex_shader_viewport_index */ - -/* ------------------------- GL_ANGLE_depth_texture ------------------------ */ - -#ifndef GL_ANGLE_depth_texture -#define GL_ANGLE_depth_texture 1 - -#define GLEW_ANGLE_depth_texture GLEW_GET_VAR(__GLEW_ANGLE_depth_texture) - -#endif /* GL_ANGLE_depth_texture */ - -/* ----------------------- GL_ANGLE_framebuffer_blit ----------------------- */ - -#ifndef GL_ANGLE_framebuffer_blit -#define GL_ANGLE_framebuffer_blit 1 - -#define GL_DRAW_FRAMEBUFFER_BINDING_ANGLE 0x8CA6 -#define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_ANGLE 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING_ANGLE 0x8CAA - -typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFERANGLEPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); - -#define glBlitFramebufferANGLE GLEW_GET_FUN(__glewBlitFramebufferANGLE) - -#define GLEW_ANGLE_framebuffer_blit GLEW_GET_VAR(__GLEW_ANGLE_framebuffer_blit) - -#endif /* GL_ANGLE_framebuffer_blit */ - -/* -------------------- GL_ANGLE_framebuffer_multisample ------------------- */ - -#ifndef GL_ANGLE_framebuffer_multisample -#define GL_ANGLE_framebuffer_multisample 1 - -#define GL_RENDERBUFFER_SAMPLES_ANGLE 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_ANGLE 0x8D56 -#define GL_MAX_SAMPLES_ANGLE 0x8D57 - -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); - -#define glRenderbufferStorageMultisampleANGLE GLEW_GET_FUN(__glewRenderbufferStorageMultisampleANGLE) - -#define GLEW_ANGLE_framebuffer_multisample GLEW_GET_VAR(__GLEW_ANGLE_framebuffer_multisample) - -#endif /* GL_ANGLE_framebuffer_multisample */ - -/* ----------------------- GL_ANGLE_instanced_arrays ----------------------- */ - -#ifndef GL_ANGLE_instanced_arrays -#define GL_ANGLE_instanced_arrays 1 - -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); - -#define glDrawArraysInstancedANGLE GLEW_GET_FUN(__glewDrawArraysInstancedANGLE) -#define glDrawElementsInstancedANGLE GLEW_GET_FUN(__glewDrawElementsInstancedANGLE) -#define glVertexAttribDivisorANGLE GLEW_GET_FUN(__glewVertexAttribDivisorANGLE) - -#define GLEW_ANGLE_instanced_arrays GLEW_GET_VAR(__GLEW_ANGLE_instanced_arrays) - -#endif /* GL_ANGLE_instanced_arrays */ - -/* -------------------- GL_ANGLE_pack_reverse_row_order -------------------- */ - -#ifndef GL_ANGLE_pack_reverse_row_order -#define GL_ANGLE_pack_reverse_row_order 1 - -#define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 - -#define GLEW_ANGLE_pack_reverse_row_order GLEW_GET_VAR(__GLEW_ANGLE_pack_reverse_row_order) - -#endif /* GL_ANGLE_pack_reverse_row_order */ - -/* ------------------------ GL_ANGLE_program_binary ------------------------ */ - -#ifndef GL_ANGLE_program_binary -#define GL_ANGLE_program_binary 1 - -#define GL_PROGRAM_BINARY_ANGLE 0x93A6 - -#define GLEW_ANGLE_program_binary GLEW_GET_VAR(__GLEW_ANGLE_program_binary) - -#endif /* GL_ANGLE_program_binary */ - -/* ------------------- GL_ANGLE_texture_compression_dxt1 ------------------- */ - -#ifndef GL_ANGLE_texture_compression_dxt1 -#define GL_ANGLE_texture_compression_dxt1 1 - -#define GL_COMPRESSED_RGB_S3TC_DXT1_ANGLE 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_ANGLE 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 - -#define GLEW_ANGLE_texture_compression_dxt1 GLEW_GET_VAR(__GLEW_ANGLE_texture_compression_dxt1) - -#endif /* GL_ANGLE_texture_compression_dxt1 */ - -/* ------------------- GL_ANGLE_texture_compression_dxt3 ------------------- */ - -#ifndef GL_ANGLE_texture_compression_dxt3 -#define GL_ANGLE_texture_compression_dxt3 1 - -#define GL_COMPRESSED_RGB_S3TC_DXT1_ANGLE 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_ANGLE 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 - -#define GLEW_ANGLE_texture_compression_dxt3 GLEW_GET_VAR(__GLEW_ANGLE_texture_compression_dxt3) - -#endif /* GL_ANGLE_texture_compression_dxt3 */ - -/* ------------------- GL_ANGLE_texture_compression_dxt5 ------------------- */ - -#ifndef GL_ANGLE_texture_compression_dxt5 -#define GL_ANGLE_texture_compression_dxt5 1 - -#define GL_COMPRESSED_RGB_S3TC_DXT1_ANGLE 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_ANGLE 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 - -#define GLEW_ANGLE_texture_compression_dxt5 GLEW_GET_VAR(__GLEW_ANGLE_texture_compression_dxt5) - -#endif /* GL_ANGLE_texture_compression_dxt5 */ - -/* ------------------------- GL_ANGLE_texture_usage ------------------------ */ - -#ifndef GL_ANGLE_texture_usage -#define GL_ANGLE_texture_usage 1 - -#define GL_TEXTURE_USAGE_ANGLE 0x93A2 -#define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 - -#define GLEW_ANGLE_texture_usage GLEW_GET_VAR(__GLEW_ANGLE_texture_usage) - -#endif /* GL_ANGLE_texture_usage */ - -/* -------------------------- GL_ANGLE_timer_query ------------------------- */ - -#ifndef GL_ANGLE_timer_query -#define GL_ANGLE_timer_query 1 - -#define GL_QUERY_COUNTER_BITS_ANGLE 0x8864 -#define GL_CURRENT_QUERY_ANGLE 0x8865 -#define GL_QUERY_RESULT_ANGLE 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ANGLE 0x8867 -#define GL_TIME_ELAPSED_ANGLE 0x88BF -#define GL_TIMESTAMP_ANGLE 0x8E28 - -typedef void (GLAPIENTRY * PFNGLBEGINQUERYANGLEPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEQUERIESANGLEPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLENDQUERYANGLEPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGENQUERIESANGLEPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VANGLEPROC) (GLuint id, GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVANGLEPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VANGLEPROC) (GLuint id, GLenum pname, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVANGLEPROC) (GLuint id, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYIVANGLEPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISQUERYANGLEPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLQUERYCOUNTERANGLEPROC) (GLuint id, GLenum target); - -#define glBeginQueryANGLE GLEW_GET_FUN(__glewBeginQueryANGLE) -#define glDeleteQueriesANGLE GLEW_GET_FUN(__glewDeleteQueriesANGLE) -#define glEndQueryANGLE GLEW_GET_FUN(__glewEndQueryANGLE) -#define glGenQueriesANGLE GLEW_GET_FUN(__glewGenQueriesANGLE) -#define glGetQueryObjecti64vANGLE GLEW_GET_FUN(__glewGetQueryObjecti64vANGLE) -#define glGetQueryObjectivANGLE GLEW_GET_FUN(__glewGetQueryObjectivANGLE) -#define glGetQueryObjectui64vANGLE GLEW_GET_FUN(__glewGetQueryObjectui64vANGLE) -#define glGetQueryObjectuivANGLE GLEW_GET_FUN(__glewGetQueryObjectuivANGLE) -#define glGetQueryivANGLE GLEW_GET_FUN(__glewGetQueryivANGLE) -#define glIsQueryANGLE GLEW_GET_FUN(__glewIsQueryANGLE) -#define glQueryCounterANGLE GLEW_GET_FUN(__glewQueryCounterANGLE) - -#define GLEW_ANGLE_timer_query GLEW_GET_VAR(__GLEW_ANGLE_timer_query) - -#endif /* GL_ANGLE_timer_query */ - -/* ------------------- GL_ANGLE_translated_shader_source ------------------- */ - -#ifndef GL_ANGLE_translated_shader_source -#define GL_ANGLE_translated_shader_source 1 - -#define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 - -typedef void (GLAPIENTRY * PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei* length, GLchar* source); - -#define glGetTranslatedShaderSourceANGLE GLEW_GET_FUN(__glewGetTranslatedShaderSourceANGLE) - -#define GLEW_ANGLE_translated_shader_source GLEW_GET_VAR(__GLEW_ANGLE_translated_shader_source) - -#endif /* GL_ANGLE_translated_shader_source */ - -/* ----------------------- GL_APPLE_aux_depth_stencil ---------------------- */ - -#ifndef GL_APPLE_aux_depth_stencil -#define GL_APPLE_aux_depth_stencil 1 - -#define GL_AUX_DEPTH_STENCIL_APPLE 0x8A14 - -#define GLEW_APPLE_aux_depth_stencil GLEW_GET_VAR(__GLEW_APPLE_aux_depth_stencil) - -#endif /* GL_APPLE_aux_depth_stencil */ - -/* ------------------------ GL_APPLE_client_storage ------------------------ */ - -#ifndef GL_APPLE_client_storage -#define GL_APPLE_client_storage 1 - -#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 - -#define GLEW_APPLE_client_storage GLEW_GET_VAR(__GLEW_APPLE_client_storage) - -#endif /* GL_APPLE_client_storage */ - -/* ------------------------- GL_APPLE_element_array ------------------------ */ - -#ifndef GL_APPLE_element_array -#define GL_APPLE_element_array 1 - -#define GL_ELEMENT_ARRAY_APPLE 0x8A0C -#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8A0D -#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x8A0E - -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const void *pointer); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint* first, const GLsizei *count, GLsizei primcount); - -#define glDrawElementArrayAPPLE GLEW_GET_FUN(__glewDrawElementArrayAPPLE) -#define glDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewDrawRangeElementArrayAPPLE) -#define glElementPointerAPPLE GLEW_GET_FUN(__glewElementPointerAPPLE) -#define glMultiDrawElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawElementArrayAPPLE) -#define glMultiDrawRangeElementArrayAPPLE GLEW_GET_FUN(__glewMultiDrawRangeElementArrayAPPLE) - -#define GLEW_APPLE_element_array GLEW_GET_VAR(__GLEW_APPLE_element_array) - -#endif /* GL_APPLE_element_array */ - -/* ----------------------------- GL_APPLE_fence ---------------------------- */ - -#ifndef GL_APPLE_fence -#define GL_APPLE_fence 1 - -#define GL_DRAW_PIXELS_APPLE 0x8A0A -#define GL_FENCE_APPLE 0x8A0B - -typedef void (GLAPIENTRY * PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint* fences); -typedef void (GLAPIENTRY * PFNGLFINISHFENCEAPPLEPROC) (GLuint fence); -typedef void (GLAPIENTRY * PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name); -typedef void (GLAPIENTRY * PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint* fences); -typedef GLboolean (GLAPIENTRY * PFNGLISFENCEAPPLEPROC) (GLuint fence); -typedef void (GLAPIENTRY * PFNGLSETFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (GLAPIENTRY * PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name); - -#define glDeleteFencesAPPLE GLEW_GET_FUN(__glewDeleteFencesAPPLE) -#define glFinishFenceAPPLE GLEW_GET_FUN(__glewFinishFenceAPPLE) -#define glFinishObjectAPPLE GLEW_GET_FUN(__glewFinishObjectAPPLE) -#define glGenFencesAPPLE GLEW_GET_FUN(__glewGenFencesAPPLE) -#define glIsFenceAPPLE GLEW_GET_FUN(__glewIsFenceAPPLE) -#define glSetFenceAPPLE GLEW_GET_FUN(__glewSetFenceAPPLE) -#define glTestFenceAPPLE GLEW_GET_FUN(__glewTestFenceAPPLE) -#define glTestObjectAPPLE GLEW_GET_FUN(__glewTestObjectAPPLE) - -#define GLEW_APPLE_fence GLEW_GET_VAR(__GLEW_APPLE_fence) - -#endif /* GL_APPLE_fence */ - -/* ------------------------- GL_APPLE_float_pixels ------------------------- */ - -#ifndef GL_APPLE_float_pixels -#define GL_APPLE_float_pixels 1 - -#define GL_HALF_APPLE 0x140B -#define GL_RGBA_FLOAT32_APPLE 0x8814 -#define GL_RGB_FLOAT32_APPLE 0x8815 -#define GL_ALPHA_FLOAT32_APPLE 0x8816 -#define GL_INTENSITY_FLOAT32_APPLE 0x8817 -#define GL_LUMINANCE_FLOAT32_APPLE 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_APPLE 0x8819 -#define GL_RGBA_FLOAT16_APPLE 0x881A -#define GL_RGB_FLOAT16_APPLE 0x881B -#define GL_ALPHA_FLOAT16_APPLE 0x881C -#define GL_INTENSITY_FLOAT16_APPLE 0x881D -#define GL_LUMINANCE_FLOAT16_APPLE 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_APPLE 0x881F -#define GL_COLOR_FLOAT_APPLE 0x8A0F - -#define GLEW_APPLE_float_pixels GLEW_GET_VAR(__GLEW_APPLE_float_pixels) - -#endif /* GL_APPLE_float_pixels */ - -/* ---------------------- GL_APPLE_flush_buffer_range ---------------------- */ - -#ifndef GL_APPLE_flush_buffer_range -#define GL_APPLE_flush_buffer_range 1 - -#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 -#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 - -typedef void (GLAPIENTRY * PFNGLBUFFERPARAMETERIAPPLEPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC) (GLenum target, GLintptr offset, GLsizeiptr size); - -#define glBufferParameteriAPPLE GLEW_GET_FUN(__glewBufferParameteriAPPLE) -#define glFlushMappedBufferRangeAPPLE GLEW_GET_FUN(__glewFlushMappedBufferRangeAPPLE) - -#define GLEW_APPLE_flush_buffer_range GLEW_GET_VAR(__GLEW_APPLE_flush_buffer_range) - -#endif /* GL_APPLE_flush_buffer_range */ - -/* ----------------------- GL_APPLE_object_purgeable ----------------------- */ - -#ifndef GL_APPLE_object_purgeable -#define GL_APPLE_object_purgeable 1 - -#define GL_BUFFER_OBJECT_APPLE 0x85B3 -#define GL_RELEASED_APPLE 0x8A19 -#define GL_VOLATILE_APPLE 0x8A1A -#define GL_RETAINED_APPLE 0x8A1B -#define GL_UNDEFINED_APPLE 0x8A1C -#define GL_PURGEABLE_APPLE 0x8A1D - -typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERIVAPPLEPROC) (GLenum objectType, GLuint name, GLenum pname, GLint* params); -typedef GLenum (GLAPIENTRY * PFNGLOBJECTPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); -typedef GLenum (GLAPIENTRY * PFNGLOBJECTUNPURGEABLEAPPLEPROC) (GLenum objectType, GLuint name, GLenum option); - -#define glGetObjectParameterivAPPLE GLEW_GET_FUN(__glewGetObjectParameterivAPPLE) -#define glObjectPurgeableAPPLE GLEW_GET_FUN(__glewObjectPurgeableAPPLE) -#define glObjectUnpurgeableAPPLE GLEW_GET_FUN(__glewObjectUnpurgeableAPPLE) - -#define GLEW_APPLE_object_purgeable GLEW_GET_VAR(__GLEW_APPLE_object_purgeable) - -#endif /* GL_APPLE_object_purgeable */ - -/* ------------------------- GL_APPLE_pixel_buffer ------------------------- */ - -#ifndef GL_APPLE_pixel_buffer -#define GL_APPLE_pixel_buffer 1 - -#define GL_MIN_PBUFFER_VIEWPORT_DIMS_APPLE 0x8A10 - -#define GLEW_APPLE_pixel_buffer GLEW_GET_VAR(__GLEW_APPLE_pixel_buffer) - -#endif /* GL_APPLE_pixel_buffer */ - -/* ---------------------------- GL_APPLE_rgb_422 --------------------------- */ - -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 - -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#define GL_RGB_422_APPLE 0x8A1F -#define GL_RGB_RAW_422_APPLE 0x8A51 - -#define GLEW_APPLE_rgb_422 GLEW_GET_VAR(__GLEW_APPLE_rgb_422) - -#endif /* GL_APPLE_rgb_422 */ - -/* --------------------------- GL_APPLE_row_bytes -------------------------- */ - -#ifndef GL_APPLE_row_bytes -#define GL_APPLE_row_bytes 1 - -#define GL_PACK_ROW_BYTES_APPLE 0x8A15 -#define GL_UNPACK_ROW_BYTES_APPLE 0x8A16 - -#define GLEW_APPLE_row_bytes GLEW_GET_VAR(__GLEW_APPLE_row_bytes) - -#endif /* GL_APPLE_row_bytes */ - -/* ------------------------ GL_APPLE_specular_vector ----------------------- */ - -#ifndef GL_APPLE_specular_vector -#define GL_APPLE_specular_vector 1 - -#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0 - -#define GLEW_APPLE_specular_vector GLEW_GET_VAR(__GLEW_APPLE_specular_vector) - -#endif /* GL_APPLE_specular_vector */ - -/* ------------------------- GL_APPLE_texture_range ------------------------ */ - -#ifndef GL_APPLE_texture_range -#define GL_APPLE_texture_range 1 - -#define GL_TEXTURE_RANGE_LENGTH_APPLE 0x85B7 -#define GL_TEXTURE_RANGE_POINTER_APPLE 0x85B8 -#define GL_TEXTURE_STORAGE_HINT_APPLE 0x85BC -#define GL_STORAGE_PRIVATE_APPLE 0x85BD -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF - -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC) (GLenum target, GLenum pname, void **params); -typedef void (GLAPIENTRY * PFNGLTEXTURERANGEAPPLEPROC) (GLenum target, GLsizei length, void *pointer); - -#define glGetTexParameterPointervAPPLE GLEW_GET_FUN(__glewGetTexParameterPointervAPPLE) -#define glTextureRangeAPPLE GLEW_GET_FUN(__glewTextureRangeAPPLE) - -#define GLEW_APPLE_texture_range GLEW_GET_VAR(__GLEW_APPLE_texture_range) - -#endif /* GL_APPLE_texture_range */ - -/* ------------------------ GL_APPLE_transform_hint ------------------------ */ - -#ifndef GL_APPLE_transform_hint -#define GL_APPLE_transform_hint 1 - -#define GL_TRANSFORM_HINT_APPLE 0x85B1 - -#define GLEW_APPLE_transform_hint GLEW_GET_VAR(__GLEW_APPLE_transform_hint) - -#endif /* GL_APPLE_transform_hint */ - -/* ---------------------- GL_APPLE_vertex_array_object --------------------- */ - -#ifndef GL_APPLE_vertex_array_object -#define GL_APPLE_vertex_array_object 1 - -#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 - -typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array); -typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays); -typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint* arrays); -typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array); - -#define glBindVertexArrayAPPLE GLEW_GET_FUN(__glewBindVertexArrayAPPLE) -#define glDeleteVertexArraysAPPLE GLEW_GET_FUN(__glewDeleteVertexArraysAPPLE) -#define glGenVertexArraysAPPLE GLEW_GET_FUN(__glewGenVertexArraysAPPLE) -#define glIsVertexArrayAPPLE GLEW_GET_FUN(__glewIsVertexArrayAPPLE) - -#define GLEW_APPLE_vertex_array_object GLEW_GET_VAR(__GLEW_APPLE_vertex_array_object) - -#endif /* GL_APPLE_vertex_array_object */ - -/* ---------------------- GL_APPLE_vertex_array_range ---------------------- */ - -#ifndef GL_APPLE_vertex_array_range -#define GL_APPLE_vertex_array_range 1 - -#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E -#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_APPLE 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521 -#define GL_STORAGE_CLIENT_APPLE 0x85B4 -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF - -typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, void *pointer); - -#define glFlushVertexArrayRangeAPPLE GLEW_GET_FUN(__glewFlushVertexArrayRangeAPPLE) -#define glVertexArrayParameteriAPPLE GLEW_GET_FUN(__glewVertexArrayParameteriAPPLE) -#define glVertexArrayRangeAPPLE GLEW_GET_FUN(__glewVertexArrayRangeAPPLE) - -#define GLEW_APPLE_vertex_array_range GLEW_GET_VAR(__GLEW_APPLE_vertex_array_range) - -#endif /* GL_APPLE_vertex_array_range */ - -/* ------------------- GL_APPLE_vertex_program_evaluators ------------------ */ - -#ifndef GL_APPLE_vertex_program_evaluators -#define GL_APPLE_vertex_program_evaluators 1 - -#define GL_VERTEX_ATTRIB_MAP1_APPLE 0x8A00 -#define GL_VERTEX_ATTRIB_MAP2_APPLE 0x8A01 -#define GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE 0x8A02 -#define GL_VERTEX_ATTRIB_MAP1_COEFF_APPLE 0x8A03 -#define GL_VERTEX_ATTRIB_MAP1_ORDER_APPLE 0x8A04 -#define GL_VERTEX_ATTRIB_MAP1_DOMAIN_APPLE 0x8A05 -#define GL_VERTEX_ATTRIB_MAP2_SIZE_APPLE 0x8A06 -#define GL_VERTEX_ATTRIB_MAP2_COEFF_APPLE 0x8A07 -#define GL_VERTEX_ATTRIB_MAP2_ORDER_APPLE 0x8A08 -#define GL_VERTEX_ATTRIB_MAP2_DOMAIN_APPLE 0x8A09 - -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBAPPLEPROC) (GLuint index, GLenum pname); -typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXATTRIBENABLEDAPPLEPROC) (GLuint index, GLenum pname); -typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB1DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble* points); -typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB1FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat* points); -typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB2DAPPLEPROC) (GLuint index, GLuint size, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble* points); -typedef void (GLAPIENTRY * PFNGLMAPVERTEXATTRIB2FAPPLEPROC) (GLuint index, GLuint size, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat* points); - -#define glDisableVertexAttribAPPLE GLEW_GET_FUN(__glewDisableVertexAttribAPPLE) -#define glEnableVertexAttribAPPLE GLEW_GET_FUN(__glewEnableVertexAttribAPPLE) -#define glIsVertexAttribEnabledAPPLE GLEW_GET_FUN(__glewIsVertexAttribEnabledAPPLE) -#define glMapVertexAttrib1dAPPLE GLEW_GET_FUN(__glewMapVertexAttrib1dAPPLE) -#define glMapVertexAttrib1fAPPLE GLEW_GET_FUN(__glewMapVertexAttrib1fAPPLE) -#define glMapVertexAttrib2dAPPLE GLEW_GET_FUN(__glewMapVertexAttrib2dAPPLE) -#define glMapVertexAttrib2fAPPLE GLEW_GET_FUN(__glewMapVertexAttrib2fAPPLE) - -#define GLEW_APPLE_vertex_program_evaluators GLEW_GET_VAR(__GLEW_APPLE_vertex_program_evaluators) - -#endif /* GL_APPLE_vertex_program_evaluators */ - -/* --------------------------- GL_APPLE_ycbcr_422 -------------------------- */ - -#ifndef GL_APPLE_ycbcr_422 -#define GL_APPLE_ycbcr_422 1 - -#define GL_YCBCR_422_APPLE 0x85B9 - -#define GLEW_APPLE_ycbcr_422 GLEW_GET_VAR(__GLEW_APPLE_ycbcr_422) - -#endif /* GL_APPLE_ycbcr_422 */ - -/* ------------------------ GL_ARB_ES2_compatibility ----------------------- */ - -#ifndef GL_ARB_ES2_compatibility -#define GL_ARB_ES2_compatibility 1 - -#define GL_FIXED 0x140C -#define GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B -#define GL_RGB565 0x8D62 -#define GL_LOW_FLOAT 0x8DF0 -#define GL_MEDIUM_FLOAT 0x8DF1 -#define GL_HIGH_FLOAT 0x8DF2 -#define GL_LOW_INT 0x8DF3 -#define GL_MEDIUM_INT 0x8DF4 -#define GL_HIGH_INT 0x8DF5 -#define GL_SHADER_BINARY_FORMATS 0x8DF8 -#define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 -#define GL_SHADER_COMPILER 0x8DFA -#define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB -#define GL_MAX_VARYING_VECTORS 0x8DFC -#define GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD - -typedef int GLfixed; - -typedef void (GLAPIENTRY * PFNGLCLEARDEPTHFPROC) (GLclampf d); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEFPROC) (GLclampf n, GLclampf f); -typedef void (GLAPIENTRY * PFNGLGETSHADERPRECISIONFORMATPROC) (GLenum shadertype, GLenum precisiontype, GLint* range, GLint *precision); -typedef void (GLAPIENTRY * PFNGLRELEASESHADERCOMPILERPROC) (void); -typedef void (GLAPIENTRY * PFNGLSHADERBINARYPROC) (GLsizei count, const GLuint* shaders, GLenum binaryformat, const void*binary, GLsizei length); - -#define glClearDepthf GLEW_GET_FUN(__glewClearDepthf) -#define glDepthRangef GLEW_GET_FUN(__glewDepthRangef) -#define glGetShaderPrecisionFormat GLEW_GET_FUN(__glewGetShaderPrecisionFormat) -#define glReleaseShaderCompiler GLEW_GET_FUN(__glewReleaseShaderCompiler) -#define glShaderBinary GLEW_GET_FUN(__glewShaderBinary) - -#define GLEW_ARB_ES2_compatibility GLEW_GET_VAR(__GLEW_ARB_ES2_compatibility) - -#endif /* GL_ARB_ES2_compatibility */ - -/* ----------------------- GL_ARB_ES3_1_compatibility ---------------------- */ - -#ifndef GL_ARB_ES3_1_compatibility -#define GL_ARB_ES3_1_compatibility 1 - -typedef void (GLAPIENTRY * PFNGLMEMORYBARRIERBYREGIONPROC) (GLbitfield barriers); - -#define glMemoryBarrierByRegion GLEW_GET_FUN(__glewMemoryBarrierByRegion) - -#define GLEW_ARB_ES3_1_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_1_compatibility) - -#endif /* GL_ARB_ES3_1_compatibility */ - -/* ----------------------- GL_ARB_ES3_2_compatibility ---------------------- */ - -#ifndef GL_ARB_ES3_2_compatibility -#define GL_ARB_ES3_2_compatibility 1 - -#define GL_PRIMITIVE_BOUNDING_BOX_ARB 0x92BE -#define GL_MULTISAMPLE_LINE_WIDTH_RANGE_ARB 0x9381 -#define GL_MULTISAMPLE_LINE_WIDTH_GRANULARITY_ARB 0x9382 - -typedef void (GLAPIENTRY * PFNGLPRIMITIVEBOUNDINGBOXARBPROC) (GLfloat minX, GLfloat minY, GLfloat minZ, GLfloat minW, GLfloat maxX, GLfloat maxY, GLfloat maxZ, GLfloat maxW); - -#define glPrimitiveBoundingBoxARB GLEW_GET_FUN(__glewPrimitiveBoundingBoxARB) - -#define GLEW_ARB_ES3_2_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_2_compatibility) - -#endif /* GL_ARB_ES3_2_compatibility */ - -/* ------------------------ GL_ARB_ES3_compatibility ----------------------- */ - -#ifndef GL_ARB_ES3_compatibility -#define GL_ARB_ES3_compatibility 1 - -#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF -#define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69 -#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A -#define GL_MAX_ELEMENT_INDEX 0x8D6B -#define GL_COMPRESSED_R11_EAC 0x9270 -#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271 -#define GL_COMPRESSED_RG11_EAC 0x9272 -#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273 -#define GL_COMPRESSED_RGB8_ETC2 0x9274 -#define GL_COMPRESSED_SRGB8_ETC2 0x9275 -#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276 -#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277 -#define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278 -#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279 - -#define GLEW_ARB_ES3_compatibility GLEW_GET_VAR(__GLEW_ARB_ES3_compatibility) - -#endif /* GL_ARB_ES3_compatibility */ - -/* ------------------------ GL_ARB_arrays_of_arrays ------------------------ */ - -#ifndef GL_ARB_arrays_of_arrays -#define GL_ARB_arrays_of_arrays 1 - -#define GLEW_ARB_arrays_of_arrays GLEW_GET_VAR(__GLEW_ARB_arrays_of_arrays) - -#endif /* GL_ARB_arrays_of_arrays */ - -/* -------------------------- GL_ARB_base_instance ------------------------- */ - -#ifndef GL_ARB_base_instance -#define GL_ARB_base_instance 1 - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLuint baseinstance); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); - -#define glDrawArraysInstancedBaseInstance GLEW_GET_FUN(__glewDrawArraysInstancedBaseInstance) -#define glDrawElementsInstancedBaseInstance GLEW_GET_FUN(__glewDrawElementsInstancedBaseInstance) -#define glDrawElementsInstancedBaseVertexBaseInstance GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertexBaseInstance) - -#define GLEW_ARB_base_instance GLEW_GET_VAR(__GLEW_ARB_base_instance) - -#endif /* GL_ARB_base_instance */ - -/* ------------------------ GL_ARB_bindless_texture ------------------------ */ - -#ifndef GL_ARB_bindless_texture -#define GL_ARB_bindless_texture 1 - -#define GL_UNSIGNED_INT64_ARB 0x140F - -typedef GLuint64 (GLAPIENTRY * PFNGLGETIMAGEHANDLEARBPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format); -typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTUREHANDLEARBPROC) (GLuint texture); -typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTURESAMPLERHANDLEARBPROC) (GLuint texture, GLuint sampler); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLUI64VARBPROC) (GLuint index, GLenum pname, GLuint64EXT* params); -typedef GLboolean (GLAPIENTRY * PFNGLISIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle); -typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLERESIDENTARBPROC) (GLuint64 handle, GLenum access); -typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLERESIDENTARBPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC) (GLuint program, GLint location, GLuint64 value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* values); -typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64ARBPROC) (GLint location, GLuint64 value); -typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64ARBPROC) (GLuint index, GLuint64EXT x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64VARBPROC) (GLuint index, const GLuint64EXT* v); - -#define glGetImageHandleARB GLEW_GET_FUN(__glewGetImageHandleARB) -#define glGetTextureHandleARB GLEW_GET_FUN(__glewGetTextureHandleARB) -#define glGetTextureSamplerHandleARB GLEW_GET_FUN(__glewGetTextureSamplerHandleARB) -#define glGetVertexAttribLui64vARB GLEW_GET_FUN(__glewGetVertexAttribLui64vARB) -#define glIsImageHandleResidentARB GLEW_GET_FUN(__glewIsImageHandleResidentARB) -#define glIsTextureHandleResidentARB GLEW_GET_FUN(__glewIsTextureHandleResidentARB) -#define glMakeImageHandleNonResidentARB GLEW_GET_FUN(__glewMakeImageHandleNonResidentARB) -#define glMakeImageHandleResidentARB GLEW_GET_FUN(__glewMakeImageHandleResidentARB) -#define glMakeTextureHandleNonResidentARB GLEW_GET_FUN(__glewMakeTextureHandleNonResidentARB) -#define glMakeTextureHandleResidentARB GLEW_GET_FUN(__glewMakeTextureHandleResidentARB) -#define glProgramUniformHandleui64ARB GLEW_GET_FUN(__glewProgramUniformHandleui64ARB) -#define glProgramUniformHandleui64vARB GLEW_GET_FUN(__glewProgramUniformHandleui64vARB) -#define glUniformHandleui64ARB GLEW_GET_FUN(__glewUniformHandleui64ARB) -#define glUniformHandleui64vARB GLEW_GET_FUN(__glewUniformHandleui64vARB) -#define glVertexAttribL1ui64ARB GLEW_GET_FUN(__glewVertexAttribL1ui64ARB) -#define glVertexAttribL1ui64vARB GLEW_GET_FUN(__glewVertexAttribL1ui64vARB) - -#define GLEW_ARB_bindless_texture GLEW_GET_VAR(__GLEW_ARB_bindless_texture) - -#endif /* GL_ARB_bindless_texture */ - -/* ----------------------- GL_ARB_blend_func_extended ---------------------- */ - -#ifndef GL_ARB_blend_func_extended -#define GL_ARB_blend_func_extended 1 - -#define GL_SRC1_COLOR 0x88F9 -#define GL_ONE_MINUS_SRC1_COLOR 0x88FA -#define GL_ONE_MINUS_SRC1_ALPHA 0x88FB -#define GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC - -typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONINDEXEDPROC) (GLuint program, GLuint colorNumber, GLuint index, const GLchar * name); -typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATAINDEXPROC) (GLuint program, const GLchar * name); - -#define glBindFragDataLocationIndexed GLEW_GET_FUN(__glewBindFragDataLocationIndexed) -#define glGetFragDataIndex GLEW_GET_FUN(__glewGetFragDataIndex) - -#define GLEW_ARB_blend_func_extended GLEW_GET_VAR(__GLEW_ARB_blend_func_extended) - -#endif /* GL_ARB_blend_func_extended */ - -/* ------------------------- GL_ARB_buffer_storage ------------------------- */ - -#ifndef GL_ARB_buffer_storage -#define GL_ARB_buffer_storage 1 - -#define GL_MAP_READ_BIT 0x0001 -#define GL_MAP_WRITE_BIT 0x0002 -#define GL_MAP_PERSISTENT_BIT 0x00000040 -#define GL_MAP_COHERENT_BIT 0x00000080 -#define GL_DYNAMIC_STORAGE_BIT 0x0100 -#define GL_CLIENT_STORAGE_BIT 0x0200 -#define GL_CLIENT_MAPPED_BUFFER_BARRIER_BIT 0x00004000 -#define GL_BUFFER_IMMUTABLE_STORAGE 0x821F -#define GL_BUFFER_STORAGE_FLAGS 0x8220 - -typedef void (GLAPIENTRY * PFNGLBUFFERSTORAGEPROC) (GLenum target, GLsizeiptr size, const void *data, GLbitfield flags); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSTORAGEEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); - -#define glBufferStorage GLEW_GET_FUN(__glewBufferStorage) -#define glNamedBufferStorageEXT GLEW_GET_FUN(__glewNamedBufferStorageEXT) - -#define GLEW_ARB_buffer_storage GLEW_GET_VAR(__GLEW_ARB_buffer_storage) - -#endif /* GL_ARB_buffer_storage */ - -/* ---------------------------- GL_ARB_cl_event ---------------------------- */ - -#ifndef GL_ARB_cl_event -#define GL_ARB_cl_event 1 - -#define GL_SYNC_CL_EVENT_ARB 0x8240 -#define GL_SYNC_CL_EVENT_COMPLETE_ARB 0x8241 - -typedef struct _cl_context *cl_context; -typedef struct _cl_event *cl_event; - -typedef GLsync (GLAPIENTRY * PFNGLCREATESYNCFROMCLEVENTARBPROC) (cl_context context, cl_event event, GLbitfield flags); - -#define glCreateSyncFromCLeventARB GLEW_GET_FUN(__glewCreateSyncFromCLeventARB) - -#define GLEW_ARB_cl_event GLEW_GET_VAR(__GLEW_ARB_cl_event) - -#endif /* GL_ARB_cl_event */ - -/* ----------------------- GL_ARB_clear_buffer_object ---------------------- */ - -#ifndef GL_ARB_clear_buffer_object -#define GL_ARB_clear_buffer_object 1 - -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); - -#define glClearBufferData GLEW_GET_FUN(__glewClearBufferData) -#define glClearBufferSubData GLEW_GET_FUN(__glewClearBufferSubData) -#define glClearNamedBufferDataEXT GLEW_GET_FUN(__glewClearNamedBufferDataEXT) -#define glClearNamedBufferSubDataEXT GLEW_GET_FUN(__glewClearNamedBufferSubDataEXT) - -#define GLEW_ARB_clear_buffer_object GLEW_GET_VAR(__GLEW_ARB_clear_buffer_object) - -#endif /* GL_ARB_clear_buffer_object */ - -/* -------------------------- GL_ARB_clear_texture ------------------------- */ - -#ifndef GL_ARB_clear_texture -#define GL_ARB_clear_texture 1 - -#define GL_CLEAR_TEXTURE 0x9365 - -typedef void (GLAPIENTRY * PFNGLCLEARTEXIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARTEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data); - -#define glClearTexImage GLEW_GET_FUN(__glewClearTexImage) -#define glClearTexSubImage GLEW_GET_FUN(__glewClearTexSubImage) - -#define GLEW_ARB_clear_texture GLEW_GET_VAR(__GLEW_ARB_clear_texture) - -#endif /* GL_ARB_clear_texture */ - -/* -------------------------- GL_ARB_clip_control -------------------------- */ - -#ifndef GL_ARB_clip_control -#define GL_ARB_clip_control 1 - -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_CLIP_ORIGIN 0x935C -#define GL_CLIP_DEPTH_MODE 0x935D -#define GL_NEGATIVE_ONE_TO_ONE 0x935E -#define GL_ZERO_TO_ONE 0x935F - -typedef void (GLAPIENTRY * PFNGLCLIPCONTROLPROC) (GLenum origin, GLenum depth); - -#define glClipControl GLEW_GET_FUN(__glewClipControl) - -#define GLEW_ARB_clip_control GLEW_GET_VAR(__GLEW_ARB_clip_control) - -#endif /* GL_ARB_clip_control */ - -/* ----------------------- GL_ARB_color_buffer_float ----------------------- */ - -#ifndef GL_ARB_color_buffer_float -#define GL_ARB_color_buffer_float 1 - -#define GL_RGBA_FLOAT_MODE_ARB 0x8820 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -#define GL_FIXED_ONLY_ARB 0x891D - -typedef void (GLAPIENTRY * PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); - -#define glClampColorARB GLEW_GET_FUN(__glewClampColorARB) - -#define GLEW_ARB_color_buffer_float GLEW_GET_VAR(__GLEW_ARB_color_buffer_float) - -#endif /* GL_ARB_color_buffer_float */ - -/* -------------------------- GL_ARB_compatibility ------------------------- */ - -#ifndef GL_ARB_compatibility -#define GL_ARB_compatibility 1 - -#define GLEW_ARB_compatibility GLEW_GET_VAR(__GLEW_ARB_compatibility) - -#endif /* GL_ARB_compatibility */ - -/* ---------------- GL_ARB_compressed_texture_pixel_storage ---------------- */ - -#ifndef GL_ARB_compressed_texture_pixel_storage -#define GL_ARB_compressed_texture_pixel_storage 1 - -#define GL_UNPACK_COMPRESSED_BLOCK_WIDTH 0x9127 -#define GL_UNPACK_COMPRESSED_BLOCK_HEIGHT 0x9128 -#define GL_UNPACK_COMPRESSED_BLOCK_DEPTH 0x9129 -#define GL_UNPACK_COMPRESSED_BLOCK_SIZE 0x912A -#define GL_PACK_COMPRESSED_BLOCK_WIDTH 0x912B -#define GL_PACK_COMPRESSED_BLOCK_HEIGHT 0x912C -#define GL_PACK_COMPRESSED_BLOCK_DEPTH 0x912D -#define GL_PACK_COMPRESSED_BLOCK_SIZE 0x912E - -#define GLEW_ARB_compressed_texture_pixel_storage GLEW_GET_VAR(__GLEW_ARB_compressed_texture_pixel_storage) - -#endif /* GL_ARB_compressed_texture_pixel_storage */ - -/* ------------------------- GL_ARB_compute_shader ------------------------- */ - -#ifndef GL_ARB_compute_shader -#define GL_ARB_compute_shader 1 - -#define GL_COMPUTE_SHADER_BIT 0x00000020 -#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262 -#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263 -#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264 -#define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265 -#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266 -#define GL_COMPUTE_WORK_GROUP_SIZE 0x8267 -#define GL_MAX_COMPUTE_WORK_GROUP_INVOCATIONS 0x90EB -#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED -#define GL_DISPATCH_INDIRECT_BUFFER 0x90EE -#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF -#define GL_COMPUTE_SHADER 0x91B9 -#define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB -#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC -#define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD -#define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE -#define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF - -typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); -typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect); - -#define glDispatchCompute GLEW_GET_FUN(__glewDispatchCompute) -#define glDispatchComputeIndirect GLEW_GET_FUN(__glewDispatchComputeIndirect) - -#define GLEW_ARB_compute_shader GLEW_GET_VAR(__GLEW_ARB_compute_shader) - -#endif /* GL_ARB_compute_shader */ - -/* ------------------- GL_ARB_compute_variable_group_size ------------------ */ - -#ifndef GL_ARB_compute_variable_group_size -#define GL_ARB_compute_variable_group_size 1 - -#define GL_MAX_COMPUTE_FIXED_GROUP_INVOCATIONS_ARB 0x90EB -#define GL_MAX_COMPUTE_FIXED_GROUP_SIZE_ARB 0x91BF -#define GL_MAX_COMPUTE_VARIABLE_GROUP_INVOCATIONS_ARB 0x9344 -#define GL_MAX_COMPUTE_VARIABLE_GROUP_SIZE_ARB 0x9345 - -typedef void (GLAPIENTRY * PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z, GLuint group_size_x, GLuint group_size_y, GLuint group_size_z); - -#define glDispatchComputeGroupSizeARB GLEW_GET_FUN(__glewDispatchComputeGroupSizeARB) - -#define GLEW_ARB_compute_variable_group_size GLEW_GET_VAR(__GLEW_ARB_compute_variable_group_size) - -#endif /* GL_ARB_compute_variable_group_size */ - -/* ------------------- GL_ARB_conditional_render_inverted ------------------ */ - -#ifndef GL_ARB_conditional_render_inverted -#define GL_ARB_conditional_render_inverted 1 - -#define GL_QUERY_WAIT_INVERTED 0x8E17 -#define GL_QUERY_NO_WAIT_INVERTED 0x8E18 -#define GL_QUERY_BY_REGION_WAIT_INVERTED 0x8E19 -#define GL_QUERY_BY_REGION_NO_WAIT_INVERTED 0x8E1A - -#define GLEW_ARB_conditional_render_inverted GLEW_GET_VAR(__GLEW_ARB_conditional_render_inverted) - -#endif /* GL_ARB_conditional_render_inverted */ - -/* ----------------------- GL_ARB_conservative_depth ----------------------- */ - -#ifndef GL_ARB_conservative_depth -#define GL_ARB_conservative_depth 1 - -#define GLEW_ARB_conservative_depth GLEW_GET_VAR(__GLEW_ARB_conservative_depth) - -#endif /* GL_ARB_conservative_depth */ - -/* --------------------------- GL_ARB_copy_buffer -------------------------- */ - -#ifndef GL_ARB_copy_buffer -#define GL_ARB_copy_buffer 1 - -#define GL_COPY_READ_BUFFER 0x8F36 -#define GL_COPY_WRITE_BUFFER 0x8F37 - -typedef void (GLAPIENTRY * PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readtarget, GLenum writetarget, GLintptr readoffset, GLintptr writeoffset, GLsizeiptr size); - -#define glCopyBufferSubData GLEW_GET_FUN(__glewCopyBufferSubData) - -#define GLEW_ARB_copy_buffer GLEW_GET_VAR(__GLEW_ARB_copy_buffer) - -#endif /* GL_ARB_copy_buffer */ - -/* --------------------------- GL_ARB_copy_image --------------------------- */ - -#ifndef GL_ARB_copy_image -#define GL_ARB_copy_image 1 - -typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); - -#define glCopyImageSubData GLEW_GET_FUN(__glewCopyImageSubData) - -#define GLEW_ARB_copy_image GLEW_GET_VAR(__GLEW_ARB_copy_image) - -#endif /* GL_ARB_copy_image */ - -/* -------------------------- GL_ARB_cull_distance ------------------------- */ - -#ifndef GL_ARB_cull_distance -#define GL_ARB_cull_distance 1 - -#define GL_MAX_CULL_DISTANCES 0x82F9 -#define GL_MAX_COMBINED_CLIP_AND_CULL_DISTANCES 0x82FA - -#define GLEW_ARB_cull_distance GLEW_GET_VAR(__GLEW_ARB_cull_distance) - -#endif /* GL_ARB_cull_distance */ - -/* -------------------------- GL_ARB_debug_output -------------------------- */ - -#ifndef GL_ARB_debug_output -#define GL_ARB_debug_output 1 - -#define GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION_ARB 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM_ARB 0x8245 -#define GL_DEBUG_SOURCE_API_ARB 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER_ARB 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY_ARB 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION_ARB 0x824A -#define GL_DEBUG_SOURCE_OTHER_ARB 0x824B -#define GL_DEBUG_TYPE_ERROR_ARB 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB 0x824E -#define GL_DEBUG_TYPE_PORTABILITY_ARB 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE_ARB 0x8250 -#define GL_DEBUG_TYPE_OTHER_ARB 0x8251 -#define GL_MAX_DEBUG_MESSAGE_LENGTH_ARB 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES_ARB 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES_ARB 0x9145 -#define GL_DEBUG_SEVERITY_HIGH_ARB 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM_ARB 0x9147 -#define GL_DEBUG_SEVERITY_LOW_ARB 0x9148 - -typedef void (GLAPIENTRY *GLDEBUGPROCARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam); - -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const void *userParam); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf); -typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog); - -#define glDebugMessageCallbackARB GLEW_GET_FUN(__glewDebugMessageCallbackARB) -#define glDebugMessageControlARB GLEW_GET_FUN(__glewDebugMessageControlARB) -#define glDebugMessageInsertARB GLEW_GET_FUN(__glewDebugMessageInsertARB) -#define glGetDebugMessageLogARB GLEW_GET_FUN(__glewGetDebugMessageLogARB) - -#define GLEW_ARB_debug_output GLEW_GET_VAR(__GLEW_ARB_debug_output) - -#endif /* GL_ARB_debug_output */ - -/* ----------------------- GL_ARB_depth_buffer_float ----------------------- */ - -#ifndef GL_ARB_depth_buffer_float -#define GL_ARB_depth_buffer_float 1 - -#define GL_DEPTH_COMPONENT32F 0x8CAC -#define GL_DEPTH32F_STENCIL8 0x8CAD -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD - -#define GLEW_ARB_depth_buffer_float GLEW_GET_VAR(__GLEW_ARB_depth_buffer_float) - -#endif /* GL_ARB_depth_buffer_float */ - -/* --------------------------- GL_ARB_depth_clamp -------------------------- */ - -#ifndef GL_ARB_depth_clamp -#define GL_ARB_depth_clamp 1 - -#define GL_DEPTH_CLAMP 0x864F - -#define GLEW_ARB_depth_clamp GLEW_GET_VAR(__GLEW_ARB_depth_clamp) - -#endif /* GL_ARB_depth_clamp */ - -/* -------------------------- GL_ARB_depth_texture ------------------------- */ - -#ifndef GL_ARB_depth_texture -#define GL_ARB_depth_texture 1 - -#define GL_DEPTH_COMPONENT16_ARB 0x81A5 -#define GL_DEPTH_COMPONENT24_ARB 0x81A6 -#define GL_DEPTH_COMPONENT32_ARB 0x81A7 -#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A -#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B - -#define GLEW_ARB_depth_texture GLEW_GET_VAR(__GLEW_ARB_depth_texture) - -#endif /* GL_ARB_depth_texture */ - -/* ----------------------- GL_ARB_derivative_control ----------------------- */ - -#ifndef GL_ARB_derivative_control -#define GL_ARB_derivative_control 1 - -#define GLEW_ARB_derivative_control GLEW_GET_VAR(__GLEW_ARB_derivative_control) - -#endif /* GL_ARB_derivative_control */ - -/* ----------------------- GL_ARB_direct_state_access ---------------------- */ - -#ifndef GL_ARB_direct_state_access -#define GL_ARB_direct_state_access 1 - -#define GL_TEXTURE_TARGET 0x1006 -#define GL_QUERY_TARGET 0x82EA - -typedef void (GLAPIENTRY * PFNGLBINDTEXTUREUNITPROC) (GLuint unit, GLuint texture); -typedef void (GLAPIENTRY * PFNGLBLITNAMEDFRAMEBUFFERPROC) (GLuint readFramebuffer, GLuint drawFramebuffer, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef GLenum (GLAPIENTRY * PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC) (GLuint framebuffer, GLenum target); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERDATAPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERFIPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERFVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, GLfloat* value); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLint* value); -typedef void (GLAPIENTRY * PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC) (GLuint framebuffer, GLenum buffer, GLint drawbuffer, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOPYNAMEDBUFFERSUBDATAPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCREATEBUFFERSPROC) (GLsizei n, GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLCREATEFRAMEBUFFERSPROC) (GLsizei n, GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLCREATEPROGRAMPIPELINESPROC) (GLsizei n, GLuint* pipelines); -typedef void (GLAPIENTRY * PFNGLCREATEQUERIESPROC) (GLenum target, GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLCREATERENDERBUFFERSPROC) (GLsizei n, GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLCREATESAMPLERSPROC) (GLsizei n, GLuint* samplers); -typedef void (GLAPIENTRY * PFNGLCREATETEXTURESPROC) (GLenum target, GLsizei n, GLuint* textures); -typedef void (GLAPIENTRY * PFNGLCREATETRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLCREATEVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYATTRIBPROC) (GLuint vaobj, GLuint index); -typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); -typedef void (GLAPIENTRY * PFNGLGENERATETEXTUREMIPMAPPROC) (GLuint texture); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLsizei bufSize, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERI64VPROC) (GLuint buffer, GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERIVPROC) (GLuint buffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPOINTERVPROC) (GLuint buffer, GLenum pname, void** params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); -typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC) (GLuint framebuffer, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC) (GLuint renderbuffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTI64VPROC) (GLuint id,GLuint buffer,GLenum pname,GLintptr offset); -typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTIVPROC) (GLuint id,GLuint buffer,GLenum pname,GLintptr offset); -typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTUI64VPROC) (GLuint id,GLuint buffer,GLenum pname,GLintptr offset); -typedef void (GLAPIENTRY * PFNGLGETQUERYBUFFEROBJECTUIVPROC) (GLuint id,GLuint buffer,GLenum pname,GLintptr offset); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREIMAGEPROC) (GLuint texture, GLint level, GLenum format, GLenum type, GLsizei bufSize, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERFVPROC) (GLuint texture, GLint level, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERIVPROC) (GLuint texture, GLint level, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKI64_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint64* param); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKI_VPROC) (GLuint xfb, GLenum pname, GLuint index, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKIVPROC) (GLuint xfb, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINDEXED64IVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint64* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINDEXEDIVPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYIVPROC) (GLuint vaobj, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum* attachments); -typedef void (GLAPIENTRY * PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC) (GLuint framebuffer, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERPROC) (GLuint buffer, GLenum access); -typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERRANGEPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERDATAPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSTORAGEPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLbitfield flags); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC) (GLuint framebuffer, GLenum mode); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC) (GLuint framebuffer, GLsizei n, const GLenum* bufs); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC) (GLuint framebuffer, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC) (GLuint framebuffer, GLenum mode); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERPROC) (GLuint texture, GLenum internalformat, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERRANGEPROC) (GLuint texture, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIIVPROC) (GLuint texture, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIUIVPROC) (GLuint texture, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFPROC) (GLuint texture, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFVPROC) (GLuint texture, GLenum pname, const GLfloat* param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIPROC) (GLuint texture, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIVPROC) (GLuint texture, GLenum pname, const GLint* param); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE1DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DPROC) (GLuint texture, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC) (GLuint texture, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE1DPROC) (GLuint texture, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE2DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE3DPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC) (GLuint xfb, GLuint index, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC) (GLuint xfb, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef GLboolean (GLAPIENTRY * PFNGLUNMAPNAMEDBUFFERPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBBINDINGPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBIFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYATTRIBLFORMATPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYBINDINGDIVISORPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYELEMENTBUFFERPROC) (GLuint vaobj, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXBUFFERPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXBUFFERSPROC) (GLuint vaobj, GLuint first, GLsizei count, const GLuint* buffers, const GLintptr *offsets, const GLsizei *strides); - -#define glBindTextureUnit GLEW_GET_FUN(__glewBindTextureUnit) -#define glBlitNamedFramebuffer GLEW_GET_FUN(__glewBlitNamedFramebuffer) -#define glCheckNamedFramebufferStatus GLEW_GET_FUN(__glewCheckNamedFramebufferStatus) -#define glClearNamedBufferData GLEW_GET_FUN(__glewClearNamedBufferData) -#define glClearNamedBufferSubData GLEW_GET_FUN(__glewClearNamedBufferSubData) -#define glClearNamedFramebufferfi GLEW_GET_FUN(__glewClearNamedFramebufferfi) -#define glClearNamedFramebufferfv GLEW_GET_FUN(__glewClearNamedFramebufferfv) -#define glClearNamedFramebufferiv GLEW_GET_FUN(__glewClearNamedFramebufferiv) -#define glClearNamedFramebufferuiv GLEW_GET_FUN(__glewClearNamedFramebufferuiv) -#define glCompressedTextureSubImage1D GLEW_GET_FUN(__glewCompressedTextureSubImage1D) -#define glCompressedTextureSubImage2D GLEW_GET_FUN(__glewCompressedTextureSubImage2D) -#define glCompressedTextureSubImage3D GLEW_GET_FUN(__glewCompressedTextureSubImage3D) -#define glCopyNamedBufferSubData GLEW_GET_FUN(__glewCopyNamedBufferSubData) -#define glCopyTextureSubImage1D GLEW_GET_FUN(__glewCopyTextureSubImage1D) -#define glCopyTextureSubImage2D GLEW_GET_FUN(__glewCopyTextureSubImage2D) -#define glCopyTextureSubImage3D GLEW_GET_FUN(__glewCopyTextureSubImage3D) -#define glCreateBuffers GLEW_GET_FUN(__glewCreateBuffers) -#define glCreateFramebuffers GLEW_GET_FUN(__glewCreateFramebuffers) -#define glCreateProgramPipelines GLEW_GET_FUN(__glewCreateProgramPipelines) -#define glCreateQueries GLEW_GET_FUN(__glewCreateQueries) -#define glCreateRenderbuffers GLEW_GET_FUN(__glewCreateRenderbuffers) -#define glCreateSamplers GLEW_GET_FUN(__glewCreateSamplers) -#define glCreateTextures GLEW_GET_FUN(__glewCreateTextures) -#define glCreateTransformFeedbacks GLEW_GET_FUN(__glewCreateTransformFeedbacks) -#define glCreateVertexArrays GLEW_GET_FUN(__glewCreateVertexArrays) -#define glDisableVertexArrayAttrib GLEW_GET_FUN(__glewDisableVertexArrayAttrib) -#define glEnableVertexArrayAttrib GLEW_GET_FUN(__glewEnableVertexArrayAttrib) -#define glFlushMappedNamedBufferRange GLEW_GET_FUN(__glewFlushMappedNamedBufferRange) -#define glGenerateTextureMipmap GLEW_GET_FUN(__glewGenerateTextureMipmap) -#define glGetCompressedTextureImage GLEW_GET_FUN(__glewGetCompressedTextureImage) -#define glGetNamedBufferParameteri64v GLEW_GET_FUN(__glewGetNamedBufferParameteri64v) -#define glGetNamedBufferParameteriv GLEW_GET_FUN(__glewGetNamedBufferParameteriv) -#define glGetNamedBufferPointerv GLEW_GET_FUN(__glewGetNamedBufferPointerv) -#define glGetNamedBufferSubData GLEW_GET_FUN(__glewGetNamedBufferSubData) -#define glGetNamedFramebufferAttachmentParameteriv GLEW_GET_FUN(__glewGetNamedFramebufferAttachmentParameteriv) -#define glGetNamedFramebufferParameteriv GLEW_GET_FUN(__glewGetNamedFramebufferParameteriv) -#define glGetNamedRenderbufferParameteriv GLEW_GET_FUN(__glewGetNamedRenderbufferParameteriv) -#define glGetQueryBufferObjecti64v GLEW_GET_FUN(__glewGetQueryBufferObjecti64v) -#define glGetQueryBufferObjectiv GLEW_GET_FUN(__glewGetQueryBufferObjectiv) -#define glGetQueryBufferObjectui64v GLEW_GET_FUN(__glewGetQueryBufferObjectui64v) -#define glGetQueryBufferObjectuiv GLEW_GET_FUN(__glewGetQueryBufferObjectuiv) -#define glGetTextureImage GLEW_GET_FUN(__glewGetTextureImage) -#define glGetTextureLevelParameterfv GLEW_GET_FUN(__glewGetTextureLevelParameterfv) -#define glGetTextureLevelParameteriv GLEW_GET_FUN(__glewGetTextureLevelParameteriv) -#define glGetTextureParameterIiv GLEW_GET_FUN(__glewGetTextureParameterIiv) -#define glGetTextureParameterIuiv GLEW_GET_FUN(__glewGetTextureParameterIuiv) -#define glGetTextureParameterfv GLEW_GET_FUN(__glewGetTextureParameterfv) -#define glGetTextureParameteriv GLEW_GET_FUN(__glewGetTextureParameteriv) -#define glGetTransformFeedbacki64_v GLEW_GET_FUN(__glewGetTransformFeedbacki64_v) -#define glGetTransformFeedbacki_v GLEW_GET_FUN(__glewGetTransformFeedbacki_v) -#define glGetTransformFeedbackiv GLEW_GET_FUN(__glewGetTransformFeedbackiv) -#define glGetVertexArrayIndexed64iv GLEW_GET_FUN(__glewGetVertexArrayIndexed64iv) -#define glGetVertexArrayIndexediv GLEW_GET_FUN(__glewGetVertexArrayIndexediv) -#define glGetVertexArrayiv GLEW_GET_FUN(__glewGetVertexArrayiv) -#define glInvalidateNamedFramebufferData GLEW_GET_FUN(__glewInvalidateNamedFramebufferData) -#define glInvalidateNamedFramebufferSubData GLEW_GET_FUN(__glewInvalidateNamedFramebufferSubData) -#define glMapNamedBuffer GLEW_GET_FUN(__glewMapNamedBuffer) -#define glMapNamedBufferRange GLEW_GET_FUN(__glewMapNamedBufferRange) -#define glNamedBufferData GLEW_GET_FUN(__glewNamedBufferData) -#define glNamedBufferStorage GLEW_GET_FUN(__glewNamedBufferStorage) -#define glNamedBufferSubData GLEW_GET_FUN(__glewNamedBufferSubData) -#define glNamedFramebufferDrawBuffer GLEW_GET_FUN(__glewNamedFramebufferDrawBuffer) -#define glNamedFramebufferDrawBuffers GLEW_GET_FUN(__glewNamedFramebufferDrawBuffers) -#define glNamedFramebufferParameteri GLEW_GET_FUN(__glewNamedFramebufferParameteri) -#define glNamedFramebufferReadBuffer GLEW_GET_FUN(__glewNamedFramebufferReadBuffer) -#define glNamedFramebufferRenderbuffer GLEW_GET_FUN(__glewNamedFramebufferRenderbuffer) -#define glNamedFramebufferTexture GLEW_GET_FUN(__glewNamedFramebufferTexture) -#define glNamedFramebufferTextureLayer GLEW_GET_FUN(__glewNamedFramebufferTextureLayer) -#define glNamedRenderbufferStorage GLEW_GET_FUN(__glewNamedRenderbufferStorage) -#define glNamedRenderbufferStorageMultisample GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisample) -#define glTextureBuffer GLEW_GET_FUN(__glewTextureBuffer) -#define glTextureBufferRange GLEW_GET_FUN(__glewTextureBufferRange) -#define glTextureParameterIiv GLEW_GET_FUN(__glewTextureParameterIiv) -#define glTextureParameterIuiv GLEW_GET_FUN(__glewTextureParameterIuiv) -#define glTextureParameterf GLEW_GET_FUN(__glewTextureParameterf) -#define glTextureParameterfv GLEW_GET_FUN(__glewTextureParameterfv) -#define glTextureParameteri GLEW_GET_FUN(__glewTextureParameteri) -#define glTextureParameteriv GLEW_GET_FUN(__glewTextureParameteriv) -#define glTextureStorage1D GLEW_GET_FUN(__glewTextureStorage1D) -#define glTextureStorage2D GLEW_GET_FUN(__glewTextureStorage2D) -#define glTextureStorage2DMultisample GLEW_GET_FUN(__glewTextureStorage2DMultisample) -#define glTextureStorage3D GLEW_GET_FUN(__glewTextureStorage3D) -#define glTextureStorage3DMultisample GLEW_GET_FUN(__glewTextureStorage3DMultisample) -#define glTextureSubImage1D GLEW_GET_FUN(__glewTextureSubImage1D) -#define glTextureSubImage2D GLEW_GET_FUN(__glewTextureSubImage2D) -#define glTextureSubImage3D GLEW_GET_FUN(__glewTextureSubImage3D) -#define glTransformFeedbackBufferBase GLEW_GET_FUN(__glewTransformFeedbackBufferBase) -#define glTransformFeedbackBufferRange GLEW_GET_FUN(__glewTransformFeedbackBufferRange) -#define glUnmapNamedBuffer GLEW_GET_FUN(__glewUnmapNamedBuffer) -#define glVertexArrayAttribBinding GLEW_GET_FUN(__glewVertexArrayAttribBinding) -#define glVertexArrayAttribFormat GLEW_GET_FUN(__glewVertexArrayAttribFormat) -#define glVertexArrayAttribIFormat GLEW_GET_FUN(__glewVertexArrayAttribIFormat) -#define glVertexArrayAttribLFormat GLEW_GET_FUN(__glewVertexArrayAttribLFormat) -#define glVertexArrayBindingDivisor GLEW_GET_FUN(__glewVertexArrayBindingDivisor) -#define glVertexArrayElementBuffer GLEW_GET_FUN(__glewVertexArrayElementBuffer) -#define glVertexArrayVertexBuffer GLEW_GET_FUN(__glewVertexArrayVertexBuffer) -#define glVertexArrayVertexBuffers GLEW_GET_FUN(__glewVertexArrayVertexBuffers) - -#define GLEW_ARB_direct_state_access GLEW_GET_VAR(__GLEW_ARB_direct_state_access) - -#endif /* GL_ARB_direct_state_access */ - -/* -------------------------- GL_ARB_draw_buffers -------------------------- */ - -#ifndef GL_ARB_draw_buffers -#define GL_ARB_draw_buffers 1 - -#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 -#define GL_DRAW_BUFFER0_ARB 0x8825 -#define GL_DRAW_BUFFER1_ARB 0x8826 -#define GL_DRAW_BUFFER2_ARB 0x8827 -#define GL_DRAW_BUFFER3_ARB 0x8828 -#define GL_DRAW_BUFFER4_ARB 0x8829 -#define GL_DRAW_BUFFER5_ARB 0x882A -#define GL_DRAW_BUFFER6_ARB 0x882B -#define GL_DRAW_BUFFER7_ARB 0x882C -#define GL_DRAW_BUFFER8_ARB 0x882D -#define GL_DRAW_BUFFER9_ARB 0x882E -#define GL_DRAW_BUFFER10_ARB 0x882F -#define GL_DRAW_BUFFER11_ARB 0x8830 -#define GL_DRAW_BUFFER12_ARB 0x8831 -#define GL_DRAW_BUFFER13_ARB 0x8832 -#define GL_DRAW_BUFFER14_ARB 0x8833 -#define GL_DRAW_BUFFER15_ARB 0x8834 - -typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum* bufs); - -#define glDrawBuffersARB GLEW_GET_FUN(__glewDrawBuffersARB) - -#define GLEW_ARB_draw_buffers GLEW_GET_VAR(__GLEW_ARB_draw_buffers) - -#endif /* GL_ARB_draw_buffers */ - -/* ----------------------- GL_ARB_draw_buffers_blend ----------------------- */ - -#ifndef GL_ARB_draw_buffers_blend -#define GL_ARB_draw_buffers_blend 1 - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEIARBPROC) (GLuint buf, GLenum modeRGB, GLenum modeAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONIARBPROC) (GLuint buf, GLenum mode); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEIARBPROC) (GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha); -typedef void (GLAPIENTRY * PFNGLBLENDFUNCIARBPROC) (GLuint buf, GLenum src, GLenum dst); - -#define glBlendEquationSeparateiARB GLEW_GET_FUN(__glewBlendEquationSeparateiARB) -#define glBlendEquationiARB GLEW_GET_FUN(__glewBlendEquationiARB) -#define glBlendFuncSeparateiARB GLEW_GET_FUN(__glewBlendFuncSeparateiARB) -#define glBlendFunciARB GLEW_GET_FUN(__glewBlendFunciARB) - -#define GLEW_ARB_draw_buffers_blend GLEW_GET_VAR(__GLEW_ARB_draw_buffers_blend) - -#endif /* GL_ARB_draw_buffers_blend */ - -/* -------------------- GL_ARB_draw_elements_base_vertex ------------------- */ - -#ifndef GL_ARB_draw_elements_base_vertex -#define GL_ARB_draw_elements_base_vertex 1 - -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLint basevertex); -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei* count, GLenum type, const void *const *indices, GLsizei primcount, const GLint *basevertex); - -#define glDrawElementsBaseVertex GLEW_GET_FUN(__glewDrawElementsBaseVertex) -#define glDrawElementsInstancedBaseVertex GLEW_GET_FUN(__glewDrawElementsInstancedBaseVertex) -#define glDrawRangeElementsBaseVertex GLEW_GET_FUN(__glewDrawRangeElementsBaseVertex) -#define glMultiDrawElementsBaseVertex GLEW_GET_FUN(__glewMultiDrawElementsBaseVertex) - -#define GLEW_ARB_draw_elements_base_vertex GLEW_GET_VAR(__GLEW_ARB_draw_elements_base_vertex) - -#endif /* GL_ARB_draw_elements_base_vertex */ - -/* -------------------------- GL_ARB_draw_indirect ------------------------- */ - -#ifndef GL_ARB_draw_indirect -#define GL_ARB_draw_indirect 1 - -#define GL_DRAW_INDIRECT_BUFFER 0x8F3F -#define GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect); - -#define glDrawArraysIndirect GLEW_GET_FUN(__glewDrawArraysIndirect) -#define glDrawElementsIndirect GLEW_GET_FUN(__glewDrawElementsIndirect) - -#define GLEW_ARB_draw_indirect GLEW_GET_VAR(__GLEW_ARB_draw_indirect) - -#endif /* GL_ARB_draw_indirect */ - -/* ------------------------- GL_ARB_draw_instanced ------------------------- */ - -#ifndef GL_ARB_draw_instanced -#define GL_ARB_draw_instanced 1 - -#define GLEW_ARB_draw_instanced GLEW_GET_VAR(__GLEW_ARB_draw_instanced) - -#endif /* GL_ARB_draw_instanced */ - -/* ------------------------ GL_ARB_enhanced_layouts ------------------------ */ - -#ifndef GL_ARB_enhanced_layouts -#define GL_ARB_enhanced_layouts 1 - -#define GL_LOCATION_COMPONENT 0x934A -#define GL_TRANSFORM_FEEDBACK_BUFFER_INDEX 0x934B -#define GL_TRANSFORM_FEEDBACK_BUFFER_STRIDE 0x934C - -#define GLEW_ARB_enhanced_layouts GLEW_GET_VAR(__GLEW_ARB_enhanced_layouts) - -#endif /* GL_ARB_enhanced_layouts */ - -/* -------------------- GL_ARB_explicit_attrib_location -------------------- */ - -#ifndef GL_ARB_explicit_attrib_location -#define GL_ARB_explicit_attrib_location 1 - -#define GLEW_ARB_explicit_attrib_location GLEW_GET_VAR(__GLEW_ARB_explicit_attrib_location) - -#endif /* GL_ARB_explicit_attrib_location */ - -/* -------------------- GL_ARB_explicit_uniform_location ------------------- */ - -#ifndef GL_ARB_explicit_uniform_location -#define GL_ARB_explicit_uniform_location 1 - -#define GL_MAX_UNIFORM_LOCATIONS 0x826E - -#define GLEW_ARB_explicit_uniform_location GLEW_GET_VAR(__GLEW_ARB_explicit_uniform_location) - -#endif /* GL_ARB_explicit_uniform_location */ - -/* ------------------- GL_ARB_fragment_coord_conventions ------------------- */ - -#ifndef GL_ARB_fragment_coord_conventions -#define GL_ARB_fragment_coord_conventions 1 - -#define GLEW_ARB_fragment_coord_conventions GLEW_GET_VAR(__GLEW_ARB_fragment_coord_conventions) - -#endif /* GL_ARB_fragment_coord_conventions */ - -/* --------------------- GL_ARB_fragment_layer_viewport -------------------- */ - -#ifndef GL_ARB_fragment_layer_viewport -#define GL_ARB_fragment_layer_viewport 1 - -#define GLEW_ARB_fragment_layer_viewport GLEW_GET_VAR(__GLEW_ARB_fragment_layer_viewport) - -#endif /* GL_ARB_fragment_layer_viewport */ - -/* ------------------------ GL_ARB_fragment_program ------------------------ */ - -#ifndef GL_ARB_fragment_program -#define GL_ARB_fragment_program 1 - -#define GL_FRAGMENT_PROGRAM_ARB 0x8804 -#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 -#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 -#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 -#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 -#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 -#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A -#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B -#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C -#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D -#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E -#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F -#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 -#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 - -#define GLEW_ARB_fragment_program GLEW_GET_VAR(__GLEW_ARB_fragment_program) - -#endif /* GL_ARB_fragment_program */ - -/* --------------------- GL_ARB_fragment_program_shadow -------------------- */ - -#ifndef GL_ARB_fragment_program_shadow -#define GL_ARB_fragment_program_shadow 1 - -#define GLEW_ARB_fragment_program_shadow GLEW_GET_VAR(__GLEW_ARB_fragment_program_shadow) - -#endif /* GL_ARB_fragment_program_shadow */ - -/* ------------------------- GL_ARB_fragment_shader ------------------------ */ - -#ifndef GL_ARB_fragment_shader -#define GL_ARB_fragment_shader 1 - -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B - -#define GLEW_ARB_fragment_shader GLEW_GET_VAR(__GLEW_ARB_fragment_shader) - -#endif /* GL_ARB_fragment_shader */ - -/* -------------------- GL_ARB_fragment_shader_interlock ------------------- */ - -#ifndef GL_ARB_fragment_shader_interlock -#define GL_ARB_fragment_shader_interlock 1 - -#define GLEW_ARB_fragment_shader_interlock GLEW_GET_VAR(__GLEW_ARB_fragment_shader_interlock) - -#endif /* GL_ARB_fragment_shader_interlock */ - -/* ------------------- GL_ARB_framebuffer_no_attachments ------------------- */ - -#ifndef GL_ARB_framebuffer_no_attachments -#define GL_ARB_framebuffer_no_attachments 1 - -#define GL_FRAMEBUFFER_DEFAULT_WIDTH 0x9310 -#define GL_FRAMEBUFFER_DEFAULT_HEIGHT 0x9311 -#define GL_FRAMEBUFFER_DEFAULT_LAYERS 0x9312 -#define GL_FRAMEBUFFER_DEFAULT_SAMPLES 0x9313 -#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314 -#define GL_MAX_FRAMEBUFFER_WIDTH 0x9315 -#define GL_MAX_FRAMEBUFFER_HEIGHT 0x9316 -#define GL_MAX_FRAMEBUFFER_LAYERS 0x9317 -#define GL_MAX_FRAMEBUFFER_SAMPLES 0x9318 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param); - -#define glFramebufferParameteri GLEW_GET_FUN(__glewFramebufferParameteri) -#define glGetFramebufferParameteriv GLEW_GET_FUN(__glewGetFramebufferParameteriv) -#define glGetNamedFramebufferParameterivEXT GLEW_GET_FUN(__glewGetNamedFramebufferParameterivEXT) -#define glNamedFramebufferParameteriEXT GLEW_GET_FUN(__glewNamedFramebufferParameteriEXT) - -#define GLEW_ARB_framebuffer_no_attachments GLEW_GET_VAR(__GLEW_ARB_framebuffer_no_attachments) - -#endif /* GL_ARB_framebuffer_no_attachments */ - -/* ----------------------- GL_ARB_framebuffer_object ----------------------- */ - -#ifndef GL_ARB_framebuffer_object -#define GL_ARB_framebuffer_object 1 - -#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 -#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 -#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 -#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212 -#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213 -#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 -#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215 -#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 -#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217 -#define GL_FRAMEBUFFER_DEFAULT 0x8218 -#define GL_FRAMEBUFFER_UNDEFINED 0x8219 -#define GL_DEPTH_STENCIL_ATTACHMENT 0x821A -#define GL_INDEX 0x8222 -#define GL_MAX_RENDERBUFFER_SIZE 0x84E8 -#define GL_DEPTH_STENCIL 0x84F9 -#define GL_UNSIGNED_INT_24_8 0x84FA -#define GL_DEPTH24_STENCIL8 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE 0x88F1 -#define GL_UNSIGNED_NORMALIZED 0x8C17 -#define GL_SRGB 0x8C40 -#define GL_DRAW_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_FRAMEBUFFER_BINDING 0x8CA6 -#define GL_RENDERBUFFER_BINDING 0x8CA7 -#define GL_READ_FRAMEBUFFER 0x8CA8 -#define GL_DRAW_FRAMEBUFFER 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING 0x8CAA -#define GL_RENDERBUFFER_SAMPLES 0x8CAB -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS 0x8CDF -#define GL_COLOR_ATTACHMENT0 0x8CE0 -#define GL_COLOR_ATTACHMENT1 0x8CE1 -#define GL_COLOR_ATTACHMENT2 0x8CE2 -#define GL_COLOR_ATTACHMENT3 0x8CE3 -#define GL_COLOR_ATTACHMENT4 0x8CE4 -#define GL_COLOR_ATTACHMENT5 0x8CE5 -#define GL_COLOR_ATTACHMENT6 0x8CE6 -#define GL_COLOR_ATTACHMENT7 0x8CE7 -#define GL_COLOR_ATTACHMENT8 0x8CE8 -#define GL_COLOR_ATTACHMENT9 0x8CE9 -#define GL_COLOR_ATTACHMENT10 0x8CEA -#define GL_COLOR_ATTACHMENT11 0x8CEB -#define GL_COLOR_ATTACHMENT12 0x8CEC -#define GL_COLOR_ATTACHMENT13 0x8CED -#define GL_COLOR_ATTACHMENT14 0x8CEE -#define GL_COLOR_ATTACHMENT15 0x8CEF -#define GL_DEPTH_ATTACHMENT 0x8D00 -#define GL_STENCIL_ATTACHMENT 0x8D20 -#define GL_FRAMEBUFFER 0x8D40 -#define GL_RENDERBUFFER 0x8D41 -#define GL_RENDERBUFFER_WIDTH 0x8D42 -#define GL_RENDERBUFFER_HEIGHT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 -#define GL_STENCIL_INDEX1 0x8D46 -#define GL_STENCIL_INDEX4 0x8D47 -#define GL_STENCIL_INDEX8 0x8D48 -#define GL_STENCIL_INDEX16 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 -#define GL_MAX_SAMPLES 0x8D57 - -typedef void (GLAPIENTRY * PFNGLBINDFRAMEBUFFERPROC) (GLenum target, GLuint framebuffer); -typedef void (GLAPIENTRY * PFNGLBINDRENDERBUFFERPROC) (GLenum target, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFERPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef GLenum (GLAPIENTRY * PFNGLCHECKFRAMEBUFFERSTATUSPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSPROC) (GLsizei n, const GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSPROC) (GLsizei n, const GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFERPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERPROC) (GLenum target,GLenum attachment, GLuint texture,GLint level,GLint layer); -typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERSPROC) (GLsizei n, GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLGENRENDERBUFFERSPROC) (GLsizei n, GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLGENERATEMIPMAPPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETRENDERBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISFRAMEBUFFERPROC) (GLuint framebuffer); -typedef GLboolean (GLAPIENTRY * PFNGLISRENDERBUFFERPROC) (GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); - -#define glBindFramebuffer GLEW_GET_FUN(__glewBindFramebuffer) -#define glBindRenderbuffer GLEW_GET_FUN(__glewBindRenderbuffer) -#define glBlitFramebuffer GLEW_GET_FUN(__glewBlitFramebuffer) -#define glCheckFramebufferStatus GLEW_GET_FUN(__glewCheckFramebufferStatus) -#define glDeleteFramebuffers GLEW_GET_FUN(__glewDeleteFramebuffers) -#define glDeleteRenderbuffers GLEW_GET_FUN(__glewDeleteRenderbuffers) -#define glFramebufferRenderbuffer GLEW_GET_FUN(__glewFramebufferRenderbuffer) -#define glFramebufferTexture1D GLEW_GET_FUN(__glewFramebufferTexture1D) -#define glFramebufferTexture2D GLEW_GET_FUN(__glewFramebufferTexture2D) -#define glFramebufferTexture3D GLEW_GET_FUN(__glewFramebufferTexture3D) -#define glFramebufferTextureLayer GLEW_GET_FUN(__glewFramebufferTextureLayer) -#define glGenFramebuffers GLEW_GET_FUN(__glewGenFramebuffers) -#define glGenRenderbuffers GLEW_GET_FUN(__glewGenRenderbuffers) -#define glGenerateMipmap GLEW_GET_FUN(__glewGenerateMipmap) -#define glGetFramebufferAttachmentParameteriv GLEW_GET_FUN(__glewGetFramebufferAttachmentParameteriv) -#define glGetRenderbufferParameteriv GLEW_GET_FUN(__glewGetRenderbufferParameteriv) -#define glIsFramebuffer GLEW_GET_FUN(__glewIsFramebuffer) -#define glIsRenderbuffer GLEW_GET_FUN(__glewIsRenderbuffer) -#define glRenderbufferStorage GLEW_GET_FUN(__glewRenderbufferStorage) -#define glRenderbufferStorageMultisample GLEW_GET_FUN(__glewRenderbufferStorageMultisample) - -#define GLEW_ARB_framebuffer_object GLEW_GET_VAR(__GLEW_ARB_framebuffer_object) - -#endif /* GL_ARB_framebuffer_object */ - -/* ------------------------ GL_ARB_framebuffer_sRGB ------------------------ */ - -#ifndef GL_ARB_framebuffer_sRGB -#define GL_ARB_framebuffer_sRGB 1 - -#define GL_FRAMEBUFFER_SRGB 0x8DB9 - -#define GLEW_ARB_framebuffer_sRGB GLEW_GET_VAR(__GLEW_ARB_framebuffer_sRGB) - -#endif /* GL_ARB_framebuffer_sRGB */ - -/* ------------------------ GL_ARB_geometry_shader4 ------------------------ */ - -#ifndef GL_ARB_geometry_shader4 -#define GL_ARB_geometry_shader4 1 - -#define GL_LINES_ADJACENCY_ARB 0xA -#define GL_LINE_STRIP_ADJACENCY_ARB 0xB -#define GL_TRIANGLES_ADJACENCY_ARB 0xC -#define GL_TRIANGLE_STRIP_ADJACENCY_ARB 0xD -#define GL_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9 -#define GL_GEOMETRY_SHADER_ARB 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT_ARB 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_ARB 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_ARB 0x8DDC -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB 0x8DE1 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREFACEARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYERARBPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIARBPROC) (GLuint program, GLenum pname, GLint value); - -#define glFramebufferTextureARB GLEW_GET_FUN(__glewFramebufferTextureARB) -#define glFramebufferTextureFaceARB GLEW_GET_FUN(__glewFramebufferTextureFaceARB) -#define glFramebufferTextureLayerARB GLEW_GET_FUN(__glewFramebufferTextureLayerARB) -#define glProgramParameteriARB GLEW_GET_FUN(__glewProgramParameteriARB) - -#define GLEW_ARB_geometry_shader4 GLEW_GET_VAR(__GLEW_ARB_geometry_shader4) - -#endif /* GL_ARB_geometry_shader4 */ - -/* ----------------------- GL_ARB_get_program_binary ----------------------- */ - -#ifndef GL_ARB_get_program_binary -#define GL_ARB_get_program_binary 1 - -#define GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257 -#define GL_PROGRAM_BINARY_LENGTH 0x8741 -#define GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE -#define GL_PROGRAM_BINARY_FORMATS 0x87FF - -typedef void (GLAPIENTRY * PFNGLGETPROGRAMBINARYPROC) (GLuint program, GLsizei bufSize, GLsizei* length, GLenum *binaryFormat, void*binary); -typedef void (GLAPIENTRY * PFNGLPROGRAMBINARYPROC) (GLuint program, GLenum binaryFormat, const void *binary, GLsizei length); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIPROC) (GLuint program, GLenum pname, GLint value); - -#define glGetProgramBinary GLEW_GET_FUN(__glewGetProgramBinary) -#define glProgramBinary GLEW_GET_FUN(__glewProgramBinary) -#define glProgramParameteri GLEW_GET_FUN(__glewProgramParameteri) - -#define GLEW_ARB_get_program_binary GLEW_GET_VAR(__GLEW_ARB_get_program_binary) - -#endif /* GL_ARB_get_program_binary */ - -/* ---------------------- GL_ARB_get_texture_sub_image --------------------- */ - -#ifndef GL_ARB_get_texture_sub_image -#define GL_ARB_get_texture_sub_image 1 - -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei bufSize, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETTEXTURESUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLsizei bufSize, void *pixels); - -#define glGetCompressedTextureSubImage GLEW_GET_FUN(__glewGetCompressedTextureSubImage) -#define glGetTextureSubImage GLEW_GET_FUN(__glewGetTextureSubImage) - -#define GLEW_ARB_get_texture_sub_image GLEW_GET_VAR(__GLEW_ARB_get_texture_sub_image) - -#endif /* GL_ARB_get_texture_sub_image */ - -/* ---------------------------- GL_ARB_gl_spirv ---------------------------- */ - -#ifndef GL_ARB_gl_spirv -#define GL_ARB_gl_spirv 1 - -#define GL_SHADER_BINARY_FORMAT_SPIR_V_ARB 0x9551 -#define GL_SPIR_V_BINARY_ARB 0x9552 - -typedef void (GLAPIENTRY * PFNGLSPECIALIZESHADERARBPROC) (GLuint shader, const GLchar* pEntryPoint, GLuint numSpecializationConstants, const GLuint* pConstantIndex, const GLuint* pConstantValue); - -#define glSpecializeShaderARB GLEW_GET_FUN(__glewSpecializeShaderARB) - -#define GLEW_ARB_gl_spirv GLEW_GET_VAR(__GLEW_ARB_gl_spirv) - -#endif /* GL_ARB_gl_spirv */ - -/* --------------------------- GL_ARB_gpu_shader5 -------------------------- */ - -#ifndef GL_ARB_gpu_shader5 -#define GL_ARB_gpu_shader5 1 - -#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F -#define GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C -#define GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D -#define GL_MAX_VERTEX_STREAMS 0x8E71 - -#define GLEW_ARB_gpu_shader5 GLEW_GET_VAR(__GLEW_ARB_gpu_shader5) - -#endif /* GL_ARB_gpu_shader5 */ - -/* ------------------------- GL_ARB_gpu_shader_fp64 ------------------------ */ - -#ifndef GL_ARB_gpu_shader_fp64 -#define GL_ARB_gpu_shader_fp64 1 - -#define GL_DOUBLE_MAT2 0x8F46 -#define GL_DOUBLE_MAT3 0x8F47 -#define GL_DOUBLE_MAT4 0x8F48 -#define GL_DOUBLE_MAT2x3 0x8F49 -#define GL_DOUBLE_MAT2x4 0x8F4A -#define GL_DOUBLE_MAT3x2 0x8F4B -#define GL_DOUBLE_MAT3x4 0x8F4C -#define GL_DOUBLE_MAT4x2 0x8F4D -#define GL_DOUBLE_MAT4x3 0x8F4E -#define GL_DOUBLE_VEC2 0x8FFC -#define GL_DOUBLE_VEC3 0x8FFD -#define GL_DOUBLE_VEC4 0x8FFE - -typedef void (GLAPIENTRY * PFNGLGETUNIFORMDVPROC) (GLuint program, GLint location, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLUNIFORM1DPROC) (GLint location, GLdouble x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1DVPROC) (GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2DPROC) (GLint location, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2DVPROC) (GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3DVPROC) (GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4DPROC) (GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4DVPROC) (GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3X4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X2DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4X3DVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); - -#define glGetUniformdv GLEW_GET_FUN(__glewGetUniformdv) -#define glUniform1d GLEW_GET_FUN(__glewUniform1d) -#define glUniform1dv GLEW_GET_FUN(__glewUniform1dv) -#define glUniform2d GLEW_GET_FUN(__glewUniform2d) -#define glUniform2dv GLEW_GET_FUN(__glewUniform2dv) -#define glUniform3d GLEW_GET_FUN(__glewUniform3d) -#define glUniform3dv GLEW_GET_FUN(__glewUniform3dv) -#define glUniform4d GLEW_GET_FUN(__glewUniform4d) -#define glUniform4dv GLEW_GET_FUN(__glewUniform4dv) -#define glUniformMatrix2dv GLEW_GET_FUN(__glewUniformMatrix2dv) -#define glUniformMatrix2x3dv GLEW_GET_FUN(__glewUniformMatrix2x3dv) -#define glUniformMatrix2x4dv GLEW_GET_FUN(__glewUniformMatrix2x4dv) -#define glUniformMatrix3dv GLEW_GET_FUN(__glewUniformMatrix3dv) -#define glUniformMatrix3x2dv GLEW_GET_FUN(__glewUniformMatrix3x2dv) -#define glUniformMatrix3x4dv GLEW_GET_FUN(__glewUniformMatrix3x4dv) -#define glUniformMatrix4dv GLEW_GET_FUN(__glewUniformMatrix4dv) -#define glUniformMatrix4x2dv GLEW_GET_FUN(__glewUniformMatrix4x2dv) -#define glUniformMatrix4x3dv GLEW_GET_FUN(__glewUniformMatrix4x3dv) - -#define GLEW_ARB_gpu_shader_fp64 GLEW_GET_VAR(__GLEW_ARB_gpu_shader_fp64) - -#endif /* GL_ARB_gpu_shader_fp64 */ - -/* ------------------------ GL_ARB_gpu_shader_int64 ------------------------ */ - -#ifndef GL_ARB_gpu_shader_int64 -#define GL_ARB_gpu_shader_int64 1 - -#define GL_INT64_ARB 0x140E -#define GL_UNSIGNED_INT64_ARB 0x140F -#define GL_INT64_VEC2_ARB 0x8FE9 -#define GL_INT64_VEC3_ARB 0x8FEA -#define GL_INT64_VEC4_ARB 0x8FEB -#define GL_UNSIGNED_INT64_VEC2_ARB 0x8FF5 -#define GL_UNSIGNED_INT64_VEC3_ARB 0x8FF6 -#define GL_UNSIGNED_INT64_VEC4_ARB 0x8FF7 - -typedef void (GLAPIENTRY * PFNGLGETUNIFORMI64VARBPROC) (GLuint program, GLint location, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUI64VARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64ARBPROC) (GLuint program, GLint location, GLint64 x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64ARBPROC) (GLuint program, GLint location, GLuint64 x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64ARBPROC) (GLuint program, GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64ARBPROC) (GLuint program, GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64VARBPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1I64ARBPROC) (GLint location, GLint64 x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1I64VARBPROC) (GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64ARBPROC) (GLint location, GLuint64 x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2I64ARBPROC) (GLint location, GLint64 x, GLint64 y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2I64VARBPROC) (GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3I64VARBPROC) (GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4I64ARBPROC) (GLint location, GLint64 x, GLint64 y, GLint64 z, GLint64 w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4I64VARBPROC) (GLint location, GLsizei count, const GLint64* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64ARBPROC) (GLint location, GLuint64 x, GLuint64 y, GLuint64 z, GLuint64 w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64VARBPROC) (GLint location, GLsizei count, const GLuint64* value); - -#define glGetUniformi64vARB GLEW_GET_FUN(__glewGetUniformi64vARB) -#define glGetUniformui64vARB GLEW_GET_FUN(__glewGetUniformui64vARB) -#define glGetnUniformi64vARB GLEW_GET_FUN(__glewGetnUniformi64vARB) -#define glGetnUniformui64vARB GLEW_GET_FUN(__glewGetnUniformui64vARB) -#define glProgramUniform1i64ARB GLEW_GET_FUN(__glewProgramUniform1i64ARB) -#define glProgramUniform1i64vARB GLEW_GET_FUN(__glewProgramUniform1i64vARB) -#define glProgramUniform1ui64ARB GLEW_GET_FUN(__glewProgramUniform1ui64ARB) -#define glProgramUniform1ui64vARB GLEW_GET_FUN(__glewProgramUniform1ui64vARB) -#define glProgramUniform2i64ARB GLEW_GET_FUN(__glewProgramUniform2i64ARB) -#define glProgramUniform2i64vARB GLEW_GET_FUN(__glewProgramUniform2i64vARB) -#define glProgramUniform2ui64ARB GLEW_GET_FUN(__glewProgramUniform2ui64ARB) -#define glProgramUniform2ui64vARB GLEW_GET_FUN(__glewProgramUniform2ui64vARB) -#define glProgramUniform3i64ARB GLEW_GET_FUN(__glewProgramUniform3i64ARB) -#define glProgramUniform3i64vARB GLEW_GET_FUN(__glewProgramUniform3i64vARB) -#define glProgramUniform3ui64ARB GLEW_GET_FUN(__glewProgramUniform3ui64ARB) -#define glProgramUniform3ui64vARB GLEW_GET_FUN(__glewProgramUniform3ui64vARB) -#define glProgramUniform4i64ARB GLEW_GET_FUN(__glewProgramUniform4i64ARB) -#define glProgramUniform4i64vARB GLEW_GET_FUN(__glewProgramUniform4i64vARB) -#define glProgramUniform4ui64ARB GLEW_GET_FUN(__glewProgramUniform4ui64ARB) -#define glProgramUniform4ui64vARB GLEW_GET_FUN(__glewProgramUniform4ui64vARB) -#define glUniform1i64ARB GLEW_GET_FUN(__glewUniform1i64ARB) -#define glUniform1i64vARB GLEW_GET_FUN(__glewUniform1i64vARB) -#define glUniform1ui64ARB GLEW_GET_FUN(__glewUniform1ui64ARB) -#define glUniform1ui64vARB GLEW_GET_FUN(__glewUniform1ui64vARB) -#define glUniform2i64ARB GLEW_GET_FUN(__glewUniform2i64ARB) -#define glUniform2i64vARB GLEW_GET_FUN(__glewUniform2i64vARB) -#define glUniform2ui64ARB GLEW_GET_FUN(__glewUniform2ui64ARB) -#define glUniform2ui64vARB GLEW_GET_FUN(__glewUniform2ui64vARB) -#define glUniform3i64ARB GLEW_GET_FUN(__glewUniform3i64ARB) -#define glUniform3i64vARB GLEW_GET_FUN(__glewUniform3i64vARB) -#define glUniform3ui64ARB GLEW_GET_FUN(__glewUniform3ui64ARB) -#define glUniform3ui64vARB GLEW_GET_FUN(__glewUniform3ui64vARB) -#define glUniform4i64ARB GLEW_GET_FUN(__glewUniform4i64ARB) -#define glUniform4i64vARB GLEW_GET_FUN(__glewUniform4i64vARB) -#define glUniform4ui64ARB GLEW_GET_FUN(__glewUniform4ui64ARB) -#define glUniform4ui64vARB GLEW_GET_FUN(__glewUniform4ui64vARB) - -#define GLEW_ARB_gpu_shader_int64 GLEW_GET_VAR(__GLEW_ARB_gpu_shader_int64) - -#endif /* GL_ARB_gpu_shader_int64 */ - -/* ------------------------ GL_ARB_half_float_pixel ------------------------ */ - -#ifndef GL_ARB_half_float_pixel -#define GL_ARB_half_float_pixel 1 - -#define GL_HALF_FLOAT_ARB 0x140B - -#define GLEW_ARB_half_float_pixel GLEW_GET_VAR(__GLEW_ARB_half_float_pixel) - -#endif /* GL_ARB_half_float_pixel */ - -/* ------------------------ GL_ARB_half_float_vertex ----------------------- */ - -#ifndef GL_ARB_half_float_vertex -#define GL_ARB_half_float_vertex 1 - -#define GL_HALF_FLOAT 0x140B - -#define GLEW_ARB_half_float_vertex GLEW_GET_VAR(__GLEW_ARB_half_float_vertex) - -#endif /* GL_ARB_half_float_vertex */ - -/* ----------------------------- GL_ARB_imaging ---------------------------- */ - -#ifndef GL_ARB_imaging -#define GL_ARB_imaging 1 - -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_IGNORE_BORDER 0x8150 -#define GL_CONSTANT_BORDER 0x8151 -#define GL_WRAP_BORDER 0x8152 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 - -typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table); -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, void *table); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, void *image); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum types, void *values); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span); -typedef void (GLAPIENTRY * PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (GLAPIENTRY * PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLRESETMINMAXPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column); - -#define glColorSubTable GLEW_GET_FUN(__glewColorSubTable) -#define glColorTable GLEW_GET_FUN(__glewColorTable) -#define glColorTableParameterfv GLEW_GET_FUN(__glewColorTableParameterfv) -#define glColorTableParameteriv GLEW_GET_FUN(__glewColorTableParameteriv) -#define glConvolutionFilter1D GLEW_GET_FUN(__glewConvolutionFilter1D) -#define glConvolutionFilter2D GLEW_GET_FUN(__glewConvolutionFilter2D) -#define glConvolutionParameterf GLEW_GET_FUN(__glewConvolutionParameterf) -#define glConvolutionParameterfv GLEW_GET_FUN(__glewConvolutionParameterfv) -#define glConvolutionParameteri GLEW_GET_FUN(__glewConvolutionParameteri) -#define glConvolutionParameteriv GLEW_GET_FUN(__glewConvolutionParameteriv) -#define glCopyColorSubTable GLEW_GET_FUN(__glewCopyColorSubTable) -#define glCopyColorTable GLEW_GET_FUN(__glewCopyColorTable) -#define glCopyConvolutionFilter1D GLEW_GET_FUN(__glewCopyConvolutionFilter1D) -#define glCopyConvolutionFilter2D GLEW_GET_FUN(__glewCopyConvolutionFilter2D) -#define glGetColorTable GLEW_GET_FUN(__glewGetColorTable) -#define glGetColorTableParameterfv GLEW_GET_FUN(__glewGetColorTableParameterfv) -#define glGetColorTableParameteriv GLEW_GET_FUN(__glewGetColorTableParameteriv) -#define glGetConvolutionFilter GLEW_GET_FUN(__glewGetConvolutionFilter) -#define glGetConvolutionParameterfv GLEW_GET_FUN(__glewGetConvolutionParameterfv) -#define glGetConvolutionParameteriv GLEW_GET_FUN(__glewGetConvolutionParameteriv) -#define glGetHistogram GLEW_GET_FUN(__glewGetHistogram) -#define glGetHistogramParameterfv GLEW_GET_FUN(__glewGetHistogramParameterfv) -#define glGetHistogramParameteriv GLEW_GET_FUN(__glewGetHistogramParameteriv) -#define glGetMinmax GLEW_GET_FUN(__glewGetMinmax) -#define glGetMinmaxParameterfv GLEW_GET_FUN(__glewGetMinmaxParameterfv) -#define glGetMinmaxParameteriv GLEW_GET_FUN(__glewGetMinmaxParameteriv) -#define glGetSeparableFilter GLEW_GET_FUN(__glewGetSeparableFilter) -#define glHistogram GLEW_GET_FUN(__glewHistogram) -#define glMinmax GLEW_GET_FUN(__glewMinmax) -#define glResetHistogram GLEW_GET_FUN(__glewResetHistogram) -#define glResetMinmax GLEW_GET_FUN(__glewResetMinmax) -#define glSeparableFilter2D GLEW_GET_FUN(__glewSeparableFilter2D) - -#define GLEW_ARB_imaging GLEW_GET_VAR(__GLEW_ARB_imaging) - -#endif /* GL_ARB_imaging */ - -/* ----------------------- GL_ARB_indirect_parameters ---------------------- */ - -#ifndef GL_ARB_indirect_parameters -#define GL_ARB_indirect_parameters 1 - -#define GL_PARAMETER_BUFFER_ARB 0x80EE -#define GL_PARAMETER_BUFFER_BINDING_ARB 0x80EF - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC) (GLenum mode, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawcount, GLsizei maxdrawcount, GLsizei stride); - -#define glMultiDrawArraysIndirectCountARB GLEW_GET_FUN(__glewMultiDrawArraysIndirectCountARB) -#define glMultiDrawElementsIndirectCountARB GLEW_GET_FUN(__glewMultiDrawElementsIndirectCountARB) - -#define GLEW_ARB_indirect_parameters GLEW_GET_VAR(__GLEW_ARB_indirect_parameters) - -#endif /* GL_ARB_indirect_parameters */ - -/* ------------------------ GL_ARB_instanced_arrays ------------------------ */ - -#ifndef GL_ARB_instanced_arrays -#define GL_ARB_instanced_arrays 1 - -#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB 0x88FE - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDARBPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDARBPROC) (GLenum mode, GLsizei count, GLenum type, const void* indices, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBDIVISORARBPROC) (GLuint index, GLuint divisor); - -#define glDrawArraysInstancedARB GLEW_GET_FUN(__glewDrawArraysInstancedARB) -#define glDrawElementsInstancedARB GLEW_GET_FUN(__glewDrawElementsInstancedARB) -#define glVertexAttribDivisorARB GLEW_GET_FUN(__glewVertexAttribDivisorARB) - -#define GLEW_ARB_instanced_arrays GLEW_GET_VAR(__GLEW_ARB_instanced_arrays) - -#endif /* GL_ARB_instanced_arrays */ - -/* ---------------------- GL_ARB_internalformat_query ---------------------- */ - -#ifndef GL_ARB_internalformat_query -#define GL_ARB_internalformat_query 1 - -#define GL_NUM_SAMPLE_COUNTS 0x9380 - -typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATIVPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params); - -#define glGetInternalformativ GLEW_GET_FUN(__glewGetInternalformativ) - -#define GLEW_ARB_internalformat_query GLEW_GET_VAR(__GLEW_ARB_internalformat_query) - -#endif /* GL_ARB_internalformat_query */ - -/* ---------------------- GL_ARB_internalformat_query2 --------------------- */ - -#ifndef GL_ARB_internalformat_query2 -#define GL_ARB_internalformat_query2 1 - -#define GL_INTERNALFORMAT_SUPPORTED 0x826F -#define GL_INTERNALFORMAT_PREFERRED 0x8270 -#define GL_INTERNALFORMAT_RED_SIZE 0x8271 -#define GL_INTERNALFORMAT_GREEN_SIZE 0x8272 -#define GL_INTERNALFORMAT_BLUE_SIZE 0x8273 -#define GL_INTERNALFORMAT_ALPHA_SIZE 0x8274 -#define GL_INTERNALFORMAT_DEPTH_SIZE 0x8275 -#define GL_INTERNALFORMAT_STENCIL_SIZE 0x8276 -#define GL_INTERNALFORMAT_SHARED_SIZE 0x8277 -#define GL_INTERNALFORMAT_RED_TYPE 0x8278 -#define GL_INTERNALFORMAT_GREEN_TYPE 0x8279 -#define GL_INTERNALFORMAT_BLUE_TYPE 0x827A -#define GL_INTERNALFORMAT_ALPHA_TYPE 0x827B -#define GL_INTERNALFORMAT_DEPTH_TYPE 0x827C -#define GL_INTERNALFORMAT_STENCIL_TYPE 0x827D -#define GL_MAX_WIDTH 0x827E -#define GL_MAX_HEIGHT 0x827F -#define GL_MAX_DEPTH 0x8280 -#define GL_MAX_LAYERS 0x8281 -#define GL_MAX_COMBINED_DIMENSIONS 0x8282 -#define GL_COLOR_COMPONENTS 0x8283 -#define GL_DEPTH_COMPONENTS 0x8284 -#define GL_STENCIL_COMPONENTS 0x8285 -#define GL_COLOR_RENDERABLE 0x8286 -#define GL_DEPTH_RENDERABLE 0x8287 -#define GL_STENCIL_RENDERABLE 0x8288 -#define GL_FRAMEBUFFER_RENDERABLE 0x8289 -#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A -#define GL_FRAMEBUFFER_BLEND 0x828B -#define GL_READ_PIXELS 0x828C -#define GL_READ_PIXELS_FORMAT 0x828D -#define GL_READ_PIXELS_TYPE 0x828E -#define GL_TEXTURE_IMAGE_FORMAT 0x828F -#define GL_TEXTURE_IMAGE_TYPE 0x8290 -#define GL_GET_TEXTURE_IMAGE_FORMAT 0x8291 -#define GL_GET_TEXTURE_IMAGE_TYPE 0x8292 -#define GL_MIPMAP 0x8293 -#define GL_MANUAL_GENERATE_MIPMAP 0x8294 -#define GL_AUTO_GENERATE_MIPMAP 0x8295 -#define GL_COLOR_ENCODING 0x8296 -#define GL_SRGB_READ 0x8297 -#define GL_SRGB_WRITE 0x8298 -#define GL_SRGB_DECODE_ARB 0x8299 -#define GL_FILTER 0x829A -#define GL_VERTEX_TEXTURE 0x829B -#define GL_TESS_CONTROL_TEXTURE 0x829C -#define GL_TESS_EVALUATION_TEXTURE 0x829D -#define GL_GEOMETRY_TEXTURE 0x829E -#define GL_FRAGMENT_TEXTURE 0x829F -#define GL_COMPUTE_TEXTURE 0x82A0 -#define GL_TEXTURE_SHADOW 0x82A1 -#define GL_TEXTURE_GATHER 0x82A2 -#define GL_TEXTURE_GATHER_SHADOW 0x82A3 -#define GL_SHADER_IMAGE_LOAD 0x82A4 -#define GL_SHADER_IMAGE_STORE 0x82A5 -#define GL_SHADER_IMAGE_ATOMIC 0x82A6 -#define GL_IMAGE_TEXEL_SIZE 0x82A7 -#define GL_IMAGE_COMPATIBILITY_CLASS 0x82A8 -#define GL_IMAGE_PIXEL_FORMAT 0x82A9 -#define GL_IMAGE_PIXEL_TYPE 0x82AA -#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC -#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD -#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE -#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF -#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1 -#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2 -#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE 0x82B3 -#define GL_CLEAR_BUFFER 0x82B4 -#define GL_TEXTURE_VIEW 0x82B5 -#define GL_VIEW_COMPATIBILITY_CLASS 0x82B6 -#define GL_FULL_SUPPORT 0x82B7 -#define GL_CAVEAT_SUPPORT 0x82B8 -#define GL_IMAGE_CLASS_4_X_32 0x82B9 -#define GL_IMAGE_CLASS_2_X_32 0x82BA -#define GL_IMAGE_CLASS_1_X_32 0x82BB -#define GL_IMAGE_CLASS_4_X_16 0x82BC -#define GL_IMAGE_CLASS_2_X_16 0x82BD -#define GL_IMAGE_CLASS_1_X_16 0x82BE -#define GL_IMAGE_CLASS_4_X_8 0x82BF -#define GL_IMAGE_CLASS_2_X_8 0x82C0 -#define GL_IMAGE_CLASS_1_X_8 0x82C1 -#define GL_IMAGE_CLASS_11_11_10 0x82C2 -#define GL_IMAGE_CLASS_10_10_10_2 0x82C3 -#define GL_VIEW_CLASS_128_BITS 0x82C4 -#define GL_VIEW_CLASS_96_BITS 0x82C5 -#define GL_VIEW_CLASS_64_BITS 0x82C6 -#define GL_VIEW_CLASS_48_BITS 0x82C7 -#define GL_VIEW_CLASS_32_BITS 0x82C8 -#define GL_VIEW_CLASS_24_BITS 0x82C9 -#define GL_VIEW_CLASS_16_BITS 0x82CA -#define GL_VIEW_CLASS_8_BITS 0x82CB -#define GL_VIEW_CLASS_S3TC_DXT1_RGB 0x82CC -#define GL_VIEW_CLASS_S3TC_DXT1_RGBA 0x82CD -#define GL_VIEW_CLASS_S3TC_DXT3_RGBA 0x82CE -#define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF -#define GL_VIEW_CLASS_RGTC1_RED 0x82D0 -#define GL_VIEW_CLASS_RGTC2_RG 0x82D1 -#define GL_VIEW_CLASS_BPTC_UNORM 0x82D2 -#define GL_VIEW_CLASS_BPTC_FLOAT 0x82D3 - -typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64* params); - -#define glGetInternalformati64v GLEW_GET_FUN(__glewGetInternalformati64v) - -#define GLEW_ARB_internalformat_query2 GLEW_GET_VAR(__GLEW_ARB_internalformat_query2) - -#endif /* GL_ARB_internalformat_query2 */ - -/* ----------------------- GL_ARB_invalidate_subdata ----------------------- */ - -#ifndef GL_ARB_invalidate_subdata -#define GL_ARB_invalidate_subdata 1 - -typedef void (GLAPIENTRY * PFNGLINVALIDATEBUFFERDATAPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); -typedef void (GLAPIENTRY * PFNGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum* attachments); -typedef void (GLAPIENTRY * PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); - -#define glInvalidateBufferData GLEW_GET_FUN(__glewInvalidateBufferData) -#define glInvalidateBufferSubData GLEW_GET_FUN(__glewInvalidateBufferSubData) -#define glInvalidateFramebuffer GLEW_GET_FUN(__glewInvalidateFramebuffer) -#define glInvalidateSubFramebuffer GLEW_GET_FUN(__glewInvalidateSubFramebuffer) -#define glInvalidateTexImage GLEW_GET_FUN(__glewInvalidateTexImage) -#define glInvalidateTexSubImage GLEW_GET_FUN(__glewInvalidateTexSubImage) - -#define GLEW_ARB_invalidate_subdata GLEW_GET_VAR(__GLEW_ARB_invalidate_subdata) - -#endif /* GL_ARB_invalidate_subdata */ - -/* ---------------------- GL_ARB_map_buffer_alignment ---------------------- */ - -#ifndef GL_ARB_map_buffer_alignment -#define GL_ARB_map_buffer_alignment 1 - -#define GL_MIN_MAP_BUFFER_ALIGNMENT 0x90BC - -#define GLEW_ARB_map_buffer_alignment GLEW_GET_VAR(__GLEW_ARB_map_buffer_alignment) - -#endif /* GL_ARB_map_buffer_alignment */ - -/* ------------------------ GL_ARB_map_buffer_range ------------------------ */ - -#ifndef GL_ARB_map_buffer_range -#define GL_ARB_map_buffer_range 1 - -#define GL_MAP_READ_BIT 0x0001 -#define GL_MAP_WRITE_BIT 0x0002 -#define GL_MAP_INVALIDATE_RANGE_BIT 0x0004 -#define GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 -#define GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 -#define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 - -typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length); -typedef void * (GLAPIENTRY * PFNGLMAPBUFFERRANGEPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); - -#define glFlushMappedBufferRange GLEW_GET_FUN(__glewFlushMappedBufferRange) -#define glMapBufferRange GLEW_GET_FUN(__glewMapBufferRange) - -#define GLEW_ARB_map_buffer_range GLEW_GET_VAR(__GLEW_ARB_map_buffer_range) - -#endif /* GL_ARB_map_buffer_range */ - -/* ------------------------- GL_ARB_matrix_palette ------------------------- */ - -#ifndef GL_ARB_matrix_palette -#define GL_ARB_matrix_palette 1 - -#define GL_MATRIX_PALETTE_ARB 0x8840 -#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 -#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 -#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 -#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 -#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 -#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 -#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 -#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 -#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 - -typedef void (GLAPIENTRY * PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index); -typedef void (GLAPIENTRY * PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, void *pointer); -typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUBVARBPROC) (GLint size, GLubyte *indices); -typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUIVARBPROC) (GLint size, GLuint *indices); -typedef void (GLAPIENTRY * PFNGLMATRIXINDEXUSVARBPROC) (GLint size, GLushort *indices); - -#define glCurrentPaletteMatrixARB GLEW_GET_FUN(__glewCurrentPaletteMatrixARB) -#define glMatrixIndexPointerARB GLEW_GET_FUN(__glewMatrixIndexPointerARB) -#define glMatrixIndexubvARB GLEW_GET_FUN(__glewMatrixIndexubvARB) -#define glMatrixIndexuivARB GLEW_GET_FUN(__glewMatrixIndexuivARB) -#define glMatrixIndexusvARB GLEW_GET_FUN(__glewMatrixIndexusvARB) - -#define GLEW_ARB_matrix_palette GLEW_GET_VAR(__GLEW_ARB_matrix_palette) - -#endif /* GL_ARB_matrix_palette */ - -/* --------------------------- GL_ARB_multi_bind --------------------------- */ - -#ifndef GL_ARB_multi_bind -#define GL_ARB_multi_bind 1 - -typedef void (GLAPIENTRY * PFNGLBINDBUFFERSBASEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERSRANGEPROC) (GLenum target, GLuint first, GLsizei count, const GLuint* buffers, const GLintptr *offsets, const GLsizeiptr *sizes); -typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTURESPROC) (GLuint first, GLsizei count, const GLuint* textures); -typedef void (GLAPIENTRY * PFNGLBINDSAMPLERSPROC) (GLuint first, GLsizei count, const GLuint* samplers); -typedef void (GLAPIENTRY * PFNGLBINDTEXTURESPROC) (GLuint first, GLsizei count, const GLuint* textures); -typedef void (GLAPIENTRY * PFNGLBINDVERTEXBUFFERSPROC) (GLuint first, GLsizei count, const GLuint* buffers, const GLintptr *offsets, const GLsizei *strides); - -#define glBindBuffersBase GLEW_GET_FUN(__glewBindBuffersBase) -#define glBindBuffersRange GLEW_GET_FUN(__glewBindBuffersRange) -#define glBindImageTextures GLEW_GET_FUN(__glewBindImageTextures) -#define glBindSamplers GLEW_GET_FUN(__glewBindSamplers) -#define glBindTextures GLEW_GET_FUN(__glewBindTextures) -#define glBindVertexBuffers GLEW_GET_FUN(__glewBindVertexBuffers) - -#define GLEW_ARB_multi_bind GLEW_GET_VAR(__GLEW_ARB_multi_bind) - -#endif /* GL_ARB_multi_bind */ - -/* ----------------------- GL_ARB_multi_draw_indirect ---------------------- */ - -#ifndef GL_ARB_multi_draw_indirect -#define GL_ARB_multi_draw_indirect 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect, GLsizei primcount, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei primcount, GLsizei stride); - -#define glMultiDrawArraysIndirect GLEW_GET_FUN(__glewMultiDrawArraysIndirect) -#define glMultiDrawElementsIndirect GLEW_GET_FUN(__glewMultiDrawElementsIndirect) - -#define GLEW_ARB_multi_draw_indirect GLEW_GET_VAR(__GLEW_ARB_multi_draw_indirect) - -#endif /* GL_ARB_multi_draw_indirect */ - -/* --------------------------- GL_ARB_multisample -------------------------- */ - -#ifndef GL_ARB_multisample -#define GL_ARB_multisample 1 - -#define GL_MULTISAMPLE_ARB 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F -#define GL_SAMPLE_COVERAGE_ARB 0x80A0 -#define GL_SAMPLE_BUFFERS_ARB 0x80A8 -#define GL_SAMPLES_ARB 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB -#define GL_MULTISAMPLE_BIT_ARB 0x20000000 - -typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); - -#define glSampleCoverageARB GLEW_GET_FUN(__glewSampleCoverageARB) - -#define GLEW_ARB_multisample GLEW_GET_VAR(__GLEW_ARB_multisample) - -#endif /* GL_ARB_multisample */ - -/* -------------------------- GL_ARB_multitexture -------------------------- */ - -#ifndef GL_ARB_multitexture -#define GL_ARB_multitexture 1 - -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 - -typedef void (GLAPIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (GLAPIENTRY * PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); - -#define glActiveTextureARB GLEW_GET_FUN(__glewActiveTextureARB) -#define glClientActiveTextureARB GLEW_GET_FUN(__glewClientActiveTextureARB) -#define glMultiTexCoord1dARB GLEW_GET_FUN(__glewMultiTexCoord1dARB) -#define glMultiTexCoord1dvARB GLEW_GET_FUN(__glewMultiTexCoord1dvARB) -#define glMultiTexCoord1fARB GLEW_GET_FUN(__glewMultiTexCoord1fARB) -#define glMultiTexCoord1fvARB GLEW_GET_FUN(__glewMultiTexCoord1fvARB) -#define glMultiTexCoord1iARB GLEW_GET_FUN(__glewMultiTexCoord1iARB) -#define glMultiTexCoord1ivARB GLEW_GET_FUN(__glewMultiTexCoord1ivARB) -#define glMultiTexCoord1sARB GLEW_GET_FUN(__glewMultiTexCoord1sARB) -#define glMultiTexCoord1svARB GLEW_GET_FUN(__glewMultiTexCoord1svARB) -#define glMultiTexCoord2dARB GLEW_GET_FUN(__glewMultiTexCoord2dARB) -#define glMultiTexCoord2dvARB GLEW_GET_FUN(__glewMultiTexCoord2dvARB) -#define glMultiTexCoord2fARB GLEW_GET_FUN(__glewMultiTexCoord2fARB) -#define glMultiTexCoord2fvARB GLEW_GET_FUN(__glewMultiTexCoord2fvARB) -#define glMultiTexCoord2iARB GLEW_GET_FUN(__glewMultiTexCoord2iARB) -#define glMultiTexCoord2ivARB GLEW_GET_FUN(__glewMultiTexCoord2ivARB) -#define glMultiTexCoord2sARB GLEW_GET_FUN(__glewMultiTexCoord2sARB) -#define glMultiTexCoord2svARB GLEW_GET_FUN(__glewMultiTexCoord2svARB) -#define glMultiTexCoord3dARB GLEW_GET_FUN(__glewMultiTexCoord3dARB) -#define glMultiTexCoord3dvARB GLEW_GET_FUN(__glewMultiTexCoord3dvARB) -#define glMultiTexCoord3fARB GLEW_GET_FUN(__glewMultiTexCoord3fARB) -#define glMultiTexCoord3fvARB GLEW_GET_FUN(__glewMultiTexCoord3fvARB) -#define glMultiTexCoord3iARB GLEW_GET_FUN(__glewMultiTexCoord3iARB) -#define glMultiTexCoord3ivARB GLEW_GET_FUN(__glewMultiTexCoord3ivARB) -#define glMultiTexCoord3sARB GLEW_GET_FUN(__glewMultiTexCoord3sARB) -#define glMultiTexCoord3svARB GLEW_GET_FUN(__glewMultiTexCoord3svARB) -#define glMultiTexCoord4dARB GLEW_GET_FUN(__glewMultiTexCoord4dARB) -#define glMultiTexCoord4dvARB GLEW_GET_FUN(__glewMultiTexCoord4dvARB) -#define glMultiTexCoord4fARB GLEW_GET_FUN(__glewMultiTexCoord4fARB) -#define glMultiTexCoord4fvARB GLEW_GET_FUN(__glewMultiTexCoord4fvARB) -#define glMultiTexCoord4iARB GLEW_GET_FUN(__glewMultiTexCoord4iARB) -#define glMultiTexCoord4ivARB GLEW_GET_FUN(__glewMultiTexCoord4ivARB) -#define glMultiTexCoord4sARB GLEW_GET_FUN(__glewMultiTexCoord4sARB) -#define glMultiTexCoord4svARB GLEW_GET_FUN(__glewMultiTexCoord4svARB) - -#define GLEW_ARB_multitexture GLEW_GET_VAR(__GLEW_ARB_multitexture) - -#endif /* GL_ARB_multitexture */ - -/* ------------------------- GL_ARB_occlusion_query ------------------------ */ - -#ifndef GL_ARB_occlusion_query -#define GL_ARB_occlusion_query 1 - -#define GL_QUERY_COUNTER_BITS_ARB 0x8864 -#define GL_CURRENT_QUERY_ARB 0x8865 -#define GL_QUERY_RESULT_ARB 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 -#define GL_SAMPLES_PASSED_ARB 0x8914 - -typedef void (GLAPIENTRY * PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLENDQUERYARBPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISQUERYARBPROC) (GLuint id); - -#define glBeginQueryARB GLEW_GET_FUN(__glewBeginQueryARB) -#define glDeleteQueriesARB GLEW_GET_FUN(__glewDeleteQueriesARB) -#define glEndQueryARB GLEW_GET_FUN(__glewEndQueryARB) -#define glGenQueriesARB GLEW_GET_FUN(__glewGenQueriesARB) -#define glGetQueryObjectivARB GLEW_GET_FUN(__glewGetQueryObjectivARB) -#define glGetQueryObjectuivARB GLEW_GET_FUN(__glewGetQueryObjectuivARB) -#define glGetQueryivARB GLEW_GET_FUN(__glewGetQueryivARB) -#define glIsQueryARB GLEW_GET_FUN(__glewIsQueryARB) - -#define GLEW_ARB_occlusion_query GLEW_GET_VAR(__GLEW_ARB_occlusion_query) - -#endif /* GL_ARB_occlusion_query */ - -/* ------------------------ GL_ARB_occlusion_query2 ------------------------ */ - -#ifndef GL_ARB_occlusion_query2 -#define GL_ARB_occlusion_query2 1 - -#define GL_ANY_SAMPLES_PASSED 0x8C2F - -#define GLEW_ARB_occlusion_query2 GLEW_GET_VAR(__GLEW_ARB_occlusion_query2) - -#endif /* GL_ARB_occlusion_query2 */ - -/* --------------------- GL_ARB_parallel_shader_compile -------------------- */ - -#ifndef GL_ARB_parallel_shader_compile -#define GL_ARB_parallel_shader_compile 1 - -#define GL_MAX_SHADER_COMPILER_THREADS_ARB 0x91B0 -#define GL_COMPLETION_STATUS_ARB 0x91B1 - -typedef void (GLAPIENTRY * PFNGLMAXSHADERCOMPILERTHREADSARBPROC) (GLuint count); - -#define glMaxShaderCompilerThreadsARB GLEW_GET_FUN(__glewMaxShaderCompilerThreadsARB) - -#define GLEW_ARB_parallel_shader_compile GLEW_GET_VAR(__GLEW_ARB_parallel_shader_compile) - -#endif /* GL_ARB_parallel_shader_compile */ - -/* -------------------- GL_ARB_pipeline_statistics_query ------------------- */ - -#ifndef GL_ARB_pipeline_statistics_query -#define GL_ARB_pipeline_statistics_query 1 - -#define GL_VERTICES_SUBMITTED_ARB 0x82EE -#define GL_PRIMITIVES_SUBMITTED_ARB 0x82EF -#define GL_VERTEX_SHADER_INVOCATIONS_ARB 0x82F0 -#define GL_TESS_CONTROL_SHADER_PATCHES_ARB 0x82F1 -#define GL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB 0x82F2 -#define GL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB 0x82F3 -#define GL_FRAGMENT_SHADER_INVOCATIONS_ARB 0x82F4 -#define GL_COMPUTE_SHADER_INVOCATIONS_ARB 0x82F5 -#define GL_CLIPPING_INPUT_PRIMITIVES_ARB 0x82F6 -#define GL_CLIPPING_OUTPUT_PRIMITIVES_ARB 0x82F7 -#define GL_GEOMETRY_SHADER_INVOCATIONS 0x887F - -#define GLEW_ARB_pipeline_statistics_query GLEW_GET_VAR(__GLEW_ARB_pipeline_statistics_query) - -#endif /* GL_ARB_pipeline_statistics_query */ - -/* ----------------------- GL_ARB_pixel_buffer_object ---------------------- */ - -#ifndef GL_ARB_pixel_buffer_object -#define GL_ARB_pixel_buffer_object 1 - -#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF - -#define GLEW_ARB_pixel_buffer_object GLEW_GET_VAR(__GLEW_ARB_pixel_buffer_object) - -#endif /* GL_ARB_pixel_buffer_object */ - -/* ------------------------ GL_ARB_point_parameters ------------------------ */ - -#ifndef GL_ARB_point_parameters -#define GL_ARB_point_parameters 1 - -#define GL_POINT_SIZE_MIN_ARB 0x8126 -#define GL_POINT_SIZE_MAX_ARB 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 - -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat* params); - -#define glPointParameterfARB GLEW_GET_FUN(__glewPointParameterfARB) -#define glPointParameterfvARB GLEW_GET_FUN(__glewPointParameterfvARB) - -#define GLEW_ARB_point_parameters GLEW_GET_VAR(__GLEW_ARB_point_parameters) - -#endif /* GL_ARB_point_parameters */ - -/* -------------------------- GL_ARB_point_sprite -------------------------- */ - -#ifndef GL_ARB_point_sprite -#define GL_ARB_point_sprite 1 - -#define GL_POINT_SPRITE_ARB 0x8861 -#define GL_COORD_REPLACE_ARB 0x8862 - -#define GLEW_ARB_point_sprite GLEW_GET_VAR(__GLEW_ARB_point_sprite) - -#endif /* GL_ARB_point_sprite */ - -/* ----------------------- GL_ARB_post_depth_coverage ---------------------- */ - -#ifndef GL_ARB_post_depth_coverage -#define GL_ARB_post_depth_coverage 1 - -#define GLEW_ARB_post_depth_coverage GLEW_GET_VAR(__GLEW_ARB_post_depth_coverage) - -#endif /* GL_ARB_post_depth_coverage */ - -/* --------------------- GL_ARB_program_interface_query -------------------- */ - -#ifndef GL_ARB_program_interface_query -#define GL_ARB_program_interface_query 1 - -#define GL_UNIFORM 0x92E1 -#define GL_UNIFORM_BLOCK 0x92E2 -#define GL_PROGRAM_INPUT 0x92E3 -#define GL_PROGRAM_OUTPUT 0x92E4 -#define GL_BUFFER_VARIABLE 0x92E5 -#define GL_SHADER_STORAGE_BLOCK 0x92E6 -#define GL_IS_PER_PATCH 0x92E7 -#define GL_VERTEX_SUBROUTINE 0x92E8 -#define GL_TESS_CONTROL_SUBROUTINE 0x92E9 -#define GL_TESS_EVALUATION_SUBROUTINE 0x92EA -#define GL_GEOMETRY_SUBROUTINE 0x92EB -#define GL_FRAGMENT_SUBROUTINE 0x92EC -#define GL_COMPUTE_SUBROUTINE 0x92ED -#define GL_VERTEX_SUBROUTINE_UNIFORM 0x92EE -#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF -#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0 -#define GL_GEOMETRY_SUBROUTINE_UNIFORM 0x92F1 -#define GL_FRAGMENT_SUBROUTINE_UNIFORM 0x92F2 -#define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3 -#define GL_TRANSFORM_FEEDBACK_VARYING 0x92F4 -#define GL_ACTIVE_RESOURCES 0x92F5 -#define GL_MAX_NAME_LENGTH 0x92F6 -#define GL_MAX_NUM_ACTIVE_VARIABLES 0x92F7 -#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8 -#define GL_NAME_LENGTH 0x92F9 -#define GL_TYPE 0x92FA -#define GL_ARRAY_SIZE 0x92FB -#define GL_OFFSET 0x92FC -#define GL_BLOCK_INDEX 0x92FD -#define GL_ARRAY_STRIDE 0x92FE -#define GL_MATRIX_STRIDE 0x92FF -#define GL_IS_ROW_MAJOR 0x9300 -#define GL_ATOMIC_COUNTER_BUFFER_INDEX 0x9301 -#define GL_BUFFER_BINDING 0x9302 -#define GL_BUFFER_DATA_SIZE 0x9303 -#define GL_NUM_ACTIVE_VARIABLES 0x9304 -#define GL_ACTIVE_VARIABLES 0x9305 -#define GL_REFERENCED_BY_VERTEX_SHADER 0x9306 -#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307 -#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308 -#define GL_REFERENCED_BY_GEOMETRY_SHADER 0x9309 -#define GL_REFERENCED_BY_FRAGMENT_SHADER 0x930A -#define GL_REFERENCED_BY_COMPUTE_SHADER 0x930B -#define GL_TOP_LEVEL_ARRAY_SIZE 0x930C -#define GL_TOP_LEVEL_ARRAY_STRIDE 0x930D -#define GL_LOCATION 0x930E -#define GL_LOCATION_INDEX 0x930F - -typedef void (GLAPIENTRY * PFNGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint* params); -typedef GLuint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar* name); -typedef GLint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar* name); -typedef GLint (GLAPIENTRY * PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei* length, GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum* props, GLsizei bufSize, GLsizei *length, GLint *params); - -#define glGetProgramInterfaceiv GLEW_GET_FUN(__glewGetProgramInterfaceiv) -#define glGetProgramResourceIndex GLEW_GET_FUN(__glewGetProgramResourceIndex) -#define glGetProgramResourceLocation GLEW_GET_FUN(__glewGetProgramResourceLocation) -#define glGetProgramResourceLocationIndex GLEW_GET_FUN(__glewGetProgramResourceLocationIndex) -#define glGetProgramResourceName GLEW_GET_FUN(__glewGetProgramResourceName) -#define glGetProgramResourceiv GLEW_GET_FUN(__glewGetProgramResourceiv) - -#define GLEW_ARB_program_interface_query GLEW_GET_VAR(__GLEW_ARB_program_interface_query) - -#endif /* GL_ARB_program_interface_query */ - -/* ------------------------ GL_ARB_provoking_vertex ------------------------ */ - -#ifndef GL_ARB_provoking_vertex -#define GL_ARB_provoking_vertex 1 - -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION 0x8E4D -#define GL_LAST_VERTEX_CONVENTION 0x8E4E -#define GL_PROVOKING_VERTEX 0x8E4F - -typedef void (GLAPIENTRY * PFNGLPROVOKINGVERTEXPROC) (GLenum mode); - -#define glProvokingVertex GLEW_GET_FUN(__glewProvokingVertex) - -#define GLEW_ARB_provoking_vertex GLEW_GET_VAR(__GLEW_ARB_provoking_vertex) - -#endif /* GL_ARB_provoking_vertex */ - -/* ----------------------- GL_ARB_query_buffer_object ---------------------- */ - -#ifndef GL_ARB_query_buffer_object -#define GL_ARB_query_buffer_object 1 - -#define GL_QUERY_BUFFER_BARRIER_BIT 0x00008000 -#define GL_QUERY_BUFFER 0x9192 -#define GL_QUERY_BUFFER_BINDING 0x9193 -#define GL_QUERY_RESULT_NO_WAIT 0x9194 - -#define GLEW_ARB_query_buffer_object GLEW_GET_VAR(__GLEW_ARB_query_buffer_object) - -#endif /* GL_ARB_query_buffer_object */ - -/* ------------------ GL_ARB_robust_buffer_access_behavior ----------------- */ - -#ifndef GL_ARB_robust_buffer_access_behavior -#define GL_ARB_robust_buffer_access_behavior 1 - -#define GLEW_ARB_robust_buffer_access_behavior GLEW_GET_VAR(__GLEW_ARB_robust_buffer_access_behavior) - -#endif /* GL_ARB_robust_buffer_access_behavior */ - -/* --------------------------- GL_ARB_robustness --------------------------- */ - -#ifndef GL_ARB_robustness -#define GL_ARB_robustness 1 - -#define GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB 0x00000004 -#define GL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 -#define GL_GUILTY_CONTEXT_RESET_ARB 0x8253 -#define GL_INNOCENT_CONTEXT_RESET_ARB 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET_ARB 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 -#define GL_NO_RESET_NOTIFICATION_ARB 0x8261 - -typedef GLenum (GLAPIENTRY * PFNGLGETGRAPHICSRESETSTATUSARBPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETNCOLORTABLEARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* table); -typedef void (GLAPIENTRY * PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, GLsizei bufSize, void* img); -typedef void (GLAPIENTRY * PFNGLGETNCONVOLUTIONFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei bufSize, void* image); -typedef void (GLAPIENTRY * PFNGLGETNHISTOGRAMARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values); -typedef void (GLAPIENTRY * PFNGLGETNMAPDVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLdouble* v); -typedef void (GLAPIENTRY * PFNGLGETNMAPFVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLfloat* v); -typedef void (GLAPIENTRY * PFNGLGETNMAPIVARBPROC) (GLenum target, GLenum query, GLsizei bufSize, GLint* v); -typedef void (GLAPIENTRY * PFNGLGETNMINMAXARBPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, void* values); -typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPFVARBPROC) (GLenum map, GLsizei bufSize, GLfloat* values); -typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPUIVARBPROC) (GLenum map, GLsizei bufSize, GLuint* values); -typedef void (GLAPIENTRY * PFNGLGETNPIXELMAPUSVARBPROC) (GLenum map, GLsizei bufSize, GLushort* values); -typedef void (GLAPIENTRY * PFNGLGETNPOLYGONSTIPPLEARBPROC) (GLsizei bufSize, GLubyte* pattern); -typedef void (GLAPIENTRY * PFNGLGETNSEPARABLEFILTERARBPROC) (GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, void* row, GLsizei columnBufSize, void*column, void*span); -typedef void (GLAPIENTRY * PFNGLGETNTEXIMAGEARBPROC) (GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, void* img); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMFVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUIVARBPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint* params); -typedef void (GLAPIENTRY * PFNGLREADNPIXELSARBPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void* data); - -#define glGetGraphicsResetStatusARB GLEW_GET_FUN(__glewGetGraphicsResetStatusARB) -#define glGetnColorTableARB GLEW_GET_FUN(__glewGetnColorTableARB) -#define glGetnCompressedTexImageARB GLEW_GET_FUN(__glewGetnCompressedTexImageARB) -#define glGetnConvolutionFilterARB GLEW_GET_FUN(__glewGetnConvolutionFilterARB) -#define glGetnHistogramARB GLEW_GET_FUN(__glewGetnHistogramARB) -#define glGetnMapdvARB GLEW_GET_FUN(__glewGetnMapdvARB) -#define glGetnMapfvARB GLEW_GET_FUN(__glewGetnMapfvARB) -#define glGetnMapivARB GLEW_GET_FUN(__glewGetnMapivARB) -#define glGetnMinmaxARB GLEW_GET_FUN(__glewGetnMinmaxARB) -#define glGetnPixelMapfvARB GLEW_GET_FUN(__glewGetnPixelMapfvARB) -#define glGetnPixelMapuivARB GLEW_GET_FUN(__glewGetnPixelMapuivARB) -#define glGetnPixelMapusvARB GLEW_GET_FUN(__glewGetnPixelMapusvARB) -#define glGetnPolygonStippleARB GLEW_GET_FUN(__glewGetnPolygonStippleARB) -#define glGetnSeparableFilterARB GLEW_GET_FUN(__glewGetnSeparableFilterARB) -#define glGetnTexImageARB GLEW_GET_FUN(__glewGetnTexImageARB) -#define glGetnUniformdvARB GLEW_GET_FUN(__glewGetnUniformdvARB) -#define glGetnUniformfvARB GLEW_GET_FUN(__glewGetnUniformfvARB) -#define glGetnUniformivARB GLEW_GET_FUN(__glewGetnUniformivARB) -#define glGetnUniformuivARB GLEW_GET_FUN(__glewGetnUniformuivARB) -#define glReadnPixelsARB GLEW_GET_FUN(__glewReadnPixelsARB) - -#define GLEW_ARB_robustness GLEW_GET_VAR(__GLEW_ARB_robustness) - -#endif /* GL_ARB_robustness */ - -/* ---------------- GL_ARB_robustness_application_isolation ---------------- */ - -#ifndef GL_ARB_robustness_application_isolation -#define GL_ARB_robustness_application_isolation 1 - -#define GLEW_ARB_robustness_application_isolation GLEW_GET_VAR(__GLEW_ARB_robustness_application_isolation) - -#endif /* GL_ARB_robustness_application_isolation */ - -/* ---------------- GL_ARB_robustness_share_group_isolation ---------------- */ - -#ifndef GL_ARB_robustness_share_group_isolation -#define GL_ARB_robustness_share_group_isolation 1 - -#define GLEW_ARB_robustness_share_group_isolation GLEW_GET_VAR(__GLEW_ARB_robustness_share_group_isolation) - -#endif /* GL_ARB_robustness_share_group_isolation */ - -/* ------------------------ GL_ARB_sample_locations ------------------------ */ - -#ifndef GL_ARB_sample_locations -#define GL_ARB_sample_locations 1 - -#define GL_SAMPLE_LOCATION_ARB 0x8E50 -#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_ARB 0x933D -#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_ARB 0x933E -#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_ARB 0x933F -#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_ARB 0x9340 -#define GL_PROGRAMMABLE_SAMPLE_LOCATION_ARB 0x9341 -#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_ARB 0x9342 -#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_ARB 0x9343 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v); - -#define glFramebufferSampleLocationsfvARB GLEW_GET_FUN(__glewFramebufferSampleLocationsfvARB) -#define glNamedFramebufferSampleLocationsfvARB GLEW_GET_FUN(__glewNamedFramebufferSampleLocationsfvARB) - -#define GLEW_ARB_sample_locations GLEW_GET_VAR(__GLEW_ARB_sample_locations) - -#endif /* GL_ARB_sample_locations */ - -/* ------------------------- GL_ARB_sample_shading ------------------------- */ - -#ifndef GL_ARB_sample_shading -#define GL_ARB_sample_shading 1 - -#define GL_SAMPLE_SHADING_ARB 0x8C36 -#define GL_MIN_SAMPLE_SHADING_VALUE_ARB 0x8C37 - -typedef void (GLAPIENTRY * PFNGLMINSAMPLESHADINGARBPROC) (GLclampf value); - -#define glMinSampleShadingARB GLEW_GET_FUN(__glewMinSampleShadingARB) - -#define GLEW_ARB_sample_shading GLEW_GET_VAR(__GLEW_ARB_sample_shading) - -#endif /* GL_ARB_sample_shading */ - -/* ------------------------- GL_ARB_sampler_objects ------------------------ */ - -#ifndef GL_ARB_sampler_objects -#define GL_ARB_sampler_objects 1 - -#define GL_SAMPLER_BINDING 0x8919 - -typedef void (GLAPIENTRY * PFNGLBINDSAMPLERPROC) (GLuint unit, GLuint sampler); -typedef void (GLAPIENTRY * PFNGLDELETESAMPLERSPROC) (GLsizei count, const GLuint * samplers); -typedef void (GLAPIENTRY * PFNGLGENSAMPLERSPROC) (GLsizei count, GLuint* samplers); -typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISSAMPLERPROC) (GLuint sampler); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIIVPROC) (GLuint sampler, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIUIVPROC) (GLuint sampler, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFPROC) (GLuint sampler, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERFVPROC) (GLuint sampler, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIPROC) (GLuint sampler, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLSAMPLERPARAMETERIVPROC) (GLuint sampler, GLenum pname, const GLint* params); - -#define glBindSampler GLEW_GET_FUN(__glewBindSampler) -#define glDeleteSamplers GLEW_GET_FUN(__glewDeleteSamplers) -#define glGenSamplers GLEW_GET_FUN(__glewGenSamplers) -#define glGetSamplerParameterIiv GLEW_GET_FUN(__glewGetSamplerParameterIiv) -#define glGetSamplerParameterIuiv GLEW_GET_FUN(__glewGetSamplerParameterIuiv) -#define glGetSamplerParameterfv GLEW_GET_FUN(__glewGetSamplerParameterfv) -#define glGetSamplerParameteriv GLEW_GET_FUN(__glewGetSamplerParameteriv) -#define glIsSampler GLEW_GET_FUN(__glewIsSampler) -#define glSamplerParameterIiv GLEW_GET_FUN(__glewSamplerParameterIiv) -#define glSamplerParameterIuiv GLEW_GET_FUN(__glewSamplerParameterIuiv) -#define glSamplerParameterf GLEW_GET_FUN(__glewSamplerParameterf) -#define glSamplerParameterfv GLEW_GET_FUN(__glewSamplerParameterfv) -#define glSamplerParameteri GLEW_GET_FUN(__glewSamplerParameteri) -#define glSamplerParameteriv GLEW_GET_FUN(__glewSamplerParameteriv) - -#define GLEW_ARB_sampler_objects GLEW_GET_VAR(__GLEW_ARB_sampler_objects) - -#endif /* GL_ARB_sampler_objects */ - -/* ------------------------ GL_ARB_seamless_cube_map ----------------------- */ - -#ifndef GL_ARB_seamless_cube_map -#define GL_ARB_seamless_cube_map 1 - -#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F - -#define GLEW_ARB_seamless_cube_map GLEW_GET_VAR(__GLEW_ARB_seamless_cube_map) - -#endif /* GL_ARB_seamless_cube_map */ - -/* ------------------ GL_ARB_seamless_cubemap_per_texture ------------------ */ - -#ifndef GL_ARB_seamless_cubemap_per_texture -#define GL_ARB_seamless_cubemap_per_texture 1 - -#define GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F - -#define GLEW_ARB_seamless_cubemap_per_texture GLEW_GET_VAR(__GLEW_ARB_seamless_cubemap_per_texture) - -#endif /* GL_ARB_seamless_cubemap_per_texture */ - -/* --------------------- GL_ARB_separate_shader_objects -------------------- */ - -#ifndef GL_ARB_separate_shader_objects -#define GL_ARB_separate_shader_objects 1 - -#define GL_VERTEX_SHADER_BIT 0x00000001 -#define GL_FRAGMENT_SHADER_BIT 0x00000002 -#define GL_GEOMETRY_SHADER_BIT 0x00000004 -#define GL_TESS_CONTROL_SHADER_BIT 0x00000008 -#define GL_TESS_EVALUATION_SHADER_BIT 0x00000010 -#define GL_PROGRAM_SEPARABLE 0x8258 -#define GL_ACTIVE_PROGRAM 0x8259 -#define GL_PROGRAM_PIPELINE_BINDING 0x825A -#define GL_ALL_SHADER_BITS 0xFFFFFFFF - -typedef void (GLAPIENTRY * PFNGLACTIVESHADERPROGRAMPROC) (GLuint pipeline, GLuint program); -typedef void (GLAPIENTRY * PFNGLBINDPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROGRAMVPROC) (GLenum type, GLsizei count, const GLchar * const * strings); -typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMPIPELINESPROC) (GLsizei n, const GLuint* pipelines); -typedef void (GLAPIENTRY * PFNGLGENPROGRAMPIPELINESPROC) (GLsizei n, GLuint* pipelines); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMPIPELINEINFOLOGPROC) (GLuint pipeline, GLsizei bufSize, GLsizei* length, GLchar *infoLog); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMPIPELINEIVPROC) (GLuint pipeline, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMPIPELINEPROC) (GLuint pipeline); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DPROC) (GLuint program, GLint location, GLdouble x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FPROC) (GLuint program, GLint location, GLfloat x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IPROC) (GLuint program, GLint location, GLint x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIPROC) (GLuint program, GLint location, GLuint x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IPROC) (GLuint program, GLint location, GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIPROC) (GLuint program, GLint location, GLuint x, GLuint y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIPROC) (GLuint program, GLint location, GLuint x, GLuint y, GLuint z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DPROC) (GLuint program, GLint location, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4DVPROC) (GLuint program, GLint location, GLsizei count, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FPROC) (GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FVPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IPROC) (GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IVPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIPROC) (GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIVPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLdouble* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUSEPROGRAMSTAGESPROC) (GLuint pipeline, GLbitfield stages, GLuint program); -typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMPIPELINEPROC) (GLuint pipeline); - -#define glActiveShaderProgram GLEW_GET_FUN(__glewActiveShaderProgram) -#define glBindProgramPipeline GLEW_GET_FUN(__glewBindProgramPipeline) -#define glCreateShaderProgramv GLEW_GET_FUN(__glewCreateShaderProgramv) -#define glDeleteProgramPipelines GLEW_GET_FUN(__glewDeleteProgramPipelines) -#define glGenProgramPipelines GLEW_GET_FUN(__glewGenProgramPipelines) -#define glGetProgramPipelineInfoLog GLEW_GET_FUN(__glewGetProgramPipelineInfoLog) -#define glGetProgramPipelineiv GLEW_GET_FUN(__glewGetProgramPipelineiv) -#define glIsProgramPipeline GLEW_GET_FUN(__glewIsProgramPipeline) -#define glProgramUniform1d GLEW_GET_FUN(__glewProgramUniform1d) -#define glProgramUniform1dv GLEW_GET_FUN(__glewProgramUniform1dv) -#define glProgramUniform1f GLEW_GET_FUN(__glewProgramUniform1f) -#define glProgramUniform1fv GLEW_GET_FUN(__glewProgramUniform1fv) -#define glProgramUniform1i GLEW_GET_FUN(__glewProgramUniform1i) -#define glProgramUniform1iv GLEW_GET_FUN(__glewProgramUniform1iv) -#define glProgramUniform1ui GLEW_GET_FUN(__glewProgramUniform1ui) -#define glProgramUniform1uiv GLEW_GET_FUN(__glewProgramUniform1uiv) -#define glProgramUniform2d GLEW_GET_FUN(__glewProgramUniform2d) -#define glProgramUniform2dv GLEW_GET_FUN(__glewProgramUniform2dv) -#define glProgramUniform2f GLEW_GET_FUN(__glewProgramUniform2f) -#define glProgramUniform2fv GLEW_GET_FUN(__glewProgramUniform2fv) -#define glProgramUniform2i GLEW_GET_FUN(__glewProgramUniform2i) -#define glProgramUniform2iv GLEW_GET_FUN(__glewProgramUniform2iv) -#define glProgramUniform2ui GLEW_GET_FUN(__glewProgramUniform2ui) -#define glProgramUniform2uiv GLEW_GET_FUN(__glewProgramUniform2uiv) -#define glProgramUniform3d GLEW_GET_FUN(__glewProgramUniform3d) -#define glProgramUniform3dv GLEW_GET_FUN(__glewProgramUniform3dv) -#define glProgramUniform3f GLEW_GET_FUN(__glewProgramUniform3f) -#define glProgramUniform3fv GLEW_GET_FUN(__glewProgramUniform3fv) -#define glProgramUniform3i GLEW_GET_FUN(__glewProgramUniform3i) -#define glProgramUniform3iv GLEW_GET_FUN(__glewProgramUniform3iv) -#define glProgramUniform3ui GLEW_GET_FUN(__glewProgramUniform3ui) -#define glProgramUniform3uiv GLEW_GET_FUN(__glewProgramUniform3uiv) -#define glProgramUniform4d GLEW_GET_FUN(__glewProgramUniform4d) -#define glProgramUniform4dv GLEW_GET_FUN(__glewProgramUniform4dv) -#define glProgramUniform4f GLEW_GET_FUN(__glewProgramUniform4f) -#define glProgramUniform4fv GLEW_GET_FUN(__glewProgramUniform4fv) -#define glProgramUniform4i GLEW_GET_FUN(__glewProgramUniform4i) -#define glProgramUniform4iv GLEW_GET_FUN(__glewProgramUniform4iv) -#define glProgramUniform4ui GLEW_GET_FUN(__glewProgramUniform4ui) -#define glProgramUniform4uiv GLEW_GET_FUN(__glewProgramUniform4uiv) -#define glProgramUniformMatrix2dv GLEW_GET_FUN(__glewProgramUniformMatrix2dv) -#define glProgramUniformMatrix2fv GLEW_GET_FUN(__glewProgramUniformMatrix2fv) -#define glProgramUniformMatrix2x3dv GLEW_GET_FUN(__glewProgramUniformMatrix2x3dv) -#define glProgramUniformMatrix2x3fv GLEW_GET_FUN(__glewProgramUniformMatrix2x3fv) -#define glProgramUniformMatrix2x4dv GLEW_GET_FUN(__glewProgramUniformMatrix2x4dv) -#define glProgramUniformMatrix2x4fv GLEW_GET_FUN(__glewProgramUniformMatrix2x4fv) -#define glProgramUniformMatrix3dv GLEW_GET_FUN(__glewProgramUniformMatrix3dv) -#define glProgramUniformMatrix3fv GLEW_GET_FUN(__glewProgramUniformMatrix3fv) -#define glProgramUniformMatrix3x2dv GLEW_GET_FUN(__glewProgramUniformMatrix3x2dv) -#define glProgramUniformMatrix3x2fv GLEW_GET_FUN(__glewProgramUniformMatrix3x2fv) -#define glProgramUniformMatrix3x4dv GLEW_GET_FUN(__glewProgramUniformMatrix3x4dv) -#define glProgramUniformMatrix3x4fv GLEW_GET_FUN(__glewProgramUniformMatrix3x4fv) -#define glProgramUniformMatrix4dv GLEW_GET_FUN(__glewProgramUniformMatrix4dv) -#define glProgramUniformMatrix4fv GLEW_GET_FUN(__glewProgramUniformMatrix4fv) -#define glProgramUniformMatrix4x2dv GLEW_GET_FUN(__glewProgramUniformMatrix4x2dv) -#define glProgramUniformMatrix4x2fv GLEW_GET_FUN(__glewProgramUniformMatrix4x2fv) -#define glProgramUniformMatrix4x3dv GLEW_GET_FUN(__glewProgramUniformMatrix4x3dv) -#define glProgramUniformMatrix4x3fv GLEW_GET_FUN(__glewProgramUniformMatrix4x3fv) -#define glUseProgramStages GLEW_GET_FUN(__glewUseProgramStages) -#define glValidateProgramPipeline GLEW_GET_FUN(__glewValidateProgramPipeline) - -#define GLEW_ARB_separate_shader_objects GLEW_GET_VAR(__GLEW_ARB_separate_shader_objects) - -#endif /* GL_ARB_separate_shader_objects */ - -/* -------------------- GL_ARB_shader_atomic_counter_ops ------------------- */ - -#ifndef GL_ARB_shader_atomic_counter_ops -#define GL_ARB_shader_atomic_counter_ops 1 - -#define GLEW_ARB_shader_atomic_counter_ops GLEW_GET_VAR(__GLEW_ARB_shader_atomic_counter_ops) - -#endif /* GL_ARB_shader_atomic_counter_ops */ - -/* --------------------- GL_ARB_shader_atomic_counters --------------------- */ - -#ifndef GL_ARB_shader_atomic_counters -#define GL_ARB_shader_atomic_counters 1 - -#define GL_ATOMIC_COUNTER_BUFFER 0x92C0 -#define GL_ATOMIC_COUNTER_BUFFER_BINDING 0x92C1 -#define GL_ATOMIC_COUNTER_BUFFER_START 0x92C2 -#define GL_ATOMIC_COUNTER_BUFFER_SIZE 0x92C3 -#define GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE 0x92C4 -#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS 0x92C5 -#define GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES 0x92C6 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER 0x92C7 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER 0x92C8 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER 0x92C9 -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER 0x92CA -#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER 0x92CB -#define GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS 0x92CC -#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS 0x92CD -#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS 0x92CE -#define GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS 0x92CF -#define GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS 0x92D0 -#define GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS 0x92D1 -#define GL_MAX_VERTEX_ATOMIC_COUNTERS 0x92D2 -#define GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS 0x92D3 -#define GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS 0x92D4 -#define GL_MAX_GEOMETRY_ATOMIC_COUNTERS 0x92D5 -#define GL_MAX_FRAGMENT_ATOMIC_COUNTERS 0x92D6 -#define GL_MAX_COMBINED_ATOMIC_COUNTERS 0x92D7 -#define GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE 0x92D8 -#define GL_ACTIVE_ATOMIC_COUNTER_BUFFERS 0x92D9 -#define GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX 0x92DA -#define GL_UNSIGNED_INT_ATOMIC_COUNTER 0x92DB -#define GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS 0x92DC - -typedef void (GLAPIENTRY * PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC) (GLuint program, GLuint bufferIndex, GLenum pname, GLint* params); - -#define glGetActiveAtomicCounterBufferiv GLEW_GET_FUN(__glewGetActiveAtomicCounterBufferiv) - -#define GLEW_ARB_shader_atomic_counters GLEW_GET_VAR(__GLEW_ARB_shader_atomic_counters) - -#endif /* GL_ARB_shader_atomic_counters */ - -/* -------------------------- GL_ARB_shader_ballot ------------------------- */ - -#ifndef GL_ARB_shader_ballot -#define GL_ARB_shader_ballot 1 - -#define GLEW_ARB_shader_ballot GLEW_GET_VAR(__GLEW_ARB_shader_ballot) - -#endif /* GL_ARB_shader_ballot */ - -/* ----------------------- GL_ARB_shader_bit_encoding ---------------------- */ - -#ifndef GL_ARB_shader_bit_encoding -#define GL_ARB_shader_bit_encoding 1 - -#define GLEW_ARB_shader_bit_encoding GLEW_GET_VAR(__GLEW_ARB_shader_bit_encoding) - -#endif /* GL_ARB_shader_bit_encoding */ - -/* -------------------------- GL_ARB_shader_clock -------------------------- */ - -#ifndef GL_ARB_shader_clock -#define GL_ARB_shader_clock 1 - -#define GLEW_ARB_shader_clock GLEW_GET_VAR(__GLEW_ARB_shader_clock) - -#endif /* GL_ARB_shader_clock */ - -/* --------------------- GL_ARB_shader_draw_parameters --------------------- */ - -#ifndef GL_ARB_shader_draw_parameters -#define GL_ARB_shader_draw_parameters 1 - -#define GLEW_ARB_shader_draw_parameters GLEW_GET_VAR(__GLEW_ARB_shader_draw_parameters) - -#endif /* GL_ARB_shader_draw_parameters */ - -/* ------------------------ GL_ARB_shader_group_vote ----------------------- */ - -#ifndef GL_ARB_shader_group_vote -#define GL_ARB_shader_group_vote 1 - -#define GLEW_ARB_shader_group_vote GLEW_GET_VAR(__GLEW_ARB_shader_group_vote) - -#endif /* GL_ARB_shader_group_vote */ - -/* --------------------- GL_ARB_shader_image_load_store -------------------- */ - -#ifndef GL_ARB_shader_image_load_store -#define GL_ARB_shader_image_load_store 1 - -#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x00000001 -#define GL_ELEMENT_ARRAY_BARRIER_BIT 0x00000002 -#define GL_UNIFORM_BARRIER_BIT 0x00000004 -#define GL_TEXTURE_FETCH_BARRIER_BIT 0x00000008 -#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x00000020 -#define GL_COMMAND_BARRIER_BIT 0x00000040 -#define GL_PIXEL_BUFFER_BARRIER_BIT 0x00000080 -#define GL_TEXTURE_UPDATE_BARRIER_BIT 0x00000100 -#define GL_BUFFER_UPDATE_BARRIER_BIT 0x00000200 -#define GL_FRAMEBUFFER_BARRIER_BIT 0x00000400 -#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x00000800 -#define GL_ATOMIC_COUNTER_BARRIER_BIT 0x00001000 -#define GL_MAX_IMAGE_UNITS 0x8F38 -#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS 0x8F39 -#define GL_IMAGE_BINDING_NAME 0x8F3A -#define GL_IMAGE_BINDING_LEVEL 0x8F3B -#define GL_IMAGE_BINDING_LAYERED 0x8F3C -#define GL_IMAGE_BINDING_LAYER 0x8F3D -#define GL_IMAGE_BINDING_ACCESS 0x8F3E -#define GL_IMAGE_1D 0x904C -#define GL_IMAGE_2D 0x904D -#define GL_IMAGE_3D 0x904E -#define GL_IMAGE_2D_RECT 0x904F -#define GL_IMAGE_CUBE 0x9050 -#define GL_IMAGE_BUFFER 0x9051 -#define GL_IMAGE_1D_ARRAY 0x9052 -#define GL_IMAGE_2D_ARRAY 0x9053 -#define GL_IMAGE_CUBE_MAP_ARRAY 0x9054 -#define GL_IMAGE_2D_MULTISAMPLE 0x9055 -#define GL_IMAGE_2D_MULTISAMPLE_ARRAY 0x9056 -#define GL_INT_IMAGE_1D 0x9057 -#define GL_INT_IMAGE_2D 0x9058 -#define GL_INT_IMAGE_3D 0x9059 -#define GL_INT_IMAGE_2D_RECT 0x905A -#define GL_INT_IMAGE_CUBE 0x905B -#define GL_INT_IMAGE_BUFFER 0x905C -#define GL_INT_IMAGE_1D_ARRAY 0x905D -#define GL_INT_IMAGE_2D_ARRAY 0x905E -#define GL_INT_IMAGE_CUBE_MAP_ARRAY 0x905F -#define GL_INT_IMAGE_2D_MULTISAMPLE 0x9060 -#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x9061 -#define GL_UNSIGNED_INT_IMAGE_1D 0x9062 -#define GL_UNSIGNED_INT_IMAGE_2D 0x9063 -#define GL_UNSIGNED_INT_IMAGE_3D 0x9064 -#define GL_UNSIGNED_INT_IMAGE_2D_RECT 0x9065 -#define GL_UNSIGNED_INT_IMAGE_CUBE 0x9066 -#define GL_UNSIGNED_INT_IMAGE_BUFFER 0x9067 -#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY 0x9068 -#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY 0x9069 -#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY 0x906A -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE 0x906B -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY 0x906C -#define GL_MAX_IMAGE_SAMPLES 0x906D -#define GL_IMAGE_BINDING_FORMAT 0x906E -#define GL_IMAGE_FORMAT_COMPATIBILITY_TYPE 0x90C7 -#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE 0x90C8 -#define GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS 0x90C9 -#define GL_MAX_VERTEX_IMAGE_UNIFORMS 0x90CA -#define GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS 0x90CB -#define GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS 0x90CC -#define GL_MAX_GEOMETRY_IMAGE_UNIFORMS 0x90CD -#define GL_MAX_FRAGMENT_IMAGE_UNIFORMS 0x90CE -#define GL_MAX_COMBINED_IMAGE_UNIFORMS 0x90CF -#define GL_ALL_BARRIER_BITS 0xFFFFFFFF - -typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTUREPROC) (GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format); -typedef void (GLAPIENTRY * PFNGLMEMORYBARRIERPROC) (GLbitfield barriers); - -#define glBindImageTexture GLEW_GET_FUN(__glewBindImageTexture) -#define glMemoryBarrier GLEW_GET_FUN(__glewMemoryBarrier) - -#define GLEW_ARB_shader_image_load_store GLEW_GET_VAR(__GLEW_ARB_shader_image_load_store) - -#endif /* GL_ARB_shader_image_load_store */ - -/* ------------------------ GL_ARB_shader_image_size ----------------------- */ - -#ifndef GL_ARB_shader_image_size -#define GL_ARB_shader_image_size 1 - -#define GLEW_ARB_shader_image_size GLEW_GET_VAR(__GLEW_ARB_shader_image_size) - -#endif /* GL_ARB_shader_image_size */ - -/* ------------------------- GL_ARB_shader_objects ------------------------- */ - -#ifndef GL_ARB_shader_objects -#define GL_ARB_shader_objects 1 - -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 -#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 -#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 -#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 -#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 - -typedef char GLcharARB; -typedef unsigned int GLhandleARB; - -typedef void (GLAPIENTRY * PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj); -typedef void (GLAPIENTRY * PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj); -typedef GLhandleARB (GLAPIENTRY * PFNGLCREATEPROGRAMOBJECTARBPROC) (void); -typedef GLhandleARB (GLAPIENTRY * PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType); -typedef void (GLAPIENTRY * PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj); -typedef void (GLAPIENTRY * PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name); -typedef void (GLAPIENTRY * PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei* count, GLhandleARB *obj); -typedef GLhandleARB (GLAPIENTRY * PFNGLGETHANDLEARBPROC) (GLenum pname); -typedef void (GLAPIENTRY * PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *infoLog); -typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei* length, GLcharARB *source); -typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint* params); -typedef void (GLAPIENTRY * PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (GLAPIENTRY * PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB ** string, const GLint *length); -typedef void (GLAPIENTRY * PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj); -typedef void (GLAPIENTRY * PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj); - -#define glAttachObjectARB GLEW_GET_FUN(__glewAttachObjectARB) -#define glCompileShaderARB GLEW_GET_FUN(__glewCompileShaderARB) -#define glCreateProgramObjectARB GLEW_GET_FUN(__glewCreateProgramObjectARB) -#define glCreateShaderObjectARB GLEW_GET_FUN(__glewCreateShaderObjectARB) -#define glDeleteObjectARB GLEW_GET_FUN(__glewDeleteObjectARB) -#define glDetachObjectARB GLEW_GET_FUN(__glewDetachObjectARB) -#define glGetActiveUniformARB GLEW_GET_FUN(__glewGetActiveUniformARB) -#define glGetAttachedObjectsARB GLEW_GET_FUN(__glewGetAttachedObjectsARB) -#define glGetHandleARB GLEW_GET_FUN(__glewGetHandleARB) -#define glGetInfoLogARB GLEW_GET_FUN(__glewGetInfoLogARB) -#define glGetObjectParameterfvARB GLEW_GET_FUN(__glewGetObjectParameterfvARB) -#define glGetObjectParameterivARB GLEW_GET_FUN(__glewGetObjectParameterivARB) -#define glGetShaderSourceARB GLEW_GET_FUN(__glewGetShaderSourceARB) -#define glGetUniformLocationARB GLEW_GET_FUN(__glewGetUniformLocationARB) -#define glGetUniformfvARB GLEW_GET_FUN(__glewGetUniformfvARB) -#define glGetUniformivARB GLEW_GET_FUN(__glewGetUniformivARB) -#define glLinkProgramARB GLEW_GET_FUN(__glewLinkProgramARB) -#define glShaderSourceARB GLEW_GET_FUN(__glewShaderSourceARB) -#define glUniform1fARB GLEW_GET_FUN(__glewUniform1fARB) -#define glUniform1fvARB GLEW_GET_FUN(__glewUniform1fvARB) -#define glUniform1iARB GLEW_GET_FUN(__glewUniform1iARB) -#define glUniform1ivARB GLEW_GET_FUN(__glewUniform1ivARB) -#define glUniform2fARB GLEW_GET_FUN(__glewUniform2fARB) -#define glUniform2fvARB GLEW_GET_FUN(__glewUniform2fvARB) -#define glUniform2iARB GLEW_GET_FUN(__glewUniform2iARB) -#define glUniform2ivARB GLEW_GET_FUN(__glewUniform2ivARB) -#define glUniform3fARB GLEW_GET_FUN(__glewUniform3fARB) -#define glUniform3fvARB GLEW_GET_FUN(__glewUniform3fvARB) -#define glUniform3iARB GLEW_GET_FUN(__glewUniform3iARB) -#define glUniform3ivARB GLEW_GET_FUN(__glewUniform3ivARB) -#define glUniform4fARB GLEW_GET_FUN(__glewUniform4fARB) -#define glUniform4fvARB GLEW_GET_FUN(__glewUniform4fvARB) -#define glUniform4iARB GLEW_GET_FUN(__glewUniform4iARB) -#define glUniform4ivARB GLEW_GET_FUN(__glewUniform4ivARB) -#define glUniformMatrix2fvARB GLEW_GET_FUN(__glewUniformMatrix2fvARB) -#define glUniformMatrix3fvARB GLEW_GET_FUN(__glewUniformMatrix3fvARB) -#define glUniformMatrix4fvARB GLEW_GET_FUN(__glewUniformMatrix4fvARB) -#define glUseProgramObjectARB GLEW_GET_FUN(__glewUseProgramObjectARB) -#define glValidateProgramARB GLEW_GET_FUN(__glewValidateProgramARB) - -#define GLEW_ARB_shader_objects GLEW_GET_VAR(__GLEW_ARB_shader_objects) - -#endif /* GL_ARB_shader_objects */ - -/* ------------------------ GL_ARB_shader_precision ------------------------ */ - -#ifndef GL_ARB_shader_precision -#define GL_ARB_shader_precision 1 - -#define GLEW_ARB_shader_precision GLEW_GET_VAR(__GLEW_ARB_shader_precision) - -#endif /* GL_ARB_shader_precision */ - -/* ---------------------- GL_ARB_shader_stencil_export --------------------- */ - -#ifndef GL_ARB_shader_stencil_export -#define GL_ARB_shader_stencil_export 1 - -#define GLEW_ARB_shader_stencil_export GLEW_GET_VAR(__GLEW_ARB_shader_stencil_export) - -#endif /* GL_ARB_shader_stencil_export */ - -/* ------------------ GL_ARB_shader_storage_buffer_object ------------------ */ - -#ifndef GL_ARB_shader_storage_buffer_object -#define GL_ARB_shader_storage_buffer_object 1 - -#define GL_SHADER_STORAGE_BARRIER_BIT 0x2000 -#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES 0x8F39 -#define GL_SHADER_STORAGE_BUFFER 0x90D2 -#define GL_SHADER_STORAGE_BUFFER_BINDING 0x90D3 -#define GL_SHADER_STORAGE_BUFFER_START 0x90D4 -#define GL_SHADER_STORAGE_BUFFER_SIZE 0x90D5 -#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6 -#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7 -#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8 -#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9 -#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA -#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB -#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC -#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD -#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE 0x90DE -#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF - -typedef void (GLAPIENTRY * PFNGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding); - -#define glShaderStorageBlockBinding GLEW_GET_FUN(__glewShaderStorageBlockBinding) - -#define GLEW_ARB_shader_storage_buffer_object GLEW_GET_VAR(__GLEW_ARB_shader_storage_buffer_object) - -#endif /* GL_ARB_shader_storage_buffer_object */ - -/* ------------------------ GL_ARB_shader_subroutine ----------------------- */ - -#ifndef GL_ARB_shader_subroutine -#define GL_ARB_shader_subroutine 1 - -#define GL_ACTIVE_SUBROUTINES 0x8DE5 -#define GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6 -#define GL_MAX_SUBROUTINES 0x8DE7 -#define GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47 -#define GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48 -#define GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49 -#define GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A -#define GL_COMPATIBLE_SUBROUTINES 0x8E4B - -typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINENAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC) (GLuint program, GLenum shadertype, GLuint index, GLsizei bufsize, GLsizei* length, GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC) (GLuint program, GLenum shadertype, GLuint index, GLenum pname, GLint* values); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTAGEIVPROC) (GLuint program, GLenum shadertype, GLenum pname, GLint* values); -typedef GLuint (GLAPIENTRY * PFNGLGETSUBROUTINEINDEXPROC) (GLuint program, GLenum shadertype, const GLchar* name); -typedef GLint (GLAPIENTRY * PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC) (GLuint program, GLenum shadertype, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMSUBROUTINEUIVPROC) (GLenum shadertype, GLint location, GLuint* params); -typedef void (GLAPIENTRY * PFNGLUNIFORMSUBROUTINESUIVPROC) (GLenum shadertype, GLsizei count, const GLuint* indices); - -#define glGetActiveSubroutineName GLEW_GET_FUN(__glewGetActiveSubroutineName) -#define glGetActiveSubroutineUniformName GLEW_GET_FUN(__glewGetActiveSubroutineUniformName) -#define glGetActiveSubroutineUniformiv GLEW_GET_FUN(__glewGetActiveSubroutineUniformiv) -#define glGetProgramStageiv GLEW_GET_FUN(__glewGetProgramStageiv) -#define glGetSubroutineIndex GLEW_GET_FUN(__glewGetSubroutineIndex) -#define glGetSubroutineUniformLocation GLEW_GET_FUN(__glewGetSubroutineUniformLocation) -#define glGetUniformSubroutineuiv GLEW_GET_FUN(__glewGetUniformSubroutineuiv) -#define glUniformSubroutinesuiv GLEW_GET_FUN(__glewUniformSubroutinesuiv) - -#define GLEW_ARB_shader_subroutine GLEW_GET_VAR(__GLEW_ARB_shader_subroutine) - -#endif /* GL_ARB_shader_subroutine */ - -/* ------------------ GL_ARB_shader_texture_image_samples ------------------ */ - -#ifndef GL_ARB_shader_texture_image_samples -#define GL_ARB_shader_texture_image_samples 1 - -#define GLEW_ARB_shader_texture_image_samples GLEW_GET_VAR(__GLEW_ARB_shader_texture_image_samples) - -#endif /* GL_ARB_shader_texture_image_samples */ - -/* ----------------------- GL_ARB_shader_texture_lod ----------------------- */ - -#ifndef GL_ARB_shader_texture_lod -#define GL_ARB_shader_texture_lod 1 - -#define GLEW_ARB_shader_texture_lod GLEW_GET_VAR(__GLEW_ARB_shader_texture_lod) - -#endif /* GL_ARB_shader_texture_lod */ - -/* ------------------- GL_ARB_shader_viewport_layer_array ------------------ */ - -#ifndef GL_ARB_shader_viewport_layer_array -#define GL_ARB_shader_viewport_layer_array 1 - -#define GLEW_ARB_shader_viewport_layer_array GLEW_GET_VAR(__GLEW_ARB_shader_viewport_layer_array) - -#endif /* GL_ARB_shader_viewport_layer_array */ - -/* ---------------------- GL_ARB_shading_language_100 ---------------------- */ - -#ifndef GL_ARB_shading_language_100 -#define GL_ARB_shading_language_100 1 - -#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C - -#define GLEW_ARB_shading_language_100 GLEW_GET_VAR(__GLEW_ARB_shading_language_100) - -#endif /* GL_ARB_shading_language_100 */ - -/* -------------------- GL_ARB_shading_language_420pack -------------------- */ - -#ifndef GL_ARB_shading_language_420pack -#define GL_ARB_shading_language_420pack 1 - -#define GLEW_ARB_shading_language_420pack GLEW_GET_VAR(__GLEW_ARB_shading_language_420pack) - -#endif /* GL_ARB_shading_language_420pack */ - -/* -------------------- GL_ARB_shading_language_include -------------------- */ - -#ifndef GL_ARB_shading_language_include -#define GL_ARB_shading_language_include 1 - -#define GL_SHADER_INCLUDE_ARB 0x8DAE -#define GL_NAMED_STRING_LENGTH_ARB 0x8DE9 -#define GL_NAMED_STRING_TYPE_ARB 0x8DEA - -typedef void (GLAPIENTRY * PFNGLCOMPILESHADERINCLUDEARBPROC) (GLuint shader, GLsizei count, const GLchar* const *path, const GLint *length); -typedef void (GLAPIENTRY * PFNGLDELETENAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLGETNAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name, GLsizei bufSize, GLint *stringlen, GLchar *string); -typedef void (GLAPIENTRY * PFNGLGETNAMEDSTRINGIVARBPROC) (GLint namelen, const GLchar* name, GLenum pname, GLint *params); -typedef GLboolean (GLAPIENTRY * PFNGLISNAMEDSTRINGARBPROC) (GLint namelen, const GLchar* name); -typedef void (GLAPIENTRY * PFNGLNAMEDSTRINGARBPROC) (GLenum type, GLint namelen, const GLchar* name, GLint stringlen, const GLchar *string); - -#define glCompileShaderIncludeARB GLEW_GET_FUN(__glewCompileShaderIncludeARB) -#define glDeleteNamedStringARB GLEW_GET_FUN(__glewDeleteNamedStringARB) -#define glGetNamedStringARB GLEW_GET_FUN(__glewGetNamedStringARB) -#define glGetNamedStringivARB GLEW_GET_FUN(__glewGetNamedStringivARB) -#define glIsNamedStringARB GLEW_GET_FUN(__glewIsNamedStringARB) -#define glNamedStringARB GLEW_GET_FUN(__glewNamedStringARB) - -#define GLEW_ARB_shading_language_include GLEW_GET_VAR(__GLEW_ARB_shading_language_include) - -#endif /* GL_ARB_shading_language_include */ - -/* -------------------- GL_ARB_shading_language_packing -------------------- */ - -#ifndef GL_ARB_shading_language_packing -#define GL_ARB_shading_language_packing 1 - -#define GLEW_ARB_shading_language_packing GLEW_GET_VAR(__GLEW_ARB_shading_language_packing) - -#endif /* GL_ARB_shading_language_packing */ - -/* ----------------------------- GL_ARB_shadow ----------------------------- */ - -#ifndef GL_ARB_shadow -#define GL_ARB_shadow 1 - -#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C -#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D -#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E - -#define GLEW_ARB_shadow GLEW_GET_VAR(__GLEW_ARB_shadow) - -#endif /* GL_ARB_shadow */ - -/* ------------------------- GL_ARB_shadow_ambient ------------------------- */ - -#ifndef GL_ARB_shadow_ambient -#define GL_ARB_shadow_ambient 1 - -#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF - -#define GLEW_ARB_shadow_ambient GLEW_GET_VAR(__GLEW_ARB_shadow_ambient) - -#endif /* GL_ARB_shadow_ambient */ - -/* -------------------------- GL_ARB_sparse_buffer ------------------------- */ - -#ifndef GL_ARB_sparse_buffer -#define GL_ARB_sparse_buffer 1 - -#define GL_SPARSE_STORAGE_BIT_ARB 0x0400 -#define GL_SPARSE_BUFFER_PAGE_SIZE_ARB 0x82F8 - -typedef void (GLAPIENTRY * PFNGLBUFFERPAGECOMMITMENTARBPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLboolean commit); - -#define glBufferPageCommitmentARB GLEW_GET_FUN(__glewBufferPageCommitmentARB) - -#define GLEW_ARB_sparse_buffer GLEW_GET_VAR(__GLEW_ARB_sparse_buffer) - -#endif /* GL_ARB_sparse_buffer */ - -/* ------------------------- GL_ARB_sparse_texture ------------------------- */ - -#ifndef GL_ARB_sparse_texture -#define GL_ARB_sparse_texture 1 - -#define GL_VIRTUAL_PAGE_SIZE_X_ARB 0x9195 -#define GL_VIRTUAL_PAGE_SIZE_Y_ARB 0x9196 -#define GL_VIRTUAL_PAGE_SIZE_Z_ARB 0x9197 -#define GL_MAX_SPARSE_TEXTURE_SIZE_ARB 0x9198 -#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_ARB 0x9199 -#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS_ARB 0x919A -#define GL_TEXTURE_SPARSE_ARB 0x91A6 -#define GL_VIRTUAL_PAGE_SIZE_INDEX_ARB 0x91A7 -#define GL_NUM_VIRTUAL_PAGE_SIZES_ARB 0x91A8 -#define GL_SPARSE_TEXTURE_FULL_ARRAY_CUBE_MIPMAPS_ARB 0x91A9 -#define GL_NUM_SPARSE_LEVELS_ARB 0x91AA - -typedef void (GLAPIENTRY * PFNGLTEXPAGECOMMITMENTARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); -typedef void (GLAPIENTRY * PFNGLTEXTUREPAGECOMMITMENTEXTPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLboolean commit); - -#define glTexPageCommitmentARB GLEW_GET_FUN(__glewTexPageCommitmentARB) -#define glTexturePageCommitmentEXT GLEW_GET_FUN(__glewTexturePageCommitmentEXT) - -#define GLEW_ARB_sparse_texture GLEW_GET_VAR(__GLEW_ARB_sparse_texture) - -#endif /* GL_ARB_sparse_texture */ - -/* ------------------------- GL_ARB_sparse_texture2 ------------------------ */ - -#ifndef GL_ARB_sparse_texture2 -#define GL_ARB_sparse_texture2 1 - -#define GLEW_ARB_sparse_texture2 GLEW_GET_VAR(__GLEW_ARB_sparse_texture2) - -#endif /* GL_ARB_sparse_texture2 */ - -/* ---------------------- GL_ARB_sparse_texture_clamp ---------------------- */ - -#ifndef GL_ARB_sparse_texture_clamp -#define GL_ARB_sparse_texture_clamp 1 - -#define GLEW_ARB_sparse_texture_clamp GLEW_GET_VAR(__GLEW_ARB_sparse_texture_clamp) - -#endif /* GL_ARB_sparse_texture_clamp */ - -/* ------------------------ GL_ARB_stencil_texturing ----------------------- */ - -#ifndef GL_ARB_stencil_texturing -#define GL_ARB_stencil_texturing 1 - -#define GL_DEPTH_STENCIL_TEXTURE_MODE 0x90EA - -#define GLEW_ARB_stencil_texturing GLEW_GET_VAR(__GLEW_ARB_stencil_texturing) - -#endif /* GL_ARB_stencil_texturing */ - -/* ------------------------------ GL_ARB_sync ------------------------------ */ - -#ifndef GL_ARB_sync -#define GL_ARB_sync 1 - -#define GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 -#define GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 -#define GL_OBJECT_TYPE 0x9112 -#define GL_SYNC_CONDITION 0x9113 -#define GL_SYNC_STATUS 0x9114 -#define GL_SYNC_FLAGS 0x9115 -#define GL_SYNC_FENCE 0x9116 -#define GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 -#define GL_UNSIGNALED 0x9118 -#define GL_SIGNALED 0x9119 -#define GL_ALREADY_SIGNALED 0x911A -#define GL_TIMEOUT_EXPIRED 0x911B -#define GL_CONDITION_SATISFIED 0x911C -#define GL_WAIT_FAILED 0x911D -#define GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull - -typedef GLenum (GLAPIENTRY * PFNGLCLIENTWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout); -typedef void (GLAPIENTRY * PFNGLDELETESYNCPROC) (GLsync GLsync); -typedef GLsync (GLAPIENTRY * PFNGLFENCESYNCPROC) (GLenum condition,GLbitfield flags); -typedef void (GLAPIENTRY * PFNGLGETINTEGER64VPROC) (GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETSYNCIVPROC) (GLsync GLsync,GLenum pname,GLsizei bufSize,GLsizei* length, GLint *values); -typedef GLboolean (GLAPIENTRY * PFNGLISSYNCPROC) (GLsync GLsync); -typedef void (GLAPIENTRY * PFNGLWAITSYNCPROC) (GLsync GLsync,GLbitfield flags,GLuint64 timeout); - -#define glClientWaitSync GLEW_GET_FUN(__glewClientWaitSync) -#define glDeleteSync GLEW_GET_FUN(__glewDeleteSync) -#define glFenceSync GLEW_GET_FUN(__glewFenceSync) -#define glGetInteger64v GLEW_GET_FUN(__glewGetInteger64v) -#define glGetSynciv GLEW_GET_FUN(__glewGetSynciv) -#define glIsSync GLEW_GET_FUN(__glewIsSync) -#define glWaitSync GLEW_GET_FUN(__glewWaitSync) - -#define GLEW_ARB_sync GLEW_GET_VAR(__GLEW_ARB_sync) - -#endif /* GL_ARB_sync */ - -/* ----------------------- GL_ARB_tessellation_shader ---------------------- */ - -#ifndef GL_ARB_tessellation_shader -#define GL_ARB_tessellation_shader 1 - -#define GL_PATCHES 0xE -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1 -#define GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C -#define GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D -#define GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E -#define GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F -#define GL_PATCH_VERTICES 0x8E72 -#define GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73 -#define GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74 -#define GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75 -#define GL_TESS_GEN_MODE 0x8E76 -#define GL_TESS_GEN_SPACING 0x8E77 -#define GL_TESS_GEN_VERTEX_ORDER 0x8E78 -#define GL_TESS_GEN_POINT_MODE 0x8E79 -#define GL_ISOLINES 0x8E7A -#define GL_FRACTIONAL_ODD 0x8E7B -#define GL_FRACTIONAL_EVEN 0x8E7C -#define GL_MAX_PATCH_VERTICES 0x8E7D -#define GL_MAX_TESS_GEN_LEVEL 0x8E7E -#define GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F -#define GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80 -#define GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81 -#define GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82 -#define GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83 -#define GL_MAX_TESS_PATCH_COMPONENTS 0x8E84 -#define GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85 -#define GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86 -#define GL_TESS_EVALUATION_SHADER 0x8E87 -#define GL_TESS_CONTROL_SHADER 0x8E88 -#define GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89 -#define GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A - -typedef void (GLAPIENTRY * PFNGLPATCHPARAMETERFVPROC) (GLenum pname, const GLfloat* values); -typedef void (GLAPIENTRY * PFNGLPATCHPARAMETERIPROC) (GLenum pname, GLint value); - -#define glPatchParameterfv GLEW_GET_FUN(__glewPatchParameterfv) -#define glPatchParameteri GLEW_GET_FUN(__glewPatchParameteri) - -#define GLEW_ARB_tessellation_shader GLEW_GET_VAR(__GLEW_ARB_tessellation_shader) - -#endif /* GL_ARB_tessellation_shader */ - -/* ------------------------- GL_ARB_texture_barrier ------------------------ */ - -#ifndef GL_ARB_texture_barrier -#define GL_ARB_texture_barrier 1 - -typedef void (GLAPIENTRY * PFNGLTEXTUREBARRIERPROC) (void); - -#define glTextureBarrier GLEW_GET_FUN(__glewTextureBarrier) - -#define GLEW_ARB_texture_barrier GLEW_GET_VAR(__GLEW_ARB_texture_barrier) - -#endif /* GL_ARB_texture_barrier */ - -/* ---------------------- GL_ARB_texture_border_clamp ---------------------- */ - -#ifndef GL_ARB_texture_border_clamp -#define GL_ARB_texture_border_clamp 1 - -#define GL_CLAMP_TO_BORDER_ARB 0x812D - -#define GLEW_ARB_texture_border_clamp GLEW_GET_VAR(__GLEW_ARB_texture_border_clamp) - -#endif /* GL_ARB_texture_border_clamp */ - -/* ---------------------- GL_ARB_texture_buffer_object --------------------- */ - -#ifndef GL_ARB_texture_buffer_object -#define GL_ARB_texture_buffer_object 1 - -#define GL_TEXTURE_BUFFER_ARB 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_ARB 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_ARB 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_ARB 0x8C2E - -typedef void (GLAPIENTRY * PFNGLTEXBUFFERARBPROC) (GLenum target, GLenum internalformat, GLuint buffer); - -#define glTexBufferARB GLEW_GET_FUN(__glewTexBufferARB) - -#define GLEW_ARB_texture_buffer_object GLEW_GET_VAR(__GLEW_ARB_texture_buffer_object) - -#endif /* GL_ARB_texture_buffer_object */ - -/* ------------------- GL_ARB_texture_buffer_object_rgb32 ------------------ */ - -#ifndef GL_ARB_texture_buffer_object_rgb32 -#define GL_ARB_texture_buffer_object_rgb32 1 - -#define GLEW_ARB_texture_buffer_object_rgb32 GLEW_GET_VAR(__GLEW_ARB_texture_buffer_object_rgb32) - -#endif /* GL_ARB_texture_buffer_object_rgb32 */ - -/* ---------------------- GL_ARB_texture_buffer_range ---------------------- */ - -#ifndef GL_ARB_texture_buffer_range -#define GL_ARB_texture_buffer_range 1 - -#define GL_TEXTURE_BUFFER_OFFSET 0x919D -#define GL_TEXTURE_BUFFER_SIZE 0x919E -#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F - -typedef void (GLAPIENTRY * PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); - -#define glTexBufferRange GLEW_GET_FUN(__glewTexBufferRange) -#define glTextureBufferRangeEXT GLEW_GET_FUN(__glewTextureBufferRangeEXT) - -#define GLEW_ARB_texture_buffer_range GLEW_GET_VAR(__GLEW_ARB_texture_buffer_range) - -#endif /* GL_ARB_texture_buffer_range */ - -/* ----------------------- GL_ARB_texture_compression ---------------------- */ - -#ifndef GL_ARB_texture_compression -#define GL_ARB_texture_compression 1 - -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 -#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB -#define GL_COMPRESSED_INTENSITY_ARB 0x84EC -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 -#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 - -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint lod, void *img); - -#define glCompressedTexImage1DARB GLEW_GET_FUN(__glewCompressedTexImage1DARB) -#define glCompressedTexImage2DARB GLEW_GET_FUN(__glewCompressedTexImage2DARB) -#define glCompressedTexImage3DARB GLEW_GET_FUN(__glewCompressedTexImage3DARB) -#define glCompressedTexSubImage1DARB GLEW_GET_FUN(__glewCompressedTexSubImage1DARB) -#define glCompressedTexSubImage2DARB GLEW_GET_FUN(__glewCompressedTexSubImage2DARB) -#define glCompressedTexSubImage3DARB GLEW_GET_FUN(__glewCompressedTexSubImage3DARB) -#define glGetCompressedTexImageARB GLEW_GET_FUN(__glewGetCompressedTexImageARB) - -#define GLEW_ARB_texture_compression GLEW_GET_VAR(__GLEW_ARB_texture_compression) - -#endif /* GL_ARB_texture_compression */ - -/* -------------------- GL_ARB_texture_compression_bptc -------------------- */ - -#ifndef GL_ARB_texture_compression_bptc -#define GL_ARB_texture_compression_bptc 1 - -#define GL_COMPRESSED_RGBA_BPTC_UNORM_ARB 0x8E8C -#define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D -#define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E -#define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F - -#define GLEW_ARB_texture_compression_bptc GLEW_GET_VAR(__GLEW_ARB_texture_compression_bptc) - -#endif /* GL_ARB_texture_compression_bptc */ - -/* -------------------- GL_ARB_texture_compression_rgtc -------------------- */ - -#ifndef GL_ARB_texture_compression_rgtc -#define GL_ARB_texture_compression_rgtc 1 - -#define GL_COMPRESSED_RED_RGTC1 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC -#define GL_COMPRESSED_RG_RGTC2 0x8DBD -#define GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE - -#define GLEW_ARB_texture_compression_rgtc GLEW_GET_VAR(__GLEW_ARB_texture_compression_rgtc) - -#endif /* GL_ARB_texture_compression_rgtc */ - -/* ------------------------ GL_ARB_texture_cube_map ------------------------ */ - -#ifndef GL_ARB_texture_cube_map -#define GL_ARB_texture_cube_map 1 - -#define GL_NORMAL_MAP_ARB 0x8511 -#define GL_REFLECTION_MAP_ARB 0x8512 -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C - -#define GLEW_ARB_texture_cube_map GLEW_GET_VAR(__GLEW_ARB_texture_cube_map) - -#endif /* GL_ARB_texture_cube_map */ - -/* --------------------- GL_ARB_texture_cube_map_array --------------------- */ - -#ifndef GL_ARB_texture_cube_map_array -#define GL_ARB_texture_cube_map_array 1 - -#define GL_TEXTURE_CUBE_MAP_ARRAY_ARB 0x9009 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARRAY_ARB 0x900A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARRAY_ARB 0x900B -#define GL_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900C -#define GL_SAMPLER_CUBE_MAP_ARRAY_SHADOW_ARB 0x900D -#define GL_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900E -#define GL_UNSIGNED_INT_SAMPLER_CUBE_MAP_ARRAY_ARB 0x900F - -#define GLEW_ARB_texture_cube_map_array GLEW_GET_VAR(__GLEW_ARB_texture_cube_map_array) - -#endif /* GL_ARB_texture_cube_map_array */ - -/* ------------------------- GL_ARB_texture_env_add ------------------------ */ - -#ifndef GL_ARB_texture_env_add -#define GL_ARB_texture_env_add 1 - -#define GLEW_ARB_texture_env_add GLEW_GET_VAR(__GLEW_ARB_texture_env_add) - -#endif /* GL_ARB_texture_env_add */ - -/* ----------------------- GL_ARB_texture_env_combine ---------------------- */ - -#ifndef GL_ARB_texture_env_combine -#define GL_ARB_texture_env_combine 1 - -#define GL_SUBTRACT_ARB 0x84E7 -#define GL_COMBINE_ARB 0x8570 -#define GL_COMBINE_RGB_ARB 0x8571 -#define GL_COMBINE_ALPHA_ARB 0x8572 -#define GL_RGB_SCALE_ARB 0x8573 -#define GL_ADD_SIGNED_ARB 0x8574 -#define GL_INTERPOLATE_ARB 0x8575 -#define GL_CONSTANT_ARB 0x8576 -#define GL_PRIMARY_COLOR_ARB 0x8577 -#define GL_PREVIOUS_ARB 0x8578 -#define GL_SOURCE0_RGB_ARB 0x8580 -#define GL_SOURCE1_RGB_ARB 0x8581 -#define GL_SOURCE2_RGB_ARB 0x8582 -#define GL_SOURCE0_ALPHA_ARB 0x8588 -#define GL_SOURCE1_ALPHA_ARB 0x8589 -#define GL_SOURCE2_ALPHA_ARB 0x858A -#define GL_OPERAND0_RGB_ARB 0x8590 -#define GL_OPERAND1_RGB_ARB 0x8591 -#define GL_OPERAND2_RGB_ARB 0x8592 -#define GL_OPERAND0_ALPHA_ARB 0x8598 -#define GL_OPERAND1_ALPHA_ARB 0x8599 -#define GL_OPERAND2_ALPHA_ARB 0x859A - -#define GLEW_ARB_texture_env_combine GLEW_GET_VAR(__GLEW_ARB_texture_env_combine) - -#endif /* GL_ARB_texture_env_combine */ - -/* ---------------------- GL_ARB_texture_env_crossbar ---------------------- */ - -#ifndef GL_ARB_texture_env_crossbar -#define GL_ARB_texture_env_crossbar 1 - -#define GLEW_ARB_texture_env_crossbar GLEW_GET_VAR(__GLEW_ARB_texture_env_crossbar) - -#endif /* GL_ARB_texture_env_crossbar */ - -/* ------------------------ GL_ARB_texture_env_dot3 ------------------------ */ - -#ifndef GL_ARB_texture_env_dot3 -#define GL_ARB_texture_env_dot3 1 - -#define GL_DOT3_RGB_ARB 0x86AE -#define GL_DOT3_RGBA_ARB 0x86AF - -#define GLEW_ARB_texture_env_dot3 GLEW_GET_VAR(__GLEW_ARB_texture_env_dot3) - -#endif /* GL_ARB_texture_env_dot3 */ - -/* ---------------------- GL_ARB_texture_filter_minmax --------------------- */ - -#ifndef GL_ARB_texture_filter_minmax -#define GL_ARB_texture_filter_minmax 1 - -#define GL_TEXTURE_REDUCTION_MODE_ARB 0x9366 -#define GL_WEIGHTED_AVERAGE_ARB 0x9367 - -#define GLEW_ARB_texture_filter_minmax GLEW_GET_VAR(__GLEW_ARB_texture_filter_minmax) - -#endif /* GL_ARB_texture_filter_minmax */ - -/* -------------------------- GL_ARB_texture_float ------------------------- */ - -#ifndef GL_ARB_texture_float -#define GL_ARB_texture_float 1 - -#define GL_RGBA32F_ARB 0x8814 -#define GL_RGB32F_ARB 0x8815 -#define GL_ALPHA32F_ARB 0x8816 -#define GL_INTENSITY32F_ARB 0x8817 -#define GL_LUMINANCE32F_ARB 0x8818 -#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 -#define GL_RGBA16F_ARB 0x881A -#define GL_RGB16F_ARB 0x881B -#define GL_ALPHA16F_ARB 0x881C -#define GL_INTENSITY16F_ARB 0x881D -#define GL_LUMINANCE16F_ARB 0x881E -#define GL_LUMINANCE_ALPHA16F_ARB 0x881F -#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 -#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 -#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 -#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 - -#define GLEW_ARB_texture_float GLEW_GET_VAR(__GLEW_ARB_texture_float) - -#endif /* GL_ARB_texture_float */ - -/* ------------------------- GL_ARB_texture_gather ------------------------- */ - -#ifndef GL_ARB_texture_gather -#define GL_ARB_texture_gather 1 - -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F -#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F - -#define GLEW_ARB_texture_gather GLEW_GET_VAR(__GLEW_ARB_texture_gather) - -#endif /* GL_ARB_texture_gather */ - -/* ------------------ GL_ARB_texture_mirror_clamp_to_edge ------------------ */ - -#ifndef GL_ARB_texture_mirror_clamp_to_edge -#define GL_ARB_texture_mirror_clamp_to_edge 1 - -#define GL_MIRROR_CLAMP_TO_EDGE 0x8743 - -#define GLEW_ARB_texture_mirror_clamp_to_edge GLEW_GET_VAR(__GLEW_ARB_texture_mirror_clamp_to_edge) - -#endif /* GL_ARB_texture_mirror_clamp_to_edge */ - -/* --------------------- GL_ARB_texture_mirrored_repeat -------------------- */ - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_ARB_texture_mirrored_repeat 1 - -#define GL_MIRRORED_REPEAT_ARB 0x8370 - -#define GLEW_ARB_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_ARB_texture_mirrored_repeat) - -#endif /* GL_ARB_texture_mirrored_repeat */ - -/* ----------------------- GL_ARB_texture_multisample ---------------------- */ - -#ifndef GL_ARB_texture_multisample -#define GL_ARB_texture_multisample 1 - -#define GL_SAMPLE_POSITION 0x8E50 -#define GL_SAMPLE_MASK 0x8E51 -#define GL_SAMPLE_MASK_VALUE 0x8E52 -#define GL_MAX_SAMPLE_MASK_WORDS 0x8E59 -#define GL_TEXTURE_2D_MULTISAMPLE 0x9100 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101 -#define GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 -#define GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104 -#define GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 -#define GL_TEXTURE_SAMPLES 0x9106 -#define GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107 -#define GL_SAMPLER_2D_MULTISAMPLE 0x9108 -#define GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109 -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A -#define GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B -#define GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C -#define GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D -#define GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E -#define GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F -#define GL_MAX_INTEGER_SAMPLES 0x9110 - -typedef void (GLAPIENTRY * PFNGLGETMULTISAMPLEFVPROC) (GLenum pname, GLuint index, GLfloat* val); -typedef void (GLAPIENTRY * PFNGLSAMPLEMASKIPROC) (GLuint index, GLbitfield mask); -typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); - -#define glGetMultisamplefv GLEW_GET_FUN(__glewGetMultisamplefv) -#define glSampleMaski GLEW_GET_FUN(__glewSampleMaski) -#define glTexImage2DMultisample GLEW_GET_FUN(__glewTexImage2DMultisample) -#define glTexImage3DMultisample GLEW_GET_FUN(__glewTexImage3DMultisample) - -#define GLEW_ARB_texture_multisample GLEW_GET_VAR(__GLEW_ARB_texture_multisample) - -#endif /* GL_ARB_texture_multisample */ - -/* -------------------- GL_ARB_texture_non_power_of_two -------------------- */ - -#ifndef GL_ARB_texture_non_power_of_two -#define GL_ARB_texture_non_power_of_two 1 - -#define GLEW_ARB_texture_non_power_of_two GLEW_GET_VAR(__GLEW_ARB_texture_non_power_of_two) - -#endif /* GL_ARB_texture_non_power_of_two */ - -/* ---------------------- GL_ARB_texture_query_levels ---------------------- */ - -#ifndef GL_ARB_texture_query_levels -#define GL_ARB_texture_query_levels 1 - -#define GLEW_ARB_texture_query_levels GLEW_GET_VAR(__GLEW_ARB_texture_query_levels) - -#endif /* GL_ARB_texture_query_levels */ - -/* ------------------------ GL_ARB_texture_query_lod ----------------------- */ - -#ifndef GL_ARB_texture_query_lod -#define GL_ARB_texture_query_lod 1 - -#define GLEW_ARB_texture_query_lod GLEW_GET_VAR(__GLEW_ARB_texture_query_lod) - -#endif /* GL_ARB_texture_query_lod */ - -/* ------------------------ GL_ARB_texture_rectangle ----------------------- */ - -#ifndef GL_ARB_texture_rectangle -#define GL_ARB_texture_rectangle 1 - -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 - -#define GLEW_ARB_texture_rectangle GLEW_GET_VAR(__GLEW_ARB_texture_rectangle) - -#endif /* GL_ARB_texture_rectangle */ - -/* --------------------------- GL_ARB_texture_rg --------------------------- */ - -#ifndef GL_ARB_texture_rg -#define GL_ARB_texture_rg 1 - -#define GL_COMPRESSED_RED 0x8225 -#define GL_COMPRESSED_RG 0x8226 -#define GL_RG 0x8227 -#define GL_RG_INTEGER 0x8228 -#define GL_R8 0x8229 -#define GL_R16 0x822A -#define GL_RG8 0x822B -#define GL_RG16 0x822C -#define GL_R16F 0x822D -#define GL_R32F 0x822E -#define GL_RG16F 0x822F -#define GL_RG32F 0x8230 -#define GL_R8I 0x8231 -#define GL_R8UI 0x8232 -#define GL_R16I 0x8233 -#define GL_R16UI 0x8234 -#define GL_R32I 0x8235 -#define GL_R32UI 0x8236 -#define GL_RG8I 0x8237 -#define GL_RG8UI 0x8238 -#define GL_RG16I 0x8239 -#define GL_RG16UI 0x823A -#define GL_RG32I 0x823B -#define GL_RG32UI 0x823C - -#define GLEW_ARB_texture_rg GLEW_GET_VAR(__GLEW_ARB_texture_rg) - -#endif /* GL_ARB_texture_rg */ - -/* ----------------------- GL_ARB_texture_rgb10_a2ui ----------------------- */ - -#ifndef GL_ARB_texture_rgb10_a2ui -#define GL_ARB_texture_rgb10_a2ui 1 - -#define GL_RGB10_A2UI 0x906F - -#define GLEW_ARB_texture_rgb10_a2ui GLEW_GET_VAR(__GLEW_ARB_texture_rgb10_a2ui) - -#endif /* GL_ARB_texture_rgb10_a2ui */ - -/* ------------------------ GL_ARB_texture_stencil8 ------------------------ */ - -#ifndef GL_ARB_texture_stencil8 -#define GL_ARB_texture_stencil8 1 - -#define GL_STENCIL_INDEX 0x1901 -#define GL_STENCIL_INDEX8 0x8D48 - -#define GLEW_ARB_texture_stencil8 GLEW_GET_VAR(__GLEW_ARB_texture_stencil8) - -#endif /* GL_ARB_texture_stencil8 */ - -/* ------------------------- GL_ARB_texture_storage ------------------------ */ - -#ifndef GL_ARB_texture_storage -#define GL_ARB_texture_storage 1 - -#define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F - -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE1DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE2DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE3DPROC) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE1DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); - -#define glTexStorage1D GLEW_GET_FUN(__glewTexStorage1D) -#define glTexStorage2D GLEW_GET_FUN(__glewTexStorage2D) -#define glTexStorage3D GLEW_GET_FUN(__glewTexStorage3D) -#define glTextureStorage1DEXT GLEW_GET_FUN(__glewTextureStorage1DEXT) -#define glTextureStorage2DEXT GLEW_GET_FUN(__glewTextureStorage2DEXT) -#define glTextureStorage3DEXT GLEW_GET_FUN(__glewTextureStorage3DEXT) - -#define GLEW_ARB_texture_storage GLEW_GET_VAR(__GLEW_ARB_texture_storage) - -#endif /* GL_ARB_texture_storage */ - -/* ------------------- GL_ARB_texture_storage_multisample ------------------ */ - -#ifndef GL_ARB_texture_storage_multisample -#define GL_ARB_texture_storage_multisample 1 - -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); -typedef void (GLAPIENTRY * PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); - -#define glTexStorage2DMultisample GLEW_GET_FUN(__glewTexStorage2DMultisample) -#define glTexStorage3DMultisample GLEW_GET_FUN(__glewTexStorage3DMultisample) -#define glTextureStorage2DMultisampleEXT GLEW_GET_FUN(__glewTextureStorage2DMultisampleEXT) -#define glTextureStorage3DMultisampleEXT GLEW_GET_FUN(__glewTextureStorage3DMultisampleEXT) - -#define GLEW_ARB_texture_storage_multisample GLEW_GET_VAR(__GLEW_ARB_texture_storage_multisample) - -#endif /* GL_ARB_texture_storage_multisample */ - -/* ------------------------- GL_ARB_texture_swizzle ------------------------ */ - -#ifndef GL_ARB_texture_swizzle -#define GL_ARB_texture_swizzle 1 - -#define GL_TEXTURE_SWIZZLE_R 0x8E42 -#define GL_TEXTURE_SWIZZLE_G 0x8E43 -#define GL_TEXTURE_SWIZZLE_B 0x8E44 -#define GL_TEXTURE_SWIZZLE_A 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA 0x8E46 - -#define GLEW_ARB_texture_swizzle GLEW_GET_VAR(__GLEW_ARB_texture_swizzle) - -#endif /* GL_ARB_texture_swizzle */ - -/* -------------------------- GL_ARB_texture_view -------------------------- */ - -#ifndef GL_ARB_texture_view -#define GL_ARB_texture_view 1 - -#define GL_TEXTURE_VIEW_MIN_LEVEL 0x82DB -#define GL_TEXTURE_VIEW_NUM_LEVELS 0x82DC -#define GL_TEXTURE_VIEW_MIN_LAYER 0x82DD -#define GL_TEXTURE_VIEW_NUM_LAYERS 0x82DE -#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF - -typedef void (GLAPIENTRY * PFNGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); - -#define glTextureView GLEW_GET_FUN(__glewTextureView) - -#define GLEW_ARB_texture_view GLEW_GET_VAR(__GLEW_ARB_texture_view) - -#endif /* GL_ARB_texture_view */ - -/* --------------------------- GL_ARB_timer_query -------------------------- */ - -#ifndef GL_ARB_timer_query -#define GL_ARB_timer_query 1 - -#define GL_TIME_ELAPSED 0x88BF -#define GL_TIMESTAMP 0x8E28 - -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VPROC) (GLuint id, GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VPROC) (GLuint id, GLenum pname, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLQUERYCOUNTERPROC) (GLuint id, GLenum target); - -#define glGetQueryObjecti64v GLEW_GET_FUN(__glewGetQueryObjecti64v) -#define glGetQueryObjectui64v GLEW_GET_FUN(__glewGetQueryObjectui64v) -#define glQueryCounter GLEW_GET_FUN(__glewQueryCounter) - -#define GLEW_ARB_timer_query GLEW_GET_VAR(__GLEW_ARB_timer_query) - -#endif /* GL_ARB_timer_query */ - -/* ----------------------- GL_ARB_transform_feedback2 ---------------------- */ - -#ifndef GL_ARB_transform_feedback2 -#define GL_ARB_transform_feedback2 1 - -#define GL_TRANSFORM_FEEDBACK 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING 0x8E25 - -typedef void (GLAPIENTRY * PFNGLBINDTRANSFORMFEEDBACKPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETETRANSFORMFEEDBACKSPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKPROC) (GLenum mode, GLuint id); -typedef void (GLAPIENTRY * PFNGLGENTRANSFORMFEEDBACKSPROC) (GLsizei n, GLuint* ids); -typedef GLboolean (GLAPIENTRY * PFNGLISTRANSFORMFEEDBACKPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLPAUSETRANSFORMFEEDBACKPROC) (void); -typedef void (GLAPIENTRY * PFNGLRESUMETRANSFORMFEEDBACKPROC) (void); - -#define glBindTransformFeedback GLEW_GET_FUN(__glewBindTransformFeedback) -#define glDeleteTransformFeedbacks GLEW_GET_FUN(__glewDeleteTransformFeedbacks) -#define glDrawTransformFeedback GLEW_GET_FUN(__glewDrawTransformFeedback) -#define glGenTransformFeedbacks GLEW_GET_FUN(__glewGenTransformFeedbacks) -#define glIsTransformFeedback GLEW_GET_FUN(__glewIsTransformFeedback) -#define glPauseTransformFeedback GLEW_GET_FUN(__glewPauseTransformFeedback) -#define glResumeTransformFeedback GLEW_GET_FUN(__glewResumeTransformFeedback) - -#define GLEW_ARB_transform_feedback2 GLEW_GET_VAR(__GLEW_ARB_transform_feedback2) - -#endif /* GL_ARB_transform_feedback2 */ - -/* ----------------------- GL_ARB_transform_feedback3 ---------------------- */ - -#ifndef GL_ARB_transform_feedback3 -#define GL_ARB_transform_feedback3 1 - -#define GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70 -#define GL_MAX_VERTEX_STREAMS 0x8E71 - -typedef void (GLAPIENTRY * PFNGLBEGINQUERYINDEXEDPROC) (GLenum target, GLuint index, GLuint id); -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC) (GLenum mode, GLuint id, GLuint stream); -typedef void (GLAPIENTRY * PFNGLENDQUERYINDEXEDPROC) (GLenum target, GLuint index); -typedef void (GLAPIENTRY * PFNGLGETQUERYINDEXEDIVPROC) (GLenum target, GLuint index, GLenum pname, GLint* params); - -#define glBeginQueryIndexed GLEW_GET_FUN(__glewBeginQueryIndexed) -#define glDrawTransformFeedbackStream GLEW_GET_FUN(__glewDrawTransformFeedbackStream) -#define glEndQueryIndexed GLEW_GET_FUN(__glewEndQueryIndexed) -#define glGetQueryIndexediv GLEW_GET_FUN(__glewGetQueryIndexediv) - -#define GLEW_ARB_transform_feedback3 GLEW_GET_VAR(__GLEW_ARB_transform_feedback3) - -#endif /* GL_ARB_transform_feedback3 */ - -/* ------------------ GL_ARB_transform_feedback_instanced ------------------ */ - -#ifndef GL_ARB_transform_feedback_instanced -#define GL_ARB_transform_feedback_instanced 1 - -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei primcount); - -#define glDrawTransformFeedbackInstanced GLEW_GET_FUN(__glewDrawTransformFeedbackInstanced) -#define glDrawTransformFeedbackStreamInstanced GLEW_GET_FUN(__glewDrawTransformFeedbackStreamInstanced) - -#define GLEW_ARB_transform_feedback_instanced GLEW_GET_VAR(__GLEW_ARB_transform_feedback_instanced) - -#endif /* GL_ARB_transform_feedback_instanced */ - -/* ---------------- GL_ARB_transform_feedback_overflow_query --------------- */ - -#ifndef GL_ARB_transform_feedback_overflow_query -#define GL_ARB_transform_feedback_overflow_query 1 - -#define GL_TRANSFORM_FEEDBACK_OVERFLOW_ARB 0x82EC -#define GL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW_ARB 0x82ED - -#define GLEW_ARB_transform_feedback_overflow_query GLEW_GET_VAR(__GLEW_ARB_transform_feedback_overflow_query) - -#endif /* GL_ARB_transform_feedback_overflow_query */ - -/* ------------------------ GL_ARB_transpose_matrix ------------------------ */ - -#ifndef GL_ARB_transpose_matrix -#define GL_ARB_transpose_matrix 1 - -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 - -typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]); -typedef void (GLAPIENTRY * PFNGLLOADTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]); -typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXDARBPROC) (GLdouble m[16]); -typedef void (GLAPIENTRY * PFNGLMULTTRANSPOSEMATRIXFARBPROC) (GLfloat m[16]); - -#define glLoadTransposeMatrixdARB GLEW_GET_FUN(__glewLoadTransposeMatrixdARB) -#define glLoadTransposeMatrixfARB GLEW_GET_FUN(__glewLoadTransposeMatrixfARB) -#define glMultTransposeMatrixdARB GLEW_GET_FUN(__glewMultTransposeMatrixdARB) -#define glMultTransposeMatrixfARB GLEW_GET_FUN(__glewMultTransposeMatrixfARB) - -#define GLEW_ARB_transpose_matrix GLEW_GET_VAR(__GLEW_ARB_transpose_matrix) - -#endif /* GL_ARB_transpose_matrix */ - -/* ---------------------- GL_ARB_uniform_buffer_object --------------------- */ - -#ifndef GL_ARB_uniform_buffer_object -#define GL_ARB_uniform_buffer_object 1 - -#define GL_UNIFORM_BUFFER 0x8A11 -#define GL_UNIFORM_BUFFER_BINDING 0x8A28 -#define GL_UNIFORM_BUFFER_START 0x8A29 -#define GL_UNIFORM_BUFFER_SIZE 0x8A2A -#define GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B -#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C -#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D -#define GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E -#define GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F -#define GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30 -#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31 -#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32 -#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33 -#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34 -#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35 -#define GL_ACTIVE_UNIFORM_BLOCKS 0x8A36 -#define GL_UNIFORM_TYPE 0x8A37 -#define GL_UNIFORM_SIZE 0x8A38 -#define GL_UNIFORM_NAME_LENGTH 0x8A39 -#define GL_UNIFORM_BLOCK_INDEX 0x8A3A -#define GL_UNIFORM_OFFSET 0x8A3B -#define GL_UNIFORM_ARRAY_STRIDE 0x8A3C -#define GL_UNIFORM_MATRIX_STRIDE 0x8A3D -#define GL_UNIFORM_IS_ROW_MAJOR 0x8A3E -#define GL_UNIFORM_BLOCK_BINDING 0x8A3F -#define GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40 -#define GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42 -#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45 -#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46 -#define GL_INVALID_INDEX 0xFFFFFFFFu - -typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASEPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGEPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMBLOCKIVPROC) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMNAMEPROC) (GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformName); -typedef void (GLAPIENTRY * PFNGLGETACTIVEUNIFORMSIVPROC) (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETINTEGERI_VPROC) (GLenum target, GLuint index, GLint* data); -typedef GLuint (GLAPIENTRY * PFNGLGETUNIFORMBLOCKINDEXPROC) (GLuint program, const GLchar* uniformBlockName); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMINDICESPROC) (GLuint program, GLsizei uniformCount, const GLchar* const * uniformNames, GLuint* uniformIndices); -typedef void (GLAPIENTRY * PFNGLUNIFORMBLOCKBINDINGPROC) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); - -#define glBindBufferBase GLEW_GET_FUN(__glewBindBufferBase) -#define glBindBufferRange GLEW_GET_FUN(__glewBindBufferRange) -#define glGetActiveUniformBlockName GLEW_GET_FUN(__glewGetActiveUniformBlockName) -#define glGetActiveUniformBlockiv GLEW_GET_FUN(__glewGetActiveUniformBlockiv) -#define glGetActiveUniformName GLEW_GET_FUN(__glewGetActiveUniformName) -#define glGetActiveUniformsiv GLEW_GET_FUN(__glewGetActiveUniformsiv) -#define glGetIntegeri_v GLEW_GET_FUN(__glewGetIntegeri_v) -#define glGetUniformBlockIndex GLEW_GET_FUN(__glewGetUniformBlockIndex) -#define glGetUniformIndices GLEW_GET_FUN(__glewGetUniformIndices) -#define glUniformBlockBinding GLEW_GET_FUN(__glewUniformBlockBinding) - -#define GLEW_ARB_uniform_buffer_object GLEW_GET_VAR(__GLEW_ARB_uniform_buffer_object) - -#endif /* GL_ARB_uniform_buffer_object */ - -/* ------------------------ GL_ARB_vertex_array_bgra ----------------------- */ - -#ifndef GL_ARB_vertex_array_bgra -#define GL_ARB_vertex_array_bgra 1 - -#define GL_BGRA 0x80E1 - -#define GLEW_ARB_vertex_array_bgra GLEW_GET_VAR(__GLEW_ARB_vertex_array_bgra) - -#endif /* GL_ARB_vertex_array_bgra */ - -/* ----------------------- GL_ARB_vertex_array_object ---------------------- */ - -#ifndef GL_ARB_vertex_array_object -#define GL_ARB_vertex_array_object 1 - -#define GL_VERTEX_ARRAY_BINDING 0x85B5 - -typedef void (GLAPIENTRY * PFNGLBINDVERTEXARRAYPROC) (GLuint array); -typedef void (GLAPIENTRY * PFNGLDELETEVERTEXARRAYSPROC) (GLsizei n, const GLuint* arrays); -typedef void (GLAPIENTRY * PFNGLGENVERTEXARRAYSPROC) (GLsizei n, GLuint* arrays); -typedef GLboolean (GLAPIENTRY * PFNGLISVERTEXARRAYPROC) (GLuint array); - -#define glBindVertexArray GLEW_GET_FUN(__glewBindVertexArray) -#define glDeleteVertexArrays GLEW_GET_FUN(__glewDeleteVertexArrays) -#define glGenVertexArrays GLEW_GET_FUN(__glewGenVertexArrays) -#define glIsVertexArray GLEW_GET_FUN(__glewIsVertexArray) - -#define GLEW_ARB_vertex_array_object GLEW_GET_VAR(__GLEW_ARB_vertex_array_object) - -#endif /* GL_ARB_vertex_array_object */ - -/* ----------------------- GL_ARB_vertex_attrib_64bit ---------------------- */ - -#ifndef GL_ARB_vertex_attrib_64bit -#define GL_ARB_vertex_attrib_64bit 1 - -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLDVPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLPOINTERPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void* pointer); - -#define glGetVertexAttribLdv GLEW_GET_FUN(__glewGetVertexAttribLdv) -#define glVertexAttribL1d GLEW_GET_FUN(__glewVertexAttribL1d) -#define glVertexAttribL1dv GLEW_GET_FUN(__glewVertexAttribL1dv) -#define glVertexAttribL2d GLEW_GET_FUN(__glewVertexAttribL2d) -#define glVertexAttribL2dv GLEW_GET_FUN(__glewVertexAttribL2dv) -#define glVertexAttribL3d GLEW_GET_FUN(__glewVertexAttribL3d) -#define glVertexAttribL3dv GLEW_GET_FUN(__glewVertexAttribL3dv) -#define glVertexAttribL4d GLEW_GET_FUN(__glewVertexAttribL4d) -#define glVertexAttribL4dv GLEW_GET_FUN(__glewVertexAttribL4dv) -#define glVertexAttribLPointer GLEW_GET_FUN(__glewVertexAttribLPointer) - -#define GLEW_ARB_vertex_attrib_64bit GLEW_GET_VAR(__GLEW_ARB_vertex_attrib_64bit) - -#endif /* GL_ARB_vertex_attrib_64bit */ - -/* ---------------------- GL_ARB_vertex_attrib_binding --------------------- */ - -#ifndef GL_ARB_vertex_attrib_binding -#define GL_ARB_vertex_attrib_binding 1 - -#define GL_VERTEX_ATTRIB_BINDING 0x82D4 -#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D5 -#define GL_VERTEX_BINDING_DIVISOR 0x82D6 -#define GL_VERTEX_BINDING_OFFSET 0x82D7 -#define GL_VERTEX_BINDING_STRIDE 0x82D8 -#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9 -#define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA -#define GL_VERTEX_BINDING_BUFFER 0x8F4F - -typedef void (GLAPIENTRY * PFNGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); -typedef void (GLAPIENTRY * PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor); - -#define glBindVertexBuffer GLEW_GET_FUN(__glewBindVertexBuffer) -#define glVertexArrayBindVertexBufferEXT GLEW_GET_FUN(__glewVertexArrayBindVertexBufferEXT) -#define glVertexArrayVertexAttribBindingEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribBindingEXT) -#define glVertexArrayVertexAttribFormatEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribFormatEXT) -#define glVertexArrayVertexAttribIFormatEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribIFormatEXT) -#define glVertexArrayVertexAttribLFormatEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribLFormatEXT) -#define glVertexArrayVertexBindingDivisorEXT GLEW_GET_FUN(__glewVertexArrayVertexBindingDivisorEXT) -#define glVertexAttribBinding GLEW_GET_FUN(__glewVertexAttribBinding) -#define glVertexAttribFormat GLEW_GET_FUN(__glewVertexAttribFormat) -#define glVertexAttribIFormat GLEW_GET_FUN(__glewVertexAttribIFormat) -#define glVertexAttribLFormat GLEW_GET_FUN(__glewVertexAttribLFormat) -#define glVertexBindingDivisor GLEW_GET_FUN(__glewVertexBindingDivisor) - -#define GLEW_ARB_vertex_attrib_binding GLEW_GET_VAR(__GLEW_ARB_vertex_attrib_binding) - -#endif /* GL_ARB_vertex_attrib_binding */ - -/* -------------------------- GL_ARB_vertex_blend -------------------------- */ - -#ifndef GL_ARB_vertex_blend -#define GL_ARB_vertex_blend 1 - -#define GL_MODELVIEW0_ARB 0x1700 -#define GL_MODELVIEW1_ARB 0x850A -#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 -#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 -#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 -#define GL_VERTEX_BLEND_ARB 0x86A7 -#define GL_CURRENT_WEIGHT_ARB 0x86A8 -#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 -#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA -#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB -#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC -#define GL_WEIGHT_ARRAY_ARB 0x86AD -#define GL_MODELVIEW2_ARB 0x8722 -#define GL_MODELVIEW3_ARB 0x8723 -#define GL_MODELVIEW4_ARB 0x8724 -#define GL_MODELVIEW5_ARB 0x8725 -#define GL_MODELVIEW6_ARB 0x8726 -#define GL_MODELVIEW7_ARB 0x8727 -#define GL_MODELVIEW8_ARB 0x8728 -#define GL_MODELVIEW9_ARB 0x8729 -#define GL_MODELVIEW10_ARB 0x872A -#define GL_MODELVIEW11_ARB 0x872B -#define GL_MODELVIEW12_ARB 0x872C -#define GL_MODELVIEW13_ARB 0x872D -#define GL_MODELVIEW14_ARB 0x872E -#define GL_MODELVIEW15_ARB 0x872F -#define GL_MODELVIEW16_ARB 0x8730 -#define GL_MODELVIEW17_ARB 0x8731 -#define GL_MODELVIEW18_ARB 0x8732 -#define GL_MODELVIEW19_ARB 0x8733 -#define GL_MODELVIEW20_ARB 0x8734 -#define GL_MODELVIEW21_ARB 0x8735 -#define GL_MODELVIEW22_ARB 0x8736 -#define GL_MODELVIEW23_ARB 0x8737 -#define GL_MODELVIEW24_ARB 0x8738 -#define GL_MODELVIEW25_ARB 0x8739 -#define GL_MODELVIEW26_ARB 0x873A -#define GL_MODELVIEW27_ARB 0x873B -#define GL_MODELVIEW28_ARB 0x873C -#define GL_MODELVIEW29_ARB 0x873D -#define GL_MODELVIEW30_ARB 0x873E -#define GL_MODELVIEW31_ARB 0x873F - -typedef void (GLAPIENTRY * PFNGLVERTEXBLENDARBPROC) (GLint count); -typedef void (GLAPIENTRY * PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, void *pointer); -typedef void (GLAPIENTRY * PFNGLWEIGHTBVARBPROC) (GLint size, GLbyte *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTDVARBPROC) (GLint size, GLdouble *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTFVARBPROC) (GLint size, GLfloat *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTIVARBPROC) (GLint size, GLint *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTSVARBPROC) (GLint size, GLshort *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTUBVARBPROC) (GLint size, GLubyte *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTUIVARBPROC) (GLint size, GLuint *weights); -typedef void (GLAPIENTRY * PFNGLWEIGHTUSVARBPROC) (GLint size, GLushort *weights); - -#define glVertexBlendARB GLEW_GET_FUN(__glewVertexBlendARB) -#define glWeightPointerARB GLEW_GET_FUN(__glewWeightPointerARB) -#define glWeightbvARB GLEW_GET_FUN(__glewWeightbvARB) -#define glWeightdvARB GLEW_GET_FUN(__glewWeightdvARB) -#define glWeightfvARB GLEW_GET_FUN(__glewWeightfvARB) -#define glWeightivARB GLEW_GET_FUN(__glewWeightivARB) -#define glWeightsvARB GLEW_GET_FUN(__glewWeightsvARB) -#define glWeightubvARB GLEW_GET_FUN(__glewWeightubvARB) -#define glWeightuivARB GLEW_GET_FUN(__glewWeightuivARB) -#define glWeightusvARB GLEW_GET_FUN(__glewWeightusvARB) - -#define GLEW_ARB_vertex_blend GLEW_GET_VAR(__GLEW_ARB_vertex_blend) - -#endif /* GL_ARB_vertex_blend */ - -/* ---------------------- GL_ARB_vertex_buffer_object ---------------------- */ - -#ifndef GL_ARB_vertex_buffer_object -#define GL_ARB_vertex_buffer_object 1 - -#define GL_BUFFER_SIZE_ARB 0x8764 -#define GL_BUFFER_USAGE_ARB 0x8765 -#define GL_ARRAY_BUFFER_ARB 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 -#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F -#define GL_READ_ONLY_ARB 0x88B8 -#define GL_WRITE_ONLY_ARB 0x88B9 -#define GL_READ_WRITE_ARB 0x88BA -#define GL_BUFFER_ACCESS_ARB 0x88BB -#define GL_BUFFER_MAPPED_ARB 0x88BC -#define GL_BUFFER_MAP_POINTER_ARB 0x88BD -#define GL_STREAM_DRAW_ARB 0x88E0 -#define GL_STREAM_READ_ARB 0x88E1 -#define GL_STREAM_COPY_ARB 0x88E2 -#define GL_STATIC_DRAW_ARB 0x88E4 -#define GL_STATIC_READ_ARB 0x88E5 -#define GL_STATIC_COPY_ARB 0x88E6 -#define GL_DYNAMIC_DRAW_ARB 0x88E8 -#define GL_DYNAMIC_READ_ARB 0x88E9 -#define GL_DYNAMIC_COPY_ARB 0x88EA - -typedef ptrdiff_t GLintptrARB; -typedef ptrdiff_t GLsizeiptrARB; - -typedef void (GLAPIENTRY * PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const void *data, GLenum usage); -typedef void (GLAPIENTRY * PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const void *data); -typedef void (GLAPIENTRY * PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint* buffers); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, void** params); -typedef void (GLAPIENTRY * PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, void *data); -typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERARBPROC) (GLuint buffer); -typedef void * (GLAPIENTRY * PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access); -typedef GLboolean (GLAPIENTRY * PFNGLUNMAPBUFFERARBPROC) (GLenum target); - -#define glBindBufferARB GLEW_GET_FUN(__glewBindBufferARB) -#define glBufferDataARB GLEW_GET_FUN(__glewBufferDataARB) -#define glBufferSubDataARB GLEW_GET_FUN(__glewBufferSubDataARB) -#define glDeleteBuffersARB GLEW_GET_FUN(__glewDeleteBuffersARB) -#define glGenBuffersARB GLEW_GET_FUN(__glewGenBuffersARB) -#define glGetBufferParameterivARB GLEW_GET_FUN(__glewGetBufferParameterivARB) -#define glGetBufferPointervARB GLEW_GET_FUN(__glewGetBufferPointervARB) -#define glGetBufferSubDataARB GLEW_GET_FUN(__glewGetBufferSubDataARB) -#define glIsBufferARB GLEW_GET_FUN(__glewIsBufferARB) -#define glMapBufferARB GLEW_GET_FUN(__glewMapBufferARB) -#define glUnmapBufferARB GLEW_GET_FUN(__glewUnmapBufferARB) - -#define GLEW_ARB_vertex_buffer_object GLEW_GET_VAR(__GLEW_ARB_vertex_buffer_object) - -#endif /* GL_ARB_vertex_buffer_object */ - -/* ------------------------- GL_ARB_vertex_program ------------------------- */ - -#ifndef GL_ARB_vertex_program -#define GL_ARB_vertex_program 1 - -#define GL_COLOR_SUM_ARB 0x8458 -#define GL_VERTEX_PROGRAM_ARB 0x8620 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 -#define GL_PROGRAM_LENGTH_ARB 0x8627 -#define GL_PROGRAM_STRING_ARB 0x8628 -#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E -#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F -#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 -#define GL_CURRENT_MATRIX_ARB 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 -#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B -#define GL_PROGRAM_BINDING_ARB 0x8677 -#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A -#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 -#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -#define GL_PROGRAM_FORMAT_ARB 0x8876 -#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 -#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 -#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 -#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 -#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 -#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 -#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 -#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 -#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 -#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 -#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA -#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB -#define GL_PROGRAM_ATTRIBS_ARB 0x88AC -#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD -#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE -#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF -#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 -#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 -#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 -#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 -#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 -#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 -#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 -#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 -#define GL_MATRIX0_ARB 0x88C0 -#define GL_MATRIX1_ARB 0x88C1 -#define GL_MATRIX2_ARB 0x88C2 -#define GL_MATRIX3_ARB 0x88C3 -#define GL_MATRIX4_ARB 0x88C4 -#define GL_MATRIX5_ARB 0x88C5 -#define GL_MATRIX6_ARB 0x88C6 -#define GL_MATRIX7_ARB 0x88C7 -#define GL_MATRIX8_ARB 0x88C8 -#define GL_MATRIX9_ARB 0x88C9 -#define GL_MATRIX10_ARB 0x88CA -#define GL_MATRIX11_ARB 0x88CB -#define GL_MATRIX12_ARB 0x88CC -#define GL_MATRIX13_ARB 0x88CD -#define GL_MATRIX14_ARB 0x88CE -#define GL_MATRIX15_ARB 0x88CF -#define GL_MATRIX16_ARB 0x88D0 -#define GL_MATRIX17_ARB 0x88D1 -#define GL_MATRIX18_ARB 0x88D2 -#define GL_MATRIX19_ARB 0x88D3 -#define GL_MATRIX20_ARB 0x88D4 -#define GL_MATRIX21_ARB 0x88D5 -#define GL_MATRIX22_ARB 0x88D6 -#define GL_MATRIX23_ARB 0x88D7 -#define GL_MATRIX24_ARB 0x88D8 -#define GL_MATRIX25_ARB 0x88D9 -#define GL_MATRIX26_ARB 0x88DA -#define GL_MATRIX27_ARB 0x88DB -#define GL_MATRIX28_ARB 0x88DC -#define GL_MATRIX29_ARB 0x88DD -#define GL_MATRIX30_ARB 0x88DE -#define GL_MATRIX31_ARB 0x88DF - -typedef void (GLAPIENTRY * PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program); -typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint* programs); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint* programs); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, void *string); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, void** pointer); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMARBPROC) (GLuint program); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const void *string); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void *pointer); - -#define glBindProgramARB GLEW_GET_FUN(__glewBindProgramARB) -#define glDeleteProgramsARB GLEW_GET_FUN(__glewDeleteProgramsARB) -#define glDisableVertexAttribArrayARB GLEW_GET_FUN(__glewDisableVertexAttribArrayARB) -#define glEnableVertexAttribArrayARB GLEW_GET_FUN(__glewEnableVertexAttribArrayARB) -#define glGenProgramsARB GLEW_GET_FUN(__glewGenProgramsARB) -#define glGetProgramEnvParameterdvARB GLEW_GET_FUN(__glewGetProgramEnvParameterdvARB) -#define glGetProgramEnvParameterfvARB GLEW_GET_FUN(__glewGetProgramEnvParameterfvARB) -#define glGetProgramLocalParameterdvARB GLEW_GET_FUN(__glewGetProgramLocalParameterdvARB) -#define glGetProgramLocalParameterfvARB GLEW_GET_FUN(__glewGetProgramLocalParameterfvARB) -#define glGetProgramStringARB GLEW_GET_FUN(__glewGetProgramStringARB) -#define glGetProgramivARB GLEW_GET_FUN(__glewGetProgramivARB) -#define glGetVertexAttribPointervARB GLEW_GET_FUN(__glewGetVertexAttribPointervARB) -#define glGetVertexAttribdvARB GLEW_GET_FUN(__glewGetVertexAttribdvARB) -#define glGetVertexAttribfvARB GLEW_GET_FUN(__glewGetVertexAttribfvARB) -#define glGetVertexAttribivARB GLEW_GET_FUN(__glewGetVertexAttribivARB) -#define glIsProgramARB GLEW_GET_FUN(__glewIsProgramARB) -#define glProgramEnvParameter4dARB GLEW_GET_FUN(__glewProgramEnvParameter4dARB) -#define glProgramEnvParameter4dvARB GLEW_GET_FUN(__glewProgramEnvParameter4dvARB) -#define glProgramEnvParameter4fARB GLEW_GET_FUN(__glewProgramEnvParameter4fARB) -#define glProgramEnvParameter4fvARB GLEW_GET_FUN(__glewProgramEnvParameter4fvARB) -#define glProgramLocalParameter4dARB GLEW_GET_FUN(__glewProgramLocalParameter4dARB) -#define glProgramLocalParameter4dvARB GLEW_GET_FUN(__glewProgramLocalParameter4dvARB) -#define glProgramLocalParameter4fARB GLEW_GET_FUN(__glewProgramLocalParameter4fARB) -#define glProgramLocalParameter4fvARB GLEW_GET_FUN(__glewProgramLocalParameter4fvARB) -#define glProgramStringARB GLEW_GET_FUN(__glewProgramStringARB) -#define glVertexAttrib1dARB GLEW_GET_FUN(__glewVertexAttrib1dARB) -#define glVertexAttrib1dvARB GLEW_GET_FUN(__glewVertexAttrib1dvARB) -#define glVertexAttrib1fARB GLEW_GET_FUN(__glewVertexAttrib1fARB) -#define glVertexAttrib1fvARB GLEW_GET_FUN(__glewVertexAttrib1fvARB) -#define glVertexAttrib1sARB GLEW_GET_FUN(__glewVertexAttrib1sARB) -#define glVertexAttrib1svARB GLEW_GET_FUN(__glewVertexAttrib1svARB) -#define glVertexAttrib2dARB GLEW_GET_FUN(__glewVertexAttrib2dARB) -#define glVertexAttrib2dvARB GLEW_GET_FUN(__glewVertexAttrib2dvARB) -#define glVertexAttrib2fARB GLEW_GET_FUN(__glewVertexAttrib2fARB) -#define glVertexAttrib2fvARB GLEW_GET_FUN(__glewVertexAttrib2fvARB) -#define glVertexAttrib2sARB GLEW_GET_FUN(__glewVertexAttrib2sARB) -#define glVertexAttrib2svARB GLEW_GET_FUN(__glewVertexAttrib2svARB) -#define glVertexAttrib3dARB GLEW_GET_FUN(__glewVertexAttrib3dARB) -#define glVertexAttrib3dvARB GLEW_GET_FUN(__glewVertexAttrib3dvARB) -#define glVertexAttrib3fARB GLEW_GET_FUN(__glewVertexAttrib3fARB) -#define glVertexAttrib3fvARB GLEW_GET_FUN(__glewVertexAttrib3fvARB) -#define glVertexAttrib3sARB GLEW_GET_FUN(__glewVertexAttrib3sARB) -#define glVertexAttrib3svARB GLEW_GET_FUN(__glewVertexAttrib3svARB) -#define glVertexAttrib4NbvARB GLEW_GET_FUN(__glewVertexAttrib4NbvARB) -#define glVertexAttrib4NivARB GLEW_GET_FUN(__glewVertexAttrib4NivARB) -#define glVertexAttrib4NsvARB GLEW_GET_FUN(__glewVertexAttrib4NsvARB) -#define glVertexAttrib4NubARB GLEW_GET_FUN(__glewVertexAttrib4NubARB) -#define glVertexAttrib4NubvARB GLEW_GET_FUN(__glewVertexAttrib4NubvARB) -#define glVertexAttrib4NuivARB GLEW_GET_FUN(__glewVertexAttrib4NuivARB) -#define glVertexAttrib4NusvARB GLEW_GET_FUN(__glewVertexAttrib4NusvARB) -#define glVertexAttrib4bvARB GLEW_GET_FUN(__glewVertexAttrib4bvARB) -#define glVertexAttrib4dARB GLEW_GET_FUN(__glewVertexAttrib4dARB) -#define glVertexAttrib4dvARB GLEW_GET_FUN(__glewVertexAttrib4dvARB) -#define glVertexAttrib4fARB GLEW_GET_FUN(__glewVertexAttrib4fARB) -#define glVertexAttrib4fvARB GLEW_GET_FUN(__glewVertexAttrib4fvARB) -#define glVertexAttrib4ivARB GLEW_GET_FUN(__glewVertexAttrib4ivARB) -#define glVertexAttrib4sARB GLEW_GET_FUN(__glewVertexAttrib4sARB) -#define glVertexAttrib4svARB GLEW_GET_FUN(__glewVertexAttrib4svARB) -#define glVertexAttrib4ubvARB GLEW_GET_FUN(__glewVertexAttrib4ubvARB) -#define glVertexAttrib4uivARB GLEW_GET_FUN(__glewVertexAttrib4uivARB) -#define glVertexAttrib4usvARB GLEW_GET_FUN(__glewVertexAttrib4usvARB) -#define glVertexAttribPointerARB GLEW_GET_FUN(__glewVertexAttribPointerARB) - -#define GLEW_ARB_vertex_program GLEW_GET_VAR(__GLEW_ARB_vertex_program) - -#endif /* GL_ARB_vertex_program */ - -/* -------------------------- GL_ARB_vertex_shader ------------------------- */ - -#ifndef GL_ARB_vertex_shader -#define GL_ARB_vertex_shader 1 - -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D -#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 -#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A - -typedef void (GLAPIENTRY * PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB* name); -typedef void (GLAPIENTRY * PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei* length, GLint *size, GLenum *type, GLcharARB *name); -typedef GLint (GLAPIENTRY * PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB* name); - -#define glBindAttribLocationARB GLEW_GET_FUN(__glewBindAttribLocationARB) -#define glGetActiveAttribARB GLEW_GET_FUN(__glewGetActiveAttribARB) -#define glGetAttribLocationARB GLEW_GET_FUN(__glewGetAttribLocationARB) - -#define GLEW_ARB_vertex_shader GLEW_GET_VAR(__GLEW_ARB_vertex_shader) - -#endif /* GL_ARB_vertex_shader */ - -/* ------------------- GL_ARB_vertex_type_10f_11f_11f_rev ------------------ */ - -#ifndef GL_ARB_vertex_type_10f_11f_11f_rev -#define GL_ARB_vertex_type_10f_11f_11f_rev 1 - -#define GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B - -#define GLEW_ARB_vertex_type_10f_11f_11f_rev GLEW_GET_VAR(__GLEW_ARB_vertex_type_10f_11f_11f_rev) - -#endif /* GL_ARB_vertex_type_10f_11f_11f_rev */ - -/* ------------------- GL_ARB_vertex_type_2_10_10_10_rev ------------------- */ - -#ifndef GL_ARB_vertex_type_2_10_10_10_rev -#define GL_ARB_vertex_type_2_10_10_10_rev 1 - -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_INT_2_10_10_10_REV 0x8D9F - -typedef void (GLAPIENTRY * PFNGLCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (GLAPIENTRY * PFNGLCOLORP3UIVPROC) (GLenum type, const GLuint* color); -typedef void (GLAPIENTRY * PFNGLCOLORP4UIPROC) (GLenum type, GLuint color); -typedef void (GLAPIENTRY * PFNGLCOLORP4UIVPROC) (GLenum type, const GLuint* color); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP1UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP1UIVPROC) (GLenum texture, GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP2UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP2UIVPROC) (GLenum texture, GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP3UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP3UIVPROC) (GLenum texture, GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP4UIPROC) (GLenum texture, GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDP4UIVPROC) (GLenum texture, GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLNORMALP3UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLNORMALP3UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORP3UIPROC) (GLenum type, GLuint color); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORP3UIVPROC) (GLenum type, const GLuint* color); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP1UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP1UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP2UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP2UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP3UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP3UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP4UIPROC) (GLenum type, GLuint coords); -typedef void (GLAPIENTRY * PFNGLTEXCOORDP4UIVPROC) (GLenum type, const GLuint* coords); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP1UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP1UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP2UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP2UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP3UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP3UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP4UIPROC) (GLuint index, GLenum type, GLboolean normalized, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBP4UIVPROC) (GLuint index, GLenum type, GLboolean normalized, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXP2UIPROC) (GLenum type, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXP2UIVPROC) (GLenum type, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXP3UIPROC) (GLenum type, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXP3UIVPROC) (GLenum type, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLVERTEXP4UIPROC) (GLenum type, GLuint value); -typedef void (GLAPIENTRY * PFNGLVERTEXP4UIVPROC) (GLenum type, const GLuint* value); - -#define glColorP3ui GLEW_GET_FUN(__glewColorP3ui) -#define glColorP3uiv GLEW_GET_FUN(__glewColorP3uiv) -#define glColorP4ui GLEW_GET_FUN(__glewColorP4ui) -#define glColorP4uiv GLEW_GET_FUN(__glewColorP4uiv) -#define glMultiTexCoordP1ui GLEW_GET_FUN(__glewMultiTexCoordP1ui) -#define glMultiTexCoordP1uiv GLEW_GET_FUN(__glewMultiTexCoordP1uiv) -#define glMultiTexCoordP2ui GLEW_GET_FUN(__glewMultiTexCoordP2ui) -#define glMultiTexCoordP2uiv GLEW_GET_FUN(__glewMultiTexCoordP2uiv) -#define glMultiTexCoordP3ui GLEW_GET_FUN(__glewMultiTexCoordP3ui) -#define glMultiTexCoordP3uiv GLEW_GET_FUN(__glewMultiTexCoordP3uiv) -#define glMultiTexCoordP4ui GLEW_GET_FUN(__glewMultiTexCoordP4ui) -#define glMultiTexCoordP4uiv GLEW_GET_FUN(__glewMultiTexCoordP4uiv) -#define glNormalP3ui GLEW_GET_FUN(__glewNormalP3ui) -#define glNormalP3uiv GLEW_GET_FUN(__glewNormalP3uiv) -#define glSecondaryColorP3ui GLEW_GET_FUN(__glewSecondaryColorP3ui) -#define glSecondaryColorP3uiv GLEW_GET_FUN(__glewSecondaryColorP3uiv) -#define glTexCoordP1ui GLEW_GET_FUN(__glewTexCoordP1ui) -#define glTexCoordP1uiv GLEW_GET_FUN(__glewTexCoordP1uiv) -#define glTexCoordP2ui GLEW_GET_FUN(__glewTexCoordP2ui) -#define glTexCoordP2uiv GLEW_GET_FUN(__glewTexCoordP2uiv) -#define glTexCoordP3ui GLEW_GET_FUN(__glewTexCoordP3ui) -#define glTexCoordP3uiv GLEW_GET_FUN(__glewTexCoordP3uiv) -#define glTexCoordP4ui GLEW_GET_FUN(__glewTexCoordP4ui) -#define glTexCoordP4uiv GLEW_GET_FUN(__glewTexCoordP4uiv) -#define glVertexAttribP1ui GLEW_GET_FUN(__glewVertexAttribP1ui) -#define glVertexAttribP1uiv GLEW_GET_FUN(__glewVertexAttribP1uiv) -#define glVertexAttribP2ui GLEW_GET_FUN(__glewVertexAttribP2ui) -#define glVertexAttribP2uiv GLEW_GET_FUN(__glewVertexAttribP2uiv) -#define glVertexAttribP3ui GLEW_GET_FUN(__glewVertexAttribP3ui) -#define glVertexAttribP3uiv GLEW_GET_FUN(__glewVertexAttribP3uiv) -#define glVertexAttribP4ui GLEW_GET_FUN(__glewVertexAttribP4ui) -#define glVertexAttribP4uiv GLEW_GET_FUN(__glewVertexAttribP4uiv) -#define glVertexP2ui GLEW_GET_FUN(__glewVertexP2ui) -#define glVertexP2uiv GLEW_GET_FUN(__glewVertexP2uiv) -#define glVertexP3ui GLEW_GET_FUN(__glewVertexP3ui) -#define glVertexP3uiv GLEW_GET_FUN(__glewVertexP3uiv) -#define glVertexP4ui GLEW_GET_FUN(__glewVertexP4ui) -#define glVertexP4uiv GLEW_GET_FUN(__glewVertexP4uiv) - -#define GLEW_ARB_vertex_type_2_10_10_10_rev GLEW_GET_VAR(__GLEW_ARB_vertex_type_2_10_10_10_rev) - -#endif /* GL_ARB_vertex_type_2_10_10_10_rev */ - -/* ------------------------- GL_ARB_viewport_array ------------------------- */ - -#ifndef GL_ARB_viewport_array -#define GL_ARB_viewport_array 1 - -#define GL_DEPTH_RANGE 0x0B70 -#define GL_VIEWPORT 0x0BA2 -#define GL_SCISSOR_BOX 0x0C10 -#define GL_SCISSOR_TEST 0x0C11 -#define GL_MAX_VIEWPORTS 0x825B -#define GL_VIEWPORT_SUBPIXEL_BITS 0x825C -#define GL_VIEWPORT_BOUNDS_RANGE 0x825D -#define GL_LAYER_PROVOKING_VERTEX 0x825E -#define GL_VIEWPORT_INDEX_PROVOKING_VERTEX 0x825F -#define GL_UNDEFINED_VERTEX 0x8260 -#define GL_FIRST_VERTEX_CONVENTION 0x8E4D -#define GL_LAST_VERTEX_CONVENTION 0x8E4E -#define GL_PROVOKING_VERTEX 0x8E4F - -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEARRAYVPROC) (GLuint first, GLsizei count, const GLclampd * v); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEINDEXEDPROC) (GLuint index, GLclampd n, GLclampd f); -typedef void (GLAPIENTRY * PFNGLGETDOUBLEI_VPROC) (GLenum target, GLuint index, GLdouble* data); -typedef void (GLAPIENTRY * PFNGLGETFLOATI_VPROC) (GLenum target, GLuint index, GLfloat* data); -typedef void (GLAPIENTRY * PFNGLSCISSORARRAYVPROC) (GLuint first, GLsizei count, const GLint * v); -typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDPROC) (GLuint index, GLint left, GLint bottom, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLSCISSORINDEXEDVPROC) (GLuint index, const GLint * v); -typedef void (GLAPIENTRY * PFNGLVIEWPORTARRAYVPROC) (GLuint first, GLsizei count, const GLfloat * v); -typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); -typedef void (GLAPIENTRY * PFNGLVIEWPORTINDEXEDFVPROC) (GLuint index, const GLfloat * v); - -#define glDepthRangeArrayv GLEW_GET_FUN(__glewDepthRangeArrayv) -#define glDepthRangeIndexed GLEW_GET_FUN(__glewDepthRangeIndexed) -#define glGetDoublei_v GLEW_GET_FUN(__glewGetDoublei_v) -#define glGetFloati_v GLEW_GET_FUN(__glewGetFloati_v) -#define glScissorArrayv GLEW_GET_FUN(__glewScissorArrayv) -#define glScissorIndexed GLEW_GET_FUN(__glewScissorIndexed) -#define glScissorIndexedv GLEW_GET_FUN(__glewScissorIndexedv) -#define glViewportArrayv GLEW_GET_FUN(__glewViewportArrayv) -#define glViewportIndexedf GLEW_GET_FUN(__glewViewportIndexedf) -#define glViewportIndexedfv GLEW_GET_FUN(__glewViewportIndexedfv) - -#define GLEW_ARB_viewport_array GLEW_GET_VAR(__GLEW_ARB_viewport_array) - -#endif /* GL_ARB_viewport_array */ - -/* --------------------------- GL_ARB_window_pos --------------------------- */ - -#ifndef GL_ARB_window_pos -#define GL_ARB_window_pos 1 - -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVARBPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVARBPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVARBPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVARBPROC) (const GLshort* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVARBPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVARBPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVARBPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVARBPROC) (const GLshort* p); - -#define glWindowPos2dARB GLEW_GET_FUN(__glewWindowPos2dARB) -#define glWindowPos2dvARB GLEW_GET_FUN(__glewWindowPos2dvARB) -#define glWindowPos2fARB GLEW_GET_FUN(__glewWindowPos2fARB) -#define glWindowPos2fvARB GLEW_GET_FUN(__glewWindowPos2fvARB) -#define glWindowPos2iARB GLEW_GET_FUN(__glewWindowPos2iARB) -#define glWindowPos2ivARB GLEW_GET_FUN(__glewWindowPos2ivARB) -#define glWindowPos2sARB GLEW_GET_FUN(__glewWindowPos2sARB) -#define glWindowPos2svARB GLEW_GET_FUN(__glewWindowPos2svARB) -#define glWindowPos3dARB GLEW_GET_FUN(__glewWindowPos3dARB) -#define glWindowPos3dvARB GLEW_GET_FUN(__glewWindowPos3dvARB) -#define glWindowPos3fARB GLEW_GET_FUN(__glewWindowPos3fARB) -#define glWindowPos3fvARB GLEW_GET_FUN(__glewWindowPos3fvARB) -#define glWindowPos3iARB GLEW_GET_FUN(__glewWindowPos3iARB) -#define glWindowPos3ivARB GLEW_GET_FUN(__glewWindowPos3ivARB) -#define glWindowPos3sARB GLEW_GET_FUN(__glewWindowPos3sARB) -#define glWindowPos3svARB GLEW_GET_FUN(__glewWindowPos3svARB) - -#define GLEW_ARB_window_pos GLEW_GET_VAR(__GLEW_ARB_window_pos) - -#endif /* GL_ARB_window_pos */ - -/* ------------------------- GL_ATIX_point_sprites ------------------------- */ - -#ifndef GL_ATIX_point_sprites -#define GL_ATIX_point_sprites 1 - -#define GL_TEXTURE_POINT_MODE_ATIX 0x60B0 -#define GL_TEXTURE_POINT_ONE_COORD_ATIX 0x60B1 -#define GL_TEXTURE_POINT_SPRITE_ATIX 0x60B2 -#define GL_POINT_SPRITE_CULL_MODE_ATIX 0x60B3 -#define GL_POINT_SPRITE_CULL_CENTER_ATIX 0x60B4 -#define GL_POINT_SPRITE_CULL_CLIP_ATIX 0x60B5 - -#define GLEW_ATIX_point_sprites GLEW_GET_VAR(__GLEW_ATIX_point_sprites) - -#endif /* GL_ATIX_point_sprites */ - -/* ---------------------- GL_ATIX_texture_env_combine3 --------------------- */ - -#ifndef GL_ATIX_texture_env_combine3 -#define GL_ATIX_texture_env_combine3 1 - -#define GL_MODULATE_ADD_ATIX 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATIX 0x8745 -#define GL_MODULATE_SUBTRACT_ATIX 0x8746 - -#define GLEW_ATIX_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATIX_texture_env_combine3) - -#endif /* GL_ATIX_texture_env_combine3 */ - -/* ----------------------- GL_ATIX_texture_env_route ----------------------- */ - -#ifndef GL_ATIX_texture_env_route -#define GL_ATIX_texture_env_route 1 - -#define GL_SECONDARY_COLOR_ATIX 0x8747 -#define GL_TEXTURE_OUTPUT_RGB_ATIX 0x8748 -#define GL_TEXTURE_OUTPUT_ALPHA_ATIX 0x8749 - -#define GLEW_ATIX_texture_env_route GLEW_GET_VAR(__GLEW_ATIX_texture_env_route) - -#endif /* GL_ATIX_texture_env_route */ - -/* ---------------- GL_ATIX_vertex_shader_output_point_size ---------------- */ - -#ifndef GL_ATIX_vertex_shader_output_point_size -#define GL_ATIX_vertex_shader_output_point_size 1 - -#define GL_OUTPUT_POINT_SIZE_ATIX 0x610E - -#define GLEW_ATIX_vertex_shader_output_point_size GLEW_GET_VAR(__GLEW_ATIX_vertex_shader_output_point_size) - -#endif /* GL_ATIX_vertex_shader_output_point_size */ - -/* -------------------------- GL_ATI_draw_buffers -------------------------- */ - -#ifndef GL_ATI_draw_buffers -#define GL_ATI_draw_buffers 1 - -#define GL_MAX_DRAW_BUFFERS_ATI 0x8824 -#define GL_DRAW_BUFFER0_ATI 0x8825 -#define GL_DRAW_BUFFER1_ATI 0x8826 -#define GL_DRAW_BUFFER2_ATI 0x8827 -#define GL_DRAW_BUFFER3_ATI 0x8828 -#define GL_DRAW_BUFFER4_ATI 0x8829 -#define GL_DRAW_BUFFER5_ATI 0x882A -#define GL_DRAW_BUFFER6_ATI 0x882B -#define GL_DRAW_BUFFER7_ATI 0x882C -#define GL_DRAW_BUFFER8_ATI 0x882D -#define GL_DRAW_BUFFER9_ATI 0x882E -#define GL_DRAW_BUFFER10_ATI 0x882F -#define GL_DRAW_BUFFER11_ATI 0x8830 -#define GL_DRAW_BUFFER12_ATI 0x8831 -#define GL_DRAW_BUFFER13_ATI 0x8832 -#define GL_DRAW_BUFFER14_ATI 0x8833 -#define GL_DRAW_BUFFER15_ATI 0x8834 - -typedef void (GLAPIENTRY * PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum* bufs); - -#define glDrawBuffersATI GLEW_GET_FUN(__glewDrawBuffersATI) - -#define GLEW_ATI_draw_buffers GLEW_GET_VAR(__GLEW_ATI_draw_buffers) - -#endif /* GL_ATI_draw_buffers */ - -/* -------------------------- GL_ATI_element_array ------------------------- */ - -#ifndef GL_ATI_element_array -#define GL_ATI_element_array 1 - -#define GL_ELEMENT_ARRAY_ATI 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A - -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count); -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count); -typedef void (GLAPIENTRY * PFNGLELEMENTPOINTERATIPROC) (GLenum type, const void *pointer); - -#define glDrawElementArrayATI GLEW_GET_FUN(__glewDrawElementArrayATI) -#define glDrawRangeElementArrayATI GLEW_GET_FUN(__glewDrawRangeElementArrayATI) -#define glElementPointerATI GLEW_GET_FUN(__glewElementPointerATI) - -#define GLEW_ATI_element_array GLEW_GET_VAR(__GLEW_ATI_element_array) - -#endif /* GL_ATI_element_array */ - -/* ------------------------- GL_ATI_envmap_bumpmap ------------------------- */ - -#ifndef GL_ATI_envmap_bumpmap -#define GL_ATI_envmap_bumpmap 1 - -#define GL_BUMP_ROT_MATRIX_ATI 0x8775 -#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 -#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 -#define GL_BUMP_TEX_UNITS_ATI 0x8778 -#define GL_DUDV_ATI 0x8779 -#define GL_DU8DV8_ATI 0x877A -#define GL_BUMP_ENVMAP_ATI 0x877B -#define GL_BUMP_TARGET_ATI 0x877C - -typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); -typedef void (GLAPIENTRY * PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); -typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); -typedef void (GLAPIENTRY * PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); - -#define glGetTexBumpParameterfvATI GLEW_GET_FUN(__glewGetTexBumpParameterfvATI) -#define glGetTexBumpParameterivATI GLEW_GET_FUN(__glewGetTexBumpParameterivATI) -#define glTexBumpParameterfvATI GLEW_GET_FUN(__glewTexBumpParameterfvATI) -#define glTexBumpParameterivATI GLEW_GET_FUN(__glewTexBumpParameterivATI) - -#define GLEW_ATI_envmap_bumpmap GLEW_GET_VAR(__GLEW_ATI_envmap_bumpmap) - -#endif /* GL_ATI_envmap_bumpmap */ - -/* ------------------------- GL_ATI_fragment_shader ------------------------ */ - -#ifndef GL_ATI_fragment_shader -#define GL_ATI_fragment_shader 1 - -#define GL_2X_BIT_ATI 0x00000001 -#define GL_RED_BIT_ATI 0x00000001 -#define GL_4X_BIT_ATI 0x00000002 -#define GL_COMP_BIT_ATI 0x00000002 -#define GL_GREEN_BIT_ATI 0x00000002 -#define GL_8X_BIT_ATI 0x00000004 -#define GL_BLUE_BIT_ATI 0x00000004 -#define GL_NEGATE_BIT_ATI 0x00000004 -#define GL_BIAS_BIT_ATI 0x00000008 -#define GL_HALF_BIT_ATI 0x00000008 -#define GL_QUARTER_BIT_ATI 0x00000010 -#define GL_EIGHTH_BIT_ATI 0x00000020 -#define GL_SATURATE_BIT_ATI 0x00000040 -#define GL_FRAGMENT_SHADER_ATI 0x8920 -#define GL_REG_0_ATI 0x8921 -#define GL_REG_1_ATI 0x8922 -#define GL_REG_2_ATI 0x8923 -#define GL_REG_3_ATI 0x8924 -#define GL_REG_4_ATI 0x8925 -#define GL_REG_5_ATI 0x8926 -#define GL_CON_0_ATI 0x8941 -#define GL_CON_1_ATI 0x8942 -#define GL_CON_2_ATI 0x8943 -#define GL_CON_3_ATI 0x8944 -#define GL_CON_4_ATI 0x8945 -#define GL_CON_5_ATI 0x8946 -#define GL_CON_6_ATI 0x8947 -#define GL_CON_7_ATI 0x8948 -#define GL_MOV_ATI 0x8961 -#define GL_ADD_ATI 0x8963 -#define GL_MUL_ATI 0x8964 -#define GL_SUB_ATI 0x8965 -#define GL_DOT3_ATI 0x8966 -#define GL_DOT4_ATI 0x8967 -#define GL_MAD_ATI 0x8968 -#define GL_LERP_ATI 0x8969 -#define GL_CND_ATI 0x896A -#define GL_CND0_ATI 0x896B -#define GL_DOT2_ADD_ATI 0x896C -#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D -#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E -#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F -#define GL_NUM_PASSES_ATI 0x8970 -#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971 -#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972 -#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973 -#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974 -#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 -#define GL_SWIZZLE_STR_ATI 0x8976 -#define GL_SWIZZLE_STQ_ATI 0x8977 -#define GL_SWIZZLE_STR_DR_ATI 0x8978 -#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 -#define GL_SWIZZLE_STRQ_ATI 0x897A -#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B - -typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (GLAPIENTRY * PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (GLAPIENTRY * PFNGLBEGINFRAGMENTSHADERATIPROC) (void); -typedef void (GLAPIENTRY * PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (GLAPIENTRY * PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (GLAPIENTRY * PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLENDFRAGMENTSHADERATIPROC) (void); -typedef GLuint (GLAPIENTRY * PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range); -typedef void (GLAPIENTRY * PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle); -typedef void (GLAPIENTRY * PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle); -typedef void (GLAPIENTRY * PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat* value); - -#define glAlphaFragmentOp1ATI GLEW_GET_FUN(__glewAlphaFragmentOp1ATI) -#define glAlphaFragmentOp2ATI GLEW_GET_FUN(__glewAlphaFragmentOp2ATI) -#define glAlphaFragmentOp3ATI GLEW_GET_FUN(__glewAlphaFragmentOp3ATI) -#define glBeginFragmentShaderATI GLEW_GET_FUN(__glewBeginFragmentShaderATI) -#define glBindFragmentShaderATI GLEW_GET_FUN(__glewBindFragmentShaderATI) -#define glColorFragmentOp1ATI GLEW_GET_FUN(__glewColorFragmentOp1ATI) -#define glColorFragmentOp2ATI GLEW_GET_FUN(__glewColorFragmentOp2ATI) -#define glColorFragmentOp3ATI GLEW_GET_FUN(__glewColorFragmentOp3ATI) -#define glDeleteFragmentShaderATI GLEW_GET_FUN(__glewDeleteFragmentShaderATI) -#define glEndFragmentShaderATI GLEW_GET_FUN(__glewEndFragmentShaderATI) -#define glGenFragmentShadersATI GLEW_GET_FUN(__glewGenFragmentShadersATI) -#define glPassTexCoordATI GLEW_GET_FUN(__glewPassTexCoordATI) -#define glSampleMapATI GLEW_GET_FUN(__glewSampleMapATI) -#define glSetFragmentShaderConstantATI GLEW_GET_FUN(__glewSetFragmentShaderConstantATI) - -#define GLEW_ATI_fragment_shader GLEW_GET_VAR(__GLEW_ATI_fragment_shader) - -#endif /* GL_ATI_fragment_shader */ - -/* ------------------------ GL_ATI_map_object_buffer ----------------------- */ - -#ifndef GL_ATI_map_object_buffer -#define GL_ATI_map_object_buffer 1 - -typedef void * (GLAPIENTRY * PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer); - -#define glMapObjectBufferATI GLEW_GET_FUN(__glewMapObjectBufferATI) -#define glUnmapObjectBufferATI GLEW_GET_FUN(__glewUnmapObjectBufferATI) - -#define GLEW_ATI_map_object_buffer GLEW_GET_VAR(__GLEW_ATI_map_object_buffer) - -#endif /* GL_ATI_map_object_buffer */ - -/* ----------------------------- GL_ATI_meminfo ---------------------------- */ - -#ifndef GL_ATI_meminfo -#define GL_ATI_meminfo 1 - -#define GL_VBO_FREE_MEMORY_ATI 0x87FB -#define GL_TEXTURE_FREE_MEMORY_ATI 0x87FC -#define GL_RENDERBUFFER_FREE_MEMORY_ATI 0x87FD - -#define GLEW_ATI_meminfo GLEW_GET_VAR(__GLEW_ATI_meminfo) - -#endif /* GL_ATI_meminfo */ - -/* -------------------------- GL_ATI_pn_triangles -------------------------- */ - -#ifndef GL_ATI_pn_triangles -#define GL_ATI_pn_triangles 1 - -#define GL_PN_TRIANGLES_ATI 0x87F0 -#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 -#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 -#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 -#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4 -#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5 -#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6 -#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 -#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8 - -typedef void (GLAPIENTRY * PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param); - -#define glPNTrianglesfATI GLEW_GET_FUN(__glewPNTrianglesfATI) -#define glPNTrianglesiATI GLEW_GET_FUN(__glewPNTrianglesiATI) - -#define GLEW_ATI_pn_triangles GLEW_GET_VAR(__GLEW_ATI_pn_triangles) - -#endif /* GL_ATI_pn_triangles */ - -/* ------------------------ GL_ATI_separate_stencil ------------------------ */ - -#ifndef GL_ATI_separate_stencil -#define GL_ATI_separate_stencil 1 - -#define GL_STENCIL_BACK_FUNC_ATI 0x8800 -#define GL_STENCIL_BACK_FAIL_ATI 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 - -typedef void (GLAPIENTRY * PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); - -#define glStencilFuncSeparateATI GLEW_GET_FUN(__glewStencilFuncSeparateATI) -#define glStencilOpSeparateATI GLEW_GET_FUN(__glewStencilOpSeparateATI) - -#define GLEW_ATI_separate_stencil GLEW_GET_VAR(__GLEW_ATI_separate_stencil) - -#endif /* GL_ATI_separate_stencil */ - -/* ----------------------- GL_ATI_shader_texture_lod ----------------------- */ - -#ifndef GL_ATI_shader_texture_lod -#define GL_ATI_shader_texture_lod 1 - -#define GLEW_ATI_shader_texture_lod GLEW_GET_VAR(__GLEW_ATI_shader_texture_lod) - -#endif /* GL_ATI_shader_texture_lod */ - -/* ---------------------- GL_ATI_text_fragment_shader ---------------------- */ - -#ifndef GL_ATI_text_fragment_shader -#define GL_ATI_text_fragment_shader 1 - -#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 - -#define GLEW_ATI_text_fragment_shader GLEW_GET_VAR(__GLEW_ATI_text_fragment_shader) - -#endif /* GL_ATI_text_fragment_shader */ - -/* --------------------- GL_ATI_texture_compression_3dc -------------------- */ - -#ifndef GL_ATI_texture_compression_3dc -#define GL_ATI_texture_compression_3dc 1 - -#define GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI 0x8837 - -#define GLEW_ATI_texture_compression_3dc GLEW_GET_VAR(__GLEW_ATI_texture_compression_3dc) - -#endif /* GL_ATI_texture_compression_3dc */ - -/* ---------------------- GL_ATI_texture_env_combine3 ---------------------- */ - -#ifndef GL_ATI_texture_env_combine3 -#define GL_ATI_texture_env_combine3 1 - -#define GL_MODULATE_ADD_ATI 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 -#define GL_MODULATE_SUBTRACT_ATI 0x8746 - -#define GLEW_ATI_texture_env_combine3 GLEW_GET_VAR(__GLEW_ATI_texture_env_combine3) - -#endif /* GL_ATI_texture_env_combine3 */ - -/* -------------------------- GL_ATI_texture_float ------------------------- */ - -#ifndef GL_ATI_texture_float -#define GL_ATI_texture_float 1 - -#define GL_RGBA_FLOAT32_ATI 0x8814 -#define GL_RGB_FLOAT32_ATI 0x8815 -#define GL_ALPHA_FLOAT32_ATI 0x8816 -#define GL_INTENSITY_FLOAT32_ATI 0x8817 -#define GL_LUMINANCE_FLOAT32_ATI 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819 -#define GL_RGBA_FLOAT16_ATI 0x881A -#define GL_RGB_FLOAT16_ATI 0x881B -#define GL_ALPHA_FLOAT16_ATI 0x881C -#define GL_INTENSITY_FLOAT16_ATI 0x881D -#define GL_LUMINANCE_FLOAT16_ATI 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F - -#define GLEW_ATI_texture_float GLEW_GET_VAR(__GLEW_ATI_texture_float) - -#endif /* GL_ATI_texture_float */ - -/* ----------------------- GL_ATI_texture_mirror_once ---------------------- */ - -#ifndef GL_ATI_texture_mirror_once -#define GL_ATI_texture_mirror_once 1 - -#define GL_MIRROR_CLAMP_ATI 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 - -#define GLEW_ATI_texture_mirror_once GLEW_GET_VAR(__GLEW_ATI_texture_mirror_once) - -#endif /* GL_ATI_texture_mirror_once */ - -/* ----------------------- GL_ATI_vertex_array_object ---------------------- */ - -#ifndef GL_ATI_vertex_array_object -#define GL_ATI_vertex_array_object 1 - -#define GL_STATIC_ATI 0x8760 -#define GL_DYNAMIC_ATI 0x8761 -#define GL_PRESERVE_ATI 0x8762 -#define GL_DISCARD_ATI 0x8763 -#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764 -#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765 -#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766 -#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767 - -typedef void (GLAPIENTRY * PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (GLAPIENTRY * PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer); -typedef GLuint (GLAPIENTRY * PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const void *pointer, GLenum usage); -typedef void (GLAPIENTRY * PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const void *pointer, GLenum preserve); -typedef void (GLAPIENTRY * PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); - -#define glArrayObjectATI GLEW_GET_FUN(__glewArrayObjectATI) -#define glFreeObjectBufferATI GLEW_GET_FUN(__glewFreeObjectBufferATI) -#define glGetArrayObjectfvATI GLEW_GET_FUN(__glewGetArrayObjectfvATI) -#define glGetArrayObjectivATI GLEW_GET_FUN(__glewGetArrayObjectivATI) -#define glGetObjectBufferfvATI GLEW_GET_FUN(__glewGetObjectBufferfvATI) -#define glGetObjectBufferivATI GLEW_GET_FUN(__glewGetObjectBufferivATI) -#define glGetVariantArrayObjectfvATI GLEW_GET_FUN(__glewGetVariantArrayObjectfvATI) -#define glGetVariantArrayObjectivATI GLEW_GET_FUN(__glewGetVariantArrayObjectivATI) -#define glIsObjectBufferATI GLEW_GET_FUN(__glewIsObjectBufferATI) -#define glNewObjectBufferATI GLEW_GET_FUN(__glewNewObjectBufferATI) -#define glUpdateObjectBufferATI GLEW_GET_FUN(__glewUpdateObjectBufferATI) -#define glVariantArrayObjectATI GLEW_GET_FUN(__glewVariantArrayObjectATI) - -#define GLEW_ATI_vertex_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_array_object) - -#endif /* GL_ATI_vertex_array_object */ - -/* ------------------- GL_ATI_vertex_attrib_array_object ------------------- */ - -#ifndef GL_ATI_vertex_attrib_array_object -#define GL_ATI_vertex_attrib_array_object 1 - -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); - -#define glGetVertexAttribArrayObjectfvATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectfvATI) -#define glGetVertexAttribArrayObjectivATI GLEW_GET_FUN(__glewGetVertexAttribArrayObjectivATI) -#define glVertexAttribArrayObjectATI GLEW_GET_FUN(__glewVertexAttribArrayObjectATI) - -#define GLEW_ATI_vertex_attrib_array_object GLEW_GET_VAR(__GLEW_ATI_vertex_attrib_array_object) - -#endif /* GL_ATI_vertex_attrib_array_object */ - -/* ------------------------- GL_ATI_vertex_streams ------------------------- */ - -#ifndef GL_ATI_vertex_streams -#define GL_ATI_vertex_streams 1 - -#define GL_MAX_VERTEX_STREAMS_ATI 0x876B -#define GL_VERTEX_SOURCE_ATI 0x876C -#define GL_VERTEX_STREAM0_ATI 0x876D -#define GL_VERTEX_STREAM1_ATI 0x876E -#define GL_VERTEX_STREAM2_ATI 0x876F -#define GL_VERTEX_STREAM3_ATI 0x8770 -#define GL_VERTEX_STREAM4_ATI 0x8771 -#define GL_VERTEX_STREAM5_ATI 0x8772 -#define GL_VERTEX_STREAM6_ATI 0x8773 -#define GL_VERTEX_STREAM7_ATI 0x8774 - -typedef void (GLAPIENTRY * PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte x, GLbyte y, GLbyte z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords); - -#define glClientActiveVertexStreamATI GLEW_GET_FUN(__glewClientActiveVertexStreamATI) -#define glNormalStream3bATI GLEW_GET_FUN(__glewNormalStream3bATI) -#define glNormalStream3bvATI GLEW_GET_FUN(__glewNormalStream3bvATI) -#define glNormalStream3dATI GLEW_GET_FUN(__glewNormalStream3dATI) -#define glNormalStream3dvATI GLEW_GET_FUN(__glewNormalStream3dvATI) -#define glNormalStream3fATI GLEW_GET_FUN(__glewNormalStream3fATI) -#define glNormalStream3fvATI GLEW_GET_FUN(__glewNormalStream3fvATI) -#define glNormalStream3iATI GLEW_GET_FUN(__glewNormalStream3iATI) -#define glNormalStream3ivATI GLEW_GET_FUN(__glewNormalStream3ivATI) -#define glNormalStream3sATI GLEW_GET_FUN(__glewNormalStream3sATI) -#define glNormalStream3svATI GLEW_GET_FUN(__glewNormalStream3svATI) -#define glVertexBlendEnvfATI GLEW_GET_FUN(__glewVertexBlendEnvfATI) -#define glVertexBlendEnviATI GLEW_GET_FUN(__glewVertexBlendEnviATI) -#define glVertexStream1dATI GLEW_GET_FUN(__glewVertexStream1dATI) -#define glVertexStream1dvATI GLEW_GET_FUN(__glewVertexStream1dvATI) -#define glVertexStream1fATI GLEW_GET_FUN(__glewVertexStream1fATI) -#define glVertexStream1fvATI GLEW_GET_FUN(__glewVertexStream1fvATI) -#define glVertexStream1iATI GLEW_GET_FUN(__glewVertexStream1iATI) -#define glVertexStream1ivATI GLEW_GET_FUN(__glewVertexStream1ivATI) -#define glVertexStream1sATI GLEW_GET_FUN(__glewVertexStream1sATI) -#define glVertexStream1svATI GLEW_GET_FUN(__glewVertexStream1svATI) -#define glVertexStream2dATI GLEW_GET_FUN(__glewVertexStream2dATI) -#define glVertexStream2dvATI GLEW_GET_FUN(__glewVertexStream2dvATI) -#define glVertexStream2fATI GLEW_GET_FUN(__glewVertexStream2fATI) -#define glVertexStream2fvATI GLEW_GET_FUN(__glewVertexStream2fvATI) -#define glVertexStream2iATI GLEW_GET_FUN(__glewVertexStream2iATI) -#define glVertexStream2ivATI GLEW_GET_FUN(__glewVertexStream2ivATI) -#define glVertexStream2sATI GLEW_GET_FUN(__glewVertexStream2sATI) -#define glVertexStream2svATI GLEW_GET_FUN(__glewVertexStream2svATI) -#define glVertexStream3dATI GLEW_GET_FUN(__glewVertexStream3dATI) -#define glVertexStream3dvATI GLEW_GET_FUN(__glewVertexStream3dvATI) -#define glVertexStream3fATI GLEW_GET_FUN(__glewVertexStream3fATI) -#define glVertexStream3fvATI GLEW_GET_FUN(__glewVertexStream3fvATI) -#define glVertexStream3iATI GLEW_GET_FUN(__glewVertexStream3iATI) -#define glVertexStream3ivATI GLEW_GET_FUN(__glewVertexStream3ivATI) -#define glVertexStream3sATI GLEW_GET_FUN(__glewVertexStream3sATI) -#define glVertexStream3svATI GLEW_GET_FUN(__glewVertexStream3svATI) -#define glVertexStream4dATI GLEW_GET_FUN(__glewVertexStream4dATI) -#define glVertexStream4dvATI GLEW_GET_FUN(__glewVertexStream4dvATI) -#define glVertexStream4fATI GLEW_GET_FUN(__glewVertexStream4fATI) -#define glVertexStream4fvATI GLEW_GET_FUN(__glewVertexStream4fvATI) -#define glVertexStream4iATI GLEW_GET_FUN(__glewVertexStream4iATI) -#define glVertexStream4ivATI GLEW_GET_FUN(__glewVertexStream4ivATI) -#define glVertexStream4sATI GLEW_GET_FUN(__glewVertexStream4sATI) -#define glVertexStream4svATI GLEW_GET_FUN(__glewVertexStream4svATI) - -#define GLEW_ATI_vertex_streams GLEW_GET_VAR(__GLEW_ATI_vertex_streams) - -#endif /* GL_ATI_vertex_streams */ - -/* ---------------- GL_EGL_NV_robustness_video_memory_purge ---------------- */ - -#ifndef GL_EGL_NV_robustness_video_memory_purge -#define GL_EGL_NV_robustness_video_memory_purge 1 - -#define GL_EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C -#define GL_PURGED_CONTEXT_RESET_NV 0x92BB - -#define GLEW_EGL_NV_robustness_video_memory_purge GLEW_GET_VAR(__GLEW_EGL_NV_robustness_video_memory_purge) - -#endif /* GL_EGL_NV_robustness_video_memory_purge */ - -/* --------------------------- GL_EXT_422_pixels --------------------------- */ - -#ifndef GL_EXT_422_pixels -#define GL_EXT_422_pixels 1 - -#define GL_422_EXT 0x80CC -#define GL_422_REV_EXT 0x80CD -#define GL_422_AVERAGE_EXT 0x80CE -#define GL_422_REV_AVERAGE_EXT 0x80CF - -#define GLEW_EXT_422_pixels GLEW_GET_VAR(__GLEW_EXT_422_pixels) - -#endif /* GL_EXT_422_pixels */ - -/* ---------------------------- GL_EXT_Cg_shader --------------------------- */ - -#ifndef GL_EXT_Cg_shader -#define GL_EXT_Cg_shader 1 - -#define GL_CG_VERTEX_SHADER_EXT 0x890E -#define GL_CG_FRAGMENT_SHADER_EXT 0x890F - -#define GLEW_EXT_Cg_shader GLEW_GET_VAR(__GLEW_EXT_Cg_shader) - -#endif /* GL_EXT_Cg_shader */ - -/* ------------------------------ GL_EXT_abgr ------------------------------ */ - -#ifndef GL_EXT_abgr -#define GL_EXT_abgr 1 - -#define GL_ABGR_EXT 0x8000 - -#define GLEW_EXT_abgr GLEW_GET_VAR(__GLEW_EXT_abgr) - -#endif /* GL_EXT_abgr */ - -/* ------------------------------ GL_EXT_bgra ------------------------------ */ - -#ifndef GL_EXT_bgra -#define GL_EXT_bgra 1 - -#define GL_BGR_EXT 0x80E0 -#define GL_BGRA_EXT 0x80E1 - -#define GLEW_EXT_bgra GLEW_GET_VAR(__GLEW_EXT_bgra) - -#endif /* GL_EXT_bgra */ - -/* ------------------------ GL_EXT_bindable_uniform ------------------------ */ - -#ifndef GL_EXT_bindable_uniform -#define GL_EXT_bindable_uniform 1 - -#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 -#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3 -#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4 -#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT 0x8DED -#define GL_UNIFORM_BUFFER_EXT 0x8DEE -#define GL_UNIFORM_BUFFER_BINDING_EXT 0x8DEF - -typedef GLint (GLAPIENTRY * PFNGLGETUNIFORMBUFFERSIZEEXTPROC) (GLuint program, GLint location); -typedef GLintptr (GLAPIENTRY * PFNGLGETUNIFORMOFFSETEXTPROC) (GLuint program, GLint location); -typedef void (GLAPIENTRY * PFNGLUNIFORMBUFFEREXTPROC) (GLuint program, GLint location, GLuint buffer); - -#define glGetUniformBufferSizeEXT GLEW_GET_FUN(__glewGetUniformBufferSizeEXT) -#define glGetUniformOffsetEXT GLEW_GET_FUN(__glewGetUniformOffsetEXT) -#define glUniformBufferEXT GLEW_GET_FUN(__glewUniformBufferEXT) - -#define GLEW_EXT_bindable_uniform GLEW_GET_VAR(__GLEW_EXT_bindable_uniform) - -#endif /* GL_EXT_bindable_uniform */ - -/* --------------------------- GL_EXT_blend_color -------------------------- */ - -#ifndef GL_EXT_blend_color -#define GL_EXT_blend_color 1 - -#define GL_CONSTANT_COLOR_EXT 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 -#define GL_CONSTANT_ALPHA_EXT 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 -#define GL_BLEND_COLOR_EXT 0x8005 - -typedef void (GLAPIENTRY * PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); - -#define glBlendColorEXT GLEW_GET_FUN(__glewBlendColorEXT) - -#define GLEW_EXT_blend_color GLEW_GET_VAR(__GLEW_EXT_blend_color) - -#endif /* GL_EXT_blend_color */ - -/* --------------------- GL_EXT_blend_equation_separate -------------------- */ - -#ifndef GL_EXT_blend_equation_separate -#define GL_EXT_blend_equation_separate 1 - -#define GL_BLEND_EQUATION_RGB_EXT 0x8009 -#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha); - -#define glBlendEquationSeparateEXT GLEW_GET_FUN(__glewBlendEquationSeparateEXT) - -#define GLEW_EXT_blend_equation_separate GLEW_GET_VAR(__GLEW_EXT_blend_equation_separate) - -#endif /* GL_EXT_blend_equation_separate */ - -/* ----------------------- GL_EXT_blend_func_separate ---------------------- */ - -#ifndef GL_EXT_blend_func_separate -#define GL_EXT_blend_func_separate 1 - -#define GL_BLEND_DST_RGB_EXT 0x80C8 -#define GL_BLEND_SRC_RGB_EXT 0x80C9 -#define GL_BLEND_DST_ALPHA_EXT 0x80CA -#define GL_BLEND_SRC_ALPHA_EXT 0x80CB - -typedef void (GLAPIENTRY * PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); - -#define glBlendFuncSeparateEXT GLEW_GET_FUN(__glewBlendFuncSeparateEXT) - -#define GLEW_EXT_blend_func_separate GLEW_GET_VAR(__GLEW_EXT_blend_func_separate) - -#endif /* GL_EXT_blend_func_separate */ - -/* ------------------------- GL_EXT_blend_logic_op ------------------------- */ - -#ifndef GL_EXT_blend_logic_op -#define GL_EXT_blend_logic_op 1 - -#define GLEW_EXT_blend_logic_op GLEW_GET_VAR(__GLEW_EXT_blend_logic_op) - -#endif /* GL_EXT_blend_logic_op */ - -/* -------------------------- GL_EXT_blend_minmax -------------------------- */ - -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 - -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#define GL_BLEND_EQUATION_EXT 0x8009 - -typedef void (GLAPIENTRY * PFNGLBLENDEQUATIONEXTPROC) (GLenum mode); - -#define glBlendEquationEXT GLEW_GET_FUN(__glewBlendEquationEXT) - -#define GLEW_EXT_blend_minmax GLEW_GET_VAR(__GLEW_EXT_blend_minmax) - -#endif /* GL_EXT_blend_minmax */ - -/* ------------------------- GL_EXT_blend_subtract ------------------------- */ - -#ifndef GL_EXT_blend_subtract -#define GL_EXT_blend_subtract 1 - -#define GL_FUNC_SUBTRACT_EXT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B - -#define GLEW_EXT_blend_subtract GLEW_GET_VAR(__GLEW_EXT_blend_subtract) - -#endif /* GL_EXT_blend_subtract */ - -/* ------------------------ GL_EXT_clip_volume_hint ------------------------ */ - -#ifndef GL_EXT_clip_volume_hint -#define GL_EXT_clip_volume_hint 1 - -#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 - -#define GLEW_EXT_clip_volume_hint GLEW_GET_VAR(__GLEW_EXT_clip_volume_hint) - -#endif /* GL_EXT_clip_volume_hint */ - -/* ------------------------------ GL_EXT_cmyka ----------------------------- */ - -#ifndef GL_EXT_cmyka -#define GL_EXT_cmyka 1 - -#define GL_CMYK_EXT 0x800C -#define GL_CMYKA_EXT 0x800D -#define GL_PACK_CMYK_HINT_EXT 0x800E -#define GL_UNPACK_CMYK_HINT_EXT 0x800F - -#define GLEW_EXT_cmyka GLEW_GET_VAR(__GLEW_EXT_cmyka) - -#endif /* GL_EXT_cmyka */ - -/* ------------------------- GL_EXT_color_subtable ------------------------- */ - -#ifndef GL_EXT_color_subtable -#define GL_EXT_color_subtable 1 - -typedef void (GLAPIENTRY * PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); - -#define glColorSubTableEXT GLEW_GET_FUN(__glewColorSubTableEXT) -#define glCopyColorSubTableEXT GLEW_GET_FUN(__glewCopyColorSubTableEXT) - -#define GLEW_EXT_color_subtable GLEW_GET_VAR(__GLEW_EXT_color_subtable) - -#endif /* GL_EXT_color_subtable */ - -/* ---------------------- GL_EXT_compiled_vertex_array --------------------- */ - -#ifndef GL_EXT_compiled_vertex_array -#define GL_EXT_compiled_vertex_array 1 - -#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8 -#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9 - -typedef void (GLAPIENTRY * PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count); -typedef void (GLAPIENTRY * PFNGLUNLOCKARRAYSEXTPROC) (void); - -#define glLockArraysEXT GLEW_GET_FUN(__glewLockArraysEXT) -#define glUnlockArraysEXT GLEW_GET_FUN(__glewUnlockArraysEXT) - -#define GLEW_EXT_compiled_vertex_array GLEW_GET_VAR(__GLEW_EXT_compiled_vertex_array) - -#endif /* GL_EXT_compiled_vertex_array */ - -/* --------------------------- GL_EXT_convolution -------------------------- */ - -#ifndef GL_EXT_convolution -#define GL_EXT_convolution 1 - -#define GL_CONVOLUTION_1D_EXT 0x8010 -#define GL_CONVOLUTION_2D_EXT 0x8011 -#define GL_SEPARABLE_2D_EXT 0x8012 -#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 -#define GL_REDUCE_EXT 0x8016 -#define GL_CONVOLUTION_FORMAT_EXT 0x8017 -#define GL_CONVOLUTION_WIDTH_EXT 0x8018 -#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 - -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *image); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *image); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *image); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, void *row, void *column, void *span); -typedef void (GLAPIENTRY * PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *row, const void *column); - -#define glConvolutionFilter1DEXT GLEW_GET_FUN(__glewConvolutionFilter1DEXT) -#define glConvolutionFilter2DEXT GLEW_GET_FUN(__glewConvolutionFilter2DEXT) -#define glConvolutionParameterfEXT GLEW_GET_FUN(__glewConvolutionParameterfEXT) -#define glConvolutionParameterfvEXT GLEW_GET_FUN(__glewConvolutionParameterfvEXT) -#define glConvolutionParameteriEXT GLEW_GET_FUN(__glewConvolutionParameteriEXT) -#define glConvolutionParameterivEXT GLEW_GET_FUN(__glewConvolutionParameterivEXT) -#define glCopyConvolutionFilter1DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter1DEXT) -#define glCopyConvolutionFilter2DEXT GLEW_GET_FUN(__glewCopyConvolutionFilter2DEXT) -#define glGetConvolutionFilterEXT GLEW_GET_FUN(__glewGetConvolutionFilterEXT) -#define glGetConvolutionParameterfvEXT GLEW_GET_FUN(__glewGetConvolutionParameterfvEXT) -#define glGetConvolutionParameterivEXT GLEW_GET_FUN(__glewGetConvolutionParameterivEXT) -#define glGetSeparableFilterEXT GLEW_GET_FUN(__glewGetSeparableFilterEXT) -#define glSeparableFilter2DEXT GLEW_GET_FUN(__glewSeparableFilter2DEXT) - -#define GLEW_EXT_convolution GLEW_GET_VAR(__GLEW_EXT_convolution) - -#endif /* GL_EXT_convolution */ - -/* ------------------------ GL_EXT_coordinate_frame ------------------------ */ - -#ifndef GL_EXT_coordinate_frame -#define GL_EXT_coordinate_frame 1 - -#define GL_TANGENT_ARRAY_EXT 0x8439 -#define GL_BINORMAL_ARRAY_EXT 0x843A -#define GL_CURRENT_TANGENT_EXT 0x843B -#define GL_CURRENT_BINORMAL_EXT 0x843C -#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E -#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F -#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440 -#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441 -#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442 -#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443 -#define GL_MAP1_TANGENT_EXT 0x8444 -#define GL_MAP2_TANGENT_EXT 0x8445 -#define GL_MAP1_BINORMAL_EXT 0x8446 -#define GL_MAP2_BINORMAL_EXT 0x8447 - -typedef void (GLAPIENTRY * PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, void *pointer); -typedef void (GLAPIENTRY * PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, void *pointer); - -#define glBinormalPointerEXT GLEW_GET_FUN(__glewBinormalPointerEXT) -#define glTangentPointerEXT GLEW_GET_FUN(__glewTangentPointerEXT) - -#define GLEW_EXT_coordinate_frame GLEW_GET_VAR(__GLEW_EXT_coordinate_frame) - -#endif /* GL_EXT_coordinate_frame */ - -/* -------------------------- GL_EXT_copy_texture -------------------------- */ - -#ifndef GL_EXT_copy_texture -#define GL_EXT_copy_texture 1 - -typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); - -#define glCopyTexImage1DEXT GLEW_GET_FUN(__glewCopyTexImage1DEXT) -#define glCopyTexImage2DEXT GLEW_GET_FUN(__glewCopyTexImage2DEXT) -#define glCopyTexSubImage1DEXT GLEW_GET_FUN(__glewCopyTexSubImage1DEXT) -#define glCopyTexSubImage2DEXT GLEW_GET_FUN(__glewCopyTexSubImage2DEXT) -#define glCopyTexSubImage3DEXT GLEW_GET_FUN(__glewCopyTexSubImage3DEXT) - -#define GLEW_EXT_copy_texture GLEW_GET_VAR(__GLEW_EXT_copy_texture) - -#endif /* GL_EXT_copy_texture */ - -/* --------------------------- GL_EXT_cull_vertex -------------------------- */ - -#ifndef GL_EXT_cull_vertex -#define GL_EXT_cull_vertex 1 - -#define GL_CULL_VERTEX_EXT 0x81AA -#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB -#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC - -typedef void (GLAPIENTRY * PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat* params); - -#define glCullParameterdvEXT GLEW_GET_FUN(__glewCullParameterdvEXT) -#define glCullParameterfvEXT GLEW_GET_FUN(__glewCullParameterfvEXT) - -#define GLEW_EXT_cull_vertex GLEW_GET_VAR(__GLEW_EXT_cull_vertex) - -#endif /* GL_EXT_cull_vertex */ - -/* --------------------------- GL_EXT_debug_label -------------------------- */ - -#ifndef GL_EXT_debug_label -#define GL_EXT_debug_label 1 - -#define GL_PROGRAM_PIPELINE_OBJECT_EXT 0x8A4F -#define GL_PROGRAM_OBJECT_EXT 0x8B40 -#define GL_SHADER_OBJECT_EXT 0x8B48 -#define GL_BUFFER_OBJECT_EXT 0x9151 -#define GL_QUERY_OBJECT_EXT 0x9153 -#define GL_VERTEX_ARRAY_OBJECT_EXT 0x9154 - -typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELEXTPROC) (GLenum type, GLuint object, GLsizei bufSize, GLsizei* length, GLchar *label); -typedef void (GLAPIENTRY * PFNGLLABELOBJECTEXTPROC) (GLenum type, GLuint object, GLsizei length, const GLchar* label); - -#define glGetObjectLabelEXT GLEW_GET_FUN(__glewGetObjectLabelEXT) -#define glLabelObjectEXT GLEW_GET_FUN(__glewLabelObjectEXT) - -#define GLEW_EXT_debug_label GLEW_GET_VAR(__GLEW_EXT_debug_label) - -#endif /* GL_EXT_debug_label */ - -/* -------------------------- GL_EXT_debug_marker -------------------------- */ - -#ifndef GL_EXT_debug_marker -#define GL_EXT_debug_marker 1 - -typedef void (GLAPIENTRY * PFNGLINSERTEVENTMARKEREXTPROC) (GLsizei length, const GLchar* marker); -typedef void (GLAPIENTRY * PFNGLPOPGROUPMARKEREXTPROC) (void); -typedef void (GLAPIENTRY * PFNGLPUSHGROUPMARKEREXTPROC) (GLsizei length, const GLchar* marker); - -#define glInsertEventMarkerEXT GLEW_GET_FUN(__glewInsertEventMarkerEXT) -#define glPopGroupMarkerEXT GLEW_GET_FUN(__glewPopGroupMarkerEXT) -#define glPushGroupMarkerEXT GLEW_GET_FUN(__glewPushGroupMarkerEXT) - -#define GLEW_EXT_debug_marker GLEW_GET_VAR(__GLEW_EXT_debug_marker) - -#endif /* GL_EXT_debug_marker */ - -/* ------------------------ GL_EXT_depth_bounds_test ----------------------- */ - -#ifndef GL_EXT_depth_bounds_test -#define GL_EXT_depth_bounds_test 1 - -#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 -#define GL_DEPTH_BOUNDS_EXT 0x8891 - -typedef void (GLAPIENTRY * PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax); - -#define glDepthBoundsEXT GLEW_GET_FUN(__glewDepthBoundsEXT) - -#define GLEW_EXT_depth_bounds_test GLEW_GET_VAR(__GLEW_EXT_depth_bounds_test) - -#endif /* GL_EXT_depth_bounds_test */ - -/* ----------------------- GL_EXT_direct_state_access ---------------------- */ - -#ifndef GL_EXT_direct_state_access -#define GL_EXT_direct_state_access 1 - -#define GL_PROGRAM_MATRIX_EXT 0x8E2D -#define GL_TRANSPOSE_PROGRAM_MATRIX_EXT 0x8E2E -#define GL_PROGRAM_MATRIX_STACK_DEPTH_EXT 0x8E2F - -typedef void (GLAPIENTRY * PFNGLBINDMULTITEXTUREEXTPROC) (GLenum texunit, GLenum target, GLuint texture); -typedef GLenum (GLAPIENTRY * PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC) (GLuint framebuffer, GLenum target); -typedef void (GLAPIENTRY * PFNGLCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *data); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (GLAPIENTRY * PFNGLDISABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index); -typedef void (GLAPIENTRY * PFNGLDISABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array); -typedef void (GLAPIENTRY * PFNGLENABLECLIENTSTATEINDEXEDEXTPROC) (GLenum array, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLECLIENTSTATEIEXTPROC) (GLenum array, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYATTRIBEXTPROC) (GLuint vaobj, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEVERTEXARRAYEXTPROC) (GLuint vaobj, GLenum array); -typedef void (GLAPIENTRY * PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC) (GLuint framebuffer, GLsizei n, const GLenum* bufs); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERREADBUFFEREXTPROC) (GLuint framebuffer, GLenum mode); -typedef void (GLAPIENTRY * PFNGLGENERATEMULTITEXMIPMAPEXTPROC) (GLenum texunit, GLenum target); -typedef void (GLAPIENTRY * PFNGLGENERATETEXTUREMIPMAPEXTPROC) (GLuint texture, GLenum target); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, void *img); -typedef void (GLAPIENTRY * PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, void *img); -typedef void (GLAPIENTRY * PFNGLGETDOUBLEINDEXEDVEXTPROC) (GLenum target, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETDOUBLEI_VEXTPROC) (GLenum pname, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETFLOATINDEXEDVEXTPROC) (GLenum target, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFLOATI_VEXTPROC) (GLenum pname, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXIMAGEEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum format, GLenum type, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLint level, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC) (GLuint buffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPOINTERVEXTPROC) (GLuint buffer, GLenum pname, void** params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, void *data); -typedef void (GLAPIENTRY * PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum pname, void *string); -typedef void (GLAPIENTRY * PFNGLGETNAMEDPROGRAMIVEXTPROC) (GLuint program, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC) (GLuint renderbuffer, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETPOINTERINDEXEDVEXTPROC) (GLenum target, GLuint index, void** params); -typedef void (GLAPIENTRY * PFNGLGETPOINTERI_VEXTPROC) (GLenum pname, GLuint index, void** params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREIMAGEEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum format, GLenum type, void *pixels); -typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLint level, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYINTEGERVEXTPROC) (GLuint vaobj, GLenum pname, GLint* param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC) (GLuint vaobj, GLuint index, GLenum pname, void** param); -typedef void (GLAPIENTRY * PFNGLGETVERTEXARRAYPOINTERVEXTPROC) (GLuint vaobj, GLenum pname, void** param); -typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFEREXTPROC) (GLuint buffer, GLenum access); -typedef void * (GLAPIENTRY * PFNGLMAPNAMEDBUFFERRANGEEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length, GLbitfield access); -typedef void (GLAPIENTRY * PFNGLMATRIXFRUSTUMEXTPROC) (GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t, GLdouble n, GLdouble f); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADIDENTITYEXTPROC) (GLenum matrixMode); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSEDEXTPROC) (GLenum matrixMode, const GLdouble* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSEFEXTPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADDEXTPROC) (GLenum matrixMode, const GLdouble* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADFEXTPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSEDEXTPROC) (GLenum matrixMode, const GLdouble* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSEFEXTPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTDEXTPROC) (GLenum matrixMode, const GLdouble* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTFEXTPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXORTHOEXTPROC) (GLenum matrixMode, GLdouble l, GLdouble r, GLdouble b, GLdouble t, GLdouble n, GLdouble f); -typedef void (GLAPIENTRY * PFNGLMATRIXPOPEXTPROC) (GLenum matrixMode); -typedef void (GLAPIENTRY * PFNGLMATRIXPUSHEXTPROC) (GLenum matrixMode); -typedef void (GLAPIENTRY * PFNGLMATRIXROTATEDEXTPROC) (GLenum matrixMode, GLdouble angle, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLMATRIXROTATEFEXTPROC) (GLenum matrixMode, GLfloat angle, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLMATRIXSCALEDEXTPROC) (GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLMATRIXSCALEFEXTPROC) (GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLMATRIXTRANSLATEDEXTPROC) (GLenum matrixMode, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLMATRIXTRANSLATEFEXTPROC) (GLenum matrixMode, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLMULTITEXBUFFEREXTPROC) (GLenum texunit, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORDPOINTEREXTPROC) (GLenum texunit, GLint size, GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLMULTITEXENVFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLMULTITEXENVFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXENVIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLMULTITEXENVIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENDEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLdouble param); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENDVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENFEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENFVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENIEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLMULTITEXGENIVEXTPROC) (GLenum texunit, GLenum coord, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIUIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERFEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERFVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLfloat* param); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIEXTPROC) (GLenum texunit, GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLMULTITEXPARAMETERIVEXTPROC) (GLenum texunit, GLenum target, GLenum pname, const GLint* param); -typedef void (GLAPIENTRY * PFNGLMULTITEXRENDERBUFFEREXTPROC) (GLenum texunit, GLenum target, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE1DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE2DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLMULTITEXSUBIMAGE3DEXTPROC) (GLenum texunit, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLsizeiptr size, const void *data, GLenum usage); -typedef void (GLAPIENTRY * PFNGLNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); -typedef void (GLAPIENTRY * PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC) (GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC) (GLuint framebuffer, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC) (GLuint framebuffer, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLenum face); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC) (GLuint framebuffer, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC) (GLuint program, GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC) (GLuint program, GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC) (GLuint program, GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC) (GLuint program, GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC) (GLuint program, GLenum target, GLuint index, GLsizei count, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLNAMEDPROGRAMSTRINGEXTPROC) (GLuint program, GLenum target, GLenum format, GLsizei len, const void *string); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC) (GLuint renderbuffer, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC) (GLuint renderbuffer, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLuint renderbuffer, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FEXTPROC) (GLuint program, GLint location, GLfloat v0); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IEXTPROC) (GLuint program, GLint location, GLint v0); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIEXTPROC) (GLuint program, GLint location, GLuint v0); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FEXTPROC) (GLuint program, GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4FVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IEXTPROC) (GLuint program, GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4IVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIEXTPROC) (GLuint program, GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UIVEXTPROC) (GLuint program, GLint location, GLsizei count, const GLuint* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC) (GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC) (GLbitfield mask); -typedef void (GLAPIENTRY * PFNGLTEXTUREBUFFEREXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIUIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLuint* params); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERFVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLfloat* param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIEXTPROC) (GLuint texture, GLenum target, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLTEXTUREPARAMETERIVEXTPROC) (GLuint texture, GLenum target, GLenum pname, const GLint* param); -typedef void (GLAPIENTRY * PFNGLTEXTURERENDERBUFFEREXTPROC) (GLuint texture, GLenum target, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE1DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE2DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXTURESUBIMAGE3DEXTPROC) (GLuint texture, GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); -typedef GLboolean (GLAPIENTRY * PFNGLUNMAPNAMEDBUFFEREXTPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYINDEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum texunit, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYNORMALOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC) (GLuint vaobj, GLuint index, GLuint divisor); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLint size, GLenum type, GLsizei stride, GLintptr offset); - -#define glBindMultiTextureEXT GLEW_GET_FUN(__glewBindMultiTextureEXT) -#define glCheckNamedFramebufferStatusEXT GLEW_GET_FUN(__glewCheckNamedFramebufferStatusEXT) -#define glClientAttribDefaultEXT GLEW_GET_FUN(__glewClientAttribDefaultEXT) -#define glCompressedMultiTexImage1DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage1DEXT) -#define glCompressedMultiTexImage2DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage2DEXT) -#define glCompressedMultiTexImage3DEXT GLEW_GET_FUN(__glewCompressedMultiTexImage3DEXT) -#define glCompressedMultiTexSubImage1DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage1DEXT) -#define glCompressedMultiTexSubImage2DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage2DEXT) -#define glCompressedMultiTexSubImage3DEXT GLEW_GET_FUN(__glewCompressedMultiTexSubImage3DEXT) -#define glCompressedTextureImage1DEXT GLEW_GET_FUN(__glewCompressedTextureImage1DEXT) -#define glCompressedTextureImage2DEXT GLEW_GET_FUN(__glewCompressedTextureImage2DEXT) -#define glCompressedTextureImage3DEXT GLEW_GET_FUN(__glewCompressedTextureImage3DEXT) -#define glCompressedTextureSubImage1DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage1DEXT) -#define glCompressedTextureSubImage2DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage2DEXT) -#define glCompressedTextureSubImage3DEXT GLEW_GET_FUN(__glewCompressedTextureSubImage3DEXT) -#define glCopyMultiTexImage1DEXT GLEW_GET_FUN(__glewCopyMultiTexImage1DEXT) -#define glCopyMultiTexImage2DEXT GLEW_GET_FUN(__glewCopyMultiTexImage2DEXT) -#define glCopyMultiTexSubImage1DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage1DEXT) -#define glCopyMultiTexSubImage2DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage2DEXT) -#define glCopyMultiTexSubImage3DEXT GLEW_GET_FUN(__glewCopyMultiTexSubImage3DEXT) -#define glCopyTextureImage1DEXT GLEW_GET_FUN(__glewCopyTextureImage1DEXT) -#define glCopyTextureImage2DEXT GLEW_GET_FUN(__glewCopyTextureImage2DEXT) -#define glCopyTextureSubImage1DEXT GLEW_GET_FUN(__glewCopyTextureSubImage1DEXT) -#define glCopyTextureSubImage2DEXT GLEW_GET_FUN(__glewCopyTextureSubImage2DEXT) -#define glCopyTextureSubImage3DEXT GLEW_GET_FUN(__glewCopyTextureSubImage3DEXT) -#define glDisableClientStateIndexedEXT GLEW_GET_FUN(__glewDisableClientStateIndexedEXT) -#define glDisableClientStateiEXT GLEW_GET_FUN(__glewDisableClientStateiEXT) -#define glDisableVertexArrayAttribEXT GLEW_GET_FUN(__glewDisableVertexArrayAttribEXT) -#define glDisableVertexArrayEXT GLEW_GET_FUN(__glewDisableVertexArrayEXT) -#define glEnableClientStateIndexedEXT GLEW_GET_FUN(__glewEnableClientStateIndexedEXT) -#define glEnableClientStateiEXT GLEW_GET_FUN(__glewEnableClientStateiEXT) -#define glEnableVertexArrayAttribEXT GLEW_GET_FUN(__glewEnableVertexArrayAttribEXT) -#define glEnableVertexArrayEXT GLEW_GET_FUN(__glewEnableVertexArrayEXT) -#define glFlushMappedNamedBufferRangeEXT GLEW_GET_FUN(__glewFlushMappedNamedBufferRangeEXT) -#define glFramebufferDrawBufferEXT GLEW_GET_FUN(__glewFramebufferDrawBufferEXT) -#define glFramebufferDrawBuffersEXT GLEW_GET_FUN(__glewFramebufferDrawBuffersEXT) -#define glFramebufferReadBufferEXT GLEW_GET_FUN(__glewFramebufferReadBufferEXT) -#define glGenerateMultiTexMipmapEXT GLEW_GET_FUN(__glewGenerateMultiTexMipmapEXT) -#define glGenerateTextureMipmapEXT GLEW_GET_FUN(__glewGenerateTextureMipmapEXT) -#define glGetCompressedMultiTexImageEXT GLEW_GET_FUN(__glewGetCompressedMultiTexImageEXT) -#define glGetCompressedTextureImageEXT GLEW_GET_FUN(__glewGetCompressedTextureImageEXT) -#define glGetDoubleIndexedvEXT GLEW_GET_FUN(__glewGetDoubleIndexedvEXT) -#define glGetDoublei_vEXT GLEW_GET_FUN(__glewGetDoublei_vEXT) -#define glGetFloatIndexedvEXT GLEW_GET_FUN(__glewGetFloatIndexedvEXT) -#define glGetFloati_vEXT GLEW_GET_FUN(__glewGetFloati_vEXT) -#define glGetFramebufferParameterivEXT GLEW_GET_FUN(__glewGetFramebufferParameterivEXT) -#define glGetMultiTexEnvfvEXT GLEW_GET_FUN(__glewGetMultiTexEnvfvEXT) -#define glGetMultiTexEnvivEXT GLEW_GET_FUN(__glewGetMultiTexEnvivEXT) -#define glGetMultiTexGendvEXT GLEW_GET_FUN(__glewGetMultiTexGendvEXT) -#define glGetMultiTexGenfvEXT GLEW_GET_FUN(__glewGetMultiTexGenfvEXT) -#define glGetMultiTexGenivEXT GLEW_GET_FUN(__glewGetMultiTexGenivEXT) -#define glGetMultiTexImageEXT GLEW_GET_FUN(__glewGetMultiTexImageEXT) -#define glGetMultiTexLevelParameterfvEXT GLEW_GET_FUN(__glewGetMultiTexLevelParameterfvEXT) -#define glGetMultiTexLevelParameterivEXT GLEW_GET_FUN(__glewGetMultiTexLevelParameterivEXT) -#define glGetMultiTexParameterIivEXT GLEW_GET_FUN(__glewGetMultiTexParameterIivEXT) -#define glGetMultiTexParameterIuivEXT GLEW_GET_FUN(__glewGetMultiTexParameterIuivEXT) -#define glGetMultiTexParameterfvEXT GLEW_GET_FUN(__glewGetMultiTexParameterfvEXT) -#define glGetMultiTexParameterivEXT GLEW_GET_FUN(__glewGetMultiTexParameterivEXT) -#define glGetNamedBufferParameterivEXT GLEW_GET_FUN(__glewGetNamedBufferParameterivEXT) -#define glGetNamedBufferPointervEXT GLEW_GET_FUN(__glewGetNamedBufferPointervEXT) -#define glGetNamedBufferSubDataEXT GLEW_GET_FUN(__glewGetNamedBufferSubDataEXT) -#define glGetNamedFramebufferAttachmentParameterivEXT GLEW_GET_FUN(__glewGetNamedFramebufferAttachmentParameterivEXT) -#define glGetNamedProgramLocalParameterIivEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterIivEXT) -#define glGetNamedProgramLocalParameterIuivEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterIuivEXT) -#define glGetNamedProgramLocalParameterdvEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterdvEXT) -#define glGetNamedProgramLocalParameterfvEXT GLEW_GET_FUN(__glewGetNamedProgramLocalParameterfvEXT) -#define glGetNamedProgramStringEXT GLEW_GET_FUN(__glewGetNamedProgramStringEXT) -#define glGetNamedProgramivEXT GLEW_GET_FUN(__glewGetNamedProgramivEXT) -#define glGetNamedRenderbufferParameterivEXT GLEW_GET_FUN(__glewGetNamedRenderbufferParameterivEXT) -#define glGetPointerIndexedvEXT GLEW_GET_FUN(__glewGetPointerIndexedvEXT) -#define glGetPointeri_vEXT GLEW_GET_FUN(__glewGetPointeri_vEXT) -#define glGetTextureImageEXT GLEW_GET_FUN(__glewGetTextureImageEXT) -#define glGetTextureLevelParameterfvEXT GLEW_GET_FUN(__glewGetTextureLevelParameterfvEXT) -#define glGetTextureLevelParameterivEXT GLEW_GET_FUN(__glewGetTextureLevelParameterivEXT) -#define glGetTextureParameterIivEXT GLEW_GET_FUN(__glewGetTextureParameterIivEXT) -#define glGetTextureParameterIuivEXT GLEW_GET_FUN(__glewGetTextureParameterIuivEXT) -#define glGetTextureParameterfvEXT GLEW_GET_FUN(__glewGetTextureParameterfvEXT) -#define glGetTextureParameterivEXT GLEW_GET_FUN(__glewGetTextureParameterivEXT) -#define glGetVertexArrayIntegeri_vEXT GLEW_GET_FUN(__glewGetVertexArrayIntegeri_vEXT) -#define glGetVertexArrayIntegervEXT GLEW_GET_FUN(__glewGetVertexArrayIntegervEXT) -#define glGetVertexArrayPointeri_vEXT GLEW_GET_FUN(__glewGetVertexArrayPointeri_vEXT) -#define glGetVertexArrayPointervEXT GLEW_GET_FUN(__glewGetVertexArrayPointervEXT) -#define glMapNamedBufferEXT GLEW_GET_FUN(__glewMapNamedBufferEXT) -#define glMapNamedBufferRangeEXT GLEW_GET_FUN(__glewMapNamedBufferRangeEXT) -#define glMatrixFrustumEXT GLEW_GET_FUN(__glewMatrixFrustumEXT) -#define glMatrixLoadIdentityEXT GLEW_GET_FUN(__glewMatrixLoadIdentityEXT) -#define glMatrixLoadTransposedEXT GLEW_GET_FUN(__glewMatrixLoadTransposedEXT) -#define glMatrixLoadTransposefEXT GLEW_GET_FUN(__glewMatrixLoadTransposefEXT) -#define glMatrixLoaddEXT GLEW_GET_FUN(__glewMatrixLoaddEXT) -#define glMatrixLoadfEXT GLEW_GET_FUN(__glewMatrixLoadfEXT) -#define glMatrixMultTransposedEXT GLEW_GET_FUN(__glewMatrixMultTransposedEXT) -#define glMatrixMultTransposefEXT GLEW_GET_FUN(__glewMatrixMultTransposefEXT) -#define glMatrixMultdEXT GLEW_GET_FUN(__glewMatrixMultdEXT) -#define glMatrixMultfEXT GLEW_GET_FUN(__glewMatrixMultfEXT) -#define glMatrixOrthoEXT GLEW_GET_FUN(__glewMatrixOrthoEXT) -#define glMatrixPopEXT GLEW_GET_FUN(__glewMatrixPopEXT) -#define glMatrixPushEXT GLEW_GET_FUN(__glewMatrixPushEXT) -#define glMatrixRotatedEXT GLEW_GET_FUN(__glewMatrixRotatedEXT) -#define glMatrixRotatefEXT GLEW_GET_FUN(__glewMatrixRotatefEXT) -#define glMatrixScaledEXT GLEW_GET_FUN(__glewMatrixScaledEXT) -#define glMatrixScalefEXT GLEW_GET_FUN(__glewMatrixScalefEXT) -#define glMatrixTranslatedEXT GLEW_GET_FUN(__glewMatrixTranslatedEXT) -#define glMatrixTranslatefEXT GLEW_GET_FUN(__glewMatrixTranslatefEXT) -#define glMultiTexBufferEXT GLEW_GET_FUN(__glewMultiTexBufferEXT) -#define glMultiTexCoordPointerEXT GLEW_GET_FUN(__glewMultiTexCoordPointerEXT) -#define glMultiTexEnvfEXT GLEW_GET_FUN(__glewMultiTexEnvfEXT) -#define glMultiTexEnvfvEXT GLEW_GET_FUN(__glewMultiTexEnvfvEXT) -#define glMultiTexEnviEXT GLEW_GET_FUN(__glewMultiTexEnviEXT) -#define glMultiTexEnvivEXT GLEW_GET_FUN(__glewMultiTexEnvivEXT) -#define glMultiTexGendEXT GLEW_GET_FUN(__glewMultiTexGendEXT) -#define glMultiTexGendvEXT GLEW_GET_FUN(__glewMultiTexGendvEXT) -#define glMultiTexGenfEXT GLEW_GET_FUN(__glewMultiTexGenfEXT) -#define glMultiTexGenfvEXT GLEW_GET_FUN(__glewMultiTexGenfvEXT) -#define glMultiTexGeniEXT GLEW_GET_FUN(__glewMultiTexGeniEXT) -#define glMultiTexGenivEXT GLEW_GET_FUN(__glewMultiTexGenivEXT) -#define glMultiTexImage1DEXT GLEW_GET_FUN(__glewMultiTexImage1DEXT) -#define glMultiTexImage2DEXT GLEW_GET_FUN(__glewMultiTexImage2DEXT) -#define glMultiTexImage3DEXT GLEW_GET_FUN(__glewMultiTexImage3DEXT) -#define glMultiTexParameterIivEXT GLEW_GET_FUN(__glewMultiTexParameterIivEXT) -#define glMultiTexParameterIuivEXT GLEW_GET_FUN(__glewMultiTexParameterIuivEXT) -#define glMultiTexParameterfEXT GLEW_GET_FUN(__glewMultiTexParameterfEXT) -#define glMultiTexParameterfvEXT GLEW_GET_FUN(__glewMultiTexParameterfvEXT) -#define glMultiTexParameteriEXT GLEW_GET_FUN(__glewMultiTexParameteriEXT) -#define glMultiTexParameterivEXT GLEW_GET_FUN(__glewMultiTexParameterivEXT) -#define glMultiTexRenderbufferEXT GLEW_GET_FUN(__glewMultiTexRenderbufferEXT) -#define glMultiTexSubImage1DEXT GLEW_GET_FUN(__glewMultiTexSubImage1DEXT) -#define glMultiTexSubImage2DEXT GLEW_GET_FUN(__glewMultiTexSubImage2DEXT) -#define glMultiTexSubImage3DEXT GLEW_GET_FUN(__glewMultiTexSubImage3DEXT) -#define glNamedBufferDataEXT GLEW_GET_FUN(__glewNamedBufferDataEXT) -#define glNamedBufferSubDataEXT GLEW_GET_FUN(__glewNamedBufferSubDataEXT) -#define glNamedCopyBufferSubDataEXT GLEW_GET_FUN(__glewNamedCopyBufferSubDataEXT) -#define glNamedFramebufferRenderbufferEXT GLEW_GET_FUN(__glewNamedFramebufferRenderbufferEXT) -#define glNamedFramebufferTexture1DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture1DEXT) -#define glNamedFramebufferTexture2DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture2DEXT) -#define glNamedFramebufferTexture3DEXT GLEW_GET_FUN(__glewNamedFramebufferTexture3DEXT) -#define glNamedFramebufferTextureEXT GLEW_GET_FUN(__glewNamedFramebufferTextureEXT) -#define glNamedFramebufferTextureFaceEXT GLEW_GET_FUN(__glewNamedFramebufferTextureFaceEXT) -#define glNamedFramebufferTextureLayerEXT GLEW_GET_FUN(__glewNamedFramebufferTextureLayerEXT) -#define glNamedProgramLocalParameter4dEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4dEXT) -#define glNamedProgramLocalParameter4dvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4dvEXT) -#define glNamedProgramLocalParameter4fEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4fEXT) -#define glNamedProgramLocalParameter4fvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameter4fvEXT) -#define glNamedProgramLocalParameterI4iEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4iEXT) -#define glNamedProgramLocalParameterI4ivEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4ivEXT) -#define glNamedProgramLocalParameterI4uiEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4uiEXT) -#define glNamedProgramLocalParameterI4uivEXT GLEW_GET_FUN(__glewNamedProgramLocalParameterI4uivEXT) -#define glNamedProgramLocalParameters4fvEXT GLEW_GET_FUN(__glewNamedProgramLocalParameters4fvEXT) -#define glNamedProgramLocalParametersI4ivEXT GLEW_GET_FUN(__glewNamedProgramLocalParametersI4ivEXT) -#define glNamedProgramLocalParametersI4uivEXT GLEW_GET_FUN(__glewNamedProgramLocalParametersI4uivEXT) -#define glNamedProgramStringEXT GLEW_GET_FUN(__glewNamedProgramStringEXT) -#define glNamedRenderbufferStorageEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageEXT) -#define glNamedRenderbufferStorageMultisampleCoverageEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisampleCoverageEXT) -#define glNamedRenderbufferStorageMultisampleEXT GLEW_GET_FUN(__glewNamedRenderbufferStorageMultisampleEXT) -#define glProgramUniform1fEXT GLEW_GET_FUN(__glewProgramUniform1fEXT) -#define glProgramUniform1fvEXT GLEW_GET_FUN(__glewProgramUniform1fvEXT) -#define glProgramUniform1iEXT GLEW_GET_FUN(__glewProgramUniform1iEXT) -#define glProgramUniform1ivEXT GLEW_GET_FUN(__glewProgramUniform1ivEXT) -#define glProgramUniform1uiEXT GLEW_GET_FUN(__glewProgramUniform1uiEXT) -#define glProgramUniform1uivEXT GLEW_GET_FUN(__glewProgramUniform1uivEXT) -#define glProgramUniform2fEXT GLEW_GET_FUN(__glewProgramUniform2fEXT) -#define glProgramUniform2fvEXT GLEW_GET_FUN(__glewProgramUniform2fvEXT) -#define glProgramUniform2iEXT GLEW_GET_FUN(__glewProgramUniform2iEXT) -#define glProgramUniform2ivEXT GLEW_GET_FUN(__glewProgramUniform2ivEXT) -#define glProgramUniform2uiEXT GLEW_GET_FUN(__glewProgramUniform2uiEXT) -#define glProgramUniform2uivEXT GLEW_GET_FUN(__glewProgramUniform2uivEXT) -#define glProgramUniform3fEXT GLEW_GET_FUN(__glewProgramUniform3fEXT) -#define glProgramUniform3fvEXT GLEW_GET_FUN(__glewProgramUniform3fvEXT) -#define glProgramUniform3iEXT GLEW_GET_FUN(__glewProgramUniform3iEXT) -#define glProgramUniform3ivEXT GLEW_GET_FUN(__glewProgramUniform3ivEXT) -#define glProgramUniform3uiEXT GLEW_GET_FUN(__glewProgramUniform3uiEXT) -#define glProgramUniform3uivEXT GLEW_GET_FUN(__glewProgramUniform3uivEXT) -#define glProgramUniform4fEXT GLEW_GET_FUN(__glewProgramUniform4fEXT) -#define glProgramUniform4fvEXT GLEW_GET_FUN(__glewProgramUniform4fvEXT) -#define glProgramUniform4iEXT GLEW_GET_FUN(__glewProgramUniform4iEXT) -#define glProgramUniform4ivEXT GLEW_GET_FUN(__glewProgramUniform4ivEXT) -#define glProgramUniform4uiEXT GLEW_GET_FUN(__glewProgramUniform4uiEXT) -#define glProgramUniform4uivEXT GLEW_GET_FUN(__glewProgramUniform4uivEXT) -#define glProgramUniformMatrix2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2fvEXT) -#define glProgramUniformMatrix2x3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x3fvEXT) -#define glProgramUniformMatrix2x4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix2x4fvEXT) -#define glProgramUniformMatrix3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3fvEXT) -#define glProgramUniformMatrix3x2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x2fvEXT) -#define glProgramUniformMatrix3x4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix3x4fvEXT) -#define glProgramUniformMatrix4fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4fvEXT) -#define glProgramUniformMatrix4x2fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x2fvEXT) -#define glProgramUniformMatrix4x3fvEXT GLEW_GET_FUN(__glewProgramUniformMatrix4x3fvEXT) -#define glPushClientAttribDefaultEXT GLEW_GET_FUN(__glewPushClientAttribDefaultEXT) -#define glTextureBufferEXT GLEW_GET_FUN(__glewTextureBufferEXT) -#define glTextureImage1DEXT GLEW_GET_FUN(__glewTextureImage1DEXT) -#define glTextureImage2DEXT GLEW_GET_FUN(__glewTextureImage2DEXT) -#define glTextureImage3DEXT GLEW_GET_FUN(__glewTextureImage3DEXT) -#define glTextureParameterIivEXT GLEW_GET_FUN(__glewTextureParameterIivEXT) -#define glTextureParameterIuivEXT GLEW_GET_FUN(__glewTextureParameterIuivEXT) -#define glTextureParameterfEXT GLEW_GET_FUN(__glewTextureParameterfEXT) -#define glTextureParameterfvEXT GLEW_GET_FUN(__glewTextureParameterfvEXT) -#define glTextureParameteriEXT GLEW_GET_FUN(__glewTextureParameteriEXT) -#define glTextureParameterivEXT GLEW_GET_FUN(__glewTextureParameterivEXT) -#define glTextureRenderbufferEXT GLEW_GET_FUN(__glewTextureRenderbufferEXT) -#define glTextureSubImage1DEXT GLEW_GET_FUN(__glewTextureSubImage1DEXT) -#define glTextureSubImage2DEXT GLEW_GET_FUN(__glewTextureSubImage2DEXT) -#define glTextureSubImage3DEXT GLEW_GET_FUN(__glewTextureSubImage3DEXT) -#define glUnmapNamedBufferEXT GLEW_GET_FUN(__glewUnmapNamedBufferEXT) -#define glVertexArrayColorOffsetEXT GLEW_GET_FUN(__glewVertexArrayColorOffsetEXT) -#define glVertexArrayEdgeFlagOffsetEXT GLEW_GET_FUN(__glewVertexArrayEdgeFlagOffsetEXT) -#define glVertexArrayFogCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayFogCoordOffsetEXT) -#define glVertexArrayIndexOffsetEXT GLEW_GET_FUN(__glewVertexArrayIndexOffsetEXT) -#define glVertexArrayMultiTexCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayMultiTexCoordOffsetEXT) -#define glVertexArrayNormalOffsetEXT GLEW_GET_FUN(__glewVertexArrayNormalOffsetEXT) -#define glVertexArraySecondaryColorOffsetEXT GLEW_GET_FUN(__glewVertexArraySecondaryColorOffsetEXT) -#define glVertexArrayTexCoordOffsetEXT GLEW_GET_FUN(__glewVertexArrayTexCoordOffsetEXT) -#define glVertexArrayVertexAttribDivisorEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribDivisorEXT) -#define glVertexArrayVertexAttribIOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribIOffsetEXT) -#define glVertexArrayVertexAttribOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribOffsetEXT) -#define glVertexArrayVertexOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexOffsetEXT) - -#define GLEW_EXT_direct_state_access GLEW_GET_VAR(__GLEW_EXT_direct_state_access) - -#endif /* GL_EXT_direct_state_access */ - -/* -------------------------- GL_EXT_draw_buffers2 ------------------------- */ - -#ifndef GL_EXT_draw_buffers2 -#define GL_EXT_draw_buffers2 1 - -typedef void (GLAPIENTRY * PFNGLCOLORMASKINDEXEDEXTPROC) (GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef void (GLAPIENTRY * PFNGLDISABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef void (GLAPIENTRY * PFNGLENABLEINDEXEDEXTPROC) (GLenum target, GLuint index); -typedef void (GLAPIENTRY * PFNGLGETBOOLEANINDEXEDVEXTPROC) (GLenum value, GLuint index, GLboolean* data); -typedef void (GLAPIENTRY * PFNGLGETINTEGERINDEXEDVEXTPROC) (GLenum value, GLuint index, GLint* data); -typedef GLboolean (GLAPIENTRY * PFNGLISENABLEDINDEXEDEXTPROC) (GLenum target, GLuint index); - -#define glColorMaskIndexedEXT GLEW_GET_FUN(__glewColorMaskIndexedEXT) -#define glDisableIndexedEXT GLEW_GET_FUN(__glewDisableIndexedEXT) -#define glEnableIndexedEXT GLEW_GET_FUN(__glewEnableIndexedEXT) -#define glGetBooleanIndexedvEXT GLEW_GET_FUN(__glewGetBooleanIndexedvEXT) -#define glGetIntegerIndexedvEXT GLEW_GET_FUN(__glewGetIntegerIndexedvEXT) -#define glIsEnabledIndexedEXT GLEW_GET_FUN(__glewIsEnabledIndexedEXT) - -#define GLEW_EXT_draw_buffers2 GLEW_GET_VAR(__GLEW_EXT_draw_buffers2) - -#endif /* GL_EXT_draw_buffers2 */ - -/* ------------------------- GL_EXT_draw_instanced ------------------------- */ - -#ifndef GL_EXT_draw_instanced -#define GL_EXT_draw_instanced 1 - -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSINSTANCEDEXTPROC) (GLenum mode, GLint start, GLsizei count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLDRAWELEMENTSINSTANCEDEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); - -#define glDrawArraysInstancedEXT GLEW_GET_FUN(__glewDrawArraysInstancedEXT) -#define glDrawElementsInstancedEXT GLEW_GET_FUN(__glewDrawElementsInstancedEXT) - -#define GLEW_EXT_draw_instanced GLEW_GET_VAR(__GLEW_EXT_draw_instanced) - -#endif /* GL_EXT_draw_instanced */ - -/* ----------------------- GL_EXT_draw_range_elements ---------------------- */ - -#ifndef GL_EXT_draw_range_elements -#define GL_EXT_draw_range_elements 1 - -#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 -#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 - -typedef void (GLAPIENTRY * PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices); - -#define glDrawRangeElementsEXT GLEW_GET_FUN(__glewDrawRangeElementsEXT) - -#define GLEW_EXT_draw_range_elements GLEW_GET_VAR(__GLEW_EXT_draw_range_elements) - -#endif /* GL_EXT_draw_range_elements */ - -/* ---------------------------- GL_EXT_fog_coord --------------------------- */ - -#ifndef GL_EXT_fog_coord -#define GL_EXT_fog_coord 1 - -#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 -#define GL_FOG_COORDINATE_EXT 0x8451 -#define GL_FRAGMENT_DEPTH_EXT 0x8452 -#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 -#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 - -typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLFOGCOORDDEXTPROC) (GLdouble coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFEXTPROC) (GLfloat coord); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord); - -#define glFogCoordPointerEXT GLEW_GET_FUN(__glewFogCoordPointerEXT) -#define glFogCoorddEXT GLEW_GET_FUN(__glewFogCoorddEXT) -#define glFogCoorddvEXT GLEW_GET_FUN(__glewFogCoorddvEXT) -#define glFogCoordfEXT GLEW_GET_FUN(__glewFogCoordfEXT) -#define glFogCoordfvEXT GLEW_GET_FUN(__glewFogCoordfvEXT) - -#define GLEW_EXT_fog_coord GLEW_GET_VAR(__GLEW_EXT_fog_coord) - -#endif /* GL_EXT_fog_coord */ - -/* ------------------------ GL_EXT_fragment_lighting ----------------------- */ - -#ifndef GL_EXT_fragment_lighting -#define GL_EXT_fragment_lighting 1 - -#define GL_FRAGMENT_LIGHTING_EXT 0x8400 -#define GL_FRAGMENT_COLOR_MATERIAL_EXT 0x8401 -#define GL_FRAGMENT_COLOR_MATERIAL_FACE_EXT 0x8402 -#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_EXT 0x8403 -#define GL_MAX_FRAGMENT_LIGHTS_EXT 0x8404 -#define GL_MAX_ACTIVE_LIGHTS_EXT 0x8405 -#define GL_CURRENT_RASTER_NORMAL_EXT 0x8406 -#define GL_LIGHT_ENV_MODE_EXT 0x8407 -#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_EXT 0x8408 -#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_EXT 0x8409 -#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_EXT 0x840A -#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_EXT 0x840B -#define GL_FRAGMENT_LIGHT0_EXT 0x840C -#define GL_FRAGMENT_LIGHT7_EXT 0x8413 - -typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALEXTPROC) (GLenum face, GLenum mode); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFEXTPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVEXTPROC) (GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIEXTPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVEXTPROC) (GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFEXTPROC) (GLenum light, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIEXTPROC) (GLenum light, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFEXTPROC) (GLenum face, GLenum pname, const GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIEXTPROC) (GLenum face, GLenum pname, const GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVEXTPROC) (GLenum light, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVEXTPROC) (GLenum light, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVEXTPROC) (GLenum face, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVEXTPROC) (GLenum face, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLLIGHTENVIEXTPROC) (GLenum pname, GLint param); - -#define glFragmentColorMaterialEXT GLEW_GET_FUN(__glewFragmentColorMaterialEXT) -#define glFragmentLightModelfEXT GLEW_GET_FUN(__glewFragmentLightModelfEXT) -#define glFragmentLightModelfvEXT GLEW_GET_FUN(__glewFragmentLightModelfvEXT) -#define glFragmentLightModeliEXT GLEW_GET_FUN(__glewFragmentLightModeliEXT) -#define glFragmentLightModelivEXT GLEW_GET_FUN(__glewFragmentLightModelivEXT) -#define glFragmentLightfEXT GLEW_GET_FUN(__glewFragmentLightfEXT) -#define glFragmentLightfvEXT GLEW_GET_FUN(__glewFragmentLightfvEXT) -#define glFragmentLightiEXT GLEW_GET_FUN(__glewFragmentLightiEXT) -#define glFragmentLightivEXT GLEW_GET_FUN(__glewFragmentLightivEXT) -#define glFragmentMaterialfEXT GLEW_GET_FUN(__glewFragmentMaterialfEXT) -#define glFragmentMaterialfvEXT GLEW_GET_FUN(__glewFragmentMaterialfvEXT) -#define glFragmentMaterialiEXT GLEW_GET_FUN(__glewFragmentMaterialiEXT) -#define glFragmentMaterialivEXT GLEW_GET_FUN(__glewFragmentMaterialivEXT) -#define glGetFragmentLightfvEXT GLEW_GET_FUN(__glewGetFragmentLightfvEXT) -#define glGetFragmentLightivEXT GLEW_GET_FUN(__glewGetFragmentLightivEXT) -#define glGetFragmentMaterialfvEXT GLEW_GET_FUN(__glewGetFragmentMaterialfvEXT) -#define glGetFragmentMaterialivEXT GLEW_GET_FUN(__glewGetFragmentMaterialivEXT) -#define glLightEnviEXT GLEW_GET_FUN(__glewLightEnviEXT) - -#define GLEW_EXT_fragment_lighting GLEW_GET_VAR(__GLEW_EXT_fragment_lighting) - -#endif /* GL_EXT_fragment_lighting */ - -/* ------------------------ GL_EXT_framebuffer_blit ------------------------ */ - -#ifndef GL_EXT_framebuffer_blit -#define GL_EXT_framebuffer_blit 1 - -#define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_READ_FRAMEBUFFER_EXT 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA - -typedef void (GLAPIENTRY * PFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); - -#define glBlitFramebufferEXT GLEW_GET_FUN(__glewBlitFramebufferEXT) - -#define GLEW_EXT_framebuffer_blit GLEW_GET_VAR(__GLEW_EXT_framebuffer_blit) - -#endif /* GL_EXT_framebuffer_blit */ - -/* --------------------- GL_EXT_framebuffer_multisample -------------------- */ - -#ifndef GL_EXT_framebuffer_multisample -#define GL_EXT_framebuffer_multisample 1 - -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 - -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); - -#define glRenderbufferStorageMultisampleEXT GLEW_GET_FUN(__glewRenderbufferStorageMultisampleEXT) - -#define GLEW_EXT_framebuffer_multisample GLEW_GET_VAR(__GLEW_EXT_framebuffer_multisample) - -#endif /* GL_EXT_framebuffer_multisample */ - -/* --------------- GL_EXT_framebuffer_multisample_blit_scaled -------------- */ - -#ifndef GL_EXT_framebuffer_multisample_blit_scaled -#define GL_EXT_framebuffer_multisample_blit_scaled 1 - -#define GL_SCALED_RESOLVE_FASTEST_EXT 0x90BA -#define GL_SCALED_RESOLVE_NICEST_EXT 0x90BB - -#define GLEW_EXT_framebuffer_multisample_blit_scaled GLEW_GET_VAR(__GLEW_EXT_framebuffer_multisample_blit_scaled) - -#endif /* GL_EXT_framebuffer_multisample_blit_scaled */ - -/* ----------------------- GL_EXT_framebuffer_object ----------------------- */ - -#ifndef GL_EXT_framebuffer_object -#define GL_EXT_framebuffer_object 1 - -#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 -#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 -#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 -#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 -#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 -#define GL_FRAMEBUFFER_EXT 0x8D40 -#define GL_RENDERBUFFER_EXT 0x8D41 -#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 -#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 -#define GL_STENCIL_INDEX1_EXT 0x8D46 -#define GL_STENCIL_INDEX4_EXT 0x8D47 -#define GL_STENCIL_INDEX8_EXT 0x8D48 -#define GL_STENCIL_INDEX16_EXT 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 - -typedef void (GLAPIENTRY * PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer); -typedef void (GLAPIENTRY * PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer); -typedef GLenum (GLAPIENTRY * PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (GLAPIENTRY * PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint* framebuffers); -typedef void (GLAPIENTRY * PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint* renderbuffers); -typedef void (GLAPIENTRY * PFNGLGENERATEMIPMAPEXTPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer); -typedef GLboolean (GLAPIENTRY * PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer); -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); - -#define glBindFramebufferEXT GLEW_GET_FUN(__glewBindFramebufferEXT) -#define glBindRenderbufferEXT GLEW_GET_FUN(__glewBindRenderbufferEXT) -#define glCheckFramebufferStatusEXT GLEW_GET_FUN(__glewCheckFramebufferStatusEXT) -#define glDeleteFramebuffersEXT GLEW_GET_FUN(__glewDeleteFramebuffersEXT) -#define glDeleteRenderbuffersEXT GLEW_GET_FUN(__glewDeleteRenderbuffersEXT) -#define glFramebufferRenderbufferEXT GLEW_GET_FUN(__glewFramebufferRenderbufferEXT) -#define glFramebufferTexture1DEXT GLEW_GET_FUN(__glewFramebufferTexture1DEXT) -#define glFramebufferTexture2DEXT GLEW_GET_FUN(__glewFramebufferTexture2DEXT) -#define glFramebufferTexture3DEXT GLEW_GET_FUN(__glewFramebufferTexture3DEXT) -#define glGenFramebuffersEXT GLEW_GET_FUN(__glewGenFramebuffersEXT) -#define glGenRenderbuffersEXT GLEW_GET_FUN(__glewGenRenderbuffersEXT) -#define glGenerateMipmapEXT GLEW_GET_FUN(__glewGenerateMipmapEXT) -#define glGetFramebufferAttachmentParameterivEXT GLEW_GET_FUN(__glewGetFramebufferAttachmentParameterivEXT) -#define glGetRenderbufferParameterivEXT GLEW_GET_FUN(__glewGetRenderbufferParameterivEXT) -#define glIsFramebufferEXT GLEW_GET_FUN(__glewIsFramebufferEXT) -#define glIsRenderbufferEXT GLEW_GET_FUN(__glewIsRenderbufferEXT) -#define glRenderbufferStorageEXT GLEW_GET_FUN(__glewRenderbufferStorageEXT) - -#define GLEW_EXT_framebuffer_object GLEW_GET_VAR(__GLEW_EXT_framebuffer_object) - -#endif /* GL_EXT_framebuffer_object */ - -/* ------------------------ GL_EXT_framebuffer_sRGB ------------------------ */ - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_EXT_framebuffer_sRGB 1 - -#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 -#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA - -#define GLEW_EXT_framebuffer_sRGB GLEW_GET_VAR(__GLEW_EXT_framebuffer_sRGB) - -#endif /* GL_EXT_framebuffer_sRGB */ - -/* ------------------------ GL_EXT_geometry_shader4 ------------------------ */ - -#ifndef GL_EXT_geometry_shader4 -#define GL_EXT_geometry_shader4 1 - -#define GL_LINES_ADJACENCY_EXT 0xA -#define GL_LINE_STRIP_ADJACENCY_EXT 0xB -#define GL_TRIANGLES_ADJACENCY_EXT 0xC -#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0xD -#define GL_PROGRAM_POINT_SIZE_EXT 0x8642 -#define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9 -#define GL_GEOMETRY_SHADER_EXT 0x8DD9 -#define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERIEXTPROC) (GLuint program, GLenum pname, GLint value); - -#define glFramebufferTextureEXT GLEW_GET_FUN(__glewFramebufferTextureEXT) -#define glFramebufferTextureFaceEXT GLEW_GET_FUN(__glewFramebufferTextureFaceEXT) -#define glProgramParameteriEXT GLEW_GET_FUN(__glewProgramParameteriEXT) - -#define GLEW_EXT_geometry_shader4 GLEW_GET_VAR(__GLEW_EXT_geometry_shader4) - -#endif /* GL_EXT_geometry_shader4 */ - -/* --------------------- GL_EXT_gpu_program_parameters --------------------- */ - -#ifndef GL_EXT_gpu_program_parameters -#define GL_EXT_gpu_program_parameters 1 - -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) (GLenum target, GLuint index, GLsizei count, const GLfloat* params); - -#define glProgramEnvParameters4fvEXT GLEW_GET_FUN(__glewProgramEnvParameters4fvEXT) -#define glProgramLocalParameters4fvEXT GLEW_GET_FUN(__glewProgramLocalParameters4fvEXT) - -#define GLEW_EXT_gpu_program_parameters GLEW_GET_VAR(__GLEW_EXT_gpu_program_parameters) - -#endif /* GL_EXT_gpu_program_parameters */ - -/* --------------------------- GL_EXT_gpu_shader4 -------------------------- */ - -#ifndef GL_EXT_gpu_shader4 -#define GL_EXT_gpu_shader4 1 - -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT 0x88FD -#define GL_SAMPLER_1D_ARRAY_EXT 0x8DC0 -#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1 -#define GL_SAMPLER_BUFFER_EXT 0x8DC2 -#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5 -#define GL_UNSIGNED_INT_VEC2_EXT 0x8DC6 -#define GL_UNSIGNED_INT_VEC3_EXT 0x8DC7 -#define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8 -#define GL_INT_SAMPLER_1D_EXT 0x8DC9 -#define GL_INT_SAMPLER_2D_EXT 0x8DCA -#define GL_INT_SAMPLER_3D_EXT 0x8DCB -#define GL_INT_SAMPLER_CUBE_EXT 0x8DCC -#define GL_INT_SAMPLER_2D_RECT_EXT 0x8DCD -#define GL_INT_SAMPLER_1D_ARRAY_EXT 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY_EXT 0x8DCF -#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_1D_EXT 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D_EXT 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D_EXT 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8 - -typedef void (GLAPIENTRY * PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program, GLuint color, const GLchar *name); -typedef GLint (GLAPIENTRY * PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program, const GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint location, GLuint *params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIIVEXTPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIUIVEXTPROC) (GLuint index, GLenum pname, GLuint *params); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint v0); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UIEXTPROC) (GLint location, GLuint v0, GLuint v1); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UIEXTPROC) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UIVEXTPROC) (GLint location, GLsizei count, const GLuint *value); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IEXTPROC) (GLuint index, GLint x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1IVEXTPROC) (GLuint index, const GLint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIEXTPROC) (GLuint index, GLuint x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI1UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IEXTPROC) (GLuint index, GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2IVEXTPROC) (GLuint index, const GLint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIEXTPROC) (GLuint index, GLuint x, GLuint y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI2UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IEXTPROC) (GLuint index, GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3IVEXTPROC) (GLuint index, const GLint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI3UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4BVEXTPROC) (GLuint index, const GLbyte *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IEXTPROC) (GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4IVEXTPROC) (GLuint index, const GLint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4SVEXTPROC) (GLuint index, const GLshort *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UBVEXTPROC) (GLuint index, const GLubyte *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIEXTPROC) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4UIVEXTPROC) (GLuint index, const GLuint *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBI4USVEXTPROC) (GLuint index, const GLushort *v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); - -#define glBindFragDataLocationEXT GLEW_GET_FUN(__glewBindFragDataLocationEXT) -#define glGetFragDataLocationEXT GLEW_GET_FUN(__glewGetFragDataLocationEXT) -#define glGetUniformuivEXT GLEW_GET_FUN(__glewGetUniformuivEXT) -#define glGetVertexAttribIivEXT GLEW_GET_FUN(__glewGetVertexAttribIivEXT) -#define glGetVertexAttribIuivEXT GLEW_GET_FUN(__glewGetVertexAttribIuivEXT) -#define glUniform1uiEXT GLEW_GET_FUN(__glewUniform1uiEXT) -#define glUniform1uivEXT GLEW_GET_FUN(__glewUniform1uivEXT) -#define glUniform2uiEXT GLEW_GET_FUN(__glewUniform2uiEXT) -#define glUniform2uivEXT GLEW_GET_FUN(__glewUniform2uivEXT) -#define glUniform3uiEXT GLEW_GET_FUN(__glewUniform3uiEXT) -#define glUniform3uivEXT GLEW_GET_FUN(__glewUniform3uivEXT) -#define glUniform4uiEXT GLEW_GET_FUN(__glewUniform4uiEXT) -#define glUniform4uivEXT GLEW_GET_FUN(__glewUniform4uivEXT) -#define glVertexAttribI1iEXT GLEW_GET_FUN(__glewVertexAttribI1iEXT) -#define glVertexAttribI1ivEXT GLEW_GET_FUN(__glewVertexAttribI1ivEXT) -#define glVertexAttribI1uiEXT GLEW_GET_FUN(__glewVertexAttribI1uiEXT) -#define glVertexAttribI1uivEXT GLEW_GET_FUN(__glewVertexAttribI1uivEXT) -#define glVertexAttribI2iEXT GLEW_GET_FUN(__glewVertexAttribI2iEXT) -#define glVertexAttribI2ivEXT GLEW_GET_FUN(__glewVertexAttribI2ivEXT) -#define glVertexAttribI2uiEXT GLEW_GET_FUN(__glewVertexAttribI2uiEXT) -#define glVertexAttribI2uivEXT GLEW_GET_FUN(__glewVertexAttribI2uivEXT) -#define glVertexAttribI3iEXT GLEW_GET_FUN(__glewVertexAttribI3iEXT) -#define glVertexAttribI3ivEXT GLEW_GET_FUN(__glewVertexAttribI3ivEXT) -#define glVertexAttribI3uiEXT GLEW_GET_FUN(__glewVertexAttribI3uiEXT) -#define glVertexAttribI3uivEXT GLEW_GET_FUN(__glewVertexAttribI3uivEXT) -#define glVertexAttribI4bvEXT GLEW_GET_FUN(__glewVertexAttribI4bvEXT) -#define glVertexAttribI4iEXT GLEW_GET_FUN(__glewVertexAttribI4iEXT) -#define glVertexAttribI4ivEXT GLEW_GET_FUN(__glewVertexAttribI4ivEXT) -#define glVertexAttribI4svEXT GLEW_GET_FUN(__glewVertexAttribI4svEXT) -#define glVertexAttribI4ubvEXT GLEW_GET_FUN(__glewVertexAttribI4ubvEXT) -#define glVertexAttribI4uiEXT GLEW_GET_FUN(__glewVertexAttribI4uiEXT) -#define glVertexAttribI4uivEXT GLEW_GET_FUN(__glewVertexAttribI4uivEXT) -#define glVertexAttribI4usvEXT GLEW_GET_FUN(__glewVertexAttribI4usvEXT) -#define glVertexAttribIPointerEXT GLEW_GET_FUN(__glewVertexAttribIPointerEXT) - -#define GLEW_EXT_gpu_shader4 GLEW_GET_VAR(__GLEW_EXT_gpu_shader4) - -#endif /* GL_EXT_gpu_shader4 */ - -/* ---------------------------- GL_EXT_histogram --------------------------- */ - -#ifndef GL_EXT_histogram -#define GL_EXT_histogram 1 - -#define GL_HISTOGRAM_EXT 0x8024 -#define GL_PROXY_HISTOGRAM_EXT 0x8025 -#define GL_HISTOGRAM_WIDTH_EXT 0x8026 -#define GL_HISTOGRAM_FORMAT_EXT 0x8027 -#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C -#define GL_HISTOGRAM_SINK_EXT 0x802D -#define GL_MINMAX_EXT 0x802E -#define GL_MINMAX_FORMAT_EXT 0x802F -#define GL_MINMAX_SINK_EXT 0x8030 - -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, void *values); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (GLAPIENTRY * PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (GLAPIENTRY * PFNGLRESETHISTOGRAMEXTPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLRESETMINMAXEXTPROC) (GLenum target); - -#define glGetHistogramEXT GLEW_GET_FUN(__glewGetHistogramEXT) -#define glGetHistogramParameterfvEXT GLEW_GET_FUN(__glewGetHistogramParameterfvEXT) -#define glGetHistogramParameterivEXT GLEW_GET_FUN(__glewGetHistogramParameterivEXT) -#define glGetMinmaxEXT GLEW_GET_FUN(__glewGetMinmaxEXT) -#define glGetMinmaxParameterfvEXT GLEW_GET_FUN(__glewGetMinmaxParameterfvEXT) -#define glGetMinmaxParameterivEXT GLEW_GET_FUN(__glewGetMinmaxParameterivEXT) -#define glHistogramEXT GLEW_GET_FUN(__glewHistogramEXT) -#define glMinmaxEXT GLEW_GET_FUN(__glewMinmaxEXT) -#define glResetHistogramEXT GLEW_GET_FUN(__glewResetHistogramEXT) -#define glResetMinmaxEXT GLEW_GET_FUN(__glewResetMinmaxEXT) - -#define GLEW_EXT_histogram GLEW_GET_VAR(__GLEW_EXT_histogram) - -#endif /* GL_EXT_histogram */ - -/* ----------------------- GL_EXT_index_array_formats ---------------------- */ - -#ifndef GL_EXT_index_array_formats -#define GL_EXT_index_array_formats 1 - -#define GLEW_EXT_index_array_formats GLEW_GET_VAR(__GLEW_EXT_index_array_formats) - -#endif /* GL_EXT_index_array_formats */ - -/* --------------------------- GL_EXT_index_func --------------------------- */ - -#ifndef GL_EXT_index_func -#define GL_EXT_index_func 1 - -typedef void (GLAPIENTRY * PFNGLINDEXFUNCEXTPROC) (GLenum func, GLfloat ref); - -#define glIndexFuncEXT GLEW_GET_FUN(__glewIndexFuncEXT) - -#define GLEW_EXT_index_func GLEW_GET_VAR(__GLEW_EXT_index_func) - -#endif /* GL_EXT_index_func */ - -/* ------------------------- GL_EXT_index_material ------------------------- */ - -#ifndef GL_EXT_index_material -#define GL_EXT_index_material 1 - -typedef void (GLAPIENTRY * PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode); - -#define glIndexMaterialEXT GLEW_GET_FUN(__glewIndexMaterialEXT) - -#define GLEW_EXT_index_material GLEW_GET_VAR(__GLEW_EXT_index_material) - -#endif /* GL_EXT_index_material */ - -/* -------------------------- GL_EXT_index_texture ------------------------- */ - -#ifndef GL_EXT_index_texture -#define GL_EXT_index_texture 1 - -#define GLEW_EXT_index_texture GLEW_GET_VAR(__GLEW_EXT_index_texture) - -#endif /* GL_EXT_index_texture */ - -/* -------------------------- GL_EXT_light_texture ------------------------- */ - -#ifndef GL_EXT_light_texture -#define GL_EXT_light_texture 1 - -#define GL_FRAGMENT_MATERIAL_EXT 0x8349 -#define GL_FRAGMENT_NORMAL_EXT 0x834A -#define GL_FRAGMENT_COLOR_EXT 0x834C -#define GL_ATTENUATION_EXT 0x834D -#define GL_SHADOW_ATTENUATION_EXT 0x834E -#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F -#define GL_TEXTURE_LIGHT_EXT 0x8350 -#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351 -#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352 - -typedef void (GLAPIENTRY * PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode); -typedef void (GLAPIENTRY * PFNGLTEXTURELIGHTEXTPROC) (GLenum pname); -typedef void (GLAPIENTRY * PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode); - -#define glApplyTextureEXT GLEW_GET_FUN(__glewApplyTextureEXT) -#define glTextureLightEXT GLEW_GET_FUN(__glewTextureLightEXT) -#define glTextureMaterialEXT GLEW_GET_FUN(__glewTextureMaterialEXT) - -#define GLEW_EXT_light_texture GLEW_GET_VAR(__GLEW_EXT_light_texture) - -#endif /* GL_EXT_light_texture */ - -/* ------------------------- GL_EXT_misc_attribute ------------------------- */ - -#ifndef GL_EXT_misc_attribute -#define GL_EXT_misc_attribute 1 - -#define GLEW_EXT_misc_attribute GLEW_GET_VAR(__GLEW_EXT_misc_attribute) - -#endif /* GL_EXT_misc_attribute */ - -/* ------------------------ GL_EXT_multi_draw_arrays ----------------------- */ - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, const GLint* first, const GLsizei *count, GLsizei primcount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, GLsizei* count, GLenum type, const void *const *indices, GLsizei primcount); - -#define glMultiDrawArraysEXT GLEW_GET_FUN(__glewMultiDrawArraysEXT) -#define glMultiDrawElementsEXT GLEW_GET_FUN(__glewMultiDrawElementsEXT) - -#define GLEW_EXT_multi_draw_arrays GLEW_GET_VAR(__GLEW_EXT_multi_draw_arrays) - -#endif /* GL_EXT_multi_draw_arrays */ - -/* --------------------------- GL_EXT_multisample -------------------------- */ - -#ifndef GL_EXT_multisample -#define GL_EXT_multisample 1 - -#define GL_MULTISAMPLE_EXT 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F -#define GL_SAMPLE_MASK_EXT 0x80A0 -#define GL_1PASS_EXT 0x80A1 -#define GL_2PASS_0_EXT 0x80A2 -#define GL_2PASS_1_EXT 0x80A3 -#define GL_4PASS_0_EXT 0x80A4 -#define GL_4PASS_1_EXT 0x80A5 -#define GL_4PASS_2_EXT 0x80A6 -#define GL_4PASS_3_EXT 0x80A7 -#define GL_SAMPLE_BUFFERS_EXT 0x80A8 -#define GL_SAMPLES_EXT 0x80A9 -#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA -#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB -#define GL_SAMPLE_PATTERN_EXT 0x80AC -#define GL_MULTISAMPLE_BIT_EXT 0x20000000 - -typedef void (GLAPIENTRY * PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert); -typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern); - -#define glSampleMaskEXT GLEW_GET_FUN(__glewSampleMaskEXT) -#define glSamplePatternEXT GLEW_GET_FUN(__glewSamplePatternEXT) - -#define GLEW_EXT_multisample GLEW_GET_VAR(__GLEW_EXT_multisample) - -#endif /* GL_EXT_multisample */ - -/* ---------------------- GL_EXT_packed_depth_stencil ---------------------- */ - -#ifndef GL_EXT_packed_depth_stencil -#define GL_EXT_packed_depth_stencil 1 - -#define GL_DEPTH_STENCIL_EXT 0x84F9 -#define GL_UNSIGNED_INT_24_8_EXT 0x84FA -#define GL_DEPTH24_STENCIL8_EXT 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 - -#define GLEW_EXT_packed_depth_stencil GLEW_GET_VAR(__GLEW_EXT_packed_depth_stencil) - -#endif /* GL_EXT_packed_depth_stencil */ - -/* -------------------------- GL_EXT_packed_float -------------------------- */ - -#ifndef GL_EXT_packed_float -#define GL_EXT_packed_float 1 - -#define GL_R11F_G11F_B10F_EXT 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B -#define GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C - -#define GLEW_EXT_packed_float GLEW_GET_VAR(__GLEW_EXT_packed_float) - -#endif /* GL_EXT_packed_float */ - -/* -------------------------- GL_EXT_packed_pixels ------------------------- */ - -#ifndef GL_EXT_packed_pixels -#define GL_EXT_packed_pixels 1 - -#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 - -#define GLEW_EXT_packed_pixels GLEW_GET_VAR(__GLEW_EXT_packed_pixels) - -#endif /* GL_EXT_packed_pixels */ - -/* ------------------------ GL_EXT_paletted_texture ------------------------ */ - -#ifndef GL_EXT_paletted_texture -#define GL_EXT_paletted_texture 1 - -#define GL_TEXTURE_1D 0x0DE0 -#define GL_TEXTURE_2D 0x0DE1 -#define GL_PROXY_TEXTURE_1D 0x8063 -#define GL_PROXY_TEXTURE_2D 0x8064 -#define GL_COLOR_TABLE_FORMAT_EXT 0x80D8 -#define GL_COLOR_TABLE_WIDTH_EXT 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_EXT 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_EXT 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_EXT 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_EXT 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_EXT 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_EXT 0x80DF -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B - -typedef void (GLAPIENTRY * PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const void *data); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, void *data); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint* params); - -#define glColorTableEXT GLEW_GET_FUN(__glewColorTableEXT) -#define glGetColorTableEXT GLEW_GET_FUN(__glewGetColorTableEXT) -#define glGetColorTableParameterfvEXT GLEW_GET_FUN(__glewGetColorTableParameterfvEXT) -#define glGetColorTableParameterivEXT GLEW_GET_FUN(__glewGetColorTableParameterivEXT) - -#define GLEW_EXT_paletted_texture GLEW_GET_VAR(__GLEW_EXT_paletted_texture) - -#endif /* GL_EXT_paletted_texture */ - -/* ----------------------- GL_EXT_pixel_buffer_object ---------------------- */ - -#ifndef GL_EXT_pixel_buffer_object -#define GL_EXT_pixel_buffer_object 1 - -#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF - -#define GLEW_EXT_pixel_buffer_object GLEW_GET_VAR(__GLEW_EXT_pixel_buffer_object) - -#endif /* GL_EXT_pixel_buffer_object */ - -/* ------------------------- GL_EXT_pixel_transform ------------------------ */ - -#ifndef GL_EXT_pixel_transform -#define GL_EXT_pixel_transform 1 - -#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330 -#define GL_PIXEL_MAG_FILTER_EXT 0x8331 -#define GL_PIXEL_MIN_FILTER_EXT 0x8332 -#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333 -#define GL_CUBIC_EXT 0x8334 -#define GL_AVERAGE_EXT 0x8335 -#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336 -#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337 -#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338 - -typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, const GLfloat param); -typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, const GLint param); -typedef void (GLAPIENTRY * PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint* params); - -#define glGetPixelTransformParameterfvEXT GLEW_GET_FUN(__glewGetPixelTransformParameterfvEXT) -#define glGetPixelTransformParameterivEXT GLEW_GET_FUN(__glewGetPixelTransformParameterivEXT) -#define glPixelTransformParameterfEXT GLEW_GET_FUN(__glewPixelTransformParameterfEXT) -#define glPixelTransformParameterfvEXT GLEW_GET_FUN(__glewPixelTransformParameterfvEXT) -#define glPixelTransformParameteriEXT GLEW_GET_FUN(__glewPixelTransformParameteriEXT) -#define glPixelTransformParameterivEXT GLEW_GET_FUN(__glewPixelTransformParameterivEXT) - -#define GLEW_EXT_pixel_transform GLEW_GET_VAR(__GLEW_EXT_pixel_transform) - -#endif /* GL_EXT_pixel_transform */ - -/* ------------------- GL_EXT_pixel_transform_color_table ------------------ */ - -#ifndef GL_EXT_pixel_transform_color_table -#define GL_EXT_pixel_transform_color_table 1 - -#define GLEW_EXT_pixel_transform_color_table GLEW_GET_VAR(__GLEW_EXT_pixel_transform_color_table) - -#endif /* GL_EXT_pixel_transform_color_table */ - -/* ------------------------ GL_EXT_point_parameters ------------------------ */ - -#ifndef GL_EXT_point_parameters -#define GL_EXT_point_parameters 1 - -#define GL_POINT_SIZE_MIN_EXT 0x8126 -#define GL_POINT_SIZE_MAX_EXT 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 -#define GL_DISTANCE_ATTENUATION_EXT 0x8129 - -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat* params); - -#define glPointParameterfEXT GLEW_GET_FUN(__glewPointParameterfEXT) -#define glPointParameterfvEXT GLEW_GET_FUN(__glewPointParameterfvEXT) - -#define GLEW_EXT_point_parameters GLEW_GET_VAR(__GLEW_EXT_point_parameters) - -#endif /* GL_EXT_point_parameters */ - -/* ------------------------- GL_EXT_polygon_offset ------------------------- */ - -#ifndef GL_EXT_polygon_offset -#define GL_EXT_polygon_offset 1 - -#define GL_POLYGON_OFFSET_EXT 0x8037 -#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 -#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 - -typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias); - -#define glPolygonOffsetEXT GLEW_GET_FUN(__glewPolygonOffsetEXT) - -#define GLEW_EXT_polygon_offset GLEW_GET_VAR(__GLEW_EXT_polygon_offset) - -#endif /* GL_EXT_polygon_offset */ - -/* ---------------------- GL_EXT_polygon_offset_clamp ---------------------- */ - -#ifndef GL_EXT_polygon_offset_clamp -#define GL_EXT_polygon_offset_clamp 1 - -#define GL_POLYGON_OFFSET_CLAMP_EXT 0x8E1B - -typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETCLAMPEXTPROC) (GLfloat factor, GLfloat units, GLfloat clamp); - -#define glPolygonOffsetClampEXT GLEW_GET_FUN(__glewPolygonOffsetClampEXT) - -#define GLEW_EXT_polygon_offset_clamp GLEW_GET_VAR(__GLEW_EXT_polygon_offset_clamp) - -#endif /* GL_EXT_polygon_offset_clamp */ - -/* ----------------------- GL_EXT_post_depth_coverage ---------------------- */ - -#ifndef GL_EXT_post_depth_coverage -#define GL_EXT_post_depth_coverage 1 - -#define GLEW_EXT_post_depth_coverage GLEW_GET_VAR(__GLEW_EXT_post_depth_coverage) - -#endif /* GL_EXT_post_depth_coverage */ - -/* ------------------------ GL_EXT_provoking_vertex ------------------------ */ - -#ifndef GL_EXT_provoking_vertex -#define GL_EXT_provoking_vertex 1 - -#define GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT 0x8E4C -#define GL_FIRST_VERTEX_CONVENTION_EXT 0x8E4D -#define GL_LAST_VERTEX_CONVENTION_EXT 0x8E4E -#define GL_PROVOKING_VERTEX_EXT 0x8E4F - -typedef void (GLAPIENTRY * PFNGLPROVOKINGVERTEXEXTPROC) (GLenum mode); - -#define glProvokingVertexEXT GLEW_GET_FUN(__glewProvokingVertexEXT) - -#define GLEW_EXT_provoking_vertex GLEW_GET_VAR(__GLEW_EXT_provoking_vertex) - -#endif /* GL_EXT_provoking_vertex */ - -/* ----------------------- GL_EXT_raster_multisample ----------------------- */ - -#ifndef GL_EXT_raster_multisample -#define GL_EXT_raster_multisample 1 - -#define GL_COLOR_SAMPLES_NV 0x8E20 -#define GL_RASTER_MULTISAMPLE_EXT 0x9327 -#define GL_RASTER_SAMPLES_EXT 0x9328 -#define GL_MAX_RASTER_SAMPLES_EXT 0x9329 -#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A -#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B -#define GL_EFFECTIVE_RASTER_SAMPLES_EXT 0x932C -#define GL_DEPTH_SAMPLES_NV 0x932D -#define GL_STENCIL_SAMPLES_NV 0x932E -#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F -#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330 -#define GL_COVERAGE_MODULATION_TABLE_NV 0x9331 -#define GL_COVERAGE_MODULATION_NV 0x9332 -#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333 - -typedef void (GLAPIENTRY * PFNGLCOVERAGEMODULATIONNVPROC) (GLenum components); -typedef void (GLAPIENTRY * PFNGLCOVERAGEMODULATIONTABLENVPROC) (GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLGETCOVERAGEMODULATIONTABLENVPROC) (GLsizei bufsize, GLfloat* v); -typedef void (GLAPIENTRY * PFNGLRASTERSAMPLESEXTPROC) (GLuint samples, GLboolean fixedsamplelocations); - -#define glCoverageModulationNV GLEW_GET_FUN(__glewCoverageModulationNV) -#define glCoverageModulationTableNV GLEW_GET_FUN(__glewCoverageModulationTableNV) -#define glGetCoverageModulationTableNV GLEW_GET_FUN(__glewGetCoverageModulationTableNV) -#define glRasterSamplesEXT GLEW_GET_FUN(__glewRasterSamplesEXT) - -#define GLEW_EXT_raster_multisample GLEW_GET_VAR(__GLEW_EXT_raster_multisample) - -#endif /* GL_EXT_raster_multisample */ - -/* ------------------------- GL_EXT_rescale_normal ------------------------- */ - -#ifndef GL_EXT_rescale_normal -#define GL_EXT_rescale_normal 1 - -#define GL_RESCALE_NORMAL_EXT 0x803A - -#define GLEW_EXT_rescale_normal GLEW_GET_VAR(__GLEW_EXT_rescale_normal) - -#endif /* GL_EXT_rescale_normal */ - -/* -------------------------- GL_EXT_scene_marker -------------------------- */ - -#ifndef GL_EXT_scene_marker -#define GL_EXT_scene_marker 1 - -typedef void (GLAPIENTRY * PFNGLBEGINSCENEEXTPROC) (void); -typedef void (GLAPIENTRY * PFNGLENDSCENEEXTPROC) (void); - -#define glBeginSceneEXT GLEW_GET_FUN(__glewBeginSceneEXT) -#define glEndSceneEXT GLEW_GET_FUN(__glewEndSceneEXT) - -#define GLEW_EXT_scene_marker GLEW_GET_VAR(__GLEW_EXT_scene_marker) - -#endif /* GL_EXT_scene_marker */ - -/* ------------------------- GL_EXT_secondary_color ------------------------ */ - -#ifndef GL_EXT_secondary_color -#define GL_EXT_secondary_color 1 - -#define GL_COLOR_SUM_EXT 0x8458 -#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D -#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E - -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const void *pointer); - -#define glSecondaryColor3bEXT GLEW_GET_FUN(__glewSecondaryColor3bEXT) -#define glSecondaryColor3bvEXT GLEW_GET_FUN(__glewSecondaryColor3bvEXT) -#define glSecondaryColor3dEXT GLEW_GET_FUN(__glewSecondaryColor3dEXT) -#define glSecondaryColor3dvEXT GLEW_GET_FUN(__glewSecondaryColor3dvEXT) -#define glSecondaryColor3fEXT GLEW_GET_FUN(__glewSecondaryColor3fEXT) -#define glSecondaryColor3fvEXT GLEW_GET_FUN(__glewSecondaryColor3fvEXT) -#define glSecondaryColor3iEXT GLEW_GET_FUN(__glewSecondaryColor3iEXT) -#define glSecondaryColor3ivEXT GLEW_GET_FUN(__glewSecondaryColor3ivEXT) -#define glSecondaryColor3sEXT GLEW_GET_FUN(__glewSecondaryColor3sEXT) -#define glSecondaryColor3svEXT GLEW_GET_FUN(__glewSecondaryColor3svEXT) -#define glSecondaryColor3ubEXT GLEW_GET_FUN(__glewSecondaryColor3ubEXT) -#define glSecondaryColor3ubvEXT GLEW_GET_FUN(__glewSecondaryColor3ubvEXT) -#define glSecondaryColor3uiEXT GLEW_GET_FUN(__glewSecondaryColor3uiEXT) -#define glSecondaryColor3uivEXT GLEW_GET_FUN(__glewSecondaryColor3uivEXT) -#define glSecondaryColor3usEXT GLEW_GET_FUN(__glewSecondaryColor3usEXT) -#define glSecondaryColor3usvEXT GLEW_GET_FUN(__glewSecondaryColor3usvEXT) -#define glSecondaryColorPointerEXT GLEW_GET_FUN(__glewSecondaryColorPointerEXT) - -#define GLEW_EXT_secondary_color GLEW_GET_VAR(__GLEW_EXT_secondary_color) - -#endif /* GL_EXT_secondary_color */ - -/* --------------------- GL_EXT_separate_shader_objects -------------------- */ - -#ifndef GL_EXT_separate_shader_objects -#define GL_EXT_separate_shader_objects 1 - -#define GL_ACTIVE_PROGRAM_EXT 0x8B8D - -typedef void (GLAPIENTRY * PFNGLACTIVEPROGRAMEXTPROC) (GLuint program); -typedef GLuint (GLAPIENTRY * PFNGLCREATESHADERPROGRAMEXTPROC) (GLenum type, const GLchar* string); -typedef void (GLAPIENTRY * PFNGLUSESHADERPROGRAMEXTPROC) (GLenum type, GLuint program); - -#define glActiveProgramEXT GLEW_GET_FUN(__glewActiveProgramEXT) -#define glCreateShaderProgramEXT GLEW_GET_FUN(__glewCreateShaderProgramEXT) -#define glUseShaderProgramEXT GLEW_GET_FUN(__glewUseShaderProgramEXT) - -#define GLEW_EXT_separate_shader_objects GLEW_GET_VAR(__GLEW_EXT_separate_shader_objects) - -#endif /* GL_EXT_separate_shader_objects */ - -/* --------------------- GL_EXT_separate_specular_color -------------------- */ - -#ifndef GL_EXT_separate_specular_color -#define GL_EXT_separate_specular_color 1 - -#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8 -#define GL_SINGLE_COLOR_EXT 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA - -#define GLEW_EXT_separate_specular_color GLEW_GET_VAR(__GLEW_EXT_separate_specular_color) - -#endif /* GL_EXT_separate_specular_color */ - -/* ------------------- GL_EXT_shader_image_load_formatted ------------------ */ - -#ifndef GL_EXT_shader_image_load_formatted -#define GL_EXT_shader_image_load_formatted 1 - -#define GLEW_EXT_shader_image_load_formatted GLEW_GET_VAR(__GLEW_EXT_shader_image_load_formatted) - -#endif /* GL_EXT_shader_image_load_formatted */ - -/* --------------------- GL_EXT_shader_image_load_store -------------------- */ - -#ifndef GL_EXT_shader_image_load_store -#define GL_EXT_shader_image_load_store 1 - -#define GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT_EXT 0x00000001 -#define GL_ELEMENT_ARRAY_BARRIER_BIT_EXT 0x00000002 -#define GL_UNIFORM_BARRIER_BIT_EXT 0x00000004 -#define GL_TEXTURE_FETCH_BARRIER_BIT_EXT 0x00000008 -#define GL_SHADER_IMAGE_ACCESS_BARRIER_BIT_EXT 0x00000020 -#define GL_COMMAND_BARRIER_BIT_EXT 0x00000040 -#define GL_PIXEL_BUFFER_BARRIER_BIT_EXT 0x00000080 -#define GL_TEXTURE_UPDATE_BARRIER_BIT_EXT 0x00000100 -#define GL_BUFFER_UPDATE_BARRIER_BIT_EXT 0x00000200 -#define GL_FRAMEBUFFER_BARRIER_BIT_EXT 0x00000400 -#define GL_TRANSFORM_FEEDBACK_BARRIER_BIT_EXT 0x00000800 -#define GL_ATOMIC_COUNTER_BARRIER_BIT_EXT 0x00001000 -#define GL_MAX_IMAGE_UNITS_EXT 0x8F38 -#define GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT 0x8F39 -#define GL_IMAGE_BINDING_NAME_EXT 0x8F3A -#define GL_IMAGE_BINDING_LEVEL_EXT 0x8F3B -#define GL_IMAGE_BINDING_LAYERED_EXT 0x8F3C -#define GL_IMAGE_BINDING_LAYER_EXT 0x8F3D -#define GL_IMAGE_BINDING_ACCESS_EXT 0x8F3E -#define GL_IMAGE_1D_EXT 0x904C -#define GL_IMAGE_2D_EXT 0x904D -#define GL_IMAGE_3D_EXT 0x904E -#define GL_IMAGE_2D_RECT_EXT 0x904F -#define GL_IMAGE_CUBE_EXT 0x9050 -#define GL_IMAGE_BUFFER_EXT 0x9051 -#define GL_IMAGE_1D_ARRAY_EXT 0x9052 -#define GL_IMAGE_2D_ARRAY_EXT 0x9053 -#define GL_IMAGE_CUBE_MAP_ARRAY_EXT 0x9054 -#define GL_IMAGE_2D_MULTISAMPLE_EXT 0x9055 -#define GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9056 -#define GL_INT_IMAGE_1D_EXT 0x9057 -#define GL_INT_IMAGE_2D_EXT 0x9058 -#define GL_INT_IMAGE_3D_EXT 0x9059 -#define GL_INT_IMAGE_2D_RECT_EXT 0x905A -#define GL_INT_IMAGE_CUBE_EXT 0x905B -#define GL_INT_IMAGE_BUFFER_EXT 0x905C -#define GL_INT_IMAGE_1D_ARRAY_EXT 0x905D -#define GL_INT_IMAGE_2D_ARRAY_EXT 0x905E -#define GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x905F -#define GL_INT_IMAGE_2D_MULTISAMPLE_EXT 0x9060 -#define GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x9061 -#define GL_UNSIGNED_INT_IMAGE_1D_EXT 0x9062 -#define GL_UNSIGNED_INT_IMAGE_2D_EXT 0x9063 -#define GL_UNSIGNED_INT_IMAGE_3D_EXT 0x9064 -#define GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT 0x9065 -#define GL_UNSIGNED_INT_IMAGE_CUBE_EXT 0x9066 -#define GL_UNSIGNED_INT_IMAGE_BUFFER_EXT 0x9067 -#define GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT 0x9068 -#define GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT 0x9069 -#define GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT 0x906A -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT 0x906B -#define GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT 0x906C -#define GL_MAX_IMAGE_SAMPLES_EXT 0x906D -#define GL_IMAGE_BINDING_FORMAT_EXT 0x906E -#define GL_ALL_BARRIER_BITS_EXT 0xFFFFFFFF - -typedef void (GLAPIENTRY * PFNGLBINDIMAGETEXTUREEXTPROC) (GLuint index, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLint format); -typedef void (GLAPIENTRY * PFNGLMEMORYBARRIEREXTPROC) (GLbitfield barriers); - -#define glBindImageTextureEXT GLEW_GET_FUN(__glewBindImageTextureEXT) -#define glMemoryBarrierEXT GLEW_GET_FUN(__glewMemoryBarrierEXT) - -#define GLEW_EXT_shader_image_load_store GLEW_GET_VAR(__GLEW_EXT_shader_image_load_store) - -#endif /* GL_EXT_shader_image_load_store */ - -/* ----------------------- GL_EXT_shader_integer_mix ----------------------- */ - -#ifndef GL_EXT_shader_integer_mix -#define GL_EXT_shader_integer_mix 1 - -#define GLEW_EXT_shader_integer_mix GLEW_GET_VAR(__GLEW_EXT_shader_integer_mix) - -#endif /* GL_EXT_shader_integer_mix */ - -/* -------------------------- GL_EXT_shadow_funcs -------------------------- */ - -#ifndef GL_EXT_shadow_funcs -#define GL_EXT_shadow_funcs 1 - -#define GLEW_EXT_shadow_funcs GLEW_GET_VAR(__GLEW_EXT_shadow_funcs) - -#endif /* GL_EXT_shadow_funcs */ - -/* --------------------- GL_EXT_shared_texture_palette --------------------- */ - -#ifndef GL_EXT_shared_texture_palette -#define GL_EXT_shared_texture_palette 1 - -#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB - -#define GLEW_EXT_shared_texture_palette GLEW_GET_VAR(__GLEW_EXT_shared_texture_palette) - -#endif /* GL_EXT_shared_texture_palette */ - -/* ------------------------- GL_EXT_sparse_texture2 ------------------------ */ - -#ifndef GL_EXT_sparse_texture2 -#define GL_EXT_sparse_texture2 1 - -#define GLEW_EXT_sparse_texture2 GLEW_GET_VAR(__GLEW_EXT_sparse_texture2) - -#endif /* GL_EXT_sparse_texture2 */ - -/* ------------------------ GL_EXT_stencil_clear_tag ----------------------- */ - -#ifndef GL_EXT_stencil_clear_tag -#define GL_EXT_stencil_clear_tag 1 - -#define GL_STENCIL_TAG_BITS_EXT 0x88F2 -#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3 - -#define GLEW_EXT_stencil_clear_tag GLEW_GET_VAR(__GLEW_EXT_stencil_clear_tag) - -#endif /* GL_EXT_stencil_clear_tag */ - -/* ------------------------ GL_EXT_stencil_two_side ------------------------ */ - -#ifndef GL_EXT_stencil_two_side -#define GL_EXT_stencil_two_side 1 - -#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 -#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 - -typedef void (GLAPIENTRY * PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); - -#define glActiveStencilFaceEXT GLEW_GET_FUN(__glewActiveStencilFaceEXT) - -#define GLEW_EXT_stencil_two_side GLEW_GET_VAR(__GLEW_EXT_stencil_two_side) - -#endif /* GL_EXT_stencil_two_side */ - -/* -------------------------- GL_EXT_stencil_wrap -------------------------- */ - -#ifndef GL_EXT_stencil_wrap -#define GL_EXT_stencil_wrap 1 - -#define GL_INCR_WRAP_EXT 0x8507 -#define GL_DECR_WRAP_EXT 0x8508 - -#define GLEW_EXT_stencil_wrap GLEW_GET_VAR(__GLEW_EXT_stencil_wrap) - -#endif /* GL_EXT_stencil_wrap */ - -/* --------------------------- GL_EXT_subtexture --------------------------- */ - -#ifndef GL_EXT_subtexture -#define GL_EXT_subtexture 1 - -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *pixels); - -#define glTexSubImage1DEXT GLEW_GET_FUN(__glewTexSubImage1DEXT) -#define glTexSubImage2DEXT GLEW_GET_FUN(__glewTexSubImage2DEXT) -#define glTexSubImage3DEXT GLEW_GET_FUN(__glewTexSubImage3DEXT) - -#define GLEW_EXT_subtexture GLEW_GET_VAR(__GLEW_EXT_subtexture) - -#endif /* GL_EXT_subtexture */ - -/* ----------------------------- GL_EXT_texture ---------------------------- */ - -#ifndef GL_EXT_texture -#define GL_EXT_texture 1 - -#define GL_ALPHA4_EXT 0x803B -#define GL_ALPHA8_EXT 0x803C -#define GL_ALPHA12_EXT 0x803D -#define GL_ALPHA16_EXT 0x803E -#define GL_LUMINANCE4_EXT 0x803F -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE12_EXT 0x8041 -#define GL_LUMINANCE16_EXT 0x8042 -#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 -#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 -#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 -#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 -#define GL_INTENSITY_EXT 0x8049 -#define GL_INTENSITY4_EXT 0x804A -#define GL_INTENSITY8_EXT 0x804B -#define GL_INTENSITY12_EXT 0x804C -#define GL_INTENSITY16_EXT 0x804D -#define GL_RGB2_EXT 0x804E -#define GL_RGB4_EXT 0x804F -#define GL_RGB5_EXT 0x8050 -#define GL_RGB8_EXT 0x8051 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB12_EXT 0x8053 -#define GL_RGB16_EXT 0x8054 -#define GL_RGBA2_EXT 0x8055 -#define GL_RGBA4_EXT 0x8056 -#define GL_RGB5_A1_EXT 0x8057 -#define GL_RGBA8_EXT 0x8058 -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGBA12_EXT 0x805A -#define GL_RGBA16_EXT 0x805B -#define GL_TEXTURE_RED_SIZE_EXT 0x805C -#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D -#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E -#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 -#define GL_REPLACE_EXT 0x8062 -#define GL_PROXY_TEXTURE_1D_EXT 0x8063 -#define GL_PROXY_TEXTURE_2D_EXT 0x8064 - -#define GLEW_EXT_texture GLEW_GET_VAR(__GLEW_EXT_texture) - -#endif /* GL_EXT_texture */ - -/* ---------------------------- GL_EXT_texture3D --------------------------- */ - -#ifndef GL_EXT_texture3D -#define GL_EXT_texture3D 1 - -#define GL_PACK_SKIP_IMAGES_EXT 0x806B -#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C -#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D -#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E -#define GL_TEXTURE_3D_EXT 0x806F -#define GL_PROXY_TEXTURE_3D_EXT 0x8070 -#define GL_TEXTURE_DEPTH_EXT 0x8071 -#define GL_TEXTURE_WRAP_R_EXT 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 - -typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const void *pixels); - -#define glTexImage3DEXT GLEW_GET_FUN(__glewTexImage3DEXT) - -#define GLEW_EXT_texture3D GLEW_GET_VAR(__GLEW_EXT_texture3D) - -#endif /* GL_EXT_texture3D */ - -/* -------------------------- GL_EXT_texture_array ------------------------- */ - -#ifndef GL_EXT_texture_array -#define GL_EXT_texture_array 1 - -#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E -#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF -#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 -#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); - -#define glFramebufferTextureLayerEXT GLEW_GET_FUN(__glewFramebufferTextureLayerEXT) - -#define GLEW_EXT_texture_array GLEW_GET_VAR(__GLEW_EXT_texture_array) - -#endif /* GL_EXT_texture_array */ - -/* ---------------------- GL_EXT_texture_buffer_object --------------------- */ - -#ifndef GL_EXT_texture_buffer_object -#define GL_EXT_texture_buffer_object 1 - -#define GL_TEXTURE_BUFFER_EXT 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_EXT 0x8C2E - -typedef void (GLAPIENTRY * PFNGLTEXBUFFEREXTPROC) (GLenum target, GLenum internalformat, GLuint buffer); - -#define glTexBufferEXT GLEW_GET_FUN(__glewTexBufferEXT) - -#define GLEW_EXT_texture_buffer_object GLEW_GET_VAR(__GLEW_EXT_texture_buffer_object) - -#endif /* GL_EXT_texture_buffer_object */ - -/* -------------------- GL_EXT_texture_compression_dxt1 -------------------- */ - -#ifndef GL_EXT_texture_compression_dxt1 -#define GL_EXT_texture_compression_dxt1 1 - -#define GLEW_EXT_texture_compression_dxt1 GLEW_GET_VAR(__GLEW_EXT_texture_compression_dxt1) - -#endif /* GL_EXT_texture_compression_dxt1 */ - -/* -------------------- GL_EXT_texture_compression_latc -------------------- */ - -#ifndef GL_EXT_texture_compression_latc -#define GL_EXT_texture_compression_latc 1 - -#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 -#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 -#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72 -#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73 - -#define GLEW_EXT_texture_compression_latc GLEW_GET_VAR(__GLEW_EXT_texture_compression_latc) - -#endif /* GL_EXT_texture_compression_latc */ - -/* -------------------- GL_EXT_texture_compression_rgtc -------------------- */ - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_EXT_texture_compression_rgtc 1 - -#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC -#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD -#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE - -#define GLEW_EXT_texture_compression_rgtc GLEW_GET_VAR(__GLEW_EXT_texture_compression_rgtc) - -#endif /* GL_EXT_texture_compression_rgtc */ - -/* -------------------- GL_EXT_texture_compression_s3tc -------------------- */ - -#ifndef GL_EXT_texture_compression_s3tc -#define GL_EXT_texture_compression_s3tc 1 - -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 - -#define GLEW_EXT_texture_compression_s3tc GLEW_GET_VAR(__GLEW_EXT_texture_compression_s3tc) - -#endif /* GL_EXT_texture_compression_s3tc */ - -/* ------------------------ GL_EXT_texture_cube_map ------------------------ */ - -#ifndef GL_EXT_texture_cube_map -#define GL_EXT_texture_cube_map 1 - -#define GL_NORMAL_MAP_EXT 0x8511 -#define GL_REFLECTION_MAP_EXT 0x8512 -#define GL_TEXTURE_CUBE_MAP_EXT 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C - -#define GLEW_EXT_texture_cube_map GLEW_GET_VAR(__GLEW_EXT_texture_cube_map) - -#endif /* GL_EXT_texture_cube_map */ - -/* ----------------------- GL_EXT_texture_edge_clamp ----------------------- */ - -#ifndef GL_EXT_texture_edge_clamp -#define GL_EXT_texture_edge_clamp 1 - -#define GL_CLAMP_TO_EDGE_EXT 0x812F - -#define GLEW_EXT_texture_edge_clamp GLEW_GET_VAR(__GLEW_EXT_texture_edge_clamp) - -#endif /* GL_EXT_texture_edge_clamp */ - -/* --------------------------- GL_EXT_texture_env -------------------------- */ - -#ifndef GL_EXT_texture_env -#define GL_EXT_texture_env 1 - -#define GLEW_EXT_texture_env GLEW_GET_VAR(__GLEW_EXT_texture_env) - -#endif /* GL_EXT_texture_env */ - -/* ------------------------- GL_EXT_texture_env_add ------------------------ */ - -#ifndef GL_EXT_texture_env_add -#define GL_EXT_texture_env_add 1 - -#define GLEW_EXT_texture_env_add GLEW_GET_VAR(__GLEW_EXT_texture_env_add) - -#endif /* GL_EXT_texture_env_add */ - -/* ----------------------- GL_EXT_texture_env_combine ---------------------- */ - -#ifndef GL_EXT_texture_env_combine -#define GL_EXT_texture_env_combine 1 - -#define GL_COMBINE_EXT 0x8570 -#define GL_COMBINE_RGB_EXT 0x8571 -#define GL_COMBINE_ALPHA_EXT 0x8572 -#define GL_RGB_SCALE_EXT 0x8573 -#define GL_ADD_SIGNED_EXT 0x8574 -#define GL_INTERPOLATE_EXT 0x8575 -#define GL_CONSTANT_EXT 0x8576 -#define GL_PRIMARY_COLOR_EXT 0x8577 -#define GL_PREVIOUS_EXT 0x8578 -#define GL_SOURCE0_RGB_EXT 0x8580 -#define GL_SOURCE1_RGB_EXT 0x8581 -#define GL_SOURCE2_RGB_EXT 0x8582 -#define GL_SOURCE0_ALPHA_EXT 0x8588 -#define GL_SOURCE1_ALPHA_EXT 0x8589 -#define GL_SOURCE2_ALPHA_EXT 0x858A -#define GL_OPERAND0_RGB_EXT 0x8590 -#define GL_OPERAND1_RGB_EXT 0x8591 -#define GL_OPERAND2_RGB_EXT 0x8592 -#define GL_OPERAND0_ALPHA_EXT 0x8598 -#define GL_OPERAND1_ALPHA_EXT 0x8599 -#define GL_OPERAND2_ALPHA_EXT 0x859A - -#define GLEW_EXT_texture_env_combine GLEW_GET_VAR(__GLEW_EXT_texture_env_combine) - -#endif /* GL_EXT_texture_env_combine */ - -/* ------------------------ GL_EXT_texture_env_dot3 ------------------------ */ - -#ifndef GL_EXT_texture_env_dot3 -#define GL_EXT_texture_env_dot3 1 - -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 - -#define GLEW_EXT_texture_env_dot3 GLEW_GET_VAR(__GLEW_EXT_texture_env_dot3) - -#endif /* GL_EXT_texture_env_dot3 */ - -/* ------------------- GL_EXT_texture_filter_anisotropic ------------------- */ - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 - -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF - -#define GLEW_EXT_texture_filter_anisotropic GLEW_GET_VAR(__GLEW_EXT_texture_filter_anisotropic) - -#endif /* GL_EXT_texture_filter_anisotropic */ - -/* ---------------------- GL_EXT_texture_filter_minmax --------------------- */ - -#ifndef GL_EXT_texture_filter_minmax -#define GL_EXT_texture_filter_minmax 1 - -#define GL_TEXTURE_REDUCTION_MODE_EXT 0x9366 -#define GL_WEIGHTED_AVERAGE_EXT 0x9367 - -#define GLEW_EXT_texture_filter_minmax GLEW_GET_VAR(__GLEW_EXT_texture_filter_minmax) - -#endif /* GL_EXT_texture_filter_minmax */ - -/* ------------------------- GL_EXT_texture_integer ------------------------ */ - -#ifndef GL_EXT_texture_integer -#define GL_EXT_texture_integer 1 - -#define GL_RGBA32UI_EXT 0x8D70 -#define GL_RGB32UI_EXT 0x8D71 -#define GL_ALPHA32UI_EXT 0x8D72 -#define GL_INTENSITY32UI_EXT 0x8D73 -#define GL_LUMINANCE32UI_EXT 0x8D74 -#define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 -#define GL_RGBA16UI_EXT 0x8D76 -#define GL_RGB16UI_EXT 0x8D77 -#define GL_ALPHA16UI_EXT 0x8D78 -#define GL_INTENSITY16UI_EXT 0x8D79 -#define GL_LUMINANCE16UI_EXT 0x8D7A -#define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B -#define GL_RGBA8UI_EXT 0x8D7C -#define GL_RGB8UI_EXT 0x8D7D -#define GL_ALPHA8UI_EXT 0x8D7E -#define GL_INTENSITY8UI_EXT 0x8D7F -#define GL_LUMINANCE8UI_EXT 0x8D80 -#define GL_LUMINANCE_ALPHA8UI_EXT 0x8D81 -#define GL_RGBA32I_EXT 0x8D82 -#define GL_RGB32I_EXT 0x8D83 -#define GL_ALPHA32I_EXT 0x8D84 -#define GL_INTENSITY32I_EXT 0x8D85 -#define GL_LUMINANCE32I_EXT 0x8D86 -#define GL_LUMINANCE_ALPHA32I_EXT 0x8D87 -#define GL_RGBA16I_EXT 0x8D88 -#define GL_RGB16I_EXT 0x8D89 -#define GL_ALPHA16I_EXT 0x8D8A -#define GL_INTENSITY16I_EXT 0x8D8B -#define GL_LUMINANCE16I_EXT 0x8D8C -#define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D -#define GL_RGBA8I_EXT 0x8D8E -#define GL_RGB8I_EXT 0x8D8F -#define GL_ALPHA8I_EXT 0x8D90 -#define GL_INTENSITY8I_EXT 0x8D91 -#define GL_LUMINANCE8I_EXT 0x8D92 -#define GL_LUMINANCE_ALPHA8I_EXT 0x8D93 -#define GL_RED_INTEGER_EXT 0x8D94 -#define GL_GREEN_INTEGER_EXT 0x8D95 -#define GL_BLUE_INTEGER_EXT 0x8D96 -#define GL_ALPHA_INTEGER_EXT 0x8D97 -#define GL_RGB_INTEGER_EXT 0x8D98 -#define GL_RGBA_INTEGER_EXT 0x8D99 -#define GL_BGR_INTEGER_EXT 0x8D9A -#define GL_BGRA_INTEGER_EXT 0x8D9B -#define GL_LUMINANCE_INTEGER_EXT 0x8D9C -#define GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D -#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E - -typedef void (GLAPIENTRY * PFNGLCLEARCOLORIIEXTPROC) (GLint red, GLint green, GLint blue, GLint alpha); -typedef void (GLAPIENTRY * PFNGLCLEARCOLORIUIEXTPROC) (GLuint red, GLuint green, GLuint blue, GLuint alpha); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, GLuint *params); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERIUIVEXTPROC) (GLenum target, GLenum pname, const GLuint *params); - -#define glClearColorIiEXT GLEW_GET_FUN(__glewClearColorIiEXT) -#define glClearColorIuiEXT GLEW_GET_FUN(__glewClearColorIuiEXT) -#define glGetTexParameterIivEXT GLEW_GET_FUN(__glewGetTexParameterIivEXT) -#define glGetTexParameterIuivEXT GLEW_GET_FUN(__glewGetTexParameterIuivEXT) -#define glTexParameterIivEXT GLEW_GET_FUN(__glewTexParameterIivEXT) -#define glTexParameterIuivEXT GLEW_GET_FUN(__glewTexParameterIuivEXT) - -#define GLEW_EXT_texture_integer GLEW_GET_VAR(__GLEW_EXT_texture_integer) - -#endif /* GL_EXT_texture_integer */ - -/* ------------------------ GL_EXT_texture_lod_bias ------------------------ */ - -#ifndef GL_EXT_texture_lod_bias -#define GL_EXT_texture_lod_bias 1 - -#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD -#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 -#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 - -#define GLEW_EXT_texture_lod_bias GLEW_GET_VAR(__GLEW_EXT_texture_lod_bias) - -#endif /* GL_EXT_texture_lod_bias */ - -/* ---------------------- GL_EXT_texture_mirror_clamp ---------------------- */ - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_EXT_texture_mirror_clamp 1 - -#define GL_MIRROR_CLAMP_EXT 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 -#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 - -#define GLEW_EXT_texture_mirror_clamp GLEW_GET_VAR(__GLEW_EXT_texture_mirror_clamp) - -#endif /* GL_EXT_texture_mirror_clamp */ - -/* ------------------------- GL_EXT_texture_object ------------------------- */ - -#ifndef GL_EXT_texture_object -#define GL_EXT_texture_object 1 - -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A - -typedef GLboolean (GLAPIENTRY * PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint* textures, GLboolean* residences); -typedef void (GLAPIENTRY * PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture); -typedef void (GLAPIENTRY * PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint* textures); -typedef void (GLAPIENTRY * PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint* textures); -typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREEXTPROC) (GLuint texture); -typedef void (GLAPIENTRY * PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint* textures, const GLclampf* priorities); - -#define glAreTexturesResidentEXT GLEW_GET_FUN(__glewAreTexturesResidentEXT) -#define glBindTextureEXT GLEW_GET_FUN(__glewBindTextureEXT) -#define glDeleteTexturesEXT GLEW_GET_FUN(__glewDeleteTexturesEXT) -#define glGenTexturesEXT GLEW_GET_FUN(__glewGenTexturesEXT) -#define glIsTextureEXT GLEW_GET_FUN(__glewIsTextureEXT) -#define glPrioritizeTexturesEXT GLEW_GET_FUN(__glewPrioritizeTexturesEXT) - -#define GLEW_EXT_texture_object GLEW_GET_VAR(__GLEW_EXT_texture_object) - -#endif /* GL_EXT_texture_object */ - -/* --------------------- GL_EXT_texture_perturb_normal --------------------- */ - -#ifndef GL_EXT_texture_perturb_normal -#define GL_EXT_texture_perturb_normal 1 - -#define GL_PERTURB_EXT 0x85AE -#define GL_TEXTURE_NORMAL_EXT 0x85AF - -typedef void (GLAPIENTRY * PFNGLTEXTURENORMALEXTPROC) (GLenum mode); - -#define glTextureNormalEXT GLEW_GET_FUN(__glewTextureNormalEXT) - -#define GLEW_EXT_texture_perturb_normal GLEW_GET_VAR(__GLEW_EXT_texture_perturb_normal) - -#endif /* GL_EXT_texture_perturb_normal */ - -/* ------------------------ GL_EXT_texture_rectangle ----------------------- */ - -#ifndef GL_EXT_texture_rectangle -#define GL_EXT_texture_rectangle 1 - -#define GL_TEXTURE_RECTANGLE_EXT 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_EXT 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_EXT 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_EXT 0x84F8 - -#define GLEW_EXT_texture_rectangle GLEW_GET_VAR(__GLEW_EXT_texture_rectangle) - -#endif /* GL_EXT_texture_rectangle */ - -/* -------------------------- GL_EXT_texture_sRGB -------------------------- */ - -#ifndef GL_EXT_texture_sRGB -#define GL_EXT_texture_sRGB 1 - -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB8_EXT 0x8C41 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 -#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 -#define GL_SLUMINANCE_EXT 0x8C46 -#define GL_SLUMINANCE8_EXT 0x8C47 -#define GL_COMPRESSED_SRGB_EXT 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 -#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B -#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F - -#define GLEW_EXT_texture_sRGB GLEW_GET_VAR(__GLEW_EXT_texture_sRGB) - -#endif /* GL_EXT_texture_sRGB */ - -/* ----------------------- GL_EXT_texture_sRGB_decode ---------------------- */ - -#ifndef GL_EXT_texture_sRGB_decode -#define GL_EXT_texture_sRGB_decode 1 - -#define GL_TEXTURE_SRGB_DECODE_EXT 0x8A48 -#define GL_DECODE_EXT 0x8A49 -#define GL_SKIP_DECODE_EXT 0x8A4A - -#define GLEW_EXT_texture_sRGB_decode GLEW_GET_VAR(__GLEW_EXT_texture_sRGB_decode) - -#endif /* GL_EXT_texture_sRGB_decode */ - -/* --------------------- GL_EXT_texture_shared_exponent -------------------- */ - -#ifndef GL_EXT_texture_shared_exponent -#define GL_EXT_texture_shared_exponent 1 - -#define GL_RGB9_E5_EXT 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E -#define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F - -#define GLEW_EXT_texture_shared_exponent GLEW_GET_VAR(__GLEW_EXT_texture_shared_exponent) - -#endif /* GL_EXT_texture_shared_exponent */ - -/* -------------------------- GL_EXT_texture_snorm ------------------------- */ - -#ifndef GL_EXT_texture_snorm -#define GL_EXT_texture_snorm 1 - -#define GL_RED_SNORM 0x8F90 -#define GL_RG_SNORM 0x8F91 -#define GL_RGB_SNORM 0x8F92 -#define GL_RGBA_SNORM 0x8F93 -#define GL_R8_SNORM 0x8F94 -#define GL_RG8_SNORM 0x8F95 -#define GL_RGB8_SNORM 0x8F96 -#define GL_RGBA8_SNORM 0x8F97 -#define GL_R16_SNORM 0x8F98 -#define GL_RG16_SNORM 0x8F99 -#define GL_RGB16_SNORM 0x8F9A -#define GL_RGBA16_SNORM 0x8F9B -#define GL_SIGNED_NORMALIZED 0x8F9C -#define GL_ALPHA_SNORM 0x9010 -#define GL_LUMINANCE_SNORM 0x9011 -#define GL_LUMINANCE_ALPHA_SNORM 0x9012 -#define GL_INTENSITY_SNORM 0x9013 -#define GL_ALPHA8_SNORM 0x9014 -#define GL_LUMINANCE8_SNORM 0x9015 -#define GL_LUMINANCE8_ALPHA8_SNORM 0x9016 -#define GL_INTENSITY8_SNORM 0x9017 -#define GL_ALPHA16_SNORM 0x9018 -#define GL_LUMINANCE16_SNORM 0x9019 -#define GL_LUMINANCE16_ALPHA16_SNORM 0x901A -#define GL_INTENSITY16_SNORM 0x901B - -#define GLEW_EXT_texture_snorm GLEW_GET_VAR(__GLEW_EXT_texture_snorm) - -#endif /* GL_EXT_texture_snorm */ - -/* ------------------------- GL_EXT_texture_swizzle ------------------------ */ - -#ifndef GL_EXT_texture_swizzle -#define GL_EXT_texture_swizzle 1 - -#define GL_TEXTURE_SWIZZLE_R_EXT 0x8E42 -#define GL_TEXTURE_SWIZZLE_G_EXT 0x8E43 -#define GL_TEXTURE_SWIZZLE_B_EXT 0x8E44 -#define GL_TEXTURE_SWIZZLE_A_EXT 0x8E45 -#define GL_TEXTURE_SWIZZLE_RGBA_EXT 0x8E46 - -#define GLEW_EXT_texture_swizzle GLEW_GET_VAR(__GLEW_EXT_texture_swizzle) - -#endif /* GL_EXT_texture_swizzle */ - -/* --------------------------- GL_EXT_timer_query -------------------------- */ - -#ifndef GL_EXT_timer_query -#define GL_EXT_timer_query 1 - -#define GL_TIME_ELAPSED_EXT 0x88BF - -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTI64VEXTPROC) (GLuint id, GLenum pname, GLint64EXT *params); -typedef void (GLAPIENTRY * PFNGLGETQUERYOBJECTUI64VEXTPROC) (GLuint id, GLenum pname, GLuint64EXT *params); - -#define glGetQueryObjecti64vEXT GLEW_GET_FUN(__glewGetQueryObjecti64vEXT) -#define glGetQueryObjectui64vEXT GLEW_GET_FUN(__glewGetQueryObjectui64vEXT) - -#define GLEW_EXT_timer_query GLEW_GET_VAR(__GLEW_EXT_timer_query) - -#endif /* GL_EXT_timer_query */ - -/* ----------------------- GL_EXT_transform_feedback ----------------------- */ - -#ifndef GL_EXT_transform_feedback -#define GL_EXT_transform_feedback 1 - -#define GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT 0x8C76 -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT 0x8C80 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_EXT 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT 0x8C85 -#define GL_PRIMITIVES_GENERATED_EXT 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT 0x8C88 -#define GL_RASTERIZER_DISCARD_EXT 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT 0x8C8B -#define GL_INTERLEAVED_ATTRIBS_EXT 0x8C8C -#define GL_SEPARATE_ATTRIBS_EXT 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER_EXT 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT 0x8C8F - -typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKEXTPROC) (GLenum primitiveMode); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASEEXTPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBINDBUFFEROFFSETEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGEEXTPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKEXTPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC) (GLuint program, GLsizei count, const GLchar * const* varyings, GLenum bufferMode); - -#define glBeginTransformFeedbackEXT GLEW_GET_FUN(__glewBeginTransformFeedbackEXT) -#define glBindBufferBaseEXT GLEW_GET_FUN(__glewBindBufferBaseEXT) -#define glBindBufferOffsetEXT GLEW_GET_FUN(__glewBindBufferOffsetEXT) -#define glBindBufferRangeEXT GLEW_GET_FUN(__glewBindBufferRangeEXT) -#define glEndTransformFeedbackEXT GLEW_GET_FUN(__glewEndTransformFeedbackEXT) -#define glGetTransformFeedbackVaryingEXT GLEW_GET_FUN(__glewGetTransformFeedbackVaryingEXT) -#define glTransformFeedbackVaryingsEXT GLEW_GET_FUN(__glewTransformFeedbackVaryingsEXT) - -#define GLEW_EXT_transform_feedback GLEW_GET_VAR(__GLEW_EXT_transform_feedback) - -#endif /* GL_EXT_transform_feedback */ - -/* -------------------------- GL_EXT_vertex_array -------------------------- */ - -#ifndef GL_EXT_vertex_array -#define GL_EXT_vertex_array 1 - -#define GL_DOUBLE_EXT 0x140A -#define GL_VERTEX_ARRAY_EXT 0x8074 -#define GL_NORMAL_ARRAY_EXT 0x8075 -#define GL_COLOR_ARRAY_EXT 0x8076 -#define GL_INDEX_ARRAY_EXT 0x8077 -#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 -#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 -#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A -#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B -#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C -#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D -#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E -#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F -#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 -#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 -#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 -#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 -#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 -#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 -#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 -#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 -#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A -#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B -#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C -#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D -#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E -#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F -#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 -#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 - -typedef void (GLAPIENTRY * PFNGLARRAYELEMENTEXTPROC) (GLint i); -typedef void (GLAPIENTRY * PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer); -typedef void (GLAPIENTRY * PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean* pointer); -typedef void (GLAPIENTRY * PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer); -typedef void (GLAPIENTRY * PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const void *pointer); -typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const void *pointer); - -#define glArrayElementEXT GLEW_GET_FUN(__glewArrayElementEXT) -#define glColorPointerEXT GLEW_GET_FUN(__glewColorPointerEXT) -#define glDrawArraysEXT GLEW_GET_FUN(__glewDrawArraysEXT) -#define glEdgeFlagPointerEXT GLEW_GET_FUN(__glewEdgeFlagPointerEXT) -#define glIndexPointerEXT GLEW_GET_FUN(__glewIndexPointerEXT) -#define glNormalPointerEXT GLEW_GET_FUN(__glewNormalPointerEXT) -#define glTexCoordPointerEXT GLEW_GET_FUN(__glewTexCoordPointerEXT) -#define glVertexPointerEXT GLEW_GET_FUN(__glewVertexPointerEXT) - -#define GLEW_EXT_vertex_array GLEW_GET_VAR(__GLEW_EXT_vertex_array) - -#endif /* GL_EXT_vertex_array */ - -/* ------------------------ GL_EXT_vertex_array_bgra ----------------------- */ - -#ifndef GL_EXT_vertex_array_bgra -#define GL_EXT_vertex_array_bgra 1 - -#define GL_BGRA 0x80E1 - -#define GLEW_EXT_vertex_array_bgra GLEW_GET_VAR(__GLEW_EXT_vertex_array_bgra) - -#endif /* GL_EXT_vertex_array_bgra */ - -/* ----------------------- GL_EXT_vertex_attrib_64bit ---------------------- */ - -#ifndef GL_EXT_vertex_attrib_64bit -#define GL_EXT_vertex_attrib_64bit 1 - -#define GL_DOUBLE_MAT2_EXT 0x8F46 -#define GL_DOUBLE_MAT3_EXT 0x8F47 -#define GL_DOUBLE_MAT4_EXT 0x8F48 -#define GL_DOUBLE_MAT2x3_EXT 0x8F49 -#define GL_DOUBLE_MAT2x4_EXT 0x8F4A -#define GL_DOUBLE_MAT3x2_EXT 0x8F4B -#define GL_DOUBLE_MAT3x4_EXT 0x8F4C -#define GL_DOUBLE_MAT4x2_EXT 0x8F4D -#define GL_DOUBLE_MAT4x3_EXT 0x8F4E -#define GL_DOUBLE_VEC2_EXT 0x8FFC -#define GL_DOUBLE_VEC3_EXT 0x8FFD -#define GL_DOUBLE_VEC4_EXT 0x8FFE - -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLDVEXTPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC) (GLuint vaobj, GLuint buffer, GLuint index, GLint size, GLenum type, GLsizei stride, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DEXTPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1DVEXTPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DEXTPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2DVEXTPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3DVEXTPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DEXTPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4DVEXTPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLPOINTEREXTPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); - -#define glGetVertexAttribLdvEXT GLEW_GET_FUN(__glewGetVertexAttribLdvEXT) -#define glVertexArrayVertexAttribLOffsetEXT GLEW_GET_FUN(__glewVertexArrayVertexAttribLOffsetEXT) -#define glVertexAttribL1dEXT GLEW_GET_FUN(__glewVertexAttribL1dEXT) -#define glVertexAttribL1dvEXT GLEW_GET_FUN(__glewVertexAttribL1dvEXT) -#define glVertexAttribL2dEXT GLEW_GET_FUN(__glewVertexAttribL2dEXT) -#define glVertexAttribL2dvEXT GLEW_GET_FUN(__glewVertexAttribL2dvEXT) -#define glVertexAttribL3dEXT GLEW_GET_FUN(__glewVertexAttribL3dEXT) -#define glVertexAttribL3dvEXT GLEW_GET_FUN(__glewVertexAttribL3dvEXT) -#define glVertexAttribL4dEXT GLEW_GET_FUN(__glewVertexAttribL4dEXT) -#define glVertexAttribL4dvEXT GLEW_GET_FUN(__glewVertexAttribL4dvEXT) -#define glVertexAttribLPointerEXT GLEW_GET_FUN(__glewVertexAttribLPointerEXT) - -#define GLEW_EXT_vertex_attrib_64bit GLEW_GET_VAR(__GLEW_EXT_vertex_attrib_64bit) - -#endif /* GL_EXT_vertex_attrib_64bit */ - -/* -------------------------- GL_EXT_vertex_shader ------------------------- */ - -#ifndef GL_EXT_vertex_shader -#define GL_EXT_vertex_shader 1 - -#define GL_VERTEX_SHADER_EXT 0x8780 -#define GL_VERTEX_SHADER_BINDING_EXT 0x8781 -#define GL_OP_INDEX_EXT 0x8782 -#define GL_OP_NEGATE_EXT 0x8783 -#define GL_OP_DOT3_EXT 0x8784 -#define GL_OP_DOT4_EXT 0x8785 -#define GL_OP_MUL_EXT 0x8786 -#define GL_OP_ADD_EXT 0x8787 -#define GL_OP_MADD_EXT 0x8788 -#define GL_OP_FRAC_EXT 0x8789 -#define GL_OP_MAX_EXT 0x878A -#define GL_OP_MIN_EXT 0x878B -#define GL_OP_SET_GE_EXT 0x878C -#define GL_OP_SET_LT_EXT 0x878D -#define GL_OP_CLAMP_EXT 0x878E -#define GL_OP_FLOOR_EXT 0x878F -#define GL_OP_ROUND_EXT 0x8790 -#define GL_OP_EXP_BASE_2_EXT 0x8791 -#define GL_OP_LOG_BASE_2_EXT 0x8792 -#define GL_OP_POWER_EXT 0x8793 -#define GL_OP_RECIP_EXT 0x8794 -#define GL_OP_RECIP_SQRT_EXT 0x8795 -#define GL_OP_SUB_EXT 0x8796 -#define GL_OP_CROSS_PRODUCT_EXT 0x8797 -#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798 -#define GL_OP_MOV_EXT 0x8799 -#define GL_OUTPUT_VERTEX_EXT 0x879A -#define GL_OUTPUT_COLOR0_EXT 0x879B -#define GL_OUTPUT_COLOR1_EXT 0x879C -#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D -#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E -#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F -#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0 -#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1 -#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2 -#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3 -#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4 -#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5 -#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 -#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7 -#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8 -#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9 -#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA -#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB -#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC -#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD -#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE -#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF -#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0 -#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1 -#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2 -#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3 -#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4 -#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5 -#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6 -#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7 -#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8 -#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9 -#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA -#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB -#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC -#define GL_OUTPUT_FOG_EXT 0x87BD -#define GL_SCALAR_EXT 0x87BE -#define GL_VECTOR_EXT 0x87BF -#define GL_MATRIX_EXT 0x87C0 -#define GL_VARIANT_EXT 0x87C1 -#define GL_INVARIANT_EXT 0x87C2 -#define GL_LOCAL_CONSTANT_EXT 0x87C3 -#define GL_LOCAL_EXT 0x87C4 -#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5 -#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6 -#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7 -#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8 -#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9 -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CC -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CD -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE -#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF -#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0 -#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1 -#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2 -#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3 -#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4 -#define GL_X_EXT 0x87D5 -#define GL_Y_EXT 0x87D6 -#define GL_Z_EXT 0x87D7 -#define GL_W_EXT 0x87D8 -#define GL_NEGATIVE_X_EXT 0x87D9 -#define GL_NEGATIVE_Y_EXT 0x87DA -#define GL_NEGATIVE_Z_EXT 0x87DB -#define GL_NEGATIVE_W_EXT 0x87DC -#define GL_ZERO_EXT 0x87DD -#define GL_ONE_EXT 0x87DE -#define GL_NEGATIVE_ONE_EXT 0x87DF -#define GL_NORMALIZED_RANGE_EXT 0x87E0 -#define GL_FULL_RANGE_EXT 0x87E1 -#define GL_CURRENT_VERTEX_EXT 0x87E2 -#define GL_MVP_MATRIX_EXT 0x87E3 -#define GL_VARIANT_VALUE_EXT 0x87E4 -#define GL_VARIANT_DATATYPE_EXT 0x87E5 -#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6 -#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7 -#define GL_VARIANT_ARRAY_EXT 0x87E8 -#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9 -#define GL_INVARIANT_VALUE_EXT 0x87EA -#define GL_INVARIANT_DATATYPE_EXT 0x87EB -#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC -#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED - -typedef void (GLAPIENTRY * PFNGLBEGINVERTEXSHADEREXTPROC) (void); -typedef GLuint (GLAPIENTRY * PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value); -typedef GLuint (GLAPIENTRY * PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value); -typedef GLuint (GLAPIENTRY * PFNGLBINDPARAMETEREXTPROC) (GLenum value); -typedef GLuint (GLAPIENTRY * PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value); -typedef GLuint (GLAPIENTRY * PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value); -typedef void (GLAPIENTRY * PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLENDVERTEXSHADEREXTPROC) (void); -typedef void (GLAPIENTRY * PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef GLuint (GLAPIENTRY * PFNGLGENSYMBOLSEXTPROC) (GLenum dataType, GLenum storageType, GLenum range, GLuint components); -typedef GLuint (GLAPIENTRY * PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range); -typedef void (GLAPIENTRY * PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (GLAPIENTRY * PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (GLAPIENTRY * PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (GLAPIENTRY * PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (GLAPIENTRY * PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (GLAPIENTRY * PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (GLAPIENTRY * PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (GLAPIENTRY * PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, void **data); -typedef void (GLAPIENTRY * PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef GLboolean (GLAPIENTRY * PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap); -typedef void (GLAPIENTRY * PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, void *addr); -typedef void (GLAPIENTRY * PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, void *addr); -typedef void (GLAPIENTRY * PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1); -typedef void (GLAPIENTRY * PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -typedef void (GLAPIENTRY * PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -typedef void (GLAPIENTRY * PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (GLAPIENTRY * PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, void *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTBVEXTPROC) (GLuint id, GLbyte *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTDVEXTPROC) (GLuint id, GLdouble *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTFVEXTPROC) (GLuint id, GLfloat *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTIVEXTPROC) (GLuint id, GLint *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTSVEXTPROC) (GLuint id, GLshort *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTUBVEXTPROC) (GLuint id, GLubyte *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTUIVEXTPROC) (GLuint id, GLuint *addr); -typedef void (GLAPIENTRY * PFNGLVARIANTUSVEXTPROC) (GLuint id, GLushort *addr); -typedef void (GLAPIENTRY * PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); - -#define glBeginVertexShaderEXT GLEW_GET_FUN(__glewBeginVertexShaderEXT) -#define glBindLightParameterEXT GLEW_GET_FUN(__glewBindLightParameterEXT) -#define glBindMaterialParameterEXT GLEW_GET_FUN(__glewBindMaterialParameterEXT) -#define glBindParameterEXT GLEW_GET_FUN(__glewBindParameterEXT) -#define glBindTexGenParameterEXT GLEW_GET_FUN(__glewBindTexGenParameterEXT) -#define glBindTextureUnitParameterEXT GLEW_GET_FUN(__glewBindTextureUnitParameterEXT) -#define glBindVertexShaderEXT GLEW_GET_FUN(__glewBindVertexShaderEXT) -#define glDeleteVertexShaderEXT GLEW_GET_FUN(__glewDeleteVertexShaderEXT) -#define glDisableVariantClientStateEXT GLEW_GET_FUN(__glewDisableVariantClientStateEXT) -#define glEnableVariantClientStateEXT GLEW_GET_FUN(__glewEnableVariantClientStateEXT) -#define glEndVertexShaderEXT GLEW_GET_FUN(__glewEndVertexShaderEXT) -#define glExtractComponentEXT GLEW_GET_FUN(__glewExtractComponentEXT) -#define glGenSymbolsEXT GLEW_GET_FUN(__glewGenSymbolsEXT) -#define glGenVertexShadersEXT GLEW_GET_FUN(__glewGenVertexShadersEXT) -#define glGetInvariantBooleanvEXT GLEW_GET_FUN(__glewGetInvariantBooleanvEXT) -#define glGetInvariantFloatvEXT GLEW_GET_FUN(__glewGetInvariantFloatvEXT) -#define glGetInvariantIntegervEXT GLEW_GET_FUN(__glewGetInvariantIntegervEXT) -#define glGetLocalConstantBooleanvEXT GLEW_GET_FUN(__glewGetLocalConstantBooleanvEXT) -#define glGetLocalConstantFloatvEXT GLEW_GET_FUN(__glewGetLocalConstantFloatvEXT) -#define glGetLocalConstantIntegervEXT GLEW_GET_FUN(__glewGetLocalConstantIntegervEXT) -#define glGetVariantBooleanvEXT GLEW_GET_FUN(__glewGetVariantBooleanvEXT) -#define glGetVariantFloatvEXT GLEW_GET_FUN(__glewGetVariantFloatvEXT) -#define glGetVariantIntegervEXT GLEW_GET_FUN(__glewGetVariantIntegervEXT) -#define glGetVariantPointervEXT GLEW_GET_FUN(__glewGetVariantPointervEXT) -#define glInsertComponentEXT GLEW_GET_FUN(__glewInsertComponentEXT) -#define glIsVariantEnabledEXT GLEW_GET_FUN(__glewIsVariantEnabledEXT) -#define glSetInvariantEXT GLEW_GET_FUN(__glewSetInvariantEXT) -#define glSetLocalConstantEXT GLEW_GET_FUN(__glewSetLocalConstantEXT) -#define glShaderOp1EXT GLEW_GET_FUN(__glewShaderOp1EXT) -#define glShaderOp2EXT GLEW_GET_FUN(__glewShaderOp2EXT) -#define glShaderOp3EXT GLEW_GET_FUN(__glewShaderOp3EXT) -#define glSwizzleEXT GLEW_GET_FUN(__glewSwizzleEXT) -#define glVariantPointerEXT GLEW_GET_FUN(__glewVariantPointerEXT) -#define glVariantbvEXT GLEW_GET_FUN(__glewVariantbvEXT) -#define glVariantdvEXT GLEW_GET_FUN(__glewVariantdvEXT) -#define glVariantfvEXT GLEW_GET_FUN(__glewVariantfvEXT) -#define glVariantivEXT GLEW_GET_FUN(__glewVariantivEXT) -#define glVariantsvEXT GLEW_GET_FUN(__glewVariantsvEXT) -#define glVariantubvEXT GLEW_GET_FUN(__glewVariantubvEXT) -#define glVariantuivEXT GLEW_GET_FUN(__glewVariantuivEXT) -#define glVariantusvEXT GLEW_GET_FUN(__glewVariantusvEXT) -#define glWriteMaskEXT GLEW_GET_FUN(__glewWriteMaskEXT) - -#define GLEW_EXT_vertex_shader GLEW_GET_VAR(__GLEW_EXT_vertex_shader) - -#endif /* GL_EXT_vertex_shader */ - -/* ------------------------ GL_EXT_vertex_weighting ------------------------ */ - -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 - -#define GL_MODELVIEW0_STACK_DEPTH_EXT 0x0BA3 -#define GL_MODELVIEW0_MATRIX_EXT 0x0BA6 -#define GL_MODELVIEW0_EXT 0x1700 -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 - -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, void *pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight); -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTFVEXTPROC) (GLfloat* weight); - -#define glVertexWeightPointerEXT GLEW_GET_FUN(__glewVertexWeightPointerEXT) -#define glVertexWeightfEXT GLEW_GET_FUN(__glewVertexWeightfEXT) -#define glVertexWeightfvEXT GLEW_GET_FUN(__glewVertexWeightfvEXT) - -#define GLEW_EXT_vertex_weighting GLEW_GET_VAR(__GLEW_EXT_vertex_weighting) - -#endif /* GL_EXT_vertex_weighting */ - -/* ------------------------ GL_EXT_window_rectangles ----------------------- */ - -#ifndef GL_EXT_window_rectangles -#define GL_EXT_window_rectangles 1 - -#define GL_INCLUSIVE_EXT 0x8F10 -#define GL_EXCLUSIVE_EXT 0x8F11 -#define GL_WINDOW_RECTANGLE_EXT 0x8F12 -#define GL_WINDOW_RECTANGLE_MODE_EXT 0x8F13 -#define GL_MAX_WINDOW_RECTANGLES_EXT 0x8F14 -#define GL_NUM_WINDOW_RECTANGLES_EXT 0x8F15 - -typedef void (GLAPIENTRY * PFNGLWINDOWRECTANGLESEXTPROC) (GLenum mode, GLsizei count, const GLint box[]); - -#define glWindowRectanglesEXT GLEW_GET_FUN(__glewWindowRectanglesEXT) - -#define GLEW_EXT_window_rectangles GLEW_GET_VAR(__GLEW_EXT_window_rectangles) - -#endif /* GL_EXT_window_rectangles */ - -/* ------------------------- GL_EXT_x11_sync_object ------------------------ */ - -#ifndef GL_EXT_x11_sync_object -#define GL_EXT_x11_sync_object 1 - -#define GL_SYNC_X11_FENCE_EXT 0x90E1 - -typedef GLsync (GLAPIENTRY * PFNGLIMPORTSYNCEXTPROC) (GLenum external_sync_type, GLintptr external_sync, GLbitfield flags); - -#define glImportSyncEXT GLEW_GET_FUN(__glewImportSyncEXT) - -#define GLEW_EXT_x11_sync_object GLEW_GET_VAR(__GLEW_EXT_x11_sync_object) - -#endif /* GL_EXT_x11_sync_object */ - -/* ---------------------- GL_GREMEDY_frame_terminator ---------------------- */ - -#ifndef GL_GREMEDY_frame_terminator -#define GL_GREMEDY_frame_terminator 1 - -typedef void (GLAPIENTRY * PFNGLFRAMETERMINATORGREMEDYPROC) (void); - -#define glFrameTerminatorGREMEDY GLEW_GET_FUN(__glewFrameTerminatorGREMEDY) - -#define GLEW_GREMEDY_frame_terminator GLEW_GET_VAR(__GLEW_GREMEDY_frame_terminator) - -#endif /* GL_GREMEDY_frame_terminator */ - -/* ------------------------ GL_GREMEDY_string_marker ----------------------- */ - -#ifndef GL_GREMEDY_string_marker -#define GL_GREMEDY_string_marker 1 - -typedef void (GLAPIENTRY * PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const void *string); - -#define glStringMarkerGREMEDY GLEW_GET_FUN(__glewStringMarkerGREMEDY) - -#define GLEW_GREMEDY_string_marker GLEW_GET_VAR(__GLEW_GREMEDY_string_marker) - -#endif /* GL_GREMEDY_string_marker */ - -/* --------------------- GL_HP_convolution_border_modes -------------------- */ - -#ifndef GL_HP_convolution_border_modes -#define GL_HP_convolution_border_modes 1 - -#define GLEW_HP_convolution_border_modes GLEW_GET_VAR(__GLEW_HP_convolution_border_modes) - -#endif /* GL_HP_convolution_border_modes */ - -/* ------------------------- GL_HP_image_transform ------------------------- */ - -#ifndef GL_HP_image_transform -#define GL_HP_image_transform 1 - -typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, const GLfloat param); -typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, const GLint param); -typedef void (GLAPIENTRY * PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint* params); - -#define glGetImageTransformParameterfvHP GLEW_GET_FUN(__glewGetImageTransformParameterfvHP) -#define glGetImageTransformParameterivHP GLEW_GET_FUN(__glewGetImageTransformParameterivHP) -#define glImageTransformParameterfHP GLEW_GET_FUN(__glewImageTransformParameterfHP) -#define glImageTransformParameterfvHP GLEW_GET_FUN(__glewImageTransformParameterfvHP) -#define glImageTransformParameteriHP GLEW_GET_FUN(__glewImageTransformParameteriHP) -#define glImageTransformParameterivHP GLEW_GET_FUN(__glewImageTransformParameterivHP) - -#define GLEW_HP_image_transform GLEW_GET_VAR(__GLEW_HP_image_transform) - -#endif /* GL_HP_image_transform */ - -/* -------------------------- GL_HP_occlusion_test ------------------------- */ - -#ifndef GL_HP_occlusion_test -#define GL_HP_occlusion_test 1 - -#define GLEW_HP_occlusion_test GLEW_GET_VAR(__GLEW_HP_occlusion_test) - -#endif /* GL_HP_occlusion_test */ - -/* ------------------------- GL_HP_texture_lighting ------------------------ */ - -#ifndef GL_HP_texture_lighting -#define GL_HP_texture_lighting 1 - -#define GLEW_HP_texture_lighting GLEW_GET_VAR(__GLEW_HP_texture_lighting) - -#endif /* GL_HP_texture_lighting */ - -/* --------------------------- GL_IBM_cull_vertex -------------------------- */ - -#ifndef GL_IBM_cull_vertex -#define GL_IBM_cull_vertex 1 - -#define GL_CULL_VERTEX_IBM 103050 - -#define GLEW_IBM_cull_vertex GLEW_GET_VAR(__GLEW_IBM_cull_vertex) - -#endif /* GL_IBM_cull_vertex */ - -/* ---------------------- GL_IBM_multimode_draw_arrays --------------------- */ - -#ifndef GL_IBM_multimode_draw_arrays -#define GL_IBM_multimode_draw_arrays 1 - -typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum* mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -typedef void (GLAPIENTRY * PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum* mode, const GLsizei *count, GLenum type, const void *const *indices, GLsizei primcount, GLint modestride); - -#define glMultiModeDrawArraysIBM GLEW_GET_FUN(__glewMultiModeDrawArraysIBM) -#define glMultiModeDrawElementsIBM GLEW_GET_FUN(__glewMultiModeDrawElementsIBM) - -#define GLEW_IBM_multimode_draw_arrays GLEW_GET_VAR(__GLEW_IBM_multimode_draw_arrays) - -#endif /* GL_IBM_multimode_draw_arrays */ - -/* ------------------------- GL_IBM_rasterpos_clip ------------------------- */ - -#ifndef GL_IBM_rasterpos_clip -#define GL_IBM_rasterpos_clip 1 - -#define GL_RASTER_POSITION_UNCLIPPED_IBM 103010 - -#define GLEW_IBM_rasterpos_clip GLEW_GET_VAR(__GLEW_IBM_rasterpos_clip) - -#endif /* GL_IBM_rasterpos_clip */ - -/* --------------------------- GL_IBM_static_data -------------------------- */ - -#ifndef GL_IBM_static_data -#define GL_IBM_static_data 1 - -#define GL_ALL_STATIC_DATA_IBM 103060 -#define GL_STATIC_VERTEX_ARRAY_IBM 103061 - -#define GLEW_IBM_static_data GLEW_GET_VAR(__GLEW_IBM_static_data) - -#endif /* GL_IBM_static_data */ - -/* --------------------- GL_IBM_texture_mirrored_repeat -------------------- */ - -#ifndef GL_IBM_texture_mirrored_repeat -#define GL_IBM_texture_mirrored_repeat 1 - -#define GL_MIRRORED_REPEAT_IBM 0x8370 - -#define GLEW_IBM_texture_mirrored_repeat GLEW_GET_VAR(__GLEW_IBM_texture_mirrored_repeat) - -#endif /* GL_IBM_texture_mirrored_repeat */ - -/* ----------------------- GL_IBM_vertex_array_lists ----------------------- */ - -#ifndef GL_IBM_vertex_array_lists -#define GL_IBM_vertex_array_lists 1 - -#define GL_VERTEX_ARRAY_LIST_IBM 103070 -#define GL_NORMAL_ARRAY_LIST_IBM 103071 -#define GL_COLOR_ARRAY_LIST_IBM 103072 -#define GL_INDEX_ARRAY_LIST_IBM 103073 -#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074 -#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075 -#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076 -#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077 -#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 -#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081 -#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082 -#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083 -#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084 -#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085 -#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086 -#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087 - -typedef void (GLAPIENTRY * PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean ** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride); -typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const void** pointer, GLint ptrstride); - -#define glColorPointerListIBM GLEW_GET_FUN(__glewColorPointerListIBM) -#define glEdgeFlagPointerListIBM GLEW_GET_FUN(__glewEdgeFlagPointerListIBM) -#define glFogCoordPointerListIBM GLEW_GET_FUN(__glewFogCoordPointerListIBM) -#define glIndexPointerListIBM GLEW_GET_FUN(__glewIndexPointerListIBM) -#define glNormalPointerListIBM GLEW_GET_FUN(__glewNormalPointerListIBM) -#define glSecondaryColorPointerListIBM GLEW_GET_FUN(__glewSecondaryColorPointerListIBM) -#define glTexCoordPointerListIBM GLEW_GET_FUN(__glewTexCoordPointerListIBM) -#define glVertexPointerListIBM GLEW_GET_FUN(__glewVertexPointerListIBM) - -#define GLEW_IBM_vertex_array_lists GLEW_GET_VAR(__GLEW_IBM_vertex_array_lists) - -#endif /* GL_IBM_vertex_array_lists */ - -/* -------------------------- GL_INGR_color_clamp -------------------------- */ - -#ifndef GL_INGR_color_clamp -#define GL_INGR_color_clamp 1 - -#define GL_RED_MIN_CLAMP_INGR 0x8560 -#define GL_GREEN_MIN_CLAMP_INGR 0x8561 -#define GL_BLUE_MIN_CLAMP_INGR 0x8562 -#define GL_ALPHA_MIN_CLAMP_INGR 0x8563 -#define GL_RED_MAX_CLAMP_INGR 0x8564 -#define GL_GREEN_MAX_CLAMP_INGR 0x8565 -#define GL_BLUE_MAX_CLAMP_INGR 0x8566 -#define GL_ALPHA_MAX_CLAMP_INGR 0x8567 - -#define GLEW_INGR_color_clamp GLEW_GET_VAR(__GLEW_INGR_color_clamp) - -#endif /* GL_INGR_color_clamp */ - -/* ------------------------- GL_INGR_interlace_read ------------------------ */ - -#ifndef GL_INGR_interlace_read -#define GL_INGR_interlace_read 1 - -#define GL_INTERLACE_READ_INGR 0x8568 - -#define GLEW_INGR_interlace_read GLEW_GET_VAR(__GLEW_INGR_interlace_read) - -#endif /* GL_INGR_interlace_read */ - -/* ------------------ GL_INTEL_conservative_rasterization ------------------ */ - -#ifndef GL_INTEL_conservative_rasterization -#define GL_INTEL_conservative_rasterization 1 - -#define GL_CONSERVATIVE_RASTERIZATION_INTEL 0x83FE - -#define GLEW_INTEL_conservative_rasterization GLEW_GET_VAR(__GLEW_INTEL_conservative_rasterization) - -#endif /* GL_INTEL_conservative_rasterization */ - -/* ------------------- GL_INTEL_fragment_shader_ordering ------------------- */ - -#ifndef GL_INTEL_fragment_shader_ordering -#define GL_INTEL_fragment_shader_ordering 1 - -#define GLEW_INTEL_fragment_shader_ordering GLEW_GET_VAR(__GLEW_INTEL_fragment_shader_ordering) - -#endif /* GL_INTEL_fragment_shader_ordering */ - -/* ----------------------- GL_INTEL_framebuffer_CMAA ----------------------- */ - -#ifndef GL_INTEL_framebuffer_CMAA -#define GL_INTEL_framebuffer_CMAA 1 - -#define GLEW_INTEL_framebuffer_CMAA GLEW_GET_VAR(__GLEW_INTEL_framebuffer_CMAA) - -#endif /* GL_INTEL_framebuffer_CMAA */ - -/* -------------------------- GL_INTEL_map_texture ------------------------- */ - -#ifndef GL_INTEL_map_texture -#define GL_INTEL_map_texture 1 - -#define GL_LAYOUT_DEFAULT_INTEL 0 -#define GL_LAYOUT_LINEAR_INTEL 1 -#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2 -#define GL_TEXTURE_MEMORY_LAYOUT_INTEL 0x83FF - -typedef void * (GLAPIENTRY * PFNGLMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level, GLbitfield access, GLint* stride, GLenum *layout); -typedef void (GLAPIENTRY * PFNGLSYNCTEXTUREINTELPROC) (GLuint texture); -typedef void (GLAPIENTRY * PFNGLUNMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level); - -#define glMapTexture2DINTEL GLEW_GET_FUN(__glewMapTexture2DINTEL) -#define glSyncTextureINTEL GLEW_GET_FUN(__glewSyncTextureINTEL) -#define glUnmapTexture2DINTEL GLEW_GET_FUN(__glewUnmapTexture2DINTEL) - -#define GLEW_INTEL_map_texture GLEW_GET_VAR(__GLEW_INTEL_map_texture) - -#endif /* GL_INTEL_map_texture */ - -/* ------------------------ GL_INTEL_parallel_arrays ----------------------- */ - -#ifndef GL_INTEL_parallel_arrays -#define GL_INTEL_parallel_arrays 1 - -#define GL_PARALLEL_ARRAYS_INTEL 0x83F4 -#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5 -#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6 -#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7 -#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8 - -typedef void (GLAPIENTRY * PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer); -typedef void (GLAPIENTRY * PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const void** pointer); -typedef void (GLAPIENTRY * PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const void** pointer); - -#define glColorPointervINTEL GLEW_GET_FUN(__glewColorPointervINTEL) -#define glNormalPointervINTEL GLEW_GET_FUN(__glewNormalPointervINTEL) -#define glTexCoordPointervINTEL GLEW_GET_FUN(__glewTexCoordPointervINTEL) -#define glVertexPointervINTEL GLEW_GET_FUN(__glewVertexPointervINTEL) - -#define GLEW_INTEL_parallel_arrays GLEW_GET_VAR(__GLEW_INTEL_parallel_arrays) - -#endif /* GL_INTEL_parallel_arrays */ - -/* ----------------------- GL_INTEL_performance_query ---------------------- */ - -#ifndef GL_INTEL_performance_query -#define GL_INTEL_performance_query 1 - -#define GL_PERFQUERY_SINGLE_CONTEXT_INTEL 0x0000 -#define GL_PERFQUERY_GLOBAL_CONTEXT_INTEL 0x0001 -#define GL_PERFQUERY_DONOT_FLUSH_INTEL 0x83F9 -#define GL_PERFQUERY_FLUSH_INTEL 0x83FA -#define GL_PERFQUERY_WAIT_INTEL 0x83FB -#define GL_PERFQUERY_COUNTER_EVENT_INTEL 0x94F0 -#define GL_PERFQUERY_COUNTER_DURATION_NORM_INTEL 0x94F1 -#define GL_PERFQUERY_COUNTER_DURATION_RAW_INTEL 0x94F2 -#define GL_PERFQUERY_COUNTER_THROUGHPUT_INTEL 0x94F3 -#define GL_PERFQUERY_COUNTER_RAW_INTEL 0x94F4 -#define GL_PERFQUERY_COUNTER_TIMESTAMP_INTEL 0x94F5 -#define GL_PERFQUERY_COUNTER_DATA_UINT32_INTEL 0x94F8 -#define GL_PERFQUERY_COUNTER_DATA_UINT64_INTEL 0x94F9 -#define GL_PERFQUERY_COUNTER_DATA_FLOAT_INTEL 0x94FA -#define GL_PERFQUERY_COUNTER_DATA_DOUBLE_INTEL 0x94FB -#define GL_PERFQUERY_COUNTER_DATA_BOOL32_INTEL 0x94FC -#define GL_PERFQUERY_QUERY_NAME_LENGTH_MAX_INTEL 0x94FD -#define GL_PERFQUERY_COUNTER_NAME_LENGTH_MAX_INTEL 0x94FE -#define GL_PERFQUERY_COUNTER_DESC_LENGTH_MAX_INTEL 0x94FF -#define GL_PERFQUERY_GPA_EXTENDED_COUNTERS_INTEL 0x9500 - -typedef void (GLAPIENTRY * PFNGLBEGINPERFQUERYINTELPROC) (GLuint queryHandle); -typedef void (GLAPIENTRY * PFNGLCREATEPERFQUERYINTELPROC) (GLuint queryId, GLuint* queryHandle); -typedef void (GLAPIENTRY * PFNGLDELETEPERFQUERYINTELPROC) (GLuint queryHandle); -typedef void (GLAPIENTRY * PFNGLENDPERFQUERYINTELPROC) (GLuint queryHandle); -typedef void (GLAPIENTRY * PFNGLGETFIRSTPERFQUERYIDINTELPROC) (GLuint* queryId); -typedef void (GLAPIENTRY * PFNGLGETNEXTPERFQUERYIDINTELPROC) (GLuint queryId, GLuint* nextQueryId); -typedef void (GLAPIENTRY * PFNGLGETPERFCOUNTERINFOINTELPROC) (GLuint queryId, GLuint counterId, GLuint counterNameLength, GLchar* counterName, GLuint counterDescLength, GLchar *counterDesc, GLuint *counterOffset, GLuint *counterDataSize, GLuint *counterTypeEnum, GLuint *counterDataTypeEnum, GLuint64 *rawCounterMaxValue); -typedef void (GLAPIENTRY * PFNGLGETPERFQUERYDATAINTELPROC) (GLuint queryHandle, GLuint flags, GLsizei dataSize, void *data, GLuint *bytesWritten); -typedef void (GLAPIENTRY * PFNGLGETPERFQUERYIDBYNAMEINTELPROC) (GLchar* queryName, GLuint *queryId); -typedef void (GLAPIENTRY * PFNGLGETPERFQUERYINFOINTELPROC) (GLuint queryId, GLuint queryNameLength, GLchar* queryName, GLuint *dataSize, GLuint *noCounters, GLuint *noInstances, GLuint *capsMask); - -#define glBeginPerfQueryINTEL GLEW_GET_FUN(__glewBeginPerfQueryINTEL) -#define glCreatePerfQueryINTEL GLEW_GET_FUN(__glewCreatePerfQueryINTEL) -#define glDeletePerfQueryINTEL GLEW_GET_FUN(__glewDeletePerfQueryINTEL) -#define glEndPerfQueryINTEL GLEW_GET_FUN(__glewEndPerfQueryINTEL) -#define glGetFirstPerfQueryIdINTEL GLEW_GET_FUN(__glewGetFirstPerfQueryIdINTEL) -#define glGetNextPerfQueryIdINTEL GLEW_GET_FUN(__glewGetNextPerfQueryIdINTEL) -#define glGetPerfCounterInfoINTEL GLEW_GET_FUN(__glewGetPerfCounterInfoINTEL) -#define glGetPerfQueryDataINTEL GLEW_GET_FUN(__glewGetPerfQueryDataINTEL) -#define glGetPerfQueryIdByNameINTEL GLEW_GET_FUN(__glewGetPerfQueryIdByNameINTEL) -#define glGetPerfQueryInfoINTEL GLEW_GET_FUN(__glewGetPerfQueryInfoINTEL) - -#define GLEW_INTEL_performance_query GLEW_GET_VAR(__GLEW_INTEL_performance_query) - -#endif /* GL_INTEL_performance_query */ - -/* ------------------------ GL_INTEL_texture_scissor ----------------------- */ - -#ifndef GL_INTEL_texture_scissor -#define GL_INTEL_texture_scissor 1 - -typedef void (GLAPIENTRY * PFNGLTEXSCISSORFUNCINTELPROC) (GLenum target, GLenum lfunc, GLenum hfunc); -typedef void (GLAPIENTRY * PFNGLTEXSCISSORINTELPROC) (GLenum target, GLclampf tlow, GLclampf thigh); - -#define glTexScissorFuncINTEL GLEW_GET_FUN(__glewTexScissorFuncINTEL) -#define glTexScissorINTEL GLEW_GET_FUN(__glewTexScissorINTEL) - -#define GLEW_INTEL_texture_scissor GLEW_GET_VAR(__GLEW_INTEL_texture_scissor) - -#endif /* GL_INTEL_texture_scissor */ - -/* --------------------- GL_KHR_blend_equation_advanced -------------------- */ - -#ifndef GL_KHR_blend_equation_advanced -#define GL_KHR_blend_equation_advanced 1 - -#define GL_BLEND_ADVANCED_COHERENT_KHR 0x9285 -#define GL_MULTIPLY_KHR 0x9294 -#define GL_SCREEN_KHR 0x9295 -#define GL_OVERLAY_KHR 0x9296 -#define GL_DARKEN_KHR 0x9297 -#define GL_LIGHTEN_KHR 0x9298 -#define GL_COLORDODGE_KHR 0x9299 -#define GL_COLORBURN_KHR 0x929A -#define GL_HARDLIGHT_KHR 0x929B -#define GL_SOFTLIGHT_KHR 0x929C -#define GL_DIFFERENCE_KHR 0x929E -#define GL_EXCLUSION_KHR 0x92A0 -#define GL_HSL_HUE_KHR 0x92AD -#define GL_HSL_SATURATION_KHR 0x92AE -#define GL_HSL_COLOR_KHR 0x92AF -#define GL_HSL_LUMINOSITY_KHR 0x92B0 - -typedef void (GLAPIENTRY * PFNGLBLENDBARRIERKHRPROC) (void); - -#define glBlendBarrierKHR GLEW_GET_FUN(__glewBlendBarrierKHR) - -#define GLEW_KHR_blend_equation_advanced GLEW_GET_VAR(__GLEW_KHR_blend_equation_advanced) - -#endif /* GL_KHR_blend_equation_advanced */ - -/* ---------------- GL_KHR_blend_equation_advanced_coherent ---------------- */ - -#ifndef GL_KHR_blend_equation_advanced_coherent -#define GL_KHR_blend_equation_advanced_coherent 1 - -#define GLEW_KHR_blend_equation_advanced_coherent GLEW_GET_VAR(__GLEW_KHR_blend_equation_advanced_coherent) - -#endif /* GL_KHR_blend_equation_advanced_coherent */ - -/* ---------------------- GL_KHR_context_flush_control --------------------- */ - -#ifndef GL_KHR_context_flush_control -#define GL_KHR_context_flush_control 1 - -#define GL_CONTEXT_RELEASE_BEHAVIOR 0x82FB -#define GL_CONTEXT_RELEASE_BEHAVIOR_FLUSH 0x82FC - -#define GLEW_KHR_context_flush_control GLEW_GET_VAR(__GLEW_KHR_context_flush_control) - -#endif /* GL_KHR_context_flush_control */ - -/* ------------------------------ GL_KHR_debug ----------------------------- */ - -#ifndef GL_KHR_debug -#define GL_KHR_debug 1 - -#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 -#define GL_STACK_OVERFLOW 0x0503 -#define GL_STACK_UNDERFLOW 0x0504 -#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 -#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 -#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 -#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 -#define GL_DEBUG_SOURCE_API 0x8246 -#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 -#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 -#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 -#define GL_DEBUG_SOURCE_APPLICATION 0x824A -#define GL_DEBUG_SOURCE_OTHER 0x824B -#define GL_DEBUG_TYPE_ERROR 0x824C -#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D -#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E -#define GL_DEBUG_TYPE_PORTABILITY 0x824F -#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 -#define GL_DEBUG_TYPE_OTHER 0x8251 -#define GL_DEBUG_TYPE_MARKER 0x8268 -#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 -#define GL_DEBUG_TYPE_POP_GROUP 0x826A -#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B -#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C -#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D -#define GL_BUFFER 0x82E0 -#define GL_SHADER 0x82E1 -#define GL_PROGRAM 0x82E2 -#define GL_QUERY 0x82E3 -#define GL_PROGRAM_PIPELINE 0x82E4 -#define GL_SAMPLER 0x82E6 -#define GL_DISPLAY_LIST 0x82E7 -#define GL_MAX_LABEL_LENGTH 0x82E8 -#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 -#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 -#define GL_DEBUG_LOGGED_MESSAGES 0x9145 -#define GL_DEBUG_SEVERITY_HIGH 0x9146 -#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 -#define GL_DEBUG_SEVERITY_LOW 0x9148 -#define GL_DEBUG_OUTPUT 0x92E0 - -typedef void (GLAPIENTRY *GLDEBUGPROC)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* message, const void* userParam); - -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint* ids, GLboolean enabled); -typedef void (GLAPIENTRY * PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar* buf); -typedef GLuint (GLAPIENTRY * PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufSize, GLenum* sources, GLenum* types, GLuint* ids, GLenum* severities, GLsizei* lengths, GLchar* messageLog); -typedef void (GLAPIENTRY * PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei* length, GLchar *label); -typedef void (GLAPIENTRY * PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei* length, GLchar *label); -typedef void (GLAPIENTRY * PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar* label); -typedef void (GLAPIENTRY * PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar* label); -typedef void (GLAPIENTRY * PFNGLPOPDEBUGGROUPPROC) (void); -typedef void (GLAPIENTRY * PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar * message); - -#define glDebugMessageCallback GLEW_GET_FUN(__glewDebugMessageCallback) -#define glDebugMessageControl GLEW_GET_FUN(__glewDebugMessageControl) -#define glDebugMessageInsert GLEW_GET_FUN(__glewDebugMessageInsert) -#define glGetDebugMessageLog GLEW_GET_FUN(__glewGetDebugMessageLog) -#define glGetObjectLabel GLEW_GET_FUN(__glewGetObjectLabel) -#define glGetObjectPtrLabel GLEW_GET_FUN(__glewGetObjectPtrLabel) -#define glObjectLabel GLEW_GET_FUN(__glewObjectLabel) -#define glObjectPtrLabel GLEW_GET_FUN(__glewObjectPtrLabel) -#define glPopDebugGroup GLEW_GET_FUN(__glewPopDebugGroup) -#define glPushDebugGroup GLEW_GET_FUN(__glewPushDebugGroup) - -#define GLEW_KHR_debug GLEW_GET_VAR(__GLEW_KHR_debug) - -#endif /* GL_KHR_debug */ - -/* ---------------------------- GL_KHR_no_error ---------------------------- */ - -#ifndef GL_KHR_no_error -#define GL_KHR_no_error 1 - -#define GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR 0x00000008 - -#define GLEW_KHR_no_error GLEW_GET_VAR(__GLEW_KHR_no_error) - -#endif /* GL_KHR_no_error */ - -/* ------------------ GL_KHR_robust_buffer_access_behavior ----------------- */ - -#ifndef GL_KHR_robust_buffer_access_behavior -#define GL_KHR_robust_buffer_access_behavior 1 - -#define GLEW_KHR_robust_buffer_access_behavior GLEW_GET_VAR(__GLEW_KHR_robust_buffer_access_behavior) - -#endif /* GL_KHR_robust_buffer_access_behavior */ - -/* --------------------------- GL_KHR_robustness --------------------------- */ - -#ifndef GL_KHR_robustness -#define GL_KHR_robustness 1 - -#define GL_CONTEXT_LOST 0x0507 -#define GL_LOSE_CONTEXT_ON_RESET 0x8252 -#define GL_GUILTY_CONTEXT_RESET 0x8253 -#define GL_INNOCENT_CONTEXT_RESET 0x8254 -#define GL_UNKNOWN_CONTEXT_RESET 0x8255 -#define GL_RESET_NOTIFICATION_STRATEGY 0x8256 -#define GL_NO_RESET_NOTIFICATION 0x8261 -#define GL_CONTEXT_ROBUST_ACCESS 0x90F3 - -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMFVPROC) (GLuint program, GLint location, GLsizei bufSize, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETNUNIFORMUIVPROC) (GLuint program, GLint location, GLsizei bufSize, GLuint* params); -typedef void (GLAPIENTRY * PFNGLREADNPIXELSPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, void *data); - -#define glGetnUniformfv GLEW_GET_FUN(__glewGetnUniformfv) -#define glGetnUniformiv GLEW_GET_FUN(__glewGetnUniformiv) -#define glGetnUniformuiv GLEW_GET_FUN(__glewGetnUniformuiv) -#define glReadnPixels GLEW_GET_FUN(__glewReadnPixels) - -#define GLEW_KHR_robustness GLEW_GET_VAR(__GLEW_KHR_robustness) - -#endif /* GL_KHR_robustness */ - -/* ------------------ GL_KHR_texture_compression_astc_hdr ------------------ */ - -#ifndef GL_KHR_texture_compression_astc_hdr -#define GL_KHR_texture_compression_astc_hdr 1 - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - -#define GLEW_KHR_texture_compression_astc_hdr GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_hdr) - -#endif /* GL_KHR_texture_compression_astc_hdr */ - -/* ------------------ GL_KHR_texture_compression_astc_ldr ------------------ */ - -#ifndef GL_KHR_texture_compression_astc_ldr -#define GL_KHR_texture_compression_astc_ldr 1 - -#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 -#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 -#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 -#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 -#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 -#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 -#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 -#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 -#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 -#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 -#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA -#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB -#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC -#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC -#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD - -#define GLEW_KHR_texture_compression_astc_ldr GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_ldr) - -#endif /* GL_KHR_texture_compression_astc_ldr */ - -/* --------------- GL_KHR_texture_compression_astc_sliced_3d --------------- */ - -#ifndef GL_KHR_texture_compression_astc_sliced_3d -#define GL_KHR_texture_compression_astc_sliced_3d 1 - -#define GLEW_KHR_texture_compression_astc_sliced_3d GLEW_GET_VAR(__GLEW_KHR_texture_compression_astc_sliced_3d) - -#endif /* GL_KHR_texture_compression_astc_sliced_3d */ - -/* -------------------------- GL_KTX_buffer_region ------------------------- */ - -#ifndef GL_KTX_buffer_region -#define GL_KTX_buffer_region 1 - -#define GL_KTX_FRONT_REGION 0x0 -#define GL_KTX_BACK_REGION 0x1 -#define GL_KTX_Z_REGION 0x2 -#define GL_KTX_STENCIL_REGION 0x3 - -typedef GLuint (GLAPIENTRY * PFNGLBUFFERREGIONENABLEDPROC) (void); -typedef void (GLAPIENTRY * PFNGLDELETEBUFFERREGIONPROC) (GLenum region); -typedef void (GLAPIENTRY * PFNGLDRAWBUFFERREGIONPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height, GLint xDest, GLint yDest); -typedef GLuint (GLAPIENTRY * PFNGLNEWBUFFERREGIONPROC) (GLenum region); -typedef void (GLAPIENTRY * PFNGLREADBUFFERREGIONPROC) (GLuint region, GLint x, GLint y, GLsizei width, GLsizei height); - -#define glBufferRegionEnabled GLEW_GET_FUN(__glewBufferRegionEnabled) -#define glDeleteBufferRegion GLEW_GET_FUN(__glewDeleteBufferRegion) -#define glDrawBufferRegion GLEW_GET_FUN(__glewDrawBufferRegion) -#define glNewBufferRegion GLEW_GET_FUN(__glewNewBufferRegion) -#define glReadBufferRegion GLEW_GET_FUN(__glewReadBufferRegion) - -#define GLEW_KTX_buffer_region GLEW_GET_VAR(__GLEW_KTX_buffer_region) - -#endif /* GL_KTX_buffer_region */ - -/* ------------------------- GL_MESAX_texture_stack ------------------------ */ - -#ifndef GL_MESAX_texture_stack -#define GL_MESAX_texture_stack 1 - -#define GL_TEXTURE_1D_STACK_MESAX 0x8759 -#define GL_TEXTURE_2D_STACK_MESAX 0x875A -#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B -#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C -#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D -#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E - -#define GLEW_MESAX_texture_stack GLEW_GET_VAR(__GLEW_MESAX_texture_stack) - -#endif /* GL_MESAX_texture_stack */ - -/* -------------------------- GL_MESA_pack_invert -------------------------- */ - -#ifndef GL_MESA_pack_invert -#define GL_MESA_pack_invert 1 - -#define GL_PACK_INVERT_MESA 0x8758 - -#define GLEW_MESA_pack_invert GLEW_GET_VAR(__GLEW_MESA_pack_invert) - -#endif /* GL_MESA_pack_invert */ - -/* ------------------------- GL_MESA_resize_buffers ------------------------ */ - -#ifndef GL_MESA_resize_buffers -#define GL_MESA_resize_buffers 1 - -typedef void (GLAPIENTRY * PFNGLRESIZEBUFFERSMESAPROC) (void); - -#define glResizeBuffersMESA GLEW_GET_FUN(__glewResizeBuffersMESA) - -#define GLEW_MESA_resize_buffers GLEW_GET_VAR(__GLEW_MESA_resize_buffers) - -#endif /* GL_MESA_resize_buffers */ - -/* -------------------- GL_MESA_shader_integer_functions ------------------- */ - -#ifndef GL_MESA_shader_integer_functions -#define GL_MESA_shader_integer_functions 1 - -#define GLEW_MESA_shader_integer_functions GLEW_GET_VAR(__GLEW_MESA_shader_integer_functions) - -#endif /* GL_MESA_shader_integer_functions */ - -/* --------------------------- GL_MESA_window_pos -------------------------- */ - -#ifndef GL_MESA_window_pos -#define GL_MESA_window_pos 1 - -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2IVMESAPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS2SVMESAPROC) (const GLshort* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3IVMESAPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS3SVMESAPROC) (const GLshort* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4IVMESAPROC) (const GLint* p); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLWINDOWPOS4SVMESAPROC) (const GLshort* p); - -#define glWindowPos2dMESA GLEW_GET_FUN(__glewWindowPos2dMESA) -#define glWindowPos2dvMESA GLEW_GET_FUN(__glewWindowPos2dvMESA) -#define glWindowPos2fMESA GLEW_GET_FUN(__glewWindowPos2fMESA) -#define glWindowPos2fvMESA GLEW_GET_FUN(__glewWindowPos2fvMESA) -#define glWindowPos2iMESA GLEW_GET_FUN(__glewWindowPos2iMESA) -#define glWindowPos2ivMESA GLEW_GET_FUN(__glewWindowPos2ivMESA) -#define glWindowPos2sMESA GLEW_GET_FUN(__glewWindowPos2sMESA) -#define glWindowPos2svMESA GLEW_GET_FUN(__glewWindowPos2svMESA) -#define glWindowPos3dMESA GLEW_GET_FUN(__glewWindowPos3dMESA) -#define glWindowPos3dvMESA GLEW_GET_FUN(__glewWindowPos3dvMESA) -#define glWindowPos3fMESA GLEW_GET_FUN(__glewWindowPos3fMESA) -#define glWindowPos3fvMESA GLEW_GET_FUN(__glewWindowPos3fvMESA) -#define glWindowPos3iMESA GLEW_GET_FUN(__glewWindowPos3iMESA) -#define glWindowPos3ivMESA GLEW_GET_FUN(__glewWindowPos3ivMESA) -#define glWindowPos3sMESA GLEW_GET_FUN(__glewWindowPos3sMESA) -#define glWindowPos3svMESA GLEW_GET_FUN(__glewWindowPos3svMESA) -#define glWindowPos4dMESA GLEW_GET_FUN(__glewWindowPos4dMESA) -#define glWindowPos4dvMESA GLEW_GET_FUN(__glewWindowPos4dvMESA) -#define glWindowPos4fMESA GLEW_GET_FUN(__glewWindowPos4fMESA) -#define glWindowPos4fvMESA GLEW_GET_FUN(__glewWindowPos4fvMESA) -#define glWindowPos4iMESA GLEW_GET_FUN(__glewWindowPos4iMESA) -#define glWindowPos4ivMESA GLEW_GET_FUN(__glewWindowPos4ivMESA) -#define glWindowPos4sMESA GLEW_GET_FUN(__glewWindowPos4sMESA) -#define glWindowPos4svMESA GLEW_GET_FUN(__glewWindowPos4svMESA) - -#define GLEW_MESA_window_pos GLEW_GET_VAR(__GLEW_MESA_window_pos) - -#endif /* GL_MESA_window_pos */ - -/* ------------------------- GL_MESA_ycbcr_texture ------------------------- */ - -#ifndef GL_MESA_ycbcr_texture -#define GL_MESA_ycbcr_texture 1 - -#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB -#define GL_YCBCR_MESA 0x8757 - -#define GLEW_MESA_ycbcr_texture GLEW_GET_VAR(__GLEW_MESA_ycbcr_texture) - -#endif /* GL_MESA_ycbcr_texture */ - -/* ----------- GL_NVX_blend_equation_advanced_multi_draw_buffers ----------- */ - -#ifndef GL_NVX_blend_equation_advanced_multi_draw_buffers -#define GL_NVX_blend_equation_advanced_multi_draw_buffers 1 - -#define GLEW_NVX_blend_equation_advanced_multi_draw_buffers GLEW_GET_VAR(__GLEW_NVX_blend_equation_advanced_multi_draw_buffers) - -#endif /* GL_NVX_blend_equation_advanced_multi_draw_buffers */ - -/* ----------------------- GL_NVX_conditional_render ----------------------- */ - -#ifndef GL_NVX_conditional_render -#define GL_NVX_conditional_render 1 - -typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERNVXPROC) (void); - -#define glBeginConditionalRenderNVX GLEW_GET_FUN(__glewBeginConditionalRenderNVX) -#define glEndConditionalRenderNVX GLEW_GET_FUN(__glewEndConditionalRenderNVX) - -#define GLEW_NVX_conditional_render GLEW_GET_VAR(__GLEW_NVX_conditional_render) - -#endif /* GL_NVX_conditional_render */ - -/* ------------------------- GL_NVX_gpu_memory_info ------------------------ */ - -#ifndef GL_NVX_gpu_memory_info -#define GL_NVX_gpu_memory_info 1 - -#define GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX 0x9047 -#define GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX 0x9048 -#define GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX 0x9049 -#define GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX 0x904A -#define GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX 0x904B - -#define GLEW_NVX_gpu_memory_info GLEW_GET_VAR(__GLEW_NVX_gpu_memory_info) - -#endif /* GL_NVX_gpu_memory_info */ - -/* ---------------------- GL_NVX_linked_gpu_multicast ---------------------- */ - -#ifndef GL_NVX_linked_gpu_multicast -#define GL_NVX_linked_gpu_multicast 1 - -#define GL_LGPU_SEPARATE_STORAGE_BIT_NVX 0x0800 -#define GL_MAX_LGPU_GPUS_NVX 0x92BA - -typedef void (GLAPIENTRY * PFNGLLGPUCOPYIMAGESUBDATANVXPROC) (GLuint sourceGpu, GLbitfield destinationGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -typedef void (GLAPIENTRY * PFNGLLGPUINTERLOCKNVXPROC) (void); -typedef void (GLAPIENTRY * PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); - -#define glLGPUCopyImageSubDataNVX GLEW_GET_FUN(__glewLGPUCopyImageSubDataNVX) -#define glLGPUInterlockNVX GLEW_GET_FUN(__glewLGPUInterlockNVX) -#define glLGPUNamedBufferSubDataNVX GLEW_GET_FUN(__glewLGPUNamedBufferSubDataNVX) - -#define GLEW_NVX_linked_gpu_multicast GLEW_GET_VAR(__GLEW_NVX_linked_gpu_multicast) - -#endif /* GL_NVX_linked_gpu_multicast */ - -/* ------------------- GL_NV_bindless_multi_draw_indirect ------------------ */ - -#ifndef GL_NV_bindless_multi_draw_indirect -#define GL_NV_bindless_multi_draw_indirect 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC) (GLenum mode, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawCount, GLsizei stride, GLint vertexBufferCount); - -#define glMultiDrawArraysIndirectBindlessNV GLEW_GET_FUN(__glewMultiDrawArraysIndirectBindlessNV) -#define glMultiDrawElementsIndirectBindlessNV GLEW_GET_FUN(__glewMultiDrawElementsIndirectBindlessNV) - -#define GLEW_NV_bindless_multi_draw_indirect GLEW_GET_VAR(__GLEW_NV_bindless_multi_draw_indirect) - -#endif /* GL_NV_bindless_multi_draw_indirect */ - -/* ---------------- GL_NV_bindless_multi_draw_indirect_count --------------- */ - -#ifndef GL_NV_bindless_multi_draw_indirect_count -#define GL_NV_bindless_multi_draw_indirect_count 1 - -typedef void (GLAPIENTRY * PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, const void *indirect, GLintptr drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount); -typedef void (GLAPIENTRY * PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC) (GLenum mode, GLenum type, const void *indirect, GLintptr drawCount, GLsizei maxDrawCount, GLsizei stride, GLint vertexBufferCount); - -#define glMultiDrawArraysIndirectBindlessCountNV GLEW_GET_FUN(__glewMultiDrawArraysIndirectBindlessCountNV) -#define glMultiDrawElementsIndirectBindlessCountNV GLEW_GET_FUN(__glewMultiDrawElementsIndirectBindlessCountNV) - -#define GLEW_NV_bindless_multi_draw_indirect_count GLEW_GET_VAR(__GLEW_NV_bindless_multi_draw_indirect_count) - -#endif /* GL_NV_bindless_multi_draw_indirect_count */ - -/* ------------------------- GL_NV_bindless_texture ------------------------ */ - -#ifndef GL_NV_bindless_texture -#define GL_NV_bindless_texture 1 - -typedef GLuint64 (GLAPIENTRY * PFNGLGETIMAGEHANDLENVPROC) (GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum format); -typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTUREHANDLENVPROC) (GLuint texture); -typedef GLuint64 (GLAPIENTRY * PFNGLGETTEXTURESAMPLERHANDLENVPROC) (GLuint texture, GLuint sampler); -typedef GLboolean (GLAPIENTRY * PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle); -typedef GLboolean (GLAPIENTRY * PFNGLISTEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKEIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle, GLenum access); -typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLMAKETEXTUREHANDLERESIDENTNVPROC) (GLuint64 handle); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC) (GLuint program, GLint location, GLuint64 value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64* values); -typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64NVPROC) (GLint location, GLuint64 value); -typedef void (GLAPIENTRY * PFNGLUNIFORMHANDLEUI64VNVPROC) (GLint location, GLsizei count, const GLuint64* value); - -#define glGetImageHandleNV GLEW_GET_FUN(__glewGetImageHandleNV) -#define glGetTextureHandleNV GLEW_GET_FUN(__glewGetTextureHandleNV) -#define glGetTextureSamplerHandleNV GLEW_GET_FUN(__glewGetTextureSamplerHandleNV) -#define glIsImageHandleResidentNV GLEW_GET_FUN(__glewIsImageHandleResidentNV) -#define glIsTextureHandleResidentNV GLEW_GET_FUN(__glewIsTextureHandleResidentNV) -#define glMakeImageHandleNonResidentNV GLEW_GET_FUN(__glewMakeImageHandleNonResidentNV) -#define glMakeImageHandleResidentNV GLEW_GET_FUN(__glewMakeImageHandleResidentNV) -#define glMakeTextureHandleNonResidentNV GLEW_GET_FUN(__glewMakeTextureHandleNonResidentNV) -#define glMakeTextureHandleResidentNV GLEW_GET_FUN(__glewMakeTextureHandleResidentNV) -#define glProgramUniformHandleui64NV GLEW_GET_FUN(__glewProgramUniformHandleui64NV) -#define glProgramUniformHandleui64vNV GLEW_GET_FUN(__glewProgramUniformHandleui64vNV) -#define glUniformHandleui64NV GLEW_GET_FUN(__glewUniformHandleui64NV) -#define glUniformHandleui64vNV GLEW_GET_FUN(__glewUniformHandleui64vNV) - -#define GLEW_NV_bindless_texture GLEW_GET_VAR(__GLEW_NV_bindless_texture) - -#endif /* GL_NV_bindless_texture */ - -/* --------------------- GL_NV_blend_equation_advanced --------------------- */ - -#ifndef GL_NV_blend_equation_advanced -#define GL_NV_blend_equation_advanced 1 - -#define GL_XOR_NV 0x1506 -#define GL_RED_NV 0x1903 -#define GL_GREEN_NV 0x1904 -#define GL_BLUE_NV 0x1905 -#define GL_BLEND_PREMULTIPLIED_SRC_NV 0x9280 -#define GL_BLEND_OVERLAP_NV 0x9281 -#define GL_UNCORRELATED_NV 0x9282 -#define GL_DISJOINT_NV 0x9283 -#define GL_CONJOINT_NV 0x9284 -#define GL_BLEND_ADVANCED_COHERENT_NV 0x9285 -#define GL_SRC_NV 0x9286 -#define GL_DST_NV 0x9287 -#define GL_SRC_OVER_NV 0x9288 -#define GL_DST_OVER_NV 0x9289 -#define GL_SRC_IN_NV 0x928A -#define GL_DST_IN_NV 0x928B -#define GL_SRC_OUT_NV 0x928C -#define GL_DST_OUT_NV 0x928D -#define GL_SRC_ATOP_NV 0x928E -#define GL_DST_ATOP_NV 0x928F -#define GL_PLUS_NV 0x9291 -#define GL_PLUS_DARKER_NV 0x9292 -#define GL_MULTIPLY_NV 0x9294 -#define GL_SCREEN_NV 0x9295 -#define GL_OVERLAY_NV 0x9296 -#define GL_DARKEN_NV 0x9297 -#define GL_LIGHTEN_NV 0x9298 -#define GL_COLORDODGE_NV 0x9299 -#define GL_COLORBURN_NV 0x929A -#define GL_HARDLIGHT_NV 0x929B -#define GL_SOFTLIGHT_NV 0x929C -#define GL_DIFFERENCE_NV 0x929E -#define GL_MINUS_NV 0x929F -#define GL_EXCLUSION_NV 0x92A0 -#define GL_CONTRAST_NV 0x92A1 -#define GL_INVERT_RGB_NV 0x92A3 -#define GL_LINEARDODGE_NV 0x92A4 -#define GL_LINEARBURN_NV 0x92A5 -#define GL_VIVIDLIGHT_NV 0x92A6 -#define GL_LINEARLIGHT_NV 0x92A7 -#define GL_PINLIGHT_NV 0x92A8 -#define GL_HARDMIX_NV 0x92A9 -#define GL_HSL_HUE_NV 0x92AD -#define GL_HSL_SATURATION_NV 0x92AE -#define GL_HSL_COLOR_NV 0x92AF -#define GL_HSL_LUMINOSITY_NV 0x92B0 -#define GL_PLUS_CLAMPED_NV 0x92B1 -#define GL_PLUS_CLAMPED_ALPHA_NV 0x92B2 -#define GL_MINUS_CLAMPED_NV 0x92B3 -#define GL_INVERT_OVG_NV 0x92B4 - -typedef void (GLAPIENTRY * PFNGLBLENDBARRIERNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLBLENDPARAMETERINVPROC) (GLenum pname, GLint value); - -#define glBlendBarrierNV GLEW_GET_FUN(__glewBlendBarrierNV) -#define glBlendParameteriNV GLEW_GET_FUN(__glewBlendParameteriNV) - -#define GLEW_NV_blend_equation_advanced GLEW_GET_VAR(__GLEW_NV_blend_equation_advanced) - -#endif /* GL_NV_blend_equation_advanced */ - -/* ----------------- GL_NV_blend_equation_advanced_coherent ---------------- */ - -#ifndef GL_NV_blend_equation_advanced_coherent -#define GL_NV_blend_equation_advanced_coherent 1 - -#define GLEW_NV_blend_equation_advanced_coherent GLEW_GET_VAR(__GLEW_NV_blend_equation_advanced_coherent) - -#endif /* GL_NV_blend_equation_advanced_coherent */ - -/* --------------------------- GL_NV_blend_square -------------------------- */ - -#ifndef GL_NV_blend_square -#define GL_NV_blend_square 1 - -#define GLEW_NV_blend_square GLEW_GET_VAR(__GLEW_NV_blend_square) - -#endif /* GL_NV_blend_square */ - -/* ----------------------- GL_NV_clip_space_w_scaling ---------------------- */ - -#ifndef GL_NV_clip_space_w_scaling -#define GL_NV_clip_space_w_scaling 1 - -#define GL_VIEWPORT_POSITION_W_SCALE_NV 0x937C -#define GL_VIEWPORT_POSITION_W_SCALE_X_COEFF_NV 0x937D -#define GL_VIEWPORT_POSITION_W_SCALE_Y_COEFF_NV 0x937E - -typedef void (GLAPIENTRY * PFNGLVIEWPORTPOSITIONWSCALENVPROC) (GLuint index, GLfloat xcoeff, GLfloat ycoeff); - -#define glViewportPositionWScaleNV GLEW_GET_FUN(__glewViewportPositionWScaleNV) - -#define GLEW_NV_clip_space_w_scaling GLEW_GET_VAR(__GLEW_NV_clip_space_w_scaling) - -#endif /* GL_NV_clip_space_w_scaling */ - -/* --------------------------- GL_NV_command_list -------------------------- */ - -#ifndef GL_NV_command_list -#define GL_NV_command_list 1 - -#define GL_TERMINATE_SEQUENCE_COMMAND_NV 0x0000 -#define GL_NOP_COMMAND_NV 0x0001 -#define GL_DRAW_ELEMENTS_COMMAND_NV 0x0002 -#define GL_DRAW_ARRAYS_COMMAND_NV 0x0003 -#define GL_DRAW_ELEMENTS_STRIP_COMMAND_NV 0x0004 -#define GL_DRAW_ARRAYS_STRIP_COMMAND_NV 0x0005 -#define GL_DRAW_ELEMENTS_INSTANCED_COMMAND_NV 0x0006 -#define GL_DRAW_ARRAYS_INSTANCED_COMMAND_NV 0x0007 -#define GL_ELEMENT_ADDRESS_COMMAND_NV 0x0008 -#define GL_ATTRIBUTE_ADDRESS_COMMAND_NV 0x0009 -#define GL_UNIFORM_ADDRESS_COMMAND_NV 0x000a -#define GL_BLEND_COLOR_COMMAND_NV 0x000b -#define GL_STENCIL_REF_COMMAND_NV 0x000c -#define GL_LINE_WIDTH_COMMAND_NV 0x000d -#define GL_POLYGON_OFFSET_COMMAND_NV 0x000e -#define GL_ALPHA_REF_COMMAND_NV 0x000f -#define GL_VIEWPORT_COMMAND_NV 0x0010 -#define GL_SCISSOR_COMMAND_NV 0x0011 -#define GL_FRONT_FACE_COMMAND_NV 0x0012 - -typedef void (GLAPIENTRY * PFNGLCALLCOMMANDLISTNVPROC) (GLuint list); -typedef void (GLAPIENTRY * PFNGLCOMMANDLISTSEGMENTSNVPROC) (GLuint list, GLuint segments); -typedef void (GLAPIENTRY * PFNGLCOMPILECOMMANDLISTNVPROC) (GLuint list); -typedef void (GLAPIENTRY * PFNGLCREATECOMMANDLISTSNVPROC) (GLsizei n, GLuint* lists); -typedef void (GLAPIENTRY * PFNGLCREATESTATESNVPROC) (GLsizei n, GLuint* states); -typedef void (GLAPIENTRY * PFNGLDELETECOMMANDLISTSNVPROC) (GLsizei n, const GLuint* lists); -typedef void (GLAPIENTRY * PFNGLDELETESTATESNVPROC) (GLsizei n, const GLuint* states); -typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSADDRESSNVPROC) (GLenum primitiveMode, const GLuint64* indirects, const GLsizei* sizes, GLuint count); -typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSNVPROC) (GLenum primitiveMode, GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, GLuint count); -typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC) (const GLuint64* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count); -typedef void (GLAPIENTRY * PFNGLDRAWCOMMANDSSTATESNVPROC) (GLuint buffer, const GLintptr* indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count); -typedef GLuint (GLAPIENTRY * PFNGLGETCOMMANDHEADERNVPROC) (GLenum tokenID, GLuint size); -typedef GLushort (GLAPIENTRY * PFNGLGETSTAGEINDEXNVPROC) (GLenum shadertype); -typedef GLboolean (GLAPIENTRY * PFNGLISCOMMANDLISTNVPROC) (GLuint list); -typedef GLboolean (GLAPIENTRY * PFNGLISSTATENVPROC) (GLuint state); -typedef void (GLAPIENTRY * PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC) (GLuint list, GLuint segment, const void** indirects, const GLsizei* sizes, const GLuint* states, const GLuint* fbos, GLuint count); -typedef void (GLAPIENTRY * PFNGLSTATECAPTURENVPROC) (GLuint state, GLenum mode); - -#define glCallCommandListNV GLEW_GET_FUN(__glewCallCommandListNV) -#define glCommandListSegmentsNV GLEW_GET_FUN(__glewCommandListSegmentsNV) -#define glCompileCommandListNV GLEW_GET_FUN(__glewCompileCommandListNV) -#define glCreateCommandListsNV GLEW_GET_FUN(__glewCreateCommandListsNV) -#define glCreateStatesNV GLEW_GET_FUN(__glewCreateStatesNV) -#define glDeleteCommandListsNV GLEW_GET_FUN(__glewDeleteCommandListsNV) -#define glDeleteStatesNV GLEW_GET_FUN(__glewDeleteStatesNV) -#define glDrawCommandsAddressNV GLEW_GET_FUN(__glewDrawCommandsAddressNV) -#define glDrawCommandsNV GLEW_GET_FUN(__glewDrawCommandsNV) -#define glDrawCommandsStatesAddressNV GLEW_GET_FUN(__glewDrawCommandsStatesAddressNV) -#define glDrawCommandsStatesNV GLEW_GET_FUN(__glewDrawCommandsStatesNV) -#define glGetCommandHeaderNV GLEW_GET_FUN(__glewGetCommandHeaderNV) -#define glGetStageIndexNV GLEW_GET_FUN(__glewGetStageIndexNV) -#define glIsCommandListNV GLEW_GET_FUN(__glewIsCommandListNV) -#define glIsStateNV GLEW_GET_FUN(__glewIsStateNV) -#define glListDrawCommandsStatesClientNV GLEW_GET_FUN(__glewListDrawCommandsStatesClientNV) -#define glStateCaptureNV GLEW_GET_FUN(__glewStateCaptureNV) - -#define GLEW_NV_command_list GLEW_GET_VAR(__GLEW_NV_command_list) - -#endif /* GL_NV_command_list */ - -/* ------------------------- GL_NV_compute_program5 ------------------------ */ - -#ifndef GL_NV_compute_program5 -#define GL_NV_compute_program5 1 - -#define GL_COMPUTE_PROGRAM_NV 0x90FB -#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC - -#define GLEW_NV_compute_program5 GLEW_GET_VAR(__GLEW_NV_compute_program5) - -#endif /* GL_NV_compute_program5 */ - -/* ------------------------ GL_NV_conditional_render ----------------------- */ - -#ifndef GL_NV_conditional_render -#define GL_NV_conditional_render 1 - -#define GL_QUERY_WAIT_NV 0x8E13 -#define GL_QUERY_NO_WAIT_NV 0x8E14 -#define GL_QUERY_BY_REGION_WAIT_NV 0x8E15 -#define GL_QUERY_BY_REGION_NO_WAIT_NV 0x8E16 - -typedef void (GLAPIENTRY * PFNGLBEGINCONDITIONALRENDERNVPROC) (GLuint id, GLenum mode); -typedef void (GLAPIENTRY * PFNGLENDCONDITIONALRENDERNVPROC) (void); - -#define glBeginConditionalRenderNV GLEW_GET_FUN(__glewBeginConditionalRenderNV) -#define glEndConditionalRenderNV GLEW_GET_FUN(__glewEndConditionalRenderNV) - -#define GLEW_NV_conditional_render GLEW_GET_VAR(__GLEW_NV_conditional_render) - -#endif /* GL_NV_conditional_render */ - -/* ----------------------- GL_NV_conservative_raster ----------------------- */ - -#ifndef GL_NV_conservative_raster -#define GL_NV_conservative_raster 1 - -#define GL_CONSERVATIVE_RASTERIZATION_NV 0x9346 -#define GL_SUBPIXEL_PRECISION_BIAS_X_BITS_NV 0x9347 -#define GL_SUBPIXEL_PRECISION_BIAS_Y_BITS_NV 0x9348 -#define GL_MAX_SUBPIXEL_PRECISION_BIAS_BITS_NV 0x9349 - -typedef void (GLAPIENTRY * PFNGLSUBPIXELPRECISIONBIASNVPROC) (GLuint xbits, GLuint ybits); - -#define glSubpixelPrecisionBiasNV GLEW_GET_FUN(__glewSubpixelPrecisionBiasNV) - -#define GLEW_NV_conservative_raster GLEW_GET_VAR(__GLEW_NV_conservative_raster) - -#endif /* GL_NV_conservative_raster */ - -/* -------------------- GL_NV_conservative_raster_dilate ------------------- */ - -#ifndef GL_NV_conservative_raster_dilate -#define GL_NV_conservative_raster_dilate 1 - -#define GL_CONSERVATIVE_RASTER_DILATE_NV 0x9379 -#define GL_CONSERVATIVE_RASTER_DILATE_RANGE_NV 0x937A -#define GL_CONSERVATIVE_RASTER_DILATE_GRANULARITY_NV 0x937B - -typedef void (GLAPIENTRY * PFNGLCONSERVATIVERASTERPARAMETERFNVPROC) (GLenum pname, GLfloat value); - -#define glConservativeRasterParameterfNV GLEW_GET_FUN(__glewConservativeRasterParameterfNV) - -#define GLEW_NV_conservative_raster_dilate GLEW_GET_VAR(__GLEW_NV_conservative_raster_dilate) - -#endif /* GL_NV_conservative_raster_dilate */ - -/* -------------- GL_NV_conservative_raster_pre_snap_triangles ------------- */ - -#ifndef GL_NV_conservative_raster_pre_snap_triangles -#define GL_NV_conservative_raster_pre_snap_triangles 1 - -#define GL_CONSERVATIVE_RASTER_MODE_NV 0x954D -#define GL_CONSERVATIVE_RASTER_MODE_POST_SNAP_NV 0x954E -#define GL_CONSERVATIVE_RASTER_MODE_PRE_SNAP_TRIANGLES_NV 0x954F - -typedef void (GLAPIENTRY * PFNGLCONSERVATIVERASTERPARAMETERINVPROC) (GLenum pname, GLint param); - -#define glConservativeRasterParameteriNV GLEW_GET_FUN(__glewConservativeRasterParameteriNV) - -#define GLEW_NV_conservative_raster_pre_snap_triangles GLEW_GET_VAR(__GLEW_NV_conservative_raster_pre_snap_triangles) - -#endif /* GL_NV_conservative_raster_pre_snap_triangles */ - -/* ----------------------- GL_NV_copy_depth_to_color ----------------------- */ - -#ifndef GL_NV_copy_depth_to_color -#define GL_NV_copy_depth_to_color 1 - -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F - -#define GLEW_NV_copy_depth_to_color GLEW_GET_VAR(__GLEW_NV_copy_depth_to_color) - -#endif /* GL_NV_copy_depth_to_color */ - -/* ---------------------------- GL_NV_copy_image --------------------------- */ - -#ifndef GL_NV_copy_image -#define GL_NV_copy_image 1 - -typedef void (GLAPIENTRY * PFNGLCOPYIMAGESUBDATANVPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); - -#define glCopyImageSubDataNV GLEW_GET_FUN(__glewCopyImageSubDataNV) - -#define GLEW_NV_copy_image GLEW_GET_VAR(__GLEW_NV_copy_image) - -#endif /* GL_NV_copy_image */ - -/* -------------------------- GL_NV_deep_texture3D ------------------------- */ - -#ifndef GL_NV_deep_texture3D -#define GL_NV_deep_texture3D 1 - -#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0 -#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV 0x90D1 - -#define GLEW_NV_deep_texture3D GLEW_GET_VAR(__GLEW_NV_deep_texture3D) - -#endif /* GL_NV_deep_texture3D */ - -/* ------------------------ GL_NV_depth_buffer_float ----------------------- */ - -#ifndef GL_NV_depth_buffer_float -#define GL_NV_depth_buffer_float 1 - -#define GL_DEPTH_COMPONENT32F_NV 0x8DAB -#define GL_DEPTH32F_STENCIL8_NV 0x8DAC -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD -#define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF - -typedef void (GLAPIENTRY * PFNGLCLEARDEPTHDNVPROC) (GLdouble depth); -typedef void (GLAPIENTRY * PFNGLDEPTHBOUNDSDNVPROC) (GLdouble zmin, GLdouble zmax); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEDNVPROC) (GLdouble zNear, GLdouble zFar); - -#define glClearDepthdNV GLEW_GET_FUN(__glewClearDepthdNV) -#define glDepthBoundsdNV GLEW_GET_FUN(__glewDepthBoundsdNV) -#define glDepthRangedNV GLEW_GET_FUN(__glewDepthRangedNV) - -#define GLEW_NV_depth_buffer_float GLEW_GET_VAR(__GLEW_NV_depth_buffer_float) - -#endif /* GL_NV_depth_buffer_float */ - -/* --------------------------- GL_NV_depth_clamp --------------------------- */ - -#ifndef GL_NV_depth_clamp -#define GL_NV_depth_clamp 1 - -#define GL_DEPTH_CLAMP_NV 0x864F - -#define GLEW_NV_depth_clamp GLEW_GET_VAR(__GLEW_NV_depth_clamp) - -#endif /* GL_NV_depth_clamp */ - -/* ---------------------- GL_NV_depth_range_unclamped ---------------------- */ - -#ifndef GL_NV_depth_range_unclamped -#define GL_NV_depth_range_unclamped 1 - -#define GL_SAMPLE_COUNT_BITS_NV 0x8864 -#define GL_CURRENT_SAMPLE_COUNT_QUERY_NV 0x8865 -#define GL_QUERY_RESULT_NV 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_NV 0x8867 -#define GL_SAMPLE_COUNT_NV 0x8914 - -#define GLEW_NV_depth_range_unclamped GLEW_GET_VAR(__GLEW_NV_depth_range_unclamped) - -#endif /* GL_NV_depth_range_unclamped */ - -/* --------------------------- GL_NV_draw_texture -------------------------- */ - -#ifndef GL_NV_draw_texture -#define GL_NV_draw_texture 1 - -typedef void (GLAPIENTRY * PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); - -#define glDrawTextureNV GLEW_GET_FUN(__glewDrawTextureNV) - -#define GLEW_NV_draw_texture GLEW_GET_VAR(__GLEW_NV_draw_texture) - -#endif /* GL_NV_draw_texture */ - -/* ------------------------ GL_NV_draw_vulkan_image ------------------------ */ - -#ifndef GL_NV_draw_vulkan_image -#define GL_NV_draw_vulkan_image 1 - -typedef void (APIENTRY *GLVULKANPROCNV)(void); - -typedef void (GLAPIENTRY * PFNGLDRAWVKIMAGENVPROC) (GLuint64 vkImage, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); -typedef GLVULKANPROCNV (GLAPIENTRY * PFNGLGETVKPROCADDRNVPROC) (const GLchar* name); -typedef void (GLAPIENTRY * PFNGLSIGNALVKFENCENVPROC) (GLuint64 vkFence); -typedef void (GLAPIENTRY * PFNGLSIGNALVKSEMAPHORENVPROC) (GLuint64 vkSemaphore); -typedef void (GLAPIENTRY * PFNGLWAITVKSEMAPHORENVPROC) (GLuint64 vkSemaphore); - -#define glDrawVkImageNV GLEW_GET_FUN(__glewDrawVkImageNV) -#define glGetVkProcAddrNV GLEW_GET_FUN(__glewGetVkProcAddrNV) -#define glSignalVkFenceNV GLEW_GET_FUN(__glewSignalVkFenceNV) -#define glSignalVkSemaphoreNV GLEW_GET_FUN(__glewSignalVkSemaphoreNV) -#define glWaitVkSemaphoreNV GLEW_GET_FUN(__glewWaitVkSemaphoreNV) - -#define GLEW_NV_draw_vulkan_image GLEW_GET_VAR(__GLEW_NV_draw_vulkan_image) - -#endif /* GL_NV_draw_vulkan_image */ - -/* ---------------------------- GL_NV_evaluators --------------------------- */ - -#ifndef GL_NV_evaluators -#define GL_NV_evaluators 1 - -#define GL_EVAL_2D_NV 0x86C0 -#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_MAP_TESSELLATION_NV 0x86C2 -#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 -#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 -#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 -#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF -#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5 -#define GL_MAX_MAP_TESSELLATION_NV 0x86D6 -#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7 - -typedef void (GLAPIENTRY * PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); -typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, void *points); -typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const void *points); -typedef void (GLAPIENTRY * PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint* params); - -#define glEvalMapsNV GLEW_GET_FUN(__glewEvalMapsNV) -#define glGetMapAttribParameterfvNV GLEW_GET_FUN(__glewGetMapAttribParameterfvNV) -#define glGetMapAttribParameterivNV GLEW_GET_FUN(__glewGetMapAttribParameterivNV) -#define glGetMapControlPointsNV GLEW_GET_FUN(__glewGetMapControlPointsNV) -#define glGetMapParameterfvNV GLEW_GET_FUN(__glewGetMapParameterfvNV) -#define glGetMapParameterivNV GLEW_GET_FUN(__glewGetMapParameterivNV) -#define glMapControlPointsNV GLEW_GET_FUN(__glewMapControlPointsNV) -#define glMapParameterfvNV GLEW_GET_FUN(__glewMapParameterfvNV) -#define glMapParameterivNV GLEW_GET_FUN(__glewMapParameterivNV) - -#define GLEW_NV_evaluators GLEW_GET_VAR(__GLEW_NV_evaluators) - -#endif /* GL_NV_evaluators */ - -/* ----------------------- GL_NV_explicit_multisample ---------------------- */ - -#ifndef GL_NV_explicit_multisample -#define GL_NV_explicit_multisample 1 - -#define GL_SAMPLE_POSITION_NV 0x8E50 -#define GL_SAMPLE_MASK_NV 0x8E51 -#define GL_SAMPLE_MASK_VALUE_NV 0x8E52 -#define GL_TEXTURE_BINDING_RENDERBUFFER_NV 0x8E53 -#define GL_TEXTURE_RENDERBUFFER_DATA_STORE_BINDING_NV 0x8E54 -#define GL_TEXTURE_RENDERBUFFER_NV 0x8E55 -#define GL_SAMPLER_RENDERBUFFER_NV 0x8E56 -#define GL_INT_SAMPLER_RENDERBUFFER_NV 0x8E57 -#define GL_UNSIGNED_INT_SAMPLER_RENDERBUFFER_NV 0x8E58 -#define GL_MAX_SAMPLE_MASK_WORDS_NV 0x8E59 - -typedef void (GLAPIENTRY * PFNGLGETMULTISAMPLEFVNVPROC) (GLenum pname, GLuint index, GLfloat* val); -typedef void (GLAPIENTRY * PFNGLSAMPLEMASKINDEXEDNVPROC) (GLuint index, GLbitfield mask); -typedef void (GLAPIENTRY * PFNGLTEXRENDERBUFFERNVPROC) (GLenum target, GLuint renderbuffer); - -#define glGetMultisamplefvNV GLEW_GET_FUN(__glewGetMultisamplefvNV) -#define glSampleMaskIndexedNV GLEW_GET_FUN(__glewSampleMaskIndexedNV) -#define glTexRenderbufferNV GLEW_GET_FUN(__glewTexRenderbufferNV) - -#define GLEW_NV_explicit_multisample GLEW_GET_VAR(__GLEW_NV_explicit_multisample) - -#endif /* GL_NV_explicit_multisample */ - -/* ------------------------------ GL_NV_fence ------------------------------ */ - -#ifndef GL_NV_fence -#define GL_NV_fence 1 - -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 - -typedef void (GLAPIENTRY * PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint* fences); -typedef void (GLAPIENTRY * PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (GLAPIENTRY * PFNGLGENFENCESNVPROC) (GLsizei n, GLuint* fences); -typedef void (GLAPIENTRY * PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISFENCENVPROC) (GLuint fence); -typedef void (GLAPIENTRY * PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -typedef GLboolean (GLAPIENTRY * PFNGLTESTFENCENVPROC) (GLuint fence); - -#define glDeleteFencesNV GLEW_GET_FUN(__glewDeleteFencesNV) -#define glFinishFenceNV GLEW_GET_FUN(__glewFinishFenceNV) -#define glGenFencesNV GLEW_GET_FUN(__glewGenFencesNV) -#define glGetFenceivNV GLEW_GET_FUN(__glewGetFenceivNV) -#define glIsFenceNV GLEW_GET_FUN(__glewIsFenceNV) -#define glSetFenceNV GLEW_GET_FUN(__glewSetFenceNV) -#define glTestFenceNV GLEW_GET_FUN(__glewTestFenceNV) - -#define GLEW_NV_fence GLEW_GET_VAR(__GLEW_NV_fence) - -#endif /* GL_NV_fence */ - -/* -------------------------- GL_NV_fill_rectangle ------------------------- */ - -#ifndef GL_NV_fill_rectangle -#define GL_NV_fill_rectangle 1 - -#define GL_FILL_RECTANGLE_NV 0x933C - -#define GLEW_NV_fill_rectangle GLEW_GET_VAR(__GLEW_NV_fill_rectangle) - -#endif /* GL_NV_fill_rectangle */ - -/* --------------------------- GL_NV_float_buffer -------------------------- */ - -#ifndef GL_NV_float_buffer -#define GL_NV_float_buffer 1 - -#define GL_FLOAT_R_NV 0x8880 -#define GL_FLOAT_RG_NV 0x8881 -#define GL_FLOAT_RGB_NV 0x8882 -#define GL_FLOAT_RGBA_NV 0x8883 -#define GL_FLOAT_R16_NV 0x8884 -#define GL_FLOAT_R32_NV 0x8885 -#define GL_FLOAT_RG16_NV 0x8886 -#define GL_FLOAT_RG32_NV 0x8887 -#define GL_FLOAT_RGB16_NV 0x8888 -#define GL_FLOAT_RGB32_NV 0x8889 -#define GL_FLOAT_RGBA16_NV 0x888A -#define GL_FLOAT_RGBA32_NV 0x888B -#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C -#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D -#define GL_FLOAT_RGBA_MODE_NV 0x888E - -#define GLEW_NV_float_buffer GLEW_GET_VAR(__GLEW_NV_float_buffer) - -#endif /* GL_NV_float_buffer */ - -/* --------------------------- GL_NV_fog_distance -------------------------- */ - -#ifndef GL_NV_fog_distance -#define GL_NV_fog_distance 1 - -#define GL_FOG_DISTANCE_MODE_NV 0x855A -#define GL_EYE_RADIAL_NV 0x855B -#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C - -#define GLEW_NV_fog_distance GLEW_GET_VAR(__GLEW_NV_fog_distance) - -#endif /* GL_NV_fog_distance */ - -/* -------------------- GL_NV_fragment_coverage_to_color ------------------- */ - -#ifndef GL_NV_fragment_coverage_to_color -#define GL_NV_fragment_coverage_to_color 1 - -#define GL_FRAGMENT_COVERAGE_TO_COLOR_NV 0x92DD -#define GL_FRAGMENT_COVERAGE_COLOR_NV 0x92DE - -typedef void (GLAPIENTRY * PFNGLFRAGMENTCOVERAGECOLORNVPROC) (GLuint color); - -#define glFragmentCoverageColorNV GLEW_GET_FUN(__glewFragmentCoverageColorNV) - -#define GLEW_NV_fragment_coverage_to_color GLEW_GET_VAR(__GLEW_NV_fragment_coverage_to_color) - -#endif /* GL_NV_fragment_coverage_to_color */ - -/* ------------------------- GL_NV_fragment_program ------------------------ */ - -#ifndef GL_NV_fragment_program -#define GL_NV_fragment_program 1 - -#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868 -#define GL_FRAGMENT_PROGRAM_NV 0x8870 -#define GL_MAX_TEXTURE_COORDS_NV 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872 -#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873 -#define GL_PROGRAM_ERROR_STRING_NV 0x8874 - -typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble *params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLdouble v[]); -typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte* name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte* name, const GLfloat v[]); - -#define glGetProgramNamedParameterdvNV GLEW_GET_FUN(__glewGetProgramNamedParameterdvNV) -#define glGetProgramNamedParameterfvNV GLEW_GET_FUN(__glewGetProgramNamedParameterfvNV) -#define glProgramNamedParameter4dNV GLEW_GET_FUN(__glewProgramNamedParameter4dNV) -#define glProgramNamedParameter4dvNV GLEW_GET_FUN(__glewProgramNamedParameter4dvNV) -#define glProgramNamedParameter4fNV GLEW_GET_FUN(__glewProgramNamedParameter4fNV) -#define glProgramNamedParameter4fvNV GLEW_GET_FUN(__glewProgramNamedParameter4fvNV) - -#define GLEW_NV_fragment_program GLEW_GET_VAR(__GLEW_NV_fragment_program) - -#endif /* GL_NV_fragment_program */ - -/* ------------------------ GL_NV_fragment_program2 ------------------------ */ - -#ifndef GL_NV_fragment_program2 -#define GL_NV_fragment_program2 1 - -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 -#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 -#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7 -#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8 - -#define GLEW_NV_fragment_program2 GLEW_GET_VAR(__GLEW_NV_fragment_program2) - -#endif /* GL_NV_fragment_program2 */ - -/* ------------------------ GL_NV_fragment_program4 ------------------------ */ - -#ifndef GL_NV_fragment_program4 -#define GL_NV_fragment_program4 1 - -#define GLEW_NV_fragment_program4 GLEW_GET_VAR(__GLEW_NV_fragment_program4) - -#endif /* GL_NV_fragment_program4 */ - -/* --------------------- GL_NV_fragment_program_option --------------------- */ - -#ifndef GL_NV_fragment_program_option -#define GL_NV_fragment_program_option 1 - -#define GLEW_NV_fragment_program_option GLEW_GET_VAR(__GLEW_NV_fragment_program_option) - -#endif /* GL_NV_fragment_program_option */ - -/* -------------------- GL_NV_fragment_shader_interlock -------------------- */ - -#ifndef GL_NV_fragment_shader_interlock -#define GL_NV_fragment_shader_interlock 1 - -#define GLEW_NV_fragment_shader_interlock GLEW_GET_VAR(__GLEW_NV_fragment_shader_interlock) - -#endif /* GL_NV_fragment_shader_interlock */ - -/* -------------------- GL_NV_framebuffer_mixed_samples -------------------- */ - -#ifndef GL_NV_framebuffer_mixed_samples -#define GL_NV_framebuffer_mixed_samples 1 - -#define GL_COLOR_SAMPLES_NV 0x8E20 -#define GL_RASTER_MULTISAMPLE_EXT 0x9327 -#define GL_RASTER_SAMPLES_EXT 0x9328 -#define GL_MAX_RASTER_SAMPLES_EXT 0x9329 -#define GL_RASTER_FIXED_SAMPLE_LOCATIONS_EXT 0x932A -#define GL_MULTISAMPLE_RASTERIZATION_ALLOWED_EXT 0x932B -#define GL_EFFECTIVE_RASTER_SAMPLES_EXT 0x932C -#define GL_DEPTH_SAMPLES_NV 0x932D -#define GL_STENCIL_SAMPLES_NV 0x932E -#define GL_MIXED_DEPTH_SAMPLES_SUPPORTED_NV 0x932F -#define GL_MIXED_STENCIL_SAMPLES_SUPPORTED_NV 0x9330 -#define GL_COVERAGE_MODULATION_TABLE_NV 0x9331 -#define GL_COVERAGE_MODULATION_NV 0x9332 -#define GL_COVERAGE_MODULATION_TABLE_SIZE_NV 0x9333 - -#define GLEW_NV_framebuffer_mixed_samples GLEW_GET_VAR(__GLEW_NV_framebuffer_mixed_samples) - -#endif /* GL_NV_framebuffer_mixed_samples */ - -/* ----------------- GL_NV_framebuffer_multisample_coverage ---------------- */ - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_NV_framebuffer_multisample_coverage 1 - -#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB -#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 -#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 -#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 - -typedef void (GLAPIENTRY * PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); - -#define glRenderbufferStorageMultisampleCoverageNV GLEW_GET_FUN(__glewRenderbufferStorageMultisampleCoverageNV) - -#define GLEW_NV_framebuffer_multisample_coverage GLEW_GET_VAR(__GLEW_NV_framebuffer_multisample_coverage) - -#endif /* GL_NV_framebuffer_multisample_coverage */ - -/* ------------------------ GL_NV_geometry_program4 ------------------------ */ - -#ifndef GL_NV_geometry_program4 -#define GL_NV_geometry_program4 1 - -#define GL_GEOMETRY_PROGRAM_NV 0x8C26 -#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27 -#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28 - -typedef void (GLAPIENTRY * PFNGLPROGRAMVERTEXLIMITNVPROC) (GLenum target, GLint limit); - -#define glProgramVertexLimitNV GLEW_GET_FUN(__glewProgramVertexLimitNV) - -#define GLEW_NV_geometry_program4 GLEW_GET_VAR(__GLEW_NV_geometry_program4) - -#endif /* GL_NV_geometry_program4 */ - -/* ------------------------- GL_NV_geometry_shader4 ------------------------ */ - -#ifndef GL_NV_geometry_shader4 -#define GL_NV_geometry_shader4 1 - -#define GLEW_NV_geometry_shader4 GLEW_GET_VAR(__GLEW_NV_geometry_shader4) - -#endif /* GL_NV_geometry_shader4 */ - -/* ------------------- GL_NV_geometry_shader_passthrough ------------------- */ - -#ifndef GL_NV_geometry_shader_passthrough -#define GL_NV_geometry_shader_passthrough 1 - -#define GLEW_NV_geometry_shader_passthrough GLEW_GET_VAR(__GLEW_NV_geometry_shader_passthrough) - -#endif /* GL_NV_geometry_shader_passthrough */ - -/* -------------------------- GL_NV_gpu_multicast -------------------------- */ - -#ifndef GL_NV_gpu_multicast -#define GL_NV_gpu_multicast 1 - -#define GL_PER_GPU_STORAGE_BIT_NV 0x0800 -#define GL_MULTICAST_GPUS_NV 0x92BA -#define GL_PER_GPU_STORAGE_NV 0x9548 -#define GL_MULTICAST_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9549 -#define GL_RENDER_GPU_MASK_NV 0x9558 - -typedef void (GLAPIENTRY * PFNGLMULTICASTBARRIERNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLMULTICASTBLITFRAMEBUFFERNVPROC) (GLuint srcGpu, GLuint dstGpu, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef void (GLAPIENTRY * PFNGLMULTICASTBUFFERSUBDATANVPROC) (GLbitfield gpuMask, GLuint buffer, GLintptr offset, GLsizeiptr size, const void *data); -typedef void (GLAPIENTRY * PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC) (GLuint readGpu, GLbitfield writeGpuMask, GLuint readBuffer, GLuint writeBuffer, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLMULTICASTCOPYIMAGESUBDATANVPROC) (GLuint srcGpu, GLbitfield dstGpuMask, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srxY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); -typedef void (GLAPIENTRY * PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint gpu, GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint64* params); -typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint64* params); -typedef void (GLAPIENTRY * PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC) (GLuint gpu, GLuint id, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLMULTICASTWAITSYNCNVPROC) (GLuint signalGpu, GLbitfield waitGpuMask); -typedef void (GLAPIENTRY * PFNGLRENDERGPUMASKNVPROC) (GLbitfield mask); - -#define glMulticastBarrierNV GLEW_GET_FUN(__glewMulticastBarrierNV) -#define glMulticastBlitFramebufferNV GLEW_GET_FUN(__glewMulticastBlitFramebufferNV) -#define glMulticastBufferSubDataNV GLEW_GET_FUN(__glewMulticastBufferSubDataNV) -#define glMulticastCopyBufferSubDataNV GLEW_GET_FUN(__glewMulticastCopyBufferSubDataNV) -#define glMulticastCopyImageSubDataNV GLEW_GET_FUN(__glewMulticastCopyImageSubDataNV) -#define glMulticastFramebufferSampleLocationsfvNV GLEW_GET_FUN(__glewMulticastFramebufferSampleLocationsfvNV) -#define glMulticastGetQueryObjecti64vNV GLEW_GET_FUN(__glewMulticastGetQueryObjecti64vNV) -#define glMulticastGetQueryObjectivNV GLEW_GET_FUN(__glewMulticastGetQueryObjectivNV) -#define glMulticastGetQueryObjectui64vNV GLEW_GET_FUN(__glewMulticastGetQueryObjectui64vNV) -#define glMulticastGetQueryObjectuivNV GLEW_GET_FUN(__glewMulticastGetQueryObjectuivNV) -#define glMulticastWaitSyncNV GLEW_GET_FUN(__glewMulticastWaitSyncNV) -#define glRenderGpuMaskNV GLEW_GET_FUN(__glewRenderGpuMaskNV) - -#define GLEW_NV_gpu_multicast GLEW_GET_VAR(__GLEW_NV_gpu_multicast) - -#endif /* GL_NV_gpu_multicast */ - -/* --------------------------- GL_NV_gpu_program4 -------------------------- */ - -#ifndef GL_NV_gpu_program4 -#define GL_NV_gpu_program4 1 - -#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 -#define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 -#define GL_PROGRAM_RESULT_COMPONENTS_NV 0x8907 -#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908 -#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909 -#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5 -#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6 - -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4INVPROC) (GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC) (GLenum target, GLuint index, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4UINVPROC) (GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC) (GLenum target, GLuint index, const GLuint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC) (GLenum target, GLuint index, GLsizei count, const GLuint *params); - -#define glProgramEnvParameterI4iNV GLEW_GET_FUN(__glewProgramEnvParameterI4iNV) -#define glProgramEnvParameterI4ivNV GLEW_GET_FUN(__glewProgramEnvParameterI4ivNV) -#define glProgramEnvParameterI4uiNV GLEW_GET_FUN(__glewProgramEnvParameterI4uiNV) -#define glProgramEnvParameterI4uivNV GLEW_GET_FUN(__glewProgramEnvParameterI4uivNV) -#define glProgramEnvParametersI4ivNV GLEW_GET_FUN(__glewProgramEnvParametersI4ivNV) -#define glProgramEnvParametersI4uivNV GLEW_GET_FUN(__glewProgramEnvParametersI4uivNV) -#define glProgramLocalParameterI4iNV GLEW_GET_FUN(__glewProgramLocalParameterI4iNV) -#define glProgramLocalParameterI4ivNV GLEW_GET_FUN(__glewProgramLocalParameterI4ivNV) -#define glProgramLocalParameterI4uiNV GLEW_GET_FUN(__glewProgramLocalParameterI4uiNV) -#define glProgramLocalParameterI4uivNV GLEW_GET_FUN(__glewProgramLocalParameterI4uivNV) -#define glProgramLocalParametersI4ivNV GLEW_GET_FUN(__glewProgramLocalParametersI4ivNV) -#define glProgramLocalParametersI4uivNV GLEW_GET_FUN(__glewProgramLocalParametersI4uivNV) - -#define GLEW_NV_gpu_program4 GLEW_GET_VAR(__GLEW_NV_gpu_program4) - -#endif /* GL_NV_gpu_program4 */ - -/* --------------------------- GL_NV_gpu_program5 -------------------------- */ - -#ifndef GL_NV_gpu_program5 -#define GL_NV_gpu_program5 1 - -#define GL_MAX_GEOMETRY_PROGRAM_INVOCATIONS_NV 0x8E5A -#define GL_MIN_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5B -#define GL_MAX_FRAGMENT_INTERPOLATION_OFFSET_NV 0x8E5C -#define GL_FRAGMENT_PROGRAM_INTERPOLATION_OFFSET_BITS_NV 0x8E5D -#define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5E -#define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_NV 0x8E5F - -#define GLEW_NV_gpu_program5 GLEW_GET_VAR(__GLEW_NV_gpu_program5) - -#endif /* GL_NV_gpu_program5 */ - -/* -------------------- GL_NV_gpu_program5_mem_extended -------------------- */ - -#ifndef GL_NV_gpu_program5_mem_extended -#define GL_NV_gpu_program5_mem_extended 1 - -#define GLEW_NV_gpu_program5_mem_extended GLEW_GET_VAR(__GLEW_NV_gpu_program5_mem_extended) - -#endif /* GL_NV_gpu_program5_mem_extended */ - -/* ------------------------- GL_NV_gpu_program_fp64 ------------------------ */ - -#ifndef GL_NV_gpu_program_fp64 -#define GL_NV_gpu_program_fp64 1 - -#define GLEW_NV_gpu_program_fp64 GLEW_GET_VAR(__GLEW_NV_gpu_program_fp64) - -#endif /* GL_NV_gpu_program_fp64 */ - -/* --------------------------- GL_NV_gpu_shader5 --------------------------- */ - -#ifndef GL_NV_gpu_shader5 -#define GL_NV_gpu_shader5 1 - -#define GL_INT64_NV 0x140E -#define GL_UNSIGNED_INT64_NV 0x140F -#define GL_INT8_NV 0x8FE0 -#define GL_INT8_VEC2_NV 0x8FE1 -#define GL_INT8_VEC3_NV 0x8FE2 -#define GL_INT8_VEC4_NV 0x8FE3 -#define GL_INT16_NV 0x8FE4 -#define GL_INT16_VEC2_NV 0x8FE5 -#define GL_INT16_VEC3_NV 0x8FE6 -#define GL_INT16_VEC4_NV 0x8FE7 -#define GL_INT64_VEC2_NV 0x8FE9 -#define GL_INT64_VEC3_NV 0x8FEA -#define GL_INT64_VEC4_NV 0x8FEB -#define GL_UNSIGNED_INT8_NV 0x8FEC -#define GL_UNSIGNED_INT8_VEC2_NV 0x8FED -#define GL_UNSIGNED_INT8_VEC3_NV 0x8FEE -#define GL_UNSIGNED_INT8_VEC4_NV 0x8FEF -#define GL_UNSIGNED_INT16_NV 0x8FF0 -#define GL_UNSIGNED_INT16_VEC2_NV 0x8FF1 -#define GL_UNSIGNED_INT16_VEC3_NV 0x8FF2 -#define GL_UNSIGNED_INT16_VEC4_NV 0x8FF3 -#define GL_UNSIGNED_INT64_VEC2_NV 0x8FF5 -#define GL_UNSIGNED_INT64_VEC3_NV 0x8FF6 -#define GL_UNSIGNED_INT64_VEC4_NV 0x8FF7 -#define GL_FLOAT16_NV 0x8FF8 -#define GL_FLOAT16_VEC2_NV 0x8FF9 -#define GL_FLOAT16_VEC3_NV 0x8FFA -#define GL_FLOAT16_VEC4_NV 0x8FFB - -typedef void (GLAPIENTRY * PFNGLGETUNIFORMI64VNVPROC) (GLuint program, GLint location, GLint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLuint64EXT* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64NVPROC) (GLuint program, GLint location, GLint64EXT x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM1UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM2UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM3UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64NVPROC) (GLuint program, GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4I64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64NVPROC) (GLuint program, GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORM4UI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1I64NVPROC) (GLint location, GLint64EXT x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64NVPROC) (GLint location, GLuint64EXT x); -typedef void (GLAPIENTRY * PFNGLUNIFORM1UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y); -typedef void (GLAPIENTRY * PFNGLUNIFORM2UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (GLAPIENTRY * PFNGLUNIFORM3UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4I64NVPROC) (GLint location, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4I64VNVPROC) (GLint location, GLsizei count, const GLint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64NVPROC) (GLint location, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (GLAPIENTRY * PFNGLUNIFORM4UI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); - -#define glGetUniformi64vNV GLEW_GET_FUN(__glewGetUniformi64vNV) -#define glGetUniformui64vNV GLEW_GET_FUN(__glewGetUniformui64vNV) -#define glProgramUniform1i64NV GLEW_GET_FUN(__glewProgramUniform1i64NV) -#define glProgramUniform1i64vNV GLEW_GET_FUN(__glewProgramUniform1i64vNV) -#define glProgramUniform1ui64NV GLEW_GET_FUN(__glewProgramUniform1ui64NV) -#define glProgramUniform1ui64vNV GLEW_GET_FUN(__glewProgramUniform1ui64vNV) -#define glProgramUniform2i64NV GLEW_GET_FUN(__glewProgramUniform2i64NV) -#define glProgramUniform2i64vNV GLEW_GET_FUN(__glewProgramUniform2i64vNV) -#define glProgramUniform2ui64NV GLEW_GET_FUN(__glewProgramUniform2ui64NV) -#define glProgramUniform2ui64vNV GLEW_GET_FUN(__glewProgramUniform2ui64vNV) -#define glProgramUniform3i64NV GLEW_GET_FUN(__glewProgramUniform3i64NV) -#define glProgramUniform3i64vNV GLEW_GET_FUN(__glewProgramUniform3i64vNV) -#define glProgramUniform3ui64NV GLEW_GET_FUN(__glewProgramUniform3ui64NV) -#define glProgramUniform3ui64vNV GLEW_GET_FUN(__glewProgramUniform3ui64vNV) -#define glProgramUniform4i64NV GLEW_GET_FUN(__glewProgramUniform4i64NV) -#define glProgramUniform4i64vNV GLEW_GET_FUN(__glewProgramUniform4i64vNV) -#define glProgramUniform4ui64NV GLEW_GET_FUN(__glewProgramUniform4ui64NV) -#define glProgramUniform4ui64vNV GLEW_GET_FUN(__glewProgramUniform4ui64vNV) -#define glUniform1i64NV GLEW_GET_FUN(__glewUniform1i64NV) -#define glUniform1i64vNV GLEW_GET_FUN(__glewUniform1i64vNV) -#define glUniform1ui64NV GLEW_GET_FUN(__glewUniform1ui64NV) -#define glUniform1ui64vNV GLEW_GET_FUN(__glewUniform1ui64vNV) -#define glUniform2i64NV GLEW_GET_FUN(__glewUniform2i64NV) -#define glUniform2i64vNV GLEW_GET_FUN(__glewUniform2i64vNV) -#define glUniform2ui64NV GLEW_GET_FUN(__glewUniform2ui64NV) -#define glUniform2ui64vNV GLEW_GET_FUN(__glewUniform2ui64vNV) -#define glUniform3i64NV GLEW_GET_FUN(__glewUniform3i64NV) -#define glUniform3i64vNV GLEW_GET_FUN(__glewUniform3i64vNV) -#define glUniform3ui64NV GLEW_GET_FUN(__glewUniform3ui64NV) -#define glUniform3ui64vNV GLEW_GET_FUN(__glewUniform3ui64vNV) -#define glUniform4i64NV GLEW_GET_FUN(__glewUniform4i64NV) -#define glUniform4i64vNV GLEW_GET_FUN(__glewUniform4i64vNV) -#define glUniform4ui64NV GLEW_GET_FUN(__glewUniform4ui64NV) -#define glUniform4ui64vNV GLEW_GET_FUN(__glewUniform4ui64vNV) - -#define GLEW_NV_gpu_shader5 GLEW_GET_VAR(__GLEW_NV_gpu_shader5) - -#endif /* GL_NV_gpu_shader5 */ - -/* ---------------------------- GL_NV_half_float --------------------------- */ - -#ifndef GL_NV_half_float -#define GL_NV_half_float 1 - -#define GL_HALF_FLOAT_NV 0x140B - -typedef unsigned short GLhalf; - -typedef void (GLAPIENTRY * PFNGLCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue); -typedef void (GLAPIENTRY * PFNGLCOLOR3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLCOLOR4HNVPROC) (GLhalf red, GLhalf green, GLhalf blue, GLhalf alpha); -typedef void (GLAPIENTRY * PFNGLCOLOR4HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLFOGCOORDHNVPROC) (GLhalf fog); -typedef void (GLAPIENTRY * PFNGLFOGCOORDHVNVPROC) (const GLhalf* fog); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalf s); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalf s, GLhalf t); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalf s, GLhalf t, GLhalf r, GLhalf q); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLNORMAL3HNVPROC) (GLhalf nx, GLhalf ny, GLhalf nz); -typedef void (GLAPIENTRY * PFNGLNORMAL3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HNVPROC) (GLhalf red, GLhalf green, GLhalf blue); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD1HNVPROC) (GLhalf s); -typedef void (GLAPIENTRY * PFNGLTEXCOORD1HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2HNVPROC) (GLhalf s, GLhalf t); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD3HNVPROC) (GLhalf s, GLhalf t, GLhalf r); -typedef void (GLAPIENTRY * PFNGLTEXCOORD3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4HNVPROC) (GLhalf s, GLhalf t, GLhalf r, GLhalf q); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEX2HNVPROC) (GLhalf x, GLhalf y); -typedef void (GLAPIENTRY * PFNGLVERTEX2HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEX3HNVPROC) (GLhalf x, GLhalf y, GLhalf z); -typedef void (GLAPIENTRY * PFNGLVERTEX3HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEX4HNVPROC) (GLhalf x, GLhalf y, GLhalf z, GLhalf w); -typedef void (GLAPIENTRY * PFNGLVERTEX4HVNVPROC) (const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalf x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalf x, GLhalf y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalf x, GLhalf y, GLhalf z, GLhalf w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalf* v); -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHNVPROC) (GLhalf weight); -typedef void (GLAPIENTRY * PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalf* weight); - -#define glColor3hNV GLEW_GET_FUN(__glewColor3hNV) -#define glColor3hvNV GLEW_GET_FUN(__glewColor3hvNV) -#define glColor4hNV GLEW_GET_FUN(__glewColor4hNV) -#define glColor4hvNV GLEW_GET_FUN(__glewColor4hvNV) -#define glFogCoordhNV GLEW_GET_FUN(__glewFogCoordhNV) -#define glFogCoordhvNV GLEW_GET_FUN(__glewFogCoordhvNV) -#define glMultiTexCoord1hNV GLEW_GET_FUN(__glewMultiTexCoord1hNV) -#define glMultiTexCoord1hvNV GLEW_GET_FUN(__glewMultiTexCoord1hvNV) -#define glMultiTexCoord2hNV GLEW_GET_FUN(__glewMultiTexCoord2hNV) -#define glMultiTexCoord2hvNV GLEW_GET_FUN(__glewMultiTexCoord2hvNV) -#define glMultiTexCoord3hNV GLEW_GET_FUN(__glewMultiTexCoord3hNV) -#define glMultiTexCoord3hvNV GLEW_GET_FUN(__glewMultiTexCoord3hvNV) -#define glMultiTexCoord4hNV GLEW_GET_FUN(__glewMultiTexCoord4hNV) -#define glMultiTexCoord4hvNV GLEW_GET_FUN(__glewMultiTexCoord4hvNV) -#define glNormal3hNV GLEW_GET_FUN(__glewNormal3hNV) -#define glNormal3hvNV GLEW_GET_FUN(__glewNormal3hvNV) -#define glSecondaryColor3hNV GLEW_GET_FUN(__glewSecondaryColor3hNV) -#define glSecondaryColor3hvNV GLEW_GET_FUN(__glewSecondaryColor3hvNV) -#define glTexCoord1hNV GLEW_GET_FUN(__glewTexCoord1hNV) -#define glTexCoord1hvNV GLEW_GET_FUN(__glewTexCoord1hvNV) -#define glTexCoord2hNV GLEW_GET_FUN(__glewTexCoord2hNV) -#define glTexCoord2hvNV GLEW_GET_FUN(__glewTexCoord2hvNV) -#define glTexCoord3hNV GLEW_GET_FUN(__glewTexCoord3hNV) -#define glTexCoord3hvNV GLEW_GET_FUN(__glewTexCoord3hvNV) -#define glTexCoord4hNV GLEW_GET_FUN(__glewTexCoord4hNV) -#define glTexCoord4hvNV GLEW_GET_FUN(__glewTexCoord4hvNV) -#define glVertex2hNV GLEW_GET_FUN(__glewVertex2hNV) -#define glVertex2hvNV GLEW_GET_FUN(__glewVertex2hvNV) -#define glVertex3hNV GLEW_GET_FUN(__glewVertex3hNV) -#define glVertex3hvNV GLEW_GET_FUN(__glewVertex3hvNV) -#define glVertex4hNV GLEW_GET_FUN(__glewVertex4hNV) -#define glVertex4hvNV GLEW_GET_FUN(__glewVertex4hvNV) -#define glVertexAttrib1hNV GLEW_GET_FUN(__glewVertexAttrib1hNV) -#define glVertexAttrib1hvNV GLEW_GET_FUN(__glewVertexAttrib1hvNV) -#define glVertexAttrib2hNV GLEW_GET_FUN(__glewVertexAttrib2hNV) -#define glVertexAttrib2hvNV GLEW_GET_FUN(__glewVertexAttrib2hvNV) -#define glVertexAttrib3hNV GLEW_GET_FUN(__glewVertexAttrib3hNV) -#define glVertexAttrib3hvNV GLEW_GET_FUN(__glewVertexAttrib3hvNV) -#define glVertexAttrib4hNV GLEW_GET_FUN(__glewVertexAttrib4hNV) -#define glVertexAttrib4hvNV GLEW_GET_FUN(__glewVertexAttrib4hvNV) -#define glVertexAttribs1hvNV GLEW_GET_FUN(__glewVertexAttribs1hvNV) -#define glVertexAttribs2hvNV GLEW_GET_FUN(__glewVertexAttribs2hvNV) -#define glVertexAttribs3hvNV GLEW_GET_FUN(__glewVertexAttribs3hvNV) -#define glVertexAttribs4hvNV GLEW_GET_FUN(__glewVertexAttribs4hvNV) -#define glVertexWeighthNV GLEW_GET_FUN(__glewVertexWeighthNV) -#define glVertexWeighthvNV GLEW_GET_FUN(__glewVertexWeighthvNV) - -#define GLEW_NV_half_float GLEW_GET_VAR(__GLEW_NV_half_float) - -#endif /* GL_NV_half_float */ - -/* ------------------- GL_NV_internalformat_sample_query ------------------- */ - -#ifndef GL_NV_internalformat_sample_query -#define GL_NV_internalformat_sample_query 1 - -#define GL_MULTISAMPLES_NV 0x9371 -#define GL_SUPERSAMPLE_SCALE_X_NV 0x9372 -#define GL_SUPERSAMPLE_SCALE_Y_NV 0x9373 -#define GL_CONFORMANT_NV 0x9374 - -typedef void (GLAPIENTRY * PFNGLGETINTERNALFORMATSAMPLEIVNVPROC) (GLenum target, GLenum internalformat, GLsizei samples, GLenum pname, GLsizei bufSize, GLint* params); - -#define glGetInternalformatSampleivNV GLEW_GET_FUN(__glewGetInternalformatSampleivNV) - -#define GLEW_NV_internalformat_sample_query GLEW_GET_VAR(__GLEW_NV_internalformat_sample_query) - -#endif /* GL_NV_internalformat_sample_query */ - -/* ------------------------ GL_NV_light_max_exponent ----------------------- */ - -#ifndef GL_NV_light_max_exponent -#define GL_NV_light_max_exponent 1 - -#define GL_MAX_SHININESS_NV 0x8504 -#define GL_MAX_SPOT_EXPONENT_NV 0x8505 - -#define GLEW_NV_light_max_exponent GLEW_GET_VAR(__GLEW_NV_light_max_exponent) - -#endif /* GL_NV_light_max_exponent */ - -/* ----------------------- GL_NV_multisample_coverage ---------------------- */ - -#ifndef GL_NV_multisample_coverage -#define GL_NV_multisample_coverage 1 - -#define GL_COLOR_SAMPLES_NV 0x8E20 - -#define GLEW_NV_multisample_coverage GLEW_GET_VAR(__GLEW_NV_multisample_coverage) - -#endif /* GL_NV_multisample_coverage */ - -/* --------------------- GL_NV_multisample_filter_hint --------------------- */ - -#ifndef GL_NV_multisample_filter_hint -#define GL_NV_multisample_filter_hint 1 - -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 - -#define GLEW_NV_multisample_filter_hint GLEW_GET_VAR(__GLEW_NV_multisample_filter_hint) - -#endif /* GL_NV_multisample_filter_hint */ - -/* ------------------------- GL_NV_occlusion_query ------------------------- */ - -#ifndef GL_NV_occlusion_query -#define GL_NV_occlusion_query 1 - -#define GL_PIXEL_COUNTER_BITS_NV 0x8864 -#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 -#define GL_PIXEL_COUNT_NV 0x8866 -#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 - -typedef void (GLAPIENTRY * PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLENDOCCLUSIONQUERYNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id); - -#define glBeginOcclusionQueryNV GLEW_GET_FUN(__glewBeginOcclusionQueryNV) -#define glDeleteOcclusionQueriesNV GLEW_GET_FUN(__glewDeleteOcclusionQueriesNV) -#define glEndOcclusionQueryNV GLEW_GET_FUN(__glewEndOcclusionQueryNV) -#define glGenOcclusionQueriesNV GLEW_GET_FUN(__glewGenOcclusionQueriesNV) -#define glGetOcclusionQueryivNV GLEW_GET_FUN(__glewGetOcclusionQueryivNV) -#define glGetOcclusionQueryuivNV GLEW_GET_FUN(__glewGetOcclusionQueryuivNV) -#define glIsOcclusionQueryNV GLEW_GET_FUN(__glewIsOcclusionQueryNV) - -#define GLEW_NV_occlusion_query GLEW_GET_VAR(__GLEW_NV_occlusion_query) - -#endif /* GL_NV_occlusion_query */ - -/* ----------------------- GL_NV_packed_depth_stencil ---------------------- */ - -#ifndef GL_NV_packed_depth_stencil -#define GL_NV_packed_depth_stencil 1 - -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA - -#define GLEW_NV_packed_depth_stencil GLEW_GET_VAR(__GLEW_NV_packed_depth_stencil) - -#endif /* GL_NV_packed_depth_stencil */ - -/* --------------------- GL_NV_parameter_buffer_object --------------------- */ - -#ifndef GL_NV_parameter_buffer_object -#define GL_NV_parameter_buffer_object 1 - -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0 -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1 -#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 -#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3 -#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4 - -typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); -typedef void (GLAPIENTRY * PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); - -#define glProgramBufferParametersIivNV GLEW_GET_FUN(__glewProgramBufferParametersIivNV) -#define glProgramBufferParametersIuivNV GLEW_GET_FUN(__glewProgramBufferParametersIuivNV) -#define glProgramBufferParametersfvNV GLEW_GET_FUN(__glewProgramBufferParametersfvNV) - -#define GLEW_NV_parameter_buffer_object GLEW_GET_VAR(__GLEW_NV_parameter_buffer_object) - -#endif /* GL_NV_parameter_buffer_object */ - -/* --------------------- GL_NV_parameter_buffer_object2 -------------------- */ - -#ifndef GL_NV_parameter_buffer_object2 -#define GL_NV_parameter_buffer_object2 1 - -#define GLEW_NV_parameter_buffer_object2 GLEW_GET_VAR(__GLEW_NV_parameter_buffer_object2) - -#endif /* GL_NV_parameter_buffer_object2 */ - -/* -------------------------- GL_NV_path_rendering ------------------------- */ - -#ifndef GL_NV_path_rendering -#define GL_NV_path_rendering 1 - -#define GL_CLOSE_PATH_NV 0x00 -#define GL_BOLD_BIT_NV 0x01 -#define GL_GLYPH_WIDTH_BIT_NV 0x01 -#define GL_GLYPH_HEIGHT_BIT_NV 0x02 -#define GL_ITALIC_BIT_NV 0x02 -#define GL_MOVE_TO_NV 0x02 -#define GL_RELATIVE_MOVE_TO_NV 0x03 -#define GL_GLYPH_HORIZONTAL_BEARING_X_BIT_NV 0x04 -#define GL_LINE_TO_NV 0x04 -#define GL_RELATIVE_LINE_TO_NV 0x05 -#define GL_HORIZONTAL_LINE_TO_NV 0x06 -#define GL_RELATIVE_HORIZONTAL_LINE_TO_NV 0x07 -#define GL_GLYPH_HORIZONTAL_BEARING_Y_BIT_NV 0x08 -#define GL_VERTICAL_LINE_TO_NV 0x08 -#define GL_RELATIVE_VERTICAL_LINE_TO_NV 0x09 -#define GL_QUADRATIC_CURVE_TO_NV 0x0A -#define GL_RELATIVE_QUADRATIC_CURVE_TO_NV 0x0B -#define GL_CUBIC_CURVE_TO_NV 0x0C -#define GL_RELATIVE_CUBIC_CURVE_TO_NV 0x0D -#define GL_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0E -#define GL_RELATIVE_SMOOTH_QUADRATIC_CURVE_TO_NV 0x0F -#define GL_GLYPH_HORIZONTAL_BEARING_ADVANCE_BIT_NV 0x10 -#define GL_SMOOTH_CUBIC_CURVE_TO_NV 0x10 -#define GL_RELATIVE_SMOOTH_CUBIC_CURVE_TO_NV 0x11 -#define GL_SMALL_CCW_ARC_TO_NV 0x12 -#define GL_RELATIVE_SMALL_CCW_ARC_TO_NV 0x13 -#define GL_SMALL_CW_ARC_TO_NV 0x14 -#define GL_RELATIVE_SMALL_CW_ARC_TO_NV 0x15 -#define GL_LARGE_CCW_ARC_TO_NV 0x16 -#define GL_RELATIVE_LARGE_CCW_ARC_TO_NV 0x17 -#define GL_LARGE_CW_ARC_TO_NV 0x18 -#define GL_RELATIVE_LARGE_CW_ARC_TO_NV 0x19 -#define GL_CONIC_CURVE_TO_NV 0x1A -#define GL_RELATIVE_CONIC_CURVE_TO_NV 0x1B -#define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20 -#define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40 -#define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80 -#define GL_ROUNDED_RECT_NV 0xE8 -#define GL_RELATIVE_ROUNDED_RECT_NV 0xE9 -#define GL_ROUNDED_RECT2_NV 0xEA -#define GL_RELATIVE_ROUNDED_RECT2_NV 0xEB -#define GL_ROUNDED_RECT4_NV 0xEC -#define GL_RELATIVE_ROUNDED_RECT4_NV 0xED -#define GL_ROUNDED_RECT8_NV 0xEE -#define GL_RELATIVE_ROUNDED_RECT8_NV 0xEF -#define GL_RESTART_PATH_NV 0xF0 -#define GL_DUP_FIRST_CUBIC_CURVE_TO_NV 0xF2 -#define GL_DUP_LAST_CUBIC_CURVE_TO_NV 0xF4 -#define GL_RECT_NV 0xF6 -#define GL_RELATIVE_RECT_NV 0xF7 -#define GL_CIRCULAR_CCW_ARC_TO_NV 0xF8 -#define GL_CIRCULAR_CW_ARC_TO_NV 0xFA -#define GL_CIRCULAR_TANGENT_ARC_TO_NV 0xFC -#define GL_ARC_TO_NV 0xFE -#define GL_RELATIVE_ARC_TO_NV 0xFF -#define GL_GLYPH_HAS_KERNING_BIT_NV 0x100 -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PATH_FORMAT_SVG_NV 0x9070 -#define GL_PATH_FORMAT_PS_NV 0x9071 -#define GL_STANDARD_FONT_NAME_NV 0x9072 -#define GL_SYSTEM_FONT_NAME_NV 0x9073 -#define GL_FILE_NAME_NV 0x9074 -#define GL_PATH_STROKE_WIDTH_NV 0x9075 -#define GL_PATH_END_CAPS_NV 0x9076 -#define GL_PATH_INITIAL_END_CAP_NV 0x9077 -#define GL_PATH_TERMINAL_END_CAP_NV 0x9078 -#define GL_PATH_JOIN_STYLE_NV 0x9079 -#define GL_PATH_MITER_LIMIT_NV 0x907A -#define GL_PATH_DASH_CAPS_NV 0x907B -#define GL_PATH_INITIAL_DASH_CAP_NV 0x907C -#define GL_PATH_TERMINAL_DASH_CAP_NV 0x907D -#define GL_PATH_DASH_OFFSET_NV 0x907E -#define GL_PATH_CLIENT_LENGTH_NV 0x907F -#define GL_PATH_FILL_MODE_NV 0x9080 -#define GL_PATH_FILL_MASK_NV 0x9081 -#define GL_PATH_FILL_COVER_MODE_NV 0x9082 -#define GL_PATH_STROKE_COVER_MODE_NV 0x9083 -#define GL_PATH_STROKE_MASK_NV 0x9084 -#define GL_PATH_STROKE_BOUND_NV 0x9086 -#define GL_COUNT_UP_NV 0x9088 -#define GL_COUNT_DOWN_NV 0x9089 -#define GL_PATH_OBJECT_BOUNDING_BOX_NV 0x908A -#define GL_CONVEX_HULL_NV 0x908B -#define GL_BOUNDING_BOX_NV 0x908D -#define GL_TRANSLATE_X_NV 0x908E -#define GL_TRANSLATE_Y_NV 0x908F -#define GL_TRANSLATE_2D_NV 0x9090 -#define GL_TRANSLATE_3D_NV 0x9091 -#define GL_AFFINE_2D_NV 0x9092 -#define GL_AFFINE_3D_NV 0x9094 -#define GL_TRANSPOSE_AFFINE_2D_NV 0x9096 -#define GL_TRANSPOSE_AFFINE_3D_NV 0x9098 -#define GL_UTF8_NV 0x909A -#define GL_UTF16_NV 0x909B -#define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C -#define GL_PATH_COMMAND_COUNT_NV 0x909D -#define GL_PATH_COORD_COUNT_NV 0x909E -#define GL_PATH_DASH_ARRAY_COUNT_NV 0x909F -#define GL_PATH_COMPUTED_LENGTH_NV 0x90A0 -#define GL_PATH_FILL_BOUNDING_BOX_NV 0x90A1 -#define GL_PATH_STROKE_BOUNDING_BOX_NV 0x90A2 -#define GL_SQUARE_NV 0x90A3 -#define GL_ROUND_NV 0x90A4 -#define GL_TRIANGULAR_NV 0x90A5 -#define GL_BEVEL_NV 0x90A6 -#define GL_MITER_REVERT_NV 0x90A7 -#define GL_MITER_TRUNCATE_NV 0x90A8 -#define GL_SKIP_MISSING_GLYPH_NV 0x90A9 -#define GL_USE_MISSING_GLYPH_NV 0x90AA -#define GL_PATH_ERROR_POSITION_NV 0x90AB -#define GL_PATH_FOG_GEN_MODE_NV 0x90AC -#define GL_ACCUM_ADJACENT_PAIRS_NV 0x90AD -#define GL_ADJACENT_PAIRS_NV 0x90AE -#define GL_FIRST_TO_REST_NV 0x90AF -#define GL_PATH_GEN_MODE_NV 0x90B0 -#define GL_PATH_GEN_COEFF_NV 0x90B1 -#define GL_PATH_GEN_COLOR_FORMAT_NV 0x90B2 -#define GL_PATH_GEN_COMPONENTS_NV 0x90B3 -#define GL_PATH_DASH_OFFSET_RESET_NV 0x90B4 -#define GL_MOVE_TO_RESETS_NV 0x90B5 -#define GL_MOVE_TO_CONTINUES_NV 0x90B6 -#define GL_PATH_STENCIL_FUNC_NV 0x90B7 -#define GL_PATH_STENCIL_REF_NV 0x90B8 -#define GL_PATH_STENCIL_VALUE_MASK_NV 0x90B9 -#define GL_PATH_STENCIL_DEPTH_OFFSET_FACTOR_NV 0x90BD -#define GL_PATH_STENCIL_DEPTH_OFFSET_UNITS_NV 0x90BE -#define GL_PATH_COVER_DEPTH_FUNC_NV 0x90BF -#define GL_FONT_GLYPHS_AVAILABLE_NV 0x9368 -#define GL_FONT_TARGET_UNAVAILABLE_NV 0x9369 -#define GL_FONT_UNAVAILABLE_NV 0x936A -#define GL_FONT_UNINTELLIGIBLE_NV 0x936B -#define GL_STANDARD_FONT_FORMAT_NV 0x936C -#define GL_FRAGMENT_INPUT_NV 0x936D -#define GL_FONT_X_MIN_BOUNDS_BIT_NV 0x00010000 -#define GL_FONT_Y_MIN_BOUNDS_BIT_NV 0x00020000 -#define GL_FONT_X_MAX_BOUNDS_BIT_NV 0x00040000 -#define GL_FONT_Y_MAX_BOUNDS_BIT_NV 0x00080000 -#define GL_FONT_UNITS_PER_EM_BIT_NV 0x00100000 -#define GL_FONT_ASCENDER_BIT_NV 0x00200000 -#define GL_FONT_DESCENDER_BIT_NV 0x00400000 -#define GL_FONT_HEIGHT_BIT_NV 0x00800000 -#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV 0x01000000 -#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000 -#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000 -#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000 -#define GL_FONT_HAS_KERNING_BIT_NV 0x10000000 -#define GL_FONT_NUM_GLYPH_INDICES_BIT_NV 0x20000000 - -typedef void (GLAPIENTRY * PFNGLCOPYPATHNVPROC) (GLuint resultPath, GLuint srcPath); -typedef void (GLAPIENTRY * PFNGLCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLCOVERFILLPATHNVPROC) (GLuint path, GLenum coverMode); -typedef void (GLAPIENTRY * PFNGLCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLCOVERSTROKEPATHNVPROC) (GLuint path, GLenum coverMode); -typedef void (GLAPIENTRY * PFNGLDELETEPATHSNVPROC) (GLuint path, GLsizei range); -typedef GLuint (GLAPIENTRY * PFNGLGENPATHSNVPROC) (GLsizei range); -typedef void (GLAPIENTRY * PFNGLGETPATHCOLORGENFVNVPROC) (GLenum color, GLenum pname, GLfloat* value); -typedef void (GLAPIENTRY * PFNGLGETPATHCOLORGENIVNVPROC) (GLenum color, GLenum pname, GLint* value); -typedef void (GLAPIENTRY * PFNGLGETPATHCOMMANDSNVPROC) (GLuint path, GLubyte* commands); -typedef void (GLAPIENTRY * PFNGLGETPATHCOORDSNVPROC) (GLuint path, GLfloat* coords); -typedef void (GLAPIENTRY * PFNGLGETPATHDASHARRAYNVPROC) (GLuint path, GLfloat* dashArray); -typedef GLfloat (GLAPIENTRY * PFNGLGETPATHLENGTHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments); -typedef void (GLAPIENTRY * PFNGLGETPATHMETRICRANGENVPROC) (GLbitfield metricQueryMask, GLuint firstPathName, GLsizei numPaths, GLsizei stride, GLfloat* metrics); -typedef void (GLAPIENTRY * PFNGLGETPATHMETRICSNVPROC) (GLbitfield metricQueryMask, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLsizei stride, GLfloat *metrics); -typedef void (GLAPIENTRY * PFNGLGETPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, GLfloat* value); -typedef void (GLAPIENTRY * PFNGLGETPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, GLint* value); -typedef void (GLAPIENTRY * PFNGLGETPATHSPACINGNVPROC) (GLenum pathListMode, GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLfloat advanceScale, GLfloat kerningScale, GLenum transformType, GLfloat *returnedSpacing); -typedef void (GLAPIENTRY * PFNGLGETPATHTEXGENFVNVPROC) (GLenum texCoordSet, GLenum pname, GLfloat* value); -typedef void (GLAPIENTRY * PFNGLGETPATHTEXGENIVNVPROC) (GLenum texCoordSet, GLenum pname, GLint* value); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMRESOURCEFVNVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum* props, GLsizei bufSize, GLsizei *length, GLfloat *params); -typedef void (GLAPIENTRY * PFNGLINTERPOLATEPATHSNVPROC) (GLuint resultPath, GLuint pathA, GLuint pathB, GLfloat weight); -typedef GLboolean (GLAPIENTRY * PFNGLISPATHNVPROC) (GLuint path); -typedef GLboolean (GLAPIENTRY * PFNGLISPOINTINFILLPATHNVPROC) (GLuint path, GLuint mask, GLfloat x, GLfloat y); -typedef GLboolean (GLAPIENTRY * PFNGLISPOINTINSTROKEPATHNVPROC) (GLuint path, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLMATRIXLOAD3X2FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOAD3X3FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULT3X2FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULT3X3FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC) (GLenum matrixMode, const GLfloat* m); -typedef void (GLAPIENTRY * PFNGLPATHCOLORGENNVPROC) (GLenum color, GLenum genMode, GLenum colorFormat, const GLfloat* coeffs); -typedef void (GLAPIENTRY * PFNGLPATHCOMMANDSNVPROC) (GLuint path, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void*coords); -typedef void (GLAPIENTRY * PFNGLPATHCOORDSNVPROC) (GLuint path, GLsizei numCoords, GLenum coordType, const void *coords); -typedef void (GLAPIENTRY * PFNGLPATHCOVERDEPTHFUNCNVPROC) (GLenum zfunc); -typedef void (GLAPIENTRY * PFNGLPATHDASHARRAYNVPROC) (GLuint path, GLsizei dashCount, const GLfloat* dashArray); -typedef void (GLAPIENTRY * PFNGLPATHFOGGENNVPROC) (GLenum genMode); -typedef GLenum (GLAPIENTRY * PFNGLPATHGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale); -typedef GLenum (GLAPIENTRY * PFNGLPATHGLYPHINDEXRANGENVPROC) (GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint pathParameterTemplate, GLfloat emScale, GLuint baseAndCount[2]); -typedef void (GLAPIENTRY * PFNGLPATHGLYPHRANGENVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLuint firstGlyph, GLsizei numGlyphs, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale); -typedef void (GLAPIENTRY * PFNGLPATHGLYPHSNVPROC) (GLuint firstPathName, GLenum fontTarget, const void *fontName, GLbitfield fontStyle, GLsizei numGlyphs, GLenum type, const void*charcodes, GLenum handleMissingGlyphs, GLuint pathParameterTemplate, GLfloat emScale); -typedef GLenum (GLAPIENTRY * PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC) (GLuint firstPathName, GLenum fontTarget, GLsizeiptr fontSize, const void *fontData, GLsizei faceIndex, GLuint firstGlyphIndex, GLsizei numGlyphs, GLuint pathParameterTemplate, GLfloat emScale); -typedef void (GLAPIENTRY * PFNGLPATHPARAMETERFNVPROC) (GLuint path, GLenum pname, GLfloat value); -typedef void (GLAPIENTRY * PFNGLPATHPARAMETERFVNVPROC) (GLuint path, GLenum pname, const GLfloat* value); -typedef void (GLAPIENTRY * PFNGLPATHPARAMETERINVPROC) (GLuint path, GLenum pname, GLint value); -typedef void (GLAPIENTRY * PFNGLPATHPARAMETERIVNVPROC) (GLuint path, GLenum pname, const GLint* value); -typedef void (GLAPIENTRY * PFNGLPATHSTENCILDEPTHOFFSETNVPROC) (GLfloat factor, GLfloat units); -typedef void (GLAPIENTRY * PFNGLPATHSTENCILFUNCNVPROC) (GLenum func, GLint ref, GLuint mask); -typedef void (GLAPIENTRY * PFNGLPATHSTRINGNVPROC) (GLuint path, GLenum format, GLsizei length, const void *pathString); -typedef void (GLAPIENTRY * PFNGLPATHSUBCOMMANDSNVPROC) (GLuint path, GLsizei commandStart, GLsizei commandsToDelete, GLsizei numCommands, const GLubyte* commands, GLsizei numCoords, GLenum coordType, const void*coords); -typedef void (GLAPIENTRY * PFNGLPATHSUBCOORDSNVPROC) (GLuint path, GLsizei coordStart, GLsizei numCoords, GLenum coordType, const void *coords); -typedef void (GLAPIENTRY * PFNGLPATHTEXGENNVPROC) (GLenum texCoordSet, GLenum genMode, GLint components, const GLfloat* coeffs); -typedef GLboolean (GLAPIENTRY * PFNGLPOINTALONGPATHNVPROC) (GLuint path, GLsizei startSegment, GLsizei numSegments, GLfloat distance, GLfloat* x, GLfloat *y, GLfloat *tangentX, GLfloat *tangentY); -typedef void (GLAPIENTRY * PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC) (GLuint program, GLint location, GLenum genMode, GLint components, const GLfloat* coeffs); -typedef void (GLAPIENTRY * PFNGLSTENCILFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLSTENCILFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLSTENCILSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask); -typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLenum fillMode, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERFILLPATHNVPROC) (GLuint path, GLenum fillMode, GLuint mask, GLenum coverMode); -typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC) (GLsizei numPaths, GLenum pathNameType, const void *paths, GLuint pathBase, GLint reference, GLuint mask, GLenum coverMode, GLenum transformType, const GLfloat *transformValues); -typedef void (GLAPIENTRY * PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC) (GLuint path, GLint reference, GLuint mask, GLenum coverMode); -typedef void (GLAPIENTRY * PFNGLTRANSFORMPATHNVPROC) (GLuint resultPath, GLuint srcPath, GLenum transformType, const GLfloat* transformValues); -typedef void (GLAPIENTRY * PFNGLWEIGHTPATHSNVPROC) (GLuint resultPath, GLsizei numPaths, const GLuint paths[], const GLfloat weights[]); - -#define glCopyPathNV GLEW_GET_FUN(__glewCopyPathNV) -#define glCoverFillPathInstancedNV GLEW_GET_FUN(__glewCoverFillPathInstancedNV) -#define glCoverFillPathNV GLEW_GET_FUN(__glewCoverFillPathNV) -#define glCoverStrokePathInstancedNV GLEW_GET_FUN(__glewCoverStrokePathInstancedNV) -#define glCoverStrokePathNV GLEW_GET_FUN(__glewCoverStrokePathNV) -#define glDeletePathsNV GLEW_GET_FUN(__glewDeletePathsNV) -#define glGenPathsNV GLEW_GET_FUN(__glewGenPathsNV) -#define glGetPathColorGenfvNV GLEW_GET_FUN(__glewGetPathColorGenfvNV) -#define glGetPathColorGenivNV GLEW_GET_FUN(__glewGetPathColorGenivNV) -#define glGetPathCommandsNV GLEW_GET_FUN(__glewGetPathCommandsNV) -#define glGetPathCoordsNV GLEW_GET_FUN(__glewGetPathCoordsNV) -#define glGetPathDashArrayNV GLEW_GET_FUN(__glewGetPathDashArrayNV) -#define glGetPathLengthNV GLEW_GET_FUN(__glewGetPathLengthNV) -#define glGetPathMetricRangeNV GLEW_GET_FUN(__glewGetPathMetricRangeNV) -#define glGetPathMetricsNV GLEW_GET_FUN(__glewGetPathMetricsNV) -#define glGetPathParameterfvNV GLEW_GET_FUN(__glewGetPathParameterfvNV) -#define glGetPathParameterivNV GLEW_GET_FUN(__glewGetPathParameterivNV) -#define glGetPathSpacingNV GLEW_GET_FUN(__glewGetPathSpacingNV) -#define glGetPathTexGenfvNV GLEW_GET_FUN(__glewGetPathTexGenfvNV) -#define glGetPathTexGenivNV GLEW_GET_FUN(__glewGetPathTexGenivNV) -#define glGetProgramResourcefvNV GLEW_GET_FUN(__glewGetProgramResourcefvNV) -#define glInterpolatePathsNV GLEW_GET_FUN(__glewInterpolatePathsNV) -#define glIsPathNV GLEW_GET_FUN(__glewIsPathNV) -#define glIsPointInFillPathNV GLEW_GET_FUN(__glewIsPointInFillPathNV) -#define glIsPointInStrokePathNV GLEW_GET_FUN(__glewIsPointInStrokePathNV) -#define glMatrixLoad3x2fNV GLEW_GET_FUN(__glewMatrixLoad3x2fNV) -#define glMatrixLoad3x3fNV GLEW_GET_FUN(__glewMatrixLoad3x3fNV) -#define glMatrixLoadTranspose3x3fNV GLEW_GET_FUN(__glewMatrixLoadTranspose3x3fNV) -#define glMatrixMult3x2fNV GLEW_GET_FUN(__glewMatrixMult3x2fNV) -#define glMatrixMult3x3fNV GLEW_GET_FUN(__glewMatrixMult3x3fNV) -#define glMatrixMultTranspose3x3fNV GLEW_GET_FUN(__glewMatrixMultTranspose3x3fNV) -#define glPathColorGenNV GLEW_GET_FUN(__glewPathColorGenNV) -#define glPathCommandsNV GLEW_GET_FUN(__glewPathCommandsNV) -#define glPathCoordsNV GLEW_GET_FUN(__glewPathCoordsNV) -#define glPathCoverDepthFuncNV GLEW_GET_FUN(__glewPathCoverDepthFuncNV) -#define glPathDashArrayNV GLEW_GET_FUN(__glewPathDashArrayNV) -#define glPathFogGenNV GLEW_GET_FUN(__glewPathFogGenNV) -#define glPathGlyphIndexArrayNV GLEW_GET_FUN(__glewPathGlyphIndexArrayNV) -#define glPathGlyphIndexRangeNV GLEW_GET_FUN(__glewPathGlyphIndexRangeNV) -#define glPathGlyphRangeNV GLEW_GET_FUN(__glewPathGlyphRangeNV) -#define glPathGlyphsNV GLEW_GET_FUN(__glewPathGlyphsNV) -#define glPathMemoryGlyphIndexArrayNV GLEW_GET_FUN(__glewPathMemoryGlyphIndexArrayNV) -#define glPathParameterfNV GLEW_GET_FUN(__glewPathParameterfNV) -#define glPathParameterfvNV GLEW_GET_FUN(__glewPathParameterfvNV) -#define glPathParameteriNV GLEW_GET_FUN(__glewPathParameteriNV) -#define glPathParameterivNV GLEW_GET_FUN(__glewPathParameterivNV) -#define glPathStencilDepthOffsetNV GLEW_GET_FUN(__glewPathStencilDepthOffsetNV) -#define glPathStencilFuncNV GLEW_GET_FUN(__glewPathStencilFuncNV) -#define glPathStringNV GLEW_GET_FUN(__glewPathStringNV) -#define glPathSubCommandsNV GLEW_GET_FUN(__glewPathSubCommandsNV) -#define glPathSubCoordsNV GLEW_GET_FUN(__glewPathSubCoordsNV) -#define glPathTexGenNV GLEW_GET_FUN(__glewPathTexGenNV) -#define glPointAlongPathNV GLEW_GET_FUN(__glewPointAlongPathNV) -#define glProgramPathFragmentInputGenNV GLEW_GET_FUN(__glewProgramPathFragmentInputGenNV) -#define glStencilFillPathInstancedNV GLEW_GET_FUN(__glewStencilFillPathInstancedNV) -#define glStencilFillPathNV GLEW_GET_FUN(__glewStencilFillPathNV) -#define glStencilStrokePathInstancedNV GLEW_GET_FUN(__glewStencilStrokePathInstancedNV) -#define glStencilStrokePathNV GLEW_GET_FUN(__glewStencilStrokePathNV) -#define glStencilThenCoverFillPathInstancedNV GLEW_GET_FUN(__glewStencilThenCoverFillPathInstancedNV) -#define glStencilThenCoverFillPathNV GLEW_GET_FUN(__glewStencilThenCoverFillPathNV) -#define glStencilThenCoverStrokePathInstancedNV GLEW_GET_FUN(__glewStencilThenCoverStrokePathInstancedNV) -#define glStencilThenCoverStrokePathNV GLEW_GET_FUN(__glewStencilThenCoverStrokePathNV) -#define glTransformPathNV GLEW_GET_FUN(__glewTransformPathNV) -#define glWeightPathsNV GLEW_GET_FUN(__glewWeightPathsNV) - -#define GLEW_NV_path_rendering GLEW_GET_VAR(__GLEW_NV_path_rendering) - -#endif /* GL_NV_path_rendering */ - -/* -------------------- GL_NV_path_rendering_shared_edge ------------------- */ - -#ifndef GL_NV_path_rendering_shared_edge -#define GL_NV_path_rendering_shared_edge 1 - -#define GL_SHARED_EDGE_NV 0xC0 - -#define GLEW_NV_path_rendering_shared_edge GLEW_GET_VAR(__GLEW_NV_path_rendering_shared_edge) - -#endif /* GL_NV_path_rendering_shared_edge */ - -/* ------------------------- GL_NV_pixel_data_range ------------------------ */ - -#ifndef GL_NV_pixel_data_range -#define GL_NV_pixel_data_range 1 - -#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878 -#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879 -#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A -#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B -#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C -#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D - -typedef void (GLAPIENTRY * PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, void *pointer); - -#define glFlushPixelDataRangeNV GLEW_GET_FUN(__glewFlushPixelDataRangeNV) -#define glPixelDataRangeNV GLEW_GET_FUN(__glewPixelDataRangeNV) - -#define GLEW_NV_pixel_data_range GLEW_GET_VAR(__GLEW_NV_pixel_data_range) - -#endif /* GL_NV_pixel_data_range */ - -/* --------------------------- GL_NV_point_sprite -------------------------- */ - -#ifndef GL_NV_point_sprite -#define GL_NV_point_sprite 1 - -#define GL_POINT_SPRITE_NV 0x8861 -#define GL_COORD_REPLACE_NV 0x8862 -#define GL_POINT_SPRITE_R_MODE_NV 0x8863 - -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint* params); - -#define glPointParameteriNV GLEW_GET_FUN(__glewPointParameteriNV) -#define glPointParameterivNV GLEW_GET_FUN(__glewPointParameterivNV) - -#define GLEW_NV_point_sprite GLEW_GET_VAR(__GLEW_NV_point_sprite) - -#endif /* GL_NV_point_sprite */ - -/* -------------------------- GL_NV_present_video -------------------------- */ - -#ifndef GL_NV_present_video -#define GL_NV_present_video 1 - -#define GL_FRAME_NV 0x8E26 -#define GL_FIELDS_NV 0x8E27 -#define GL_CURRENT_TIME_NV 0x8E28 -#define GL_NUM_FILL_STREAMS_NV 0x8E29 -#define GL_PRESENT_TIME_NV 0x8E2A -#define GL_PRESENT_DURATION_NV 0x8E2B - -typedef void (GLAPIENTRY * PFNGLGETVIDEOI64VNVPROC) (GLuint video_slot, GLenum pname, GLint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOIVNVPROC) (GLuint video_slot, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOUI64VNVPROC) (GLuint video_slot, GLenum pname, GLuint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOUIVNVPROC) (GLuint video_slot, GLenum pname, GLuint* params); -typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEDUALFILLNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLenum target1, GLuint fill1, GLenum target2, GLuint fill2, GLenum target3, GLuint fill3); -typedef void (GLAPIENTRY * PFNGLPRESENTFRAMEKEYEDNVPROC) (GLuint video_slot, GLuint64EXT minPresentTime, GLuint beginPresentTimeId, GLuint presentDurationId, GLenum type, GLenum target0, GLuint fill0, GLuint key0, GLenum target1, GLuint fill1, GLuint key1); - -#define glGetVideoi64vNV GLEW_GET_FUN(__glewGetVideoi64vNV) -#define glGetVideoivNV GLEW_GET_FUN(__glewGetVideoivNV) -#define glGetVideoui64vNV GLEW_GET_FUN(__glewGetVideoui64vNV) -#define glGetVideouivNV GLEW_GET_FUN(__glewGetVideouivNV) -#define glPresentFrameDualFillNV GLEW_GET_FUN(__glewPresentFrameDualFillNV) -#define glPresentFrameKeyedNV GLEW_GET_FUN(__glewPresentFrameKeyedNV) - -#define GLEW_NV_present_video GLEW_GET_VAR(__GLEW_NV_present_video) - -#endif /* GL_NV_present_video */ - -/* ------------------------ GL_NV_primitive_restart ------------------------ */ - -#ifndef GL_NV_primitive_restart -#define GL_NV_primitive_restart 1 - -#define GL_PRIMITIVE_RESTART_NV 0x8558 -#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 - -typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index); -typedef void (GLAPIENTRY * PFNGLPRIMITIVERESTARTNVPROC) (void); - -#define glPrimitiveRestartIndexNV GLEW_GET_FUN(__glewPrimitiveRestartIndexNV) -#define glPrimitiveRestartNV GLEW_GET_FUN(__glewPrimitiveRestartNV) - -#define GLEW_NV_primitive_restart GLEW_GET_VAR(__GLEW_NV_primitive_restart) - -#endif /* GL_NV_primitive_restart */ - -/* ------------------------ GL_NV_register_combiners ----------------------- */ - -#ifndef GL_NV_register_combiners -#define GL_NV_register_combiners 1 - -#define GL_REGISTER_COMBINERS_NV 0x8522 -#define GL_VARIABLE_A_NV 0x8523 -#define GL_VARIABLE_B_NV 0x8524 -#define GL_VARIABLE_C_NV 0x8525 -#define GL_VARIABLE_D_NV 0x8526 -#define GL_VARIABLE_E_NV 0x8527 -#define GL_VARIABLE_F_NV 0x8528 -#define GL_VARIABLE_G_NV 0x8529 -#define GL_CONSTANT_COLOR0_NV 0x852A -#define GL_CONSTANT_COLOR1_NV 0x852B -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_SPARE0_NV 0x852E -#define GL_SPARE1_NV 0x852F -#define GL_DISCARD_NV 0x8530 -#define GL_E_TIMES_F_NV 0x8531 -#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 -#define GL_UNSIGNED_IDENTITY_NV 0x8536 -#define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_EXPAND_NORMAL_NV 0x8538 -#define GL_EXPAND_NEGATE_NV 0x8539 -#define GL_HALF_BIAS_NORMAL_NV 0x853A -#define GL_HALF_BIAS_NEGATE_NV 0x853B -#define GL_SIGNED_IDENTITY_NV 0x853C -#define GL_SIGNED_NEGATE_NV 0x853D -#define GL_SCALE_BY_TWO_NV 0x853E -#define GL_SCALE_BY_FOUR_NV 0x853F -#define GL_SCALE_BY_ONE_HALF_NV 0x8540 -#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541 -#define GL_COMBINER_INPUT_NV 0x8542 -#define GL_COMBINER_MAPPING_NV 0x8543 -#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544 -#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545 -#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546 -#define GL_COMBINER_MUX_SUM_NV 0x8547 -#define GL_COMBINER_SCALE_NV 0x8548 -#define GL_COMBINER_BIAS_NV 0x8549 -#define GL_COMBINER_AB_OUTPUT_NV 0x854A -#define GL_COMBINER_CD_OUTPUT_NV 0x854B -#define GL_COMBINER_SUM_OUTPUT_NV 0x854C -#define GL_MAX_GENERAL_COMBINERS_NV 0x854D -#define GL_NUM_GENERAL_COMBINERS_NV 0x854E -#define GL_COLOR_SUM_CLAMP_NV 0x854F -#define GL_COMBINER0_NV 0x8550 -#define GL_COMBINER1_NV 0x8551 -#define GL_COMBINER2_NV 0x8552 -#define GL_COMBINER3_NV 0x8553 -#define GL_COMBINER4_NV 0x8554 -#define GL_COMBINER5_NV 0x8555 -#define GL_COMBINER6_NV 0x8556 -#define GL_COMBINER7_NV 0x8557 - -typedef void (GLAPIENTRY * PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (GLAPIENTRY * PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint* params); - -#define glCombinerInputNV GLEW_GET_FUN(__glewCombinerInputNV) -#define glCombinerOutputNV GLEW_GET_FUN(__glewCombinerOutputNV) -#define glCombinerParameterfNV GLEW_GET_FUN(__glewCombinerParameterfNV) -#define glCombinerParameterfvNV GLEW_GET_FUN(__glewCombinerParameterfvNV) -#define glCombinerParameteriNV GLEW_GET_FUN(__glewCombinerParameteriNV) -#define glCombinerParameterivNV GLEW_GET_FUN(__glewCombinerParameterivNV) -#define glFinalCombinerInputNV GLEW_GET_FUN(__glewFinalCombinerInputNV) -#define glGetCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetCombinerInputParameterfvNV) -#define glGetCombinerInputParameterivNV GLEW_GET_FUN(__glewGetCombinerInputParameterivNV) -#define glGetCombinerOutputParameterfvNV GLEW_GET_FUN(__glewGetCombinerOutputParameterfvNV) -#define glGetCombinerOutputParameterivNV GLEW_GET_FUN(__glewGetCombinerOutputParameterivNV) -#define glGetFinalCombinerInputParameterfvNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterfvNV) -#define glGetFinalCombinerInputParameterivNV GLEW_GET_FUN(__glewGetFinalCombinerInputParameterivNV) - -#define GLEW_NV_register_combiners GLEW_GET_VAR(__GLEW_NV_register_combiners) - -#endif /* GL_NV_register_combiners */ - -/* ----------------------- GL_NV_register_combiners2 ----------------------- */ - -#ifndef GL_NV_register_combiners2 -#define GL_NV_register_combiners2 1 - -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 - -typedef void (GLAPIENTRY * PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat* params); - -#define glCombinerStageParameterfvNV GLEW_GET_FUN(__glewCombinerStageParameterfvNV) -#define glGetCombinerStageParameterfvNV GLEW_GET_FUN(__glewGetCombinerStageParameterfvNV) - -#define GLEW_NV_register_combiners2 GLEW_GET_VAR(__GLEW_NV_register_combiners2) - -#endif /* GL_NV_register_combiners2 */ - -/* ------------------ GL_NV_robustness_video_memory_purge ------------------ */ - -#ifndef GL_NV_robustness_video_memory_purge -#define GL_NV_robustness_video_memory_purge 1 - -#define GL_EGL_GENERATE_RESET_ON_VIDEO_MEMORY_PURGE_NV 0x334C -#define GL_PURGED_CONTEXT_RESET_NV 0x92BB - -#define GLEW_NV_robustness_video_memory_purge GLEW_GET_VAR(__GLEW_NV_robustness_video_memory_purge) - -#endif /* GL_NV_robustness_video_memory_purge */ - -/* ------------------------- GL_NV_sample_locations ------------------------ */ - -#ifndef GL_NV_sample_locations -#define GL_NV_sample_locations 1 - -#define GL_SAMPLE_LOCATION_NV 0x8E50 -#define GL_SAMPLE_LOCATION_SUBPIXEL_BITS_NV 0x933D -#define GL_SAMPLE_LOCATION_PIXEL_GRID_WIDTH_NV 0x933E -#define GL_SAMPLE_LOCATION_PIXEL_GRID_HEIGHT_NV 0x933F -#define GL_PROGRAMMABLE_SAMPLE_LOCATION_TABLE_SIZE_NV 0x9340 -#define GL_PROGRAMMABLE_SAMPLE_LOCATION_NV 0x9341 -#define GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS_NV 0x9342 -#define GL_FRAMEBUFFER_SAMPLE_LOCATION_PIXEL_GRID_NV 0x9343 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLenum target, GLuint start, GLsizei count, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC) (GLuint framebuffer, GLuint start, GLsizei count, const GLfloat* v); - -#define glFramebufferSampleLocationsfvNV GLEW_GET_FUN(__glewFramebufferSampleLocationsfvNV) -#define glNamedFramebufferSampleLocationsfvNV GLEW_GET_FUN(__glewNamedFramebufferSampleLocationsfvNV) - -#define GLEW_NV_sample_locations GLEW_GET_VAR(__GLEW_NV_sample_locations) - -#endif /* GL_NV_sample_locations */ - -/* ------------------ GL_NV_sample_mask_override_coverage ------------------ */ - -#ifndef GL_NV_sample_mask_override_coverage -#define GL_NV_sample_mask_override_coverage 1 - -#define GLEW_NV_sample_mask_override_coverage GLEW_GET_VAR(__GLEW_NV_sample_mask_override_coverage) - -#endif /* GL_NV_sample_mask_override_coverage */ - -/* ---------------------- GL_NV_shader_atomic_counters --------------------- */ - -#ifndef GL_NV_shader_atomic_counters -#define GL_NV_shader_atomic_counters 1 - -#define GLEW_NV_shader_atomic_counters GLEW_GET_VAR(__GLEW_NV_shader_atomic_counters) - -#endif /* GL_NV_shader_atomic_counters */ - -/* ----------------------- GL_NV_shader_atomic_float ----------------------- */ - -#ifndef GL_NV_shader_atomic_float -#define GL_NV_shader_atomic_float 1 - -#define GLEW_NV_shader_atomic_float GLEW_GET_VAR(__GLEW_NV_shader_atomic_float) - -#endif /* GL_NV_shader_atomic_float */ - -/* ---------------------- GL_NV_shader_atomic_float64 ---------------------- */ - -#ifndef GL_NV_shader_atomic_float64 -#define GL_NV_shader_atomic_float64 1 - -#define GLEW_NV_shader_atomic_float64 GLEW_GET_VAR(__GLEW_NV_shader_atomic_float64) - -#endif /* GL_NV_shader_atomic_float64 */ - -/* -------------------- GL_NV_shader_atomic_fp16_vector -------------------- */ - -#ifndef GL_NV_shader_atomic_fp16_vector -#define GL_NV_shader_atomic_fp16_vector 1 - -#define GLEW_NV_shader_atomic_fp16_vector GLEW_GET_VAR(__GLEW_NV_shader_atomic_fp16_vector) - -#endif /* GL_NV_shader_atomic_fp16_vector */ - -/* ----------------------- GL_NV_shader_atomic_int64 ----------------------- */ - -#ifndef GL_NV_shader_atomic_int64 -#define GL_NV_shader_atomic_int64 1 - -#define GLEW_NV_shader_atomic_int64 GLEW_GET_VAR(__GLEW_NV_shader_atomic_int64) - -#endif /* GL_NV_shader_atomic_int64 */ - -/* ------------------------ GL_NV_shader_buffer_load ----------------------- */ - -#ifndef GL_NV_shader_buffer_load -#define GL_NV_shader_buffer_load 1 - -#define GL_BUFFER_GPU_ADDRESS_NV 0x8F1D -#define GL_GPU_ADDRESS_NV 0x8F34 -#define GL_MAX_SHADER_BUFFER_ADDRESS_NV 0x8F35 - -typedef void (GLAPIENTRY * PFNGLGETBUFFERPARAMETERUI64VNVPROC) (GLenum target, GLenum pname, GLuint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETINTEGERUI64VNVPROC) (GLenum value, GLuint64EXT* result); -typedef void (GLAPIENTRY * PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC) (GLuint buffer, GLenum pname, GLuint64EXT* params); -typedef GLboolean (GLAPIENTRY * PFNGLISBUFFERRESIDENTNVPROC) (GLenum target); -typedef GLboolean (GLAPIENTRY * PFNGLISNAMEDBUFFERRESIDENTNVPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLMAKEBUFFERNONRESIDENTNVPROC) (GLenum target); -typedef void (GLAPIENTRY * PFNGLMAKEBUFFERRESIDENTNVPROC) (GLenum target, GLenum access); -typedef void (GLAPIENTRY * PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC) (GLuint buffer); -typedef void (GLAPIENTRY * PFNGLMAKENAMEDBUFFERRESIDENTNVPROC) (GLuint buffer, GLenum access); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMUI64NVPROC) (GLuint program, GLint location, GLuint64EXT value); -typedef void (GLAPIENTRY * PFNGLPROGRAMUNIFORMUI64VNVPROC) (GLuint program, GLint location, GLsizei count, const GLuint64EXT* value); -typedef void (GLAPIENTRY * PFNGLUNIFORMUI64NVPROC) (GLint location, GLuint64EXT value); -typedef void (GLAPIENTRY * PFNGLUNIFORMUI64VNVPROC) (GLint location, GLsizei count, const GLuint64EXT* value); - -#define glGetBufferParameterui64vNV GLEW_GET_FUN(__glewGetBufferParameterui64vNV) -#define glGetIntegerui64vNV GLEW_GET_FUN(__glewGetIntegerui64vNV) -#define glGetNamedBufferParameterui64vNV GLEW_GET_FUN(__glewGetNamedBufferParameterui64vNV) -#define glIsBufferResidentNV GLEW_GET_FUN(__glewIsBufferResidentNV) -#define glIsNamedBufferResidentNV GLEW_GET_FUN(__glewIsNamedBufferResidentNV) -#define glMakeBufferNonResidentNV GLEW_GET_FUN(__glewMakeBufferNonResidentNV) -#define glMakeBufferResidentNV GLEW_GET_FUN(__glewMakeBufferResidentNV) -#define glMakeNamedBufferNonResidentNV GLEW_GET_FUN(__glewMakeNamedBufferNonResidentNV) -#define glMakeNamedBufferResidentNV GLEW_GET_FUN(__glewMakeNamedBufferResidentNV) -#define glProgramUniformui64NV GLEW_GET_FUN(__glewProgramUniformui64NV) -#define glProgramUniformui64vNV GLEW_GET_FUN(__glewProgramUniformui64vNV) -#define glUniformui64NV GLEW_GET_FUN(__glewUniformui64NV) -#define glUniformui64vNV GLEW_GET_FUN(__glewUniformui64vNV) - -#define GLEW_NV_shader_buffer_load GLEW_GET_VAR(__GLEW_NV_shader_buffer_load) - -#endif /* GL_NV_shader_buffer_load */ - -/* ------------------- GL_NV_shader_storage_buffer_object ------------------ */ - -#ifndef GL_NV_shader_storage_buffer_object -#define GL_NV_shader_storage_buffer_object 1 - -#define GLEW_NV_shader_storage_buffer_object GLEW_GET_VAR(__GLEW_NV_shader_storage_buffer_object) - -#endif /* GL_NV_shader_storage_buffer_object */ - -/* ----------------------- GL_NV_shader_thread_group ----------------------- */ - -#ifndef GL_NV_shader_thread_group -#define GL_NV_shader_thread_group 1 - -#define GL_WARP_SIZE_NV 0x9339 -#define GL_WARPS_PER_SM_NV 0x933A -#define GL_SM_COUNT_NV 0x933B - -#define GLEW_NV_shader_thread_group GLEW_GET_VAR(__GLEW_NV_shader_thread_group) - -#endif /* GL_NV_shader_thread_group */ - -/* ---------------------- GL_NV_shader_thread_shuffle ---------------------- */ - -#ifndef GL_NV_shader_thread_shuffle -#define GL_NV_shader_thread_shuffle 1 - -#define GLEW_NV_shader_thread_shuffle GLEW_GET_VAR(__GLEW_NV_shader_thread_shuffle) - -#endif /* GL_NV_shader_thread_shuffle */ - -/* ---------------------- GL_NV_stereo_view_rendering ---------------------- */ - -#ifndef GL_NV_stereo_view_rendering -#define GL_NV_stereo_view_rendering 1 - -#define GLEW_NV_stereo_view_rendering GLEW_GET_VAR(__GLEW_NV_stereo_view_rendering) - -#endif /* GL_NV_stereo_view_rendering */ - -/* ---------------------- GL_NV_tessellation_program5 ---------------------- */ - -#ifndef GL_NV_tessellation_program5 -#define GL_NV_tessellation_program5 1 - -#define GL_MAX_PROGRAM_PATCH_ATTRIBS_NV 0x86D8 -#define GL_TESS_CONTROL_PROGRAM_NV 0x891E -#define GL_TESS_EVALUATION_PROGRAM_NV 0x891F -#define GL_TESS_CONTROL_PROGRAM_PARAMETER_BUFFER_NV 0x8C74 -#define GL_TESS_EVALUATION_PROGRAM_PARAMETER_BUFFER_NV 0x8C75 - -#define GLEW_NV_tessellation_program5 GLEW_GET_VAR(__GLEW_NV_tessellation_program5) - -#endif /* GL_NV_tessellation_program5 */ - -/* -------------------------- GL_NV_texgen_emboss -------------------------- */ - -#ifndef GL_NV_texgen_emboss -#define GL_NV_texgen_emboss 1 - -#define GL_EMBOSS_LIGHT_NV 0x855D -#define GL_EMBOSS_CONSTANT_NV 0x855E -#define GL_EMBOSS_MAP_NV 0x855F - -#define GLEW_NV_texgen_emboss GLEW_GET_VAR(__GLEW_NV_texgen_emboss) - -#endif /* GL_NV_texgen_emboss */ - -/* ------------------------ GL_NV_texgen_reflection ------------------------ */ - -#ifndef GL_NV_texgen_reflection -#define GL_NV_texgen_reflection 1 - -#define GL_NORMAL_MAP_NV 0x8511 -#define GL_REFLECTION_MAP_NV 0x8512 - -#define GLEW_NV_texgen_reflection GLEW_GET_VAR(__GLEW_NV_texgen_reflection) - -#endif /* GL_NV_texgen_reflection */ - -/* ------------------------- GL_NV_texture_barrier ------------------------- */ - -#ifndef GL_NV_texture_barrier -#define GL_NV_texture_barrier 1 - -typedef void (GLAPIENTRY * PFNGLTEXTUREBARRIERNVPROC) (void); - -#define glTextureBarrierNV GLEW_GET_FUN(__glewTextureBarrierNV) - -#define GLEW_NV_texture_barrier GLEW_GET_VAR(__GLEW_NV_texture_barrier) - -#endif /* GL_NV_texture_barrier */ - -/* --------------------- GL_NV_texture_compression_vtc --------------------- */ - -#ifndef GL_NV_texture_compression_vtc -#define GL_NV_texture_compression_vtc 1 - -#define GLEW_NV_texture_compression_vtc GLEW_GET_VAR(__GLEW_NV_texture_compression_vtc) - -#endif /* GL_NV_texture_compression_vtc */ - -/* ----------------------- GL_NV_texture_env_combine4 ---------------------- */ - -#ifndef GL_NV_texture_env_combine4 -#define GL_NV_texture_env_combine4 1 - -#define GL_COMBINE4_NV 0x8503 -#define GL_SOURCE3_RGB_NV 0x8583 -#define GL_SOURCE3_ALPHA_NV 0x858B -#define GL_OPERAND3_RGB_NV 0x8593 -#define GL_OPERAND3_ALPHA_NV 0x859B - -#define GLEW_NV_texture_env_combine4 GLEW_GET_VAR(__GLEW_NV_texture_env_combine4) - -#endif /* GL_NV_texture_env_combine4 */ - -/* ---------------------- GL_NV_texture_expand_normal ---------------------- */ - -#ifndef GL_NV_texture_expand_normal -#define GL_NV_texture_expand_normal 1 - -#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F - -#define GLEW_NV_texture_expand_normal GLEW_GET_VAR(__GLEW_NV_texture_expand_normal) - -#endif /* GL_NV_texture_expand_normal */ - -/* ----------------------- GL_NV_texture_multisample ----------------------- */ - -#ifndef GL_NV_texture_multisample -#define GL_NV_texture_multisample 1 - -#define GL_TEXTURE_COVERAGE_SAMPLES_NV 0x9045 -#define GL_TEXTURE_COLOR_SAMPLES_NV 0x9046 - -typedef void (GLAPIENTRY * PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC) (GLuint texture, GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations); -typedef void (GLAPIENTRY * PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC) (GLuint texture, GLenum target, GLsizei samples, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedSampleLocations); - -#define glTexImage2DMultisampleCoverageNV GLEW_GET_FUN(__glewTexImage2DMultisampleCoverageNV) -#define glTexImage3DMultisampleCoverageNV GLEW_GET_FUN(__glewTexImage3DMultisampleCoverageNV) -#define glTextureImage2DMultisampleCoverageNV GLEW_GET_FUN(__glewTextureImage2DMultisampleCoverageNV) -#define glTextureImage2DMultisampleNV GLEW_GET_FUN(__glewTextureImage2DMultisampleNV) -#define glTextureImage3DMultisampleCoverageNV GLEW_GET_FUN(__glewTextureImage3DMultisampleCoverageNV) -#define glTextureImage3DMultisampleNV GLEW_GET_FUN(__glewTextureImage3DMultisampleNV) - -#define GLEW_NV_texture_multisample GLEW_GET_VAR(__GLEW_NV_texture_multisample) - -#endif /* GL_NV_texture_multisample */ - -/* ------------------------ GL_NV_texture_rectangle ------------------------ */ - -#ifndef GL_NV_texture_rectangle -#define GL_NV_texture_rectangle 1 - -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 - -#define GLEW_NV_texture_rectangle GLEW_GET_VAR(__GLEW_NV_texture_rectangle) - -#endif /* GL_NV_texture_rectangle */ - -/* -------------------------- GL_NV_texture_shader ------------------------- */ - -#ifndef GL_NV_texture_shader -#define GL_NV_texture_shader 1 - -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_2D_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_2D_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F - -#define GLEW_NV_texture_shader GLEW_GET_VAR(__GLEW_NV_texture_shader) - -#endif /* GL_NV_texture_shader */ - -/* ------------------------- GL_NV_texture_shader2 ------------------------- */ - -#ifndef GL_NV_texture_shader2 -#define GL_NV_texture_shader2 1 - -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D - -#define GLEW_NV_texture_shader2 GLEW_GET_VAR(__GLEW_NV_texture_shader2) - -#endif /* GL_NV_texture_shader2 */ - -/* ------------------------- GL_NV_texture_shader3 ------------------------- */ - -#ifndef GL_NV_texture_shader3 -#define GL_NV_texture_shader3 1 - -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 -#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854 -#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857 -#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858 -#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859 -#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A -#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B -#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C -#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D -#define GL_HILO8_NV 0x885E -#define GL_SIGNED_HILO8_NV 0x885F -#define GL_FORCE_BLUE_TO_ONE_NV 0x8860 - -#define GLEW_NV_texture_shader3 GLEW_GET_VAR(__GLEW_NV_texture_shader3) - -#endif /* GL_NV_texture_shader3 */ - -/* ------------------------ GL_NV_transform_feedback ----------------------- */ - -#ifndef GL_NV_transform_feedback -#define GL_NV_transform_feedback 1 - -#define GL_BACK_PRIMARY_COLOR_NV 0x8C77 -#define GL_BACK_SECONDARY_COLOR_NV 0x8C78 -#define GL_TEXTURE_COORD_NV 0x8C79 -#define GL_CLIP_DISTANCE_NV 0x8C7A -#define GL_VERTEX_ID_NV 0x8C7B -#define GL_PRIMITIVE_ID_NV 0x8C7C -#define GL_GENERIC_ATTRIB_NV 0x8C7D -#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV 0x8C7E -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80 -#define GL_ACTIVE_VARYINGS_NV 0x8C81 -#define GL_ACTIVE_VARYING_MAX_LENGTH_NV 0x8C82 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85 -#define GL_TRANSFORM_FEEDBACK_RECORD_NV 0x8C86 -#define GL_PRIMITIVES_GENERATED_NV 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88 -#define GL_RASTERIZER_DISCARD_NV 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B -#define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C -#define GL_SEPARATE_ATTRIBS_NV 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F - -typedef void (GLAPIENTRY * PFNGLACTIVEVARYINGNVPROC) (GLuint program, const GLchar *name); -typedef void (GLAPIENTRY * PFNGLBEGINTRANSFORMFEEDBACKNVPROC) (GLenum primitiveMode); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERBASENVPROC) (GLenum target, GLuint index, GLuint buffer); -typedef void (GLAPIENTRY * PFNGLBINDBUFFEROFFSETNVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void (GLAPIENTRY * PFNGLBINDBUFFERRANGENVPROC) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void (GLAPIENTRY * PFNGLENDTRANSFORMFEEDBACKNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLGETACTIVEVARYINGNVPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -typedef void (GLAPIENTRY * PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC) (GLuint program, GLuint index, GLint *location); -typedef GLint (GLAPIENTRY * PFNGLGETVARYINGLOCATIONNVPROC) (GLuint program, const GLchar *name); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC) (GLuint count, const GLint *attribs, GLenum bufferMode); -typedef void (GLAPIENTRY * PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC) (GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); - -#define glActiveVaryingNV GLEW_GET_FUN(__glewActiveVaryingNV) -#define glBeginTransformFeedbackNV GLEW_GET_FUN(__glewBeginTransformFeedbackNV) -#define glBindBufferBaseNV GLEW_GET_FUN(__glewBindBufferBaseNV) -#define glBindBufferOffsetNV GLEW_GET_FUN(__glewBindBufferOffsetNV) -#define glBindBufferRangeNV GLEW_GET_FUN(__glewBindBufferRangeNV) -#define glEndTransformFeedbackNV GLEW_GET_FUN(__glewEndTransformFeedbackNV) -#define glGetActiveVaryingNV GLEW_GET_FUN(__glewGetActiveVaryingNV) -#define glGetTransformFeedbackVaryingNV GLEW_GET_FUN(__glewGetTransformFeedbackVaryingNV) -#define glGetVaryingLocationNV GLEW_GET_FUN(__glewGetVaryingLocationNV) -#define glTransformFeedbackAttribsNV GLEW_GET_FUN(__glewTransformFeedbackAttribsNV) -#define glTransformFeedbackVaryingsNV GLEW_GET_FUN(__glewTransformFeedbackVaryingsNV) - -#define GLEW_NV_transform_feedback GLEW_GET_VAR(__GLEW_NV_transform_feedback) - -#endif /* GL_NV_transform_feedback */ - -/* ----------------------- GL_NV_transform_feedback2 ----------------------- */ - -#ifndef GL_NV_transform_feedback2 -#define GL_NV_transform_feedback2 1 - -#define GL_TRANSFORM_FEEDBACK_NV 0x8E22 -#define GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED_NV 0x8E23 -#define GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE_NV 0x8E24 -#define GL_TRANSFORM_FEEDBACK_BINDING_NV 0x8E25 - -typedef void (GLAPIENTRY * PFNGLBINDTRANSFORMFEEDBACKNVPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETETRANSFORMFEEDBACKSNVPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLDRAWTRANSFORMFEEDBACKNVPROC) (GLenum mode, GLuint id); -typedef void (GLAPIENTRY * PFNGLGENTRANSFORMFEEDBACKSNVPROC) (GLsizei n, GLuint* ids); -typedef GLboolean (GLAPIENTRY * PFNGLISTRANSFORMFEEDBACKNVPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLPAUSETRANSFORMFEEDBACKNVPROC) (void); -typedef void (GLAPIENTRY * PFNGLRESUMETRANSFORMFEEDBACKNVPROC) (void); - -#define glBindTransformFeedbackNV GLEW_GET_FUN(__glewBindTransformFeedbackNV) -#define glDeleteTransformFeedbacksNV GLEW_GET_FUN(__glewDeleteTransformFeedbacksNV) -#define glDrawTransformFeedbackNV GLEW_GET_FUN(__glewDrawTransformFeedbackNV) -#define glGenTransformFeedbacksNV GLEW_GET_FUN(__glewGenTransformFeedbacksNV) -#define glIsTransformFeedbackNV GLEW_GET_FUN(__glewIsTransformFeedbackNV) -#define glPauseTransformFeedbackNV GLEW_GET_FUN(__glewPauseTransformFeedbackNV) -#define glResumeTransformFeedbackNV GLEW_GET_FUN(__glewResumeTransformFeedbackNV) - -#define GLEW_NV_transform_feedback2 GLEW_GET_VAR(__GLEW_NV_transform_feedback2) - -#endif /* GL_NV_transform_feedback2 */ - -/* ------------------ GL_NV_uniform_buffer_unified_memory ------------------ */ - -#ifndef GL_NV_uniform_buffer_unified_memory -#define GL_NV_uniform_buffer_unified_memory 1 - -#define GL_UNIFORM_BUFFER_UNIFIED_NV 0x936E -#define GL_UNIFORM_BUFFER_ADDRESS_NV 0x936F -#define GL_UNIFORM_BUFFER_LENGTH_NV 0x9370 - -#define GLEW_NV_uniform_buffer_unified_memory GLEW_GET_VAR(__GLEW_NV_uniform_buffer_unified_memory) - -#endif /* GL_NV_uniform_buffer_unified_memory */ - -/* -------------------------- GL_NV_vdpau_interop -------------------------- */ - -#ifndef GL_NV_vdpau_interop -#define GL_NV_vdpau_interop 1 - -#define GL_SURFACE_STATE_NV 0x86EB -#define GL_SURFACE_REGISTERED_NV 0x86FD -#define GL_SURFACE_MAPPED_NV 0x8700 -#define GL_WRITE_DISCARD_NV 0x88BE - -typedef GLintptr GLvdpauSurfaceNV; - -typedef void (GLAPIENTRY * PFNGLVDPAUFININVPROC) (void); -typedef void (GLAPIENTRY * PFNGLVDPAUGETSURFACEIVNVPROC) (GLvdpauSurfaceNV surface, GLenum pname, GLsizei bufSize, GLsizei* length, GLint *values); -typedef void (GLAPIENTRY * PFNGLVDPAUINITNVPROC) (const void* vdpDevice, const void*getProcAddress); -typedef void (GLAPIENTRY * PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface); -typedef void (GLAPIENTRY * PFNGLVDPAUMAPSURFACESNVPROC) (GLsizei numSurfaces, const GLvdpauSurfaceNV* surfaces); -typedef GLvdpauSurfaceNV (GLAPIENTRY * PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef GLvdpauSurfaceNV (GLAPIENTRY * PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (const void* vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); -typedef void (GLAPIENTRY * PFNGLVDPAUSURFACEACCESSNVPROC) (GLvdpauSurfaceNV surface, GLenum access); -typedef void (GLAPIENTRY * PFNGLVDPAUUNMAPSURFACESNVPROC) (GLsizei numSurface, const GLvdpauSurfaceNV* surfaces); -typedef void (GLAPIENTRY * PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface); - -#define glVDPAUFiniNV GLEW_GET_FUN(__glewVDPAUFiniNV) -#define glVDPAUGetSurfaceivNV GLEW_GET_FUN(__glewVDPAUGetSurfaceivNV) -#define glVDPAUInitNV GLEW_GET_FUN(__glewVDPAUInitNV) -#define glVDPAUIsSurfaceNV GLEW_GET_FUN(__glewVDPAUIsSurfaceNV) -#define glVDPAUMapSurfacesNV GLEW_GET_FUN(__glewVDPAUMapSurfacesNV) -#define glVDPAURegisterOutputSurfaceNV GLEW_GET_FUN(__glewVDPAURegisterOutputSurfaceNV) -#define glVDPAURegisterVideoSurfaceNV GLEW_GET_FUN(__glewVDPAURegisterVideoSurfaceNV) -#define glVDPAUSurfaceAccessNV GLEW_GET_FUN(__glewVDPAUSurfaceAccessNV) -#define glVDPAUUnmapSurfacesNV GLEW_GET_FUN(__glewVDPAUUnmapSurfacesNV) -#define glVDPAUUnregisterSurfaceNV GLEW_GET_FUN(__glewVDPAUUnregisterSurfaceNV) - -#define GLEW_NV_vdpau_interop GLEW_GET_VAR(__GLEW_NV_vdpau_interop) - -#endif /* GL_NV_vdpau_interop */ - -/* ------------------------ GL_NV_vertex_array_range ----------------------- */ - -#ifndef GL_NV_vertex_array_range -#define GL_NV_vertex_array_range 1 - -#define GL_VERTEX_ARRAY_RANGE_NV 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E -#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521 - -typedef void (GLAPIENTRY * PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void); -typedef void (GLAPIENTRY * PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, void *pointer); - -#define glFlushVertexArrayRangeNV GLEW_GET_FUN(__glewFlushVertexArrayRangeNV) -#define glVertexArrayRangeNV GLEW_GET_FUN(__glewVertexArrayRangeNV) - -#define GLEW_NV_vertex_array_range GLEW_GET_VAR(__GLEW_NV_vertex_array_range) - -#endif /* GL_NV_vertex_array_range */ - -/* ----------------------- GL_NV_vertex_array_range2 ----------------------- */ - -#ifndef GL_NV_vertex_array_range2 -#define GL_NV_vertex_array_range2 1 - -#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533 - -#define GLEW_NV_vertex_array_range2 GLEW_GET_VAR(__GLEW_NV_vertex_array_range2) - -#endif /* GL_NV_vertex_array_range2 */ - -/* ------------------- GL_NV_vertex_attrib_integer_64bit ------------------- */ - -#ifndef GL_NV_vertex_attrib_integer_64bit -#define GL_NV_vertex_attrib_integer_64bit 1 - -#define GL_INT64_NV 0x140E -#define GL_UNSIGNED_INT64_NV 0x140F - -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLI64VNVPROC) (GLuint index, GLenum pname, GLint64EXT* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBLUI64VNVPROC) (GLuint index, GLenum pname, GLuint64EXT* params); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1I64NVPROC) (GLuint index, GLint64EXT x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1I64VNVPROC) (GLuint index, const GLint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64NVPROC) (GLuint index, GLuint64EXT x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL1UI64VNVPROC) (GLuint index, const GLuint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2I64VNVPROC) (GLuint index, const GLint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL2UI64VNVPROC) (GLuint index, const GLuint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3I64VNVPROC) (GLuint index, const GLint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL3UI64VNVPROC) (GLuint index, const GLuint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4I64NVPROC) (GLuint index, GLint64EXT x, GLint64EXT y, GLint64EXT z, GLint64EXT w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4I64VNVPROC) (GLuint index, const GLint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4UI64NVPROC) (GLuint index, GLuint64EXT x, GLuint64EXT y, GLuint64EXT z, GLuint64EXT w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBL4UI64VNVPROC) (GLuint index, const GLuint64EXT* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBLFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); - -#define glGetVertexAttribLi64vNV GLEW_GET_FUN(__glewGetVertexAttribLi64vNV) -#define glGetVertexAttribLui64vNV GLEW_GET_FUN(__glewGetVertexAttribLui64vNV) -#define glVertexAttribL1i64NV GLEW_GET_FUN(__glewVertexAttribL1i64NV) -#define glVertexAttribL1i64vNV GLEW_GET_FUN(__glewVertexAttribL1i64vNV) -#define glVertexAttribL1ui64NV GLEW_GET_FUN(__glewVertexAttribL1ui64NV) -#define glVertexAttribL1ui64vNV GLEW_GET_FUN(__glewVertexAttribL1ui64vNV) -#define glVertexAttribL2i64NV GLEW_GET_FUN(__glewVertexAttribL2i64NV) -#define glVertexAttribL2i64vNV GLEW_GET_FUN(__glewVertexAttribL2i64vNV) -#define glVertexAttribL2ui64NV GLEW_GET_FUN(__glewVertexAttribL2ui64NV) -#define glVertexAttribL2ui64vNV GLEW_GET_FUN(__glewVertexAttribL2ui64vNV) -#define glVertexAttribL3i64NV GLEW_GET_FUN(__glewVertexAttribL3i64NV) -#define glVertexAttribL3i64vNV GLEW_GET_FUN(__glewVertexAttribL3i64vNV) -#define glVertexAttribL3ui64NV GLEW_GET_FUN(__glewVertexAttribL3ui64NV) -#define glVertexAttribL3ui64vNV GLEW_GET_FUN(__glewVertexAttribL3ui64vNV) -#define glVertexAttribL4i64NV GLEW_GET_FUN(__glewVertexAttribL4i64NV) -#define glVertexAttribL4i64vNV GLEW_GET_FUN(__glewVertexAttribL4i64vNV) -#define glVertexAttribL4ui64NV GLEW_GET_FUN(__glewVertexAttribL4ui64NV) -#define glVertexAttribL4ui64vNV GLEW_GET_FUN(__glewVertexAttribL4ui64vNV) -#define glVertexAttribLFormatNV GLEW_GET_FUN(__glewVertexAttribLFormatNV) - -#define GLEW_NV_vertex_attrib_integer_64bit GLEW_GET_VAR(__GLEW_NV_vertex_attrib_integer_64bit) - -#endif /* GL_NV_vertex_attrib_integer_64bit */ - -/* ------------------- GL_NV_vertex_buffer_unified_memory ------------------ */ - -#ifndef GL_NV_vertex_buffer_unified_memory -#define GL_NV_vertex_buffer_unified_memory 1 - -#define GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV 0x8F1E -#define GL_ELEMENT_ARRAY_UNIFIED_NV 0x8F1F -#define GL_VERTEX_ATTRIB_ARRAY_ADDRESS_NV 0x8F20 -#define GL_VERTEX_ARRAY_ADDRESS_NV 0x8F21 -#define GL_NORMAL_ARRAY_ADDRESS_NV 0x8F22 -#define GL_COLOR_ARRAY_ADDRESS_NV 0x8F23 -#define GL_INDEX_ARRAY_ADDRESS_NV 0x8F24 -#define GL_TEXTURE_COORD_ARRAY_ADDRESS_NV 0x8F25 -#define GL_EDGE_FLAG_ARRAY_ADDRESS_NV 0x8F26 -#define GL_SECONDARY_COLOR_ARRAY_ADDRESS_NV 0x8F27 -#define GL_FOG_COORD_ARRAY_ADDRESS_NV 0x8F28 -#define GL_ELEMENT_ARRAY_ADDRESS_NV 0x8F29 -#define GL_VERTEX_ATTRIB_ARRAY_LENGTH_NV 0x8F2A -#define GL_VERTEX_ARRAY_LENGTH_NV 0x8F2B -#define GL_NORMAL_ARRAY_LENGTH_NV 0x8F2C -#define GL_COLOR_ARRAY_LENGTH_NV 0x8F2D -#define GL_INDEX_ARRAY_LENGTH_NV 0x8F2E -#define GL_TEXTURE_COORD_ARRAY_LENGTH_NV 0x8F2F -#define GL_EDGE_FLAG_ARRAY_LENGTH_NV 0x8F30 -#define GL_SECONDARY_COLOR_ARRAY_LENGTH_NV 0x8F31 -#define GL_FOG_COORD_ARRAY_LENGTH_NV 0x8F32 -#define GL_ELEMENT_ARRAY_LENGTH_NV 0x8F33 -#define GL_DRAW_INDIRECT_UNIFIED_NV 0x8F40 -#define GL_DRAW_INDIRECT_ADDRESS_NV 0x8F41 -#define GL_DRAW_INDIRECT_LENGTH_NV 0x8F42 - -typedef void (GLAPIENTRY * PFNGLBUFFERADDRESSRANGENVPROC) (GLenum pname, GLuint index, GLuint64EXT address, GLsizeiptr length); -typedef void (GLAPIENTRY * PFNGLCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLEDGEFLAGFORMATNVPROC) (GLsizei stride); -typedef void (GLAPIENTRY * PFNGLFOGCOORDFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLGETINTEGERUI64I_VNVPROC) (GLenum value, GLuint index, GLuint64EXT result[]); -typedef void (GLAPIENTRY * PFNGLINDEXFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLNORMALFORMATNVPROC) (GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLSECONDARYCOLORFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLTEXCOORDFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBIFORMATNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride); -typedef void (GLAPIENTRY * PFNGLVERTEXFORMATNVPROC) (GLint size, GLenum type, GLsizei stride); - -#define glBufferAddressRangeNV GLEW_GET_FUN(__glewBufferAddressRangeNV) -#define glColorFormatNV GLEW_GET_FUN(__glewColorFormatNV) -#define glEdgeFlagFormatNV GLEW_GET_FUN(__glewEdgeFlagFormatNV) -#define glFogCoordFormatNV GLEW_GET_FUN(__glewFogCoordFormatNV) -#define glGetIntegerui64i_vNV GLEW_GET_FUN(__glewGetIntegerui64i_vNV) -#define glIndexFormatNV GLEW_GET_FUN(__glewIndexFormatNV) -#define glNormalFormatNV GLEW_GET_FUN(__glewNormalFormatNV) -#define glSecondaryColorFormatNV GLEW_GET_FUN(__glewSecondaryColorFormatNV) -#define glTexCoordFormatNV GLEW_GET_FUN(__glewTexCoordFormatNV) -#define glVertexAttribFormatNV GLEW_GET_FUN(__glewVertexAttribFormatNV) -#define glVertexAttribIFormatNV GLEW_GET_FUN(__glewVertexAttribIFormatNV) -#define glVertexFormatNV GLEW_GET_FUN(__glewVertexFormatNV) - -#define GLEW_NV_vertex_buffer_unified_memory GLEW_GET_VAR(__GLEW_NV_vertex_buffer_unified_memory) - -#endif /* GL_NV_vertex_buffer_unified_memory */ - -/* -------------------------- GL_NV_vertex_program ------------------------- */ - -#ifndef GL_NV_vertex_program -#define GL_NV_vertex_program 1 - -#define GL_VERTEX_PROGRAM_NV 0x8620 -#define GL_VERTEX_STATE_PROGRAM_NV 0x8621 -#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623 -#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624 -#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625 -#define GL_CURRENT_ATTRIB_NV 0x8626 -#define GL_PROGRAM_LENGTH_NV 0x8627 -#define GL_PROGRAM_STRING_NV 0x8628 -#define GL_MODELVIEW_PROJECTION_NV 0x8629 -#define GL_IDENTITY_NV 0x862A -#define GL_INVERSE_NV 0x862B -#define GL_TRANSPOSE_NV 0x862C -#define GL_INVERSE_TRANSPOSE_NV 0x862D -#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E -#define GL_MAX_TRACK_MATRICES_NV 0x862F -#define GL_MATRIX0_NV 0x8630 -#define GL_MATRIX1_NV 0x8631 -#define GL_MATRIX2_NV 0x8632 -#define GL_MATRIX3_NV 0x8633 -#define GL_MATRIX4_NV 0x8634 -#define GL_MATRIX5_NV 0x8635 -#define GL_MATRIX6_NV 0x8636 -#define GL_MATRIX7_NV 0x8637 -#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640 -#define GL_CURRENT_MATRIX_NV 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643 -#define GL_PROGRAM_PARAMETER_NV 0x8644 -#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645 -#define GL_PROGRAM_TARGET_NV 0x8646 -#define GL_PROGRAM_RESIDENT_NV 0x8647 -#define GL_TRACK_MATRIX_NV 0x8648 -#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649 -#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A -#define GL_PROGRAM_ERROR_POSITION_NV 0x864B -#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650 -#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651 -#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652 -#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653 -#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654 -#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655 -#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656 -#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657 -#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658 -#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659 -#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A -#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B -#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C -#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D -#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E -#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F -#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660 -#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661 -#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662 -#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663 -#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664 -#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665 -#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666 -#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667 -#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668 -#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669 -#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A -#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B -#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C -#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D -#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E -#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F -#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670 -#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671 -#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672 -#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673 -#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674 -#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675 -#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676 -#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677 -#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678 -#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 -#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A -#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B -#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C -#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D -#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E -#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F - -typedef GLboolean (GLAPIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint* ids, GLboolean *residences); -typedef void (GLAPIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (GLAPIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint* ids); -typedef void (GLAPIENTRY * PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte* program); -typedef void (GLAPIENTRY * PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, void** pointer); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint* params); -typedef GLboolean (GLAPIENTRY * PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (GLAPIENTRY * PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte* program); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLsizei num, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLsizei num, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, GLuint* ids); -typedef void (GLAPIENTRY * PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint size, GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei n, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei n, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei n, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei n, const GLdouble* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei n, const GLfloat* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei n, const GLshort* v); -typedef void (GLAPIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei n, const GLubyte* v); - -#define glAreProgramsResidentNV GLEW_GET_FUN(__glewAreProgramsResidentNV) -#define glBindProgramNV GLEW_GET_FUN(__glewBindProgramNV) -#define glDeleteProgramsNV GLEW_GET_FUN(__glewDeleteProgramsNV) -#define glExecuteProgramNV GLEW_GET_FUN(__glewExecuteProgramNV) -#define glGenProgramsNV GLEW_GET_FUN(__glewGenProgramsNV) -#define glGetProgramParameterdvNV GLEW_GET_FUN(__glewGetProgramParameterdvNV) -#define glGetProgramParameterfvNV GLEW_GET_FUN(__glewGetProgramParameterfvNV) -#define glGetProgramStringNV GLEW_GET_FUN(__glewGetProgramStringNV) -#define glGetProgramivNV GLEW_GET_FUN(__glewGetProgramivNV) -#define glGetTrackMatrixivNV GLEW_GET_FUN(__glewGetTrackMatrixivNV) -#define glGetVertexAttribPointervNV GLEW_GET_FUN(__glewGetVertexAttribPointervNV) -#define glGetVertexAttribdvNV GLEW_GET_FUN(__glewGetVertexAttribdvNV) -#define glGetVertexAttribfvNV GLEW_GET_FUN(__glewGetVertexAttribfvNV) -#define glGetVertexAttribivNV GLEW_GET_FUN(__glewGetVertexAttribivNV) -#define glIsProgramNV GLEW_GET_FUN(__glewIsProgramNV) -#define glLoadProgramNV GLEW_GET_FUN(__glewLoadProgramNV) -#define glProgramParameter4dNV GLEW_GET_FUN(__glewProgramParameter4dNV) -#define glProgramParameter4dvNV GLEW_GET_FUN(__glewProgramParameter4dvNV) -#define glProgramParameter4fNV GLEW_GET_FUN(__glewProgramParameter4fNV) -#define glProgramParameter4fvNV GLEW_GET_FUN(__glewProgramParameter4fvNV) -#define glProgramParameters4dvNV GLEW_GET_FUN(__glewProgramParameters4dvNV) -#define glProgramParameters4fvNV GLEW_GET_FUN(__glewProgramParameters4fvNV) -#define glRequestResidentProgramsNV GLEW_GET_FUN(__glewRequestResidentProgramsNV) -#define glTrackMatrixNV GLEW_GET_FUN(__glewTrackMatrixNV) -#define glVertexAttrib1dNV GLEW_GET_FUN(__glewVertexAttrib1dNV) -#define glVertexAttrib1dvNV GLEW_GET_FUN(__glewVertexAttrib1dvNV) -#define glVertexAttrib1fNV GLEW_GET_FUN(__glewVertexAttrib1fNV) -#define glVertexAttrib1fvNV GLEW_GET_FUN(__glewVertexAttrib1fvNV) -#define glVertexAttrib1sNV GLEW_GET_FUN(__glewVertexAttrib1sNV) -#define glVertexAttrib1svNV GLEW_GET_FUN(__glewVertexAttrib1svNV) -#define glVertexAttrib2dNV GLEW_GET_FUN(__glewVertexAttrib2dNV) -#define glVertexAttrib2dvNV GLEW_GET_FUN(__glewVertexAttrib2dvNV) -#define glVertexAttrib2fNV GLEW_GET_FUN(__glewVertexAttrib2fNV) -#define glVertexAttrib2fvNV GLEW_GET_FUN(__glewVertexAttrib2fvNV) -#define glVertexAttrib2sNV GLEW_GET_FUN(__glewVertexAttrib2sNV) -#define glVertexAttrib2svNV GLEW_GET_FUN(__glewVertexAttrib2svNV) -#define glVertexAttrib3dNV GLEW_GET_FUN(__glewVertexAttrib3dNV) -#define glVertexAttrib3dvNV GLEW_GET_FUN(__glewVertexAttrib3dvNV) -#define glVertexAttrib3fNV GLEW_GET_FUN(__glewVertexAttrib3fNV) -#define glVertexAttrib3fvNV GLEW_GET_FUN(__glewVertexAttrib3fvNV) -#define glVertexAttrib3sNV GLEW_GET_FUN(__glewVertexAttrib3sNV) -#define glVertexAttrib3svNV GLEW_GET_FUN(__glewVertexAttrib3svNV) -#define glVertexAttrib4dNV GLEW_GET_FUN(__glewVertexAttrib4dNV) -#define glVertexAttrib4dvNV GLEW_GET_FUN(__glewVertexAttrib4dvNV) -#define glVertexAttrib4fNV GLEW_GET_FUN(__glewVertexAttrib4fNV) -#define glVertexAttrib4fvNV GLEW_GET_FUN(__glewVertexAttrib4fvNV) -#define glVertexAttrib4sNV GLEW_GET_FUN(__glewVertexAttrib4sNV) -#define glVertexAttrib4svNV GLEW_GET_FUN(__glewVertexAttrib4svNV) -#define glVertexAttrib4ubNV GLEW_GET_FUN(__glewVertexAttrib4ubNV) -#define glVertexAttrib4ubvNV GLEW_GET_FUN(__glewVertexAttrib4ubvNV) -#define glVertexAttribPointerNV GLEW_GET_FUN(__glewVertexAttribPointerNV) -#define glVertexAttribs1dvNV GLEW_GET_FUN(__glewVertexAttribs1dvNV) -#define glVertexAttribs1fvNV GLEW_GET_FUN(__glewVertexAttribs1fvNV) -#define glVertexAttribs1svNV GLEW_GET_FUN(__glewVertexAttribs1svNV) -#define glVertexAttribs2dvNV GLEW_GET_FUN(__glewVertexAttribs2dvNV) -#define glVertexAttribs2fvNV GLEW_GET_FUN(__glewVertexAttribs2fvNV) -#define glVertexAttribs2svNV GLEW_GET_FUN(__glewVertexAttribs2svNV) -#define glVertexAttribs3dvNV GLEW_GET_FUN(__glewVertexAttribs3dvNV) -#define glVertexAttribs3fvNV GLEW_GET_FUN(__glewVertexAttribs3fvNV) -#define glVertexAttribs3svNV GLEW_GET_FUN(__glewVertexAttribs3svNV) -#define glVertexAttribs4dvNV GLEW_GET_FUN(__glewVertexAttribs4dvNV) -#define glVertexAttribs4fvNV GLEW_GET_FUN(__glewVertexAttribs4fvNV) -#define glVertexAttribs4svNV GLEW_GET_FUN(__glewVertexAttribs4svNV) -#define glVertexAttribs4ubvNV GLEW_GET_FUN(__glewVertexAttribs4ubvNV) - -#define GLEW_NV_vertex_program GLEW_GET_VAR(__GLEW_NV_vertex_program) - -#endif /* GL_NV_vertex_program */ - -/* ------------------------ GL_NV_vertex_program1_1 ------------------------ */ - -#ifndef GL_NV_vertex_program1_1 -#define GL_NV_vertex_program1_1 1 - -#define GLEW_NV_vertex_program1_1 GLEW_GET_VAR(__GLEW_NV_vertex_program1_1) - -#endif /* GL_NV_vertex_program1_1 */ - -/* ------------------------- GL_NV_vertex_program2 ------------------------- */ - -#ifndef GL_NV_vertex_program2 -#define GL_NV_vertex_program2 1 - -#define GLEW_NV_vertex_program2 GLEW_GET_VAR(__GLEW_NV_vertex_program2) - -#endif /* GL_NV_vertex_program2 */ - -/* ---------------------- GL_NV_vertex_program2_option --------------------- */ - -#ifndef GL_NV_vertex_program2_option -#define GL_NV_vertex_program2_option 1 - -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 - -#define GLEW_NV_vertex_program2_option GLEW_GET_VAR(__GLEW_NV_vertex_program2_option) - -#endif /* GL_NV_vertex_program2_option */ - -/* ------------------------- GL_NV_vertex_program3 ------------------------- */ - -#ifndef GL_NV_vertex_program3 -#define GL_NV_vertex_program3 1 - -#define MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C - -#define GLEW_NV_vertex_program3 GLEW_GET_VAR(__GLEW_NV_vertex_program3) - -#endif /* GL_NV_vertex_program3 */ - -/* ------------------------- GL_NV_vertex_program4 ------------------------- */ - -#ifndef GL_NV_vertex_program4 -#define GL_NV_vertex_program4 1 - -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD - -#define GLEW_NV_vertex_program4 GLEW_GET_VAR(__GLEW_NV_vertex_program4) - -#endif /* GL_NV_vertex_program4 */ - -/* -------------------------- GL_NV_video_capture -------------------------- */ - -#ifndef GL_NV_video_capture -#define GL_NV_video_capture 1 - -#define GL_VIDEO_BUFFER_NV 0x9020 -#define GL_VIDEO_BUFFER_BINDING_NV 0x9021 -#define GL_FIELD_UPPER_NV 0x9022 -#define GL_FIELD_LOWER_NV 0x9023 -#define GL_NUM_VIDEO_CAPTURE_STREAMS_NV 0x9024 -#define GL_NEXT_VIDEO_CAPTURE_BUFFER_STATUS_NV 0x9025 -#define GL_VIDEO_CAPTURE_TO_422_SUPPORTED_NV 0x9026 -#define GL_LAST_VIDEO_CAPTURE_STATUS_NV 0x9027 -#define GL_VIDEO_BUFFER_PITCH_NV 0x9028 -#define GL_VIDEO_COLOR_CONVERSION_MATRIX_NV 0x9029 -#define GL_VIDEO_COLOR_CONVERSION_MAX_NV 0x902A -#define GL_VIDEO_COLOR_CONVERSION_MIN_NV 0x902B -#define GL_VIDEO_COLOR_CONVERSION_OFFSET_NV 0x902C -#define GL_VIDEO_BUFFER_INTERNAL_FORMAT_NV 0x902D -#define GL_PARTIAL_SUCCESS_NV 0x902E -#define GL_SUCCESS_NV 0x902F -#define GL_FAILURE_NV 0x9030 -#define GL_YCBYCR8_422_NV 0x9031 -#define GL_YCBAYCR8A_4224_NV 0x9032 -#define GL_Z6Y10Z6CB10Z6Y10Z6CR10_422_NV 0x9033 -#define GL_Z6Y10Z6CB10Z6A10Z6Y10Z6CR10Z6A10_4224_NV 0x9034 -#define GL_Z4Y12Z4CB12Z4Y12Z4CR12_422_NV 0x9035 -#define GL_Z4Y12Z4CB12Z4A12Z4Y12Z4CR12Z4A12_4224_NV 0x9036 -#define GL_Z4Y12Z4CB12Z4CR12_444_NV 0x9037 -#define GL_VIDEO_CAPTURE_FRAME_WIDTH_NV 0x9038 -#define GL_VIDEO_CAPTURE_FRAME_HEIGHT_NV 0x9039 -#define GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV 0x903A -#define GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV 0x903B -#define GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV 0x903C - -typedef void (GLAPIENTRY * PFNGLBEGINVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (GLAPIENTRY * PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLintptrARB offset); -typedef void (GLAPIENTRY * PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC) (GLuint video_capture_slot, GLuint stream, GLenum frame_region, GLenum target, GLuint texture); -typedef void (GLAPIENTRY * PFNGLENDVIDEOCAPTURENVPROC) (GLuint video_capture_slot); -typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLdouble* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTURESTREAMIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETVIDEOCAPTUREIVNVPROC) (GLuint video_capture_slot, GLenum pname, GLint* params); -typedef GLenum (GLAPIENTRY * PFNGLVIDEOCAPTURENVPROC) (GLuint video_capture_slot, GLuint* sequence_num, GLuint64EXT *capture_time); -typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLdouble* params); -typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC) (GLuint video_capture_slot, GLuint stream, GLenum pname, const GLint* params); - -#define glBeginVideoCaptureNV GLEW_GET_FUN(__glewBeginVideoCaptureNV) -#define glBindVideoCaptureStreamBufferNV GLEW_GET_FUN(__glewBindVideoCaptureStreamBufferNV) -#define glBindVideoCaptureStreamTextureNV GLEW_GET_FUN(__glewBindVideoCaptureStreamTextureNV) -#define glEndVideoCaptureNV GLEW_GET_FUN(__glewEndVideoCaptureNV) -#define glGetVideoCaptureStreamdvNV GLEW_GET_FUN(__glewGetVideoCaptureStreamdvNV) -#define glGetVideoCaptureStreamfvNV GLEW_GET_FUN(__glewGetVideoCaptureStreamfvNV) -#define glGetVideoCaptureStreamivNV GLEW_GET_FUN(__glewGetVideoCaptureStreamivNV) -#define glGetVideoCaptureivNV GLEW_GET_FUN(__glewGetVideoCaptureivNV) -#define glVideoCaptureNV GLEW_GET_FUN(__glewVideoCaptureNV) -#define glVideoCaptureStreamParameterdvNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterdvNV) -#define glVideoCaptureStreamParameterfvNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterfvNV) -#define glVideoCaptureStreamParameterivNV GLEW_GET_FUN(__glewVideoCaptureStreamParameterivNV) - -#define GLEW_NV_video_capture GLEW_GET_VAR(__GLEW_NV_video_capture) - -#endif /* GL_NV_video_capture */ - -/* ------------------------- GL_NV_viewport_array2 ------------------------- */ - -#ifndef GL_NV_viewport_array2 -#define GL_NV_viewport_array2 1 - -#define GLEW_NV_viewport_array2 GLEW_GET_VAR(__GLEW_NV_viewport_array2) - -#endif /* GL_NV_viewport_array2 */ - -/* ------------------------- GL_NV_viewport_swizzle ------------------------ */ - -#ifndef GL_NV_viewport_swizzle -#define GL_NV_viewport_swizzle 1 - -#define GL_VIEWPORT_SWIZZLE_POSITIVE_X_NV 0x9350 -#define GL_VIEWPORT_SWIZZLE_NEGATIVE_X_NV 0x9351 -#define GL_VIEWPORT_SWIZZLE_POSITIVE_Y_NV 0x9352 -#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Y_NV 0x9353 -#define GL_VIEWPORT_SWIZZLE_POSITIVE_Z_NV 0x9354 -#define GL_VIEWPORT_SWIZZLE_NEGATIVE_Z_NV 0x9355 -#define GL_VIEWPORT_SWIZZLE_POSITIVE_W_NV 0x9356 -#define GL_VIEWPORT_SWIZZLE_NEGATIVE_W_NV 0x9357 -#define GL_VIEWPORT_SWIZZLE_X_NV 0x9358 -#define GL_VIEWPORT_SWIZZLE_Y_NV 0x9359 -#define GL_VIEWPORT_SWIZZLE_Z_NV 0x935A -#define GL_VIEWPORT_SWIZZLE_W_NV 0x935B - -typedef void (GLAPIENTRY * PFNGLVIEWPORTSWIZZLENVPROC) (GLuint index, GLenum swizzlex, GLenum swizzley, GLenum swizzlez, GLenum swizzlew); - -#define glViewportSwizzleNV GLEW_GET_FUN(__glewViewportSwizzleNV) - -#define GLEW_NV_viewport_swizzle GLEW_GET_VAR(__GLEW_NV_viewport_swizzle) - -#endif /* GL_NV_viewport_swizzle */ - -/* ------------------------ GL_OES_byte_coordinates ------------------------ */ - -#ifndef GL_OES_byte_coordinates -#define GL_OES_byte_coordinates 1 - -#define GLEW_OES_byte_coordinates GLEW_GET_VAR(__GLEW_OES_byte_coordinates) - -#endif /* GL_OES_byte_coordinates */ - -/* ------------------- GL_OES_compressed_paletted_texture ------------------ */ - -#ifndef GL_OES_compressed_paletted_texture -#define GL_OES_compressed_paletted_texture 1 - -#define GL_PALETTE4_RGB8_OES 0x8B90 -#define GL_PALETTE4_RGBA8_OES 0x8B91 -#define GL_PALETTE4_R5_G6_B5_OES 0x8B92 -#define GL_PALETTE4_RGBA4_OES 0x8B93 -#define GL_PALETTE4_RGB5_A1_OES 0x8B94 -#define GL_PALETTE8_RGB8_OES 0x8B95 -#define GL_PALETTE8_RGBA8_OES 0x8B96 -#define GL_PALETTE8_R5_G6_B5_OES 0x8B97 -#define GL_PALETTE8_RGBA4_OES 0x8B98 -#define GL_PALETTE8_RGB5_A1_OES 0x8B99 - -#define GLEW_OES_compressed_paletted_texture GLEW_GET_VAR(__GLEW_OES_compressed_paletted_texture) - -#endif /* GL_OES_compressed_paletted_texture */ - -/* --------------------------- GL_OES_read_format -------------------------- */ - -#ifndef GL_OES_read_format -#define GL_OES_read_format 1 - -#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B - -#define GLEW_OES_read_format GLEW_GET_VAR(__GLEW_OES_read_format) - -#endif /* GL_OES_read_format */ - -/* ------------------------ GL_OES_single_precision ------------------------ */ - -#ifndef GL_OES_single_precision -#define GL_OES_single_precision 1 - -typedef void (GLAPIENTRY * PFNGLCLEARDEPTHFOESPROC) (GLclampf depth); -typedef void (GLAPIENTRY * PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat* equation); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f); -typedef void (GLAPIENTRY * PFNGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); -typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat* equation); -typedef void (GLAPIENTRY * PFNGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); - -#define glClearDepthfOES GLEW_GET_FUN(__glewClearDepthfOES) -#define glClipPlanefOES GLEW_GET_FUN(__glewClipPlanefOES) -#define glDepthRangefOES GLEW_GET_FUN(__glewDepthRangefOES) -#define glFrustumfOES GLEW_GET_FUN(__glewFrustumfOES) -#define glGetClipPlanefOES GLEW_GET_FUN(__glewGetClipPlanefOES) -#define glOrthofOES GLEW_GET_FUN(__glewOrthofOES) - -#define GLEW_OES_single_precision GLEW_GET_VAR(__GLEW_OES_single_precision) - -#endif /* GL_OES_single_precision */ - -/* ---------------------------- GL_OML_interlace --------------------------- */ - -#ifndef GL_OML_interlace -#define GL_OML_interlace 1 - -#define GL_INTERLACE_OML 0x8980 -#define GL_INTERLACE_READ_OML 0x8981 - -#define GLEW_OML_interlace GLEW_GET_VAR(__GLEW_OML_interlace) - -#endif /* GL_OML_interlace */ - -/* ---------------------------- GL_OML_resample ---------------------------- */ - -#ifndef GL_OML_resample -#define GL_OML_resample 1 - -#define GL_PACK_RESAMPLE_OML 0x8984 -#define GL_UNPACK_RESAMPLE_OML 0x8985 -#define GL_RESAMPLE_REPLICATE_OML 0x8986 -#define GL_RESAMPLE_ZERO_FILL_OML 0x8987 -#define GL_RESAMPLE_AVERAGE_OML 0x8988 -#define GL_RESAMPLE_DECIMATE_OML 0x8989 - -#define GLEW_OML_resample GLEW_GET_VAR(__GLEW_OML_resample) - -#endif /* GL_OML_resample */ - -/* ---------------------------- GL_OML_subsample --------------------------- */ - -#ifndef GL_OML_subsample -#define GL_OML_subsample 1 - -#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 -#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 - -#define GLEW_OML_subsample GLEW_GET_VAR(__GLEW_OML_subsample) - -#endif /* GL_OML_subsample */ - -/* ---------------------------- GL_OVR_multiview --------------------------- */ - -#ifndef GL_OVR_multiview -#define GL_OVR_multiview 1 - -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630 -#define GL_MAX_VIEWS_OVR 0x9631 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632 -#define GL_FRAMEBUFFER_INCOMPLETE_VIEW_TARGETS_OVR 0x9633 - -typedef void (GLAPIENTRY * PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint baseViewIndex, GLsizei numViews); - -#define glFramebufferTextureMultiviewOVR GLEW_GET_FUN(__glewFramebufferTextureMultiviewOVR) - -#define GLEW_OVR_multiview GLEW_GET_VAR(__GLEW_OVR_multiview) - -#endif /* GL_OVR_multiview */ - -/* --------------------------- GL_OVR_multiview2 --------------------------- */ - -#ifndef GL_OVR_multiview2 -#define GL_OVR_multiview2 1 - -#define GLEW_OVR_multiview2 GLEW_GET_VAR(__GLEW_OVR_multiview2) - -#endif /* GL_OVR_multiview2 */ - -/* --------------------------- GL_PGI_misc_hints --------------------------- */ - -#ifndef GL_PGI_misc_hints -#define GL_PGI_misc_hints 1 - -#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 107000 -#define GL_CONSERVE_MEMORY_HINT_PGI 107005 -#define GL_RECLAIM_MEMORY_HINT_PGI 107006 -#define GL_NATIVE_GRAPHICS_HANDLE_PGI 107010 -#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 107011 -#define GL_NATIVE_GRAPHICS_END_HINT_PGI 107012 -#define GL_ALWAYS_FAST_HINT_PGI 107020 -#define GL_ALWAYS_SOFT_HINT_PGI 107021 -#define GL_ALLOW_DRAW_OBJ_HINT_PGI 107022 -#define GL_ALLOW_DRAW_WIN_HINT_PGI 107023 -#define GL_ALLOW_DRAW_FRG_HINT_PGI 107024 -#define GL_ALLOW_DRAW_MEM_HINT_PGI 107025 -#define GL_STRICT_DEPTHFUNC_HINT_PGI 107030 -#define GL_STRICT_LIGHTING_HINT_PGI 107031 -#define GL_STRICT_SCISSOR_HINT_PGI 107032 -#define GL_FULL_STIPPLE_HINT_PGI 107033 -#define GL_CLIP_NEAR_HINT_PGI 107040 -#define GL_CLIP_FAR_HINT_PGI 107041 -#define GL_WIDE_LINE_HINT_PGI 107042 -#define GL_BACK_NORMALS_HINT_PGI 107043 - -#define GLEW_PGI_misc_hints GLEW_GET_VAR(__GLEW_PGI_misc_hints) - -#endif /* GL_PGI_misc_hints */ - -/* -------------------------- GL_PGI_vertex_hints -------------------------- */ - -#ifndef GL_PGI_vertex_hints -#define GL_PGI_vertex_hints 1 - -#define GL_VERTEX23_BIT_PGI 0x00000004 -#define GL_VERTEX4_BIT_PGI 0x00000008 -#define GL_COLOR3_BIT_PGI 0x00010000 -#define GL_COLOR4_BIT_PGI 0x00020000 -#define GL_EDGEFLAG_BIT_PGI 0x00040000 -#define GL_INDEX_BIT_PGI 0x00080000 -#define GL_MAT_AMBIENT_BIT_PGI 0x00100000 -#define GL_VERTEX_DATA_HINT_PGI 107050 -#define GL_VERTEX_CONSISTENT_HINT_PGI 107051 -#define GL_MATERIAL_SIDE_HINT_PGI 107052 -#define GL_MAX_VERTEX_HINT_PGI 107053 -#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000 -#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000 -#define GL_MAT_EMISSION_BIT_PGI 0x00800000 -#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000 -#define GL_MAT_SHININESS_BIT_PGI 0x02000000 -#define GL_MAT_SPECULAR_BIT_PGI 0x04000000 -#define GL_NORMAL_BIT_PGI 0x08000000 -#define GL_TEXCOORD1_BIT_PGI 0x10000000 -#define GL_TEXCOORD2_BIT_PGI 0x20000000 -#define GL_TEXCOORD3_BIT_PGI 0x40000000 -#define GL_TEXCOORD4_BIT_PGI 0x80000000 - -#define GLEW_PGI_vertex_hints GLEW_GET_VAR(__GLEW_PGI_vertex_hints) - -#endif /* GL_PGI_vertex_hints */ - -/* ---------------------- GL_REGAL_ES1_0_compatibility --------------------- */ - -#ifndef GL_REGAL_ES1_0_compatibility -#define GL_REGAL_ES1_0_compatibility 1 - -typedef int GLclampx; - -typedef void (GLAPIENTRY * PFNGLALPHAFUNCXPROC) (GLenum func, GLclampx ref); -typedef void (GLAPIENTRY * PFNGLCLEARCOLORXPROC) (GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); -typedef void (GLAPIENTRY * PFNGLCLEARDEPTHXPROC) (GLclampx depth); -typedef void (GLAPIENTRY * PFNGLCOLOR4XPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); -typedef void (GLAPIENTRY * PFNGLDEPTHRANGEXPROC) (GLclampx zNear, GLclampx zFar); -typedef void (GLAPIENTRY * PFNGLFOGXPROC) (GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLFOGXVPROC) (GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLFRUSTUMFPROC) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); -typedef void (GLAPIENTRY * PFNGLFRUSTUMXPROC) (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); -typedef void (GLAPIENTRY * PFNGLLIGHTMODELXPROC) (GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLLIGHTMODELXVPROC) (GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLLIGHTXPROC) (GLenum light, GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLLIGHTXVPROC) (GLenum light, GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLLINEWIDTHXPROC) (GLfixed width); -typedef void (GLAPIENTRY * PFNGLLOADMATRIXXPROC) (const GLfixed* m); -typedef void (GLAPIENTRY * PFNGLMATERIALXPROC) (GLenum face, GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLMATERIALXVPROC) (GLenum face, GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLMULTMATRIXXPROC) (const GLfixed* m); -typedef void (GLAPIENTRY * PFNGLMULTITEXCOORD4XPROC) (GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); -typedef void (GLAPIENTRY * PFNGLNORMAL3XPROC) (GLfixed nx, GLfixed ny, GLfixed nz); -typedef void (GLAPIENTRY * PFNGLORTHOFPROC) (GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); -typedef void (GLAPIENTRY * PFNGLORTHOXPROC) (GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); -typedef void (GLAPIENTRY * PFNGLPOINTSIZEXPROC) (GLfixed size); -typedef void (GLAPIENTRY * PFNGLPOLYGONOFFSETXPROC) (GLfixed factor, GLfixed units); -typedef void (GLAPIENTRY * PFNGLROTATEXPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z); -typedef void (GLAPIENTRY * PFNGLSAMPLECOVERAGEXPROC) (GLclampx value, GLboolean invert); -typedef void (GLAPIENTRY * PFNGLSCALEXPROC) (GLfixed x, GLfixed y, GLfixed z); -typedef void (GLAPIENTRY * PFNGLTEXENVXPROC) (GLenum target, GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLTEXENVXVPROC) (GLenum target, GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERXPROC) (GLenum target, GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLTRANSLATEXPROC) (GLfixed x, GLfixed y, GLfixed z); - -#define glAlphaFuncx GLEW_GET_FUN(__glewAlphaFuncx) -#define glClearColorx GLEW_GET_FUN(__glewClearColorx) -#define glClearDepthx GLEW_GET_FUN(__glewClearDepthx) -#define glColor4x GLEW_GET_FUN(__glewColor4x) -#define glDepthRangex GLEW_GET_FUN(__glewDepthRangex) -#define glFogx GLEW_GET_FUN(__glewFogx) -#define glFogxv GLEW_GET_FUN(__glewFogxv) -#define glFrustumf GLEW_GET_FUN(__glewFrustumf) -#define glFrustumx GLEW_GET_FUN(__glewFrustumx) -#define glLightModelx GLEW_GET_FUN(__glewLightModelx) -#define glLightModelxv GLEW_GET_FUN(__glewLightModelxv) -#define glLightx GLEW_GET_FUN(__glewLightx) -#define glLightxv GLEW_GET_FUN(__glewLightxv) -#define glLineWidthx GLEW_GET_FUN(__glewLineWidthx) -#define glLoadMatrixx GLEW_GET_FUN(__glewLoadMatrixx) -#define glMaterialx GLEW_GET_FUN(__glewMaterialx) -#define glMaterialxv GLEW_GET_FUN(__glewMaterialxv) -#define glMultMatrixx GLEW_GET_FUN(__glewMultMatrixx) -#define glMultiTexCoord4x GLEW_GET_FUN(__glewMultiTexCoord4x) -#define glNormal3x GLEW_GET_FUN(__glewNormal3x) -#define glOrthof GLEW_GET_FUN(__glewOrthof) -#define glOrthox GLEW_GET_FUN(__glewOrthox) -#define glPointSizex GLEW_GET_FUN(__glewPointSizex) -#define glPolygonOffsetx GLEW_GET_FUN(__glewPolygonOffsetx) -#define glRotatex GLEW_GET_FUN(__glewRotatex) -#define glSampleCoveragex GLEW_GET_FUN(__glewSampleCoveragex) -#define glScalex GLEW_GET_FUN(__glewScalex) -#define glTexEnvx GLEW_GET_FUN(__glewTexEnvx) -#define glTexEnvxv GLEW_GET_FUN(__glewTexEnvxv) -#define glTexParameterx GLEW_GET_FUN(__glewTexParameterx) -#define glTranslatex GLEW_GET_FUN(__glewTranslatex) - -#define GLEW_REGAL_ES1_0_compatibility GLEW_GET_VAR(__GLEW_REGAL_ES1_0_compatibility) - -#endif /* GL_REGAL_ES1_0_compatibility */ - -/* ---------------------- GL_REGAL_ES1_1_compatibility --------------------- */ - -#ifndef GL_REGAL_ES1_1_compatibility -#define GL_REGAL_ES1_1_compatibility 1 - -typedef void (GLAPIENTRY * PFNGLCLIPPLANEFPROC) (GLenum plane, const GLfloat* equation); -typedef void (GLAPIENTRY * PFNGLCLIPPLANEXPROC) (GLenum plane, const GLfixed* equation); -typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEFPROC) (GLenum pname, GLfloat eqn[4]); -typedef void (GLAPIENTRY * PFNGLGETCLIPPLANEXPROC) (GLenum pname, GLfixed eqn[4]); -typedef void (GLAPIENTRY * PFNGLGETFIXEDVPROC) (GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLGETLIGHTXVPROC) (GLenum light, GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLGETMATERIALXVPROC) (GLenum face, GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLGETTEXENVXVPROC) (GLenum env, GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLGETTEXPARAMETERXVPROC) (GLenum target, GLenum pname, GLfixed* params); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERXPROC) (GLenum pname, GLfixed param); -typedef void (GLAPIENTRY * PFNGLPOINTPARAMETERXVPROC) (GLenum pname, const GLfixed* params); -typedef void (GLAPIENTRY * PFNGLPOINTSIZEPOINTEROESPROC) (GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLTEXPARAMETERXVPROC) (GLenum target, GLenum pname, const GLfixed* params); - -#define glClipPlanef GLEW_GET_FUN(__glewClipPlanef) -#define glClipPlanex GLEW_GET_FUN(__glewClipPlanex) -#define glGetClipPlanef GLEW_GET_FUN(__glewGetClipPlanef) -#define glGetClipPlanex GLEW_GET_FUN(__glewGetClipPlanex) -#define glGetFixedv GLEW_GET_FUN(__glewGetFixedv) -#define glGetLightxv GLEW_GET_FUN(__glewGetLightxv) -#define glGetMaterialxv GLEW_GET_FUN(__glewGetMaterialxv) -#define glGetTexEnvxv GLEW_GET_FUN(__glewGetTexEnvxv) -#define glGetTexParameterxv GLEW_GET_FUN(__glewGetTexParameterxv) -#define glPointParameterx GLEW_GET_FUN(__glewPointParameterx) -#define glPointParameterxv GLEW_GET_FUN(__glewPointParameterxv) -#define glPointSizePointerOES GLEW_GET_FUN(__glewPointSizePointerOES) -#define glTexParameterxv GLEW_GET_FUN(__glewTexParameterxv) - -#define GLEW_REGAL_ES1_1_compatibility GLEW_GET_VAR(__GLEW_REGAL_ES1_1_compatibility) - -#endif /* GL_REGAL_ES1_1_compatibility */ - -/* ---------------------------- GL_REGAL_enable ---------------------------- */ - -#ifndef GL_REGAL_enable -#define GL_REGAL_enable 1 - -#define GL_ERROR_REGAL 0x9322 -#define GL_DEBUG_REGAL 0x9323 -#define GL_LOG_REGAL 0x9324 -#define GL_EMULATION_REGAL 0x9325 -#define GL_DRIVER_REGAL 0x9326 -#define GL_MISSING_REGAL 0x9360 -#define GL_TRACE_REGAL 0x9361 -#define GL_CACHE_REGAL 0x9362 -#define GL_CODE_REGAL 0x9363 -#define GL_STATISTICS_REGAL 0x9364 - -#define GLEW_REGAL_enable GLEW_GET_VAR(__GLEW_REGAL_enable) - -#endif /* GL_REGAL_enable */ - -/* ------------------------- GL_REGAL_error_string ------------------------- */ - -#ifndef GL_REGAL_error_string -#define GL_REGAL_error_string 1 - -typedef const GLchar* (GLAPIENTRY * PFNGLERRORSTRINGREGALPROC) (GLenum error); - -#define glErrorStringREGAL GLEW_GET_FUN(__glewErrorStringREGAL) - -#define GLEW_REGAL_error_string GLEW_GET_VAR(__GLEW_REGAL_error_string) - -#endif /* GL_REGAL_error_string */ - -/* ------------------------ GL_REGAL_extension_query ----------------------- */ - -#ifndef GL_REGAL_extension_query -#define GL_REGAL_extension_query 1 - -typedef GLboolean (GLAPIENTRY * PFNGLGETEXTENSIONREGALPROC) (const GLchar* ext); -typedef GLboolean (GLAPIENTRY * PFNGLISSUPPORTEDREGALPROC) (const GLchar* ext); - -#define glGetExtensionREGAL GLEW_GET_FUN(__glewGetExtensionREGAL) -#define glIsSupportedREGAL GLEW_GET_FUN(__glewIsSupportedREGAL) - -#define GLEW_REGAL_extension_query GLEW_GET_VAR(__GLEW_REGAL_extension_query) - -#endif /* GL_REGAL_extension_query */ - -/* ------------------------------ GL_REGAL_log ----------------------------- */ - -#ifndef GL_REGAL_log -#define GL_REGAL_log 1 - -#define GL_LOG_ERROR_REGAL 0x9319 -#define GL_LOG_WARNING_REGAL 0x931A -#define GL_LOG_INFO_REGAL 0x931B -#define GL_LOG_APP_REGAL 0x931C -#define GL_LOG_DRIVER_REGAL 0x931D -#define GL_LOG_INTERNAL_REGAL 0x931E -#define GL_LOG_DEBUG_REGAL 0x931F -#define GL_LOG_STATUS_REGAL 0x9320 -#define GL_LOG_HTTP_REGAL 0x9321 - -typedef void (APIENTRY *GLLOGPROCREGAL)(GLenum stream, GLsizei length, const GLchar *message, void *context); - -typedef void (GLAPIENTRY * PFNGLLOGMESSAGECALLBACKREGALPROC) (GLLOGPROCREGAL callback); - -#define glLogMessageCallbackREGAL GLEW_GET_FUN(__glewLogMessageCallbackREGAL) - -#define GLEW_REGAL_log GLEW_GET_VAR(__GLEW_REGAL_log) - -#endif /* GL_REGAL_log */ - -/* ------------------------- GL_REGAL_proc_address ------------------------- */ - -#ifndef GL_REGAL_proc_address -#define GL_REGAL_proc_address 1 - -typedef void * (GLAPIENTRY * PFNGLGETPROCADDRESSREGALPROC) (const GLchar *name); - -#define glGetProcAddressREGAL GLEW_GET_FUN(__glewGetProcAddressREGAL) - -#define GLEW_REGAL_proc_address GLEW_GET_VAR(__GLEW_REGAL_proc_address) - -#endif /* GL_REGAL_proc_address */ - -/* ----------------------- GL_REND_screen_coordinates ---------------------- */ - -#ifndef GL_REND_screen_coordinates -#define GL_REND_screen_coordinates 1 - -#define GL_SCREEN_COORDINATES_REND 0x8490 -#define GL_INVERTED_SCREEN_W_REND 0x8491 - -#define GLEW_REND_screen_coordinates GLEW_GET_VAR(__GLEW_REND_screen_coordinates) - -#endif /* GL_REND_screen_coordinates */ - -/* ------------------------------- GL_S3_s3tc ------------------------------ */ - -#ifndef GL_S3_s3tc -#define GL_S3_s3tc 1 - -#define GL_RGB_S3TC 0x83A0 -#define GL_RGB4_S3TC 0x83A1 -#define GL_RGBA_S3TC 0x83A2 -#define GL_RGBA4_S3TC 0x83A3 -#define GL_RGBA_DXT5_S3TC 0x83A4 -#define GL_RGBA4_DXT5_S3TC 0x83A5 - -#define GLEW_S3_s3tc GLEW_GET_VAR(__GLEW_S3_s3tc) - -#endif /* GL_S3_s3tc */ - -/* -------------------------- GL_SGIS_color_range -------------------------- */ - -#ifndef GL_SGIS_color_range -#define GL_SGIS_color_range 1 - -#define GL_EXTENDED_RANGE_SGIS 0x85A5 -#define GL_MIN_RED_SGIS 0x85A6 -#define GL_MAX_RED_SGIS 0x85A7 -#define GL_MIN_GREEN_SGIS 0x85A8 -#define GL_MAX_GREEN_SGIS 0x85A9 -#define GL_MIN_BLUE_SGIS 0x85AA -#define GL_MAX_BLUE_SGIS 0x85AB -#define GL_MIN_ALPHA_SGIS 0x85AC -#define GL_MAX_ALPHA_SGIS 0x85AD - -#define GLEW_SGIS_color_range GLEW_GET_VAR(__GLEW_SGIS_color_range) - -#endif /* GL_SGIS_color_range */ - -/* ------------------------- GL_SGIS_detail_texture ------------------------ */ - -#ifndef GL_SGIS_detail_texture -#define GL_SGIS_detail_texture 1 - -typedef void (GLAPIENTRY * PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points); -typedef void (GLAPIENTRY * PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat* points); - -#define glDetailTexFuncSGIS GLEW_GET_FUN(__glewDetailTexFuncSGIS) -#define glGetDetailTexFuncSGIS GLEW_GET_FUN(__glewGetDetailTexFuncSGIS) - -#define GLEW_SGIS_detail_texture GLEW_GET_VAR(__GLEW_SGIS_detail_texture) - -#endif /* GL_SGIS_detail_texture */ - -/* -------------------------- GL_SGIS_fog_function ------------------------- */ - -#ifndef GL_SGIS_fog_function -#define GL_SGIS_fog_function 1 - -typedef void (GLAPIENTRY * PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat* points); -typedef void (GLAPIENTRY * PFNGLGETFOGFUNCSGISPROC) (GLfloat* points); - -#define glFogFuncSGIS GLEW_GET_FUN(__glewFogFuncSGIS) -#define glGetFogFuncSGIS GLEW_GET_FUN(__glewGetFogFuncSGIS) - -#define GLEW_SGIS_fog_function GLEW_GET_VAR(__GLEW_SGIS_fog_function) - -#endif /* GL_SGIS_fog_function */ - -/* ------------------------ GL_SGIS_generate_mipmap ------------------------ */ - -#ifndef GL_SGIS_generate_mipmap -#define GL_SGIS_generate_mipmap 1 - -#define GL_GENERATE_MIPMAP_SGIS 0x8191 -#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 - -#define GLEW_SGIS_generate_mipmap GLEW_GET_VAR(__GLEW_SGIS_generate_mipmap) - -#endif /* GL_SGIS_generate_mipmap */ - -/* -------------------------- GL_SGIS_multisample -------------------------- */ - -#ifndef GL_SGIS_multisample -#define GL_SGIS_multisample 1 - -#define GL_MULTISAMPLE_SGIS 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F -#define GL_SAMPLE_MASK_SGIS 0x80A0 -#define GL_1PASS_SGIS 0x80A1 -#define GL_2PASS_0_SGIS 0x80A2 -#define GL_2PASS_1_SGIS 0x80A3 -#define GL_4PASS_0_SGIS 0x80A4 -#define GL_4PASS_1_SGIS 0x80A5 -#define GL_4PASS_2_SGIS 0x80A6 -#define GL_4PASS_3_SGIS 0x80A7 -#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 -#define GL_SAMPLES_SGIS 0x80A9 -#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA -#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB -#define GL_SAMPLE_PATTERN_SGIS 0x80AC - -typedef void (GLAPIENTRY * PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert); -typedef void (GLAPIENTRY * PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern); - -#define glSampleMaskSGIS GLEW_GET_FUN(__glewSampleMaskSGIS) -#define glSamplePatternSGIS GLEW_GET_FUN(__glewSamplePatternSGIS) - -#define GLEW_SGIS_multisample GLEW_GET_VAR(__GLEW_SGIS_multisample) - -#endif /* GL_SGIS_multisample */ - -/* ------------------------- GL_SGIS_pixel_texture ------------------------- */ - -#ifndef GL_SGIS_pixel_texture -#define GL_SGIS_pixel_texture 1 - -#define GLEW_SGIS_pixel_texture GLEW_GET_VAR(__GLEW_SGIS_pixel_texture) - -#endif /* GL_SGIS_pixel_texture */ - -/* ----------------------- GL_SGIS_point_line_texgen ----------------------- */ - -#ifndef GL_SGIS_point_line_texgen -#define GL_SGIS_point_line_texgen 1 - -#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0 -#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1 -#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2 -#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3 -#define GL_EYE_POINT_SGIS 0x81F4 -#define GL_OBJECT_POINT_SGIS 0x81F5 -#define GL_EYE_LINE_SGIS 0x81F6 -#define GL_OBJECT_LINE_SGIS 0x81F7 - -#define GLEW_SGIS_point_line_texgen GLEW_GET_VAR(__GLEW_SGIS_point_line_texgen) - -#endif /* GL_SGIS_point_line_texgen */ - -/* ------------------------ GL_SGIS_sharpen_texture ------------------------ */ - -#ifndef GL_SGIS_sharpen_texture -#define GL_SGIS_sharpen_texture 1 - -typedef void (GLAPIENTRY * PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat* points); -typedef void (GLAPIENTRY * PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat* points); - -#define glGetSharpenTexFuncSGIS GLEW_GET_FUN(__glewGetSharpenTexFuncSGIS) -#define glSharpenTexFuncSGIS GLEW_GET_FUN(__glewSharpenTexFuncSGIS) - -#define GLEW_SGIS_sharpen_texture GLEW_GET_VAR(__GLEW_SGIS_sharpen_texture) - -#endif /* GL_SGIS_sharpen_texture */ - -/* --------------------------- GL_SGIS_texture4D --------------------------- */ - -#ifndef GL_SGIS_texture4D -#define GL_SGIS_texture4D 1 - -typedef void (GLAPIENTRY * PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void *pixels); -typedef void (GLAPIENTRY * PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLenum format, GLenum type, const void *pixels); - -#define glTexImage4DSGIS GLEW_GET_FUN(__glewTexImage4DSGIS) -#define glTexSubImage4DSGIS GLEW_GET_FUN(__glewTexSubImage4DSGIS) - -#define GLEW_SGIS_texture4D GLEW_GET_VAR(__GLEW_SGIS_texture4D) - -#endif /* GL_SGIS_texture4D */ - -/* ---------------------- GL_SGIS_texture_border_clamp --------------------- */ - -#ifndef GL_SGIS_texture_border_clamp -#define GL_SGIS_texture_border_clamp 1 - -#define GL_CLAMP_TO_BORDER_SGIS 0x812D - -#define GLEW_SGIS_texture_border_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_border_clamp) - -#endif /* GL_SGIS_texture_border_clamp */ - -/* ----------------------- GL_SGIS_texture_edge_clamp ---------------------- */ - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_SGIS_texture_edge_clamp 1 - -#define GL_CLAMP_TO_EDGE_SGIS 0x812F - -#define GLEW_SGIS_texture_edge_clamp GLEW_GET_VAR(__GLEW_SGIS_texture_edge_clamp) - -#endif /* GL_SGIS_texture_edge_clamp */ - -/* ------------------------ GL_SGIS_texture_filter4 ------------------------ */ - -#ifndef GL_SGIS_texture_filter4 -#define GL_SGIS_texture_filter4 1 - -typedef void (GLAPIENTRY * PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat* weights); -typedef void (GLAPIENTRY * PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat* weights); - -#define glGetTexFilterFuncSGIS GLEW_GET_FUN(__glewGetTexFilterFuncSGIS) -#define glTexFilterFuncSGIS GLEW_GET_FUN(__glewTexFilterFuncSGIS) - -#define GLEW_SGIS_texture_filter4 GLEW_GET_VAR(__GLEW_SGIS_texture_filter4) - -#endif /* GL_SGIS_texture_filter4 */ - -/* -------------------------- GL_SGIS_texture_lod -------------------------- */ - -#ifndef GL_SGIS_texture_lod -#define GL_SGIS_texture_lod 1 - -#define GL_TEXTURE_MIN_LOD_SGIS 0x813A -#define GL_TEXTURE_MAX_LOD_SGIS 0x813B -#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C -#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D - -#define GLEW_SGIS_texture_lod GLEW_GET_VAR(__GLEW_SGIS_texture_lod) - -#endif /* GL_SGIS_texture_lod */ - -/* ------------------------- GL_SGIS_texture_select ------------------------ */ - -#ifndef GL_SGIS_texture_select -#define GL_SGIS_texture_select 1 - -#define GLEW_SGIS_texture_select GLEW_GET_VAR(__GLEW_SGIS_texture_select) - -#endif /* GL_SGIS_texture_select */ - -/* ----------------------------- GL_SGIX_async ----------------------------- */ - -#ifndef GL_SGIX_async -#define GL_SGIX_async 1 - -#define GL_ASYNC_MARKER_SGIX 0x8329 - -typedef void (GLAPIENTRY * PFNGLASYNCMARKERSGIXPROC) (GLuint marker); -typedef void (GLAPIENTRY * PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range); -typedef GLint (GLAPIENTRY * PFNGLFINISHASYNCSGIXPROC) (GLuint* markerp); -typedef GLuint (GLAPIENTRY * PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range); -typedef GLboolean (GLAPIENTRY * PFNGLISASYNCMARKERSGIXPROC) (GLuint marker); -typedef GLint (GLAPIENTRY * PFNGLPOLLASYNCSGIXPROC) (GLuint* markerp); - -#define glAsyncMarkerSGIX GLEW_GET_FUN(__glewAsyncMarkerSGIX) -#define glDeleteAsyncMarkersSGIX GLEW_GET_FUN(__glewDeleteAsyncMarkersSGIX) -#define glFinishAsyncSGIX GLEW_GET_FUN(__glewFinishAsyncSGIX) -#define glGenAsyncMarkersSGIX GLEW_GET_FUN(__glewGenAsyncMarkersSGIX) -#define glIsAsyncMarkerSGIX GLEW_GET_FUN(__glewIsAsyncMarkerSGIX) -#define glPollAsyncSGIX GLEW_GET_FUN(__glewPollAsyncSGIX) - -#define GLEW_SGIX_async GLEW_GET_VAR(__GLEW_SGIX_async) - -#endif /* GL_SGIX_async */ - -/* ------------------------ GL_SGIX_async_histogram ------------------------ */ - -#ifndef GL_SGIX_async_histogram -#define GL_SGIX_async_histogram 1 - -#define GL_ASYNC_HISTOGRAM_SGIX 0x832C -#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D - -#define GLEW_SGIX_async_histogram GLEW_GET_VAR(__GLEW_SGIX_async_histogram) - -#endif /* GL_SGIX_async_histogram */ - -/* -------------------------- GL_SGIX_async_pixel -------------------------- */ - -#ifndef GL_SGIX_async_pixel -#define GL_SGIX_async_pixel 1 - -#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C -#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D -#define GL_ASYNC_READ_PIXELS_SGIX 0x835E -#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F -#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360 -#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361 - -#define GLEW_SGIX_async_pixel GLEW_GET_VAR(__GLEW_SGIX_async_pixel) - -#endif /* GL_SGIX_async_pixel */ - -/* ----------------------- GL_SGIX_blend_alpha_minmax ---------------------- */ - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_SGIX_blend_alpha_minmax 1 - -#define GL_ALPHA_MIN_SGIX 0x8320 -#define GL_ALPHA_MAX_SGIX 0x8321 - -#define GLEW_SGIX_blend_alpha_minmax GLEW_GET_VAR(__GLEW_SGIX_blend_alpha_minmax) - -#endif /* GL_SGIX_blend_alpha_minmax */ - -/* ---------------------------- GL_SGIX_clipmap ---------------------------- */ - -#ifndef GL_SGIX_clipmap -#define GL_SGIX_clipmap 1 - -#define GLEW_SGIX_clipmap GLEW_GET_VAR(__GLEW_SGIX_clipmap) - -#endif /* GL_SGIX_clipmap */ - -/* ---------------------- GL_SGIX_convolution_accuracy --------------------- */ - -#ifndef GL_SGIX_convolution_accuracy -#define GL_SGIX_convolution_accuracy 1 - -#define GL_CONVOLUTION_HINT_SGIX 0x8316 - -#define GLEW_SGIX_convolution_accuracy GLEW_GET_VAR(__GLEW_SGIX_convolution_accuracy) - -#endif /* GL_SGIX_convolution_accuracy */ - -/* ------------------------- GL_SGIX_depth_texture ------------------------- */ - -#ifndef GL_SGIX_depth_texture -#define GL_SGIX_depth_texture 1 - -#define GL_DEPTH_COMPONENT16_SGIX 0x81A5 -#define GL_DEPTH_COMPONENT24_SGIX 0x81A6 -#define GL_DEPTH_COMPONENT32_SGIX 0x81A7 - -#define GLEW_SGIX_depth_texture GLEW_GET_VAR(__GLEW_SGIX_depth_texture) - -#endif /* GL_SGIX_depth_texture */ - -/* -------------------------- GL_SGIX_flush_raster ------------------------- */ - -#ifndef GL_SGIX_flush_raster -#define GL_SGIX_flush_raster 1 - -typedef void (GLAPIENTRY * PFNGLFLUSHRASTERSGIXPROC) (void); - -#define glFlushRasterSGIX GLEW_GET_FUN(__glewFlushRasterSGIX) - -#define GLEW_SGIX_flush_raster GLEW_GET_VAR(__GLEW_SGIX_flush_raster) - -#endif /* GL_SGIX_flush_raster */ - -/* --------------------------- GL_SGIX_fog_offset -------------------------- */ - -#ifndef GL_SGIX_fog_offset -#define GL_SGIX_fog_offset 1 - -#define GL_FOG_OFFSET_SGIX 0x8198 -#define GL_FOG_OFFSET_VALUE_SGIX 0x8199 - -#define GLEW_SGIX_fog_offset GLEW_GET_VAR(__GLEW_SGIX_fog_offset) - -#endif /* GL_SGIX_fog_offset */ - -/* -------------------------- GL_SGIX_fog_texture -------------------------- */ - -#ifndef GL_SGIX_fog_texture -#define GL_SGIX_fog_texture 1 - -typedef void (GLAPIENTRY * PFNGLTEXTUREFOGSGIXPROC) (GLenum pname); - -#define glTextureFogSGIX GLEW_GET_FUN(__glewTextureFogSGIX) - -#define GLEW_SGIX_fog_texture GLEW_GET_VAR(__GLEW_SGIX_fog_texture) - -#endif /* GL_SGIX_fog_texture */ - -/* ------------------- GL_SGIX_fragment_specular_lighting ------------------ */ - -#ifndef GL_SGIX_fragment_specular_lighting -#define GL_SGIX_fragment_specular_lighting 1 - -typedef void (GLAPIENTRY * PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, const GLfloat param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, const GLint param); -typedef void (GLAPIENTRY * PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum value, GLfloat* data); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum value, GLint* data); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat* data); -typedef void (GLAPIENTRY * PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint* data); - -#define glFragmentColorMaterialSGIX GLEW_GET_FUN(__glewFragmentColorMaterialSGIX) -#define glFragmentLightModelfSGIX GLEW_GET_FUN(__glewFragmentLightModelfSGIX) -#define glFragmentLightModelfvSGIX GLEW_GET_FUN(__glewFragmentLightModelfvSGIX) -#define glFragmentLightModeliSGIX GLEW_GET_FUN(__glewFragmentLightModeliSGIX) -#define glFragmentLightModelivSGIX GLEW_GET_FUN(__glewFragmentLightModelivSGIX) -#define glFragmentLightfSGIX GLEW_GET_FUN(__glewFragmentLightfSGIX) -#define glFragmentLightfvSGIX GLEW_GET_FUN(__glewFragmentLightfvSGIX) -#define glFragmentLightiSGIX GLEW_GET_FUN(__glewFragmentLightiSGIX) -#define glFragmentLightivSGIX GLEW_GET_FUN(__glewFragmentLightivSGIX) -#define glFragmentMaterialfSGIX GLEW_GET_FUN(__glewFragmentMaterialfSGIX) -#define glFragmentMaterialfvSGIX GLEW_GET_FUN(__glewFragmentMaterialfvSGIX) -#define glFragmentMaterialiSGIX GLEW_GET_FUN(__glewFragmentMaterialiSGIX) -#define glFragmentMaterialivSGIX GLEW_GET_FUN(__glewFragmentMaterialivSGIX) -#define glGetFragmentLightfvSGIX GLEW_GET_FUN(__glewGetFragmentLightfvSGIX) -#define glGetFragmentLightivSGIX GLEW_GET_FUN(__glewGetFragmentLightivSGIX) -#define glGetFragmentMaterialfvSGIX GLEW_GET_FUN(__glewGetFragmentMaterialfvSGIX) -#define glGetFragmentMaterialivSGIX GLEW_GET_FUN(__glewGetFragmentMaterialivSGIX) - -#define GLEW_SGIX_fragment_specular_lighting GLEW_GET_VAR(__GLEW_SGIX_fragment_specular_lighting) - -#endif /* GL_SGIX_fragment_specular_lighting */ - -/* --------------------------- GL_SGIX_framezoom --------------------------- */ - -#ifndef GL_SGIX_framezoom -#define GL_SGIX_framezoom 1 - -typedef void (GLAPIENTRY * PFNGLFRAMEZOOMSGIXPROC) (GLint factor); - -#define glFrameZoomSGIX GLEW_GET_FUN(__glewFrameZoomSGIX) - -#define GLEW_SGIX_framezoom GLEW_GET_VAR(__GLEW_SGIX_framezoom) - -#endif /* GL_SGIX_framezoom */ - -/* --------------------------- GL_SGIX_interlace --------------------------- */ - -#ifndef GL_SGIX_interlace -#define GL_SGIX_interlace 1 - -#define GL_INTERLACE_SGIX 0x8094 - -#define GLEW_SGIX_interlace GLEW_GET_VAR(__GLEW_SGIX_interlace) - -#endif /* GL_SGIX_interlace */ - -/* ------------------------- GL_SGIX_ir_instrument1 ------------------------ */ - -#ifndef GL_SGIX_ir_instrument1 -#define GL_SGIX_ir_instrument1 1 - -#define GLEW_SGIX_ir_instrument1 GLEW_GET_VAR(__GLEW_SGIX_ir_instrument1) - -#endif /* GL_SGIX_ir_instrument1 */ - -/* ------------------------- GL_SGIX_list_priority ------------------------- */ - -#ifndef GL_SGIX_list_priority -#define GL_SGIX_list_priority 1 - -#define GLEW_SGIX_list_priority GLEW_GET_VAR(__GLEW_SGIX_list_priority) - -#endif /* GL_SGIX_list_priority */ - -/* ------------------------- GL_SGIX_pixel_texture ------------------------- */ - -#ifndef GL_SGIX_pixel_texture -#define GL_SGIX_pixel_texture 1 - -typedef void (GLAPIENTRY * PFNGLPIXELTEXGENSGIXPROC) (GLenum mode); - -#define glPixelTexGenSGIX GLEW_GET_FUN(__glewPixelTexGenSGIX) - -#define GLEW_SGIX_pixel_texture GLEW_GET_VAR(__GLEW_SGIX_pixel_texture) - -#endif /* GL_SGIX_pixel_texture */ - -/* ----------------------- GL_SGIX_pixel_texture_bits ---------------------- */ - -#ifndef GL_SGIX_pixel_texture_bits -#define GL_SGIX_pixel_texture_bits 1 - -#define GLEW_SGIX_pixel_texture_bits GLEW_GET_VAR(__GLEW_SGIX_pixel_texture_bits) - -#endif /* GL_SGIX_pixel_texture_bits */ - -/* ------------------------ GL_SGIX_reference_plane ------------------------ */ - -#ifndef GL_SGIX_reference_plane -#define GL_SGIX_reference_plane 1 - -typedef void (GLAPIENTRY * PFNGLREFERENCEPLANESGIXPROC) (const GLdouble* equation); - -#define glReferencePlaneSGIX GLEW_GET_FUN(__glewReferencePlaneSGIX) - -#define GLEW_SGIX_reference_plane GLEW_GET_VAR(__GLEW_SGIX_reference_plane) - -#endif /* GL_SGIX_reference_plane */ - -/* ---------------------------- GL_SGIX_resample --------------------------- */ - -#ifndef GL_SGIX_resample -#define GL_SGIX_resample 1 - -#define GL_PACK_RESAMPLE_SGIX 0x842E -#define GL_UNPACK_RESAMPLE_SGIX 0x842F -#define GL_RESAMPLE_DECIMATE_SGIX 0x8430 -#define GL_RESAMPLE_REPLICATE_SGIX 0x8433 -#define GL_RESAMPLE_ZERO_FILL_SGIX 0x8434 - -#define GLEW_SGIX_resample GLEW_GET_VAR(__GLEW_SGIX_resample) - -#endif /* GL_SGIX_resample */ - -/* ----------------------------- GL_SGIX_shadow ---------------------------- */ - -#ifndef GL_SGIX_shadow -#define GL_SGIX_shadow 1 - -#define GL_TEXTURE_COMPARE_SGIX 0x819A -#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B -#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C -#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D - -#define GLEW_SGIX_shadow GLEW_GET_VAR(__GLEW_SGIX_shadow) - -#endif /* GL_SGIX_shadow */ - -/* ------------------------- GL_SGIX_shadow_ambient ------------------------ */ - -#ifndef GL_SGIX_shadow_ambient -#define GL_SGIX_shadow_ambient 1 - -#define GL_SHADOW_AMBIENT_SGIX 0x80BF - -#define GLEW_SGIX_shadow_ambient GLEW_GET_VAR(__GLEW_SGIX_shadow_ambient) - -#endif /* GL_SGIX_shadow_ambient */ - -/* ----------------------------- GL_SGIX_sprite ---------------------------- */ - -#ifndef GL_SGIX_sprite -#define GL_SGIX_sprite 1 - -typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param); -typedef void (GLAPIENTRY * PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, GLint* params); - -#define glSpriteParameterfSGIX GLEW_GET_FUN(__glewSpriteParameterfSGIX) -#define glSpriteParameterfvSGIX GLEW_GET_FUN(__glewSpriteParameterfvSGIX) -#define glSpriteParameteriSGIX GLEW_GET_FUN(__glewSpriteParameteriSGIX) -#define glSpriteParameterivSGIX GLEW_GET_FUN(__glewSpriteParameterivSGIX) - -#define GLEW_SGIX_sprite GLEW_GET_VAR(__GLEW_SGIX_sprite) - -#endif /* GL_SGIX_sprite */ - -/* ----------------------- GL_SGIX_tag_sample_buffer ----------------------- */ - -#ifndef GL_SGIX_tag_sample_buffer -#define GL_SGIX_tag_sample_buffer 1 - -typedef void (GLAPIENTRY * PFNGLTAGSAMPLEBUFFERSGIXPROC) (void); - -#define glTagSampleBufferSGIX GLEW_GET_FUN(__glewTagSampleBufferSGIX) - -#define GLEW_SGIX_tag_sample_buffer GLEW_GET_VAR(__GLEW_SGIX_tag_sample_buffer) - -#endif /* GL_SGIX_tag_sample_buffer */ - -/* ------------------------ GL_SGIX_texture_add_env ------------------------ */ - -#ifndef GL_SGIX_texture_add_env -#define GL_SGIX_texture_add_env 1 - -#define GLEW_SGIX_texture_add_env GLEW_GET_VAR(__GLEW_SGIX_texture_add_env) - -#endif /* GL_SGIX_texture_add_env */ - -/* -------------------- GL_SGIX_texture_coordinate_clamp ------------------- */ - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_SGIX_texture_coordinate_clamp 1 - -#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 -#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A -#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B - -#define GLEW_SGIX_texture_coordinate_clamp GLEW_GET_VAR(__GLEW_SGIX_texture_coordinate_clamp) - -#endif /* GL_SGIX_texture_coordinate_clamp */ - -/* ------------------------ GL_SGIX_texture_lod_bias ----------------------- */ - -#ifndef GL_SGIX_texture_lod_bias -#define GL_SGIX_texture_lod_bias 1 - -#define GLEW_SGIX_texture_lod_bias GLEW_GET_VAR(__GLEW_SGIX_texture_lod_bias) - -#endif /* GL_SGIX_texture_lod_bias */ - -/* ---------------------- GL_SGIX_texture_multi_buffer --------------------- */ - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_SGIX_texture_multi_buffer 1 - -#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E - -#define GLEW_SGIX_texture_multi_buffer GLEW_GET_VAR(__GLEW_SGIX_texture_multi_buffer) - -#endif /* GL_SGIX_texture_multi_buffer */ - -/* ------------------------- GL_SGIX_texture_range ------------------------- */ - -#ifndef GL_SGIX_texture_range -#define GL_SGIX_texture_range 1 - -#define GL_RGB_SIGNED_SGIX 0x85E0 -#define GL_RGBA_SIGNED_SGIX 0x85E1 -#define GL_ALPHA_SIGNED_SGIX 0x85E2 -#define GL_LUMINANCE_SIGNED_SGIX 0x85E3 -#define GL_INTENSITY_SIGNED_SGIX 0x85E4 -#define GL_LUMINANCE_ALPHA_SIGNED_SGIX 0x85E5 -#define GL_RGB16_SIGNED_SGIX 0x85E6 -#define GL_RGBA16_SIGNED_SGIX 0x85E7 -#define GL_ALPHA16_SIGNED_SGIX 0x85E8 -#define GL_LUMINANCE16_SIGNED_SGIX 0x85E9 -#define GL_INTENSITY16_SIGNED_SGIX 0x85EA -#define GL_LUMINANCE16_ALPHA16_SIGNED_SGIX 0x85EB -#define GL_RGB_EXTENDED_RANGE_SGIX 0x85EC -#define GL_RGBA_EXTENDED_RANGE_SGIX 0x85ED -#define GL_ALPHA_EXTENDED_RANGE_SGIX 0x85EE -#define GL_LUMINANCE_EXTENDED_RANGE_SGIX 0x85EF -#define GL_INTENSITY_EXTENDED_RANGE_SGIX 0x85F0 -#define GL_LUMINANCE_ALPHA_EXTENDED_RANGE_SGIX 0x85F1 -#define GL_RGB16_EXTENDED_RANGE_SGIX 0x85F2 -#define GL_RGBA16_EXTENDED_RANGE_SGIX 0x85F3 -#define GL_ALPHA16_EXTENDED_RANGE_SGIX 0x85F4 -#define GL_LUMINANCE16_EXTENDED_RANGE_SGIX 0x85F5 -#define GL_INTENSITY16_EXTENDED_RANGE_SGIX 0x85F6 -#define GL_LUMINANCE16_ALPHA16_EXTENDED_RANGE_SGIX 0x85F7 -#define GL_MIN_LUMINANCE_SGIS 0x85F8 -#define GL_MAX_LUMINANCE_SGIS 0x85F9 -#define GL_MIN_INTENSITY_SGIS 0x85FA -#define GL_MAX_INTENSITY_SGIS 0x85FB - -#define GLEW_SGIX_texture_range GLEW_GET_VAR(__GLEW_SGIX_texture_range) - -#endif /* GL_SGIX_texture_range */ - -/* ----------------------- GL_SGIX_texture_scale_bias ---------------------- */ - -#ifndef GL_SGIX_texture_scale_bias -#define GL_SGIX_texture_scale_bias 1 - -#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179 -#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A -#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B -#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C - -#define GLEW_SGIX_texture_scale_bias GLEW_GET_VAR(__GLEW_SGIX_texture_scale_bias) - -#endif /* GL_SGIX_texture_scale_bias */ - -/* ------------------------- GL_SGIX_vertex_preclip ------------------------ */ - -#ifndef GL_SGIX_vertex_preclip -#define GL_SGIX_vertex_preclip 1 - -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF - -#define GLEW_SGIX_vertex_preclip GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip) - -#endif /* GL_SGIX_vertex_preclip */ - -/* ---------------------- GL_SGIX_vertex_preclip_hint ---------------------- */ - -#ifndef GL_SGIX_vertex_preclip_hint -#define GL_SGIX_vertex_preclip_hint 1 - -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF - -#define GLEW_SGIX_vertex_preclip_hint GLEW_GET_VAR(__GLEW_SGIX_vertex_preclip_hint) - -#endif /* GL_SGIX_vertex_preclip_hint */ - -/* ----------------------------- GL_SGIX_ycrcb ----------------------------- */ - -#ifndef GL_SGIX_ycrcb -#define GL_SGIX_ycrcb 1 - -#define GLEW_SGIX_ycrcb GLEW_GET_VAR(__GLEW_SGIX_ycrcb) - -#endif /* GL_SGIX_ycrcb */ - -/* -------------------------- GL_SGI_color_matrix -------------------------- */ - -#ifndef GL_SGI_color_matrix -#define GL_SGI_color_matrix 1 - -#define GL_COLOR_MATRIX_SGI 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB - -#define GLEW_SGI_color_matrix GLEW_GET_VAR(__GLEW_SGI_color_matrix) - -#endif /* GL_SGI_color_matrix */ - -/* --------------------------- GL_SGI_color_table -------------------------- */ - -#ifndef GL_SGI_color_table -#define GL_SGI_color_table 1 - -#define GL_COLOR_TABLE_SGI 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 -#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 -#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 -#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 -#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 -#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF - -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat* params); -typedef void (GLAPIENTRY * PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint* params); -typedef void (GLAPIENTRY * PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const void *table); -typedef void (GLAPIENTRY * PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat* params); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint* params); -typedef void (GLAPIENTRY * PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, void *table); - -#define glColorTableParameterfvSGI GLEW_GET_FUN(__glewColorTableParameterfvSGI) -#define glColorTableParameterivSGI GLEW_GET_FUN(__glewColorTableParameterivSGI) -#define glColorTableSGI GLEW_GET_FUN(__glewColorTableSGI) -#define glCopyColorTableSGI GLEW_GET_FUN(__glewCopyColorTableSGI) -#define glGetColorTableParameterfvSGI GLEW_GET_FUN(__glewGetColorTableParameterfvSGI) -#define glGetColorTableParameterivSGI GLEW_GET_FUN(__glewGetColorTableParameterivSGI) -#define glGetColorTableSGI GLEW_GET_FUN(__glewGetColorTableSGI) - -#define GLEW_SGI_color_table GLEW_GET_VAR(__GLEW_SGI_color_table) - -#endif /* GL_SGI_color_table */ - -/* ----------------------- GL_SGI_texture_color_table ---------------------- */ - -#ifndef GL_SGI_texture_color_table -#define GL_SGI_texture_color_table 1 - -#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC -#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD - -#define GLEW_SGI_texture_color_table GLEW_GET_VAR(__GLEW_SGI_texture_color_table) - -#endif /* GL_SGI_texture_color_table */ - -/* ------------------------- GL_SUNX_constant_data ------------------------- */ - -#ifndef GL_SUNX_constant_data -#define GL_SUNX_constant_data 1 - -#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 -#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6 - -typedef void (GLAPIENTRY * PFNGLFINISHTEXTURESUNXPROC) (void); - -#define glFinishTextureSUNX GLEW_GET_FUN(__glewFinishTextureSUNX) - -#define GLEW_SUNX_constant_data GLEW_GET_VAR(__GLEW_SUNX_constant_data) - -#endif /* GL_SUNX_constant_data */ - -/* -------------------- GL_SUN_convolution_border_modes -------------------- */ - -#ifndef GL_SUN_convolution_border_modes -#define GL_SUN_convolution_border_modes 1 - -#define GL_WRAP_BORDER_SUN 0x81D4 - -#define GLEW_SUN_convolution_border_modes GLEW_GET_VAR(__GLEW_SUN_convolution_border_modes) - -#endif /* GL_SUN_convolution_border_modes */ - -/* -------------------------- GL_SUN_global_alpha -------------------------- */ - -#ifndef GL_SUN_global_alpha -#define GL_SUN_global_alpha 1 - -#define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA - -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor); -typedef void (GLAPIENTRY * PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor); - -#define glGlobalAlphaFactorbSUN GLEW_GET_FUN(__glewGlobalAlphaFactorbSUN) -#define glGlobalAlphaFactordSUN GLEW_GET_FUN(__glewGlobalAlphaFactordSUN) -#define glGlobalAlphaFactorfSUN GLEW_GET_FUN(__glewGlobalAlphaFactorfSUN) -#define glGlobalAlphaFactoriSUN GLEW_GET_FUN(__glewGlobalAlphaFactoriSUN) -#define glGlobalAlphaFactorsSUN GLEW_GET_FUN(__glewGlobalAlphaFactorsSUN) -#define glGlobalAlphaFactorubSUN GLEW_GET_FUN(__glewGlobalAlphaFactorubSUN) -#define glGlobalAlphaFactoruiSUN GLEW_GET_FUN(__glewGlobalAlphaFactoruiSUN) -#define glGlobalAlphaFactorusSUN GLEW_GET_FUN(__glewGlobalAlphaFactorusSUN) - -#define GLEW_SUN_global_alpha GLEW_GET_VAR(__GLEW_SUN_global_alpha) - -#endif /* GL_SUN_global_alpha */ - -/* --------------------------- GL_SUN_mesh_array --------------------------- */ - -#ifndef GL_SUN_mesh_array -#define GL_SUN_mesh_array 1 - -#define GL_QUAD_MESH_SUN 0x8614 -#define GL_TRIANGLE_MESH_SUN 0x8615 - -#define GLEW_SUN_mesh_array GLEW_GET_VAR(__GLEW_SUN_mesh_array) - -#endif /* GL_SUN_mesh_array */ - -/* ------------------------ GL_SUN_read_video_pixels ----------------------- */ - -#ifndef GL_SUN_read_video_pixels -#define GL_SUN_read_video_pixels 1 - -typedef void (GLAPIENTRY * PFNGLREADVIDEOPIXELSSUNPROC) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels); - -#define glReadVideoPixelsSUN GLEW_GET_FUN(__glewReadVideoPixelsSUN) - -#define GLEW_SUN_read_video_pixels GLEW_GET_VAR(__GLEW_SUN_read_video_pixels) - -#endif /* GL_SUN_read_video_pixels */ - -/* --------------------------- GL_SUN_slice_accum -------------------------- */ - -#ifndef GL_SUN_slice_accum -#define GL_SUN_slice_accum 1 - -#define GL_SLICE_ACCUM_SUN 0x85CC - -#define GLEW_SUN_slice_accum GLEW_GET_VAR(__GLEW_SUN_slice_accum) - -#endif /* GL_SUN_slice_accum */ - -/* -------------------------- GL_SUN_triangle_list ------------------------- */ - -#ifndef GL_SUN_triangle_list -#define GL_SUN_triangle_list 1 - -#define GL_RESTART_SUN 0x01 -#define GL_REPLACE_MIDDLE_SUN 0x02 -#define GL_REPLACE_OLDEST_SUN 0x03 -#define GL_TRIANGLE_LIST_SUN 0x81D7 -#define GL_REPLACEMENT_CODE_SUN 0x81D8 -#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0 -#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1 -#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2 -#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3 -#define GL_R1UI_V3F_SUN 0x85C4 -#define GL_R1UI_C4UB_V3F_SUN 0x85C5 -#define GL_R1UI_C3F_V3F_SUN 0x85C6 -#define GL_R1UI_N3F_V3F_SUN 0x85C7 -#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8 -#define GL_R1UI_T2F_V3F_SUN 0x85C9 -#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA -#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB - -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const void *pointer); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte* code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint* code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort* code); - -#define glReplacementCodePointerSUN GLEW_GET_FUN(__glewReplacementCodePointerSUN) -#define glReplacementCodeubSUN GLEW_GET_FUN(__glewReplacementCodeubSUN) -#define glReplacementCodeubvSUN GLEW_GET_FUN(__glewReplacementCodeubvSUN) -#define glReplacementCodeuiSUN GLEW_GET_FUN(__glewReplacementCodeuiSUN) -#define glReplacementCodeuivSUN GLEW_GET_FUN(__glewReplacementCodeuivSUN) -#define glReplacementCodeusSUN GLEW_GET_FUN(__glewReplacementCodeusSUN) -#define glReplacementCodeusvSUN GLEW_GET_FUN(__glewReplacementCodeusvSUN) - -#define GLEW_SUN_triangle_list GLEW_GET_VAR(__GLEW_SUN_triangle_list) - -#endif /* GL_SUN_triangle_list */ - -/* ----------------------------- GL_SUN_vertex ----------------------------- */ - -#ifndef GL_SUN_vertex -#define GL_SUN_vertex 1 - -typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte* c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte* c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint* rc, const GLubyte *c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *tc, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint* rc, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat* tc, const GLubyte *c, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (GLAPIENTRY * PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat* tc, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (GLAPIENTRY * PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat* tc, const GLfloat *v); - -#define glColor3fVertex3fSUN GLEW_GET_FUN(__glewColor3fVertex3fSUN) -#define glColor3fVertex3fvSUN GLEW_GET_FUN(__glewColor3fVertex3fvSUN) -#define glColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fSUN) -#define glColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewColor4fNormal3fVertex3fvSUN) -#define glColor4ubVertex2fSUN GLEW_GET_FUN(__glewColor4ubVertex2fSUN) -#define glColor4ubVertex2fvSUN GLEW_GET_FUN(__glewColor4ubVertex2fvSUN) -#define glColor4ubVertex3fSUN GLEW_GET_FUN(__glewColor4ubVertex3fSUN) -#define glColor4ubVertex3fvSUN GLEW_GET_FUN(__glewColor4ubVertex3fvSUN) -#define glNormal3fVertex3fSUN GLEW_GET_FUN(__glewNormal3fVertex3fSUN) -#define glNormal3fVertex3fvSUN GLEW_GET_FUN(__glewNormal3fVertex3fvSUN) -#define glReplacementCodeuiColor3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fSUN) -#define glReplacementCodeuiColor3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor3fVertex3fvSUN) -#define glReplacementCodeuiColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fSUN) -#define glReplacementCodeuiColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4fNormal3fVertex3fvSUN) -#define glReplacementCodeuiColor4ubVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fSUN) -#define glReplacementCodeuiColor4ubVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiColor4ubVertex3fvSUN) -#define glReplacementCodeuiNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fSUN) -#define glReplacementCodeuiNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiNormal3fVertex3fvSUN) -#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN) -#define glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN) -#define glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN) -#define glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN) -#define glReplacementCodeuiTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fSUN) -#define glReplacementCodeuiTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiTexCoord2fVertex3fvSUN) -#define glReplacementCodeuiVertex3fSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fSUN) -#define glReplacementCodeuiVertex3fvSUN GLEW_GET_FUN(__glewReplacementCodeuiVertex3fvSUN) -#define glTexCoord2fColor3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fSUN) -#define glTexCoord2fColor3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor3fVertex3fvSUN) -#define glTexCoord2fColor4fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fSUN) -#define glTexCoord2fColor4fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4fNormal3fVertex3fvSUN) -#define glTexCoord2fColor4ubVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fSUN) -#define glTexCoord2fColor4ubVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fColor4ubVertex3fvSUN) -#define glTexCoord2fNormal3fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fSUN) -#define glTexCoord2fNormal3fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fNormal3fVertex3fvSUN) -#define glTexCoord2fVertex3fSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fSUN) -#define glTexCoord2fVertex3fvSUN GLEW_GET_FUN(__glewTexCoord2fVertex3fvSUN) -#define glTexCoord4fColor4fNormal3fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fSUN) -#define glTexCoord4fColor4fNormal3fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fColor4fNormal3fVertex4fvSUN) -#define glTexCoord4fVertex4fSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fSUN) -#define glTexCoord4fVertex4fvSUN GLEW_GET_FUN(__glewTexCoord4fVertex4fvSUN) - -#define GLEW_SUN_vertex GLEW_GET_VAR(__GLEW_SUN_vertex) - -#endif /* GL_SUN_vertex */ - -/* -------------------------- GL_WIN_phong_shading ------------------------- */ - -#ifndef GL_WIN_phong_shading -#define GL_WIN_phong_shading 1 - -#define GL_PHONG_WIN 0x80EA -#define GL_PHONG_HINT_WIN 0x80EB - -#define GLEW_WIN_phong_shading GLEW_GET_VAR(__GLEW_WIN_phong_shading) - -#endif /* GL_WIN_phong_shading */ - -/* -------------------------- GL_WIN_specular_fog -------------------------- */ - -#ifndef GL_WIN_specular_fog -#define GL_WIN_specular_fog 1 - -#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC - -#define GLEW_WIN_specular_fog GLEW_GET_VAR(__GLEW_WIN_specular_fog) - -#endif /* GL_WIN_specular_fog */ - -/* ---------------------------- GL_WIN_swap_hint --------------------------- */ - -#ifndef GL_WIN_swap_hint -#define GL_WIN_swap_hint 1 - -typedef void (GLAPIENTRY * PFNGLADDSWAPHINTRECTWINPROC) (GLint x, GLint y, GLsizei width, GLsizei height); - -#define glAddSwapHintRectWIN GLEW_GET_FUN(__glewAddSwapHintRectWIN) - -#define GLEW_WIN_swap_hint GLEW_GET_VAR(__GLEW_WIN_swap_hint) - -#endif /* GL_WIN_swap_hint */ - -/* ------------------------------------------------------------------------- */ - - - -GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DPROC __glewCopyTexSubImage3D; -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSPROC __glewDrawRangeElements; -GLEW_FUN_EXPORT PFNGLTEXIMAGE3DPROC __glewTexImage3D; -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DPROC __glewTexSubImage3D; - -GLEW_FUN_EXPORT PFNGLACTIVETEXTUREPROC __glewActiveTexture; -GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREPROC __glewClientActiveTexture; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DPROC __glewCompressedTexImage1D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DPROC __glewCompressedTexImage2D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DPROC __glewCompressedTexImage3D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC __glewCompressedTexSubImage1D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC __glewCompressedTexSubImage2D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC __glewCompressedTexSubImage3D; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEPROC __glewGetCompressedTexImage; -GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDPROC __glewLoadTransposeMatrixd; -GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFPROC __glewLoadTransposeMatrixf; -GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDPROC __glewMultTransposeMatrixd; -GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFPROC __glewMultTransposeMatrixf; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DPROC __glewMultiTexCoord1d; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVPROC __glewMultiTexCoord1dv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FPROC __glewMultiTexCoord1f; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVPROC __glewMultiTexCoord1fv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IPROC __glewMultiTexCoord1i; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVPROC __glewMultiTexCoord1iv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SPROC __glewMultiTexCoord1s; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVPROC __glewMultiTexCoord1sv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DPROC __glewMultiTexCoord2d; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVPROC __glewMultiTexCoord2dv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FPROC __glewMultiTexCoord2f; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVPROC __glewMultiTexCoord2fv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IPROC __glewMultiTexCoord2i; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVPROC __glewMultiTexCoord2iv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SPROC __glewMultiTexCoord2s; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVPROC __glewMultiTexCoord2sv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DPROC __glewMultiTexCoord3d; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVPROC __glewMultiTexCoord3dv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FPROC __glewMultiTexCoord3f; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVPROC __glewMultiTexCoord3fv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IPROC __glewMultiTexCoord3i; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVPROC __glewMultiTexCoord3iv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SPROC __glewMultiTexCoord3s; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVPROC __glewMultiTexCoord3sv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DPROC __glewMultiTexCoord4d; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVPROC __glewMultiTexCoord4dv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FPROC __glewMultiTexCoord4f; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVPROC __glewMultiTexCoord4fv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IPROC __glewMultiTexCoord4i; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVPROC __glewMultiTexCoord4iv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SPROC __glewMultiTexCoord4s; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVPROC __glewMultiTexCoord4sv; -GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEPROC __glewSampleCoverage; - -GLEW_FUN_EXPORT PFNGLBLENDCOLORPROC __glewBlendColor; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONPROC __glewBlendEquation; -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEPROC __glewBlendFuncSeparate; -GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERPROC __glewFogCoordPointer; -GLEW_FUN_EXPORT PFNGLFOGCOORDDPROC __glewFogCoordd; -GLEW_FUN_EXPORT PFNGLFOGCOORDDVPROC __glewFogCoorddv; -GLEW_FUN_EXPORT PFNGLFOGCOORDFPROC __glewFogCoordf; -GLEW_FUN_EXPORT PFNGLFOGCOORDFVPROC __glewFogCoordfv; -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSPROC __glewMultiDrawArrays; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSPROC __glewMultiDrawElements; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFPROC __glewPointParameterf; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVPROC __glewPointParameterfv; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIPROC __glewPointParameteri; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIVPROC __glewPointParameteriv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BPROC __glewSecondaryColor3b; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVPROC __glewSecondaryColor3bv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DPROC __glewSecondaryColor3d; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVPROC __glewSecondaryColor3dv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FPROC __glewSecondaryColor3f; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVPROC __glewSecondaryColor3fv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IPROC __glewSecondaryColor3i; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVPROC __glewSecondaryColor3iv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SPROC __glewSecondaryColor3s; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVPROC __glewSecondaryColor3sv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBPROC __glewSecondaryColor3ub; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVPROC __glewSecondaryColor3ubv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIPROC __glewSecondaryColor3ui; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVPROC __glewSecondaryColor3uiv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USPROC __glewSecondaryColor3us; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVPROC __glewSecondaryColor3usv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERPROC __glewSecondaryColorPointer; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DPROC __glewWindowPos2d; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVPROC __glewWindowPos2dv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FPROC __glewWindowPos2f; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVPROC __glewWindowPos2fv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IPROC __glewWindowPos2i; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVPROC __glewWindowPos2iv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SPROC __glewWindowPos2s; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVPROC __glewWindowPos2sv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DPROC __glewWindowPos3d; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVPROC __glewWindowPos3dv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FPROC __glewWindowPos3f; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVPROC __glewWindowPos3fv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IPROC __glewWindowPos3i; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVPROC __glewWindowPos3iv; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SPROC __glewWindowPos3s; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVPROC __glewWindowPos3sv; - -GLEW_FUN_EXPORT PFNGLBEGINQUERYPROC __glewBeginQuery; -GLEW_FUN_EXPORT PFNGLBINDBUFFERPROC __glewBindBuffer; -GLEW_FUN_EXPORT PFNGLBUFFERDATAPROC __glewBufferData; -GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAPROC __glewBufferSubData; -GLEW_FUN_EXPORT PFNGLDELETEBUFFERSPROC __glewDeleteBuffers; -GLEW_FUN_EXPORT PFNGLDELETEQUERIESPROC __glewDeleteQueries; -GLEW_FUN_EXPORT PFNGLENDQUERYPROC __glewEndQuery; -GLEW_FUN_EXPORT PFNGLGENBUFFERSPROC __glewGenBuffers; -GLEW_FUN_EXPORT PFNGLGENQUERIESPROC __glewGenQueries; -GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVPROC __glewGetBufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVPROC __glewGetBufferPointerv; -GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAPROC __glewGetBufferSubData; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVPROC __glewGetQueryObjectiv; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVPROC __glewGetQueryObjectuiv; -GLEW_FUN_EXPORT PFNGLGETQUERYIVPROC __glewGetQueryiv; -GLEW_FUN_EXPORT PFNGLISBUFFERPROC __glewIsBuffer; -GLEW_FUN_EXPORT PFNGLISQUERYPROC __glewIsQuery; -GLEW_FUN_EXPORT PFNGLMAPBUFFERPROC __glewMapBuffer; -GLEW_FUN_EXPORT PFNGLUNMAPBUFFERPROC __glewUnmapBuffer; - -GLEW_FUN_EXPORT PFNGLATTACHSHADERPROC __glewAttachShader; -GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONPROC __glewBindAttribLocation; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEPROC __glewBlendEquationSeparate; -GLEW_FUN_EXPORT PFNGLCOMPILESHADERPROC __glewCompileShader; -GLEW_FUN_EXPORT PFNGLCREATEPROGRAMPROC __glewCreateProgram; -GLEW_FUN_EXPORT PFNGLCREATESHADERPROC __glewCreateShader; -GLEW_FUN_EXPORT PFNGLDELETEPROGRAMPROC __glewDeleteProgram; -GLEW_FUN_EXPORT PFNGLDELETESHADERPROC __glewDeleteShader; -GLEW_FUN_EXPORT PFNGLDETACHSHADERPROC __glewDetachShader; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYPROC __glewDisableVertexAttribArray; -GLEW_FUN_EXPORT PFNGLDRAWBUFFERSPROC __glewDrawBuffers; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYPROC __glewEnableVertexAttribArray; -GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBPROC __glewGetActiveAttrib; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMPROC __glewGetActiveUniform; -GLEW_FUN_EXPORT PFNGLGETATTACHEDSHADERSPROC __glewGetAttachedShaders; -GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONPROC __glewGetAttribLocation; -GLEW_FUN_EXPORT PFNGLGETPROGRAMINFOLOGPROC __glewGetProgramInfoLog; -GLEW_FUN_EXPORT PFNGLGETPROGRAMIVPROC __glewGetProgramiv; -GLEW_FUN_EXPORT PFNGLGETSHADERINFOLOGPROC __glewGetShaderInfoLog; -GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEPROC __glewGetShaderSource; -GLEW_FUN_EXPORT PFNGLGETSHADERIVPROC __glewGetShaderiv; -GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONPROC __glewGetUniformLocation; -GLEW_FUN_EXPORT PFNGLGETUNIFORMFVPROC __glewGetUniformfv; -GLEW_FUN_EXPORT PFNGLGETUNIFORMIVPROC __glewGetUniformiv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVPROC __glewGetVertexAttribPointerv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVPROC __glewGetVertexAttribdv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVPROC __glewGetVertexAttribfv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVPROC __glewGetVertexAttribiv; -GLEW_FUN_EXPORT PFNGLISPROGRAMPROC __glewIsProgram; -GLEW_FUN_EXPORT PFNGLISSHADERPROC __glewIsShader; -GLEW_FUN_EXPORT PFNGLLINKPROGRAMPROC __glewLinkProgram; -GLEW_FUN_EXPORT PFNGLSHADERSOURCEPROC __glewShaderSource; -GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEPROC __glewStencilFuncSeparate; -GLEW_FUN_EXPORT PFNGLSTENCILMASKSEPARATEPROC __glewStencilMaskSeparate; -GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEPROC __glewStencilOpSeparate; -GLEW_FUN_EXPORT PFNGLUNIFORM1FPROC __glewUniform1f; -GLEW_FUN_EXPORT PFNGLUNIFORM1FVPROC __glewUniform1fv; -GLEW_FUN_EXPORT PFNGLUNIFORM1IPROC __glewUniform1i; -GLEW_FUN_EXPORT PFNGLUNIFORM1IVPROC __glewUniform1iv; -GLEW_FUN_EXPORT PFNGLUNIFORM2FPROC __glewUniform2f; -GLEW_FUN_EXPORT PFNGLUNIFORM2FVPROC __glewUniform2fv; -GLEW_FUN_EXPORT PFNGLUNIFORM2IPROC __glewUniform2i; -GLEW_FUN_EXPORT PFNGLUNIFORM2IVPROC __glewUniform2iv; -GLEW_FUN_EXPORT PFNGLUNIFORM3FPROC __glewUniform3f; -GLEW_FUN_EXPORT PFNGLUNIFORM3FVPROC __glewUniform3fv; -GLEW_FUN_EXPORT PFNGLUNIFORM3IPROC __glewUniform3i; -GLEW_FUN_EXPORT PFNGLUNIFORM3IVPROC __glewUniform3iv; -GLEW_FUN_EXPORT PFNGLUNIFORM4FPROC __glewUniform4f; -GLEW_FUN_EXPORT PFNGLUNIFORM4FVPROC __glewUniform4fv; -GLEW_FUN_EXPORT PFNGLUNIFORM4IPROC __glewUniform4i; -GLEW_FUN_EXPORT PFNGLUNIFORM4IVPROC __glewUniform4iv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVPROC __glewUniformMatrix2fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVPROC __glewUniformMatrix3fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVPROC __glewUniformMatrix4fv; -GLEW_FUN_EXPORT PFNGLUSEPROGRAMPROC __glewUseProgram; -GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPROC __glewValidateProgram; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DPROC __glewVertexAttrib1d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVPROC __glewVertexAttrib1dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FPROC __glewVertexAttrib1f; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVPROC __glewVertexAttrib1fv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SPROC __glewVertexAttrib1s; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVPROC __glewVertexAttrib1sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DPROC __glewVertexAttrib2d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVPROC __glewVertexAttrib2dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FPROC __glewVertexAttrib2f; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVPROC __glewVertexAttrib2fv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SPROC __glewVertexAttrib2s; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVPROC __glewVertexAttrib2sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DPROC __glewVertexAttrib3d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVPROC __glewVertexAttrib3dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FPROC __glewVertexAttrib3f; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVPROC __glewVertexAttrib3fv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SPROC __glewVertexAttrib3s; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVPROC __glewVertexAttrib3sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVPROC __glewVertexAttrib4Nbv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVPROC __glewVertexAttrib4Niv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVPROC __glewVertexAttrib4Nsv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBPROC __glewVertexAttrib4Nub; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVPROC __glewVertexAttrib4Nubv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVPROC __glewVertexAttrib4Nuiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVPROC __glewVertexAttrib4Nusv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVPROC __glewVertexAttrib4bv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DPROC __glewVertexAttrib4d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVPROC __glewVertexAttrib4dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FPROC __glewVertexAttrib4f; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVPROC __glewVertexAttrib4fv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVPROC __glewVertexAttrib4iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SPROC __glewVertexAttrib4s; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVPROC __glewVertexAttrib4sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVPROC __glewVertexAttrib4ubv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVPROC __glewVertexAttrib4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVPROC __glewVertexAttrib4usv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERPROC __glewVertexAttribPointer; - -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X3FVPROC __glewUniformMatrix2x3fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X4FVPROC __glewUniformMatrix2x4fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X2FVPROC __glewUniformMatrix3x2fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X4FVPROC __glewUniformMatrix3x4fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X2FVPROC __glewUniformMatrix4x2fv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X3FVPROC __glewUniformMatrix4x3fv; - -GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERPROC __glewBeginConditionalRender; -GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKPROC __glewBeginTransformFeedback; -GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONPROC __glewBindFragDataLocation; -GLEW_FUN_EXPORT PFNGLCLAMPCOLORPROC __glewClampColor; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERFIPROC __glewClearBufferfi; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERFVPROC __glewClearBufferfv; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERIVPROC __glewClearBufferiv; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERUIVPROC __glewClearBufferuiv; -GLEW_FUN_EXPORT PFNGLCOLORMASKIPROC __glewColorMaski; -GLEW_FUN_EXPORT PFNGLDISABLEIPROC __glewDisablei; -GLEW_FUN_EXPORT PFNGLENABLEIPROC __glewEnablei; -GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERPROC __glewEndConditionalRender; -GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKPROC __glewEndTransformFeedback; -GLEW_FUN_EXPORT PFNGLGETBOOLEANI_VPROC __glewGetBooleani_v; -GLEW_FUN_EXPORT PFNGLGETFRAGDATALOCATIONPROC __glewGetFragDataLocation; -GLEW_FUN_EXPORT PFNGLGETSTRINGIPROC __glewGetStringi; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIIVPROC __glewGetTexParameterIiv; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIUIVPROC __glewGetTexParameterIuiv; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGPROC __glewGetTransformFeedbackVarying; -GLEW_FUN_EXPORT PFNGLGETUNIFORMUIVPROC __glewGetUniformuiv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIIVPROC __glewGetVertexAttribIiv; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIUIVPROC __glewGetVertexAttribIuiv; -GLEW_FUN_EXPORT PFNGLISENABLEDIPROC __glewIsEnabledi; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERIIVPROC __glewTexParameterIiv; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERIUIVPROC __glewTexParameterIuiv; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSPROC __glewTransformFeedbackVaryings; -GLEW_FUN_EXPORT PFNGLUNIFORM1UIPROC __glewUniform1ui; -GLEW_FUN_EXPORT PFNGLUNIFORM1UIVPROC __glewUniform1uiv; -GLEW_FUN_EXPORT PFNGLUNIFORM2UIPROC __glewUniform2ui; -GLEW_FUN_EXPORT PFNGLUNIFORM2UIVPROC __glewUniform2uiv; -GLEW_FUN_EXPORT PFNGLUNIFORM3UIPROC __glewUniform3ui; -GLEW_FUN_EXPORT PFNGLUNIFORM3UIVPROC __glewUniform3uiv; -GLEW_FUN_EXPORT PFNGLUNIFORM4UIPROC __glewUniform4ui; -GLEW_FUN_EXPORT PFNGLUNIFORM4UIVPROC __glewUniform4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IPROC __glewVertexAttribI1i; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IVPROC __glewVertexAttribI1iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIPROC __glewVertexAttribI1ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIVPROC __glewVertexAttribI1uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IPROC __glewVertexAttribI2i; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IVPROC __glewVertexAttribI2iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIPROC __glewVertexAttribI2ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIVPROC __glewVertexAttribI2uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IPROC __glewVertexAttribI3i; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IVPROC __glewVertexAttribI3iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIPROC __glewVertexAttribI3ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIVPROC __glewVertexAttribI3uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4BVPROC __glewVertexAttribI4bv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IPROC __glewVertexAttribI4i; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IVPROC __glewVertexAttribI4iv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4SVPROC __glewVertexAttribI4sv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UBVPROC __glewVertexAttribI4ubv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIPROC __glewVertexAttribI4ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIVPROC __glewVertexAttribI4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4USVPROC __glewVertexAttribI4usv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIPOINTERPROC __glewVertexAttribIPointer; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDPROC __glewDrawArraysInstanced; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDPROC __glewDrawElementsInstanced; -GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXPROC __glewPrimitiveRestartIndex; -GLEW_FUN_EXPORT PFNGLTEXBUFFERPROC __glewTexBuffer; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREPROC __glewFramebufferTexture; -GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERI64VPROC __glewGetBufferParameteri64v; -GLEW_FUN_EXPORT PFNGLGETINTEGER64I_VPROC __glewGetInteger64i_v; - -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORPROC __glewVertexAttribDivisor; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEIPROC __glewBlendEquationSeparatei; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONIPROC __glewBlendEquationi; -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIPROC __glewBlendFuncSeparatei; -GLEW_FUN_EXPORT PFNGLBLENDFUNCIPROC __glewBlendFunci; -GLEW_FUN_EXPORT PFNGLMINSAMPLESHADINGPROC __glewMinSampleShading; - -GLEW_FUN_EXPORT PFNGLGETGRAPHICSRESETSTATUSPROC __glewGetGraphicsResetStatus; -GLEW_FUN_EXPORT PFNGLGETNCOMPRESSEDTEXIMAGEPROC __glewGetnCompressedTexImage; -GLEW_FUN_EXPORT PFNGLGETNTEXIMAGEPROC __glewGetnTexImage; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMDVPROC __glewGetnUniformdv; - -GLEW_FUN_EXPORT PFNGLTBUFFERMASK3DFXPROC __glewTbufferMask3DFX; - -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKAMDPROC __glewDebugMessageCallbackAMD; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEENABLEAMDPROC __glewDebugMessageEnableAMD; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTAMDPROC __glewDebugMessageInsertAMD; -GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGAMDPROC __glewGetDebugMessageLogAMD; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONINDEXEDAMDPROC __glewBlendEquationIndexedAMD; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEINDEXEDAMDPROC __glewBlendEquationSeparateIndexedAMD; -GLEW_FUN_EXPORT PFNGLBLENDFUNCINDEXEDAMDPROC __glewBlendFuncIndexedAMD; -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEINDEXEDAMDPROC __glewBlendFuncSeparateIndexedAMD; - -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPARAMETERIAMDPROC __glewVertexAttribParameteriAMD; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTAMDPROC __glewMultiDrawArraysIndirectAMD; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTAMDPROC __glewMultiDrawElementsIndirectAMD; - -GLEW_FUN_EXPORT PFNGLDELETENAMESAMDPROC __glewDeleteNamesAMD; -GLEW_FUN_EXPORT PFNGLGENNAMESAMDPROC __glewGenNamesAMD; -GLEW_FUN_EXPORT PFNGLISNAMEAMDPROC __glewIsNameAMD; - -GLEW_FUN_EXPORT PFNGLQUERYOBJECTPARAMETERUIAMDPROC __glewQueryObjectParameteruiAMD; - -GLEW_FUN_EXPORT PFNGLBEGINPERFMONITORAMDPROC __glewBeginPerfMonitorAMD; -GLEW_FUN_EXPORT PFNGLDELETEPERFMONITORSAMDPROC __glewDeletePerfMonitorsAMD; -GLEW_FUN_EXPORT PFNGLENDPERFMONITORAMDPROC __glewEndPerfMonitorAMD; -GLEW_FUN_EXPORT PFNGLGENPERFMONITORSAMDPROC __glewGenPerfMonitorsAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERDATAAMDPROC __glewGetPerfMonitorCounterDataAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERINFOAMDPROC __glewGetPerfMonitorCounterInfoAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERSTRINGAMDPROC __glewGetPerfMonitorCounterStringAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORCOUNTERSAMDPROC __glewGetPerfMonitorCountersAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORGROUPSTRINGAMDPROC __glewGetPerfMonitorGroupStringAMD; -GLEW_FUN_EXPORT PFNGLGETPERFMONITORGROUPSAMDPROC __glewGetPerfMonitorGroupsAMD; -GLEW_FUN_EXPORT PFNGLSELECTPERFMONITORCOUNTERSAMDPROC __glewSelectPerfMonitorCountersAMD; - -GLEW_FUN_EXPORT PFNGLSETMULTISAMPLEFVAMDPROC __glewSetMultisamplefvAMD; - -GLEW_FUN_EXPORT PFNGLTEXSTORAGESPARSEAMDPROC __glewTexStorageSparseAMD; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGESPARSEAMDPROC __glewTextureStorageSparseAMD; - -GLEW_FUN_EXPORT PFNGLSTENCILOPVALUEAMDPROC __glewStencilOpValueAMD; - -GLEW_FUN_EXPORT PFNGLTESSELLATIONFACTORAMDPROC __glewTessellationFactorAMD; -GLEW_FUN_EXPORT PFNGLTESSELLATIONMODEAMDPROC __glewTessellationModeAMD; - -GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFERANGLEPROC __glewBlitFramebufferANGLE; - -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC __glewRenderbufferStorageMultisampleANGLE; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDANGLEPROC __glewDrawArraysInstancedANGLE; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDANGLEPROC __glewDrawElementsInstancedANGLE; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORANGLEPROC __glewVertexAttribDivisorANGLE; - -GLEW_FUN_EXPORT PFNGLBEGINQUERYANGLEPROC __glewBeginQueryANGLE; -GLEW_FUN_EXPORT PFNGLDELETEQUERIESANGLEPROC __glewDeleteQueriesANGLE; -GLEW_FUN_EXPORT PFNGLENDQUERYANGLEPROC __glewEndQueryANGLE; -GLEW_FUN_EXPORT PFNGLGENQUERIESANGLEPROC __glewGenQueriesANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VANGLEPROC __glewGetQueryObjecti64vANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVANGLEPROC __glewGetQueryObjectivANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VANGLEPROC __glewGetQueryObjectui64vANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVANGLEPROC __glewGetQueryObjectuivANGLE; -GLEW_FUN_EXPORT PFNGLGETQUERYIVANGLEPROC __glewGetQueryivANGLE; -GLEW_FUN_EXPORT PFNGLISQUERYANGLEPROC __glewIsQueryANGLE; -GLEW_FUN_EXPORT PFNGLQUERYCOUNTERANGLEPROC __glewQueryCounterANGLE; - -GLEW_FUN_EXPORT PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC __glewGetTranslatedShaderSourceANGLE; - -GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYAPPLEPROC __glewDrawElementArrayAPPLE; -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC __glewDrawRangeElementArrayAPPLE; -GLEW_FUN_EXPORT PFNGLELEMENTPOINTERAPPLEPROC __glewElementPointerAPPLE; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC __glewMultiDrawElementArrayAPPLE; -GLEW_FUN_EXPORT PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC __glewMultiDrawRangeElementArrayAPPLE; - -GLEW_FUN_EXPORT PFNGLDELETEFENCESAPPLEPROC __glewDeleteFencesAPPLE; -GLEW_FUN_EXPORT PFNGLFINISHFENCEAPPLEPROC __glewFinishFenceAPPLE; -GLEW_FUN_EXPORT PFNGLFINISHOBJECTAPPLEPROC __glewFinishObjectAPPLE; -GLEW_FUN_EXPORT PFNGLGENFENCESAPPLEPROC __glewGenFencesAPPLE; -GLEW_FUN_EXPORT PFNGLISFENCEAPPLEPROC __glewIsFenceAPPLE; -GLEW_FUN_EXPORT PFNGLSETFENCEAPPLEPROC __glewSetFenceAPPLE; -GLEW_FUN_EXPORT PFNGLTESTFENCEAPPLEPROC __glewTestFenceAPPLE; -GLEW_FUN_EXPORT PFNGLTESTOBJECTAPPLEPROC __glewTestObjectAPPLE; - -GLEW_FUN_EXPORT PFNGLBUFFERPARAMETERIAPPLEPROC __glewBufferParameteriAPPLE; -GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC __glewFlushMappedBufferRangeAPPLE; - -GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERIVAPPLEPROC __glewGetObjectParameterivAPPLE; -GLEW_FUN_EXPORT PFNGLOBJECTPURGEABLEAPPLEPROC __glewObjectPurgeableAPPLE; -GLEW_FUN_EXPORT PFNGLOBJECTUNPURGEABLEAPPLEPROC __glewObjectUnpurgeableAPPLE; - -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERPOINTERVAPPLEPROC __glewGetTexParameterPointervAPPLE; -GLEW_FUN_EXPORT PFNGLTEXTURERANGEAPPLEPROC __glewTextureRangeAPPLE; - -GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYAPPLEPROC __glewBindVertexArrayAPPLE; -GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSAPPLEPROC __glewDeleteVertexArraysAPPLE; -GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSAPPLEPROC __glewGenVertexArraysAPPLE; -GLEW_FUN_EXPORT PFNGLISVERTEXARRAYAPPLEPROC __glewIsVertexArrayAPPLE; - -GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC __glewFlushVertexArrayRangeAPPLE; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYPARAMETERIAPPLEPROC __glewVertexArrayParameteriAPPLE; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGEAPPLEPROC __glewVertexArrayRangeAPPLE; - -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBAPPLEPROC __glewDisableVertexAttribAPPLE; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBAPPLEPROC __glewEnableVertexAttribAPPLE; -GLEW_FUN_EXPORT PFNGLISVERTEXATTRIBENABLEDAPPLEPROC __glewIsVertexAttribEnabledAPPLE; -GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB1DAPPLEPROC __glewMapVertexAttrib1dAPPLE; -GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB1FAPPLEPROC __glewMapVertexAttrib1fAPPLE; -GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB2DAPPLEPROC __glewMapVertexAttrib2dAPPLE; -GLEW_FUN_EXPORT PFNGLMAPVERTEXATTRIB2FAPPLEPROC __glewMapVertexAttrib2fAPPLE; - -GLEW_FUN_EXPORT PFNGLCLEARDEPTHFPROC __glewClearDepthf; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEFPROC __glewDepthRangef; -GLEW_FUN_EXPORT PFNGLGETSHADERPRECISIONFORMATPROC __glewGetShaderPrecisionFormat; -GLEW_FUN_EXPORT PFNGLRELEASESHADERCOMPILERPROC __glewReleaseShaderCompiler; -GLEW_FUN_EXPORT PFNGLSHADERBINARYPROC __glewShaderBinary; - -GLEW_FUN_EXPORT PFNGLMEMORYBARRIERBYREGIONPROC __glewMemoryBarrierByRegion; - -GLEW_FUN_EXPORT PFNGLPRIMITIVEBOUNDINGBOXARBPROC __glewPrimitiveBoundingBoxARB; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC __glewDrawArraysInstancedBaseInstance; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC __glewDrawElementsInstancedBaseInstance; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC __glewDrawElementsInstancedBaseVertexBaseInstance; - -GLEW_FUN_EXPORT PFNGLGETIMAGEHANDLEARBPROC __glewGetImageHandleARB; -GLEW_FUN_EXPORT PFNGLGETTEXTUREHANDLEARBPROC __glewGetTextureHandleARB; -GLEW_FUN_EXPORT PFNGLGETTEXTURESAMPLERHANDLEARBPROC __glewGetTextureSamplerHandleARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLUI64VARBPROC __glewGetVertexAttribLui64vARB; -GLEW_FUN_EXPORT PFNGLISIMAGEHANDLERESIDENTARBPROC __glewIsImageHandleResidentARB; -GLEW_FUN_EXPORT PFNGLISTEXTUREHANDLERESIDENTARBPROC __glewIsTextureHandleResidentARB; -GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLENONRESIDENTARBPROC __glewMakeImageHandleNonResidentARB; -GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLERESIDENTARBPROC __glewMakeImageHandleResidentARB; -GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC __glewMakeTextureHandleNonResidentARB; -GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLERESIDENTARBPROC __glewMakeTextureHandleResidentARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64ARBPROC __glewProgramUniformHandleui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64VARBPROC __glewProgramUniformHandleui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64ARBPROC __glewUniformHandleui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64VARBPROC __glewUniformHandleui64vARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64ARBPROC __glewVertexAttribL1ui64ARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64VARBPROC __glewVertexAttribL1ui64vARB; - -GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONINDEXEDPROC __glewBindFragDataLocationIndexed; -GLEW_FUN_EXPORT PFNGLGETFRAGDATAINDEXPROC __glewGetFragDataIndex; - -GLEW_FUN_EXPORT PFNGLBUFFERSTORAGEPROC __glewBufferStorage; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSTORAGEEXTPROC __glewNamedBufferStorageEXT; - -GLEW_FUN_EXPORT PFNGLCREATESYNCFROMCLEVENTARBPROC __glewCreateSyncFromCLeventARB; - -GLEW_FUN_EXPORT PFNGLCLEARBUFFERDATAPROC __glewClearBufferData; -GLEW_FUN_EXPORT PFNGLCLEARBUFFERSUBDATAPROC __glewClearBufferSubData; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERDATAEXTPROC __glewClearNamedBufferDataEXT; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC __glewClearNamedBufferSubDataEXT; - -GLEW_FUN_EXPORT PFNGLCLEARTEXIMAGEPROC __glewClearTexImage; -GLEW_FUN_EXPORT PFNGLCLEARTEXSUBIMAGEPROC __glewClearTexSubImage; - -GLEW_FUN_EXPORT PFNGLCLIPCONTROLPROC __glewClipControl; - -GLEW_FUN_EXPORT PFNGLCLAMPCOLORARBPROC __glewClampColorARB; - -GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEPROC __glewDispatchCompute; -GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEINDIRECTPROC __glewDispatchComputeIndirect; - -GLEW_FUN_EXPORT PFNGLDISPATCHCOMPUTEGROUPSIZEARBPROC __glewDispatchComputeGroupSizeARB; - -GLEW_FUN_EXPORT PFNGLCOPYBUFFERSUBDATAPROC __glewCopyBufferSubData; - -GLEW_FUN_EXPORT PFNGLCOPYIMAGESUBDATAPROC __glewCopyImageSubData; - -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKARBPROC __glewDebugMessageCallbackARB; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECONTROLARBPROC __glewDebugMessageControlARB; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTARBPROC __glewDebugMessageInsertARB; -GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGARBPROC __glewGetDebugMessageLogARB; - -GLEW_FUN_EXPORT PFNGLBINDTEXTUREUNITPROC __glewBindTextureUnit; -GLEW_FUN_EXPORT PFNGLBLITNAMEDFRAMEBUFFERPROC __glewBlitNamedFramebuffer; -GLEW_FUN_EXPORT PFNGLCHECKNAMEDFRAMEBUFFERSTATUSPROC __glewCheckNamedFramebufferStatus; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERDATAPROC __glewClearNamedBufferData; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDBUFFERSUBDATAPROC __glewClearNamedBufferSubData; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERFIPROC __glewClearNamedFramebufferfi; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERFVPROC __glewClearNamedFramebufferfv; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERIVPROC __glewClearNamedFramebufferiv; -GLEW_FUN_EXPORT PFNGLCLEARNAMEDFRAMEBUFFERUIVPROC __glewClearNamedFramebufferuiv; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE1DPROC __glewCompressedTextureSubImage1D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE2DPROC __glewCompressedTextureSubImage2D; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE3DPROC __glewCompressedTextureSubImage3D; -GLEW_FUN_EXPORT PFNGLCOPYNAMEDBUFFERSUBDATAPROC __glewCopyNamedBufferSubData; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE1DPROC __glewCopyTextureSubImage1D; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE2DPROC __glewCopyTextureSubImage2D; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE3DPROC __glewCopyTextureSubImage3D; -GLEW_FUN_EXPORT PFNGLCREATEBUFFERSPROC __glewCreateBuffers; -GLEW_FUN_EXPORT PFNGLCREATEFRAMEBUFFERSPROC __glewCreateFramebuffers; -GLEW_FUN_EXPORT PFNGLCREATEPROGRAMPIPELINESPROC __glewCreateProgramPipelines; -GLEW_FUN_EXPORT PFNGLCREATEQUERIESPROC __glewCreateQueries; -GLEW_FUN_EXPORT PFNGLCREATERENDERBUFFERSPROC __glewCreateRenderbuffers; -GLEW_FUN_EXPORT PFNGLCREATESAMPLERSPROC __glewCreateSamplers; -GLEW_FUN_EXPORT PFNGLCREATETEXTURESPROC __glewCreateTextures; -GLEW_FUN_EXPORT PFNGLCREATETRANSFORMFEEDBACKSPROC __glewCreateTransformFeedbacks; -GLEW_FUN_EXPORT PFNGLCREATEVERTEXARRAYSPROC __glewCreateVertexArrays; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYATTRIBPROC __glewDisableVertexArrayAttrib; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYATTRIBPROC __glewEnableVertexArrayAttrib; -GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEPROC __glewFlushMappedNamedBufferRange; -GLEW_FUN_EXPORT PFNGLGENERATETEXTUREMIPMAPPROC __glewGenerateTextureMipmap; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTUREIMAGEPROC __glewGetCompressedTextureImage; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERI64VPROC __glewGetNamedBufferParameteri64v; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERIVPROC __glewGetNamedBufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPOINTERVPROC __glewGetNamedBufferPointerv; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERSUBDATAPROC __glewGetNamedBufferSubData; -GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetNamedFramebufferAttachmentParameteriv; -GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVPROC __glewGetNamedFramebufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETNAMEDRENDERBUFFERPARAMETERIVPROC __glewGetNamedRenderbufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTI64VPROC __glewGetQueryBufferObjecti64v; -GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTIVPROC __glewGetQueryBufferObjectiv; -GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTUI64VPROC __glewGetQueryBufferObjectui64v; -GLEW_FUN_EXPORT PFNGLGETQUERYBUFFEROBJECTUIVPROC __glewGetQueryBufferObjectuiv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREIMAGEPROC __glewGetTextureImage; -GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERFVPROC __glewGetTextureLevelParameterfv; -GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERIVPROC __glewGetTextureLevelParameteriv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIIVPROC __glewGetTextureParameterIiv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIUIVPROC __glewGetTextureParameterIuiv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERFVPROC __glewGetTextureParameterfv; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIVPROC __glewGetTextureParameteriv; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKI64_VPROC __glewGetTransformFeedbacki64_v; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKI_VPROC __glewGetTransformFeedbacki_v; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKIVPROC __glewGetTransformFeedbackiv; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINDEXED64IVPROC __glewGetVertexArrayIndexed64iv; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINDEXEDIVPROC __glewGetVertexArrayIndexediv; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYIVPROC __glewGetVertexArrayiv; -GLEW_FUN_EXPORT PFNGLINVALIDATENAMEDFRAMEBUFFERDATAPROC __glewInvalidateNamedFramebufferData; -GLEW_FUN_EXPORT PFNGLINVALIDATENAMEDFRAMEBUFFERSUBDATAPROC __glewInvalidateNamedFramebufferSubData; -GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERPROC __glewMapNamedBuffer; -GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERRANGEPROC __glewMapNamedBufferRange; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERDATAPROC __glewNamedBufferData; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSTORAGEPROC __glewNamedBufferStorage; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSUBDATAPROC __glewNamedBufferSubData; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERDRAWBUFFERPROC __glewNamedFramebufferDrawBuffer; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERDRAWBUFFERSPROC __glewNamedFramebufferDrawBuffers; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERPARAMETERIPROC __glewNamedFramebufferParameteri; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERREADBUFFERPROC __glewNamedFramebufferReadBuffer; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERRENDERBUFFERPROC __glewNamedFramebufferRenderbuffer; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREPROC __glewNamedFramebufferTexture; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURELAYERPROC __glewNamedFramebufferTextureLayer; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEPROC __glewNamedRenderbufferStorage; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewNamedRenderbufferStorageMultisample; -GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERPROC __glewTextureBuffer; -GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERRANGEPROC __glewTextureBufferRange; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIIVPROC __glewTextureParameterIiv; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIUIVPROC __glewTextureParameterIuiv; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFPROC __glewTextureParameterf; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFVPROC __glewTextureParameterfv; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIPROC __glewTextureParameteri; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIVPROC __glewTextureParameteriv; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE1DPROC __glewTextureStorage1D; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DPROC __glewTextureStorage2D; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DMULTISAMPLEPROC __glewTextureStorage2DMultisample; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DPROC __glewTextureStorage3D; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DMULTISAMPLEPROC __glewTextureStorage3DMultisample; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE1DPROC __glewTextureSubImage1D; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE2DPROC __glewTextureSubImage2D; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE3DPROC __glewTextureSubImage3D; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKBUFFERBASEPROC __glewTransformFeedbackBufferBase; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKBUFFERRANGEPROC __glewTransformFeedbackBufferRange; -GLEW_FUN_EXPORT PFNGLUNMAPNAMEDBUFFERPROC __glewUnmapNamedBuffer; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBBINDINGPROC __glewVertexArrayAttribBinding; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBFORMATPROC __glewVertexArrayAttribFormat; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBIFORMATPROC __glewVertexArrayAttribIFormat; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYATTRIBLFORMATPROC __glewVertexArrayAttribLFormat; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYBINDINGDIVISORPROC __glewVertexArrayBindingDivisor; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYELEMENTBUFFERPROC __glewVertexArrayElementBuffer; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXBUFFERPROC __glewVertexArrayVertexBuffer; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXBUFFERSPROC __glewVertexArrayVertexBuffers; - -GLEW_FUN_EXPORT PFNGLDRAWBUFFERSARBPROC __glewDrawBuffersARB; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEIARBPROC __glewBlendEquationSeparateiARB; -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONIARBPROC __glewBlendEquationiARB; -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEIARBPROC __glewBlendFuncSeparateiARB; -GLEW_FUN_EXPORT PFNGLBLENDFUNCIARBPROC __glewBlendFunciARB; - -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSBASEVERTEXPROC __glewDrawElementsBaseVertex; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __glewDrawElementsInstancedBaseVertex; -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC __glewDrawRangeElementsBaseVertex; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC __glewMultiDrawElementsBaseVertex; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINDIRECTPROC __glewDrawArraysIndirect; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINDIRECTPROC __glewDrawElementsIndirect; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERPARAMETERIPROC __glewFramebufferParameteri; -GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVPROC __glewGetFramebufferParameteriv; -GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC __glewGetNamedFramebufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC __glewNamedFramebufferParameteriEXT; - -GLEW_FUN_EXPORT PFNGLBINDFRAMEBUFFERPROC __glewBindFramebuffer; -GLEW_FUN_EXPORT PFNGLBINDRENDERBUFFERPROC __glewBindRenderbuffer; -GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFERPROC __glewBlitFramebuffer; -GLEW_FUN_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSPROC __glewCheckFramebufferStatus; -GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSPROC __glewDeleteFramebuffers; -GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSPROC __glewDeleteRenderbuffers; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFERPROC __glewFramebufferRenderbuffer; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DPROC __glewFramebufferTexture1D; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DPROC __glewFramebufferTexture2D; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DPROC __glewFramebufferTexture3D; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERPROC __glewFramebufferTextureLayer; -GLEW_FUN_EXPORT PFNGLGENFRAMEBUFFERSPROC __glewGenFramebuffers; -GLEW_FUN_EXPORT PFNGLGENRENDERBUFFERSPROC __glewGenRenderbuffers; -GLEW_FUN_EXPORT PFNGLGENERATEMIPMAPPROC __glewGenerateMipmap; -GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __glewGetFramebufferAttachmentParameteriv; -GLEW_FUN_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVPROC __glewGetRenderbufferParameteriv; -GLEW_FUN_EXPORT PFNGLISFRAMEBUFFERPROC __glewIsFramebuffer; -GLEW_FUN_EXPORT PFNGLISRENDERBUFFERPROC __glewIsRenderbuffer; -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEPROC __glewRenderbufferStorage; -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __glewRenderbufferStorageMultisample; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREARBPROC __glewFramebufferTextureARB; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREFACEARBPROC __glewFramebufferTextureFaceARB; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYERARBPROC __glewFramebufferTextureLayerARB; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIARBPROC __glewProgramParameteriARB; - -GLEW_FUN_EXPORT PFNGLGETPROGRAMBINARYPROC __glewGetProgramBinary; -GLEW_FUN_EXPORT PFNGLPROGRAMBINARYPROC __glewProgramBinary; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIPROC __glewProgramParameteri; - -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC __glewGetCompressedTextureSubImage; -GLEW_FUN_EXPORT PFNGLGETTEXTURESUBIMAGEPROC __glewGetTextureSubImage; - -GLEW_FUN_EXPORT PFNGLSPECIALIZESHADERARBPROC __glewSpecializeShaderARB; - -GLEW_FUN_EXPORT PFNGLGETUNIFORMDVPROC __glewGetUniformdv; -GLEW_FUN_EXPORT PFNGLUNIFORM1DPROC __glewUniform1d; -GLEW_FUN_EXPORT PFNGLUNIFORM1DVPROC __glewUniform1dv; -GLEW_FUN_EXPORT PFNGLUNIFORM2DPROC __glewUniform2d; -GLEW_FUN_EXPORT PFNGLUNIFORM2DVPROC __glewUniform2dv; -GLEW_FUN_EXPORT PFNGLUNIFORM3DPROC __glewUniform3d; -GLEW_FUN_EXPORT PFNGLUNIFORM3DVPROC __glewUniform3dv; -GLEW_FUN_EXPORT PFNGLUNIFORM4DPROC __glewUniform4d; -GLEW_FUN_EXPORT PFNGLUNIFORM4DVPROC __glewUniform4dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2DVPROC __glewUniformMatrix2dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X3DVPROC __glewUniformMatrix2x3dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2X4DVPROC __glewUniformMatrix2x4dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3DVPROC __glewUniformMatrix3dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X2DVPROC __glewUniformMatrix3x2dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3X4DVPROC __glewUniformMatrix3x4dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4DVPROC __glewUniformMatrix4dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X2DVPROC __glewUniformMatrix4x2dv; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4X3DVPROC __glewUniformMatrix4x3dv; - -GLEW_FUN_EXPORT PFNGLGETUNIFORMI64VARBPROC __glewGetUniformi64vARB; -GLEW_FUN_EXPORT PFNGLGETUNIFORMUI64VARBPROC __glewGetUniformui64vARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMI64VARBPROC __glewGetnUniformi64vARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMUI64VARBPROC __glewGetnUniformui64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64ARBPROC __glewProgramUniform1i64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64VARBPROC __glewProgramUniform1i64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64ARBPROC __glewProgramUniform1ui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64VARBPROC __glewProgramUniform1ui64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64ARBPROC __glewProgramUniform2i64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64VARBPROC __glewProgramUniform2i64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64ARBPROC __glewProgramUniform2ui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64VARBPROC __glewProgramUniform2ui64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64ARBPROC __glewProgramUniform3i64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64VARBPROC __glewProgramUniform3i64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64ARBPROC __glewProgramUniform3ui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64VARBPROC __glewProgramUniform3ui64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64ARBPROC __glewProgramUniform4i64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64VARBPROC __glewProgramUniform4i64vARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64ARBPROC __glewProgramUniform4ui64ARB; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64VARBPROC __glewProgramUniform4ui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1I64ARBPROC __glewUniform1i64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1I64VARBPROC __glewUniform1i64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1UI64ARBPROC __glewUniform1ui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1UI64VARBPROC __glewUniform1ui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2I64ARBPROC __glewUniform2i64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2I64VARBPROC __glewUniform2i64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2UI64ARBPROC __glewUniform2ui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2UI64VARBPROC __glewUniform2ui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3I64ARBPROC __glewUniform3i64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3I64VARBPROC __glewUniform3i64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3UI64ARBPROC __glewUniform3ui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3UI64VARBPROC __glewUniform3ui64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4I64ARBPROC __glewUniform4i64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4I64VARBPROC __glewUniform4i64vARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4UI64ARBPROC __glewUniform4ui64ARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4UI64VARBPROC __glewUniform4ui64vARB; - -GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEPROC __glewColorSubTable; -GLEW_FUN_EXPORT PFNGLCOLORTABLEPROC __glewColorTable; -GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVPROC __glewColorTableParameterfv; -GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVPROC __glewColorTableParameteriv; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DPROC __glewConvolutionFilter1D; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DPROC __glewConvolutionFilter2D; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFPROC __glewConvolutionParameterf; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVPROC __glewConvolutionParameterfv; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIPROC __glewConvolutionParameteri; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVPROC __glewConvolutionParameteriv; -GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEPROC __glewCopyColorSubTable; -GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLEPROC __glewCopyColorTable; -GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DPROC __glewCopyConvolutionFilter1D; -GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DPROC __glewCopyConvolutionFilter2D; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPROC __glewGetColorTable; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVPROC __glewGetColorTableParameterfv; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVPROC __glewGetColorTableParameteriv; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTERPROC __glewGetConvolutionFilter; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVPROC __glewGetConvolutionParameterfv; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVPROC __glewGetConvolutionParameteriv; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPROC __glewGetHistogram; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVPROC __glewGetHistogramParameterfv; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVPROC __glewGetHistogramParameteriv; -GLEW_FUN_EXPORT PFNGLGETMINMAXPROC __glewGetMinmax; -GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVPROC __glewGetMinmaxParameterfv; -GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVPROC __glewGetMinmaxParameteriv; -GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTERPROC __glewGetSeparableFilter; -GLEW_FUN_EXPORT PFNGLHISTOGRAMPROC __glewHistogram; -GLEW_FUN_EXPORT PFNGLMINMAXPROC __glewMinmax; -GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMPROC __glewResetHistogram; -GLEW_FUN_EXPORT PFNGLRESETMINMAXPROC __glewResetMinmax; -GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DPROC __glewSeparableFilter2D; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC __glewMultiDrawArraysIndirectCountARB; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC __glewMultiDrawElementsIndirectCountARB; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDARBPROC __glewDrawArraysInstancedARB; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDARBPROC __glewDrawElementsInstancedARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBDIVISORARBPROC __glewVertexAttribDivisorARB; - -GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATIVPROC __glewGetInternalformativ; - -GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATI64VPROC __glewGetInternalformati64v; - -GLEW_FUN_EXPORT PFNGLINVALIDATEBUFFERDATAPROC __glewInvalidateBufferData; -GLEW_FUN_EXPORT PFNGLINVALIDATEBUFFERSUBDATAPROC __glewInvalidateBufferSubData; -GLEW_FUN_EXPORT PFNGLINVALIDATEFRAMEBUFFERPROC __glewInvalidateFramebuffer; -GLEW_FUN_EXPORT PFNGLINVALIDATESUBFRAMEBUFFERPROC __glewInvalidateSubFramebuffer; -GLEW_FUN_EXPORT PFNGLINVALIDATETEXIMAGEPROC __glewInvalidateTexImage; -GLEW_FUN_EXPORT PFNGLINVALIDATETEXSUBIMAGEPROC __glewInvalidateTexSubImage; - -GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDBUFFERRANGEPROC __glewFlushMappedBufferRange; -GLEW_FUN_EXPORT PFNGLMAPBUFFERRANGEPROC __glewMapBufferRange; - -GLEW_FUN_EXPORT PFNGLCURRENTPALETTEMATRIXARBPROC __glewCurrentPaletteMatrixARB; -GLEW_FUN_EXPORT PFNGLMATRIXINDEXPOINTERARBPROC __glewMatrixIndexPointerARB; -GLEW_FUN_EXPORT PFNGLMATRIXINDEXUBVARBPROC __glewMatrixIndexubvARB; -GLEW_FUN_EXPORT PFNGLMATRIXINDEXUIVARBPROC __glewMatrixIndexuivARB; -GLEW_FUN_EXPORT PFNGLMATRIXINDEXUSVARBPROC __glewMatrixIndexusvARB; - -GLEW_FUN_EXPORT PFNGLBINDBUFFERSBASEPROC __glewBindBuffersBase; -GLEW_FUN_EXPORT PFNGLBINDBUFFERSRANGEPROC __glewBindBuffersRange; -GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTURESPROC __glewBindImageTextures; -GLEW_FUN_EXPORT PFNGLBINDSAMPLERSPROC __glewBindSamplers; -GLEW_FUN_EXPORT PFNGLBINDTEXTURESPROC __glewBindTextures; -GLEW_FUN_EXPORT PFNGLBINDVERTEXBUFFERSPROC __glewBindVertexBuffers; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTPROC __glewMultiDrawArraysIndirect; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTPROC __glewMultiDrawElementsIndirect; - -GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEARBPROC __glewSampleCoverageARB; - -GLEW_FUN_EXPORT PFNGLACTIVETEXTUREARBPROC __glewActiveTextureARB; -GLEW_FUN_EXPORT PFNGLCLIENTACTIVETEXTUREARBPROC __glewClientActiveTextureARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DARBPROC __glewMultiTexCoord1dARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1DVARBPROC __glewMultiTexCoord1dvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FARBPROC __glewMultiTexCoord1fARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1FVARBPROC __glewMultiTexCoord1fvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IARBPROC __glewMultiTexCoord1iARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1IVARBPROC __glewMultiTexCoord1ivARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SARBPROC __glewMultiTexCoord1sARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1SVARBPROC __glewMultiTexCoord1svARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DARBPROC __glewMultiTexCoord2dARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2DVARBPROC __glewMultiTexCoord2dvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FARBPROC __glewMultiTexCoord2fARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2FVARBPROC __glewMultiTexCoord2fvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IARBPROC __glewMultiTexCoord2iARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2IVARBPROC __glewMultiTexCoord2ivARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SARBPROC __glewMultiTexCoord2sARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2SVARBPROC __glewMultiTexCoord2svARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DARBPROC __glewMultiTexCoord3dARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3DVARBPROC __glewMultiTexCoord3dvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FARBPROC __glewMultiTexCoord3fARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3FVARBPROC __glewMultiTexCoord3fvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IARBPROC __glewMultiTexCoord3iARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3IVARBPROC __glewMultiTexCoord3ivARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SARBPROC __glewMultiTexCoord3sARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3SVARBPROC __glewMultiTexCoord3svARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DARBPROC __glewMultiTexCoord4dARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4DVARBPROC __glewMultiTexCoord4dvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FARBPROC __glewMultiTexCoord4fARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4FVARBPROC __glewMultiTexCoord4fvARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IARBPROC __glewMultiTexCoord4iARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4IVARBPROC __glewMultiTexCoord4ivARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SARBPROC __glewMultiTexCoord4sARB; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4SVARBPROC __glewMultiTexCoord4svARB; - -GLEW_FUN_EXPORT PFNGLBEGINQUERYARBPROC __glewBeginQueryARB; -GLEW_FUN_EXPORT PFNGLDELETEQUERIESARBPROC __glewDeleteQueriesARB; -GLEW_FUN_EXPORT PFNGLENDQUERYARBPROC __glewEndQueryARB; -GLEW_FUN_EXPORT PFNGLGENQUERIESARBPROC __glewGenQueriesARB; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTIVARBPROC __glewGetQueryObjectivARB; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUIVARBPROC __glewGetQueryObjectuivARB; -GLEW_FUN_EXPORT PFNGLGETQUERYIVARBPROC __glewGetQueryivARB; -GLEW_FUN_EXPORT PFNGLISQUERYARBPROC __glewIsQueryARB; - -GLEW_FUN_EXPORT PFNGLMAXSHADERCOMPILERTHREADSARBPROC __glewMaxShaderCompilerThreadsARB; - -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFARBPROC __glewPointParameterfARB; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVARBPROC __glewPointParameterfvARB; - -GLEW_FUN_EXPORT PFNGLGETPROGRAMINTERFACEIVPROC __glewGetProgramInterfaceiv; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEINDEXPROC __glewGetProgramResourceIndex; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONPROC __glewGetProgramResourceLocation; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC __glewGetProgramResourceLocationIndex; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCENAMEPROC __glewGetProgramResourceName; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEIVPROC __glewGetProgramResourceiv; - -GLEW_FUN_EXPORT PFNGLPROVOKINGVERTEXPROC __glewProvokingVertex; - -GLEW_FUN_EXPORT PFNGLGETGRAPHICSRESETSTATUSARBPROC __glewGetGraphicsResetStatusARB; -GLEW_FUN_EXPORT PFNGLGETNCOLORTABLEARBPROC __glewGetnColorTableARB; -GLEW_FUN_EXPORT PFNGLGETNCOMPRESSEDTEXIMAGEARBPROC __glewGetnCompressedTexImageARB; -GLEW_FUN_EXPORT PFNGLGETNCONVOLUTIONFILTERARBPROC __glewGetnConvolutionFilterARB; -GLEW_FUN_EXPORT PFNGLGETNHISTOGRAMARBPROC __glewGetnHistogramARB; -GLEW_FUN_EXPORT PFNGLGETNMAPDVARBPROC __glewGetnMapdvARB; -GLEW_FUN_EXPORT PFNGLGETNMAPFVARBPROC __glewGetnMapfvARB; -GLEW_FUN_EXPORT PFNGLGETNMAPIVARBPROC __glewGetnMapivARB; -GLEW_FUN_EXPORT PFNGLGETNMINMAXARBPROC __glewGetnMinmaxARB; -GLEW_FUN_EXPORT PFNGLGETNPIXELMAPFVARBPROC __glewGetnPixelMapfvARB; -GLEW_FUN_EXPORT PFNGLGETNPIXELMAPUIVARBPROC __glewGetnPixelMapuivARB; -GLEW_FUN_EXPORT PFNGLGETNPIXELMAPUSVARBPROC __glewGetnPixelMapusvARB; -GLEW_FUN_EXPORT PFNGLGETNPOLYGONSTIPPLEARBPROC __glewGetnPolygonStippleARB; -GLEW_FUN_EXPORT PFNGLGETNSEPARABLEFILTERARBPROC __glewGetnSeparableFilterARB; -GLEW_FUN_EXPORT PFNGLGETNTEXIMAGEARBPROC __glewGetnTexImageARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMDVARBPROC __glewGetnUniformdvARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMFVARBPROC __glewGetnUniformfvARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMIVARBPROC __glewGetnUniformivARB; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMUIVARBPROC __glewGetnUniformuivARB; -GLEW_FUN_EXPORT PFNGLREADNPIXELSARBPROC __glewReadnPixelsARB; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERSAMPLELOCATIONSFVARBPROC __glewFramebufferSampleLocationsfvARB; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVARBPROC __glewNamedFramebufferSampleLocationsfvARB; - -GLEW_FUN_EXPORT PFNGLMINSAMPLESHADINGARBPROC __glewMinSampleShadingARB; - -GLEW_FUN_EXPORT PFNGLBINDSAMPLERPROC __glewBindSampler; -GLEW_FUN_EXPORT PFNGLDELETESAMPLERSPROC __glewDeleteSamplers; -GLEW_FUN_EXPORT PFNGLGENSAMPLERSPROC __glewGenSamplers; -GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIIVPROC __glewGetSamplerParameterIiv; -GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIUIVPROC __glewGetSamplerParameterIuiv; -GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERFVPROC __glewGetSamplerParameterfv; -GLEW_FUN_EXPORT PFNGLGETSAMPLERPARAMETERIVPROC __glewGetSamplerParameteriv; -GLEW_FUN_EXPORT PFNGLISSAMPLERPROC __glewIsSampler; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIIVPROC __glewSamplerParameterIiv; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIUIVPROC __glewSamplerParameterIuiv; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERFPROC __glewSamplerParameterf; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERFVPROC __glewSamplerParameterfv; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIPROC __glewSamplerParameteri; -GLEW_FUN_EXPORT PFNGLSAMPLERPARAMETERIVPROC __glewSamplerParameteriv; - -GLEW_FUN_EXPORT PFNGLACTIVESHADERPROGRAMPROC __glewActiveShaderProgram; -GLEW_FUN_EXPORT PFNGLBINDPROGRAMPIPELINEPROC __glewBindProgramPipeline; -GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMVPROC __glewCreateShaderProgramv; -GLEW_FUN_EXPORT PFNGLDELETEPROGRAMPIPELINESPROC __glewDeleteProgramPipelines; -GLEW_FUN_EXPORT PFNGLGENPROGRAMPIPELINESPROC __glewGenProgramPipelines; -GLEW_FUN_EXPORT PFNGLGETPROGRAMPIPELINEINFOLOGPROC __glewGetProgramPipelineInfoLog; -GLEW_FUN_EXPORT PFNGLGETPROGRAMPIPELINEIVPROC __glewGetProgramPipelineiv; -GLEW_FUN_EXPORT PFNGLISPROGRAMPIPELINEPROC __glewIsProgramPipeline; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DPROC __glewProgramUniform1d; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1DVPROC __glewProgramUniform1dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FPROC __glewProgramUniform1f; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FVPROC __glewProgramUniform1fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IPROC __glewProgramUniform1i; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IVPROC __glewProgramUniform1iv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIPROC __glewProgramUniform1ui; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIVPROC __glewProgramUniform1uiv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DPROC __glewProgramUniform2d; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2DVPROC __glewProgramUniform2dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FPROC __glewProgramUniform2f; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FVPROC __glewProgramUniform2fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IPROC __glewProgramUniform2i; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IVPROC __glewProgramUniform2iv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIPROC __glewProgramUniform2ui; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIVPROC __glewProgramUniform2uiv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DPROC __glewProgramUniform3d; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3DVPROC __glewProgramUniform3dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FPROC __glewProgramUniform3f; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FVPROC __glewProgramUniform3fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IPROC __glewProgramUniform3i; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IVPROC __glewProgramUniform3iv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIPROC __glewProgramUniform3ui; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIVPROC __glewProgramUniform3uiv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DPROC __glewProgramUniform4d; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4DVPROC __glewProgramUniform4dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FPROC __glewProgramUniform4f; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FVPROC __glewProgramUniform4fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IPROC __glewProgramUniform4i; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IVPROC __glewProgramUniform4iv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIPROC __glewProgramUniform4ui; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIVPROC __glewProgramUniform4uiv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2DVPROC __glewProgramUniformMatrix2dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVPROC __glewProgramUniformMatrix2fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3DVPROC __glewProgramUniformMatrix2x3dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVPROC __glewProgramUniformMatrix2x3fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4DVPROC __glewProgramUniformMatrix2x4dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVPROC __glewProgramUniformMatrix2x4fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3DVPROC __glewProgramUniformMatrix3dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVPROC __glewProgramUniformMatrix3fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2DVPROC __glewProgramUniformMatrix3x2dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVPROC __glewProgramUniformMatrix3x2fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4DVPROC __glewProgramUniformMatrix3x4dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVPROC __glewProgramUniformMatrix3x4fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4DVPROC __glewProgramUniformMatrix4dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVPROC __glewProgramUniformMatrix4fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2DVPROC __glewProgramUniformMatrix4x2dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVPROC __glewProgramUniformMatrix4x2fv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3DVPROC __glewProgramUniformMatrix4x3dv; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVPROC __glewProgramUniformMatrix4x3fv; -GLEW_FUN_EXPORT PFNGLUSEPROGRAMSTAGESPROC __glewUseProgramStages; -GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMPIPELINEPROC __glewValidateProgramPipeline; - -GLEW_FUN_EXPORT PFNGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __glewGetActiveAtomicCounterBufferiv; - -GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTUREPROC __glewBindImageTexture; -GLEW_FUN_EXPORT PFNGLMEMORYBARRIERPROC __glewMemoryBarrier; - -GLEW_FUN_EXPORT PFNGLATTACHOBJECTARBPROC __glewAttachObjectARB; -GLEW_FUN_EXPORT PFNGLCOMPILESHADERARBPROC __glewCompileShaderARB; -GLEW_FUN_EXPORT PFNGLCREATEPROGRAMOBJECTARBPROC __glewCreateProgramObjectARB; -GLEW_FUN_EXPORT PFNGLCREATESHADEROBJECTARBPROC __glewCreateShaderObjectARB; -GLEW_FUN_EXPORT PFNGLDELETEOBJECTARBPROC __glewDeleteObjectARB; -GLEW_FUN_EXPORT PFNGLDETACHOBJECTARBPROC __glewDetachObjectARB; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMARBPROC __glewGetActiveUniformARB; -GLEW_FUN_EXPORT PFNGLGETATTACHEDOBJECTSARBPROC __glewGetAttachedObjectsARB; -GLEW_FUN_EXPORT PFNGLGETHANDLEARBPROC __glewGetHandleARB; -GLEW_FUN_EXPORT PFNGLGETINFOLOGARBPROC __glewGetInfoLogARB; -GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERFVARBPROC __glewGetObjectParameterfvARB; -GLEW_FUN_EXPORT PFNGLGETOBJECTPARAMETERIVARBPROC __glewGetObjectParameterivARB; -GLEW_FUN_EXPORT PFNGLGETSHADERSOURCEARBPROC __glewGetShaderSourceARB; -GLEW_FUN_EXPORT PFNGLGETUNIFORMLOCATIONARBPROC __glewGetUniformLocationARB; -GLEW_FUN_EXPORT PFNGLGETUNIFORMFVARBPROC __glewGetUniformfvARB; -GLEW_FUN_EXPORT PFNGLGETUNIFORMIVARBPROC __glewGetUniformivARB; -GLEW_FUN_EXPORT PFNGLLINKPROGRAMARBPROC __glewLinkProgramARB; -GLEW_FUN_EXPORT PFNGLSHADERSOURCEARBPROC __glewShaderSourceARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1FARBPROC __glewUniform1fARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1FVARBPROC __glewUniform1fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1IARBPROC __glewUniform1iARB; -GLEW_FUN_EXPORT PFNGLUNIFORM1IVARBPROC __glewUniform1ivARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2FARBPROC __glewUniform2fARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2FVARBPROC __glewUniform2fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2IARBPROC __glewUniform2iARB; -GLEW_FUN_EXPORT PFNGLUNIFORM2IVARBPROC __glewUniform2ivARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3FARBPROC __glewUniform3fARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3FVARBPROC __glewUniform3fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3IARBPROC __glewUniform3iARB; -GLEW_FUN_EXPORT PFNGLUNIFORM3IVARBPROC __glewUniform3ivARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4FARBPROC __glewUniform4fARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4FVARBPROC __glewUniform4fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4IARBPROC __glewUniform4iARB; -GLEW_FUN_EXPORT PFNGLUNIFORM4IVARBPROC __glewUniform4ivARB; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX2FVARBPROC __glewUniformMatrix2fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX3FVARBPROC __glewUniformMatrix3fvARB; -GLEW_FUN_EXPORT PFNGLUNIFORMMATRIX4FVARBPROC __glewUniformMatrix4fvARB; -GLEW_FUN_EXPORT PFNGLUSEPROGRAMOBJECTARBPROC __glewUseProgramObjectARB; -GLEW_FUN_EXPORT PFNGLVALIDATEPROGRAMARBPROC __glewValidateProgramARB; - -GLEW_FUN_EXPORT PFNGLSHADERSTORAGEBLOCKBINDINGPROC __glewShaderStorageBlockBinding; - -GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINENAMEPROC __glewGetActiveSubroutineName; -GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINEUNIFORMNAMEPROC __glewGetActiveSubroutineUniformName; -GLEW_FUN_EXPORT PFNGLGETACTIVESUBROUTINEUNIFORMIVPROC __glewGetActiveSubroutineUniformiv; -GLEW_FUN_EXPORT PFNGLGETPROGRAMSTAGEIVPROC __glewGetProgramStageiv; -GLEW_FUN_EXPORT PFNGLGETSUBROUTINEINDEXPROC __glewGetSubroutineIndex; -GLEW_FUN_EXPORT PFNGLGETSUBROUTINEUNIFORMLOCATIONPROC __glewGetSubroutineUniformLocation; -GLEW_FUN_EXPORT PFNGLGETUNIFORMSUBROUTINEUIVPROC __glewGetUniformSubroutineuiv; -GLEW_FUN_EXPORT PFNGLUNIFORMSUBROUTINESUIVPROC __glewUniformSubroutinesuiv; - -GLEW_FUN_EXPORT PFNGLCOMPILESHADERINCLUDEARBPROC __glewCompileShaderIncludeARB; -GLEW_FUN_EXPORT PFNGLDELETENAMEDSTRINGARBPROC __glewDeleteNamedStringARB; -GLEW_FUN_EXPORT PFNGLGETNAMEDSTRINGARBPROC __glewGetNamedStringARB; -GLEW_FUN_EXPORT PFNGLGETNAMEDSTRINGIVARBPROC __glewGetNamedStringivARB; -GLEW_FUN_EXPORT PFNGLISNAMEDSTRINGARBPROC __glewIsNamedStringARB; -GLEW_FUN_EXPORT PFNGLNAMEDSTRINGARBPROC __glewNamedStringARB; - -GLEW_FUN_EXPORT PFNGLBUFFERPAGECOMMITMENTARBPROC __glewBufferPageCommitmentARB; - -GLEW_FUN_EXPORT PFNGLTEXPAGECOMMITMENTARBPROC __glewTexPageCommitmentARB; -GLEW_FUN_EXPORT PFNGLTEXTUREPAGECOMMITMENTEXTPROC __glewTexturePageCommitmentEXT; - -GLEW_FUN_EXPORT PFNGLCLIENTWAITSYNCPROC __glewClientWaitSync; -GLEW_FUN_EXPORT PFNGLDELETESYNCPROC __glewDeleteSync; -GLEW_FUN_EXPORT PFNGLFENCESYNCPROC __glewFenceSync; -GLEW_FUN_EXPORT PFNGLGETINTEGER64VPROC __glewGetInteger64v; -GLEW_FUN_EXPORT PFNGLGETSYNCIVPROC __glewGetSynciv; -GLEW_FUN_EXPORT PFNGLISSYNCPROC __glewIsSync; -GLEW_FUN_EXPORT PFNGLWAITSYNCPROC __glewWaitSync; - -GLEW_FUN_EXPORT PFNGLPATCHPARAMETERFVPROC __glewPatchParameterfv; -GLEW_FUN_EXPORT PFNGLPATCHPARAMETERIPROC __glewPatchParameteri; - -GLEW_FUN_EXPORT PFNGLTEXTUREBARRIERPROC __glewTextureBarrier; - -GLEW_FUN_EXPORT PFNGLTEXBUFFERARBPROC __glewTexBufferARB; - -GLEW_FUN_EXPORT PFNGLTEXBUFFERRANGEPROC __glewTexBufferRange; -GLEW_FUN_EXPORT PFNGLTEXTUREBUFFERRANGEEXTPROC __glewTextureBufferRangeEXT; - -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE1DARBPROC __glewCompressedTexImage1DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE2DARBPROC __glewCompressedTexImage2DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXIMAGE3DARBPROC __glewCompressedTexImage3DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __glewCompressedTexSubImage1DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __glewCompressedTexSubImage2DARB; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __glewCompressedTexSubImage3DARB; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXIMAGEARBPROC __glewGetCompressedTexImageARB; - -GLEW_FUN_EXPORT PFNGLGETMULTISAMPLEFVPROC __glewGetMultisamplefv; -GLEW_FUN_EXPORT PFNGLSAMPLEMASKIPROC __glewSampleMaski; -GLEW_FUN_EXPORT PFNGLTEXIMAGE2DMULTISAMPLEPROC __glewTexImage2DMultisample; -GLEW_FUN_EXPORT PFNGLTEXIMAGE3DMULTISAMPLEPROC __glewTexImage3DMultisample; - -GLEW_FUN_EXPORT PFNGLTEXSTORAGE1DPROC __glewTexStorage1D; -GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DPROC __glewTexStorage2D; -GLEW_FUN_EXPORT PFNGLTEXSTORAGE3DPROC __glewTexStorage3D; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE1DEXTPROC __glewTextureStorage1DEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DEXTPROC __glewTextureStorage2DEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DEXTPROC __glewTextureStorage3DEXT; - -GLEW_FUN_EXPORT PFNGLTEXSTORAGE2DMULTISAMPLEPROC __glewTexStorage2DMultisample; -GLEW_FUN_EXPORT PFNGLTEXSTORAGE3DMULTISAMPLEPROC __glewTexStorage3DMultisample; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC __glewTextureStorage2DMultisampleEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC __glewTextureStorage3DMultisampleEXT; - -GLEW_FUN_EXPORT PFNGLTEXTUREVIEWPROC __glewTextureView; - -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VPROC __glewGetQueryObjecti64v; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VPROC __glewGetQueryObjectui64v; -GLEW_FUN_EXPORT PFNGLQUERYCOUNTERPROC __glewQueryCounter; - -GLEW_FUN_EXPORT PFNGLBINDTRANSFORMFEEDBACKPROC __glewBindTransformFeedback; -GLEW_FUN_EXPORT PFNGLDELETETRANSFORMFEEDBACKSPROC __glewDeleteTransformFeedbacks; -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKPROC __glewDrawTransformFeedback; -GLEW_FUN_EXPORT PFNGLGENTRANSFORMFEEDBACKSPROC __glewGenTransformFeedbacks; -GLEW_FUN_EXPORT PFNGLISTRANSFORMFEEDBACKPROC __glewIsTransformFeedback; -GLEW_FUN_EXPORT PFNGLPAUSETRANSFORMFEEDBACKPROC __glewPauseTransformFeedback; -GLEW_FUN_EXPORT PFNGLRESUMETRANSFORMFEEDBACKPROC __glewResumeTransformFeedback; - -GLEW_FUN_EXPORT PFNGLBEGINQUERYINDEXEDPROC __glewBeginQueryIndexed; -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKSTREAMPROC __glewDrawTransformFeedbackStream; -GLEW_FUN_EXPORT PFNGLENDQUERYINDEXEDPROC __glewEndQueryIndexed; -GLEW_FUN_EXPORT PFNGLGETQUERYINDEXEDIVPROC __glewGetQueryIndexediv; - -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC __glewDrawTransformFeedbackInstanced; -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC __glewDrawTransformFeedbackStreamInstanced; - -GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXDARBPROC __glewLoadTransposeMatrixdARB; -GLEW_FUN_EXPORT PFNGLLOADTRANSPOSEMATRIXFARBPROC __glewLoadTransposeMatrixfARB; -GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXDARBPROC __glewMultTransposeMatrixdARB; -GLEW_FUN_EXPORT PFNGLMULTTRANSPOSEMATRIXFARBPROC __glewMultTransposeMatrixfARB; - -GLEW_FUN_EXPORT PFNGLBINDBUFFERBASEPROC __glewBindBufferBase; -GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGEPROC __glewBindBufferRange; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMBLOCKNAMEPROC __glewGetActiveUniformBlockName; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMBLOCKIVPROC __glewGetActiveUniformBlockiv; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMNAMEPROC __glewGetActiveUniformName; -GLEW_FUN_EXPORT PFNGLGETACTIVEUNIFORMSIVPROC __glewGetActiveUniformsiv; -GLEW_FUN_EXPORT PFNGLGETINTEGERI_VPROC __glewGetIntegeri_v; -GLEW_FUN_EXPORT PFNGLGETUNIFORMBLOCKINDEXPROC __glewGetUniformBlockIndex; -GLEW_FUN_EXPORT PFNGLGETUNIFORMINDICESPROC __glewGetUniformIndices; -GLEW_FUN_EXPORT PFNGLUNIFORMBLOCKBINDINGPROC __glewUniformBlockBinding; - -GLEW_FUN_EXPORT PFNGLBINDVERTEXARRAYPROC __glewBindVertexArray; -GLEW_FUN_EXPORT PFNGLDELETEVERTEXARRAYSPROC __glewDeleteVertexArrays; -GLEW_FUN_EXPORT PFNGLGENVERTEXARRAYSPROC __glewGenVertexArrays; -GLEW_FUN_EXPORT PFNGLISVERTEXARRAYPROC __glewIsVertexArray; - -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLDVPROC __glewGetVertexAttribLdv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DPROC __glewVertexAttribL1d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DVPROC __glewVertexAttribL1dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DPROC __glewVertexAttribL2d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DVPROC __glewVertexAttribL2dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DPROC __glewVertexAttribL3d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DVPROC __glewVertexAttribL3dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DPROC __glewVertexAttribL4d; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DVPROC __glewVertexAttribL4dv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLPOINTERPROC __glewVertexAttribLPointer; - -GLEW_FUN_EXPORT PFNGLBINDVERTEXBUFFERPROC __glewBindVertexBuffer; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC __glewVertexArrayBindVertexBufferEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC __glewVertexArrayVertexAttribBindingEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC __glewVertexArrayVertexAttribFormatEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC __glewVertexArrayVertexAttribIFormatEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC __glewVertexArrayVertexAttribLFormatEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC __glewVertexArrayVertexBindingDivisorEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBBINDINGPROC __glewVertexAttribBinding; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBFORMATPROC __glewVertexAttribFormat; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIFORMATPROC __glewVertexAttribIFormat; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLFORMATPROC __glewVertexAttribLFormat; -GLEW_FUN_EXPORT PFNGLVERTEXBINDINGDIVISORPROC __glewVertexBindingDivisor; - -GLEW_FUN_EXPORT PFNGLVERTEXBLENDARBPROC __glewVertexBlendARB; -GLEW_FUN_EXPORT PFNGLWEIGHTPOINTERARBPROC __glewWeightPointerARB; -GLEW_FUN_EXPORT PFNGLWEIGHTBVARBPROC __glewWeightbvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTDVARBPROC __glewWeightdvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTFVARBPROC __glewWeightfvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTIVARBPROC __glewWeightivARB; -GLEW_FUN_EXPORT PFNGLWEIGHTSVARBPROC __glewWeightsvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTUBVARBPROC __glewWeightubvARB; -GLEW_FUN_EXPORT PFNGLWEIGHTUIVARBPROC __glewWeightuivARB; -GLEW_FUN_EXPORT PFNGLWEIGHTUSVARBPROC __glewWeightusvARB; - -GLEW_FUN_EXPORT PFNGLBINDBUFFERARBPROC __glewBindBufferARB; -GLEW_FUN_EXPORT PFNGLBUFFERDATAARBPROC __glewBufferDataARB; -GLEW_FUN_EXPORT PFNGLBUFFERSUBDATAARBPROC __glewBufferSubDataARB; -GLEW_FUN_EXPORT PFNGLDELETEBUFFERSARBPROC __glewDeleteBuffersARB; -GLEW_FUN_EXPORT PFNGLGENBUFFERSARBPROC __glewGenBuffersARB; -GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERIVARBPROC __glewGetBufferParameterivARB; -GLEW_FUN_EXPORT PFNGLGETBUFFERPOINTERVARBPROC __glewGetBufferPointervARB; -GLEW_FUN_EXPORT PFNGLGETBUFFERSUBDATAARBPROC __glewGetBufferSubDataARB; -GLEW_FUN_EXPORT PFNGLISBUFFERARBPROC __glewIsBufferARB; -GLEW_FUN_EXPORT PFNGLMAPBUFFERARBPROC __glewMapBufferARB; -GLEW_FUN_EXPORT PFNGLUNMAPBUFFERARBPROC __glewUnmapBufferARB; - -GLEW_FUN_EXPORT PFNGLBINDPROGRAMARBPROC __glewBindProgramARB; -GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSARBPROC __glewDeleteProgramsARB; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXATTRIBARRAYARBPROC __glewDisableVertexAttribArrayARB; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXATTRIBARRAYARBPROC __glewEnableVertexAttribArrayARB; -GLEW_FUN_EXPORT PFNGLGENPROGRAMSARBPROC __glewGenProgramsARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERDVARBPROC __glewGetProgramEnvParameterdvARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMENVPARAMETERFVARBPROC __glewGetProgramEnvParameterfvARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC __glewGetProgramLocalParameterdvARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC __glewGetProgramLocalParameterfvARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGARBPROC __glewGetProgramStringARB; -GLEW_FUN_EXPORT PFNGLGETPROGRAMIVARBPROC __glewGetProgramivARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVARBPROC __glewGetVertexAttribPointervARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVARBPROC __glewGetVertexAttribdvARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVARBPROC __glewGetVertexAttribfvARB; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVARBPROC __glewGetVertexAttribivARB; -GLEW_FUN_EXPORT PFNGLISPROGRAMARBPROC __glewIsProgramARB; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DARBPROC __glewProgramEnvParameter4dARB; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4DVARBPROC __glewProgramEnvParameter4dvARB; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FARBPROC __glewProgramEnvParameter4fARB; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETER4FVARBPROC __glewProgramEnvParameter4fvARB; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DARBPROC __glewProgramLocalParameter4dARB; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4DVARBPROC __glewProgramLocalParameter4dvARB; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FARBPROC __glewProgramLocalParameter4fARB; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETER4FVARBPROC __glewProgramLocalParameter4fvARB; -GLEW_FUN_EXPORT PFNGLPROGRAMSTRINGARBPROC __glewProgramStringARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DARBPROC __glewVertexAttrib1dARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVARBPROC __glewVertexAttrib1dvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FARBPROC __glewVertexAttrib1fARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVARBPROC __glewVertexAttrib1fvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SARBPROC __glewVertexAttrib1sARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVARBPROC __glewVertexAttrib1svARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DARBPROC __glewVertexAttrib2dARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVARBPROC __glewVertexAttrib2dvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FARBPROC __glewVertexAttrib2fARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVARBPROC __glewVertexAttrib2fvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SARBPROC __glewVertexAttrib2sARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVARBPROC __glewVertexAttrib2svARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DARBPROC __glewVertexAttrib3dARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVARBPROC __glewVertexAttrib3dvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FARBPROC __glewVertexAttrib3fARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVARBPROC __glewVertexAttrib3fvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SARBPROC __glewVertexAttrib3sARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVARBPROC __glewVertexAttrib3svARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NBVARBPROC __glewVertexAttrib4NbvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NIVARBPROC __glewVertexAttrib4NivARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NSVARBPROC __glewVertexAttrib4NsvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBARBPROC __glewVertexAttrib4NubARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUBVARBPROC __glewVertexAttrib4NubvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUIVARBPROC __glewVertexAttrib4NuivARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4NUSVARBPROC __glewVertexAttrib4NusvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4BVARBPROC __glewVertexAttrib4bvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DARBPROC __glewVertexAttrib4dARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVARBPROC __glewVertexAttrib4dvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FARBPROC __glewVertexAttrib4fARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVARBPROC __glewVertexAttrib4fvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4IVARBPROC __glewVertexAttrib4ivARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SARBPROC __glewVertexAttrib4sARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVARBPROC __glewVertexAttrib4svARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVARBPROC __glewVertexAttrib4ubvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UIVARBPROC __glewVertexAttrib4uivARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4USVARBPROC __glewVertexAttrib4usvARB; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERARBPROC __glewVertexAttribPointerARB; - -GLEW_FUN_EXPORT PFNGLBINDATTRIBLOCATIONARBPROC __glewBindAttribLocationARB; -GLEW_FUN_EXPORT PFNGLGETACTIVEATTRIBARBPROC __glewGetActiveAttribARB; -GLEW_FUN_EXPORT PFNGLGETATTRIBLOCATIONARBPROC __glewGetAttribLocationARB; - -GLEW_FUN_EXPORT PFNGLCOLORP3UIPROC __glewColorP3ui; -GLEW_FUN_EXPORT PFNGLCOLORP3UIVPROC __glewColorP3uiv; -GLEW_FUN_EXPORT PFNGLCOLORP4UIPROC __glewColorP4ui; -GLEW_FUN_EXPORT PFNGLCOLORP4UIVPROC __glewColorP4uiv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP1UIPROC __glewMultiTexCoordP1ui; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP1UIVPROC __glewMultiTexCoordP1uiv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP2UIPROC __glewMultiTexCoordP2ui; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP2UIVPROC __glewMultiTexCoordP2uiv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP3UIPROC __glewMultiTexCoordP3ui; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP3UIVPROC __glewMultiTexCoordP3uiv; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP4UIPROC __glewMultiTexCoordP4ui; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDP4UIVPROC __glewMultiTexCoordP4uiv; -GLEW_FUN_EXPORT PFNGLNORMALP3UIPROC __glewNormalP3ui; -GLEW_FUN_EXPORT PFNGLNORMALP3UIVPROC __glewNormalP3uiv; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORP3UIPROC __glewSecondaryColorP3ui; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORP3UIVPROC __glewSecondaryColorP3uiv; -GLEW_FUN_EXPORT PFNGLTEXCOORDP1UIPROC __glewTexCoordP1ui; -GLEW_FUN_EXPORT PFNGLTEXCOORDP1UIVPROC __glewTexCoordP1uiv; -GLEW_FUN_EXPORT PFNGLTEXCOORDP2UIPROC __glewTexCoordP2ui; -GLEW_FUN_EXPORT PFNGLTEXCOORDP2UIVPROC __glewTexCoordP2uiv; -GLEW_FUN_EXPORT PFNGLTEXCOORDP3UIPROC __glewTexCoordP3ui; -GLEW_FUN_EXPORT PFNGLTEXCOORDP3UIVPROC __glewTexCoordP3uiv; -GLEW_FUN_EXPORT PFNGLTEXCOORDP4UIPROC __glewTexCoordP4ui; -GLEW_FUN_EXPORT PFNGLTEXCOORDP4UIVPROC __glewTexCoordP4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP1UIPROC __glewVertexAttribP1ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP1UIVPROC __glewVertexAttribP1uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP2UIPROC __glewVertexAttribP2ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP2UIVPROC __glewVertexAttribP2uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP3UIPROC __glewVertexAttribP3ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP3UIVPROC __glewVertexAttribP3uiv; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP4UIPROC __glewVertexAttribP4ui; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBP4UIVPROC __glewVertexAttribP4uiv; -GLEW_FUN_EXPORT PFNGLVERTEXP2UIPROC __glewVertexP2ui; -GLEW_FUN_EXPORT PFNGLVERTEXP2UIVPROC __glewVertexP2uiv; -GLEW_FUN_EXPORT PFNGLVERTEXP3UIPROC __glewVertexP3ui; -GLEW_FUN_EXPORT PFNGLVERTEXP3UIVPROC __glewVertexP3uiv; -GLEW_FUN_EXPORT PFNGLVERTEXP4UIPROC __glewVertexP4ui; -GLEW_FUN_EXPORT PFNGLVERTEXP4UIVPROC __glewVertexP4uiv; - -GLEW_FUN_EXPORT PFNGLDEPTHRANGEARRAYVPROC __glewDepthRangeArrayv; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEINDEXEDPROC __glewDepthRangeIndexed; -GLEW_FUN_EXPORT PFNGLGETDOUBLEI_VPROC __glewGetDoublei_v; -GLEW_FUN_EXPORT PFNGLGETFLOATI_VPROC __glewGetFloati_v; -GLEW_FUN_EXPORT PFNGLSCISSORARRAYVPROC __glewScissorArrayv; -GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDPROC __glewScissorIndexed; -GLEW_FUN_EXPORT PFNGLSCISSORINDEXEDVPROC __glewScissorIndexedv; -GLEW_FUN_EXPORT PFNGLVIEWPORTARRAYVPROC __glewViewportArrayv; -GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFPROC __glewViewportIndexedf; -GLEW_FUN_EXPORT PFNGLVIEWPORTINDEXEDFVPROC __glewViewportIndexedfv; - -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DARBPROC __glewWindowPos2dARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVARBPROC __glewWindowPos2dvARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FARBPROC __glewWindowPos2fARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVARBPROC __glewWindowPos2fvARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IARBPROC __glewWindowPos2iARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVARBPROC __glewWindowPos2ivARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SARBPROC __glewWindowPos2sARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVARBPROC __glewWindowPos2svARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DARBPROC __glewWindowPos3dARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVARBPROC __glewWindowPos3dvARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FARBPROC __glewWindowPos3fARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVARBPROC __glewWindowPos3fvARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IARBPROC __glewWindowPos3iARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVARBPROC __glewWindowPos3ivARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SARBPROC __glewWindowPos3sARB; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVARBPROC __glewWindowPos3svARB; - -GLEW_FUN_EXPORT PFNGLDRAWBUFFERSATIPROC __glewDrawBuffersATI; - -GLEW_FUN_EXPORT PFNGLDRAWELEMENTARRAYATIPROC __glewDrawElementArrayATI; -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTARRAYATIPROC __glewDrawRangeElementArrayATI; -GLEW_FUN_EXPORT PFNGLELEMENTPOINTERATIPROC __glewElementPointerATI; - -GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERFVATIPROC __glewGetTexBumpParameterfvATI; -GLEW_FUN_EXPORT PFNGLGETTEXBUMPPARAMETERIVATIPROC __glewGetTexBumpParameterivATI; -GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERFVATIPROC __glewTexBumpParameterfvATI; -GLEW_FUN_EXPORT PFNGLTEXBUMPPARAMETERIVATIPROC __glewTexBumpParameterivATI; - -GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP1ATIPROC __glewAlphaFragmentOp1ATI; -GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP2ATIPROC __glewAlphaFragmentOp2ATI; -GLEW_FUN_EXPORT PFNGLALPHAFRAGMENTOP3ATIPROC __glewAlphaFragmentOp3ATI; -GLEW_FUN_EXPORT PFNGLBEGINFRAGMENTSHADERATIPROC __glewBeginFragmentShaderATI; -GLEW_FUN_EXPORT PFNGLBINDFRAGMENTSHADERATIPROC __glewBindFragmentShaderATI; -GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP1ATIPROC __glewColorFragmentOp1ATI; -GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP2ATIPROC __glewColorFragmentOp2ATI; -GLEW_FUN_EXPORT PFNGLCOLORFRAGMENTOP3ATIPROC __glewColorFragmentOp3ATI; -GLEW_FUN_EXPORT PFNGLDELETEFRAGMENTSHADERATIPROC __glewDeleteFragmentShaderATI; -GLEW_FUN_EXPORT PFNGLENDFRAGMENTSHADERATIPROC __glewEndFragmentShaderATI; -GLEW_FUN_EXPORT PFNGLGENFRAGMENTSHADERSATIPROC __glewGenFragmentShadersATI; -GLEW_FUN_EXPORT PFNGLPASSTEXCOORDATIPROC __glewPassTexCoordATI; -GLEW_FUN_EXPORT PFNGLSAMPLEMAPATIPROC __glewSampleMapATI; -GLEW_FUN_EXPORT PFNGLSETFRAGMENTSHADERCONSTANTATIPROC __glewSetFragmentShaderConstantATI; - -GLEW_FUN_EXPORT PFNGLMAPOBJECTBUFFERATIPROC __glewMapObjectBufferATI; -GLEW_FUN_EXPORT PFNGLUNMAPOBJECTBUFFERATIPROC __glewUnmapObjectBufferATI; - -GLEW_FUN_EXPORT PFNGLPNTRIANGLESFATIPROC __glewPNTrianglesfATI; -GLEW_FUN_EXPORT PFNGLPNTRIANGLESIATIPROC __glewPNTrianglesiATI; - -GLEW_FUN_EXPORT PFNGLSTENCILFUNCSEPARATEATIPROC __glewStencilFuncSeparateATI; -GLEW_FUN_EXPORT PFNGLSTENCILOPSEPARATEATIPROC __glewStencilOpSeparateATI; - -GLEW_FUN_EXPORT PFNGLARRAYOBJECTATIPROC __glewArrayObjectATI; -GLEW_FUN_EXPORT PFNGLFREEOBJECTBUFFERATIPROC __glewFreeObjectBufferATI; -GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTFVATIPROC __glewGetArrayObjectfvATI; -GLEW_FUN_EXPORT PFNGLGETARRAYOBJECTIVATIPROC __glewGetArrayObjectivATI; -GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERFVATIPROC __glewGetObjectBufferfvATI; -GLEW_FUN_EXPORT PFNGLGETOBJECTBUFFERIVATIPROC __glewGetObjectBufferivATI; -GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTFVATIPROC __glewGetVariantArrayObjectfvATI; -GLEW_FUN_EXPORT PFNGLGETVARIANTARRAYOBJECTIVATIPROC __glewGetVariantArrayObjectivATI; -GLEW_FUN_EXPORT PFNGLISOBJECTBUFFERATIPROC __glewIsObjectBufferATI; -GLEW_FUN_EXPORT PFNGLNEWOBJECTBUFFERATIPROC __glewNewObjectBufferATI; -GLEW_FUN_EXPORT PFNGLUPDATEOBJECTBUFFERATIPROC __glewUpdateObjectBufferATI; -GLEW_FUN_EXPORT PFNGLVARIANTARRAYOBJECTATIPROC __glewVariantArrayObjectATI; - -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC __glewGetVertexAttribArrayObjectfvATI; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC __glewGetVertexAttribArrayObjectivATI; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBARRAYOBJECTATIPROC __glewVertexAttribArrayObjectATI; - -GLEW_FUN_EXPORT PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC __glewClientActiveVertexStreamATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BATIPROC __glewNormalStream3bATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3BVATIPROC __glewNormalStream3bvATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DATIPROC __glewNormalStream3dATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3DVATIPROC __glewNormalStream3dvATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FATIPROC __glewNormalStream3fATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3FVATIPROC __glewNormalStream3fvATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IATIPROC __glewNormalStream3iATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3IVATIPROC __glewNormalStream3ivATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SATIPROC __glewNormalStream3sATI; -GLEW_FUN_EXPORT PFNGLNORMALSTREAM3SVATIPROC __glewNormalStream3svATI; -GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVFATIPROC __glewVertexBlendEnvfATI; -GLEW_FUN_EXPORT PFNGLVERTEXBLENDENVIATIPROC __glewVertexBlendEnviATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1DATIPROC __glewVertexStream1dATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1DVATIPROC __glewVertexStream1dvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1FATIPROC __glewVertexStream1fATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1FVATIPROC __glewVertexStream1fvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1IATIPROC __glewVertexStream1iATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1IVATIPROC __glewVertexStream1ivATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1SATIPROC __glewVertexStream1sATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM1SVATIPROC __glewVertexStream1svATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DATIPROC __glewVertexStream2dATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2DVATIPROC __glewVertexStream2dvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FATIPROC __glewVertexStream2fATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2FVATIPROC __glewVertexStream2fvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IATIPROC __glewVertexStream2iATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2IVATIPROC __glewVertexStream2ivATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SATIPROC __glewVertexStream2sATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM2SVATIPROC __glewVertexStream2svATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DATIPROC __glewVertexStream3dATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3DVATIPROC __glewVertexStream3dvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FATIPROC __glewVertexStream3fATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3FVATIPROC __glewVertexStream3fvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IATIPROC __glewVertexStream3iATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3IVATIPROC __glewVertexStream3ivATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SATIPROC __glewVertexStream3sATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM3SVATIPROC __glewVertexStream3svATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DATIPROC __glewVertexStream4dATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4DVATIPROC __glewVertexStream4dvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FATIPROC __glewVertexStream4fATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4FVATIPROC __glewVertexStream4fvATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IATIPROC __glewVertexStream4iATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4IVATIPROC __glewVertexStream4ivATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SATIPROC __glewVertexStream4sATI; -GLEW_FUN_EXPORT PFNGLVERTEXSTREAM4SVATIPROC __glewVertexStream4svATI; - -GLEW_FUN_EXPORT PFNGLGETUNIFORMBUFFERSIZEEXTPROC __glewGetUniformBufferSizeEXT; -GLEW_FUN_EXPORT PFNGLGETUNIFORMOFFSETEXTPROC __glewGetUniformOffsetEXT; -GLEW_FUN_EXPORT PFNGLUNIFORMBUFFEREXTPROC __glewUniformBufferEXT; - -GLEW_FUN_EXPORT PFNGLBLENDCOLOREXTPROC __glewBlendColorEXT; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONSEPARATEEXTPROC __glewBlendEquationSeparateEXT; - -GLEW_FUN_EXPORT PFNGLBLENDFUNCSEPARATEEXTPROC __glewBlendFuncSeparateEXT; - -GLEW_FUN_EXPORT PFNGLBLENDEQUATIONEXTPROC __glewBlendEquationEXT; - -GLEW_FUN_EXPORT PFNGLCOLORSUBTABLEEXTPROC __glewColorSubTableEXT; -GLEW_FUN_EXPORT PFNGLCOPYCOLORSUBTABLEEXTPROC __glewCopyColorSubTableEXT; - -GLEW_FUN_EXPORT PFNGLLOCKARRAYSEXTPROC __glewLockArraysEXT; -GLEW_FUN_EXPORT PFNGLUNLOCKARRAYSEXTPROC __glewUnlockArraysEXT; - -GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER1DEXTPROC __glewConvolutionFilter1DEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONFILTER2DEXTPROC __glewConvolutionFilter2DEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFEXTPROC __glewConvolutionParameterfEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERFVEXTPROC __glewConvolutionParameterfvEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIEXTPROC __glewConvolutionParameteriEXT; -GLEW_FUN_EXPORT PFNGLCONVOLUTIONPARAMETERIVEXTPROC __glewConvolutionParameterivEXT; -GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC __glewCopyConvolutionFilter1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC __glewCopyConvolutionFilter2DEXT; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONFILTEREXTPROC __glewGetConvolutionFilterEXT; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC __glewGetConvolutionParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC __glewGetConvolutionParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETSEPARABLEFILTEREXTPROC __glewGetSeparableFilterEXT; -GLEW_FUN_EXPORT PFNGLSEPARABLEFILTER2DEXTPROC __glewSeparableFilter2DEXT; - -GLEW_FUN_EXPORT PFNGLBINORMALPOINTEREXTPROC __glewBinormalPointerEXT; -GLEW_FUN_EXPORT PFNGLTANGENTPOINTEREXTPROC __glewTangentPointerEXT; - -GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE1DEXTPROC __glewCopyTexImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXIMAGE2DEXTPROC __glewCopyTexImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE1DEXTPROC __glewCopyTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE2DEXTPROC __glewCopyTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXSUBIMAGE3DEXTPROC __glewCopyTexSubImage3DEXT; - -GLEW_FUN_EXPORT PFNGLCULLPARAMETERDVEXTPROC __glewCullParameterdvEXT; -GLEW_FUN_EXPORT PFNGLCULLPARAMETERFVEXTPROC __glewCullParameterfvEXT; - -GLEW_FUN_EXPORT PFNGLGETOBJECTLABELEXTPROC __glewGetObjectLabelEXT; -GLEW_FUN_EXPORT PFNGLLABELOBJECTEXTPROC __glewLabelObjectEXT; - -GLEW_FUN_EXPORT PFNGLINSERTEVENTMARKEREXTPROC __glewInsertEventMarkerEXT; -GLEW_FUN_EXPORT PFNGLPOPGROUPMARKEREXTPROC __glewPopGroupMarkerEXT; -GLEW_FUN_EXPORT PFNGLPUSHGROUPMARKEREXTPROC __glewPushGroupMarkerEXT; - -GLEW_FUN_EXPORT PFNGLDEPTHBOUNDSEXTPROC __glewDepthBoundsEXT; - -GLEW_FUN_EXPORT PFNGLBINDMULTITEXTUREEXTPROC __glewBindMultiTextureEXT; -GLEW_FUN_EXPORT PFNGLCHECKNAMEDFRAMEBUFFERSTATUSEXTPROC __glewCheckNamedFramebufferStatusEXT; -GLEW_FUN_EXPORT PFNGLCLIENTATTRIBDEFAULTEXTPROC __glewClientAttribDefaultEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE1DEXTPROC __glewCompressedMultiTexImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE2DEXTPROC __glewCompressedMultiTexImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXIMAGE3DEXTPROC __glewCompressedMultiTexImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE1DEXTPROC __glewCompressedMultiTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE2DEXTPROC __glewCompressedMultiTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDMULTITEXSUBIMAGE3DEXTPROC __glewCompressedMultiTexSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE1DEXTPROC __glewCompressedTextureImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE2DEXTPROC __glewCompressedTextureImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTUREIMAGE3DEXTPROC __glewCompressedTextureImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE1DEXTPROC __glewCompressedTextureSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE2DEXTPROC __glewCompressedTextureSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOMPRESSEDTEXTURESUBIMAGE3DEXTPROC __glewCompressedTextureSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXIMAGE1DEXTPROC __glewCopyMultiTexImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXIMAGE2DEXTPROC __glewCopyMultiTexImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE1DEXTPROC __glewCopyMultiTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE2DEXTPROC __glewCopyMultiTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYMULTITEXSUBIMAGE3DEXTPROC __glewCopyMultiTexSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTUREIMAGE1DEXTPROC __glewCopyTextureImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTUREIMAGE2DEXTPROC __glewCopyTextureImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE1DEXTPROC __glewCopyTextureSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE2DEXTPROC __glewCopyTextureSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLCOPYTEXTURESUBIMAGE3DEXTPROC __glewCopyTextureSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLDISABLECLIENTSTATEINDEXEDEXTPROC __glewDisableClientStateIndexedEXT; -GLEW_FUN_EXPORT PFNGLDISABLECLIENTSTATEIEXTPROC __glewDisableClientStateiEXT; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYATTRIBEXTPROC __glewDisableVertexArrayAttribEXT; -GLEW_FUN_EXPORT PFNGLDISABLEVERTEXARRAYEXTPROC __glewDisableVertexArrayEXT; -GLEW_FUN_EXPORT PFNGLENABLECLIENTSTATEINDEXEDEXTPROC __glewEnableClientStateIndexedEXT; -GLEW_FUN_EXPORT PFNGLENABLECLIENTSTATEIEXTPROC __glewEnableClientStateiEXT; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYATTRIBEXTPROC __glewEnableVertexArrayAttribEXT; -GLEW_FUN_EXPORT PFNGLENABLEVERTEXARRAYEXTPROC __glewEnableVertexArrayEXT; -GLEW_FUN_EXPORT PFNGLFLUSHMAPPEDNAMEDBUFFERRANGEEXTPROC __glewFlushMappedNamedBufferRangeEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERDRAWBUFFEREXTPROC __glewFramebufferDrawBufferEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERDRAWBUFFERSEXTPROC __glewFramebufferDrawBuffersEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERREADBUFFEREXTPROC __glewFramebufferReadBufferEXT; -GLEW_FUN_EXPORT PFNGLGENERATEMULTITEXMIPMAPEXTPROC __glewGenerateMultiTexMipmapEXT; -GLEW_FUN_EXPORT PFNGLGENERATETEXTUREMIPMAPEXTPROC __glewGenerateTextureMipmapEXT; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDMULTITEXIMAGEEXTPROC __glewGetCompressedMultiTexImageEXT; -GLEW_FUN_EXPORT PFNGLGETCOMPRESSEDTEXTUREIMAGEEXTPROC __glewGetCompressedTextureImageEXT; -GLEW_FUN_EXPORT PFNGLGETDOUBLEINDEXEDVEXTPROC __glewGetDoubleIndexedvEXT; -GLEW_FUN_EXPORT PFNGLGETDOUBLEI_VEXTPROC __glewGetDoublei_vEXT; -GLEW_FUN_EXPORT PFNGLGETFLOATINDEXEDVEXTPROC __glewGetFloatIndexedvEXT; -GLEW_FUN_EXPORT PFNGLGETFLOATI_VEXTPROC __glewGetFloati_vEXT; -GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERPARAMETERIVEXTPROC __glewGetFramebufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXENVFVEXTPROC __glewGetMultiTexEnvfvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXENVIVEXTPROC __glewGetMultiTexEnvivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXGENDVEXTPROC __glewGetMultiTexGendvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXGENFVEXTPROC __glewGetMultiTexGenfvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXGENIVEXTPROC __glewGetMultiTexGenivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXIMAGEEXTPROC __glewGetMultiTexImageEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXLEVELPARAMETERFVEXTPROC __glewGetMultiTexLevelParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXLEVELPARAMETERIVEXTPROC __glewGetMultiTexLevelParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIIVEXTPROC __glewGetMultiTexParameterIivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIUIVEXTPROC __glewGetMultiTexParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERFVEXTPROC __glewGetMultiTexParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETMULTITEXPARAMETERIVEXTPROC __glewGetMultiTexParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERIVEXTPROC __glewGetNamedBufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPOINTERVEXTPROC __glewGetNamedBufferPointervEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERSUBDATAEXTPROC __glewGetNamedBufferSubDataEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetNamedFramebufferAttachmentParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERIIVEXTPROC __glewGetNamedProgramLocalParameterIivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERIUIVEXTPROC __glewGetNamedProgramLocalParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERDVEXTPROC __glewGetNamedProgramLocalParameterdvEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMLOCALPARAMETERFVEXTPROC __glewGetNamedProgramLocalParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMSTRINGEXTPROC __glewGetNamedProgramStringEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDPROGRAMIVEXTPROC __glewGetNamedProgramivEXT; -GLEW_FUN_EXPORT PFNGLGETNAMEDRENDERBUFFERPARAMETERIVEXTPROC __glewGetNamedRenderbufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETPOINTERINDEXEDVEXTPROC __glewGetPointerIndexedvEXT; -GLEW_FUN_EXPORT PFNGLGETPOINTERI_VEXTPROC __glewGetPointeri_vEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREIMAGEEXTPROC __glewGetTextureImageEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERFVEXTPROC __glewGetTextureLevelParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTURELEVELPARAMETERIVEXTPROC __glewGetTextureLevelParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIIVEXTPROC __glewGetTextureParameterIivEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIUIVEXTPROC __glewGetTextureParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERFVEXTPROC __glewGetTextureParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETTEXTUREPARAMETERIVEXTPROC __glewGetTextureParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINTEGERI_VEXTPROC __glewGetVertexArrayIntegeri_vEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYINTEGERVEXTPROC __glewGetVertexArrayIntegervEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYPOINTERI_VEXTPROC __glewGetVertexArrayPointeri_vEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXARRAYPOINTERVEXTPROC __glewGetVertexArrayPointervEXT; -GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFEREXTPROC __glewMapNamedBufferEXT; -GLEW_FUN_EXPORT PFNGLMAPNAMEDBUFFERRANGEEXTPROC __glewMapNamedBufferRangeEXT; -GLEW_FUN_EXPORT PFNGLMATRIXFRUSTUMEXTPROC __glewMatrixFrustumEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADIDENTITYEXTPROC __glewMatrixLoadIdentityEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSEDEXTPROC __glewMatrixLoadTransposedEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSEFEXTPROC __glewMatrixLoadTransposefEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADDEXTPROC __glewMatrixLoaddEXT; -GLEW_FUN_EXPORT PFNGLMATRIXLOADFEXTPROC __glewMatrixLoadfEXT; -GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSEDEXTPROC __glewMatrixMultTransposedEXT; -GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSEFEXTPROC __glewMatrixMultTransposefEXT; -GLEW_FUN_EXPORT PFNGLMATRIXMULTDEXTPROC __glewMatrixMultdEXT; -GLEW_FUN_EXPORT PFNGLMATRIXMULTFEXTPROC __glewMatrixMultfEXT; -GLEW_FUN_EXPORT PFNGLMATRIXORTHOEXTPROC __glewMatrixOrthoEXT; -GLEW_FUN_EXPORT PFNGLMATRIXPOPEXTPROC __glewMatrixPopEXT; -GLEW_FUN_EXPORT PFNGLMATRIXPUSHEXTPROC __glewMatrixPushEXT; -GLEW_FUN_EXPORT PFNGLMATRIXROTATEDEXTPROC __glewMatrixRotatedEXT; -GLEW_FUN_EXPORT PFNGLMATRIXROTATEFEXTPROC __glewMatrixRotatefEXT; -GLEW_FUN_EXPORT PFNGLMATRIXSCALEDEXTPROC __glewMatrixScaledEXT; -GLEW_FUN_EXPORT PFNGLMATRIXSCALEFEXTPROC __glewMatrixScalefEXT; -GLEW_FUN_EXPORT PFNGLMATRIXTRANSLATEDEXTPROC __glewMatrixTranslatedEXT; -GLEW_FUN_EXPORT PFNGLMATRIXTRANSLATEFEXTPROC __glewMatrixTranslatefEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXBUFFEREXTPROC __glewMultiTexBufferEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORDPOINTEREXTPROC __glewMultiTexCoordPointerEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXENVFEXTPROC __glewMultiTexEnvfEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXENVFVEXTPROC __glewMultiTexEnvfvEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXENVIEXTPROC __glewMultiTexEnviEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXENVIVEXTPROC __glewMultiTexEnvivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENDEXTPROC __glewMultiTexGendEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENDVEXTPROC __glewMultiTexGendvEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENFEXTPROC __glewMultiTexGenfEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENFVEXTPROC __glewMultiTexGenfvEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENIEXTPROC __glewMultiTexGeniEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXGENIVEXTPROC __glewMultiTexGenivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE1DEXTPROC __glewMultiTexImage1DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE2DEXTPROC __glewMultiTexImage2DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXIMAGE3DEXTPROC __glewMultiTexImage3DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIIVEXTPROC __glewMultiTexParameterIivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIUIVEXTPROC __glewMultiTexParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERFEXTPROC __glewMultiTexParameterfEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERFVEXTPROC __glewMultiTexParameterfvEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIEXTPROC __glewMultiTexParameteriEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXPARAMETERIVEXTPROC __glewMultiTexParameterivEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXRENDERBUFFEREXTPROC __glewMultiTexRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE1DEXTPROC __glewMultiTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE2DEXTPROC __glewMultiTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLMULTITEXSUBIMAGE3DEXTPROC __glewMultiTexSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERDATAEXTPROC __glewNamedBufferDataEXT; -GLEW_FUN_EXPORT PFNGLNAMEDBUFFERSUBDATAEXTPROC __glewNamedBufferSubDataEXT; -GLEW_FUN_EXPORT PFNGLNAMEDCOPYBUFFERSUBDATAEXTPROC __glewNamedCopyBufferSubDataEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERRENDERBUFFEREXTPROC __glewNamedFramebufferRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE1DEXTPROC __glewNamedFramebufferTexture1DEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE2DEXTPROC __glewNamedFramebufferTexture2DEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURE3DEXTPROC __glewNamedFramebufferTexture3DEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREEXTPROC __glewNamedFramebufferTextureEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTUREFACEEXTPROC __glewNamedFramebufferTextureFaceEXT; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERTEXTURELAYEREXTPROC __glewNamedFramebufferTextureLayerEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4DEXTPROC __glewNamedProgramLocalParameter4dEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4DVEXTPROC __glewNamedProgramLocalParameter4dvEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4FEXTPROC __glewNamedProgramLocalParameter4fEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETER4FVEXTPROC __glewNamedProgramLocalParameter4fvEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4IEXTPROC __glewNamedProgramLocalParameterI4iEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4IVEXTPROC __glewNamedProgramLocalParameterI4ivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIEXTPROC __glewNamedProgramLocalParameterI4uiEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERI4UIVEXTPROC __glewNamedProgramLocalParameterI4uivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERS4FVEXTPROC __glewNamedProgramLocalParameters4fvEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERSI4IVEXTPROC __glewNamedProgramLocalParametersI4ivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMLOCALPARAMETERSI4UIVEXTPROC __glewNamedProgramLocalParametersI4uivEXT; -GLEW_FUN_EXPORT PFNGLNAMEDPROGRAMSTRINGEXTPROC __glewNamedProgramStringEXT; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEEXTPROC __glewNamedRenderbufferStorageEXT; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLECOVERAGEEXTPROC __glewNamedRenderbufferStorageMultisampleCoverageEXT; -GLEW_FUN_EXPORT PFNGLNAMEDRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewNamedRenderbufferStorageMultisampleEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FEXTPROC __glewProgramUniform1fEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1FVEXTPROC __glewProgramUniform1fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IEXTPROC __glewProgramUniform1iEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1IVEXTPROC __glewProgramUniform1ivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIEXTPROC __glewProgramUniform1uiEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UIVEXTPROC __glewProgramUniform1uivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FEXTPROC __glewProgramUniform2fEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2FVEXTPROC __glewProgramUniform2fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IEXTPROC __glewProgramUniform2iEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2IVEXTPROC __glewProgramUniform2ivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIEXTPROC __glewProgramUniform2uiEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UIVEXTPROC __glewProgramUniform2uivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FEXTPROC __glewProgramUniform3fEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3FVEXTPROC __glewProgramUniform3fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IEXTPROC __glewProgramUniform3iEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3IVEXTPROC __glewProgramUniform3ivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIEXTPROC __glewProgramUniform3uiEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UIVEXTPROC __glewProgramUniform3uivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FEXTPROC __glewProgramUniform4fEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4FVEXTPROC __glewProgramUniform4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IEXTPROC __glewProgramUniform4iEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4IVEXTPROC __glewProgramUniform4ivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIEXTPROC __glewProgramUniform4uiEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UIVEXTPROC __glewProgramUniform4uivEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2FVEXTPROC __glewProgramUniformMatrix2fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __glewProgramUniformMatrix2x3fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __glewProgramUniformMatrix2x4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3FVEXTPROC __glewProgramUniformMatrix3fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __glewProgramUniformMatrix3x2fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __glewProgramUniformMatrix3x4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4FVEXTPROC __glewProgramUniformMatrix4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __glewProgramUniformMatrix4x2fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __glewProgramUniformMatrix4x3fvEXT; -GLEW_FUN_EXPORT PFNGLPUSHCLIENTATTRIBDEFAULTEXTPROC __glewPushClientAttribDefaultEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREBUFFEREXTPROC __glewTextureBufferEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE1DEXTPROC __glewTextureImage1DEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DEXTPROC __glewTextureImage2DEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DEXTPROC __glewTextureImage3DEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIIVEXTPROC __glewTextureParameterIivEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIUIVEXTPROC __glewTextureParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFEXTPROC __glewTextureParameterfEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERFVEXTPROC __glewTextureParameterfvEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIEXTPROC __glewTextureParameteriEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREPARAMETERIVEXTPROC __glewTextureParameterivEXT; -GLEW_FUN_EXPORT PFNGLTEXTURERENDERBUFFEREXTPROC __glewTextureRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE1DEXTPROC __glewTextureSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE2DEXTPROC __glewTextureSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLTEXTURESUBIMAGE3DEXTPROC __glewTextureSubImage3DEXT; -GLEW_FUN_EXPORT PFNGLUNMAPNAMEDBUFFEREXTPROC __glewUnmapNamedBufferEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYCOLOROFFSETEXTPROC __glewVertexArrayColorOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYEDGEFLAGOFFSETEXTPROC __glewVertexArrayEdgeFlagOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYFOGCOORDOFFSETEXTPROC __glewVertexArrayFogCoordOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYINDEXOFFSETEXTPROC __glewVertexArrayIndexOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYMULTITEXCOORDOFFSETEXTPROC __glewVertexArrayMultiTexCoordOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYNORMALOFFSETEXTPROC __glewVertexArrayNormalOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYSECONDARYCOLOROFFSETEXTPROC __glewVertexArraySecondaryColorOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYTEXCOORDOFFSETEXTPROC __glewVertexArrayTexCoordOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBDIVISOREXTPROC __glewVertexArrayVertexAttribDivisorEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBIOFFSETEXTPROC __glewVertexArrayVertexAttribIOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBOFFSETEXTPROC __glewVertexArrayVertexAttribOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXOFFSETEXTPROC __glewVertexArrayVertexOffsetEXT; - -GLEW_FUN_EXPORT PFNGLCOLORMASKINDEXEDEXTPROC __glewColorMaskIndexedEXT; -GLEW_FUN_EXPORT PFNGLDISABLEINDEXEDEXTPROC __glewDisableIndexedEXT; -GLEW_FUN_EXPORT PFNGLENABLEINDEXEDEXTPROC __glewEnableIndexedEXT; -GLEW_FUN_EXPORT PFNGLGETBOOLEANINDEXEDVEXTPROC __glewGetBooleanIndexedvEXT; -GLEW_FUN_EXPORT PFNGLGETINTEGERINDEXEDVEXTPROC __glewGetIntegerIndexedvEXT; -GLEW_FUN_EXPORT PFNGLISENABLEDINDEXEDEXTPROC __glewIsEnabledIndexedEXT; - -GLEW_FUN_EXPORT PFNGLDRAWARRAYSINSTANCEDEXTPROC __glewDrawArraysInstancedEXT; -GLEW_FUN_EXPORT PFNGLDRAWELEMENTSINSTANCEDEXTPROC __glewDrawElementsInstancedEXT; - -GLEW_FUN_EXPORT PFNGLDRAWRANGEELEMENTSEXTPROC __glewDrawRangeElementsEXT; - -GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTEREXTPROC __glewFogCoordPointerEXT; -GLEW_FUN_EXPORT PFNGLFOGCOORDDEXTPROC __glewFogCoorddEXT; -GLEW_FUN_EXPORT PFNGLFOGCOORDDVEXTPROC __glewFogCoorddvEXT; -GLEW_FUN_EXPORT PFNGLFOGCOORDFEXTPROC __glewFogCoordfEXT; -GLEW_FUN_EXPORT PFNGLFOGCOORDFVEXTPROC __glewFogCoordfvEXT; - -GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALEXTPROC __glewFragmentColorMaterialEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFEXTPROC __glewFragmentLightModelfEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVEXTPROC __glewFragmentLightModelfvEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIEXTPROC __glewFragmentLightModeliEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVEXTPROC __glewFragmentLightModelivEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFEXTPROC __glewFragmentLightfEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVEXTPROC __glewFragmentLightfvEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIEXTPROC __glewFragmentLightiEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVEXTPROC __glewFragmentLightivEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFEXTPROC __glewFragmentMaterialfEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVEXTPROC __glewFragmentMaterialfvEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIEXTPROC __glewFragmentMaterialiEXT; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVEXTPROC __glewFragmentMaterialivEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVEXTPROC __glewGetFragmentLightfvEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVEXTPROC __glewGetFragmentLightivEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVEXTPROC __glewGetFragmentMaterialfvEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVEXTPROC __glewGetFragmentMaterialivEXT; -GLEW_FUN_EXPORT PFNGLLIGHTENVIEXTPROC __glewLightEnviEXT; - -GLEW_FUN_EXPORT PFNGLBLITFRAMEBUFFEREXTPROC __glewBlitFramebufferEXT; - -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __glewRenderbufferStorageMultisampleEXT; - -GLEW_FUN_EXPORT PFNGLBINDFRAMEBUFFEREXTPROC __glewBindFramebufferEXT; -GLEW_FUN_EXPORT PFNGLBINDRENDERBUFFEREXTPROC __glewBindRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC __glewCheckFramebufferStatusEXT; -GLEW_FUN_EXPORT PFNGLDELETEFRAMEBUFFERSEXTPROC __glewDeleteFramebuffersEXT; -GLEW_FUN_EXPORT PFNGLDELETERENDERBUFFERSEXTPROC __glewDeleteRenderbuffersEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC __glewFramebufferRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE1DEXTPROC __glewFramebufferTexture1DEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE2DEXTPROC __glewFramebufferTexture2DEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURE3DEXTPROC __glewFramebufferTexture3DEXT; -GLEW_FUN_EXPORT PFNGLGENFRAMEBUFFERSEXTPROC __glewGenFramebuffersEXT; -GLEW_FUN_EXPORT PFNGLGENRENDERBUFFERSEXTPROC __glewGenRenderbuffersEXT; -GLEW_FUN_EXPORT PFNGLGENERATEMIPMAPEXTPROC __glewGenerateMipmapEXT; -GLEW_FUN_EXPORT PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC __glewGetFramebufferAttachmentParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC __glewGetRenderbufferParameterivEXT; -GLEW_FUN_EXPORT PFNGLISFRAMEBUFFEREXTPROC __glewIsFramebufferEXT; -GLEW_FUN_EXPORT PFNGLISRENDERBUFFEREXTPROC __glewIsRenderbufferEXT; -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEEXTPROC __glewRenderbufferStorageEXT; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREEXTPROC __glewFramebufferTextureEXT; -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC __glewFramebufferTextureFaceEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERIEXTPROC __glewProgramParameteriEXT; - -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERS4FVEXTPROC __glewProgramEnvParameters4fvEXT; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC __glewProgramLocalParameters4fvEXT; - -GLEW_FUN_EXPORT PFNGLBINDFRAGDATALOCATIONEXTPROC __glewBindFragDataLocationEXT; -GLEW_FUN_EXPORT PFNGLGETFRAGDATALOCATIONEXTPROC __glewGetFragDataLocationEXT; -GLEW_FUN_EXPORT PFNGLGETUNIFORMUIVEXTPROC __glewGetUniformuivEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIIVEXTPROC __glewGetVertexAttribIivEXT; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIUIVEXTPROC __glewGetVertexAttribIuivEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM1UIEXTPROC __glewUniform1uiEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM1UIVEXTPROC __glewUniform1uivEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM2UIEXTPROC __glewUniform2uiEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM2UIVEXTPROC __glewUniform2uivEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM3UIEXTPROC __glewUniform3uiEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM3UIVEXTPROC __glewUniform3uivEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM4UIEXTPROC __glewUniform4uiEXT; -GLEW_FUN_EXPORT PFNGLUNIFORM4UIVEXTPROC __glewUniform4uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IEXTPROC __glewVertexAttribI1iEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1IVEXTPROC __glewVertexAttribI1ivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIEXTPROC __glewVertexAttribI1uiEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI1UIVEXTPROC __glewVertexAttribI1uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IEXTPROC __glewVertexAttribI2iEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2IVEXTPROC __glewVertexAttribI2ivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIEXTPROC __glewVertexAttribI2uiEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI2UIVEXTPROC __glewVertexAttribI2uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IEXTPROC __glewVertexAttribI3iEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3IVEXTPROC __glewVertexAttribI3ivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIEXTPROC __glewVertexAttribI3uiEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI3UIVEXTPROC __glewVertexAttribI3uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4BVEXTPROC __glewVertexAttribI4bvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IEXTPROC __glewVertexAttribI4iEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4IVEXTPROC __glewVertexAttribI4ivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4SVEXTPROC __glewVertexAttribI4svEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UBVEXTPROC __glewVertexAttribI4ubvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIEXTPROC __glewVertexAttribI4uiEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4UIVEXTPROC __glewVertexAttribI4uivEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBI4USVEXTPROC __glewVertexAttribI4usvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIPOINTEREXTPROC __glewVertexAttribIPointerEXT; - -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMEXTPROC __glewGetHistogramEXT; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERFVEXTPROC __glewGetHistogramParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETHISTOGRAMPARAMETERIVEXTPROC __glewGetHistogramParameterivEXT; -GLEW_FUN_EXPORT PFNGLGETMINMAXEXTPROC __glewGetMinmaxEXT; -GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERFVEXTPROC __glewGetMinmaxParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETMINMAXPARAMETERIVEXTPROC __glewGetMinmaxParameterivEXT; -GLEW_FUN_EXPORT PFNGLHISTOGRAMEXTPROC __glewHistogramEXT; -GLEW_FUN_EXPORT PFNGLMINMAXEXTPROC __glewMinmaxEXT; -GLEW_FUN_EXPORT PFNGLRESETHISTOGRAMEXTPROC __glewResetHistogramEXT; -GLEW_FUN_EXPORT PFNGLRESETMINMAXEXTPROC __glewResetMinmaxEXT; - -GLEW_FUN_EXPORT PFNGLINDEXFUNCEXTPROC __glewIndexFuncEXT; - -GLEW_FUN_EXPORT PFNGLINDEXMATERIALEXTPROC __glewIndexMaterialEXT; - -GLEW_FUN_EXPORT PFNGLAPPLYTEXTUREEXTPROC __glewApplyTextureEXT; -GLEW_FUN_EXPORT PFNGLTEXTURELIGHTEXTPROC __glewTextureLightEXT; -GLEW_FUN_EXPORT PFNGLTEXTUREMATERIALEXTPROC __glewTextureMaterialEXT; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSEXTPROC __glewMultiDrawArraysEXT; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSEXTPROC __glewMultiDrawElementsEXT; - -GLEW_FUN_EXPORT PFNGLSAMPLEMASKEXTPROC __glewSampleMaskEXT; -GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNEXTPROC __glewSamplePatternEXT; - -GLEW_FUN_EXPORT PFNGLCOLORTABLEEXTPROC __glewColorTableEXT; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEEXTPROC __glewGetColorTableEXT; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVEXTPROC __glewGetColorTableParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVEXTPROC __glewGetColorTableParameterivEXT; - -GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC __glewGetPixelTransformParameterfvEXT; -GLEW_FUN_EXPORT PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC __glewGetPixelTransformParameterivEXT; -GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFEXTPROC __glewPixelTransformParameterfEXT; -GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC __glewPixelTransformParameterfvEXT; -GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIEXTPROC __glewPixelTransformParameteriEXT; -GLEW_FUN_EXPORT PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC __glewPixelTransformParameterivEXT; - -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFEXTPROC __glewPointParameterfEXT; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERFVEXTPROC __glewPointParameterfvEXT; - -GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETEXTPROC __glewPolygonOffsetEXT; - -GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETCLAMPEXTPROC __glewPolygonOffsetClampEXT; - -GLEW_FUN_EXPORT PFNGLPROVOKINGVERTEXEXTPROC __glewProvokingVertexEXT; - -GLEW_FUN_EXPORT PFNGLCOVERAGEMODULATIONNVPROC __glewCoverageModulationNV; -GLEW_FUN_EXPORT PFNGLCOVERAGEMODULATIONTABLENVPROC __glewCoverageModulationTableNV; -GLEW_FUN_EXPORT PFNGLGETCOVERAGEMODULATIONTABLENVPROC __glewGetCoverageModulationTableNV; -GLEW_FUN_EXPORT PFNGLRASTERSAMPLESEXTPROC __glewRasterSamplesEXT; - -GLEW_FUN_EXPORT PFNGLBEGINSCENEEXTPROC __glewBeginSceneEXT; -GLEW_FUN_EXPORT PFNGLENDSCENEEXTPROC __glewEndSceneEXT; - -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BEXTPROC __glewSecondaryColor3bEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3BVEXTPROC __glewSecondaryColor3bvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DEXTPROC __glewSecondaryColor3dEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3DVEXTPROC __glewSecondaryColor3dvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FEXTPROC __glewSecondaryColor3fEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3FVEXTPROC __glewSecondaryColor3fvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IEXTPROC __glewSecondaryColor3iEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3IVEXTPROC __glewSecondaryColor3ivEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SEXTPROC __glewSecondaryColor3sEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3SVEXTPROC __glewSecondaryColor3svEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBEXTPROC __glewSecondaryColor3ubEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UBVEXTPROC __glewSecondaryColor3ubvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIEXTPROC __glewSecondaryColor3uiEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3UIVEXTPROC __glewSecondaryColor3uivEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USEXTPROC __glewSecondaryColor3usEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3USVEXTPROC __glewSecondaryColor3usvEXT; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTEREXTPROC __glewSecondaryColorPointerEXT; - -GLEW_FUN_EXPORT PFNGLACTIVEPROGRAMEXTPROC __glewActiveProgramEXT; -GLEW_FUN_EXPORT PFNGLCREATESHADERPROGRAMEXTPROC __glewCreateShaderProgramEXT; -GLEW_FUN_EXPORT PFNGLUSESHADERPROGRAMEXTPROC __glewUseShaderProgramEXT; - -GLEW_FUN_EXPORT PFNGLBINDIMAGETEXTUREEXTPROC __glewBindImageTextureEXT; -GLEW_FUN_EXPORT PFNGLMEMORYBARRIEREXTPROC __glewMemoryBarrierEXT; - -GLEW_FUN_EXPORT PFNGLACTIVESTENCILFACEEXTPROC __glewActiveStencilFaceEXT; - -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE1DEXTPROC __glewTexSubImage1DEXT; -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE2DEXTPROC __glewTexSubImage2DEXT; -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE3DEXTPROC __glewTexSubImage3DEXT; - -GLEW_FUN_EXPORT PFNGLTEXIMAGE3DEXTPROC __glewTexImage3DEXT; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC __glewFramebufferTextureLayerEXT; - -GLEW_FUN_EXPORT PFNGLTEXBUFFEREXTPROC __glewTexBufferEXT; - -GLEW_FUN_EXPORT PFNGLCLEARCOLORIIEXTPROC __glewClearColorIiEXT; -GLEW_FUN_EXPORT PFNGLCLEARCOLORIUIEXTPROC __glewClearColorIuiEXT; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIIVEXTPROC __glewGetTexParameterIivEXT; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERIUIVEXTPROC __glewGetTexParameterIuivEXT; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERIIVEXTPROC __glewTexParameterIivEXT; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERIUIVEXTPROC __glewTexParameterIuivEXT; - -GLEW_FUN_EXPORT PFNGLARETEXTURESRESIDENTEXTPROC __glewAreTexturesResidentEXT; -GLEW_FUN_EXPORT PFNGLBINDTEXTUREEXTPROC __glewBindTextureEXT; -GLEW_FUN_EXPORT PFNGLDELETETEXTURESEXTPROC __glewDeleteTexturesEXT; -GLEW_FUN_EXPORT PFNGLGENTEXTURESEXTPROC __glewGenTexturesEXT; -GLEW_FUN_EXPORT PFNGLISTEXTUREEXTPROC __glewIsTextureEXT; -GLEW_FUN_EXPORT PFNGLPRIORITIZETEXTURESEXTPROC __glewPrioritizeTexturesEXT; - -GLEW_FUN_EXPORT PFNGLTEXTURENORMALEXTPROC __glewTextureNormalEXT; - -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTI64VEXTPROC __glewGetQueryObjecti64vEXT; -GLEW_FUN_EXPORT PFNGLGETQUERYOBJECTUI64VEXTPROC __glewGetQueryObjectui64vEXT; - -GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKEXTPROC __glewBeginTransformFeedbackEXT; -GLEW_FUN_EXPORT PFNGLBINDBUFFERBASEEXTPROC __glewBindBufferBaseEXT; -GLEW_FUN_EXPORT PFNGLBINDBUFFEROFFSETEXTPROC __glewBindBufferOffsetEXT; -GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGEEXTPROC __glewBindBufferRangeEXT; -GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKEXTPROC __glewEndTransformFeedbackEXT; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGEXTPROC __glewGetTransformFeedbackVaryingEXT; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSEXTPROC __glewTransformFeedbackVaryingsEXT; - -GLEW_FUN_EXPORT PFNGLARRAYELEMENTEXTPROC __glewArrayElementEXT; -GLEW_FUN_EXPORT PFNGLCOLORPOINTEREXTPROC __glewColorPointerEXT; -GLEW_FUN_EXPORT PFNGLDRAWARRAYSEXTPROC __glewDrawArraysEXT; -GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTEREXTPROC __glewEdgeFlagPointerEXT; -GLEW_FUN_EXPORT PFNGLINDEXPOINTEREXTPROC __glewIndexPointerEXT; -GLEW_FUN_EXPORT PFNGLNORMALPOINTEREXTPROC __glewNormalPointerEXT; -GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTEREXTPROC __glewTexCoordPointerEXT; -GLEW_FUN_EXPORT PFNGLVERTEXPOINTEREXTPROC __glewVertexPointerEXT; - -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLDVEXTPROC __glewGetVertexAttribLdvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYVERTEXATTRIBLOFFSETEXTPROC __glewVertexArrayVertexAttribLOffsetEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DEXTPROC __glewVertexAttribL1dEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1DVEXTPROC __glewVertexAttribL1dvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DEXTPROC __glewVertexAttribL2dEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2DVEXTPROC __glewVertexAttribL2dvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DEXTPROC __glewVertexAttribL3dEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3DVEXTPROC __glewVertexAttribL3dvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DEXTPROC __glewVertexAttribL4dEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4DVEXTPROC __glewVertexAttribL4dvEXT; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLPOINTEREXTPROC __glewVertexAttribLPointerEXT; - -GLEW_FUN_EXPORT PFNGLBEGINVERTEXSHADEREXTPROC __glewBeginVertexShaderEXT; -GLEW_FUN_EXPORT PFNGLBINDLIGHTPARAMETEREXTPROC __glewBindLightParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDMATERIALPARAMETEREXTPROC __glewBindMaterialParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDPARAMETEREXTPROC __glewBindParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDTEXGENPARAMETEREXTPROC __glewBindTexGenParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDTEXTUREUNITPARAMETEREXTPROC __glewBindTextureUnitParameterEXT; -GLEW_FUN_EXPORT PFNGLBINDVERTEXSHADEREXTPROC __glewBindVertexShaderEXT; -GLEW_FUN_EXPORT PFNGLDELETEVERTEXSHADEREXTPROC __glewDeleteVertexShaderEXT; -GLEW_FUN_EXPORT PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC __glewDisableVariantClientStateEXT; -GLEW_FUN_EXPORT PFNGLENABLEVARIANTCLIENTSTATEEXTPROC __glewEnableVariantClientStateEXT; -GLEW_FUN_EXPORT PFNGLENDVERTEXSHADEREXTPROC __glewEndVertexShaderEXT; -GLEW_FUN_EXPORT PFNGLEXTRACTCOMPONENTEXTPROC __glewExtractComponentEXT; -GLEW_FUN_EXPORT PFNGLGENSYMBOLSEXTPROC __glewGenSymbolsEXT; -GLEW_FUN_EXPORT PFNGLGENVERTEXSHADERSEXTPROC __glewGenVertexShadersEXT; -GLEW_FUN_EXPORT PFNGLGETINVARIANTBOOLEANVEXTPROC __glewGetInvariantBooleanvEXT; -GLEW_FUN_EXPORT PFNGLGETINVARIANTFLOATVEXTPROC __glewGetInvariantFloatvEXT; -GLEW_FUN_EXPORT PFNGLGETINVARIANTINTEGERVEXTPROC __glewGetInvariantIntegervEXT; -GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC __glewGetLocalConstantBooleanvEXT; -GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTFLOATVEXTPROC __glewGetLocalConstantFloatvEXT; -GLEW_FUN_EXPORT PFNGLGETLOCALCONSTANTINTEGERVEXTPROC __glewGetLocalConstantIntegervEXT; -GLEW_FUN_EXPORT PFNGLGETVARIANTBOOLEANVEXTPROC __glewGetVariantBooleanvEXT; -GLEW_FUN_EXPORT PFNGLGETVARIANTFLOATVEXTPROC __glewGetVariantFloatvEXT; -GLEW_FUN_EXPORT PFNGLGETVARIANTINTEGERVEXTPROC __glewGetVariantIntegervEXT; -GLEW_FUN_EXPORT PFNGLGETVARIANTPOINTERVEXTPROC __glewGetVariantPointervEXT; -GLEW_FUN_EXPORT PFNGLINSERTCOMPONENTEXTPROC __glewInsertComponentEXT; -GLEW_FUN_EXPORT PFNGLISVARIANTENABLEDEXTPROC __glewIsVariantEnabledEXT; -GLEW_FUN_EXPORT PFNGLSETINVARIANTEXTPROC __glewSetInvariantEXT; -GLEW_FUN_EXPORT PFNGLSETLOCALCONSTANTEXTPROC __glewSetLocalConstantEXT; -GLEW_FUN_EXPORT PFNGLSHADEROP1EXTPROC __glewShaderOp1EXT; -GLEW_FUN_EXPORT PFNGLSHADEROP2EXTPROC __glewShaderOp2EXT; -GLEW_FUN_EXPORT PFNGLSHADEROP3EXTPROC __glewShaderOp3EXT; -GLEW_FUN_EXPORT PFNGLSWIZZLEEXTPROC __glewSwizzleEXT; -GLEW_FUN_EXPORT PFNGLVARIANTPOINTEREXTPROC __glewVariantPointerEXT; -GLEW_FUN_EXPORT PFNGLVARIANTBVEXTPROC __glewVariantbvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTDVEXTPROC __glewVariantdvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTFVEXTPROC __glewVariantfvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTIVEXTPROC __glewVariantivEXT; -GLEW_FUN_EXPORT PFNGLVARIANTSVEXTPROC __glewVariantsvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTUBVEXTPROC __glewVariantubvEXT; -GLEW_FUN_EXPORT PFNGLVARIANTUIVEXTPROC __glewVariantuivEXT; -GLEW_FUN_EXPORT PFNGLVARIANTUSVEXTPROC __glewVariantusvEXT; -GLEW_FUN_EXPORT PFNGLWRITEMASKEXTPROC __glewWriteMaskEXT; - -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTPOINTEREXTPROC __glewVertexWeightPointerEXT; -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFEXTPROC __glewVertexWeightfEXT; -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTFVEXTPROC __glewVertexWeightfvEXT; - -GLEW_FUN_EXPORT PFNGLWINDOWRECTANGLESEXTPROC __glewWindowRectanglesEXT; - -GLEW_FUN_EXPORT PFNGLIMPORTSYNCEXTPROC __glewImportSyncEXT; - -GLEW_FUN_EXPORT PFNGLFRAMETERMINATORGREMEDYPROC __glewFrameTerminatorGREMEDY; - -GLEW_FUN_EXPORT PFNGLSTRINGMARKERGREMEDYPROC __glewStringMarkerGREMEDY; - -GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC __glewGetImageTransformParameterfvHP; -GLEW_FUN_EXPORT PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC __glewGetImageTransformParameterivHP; -GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFHPPROC __glewImageTransformParameterfHP; -GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERFVHPPROC __glewImageTransformParameterfvHP; -GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIHPPROC __glewImageTransformParameteriHP; -GLEW_FUN_EXPORT PFNGLIMAGETRANSFORMPARAMETERIVHPPROC __glewImageTransformParameterivHP; - -GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWARRAYSIBMPROC __glewMultiModeDrawArraysIBM; -GLEW_FUN_EXPORT PFNGLMULTIMODEDRAWELEMENTSIBMPROC __glewMultiModeDrawElementsIBM; - -GLEW_FUN_EXPORT PFNGLCOLORPOINTERLISTIBMPROC __glewColorPointerListIBM; -GLEW_FUN_EXPORT PFNGLEDGEFLAGPOINTERLISTIBMPROC __glewEdgeFlagPointerListIBM; -GLEW_FUN_EXPORT PFNGLFOGCOORDPOINTERLISTIBMPROC __glewFogCoordPointerListIBM; -GLEW_FUN_EXPORT PFNGLINDEXPOINTERLISTIBMPROC __glewIndexPointerListIBM; -GLEW_FUN_EXPORT PFNGLNORMALPOINTERLISTIBMPROC __glewNormalPointerListIBM; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORPOINTERLISTIBMPROC __glewSecondaryColorPointerListIBM; -GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERLISTIBMPROC __glewTexCoordPointerListIBM; -GLEW_FUN_EXPORT PFNGLVERTEXPOINTERLISTIBMPROC __glewVertexPointerListIBM; - -GLEW_FUN_EXPORT PFNGLMAPTEXTURE2DINTELPROC __glewMapTexture2DINTEL; -GLEW_FUN_EXPORT PFNGLSYNCTEXTUREINTELPROC __glewSyncTextureINTEL; -GLEW_FUN_EXPORT PFNGLUNMAPTEXTURE2DINTELPROC __glewUnmapTexture2DINTEL; - -GLEW_FUN_EXPORT PFNGLCOLORPOINTERVINTELPROC __glewColorPointervINTEL; -GLEW_FUN_EXPORT PFNGLNORMALPOINTERVINTELPROC __glewNormalPointervINTEL; -GLEW_FUN_EXPORT PFNGLTEXCOORDPOINTERVINTELPROC __glewTexCoordPointervINTEL; -GLEW_FUN_EXPORT PFNGLVERTEXPOINTERVINTELPROC __glewVertexPointervINTEL; - -GLEW_FUN_EXPORT PFNGLBEGINPERFQUERYINTELPROC __glewBeginPerfQueryINTEL; -GLEW_FUN_EXPORT PFNGLCREATEPERFQUERYINTELPROC __glewCreatePerfQueryINTEL; -GLEW_FUN_EXPORT PFNGLDELETEPERFQUERYINTELPROC __glewDeletePerfQueryINTEL; -GLEW_FUN_EXPORT PFNGLENDPERFQUERYINTELPROC __glewEndPerfQueryINTEL; -GLEW_FUN_EXPORT PFNGLGETFIRSTPERFQUERYIDINTELPROC __glewGetFirstPerfQueryIdINTEL; -GLEW_FUN_EXPORT PFNGLGETNEXTPERFQUERYIDINTELPROC __glewGetNextPerfQueryIdINTEL; -GLEW_FUN_EXPORT PFNGLGETPERFCOUNTERINFOINTELPROC __glewGetPerfCounterInfoINTEL; -GLEW_FUN_EXPORT PFNGLGETPERFQUERYDATAINTELPROC __glewGetPerfQueryDataINTEL; -GLEW_FUN_EXPORT PFNGLGETPERFQUERYIDBYNAMEINTELPROC __glewGetPerfQueryIdByNameINTEL; -GLEW_FUN_EXPORT PFNGLGETPERFQUERYINFOINTELPROC __glewGetPerfQueryInfoINTEL; - -GLEW_FUN_EXPORT PFNGLTEXSCISSORFUNCINTELPROC __glewTexScissorFuncINTEL; -GLEW_FUN_EXPORT PFNGLTEXSCISSORINTELPROC __glewTexScissorINTEL; - -GLEW_FUN_EXPORT PFNGLBLENDBARRIERKHRPROC __glewBlendBarrierKHR; - -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECALLBACKPROC __glewDebugMessageCallback; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGECONTROLPROC __glewDebugMessageControl; -GLEW_FUN_EXPORT PFNGLDEBUGMESSAGEINSERTPROC __glewDebugMessageInsert; -GLEW_FUN_EXPORT PFNGLGETDEBUGMESSAGELOGPROC __glewGetDebugMessageLog; -GLEW_FUN_EXPORT PFNGLGETOBJECTLABELPROC __glewGetObjectLabel; -GLEW_FUN_EXPORT PFNGLGETOBJECTPTRLABELPROC __glewGetObjectPtrLabel; -GLEW_FUN_EXPORT PFNGLOBJECTLABELPROC __glewObjectLabel; -GLEW_FUN_EXPORT PFNGLOBJECTPTRLABELPROC __glewObjectPtrLabel; -GLEW_FUN_EXPORT PFNGLPOPDEBUGGROUPPROC __glewPopDebugGroup; -GLEW_FUN_EXPORT PFNGLPUSHDEBUGGROUPPROC __glewPushDebugGroup; - -GLEW_FUN_EXPORT PFNGLGETNUNIFORMFVPROC __glewGetnUniformfv; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMIVPROC __glewGetnUniformiv; -GLEW_FUN_EXPORT PFNGLGETNUNIFORMUIVPROC __glewGetnUniformuiv; -GLEW_FUN_EXPORT PFNGLREADNPIXELSPROC __glewReadnPixels; - -GLEW_FUN_EXPORT PFNGLBUFFERREGIONENABLEDPROC __glewBufferRegionEnabled; -GLEW_FUN_EXPORT PFNGLDELETEBUFFERREGIONPROC __glewDeleteBufferRegion; -GLEW_FUN_EXPORT PFNGLDRAWBUFFERREGIONPROC __glewDrawBufferRegion; -GLEW_FUN_EXPORT PFNGLNEWBUFFERREGIONPROC __glewNewBufferRegion; -GLEW_FUN_EXPORT PFNGLREADBUFFERREGIONPROC __glewReadBufferRegion; - -GLEW_FUN_EXPORT PFNGLRESIZEBUFFERSMESAPROC __glewResizeBuffersMESA; - -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DMESAPROC __glewWindowPos2dMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2DVMESAPROC __glewWindowPos2dvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FMESAPROC __glewWindowPos2fMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2FVMESAPROC __glewWindowPos2fvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IMESAPROC __glewWindowPos2iMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2IVMESAPROC __glewWindowPos2ivMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SMESAPROC __glewWindowPos2sMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS2SVMESAPROC __glewWindowPos2svMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DMESAPROC __glewWindowPos3dMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3DVMESAPROC __glewWindowPos3dvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FMESAPROC __glewWindowPos3fMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3FVMESAPROC __glewWindowPos3fvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IMESAPROC __glewWindowPos3iMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3IVMESAPROC __glewWindowPos3ivMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SMESAPROC __glewWindowPos3sMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS3SVMESAPROC __glewWindowPos3svMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4DMESAPROC __glewWindowPos4dMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4DVMESAPROC __glewWindowPos4dvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4FMESAPROC __glewWindowPos4fMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4FVMESAPROC __glewWindowPos4fvMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4IMESAPROC __glewWindowPos4iMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4IVMESAPROC __glewWindowPos4ivMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4SMESAPROC __glewWindowPos4sMESA; -GLEW_FUN_EXPORT PFNGLWINDOWPOS4SVMESAPROC __glewWindowPos4svMESA; - -GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERNVXPROC __glewBeginConditionalRenderNVX; -GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERNVXPROC __glewEndConditionalRenderNVX; - -GLEW_FUN_EXPORT PFNGLLGPUCOPYIMAGESUBDATANVXPROC __glewLGPUCopyImageSubDataNVX; -GLEW_FUN_EXPORT PFNGLLGPUINTERLOCKNVXPROC __glewLGPUInterlockNVX; -GLEW_FUN_EXPORT PFNGLLGPUNAMEDBUFFERSUBDATANVXPROC __glewLGPUNamedBufferSubDataNVX; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSNVPROC __glewMultiDrawArraysIndirectBindlessNV; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSNVPROC __glewMultiDrawElementsIndirectBindlessNV; - -GLEW_FUN_EXPORT PFNGLMULTIDRAWARRAYSINDIRECTBINDLESSCOUNTNVPROC __glewMultiDrawArraysIndirectBindlessCountNV; -GLEW_FUN_EXPORT PFNGLMULTIDRAWELEMENTSINDIRECTBINDLESSCOUNTNVPROC __glewMultiDrawElementsIndirectBindlessCountNV; - -GLEW_FUN_EXPORT PFNGLGETIMAGEHANDLENVPROC __glewGetImageHandleNV; -GLEW_FUN_EXPORT PFNGLGETTEXTUREHANDLENVPROC __glewGetTextureHandleNV; -GLEW_FUN_EXPORT PFNGLGETTEXTURESAMPLERHANDLENVPROC __glewGetTextureSamplerHandleNV; -GLEW_FUN_EXPORT PFNGLISIMAGEHANDLERESIDENTNVPROC __glewIsImageHandleResidentNV; -GLEW_FUN_EXPORT PFNGLISTEXTUREHANDLERESIDENTNVPROC __glewIsTextureHandleResidentNV; -GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLENONRESIDENTNVPROC __glewMakeImageHandleNonResidentNV; -GLEW_FUN_EXPORT PFNGLMAKEIMAGEHANDLERESIDENTNVPROC __glewMakeImageHandleResidentNV; -GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLENONRESIDENTNVPROC __glewMakeTextureHandleNonResidentNV; -GLEW_FUN_EXPORT PFNGLMAKETEXTUREHANDLERESIDENTNVPROC __glewMakeTextureHandleResidentNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64NVPROC __glewProgramUniformHandleui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMHANDLEUI64VNVPROC __glewProgramUniformHandleui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64NVPROC __glewUniformHandleui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORMHANDLEUI64VNVPROC __glewUniformHandleui64vNV; - -GLEW_FUN_EXPORT PFNGLBLENDBARRIERNVPROC __glewBlendBarrierNV; -GLEW_FUN_EXPORT PFNGLBLENDPARAMETERINVPROC __glewBlendParameteriNV; - -GLEW_FUN_EXPORT PFNGLVIEWPORTPOSITIONWSCALENVPROC __glewViewportPositionWScaleNV; - -GLEW_FUN_EXPORT PFNGLCALLCOMMANDLISTNVPROC __glewCallCommandListNV; -GLEW_FUN_EXPORT PFNGLCOMMANDLISTSEGMENTSNVPROC __glewCommandListSegmentsNV; -GLEW_FUN_EXPORT PFNGLCOMPILECOMMANDLISTNVPROC __glewCompileCommandListNV; -GLEW_FUN_EXPORT PFNGLCREATECOMMANDLISTSNVPROC __glewCreateCommandListsNV; -GLEW_FUN_EXPORT PFNGLCREATESTATESNVPROC __glewCreateStatesNV; -GLEW_FUN_EXPORT PFNGLDELETECOMMANDLISTSNVPROC __glewDeleteCommandListsNV; -GLEW_FUN_EXPORT PFNGLDELETESTATESNVPROC __glewDeleteStatesNV; -GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSADDRESSNVPROC __glewDrawCommandsAddressNV; -GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSNVPROC __glewDrawCommandsNV; -GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSSTATESADDRESSNVPROC __glewDrawCommandsStatesAddressNV; -GLEW_FUN_EXPORT PFNGLDRAWCOMMANDSSTATESNVPROC __glewDrawCommandsStatesNV; -GLEW_FUN_EXPORT PFNGLGETCOMMANDHEADERNVPROC __glewGetCommandHeaderNV; -GLEW_FUN_EXPORT PFNGLGETSTAGEINDEXNVPROC __glewGetStageIndexNV; -GLEW_FUN_EXPORT PFNGLISCOMMANDLISTNVPROC __glewIsCommandListNV; -GLEW_FUN_EXPORT PFNGLISSTATENVPROC __glewIsStateNV; -GLEW_FUN_EXPORT PFNGLLISTDRAWCOMMANDSSTATESCLIENTNVPROC __glewListDrawCommandsStatesClientNV; -GLEW_FUN_EXPORT PFNGLSTATECAPTURENVPROC __glewStateCaptureNV; - -GLEW_FUN_EXPORT PFNGLBEGINCONDITIONALRENDERNVPROC __glewBeginConditionalRenderNV; -GLEW_FUN_EXPORT PFNGLENDCONDITIONALRENDERNVPROC __glewEndConditionalRenderNV; - -GLEW_FUN_EXPORT PFNGLSUBPIXELPRECISIONBIASNVPROC __glewSubpixelPrecisionBiasNV; - -GLEW_FUN_EXPORT PFNGLCONSERVATIVERASTERPARAMETERFNVPROC __glewConservativeRasterParameterfNV; - -GLEW_FUN_EXPORT PFNGLCONSERVATIVERASTERPARAMETERINVPROC __glewConservativeRasterParameteriNV; - -GLEW_FUN_EXPORT PFNGLCOPYIMAGESUBDATANVPROC __glewCopyImageSubDataNV; - -GLEW_FUN_EXPORT PFNGLCLEARDEPTHDNVPROC __glewClearDepthdNV; -GLEW_FUN_EXPORT PFNGLDEPTHBOUNDSDNVPROC __glewDepthBoundsdNV; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEDNVPROC __glewDepthRangedNV; - -GLEW_FUN_EXPORT PFNGLDRAWTEXTURENVPROC __glewDrawTextureNV; - -GLEW_FUN_EXPORT PFNGLDRAWVKIMAGENVPROC __glewDrawVkImageNV; -GLEW_FUN_EXPORT PFNGLGETVKPROCADDRNVPROC __glewGetVkProcAddrNV; -GLEW_FUN_EXPORT PFNGLSIGNALVKFENCENVPROC __glewSignalVkFenceNV; -GLEW_FUN_EXPORT PFNGLSIGNALVKSEMAPHORENVPROC __glewSignalVkSemaphoreNV; -GLEW_FUN_EXPORT PFNGLWAITVKSEMAPHORENVPROC __glewWaitVkSemaphoreNV; - -GLEW_FUN_EXPORT PFNGLEVALMAPSNVPROC __glewEvalMapsNV; -GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERFVNVPROC __glewGetMapAttribParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETMAPATTRIBPARAMETERIVNVPROC __glewGetMapAttribParameterivNV; -GLEW_FUN_EXPORT PFNGLGETMAPCONTROLPOINTSNVPROC __glewGetMapControlPointsNV; -GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERFVNVPROC __glewGetMapParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETMAPPARAMETERIVNVPROC __glewGetMapParameterivNV; -GLEW_FUN_EXPORT PFNGLMAPCONTROLPOINTSNVPROC __glewMapControlPointsNV; -GLEW_FUN_EXPORT PFNGLMAPPARAMETERFVNVPROC __glewMapParameterfvNV; -GLEW_FUN_EXPORT PFNGLMAPPARAMETERIVNVPROC __glewMapParameterivNV; - -GLEW_FUN_EXPORT PFNGLGETMULTISAMPLEFVNVPROC __glewGetMultisamplefvNV; -GLEW_FUN_EXPORT PFNGLSAMPLEMASKINDEXEDNVPROC __glewSampleMaskIndexedNV; -GLEW_FUN_EXPORT PFNGLTEXRENDERBUFFERNVPROC __glewTexRenderbufferNV; - -GLEW_FUN_EXPORT PFNGLDELETEFENCESNVPROC __glewDeleteFencesNV; -GLEW_FUN_EXPORT PFNGLFINISHFENCENVPROC __glewFinishFenceNV; -GLEW_FUN_EXPORT PFNGLGENFENCESNVPROC __glewGenFencesNV; -GLEW_FUN_EXPORT PFNGLGETFENCEIVNVPROC __glewGetFenceivNV; -GLEW_FUN_EXPORT PFNGLISFENCENVPROC __glewIsFenceNV; -GLEW_FUN_EXPORT PFNGLSETFENCENVPROC __glewSetFenceNV; -GLEW_FUN_EXPORT PFNGLTESTFENCENVPROC __glewTestFenceNV; - -GLEW_FUN_EXPORT PFNGLFRAGMENTCOVERAGECOLORNVPROC __glewFragmentCoverageColorNV; - -GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC __glewGetProgramNamedParameterdvNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC __glewGetProgramNamedParameterfvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DNVPROC __glewProgramNamedParameter4dNV; -GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC __glewProgramNamedParameter4dvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FNVPROC __glewProgramNamedParameter4fNV; -GLEW_FUN_EXPORT PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC __glewProgramNamedParameter4fvNV; - -GLEW_FUN_EXPORT PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC __glewRenderbufferStorageMultisampleCoverageNV; - -GLEW_FUN_EXPORT PFNGLPROGRAMVERTEXLIMITNVPROC __glewProgramVertexLimitNV; - -GLEW_FUN_EXPORT PFNGLMULTICASTBARRIERNVPROC __glewMulticastBarrierNV; -GLEW_FUN_EXPORT PFNGLMULTICASTBLITFRAMEBUFFERNVPROC __glewMulticastBlitFramebufferNV; -GLEW_FUN_EXPORT PFNGLMULTICASTBUFFERSUBDATANVPROC __glewMulticastBufferSubDataNV; -GLEW_FUN_EXPORT PFNGLMULTICASTCOPYBUFFERSUBDATANVPROC __glewMulticastCopyBufferSubDataNV; -GLEW_FUN_EXPORT PFNGLMULTICASTCOPYIMAGESUBDATANVPROC __glewMulticastCopyImageSubDataNV; -GLEW_FUN_EXPORT PFNGLMULTICASTFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewMulticastFramebufferSampleLocationsfvNV; -GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTI64VNVPROC __glewMulticastGetQueryObjecti64vNV; -GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTIVNVPROC __glewMulticastGetQueryObjectivNV; -GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTUI64VNVPROC __glewMulticastGetQueryObjectui64vNV; -GLEW_FUN_EXPORT PFNGLMULTICASTGETQUERYOBJECTUIVNVPROC __glewMulticastGetQueryObjectuivNV; -GLEW_FUN_EXPORT PFNGLMULTICASTWAITSYNCNVPROC __glewMulticastWaitSyncNV; -GLEW_FUN_EXPORT PFNGLRENDERGPUMASKNVPROC __glewRenderGpuMaskNV; - -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4INVPROC __glewProgramEnvParameterI4iNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4IVNVPROC __glewProgramEnvParameterI4ivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4UINVPROC __glewProgramEnvParameterI4uiNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERI4UIVNVPROC __glewProgramEnvParameterI4uivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERSI4IVNVPROC __glewProgramEnvParametersI4ivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC __glewProgramEnvParametersI4uivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4INVPROC __glewProgramLocalParameterI4iNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC __glewProgramLocalParameterI4ivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4UINVPROC __glewProgramLocalParameterI4uiNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC __glewProgramLocalParameterI4uivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC __glewProgramLocalParametersI4ivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC __glewProgramLocalParametersI4uivNV; - -GLEW_FUN_EXPORT PFNGLGETUNIFORMI64VNVPROC __glewGetUniformi64vNV; -GLEW_FUN_EXPORT PFNGLGETUNIFORMUI64VNVPROC __glewGetUniformui64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64NVPROC __glewProgramUniform1i64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1I64VNVPROC __glewProgramUniform1i64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64NVPROC __glewProgramUniform1ui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM1UI64VNVPROC __glewProgramUniform1ui64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64NVPROC __glewProgramUniform2i64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2I64VNVPROC __glewProgramUniform2i64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64NVPROC __glewProgramUniform2ui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM2UI64VNVPROC __glewProgramUniform2ui64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64NVPROC __glewProgramUniform3i64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3I64VNVPROC __glewProgramUniform3i64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64NVPROC __glewProgramUniform3ui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM3UI64VNVPROC __glewProgramUniform3ui64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64NVPROC __glewProgramUniform4i64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4I64VNVPROC __glewProgramUniform4i64vNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64NVPROC __glewProgramUniform4ui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORM4UI64VNVPROC __glewProgramUniform4ui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM1I64NVPROC __glewUniform1i64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM1I64VNVPROC __glewUniform1i64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM1UI64NVPROC __glewUniform1ui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM1UI64VNVPROC __glewUniform1ui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM2I64NVPROC __glewUniform2i64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM2I64VNVPROC __glewUniform2i64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM2UI64NVPROC __glewUniform2ui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM2UI64VNVPROC __glewUniform2ui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM3I64NVPROC __glewUniform3i64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM3I64VNVPROC __glewUniform3i64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM3UI64NVPROC __glewUniform3ui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM3UI64VNVPROC __glewUniform3ui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM4I64NVPROC __glewUniform4i64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM4I64VNVPROC __glewUniform4i64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORM4UI64NVPROC __glewUniform4ui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORM4UI64VNVPROC __glewUniform4ui64vNV; - -GLEW_FUN_EXPORT PFNGLCOLOR3HNVPROC __glewColor3hNV; -GLEW_FUN_EXPORT PFNGLCOLOR3HVNVPROC __glewColor3hvNV; -GLEW_FUN_EXPORT PFNGLCOLOR4HNVPROC __glewColor4hNV; -GLEW_FUN_EXPORT PFNGLCOLOR4HVNVPROC __glewColor4hvNV; -GLEW_FUN_EXPORT PFNGLFOGCOORDHNVPROC __glewFogCoordhNV; -GLEW_FUN_EXPORT PFNGLFOGCOORDHVNVPROC __glewFogCoordhvNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HNVPROC __glewMultiTexCoord1hNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD1HVNVPROC __glewMultiTexCoord1hvNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HNVPROC __glewMultiTexCoord2hNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD2HVNVPROC __glewMultiTexCoord2hvNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HNVPROC __glewMultiTexCoord3hNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD3HVNVPROC __glewMultiTexCoord3hvNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HNVPROC __glewMultiTexCoord4hNV; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4HVNVPROC __glewMultiTexCoord4hvNV; -GLEW_FUN_EXPORT PFNGLNORMAL3HNVPROC __glewNormal3hNV; -GLEW_FUN_EXPORT PFNGLNORMAL3HVNVPROC __glewNormal3hvNV; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HNVPROC __glewSecondaryColor3hNV; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLOR3HVNVPROC __glewSecondaryColor3hvNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD1HNVPROC __glewTexCoord1hNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD1HVNVPROC __glewTexCoord1hvNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD2HNVPROC __glewTexCoord2hNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD2HVNVPROC __glewTexCoord2hvNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD3HNVPROC __glewTexCoord3hNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD3HVNVPROC __glewTexCoord3hvNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD4HNVPROC __glewTexCoord4hNV; -GLEW_FUN_EXPORT PFNGLTEXCOORD4HVNVPROC __glewTexCoord4hvNV; -GLEW_FUN_EXPORT PFNGLVERTEX2HNVPROC __glewVertex2hNV; -GLEW_FUN_EXPORT PFNGLVERTEX2HVNVPROC __glewVertex2hvNV; -GLEW_FUN_EXPORT PFNGLVERTEX3HNVPROC __glewVertex3hNV; -GLEW_FUN_EXPORT PFNGLVERTEX3HVNVPROC __glewVertex3hvNV; -GLEW_FUN_EXPORT PFNGLVERTEX4HNVPROC __glewVertex4hNV; -GLEW_FUN_EXPORT PFNGLVERTEX4HVNVPROC __glewVertex4hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HNVPROC __glewVertexAttrib1hNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1HVNVPROC __glewVertexAttrib1hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HNVPROC __glewVertexAttrib2hNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2HVNVPROC __glewVertexAttrib2hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HNVPROC __glewVertexAttrib3hNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3HVNVPROC __glewVertexAttrib3hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HNVPROC __glewVertexAttrib4hNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4HVNVPROC __glewVertexAttrib4hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1HVNVPROC __glewVertexAttribs1hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2HVNVPROC __glewVertexAttribs2hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3HVNVPROC __glewVertexAttribs3hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4HVNVPROC __glewVertexAttribs4hvNV; -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHNVPROC __glewVertexWeighthNV; -GLEW_FUN_EXPORT PFNGLVERTEXWEIGHTHVNVPROC __glewVertexWeighthvNV; - -GLEW_FUN_EXPORT PFNGLGETINTERNALFORMATSAMPLEIVNVPROC __glewGetInternalformatSampleivNV; - -GLEW_FUN_EXPORT PFNGLBEGINOCCLUSIONQUERYNVPROC __glewBeginOcclusionQueryNV; -GLEW_FUN_EXPORT PFNGLDELETEOCCLUSIONQUERIESNVPROC __glewDeleteOcclusionQueriesNV; -GLEW_FUN_EXPORT PFNGLENDOCCLUSIONQUERYNVPROC __glewEndOcclusionQueryNV; -GLEW_FUN_EXPORT PFNGLGENOCCLUSIONQUERIESNVPROC __glewGenOcclusionQueriesNV; -GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYIVNVPROC __glewGetOcclusionQueryivNV; -GLEW_FUN_EXPORT PFNGLGETOCCLUSIONQUERYUIVNVPROC __glewGetOcclusionQueryuivNV; -GLEW_FUN_EXPORT PFNGLISOCCLUSIONQUERYNVPROC __glewIsOcclusionQueryNV; - -GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC __glewProgramBufferParametersIivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC __glewProgramBufferParametersIuivNV; -GLEW_FUN_EXPORT PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC __glewProgramBufferParametersfvNV; - -GLEW_FUN_EXPORT PFNGLCOPYPATHNVPROC __glewCopyPathNV; -GLEW_FUN_EXPORT PFNGLCOVERFILLPATHINSTANCEDNVPROC __glewCoverFillPathInstancedNV; -GLEW_FUN_EXPORT PFNGLCOVERFILLPATHNVPROC __glewCoverFillPathNV; -GLEW_FUN_EXPORT PFNGLCOVERSTROKEPATHINSTANCEDNVPROC __glewCoverStrokePathInstancedNV; -GLEW_FUN_EXPORT PFNGLCOVERSTROKEPATHNVPROC __glewCoverStrokePathNV; -GLEW_FUN_EXPORT PFNGLDELETEPATHSNVPROC __glewDeletePathsNV; -GLEW_FUN_EXPORT PFNGLGENPATHSNVPROC __glewGenPathsNV; -GLEW_FUN_EXPORT PFNGLGETPATHCOLORGENFVNVPROC __glewGetPathColorGenfvNV; -GLEW_FUN_EXPORT PFNGLGETPATHCOLORGENIVNVPROC __glewGetPathColorGenivNV; -GLEW_FUN_EXPORT PFNGLGETPATHCOMMANDSNVPROC __glewGetPathCommandsNV; -GLEW_FUN_EXPORT PFNGLGETPATHCOORDSNVPROC __glewGetPathCoordsNV; -GLEW_FUN_EXPORT PFNGLGETPATHDASHARRAYNVPROC __glewGetPathDashArrayNV; -GLEW_FUN_EXPORT PFNGLGETPATHLENGTHNVPROC __glewGetPathLengthNV; -GLEW_FUN_EXPORT PFNGLGETPATHMETRICRANGENVPROC __glewGetPathMetricRangeNV; -GLEW_FUN_EXPORT PFNGLGETPATHMETRICSNVPROC __glewGetPathMetricsNV; -GLEW_FUN_EXPORT PFNGLGETPATHPARAMETERFVNVPROC __glewGetPathParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETPATHPARAMETERIVNVPROC __glewGetPathParameterivNV; -GLEW_FUN_EXPORT PFNGLGETPATHSPACINGNVPROC __glewGetPathSpacingNV; -GLEW_FUN_EXPORT PFNGLGETPATHTEXGENFVNVPROC __glewGetPathTexGenfvNV; -GLEW_FUN_EXPORT PFNGLGETPATHTEXGENIVNVPROC __glewGetPathTexGenivNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMRESOURCEFVNVPROC __glewGetProgramResourcefvNV; -GLEW_FUN_EXPORT PFNGLINTERPOLATEPATHSNVPROC __glewInterpolatePathsNV; -GLEW_FUN_EXPORT PFNGLISPATHNVPROC __glewIsPathNV; -GLEW_FUN_EXPORT PFNGLISPOINTINFILLPATHNVPROC __glewIsPointInFillPathNV; -GLEW_FUN_EXPORT PFNGLISPOINTINSTROKEPATHNVPROC __glewIsPointInStrokePathNV; -GLEW_FUN_EXPORT PFNGLMATRIXLOAD3X2FNVPROC __glewMatrixLoad3x2fNV; -GLEW_FUN_EXPORT PFNGLMATRIXLOAD3X3FNVPROC __glewMatrixLoad3x3fNV; -GLEW_FUN_EXPORT PFNGLMATRIXLOADTRANSPOSE3X3FNVPROC __glewMatrixLoadTranspose3x3fNV; -GLEW_FUN_EXPORT PFNGLMATRIXMULT3X2FNVPROC __glewMatrixMult3x2fNV; -GLEW_FUN_EXPORT PFNGLMATRIXMULT3X3FNVPROC __glewMatrixMult3x3fNV; -GLEW_FUN_EXPORT PFNGLMATRIXMULTTRANSPOSE3X3FNVPROC __glewMatrixMultTranspose3x3fNV; -GLEW_FUN_EXPORT PFNGLPATHCOLORGENNVPROC __glewPathColorGenNV; -GLEW_FUN_EXPORT PFNGLPATHCOMMANDSNVPROC __glewPathCommandsNV; -GLEW_FUN_EXPORT PFNGLPATHCOORDSNVPROC __glewPathCoordsNV; -GLEW_FUN_EXPORT PFNGLPATHCOVERDEPTHFUNCNVPROC __glewPathCoverDepthFuncNV; -GLEW_FUN_EXPORT PFNGLPATHDASHARRAYNVPROC __glewPathDashArrayNV; -GLEW_FUN_EXPORT PFNGLPATHFOGGENNVPROC __glewPathFogGenNV; -GLEW_FUN_EXPORT PFNGLPATHGLYPHINDEXARRAYNVPROC __glewPathGlyphIndexArrayNV; -GLEW_FUN_EXPORT PFNGLPATHGLYPHINDEXRANGENVPROC __glewPathGlyphIndexRangeNV; -GLEW_FUN_EXPORT PFNGLPATHGLYPHRANGENVPROC __glewPathGlyphRangeNV; -GLEW_FUN_EXPORT PFNGLPATHGLYPHSNVPROC __glewPathGlyphsNV; -GLEW_FUN_EXPORT PFNGLPATHMEMORYGLYPHINDEXARRAYNVPROC __glewPathMemoryGlyphIndexArrayNV; -GLEW_FUN_EXPORT PFNGLPATHPARAMETERFNVPROC __glewPathParameterfNV; -GLEW_FUN_EXPORT PFNGLPATHPARAMETERFVNVPROC __glewPathParameterfvNV; -GLEW_FUN_EXPORT PFNGLPATHPARAMETERINVPROC __glewPathParameteriNV; -GLEW_FUN_EXPORT PFNGLPATHPARAMETERIVNVPROC __glewPathParameterivNV; -GLEW_FUN_EXPORT PFNGLPATHSTENCILDEPTHOFFSETNVPROC __glewPathStencilDepthOffsetNV; -GLEW_FUN_EXPORT PFNGLPATHSTENCILFUNCNVPROC __glewPathStencilFuncNV; -GLEW_FUN_EXPORT PFNGLPATHSTRINGNVPROC __glewPathStringNV; -GLEW_FUN_EXPORT PFNGLPATHSUBCOMMANDSNVPROC __glewPathSubCommandsNV; -GLEW_FUN_EXPORT PFNGLPATHSUBCOORDSNVPROC __glewPathSubCoordsNV; -GLEW_FUN_EXPORT PFNGLPATHTEXGENNVPROC __glewPathTexGenNV; -GLEW_FUN_EXPORT PFNGLPOINTALONGPATHNVPROC __glewPointAlongPathNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPATHFRAGMENTINPUTGENNVPROC __glewProgramPathFragmentInputGenNV; -GLEW_FUN_EXPORT PFNGLSTENCILFILLPATHINSTANCEDNVPROC __glewStencilFillPathInstancedNV; -GLEW_FUN_EXPORT PFNGLSTENCILFILLPATHNVPROC __glewStencilFillPathNV; -GLEW_FUN_EXPORT PFNGLSTENCILSTROKEPATHINSTANCEDNVPROC __glewStencilStrokePathInstancedNV; -GLEW_FUN_EXPORT PFNGLSTENCILSTROKEPATHNVPROC __glewStencilStrokePathNV; -GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERFILLPATHINSTANCEDNVPROC __glewStencilThenCoverFillPathInstancedNV; -GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERFILLPATHNVPROC __glewStencilThenCoverFillPathNV; -GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHINSTANCEDNVPROC __glewStencilThenCoverStrokePathInstancedNV; -GLEW_FUN_EXPORT PFNGLSTENCILTHENCOVERSTROKEPATHNVPROC __glewStencilThenCoverStrokePathNV; -GLEW_FUN_EXPORT PFNGLTRANSFORMPATHNVPROC __glewTransformPathNV; -GLEW_FUN_EXPORT PFNGLWEIGHTPATHSNVPROC __glewWeightPathsNV; - -GLEW_FUN_EXPORT PFNGLFLUSHPIXELDATARANGENVPROC __glewFlushPixelDataRangeNV; -GLEW_FUN_EXPORT PFNGLPIXELDATARANGENVPROC __glewPixelDataRangeNV; - -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERINVPROC __glewPointParameteriNV; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERIVNVPROC __glewPointParameterivNV; - -GLEW_FUN_EXPORT PFNGLGETVIDEOI64VNVPROC __glewGetVideoi64vNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOIVNVPROC __glewGetVideoivNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOUI64VNVPROC __glewGetVideoui64vNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOUIVNVPROC __glewGetVideouivNV; -GLEW_FUN_EXPORT PFNGLPRESENTFRAMEDUALFILLNVPROC __glewPresentFrameDualFillNV; -GLEW_FUN_EXPORT PFNGLPRESENTFRAMEKEYEDNVPROC __glewPresentFrameKeyedNV; - -GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTINDEXNVPROC __glewPrimitiveRestartIndexNV; -GLEW_FUN_EXPORT PFNGLPRIMITIVERESTARTNVPROC __glewPrimitiveRestartNV; - -GLEW_FUN_EXPORT PFNGLCOMBINERINPUTNVPROC __glewCombinerInputNV; -GLEW_FUN_EXPORT PFNGLCOMBINEROUTPUTNVPROC __glewCombinerOutputNV; -GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFNVPROC __glewCombinerParameterfNV; -GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERFVNVPROC __glewCombinerParameterfvNV; -GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERINVPROC __glewCombinerParameteriNV; -GLEW_FUN_EXPORT PFNGLCOMBINERPARAMETERIVNVPROC __glewCombinerParameterivNV; -GLEW_FUN_EXPORT PFNGLFINALCOMBINERINPUTNVPROC __glewFinalCombinerInputNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC __glewGetCombinerInputParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC __glewGetCombinerInputParameterivNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC __glewGetCombinerOutputParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC __glewGetCombinerOutputParameterivNV; -GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC __glewGetFinalCombinerInputParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC __glewGetFinalCombinerInputParameterivNV; - -GLEW_FUN_EXPORT PFNGLCOMBINERSTAGEPARAMETERFVNVPROC __glewCombinerStageParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC __glewGetCombinerStageParameterfvNV; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewFramebufferSampleLocationsfvNV; -GLEW_FUN_EXPORT PFNGLNAMEDFRAMEBUFFERSAMPLELOCATIONSFVNVPROC __glewNamedFramebufferSampleLocationsfvNV; - -GLEW_FUN_EXPORT PFNGLGETBUFFERPARAMETERUI64VNVPROC __glewGetBufferParameterui64vNV; -GLEW_FUN_EXPORT PFNGLGETINTEGERUI64VNVPROC __glewGetIntegerui64vNV; -GLEW_FUN_EXPORT PFNGLGETNAMEDBUFFERPARAMETERUI64VNVPROC __glewGetNamedBufferParameterui64vNV; -GLEW_FUN_EXPORT PFNGLISBUFFERRESIDENTNVPROC __glewIsBufferResidentNV; -GLEW_FUN_EXPORT PFNGLISNAMEDBUFFERRESIDENTNVPROC __glewIsNamedBufferResidentNV; -GLEW_FUN_EXPORT PFNGLMAKEBUFFERNONRESIDENTNVPROC __glewMakeBufferNonResidentNV; -GLEW_FUN_EXPORT PFNGLMAKEBUFFERRESIDENTNVPROC __glewMakeBufferResidentNV; -GLEW_FUN_EXPORT PFNGLMAKENAMEDBUFFERNONRESIDENTNVPROC __glewMakeNamedBufferNonResidentNV; -GLEW_FUN_EXPORT PFNGLMAKENAMEDBUFFERRESIDENTNVPROC __glewMakeNamedBufferResidentNV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMUI64NVPROC __glewProgramUniformui64NV; -GLEW_FUN_EXPORT PFNGLPROGRAMUNIFORMUI64VNVPROC __glewProgramUniformui64vNV; -GLEW_FUN_EXPORT PFNGLUNIFORMUI64NVPROC __glewUniformui64NV; -GLEW_FUN_EXPORT PFNGLUNIFORMUI64VNVPROC __glewUniformui64vNV; - -GLEW_FUN_EXPORT PFNGLTEXTUREBARRIERNVPROC __glewTextureBarrierNV; - -GLEW_FUN_EXPORT PFNGLTEXIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTexImage2DMultisampleCoverageNV; -GLEW_FUN_EXPORT PFNGLTEXIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTexImage3DMultisampleCoverageNV; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DMULTISAMPLECOVERAGENVPROC __glewTextureImage2DMultisampleCoverageNV; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE2DMULTISAMPLENVPROC __glewTextureImage2DMultisampleNV; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DMULTISAMPLECOVERAGENVPROC __glewTextureImage3DMultisampleCoverageNV; -GLEW_FUN_EXPORT PFNGLTEXTUREIMAGE3DMULTISAMPLENVPROC __glewTextureImage3DMultisampleNV; - -GLEW_FUN_EXPORT PFNGLACTIVEVARYINGNVPROC __glewActiveVaryingNV; -GLEW_FUN_EXPORT PFNGLBEGINTRANSFORMFEEDBACKNVPROC __glewBeginTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLBINDBUFFERBASENVPROC __glewBindBufferBaseNV; -GLEW_FUN_EXPORT PFNGLBINDBUFFEROFFSETNVPROC __glewBindBufferOffsetNV; -GLEW_FUN_EXPORT PFNGLBINDBUFFERRANGENVPROC __glewBindBufferRangeNV; -GLEW_FUN_EXPORT PFNGLENDTRANSFORMFEEDBACKNVPROC __glewEndTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLGETACTIVEVARYINGNVPROC __glewGetActiveVaryingNV; -GLEW_FUN_EXPORT PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC __glewGetTransformFeedbackVaryingNV; -GLEW_FUN_EXPORT PFNGLGETVARYINGLOCATIONNVPROC __glewGetVaryingLocationNV; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC __glewTransformFeedbackAttribsNV; -GLEW_FUN_EXPORT PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC __glewTransformFeedbackVaryingsNV; - -GLEW_FUN_EXPORT PFNGLBINDTRANSFORMFEEDBACKNVPROC __glewBindTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLDELETETRANSFORMFEEDBACKSNVPROC __glewDeleteTransformFeedbacksNV; -GLEW_FUN_EXPORT PFNGLDRAWTRANSFORMFEEDBACKNVPROC __glewDrawTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLGENTRANSFORMFEEDBACKSNVPROC __glewGenTransformFeedbacksNV; -GLEW_FUN_EXPORT PFNGLISTRANSFORMFEEDBACKNVPROC __glewIsTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLPAUSETRANSFORMFEEDBACKNVPROC __glewPauseTransformFeedbackNV; -GLEW_FUN_EXPORT PFNGLRESUMETRANSFORMFEEDBACKNVPROC __glewResumeTransformFeedbackNV; - -GLEW_FUN_EXPORT PFNGLVDPAUFININVPROC __glewVDPAUFiniNV; -GLEW_FUN_EXPORT PFNGLVDPAUGETSURFACEIVNVPROC __glewVDPAUGetSurfaceivNV; -GLEW_FUN_EXPORT PFNGLVDPAUINITNVPROC __glewVDPAUInitNV; -GLEW_FUN_EXPORT PFNGLVDPAUISSURFACENVPROC __glewVDPAUIsSurfaceNV; -GLEW_FUN_EXPORT PFNGLVDPAUMAPSURFACESNVPROC __glewVDPAUMapSurfacesNV; -GLEW_FUN_EXPORT PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC __glewVDPAURegisterOutputSurfaceNV; -GLEW_FUN_EXPORT PFNGLVDPAUREGISTERVIDEOSURFACENVPROC __glewVDPAURegisterVideoSurfaceNV; -GLEW_FUN_EXPORT PFNGLVDPAUSURFACEACCESSNVPROC __glewVDPAUSurfaceAccessNV; -GLEW_FUN_EXPORT PFNGLVDPAUUNMAPSURFACESNVPROC __glewVDPAUUnmapSurfacesNV; -GLEW_FUN_EXPORT PFNGLVDPAUUNREGISTERSURFACENVPROC __glewVDPAUUnregisterSurfaceNV; - -GLEW_FUN_EXPORT PFNGLFLUSHVERTEXARRAYRANGENVPROC __glewFlushVertexArrayRangeNV; -GLEW_FUN_EXPORT PFNGLVERTEXARRAYRANGENVPROC __glewVertexArrayRangeNV; - -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLI64VNVPROC __glewGetVertexAttribLi64vNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBLUI64VNVPROC __glewGetVertexAttribLui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1I64NVPROC __glewVertexAttribL1i64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1I64VNVPROC __glewVertexAttribL1i64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64NVPROC __glewVertexAttribL1ui64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL1UI64VNVPROC __glewVertexAttribL1ui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2I64NVPROC __glewVertexAttribL2i64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2I64VNVPROC __glewVertexAttribL2i64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2UI64NVPROC __glewVertexAttribL2ui64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL2UI64VNVPROC __glewVertexAttribL2ui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3I64NVPROC __glewVertexAttribL3i64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3I64VNVPROC __glewVertexAttribL3i64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3UI64NVPROC __glewVertexAttribL3ui64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL3UI64VNVPROC __glewVertexAttribL3ui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4I64NVPROC __glewVertexAttribL4i64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4I64VNVPROC __glewVertexAttribL4i64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4UI64NVPROC __glewVertexAttribL4ui64NV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBL4UI64VNVPROC __glewVertexAttribL4ui64vNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBLFORMATNVPROC __glewVertexAttribLFormatNV; - -GLEW_FUN_EXPORT PFNGLBUFFERADDRESSRANGENVPROC __glewBufferAddressRangeNV; -GLEW_FUN_EXPORT PFNGLCOLORFORMATNVPROC __glewColorFormatNV; -GLEW_FUN_EXPORT PFNGLEDGEFLAGFORMATNVPROC __glewEdgeFlagFormatNV; -GLEW_FUN_EXPORT PFNGLFOGCOORDFORMATNVPROC __glewFogCoordFormatNV; -GLEW_FUN_EXPORT PFNGLGETINTEGERUI64I_VNVPROC __glewGetIntegerui64i_vNV; -GLEW_FUN_EXPORT PFNGLINDEXFORMATNVPROC __glewIndexFormatNV; -GLEW_FUN_EXPORT PFNGLNORMALFORMATNVPROC __glewNormalFormatNV; -GLEW_FUN_EXPORT PFNGLSECONDARYCOLORFORMATNVPROC __glewSecondaryColorFormatNV; -GLEW_FUN_EXPORT PFNGLTEXCOORDFORMATNVPROC __glewTexCoordFormatNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBFORMATNVPROC __glewVertexAttribFormatNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBIFORMATNVPROC __glewVertexAttribIFormatNV; -GLEW_FUN_EXPORT PFNGLVERTEXFORMATNVPROC __glewVertexFormatNV; - -GLEW_FUN_EXPORT PFNGLAREPROGRAMSRESIDENTNVPROC __glewAreProgramsResidentNV; -GLEW_FUN_EXPORT PFNGLBINDPROGRAMNVPROC __glewBindProgramNV; -GLEW_FUN_EXPORT PFNGLDELETEPROGRAMSNVPROC __glewDeleteProgramsNV; -GLEW_FUN_EXPORT PFNGLEXECUTEPROGRAMNVPROC __glewExecuteProgramNV; -GLEW_FUN_EXPORT PFNGLGENPROGRAMSNVPROC __glewGenProgramsNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERDVNVPROC __glewGetProgramParameterdvNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMPARAMETERFVNVPROC __glewGetProgramParameterfvNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMSTRINGNVPROC __glewGetProgramStringNV; -GLEW_FUN_EXPORT PFNGLGETPROGRAMIVNVPROC __glewGetProgramivNV; -GLEW_FUN_EXPORT PFNGLGETTRACKMATRIXIVNVPROC __glewGetTrackMatrixivNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBPOINTERVNVPROC __glewGetVertexAttribPointervNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBDVNVPROC __glewGetVertexAttribdvNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBFVNVPROC __glewGetVertexAttribfvNV; -GLEW_FUN_EXPORT PFNGLGETVERTEXATTRIBIVNVPROC __glewGetVertexAttribivNV; -GLEW_FUN_EXPORT PFNGLISPROGRAMNVPROC __glewIsProgramNV; -GLEW_FUN_EXPORT PFNGLLOADPROGRAMNVPROC __glewLoadProgramNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DNVPROC __glewProgramParameter4dNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4DVNVPROC __glewProgramParameter4dvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FNVPROC __glewProgramParameter4fNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETER4FVNVPROC __glewProgramParameter4fvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4DVNVPROC __glewProgramParameters4dvNV; -GLEW_FUN_EXPORT PFNGLPROGRAMPARAMETERS4FVNVPROC __glewProgramParameters4fvNV; -GLEW_FUN_EXPORT PFNGLREQUESTRESIDENTPROGRAMSNVPROC __glewRequestResidentProgramsNV; -GLEW_FUN_EXPORT PFNGLTRACKMATRIXNVPROC __glewTrackMatrixNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DNVPROC __glewVertexAttrib1dNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1DVNVPROC __glewVertexAttrib1dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FNVPROC __glewVertexAttrib1fNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1FVNVPROC __glewVertexAttrib1fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SNVPROC __glewVertexAttrib1sNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB1SVNVPROC __glewVertexAttrib1svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DNVPROC __glewVertexAttrib2dNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2DVNVPROC __glewVertexAttrib2dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FNVPROC __glewVertexAttrib2fNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2FVNVPROC __glewVertexAttrib2fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SNVPROC __glewVertexAttrib2sNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB2SVNVPROC __glewVertexAttrib2svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DNVPROC __glewVertexAttrib3dNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3DVNVPROC __glewVertexAttrib3dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FNVPROC __glewVertexAttrib3fNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3FVNVPROC __glewVertexAttrib3fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SNVPROC __glewVertexAttrib3sNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB3SVNVPROC __glewVertexAttrib3svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DNVPROC __glewVertexAttrib4dNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4DVNVPROC __glewVertexAttrib4dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FNVPROC __glewVertexAttrib4fNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4FVNVPROC __glewVertexAttrib4fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SNVPROC __glewVertexAttrib4sNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4SVNVPROC __glewVertexAttrib4svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBNVPROC __glewVertexAttrib4ubNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIB4UBVNVPROC __glewVertexAttrib4ubvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBPOINTERNVPROC __glewVertexAttribPointerNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1DVNVPROC __glewVertexAttribs1dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1FVNVPROC __glewVertexAttribs1fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS1SVNVPROC __glewVertexAttribs1svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2DVNVPROC __glewVertexAttribs2dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2FVNVPROC __glewVertexAttribs2fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS2SVNVPROC __glewVertexAttribs2svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3DVNVPROC __glewVertexAttribs3dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3FVNVPROC __glewVertexAttribs3fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS3SVNVPROC __glewVertexAttribs3svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4DVNVPROC __glewVertexAttribs4dvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4FVNVPROC __glewVertexAttribs4fvNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4SVNVPROC __glewVertexAttribs4svNV; -GLEW_FUN_EXPORT PFNGLVERTEXATTRIBS4UBVNVPROC __glewVertexAttribs4ubvNV; - -GLEW_FUN_EXPORT PFNGLBEGINVIDEOCAPTURENVPROC __glewBeginVideoCaptureNV; -GLEW_FUN_EXPORT PFNGLBINDVIDEOCAPTURESTREAMBUFFERNVPROC __glewBindVideoCaptureStreamBufferNV; -GLEW_FUN_EXPORT PFNGLBINDVIDEOCAPTURESTREAMTEXTURENVPROC __glewBindVideoCaptureStreamTextureNV; -GLEW_FUN_EXPORT PFNGLENDVIDEOCAPTURENVPROC __glewEndVideoCaptureNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMDVNVPROC __glewGetVideoCaptureStreamdvNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMFVNVPROC __glewGetVideoCaptureStreamfvNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTURESTREAMIVNVPROC __glewGetVideoCaptureStreamivNV; -GLEW_FUN_EXPORT PFNGLGETVIDEOCAPTUREIVNVPROC __glewGetVideoCaptureivNV; -GLEW_FUN_EXPORT PFNGLVIDEOCAPTURENVPROC __glewVideoCaptureNV; -GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERDVNVPROC __glewVideoCaptureStreamParameterdvNV; -GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERFVNVPROC __glewVideoCaptureStreamParameterfvNV; -GLEW_FUN_EXPORT PFNGLVIDEOCAPTURESTREAMPARAMETERIVNVPROC __glewVideoCaptureStreamParameterivNV; - -GLEW_FUN_EXPORT PFNGLVIEWPORTSWIZZLENVPROC __glewViewportSwizzleNV; - -GLEW_FUN_EXPORT PFNGLCLEARDEPTHFOESPROC __glewClearDepthfOES; -GLEW_FUN_EXPORT PFNGLCLIPPLANEFOESPROC __glewClipPlanefOES; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEFOESPROC __glewDepthRangefOES; -GLEW_FUN_EXPORT PFNGLFRUSTUMFOESPROC __glewFrustumfOES; -GLEW_FUN_EXPORT PFNGLGETCLIPPLANEFOESPROC __glewGetClipPlanefOES; -GLEW_FUN_EXPORT PFNGLORTHOFOESPROC __glewOrthofOES; - -GLEW_FUN_EXPORT PFNGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC __glewFramebufferTextureMultiviewOVR; - -GLEW_FUN_EXPORT PFNGLALPHAFUNCXPROC __glewAlphaFuncx; -GLEW_FUN_EXPORT PFNGLCLEARCOLORXPROC __glewClearColorx; -GLEW_FUN_EXPORT PFNGLCLEARDEPTHXPROC __glewClearDepthx; -GLEW_FUN_EXPORT PFNGLCOLOR4XPROC __glewColor4x; -GLEW_FUN_EXPORT PFNGLDEPTHRANGEXPROC __glewDepthRangex; -GLEW_FUN_EXPORT PFNGLFOGXPROC __glewFogx; -GLEW_FUN_EXPORT PFNGLFOGXVPROC __glewFogxv; -GLEW_FUN_EXPORT PFNGLFRUSTUMFPROC __glewFrustumf; -GLEW_FUN_EXPORT PFNGLFRUSTUMXPROC __glewFrustumx; -GLEW_FUN_EXPORT PFNGLLIGHTMODELXPROC __glewLightModelx; -GLEW_FUN_EXPORT PFNGLLIGHTMODELXVPROC __glewLightModelxv; -GLEW_FUN_EXPORT PFNGLLIGHTXPROC __glewLightx; -GLEW_FUN_EXPORT PFNGLLIGHTXVPROC __glewLightxv; -GLEW_FUN_EXPORT PFNGLLINEWIDTHXPROC __glewLineWidthx; -GLEW_FUN_EXPORT PFNGLLOADMATRIXXPROC __glewLoadMatrixx; -GLEW_FUN_EXPORT PFNGLMATERIALXPROC __glewMaterialx; -GLEW_FUN_EXPORT PFNGLMATERIALXVPROC __glewMaterialxv; -GLEW_FUN_EXPORT PFNGLMULTMATRIXXPROC __glewMultMatrixx; -GLEW_FUN_EXPORT PFNGLMULTITEXCOORD4XPROC __glewMultiTexCoord4x; -GLEW_FUN_EXPORT PFNGLNORMAL3XPROC __glewNormal3x; -GLEW_FUN_EXPORT PFNGLORTHOFPROC __glewOrthof; -GLEW_FUN_EXPORT PFNGLORTHOXPROC __glewOrthox; -GLEW_FUN_EXPORT PFNGLPOINTSIZEXPROC __glewPointSizex; -GLEW_FUN_EXPORT PFNGLPOLYGONOFFSETXPROC __glewPolygonOffsetx; -GLEW_FUN_EXPORT PFNGLROTATEXPROC __glewRotatex; -GLEW_FUN_EXPORT PFNGLSAMPLECOVERAGEXPROC __glewSampleCoveragex; -GLEW_FUN_EXPORT PFNGLSCALEXPROC __glewScalex; -GLEW_FUN_EXPORT PFNGLTEXENVXPROC __glewTexEnvx; -GLEW_FUN_EXPORT PFNGLTEXENVXVPROC __glewTexEnvxv; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERXPROC __glewTexParameterx; -GLEW_FUN_EXPORT PFNGLTRANSLATEXPROC __glewTranslatex; - -GLEW_FUN_EXPORT PFNGLCLIPPLANEFPROC __glewClipPlanef; -GLEW_FUN_EXPORT PFNGLCLIPPLANEXPROC __glewClipPlanex; -GLEW_FUN_EXPORT PFNGLGETCLIPPLANEFPROC __glewGetClipPlanef; -GLEW_FUN_EXPORT PFNGLGETCLIPPLANEXPROC __glewGetClipPlanex; -GLEW_FUN_EXPORT PFNGLGETFIXEDVPROC __glewGetFixedv; -GLEW_FUN_EXPORT PFNGLGETLIGHTXVPROC __glewGetLightxv; -GLEW_FUN_EXPORT PFNGLGETMATERIALXVPROC __glewGetMaterialxv; -GLEW_FUN_EXPORT PFNGLGETTEXENVXVPROC __glewGetTexEnvxv; -GLEW_FUN_EXPORT PFNGLGETTEXPARAMETERXVPROC __glewGetTexParameterxv; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERXPROC __glewPointParameterx; -GLEW_FUN_EXPORT PFNGLPOINTPARAMETERXVPROC __glewPointParameterxv; -GLEW_FUN_EXPORT PFNGLPOINTSIZEPOINTEROESPROC __glewPointSizePointerOES; -GLEW_FUN_EXPORT PFNGLTEXPARAMETERXVPROC __glewTexParameterxv; - -GLEW_FUN_EXPORT PFNGLERRORSTRINGREGALPROC __glewErrorStringREGAL; - -GLEW_FUN_EXPORT PFNGLGETEXTENSIONREGALPROC __glewGetExtensionREGAL; -GLEW_FUN_EXPORT PFNGLISSUPPORTEDREGALPROC __glewIsSupportedREGAL; - -GLEW_FUN_EXPORT PFNGLLOGMESSAGECALLBACKREGALPROC __glewLogMessageCallbackREGAL; - -GLEW_FUN_EXPORT PFNGLGETPROCADDRESSREGALPROC __glewGetProcAddressREGAL; - -GLEW_FUN_EXPORT PFNGLDETAILTEXFUNCSGISPROC __glewDetailTexFuncSGIS; -GLEW_FUN_EXPORT PFNGLGETDETAILTEXFUNCSGISPROC __glewGetDetailTexFuncSGIS; - -GLEW_FUN_EXPORT PFNGLFOGFUNCSGISPROC __glewFogFuncSGIS; -GLEW_FUN_EXPORT PFNGLGETFOGFUNCSGISPROC __glewGetFogFuncSGIS; - -GLEW_FUN_EXPORT PFNGLSAMPLEMASKSGISPROC __glewSampleMaskSGIS; -GLEW_FUN_EXPORT PFNGLSAMPLEPATTERNSGISPROC __glewSamplePatternSGIS; - -GLEW_FUN_EXPORT PFNGLGETSHARPENTEXFUNCSGISPROC __glewGetSharpenTexFuncSGIS; -GLEW_FUN_EXPORT PFNGLSHARPENTEXFUNCSGISPROC __glewSharpenTexFuncSGIS; - -GLEW_FUN_EXPORT PFNGLTEXIMAGE4DSGISPROC __glewTexImage4DSGIS; -GLEW_FUN_EXPORT PFNGLTEXSUBIMAGE4DSGISPROC __glewTexSubImage4DSGIS; - -GLEW_FUN_EXPORT PFNGLGETTEXFILTERFUNCSGISPROC __glewGetTexFilterFuncSGIS; -GLEW_FUN_EXPORT PFNGLTEXFILTERFUNCSGISPROC __glewTexFilterFuncSGIS; - -GLEW_FUN_EXPORT PFNGLASYNCMARKERSGIXPROC __glewAsyncMarkerSGIX; -GLEW_FUN_EXPORT PFNGLDELETEASYNCMARKERSSGIXPROC __glewDeleteAsyncMarkersSGIX; -GLEW_FUN_EXPORT PFNGLFINISHASYNCSGIXPROC __glewFinishAsyncSGIX; -GLEW_FUN_EXPORT PFNGLGENASYNCMARKERSSGIXPROC __glewGenAsyncMarkersSGIX; -GLEW_FUN_EXPORT PFNGLISASYNCMARKERSGIXPROC __glewIsAsyncMarkerSGIX; -GLEW_FUN_EXPORT PFNGLPOLLASYNCSGIXPROC __glewPollAsyncSGIX; - -GLEW_FUN_EXPORT PFNGLFLUSHRASTERSGIXPROC __glewFlushRasterSGIX; - -GLEW_FUN_EXPORT PFNGLTEXTUREFOGSGIXPROC __glewTextureFogSGIX; - -GLEW_FUN_EXPORT PFNGLFRAGMENTCOLORMATERIALSGIXPROC __glewFragmentColorMaterialSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFSGIXPROC __glewFragmentLightModelfSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELFVSGIXPROC __glewFragmentLightModelfvSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELISGIXPROC __glewFragmentLightModeliSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTMODELIVSGIXPROC __glewFragmentLightModelivSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFSGIXPROC __glewFragmentLightfSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTFVSGIXPROC __glewFragmentLightfvSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTISGIXPROC __glewFragmentLightiSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTLIGHTIVSGIXPROC __glewFragmentLightivSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFSGIXPROC __glewFragmentMaterialfSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALFVSGIXPROC __glewFragmentMaterialfvSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALISGIXPROC __glewFragmentMaterialiSGIX; -GLEW_FUN_EXPORT PFNGLFRAGMENTMATERIALIVSGIXPROC __glewFragmentMaterialivSGIX; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTFVSGIXPROC __glewGetFragmentLightfvSGIX; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTLIGHTIVSGIXPROC __glewGetFragmentLightivSGIX; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALFVSGIXPROC __glewGetFragmentMaterialfvSGIX; -GLEW_FUN_EXPORT PFNGLGETFRAGMENTMATERIALIVSGIXPROC __glewGetFragmentMaterialivSGIX; - -GLEW_FUN_EXPORT PFNGLFRAMEZOOMSGIXPROC __glewFrameZoomSGIX; - -GLEW_FUN_EXPORT PFNGLPIXELTEXGENSGIXPROC __glewPixelTexGenSGIX; - -GLEW_FUN_EXPORT PFNGLREFERENCEPLANESGIXPROC __glewReferencePlaneSGIX; - -GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFSGIXPROC __glewSpriteParameterfSGIX; -GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERFVSGIXPROC __glewSpriteParameterfvSGIX; -GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERISGIXPROC __glewSpriteParameteriSGIX; -GLEW_FUN_EXPORT PFNGLSPRITEPARAMETERIVSGIXPROC __glewSpriteParameterivSGIX; - -GLEW_FUN_EXPORT PFNGLTAGSAMPLEBUFFERSGIXPROC __glewTagSampleBufferSGIX; - -GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERFVSGIPROC __glewColorTableParameterfvSGI; -GLEW_FUN_EXPORT PFNGLCOLORTABLEPARAMETERIVSGIPROC __glewColorTableParameterivSGI; -GLEW_FUN_EXPORT PFNGLCOLORTABLESGIPROC __glewColorTableSGI; -GLEW_FUN_EXPORT PFNGLCOPYCOLORTABLESGIPROC __glewCopyColorTableSGI; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERFVSGIPROC __glewGetColorTableParameterfvSGI; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLEPARAMETERIVSGIPROC __glewGetColorTableParameterivSGI; -GLEW_FUN_EXPORT PFNGLGETCOLORTABLESGIPROC __glewGetColorTableSGI; - -GLEW_FUN_EXPORT PFNGLFINISHTEXTURESUNXPROC __glewFinishTextureSUNX; - -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORBSUNPROC __glewGlobalAlphaFactorbSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORDSUNPROC __glewGlobalAlphaFactordSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORFSUNPROC __glewGlobalAlphaFactorfSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORISUNPROC __glewGlobalAlphaFactoriSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORSSUNPROC __glewGlobalAlphaFactorsSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUBSUNPROC __glewGlobalAlphaFactorubSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUISUNPROC __glewGlobalAlphaFactoruiSUN; -GLEW_FUN_EXPORT PFNGLGLOBALALPHAFACTORUSSUNPROC __glewGlobalAlphaFactorusSUN; - -GLEW_FUN_EXPORT PFNGLREADVIDEOPIXELSSUNPROC __glewReadVideoPixelsSUN; - -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEPOINTERSUNPROC __glewReplacementCodePointerSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBSUNPROC __glewReplacementCodeubSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUBVSUNPROC __glewReplacementCodeubvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUISUNPROC __glewReplacementCodeuiSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVSUNPROC __glewReplacementCodeuivSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSSUNPROC __glewReplacementCodeusSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUSVSUNPROC __glewReplacementCodeusvSUN; - -GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FSUNPROC __glewColor3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLCOLOR3FVERTEX3FVSUNPROC __glewColor3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewColor4fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewColor4fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FSUNPROC __glewColor4ubVertex2fSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX2FVSUNPROC __glewColor4ubVertex2fvSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FSUNPROC __glewColor4ubVertex3fSUN; -GLEW_FUN_EXPORT PFNGLCOLOR4UBVERTEX3FVSUNPROC __glewColor4ubVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FSUNPROC __glewNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLNORMAL3FVERTEX3FVSUNPROC __glewNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC __glewReplacementCodeuiColor3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiColor4fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC __glewReplacementCodeuiColor4ubVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC __glewReplacementCodeuiColor4ubVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC __glewReplacementCodeuiTexCoord2fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC __glewReplacementCodeuiVertex3fSUN; -GLEW_FUN_EXPORT PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC __glewReplacementCodeuiVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC __glewTexCoord2fColor3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC __glewTexCoord2fColor3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fColor4fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC __glewTexCoord2fColor4ubVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC __glewTexCoord2fColor4ubVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC __glewTexCoord2fNormal3fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC __glewTexCoord2fNormal3fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FSUNPROC __glewTexCoord2fVertex3fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD2FVERTEX3FVSUNPROC __glewTexCoord2fVertex3fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC __glewTexCoord4fColor4fNormal3fVertex4fvSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FSUNPROC __glewTexCoord4fVertex4fSUN; -GLEW_FUN_EXPORT PFNGLTEXCOORD4FVERTEX4FVSUNPROC __glewTexCoord4fVertex4fvSUN; - -GLEW_FUN_EXPORT PFNGLADDSWAPHINTRECTWINPROC __glewAddSwapHintRectWIN; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_2_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_3; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_4; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_1_5; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_2_0; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_2_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_0; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_2; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_3_3; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_0; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_1; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_2; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_3; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_4; -GLEW_VAR_EXPORT GLboolean __GLEW_VERSION_4_5; -GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_tbuffer; -GLEW_VAR_EXPORT GLboolean __GLEW_3DFX_texture_compression_FXT1; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_blend_minmax_factor; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_conservative_depth; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_debug_output; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_depth_clamp_separate; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_draw_buffers_blend; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_gcn_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_gpu_shader_int64; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_interleaved_elements; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_multi_draw_indirect; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_name_gen_delete; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_occlusion_query_event; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_performance_monitor; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_pinned_memory; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_query_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_sample_positions; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_seamless_cubemap_per_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_atomic_counter_ops; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_explicit_vertex_parameter; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_stencil_export; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_stencil_value_export; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_shader_trinary_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_sparse_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_stencil_operation_extended; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_texture_texture4; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_transform_feedback3_lines_triangles; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_transform_feedback4; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_layer; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_tessellator; -GLEW_VAR_EXPORT GLboolean __GLEW_AMD_vertex_shader_viewport_index; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_depth_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_framebuffer_blit; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_framebuffer_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_instanced_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_pack_reverse_row_order; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_program_binary; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_compression_dxt1; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_compression_dxt3; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_compression_dxt5; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_texture_usage; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_timer_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ANGLE_translated_shader_source; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_aux_depth_stencil; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_client_storage; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_element_array; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_fence; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_float_pixels; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_flush_buffer_range; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_object_purgeable; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_pixel_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_rgb_422; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_row_bytes; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_specular_vector; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_texture_range; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_transform_hint; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_object; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_array_range; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_vertex_program_evaluators; -GLEW_VAR_EXPORT GLboolean __GLEW_APPLE_ycbcr_422; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES2_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_1_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_2_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_ES3_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_arrays_of_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_base_instance; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_bindless_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_blend_func_extended; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_buffer_storage; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_cl_event; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clear_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clear_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_clip_control; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_color_buffer_float; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compressed_texture_pixel_storage; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compute_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_compute_variable_group_size; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_conditional_render_inverted; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_conservative_depth; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_copy_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_copy_image; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_cull_distance; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_debug_output; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_buffer_float; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_depth_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_derivative_control; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_direct_state_access; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_buffers; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_buffers_blend; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_elements_base_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_indirect; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_draw_instanced; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_enhanced_layouts; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_explicit_attrib_location; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_explicit_uniform_location; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_coord_conventions; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_layer_viewport; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_program_shadow; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_fragment_shader_interlock; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_no_attachments; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_framebuffer_sRGB; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_geometry_shader4; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_get_program_binary; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_get_texture_sub_image; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gl_spirv; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader5; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader_fp64; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_gpu_shader_int64; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_half_float_pixel; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_half_float_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_imaging; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_indirect_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_instanced_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_internalformat_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_internalformat_query2; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_invalidate_subdata; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_map_buffer_alignment; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_map_buffer_range; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_matrix_palette; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multi_bind; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multi_draw_indirect; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_multitexture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_occlusion_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_occlusion_query2; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_parallel_shader_compile; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_pipeline_statistics_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_pixel_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_point_sprite; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_post_depth_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_program_interface_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_provoking_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_query_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robust_buffer_access_behavior; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness_application_isolation; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_robustness_share_group_isolation; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sample_locations; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sample_shading; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sampler_objects; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_seamless_cube_map; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_seamless_cubemap_per_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_separate_shader_objects; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_atomic_counter_ops; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_atomic_counters; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_ballot; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_bit_encoding; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_clock; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_draw_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_group_vote; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_image_load_store; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_image_size; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_objects; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_precision; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_stencil_export; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_storage_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_subroutine; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_texture_image_samples; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_texture_lod; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shader_viewport_layer_array; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_100; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_420pack; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_include; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shading_language_packing; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_shadow_ambient; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_texture2; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sparse_texture_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_stencil_texturing; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_sync; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_tessellation_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_barrier; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_border_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_object_rgb32; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_buffer_range; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression_bptc; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_compression_rgtc; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_cube_map; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_cube_map_array; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_add; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_combine; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_crossbar; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_env_dot3; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_filter_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_float; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_gather; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_mirror_clamp_to_edge; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_mirrored_repeat; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_non_power_of_two; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_query_levels; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_query_lod; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rectangle; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rg; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_rgb10_a2ui; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_stencil8; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_storage; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_storage_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_swizzle; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_texture_view; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_timer_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback2; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback3; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback_instanced; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transform_feedback_overflow_query; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_transpose_matrix; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_uniform_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_array_bgra; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_array_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_attrib_64bit; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_attrib_binding; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_blend; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_program; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_type_10f_11f_11f_rev; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_vertex_type_2_10_10_10_rev; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_viewport_array; -GLEW_VAR_EXPORT GLboolean __GLEW_ARB_window_pos; -GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_point_sprites; -GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_combine3; -GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_texture_env_route; -GLEW_VAR_EXPORT GLboolean __GLEW_ATIX_vertex_shader_output_point_size; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_draw_buffers; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_element_array; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_envmap_bumpmap; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_fragment_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_map_object_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_meminfo; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_pn_triangles; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_separate_stencil; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_shader_texture_lod; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_text_fragment_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_compression_3dc; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_env_combine3; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_float; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_texture_mirror_once; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_array_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_attrib_array_object; -GLEW_VAR_EXPORT GLboolean __GLEW_ATI_vertex_streams; -GLEW_VAR_EXPORT GLboolean __GLEW_EGL_NV_robustness_video_memory_purge; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_422_pixels; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_Cg_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_abgr; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_bgra; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_bindable_uniform; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_color; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_equation_separate; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_func_separate; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_logic_op; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_blend_subtract; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_clip_volume_hint; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cmyka; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_color_subtable; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_compiled_vertex_array; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_convolution; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_coordinate_frame; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_copy_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_cull_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_label; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_debug_marker; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_depth_bounds_test; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_direct_state_access; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_buffers2; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_instanced; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_draw_range_elements; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fog_coord; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_fragment_lighting; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_blit; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_multisample_blit_scaled; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_framebuffer_sRGB; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_geometry_shader4; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_gpu_program_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_gpu_shader4; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_histogram; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_array_formats; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_func; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_material; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_index_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_light_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_misc_attribute; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multi_draw_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_depth_stencil; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_float; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_packed_pixels; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_paletted_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_pixel_transform_color_table; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_point_parameters; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_polygon_offset; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_polygon_offset_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_post_depth_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_provoking_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_raster_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_rescale_normal; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_scene_marker; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_secondary_color; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_shader_objects; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_separate_specular_color; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_formatted; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_image_load_store; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shader_integer_mix; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shadow_funcs; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_shared_texture_palette; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_sparse_texture2; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_clear_tag; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_two_side; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_stencil_wrap; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_subtexture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture3D; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_array; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_dxt1; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_latc; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_rgtc; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_compression_s3tc; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_cube_map; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_edge_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_add; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_combine; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_env_dot3; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_filter_anisotropic; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_filter_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_integer; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_lod_bias; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_mirror_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_object; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_perturb_normal; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_rectangle; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_sRGB_decode; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_shared_exponent; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_snorm; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_texture_swizzle; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_timer_query; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_transform_feedback; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_array_bgra; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_attrib_64bit; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_vertex_weighting; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_window_rectangles; -GLEW_VAR_EXPORT GLboolean __GLEW_EXT_x11_sync_object; -GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_frame_terminator; -GLEW_VAR_EXPORT GLboolean __GLEW_GREMEDY_string_marker; -GLEW_VAR_EXPORT GLboolean __GLEW_HP_convolution_border_modes; -GLEW_VAR_EXPORT GLboolean __GLEW_HP_image_transform; -GLEW_VAR_EXPORT GLboolean __GLEW_HP_occlusion_test; -GLEW_VAR_EXPORT GLboolean __GLEW_HP_texture_lighting; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_cull_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_multimode_draw_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_rasterpos_clip; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_static_data; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_texture_mirrored_repeat; -GLEW_VAR_EXPORT GLboolean __GLEW_IBM_vertex_array_lists; -GLEW_VAR_EXPORT GLboolean __GLEW_INGR_color_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_INGR_interlace_read; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_conservative_rasterization; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_fragment_shader_ordering; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_framebuffer_CMAA; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_map_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_parallel_arrays; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_performance_query; -GLEW_VAR_EXPORT GLboolean __GLEW_INTEL_texture_scissor; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_blend_equation_advanced; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_blend_equation_advanced_coherent; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_context_flush_control; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_debug; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_no_error; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_robust_buffer_access_behavior; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_robustness; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_hdr; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_ldr; -GLEW_VAR_EXPORT GLboolean __GLEW_KHR_texture_compression_astc_sliced_3d; -GLEW_VAR_EXPORT GLboolean __GLEW_KTX_buffer_region; -GLEW_VAR_EXPORT GLboolean __GLEW_MESAX_texture_stack; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_pack_invert; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_resize_buffers; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_shader_integer_functions; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_window_pos; -GLEW_VAR_EXPORT GLboolean __GLEW_MESA_ycbcr_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_NVX_blend_equation_advanced_multi_draw_buffers; -GLEW_VAR_EXPORT GLboolean __GLEW_NVX_conditional_render; -GLEW_VAR_EXPORT GLboolean __GLEW_NVX_gpu_memory_info; -GLEW_VAR_EXPORT GLboolean __GLEW_NVX_linked_gpu_multicast; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_multi_draw_indirect; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_multi_draw_indirect_count; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_bindless_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_equation_advanced; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_equation_advanced_coherent; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_blend_square; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_clip_space_w_scaling; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_command_list; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_compute_program5; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_conditional_render; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_conservative_raster; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_conservative_raster_dilate; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_conservative_raster_pre_snap_triangles; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_depth_to_color; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_copy_image; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_deep_texture3D; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_buffer_float; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_depth_range_unclamped; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_draw_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_draw_vulkan_image; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_evaluators; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_explicit_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fence; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fill_rectangle; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_float_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fog_distance; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_coverage_to_color; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_program_option; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_fragment_shader_interlock; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_framebuffer_mixed_samples; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_framebuffer_multisample_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_program4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_shader4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_geometry_shader_passthrough; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_multicast; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program5; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program5_mem_extended; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_program_fp64; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_gpu_shader5; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_half_float; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_internalformat_sample_query; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_light_max_exponent; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_multisample_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_multisample_filter_hint; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_occlusion_query; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_packed_depth_stencil; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_parameter_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_parameter_buffer_object2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_path_rendering; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_path_rendering_shared_edge; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_pixel_data_range; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_point_sprite; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_present_video; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_primitive_restart; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_register_combiners2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_robustness_video_memory_purge; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_sample_locations; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_sample_mask_override_coverage; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_counters; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_float; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_float64; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_fp16_vector; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_atomic_int64; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_buffer_load; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_storage_buffer_object; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_thread_group; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_shader_thread_shuffle; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_stereo_view_rendering; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_tessellation_program5; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_emboss; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texgen_reflection; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_barrier; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_compression_vtc; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_env_combine4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_expand_normal; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_rectangle; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_texture_shader3; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_transform_feedback; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_transform_feedback2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_uniform_buffer_unified_memory; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vdpau_interop; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_array_range2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_attrib_integer_64bit; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_buffer_unified_memory; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program1_1; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program2_option; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program3; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_vertex_program4; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_video_capture; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_viewport_array2; -GLEW_VAR_EXPORT GLboolean __GLEW_NV_viewport_swizzle; -GLEW_VAR_EXPORT GLboolean __GLEW_OES_byte_coordinates; -GLEW_VAR_EXPORT GLboolean __GLEW_OES_compressed_paletted_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_OES_read_format; -GLEW_VAR_EXPORT GLboolean __GLEW_OES_single_precision; -GLEW_VAR_EXPORT GLboolean __GLEW_OML_interlace; -GLEW_VAR_EXPORT GLboolean __GLEW_OML_resample; -GLEW_VAR_EXPORT GLboolean __GLEW_OML_subsample; -GLEW_VAR_EXPORT GLboolean __GLEW_OVR_multiview; -GLEW_VAR_EXPORT GLboolean __GLEW_OVR_multiview2; -GLEW_VAR_EXPORT GLboolean __GLEW_PGI_misc_hints; -GLEW_VAR_EXPORT GLboolean __GLEW_PGI_vertex_hints; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_ES1_0_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_ES1_1_compatibility; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_enable; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_error_string; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_extension_query; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_log; -GLEW_VAR_EXPORT GLboolean __GLEW_REGAL_proc_address; -GLEW_VAR_EXPORT GLboolean __GLEW_REND_screen_coordinates; -GLEW_VAR_EXPORT GLboolean __GLEW_S3_s3tc; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_color_range; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_detail_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_fog_function; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_generate_mipmap; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_multisample; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_pixel_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_point_line_texgen; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_sharpen_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture4D; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_border_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_edge_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_filter4; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_lod; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIS_texture_select; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_histogram; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_async_pixel; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_blend_alpha_minmax; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_clipmap; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_convolution_accuracy; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_depth_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_flush_raster; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_offset; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fog_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_fragment_specular_lighting; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_framezoom; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_interlace; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ir_instrument1; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_list_priority; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_pixel_texture_bits; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_reference_plane; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_resample; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_shadow_ambient; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_sprite; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_tag_sample_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_add_env; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_coordinate_clamp; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_lod_bias; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_multi_buffer; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_range; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_texture_scale_bias; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_vertex_preclip_hint; -GLEW_VAR_EXPORT GLboolean __GLEW_SGIX_ycrcb; -GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_matrix; -GLEW_VAR_EXPORT GLboolean __GLEW_SGI_color_table; -GLEW_VAR_EXPORT GLboolean __GLEW_SGI_texture_color_table; -GLEW_VAR_EXPORT GLboolean __GLEW_SUNX_constant_data; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_convolution_border_modes; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_global_alpha; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_mesh_array; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_read_video_pixels; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_slice_accum; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_triangle_list; -GLEW_VAR_EXPORT GLboolean __GLEW_SUN_vertex; -GLEW_VAR_EXPORT GLboolean __GLEW_WIN_phong_shading; -GLEW_VAR_EXPORT GLboolean __GLEW_WIN_specular_fog; -GLEW_VAR_EXPORT GLboolean __GLEW_WIN_swap_hint; -/* ------------------------------------------------------------------------- */ - -/* error codes */ -#define GLEW_OK 0 -#define GLEW_NO_ERROR 0 -#define GLEW_ERROR_NO_GL_VERSION 1 /* missing GL version */ -#define GLEW_ERROR_GL_VERSION_10_ONLY 2 /* Need at least OpenGL 1.1 */ -#define GLEW_ERROR_GLX_VERSION_11_ONLY 3 /* Need at least GLX 1.2 */ - -/* string codes */ -#define GLEW_VERSION 1 -#define GLEW_VERSION_MAJOR 2 -#define GLEW_VERSION_MINOR 3 -#define GLEW_VERSION_MICRO 4 - -/* ------------------------------------------------------------------------- */ - -/* GLEW version info */ - -/* -VERSION 2.0.0 -VERSION_MAJOR 2 -VERSION_MINOR 0 -VERSION_MICRO 0 -*/ - -/* API */ -GLEWAPI GLenum GLEWAPIENTRY glewInit (void); -GLEWAPI GLboolean GLEWAPIENTRY glewIsSupported (const char *name); -#define glewIsExtensionSupported(x) glewIsSupported(x) - -#ifndef GLEW_GET_VAR -#define GLEW_GET_VAR(x) (*(const GLboolean*)&x) -#endif - -#ifndef GLEW_GET_FUN -#define GLEW_GET_FUN(x) x -#endif - -GLEWAPI GLboolean glewExperimental; -GLEWAPI GLboolean GLEWAPIENTRY glewGetExtension (const char *name); -GLEWAPI const GLubyte * GLEWAPIENTRY glewGetErrorString (GLenum error); -GLEWAPI const GLubyte * GLEWAPIENTRY glewGetString (GLenum name); - -#ifdef __cplusplus -} -#endif - -#ifdef GLEW_APIENTRY_DEFINED -#undef GLEW_APIENTRY_DEFINED -#undef APIENTRY -#endif - -#ifdef GLEW_CALLBACK_DEFINED -#undef GLEW_CALLBACK_DEFINED -#undef CALLBACK -#endif - -#ifdef GLEW_WINGDIAPI_DEFINED -#undef GLEW_WINGDIAPI_DEFINED -#undef WINGDIAPI -#endif - -#undef GLAPI -/* #undef GLEWAPI */ - -#endif /* __glew_h__ */ diff --git a/opengl/glew32.lib b/opengl/glew32.lib deleted file mode 100644 index 24793a72a5f7573aa111aca87058ebf67f53f448..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631602 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 diff --git a/opengl/glew32s.lib b/opengl/glew32s.lib deleted file mode 100644 index 18510029c78364637fc65df33c1c80a7868bb152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2141998 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

Z!Q2s@ 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%0A(z6*bJq9Vmn3!x?&#Awc#8kRpm!qYex$ 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 diff --git a/opengl/glext.h b/opengl/glext.h deleted file mode 100644 index 7bb8e6e7..00000000 --- a/opengl/glext.h +++ /dev/null @@ -1,6495 +0,0 @@ -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** License Applicability. Except to the extent portions of this file are -** made subject to an alternative license as permitted in the SGI Free -** Software License B, Version 1.1 (the "License"), the contents of this -** file are subject only to the provisions of the License. You may not use -** this file except in compliance with the License. You may obtain a copy -** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** -** http://oss.sgi.com/projects/FreeB -** -** Note that, as provided in the License, the Software is distributed on an -** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** -** Original Code. The Original Code is: OpenGL Sample Implementation, -** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -** Inc. The Original Code is Copyright (c) 1991-2004 Silicon Graphics, Inc. -** Copyright in any portions created by third parties is as indicated -** elsewhere herein. All Rights Reserved. -** -** Additional Notice Provisions: This software was created using the -** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has -** not been independently verified as being compliant with the OpenGL(R) -** version 1.2.1 Specification. -*/ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif - -/*************************************************************/ - -/* Header file version number, required by OpenGL ABI for Linux */ -/* glext.h last updated 2005/06/20 */ -/* Current version at http://oss.sgi.com/projects/ogl-sample/registry/ */ -#define GL_GLEXT_VERSION 29 - -#ifndef GL_VERSION_1_2 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_RESCALE_NORMAL 0x803A -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#endif - -#ifndef GL_ARB_imaging -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CONSTANT_BORDER 0x8151 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 -#endif - -#ifndef GL_VERSION_1_3 -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_MULTISAMPLE_BIT 0x20000000 -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_CLAMP_TO_BORDER 0x812D -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_SUBTRACT 0x84E7 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#endif - -#ifndef GL_VERSION_1_4 -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#define GL_COMPARE_R_TO_TEXTURE 0x884E -#endif - -#ifndef GL_VERSION_1_5 -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 -#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE -#define GL_FOG_COORD GL_FOG_COORDINATE -#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE -#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE -#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE -#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER -#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING -#define GL_SRC0_RGB GL_SOURCE0_RGB -#define GL_SRC1_RGB GL_SOURCE1_RGB -#define GL_SRC2_RGB GL_SOURCE2_RGB -#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA -#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA -#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA -#endif - -#ifndef GL_VERSION_2_0 -#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_COORDS 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif - -#ifndef GL_ARB_multisample -#define GL_MULTISAMPLE_ARB 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F -#define GL_SAMPLE_COVERAGE_ARB 0x80A0 -#define GL_SAMPLE_BUFFERS_ARB 0x80A8 -#define GL_SAMPLES_ARB 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB -#define GL_MULTISAMPLE_BIT_ARB 0x20000000 -#endif - -#ifndef GL_ARB_texture_env_add -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_NORMAL_MAP_ARB 0x8511 -#define GL_REFLECTION_MAP_ARB 0x8512 -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C -#endif - -#ifndef GL_ARB_texture_compression -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 -#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB -#define GL_COMPRESSED_INTENSITY_ARB 0x84EC -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 -#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_CLAMP_TO_BORDER_ARB 0x812D -#endif - -#ifndef GL_ARB_point_parameters -#define GL_POINT_SIZE_MIN_ARB 0x8126 -#define GL_POINT_SIZE_MAX_ARB 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 -#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 -#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 -#define GL_VERTEX_BLEND_ARB 0x86A7 -#define GL_CURRENT_WEIGHT_ARB 0x86A8 -#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 -#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA -#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB -#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC -#define GL_WEIGHT_ARRAY_ARB 0x86AD -#define GL_MODELVIEW0_ARB 0x1700 -#define GL_MODELVIEW1_ARB 0x850A -#define GL_MODELVIEW2_ARB 0x8722 -#define GL_MODELVIEW3_ARB 0x8723 -#define GL_MODELVIEW4_ARB 0x8724 -#define GL_MODELVIEW5_ARB 0x8725 -#define GL_MODELVIEW6_ARB 0x8726 -#define GL_MODELVIEW7_ARB 0x8727 -#define GL_MODELVIEW8_ARB 0x8728 -#define GL_MODELVIEW9_ARB 0x8729 -#define GL_MODELVIEW10_ARB 0x872A -#define GL_MODELVIEW11_ARB 0x872B -#define GL_MODELVIEW12_ARB 0x872C -#define GL_MODELVIEW13_ARB 0x872D -#define GL_MODELVIEW14_ARB 0x872E -#define GL_MODELVIEW15_ARB 0x872F -#define GL_MODELVIEW16_ARB 0x8730 -#define GL_MODELVIEW17_ARB 0x8731 -#define GL_MODELVIEW18_ARB 0x8732 -#define GL_MODELVIEW19_ARB 0x8733 -#define GL_MODELVIEW20_ARB 0x8734 -#define GL_MODELVIEW21_ARB 0x8735 -#define GL_MODELVIEW22_ARB 0x8736 -#define GL_MODELVIEW23_ARB 0x8737 -#define GL_MODELVIEW24_ARB 0x8738 -#define GL_MODELVIEW25_ARB 0x8739 -#define GL_MODELVIEW26_ARB 0x873A -#define GL_MODELVIEW27_ARB 0x873B -#define GL_MODELVIEW28_ARB 0x873C -#define GL_MODELVIEW29_ARB 0x873D -#define GL_MODELVIEW30_ARB 0x873E -#define GL_MODELVIEW31_ARB 0x873F -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_MATRIX_PALETTE_ARB 0x8840 -#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 -#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 -#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 -#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 -#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 -#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 -#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 -#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 -#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_COMBINE_ARB 0x8570 -#define GL_COMBINE_RGB_ARB 0x8571 -#define GL_COMBINE_ALPHA_ARB 0x8572 -#define GL_SOURCE0_RGB_ARB 0x8580 -#define GL_SOURCE1_RGB_ARB 0x8581 -#define GL_SOURCE2_RGB_ARB 0x8582 -#define GL_SOURCE0_ALPHA_ARB 0x8588 -#define GL_SOURCE1_ALPHA_ARB 0x8589 -#define GL_SOURCE2_ALPHA_ARB 0x858A -#define GL_OPERAND0_RGB_ARB 0x8590 -#define GL_OPERAND1_RGB_ARB 0x8591 -#define GL_OPERAND2_RGB_ARB 0x8592 -#define GL_OPERAND0_ALPHA_ARB 0x8598 -#define GL_OPERAND1_ALPHA_ARB 0x8599 -#define GL_OPERAND2_ALPHA_ARB 0x859A -#define GL_RGB_SCALE_ARB 0x8573 -#define GL_ADD_SIGNED_ARB 0x8574 -#define GL_INTERPOLATE_ARB 0x8575 -#define GL_SUBTRACT_ARB 0x84E7 -#define GL_CONSTANT_ARB 0x8576 -#define GL_PRIMARY_COLOR_ARB 0x8577 -#define GL_PREVIOUS_ARB 0x8578 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_DOT3_RGB_ARB 0x86AE -#define GL_DOT3_RGBA_ARB 0x86AF -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_ARB 0x8370 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_DEPTH_COMPONENT16_ARB 0x81A5 -#define GL_DEPTH_COMPONENT24_ARB 0x81A6 -#define GL_DEPTH_COMPONENT32_ARB 0x81A7 -#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A -#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B -#endif - -#ifndef GL_ARB_shadow -#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C -#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D -#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF -#endif - -#ifndef GL_ARB_window_pos -#endif - -#ifndef GL_ARB_vertex_program -#define GL_COLOR_SUM_ARB 0x8458 -#define GL_VERTEX_PROGRAM_ARB 0x8620 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 -#define GL_PROGRAM_LENGTH_ARB 0x8627 -#define GL_PROGRAM_STRING_ARB 0x8628 -#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E -#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F -#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 -#define GL_CURRENT_MATRIX_ARB 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 -#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B -#define GL_PROGRAM_BINDING_ARB 0x8677 -#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A -#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 -#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -#define GL_PROGRAM_FORMAT_ARB 0x8876 -#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 -#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 -#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 -#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 -#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 -#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 -#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 -#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 -#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 -#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 -#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA -#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB -#define GL_PROGRAM_ATTRIBS_ARB 0x88AC -#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD -#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE -#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF -#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 -#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 -#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 -#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 -#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 -#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 -#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 -#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 -#define GL_MATRIX0_ARB 0x88C0 -#define GL_MATRIX1_ARB 0x88C1 -#define GL_MATRIX2_ARB 0x88C2 -#define GL_MATRIX3_ARB 0x88C3 -#define GL_MATRIX4_ARB 0x88C4 -#define GL_MATRIX5_ARB 0x88C5 -#define GL_MATRIX6_ARB 0x88C6 -#define GL_MATRIX7_ARB 0x88C7 -#define GL_MATRIX8_ARB 0x88C8 -#define GL_MATRIX9_ARB 0x88C9 -#define GL_MATRIX10_ARB 0x88CA -#define GL_MATRIX11_ARB 0x88CB -#define GL_MATRIX12_ARB 0x88CC -#define GL_MATRIX13_ARB 0x88CD -#define GL_MATRIX14_ARB 0x88CE -#define GL_MATRIX15_ARB 0x88CF -#define GL_MATRIX16_ARB 0x88D0 -#define GL_MATRIX17_ARB 0x88D1 -#define GL_MATRIX18_ARB 0x88D2 -#define GL_MATRIX19_ARB 0x88D3 -#define GL_MATRIX20_ARB 0x88D4 -#define GL_MATRIX21_ARB 0x88D5 -#define GL_MATRIX22_ARB 0x88D6 -#define GL_MATRIX23_ARB 0x88D7 -#define GL_MATRIX24_ARB 0x88D8 -#define GL_MATRIX25_ARB 0x88D9 -#define GL_MATRIX26_ARB 0x88DA -#define GL_MATRIX27_ARB 0x88DB -#define GL_MATRIX28_ARB 0x88DC -#define GL_MATRIX29_ARB 0x88DD -#define GL_MATRIX30_ARB 0x88DE -#define GL_MATRIX31_ARB 0x88DF -#endif - -#ifndef GL_ARB_fragment_program -#define GL_FRAGMENT_PROGRAM_ARB 0x8804 -#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 -#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 -#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 -#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 -#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 -#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A -#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B -#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C -#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D -#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E -#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F -#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 -#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_BUFFER_SIZE_ARB 0x8764 -#define GL_BUFFER_USAGE_ARB 0x8765 -#define GL_ARRAY_BUFFER_ARB 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 -#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F -#define GL_READ_ONLY_ARB 0x88B8 -#define GL_WRITE_ONLY_ARB 0x88B9 -#define GL_READ_WRITE_ARB 0x88BA -#define GL_BUFFER_ACCESS_ARB 0x88BB -#define GL_BUFFER_MAPPED_ARB 0x88BC -#define GL_BUFFER_MAP_POINTER_ARB 0x88BD -#define GL_STREAM_DRAW_ARB 0x88E0 -#define GL_STREAM_READ_ARB 0x88E1 -#define GL_STREAM_COPY_ARB 0x88E2 -#define GL_STATIC_DRAW_ARB 0x88E4 -#define GL_STATIC_READ_ARB 0x88E5 -#define GL_STATIC_COPY_ARB 0x88E6 -#define GL_DYNAMIC_DRAW_ARB 0x88E8 -#define GL_DYNAMIC_READ_ARB 0x88E9 -#define GL_DYNAMIC_COPY_ARB 0x88EA -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_QUERY_COUNTER_BITS_ARB 0x8864 -#define GL_CURRENT_QUERY_ARB 0x8865 -#define GL_QUERY_RESULT_ARB 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 -#define GL_SAMPLES_PASSED_ARB 0x8914 -#endif - -#ifndef GL_ARB_shader_objects -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 -#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 -#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 -#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 -#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D -#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 -#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#endif - -#ifndef GL_ARB_point_sprite -#define GL_POINT_SPRITE_ARB 0x8861 -#define GL_COORD_REPLACE_ARB 0x8862 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 -#define GL_DRAW_BUFFER0_ARB 0x8825 -#define GL_DRAW_BUFFER1_ARB 0x8826 -#define GL_DRAW_BUFFER2_ARB 0x8827 -#define GL_DRAW_BUFFER3_ARB 0x8828 -#define GL_DRAW_BUFFER4_ARB 0x8829 -#define GL_DRAW_BUFFER5_ARB 0x882A -#define GL_DRAW_BUFFER6_ARB 0x882B -#define GL_DRAW_BUFFER7_ARB 0x882C -#define GL_DRAW_BUFFER8_ARB 0x882D -#define GL_DRAW_BUFFER9_ARB 0x882E -#define GL_DRAW_BUFFER10_ARB 0x882F -#define GL_DRAW_BUFFER11_ARB 0x8830 -#define GL_DRAW_BUFFER12_ARB 0x8831 -#define GL_DRAW_BUFFER13_ARB 0x8832 -#define GL_DRAW_BUFFER14_ARB 0x8833 -#define GL_DRAW_BUFFER15_ARB 0x8834 -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_RGBA_FLOAT_MODE_ARB 0x8820 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -#define GL_FIXED_ONLY_ARB 0x891D -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_HALF_FLOAT_ARB 0x140B -#endif - -#ifndef GL_ARB_texture_float -#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 -#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 -#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 -#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 -#define GL_RGBA32F_ARB 0x8814 -#define GL_RGB32F_ARB 0x8815 -#define GL_ALPHA32F_ARB 0x8816 -#define GL_INTENSITY32F_ARB 0x8817 -#define GL_LUMINANCE32F_ARB 0x8818 -#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 -#define GL_RGBA16F_ARB 0x881A -#define GL_RGB16F_ARB 0x881B -#define GL_ALPHA16F_ARB 0x881C -#define GL_INTENSITY16F_ARB 0x881D -#define GL_LUMINANCE16F_ARB 0x881E -#define GL_LUMINANCE_ALPHA16F_ARB 0x881F -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF -#endif - -#ifndef GL_EXT_abgr -#define GL_ABGR_EXT 0x8000 -#endif - -#ifndef GL_EXT_blend_color -#define GL_CONSTANT_COLOR_EXT 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 -#define GL_CONSTANT_ALPHA_EXT 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 -#define GL_BLEND_COLOR_EXT 0x8005 -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_POLYGON_OFFSET_EXT 0x8037 -#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 -#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 -#endif - -#ifndef GL_EXT_texture -#define GL_ALPHA4_EXT 0x803B -#define GL_ALPHA8_EXT 0x803C -#define GL_ALPHA12_EXT 0x803D -#define GL_ALPHA16_EXT 0x803E -#define GL_LUMINANCE4_EXT 0x803F -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE12_EXT 0x8041 -#define GL_LUMINANCE16_EXT 0x8042 -#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 -#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 -#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 -#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 -#define GL_INTENSITY_EXT 0x8049 -#define GL_INTENSITY4_EXT 0x804A -#define GL_INTENSITY8_EXT 0x804B -#define GL_INTENSITY12_EXT 0x804C -#define GL_INTENSITY16_EXT 0x804D -#define GL_RGB2_EXT 0x804E -#define GL_RGB4_EXT 0x804F -#define GL_RGB5_EXT 0x8050 -#define GL_RGB8_EXT 0x8051 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB12_EXT 0x8053 -#define GL_RGB16_EXT 0x8054 -#define GL_RGBA2_EXT 0x8055 -#define GL_RGBA4_EXT 0x8056 -#define GL_RGB5_A1_EXT 0x8057 -#define GL_RGBA8_EXT 0x8058 -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGBA12_EXT 0x805A -#define GL_RGBA16_EXT 0x805B -#define GL_TEXTURE_RED_SIZE_EXT 0x805C -#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D -#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E -#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 -#define GL_REPLACE_EXT 0x8062 -#define GL_PROXY_TEXTURE_1D_EXT 0x8063 -#define GL_PROXY_TEXTURE_2D_EXT 0x8064 -#define GL_TEXTURE_TOO_LARGE_EXT 0x8065 -#endif - -#ifndef GL_EXT_texture3D -#define GL_PACK_SKIP_IMAGES_EXT 0x806B -#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C -#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D -#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E -#define GL_TEXTURE_3D_EXT 0x806F -#define GL_PROXY_TEXTURE_3D_EXT 0x8070 -#define GL_TEXTURE_DEPTH_EXT 0x8071 -#define GL_TEXTURE_WRAP_R_EXT 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_FILTER4_SGIS 0x8146 -#define GL_TEXTURE_FILTER4_SIZE_SGIS 0x8147 -#endif - -#ifndef GL_EXT_subtexture -#endif - -#ifndef GL_EXT_copy_texture -#endif - -#ifndef GL_EXT_histogram -#define GL_HISTOGRAM_EXT 0x8024 -#define GL_PROXY_HISTOGRAM_EXT 0x8025 -#define GL_HISTOGRAM_WIDTH_EXT 0x8026 -#define GL_HISTOGRAM_FORMAT_EXT 0x8027 -#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C -#define GL_HISTOGRAM_SINK_EXT 0x802D -#define GL_MINMAX_EXT 0x802E -#define GL_MINMAX_FORMAT_EXT 0x802F -#define GL_MINMAX_SINK_EXT 0x8030 -#define GL_TABLE_TOO_LARGE_EXT 0x8031 -#endif - -#ifndef GL_EXT_convolution -#define GL_CONVOLUTION_1D_EXT 0x8010 -#define GL_CONVOLUTION_2D_EXT 0x8011 -#define GL_SEPARABLE_2D_EXT 0x8012 -#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 -#define GL_REDUCE_EXT 0x8016 -#define GL_CONVOLUTION_FORMAT_EXT 0x8017 -#define GL_CONVOLUTION_WIDTH_EXT 0x8018 -#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 -#endif - -#ifndef GL_SGI_color_matrix -#define GL_COLOR_MATRIX_SGI 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB -#endif - -#ifndef GL_SGI_color_table -#define GL_COLOR_TABLE_SGI 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 -#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 -#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 -#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 -#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 -#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_PIXEL_TEXTURE_SGIS 0x8353 -#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354 -#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355 -#define GL_PIXEL_GROUP_COLOR_SGIS 0x8356 -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_PIXEL_TEX_GEN_SGIX 0x8139 -#define GL_PIXEL_TEX_GEN_MODE_SGIX 0x832B -#endif - -#ifndef GL_SGIS_texture4D -#define GL_PACK_SKIP_VOLUMES_SGIS 0x8130 -#define GL_PACK_IMAGE_DEPTH_SGIS 0x8131 -#define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 -#define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 -#define GL_TEXTURE_4D_SGIS 0x8134 -#define GL_PROXY_TEXTURE_4D_SGIS 0x8135 -#define GL_TEXTURE_4DSIZE_SGIS 0x8136 -#define GL_TEXTURE_WRAP_Q_SGIS 0x8137 -#define GL_MAX_4D_TEXTURE_SIZE_SGIS 0x8138 -#define GL_TEXTURE_4D_BINDING_SGIS 0x814F -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC -#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD -#endif - -#ifndef GL_EXT_cmyka -#define GL_CMYK_EXT 0x800C -#define GL_CMYKA_EXT 0x800D -#define GL_PACK_CMYK_HINT_EXT 0x800E -#define GL_UNPACK_CMYK_HINT_EXT 0x800F -#endif - -#ifndef GL_EXT_texture_object -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_DETAIL_TEXTURE_2D_SGIS 0x8095 -#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096 -#define GL_LINEAR_DETAIL_SGIS 0x8097 -#define GL_LINEAR_DETAIL_ALPHA_SGIS 0x8098 -#define GL_LINEAR_DETAIL_COLOR_SGIS 0x8099 -#define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A -#define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B -#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_LINEAR_SHARPEN_SGIS 0x80AD -#define GL_LINEAR_SHARPEN_ALPHA_SGIS 0x80AE -#define GL_LINEAR_SHARPEN_COLOR_SGIS 0x80AF -#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0 -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_TEXTURE_MIN_LOD_SGIS 0x813A -#define GL_TEXTURE_MAX_LOD_SGIS 0x813B -#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C -#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D -#endif - -#ifndef GL_SGIS_multisample -#define GL_MULTISAMPLE_SGIS 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F -#define GL_SAMPLE_MASK_SGIS 0x80A0 -#define GL_1PASS_SGIS 0x80A1 -#define GL_2PASS_0_SGIS 0x80A2 -#define GL_2PASS_1_SGIS 0x80A3 -#define GL_4PASS_0_SGIS 0x80A4 -#define GL_4PASS_1_SGIS 0x80A5 -#define GL_4PASS_2_SGIS 0x80A6 -#define GL_4PASS_3_SGIS 0x80A7 -#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 -#define GL_SAMPLES_SGIS 0x80A9 -#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA -#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB -#define GL_SAMPLE_PATTERN_SGIS 0x80AC -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_RESCALE_NORMAL_EXT 0x803A -#endif - -#ifndef GL_EXT_vertex_array -#define GL_VERTEX_ARRAY_EXT 0x8074 -#define GL_NORMAL_ARRAY_EXT 0x8075 -#define GL_COLOR_ARRAY_EXT 0x8076 -#define GL_INDEX_ARRAY_EXT 0x8077 -#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 -#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 -#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A -#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B -#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C -#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D -#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E -#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F -#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 -#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 -#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 -#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 -#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 -#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 -#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 -#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 -#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A -#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B -#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C -#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D -#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E -#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F -#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 -#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 -#endif - -#ifndef GL_EXT_misc_attribute -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_GENERATE_MIPMAP_SGIS 0x8191 -#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 -#define GL_TEXTURE_CLIPMAP_CENTER_SGIX 0x8171 -#define GL_TEXTURE_CLIPMAP_FRAME_SGIX 0x8172 -#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX 0x8173 -#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174 -#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175 -#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX 0x8176 -#define GL_MAX_CLIPMAP_DEPTH_SGIX 0x8177 -#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178 -#define GL_NEAREST_CLIPMAP_NEAREST_SGIX 0x844D -#define GL_NEAREST_CLIPMAP_LINEAR_SGIX 0x844E -#define GL_LINEAR_CLIPMAP_NEAREST_SGIX 0x844F -#endif - -#ifndef GL_SGIX_shadow -#define GL_TEXTURE_COMPARE_SGIX 0x819A -#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B -#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C -#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_CLAMP_TO_EDGE_SGIS 0x812F -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_CLAMP_TO_BORDER_SGIS 0x812D -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#define GL_BLEND_EQUATION_EXT 0x8009 -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_FUNC_SUBTRACT_EXT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B -#endif - -#ifndef GL_EXT_blend_logic_op -#endif - -#ifndef GL_SGIX_interlace -#define GL_INTERLACE_SGIX 0x8094 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E -#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F -#define GL_PIXEL_TILE_WIDTH_SGIX 0x8140 -#define GL_PIXEL_TILE_HEIGHT_SGIX 0x8141 -#define GL_PIXEL_TILE_GRID_WIDTH_SGIX 0x8142 -#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX 0x8143 -#define GL_PIXEL_TILE_GRID_DEPTH_SGIX 0x8144 -#define GL_PIXEL_TILE_CACHE_SIZE_SGIX 0x8145 -#endif - -#ifndef GL_SGIS_texture_select -#define GL_DUAL_ALPHA4_SGIS 0x8110 -#define GL_DUAL_ALPHA8_SGIS 0x8111 -#define GL_DUAL_ALPHA12_SGIS 0x8112 -#define GL_DUAL_ALPHA16_SGIS 0x8113 -#define GL_DUAL_LUMINANCE4_SGIS 0x8114 -#define GL_DUAL_LUMINANCE8_SGIS 0x8115 -#define GL_DUAL_LUMINANCE12_SGIS 0x8116 -#define GL_DUAL_LUMINANCE16_SGIS 0x8117 -#define GL_DUAL_INTENSITY4_SGIS 0x8118 -#define GL_DUAL_INTENSITY8_SGIS 0x8119 -#define GL_DUAL_INTENSITY12_SGIS 0x811A -#define GL_DUAL_INTENSITY16_SGIS 0x811B -#define GL_DUAL_LUMINANCE_ALPHA4_SGIS 0x811C -#define GL_DUAL_LUMINANCE_ALPHA8_SGIS 0x811D -#define GL_QUAD_ALPHA4_SGIS 0x811E -#define GL_QUAD_ALPHA8_SGIS 0x811F -#define GL_QUAD_LUMINANCE4_SGIS 0x8120 -#define GL_QUAD_LUMINANCE8_SGIS 0x8121 -#define GL_QUAD_INTENSITY4_SGIS 0x8122 -#define GL_QUAD_INTENSITY8_SGIS 0x8123 -#define GL_DUAL_TEXTURE_SELECT_SGIS 0x8124 -#define GL_QUAD_TEXTURE_SELECT_SGIS 0x8125 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SPRITE_SGIX 0x8148 -#define GL_SPRITE_MODE_SGIX 0x8149 -#define GL_SPRITE_AXIS_SGIX 0x814A -#define GL_SPRITE_TRANSLATION_SGIX 0x814B -#define GL_SPRITE_AXIAL_SGIX 0x814C -#define GL_SPRITE_OBJECT_ALIGNED_SGIX 0x814D -#define GL_SPRITE_EYE_ALIGNED_SGIX 0x814E -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E -#endif - -#ifndef GL_EXT_point_parameters -#define GL_POINT_SIZE_MIN_EXT 0x8126 -#define GL_POINT_SIZE_MAX_EXT 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 -#define GL_DISTANCE_ATTENUATION_EXT 0x8129 -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_POINT_SIZE_MIN_SGIS 0x8126 -#define GL_POINT_SIZE_MAX_SGIS 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128 -#define GL_DISTANCE_ATTENUATION_SGIS 0x8129 -#endif - -#ifndef GL_SGIX_instruments -#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180 -#define GL_INSTRUMENT_MEASUREMENTS_SGIX 0x8181 -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179 -#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A -#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B -#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C -#endif - -#ifndef GL_SGIX_framezoom -#define GL_FRAMEZOOM_SGIX 0x818B -#define GL_FRAMEZOOM_FACTOR_SGIX 0x818C -#define GL_MAX_FRAMEZOOM_FACTOR_SGIX 0x818D -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#endif - -#ifndef GL_FfdMaskSGIX -#define GL_TEXTURE_DEFORMATION_BIT_SGIX 0x00000001 -#define GL_GEOMETRY_DEFORMATION_BIT_SGIX 0x00000002 -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_GEOMETRY_DEFORMATION_SGIX 0x8194 -#define GL_TEXTURE_DEFORMATION_SGIX 0x8195 -#define GL_DEFORMATIONS_MASK_SGIX 0x8196 -#define GL_MAX_DEFORMATION_ORDER_SGIX 0x8197 -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_REFERENCE_PLANE_SGIX 0x817D -#define GL_REFERENCE_PLANE_EQUATION_SGIX 0x817E -#endif - -#ifndef GL_SGIX_flush_raster -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_DEPTH_COMPONENT16_SGIX 0x81A5 -#define GL_DEPTH_COMPONENT24_SGIX 0x81A6 -#define GL_DEPTH_COMPONENT32_SGIX 0x81A7 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_FOG_FUNC_SGIS 0x812A -#define GL_FOG_FUNC_POINTS_SGIS 0x812B -#define GL_MAX_FOG_FUNC_POINTS_SGIS 0x812C -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_FOG_OFFSET_SGIX 0x8198 -#define GL_FOG_OFFSET_VALUE_SGIX 0x8199 -#endif - -#ifndef GL_HP_image_transform -#define GL_IMAGE_SCALE_X_HP 0x8155 -#define GL_IMAGE_SCALE_Y_HP 0x8156 -#define GL_IMAGE_TRANSLATE_X_HP 0x8157 -#define GL_IMAGE_TRANSLATE_Y_HP 0x8158 -#define GL_IMAGE_ROTATE_ANGLE_HP 0x8159 -#define GL_IMAGE_ROTATE_ORIGIN_X_HP 0x815A -#define GL_IMAGE_ROTATE_ORIGIN_Y_HP 0x815B -#define GL_IMAGE_MAG_FILTER_HP 0x815C -#define GL_IMAGE_MIN_FILTER_HP 0x815D -#define GL_IMAGE_CUBIC_WEIGHT_HP 0x815E -#define GL_CUBIC_HP 0x815F -#define GL_AVERAGE_HP 0x8160 -#define GL_IMAGE_TRANSFORM_2D_HP 0x8161 -#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162 -#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163 -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_IGNORE_BORDER_HP 0x8150 -#define GL_CONSTANT_BORDER_HP 0x8151 -#define GL_REPLICATE_BORDER_HP 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR_HP 0x8154 -#endif - -#ifndef GL_INGR_palette_buffer -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_TEXTURE_ENV_BIAS_SGIX 0x80BE -#endif - -#ifndef GL_EXT_color_subtable -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_VERTEX_DATA_HINT_PGI 0x1A22A -#define GL_VERTEX_CONSISTENT_HINT_PGI 0x1A22B -#define GL_MATERIAL_SIDE_HINT_PGI 0x1A22C -#define GL_MAX_VERTEX_HINT_PGI 0x1A22D -#define GL_COLOR3_BIT_PGI 0x00010000 -#define GL_COLOR4_BIT_PGI 0x00020000 -#define GL_EDGEFLAG_BIT_PGI 0x00040000 -#define GL_INDEX_BIT_PGI 0x00080000 -#define GL_MAT_AMBIENT_BIT_PGI 0x00100000 -#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000 -#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000 -#define GL_MAT_EMISSION_BIT_PGI 0x00800000 -#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000 -#define GL_MAT_SHININESS_BIT_PGI 0x02000000 -#define GL_MAT_SPECULAR_BIT_PGI 0x04000000 -#define GL_NORMAL_BIT_PGI 0x08000000 -#define GL_TEXCOORD1_BIT_PGI 0x10000000 -#define GL_TEXCOORD2_BIT_PGI 0x20000000 -#define GL_TEXCOORD3_BIT_PGI 0x40000000 -#define GL_TEXCOORD4_BIT_PGI 0x80000000 -#define GL_VERTEX23_BIT_PGI 0x00000004 -#define GL_VERTEX4_BIT_PGI 0x00000008 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 0x1A1F8 -#define GL_CONSERVE_MEMORY_HINT_PGI 0x1A1FD -#define GL_RECLAIM_MEMORY_HINT_PGI 0x1A1FE -#define GL_NATIVE_GRAPHICS_HANDLE_PGI 0x1A202 -#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203 -#define GL_NATIVE_GRAPHICS_END_HINT_PGI 0x1A204 -#define GL_ALWAYS_FAST_HINT_PGI 0x1A20C -#define GL_ALWAYS_SOFT_HINT_PGI 0x1A20D -#define GL_ALLOW_DRAW_OBJ_HINT_PGI 0x1A20E -#define GL_ALLOW_DRAW_WIN_HINT_PGI 0x1A20F -#define GL_ALLOW_DRAW_FRG_HINT_PGI 0x1A210 -#define GL_ALLOW_DRAW_MEM_HINT_PGI 0x1A211 -#define GL_STRICT_DEPTHFUNC_HINT_PGI 0x1A216 -#define GL_STRICT_LIGHTING_HINT_PGI 0x1A217 -#define GL_STRICT_SCISSOR_HINT_PGI 0x1A218 -#define GL_FULL_STIPPLE_HINT_PGI 0x1A219 -#define GL_CLIP_NEAR_HINT_PGI 0x1A220 -#define GL_CLIP_FAR_HINT_PGI 0x1A221 -#define GL_WIDE_LINE_HINT_PGI 0x1A222 -#define GL_BACK_NORMALS_HINT_PGI 0x1A223 -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_LIST_PRIORITY_SGIX 0x8182 -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_IR_INSTRUMENT1_SGIX 0x817F -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_CALLIGRAPHIC_FRAGMENT_SGIX 0x8183 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_TEXTURE_LOD_BIAS_S_SGIX 0x818E -#define GL_TEXTURE_LOD_BIAS_T_SGIX 0x818F -#define GL_TEXTURE_LOD_BIAS_R_SGIX 0x8190 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SHADOW_AMBIENT_SGIX 0x80BF -#endif - -#ifndef GL_EXT_index_texture -#endif - -#ifndef GL_EXT_index_material -#define GL_INDEX_MATERIAL_EXT 0x81B8 -#define GL_INDEX_MATERIAL_PARAMETER_EXT 0x81B9 -#define GL_INDEX_MATERIAL_FACE_EXT 0x81BA -#endif - -#ifndef GL_EXT_index_func -#define GL_INDEX_TEST_EXT 0x81B5 -#define GL_INDEX_TEST_FUNC_EXT 0x81B6 -#define GL_INDEX_TEST_REF_EXT 0x81B7 -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_IUI_V2F_EXT 0x81AD -#define GL_IUI_V3F_EXT 0x81AE -#define GL_IUI_N3F_V2F_EXT 0x81AF -#define GL_IUI_N3F_V3F_EXT 0x81B0 -#define GL_T2F_IUI_V2F_EXT 0x81B1 -#define GL_T2F_IUI_V3F_EXT 0x81B2 -#define GL_T2F_IUI_N3F_V2F_EXT 0x81B3 -#define GL_T2F_IUI_N3F_V3F_EXT 0x81B4 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8 -#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9 -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_CULL_VERTEX_EXT 0x81AA -#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB -#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_YCRCB_422_SGIX 0x81BB -#define GL_YCRCB_444_SGIX 0x81BC -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_FRAGMENT_LIGHTING_SGIX 0x8400 -#define GL_FRAGMENT_COLOR_MATERIAL_SGIX 0x8401 -#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402 -#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403 -#define GL_MAX_FRAGMENT_LIGHTS_SGIX 0x8404 -#define GL_MAX_ACTIVE_LIGHTS_SGIX 0x8405 -#define GL_CURRENT_RASTER_NORMAL_SGIX 0x8406 -#define GL_LIGHT_ENV_MODE_SGIX 0x8407 -#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408 -#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409 -#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A -#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B -#define GL_FRAGMENT_LIGHT0_SGIX 0x840C -#define GL_FRAGMENT_LIGHT1_SGIX 0x840D -#define GL_FRAGMENT_LIGHT2_SGIX 0x840E -#define GL_FRAGMENT_LIGHT3_SGIX 0x840F -#define GL_FRAGMENT_LIGHT4_SGIX 0x8410 -#define GL_FRAGMENT_LIGHT5_SGIX 0x8411 -#define GL_FRAGMENT_LIGHT6_SGIX 0x8412 -#define GL_FRAGMENT_LIGHT7_SGIX 0x8413 -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_RASTER_POSITION_UNCLIPPED_IBM 0x19262 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_TEXTURE_LIGHTING_MODE_HP 0x8167 -#define GL_TEXTURE_POST_SPECULAR_HP 0x8168 -#define GL_TEXTURE_PRE_SPECULAR_HP 0x8169 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 -#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 -#endif - -#ifndef GL_WIN_phong_shading -#define GL_PHONG_WIN 0x80EA -#define GL_PHONG_HINT_WIN 0x80EB -#endif - -#ifndef GL_WIN_specular_fog -#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC -#endif - -#ifndef GL_EXT_light_texture -#define GL_FRAGMENT_MATERIAL_EXT 0x8349 -#define GL_FRAGMENT_NORMAL_EXT 0x834A -#define GL_FRAGMENT_COLOR_EXT 0x834C -#define GL_ATTENUATION_EXT 0x834D -#define GL_SHADOW_ATTENUATION_EXT 0x834E -#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F -#define GL_TEXTURE_LIGHT_EXT 0x8350 -#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351 -#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352 -/* reuse GL_FRAGMENT_DEPTH_EXT */ -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_ALPHA_MIN_SGIX 0x8320 -#define GL_ALPHA_MAX_SGIX 0x8321 -#endif - -#ifndef GL_SGIX_impact_pixel_texture -#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX 0x8184 -#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX 0x8185 -#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX 0x8186 -#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187 -#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188 -#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX 0x8189 -#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX 0x818A -#endif - -#ifndef GL_EXT_bgra -#define GL_BGR_EXT 0x80E0 -#define GL_BGRA_EXT 0x80E1 -#endif - -#ifndef GL_SGIX_async -#define GL_ASYNC_MARKER_SGIX 0x8329 -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C -#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D -#define GL_ASYNC_READ_PIXELS_SGIX 0x835E -#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F -#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360 -#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_ASYNC_HISTOGRAM_SGIX 0x832C -#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D -#endif - -#ifndef GL_INTEL_texture_scissor -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_PARALLEL_ARRAYS_INTEL 0x83F4 -#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5 -#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6 -#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7 -#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8 -#endif - -#ifndef GL_HP_occlusion_test -#define GL_OCCLUSION_TEST_HP 0x8165 -#define GL_OCCLUSION_TEST_RESULT_HP 0x8166 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330 -#define GL_PIXEL_MAG_FILTER_EXT 0x8331 -#define GL_PIXEL_MIN_FILTER_EXT 0x8332 -#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333 -#define GL_CUBIC_EXT 0x8334 -#define GL_AVERAGE_EXT 0x8335 -#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336 -#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337 -#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338 -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8 -#define GL_SINGLE_COLOR_EXT 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA -#endif - -#ifndef GL_EXT_secondary_color -#define GL_COLOR_SUM_EXT 0x8458 -#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D -#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_PERTURB_EXT 0x85AE -#define GL_TEXTURE_NORMAL_EXT 0x85AF -#endif - -#ifndef GL_EXT_multi_draw_arrays -#endif - -#ifndef GL_EXT_fog_coord -#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 -#define GL_FOG_COORDINATE_EXT 0x8451 -#define GL_FRAGMENT_DEPTH_EXT 0x8452 -#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 -#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_SCREEN_COORDINATES_REND 0x8490 -#define GL_INVERTED_SCREEN_W_REND 0x8491 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_TANGENT_ARRAY_EXT 0x8439 -#define GL_BINORMAL_ARRAY_EXT 0x843A -#define GL_CURRENT_TANGENT_EXT 0x843B -#define GL_CURRENT_BINORMAL_EXT 0x843C -#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E -#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F -#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440 -#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441 -#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442 -#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443 -#define GL_MAP1_TANGENT_EXT 0x8444 -#define GL_MAP2_TANGENT_EXT 0x8445 -#define GL_MAP1_BINORMAL_EXT 0x8446 -#define GL_MAP2_BINORMAL_EXT 0x8447 -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_COMBINE_EXT 0x8570 -#define GL_COMBINE_RGB_EXT 0x8571 -#define GL_COMBINE_ALPHA_EXT 0x8572 -#define GL_RGB_SCALE_EXT 0x8573 -#define GL_ADD_SIGNED_EXT 0x8574 -#define GL_INTERPOLATE_EXT 0x8575 -#define GL_CONSTANT_EXT 0x8576 -#define GL_PRIMARY_COLOR_EXT 0x8577 -#define GL_PREVIOUS_EXT 0x8578 -#define GL_SOURCE0_RGB_EXT 0x8580 -#define GL_SOURCE1_RGB_EXT 0x8581 -#define GL_SOURCE2_RGB_EXT 0x8582 -#define GL_SOURCE0_ALPHA_EXT 0x8588 -#define GL_SOURCE1_ALPHA_EXT 0x8589 -#define GL_SOURCE2_ALPHA_EXT 0x858A -#define GL_OPERAND0_RGB_EXT 0x8590 -#define GL_OPERAND1_RGB_EXT 0x8591 -#define GL_OPERAND2_RGB_EXT 0x8592 -#define GL_OPERAND0_ALPHA_EXT 0x8598 -#define GL_OPERAND1_ALPHA_EXT 0x8599 -#define GL_OPERAND2_ALPHA_EXT 0x859A -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_TRANSFORM_HINT_APPLE 0x85B1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_FOG_SCALE_SGIX 0x81FC -#define GL_FOG_SCALE_VALUE_SGIX 0x81FD -#endif - -#ifndef GL_SUNX_constant_data -#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 -#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6 -#endif - -#ifndef GL_SUN_global_alpha -#define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA -#endif - -#ifndef GL_SUN_triangle_list -#define GL_RESTART_SUN 0x0001 -#define GL_REPLACE_MIDDLE_SUN 0x0002 -#define GL_REPLACE_OLDEST_SUN 0x0003 -#define GL_TRIANGLE_LIST_SUN 0x81D7 -#define GL_REPLACEMENT_CODE_SUN 0x81D8 -#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0 -#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1 -#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2 -#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3 -#define GL_R1UI_V3F_SUN 0x85C4 -#define GL_R1UI_C4UB_V3F_SUN 0x85C5 -#define GL_R1UI_C3F_V3F_SUN 0x85C6 -#define GL_R1UI_N3F_V3F_SUN 0x85C7 -#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8 -#define GL_R1UI_T2F_V3F_SUN 0x85C9 -#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA -#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB -#endif - -#ifndef GL_SUN_vertex -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_BLEND_DST_RGB_EXT 0x80C8 -#define GL_BLEND_SRC_RGB_EXT 0x80C9 -#define GL_BLEND_DST_ALPHA_EXT 0x80CA -#define GL_BLEND_SRC_ALPHA_EXT 0x80CB -#endif - -#ifndef GL_INGR_color_clamp -#define GL_RED_MIN_CLAMP_INGR 0x8560 -#define GL_GREEN_MIN_CLAMP_INGR 0x8561 -#define GL_BLUE_MIN_CLAMP_INGR 0x8562 -#define GL_ALPHA_MIN_CLAMP_INGR 0x8563 -#define GL_RED_MAX_CLAMP_INGR 0x8564 -#define GL_GREEN_MAX_CLAMP_INGR 0x8565 -#define GL_BLUE_MAX_CLAMP_INGR 0x8566 -#define GL_ALPHA_MAX_CLAMP_INGR 0x8567 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INTERLACE_READ_INGR 0x8568 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_INCR_WRAP_EXT 0x8507 -#define GL_DECR_WRAP_EXT 0x8508 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_422_EXT 0x80CC -#define GL_422_REV_EXT 0x80CD -#define GL_422_AVERAGE_EXT 0x80CE -#define GL_422_REV_AVERAGE_EXT 0x80CF -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NORMAL_MAP_NV 0x8511 -#define GL_REFLECTION_MAP_NV 0x8512 -#endif - -#ifndef GL_EXT_texture_cube_map -#define GL_NORMAL_MAP_EXT 0x8511 -#define GL_REFLECTION_MAP_EXT 0x8512 -#define GL_TEXTURE_CUBE_MAP_EXT 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_WRAP_BORDER_SUN 0x81D4 -#endif - -#ifndef GL_EXT_texture_env_add -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD -#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 -#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_MODELVIEW0_STACK_DEPTH_EXT GL_MODELVIEW_STACK_DEPTH -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW0_MATRIX_EXT GL_MODELVIEW_MATRIX -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW0_EXT GL_MODELVIEW -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_MAX_SHININESS_NV 0x8504 -#define GL_MAX_SPOT_EXPONENT_NV 0x8505 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_NV 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E -#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521 -#endif - -#ifndef GL_NV_register_combiners -#define GL_REGISTER_COMBINERS_NV 0x8522 -#define GL_VARIABLE_A_NV 0x8523 -#define GL_VARIABLE_B_NV 0x8524 -#define GL_VARIABLE_C_NV 0x8525 -#define GL_VARIABLE_D_NV 0x8526 -#define GL_VARIABLE_E_NV 0x8527 -#define GL_VARIABLE_F_NV 0x8528 -#define GL_VARIABLE_G_NV 0x8529 -#define GL_CONSTANT_COLOR0_NV 0x852A -#define GL_CONSTANT_COLOR1_NV 0x852B -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_SPARE0_NV 0x852E -#define GL_SPARE1_NV 0x852F -#define GL_DISCARD_NV 0x8530 -#define GL_E_TIMES_F_NV 0x8531 -#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 -#define GL_UNSIGNED_IDENTITY_NV 0x8536 -#define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_EXPAND_NORMAL_NV 0x8538 -#define GL_EXPAND_NEGATE_NV 0x8539 -#define GL_HALF_BIAS_NORMAL_NV 0x853A -#define GL_HALF_BIAS_NEGATE_NV 0x853B -#define GL_SIGNED_IDENTITY_NV 0x853C -#define GL_SIGNED_NEGATE_NV 0x853D -#define GL_SCALE_BY_TWO_NV 0x853E -#define GL_SCALE_BY_FOUR_NV 0x853F -#define GL_SCALE_BY_ONE_HALF_NV 0x8540 -#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541 -#define GL_COMBINER_INPUT_NV 0x8542 -#define GL_COMBINER_MAPPING_NV 0x8543 -#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544 -#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545 -#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546 -#define GL_COMBINER_MUX_SUM_NV 0x8547 -#define GL_COMBINER_SCALE_NV 0x8548 -#define GL_COMBINER_BIAS_NV 0x8549 -#define GL_COMBINER_AB_OUTPUT_NV 0x854A -#define GL_COMBINER_CD_OUTPUT_NV 0x854B -#define GL_COMBINER_SUM_OUTPUT_NV 0x854C -#define GL_MAX_GENERAL_COMBINERS_NV 0x854D -#define GL_NUM_GENERAL_COMBINERS_NV 0x854E -#define GL_COLOR_SUM_CLAMP_NV 0x854F -#define GL_COMBINER0_NV 0x8550 -#define GL_COMBINER1_NV 0x8551 -#define GL_COMBINER2_NV 0x8552 -#define GL_COMBINER3_NV 0x8553 -#define GL_COMBINER4_NV 0x8554 -#define GL_COMBINER5_NV 0x8555 -#define GL_COMBINER6_NV 0x8556 -#define GL_COMBINER7_NV 0x8557 -/* reuse GL_TEXTURE0_ARB */ -/* reuse GL_TEXTURE1_ARB */ -/* reuse GL_ZERO */ -/* reuse GL_NONE */ -/* reuse GL_FOG */ -#endif - -#ifndef GL_NV_fog_distance -#define GL_FOG_DISTANCE_MODE_NV 0x855A -#define GL_EYE_RADIAL_NV 0x855B -#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C -/* reuse GL_EYE_PLANE */ -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_EMBOSS_LIGHT_NV 0x855D -#define GL_EMBOSS_CONSTANT_NV 0x855E -#define GL_EMBOSS_MAP_NV 0x855F -#endif - -#ifndef GL_NV_blend_square -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_COMBINE4_NV 0x8503 -#define GL_SOURCE3_RGB_NV 0x8583 -#define GL_SOURCE3_ALPHA_NV 0x858B -#define GL_OPERAND3_RGB_NV 0x8593 -#define GL_OPERAND3_ALPHA_NV 0x859B -#endif - -#ifndef GL_MESA_resize_buffers -#endif - -#ifndef GL_MESA_window_pos -#endif - -#ifndef GL_EXT_texture_compression_s3tc -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_CULL_VERTEX_IBM 103050 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_VERTEX_ARRAY_LIST_IBM 103070 -#define GL_NORMAL_ARRAY_LIST_IBM 103071 -#define GL_COLOR_ARRAY_LIST_IBM 103072 -#define GL_INDEX_ARRAY_LIST_IBM 103073 -#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074 -#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075 -#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076 -#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077 -#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 -#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081 -#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082 -#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083 -#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084 -#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085 -#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086 -#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087 -#endif - -#ifndef GL_SGIX_subsample -#define GL_PACK_SUBSAMPLE_RATE_SGIX 0x85A0 -#define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 -#define GL_PIXEL_SUBSAMPLE_4444_SGIX 0x85A2 -#define GL_PIXEL_SUBSAMPLE_2424_SGIX 0x85A3 -#define GL_PIXEL_SUBSAMPLE_4242_SGIX 0x85A4 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_YCRCB_SGIX 0x8318 -#define GL_YCRCBA_SGIX 0x8319 -#endif - -#ifndef GL_SGI_depth_pass_instrument -#define GL_DEPTH_PASS_INSTRUMENT_SGIX 0x8310 -#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311 -#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 -#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_MULTISAMPLE_3DFX 0x86B2 -#define GL_SAMPLE_BUFFERS_3DFX 0x86B3 -#define GL_SAMPLES_3DFX 0x86B4 -#define GL_MULTISAMPLE_BIT_3DFX 0x20000000 -#endif - -#ifndef GL_3DFX_tbuffer -#endif - -#ifndef GL_EXT_multisample -#define GL_MULTISAMPLE_EXT 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F -#define GL_SAMPLE_MASK_EXT 0x80A0 -#define GL_1PASS_EXT 0x80A1 -#define GL_2PASS_0_EXT 0x80A2 -#define GL_2PASS_1_EXT 0x80A3 -#define GL_4PASS_0_EXT 0x80A4 -#define GL_4PASS_1_EXT 0x80A5 -#define GL_4PASS_2_EXT 0x80A6 -#define GL_4PASS_3_EXT 0x80A7 -#define GL_SAMPLE_BUFFERS_EXT 0x80A8 -#define GL_SAMPLES_EXT 0x80A9 -#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA -#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB -#define GL_SAMPLE_PATTERN_EXT 0x80AC -#define GL_MULTISAMPLE_BIT_EXT 0x20000000 -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_CONVOLUTION_HINT_SGIX 0x8316 -#endif - -#ifndef GL_SGIX_resample -#define GL_PACK_RESAMPLE_SGIX 0x842C -#define GL_UNPACK_RESAMPLE_SGIX 0x842D -#define GL_RESAMPLE_REPLICATE_SGIX 0x842E -#define GL_RESAMPLE_ZERO_FILL_SGIX 0x842F -#define GL_RESAMPLE_DECIMATE_SGIX 0x8430 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0 -#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1 -#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2 -#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3 -#define GL_EYE_POINT_SGIS 0x81F4 -#define GL_OBJECT_POINT_SGIS 0x81F5 -#define GL_EYE_LINE_SGIS 0x81F6 -#define GL_OBJECT_LINE_SGIS 0x81F7 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_TEXTURE_COLOR_WRITEMASK_SGIS 0x81EF -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_MIRROR_CLAMP_ATI 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 -#endif - -#ifndef GL_NV_fence -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -#endif - -#ifndef GL_IBM_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_IBM 0x8370 -#endif - -#ifndef GL_NV_evaluators -#define GL_EVAL_2D_NV 0x86C0 -#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_MAP_TESSELLATION_NV 0x86C2 -#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 -#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 -#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 -#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF -#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5 -#define GL_MAX_MAP_TESSELLATION_NV 0x86D6 -#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7 -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 -#endif - -#ifndef GL_NV_texture_compression_vtc -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 -#endif - -#ifndef GL_NV_texture_shader -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV -#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV -#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533 -#endif - -#ifndef GL_NV_vertex_program -#define GL_VERTEX_PROGRAM_NV 0x8620 -#define GL_VERTEX_STATE_PROGRAM_NV 0x8621 -#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623 -#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624 -#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625 -#define GL_CURRENT_ATTRIB_NV 0x8626 -#define GL_PROGRAM_LENGTH_NV 0x8627 -#define GL_PROGRAM_STRING_NV 0x8628 -#define GL_MODELVIEW_PROJECTION_NV 0x8629 -#define GL_IDENTITY_NV 0x862A -#define GL_INVERSE_NV 0x862B -#define GL_TRANSPOSE_NV 0x862C -#define GL_INVERSE_TRANSPOSE_NV 0x862D -#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E -#define GL_MAX_TRACK_MATRICES_NV 0x862F -#define GL_MATRIX0_NV 0x8630 -#define GL_MATRIX1_NV 0x8631 -#define GL_MATRIX2_NV 0x8632 -#define GL_MATRIX3_NV 0x8633 -#define GL_MATRIX4_NV 0x8634 -#define GL_MATRIX5_NV 0x8635 -#define GL_MATRIX6_NV 0x8636 -#define GL_MATRIX7_NV 0x8637 -#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640 -#define GL_CURRENT_MATRIX_NV 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643 -#define GL_PROGRAM_PARAMETER_NV 0x8644 -#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645 -#define GL_PROGRAM_TARGET_NV 0x8646 -#define GL_PROGRAM_RESIDENT_NV 0x8647 -#define GL_TRACK_MATRIX_NV 0x8648 -#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649 -#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A -#define GL_PROGRAM_ERROR_POSITION_NV 0x864B -#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650 -#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651 -#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652 -#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653 -#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654 -#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655 -#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656 -#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657 -#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658 -#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659 -#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A -#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B -#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C -#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D -#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E -#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F -#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660 -#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661 -#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662 -#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663 -#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664 -#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665 -#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666 -#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667 -#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668 -#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669 -#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A -#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B -#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C -#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D -#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E -#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F -#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670 -#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671 -#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672 -#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673 -#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674 -#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675 -#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676 -#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677 -#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678 -#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 -#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A -#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B -#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C -#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D -#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E -#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 -#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A -#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SCALEBIAS_HINT_SGIX 0x8322 -#endif - -#ifndef GL_OML_interlace -#define GL_INTERLACE_OML 0x8980 -#define GL_INTERLACE_READ_OML 0x8981 -#endif - -#ifndef GL_OML_subsample -#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 -#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 -#endif - -#ifndef GL_OML_resample -#define GL_PACK_RESAMPLE_OML 0x8984 -#define GL_UNPACK_RESAMPLE_OML 0x8985 -#define GL_RESAMPLE_REPLICATE_OML 0x8986 -#define GL_RESAMPLE_ZERO_FILL_OML 0x8987 -#define GL_RESAMPLE_AVERAGE_OML 0x8988 -#define GL_RESAMPLE_DECIMATE_OML 0x8989 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_BUMP_ROT_MATRIX_ATI 0x8775 -#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 -#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 -#define GL_BUMP_TEX_UNITS_ATI 0x8778 -#define GL_DUDV_ATI 0x8779 -#define GL_DU8DV8_ATI 0x877A -#define GL_BUMP_ENVMAP_ATI 0x877B -#define GL_BUMP_TARGET_ATI 0x877C -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_FRAGMENT_SHADER_ATI 0x8920 -#define GL_REG_0_ATI 0x8921 -#define GL_REG_1_ATI 0x8922 -#define GL_REG_2_ATI 0x8923 -#define GL_REG_3_ATI 0x8924 -#define GL_REG_4_ATI 0x8925 -#define GL_REG_5_ATI 0x8926 -#define GL_REG_6_ATI 0x8927 -#define GL_REG_7_ATI 0x8928 -#define GL_REG_8_ATI 0x8929 -#define GL_REG_9_ATI 0x892A -#define GL_REG_10_ATI 0x892B -#define GL_REG_11_ATI 0x892C -#define GL_REG_12_ATI 0x892D -#define GL_REG_13_ATI 0x892E -#define GL_REG_14_ATI 0x892F -#define GL_REG_15_ATI 0x8930 -#define GL_REG_16_ATI 0x8931 -#define GL_REG_17_ATI 0x8932 -#define GL_REG_18_ATI 0x8933 -#define GL_REG_19_ATI 0x8934 -#define GL_REG_20_ATI 0x8935 -#define GL_REG_21_ATI 0x8936 -#define GL_REG_22_ATI 0x8937 -#define GL_REG_23_ATI 0x8938 -#define GL_REG_24_ATI 0x8939 -#define GL_REG_25_ATI 0x893A -#define GL_REG_26_ATI 0x893B -#define GL_REG_27_ATI 0x893C -#define GL_REG_28_ATI 0x893D -#define GL_REG_29_ATI 0x893E -#define GL_REG_30_ATI 0x893F -#define GL_REG_31_ATI 0x8940 -#define GL_CON_0_ATI 0x8941 -#define GL_CON_1_ATI 0x8942 -#define GL_CON_2_ATI 0x8943 -#define GL_CON_3_ATI 0x8944 -#define GL_CON_4_ATI 0x8945 -#define GL_CON_5_ATI 0x8946 -#define GL_CON_6_ATI 0x8947 -#define GL_CON_7_ATI 0x8948 -#define GL_CON_8_ATI 0x8949 -#define GL_CON_9_ATI 0x894A -#define GL_CON_10_ATI 0x894B -#define GL_CON_11_ATI 0x894C -#define GL_CON_12_ATI 0x894D -#define GL_CON_13_ATI 0x894E -#define GL_CON_14_ATI 0x894F -#define GL_CON_15_ATI 0x8950 -#define GL_CON_16_ATI 0x8951 -#define GL_CON_17_ATI 0x8952 -#define GL_CON_18_ATI 0x8953 -#define GL_CON_19_ATI 0x8954 -#define GL_CON_20_ATI 0x8955 -#define GL_CON_21_ATI 0x8956 -#define GL_CON_22_ATI 0x8957 -#define GL_CON_23_ATI 0x8958 -#define GL_CON_24_ATI 0x8959 -#define GL_CON_25_ATI 0x895A -#define GL_CON_26_ATI 0x895B -#define GL_CON_27_ATI 0x895C -#define GL_CON_28_ATI 0x895D -#define GL_CON_29_ATI 0x895E -#define GL_CON_30_ATI 0x895F -#define GL_CON_31_ATI 0x8960 -#define GL_MOV_ATI 0x8961 -#define GL_ADD_ATI 0x8963 -#define GL_MUL_ATI 0x8964 -#define GL_SUB_ATI 0x8965 -#define GL_DOT3_ATI 0x8966 -#define GL_DOT4_ATI 0x8967 -#define GL_MAD_ATI 0x8968 -#define GL_LERP_ATI 0x8969 -#define GL_CND_ATI 0x896A -#define GL_CND0_ATI 0x896B -#define GL_DOT2_ADD_ATI 0x896C -#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D -#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E -#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F -#define GL_NUM_PASSES_ATI 0x8970 -#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971 -#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972 -#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973 -#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974 -#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 -#define GL_SWIZZLE_STR_ATI 0x8976 -#define GL_SWIZZLE_STQ_ATI 0x8977 -#define GL_SWIZZLE_STR_DR_ATI 0x8978 -#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 -#define GL_SWIZZLE_STRQ_ATI 0x897A -#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B -#define GL_RED_BIT_ATI 0x00000001 -#define GL_GREEN_BIT_ATI 0x00000002 -#define GL_BLUE_BIT_ATI 0x00000004 -#define GL_2X_BIT_ATI 0x00000001 -#define GL_4X_BIT_ATI 0x00000002 -#define GL_8X_BIT_ATI 0x00000004 -#define GL_HALF_BIT_ATI 0x00000008 -#define GL_QUARTER_BIT_ATI 0x00000010 -#define GL_EIGHTH_BIT_ATI 0x00000020 -#define GL_SATURATE_BIT_ATI 0x00000040 -#define GL_COMP_BIT_ATI 0x00000002 -#define GL_NEGATE_BIT_ATI 0x00000004 -#define GL_BIAS_BIT_ATI 0x00000008 -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_PN_TRIANGLES_ATI 0x87F0 -#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 -#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 -#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 -#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4 -#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5 -#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6 -#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 -#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8 -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_STATIC_ATI 0x8760 -#define GL_DYNAMIC_ATI 0x8761 -#define GL_PRESERVE_ATI 0x8762 -#define GL_DISCARD_ATI 0x8763 -#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764 -#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765 -#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766 -#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767 -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_VERTEX_SHADER_EXT 0x8780 -#define GL_VERTEX_SHADER_BINDING_EXT 0x8781 -#define GL_OP_INDEX_EXT 0x8782 -#define GL_OP_NEGATE_EXT 0x8783 -#define GL_OP_DOT3_EXT 0x8784 -#define GL_OP_DOT4_EXT 0x8785 -#define GL_OP_MUL_EXT 0x8786 -#define GL_OP_ADD_EXT 0x8787 -#define GL_OP_MADD_EXT 0x8788 -#define GL_OP_FRAC_EXT 0x8789 -#define GL_OP_MAX_EXT 0x878A -#define GL_OP_MIN_EXT 0x878B -#define GL_OP_SET_GE_EXT 0x878C -#define GL_OP_SET_LT_EXT 0x878D -#define GL_OP_CLAMP_EXT 0x878E -#define GL_OP_FLOOR_EXT 0x878F -#define GL_OP_ROUND_EXT 0x8790 -#define GL_OP_EXP_BASE_2_EXT 0x8791 -#define GL_OP_LOG_BASE_2_EXT 0x8792 -#define GL_OP_POWER_EXT 0x8793 -#define GL_OP_RECIP_EXT 0x8794 -#define GL_OP_RECIP_SQRT_EXT 0x8795 -#define GL_OP_SUB_EXT 0x8796 -#define GL_OP_CROSS_PRODUCT_EXT 0x8797 -#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798 -#define GL_OP_MOV_EXT 0x8799 -#define GL_OUTPUT_VERTEX_EXT 0x879A -#define GL_OUTPUT_COLOR0_EXT 0x879B -#define GL_OUTPUT_COLOR1_EXT 0x879C -#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D -#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E -#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F -#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0 -#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1 -#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2 -#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3 -#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4 -#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5 -#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 -#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7 -#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8 -#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9 -#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA -#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB -#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC -#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD -#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE -#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF -#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0 -#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1 -#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2 -#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3 -#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4 -#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5 -#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6 -#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7 -#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8 -#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9 -#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA -#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB -#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC -#define GL_OUTPUT_FOG_EXT 0x87BD -#define GL_SCALAR_EXT 0x87BE -#define GL_VECTOR_EXT 0x87BF -#define GL_MATRIX_EXT 0x87C0 -#define GL_VARIANT_EXT 0x87C1 -#define GL_INVARIANT_EXT 0x87C2 -#define GL_LOCAL_CONSTANT_EXT 0x87C3 -#define GL_LOCAL_EXT 0x87C4 -#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5 -#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6 -#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7 -#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8 -#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9 -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE -#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF -#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0 -#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1 -#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2 -#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3 -#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4 -#define GL_X_EXT 0x87D5 -#define GL_Y_EXT 0x87D6 -#define GL_Z_EXT 0x87D7 -#define GL_W_EXT 0x87D8 -#define GL_NEGATIVE_X_EXT 0x87D9 -#define GL_NEGATIVE_Y_EXT 0x87DA -#define GL_NEGATIVE_Z_EXT 0x87DB -#define GL_NEGATIVE_W_EXT 0x87DC -#define GL_ZERO_EXT 0x87DD -#define GL_ONE_EXT 0x87DE -#define GL_NEGATIVE_ONE_EXT 0x87DF -#define GL_NORMALIZED_RANGE_EXT 0x87E0 -#define GL_FULL_RANGE_EXT 0x87E1 -#define GL_CURRENT_VERTEX_EXT 0x87E2 -#define GL_MVP_MATRIX_EXT 0x87E3 -#define GL_VARIANT_VALUE_EXT 0x87E4 -#define GL_VARIANT_DATATYPE_EXT 0x87E5 -#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6 -#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7 -#define GL_VARIANT_ARRAY_EXT 0x87E8 -#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9 -#define GL_INVARIANT_VALUE_EXT 0x87EA -#define GL_INVARIANT_DATATYPE_EXT 0x87EB -#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC -#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_MAX_VERTEX_STREAMS_ATI 0x876B -#define GL_VERTEX_STREAM0_ATI 0x876C -#define GL_VERTEX_STREAM1_ATI 0x876D -#define GL_VERTEX_STREAM2_ATI 0x876E -#define GL_VERTEX_STREAM3_ATI 0x876F -#define GL_VERTEX_STREAM4_ATI 0x8770 -#define GL_VERTEX_STREAM5_ATI 0x8771 -#define GL_VERTEX_STREAM6_ATI 0x8772 -#define GL_VERTEX_STREAM7_ATI 0x8773 -#define GL_VERTEX_SOURCE_ATI 0x8774 -#endif - -#ifndef GL_ATI_element_array -#define GL_ELEMENT_ARRAY_ATI 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A -#endif - -#ifndef GL_SUN_mesh_array -#define GL_QUAD_MESH_SUN 0x8614 -#define GL_TRIANGLE_MESH_SUN 0x8615 -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SLICE_ACCUM_SUN 0x85CC -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_DEPTH_CLAMP_NV 0x864F -#endif - -#ifndef GL_NV_occlusion_query -#define GL_PIXEL_COUNTER_BITS_NV 0x8864 -#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 -#define GL_PIXEL_COUNT_NV 0x8866 -#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 -#endif - -#ifndef GL_NV_point_sprite -#define GL_POINT_SPRITE_NV 0x8861 -#define GL_COORD_REPLACE_NV 0x8862 -#define GL_POINT_SPRITE_R_MODE_NV 0x8863 -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 -#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854 -#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857 -#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858 -#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859 -#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A -#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B -#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C -#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D -#define GL_HILO8_NV 0x885E -#define GL_SIGNED_HILO8_NV 0x885F -#define GL_FORCE_BLUE_TO_ONE_NV 0x8860 -#endif - -#ifndef GL_NV_vertex_program1_1 -#endif - -#ifndef GL_EXT_shadow_funcs -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 -#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 -#endif - -#ifndef GL_APPLE_element_array -#define GL_ELEMENT_ARRAY_APPLE 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x876A -#endif - -#ifndef GL_APPLE_fence -#define GL_DRAW_PIXELS_APPLE 0x8A0A -#define GL_FENCE_APPLE 0x8A0B -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E -#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F -#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521 -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_YCBCR_422_APPLE 0x85B9 -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - -#ifndef GL_S3_s3tc -#define GL_RGB_S3TC 0x83A0 -#define GL_RGB4_S3TC 0x83A1 -#define GL_RGBA_S3TC 0x83A2 -#define GL_RGBA4_S3TC 0x83A3 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ATI 0x8824 -#define GL_DRAW_BUFFER0_ATI 0x8825 -#define GL_DRAW_BUFFER1_ATI 0x8826 -#define GL_DRAW_BUFFER2_ATI 0x8827 -#define GL_DRAW_BUFFER3_ATI 0x8828 -#define GL_DRAW_BUFFER4_ATI 0x8829 -#define GL_DRAW_BUFFER5_ATI 0x882A -#define GL_DRAW_BUFFER6_ATI 0x882B -#define GL_DRAW_BUFFER7_ATI 0x882C -#define GL_DRAW_BUFFER8_ATI 0x882D -#define GL_DRAW_BUFFER9_ATI 0x882E -#define GL_DRAW_BUFFER10_ATI 0x882F -#define GL_DRAW_BUFFER11_ATI 0x8830 -#define GL_DRAW_BUFFER12_ATI 0x8831 -#define GL_DRAW_BUFFER13_ATI 0x8832 -#define GL_DRAW_BUFFER14_ATI 0x8833 -#define GL_DRAW_BUFFER15_ATI 0x8834 -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 -#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_MODULATE_ADD_ATI 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 -#define GL_MODULATE_SUBTRACT_ATI 0x8746 -#endif - -#ifndef GL_ATI_texture_float -#define GL_RGBA_FLOAT32_ATI 0x8814 -#define GL_RGB_FLOAT32_ATI 0x8815 -#define GL_ALPHA_FLOAT32_ATI 0x8816 -#define GL_INTENSITY_FLOAT32_ATI 0x8817 -#define GL_LUMINANCE_FLOAT32_ATI 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819 -#define GL_RGBA_FLOAT16_ATI 0x881A -#define GL_RGB_FLOAT16_ATI 0x881B -#define GL_ALPHA_FLOAT16_ATI 0x881C -#define GL_INTENSITY_FLOAT16_ATI 0x881D -#define GL_LUMINANCE_FLOAT16_ATI 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F -#endif - -#ifndef GL_NV_float_buffer -#define GL_FLOAT_R_NV 0x8880 -#define GL_FLOAT_RG_NV 0x8881 -#define GL_FLOAT_RGB_NV 0x8882 -#define GL_FLOAT_RGBA_NV 0x8883 -#define GL_FLOAT_R16_NV 0x8884 -#define GL_FLOAT_R32_NV 0x8885 -#define GL_FLOAT_RG16_NV 0x8886 -#define GL_FLOAT_RG32_NV 0x8887 -#define GL_FLOAT_RGB16_NV 0x8888 -#define GL_FLOAT_RGB32_NV 0x8889 -#define GL_FLOAT_RGBA16_NV 0x888A -#define GL_FLOAT_RGBA32_NV 0x888B -#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C -#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D -#define GL_FLOAT_RGBA_MODE_NV 0x888E -#endif - -#ifndef GL_NV_fragment_program -#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868 -#define GL_FRAGMENT_PROGRAM_NV 0x8870 -#define GL_MAX_TEXTURE_COORDS_NV 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872 -#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873 -#define GL_PROGRAM_ERROR_STRING_NV 0x8874 -#endif - -#ifndef GL_NV_half_float -#define GL_HALF_FLOAT_NV 0x140B -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878 -#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879 -#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A -#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B -#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C -#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D -#endif - -#ifndef GL_NV_primitive_restart -#define GL_PRIMITIVE_RESTART_NV 0x8558 -#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F -#endif - -#ifndef GL_NV_vertex_program2 -#endif - -#ifndef GL_ATI_map_object_buffer -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_STENCIL_BACK_FUNC_ATI 0x8800 -#define GL_STENCIL_BACK_FAIL_ATI 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#endif - -#ifndef GL_OES_read_format -#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 -#define GL_DEPTH_BOUNDS_EXT 0x8891 -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_MIRROR_CLAMP_EXT 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 -#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_BLEND_EQUATION_RGB_EXT GL_BLEND_EQUATION -#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D -#endif - -#ifndef GL_MESA_pack_invert -#define GL_PACK_INVERT_MESA 0x8758 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB -#define GL_YCBCR_MESA 0x8757 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF -#endif - -#ifndef GL_NV_fragment_program_option -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 -#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 -#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7 -#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8 -#endif - -#ifndef GL_NV_vertex_program2_option -/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ -/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */ -#endif - -#ifndef GL_NV_vertex_program3 -/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 -#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 -#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 -#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 -#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 -#define GL_FRAMEBUFFER_EXT 0x8D40 -#define GL_RENDERBUFFER_EXT 0x8D41 -#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 -#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 -#define GL_STENCIL_INDEX1_EXT 0x8D46 -#define GL_STENCIL_INDEX4_EXT 0x8D47 -#define GL_STENCIL_INDEX8_EXT 0x8D48 -#define GL_STENCIL_INDEX16_EXT 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 -#endif - -#ifndef GL_GREMEDY_string_marker -#endif - - -/*************************************************************/ - -#include -#ifndef GL_VERSION_2_0 -/* GL type for program/shader text */ -typedef char GLchar; /* native character */ -#endif - -#ifndef GL_VERSION_1_5 -/* GL types for handling large vertex buffer objects */ -typedef ptrdiff_t GLintptr; -typedef ptrdiff_t GLsizeiptr; -#endif - -#ifndef GL_ARB_vertex_buffer_object -/* GL types for handling large vertex buffer objects */ -typedef ptrdiff_t GLintptrARB; -typedef ptrdiff_t GLsizeiptrARB; -#endif - -#ifndef GL_ARB_shader_objects -/* GL types for handling shader object handles and program/shader text */ -typedef char GLcharARB; /* native character */ -typedef unsigned int GLhandleARB; /* shader object handle */ -#endif - -/* GL types for "half" precision (s10e5) float data in host memory */ -#ifndef GL_ARB_half_float_pixel -typedef unsigned short GLhalfARB; -#endif - -#ifndef GL_NV_half_float -typedef unsigned short GLhalfNV; -#endif - -#ifndef GL_VERSION_1_2 -#define GL_VERSION_1_2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColor (GLclampf, GLclampf, GLclampf, GLclampf); -GLAPI void APIENTRY glBlendEquation (GLenum); -GLAPI void APIENTRY glDrawRangeElements (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *); -GLAPI void APIENTRY glColorTable (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glColorTableParameterfv (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glColorTableParameteriv (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyColorTable (GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glGetColorTable (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetColorTableParameterfv (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetColorTableParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glColorSubTable (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glCopyColorSubTable (GLenum, GLsizei, GLint, GLint, GLsizei); -GLAPI void APIENTRY glConvolutionFilter1D (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionParameterf (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glConvolutionParameterfv (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glConvolutionParameteri (GLenum, GLenum, GLint); -GLAPI void APIENTRY glConvolutionParameteriv (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyConvolutionFilter1D (GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glCopyConvolutionFilter2D (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glGetConvolutionFilter (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetConvolutionParameterfv (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetConvolutionParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetSeparableFilter (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *); -GLAPI void APIENTRY glSeparableFilter2D (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *); -GLAPI void APIENTRY glGetHistogram (GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetHistogramParameterfv (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetHistogramParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetMinmax (GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetMinmaxParameterfv (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetMinmaxParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glHistogram (GLenum, GLsizei, GLenum, GLboolean); -GLAPI void APIENTRY glMinmax (GLenum, GLenum, GLboolean); -GLAPI void APIENTRY glResetHistogram (GLenum); -GLAPI void APIENTRY glResetMinmax (GLenum); -GLAPI void APIENTRY glTexImage3D (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glCopyTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTERPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXPROC) (GLenum target); -typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_VERSION_1_3 -#define GL_VERSION_1_3 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTexture (GLenum); -GLAPI void APIENTRY glClientActiveTexture (GLenum); -GLAPI void APIENTRY glMultiTexCoord1d (GLenum, GLdouble); -GLAPI void APIENTRY glMultiTexCoord1dv (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord1f (GLenum, GLfloat); -GLAPI void APIENTRY glMultiTexCoord1fv (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord1i (GLenum, GLint); -GLAPI void APIENTRY glMultiTexCoord1iv (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord1s (GLenum, GLshort); -GLAPI void APIENTRY glMultiTexCoord1sv (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord2d (GLenum, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord2dv (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord2fv (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord2i (GLenum, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord2iv (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord2s (GLenum, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord2sv (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord3d (GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord3dv (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord3f (GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord3fv (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord3i (GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord3iv (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord3s (GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord3sv (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord4d (GLenum, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord4dv (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord4f (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord4fv (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord4i (GLenum, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord4iv (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord4s (GLenum, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord4sv (GLenum, const GLshort *); -GLAPI void APIENTRY glLoadTransposeMatrixf (const GLfloat *); -GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *); -GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *); -GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *); -GLAPI void APIENTRY glSampleCoverage (GLclampf, GLboolean); -GLAPI void APIENTRY glCompressedTexImage3D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage2D (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage1D (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glGetCompressedTexImage (GLenum, GLint, GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_VERSION_1_4 -#define GL_VERSION_1_4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparate (GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glFogCoordf (GLfloat); -GLAPI void APIENTRY glFogCoordfv (const GLfloat *); -GLAPI void APIENTRY glFogCoordd (GLdouble); -GLAPI void APIENTRY glFogCoorddv (const GLdouble *); -GLAPI void APIENTRY glFogCoordPointer (GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glMultiDrawArrays (GLenum, GLint *, GLsizei *, GLsizei); -GLAPI void APIENTRY glMultiDrawElements (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); -GLAPI void APIENTRY glPointParameterf (GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfv (GLenum, const GLfloat *); -GLAPI void APIENTRY glPointParameteri (GLenum, GLint); -GLAPI void APIENTRY glPointParameteriv (GLenum, const GLint *); -GLAPI void APIENTRY glSecondaryColor3b (GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glSecondaryColor3bv (const GLbyte *); -GLAPI void APIENTRY glSecondaryColor3d (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glSecondaryColor3dv (const GLdouble *); -GLAPI void APIENTRY glSecondaryColor3f (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glSecondaryColor3fv (const GLfloat *); -GLAPI void APIENTRY glSecondaryColor3i (GLint, GLint, GLint); -GLAPI void APIENTRY glSecondaryColor3iv (const GLint *); -GLAPI void APIENTRY glSecondaryColor3s (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glSecondaryColor3sv (const GLshort *); -GLAPI void APIENTRY glSecondaryColor3ub (GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glSecondaryColor3ubv (const GLubyte *); -GLAPI void APIENTRY glSecondaryColor3ui (GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSecondaryColor3uiv (const GLuint *); -GLAPI void APIENTRY glSecondaryColor3us (GLushort, GLushort, GLushort); -GLAPI void APIENTRY glSecondaryColor3usv (const GLushort *); -GLAPI void APIENTRY glSecondaryColorPointer (GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glWindowPos2d (GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos2dv (const GLdouble *); -GLAPI void APIENTRY glWindowPos2f (GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos2fv (const GLfloat *); -GLAPI void APIENTRY glWindowPos2i (GLint, GLint); -GLAPI void APIENTRY glWindowPos2iv (const GLint *); -GLAPI void APIENTRY glWindowPos2s (GLshort, GLshort); -GLAPI void APIENTRY glWindowPos2sv (const GLshort *); -GLAPI void APIENTRY glWindowPos3d (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos3dv (const GLdouble *); -GLAPI void APIENTRY glWindowPos3f (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos3fv (const GLfloat *); -GLAPI void APIENTRY glWindowPos3i (GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos3iv (const GLint *); -GLAPI void APIENTRY glWindowPos3s (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos3sv (const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLWINDOWPOS2DPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVPROC) (const GLshort *v); -#endif - -#ifndef GL_VERSION_1_5 -#define GL_VERSION_1_5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueries (GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteQueries (GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsQuery (GLuint); -GLAPI void APIENTRY glBeginQuery (GLenum, GLuint); -GLAPI void APIENTRY glEndQuery (GLenum); -GLAPI void APIENTRY glGetQueryiv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectiv (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectuiv (GLuint, GLenum, GLuint *); -GLAPI void APIENTRY glBindBuffer (GLenum, GLuint); -GLAPI void APIENTRY glDeleteBuffers (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenBuffers (GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsBuffer (GLuint); -GLAPI void APIENTRY glBufferData (GLenum, GLsizeiptr, const GLvoid *, GLenum); -GLAPI void APIENTRY glBufferSubData (GLenum, GLintptr, GLsizeiptr, const GLvoid *); -GLAPI void APIENTRY glGetBufferSubData (GLenum, GLintptr, GLsizeiptr, GLvoid *); -GLAPI GLvoid* APIENTRY glMapBuffer (GLenum, GLenum); -GLAPI GLboolean APIENTRY glUnmapBuffer (GLenum); -GLAPI void APIENTRY glGetBufferParameteriv (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetBufferPointerv (GLenum, GLenum, GLvoid* *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVPROC) (GLuint id, GLenum pname, GLuint *params); -typedef void (APIENTRYP PFNGLBINDBUFFERPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAPROC) (GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAPROC) (GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_VERSION_2_0 -#define GL_VERSION_2_0 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparate (GLenum, GLenum); -GLAPI void APIENTRY glDrawBuffers (GLsizei, const GLenum *); -GLAPI void APIENTRY glStencilOpSeparate (GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glStencilFuncSeparate (GLenum, GLenum, GLint, GLuint); -GLAPI void APIENTRY glStencilMaskSeparate (GLenum, GLuint); -GLAPI void APIENTRY glAttachShader (GLuint, GLuint); -GLAPI void APIENTRY glBindAttribLocation (GLuint, GLuint, const GLchar *); -GLAPI void APIENTRY glCompileShader (GLuint); -GLAPI GLuint APIENTRY glCreateProgram (void); -GLAPI GLuint APIENTRY glCreateShader (GLenum); -GLAPI void APIENTRY glDeleteProgram (GLuint); -GLAPI void APIENTRY glDeleteShader (GLuint); -GLAPI void APIENTRY glDetachShader (GLuint, GLuint); -GLAPI void APIENTRY glDisableVertexAttribArray (GLuint); -GLAPI void APIENTRY glEnableVertexAttribArray (GLuint); -GLAPI void APIENTRY glGetActiveAttrib (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *); -GLAPI void APIENTRY glGetActiveUniform (GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *); -GLAPI void APIENTRY glGetAttachedShaders (GLuint, GLsizei, GLsizei *, GLuint *); -GLAPI GLint APIENTRY glGetAttribLocation (GLuint, const GLchar *); -GLAPI void APIENTRY glGetProgramiv (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetProgramInfoLog (GLuint, GLsizei, GLsizei *, GLchar *); -GLAPI void APIENTRY glGetShaderiv (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetShaderInfoLog (GLuint, GLsizei, GLsizei *, GLchar *); -GLAPI void APIENTRY glGetShaderSource (GLuint, GLsizei, GLsizei *, GLchar *); -GLAPI GLint APIENTRY glGetUniformLocation (GLuint, const GLchar *); -GLAPI void APIENTRY glGetUniformfv (GLuint, GLint, GLfloat *); -GLAPI void APIENTRY glGetUniformiv (GLuint, GLint, GLint *); -GLAPI void APIENTRY glGetVertexAttribdv (GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetVertexAttribfv (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribiv (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribPointerv (GLuint, GLenum, GLvoid* *); -GLAPI GLboolean APIENTRY glIsProgram (GLuint); -GLAPI GLboolean APIENTRY glIsShader (GLuint); -GLAPI void APIENTRY glLinkProgram (GLuint); -GLAPI void APIENTRY glShaderSource (GLuint, GLsizei, const GLchar* *, const GLint *); -GLAPI void APIENTRY glUseProgram (GLuint); -GLAPI void APIENTRY glUniform1f (GLint, GLfloat); -GLAPI void APIENTRY glUniform2f (GLint, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform3f (GLint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform4f (GLint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform1i (GLint, GLint); -GLAPI void APIENTRY glUniform2i (GLint, GLint, GLint); -GLAPI void APIENTRY glUniform3i (GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform4i (GLint, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform1fv (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform2fv (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform3fv (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform4fv (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform1iv (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform2iv (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform3iv (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform4iv (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniformMatrix2fv (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix3fv (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix4fv (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glValidateProgram (GLuint); -GLAPI void APIENTRY glVertexAttrib1d (GLuint, GLdouble); -GLAPI void APIENTRY glVertexAttrib1dv (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib1f (GLuint, GLfloat); -GLAPI void APIENTRY glVertexAttrib1fv (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib1s (GLuint, GLshort); -GLAPI void APIENTRY glVertexAttrib1sv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib2d (GLuint, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib2dv (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib2f (GLuint, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib2fv (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib2s (GLuint, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib2sv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib3d (GLuint, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib3dv (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib3f (GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib3fv (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib3s (GLuint, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib3sv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4Nbv (GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4Niv (GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4Nsv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4Nub (GLuint, GLubyte, GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glVertexAttrib4Nubv (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4Nuiv (GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4Nusv (GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttrib4bv (GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4d (GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib4dv (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib4f (GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib4fv (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib4iv (GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4s (GLuint, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib4sv (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4ubv (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4uiv (GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4usv (GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttribPointer (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC) (GLenum modeRGB, GLenum modeAlpha); -typedef void (APIENTRYP PFNGLDRAWBUFFERSPROC) (GLsizei n, const GLenum *bufs); -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -typedef void (APIENTRYP PFNGLSTENCILMASKSEPARATEPROC) (GLenum face, GLuint mask); -typedef void (APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONPROC) (GLuint program, GLuint index, const GLchar *name); -typedef void (APIENTRYP PFNGLCOMPILESHADERPROC) (GLuint shader); -typedef GLuint (APIENTRYP PFNGLCREATEPROGRAMPROC) (void); -typedef GLuint (APIENTRYP PFNGLCREATESHADERPROC) (GLenum type); -typedef void (APIENTRYP PFNGLDELETEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLDELETESHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLDETACHSHADERPROC) (GLuint program, GLuint shader); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMPROC) (GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void (APIENTRYP PFNGLGETATTACHEDSHADERSPROC) (GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETPROGRAMIVPROC) (GLuint program, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMINFOLOGPROC) (GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONPROC) (GLuint program, const GLchar *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVPROC) (GLuint program, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVPROC) (GLuint program, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMPROC) (GLuint program); -typedef GLboolean (APIENTRYP PFNGLISSHADERPROC) (GLuint shader); -typedef void (APIENTRYP PFNGLLINKPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const GLchar* *string, const GLint *length); -typedef void (APIENTRYP PFNGLUSEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLUNIFORM1FPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMPROC) (GLuint program); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_ARB_multitexture -#define GL_ARB_multitexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTextureARB (GLenum); -GLAPI void APIENTRY glClientActiveTextureARB (GLenum); -GLAPI void APIENTRY glMultiTexCoord1dARB (GLenum, GLdouble); -GLAPI void APIENTRY glMultiTexCoord1dvARB (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord1fARB (GLenum, GLfloat); -GLAPI void APIENTRY glMultiTexCoord1fvARB (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord1iARB (GLenum, GLint); -GLAPI void APIENTRY glMultiTexCoord1ivARB (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord1sARB (GLenum, GLshort); -GLAPI void APIENTRY glMultiTexCoord1svARB (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord2dARB (GLenum, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord2dvARB (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord2fARB (GLenum, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord2fvARB (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord2iARB (GLenum, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord2ivARB (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord2sARB (GLenum, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord2svARB (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord3dARB (GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord3dvARB (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord3fARB (GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord3fvARB (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord3iARB (GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord3ivARB (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord3sARB (GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord3svARB (GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord4dARB (GLenum, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord4dvARB (GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord4fARB (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord4fvARB (GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord4iARB (GLenum, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord4ivARB (GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord4sARB (GLenum, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord4svARB (GLenum, const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FARBPROC) (GLenum target, GLfloat s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IARBPROC) (GLenum target, GLint s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SARBPROC) (GLenum target, GLshort s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DARBPROC) (GLenum target, GLdouble s, GLdouble t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FARBPROC) (GLenum target, GLfloat s, GLfloat t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IARBPROC) (GLenum target, GLint s, GLint t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SARBPROC) (GLenum target, GLshort s, GLshort t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IARBPROC) (GLenum target, GLint s, GLint t, GLint r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC) (GLenum target, const GLshort *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DARBPROC) (GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC) (GLenum target, const GLdouble *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FARBPROC) (GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC) (GLenum target, const GLfloat *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IARBPROC) (GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC) (GLenum target, const GLint *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SARBPROC) (GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLshort *v); -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_ARB_transpose_matrix 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLoadTransposeMatrixfARB (const GLfloat *); -GLAPI void APIENTRY glLoadTransposeMatrixdARB (const GLdouble *); -GLAPI void APIENTRY glMultTransposeMatrixfARB (const GLfloat *); -GLAPI void APIENTRY glMultTransposeMatrixdARB (const GLdouble *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC) (const GLfloat *m); -typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC) (const GLdouble *m); -#endif - -#ifndef GL_ARB_multisample -#define GL_ARB_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleCoverageARB (GLclampf, GLboolean); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEARBPROC) (GLclampf value, GLboolean invert); -#endif - -#ifndef GL_ARB_texture_env_add -#define GL_ARB_texture_env_add 1 -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_ARB_texture_cube_map 1 -#endif - -#ifndef GL_ARB_texture_compression -#define GL_ARB_texture_compression 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCompressedTexImage3DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage2DARB (GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage1DARB (GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage3DARB (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage2DARB (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage1DARB (GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glGetCompressedTexImageARB (GLenum, GLint, GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_ARB_texture_border_clamp 1 -#endif - -#ifndef GL_ARB_point_parameters -#define GL_ARB_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfARB (GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfvARB (GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFARBPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVARBPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_ARB_vertex_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWeightbvARB (GLint, const GLbyte *); -GLAPI void APIENTRY glWeightsvARB (GLint, const GLshort *); -GLAPI void APIENTRY glWeightivARB (GLint, const GLint *); -GLAPI void APIENTRY glWeightfvARB (GLint, const GLfloat *); -GLAPI void APIENTRY glWeightdvARB (GLint, const GLdouble *); -GLAPI void APIENTRY glWeightubvARB (GLint, const GLubyte *); -GLAPI void APIENTRY glWeightusvARB (GLint, const GLushort *); -GLAPI void APIENTRY glWeightuivARB (GLint, const GLuint *); -GLAPI void APIENTRY glWeightPointerARB (GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glVertexBlendARB (GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWEIGHTBVARBPROC) (GLint size, const GLbyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTSVARBPROC) (GLint size, const GLshort *weights); -typedef void (APIENTRYP PFNGLWEIGHTIVARBPROC) (GLint size, const GLint *weights); -typedef void (APIENTRYP PFNGLWEIGHTFVARBPROC) (GLint size, const GLfloat *weights); -typedef void (APIENTRYP PFNGLWEIGHTDVARBPROC) (GLint size, const GLdouble *weights); -typedef void (APIENTRYP PFNGLWEIGHTUBVARBPROC) (GLint size, const GLubyte *weights); -typedef void (APIENTRYP PFNGLWEIGHTUSVARBPROC) (GLint size, const GLushort *weights); -typedef void (APIENTRYP PFNGLWEIGHTUIVARBPROC) (GLint size, const GLuint *weights); -typedef void (APIENTRYP PFNGLWEIGHTPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXBLENDARBPROC) (GLint count); -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_ARB_matrix_palette 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCurrentPaletteMatrixARB (GLint); -GLAPI void APIENTRY glMatrixIndexubvARB (GLint, const GLubyte *); -GLAPI void APIENTRY glMatrixIndexusvARB (GLint, const GLushort *); -GLAPI void APIENTRY glMatrixIndexuivARB (GLint, const GLuint *); -GLAPI void APIENTRY glMatrixIndexPointerARB (GLint, GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC) (GLint index); -typedef void (APIENTRYP PFNGLMATRIXINDEXUBVARBPROC) (GLint size, const GLubyte *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUSVARBPROC) (GLint size, const GLushort *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXUIVARBPROC) (GLint size, const GLuint *indices); -typedef void (APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_ARB_texture_env_combine 1 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#define GL_ARB_texture_env_crossbar 1 -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_ARB_texture_env_dot3 1 -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_ARB_texture_mirrored_repeat 1 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_ARB_depth_texture 1 -#endif - -#ifndef GL_ARB_shadow -#define GL_ARB_shadow 1 -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_ARB_shadow_ambient 1 -#endif - -#ifndef GL_ARB_window_pos -#define GL_ARB_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dARB (GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos2dvARB (const GLdouble *); -GLAPI void APIENTRY glWindowPos2fARB (GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos2fvARB (const GLfloat *); -GLAPI void APIENTRY glWindowPos2iARB (GLint, GLint); -GLAPI void APIENTRY glWindowPos2ivARB (const GLint *); -GLAPI void APIENTRY glWindowPos2sARB (GLshort, GLshort); -GLAPI void APIENTRY glWindowPos2svARB (const GLshort *); -GLAPI void APIENTRY glWindowPos3dARB (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos3dvARB (const GLdouble *); -GLAPI void APIENTRY glWindowPos3fARB (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos3fvARB (const GLfloat *); -GLAPI void APIENTRY glWindowPos3iARB (GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos3ivARB (const GLint *); -GLAPI void APIENTRY glWindowPos3sARB (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos3svARB (const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DARBPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FARBPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IARBPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SARBPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVARBPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DARBPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVARBPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FARBPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVARBPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IARBPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVARBPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SARBPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVARBPROC) (const GLshort *v); -#endif - -#ifndef GL_ARB_vertex_program -#define GL_ARB_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttrib1dARB (GLuint, GLdouble); -GLAPI void APIENTRY glVertexAttrib1dvARB (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib1fARB (GLuint, GLfloat); -GLAPI void APIENTRY glVertexAttrib1fvARB (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib1sARB (GLuint, GLshort); -GLAPI void APIENTRY glVertexAttrib1svARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib2dARB (GLuint, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib2dvARB (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib2fARB (GLuint, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib2fvARB (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib2sARB (GLuint, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib2svARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib3dARB (GLuint, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib3dvARB (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib3fARB (GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib3fvARB (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib3sARB (GLuint, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib3svARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4NbvARB (GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4NivARB (GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4NsvARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4NubARB (GLuint, GLubyte, GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glVertexAttrib4NubvARB (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4NuivARB (GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4NusvARB (GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttrib4bvARB (GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4dARB (GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib4dvARB (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib4fARB (GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib4fvARB (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib4ivARB (GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4sARB (GLuint, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib4svARB (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4ubvARB (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4uivARB (GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4usvARB (GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttribPointerARB (GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); -GLAPI void APIENTRY glEnableVertexAttribArrayARB (GLuint); -GLAPI void APIENTRY glDisableVertexAttribArrayARB (GLuint); -GLAPI void APIENTRY glProgramStringARB (GLenum, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glBindProgramARB (GLenum, GLuint); -GLAPI void APIENTRY glDeleteProgramsARB (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenProgramsARB (GLsizei, GLuint *); -GLAPI void APIENTRY glProgramEnvParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramEnvParameter4dvARB (GLenum, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramEnvParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramEnvParameter4fvARB (GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glProgramLocalParameter4dARB (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramLocalParameter4dvARB (GLenum, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramLocalParameter4fARB (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramLocalParameter4fvARB (GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glGetProgramEnvParameterdvARB (GLenum, GLuint, GLdouble *); -GLAPI void APIENTRY glGetProgramEnvParameterfvARB (GLenum, GLuint, GLfloat *); -GLAPI void APIENTRY glGetProgramLocalParameterdvARB (GLenum, GLuint, GLdouble *); -GLAPI void APIENTRY glGetProgramLocalParameterfvARB (GLenum, GLuint, GLfloat *); -GLAPI void APIENTRY glGetProgramivARB (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetProgramStringARB (GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetVertexAttribdvARB (GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetVertexAttribfvARB (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribivARB (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribPointervARB (GLuint, GLenum, GLvoid* *); -GLAPI GLboolean APIENTRY glIsProgramARB (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DARBPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FARBPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SARBPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DARBPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FARBPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SARBPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC) (GLuint index, const GLbyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DARBPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FARBPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC) (GLuint index, const GLint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SARBPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC) (GLuint index, const GLuint *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC) (GLuint index, const GLushort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC) (GLuint index); -typedef void (APIENTRYP PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string); -typedef void (APIENTRYP PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC) (GLenum target, GLuint index, const GLdouble *params); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) (GLenum target, GLuint index, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC) (GLenum target, GLuint index, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) (GLenum target, GLuint index, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC) (GLenum target, GLenum pname, GLvoid *string); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMARBPROC) (GLuint program); -#endif - -#ifndef GL_ARB_fragment_program -#define GL_ARB_fragment_program 1 -/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */ -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_ARB_vertex_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindBufferARB (GLenum, GLuint); -GLAPI void APIENTRY glDeleteBuffersARB (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenBuffersARB (GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsBufferARB (GLuint); -GLAPI void APIENTRY glBufferDataARB (GLenum, GLsizeiptrARB, const GLvoid *, GLenum); -GLAPI void APIENTRY glBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *); -GLAPI void APIENTRY glGetBufferSubDataARB (GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *); -GLAPI GLvoid* APIENTRY glMapBufferARB (GLenum, GLenum); -GLAPI GLboolean APIENTRY glUnmapBufferARB (GLenum); -GLAPI void APIENTRY glGetBufferParameterivARB (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetBufferPointervARB (GLenum, GLenum, GLvoid* *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer); -typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers); -typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers); -typedef GLboolean (APIENTRYP PFNGLISBUFFERARBPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -typedef void (APIENTRYP PFNGLBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); -typedef GLvoid* (APIENTRYP PFNGLMAPBUFFERARBPROC) (GLenum target, GLenum access); -typedef GLboolean (APIENTRYP PFNGLUNMAPBUFFERARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC) (GLenum target, GLenum pname, GLvoid* *params); -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_ARB_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueriesARB (GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteQueriesARB (GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsQueryARB (GLuint); -GLAPI void APIENTRY glBeginQueryARB (GLenum, GLuint); -GLAPI void APIENTRY glEndQueryARB (GLenum); -GLAPI void APIENTRY glGetQueryivARB (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectivARB (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectuivARB (GLuint, GLenum, GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENQUERIESARBPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEQUERIESARBPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISQUERYARBPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINQUERYARBPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLENDQUERYARBPROC) (GLenum target); -typedef void (APIENTRYP PFNGLGETQUERYIVARBPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_ARB_shader_objects -#define GL_ARB_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteObjectARB (GLhandleARB); -GLAPI GLhandleARB APIENTRY glGetHandleARB (GLenum); -GLAPI void APIENTRY glDetachObjectARB (GLhandleARB, GLhandleARB); -GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB (GLenum); -GLAPI void APIENTRY glShaderSourceARB (GLhandleARB, GLsizei, const GLcharARB* *, const GLint *); -GLAPI void APIENTRY glCompileShaderARB (GLhandleARB); -GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB (void); -GLAPI void APIENTRY glAttachObjectARB (GLhandleARB, GLhandleARB); -GLAPI void APIENTRY glLinkProgramARB (GLhandleARB); -GLAPI void APIENTRY glUseProgramObjectARB (GLhandleARB); -GLAPI void APIENTRY glValidateProgramARB (GLhandleARB); -GLAPI void APIENTRY glUniform1fARB (GLint, GLfloat); -GLAPI void APIENTRY glUniform2fARB (GLint, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform3fARB (GLint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform4fARB (GLint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform1iARB (GLint, GLint); -GLAPI void APIENTRY glUniform2iARB (GLint, GLint, GLint); -GLAPI void APIENTRY glUniform3iARB (GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform4iARB (GLint, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform1fvARB (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform2fvARB (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform3fvARB (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform4fvARB (GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform1ivARB (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform2ivARB (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform3ivARB (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform4ivARB (GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniformMatrix2fvARB (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix3fvARB (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix4fvARB (GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glGetObjectParameterfvARB (GLhandleARB, GLenum, GLfloat *); -GLAPI void APIENTRY glGetObjectParameterivARB (GLhandleARB, GLenum, GLint *); -GLAPI void APIENTRY glGetInfoLogARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *); -GLAPI void APIENTRY glGetAttachedObjectsARB (GLhandleARB, GLsizei, GLsizei *, GLhandleARB *); -GLAPI GLint APIENTRY glGetUniformLocationARB (GLhandleARB, const GLcharARB *); -GLAPI void APIENTRY glGetActiveUniformARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); -GLAPI void APIENTRY glGetUniformfvARB (GLhandleARB, GLint, GLfloat *); -GLAPI void APIENTRY glGetUniformivARB (GLhandleARB, GLint, GLint *); -GLAPI void APIENTRY glGetShaderSourceARB (GLhandleARB, GLsizei, GLsizei *, GLcharARB *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEOBJECTARBPROC) (GLhandleARB obj); -typedef GLhandleARB (APIENTRYP PFNGLGETHANDLEARBPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLDETACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB attachedObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATESHADEROBJECTARBPROC) (GLenum shaderType); -typedef void (APIENTRYP PFNGLSHADERSOURCEARBPROC) (GLhandleARB shaderObj, GLsizei count, const GLcharARB* *string, const GLint *length); -typedef void (APIENTRYP PFNGLCOMPILESHADERARBPROC) (GLhandleARB shaderObj); -typedef GLhandleARB (APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC) (void); -typedef void (APIENTRYP PFNGLATTACHOBJECTARBPROC) (GLhandleARB containerObj, GLhandleARB obj); -typedef void (APIENTRYP PFNGLLINKPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLVALIDATEPROGRAMARBPROC) (GLhandleARB programObj); -typedef void (APIENTRYP PFNGLUNIFORM1FARBPROC) (GLint location, GLfloat v0); -typedef void (APIENTRYP PFNGLUNIFORM2FARBPROC) (GLint location, GLfloat v0, GLfloat v1); -typedef void (APIENTRYP PFNGLUNIFORM3FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void (APIENTRYP PFNGLUNIFORM4FARBPROC) (GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void (APIENTRYP PFNGLUNIFORM1IARBPROC) (GLint location, GLint v0); -typedef void (APIENTRYP PFNGLUNIFORM2IARBPROC) (GLint location, GLint v0, GLint v1); -typedef void (APIENTRYP PFNGLUNIFORM3IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2); -typedef void (APIENTRYP PFNGLUNIFORM4IARBPROC) (GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void (APIENTRYP PFNGLUNIFORM1FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM2FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM3FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM4FVARBPROC) (GLint location, GLsizei count, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORM1IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM2IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM3IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORM4IVARBPROC) (GLint location, GLsizei count, const GLint *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC) (GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC) (GLhandleARB obj, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC) (GLhandleARB obj, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETINFOLOGARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); -typedef void (APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC) (GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); -typedef GLint (APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef void (APIENTRYP PFNGLGETUNIFORMFVARBPROC) (GLhandleARB programObj, GLint location, GLfloat *params); -typedef void (APIENTRYP PFNGLGETUNIFORMIVARBPROC) (GLhandleARB programObj, GLint location, GLint *params); -typedef void (APIENTRYP PFNGLGETSHADERSOURCEARBPROC) (GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_ARB_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindAttribLocationARB (GLhandleARB, GLuint, const GLcharARB *); -GLAPI void APIENTRY glGetActiveAttribARB (GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); -GLAPI GLint APIENTRY glGetAttribLocationARB (GLhandleARB, const GLcharARB *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC) (GLhandleARB programObj, GLuint index, const GLcharARB *name); -typedef void (APIENTRYP PFNGLGETACTIVEATTRIBARBPROC) (GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef GLint (APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC) (GLhandleARB programObj, const GLcharARB *name); -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_ARB_fragment_shader 1 -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_ARB_shading_language_100 1 -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#define GL_ARB_texture_non_power_of_two 1 -#endif - -#ifndef GL_ARB_point_sprite -#define GL_ARB_point_sprite 1 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#define GL_ARB_fragment_program_shadow 1 -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_ARB_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersARB (GLsizei, const GLenum *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSARBPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_ARB_texture_rectangle 1 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_ARB_color_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClampColorARB (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCLAMPCOLORARBPROC) (GLenum target, GLenum clamp); -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_ARB_half_float_pixel 1 -#endif - -#ifndef GL_ARB_texture_float -#define GL_ARB_texture_float 1 -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_ARB_pixel_buffer_object 1 -#endif - -#ifndef GL_EXT_abgr -#define GL_EXT_abgr 1 -#endif - -#ifndef GL_EXT_blend_color -#define GL_EXT_blend_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColorEXT (GLclampf, GLclampf, GLclampf, GLclampf); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLOREXTPROC) (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_EXT_polygon_offset 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPolygonOffsetEXT (GLfloat, GLfloat); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOLYGONOFFSETEXTPROC) (GLfloat factor, GLfloat bias); -#endif - -#ifndef GL_EXT_texture -#define GL_EXT_texture 1 -#endif - -#ifndef GL_EXT_texture3D -#define GL_EXT_texture3D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_SGIS_texture_filter4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetTexFilterFuncSGIS (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glTexFilterFuncSGIS (GLenum, GLenum, GLsizei, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLfloat *weights); -typedef void (APIENTRYP PFNGLTEXFILTERFUNCSGISPROC) (GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); -#endif - -#ifndef GL_EXT_subtexture -#define GL_EXT_subtexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexSubImage1DEXT (GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_EXT_copy_texture -#define GL_EXT_copy_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyTexImage1DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint); -GLAPI void APIENTRY glCopyTexImage2DEXT (GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint); -GLAPI void APIENTRY glCopyTexSubImage1DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei); -GLAPI void APIENTRY glCopyTexSubImage2DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glCopyTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_histogram -#define GL_EXT_histogram 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetHistogramEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetHistogramParameterfvEXT (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetHistogramParameterivEXT (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetMinmaxEXT (GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetMinmaxParameterfvEXT (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetMinmaxParameterivEXT (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glHistogramEXT (GLenum, GLsizei, GLenum, GLboolean); -GLAPI void APIENTRY glMinmaxEXT (GLenum, GLenum, GLboolean); -GLAPI void APIENTRY glResetHistogramEXT (GLenum); -GLAPI void APIENTRY glResetMinmaxEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETHISTOGRAMEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMINMAXEXTPROC) (GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLHISTOGRAMEXTPROC) (GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLMINMAXEXTPROC) (GLenum target, GLenum internalformat, GLboolean sink); -typedef void (APIENTRYP PFNGLRESETHISTOGRAMEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLRESETMINMAXEXTPROC) (GLenum target); -#endif - -#ifndef GL_EXT_convolution -#define GL_EXT_convolution 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glConvolutionFilter1DEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionParameterfEXT (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glConvolutionParameterfvEXT (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glConvolutionParameteriEXT (GLenum, GLenum, GLint); -GLAPI void APIENTRY glConvolutionParameterivEXT (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyConvolutionFilter1DEXT (GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glCopyConvolutionFilter2DEXT (GLenum, GLenum, GLint, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glGetConvolutionFilterEXT (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetConvolutionParameterfvEXT (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetConvolutionParameterivEXT (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetSeparableFilterEXT (GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *); -GLAPI void APIENTRY glSeparableFilter2DEXT (GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint params); -typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void (APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -#endif - -#ifndef GL_EXT_color_matrix -#define GL_EXT_color_matrix 1 -#endif - -#ifndef GL_SGI_color_table -#define GL_SGI_color_table 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableSGI (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glColorTableParameterfvSGI (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glColorTableParameterivSGI (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyColorTableSGI (GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glGetColorTableSGI (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetColorTableParameterfvSGI (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetColorTableParameterivSGI (GLenum, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOPYCOLORTABLESGIPROC) (GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void (APIENTRYP PFNGLGETCOLORTABLESGIPROC) (GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC) (GLenum target, GLenum pname, GLint *params); -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_SGIX_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenSGIX (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENSGIXPROC) (GLenum mode); -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_SGIS_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenParameteriSGIS (GLenum, GLint); -GLAPI void APIENTRY glPixelTexGenParameterivSGIS (GLenum, const GLint *); -GLAPI void APIENTRY glPixelTexGenParameterfSGIS (GLenum, GLfloat); -GLAPI void APIENTRY glPixelTexGenParameterfvSGIS (GLenum, const GLfloat *); -GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS (GLenum, GLint *); -GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC) (GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIS_texture4D -#define GL_SGIS_texture4D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage4DSGIS (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage4DSGIS (GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXIMAGE4DSGISPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_SGI_texture_color_table 1 -#endif - -#ifndef GL_EXT_cmyka -#define GL_EXT_cmyka 1 -#endif - -#ifndef GL_EXT_texture_object -#define GL_EXT_texture_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreTexturesResidentEXT (GLsizei, const GLuint *, GLboolean *); -GLAPI void APIENTRY glBindTextureEXT (GLenum, GLuint); -GLAPI void APIENTRY glDeleteTexturesEXT (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenTexturesEXT (GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsTextureEXT (GLuint); -GLAPI void APIENTRY glPrioritizeTexturesEXT (GLsizei, const GLuint *, const GLclampf *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC) (GLsizei n, const GLuint *textures, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDTEXTUREEXTPROC) (GLenum target, GLuint texture); -typedef void (APIENTRYP PFNGLDELETETEXTURESEXTPROC) (GLsizei n, const GLuint *textures); -typedef void (APIENTRYP PFNGLGENTEXTURESEXTPROC) (GLsizei n, GLuint *textures); -typedef GLboolean (APIENTRYP PFNGLISTEXTUREEXTPROC) (GLuint texture); -typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC) (GLsizei n, const GLuint *textures, const GLclampf *priorities); -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_SGIS_detail_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDetailTexFuncSGIS (GLenum, GLsizei, const GLfloat *); -GLAPI void APIENTRY glGetDetailTexFuncSGIS (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDETAILTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_SGIS_sharpen_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSharpenTexFuncSGIS (GLenum, GLsizei, const GLfloat *); -GLAPI void APIENTRY glGetSharpenTexFuncSGIS (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC) (GLenum target, GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC) (GLenum target, GLfloat *points); -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_EXT_packed_pixels 1 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_SGIS_texture_lod 1 -#endif - -#ifndef GL_SGIS_multisample -#define GL_SGIS_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskSGIS (GLclampf, GLboolean); -GLAPI void APIENTRY glSamplePatternSGIS (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKSGISPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNSGISPROC) (GLenum pattern); -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_EXT_rescale_normal 1 -#endif - -#ifndef GL_EXT_vertex_array -#define GL_EXT_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glArrayElementEXT (GLint); -GLAPI void APIENTRY glColorPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glDrawArraysEXT (GLenum, GLint, GLsizei); -GLAPI void APIENTRY glEdgeFlagPointerEXT (GLsizei, GLsizei, const GLboolean *); -GLAPI void APIENTRY glGetPointervEXT (GLenum, GLvoid* *); -GLAPI void APIENTRY glIndexPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glNormalPointerEXT (GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glTexCoordPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glVertexPointerEXT (GLint, GLenum, GLsizei, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLARRAYELEMENTEXTPROC) (GLint i); -typedef void (APIENTRYP PFNGLCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWARRAYSEXTPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC) (GLsizei stride, GLsizei count, const GLboolean *pointer); -typedef void (APIENTRYP PFNGLGETPOINTERVEXTPROC) (GLenum pname, GLvoid* *params); -typedef void (APIENTRYP PFNGLINDEXPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_misc_attribute -#define GL_EXT_misc_attribute 1 -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_SGIS_generate_mipmap 1 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_SGIX_clipmap 1 -#endif - -#ifndef GL_SGIX_shadow -#define GL_SGIX_shadow 1 -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_SGIS_texture_edge_clamp 1 -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_SGIS_texture_border_clamp 1 -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_EXT_blend_subtract 1 -#endif - -#ifndef GL_EXT_blend_logic_op -#define GL_EXT_blend_logic_op 1 -#endif - -#ifndef GL_SGIX_interlace -#define GL_SGIX_interlace 1 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_SGIX_pixel_tiles 1 -#endif - -#ifndef GL_SGIX_texture_select -#define GL_SGIX_texture_select 1 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SGIX_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSpriteParameterfSGIX (GLenum, GLfloat); -GLAPI void APIENTRY glSpriteParameterfvSGIX (GLenum, const GLfloat *); -GLAPI void APIENTRY glSpriteParameteriSGIX (GLenum, GLint); -GLAPI void APIENTRY glSpriteParameterivSGIX (GLenum, const GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_SGIX_texture_multi_buffer 1 -#endif - -#ifndef GL_EXT_point_parameters -#define GL_EXT_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfEXT (GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfvEXT (GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFEXTPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_SGIS_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfSGIS (GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfvSGIS (GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERFSGISPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC) (GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIX_instruments -#define GL_SGIX_instruments 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLint APIENTRY glGetInstrumentsSGIX (void); -GLAPI void APIENTRY glInstrumentsBufferSGIX (GLsizei, GLint *); -GLAPI GLint APIENTRY glPollInstrumentsSGIX (GLint *); -GLAPI void APIENTRY glReadInstrumentsSGIX (GLint); -GLAPI void APIENTRY glStartInstrumentsSGIX (void); -GLAPI void APIENTRY glStopInstrumentsSGIX (GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLint (APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC) (GLsizei size, GLint *buffer); -typedef GLint (APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC) (GLint *marker_p); -typedef void (APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC) (GLint marker); -typedef void (APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC) (void); -typedef void (APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC) (GLint marker); -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_SGIX_texture_scale_bias 1 -#endif - -#ifndef GL_SGIX_framezoom -#define GL_SGIX_framezoom 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFrameZoomSGIX (GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAMEZOOMSGIXPROC) (GLint factor); -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#define GL_SGIX_tag_sample_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTagSampleBufferSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_SGIX_polynomial_ffd 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeformationMap3dSGIX (GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *); -GLAPI void APIENTRY glDeformationMap3fSGIX (GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *); -GLAPI void APIENTRY glDeformSGIX (GLbitfield); -GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX (GLbitfield); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC) (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); -typedef void (APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC) (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); -typedef void (APIENTRYP PFNGLDEFORMSGIXPROC) (GLbitfield mask); -typedef void (APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC) (GLbitfield mask); -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_SGIX_reference_plane 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReferencePlaneSGIX (const GLdouble *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREFERENCEPLANESGIXPROC) (const GLdouble *equation); -#endif - -#ifndef GL_SGIX_flush_raster -#define GL_SGIX_flush_raster 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushRasterSGIX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHRASTERSGIXPROC) (void); -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_SGIX_depth_texture 1 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_SGIS_fog_function 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogFuncSGIS (GLsizei, const GLfloat *); -GLAPI void APIENTRY glGetFogFuncSGIS (GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGFUNCSGISPROC) (GLsizei n, const GLfloat *points); -typedef void (APIENTRYP PFNGLGETFOGFUNCSGISPROC) (GLfloat *points); -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_SGIX_fog_offset 1 -#endif - -#ifndef GL_HP_image_transform -#define GL_HP_image_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glImageTransformParameteriHP (GLenum, GLenum, GLint); -GLAPI void APIENTRY glImageTransformParameterfHP (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glImageTransformParameterivHP (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glImageTransformParameterfvHP (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glGetImageTransformParameterivHP (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetImageTransformParameterfvHP (GLenum, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_HP_convolution_border_modes 1 -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_SGIX_texture_add_env 1 -#endif - -#ifndef GL_EXT_color_subtable -#define GL_EXT_color_subtable 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorSubTableEXT (GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glCopyColorSubTableEXT (GLenum, GLsizei, GLint, GLint, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC) (GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_PGI_vertex_hints 1 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PGI_misc_hints 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glHintPGI (GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLHINTPGIPROC) (GLenum target, GLint mode); -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_EXT_paletted_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableEXT (GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glGetColorTableEXT (GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetColorTableParameterivEXT (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetColorTableParameterfvEXT (GLenum, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORTABLEEXTPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void (APIENTRYP PFNGLGETCOLORTABLEEXTPROC) (GLenum target, GLenum format, GLenum type, GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_EXT_clip_volume_hint 1 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_SGIX_list_priority 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetListParameterfvSGIX (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetListParameterivSGIX (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glListParameterfSGIX (GLuint, GLenum, GLfloat); -GLAPI void APIENTRY glListParameterfvSGIX (GLuint, GLenum, const GLfloat *); -GLAPI void APIENTRY glListParameteriSGIX (GLuint, GLenum, GLint); -GLAPI void APIENTRY glListParameterivSGIX (GLuint, GLenum, const GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERFSGIXPROC) (GLuint list, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC) (GLuint list, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLLISTPARAMETERISGIXPROC) (GLuint list, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC) (GLuint list, GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_SGIX_ir_instrument1 1 -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_SGIX_calligraphic_fragment 1 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_SGIX_texture_lod_bias 1 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SGIX_shadow_ambient 1 -#endif - -#ifndef GL_EXT_index_texture -#define GL_EXT_index_texture 1 -#endif - -#ifndef GL_EXT_index_material -#define GL_EXT_index_material 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexMaterialEXT (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_EXT_index_func -#define GL_EXT_index_func 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexFuncEXT (GLenum, GLclampf); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLINDEXFUNCEXTPROC) (GLenum func, GLclampf ref); -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_EXT_index_array_formats 1 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_EXT_compiled_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLockArraysEXT (GLint, GLsizei); -GLAPI void APIENTRY glUnlockArraysEXT (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLLOCKARRAYSEXTPROC) (GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLUNLOCKARRAYSEXTPROC) (void); -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_EXT_cull_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCullParameterdvEXT (GLenum, GLdouble *); -GLAPI void APIENTRY glCullParameterfvEXT (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCULLPARAMETERDVEXTPROC) (GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLCULLPARAMETERFVEXTPROC) (GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_SGIX_ycrcb 1 -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_SGIX_fragment_lighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFragmentColorMaterialSGIX (GLenum, GLenum); -GLAPI void APIENTRY glFragmentLightfSGIX (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glFragmentLightfvSGIX (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glFragmentLightiSGIX (GLenum, GLenum, GLint); -GLAPI void APIENTRY glFragmentLightivSGIX (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glFragmentLightModelfSGIX (GLenum, GLfloat); -GLAPI void APIENTRY glFragmentLightModelfvSGIX (GLenum, const GLfloat *); -GLAPI void APIENTRY glFragmentLightModeliSGIX (GLenum, GLint); -GLAPI void APIENTRY glFragmentLightModelivSGIX (GLenum, const GLint *); -GLAPI void APIENTRY glFragmentMaterialfSGIX (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glFragmentMaterialfvSGIX (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glFragmentMaterialiSGIX (GLenum, GLenum, GLint); -GLAPI void APIENTRY glFragmentMaterialivSGIX (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glGetFragmentLightfvSGIX (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetFragmentLightivSGIX (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetFragmentMaterialfvSGIX (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetFragmentMaterialivSGIX (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glLightEnviSGIX (GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC) (GLenum face, GLenum mode); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC) (GLenum light, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC) (GLenum light, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC) (GLenum face, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC) (GLenum face, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC) (GLenum light, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC) (GLenum light, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC) (GLenum face, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC) (GLenum face, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLLIGHTENVISGIXPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_IBM_rasterpos_clip 1 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_HP_texture_lighting 1 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_EXT_draw_range_elements 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawRangeElementsEXT (GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -#endif - -#ifndef GL_WIN_phong_shading -#define GL_WIN_phong_shading 1 -#endif - -#ifndef GL_WIN_specular_fog -#define GL_WIN_specular_fog 1 -#endif - -#ifndef GL_EXT_light_texture -#define GL_EXT_light_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glApplyTextureEXT (GLenum); -GLAPI void APIENTRY glTextureLightEXT (GLenum); -GLAPI void APIENTRY glTextureMaterialEXT (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLAPPLYTEXTUREEXTPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLTEXTURELIGHTEXTPROC) (GLenum pname); -typedef void (APIENTRYP PFNGLTEXTUREMATERIALEXTPROC) (GLenum face, GLenum mode); -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_SGIX_blend_alpha_minmax 1 -#endif - -#ifndef GL_EXT_bgra -#define GL_EXT_bgra 1 -#endif - -#ifndef GL_SGIX_async -#define GL_SGIX_async 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glAsyncMarkerSGIX (GLuint); -GLAPI GLint APIENTRY glFinishAsyncSGIX (GLuint *); -GLAPI GLint APIENTRY glPollAsyncSGIX (GLuint *); -GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX (GLsizei); -GLAPI void APIENTRY glDeleteAsyncMarkersSGIX (GLuint, GLsizei); -GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLASYNCMARKERSGIXPROC) (GLuint marker); -typedef GLint (APIENTRYP PFNGLFINISHASYNCSGIXPROC) (GLuint *markerp); -typedef GLint (APIENTRYP PFNGLPOLLASYNCSGIXPROC) (GLuint *markerp); -typedef GLuint (APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC) (GLsizei range); -typedef void (APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC) (GLuint marker, GLsizei range); -typedef GLboolean (APIENTRYP PFNGLISASYNCMARKERSGIXPROC) (GLuint marker); -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_SGIX_async_pixel 1 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_SGIX_async_histogram 1 -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_INTEL_parallel_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexPointervINTEL (GLint, GLenum, const GLvoid* *); -GLAPI void APIENTRY glNormalPointervINTEL (GLenum, const GLvoid* *); -GLAPI void APIENTRY glColorPointervINTEL (GLint, GLenum, const GLvoid* *); -GLAPI void APIENTRY glTexCoordPointervINTEL (GLint, GLenum, const GLvoid* *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLNORMALPOINTERVINTELPROC) (GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLCOLORPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC) (GLint size, GLenum type, const GLvoid* *pointer); -#endif - -#ifndef GL_HP_occlusion_test -#define GL_HP_occlusion_test 1 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_EXT_pixel_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum, GLenum, GLint); -GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum, GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#define GL_EXT_pixel_transform_color_table 1 -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_EXT_shared_texture_palette 1 -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_EXT_separate_specular_color 1 -#endif - -#ifndef GL_EXT_secondary_color -#define GL_EXT_secondary_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSecondaryColor3bEXT (GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glSecondaryColor3bvEXT (const GLbyte *); -GLAPI void APIENTRY glSecondaryColor3dEXT (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glSecondaryColor3dvEXT (const GLdouble *); -GLAPI void APIENTRY glSecondaryColor3fEXT (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glSecondaryColor3fvEXT (const GLfloat *); -GLAPI void APIENTRY glSecondaryColor3iEXT (GLint, GLint, GLint); -GLAPI void APIENTRY glSecondaryColor3ivEXT (const GLint *); -GLAPI void APIENTRY glSecondaryColor3sEXT (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glSecondaryColor3svEXT (const GLshort *); -GLAPI void APIENTRY glSecondaryColor3ubEXT (GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glSecondaryColor3ubvEXT (const GLubyte *); -GLAPI void APIENTRY glSecondaryColor3uiEXT (GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSecondaryColor3uivEXT (const GLuint *); -GLAPI void APIENTRY glSecondaryColor3usEXT (GLushort, GLushort, GLushort); -GLAPI void APIENTRY glSecondaryColor3usvEXT (const GLushort *); -GLAPI void APIENTRY glSecondaryColorPointerEXT (GLint, GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC) (GLbyte red, GLbyte green, GLbyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC) (GLdouble red, GLdouble green, GLdouble blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC) (GLfloat red, GLfloat green, GLfloat blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC) (GLint red, GLint green, GLint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC) (GLshort red, GLshort green, GLshort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC) (GLubyte red, GLubyte green, GLubyte blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC) (const GLubyte *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC) (GLuint red, GLuint green, GLuint blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC) (const GLuint *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC) (GLushort red, GLushort green, GLushort blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC) (const GLushort *v); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_EXT_texture_perturb_normal 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureNormalEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURENORMALEXTPROC) (GLenum mode); -#endif - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiDrawArraysEXT (GLenum, GLint *, GLsizei *, GLsizei); -GLAPI void APIENTRY glMultiDrawElementsEXT (GLenum, const GLsizei *, GLenum, const GLvoid* *, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC) (GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* *indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_fog_coord -#define GL_EXT_fog_coord 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogCoordfEXT (GLfloat); -GLAPI void APIENTRY glFogCoordfvEXT (const GLfloat *); -GLAPI void APIENTRY glFogCoorddEXT (GLdouble); -GLAPI void APIENTRY glFogCoorddvEXT (const GLdouble *); -GLAPI void APIENTRY glFogCoordPointerEXT (GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFOGCOORDFEXTPROC) (GLfloat coord); -typedef void (APIENTRYP PFNGLFOGCOORDFVEXTPROC) (const GLfloat *coord); -typedef void (APIENTRYP PFNGLFOGCOORDDEXTPROC) (GLdouble coord); -typedef void (APIENTRYP PFNGLFOGCOORDDVEXTPROC) (const GLdouble *coord); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_REND_screen_coordinates 1 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_EXT_coordinate_frame 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTangent3bEXT (GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glTangent3bvEXT (const GLbyte *); -GLAPI void APIENTRY glTangent3dEXT (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glTangent3dvEXT (const GLdouble *); -GLAPI void APIENTRY glTangent3fEXT (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTangent3fvEXT (const GLfloat *); -GLAPI void APIENTRY glTangent3iEXT (GLint, GLint, GLint); -GLAPI void APIENTRY glTangent3ivEXT (const GLint *); -GLAPI void APIENTRY glTangent3sEXT (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glTangent3svEXT (const GLshort *); -GLAPI void APIENTRY glBinormal3bEXT (GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glBinormal3bvEXT (const GLbyte *); -GLAPI void APIENTRY glBinormal3dEXT (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glBinormal3dvEXT (const GLdouble *); -GLAPI void APIENTRY glBinormal3fEXT (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glBinormal3fvEXT (const GLfloat *); -GLAPI void APIENTRY glBinormal3iEXT (GLint, GLint, GLint); -GLAPI void APIENTRY glBinormal3ivEXT (const GLint *); -GLAPI void APIENTRY glBinormal3sEXT (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glBinormal3svEXT (const GLshort *); -GLAPI void APIENTRY glTangentPointerEXT (GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glBinormalPointerEXT (GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTANGENT3BEXTPROC) (GLbyte tx, GLbyte ty, GLbyte tz); -typedef void (APIENTRYP PFNGLTANGENT3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLTANGENT3DEXTPROC) (GLdouble tx, GLdouble ty, GLdouble tz); -typedef void (APIENTRYP PFNGLTANGENT3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLTANGENT3FEXTPROC) (GLfloat tx, GLfloat ty, GLfloat tz); -typedef void (APIENTRYP PFNGLTANGENT3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLTANGENT3IEXTPROC) (GLint tx, GLint ty, GLint tz); -typedef void (APIENTRYP PFNGLTANGENT3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLTANGENT3SEXTPROC) (GLshort tx, GLshort ty, GLshort tz); -typedef void (APIENTRYP PFNGLTANGENT3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLBINORMAL3BEXTPROC) (GLbyte bx, GLbyte by, GLbyte bz); -typedef void (APIENTRYP PFNGLBINORMAL3BVEXTPROC) (const GLbyte *v); -typedef void (APIENTRYP PFNGLBINORMAL3DEXTPROC) (GLdouble bx, GLdouble by, GLdouble bz); -typedef void (APIENTRYP PFNGLBINORMAL3DVEXTPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLBINORMAL3FEXTPROC) (GLfloat bx, GLfloat by, GLfloat bz); -typedef void (APIENTRYP PFNGLBINORMAL3FVEXTPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLBINORMAL3IEXTPROC) (GLint bx, GLint by, GLint bz); -typedef void (APIENTRYP PFNGLBINORMAL3IVEXTPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLBINORMAL3SEXTPROC) (GLshort bx, GLshort by, GLshort bz); -typedef void (APIENTRYP PFNGLBINORMAL3SVEXTPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLTANGENTPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLBINORMALPOINTEREXTPROC) (GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_EXT_texture_env_combine 1 -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_APPLE_specular_vector 1 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_APPLE_transform_hint 1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_SGIX_fog_scale 1 -#endif - -#ifndef GL_SUNX_constant_data -#define GL_SUNX_constant_data 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFinishTextureSUNX (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFINISHTEXTURESUNXPROC) (void); -#endif - -#ifndef GL_SUN_global_alpha -#define GL_SUN_global_alpha 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGlobalAlphaFactorbSUN (GLbyte); -GLAPI void APIENTRY glGlobalAlphaFactorsSUN (GLshort); -GLAPI void APIENTRY glGlobalAlphaFactoriSUN (GLint); -GLAPI void APIENTRY glGlobalAlphaFactorfSUN (GLfloat); -GLAPI void APIENTRY glGlobalAlphaFactordSUN (GLdouble); -GLAPI void APIENTRY glGlobalAlphaFactorubSUN (GLubyte); -GLAPI void APIENTRY glGlobalAlphaFactorusSUN (GLushort); -GLAPI void APIENTRY glGlobalAlphaFactoruiSUN (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC) (GLbyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC) (GLshort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC) (GLint factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC) (GLfloat factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC) (GLdouble factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC) (GLubyte factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC) (GLushort factor); -typedef void (APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC) (GLuint factor); -#endif - -#ifndef GL_SUN_triangle_list -#define GL_SUN_triangle_list 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReplacementCodeuiSUN (GLuint); -GLAPI void APIENTRY glReplacementCodeusSUN (GLushort); -GLAPI void APIENTRY glReplacementCodeubSUN (GLubyte); -GLAPI void APIENTRY glReplacementCodeuivSUN (const GLuint *); -GLAPI void APIENTRY glReplacementCodeusvSUN (const GLushort *); -GLAPI void APIENTRY glReplacementCodeubvSUN (const GLubyte *); -GLAPI void APIENTRY glReplacementCodePointerSUN (GLenum, GLsizei, const GLvoid* *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC) (GLuint code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC) (GLushort code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC) (GLubyte code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC) (const GLuint *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC) (const GLushort *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC) (const GLubyte *code); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC) (GLenum type, GLsizei stride, const GLvoid* *pointer); -#endif - -#ifndef GL_SUN_vertex -#define GL_SUN_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColor4ubVertex2fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat); -GLAPI void APIENTRY glColor4ubVertex2fvSUN (const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glColor4ubVertex3fSUN (GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glColor4ubVertex3fvSUN (const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glColor3fVertex3fvSUN (const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fVertex3fvSUN (const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord4fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord4fVertex4fvSUN (const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN (GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN (const GLfloat *, const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN (GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN (const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN (const GLuint *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN (GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN (const GLuint *, const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC) (GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC) (const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC) (GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC) (const GLfloat *tc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC) (GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC) (const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC) (GLuint rc, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC) (GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC) (const GLuint *rc, const GLubyte *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC) (GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC) (const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_EXT_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateEXT (GLenum, GLenum, GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_blend_func_separate -#define GL_INGR_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateINGR (GLenum, GLenum, GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_color_clamp -#define GL_INGR_color_clamp 1 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INGR_interlace_read 1 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_EXT_stencil_wrap 1 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_EXT_422_pixels 1 -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NV_texgen_reflection 1 -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_SUN_convolution_border_modes 1 -#endif - -#ifndef GL_EXT_texture_env_add -#define GL_EXT_texture_env_add 1 -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_EXT_texture_lod_bias 1 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexWeightfEXT (GLfloat); -GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *); -GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei, GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_NV_light_max_exponent 1 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_NV_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushVertexArrayRangeNV (void); -GLAPI void APIENTRY glVertexArrayRangeNV (GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC) (void); -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGENVPROC) (GLsizei length, const GLvoid *pointer); -#endif - -#ifndef GL_NV_register_combiners -#define GL_NV_register_combiners 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerParameterfvNV (GLenum, const GLfloat *); -GLAPI void APIENTRY glCombinerParameterfNV (GLenum, GLfloat); -GLAPI void APIENTRY glCombinerParameterivNV (GLenum, const GLint *); -GLAPI void APIENTRY glCombinerParameteriNV (GLenum, GLint); -GLAPI void APIENTRY glCombinerInputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glCombinerOutputNV (GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean); -GLAPI void APIENTRY glFinalCombinerInputNV (GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glGetCombinerInputParameterfvNV (GLenum, GLenum, GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetCombinerInputParameterivNV (GLenum, GLenum, GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetCombinerOutputParameterfvNV (GLenum, GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetCombinerOutputParameterivNV (GLenum, GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV (GLenum, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLCOMBINERPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLCOMBINERINPUTNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLCOMBINEROUTPUTNVPROC) (GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -typedef void (APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC) (GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC) (GLenum stage, GLenum portion, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC) (GLenum variable, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC) (GLenum variable, GLenum pname, GLint *params); -#endif - -#ifndef GL_NV_fog_distance -#define GL_NV_fog_distance 1 -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_NV_texgen_emboss 1 -#endif - -#ifndef GL_NV_blend_square -#define GL_NV_blend_square 1 -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_NV_texture_env_combine4 1 -#endif - -#ifndef GL_MESA_resize_buffers -#define GL_MESA_resize_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glResizeBuffersMESA (void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLRESIZEBUFFERSMESAPROC) (void); -#endif - -#ifndef GL_MESA_window_pos -#define GL_MESA_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dMESA (GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos2dvMESA (const GLdouble *); -GLAPI void APIENTRY glWindowPos2fMESA (GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos2fvMESA (const GLfloat *); -GLAPI void APIENTRY glWindowPos2iMESA (GLint, GLint); -GLAPI void APIENTRY glWindowPos2ivMESA (const GLint *); -GLAPI void APIENTRY glWindowPos2sMESA (GLshort, GLshort); -GLAPI void APIENTRY glWindowPos2svMESA (const GLshort *); -GLAPI void APIENTRY glWindowPos3dMESA (GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos3dvMESA (const GLdouble *); -GLAPI void APIENTRY glWindowPos3fMESA (GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos3fvMESA (const GLfloat *); -GLAPI void APIENTRY glWindowPos3iMESA (GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos3ivMESA (const GLint *); -GLAPI void APIENTRY glWindowPos3sMESA (GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos3svMESA (const GLshort *); -GLAPI void APIENTRY glWindowPos4dMESA (GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos4dvMESA (const GLdouble *); -GLAPI void APIENTRY glWindowPos4fMESA (GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos4fvMESA (const GLfloat *); -GLAPI void APIENTRY glWindowPos4iMESA (GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos4ivMESA (const GLint *); -GLAPI void APIENTRY glWindowPos4sMESA (GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos4svMESA (const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLWINDOWPOS2DMESAPROC) (GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLWINDOWPOS2DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2FMESAPROC) (GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLWINDOWPOS2FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2IMESAPROC) (GLint x, GLint y); -typedef void (APIENTRYP PFNGLWINDOWPOS2IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS2SMESAPROC) (GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLWINDOWPOS2SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3DMESAPROC) (GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLWINDOWPOS3DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3FMESAPROC) (GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLWINDOWPOS3FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3IMESAPROC) (GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLWINDOWPOS3IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS3SMESAPROC) (GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLWINDOWPOS3SVMESAPROC) (const GLshort *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4DMESAPROC) (GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLWINDOWPOS4DVMESAPROC) (const GLdouble *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4FMESAPROC) (GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLWINDOWPOS4FVMESAPROC) (const GLfloat *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4IMESAPROC) (GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLWINDOWPOS4IVMESAPROC) (const GLint *v); -typedef void (APIENTRYP PFNGLWINDOWPOS4SMESAPROC) (GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLWINDOWPOS4SVMESAPROC) (const GLshort *v); -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_IBM_cull_vertex 1 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#define GL_IBM_multimode_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiModeDrawArraysIBM (const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint); -GLAPI void APIENTRY glMultiModeDrawElementsIBM (const GLenum *, const GLsizei *, GLenum, const GLvoid* const *, GLsizei, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC) (const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -typedef void (APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC) (const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, GLint modestride); -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_IBM_vertex_array_lists 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glSecondaryColorPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glEdgeFlagPointerListIBM (GLint, const GLboolean* *, GLint); -GLAPI void APIENTRY glFogCoordPointerListIBM (GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glIndexPointerListIBM (GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glNormalPointerListIBM (GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glTexCoordPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); -GLAPI void APIENTRY glVertexPointerListIBM (GLint, GLenum, GLint, const GLvoid* *, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC) (GLint stride, const GLboolean* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC) (GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -typedef void (APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC) (GLint size, GLenum type, GLint stride, const GLvoid* *pointer, GLint ptrstride); -#endif - -#ifndef GL_SGIX_subsample -#define GL_SGIX_subsample 1 -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_SGIX_ycrcba 1 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#define GL_SGIX_ycrcb_subsample 1 -#endif - -#ifndef GL_SGIX_depth_pass_instrument -#define GL_SGIX_depth_pass_instrument 1 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_3DFX_texture_compression_FXT1 1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_3DFX_multisample 1 -#endif - -#ifndef GL_3DFX_tbuffer -#define GL_3DFX_tbuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTbufferMask3DFX (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTBUFFERMASK3DFXPROC) (GLuint mask); -#endif - -#ifndef GL_EXT_multisample -#define GL_EXT_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskEXT (GLclampf, GLboolean); -GLAPI void APIENTRY glSamplePatternEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSAMPLEMASKEXTPROC) (GLclampf value, GLboolean invert); -typedef void (APIENTRYP PFNGLSAMPLEPATTERNEXTPROC) (GLenum pattern); -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_SGIX_vertex_preclip 1 -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_SGIX_convolution_accuracy 1 -#endif - -#ifndef GL_SGIX_resample -#define GL_SGIX_resample 1 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_SGIS_point_line_texgen 1 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_SGIS_texture_color_mask 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureColorMaskSGIS (GLboolean, GLboolean, GLboolean, GLboolean); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC) (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -#endif - -#ifndef GL_SGIX_igloo_interface -#define GL_SGIX_igloo_interface 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIglooInterfaceSGIX (GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLIGLOOINTERFACESGIXPROC) (GLenum pname, const GLvoid *params); -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_EXT_texture_env_dot3 1 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_ATI_texture_mirror_once 1 -#endif - -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteFencesNV (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenFencesNV (GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsFenceNV (GLuint); -GLAPI GLboolean APIENTRY glTestFenceNV (GLuint); -GLAPI void APIENTRY glGetFenceivNV (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glFinishFenceNV (GLuint); -GLAPI void APIENTRY glSetFenceNV (GLuint, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDELETEFENCESNVPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLGENFENCESNVPROC) (GLsizei n, GLuint *fences); -typedef GLboolean (APIENTRYP PFNGLISFENCENVPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLGETFENCEIVNVPROC) (GLuint fence, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); -#endif - -#ifndef GL_NV_evaluators -#define GL_NV_evaluators 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *); -GLAPI void APIENTRY glMapParameterivNV (GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glMapParameterfvNV (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glGetMapControlPointsNV (GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *); -GLAPI void APIENTRY glGetMapParameterivNV (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetMapParameterfvNV (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetMapAttribParameterivNV (GLenum, GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetMapAttribParameterfvNV (GLenum, GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glEvalMapsNV (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -typedef void (APIENTRYP PFNGLMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, const GLint *params); -typedef void (APIENTRYP PFNGLMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC) (GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC) (GLenum target, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC) (GLenum target, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC) (GLenum target, GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLEVALMAPSNVPROC) (GLenum target, GLenum mode); -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_NV_packed_depth_stencil 1 -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_NV_register_combiners2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerStageParameterfvNV (GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glGetCombinerStageParameterfvNV (GLenum, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC) (GLenum stage, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_NV_texture_compression_vtc -#define GL_NV_texture_compression_vtc 1 -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_NV_texture_rectangle 1 -#endif - -#ifndef GL_NV_texture_shader -#define GL_NV_texture_shader 1 -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_NV_texture_shader2 1 -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_NV_vertex_array_range2 1 -#endif - -#ifndef GL_NV_vertex_program -#define GL_NV_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreProgramsResidentNV (GLsizei, const GLuint *, GLboolean *); -GLAPI void APIENTRY glBindProgramNV (GLenum, GLuint); -GLAPI void APIENTRY glDeleteProgramsNV (GLsizei, const GLuint *); -GLAPI void APIENTRY glExecuteProgramNV (GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glGenProgramsNV (GLsizei, GLuint *); -GLAPI void APIENTRY glGetProgramParameterdvNV (GLenum, GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetProgramParameterfvNV (GLenum, GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetProgramivNV (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetProgramStringNV (GLuint, GLenum, GLubyte *); -GLAPI void APIENTRY glGetTrackMatrixivNV (GLenum, GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribdvNV (GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetVertexAttribfvNV (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribivNV (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribPointervNV (GLuint, GLenum, GLvoid* *); -GLAPI GLboolean APIENTRY glIsProgramNV (GLuint); -GLAPI void APIENTRY glLoadProgramNV (GLenum, GLuint, GLsizei, const GLubyte *); -GLAPI void APIENTRY glProgramParameter4dNV (GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramParameter4dvNV (GLenum, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramParameter4fNV (GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramParameter4fvNV (GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glProgramParameters4dvNV (GLenum, GLuint, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramParameters4fvNV (GLenum, GLuint, GLuint, const GLfloat *); -GLAPI void APIENTRY glRequestResidentProgramsNV (GLsizei, const GLuint *); -GLAPI void APIENTRY glTrackMatrixNV (GLenum, GLuint, GLenum, GLenum); -GLAPI void APIENTRY glVertexAttribPointerNV (GLuint, GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glVertexAttrib1dNV (GLuint, GLdouble); -GLAPI void APIENTRY glVertexAttrib1dvNV (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib1fNV (GLuint, GLfloat); -GLAPI void APIENTRY glVertexAttrib1fvNV (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib1sNV (GLuint, GLshort); -GLAPI void APIENTRY glVertexAttrib1svNV (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib2dNV (GLuint, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib2dvNV (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib2fNV (GLuint, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib2fvNV (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib2sNV (GLuint, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib2svNV (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib3dNV (GLuint, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib3dvNV (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib3fNV (GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib3fvNV (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib3sNV (GLuint, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib3svNV (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4dNV (GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib4dvNV (GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib4fNV (GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib4fvNV (GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib4sNV (GLuint, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib4svNV (GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4ubNV (GLuint, GLubyte, GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glVertexAttrib4ubvNV (GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttribs1dvNV (GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs1fvNV (GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs1svNV (GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs2dvNV (GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs2fvNV (GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs2svNV (GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs3dvNV (GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs3fvNV (GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs3svNV (GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs4dvNV (GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs4fvNV (GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs4svNV (GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs4ubvNV (GLuint, GLsizei, const GLubyte *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences); -typedef void (APIENTRYP PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id); -typedef void (APIENTRYP PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLEXECUTEPROGRAMNVPROC) (GLenum target, GLuint id, const GLfloat *params); -typedef void (APIENTRYP PFNGLGENPROGRAMSNVPROC) (GLsizei n, GLuint *programs); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC) (GLenum target, GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC) (GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC) (GLuint id, GLenum pname, GLubyte *program); -typedef void (APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC) (GLenum target, GLuint address, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC) (GLuint index, GLenum pname, GLdouble *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC) (GLuint index, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC) (GLuint index, GLenum pname, GLvoid* *pointer); -typedef GLboolean (APIENTRYP PFNGLISPROGRAMNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLLOADPROGRAMNVPROC) (GLenum target, GLuint id, GLsizei len, const GLubyte *program); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC) (GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC) (GLenum target, GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC) (GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC) (GLenum target, GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC) (GLenum target, GLuint index, GLuint count, const GLdouble *v); -typedef void (APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC) (GLenum target, GLuint index, GLuint count, const GLfloat *v); -typedef void (APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC) (GLsizei n, const GLuint *programs); -typedef void (APIENTRYP PFNGLTRACKMATRIXNVPROC) (GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void (APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC) (GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DNVPROC) (GLuint index, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FNVPROC) (GLuint index, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SNVPROC) (GLuint index, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DNVPROC) (GLuint index, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FNVPROC) (GLuint index, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SNVPROC) (GLuint index, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DNVPROC) (GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC) (GLuint index, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FNVPROC) (GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC) (GLuint index, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SNVPROC) (GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC) (GLuint index, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC) (GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC) (GLuint index, const GLubyte *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC) (GLuint index, GLsizei count, const GLdouble *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v); -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_SGIX_texture_coordinate_clamp 1 -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SGIX_scalebias_hint 1 -#endif - -#ifndef GL_OML_interlace -#define GL_OML_interlace 1 -#endif - -#ifndef GL_OML_subsample -#define GL_OML_subsample 1 -#endif - -#ifndef GL_OML_resample -#define GL_OML_resample 1 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_NV_copy_depth_to_color 1 -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_ATI_envmap_bumpmap 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBumpParameterivATI (GLenum, const GLint *); -GLAPI void APIENTRY glTexBumpParameterfvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glGetTexBumpParameterivATI (GLenum, GLint *); -GLAPI void APIENTRY glGetTexBumpParameterfvATI (GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC) (GLenum pname, const GLint *param); -typedef void (APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC) (GLenum pname, const GLfloat *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC) (GLenum pname, GLint *param); -typedef void (APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC) (GLenum pname, GLfloat *param); -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_ATI_fragment_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glGenFragmentShadersATI (GLuint); -GLAPI void APIENTRY glBindFragmentShaderATI (GLuint); -GLAPI void APIENTRY glDeleteFragmentShaderATI (GLuint); -GLAPI void APIENTRY glBeginFragmentShaderATI (void); -GLAPI void APIENTRY glEndFragmentShaderATI (void); -GLAPI void APIENTRY glPassTexCoordATI (GLuint, GLuint, GLenum); -GLAPI void APIENTRY glSampleMapATI (GLuint, GLuint, GLenum); -GLAPI void APIENTRY glColorFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glColorFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glColorFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glAlphaFragmentOp1ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glAlphaFragmentOp2ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glAlphaFragmentOp3ATI (GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSetFragmentShaderConstantATI (GLuint, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC) (GLuint range); -typedef void (APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC) (void); -typedef void (APIENTRYP PFNGLPASSTEXCOORDATIPROC) (GLuint dst, GLuint coord, GLenum swizzle); -typedef void (APIENTRYP PFNGLSAMPLEMAPATIPROC) (GLuint dst, GLuint interp, GLenum swizzle); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void (APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC) (GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void (APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC) (GLuint dst, const GLfloat *value); -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_ATI_pn_triangles 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPNTrianglesiATI (GLenum, GLint); -GLAPI void APIENTRY glPNTrianglesfATI (GLenum, GLfloat); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_ATI_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glNewObjectBufferATI (GLsizei, const GLvoid *, GLenum); -GLAPI GLboolean APIENTRY glIsObjectBufferATI (GLuint); -GLAPI void APIENTRY glUpdateObjectBufferATI (GLuint, GLuint, GLsizei, const GLvoid *, GLenum); -GLAPI void APIENTRY glGetObjectBufferfvATI (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetObjectBufferivATI (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glFreeObjectBufferATI (GLuint); -GLAPI void APIENTRY glArrayObjectATI (GLenum, GLint, GLenum, GLsizei, GLuint, GLuint); -GLAPI void APIENTRY glGetArrayObjectfvATI (GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetArrayObjectivATI (GLenum, GLenum, GLint *); -GLAPI void APIENTRY glVariantArrayObjectATI (GLuint, GLenum, GLsizei, GLuint, GLuint); -GLAPI void APIENTRY glGetVariantArrayObjectfvATI (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVariantArrayObjectivATI (GLuint, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint (APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC) (GLsizei size, const GLvoid *pointer, GLenum usage); -typedef GLboolean (APIENTRYP PFNGLISOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC) (GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC) (GLuint buffer, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC) (GLuint buffer, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLARRAYOBJECTATIPROC) (GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC) (GLenum array, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC) (GLenum array, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC) (GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC) (GLuint id, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC) (GLuint id, GLenum pname, GLint *params); -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_EXT_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginVertexShaderEXT (void); -GLAPI void APIENTRY glEndVertexShaderEXT (void); -GLAPI void APIENTRY glBindVertexShaderEXT (GLuint); -GLAPI GLuint APIENTRY glGenVertexShadersEXT (GLuint); -GLAPI void APIENTRY glDeleteVertexShaderEXT (GLuint); -GLAPI void APIENTRY glShaderOp1EXT (GLenum, GLuint, GLuint); -GLAPI void APIENTRY glShaderOp2EXT (GLenum, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glShaderOp3EXT (GLenum, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSwizzleEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glWriteMaskEXT (GLuint, GLuint, GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glInsertComponentEXT (GLuint, GLuint, GLuint); -GLAPI void APIENTRY glExtractComponentEXT (GLuint, GLuint, GLuint); -GLAPI GLuint APIENTRY glGenSymbolsEXT (GLenum, GLenum, GLenum, GLuint); -GLAPI void APIENTRY glSetInvariantEXT (GLuint, GLenum, const GLvoid *); -GLAPI void APIENTRY glSetLocalConstantEXT (GLuint, GLenum, const GLvoid *); -GLAPI void APIENTRY glVariantbvEXT (GLuint, const GLbyte *); -GLAPI void APIENTRY glVariantsvEXT (GLuint, const GLshort *); -GLAPI void APIENTRY glVariantivEXT (GLuint, const GLint *); -GLAPI void APIENTRY glVariantfvEXT (GLuint, const GLfloat *); -GLAPI void APIENTRY glVariantdvEXT (GLuint, const GLdouble *); -GLAPI void APIENTRY glVariantubvEXT (GLuint, const GLubyte *); -GLAPI void APIENTRY glVariantusvEXT (GLuint, const GLushort *); -GLAPI void APIENTRY glVariantuivEXT (GLuint, const GLuint *); -GLAPI void APIENTRY glVariantPointerEXT (GLuint, GLenum, GLuint, const GLvoid *); -GLAPI void APIENTRY glEnableVariantClientStateEXT (GLuint); -GLAPI void APIENTRY glDisableVariantClientStateEXT (GLuint); -GLAPI GLuint APIENTRY glBindLightParameterEXT (GLenum, GLenum); -GLAPI GLuint APIENTRY glBindMaterialParameterEXT (GLenum, GLenum); -GLAPI GLuint APIENTRY glBindTexGenParameterEXT (GLenum, GLenum, GLenum); -GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT (GLenum, GLenum); -GLAPI GLuint APIENTRY glBindParameterEXT (GLenum); -GLAPI GLboolean APIENTRY glIsVariantEnabledEXT (GLuint, GLenum); -GLAPI void APIENTRY glGetVariantBooleanvEXT (GLuint, GLenum, GLboolean *); -GLAPI void APIENTRY glGetVariantIntegervEXT (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVariantFloatvEXT (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVariantPointervEXT (GLuint, GLenum, GLvoid* *); -GLAPI void APIENTRY glGetInvariantBooleanvEXT (GLuint, GLenum, GLboolean *); -GLAPI void APIENTRY glGetInvariantIntegervEXT (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetInvariantFloatvEXT (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetLocalConstantBooleanvEXT (GLuint, GLenum, GLboolean *); -GLAPI void APIENTRY glGetLocalConstantIntegervEXT (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetLocalConstantFloatvEXT (GLuint, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLENDVERTEXSHADEREXTPROC) (void); -typedef void (APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC) (GLuint range); -typedef void (APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLSHADEROP1EXTPROC) (GLenum op, GLuint res, GLuint arg1); -typedef void (APIENTRYP PFNGLSHADEROP2EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2); -typedef void (APIENTRYP PFNGLSHADEROP3EXTPROC) (GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -typedef void (APIENTRYP PFNGLSWIZZLEEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLWRITEMASKEXTPROC) (GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void (APIENTRYP PFNGLINSERTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef void (APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC) (GLuint res, GLuint src, GLuint num); -typedef GLuint (APIENTRYP PFNGLGENSYMBOLSEXTPROC) (GLenum datatype, GLenum storagetype, GLenum range, GLuint components); -typedef void (APIENTRYP PFNGLSETINVARIANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC) (GLuint id, GLenum type, const GLvoid *addr); -typedef void (APIENTRYP PFNGLVARIANTBVEXTPROC) (GLuint id, const GLbyte *addr); -typedef void (APIENTRYP PFNGLVARIANTSVEXTPROC) (GLuint id, const GLshort *addr); -typedef void (APIENTRYP PFNGLVARIANTIVEXTPROC) (GLuint id, const GLint *addr); -typedef void (APIENTRYP PFNGLVARIANTFVEXTPROC) (GLuint id, const GLfloat *addr); -typedef void (APIENTRYP PFNGLVARIANTDVEXTPROC) (GLuint id, const GLdouble *addr); -typedef void (APIENTRYP PFNGLVARIANTUBVEXTPROC) (GLuint id, const GLubyte *addr); -typedef void (APIENTRYP PFNGLVARIANTUSVEXTPROC) (GLuint id, const GLushort *addr); -typedef void (APIENTRYP PFNGLVARIANTUIVEXTPROC) (GLuint id, const GLuint *addr); -typedef void (APIENTRYP PFNGLVARIANTPOINTEREXTPROC) (GLuint id, GLenum type, GLuint stride, const GLvoid *addr); -typedef void (APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef void (APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC) (GLuint id); -typedef GLuint (APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC) (GLenum light, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC) (GLenum face, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC) (GLenum unit, GLenum coord, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC) (GLenum unit, GLenum value); -typedef GLuint (APIENTRYP PFNGLBINDPARAMETEREXTPROC) (GLenum value); -typedef GLboolean (APIENTRYP PFNGLISVARIANTENABLEDEXTPROC) (GLuint id, GLenum cap); -typedef void (APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC) (GLuint id, GLenum value, GLvoid* *data); -typedef void (APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC) (GLuint id, GLenum value, GLboolean *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC) (GLuint id, GLenum value, GLint *data); -typedef void (APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC) (GLuint id, GLenum value, GLfloat *data); -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_ATI_vertex_streams 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexStream1sATI (GLenum, GLshort); -GLAPI void APIENTRY glVertexStream1svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream1iATI (GLenum, GLint); -GLAPI void APIENTRY glVertexStream1ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream1fATI (GLenum, GLfloat); -GLAPI void APIENTRY glVertexStream1fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream1dATI (GLenum, GLdouble); -GLAPI void APIENTRY glVertexStream1dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glVertexStream2sATI (GLenum, GLshort, GLshort); -GLAPI void APIENTRY glVertexStream2svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream2iATI (GLenum, GLint, GLint); -GLAPI void APIENTRY glVertexStream2ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream2fATI (GLenum, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexStream2fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream2dATI (GLenum, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexStream2dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glVertexStream3sATI (GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexStream3svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream3iATI (GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glVertexStream3ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream3fATI (GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexStream3fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream3dATI (GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexStream3dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glVertexStream4sATI (GLenum, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexStream4svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream4iATI (GLenum, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glVertexStream4ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream4fATI (GLenum, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexStream4fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream4dATI (GLenum, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexStream4dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glNormalStream3bATI (GLenum, GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glNormalStream3bvATI (GLenum, const GLbyte *); -GLAPI void APIENTRY glNormalStream3sATI (GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glNormalStream3svATI (GLenum, const GLshort *); -GLAPI void APIENTRY glNormalStream3iATI (GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glNormalStream3ivATI (GLenum, const GLint *); -GLAPI void APIENTRY glNormalStream3fATI (GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glNormalStream3fvATI (GLenum, const GLfloat *); -GLAPI void APIENTRY glNormalStream3dATI (GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glNormalStream3dvATI (GLenum, const GLdouble *); -GLAPI void APIENTRY glClientActiveVertexStreamATI (GLenum); -GLAPI void APIENTRY glVertexBlendEnviATI (GLenum, GLint); -GLAPI void APIENTRY glVertexBlendEnvfATI (GLenum, GLfloat); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SATIPROC) (GLenum stream, GLshort x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IATIPROC) (GLenum stream, GLint x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FATIPROC) (GLenum stream, GLfloat x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DATIPROC) (GLenum stream, GLdouble x); -typedef void (APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SATIPROC) (GLenum stream, GLshort x, GLshort y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IATIPROC) (GLenum stream, GLint x, GLint y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FATIPROC) (GLenum stream, GLfloat x, GLfloat y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DATIPROC) (GLenum stream, GLdouble x, GLdouble y); -typedef void (APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IATIPROC) (GLenum stream, GLint x, GLint y, GLint z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void (APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SATIPROC) (GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IATIPROC) (GLenum stream, GLint x, GLint y, GLint z, GLint w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FATIPROC) (GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DATIPROC) (GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BATIPROC) (GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3BVATIPROC) (GLenum stream, const GLbyte *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SATIPROC) (GLenum stream, GLshort nx, GLshort ny, GLshort nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3SVATIPROC) (GLenum stream, const GLshort *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IATIPROC) (GLenum stream, GLint nx, GLint ny, GLint nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3IVATIPROC) (GLenum stream, const GLint *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FATIPROC) (GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3FVATIPROC) (GLenum stream, const GLfloat *coords); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DATIPROC) (GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); -typedef void (APIENTRYP PFNGLNORMALSTREAM3DVATIPROC) (GLenum stream, const GLdouble *coords); -typedef void (APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC) (GLenum stream); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVIATIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLVERTEXBLENDENVFATIPROC) (GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_element_array -#define GL_ATI_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerATI (GLenum, const GLvoid *); -GLAPI void APIENTRY glDrawElementArrayATI (GLenum, GLsizei); -GLAPI void APIENTRY glDrawRangeElementArrayATI (GLenum, GLuint, GLuint, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERATIPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC) (GLenum mode, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count); -#endif - -#ifndef GL_SUN_mesh_array -#define GL_SUN_mesh_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawMeshArraysSUN (GLenum, GLint, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC) (GLenum mode, GLint first, GLsizei count, GLsizei width); -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SUN_slice_accum 1 -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_NV_multisample_filter_hint 1 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_NV_depth_clamp 1 -#endif - -#ifndef GL_NV_occlusion_query -#define GL_NV_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenOcclusionQueriesNV (GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteOcclusionQueriesNV (GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsOcclusionQueryNV (GLuint); -GLAPI void APIENTRY glBeginOcclusionQueryNV (GLuint); -GLAPI void APIENTRY glEndOcclusionQueryNV (void); -GLAPI void APIENTRY glGetOcclusionQueryivNV (GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetOcclusionQueryuivNV (GLuint, GLenum, GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC) (GLsizei n, GLuint *ids); -typedef void (APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC) (GLsizei n, const GLuint *ids); -typedef GLboolean (APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC) (GLuint id); -typedef void (APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC) (void); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC) (GLuint id, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC) (GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_NV_point_sprite -#define GL_NV_point_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameteriNV (GLenum, GLint); -GLAPI void APIENTRY glPointParameterivNV (GLenum, const GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPOINTPARAMETERINVPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVNVPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_NV_texture_shader3 1 -#endif - -#ifndef GL_NV_vertex_program1_1 -#define GL_NV_vertex_program1_1 1 -#endif - -#ifndef GL_EXT_shadow_funcs -#define GL_EXT_shadow_funcs 1 -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_EXT_stencil_two_side 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveStencilFaceEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC) (GLenum face); -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_ATI_text_fragment_shader 1 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_APPLE_client_storage 1 -#endif - -#ifndef GL_APPLE_element_array -#define GL_APPLE_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerAPPLE (GLenum, const GLvoid *); -GLAPI void APIENTRY glDrawElementArrayAPPLE (GLenum, GLint, GLsizei); -GLAPI void APIENTRY glDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, GLint, GLsizei); -GLAPI void APIENTRY glMultiDrawElementArrayAPPLE (GLenum, const GLint *, const GLsizei *, GLsizei); -GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE (GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC) (GLenum type, const GLvoid *pointer); -typedef void (APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC) (GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); -#endif - -#ifndef GL_APPLE_fence -#define GL_APPLE_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenFencesAPPLE (GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteFencesAPPLE (GLsizei, const GLuint *); -GLAPI void APIENTRY glSetFenceAPPLE (GLuint); -GLAPI GLboolean APIENTRY glIsFenceAPPLE (GLuint); -GLAPI GLboolean APIENTRY glTestFenceAPPLE (GLuint); -GLAPI void APIENTRY glFinishFenceAPPLE (GLuint); -GLAPI GLboolean APIENTRY glTestObjectAPPLE (GLenum, GLuint); -GLAPI void APIENTRY glFinishObjectAPPLE (GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLGENFENCESAPPLEPROC) (GLsizei n, GLuint *fences); -typedef void (APIENTRYP PFNGLDELETEFENCESAPPLEPROC) (GLsizei n, const GLuint *fences); -typedef void (APIENTRYP PFNGLSETFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLISFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTFENCEAPPLEPROC) (GLuint fence); -typedef void (APIENTRYP PFNGLFINISHFENCEAPPLEPROC) (GLuint fence); -typedef GLboolean (APIENTRYP PFNGLTESTOBJECTAPPLEPROC) (GLenum object, GLuint name); -typedef void (APIENTRYP PFNGLFINISHOBJECTAPPLEPROC) (GLenum object, GLint name); -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_APPLE_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindVertexArrayAPPLE (GLuint); -GLAPI void APIENTRY glDeleteVertexArraysAPPLE (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenVertexArraysAPPLE (GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC) (GLuint array); -typedef void (APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays); -typedef void (APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC) (GLsizei n, const GLuint *arrays); -typedef GLboolean (APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC) (GLuint array); -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_APPLE_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexArrayRangeAPPLE (GLsizei, GLvoid *); -GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE (GLsizei, GLvoid *); -GLAPI void APIENTRY glVertexArrayParameteriAPPLE (GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC) (GLenum pname, GLint param); -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_APPLE_ycbcr_422 1 -#endif - -#ifndef GL_S3_s3tc -#define GL_S3_s3tc 1 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_ATI_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersATI (GLsizei, const GLenum *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_ATI_pixel_format_float 1 -/* This is really a WGL extension, but defines some associated GL enums. - * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string. - */ -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_ATI_texture_env_combine3 1 -#endif - -#ifndef GL_ATI_texture_float -#define GL_ATI_texture_float 1 -#endif - -#ifndef GL_NV_float_buffer -#define GL_NV_float_buffer 1 -#endif - -#ifndef GL_NV_fragment_program -#define GL_NV_fragment_program 1 -/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint, GLsizei, const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint, GLsizei, const GLubyte *, const GLdouble *); -GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint, GLsizei, const GLubyte *, GLfloat *); -GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint, GLsizei, const GLubyte *, GLdouble *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); -typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); -#endif - -#ifndef GL_NV_half_float -#define GL_NV_half_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertex2hNV (GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertex2hvNV (const GLhalfNV *); -GLAPI void APIENTRY glVertex3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertex3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glVertex4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertex4hvNV (const GLhalfNV *); -GLAPI void APIENTRY glNormal3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glNormal3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glColor3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glColor4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glColor4hvNV (const GLhalfNV *); -GLAPI void APIENTRY glTexCoord1hNV (GLhalfNV); -GLAPI void APIENTRY glTexCoord1hvNV (const GLhalfNV *); -GLAPI void APIENTRY glTexCoord2hNV (GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glTexCoord2hvNV (const GLhalfNV *); -GLAPI void APIENTRY glTexCoord3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glTexCoord3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glTexCoord4hNV (GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glTexCoord4hvNV (const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord1hNV (GLenum, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord1hvNV (GLenum, const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord2hNV (GLenum, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord2hvNV (GLenum, const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord3hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord3hvNV (GLenum, const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord4hNV (GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord4hvNV (GLenum, const GLhalfNV *); -GLAPI void APIENTRY glFogCoordhNV (GLhalfNV); -GLAPI void APIENTRY glFogCoordhvNV (const GLhalfNV *); -GLAPI void APIENTRY glSecondaryColor3hNV (GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glSecondaryColor3hvNV (const GLhalfNV *); -GLAPI void APIENTRY glVertexWeighthNV (GLhalfNV); -GLAPI void APIENTRY glVertexWeighthvNV (const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib1hNV (GLuint, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib1hvNV (GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib2hNV (GLuint, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib2hvNV (GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib3hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib3hvNV (GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib4hNV (GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib4hvNV (GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs1hvNV (GLuint, GLsizei, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs2hvNV (GLuint, GLsizei, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs3hvNV (GLuint, GLsizei, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs4hvNV (GLuint, GLsizei, const GLhalfNV *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEX2HNVPROC) (GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEX2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX3HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEX3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEX4HNVPROC) (GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEX4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLNORMAL3HNVPROC) (GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); -typedef void (APIENTRYP PFNGLNORMAL3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLCOLOR4HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); -typedef void (APIENTRYP PFNGLCOLOR4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD1HNVPROC) (GLhalfNV s); -typedef void (APIENTRYP PFNGLTEXCOORD1HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD2HNVPROC) (GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLTEXCOORD2HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD3HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLTEXCOORD3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLTEXCOORD4HNVPROC) (GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLTEXCOORD4HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HNVPROC) (GLenum target, GLhalfNV s); -typedef void (APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t); -typedef void (APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void (APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HNVPROC) (GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void (APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC) (GLenum target, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLFOGCOORDHNVPROC) (GLhalfNV fog); -typedef void (APIENTRYP PFNGLFOGCOORDHVNVPROC) (const GLhalfNV *fog); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC) (GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void (APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC) (const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHNVPROC) (GLhalfNV weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC) (const GLhalfNV *weight); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HNVPROC) (GLuint index, GLhalfNV x); -typedef void (APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y); -typedef void (APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void (APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HNVPROC) (GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void (APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC) (GLuint index, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, const GLhalfNV *v); -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_NV_pixel_data_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelDataRangeNV (GLenum, GLsizei, GLvoid *); -GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer); -typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target); -#endif - -#ifndef GL_NV_primitive_restart -#define GL_NV_primitive_restart 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPrimitiveRestartNV (void); -GLAPI void APIENTRY glPrimitiveRestartIndexNV (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTNVPROC) (void); -typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC) (GLuint index); -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_NV_texture_expand_normal 1 -#endif - -#ifndef GL_NV_vertex_program2 -#define GL_NV_vertex_program2 1 -#endif - -#ifndef GL_ATI_map_object_buffer -#define GL_ATI_map_object_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLvoid* APIENTRY glMapObjectBufferATI (GLuint); -GLAPI void APIENTRY glUnmapObjectBufferATI (GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLvoid* (APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC) (GLuint buffer); -typedef void (APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC) (GLuint buffer); -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_ATI_separate_stencil 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilOpSeparateATI (GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glStencilFuncSeparateATI (GLenum, GLenum, GLint, GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC) (GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void (APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC) (GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#define GL_ATI_vertex_attrib_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribArrayObjectATI (GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint); -GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI (GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI (GLuint, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, GLenum pname, GLfloat *params); -typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params); -#endif - -#ifndef GL_OES_read_format -#define GL_OES_read_format 1 -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_EXT_depth_bounds_test 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthBoundsEXT (GLclampd, GLclampd); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDEPTHBOUNDSEXTPROC) (GLclampd zmin, GLclampd zmax); -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_EXT_texture_mirror_clamp 1 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_EXT_blend_equation_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparateEXT (GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC) (GLenum modeRGB, GLenum modeAlpha); -#endif - -#ifndef GL_MESA_pack_invert -#define GL_MESA_pack_invert 1 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_MESA_ycbcr_texture 1 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_EXT_pixel_buffer_object 1 -#endif - -#ifndef GL_NV_fragment_program_option -#define GL_NV_fragment_program_option 1 -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_NV_fragment_program2 1 -#endif - -#ifndef GL_NV_vertex_program2_option -#define GL_NV_vertex_program2_option 1 -#endif - -#ifndef GL_NV_vertex_program3 -#define GL_NV_vertex_program3 1 -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_EXT_framebuffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glIsRenderbufferEXT (GLuint); -GLAPI void APIENTRY glBindRenderbufferEXT (GLenum, GLuint); -GLAPI void APIENTRY glDeleteRenderbuffersEXT (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenRenderbuffersEXT (GLsizei, GLuint *); -GLAPI void APIENTRY glRenderbufferStorageEXT (GLenum, GLenum, GLsizei, GLsizei); -GLAPI void APIENTRY glGetRenderbufferParameterivEXT (GLenum, GLenum, GLint *); -GLAPI GLboolean APIENTRY glIsFramebufferEXT (GLuint); -GLAPI void APIENTRY glBindFramebufferEXT (GLenum, GLuint); -GLAPI void APIENTRY glDeleteFramebuffersEXT (GLsizei, const GLuint *); -GLAPI void APIENTRY glGenFramebuffersEXT (GLsizei, GLuint *); -GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT (GLenum); -GLAPI void APIENTRY glFramebufferTexture1DEXT (GLenum, GLenum, GLenum, GLuint, GLint); -GLAPI void APIENTRY glFramebufferTexture2DEXT (GLenum, GLenum, GLenum, GLuint, GLint); -GLAPI void APIENTRY glFramebufferTexture3DEXT (GLenum, GLenum, GLenum, GLuint, GLint, GLint); -GLAPI void APIENTRY glFramebufferRenderbufferEXT (GLenum, GLenum, GLenum, GLuint); -GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT (GLenum, GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGenerateMipmapEXT (GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean (APIENTRYP PFNGLISRENDERBUFFEREXTPROC) (GLuint renderbuffer); -typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC) (GLenum target, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC) (GLsizei n, const GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC) (GLsizei n, GLuint *renderbuffers); -typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void (APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); -typedef GLboolean (APIENTRYP PFNGLISFRAMEBUFFEREXTPROC) (GLuint framebuffer); -typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC) (GLenum target, GLuint framebuffer); -typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC) (GLsizei n, const GLuint *framebuffers); -typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC) (GLsizei n, GLuint *framebuffers); -typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) (GLenum target); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void (APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC) (GLenum target, GLenum attachment, GLenum pname, GLint *params); -typedef void (APIENTRYP PFNGLGENERATEMIPMAPEXTPROC) (GLenum target); -#endif - -#ifndef GL_GREMEDY_string_marker -#define GL_GREMEDY_string_marker 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStringMarkerGREMEDY (GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC) (GLsizei len, const GLvoid *string); -#endif - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/opengl/glut32.lib b/opengl/glut32.lib deleted file mode 100644 index 494cad96eeeebbde33e6d77baa881c4483df9bbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13824 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 CmU5~9 diff --git a/opengl/wglew.h b/opengl/wglew.h deleted file mode 100644 index 71ee0f30..00000000 --- a/opengl/wglew.h +++ /dev/null @@ -1,1427 +0,0 @@ -/* -** The OpenGL Extension Wrangler Library -** Copyright (C) 2008-2015, Nigel Stewart -** Copyright (C) 2002-2008, Milan Ikits -** Copyright (C) 2002-2008, Marcelo E. Magallon -** Copyright (C) 2002, Lev Povalahev -** All rights reserved. -** -** Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are met: -** -** * Redistributions of source code must retain the above copyright notice, -** this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright notice, -** this list of conditions and the following disclaimer in the documentation -** and/or other materials provided with the distribution. -** * The name of the author may be used to endorse or promote products -** derived from this software without specific prior written permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -** ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -** LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -** INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -** CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -** ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF -** THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* -** Copyright (c) 2007 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -#ifndef __wglew_h__ -#define __wglew_h__ -#define __WGLEW_H__ - -#ifdef __wglext_h_ -#error wglext.h included before wglew.h -#endif - -#define __wglext_h_ - -#if !defined(WINAPI) -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN 1 -# endif -#include -# undef WIN32_LEAN_AND_MEAN -#endif - -/* - * GLEW_STATIC needs to be set when using the static version. - * GLEW_BUILD is set when building the DLL version. - */ -#ifdef GLEW_STATIC -# define GLEWAPI extern -#else -# ifdef GLEW_BUILD -# define GLEWAPI extern __declspec(dllexport) -# else -# define GLEWAPI extern __declspec(dllimport) -# endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* -------------------------- WGL_3DFX_multisample ------------------------- */ - -#ifndef WGL_3DFX_multisample -#define WGL_3DFX_multisample 1 - -#define WGL_SAMPLE_BUFFERS_3DFX 0x2060 -#define WGL_SAMPLES_3DFX 0x2061 - -#define WGLEW_3DFX_multisample WGLEW_GET_VAR(__WGLEW_3DFX_multisample) - -#endif /* WGL_3DFX_multisample */ - -/* ------------------------- WGL_3DL_stereo_control ------------------------ */ - -#ifndef WGL_3DL_stereo_control -#define WGL_3DL_stereo_control 1 - -#define WGL_STEREO_EMITTER_ENABLE_3DL 0x2055 -#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056 -#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057 -#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058 - -typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState); - -#define wglSetStereoEmitterState3DL WGLEW_GET_FUN(__wglewSetStereoEmitterState3DL) - -#define WGLEW_3DL_stereo_control WGLEW_GET_VAR(__WGLEW_3DL_stereo_control) - -#endif /* WGL_3DL_stereo_control */ - -/* ------------------------ WGL_AMD_gpu_association ------------------------ */ - -#ifndef WGL_AMD_gpu_association -#define WGL_AMD_gpu_association 1 - -#define WGL_GPU_VENDOR_AMD 0x1F00 -#define WGL_GPU_RENDERER_STRING_AMD 0x1F01 -#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02 -#define WGL_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2 -#define WGL_GPU_RAM_AMD 0x21A3 -#define WGL_GPU_CLOCK_AMD 0x21A4 -#define WGL_GPU_NUM_PIPES_AMD 0x21A5 -#define WGL_GPU_NUM_SIMD_AMD 0x21A6 -#define WGL_GPU_NUM_RB_AMD 0x21A7 -#define WGL_GPU_NUM_SPI_AMD 0x21A8 - -typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id); -typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int* attribList); -typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc); -typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc); -typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void); -typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT* ids); -typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, INT property, GLenum dataType, UINT size, void* data); -typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc); - -#define wglBlitContextFramebufferAMD WGLEW_GET_FUN(__wglewBlitContextFramebufferAMD) -#define wglCreateAssociatedContextAMD WGLEW_GET_FUN(__wglewCreateAssociatedContextAMD) -#define wglCreateAssociatedContextAttribsAMD WGLEW_GET_FUN(__wglewCreateAssociatedContextAttribsAMD) -#define wglDeleteAssociatedContextAMD WGLEW_GET_FUN(__wglewDeleteAssociatedContextAMD) -#define wglGetContextGPUIDAMD WGLEW_GET_FUN(__wglewGetContextGPUIDAMD) -#define wglGetCurrentAssociatedContextAMD WGLEW_GET_FUN(__wglewGetCurrentAssociatedContextAMD) -#define wglGetGPUIDsAMD WGLEW_GET_FUN(__wglewGetGPUIDsAMD) -#define wglGetGPUInfoAMD WGLEW_GET_FUN(__wglewGetGPUInfoAMD) -#define wglMakeAssociatedContextCurrentAMD WGLEW_GET_FUN(__wglewMakeAssociatedContextCurrentAMD) - -#define WGLEW_AMD_gpu_association WGLEW_GET_VAR(__WGLEW_AMD_gpu_association) - -#endif /* WGL_AMD_gpu_association */ - -/* ------------------------- WGL_ARB_buffer_region ------------------------- */ - -#ifndef WGL_ARB_buffer_region -#define WGL_ARB_buffer_region 1 - -#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001 -#define WGL_BACK_COLOR_BUFFER_BIT_ARB 0x00000002 -#define WGL_DEPTH_BUFFER_BIT_ARB 0x00000004 -#define WGL_STENCIL_BUFFER_BIT_ARB 0x00000008 - -typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType); -typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion); -typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); -typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height); - -#define wglCreateBufferRegionARB WGLEW_GET_FUN(__wglewCreateBufferRegionARB) -#define wglDeleteBufferRegionARB WGLEW_GET_FUN(__wglewDeleteBufferRegionARB) -#define wglRestoreBufferRegionARB WGLEW_GET_FUN(__wglewRestoreBufferRegionARB) -#define wglSaveBufferRegionARB WGLEW_GET_FUN(__wglewSaveBufferRegionARB) - -#define WGLEW_ARB_buffer_region WGLEW_GET_VAR(__WGLEW_ARB_buffer_region) - -#endif /* WGL_ARB_buffer_region */ - -/* --------------------- WGL_ARB_context_flush_control --------------------- */ - -#ifndef WGL_ARB_context_flush_control -#define WGL_ARB_context_flush_control 1 - -#define WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0x0000 -#define WGL_CONTEXT_RELEASE_BEHAVIOR_ARB 0x2097 -#define WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB 0x2098 - -#define WGLEW_ARB_context_flush_control WGLEW_GET_VAR(__WGLEW_ARB_context_flush_control) - -#endif /* WGL_ARB_context_flush_control */ - -/* ------------------------- WGL_ARB_create_context ------------------------ */ - -#ifndef WGL_ARB_create_context -#define WGL_ARB_create_context 1 - -#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 -#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 -#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 -#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 -#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 -#define WGL_CONTEXT_FLAGS_ARB 0x2094 -#define ERROR_INVALID_VERSION_ARB 0x2095 -#define ERROR_INVALID_PROFILE_ARB 0x2096 - -typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int* attribList); - -#define wglCreateContextAttribsARB WGLEW_GET_FUN(__wglewCreateContextAttribsARB) - -#define WGLEW_ARB_create_context WGLEW_GET_VAR(__WGLEW_ARB_create_context) - -#endif /* WGL_ARB_create_context */ - -/* --------------------- WGL_ARB_create_context_profile -------------------- */ - -#ifndef WGL_ARB_create_context_profile -#define WGL_ARB_create_context_profile 1 - -#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 -#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 -#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 - -#define WGLEW_ARB_create_context_profile WGLEW_GET_VAR(__WGLEW_ARB_create_context_profile) - -#endif /* WGL_ARB_create_context_profile */ - -/* ------------------- WGL_ARB_create_context_robustness ------------------- */ - -#ifndef WGL_ARB_create_context_robustness -#define WGL_ARB_create_context_robustness 1 - -#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004 -#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 -#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 -#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261 - -#define WGLEW_ARB_create_context_robustness WGLEW_GET_VAR(__WGLEW_ARB_create_context_robustness) - -#endif /* WGL_ARB_create_context_robustness */ - -/* ----------------------- WGL_ARB_extensions_string ----------------------- */ - -#ifndef WGL_ARB_extensions_string -#define WGL_ARB_extensions_string 1 - -typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc); - -#define wglGetExtensionsStringARB WGLEW_GET_FUN(__wglewGetExtensionsStringARB) - -#define WGLEW_ARB_extensions_string WGLEW_GET_VAR(__WGLEW_ARB_extensions_string) - -#endif /* WGL_ARB_extensions_string */ - -/* ------------------------ WGL_ARB_framebuffer_sRGB ----------------------- */ - -#ifndef WGL_ARB_framebuffer_sRGB -#define WGL_ARB_framebuffer_sRGB 1 - -#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9 - -#define WGLEW_ARB_framebuffer_sRGB WGLEW_GET_VAR(__WGLEW_ARB_framebuffer_sRGB) - -#endif /* WGL_ARB_framebuffer_sRGB */ - -/* ----------------------- WGL_ARB_make_current_read ----------------------- */ - -#ifndef WGL_ARB_make_current_read -#define WGL_ARB_make_current_read 1 - -#define ERROR_INVALID_PIXEL_TYPE_ARB 0x2043 -#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054 - -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (VOID); -typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); - -#define wglGetCurrentReadDCARB WGLEW_GET_FUN(__wglewGetCurrentReadDCARB) -#define wglMakeContextCurrentARB WGLEW_GET_FUN(__wglewMakeContextCurrentARB) - -#define WGLEW_ARB_make_current_read WGLEW_GET_VAR(__WGLEW_ARB_make_current_read) - -#endif /* WGL_ARB_make_current_read */ - -/* -------------------------- WGL_ARB_multisample -------------------------- */ - -#ifndef WGL_ARB_multisample -#define WGL_ARB_multisample 1 - -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 - -#define WGLEW_ARB_multisample WGLEW_GET_VAR(__WGLEW_ARB_multisample) - -#endif /* WGL_ARB_multisample */ - -/* ---------------------------- WGL_ARB_pbuffer ---------------------------- */ - -#ifndef WGL_ARB_pbuffer -#define WGL_ARB_pbuffer 1 - -#define WGL_DRAW_TO_PBUFFER_ARB 0x202D -#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E -#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F -#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030 -#define WGL_PBUFFER_LARGEST_ARB 0x2033 -#define WGL_PBUFFER_WIDTH_ARB 0x2034 -#define WGL_PBUFFER_HEIGHT_ARB 0x2035 -#define WGL_PBUFFER_LOST_ARB 0x2036 - -DECLARE_HANDLE(HPBUFFERARB); - -typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList); -typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer); -typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer); -typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int* piValue); -typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC); - -#define wglCreatePbufferARB WGLEW_GET_FUN(__wglewCreatePbufferARB) -#define wglDestroyPbufferARB WGLEW_GET_FUN(__wglewDestroyPbufferARB) -#define wglGetPbufferDCARB WGLEW_GET_FUN(__wglewGetPbufferDCARB) -#define wglQueryPbufferARB WGLEW_GET_FUN(__wglewQueryPbufferARB) -#define wglReleasePbufferDCARB WGLEW_GET_FUN(__wglewReleasePbufferDCARB) - -#define WGLEW_ARB_pbuffer WGLEW_GET_VAR(__WGLEW_ARB_pbuffer) - -#endif /* WGL_ARB_pbuffer */ - -/* -------------------------- WGL_ARB_pixel_format ------------------------- */ - -#ifndef WGL_ARB_pixel_format -#define WGL_ARB_pixel_format 1 - -#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 -#define WGL_DRAW_TO_WINDOW_ARB 0x2001 -#define WGL_DRAW_TO_BITMAP_ARB 0x2002 -#define WGL_ACCELERATION_ARB 0x2003 -#define WGL_NEED_PALETTE_ARB 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006 -#define WGL_SWAP_METHOD_ARB 0x2007 -#define WGL_NUMBER_OVERLAYS_ARB 0x2008 -#define WGL_NUMBER_UNDERLAYS_ARB 0x2009 -#define WGL_TRANSPARENT_ARB 0x200A -#define WGL_SHARE_DEPTH_ARB 0x200C -#define WGL_SHARE_STENCIL_ARB 0x200D -#define WGL_SHARE_ACCUM_ARB 0x200E -#define WGL_SUPPORT_GDI_ARB 0x200F -#define WGL_SUPPORT_OPENGL_ARB 0x2010 -#define WGL_DOUBLE_BUFFER_ARB 0x2011 -#define WGL_STEREO_ARB 0x2012 -#define WGL_PIXEL_TYPE_ARB 0x2013 -#define WGL_COLOR_BITS_ARB 0x2014 -#define WGL_RED_BITS_ARB 0x2015 -#define WGL_RED_SHIFT_ARB 0x2016 -#define WGL_GREEN_BITS_ARB 0x2017 -#define WGL_GREEN_SHIFT_ARB 0x2018 -#define WGL_BLUE_BITS_ARB 0x2019 -#define WGL_BLUE_SHIFT_ARB 0x201A -#define WGL_ALPHA_BITS_ARB 0x201B -#define WGL_ALPHA_SHIFT_ARB 0x201C -#define WGL_ACCUM_BITS_ARB 0x201D -#define WGL_ACCUM_RED_BITS_ARB 0x201E -#define WGL_ACCUM_GREEN_BITS_ARB 0x201F -#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 -#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 -#define WGL_DEPTH_BITS_ARB 0x2022 -#define WGL_STENCIL_BITS_ARB 0x2023 -#define WGL_AUX_BUFFERS_ARB 0x2024 -#define WGL_NO_ACCELERATION_ARB 0x2025 -#define WGL_GENERIC_ACCELERATION_ARB 0x2026 -#define WGL_FULL_ACCELERATION_ARB 0x2027 -#define WGL_SWAP_EXCHANGE_ARB 0x2028 -#define WGL_SWAP_COPY_ARB 0x2029 -#define WGL_SWAP_UNDEFINED_ARB 0x202A -#define WGL_TYPE_RGBA_ARB 0x202B -#define WGL_TYPE_COLORINDEX_ARB 0x202C -#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037 -#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038 -#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039 -#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A -#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B - -typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, FLOAT *pfValues); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, int *piValues); - -#define wglChoosePixelFormatARB WGLEW_GET_FUN(__wglewChoosePixelFormatARB) -#define wglGetPixelFormatAttribfvARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvARB) -#define wglGetPixelFormatAttribivARB WGLEW_GET_FUN(__wglewGetPixelFormatAttribivARB) - -#define WGLEW_ARB_pixel_format WGLEW_GET_VAR(__WGLEW_ARB_pixel_format) - -#endif /* WGL_ARB_pixel_format */ - -/* ----------------------- WGL_ARB_pixel_format_float ---------------------- */ - -#ifndef WGL_ARB_pixel_format_float -#define WGL_ARB_pixel_format_float 1 - -#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0 - -#define WGLEW_ARB_pixel_format_float WGLEW_GET_VAR(__WGLEW_ARB_pixel_format_float) - -#endif /* WGL_ARB_pixel_format_float */ - -/* ------------------------- WGL_ARB_render_texture ------------------------ */ - -#ifndef WGL_ARB_render_texture -#define WGL_ARB_render_texture 1 - -#define WGL_BIND_TO_TEXTURE_RGB_ARB 0x2070 -#define WGL_BIND_TO_TEXTURE_RGBA_ARB 0x2071 -#define WGL_TEXTURE_FORMAT_ARB 0x2072 -#define WGL_TEXTURE_TARGET_ARB 0x2073 -#define WGL_MIPMAP_TEXTURE_ARB 0x2074 -#define WGL_TEXTURE_RGB_ARB 0x2075 -#define WGL_TEXTURE_RGBA_ARB 0x2076 -#define WGL_NO_TEXTURE_ARB 0x2077 -#define WGL_TEXTURE_CUBE_MAP_ARB 0x2078 -#define WGL_TEXTURE_1D_ARB 0x2079 -#define WGL_TEXTURE_2D_ARB 0x207A -#define WGL_MIPMAP_LEVEL_ARB 0x207B -#define WGL_CUBE_MAP_FACE_ARB 0x207C -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080 -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081 -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082 -#define WGL_FRONT_LEFT_ARB 0x2083 -#define WGL_FRONT_RIGHT_ARB 0x2084 -#define WGL_BACK_LEFT_ARB 0x2085 -#define WGL_BACK_RIGHT_ARB 0x2086 -#define WGL_AUX0_ARB 0x2087 -#define WGL_AUX1_ARB 0x2088 -#define WGL_AUX2_ARB 0x2089 -#define WGL_AUX3_ARB 0x208A -#define WGL_AUX4_ARB 0x208B -#define WGL_AUX5_ARB 0x208C -#define WGL_AUX6_ARB 0x208D -#define WGL_AUX7_ARB 0x208E -#define WGL_AUX8_ARB 0x208F -#define WGL_AUX9_ARB 0x2090 - -typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); -typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); -typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int* piAttribList); - -#define wglBindTexImageARB WGLEW_GET_FUN(__wglewBindTexImageARB) -#define wglReleaseTexImageARB WGLEW_GET_FUN(__wglewReleaseTexImageARB) -#define wglSetPbufferAttribARB WGLEW_GET_FUN(__wglewSetPbufferAttribARB) - -#define WGLEW_ARB_render_texture WGLEW_GET_VAR(__WGLEW_ARB_render_texture) - -#endif /* WGL_ARB_render_texture */ - -/* ---------------- WGL_ARB_robustness_application_isolation --------------- */ - -#ifndef WGL_ARB_robustness_application_isolation -#define WGL_ARB_robustness_application_isolation 1 - -#define WGL_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008 - -#define WGLEW_ARB_robustness_application_isolation WGLEW_GET_VAR(__WGLEW_ARB_robustness_application_isolation) - -#endif /* WGL_ARB_robustness_application_isolation */ - -/* ---------------- WGL_ARB_robustness_share_group_isolation --------------- */ - -#ifndef WGL_ARB_robustness_share_group_isolation -#define WGL_ARB_robustness_share_group_isolation 1 - -#define WGL_CONTEXT_RESET_ISOLATION_BIT_ARB 0x00000008 - -#define WGLEW_ARB_robustness_share_group_isolation WGLEW_GET_VAR(__WGLEW_ARB_robustness_share_group_isolation) - -#endif /* WGL_ARB_robustness_share_group_isolation */ - -/* ----------------------- WGL_ATI_pixel_format_float ---------------------- */ - -#ifndef WGL_ATI_pixel_format_float -#define WGL_ATI_pixel_format_float 1 - -#define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0 -#define GL_RGBA_FLOAT_MODE_ATI 0x8820 -#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 - -#define WGLEW_ATI_pixel_format_float WGLEW_GET_VAR(__WGLEW_ATI_pixel_format_float) - -#endif /* WGL_ATI_pixel_format_float */ - -/* -------------------- WGL_ATI_render_texture_rectangle ------------------- */ - -#ifndef WGL_ATI_render_texture_rectangle -#define WGL_ATI_render_texture_rectangle 1 - -#define WGL_TEXTURE_RECTANGLE_ATI 0x21A5 - -#define WGLEW_ATI_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_ATI_render_texture_rectangle) - -#endif /* WGL_ATI_render_texture_rectangle */ - -/* ------------------- WGL_EXT_create_context_es2_profile ------------------ */ - -#ifndef WGL_EXT_create_context_es2_profile -#define WGL_EXT_create_context_es2_profile 1 - -#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 - -#define WGLEW_EXT_create_context_es2_profile WGLEW_GET_VAR(__WGLEW_EXT_create_context_es2_profile) - -#endif /* WGL_EXT_create_context_es2_profile */ - -/* ------------------- WGL_EXT_create_context_es_profile ------------------- */ - -#ifndef WGL_EXT_create_context_es_profile -#define WGL_EXT_create_context_es_profile 1 - -#define WGL_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004 - -#define WGLEW_EXT_create_context_es_profile WGLEW_GET_VAR(__WGLEW_EXT_create_context_es_profile) - -#endif /* WGL_EXT_create_context_es_profile */ - -/* -------------------------- WGL_EXT_depth_float -------------------------- */ - -#ifndef WGL_EXT_depth_float -#define WGL_EXT_depth_float 1 - -#define WGL_DEPTH_FLOAT_EXT 0x2040 - -#define WGLEW_EXT_depth_float WGLEW_GET_VAR(__WGLEW_EXT_depth_float) - -#endif /* WGL_EXT_depth_float */ - -/* ---------------------- WGL_EXT_display_color_table ---------------------- */ - -#ifndef WGL_EXT_display_color_table -#define WGL_EXT_display_color_table 1 - -typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef void (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (GLushort* table, GLuint length); - -#define wglBindDisplayColorTableEXT WGLEW_GET_FUN(__wglewBindDisplayColorTableEXT) -#define wglCreateDisplayColorTableEXT WGLEW_GET_FUN(__wglewCreateDisplayColorTableEXT) -#define wglDestroyDisplayColorTableEXT WGLEW_GET_FUN(__wglewDestroyDisplayColorTableEXT) -#define wglLoadDisplayColorTableEXT WGLEW_GET_FUN(__wglewLoadDisplayColorTableEXT) - -#define WGLEW_EXT_display_color_table WGLEW_GET_VAR(__WGLEW_EXT_display_color_table) - -#endif /* WGL_EXT_display_color_table */ - -/* ----------------------- WGL_EXT_extensions_string ----------------------- */ - -#ifndef WGL_EXT_extensions_string -#define WGL_EXT_extensions_string 1 - -typedef const char* (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void); - -#define wglGetExtensionsStringEXT WGLEW_GET_FUN(__wglewGetExtensionsStringEXT) - -#define WGLEW_EXT_extensions_string WGLEW_GET_VAR(__WGLEW_EXT_extensions_string) - -#endif /* WGL_EXT_extensions_string */ - -/* ------------------------ WGL_EXT_framebuffer_sRGB ----------------------- */ - -#ifndef WGL_EXT_framebuffer_sRGB -#define WGL_EXT_framebuffer_sRGB 1 - -#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9 - -#define WGLEW_EXT_framebuffer_sRGB WGLEW_GET_VAR(__WGLEW_EXT_framebuffer_sRGB) - -#endif /* WGL_EXT_framebuffer_sRGB */ - -/* ----------------------- WGL_EXT_make_current_read ----------------------- */ - -#ifndef WGL_EXT_make_current_read -#define WGL_EXT_make_current_read 1 - -#define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043 - -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (VOID); -typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); - -#define wglGetCurrentReadDCEXT WGLEW_GET_FUN(__wglewGetCurrentReadDCEXT) -#define wglMakeContextCurrentEXT WGLEW_GET_FUN(__wglewMakeContextCurrentEXT) - -#define WGLEW_EXT_make_current_read WGLEW_GET_VAR(__WGLEW_EXT_make_current_read) - -#endif /* WGL_EXT_make_current_read */ - -/* -------------------------- WGL_EXT_multisample -------------------------- */ - -#ifndef WGL_EXT_multisample -#define WGL_EXT_multisample 1 - -#define WGL_SAMPLE_BUFFERS_EXT 0x2041 -#define WGL_SAMPLES_EXT 0x2042 - -#define WGLEW_EXT_multisample WGLEW_GET_VAR(__WGLEW_EXT_multisample) - -#endif /* WGL_EXT_multisample */ - -/* ---------------------------- WGL_EXT_pbuffer ---------------------------- */ - -#ifndef WGL_EXT_pbuffer -#define WGL_EXT_pbuffer 1 - -#define WGL_DRAW_TO_PBUFFER_EXT 0x202D -#define WGL_MAX_PBUFFER_PIXELS_EXT 0x202E -#define WGL_MAX_PBUFFER_WIDTH_EXT 0x202F -#define WGL_MAX_PBUFFER_HEIGHT_EXT 0x2030 -#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT 0x2031 -#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032 -#define WGL_PBUFFER_LARGEST_EXT 0x2033 -#define WGL_PBUFFER_WIDTH_EXT 0x2034 -#define WGL_PBUFFER_HEIGHT_EXT 0x2035 - -DECLARE_HANDLE(HPBUFFEREXT); - -typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int* piAttribList); -typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer); -typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer); -typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int* piValue); -typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC); - -#define wglCreatePbufferEXT WGLEW_GET_FUN(__wglewCreatePbufferEXT) -#define wglDestroyPbufferEXT WGLEW_GET_FUN(__wglewDestroyPbufferEXT) -#define wglGetPbufferDCEXT WGLEW_GET_FUN(__wglewGetPbufferDCEXT) -#define wglQueryPbufferEXT WGLEW_GET_FUN(__wglewQueryPbufferEXT) -#define wglReleasePbufferDCEXT WGLEW_GET_FUN(__wglewReleasePbufferDCEXT) - -#define WGLEW_EXT_pbuffer WGLEW_GET_VAR(__WGLEW_EXT_pbuffer) - -#endif /* WGL_EXT_pbuffer */ - -/* -------------------------- WGL_EXT_pixel_format ------------------------- */ - -#ifndef WGL_EXT_pixel_format -#define WGL_EXT_pixel_format 1 - -#define WGL_NUMBER_PIXEL_FORMATS_EXT 0x2000 -#define WGL_DRAW_TO_WINDOW_EXT 0x2001 -#define WGL_DRAW_TO_BITMAP_EXT 0x2002 -#define WGL_ACCELERATION_EXT 0x2003 -#define WGL_NEED_PALETTE_EXT 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_EXT 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_EXT 0x2006 -#define WGL_SWAP_METHOD_EXT 0x2007 -#define WGL_NUMBER_OVERLAYS_EXT 0x2008 -#define WGL_NUMBER_UNDERLAYS_EXT 0x2009 -#define WGL_TRANSPARENT_EXT 0x200A -#define WGL_TRANSPARENT_VALUE_EXT 0x200B -#define WGL_SHARE_DEPTH_EXT 0x200C -#define WGL_SHARE_STENCIL_EXT 0x200D -#define WGL_SHARE_ACCUM_EXT 0x200E -#define WGL_SUPPORT_GDI_EXT 0x200F -#define WGL_SUPPORT_OPENGL_EXT 0x2010 -#define WGL_DOUBLE_BUFFER_EXT 0x2011 -#define WGL_STEREO_EXT 0x2012 -#define WGL_PIXEL_TYPE_EXT 0x2013 -#define WGL_COLOR_BITS_EXT 0x2014 -#define WGL_RED_BITS_EXT 0x2015 -#define WGL_RED_SHIFT_EXT 0x2016 -#define WGL_GREEN_BITS_EXT 0x2017 -#define WGL_GREEN_SHIFT_EXT 0x2018 -#define WGL_BLUE_BITS_EXT 0x2019 -#define WGL_BLUE_SHIFT_EXT 0x201A -#define WGL_ALPHA_BITS_EXT 0x201B -#define WGL_ALPHA_SHIFT_EXT 0x201C -#define WGL_ACCUM_BITS_EXT 0x201D -#define WGL_ACCUM_RED_BITS_EXT 0x201E -#define WGL_ACCUM_GREEN_BITS_EXT 0x201F -#define WGL_ACCUM_BLUE_BITS_EXT 0x2020 -#define WGL_ACCUM_ALPHA_BITS_EXT 0x2021 -#define WGL_DEPTH_BITS_EXT 0x2022 -#define WGL_STENCIL_BITS_EXT 0x2023 -#define WGL_AUX_BUFFERS_EXT 0x2024 -#define WGL_NO_ACCELERATION_EXT 0x2025 -#define WGL_GENERIC_ACCELERATION_EXT 0x2026 -#define WGL_FULL_ACCELERATION_EXT 0x2027 -#define WGL_SWAP_EXCHANGE_EXT 0x2028 -#define WGL_SWAP_COPY_EXT 0x2029 -#define WGL_SWAP_UNDEFINED_EXT 0x202A -#define WGL_TYPE_RGBA_EXT 0x202B -#define WGL_TYPE_COLORINDEX_EXT 0x202C - -typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int* piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, FLOAT *pfValues); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int* piAttributes, int *piValues); - -#define wglChoosePixelFormatEXT WGLEW_GET_FUN(__wglewChoosePixelFormatEXT) -#define wglGetPixelFormatAttribfvEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribfvEXT) -#define wglGetPixelFormatAttribivEXT WGLEW_GET_FUN(__wglewGetPixelFormatAttribivEXT) - -#define WGLEW_EXT_pixel_format WGLEW_GET_VAR(__WGLEW_EXT_pixel_format) - -#endif /* WGL_EXT_pixel_format */ - -/* ------------------- WGL_EXT_pixel_format_packed_float ------------------- */ - -#ifndef WGL_EXT_pixel_format_packed_float -#define WGL_EXT_pixel_format_packed_float 1 - -#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8 - -#define WGLEW_EXT_pixel_format_packed_float WGLEW_GET_VAR(__WGLEW_EXT_pixel_format_packed_float) - -#endif /* WGL_EXT_pixel_format_packed_float */ - -/* -------------------------- WGL_EXT_swap_control ------------------------- */ - -#ifndef WGL_EXT_swap_control -#define WGL_EXT_swap_control 1 - -typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void); -typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval); - -#define wglGetSwapIntervalEXT WGLEW_GET_FUN(__wglewGetSwapIntervalEXT) -#define wglSwapIntervalEXT WGLEW_GET_FUN(__wglewSwapIntervalEXT) - -#define WGLEW_EXT_swap_control WGLEW_GET_VAR(__WGLEW_EXT_swap_control) - -#endif /* WGL_EXT_swap_control */ - -/* ----------------------- WGL_EXT_swap_control_tear ----------------------- */ - -#ifndef WGL_EXT_swap_control_tear -#define WGL_EXT_swap_control_tear 1 - -#define WGLEW_EXT_swap_control_tear WGLEW_GET_VAR(__WGLEW_EXT_swap_control_tear) - -#endif /* WGL_EXT_swap_control_tear */ - -/* --------------------- WGL_I3D_digital_video_control --------------------- */ - -#ifndef WGL_I3D_digital_video_control -#define WGL_I3D_digital_video_control 1 - -#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050 -#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051 -#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052 -#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053 - -typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue); -typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue); - -#define wglGetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewGetDigitalVideoParametersI3D) -#define wglSetDigitalVideoParametersI3D WGLEW_GET_FUN(__wglewSetDigitalVideoParametersI3D) - -#define WGLEW_I3D_digital_video_control WGLEW_GET_VAR(__WGLEW_I3D_digital_video_control) - -#endif /* WGL_I3D_digital_video_control */ - -/* ----------------------------- WGL_I3D_gamma ----------------------------- */ - -#ifndef WGL_I3D_gamma -#define WGL_I3D_gamma 1 - -#define WGL_GAMMA_TABLE_SIZE_I3D 0x204E -#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D 0x204F - -typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT* puRed, USHORT *puGreen, USHORT *puBlue); -typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int* piValue); -typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT* puRed, const USHORT *puGreen, const USHORT *puBlue); -typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int* piValue); - -#define wglGetGammaTableI3D WGLEW_GET_FUN(__wglewGetGammaTableI3D) -#define wglGetGammaTableParametersI3D WGLEW_GET_FUN(__wglewGetGammaTableParametersI3D) -#define wglSetGammaTableI3D WGLEW_GET_FUN(__wglewSetGammaTableI3D) -#define wglSetGammaTableParametersI3D WGLEW_GET_FUN(__wglewSetGammaTableParametersI3D) - -#define WGLEW_I3D_gamma WGLEW_GET_VAR(__WGLEW_I3D_gamma) - -#endif /* WGL_I3D_gamma */ - -/* ---------------------------- WGL_I3D_genlock ---------------------------- */ - -#ifndef WGL_I3D_genlock -#define WGL_I3D_genlock 1 - -#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044 -#define WGL_GENLOCK_SOURCE_EXTERNAL_SYNC_I3D 0x2045 -#define WGL_GENLOCK_SOURCE_EXTERNAL_FIELD_I3D 0x2046 -#define WGL_GENLOCK_SOURCE_EXTERNAL_TTL_I3D 0x2047 -#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048 -#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049 -#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A -#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B -#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C - -typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC); -typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC); -typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT* uRate); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT* uDelay); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT* uEdge); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT* uSource); -typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL* pFlag); -typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT* uMaxLineDelay, UINT *uMaxPixelDelay); - -#define wglDisableGenlockI3D WGLEW_GET_FUN(__wglewDisableGenlockI3D) -#define wglEnableGenlockI3D WGLEW_GET_FUN(__wglewEnableGenlockI3D) -#define wglGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGenlockSampleRateI3D) -#define wglGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGenlockSourceDelayI3D) -#define wglGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGenlockSourceEdgeI3D) -#define wglGenlockSourceI3D WGLEW_GET_FUN(__wglewGenlockSourceI3D) -#define wglGetGenlockSampleRateI3D WGLEW_GET_FUN(__wglewGetGenlockSampleRateI3D) -#define wglGetGenlockSourceDelayI3D WGLEW_GET_FUN(__wglewGetGenlockSourceDelayI3D) -#define wglGetGenlockSourceEdgeI3D WGLEW_GET_FUN(__wglewGetGenlockSourceEdgeI3D) -#define wglGetGenlockSourceI3D WGLEW_GET_FUN(__wglewGetGenlockSourceI3D) -#define wglIsEnabledGenlockI3D WGLEW_GET_FUN(__wglewIsEnabledGenlockI3D) -#define wglQueryGenlockMaxSourceDelayI3D WGLEW_GET_FUN(__wglewQueryGenlockMaxSourceDelayI3D) - -#define WGLEW_I3D_genlock WGLEW_GET_VAR(__WGLEW_I3D_genlock) - -#endif /* WGL_I3D_genlock */ - -/* -------------------------- WGL_I3D_image_buffer ------------------------- */ - -#ifndef WGL_I3D_image_buffer -#define WGL_I3D_image_buffer 1 - -#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001 -#define WGL_IMAGE_BUFFER_LOCK_I3D 0x00000002 - -typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, HANDLE* pEvent, LPVOID *pAddress, DWORD *pSize, UINT count); -typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags); -typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress); -typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hdc, LPVOID* pAddress, UINT count); - -#define wglAssociateImageBufferEventsI3D WGLEW_GET_FUN(__wglewAssociateImageBufferEventsI3D) -#define wglCreateImageBufferI3D WGLEW_GET_FUN(__wglewCreateImageBufferI3D) -#define wglDestroyImageBufferI3D WGLEW_GET_FUN(__wglewDestroyImageBufferI3D) -#define wglReleaseImageBufferEventsI3D WGLEW_GET_FUN(__wglewReleaseImageBufferEventsI3D) - -#define WGLEW_I3D_image_buffer WGLEW_GET_VAR(__WGLEW_I3D_image_buffer) - -#endif /* WGL_I3D_image_buffer */ - -/* ------------------------ WGL_I3D_swap_frame_lock ------------------------ */ - -#ifndef WGL_I3D_swap_frame_lock -#define WGL_I3D_swap_frame_lock 1 - -typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (VOID); -typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (VOID); -typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL* pFlag); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL* pFlag); - -#define wglDisableFrameLockI3D WGLEW_GET_FUN(__wglewDisableFrameLockI3D) -#define wglEnableFrameLockI3D WGLEW_GET_FUN(__wglewEnableFrameLockI3D) -#define wglIsEnabledFrameLockI3D WGLEW_GET_FUN(__wglewIsEnabledFrameLockI3D) -#define wglQueryFrameLockMasterI3D WGLEW_GET_FUN(__wglewQueryFrameLockMasterI3D) - -#define WGLEW_I3D_swap_frame_lock WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_lock) - -#endif /* WGL_I3D_swap_frame_lock */ - -/* ------------------------ WGL_I3D_swap_frame_usage ----------------------- */ - -#ifndef WGL_I3D_swap_frame_usage -#define WGL_I3D_swap_frame_usage 1 - -typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float* pUsage); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD* pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); - -#define wglBeginFrameTrackingI3D WGLEW_GET_FUN(__wglewBeginFrameTrackingI3D) -#define wglEndFrameTrackingI3D WGLEW_GET_FUN(__wglewEndFrameTrackingI3D) -#define wglGetFrameUsageI3D WGLEW_GET_FUN(__wglewGetFrameUsageI3D) -#define wglQueryFrameTrackingI3D WGLEW_GET_FUN(__wglewQueryFrameTrackingI3D) - -#define WGLEW_I3D_swap_frame_usage WGLEW_GET_VAR(__WGLEW_I3D_swap_frame_usage) - -#endif /* WGL_I3D_swap_frame_usage */ - -/* --------------------------- WGL_NV_DX_interop --------------------------- */ - -#ifndef WGL_NV_DX_interop -#define WGL_NV_DX_interop 1 - -#define WGL_ACCESS_READ_ONLY_NV 0x0000 -#define WGL_ACCESS_READ_WRITE_NV 0x0001 -#define WGL_ACCESS_WRITE_DISCARD_NV 0x0002 - -typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice); -typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects); -typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access); -typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void* dxDevice); -typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void* dxObject, GLuint name, GLenum type, GLenum access); -typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void* dxObject, HANDLE shareHandle); -typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE* hObjects); -typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject); - -#define wglDXCloseDeviceNV WGLEW_GET_FUN(__wglewDXCloseDeviceNV) -#define wglDXLockObjectsNV WGLEW_GET_FUN(__wglewDXLockObjectsNV) -#define wglDXObjectAccessNV WGLEW_GET_FUN(__wglewDXObjectAccessNV) -#define wglDXOpenDeviceNV WGLEW_GET_FUN(__wglewDXOpenDeviceNV) -#define wglDXRegisterObjectNV WGLEW_GET_FUN(__wglewDXRegisterObjectNV) -#define wglDXSetResourceShareHandleNV WGLEW_GET_FUN(__wglewDXSetResourceShareHandleNV) -#define wglDXUnlockObjectsNV WGLEW_GET_FUN(__wglewDXUnlockObjectsNV) -#define wglDXUnregisterObjectNV WGLEW_GET_FUN(__wglewDXUnregisterObjectNV) - -#define WGLEW_NV_DX_interop WGLEW_GET_VAR(__WGLEW_NV_DX_interop) - -#endif /* WGL_NV_DX_interop */ - -/* --------------------------- WGL_NV_DX_interop2 -------------------------- */ - -#ifndef WGL_NV_DX_interop2 -#define WGL_NV_DX_interop2 1 - -#define WGLEW_NV_DX_interop2 WGLEW_GET_VAR(__WGLEW_NV_DX_interop2) - -#endif /* WGL_NV_DX_interop2 */ - -/* --------------------------- WGL_NV_copy_image --------------------------- */ - -#ifndef WGL_NV_copy_image -#define WGL_NV_copy_image 1 - -typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); - -#define wglCopyImageSubDataNV WGLEW_GET_FUN(__wglewCopyImageSubDataNV) - -#define WGLEW_NV_copy_image WGLEW_GET_VAR(__WGLEW_NV_copy_image) - -#endif /* WGL_NV_copy_image */ - -/* ------------------------ WGL_NV_delay_before_swap ----------------------- */ - -#ifndef WGL_NV_delay_before_swap -#define WGL_NV_delay_before_swap 1 - -typedef BOOL (WINAPI * PFNWGLDELAYBEFORESWAPNVPROC) (HDC hDC, GLfloat seconds); - -#define wglDelayBeforeSwapNV WGLEW_GET_FUN(__wglewDelayBeforeSwapNV) - -#define WGLEW_NV_delay_before_swap WGLEW_GET_VAR(__WGLEW_NV_delay_before_swap) - -#endif /* WGL_NV_delay_before_swap */ - -/* -------------------------- WGL_NV_float_buffer -------------------------- */ - -#ifndef WGL_NV_float_buffer -#define WGL_NV_float_buffer 1 - -#define WGL_FLOAT_COMPONENTS_NV 0x20B0 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4 -#define WGL_TEXTURE_FLOAT_R_NV 0x20B5 -#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6 -#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7 -#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8 - -#define WGLEW_NV_float_buffer WGLEW_GET_VAR(__WGLEW_NV_float_buffer) - -#endif /* WGL_NV_float_buffer */ - -/* -------------------------- WGL_NV_gpu_affinity -------------------------- */ - -#ifndef WGL_NV_gpu_affinity -#define WGL_NV_gpu_affinity 1 - -#define WGL_ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0 -#define WGL_ERROR_MISSING_AFFINITY_MASK_NV 0x20D1 - -DECLARE_HANDLE(HGPUNV); -typedef struct _GPU_DEVICE { - DWORD cb; - CHAR DeviceName[32]; - CHAR DeviceString[128]; - DWORD Flags; - RECT rcVirtualScreen; -} GPU_DEVICE, *PGPU_DEVICE; - -typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList); -typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc); -typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice); -typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu); -typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu); - -#define wglCreateAffinityDCNV WGLEW_GET_FUN(__wglewCreateAffinityDCNV) -#define wglDeleteDCNV WGLEW_GET_FUN(__wglewDeleteDCNV) -#define wglEnumGpuDevicesNV WGLEW_GET_FUN(__wglewEnumGpuDevicesNV) -#define wglEnumGpusFromAffinityDCNV WGLEW_GET_FUN(__wglewEnumGpusFromAffinityDCNV) -#define wglEnumGpusNV WGLEW_GET_FUN(__wglewEnumGpusNV) - -#define WGLEW_NV_gpu_affinity WGLEW_GET_VAR(__WGLEW_NV_gpu_affinity) - -#endif /* WGL_NV_gpu_affinity */ - -/* ---------------------- WGL_NV_multisample_coverage ---------------------- */ - -#ifndef WGL_NV_multisample_coverage -#define WGL_NV_multisample_coverage 1 - -#define WGL_COVERAGE_SAMPLES_NV 0x2042 -#define WGL_COLOR_SAMPLES_NV 0x20B9 - -#define WGLEW_NV_multisample_coverage WGLEW_GET_VAR(__WGLEW_NV_multisample_coverage) - -#endif /* WGL_NV_multisample_coverage */ - -/* -------------------------- WGL_NV_present_video ------------------------- */ - -#ifndef WGL_NV_present_video -#define WGL_NV_present_video 1 - -#define WGL_NUM_VIDEO_SLOTS_NV 0x20F0 - -DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV); - -typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDc, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int* piAttribList); -typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDc, HVIDEOOUTPUTDEVICENV* phDeviceList); -typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int* piValue); - -#define wglBindVideoDeviceNV WGLEW_GET_FUN(__wglewBindVideoDeviceNV) -#define wglEnumerateVideoDevicesNV WGLEW_GET_FUN(__wglewEnumerateVideoDevicesNV) -#define wglQueryCurrentContextNV WGLEW_GET_FUN(__wglewQueryCurrentContextNV) - -#define WGLEW_NV_present_video WGLEW_GET_VAR(__WGLEW_NV_present_video) - -#endif /* WGL_NV_present_video */ - -/* ---------------------- WGL_NV_render_depth_texture ---------------------- */ - -#ifndef WGL_NV_render_depth_texture -#define WGL_NV_render_depth_texture 1 - -#define WGL_NO_TEXTURE_ARB 0x2077 -#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4 -#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5 -#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6 -#define WGL_DEPTH_COMPONENT_NV 0x20A7 - -#define WGLEW_NV_render_depth_texture WGLEW_GET_VAR(__WGLEW_NV_render_depth_texture) - -#endif /* WGL_NV_render_depth_texture */ - -/* -------------------- WGL_NV_render_texture_rectangle -------------------- */ - -#ifndef WGL_NV_render_texture_rectangle -#define WGL_NV_render_texture_rectangle 1 - -#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1 -#define WGL_TEXTURE_RECTANGLE_NV 0x20A2 - -#define WGLEW_NV_render_texture_rectangle WGLEW_GET_VAR(__WGLEW_NV_render_texture_rectangle) - -#endif /* WGL_NV_render_texture_rectangle */ - -/* --------------------------- WGL_NV_swap_group --------------------------- */ - -#ifndef WGL_NV_swap_group -#define WGL_NV_swap_group 1 - -typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier); -typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint* count); -typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint* maxGroups, GLuint *maxBarriers); -typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint* group, GLuint *barrier); -typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC); - -#define wglBindSwapBarrierNV WGLEW_GET_FUN(__wglewBindSwapBarrierNV) -#define wglJoinSwapGroupNV WGLEW_GET_FUN(__wglewJoinSwapGroupNV) -#define wglQueryFrameCountNV WGLEW_GET_FUN(__wglewQueryFrameCountNV) -#define wglQueryMaxSwapGroupsNV WGLEW_GET_FUN(__wglewQueryMaxSwapGroupsNV) -#define wglQuerySwapGroupNV WGLEW_GET_FUN(__wglewQuerySwapGroupNV) -#define wglResetFrameCountNV WGLEW_GET_FUN(__wglewResetFrameCountNV) - -#define WGLEW_NV_swap_group WGLEW_GET_VAR(__WGLEW_NV_swap_group) - -#endif /* WGL_NV_swap_group */ - -/* ----------------------- WGL_NV_vertex_array_range ----------------------- */ - -#ifndef WGL_NV_vertex_array_range -#define WGL_NV_vertex_array_range 1 - -typedef void * (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority); -typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer); - -#define wglAllocateMemoryNV WGLEW_GET_FUN(__wglewAllocateMemoryNV) -#define wglFreeMemoryNV WGLEW_GET_FUN(__wglewFreeMemoryNV) - -#define WGLEW_NV_vertex_array_range WGLEW_GET_VAR(__WGLEW_NV_vertex_array_range) - -#endif /* WGL_NV_vertex_array_range */ - -/* -------------------------- WGL_NV_video_capture ------------------------- */ - -#ifndef WGL_NV_video_capture -#define WGL_NV_video_capture 1 - -#define WGL_UNIQUE_ID_NV 0x20CE -#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF - -DECLARE_HANDLE(HVIDEOINPUTDEVICENV); - -typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice); -typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV* phDeviceList); -typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int* piValue); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); - -#define wglBindVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewBindVideoCaptureDeviceNV) -#define wglEnumerateVideoCaptureDevicesNV WGLEW_GET_FUN(__wglewEnumerateVideoCaptureDevicesNV) -#define wglLockVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewLockVideoCaptureDeviceNV) -#define wglQueryVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewQueryVideoCaptureDeviceNV) -#define wglReleaseVideoCaptureDeviceNV WGLEW_GET_FUN(__wglewReleaseVideoCaptureDeviceNV) - -#define WGLEW_NV_video_capture WGLEW_GET_VAR(__WGLEW_NV_video_capture) - -#endif /* WGL_NV_video_capture */ - -/* -------------------------- WGL_NV_video_output -------------------------- */ - -#ifndef WGL_NV_video_output -#define WGL_NV_video_output 1 - -#define WGL_BIND_TO_VIDEO_RGB_NV 0x20C0 -#define WGL_BIND_TO_VIDEO_RGBA_NV 0x20C1 -#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2 -#define WGL_VIDEO_OUT_COLOR_NV 0x20C3 -#define WGL_VIDEO_OUT_ALPHA_NV 0x20C4 -#define WGL_VIDEO_OUT_DEPTH_NV 0x20C5 -#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 -#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 -#define WGL_VIDEO_OUT_FRAME 0x20C8 -#define WGL_VIDEO_OUT_FIELD_1 0x20C9 -#define WGL_VIDEO_OUT_FIELD_2 0x20CA -#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2 0x20CB -#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1 0x20CC - -DECLARE_HANDLE(HPVIDEODEV); - -typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer); -typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV* hVideoDevice); -typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long* pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer); -typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long* pulCounterPbuffer, BOOL bBlock); - -#define wglBindVideoImageNV WGLEW_GET_FUN(__wglewBindVideoImageNV) -#define wglGetVideoDeviceNV WGLEW_GET_FUN(__wglewGetVideoDeviceNV) -#define wglGetVideoInfoNV WGLEW_GET_FUN(__wglewGetVideoInfoNV) -#define wglReleaseVideoDeviceNV WGLEW_GET_FUN(__wglewReleaseVideoDeviceNV) -#define wglReleaseVideoImageNV WGLEW_GET_FUN(__wglewReleaseVideoImageNV) -#define wglSendPbufferToVideoNV WGLEW_GET_FUN(__wglewSendPbufferToVideoNV) - -#define WGLEW_NV_video_output WGLEW_GET_VAR(__WGLEW_NV_video_output) - -#endif /* WGL_NV_video_output */ - -/* -------------------------- WGL_OML_sync_control ------------------------- */ - -#ifndef WGL_OML_sync_control -#define WGL_OML_sync_control 1 - -typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32* numerator, INT32 *denominator); -typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64* ust, INT64 *msc, INT64 *sbc); -typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); -typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, INT fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); -typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64* ust, INT64 *msc, INT64 *sbc); -typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64* ust, INT64 *msc, INT64 *sbc); - -#define wglGetMscRateOML WGLEW_GET_FUN(__wglewGetMscRateOML) -#define wglGetSyncValuesOML WGLEW_GET_FUN(__wglewGetSyncValuesOML) -#define wglSwapBuffersMscOML WGLEW_GET_FUN(__wglewSwapBuffersMscOML) -#define wglSwapLayerBuffersMscOML WGLEW_GET_FUN(__wglewSwapLayerBuffersMscOML) -#define wglWaitForMscOML WGLEW_GET_FUN(__wglewWaitForMscOML) -#define wglWaitForSbcOML WGLEW_GET_FUN(__wglewWaitForSbcOML) - -#define WGLEW_OML_sync_control WGLEW_GET_VAR(__WGLEW_OML_sync_control) - -#endif /* WGL_OML_sync_control */ - -/* ------------------------------------------------------------------------- */ - -#define WGLEW_FUN_EXPORT GLEW_FUN_EXPORT -#define WGLEW_VAR_EXPORT GLEW_VAR_EXPORT - -WGLEW_FUN_EXPORT PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL; - -WGLEW_FUN_EXPORT PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC __wglewBlitContextFramebufferAMD; -WGLEW_FUN_EXPORT PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC __wglewCreateAssociatedContextAMD; -WGLEW_FUN_EXPORT PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC __wglewCreateAssociatedContextAttribsAMD; -WGLEW_FUN_EXPORT PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC __wglewDeleteAssociatedContextAMD; -WGLEW_FUN_EXPORT PFNWGLGETCONTEXTGPUIDAMDPROC __wglewGetContextGPUIDAMD; -WGLEW_FUN_EXPORT PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC __wglewGetCurrentAssociatedContextAMD; -WGLEW_FUN_EXPORT PFNWGLGETGPUIDSAMDPROC __wglewGetGPUIDsAMD; -WGLEW_FUN_EXPORT PFNWGLGETGPUINFOAMDPROC __wglewGetGPUInfoAMD; -WGLEW_FUN_EXPORT PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC __wglewMakeAssociatedContextCurrentAMD; - -WGLEW_FUN_EXPORT PFNWGLCREATEBUFFERREGIONARBPROC __wglewCreateBufferRegionARB; -WGLEW_FUN_EXPORT PFNWGLDELETEBUFFERREGIONARBPROC __wglewDeleteBufferRegionARB; -WGLEW_FUN_EXPORT PFNWGLRESTOREBUFFERREGIONARBPROC __wglewRestoreBufferRegionARB; -WGLEW_FUN_EXPORT PFNWGLSAVEBUFFERREGIONARBPROC __wglewSaveBufferRegionARB; - -WGLEW_FUN_EXPORT PFNWGLCREATECONTEXTATTRIBSARBPROC __wglewCreateContextAttribsARB; - -WGLEW_FUN_EXPORT PFNWGLGETEXTENSIONSSTRINGARBPROC __wglewGetExtensionsStringARB; - -WGLEW_FUN_EXPORT PFNWGLGETCURRENTREADDCARBPROC __wglewGetCurrentReadDCARB; -WGLEW_FUN_EXPORT PFNWGLMAKECONTEXTCURRENTARBPROC __wglewMakeContextCurrentARB; - -WGLEW_FUN_EXPORT PFNWGLCREATEPBUFFERARBPROC __wglewCreatePbufferARB; -WGLEW_FUN_EXPORT PFNWGLDESTROYPBUFFERARBPROC __wglewDestroyPbufferARB; -WGLEW_FUN_EXPORT PFNWGLGETPBUFFERDCARBPROC __wglewGetPbufferDCARB; -WGLEW_FUN_EXPORT PFNWGLQUERYPBUFFERARBPROC __wglewQueryPbufferARB; -WGLEW_FUN_EXPORT PFNWGLRELEASEPBUFFERDCARBPROC __wglewReleasePbufferDCARB; - -WGLEW_FUN_EXPORT PFNWGLCHOOSEPIXELFORMATARBPROC __wglewChoosePixelFormatARB; -WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBFVARBPROC __wglewGetPixelFormatAttribfvARB; -WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBIVARBPROC __wglewGetPixelFormatAttribivARB; - -WGLEW_FUN_EXPORT PFNWGLBINDTEXIMAGEARBPROC __wglewBindTexImageARB; -WGLEW_FUN_EXPORT PFNWGLRELEASETEXIMAGEARBPROC __wglewReleaseTexImageARB; -WGLEW_FUN_EXPORT PFNWGLSETPBUFFERATTRIBARBPROC __wglewSetPbufferAttribARB; - -WGLEW_FUN_EXPORT PFNWGLBINDDISPLAYCOLORTABLEEXTPROC __wglewBindDisplayColorTableEXT; -WGLEW_FUN_EXPORT PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC __wglewCreateDisplayColorTableEXT; -WGLEW_FUN_EXPORT PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC __wglewDestroyDisplayColorTableEXT; -WGLEW_FUN_EXPORT PFNWGLLOADDISPLAYCOLORTABLEEXTPROC __wglewLoadDisplayColorTableEXT; - -WGLEW_FUN_EXPORT PFNWGLGETEXTENSIONSSTRINGEXTPROC __wglewGetExtensionsStringEXT; - -WGLEW_FUN_EXPORT PFNWGLGETCURRENTREADDCEXTPROC __wglewGetCurrentReadDCEXT; -WGLEW_FUN_EXPORT PFNWGLMAKECONTEXTCURRENTEXTPROC __wglewMakeContextCurrentEXT; - -WGLEW_FUN_EXPORT PFNWGLCREATEPBUFFEREXTPROC __wglewCreatePbufferEXT; -WGLEW_FUN_EXPORT PFNWGLDESTROYPBUFFEREXTPROC __wglewDestroyPbufferEXT; -WGLEW_FUN_EXPORT PFNWGLGETPBUFFERDCEXTPROC __wglewGetPbufferDCEXT; -WGLEW_FUN_EXPORT PFNWGLQUERYPBUFFEREXTPROC __wglewQueryPbufferEXT; -WGLEW_FUN_EXPORT PFNWGLRELEASEPBUFFERDCEXTPROC __wglewReleasePbufferDCEXT; - -WGLEW_FUN_EXPORT PFNWGLCHOOSEPIXELFORMATEXTPROC __wglewChoosePixelFormatEXT; -WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBFVEXTPROC __wglewGetPixelFormatAttribfvEXT; -WGLEW_FUN_EXPORT PFNWGLGETPIXELFORMATATTRIBIVEXTPROC __wglewGetPixelFormatAttribivEXT; - -WGLEW_FUN_EXPORT PFNWGLGETSWAPINTERVALEXTPROC __wglewGetSwapIntervalEXT; -WGLEW_FUN_EXPORT PFNWGLSWAPINTERVALEXTPROC __wglewSwapIntervalEXT; - -WGLEW_FUN_EXPORT PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC __wglewGetDigitalVideoParametersI3D; -WGLEW_FUN_EXPORT PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC __wglewSetDigitalVideoParametersI3D; - -WGLEW_FUN_EXPORT PFNWGLGETGAMMATABLEI3DPROC __wglewGetGammaTableI3D; -WGLEW_FUN_EXPORT PFNWGLGETGAMMATABLEPARAMETERSI3DPROC __wglewGetGammaTableParametersI3D; -WGLEW_FUN_EXPORT PFNWGLSETGAMMATABLEI3DPROC __wglewSetGammaTableI3D; -WGLEW_FUN_EXPORT PFNWGLSETGAMMATABLEPARAMETERSI3DPROC __wglewSetGammaTableParametersI3D; - -WGLEW_FUN_EXPORT PFNWGLDISABLEGENLOCKI3DPROC __wglewDisableGenlockI3D; -WGLEW_FUN_EXPORT PFNWGLENABLEGENLOCKI3DPROC __wglewEnableGenlockI3D; -WGLEW_FUN_EXPORT PFNWGLGENLOCKSAMPLERATEI3DPROC __wglewGenlockSampleRateI3D; -WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEDELAYI3DPROC __wglewGenlockSourceDelayI3D; -WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEEDGEI3DPROC __wglewGenlockSourceEdgeI3D; -WGLEW_FUN_EXPORT PFNWGLGENLOCKSOURCEI3DPROC __wglewGenlockSourceI3D; -WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSAMPLERATEI3DPROC __wglewGetGenlockSampleRateI3D; -WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEDELAYI3DPROC __wglewGetGenlockSourceDelayI3D; -WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEEDGEI3DPROC __wglewGetGenlockSourceEdgeI3D; -WGLEW_FUN_EXPORT PFNWGLGETGENLOCKSOURCEI3DPROC __wglewGetGenlockSourceI3D; -WGLEW_FUN_EXPORT PFNWGLISENABLEDGENLOCKI3DPROC __wglewIsEnabledGenlockI3D; -WGLEW_FUN_EXPORT PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC __wglewQueryGenlockMaxSourceDelayI3D; - -WGLEW_FUN_EXPORT PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC __wglewAssociateImageBufferEventsI3D; -WGLEW_FUN_EXPORT PFNWGLCREATEIMAGEBUFFERI3DPROC __wglewCreateImageBufferI3D; -WGLEW_FUN_EXPORT PFNWGLDESTROYIMAGEBUFFERI3DPROC __wglewDestroyImageBufferI3D; -WGLEW_FUN_EXPORT PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC __wglewReleaseImageBufferEventsI3D; - -WGLEW_FUN_EXPORT PFNWGLDISABLEFRAMELOCKI3DPROC __wglewDisableFrameLockI3D; -WGLEW_FUN_EXPORT PFNWGLENABLEFRAMELOCKI3DPROC __wglewEnableFrameLockI3D; -WGLEW_FUN_EXPORT PFNWGLISENABLEDFRAMELOCKI3DPROC __wglewIsEnabledFrameLockI3D; -WGLEW_FUN_EXPORT PFNWGLQUERYFRAMELOCKMASTERI3DPROC __wglewQueryFrameLockMasterI3D; - -WGLEW_FUN_EXPORT PFNWGLBEGINFRAMETRACKINGI3DPROC __wglewBeginFrameTrackingI3D; -WGLEW_FUN_EXPORT PFNWGLENDFRAMETRACKINGI3DPROC __wglewEndFrameTrackingI3D; -WGLEW_FUN_EXPORT PFNWGLGETFRAMEUSAGEI3DPROC __wglewGetFrameUsageI3D; -WGLEW_FUN_EXPORT PFNWGLQUERYFRAMETRACKINGI3DPROC __wglewQueryFrameTrackingI3D; - -WGLEW_FUN_EXPORT PFNWGLDXCLOSEDEVICENVPROC __wglewDXCloseDeviceNV; -WGLEW_FUN_EXPORT PFNWGLDXLOCKOBJECTSNVPROC __wglewDXLockObjectsNV; -WGLEW_FUN_EXPORT PFNWGLDXOBJECTACCESSNVPROC __wglewDXObjectAccessNV; -WGLEW_FUN_EXPORT PFNWGLDXOPENDEVICENVPROC __wglewDXOpenDeviceNV; -WGLEW_FUN_EXPORT PFNWGLDXREGISTEROBJECTNVPROC __wglewDXRegisterObjectNV; -WGLEW_FUN_EXPORT PFNWGLDXSETRESOURCESHAREHANDLENVPROC __wglewDXSetResourceShareHandleNV; -WGLEW_FUN_EXPORT PFNWGLDXUNLOCKOBJECTSNVPROC __wglewDXUnlockObjectsNV; -WGLEW_FUN_EXPORT PFNWGLDXUNREGISTEROBJECTNVPROC __wglewDXUnregisterObjectNV; - -WGLEW_FUN_EXPORT PFNWGLCOPYIMAGESUBDATANVPROC __wglewCopyImageSubDataNV; - -WGLEW_FUN_EXPORT PFNWGLDELAYBEFORESWAPNVPROC __wglewDelayBeforeSwapNV; - -WGLEW_FUN_EXPORT PFNWGLCREATEAFFINITYDCNVPROC __wglewCreateAffinityDCNV; -WGLEW_FUN_EXPORT PFNWGLDELETEDCNVPROC __wglewDeleteDCNV; -WGLEW_FUN_EXPORT PFNWGLENUMGPUDEVICESNVPROC __wglewEnumGpuDevicesNV; -WGLEW_FUN_EXPORT PFNWGLENUMGPUSFROMAFFINITYDCNVPROC __wglewEnumGpusFromAffinityDCNV; -WGLEW_FUN_EXPORT PFNWGLENUMGPUSNVPROC __wglewEnumGpusNV; - -WGLEW_FUN_EXPORT PFNWGLBINDVIDEODEVICENVPROC __wglewBindVideoDeviceNV; -WGLEW_FUN_EXPORT PFNWGLENUMERATEVIDEODEVICESNVPROC __wglewEnumerateVideoDevicesNV; -WGLEW_FUN_EXPORT PFNWGLQUERYCURRENTCONTEXTNVPROC __wglewQueryCurrentContextNV; - -WGLEW_FUN_EXPORT PFNWGLBINDSWAPBARRIERNVPROC __wglewBindSwapBarrierNV; -WGLEW_FUN_EXPORT PFNWGLJOINSWAPGROUPNVPROC __wglewJoinSwapGroupNV; -WGLEW_FUN_EXPORT PFNWGLQUERYFRAMECOUNTNVPROC __wglewQueryFrameCountNV; -WGLEW_FUN_EXPORT PFNWGLQUERYMAXSWAPGROUPSNVPROC __wglewQueryMaxSwapGroupsNV; -WGLEW_FUN_EXPORT PFNWGLQUERYSWAPGROUPNVPROC __wglewQuerySwapGroupNV; -WGLEW_FUN_EXPORT PFNWGLRESETFRAMECOUNTNVPROC __wglewResetFrameCountNV; - -WGLEW_FUN_EXPORT PFNWGLALLOCATEMEMORYNVPROC __wglewAllocateMemoryNV; -WGLEW_FUN_EXPORT PFNWGLFREEMEMORYNVPROC __wglewFreeMemoryNV; - -WGLEW_FUN_EXPORT PFNWGLBINDVIDEOCAPTUREDEVICENVPROC __wglewBindVideoCaptureDeviceNV; -WGLEW_FUN_EXPORT PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC __wglewEnumerateVideoCaptureDevicesNV; -WGLEW_FUN_EXPORT PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC __wglewLockVideoCaptureDeviceNV; -WGLEW_FUN_EXPORT PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC __wglewQueryVideoCaptureDeviceNV; -WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC __wglewReleaseVideoCaptureDeviceNV; - -WGLEW_FUN_EXPORT PFNWGLBINDVIDEOIMAGENVPROC __wglewBindVideoImageNV; -WGLEW_FUN_EXPORT PFNWGLGETVIDEODEVICENVPROC __wglewGetVideoDeviceNV; -WGLEW_FUN_EXPORT PFNWGLGETVIDEOINFONVPROC __wglewGetVideoInfoNV; -WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEODEVICENVPROC __wglewReleaseVideoDeviceNV; -WGLEW_FUN_EXPORT PFNWGLRELEASEVIDEOIMAGENVPROC __wglewReleaseVideoImageNV; -WGLEW_FUN_EXPORT PFNWGLSENDPBUFFERTOVIDEONVPROC __wglewSendPbufferToVideoNV; - -WGLEW_FUN_EXPORT PFNWGLGETMSCRATEOMLPROC __wglewGetMscRateOML; -WGLEW_FUN_EXPORT PFNWGLGETSYNCVALUESOMLPROC __wglewGetSyncValuesOML; -WGLEW_FUN_EXPORT PFNWGLSWAPBUFFERSMSCOMLPROC __wglewSwapBuffersMscOML; -WGLEW_FUN_EXPORT PFNWGLSWAPLAYERBUFFERSMSCOMLPROC __wglewSwapLayerBuffersMscOML; -WGLEW_FUN_EXPORT PFNWGLWAITFORMSCOMLPROC __wglewWaitForMscOML; -WGLEW_FUN_EXPORT PFNWGLWAITFORSBCOMLPROC __wglewWaitForSbcOML; -WGLEW_VAR_EXPORT GLboolean __WGLEW_3DFX_multisample; -WGLEW_VAR_EXPORT GLboolean __WGLEW_3DL_stereo_control; -WGLEW_VAR_EXPORT GLboolean __WGLEW_AMD_gpu_association; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_buffer_region; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_context_flush_control; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_profile; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_create_context_robustness; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_extensions_string; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_framebuffer_sRGB; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_make_current_read; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_multisample; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pbuffer; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pixel_format; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_pixel_format_float; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_render_texture; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_robustness_application_isolation; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ARB_robustness_share_group_isolation; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_pixel_format_float; -WGLEW_VAR_EXPORT GLboolean __WGLEW_ATI_render_texture_rectangle; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es2_profile; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_create_context_es_profile; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_depth_float; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_display_color_table; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_extensions_string; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_framebuffer_sRGB; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_make_current_read; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_multisample; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pbuffer; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pixel_format; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_pixel_format_packed_float; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_swap_control; -WGLEW_VAR_EXPORT GLboolean __WGLEW_EXT_swap_control_tear; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_digital_video_control; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_gamma; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_genlock; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_image_buffer; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_swap_frame_lock; -WGLEW_VAR_EXPORT GLboolean __WGLEW_I3D_swap_frame_usage; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_DX_interop2; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_copy_image; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_delay_before_swap; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_float_buffer; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_gpu_affinity; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_multisample_coverage; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_present_video; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_render_depth_texture; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_render_texture_rectangle; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_swap_group; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_vertex_array_range; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_capture; -WGLEW_VAR_EXPORT GLboolean __WGLEW_NV_video_output; -WGLEW_VAR_EXPORT GLboolean __WGLEW_OML_sync_control; -/* ------------------------------------------------------------------------- */ - -GLEWAPI GLenum GLEWAPIENTRY wglewInit (); -GLEWAPI GLboolean GLEWAPIENTRY wglewIsSupported (const char *name); - -#ifndef WGLEW_GET_VAR -#define WGLEW_GET_VAR(x) (*(const GLboolean*)&x) -#endif - -#ifndef WGLEW_GET_FUN -#define WGLEW_GET_FUN(x) x -#endif - -GLEWAPI GLboolean GLEWAPIENTRY wglewGetExtension (const char *name); - -#ifdef __cplusplus -} -#endif - -#undef GLEWAPI - -#endif /* __wglew_h__ */ diff --git a/opengl/wglext.h b/opengl/wglext.h deleted file mode 100644 index 3fe2e2df..00000000 --- a/opengl/wglext.h +++ /dev/null @@ -1,929 +0,0 @@ -#ifndef __wglext_h_ -#define __wglext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright (c) 2007-2010 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Function declaration macros - to move into glplatform.h */ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif - -/*************************************************************/ - -/* Header file version number */ -/* wglext.h last updated 2011/04/13 */ -/* Current version at http://www.opengl.org/registry/ */ -#define WGL_WGLEXT_VERSION 23 - -#ifndef WGL_ARB_buffer_region -#define WGL_FRONT_COLOR_BUFFER_BIT_ARB 0x00000001 -#define WGL_BACK_COLOR_BUFFER_BIT_ARB 0x00000002 -#define WGL_DEPTH_BUFFER_BIT_ARB 0x00000004 -#define WGL_STENCIL_BUFFER_BIT_ARB 0x00000008 -#endif - -#ifndef WGL_ARB_multisample -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 -#endif - -#ifndef WGL_ARB_extensions_string -#endif - -#ifndef WGL_ARB_pixel_format -#define WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 -#define WGL_DRAW_TO_WINDOW_ARB 0x2001 -#define WGL_DRAW_TO_BITMAP_ARB 0x2002 -#define WGL_ACCELERATION_ARB 0x2003 -#define WGL_NEED_PALETTE_ARB 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_ARB 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_ARB 0x2006 -#define WGL_SWAP_METHOD_ARB 0x2007 -#define WGL_NUMBER_OVERLAYS_ARB 0x2008 -#define WGL_NUMBER_UNDERLAYS_ARB 0x2009 -#define WGL_TRANSPARENT_ARB 0x200A -#define WGL_TRANSPARENT_RED_VALUE_ARB 0x2037 -#define WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038 -#define WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039 -#define WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A -#define WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B -#define WGL_SHARE_DEPTH_ARB 0x200C -#define WGL_SHARE_STENCIL_ARB 0x200D -#define WGL_SHARE_ACCUM_ARB 0x200E -#define WGL_SUPPORT_GDI_ARB 0x200F -#define WGL_SUPPORT_OPENGL_ARB 0x2010 -#define WGL_DOUBLE_BUFFER_ARB 0x2011 -#define WGL_STEREO_ARB 0x2012 -#define WGL_PIXEL_TYPE_ARB 0x2013 -#define WGL_COLOR_BITS_ARB 0x2014 -#define WGL_RED_BITS_ARB 0x2015 -#define WGL_RED_SHIFT_ARB 0x2016 -#define WGL_GREEN_BITS_ARB 0x2017 -#define WGL_GREEN_SHIFT_ARB 0x2018 -#define WGL_BLUE_BITS_ARB 0x2019 -#define WGL_BLUE_SHIFT_ARB 0x201A -#define WGL_ALPHA_BITS_ARB 0x201B -#define WGL_ALPHA_SHIFT_ARB 0x201C -#define WGL_ACCUM_BITS_ARB 0x201D -#define WGL_ACCUM_RED_BITS_ARB 0x201E -#define WGL_ACCUM_GREEN_BITS_ARB 0x201F -#define WGL_ACCUM_BLUE_BITS_ARB 0x2020 -#define WGL_ACCUM_ALPHA_BITS_ARB 0x2021 -#define WGL_DEPTH_BITS_ARB 0x2022 -#define WGL_STENCIL_BITS_ARB 0x2023 -#define WGL_AUX_BUFFERS_ARB 0x2024 -#define WGL_NO_ACCELERATION_ARB 0x2025 -#define WGL_GENERIC_ACCELERATION_ARB 0x2026 -#define WGL_FULL_ACCELERATION_ARB 0x2027 -#define WGL_SWAP_EXCHANGE_ARB 0x2028 -#define WGL_SWAP_COPY_ARB 0x2029 -#define WGL_SWAP_UNDEFINED_ARB 0x202A -#define WGL_TYPE_RGBA_ARB 0x202B -#define WGL_TYPE_COLORINDEX_ARB 0x202C -#endif - -#ifndef WGL_ARB_make_current_read -#define ERROR_INVALID_PIXEL_TYPE_ARB 0x2043 -#define ERROR_INCOMPATIBLE_DEVICE_CONTEXTS_ARB 0x2054 -#endif - -#ifndef WGL_ARB_pbuffer -#define WGL_DRAW_TO_PBUFFER_ARB 0x202D -#define WGL_MAX_PBUFFER_PIXELS_ARB 0x202E -#define WGL_MAX_PBUFFER_WIDTH_ARB 0x202F -#define WGL_MAX_PBUFFER_HEIGHT_ARB 0x2030 -#define WGL_PBUFFER_LARGEST_ARB 0x2033 -#define WGL_PBUFFER_WIDTH_ARB 0x2034 -#define WGL_PBUFFER_HEIGHT_ARB 0x2035 -#define WGL_PBUFFER_LOST_ARB 0x2036 -#endif - -#ifndef WGL_ARB_render_texture -#define WGL_BIND_TO_TEXTURE_RGB_ARB 0x2070 -#define WGL_BIND_TO_TEXTURE_RGBA_ARB 0x2071 -#define WGL_TEXTURE_FORMAT_ARB 0x2072 -#define WGL_TEXTURE_TARGET_ARB 0x2073 -#define WGL_MIPMAP_TEXTURE_ARB 0x2074 -#define WGL_TEXTURE_RGB_ARB 0x2075 -#define WGL_TEXTURE_RGBA_ARB 0x2076 -#define WGL_NO_TEXTURE_ARB 0x2077 -#define WGL_TEXTURE_CUBE_MAP_ARB 0x2078 -#define WGL_TEXTURE_1D_ARB 0x2079 -#define WGL_TEXTURE_2D_ARB 0x207A -#define WGL_MIPMAP_LEVEL_ARB 0x207B -#define WGL_CUBE_MAP_FACE_ARB 0x207C -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x207D -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x207E -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x207F -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x2080 -#define WGL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x2081 -#define WGL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x2082 -#define WGL_FRONT_LEFT_ARB 0x2083 -#define WGL_FRONT_RIGHT_ARB 0x2084 -#define WGL_BACK_LEFT_ARB 0x2085 -#define WGL_BACK_RIGHT_ARB 0x2086 -#define WGL_AUX0_ARB 0x2087 -#define WGL_AUX1_ARB 0x2088 -#define WGL_AUX2_ARB 0x2089 -#define WGL_AUX3_ARB 0x208A -#define WGL_AUX4_ARB 0x208B -#define WGL_AUX5_ARB 0x208C -#define WGL_AUX6_ARB 0x208D -#define WGL_AUX7_ARB 0x208E -#define WGL_AUX8_ARB 0x208F -#define WGL_AUX9_ARB 0x2090 -#endif - -#ifndef WGL_ARB_pixel_format_float -#define WGL_TYPE_RGBA_FLOAT_ARB 0x21A0 -#endif - -#ifndef WGL_ARB_framebuffer_sRGB -#define WGL_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20A9 -#endif - -#ifndef WGL_ARB_create_context -#define WGL_CONTEXT_DEBUG_BIT_ARB 0x00000001 -#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 -#define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 -#define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 -#define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 -#define WGL_CONTEXT_FLAGS_ARB 0x2094 -#define ERROR_INVALID_VERSION_ARB 0x2095 -#endif - -#ifndef WGL_ARB_create_context_profile -#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 -#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 -#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 -#define ERROR_INVALID_PROFILE_ARB 0x2096 -#endif - -#ifndef WGL_ARB_create_context_robustness -#define WGL_CONTEXT_ROBUST_ACCESS_BIT_ARB 0x00000004 -#define WGL_LOSE_CONTEXT_ON_RESET_ARB 0x8252 -#define WGL_CONTEXT_RESET_NOTIFICATION_STRATEGY_ARB 0x8256 -#define WGL_NO_RESET_NOTIFICATION_ARB 0x8261 -#endif - -#ifndef WGL_EXT_make_current_read -#define ERROR_INVALID_PIXEL_TYPE_EXT 0x2043 -#endif - -#ifndef WGL_EXT_pixel_format -#define WGL_NUMBER_PIXEL_FORMATS_EXT 0x2000 -#define WGL_DRAW_TO_WINDOW_EXT 0x2001 -#define WGL_DRAW_TO_BITMAP_EXT 0x2002 -#define WGL_ACCELERATION_EXT 0x2003 -#define WGL_NEED_PALETTE_EXT 0x2004 -#define WGL_NEED_SYSTEM_PALETTE_EXT 0x2005 -#define WGL_SWAP_LAYER_BUFFERS_EXT 0x2006 -#define WGL_SWAP_METHOD_EXT 0x2007 -#define WGL_NUMBER_OVERLAYS_EXT 0x2008 -#define WGL_NUMBER_UNDERLAYS_EXT 0x2009 -#define WGL_TRANSPARENT_EXT 0x200A -#define WGL_TRANSPARENT_VALUE_EXT 0x200B -#define WGL_SHARE_DEPTH_EXT 0x200C -#define WGL_SHARE_STENCIL_EXT 0x200D -#define WGL_SHARE_ACCUM_EXT 0x200E -#define WGL_SUPPORT_GDI_EXT 0x200F -#define WGL_SUPPORT_OPENGL_EXT 0x2010 -#define WGL_DOUBLE_BUFFER_EXT 0x2011 -#define WGL_STEREO_EXT 0x2012 -#define WGL_PIXEL_TYPE_EXT 0x2013 -#define WGL_COLOR_BITS_EXT 0x2014 -#define WGL_RED_BITS_EXT 0x2015 -#define WGL_RED_SHIFT_EXT 0x2016 -#define WGL_GREEN_BITS_EXT 0x2017 -#define WGL_GREEN_SHIFT_EXT 0x2018 -#define WGL_BLUE_BITS_EXT 0x2019 -#define WGL_BLUE_SHIFT_EXT 0x201A -#define WGL_ALPHA_BITS_EXT 0x201B -#define WGL_ALPHA_SHIFT_EXT 0x201C -#define WGL_ACCUM_BITS_EXT 0x201D -#define WGL_ACCUM_RED_BITS_EXT 0x201E -#define WGL_ACCUM_GREEN_BITS_EXT 0x201F -#define WGL_ACCUM_BLUE_BITS_EXT 0x2020 -#define WGL_ACCUM_ALPHA_BITS_EXT 0x2021 -#define WGL_DEPTH_BITS_EXT 0x2022 -#define WGL_STENCIL_BITS_EXT 0x2023 -#define WGL_AUX_BUFFERS_EXT 0x2024 -#define WGL_NO_ACCELERATION_EXT 0x2025 -#define WGL_GENERIC_ACCELERATION_EXT 0x2026 -#define WGL_FULL_ACCELERATION_EXT 0x2027 -#define WGL_SWAP_EXCHANGE_EXT 0x2028 -#define WGL_SWAP_COPY_EXT 0x2029 -#define WGL_SWAP_UNDEFINED_EXT 0x202A -#define WGL_TYPE_RGBA_EXT 0x202B -#define WGL_TYPE_COLORINDEX_EXT 0x202C -#endif - -#ifndef WGL_EXT_pbuffer -#define WGL_DRAW_TO_PBUFFER_EXT 0x202D -#define WGL_MAX_PBUFFER_PIXELS_EXT 0x202E -#define WGL_MAX_PBUFFER_WIDTH_EXT 0x202F -#define WGL_MAX_PBUFFER_HEIGHT_EXT 0x2030 -#define WGL_OPTIMAL_PBUFFER_WIDTH_EXT 0x2031 -#define WGL_OPTIMAL_PBUFFER_HEIGHT_EXT 0x2032 -#define WGL_PBUFFER_LARGEST_EXT 0x2033 -#define WGL_PBUFFER_WIDTH_EXT 0x2034 -#define WGL_PBUFFER_HEIGHT_EXT 0x2035 -#endif - -#ifndef WGL_EXT_depth_float -#define WGL_DEPTH_FLOAT_EXT 0x2040 -#endif - -#ifndef WGL_3DFX_multisample -#define WGL_SAMPLE_BUFFERS_3DFX 0x2060 -#define WGL_SAMPLES_3DFX 0x2061 -#endif - -#ifndef WGL_EXT_multisample -#define WGL_SAMPLE_BUFFERS_EXT 0x2041 -#define WGL_SAMPLES_EXT 0x2042 -#endif - -#ifndef WGL_I3D_digital_video_control -#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_FRAMEBUFFER_I3D 0x2050 -#define WGL_DIGITAL_VIDEO_CURSOR_ALPHA_VALUE_I3D 0x2051 -#define WGL_DIGITAL_VIDEO_CURSOR_INCLUDED_I3D 0x2052 -#define WGL_DIGITAL_VIDEO_GAMMA_CORRECTED_I3D 0x2053 -#endif - -#ifndef WGL_I3D_gamma -#define WGL_GAMMA_TABLE_SIZE_I3D 0x204E -#define WGL_GAMMA_EXCLUDE_DESKTOP_I3D 0x204F -#endif - -#ifndef WGL_I3D_genlock -#define WGL_GENLOCK_SOURCE_MULTIVIEW_I3D 0x2044 -#define WGL_GENLOCK_SOURCE_EXTENAL_SYNC_I3D 0x2045 -#define WGL_GENLOCK_SOURCE_EXTENAL_FIELD_I3D 0x2046 -#define WGL_GENLOCK_SOURCE_EXTENAL_TTL_I3D 0x2047 -#define WGL_GENLOCK_SOURCE_DIGITAL_SYNC_I3D 0x2048 -#define WGL_GENLOCK_SOURCE_DIGITAL_FIELD_I3D 0x2049 -#define WGL_GENLOCK_SOURCE_EDGE_FALLING_I3D 0x204A -#define WGL_GENLOCK_SOURCE_EDGE_RISING_I3D 0x204B -#define WGL_GENLOCK_SOURCE_EDGE_BOTH_I3D 0x204C -#endif - -#ifndef WGL_I3D_image_buffer -#define WGL_IMAGE_BUFFER_MIN_ACCESS_I3D 0x00000001 -#define WGL_IMAGE_BUFFER_LOCK_I3D 0x00000002 -#endif - -#ifndef WGL_I3D_swap_frame_lock -#endif - -#ifndef WGL_NV_render_depth_texture -#define WGL_BIND_TO_TEXTURE_DEPTH_NV 0x20A3 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_DEPTH_NV 0x20A4 -#define WGL_DEPTH_TEXTURE_FORMAT_NV 0x20A5 -#define WGL_TEXTURE_DEPTH_COMPONENT_NV 0x20A6 -#define WGL_DEPTH_COMPONENT_NV 0x20A7 -#endif - -#ifndef WGL_NV_render_texture_rectangle -#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGB_NV 0x20A0 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_RGBA_NV 0x20A1 -#define WGL_TEXTURE_RECTANGLE_NV 0x20A2 -#endif - -#ifndef WGL_ATI_pixel_format_float -#define WGL_TYPE_RGBA_FLOAT_ATI 0x21A0 -#endif - -#ifndef WGL_NV_float_buffer -#define WGL_FLOAT_COMPONENTS_NV 0x20B0 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_R_NV 0x20B1 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RG_NV 0x20B2 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGB_NV 0x20B3 -#define WGL_BIND_TO_TEXTURE_RECTANGLE_FLOAT_RGBA_NV 0x20B4 -#define WGL_TEXTURE_FLOAT_R_NV 0x20B5 -#define WGL_TEXTURE_FLOAT_RG_NV 0x20B6 -#define WGL_TEXTURE_FLOAT_RGB_NV 0x20B7 -#define WGL_TEXTURE_FLOAT_RGBA_NV 0x20B8 -#endif - -#ifndef WGL_3DL_stereo_control -#define WGL_STEREO_EMITTER_ENABLE_3DL 0x2055 -#define WGL_STEREO_EMITTER_DISABLE_3DL 0x2056 -#define WGL_STEREO_POLARITY_NORMAL_3DL 0x2057 -#define WGL_STEREO_POLARITY_INVERT_3DL 0x2058 -#endif - -#ifndef WGL_EXT_pixel_format_packed_float -#define WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8 -#endif - -#ifndef WGL_EXT_framebuffer_sRGB -#define WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9 -#endif - -#ifndef WGL_NV_present_video -#define WGL_NUM_VIDEO_SLOTS_NV 0x20F0 -#endif - -#ifndef WGL_NV_video_out -#define WGL_BIND_TO_VIDEO_RGB_NV 0x20C0 -#define WGL_BIND_TO_VIDEO_RGBA_NV 0x20C1 -#define WGL_BIND_TO_VIDEO_RGB_AND_DEPTH_NV 0x20C2 -#define WGL_VIDEO_OUT_COLOR_NV 0x20C3 -#define WGL_VIDEO_OUT_ALPHA_NV 0x20C4 -#define WGL_VIDEO_OUT_DEPTH_NV 0x20C5 -#define WGL_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 -#define WGL_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 -#define WGL_VIDEO_OUT_FRAME 0x20C8 -#define WGL_VIDEO_OUT_FIELD_1 0x20C9 -#define WGL_VIDEO_OUT_FIELD_2 0x20CA -#define WGL_VIDEO_OUT_STACKED_FIELDS_1_2 0x20CB -#define WGL_VIDEO_OUT_STACKED_FIELDS_2_1 0x20CC -#endif - -#ifndef WGL_NV_swap_group -#endif - -#ifndef WGL_NV_gpu_affinity -#define WGL_ERROR_INCOMPATIBLE_AFFINITY_MASKS_NV 0x20D0 -#define WGL_ERROR_MISSING_AFFINITY_MASK_NV 0x20D1 -#endif - -#ifndef WGL_AMD_gpu_association -#define WGL_GPU_VENDOR_AMD 0x1F00 -#define WGL_GPU_RENDERER_STRING_AMD 0x1F01 -#define WGL_GPU_OPENGL_VERSION_STRING_AMD 0x1F02 -#define WGL_GPU_FASTEST_TARGET_GPUS_AMD 0x21A2 -#define WGL_GPU_RAM_AMD 0x21A3 -#define WGL_GPU_CLOCK_AMD 0x21A4 -#define WGL_GPU_NUM_PIPES_AMD 0x21A5 -#define WGL_GPU_NUM_SIMD_AMD 0x21A6 -#define WGL_GPU_NUM_RB_AMD 0x21A7 -#define WGL_GPU_NUM_SPI_AMD 0x21A8 -#endif - -#ifndef WGL_NV_video_capture -#define WGL_UNIQUE_ID_NV 0x20CE -#define WGL_NUM_VIDEO_CAPTURE_SLOTS_NV 0x20CF -#endif - -#ifndef WGL_NV_copy_image -#endif - -#ifndef WGL_NV_multisample_coverage -#define WGL_COVERAGE_SAMPLES_NV 0x2042 -#define WGL_COLOR_SAMPLES_NV 0x20B9 -#endif - -#ifndef WGL_EXT_create_context_es2_profile -#define WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004 -#endif - -#ifndef WGL_NV_DX_interop -#define WGL_ACCESS_READ_ONLY_NV 0x00000000 -#define WGL_ACCESS_READ_WRITE_NV 0x00000001 -#define WGL_ACCESS_WRITE_DISCARD_NV 0x00000002 -#endif - - -/*************************************************************/ - -#ifndef WGL_ARB_pbuffer -DECLARE_HANDLE(HPBUFFERARB); -#endif -#ifndef WGL_EXT_pbuffer -DECLARE_HANDLE(HPBUFFEREXT); -#endif -#ifndef WGL_NV_present_video -DECLARE_HANDLE(HVIDEOOUTPUTDEVICENV); -#endif -#ifndef WGL_NV_video_output -DECLARE_HANDLE(HPVIDEODEV); -#endif -#ifndef WGL_NV_gpu_affinity -DECLARE_HANDLE(HPGPUNV); -DECLARE_HANDLE(HGPUNV); - -typedef struct _GPU_DEVICE { - DWORD cb; - CHAR DeviceName[32]; - CHAR DeviceString[128]; - DWORD Flags; - RECT rcVirtualScreen; -} GPU_DEVICE, *PGPU_DEVICE; -#endif -#ifndef WGL_NV_video_capture -DECLARE_HANDLE(HVIDEOINPUTDEVICENV); -#endif - -#ifndef WGL_ARB_buffer_region -#define WGL_ARB_buffer_region 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern HANDLE WINAPI wglCreateBufferRegionARB (HDC hDC, int iLayerPlane, UINT uType); -extern VOID WINAPI wglDeleteBufferRegionARB (HANDLE hRegion); -extern BOOL WINAPI wglSaveBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height); -extern BOOL WINAPI wglRestoreBufferRegionARB (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef HANDLE (WINAPI * PFNWGLCREATEBUFFERREGIONARBPROC) (HDC hDC, int iLayerPlane, UINT uType); -typedef VOID (WINAPI * PFNWGLDELETEBUFFERREGIONARBPROC) (HANDLE hRegion); -typedef BOOL (WINAPI * PFNWGLSAVEBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height); -typedef BOOL (WINAPI * PFNWGLRESTOREBUFFERREGIONARBPROC) (HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); -#endif - -#ifndef WGL_ARB_multisample -#define WGL_ARB_multisample 1 -#endif - -#ifndef WGL_ARB_extensions_string -#define WGL_ARB_extensions_string 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern const char * WINAPI wglGetExtensionsStringARB (HDC hdc); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc); -#endif - -#ifndef WGL_ARB_pixel_format -#define WGL_ARB_pixel_format 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); -extern BOOL WINAPI wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); -extern BOOL WINAPI wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVARBPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues); -typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATARBPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#endif - -#ifndef WGL_ARB_make_current_read -#define WGL_ARB_make_current_read 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglMakeContextCurrentARB (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -extern HDC WINAPI wglGetCurrentReadDCARB (void); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTARBPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCARBPROC) (void); -#endif - -#ifndef WGL_ARB_pbuffer -#define WGL_ARB_pbuffer 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern HPBUFFERARB WINAPI wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); -extern HDC WINAPI wglGetPbufferDCARB (HPBUFFERARB hPbuffer); -extern int WINAPI wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); -extern BOOL WINAPI wglDestroyPbufferARB (HPBUFFERARB hPbuffer); -extern BOOL WINAPI wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef HPBUFFERARB (WINAPI * PFNWGLCREATEPBUFFERARBPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); -typedef HDC (WINAPI * PFNWGLGETPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer); -typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCARBPROC) (HPBUFFERARB hPbuffer, HDC hDC); -typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFERARBPROC) (HPBUFFERARB hPbuffer); -typedef BOOL (WINAPI * PFNWGLQUERYPBUFFERARBPROC) (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); -#endif - -#ifndef WGL_ARB_render_texture -#define WGL_ARB_render_texture 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); -extern BOOL WINAPI wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); -extern BOOL WINAPI wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLBINDTEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); -typedef BOOL (WINAPI * PFNWGLRELEASETEXIMAGEARBPROC) (HPBUFFERARB hPbuffer, int iBuffer); -typedef BOOL (WINAPI * PFNWGLSETPBUFFERATTRIBARBPROC) (HPBUFFERARB hPbuffer, const int *piAttribList); -#endif - -#ifndef WGL_ARB_pixel_format_float -#define WGL_ARB_pixel_format_float 1 -#endif - -#ifndef WGL_ARB_framebuffer_sRGB -#define WGL_ARB_framebuffer_sRGB 1 -#endif - -#ifndef WGL_ARB_create_context -#define WGL_ARB_create_context 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern HGLRC WINAPI wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int *attribList); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef HGLRC (WINAPI * PFNWGLCREATECONTEXTATTRIBSARBPROC) (HDC hDC, HGLRC hShareContext, const int *attribList); -#endif - -#ifndef WGL_ARB_create_context_profile -#define WGL_ARB_create_context_profile 1 -#endif - -#ifndef WGL_ARB_create_context_robustness -#define WGL_ARB_create_context_robustness 1 -#endif - -#ifndef WGL_EXT_display_color_table -#define WGL_EXT_display_color_table 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern GLboolean WINAPI wglCreateDisplayColorTableEXT (GLushort id); -extern GLboolean WINAPI wglLoadDisplayColorTableEXT (const GLushort *table, GLuint length); -extern GLboolean WINAPI wglBindDisplayColorTableEXT (GLushort id); -extern VOID WINAPI wglDestroyDisplayColorTableEXT (GLushort id); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef GLboolean (WINAPI * PFNWGLCREATEDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef GLboolean (WINAPI * PFNWGLLOADDISPLAYCOLORTABLEEXTPROC) (const GLushort *table, GLuint length); -typedef GLboolean (WINAPI * PFNWGLBINDDISPLAYCOLORTABLEEXTPROC) (GLushort id); -typedef VOID (WINAPI * PFNWGLDESTROYDISPLAYCOLORTABLEEXTPROC) (GLushort id); -#endif - -#ifndef WGL_EXT_extensions_string -#define WGL_EXT_extensions_string 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern const char * WINAPI wglGetExtensionsStringEXT (void); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGEXTPROC) (void); -#endif - -#ifndef WGL_EXT_make_current_read -#define WGL_EXT_make_current_read 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglMakeContextCurrentEXT (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -extern HDC WINAPI wglGetCurrentReadDCEXT (void); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLMAKECONTEXTCURRENTEXTPROC) (HDC hDrawDC, HDC hReadDC, HGLRC hglrc); -typedef HDC (WINAPI * PFNWGLGETCURRENTREADDCEXTPROC) (void); -#endif - -#ifndef WGL_EXT_pbuffer -#define WGL_EXT_pbuffer 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern HPBUFFEREXT WINAPI wglCreatePbufferEXT (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); -extern HDC WINAPI wglGetPbufferDCEXT (HPBUFFEREXT hPbuffer); -extern int WINAPI wglReleasePbufferDCEXT (HPBUFFEREXT hPbuffer, HDC hDC); -extern BOOL WINAPI wglDestroyPbufferEXT (HPBUFFEREXT hPbuffer); -extern BOOL WINAPI wglQueryPbufferEXT (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef HPBUFFEREXT (WINAPI * PFNWGLCREATEPBUFFEREXTPROC) (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); -typedef HDC (WINAPI * PFNWGLGETPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer); -typedef int (WINAPI * PFNWGLRELEASEPBUFFERDCEXTPROC) (HPBUFFEREXT hPbuffer, HDC hDC); -typedef BOOL (WINAPI * PFNWGLDESTROYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer); -typedef BOOL (WINAPI * PFNWGLQUERYPBUFFEREXTPROC) (HPBUFFEREXT hPbuffer, int iAttribute, int *piValue); -#endif - -#ifndef WGL_EXT_pixel_format -#define WGL_EXT_pixel_format 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetPixelFormatAttribivEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); -extern BOOL WINAPI wglGetPixelFormatAttribfvEXT (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); -extern BOOL WINAPI wglChoosePixelFormatEXT (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *piValues); -typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBFVEXTPROC) (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, FLOAT *pfValues); -typedef BOOL (WINAPI * PFNWGLCHOOSEPIXELFORMATEXTPROC) (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats); -#endif - -#ifndef WGL_EXT_swap_control -#define WGL_EXT_swap_control 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglSwapIntervalEXT (int interval); -extern int WINAPI wglGetSwapIntervalEXT (void); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC) (int interval); -typedef int (WINAPI * PFNWGLGETSWAPINTERVALEXTPROC) (void); -#endif - -#ifndef WGL_EXT_depth_float -#define WGL_EXT_depth_float 1 -#endif - -#ifndef WGL_NV_vertex_array_range -#define WGL_NV_vertex_array_range 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern void* WINAPI wglAllocateMemoryNV (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); -extern void WINAPI wglFreeMemoryNV (void *pointer); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef void* (WINAPI * PFNWGLALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority); -typedef void (WINAPI * PFNWGLFREEMEMORYNVPROC) (void *pointer); -#endif - -#ifndef WGL_3DFX_multisample -#define WGL_3DFX_multisample 1 -#endif - -#ifndef WGL_EXT_multisample -#define WGL_EXT_multisample 1 -#endif - -#ifndef WGL_OML_sync_control -#define WGL_OML_sync_control 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetSyncValuesOML (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc); -extern BOOL WINAPI wglGetMscRateOML (HDC hdc, INT32 *numerator, INT32 *denominator); -extern INT64 WINAPI wglSwapBuffersMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); -extern INT64 WINAPI wglSwapLayerBuffersMscOML (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); -extern BOOL WINAPI wglWaitForMscOML (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc); -extern BOOL WINAPI wglWaitForSbcOML (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETSYNCVALUESOMLPROC) (HDC hdc, INT64 *ust, INT64 *msc, INT64 *sbc); -typedef BOOL (WINAPI * PFNWGLGETMSCRATEOMLPROC) (HDC hdc, INT32 *numerator, INT32 *denominator); -typedef INT64 (WINAPI * PFNWGLSWAPBUFFERSMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder); -typedef INT64 (WINAPI * PFNWGLSWAPLAYERBUFFERSMSCOMLPROC) (HDC hdc, int fuPlanes, INT64 target_msc, INT64 divisor, INT64 remainder); -typedef BOOL (WINAPI * PFNWGLWAITFORMSCOMLPROC) (HDC hdc, INT64 target_msc, INT64 divisor, INT64 remainder, INT64 *ust, INT64 *msc, INT64 *sbc); -typedef BOOL (WINAPI * PFNWGLWAITFORSBCOMLPROC) (HDC hdc, INT64 target_sbc, INT64 *ust, INT64 *msc, INT64 *sbc); -#endif - -#ifndef WGL_I3D_digital_video_control -#define WGL_I3D_digital_video_control 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetDigitalVideoParametersI3D (HDC hDC, int iAttribute, int *piValue); -extern BOOL WINAPI wglSetDigitalVideoParametersI3D (HDC hDC, int iAttribute, const int *piValue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue); -typedef BOOL (WINAPI * PFNWGLSETDIGITALVIDEOPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue); -#endif - -#ifndef WGL_I3D_gamma -#define WGL_I3D_gamma 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetGammaTableParametersI3D (HDC hDC, int iAttribute, int *piValue); -extern BOOL WINAPI wglSetGammaTableParametersI3D (HDC hDC, int iAttribute, const int *piValue); -extern BOOL WINAPI wglGetGammaTableI3D (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue); -extern BOOL WINAPI wglSetGammaTableI3D (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, int *piValue); -typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEPARAMETERSI3DPROC) (HDC hDC, int iAttribute, const int *piValue); -typedef BOOL (WINAPI * PFNWGLGETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, USHORT *puRed, USHORT *puGreen, USHORT *puBlue); -typedef BOOL (WINAPI * PFNWGLSETGAMMATABLEI3DPROC) (HDC hDC, int iEntries, const USHORT *puRed, const USHORT *puGreen, const USHORT *puBlue); -#endif - -#ifndef WGL_I3D_genlock -#define WGL_I3D_genlock 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglEnableGenlockI3D (HDC hDC); -extern BOOL WINAPI wglDisableGenlockI3D (HDC hDC); -extern BOOL WINAPI wglIsEnabledGenlockI3D (HDC hDC, BOOL *pFlag); -extern BOOL WINAPI wglGenlockSourceI3D (HDC hDC, UINT uSource); -extern BOOL WINAPI wglGetGenlockSourceI3D (HDC hDC, UINT *uSource); -extern BOOL WINAPI wglGenlockSourceEdgeI3D (HDC hDC, UINT uEdge); -extern BOOL WINAPI wglGetGenlockSourceEdgeI3D (HDC hDC, UINT *uEdge); -extern BOOL WINAPI wglGenlockSampleRateI3D (HDC hDC, UINT uRate); -extern BOOL WINAPI wglGetGenlockSampleRateI3D (HDC hDC, UINT *uRate); -extern BOOL WINAPI wglGenlockSourceDelayI3D (HDC hDC, UINT uDelay); -extern BOOL WINAPI wglGetGenlockSourceDelayI3D (HDC hDC, UINT *uDelay); -extern BOOL WINAPI wglQueryGenlockMaxSourceDelayI3D (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLENABLEGENLOCKI3DPROC) (HDC hDC); -typedef BOOL (WINAPI * PFNWGLDISABLEGENLOCKI3DPROC) (HDC hDC); -typedef BOOL (WINAPI * PFNWGLISENABLEDGENLOCKI3DPROC) (HDC hDC, BOOL *pFlag); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEI3DPROC) (HDC hDC, UINT uSource); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEI3DPROC) (HDC hDC, UINT *uSource); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT uEdge); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEEDGEI3DPROC) (HDC hDC, UINT *uEdge); -typedef BOOL (WINAPI * PFNWGLGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT uRate); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSAMPLERATEI3DPROC) (HDC hDC, UINT *uRate); -typedef BOOL (WINAPI * PFNWGLGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT uDelay); -typedef BOOL (WINAPI * PFNWGLGETGENLOCKSOURCEDELAYI3DPROC) (HDC hDC, UINT *uDelay); -typedef BOOL (WINAPI * PFNWGLQUERYGENLOCKMAXSOURCEDELAYI3DPROC) (HDC hDC, UINT *uMaxLineDelay, UINT *uMaxPixelDelay); -#endif - -#ifndef WGL_I3D_image_buffer -#define WGL_I3D_image_buffer 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern LPVOID WINAPI wglCreateImageBufferI3D (HDC hDC, DWORD dwSize, UINT uFlags); -extern BOOL WINAPI wglDestroyImageBufferI3D (HDC hDC, LPVOID pAddress); -extern BOOL WINAPI wglAssociateImageBufferEventsI3D (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count); -extern BOOL WINAPI wglReleaseImageBufferEventsI3D (HDC hDC, const LPVOID *pAddress, UINT count); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef LPVOID (WINAPI * PFNWGLCREATEIMAGEBUFFERI3DPROC) (HDC hDC, DWORD dwSize, UINT uFlags); -typedef BOOL (WINAPI * PFNWGLDESTROYIMAGEBUFFERI3DPROC) (HDC hDC, LPVOID pAddress); -typedef BOOL (WINAPI * PFNWGLASSOCIATEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const HANDLE *pEvent, const LPVOID *pAddress, const DWORD *pSize, UINT count); -typedef BOOL (WINAPI * PFNWGLRELEASEIMAGEBUFFEREVENTSI3DPROC) (HDC hDC, const LPVOID *pAddress, UINT count); -#endif - -#ifndef WGL_I3D_swap_frame_lock -#define WGL_I3D_swap_frame_lock 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglEnableFrameLockI3D (void); -extern BOOL WINAPI wglDisableFrameLockI3D (void); -extern BOOL WINAPI wglIsEnabledFrameLockI3D (BOOL *pFlag); -extern BOOL WINAPI wglQueryFrameLockMasterI3D (BOOL *pFlag); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLENABLEFRAMELOCKI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLDISABLEFRAMELOCKI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLISENABLEDFRAMELOCKI3DPROC) (BOOL *pFlag); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMELOCKMASTERI3DPROC) (BOOL *pFlag); -#endif - -#ifndef WGL_I3D_swap_frame_usage -#define WGL_I3D_swap_frame_usage 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetFrameUsageI3D (float *pUsage); -extern BOOL WINAPI wglBeginFrameTrackingI3D (void); -extern BOOL WINAPI wglEndFrameTrackingI3D (void); -extern BOOL WINAPI wglQueryFrameTrackingI3D (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETFRAMEUSAGEI3DPROC) (float *pUsage); -typedef BOOL (WINAPI * PFNWGLBEGINFRAMETRACKINGI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLENDFRAMETRACKINGI3DPROC) (void); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMETRACKINGI3DPROC) (DWORD *pFrameCount, DWORD *pMissedFrames, float *pLastMissedUsage); -#endif - -#ifndef WGL_ATI_pixel_format_float -#define WGL_ATI_pixel_format_float 1 -#endif - -#ifndef WGL_NV_float_buffer -#define WGL_NV_float_buffer 1 -#endif - -#ifndef WGL_3DL_stereo_control -#define WGL_3DL_stereo_control 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglSetStereoEmitterState3DL (HDC hDC, UINT uState); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLSETSTEREOEMITTERSTATE3DLPROC) (HDC hDC, UINT uState); -#endif - -#ifndef WGL_EXT_pixel_format_packed_float -#define WGL_EXT_pixel_format_packed_float 1 -#endif - -#ifndef WGL_EXT_framebuffer_sRGB -#define WGL_EXT_framebuffer_sRGB 1 -#endif - -#ifndef WGL_NV_present_video -#define WGL_NV_present_video 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern int WINAPI wglEnumerateVideoDevicesNV (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList); -extern BOOL WINAPI wglBindVideoDeviceNV (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); -extern BOOL WINAPI wglQueryCurrentContextNV (int iAttribute, int *piValue); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef int (WINAPI * PFNWGLENUMERATEVIDEODEVICESNVPROC) (HDC hDC, HVIDEOOUTPUTDEVICENV *phDeviceList); -typedef BOOL (WINAPI * PFNWGLBINDVIDEODEVICENVPROC) (HDC hDC, unsigned int uVideoSlot, HVIDEOOUTPUTDEVICENV hVideoDevice, const int *piAttribList); -typedef BOOL (WINAPI * PFNWGLQUERYCURRENTCONTEXTNVPROC) (int iAttribute, int *piValue); -#endif - -#ifndef WGL_NV_video_output -#define WGL_NV_video_output 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglGetVideoDeviceNV (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice); -extern BOOL WINAPI wglReleaseVideoDeviceNV (HPVIDEODEV hVideoDevice); -extern BOOL WINAPI wglBindVideoImageNV (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer); -extern BOOL WINAPI wglReleaseVideoImageNV (HPBUFFERARB hPbuffer, int iVideoBuffer); -extern BOOL WINAPI wglSendPbufferToVideoNV (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock); -extern BOOL WINAPI wglGetVideoInfoNV (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLGETVIDEODEVICENVPROC) (HDC hDC, int numDevices, HPVIDEODEV *hVideoDevice); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEODEVICENVPROC) (HPVIDEODEV hVideoDevice); -typedef BOOL (WINAPI * PFNWGLBINDVIDEOIMAGENVPROC) (HPVIDEODEV hVideoDevice, HPBUFFERARB hPbuffer, int iVideoBuffer); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOIMAGENVPROC) (HPBUFFERARB hPbuffer, int iVideoBuffer); -typedef BOOL (WINAPI * PFNWGLSENDPBUFFERTOVIDEONVPROC) (HPBUFFERARB hPbuffer, int iBufferType, unsigned long *pulCounterPbuffer, BOOL bBlock); -typedef BOOL (WINAPI * PFNWGLGETVIDEOINFONVPROC) (HPVIDEODEV hpVideoDevice, unsigned long *pulCounterOutputPbuffer, unsigned long *pulCounterOutputVideo); -#endif - -#ifndef WGL_NV_swap_group -#define WGL_NV_swap_group 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglJoinSwapGroupNV (HDC hDC, GLuint group); -extern BOOL WINAPI wglBindSwapBarrierNV (GLuint group, GLuint barrier); -extern BOOL WINAPI wglQuerySwapGroupNV (HDC hDC, GLuint *group, GLuint *barrier); -extern BOOL WINAPI wglQueryMaxSwapGroupsNV (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers); -extern BOOL WINAPI wglQueryFrameCountNV (HDC hDC, GLuint *count); -extern BOOL WINAPI wglResetFrameCountNV (HDC hDC); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLJOINSWAPGROUPNVPROC) (HDC hDC, GLuint group); -typedef BOOL (WINAPI * PFNWGLBINDSWAPBARRIERNVPROC) (GLuint group, GLuint barrier); -typedef BOOL (WINAPI * PFNWGLQUERYSWAPGROUPNVPROC) (HDC hDC, GLuint *group, GLuint *barrier); -typedef BOOL (WINAPI * PFNWGLQUERYMAXSWAPGROUPSNVPROC) (HDC hDC, GLuint *maxGroups, GLuint *maxBarriers); -typedef BOOL (WINAPI * PFNWGLQUERYFRAMECOUNTNVPROC) (HDC hDC, GLuint *count); -typedef BOOL (WINAPI * PFNWGLRESETFRAMECOUNTNVPROC) (HDC hDC); -#endif - -#ifndef WGL_NV_gpu_affinity -#define WGL_NV_gpu_affinity 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglEnumGpusNV (UINT iGpuIndex, HGPUNV *phGpu); -extern BOOL WINAPI wglEnumGpuDevicesNV (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice); -extern HDC WINAPI wglCreateAffinityDCNV (const HGPUNV *phGpuList); -extern BOOL WINAPI wglEnumGpusFromAffinityDCNV (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu); -extern BOOL WINAPI wglDeleteDCNV (HDC hdc); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLENUMGPUSNVPROC) (UINT iGpuIndex, HGPUNV *phGpu); -typedef BOOL (WINAPI * PFNWGLENUMGPUDEVICESNVPROC) (HGPUNV hGpu, UINT iDeviceIndex, PGPU_DEVICE lpGpuDevice); -typedef HDC (WINAPI * PFNWGLCREATEAFFINITYDCNVPROC) (const HGPUNV *phGpuList); -typedef BOOL (WINAPI * PFNWGLENUMGPUSFROMAFFINITYDCNVPROC) (HDC hAffinityDC, UINT iGpuIndex, HGPUNV *hGpu); -typedef BOOL (WINAPI * PFNWGLDELETEDCNVPROC) (HDC hdc); -#endif - -#ifndef WGL_AMD_gpu_association -#define WGL_AMD_gpu_association 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern UINT WINAPI wglGetGPUIDsAMD (UINT maxCount, UINT *ids); -extern INT WINAPI wglGetGPUInfoAMD (UINT id, int property, GLenum dataType, UINT size, void *data); -extern UINT WINAPI wglGetContextGPUIDAMD (HGLRC hglrc); -extern HGLRC WINAPI wglCreateAssociatedContextAMD (UINT id); -extern HGLRC WINAPI wglCreateAssociatedContextAttribsAMD (UINT id, HGLRC hShareContext, const int *attribList); -extern BOOL WINAPI wglDeleteAssociatedContextAMD (HGLRC hglrc); -extern BOOL WINAPI wglMakeAssociatedContextCurrentAMD (HGLRC hglrc); -extern HGLRC WINAPI wglGetCurrentAssociatedContextAMD (void); -extern VOID WINAPI wglBlitContextFramebufferAMD (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef UINT (WINAPI * PFNWGLGETGPUIDSAMDPROC) (UINT maxCount, UINT *ids); -typedef INT (WINAPI * PFNWGLGETGPUINFOAMDPROC) (UINT id, int property, GLenum dataType, UINT size, void *data); -typedef UINT (WINAPI * PFNWGLGETCONTEXTGPUIDAMDPROC) (HGLRC hglrc); -typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTAMDPROC) (UINT id); -typedef HGLRC (WINAPI * PFNWGLCREATEASSOCIATEDCONTEXTATTRIBSAMDPROC) (UINT id, HGLRC hShareContext, const int *attribList); -typedef BOOL (WINAPI * PFNWGLDELETEASSOCIATEDCONTEXTAMDPROC) (HGLRC hglrc); -typedef BOOL (WINAPI * PFNWGLMAKEASSOCIATEDCONTEXTCURRENTAMDPROC) (HGLRC hglrc); -typedef HGLRC (WINAPI * PFNWGLGETCURRENTASSOCIATEDCONTEXTAMDPROC) (void); -typedef VOID (WINAPI * PFNWGLBLITCONTEXTFRAMEBUFFERAMDPROC) (HGLRC dstCtx, GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif - -#ifndef WGL_NV_video_capture -#define WGL_NV_video_capture 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglBindVideoCaptureDeviceNV (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice); -extern UINT WINAPI wglEnumerateVideoCaptureDevicesNV (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList); -extern BOOL WINAPI wglLockVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -extern BOOL WINAPI wglQueryVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue); -extern BOOL WINAPI wglReleaseVideoCaptureDeviceNV (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLBINDVIDEOCAPTUREDEVICENVPROC) (UINT uVideoSlot, HVIDEOINPUTDEVICENV hDevice); -typedef UINT (WINAPI * PFNWGLENUMERATEVIDEOCAPTUREDEVICESNVPROC) (HDC hDc, HVIDEOINPUTDEVICENV *phDeviceList); -typedef BOOL (WINAPI * PFNWGLLOCKVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -typedef BOOL (WINAPI * PFNWGLQUERYVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice, int iAttribute, int *piValue); -typedef BOOL (WINAPI * PFNWGLRELEASEVIDEOCAPTUREDEVICENVPROC) (HDC hDc, HVIDEOINPUTDEVICENV hDevice); -#endif - -#ifndef WGL_NV_copy_image -#define WGL_NV_copy_image 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglCopyImageSubDataNV (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLCOPYIMAGESUBDATANVPROC) (HGLRC hSrcRC, GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, HGLRC hDstRC, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei width, GLsizei height, GLsizei depth); -#endif - -#ifndef WGL_NV_multisample_coverage -#define WGL_NV_multisample_coverage 1 -#endif - -#ifndef WGL_NV_DX_interop -#define WGL_NV_DX_interop 1 -#ifdef WGL_WGLEXT_PROTOTYPES -extern BOOL WINAPI wglDXSetResourceShareHandleNV (void *dxObject, HANDLE shareHandle); -extern HANDLE WINAPI wglDXOpenDeviceNV (void *dxDevice); -extern BOOL WINAPI wglDXCloseDeviceNV (HANDLE hDevice); -extern HANDLE WINAPI wglDXRegisterObjectNV (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access); -extern BOOL WINAPI wglDXUnregisterObjectNV (HANDLE hDevice, HANDLE hObject); -extern BOOL WINAPI wglDXObjectAccessNV (HANDLE hObject, GLenum access); -extern BOOL WINAPI wglDXLockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects); -extern BOOL WINAPI wglDXUnlockObjectsNV (HANDLE hDevice, GLint count, HANDLE *hObjects); -#endif /* WGL_WGLEXT_PROTOTYPES */ -typedef BOOL (WINAPI * PFNWGLDXSETRESOURCESHAREHANDLENVPROC) (void *dxObject, HANDLE shareHandle); -typedef HANDLE (WINAPI * PFNWGLDXOPENDEVICENVPROC) (void *dxDevice); -typedef BOOL (WINAPI * PFNWGLDXCLOSEDEVICENVPROC) (HANDLE hDevice); -typedef HANDLE (WINAPI * PFNWGLDXREGISTEROBJECTNVPROC) (HANDLE hDevice, void *dxObject, GLuint name, GLenum type, GLenum access); -typedef BOOL (WINAPI * PFNWGLDXUNREGISTEROBJECTNVPROC) (HANDLE hDevice, HANDLE hObject); -typedef BOOL (WINAPI * PFNWGLDXOBJECTACCESSNVPROC) (HANDLE hObject, GLenum access); -typedef BOOL (WINAPI * PFNWGLDXLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); -typedef BOOL (WINAPI * PFNWGLDXUNLOCKOBJECTSNVPROC) (HANDLE hDevice, GLint count, HANDLE *hObjects); -#endif - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/python/include/Python-ast.h b/python/include/Python-ast.h deleted file mode 100644 index 3f35bbb6..00000000 --- a/python/include/Python-ast.h +++ /dev/null @@ -1,535 +0,0 @@ -/* File automatically generated by Parser/asdl_c.py. */ - -#include "asdl.h" - -typedef struct _mod *mod_ty; - -typedef struct _stmt *stmt_ty; - -typedef struct _expr *expr_ty; - -typedef enum _expr_context { Load=1, Store=2, Del=3, AugLoad=4, AugStore=5, - Param=6 } expr_context_ty; - -typedef struct _slice *slice_ty; - -typedef enum _boolop { And=1, Or=2 } boolop_ty; - -typedef enum _operator { Add=1, Sub=2, Mult=3, Div=4, Mod=5, Pow=6, LShift=7, - RShift=8, BitOr=9, BitXor=10, BitAnd=11, FloorDiv=12 } - operator_ty; - -typedef enum _unaryop { Invert=1, Not=2, UAdd=3, USub=4 } unaryop_ty; - -typedef enum _cmpop { Eq=1, NotEq=2, Lt=3, LtE=4, Gt=5, GtE=6, Is=7, IsNot=8, - In=9, NotIn=10 } cmpop_ty; - -typedef struct _comprehension *comprehension_ty; - -typedef struct _excepthandler *excepthandler_ty; - -typedef struct _arguments *arguments_ty; - -typedef struct _keyword *keyword_ty; - -typedef struct _alias *alias_ty; - - -enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3, - Suite_kind=4}; -struct _mod { - enum _mod_kind kind; - union { - struct { - asdl_seq *body; - } Module; - - struct { - asdl_seq *body; - } Interactive; - - struct { - expr_ty body; - } Expression; - - struct { - asdl_seq *body; - } Suite; - - } v; -}; - -enum _stmt_kind {FunctionDef_kind=1, ClassDef_kind=2, Return_kind=3, - Delete_kind=4, Assign_kind=5, AugAssign_kind=6, Print_kind=7, - For_kind=8, While_kind=9, If_kind=10, With_kind=11, - Raise_kind=12, TryExcept_kind=13, TryFinally_kind=14, - Assert_kind=15, Import_kind=16, ImportFrom_kind=17, - Exec_kind=18, Global_kind=19, Expr_kind=20, Pass_kind=21, - Break_kind=22, Continue_kind=23}; -struct _stmt { - enum _stmt_kind kind; - union { - struct { - identifier name; - arguments_ty args; - asdl_seq *body; - asdl_seq *decorator_list; - } FunctionDef; - - struct { - identifier name; - asdl_seq *bases; - asdl_seq *body; - asdl_seq *decorator_list; - } ClassDef; - - struct { - expr_ty value; - } Return; - - struct { - asdl_seq *targets; - } Delete; - - struct { - asdl_seq *targets; - expr_ty value; - } Assign; - - struct { - expr_ty target; - operator_ty op; - expr_ty value; - } AugAssign; - - struct { - expr_ty dest; - asdl_seq *values; - bool nl; - } Print; - - struct { - expr_ty target; - expr_ty iter; - asdl_seq *body; - asdl_seq *orelse; - } For; - - struct { - expr_ty test; - asdl_seq *body; - asdl_seq *orelse; - } While; - - struct { - expr_ty test; - asdl_seq *body; - asdl_seq *orelse; - } If; - - struct { - expr_ty context_expr; - expr_ty optional_vars; - asdl_seq *body; - } With; - - struct { - expr_ty type; - expr_ty inst; - expr_ty tback; - } Raise; - - struct { - asdl_seq *body; - asdl_seq *handlers; - asdl_seq *orelse; - } TryExcept; - - struct { - asdl_seq *body; - asdl_seq *finalbody; - } TryFinally; - - struct { - expr_ty test; - expr_ty msg; - } Assert; - - struct { - asdl_seq *names; - } Import; - - struct { - identifier module; - asdl_seq *names; - int level; - } ImportFrom; - - struct { - expr_ty body; - expr_ty globals; - expr_ty locals; - } Exec; - - struct { - asdl_seq *names; - } Global; - - struct { - expr_ty value; - } Expr; - - } v; - int lineno; - int col_offset; -}; - -enum _expr_kind {BoolOp_kind=1, BinOp_kind=2, UnaryOp_kind=3, Lambda_kind=4, - IfExp_kind=5, Dict_kind=6, Set_kind=7, ListComp_kind=8, - SetComp_kind=9, DictComp_kind=10, GeneratorExp_kind=11, - Yield_kind=12, Compare_kind=13, Call_kind=14, Repr_kind=15, - Num_kind=16, Str_kind=17, Attribute_kind=18, - Subscript_kind=19, Name_kind=20, List_kind=21, Tuple_kind=22}; -struct _expr { - enum _expr_kind kind; - union { - struct { - boolop_ty op; - asdl_seq *values; - } BoolOp; - - struct { - expr_ty left; - operator_ty op; - expr_ty right; - } BinOp; - - struct { - unaryop_ty op; - expr_ty operand; - } UnaryOp; - - struct { - arguments_ty args; - expr_ty body; - } Lambda; - - struct { - expr_ty test; - expr_ty body; - expr_ty orelse; - } IfExp; - - struct { - asdl_seq *keys; - asdl_seq *values; - } Dict; - - struct { - asdl_seq *elts; - } Set; - - struct { - expr_ty elt; - asdl_seq *generators; - } ListComp; - - struct { - expr_ty elt; - asdl_seq *generators; - } SetComp; - - struct { - expr_ty key; - expr_ty value; - asdl_seq *generators; - } DictComp; - - struct { - expr_ty elt; - asdl_seq *generators; - } GeneratorExp; - - struct { - expr_ty value; - } Yield; - - struct { - expr_ty left; - asdl_int_seq *ops; - asdl_seq *comparators; - } Compare; - - struct { - expr_ty func; - asdl_seq *args; - asdl_seq *keywords; - expr_ty starargs; - expr_ty kwargs; - } Call; - - struct { - expr_ty value; - } Repr; - - struct { - object n; - } Num; - - struct { - string s; - } Str; - - struct { - expr_ty value; - identifier attr; - expr_context_ty ctx; - } Attribute; - - struct { - expr_ty value; - slice_ty slice; - expr_context_ty ctx; - } Subscript; - - struct { - identifier id; - expr_context_ty ctx; - } Name; - - struct { - asdl_seq *elts; - expr_context_ty ctx; - } List; - - struct { - asdl_seq *elts; - expr_context_ty ctx; - } Tuple; - - } v; - int lineno; - int col_offset; -}; - -enum _slice_kind {Ellipsis_kind=1, Slice_kind=2, ExtSlice_kind=3, Index_kind=4}; -struct _slice { - enum _slice_kind kind; - union { - struct { - expr_ty lower; - expr_ty upper; - expr_ty step; - } Slice; - - struct { - asdl_seq *dims; - } ExtSlice; - - struct { - expr_ty value; - } Index; - - } v; -}; - -struct _comprehension { - expr_ty target; - expr_ty iter; - asdl_seq *ifs; -}; - -enum _excepthandler_kind {ExceptHandler_kind=1}; -struct _excepthandler { - enum _excepthandler_kind kind; - union { - struct { - expr_ty type; - expr_ty name; - asdl_seq *body; - } ExceptHandler; - - } v; - int lineno; - int col_offset; -}; - -struct _arguments { - asdl_seq *args; - identifier vararg; - identifier kwarg; - asdl_seq *defaults; -}; - -struct _keyword { - identifier arg; - expr_ty value; -}; - -struct _alias { - identifier name; - identifier asname; -}; - - -#define Module(a0, a1) _Py_Module(a0, a1) -mod_ty _Py_Module(asdl_seq * body, PyArena *arena); -#define Interactive(a0, a1) _Py_Interactive(a0, a1) -mod_ty _Py_Interactive(asdl_seq * body, PyArena *arena); -#define Expression(a0, a1) _Py_Expression(a0, a1) -mod_ty _Py_Expression(expr_ty body, PyArena *arena); -#define Suite(a0, a1) _Py_Suite(a0, a1) -mod_ty _Py_Suite(asdl_seq * body, PyArena *arena); -#define FunctionDef(a0, a1, a2, a3, a4, a5, a6) _Py_FunctionDef(a0, a1, a2, a3, a4, a5, a6) -stmt_ty _Py_FunctionDef(identifier name, arguments_ty args, asdl_seq * body, - asdl_seq * decorator_list, int lineno, int col_offset, - PyArena *arena); -#define ClassDef(a0, a1, a2, a3, a4, a5, a6) _Py_ClassDef(a0, a1, a2, a3, a4, a5, a6) -stmt_ty _Py_ClassDef(identifier name, asdl_seq * bases, asdl_seq * body, - asdl_seq * decorator_list, int lineno, int col_offset, - PyArena *arena); -#define Return(a0, a1, a2, a3) _Py_Return(a0, a1, a2, a3) -stmt_ty _Py_Return(expr_ty value, int lineno, int col_offset, PyArena *arena); -#define Delete(a0, a1, a2, a3) _Py_Delete(a0, a1, a2, a3) -stmt_ty _Py_Delete(asdl_seq * targets, int lineno, int col_offset, PyArena - *arena); -#define Assign(a0, a1, a2, a3, a4) _Py_Assign(a0, a1, a2, a3, a4) -stmt_ty _Py_Assign(asdl_seq * targets, expr_ty value, int lineno, int - col_offset, PyArena *arena); -#define AugAssign(a0, a1, a2, a3, a4, a5) _Py_AugAssign(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_AugAssign(expr_ty target, operator_ty op, expr_ty value, int - lineno, int col_offset, PyArena *arena); -#define Print(a0, a1, a2, a3, a4, a5) _Py_Print(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_Print(expr_ty dest, asdl_seq * values, bool nl, int lineno, int - col_offset, PyArena *arena); -#define For(a0, a1, a2, a3, a4, a5, a6) _Py_For(a0, a1, a2, a3, a4, a5, a6) -stmt_ty _Py_For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * - orelse, int lineno, int col_offset, PyArena *arena); -#define While(a0, a1, a2, a3, a4, a5) _Py_While(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_While(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, - int col_offset, PyArena *arena); -#define If(a0, a1, a2, a3, a4, a5) _Py_If(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_If(expr_ty test, asdl_seq * body, asdl_seq * orelse, int lineno, - int col_offset, PyArena *arena); -#define With(a0, a1, a2, a3, a4, a5) _Py_With(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_With(expr_ty context_expr, expr_ty optional_vars, asdl_seq * body, - int lineno, int col_offset, PyArena *arena); -#define Raise(a0, a1, a2, a3, a4, a5) _Py_Raise(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_Raise(expr_ty type, expr_ty inst, expr_ty tback, int lineno, int - col_offset, PyArena *arena); -#define TryExcept(a0, a1, a2, a3, a4, a5) _Py_TryExcept(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_TryExcept(asdl_seq * body, asdl_seq * handlers, asdl_seq * orelse, - int lineno, int col_offset, PyArena *arena); -#define TryFinally(a0, a1, a2, a3, a4) _Py_TryFinally(a0, a1, a2, a3, a4) -stmt_ty _Py_TryFinally(asdl_seq * body, asdl_seq * finalbody, int lineno, int - col_offset, PyArena *arena); -#define Assert(a0, a1, a2, a3, a4) _Py_Assert(a0, a1, a2, a3, a4) -stmt_ty _Py_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, - PyArena *arena); -#define Import(a0, a1, a2, a3) _Py_Import(a0, a1, a2, a3) -stmt_ty _Py_Import(asdl_seq * names, int lineno, int col_offset, PyArena - *arena); -#define ImportFrom(a0, a1, a2, a3, a4, a5) _Py_ImportFrom(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_ImportFrom(identifier module, asdl_seq * names, int level, int - lineno, int col_offset, PyArena *arena); -#define Exec(a0, a1, a2, a3, a4, a5) _Py_Exec(a0, a1, a2, a3, a4, a5) -stmt_ty _Py_Exec(expr_ty body, expr_ty globals, expr_ty locals, int lineno, int - col_offset, PyArena *arena); -#define Global(a0, a1, a2, a3) _Py_Global(a0, a1, a2, a3) -stmt_ty _Py_Global(asdl_seq * names, int lineno, int col_offset, PyArena - *arena); -#define Expr(a0, a1, a2, a3) _Py_Expr(a0, a1, a2, a3) -stmt_ty _Py_Expr(expr_ty value, int lineno, int col_offset, PyArena *arena); -#define Pass(a0, a1, a2) _Py_Pass(a0, a1, a2) -stmt_ty _Py_Pass(int lineno, int col_offset, PyArena *arena); -#define Break(a0, a1, a2) _Py_Break(a0, a1, a2) -stmt_ty _Py_Break(int lineno, int col_offset, PyArena *arena); -#define Continue(a0, a1, a2) _Py_Continue(a0, a1, a2) -stmt_ty _Py_Continue(int lineno, int col_offset, PyArena *arena); -#define BoolOp(a0, a1, a2, a3, a4) _Py_BoolOp(a0, a1, a2, a3, a4) -expr_ty _Py_BoolOp(boolop_ty op, asdl_seq * values, int lineno, int col_offset, - PyArena *arena); -#define BinOp(a0, a1, a2, a3, a4, a5) _Py_BinOp(a0, a1, a2, a3, a4, a5) -expr_ty _Py_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int - col_offset, PyArena *arena); -#define UnaryOp(a0, a1, a2, a3, a4) _Py_UnaryOp(a0, a1, a2, a3, a4) -expr_ty _Py_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset, - PyArena *arena); -#define Lambda(a0, a1, a2, a3, a4) _Py_Lambda(a0, a1, a2, a3, a4) -expr_ty _Py_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset, - PyArena *arena); -#define IfExp(a0, a1, a2, a3, a4, a5) _Py_IfExp(a0, a1, a2, a3, a4, a5) -expr_ty _Py_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int - col_offset, PyArena *arena); -#define Dict(a0, a1, a2, a3, a4) _Py_Dict(a0, a1, a2, a3, a4) -expr_ty _Py_Dict(asdl_seq * keys, asdl_seq * values, int lineno, int - col_offset, PyArena *arena); -#define Set(a0, a1, a2, a3) _Py_Set(a0, a1, a2, a3) -expr_ty _Py_Set(asdl_seq * elts, int lineno, int col_offset, PyArena *arena); -#define ListComp(a0, a1, a2, a3, a4) _Py_ListComp(a0, a1, a2, a3, a4) -expr_ty _Py_ListComp(expr_ty elt, asdl_seq * generators, int lineno, int - col_offset, PyArena *arena); -#define SetComp(a0, a1, a2, a3, a4) _Py_SetComp(a0, a1, a2, a3, a4) -expr_ty _Py_SetComp(expr_ty elt, asdl_seq * generators, int lineno, int - col_offset, PyArena *arena); -#define DictComp(a0, a1, a2, a3, a4, a5) _Py_DictComp(a0, a1, a2, a3, a4, a5) -expr_ty _Py_DictComp(expr_ty key, expr_ty value, asdl_seq * generators, int - lineno, int col_offset, PyArena *arena); -#define GeneratorExp(a0, a1, a2, a3, a4) _Py_GeneratorExp(a0, a1, a2, a3, a4) -expr_ty _Py_GeneratorExp(expr_ty elt, asdl_seq * generators, int lineno, int - col_offset, PyArena *arena); -#define Yield(a0, a1, a2, a3) _Py_Yield(a0, a1, a2, a3) -expr_ty _Py_Yield(expr_ty value, int lineno, int col_offset, PyArena *arena); -#define Compare(a0, a1, a2, a3, a4, a5) _Py_Compare(a0, a1, a2, a3, a4, a5) -expr_ty _Py_Compare(expr_ty left, asdl_int_seq * ops, asdl_seq * comparators, - int lineno, int col_offset, PyArena *arena); -#define Call(a0, a1, a2, a3, a4, a5, a6, a7) _Py_Call(a0, a1, a2, a3, a4, a5, a6, a7) -expr_ty _Py_Call(expr_ty func, asdl_seq * args, asdl_seq * keywords, expr_ty - starargs, expr_ty kwargs, int lineno, int col_offset, PyArena - *arena); -#define Repr(a0, a1, a2, a3) _Py_Repr(a0, a1, a2, a3) -expr_ty _Py_Repr(expr_ty value, int lineno, int col_offset, PyArena *arena); -#define Num(a0, a1, a2, a3) _Py_Num(a0, a1, a2, a3) -expr_ty _Py_Num(object n, int lineno, int col_offset, PyArena *arena); -#define Str(a0, a1, a2, a3) _Py_Str(a0, a1, a2, a3) -expr_ty _Py_Str(string s, int lineno, int col_offset, PyArena *arena); -#define Attribute(a0, a1, a2, a3, a4, a5) _Py_Attribute(a0, a1, a2, a3, a4, a5) -expr_ty _Py_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int - lineno, int col_offset, PyArena *arena); -#define Subscript(a0, a1, a2, a3, a4, a5) _Py_Subscript(a0, a1, a2, a3, a4, a5) -expr_ty _Py_Subscript(expr_ty value, slice_ty slice, expr_context_ty ctx, int - lineno, int col_offset, PyArena *arena); -#define Name(a0, a1, a2, a3, a4) _Py_Name(a0, a1, a2, a3, a4) -expr_ty _Py_Name(identifier id, expr_context_ty ctx, int lineno, int - col_offset, PyArena *arena); -#define List(a0, a1, a2, a3, a4) _Py_List(a0, a1, a2, a3, a4) -expr_ty _Py_List(asdl_seq * elts, expr_context_ty ctx, int lineno, int - col_offset, PyArena *arena); -#define Tuple(a0, a1, a2, a3, a4) _Py_Tuple(a0, a1, a2, a3, a4) -expr_ty _Py_Tuple(asdl_seq * elts, expr_context_ty ctx, int lineno, int - col_offset, PyArena *arena); -#define Ellipsis(a0) _Py_Ellipsis(a0) -slice_ty _Py_Ellipsis(PyArena *arena); -#define Slice(a0, a1, a2, a3) _Py_Slice(a0, a1, a2, a3) -slice_ty _Py_Slice(expr_ty lower, expr_ty upper, expr_ty step, PyArena *arena); -#define ExtSlice(a0, a1) _Py_ExtSlice(a0, a1) -slice_ty _Py_ExtSlice(asdl_seq * dims, PyArena *arena); -#define Index(a0, a1) _Py_Index(a0, a1) -slice_ty _Py_Index(expr_ty value, PyArena *arena); -#define comprehension(a0, a1, a2, a3) _Py_comprehension(a0, a1, a2, a3) -comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq * - ifs, PyArena *arena); -#define ExceptHandler(a0, a1, a2, a3, a4, a5) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5) -excepthandler_ty _Py_ExceptHandler(expr_ty type, expr_ty name, asdl_seq * body, - int lineno, int col_offset, PyArena *arena); -#define arguments(a0, a1, a2, a3, a4) _Py_arguments(a0, a1, a2, a3, a4) -arguments_ty _Py_arguments(asdl_seq * args, identifier vararg, identifier - kwarg, asdl_seq * defaults, PyArena *arena); -#define keyword(a0, a1, a2) _Py_keyword(a0, a1, a2) -keyword_ty _Py_keyword(identifier arg, expr_ty value, PyArena *arena); -#define alias(a0, a1, a2) _Py_alias(a0, a1, a2) -alias_ty _Py_alias(identifier name, identifier asname, PyArena *arena); - -PyObject* PyAST_mod2obj(mod_ty t); -mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode); -int PyAST_Check(PyObject* obj); diff --git a/python/include/Python.h b/python/include/Python.h deleted file mode 100644 index 775412b8..00000000 --- a/python/include/Python.h +++ /dev/null @@ -1,178 +0,0 @@ -#ifndef Py_PYTHON_H -#define Py_PYTHON_H -/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */ - -/* Include nearly all Python header files */ - -#include "patchlevel.h" -#include "pyconfig.h" -#include "pymacconfig.h" - -/* Cyclic gc is always enabled, starting with release 2.3a1. Supply the - * old symbol for the benefit of extension modules written before then - * that may be conditionalizing on it. The core doesn't use it anymore. - */ -#ifndef WITH_CYCLE_GC -#define WITH_CYCLE_GC 1 -#endif - -#include - -#ifndef UCHAR_MAX -#error "Something's broken. UCHAR_MAX should be defined in limits.h." -#endif - -#if UCHAR_MAX != 255 -#error "Python's source code assumes C's unsigned char is an 8-bit type." -#endif - -#if defined(__sgi) && defined(WITH_THREAD) && !defined(_SGI_MP_SOURCE) -#define _SGI_MP_SOURCE -#endif - -#include -#ifndef NULL -# error "Python.h requires that stdio.h define NULL." -#endif - -#include -#ifdef HAVE_ERRNO_H -#include -#endif -#include -#ifdef HAVE_UNISTD_H -#include -#endif - -/* For size_t? */ -#ifdef HAVE_STDDEF_H -#include -#endif - -/* CAUTION: Build setups should ensure that NDEBUG is defined on the - * compiler command line when building Python in release mode; else - * assert() calls won't be removed. - */ -#include - -#include "pyport.h" - -/* pyconfig.h or pyport.h may or may not define DL_IMPORT */ -#ifndef DL_IMPORT /* declarations for DLL import/export */ -#define DL_IMPORT(RTYPE) RTYPE -#endif -#ifndef DL_EXPORT /* declarations for DLL import/export */ -#define DL_EXPORT(RTYPE) RTYPE -#endif - -/* Debug-mode build with pymalloc implies PYMALLOC_DEBUG. - * PYMALLOC_DEBUG is in error if pymalloc is not in use. - */ -#if defined(Py_DEBUG) && defined(WITH_PYMALLOC) && !defined(PYMALLOC_DEBUG) -#define PYMALLOC_DEBUG -#endif -#if defined(PYMALLOC_DEBUG) && !defined(WITH_PYMALLOC) -#error "PYMALLOC_DEBUG requires WITH_PYMALLOC" -#endif -#include "pymath.h" -#include "pymem.h" - -#include "object.h" -#include "objimpl.h" - -#include "pydebug.h" - -#include "unicodeobject.h" -#include "intobject.h" -#include "boolobject.h" -#include "longobject.h" -#include "floatobject.h" -#ifndef WITHOUT_COMPLEX -#include "complexobject.h" -#endif -#include "rangeobject.h" -#include "stringobject.h" -#include "memoryobject.h" -#include "bufferobject.h" -#include "bytesobject.h" -#include "bytearrayobject.h" -#include "tupleobject.h" -#include "listobject.h" -#include "dictobject.h" -#include "enumobject.h" -#include "setobject.h" -#include "methodobject.h" -#include "moduleobject.h" -#include "funcobject.h" -#include "classobject.h" -#include "fileobject.h" -#include "cobject.h" -#include "pycapsule.h" -#include "traceback.h" -#include "sliceobject.h" -#include "cellobject.h" -#include "iterobject.h" -#include "genobject.h" -#include "descrobject.h" -#include "warnings.h" -#include "weakrefobject.h" - -#include "codecs.h" -#include "pyerrors.h" - -#include "pystate.h" - -#include "pyarena.h" -#include "modsupport.h" -#include "pythonrun.h" -#include "ceval.h" -#include "sysmodule.h" -#include "intrcheck.h" -#include "import.h" - -#include "abstract.h" - -#include "compile.h" -#include "eval.h" - -#include "pyctype.h" -#include "pystrtod.h" -#include "pystrcmp.h" -#include "dtoa.h" - -/* _Py_Mangle is defined in compile.c */ -PyAPI_FUNC(PyObject*) _Py_Mangle(PyObject *p, PyObject *name); - -/* PyArg_GetInt is deprecated and should not be used, use PyArg_Parse(). */ -#define PyArg_GetInt(v, a) PyArg_Parse((v), "i", (a)) - -/* PyArg_NoArgs should not be necessary. - Set ml_flags in the PyMethodDef to METH_NOARGS. */ -#define PyArg_NoArgs(v) PyArg_Parse(v, "") - -/* Argument must be a char or an int in [-128, 127] or [0, 255]. */ -#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff)) - -#include "pyfpe.h" - -/* These definitions must match corresponding definitions in graminit.h. - There's code in compile.c that checks that they are the same. */ -#define Py_single_input 256 -#define Py_file_input 257 -#define Py_eval_input 258 - -#ifdef HAVE_PTH -/* GNU pth user-space thread support */ -#include -#endif - -/* Define macros for inline documentation. */ -#define PyDoc_VAR(name) static char name[] -#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str) -#ifdef WITH_DOC_STRINGS -#define PyDoc_STR(str) str -#else -#define PyDoc_STR(str) "" -#endif - -#endif /* !Py_PYTHON_H */ diff --git a/python/include/abstract.h b/python/include/abstract.h deleted file mode 100644 index a3774238..00000000 --- a/python/include/abstract.h +++ /dev/null @@ -1,1396 +0,0 @@ -#ifndef Py_ABSTRACTOBJECT_H -#define Py_ABSTRACTOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef PY_SSIZE_T_CLEAN -#define PyObject_CallFunction _PyObject_CallFunction_SizeT -#define PyObject_CallMethod _PyObject_CallMethod_SizeT -#endif - -/* Abstract Object Interface (many thanks to Jim Fulton) */ - -/* - PROPOSAL: A Generic Python Object Interface for Python C Modules - -Problem - - Python modules written in C that must access Python objects must do - so through routines whose interfaces are described by a set of - include files. Unfortunately, these routines vary according to the - object accessed. To use these routines, the C programmer must check - the type of the object being used and must call a routine based on - the object type. For example, to access an element of a sequence, - the programmer must determine whether the sequence is a list or a - tuple: - - if(is_tupleobject(o)) - e=gettupleitem(o,i) - else if(is_listitem(o)) - e=getlistitem(o,i) - - If the programmer wants to get an item from another type of object - that provides sequence behavior, there is no clear way to do it - correctly. - - The persistent programmer may peruse object.h and find that the - _typeobject structure provides a means of invoking up to (currently - about) 41 special operators. So, for example, a routine can get an - item from any object that provides sequence behavior. However, to - use this mechanism, the programmer must make their code dependent on - the current Python implementation. - - Also, certain semantics, especially memory management semantics, may - differ by the type of object being used. Unfortunately, these - semantics are not clearly described in the current include files. - An abstract interface providing more consistent semantics is needed. - -Proposal - - I propose the creation of a standard interface (with an associated - library of routines and/or macros) for generically obtaining the - services of Python objects. This proposal can be viewed as one - components of a Python C interface consisting of several components. - - From the viewpoint of C access to Python services, we have (as - suggested by Guido in off-line discussions): - - - "Very high level layer": two or three functions that let you exec or - eval arbitrary Python code given as a string in a module whose name is - given, passing C values in and getting C values out using - mkvalue/getargs style format strings. This does not require the user - to declare any variables of type "PyObject *". This should be enough - to write a simple application that gets Python code from the user, - execs it, and returns the output or errors. (Error handling must also - be part of this API.) - - - "Abstract objects layer": which is the subject of this proposal. - It has many functions operating on objects, and lest you do many - things from C that you can also write in Python, without going - through the Python parser. - - - "Concrete objects layer": This is the public type-dependent - interface provided by the standard built-in types, such as floats, - strings, and lists. This interface exists and is currently - documented by the collection of include files provided with the - Python distributions. - - From the point of view of Python accessing services provided by C - modules: - - - "Python module interface": this interface consist of the basic - routines used to define modules and their members. Most of the - current extensions-writing guide deals with this interface. - - - "Built-in object interface": this is the interface that a new - built-in type must provide and the mechanisms and rules that a - developer of a new built-in type must use and follow. - - This proposal is a "first-cut" that is intended to spur - discussion. See especially the lists of notes. - - The Python C object interface will provide four protocols: object, - numeric, sequence, and mapping. Each protocol consists of a - collection of related operations. If an operation that is not - provided by a particular type is invoked, then a standard exception, - NotImplementedError is raised with a operation name as an argument. - In addition, for convenience this interface defines a set of - constructors for building objects of built-in types. This is needed - so new objects can be returned from C functions that otherwise treat - objects generically. - -Memory Management - - For all of the functions described in this proposal, if a function - retains a reference to a Python object passed as an argument, then the - function will increase the reference count of the object. It is - unnecessary for the caller to increase the reference count of an - argument in anticipation of the object's retention. - - All Python objects returned from functions should be treated as new - objects. Functions that return objects assume that the caller will - retain a reference and the reference count of the object has already - been incremented to account for this fact. A caller that does not - retain a reference to an object that is returned from a function - must decrement the reference count of the object (using - DECREF(object)) to prevent memory leaks. - - Note that the behavior mentioned here is different from the current - behavior for some objects (e.g. lists and tuples) when certain - type-specific routines are called directly (e.g. setlistitem). The - proposed abstraction layer will provide a consistent memory - management interface, correcting for inconsistent behavior for some - built-in types. - -Protocols - -xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ - -/* Object Protocol: */ - - /* Implemented elsewhere: - - int PyObject_Print(PyObject *o, FILE *fp, int flags); - - Print an object, o, on file, fp. Returns -1 on - error. The flags argument is used to enable certain printing - options. The only option currently supported is Py_Print_RAW. - - (What should be said about Py_Print_RAW?) - - */ - - /* Implemented elsewhere: - - int PyObject_HasAttrString(PyObject *o, char *attr_name); - - Returns 1 if o has the attribute attr_name, and 0 otherwise. - This is equivalent to the Python expression: - hasattr(o,attr_name). - - This function always succeeds. - - */ - - /* Implemented elsewhere: - - PyObject* PyObject_GetAttrString(PyObject *o, char *attr_name); - - Retrieve an attributed named attr_name form object o. - Returns the attribute value on success, or NULL on failure. - This is the equivalent of the Python expression: o.attr_name. - - */ - - /* Implemented elsewhere: - - int PyObject_HasAttr(PyObject *o, PyObject *attr_name); - - Returns 1 if o has the attribute attr_name, and 0 otherwise. - This is equivalent to the Python expression: - hasattr(o,attr_name). - - This function always succeeds. - - */ - - /* Implemented elsewhere: - - PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name); - - Retrieve an attributed named attr_name form object o. - Returns the attribute value on success, or NULL on failure. - This is the equivalent of the Python expression: o.attr_name. - - */ - - - /* Implemented elsewhere: - - int PyObject_SetAttrString(PyObject *o, char *attr_name, PyObject *v); - - Set the value of the attribute named attr_name, for object o, - to the value, v. Returns -1 on failure. This is - the equivalent of the Python statement: o.attr_name=v. - - */ - - /* Implemented elsewhere: - - int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v); - - Set the value of the attribute named attr_name, for object o, - to the value, v. Returns -1 on failure. This is - the equivalent of the Python statement: o.attr_name=v. - - */ - - /* implemented as a macro: - - int PyObject_DelAttrString(PyObject *o, char *attr_name); - - Delete attribute named attr_name, for object o. Returns - -1 on failure. This is the equivalent of the Python - statement: del o.attr_name. - - */ -#define PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A),NULL) - - /* implemented as a macro: - - int PyObject_DelAttr(PyObject *o, PyObject *attr_name); - - Delete attribute named attr_name, for object o. Returns -1 - on failure. This is the equivalent of the Python - statement: del o.attr_name. - - */ -#define PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A),NULL) - - PyAPI_FUNC(int) PyObject_Cmp(PyObject *o1, PyObject *o2, int *result); - - /* - Compare the values of o1 and o2 using a routine provided by - o1, if one exists, otherwise with a routine provided by o2. - The result of the comparison is returned in result. Returns - -1 on failure. This is the equivalent of the Python - statement: result=cmp(o1,o2). - - */ - - /* Implemented elsewhere: - - int PyObject_Compare(PyObject *o1, PyObject *o2); - - Compare the values of o1 and o2 using a routine provided by - o1, if one exists, otherwise with a routine provided by o2. - Returns the result of the comparison on success. On error, - the value returned is undefined. This is equivalent to the - Python expression: cmp(o1,o2). - - */ - - /* Implemented elsewhere: - - PyObject *PyObject_Repr(PyObject *o); - - Compute the string representation of object, o. Returns the - string representation on success, NULL on failure. This is - the equivalent of the Python expression: repr(o). - - Called by the repr() built-in function and by reverse quotes. - - */ - - /* Implemented elsewhere: - - PyObject *PyObject_Str(PyObject *o); - - Compute the string representation of object, o. Returns the - string representation on success, NULL on failure. This is - the equivalent of the Python expression: str(o).) - - Called by the str() built-in function and by the print - statement. - - */ - - /* Implemented elsewhere: - - PyObject *PyObject_Unicode(PyObject *o); - - Compute the unicode representation of object, o. Returns the - unicode representation on success, NULL on failure. This is - the equivalent of the Python expression: unistr(o).) - - Called by the unistr() built-in function. - - */ - - /* Declared elsewhere - - PyAPI_FUNC(int) PyCallable_Check(PyObject *o); - - Determine if the object, o, is callable. Return 1 if the - object is callable and 0 otherwise. - - This function always succeeds. - - */ - - - - PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object, - PyObject *args, PyObject *kw); - - /* - Call a callable Python object, callable_object, with - arguments and keywords arguments. The 'args' argument can not be - NULL, but the 'kw' argument can be NULL. - - */ - - PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object, - PyObject *args); - - /* - Call a callable Python object, callable_object, with - arguments given by the tuple, args. If no arguments are - needed, then args may be NULL. Returns the result of the - call on success, or NULL on failure. This is the equivalent - of the Python expression: apply(o,args). - - */ - - PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object, - char *format, ...); - - /* - Call a callable Python object, callable_object, with a - variable number of C arguments. The C arguments are described - using a mkvalue-style format string. The format may be NULL, - indicating that no arguments are provided. Returns the - result of the call on success, or NULL on failure. This is - the equivalent of the Python expression: apply(o,args). - - */ - - - PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, char *m, - char *format, ...); - - /* - Call the method named m of object o with a variable number of - C arguments. The C arguments are described by a mkvalue - format string. The format may be NULL, indicating that no - arguments are provided. Returns the result of the call on - success, or NULL on failure. This is the equivalent of the - Python expression: o.method(args). - */ - - PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable, - char *format, ...); - PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o, - char *name, - char *format, ...); - - PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable, - ...); - - /* - Call a callable Python object, callable_object, with a - variable number of C arguments. The C arguments are provided - as PyObject * values, terminated by a NULL. Returns the - result of the call on success, or NULL on failure. This is - the equivalent of the Python expression: apply(o,args). - */ - - - PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o, - PyObject *m, ...); - - /* - Call the method named m of object o with a variable number of - C arguments. The C arguments are provided as PyObject * - values, terminated by NULL. Returns the result of the call - on success, or NULL on failure. This is the equivalent of - the Python expression: o.method(args). - */ - - - /* Implemented elsewhere: - - long PyObject_Hash(PyObject *o); - - Compute and return the hash, hash_value, of an object, o. On - failure, return -1. This is the equivalent of the Python - expression: hash(o). - - */ - - - /* Implemented elsewhere: - - int PyObject_IsTrue(PyObject *o); - - Returns 1 if the object, o, is considered to be true, 0 if o is - considered to be false and -1 on failure. This is equivalent to the - Python expression: not not o - - */ - - /* Implemented elsewhere: - - int PyObject_Not(PyObject *o); - - Returns 0 if the object, o, is considered to be true, 1 if o is - considered to be false and -1 on failure. This is equivalent to the - Python expression: not o - - */ - - PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o); - - /* - On success, returns a type object corresponding to the object - type of object o. On failure, returns NULL. This is - equivalent to the Python expression: type(o). - */ - - PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o); - - /* - Return the size of object o. If the object, o, provides - both sequence and mapping protocols, the sequence size is - returned. On error, -1 is returned. This is the equivalent - to the Python expression: len(o). - - */ - - /* For DLL compatibility */ -#undef PyObject_Length - PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o); -#define PyObject_Length PyObject_Size - - PyAPI_FUNC(Py_ssize_t) _PyObject_LengthHint(PyObject *o, Py_ssize_t); - - /* - Guess the size of object o using len(o) or o.__length_hint__(). - If neither of those return a non-negative value, then return the - default value. If one of the calls fails, this function returns -1. - */ - - PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key); - - /* - Return element of o corresponding to the object, key, or NULL - on failure. This is the equivalent of the Python expression: - o[key]. - - */ - - PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v); - - /* - Map the object, key, to the value, v. Returns - -1 on failure. This is the equivalent of the Python - statement: o[key]=v. - */ - - PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, char *key); - - /* - Remove the mapping for object, key, from the object *o. - Returns -1 on failure. This is equivalent to - the Python statement: del o[key]. - */ - - PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key); - - /* - Delete the mapping for key from *o. Returns -1 on failure. - This is the equivalent of the Python statement: del o[key]. - */ - - PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj, - const char **buffer, - Py_ssize_t *buffer_len); - - /* - Takes an arbitrary object which must support the (character, - single segment) buffer interface and returns a pointer to a - read-only memory location useable as character based input - for subsequent processing. - - 0 is returned on success. buffer and buffer_len are only - set in case no error occurs. Otherwise, -1 is returned and - an exception set. - - */ - - PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj); - - /* - Checks whether an arbitrary object supports the (character, - single segment) buffer interface. Returns 1 on success, 0 - on failure. - - */ - - PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj, - const void **buffer, - Py_ssize_t *buffer_len); - - /* - Same as PyObject_AsCharBuffer() except that this API expects - (readable, single segment) buffer interface and returns a - pointer to a read-only memory location which can contain - arbitrary data. - - 0 is returned on success. buffer and buffer_len are only - set in case no error occurs. Otherwise, -1 is returned and - an exception set. - - */ - - PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj, - void **buffer, - Py_ssize_t *buffer_len); - - /* - Takes an arbitrary object which must support the (writeable, - single segment) buffer interface and returns a pointer to a - writeable memory location in buffer of size buffer_len. - - 0 is returned on success. buffer and buffer_len are only - set in case no error occurs. Otherwise, -1 is returned and - an exception set. - - */ - - /* new buffer API */ - -#define PyObject_CheckBuffer(obj) \ - (((obj)->ob_type->tp_as_buffer != NULL) && \ - (PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_NEWBUFFER)) && \ - ((obj)->ob_type->tp_as_buffer->bf_getbuffer != NULL)) - - /* Return 1 if the getbuffer function is available, otherwise - return 0 */ - - PyAPI_FUNC(int) PyObject_GetBuffer(PyObject *obj, Py_buffer *view, - int flags); - - /* This is a C-API version of the getbuffer function call. It checks - to make sure object has the required function pointer and issues the - call. Returns -1 and raises an error on failure and returns 0 on - success - */ - - - PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices); - - /* Get the memory area pointed to by the indices for the buffer given. - Note that view->ndim is the assumed size of indices - */ - - PyAPI_FUNC(int) PyBuffer_SizeFromFormat(const char *); - - /* Return the implied itemsize of the data-format area from a - struct-style description */ - - - - PyAPI_FUNC(int) PyBuffer_ToContiguous(void *buf, Py_buffer *view, - Py_ssize_t len, char fort); - - PyAPI_FUNC(int) PyBuffer_FromContiguous(Py_buffer *view, void *buf, - Py_ssize_t len, char fort); - - - /* Copy len bytes of data from the contiguous chunk of memory - pointed to by buf into the buffer exported by obj. Return - 0 on success and return -1 and raise a PyBuffer_Error on - error (i.e. the object does not have a buffer interface or - it is not working). - - If fort is 'F' and the object is multi-dimensional, - then the data will be copied into the array in - Fortran-style (first dimension varies the fastest). If - fort is 'C', then the data will be copied into the array - in C-style (last dimension varies the fastest). If fort - is 'A', then it does not matter and the copy will be made - in whatever way is more efficient. - - */ - - PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src); - - /* Copy the data from the src buffer to the buffer of destination - */ - - PyAPI_FUNC(int) PyBuffer_IsContiguous(Py_buffer *view, char fort); - - - PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims, - Py_ssize_t *shape, - Py_ssize_t *strides, - int itemsize, - char fort); - - /* Fill the strides array with byte-strides of a contiguous - (Fortran-style if fort is 'F' or C-style otherwise) - array of the given shape with the given number of bytes - per element. - */ - - PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf, - Py_ssize_t len, int readonly, - int flags); - - /* Fills in a buffer-info structure correctly for an exporter - that can only share a contiguous chunk of memory of - "unsigned bytes" of the given length. Returns 0 on success - and -1 (with raising an error) on error. - */ - - PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view); - - /* Releases a Py_buffer obtained from getbuffer ParseTuple's s*. - */ - - PyAPI_FUNC(PyObject *) PyObject_Format(PyObject* obj, - PyObject *format_spec); - /* - Takes an arbitrary object and returns the result of - calling obj.__format__(format_spec). - */ - -/* Iterators */ - - PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *); - /* Takes an object and returns an iterator for it. - This is typically a new iterator but if the argument - is an iterator, this returns itself. */ - -#define PyIter_Check(obj) \ - (PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_ITER) && \ - (obj)->ob_type->tp_iternext != NULL && \ - (obj)->ob_type->tp_iternext != &_PyObject_NextNotImplemented) - - PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *); - /* Takes an iterator object and calls its tp_iternext slot, - returning the next value. If the iterator is exhausted, - this returns NULL without setting an exception. - NULL with an exception means an error occurred. */ - -/* Number Protocol:*/ - - PyAPI_FUNC(int) PyNumber_Check(PyObject *o); - - /* - Returns 1 if the object, o, provides numeric protocols, and - false otherwise. - - This function always succeeds. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2); - - /* - Returns the result of adding o1 and o2, or null on failure. - This is the equivalent of the Python expression: o1+o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2); - - /* - Returns the result of subtracting o2 from o1, or null on - failure. This is the equivalent of the Python expression: - o1-o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2); - - /* - Returns the result of multiplying o1 and o2, or null on - failure. This is the equivalent of the Python expression: - o1*o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Divide(PyObject *o1, PyObject *o2); - - /* - Returns the result of dividing o1 by o2, or null on failure. - This is the equivalent of the Python expression: o1/o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2); - - /* - Returns the result of dividing o1 by o2 giving an integral result, - or null on failure. - This is the equivalent of the Python expression: o1//o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2); - - /* - Returns the result of dividing o1 by o2 giving a float result, - or null on failure. - This is the equivalent of the Python expression: o1/o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2); - - /* - Returns the remainder of dividing o1 by o2, or null on - failure. This is the equivalent of the Python expression: - o1%o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2); - - /* - See the built-in function divmod. Returns NULL on failure. - This is the equivalent of the Python expression: - divmod(o1,o2). - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2, - PyObject *o3); - - /* - See the built-in function pow. Returns NULL on failure. - This is the equivalent of the Python expression: - pow(o1,o2,o3), where o3 is optional. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o); - - /* - Returns the negation of o on success, or null on failure. - This is the equivalent of the Python expression: -o. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o); - - /* - Returns the (what?) of o on success, or NULL on failure. - This is the equivalent of the Python expression: +o. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o); - - /* - Returns the absolute value of o, or null on failure. This is - the equivalent of the Python expression: abs(o). - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o); - - /* - Returns the bitwise negation of o on success, or NULL on - failure. This is the equivalent of the Python expression: - ~o. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2); - - /* - Returns the result of left shifting o1 by o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1 << o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2); - - /* - Returns the result of right shifting o1 by o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1 >> o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2); - - /* - Returns the result of bitwise and of o1 and o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1&o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2); - - /* - Returns the bitwise exclusive or of o1 by o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1^o2. - - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2); - - /* - Returns the result of bitwise or on o1 and o2 on success, or - NULL on failure. This is the equivalent of the Python - expression: o1|o2. - - */ - - /* Implemented elsewhere: - - int PyNumber_Coerce(PyObject **p1, PyObject **p2); - - This function takes the addresses of two variables of type - PyObject*. - - If the objects pointed to by *p1 and *p2 have the same type, - increment their reference count and return 0 (success). - If the objects can be converted to a common numeric type, - replace *p1 and *p2 by their converted value (with 'new' - reference counts), and return 0. - If no conversion is possible, or if some other error occurs, - return -1 (failure) and don't increment the reference counts. - The call PyNumber_Coerce(&o1, &o2) is equivalent to the Python - statement o1, o2 = coerce(o1, o2). - - */ - -#define PyIndex_Check(obj) \ - ((obj)->ob_type->tp_as_number != NULL && \ - PyType_HasFeature((obj)->ob_type, Py_TPFLAGS_HAVE_INDEX) && \ - (obj)->ob_type->tp_as_number->nb_index != NULL) - - PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o); - - /* - Returns the object converted to a Python long or int - or NULL with an error raised on failure. - */ - - PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc); - - /* - Returns the Integral instance converted to an int. The - instance is expected to be int or long or have an __int__ - method. Steals integral's reference. error_format will be - used to create the TypeError if integral isn't actually an - Integral instance. error_format should be a format string - that can accept a char* naming integral's type. - */ - - PyAPI_FUNC(PyObject *) _PyNumber_ConvertIntegralToInt( - PyObject *integral, - const char* error_format); - - /* - Returns the object converted to Py_ssize_t by going through - PyNumber_Index first. If an overflow error occurs while - converting the int-or-long to Py_ssize_t, then the second argument - is the error-type to return. If it is NULL, then the overflow error - is cleared and the value is clipped. - */ - - PyAPI_FUNC(PyObject *) PyNumber_Int(PyObject *o); - - /* - Returns the o converted to an integer object on success, or - NULL on failure. This is the equivalent of the Python - expression: int(o). - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o); - - /* - Returns the o converted to a long integer object on success, - or NULL on failure. This is the equivalent of the Python - expression: long(o). - - */ - - PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o); - - /* - Returns the o converted to a float object on success, or NULL - on failure. This is the equivalent of the Python expression: - float(o). - */ - -/* In-place variants of (some of) the above number protocol functions */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2); - - /* - Returns the result of adding o2 to o1, possibly in-place, or null - on failure. This is the equivalent of the Python expression: - o1 += o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2); - - /* - Returns the result of subtracting o2 from o1, possibly in-place or - null on failure. This is the equivalent of the Python expression: - o1 -= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2); - - /* - Returns the result of multiplying o1 by o2, possibly in-place, or - null on failure. This is the equivalent of the Python expression: - o1 *= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceDivide(PyObject *o1, PyObject *o2); - - /* - Returns the result of dividing o1 by o2, possibly in-place, or null - on failure. This is the equivalent of the Python expression: - o1 /= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1, - PyObject *o2); - - /* - Returns the result of dividing o1 by o2 giving an integral result, - possibly in-place, or null on failure. - This is the equivalent of the Python expression: - o1 /= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1, - PyObject *o2); - - /* - Returns the result of dividing o1 by o2 giving a float result, - possibly in-place, or null on failure. - This is the equivalent of the Python expression: - o1 /= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2); - - /* - Returns the remainder of dividing o1 by o2, possibly in-place, or - null on failure. This is the equivalent of the Python expression: - o1 %= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2, - PyObject *o3); - - /* - Returns the result of raising o1 to the power of o2, possibly - in-place, or null on failure. This is the equivalent of the Python - expression: o1 **= o2, or pow(o1, o2, o3) if o3 is present. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2); - - /* - Returns the result of left shifting o1 by o2, possibly in-place, or - null on failure. This is the equivalent of the Python expression: - o1 <<= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2); - - /* - Returns the result of right shifting o1 by o2, possibly in-place or - null on failure. This is the equivalent of the Python expression: - o1 >>= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2); - - /* - Returns the result of bitwise and of o1 and o2, possibly in-place, - or null on failure. This is the equivalent of the Python - expression: o1 &= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2); - - /* - Returns the bitwise exclusive or of o1 by o2, possibly in-place, or - null on failure. This is the equivalent of the Python expression: - o1 ^= o2. - - */ - - PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2); - - /* - Returns the result of bitwise or of o1 and o2, possibly in-place, - or null on failure. This is the equivalent of the Python - expression: o1 |= o2. - - */ - - - PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base); - - /* - Returns the integer n converted to a string with a base, with a base - marker of 0b, 0o or 0x prefixed if applicable. - If n is not an int object, it is converted with PyNumber_Index first. - */ - - -/* Sequence protocol:*/ - - PyAPI_FUNC(int) PySequence_Check(PyObject *o); - - /* - Return 1 if the object provides sequence protocol, and zero - otherwise. - - This function always succeeds. - - */ - - PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o); - - /* - Return the size of sequence object o, or -1 on failure. - - */ - - /* For DLL compatibility */ -#undef PySequence_Length - PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o); -#define PySequence_Length PySequence_Size - - - PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2); - - /* - Return the concatenation of o1 and o2 on success, and NULL on - failure. This is the equivalent of the Python - expression: o1+o2. - - */ - - PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count); - - /* - Return the result of repeating sequence object o count times, - or NULL on failure. This is the equivalent of the Python - expression: o1*count. - - */ - - PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i); - - /* - Return the ith element of o, or NULL on failure. This is the - equivalent of the Python expression: o[i]. - */ - - PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2); - - /* - Return the slice of sequence object o between i1 and i2, or - NULL on failure. This is the equivalent of the Python - expression: o[i1:i2]. - - */ - - PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v); - - /* - Assign object v to the ith element of o. Returns - -1 on failure. This is the equivalent of the Python - statement: o[i]=v. - - */ - - PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i); - - /* - Delete the ith element of object v. Returns - -1 on failure. This is the equivalent of the Python - statement: del o[i]. - */ - - PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2, - PyObject *v); - - /* - Assign the sequence object, v, to the slice in sequence - object, o, from i1 to i2. Returns -1 on failure. This is the - equivalent of the Python statement: o[i1:i2]=v. - */ - - PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2); - - /* - Delete the slice in sequence object, o, from i1 to i2. - Returns -1 on failure. This is the equivalent of the Python - statement: del o[i1:i2]. - */ - - PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o); - - /* - Returns the sequence, o, as a tuple on success, and NULL on failure. - This is equivalent to the Python expression: tuple(o) - */ - - - PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o); - /* - Returns the sequence, o, as a list on success, and NULL on failure. - This is equivalent to the Python expression: list(o) - */ - - PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m); - /* - Returns the sequence, o, as a tuple, unless it's already a - tuple or list. Use PySequence_Fast_GET_ITEM to access the - members of this list, and PySequence_Fast_GET_SIZE to get its length. - - Returns NULL on failure. If the object does not support iteration, - raises a TypeError exception with m as the message text. - */ - -#define PySequence_Fast_GET_SIZE(o) \ - (PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o)) - /* - Return the size of o, assuming that o was returned by - PySequence_Fast and is not NULL. - */ - -#define PySequence_Fast_GET_ITEM(o, i)\ - (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i)) - /* - Return the ith element of o, assuming that o was returned by - PySequence_Fast, and that i is within bounds. - */ - -#define PySequence_ITEM(o, i)\ - ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) ) - /* Assume tp_as_sequence and sq_item exist and that i does not - need to be corrected for a negative index - */ - -#define PySequence_Fast_ITEMS(sf) \ - (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \ - : ((PyTupleObject *)(sf))->ob_item) - /* Return a pointer to the underlying item array for - an object retured by PySequence_Fast */ - - PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value); - - /* - Return the number of occurrences on value on o, that is, - return the number of keys for which o[key]==value. On - failure, return -1. This is equivalent to the Python - expression: o.count(value). - */ - - PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob); - /* - Return -1 if error; 1 if ob in seq; 0 if ob not in seq. - Use __contains__ if possible, else _PySequence_IterSearch(). - */ - -#define PY_ITERSEARCH_COUNT 1 -#define PY_ITERSEARCH_INDEX 2 -#define PY_ITERSEARCH_CONTAINS 3 - PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq, - PyObject *obj, int operation); - /* - Iterate over seq. Result depends on the operation: - PY_ITERSEARCH_COUNT: return # of times obj appears in seq; -1 if - error. - PY_ITERSEARCH_INDEX: return 0-based index of first occurrence of - obj in seq; set ValueError and return -1 if none found; - also return -1 on error. - PY_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on - error. - */ - -/* For DLL-level backwards compatibility */ -#undef PySequence_In - PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value); - -/* For source-level backwards compatibility */ -#define PySequence_In PySequence_Contains - - /* - Determine if o contains value. If an item in o is equal to - X, return 1, otherwise return 0. On error, return -1. This - is equivalent to the Python expression: value in o. - */ - - PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value); - - /* - Return the first index for which o[i]=value. On error, - return -1. This is equivalent to the Python - expression: o.index(value). - */ - -/* In-place versions of some of the above Sequence functions. */ - - PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2); - - /* - Append o2 to o1, in-place when possible. Return the resulting - object, which could be o1, or NULL on failure. This is the - equivalent of the Python expression: o1 += o2. - - */ - - PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count); - - /* - Repeat o1 by count, in-place when possible. Return the resulting - object, which could be o1, or NULL on failure. This is the - equivalent of the Python expression: o1 *= count. - - */ - -/* Mapping protocol:*/ - - PyAPI_FUNC(int) PyMapping_Check(PyObject *o); - - /* - Return 1 if the object provides mapping protocol, and zero - otherwise. - - This function always succeeds. - */ - - PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o); - - /* - Returns the number of keys in object o on success, and -1 on - failure. For objects that do not provide sequence protocol, - this is equivalent to the Python expression: len(o). - */ - - /* For DLL compatibility */ -#undef PyMapping_Length - PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o); -#define PyMapping_Length PyMapping_Size - - - /* implemented as a macro: - - int PyMapping_DelItemString(PyObject *o, char *key); - - Remove the mapping for object, key, from the object *o. - Returns -1 on failure. This is equivalent to - the Python statement: del o[key]. - */ -#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K)) - - /* implemented as a macro: - - int PyMapping_DelItem(PyObject *o, PyObject *key); - - Remove the mapping for object, key, from the object *o. - Returns -1 on failure. This is equivalent to - the Python statement: del o[key]. - */ -#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K)) - - PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, char *key); - - /* - On success, return 1 if the mapping object has the key, key, - and 0 otherwise. This is equivalent to the Python expression: - o.has_key(key). - - This function always succeeds. - */ - - PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key); - - /* - Return 1 if the mapping object has the key, key, - and 0 otherwise. This is equivalent to the Python expression: - o.has_key(key). - - This function always succeeds. - - */ - - /* Implemented as macro: - - PyObject *PyMapping_Keys(PyObject *o); - - On success, return a list of the keys in object o. On - failure, return NULL. This is equivalent to the Python - expression: o.keys(). - */ -#define PyMapping_Keys(O) PyObject_CallMethod(O,"keys",NULL) - - /* Implemented as macro: - - PyObject *PyMapping_Values(PyObject *o); - - On success, return a list of the values in object o. On - failure, return NULL. This is equivalent to the Python - expression: o.values(). - */ -#define PyMapping_Values(O) PyObject_CallMethod(O,"values",NULL) - - /* Implemented as macro: - - PyObject *PyMapping_Items(PyObject *o); - - On success, return a list of the items in object o, where - each item is a tuple containing a key-value pair. On - failure, return NULL. This is equivalent to the Python - expression: o.items(). - - */ -#define PyMapping_Items(O) PyObject_CallMethod(O,"items",NULL) - - PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o, char *key); - - /* - Return element of o corresponding to the object, key, or NULL - on failure. This is the equivalent of the Python expression: - o[key]. - */ - - PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, char *key, - PyObject *value); - - /* - Map the object, key, to the value, v. Returns - -1 on failure. This is the equivalent of the Python - statement: o[key]=v. - */ - - -PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass); - /* isinstance(object, typeorclass) */ - -PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass); - /* issubclass(object, typeorclass) */ - - -PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls); - -PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls); - - -/* For internal use by buffer API functions */ -PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index, - const Py_ssize_t *shape); -PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index, - const Py_ssize_t *shape); - - -#ifdef __cplusplus -} -#endif -#endif /* Py_ABSTRACTOBJECT_H */ diff --git a/python/include/asdl.h b/python/include/asdl.h deleted file mode 100644 index 84e837e7..00000000 --- a/python/include/asdl.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef Py_ASDL_H -#define Py_ASDL_H - -typedef PyObject * identifier; -typedef PyObject * string; -typedef PyObject * object; - -#ifndef __cplusplus -typedef enum {false, true} bool; -#endif - -/* It would be nice if the code generated by asdl_c.py was completely - independent of Python, but it is a goal the requires too much work - at this stage. So, for example, I'll represent identifiers as - interned Python strings. -*/ - -/* XXX A sequence should be typed so that its use can be typechecked. */ - -typedef struct { - int size; - void *elements[1]; -} asdl_seq; - -typedef struct { - int size; - int elements[1]; -} asdl_int_seq; - -asdl_seq *asdl_seq_new(int size, PyArena *arena); -asdl_int_seq *asdl_int_seq_new(int size, PyArena *arena); - -#define asdl_seq_GET(S, I) (S)->elements[(I)] -#define asdl_seq_LEN(S) ((S) == NULL ? 0 : (S)->size) -#ifdef Py_DEBUG -#define asdl_seq_SET(S, I, V) { \ - int _asdl_i = (I); \ - assert((S) && _asdl_i < (S)->size); \ - (S)->elements[_asdl_i] = (V); \ -} -#else -#define asdl_seq_SET(S, I, V) (S)->elements[I] = (V) -#endif - -#endif /* !Py_ASDL_H */ diff --git a/python/include/ast.h b/python/include/ast.h deleted file mode 100644 index cc14b7fd..00000000 --- a/python/include/ast.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef Py_AST_H -#define Py_AST_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(mod_ty) PyAST_FromNode(const node *, PyCompilerFlags *flags, - const char *, PyArena *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_AST_H */ diff --git a/python/include/bitset.h b/python/include/bitset.h deleted file mode 100644 index faeb4191..00000000 --- a/python/include/bitset.h +++ /dev/null @@ -1,32 +0,0 @@ - -#ifndef Py_BITSET_H -#define Py_BITSET_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Bitset interface */ - -#define BYTE char - -typedef BYTE *bitset; - -bitset newbitset(int nbits); -void delbitset(bitset bs); -#define testbit(ss, ibit) (((ss)[BIT2BYTE(ibit)] & BIT2MASK(ibit)) != 0) -int addbit(bitset bs, int ibit); /* Returns 0 if already set */ -int samebitset(bitset bs1, bitset bs2, int nbits); -void mergebitset(bitset bs1, bitset bs2, int nbits); - -#define BITSPERBYTE (8*sizeof(BYTE)) -#define NBYTES(nbits) (((nbits) + BITSPERBYTE - 1) / BITSPERBYTE) - -#define BIT2BYTE(ibit) ((ibit) / BITSPERBYTE) -#define BIT2SHIFT(ibit) ((ibit) % BITSPERBYTE) -#define BIT2MASK(ibit) (1 << BIT2SHIFT(ibit)) -#define BYTE2BIT(ibyte) ((ibyte) * BITSPERBYTE) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_BITSET_H */ diff --git a/python/include/boolobject.h b/python/include/boolobject.h deleted file mode 100644 index 74e854f7..00000000 --- a/python/include/boolobject.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Boolean object interface */ - -#ifndef Py_BOOLOBJECT_H -#define Py_BOOLOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -typedef PyIntObject PyBoolObject; - -PyAPI_DATA(PyTypeObject) PyBool_Type; - -#define PyBool_Check(x) (Py_TYPE(x) == &PyBool_Type) - -/* Py_False and Py_True are the only two bools in existence. -Don't forget to apply Py_INCREF() when returning either!!! */ - -/* Don't use these directly */ -PyAPI_DATA(PyIntObject) _Py_ZeroStruct, _Py_TrueStruct; - -/* Use these macros */ -#define Py_False ((PyObject *) &_Py_ZeroStruct) -#define Py_True ((PyObject *) &_Py_TrueStruct) - -/* Macros for returning Py_True or Py_False, respectively */ -#define Py_RETURN_TRUE return Py_INCREF(Py_True), Py_True -#define Py_RETURN_FALSE return Py_INCREF(Py_False), Py_False - -/* Function to return a bool from a C long */ -PyAPI_FUNC(PyObject *) PyBool_FromLong(long); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_BOOLOBJECT_H */ diff --git a/python/include/bufferobject.h b/python/include/bufferobject.h deleted file mode 100644 index 6dd83458..00000000 --- a/python/include/bufferobject.h +++ /dev/null @@ -1,33 +0,0 @@ - -/* Buffer object interface */ - -/* Note: the object's structure is private */ - -#ifndef Py_BUFFEROBJECT_H -#define Py_BUFFEROBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -PyAPI_DATA(PyTypeObject) PyBuffer_Type; - -#define PyBuffer_Check(op) (Py_TYPE(op) == &PyBuffer_Type) - -#define Py_END_OF_BUFFER (-1) - -PyAPI_FUNC(PyObject *) PyBuffer_FromObject(PyObject *base, - Py_ssize_t offset, Py_ssize_t size); -PyAPI_FUNC(PyObject *) PyBuffer_FromReadWriteObject(PyObject *base, - Py_ssize_t offset, - Py_ssize_t size); - -PyAPI_FUNC(PyObject *) PyBuffer_FromMemory(void *ptr, Py_ssize_t size); -PyAPI_FUNC(PyObject *) PyBuffer_FromReadWriteMemory(void *ptr, Py_ssize_t size); - -PyAPI_FUNC(PyObject *) PyBuffer_New(Py_ssize_t size); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_BUFFEROBJECT_H */ diff --git a/python/include/bytearrayobject.h b/python/include/bytearrayobject.h deleted file mode 100644 index e1281a62..00000000 --- a/python/include/bytearrayobject.h +++ /dev/null @@ -1,57 +0,0 @@ -/* ByteArray object interface */ - -#ifndef Py_BYTEARRAYOBJECT_H -#define Py_BYTEARRAYOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/* Type PyByteArrayObject represents a mutable array of bytes. - * The Python API is that of a sequence; - * the bytes are mapped to ints in [0, 256). - * Bytes are not characters; they may be used to encode characters. - * The only way to go between bytes and str/unicode is via encoding - * and decoding. - * For the convenience of C programmers, the bytes type is considered - * to contain a char pointer, not an unsigned char pointer. - */ - -/* Object layout */ -typedef struct { - PyObject_VAR_HEAD - /* XXX(nnorwitz): should ob_exports be Py_ssize_t? */ - int ob_exports; /* how many buffer exports */ - Py_ssize_t ob_alloc; /* How many bytes allocated */ - char *ob_bytes; -} PyByteArrayObject; - -/* Type object */ -PyAPI_DATA(PyTypeObject) PyByteArray_Type; -PyAPI_DATA(PyTypeObject) PyByteArrayIter_Type; - -/* Type check macros */ -#define PyByteArray_Check(self) PyObject_TypeCheck(self, &PyByteArray_Type) -#define PyByteArray_CheckExact(self) (Py_TYPE(self) == &PyByteArray_Type) - -/* Direct API functions */ -PyAPI_FUNC(PyObject *) PyByteArray_FromObject(PyObject *); -PyAPI_FUNC(PyObject *) PyByteArray_Concat(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyByteArray_FromStringAndSize(const char *, Py_ssize_t); -PyAPI_FUNC(Py_ssize_t) PyByteArray_Size(PyObject *); -PyAPI_FUNC(char *) PyByteArray_AsString(PyObject *); -PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t); - -/* Macros, trading safety for speed */ -#define PyByteArray_AS_STRING(self) \ - (assert(PyByteArray_Check(self)), \ - Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_bytes : _PyByteArray_empty_string) -#define PyByteArray_GET_SIZE(self) (assert(PyByteArray_Check(self)),Py_SIZE(self)) - -PyAPI_DATA(char) _PyByteArray_empty_string[]; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_BYTEARRAYOBJECT_H */ diff --git a/python/include/bytes_methods.h b/python/include/bytes_methods.h deleted file mode 100644 index 41256662..00000000 --- a/python/include/bytes_methods.h +++ /dev/null @@ -1,75 +0,0 @@ -#ifndef Py_BYTES_CTYPE_H -#define Py_BYTES_CTYPE_H - -/* - * The internal implementation behind PyString (bytes) and PyBytes (buffer) - * methods of the given names, they operate on ASCII byte strings. - */ -extern PyObject* _Py_bytes_isspace(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_isalpha(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_isalnum(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_isdigit(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_islower(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_isupper(const char *cptr, Py_ssize_t len); -extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len); - -/* These store their len sized answer in the given preallocated *result arg. */ -extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len); -extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len); -extern void _Py_bytes_title(char *result, char *s, Py_ssize_t len); -extern void _Py_bytes_capitalize(char *result, char *s, Py_ssize_t len); -extern void _Py_bytes_swapcase(char *result, char *s, Py_ssize_t len); - -/* Shared __doc__ strings. */ -extern const char _Py_isspace__doc__[]; -extern const char _Py_isalpha__doc__[]; -extern const char _Py_isalnum__doc__[]; -extern const char _Py_isdigit__doc__[]; -extern const char _Py_islower__doc__[]; -extern const char _Py_isupper__doc__[]; -extern const char _Py_istitle__doc__[]; -extern const char _Py_lower__doc__[]; -extern const char _Py_upper__doc__[]; -extern const char _Py_title__doc__[]; -extern const char _Py_capitalize__doc__[]; -extern const char _Py_swapcase__doc__[]; - -/* These are left in for backward compatibility and will be removed - in 2.8/3.2 */ -#define ISLOWER(c) Py_ISLOWER(c) -#define ISUPPER(c) Py_ISUPPER(c) -#define ISALPHA(c) Py_ISALPHA(c) -#define ISDIGIT(c) Py_ISDIGIT(c) -#define ISXDIGIT(c) Py_ISXDIGIT(c) -#define ISALNUM(c) Py_ISALNUM(c) -#define ISSPACE(c) Py_ISSPACE(c) - -#undef islower -#define islower(c) undefined_islower(c) -#undef isupper -#define isupper(c) undefined_isupper(c) -#undef isalpha -#define isalpha(c) undefined_isalpha(c) -#undef isdigit -#define isdigit(c) undefined_isdigit(c) -#undef isxdigit -#define isxdigit(c) undefined_isxdigit(c) -#undef isalnum -#define isalnum(c) undefined_isalnum(c) -#undef isspace -#define isspace(c) undefined_isspace(c) - -/* These are left in for backward compatibility and will be removed - in 2.8/3.2 */ -#define TOLOWER(c) Py_TOLOWER(c) -#define TOUPPER(c) Py_TOUPPER(c) - -#undef tolower -#define tolower(c) undefined_tolower(c) -#undef toupper -#define toupper(c) undefined_toupper(c) - -/* this is needed because some docs are shared from the .o, not static */ -#define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str) - -#endif /* !Py_BYTES_CTYPE_H */ diff --git a/python/include/bytesobject.h b/python/include/bytesobject.h deleted file mode 100644 index 1083da9c..00000000 --- a/python/include/bytesobject.h +++ /dev/null @@ -1,27 +0,0 @@ -#define PyBytesObject PyStringObject -#define PyBytes_Type PyString_Type - -#define PyBytes_Check PyString_Check -#define PyBytes_CheckExact PyString_CheckExact -#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED -#define PyBytes_AS_STRING PyString_AS_STRING -#define PyBytes_GET_SIZE PyString_GET_SIZE -#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS - -#define PyBytes_FromStringAndSize PyString_FromStringAndSize -#define PyBytes_FromString PyString_FromString -#define PyBytes_FromFormatV PyString_FromFormatV -#define PyBytes_FromFormat PyString_FromFormat -#define PyBytes_Size PyString_Size -#define PyBytes_AsString PyString_AsString -#define PyBytes_Repr PyString_Repr -#define PyBytes_Concat PyString_Concat -#define PyBytes_ConcatAndDel PyString_ConcatAndDel -#define _PyBytes_Resize _PyString_Resize -#define _PyBytes_Eq _PyString_Eq -#define PyBytes_Format PyString_Format -#define _PyBytes_FormatLong _PyString_FormatLong -#define PyBytes_DecodeEscape PyString_DecodeEscape -#define _PyBytes_Join _PyString_Join -#define PyBytes_AsStringAndSize PyString_AsStringAndSize -#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping diff --git a/python/include/cStringIO.h b/python/include/cStringIO.h deleted file mode 100644 index 6ca44a83..00000000 --- a/python/include/cStringIO.h +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef Py_CSTRINGIO_H -#define Py_CSTRINGIO_H -#ifdef __cplusplus -extern "C" { -#endif -/* - - This header provides access to cStringIO objects from C. - Functions are provided for calling cStringIO objects and - macros are provided for testing whether you have cStringIO - objects. - - Before calling any of the functions or macros, you must initialize - the routines with: - - PycString_IMPORT - - This would typically be done in your init function. - -*/ - -#define PycStringIO_CAPSULE_NAME "cStringIO.cStringIO_CAPI" - -#define PycString_IMPORT \ - PycStringIO = ((struct PycStringIO_CAPI*)PyCapsule_Import(\ - PycStringIO_CAPSULE_NAME, 0)) - -/* Basic functions to manipulate cStringIO objects from C */ - -static struct PycStringIO_CAPI { - - /* Read a string from an input object. If the last argument - is -1, the remainder will be read. - */ - int(*cread)(PyObject *, char **, Py_ssize_t); - - /* Read a line from an input object. Returns the length of the read - line as an int and a pointer inside the object buffer as char** (so - the caller doesn't have to provide its own buffer as destination). - */ - int(*creadline)(PyObject *, char **); - - /* Write a string to an output object*/ - int(*cwrite)(PyObject *, const char *, Py_ssize_t); - - /* Get the output object as a Python string (returns new reference). */ - PyObject *(*cgetvalue)(PyObject *); - - /* Create a new output object */ - PyObject *(*NewOutput)(int); - - /* Create an input object from a Python string - (copies the Python string reference). - */ - PyObject *(*NewInput)(PyObject *); - - /* The Python types for cStringIO input and output objects. - Note that you can do input on an output object. - */ - PyTypeObject *InputType, *OutputType; - -} *PycStringIO; - -/* These can be used to test if you have one */ -#define PycStringIO_InputCheck(O) \ - (Py_TYPE(O)==PycStringIO->InputType) -#define PycStringIO_OutputCheck(O) \ - (Py_TYPE(O)==PycStringIO->OutputType) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CSTRINGIO_H */ diff --git a/python/include/cellobject.h b/python/include/cellobject.h deleted file mode 100644 index c927ee5d..00000000 --- a/python/include/cellobject.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Cell object interface */ - -#ifndef Py_CELLOBJECT_H -#define Py_CELLOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - PyObject *ob_ref; /* Content of the cell or NULL when empty */ -} PyCellObject; - -PyAPI_DATA(PyTypeObject) PyCell_Type; - -#define PyCell_Check(op) (Py_TYPE(op) == &PyCell_Type) - -PyAPI_FUNC(PyObject *) PyCell_New(PyObject *); -PyAPI_FUNC(PyObject *) PyCell_Get(PyObject *); -PyAPI_FUNC(int) PyCell_Set(PyObject *, PyObject *); - -#define PyCell_GET(op) (((PyCellObject *)(op))->ob_ref) -#define PyCell_SET(op, v) (((PyCellObject *)(op))->ob_ref = v) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_TUPLEOBJECT_H */ diff --git a/python/include/ceval.h b/python/include/ceval.h deleted file mode 100644 index 0e8bd2ab..00000000 --- a/python/include/ceval.h +++ /dev/null @@ -1,153 +0,0 @@ -#ifndef Py_CEVAL_H -#define Py_CEVAL_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Interface to random parts in ceval.c */ - -PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords( - PyObject *, PyObject *, PyObject *); - -/* Inline this */ -#define PyEval_CallObject(func,arg) \ - PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL) - -PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj, - const char *format, ...); -PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj, - const char *methodname, - const char *format, ...); - -PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *); -PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *); - -struct _frame; /* Avoid including frameobject.h */ - -PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void); -PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void); -PyAPI_FUNC(PyObject *) PyEval_GetLocals(void); -PyAPI_FUNC(struct _frame *) PyEval_GetFrame(void); -PyAPI_FUNC(int) PyEval_GetRestricted(void); - -/* Look at the current frame's (if any) code's co_flags, and turn on - the corresponding compiler flags in cf->cf_flags. Return 1 if any - flag was set, else return 0. */ -PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf); - -PyAPI_FUNC(int) Py_FlushLine(void); - -PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg); -PyAPI_FUNC(int) Py_MakePendingCalls(void); - -/* Protection against deeply nested recursive calls */ -PyAPI_FUNC(void) Py_SetRecursionLimit(int); -PyAPI_FUNC(int) Py_GetRecursionLimit(void); - -#define Py_EnterRecursiveCall(where) \ - (_Py_MakeRecCheck(PyThreadState_GET()->recursion_depth) && \ - _Py_CheckRecursiveCall(where)) -#define Py_LeaveRecursiveCall() \ - (--PyThreadState_GET()->recursion_depth) -PyAPI_FUNC(int) _Py_CheckRecursiveCall(char *where); -PyAPI_DATA(int) _Py_CheckRecursionLimit; -#ifdef USE_STACKCHECK -# define _Py_MakeRecCheck(x) (++(x) > --_Py_CheckRecursionLimit) -#else -# define _Py_MakeRecCheck(x) (++(x) > _Py_CheckRecursionLimit) -#endif - -PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *); -PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *); - -PyAPI_FUNC(PyObject *) PyEval_GetCallStats(PyObject *); -PyAPI_FUNC(PyObject *) PyEval_EvalFrame(struct _frame *); -PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(struct _frame *f, int exc); - -/* this used to be handled on a per-thread basis - now just two globals */ -PyAPI_DATA(volatile int) _Py_Ticker; -PyAPI_DATA(int) _Py_CheckInterval; - -/* Interface for threads. - - A module that plans to do a blocking system call (or something else - that lasts a long time and doesn't touch Python data) can allow other - threads to run as follows: - - ...preparations here... - Py_BEGIN_ALLOW_THREADS - ...blocking system call here... - Py_END_ALLOW_THREADS - ...interpret result here... - - The Py_BEGIN_ALLOW_THREADS/Py_END_ALLOW_THREADS pair expands to a - {}-surrounded block. - To leave the block in the middle (e.g., with return), you must insert - a line containing Py_BLOCK_THREADS before the return, e.g. - - if (...premature_exit...) { - Py_BLOCK_THREADS - PyErr_SetFromErrno(PyExc_IOError); - return NULL; - } - - An alternative is: - - Py_BLOCK_THREADS - if (...premature_exit...) { - PyErr_SetFromErrno(PyExc_IOError); - return NULL; - } - Py_UNBLOCK_THREADS - - For convenience, that the value of 'errno' is restored across - Py_END_ALLOW_THREADS and Py_BLOCK_THREADS. - - WARNING: NEVER NEST CALLS TO Py_BEGIN_ALLOW_THREADS AND - Py_END_ALLOW_THREADS!!! - - The function PyEval_InitThreads() should be called only from - initthread() in "threadmodule.c". - - Note that not yet all candidates have been converted to use this - mechanism! -*/ - -PyAPI_FUNC(PyThreadState *) PyEval_SaveThread(void); -PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *); - -#ifdef WITH_THREAD - -PyAPI_FUNC(int) PyEval_ThreadsInitialized(void); -PyAPI_FUNC(void) PyEval_InitThreads(void); -PyAPI_FUNC(void) PyEval_AcquireLock(void); -PyAPI_FUNC(void) PyEval_ReleaseLock(void); -PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate); -PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate); -PyAPI_FUNC(void) PyEval_ReInitThreads(void); - -#define Py_BEGIN_ALLOW_THREADS { \ - PyThreadState *_save; \ - _save = PyEval_SaveThread(); -#define Py_BLOCK_THREADS PyEval_RestoreThread(_save); -#define Py_UNBLOCK_THREADS _save = PyEval_SaveThread(); -#define Py_END_ALLOW_THREADS PyEval_RestoreThread(_save); \ - } - -#else /* !WITH_THREAD */ - -#define Py_BEGIN_ALLOW_THREADS { -#define Py_BLOCK_THREADS -#define Py_UNBLOCK_THREADS -#define Py_END_ALLOW_THREADS } - -#endif /* !WITH_THREAD */ - -PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *); - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CEVAL_H */ diff --git a/python/include/classobject.h b/python/include/classobject.h deleted file mode 100644 index bc03e0d0..00000000 --- a/python/include/classobject.h +++ /dev/null @@ -1,83 +0,0 @@ - -/* Class object interface */ - -/* Revealing some structures (not for general use) */ - -#ifndef Py_CLASSOBJECT_H -#define Py_CLASSOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - PyObject *cl_bases; /* A tuple of class objects */ - PyObject *cl_dict; /* A dictionary */ - PyObject *cl_name; /* A string */ - /* The following three are functions or NULL */ - PyObject *cl_getattr; - PyObject *cl_setattr; - PyObject *cl_delattr; - PyObject *cl_weakreflist; /* List of weak references */ -} PyClassObject; - -typedef struct { - PyObject_HEAD - PyClassObject *in_class; /* The class object */ - PyObject *in_dict; /* A dictionary */ - PyObject *in_weakreflist; /* List of weak references */ -} PyInstanceObject; - -typedef struct { - PyObject_HEAD - PyObject *im_func; /* The callable object implementing the method */ - PyObject *im_self; /* The instance it is bound to, or NULL */ - PyObject *im_class; /* The class that asked for the method */ - PyObject *im_weakreflist; /* List of weak references */ -} PyMethodObject; - -PyAPI_DATA(PyTypeObject) PyClass_Type, PyInstance_Type, PyMethod_Type; - -#define PyClass_Check(op) ((op)->ob_type == &PyClass_Type) -#define PyInstance_Check(op) ((op)->ob_type == &PyInstance_Type) -#define PyMethod_Check(op) ((op)->ob_type == &PyMethod_Type) - -PyAPI_FUNC(PyObject *) PyClass_New(PyObject *, PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyInstance_New(PyObject *, PyObject *, - PyObject *); -PyAPI_FUNC(PyObject *) PyInstance_NewRaw(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *, PyObject *); - -PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *); -PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *); -PyAPI_FUNC(PyObject *) PyMethod_Class(PyObject *); - -/* Look up attribute with name (a string) on instance object pinst, using - * only the instance and base class dicts. If a descriptor is found in - * a class dict, the descriptor is returned without calling it. - * Returns NULL if nothing found, else a borrowed reference to the - * value associated with name in the dict in which name was found. - * The point of this routine is that it never calls arbitrary Python - * code, so is always "safe": all it does is dict lookups. The function - * can't fail, never sets an exception, and NULL is not an error (it just - * means "not found"). - */ -PyAPI_FUNC(PyObject *) _PyInstance_Lookup(PyObject *pinst, PyObject *name); - -/* Macros for direct access to these values. Type checks are *not* - done, so use with care. */ -#define PyMethod_GET_FUNCTION(meth) \ - (((PyMethodObject *)meth) -> im_func) -#define PyMethod_GET_SELF(meth) \ - (((PyMethodObject *)meth) -> im_self) -#define PyMethod_GET_CLASS(meth) \ - (((PyMethodObject *)meth) -> im_class) - -PyAPI_FUNC(int) PyClass_IsSubclass(PyObject *, PyObject *); - -PyAPI_FUNC(int) PyMethod_ClearFreeList(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CLASSOBJECT_H */ diff --git a/python/include/cobject.h b/python/include/cobject.h deleted file mode 100644 index ad3cd9c9..00000000 --- a/python/include/cobject.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - CObjects are marked Pending Deprecation as of Python 2.7. - The full schedule for 2.x is as follows: - - CObjects are marked Pending Deprecation in Python 2.7. - - CObjects will be marked Deprecated in Python 2.8 - (if there is one). - - CObjects will be removed in Python 2.9 (if there is one). - - Additionally, for the Python 3.x series: - - CObjects were marked Deprecated in Python 3.1. - - CObjects will be removed in Python 3.2. - - You should switch all use of CObjects to capsules. Capsules - have a safer and more consistent API. For more information, - see Include/pycapsule.h, or read the "Capsules" topic in - the "Python/C API Reference Manual". - - Python 2.7 no longer uses CObjects itself; all objects which - were formerly CObjects are now capsules. Note that this change - does not by itself break binary compatibility with extensions - built for previous versions of Python--PyCObject_AsVoidPtr() - has been changed to also understand capsules. - -*/ - -/* original file header comment follows: */ - -/* C objects to be exported from one extension module to another. - - C objects are used for communication between extension modules. - They provide a way for an extension module to export a C interface - to other extension modules, so that extension modules can use the - Python import mechanism to link to one another. - -*/ - -#ifndef Py_COBJECT_H -#define Py_COBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyCObject_Type; - -#define PyCObject_Check(op) (Py_TYPE(op) == &PyCObject_Type) - -/* Create a PyCObject from a pointer to a C object and an optional - destructor function. If the second argument is non-null, then it - will be called with the first argument if and when the PyCObject is - destroyed. - -*/ -PyAPI_FUNC(PyObject *) PyCObject_FromVoidPtr( - void *cobj, void (*destruct)(void*)); - - -/* Create a PyCObject from a pointer to a C object, a description object, - and an optional destructor function. If the third argument is non-null, - then it will be called with the first and second arguments if and when - the PyCObject is destroyed. -*/ -PyAPI_FUNC(PyObject *) PyCObject_FromVoidPtrAndDesc( - void *cobj, void *desc, void (*destruct)(void*,void*)); - -/* Retrieve a pointer to a C object from a PyCObject. */ -PyAPI_FUNC(void *) PyCObject_AsVoidPtr(PyObject *); - -/* Retrieve a pointer to a description object from a PyCObject. */ -PyAPI_FUNC(void *) PyCObject_GetDesc(PyObject *); - -/* Import a pointer to a C object from a module using a PyCObject. */ -PyAPI_FUNC(void *) PyCObject_Import(char *module_name, char *cobject_name); - -/* Modify a C object. Fails (==0) if object has a destructor. */ -PyAPI_FUNC(int) PyCObject_SetVoidPtr(PyObject *self, void *cobj); - - -typedef struct { - PyObject_HEAD - void *cobject; - void *desc; - void (*destructor)(void *); -} PyCObject; - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_COBJECT_H */ diff --git a/python/include/code.h b/python/include/code.h deleted file mode 100644 index 38b29580..00000000 --- a/python/include/code.h +++ /dev/null @@ -1,107 +0,0 @@ -/* Definitions for bytecode */ - -#ifndef Py_CODE_H -#define Py_CODE_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Bytecode object */ -typedef struct { - PyObject_HEAD - int co_argcount; /* #arguments, except *args */ - int co_nlocals; /* #local variables */ - int co_stacksize; /* #entries needed for evaluation stack */ - int co_flags; /* CO_..., see below */ - PyObject *co_code; /* instruction opcodes */ - PyObject *co_consts; /* list (constants used) */ - PyObject *co_names; /* list of strings (names used) */ - PyObject *co_varnames; /* tuple of strings (local variable names) */ - PyObject *co_freevars; /* tuple of strings (free variable names) */ - PyObject *co_cellvars; /* tuple of strings (cell variable names) */ - /* The rest doesn't count for hash/cmp */ - PyObject *co_filename; /* string (where it was loaded from) */ - PyObject *co_name; /* string (name, for reference) */ - int co_firstlineno; /* first source line number */ - PyObject *co_lnotab; /* string (encoding addr<->lineno mapping) See - Objects/lnotab_notes.txt for details. */ - void *co_zombieframe; /* for optimization only (see frameobject.c) */ - PyObject *co_weakreflist; /* to support weakrefs to code objects */ -} PyCodeObject; - -/* Masks for co_flags above */ -#define CO_OPTIMIZED 0x0001 -#define CO_NEWLOCALS 0x0002 -#define CO_VARARGS 0x0004 -#define CO_VARKEYWORDS 0x0008 -#define CO_NESTED 0x0010 -#define CO_GENERATOR 0x0020 -/* The CO_NOFREE flag is set if there are no free or cell variables. - This information is redundant, but it allows a single flag test - to determine whether there is any extra work to be done when the - call frame it setup. -*/ -#define CO_NOFREE 0x0040 - -#if 0 -/* This is no longer used. Stopped defining in 2.5, do not re-use. */ -#define CO_GENERATOR_ALLOWED 0x1000 -#endif -#define CO_FUTURE_DIVISION 0x2000 -#define CO_FUTURE_ABSOLUTE_IMPORT 0x4000 /* do absolute imports by default */ -#define CO_FUTURE_WITH_STATEMENT 0x8000 -#define CO_FUTURE_PRINT_FUNCTION 0x10000 -#define CO_FUTURE_UNICODE_LITERALS 0x20000 - -/* This should be defined if a future statement modifies the syntax. - For example, when a keyword is added. -*/ -#if 1 -#define PY_PARSER_REQUIRES_FUTURE_KEYWORD -#endif - -#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */ - -PyAPI_DATA(PyTypeObject) PyCode_Type; - -#define PyCode_Check(op) (Py_TYPE(op) == &PyCode_Type) -#define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars)) - -/* Public interface */ -PyAPI_FUNC(PyCodeObject *) PyCode_New( - int, int, int, int, PyObject *, PyObject *, PyObject *, PyObject *, - PyObject *, PyObject *, PyObject *, PyObject *, int, PyObject *); - /* same as struct above */ - -/* Creates a new empty code object with the specified source location. */ -PyAPI_FUNC(PyCodeObject *) -PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno); - -/* Return the line number associated with the specified bytecode index - in this code object. If you just need the line number of a frame, - use PyFrame_GetLineNumber() instead. */ -PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int); - -/* for internal use only */ -#define _PyCode_GETCODEPTR(co, pp) \ - ((*Py_TYPE((co)->co_code)->tp_as_buffer->bf_getreadbuffer) \ - ((co)->co_code, 0, (void **)(pp))) - -typedef struct _addr_pair { - int ap_lower; - int ap_upper; -} PyAddrPair; - -/* Update *bounds to describe the first and one-past-the-last instructions in the - same line as lasti. Return the number of that line. -*/ -PyAPI_FUNC(int) _PyCode_CheckLineNumber(PyCodeObject* co, - int lasti, PyAddrPair *bounds); - -PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts, - PyObject *names, PyObject *lineno_obj); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CODE_H */ diff --git a/python/include/codecs.h b/python/include/codecs.h deleted file mode 100644 index c038c6a9..00000000 --- a/python/include/codecs.h +++ /dev/null @@ -1,167 +0,0 @@ -#ifndef Py_CODECREGISTRY_H -#define Py_CODECREGISTRY_H -#ifdef __cplusplus -extern "C" { -#endif - -/* ------------------------------------------------------------------------ - - Python Codec Registry and support functions - - -Written by Marc-Andre Lemburg (mal@lemburg.com). - -Copyright (c) Corporation for National Research Initiatives. - - ------------------------------------------------------------------------ */ - -/* Register a new codec search function. - - As side effect, this tries to load the encodings package, if not - yet done, to make sure that it is always first in the list of - search functions. - - The search_function's refcount is incremented by this function. */ - -PyAPI_FUNC(int) PyCodec_Register( - PyObject *search_function - ); - -/* Codec register lookup API. - - Looks up the given encoding and returns a CodecInfo object with - function attributes which implement the different aspects of - processing the encoding. - - The encoding string is looked up converted to all lower-case - characters. This makes encodings looked up through this mechanism - effectively case-insensitive. - - If no codec is found, a KeyError is set and NULL returned. - - As side effect, this tries to load the encodings package, if not - yet done. This is part of the lazy load strategy for the encodings - package. - - */ - -PyAPI_FUNC(PyObject *) _PyCodec_Lookup( - const char *encoding - ); - -/* Generic codec based encoding API. - - object is passed through the encoder function found for the given - encoding using the error handling method defined by errors. errors - may be NULL to use the default method defined for the codec. - - Raises a LookupError in case no encoder can be found. - - */ - -PyAPI_FUNC(PyObject *) PyCodec_Encode( - PyObject *object, - const char *encoding, - const char *errors - ); - -/* Generic codec based decoding API. - - object is passed through the decoder function found for the given - encoding using the error handling method defined by errors. errors - may be NULL to use the default method defined for the codec. - - Raises a LookupError in case no encoder can be found. - - */ - -PyAPI_FUNC(PyObject *) PyCodec_Decode( - PyObject *object, - const char *encoding, - const char *errors - ); - -/* --- Codec Lookup APIs -------------------------------------------------- - - All APIs return a codec object with incremented refcount and are - based on _PyCodec_Lookup(). The same comments w/r to the encoding - name also apply to these APIs. - -*/ - -/* Get an encoder function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_Encoder( - const char *encoding - ); - -/* Get a decoder function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_Decoder( - const char *encoding - ); - -/* Get a IncrementalEncoder object for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_IncrementalEncoder( - const char *encoding, - const char *errors - ); - -/* Get a IncrementalDecoder object function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_IncrementalDecoder( - const char *encoding, - const char *errors - ); - -/* Get a StreamReader factory function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_StreamReader( - const char *encoding, - PyObject *stream, - const char *errors - ); - -/* Get a StreamWriter factory function for the given encoding. */ - -PyAPI_FUNC(PyObject *) PyCodec_StreamWriter( - const char *encoding, - PyObject *stream, - const char *errors - ); - -/* Unicode encoding error handling callback registry API */ - -/* Register the error handling callback function error under the given - name. This function will be called by the codec when it encounters - unencodable characters/undecodable bytes and doesn't know the - callback name, when name is specified as the error parameter - in the call to the encode/decode function. - Return 0 on success, -1 on error */ -PyAPI_FUNC(int) PyCodec_RegisterError(const char *name, PyObject *error); - -/* Lookup the error handling callback function registered under the given - name. As a special case NULL can be passed, in which case - the error handling callback for "strict" will be returned. */ -PyAPI_FUNC(PyObject *) PyCodec_LookupError(const char *name); - -/* raise exc as an exception */ -PyAPI_FUNC(PyObject *) PyCodec_StrictErrors(PyObject *exc); - -/* ignore the unicode error, skipping the faulty input */ -PyAPI_FUNC(PyObject *) PyCodec_IgnoreErrors(PyObject *exc); - -/* replace the unicode encode error with ? or U+FFFD */ -PyAPI_FUNC(PyObject *) PyCodec_ReplaceErrors(PyObject *exc); - -/* replace the unicode encode error with XML character references */ -PyAPI_FUNC(PyObject *) PyCodec_XMLCharRefReplaceErrors(PyObject *exc); - -/* replace the unicode encode error with backslash escapes (\x, \u and \U) */ -PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CODECREGISTRY_H */ diff --git a/python/include/compile.h b/python/include/compile.h deleted file mode 100644 index 61001016..00000000 --- a/python/include/compile.h +++ /dev/null @@ -1,40 +0,0 @@ - -#ifndef Py_COMPILE_H -#define Py_COMPILE_H - -#include "code.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* Public interface */ -struct _node; /* Declare the existence of this type */ -PyAPI_FUNC(PyCodeObject *) PyNode_Compile(struct _node *, const char *); - -/* Future feature support */ - -typedef struct { - int ff_features; /* flags set by future statements */ - int ff_lineno; /* line number of last future statement */ -} PyFutureFeatures; - -#define FUTURE_NESTED_SCOPES "nested_scopes" -#define FUTURE_GENERATORS "generators" -#define FUTURE_DIVISION "division" -#define FUTURE_ABSOLUTE_IMPORT "absolute_import" -#define FUTURE_WITH_STATEMENT "with_statement" -#define FUTURE_PRINT_FUNCTION "print_function" -#define FUTURE_UNICODE_LITERALS "unicode_literals" - - -struct _mod; /* Declare the existence of this type */ -PyAPI_FUNC(PyCodeObject *) PyAST_Compile(struct _mod *, const char *, - PyCompilerFlags *, PyArena *); -PyAPI_FUNC(PyFutureFeatures *) PyFuture_FromAST(struct _mod *, const char *); - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_COMPILE_H */ diff --git a/python/include/complexobject.h b/python/include/complexobject.h deleted file mode 100644 index c9a9500f..00000000 --- a/python/include/complexobject.h +++ /dev/null @@ -1,66 +0,0 @@ -/* Complex number structure */ - -#ifndef Py_COMPLEXOBJECT_H -#define Py_COMPLEXOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - double real; - double imag; -} Py_complex; - -/* Operations on complex numbers from complexmodule.c */ - -#define c_sum _Py_c_sum -#define c_diff _Py_c_diff -#define c_neg _Py_c_neg -#define c_prod _Py_c_prod -#define c_quot _Py_c_quot -#define c_pow _Py_c_pow -#define c_abs _Py_c_abs - -PyAPI_FUNC(Py_complex) c_sum(Py_complex, Py_complex); -PyAPI_FUNC(Py_complex) c_diff(Py_complex, Py_complex); -PyAPI_FUNC(Py_complex) c_neg(Py_complex); -PyAPI_FUNC(Py_complex) c_prod(Py_complex, Py_complex); -PyAPI_FUNC(Py_complex) c_quot(Py_complex, Py_complex); -PyAPI_FUNC(Py_complex) c_pow(Py_complex, Py_complex); -PyAPI_FUNC(double) c_abs(Py_complex); - - -/* Complex object interface */ - -/* -PyComplexObject represents a complex number with double-precision -real and imaginary parts. -*/ - -typedef struct { - PyObject_HEAD - Py_complex cval; -} PyComplexObject; - -PyAPI_DATA(PyTypeObject) PyComplex_Type; - -#define PyComplex_Check(op) PyObject_TypeCheck(op, &PyComplex_Type) -#define PyComplex_CheckExact(op) (Py_TYPE(op) == &PyComplex_Type) - -PyAPI_FUNC(PyObject *) PyComplex_FromCComplex(Py_complex); -PyAPI_FUNC(PyObject *) PyComplex_FromDoubles(double real, double imag); - -PyAPI_FUNC(double) PyComplex_RealAsDouble(PyObject *op); -PyAPI_FUNC(double) PyComplex_ImagAsDouble(PyObject *op); -PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyComplex_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_COMPLEXOBJECT_H */ diff --git a/python/include/datetime.h b/python/include/datetime.h deleted file mode 100644 index 47abe5cb..00000000 --- a/python/include/datetime.h +++ /dev/null @@ -1,239 +0,0 @@ -/* datetime.h - */ - -#ifndef DATETIME_H -#define DATETIME_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Fields are packed into successive bytes, each viewed as unsigned and - * big-endian, unless otherwise noted: - * - * byte offset - * 0 year 2 bytes, 1-9999 - * 2 month 1 byte, 1-12 - * 3 day 1 byte, 1-31 - * 4 hour 1 byte, 0-23 - * 5 minute 1 byte, 0-59 - * 6 second 1 byte, 0-59 - * 7 usecond 3 bytes, 0-999999 - * 10 - */ - -/* # of bytes for year, month, and day. */ -#define _PyDateTime_DATE_DATASIZE 4 - -/* # of bytes for hour, minute, second, and usecond. */ -#define _PyDateTime_TIME_DATASIZE 6 - -/* # of bytes for year, month, day, hour, minute, second, and usecond. */ -#define _PyDateTime_DATETIME_DATASIZE 10 - - -typedef struct -{ - PyObject_HEAD - long hashcode; /* -1 when unknown */ - int days; /* -MAX_DELTA_DAYS <= days <= MAX_DELTA_DAYS */ - int seconds; /* 0 <= seconds < 24*3600 is invariant */ - int microseconds; /* 0 <= microseconds < 1000000 is invariant */ -} PyDateTime_Delta; - -typedef struct -{ - PyObject_HEAD /* a pure abstract base clase */ -} PyDateTime_TZInfo; - - -/* The datetime and time types have hashcodes, and an optional tzinfo member, - * present if and only if hastzinfo is true. - */ -#define _PyTZINFO_HEAD \ - PyObject_HEAD \ - long hashcode; \ - char hastzinfo; /* boolean flag */ - -/* No _PyDateTime_BaseTZInfo is allocated; it's just to have something - * convenient to cast to, when getting at the hastzinfo member of objects - * starting with _PyTZINFO_HEAD. - */ -typedef struct -{ - _PyTZINFO_HEAD -} _PyDateTime_BaseTZInfo; - -/* All time objects are of PyDateTime_TimeType, but that can be allocated - * in two ways, with or without a tzinfo member. Without is the same as - * tzinfo == None, but consumes less memory. _PyDateTime_BaseTime is an - * internal struct used to allocate the right amount of space for the - * "without" case. - */ -#define _PyDateTime_TIMEHEAD \ - _PyTZINFO_HEAD \ - unsigned char data[_PyDateTime_TIME_DATASIZE]; - -typedef struct -{ - _PyDateTime_TIMEHEAD -} _PyDateTime_BaseTime; /* hastzinfo false */ - -typedef struct -{ - _PyDateTime_TIMEHEAD - PyObject *tzinfo; -} PyDateTime_Time; /* hastzinfo true */ - - -/* All datetime objects are of PyDateTime_DateTimeType, but that can be - * allocated in two ways too, just like for time objects above. In addition, - * the plain date type is a base class for datetime, so it must also have - * a hastzinfo member (although it's unused there). - */ -typedef struct -{ - _PyTZINFO_HEAD - unsigned char data[_PyDateTime_DATE_DATASIZE]; -} PyDateTime_Date; - -#define _PyDateTime_DATETIMEHEAD \ - _PyTZINFO_HEAD \ - unsigned char data[_PyDateTime_DATETIME_DATASIZE]; - -typedef struct -{ - _PyDateTime_DATETIMEHEAD -} _PyDateTime_BaseDateTime; /* hastzinfo false */ - -typedef struct -{ - _PyDateTime_DATETIMEHEAD - PyObject *tzinfo; -} PyDateTime_DateTime; /* hastzinfo true */ - - -/* Apply for date and datetime instances. */ -#define PyDateTime_GET_YEAR(o) ((((PyDateTime_Date*)o)->data[0] << 8) | \ - ((PyDateTime_Date*)o)->data[1]) -#define PyDateTime_GET_MONTH(o) (((PyDateTime_Date*)o)->data[2]) -#define PyDateTime_GET_DAY(o) (((PyDateTime_Date*)o)->data[3]) - -#define PyDateTime_DATE_GET_HOUR(o) (((PyDateTime_DateTime*)o)->data[4]) -#define PyDateTime_DATE_GET_MINUTE(o) (((PyDateTime_DateTime*)o)->data[5]) -#define PyDateTime_DATE_GET_SECOND(o) (((PyDateTime_DateTime*)o)->data[6]) -#define PyDateTime_DATE_GET_MICROSECOND(o) \ - ((((PyDateTime_DateTime*)o)->data[7] << 16) | \ - (((PyDateTime_DateTime*)o)->data[8] << 8) | \ - ((PyDateTime_DateTime*)o)->data[9]) - -/* Apply for time instances. */ -#define PyDateTime_TIME_GET_HOUR(o) (((PyDateTime_Time*)o)->data[0]) -#define PyDateTime_TIME_GET_MINUTE(o) (((PyDateTime_Time*)o)->data[1]) -#define PyDateTime_TIME_GET_SECOND(o) (((PyDateTime_Time*)o)->data[2]) -#define PyDateTime_TIME_GET_MICROSECOND(o) \ - ((((PyDateTime_Time*)o)->data[3] << 16) | \ - (((PyDateTime_Time*)o)->data[4] << 8) | \ - ((PyDateTime_Time*)o)->data[5]) - - -/* Define structure for C API. */ -typedef struct { - /* type objects */ - PyTypeObject *DateType; - PyTypeObject *DateTimeType; - PyTypeObject *TimeType; - PyTypeObject *DeltaType; - PyTypeObject *TZInfoType; - - /* constructors */ - PyObject *(*Date_FromDate)(int, int, int, PyTypeObject*); - PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int, - PyObject*, PyTypeObject*); - PyObject *(*Time_FromTime)(int, int, int, int, PyObject*, PyTypeObject*); - PyObject *(*Delta_FromDelta)(int, int, int, int, PyTypeObject*); - - /* constructors for the DB API */ - PyObject *(*DateTime_FromTimestamp)(PyObject*, PyObject*, PyObject*); - PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*); - -} PyDateTime_CAPI; - -#define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI" - - -/* "magic" constant used to partially protect against developer mistakes. */ -#define DATETIME_API_MAGIC 0x414548d5 - -#ifdef Py_BUILD_CORE - -/* Macros for type checking when building the Python core. */ -#define PyDate_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateType) -#define PyDate_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateType) - -#define PyDateTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_DateTimeType) -#define PyDateTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DateTimeType) - -#define PyTime_Check(op) PyObject_TypeCheck(op, &PyDateTime_TimeType) -#define PyTime_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TimeType) - -#define PyDelta_Check(op) PyObject_TypeCheck(op, &PyDateTime_DeltaType) -#define PyDelta_CheckExact(op) (Py_TYPE(op) == &PyDateTime_DeltaType) - -#define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType) -#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TZInfoType) - -#else - -/* Define global variable for the C API and a macro for setting it. */ -static PyDateTime_CAPI *PyDateTimeAPI = NULL; - -#define PyDateTime_IMPORT \ - PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0) - -/* Macros for type checking when not building the Python core. */ -#define PyDate_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateType) -#define PyDate_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateType) - -#define PyDateTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateTimeType) -#define PyDateTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DateTimeType) - -#define PyTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TimeType) -#define PyTime_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TimeType) - -#define PyDelta_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DeltaType) -#define PyDelta_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->DeltaType) - -#define PyTZInfo_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TZInfoType) -#define PyTZInfo_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TZInfoType) - -/* Macros for accessing constructors in a simplified fashion. */ -#define PyDate_FromDate(year, month, day) \ - PyDateTimeAPI->Date_FromDate(year, month, day, PyDateTimeAPI->DateType) - -#define PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, usec) \ - PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, \ - min, sec, usec, Py_None, PyDateTimeAPI->DateTimeType) - -#define PyTime_FromTime(hour, minute, second, usecond) \ - PyDateTimeAPI->Time_FromTime(hour, minute, second, usecond, \ - Py_None, PyDateTimeAPI->TimeType) - -#define PyDelta_FromDSU(days, seconds, useconds) \ - PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \ - PyDateTimeAPI->DeltaType) - -/* Macros supporting the DB API. */ -#define PyDateTime_FromTimestamp(args) \ - PyDateTimeAPI->DateTime_FromTimestamp( \ - (PyObject*) (PyDateTimeAPI->DateTimeType), args, NULL) - -#define PyDate_FromTimestamp(args) \ - PyDateTimeAPI->Date_FromTimestamp( \ - (PyObject*) (PyDateTimeAPI->DateType), args) - -#endif /* Py_BUILD_CORE */ - -#ifdef __cplusplus -} -#endif -#endif diff --git a/python/include/descrobject.h b/python/include/descrobject.h deleted file mode 100644 index b542732b..00000000 --- a/python/include/descrobject.h +++ /dev/null @@ -1,94 +0,0 @@ -/* Descriptors */ -#ifndef Py_DESCROBJECT_H -#define Py_DESCROBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef PyObject *(*getter)(PyObject *, void *); -typedef int (*setter)(PyObject *, PyObject *, void *); - -typedef struct PyGetSetDef { - char *name; - getter get; - setter set; - char *doc; - void *closure; -} PyGetSetDef; - -typedef PyObject *(*wrapperfunc)(PyObject *self, PyObject *args, - void *wrapped); - -typedef PyObject *(*wrapperfunc_kwds)(PyObject *self, PyObject *args, - void *wrapped, PyObject *kwds); - -struct wrapperbase { - char *name; - int offset; - void *function; - wrapperfunc wrapper; - char *doc; - int flags; - PyObject *name_strobj; -}; - -/* Flags for above struct */ -#define PyWrapperFlag_KEYWORDS 1 /* wrapper function takes keyword args */ - -/* Various kinds of descriptor objects */ - -#define PyDescr_COMMON \ - PyObject_HEAD \ - PyTypeObject *d_type; \ - PyObject *d_name - -typedef struct { - PyDescr_COMMON; -} PyDescrObject; - -typedef struct { - PyDescr_COMMON; - PyMethodDef *d_method; -} PyMethodDescrObject; - -typedef struct { - PyDescr_COMMON; - struct PyMemberDef *d_member; -} PyMemberDescrObject; - -typedef struct { - PyDescr_COMMON; - PyGetSetDef *d_getset; -} PyGetSetDescrObject; - -typedef struct { - PyDescr_COMMON; - struct wrapperbase *d_base; - void *d_wrapped; /* This can be any function pointer */ -} PyWrapperDescrObject; - -PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type; -PyAPI_DATA(PyTypeObject) PyDictProxy_Type; -PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type; -PyAPI_DATA(PyTypeObject) PyMemberDescr_Type; - -PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *); -PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *); -PyAPI_FUNC(PyObject *) PyDescr_NewMember(PyTypeObject *, - struct PyMemberDef *); -PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *, - struct PyGetSetDef *); -PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *, - struct wrapperbase *, void *); -#define PyDescr_IsData(d) (Py_TYPE(d)->tp_descr_set != NULL) - -PyAPI_FUNC(PyObject *) PyDictProxy_New(PyObject *); -PyAPI_FUNC(PyObject *) PyWrapper_New(PyObject *, PyObject *); - - -PyAPI_DATA(PyTypeObject) PyProperty_Type; -#ifdef __cplusplus -} -#endif -#endif /* !Py_DESCROBJECT_H */ - diff --git a/python/include/dictobject.h b/python/include/dictobject.h deleted file mode 100644 index ece01c64..00000000 --- a/python/include/dictobject.h +++ /dev/null @@ -1,156 +0,0 @@ -#ifndef Py_DICTOBJECT_H -#define Py_DICTOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Dictionary object type -- mapping from hashable object to object */ - -/* The distribution includes a separate file, Objects/dictnotes.txt, - describing explorations into dictionary design and optimization. - It covers typical dictionary use patterns, the parameters for - tuning dictionaries, and several ideas for possible optimizations. -*/ - -/* -There are three kinds of slots in the table: - -1. Unused. me_key == me_value == NULL - Does not hold an active (key, value) pair now and never did. Unused can - transition to Active upon key insertion. This is the only case in which - me_key is NULL, and is each slot's initial state. - -2. Active. me_key != NULL and me_key != dummy and me_value != NULL - Holds an active (key, value) pair. Active can transition to Dummy upon - key deletion. This is the only case in which me_value != NULL. - -3. Dummy. me_key == dummy and me_value == NULL - Previously held an active (key, value) pair, but that was deleted and an - active pair has not yet overwritten the slot. Dummy can transition to - Active upon key insertion. Dummy slots cannot be made Unused again - (cannot have me_key set to NULL), else the probe sequence in case of - collision would have no way to know they were once active. - -Note: .popitem() abuses the me_hash field of an Unused or Dummy slot to -hold a search finger. The me_hash field of Unused or Dummy slots has no -meaning otherwise. -*/ - -/* PyDict_MINSIZE is the minimum size of a dictionary. This many slots are - * allocated directly in the dict object (in the ma_smalltable member). - * It must be a power of 2, and at least 4. 8 allows dicts with no more - * than 5 active entries to live in ma_smalltable (and so avoid an - * additional malloc); instrumentation suggested this suffices for the - * majority of dicts (consisting mostly of usually-small instance dicts and - * usually-small dicts created to pass keyword arguments). - */ -#define PyDict_MINSIZE 8 - -typedef struct { - /* Cached hash code of me_key. Note that hash codes are C longs. - * We have to use Py_ssize_t instead because dict_popitem() abuses - * me_hash to hold a search finger. - */ - Py_ssize_t me_hash; - PyObject *me_key; - PyObject *me_value; -} PyDictEntry; - -/* -To ensure the lookup algorithm terminates, there must be at least one Unused -slot (NULL key) in the table. -The value ma_fill is the number of non-NULL keys (sum of Active and Dummy); -ma_used is the number of non-NULL, non-dummy keys (== the number of non-NULL -values == the number of Active items). -To avoid slowing down lookups on a near-full table, we resize the table when -it's two-thirds full. -*/ -typedef struct _dictobject PyDictObject; -struct _dictobject { - PyObject_HEAD - Py_ssize_t ma_fill; /* # Active + # Dummy */ - Py_ssize_t ma_used; /* # Active */ - - /* The table contains ma_mask + 1 slots, and that's a power of 2. - * We store the mask instead of the size because the mask is more - * frequently needed. - */ - Py_ssize_t ma_mask; - - /* ma_table points to ma_smalltable for small tables, else to - * additional malloc'ed memory. ma_table is never NULL! This rule - * saves repeated runtime null-tests in the workhorse getitem and - * setitem calls. - */ - PyDictEntry *ma_table; - PyDictEntry *(*ma_lookup)(PyDictObject *mp, PyObject *key, long hash); - PyDictEntry ma_smalltable[PyDict_MINSIZE]; -}; - -PyAPI_DATA(PyTypeObject) PyDict_Type; -PyAPI_DATA(PyTypeObject) PyDictIterKey_Type; -PyAPI_DATA(PyTypeObject) PyDictIterValue_Type; -PyAPI_DATA(PyTypeObject) PyDictIterItem_Type; -PyAPI_DATA(PyTypeObject) PyDictKeys_Type; -PyAPI_DATA(PyTypeObject) PyDictItems_Type; -PyAPI_DATA(PyTypeObject) PyDictValues_Type; - -#define PyDict_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_DICT_SUBCLASS) -#define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type) -#define PyDictKeys_Check(op) (Py_TYPE(op) == &PyDictKeys_Type) -#define PyDictItems_Check(op) (Py_TYPE(op) == &PyDictItems_Type) -#define PyDictValues_Check(op) (Py_TYPE(op) == &PyDictValues_Type) -/* This excludes Values, since they are not sets. */ -# define PyDictViewSet_Check(op) \ - (PyDictKeys_Check(op) || PyDictItems_Check(op)) - -PyAPI_FUNC(PyObject *) PyDict_New(void); -PyAPI_FUNC(PyObject *) PyDict_GetItem(PyObject *mp, PyObject *key); -PyAPI_FUNC(int) PyDict_SetItem(PyObject *mp, PyObject *key, PyObject *item); -PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key); -PyAPI_FUNC(void) PyDict_Clear(PyObject *mp); -PyAPI_FUNC(int) PyDict_Next( - PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value); -PyAPI_FUNC(int) _PyDict_Next( - PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, long *hash); -PyAPI_FUNC(PyObject *) PyDict_Keys(PyObject *mp); -PyAPI_FUNC(PyObject *) PyDict_Values(PyObject *mp); -PyAPI_FUNC(PyObject *) PyDict_Items(PyObject *mp); -PyAPI_FUNC(Py_ssize_t) PyDict_Size(PyObject *mp); -PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp); -PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key); -PyAPI_FUNC(int) _PyDict_Contains(PyObject *mp, PyObject *key, long hash); -PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused); -PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp); - -/* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */ -PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other); - -/* PyDict_Merge updates/merges from a mapping object (an object that - supports PyMapping_Keys() and PyObject_GetItem()). If override is true, - the last occurrence of a key wins, else the first. The Python - dict.update(other) is equivalent to PyDict_Merge(dict, other, 1). -*/ -PyAPI_FUNC(int) PyDict_Merge(PyObject *mp, - PyObject *other, - int override); - -/* PyDict_MergeFromSeq2 updates/merges from an iterable object producing - iterable objects of length 2. If override is true, the last occurrence - of a key wins, else the first. The Python dict constructor dict(seq2) - is equivalent to dict={}; PyDict_MergeFromSeq(dict, seq2, 1). -*/ -PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d, - PyObject *seq2, - int override); - -PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key); -PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item); -PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_DICTOBJECT_H */ diff --git a/python/include/dtoa.h b/python/include/dtoa.h deleted file mode 100644 index 9b434b77..00000000 --- a/python/include/dtoa.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef PY_NO_SHORT_FLOAT_REPR -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(double) _Py_dg_strtod(const char *str, char **ptr); -PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits, - int *decpt, int *sign, char **rve); -PyAPI_FUNC(void) _Py_dg_freedtoa(char *s); - - -#ifdef __cplusplus -} -#endif -#endif diff --git a/python/include/enumobject.h b/python/include/enumobject.h deleted file mode 100644 index c14dbfc8..00000000 --- a/python/include/enumobject.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef Py_ENUMOBJECT_H -#define Py_ENUMOBJECT_H - -/* Enumerate Object */ - -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyEnum_Type; -PyAPI_DATA(PyTypeObject) PyReversed_Type; - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_ENUMOBJECT_H */ diff --git a/python/include/errcode.h b/python/include/errcode.h deleted file mode 100644 index becec80c..00000000 --- a/python/include/errcode.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef Py_ERRCODE_H -#define Py_ERRCODE_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Error codes passed around between file input, tokenizer, parser and - interpreter. This is necessary so we can turn them into Python - exceptions at a higher level. Note that some errors have a - slightly different meaning when passed from the tokenizer to the - parser than when passed from the parser to the interpreter; e.g. - the parser only returns E_EOF when it hits EOF immediately, and it - never returns E_OK. */ - -#define E_OK 10 /* No error */ -#define E_EOF 11 /* End Of File */ -#define E_INTR 12 /* Interrupted */ -#define E_TOKEN 13 /* Bad token */ -#define E_SYNTAX 14 /* Syntax error */ -#define E_NOMEM 15 /* Ran out of memory */ -#define E_DONE 16 /* Parsing complete */ -#define E_ERROR 17 /* Execution error */ -#define E_TABSPACE 18 /* Inconsistent mixing of tabs and spaces */ -#define E_OVERFLOW 19 /* Node had too many children */ -#define E_TOODEEP 20 /* Too many indentation levels */ -#define E_DEDENT 21 /* No matching outer block for dedent */ -#define E_DECODE 22 /* Error in decoding into Unicode */ -#define E_EOFS 23 /* EOF in triple-quoted string */ -#define E_EOLS 24 /* EOL in single-quoted string */ -#define E_LINECONT 25 /* Unexpected characters after a line continuation */ - -#ifdef __cplusplus -} -#endif -#endif /* !Py_ERRCODE_H */ diff --git a/python/include/eval.h b/python/include/eval.h deleted file mode 100644 index b78dfe0f..00000000 --- a/python/include/eval.h +++ /dev/null @@ -1,25 +0,0 @@ - -/* Interface to execute compiled code */ - -#ifndef Py_EVAL_H -#define Py_EVAL_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(PyObject *) PyEval_EvalCode(PyCodeObject *, PyObject *, PyObject *); - -PyAPI_FUNC(PyObject *) PyEval_EvalCodeEx(PyCodeObject *co, - PyObject *globals, - PyObject *locals, - PyObject **args, int argc, - PyObject **kwds, int kwdc, - PyObject **defs, int defc, - PyObject *closure); - -PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_EVAL_H */ diff --git a/python/include/fileobject.h b/python/include/fileobject.h deleted file mode 100644 index 1b540f90..00000000 --- a/python/include/fileobject.h +++ /dev/null @@ -1,97 +0,0 @@ - -/* File object interface */ - -#ifndef Py_FILEOBJECT_H -#define Py_FILEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - FILE *f_fp; - PyObject *f_name; - PyObject *f_mode; - int (*f_close)(FILE *); - int f_softspace; /* Flag used by 'print' command */ - int f_binary; /* Flag which indicates whether the file is - open in binary (1) or text (0) mode */ - char* f_buf; /* Allocated readahead buffer */ - char* f_bufend; /* Points after last occupied position */ - char* f_bufptr; /* Current buffer position */ - char *f_setbuf; /* Buffer for setbuf(3) and setvbuf(3) */ - int f_univ_newline; /* Handle any newline convention */ - int f_newlinetypes; /* Types of newlines seen */ - int f_skipnextlf; /* Skip next \n */ - PyObject *f_encoding; - PyObject *f_errors; - PyObject *weakreflist; /* List of weak references */ - int unlocked_count; /* Num. currently running sections of code - using f_fp with the GIL released. */ - int readable; - int writable; -} PyFileObject; - -PyAPI_DATA(PyTypeObject) PyFile_Type; - -#define PyFile_Check(op) PyObject_TypeCheck(op, &PyFile_Type) -#define PyFile_CheckExact(op) (Py_TYPE(op) == &PyFile_Type) - -PyAPI_FUNC(PyObject *) PyFile_FromString(char *, char *); -PyAPI_FUNC(void) PyFile_SetBufSize(PyObject *, int); -PyAPI_FUNC(int) PyFile_SetEncoding(PyObject *, const char *); -PyAPI_FUNC(int) PyFile_SetEncodingAndErrors(PyObject *, const char *, char *errors); -PyAPI_FUNC(PyObject *) PyFile_FromFile(FILE *, char *, char *, - int (*)(FILE *)); -PyAPI_FUNC(FILE *) PyFile_AsFile(PyObject *); -PyAPI_FUNC(void) PyFile_IncUseCount(PyFileObject *); -PyAPI_FUNC(void) PyFile_DecUseCount(PyFileObject *); -PyAPI_FUNC(PyObject *) PyFile_Name(PyObject *); -PyAPI_FUNC(PyObject *) PyFile_GetLine(PyObject *, int); -PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int); -PyAPI_FUNC(int) PyFile_SoftSpace(PyObject *, int); -PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *); -PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *); - -/* The default encoding used by the platform file system APIs - If non-NULL, this is different than the default encoding for strings -*/ -PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding; - -/* Routines to replace fread() and fgets() which accept any of \r, \n - or \r\n as line terminators. -*/ -#define PY_STDIOTEXTMODE "b" -char *Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *); -size_t Py_UniversalNewlineFread(char *, size_t, FILE *, PyObject *); - -/* A routine to do sanity checking on the file mode string. returns - non-zero on if an exception occurred -*/ -int _PyFile_SanitizeMode(char *mode); - -#if defined _MSC_VER && _MSC_VER >= 1400 -/* A routine to check if a file descriptor is valid on Windows. Returns 0 - * and sets errno to EBADF if it isn't. This is to avoid Assertions - * from various functions in the Windows CRT beginning with - * Visual Studio 2005 - */ -int _PyVerify_fd(int fd); -#elif defined _MSC_VER && _MSC_VER >= 1200 -/* fdopen doesn't set errno EBADF and crashes for large fd on debug build */ -#define _PyVerify_fd(fd) (_get_osfhandle(fd) >= 0) -#else -#define _PyVerify_fd(A) (1) /* dummy */ -#endif - -/* A routine to check if a file descriptor can be select()-ed. */ -#ifdef HAVE_SELECT - #define _PyIsSelectable_fd(FD) (((FD) >= 0) && ((FD) < FD_SETSIZE)) -#else - #define _PyIsSelectable_fd(FD) (1) -#endif /* HAVE_SELECT */ - -#ifdef __cplusplus -} -#endif -#endif /* !Py_FILEOBJECT_H */ diff --git a/python/include/floatobject.h b/python/include/floatobject.h deleted file mode 100644 index 54e88256..00000000 --- a/python/include/floatobject.h +++ /dev/null @@ -1,140 +0,0 @@ - -/* Float object interface */ - -/* -PyFloatObject represents a (double precision) floating point number. -*/ - -#ifndef Py_FLOATOBJECT_H -#define Py_FLOATOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - double ob_fval; -} PyFloatObject; - -PyAPI_DATA(PyTypeObject) PyFloat_Type; - -#define PyFloat_Check(op) PyObject_TypeCheck(op, &PyFloat_Type) -#define PyFloat_CheckExact(op) (Py_TYPE(op) == &PyFloat_Type) - -/* The str() precision PyFloat_STR_PRECISION is chosen so that in most cases, - the rounding noise created by various operations is suppressed, while - giving plenty of precision for practical use. */ - -#define PyFloat_STR_PRECISION 12 - -#ifdef Py_NAN -#define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN) -#endif - -#define Py_RETURN_INF(sign) do \ - if (copysign(1., sign) == 1.) { \ - return PyFloat_FromDouble(Py_HUGE_VAL); \ - } else { \ - return PyFloat_FromDouble(-Py_HUGE_VAL); \ - } while(0) - -PyAPI_FUNC(double) PyFloat_GetMax(void); -PyAPI_FUNC(double) PyFloat_GetMin(void); -PyAPI_FUNC(PyObject *) PyFloat_GetInfo(void); - -/* Return Python float from string PyObject. Second argument ignored on - input, and, if non-NULL, NULL is stored into *junk (this tried to serve a - purpose once but can't be made to work as intended). */ -PyAPI_FUNC(PyObject *) PyFloat_FromString(PyObject*, char** junk); - -/* Return Python float from C double. */ -PyAPI_FUNC(PyObject *) PyFloat_FromDouble(double); - -/* Extract C double from Python float. The macro version trades safety for - speed. */ -PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *); -#define PyFloat_AS_DOUBLE(op) (((PyFloatObject *)(op))->ob_fval) - -/* Write repr(v) into the char buffer argument, followed by null byte. The - buffer must be "big enough"; >= 100 is very safe. - PyFloat_AsReprString(buf, x) strives to print enough digits so that - PyFloat_FromString(buf) then reproduces x exactly. */ -PyAPI_FUNC(void) PyFloat_AsReprString(char*, PyFloatObject *v); - -/* Write str(v) into the char buffer argument, followed by null byte. The - buffer must be "big enough"; >= 100 is very safe. Note that it's - unusual to be able to get back the float you started with from - PyFloat_AsString's result -- use PyFloat_AsReprString() if you want to - preserve precision across conversions. */ -PyAPI_FUNC(void) PyFloat_AsString(char*, PyFloatObject *v); - -/* _PyFloat_{Pack,Unpack}{4,8} - * - * The struct and pickle (at least) modules need an efficient platform- - * independent way to store floating-point values as byte strings. - * The Pack routines produce a string from a C double, and the Unpack - * routines produce a C double from such a string. The suffix (4 or 8) - * specifies the number of bytes in the string. - * - * On platforms that appear to use (see _PyFloat_Init()) IEEE-754 formats - * these functions work by copying bits. On other platforms, the formats the - * 4- byte format is identical to the IEEE-754 single precision format, and - * the 8-byte format to the IEEE-754 double precision format, although the - * packing of INFs and NaNs (if such things exist on the platform) isn't - * handled correctly, and attempting to unpack a string containing an IEEE - * INF or NaN will raise an exception. - * - * On non-IEEE platforms with more precision, or larger dynamic range, than - * 754 supports, not all values can be packed; on non-IEEE platforms with less - * precision, or smaller dynamic range, not all values can be unpacked. What - * happens in such cases is partly accidental (alas). - */ - -/* The pack routines write 4 or 8 bytes, starting at p. le is a bool - * argument, true if you want the string in little-endian format (exponent - * last, at p+3 or p+7), false if you want big-endian format (exponent - * first, at p). - * Return value: 0 if all is OK, -1 if error (and an exception is - * set, most likely OverflowError). - * There are two problems on non-IEEE platforms: - * 1): What this does is undefined if x is a NaN or infinity. - * 2): -0.0 and +0.0 produce the same string. - */ -PyAPI_FUNC(int) _PyFloat_Pack4(double x, unsigned char *p, int le); -PyAPI_FUNC(int) _PyFloat_Pack8(double x, unsigned char *p, int le); - -/* Used to get the important decimal digits of a double */ -PyAPI_FUNC(int) _PyFloat_Digits(char *buf, double v, int *signum); -PyAPI_FUNC(void) _PyFloat_DigitsInit(void); - -/* The unpack routines read 4 or 8 bytes, starting at p. le is a bool - * argument, true if the string is in little-endian format (exponent - * last, at p+3 or p+7), false if big-endian (exponent first, at p). - * Return value: The unpacked double. On error, this is -1.0 and - * PyErr_Occurred() is true (and an exception is set, most likely - * OverflowError). Note that on a non-IEEE platform this will refuse - * to unpack a string that represents a NaN or infinity. - */ -PyAPI_FUNC(double) _PyFloat_Unpack4(const unsigned char *p, int le); -PyAPI_FUNC(double) _PyFloat_Unpack8(const unsigned char *p, int le); - -/* free list api */ -PyAPI_FUNC(int) PyFloat_ClearFreeList(void); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyFloat_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -/* Round a C double x to the closest multiple of 10**-ndigits. Returns a - Python float on success, or NULL (with an appropriate exception set) on - failure. Used in builtin_round in bltinmodule.c. */ -PyAPI_FUNC(PyObject *) _Py_double_round(double x, int ndigits); - - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_FLOATOBJECT_H */ diff --git a/python/include/frameobject.h b/python/include/frameobject.h deleted file mode 100644 index 17e7679a..00000000 --- a/python/include/frameobject.h +++ /dev/null @@ -1,89 +0,0 @@ - -/* Frame object interface */ - -#ifndef Py_FRAMEOBJECT_H -#define Py_FRAMEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - int b_type; /* what kind of block this is */ - int b_handler; /* where to jump to find handler */ - int b_level; /* value stack level to pop to */ -} PyTryBlock; - -typedef struct _frame { - PyObject_VAR_HEAD - struct _frame *f_back; /* previous frame, or NULL */ - PyCodeObject *f_code; /* code segment */ - PyObject *f_builtins; /* builtin symbol table (PyDictObject) */ - PyObject *f_globals; /* global symbol table (PyDictObject) */ - PyObject *f_locals; /* local symbol table (any mapping) */ - PyObject **f_valuestack; /* points after the last local */ - /* Next free slot in f_valuestack. Frame creation sets to f_valuestack. - Frame evaluation usually NULLs it, but a frame that yields sets it - to the current stack top. */ - PyObject **f_stacktop; - PyObject *f_trace; /* Trace function */ - - /* If an exception is raised in this frame, the next three are used to - * record the exception info (if any) originally in the thread state. See - * comments before set_exc_info() -- it's not obvious. - * Invariant: if _type is NULL, then so are _value and _traceback. - * Desired invariant: all three are NULL, or all three are non-NULL. That - * one isn't currently true, but "should be". - */ - PyObject *f_exc_type, *f_exc_value, *f_exc_traceback; - - PyThreadState *f_tstate; - int f_lasti; /* Last instruction if called */ - /* Call PyFrame_GetLineNumber() instead of reading this field - directly. As of 2.3 f_lineno is only valid when tracing is - active (i.e. when f_trace is set). At other times we use - PyCode_Addr2Line to calculate the line from the current - bytecode index. */ - int f_lineno; /* Current line number */ - int f_iblock; /* index in f_blockstack */ - PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */ - PyObject *f_localsplus[1]; /* locals+stack, dynamically sized */ -} PyFrameObject; - - -/* Standard object interface */ - -PyAPI_DATA(PyTypeObject) PyFrame_Type; - -#define PyFrame_Check(op) ((op)->ob_type == &PyFrame_Type) -#define PyFrame_IsRestricted(f) \ - ((f)->f_builtins != (f)->f_tstate->interp->builtins) - -PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *, - PyObject *, PyObject *); - - -/* The rest of the interface is specific for frame objects */ - -/* Block management functions */ - -PyAPI_FUNC(void) PyFrame_BlockSetup(PyFrameObject *, int, int, int); -PyAPI_FUNC(PyTryBlock *) PyFrame_BlockPop(PyFrameObject *); - -/* Extend the value stack */ - -PyAPI_FUNC(PyObject **) PyFrame_ExtendStack(PyFrameObject *, int, int); - -/* Conversions between "fast locals" and locals in dictionary */ - -PyAPI_FUNC(void) PyFrame_LocalsToFast(PyFrameObject *, int); -PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *); - -PyAPI_FUNC(int) PyFrame_ClearFreeList(void); - -/* Return the line of code the frame is currently executing. */ -PyAPI_FUNC(int) PyFrame_GetLineNumber(PyFrameObject *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_FRAMEOBJECT_H */ diff --git a/python/include/funcobject.h b/python/include/funcobject.h deleted file mode 100644 index eb19f4c3..00000000 --- a/python/include/funcobject.h +++ /dev/null @@ -1,76 +0,0 @@ - -/* Function object interface */ - -#ifndef Py_FUNCOBJECT_H -#define Py_FUNCOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Function objects and code objects should not be confused with each other: - * - * Function objects are created by the execution of the 'def' statement. - * They reference a code object in their func_code attribute, which is a - * purely syntactic object, i.e. nothing more than a compiled version of some - * source code lines. There is one code object per source code "fragment", - * but each code object can be referenced by zero or many function objects - * depending only on how many times the 'def' statement in the source was - * executed so far. - */ - -typedef struct { - PyObject_HEAD - PyObject *func_code; /* A code object */ - PyObject *func_globals; /* A dictionary (other mappings won't do) */ - PyObject *func_defaults; /* NULL or a tuple */ - PyObject *func_closure; /* NULL or a tuple of cell objects */ - PyObject *func_doc; /* The __doc__ attribute, can be anything */ - PyObject *func_name; /* The __name__ attribute, a string object */ - PyObject *func_dict; /* The __dict__ attribute, a dict or NULL */ - PyObject *func_weakreflist; /* List of weak references */ - PyObject *func_module; /* The __module__ attribute, can be anything */ - - /* Invariant: - * func_closure contains the bindings for func_code->co_freevars, so - * PyTuple_Size(func_closure) == PyCode_GetNumFree(func_code) - * (func_closure may be NULL if PyCode_GetNumFree(func_code) == 0). - */ -} PyFunctionObject; - -PyAPI_DATA(PyTypeObject) PyFunction_Type; - -#define PyFunction_Check(op) (Py_TYPE(op) == &PyFunction_Type) - -PyAPI_FUNC(PyObject *) PyFunction_New(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetCode(PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetGlobals(PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetModule(PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetDefaults(PyObject *); -PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyFunction_GetClosure(PyObject *); -PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *); - -/* Macros for direct access to these values. Type checks are *not* - done, so use with care. */ -#define PyFunction_GET_CODE(func) \ - (((PyFunctionObject *)func) -> func_code) -#define PyFunction_GET_GLOBALS(func) \ - (((PyFunctionObject *)func) -> func_globals) -#define PyFunction_GET_MODULE(func) \ - (((PyFunctionObject *)func) -> func_module) -#define PyFunction_GET_DEFAULTS(func) \ - (((PyFunctionObject *)func) -> func_defaults) -#define PyFunction_GET_CLOSURE(func) \ - (((PyFunctionObject *)func) -> func_closure) - -/* The classmethod and staticmethod types lives here, too */ -PyAPI_DATA(PyTypeObject) PyClassMethod_Type; -PyAPI_DATA(PyTypeObject) PyStaticMethod_Type; - -PyAPI_FUNC(PyObject *) PyClassMethod_New(PyObject *); -PyAPI_FUNC(PyObject *) PyStaticMethod_New(PyObject *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_FUNCOBJECT_H */ diff --git a/python/include/genobject.h b/python/include/genobject.h deleted file mode 100644 index 135561b7..00000000 --- a/python/include/genobject.h +++ /dev/null @@ -1,40 +0,0 @@ - -/* Generator object interface */ - -#ifndef Py_GENOBJECT_H -#define Py_GENOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -struct _frame; /* Avoid including frameobject.h */ - -typedef struct { - PyObject_HEAD - /* The gi_ prefix is intended to remind of generator-iterator. */ - - /* Note: gi_frame can be NULL if the generator is "finished" */ - struct _frame *gi_frame; - - /* True if generator is being executed. */ - int gi_running; - - /* The code object backing the generator */ - PyObject *gi_code; - - /* List of weak reference. */ - PyObject *gi_weakreflist; -} PyGenObject; - -PyAPI_DATA(PyTypeObject) PyGen_Type; - -#define PyGen_Check(op) PyObject_TypeCheck(op, &PyGen_Type) -#define PyGen_CheckExact(op) (Py_TYPE(op) == &PyGen_Type) - -PyAPI_FUNC(PyObject *) PyGen_New(struct _frame *); -PyAPI_FUNC(int) PyGen_NeedsFinalizing(PyGenObject *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_GENOBJECT_H */ diff --git a/python/include/graminit.h b/python/include/graminit.h deleted file mode 100644 index 40d531e8..00000000 --- a/python/include/graminit.h +++ /dev/null @@ -1,87 +0,0 @@ -/* Generated by Parser/pgen */ - -#define single_input 256 -#define file_input 257 -#define eval_input 258 -#define decorator 259 -#define decorators 260 -#define decorated 261 -#define funcdef 262 -#define parameters 263 -#define varargslist 264 -#define fpdef 265 -#define fplist 266 -#define stmt 267 -#define simple_stmt 268 -#define small_stmt 269 -#define expr_stmt 270 -#define augassign 271 -#define print_stmt 272 -#define del_stmt 273 -#define pass_stmt 274 -#define flow_stmt 275 -#define break_stmt 276 -#define continue_stmt 277 -#define return_stmt 278 -#define yield_stmt 279 -#define raise_stmt 280 -#define import_stmt 281 -#define import_name 282 -#define import_from 283 -#define import_as_name 284 -#define dotted_as_name 285 -#define import_as_names 286 -#define dotted_as_names 287 -#define dotted_name 288 -#define global_stmt 289 -#define exec_stmt 290 -#define assert_stmt 291 -#define compound_stmt 292 -#define if_stmt 293 -#define while_stmt 294 -#define for_stmt 295 -#define try_stmt 296 -#define with_stmt 297 -#define with_item 298 -#define except_clause 299 -#define suite 300 -#define testlist_safe 301 -#define old_test 302 -#define old_lambdef 303 -#define test 304 -#define or_test 305 -#define and_test 306 -#define not_test 307 -#define comparison 308 -#define comp_op 309 -#define expr 310 -#define xor_expr 311 -#define and_expr 312 -#define shift_expr 313 -#define arith_expr 314 -#define term 315 -#define factor 316 -#define power 317 -#define atom 318 -#define listmaker 319 -#define testlist_comp 320 -#define lambdef 321 -#define trailer 322 -#define subscriptlist 323 -#define subscript 324 -#define sliceop 325 -#define exprlist 326 -#define testlist 327 -#define dictorsetmaker 328 -#define classdef 329 -#define arglist 330 -#define argument 331 -#define list_iter 332 -#define list_for 333 -#define list_if 334 -#define comp_iter 335 -#define comp_for 336 -#define comp_if 337 -#define testlist1 338 -#define encoding_decl 339 -#define yield_expr 340 diff --git a/python/include/grammar.h b/python/include/grammar.h deleted file mode 100644 index 8426da30..00000000 --- a/python/include/grammar.h +++ /dev/null @@ -1,93 +0,0 @@ - -/* Grammar interface */ - -#ifndef Py_GRAMMAR_H -#define Py_GRAMMAR_H -#ifdef __cplusplus -extern "C" { -#endif - -#include "bitset.h" /* Sigh... */ - -/* A label of an arc */ - -typedef struct { - int lb_type; - char *lb_str; -} label; - -#define EMPTY 0 /* Label number 0 is by definition the empty label */ - -/* A list of labels */ - -typedef struct { - int ll_nlabels; - label *ll_label; -} labellist; - -/* An arc from one state to another */ - -typedef struct { - short a_lbl; /* Label of this arc */ - short a_arrow; /* State where this arc goes to */ -} arc; - -/* A state in a DFA */ - -typedef struct { - int s_narcs; - arc *s_arc; /* Array of arcs */ - - /* Optional accelerators */ - int s_lower; /* Lowest label index */ - int s_upper; /* Highest label index */ - int *s_accel; /* Accelerator */ - int s_accept; /* Nonzero for accepting state */ -} state; - -/* A DFA */ - -typedef struct { - int d_type; /* Non-terminal this represents */ - char *d_name; /* For printing */ - int d_initial; /* Initial state */ - int d_nstates; - state *d_state; /* Array of states */ - bitset d_first; -} dfa; - -/* A grammar */ - -typedef struct { - int g_ndfas; - dfa *g_dfa; /* Array of DFAs */ - labellist g_ll; - int g_start; /* Start symbol of the grammar */ - int g_accel; /* Set if accelerators present */ -} grammar; - -/* FUNCTIONS */ - -grammar *newgrammar(int start); -dfa *adddfa(grammar *g, int type, char *name); -int addstate(dfa *d); -void addarc(dfa *d, int from, int to, int lbl); -dfa *PyGrammar_FindDFA(grammar *g, int type); - -int addlabel(labellist *ll, int type, char *str); -int findlabel(labellist *ll, int type, char *str); -char *PyGrammar_LabelRepr(label *lb); -void translatelabels(grammar *g); - -void addfirstsets(grammar *g); - -void PyGrammar_AddAccelerators(grammar *g); -void PyGrammar_RemoveAccelerators(grammar *); - -void printgrammar(grammar *g, FILE *fp); -void printnonterminals(grammar *g, FILE *fp); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_GRAMMAR_H */ diff --git a/python/include/import.h b/python/include/import.h deleted file mode 100644 index 1b7fe0a7..00000000 --- a/python/include/import.h +++ /dev/null @@ -1,71 +0,0 @@ - -/* Module definition and import interface */ - -#ifndef Py_IMPORT_H -#define Py_IMPORT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(long) PyImport_GetMagicNumber(void); -PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule(char *name, PyObject *co); -PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx( - char *name, PyObject *co, char *pathname); -PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void); -PyAPI_FUNC(PyObject *) PyImport_AddModule(const char *name); -PyAPI_FUNC(PyObject *) PyImport_ImportModule(const char *name); -PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(const char *); -PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(char *name, - PyObject *globals, PyObject *locals, PyObject *fromlist, int level); - -#define PyImport_ImportModuleEx(n, g, l, f) \ - PyImport_ImportModuleLevel(n, g, l, f, -1) - -PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path); -PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name); -PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m); -PyAPI_FUNC(void) PyImport_Cleanup(void); -PyAPI_FUNC(int) PyImport_ImportFrozenModule(char *); - -#ifdef WITH_THREAD -PyAPI_FUNC(void) _PyImport_AcquireLock(void); -PyAPI_FUNC(int) _PyImport_ReleaseLock(void); -#else -#define _PyImport_AcquireLock() -#define _PyImport_ReleaseLock() 1 -#endif - -PyAPI_FUNC(struct filedescr *) _PyImport_FindModule( - const char *, PyObject *, char *, size_t, FILE **, PyObject **); -PyAPI_FUNC(int) _PyImport_IsScript(struct filedescr *); -PyAPI_FUNC(void) _PyImport_ReInitLock(void); - -PyAPI_FUNC(PyObject *)_PyImport_FindExtension(char *, char *); -PyAPI_FUNC(PyObject *)_PyImport_FixupExtension(char *, char *); - -struct _inittab { - char *name; - void (*initfunc)(void); -}; - -PyAPI_DATA(PyTypeObject) PyNullImporter_Type; -PyAPI_DATA(struct _inittab *) PyImport_Inittab; - -PyAPI_FUNC(int) PyImport_AppendInittab(const char *name, void (*initfunc)(void)); -PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab); - -struct _frozen { - char *name; - unsigned char *code; - int size; -}; - -/* Embedding apps may change this pointer to point to their favorite - collection of frozen modules: */ - -PyAPI_DATA(struct _frozen *) PyImport_FrozenModules; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_IMPORT_H */ diff --git a/python/include/intobject.h b/python/include/intobject.h deleted file mode 100644 index 78746a63..00000000 --- a/python/include/intobject.h +++ /dev/null @@ -1,80 +0,0 @@ - -/* Integer object interface */ - -/* -PyIntObject represents a (long) integer. This is an immutable object; -an integer cannot change its value after creation. - -There are functions to create new integer objects, to test an object -for integer-ness, and to get the integer value. The latter functions -returns -1 and sets errno to EBADF if the object is not an PyIntObject. -None of the functions should be applied to nil objects. - -The type PyIntObject is (unfortunately) exposed here so we can declare -_Py_TrueStruct and _Py_ZeroStruct in boolobject.h; don't use this. -*/ - -#ifndef Py_INTOBJECT_H -#define Py_INTOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_HEAD - long ob_ival; -} PyIntObject; - -PyAPI_DATA(PyTypeObject) PyInt_Type; - -#define PyInt_Check(op) \ - PyType_FastSubclass((op)->ob_type, Py_TPFLAGS_INT_SUBCLASS) -#define PyInt_CheckExact(op) ((op)->ob_type == &PyInt_Type) - -PyAPI_FUNC(PyObject *) PyInt_FromString(char*, char**, int); -#ifdef Py_USING_UNICODE -PyAPI_FUNC(PyObject *) PyInt_FromUnicode(Py_UNICODE*, Py_ssize_t, int); -#endif -PyAPI_FUNC(PyObject *) PyInt_FromLong(long); -PyAPI_FUNC(PyObject *) PyInt_FromSize_t(size_t); -PyAPI_FUNC(PyObject *) PyInt_FromSsize_t(Py_ssize_t); -PyAPI_FUNC(long) PyInt_AsLong(PyObject *); -PyAPI_FUNC(Py_ssize_t) PyInt_AsSsize_t(PyObject *); -PyAPI_FUNC(unsigned long) PyInt_AsUnsignedLongMask(PyObject *); -#ifdef HAVE_LONG_LONG -PyAPI_FUNC(unsigned PY_LONG_LONG) PyInt_AsUnsignedLongLongMask(PyObject *); -#endif - -PyAPI_FUNC(long) PyInt_GetMax(void); - -/* Macro, trading safety for speed */ -#define PyInt_AS_LONG(op) (((PyIntObject *)(op))->ob_ival) - -/* These aren't really part of the Int object, but they're handy; the protos - * are necessary for systems that need the magic of PyAPI_FUNC and that want - * to have stropmodule as a dynamically loaded module instead of building it - * into the main Python shared library/DLL. Guido thinks I'm weird for - * building it this way. :-) [cjh] - */ -PyAPI_FUNC(unsigned long) PyOS_strtoul(char *, char **, int); -PyAPI_FUNC(long) PyOS_strtol(char *, char **, int); - -/* free list api */ -PyAPI_FUNC(int) PyInt_ClearFreeList(void); - -/* Convert an integer to the given base. Returns a string. - If base is 2, 8 or 16, add the proper prefix '0b', '0o' or '0x'. - If newstyle is zero, then use the pre-2.6 behavior of octal having - a leading "0" */ -PyAPI_FUNC(PyObject*) _PyInt_Format(PyIntObject* v, int base, int newstyle); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyInt_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_INTOBJECT_H */ diff --git a/python/include/intrcheck.h b/python/include/intrcheck.h deleted file mode 100644 index 3b67ed0d..00000000 --- a/python/include/intrcheck.h +++ /dev/null @@ -1,15 +0,0 @@ - -#ifndef Py_INTRCHECK_H -#define Py_INTRCHECK_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(int) PyOS_InterruptOccurred(void); -PyAPI_FUNC(void) PyOS_InitInterrupts(void); -PyAPI_FUNC(void) PyOS_AfterFork(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_INTRCHECK_H */ diff --git a/python/include/iterobject.h b/python/include/iterobject.h deleted file mode 100644 index 4bd19c29..00000000 --- a/python/include/iterobject.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef Py_ITEROBJECT_H -#define Py_ITEROBJECT_H -/* Iterators (the basic kind, over a sequence) */ -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PySeqIter_Type; - -#define PySeqIter_Check(op) (Py_TYPE(op) == &PySeqIter_Type) - -PyAPI_FUNC(PyObject *) PySeqIter_New(PyObject *); - -PyAPI_DATA(PyTypeObject) PyCallIter_Type; - -#define PyCallIter_Check(op) (Py_TYPE(op) == &PyCallIter_Type) - -PyAPI_FUNC(PyObject *) PyCallIter_New(PyObject *, PyObject *); -#ifdef __cplusplus -} -#endif -#endif /* !Py_ITEROBJECT_H */ - diff --git a/python/include/listobject.h b/python/include/listobject.h deleted file mode 100644 index c4458733..00000000 --- a/python/include/listobject.h +++ /dev/null @@ -1,68 +0,0 @@ - -/* List object interface */ - -/* -Another generally useful object type is an list of object pointers. -This is a mutable type: the list items can be changed, and items can be -added or removed. Out-of-range indices or non-list objects are ignored. - -*** WARNING *** PyList_SetItem does not increment the new item's reference -count, but does decrement the reference count of the item it replaces, -if not nil. It does *decrement* the reference count if it is *not* -inserted in the list. Similarly, PyList_GetItem does not increment the -returned item's reference count. -*/ - -#ifndef Py_LISTOBJECT_H -#define Py_LISTOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - PyObject_VAR_HEAD - /* Vector of pointers to list elements. list[0] is ob_item[0], etc. */ - PyObject **ob_item; - - /* ob_item contains space for 'allocated' elements. The number - * currently in use is ob_size. - * Invariants: - * 0 <= ob_size <= allocated - * len(list) == ob_size - * ob_item == NULL implies ob_size == allocated == 0 - * list.sort() temporarily sets allocated to -1 to detect mutations. - * - * Items must normally not be NULL, except during construction when - * the list is not yet visible outside the function that builds it. - */ - Py_ssize_t allocated; -} PyListObject; - -PyAPI_DATA(PyTypeObject) PyList_Type; - -#define PyList_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS) -#define PyList_CheckExact(op) (Py_TYPE(op) == &PyList_Type) - -PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size); -PyAPI_FUNC(Py_ssize_t) PyList_Size(PyObject *); -PyAPI_FUNC(PyObject *) PyList_GetItem(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyList_SetItem(PyObject *, Py_ssize_t, PyObject *); -PyAPI_FUNC(int) PyList_Insert(PyObject *, Py_ssize_t, PyObject *); -PyAPI_FUNC(int) PyList_Append(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyList_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t); -PyAPI_FUNC(int) PyList_SetSlice(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *); -PyAPI_FUNC(int) PyList_Sort(PyObject *); -PyAPI_FUNC(int) PyList_Reverse(PyObject *); -PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *); -PyAPI_FUNC(PyObject *) _PyList_Extend(PyListObject *, PyObject *); - -/* Macro, trading safety for speed */ -#define PyList_GET_ITEM(op, i) (((PyListObject *)(op))->ob_item[i]) -#define PyList_SET_ITEM(op, i, v) (((PyListObject *)(op))->ob_item[i] = (v)) -#define PyList_GET_SIZE(op) Py_SIZE(op) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_LISTOBJECT_H */ diff --git a/python/include/longintrepr.h b/python/include/longintrepr.h deleted file mode 100644 index 6425c30f..00000000 --- a/python/include/longintrepr.h +++ /dev/null @@ -1,103 +0,0 @@ -#ifndef Py_LONGINTREPR_H -#define Py_LONGINTREPR_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* This is published for the benefit of "friend" marshal.c only. */ - -/* Parameters of the long integer representation. There are two different - sets of parameters: one set for 30-bit digits, stored in an unsigned 32-bit - integer type, and one set for 15-bit digits with each digit stored in an - unsigned short. The value of PYLONG_BITS_IN_DIGIT, defined either at - configure time or in pyport.h, is used to decide which digit size to use. - - Type 'digit' should be able to hold 2*PyLong_BASE-1, and type 'twodigits' - should be an unsigned integer type able to hold all integers up to - PyLong_BASE*PyLong_BASE-1. x_sub assumes that 'digit' is an unsigned type, - and that overflow is handled by taking the result modulo 2**N for some N > - PyLong_SHIFT. The majority of the code doesn't care about the precise - value of PyLong_SHIFT, but there are some notable exceptions: - - - long_pow() requires that PyLong_SHIFT be divisible by 5 - - - PyLong_{As,From}ByteArray require that PyLong_SHIFT be at least 8 - - - long_hash() requires that PyLong_SHIFT is *strictly* less than the number - of bits in an unsigned long, as do the PyLong <-> long (or unsigned long) - conversion functions - - - the long <-> size_t/Py_ssize_t conversion functions expect that - PyLong_SHIFT is strictly less than the number of bits in a size_t - - - the marshal code currently expects that PyLong_SHIFT is a multiple of 15 - - The values 15 and 30 should fit all of the above requirements, on any - platform. -*/ - -#if PYLONG_BITS_IN_DIGIT == 30 -#if !(defined HAVE_UINT64_T && defined HAVE_UINT32_T && \ - defined HAVE_INT64_T && defined HAVE_INT32_T) -#error "30-bit long digits requested, but the necessary types are not available on this platform" -#endif -typedef PY_UINT32_T digit; -typedef PY_INT32_T sdigit; /* signed variant of digit */ -typedef PY_UINT64_T twodigits; -typedef PY_INT64_T stwodigits; /* signed variant of twodigits */ -#define PyLong_SHIFT 30 -#define _PyLong_DECIMAL_SHIFT 9 /* max(e such that 10**e fits in a digit) */ -#define _PyLong_DECIMAL_BASE ((digit)1000000000) /* 10 ** DECIMAL_SHIFT */ -#elif PYLONG_BITS_IN_DIGIT == 15 -typedef unsigned short digit; -typedef short sdigit; /* signed variant of digit */ -typedef unsigned long twodigits; -typedef long stwodigits; /* signed variant of twodigits */ -#define PyLong_SHIFT 15 -#define _PyLong_DECIMAL_SHIFT 4 /* max(e such that 10**e fits in a digit) */ -#define _PyLong_DECIMAL_BASE ((digit)10000) /* 10 ** DECIMAL_SHIFT */ -#else -#error "PYLONG_BITS_IN_DIGIT should be 15 or 30" -#endif -#define PyLong_BASE ((digit)1 << PyLong_SHIFT) -#define PyLong_MASK ((digit)(PyLong_BASE - 1)) - -/* b/w compatibility with Python 2.5 */ -#define SHIFT PyLong_SHIFT -#define BASE PyLong_BASE -#define MASK PyLong_MASK - -#if PyLong_SHIFT % 5 != 0 -#error "longobject.c requires that PyLong_SHIFT be divisible by 5" -#endif - -/* Long integer representation. - The absolute value of a number is equal to - SUM(for i=0 through abs(ob_size)-1) ob_digit[i] * 2**(SHIFT*i) - Negative numbers are represented with ob_size < 0; - zero is represented by ob_size == 0. - In a normalized number, ob_digit[abs(ob_size)-1] (the most significant - digit) is never zero. Also, in all cases, for all valid i, - 0 <= ob_digit[i] <= MASK. - The allocation function takes care of allocating extra memory - so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available. - - CAUTION: Generic code manipulating subtypes of PyVarObject has to - aware that longs abuse ob_size's sign bit. -*/ - -struct _longobject { - PyObject_VAR_HEAD - digit ob_digit[1]; -}; - -PyAPI_FUNC(PyLongObject *) _PyLong_New(Py_ssize_t); - -/* Return a copy of src. */ -PyAPI_FUNC(PyObject *) _PyLong_Copy(PyLongObject *src); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_LONGINTREPR_H */ diff --git a/python/include/longobject.h b/python/include/longobject.h deleted file mode 100644 index 2b404612..00000000 --- a/python/include/longobject.h +++ /dev/null @@ -1,134 +0,0 @@ -#ifndef Py_LONGOBJECT_H -#define Py_LONGOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Long (arbitrary precision) integer object interface */ - -typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */ - -PyAPI_DATA(PyTypeObject) PyLong_Type; - -#define PyLong_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LONG_SUBCLASS) -#define PyLong_CheckExact(op) (Py_TYPE(op) == &PyLong_Type) - -PyAPI_FUNC(PyObject *) PyLong_FromLong(long); -PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLong(unsigned long); -PyAPI_FUNC(PyObject *) PyLong_FromDouble(double); -PyAPI_FUNC(PyObject *) PyLong_FromSize_t(size_t); -PyAPI_FUNC(PyObject *) PyLong_FromSsize_t(Py_ssize_t); -PyAPI_FUNC(long) PyLong_AsLong(PyObject *); -PyAPI_FUNC(long) PyLong_AsLongAndOverflow(PyObject *, int *); -PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLong(PyObject *); -PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLongMask(PyObject *); -PyAPI_FUNC(Py_ssize_t) PyLong_AsSsize_t(PyObject *); -PyAPI_FUNC(PyObject *) PyLong_GetInfo(void); - -/* For use by intobject.c only */ -#define _PyLong_AsSsize_t PyLong_AsSsize_t -#define _PyLong_FromSize_t PyLong_FromSize_t -#define _PyLong_FromSsize_t PyLong_FromSsize_t -PyAPI_DATA(int) _PyLong_DigitValue[256]; - -/* _PyLong_Frexp returns a double x and an exponent e such that the - true value is approximately equal to x * 2**e. e is >= 0. x is - 0.0 if and only if the input is 0 (in which case, e and x are both - zeroes); otherwise, 0.5 <= abs(x) < 1.0. On overflow, which is - possible if the number of bits doesn't fit into a Py_ssize_t, sets - OverflowError and returns -1.0 for x, 0 for e. */ -PyAPI_FUNC(double) _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e); - -PyAPI_FUNC(double) PyLong_AsDouble(PyObject *); -PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *); -PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *); - -#ifdef HAVE_LONG_LONG -PyAPI_FUNC(PyObject *) PyLong_FromLongLong(PY_LONG_LONG); -PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned PY_LONG_LONG); -PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLong(PyObject *); -PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *); -PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *); -PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLongAndOverflow(PyObject *, int *); -#endif /* HAVE_LONG_LONG */ - -PyAPI_FUNC(PyObject *) PyLong_FromString(char *, char **, int); -#ifdef Py_USING_UNICODE -PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int); -#endif - -/* _PyLong_Sign. Return 0 if v is 0, -1 if v < 0, +1 if v > 0. - v must not be NULL, and must be a normalized long. - There are no error cases. -*/ -PyAPI_FUNC(int) _PyLong_Sign(PyObject *v); - - -/* _PyLong_NumBits. Return the number of bits needed to represent the - absolute value of a long. For example, this returns 1 for 1 and -1, 2 - for 2 and -2, and 2 for 3 and -3. It returns 0 for 0. - v must not be NULL, and must be a normalized long. - (size_t)-1 is returned and OverflowError set if the true result doesn't - fit in a size_t. -*/ -PyAPI_FUNC(size_t) _PyLong_NumBits(PyObject *v); - -/* _PyLong_FromByteArray: View the n unsigned bytes as a binary integer in - base 256, and return a Python long with the same numeric value. - If n is 0, the integer is 0. Else: - If little_endian is 1/true, bytes[n-1] is the MSB and bytes[0] the LSB; - else (little_endian is 0/false) bytes[0] is the MSB and bytes[n-1] the - LSB. - If is_signed is 0/false, view the bytes as a non-negative integer. - If is_signed is 1/true, view the bytes as a 2's-complement integer, - non-negative if bit 0x80 of the MSB is clear, negative if set. - Error returns: - + Return NULL with the appropriate exception set if there's not - enough memory to create the Python long. -*/ -PyAPI_FUNC(PyObject *) _PyLong_FromByteArray( - const unsigned char* bytes, size_t n, - int little_endian, int is_signed); - -/* _PyLong_AsByteArray: Convert the least-significant 8*n bits of long - v to a base-256 integer, stored in array bytes. Normally return 0, - return -1 on error. - If little_endian is 1/true, store the MSB at bytes[n-1] and the LSB at - bytes[0]; else (little_endian is 0/false) store the MSB at bytes[0] and - the LSB at bytes[n-1]. - If is_signed is 0/false, it's an error if v < 0; else (v >= 0) n bytes - are filled and there's nothing special about bit 0x80 of the MSB. - If is_signed is 1/true, bytes is filled with the 2's-complement - representation of v's value. Bit 0x80 of the MSB is the sign bit. - Error returns (-1): - + is_signed is 0 and v < 0. TypeError is set in this case, and bytes - isn't altered. - + n isn't big enough to hold the full mathematical value of v. For - example, if is_signed is 0 and there are more digits in the v than - fit in n; or if is_signed is 1, v < 0, and n is just 1 bit shy of - being large enough to hold a sign bit. OverflowError is set in this - case, but bytes holds the least-signficant n bytes of the true value. -*/ -PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v, - unsigned char* bytes, size_t n, - int little_endian, int is_signed); - -/* _PyLong_Format: Convert the long to a string object with given base, - appending a base prefix of 0[box] if base is 2, 8 or 16. - Add a trailing "L" if addL is non-zero. - If newstyle is zero, then use the pre-2.6 behavior of octal having - a leading "0", instead of the prefix "0o" */ -PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *aa, int base, int addL, int newstyle); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyLong_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_LONGOBJECT_H */ diff --git a/python/include/marshal.h b/python/include/marshal.h deleted file mode 100644 index 411fdca3..00000000 --- a/python/include/marshal.h +++ /dev/null @@ -1,25 +0,0 @@ - -/* Interface for marshal.c */ - -#ifndef Py_MARSHAL_H -#define Py_MARSHAL_H -#ifdef __cplusplus -extern "C" { -#endif - -#define Py_MARSHAL_VERSION 2 - -PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *, int); -PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *, int); -PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *, int); - -PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *); -PyAPI_FUNC(int) PyMarshal_ReadShortFromFile(FILE *); -PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromFile(FILE *); -PyAPI_FUNC(PyObject *) PyMarshal_ReadLastObjectFromFile(FILE *); -PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(char *, Py_ssize_t); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MARSHAL_H */ diff --git a/python/include/memoryobject.h b/python/include/memoryobject.h deleted file mode 100644 index bf0b621a..00000000 --- a/python/include/memoryobject.h +++ /dev/null @@ -1,74 +0,0 @@ -/* Memory view object. In Python this is available as "memoryview". */ - -#ifndef Py_MEMORYOBJECT_H -#define Py_MEMORYOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyMemoryView_Type; - -#define PyMemoryView_Check(op) (Py_TYPE(op) == &PyMemoryView_Type) - -/* Get a pointer to the underlying Py_buffer of a memoryview object. */ -#define PyMemoryView_GET_BUFFER(op) (&((PyMemoryViewObject *)(op))->view) -/* Get a pointer to the PyObject from which originates a memoryview object. */ -#define PyMemoryView_GET_BASE(op) (((PyMemoryViewObject *)(op))->view.obj) - - -PyAPI_FUNC(PyObject *) PyMemoryView_GetContiguous(PyObject *base, - int buffertype, - char fort); - - /* Return a contiguous chunk of memory representing the buffer - from an object in a memory view object. If a copy is made then the - base object for the memory view will be a *new* bytes object. - - Otherwise, the base-object will be the object itself and no - data-copying will be done. - - The buffertype argument can be PyBUF_READ, PyBUF_WRITE, - PyBUF_SHADOW to determine whether the returned buffer - should be READONLY, WRITABLE, or set to update the - original buffer if a copy must be made. If buffertype is - PyBUF_WRITE and the buffer is not contiguous an error will - be raised. In this circumstance, the user can use - PyBUF_SHADOW to ensure that a a writable temporary - contiguous buffer is returned. The contents of this - contiguous buffer will be copied back into the original - object after the memoryview object is deleted as long as - the original object is writable and allows setting an - exclusive write lock. If this is not allowed by the - original object, then a BufferError is raised. - - If the object is multi-dimensional and if fortran is 'F', - the first dimension of the underlying array will vary the - fastest in the buffer. If fortran is 'C', then the last - dimension will vary the fastest (C-style contiguous). If - fortran is 'A', then it does not matter and you will get - whatever the object decides is more efficient. - - A new reference is returned that must be DECREF'd when finished. - */ - -PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base); - -PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info); - /* create new if bufptr is NULL - will be a new bytesobject in base */ - - -/* The struct is declared here so that macros can work, but it shouldn't - be considered public. Don't access those fields directly, use the macros - and functions instead! */ -typedef struct { - PyObject_HEAD - PyObject *base; - Py_buffer view; -} PyMemoryViewObject; - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MEMORYOBJECT_H */ diff --git a/python/include/metagrammar.h b/python/include/metagrammar.h deleted file mode 100644 index 15c8ef8f..00000000 --- a/python/include/metagrammar.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef Py_METAGRAMMAR_H -#define Py_METAGRAMMAR_H -#ifdef __cplusplus -extern "C" { -#endif - - -#define MSTART 256 -#define RULE 257 -#define RHS 258 -#define ALT 259 -#define ITEM 260 -#define ATOM 261 - -#ifdef __cplusplus -} -#endif -#endif /* !Py_METAGRAMMAR_H */ diff --git a/python/include/methodobject.h b/python/include/methodobject.h deleted file mode 100644 index 6e160b63..00000000 --- a/python/include/methodobject.h +++ /dev/null @@ -1,93 +0,0 @@ - -/* Method object interface */ - -#ifndef Py_METHODOBJECT_H -#define Py_METHODOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* This is about the type 'builtin_function_or_method', - not Python methods in user-defined classes. See classobject.h - for the latter. */ - -PyAPI_DATA(PyTypeObject) PyCFunction_Type; - -#define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type) - -typedef PyObject *(*PyCFunction)(PyObject *, PyObject *); -typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *, - PyObject *); -typedef PyObject *(*PyNoArgsFunction)(PyObject *); - -PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *); -PyAPI_FUNC(PyObject *) PyCFunction_GetSelf(PyObject *); -PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *); - -/* Macros for direct access to these values. Type checks are *not* - done, so use with care. */ -#define PyCFunction_GET_FUNCTION(func) \ - (((PyCFunctionObject *)func) -> m_ml -> ml_meth) -#define PyCFunction_GET_SELF(func) \ - (((PyCFunctionObject *)func) -> m_self) -#define PyCFunction_GET_FLAGS(func) \ - (((PyCFunctionObject *)func) -> m_ml -> ml_flags) -PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *); - -struct PyMethodDef { - const char *ml_name; /* The name of the built-in function/method */ - PyCFunction ml_meth; /* The C function that implements it */ - int ml_flags; /* Combination of METH_xxx flags, which mostly - describe the args expected by the C func */ - const char *ml_doc; /* The __doc__ attribute, or NULL */ -}; -typedef struct PyMethodDef PyMethodDef; - -PyAPI_FUNC(PyObject *) Py_FindMethod(PyMethodDef[], PyObject *, const char *); - -#define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL) -PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *, - PyObject *); - -/* Flag passed to newmethodobject */ -#define METH_OLDARGS 0x0000 -#define METH_VARARGS 0x0001 -#define METH_KEYWORDS 0x0002 -/* METH_NOARGS and METH_O must not be combined with the flags above. */ -#define METH_NOARGS 0x0004 -#define METH_O 0x0008 - -/* METH_CLASS and METH_STATIC are a little different; these control - the construction of methods for a class. These cannot be used for - functions in modules. */ -#define METH_CLASS 0x0010 -#define METH_STATIC 0x0020 - -/* METH_COEXIST allows a method to be entered eventhough a slot has - already filled the entry. When defined, the flag allows a separate - method, "__contains__" for example, to coexist with a defined - slot like sq_contains. */ - -#define METH_COEXIST 0x0040 - -typedef struct PyMethodChain { - PyMethodDef *methods; /* Methods of this type */ - struct PyMethodChain *link; /* NULL or base type */ -} PyMethodChain; - -PyAPI_FUNC(PyObject *) Py_FindMethodInChain(PyMethodChain *, PyObject *, - const char *); - -typedef struct { - PyObject_HEAD - PyMethodDef *m_ml; /* Description of the C function to call */ - PyObject *m_self; /* Passed as 'self' arg to the C func, can be NULL */ - PyObject *m_module; /* The __module__ attribute, can be anything */ -} PyCFunctionObject; - -PyAPI_FUNC(int) PyCFunction_ClearFreeList(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_METHODOBJECT_H */ diff --git a/python/include/modsupport.h b/python/include/modsupport.h deleted file mode 100644 index d4dddef0..00000000 --- a/python/include/modsupport.h +++ /dev/null @@ -1,134 +0,0 @@ - -#ifndef Py_MODSUPPORT_H -#define Py_MODSUPPORT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Module support interface */ - -#include - -/* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier - to mean Py_ssize_t */ -#ifdef PY_SSIZE_T_CLEAN -#define PyArg_Parse _PyArg_Parse_SizeT -#define PyArg_ParseTuple _PyArg_ParseTuple_SizeT -#define PyArg_ParseTupleAndKeywords _PyArg_ParseTupleAndKeywords_SizeT -#define PyArg_VaParse _PyArg_VaParse_SizeT -#define PyArg_VaParseTupleAndKeywords _PyArg_VaParseTupleAndKeywords_SizeT -#define Py_BuildValue _Py_BuildValue_SizeT -#define Py_VaBuildValue _Py_VaBuildValue_SizeT -#else -PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list); -#endif - -PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); -PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3); -PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, - const char *, char **, ...); -PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...); -PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...); -PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...); -PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kw); - -PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); -PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *, - const char *, char **, va_list); -PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list); - -PyAPI_FUNC(int) PyModule_AddObject(PyObject *, const char *, PyObject *); -PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long); -PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *); -#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c) -#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c) - -#define PYTHON_API_VERSION 1013 -#define PYTHON_API_STRING "1013" -/* The API version is maintained (independently from the Python version) - so we can detect mismatches between the interpreter and dynamically - loaded modules. These are diagnosed by an error message but - the module is still loaded (because the mismatch can only be tested - after loading the module). The error message is intended to - explain the core dump a few seconds later. - - The symbol PYTHON_API_STRING defines the same value as a string - literal. *** PLEASE MAKE SURE THE DEFINITIONS MATCH. *** - - Please add a line or two to the top of this log for each API - version change: - - 22-Feb-2006 MvL 1013 PEP 353 - long indices for sequence lengths - - 19-Aug-2002 GvR 1012 Changes to string object struct for - interning changes, saving 3 bytes. - - 17-Jul-2001 GvR 1011 Descr-branch, just to be on the safe side - - 25-Jan-2001 FLD 1010 Parameters added to PyCode_New() and - PyFrame_New(); Python 2.1a2 - - 14-Mar-2000 GvR 1009 Unicode API added - - 3-Jan-1999 GvR 1007 Decided to change back! (Don't reuse 1008!) - - 3-Dec-1998 GvR 1008 Python 1.5.2b1 - - 18-Jan-1997 GvR 1007 string interning and other speedups - - 11-Oct-1996 GvR renamed Py_Ellipses to Py_Ellipsis :-( - - 30-Jul-1996 GvR Slice and ellipses syntax added - - 23-Jul-1996 GvR For 1.4 -- better safe than sorry this time :-) - - 7-Nov-1995 GvR Keyword arguments (should've been done at 1.3 :-( ) - - 10-Jan-1995 GvR Renamed globals to new naming scheme - - 9-Jan-1995 GvR Initial version (incompatible with older API) -*/ - -#ifdef MS_WINDOWS -/* Special defines for Windows versions used to live here. Things - have changed, and the "Version" is now in a global string variable. - Reason for this is that this for easier branding of a "custom DLL" - without actually needing a recompile. */ -#endif /* MS_WINDOWS */ - -#if SIZEOF_SIZE_T != SIZEOF_INT -/* On a 64-bit system, rename the Py_InitModule4 so that 2.4 - modules cannot get loaded into a 2.5 interpreter */ -#define Py_InitModule4 Py_InitModule4_64 -#endif - -#ifdef Py_TRACE_REFS - /* When we are tracing reference counts, rename Py_InitModule4 so - modules compiled with incompatible settings will generate a - link-time error. */ - #if SIZEOF_SIZE_T != SIZEOF_INT - #undef Py_InitModule4 - #define Py_InitModule4 Py_InitModule4TraceRefs_64 - #else - #define Py_InitModule4 Py_InitModule4TraceRefs - #endif -#endif - -PyAPI_FUNC(PyObject *) Py_InitModule4(const char *name, PyMethodDef *methods, - const char *doc, PyObject *self, - int apiver); - -#define Py_InitModule(name, methods) \ - Py_InitModule4(name, methods, (char *)NULL, (PyObject *)NULL, \ - PYTHON_API_VERSION) - -#define Py_InitModule3(name, methods, doc) \ - Py_InitModule4(name, methods, doc, (PyObject *)NULL, \ - PYTHON_API_VERSION) - -PyAPI_DATA(char *) _Py_PackageContext; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MODSUPPORT_H */ diff --git a/python/include/moduleobject.h b/python/include/moduleobject.h deleted file mode 100644 index b387f5bf..00000000 --- a/python/include/moduleobject.h +++ /dev/null @@ -1,24 +0,0 @@ - -/* Module object interface */ - -#ifndef Py_MODULEOBJECT_H -#define Py_MODULEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyModule_Type; - -#define PyModule_Check(op) PyObject_TypeCheck(op, &PyModule_Type) -#define PyModule_CheckExact(op) (Py_TYPE(op) == &PyModule_Type) - -PyAPI_FUNC(PyObject *) PyModule_New(const char *); -PyAPI_FUNC(PyObject *) PyModule_GetDict(PyObject *); -PyAPI_FUNC(char *) PyModule_GetName(PyObject *); -PyAPI_FUNC(char *) PyModule_GetFilename(PyObject *); -PyAPI_FUNC(void) _PyModule_Clear(PyObject *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_MODULEOBJECT_H */ diff --git a/python/include/node.h b/python/include/node.h deleted file mode 100644 index e23e709f..00000000 --- a/python/include/node.h +++ /dev/null @@ -1,40 +0,0 @@ - -/* Parse tree node interface */ - -#ifndef Py_NODE_H -#define Py_NODE_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct _node { - short n_type; - char *n_str; - int n_lineno; - int n_col_offset; - int n_nchildren; - struct _node *n_child; -} node; - -PyAPI_FUNC(node *) PyNode_New(int type); -PyAPI_FUNC(int) PyNode_AddChild(node *n, int type, - char *str, int lineno, int col_offset); -PyAPI_FUNC(void) PyNode_Free(node *n); - -/* Node access functions */ -#define NCH(n) ((n)->n_nchildren) - -#define CHILD(n, i) (&(n)->n_child[i]) -#define RCHILD(n, i) (CHILD(n, NCH(n) + i)) -#define TYPE(n) ((n)->n_type) -#define STR(n) ((n)->n_str) - -/* Assert that the type of a node is what we expect */ -#define REQ(n, type) assert(TYPE(n) == (type)) - -PyAPI_FUNC(void) PyNode_ListTree(node *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_NODE_H */ diff --git a/python/include/object.h b/python/include/object.h deleted file mode 100644 index edcd3fc2..00000000 --- a/python/include/object.h +++ /dev/null @@ -1,996 +0,0 @@ -#ifndef Py_OBJECT_H -#define Py_OBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Object and type object interface */ - -/* -Objects are structures allocated on the heap. Special rules apply to -the use of objects to ensure they are properly garbage-collected. -Objects are never allocated statically or on the stack; they must be -accessed through special macros and functions only. (Type objects are -exceptions to the first rule; the standard types are represented by -statically initialized type objects, although work on type/class unification -for Python 2.2 made it possible to have heap-allocated type objects too). - -An object has a 'reference count' that is increased or decreased when a -pointer to the object is copied or deleted; when the reference count -reaches zero there are no references to the object left and it can be -removed from the heap. - -An object has a 'type' that determines what it represents and what kind -of data it contains. An object's type is fixed when it is created. -Types themselves are represented as objects; an object contains a -pointer to the corresponding type object. The type itself has a type -pointer pointing to the object representing the type 'type', which -contains a pointer to itself!). - -Objects do not float around in memory; once allocated an object keeps -the same size and address. Objects that must hold variable-size data -can contain pointers to variable-size parts of the object. Not all -objects of the same type have the same size; but the size cannot change -after allocation. (These restrictions are made so a reference to an -object can be simply a pointer -- moving an object would require -updating all the pointers, and changing an object's size would require -moving it if there was another object right next to it.) - -Objects are always accessed through pointers of the type 'PyObject *'. -The type 'PyObject' is a structure that only contains the reference count -and the type pointer. The actual memory allocated for an object -contains other data that can only be accessed after casting the pointer -to a pointer to a longer structure type. This longer type must start -with the reference count and type fields; the macro PyObject_HEAD should be -used for this (to accommodate for future changes). The implementation -of a particular object type can cast the object pointer to the proper -type and back. - -A standard interface exists for objects that contain an array of items -whose size is determined when the object is allocated. -*/ - -/* Py_DEBUG implies Py_TRACE_REFS. */ -#if defined(Py_DEBUG) && !defined(Py_TRACE_REFS) -#define Py_TRACE_REFS -#endif - -/* Py_TRACE_REFS implies Py_REF_DEBUG. */ -#if defined(Py_TRACE_REFS) && !defined(Py_REF_DEBUG) -#define Py_REF_DEBUG -#endif - -#ifdef Py_TRACE_REFS -/* Define pointers to support a doubly-linked list of all live heap objects. */ -#define _PyObject_HEAD_EXTRA \ - struct _object *_ob_next; \ - struct _object *_ob_prev; - -#define _PyObject_EXTRA_INIT 0, 0, - -#else -#define _PyObject_HEAD_EXTRA -#define _PyObject_EXTRA_INIT -#endif - -/* PyObject_HEAD defines the initial segment of every PyObject. */ -#define PyObject_HEAD \ - _PyObject_HEAD_EXTRA \ - Py_ssize_t ob_refcnt; \ - struct _typeobject *ob_type; - -#define PyObject_HEAD_INIT(type) \ - _PyObject_EXTRA_INIT \ - 1, type, - -#define PyVarObject_HEAD_INIT(type, size) \ - PyObject_HEAD_INIT(type) size, - -/* PyObject_VAR_HEAD defines the initial segment of all variable-size - * container objects. These end with a declaration of an array with 1 - * element, but enough space is malloc'ed so that the array actually - * has room for ob_size elements. Note that ob_size is an element count, - * not necessarily a byte count. - */ -#define PyObject_VAR_HEAD \ - PyObject_HEAD \ - Py_ssize_t ob_size; /* Number of items in variable part */ -#define Py_INVALID_SIZE (Py_ssize_t)-1 - -/* Nothing is actually declared to be a PyObject, but every pointer to - * a Python object can be cast to a PyObject*. This is inheritance built - * by hand. Similarly every pointer to a variable-size Python object can, - * in addition, be cast to PyVarObject*. - */ -typedef struct _object { - PyObject_HEAD -} PyObject; - -typedef struct { - PyObject_VAR_HEAD -} PyVarObject; - -#define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt) -#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type) -#define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size) - -/* -Type objects contain a string containing the type name (to help somewhat -in debugging), the allocation parameters (see PyObject_New() and -PyObject_NewVar()), -and methods for accessing objects of the type. Methods are optional, a -nil pointer meaning that particular kind of access is not available for -this type. The Py_DECREF() macro uses the tp_dealloc method without -checking for a nil pointer; it should always be implemented except if -the implementation can guarantee that the reference count will never -reach zero (e.g., for statically allocated type objects). - -NB: the methods for certain type groups are now contained in separate -method blocks. -*/ - -typedef PyObject * (*unaryfunc)(PyObject *); -typedef PyObject * (*binaryfunc)(PyObject *, PyObject *); -typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *); -typedef int (*inquiry)(PyObject *); -typedef Py_ssize_t (*lenfunc)(PyObject *); -typedef int (*coercion)(PyObject **, PyObject **); -typedef PyObject *(*intargfunc)(PyObject *, int) Py_DEPRECATED(2.5); -typedef PyObject *(*intintargfunc)(PyObject *, int, int) Py_DEPRECATED(2.5); -typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t); -typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t); -typedef int(*intobjargproc)(PyObject *, int, PyObject *); -typedef int(*intintobjargproc)(PyObject *, int, int, PyObject *); -typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *); -typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *); -typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *); - - - -/* int-based buffer interface */ -typedef int (*getreadbufferproc)(PyObject *, int, void **); -typedef int (*getwritebufferproc)(PyObject *, int, void **); -typedef int (*getsegcountproc)(PyObject *, int *); -typedef int (*getcharbufferproc)(PyObject *, int, char **); -/* ssize_t-based buffer interface */ -typedef Py_ssize_t (*readbufferproc)(PyObject *, Py_ssize_t, void **); -typedef Py_ssize_t (*writebufferproc)(PyObject *, Py_ssize_t, void **); -typedef Py_ssize_t (*segcountproc)(PyObject *, Py_ssize_t *); -typedef Py_ssize_t (*charbufferproc)(PyObject *, Py_ssize_t, char **); - - -/* Py3k buffer interface */ -typedef struct bufferinfo { - void *buf; - PyObject *obj; /* owned reference */ - Py_ssize_t len; - Py_ssize_t itemsize; /* This is Py_ssize_t so it can be - pointed to by strides in simple case.*/ - int readonly; - int ndim; - char *format; - Py_ssize_t *shape; - Py_ssize_t *strides; - Py_ssize_t *suboffsets; - Py_ssize_t smalltable[2]; /* static store for shape and strides of - mono-dimensional buffers. */ - void *internal; -} Py_buffer; - -typedef int (*getbufferproc)(PyObject *, Py_buffer *, int); -typedef void (*releasebufferproc)(PyObject *, Py_buffer *); - - /* Flags for getting buffers */ -#define PyBUF_SIMPLE 0 -#define PyBUF_WRITABLE 0x0001 -/* we used to include an E, backwards compatible alias */ -#define PyBUF_WRITEABLE PyBUF_WRITABLE -#define PyBUF_FORMAT 0x0004 -#define PyBUF_ND 0x0008 -#define PyBUF_STRIDES (0x0010 | PyBUF_ND) -#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES) -#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES) -#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES) -#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES) - -#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE) -#define PyBUF_CONTIG_RO (PyBUF_ND) - -#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE) -#define PyBUF_STRIDED_RO (PyBUF_STRIDES) - -#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT) -#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT) - -#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT) -#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT) - - -#define PyBUF_READ 0x100 -#define PyBUF_WRITE 0x200 -#define PyBUF_SHADOW 0x400 -/* end Py3k buffer interface */ - -typedef int (*objobjproc)(PyObject *, PyObject *); -typedef int (*visitproc)(PyObject *, void *); -typedef int (*traverseproc)(PyObject *, visitproc, void *); - -typedef struct { - /* For numbers without flag bit Py_TPFLAGS_CHECKTYPES set, all - arguments are guaranteed to be of the object's type (modulo - coercion hacks -- i.e. if the type's coercion function - returns other types, then these are allowed as well). Numbers that - have the Py_TPFLAGS_CHECKTYPES flag bit set should check *both* - arguments for proper type and implement the necessary conversions - in the slot functions themselves. */ - - binaryfunc nb_add; - binaryfunc nb_subtract; - binaryfunc nb_multiply; - binaryfunc nb_divide; - binaryfunc nb_remainder; - binaryfunc nb_divmod; - ternaryfunc nb_power; - unaryfunc nb_negative; - unaryfunc nb_positive; - unaryfunc nb_absolute; - inquiry nb_nonzero; - unaryfunc nb_invert; - binaryfunc nb_lshift; - binaryfunc nb_rshift; - binaryfunc nb_and; - binaryfunc nb_xor; - binaryfunc nb_or; - coercion nb_coerce; - unaryfunc nb_int; - unaryfunc nb_long; - unaryfunc nb_float; - unaryfunc nb_oct; - unaryfunc nb_hex; - /* Added in release 2.0 */ - binaryfunc nb_inplace_add; - binaryfunc nb_inplace_subtract; - binaryfunc nb_inplace_multiply; - binaryfunc nb_inplace_divide; - binaryfunc nb_inplace_remainder; - ternaryfunc nb_inplace_power; - binaryfunc nb_inplace_lshift; - binaryfunc nb_inplace_rshift; - binaryfunc nb_inplace_and; - binaryfunc nb_inplace_xor; - binaryfunc nb_inplace_or; - - /* Added in release 2.2 */ - /* The following require the Py_TPFLAGS_HAVE_CLASS flag */ - binaryfunc nb_floor_divide; - binaryfunc nb_true_divide; - binaryfunc nb_inplace_floor_divide; - binaryfunc nb_inplace_true_divide; - - /* Added in release 2.5 */ - unaryfunc nb_index; -} PyNumberMethods; - -typedef struct { - lenfunc sq_length; - binaryfunc sq_concat; - ssizeargfunc sq_repeat; - ssizeargfunc sq_item; - ssizessizeargfunc sq_slice; - ssizeobjargproc sq_ass_item; - ssizessizeobjargproc sq_ass_slice; - objobjproc sq_contains; - /* Added in release 2.0 */ - binaryfunc sq_inplace_concat; - ssizeargfunc sq_inplace_repeat; -} PySequenceMethods; - -typedef struct { - lenfunc mp_length; - binaryfunc mp_subscript; - objobjargproc mp_ass_subscript; -} PyMappingMethods; - -typedef struct { - readbufferproc bf_getreadbuffer; - writebufferproc bf_getwritebuffer; - segcountproc bf_getsegcount; - charbufferproc bf_getcharbuffer; - getbufferproc bf_getbuffer; - releasebufferproc bf_releasebuffer; -} PyBufferProcs; - - -typedef void (*freefunc)(void *); -typedef void (*destructor)(PyObject *); -typedef int (*printfunc)(PyObject *, FILE *, int); -typedef PyObject *(*getattrfunc)(PyObject *, char *); -typedef PyObject *(*getattrofunc)(PyObject *, PyObject *); -typedef int (*setattrfunc)(PyObject *, char *, PyObject *); -typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *); -typedef int (*cmpfunc)(PyObject *, PyObject *); -typedef PyObject *(*reprfunc)(PyObject *); -typedef long (*hashfunc)(PyObject *); -typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int); -typedef PyObject *(*getiterfunc) (PyObject *); -typedef PyObject *(*iternextfunc) (PyObject *); -typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *); -typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *); -typedef int (*initproc)(PyObject *, PyObject *, PyObject *); -typedef PyObject *(*newfunc)(struct _typeobject *, PyObject *, PyObject *); -typedef PyObject *(*allocfunc)(struct _typeobject *, Py_ssize_t); - -typedef struct _typeobject { - PyObject_VAR_HEAD - const char *tp_name; /* For printing, in format "." */ - Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */ - - /* Methods to implement standard operations */ - - destructor tp_dealloc; - printfunc tp_print; - getattrfunc tp_getattr; - setattrfunc tp_setattr; - cmpfunc tp_compare; - reprfunc tp_repr; - - /* Method suites for standard classes */ - - PyNumberMethods *tp_as_number; - PySequenceMethods *tp_as_sequence; - PyMappingMethods *tp_as_mapping; - - /* More standard operations (here for binary compatibility) */ - - hashfunc tp_hash; - ternaryfunc tp_call; - reprfunc tp_str; - getattrofunc tp_getattro; - setattrofunc tp_setattro; - - /* Functions to access object as input/output buffer */ - PyBufferProcs *tp_as_buffer; - - /* Flags to define presence of optional/expanded features */ - long tp_flags; - - const char *tp_doc; /* Documentation string */ - - /* Assigned meaning in release 2.0 */ - /* call function for all accessible objects */ - traverseproc tp_traverse; - - /* delete references to contained objects */ - inquiry tp_clear; - - /* Assigned meaning in release 2.1 */ - /* rich comparisons */ - richcmpfunc tp_richcompare; - - /* weak reference enabler */ - Py_ssize_t tp_weaklistoffset; - - /* Added in release 2.2 */ - /* Iterators */ - getiterfunc tp_iter; - iternextfunc tp_iternext; - - /* Attribute descriptor and subclassing stuff */ - struct PyMethodDef *tp_methods; - struct PyMemberDef *tp_members; - struct PyGetSetDef *tp_getset; - struct _typeobject *tp_base; - PyObject *tp_dict; - descrgetfunc tp_descr_get; - descrsetfunc tp_descr_set; - Py_ssize_t tp_dictoffset; - initproc tp_init; - allocfunc tp_alloc; - newfunc tp_new; - freefunc tp_free; /* Low-level free-memory routine */ - inquiry tp_is_gc; /* For PyObject_IS_GC */ - PyObject *tp_bases; - PyObject *tp_mro; /* method resolution order */ - PyObject *tp_cache; - PyObject *tp_subclasses; - PyObject *tp_weaklist; - destructor tp_del; - - /* Type attribute cache version tag. Added in version 2.6 */ - unsigned int tp_version_tag; - -#ifdef COUNT_ALLOCS - /* these must be last and never explicitly initialized */ - Py_ssize_t tp_allocs; - Py_ssize_t tp_frees; - Py_ssize_t tp_maxalloc; - struct _typeobject *tp_prev; - struct _typeobject *tp_next; -#endif -} PyTypeObject; - - -/* The *real* layout of a type object when allocated on the heap */ -typedef struct _heaptypeobject { - /* Note: there's a dependency on the order of these members - in slotptr() in typeobject.c . */ - PyTypeObject ht_type; - PyNumberMethods as_number; - PyMappingMethods as_mapping; - PySequenceMethods as_sequence; /* as_sequence comes after as_mapping, - so that the mapping wins when both - the mapping and the sequence define - a given operator (e.g. __getitem__). - see add_operators() in typeobject.c . */ - PyBufferProcs as_buffer; - PyObject *ht_name, *ht_slots; - /* here are optional user slots, followed by the members. */ -} PyHeapTypeObject; - -/* access macro to the members which are floating "behind" the object */ -#define PyHeapType_GET_MEMBERS(etype) \ - ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize)) - - -/* Generic type check */ -PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *); -#define PyObject_TypeCheck(ob, tp) \ - (Py_TYPE(ob) == (tp) || PyType_IsSubtype(Py_TYPE(ob), (tp))) - -PyAPI_DATA(PyTypeObject) PyType_Type; /* built-in 'type' */ -PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */ -PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */ - -#define PyType_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS) -#define PyType_CheckExact(op) (Py_TYPE(op) == &PyType_Type) - -PyAPI_FUNC(int) PyType_Ready(PyTypeObject *); -PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t); -PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *, - PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *); -PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, char *, PyObject **); -PyAPI_FUNC(unsigned int) PyType_ClearCache(void); -PyAPI_FUNC(void) PyType_Modified(PyTypeObject *); - -/* Generic operations on objects */ -PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int); -PyAPI_FUNC(void) _PyObject_Dump(PyObject *); -PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *); -PyAPI_FUNC(PyObject *) _PyObject_Str(PyObject *); -PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *); -#define PyObject_Bytes PyObject_Str -#ifdef Py_USING_UNICODE -PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *); -#endif -PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int); -PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int); -PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *); -PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *); -PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *); -PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *); -PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *); -PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *); -PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *); -PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *); -PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *); -PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *); -PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *, - PyObject *, PyObject *); -PyAPI_FUNC(long) PyObject_Hash(PyObject *); -PyAPI_FUNC(long) PyObject_HashNotImplemented(PyObject *); -PyAPI_FUNC(int) PyObject_IsTrue(PyObject *); -PyAPI_FUNC(int) PyObject_Not(PyObject *); -PyAPI_FUNC(int) PyCallable_Check(PyObject *); -PyAPI_FUNC(int) PyNumber_Coerce(PyObject **, PyObject **); -PyAPI_FUNC(int) PyNumber_CoerceEx(PyObject **, PyObject **); - -PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *); - -/* A slot function whose address we need to compare */ -extern int _PyObject_SlotCompare(PyObject *, PyObject *); -/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes - dict as the last parameter. */ -PyAPI_FUNC(PyObject *) -_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *); -PyAPI_FUNC(int) -_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *, - PyObject *, PyObject *); - - -/* PyObject_Dir(obj) acts like Python __builtin__.dir(obj), returning a - list of strings. PyObject_Dir(NULL) is like __builtin__.dir(), - returning the names of the current locals. In this case, if there are - no current locals, NULL is returned, and PyErr_Occurred() is false. -*/ -PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *); - - -/* Helpers for printing recursive container types */ -PyAPI_FUNC(int) Py_ReprEnter(PyObject *); -PyAPI_FUNC(void) Py_ReprLeave(PyObject *); - -/* Helpers for hash functions */ -PyAPI_FUNC(long) _Py_HashDouble(double); -PyAPI_FUNC(long) _Py_HashPointer(void*); - -typedef struct { - long prefix; - long suffix; -} _Py_HashSecret_t; -PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret; - -#ifdef Py_DEBUG -PyAPI_DATA(int) _Py_HashSecret_Initialized; -#endif - -/* Helper for passing objects to printf and the like */ -#define PyObject_REPR(obj) PyString_AS_STRING(PyObject_Repr(obj)) - -/* Flag bits for printing: */ -#define Py_PRINT_RAW 1 /* No string quotes etc. */ - -/* -`Type flags (tp_flags) - -These flags are used to extend the type structure in a backwards-compatible -fashion. Extensions can use the flags to indicate (and test) when a given -type structure contains a new feature. The Python core will use these when -introducing new functionality between major revisions (to avoid mid-version -changes in the PYTHON_API_VERSION). - -Arbitration of the flag bit positions will need to be coordinated among -all extension writers who publically release their extensions (this will -be fewer than you might expect!).. - -Python 1.5.2 introduced the bf_getcharbuffer slot into PyBufferProcs. - -Type definitions should use Py_TPFLAGS_DEFAULT for their tp_flags value. - -Code can use PyType_HasFeature(type_ob, flag_value) to test whether the -given type object has a specified feature. - -NOTE: when building the core, Py_TPFLAGS_DEFAULT includes -Py_TPFLAGS_HAVE_VERSION_TAG; outside the core, it doesn't. This is so -that extensions that modify tp_dict of their own types directly don't -break, since this was allowed in 2.5. In 3.0 they will have to -manually remove this flag though! -*/ - -/* PyBufferProcs contains bf_getcharbuffer */ -#define Py_TPFLAGS_HAVE_GETCHARBUFFER (1L<<0) - -/* PySequenceMethods contains sq_contains */ -#define Py_TPFLAGS_HAVE_SEQUENCE_IN (1L<<1) - -/* This is here for backwards compatibility. Extensions that use the old GC - * API will still compile but the objects will not be tracked by the GC. */ -#define Py_TPFLAGS_GC 0 /* used to be (1L<<2) */ - -/* PySequenceMethods and PyNumberMethods contain in-place operators */ -#define Py_TPFLAGS_HAVE_INPLACEOPS (1L<<3) - -/* PyNumberMethods do their own coercion */ -#define Py_TPFLAGS_CHECKTYPES (1L<<4) - -/* tp_richcompare is defined */ -#define Py_TPFLAGS_HAVE_RICHCOMPARE (1L<<5) - -/* Objects which are weakly referencable if their tp_weaklistoffset is >0 */ -#define Py_TPFLAGS_HAVE_WEAKREFS (1L<<6) - -/* tp_iter is defined */ -#define Py_TPFLAGS_HAVE_ITER (1L<<7) - -/* New members introduced by Python 2.2 exist */ -#define Py_TPFLAGS_HAVE_CLASS (1L<<8) - -/* Set if the type object is dynamically allocated */ -#define Py_TPFLAGS_HEAPTYPE (1L<<9) - -/* Set if the type allows subclassing */ -#define Py_TPFLAGS_BASETYPE (1L<<10) - -/* Set if the type is 'ready' -- fully initialized */ -#define Py_TPFLAGS_READY (1L<<12) - -/* Set while the type is being 'readied', to prevent recursive ready calls */ -#define Py_TPFLAGS_READYING (1L<<13) - -/* Objects support garbage collection (see objimp.h) */ -#define Py_TPFLAGS_HAVE_GC (1L<<14) - -/* These two bits are preserved for Stackless Python, next after this is 17 */ -#ifdef STACKLESS -#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3L<<15) -#else -#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0 -#endif - -/* Objects support nb_index in PyNumberMethods */ -#define Py_TPFLAGS_HAVE_INDEX (1L<<17) - -/* Objects support type attribute cache */ -#define Py_TPFLAGS_HAVE_VERSION_TAG (1L<<18) -#define Py_TPFLAGS_VALID_VERSION_TAG (1L<<19) - -/* Type is abstract and cannot be instantiated */ -#define Py_TPFLAGS_IS_ABSTRACT (1L<<20) - -/* Has the new buffer protocol */ -#define Py_TPFLAGS_HAVE_NEWBUFFER (1L<<21) - -/* These flags are used to determine if a type is a subclass. */ -#define Py_TPFLAGS_INT_SUBCLASS (1L<<23) -#define Py_TPFLAGS_LONG_SUBCLASS (1L<<24) -#define Py_TPFLAGS_LIST_SUBCLASS (1L<<25) -#define Py_TPFLAGS_TUPLE_SUBCLASS (1L<<26) -#define Py_TPFLAGS_STRING_SUBCLASS (1L<<27) -#define Py_TPFLAGS_UNICODE_SUBCLASS (1L<<28) -#define Py_TPFLAGS_DICT_SUBCLASS (1L<<29) -#define Py_TPFLAGS_BASE_EXC_SUBCLASS (1L<<30) -#define Py_TPFLAGS_TYPE_SUBCLASS (1L<<31) - -#define Py_TPFLAGS_DEFAULT_EXTERNAL ( \ - Py_TPFLAGS_HAVE_GETCHARBUFFER | \ - Py_TPFLAGS_HAVE_SEQUENCE_IN | \ - Py_TPFLAGS_HAVE_INPLACEOPS | \ - Py_TPFLAGS_HAVE_RICHCOMPARE | \ - Py_TPFLAGS_HAVE_WEAKREFS | \ - Py_TPFLAGS_HAVE_ITER | \ - Py_TPFLAGS_HAVE_CLASS | \ - Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | \ - Py_TPFLAGS_HAVE_INDEX | \ - 0) -#define Py_TPFLAGS_DEFAULT_CORE (Py_TPFLAGS_DEFAULT_EXTERNAL | \ - Py_TPFLAGS_HAVE_VERSION_TAG) - -#ifdef Py_BUILD_CORE -#define Py_TPFLAGS_DEFAULT Py_TPFLAGS_DEFAULT_CORE -#else -#define Py_TPFLAGS_DEFAULT Py_TPFLAGS_DEFAULT_EXTERNAL -#endif - -#define PyType_HasFeature(t,f) (((t)->tp_flags & (f)) != 0) -#define PyType_FastSubclass(t,f) PyType_HasFeature(t,f) - - -/* -The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement -reference counts. Py_DECREF calls the object's deallocator function when -the refcount falls to 0; for -objects that don't contain references to other objects or heap memory -this can be the standard function free(). Both macros can be used -wherever a void expression is allowed. The argument must not be a -NULL pointer. If it may be NULL, use Py_XINCREF/Py_XDECREF instead. -The macro _Py_NewReference(op) initialize reference counts to 1, and -in special builds (Py_REF_DEBUG, Py_TRACE_REFS) performs additional -bookkeeping appropriate to the special build. - -We assume that the reference count field can never overflow; this can -be proven when the size of the field is the same as the pointer size, so -we ignore the possibility. Provided a C int is at least 32 bits (which -is implicitly assumed in many parts of this code), that's enough for -about 2**31 references to an object. - -XXX The following became out of date in Python 2.2, but I'm not sure -XXX what the full truth is now. Certainly, heap-allocated type objects -XXX can and should be deallocated. -Type objects should never be deallocated; the type pointer in an object -is not considered to be a reference to the type object, to save -complications in the deallocation function. (This is actually a -decision that's up to the implementer of each new type so if you want, -you can count such references to the type object.) - -*** WARNING*** The Py_DECREF macro must have a side-effect-free argument -since it may evaluate its argument multiple times. (The alternative -would be to mace it a proper function or assign it to a global temporary -variable first, both of which are slower; and in a multi-threaded -environment the global variable trick is not safe.) -*/ - -/* First define a pile of simple helper macros, one set per special - * build symbol. These either expand to the obvious things, or to - * nothing at all when the special mode isn't in effect. The main - * macros can later be defined just once then, yet expand to different - * things depending on which special build options are and aren't in effect. - * Trust me : while painful, this is 20x easier to understand than, - * e.g, defining _Py_NewReference five different times in a maze of nested - * #ifdefs (we used to do that -- it was impenetrable). - */ -#ifdef Py_REF_DEBUG -PyAPI_DATA(Py_ssize_t) _Py_RefTotal; -PyAPI_FUNC(void) _Py_NegativeRefcount(const char *fname, - int lineno, PyObject *op); -PyAPI_FUNC(PyObject *) _PyDict_Dummy(void); -PyAPI_FUNC(PyObject *) _PySet_Dummy(void); -PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void); -#define _Py_INC_REFTOTAL _Py_RefTotal++ -#define _Py_DEC_REFTOTAL _Py_RefTotal-- -#define _Py_REF_DEBUG_COMMA , -#define _Py_CHECK_REFCNT(OP) \ -{ if (((PyObject*)OP)->ob_refcnt < 0) \ - _Py_NegativeRefcount(__FILE__, __LINE__, \ - (PyObject *)(OP)); \ -} -#else -#define _Py_INC_REFTOTAL -#define _Py_DEC_REFTOTAL -#define _Py_REF_DEBUG_COMMA -#define _Py_CHECK_REFCNT(OP) /* a semicolon */; -#endif /* Py_REF_DEBUG */ - -#ifdef COUNT_ALLOCS -PyAPI_FUNC(void) inc_count(PyTypeObject *); -PyAPI_FUNC(void) dec_count(PyTypeObject *); -#define _Py_INC_TPALLOCS(OP) inc_count(Py_TYPE(OP)) -#define _Py_INC_TPFREES(OP) dec_count(Py_TYPE(OP)) -#define _Py_DEC_TPFREES(OP) Py_TYPE(OP)->tp_frees-- -#define _Py_COUNT_ALLOCS_COMMA , -#else -#define _Py_INC_TPALLOCS(OP) -#define _Py_INC_TPFREES(OP) -#define _Py_DEC_TPFREES(OP) -#define _Py_COUNT_ALLOCS_COMMA -#endif /* COUNT_ALLOCS */ - -#ifdef Py_TRACE_REFS -/* Py_TRACE_REFS is such major surgery that we call external routines. */ -PyAPI_FUNC(void) _Py_NewReference(PyObject *); -PyAPI_FUNC(void) _Py_ForgetReference(PyObject *); -PyAPI_FUNC(void) _Py_Dealloc(PyObject *); -PyAPI_FUNC(void) _Py_PrintReferences(FILE *); -PyAPI_FUNC(void) _Py_PrintReferenceAddresses(FILE *); -PyAPI_FUNC(void) _Py_AddToAllObjects(PyObject *, int force); - -#else -/* Without Py_TRACE_REFS, there's little enough to do that we expand code - * inline. - */ -#define _Py_NewReference(op) ( \ - _Py_INC_TPALLOCS(op) _Py_COUNT_ALLOCS_COMMA \ - _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA \ - Py_REFCNT(op) = 1) - -#define _Py_ForgetReference(op) _Py_INC_TPFREES(op) - -#define _Py_Dealloc(op) ( \ - _Py_INC_TPFREES(op) _Py_COUNT_ALLOCS_COMMA \ - (*Py_TYPE(op)->tp_dealloc)((PyObject *)(op))) -#endif /* !Py_TRACE_REFS */ - -#define Py_INCREF(op) ( \ - _Py_INC_REFTOTAL _Py_REF_DEBUG_COMMA \ - ((PyObject*)(op))->ob_refcnt++) - -#define Py_DECREF(op) \ - do { \ - if (_Py_DEC_REFTOTAL _Py_REF_DEBUG_COMMA \ - --((PyObject*)(op))->ob_refcnt != 0) \ - _Py_CHECK_REFCNT(op) \ - else \ - _Py_Dealloc((PyObject *)(op)); \ - } while (0) - -/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear - * and tp_dealloc implementatons. - * - * Note that "the obvious" code can be deadly: - * - * Py_XDECREF(op); - * op = NULL; - * - * Typically, `op` is something like self->containee, and `self` is done - * using its `containee` member. In the code sequence above, suppose - * `containee` is non-NULL with a refcount of 1. Its refcount falls to - * 0 on the first line, which can trigger an arbitrary amount of code, - * possibly including finalizers (like __del__ methods or weakref callbacks) - * coded in Python, which in turn can release the GIL and allow other threads - * to run, etc. Such code may even invoke methods of `self` again, or cause - * cyclic gc to trigger, but-- oops! --self->containee still points to the - * object being torn down, and it may be in an insane state while being torn - * down. This has in fact been a rich historic source of miserable (rare & - * hard-to-diagnose) segfaulting (and other) bugs. - * - * The safe way is: - * - * Py_CLEAR(op); - * - * That arranges to set `op` to NULL _before_ decref'ing, so that any code - * triggered as a side-effect of `op` getting torn down no longer believes - * `op` points to a valid object. - * - * There are cases where it's safe to use the naive code, but they're brittle. - * For example, if `op` points to a Python integer, you know that destroying - * one of those can't cause problems -- but in part that relies on that - * Python integers aren't currently weakly referencable. Best practice is - * to use Py_CLEAR() even if you can't think of a reason for why you need to. - */ -#define Py_CLEAR(op) \ - do { \ - if (op) { \ - PyObject *_py_tmp = (PyObject *)(op); \ - (op) = NULL; \ - Py_DECREF(_py_tmp); \ - } \ - } while (0) - -/* Macros to use in case the object pointer may be NULL: */ -#define Py_XINCREF(op) do { if ((op) == NULL) ; else Py_INCREF(op); } while (0) -#define Py_XDECREF(op) do { if ((op) == NULL) ; else Py_DECREF(op); } while (0) - -/* -These are provided as conveniences to Python runtime embedders, so that -they can have object code that is not dependent on Python compilation flags. -*/ -PyAPI_FUNC(void) Py_IncRef(PyObject *); -PyAPI_FUNC(void) Py_DecRef(PyObject *); - -/* -_Py_NoneStruct is an object of undefined type which can be used in contexts -where NULL (nil) is not suitable (since NULL often means 'error'). - -Don't forget to apply Py_INCREF() when returning this value!!! -*/ -PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */ -#define Py_None (&_Py_NoneStruct) - -/* Macro for returning Py_None from a function */ -#define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None - -/* -Py_NotImplemented is a singleton used to signal that an operation is -not implemented for a given type combination. -*/ -PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */ -#define Py_NotImplemented (&_Py_NotImplementedStruct) - -/* Rich comparison opcodes */ -#define Py_LT 0 -#define Py_LE 1 -#define Py_EQ 2 -#define Py_NE 3 -#define Py_GT 4 -#define Py_GE 5 - -/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE. - * Defined in object.c. - */ -PyAPI_DATA(int) _Py_SwappedOp[]; - -/* -Define staticforward and statichere for source compatibility with old -C extensions. - -The staticforward define was needed to support certain broken C -compilers (notably SCO ODT 3.0, perhaps early AIX as well) botched the -static keyword when it was used with a forward declaration of a static -initialized structure. Standard C allows the forward declaration with -static, and we've decided to stop catering to broken C compilers. -(In fact, we expect that the compilers are all fixed eight years later.) -*/ - -#define staticforward static -#define statichere static - - -/* -More conventions -================ - -Argument Checking ------------------ - -Functions that take objects as arguments normally don't check for nil -arguments, but they do check the type of the argument, and return an -error if the function doesn't apply to the type. - -Failure Modes -------------- - -Functions may fail for a variety of reasons, including running out of -memory. This is communicated to the caller in two ways: an error string -is set (see errors.h), and the function result differs: functions that -normally return a pointer return NULL for failure, functions returning -an integer return -1 (which could be a legal return value too!), and -other functions return 0 for success and -1 for failure. -Callers should always check for errors before using the result. If -an error was set, the caller must either explicitly clear it, or pass -the error on to its caller. - -Reference Counts ----------------- - -It takes a while to get used to the proper usage of reference counts. - -Functions that create an object set the reference count to 1; such new -objects must be stored somewhere or destroyed again with Py_DECREF(). -Some functions that 'store' objects, such as PyTuple_SetItem() and -PyList_SetItem(), -don't increment the reference count of the object, since the most -frequent use is to store a fresh object. Functions that 'retrieve' -objects, such as PyTuple_GetItem() and PyDict_GetItemString(), also -don't increment -the reference count, since most frequently the object is only looked at -quickly. Thus, to retrieve an object and store it again, the caller -must call Py_INCREF() explicitly. - -NOTE: functions that 'consume' a reference count, like -PyList_SetItem(), consume the reference even if the object wasn't -successfully stored, to simplify error handling. - -It seems attractive to make other functions that take an object as -argument consume a reference count; however, this may quickly get -confusing (even the current practice is already confusing). Consider -it carefully, it may save lots of calls to Py_INCREF() and Py_DECREF() at -times. -*/ - - -/* Trashcan mechanism, thanks to Christian Tismer. - -When deallocating a container object, it's possible to trigger an unbounded -chain of deallocations, as each Py_DECREF in turn drops the refcount on "the -next" object in the chain to 0. This can easily lead to stack faults, and -especially in threads (which typically have less stack space to work with). - -A container object that participates in cyclic gc can avoid this by -bracketing the body of its tp_dealloc function with a pair of macros: - -static void -mytype_dealloc(mytype *p) -{ - ... declarations go here ... - - PyObject_GC_UnTrack(p); // must untrack first - Py_TRASHCAN_SAFE_BEGIN(p) - ... The body of the deallocator goes here, including all calls ... - ... to Py_DECREF on contained objects. ... - Py_TRASHCAN_SAFE_END(p) -} - -CAUTION: Never return from the middle of the body! If the body needs to -"get out early", put a label immediately before the Py_TRASHCAN_SAFE_END -call, and goto it. Else the call-depth counter (see below) will stay -above 0 forever, and the trashcan will never get emptied. - -How it works: The BEGIN macro increments a call-depth counter. So long -as this counter is small, the body of the deallocator is run directly without -further ado. But if the counter gets large, it instead adds p to a list of -objects to be deallocated later, skips the body of the deallocator, and -resumes execution after the END macro. The tp_dealloc routine then returns -without deallocating anything (and so unbounded call-stack depth is avoided). - -When the call stack finishes unwinding again, code generated by the END macro -notices this, and calls another routine to deallocate all the objects that -may have been added to the list of deferred deallocations. In effect, a -chain of N deallocations is broken into N / PyTrash_UNWIND_LEVEL pieces, -with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL. -*/ - -PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*); -PyAPI_FUNC(void) _PyTrash_destroy_chain(void); -PyAPI_DATA(int) _PyTrash_delete_nesting; -PyAPI_DATA(PyObject *) _PyTrash_delete_later; - -#define PyTrash_UNWIND_LEVEL 50 - -#define Py_TRASHCAN_SAFE_BEGIN(op) \ - if (_PyTrash_delete_nesting < PyTrash_UNWIND_LEVEL) { \ - ++_PyTrash_delete_nesting; - /* The body of the deallocator is here. */ -#define Py_TRASHCAN_SAFE_END(op) \ - --_PyTrash_delete_nesting; \ - if (_PyTrash_delete_later && _PyTrash_delete_nesting <= 0) \ - _PyTrash_destroy_chain(); \ - } \ - else \ - _PyTrash_deposit_object((PyObject*)op); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_OBJECT_H */ diff --git a/python/include/objimpl.h b/python/include/objimpl.h deleted file mode 100644 index 55e83ece..00000000 --- a/python/include/objimpl.h +++ /dev/null @@ -1,354 +0,0 @@ -/* The PyObject_ memory family: high-level object memory interfaces. - See pymem.h for the low-level PyMem_ family. -*/ - -#ifndef Py_OBJIMPL_H -#define Py_OBJIMPL_H - -#include "pymem.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* BEWARE: - - Each interface exports both functions and macros. Extension modules should - use the functions, to ensure binary compatibility across Python versions. - Because the Python implementation is free to change internal details, and - the macros may (or may not) expose details for speed, if you do use the - macros you must recompile your extensions with each Python release. - - Never mix calls to PyObject_ memory functions with calls to the platform - malloc/realloc/ calloc/free, or with calls to PyMem_. -*/ - -/* -Functions and macros for modules that implement new object types. - - - PyObject_New(type, typeobj) allocates memory for a new object of the given - type, and initializes part of it. 'type' must be the C structure type used - to represent the object, and 'typeobj' the address of the corresponding - type object. Reference count and type pointer are filled in; the rest of - the bytes of the object are *undefined*! The resulting expression type is - 'type *'. The size of the object is determined by the tp_basicsize field - of the type object. - - - PyObject_NewVar(type, typeobj, n) is similar but allocates a variable-size - object with room for n items. In addition to the refcount and type pointer - fields, this also fills in the ob_size field. - - - PyObject_Del(op) releases the memory allocated for an object. It does not - run a destructor -- it only frees the memory. PyObject_Free is identical. - - - PyObject_Init(op, typeobj) and PyObject_InitVar(op, typeobj, n) don't - allocate memory. Instead of a 'type' parameter, they take a pointer to a - new object (allocated by an arbitrary allocator), and initialize its object - header fields. - -Note that objects created with PyObject_{New, NewVar} are allocated using the -specialized Python allocator (implemented in obmalloc.c), if WITH_PYMALLOC is -enabled. In addition, a special debugging allocator is used if PYMALLOC_DEBUG -is also #defined. - -In case a specific form of memory management is needed (for example, if you -must use the platform malloc heap(s), or shared memory, or C++ local storage or -operator new), you must first allocate the object with your custom allocator, -then pass its pointer to PyObject_{Init, InitVar} for filling in its Python- -specific fields: reference count, type pointer, possibly others. You should -be aware that Python no control over these objects because they don't -cooperate with the Python memory manager. Such objects may not be eligible -for automatic garbage collection and you have to make sure that they are -released accordingly whenever their destructor gets called (cf. the specific -form of memory management you're using). - -Unless you have specific memory management requirements, use -PyObject_{New, NewVar, Del}. -*/ - -/* - * Raw object memory interface - * =========================== - */ - -/* Functions to call the same malloc/realloc/free as used by Python's - object allocator. If WITH_PYMALLOC is enabled, these may differ from - the platform malloc/realloc/free. The Python object allocator is - designed for fast, cache-conscious allocation of many "small" objects, - and with low hidden memory overhead. - - PyObject_Malloc(0) returns a unique non-NULL pointer if possible. - - PyObject_Realloc(NULL, n) acts like PyObject_Malloc(n). - PyObject_Realloc(p != NULL, 0) does not return NULL, or free the memory - at p. - - Returned pointers must be checked for NULL explicitly; no action is - performed on failure other than to return NULL (no warning it printed, no - exception is set, etc). - - For allocating objects, use PyObject_{New, NewVar} instead whenever - possible. The PyObject_{Malloc, Realloc, Free} family is exposed - so that you can exploit Python's small-block allocator for non-object - uses. If you must use these routines to allocate object memory, make sure - the object gets initialized via PyObject_{Init, InitVar} after obtaining - the raw memory. -*/ -PyAPI_FUNC(void *) PyObject_Malloc(size_t); -PyAPI_FUNC(void *) PyObject_Realloc(void *, size_t); -PyAPI_FUNC(void) PyObject_Free(void *); - - -/* Macros */ -#ifdef WITH_PYMALLOC -#ifdef PYMALLOC_DEBUG /* WITH_PYMALLOC && PYMALLOC_DEBUG */ -PyAPI_FUNC(void *) _PyObject_DebugMalloc(size_t nbytes); -PyAPI_FUNC(void *) _PyObject_DebugRealloc(void *p, size_t nbytes); -PyAPI_FUNC(void) _PyObject_DebugFree(void *p); -PyAPI_FUNC(void) _PyObject_DebugDumpAddress(const void *p); -PyAPI_FUNC(void) _PyObject_DebugCheckAddress(const void *p); -PyAPI_FUNC(void) _PyObject_DebugMallocStats(void); -PyAPI_FUNC(void *) _PyObject_DebugMallocApi(char api, size_t nbytes); -PyAPI_FUNC(void *) _PyObject_DebugReallocApi(char api, void *p, size_t nbytes); -PyAPI_FUNC(void) _PyObject_DebugFreeApi(char api, void *p); -PyAPI_FUNC(void) _PyObject_DebugCheckAddressApi(char api, const void *p); -PyAPI_FUNC(void *) _PyMem_DebugMalloc(size_t nbytes); -PyAPI_FUNC(void *) _PyMem_DebugRealloc(void *p, size_t nbytes); -PyAPI_FUNC(void) _PyMem_DebugFree(void *p); -#define PyObject_MALLOC _PyObject_DebugMalloc -#define PyObject_Malloc _PyObject_DebugMalloc -#define PyObject_REALLOC _PyObject_DebugRealloc -#define PyObject_Realloc _PyObject_DebugRealloc -#define PyObject_FREE _PyObject_DebugFree -#define PyObject_Free _PyObject_DebugFree - -#else /* WITH_PYMALLOC && ! PYMALLOC_DEBUG */ -#define PyObject_MALLOC PyObject_Malloc -#define PyObject_REALLOC PyObject_Realloc -#define PyObject_FREE PyObject_Free -#endif - -#else /* ! WITH_PYMALLOC */ -#define PyObject_MALLOC PyMem_MALLOC -#define PyObject_REALLOC PyMem_REALLOC -#define PyObject_FREE PyMem_FREE - -#endif /* WITH_PYMALLOC */ - -#define PyObject_Del PyObject_Free -#define PyObject_DEL PyObject_FREE - -/* for source compatibility with 2.2 */ -#define _PyObject_Del PyObject_Free - -/* - * Generic object allocator interface - * ================================== - */ - -/* Functions */ -PyAPI_FUNC(PyObject *) PyObject_Init(PyObject *, PyTypeObject *); -PyAPI_FUNC(PyVarObject *) PyObject_InitVar(PyVarObject *, - PyTypeObject *, Py_ssize_t); -PyAPI_FUNC(PyObject *) _PyObject_New(PyTypeObject *); -PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t); - -#define PyObject_New(type, typeobj) \ - ( (type *) _PyObject_New(typeobj) ) -#define PyObject_NewVar(type, typeobj, n) \ - ( (type *) _PyObject_NewVar((typeobj), (n)) ) - -/* Macros trading binary compatibility for speed. See also pymem.h. - Note that these macros expect non-NULL object pointers.*/ -#define PyObject_INIT(op, typeobj) \ - ( Py_TYPE(op) = (typeobj), _Py_NewReference((PyObject *)(op)), (op) ) -#define PyObject_INIT_VAR(op, typeobj, size) \ - ( Py_SIZE(op) = (size), PyObject_INIT((op), (typeobj)) ) - -#define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize ) - -/* _PyObject_VAR_SIZE returns the number of bytes (as size_t) allocated for a - vrbl-size object with nitems items, exclusive of gc overhead (if any). The - value is rounded up to the closest multiple of sizeof(void *), in order to - ensure that pointer fields at the end of the object are correctly aligned - for the platform (this is of special importance for subclasses of, e.g., - str or long, so that pointers can be stored after the embedded data). - - Note that there's no memory wastage in doing this, as malloc has to - return (at worst) pointer-aligned memory anyway. -*/ -#if ((SIZEOF_VOID_P - 1) & SIZEOF_VOID_P) != 0 -# error "_PyObject_VAR_SIZE requires SIZEOF_VOID_P be a power of 2" -#endif - -#define _PyObject_VAR_SIZE(typeobj, nitems) \ - (size_t) \ - ( ( (typeobj)->tp_basicsize + \ - (nitems)*(typeobj)->tp_itemsize + \ - (SIZEOF_VOID_P - 1) \ - ) & ~(SIZEOF_VOID_P - 1) \ - ) - -#define PyObject_NEW(type, typeobj) \ -( (type *) PyObject_Init( \ - (PyObject *) PyObject_MALLOC( _PyObject_SIZE(typeobj) ), (typeobj)) ) - -#define PyObject_NEW_VAR(type, typeobj, n) \ -( (type *) PyObject_InitVar( \ - (PyVarObject *) PyObject_MALLOC(_PyObject_VAR_SIZE((typeobj),(n)) ),\ - (typeobj), (n)) ) - -/* This example code implements an object constructor with a custom - allocator, where PyObject_New is inlined, and shows the important - distinction between two steps (at least): - 1) the actual allocation of the object storage; - 2) the initialization of the Python specific fields - in this storage with PyObject_{Init, InitVar}. - - PyObject * - YourObject_New(...) - { - PyObject *op; - - op = (PyObject *) Your_Allocator(_PyObject_SIZE(YourTypeStruct)); - if (op == NULL) - return PyErr_NoMemory(); - - PyObject_Init(op, &YourTypeStruct); - - op->ob_field = value; - ... - return op; - } - - Note that in C++, the use of the new operator usually implies that - the 1st step is performed automatically for you, so in a C++ class - constructor you would start directly with PyObject_Init/InitVar -*/ - -/* - * Garbage Collection Support - * ========================== - */ - -/* C equivalent of gc.collect(). */ -PyAPI_FUNC(Py_ssize_t) PyGC_Collect(void); - -/* Test if a type has a GC head */ -#define PyType_IS_GC(t) PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC) - -/* Test if an object has a GC head */ -#define PyObject_IS_GC(o) (PyType_IS_GC(Py_TYPE(o)) && \ - (Py_TYPE(o)->tp_is_gc == NULL || Py_TYPE(o)->tp_is_gc(o))) - -PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); -#define PyObject_GC_Resize(type, op, n) \ - ( (type *) _PyObject_GC_Resize((PyVarObject *)(op), (n)) ) - -/* for source compatibility with 2.2 */ -#define _PyObject_GC_Del PyObject_GC_Del - -/* GC information is stored BEFORE the object structure. */ -typedef union _gc_head { - struct { - union _gc_head *gc_next; - union _gc_head *gc_prev; - Py_ssize_t gc_refs; - } gc; - long double dummy; /* force worst-case alignment */ -} PyGC_Head; - -extern PyGC_Head *_PyGC_generation0; - -#define _Py_AS_GC(o) ((PyGC_Head *)(o)-1) - -#define _PyGC_REFS_UNTRACKED (-2) -#define _PyGC_REFS_REACHABLE (-3) -#define _PyGC_REFS_TENTATIVELY_UNREACHABLE (-4) - -/* Tell the GC to track this object. NB: While the object is tracked the - * collector it must be safe to call the ob_traverse method. */ -#define _PyObject_GC_TRACK(o) do { \ - PyGC_Head *g = _Py_AS_GC(o); \ - if (g->gc.gc_refs != _PyGC_REFS_UNTRACKED) \ - Py_FatalError("GC object already tracked"); \ - g->gc.gc_refs = _PyGC_REFS_REACHABLE; \ - g->gc.gc_next = _PyGC_generation0; \ - g->gc.gc_prev = _PyGC_generation0->gc.gc_prev; \ - g->gc.gc_prev->gc.gc_next = g; \ - _PyGC_generation0->gc.gc_prev = g; \ - } while (0); - -/* Tell the GC to stop tracking this object. - * gc_next doesn't need to be set to NULL, but doing so is a good - * way to provoke memory errors if calling code is confused. - */ -#define _PyObject_GC_UNTRACK(o) do { \ - PyGC_Head *g = _Py_AS_GC(o); \ - assert(g->gc.gc_refs != _PyGC_REFS_UNTRACKED); \ - g->gc.gc_refs = _PyGC_REFS_UNTRACKED; \ - g->gc.gc_prev->gc.gc_next = g->gc.gc_next; \ - g->gc.gc_next->gc.gc_prev = g->gc.gc_prev; \ - g->gc.gc_next = NULL; \ - } while (0); - -/* True if the object is currently tracked by the GC. */ -#define _PyObject_GC_IS_TRACKED(o) \ - ((_Py_AS_GC(o))->gc.gc_refs != _PyGC_REFS_UNTRACKED) - -/* True if the object may be tracked by the GC in the future, or already is. - This can be useful to implement some optimizations. */ -#define _PyObject_GC_MAY_BE_TRACKED(obj) \ - (PyObject_IS_GC(obj) && \ - (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj))) - - -PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t); -PyAPI_FUNC(PyObject *) _PyObject_GC_New(PyTypeObject *); -PyAPI_FUNC(PyVarObject *) _PyObject_GC_NewVar(PyTypeObject *, Py_ssize_t); -PyAPI_FUNC(void) PyObject_GC_Track(void *); -PyAPI_FUNC(void) PyObject_GC_UnTrack(void *); -PyAPI_FUNC(void) PyObject_GC_Del(void *); - -#define PyObject_GC_New(type, typeobj) \ - ( (type *) _PyObject_GC_New(typeobj) ) -#define PyObject_GC_NewVar(type, typeobj, n) \ - ( (type *) _PyObject_GC_NewVar((typeobj), (n)) ) - - -/* Utility macro to help write tp_traverse functions. - * To use this macro, the tp_traverse function must name its arguments - * "visit" and "arg". This is intended to keep tp_traverse functions - * looking as much alike as possible. - */ -#define Py_VISIT(op) \ - do { \ - if (op) { \ - int vret = visit((PyObject *)(op), arg); \ - if (vret) \ - return vret; \ - } \ - } while (0) - -/* This is here for the sake of backwards compatibility. Extensions that - * use the old GC API will still compile but the objects will not be - * tracked by the GC. */ -#define PyGC_HEAD_SIZE 0 -#define PyObject_GC_Init(op) -#define PyObject_GC_Fini(op) -#define PyObject_AS_GC(op) (op) -#define PyObject_FROM_GC(op) (op) - - -/* Test if a type supports weak references */ -#define PyType_SUPPORTS_WEAKREFS(t) \ - (PyType_HasFeature((t), Py_TPFLAGS_HAVE_WEAKREFS) \ - && ((t)->tp_weaklistoffset > 0)) - -#define PyObject_GET_WEAKREFS_LISTPTR(o) \ - ((PyObject **) (((char *) (o)) + Py_TYPE(o)->tp_weaklistoffset)) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_OBJIMPL_H */ diff --git a/python/include/opcode.h b/python/include/opcode.h deleted file mode 100644 index 9764109a..00000000 --- a/python/include/opcode.h +++ /dev/null @@ -1,162 +0,0 @@ -#ifndef Py_OPCODE_H -#define Py_OPCODE_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Instruction opcodes for compiled code */ - -#define STOP_CODE 0 -#define POP_TOP 1 -#define ROT_TWO 2 -#define ROT_THREE 3 -#define DUP_TOP 4 -#define ROT_FOUR 5 -#define NOP 9 - -#define UNARY_POSITIVE 10 -#define UNARY_NEGATIVE 11 -#define UNARY_NOT 12 -#define UNARY_CONVERT 13 - -#define UNARY_INVERT 15 - -#define BINARY_POWER 19 - -#define BINARY_MULTIPLY 20 -#define BINARY_DIVIDE 21 -#define BINARY_MODULO 22 -#define BINARY_ADD 23 -#define BINARY_SUBTRACT 24 -#define BINARY_SUBSCR 25 -#define BINARY_FLOOR_DIVIDE 26 -#define BINARY_TRUE_DIVIDE 27 -#define INPLACE_FLOOR_DIVIDE 28 -#define INPLACE_TRUE_DIVIDE 29 - -#define SLICE 30 -/* Also uses 31-33 */ - -#define STORE_SLICE 40 -/* Also uses 41-43 */ - -#define DELETE_SLICE 50 -/* Also uses 51-53 */ - -#define STORE_MAP 54 -#define INPLACE_ADD 55 -#define INPLACE_SUBTRACT 56 -#define INPLACE_MULTIPLY 57 -#define INPLACE_DIVIDE 58 -#define INPLACE_MODULO 59 -#define STORE_SUBSCR 60 -#define DELETE_SUBSCR 61 - -#define BINARY_LSHIFT 62 -#define BINARY_RSHIFT 63 -#define BINARY_AND 64 -#define BINARY_XOR 65 -#define BINARY_OR 66 -#define INPLACE_POWER 67 -#define GET_ITER 68 - -#define PRINT_EXPR 70 -#define PRINT_ITEM 71 -#define PRINT_NEWLINE 72 -#define PRINT_ITEM_TO 73 -#define PRINT_NEWLINE_TO 74 -#define INPLACE_LSHIFT 75 -#define INPLACE_RSHIFT 76 -#define INPLACE_AND 77 -#define INPLACE_XOR 78 -#define INPLACE_OR 79 -#define BREAK_LOOP 80 -#define WITH_CLEANUP 81 -#define LOAD_LOCALS 82 -#define RETURN_VALUE 83 -#define IMPORT_STAR 84 -#define EXEC_STMT 85 -#define YIELD_VALUE 86 -#define POP_BLOCK 87 -#define END_FINALLY 88 -#define BUILD_CLASS 89 - -#define HAVE_ARGUMENT 90 /* Opcodes from here have an argument: */ - -#define STORE_NAME 90 /* Index in name list */ -#define DELETE_NAME 91 /* "" */ -#define UNPACK_SEQUENCE 92 /* Number of sequence items */ -#define FOR_ITER 93 -#define LIST_APPEND 94 - -#define STORE_ATTR 95 /* Index in name list */ -#define DELETE_ATTR 96 /* "" */ -#define STORE_GLOBAL 97 /* "" */ -#define DELETE_GLOBAL 98 /* "" */ -#define DUP_TOPX 99 /* number of items to duplicate */ -#define LOAD_CONST 100 /* Index in const list */ -#define LOAD_NAME 101 /* Index in name list */ -#define BUILD_TUPLE 102 /* Number of tuple items */ -#define BUILD_LIST 103 /* Number of list items */ -#define BUILD_SET 104 /* Number of set items */ -#define BUILD_MAP 105 /* Always zero for now */ -#define LOAD_ATTR 106 /* Index in name list */ -#define COMPARE_OP 107 /* Comparison operator */ -#define IMPORT_NAME 108 /* Index in name list */ -#define IMPORT_FROM 109 /* Index in name list */ -#define JUMP_FORWARD 110 /* Number of bytes to skip */ - -#define JUMP_IF_FALSE_OR_POP 111 /* Target byte offset from beginning - of code */ -#define JUMP_IF_TRUE_OR_POP 112 /* "" */ -#define JUMP_ABSOLUTE 113 /* "" */ -#define POP_JUMP_IF_FALSE 114 /* "" */ -#define POP_JUMP_IF_TRUE 115 /* "" */ - -#define LOAD_GLOBAL 116 /* Index in name list */ - -#define CONTINUE_LOOP 119 /* Start of loop (absolute) */ -#define SETUP_LOOP 120 /* Target address (relative) */ -#define SETUP_EXCEPT 121 /* "" */ -#define SETUP_FINALLY 122 /* "" */ - -#define LOAD_FAST 124 /* Local variable number */ -#define STORE_FAST 125 /* Local variable number */ -#define DELETE_FAST 126 /* Local variable number */ - -#define RAISE_VARARGS 130 /* Number of raise arguments (1, 2 or 3) */ -/* CALL_FUNCTION_XXX opcodes defined below depend on this definition */ -#define CALL_FUNCTION 131 /* #args + (#kwargs<<8) */ -#define MAKE_FUNCTION 132 /* #defaults */ -#define BUILD_SLICE 133 /* Number of items */ - -#define MAKE_CLOSURE 134 /* #free vars */ -#define LOAD_CLOSURE 135 /* Load free variable from closure */ -#define LOAD_DEREF 136 /* Load and dereference from closure cell */ -#define STORE_DEREF 137 /* Store into cell */ - -/* The next 3 opcodes must be contiguous and satisfy - (CALL_FUNCTION_VAR - CALL_FUNCTION) & 3 == 1 */ -#define CALL_FUNCTION_VAR 140 /* #args + (#kwargs<<8) */ -#define CALL_FUNCTION_KW 141 /* #args + (#kwargs<<8) */ -#define CALL_FUNCTION_VAR_KW 142 /* #args + (#kwargs<<8) */ - -#define SETUP_WITH 143 - -/* Support for opargs more than 16 bits long */ -#define EXTENDED_ARG 145 - -#define SET_ADD 146 -#define MAP_ADD 147 - - -enum cmp_op {PyCmp_LT=Py_LT, PyCmp_LE=Py_LE, PyCmp_EQ=Py_EQ, PyCmp_NE=Py_NE, PyCmp_GT=Py_GT, PyCmp_GE=Py_GE, - PyCmp_IN, PyCmp_NOT_IN, PyCmp_IS, PyCmp_IS_NOT, PyCmp_EXC_MATCH, PyCmp_BAD}; - -#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_OPCODE_H */ diff --git a/python/include/osdefs.h b/python/include/osdefs.h deleted file mode 100644 index 69376593..00000000 --- a/python/include/osdefs.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef Py_OSDEFS_H -#define Py_OSDEFS_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Operating system dependencies */ - -/* Mod by chrish: QNX has WATCOM, but isn't DOS */ -#if !defined(__QNX__) -#if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2) -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#define MAXPATHLEN 260 -#define SEP '/' -#define ALTSEP '\\' -#else -#define SEP '\\' -#define ALTSEP '/' -#define MAXPATHLEN 256 -#endif -#define DELIM ';' -#endif -#endif - -#ifdef RISCOS -#define SEP '.' -#define MAXPATHLEN 256 -#define DELIM ',' -#endif - - -/* Filename separator */ -#ifndef SEP -#define SEP '/' -#endif - -/* Max pathname length */ -#ifndef MAXPATHLEN -#if defined(PATH_MAX) && PATH_MAX > 1024 -#define MAXPATHLEN PATH_MAX -#else -#define MAXPATHLEN 1024 -#endif -#endif - -/* Search path entry delimiter */ -#ifndef DELIM -#define DELIM ':' -#endif - -#ifdef __cplusplus -} -#endif -#endif /* !Py_OSDEFS_H */ diff --git a/python/include/parsetok.h b/python/include/parsetok.h deleted file mode 100644 index ec1eb6ff..00000000 --- a/python/include/parsetok.h +++ /dev/null @@ -1,64 +0,0 @@ - -/* Parser-tokenizer link interface */ - -#ifndef Py_PARSETOK_H -#define Py_PARSETOK_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { - int error; - const char *filename; - int lineno; - int offset; - char *text; - int token; - int expected; -} perrdetail; - -#if 0 -#define PyPARSE_YIELD_IS_KEYWORD 0x0001 -#endif - -#define PyPARSE_DONT_IMPLY_DEDENT 0x0002 - -#if 0 -#define PyPARSE_WITH_IS_KEYWORD 0x0003 -#endif - -#define PyPARSE_PRINT_IS_FUNCTION 0x0004 -#define PyPARSE_UNICODE_LITERALS 0x0008 - - - -PyAPI_FUNC(node *) PyParser_ParseString(const char *, grammar *, int, - perrdetail *); -PyAPI_FUNC(node *) PyParser_ParseFile (FILE *, const char *, grammar *, int, - char *, char *, perrdetail *); - -PyAPI_FUNC(node *) PyParser_ParseStringFlags(const char *, grammar *, int, - perrdetail *, int); -PyAPI_FUNC(node *) PyParser_ParseFileFlags(FILE *, const char *, grammar *, - int, char *, char *, - perrdetail *, int); -PyAPI_FUNC(node *) PyParser_ParseFileFlagsEx(FILE *, const char *, grammar *, - int, char *, char *, - perrdetail *, int *); - -PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilename(const char *, - const char *, - grammar *, int, - perrdetail *, int); -PyAPI_FUNC(node *) PyParser_ParseStringFlagsFilenameEx(const char *, - const char *, - grammar *, int, - perrdetail *, int *); - -/* Note that he following function is defined in pythonrun.c not parsetok.c. */ -PyAPI_FUNC(void) PyParser_SetError(perrdetail *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PARSETOK_H */ diff --git a/python/include/patchlevel.h b/python/include/patchlevel.h deleted file mode 100644 index 0a05696c..00000000 --- a/python/include/patchlevel.h +++ /dev/null @@ -1,43 +0,0 @@ - -/* Newfangled version identification scheme. - - This scheme was added in Python 1.5.2b2; before that time, only PATCHLEVEL - was available. To test for presence of the scheme, test for - defined(PY_MAJOR_VERSION). - - When the major or minor version changes, the VERSION variable in - configure.in must also be changed. - - There is also (independent) API version information in modsupport.h. -*/ - -/* Values for PY_RELEASE_LEVEL */ -#define PY_RELEASE_LEVEL_ALPHA 0xA -#define PY_RELEASE_LEVEL_BETA 0xB -#define PY_RELEASE_LEVEL_GAMMA 0xC /* For release candidates */ -#define PY_RELEASE_LEVEL_FINAL 0xF /* Serial should be 0 here */ - /* Higher for patch releases */ - -/* Version parsed out into numeric values */ -/*--start constants--*/ -#define PY_MAJOR_VERSION 2 -#define PY_MINOR_VERSION 7 -#define PY_MICRO_VERSION 3 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL -#define PY_RELEASE_SERIAL 0 - -/* Version as a string */ -#define PY_VERSION "2.7.3" -/*--end constants--*/ - -/* Subversion Revision number of this file (not of the repository). Empty - since Mercurial migration. */ -#define PY_PATCHLEVEL_REVISION "" - -/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. - Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */ -#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \ - (PY_MINOR_VERSION << 16) | \ - (PY_MICRO_VERSION << 8) | \ - (PY_RELEASE_LEVEL << 4) | \ - (PY_RELEASE_SERIAL << 0)) diff --git a/python/include/pgen.h b/python/include/pgen.h deleted file mode 100644 index 8a325ed0..00000000 --- a/python/include/pgen.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef Py_PGEN_H -#define Py_PGEN_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Parser generator interface */ - -extern grammar *meta_grammar(void); - -struct _node; -extern grammar *pgen(struct _node *); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PGEN_H */ diff --git a/python/include/pgenheaders.h b/python/include/pgenheaders.h deleted file mode 100644 index 2049ae32..00000000 --- a/python/include/pgenheaders.h +++ /dev/null @@ -1,42 +0,0 @@ -#ifndef Py_PGENHEADERS_H -#define Py_PGENHEADERS_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Include files and extern declarations used by most of the parser. */ - -#include "Python.h" - -PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); -PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); - -#define addarc _Py_addarc -#define addbit _Py_addbit -#define adddfa _Py_adddfa -#define addfirstsets _Py_addfirstsets -#define addlabel _Py_addlabel -#define addstate _Py_addstate -#define delbitset _Py_delbitset -#define dumptree _Py_dumptree -#define findlabel _Py_findlabel -#define mergebitset _Py_mergebitset -#define meta_grammar _Py_meta_grammar -#define newbitset _Py_newbitset -#define newgrammar _Py_newgrammar -#define pgen _Py_pgen -#define printgrammar _Py_printgrammar -#define printnonterminals _Py_printnonterminals -#define printtree _Py_printtree -#define samebitset _Py_samebitset -#define showtree _Py_showtree -#define tok_dump _Py_tok_dump -#define translatelabels _Py_translatelabels - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PGENHEADERS_H */ diff --git a/python/include/py_curses.h b/python/include/py_curses.h deleted file mode 100644 index 657816cb..00000000 --- a/python/include/py_curses.h +++ /dev/null @@ -1,176 +0,0 @@ - -#ifndef Py_CURSES_H -#define Py_CURSES_H - -#ifdef __APPLE__ -/* -** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards -** against multiple definition of wchar_t. -*/ -#ifdef _BSD_WCHAR_T_DEFINED_ -#define _WCHAR_T -#endif - -/* the following define is necessary for OS X 10.6; without it, the - Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python - can't get at the WINDOW flags field. */ -#define NCURSES_OPAQUE 0 -#endif /* __APPLE__ */ - -#ifdef __FreeBSD__ -/* -** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards -** against multiple definition of wchar_t and wint_t. -*/ -#ifdef _XOPEN_SOURCE_EXTENDED -#ifndef __FreeBSD_version -#include -#endif -#if __FreeBSD_version >= 500000 -#ifndef __wchar_t -#define __wchar_t -#endif -#ifndef __wint_t -#define __wint_t -#endif -#else -#ifndef _WCHAR_T -#define _WCHAR_T -#endif -#ifndef _WINT_T -#define _WINT_T -#endif -#endif -#endif -#endif - -#ifdef HAVE_NCURSES_H -#include -#else -#include -#ifdef HAVE_TERM_H -/* for tigetstr, which is not declared in SysV curses */ -#include -#endif -#endif - -#ifdef HAVE_NCURSES_H -/* configure was checking , but we will - use , which has all these features. */ -#ifndef WINDOW_HAS_FLAGS -#define WINDOW_HAS_FLAGS 1 -#endif -#ifndef MVWDELCH_IS_EXPRESSION -#define MVWDELCH_IS_EXPRESSION 1 -#endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define PyCurses_API_pointers 4 - -/* Type declarations */ - -typedef struct { - PyObject_HEAD - WINDOW *win; -} PyCursesWindowObject; - -#define PyCursesWindow_Check(v) (Py_TYPE(v) == &PyCursesWindow_Type) - -#define PyCurses_CAPSULE_NAME "_curses._C_API" - - -#ifdef CURSES_MODULE -/* This section is used when compiling _cursesmodule.c */ - -#else -/* This section is used in modules that use the _cursesmodule API */ - -static void **PyCurses_API; - -#define PyCursesWindow_Type (*(PyTypeObject *) PyCurses_API[0]) -#define PyCursesSetupTermCalled {if (! ((int (*)(void))PyCurses_API[1]) () ) return NULL;} -#define PyCursesInitialised {if (! ((int (*)(void))PyCurses_API[2]) () ) return NULL;} -#define PyCursesInitialisedColor {if (! ((int (*)(void))PyCurses_API[3]) () ) return NULL;} - -#define import_curses() \ - PyCurses_API = (void **)PyCapsule_Import(PyCurses_CAPSULE_NAME, 1); - -#endif - -/* general error messages */ -static char *catchall_ERR = "curses function returned ERR"; -static char *catchall_NULL = "curses function returned NULL"; - -/* Function Prototype Macros - They are ugly but very, very useful. ;-) - - X - function name - TYPE - parameter Type - ERGSTR - format string for construction of the return value - PARSESTR - format string for argument parsing - */ - -#define NoArgNoReturnFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - return PyCursesCheckERR(X(), # X); } - -#define NoArgOrFlagNoReturnFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self, PyObject *args) \ -{ \ - int flag = 0; \ - PyCursesInitialised \ - switch(PyTuple_Size(args)) { \ - case 0: \ - return PyCursesCheckERR(X(), # X); \ - case 1: \ - if (!PyArg_ParseTuple(args, "i;True(1) or False(0)", &flag)) return NULL; \ - if (flag) return PyCursesCheckERR(X(), # X); \ - else return PyCursesCheckERR(no ## X (), # X); \ - default: \ - PyErr_SetString(PyExc_TypeError, # X " requires 0 or 1 arguments"); \ - return NULL; } } - -#define NoArgReturnIntFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - return PyInt_FromLong((long) X()); } - - -#define NoArgReturnStringFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - return PyString_FromString(X()); } - -#define NoArgTrueFalseFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - if (X () == FALSE) { \ - Py_INCREF(Py_False); \ - return Py_False; \ - } \ - Py_INCREF(Py_True); \ - return Py_True; } - -#define NoArgNoReturnVoidFunction(X) \ -static PyObject *PyCurses_ ## X (PyObject *self) \ -{ \ - PyCursesInitialised \ - X(); \ - Py_INCREF(Py_None); \ - return Py_None; } - -#ifdef __cplusplus -} -#endif - -#endif /* !defined(Py_CURSES_H) */ - - diff --git a/python/include/pyarena.h b/python/include/pyarena.h deleted file mode 100644 index 5f193fec..00000000 --- a/python/include/pyarena.h +++ /dev/null @@ -1,62 +0,0 @@ -/* An arena-like memory interface for the compiler. - */ - -#ifndef Py_PYARENA_H -#define Py_PYARENA_H - -#ifdef __cplusplus -extern "C" { -#endif - - typedef struct _arena PyArena; - - /* PyArena_New() and PyArena_Free() create a new arena and free it, - respectively. Once an arena has been created, it can be used - to allocate memory via PyArena_Malloc(). Pointers to PyObject can - also be registered with the arena via PyArena_AddPyObject(), and the - arena will ensure that the PyObjects stay alive at least until - PyArena_Free() is called. When an arena is freed, all the memory it - allocated is freed, the arena releases internal references to registered - PyObject*, and none of its pointers are valid. - XXX (tim) What does "none of its pointers are valid" mean? Does it - XXX mean that pointers previously obtained via PyArena_Malloc() are - XXX no longer valid? (That's clearly true, but not sure that's what - XXX the text is trying to say.) - - PyArena_New() returns an arena pointer. On error, it - returns a negative number and sets an exception. - XXX (tim): Not true. On error, PyArena_New() actually returns NULL, - XXX and looks like it may or may not set an exception (e.g., if the - XXX internal PyList_New(0) returns NULL, PyArena_New() passes that on - XXX and an exception is set; OTOH, if the internal - XXX block_new(DEFAULT_BLOCK_SIZE) returns NULL, that's passed on but - XXX an exception is not set in that case). - */ - PyAPI_FUNC(PyArena *) PyArena_New(void); - PyAPI_FUNC(void) PyArena_Free(PyArena *); - - /* Mostly like malloc(), return the address of a block of memory spanning - * `size` bytes, or return NULL (without setting an exception) if enough - * new memory can't be obtained. Unlike malloc(0), PyArena_Malloc() with - * size=0 does not guarantee to return a unique pointer (the pointer - * returned may equal one or more other pointers obtained from - * PyArena_Malloc()). - * Note that pointers obtained via PyArena_Malloc() must never be passed to - * the system free() or realloc(), or to any of Python's similar memory- - * management functions. PyArena_Malloc()-obtained pointers remain valid - * until PyArena_Free(ar) is called, at which point all pointers obtained - * from the arena `ar` become invalid simultaneously. - */ - PyAPI_FUNC(void *) PyArena_Malloc(PyArena *, size_t size); - - /* This routine isn't a proper arena allocation routine. It takes - * a PyObject* and records it so that it can be DECREFed when the - * arena is freed. - */ - PyAPI_FUNC(int) PyArena_AddPyObject(PyArena *, PyObject *); - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_PYARENA_H */ diff --git a/python/include/pycapsule.h b/python/include/pycapsule.h deleted file mode 100644 index cd682fc7..00000000 --- a/python/include/pycapsule.h +++ /dev/null @@ -1,56 +0,0 @@ - -/* Capsule objects let you wrap a C "void *" pointer in a Python - object. They're a way of passing data through the Python interpreter - without creating your own custom type. - - Capsules are used for communication between extension modules. - They provide a way for an extension module to export a C interface - to other extension modules, so that extension modules can use the - Python import mechanism to link to one another. - - For more information, please see "c-api/capsule.html" in the - documentation. -*/ - -#ifndef Py_CAPSULE_H -#define Py_CAPSULE_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(PyTypeObject) PyCapsule_Type; - -typedef void (*PyCapsule_Destructor)(PyObject *); - -#define PyCapsule_CheckExact(op) (Py_TYPE(op) == &PyCapsule_Type) - - -PyAPI_FUNC(PyObject *) PyCapsule_New( - void *pointer, - const char *name, - PyCapsule_Destructor destructor); - -PyAPI_FUNC(void *) PyCapsule_GetPointer(PyObject *capsule, const char *name); - -PyAPI_FUNC(PyCapsule_Destructor) PyCapsule_GetDestructor(PyObject *capsule); - -PyAPI_FUNC(const char *) PyCapsule_GetName(PyObject *capsule); - -PyAPI_FUNC(void *) PyCapsule_GetContext(PyObject *capsule); - -PyAPI_FUNC(int) PyCapsule_IsValid(PyObject *capsule, const char *name); - -PyAPI_FUNC(int) PyCapsule_SetPointer(PyObject *capsule, void *pointer); - -PyAPI_FUNC(int) PyCapsule_SetDestructor(PyObject *capsule, PyCapsule_Destructor destructor); - -PyAPI_FUNC(int) PyCapsule_SetName(PyObject *capsule, const char *name); - -PyAPI_FUNC(int) PyCapsule_SetContext(PyObject *capsule, void *context); - -PyAPI_FUNC(void *) PyCapsule_Import(const char *name, int no_block); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_CAPSULE_H */ diff --git a/python/include/pyconfig.h b/python/include/pyconfig.h deleted file mode 100644 index 1cfc59b8..00000000 --- a/python/include/pyconfig.h +++ /dev/null @@ -1,759 +0,0 @@ -#ifndef Py_CONFIG_H -#define Py_CONFIG_H - -/* pyconfig.h. NOT Generated automatically by configure. - -This is a manually maintained version used for the Watcom, -Borland and Microsoft Visual C++ compilers. It is a -standard part of the Python distribution. - -WINDOWS DEFINES: -The code specific to Windows should be wrapped around one of -the following #defines - -MS_WIN64 - Code specific to the MS Win64 API -MS_WIN32 - Code specific to the MS Win32 (and Win64) API (obsolete, this covers all supported APIs) -MS_WINDOWS - Code specific to Windows, but all versions. -MS_WINCE - Code specific to Windows CE -Py_ENABLE_SHARED - Code if the Python core is built as a DLL. - -Also note that neither "_M_IX86" or "_MSC_VER" should be used for -any purpose other than "Windows Intel x86 specific" and "Microsoft -compiler specific". Therefore, these should be very rare. - - -NOTE: The following symbols are deprecated: -NT, USE_DL_EXPORT, USE_DL_IMPORT, DL_EXPORT, DL_IMPORT -MS_CORE_DLL. - -WIN32 is still required for the locale module. - -*/ - -#ifdef _WIN32_WCE -#define MS_WINCE -#endif - -/* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */ -#ifdef USE_DL_EXPORT -# define Py_BUILD_CORE -#endif /* USE_DL_EXPORT */ - -/* Visual Studio 2005 introduces deprecation warnings for - "insecure" and POSIX functions. The insecure functions should - be replaced by *_s versions (according to Microsoft); the - POSIX functions by _* versions (which, according to Microsoft, - would be ISO C conforming). Neither renaming is feasible, so - we just silence the warnings. */ - -#ifndef _CRT_SECURE_NO_DEPRECATE -#define _CRT_SECURE_NO_DEPRECATE 1 -#endif -#ifndef _CRT_NONSTDC_NO_DEPRECATE -#define _CRT_NONSTDC_NO_DEPRECATE 1 -#endif - -/* Windows CE does not have these */ -#ifndef MS_WINCE -#define HAVE_IO_H -#define HAVE_SYS_UTIME_H -#define HAVE_TEMPNAM -#define HAVE_TMPFILE -#define HAVE_TMPNAM -#define HAVE_CLOCK -#define HAVE_STRERROR -#endif - -#ifdef HAVE_IO_H -#include -#endif - -#define HAVE_HYPOT -#define HAVE_STRFTIME -#define DONT_HAVE_SIG_ALARM -#define DONT_HAVE_SIG_PAUSE -#define LONG_BIT 32 -#define WORD_BIT 32 -#define PREFIX "" -#define EXEC_PREFIX "" - -#define MS_WIN32 /* only support win32 and greater. */ -#define MS_WINDOWS -#ifndef PYTHONPATH -# define PYTHONPATH ".\\DLLs;.\\lib;.\\lib\\plat-win;.\\lib\\lib-tk" -#endif -#define NT_THREADS -#define WITH_THREAD -#ifndef NETSCAPE_PI -#define USE_SOCKET -#endif - -/* CE6 doesn't have strdup() but _strdup(). Assume the same for earlier versions. */ -#if defined(MS_WINCE) -# include -# define strdup _strdup -#endif - -#ifdef MS_WINCE -/* Windows CE does not support environment variables */ -#define getenv(v) (NULL) -#define environ (NULL) -#endif - -/* Compiler specific defines */ - -/* ------------------------------------------------------------------------*/ -/* Microsoft C defines _MSC_VER */ -#ifdef _MSC_VER - -/* We want COMPILER to expand to a string containing _MSC_VER's *value*. - * This is horridly tricky, because the stringization operator only works - * on macro arguments, and doesn't evaluate macros passed *as* arguments. - * Attempts simpler than the following appear doomed to produce "_MSC_VER" - * literally in the string. - */ -#define _Py_PASTE_VERSION(SUFFIX) \ - ("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]") -/* e.g., this produces, after compile-time string catenation, - * ("[MSC v.1200 32 bit (Intel)]") - * - * _Py_STRINGIZE(_MSC_VER) expands to - * _Py_STRINGIZE1((_MSC_VER)) expands to - * _Py_STRINGIZE2(_MSC_VER) but as this call is the result of token-pasting - * it's scanned again for macros and so further expands to (under MSVC 6) - * _Py_STRINGIZE2(1200) which then expands to - * "1200" - */ -#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X)) -#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X -#define _Py_STRINGIZE2(X) #X - -/* MSVC defines _WINxx to differentiate the windows platform types - - Note that for compatibility reasons _WIN32 is defined on Win32 - *and* on Win64. For the same reasons, in Python, MS_WIN32 is - defined on Win32 *and* Win64. Win32 only code must therefore be - guarded as follows: - #if defined(MS_WIN32) && !defined(MS_WIN64) - Some modules are disabled on Itanium processors, therefore we - have MS_WINI64 set for those targets, otherwise MS_WINX64 -*/ -#ifdef _WIN64 -#define MS_WIN64 -#endif - -/* set the COMPILER */ -#ifdef MS_WIN64 -#if defined(_M_IA64) -#define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)") -#define MS_WINI64 -#elif defined(_M_X64) || defined(_M_AMD64) -#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)") -#define MS_WINX64 -#else -#define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)") -#endif -#endif /* MS_WIN64 */ - -/* set the version macros for the windows headers */ -#ifdef MS_WINX64 -/* 64 bit only runs on XP or greater */ -#define Py_WINVER _WIN32_WINNT_WINXP -#define Py_NTDDI NTDDI_WINXP -#else -/* Python 2.6+ requires Windows 2000 or greater */ -#ifdef _WIN32_WINNT_WIN2K -#define Py_WINVER _WIN32_WINNT_WIN2K -#else -#define Py_WINVER 0x0500 -#endif -#define Py_NTDDI NTDDI_WIN2KSP4 -#endif - -/* We only set these values when building Python - we don't want to force - these values on extensions, as that will affect the prototypes and - structures exposed in the Windows headers. Even when building Python, we - allow a single source file to override this - they may need access to - structures etc so it can optionally use new Windows features if it - determines at runtime they are available. -*/ -#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_MODULE) -#ifndef NTDDI_VERSION -#define NTDDI_VERSION Py_NTDDI -#endif -#ifndef WINVER -#define WINVER Py_WINVER -#endif -#ifndef _WIN32_WINNT -#define _WIN32_WINNT Py_WINVER -#endif -#endif - -/* _W64 is not defined for VC6 or eVC4 */ -#ifndef _W64 -#define _W64 -#endif - -/* Define like size_t, omitting the "unsigned" */ -#ifdef MS_WIN64 -typedef __int64 ssize_t; -#else -typedef _W64 int ssize_t; -#endif -#define HAVE_SSIZE_T 1 - -#if defined(MS_WIN32) && !defined(MS_WIN64) -#ifdef _M_IX86 -#define COMPILER _Py_PASTE_VERSION("32 bit (Intel)") -#else -#define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)") -#endif -#endif /* MS_WIN32 && !MS_WIN64 */ - -typedef int pid_t; - -#include -#define Py_IS_NAN _isnan -#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X)) -#define Py_IS_FINITE(X) _finite(X) -#define copysign _copysign -#define hypot _hypot - -#endif /* _MSC_VER */ - -/* define some ANSI types that are not defined in earlier Win headers */ -#if defined(_MSC_VER) && _MSC_VER >= 1200 -/* This file only exists in VC 6.0 or higher */ -#include -#endif - -/* ------------------------------------------------------------------------*/ -/* The Borland compiler defines __BORLANDC__ */ -/* XXX These defines are likely incomplete, but should be easy to fix. */ -#ifdef __BORLANDC__ -#define COMPILER "[Borland]" - -#ifdef _WIN32 -/* tested with BCC 5.5 (__BORLANDC__ >= 0x0550) - */ - -typedef int pid_t; -/* BCC55 seems to understand __declspec(dllimport), it is used in its - own header files (winnt.h, ...) - so we can do nothing and get the default*/ - -#undef HAVE_SYS_UTIME_H -#define HAVE_UTIME_H -#define HAVE_DIRENT_H - -/* rename a few functions for the Borland compiler */ -#include -#define _chsize chsize -#define _setmode setmode - -#else /* !_WIN32 */ -#error "Only Win32 and later are supported" -#endif /* !_WIN32 */ - -#endif /* BORLANDC */ - -/* ------------------------------------------------------------------------*/ -/* egcs/gnu-win32 defines __GNUC__ and _WIN32 */ -#if defined(__GNUC__) && defined(_WIN32) -/* XXX These defines are likely incomplete, but should be easy to fix. - They should be complete enough to build extension modules. */ -/* Suggested by Rene Liebscher to avoid a GCC 2.91.* - bug that requires structure imports. More recent versions of the - compiler don't exhibit this bug. -*/ -#if (__GNUC__==2) && (__GNUC_MINOR__<=91) -#warning "Please use an up-to-date version of gcc! (>2.91 recommended)" -#endif - -#define COMPILER "[gcc]" -#define hypot _hypot -#define PY_LONG_LONG long long -#define PY_LLONG_MIN LLONG_MIN -#define PY_LLONG_MAX LLONG_MAX -#define PY_ULLONG_MAX ULLONG_MAX -#endif /* GNUC */ - -/* ------------------------------------------------------------------------*/ -/* lcc-win32 defines __LCC__ */ -#if defined(__LCC__) -/* XXX These defines are likely incomplete, but should be easy to fix. - They should be complete enough to build extension modules. */ - -#define COMPILER "[lcc-win32]" -typedef int pid_t; -/* __declspec() is supported here too - do nothing to get the defaults */ - -#endif /* LCC */ - -/* ------------------------------------------------------------------------*/ -/* End of compilers - finish up */ - -#ifndef NO_STDIO_H -# include -#endif - -/* 64 bit ints are usually spelt __int64 unless compiler has overridden */ -#define HAVE_LONG_LONG 1 -#ifndef PY_LONG_LONG -# define PY_LONG_LONG __int64 -# define PY_LLONG_MAX _I64_MAX -# define PY_LLONG_MIN _I64_MIN -# define PY_ULLONG_MAX _UI64_MAX -#endif - -/* For Windows the Python core is in a DLL by default. Test -Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ -#if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) -# define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ -# define MS_COREDLL /* deprecated old symbol */ -#endif /* !MS_NO_COREDLL && ... */ - -/* All windows compilers that use this header support __declspec */ -#define HAVE_DECLSPEC_DLL - -/* For an MSVC DLL, we can nominate the .lib files used by extensions */ -#ifdef MS_COREDLL -# ifndef Py_BUILD_CORE /* not building the core - must be an ext */ -# if defined(_MSC_VER) - /* So MSVC users need not specify the .lib file in - their Makefile (other compilers are generally - taken care of by distutils.) */ -# ifdef _DEBUG -# pragma comment(lib,"python27_d.lib") -# else -# pragma comment(lib,"python27.lib") -# endif /* _DEBUG */ -# endif /* _MSC_VER */ -# endif /* Py_BUILD_CORE */ -#endif /* MS_COREDLL */ - -#if defined(MS_WIN64) -/* maintain "win32" sys.platform for backward compatibility of Python code, - the Win64 API should be close enough to the Win32 API to make this - preferable */ -# define PLATFORM "win32" -# define SIZEOF_VOID_P 8 -# define SIZEOF_TIME_T 8 -# define SIZEOF_OFF_T 4 -# define SIZEOF_FPOS_T 8 -# define SIZEOF_HKEY 8 -# define SIZEOF_SIZE_T 8 -/* configure.in defines HAVE_LARGEFILE_SUPPORT iff HAVE_LONG_LONG, - sizeof(off_t) > sizeof(long), and sizeof(PY_LONG_LONG) >= sizeof(off_t). - On Win64 the second condition is not true, but if fpos_t replaces off_t - then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64 - should define this. */ -# define HAVE_LARGEFILE_SUPPORT -#elif defined(MS_WIN32) -# define PLATFORM "win32" -# define HAVE_LARGEFILE_SUPPORT -# define SIZEOF_VOID_P 4 -# define SIZEOF_OFF_T 4 -# define SIZEOF_FPOS_T 8 -# define SIZEOF_HKEY 4 -# define SIZEOF_SIZE_T 4 - /* MS VS2005 changes time_t to an 64-bit type on all platforms */ -# if defined(_MSC_VER) && _MSC_VER >= 1400 -# define SIZEOF_TIME_T 8 -# else -# define SIZEOF_TIME_T 4 -# endif -#endif - -#ifdef _DEBUG -# define Py_DEBUG -#endif - - -#ifdef MS_WIN32 - -#define SIZEOF_SHORT 2 -#define SIZEOF_INT 4 -#define SIZEOF_LONG 4 -#define SIZEOF_LONG_LONG 8 -#define SIZEOF_DOUBLE 8 -#define SIZEOF_FLOAT 4 - -/* VC 7.1 has them and VC 6.0 does not. VC 6.0 has a version number of 1200. - Microsoft eMbedded Visual C++ 4.0 has a version number of 1201 and doesn't - define these. - If some compiler does not provide them, modify the #if appropriately. */ -#if defined(_MSC_VER) -#if _MSC_VER > 1300 -#define HAVE_UINTPTR_T 1 -#define HAVE_INTPTR_T 1 -#else -/* VC6, VS 2002 and eVC4 don't support the C99 LL suffix for 64-bit integer literals */ -#define Py_LL(x) x##I64 -#endif /* _MSC_VER > 1200 */ -#endif /* _MSC_VER */ - -#endif - -/* define signed and unsigned exact-width 32-bit and 64-bit types, used in the - implementation of Python long integers. */ -#ifndef PY_UINT32_T -#if SIZEOF_INT == 4 -#define HAVE_UINT32_T 1 -#define PY_UINT32_T unsigned int -#elif SIZEOF_LONG == 4 -#define HAVE_UINT32_T 1 -#define PY_UINT32_T unsigned long -#endif -#endif - -#ifndef PY_UINT64_T -#if SIZEOF_LONG_LONG == 8 -#define HAVE_UINT64_T 1 -#define PY_UINT64_T unsigned PY_LONG_LONG -#endif -#endif - -#ifndef PY_INT32_T -#if SIZEOF_INT == 4 -#define HAVE_INT32_T 1 -#define PY_INT32_T int -#elif SIZEOF_LONG == 4 -#define HAVE_INT32_T 1 -#define PY_INT32_T long -#endif -#endif - -#ifndef PY_INT64_T -#if SIZEOF_LONG_LONG == 8 -#define HAVE_INT64_T 1 -#define PY_INT64_T PY_LONG_LONG -#endif -#endif - -/* Fairly standard from here! */ - -/* Define to 1 if you have the `copysign' function. */ -#define HAVE_COPYSIGN 1 - -/* Define to 1 if you have the `isinf' macro. */ -#define HAVE_DECL_ISINF 1 - -/* Define to 1 if you have the `isnan' function. */ -#define HAVE_DECL_ISNAN 1 - -/* Define if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ -#ifndef _ALL_SOURCE -/* #undef _ALL_SOURCE */ -#endif - -/* Define to empty if the keyword does not work. */ -/* #define const */ - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_CONIO_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_DIRECT_H 1 -#endif - -/* Define if you have dirent.h. */ -/* #define DIRENT 1 */ - -/* Define to the type of elements in the array set by `getgroups'. - Usually this is either `int' or `gid_t'. */ -/* #undef GETGROUPS_T */ - -/* Define to `int' if doesn't define. */ -/* #undef gid_t */ - -/* Define if your struct tm has tm_zone. */ -/* #undef HAVE_TM_ZONE */ - -/* Define if you don't have tm_zone but do have the external array - tzname. */ -#define HAVE_TZNAME - -/* Define to `int' if doesn't define. */ -/* #undef mode_t */ - -/* Define if you don't have dirent.h, but have ndir.h. */ -/* #undef NDIR */ - -/* Define to `long' if doesn't define. */ -/* #undef off_t */ - -/* Define to `int' if doesn't define. */ -/* #undef pid_t */ - -/* Define if the system does not provide POSIX.1 features except - with this defined. */ -/* #undef _POSIX_1_SOURCE */ - -/* Define if you need to in order for stat and other things to work. */ -/* #undef _POSIX_SOURCE */ - -/* Define as the return type of signal handlers (int or void). */ -#define RETSIGTYPE void - -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define if you don't have dirent.h, but have sys/dir.h. */ -/* #undef SYSDIR */ - -/* Define if you don't have dirent.h, but have sys/ndir.h. */ -/* #undef SYSNDIR */ - -/* Define if you can safely include both and . */ -/* #undef TIME_WITH_SYS_TIME */ - -/* Define if your declares struct tm. */ -/* #define TM_IN_SYS_TIME 1 */ - -/* Define to `int' if doesn't define. */ -/* #undef uid_t */ - -/* Define if the closedir function returns void instead of int. */ -/* #undef VOID_CLOSEDIR */ - -/* Define if getpgrp() must be called as getpgrp(0) - and (consequently) setpgrp() as setpgrp(0, 0). */ -/* #undef GETPGRP_HAVE_ARGS */ - -/* Define this if your time.h defines altzone */ -/* #define HAVE_ALTZONE */ - -/* Define if you have the putenv function. */ -#ifndef MS_WINCE -#define HAVE_PUTENV -#endif - -/* Define if your compiler supports function prototypes */ -#define HAVE_PROTOTYPES - -/* Define if you can safely include both and - (which you can't on SCO ODT 3.0). */ -/* #undef SYS_SELECT_WITH_SYS_TIME */ - -/* Define if you want documentation strings in extension modules */ -#define WITH_DOC_STRINGS 1 - -/* Define if you want to compile in rudimentary thread support */ -/* #undef WITH_THREAD */ - -/* Define if you want to use the GNU readline library */ -/* #define WITH_READLINE 1 */ - -/* Define if you want to have a Unicode type. */ -#define Py_USING_UNICODE - -/* Define as the size of the unicode type. */ -/* This is enough for unicodeobject.h to do the "right thing" on Windows. */ -#define Py_UNICODE_SIZE 2 - -/* Use Python's own small-block memory-allocator. */ -#define WITH_PYMALLOC 1 - -/* Define if you have clock. */ -/* #define HAVE_CLOCK */ - -/* Define when any dynamic module loading is enabled */ -#define HAVE_DYNAMIC_LOADING - -/* Define if you have ftime. */ -#ifndef MS_WINCE -#define HAVE_FTIME -#endif - -/* Define if you have getpeername. */ -#define HAVE_GETPEERNAME - -/* Define if you have getpgrp. */ -/* #undef HAVE_GETPGRP */ - -/* Define if you have getpid. */ -#ifndef MS_WINCE -#define HAVE_GETPID -#endif - -/* Define if you have gettimeofday. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define if you have getwd. */ -/* #undef HAVE_GETWD */ - -/* Define if you have lstat. */ -/* #undef HAVE_LSTAT */ - -/* Define if you have the mktime function. */ -#define HAVE_MKTIME - -/* Define if you have nice. */ -/* #undef HAVE_NICE */ - -/* Define if you have readlink. */ -/* #undef HAVE_READLINK */ - -/* Define if you have select. */ -/* #undef HAVE_SELECT */ - -/* Define if you have setpgid. */ -/* #undef HAVE_SETPGID */ - -/* Define if you have setpgrp. */ -/* #undef HAVE_SETPGRP */ - -/* Define if you have setsid. */ -/* #undef HAVE_SETSID */ - -/* Define if you have setvbuf. */ -#define HAVE_SETVBUF - -/* Define if you have siginterrupt. */ -/* #undef HAVE_SIGINTERRUPT */ - -/* Define if you have symlink. */ -/* #undef HAVE_SYMLINK */ - -/* Define if you have tcgetpgrp. */ -/* #undef HAVE_TCGETPGRP */ - -/* Define if you have tcsetpgrp. */ -/* #undef HAVE_TCSETPGRP */ - -/* Define if you have times. */ -/* #undef HAVE_TIMES */ - -/* Define if you have uname. */ -/* #undef HAVE_UNAME */ - -/* Define if you have waitpid. */ -/* #undef HAVE_WAITPID */ - -/* Define to 1 if you have the `wcscoll' function. */ -#ifndef MS_WINCE -#define HAVE_WCSCOLL 1 -#endif - -/* Define if the zlib library has inflateCopy */ -#define HAVE_ZLIB_COPY 1 - -/* Define if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_ERRNO_H 1 -#endif - -/* Define if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_FCNTL_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_PROCESS_H 1 -#endif - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_SIGNAL_H 1 -#endif - -/* Define if you have the prototypes. */ -#define HAVE_STDARG_PROTOTYPES - -/* Define if you have the header file. */ -#define HAVE_STDDEF_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_AUDIOIO_H */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_PARAM_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_SELECT_H 1 */ - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_SYS_STAT_H 1 -#endif - -/* Define if you have the header file. */ -/* #define HAVE_SYS_TIME_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_TIMES_H 1 */ - -/* Define to 1 if you have the header file. */ -#ifndef MS_WINCE -#define HAVE_SYS_TYPES_H 1 -#endif - -/* Define if you have the header file. */ -/* #define HAVE_SYS_UN_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_UTIME_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_SYS_UTSNAME_H 1 */ - -/* Define if you have the header file. */ -/* #undef HAVE_THREAD_H */ - -/* Define if you have the header file. */ -/* #define HAVE_UNISTD_H 1 */ - -/* Define if you have the header file. */ -/* #define HAVE_UTIME_H 1 */ - -/* Define if the compiler provides a wchar.h header file. */ -#define HAVE_WCHAR_H 1 - -/* Define if you have the dl library (-ldl). */ -/* #undef HAVE_LIBDL */ - -/* Define if you have the mpc library (-lmpc). */ -/* #undef HAVE_LIBMPC */ - -/* Define if you have the nsl library (-lnsl). */ -#define HAVE_LIBNSL 1 - -/* Define if you have the seq library (-lseq). */ -/* #undef HAVE_LIBSEQ */ - -/* Define if you have the socket library (-lsocket). */ -#define HAVE_LIBSOCKET 1 - -/* Define if you have the sun library (-lsun). */ -/* #undef HAVE_LIBSUN */ - -/* Define if you have the termcap library (-ltermcap). */ -/* #undef HAVE_LIBTERMCAP */ - -/* Define if you have the termlib library (-ltermlib). */ -/* #undef HAVE_LIBTERMLIB */ - -/* Define if you have the thread library (-lthread). */ -/* #undef HAVE_LIBTHREAD */ - -/* WinSock does not use a bitmask in select, and uses - socket handles greater than FD_SETSIZE */ -#define Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE - -/* Define if C doubles are 64-bit IEEE 754 binary format, stored with the - least significant byte first */ -#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1 - -#endif /* !Py_CONFIG_H */ diff --git a/python/include/pyctype.h b/python/include/pyctype.h deleted file mode 100644 index 673cf2eb..00000000 --- a/python/include/pyctype.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef PYCTYPE_H -#define PYCTYPE_H - -#define PY_CTF_LOWER 0x01 -#define PY_CTF_UPPER 0x02 -#define PY_CTF_ALPHA (PY_CTF_LOWER|PY_CTF_UPPER) -#define PY_CTF_DIGIT 0x04 -#define PY_CTF_ALNUM (PY_CTF_ALPHA|PY_CTF_DIGIT) -#define PY_CTF_SPACE 0x08 -#define PY_CTF_XDIGIT 0x10 - -PyAPI_DATA(const unsigned int) _Py_ctype_table[256]; - -/* Unlike their C counterparts, the following macros are not meant to - * handle an int with any of the values [EOF, 0-UCHAR_MAX]. The argument - * must be a signed/unsigned char. */ -#define Py_ISLOWER(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_LOWER) -#define Py_ISUPPER(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_UPPER) -#define Py_ISALPHA(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALPHA) -#define Py_ISDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_DIGIT) -#define Py_ISXDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_XDIGIT) -#define Py_ISALNUM(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALNUM) -#define Py_ISSPACE(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_SPACE) - -PyAPI_DATA(const unsigned char) _Py_ctype_tolower[256]; -PyAPI_DATA(const unsigned char) _Py_ctype_toupper[256]; - -#define Py_TOLOWER(c) (_Py_ctype_tolower[Py_CHARMASK(c)]) -#define Py_TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)]) - -#endif /* !PYCTYPE_H */ diff --git a/python/include/pydebug.h b/python/include/pydebug.h deleted file mode 100644 index 0f45960f..00000000 --- a/python/include/pydebug.h +++ /dev/null @@ -1,41 +0,0 @@ - -#ifndef Py_PYDEBUG_H -#define Py_PYDEBUG_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(int) Py_DebugFlag; -PyAPI_DATA(int) Py_VerboseFlag; -PyAPI_DATA(int) Py_InteractiveFlag; -PyAPI_DATA(int) Py_InspectFlag; -PyAPI_DATA(int) Py_OptimizeFlag; -PyAPI_DATA(int) Py_NoSiteFlag; -PyAPI_DATA(int) Py_BytesWarningFlag; -PyAPI_DATA(int) Py_UseClassExceptionsFlag; -PyAPI_DATA(int) Py_FrozenFlag; -PyAPI_DATA(int) Py_TabcheckFlag; -PyAPI_DATA(int) Py_UnicodeFlag; -PyAPI_DATA(int) Py_IgnoreEnvironmentFlag; -PyAPI_DATA(int) Py_DivisionWarningFlag; -PyAPI_DATA(int) Py_DontWriteBytecodeFlag; -PyAPI_DATA(int) Py_NoUserSiteDirectory; -/* _XXX Py_QnewFlag should go away in 3.0. It's true iff -Qnew is passed, - on the command line, and is used in 2.2 by ceval.c to make all "/" divisions - true divisions (which they will be in 3.0). */ -PyAPI_DATA(int) _Py_QnewFlag; -/* Warn about 3.x issues */ -PyAPI_DATA(int) Py_Py3kWarningFlag; -PyAPI_DATA(int) Py_HashRandomizationFlag; - -/* this is a wrapper around getenv() that pays attention to - Py_IgnoreEnvironmentFlag. It should be used for getting variables like - PYTHONPATH and PYTHONHOME from the environment */ -#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s)) - -PyAPI_FUNC(void) Py_FatalError(const char *message); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYDEBUG_H */ diff --git a/python/include/pyerrors.h b/python/include/pyerrors.h deleted file mode 100644 index dbe3bfa5..00000000 --- a/python/include/pyerrors.h +++ /dev/null @@ -1,328 +0,0 @@ -#ifndef Py_ERRORS_H -#define Py_ERRORS_H -#ifdef __cplusplus -extern "C" { -#endif - -/* Error objects */ - -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; -} PyBaseExceptionObject; - -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *msg; - PyObject *filename; - PyObject *lineno; - PyObject *offset; - PyObject *text; - PyObject *print_file_and_line; -} PySyntaxErrorObject; - -#ifdef Py_USING_UNICODE -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *encoding; - PyObject *object; - Py_ssize_t start; - Py_ssize_t end; - PyObject *reason; -} PyUnicodeErrorObject; -#endif - -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *code; -} PySystemExitObject; - -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *myerrno; - PyObject *strerror; - PyObject *filename; -} PyEnvironmentErrorObject; - -#ifdef MS_WINDOWS -typedef struct { - PyObject_HEAD - PyObject *dict; - PyObject *args; - PyObject *message; - PyObject *myerrno; - PyObject *strerror; - PyObject *filename; - PyObject *winerror; -} PyWindowsErrorObject; -#endif - -/* Error handling definitions */ - -PyAPI_FUNC(void) PyErr_SetNone(PyObject *); -PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *); -PyAPI_FUNC(void) PyErr_SetString(PyObject *, const char *); -PyAPI_FUNC(PyObject *) PyErr_Occurred(void); -PyAPI_FUNC(void) PyErr_Clear(void); -PyAPI_FUNC(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **); -PyAPI_FUNC(void) PyErr_Restore(PyObject *, PyObject *, PyObject *); - -#ifdef Py_DEBUG -#define _PyErr_OCCURRED() PyErr_Occurred() -#else -#define _PyErr_OCCURRED() (_PyThreadState_Current->curexc_type) -#endif - -/* Error testing and normalization */ -PyAPI_FUNC(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *); -PyAPI_FUNC(int) PyErr_ExceptionMatches(PyObject *); -PyAPI_FUNC(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**); - -/* */ - -#define PyExceptionClass_Check(x) \ - (PyClass_Check((x)) || (PyType_Check((x)) && \ - PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS))) - -#define PyExceptionInstance_Check(x) \ - (PyInstance_Check((x)) || \ - PyType_FastSubclass((x)->ob_type, Py_TPFLAGS_BASE_EXC_SUBCLASS)) - -#define PyExceptionClass_Name(x) \ - (PyClass_Check((x)) \ - ? PyString_AS_STRING(((PyClassObject*)(x))->cl_name) \ - : (char *)(((PyTypeObject*)(x))->tp_name)) - -#define PyExceptionInstance_Class(x) \ - ((PyInstance_Check((x)) \ - ? (PyObject*)((PyInstanceObject*)(x))->in_class \ - : (PyObject*)((x)->ob_type))) - - -/* Predefined exceptions */ - -PyAPI_DATA(PyObject *) PyExc_BaseException; -PyAPI_DATA(PyObject *) PyExc_Exception; -PyAPI_DATA(PyObject *) PyExc_StopIteration; -PyAPI_DATA(PyObject *) PyExc_GeneratorExit; -PyAPI_DATA(PyObject *) PyExc_StandardError; -PyAPI_DATA(PyObject *) PyExc_ArithmeticError; -PyAPI_DATA(PyObject *) PyExc_LookupError; - -PyAPI_DATA(PyObject *) PyExc_AssertionError; -PyAPI_DATA(PyObject *) PyExc_AttributeError; -PyAPI_DATA(PyObject *) PyExc_EOFError; -PyAPI_DATA(PyObject *) PyExc_FloatingPointError; -PyAPI_DATA(PyObject *) PyExc_EnvironmentError; -PyAPI_DATA(PyObject *) PyExc_IOError; -PyAPI_DATA(PyObject *) PyExc_OSError; -PyAPI_DATA(PyObject *) PyExc_ImportError; -PyAPI_DATA(PyObject *) PyExc_IndexError; -PyAPI_DATA(PyObject *) PyExc_KeyError; -PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt; -PyAPI_DATA(PyObject *) PyExc_MemoryError; -PyAPI_DATA(PyObject *) PyExc_NameError; -PyAPI_DATA(PyObject *) PyExc_OverflowError; -PyAPI_DATA(PyObject *) PyExc_RuntimeError; -PyAPI_DATA(PyObject *) PyExc_NotImplementedError; -PyAPI_DATA(PyObject *) PyExc_SyntaxError; -PyAPI_DATA(PyObject *) PyExc_IndentationError; -PyAPI_DATA(PyObject *) PyExc_TabError; -PyAPI_DATA(PyObject *) PyExc_ReferenceError; -PyAPI_DATA(PyObject *) PyExc_SystemError; -PyAPI_DATA(PyObject *) PyExc_SystemExit; -PyAPI_DATA(PyObject *) PyExc_TypeError; -PyAPI_DATA(PyObject *) PyExc_UnboundLocalError; -PyAPI_DATA(PyObject *) PyExc_UnicodeError; -PyAPI_DATA(PyObject *) PyExc_UnicodeEncodeError; -PyAPI_DATA(PyObject *) PyExc_UnicodeDecodeError; -PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError; -PyAPI_DATA(PyObject *) PyExc_ValueError; -PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError; -#ifdef MS_WINDOWS -PyAPI_DATA(PyObject *) PyExc_WindowsError; -#endif -#ifdef __VMS -PyAPI_DATA(PyObject *) PyExc_VMSError; -#endif - -PyAPI_DATA(PyObject *) PyExc_BufferError; - -PyAPI_DATA(PyObject *) PyExc_MemoryErrorInst; -PyAPI_DATA(PyObject *) PyExc_RecursionErrorInst; - -/* Predefined warning categories */ -PyAPI_DATA(PyObject *) PyExc_Warning; -PyAPI_DATA(PyObject *) PyExc_UserWarning; -PyAPI_DATA(PyObject *) PyExc_DeprecationWarning; -PyAPI_DATA(PyObject *) PyExc_PendingDeprecationWarning; -PyAPI_DATA(PyObject *) PyExc_SyntaxWarning; -PyAPI_DATA(PyObject *) PyExc_RuntimeWarning; -PyAPI_DATA(PyObject *) PyExc_FutureWarning; -PyAPI_DATA(PyObject *) PyExc_ImportWarning; -PyAPI_DATA(PyObject *) PyExc_UnicodeWarning; -PyAPI_DATA(PyObject *) PyExc_BytesWarning; - - -/* Convenience functions */ - -PyAPI_FUNC(int) PyErr_BadArgument(void); -PyAPI_FUNC(PyObject *) PyErr_NoMemory(void); -PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *); -PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject( - PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename( - PyObject *, const char *); -#ifdef MS_WINDOWS -PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename( - PyObject *, const Py_UNICODE *); -#endif /* MS_WINDOWS */ - -PyAPI_FUNC(PyObject *) PyErr_Format(PyObject *, const char *, ...) - Py_GCC_ATTRIBUTE((format(printf, 2, 3))); - -#ifdef MS_WINDOWS -PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilenameObject( - int, const char *); -PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename( - int, const char *); -PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename( - int, const Py_UNICODE *); -PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int); -PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject( - PyObject *,int, PyObject *); -PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename( - PyObject *,int, const char *); -PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename( - PyObject *,int, const Py_UNICODE *); -PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int); -#endif /* MS_WINDOWS */ - -/* Export the old function so that the existing API remains available: */ -PyAPI_FUNC(void) PyErr_BadInternalCall(void); -PyAPI_FUNC(void) _PyErr_BadInternalCall(char *filename, int lineno); -/* Mask the old API with a call to the new API for code compiled under - Python 2.0: */ -#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__) - -/* Function to create a new exception */ -PyAPI_FUNC(PyObject *) PyErr_NewException( - char *name, PyObject *base, PyObject *dict); -PyAPI_FUNC(PyObject *) PyErr_NewExceptionWithDoc( - char *name, char *doc, PyObject *base, PyObject *dict); -PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *); - -/* In sigcheck.c or signalmodule.c */ -PyAPI_FUNC(int) PyErr_CheckSignals(void); -PyAPI_FUNC(void) PyErr_SetInterrupt(void); - -/* In signalmodule.c */ -int PySignal_SetWakeupFd(int fd); - -/* Support for adding program text to SyntaxErrors */ -PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int); -PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int); - -#ifdef Py_USING_UNICODE -/* The following functions are used to create and modify unicode - exceptions from C */ - -/* create a UnicodeDecodeError object */ -PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create( - const char *, const char *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); - -/* create a UnicodeEncodeError object */ -PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create( - const char *, const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); - -/* create a UnicodeTranslateError object */ -PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create( - const Py_UNICODE *, Py_ssize_t, Py_ssize_t, Py_ssize_t, const char *); - -/* get the encoding attribute */ -PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetEncoding(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetEncoding(PyObject *); - -/* get the object attribute */ -PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetObject(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetObject(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetObject(PyObject *); - -/* get the value of the start attribute (the int * may not be NULL) - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_GetStart(PyObject *, Py_ssize_t *); -PyAPI_FUNC(int) PyUnicodeDecodeError_GetStart(PyObject *, Py_ssize_t *); -PyAPI_FUNC(int) PyUnicodeTranslateError_GetStart(PyObject *, Py_ssize_t *); - -/* assign a new value to the start attribute - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_SetStart(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyUnicodeDecodeError_SetStart(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyUnicodeTranslateError_SetStart(PyObject *, Py_ssize_t); - -/* get the value of the end attribute (the int *may not be NULL) - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_GetEnd(PyObject *, Py_ssize_t *); -PyAPI_FUNC(int) PyUnicodeDecodeError_GetEnd(PyObject *, Py_ssize_t *); -PyAPI_FUNC(int) PyUnicodeTranslateError_GetEnd(PyObject *, Py_ssize_t *); - -/* assign a new value to the end attribute - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_SetEnd(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyUnicodeDecodeError_SetEnd(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyUnicodeTranslateError_SetEnd(PyObject *, Py_ssize_t); - -/* get the value of the reason attribute */ -PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetReason(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetReason(PyObject *); -PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetReason(PyObject *); - -/* assign a new value to the reason attribute - return 0 on success, -1 on failure */ -PyAPI_FUNC(int) PyUnicodeEncodeError_SetReason( - PyObject *, const char *); -PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason( - PyObject *, const char *); -PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason( - PyObject *, const char *); -#endif - - -/* These APIs aren't really part of the error implementation, but - often needed to format error messages; the native C lib APIs are - not available on all platforms, which is why we provide emulations - for those platforms in Python/mysnprintf.c, - WARNING: The return value of snprintf varies across platforms; do - not rely on any particular behavior; eventually the C99 defn may - be reliable. -*/ -#if defined(MS_WIN32) && !defined(HAVE_SNPRINTF) -# define HAVE_SNPRINTF -# define snprintf _snprintf -# define vsnprintf _vsnprintf -#endif - -#include -PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 3, 4))); -PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va) - Py_GCC_ATTRIBUTE((format(printf, 3, 0))); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_ERRORS_H */ diff --git a/python/include/pyexpat.h b/python/include/pyexpat.h deleted file mode 100644 index 5340ef5f..00000000 --- a/python/include/pyexpat.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Stuff to export relevant 'expat' entry points from pyexpat to other - * parser modules, such as cElementTree. */ - -/* note: you must import expat.h before importing this module! */ - -#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0" -#define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" - -struct PyExpat_CAPI -{ - char* magic; /* set to PyExpat_CAPI_MAGIC */ - int size; /* set to sizeof(struct PyExpat_CAPI) */ - int MAJOR_VERSION; - int MINOR_VERSION; - int MICRO_VERSION; - /* pointers to selected expat functions. add new functions at - the end, if needed */ - const XML_LChar * (*ErrorString)(enum XML_Error code); - enum XML_Error (*GetErrorCode)(XML_Parser parser); - XML_Size (*GetErrorColumnNumber)(XML_Parser parser); - XML_Size (*GetErrorLineNumber)(XML_Parser parser); - enum XML_Status (*Parse)( - XML_Parser parser, const char *s, int len, int isFinal); - XML_Parser (*ParserCreate_MM)( - const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, - const XML_Char *namespaceSeparator); - void (*ParserFree)(XML_Parser parser); - void (*SetCharacterDataHandler)( - XML_Parser parser, XML_CharacterDataHandler handler); - void (*SetCommentHandler)( - XML_Parser parser, XML_CommentHandler handler); - void (*SetDefaultHandlerExpand)( - XML_Parser parser, XML_DefaultHandler handler); - void (*SetElementHandler)( - XML_Parser parser, XML_StartElementHandler start, - XML_EndElementHandler end); - void (*SetNamespaceDeclHandler)( - XML_Parser parser, XML_StartNamespaceDeclHandler start, - XML_EndNamespaceDeclHandler end); - void (*SetProcessingInstructionHandler)( - XML_Parser parser, XML_ProcessingInstructionHandler handler); - void (*SetUnknownEncodingHandler)( - XML_Parser parser, XML_UnknownEncodingHandler handler, - void *encodingHandlerData); - void (*SetUserData)(XML_Parser parser, void *userData); - /* always add new stuff to the end! */ -}; - diff --git a/python/include/pyfpe.h b/python/include/pyfpe.h deleted file mode 100644 index 19110ab0..00000000 --- a/python/include/pyfpe.h +++ /dev/null @@ -1,176 +0,0 @@ -#ifndef Py_PYFPE_H -#define Py_PYFPE_H -#ifdef __cplusplus -extern "C" { -#endif -/* - --------------------------------------------------------------------- - / Copyright (c) 1996. \ - | The Regents of the University of California. | - | All rights reserved. | - | | - | Permission to use, copy, modify, and distribute this software for | - | any purpose without fee is hereby granted, provided that this en- | - | tire notice is included in all copies of any software which is or | - | includes a copy or modification of this software and in all | - | copies of the supporting documentation for such software. | - | | - | This work was produced at the University of California, Lawrence | - | Livermore National Laboratory under contract no. W-7405-ENG-48 | - | between the U.S. Department of Energy and The Regents of the | - | University of California for the operation of UC LLNL. | - | | - | DISCLAIMER | - | | - | This software was prepared as an account of work sponsored by an | - | agency of the United States Government. Neither the United States | - | Government nor the University of California nor any of their em- | - | ployees, makes any warranty, express or implied, or assumes any | - | liability or responsibility for the accuracy, completeness, or | - | usefulness of any information, apparatus, product, or process | - | disclosed, or represents that its use would not infringe | - | privately-owned rights. Reference herein to any specific commer- | - | cial products, process, or service by trade name, trademark, | - | manufacturer, or otherwise, does not necessarily constitute or | - | imply its endorsement, recommendation, or favoring by the United | - | States Government or the University of California. The views and | - | opinions of authors expressed herein do not necessarily state or | - | reflect those of the United States Government or the University | - | of California, and shall not be used for advertising or product | - \ endorsement purposes. / - --------------------------------------------------------------------- -*/ - -/* - * Define macros for handling SIGFPE. - * Lee Busby, LLNL, November, 1996 - * busby1@llnl.gov - * - ********************************************* - * Overview of the system for handling SIGFPE: - * - * This file (Include/pyfpe.h) defines a couple of "wrapper" macros for - * insertion into your Python C code of choice. Their proper use is - * discussed below. The file Python/pyfpe.c defines a pair of global - * variables PyFPE_jbuf and PyFPE_counter which are used by the signal - * handler for SIGFPE to decide if a particular exception was protected - * by the macros. The signal handler itself, and code for enabling the - * generation of SIGFPE in the first place, is in a (new) Python module - * named fpectl. This module is standard in every respect. It can be loaded - * either statically or dynamically as you choose, and like any other - * Python module, has no effect until you import it. - * - * In the general case, there are three steps toward handling SIGFPE in any - * Python code: - * - * 1) Add the *_PROTECT macros to your C code as required to protect - * dangerous floating point sections. - * - * 2) Turn on the inclusion of the code by adding the ``--with-fpectl'' - * flag at the time you run configure. If the fpectl or other modules - * which use the *_PROTECT macros are to be dynamically loaded, be - * sure they are compiled with WANT_SIGFPE_HANDLER defined. - * - * 3) When python is built and running, import fpectl, and execute - * fpectl.turnon_sigfpe(). This sets up the signal handler and enables - * generation of SIGFPE whenever an exception occurs. From this point - * on, any properly trapped SIGFPE should result in the Python - * FloatingPointError exception. - * - * Step 1 has been done already for the Python kernel code, and should be - * done soon for the NumPy array package. Step 2 is usually done once at - * python install time. Python's behavior with respect to SIGFPE is not - * changed unless you also do step 3. Thus you can control this new - * facility at compile time, or run time, or both. - * - ******************************** - * Using the macros in your code: - * - * static PyObject *foobar(PyObject *self,PyObject *args) - * { - * .... - * PyFPE_START_PROTECT("Error in foobar", return 0) - * result = dangerous_op(somearg1, somearg2, ...); - * PyFPE_END_PROTECT(result) - * .... - * } - * - * If a floating point error occurs in dangerous_op, foobar returns 0 (NULL), - * after setting the associated value of the FloatingPointError exception to - * "Error in foobar". ``Dangerous_op'' can be a single operation, or a block - * of code, function calls, or any combination, so long as no alternate - * return is possible before the PyFPE_END_PROTECT macro is reached. - * - * The macros can only be used in a function context where an error return - * can be recognized as signaling a Python exception. (Generally, most - * functions that return a PyObject * will qualify.) - * - * Guido's original design suggestion for PyFPE_START_PROTECT and - * PyFPE_END_PROTECT had them open and close a local block, with a locally - * defined jmp_buf and jmp_buf pointer. This would allow recursive nesting - * of the macros. The Ansi C standard makes it clear that such local - * variables need to be declared with the "volatile" type qualifier to keep - * setjmp from corrupting their values. Some current implementations seem - * to be more restrictive. For example, the HPUX man page for setjmp says - * - * Upon the return from a setjmp() call caused by a longjmp(), the - * values of any non-static local variables belonging to the routine - * from which setjmp() was called are undefined. Code which depends on - * such values is not guaranteed to be portable. - * - * I therefore decided on a more limited form of nesting, using a counter - * variable (PyFPE_counter) to keep track of any recursion. If an exception - * occurs in an ``inner'' pair of macros, the return will apparently - * come from the outermost level. - * - */ - -#ifdef WANT_SIGFPE_HANDLER -#include -#include -#include -extern jmp_buf PyFPE_jbuf; -extern int PyFPE_counter; -extern double PyFPE_dummy(void *); - -#define PyFPE_START_PROTECT(err_string, leave_stmt) \ -if (!PyFPE_counter++ && setjmp(PyFPE_jbuf)) { \ - PyErr_SetString(PyExc_FloatingPointError, err_string); \ - PyFPE_counter = 0; \ - leave_stmt; \ -} - -/* - * This (following) is a heck of a way to decrement a counter. However, - * unless the macro argument is provided, code optimizers will sometimes move - * this statement so that it gets executed *before* the unsafe expression - * which we're trying to protect. That pretty well messes things up, - * of course. - * - * If the expression(s) you're trying to protect don't happen to return a - * value, you will need to manufacture a dummy result just to preserve the - * correct ordering of statements. Note that the macro passes the address - * of its argument (so you need to give it something which is addressable). - * If your expression returns multiple results, pass the last such result - * to PyFPE_END_PROTECT. - * - * Note that PyFPE_dummy returns a double, which is cast to int. - * This seeming insanity is to tickle the Floating Point Unit (FPU). - * If an exception has occurred in a preceding floating point operation, - * some architectures (notably Intel 80x86) will not deliver the interrupt - * until the *next* floating point operation. This is painful if you've - * already decremented PyFPE_counter. - */ -#define PyFPE_END_PROTECT(v) PyFPE_counter -= (int)PyFPE_dummy(&(v)); - -#else - -#define PyFPE_START_PROTECT(err_string, leave_stmt) -#define PyFPE_END_PROTECT(v) - -#endif - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYFPE_H */ diff --git a/python/include/pygetopt.h b/python/include/pygetopt.h deleted file mode 100644 index 9860d360..00000000 --- a/python/include/pygetopt.h +++ /dev/null @@ -1,18 +0,0 @@ - -#ifndef Py_PYGETOPT_H -#define Py_PYGETOPT_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_DATA(int) _PyOS_opterr; -PyAPI_DATA(int) _PyOS_optind; -PyAPI_DATA(char *) _PyOS_optarg; - -PyAPI_FUNC(void) _PyOS_ResetGetOpt(void); -PyAPI_FUNC(int) _PyOS_GetOpt(int argc, char **argv, char *optstring); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYGETOPT_H */ diff --git a/python/include/pymacconfig.h b/python/include/pymacconfig.h deleted file mode 100644 index 24e7b8da..00000000 --- a/python/include/pymacconfig.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef PYMACCONFIG_H -#define PYMACCONFIG_H - /* - * This file moves some of the autoconf magic to compile-time - * when building on MacOSX. This is needed for building 4-way - * universal binaries and for 64-bit universal binaries because - * the values redefined below aren't configure-time constant but - * only compile-time constant in these scenarios. - */ - -#if defined(__APPLE__) - -# undef SIZEOF_LONG -# undef SIZEOF_PTHREAD_T -# undef SIZEOF_SIZE_T -# undef SIZEOF_TIME_T -# undef SIZEOF_VOID_P -# undef SIZEOF__BOOL -# undef SIZEOF_UINTPTR_T -# undef SIZEOF_PTHREAD_T -# undef WORDS_BIGENDIAN -# undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 -# undef DOUBLE_IS_BIG_ENDIAN_IEEE754 -# undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 -# undef HAVE_GCC_ASM_FOR_X87 - -# undef VA_LIST_IS_ARRAY -# if defined(__LP64__) && defined(__x86_64__) -# define VA_LIST_IS_ARRAY 1 -# endif - -# undef HAVE_LARGEFILE_SUPPORT -# ifndef __LP64__ -# define HAVE_LARGEFILE_SUPPORT 1 -# endif - -# undef SIZEOF_LONG -# ifdef __LP64__ -# define SIZEOF__BOOL 1 -# define SIZEOF__BOOL 1 -# define SIZEOF_LONG 8 -# define SIZEOF_PTHREAD_T 8 -# define SIZEOF_SIZE_T 8 -# define SIZEOF_TIME_T 8 -# define SIZEOF_VOID_P 8 -# define SIZEOF_UINTPTR_T 8 -# define SIZEOF_PTHREAD_T 8 -# else -# ifdef __ppc__ -# define SIZEOF__BOOL 4 -# else -# define SIZEOF__BOOL 1 -# endif -# define SIZEOF_LONG 4 -# define SIZEOF_PTHREAD_T 4 -# define SIZEOF_SIZE_T 4 -# define SIZEOF_TIME_T 4 -# define SIZEOF_VOID_P 4 -# define SIZEOF_UINTPTR_T 4 -# define SIZEOF_PTHREAD_T 4 -# endif - -# if defined(__LP64__) - /* MacOSX 10.4 (the first release to support 64-bit code - * at all) only supports 64-bit in the UNIX layer. - * Therefore surpress the toolbox-glue in 64-bit mode. - */ - - /* In 64-bit mode setpgrp always has no argments, in 32-bit - * mode that depends on the compilation environment - */ -# undef SETPGRP_HAVE_ARG - -# endif - -#ifdef __BIG_ENDIAN__ -#define WORDS_BIGENDIAN 1 -#define DOUBLE_IS_BIG_ENDIAN_IEEE754 -#else -#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 -#endif /* __BIG_ENDIAN */ - -#ifdef __i386__ -# define HAVE_GCC_ASM_FOR_X87 -#endif - - /* - * The definition in pyconfig.h is only valid on the OS release - * where configure ran on and not necessarily for all systems where - * the executable can be used on. - * - * Specifically: OSX 10.4 has limited supported for '%zd', while - * 10.5 has full support for '%zd'. A binary built on 10.5 won't - * work properly on 10.4 unless we surpress the definition - * of PY_FORMAT_SIZE_T - */ -#undef PY_FORMAT_SIZE_T - - -#endif /* defined(_APPLE__) */ - -#endif /* PYMACCONFIG_H */ diff --git a/python/include/pymactoolbox.h b/python/include/pymactoolbox.h deleted file mode 100644 index fd159752..00000000 --- a/python/include/pymactoolbox.h +++ /dev/null @@ -1,217 +0,0 @@ -/* -** pymactoolbox.h - globals defined in mactoolboxglue.c -*/ -#ifndef Py_PYMACTOOLBOX_H -#define Py_PYMACTOOLBOX_H -#ifdef __cplusplus - extern "C" { -#endif - -#include - -#ifndef __LP64__ -#include -#endif /* !__LP64__ */ - -/* -** Helper routines for error codes and such. -*/ -char *PyMac_StrError(int); /* strerror with mac errors */ -extern PyObject *PyMac_OSErrException; /* Exception for OSErr */ -PyObject *PyMac_GetOSErrException(void); /* Initialize & return it */ -PyObject *PyErr_Mac(PyObject *, int); /* Exception with a mac error */ -PyObject *PyMac_Error(OSErr); /* Uses PyMac_GetOSErrException */ -#ifndef __LP64__ -extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert - fsspec->path */ -#endif /* __LP64__ */ - -/* -** These conversion routines are defined in mactoolboxglue.c itself. -*/ -int PyMac_GetOSType(PyObject *, OSType *); /* argument parser for OSType */ -PyObject *PyMac_BuildOSType(OSType); /* Convert OSType to PyObject */ - -PyObject *PyMac_BuildNumVersion(NumVersion);/* Convert NumVersion to PyObject */ - -int PyMac_GetStr255(PyObject *, Str255); /* argument parser for Str255 */ -PyObject *PyMac_BuildStr255(Str255); /* Convert Str255 to PyObject */ -PyObject *PyMac_BuildOptStr255(Str255); /* Convert Str255 to PyObject, - NULL to None */ - -int PyMac_GetRect(PyObject *, Rect *); /* argument parser for Rect */ -PyObject *PyMac_BuildRect(Rect *); /* Convert Rect to PyObject */ - -int PyMac_GetPoint(PyObject *, Point *); /* argument parser for Point */ -PyObject *PyMac_BuildPoint(Point); /* Convert Point to PyObject */ - -int PyMac_GetEventRecord(PyObject *, EventRecord *); /* argument parser for - EventRecord */ -PyObject *PyMac_BuildEventRecord(EventRecord *); /* Convert EventRecord to - PyObject */ - -int PyMac_GetFixed(PyObject *, Fixed *); /* argument parser for Fixed */ -PyObject *PyMac_BuildFixed(Fixed); /* Convert Fixed to PyObject */ -int PyMac_Getwide(PyObject *, wide *); /* argument parser for wide */ -PyObject *PyMac_Buildwide(wide *); /* Convert wide to PyObject */ - -/* -** The rest of the routines are implemented by extension modules. If they are -** dynamically loaded mactoolboxglue will contain a stub implementation of the -** routine, which imports the module, whereupon the module's init routine will -** communicate the routine pointer back to the stub. -** If USE_TOOLBOX_OBJECT_GLUE is not defined there is no glue code, and the -** extension modules simply declare the routine. This is the case for static -** builds (and could be the case for MacPython CFM builds, because CFM extension -** modules can reference each other without problems). -*/ - -#ifdef USE_TOOLBOX_OBJECT_GLUE -/* -** These macros are used in the module init code. If we use toolbox object glue -** it sets the function pointer to point to the real function. -*/ -#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) { \ - extern PyObject *(*PyMacGluePtr_##rtn)(object); \ - PyMacGluePtr_##rtn = _##rtn; \ -} -#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) { \ - extern int (*PyMacGluePtr_##rtn)(PyObject *, object *); \ - PyMacGluePtr_##rtn = _##rtn; \ -} -#else -/* -** If we don't use toolbox object glue the init macros are empty. Moreover, we define -** _xxx_New to be the same as xxx_New, and the code in mactoolboxglue isn't included. -*/ -#define PyMac_INIT_TOOLBOX_OBJECT_NEW(object, rtn) -#define PyMac_INIT_TOOLBOX_OBJECT_CONVERT(object, rtn) -#endif /* USE_TOOLBOX_OBJECT_GLUE */ - -/* macfs exports */ -#ifndef __LP64__ -int PyMac_GetFSSpec(PyObject *, FSSpec *); /* argument parser for FSSpec */ -PyObject *PyMac_BuildFSSpec(FSSpec *); /* Convert FSSpec to PyObject */ -#endif /* !__LP64__ */ - -int PyMac_GetFSRef(PyObject *, FSRef *); /* argument parser for FSRef */ -PyObject *PyMac_BuildFSRef(FSRef *); /* Convert FSRef to PyObject */ - -/* AE exports */ -extern PyObject *AEDesc_New(AppleEvent *); /* XXXX Why passed by address?? */ -extern PyObject *AEDesc_NewBorrowed(AppleEvent *); -extern int AEDesc_Convert(PyObject *, AppleEvent *); - -/* Cm exports */ -extern PyObject *CmpObj_New(Component); -extern int CmpObj_Convert(PyObject *, Component *); -extern PyObject *CmpInstObj_New(ComponentInstance); -extern int CmpInstObj_Convert(PyObject *, ComponentInstance *); - -/* Ctl exports */ -#ifndef __LP64__ -extern PyObject *CtlObj_New(ControlHandle); -extern int CtlObj_Convert(PyObject *, ControlHandle *); -#endif /* !__LP64__ */ - -/* Dlg exports */ -#ifndef __LP64__ -extern PyObject *DlgObj_New(DialogPtr); -extern int DlgObj_Convert(PyObject *, DialogPtr *); -extern PyObject *DlgObj_WhichDialog(DialogPtr); -#endif /* !__LP64__ */ - -/* Drag exports */ -#ifndef __LP64__ -extern PyObject *DragObj_New(DragReference); -extern int DragObj_Convert(PyObject *, DragReference *); -#endif /* !__LP64__ */ - -/* List exports */ -#ifndef __LP64__ -extern PyObject *ListObj_New(ListHandle); -extern int ListObj_Convert(PyObject *, ListHandle *); -#endif /* !__LP64__ */ - -/* Menu exports */ -#ifndef __LP64__ -extern PyObject *MenuObj_New(MenuHandle); -extern int MenuObj_Convert(PyObject *, MenuHandle *); -#endif /* !__LP64__ */ - -/* Qd exports */ -#ifndef __LP64__ -extern PyObject *GrafObj_New(GrafPtr); -extern int GrafObj_Convert(PyObject *, GrafPtr *); -extern PyObject *BMObj_New(BitMapPtr); -extern int BMObj_Convert(PyObject *, BitMapPtr *); -extern PyObject *QdRGB_New(RGBColor *); -extern int QdRGB_Convert(PyObject *, RGBColor *); -#endif /* !__LP64__ */ - -/* Qdoffs exports */ -#ifndef __LP64__ -extern PyObject *GWorldObj_New(GWorldPtr); -extern int GWorldObj_Convert(PyObject *, GWorldPtr *); -#endif /* !__LP64__ */ - -/* Qt exports */ -#ifndef __LP64__ -extern PyObject *TrackObj_New(Track); -extern int TrackObj_Convert(PyObject *, Track *); -extern PyObject *MovieObj_New(Movie); -extern int MovieObj_Convert(PyObject *, Movie *); -extern PyObject *MovieCtlObj_New(MovieController); -extern int MovieCtlObj_Convert(PyObject *, MovieController *); -extern PyObject *TimeBaseObj_New(TimeBase); -extern int TimeBaseObj_Convert(PyObject *, TimeBase *); -extern PyObject *UserDataObj_New(UserData); -extern int UserDataObj_Convert(PyObject *, UserData *); -extern PyObject *MediaObj_New(Media); -extern int MediaObj_Convert(PyObject *, Media *); -#endif /* !__LP64__ */ - -/* Res exports */ -extern PyObject *ResObj_New(Handle); -extern int ResObj_Convert(PyObject *, Handle *); -extern PyObject *OptResObj_New(Handle); -extern int OptResObj_Convert(PyObject *, Handle *); - -/* TE exports */ -#ifndef __LP64__ -extern PyObject *TEObj_New(TEHandle); -extern int TEObj_Convert(PyObject *, TEHandle *); -#endif /* !__LP64__ */ - -/* Win exports */ -#ifndef __LP64__ -extern PyObject *WinObj_New(WindowPtr); -extern int WinObj_Convert(PyObject *, WindowPtr *); -extern PyObject *WinObj_WhichWindow(WindowPtr); -#endif /* !__LP64__ */ - -/* CF exports */ -extern PyObject *CFObj_New(CFTypeRef); -extern int CFObj_Convert(PyObject *, CFTypeRef *); -extern PyObject *CFTypeRefObj_New(CFTypeRef); -extern int CFTypeRefObj_Convert(PyObject *, CFTypeRef *); -extern PyObject *CFStringRefObj_New(CFStringRef); -extern int CFStringRefObj_Convert(PyObject *, CFStringRef *); -extern PyObject *CFMutableStringRefObj_New(CFMutableStringRef); -extern int CFMutableStringRefObj_Convert(PyObject *, CFMutableStringRef *); -extern PyObject *CFArrayRefObj_New(CFArrayRef); -extern int CFArrayRefObj_Convert(PyObject *, CFArrayRef *); -extern PyObject *CFMutableArrayRefObj_New(CFMutableArrayRef); -extern int CFMutableArrayRefObj_Convert(PyObject *, CFMutableArrayRef *); -extern PyObject *CFDictionaryRefObj_New(CFDictionaryRef); -extern int CFDictionaryRefObj_Convert(PyObject *, CFDictionaryRef *); -extern PyObject *CFMutableDictionaryRefObj_New(CFMutableDictionaryRef); -extern int CFMutableDictionaryRefObj_Convert(PyObject *, CFMutableDictionaryRef *); -extern PyObject *CFURLRefObj_New(CFURLRef); -extern int CFURLRefObj_Convert(PyObject *, CFURLRef *); -extern int OptionalCFURLRefObj_Convert(PyObject *, CFURLRef *); - -#ifdef __cplusplus - } -#endif -#endif diff --git a/python/include/pymath.h b/python/include/pymath.h deleted file mode 100644 index f77ce930..00000000 --- a/python/include/pymath.h +++ /dev/null @@ -1,192 +0,0 @@ -#ifndef Py_PYMATH_H -#define Py_PYMATH_H - -#include "pyconfig.h" /* include for defines */ - -/************************************************************************** -Symbols and macros to supply platform-independent interfaces to mathematical -functions and constants -**************************************************************************/ - -/* Python provides implementations for copysign, round and hypot in - * Python/pymath.c just in case your math library doesn't provide the - * functions. - * - *Note: PC/pyconfig.h defines copysign as _copysign - */ -#ifndef HAVE_COPYSIGN -extern double copysign(double, double); -#endif - -#ifndef HAVE_ROUND -extern double round(double); -#endif - -#ifndef HAVE_HYPOT -extern double hypot(double, double); -#endif - -/* extra declarations */ -#ifndef _MSC_VER -#ifndef __STDC__ -//extern double fmod (double, double); -//extern double frexp (double, int *); -//extern double ldexp (double, int); -//extern double modf (double, double *); -//extern double pow(double, double); -#endif /* __STDC__ */ -#endif /* _MSC_VER */ - -#ifdef _OSF_SOURCE -/* OSF1 5.1 doesn't make these available with XOPEN_SOURCE_EXTENDED defined */ -extern int finite(double); -extern double copysign(double, double); -#endif - -/* High precision defintion of pi and e (Euler) - * The values are taken from libc6's math.h. - */ -#ifndef Py_MATH_PIl -#define Py_MATH_PIl 3.1415926535897932384626433832795029L -#endif -#ifndef Py_MATH_PI -#define Py_MATH_PI 3.14159265358979323846 -#endif - -#ifndef Py_MATH_El -#define Py_MATH_El 2.7182818284590452353602874713526625L -#endif - -#ifndef Py_MATH_E -#define Py_MATH_E 2.7182818284590452354 -#endif - -/* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU - register and into a 64-bit memory location, rounding from extended - precision to double precision in the process. On other platforms it does - nothing. */ - -/* we take double rounding as evidence of x87 usage */ -#ifndef Py_FORCE_DOUBLE -# ifdef X87_DOUBLE_ROUNDING -PyAPI_FUNC(double) _Py_force_double(double); -# define Py_FORCE_DOUBLE(X) (_Py_force_double(X)) -# else -# define Py_FORCE_DOUBLE(X) (X) -# endif -#endif - -#ifdef HAVE_GCC_ASM_FOR_X87 -PyAPI_FUNC(unsigned short) _Py_get_387controlword(void); -PyAPI_FUNC(void) _Py_set_387controlword(unsigned short); -#endif - -/* Py_IS_NAN(X) - * Return 1 if float or double arg is a NaN, else 0. - * Caution: - * X is evaluated more than once. - * This may not work on all platforms. Each platform has *some* - * way to spell this, though -- override in pyconfig.h if you have - * a platform where it doesn't work. - * Note: PC/pyconfig.h defines Py_IS_NAN as _isnan - */ -#ifndef Py_IS_NAN -#if defined HAVE_DECL_ISNAN && HAVE_DECL_ISNAN == 1 -#define Py_IS_NAN(X) isnan(X) -#else -#define Py_IS_NAN(X) ((X) != (X)) -#endif -#endif - -/* Py_IS_INFINITY(X) - * Return 1 if float or double arg is an infinity, else 0. - * Caution: - * X is evaluated more than once. - * This implementation may set the underflow flag if |X| is very small; - * it really can't be implemented correctly (& easily) before C99. - * Override in pyconfig.h if you have a better spelling on your platform. - * Py_FORCE_DOUBLE is used to avoid getting false negatives from a - * non-infinite value v sitting in an 80-bit x87 register such that - * v becomes infinite when spilled from the register to 64-bit memory. - * Note: PC/pyconfig.h defines Py_IS_INFINITY as _isinf - */ -#ifndef Py_IS_INFINITY -# if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1 -# define Py_IS_INFINITY(X) isinf(X) -# else -# define Py_IS_INFINITY(X) ((X) && \ - (Py_FORCE_DOUBLE(X)*0.5 == Py_FORCE_DOUBLE(X))) -# endif -#endif - -/* Py_IS_FINITE(X) - * Return 1 if float or double arg is neither infinite nor NAN, else 0. - * Some compilers (e.g. VisualStudio) have intrisics for this, so a special - * macro for this particular test is useful - * Note: PC/pyconfig.h defines Py_IS_FINITE as _finite - */ -#ifndef Py_IS_FINITE -#if defined HAVE_DECL_ISFINITE && HAVE_DECL_ISFINITE == 1 -#define Py_IS_FINITE(X) isfinite(X) -#elif defined HAVE_FINITE -#define Py_IS_FINITE(X) finite(X) -#else -#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X)) -#endif -#endif - -/* HUGE_VAL is supposed to expand to a positive double infinity. Python - * uses Py_HUGE_VAL instead because some platforms are broken in this - * respect. We used to embed code in pyport.h to try to worm around that, - * but different platforms are broken in conflicting ways. If you're on - * a platform where HUGE_VAL is defined incorrectly, fiddle your Python - * config to #define Py_HUGE_VAL to something that works on your platform. - */ -#ifndef Py_HUGE_VAL -#define Py_HUGE_VAL HUGE_VAL -#endif - -/* Py_NAN - * A value that evaluates to a NaN. On IEEE 754 platforms INF*0 or - * INF/INF works. Define Py_NO_NAN in pyconfig.h if your platform - * doesn't support NaNs. - */ -#if !defined(Py_NAN) && !defined(Py_NO_NAN) -#define Py_NAN (Py_HUGE_VAL * 0.) -#endif - -/* Py_OVERFLOWED(X) - * Return 1 iff a libm function overflowed. Set errno to 0 before calling - * a libm function, and invoke this macro after, passing the function - * result. - * Caution: - * This isn't reliable. C99 no longer requires libm to set errno under - * any exceptional condition, but does require +- HUGE_VAL return - * values on overflow. A 754 box *probably* maps HUGE_VAL to a - * double infinity, and we're cool if that's so, unless the input - * was an infinity and an infinity is the expected result. A C89 - * system sets errno to ERANGE, so we check for that too. We're - * out of luck if a C99 754 box doesn't map HUGE_VAL to +Inf, or - * if the returned result is a NaN, or if a C89 box returns HUGE_VAL - * in non-overflow cases. - * X is evaluated more than once. - * Some platforms have better way to spell this, so expect some #ifdef'ery. - * - * OpenBSD uses 'isinf()' because a compiler bug on that platform causes - * the longer macro version to be mis-compiled. This isn't optimal, and - * should be removed once a newer compiler is available on that platform. - * The system that had the failure was running OpenBSD 3.2 on Intel, with - * gcc 2.95.3. - * - * According to Tim's checkin, the FreeBSD systems use isinf() to work - * around a FPE bug on that platform. - */ -#if defined(__FreeBSD__) || defined(__OpenBSD__) -#define Py_OVERFLOWED(X) isinf(X) -#else -#define Py_OVERFLOWED(X) ((X) != 0.0 && (errno == ERANGE || \ - (X) == Py_HUGE_VAL || \ - (X) == -Py_HUGE_VAL)) -#endif - -#endif /* Py_PYMATH_H */ diff --git a/python/include/pymem.h b/python/include/pymem.h deleted file mode 100644 index 10b5bea5..00000000 --- a/python/include/pymem.h +++ /dev/null @@ -1,122 +0,0 @@ -/* The PyMem_ family: low-level memory allocation interfaces. - See objimpl.h for the PyObject_ memory family. -*/ - -#ifndef Py_PYMEM_H -#define Py_PYMEM_H - -#include "pyport.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* BEWARE: - - Each interface exports both functions and macros. Extension modules should - use the functions, to ensure binary compatibility across Python versions. - Because the Python implementation is free to change internal details, and - the macros may (or may not) expose details for speed, if you do use the - macros you must recompile your extensions with each Python release. - - Never mix calls to PyMem_ with calls to the platform malloc/realloc/ - calloc/free. For example, on Windows different DLLs may end up using - different heaps, and if you use PyMem_Malloc you'll get the memory from the - heap used by the Python DLL; it could be a disaster if you free()'ed that - directly in your own extension. Using PyMem_Free instead ensures Python - can return the memory to the proper heap. As another example, in - PYMALLOC_DEBUG mode, Python wraps all calls to all PyMem_ and PyObject_ - memory functions in special debugging wrappers that add additional - debugging info to dynamic memory blocks. The system routines have no idea - what to do with that stuff, and the Python wrappers have no idea what to do - with raw blocks obtained directly by the system routines then. - - The GIL must be held when using these APIs. -*/ - -/* - * Raw memory interface - * ==================== - */ - -/* Functions - - Functions supplying platform-independent semantics for malloc/realloc/ - free. These functions make sure that allocating 0 bytes returns a distinct - non-NULL pointer (whenever possible -- if we're flat out of memory, NULL - may be returned), even if the platform malloc and realloc don't. - Returned pointers must be checked for NULL explicitly. No action is - performed on failure (no exception is set, no warning is printed, etc). -*/ - -PyAPI_FUNC(void *) PyMem_Malloc(size_t); -PyAPI_FUNC(void *) PyMem_Realloc(void *, size_t); -PyAPI_FUNC(void) PyMem_Free(void *); - -/* Starting from Python 1.6, the wrappers Py_{Malloc,Realloc,Free} are - no longer supported. They used to call PyErr_NoMemory() on failure. */ - -/* Macros. */ -#ifdef PYMALLOC_DEBUG -/* Redirect all memory operations to Python's debugging allocator. */ -#define PyMem_MALLOC _PyMem_DebugMalloc -#define PyMem_REALLOC _PyMem_DebugRealloc -#define PyMem_FREE _PyMem_DebugFree - -#else /* ! PYMALLOC_DEBUG */ - -/* PyMem_MALLOC(0) means malloc(1). Some systems would return NULL - for malloc(0), which would be treated as an error. Some platforms - would return a pointer with no memory behind it, which would break - pymalloc. To solve these problems, allocate an extra byte. */ -/* Returns NULL to indicate error if a negative size or size larger than - Py_ssize_t can represent is supplied. Helps prevents security holes. */ -#define PyMem_MALLOC(n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \ - : malloc((n) ? (n) : 1)) -#define PyMem_REALLOC(p, n) ((size_t)(n) > (size_t)PY_SSIZE_T_MAX ? NULL \ - : realloc((p), (n) ? (n) : 1)) -#define PyMem_FREE free - -#endif /* PYMALLOC_DEBUG */ - -/* - * Type-oriented memory interface - * ============================== - * - * Allocate memory for n objects of the given type. Returns a new pointer - * or NULL if the request was too large or memory allocation failed. Use - * these macros rather than doing the multiplication yourself so that proper - * overflow checking is always done. - */ - -#define PyMem_New(type, n) \ - ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ - ( (type *) PyMem_Malloc((n) * sizeof(type)) ) ) -#define PyMem_NEW(type, n) \ - ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ - ( (type *) PyMem_MALLOC((n) * sizeof(type)) ) ) - -/* - * The value of (p) is always clobbered by this macro regardless of success. - * The caller MUST check if (p) is NULL afterwards and deal with the memory - * error if so. This means the original value of (p) MUST be saved for the - * caller's memory error handler to not lose track of it. - */ -#define PyMem_Resize(p, type, n) \ - ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ - (type *) PyMem_Realloc((p), (n) * sizeof(type)) ) -#define PyMem_RESIZE(p, type, n) \ - ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ - (type *) PyMem_REALLOC((p), (n) * sizeof(type)) ) - -/* PyMem{Del,DEL} are left over from ancient days, and shouldn't be used - * anymore. They're just confusing aliases for PyMem_{Free,FREE} now. - */ -#define PyMem_Del PyMem_Free -#define PyMem_DEL PyMem_FREE - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_PYMEM_H */ diff --git a/python/include/pyport.h b/python/include/pyport.h deleted file mode 100644 index 693d0935..00000000 --- a/python/include/pyport.h +++ /dev/null @@ -1,904 +0,0 @@ -#ifndef Py_PYPORT_H -#define Py_PYPORT_H - -#include "pyconfig.h" /* include for defines */ - -/* Some versions of HP-UX & Solaris need inttypes.h for int32_t, - INT32_MAX, etc. */ -#ifdef HAVE_INTTYPES_H -#include -#endif - -#ifdef HAVE_STDINT_H -#include -#endif - -/************************************************************************** -Symbols and macros to supply platform-independent interfaces to basic -C language & library operations whose spellings vary across platforms. - -Please try to make documentation here as clear as possible: by definition, -the stuff here is trying to illuminate C's darkest corners. - -Config #defines referenced here: - -SIGNED_RIGHT_SHIFT_ZERO_FILLS -Meaning: To be defined iff i>>j does not extend the sign bit when i is a - signed integral type and i < 0. -Used in: Py_ARITHMETIC_RIGHT_SHIFT - -Py_DEBUG -Meaning: Extra checks compiled in for debug mode. -Used in: Py_SAFE_DOWNCAST - -HAVE_UINTPTR_T -Meaning: The C9X type uintptr_t is supported by the compiler -Used in: Py_uintptr_t - -HAVE_LONG_LONG -Meaning: The compiler supports the C type "long long" -Used in: PY_LONG_LONG - -**************************************************************************/ - - -/* For backward compatibility only. Obsolete, do not use. */ -#ifdef HAVE_PROTOTYPES -#define Py_PROTO(x) x -#else -#define Py_PROTO(x) () -#endif -#ifndef Py_FPROTO -#define Py_FPROTO(x) Py_PROTO(x) -#endif - -/* typedefs for some C9X-defined synonyms for integral types. - * - * The names in Python are exactly the same as the C9X names, except with a - * Py_ prefix. Until C9X is universally implemented, this is the only way - * to ensure that Python gets reliable names that don't conflict with names - * in non-Python code that are playing their own tricks to define the C9X - * names. - * - * NOTE: don't go nuts here! Python has no use for *most* of the C9X - * integral synonyms. Only define the ones we actually need. - */ - -#ifdef HAVE_LONG_LONG -#ifndef PY_LONG_LONG -#define PY_LONG_LONG long long -#if defined(LLONG_MAX) -/* If LLONG_MAX is defined in limits.h, use that. */ -#define PY_LLONG_MIN LLONG_MIN -#define PY_LLONG_MAX LLONG_MAX -#define PY_ULLONG_MAX ULLONG_MAX -#elif defined(__LONG_LONG_MAX__) -/* Otherwise, if GCC has a builtin define, use that. */ -#define PY_LLONG_MAX __LONG_LONG_MAX__ -#define PY_LLONG_MIN (-PY_LLONG_MAX-1) -#define PY_ULLONG_MAX (__LONG_LONG_MAX__*2ULL + 1ULL) -#else -/* Otherwise, rely on two's complement. */ -#define PY_ULLONG_MAX (~0ULL) -#define PY_LLONG_MAX ((long long)(PY_ULLONG_MAX>>1)) -#define PY_LLONG_MIN (-PY_LLONG_MAX-1) -#endif /* LLONG_MAX */ -#endif -#endif /* HAVE_LONG_LONG */ - -/* a build with 30-bit digits for Python long integers needs an exact-width - * 32-bit unsigned integer type to store those digits. (We could just use - * type 'unsigned long', but that would be wasteful on a system where longs - * are 64-bits.) On Unix systems, the autoconf macro AC_TYPE_UINT32_T defines - * uint32_t to be such a type unless stdint.h or inttypes.h defines uint32_t. - * However, it doesn't set HAVE_UINT32_T, so we do that here. - */ -#if (defined UINT32_MAX || defined uint32_t) -#ifndef PY_UINT32_T -#define HAVE_UINT32_T 1 -#define PY_UINT32_T uint32_t -#endif -#endif - -/* Macros for a 64-bit unsigned integer type; used for type 'twodigits' in the - * long integer implementation, when 30-bit digits are enabled. - */ -#if (defined UINT64_MAX || defined uint64_t) -#ifndef PY_UINT64_T -#define HAVE_UINT64_T 1 -#define PY_UINT64_T uint64_t -#endif -#endif - -/* Signed variants of the above */ -#if (defined INT32_MAX || defined int32_t) -#ifndef PY_INT32_T -#define HAVE_INT32_T 1 -#define PY_INT32_T int32_t -#endif -#endif -#if (defined INT64_MAX || defined int64_t) -#ifndef PY_INT64_T -#define HAVE_INT64_T 1 -#define PY_INT64_T int64_t -#endif -#endif - -/* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all - the necessary integer types are available, and we're on a 64-bit platform - (as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */ - -#ifndef PYLONG_BITS_IN_DIGIT -#if (defined HAVE_UINT64_T && defined HAVE_INT64_T && \ - defined HAVE_UINT32_T && defined HAVE_INT32_T && SIZEOF_VOID_P >= 8) -#define PYLONG_BITS_IN_DIGIT 30 -#else -#define PYLONG_BITS_IN_DIGIT 15 -#endif -#endif - -/* uintptr_t is the C9X name for an unsigned integral type such that a - * legitimate void* can be cast to uintptr_t and then back to void* again - * without loss of information. Similarly for intptr_t, wrt a signed - * integral type. - */ -#ifdef HAVE_UINTPTR_T -typedef uintptr_t Py_uintptr_t; -typedef intptr_t Py_intptr_t; - -#elif SIZEOF_VOID_P <= SIZEOF_INT -typedef unsigned int Py_uintptr_t; -typedef int Py_intptr_t; - -#elif SIZEOF_VOID_P <= SIZEOF_LONG -typedef unsigned long Py_uintptr_t; -typedef long Py_intptr_t; - -#elif defined(HAVE_LONG_LONG) && (SIZEOF_VOID_P <= SIZEOF_LONG_LONG) -typedef unsigned PY_LONG_LONG Py_uintptr_t; -typedef PY_LONG_LONG Py_intptr_t; - -#else -# error "Python needs a typedef for Py_uintptr_t in pyport.h." -#endif /* HAVE_UINTPTR_T */ - -/* Py_ssize_t is a signed integral type such that sizeof(Py_ssize_t) == - * sizeof(size_t). C99 doesn't define such a thing directly (size_t is an - * unsigned integral type). See PEP 353 for details. - */ -#ifdef HAVE_SSIZE_T -typedef ssize_t Py_ssize_t; -#elif SIZEOF_VOID_P == SIZEOF_SIZE_T -typedef Py_intptr_t Py_ssize_t; -#else -# error "Python needs a typedef for Py_ssize_t in pyport.h." -#endif - -/* Largest possible value of size_t. - SIZE_MAX is part of C99, so it might be defined on some - platforms. If it is not defined, (size_t)-1 is a portable - definition for C89, due to the way signed->unsigned - conversion is defined. */ -#ifdef SIZE_MAX -#define PY_SIZE_MAX SIZE_MAX -#else -#define PY_SIZE_MAX ((size_t)-1) -#endif - -/* Largest positive value of type Py_ssize_t. */ -#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1)) -/* Smallest negative value of type Py_ssize_t. */ -#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1) - -#if SIZEOF_PID_T > SIZEOF_LONG -# error "Python doesn't support sizeof(pid_t) > sizeof(long)" -#endif - -/* PY_FORMAT_SIZE_T is a platform-specific modifier for use in a printf - * format to convert an argument with the width of a size_t or Py_ssize_t. - * C99 introduced "z" for this purpose, but not all platforms support that; - * e.g., MS compilers use "I" instead. - * - * These "high level" Python format functions interpret "z" correctly on - * all platforms (Python interprets the format string itself, and does whatever - * the platform C requires to convert a size_t/Py_ssize_t argument): - * - * PyString_FromFormat - * PyErr_Format - * PyString_FromFormatV - * - * Lower-level uses require that you interpolate the correct format modifier - * yourself (e.g., calling printf, fprintf, sprintf, PyOS_snprintf); for - * example, - * - * Py_ssize_t index; - * fprintf(stderr, "index %" PY_FORMAT_SIZE_T "d sucks\n", index); - * - * That will expand to %ld, or %Id, or to something else correct for a - * Py_ssize_t on the platform. - */ -#ifndef PY_FORMAT_SIZE_T -# if SIZEOF_SIZE_T == SIZEOF_INT && !defined(__APPLE__) -# define PY_FORMAT_SIZE_T "" -# elif SIZEOF_SIZE_T == SIZEOF_LONG -# define PY_FORMAT_SIZE_T "l" -# elif defined(MS_WINDOWS) -# define PY_FORMAT_SIZE_T "I" -# else -# error "This platform's pyconfig.h needs to define PY_FORMAT_SIZE_T" -# endif -#endif - -/* PY_FORMAT_LONG_LONG is analogous to PY_FORMAT_SIZE_T above, but for - * the long long type instead of the size_t type. It's only available - * when HAVE_LONG_LONG is defined. The "high level" Python format - * functions listed above will interpret "lld" or "llu" correctly on - * all platforms. - */ -#ifdef HAVE_LONG_LONG -# ifndef PY_FORMAT_LONG_LONG -# if defined(MS_WIN64) || defined(MS_WINDOWS) -# define PY_FORMAT_LONG_LONG "I64" -# else -# error "This platform's pyconfig.h needs to define PY_FORMAT_LONG_LONG" -# endif -# endif -#endif - -/* Py_LOCAL can be used instead of static to get the fastest possible calling - * convention for functions that are local to a given module. - * - * Py_LOCAL_INLINE does the same thing, and also explicitly requests inlining, - * for platforms that support that. - * - * If PY_LOCAL_AGGRESSIVE is defined before python.h is included, more - * "aggressive" inlining/optimizaion is enabled for the entire module. This - * may lead to code bloat, and may slow things down for those reasons. It may - * also lead to errors, if the code relies on pointer aliasing. Use with - * care. - * - * NOTE: You can only use this for functions that are entirely local to a - * module; functions that are exported via method tables, callbacks, etc, - * should keep using static. - */ - -#undef USE_INLINE /* XXX - set via configure? */ - -#if defined(_MSC_VER) -#if defined(PY_LOCAL_AGGRESSIVE) -/* enable more aggressive optimization for visual studio */ -#pragma optimize("agtw", on) -#endif -/* ignore warnings if the compiler decides not to inline a function */ -#pragma warning(disable: 4710) -/* fastest possible local call under MSVC */ -#define Py_LOCAL(type) static type -#define Py_LOCAL_INLINE(type) static __inline type -#elif defined(USE_INLINE) -#define Py_LOCAL(type) static type -#define Py_LOCAL_INLINE(type) static inline type -#else -#define Py_LOCAL(type) static type -#define Py_LOCAL_INLINE(type) static type -#endif - -/* Py_MEMCPY can be used instead of memcpy in cases where the copied blocks - * are often very short. While most platforms have highly optimized code for - * large transfers, the setup costs for memcpy are often quite high. MEMCPY - * solves this by doing short copies "in line". - */ - -#if defined(_MSC_VER) -#define Py_MEMCPY(target, source, length) do { \ - size_t i_, n_ = (length); \ - char *t_ = (void*) (target); \ - const char *s_ = (void*) (source); \ - if (n_ >= 16) \ - memcpy(t_, s_, n_); \ - else \ - for (i_ = 0; i_ < n_; i_++) \ - t_[i_] = s_[i_]; \ - } while (0) -#else -#define Py_MEMCPY memcpy -#endif - -#include - -#ifdef HAVE_IEEEFP_H -#include /* needed for 'finite' declaration on some platforms */ -#endif - -#include /* Moved here from the math section, before extern "C" */ - -/******************************************** - * WRAPPER FOR and/or * - ********************************************/ - -#ifdef TIME_WITH_SYS_TIME -#include -#include -#else /* !TIME_WITH_SYS_TIME */ -#ifdef HAVE_SYS_TIME_H -#include -#else /* !HAVE_SYS_TIME_H */ -#include -#endif /* !HAVE_SYS_TIME_H */ -#endif /* !TIME_WITH_SYS_TIME */ - - -/****************************** - * WRAPPER FOR * - ******************************/ - -/* NB caller must include */ - -#ifdef HAVE_SYS_SELECT_H - -#include - -#endif /* !HAVE_SYS_SELECT_H */ - -/******************************* - * stat() and fstat() fiddling * - *******************************/ - -/* We expect that stat and fstat exist on most systems. - * It's confirmed on Unix, Mac and Windows. - * If you don't have them, add - * #define DONT_HAVE_STAT - * and/or - * #define DONT_HAVE_FSTAT - * to your pyconfig.h. Python code beyond this should check HAVE_STAT and - * HAVE_FSTAT instead. - * Also - * #define HAVE_SYS_STAT_H - * if exists on your platform, and - * #define HAVE_STAT_H - * if does. - */ -#ifndef DONT_HAVE_STAT -#define HAVE_STAT -#endif - -#ifndef DONT_HAVE_FSTAT -#define HAVE_FSTAT -#endif - -#ifdef RISCOS -#include -#include "unixstuff.h" -#endif - -#ifdef HAVE_SYS_STAT_H -#if defined(PYOS_OS2) && defined(PYCC_GCC) -#include -#endif -#include -#elif defined(HAVE_STAT_H) -#include -#endif - -#if defined(PYCC_VACPP) -/* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */ -#define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG) -#endif - -#ifndef S_ISREG -#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) -#endif - -#ifndef S_ISDIR -#define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR) -#endif - - -#ifdef __cplusplus -/* Move this down here since some C++ #include's don't like to be included - inside an extern "C" */ -extern "C" { -#endif - - -/* Py_ARITHMETIC_RIGHT_SHIFT - * C doesn't define whether a right-shift of a signed integer sign-extends - * or zero-fills. Here a macro to force sign extension: - * Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) - * Return I >> J, forcing sign extension. Arithmetically, return the - * floor of I/2**J. - * Requirements: - * I should have signed integer type. In the terminology of C99, this can - * be either one of the five standard signed integer types (signed char, - * short, int, long, long long) or an extended signed integer type. - * J is an integer >= 0 and strictly less than the number of bits in the - * type of I (because C doesn't define what happens for J outside that - * range either). - * TYPE used to specify the type of I, but is now ignored. It's been left - * in for backwards compatibility with versions <= 2.6 or 3.0. - * Caution: - * I may be evaluated more than once. - */ -#ifdef SIGNED_RIGHT_SHIFT_ZERO_FILLS -#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) \ - ((I) < 0 ? -1-((-1-(I)) >> (J)) : (I) >> (J)) -#else -#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) ((I) >> (J)) -#endif - -/* Py_FORCE_EXPANSION(X) - * "Simply" returns its argument. However, macro expansions within the - * argument are evaluated. This unfortunate trickery is needed to get - * token-pasting to work as desired in some cases. - */ -#define Py_FORCE_EXPANSION(X) X - -/* Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) - * Cast VALUE to type NARROW from type WIDE. In Py_DEBUG mode, this - * assert-fails if any information is lost. - * Caution: - * VALUE may be evaluated more than once. - */ -#ifdef Py_DEBUG -#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) \ - (assert((WIDE)(NARROW)(VALUE) == (VALUE)), (NARROW)(VALUE)) -#else -#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) (NARROW)(VALUE) -#endif - -/* Py_SET_ERRNO_ON_MATH_ERROR(x) - * If a libm function did not set errno, but it looks like the result - * overflowed or not-a-number, set errno to ERANGE or EDOM. Set errno - * to 0 before calling a libm function, and invoke this macro after, - * passing the function result. - * Caution: - * This isn't reliable. See Py_OVERFLOWED comments. - * X is evaluated more than once. - */ -#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__hpux) && defined(__ia64)) -#define _Py_SET_EDOM_FOR_NAN(X) if (isnan(X)) errno = EDOM; -#else -#define _Py_SET_EDOM_FOR_NAN(X) ; -#endif -#define Py_SET_ERRNO_ON_MATH_ERROR(X) \ - do { \ - if (errno == 0) { \ - if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \ - errno = ERANGE; \ - else _Py_SET_EDOM_FOR_NAN(X) \ - } \ - } while(0) - -/* Py_SET_ERANGE_ON_OVERFLOW(x) - * An alias of Py_SET_ERRNO_ON_MATH_ERROR for backward-compatibility. - */ -#define Py_SET_ERANGE_IF_OVERFLOW(X) Py_SET_ERRNO_ON_MATH_ERROR(X) - -/* Py_ADJUST_ERANGE1(x) - * Py_ADJUST_ERANGE2(x, y) - * Set errno to 0 before calling a libm function, and invoke one of these - * macros after, passing the function result(s) (Py_ADJUST_ERANGE2 is useful - * for functions returning complex results). This makes two kinds of - * adjustments to errno: (A) If it looks like the platform libm set - * errno=ERANGE due to underflow, clear errno. (B) If it looks like the - * platform libm overflowed but didn't set errno, force errno to ERANGE. In - * effect, we're trying to force a useful implementation of C89 errno - * behavior. - * Caution: - * This isn't reliable. See Py_OVERFLOWED comments. - * X and Y may be evaluated more than once. - */ -#define Py_ADJUST_ERANGE1(X) \ - do { \ - if (errno == 0) { \ - if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \ - errno = ERANGE; \ - } \ - else if (errno == ERANGE && (X) == 0.0) \ - errno = 0; \ - } while(0) - -#define Py_ADJUST_ERANGE2(X, Y) \ - do { \ - if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL || \ - (Y) == Py_HUGE_VAL || (Y) == -Py_HUGE_VAL) { \ - if (errno == 0) \ - errno = ERANGE; \ - } \ - else if (errno == ERANGE) \ - errno = 0; \ - } while(0) - -/* The functions _Py_dg_strtod and _Py_dg_dtoa in Python/dtoa.c (which are - * required to support the short float repr introduced in Python 3.1) require - * that the floating-point unit that's being used for arithmetic operations - * on C doubles is set to use 53-bit precision. It also requires that the - * FPU rounding mode is round-half-to-even, but that's less often an issue. - * - * If your FPU isn't already set to 53-bit precision/round-half-to-even, and - * you want to make use of _Py_dg_strtod and _Py_dg_dtoa, then you should - * - * #define HAVE_PY_SET_53BIT_PRECISION 1 - * - * and also give appropriate definitions for the following three macros: - * - * _PY_SET_53BIT_PRECISION_START : store original FPU settings, and - * set FPU to 53-bit precision/round-half-to-even - * _PY_SET_53BIT_PRECISION_END : restore original FPU settings - * _PY_SET_53BIT_PRECISION_HEADER : any variable declarations needed to - * use the two macros above. - * - * The macros are designed to be used within a single C function: see - * Python/pystrtod.c for an example of their use. - */ - -/* get and set x87 control word for gcc/x86 */ -#ifdef HAVE_GCC_ASM_FOR_X87 -#define HAVE_PY_SET_53BIT_PRECISION 1 -/* _Py_get/set_387controlword functions are defined in Python/pymath.c */ -#define _Py_SET_53BIT_PRECISION_HEADER \ - unsigned short old_387controlword, new_387controlword -#define _Py_SET_53BIT_PRECISION_START \ - do { \ - old_387controlword = _Py_get_387controlword(); \ - new_387controlword = (old_387controlword & ~0x0f00) | 0x0200; \ - if (new_387controlword != old_387controlword) \ - _Py_set_387controlword(new_387controlword); \ - } while (0) -#define _Py_SET_53BIT_PRECISION_END \ - if (new_387controlword != old_387controlword) \ - _Py_set_387controlword(old_387controlword) -#endif - -/* default definitions are empty */ -#ifndef HAVE_PY_SET_53BIT_PRECISION -#define _Py_SET_53BIT_PRECISION_HEADER -#define _Py_SET_53BIT_PRECISION_START -#define _Py_SET_53BIT_PRECISION_END -#endif - -/* If we can't guarantee 53-bit precision, don't use the code - in Python/dtoa.c, but fall back to standard code. This - means that repr of a float will be long (17 sig digits). - - Realistically, there are two things that could go wrong: - - (1) doubles aren't IEEE 754 doubles, or - (2) we're on x86 with the rounding precision set to 64-bits - (extended precision), and we don't know how to change - the rounding precision. - */ - -#if !defined(DOUBLE_IS_LITTLE_ENDIAN_IEEE754) && \ - !defined(DOUBLE_IS_BIG_ENDIAN_IEEE754) && \ - !defined(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754) -#define PY_NO_SHORT_FLOAT_REPR -#endif - -/* double rounding is symptomatic of use of extended precision on x86. If - we're seeing double rounding, and we don't have any mechanism available for - changing the FPU rounding precision, then don't use Python/dtoa.c. */ -#if defined(X87_DOUBLE_ROUNDING) && !defined(HAVE_PY_SET_53BIT_PRECISION) -#define PY_NO_SHORT_FLOAT_REPR -#endif - -/* Py_DEPRECATED(version) - * Declare a variable, type, or function deprecated. - * Usage: - * extern int old_var Py_DEPRECATED(2.3); - * typedef int T1 Py_DEPRECATED(2.4); - * extern int x() Py_DEPRECATED(2.5); - */ -#if defined(__GNUC__) && ((__GNUC__ >= 4) || \ - (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)) -#define Py_DEPRECATED(VERSION_UNUSED) __attribute__((__deprecated__)) -#else -#define Py_DEPRECATED(VERSION_UNUSED) -#endif - -/************************************************************************** -Prototypes that are missing from the standard include files on some systems -(and possibly only some versions of such systems.) - -Please be conservative with adding new ones, document them and enclose them -in platform-specific #ifdefs. -**************************************************************************/ - -#ifdef SOLARIS -/* Unchecked */ -extern int gethostname(char *, int); -#endif - -#ifdef __BEOS__ -/* Unchecked */ -/* It's in the libs, but not the headers... - [cjh] */ -int shutdown( int, int ); -#endif - -#ifdef HAVE__GETPTY -#include /* we need to import mode_t */ -extern char * _getpty(int *, int, mode_t, int); -#endif - -/* On QNX 6, struct termio must be declared by including sys/termio.h - if TCGETA, TCSETA, TCSETAW, or TCSETAF are used. sys/termio.h must - be included before termios.h or it will generate an error. */ -#ifdef HAVE_SYS_TERMIO_H -#include -#endif - -#if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) -#if !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) && !defined(HAVE_UTIL_H) -/* BSDI does not supply a prototype for the 'openpty' and 'forkpty' - functions, even though they are included in libutil. */ -#include -extern int openpty(int *, int *, char *, struct termios *, struct winsize *); -extern pid_t forkpty(int *, char *, struct termios *, struct winsize *); -#endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */ -#endif /* defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) */ - - -/* These are pulled from various places. It isn't obvious on what platforms - they are necessary, nor what the exact prototype should look like (which - is likely to vary between platforms!) If you find you need one of these - declarations, please move them to a platform-specific block and include - proper prototypes. */ -#if 0 - -/* From Modules/resource.c */ -extern int getrusage(); -extern int getpagesize(); - -/* From Python/sysmodule.c and Modules/posixmodule.c */ -extern int fclose(FILE *); - -/* From Modules/posixmodule.c */ -extern int fdatasync(int); -#endif /* 0 */ - - -/* On 4.4BSD-descendants, ctype functions serves the whole range of - * wchar_t character set rather than single byte code points only. - * This characteristic can break some operations of string object - * including str.upper() and str.split() on UTF-8 locales. This - * workaround was provided by Tim Robbins of FreeBSD project. - */ - -#ifdef __FreeBSD__ -#include -#if __FreeBSD_version > 500039 -# define _PY_PORT_CTYPE_UTF8_ISSUE -#endif -#endif - - -#if defined(__APPLE__) -# define _PY_PORT_CTYPE_UTF8_ISSUE -#endif - -#ifdef _PY_PORT_CTYPE_UTF8_ISSUE -#include -#include -#undef isalnum -#define isalnum(c) iswalnum(btowc(c)) -#undef isalpha -#define isalpha(c) iswalpha(btowc(c)) -#undef islower -#define islower(c) iswlower(btowc(c)) -#undef isspace -#define isspace(c) iswspace(btowc(c)) -#undef isupper -#define isupper(c) iswupper(btowc(c)) -#undef tolower -#define tolower(c) towlower(btowc(c)) -#undef toupper -#define toupper(c) towupper(btowc(c)) -#endif - - -/* Declarations for symbol visibility. - - PyAPI_FUNC(type): Declares a public Python API function and return type - PyAPI_DATA(type): Declares public Python data and its type - PyMODINIT_FUNC: A Python module init function. If these functions are - inside the Python core, they are private to the core. - If in an extension module, it may be declared with - external linkage depending on the platform. - - As a number of platforms support/require "__declspec(dllimport/dllexport)", - we support a HAVE_DECLSPEC_DLL macro to save duplication. -*/ - -/* - All windows ports, except cygwin, are handled in PC/pyconfig.h. - - BeOS and cygwin are the only other autoconf platform requiring special - linkage handling and both of these use __declspec(). -*/ -#if defined(__CYGWIN__) || defined(__BEOS__) -# define HAVE_DECLSPEC_DLL -#endif - -/* only get special linkage if built as shared or platform is Cygwin */ -#if defined(Py_ENABLE_SHARED) || defined(__CYGWIN__) -# if defined(HAVE_DECLSPEC_DLL) -# ifdef Py_BUILD_CORE -# define PyAPI_FUNC(RTYPE) __declspec(dllexport) RTYPE -# define PyAPI_DATA(RTYPE) extern __declspec(dllexport) RTYPE - /* module init functions inside the core need no external linkage */ - /* except for Cygwin to handle embedding (FIXME: BeOS too?) */ -# if defined(__CYGWIN__) -# define PyMODINIT_FUNC __declspec(dllexport) void -# else /* __CYGWIN__ */ -# define PyMODINIT_FUNC void -# endif /* __CYGWIN__ */ -# else /* Py_BUILD_CORE */ - /* Building an extension module, or an embedded situation */ - /* public Python functions and data are imported */ - /* Under Cygwin, auto-import functions to prevent compilation */ - /* failures similar to those described at the bottom of 4.1: */ - /* http://docs.python.org/extending/windows.html#a-cookbook-approach */ -# if !defined(__CYGWIN__) -# define PyAPI_FUNC(RTYPE) __declspec(dllimport) RTYPE -# endif /* !__CYGWIN__ */ -# define PyAPI_DATA(RTYPE) extern __declspec(dllimport) RTYPE - /* module init functions outside the core must be exported */ -# if defined(__cplusplus) -# define PyMODINIT_FUNC extern "C" __declspec(dllexport) void -# else /* __cplusplus */ -# define PyMODINIT_FUNC __declspec(dllexport) void -# endif /* __cplusplus */ -# endif /* Py_BUILD_CORE */ -# endif /* HAVE_DECLSPEC */ -#endif /* Py_ENABLE_SHARED */ - -/* If no external linkage macros defined by now, create defaults */ -#ifndef PyAPI_FUNC -# define PyAPI_FUNC(RTYPE) RTYPE -#endif -#ifndef PyAPI_DATA -# define PyAPI_DATA(RTYPE) extern RTYPE -#endif -#ifndef PyMODINIT_FUNC -# if defined(__cplusplus) -# define PyMODINIT_FUNC extern "C" void -# else /* __cplusplus */ -# define PyMODINIT_FUNC void -# endif /* __cplusplus */ -#endif - -/* Deprecated DL_IMPORT and DL_EXPORT macros */ -#if defined(Py_ENABLE_SHARED) && defined (HAVE_DECLSPEC_DLL) -# if defined(Py_BUILD_CORE) -# define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE -# define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -# else -# define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE -# define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE -# endif -#endif -#ifndef DL_EXPORT -# define DL_EXPORT(RTYPE) RTYPE -#endif -#ifndef DL_IMPORT -# define DL_IMPORT(RTYPE) RTYPE -#endif -/* End of deprecated DL_* macros */ - -/* If the fd manipulation macros aren't defined, - here is a set that should do the job */ - -#if 0 /* disabled and probably obsolete */ - -#ifndef FD_SETSIZE -#define FD_SETSIZE 256 -#endif - -#ifndef FD_SET - -typedef long fd_mask; - -#define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */ -#ifndef howmany -#define howmany(x, y) (((x)+((y)-1))/(y)) -#endif /* howmany */ - -typedef struct fd_set { - fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)]; -} fd_set; - -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) -#define FD_ZERO(p) memset((char *)(p), '\0', sizeof(*(p))) - -#endif /* FD_SET */ - -#endif /* fd manipulation macros */ - - -/* limits.h constants that may be missing */ - -#ifndef INT_MAX -#define INT_MAX 2147483647 -#endif - -#ifndef LONG_MAX -#if SIZEOF_LONG == 4 -#define LONG_MAX 0X7FFFFFFFL -#elif SIZEOF_LONG == 8 -#define LONG_MAX 0X7FFFFFFFFFFFFFFFL -#else -#error "could not set LONG_MAX in pyport.h" -#endif -#endif - -#ifndef LONG_MIN -#define LONG_MIN (-LONG_MAX-1) -#endif - -#ifndef LONG_BIT -#define LONG_BIT (8 * SIZEOF_LONG) -#endif - -#if LONG_BIT != 8 * SIZEOF_LONG -/* 04-Oct-2000 LONG_BIT is apparently (mis)defined as 64 on some recent - * 32-bit platforms using gcc. We try to catch that here at compile-time - * rather than waiting for integer multiplication to trigger bogus - * overflows. - */ -#error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." -#endif - -#ifdef __cplusplus -} -#endif - -/* - * Hide GCC attributes from compilers that don't support them. - */ -#if (!defined(__GNUC__) || __GNUC__ < 2 || \ - (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ) && \ - !defined(RISCOS) -#define Py_GCC_ATTRIBUTE(x) -#else -#define Py_GCC_ATTRIBUTE(x) __attribute__(x) -#endif - -/* - * Add PyArg_ParseTuple format where available. - */ -#ifdef HAVE_ATTRIBUTE_FORMAT_PARSETUPLE -#define Py_FORMAT_PARSETUPLE(func,p1,p2) __attribute__((format(func,p1,p2))) -#else -#define Py_FORMAT_PARSETUPLE(func,p1,p2) -#endif - -/* - * Specify alignment on compilers that support it. - */ -#if defined(__GNUC__) && __GNUC__ >= 3 -#define Py_ALIGNED(x) __attribute__((aligned(x))) -#else -#define Py_ALIGNED(x) -#endif - -/* Eliminate end-of-loop code not reached warnings from SunPro C - * when using do{...}while(0) macros - */ -#ifdef __SUNPRO_C -#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED) -#endif - -/* - * Older Microsoft compilers don't support the C99 long long literal suffixes, - * so these will be defined in PC/pyconfig.h for those compilers. - */ -#ifndef Py_LL -#define Py_LL(x) x##LL -#endif - -#ifndef Py_ULL -#define Py_ULL(x) Py_LL(x##U) -#endif - -#endif /* Py_PYPORT_H */ diff --git a/python/include/pystate.h b/python/include/pystate.h deleted file mode 100644 index 8d74940f..00000000 --- a/python/include/pystate.h +++ /dev/null @@ -1,197 +0,0 @@ - -/* Thread and interpreter state structures and their interfaces */ - - -#ifndef Py_PYSTATE_H -#define Py_PYSTATE_H -#ifdef __cplusplus -extern "C" { -#endif - -/* State shared between threads */ - -struct _ts; /* Forward */ -struct _is; /* Forward */ - -typedef struct _is { - - struct _is *next; - struct _ts *tstate_head; - - PyObject *modules; - PyObject *sysdict; - PyObject *builtins; - PyObject *modules_reloading; - - PyObject *codec_search_path; - PyObject *codec_search_cache; - PyObject *codec_error_registry; - -#ifdef HAVE_DLOPEN - int dlopenflags; -#endif -#ifdef WITH_TSC - int tscdump; -#endif - -} PyInterpreterState; - - -/* State unique per thread */ - -struct _frame; /* Avoid including frameobject.h */ - -/* Py_tracefunc return -1 when raising an exception, or 0 for success. */ -typedef int (*Py_tracefunc)(PyObject *, struct _frame *, int, PyObject *); - -/* The following values are used for 'what' for tracefunc functions: */ -#define PyTrace_CALL 0 -#define PyTrace_EXCEPTION 1 -#define PyTrace_LINE 2 -#define PyTrace_RETURN 3 -#define PyTrace_C_CALL 4 -#define PyTrace_C_EXCEPTION 5 -#define PyTrace_C_RETURN 6 - -typedef struct _ts { - /* See Python/ceval.c for comments explaining most fields */ - - struct _ts *next; - PyInterpreterState *interp; - - struct _frame *frame; - int recursion_depth; - /* 'tracing' keeps track of the execution depth when tracing/profiling. - This is to prevent the actual trace/profile code from being recorded in - the trace/profile. */ - int tracing; - int use_tracing; - - Py_tracefunc c_profilefunc; - Py_tracefunc c_tracefunc; - PyObject *c_profileobj; - PyObject *c_traceobj; - - PyObject *curexc_type; - PyObject *curexc_value; - PyObject *curexc_traceback; - - PyObject *exc_type; - PyObject *exc_value; - PyObject *exc_traceback; - - PyObject *dict; /* Stores per-thread state */ - - /* tick_counter is incremented whenever the check_interval ticker - * reaches zero. The purpose is to give a useful measure of the number - * of interpreted bytecode instructions in a given thread. This - * extremely lightweight statistic collector may be of interest to - * profilers (like psyco.jit()), although nothing in the core uses it. - */ - int tick_counter; - - int gilstate_counter; - - PyObject *async_exc; /* Asynchronous exception to raise */ - long thread_id; /* Thread id where this tstate was created */ - - /* XXX signal handlers should also be here */ - -} PyThreadState; - - -PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void); -PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *); -PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *); - -PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *); -PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *); -PyAPI_FUNC(void) _PyThreadState_Init(PyThreadState *); -PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *); -PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); -#ifdef WITH_THREAD -PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); -#endif - -PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); -PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *); -PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void); -PyAPI_FUNC(int) PyThreadState_SetAsyncExc(long, PyObject *); - - -/* Variable and macro for in-line access to current thread state */ - -PyAPI_DATA(PyThreadState *) _PyThreadState_Current; - -#ifdef Py_DEBUG -#define PyThreadState_GET() PyThreadState_Get() -#else -#define PyThreadState_GET() (_PyThreadState_Current) -#endif - -typedef - enum {PyGILState_LOCKED, PyGILState_UNLOCKED} - PyGILState_STATE; - -/* Ensure that the current thread is ready to call the Python - C API, regardless of the current state of Python, or of its - thread lock. This may be called as many times as desired - by a thread so long as each call is matched with a call to - PyGILState_Release(). In general, other thread-state APIs may - be used between _Ensure() and _Release() calls, so long as the - thread-state is restored to its previous state before the Release(). - For example, normal use of the Py_BEGIN_ALLOW_THREADS/ - Py_END_ALLOW_THREADS macros are acceptable. - - The return value is an opaque "handle" to the thread state when - PyGILState_Ensure() was called, and must be passed to - PyGILState_Release() to ensure Python is left in the same state. Even - though recursive calls are allowed, these handles can *not* be shared - - each unique call to PyGILState_Ensure must save the handle for its - call to PyGILState_Release. - - When the function returns, the current thread will hold the GIL. - - Failure is a fatal error. -*/ -PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure(void); - -/* Release any resources previously acquired. After this call, Python's - state will be the same as it was prior to the corresponding - PyGILState_Ensure() call (but generally this state will be unknown to - the caller, hence the use of the GILState API.) - - Every call to PyGILState_Ensure must be matched by a call to - PyGILState_Release on the same thread. -*/ -PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE); - -/* Helper/diagnostic function - get the current thread state for - this thread. May return NULL if no GILState API has been used - on the current thread. Note that the main thread always has such a - thread-state, even if no auto-thread-state call has been made - on the main thread. -*/ -PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void); - -/* The implementation of sys._current_frames() Returns a dict mapping - thread id to that thread's current frame. -*/ -PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void); - -/* Routines for advanced debuggers, requested by David Beazley. - Don't use unless you know what you are doing! */ -PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void); -PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *); -PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *); -PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *); - -typedef struct _frame *(*PyThreadFrameGetter)(PyThreadState *self_); - -/* hook for PyEval_GetFrame(), requested for Psyco */ -PyAPI_DATA(PyThreadFrameGetter) _PyThreadState_GetFrame; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYSTATE_H */ diff --git a/python/include/pystrcmp.h b/python/include/pystrcmp.h deleted file mode 100644 index 369c7e77..00000000 --- a/python/include/pystrcmp.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef Py_STRCMP_H -#define Py_STRCMP_H - -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t); -PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *); - -#if defined(MS_WINDOWS) || defined(PYOS_OS2) -#define PyOS_strnicmp strnicmp -#define PyOS_stricmp stricmp -#else -#define PyOS_strnicmp PyOS_mystrnicmp -#define PyOS_stricmp PyOS_mystricmp -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_STRCMP_H */ diff --git a/python/include/pystrtod.h b/python/include/pystrtod.h deleted file mode 100644 index eec434f1..00000000 --- a/python/include/pystrtod.h +++ /dev/null @@ -1,45 +0,0 @@ -#ifndef Py_STRTOD_H -#define Py_STRTOD_H - -#ifdef __cplusplus -extern "C" { -#endif - - -PyAPI_FUNC(double) PyOS_ascii_strtod(const char *str, char **ptr); -PyAPI_FUNC(double) PyOS_ascii_atof(const char *str); - -/* Deprecated in 2.7 and 3.1. Will disappear in 2.8 (if it exists) and 3.2 */ -PyAPI_FUNC(char *) PyOS_ascii_formatd(char *buffer, size_t buf_len, - const char *format, double d); -PyAPI_FUNC(double) PyOS_string_to_double(const char *str, - char **endptr, - PyObject *overflow_exception); - -/* The caller is responsible for calling PyMem_Free to free the buffer - that's is returned. */ -PyAPI_FUNC(char *) PyOS_double_to_string(double val, - char format_code, - int precision, - int flags, - int *type); - -PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr); - - -/* PyOS_double_to_string's "flags" parameter can be set to 0 or more of: */ -#define Py_DTSF_SIGN 0x01 /* always add the sign */ -#define Py_DTSF_ADD_DOT_0 0x02 /* if the result is an integer add ".0" */ -#define Py_DTSF_ALT 0x04 /* "alternate" formatting. it's format_code - specific */ - -/* PyOS_double_to_string's "type", if non-NULL, will be set to one of: */ -#define Py_DTST_FINITE 0 -#define Py_DTST_INFINITE 1 -#define Py_DTST_NAN 2 - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_STRTOD_H */ diff --git a/python/include/pythonrun.h b/python/include/pythonrun.h deleted file mode 100644 index 6bfc1750..00000000 --- a/python/include/pythonrun.h +++ /dev/null @@ -1,181 +0,0 @@ - -/* Interfaces to parse and execute pieces of python code */ - -#ifndef Py_PYTHONRUN_H -#define Py_PYTHONRUN_H -#ifdef __cplusplus -extern "C" { -#endif - -#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \ - CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \ - CO_FUTURE_UNICODE_LITERALS) -#define PyCF_MASK_OBSOLETE (CO_NESTED) -#define PyCF_SOURCE_IS_UTF8 0x0100 -#define PyCF_DONT_IMPLY_DEDENT 0x0200 -#define PyCF_ONLY_AST 0x0400 - -typedef struct { - int cf_flags; /* bitmask of CO_xxx flags relevant to future */ -} PyCompilerFlags; - -PyAPI_FUNC(void) Py_SetProgramName(char *); -PyAPI_FUNC(char *) Py_GetProgramName(void); - -PyAPI_FUNC(void) Py_SetPythonHome(char *); -PyAPI_FUNC(char *) Py_GetPythonHome(void); - -PyAPI_FUNC(void) Py_Initialize(void); -PyAPI_FUNC(void) Py_InitializeEx(int); -PyAPI_FUNC(void) Py_Finalize(void); -PyAPI_FUNC(int) Py_IsInitialized(void); -PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void); -PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *); - -PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_AnyFileExFlags(FILE *, const char *, int, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_SimpleFileExFlags(FILE *, const char *, int, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_InteractiveOneFlags(FILE *, const char *, PyCompilerFlags *); -PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(FILE *, const char *, PyCompilerFlags *); - -PyAPI_FUNC(struct _mod *) PyParser_ASTFromString(const char *, const char *, - int, PyCompilerFlags *flags, - PyArena *); -PyAPI_FUNC(struct _mod *) PyParser_ASTFromFile(FILE *, const char *, int, - char *, char *, - PyCompilerFlags *, int *, - PyArena *); -#define PyParser_SimpleParseString(S, B) \ - PyParser_SimpleParseStringFlags(S, B, 0) -#define PyParser_SimpleParseFile(FP, S, B) \ - PyParser_SimpleParseFileFlags(FP, S, B, 0) -PyAPI_FUNC(struct _node *) PyParser_SimpleParseStringFlags(const char *, int, - int); -PyAPI_FUNC(struct _node *) PyParser_SimpleParseFileFlags(FILE *, const char *, - int, int); - -PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *, - PyObject *, PyCompilerFlags *); - -PyAPI_FUNC(PyObject *) PyRun_FileExFlags(FILE *, const char *, int, - PyObject *, PyObject *, int, - PyCompilerFlags *); - -#define Py_CompileString(str, p, s) Py_CompileStringFlags(str, p, s, NULL) -PyAPI_FUNC(PyObject *) Py_CompileStringFlags(const char *, const char *, int, - PyCompilerFlags *); -PyAPI_FUNC(struct symtable *) Py_SymtableString(const char *, const char *, int); - -PyAPI_FUNC(void) PyErr_Print(void); -PyAPI_FUNC(void) PyErr_PrintEx(int); -PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *); - -PyAPI_FUNC(int) Py_AtExit(void (*func)(void)); - -PyAPI_FUNC(void) Py_Exit(int); - -PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *); - -/* Bootstrap */ -PyAPI_FUNC(int) Py_Main(int argc, char **argv); - -/* Use macros for a bunch of old variants */ -#define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL) -#define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL) -#define PyRun_AnyFileEx(fp, name, closeit) \ - PyRun_AnyFileExFlags(fp, name, closeit, NULL) -#define PyRun_AnyFileFlags(fp, name, flags) \ - PyRun_AnyFileExFlags(fp, name, 0, flags) -#define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL) -#define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL) -#define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL) -#define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL) -#define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL) -#define PyRun_File(fp, p, s, g, l) \ - PyRun_FileExFlags(fp, p, s, g, l, 0, NULL) -#define PyRun_FileEx(fp, p, s, g, l, c) \ - PyRun_FileExFlags(fp, p, s, g, l, c, NULL) -#define PyRun_FileFlags(fp, p, s, g, l, flags) \ - PyRun_FileExFlags(fp, p, s, g, l, 0, flags) - -/* In getpath.c */ -PyAPI_FUNC(char *) Py_GetProgramFullPath(void); -PyAPI_FUNC(char *) Py_GetPrefix(void); -PyAPI_FUNC(char *) Py_GetExecPrefix(void); -PyAPI_FUNC(char *) Py_GetPath(void); - -/* In their own files */ -PyAPI_FUNC(const char *) Py_GetVersion(void); -PyAPI_FUNC(const char *) Py_GetPlatform(void); -PyAPI_FUNC(const char *) Py_GetCopyright(void); -PyAPI_FUNC(const char *) Py_GetCompiler(void); -PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -PyAPI_FUNC(const char *) _Py_svnversion(void); -PyAPI_FUNC(const char *) Py_SubversionRevision(void); -PyAPI_FUNC(const char *) Py_SubversionShortBranch(void); -PyAPI_FUNC(const char *) _Py_hgidentifier(void); -PyAPI_FUNC(const char *) _Py_hgversion(void); - -/* Internal -- various one-time initializations */ -PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void); -PyAPI_FUNC(PyObject *) _PySys_Init(void); -PyAPI_FUNC(void) _PyImport_Init(void); -PyAPI_FUNC(void) _PyExc_Init(void); -PyAPI_FUNC(void) _PyImportHooks_Init(void); -PyAPI_FUNC(int) _PyFrame_Init(void); -PyAPI_FUNC(int) _PyInt_Init(void); -PyAPI_FUNC(int) _PyLong_Init(void); -PyAPI_FUNC(void) _PyFloat_Init(void); -PyAPI_FUNC(int) PyByteArray_Init(void); -PyAPI_FUNC(void) _PyRandom_Init(void); - -/* Various internal finalizers */ -PyAPI_FUNC(void) _PyExc_Fini(void); -PyAPI_FUNC(void) _PyImport_Fini(void); -PyAPI_FUNC(void) PyMethod_Fini(void); -PyAPI_FUNC(void) PyFrame_Fini(void); -PyAPI_FUNC(void) PyCFunction_Fini(void); -PyAPI_FUNC(void) PyDict_Fini(void); -PyAPI_FUNC(void) PyTuple_Fini(void); -PyAPI_FUNC(void) PyList_Fini(void); -PyAPI_FUNC(void) PySet_Fini(void); -PyAPI_FUNC(void) PyString_Fini(void); -PyAPI_FUNC(void) PyInt_Fini(void); -PyAPI_FUNC(void) PyFloat_Fini(void); -PyAPI_FUNC(void) PyOS_FiniInterrupts(void); -PyAPI_FUNC(void) PyByteArray_Fini(void); - -/* Stuff with no proper home (yet) */ -PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *); -PyAPI_DATA(int) (*PyOS_InputHook)(void); -PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, char *); -PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState; - -/* Stack size, in "pointers" (so we get extra safety margins - on 64-bit platforms). On a 32-bit platform, this translates - to a 8k margin. */ -#define PYOS_STACK_MARGIN 2048 - -#if defined(WIN32) && !defined(MS_WIN64) && defined(_MSC_VER) && _MSC_VER >= 1300 -/* Enable stack checking under Microsoft C */ -#define USE_STACKCHECK -#endif - -#ifdef USE_STACKCHECK -/* Check that we aren't overflowing our stack */ -PyAPI_FUNC(int) PyOS_CheckStack(void); -#endif - -/* Signals */ -typedef void (*PyOS_sighandler_t)(int); -PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int); -PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t); - -/* Random */ -PyAPI_FUNC(int) _PyOS_URandom (void *buffer, Py_ssize_t size); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_PYTHONRUN_H */ diff --git a/python/include/pythread.h b/python/include/pythread.h deleted file mode 100644 index dfd61575..00000000 --- a/python/include/pythread.h +++ /dev/null @@ -1,41 +0,0 @@ - -#ifndef Py_PYTHREAD_H -#define Py_PYTHREAD_H - -typedef void *PyThread_type_lock; -typedef void *PyThread_type_sema; - -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(void) PyThread_init_thread(void); -PyAPI_FUNC(long) PyThread_start_new_thread(void (*)(void *), void *); -PyAPI_FUNC(void) PyThread_exit_thread(void); -PyAPI_FUNC(long) PyThread_get_thread_ident(void); - -PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void); -PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock); -PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int); -#define WAIT_LOCK 1 -#define NOWAIT_LOCK 0 -PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock); - -PyAPI_FUNC(size_t) PyThread_get_stacksize(void); -PyAPI_FUNC(int) PyThread_set_stacksize(size_t); - -/* Thread Local Storage (TLS) API */ -PyAPI_FUNC(int) PyThread_create_key(void); -PyAPI_FUNC(void) PyThread_delete_key(int); -PyAPI_FUNC(int) PyThread_set_key_value(int, void *); -PyAPI_FUNC(void *) PyThread_get_key_value(int); -PyAPI_FUNC(void) PyThread_delete_key_value(int key); - -/* Cleanup after a fork */ -PyAPI_FUNC(void) PyThread_ReInitTLS(void); - -#ifdef __cplusplus -} -#endif - -#endif /* !Py_PYTHREAD_H */ diff --git a/python/include/rangeobject.h b/python/include/rangeobject.h deleted file mode 100644 index 36c9cee5..00000000 --- a/python/include/rangeobject.h +++ /dev/null @@ -1,28 +0,0 @@ - -/* Range object interface */ - -#ifndef Py_RANGEOBJECT_H -#define Py_RANGEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* This is about the type 'xrange', not the built-in function range(), which - returns regular lists. */ - -/* -A range object represents an integer range. This is an immutable object; -a range cannot change its value after creation. - -Range objects behave like the corresponding tuple objects except that -they are represented by a start, stop, and step datamembers. -*/ - -PyAPI_DATA(PyTypeObject) PyRange_Type; - -#define PyRange_Check(op) (Py_TYPE(op) == &PyRange_Type) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_RANGEOBJECT_H */ diff --git a/python/include/setobject.h b/python/include/setobject.h deleted file mode 100644 index 52b07d52..00000000 --- a/python/include/setobject.h +++ /dev/null @@ -1,99 +0,0 @@ -/* Set object interface */ - -#ifndef Py_SETOBJECT_H -#define Py_SETOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* -There are three kinds of slots in the table: - -1. Unused: key == NULL -2. Active: key != NULL and key != dummy -3. Dummy: key == dummy - -Note: .pop() abuses the hash field of an Unused or Dummy slot to -hold a search finger. The hash field of Unused or Dummy slots has -no meaning otherwise. -*/ - -#define PySet_MINSIZE 8 - -typedef struct { - long hash; /* cached hash code for the entry key */ - PyObject *key; -} setentry; - - -/* -This data structure is shared by set and frozenset objects. -*/ - -typedef struct _setobject PySetObject; -struct _setobject { - PyObject_HEAD - - Py_ssize_t fill; /* # Active + # Dummy */ - Py_ssize_t used; /* # Active */ - - /* The table contains mask + 1 slots, and that's a power of 2. - * We store the mask instead of the size because the mask is more - * frequently needed. - */ - Py_ssize_t mask; - - /* table points to smalltable for small tables, else to - * additional malloc'ed memory. table is never NULL! This rule - * saves repeated runtime null-tests. - */ - setentry *table; - setentry *(*lookup)(PySetObject *so, PyObject *key, long hash); - setentry smalltable[PySet_MINSIZE]; - - long hash; /* only used by frozenset objects */ - PyObject *weakreflist; /* List of weak references */ -}; - -PyAPI_DATA(PyTypeObject) PySet_Type; -PyAPI_DATA(PyTypeObject) PyFrozenSet_Type; - -/* Invariants for frozensets: - * data is immutable. - * hash is the hash of the frozenset or -1 if not computed yet. - * Invariants for sets: - * hash is -1 - */ - -#define PyFrozenSet_CheckExact(ob) (Py_TYPE(ob) == &PyFrozenSet_Type) -#define PyAnySet_CheckExact(ob) \ - (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type) -#define PyAnySet_Check(ob) \ - (Py_TYPE(ob) == &PySet_Type || Py_TYPE(ob) == &PyFrozenSet_Type || \ - PyType_IsSubtype(Py_TYPE(ob), &PySet_Type) || \ - PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type)) -#define PySet_Check(ob) \ - (Py_TYPE(ob) == &PySet_Type || \ - PyType_IsSubtype(Py_TYPE(ob), &PySet_Type)) -#define PyFrozenSet_Check(ob) \ - (Py_TYPE(ob) == &PyFrozenSet_Type || \ - PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type)) - -PyAPI_FUNC(PyObject *) PySet_New(PyObject *); -PyAPI_FUNC(PyObject *) PyFrozenSet_New(PyObject *); -PyAPI_FUNC(Py_ssize_t) PySet_Size(PyObject *anyset); -#define PySet_GET_SIZE(so) (((PySetObject *)(so))->used) -PyAPI_FUNC(int) PySet_Clear(PyObject *set); -PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key); -PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key); -PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key); -PyAPI_FUNC(int) _PySet_Next(PyObject *set, Py_ssize_t *pos, PyObject **key); -PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, long *hash); -PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set); -PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_SETOBJECT_H */ diff --git a/python/include/sliceobject.h b/python/include/sliceobject.h deleted file mode 100644 index 8ab62dd4..00000000 --- a/python/include/sliceobject.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef Py_SLICEOBJECT_H -#define Py_SLICEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* The unique ellipsis object "..." */ - -PyAPI_DATA(PyObject) _Py_EllipsisObject; /* Don't use this directly */ - -#define Py_Ellipsis (&_Py_EllipsisObject) - -/* Slice object interface */ - -/* - -A slice object containing start, stop, and step data members (the -names are from range). After much talk with Guido, it was decided to -let these be any arbitrary python type. Py_None stands for omitted values. -*/ - -typedef struct { - PyObject_HEAD - PyObject *start, *stop, *step; /* not NULL */ -} PySliceObject; - -PyAPI_DATA(PyTypeObject) PySlice_Type; -PyAPI_DATA(PyTypeObject) PyEllipsis_Type; - -#define PySlice_Check(op) (Py_TYPE(op) == &PySlice_Type) - -PyAPI_FUNC(PyObject *) PySlice_New(PyObject* start, PyObject* stop, - PyObject* step); -PyAPI_FUNC(PyObject *) _PySlice_FromIndices(Py_ssize_t start, Py_ssize_t stop); -PyAPI_FUNC(int) PySlice_GetIndices(PySliceObject *r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); -PyAPI_FUNC(int) PySlice_GetIndicesEx(PySliceObject *r, Py_ssize_t length, - Py_ssize_t *start, Py_ssize_t *stop, - Py_ssize_t *step, Py_ssize_t *slicelength); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_SLICEOBJECT_H */ diff --git a/python/include/stringobject.h b/python/include/stringobject.h deleted file mode 100644 index 18b5b411..00000000 --- a/python/include/stringobject.h +++ /dev/null @@ -1,210 +0,0 @@ - -/* String (str/bytes) object interface */ - -#ifndef Py_STRINGOBJECT_H -#define Py_STRINGOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -#include - -/* -Type PyStringObject represents a character string. An extra zero byte is -reserved at the end to ensure it is zero-terminated, but a size is -present so strings with null bytes in them can be represented. This -is an immutable object type. - -There are functions to create new string objects, to test -an object for string-ness, and to get the -string value. The latter function returns a null pointer -if the object is not of the proper type. -There is a variant that takes an explicit size as well as a -variant that assumes a zero-terminated string. Note that none of the -functions should be applied to nil objects. -*/ - -/* Caching the hash (ob_shash) saves recalculation of a string's hash value. - Interning strings (ob_sstate) tries to ensure that only one string - object with a given value exists, so equality tests can be one pointer - comparison. This is generally restricted to strings that "look like" - Python identifiers, although the intern() builtin can be used to force - interning of any string. - Together, these sped the interpreter by up to 20%. */ - -typedef struct { - PyObject_VAR_HEAD - long ob_shash; - int ob_sstate; - char ob_sval[1]; - - /* Invariants: - * ob_sval contains space for 'ob_size+1' elements. - * ob_sval[ob_size] == 0. - * ob_shash is the hash of the string or -1 if not computed yet. - * ob_sstate != 0 iff the string object is in stringobject.c's - * 'interned' dictionary; in this case the two references - * from 'interned' to this object are *not counted* in ob_refcnt. - */ -} PyStringObject; - -#define SSTATE_NOT_INTERNED 0 -#define SSTATE_INTERNED_MORTAL 1 -#define SSTATE_INTERNED_IMMORTAL 2 - -PyAPI_DATA(PyTypeObject) PyBaseString_Type; -PyAPI_DATA(PyTypeObject) PyString_Type; - -#define PyString_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_STRING_SUBCLASS) -#define PyString_CheckExact(op) (Py_TYPE(op) == &PyString_Type) - -PyAPI_FUNC(PyObject *) PyString_FromStringAndSize(const char *, Py_ssize_t); -PyAPI_FUNC(PyObject *) PyString_FromString(const char *); -PyAPI_FUNC(PyObject *) PyString_FromFormatV(const char*, va_list) - Py_GCC_ATTRIBUTE((format(printf, 1, 0))); -PyAPI_FUNC(PyObject *) PyString_FromFormat(const char*, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); -PyAPI_FUNC(Py_ssize_t) PyString_Size(PyObject *); -PyAPI_FUNC(char *) PyString_AsString(PyObject *); -PyAPI_FUNC(PyObject *) PyString_Repr(PyObject *, int); -PyAPI_FUNC(void) PyString_Concat(PyObject **, PyObject *); -PyAPI_FUNC(void) PyString_ConcatAndDel(PyObject **, PyObject *); -PyAPI_FUNC(int) _PyString_Resize(PyObject **, Py_ssize_t); -PyAPI_FUNC(int) _PyString_Eq(PyObject *, PyObject*); -PyAPI_FUNC(PyObject *) PyString_Format(PyObject *, PyObject *); -PyAPI_FUNC(PyObject *) _PyString_FormatLong(PyObject*, int, int, - int, char**, int*); -PyAPI_FUNC(PyObject *) PyString_DecodeEscape(const char *, Py_ssize_t, - const char *, Py_ssize_t, - const char *); - -PyAPI_FUNC(void) PyString_InternInPlace(PyObject **); -PyAPI_FUNC(void) PyString_InternImmortal(PyObject **); -PyAPI_FUNC(PyObject *) PyString_InternFromString(const char *); -PyAPI_FUNC(void) _Py_ReleaseInternedStrings(void); - -/* Use only if you know it's a string */ -#define PyString_CHECK_INTERNED(op) (((PyStringObject *)(op))->ob_sstate) - -/* Macro, trading safety for speed */ -#define PyString_AS_STRING(op) (((PyStringObject *)(op))->ob_sval) -#define PyString_GET_SIZE(op) Py_SIZE(op) - -/* _PyString_Join(sep, x) is like sep.join(x). sep must be PyStringObject*, - x must be an iterable object. */ -PyAPI_FUNC(PyObject *) _PyString_Join(PyObject *sep, PyObject *x); - -/* --- Generic Codecs ----------------------------------------------------- */ - -/* Create an object by decoding the encoded string s of the - given size. */ - -PyAPI_FUNC(PyObject*) PyString_Decode( - const char *s, /* encoded string */ - Py_ssize_t size, /* size of buffer */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a char buffer of the given size and returns a - Python object. */ - -PyAPI_FUNC(PyObject*) PyString_Encode( - const char *s, /* string char buffer */ - Py_ssize_t size, /* number of chars to encode */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a string object and returns the result as Python - object. */ - -PyAPI_FUNC(PyObject*) PyString_AsEncodedObject( - PyObject *str, /* string object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a string object and returns the result as Python string - object. - - If the codec returns an Unicode object, the object is converted - back to a string using the default encoding. - - DEPRECATED - use PyString_AsEncodedObject() instead. */ - -PyAPI_FUNC(PyObject*) PyString_AsEncodedString( - PyObject *str, /* string object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Decodes a string object and returns the result as Python - object. */ - -PyAPI_FUNC(PyObject*) PyString_AsDecodedObject( - PyObject *str, /* string object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Decodes a string object and returns the result as Python string - object. - - If the codec returns an Unicode object, the object is converted - back to a string using the default encoding. - - DEPRECATED - use PyString_AsDecodedObject() instead. */ - -PyAPI_FUNC(PyObject*) PyString_AsDecodedString( - PyObject *str, /* string object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Provides access to the internal data buffer and size of a string - object or the default encoded version of an Unicode object. Passing - NULL as *len parameter will force the string buffer to be - 0-terminated (passing a string with embedded NULL characters will - cause an exception). */ - -PyAPI_FUNC(int) PyString_AsStringAndSize( - register PyObject *obj, /* string or Unicode object */ - register char **s, /* pointer to buffer variable */ - register Py_ssize_t *len /* pointer to length variable or NULL - (only possible for 0-terminated - strings) */ - ); - - -/* Using the current locale, insert the thousands grouping - into the string pointed to by buffer. For the argument descriptions, - see Objects/stringlib/localeutil.h */ -PyAPI_FUNC(Py_ssize_t) _PyString_InsertThousandsGroupingLocale(char *buffer, - Py_ssize_t n_buffer, - char *digits, - Py_ssize_t n_digits, - Py_ssize_t min_width); - -/* Using explicit passed-in values, insert the thousands grouping - into the string pointed to by buffer. For the argument descriptions, - see Objects/stringlib/localeutil.h */ -PyAPI_FUNC(Py_ssize_t) _PyString_InsertThousandsGrouping(char *buffer, - Py_ssize_t n_buffer, - char *digits, - Py_ssize_t n_digits, - Py_ssize_t min_width, - const char *grouping, - const char *thousands_sep); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyBytes_FormatAdvanced(PyObject *obj, - char *format_spec, - Py_ssize_t format_spec_len); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_STRINGOBJECT_H */ diff --git a/python/include/structmember.h b/python/include/structmember.h deleted file mode 100644 index fe5b44ea..00000000 --- a/python/include/structmember.h +++ /dev/null @@ -1,99 +0,0 @@ -#ifndef Py_STRUCTMEMBER_H -#define Py_STRUCTMEMBER_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Interface to map C struct members to Python object attributes */ - -#include /* For offsetof */ - -/* The offsetof() macro calculates the offset of a structure member - in its structure. Unfortunately this cannot be written down - portably, hence it is provided by a Standard C header file. - For pre-Standard C compilers, here is a version that usually works - (but watch out!): */ - -#ifndef offsetof -#define offsetof(type, member) ( (int) & ((type*)0) -> member ) -#endif - -/* An array of memberlist structures defines the name, type and offset - of selected members of a C structure. These can be read by - PyMember_Get() and set by PyMember_Set() (except if their READONLY flag - is set). The array must be terminated with an entry whose name - pointer is NULL. */ - -struct memberlist { - /* Obsolete version, for binary backwards compatibility */ - char *name; - int type; - int offset; - int flags; -}; - -typedef struct PyMemberDef { - /* Current version, use this */ - char *name; - int type; - Py_ssize_t offset; - int flags; - char *doc; -} PyMemberDef; - -/* Types */ -#define T_SHORT 0 -#define T_INT 1 -#define T_LONG 2 -#define T_FLOAT 3 -#define T_DOUBLE 4 -#define T_STRING 5 -#define T_OBJECT 6 -/* XXX the ordering here is weird for binary compatibility */ -#define T_CHAR 7 /* 1-character string */ -#define T_BYTE 8 /* 8-bit signed int */ -/* unsigned variants: */ -#define T_UBYTE 9 -#define T_USHORT 10 -#define T_UINT 11 -#define T_ULONG 12 - -/* Added by Jack: strings contained in the structure */ -#define T_STRING_INPLACE 13 - -/* Added by Lillo: bools contained in the structure (assumed char) */ -#define T_BOOL 14 - -#define T_OBJECT_EX 16 /* Like T_OBJECT, but raises AttributeError - when the value is NULL, instead of - converting to None. */ -#ifdef HAVE_LONG_LONG -#define T_LONGLONG 17 -#define T_ULONGLONG 18 -#endif /* HAVE_LONG_LONG */ - -#define T_PYSSIZET 19 /* Py_ssize_t */ - - -/* Flags */ -#define READONLY 1 -#define RO READONLY /* Shorthand */ -#define READ_RESTRICTED 2 -#define PY_WRITE_RESTRICTED 4 -#define RESTRICTED (READ_RESTRICTED | PY_WRITE_RESTRICTED) - - -/* Obsolete API, for binary backwards compatibility */ -PyAPI_FUNC(PyObject *) PyMember_Get(const char *, struct memberlist *, const char *); -PyAPI_FUNC(int) PyMember_Set(char *, struct memberlist *, const char *, PyObject *); - -/* Current API, use this */ -PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *); -PyAPI_FUNC(int) PyMember_SetOne(char *, struct PyMemberDef *, PyObject *); - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_STRUCTMEMBER_H */ diff --git a/python/include/structseq.h b/python/include/structseq.h deleted file mode 100644 index e662916f..00000000 --- a/python/include/structseq.h +++ /dev/null @@ -1,41 +0,0 @@ - -/* Tuple object interface */ - -#ifndef Py_STRUCTSEQ_H -#define Py_STRUCTSEQ_H -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct PyStructSequence_Field { - char *name; - char *doc; -} PyStructSequence_Field; - -typedef struct PyStructSequence_Desc { - char *name; - char *doc; - struct PyStructSequence_Field *fields; - int n_in_sequence; -} PyStructSequence_Desc; - -extern char* PyStructSequence_UnnamedField; - -PyAPI_FUNC(void) PyStructSequence_InitType(PyTypeObject *type, - PyStructSequence_Desc *desc); - -PyAPI_FUNC(PyObject *) PyStructSequence_New(PyTypeObject* type); - -typedef struct { - PyObject_VAR_HEAD - PyObject *ob_item[1]; -} PyStructSequence; - -/* Macro, *only* to be used to fill in brand new objects */ -#define PyStructSequence_SET_ITEM(op, i, v) \ - (((PyStructSequence *)(op))->ob_item[i] = v) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_STRUCTSEQ_H */ diff --git a/python/include/symtable.h b/python/include/symtable.h deleted file mode 100644 index e0a0be41..00000000 --- a/python/include/symtable.h +++ /dev/null @@ -1,98 +0,0 @@ -#ifndef Py_SYMTABLE_H -#define Py_SYMTABLE_H - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock } - _Py_block_ty; - -struct _symtable_entry; - -struct symtable { - const char *st_filename; /* name of file being compiled */ - struct _symtable_entry *st_cur; /* current symbol table entry */ - struct _symtable_entry *st_top; /* module entry */ - PyObject *st_symbols; /* dictionary of symbol table entries */ - PyObject *st_stack; /* stack of namespace info */ - PyObject *st_global; /* borrowed ref to MODULE in st_symbols */ - int st_nblocks; /* number of blocks */ - PyObject *st_private; /* name of current class or NULL */ - PyFutureFeatures *st_future; /* module's future features */ -}; - -typedef struct _symtable_entry { - PyObject_HEAD - PyObject *ste_id; /* int: key in st_symbols */ - PyObject *ste_symbols; /* dict: name to flags */ - PyObject *ste_name; /* string: name of block */ - PyObject *ste_varnames; /* list of variable names */ - PyObject *ste_children; /* list of child ids */ - _Py_block_ty ste_type; /* module, class, or function */ - int ste_unoptimized; /* false if namespace is optimized */ - int ste_nested; /* true if block is nested */ - unsigned ste_free : 1; /* true if block has free variables */ - unsigned ste_child_free : 1; /* true if a child block has free vars, - including free refs to globals */ - unsigned ste_generator : 1; /* true if namespace is a generator */ - unsigned ste_varargs : 1; /* true if block has varargs */ - unsigned ste_varkeywords : 1; /* true if block has varkeywords */ - unsigned ste_returns_value : 1; /* true if namespace uses return with - an argument */ - int ste_lineno; /* first line of block */ - int ste_opt_lineno; /* lineno of last exec or import * */ - int ste_tmpname; /* counter for listcomp temp vars */ - struct symtable *ste_table; -} PySTEntryObject; - -PyAPI_DATA(PyTypeObject) PySTEntry_Type; - -#define PySTEntry_Check(op) (Py_TYPE(op) == &PySTEntry_Type) - -PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *); - -PyAPI_FUNC(struct symtable *) PySymtable_Build(mod_ty, const char *, - PyFutureFeatures *); -PyAPI_FUNC(PySTEntryObject *) PySymtable_Lookup(struct symtable *, void *); - -PyAPI_FUNC(void) PySymtable_Free(struct symtable *); - -/* Flags for def-use information */ - -#define DEF_GLOBAL 1 /* global stmt */ -#define DEF_LOCAL 2 /* assignment in code block */ -#define DEF_PARAM 2<<1 /* formal parameter */ -#define USE 2<<2 /* name is used */ -#define DEF_FREE 2<<3 /* name used but not defined in nested block */ -#define DEF_FREE_CLASS 2<<4 /* free variable from class's method */ -#define DEF_IMPORT 2<<5 /* assignment occurred via import */ - -#define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT) - -/* GLOBAL_EXPLICIT and GLOBAL_IMPLICIT are used internally by the symbol - table. GLOBAL is returned from PyST_GetScope() for either of them. - It is stored in ste_symbols at bits 12-14. -*/ -#define SCOPE_OFF 11 -#define SCOPE_MASK 7 - -#define LOCAL 1 -#define GLOBAL_EXPLICIT 2 -#define GLOBAL_IMPLICIT 3 -#define FREE 4 -#define CELL 5 - -/* The following three names are used for the ste_unoptimized bit field */ -#define OPT_IMPORT_STAR 1 -#define OPT_EXEC 2 -#define OPT_BARE_EXEC 4 -#define OPT_TOPLEVEL 8 /* top-level names, including eval and exec */ - -#define GENERATOR 1 -#define GENERATOR_EXPRESSION 2 - -#ifdef __cplusplus -} -#endif -#endif /* !Py_SYMTABLE_H */ diff --git a/python/include/sysmodule.h b/python/include/sysmodule.h deleted file mode 100644 index 16af1196..00000000 --- a/python/include/sysmodule.h +++ /dev/null @@ -1,32 +0,0 @@ - -/* System module interface */ - -#ifndef Py_SYSMODULE_H -#define Py_SYSMODULE_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(PyObject *) PySys_GetObject(char *); -PyAPI_FUNC(int) PySys_SetObject(char *, PyObject *); -PyAPI_FUNC(FILE *) PySys_GetFile(char *, FILE *); -PyAPI_FUNC(void) PySys_SetArgv(int, char **); -PyAPI_FUNC(void) PySys_SetArgvEx(int, char **, int); -PyAPI_FUNC(void) PySys_SetPath(char *); - -PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); -PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) - Py_GCC_ATTRIBUTE((format(printf, 1, 2))); - -PyAPI_DATA(PyObject *) _PySys_TraceFunc, *_PySys_ProfileFunc; -PyAPI_DATA(int) _PySys_CheckInterval; - -PyAPI_FUNC(void) PySys_ResetWarnOptions(void); -PyAPI_FUNC(void) PySys_AddWarnOption(char *); -PyAPI_FUNC(int) PySys_HasWarnOptions(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_SYSMODULE_H */ diff --git a/python/include/timefuncs.h b/python/include/timefuncs.h deleted file mode 100644 index 553142db..00000000 --- a/python/include/timefuncs.h +++ /dev/null @@ -1,23 +0,0 @@ -/* timefuncs.h - */ - -/* Utility function related to timemodule.c. */ - -#ifndef TIMEFUNCS_H -#define TIMEFUNCS_H -#ifdef __cplusplus -extern "C" { -#endif - - -/* Cast double x to time_t, but raise ValueError if x is too large - * to fit in a time_t. ValueError is set on return iff the return - * value is (time_t)-1 and PyErr_Occurred(). - */ -PyAPI_FUNC(time_t) _PyTime_DoubleToTimet(double x); - - -#ifdef __cplusplus -} -#endif -#endif /* TIMEFUNCS_H */ diff --git a/python/include/token.h b/python/include/token.h deleted file mode 100644 index 72659ac0..00000000 --- a/python/include/token.h +++ /dev/null @@ -1,85 +0,0 @@ - -/* Token types */ - -#ifndef Py_TOKEN_H -#define Py_TOKEN_H -#ifdef __cplusplus -extern "C" { -#endif - -#undef TILDE /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */ - -#define ENDMARKER 0 -#define NAME 1 -#define NUMBER 2 -#define STRING 3 -#define NEWLINE 4 -#define INDENT 5 -#define DEDENT 6 -#define LPAR 7 -#define RPAR 8 -#define LSQB 9 -#define RSQB 10 -#define COLON 11 -#define COMMA 12 -#define SEMI 13 -#define PLUS 14 -#define MINUS 15 -#define STAR 16 -#define SLASH 17 -#define VBAR 18 -#define AMPER 19 -#define LESS 20 -#define GREATER 21 -#define EQUAL 22 -#define DOT 23 -#define PERCENT 24 -#define BACKQUOTE 25 -#define LBRACE 26 -#define RBRACE 27 -#define EQEQUAL 28 -#define NOTEQUAL 29 -#define LESSEQUAL 30 -#define GREATEREQUAL 31 -#define TILDE 32 -#define CIRCUMFLEX 33 -#define LEFTSHIFT 34 -#define RIGHTSHIFT 35 -#define DOUBLESTAR 36 -#define PLUSEQUAL 37 -#define MINEQUAL 38 -#define STAREQUAL 39 -#define SLASHEQUAL 40 -#define PERCENTEQUAL 41 -#define AMPEREQUAL 42 -#define VBAREQUAL 43 -#define CIRCUMFLEXEQUAL 44 -#define LEFTSHIFTEQUAL 45 -#define RIGHTSHIFTEQUAL 46 -#define DOUBLESTAREQUAL 47 -#define DOUBLESLASH 48 -#define DOUBLESLASHEQUAL 49 -#define AT 50 -/* Don't forget to update the table _PyParser_TokenNames in tokenizer.c! */ -#define OP 51 -#define ERRORTOKEN 52 -#define N_TOKENS 53 - -/* Special definitions for cooperation with parser */ - -#define NT_OFFSET 256 - -#define ISTERMINAL(x) ((x) < NT_OFFSET) -#define ISNONTERMINAL(x) ((x) >= NT_OFFSET) -#define ISEOF(x) ((x) == ENDMARKER) - - -PyAPI_DATA(char *) _PyParser_TokenNames[]; /* Token names */ -PyAPI_FUNC(int) PyToken_OneChar(int); -PyAPI_FUNC(int) PyToken_TwoChars(int, int); -PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_TOKEN_H */ diff --git a/python/include/traceback.h b/python/include/traceback.h deleted file mode 100644 index e7943dae..00000000 --- a/python/include/traceback.h +++ /dev/null @@ -1,31 +0,0 @@ - -#ifndef Py_TRACEBACK_H -#define Py_TRACEBACK_H -#ifdef __cplusplus -extern "C" { -#endif - -struct _frame; - -/* Traceback interface */ - -typedef struct _traceback { - PyObject_HEAD - struct _traceback *tb_next; - struct _frame *tb_frame; - int tb_lasti; - int tb_lineno; -} PyTracebackObject; - -PyAPI_FUNC(int) PyTraceBack_Here(struct _frame *); -PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *); -PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, const char *, int, int); - -/* Reveal traceback type so we can typecheck traceback objects */ -PyAPI_DATA(PyTypeObject) PyTraceBack_Type; -#define PyTraceBack_Check(v) (Py_TYPE(v) == &PyTraceBack_Type) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_TRACEBACK_H */ diff --git a/python/include/tupleobject.h b/python/include/tupleobject.h deleted file mode 100644 index a5ab7332..00000000 --- a/python/include/tupleobject.h +++ /dev/null @@ -1,61 +0,0 @@ - -/* Tuple object interface */ - -#ifndef Py_TUPLEOBJECT_H -#define Py_TUPLEOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - -/* -Another generally useful object type is a tuple of object pointers. -For Python, this is an immutable type. C code can change the tuple items -(but not their number), and even use tuples are general-purpose arrays of -object references, but in general only brand new tuples should be mutated, -not ones that might already have been exposed to Python code. - -*** WARNING *** PyTuple_SetItem does not increment the new item's reference -count, but does decrement the reference count of the item it replaces, -if not nil. It does *decrement* the reference count if it is *not* -inserted in the tuple. Similarly, PyTuple_GetItem does not increment the -returned item's reference count. -*/ - -typedef struct { - PyObject_VAR_HEAD - PyObject *ob_item[1]; - - /* ob_item contains space for 'ob_size' elements. - * Items must normally not be NULL, except during construction when - * the tuple is not yet visible outside the function that builds it. - */ -} PyTupleObject; - -PyAPI_DATA(PyTypeObject) PyTuple_Type; - -#define PyTuple_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TUPLE_SUBCLASS) -#define PyTuple_CheckExact(op) (Py_TYPE(op) == &PyTuple_Type) - -PyAPI_FUNC(PyObject *) PyTuple_New(Py_ssize_t size); -PyAPI_FUNC(Py_ssize_t) PyTuple_Size(PyObject *); -PyAPI_FUNC(PyObject *) PyTuple_GetItem(PyObject *, Py_ssize_t); -PyAPI_FUNC(int) PyTuple_SetItem(PyObject *, Py_ssize_t, PyObject *); -PyAPI_FUNC(PyObject *) PyTuple_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t); -PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t); -PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...); -PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *); - -/* Macro, trading safety for speed */ -#define PyTuple_GET_ITEM(op, i) (((PyTupleObject *)(op))->ob_item[i]) -#define PyTuple_GET_SIZE(op) Py_SIZE(op) - -/* Macro, *only* to be used to fill in brand new tuples */ -#define PyTuple_SET_ITEM(op, i, v) (((PyTupleObject *)(op))->ob_item[i] = v) - -PyAPI_FUNC(int) PyTuple_ClearFreeList(void); - -#ifdef __cplusplus -} -#endif -#endif /* !Py_TUPLEOBJECT_H */ diff --git a/python/include/ucnhash.h b/python/include/ucnhash.h deleted file mode 100644 index 69b7774a..00000000 --- a/python/include/ucnhash.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Unicode name database interface */ - -#ifndef Py_UCNHASH_H -#define Py_UCNHASH_H -#ifdef __cplusplus -extern "C" { -#endif - -/* revised ucnhash CAPI interface (exported through a "wrapper") */ - -#define PyUnicodeData_CAPSULE_NAME "unicodedata.ucnhash_CAPI" - -typedef struct { - - /* Size of this struct */ - int size; - - /* Get name for a given character code. Returns non-zero if - success, zero if not. Does not set Python exceptions. - If self is NULL, data come from the default version of the database. - If it is not NULL, it should be a unicodedata.ucd_X_Y_Z object */ - int (*getname)(PyObject *self, Py_UCS4 code, char* buffer, int buflen); - - /* Get character code for a given name. Same error handling - as for getname. */ - int (*getcode)(PyObject *self, const char* name, int namelen, Py_UCS4* code); - -} _PyUnicode_Name_CAPI; - -#ifdef __cplusplus -} -#endif -#endif /* !Py_UCNHASH_H */ diff --git a/python/include/unicodeobject.h b/python/include/unicodeobject.h deleted file mode 100644 index 9ab724aa..00000000 --- a/python/include/unicodeobject.h +++ /dev/null @@ -1,1413 +0,0 @@ -#ifndef Py_UNICODEOBJECT_H -#define Py_UNICODEOBJECT_H - -#include - -/* - -Unicode implementation based on original code by Fredrik Lundh, -modified by Marc-Andre Lemburg (mal@lemburg.com) according to the -Unicode Integration Proposal (see file Misc/unicode.txt). - -Copyright (c) Corporation for National Research Initiatives. - - - Original header: - -------------------------------------------------------------------- - - * Yet another Unicode string type for Python. This type supports the - * 16-bit Basic Multilingual Plane (BMP) only. - * - * Written by Fredrik Lundh, January 1999. - * - * Copyright (c) 1999 by Secret Labs AB. - * Copyright (c) 1999 by Fredrik Lundh. - * - * fredrik@pythonware.com - * http://www.pythonware.com - * - * -------------------------------------------------------------------- - * This Unicode String Type is - * - * Copyright (c) 1999 by Secret Labs AB - * Copyright (c) 1999 by Fredrik Lundh - * - * By obtaining, using, and/or copying this software and/or its - * associated documentation, you agree that you have read, understood, - * and will comply with the following terms and conditions: - * - * Permission to use, copy, modify, and distribute this software and its - * associated documentation for any purpose and without fee is hereby - * granted, provided that the above copyright notice appears in all - * copies, and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of Secret Labs - * AB or the author not be used in advertising or publicity pertaining to - * distribution of the software without specific, written prior - * permission. - * - * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT - * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * -------------------------------------------------------------------- */ - -#include - -/* === Internal API ======================================================= */ - -/* --- Internal Unicode Format -------------------------------------------- */ - -#ifndef Py_USING_UNICODE - -#define PyUnicode_Check(op) 0 -#define PyUnicode_CheckExact(op) 0 - -#else - -/* FIXME: MvL's new implementation assumes that Py_UNICODE_SIZE is - properly set, but the default rules below doesn't set it. I'll - sort this out some other day -- fredrik@pythonware.com */ - -#ifndef Py_UNICODE_SIZE -#error Must define Py_UNICODE_SIZE -#endif - -/* Setting Py_UNICODE_WIDE enables UCS-4 storage. Otherwise, Unicode - strings are stored as UCS-2 (with limited support for UTF-16) */ - -#if Py_UNICODE_SIZE >= 4 -#define Py_UNICODE_WIDE -#endif - -/* Set these flags if the platform has "wchar.h", "wctype.h" and the - wchar_t type is a 16-bit unsigned type */ -/* #define HAVE_WCHAR_H */ -/* #define HAVE_USABLE_WCHAR_T */ - -/* Defaults for various platforms */ -#ifndef PY_UNICODE_TYPE - -/* Windows has a usable wchar_t type (unless we're using UCS-4) */ -# if defined(MS_WIN32) && Py_UNICODE_SIZE == 2 -# define HAVE_USABLE_WCHAR_T -# define PY_UNICODE_TYPE wchar_t -# endif - -# if defined(Py_UNICODE_WIDE) -# define PY_UNICODE_TYPE Py_UCS4 -# endif - -#endif - -/* If the compiler provides a wchar_t type we try to support it - through the interface functions PyUnicode_FromWideChar() and - PyUnicode_AsWideChar(). */ - -#ifdef HAVE_USABLE_WCHAR_T -# ifndef HAVE_WCHAR_H -# define HAVE_WCHAR_H -# endif -#endif - -#ifdef HAVE_WCHAR_H -/* Work around a cosmetic bug in BSDI 4.x wchar.h; thanks to Thomas Wouters */ -# ifdef _HAVE_BSDI -# include -# endif -# include -#endif - -/* - * Use this typedef when you need to represent a UTF-16 surrogate pair - * as single unsigned integer. - */ -#if SIZEOF_INT >= 4 -typedef unsigned int Py_UCS4; -#elif SIZEOF_LONG >= 4 -typedef unsigned long Py_UCS4; -#endif - -/* Py_UNICODE is the native Unicode storage format (code unit) used by - Python and represents a single Unicode element in the Unicode - type. */ - -typedef PY_UNICODE_TYPE Py_UNICODE; - -/* --- UCS-2/UCS-4 Name Mangling ------------------------------------------ */ - -/* Unicode API names are mangled to assure that UCS-2 and UCS-4 builds - produce different external names and thus cause import errors in - case Python interpreters and extensions with mixed compiled in - Unicode width assumptions are combined. */ - -#ifndef Py_UNICODE_WIDE - -# define PyUnicode_AsASCIIString PyUnicodeUCS2_AsASCIIString -# define PyUnicode_AsCharmapString PyUnicodeUCS2_AsCharmapString -# define PyUnicode_AsEncodedObject PyUnicodeUCS2_AsEncodedObject -# define PyUnicode_AsEncodedString PyUnicodeUCS2_AsEncodedString -# define PyUnicode_AsLatin1String PyUnicodeUCS2_AsLatin1String -# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS2_AsRawUnicodeEscapeString -# define PyUnicode_AsUTF32String PyUnicodeUCS2_AsUTF32String -# define PyUnicode_AsUTF16String PyUnicodeUCS2_AsUTF16String -# define PyUnicode_AsUTF8String PyUnicodeUCS2_AsUTF8String -# define PyUnicode_AsUnicode PyUnicodeUCS2_AsUnicode -# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS2_AsUnicodeEscapeString -# define PyUnicode_AsWideChar PyUnicodeUCS2_AsWideChar -# define PyUnicode_ClearFreeList PyUnicodeUCS2_ClearFreelist -# define PyUnicode_Compare PyUnicodeUCS2_Compare -# define PyUnicode_Concat PyUnicodeUCS2_Concat -# define PyUnicode_Contains PyUnicodeUCS2_Contains -# define PyUnicode_Count PyUnicodeUCS2_Count -# define PyUnicode_Decode PyUnicodeUCS2_Decode -# define PyUnicode_DecodeASCII PyUnicodeUCS2_DecodeASCII -# define PyUnicode_DecodeCharmap PyUnicodeUCS2_DecodeCharmap -# define PyUnicode_DecodeLatin1 PyUnicodeUCS2_DecodeLatin1 -# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS2_DecodeRawUnicodeEscape -# define PyUnicode_DecodeUTF32 PyUnicodeUCS2_DecodeUTF32 -# define PyUnicode_DecodeUTF32Stateful PyUnicodeUCS2_DecodeUTF32Stateful -# define PyUnicode_DecodeUTF16 PyUnicodeUCS2_DecodeUTF16 -# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS2_DecodeUTF16Stateful -# define PyUnicode_DecodeUTF8 PyUnicodeUCS2_DecodeUTF8 -# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS2_DecodeUTF8Stateful -# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS2_DecodeUnicodeEscape -# define PyUnicode_Encode PyUnicodeUCS2_Encode -# define PyUnicode_EncodeASCII PyUnicodeUCS2_EncodeASCII -# define PyUnicode_EncodeCharmap PyUnicodeUCS2_EncodeCharmap -# define PyUnicode_EncodeDecimal PyUnicodeUCS2_EncodeDecimal -# define PyUnicode_EncodeLatin1 PyUnicodeUCS2_EncodeLatin1 -# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS2_EncodeRawUnicodeEscape -# define PyUnicode_EncodeUTF32 PyUnicodeUCS2_EncodeUTF32 -# define PyUnicode_EncodeUTF16 PyUnicodeUCS2_EncodeUTF16 -# define PyUnicode_EncodeUTF8 PyUnicodeUCS2_EncodeUTF8 -# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS2_EncodeUnicodeEscape -# define PyUnicode_Find PyUnicodeUCS2_Find -# define PyUnicode_Format PyUnicodeUCS2_Format -# define PyUnicode_FromEncodedObject PyUnicodeUCS2_FromEncodedObject -# define PyUnicode_FromFormat PyUnicodeUCS2_FromFormat -# define PyUnicode_FromFormatV PyUnicodeUCS2_FromFormatV -# define PyUnicode_FromObject PyUnicodeUCS2_FromObject -# define PyUnicode_FromOrdinal PyUnicodeUCS2_FromOrdinal -# define PyUnicode_FromString PyUnicodeUCS2_FromString -# define PyUnicode_FromStringAndSize PyUnicodeUCS2_FromStringAndSize -# define PyUnicode_FromUnicode PyUnicodeUCS2_FromUnicode -# define PyUnicode_FromWideChar PyUnicodeUCS2_FromWideChar -# define PyUnicode_GetDefaultEncoding PyUnicodeUCS2_GetDefaultEncoding -# define PyUnicode_GetMax PyUnicodeUCS2_GetMax -# define PyUnicode_GetSize PyUnicodeUCS2_GetSize -# define PyUnicode_Join PyUnicodeUCS2_Join -# define PyUnicode_Partition PyUnicodeUCS2_Partition -# define PyUnicode_RPartition PyUnicodeUCS2_RPartition -# define PyUnicode_RSplit PyUnicodeUCS2_RSplit -# define PyUnicode_Replace PyUnicodeUCS2_Replace -# define PyUnicode_Resize PyUnicodeUCS2_Resize -# define PyUnicode_RichCompare PyUnicodeUCS2_RichCompare -# define PyUnicode_SetDefaultEncoding PyUnicodeUCS2_SetDefaultEncoding -# define PyUnicode_Split PyUnicodeUCS2_Split -# define PyUnicode_Splitlines PyUnicodeUCS2_Splitlines -# define PyUnicode_Tailmatch PyUnicodeUCS2_Tailmatch -# define PyUnicode_Translate PyUnicodeUCS2_Translate -# define PyUnicode_TranslateCharmap PyUnicodeUCS2_TranslateCharmap -# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS2_AsDefaultEncodedString -# define _PyUnicode_Fini _PyUnicodeUCS2_Fini -# define _PyUnicode_Init _PyUnicodeUCS2_Init -# define _PyUnicode_IsAlpha _PyUnicodeUCS2_IsAlpha -# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS2_IsDecimalDigit -# define _PyUnicode_IsDigit _PyUnicodeUCS2_IsDigit -# define _PyUnicode_IsLinebreak _PyUnicodeUCS2_IsLinebreak -# define _PyUnicode_IsLowercase _PyUnicodeUCS2_IsLowercase -# define _PyUnicode_IsNumeric _PyUnicodeUCS2_IsNumeric -# define _PyUnicode_IsTitlecase _PyUnicodeUCS2_IsTitlecase -# define _PyUnicode_IsUppercase _PyUnicodeUCS2_IsUppercase -# define _PyUnicode_IsWhitespace _PyUnicodeUCS2_IsWhitespace -# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS2_ToDecimalDigit -# define _PyUnicode_ToDigit _PyUnicodeUCS2_ToDigit -# define _PyUnicode_ToLowercase _PyUnicodeUCS2_ToLowercase -# define _PyUnicode_ToNumeric _PyUnicodeUCS2_ToNumeric -# define _PyUnicode_ToTitlecase _PyUnicodeUCS2_ToTitlecase -# define _PyUnicode_ToUppercase _PyUnicodeUCS2_ToUppercase - -#else - -# define PyUnicode_AsASCIIString PyUnicodeUCS4_AsASCIIString -# define PyUnicode_AsCharmapString PyUnicodeUCS4_AsCharmapString -# define PyUnicode_AsEncodedObject PyUnicodeUCS4_AsEncodedObject -# define PyUnicode_AsEncodedString PyUnicodeUCS4_AsEncodedString -# define PyUnicode_AsLatin1String PyUnicodeUCS4_AsLatin1String -# define PyUnicode_AsRawUnicodeEscapeString PyUnicodeUCS4_AsRawUnicodeEscapeString -# define PyUnicode_AsUTF32String PyUnicodeUCS4_AsUTF32String -# define PyUnicode_AsUTF16String PyUnicodeUCS4_AsUTF16String -# define PyUnicode_AsUTF8String PyUnicodeUCS4_AsUTF8String -# define PyUnicode_AsUnicode PyUnicodeUCS4_AsUnicode -# define PyUnicode_AsUnicodeEscapeString PyUnicodeUCS4_AsUnicodeEscapeString -# define PyUnicode_AsWideChar PyUnicodeUCS4_AsWideChar -# define PyUnicode_ClearFreeList PyUnicodeUCS4_ClearFreelist -# define PyUnicode_Compare PyUnicodeUCS4_Compare -# define PyUnicode_Concat PyUnicodeUCS4_Concat -# define PyUnicode_Contains PyUnicodeUCS4_Contains -# define PyUnicode_Count PyUnicodeUCS4_Count -# define PyUnicode_Decode PyUnicodeUCS4_Decode -# define PyUnicode_DecodeASCII PyUnicodeUCS4_DecodeASCII -# define PyUnicode_DecodeCharmap PyUnicodeUCS4_DecodeCharmap -# define PyUnicode_DecodeLatin1 PyUnicodeUCS4_DecodeLatin1 -# define PyUnicode_DecodeRawUnicodeEscape PyUnicodeUCS4_DecodeRawUnicodeEscape -# define PyUnicode_DecodeUTF32 PyUnicodeUCS4_DecodeUTF32 -# define PyUnicode_DecodeUTF32Stateful PyUnicodeUCS4_DecodeUTF32Stateful -# define PyUnicode_DecodeUTF16 PyUnicodeUCS4_DecodeUTF16 -# define PyUnicode_DecodeUTF16Stateful PyUnicodeUCS4_DecodeUTF16Stateful -# define PyUnicode_DecodeUTF8 PyUnicodeUCS4_DecodeUTF8 -# define PyUnicode_DecodeUTF8Stateful PyUnicodeUCS4_DecodeUTF8Stateful -# define PyUnicode_DecodeUnicodeEscape PyUnicodeUCS4_DecodeUnicodeEscape -# define PyUnicode_Encode PyUnicodeUCS4_Encode -# define PyUnicode_EncodeASCII PyUnicodeUCS4_EncodeASCII -# define PyUnicode_EncodeCharmap PyUnicodeUCS4_EncodeCharmap -# define PyUnicode_EncodeDecimal PyUnicodeUCS4_EncodeDecimal -# define PyUnicode_EncodeLatin1 PyUnicodeUCS4_EncodeLatin1 -# define PyUnicode_EncodeRawUnicodeEscape PyUnicodeUCS4_EncodeRawUnicodeEscape -# define PyUnicode_EncodeUTF32 PyUnicodeUCS4_EncodeUTF32 -# define PyUnicode_EncodeUTF16 PyUnicodeUCS4_EncodeUTF16 -# define PyUnicode_EncodeUTF8 PyUnicodeUCS4_EncodeUTF8 -# define PyUnicode_EncodeUnicodeEscape PyUnicodeUCS4_EncodeUnicodeEscape -# define PyUnicode_Find PyUnicodeUCS4_Find -# define PyUnicode_Format PyUnicodeUCS4_Format -# define PyUnicode_FromEncodedObject PyUnicodeUCS4_FromEncodedObject -# define PyUnicode_FromFormat PyUnicodeUCS4_FromFormat -# define PyUnicode_FromFormatV PyUnicodeUCS4_FromFormatV -# define PyUnicode_FromObject PyUnicodeUCS4_FromObject -# define PyUnicode_FromOrdinal PyUnicodeUCS4_FromOrdinal -# define PyUnicode_FromString PyUnicodeUCS4_FromString -# define PyUnicode_FromStringAndSize PyUnicodeUCS4_FromStringAndSize -# define PyUnicode_FromUnicode PyUnicodeUCS4_FromUnicode -# define PyUnicode_FromWideChar PyUnicodeUCS4_FromWideChar -# define PyUnicode_GetDefaultEncoding PyUnicodeUCS4_GetDefaultEncoding -# define PyUnicode_GetMax PyUnicodeUCS4_GetMax -# define PyUnicode_GetSize PyUnicodeUCS4_GetSize -# define PyUnicode_Join PyUnicodeUCS4_Join -# define PyUnicode_Partition PyUnicodeUCS4_Partition -# define PyUnicode_RPartition PyUnicodeUCS4_RPartition -# define PyUnicode_RSplit PyUnicodeUCS4_RSplit -# define PyUnicode_Replace PyUnicodeUCS4_Replace -# define PyUnicode_Resize PyUnicodeUCS4_Resize -# define PyUnicode_RichCompare PyUnicodeUCS4_RichCompare -# define PyUnicode_SetDefaultEncoding PyUnicodeUCS4_SetDefaultEncoding -# define PyUnicode_Split PyUnicodeUCS4_Split -# define PyUnicode_Splitlines PyUnicodeUCS4_Splitlines -# define PyUnicode_Tailmatch PyUnicodeUCS4_Tailmatch -# define PyUnicode_Translate PyUnicodeUCS4_Translate -# define PyUnicode_TranslateCharmap PyUnicodeUCS4_TranslateCharmap -# define _PyUnicode_AsDefaultEncodedString _PyUnicodeUCS4_AsDefaultEncodedString -# define _PyUnicode_Fini _PyUnicodeUCS4_Fini -# define _PyUnicode_Init _PyUnicodeUCS4_Init -# define _PyUnicode_IsAlpha _PyUnicodeUCS4_IsAlpha -# define _PyUnicode_IsDecimalDigit _PyUnicodeUCS4_IsDecimalDigit -# define _PyUnicode_IsDigit _PyUnicodeUCS4_IsDigit -# define _PyUnicode_IsLinebreak _PyUnicodeUCS4_IsLinebreak -# define _PyUnicode_IsLowercase _PyUnicodeUCS4_IsLowercase -# define _PyUnicode_IsNumeric _PyUnicodeUCS4_IsNumeric -# define _PyUnicode_IsTitlecase _PyUnicodeUCS4_IsTitlecase -# define _PyUnicode_IsUppercase _PyUnicodeUCS4_IsUppercase -# define _PyUnicode_IsWhitespace _PyUnicodeUCS4_IsWhitespace -# define _PyUnicode_ToDecimalDigit _PyUnicodeUCS4_ToDecimalDigit -# define _PyUnicode_ToDigit _PyUnicodeUCS4_ToDigit -# define _PyUnicode_ToLowercase _PyUnicodeUCS4_ToLowercase -# define _PyUnicode_ToNumeric _PyUnicodeUCS4_ToNumeric -# define _PyUnicode_ToTitlecase _PyUnicodeUCS4_ToTitlecase -# define _PyUnicode_ToUppercase _PyUnicodeUCS4_ToUppercase - - -#endif - -/* --- Internal Unicode Operations ---------------------------------------- */ - -/* If you want Python to use the compiler's wctype.h functions instead - of the ones supplied with Python, define WANT_WCTYPE_FUNCTIONS or - configure Python using --with-wctype-functions. This reduces the - interpreter's code size. */ - -#if defined(HAVE_USABLE_WCHAR_T) && defined(WANT_WCTYPE_FUNCTIONS) - -#include - -#define Py_UNICODE_ISSPACE(ch) iswspace(ch) - -#define Py_UNICODE_ISLOWER(ch) iswlower(ch) -#define Py_UNICODE_ISUPPER(ch) iswupper(ch) -#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch) -#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch) - -#define Py_UNICODE_TOLOWER(ch) towlower(ch) -#define Py_UNICODE_TOUPPER(ch) towupper(ch) -#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch) - -#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch) -#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch) -#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch) - -#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch) -#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch) -#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch) - -#define Py_UNICODE_ISALPHA(ch) iswalpha(ch) - -#else - -/* Since splitting on whitespace is an important use case, and - whitespace in most situations is solely ASCII whitespace, we - optimize for the common case by using a quick look-up table - _Py_ascii_whitespace (see below) with an inlined check. - - */ -#define Py_UNICODE_ISSPACE(ch) \ - ((ch) < 128U ? _Py_ascii_whitespace[(ch)] : _PyUnicode_IsWhitespace(ch)) - -#define Py_UNICODE_ISLOWER(ch) _PyUnicode_IsLowercase(ch) -#define Py_UNICODE_ISUPPER(ch) _PyUnicode_IsUppercase(ch) -#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch) -#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch) - -#define Py_UNICODE_TOLOWER(ch) _PyUnicode_ToLowercase(ch) -#define Py_UNICODE_TOUPPER(ch) _PyUnicode_ToUppercase(ch) -#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch) - -#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch) -#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch) -#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch) - -#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch) -#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch) -#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch) - -#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch) - -#endif - -#define Py_UNICODE_ISALNUM(ch) \ - (Py_UNICODE_ISALPHA(ch) || \ - Py_UNICODE_ISDECIMAL(ch) || \ - Py_UNICODE_ISDIGIT(ch) || \ - Py_UNICODE_ISNUMERIC(ch)) - -#define Py_UNICODE_COPY(target, source, length) \ - Py_MEMCPY((target), (source), (length)*sizeof(Py_UNICODE)) - -#define Py_UNICODE_FILL(target, value, length) \ - do {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\ - for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\ - } while (0) - -/* Check if substring matches at given offset. the offset must be - valid, and the substring must not be empty */ - -#define Py_UNICODE_MATCH(string, offset, substring) \ - ((*((string)->str + (offset)) == *((substring)->str)) && \ - ((*((string)->str + (offset) + (substring)->length-1) == *((substring)->str + (substring)->length-1))) && \ - !memcmp((string)->str + (offset), (substring)->str, (substring)->length*sizeof(Py_UNICODE))) - -#ifdef __cplusplus -extern "C" { -#endif - -/* --- Unicode Type ------------------------------------------------------- */ - -typedef struct { - PyObject_HEAD - Py_ssize_t length; /* Length of raw Unicode data in buffer */ - Py_UNICODE *str; /* Raw Unicode buffer */ - long hash; /* Hash value; -1 if not set */ - PyObject *defenc; /* (Default) Encoded version as Python - string, or NULL; this is used for - implementing the buffer protocol */ -} PyUnicodeObject; - -PyAPI_DATA(PyTypeObject) PyUnicode_Type; - -#define PyUnicode_Check(op) \ - PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_UNICODE_SUBCLASS) -#define PyUnicode_CheckExact(op) (Py_TYPE(op) == &PyUnicode_Type) - -/* Fast access macros */ -#define PyUnicode_GET_SIZE(op) \ - (((PyUnicodeObject *)(op))->length) -#define PyUnicode_GET_DATA_SIZE(op) \ - (((PyUnicodeObject *)(op))->length * sizeof(Py_UNICODE)) -#define PyUnicode_AS_UNICODE(op) \ - (((PyUnicodeObject *)(op))->str) -#define PyUnicode_AS_DATA(op) \ - ((const char *)((PyUnicodeObject *)(op))->str) - -/* --- Constants ---------------------------------------------------------- */ - -/* This Unicode character will be used as replacement character during - decoding if the errors argument is set to "replace". Note: the - Unicode character U+FFFD is the official REPLACEMENT CHARACTER in - Unicode 3.0. */ - -#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UNICODE) 0xFFFD) - -/* === Public API ========================================================= */ - -/* --- Plain Py_UNICODE --------------------------------------------------- */ - -/* Create a Unicode Object from the Py_UNICODE buffer u of the given - size. - - u may be NULL which causes the contents to be undefined. It is the - user's responsibility to fill in the needed data afterwards. Note - that modifying the Unicode object contents after construction is - only allowed if u was set to NULL. - - The buffer is copied into the new object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode( - const Py_UNICODE *u, /* Unicode buffer */ - Py_ssize_t size /* size of buffer */ - ); - -/* Similar to PyUnicode_FromUnicode(), but u points to Latin-1 encoded bytes */ -PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize( - const char *u, /* char buffer */ - Py_ssize_t size /* size of buffer */ - ); - -/* Similar to PyUnicode_FromUnicode(), but u points to null-terminated - Latin-1 encoded bytes */ -PyAPI_FUNC(PyObject*) PyUnicode_FromString( - const char *u /* string */ - ); - -/* Return a read-only pointer to the Unicode object's internal - Py_UNICODE buffer. */ - -PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode( - PyObject *unicode /* Unicode object */ - ); - -/* Get the length of the Unicode object. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize( - PyObject *unicode /* Unicode object */ - ); - -/* Get the maximum ordinal for a Unicode character. */ -PyAPI_FUNC(Py_UNICODE) PyUnicode_GetMax(void); - -/* Resize an already allocated Unicode object to the new size length. - - *unicode is modified to point to the new (resized) object and 0 - returned on success. - - This API may only be called by the function which also called the - Unicode constructor. The refcount on the object must be 1. Otherwise, - an error is returned. - - Error handling is implemented as follows: an exception is set, -1 - is returned and *unicode left untouched. - -*/ - -PyAPI_FUNC(int) PyUnicode_Resize( - PyObject **unicode, /* Pointer to the Unicode object */ - Py_ssize_t length /* New length */ - ); - -/* Coerce obj to an Unicode object and return a reference with - *incremented* refcount. - - Coercion is done in the following way: - - 1. String and other char buffer compatible objects are decoded - under the assumptions that they contain data using the current - default encoding. Decoding is done in "strict" mode. - - 2. All other objects (including Unicode objects) raise an - exception. - - The API returns NULL in case of an error. The caller is responsible - for decref'ing the returned objects. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject( - register PyObject *obj, /* Object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Coerce obj to an Unicode object and return a reference with - *incremented* refcount. - - Unicode objects are passed back as-is (subclasses are converted to - true Unicode objects), all other objects are delegated to - PyUnicode_FromEncodedObject(obj, NULL, "strict") which results in - using the default encoding as basis for decoding the object. - - The API returns NULL in case of an error. The caller is responsible - for decref'ing the returned objects. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_FromObject( - register PyObject *obj /* Object */ - ); - -PyAPI_FUNC(PyObject *) PyUnicode_FromFormatV(const char*, va_list); -PyAPI_FUNC(PyObject *) PyUnicode_FromFormat(const char*, ...); - -/* Format the object based on the format_spec, as defined in PEP 3101 - (Advanced String Formatting). */ -PyAPI_FUNC(PyObject *) _PyUnicode_FormatAdvanced(PyObject *obj, - Py_UNICODE *format_spec, - Py_ssize_t format_spec_len); - -/* --- wchar_t support for platforms which support it --------------------- */ - -#ifdef HAVE_WCHAR_H - -/* Create a Unicode Object from the whcar_t buffer w of the given - size. - - The buffer is copied into the new object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar( - register const wchar_t *w, /* wchar_t buffer */ - Py_ssize_t size /* size of buffer */ - ); - -/* Copies the Unicode Object contents into the wchar_t buffer w. At - most size wchar_t characters are copied. - - Note that the resulting wchar_t string may or may not be - 0-terminated. It is the responsibility of the caller to make sure - that the wchar_t string is 0-terminated in case this is required by - the application. - - Returns the number of wchar_t characters copied (excluding a - possibly trailing 0-termination character) or -1 in case of an - error. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar( - PyUnicodeObject *unicode, /* Unicode object */ - register wchar_t *w, /* wchar_t buffer */ - Py_ssize_t size /* size of buffer */ - ); - -#endif - -/* --- Unicode ordinals --------------------------------------------------- */ - -/* Create a Unicode Object from the given Unicode code point ordinal. - - The ordinal must be in range(0x10000) on narrow Python builds - (UCS2), and range(0x110000) on wide builds (UCS4). A ValueError is - raised in case it is not. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal); - -/* --- Free-list management ----------------------------------------------- */ - -/* Clear the free list used by the Unicode implementation. - - This can be used to release memory used for objects on the free - list back to the Python memory allocator. - -*/ - -PyAPI_FUNC(int) PyUnicode_ClearFreeList(void); - -/* === Builtin Codecs ===================================================== - - Many of these APIs take two arguments encoding and errors. These - parameters encoding and errors have the same semantics as the ones - of the builtin unicode() API. - - Setting encoding to NULL causes the default encoding to be used. - - Error handling is set by errors which may also be set to NULL - meaning to use the default handling defined for the codec. Default - error handling for all builtin codecs is "strict" (ValueErrors are - raised). - - The codecs all use a similar interface. Only deviation from the - generic ones are documented. - -*/ - -/* --- Manage the default encoding ---------------------------------------- */ - -/* Return a Python string holding the default encoded value of the - Unicode object. - - The resulting string is cached in the Unicode object for subsequent - usage by this function. The cached version is needed to implement - the character buffer interface and will live (at least) as long as - the Unicode object itself. - - The refcount of the string is *not* incremented. - - *** Exported for internal use by the interpreter only !!! *** - -*/ - -PyAPI_FUNC(PyObject *) _PyUnicode_AsDefaultEncodedString( - PyObject *, const char *); - -/* Returns the currently active default encoding. - - The default encoding is currently implemented as run-time settable - process global. This may change in future versions of the - interpreter to become a parameter which is managed on a per-thread - basis. - - */ - -PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void); - -/* Sets the currently active default encoding. - - Returns 0 on success, -1 in case of an error. - - */ - -PyAPI_FUNC(int) PyUnicode_SetDefaultEncoding( - const char *encoding /* Encoding name in standard form */ - ); - -/* --- Generic Codecs ----------------------------------------------------- */ - -/* Create a Unicode object by decoding the encoded string s of the - given size. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Decode( - const char *s, /* encoded string */ - Py_ssize_t size, /* size of buffer */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a Py_UNICODE buffer of the given size and returns a - Python string object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Encode( - const Py_UNICODE *s, /* Unicode char buffer */ - Py_ssize_t size, /* number of Py_UNICODE chars to encode */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a Unicode object and returns the result as Python - object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject( - PyObject *unicode, /* Unicode object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -/* Encodes a Unicode object and returns the result as Python string - object. */ - -PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString( - PyObject *unicode, /* Unicode object */ - const char *encoding, /* encoding */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap( - PyObject* string /* 256 character map */ - ); - - -/* --- UTF-7 Codecs ------------------------------------------------------- */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7( - const char *string, /* UTF-7 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful( - const char *string, /* UTF-7 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* number of Py_UNICODE chars to encode */ - int base64SetO, /* Encode RFC2152 Set O characters in base64 */ - int base64WhiteSpace, /* Encode whitespace (sp, ht, nl, cr) in base64 */ - const char *errors /* error handling */ - ); - -/* --- UTF-8 Codecs ------------------------------------------------------- */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8( - const char *string, /* UTF-8 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful( - const char *string, /* UTF-8 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* number of Py_UNICODE chars to encode */ - const char *errors /* error handling */ - ); - -/* --- UTF-32 Codecs ------------------------------------------------------ */ - -/* Decodes length bytes from a UTF-32 encoded buffer string and returns - the corresponding Unicode object. - - errors (if non-NULL) defines the error handling. It defaults - to "strict". - - If byteorder is non-NULL, the decoder starts decoding using the - given byte order: - - *byteorder == -1: little endian - *byteorder == 0: native order - *byteorder == 1: big endian - - In native mode, the first four bytes of the stream are checked for a - BOM mark. If found, the BOM mark is analysed, the byte order - adjusted and the BOM skipped. In the other modes, no BOM mark - interpretation is done. After completion, *byteorder is set to the - current byte order at the end of input data. - - If byteorder is NULL, the codec starts in native order mode. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32( - const char *string, /* UTF-32 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - int *byteorder /* pointer to byteorder to use - 0=native;-1=LE,1=BE; updated on - exit */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32Stateful( - const char *string, /* UTF-32 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - int *byteorder, /* pointer to byteorder to use - 0=native;-1=LE,1=BE; updated on - exit */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -/* Returns a Python string using the UTF-32 encoding in native byte - order. The string always starts with a BOM mark. */ - -PyAPI_FUNC(PyObject*) PyUnicode_AsUTF32String( - PyObject *unicode /* Unicode object */ - ); - -/* Returns a Python string object holding the UTF-32 encoded value of - the Unicode data. - - If byteorder is not 0, output is written according to the following - byte order: - - byteorder == -1: little endian - byteorder == 0: native byte order (writes a BOM mark) - byteorder == 1: big endian - - If byteorder is 0, the output string will always start with the - Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is - prepended. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF32( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* number of Py_UNICODE chars to encode */ - const char *errors, /* error handling */ - int byteorder /* byteorder to use 0=BOM+native;-1=LE,1=BE */ - ); - -/* --- UTF-16 Codecs ------------------------------------------------------ */ - -/* Decodes length bytes from a UTF-16 encoded buffer string and returns - the corresponding Unicode object. - - errors (if non-NULL) defines the error handling. It defaults - to "strict". - - If byteorder is non-NULL, the decoder starts decoding using the - given byte order: - - *byteorder == -1: little endian - *byteorder == 0: native order - *byteorder == 1: big endian - - In native mode, the first two bytes of the stream are checked for a - BOM mark. If found, the BOM mark is analysed, the byte order - adjusted and the BOM skipped. In the other modes, no BOM mark - interpretation is done. After completion, *byteorder is set to the - current byte order at the end of input data. - - If byteorder is NULL, the codec starts in native order mode. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16( - const char *string, /* UTF-16 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - int *byteorder /* pointer to byteorder to use - 0=native;-1=LE,1=BE; updated on - exit */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful( - const char *string, /* UTF-16 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - int *byteorder, /* pointer to byteorder to use - 0=native;-1=LE,1=BE; updated on - exit */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -/* Returns a Python string using the UTF-16 encoding in native byte - order. The string always starts with a BOM mark. */ - -PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String( - PyObject *unicode /* Unicode object */ - ); - -/* Returns a Python string object holding the UTF-16 encoded value of - the Unicode data. - - If byteorder is not 0, output is written according to the following - byte order: - - byteorder == -1: little endian - byteorder == 0: native byte order (writes a BOM mark) - byteorder == 1: big endian - - If byteorder is 0, the output string will always start with the - Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is - prepended. - - Note that Py_UNICODE data is being interpreted as UTF-16 reduced to - UCS-2. This trick makes it possible to add full UTF-16 capabilities - at a later point without compromising the APIs. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* number of Py_UNICODE chars to encode */ - const char *errors, /* error handling */ - int byteorder /* byteorder to use 0=BOM+native;-1=LE,1=BE */ - ); - -/* --- Unicode-Escape Codecs ---------------------------------------------- */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape( - const char *string, /* Unicode-Escape encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length /* Number of Py_UNICODE chars to encode */ - ); - -/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape( - const char *string, /* Raw-Unicode-Escape encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length /* Number of Py_UNICODE chars to encode */ - ); - -/* --- Unicode Internal Codec --------------------------------------------- - - Only for internal use in _codecsmodule.c */ - -PyObject *_PyUnicode_DecodeUnicodeInternal( - const char *string, - Py_ssize_t length, - const char *errors - ); - -/* --- Latin-1 Codecs ----------------------------------------------------- - - Note: Latin-1 corresponds to the first 256 Unicode ordinals. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1( - const char *string, /* Latin-1 encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - const char *errors /* error handling */ - ); - -/* --- ASCII Codecs ------------------------------------------------------- - - Only 7-bit ASCII data is excepted. All other codes generate errors. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII( - const char *string, /* ASCII encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - const char *errors /* error handling */ - ); - -/* --- Character Map Codecs ----------------------------------------------- - - This codec uses mappings to encode and decode characters. - - Decoding mappings must map single string characters to single - Unicode characters, integers (which are then interpreted as Unicode - ordinals) or None (meaning "undefined mapping" and causing an - error). - - Encoding mappings must map single Unicode characters to single - string characters, integers (which are then interpreted as Latin-1 - ordinals) or None (meaning "undefined mapping" and causing an - error). - - If a character lookup fails with a LookupError, the character is - copied as-is meaning that its ordinal value will be interpreted as - Unicode or Latin-1 ordinal resp. Because of this mappings only need - to contain those mappings which map characters to different code - points. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap( - const char *string, /* Encoded string */ - Py_ssize_t length, /* size of string */ - PyObject *mapping, /* character mapping - (char ordinal -> unicode ordinal) */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString( - PyObject *unicode, /* Unicode object */ - PyObject *mapping /* character mapping - (unicode ordinal -> char ordinal) */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - PyObject *mapping, /* character mapping - (unicode ordinal -> char ordinal) */ - const char *errors /* error handling */ - ); - -/* Translate a Py_UNICODE buffer of the given length by applying a - character mapping table to it and return the resulting Unicode - object. - - The mapping table must map Unicode ordinal integers to Unicode - ordinal integers or None (causing deletion of the character). - - Mapping tables may be dictionaries or sequences. Unmapped character - ordinals (ones which cause a LookupError) are left untouched and - are copied as-is. - -*/ - -PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - PyObject *table, /* Translate table */ - const char *errors /* error handling */ - ); - -#ifdef MS_WIN32 - -/* --- MBCS codecs for Windows -------------------------------------------- */ - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS( - const char *string, /* MBCS encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors /* error handling */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful( - const char *string, /* MBCS encoded string */ - Py_ssize_t length, /* size of string */ - const char *errors, /* error handling */ - Py_ssize_t *consumed /* bytes consumed */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString( - PyObject *unicode /* Unicode object */ - ); - -PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS( - const Py_UNICODE *data, /* Unicode char buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - const char *errors /* error handling */ - ); - -#endif /* MS_WIN32 */ - -/* --- Decimal Encoder ---------------------------------------------------- */ - -/* Takes a Unicode string holding a decimal value and writes it into - an output buffer using standard ASCII digit codes. - - The output buffer has to provide at least length+1 bytes of storage - area. The output string is 0-terminated. - - The encoder converts whitespace to ' ', decimal characters to their - corresponding ASCII digit and all other Latin-1 characters except - \0 as-is. Characters outside this range (Unicode ordinals 1-256) - are treated as errors. This includes embedded NULL bytes. - - Error handling is defined by the errors argument: - - NULL or "strict": raise a ValueError - "ignore": ignore the wrong characters (these are not copied to the - output buffer) - "replace": replaces illegal characters with '?' - - Returns 0 on success, -1 on failure. - -*/ - -PyAPI_FUNC(int) PyUnicode_EncodeDecimal( - Py_UNICODE *s, /* Unicode buffer */ - Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ - char *output, /* Output buffer; must have size >= length */ - const char *errors /* error handling */ - ); - -/* --- Methods & Slots ---------------------------------------------------- - - These are capable of handling Unicode objects and strings on input - (we refer to them as strings in the descriptions) and return - Unicode objects or integers as apporpriate. */ - -/* Concat two strings giving a new Unicode string. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Concat( - PyObject *left, /* Left string */ - PyObject *right /* Right string */ - ); - -/* Split a string giving a list of Unicode strings. - - If sep is NULL, splitting will be done at all whitespace - substrings. Otherwise, splits occur at the given separator. - - At most maxsplit splits will be done. If negative, no limit is set. - - Separators are not included in the resulting list. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_Split( - PyObject *s, /* String to split */ - PyObject *sep, /* String separator */ - Py_ssize_t maxsplit /* Maxsplit count */ - ); - -/* Dito, but split at line breaks. - - CRLF is considered to be one line break. Line breaks are not - included in the resulting list. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Splitlines( - PyObject *s, /* String to split */ - int keepends /* If true, line end markers are included */ - ); - -/* Partition a string using a given separator. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Partition( - PyObject *s, /* String to partition */ - PyObject *sep /* String separator */ - ); - -/* Partition a string using a given separator, searching from the end of the - string. */ - -PyAPI_FUNC(PyObject*) PyUnicode_RPartition( - PyObject *s, /* String to partition */ - PyObject *sep /* String separator */ - ); - -/* Split a string giving a list of Unicode strings. - - If sep is NULL, splitting will be done at all whitespace - substrings. Otherwise, splits occur at the given separator. - - At most maxsplit splits will be done. But unlike PyUnicode_Split - PyUnicode_RSplit splits from the end of the string. If negative, - no limit is set. - - Separators are not included in the resulting list. - -*/ - -PyAPI_FUNC(PyObject*) PyUnicode_RSplit( - PyObject *s, /* String to split */ - PyObject *sep, /* String separator */ - Py_ssize_t maxsplit /* Maxsplit count */ - ); - -/* Translate a string by applying a character mapping table to it and - return the resulting Unicode object. - - The mapping table must map Unicode ordinal integers to Unicode - ordinal integers or None (causing deletion of the character). - - Mapping tables may be dictionaries or sequences. Unmapped character - ordinals (ones which cause a LookupError) are left untouched and - are copied as-is. - -*/ - -PyAPI_FUNC(PyObject *) PyUnicode_Translate( - PyObject *str, /* String */ - PyObject *table, /* Translate table */ - const char *errors /* error handling */ - ); - -/* Join a sequence of strings using the given separator and return - the resulting Unicode string. */ - -PyAPI_FUNC(PyObject*) PyUnicode_Join( - PyObject *separator, /* Separator string */ - PyObject *seq /* Sequence object */ - ); - -/* Return 1 if substr matches str[start:end] at the given tail end, 0 - otherwise. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch( - PyObject *str, /* String */ - PyObject *substr, /* Prefix or Suffix string */ - Py_ssize_t start, /* Start index */ - Py_ssize_t end, /* Stop index */ - int direction /* Tail end: -1 prefix, +1 suffix */ - ); - -/* Return the first position of substr in str[start:end] using the - given search direction or -1 if not found. -2 is returned in case - an error occurred and an exception is set. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_Find( - PyObject *str, /* String */ - PyObject *substr, /* Substring to find */ - Py_ssize_t start, /* Start index */ - Py_ssize_t end, /* Stop index */ - int direction /* Find direction: +1 forward, -1 backward */ - ); - -/* Count the number of occurrences of substr in str[start:end]. */ - -PyAPI_FUNC(Py_ssize_t) PyUnicode_Count( - PyObject *str, /* String */ - PyObject *substr, /* Substring to count */ - Py_ssize_t start, /* Start index */ - Py_ssize_t end /* Stop index */ - ); - -/* Replace at most maxcount occurrences of substr in str with replstr - and return the resulting Unicode object. */ - -PyAPI_FUNC(PyObject *) PyUnicode_Replace( - PyObject *str, /* String */ - PyObject *substr, /* Substring to find */ - PyObject *replstr, /* Substring to replace */ - Py_ssize_t maxcount /* Max. number of replacements to apply; - -1 = all */ - ); - -/* Compare two strings and return -1, 0, 1 for less than, equal, - greater than resp. */ - -PyAPI_FUNC(int) PyUnicode_Compare( - PyObject *left, /* Left string */ - PyObject *right /* Right string */ - ); - -/* Rich compare two strings and return one of the following: - - - NULL in case an exception was raised - - Py_True or Py_False for successfuly comparisons - - Py_NotImplemented in case the type combination is unknown - - Note that Py_EQ and Py_NE comparisons can cause a UnicodeWarning in - case the conversion of the arguments to Unicode fails with a - UnicodeDecodeError. - - Possible values for op: - - Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE - -*/ - -PyAPI_FUNC(PyObject *) PyUnicode_RichCompare( - PyObject *left, /* Left string */ - PyObject *right, /* Right string */ - int op /* Operation: Py_EQ, Py_NE, Py_GT, etc. */ - ); - -/* Apply a argument tuple or dictionary to a format string and return - the resulting Unicode string. */ - -PyAPI_FUNC(PyObject *) PyUnicode_Format( - PyObject *format, /* Format string */ - PyObject *args /* Argument tuple or dictionary */ - ); - -/* Checks whether element is contained in container and return 1/0 - accordingly. - - element has to coerce to an one element Unicode string. -1 is - returned in case of an error. */ - -PyAPI_FUNC(int) PyUnicode_Contains( - PyObject *container, /* Container string */ - PyObject *element /* Element string */ - ); - -/* Externally visible for str.strip(unicode) */ -PyAPI_FUNC(PyObject *) _PyUnicode_XStrip( - PyUnicodeObject *self, - int striptype, - PyObject *sepobj - ); - -/* === Characters Type APIs =============================================== */ - -/* Helper array used by Py_UNICODE_ISSPACE(). */ - -PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[]; - -/* These should not be used directly. Use the Py_UNICODE_IS* and - Py_UNICODE_TO* macros instead. - - These APIs are implemented in Objects/unicodectype.c. - -*/ - -PyAPI_FUNC(int) _PyUnicode_IsLowercase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsUppercase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsTitlecase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsWhitespace( - const Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsLinebreak( - const Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToLowercase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToUppercase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(Py_UNICODE) _PyUnicode_ToTitlecase( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_ToDecimalDigit( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_ToDigit( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(double) _PyUnicode_ToNumeric( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsDecimalDigit( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsDigit( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsNumeric( - Py_UNICODE ch /* Unicode character */ - ); - -PyAPI_FUNC(int) _PyUnicode_IsAlpha( - Py_UNICODE ch /* Unicode character */ - ); - -#ifdef __cplusplus -} -#endif -#endif /* Py_USING_UNICODE */ -#endif /* !Py_UNICODEOBJECT_H */ diff --git a/python/include/warnings.h b/python/include/warnings.h deleted file mode 100644 index 0818d7a1..00000000 --- a/python/include/warnings.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef Py_WARNINGS_H -#define Py_WARNINGS_H -#ifdef __cplusplus -extern "C" { -#endif - -PyAPI_FUNC(void) _PyWarnings_Init(void); - -PyAPI_FUNC(int) PyErr_WarnEx(PyObject *, const char *, Py_ssize_t); -PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *, const char *, int, - const char *, PyObject *); - -#define PyErr_WarnPy3k(msg, stacklevel) \ - (Py_Py3kWarningFlag ? PyErr_WarnEx(PyExc_DeprecationWarning, msg, stacklevel) : 0) - -/* DEPRECATED: Use PyErr_WarnEx() instead. */ -#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1) - -#ifdef __cplusplus -} -#endif -#endif /* !Py_WARNINGS_H */ - diff --git a/python/include/weakrefobject.h b/python/include/weakrefobject.h deleted file mode 100644 index f15c9d9c..00000000 --- a/python/include/weakrefobject.h +++ /dev/null @@ -1,75 +0,0 @@ -/* Weak references objects for Python. */ - -#ifndef Py_WEAKREFOBJECT_H -#define Py_WEAKREFOBJECT_H -#ifdef __cplusplus -extern "C" { -#endif - - -typedef struct _PyWeakReference PyWeakReference; - -/* PyWeakReference is the base struct for the Python ReferenceType, ProxyType, - * and CallableProxyType. - */ -struct _PyWeakReference { - PyObject_HEAD - - /* The object to which this is a weak reference, or Py_None if none. - * Note that this is a stealth reference: wr_object's refcount is - * not incremented to reflect this pointer. - */ - PyObject *wr_object; - - /* A callable to invoke when wr_object dies, or NULL if none. */ - PyObject *wr_callback; - - /* A cache for wr_object's hash code. As usual for hashes, this is -1 - * if the hash code isn't known yet. - */ - long hash; - - /* If wr_object is weakly referenced, wr_object has a doubly-linked NULL- - * terminated list of weak references to it. These are the list pointers. - * If wr_object goes away, wr_object is set to Py_None, and these pointers - * have no meaning then. - */ - PyWeakReference *wr_prev; - PyWeakReference *wr_next; -}; - -PyAPI_DATA(PyTypeObject) _PyWeakref_RefType; -PyAPI_DATA(PyTypeObject) _PyWeakref_ProxyType; -PyAPI_DATA(PyTypeObject) _PyWeakref_CallableProxyType; - -#define PyWeakref_CheckRef(op) PyObject_TypeCheck(op, &_PyWeakref_RefType) -#define PyWeakref_CheckRefExact(op) \ - (Py_TYPE(op) == &_PyWeakref_RefType) -#define PyWeakref_CheckProxy(op) \ - ((Py_TYPE(op) == &_PyWeakref_ProxyType) || \ - (Py_TYPE(op) == &_PyWeakref_CallableProxyType)) - -/* This macro calls PyWeakref_CheckRef() last since that can involve a - function call; this makes it more likely that the function call - will be avoided. */ -#define PyWeakref_Check(op) \ - (PyWeakref_CheckRef(op) || PyWeakref_CheckProxy(op)) - - -PyAPI_FUNC(PyObject *) PyWeakref_NewRef(PyObject *ob, - PyObject *callback); -PyAPI_FUNC(PyObject *) PyWeakref_NewProxy(PyObject *ob, - PyObject *callback); -PyAPI_FUNC(PyObject *) PyWeakref_GetObject(PyObject *ref); - -PyAPI_FUNC(Py_ssize_t) _PyWeakref_GetWeakrefCount(PyWeakReference *head); - -PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self); - -#define PyWeakref_GET_OBJECT(ref) (((PyWeakReference *)(ref))->wr_object) - - -#ifdef __cplusplus -} -#endif -#endif /* !Py_WEAKREFOBJECT_H */ diff --git a/python/libs/_bsddb.lib b/python/libs/_bsddb.lib deleted file mode 100644 index 9f840ed9bdf28d0ae3c4e273067c601ab82d5dee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1888 zcmcIlPj3=I6#p%MTG)8NKS^VvaZQ@27X)@`OJc}YYa;0u2&LyOu+?&CAuT5D$%{wB z#jjxe3?6$n9z6H~ntq5Lt?$jwz)(TK;3P9|-kZ1c-tYaHefX?#)Y>naPp#3BwQVO; zu=81GRGyJ+b~Pt=yC#4|z_7+gZ4p}mcw?>@1Dv_MmbGGKM(ga<6Il!j1$lc z14zVxA~BZ>K%XXohk*#rr zBZ{w|-&agVO(+>?I@oKzeY3nBvVcpQ4~mi0Me2FF9W;84<(xXYLz{0j&!r$r)J5h@ z>a9pIZqVi@&2uFn>cTpU5WR_{keXq2FsMhko#F)Wbv#%hd2(y3-8$+VcV73b$F(Px zS1NCc(`yUc;t%-(s$Q{6(aM=##Lx(N(CQp?$<^e^M_gSgbNmGl_ALU1*ad{Q`${6P zv7M-rIIKeg40Q5C3CkbwA_w0NtVxbZ1XWu9rOM`2B{`=s=zq_Mh${IaJY)aHS4kj_ zhKp7uwvuv{d{T_0TqXY_`_ts~KKU^5kQ?ed!teUM&f1355R%`C1O%LCl;t TCqLfKU9w})%Xsa7q*?j}^C)V` diff --git a/python/libs/_ctypes.lib b/python/libs/_ctypes.lib deleted file mode 100644 index 7cc4d0fa78d967534be6584b96c85221e6433e39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1714 zcmcIlzfaph6#i_7A2AFOurMIG5)yO?3ATYq2suEdM3@AbFq<@?B?BaaAi>1K$X1E} zp!^SPSvz#-&_95Gf)(Dg@37O7k|27K@9ur~?(Ti>zPo%_t)A2l*YpLWyJSt%%H&Kt zYj)!qVP;KB^!9ZCLx6GvXdNK&01OxS^ZnxXPT8yYo1bAJebG8Nh3}X4 zT=#DWTndkHyi(XJZTXw|N}gskj#^Y5H`>pO#EpR&SP_E+QMgfnjs`rCQ5X&=L4k?{ z{WRMB4P0Iexi{A^OX=1{J)rg4X;?XVO#8a4X!vn^RURWgqr{7flCB?oKKnYm8=63# zI@i(=t%KBhx>2vTtFw!8Xo@;N>AM#Ir3Vf&9pSemV2o4ekv{3ixC5i3Qagbpn-~+P z#-!#jnHnLC*WU2(;owwA$_|}ABZm?R$ngwKA{P4)5c${;Qsny;FR}Y&Nu2$DNkg>nn%#ag+Ea*w fX4JCf{|f(q@a1$Bezm5Fol5Uk_d6dwhtQt@uX{o3 diff --git a/python/libs/_ctypes_test.lib b/python/libs/_ctypes_test.lib deleted file mode 100644 index 2307e980d1be892a660617779938b074e7e74925..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21680 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 diff --git a/python/libs/_elementtree.lib b/python/libs/_elementtree.lib deleted file mode 100644 index 4217b7eadfd1ebfb294017fd92508a246bbd708d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1878 zcmcIlPfrs;6#wnE0^M+Ekl=}AQH*-&zwII>h7?6(VQEPzHvF4duwul`n=NTs>BK9` zPFgqR3CSkyw4_P~fCqp+4TRT;JO?JOxVvt4b1Ppcx@+&Y-xji4#eBhay+g0=9r=FC z^WeI<9mna{!f8;gtyKK5liP6DR*S2&tyXW+a8&bydgzyo?bTA(t1!7Wtpn>soRfc7 z6T(es&=ICDM0VWOztKIoJreOA2Zv_urOIZ>2!<}!{9J_*SIJd59)bZo*^QQ?h4AC+ zS$<9frYLgMv{=>K{j|Th-DZLJL|iCF&KX4C#A?;DUtUb9rCB0=QvV|bA(}HtTuQwq zDaH&DVY*N0u{;Cwl9Gl;h%k$2uba>CFgi&Kd?+_oi=51C)+(*WabwRnpBG-3PByn8 zR(l45xY)=C(B0H05v7sfK~(QmWKE?}Z<5)OlP|cwR+sWVZfvIx<$VSamLDjI@RQ99 zDM^}jNPv!x-IcKXDG##o>A;HQc+&Ba#=E0-2o}dgPs+ACFNmY*0zKb_m2B%^^i;)C zcL<=zQc_0GH^s=A(ewXMF-n%_$&!CQcVkyxYI!*jyLRRMrW@Kh9~`?|D$iEoVq|jV x1zVu<(n`*HzZ4_q`;YM`aeYj;-!CpZur&G4##QTR{IWd}eohVe%kPaw@A#w2$P z>NzGd4@t=fGOPsgmm6z1&wPB28-pB_~&J>rSk&;Kcq#KH& z-r8+bxaouMxV#jHyoZV7Ga;ypfQq;&8ikKNS)%dSh7`E6@p~H9Px7FNPY2#=i6;{w zjrXgk;Z;k)&tLU$V3?{}eyHd;#+$39p_Y0>qFP+ha}yn cqW4CZqQn0u+@XQNuh$cWZ}i$bpUfES-<}&png9R* diff --git a/python/libs/_msi.lib b/python/libs/_msi.lib deleted file mode 100644 index ca2b30f6ffc4c8907352a646711e10e62c5f63bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1664 zcmb_dPfHt75dZCN8k42apq`3_6a?E#n(S`0f=IL$8e9{J@w~>wKYNG?8bL35@#w8r zPagaTo;{WxiueKiBn6#$d6UFSXaaf5&U^El**AaQ%-fF(mBZ@(qWvZLa%5cBOV7L6 zjPnvtYc}JEV9N&Z1~AS5>k5e61JNmdgCM`QUM!V^mG2whO8ND2u@nULqYyz**!2C^ zQk=86EiC`oEUX4AOXVd}59>`L2VtxId1p1W*KXJA2)TV`09O`pPs~(Qg#iO5BJ@~f zcUb@Xd)g;53OCg}tw|jJ%ewcq>%VVU_;qtpj8Y6SiiL)es_kqa?@e#CSzwVCm%`{d zhs1I!tW{c-X-7npwD?W$qXsA?$RT~F^=35;KI*^piXP)RB=1a`-yzN{Vths%)C?vP zV+8PKJXjn*8D9&lhmE7gZY%kz^f~G03#&@{4|z*Gf5;n9O{rCaC>0uEVuGw!8}%l+ z89(`nrzbJS`aIY#6B2C>P@e7!qT*sJmLMMM5P*(Owu>F(UJeZy4MajU!{(x*CVO4KDi)!_=t)p0G1p1C?kf9ivrCZ9mx3&fVn7__6D zxz`=_Ko;6(J9I~7B~4s`+)=%wr=vW!T$vAM&IBY PYC^>oL(dJauL#)B%X210 diff --git a/python/libs/_multiprocessing.lib b/python/libs/_multiprocessing.lib deleted file mode 100644 index 4fc7827582c28c715998cf0be7b89ae1d7201a24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1950 zcmcIl&2HL25dLha0#*;GjdF=nxlz9Qyz{^w0h375G5HXQ_y>fW&IjZPxqsg^Zkj*z_~nEdGbF@lKk3Kz0`yBNBxVt371Lo*U*c(kDokbd8@t9&pKQ8~ZoAjs@9VEB zi@IGbZHW1S;W25vkUv1D!jlrz6K%*AwjD*)Xtz2Pe*E+cZf@kpyp|ist3qa>0C)%v zrNzU`J4U1>%RXelA0O-1!uCb(MB}dmt3u;JMU(pbF?tMsN^*?Jri_&rp3ElIW7Cxv zEyoqGqd8NgSm!?@pJZF%Tko}pH+ILL JDfCXzegjG~g_-~W diff --git a/python/libs/_socket.lib b/python/libs/_socket.lib deleted file mode 100644 index f795f14707c53759adc9f6d4f16892fe395c96eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1920 zcmcIl&2G~`5dQ2WO_Oqn3>OYaMydo{LK53hO9(koB%-=W<)*#5sgu%xila72<-~;} zH=Y61SK!to7Y-bF0A8ZkGGp&1&L2%GSb2YDc6N8Z*>A^ppR|sH!>9R&`e-Q|hFP)= zt6Uk?mxNeelM{P+09in}0Ma^;*#(x);+oZHO7s2N=2pXN`s**YpL?~fX2bLSlQ4MG z>BINyJFYuvfDghVo^QU~sc-n})n=7ebdP$}yzTY}n~Vr!^WpyMPCy3@Y=mNA#P$$z zh9F-kfSv|+NjO^qG>QRzP@p1>OjJ|k?KQAZgLoAxj^#MS*)fcxU+leaM`5_?woTg* z_r8~Rl@z{z{n%I`{L6%wAs5@7{dcccw__2g(%_R6MDL*Rtk`Y0`mNQ9oVrDWA5?z} zMT&X{rE_8TNT_jx2A5Q&9qS$F=PLCYax7v+uz^9{!_5NU1@Fg&Epn&YW;ZwvPr`$~ ze&2hbyS4g8G&|PtVZ4wxAWBE00=0bUStL$@6NE=S@-=t*8JFZ=d>pUf!p^CXkR2d$ z_fTpgaJ(WVH747T0s|XssA0X%jVQc3U<-*m6&|(MBHT=(K{h053vj);stN1RUgyb-OdOvpe(c%&aG0R}X62Z|s*&H)UPd%gnj? zY_40M(PGw})!e2H;0a)y0M!syzX(3pkEzxe1hP|jIHt3fA8HLwDL1E*>0M0ESL3lO>6f77p zk)WSN{vU(q;i&IHtZysb{9I>j4`s!h>)`PX3qMc4mPZKF5Md)S()FzmN1vwF+9I$> z%r_DATtI3u9o4I?>Qqja#)$bv-=$X26`_F4nYMeS)fi!h{D~cl1vqCW&7(-Nh+)Yc zgL;n9)F3JOKqfXx9zR`)Y6p$O#>bZPqB8CH#nQ4`y)g`v%p3Ut%9-L)G*a?N7k5KZ z)Ec`@3O9ND9amT4koPcgd?o~S0ZvNPnKvrwjl+sZSoxr>nC~8#HR!ETH?t> zK;z@;sejdy%V)29*f&g7Ek9Ir9OK>9QddizAyzG}Xt`QWMbI->%m1l@UNSpDQT+A6 zvE!A}OPA$l@E8(X-ue5%k>O`|agUpONSO d)uK0}OVQ!~6Yfyo;MZ$h;TyW~&c`zb`w#4;LaqP+ diff --git a/python/libs/_ssl.lib b/python/libs/_ssl.lib deleted file mode 100644 index 176c166fd4cd3b507dc1159348034a8a3da0a438..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1664 zcmb_dOG^S#6#iz$OeILNRTLNm)y8yY>;Vz>f}}~qY(1Iw5Go}NYEzq*?b^0#(NAdI zx*(z-&@Tzey?m;kAd{zSMv_19&55*ek+-1|1%H46@s)|E)c3 z5gCOWDPI&+9RFqAo^AN=Xa-&$uG3zM!AG&s&?1Gs-Lr$Str`m~(Beiha!w$)6e$*R z)!dk=M1!<=ruRbvloBKmeUf_95(XdjC%sCK@dUz8I?es?GYcP|5eGGnP_UN(-i!x} z{pSN4#r$chQrfSECo+>^Cz)Co(qE*Hc>a(#pqdh^AW4z!SI50#?J=AOHXW diff --git a/python/libs/_testcapi.lib b/python/libs/_testcapi.lib deleted file mode 100644 index ae59b09416ba16e0c8dc257ad0b92b93e6dc5f9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1748 zcmcIlOHbQC5dLgaN-Q2x;aU+85^xE5*a!qdrhwE4lb{f|nlz8%10(_?!HG+c-1raa zkLZPCZyY#~J3l0yadwk9(2$^ZEbs2jj(6vq`F1_Co~Z0Jjopv03&Bet3} zCe*kgCysRh9{{BWXmuKff#EX0j+5Hk&t!AX_RhgpHnpG2WF5yVU3i6j)rI4v4{iIU z3vOCIO^@8y!}PARy_wsjZ`{)=HD|8Zazd9nFcPzkWQd^D6ripFVZu}%_Mt(6iXnP5 zir`(C`U$)jZke@c^}0v^->Qxoi;FrP>$aldckM@Jf^dxxJ`yEbEPcEDK6lVmfh`)` zN=5V*!e63pG4JK)5^`#a1`qT;3j?JI7Gn3pZ&{czP6LJZlYVTs5V=>WpF)ULjI}Dr zpyn|d{zz6{k%fIiSD*IW!g=MQQuZPX*~N&RO7Hr!UCk)z{2?y@Die>0h0IDC1@?he zsGL?Q-q6(@8V$K2f5XB7s*tcPzz_LET6}=KlO`<&`;Y-GAG2*?`z$v?cy(Y+Xxynd zqV}Dn>OmMi0J;yxBsxxkt*Aa@e)$1%n6ERY=ufqq4#p&Dxzn`{3j;#Q{B%L z#$PX=f%CS~zCGkgd!h}RrG7ncJx-b_Q^kbjlh!F6C(V#{_Is3y=>Ktk`^o7vZQX;8 egJ#uOm46-nyYMl!6~4o`bbO0-UHO6Kq5lDp)K3-w diff --git a/python/libs/_tkinter.lib b/python/libs/_tkinter.lib deleted file mode 100644 index 6d8865d5c3c442c37db57cd1ee1a23a5f0980190..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1732 zcmcIlPfrt35dZCNMYl?a7ghJ{x``*mFd2it>K z%DV6WZGkUh(lrR)uUD4CrG;RDwnY1F8V;gZY|t;=8HLwFL1E*_08T9+MR+zw6f77p zk)oeP{_lh5_NZ?_tZysZ{@i42w`Ikf@8R(c3qOy)R>uj`C}ATqvd!(SPrK7=T@hF$ z=9>t5E+Mm+jhgkiK3$NdNn(D{_ggFIicmuCMBB}3HO84Ce`3dC3C@X0^90f?VoY+! zpq^nO^N^H$AQPLU4>H-4mLDoQj`8|xX{x2(kf;_{v|KI6BIuc`<^NQ{AentaQT+44 zv6GcDNS77nK#0nNH`T=|i3%GYO;dz{nW)ASkb_R%`WO;r-gXT6wiztp&}mHiDqC z?)(2c@r}F#Uwv`CvK%bT*XJp^v(+Q9-RX;u)g&=udx$tikoPp;zyOX&85rnKV#2;30n~<7TB<>~kK8W4j0IP^a-BGOQvklbXSJ zHcdLO#f`n0{l_bv)=u|x_ha9BR(o#w<;t?~{v(Jt;zM45s6;)DEJ@-Q&EyX7THUQ4 zVa)9R#Knc$ilezPC><(Q4-hanl|>}Q;0$GPIfe`fV~Rry+n=zIjaLVXQsY6#63N7b zi6w@alo_@=8)1ennDIw|VrcQqXbaa+M3~_yD>LJlQsl_Yxc3vk%UM1p0M|Ymi7Qr8 zZ`g*Z?$Te{U~sVU6}#asg-l@j@m-3x$X#-ko#RfGBFB5H>|LrkNt?!!FKHzm^(a~V WAHWyU*Z5_6B(fSs_-3nnYhD8Cg&CRv diff --git a/python/libs/omf_python27.lib b/python/libs/omf_python27.lib deleted file mode 100644 index a239e707b981d84b19020d7722542ba0076efbbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103936 zcmd_TdzhtFbthZ|6E9dIA|fC+xyc|RAOVLkq^YiMEA)-7YFb2c=JYvlR~`G*ImNkj zS9yue7-FeI7~?p`5JU19$1%qE8OQi}8$%rQ^NM_i7{e&yjTkj(lsLxQthLwLd#~T# z`#sh9d-{2(D)w)^YpuQZ+H0?UdH4I>=_&i~=)+H(dO~B@+NSx1#!P>CrPHnc&H6=C zQ-63=TKxExwb4?)cgf|?YInQS@WhW_{R>l5BVl{^xT#~6-9AHJ(>9ps$R3PsombSwsYT$s@CYk>sLCaMG!b2UwHZ)&wlFgu~XB5 z|CT{jjn*%8jIk6rKHhU=`r895X8>P+r|{L zVN=H!ukUoaZ$Jj}P6c@>$2+WivDY=tVI>{4v9PvMHH^Iy2;`8x61XzF z*@?A1m}-7B==2sH|Em-J1}gD4aEt`fMGik{>WO5(Yx@0egM-nwesA%-^-G<_G5~lV zn>_W1(_H(TvJE3Nmv3(k)(H<}cs`{zCA9 z$p7@IQ_)_#t7d!epfjqZBKNFscSf5`1rnbIHA?u+2GOp=9Ilrys(x<+`Gp$S$QR02 zCGsUd&=%NQjdt}ry-_t7<@Svr)Hb$XB#49h;ipbLCE9mx7`^e<^{bs>YhaLZLa?ai z@Gh*1*i-Tmtq%?1H<)}RmI8OmMH}uHG{wMwI@E-puw%;M6Q@q#_FWrQn+AjC z+8p_g8&V#%ewAz9G78+ETzdYUqI}A~vB`z$-r}(({sFD!A1Llt{wGWwZ}q1vzSnAw zzOnvXr+o$4D&z5jUo(2é-z2Ai$gb2hh{=20eVz)QO-!54zIRuU+5d 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�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 a`mgZ+gDGjrg~IpaAqz>q1L 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 Z^(Wy!2G^yd@q6`I_|}8q+a9Q9^EdzPI3)l8 diff --git a/python/libs/unicodedata.lib b/python/libs/unicodedata.lib deleted file mode 100644 index d6e6f64a751d5974bbf5e930207755acbdb28528..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1782 zcmcIl%}(1u5dLiQ(^yE23gTADNRencgd~n5kN}xKi3pRR5H7u#H0H+#NCZKmr(Sa8 z)_17H3vff?*lQ0QcmVFa0n9kN#5go0h_2<`nQzCQ`DSMAiMh&g^#%8fpc2`!nmP`4~aiUGPbisFsjdJVs84no9}^&j5!Yt^z+v!ZT0x}#|L^SfCbC4L`>Ck-X(?S4Pq zPi(bRV3mY(sfg7^d@1R3;Sw3SHAcc;y6*%)>4J^awXn+x7;zFb@+a*Ww_#kXw2mXj zDn3R?O=2`YOgO)j2V2F?K5h8bOvy<~NQ ioOf-?elu&CBC!Vld-%XQ3V+eq5r5MsPB?q6I0 diff --git a/python/libs/winsound.lib b/python/libs/winsound.lib deleted file mode 100644 index efa8af838b879719d4d92fc30c50367828852c4f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1732 zcmcIlPfrt35dZCNLAoKN5pPDbBqYkEw%x6QF{J!4v0-URSrTqb?W*j7wt*7y#KogG z?;QCMp17J24j%jfei58`eM7hWt)xz~^WMyx_hx=?W?rY>)OQ=(^Y#m;pYpEj<>uUC z-tE`tw3v5i^=!)qFaj7yfOSgK6fnBUUl^8G*Q&K3TzjUI-RwOT5!2){Hx1gMR6sQFuKR6gG|w;M4+AglBV9!GZx3 zDf(ID|2}x`j{0WA0yEqG5;3;Bvf|D4@c4#>pT}RT6NG7uun`&A=)?Q{Pt)sN5m=H zUp)=4S_;MdMGyOisjB6NijHHvzFH!+)MJTiaYf73ax8)#xmx~D6%3NuCltkv500Iz zltH?zFe|U%mMvZOn>=*$eEq%M(q%=tDy~NEvLq$C%o9D^{SrZs!@b`@?(`{n9$qba buXHIo{C~n7>KpueJy!U}F1_=~jKTg38>dN! diff --git a/renderer.cpp b/renderer.cpp index 809560cc..43c1f8ad 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -23,8 +23,8 @@ opengl_renderer::Init() { light.id = GL_LIGHT1 + idx; light.position[ 3 ] = 1.0f; - ::glLightf( light.id, GL_SPOT_CUTOFF, 20.0f ); - ::glLightf( light.id, GL_SPOT_EXPONENT, 10.0f ); + ::glLightf( light.id, GL_SPOT_CUTOFF, 7.5f ); + ::glLightf( light.id, GL_SPOT_EXPONENT, 7.5f ); ::glLightf( light.id, GL_CONSTANT_ATTENUATION, 0.0f ); ::glLightf( light.id, GL_LINEAR_ATTENUATION, 0.035f ); @@ -66,7 +66,7 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { renderlight->ambient[ 1 ] = scenelight.color.y * scenelight.intensity; renderlight->ambient[ 2 ] = scenelight.color.z * scenelight.intensity; - ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, 0.3f / std::pow( scenelight.count, 2 ) ); + ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, (0.25f * scenelight.count) / std::pow( scenelight.count, 2 ) ); ::glEnable( renderlight->id ); renderlight->apply_intensity(); diff --git a/renderer.h b/renderer.h index ed0c3ba5..dc613ac5 100644 --- a/renderer.h +++ b/renderer.h @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "opengl/glew.h" +#include "gl/glew.h" #include "texture.h" #include "lightarray.h" #include "dumb3d.h" diff --git a/skydome.cpp b/skydome.cpp index e57bd043..c5497639 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -1,6 +1,5 @@ #include "stdafx.h" -#include "opengl/glew.h" #include "skydome.h" #include "color.h" @@ -82,6 +81,8 @@ void CSkyDome::Generate() { int const latitudes = m_tesselation / 2; int const longitudes = m_tesselation; + std::uint16_t index = 0; + for( int i = 0; i < latitudes; ++i ) { float lat0 = M_PI * ( -0.5f + (float)( i ) / latitudes ); @@ -106,6 +107,21 @@ void CSkyDome::Generate() { 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; + } + else { + // indices for two triangles + m_indices.emplace_back( index - 2 ); + 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; + } } } } @@ -123,26 +139,35 @@ void CSkyDome::Update( Math3D::vector3 const &Sun ) { // render skydome to screen void CSkyDome::Render() { - int const latitudes = m_tesselation / 2; - int const longitudes = m_tesselation; - int idx = 0; + if( m_vertexbuffer == -1 ) { + // build the buffers + ::glGenBuffers( 1, &m_vertexbuffer ); + ::glBindBuffer( GL_ARRAY_BUFFER, m_vertexbuffer ); + ::glBufferData( GL_ARRAY_BUFFER, m_vertices.size() * sizeof( float3 ), m_vertices.data(), GL_STATIC_DRAW ); - for( int i = 0; i < latitudes; ++i ) { + ::glGenBuffers( 1, &m_coloursbuffer ); + ::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer ); + ::glBufferData( GL_ARRAY_BUFFER, m_colours.size() * sizeof( float3 ), m_colours.data(), GL_DYNAMIC_DRAW ); - ::glBegin( GL_QUAD_STRIP ); - for( int j = 0; j <= longitudes / 2; ++j ) { - - ::glColor3f( m_colours[ idx ].x, m_colours[ idx ].y, m_colours[ idx ].z ); -// ::glNormal3f( m_normals[ idx ].x, m_normals[ idx ].y, m_normals[ idx ].z ); - ::glVertex3f( m_vertices[ idx ].x, m_vertices[ idx ].y, m_vertices[ idx ].z ); - ++idx; - ::glColor3f( m_colours[ idx ].x, m_colours[ idx ].y, m_colours[ idx ].z ); -// ::glNormal3f( m_normals[ idx ].x, m_normals[ idx ].y, m_normals[ idx ].z ); - ::glVertex3f( m_vertices[ idx ].x, m_vertices[ idx ].y, m_vertices[ idx ].z ); - ++idx; - } - glEnd(); + ::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 ); } + // begin + ::glEnableClientState( GL_VERTEX_ARRAY ); + ::glEnableClientState( GL_COLOR_ARRAY ); + // positions + ::glBindBuffer( GL_ARRAY_BUFFER, m_vertexbuffer ); + ::glVertexPointer( 3, GL_FLOAT, sizeof( float3 ), reinterpret_cast( 0 ) ); + // colours + ::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer ); + ::glColorPointer( 3, GL_FLOAT, sizeof( float3 ), reinterpret_cast( 0 ) ); + // indices + ::glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_indexbuffer ); + ::glDrawElements( GL_TRIANGLES, static_cast( m_indices.size() ), GL_UNSIGNED_SHORT, reinterpret_cast( 0 ) ); + // cleanup + ::glDisableClientState( GL_COLOR_ARRAY ); + ::glDisableClientState( GL_VERTEX_ARRAY ); } //******************************************************************************// @@ -339,6 +364,13 @@ void CSkyDome::RebuildColors() { m_averagecolour.x = std::max( m_averagecolour.x, 0.0f ); m_averagecolour.y = std::max( m_averagecolour.y, 0.0f ); m_averagecolour.z = std::max( m_averagecolour.z, 0.0f ); + + if( m_coloursbuffer != -1 ) { + // the colour buffer was already initialized, so on this run we update its content + ::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer ); + ::glBufferSubData( GL_ARRAY_BUFFER, 0, m_colours.size() * sizeof( float3 ), m_colours.data() ); + } + } //******************************************************************************// diff --git a/skydome.h b/skydome.h index 0fcfb329..67347a59 100644 --- a/skydome.h +++ b/skydome.h @@ -42,8 +42,12 @@ private: // data int const m_tesselation; std::vector m_vertices; + std::vector m_indices; // std::vector m_normals; std::vector m_colours; + GLuint m_vertexbuffer{ -1 }; + GLuint m_indexbuffer{ -1 }; + GLuint m_coloursbuffer{ -1 }; static float m_distributionluminance[ 5 ][ 2 ]; static float m_distributionxcomp[ 5 ][ 2 ]; diff --git a/stdafx.h b/stdafx.h index d4c1225e..7acb8d8c 100644 --- a/stdafx.h +++ b/stdafx.h @@ -58,3 +58,11 @@ #include #include #include + +#include "GL/glew.h" +#ifdef _WINDOWS +#include "GL/wglew.h" +#define GLFW_DLL +#endif +#define GLFW_INCLUDE_GLU +#include \ No newline at end of file diff --git a/sun.h b/sun.h index c64543f1..bc275f3d 100644 --- a/sun.h +++ b/sun.h @@ -1,8 +1,8 @@ #pragma once #include "windows.h" -#include "opengl/glew.h" -#include "opengl/wglew.h" +#include "gl/glew.h" +#include "gl/wglew.h" #include "dumb3d.h" From ab9a8835d6f6639b7b77c768db12c8ec4c5e8f71 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 2 Mar 2017 17:16:29 +0100 Subject: [PATCH 037/426] skydome optimization, vsync .ini setting --- EU07.cpp | 2 +- Globals.cpp | 84 ++++++++++++++++++++--------------------------------- Globals.h | 1 + skydome.cpp | 56 +++++++++++++++++------------------ 4 files changed, 60 insertions(+), 83 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 56c0b148..6e673d1a 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -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 ); diff --git a/Globals.cpp b/Globals.cpp index e33296eb..2f1be79b 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -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 diff --git a/Globals.h b/Globals.h index b415c9dc..a9710c36 100644 --- a/Globals.h +++ b/Globals.h @@ -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; diff --git a/skydome.cpp b/skydome.cpp index c5497639..230a8466 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -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 ); From 22a5cc8dbc89a9199301ea140ef08ce8c8cbd8b9 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 2 Mar 2017 17:40:17 +0100 Subject: [PATCH 038/426] static linking for vs crt --- maszyna.vcxproj | 2 +- skydome.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/maszyna.vcxproj b/maszyna.vcxproj index dae5517e..5b62a56d 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -67,7 +67,7 @@ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreaded Level3 ProgramDatabase $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) diff --git a/skydome.cpp b/skydome.cpp index 230a8466..a4daabcc 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -353,10 +353,11 @@ void CSkyDome::RebuildColors() { // save m_colours[ i ] = color; - averagecolor += color; + averagecolor += color * 8.0f; // save for edge cases each vertex goes in 8 triangles } - - m_averagecolour = averagecolor / m_vertices.size(); + // NOTE: average reduced to 25% makes nice tint value for clouds lit from behind + // down the road we could interpolate between it and full strength average, to improve accuracy of cloud appearance + m_averagecolour = averagecolor / m_indices.size(); m_averagecolour.x = std::max( m_averagecolour.x, 0.0f ); m_averagecolour.y = std::max( m_averagecolour.y, 0.0f ); m_averagecolour.z = std::max( m_averagecolour.z, 0.0f ); From 0e3b414f8ff575661c358fa50c5c0ddc5c3224df Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 2 Mar 2017 19:17:22 +0100 Subject: [PATCH 039/426] low framerate cab movement fix --- Train.cpp | 14 ++++- opengl/ARB_Multisample.cpp | 120 ------------------------------------- opengl/ARB_Multisample.h | 25 -------- skydome.cpp | 1 - 4 files changed, 11 insertions(+), 149 deletions(-) delete mode 100644 opengl/ARB_Multisample.cpp delete mode 100644 opengl/ARB_Multisample.h diff --git a/Train.cpp b/Train.cpp index 7e69f63d..87bec48c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2616,9 +2616,17 @@ void TTrain::UpdateMechPosition(double dt) pMechPosition += DynamicObject->GetPosition(); // framerate-independent speed reduction that doesn't break at high framerates... - vMechMovement -= vMechMovement * 50.0 * dt; - if( vMechMovement.LengthSquared() < 0.01 ) { - vMechMovement = Math3D::vector3(); + Math3D::vector3 movementslowdown = vMechMovement * 35 * dt; + if( movementslowdown.LengthSquared() >= vMechMovement.LengthSquared() ) { + // if the reduction vector exceeds speed movement we're running at low fps, + // fallback on the old behaviour + vMechMovement *= 0.5; + } + else { + vMechMovement -= movementslowdown; + if( vMechMovement.LengthSquared() < 0.01 ) { + vMechMovement = Math3D::vector3(); + } } }; diff --git a/opengl/ARB_Multisample.cpp b/opengl/ARB_Multisample.cpp deleted file mode 100644 index f5b2e7eb..00000000 --- a/opengl/ARB_Multisample.cpp +++ /dev/null @@ -1,120 +0,0 @@ -/*======================================================================================== - - Name: ARB_multisample.cpp - Author: Colt "MainRoach" McAnlis - Date: 4/29/04 - Desc: This file contains the context to load a WGL extension from a string - As well as collect the sample format available based upon the graphics card. - -========================================================================================*/ - -#include "stdafx.h" -#include "arb_multisample.h" -#include "gl/glew.h" -#include "gl/wglew.h" - -// Declairations We'll Use -#define WGL_SAMPLE_BUFFERS_ARB 0x2041 -#define WGL_SAMPLES_ARB 0x2042 - -bool arbMultisampleSupported = false; -int arbMultisampleFormat = 0; - -// WGLisExtensionSupported: This Is A Form Of The Extension For WGL -bool WGLisExtensionSupported(const char *extension) -{ - const size_t extlen = strlen(extension); - const char *supported = NULL; - - // Try To Use wglGetExtensionStringARB On Current DC, If Possible - PROC wglGetExtString = wglGetProcAddress("wglGetExtensionsStringARB"); - - if (wglGetExtString) - supported = ((char*(__stdcall*)(HDC))wglGetExtString)(wglGetCurrentDC()); - - // If That Failed, Try Standard Opengl Extensions String - if (supported == NULL) - supported = (char*)glGetString(GL_EXTENSIONS); - - // If That Failed Too, Must Be No Extensions Supported - if (supported == NULL) - return false; - - // Begin Examination At Start Of String, Increment By 1 On False Match - for (const char* p = supported; ; p++) - { - // Advance p Up To The Next Possible Match - p = strstr(p, extension); - - if (p == NULL) - return false; // No Match - - // Make Sure That Match Is At The Start Of The String Or That - // The Previous Char Is A Space, Or Else We Could Accidentally - // Match "wglFunkywglExtension" With "wglExtension" - - // Also, Make Sure That The Following Character Is Space Or NULL - // Or Else "wglExtensionTwo" Might Match "wglExtension" - if ((p==supported || p[-1]==' ') && (p[extlen]=='\0' || p[extlen]==' ')) - return true; // Match - } -} - -int InitMultisample(HINSTANCE hInstance,HWND hWnd,PIXELFORMATDESCRIPTOR pfd,int mode) -{//used to query the multisample frequencies - arbMultisampleSupported=false; - //see if the string exists in WGL! - if (!WGLisExtensionSupported("WGL_ARB_multisample")) - return 0; - //get our pixel format - PFNWGLCHOOSEPIXELFORMATARBPROC wglChoosePixelFormatARB=(PFNWGLCHOOSEPIXELFORMATARBPROC)wglGetProcAddress("wglChoosePixelFormatARB"); - if (!wglChoosePixelFormatARB) - return 0; - //get our current device context - HDC hDC=GetDC(hWnd); - int pixelFormat; - int valid; - UINT numFormats; - float fAttributes[]={0,0}; - // These attributes are the bits we want to test for in our sample - // everything is pretty standard, the only one we want to - // really focus on is the SAMPLE BUFFERS ARB and WGL SAMPLES - // these two are going to do the main testing for whether or not - // we support multisampling on this hardware. - int iAttributes[]= - { - WGL_DRAW_TO_WINDOW_ARB,GL_TRUE, - WGL_SUPPORT_OPENGL_ARB,GL_TRUE, - WGL_ACCELERATION_ARB,WGL_FULL_ACCELERATION_ARB, - WGL_COLOR_BITS_ARB,24, - WGL_ALPHA_BITS_ARB,8, - WGL_DEPTH_BITS_ARB,16, - WGL_STENCIL_BITS_ARB,0, - WGL_DOUBLE_BUFFER_ARB,GL_TRUE, - WGL_SAMPLE_BUFFERS_ARB,GL_TRUE, - WGL_SAMPLES_ARB,mode, - 0,0 - }; -/* - //first we check to see if we can get a pixel format for 4 samples - valid=wglChoosePixelFormatARB(hDC,iAttributes,fAttributes,1,&pixelFormat,&numFormats); - if (valid&&(numFormats>=1)) - {//if we returned true, and our format count is greater than 1 - arbMultisampleSupported=true; - arbMultisampleFormat=pixelFormat; - return arbMultisampleSupported; - } -*/ - while (iAttributes[19]>1) - {//our pixel format with (mode) samples failed, test for less samples - valid=wglChoosePixelFormatARB(hDC,iAttributes,fAttributes,1,&pixelFormat,&numFormats); - if (valid&&(numFormats>=1)) - {//if we returned true, and our format count is greater than 1 - arbMultisampleSupported=true; - arbMultisampleFormat=pixelFormat; - return iAttributes[19]; //return number of samples - } - iAttributes[19]>>=1; - } - return 0; -} diff --git a/opengl/ARB_Multisample.h b/opengl/ARB_Multisample.h deleted file mode 100644 index a688e851..00000000 --- a/opengl/ARB_Multisample.h +++ /dev/null @@ -1,25 +0,0 @@ -/*==================================== - Name: ARB_multisample.h - Author: Colt "MainRoach" McAnlis - Date: 4/29/04 - Desc: - This file contains our external items - -====================================*/ - -#ifndef __ARB_MULTISAMPLE_H__ -#define __ARB_MULTISAMPLE_H__ - -#include - -//Globals -extern bool arbMultisampleSupported; -extern int arbMultisampleFormat; - -//If you don't want multisampling, set this to 0 -#define CHECK_FOR_MULTISAMPLE 1 - -//to check for our sampling -int InitMultisample(HINSTANCE hInstance,HWND hWnd,PIXELFORMATDESCRIPTOR pfd,int mode=4); - -#endif diff --git a/skydome.cpp b/skydome.cpp index a4daabcc..68a1f316 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -350,7 +350,6 @@ void CSkyDome::RebuildColors() { color.y = 0.65f * color.z; color = color * ( 1.15f - vertex.y ); // simple gradient, darkening towards the top } - // save m_colours[ i ] = color; averagecolor += color * 8.0f; // save for edge cases each vertex goes in 8 triangles From 97111f5ff3ca631f2089f3eb72237df19ad96fed Mon Sep 17 00:00:00 2001 From: VB Date: Fri, 3 Mar 2017 11:29:12 +0100 Subject: [PATCH 040/426] =?UTF-8?q?zapomnia=C5=82em=20o=20licencji?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sn_utils.cpp | 4 ++++ sn_utils.h | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sn_utils.cpp b/sn_utils.cpp index 31d3b025..f454fc3c 100644 --- a/sn_utils.cpp +++ b/sn_utils.cpp @@ -1,3 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public +* License, v. 2.0. If a copy of the MPL was not distributed with this +* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + #include "stdafx.h" #include "sn_utils.h" diff --git a/sn_utils.h b/sn_utils.h index 8ec68259..dd269121 100644 --- a/sn_utils.h +++ b/sn_utils.h @@ -1,3 +1,7 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public +* License, v. 2.0. If a copy of the MPL was not distributed with this +* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + #include class sn_utils From b95af30f3a57a4a60715e7035d1bb720e5ec686c Mon Sep 17 00:00:00 2001 From: VB Date: Fri, 3 Mar 2017 17:03:34 +0100 Subject: [PATCH 041/426] =?UTF-8?q?ups,=20ctrl=20w=C5=82=C4=85cza=C5=82=20?= =?UTF-8?q?radiostop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Globals.cpp | 4 +--- World.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index 879847b9..54095bcd 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -487,10 +487,8 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> token; -/* + Global::bUseVBO = (token == "yes"); -*/ - Global::bUseVBO = false; // temporarily disabled until render paths are sorted out } else if (token == "feedbackmode") { diff --git a/World.cpp b/World.cpp index 183068ea..83c67230 100644 --- a/World.cpp +++ b/World.cpp @@ -753,7 +753,7 @@ void TWorld::OnKeyDown(int cKey) // else if (cKey=='3') Global::iWriteLogEnabled^=4; //wypisywanie nazw torów } } - else if (Global::ctrlState && GLFW_KEY_PAUSE) //[Ctrl]+[Break] + else if (Global::ctrlState && cKey == GLFW_KEY_PAUSE) //[Ctrl]+[Break] { // hamowanie wszystkich pojazdów w okolicy if (Controlled->MoverParameters->Radio) Ground.RadioStop(Camera.Pos); From 84f54db12e3c99e13ec006d266131e63599d6c62 Mon Sep 17 00:00:00 2001 From: VB Date: Fri, 3 Mar 2017 22:29:37 +0100 Subject: [PATCH 042/426] screenshoty --- CMakeLists.txt | 7 ++++++- EU07.cpp | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 016bc89c..bd25b5ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,7 @@ set(SOURCES "skydome.cpp" "Sound.cpp" "Spring.cpp" +"shader.cpp" ) if (WIN32) @@ -99,4 +100,8 @@ target_link_libraries(${PROJECT_NAME} ${GLUT_LIBRARIES}) find_package(PythonLibs 2 REQUIRED) include_directories(${PYTHON_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES}) \ No newline at end of file +target_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES}) + +find_package(PNG REQUIRED) +include_directories(${PNG_INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARIES}) \ No newline at end of file diff --git a/EU07.cpp b/EU07.cpp index aca1353e..ff930ebb 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -18,6 +18,8 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others */ #include "stdafx.h" +#include +#include #include "Globals.h" #include "Logs.h" @@ -34,6 +36,45 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others TWorld World; +void screenshot_save_thread(char *img) +{ + png_image png; + memset(&png, 0, sizeof(png_image)); + png.version = PNG_IMAGE_VERSION; + png.width = Global::ScreenWidth; + png.height = Global::ScreenHeight; + png.format = PNG_FORMAT_RGB; + + char datetime[64]; + time_t timer; + struct tm* tm_info; + time(&timer); + tm_info = localtime(&timer); + strftime(datetime, 64, "%Y-%m-%d_%H-%M-%S", tm_info); + + uint64_t perf; + QueryPerformanceCounter((LARGE_INTEGER*)&perf); + + std::string filename = "screenshots/" + std::string(datetime) + + "_" + std::to_string(perf) + ".png"; + + if (png_image_write_to_file(&png, filename.c_str(), 0, img, -Global::ScreenWidth * 3, nullptr) == 1) + WriteLog("saved " + filename + "."); + else + WriteLog("failed to save screenshot."); + + delete[] img; +} + +void make_screenshot() +{ + char *img = new char[Global::ScreenWidth * Global::ScreenHeight * 3]; + glReadPixels(0, 0, Global::ScreenWidth, Global::ScreenHeight, GL_RGB, GL_UNSIGNED_BYTE, (GLvoid*)img); + + std::thread t(screenshot_save_thread, img); + t.detach(); +} + void window_resize_callback(GLFWwindow *window, int w, int h) { Global::ScreenWidth = w; @@ -68,6 +109,9 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo switch( key ) { + case GLFW_KEY_F11: + make_screenshot(); + break; case GLFW_KEY_ESCAPE: { //[Esc] pauzuje tylko bez Debugmode if( DebugModeFlag ) From 39b8fbfb86e8092223f13def6aa4d78bdfc91d7b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 4 Mar 2017 13:24:34 +0100 Subject: [PATCH 043/426] copydata communication fix, update loop tweaks --- EU07.cpp | 3 +- Ground.cpp | 24 ++++----- McZapkie/mctools.cpp | 4 +- Model3d.cpp | 3 +- World.cpp | 115 ++++++++++++++++++++++++++++--------------- World.h | 4 ++ maszyna.sln | 6 +-- maszyna.vcxproj | 2 +- 8 files changed, 97 insertions(+), 64 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 6e673d1a..11949bcf 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -27,6 +27,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "PyInt.h" #include "World.h" #include "Mover.h" +#include "usefull.h" #pragma comment( lib, "glfw3dll.lib" ) #pragma comment( lib, "glew32.lib" ) @@ -143,7 +144,7 @@ LRESULT APIENTRY WndProc( HWND hWnd, // handle for this window case WM_COPYDATA: { // obsługa danych przesłanych przez program sterujący pDane = (PCOPYDATASTRUCT)lParam; - if( pDane->dwData == 'EU07' ) // sygnatura danych + if( pDane->dwData == MAKE_ID4( 'E', 'U', '0', '7' ) ) // sygnatura danych World.OnCommandGet( (DaneRozkaz *)( pDane->lpData ) ); break; } diff --git a/Ground.cpp b/Ground.cpp index 3fc43f6e..5d88e9d6 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -5052,7 +5052,7 @@ void TGround::Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LP void TGround::WyslijEvent(const std::string &e, const std::string &d) { // Ra: jeszcze do wyczyszczenia DaneRozkaz r; - r.iSygn = 'EU07'; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = 2; // 2 - event int i = e.length(), j = d.length(); r.cString[0] = char(i); @@ -5060,7 +5060,7 @@ void TGround::WyslijEvent(const std::string &e, const std::string &d) r.cString[i + 2] = char(j); // licznik po zerze kończącym strcpy(r.cString + 3 + i, d.c_str()); // zakończony zerem COPYDATASTRUCT cData; - cData.dwData = 'EU07'; // sygnatura + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = 12 + i + j; // 8+dwa liczniki i dwa zera kończące cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); @@ -5070,14 +5070,14 @@ void TGround::WyslijEvent(const std::string &e, const std::string &d) void TGround::WyslijUszkodzenia(const std::string &t, char fl) { // wysłanie informacji w postaci pojedynczego tekstu DaneRozkaz r; - r.iSygn = 'EU07'; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = 13; // numer komunikatu int i = t.length(); r.cString[0] = char(fl); r.cString[1] = char(i); strcpy(r.cString + 2, t.c_str()); // z zerem kończącym COPYDATASTRUCT cData; - cData.dwData = 'EU07'; // sygnatura + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = 11 + i; // 8+licznik i zero kończące cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); @@ -5087,13 +5087,13 @@ void TGround::WyslijUszkodzenia(const std::string &t, char fl) void TGround::WyslijString(const std::string &t, int n) { // wysłanie informacji w postaci pojedynczego tekstu DaneRozkaz r; - r.iSygn = 'EU07'; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = n; // numer komunikatu int i = t.length(); r.cString[0] = char(i); strcpy(r.cString + 1, t.c_str()); // z zerem kończącym COPYDATASTRUCT cData; - cData.dwData = 'EU07'; // sygnatura + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = 10 + i; // 8+licznik i zero kończące cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); @@ -5109,7 +5109,7 @@ void TGround::WyslijNamiary(TGroundNode *t) { // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby // WriteLog("Wysylam pojazd"); DaneRozkaz r; - r.iSygn = 'EU07'; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = 7; // 7 - dane pojazdu int i = 32, j = t->asName.length(); r.iPar[0] = i; // ilość danych liczbowych @@ -5171,7 +5171,7 @@ void TGround::WyslijNamiary(TGroundNode *t) r.cString[i] = char(j); // na końcu nazwa, żeby jakoś zidentyfikować strcpy(r.cString + i + 1, t->asName.c_str()); // zakończony zerem COPYDATASTRUCT cData; - cData.dwData = 'EU07'; // sygnatura + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = 10 + i + j; // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); @@ -5183,7 +5183,7 @@ void TGround::WyslijNamiary(TGroundNode *t) void TGround::WyslijObsadzone() { // wysłanie informacji o pojeździe DaneRozkaz2 r; - r.iSygn = 'EU07'; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = 12; // kod 12 for (int i=0; i<1984; ++i) r.cString[i] = 0; @@ -5214,7 +5214,7 @@ void TGround::WyslijObsadzone() } COPYDATASTRUCT cData; - cData.dwData = 'EU07'; // sygnatura + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = 8 + 1984; // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); @@ -5226,7 +5226,7 @@ void TGround::WyslijObsadzone() void TGround::WyslijParam(int nr, int fl) { // wysłanie parametrów symulacji w ramce (nr) z flagami (fl) DaneRozkaz r; - r.iSygn = 'EU07'; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = nr; // zwykle 5 r.iPar[0] = fl; // flagi istotności kolejnych parametrów int i = 0; // domyślnie brak danych @@ -5239,7 +5239,7 @@ void TGround::WyslijParam(int nr, int fl) break; } COPYDATASTRUCT cData; - cData.dwData = 'EU07'; // sygnatura + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = 12 + i; // 12+rozmiar danych cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index 2c751394..f91f7b9d 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -75,10 +75,8 @@ std::string Now() { std::time_t timenow = std::time( nullptr ); std::tm tm = *std::localtime( &timenow ); std::stringstream converter; - std::string output; converter << std::put_time( &tm, "%c" ); - converter >> output; - return output; + return converter.str(); /* char buffer[ 256 ]; sprintf( buffer, diff --git a/Model3d.cpp b/Model3d.cpp index 994862b5..ef1b0704 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1812,8 +1812,7 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) // wczytanie modelu z pliku std::string name = ToLower(FileName); // trim extension if needed - if( ( name.rfind( '.' ) != std::string::npos ) - && ( name.substr( name.rfind( '.' ) ) == ".t3d" ) ) + if( name.rfind( '.' ) != std::string::npos ) { name.erase(name.rfind('.')); } diff --git a/World.cpp b/World.cpp index bd325e09..6d2bc9c4 100644 --- a/World.cpp +++ b/World.cpp @@ -1081,13 +1081,15 @@ bool TWorld::Update() Update_Environment(); } // koniec działań niewykonywanych podczas pauzy // poprzednie jakoś tam działało - double dt = Timer::GetDeltaRenderTime(); // nie uwzględnia pauzowania ani mnożenia czasu - fTime50Hz += - dt; // w pauzie też trzeba zliczać czas, bo przy dużym FPS będzie problem z odczytem ramek - if (fTime50Hz >= 0.2) - Console::Update(); // to i tak trzeba wywoływać - dt = Timer::GetDeltaTime(); // 0.0 gdy pauza + + // fixed step, simulation time based updates + double dt = Timer::GetDeltaTime(); // 0.0 gdy pauza +/* fTimeBuffer += dt; //[s] dodanie czasu od poprzedniej ramki +*/ + m_primaryupdateaccumulator += dt; + m_secondaryupdateaccumulator += dt; +/* if (fTimeBuffer >= fMaxDt) // jest co najmniej jeden krok; normalnie 0.01s { // Ra: czas dla fizyki jest skwantowany - fizykę lepiej przeliczać stałym krokiem // tak można np. moc silników itp., ale ruch musi być przeliczany w każdej klatce, bo @@ -1101,28 +1103,31 @@ bool TWorld::Update() if (n > 20) n = 20; // Ra: jeżeli FPS jest zatrważająco niski, to fizyka nie może zająć całkowicie procesora } - // awaria PoKeys mogła włączyć pauzę - przekazać informację - if (Global::iMultiplayer) // dajemy znać do serwera o wykonaniu - if (iPause != Global::iPause) - { // przesłanie informacji o pauzie do programu nadzorującego - Ground.WyslijParam(5, 3); // ramka 5 z czasem i stanem zapauzowania - iPause = Global::iPause; - } - double iter; - int n = 1; - if (dt > fMaxDt) // normalnie 0.01s - { - iter = ceil(dt / fMaxDt); - n = iter; - dt = dt / iter; // Ra: fizykę lepiej by było przeliczać ze stałym krokiem - if (n > 20) - n = 20; // McZapkie-081103: przesuniecie granicy FPS z 10 na 5 +*/ +/* + // NOTE: until we have no physics state interpolation during render, we need to rely on the old code + // doing fixed step calculations but flexible step render results in ugly mini jitter + // core routines (physics) + int updatecount = 0; + while( ( m_primaryupdateaccumulator >= m_primaryupdaterate ) + &&( updatecount < 20 ) ) { + // no more than 20 updates per single pass, to keep physics from hogging up all run time + Ground.Update( m_primaryupdaterate, 1 ); + ++updatecount; + m_primaryupdateaccumulator -= m_primaryupdaterate; } - // else n=1; - // blablabla - // Ground.UpdatePhys(dt,n); //na razie tu //2014-12: yB przeniósł do Ground.Update() :( - Ground.Update(dt, n); // tu zrobić tylko coklatkową aktualizację przesunięć - +*/ + int updatecount = 1; + if( dt > m_primaryupdaterate ) // normalnie 0.01s + { + auto const iterations = std::ceil(dt / m_primaryupdaterate); + updatecount = std::min( 20, static_cast( iterations ) ); + dt = dt / iterations; // Ra: fizykę lepiej by było przeliczać ze stałym krokiem + } + // NOTE: updates are limited to 20, but dt is distributed over potentially many more iterations + // this means at count > 20 simulation and render are going to desync. is that right? + Ground.Update(dt, updatecount); // tu zrobić tylko coklatkową aktualizację przesunięć +/* if (DebugModeFlag) if (Global::bActive) // nie przyspieszać, gdy jedzie w tle :) if( Console::Pressed( GLFW_KEY_ESCAPE ) ) { @@ -1132,15 +1137,25 @@ bool TWorld::Update() Ground.Update(dt, n); Ground.Update(dt, n); // 5 razy } +*/ + // secondary fixed step simulation time routines + while( m_secondaryupdateaccumulator >= m_secondaryupdaterate ) { - dt = Timer::GetDeltaTime(); // czas niekwantowany + Global::tranTexts.Update(); // obiekt obsługujący stenogramy dźwięków na ekranie - Update_Camera( dt ); + // awaria PoKeys mogła włączyć pauzę - przekazać informację + if( Global::iMultiplayer ) // dajemy znać do serwera o wykonaniu + if( iPause != Global::iPause ) { // przesłanie informacji o pauzie do programu nadzorującego + Ground.WyslijParam( 5, 3 ); // ramka 5 z czasem i stanem zapauzowania + iPause = Global::iPause; + } - Ground.CheckQuery(); + // TODO: add fixed step part of the camera update here - Ground.Update_Lights(); + m_secondaryupdateaccumulator -= m_secondaryupdaterate; // these should be inexpensive enough we have no cap + } + // variable step simulation time routines if( Train != nullptr ) { TSubModel::iInstance = reinterpret_cast( Train->Dynamic() ); Train->Update( dt ); @@ -1149,6 +1164,23 @@ bool TWorld::Update() TSubModel::iInstance = 0; } + Ground.CheckQuery(); + + Ground.Update_Lights(); + + // render time routines follow: + dt = Timer::GetDeltaRenderTime(); // nie uwzględnia pauzowania ani mnożenia czasu + + // fixed step render time routines + fTime50Hz += dt; // w pauzie też trzeba zliczać czas, bo przy dużym FPS będzie problem z odczytem ramek + if( fTime50Hz >= 0.2 ) { + Console::Update(); // to i tak trzeba wywoływać + fTime50Hz -= 0.2; + } + + // variable step render time routines + Update_Camera( dt ); // TODO: move the fixed step cab camera updates to fixed step secondary routines section + // przy 0.25 smuga gaśnie o 6:37 w Quarku, a mogłaby już 5:40 // Ra 2014-12: przy 0.15 się skarżyli, że nie widać smug => zmieniłem na 0.25 // changed light activation threshold to 0.5, paired with strength reduction in daylight @@ -1164,6 +1196,7 @@ bool TWorld::Update() m_init = true; + // visualize state changes if (!Render()) return false; @@ -2578,7 +2611,7 @@ TWorld::Render_UI() { //--------------------------------------------------------------------------- void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) { // odebranie komunikatu z serwera - if (pRozkaz->iSygn == 'EU07') + if (pRozkaz->iSygn == MAKE_ID4('E','U','0','7') ) switch (pRozkaz->iComm) { case 0: // odesłanie identyfikatora wersji @@ -2609,7 +2642,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) int i = int(pRozkaz->cString[8]); // długość pierwszego łańcucha (z przodu dwa floaty) CommLog( - to_string(BorlandTime()) + " " + to_string(pRozkaz->iComm) + " " + + Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 11 + i, (unsigned)(pRozkaz->cString[10 + i])) + " rcvd"); TGroundNode *t = Ground.DynamicFind( @@ -2627,7 +2660,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) break; case 4: // badanie zajętości toru { - CommLog(to_string(BorlandTime()) + " " + to_string(pRozkaz->iComm) + " " + + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); TGroundNode *t = Ground.FindGroundNode( std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])), TP_TRACK); @@ -2638,7 +2671,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) break; case 5: // ustawienie parametrów { - CommLog(to_string(BorlandTime()) + " " + to_string(pRozkaz->iComm) + " params " + + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " params " + to_string(*pRozkaz->iPar) + " rcvd"); if (*pRozkaz->iPar == 0) // sprawdzenie czasu if (*pRozkaz->iPar & 1) // ustawienie czasu @@ -2663,7 +2696,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) case 6: // pobranie parametrów ruchu pojazdu if (Global::iMultiplayer) { // Ra 2014-12: to ma działać również dla pojazdów bez obsady - CommLog(to_string(BorlandTime()) + " " + to_string(pRozkaz->iComm) + " " + + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); if (pRozkaz->cString[0]) // jeśli długość nazwy jest niezerowa @@ -2686,15 +2719,15 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) } break; case 8: // ponowne wysłanie informacji o zajętych odcinkach toru - CommLog(to_string(BorlandTime()) + " " + to_string(pRozkaz->iComm) + " all busy track" + " rcvd"); + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " all busy track" + " rcvd"); Ground.TrackBusyList(); break; case 9: // ponowne wysłanie informacji o zajętych odcinkach izolowanych - CommLog(to_string(BorlandTime()) + " " + to_string(pRozkaz->iComm) + " all busy isolated" + " rcvd"); + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " all busy isolated" + " rcvd"); Ground.IsolatedBusyList(); break; case 10: // badanie zajętości jednego odcinka izolowanego - CommLog(to_string(BorlandTime()) + " " + to_string(pRozkaz->iComm) + " " + + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); Ground.IsolatedBusy(std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0]))); break; @@ -2702,14 +2735,14 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) // Ground.IsolatedBusy(AnsiString(pRozkaz->cString+1,(unsigned)(pRozkaz->cString[0]))); break; case 12: // skrocona ramka parametrow pojazdow AI (wszystkich!!) - CommLog(to_string(BorlandTime()) + " " + to_string(pRozkaz->iComm) + " obsadzone" + " rcvd"); + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " obsadzone" + " rcvd"); Ground.WyslijObsadzone(); // Ground.IsolatedBusy(AnsiString(pRozkaz->cString+1,(unsigned)(pRozkaz->cString[0]))); break; case 13: // ramka uszkodzenia i innych stanow pojazdu, np. wylaczenie CA, wlaczenie recznego itd. // WriteLog("Przyszlo 13!"); // WriteLog(pRozkaz->cString); - CommLog(to_string(BorlandTime()) + " " + to_string(pRozkaz->iComm) + " " + + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); if (pRozkaz->cString[1]) // jeśli długość nazwy jest niezerowa diff --git a/World.h b/World.h index bdc394b9..5def8d8a 100644 --- a/World.h +++ b/World.h @@ -79,6 +79,10 @@ class TWorld double fTime50Hz; // bufor czasu dla komunikacji z PoKeys double fTimeBuffer; // bufor czasu aktualizacji dla stałego kroku fizyki double fMaxDt; //[s] krok czasowy fizyki (0.01 dla normalnych warunków) + double m_primaryupdaterate{ 1.0 / 100.0 }; + double m_primaryupdateaccumulator{ 0.0 }; // keeps track of elapsed simulation time, for core fixed step routines + double m_secondaryupdaterate{ 1.0 / 50.0 }; + double m_secondaryupdateaccumulator{ 0.0 }; // keeps track of elapsed simulation time, for less important fixed step routines int iPause; // wykrywanie zmian w zapauzowaniu double VelPrev; // poprzednia prędkość int tprev; // poprzedni czas diff --git a/maszyna.sln b/maszyna.sln index 113432a9..4e726218 100644 --- a/maszyna.sln +++ b/maszyna.sln @@ -1,4 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 + +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 @@ -18,7 +19,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(Performance) = preSolution - HasPerformanceSessions = true - EndGlobalSection EndGlobal diff --git a/maszyna.vcxproj b/maszyna.vcxproj index 5b62a56d..dae5517e 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -67,7 +67,7 @@ WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL Level3 ProgramDatabase $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) From d920644af88bffe6a1481f3741452ffb5087e419 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 5 Mar 2017 16:11:23 +0100 Subject: [PATCH 044/426] framerate-independent cab camera shake, minor bug fixes --- Driver.cpp | 4 +- EU07.cpp | 7 ++- Ground.cpp | 9 ++- Train.cpp | 151 ++++++++++++++++++++++------------------------ Train.h | 1 + World.cpp | 172 +++++++++++++++++++++++++---------------------------- 6 files changed, 168 insertions(+), 176 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index bd5bede7..09b6c79a 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2441,8 +2441,8 @@ bool TController::IncSpeed() if (tsGuardSignal->GetStatus() & DSBSTATUS_PLAYING) // jeśli gada, to nie jedziemy return false; bool OK = true; - if ((iDrivigFlags & moveDoorOpened) - &&(mvOccupied->Vel > 0.1)) // added velocity threshold to prevent door shuffle on stop + if ( ( iDrivigFlags & moveDoorOpened ) + && ( VelDesired > 0.0 ) ) // to prevent door shuffle on stop Doors(false); // zamykanie drzwi - tutaj wykonuje tylko AI (zmienia fActionTime) if (fActionTime < 0.0) // gdy jest nakaz poczekać z jazdą, to nie ruszać return false; diff --git a/EU07.cpp b/EU07.cpp index 11949bcf..6c8da4f2 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -81,9 +81,12 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo switch( key ) { case GLFW_KEY_ESCAPE: { - //[Esc] pauzuje tylko bez Debugmode - if( DebugModeFlag ) + + if( ( DebugModeFlag ) //[Esc] pauzuje tylko bez Debugmode + && ( Global::iPause == 0 ) ) { // but unpausing should work always + break; + } if( Global::iPause & 1 ) // jeśli pauza startowa Global::iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować diff --git a/Ground.cpp b/Ground.cpp index 5d88e9d6..bd345169 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1977,7 +1977,8 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) if( tmp->DynamicObject->MoverParameters->LightPowerSource.SourceType != TPowerSource::NotDefined ) { // if the vehicle has defined light source, it can (potentially) emit light, so add it to the light array */ - if( tmp->DynamicObject->MoverParameters->SecuritySystem.SystemType != 0 ) { + if( ( tmp != nullptr ) + && ( tmp->DynamicObject->MoverParameters->SecuritySystem.SystemType != 0 ) ) { // we check for presence of security system, as a way to determine whether the vehicle is a controllable engine // NOTE: this isn't 100% precise, e.g. middle EZT module comes with security system, while it has no lights m_lights.insert( tmp->DynamicObject ); @@ -4009,6 +4010,7 @@ bool TGround::EventConditon(TEvent *e) { // sprawdzenie spelnienia warunków dla eventu if (e->iFlags <= update_only) return true; // bezwarunkowo + if (e->iFlags & conditional_trackoccupied) return (!e->Params[9].asTrack->IsEmpty()); else if (e->iFlags & conditional_trackfree) @@ -4022,6 +4024,11 @@ bool TGround::EventConditon(TEvent *e) } else if (e->iFlags & conditional_memcompare) { // porównanie wartości + if( nullptr == e->Params[9].asMemCell ) { + + ErrorLog( "Event " + e->asName + " trying conditional_memcompare with nonexistent memcell" ); + return true; // though this is technically error, we report success to maintain backward compatibility + } if (tmpEvent->Params[9].asMemCell->Compare(e->Params[10].asText, e->Params[11].asdouble, e->Params[12].asdouble, e->iFlags)) { //logowanie spełnionych warunków diff --git a/Train.cpp b/Train.cpp index 87bec48c..9c48f5ae 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2384,7 +2384,7 @@ if { // McZapkie: poruszanie sie po kabinie, w updatemechpos zawarte sa wiezy - auto step = 1.5f; + auto step = 1.0f; auto const camerayaw = Global::pCamera->Yaw; Math3D::vector3 direction( 0.0f, 0.0f, step ); direction.RotateY( camerayaw ); @@ -2501,6 +2501,7 @@ void TTrain::OnKeyUp(int cKey) } }; +// cab movement update, fixed step part void TTrain::UpdateMechPosition(double dt) { // Ra: mechanik powinien być // telepany niezależnie od pozycji @@ -2514,123 +2515,111 @@ void TTrain::UpdateMechPosition(double dt) // - na postoju horyzont prosto, kabina skosem // - przy szybkiej jeździe kabina prosto, horyzont pochylony - vector3 pNewMechPosition; Math3D::vector3 shake; // McZapkie: najpierw policzę pozycję w/m kabiny // ABu: rzucamy kabina tylko przy duzym FPS! // Mala histereza, zeby bez przerwy nie przelaczalo przy FPS~17 // Granice mozna ustalic doswiadczalnie. Ja proponuje 14:20 - double const iVel = std::min(DynamicObject->GetVelocity(), 150.0); + double const iVel = std::min( DynamicObject->GetVelocity(), 150.0 ); - if (!Global::iSlowMotion // musi być pełna prędkość - && (pMechOffset.y < 4.0)) // Ra 15-01: przy oglądaniu pantografu bujanie przeszkadza + if( !Global::iSlowMotion // musi być pełna prędkość + && ( pMechOffset.y < 4.0 ) ) // Ra 15-01: przy oglądaniu pantografu bujanie przeszkadza { - if( iVel > 0.0 ) { + if( iVel > 0.5 ) { // acceleration-driven base shake shake += 1.25 * MechSpring.ComputateForces( vector3( - -mvControlled->AccN * dt * 5.0, // highlight side sway - mvControlled->AccV * dt, - -mvControlled->AccS * dt * 1.25 ), // accent acceleration/deceleration + -mvControlled->AccN * dt * 5.0, // highlight side sway + mvControlled->AccV * dt, + -mvControlled->AccS * dt * 1.25 ), // accent acceleration/deceleration pMechShake ); if( Random( iVel ) > 25.0 ) { // extra shake at increased velocity shake += MechSpring.ComputateForces( vector3( - ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringX, - ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringY, - ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringZ ), + ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringX, + ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringY, + ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringZ ) + * 1.25, pMechShake ); -// * (( 200 - DynamicObject->MyTrack->iQualityFlag ) * 0.0075 ); // scale to 75-150% based on track quality + // * (( 200 - DynamicObject->MyTrack->iQualityFlag ) * 0.0075 ); // scale to 75-150% based on track quality } -// shake *= 1.25; +// shake *= 0.85; } - vMechVelocity -= (shake + vMechVelocity * 100) * (fMechSpringX + fMechSpringY + fMechSpringZ) / (200); -// vMechVelocity -= vMechVelocity * iVel * dt; -// shake *= 0.95 * dt; // shake damping + vMechVelocity -= ( shake + vMechVelocity * 100 ) * ( fMechSpringX + fMechSpringY + fMechSpringZ ) / ( 200 ); + // shake *= 0.95 * dt; // shake damping // McZapkie: pMechShake += vMechVelocity * dt; // Ra 2015-01: dotychczasowe rzucanie pMechOffset += vMechMovement * dt; - if ((pMechShake.y > fMechMaxSpring) || (pMechShake.y < -fMechMaxSpring)) + if( ( pMechShake.y > fMechMaxSpring ) || ( pMechShake.y < -fMechMaxSpring ) ) vMechVelocity.y = -vMechVelocity.y; // ABu011104: 5*pMechShake.y, zeby ladnie pudlem rzucalo :) - pNewMechPosition = pMechOffset + vector3(1.5 * pMechShake.x, 2.0 * pMechShake.y, 1.5 * pMechShake.z); -// vMechMovement = 0.5 * vMechMovement; + pMechPosition = pMechOffset + vector3( 1.5 * pMechShake.x, 2.0 * pMechShake.y, 1.5 * pMechShake.z ); + vMechMovement = 0.5 * vMechMovement; } - else - { // hamowanie rzucania przy spadku FPS - pMechShake -= pMechShake * std::min(dt, 1.0); // po tym chyba potrafią zostać jakieś ułamki, które powodują zjazd + else { // hamowanie rzucania przy spadku FPS + pMechShake -= pMechShake * std::min( dt, 1.0 ); // po tym chyba potrafią zostać jakieś ułamki, które powodują zjazd pMechOffset += vMechMovement * dt; - vMechVelocity.y -= vMechVelocity.y * 50.0 * dt; - pNewMechPosition = pMechOffset + vector3(pMechShake.x, 5 * pMechShake.y, pMechShake.z); -// vMechMovement = 0.5 * vMechMovement; + vMechVelocity.y = 0.5 * vMechVelocity.y; + pMechPosition = pMechOffset + vector3( pMechShake.x, 5 * pMechShake.y, pMechShake.z ); + vMechMovement = 0.5 * vMechMovement; } // numer kabiny (-1: kabina B) - if (DynamicObject->Mechanik) // może nie być? - if (DynamicObject->Mechanik->AIControllFlag) // jeśli prowadzi AI + if( DynamicObject->Mechanik ) // może nie być? + if( DynamicObject->Mechanik->AIControllFlag ) // jeśli prowadzi AI { // Ra: przesiadka, jeśli AI zmieniło kabinę (a człon?)... - if (iCabn != (DynamicObject->MoverParameters->ActiveCab == -1 ? - 2 : - DynamicObject->MoverParameters->ActiveCab)) - InitializeCab(DynamicObject->MoverParameters->ActiveCab, - DynamicObject->asBaseDir + DynamicObject->MoverParameters->TypeName + - ".mmd"); + if( iCabn != ( DynamicObject->MoverParameters->ActiveCab == -1 ? + 2 : + DynamicObject->MoverParameters->ActiveCab ) ) + InitializeCab( DynamicObject->MoverParameters->ActiveCab, + DynamicObject->asBaseDir + DynamicObject->MoverParameters->TypeName + + ".mmd" ); } - iCabn = (DynamicObject->MoverParameters->ActiveCab == -1 ? - 2 : - DynamicObject->MoverParameters->ActiveCab); - if (!DebugModeFlag) - { // sprawdzaj więzy //Ra: nie tu! - if (pNewMechPosition.x < Cabine[iCabn].CabPos1.x) - pNewMechPosition.x = Cabine[iCabn].CabPos1.x; - if (pNewMechPosition.x > Cabine[iCabn].CabPos2.x) - pNewMechPosition.x = Cabine[iCabn].CabPos2.x; - if (pNewMechPosition.z < Cabine[iCabn].CabPos1.z) - pNewMechPosition.z = Cabine[iCabn].CabPos1.z; - if (pNewMechPosition.z > Cabine[iCabn].CabPos2.z) - pNewMechPosition.z = Cabine[iCabn].CabPos2.z; - if (pNewMechPosition.y > Cabine[iCabn].CabPos1.y + 1.8) - pNewMechPosition.y = Cabine[iCabn].CabPos1.y + 1.8; - if (pNewMechPosition.y < Cabine[iCabn].CabPos1.y + 0.5) - pNewMechPosition.y = Cabine[iCabn].CabPos2.y + 0.5; + iCabn = ( DynamicObject->MoverParameters->ActiveCab == -1 ? + 2 : + DynamicObject->MoverParameters->ActiveCab ); + if( !DebugModeFlag ) { // sprawdzaj więzy //Ra: nie tu! + if( pMechPosition.x < Cabine[ iCabn ].CabPos1.x ) + pMechPosition.x = Cabine[ iCabn ].CabPos1.x; + if( pMechPosition.x > Cabine[ iCabn ].CabPos2.x ) + pMechPosition.x = Cabine[ iCabn ].CabPos2.x; + if( pMechPosition.z < Cabine[ iCabn ].CabPos1.z ) + pMechPosition.z = Cabine[ iCabn ].CabPos1.z; + if( pMechPosition.z > Cabine[ iCabn ].CabPos2.z ) + pMechPosition.z = Cabine[ iCabn ].CabPos2.z; + if( pMechPosition.y > Cabine[ iCabn ].CabPos1.y + 1.8 ) + pMechPosition.y = Cabine[ iCabn ].CabPos1.y + 1.8; + if( pMechPosition.y < Cabine[ iCabn ].CabPos1.y + 0.5 ) + pMechPosition.y = Cabine[ iCabn ].CabPos2.y + 0.5; - if (pMechOffset.x < Cabine[iCabn].CabPos1.x) - pMechOffset.x = Cabine[iCabn].CabPos1.x; - if (pMechOffset.x > Cabine[iCabn].CabPos2.x) - pMechOffset.x = Cabine[iCabn].CabPos2.x; - if (pMechOffset.z < Cabine[iCabn].CabPos1.z) - pMechOffset.z = Cabine[iCabn].CabPos1.z; - if (pMechOffset.z > Cabine[iCabn].CabPos2.z) - pMechOffset.z = Cabine[iCabn].CabPos2.z; - if (pMechOffset.y > Cabine[iCabn].CabPos1.y + 1.8) - pMechOffset.y = Cabine[iCabn].CabPos1.y + 1.8; - if (pMechOffset.y < Cabine[iCabn].CabPos1.y + 0.5) - pMechOffset.y = Cabine[iCabn].CabPos2.y + 0.5; + if( pMechOffset.x < Cabine[ iCabn ].CabPos1.x ) + pMechOffset.x = Cabine[ iCabn ].CabPos1.x; + if( pMechOffset.x > Cabine[ iCabn ].CabPos2.x ) + pMechOffset.x = Cabine[ iCabn ].CabPos2.x; + if( pMechOffset.z < Cabine[ iCabn ].CabPos1.z ) + pMechOffset.z = Cabine[ iCabn ].CabPos1.z; + if( pMechOffset.z > Cabine[ iCabn ].CabPos2.z ) + pMechOffset.z = Cabine[ iCabn ].CabPos2.z; + if( pMechOffset.y > Cabine[ iCabn ].CabPos1.y + 1.8 ) + pMechOffset.y = Cabine[ iCabn ].CabPos1.y + 1.8; + if( pMechOffset.y < Cabine[ iCabn ].CabPos1.y + 0.5 ) + pMechOffset.y = Cabine[ iCabn ].CabPos2.y + 0.5; } - pMechPosition = DynamicObject->mMatrix * - pNewMechPosition; // położenie względem środka pojazdu w układzie scenerii - pMechPosition += DynamicObject->GetPosition(); - - // framerate-independent speed reduction that doesn't break at high framerates... - Math3D::vector3 movementslowdown = vMechMovement * 35 * dt; - if( movementslowdown.LengthSquared() >= vMechMovement.LengthSquared() ) { - // if the reduction vector exceeds speed movement we're running at low fps, - // fallback on the old behaviour - vMechMovement *= 0.5; - } - else { - vMechMovement -= movementslowdown; - if( vMechMovement.LengthSquared() < 0.01 ) { - vMechMovement = Math3D::vector3(); - } - } - }; +// returns position of the mechanic in the scene coordinates +vector3 +TTrain::GetWorldMechPosition() { + + vector3 position = DynamicObject->mMatrix *pMechPosition; // położenie względem środka pojazdu w układzie scenerii + position += DynamicObject->GetPosition(); + return position; +} + bool TTrain::Update( double const Deltatime ) { DWORD stat; diff --git a/Train.h b/Train.h index 2ca7ac82..75252156 100644 --- a/Train.h +++ b/Train.h @@ -94,6 +94,7 @@ class TTrain return DynamicObject->VectorUp(); }; void UpdateMechPosition(double dt); + vector3 GetWorldMechPosition(); bool Update( double const Deltatime ); bool m_updated = false; void MechStop(); diff --git a/World.cpp b/World.cpp index 6d2bc9c4..a3567f5d 100644 --- a/World.cpp +++ b/World.cpp @@ -359,8 +359,6 @@ bool TWorld::Init( GLFWwindow *w ) { WriteLog("Display Lists font used."); //+AnsiString(glGetError()) WriteLog("Font init OK"); //+AnsiString(glGetError()) - Timer::ResetTimers(); - glColor4f(1.0f, 3.0f, 3.0f, 0.0f); // SwapBuffers(hDC); // Swap Buffers (Double Buffering) // glClear(GL_COLOR_BUFFER_BIT); @@ -552,7 +550,6 @@ bool TWorld::Init( GLFWwindow *w ) { else light = GfxRenderer.GetTextureId( "smuga2.tga", szTexturePath ); // Camera.Reset(); - Timer::ResetTimers(); WriteLog( "Load time: " + std::to_string( std::chrono::duration_cast(( std::chrono::system_clock::now() - timestart )).count() ) + " seconds"); @@ -560,6 +557,9 @@ bool TWorld::Init( GLFWwindow *w ) { if (Train) if (Train->Dynamic()->Mechanik) Train->Dynamic()->Mechanik->TakeControl(true); + + Timer::ResetTimers(); + return true; }; @@ -719,7 +719,7 @@ void TWorld::OnKeyDown(int cKey) } if( Global::iTextMode == GLFW_KEY_F10 ) // wyświetlone napisy klawiszem F10 { // i potwierdzenie - if( cKey == 'Y' ) { + if( cKey == GLFW_KEY_Y ) { // flaga wyjścia z programu ::PostQuitMessage( 0 ); // Global::iTextMode = -1; @@ -730,9 +730,9 @@ void TWorld::OnKeyDown(int cKey) { // tryb konfiguracji debugmode (przestawianie kamery już wyłączone if (!Global::shiftState) // bez [Shift] { - if (cKey == '1') + if (cKey == GLFW_KEY_1) Global::iWriteLogEnabled ^= 1; // włącz/wyłącz logowanie do pliku - else if (cKey == '2') + else if (cKey == GLFW_KEY_2) { // włącz/wyłącz okno konsoli Global::iWriteLogEnabled ^= 2; if ((Global::iWriteLogEnabled & 2) == 0) // nie było okienka @@ -745,7 +745,7 @@ void TWorld::OnKeyDown(int cKey) // else if (cKey=='3') Global::iWriteLogEnabled^=4; //wypisywanie nazw torów } } - else if (cKey == 3) //[Ctrl]+[Break] + else if( cKey == GLFW_KEY_3 ) //[Ctrl]+[Break] { // hamowanie wszystkich pojazdów w okolicy if (Controlled->MoverParameters->Radio) Ground.RadioStop(Camera.Pos); @@ -753,7 +753,7 @@ void TWorld::OnKeyDown(int cKey) else if (!Global::iPause) //||(cKey==VK_F4)) //podczas pauzy sterownaie nie działa, F4 tak if (Train) if (Controlled) - if ((Controlled->Controller == Humandriver) ? true : DebugModeFlag || (cKey == 'Q')) + if ((Controlled->Controller == Humandriver) ? true : DebugModeFlag || (cKey == GLFW_KEY_Q)) Train->OnKeyDown(cKey); // przekazanie klawisza do kabiny if (FreeFlyModeFlag) // aby nie odluźniało wagonu za lokomotywą { // operacje wykonywane na dowolnym pojeździe, przeniesione tu z kabiny @@ -971,25 +971,19 @@ void TWorld::FollowView(bool wycisz) } else if (Train) { // korekcja ustawienia w kabinie - OK - vector3 camStara = - Camera.Pos; // przestawianie kamery jest bez sensu: do przerobienia na potem + vector3 camStara = Camera.Pos; // przestawianie kamery jest bez sensu: do przerobienia na potem // Ra: czy to tu jest potrzebne, bo przelicza się kawałek dalej? Camera.Pos = Train->pMechPosition; // Train.GetPosition1(); - Camera.Roll = atan(Train->pMechShake.x * Train->fMechRoll); // hustanie kamery na boki - Camera.Pitch -= - atan(Train->vMechVelocity.z * Train->fMechPitch); // hustanie kamery przod tyl + Camera.Roll = std::atan(Train->pMechShake.x * Train->fMechRoll); // hustanie kamery na boki + Camera.Pitch -= 0.5 * std::atan(Train->vMechVelocity.z * Train->fMechPitch); // hustanie kamery przod tyl if (Train->Dynamic()->MoverParameters->ActiveCab == 0) - Camera.LookAt = Train->pMechPosition + Train->GetDirection(); + Camera.LookAt = Train->pMechPosition + Train->GetDirection() * 5.0; else // patrz w strone wlasciwej kabiny - Camera.LookAt = - Train->pMechPosition + - Train->GetDirection() * Train->Dynamic()->MoverParameters->ActiveCab; + Camera.LookAt = Train->pMechPosition + Train->GetDirection() * 5.0 * Train->Dynamic()->MoverParameters->ActiveCab; Train->pMechOffset.x = Train->pMechSittingPosition.x; Train->pMechOffset.y = Train->pMechSittingPosition.y; Train->pMechOffset.z = Train->pMechSittingPosition.z; - Global::SetCameraPosition( - Train->Dynamic() - ->GetPosition()); // tu ustawić nową, bo od niej liczą się odległości + Global::SetCameraPosition( Train->Dynamic() ->GetPosition()); // tu ustawić nową, bo od niej liczą się odległości if (wycisz) // trzymanie prawego w kabinie daje marny efekt Ground.Silence(camStara); // wyciszenie dźwięków z poprzedniej pozycji } @@ -1105,8 +1099,8 @@ bool TWorld::Update() } */ /* - // NOTE: until we have no physics state interpolation during render, we need to rely on the old code - // doing fixed step calculations but flexible step render results in ugly mini jitter + // NOTE: until we have no physics state interpolation during render, we need to rely on the old code, + // as doing fixed step calculations but flexible step render results in ugly mini jitter // core routines (physics) int updatecount = 0; while( ( m_primaryupdateaccumulator >= m_primaryupdaterate ) @@ -1150,7 +1144,12 @@ bool TWorld::Update() iPause = Global::iPause; } - // TODO: add fixed step part of the camera update here + // fixed step part of the camera update + if( (Train != nullptr) + && (Camera.Type == tp_Follow )) { + // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery + Train->UpdateMechPosition( m_secondaryupdaterate / Global::fTimeSpeed ); // ograniczyć telepanie po przyspieszeniu + } m_secondaryupdateaccumulator -= m_secondaryupdaterate; // these should be inexpensive enough we have no cap } @@ -1173,9 +1172,9 @@ bool TWorld::Update() // fixed step render time routines fTime50Hz += dt; // w pauzie też trzeba zliczać czas, bo przy dużym FPS będzie problem z odczytem ramek - if( fTime50Hz >= 0.2 ) { + while( fTime50Hz >= 1.0 / 50.0 ) { Console::Update(); // to i tak trzeba wywoływać - fTime50Hz -= 0.2; + fTime50Hz -= 1.0 / 50.0; } // variable step render time routines @@ -1253,77 +1252,70 @@ TWorld::Update_Camera( double const Deltatime ) { } */ Camera.Update(); // uwzględnienie ruchu wywołanego klawiszami - +/* if( Camera.Type == tp_Follow ) { if( Train ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery Train->UpdateMechPosition( Deltatime / Global::fTimeSpeed ); // ograniczyć telepanie po przyspieszeniu - vector3 tempangle; - double modelrotate; - tempangle = - Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); - modelrotate = atan2( -tempangle.x, tempangle.z ); - if( Global::ctrlState ? ( Console::Pressed( Global::Keys[ k_MechLeft ] ) || - Console::Pressed( Global::Keys[ k_MechRight ] ) ) : - false ) { // jeśli lusterko lewe albo prawe (bez rzucania na razie) - bool lr = Console::Pressed( Global::Keys[ k_MechLeft ] ); - // Camera.Yaw powinno być wyzerowane, aby po powrocie patrzeć do przodu - Camera.Pos = - Controlled->GetPosition() + Train->MirrorPosition( lr ); // pozycja lusterka - Camera.Yaw = 0; // odchylenie na bok od Camera.LookAt - if( Train->Dynamic()->MoverParameters->ActiveCab == 0 ) - Camera.LookAt = Camera.Pos - Train->GetDirection(); // gdy w korytarzu - else if( Global::shiftState ) { // patrzenie w bok przez szybę - Camera.LookAt = Camera.Pos - - ( lr ? -1 : 1 ) * Train->Dynamic()->VectorLeft() * - Train->Dynamic()->MoverParameters->ActiveCab; - Global::SetCameraRotation( -modelrotate ); - } - else { // patrzenie w kierunku osi pojazdu, z uwzględnieniem kabiny - jakby z lusterka, - // ale bez odbicia - Camera.LookAt = Camera.Pos - - Train->GetDirection() * - Train->Dynamic()->MoverParameters->ActiveCab; //-1 albo 1 - Global::SetCameraRotation( M_PI - - modelrotate ); // tu już trzeba uwzględnić lusterka - } - Camera.Roll = - atan( Train->pMechShake.x * Train->fMechRoll ); // hustanie kamery na boki - Camera.Pitch = - atan( Train->vMechVelocity.z * Train->fMechPitch ); // hustanie kamery przod tyl - Camera.vUp = Controlled->VectorUp(); - } - else { // patrzenie standardowe - Camera.Pos = Train->pMechPosition; // Train.GetPosition1(); - if( !Global::iPause ) { // podczas pauzy nie przeliczać kątów przypadkowymi wartościami - Camera.Roll = - atan( Train->pMechShake.x * Train->fMechRoll ); // hustanie kamery na boki - Camera.Pitch -= atan( Train->vMechVelocity.z * - Train->fMechPitch ); // hustanie kamery przod tyl //Ra: tu - // jest uciekanie kamery w górę!!! - } - // ABu011104: rzucanie pudlem - vector3 temp; - if( abs( Train->pMechShake.y ) < 0.25 ) - temp = vector3( 0, 0, 6 * Train->pMechShake.y ); - else if( ( Train->pMechShake.y ) > 0 ) - temp = vector3( 0, 0, 6 * 0.25 ); - else - temp = vector3( 0, 0, -6 * 0.25 ); - if( Controlled ) - Controlled->ABuSetModelShake( temp ); - // ABu: koniec rzucania +*/ + if( (Train != nullptr) + && (Camera.Type == tp_Follow )) { + // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery + vector3 tempangle = Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); + double modelrotate = atan2( -tempangle.x, tempangle.z ); - if( Train->Dynamic()->MoverParameters->ActiveCab == 0 ) - Camera.LookAt = Train->pMechPosition + Train->GetDirection(); // gdy w korytarzu - else // patrzenie w kierunku osi pojazdu, z uwzględnieniem kabiny - Camera.LookAt = Train->pMechPosition + - Train->GetDirection() * - Train->Dynamic()->MoverParameters->ActiveCab; //-1 albo 1 - Camera.vUp = Train->GetUp(); - Global::SetCameraRotation( Camera.Yaw - - modelrotate ); // tu już trzeba uwzględnić lusterka + if( (Global::ctrlState) + && ( (Console::Pressed( Global::Keys[ k_MechLeft ]) + || (Console::Pressed( Global::Keys[ k_MechRight ]))))) { + // jeśli lusterko lewe albo prawe (bez rzucania na razie) + bool lr = Console::Pressed( Global::Keys[ k_MechLeft ] ); + // Camera.Yaw powinno być wyzerowane, aby po powrocie patrzeć do przodu + Camera.Pos = Controlled->GetPosition() + Train->MirrorPosition( lr ); // pozycja lusterka + Camera.Yaw = 0; // odchylenie na bok od Camera.LookAt + if( Train->Dynamic()->MoverParameters->ActiveCab == 0 ) + Camera.LookAt = Camera.Pos - Train->GetDirection(); // gdy w korytarzu + else if( Global::shiftState ) { + // patrzenie w bok przez szybę + Camera.LookAt = Camera.Pos - ( lr ? -1 : 1 ) * Train->Dynamic()->VectorLeft() * Train->Dynamic()->MoverParameters->ActiveCab; + Global::SetCameraRotation( -modelrotate ); } + else { // patrzenie w kierunku osi pojazdu, z uwzględnieniem kabiny - jakby z lusterka, + // ale bez odbicia + Camera.LookAt = Camera.Pos - Train->GetDirection() * Train->Dynamic()->MoverParameters->ActiveCab; //-1 albo 1 + Global::SetCameraRotation( M_PI - modelrotate ); // tu już trzeba uwzględnić lusterka + } + Camera.Roll = std::atan( Train->pMechShake.x * Train->fMechRoll ); // hustanie kamery na boki + Camera.Pitch = 0.5 * std::atan( Train->vMechVelocity.z * Train->fMechPitch ); // hustanie kamery przod tyl + Camera.vUp = Controlled->VectorUp(); + } + else { + // patrzenie standardowe + Camera.Pos = Train->GetWorldMechPosition(); // Train.GetPosition1(); + if( !Global::iPause ) { // podczas pauzy nie przeliczać kątów przypadkowymi wartościami + Camera.Roll = atan( Train->pMechShake.x * Train->fMechRoll ); // hustanie kamery na boki + Camera.Pitch -= 0.5 * atan( Train->vMechVelocity.z * Train->fMechPitch ); // hustanie kamery przod tyl //Ra: tu + // jest uciekanie kamery w górę!!! + } + // ABu011104: rzucanie pudlem +/* + vector3 temp; + if( abs( Train->pMechShake.y ) < 0.25 ) + temp = vector3( 0, 0, 6 * Train->pMechShake.y ); + else if( ( Train->pMechShake.y ) > 0 ) + temp = vector3( 0, 0, 6 * 0.25 ); + else + temp = vector3( 0, 0, -6 * 0.25 ); + if( Controlled ) + Controlled->ABuSetModelShake( temp ); + // ABu: koniec rzucania +*/ + + if( Train->Dynamic()->MoverParameters->ActiveCab == 0 ) + Camera.LookAt = Train->GetWorldMechPosition() + Train->GetDirection() * 5.0; // gdy w korytarzu + else // patrzenie w kierunku osi pojazdu, z uwzględnieniem kabiny + Camera.LookAt = Train->GetWorldMechPosition() + Train->GetDirection() * 5.0 * Train->Dynamic()->MoverParameters->ActiveCab; //-1 albo 1 + Camera.vUp = Train->GetUp(); + Global::SetCameraRotation( Camera.Yaw - modelrotate ); // tu już trzeba uwzględnić lusterka } } else { // kamera nieruchoma From 6f74ecc43971f4ccd10e6d7b0837f181766c36e5 Mon Sep 17 00:00:00 2001 From: VB Date: Sun, 5 Mar 2017 22:22:06 +0100 Subject: [PATCH 045/426] out of bounds in normals calculation --- Ground.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index 236d7ac6..fb17c938 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -206,8 +206,14 @@ void TGroundNode::InitNormals() } if (Vertices[i].Normal == vector3(0, 0, 0)) Vertices[i].Normal = (n1 + n2) / 2; - if (Vertices[i + 1].Normal == vector3(0, 0, 0)) - Vertices[i + 1].Normal = n2; + if (i + 1 < iNumVerts) + { + if (Vertices[i + 1].Normal == vector3(0, 0, 0)) + Vertices[i + 1].Normal = n2; + } + else + WriteLog("odd number of vertices, normals may be wrong!"); + break; case GL_TRIANGLE_FAN: From 89fe4e7f7c446c7b8aa1bc9c2be317e55a210262 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 6 Mar 2017 03:27:52 +0100 Subject: [PATCH 046/426] restored keyboard controls for events; tweaks to intensity of vehicle spotlights, minor bug fixes --- EvLaunch.cpp | 41 +++++++++++++++++++++++++++++++++++----- Globals.cpp | 14 ++++++++++---- Globals.h | 4 ++-- Ground.cpp | 11 ++++++----- McZapkie/Mover.cpp | 5 ++++- McZapkie/hamulce.cpp | 2 +- World.cpp | 45 ++++++++++++++++++++++---------------------- renderer.cpp | 13 +++++++------ 8 files changed, 88 insertions(+), 47 deletions(-) diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 72b815e9..b759b774 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -55,6 +55,25 @@ void TEventLauncher::Init() { } +// encodes expected key in a short, where low byte represents the actual key, +// and the high byte holds modifiers: 0x1 = shift, 0x2 = ctrl, 0x4 = alt +int vk_to_glfw_key( int const Keycode ) { + +#ifdef _WINDOWS + auto const code = VkKeyScan( Keycode ); + char key = code & 0xff; + char shiftstate = ( code & 0xff00 ) >> 8; + + if( (key >= 'A') && (key <= 'Z') ) { + key = GLFW_KEY_A + key - 'A'; + } + else if( key >= '0' ) { + key = GLFW_KEY_0 + key - '0'; + } + return key + ( shiftstate << 8 ); +#endif +} + bool TEventLauncher::Load(cParser *parser) { // wczytanie wyzwalacza zdarzeń std::string token; @@ -66,10 +85,10 @@ bool TEventLauncher::Load(cParser *parser) *parser >> token; if (token != "none") { - if (token.size() == 1) - iKey = VkKeyScan(token[0]); // jeden znak jest konwertowany na kod klawisza + if( token.size() == 1 ) + iKey = vk_to_glfw_key( token[ 0 ] ); else - iKey = stol_def(token,0); // a jak więcej, to jakby numer klawisza jest + iKey = vk_to_glfw_key(stol_def( token, 0 )); // a jak więcej, to jakby numer klawisza jest } parser->getTokens(); *parser >> DeltaTime; @@ -145,8 +164,20 @@ bool TEventLauncher::Render() bool bCond = false; if (iKey != 0) { - if (Global::bActive) // tylko jeśli okno jest aktywne - bCond = (Console::Pressed(iKey)); // czy klawisz wciśnięty + if( Global::bActive ) { + // tylko jeśli okno jest aktywne + if( iKey > 255 ) { + // key and modifier + auto const modifier = ( iKey & 0xff00 ) >> 8; + bCond = ( Console::Pressed( iKey & 0xff ) ) + && ( modifier & 1 ? Global::shiftState : true ) + && ( modifier & 2 ? Global::ctrlState : true ); + } + else { + // just key + bCond = ( Console::Pressed( iKey & 0xff ) ); // czy klawisz wciśnięty + } + } } if (DeltaTime > 0) { diff --git a/Globals.cpp b/Globals.cpp index 2f1be79b..3261bcba 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -90,8 +90,8 @@ TTranscripts Global::tranTexts; // obiekt obsługujący stenogramy dźwięków n vector3 Global::pCameraPosition; double Global::pCameraRotation; double Global::pCameraRotationDeg; -vector3 Global::pFreeCameraInit[10]; -vector3 Global::pFreeCameraInitAngle[10]; +std::vector Global::FreeCameraInit; +std::vector Global::FreeCameraInitAngle; double Global::fFogStart = 1700; double Global::fFogEnd = 2000; float Global::Background[3] = {0.2, 0.4, 0.33}; @@ -240,11 +240,15 @@ std::string Global::GetNextSymbol() void Global::LoadIniFile(std::string asFileName) { +/* for (int i = 0; i < 10; ++i) { // zerowanie pozycji kamer pFreeCameraInit[i] = vector3(0, 0, 0); // współrzędne w scenerii pFreeCameraInitAngle[i] = vector3(0, 0, 0); // kąty obrotu w radianach } +*/ + FreeCameraInit.resize( 10 ); + FreeCameraInitAngle.resize( 10 ); cParser parser(asFileName, cParser::buffer_FILE); ConfigParse(parser); }; @@ -322,8 +326,10 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::bFreeFly; Parser.getTokens(3, false); - Parser >> Global::pFreeCameraInit[0].x, Global::pFreeCameraInit[0].y, - Global::pFreeCameraInit[0].z; + Parser >> + Global::FreeCameraInit[0].x, + Global::FreeCameraInit[0].y, + Global::FreeCameraInit[0].z; } else if (token == "wireframe") { diff --git a/Globals.h b/Globals.h index a9710c36..51724f38 100644 --- a/Globals.h +++ b/Globals.h @@ -170,8 +170,8 @@ class Global static double pCameraRotation; // kierunek bezwzględny kamery w świecie: 0=północ, 90°=zachód (-azymut) static double pCameraRotationDeg; // w stopniach, dla animacji billboard - static Math3D::vector3 pFreeCameraInit[10]; // pozycje kamery - static Math3D::vector3 pFreeCameraInitAngle[10]; + static std::vector FreeCameraInit; // pozycje kamery + static std::vector FreeCameraInitAngle; static int iWindowWidth; static int iWindowHeight; static float fDistanceFactor; diff --git a/Ground.cpp b/Ground.cpp index bd345169..8ec3fb62 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2959,11 +2959,12 @@ bool TGround::Init(std::string File) into = ++Global::iCameraLast; if ((into >= 0) && (into < 10)) { // przepisanie do odpowiedniego miejsca w tabelce - Global::pFreeCameraInit[into] = xyz; - abc.x = DegToRad(abc.x); - abc.y = DegToRad(abc.y); - abc.z = DegToRad(abc.z); - Global::pFreeCameraInitAngle[into] = abc; + Global::FreeCameraInit[ into ] = xyz; + Global::FreeCameraInitAngle[ into ] = + Math3D::vector3( + DegToRad( abc.x ), + DegToRad( abc.y ), + DegToRad( abc.z ) ); Global::iCameraLast = into; // numer ostatniej } } diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 89c47a26..42fe6ed5 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3814,10 +3814,13 @@ double TMoverParameters::TractionForce(double dt) } eAngle += enrot * dt; + if( eAngle > M_PI * 2.0 ) + eAngle = std::fmod( eAngle, M_PI * 2.0 ); +/* while (eAngle > M_PI * 2.0) // eAngle = Pirazy2 - eAngle; <- ABu: a nie czasem tak, jak nizej? eAngle -= M_PI * 2.0; - +*/ // hunter-091012: przeniesione z if ActiveDir<>0 (zeby po zejsciu z kierunku dalej spadala // predkosc wentylatorow) if (EngineType == ElectricSeriesMotor) diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 4602622c..ef93c067 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -90,7 +90,7 @@ double PFVa( double PH, double PL, double const S, double LIM, double const DP ) LIM = LIM + 1; PH = PH + 1; // wyzsze cisnienie absolutne PL = PL + 1; // nizsze cisnienie absolutne - double sg = PL / PH; // bezwymiarowy stosunek cisnien + double sg = std::min( 1.0, PL / PH ); // bezwymiarowy stosunek cisnien. NOTE: sg is capped at 1 to prevent calculations from going awry. TODO, TBD: log these as errors? double FM = PH * 197 * S; // najwyzszy mozliwy przeplyw, wraz z kierunkiem if ((LIM - PL) < DP) FM = FM * (LIM - PL) / DP; // jesli jestesmy przy nastawieniu, to zawor sie przymyka diff --git a/World.cpp b/World.cpp index a3567f5d..07d0de52 100644 --- a/World.cpp +++ b/World.cpp @@ -472,7 +472,7 @@ bool TWorld::Init( GLFWwindow *w ) { // Camera.Init(vector3(1500,5,-4000),0,M_PI,0); // McZapkie-130302 - coby nie przekompilowywac: // Camera.Init(Global::pFreeCameraInit,0,M_PI,0); - Camera.Init(Global::pFreeCameraInit[0], Global::pFreeCameraInitAngle[0]); + Camera.Init(Global::FreeCameraInit[0], Global::FreeCameraInitAngle[0]); char buff[255] = "Player train init: "; glRasterPos2f( -0.85f * widthratio, -0.50f ); @@ -570,9 +570,9 @@ void TWorld::OnKeyDown(int cKey) // na każdy kod wirtualny niech przypadają 4 bajty: 2 dla naciśnięcia i 2 dla zwolnienia // powtórzone 256 razy da 1kB na każdy stan przełączników, łącznie będzie 4kB pierwszej tabeli // przekodowania - if ((cKey <= '9') ? (cKey >= '0') : false) // klawisze cyfrowe + if( ( cKey >= GLFW_KEY_0 ) && ( cKey <= GLFW_KEY_9 ) ) // klawisze cyfrowe { - int i = cKey - '0'; // numer klawisza + int i = cKey - GLFW_KEY_0; // numer klawisza if (Global::shiftState) { // z [Shift] uruchomienie eventu if (!Global::iPause) // podczas pauzy klawisze nie działają @@ -584,32 +584,31 @@ void TWorld::OnKeyDown(int cKey) if( ( Global::iTextMode != GLFW_KEY_F12 ) && ( Global::iTextMode != GLFW_KEY_F3 ) ) // ograniczamy użycie kamer { - if ((!Global::pFreeCameraInit[i].x && !Global::pFreeCameraInit[i].y && - !Global::pFreeCameraInit[i].z)) + if ((!Global::FreeCameraInit[i].x) + && (!Global::FreeCameraInit[i].y) + && (!Global::FreeCameraInit[i].z)) { // jeśli kamera jest w punkcie zerowym, zapamiętanie współrzędnych i kątów - Global::pFreeCameraInit[i] = Camera.Pos; - Global::pFreeCameraInitAngle[i].x = Camera.Pitch; - Global::pFreeCameraInitAngle[i].y = Camera.Yaw; - Global::pFreeCameraInitAngle[i].z = Camera.Roll; + Global::FreeCameraInit[i] = Camera.Pos; + Global::FreeCameraInitAngle[i].x = Camera.Pitch; + Global::FreeCameraInitAngle[i].y = Camera.Yaw; + Global::FreeCameraInitAngle[i].z = Camera.Roll; // logowanie, żeby można było do scenerii przepisać WriteLog( - "camera " + std::to_string( Global::pFreeCameraInit[i].x ) + " " + - std::to_string(Global::pFreeCameraInit[i].y ) + " " + - std::to_string(Global::pFreeCameraInit[i].z ) + " " + - std::to_string(RadToDeg(Global::pFreeCameraInitAngle[i].x)) + - " " + - std::to_string(RadToDeg(Global::pFreeCameraInitAngle[i].y)) + - " " + - std::to_string(RadToDeg(Global::pFreeCameraInitAngle[i].z)) + - " " + std::to_string(i) + " endcamera"); + "camera " + std::to_string( Global::FreeCameraInit[i].x ) + " " + + std::to_string(Global::FreeCameraInit[i].y ) + " " + + std::to_string(Global::FreeCameraInit[i].z ) + " " + + std::to_string(RadToDeg(Global::FreeCameraInitAngle[i].x)) + " " + + std::to_string(RadToDeg(Global::FreeCameraInitAngle[i].y)) + " " + + std::to_string(RadToDeg(Global::FreeCameraInitAngle[i].z)) + " " + + std::to_string(i) + " endcamera"); } else // również przeskakiwanie { // Ra: to z tą kamerą (Camera.Pos i Global::pCameraPosition) jest trochę bez sensu Global::SetCameraPosition( - Global::pFreeCameraInit[i]); // nowa pozycja dla generowania obiektów + Global::FreeCameraInit[i]); // nowa pozycja dla generowania obiektów Ground.Silence(Camera.Pos); // wyciszenie wszystkiego z poprzedniej pozycji - Camera.Init(Global::pFreeCameraInit[i], - Global::pFreeCameraInitAngle[i]); // przestawienie + Camera.Init(Global::FreeCameraInit[i], + Global::FreeCameraInitAngle[i]); // przestawienie } } // będzie jeszcze załączanie sprzęgów z [Ctrl] @@ -802,9 +801,9 @@ void TWorld::OnKeyDown(int cKey) CouplNr = 0; // z [-1,1] zrobić [0,1] int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę // tapety pulpitu :/ - if (Global::shiftState < 0) // z [Shift] zapalanie + if (Global::shiftState) // z [Shift] zapalanie set = mask = 64; // bez [Ctrl] założyć tabliczki - else if (Global::ctrlState < 0) + else if (Global::ctrlState) set = mask = 2 + 32; // z [Ctrl] zapalić światła czerwone else mask = 2 + 32 + 64; // wyłączanie ściąga wszystko diff --git a/renderer.cpp b/renderer.cpp index 43c1f8ad..509632d9 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -59,12 +59,13 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { renderlight->set_position( scenelight.position ); renderlight->direction = scenelight.direction; - renderlight->diffuse[ 0 ] = scenelight.color.x; - renderlight->diffuse[ 1 ] = scenelight.color.y; - renderlight->diffuse[ 2 ] = scenelight.color.z; - renderlight->ambient[ 0 ] = scenelight.color.x * scenelight.intensity; - renderlight->ambient[ 1 ] = scenelight.color.y * scenelight.intensity; - renderlight->ambient[ 2 ] = scenelight.color.z * scenelight.intensity; + auto const luminance = Global::fLuminance; // TODO: adjust this based on location, e.g. for tunnels + renderlight->diffuse[ 0 ] = std::max( 0.0, scenelight.color.x - luminance ); + renderlight->diffuse[ 1 ] = std::max( 0.0, scenelight.color.y - luminance ); + renderlight->diffuse[ 2 ] = std::max( 0.0, scenelight.color.z - luminance ); + renderlight->ambient[ 0 ] = std::max( 0.0, scenelight.color.x * scenelight.intensity - luminance); + renderlight->ambient[ 1 ] = std::max( 0.0, scenelight.color.y * scenelight.intensity - luminance ); + renderlight->ambient[ 2 ] = std::max( 0.0, scenelight.color.z * scenelight.intensity - luminance ); ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, (0.25f * scenelight.count) / std::pow( scenelight.count, 2 ) ); ::glEnable( renderlight->id ); From e91e88d4c5db8330914e2f06ddc9c275b7a1e0bb Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 6 Mar 2017 19:11:09 +0100 Subject: [PATCH 047/426] project files cleanup --- EU07.cpp | 9 +++++++-- maszyna.vcxproj | 1 + maszyna.vcxproj.filters | 3 +++ Classes.cpp => old/Classes.cpp | 0 Forth.cpp => old/Forth.cpp | 0 Forth.h => old/Forth.h | 0 Geom.cpp => old/Geom.cpp | 0 Geom.h => old/Geom.h | 0 {McZapkie => old}/Mover.hpp | 0 {McZapkie => old}/Oerlikon_ESt.hpp | 0 {McZapkie => old}/Oerlikon_ESt.pas | 0 QueryParserComp.hpp => old/QueryParserComp.hpp | 0 QueryParserComp.pas => old/QueryParserComp.pas | 0 {McZapkie => old}/Unit1.pas | 0 {McZapkie => old}/_Mover.hpp | 0 {McZapkie => old}/_mover.pas | 0 {McZapkie => old}/friction.hpp | 0 {McZapkie => old}/friction.pas | 0 {McZapkie => old}/hamulce.hpp | 0 {McZapkie => old}/hamulce.pas | 0 {McZapkie => old}/klasy_ham.pas | 0 {McZapkie => old}/mctools.hpp | 0 {McZapkie => old}/mctools.pas | 0 {McZapkie => old}/mtable.hpp | 0 {McZapkie => old}/mtable.pas | 0 {McZapkie => old}/unit2.pas | 0 26 files changed, 11 insertions(+), 2 deletions(-) rename Classes.cpp => old/Classes.cpp (100%) rename Forth.cpp => old/Forth.cpp (100%) rename Forth.h => old/Forth.h (100%) rename Geom.cpp => old/Geom.cpp (100%) rename Geom.h => old/Geom.h (100%) rename {McZapkie => old}/Mover.hpp (100%) rename {McZapkie => old}/Oerlikon_ESt.hpp (100%) rename {McZapkie => old}/Oerlikon_ESt.pas (100%) rename QueryParserComp.hpp => old/QueryParserComp.hpp (100%) rename QueryParserComp.pas => old/QueryParserComp.pas (100%) rename {McZapkie => old}/Unit1.pas (100%) rename {McZapkie => old}/_Mover.hpp (100%) rename {McZapkie => old}/_mover.pas (100%) rename {McZapkie => old}/friction.hpp (100%) rename {McZapkie => old}/friction.pas (100%) rename {McZapkie => old}/hamulce.hpp (100%) rename {McZapkie => old}/hamulce.pas (100%) rename {McZapkie => old}/klasy_ham.pas (100%) rename {McZapkie => old}/mctools.hpp (100%) rename {McZapkie => old}/mctools.pas (100%) rename {McZapkie => old}/mtable.hpp (100%) rename {McZapkie => old}/mtable.pas (100%) rename {McZapkie => old}/unit2.pas (100%) diff --git a/EU07.cpp b/EU07.cpp index 7b795f64..62b1b660 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -18,8 +18,9 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others */ #include "stdafx.h" +#ifdef CAN_I_HAS_LIBPNG #include -#include +#endif #include "Globals.h" #include "Logs.h" @@ -45,7 +46,8 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others TWorld World; -void screenshot_save_thread(char *img) +#ifdef CAN_I_HAS_LIBPNG +void screenshot_save_thread( char *img ) { png_image png; memset(&png, 0, sizeof(png_image)); @@ -83,6 +85,7 @@ void make_screenshot() std::thread t(screenshot_save_thread, img); t.detach(); } +#endif void window_resize_callback(GLFWwindow *window, int w, int h) { @@ -118,9 +121,11 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo switch( key ) { +#ifdef CAN_I_HAS_LIBPNG case GLFW_KEY_F11: make_screenshot(); break; +#endif case GLFW_KEY_ESCAPE: { if( ( DebugModeFlag ) //[Esc] pauzuje tylko bez Debugmode diff --git a/maszyna.vcxproj b/maszyna.vcxproj index dae5517e..c212cd6b 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -156,6 +156,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 147a4d11..433c4b88 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -377,6 +377,9 @@ Header Files + + Header Files + diff --git a/Classes.cpp b/old/Classes.cpp similarity index 100% rename from Classes.cpp rename to old/Classes.cpp diff --git a/Forth.cpp b/old/Forth.cpp similarity index 100% rename from Forth.cpp rename to old/Forth.cpp diff --git a/Forth.h b/old/Forth.h similarity index 100% rename from Forth.h rename to old/Forth.h diff --git a/Geom.cpp b/old/Geom.cpp similarity index 100% rename from Geom.cpp rename to old/Geom.cpp diff --git a/Geom.h b/old/Geom.h similarity index 100% rename from Geom.h rename to old/Geom.h diff --git a/McZapkie/Mover.hpp b/old/Mover.hpp similarity index 100% rename from McZapkie/Mover.hpp rename to old/Mover.hpp diff --git a/McZapkie/Oerlikon_ESt.hpp b/old/Oerlikon_ESt.hpp similarity index 100% rename from McZapkie/Oerlikon_ESt.hpp rename to old/Oerlikon_ESt.hpp diff --git a/McZapkie/Oerlikon_ESt.pas b/old/Oerlikon_ESt.pas similarity index 100% rename from McZapkie/Oerlikon_ESt.pas rename to old/Oerlikon_ESt.pas diff --git a/QueryParserComp.hpp b/old/QueryParserComp.hpp similarity index 100% rename from QueryParserComp.hpp rename to old/QueryParserComp.hpp diff --git a/QueryParserComp.pas b/old/QueryParserComp.pas similarity index 100% rename from QueryParserComp.pas rename to old/QueryParserComp.pas diff --git a/McZapkie/Unit1.pas b/old/Unit1.pas similarity index 100% rename from McZapkie/Unit1.pas rename to old/Unit1.pas diff --git a/McZapkie/_Mover.hpp b/old/_Mover.hpp similarity index 100% rename from McZapkie/_Mover.hpp rename to old/_Mover.hpp diff --git a/McZapkie/_mover.pas b/old/_mover.pas similarity index 100% rename from McZapkie/_mover.pas rename to old/_mover.pas diff --git a/McZapkie/friction.hpp b/old/friction.hpp similarity index 100% rename from McZapkie/friction.hpp rename to old/friction.hpp diff --git a/McZapkie/friction.pas b/old/friction.pas similarity index 100% rename from McZapkie/friction.pas rename to old/friction.pas diff --git a/McZapkie/hamulce.hpp b/old/hamulce.hpp similarity index 100% rename from McZapkie/hamulce.hpp rename to old/hamulce.hpp diff --git a/McZapkie/hamulce.pas b/old/hamulce.pas similarity index 100% rename from McZapkie/hamulce.pas rename to old/hamulce.pas diff --git a/McZapkie/klasy_ham.pas b/old/klasy_ham.pas similarity index 100% rename from McZapkie/klasy_ham.pas rename to old/klasy_ham.pas diff --git a/McZapkie/mctools.hpp b/old/mctools.hpp similarity index 100% rename from McZapkie/mctools.hpp rename to old/mctools.hpp diff --git a/McZapkie/mctools.pas b/old/mctools.pas similarity index 100% rename from McZapkie/mctools.pas rename to old/mctools.pas diff --git a/McZapkie/mtable.hpp b/old/mtable.hpp similarity index 100% rename from McZapkie/mtable.hpp rename to old/mtable.hpp diff --git a/McZapkie/mtable.pas b/old/mtable.pas similarity index 100% rename from McZapkie/mtable.pas rename to old/mtable.pas diff --git a/McZapkie/unit2.pas b/old/unit2.pas similarity index 100% rename from McZapkie/unit2.pas rename to old/unit2.pas From 32c554f6b8e564f42445fd3d0315abcd4da4ba9c Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 6 Mar 2017 19:12:35 +0100 Subject: [PATCH 048/426] post-merge fixes --- EU07.cpp | 11 +++++++---- Model3d.cpp | 6 +++--- World.cpp | 2 ++ maszyna.vcxproj | 11 +++++++---- maszyna.vcxproj.filters | 9 +++++++++ 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 62b1b660..3fd1ca49 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -16,7 +16,6 @@ Authors: MarcinW, McZapkie, Shaxbee, ABu, nbmx, youBy, Ra, winger, mamut, Q424, Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others */ - #include "stdafx.h" #ifdef CAN_I_HAS_LIBPNG #include @@ -39,6 +38,9 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #pragma comment( lib, "setupapi.lib" ) #pragma comment( lib, "python27.lib" ) #pragma comment (lib, "dbghelp.lib") +#ifdef CAN_I_HAS_LIBPNG +#pragma comment (lib, "libpng16.lib") +#endif #ifdef _MSC_VER #pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") @@ -122,9 +124,10 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo switch( key ) { #ifdef CAN_I_HAS_LIBPNG - case GLFW_KEY_F11: - make_screenshot(); - break; + case GLFW_KEY_F11: { + make_screenshot(); + break; + } #endif case GLFW_KEY_ESCAPE: { diff --git a/Model3d.cpp b/Model3d.cpp index c8fcb269..6caccd53 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -2029,7 +2029,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) { // wczytanie modelu z pliku binarnego - WriteLog("loading e3d model " + FileName + " .."); + WriteLog("Loading binary format 3d model data from \"" + FileName + "\"..."); std::ifstream file(FileName, std::ios::binary); @@ -2042,12 +2042,12 @@ void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) deserialize(file, size, dynamic); file.close(); - WriteLog("..done."); + WriteLog("Finished loading 3d model data from \"" + FileName + "\""); }; void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic) { // wczytanie submodelu z pliku tekstowego - WriteLog("Loading - text model: " + FileName); + WriteLog("Loading text format 3d model data from \"" + FileName + "\"..."); iFlags |= 0x0200; // wczytano z pliku tekstowego (właścicielami tablic są submodle) cParser parser(FileName, cParser::buffer_FILE); // Ra: tu powinno być "models\\"... TSubModel *SubModel; diff --git a/World.cpp b/World.cpp index 07d0de52..1fa98c43 100644 --- a/World.cpp +++ b/World.cpp @@ -178,10 +178,12 @@ bool TWorld::Init( GLFWwindow *w ) { Global::detonatoryOK = true; WriteLog("Starting MaSzyna rail vehicle simulator."); WriteLog(Global::asVersion); +/* if( sizeof( TSubModel ) != 256 ) { Error( "Wrong sizeof(TSubModel) is " + std::to_string(sizeof( TSubModel )) ); return false; } +*/ WriteLog("Online documentation and additional files on http://eu07.pl"); 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"); diff --git a/maszyna.vcxproj b/maszyna.vcxproj index c212cd6b..19e4a244 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -51,7 +51,7 @@ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) Level3 ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) Use true false @@ -60,7 +60,7 @@ MachineX86 true - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories) + $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/libpng/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories) Windows @@ -70,7 +70,7 @@ MultiThreadedDLL Level3 ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) Use true @@ -79,7 +79,7 @@ true true true - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories) + $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/libpng/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories) Windows @@ -124,6 +124,7 @@ + @@ -142,6 +143,7 @@ + @@ -188,6 +190,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 433c4b88..39c0f4ba 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -195,6 +195,12 @@ Source Files + + Source Files + + + Source Files + @@ -380,6 +386,9 @@ Header Files + + Header Files + From 2f3e916d9e615b540343e01a49c40651ee790a9e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 7 Mar 2017 14:29:03 +0100 Subject: [PATCH 049/426] post-merge fixes, continued --- AnimModel.cpp | 2 +- EvLaunch.cpp | 2 +- Ground.cpp | 4 ++-- Model3d.cpp | 8 +++++++- World.cpp | 33 ++++++++++++++------------------- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 6d6907ed..e5828761 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -460,7 +460,7 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable iTexAlpha = 0x30300030; } // przezroczystych - return (Init(TModelsManager::GetModel(asName.c_str()))); + return (Init(TModelsManager::GetModel(asName))); } bool TAnimModel::Load(cParser *parser, bool ter) diff --git a/EvLaunch.cpp b/EvLaunch.cpp index b759b774..2d9a3652 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -67,7 +67,7 @@ int vk_to_glfw_key( int const Keycode ) { if( (key >= 'A') && (key <= 'Z') ) { key = GLFW_KEY_A + key - 'A'; } - else if( key >= '0' ) { + else if( ( key >= '0' ) && ( key <= '9' ) ) { key = GLFW_KEY_0 + key - '0'; } return key + ( shiftstate << 8 ); diff --git a/Ground.cpp b/Ground.cpp index 60f19d72..36c85663 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -5092,7 +5092,7 @@ void TGround::WyslijString(const std::string &t, int n) r.cString[0] = char(i); strcpy(r.cString + 1, t.c_str()); // z zerem kończącym COPYDATASTRUCT cData; - cData.dwData = 'EU07'; // sygnatura + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = (DWORD)(10 + i); // 8+licznik i zero kończące cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); @@ -5171,7 +5171,7 @@ void TGround::WyslijNamiary(TGroundNode *t) r.cString[i] = char(j); // na końcu nazwa, żeby jakoś zidentyfikować strcpy(r.cString + i + 1, t->asName.c_str()); // zakończony zerem COPYDATASTRUCT cData; - cData.dwData = 'EU07'; // sygnatura + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = (DWORD)(10 + i + j); // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); diff --git a/Model3d.cpp b/Model3d.cpp index 6caccd53..1f7151ff 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -2015,7 +2015,13 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, if (pTexture.find_last_of("/\\") == std::string::npos) pTexture.insert(0, Global::asCurrentTexturePath); TextureID = GfxRenderer.GetTextureId(pTexture, szTexturePath); - } + if( Opacity < 1.0 ) // przezroczystość z tekstury brana tylko dla Opacity 0! + iFlags |= GfxRenderer.Texture( TextureID ).has_alpha ? + 0x20 : + 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta + else + iFlags |= 0x10; // normalnie nieprzezroczyste + } else TextureID = iTexture; b_aAnim = b_Anim; // skopiowanie animacji do drugiego cyklu diff --git a/World.cpp b/World.cpp index 1fa98c43..3cf31fe2 100644 --- a/World.cpp +++ b/World.cpp @@ -34,9 +34,6 @@ http://mozilla.org/MPL/2.0/. #define TEXTURE_LOD_BIAS_EXT 0x8501 //--------------------------------------------------------------------------- -typedef void(APIENTRY *FglutBitmapCharacter)(void *font, int character); // typ funkcji -FglutBitmapCharacter glutBitmapCharacterDLL = NULL; // deklaracja zmiennej -HINSTANCE hinstGLUT32 = NULL; // wskaźnik do GLUT32.DLL // GLUTAPI void APIENTRY glutBitmapCharacterDLL(void *font, int character); TDynamicObject *Controlled = NULL; // pojazd, który prowadzimy @@ -75,8 +72,6 @@ TWorld::~TWorld() TSoundsManager::Free(); TModelsManager::Free(); glDeleteLists(base, 96); - if (hinstGLUT32) - FreeLibrary(hinstGLUT32); } void TWorld::TrainDelete(TDynamicObject *d) @@ -243,7 +238,7 @@ bool TWorld::Init( GLFWwindow *w ) { else { Global::bDecompressDDS = - !(true == GLEW_EXT_texture_compression_s3tc); // czy obsługiwane? + !(GLEW_EXT_texture_compression_s3tc); // czy obsługiwane? if (Global::bDecompressDDS) // czy jest obsługa DDS w karcie graficznej WriteLog("DDS textures are not supported."); else // brak obsługi DDS - trzeba włączyć programową dekompresję @@ -277,7 +272,7 @@ bool TWorld::Init( GLFWwindow *w ) { { glEnable(GL_BLEND); glEnable(GL_ALPHA_TEST); - glAlphaFunc(GL_GREATER, 0.04); + glAlphaFunc(GL_GREATER, 0.04f); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glDepthFunc(GL_LEQUAL); } @@ -451,11 +446,11 @@ bool TWorld::Init( GLFWwindow *w ) { // directional light // TODO, TBD: test omni-directional variant Global::DayLight.position[ 3 ] = 1.0f; - ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0 ); + ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); // rgb value for 5780 kelvin - Global::DayLight.diffuse[ 0 ] = 255.0 / 255.0; - Global::DayLight.diffuse[ 1 ] = 242.0 / 255.0; - Global::DayLight.diffuse[ 2 ] = 231.0 / 255.0; + Global::DayLight.diffuse[ 0 ] = 255.0f / 255.0f; + Global::DayLight.diffuse[ 1 ] = 242.0f / 255.0f; + Global::DayLight.diffuse[ 2 ] = 231.0f / 255.0f; #endif Ground.Init(Global::SceneryFile); @@ -746,7 +741,7 @@ void TWorld::OnKeyDown(int cKey) // else if (cKey=='3') Global::iWriteLogEnabled^=4; //wypisywanie nazw torów } } - else if( cKey == GLFW_KEY_3 ) //[Ctrl]+[Break] + else if( Global::ctrlState && cKey == GLFW_KEY_PAUSE ) //[Ctrl]+[Break] { // hamowanie wszystkich pojazdów w okolicy if (Controlled->MoverParameters->Radio) Ground.RadioStop(Camera.Pos); @@ -763,7 +758,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (Global::ctrlState < 0) // z ctrl odcinanie + if (Global::ctrlState) // z ctrl odcinanie { temp->MoverParameters->BrakeStatus ^= 128; } @@ -825,7 +820,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (Global::ctrlState < 0) + if (Global::ctrlState) if ((temp->MoverParameters->LocalBrake == ManualBrake) || (temp->MoverParameters->MBrake == true)) temp->MoverParameters->IncManualBrakeLevel(1); @@ -845,7 +840,7 @@ void TWorld::OnKeyDown(int cKey) TDynamicObject *temp = Global::DynamicNearest(); if (temp) { - if (Global::ctrlState < 0) + if (Global::ctrlState) if ((temp->MoverParameters->LocalBrake == ManualBrake) || (temp->MoverParameters->MBrake == true)) temp->MoverParameters->DecManualBrakeLevel(1); @@ -1157,7 +1152,7 @@ bool TWorld::Update() // variable step simulation time routines if( Train != nullptr ) { - TSubModel::iInstance = reinterpret_cast( Train->Dynamic() ); + TSubModel::iInstance = reinterpret_cast( Train->Dynamic() ); Train->Update( dt ); } else { @@ -1429,7 +1424,7 @@ void TWorld::Update_Environment() { bool TWorld::Render() { - glColor3b(255, 255, 255); + glColor3ub(255, 255, 255); // glColor3b(255, 0, 255); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glDepthFunc( GL_LEQUAL ); @@ -1469,7 +1464,7 @@ TWorld::Render_Cab() { } TDynamicObject *dynamic = Train->Dynamic(); - TSubModel::iInstance = reinterpret_cast( dynamic ); + TSubModel::iInstance = reinterpret_cast( dynamic ); if( ( true == FreeFlyModeFlag ) || ( false == dynamic->bDisplayCab ) @@ -2624,7 +2619,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0]))); if (e) if ((e->Type == tp_Multiple) || (e->Type == tp_Lights) || - bool(e->evJoined)) // tylko jawne albo niejawne Multiple + (e->evJoined != 0)) // tylko jawne albo niejawne Multiple Ground.AddToQuery(e, NULL); // drugi parametr to dynamic wywołujący - tu // brak } From 6526620364e370928653ebe7c605d36842535260 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 8 Mar 2017 01:25:09 +0100 Subject: [PATCH 050/426] view range factor implementation --- Camera.cpp | 2 +- EU07.cpp | 1 + Globals.cpp | 10 ++++++++-- Model3d.cpp | 43 +++++++++++++++++++------------------------ RealSound.cpp | 7 +++---- Texture.cpp | 6 ++++++ skydome.cpp | 27 ++------------------------- usefull.h | 41 ++++++++++++++++------------------------- 8 files changed, 56 insertions(+), 81 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index c714fb88..ffd58d66 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -53,7 +53,7 @@ void TCamera::OnCursorMove(double x, double y) Yaw += 2 * M_PI; if (Type == tp_Follow) // jeżeli jazda z pojazdem { - Fix(Pitch, -M_PI_4, M_PI_4); // ograniczenie kąta spoglądania w dół i w górę + clamp(Pitch, -M_PI_4, M_PI_4); // ograniczenie kąta spoglądania w dół i w górę // Fix(Yaw,-M_PI,M_PI); } } diff --git a/EU07.cpp b/EU07.cpp index 3fd1ca49..aeae755f 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -93,6 +93,7 @@ void window_resize_callback(GLFWwindow *window, int w, int h) { Global::ScreenWidth = w; Global::ScreenHeight = h; + Global::fDistanceFactor = h / 768.0f; // not sure if this is really something we want to use glViewport(0, 0, w, h); } diff --git a/Globals.cpp b/Globals.cpp index a8e3af98..b0e54344 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -120,7 +120,7 @@ int Global::iHiddenEvents = 1; // czy łączyć eventy z torami poprzez nazwę t int Global::Keys[MaxKeys]; int Global::iWindowWidth = 800; int Global::iWindowHeight = 600; -float Global::fDistanceFactor = 768.0; // baza do przeliczania odległości dla LoD +float Global::fDistanceFactor = Global::ScreenHeight / 768.0; // baza do przeliczania odległości dla LoD int Global::iFeedbackMode = 1; // tryb pracy informacji zwrotnej int Global::iFeedbackPort = 0; // dodatkowy adres dla informacji zwrotnych bool Global::bFreeFly = false; @@ -154,7 +154,8 @@ bool Global::bSmoothTraction = false; // wygładzanie drutów starym sposobem std::string Global::szDefaultExt = Global::szTexturesDDS; // domyślnie od DDS int Global::iMultisampling = 2; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px bool Global::bGlutFont = false; // czy tekst generowany przez GLUT32.DLL -int Global::iConvertModels = 7; // tworzenie plików binarnych, +2-optymalizacja transformów +//int Global::iConvertModels = 7; // tworzenie plików binarnych, +2-optymalizacja transformów +int Global::iConvertModels{ 0 }; // temporary override, to prevent generation of .e3d not compatible with old exe int Global::iSlowMotionMask = -1; // maska wyłączanych właściwości dla zwiększenia FPS int Global::iModifyTGA = 7; // czy korygować pliki TGA dla szybszego wczytywania // bool Global::bTerrainCompact=true; //czy zapisać teren w pliku @@ -620,6 +621,11 @@ void Global::ConfigParse(cParser &Parser) // tworzenie plików binarnych Parser.getTokens(1, false); Parser >> Global::iConvertModels; + // temporary override, to prevent generation of .e3d not compatible with old exe + Global::iConvertModels = + ( Global::iConvertModels > 128 ? + Global::iConvertModels - 128 : + 0 ); } else if (token == "inactivepause") { diff --git a/Model3d.cpp b/Model3d.cpp index 1f7151ff..d3378b69 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -74,7 +74,7 @@ void TSubModel::FirstInit() // Hits=NULL; // CollisionPts=NULL; // CollisionPtsCount=0; - Opacity = 1.0; // przy wczytywaniu modeli było dzielone przez 100... + Opacity = 0.0f; // przy wczytywaniu modeli było dzielone przez 100... bWire = false; fWireSize = 0; fNearAttenStart = 40; @@ -376,13 +376,10 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) TextureID = GfxRenderer.GetTextureId( texture, szTexturePath ); // TexAlpha=TTexturesManager::GetAlpha(TextureID); // iFlags|=TexAlpha?0x20:0x10; //0x10-nieprzezroczysta, 0x20-przezroczysta - if (Opacity < 1.0) // przezroczystość z tekstury brana tylko dla Opacity - // 0! - iFlags |= GfxRenderer.Texture(TextureID).has_alpha ? - 0x20 : - 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta - else - iFlags |= 0x10; // normalnie nieprzezroczyste + iFlags |= + ( GfxRenderer.Texture(TextureID).has_alpha ? + 0x20 : + 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta // renderowanie w cyklu przezroczystych tylko jeśli: // 1. Opacity=0 (przejściowo <1, czy tam <100) oraz // 2. tekstura ma przezroczystość @@ -391,19 +388,19 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) else iFlags |= 0x10; + // visibility range std::string discard; parser.getTokens(5, false); parser >> discard >> fSquareMaxDist >> discard >> fSquareMinDist >> discard; - if (fSquareMaxDist >= 0.0) - { - fSquareMaxDist *= fSquareMaxDist; - } - else - { - fSquareMaxDist = 15000 * 15000; - } // 15km to więcej, niż się obecnie wyświetla + if( fSquareMaxDist <= 0.0 ) { + // 15km to więcej, niż się obecnie wyświetla + fSquareMaxDist = 15000.0; + } + fSquareMaxDist *= fSquareMaxDist; fSquareMinDist *= fSquareMinDist; + + // transformation matrix fMatrix = new float4x4(); readMatrix(parser, *fMatrix); // wczytanie transform if (!fMatrix->IdentityIs()) @@ -688,7 +685,7 @@ void TSubModel::DisplayLists() glColorMaterial(GL_FRONT, GL_EMISSION); glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly glBegin(GL_POINTS); - glVertex3f( 0.0f, 0.0f, -0.025f ); // shift point towards the viewer, to avoid z-fighting with the light polygons + glVertex3f( 0.0f, 0.0f, -0.05f ); // shift point towards the viewer, to avoid z-fighting with the light polygons glEnd(); glEnable(GL_LIGHTING); glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); @@ -1484,7 +1481,7 @@ void TSubModel::AdjustDist() if (fSquareMaxDist > 0.0) fSquareMaxDist *= Global::fDistanceFactor; if (fSquareMinDist > 0.0) - fSquareMinDist *= Global::fDistanceFactor; + fSquareMinDist /= Global::fDistanceFactor; // if (fNearAttenStart>0.0) fNearAttenStart*=Global::fDistanceFactor; // if (fNearAttenEnd>0.0) fNearAttenEnd*=Global::fDistanceFactor; if (Child) @@ -2015,12 +2012,10 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, if (pTexture.find_last_of("/\\") == std::string::npos) pTexture.insert(0, Global::asCurrentTexturePath); TextureID = GfxRenderer.GetTextureId(pTexture, szTexturePath); - if( Opacity < 1.0 ) // przezroczystość z tekstury brana tylko dla Opacity 0! - iFlags |= GfxRenderer.Texture( TextureID ).has_alpha ? - 0x20 : - 0x10; // 0x10-nieprzezroczysta, 0x20-przezroczysta - else - iFlags |= 0x10; // normalnie nieprzezroczyste + iFlags |= + ( GfxRenderer.Texture( TextureID ).has_alpha ? + 0x20 : + 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta } else TextureID = iTexture; diff --git a/RealSound.cpp b/RealSound.cpp index 6f667148..19b814e6 100644 --- a/RealSound.cpp +++ b/RealSound.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. //#include "math.h" #include "Timer.h" #include "mczapkie/mctools.h" +#include "usefull.h" TRealSound::TRealSound(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, bool freqmod, double rmin) @@ -177,7 +178,7 @@ void TRealSound::AdjFreq(double Freq, double dt) // McZapkie TODO: dorobic tu ef // Freq moze byc liczba dodatnia mniejsza od 1 lub wieksza od 1 { float df, Vlist; - if ((Global::bSoundEnabled) && (AM != 0)) + if ((Global::bSoundEnabled) && (AM != 0) && (pSound != nullptr)) { if (dt > 0) // efekt Dopplera @@ -190,9 +191,7 @@ void TRealSound::AdjFreq(double Freq, double dt) // McZapkie TODO: dorobic tu ef if (Timer::GetSoundTimer()) { df = fFrequency * df; // TODO - brac czestotliwosc probkowania z wav - pSound->SetFrequency((df < DSBFREQUENCY_MIN ? - DSBFREQUENCY_MIN : - (df > DSBFREQUENCY_MAX ? DSBFREQUENCY_MAX : df))); + pSound->SetFrequency( clamp( df, static_cast(DSBFREQUENCY_MIN), static_cast(DSBFREQUENCY_MAX) ) ); } } } diff --git a/Texture.cpp b/Texture.cpp index 878c4f3d..b3b6732c 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -275,6 +275,12 @@ opengl_texture::load_DDS() { --mapcount; } */ + if( datasize == 0 ) { + // catch malformed .dds files + WriteLog( "File \"" + name + "\" is malformed and holds no texture data." ); + data_state = resource_state::failed; + return; + } // reserve space and load texture data data.resize( datasize ); if( offset != 0 ) { diff --git a/skydome.cpp b/skydome.cpp index 68a1f316..2afb16c3 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -2,6 +2,7 @@ #include "stdafx.h" #include "skydome.h" #include "color.h" +#include "usefull.h" // sky gradient based on "A practical analytic model for daylight" // by A. J. Preetham Peter Shirley Brian Smits (University of Utah) @@ -41,21 +42,6 @@ float CSkyDome::m_zenithymatrix[ 3 ][ 4 ] = { //******************************************************************************// -float clamp( float const Value, float const Min, float const Max ) { - - float value = Value; - if( value < Min ) { value = Min; } - if( value > Max ) { value = Max; } - return value; -} - -float interpolate( float const First, float const Second, float const Factor ) { - - return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); -} - -//******************************************************************************// - CSkyDome::CSkyDome (int const Tesselation) : m_tesselation( Tesselation ) { @@ -121,8 +107,6 @@ void CSkyDome::Generate() { } } -//******************************************************************************// - void CSkyDome::Update( Math3D::vector3 const &Sun ) { if( true == SetSunPosition( Sun ) ) { @@ -166,8 +150,6 @@ void CSkyDome::Render() { ::glDisableClientState( GL_VERTEX_ARRAY ); } -//******************************************************************************// - bool CSkyDome::SetSunPosition( Math3D::vector3 const &Direction ) { auto sundirection = SafeNormalize( float3( Direction.x, Direction.y, Direction.z) ); @@ -205,8 +187,6 @@ void CSkyDome::SetOvercastFactor( float const Overcast ) { m_overcast = clamp( Overcast, 0.0f, 1.0f ); } -//******************************************************************************// - void CSkyDome::GetPerez( float *Perez, float Distribution[ 5 ][ 2 ], const float Turbidity ) { Perez[ 0 ] = Distribution[ 0 ][ 0 ] * Turbidity + Distribution[ 0 ][ 1 ]; @@ -227,8 +207,6 @@ float CSkyDome::GetZenith( float Zenithmatrix[ 3 ][ 4 ], const float Theta, cons } -//******************************************************************************// - float CSkyDome::PerezFunctionO1( float Perezcoeffs[ 5 ], const float Thetasun, const float Zenithval ) { const float val = ( 1.0f + Perezcoeffs[ 0 ] * std::exp( Perezcoeffs[ 1 ] ) ) * @@ -244,7 +222,6 @@ float CSkyDome::PerezFunctionO2( float Perezcoeffs[ 5 ], const float Icostheta, ( 1.0f + Perezcoeffs[ 2 ] * std::exp( Perezcoeffs[ 3 ] * Gamma ) + Perezcoeffs[ 4 ] * Cosgamma2 ); } -//******************************************************************************// void CSkyDome::RebuildColors() { // get zenith luminance @@ -320,7 +297,7 @@ void CSkyDome::RebuildColors() { // override the hue, based on sun height above the horizon. crude way to deal with model shortcomings // correction begins when the sun is higher than 10 degrees above the horizon, and fully in effect at 10+15 degrees - auto const degreesabovehorizon = 90.0f - m_thetasun * ( 180.0f / M_PI ); + float const degreesabovehorizon = 90.0f - m_thetasun * ( 180.0f / M_PI ); auto const sunbasedphase = clamp( (1.0f / 15.0f) * ( degreesabovehorizon - 10.0f ), 0.0f, 1.0f ); // correction is applied in linear manner from the bottom, becomes fully in effect for vertices with y = 0.50 auto const heightbasedphase = clamp( vertex.y * 2.0f, 0.0f, 1.0f ); diff --git a/usefull.h b/usefull.h index aabeba22..7c7cb2b6 100644 --- a/usefull.h +++ b/usefull.h @@ -9,17 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -//#define B1(t) (t*t*t) -//#define B2(t) (3*t*t*(1-t)) -//#define B3(t) (3*t*(1-t)*(1-t)) -//#define B4(t) ((1-t)*(1-t)*(1-t)) -// Ra: to jest mocno nieoptymalne: 10+3*4=22 mnożenia, 6 odejmowań, 3*3=9 dodawań -// Ra: po przeliczeniu współczynników mamy: 3*3=9 mnożeń i 3*3=9 dodawań -//#define Interpolate(t,p1,cp1,cp2,p2) (B4(t)*p1+B3(t)*cp1+B2(t)*cp2+B1(t)*p2) - -// Ra: "delete NULL" nic nie zrobi, więc "if (a!=NULL)" jest zbędne -//#define SafeFree(a) if (a!=NULL) free(a) -//#define M_PI = 3.141592653589793 +#include "stdafx.h" #define SafeDelete(a) \ { \ @@ -37,25 +27,26 @@ http://mozilla.org/MPL/2.0/. #define DegToRad(a) ((M_PI / 180.0) * (a)) //(a) w nawiasie, bo może być dodawaniem #define RadToDeg(r) ((180.0 / M_PI) * (r)) -#define Fix(a, b, c) \ - { \ - if (a < b) \ - a = b; \ - if (a > c) \ - a = c; \ - } - #define asModelsPath std::string("models\\") #define asSceneryPath std::string("scenery\\") -//#define asTexturePath AnsiString("textures\\") -//#define asTextureExt AnsiString(".bmp") #define szSceneryPath "scenery\\" #define szTexturePath "textures\\" -//#define szDefaultTextureExt ".dds" - -//#define DevelopTime //FIXME -//#define EditorMode #define MAKE_ID4(a,b,c,d) (((std::uint32_t)(d)<<24)|((std::uint32_t)(c)<<16)|((std::uint32_t)(b)<<8)|(std::uint32_t)(a)) +template +_Type clamp( _Type const Value, _Type const Min, _Type const Max ) { + + _Type value = Value; + if( value < Min ) { value = Min; } + if( value > Max ) { value = Max; } + return value; +} + +template +_Type interpolate( _Type const First, _Type const Second, float const Factor ) { + + return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); +} + //--------------------------------------------------------------------------- From b5ae395c426fbd1c6e94dcce4f48734685557ea3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 8 Mar 2017 23:54:20 +0100 Subject: [PATCH 051/426] camera frustum --- Camera.cpp | 14 ++++ Camera.h | 10 +++ DynObj.cpp | 8 +- EU07.cpp | 2 +- Globals.cpp | 6 +- Model3d.cpp | 21 ++++- World.cpp | 15 +++- frustum.cpp | 178 ++++++++++++++++++++++++++++++++++++++++ frustum.h | 67 +++++++++++++++ maszyna.vcxproj | 2 + maszyna.vcxproj.filters | 6 ++ 11 files changed, 314 insertions(+), 15 deletions(-) create mode 100644 frustum.cpp create mode 100644 frustum.h diff --git a/Camera.cpp b/Camera.cpp index ffd58d66..e92180ee 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -169,3 +169,17 @@ void TCamera::Stop() Type = tp_Follow; Velocity = vector3(0, 0, 0); }; + +// returns true if specified object is within camera frustum, false otherwise +bool +TCamera::IsVisible( TDynamicObject const *Dynamic ) const { + + // sphere test is faster than AABB, so we'll use it here + float3 diagonal( + Dynamic->MoverParameters->Dim.L, + Dynamic->MoverParameters->Dim.H, + Dynamic->MoverParameters->Dim.W ); + float const radius = static_cast(diagonal.Length()) * 0.5f; + + return ( m_frustum.sphere_inside( Dynamic->GetPosition(), radius ) > 0.0f ); +} diff --git a/Camera.h b/Camera.h index 0d1ab315..2ec975da 100644 --- a/Camera.h +++ b/Camera.h @@ -11,6 +11,9 @@ http://mozilla.org/MPL/2.0/. #define CameraH #include "dumb3d.h" +#include "frustum.h" +#include "dynobj.h" + using namespace Math3D; //--------------------------------------------------------------------------- @@ -25,6 +28,8 @@ class TCamera { private: vector3 pOffset; // nie używane (zerowe) + cFrustum m_frustum; + public: // McZapkie: potrzebuje do kiwania na boki double Pitch; double Yaw; // w środku: 0=do przodu; na zewnątrz: 0=na południe @@ -51,6 +56,11 @@ class TCamera void SetCabMatrix(vector3 &p); void RaLook(); void Stop(); + inline + void + SetFrustum() { m_frustum.calculate(); } + bool + IsVisible( TDynamicObject const *Dynamic ) const; // bool GetMatrix(matrix4x4 &Matrix); vector3 PtNext, PtPrev; }; diff --git a/DynObj.cpp b/DynObj.cpp index cf31b015..1a3a2dc3 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3703,6 +3703,7 @@ void TDynamicObject::TurnOff() void TDynamicObject::Render() { // rysowanie elementów nieprzezroczystych // youBy - sprawdzamy, czy jest sens renderowac +/* double modelrotate; vector3 tempangle; // zmienne @@ -3713,8 +3714,7 @@ void TDynamicObject::Render() if (ObjSqrDist < 500) // jak jest blisko - do 70m modelrotate = 0.01; // mały kąt, żeby nie znikało else - { // Global::pCameraRotation to kąt bewzględny w świecie (zero - na - // północ) + { // Global::pCameraRotation to kąt bewzględny w świecie (zero - na północ) tempangle = (vPosition - Global::pCameraPosition); // wektor od kamery modelrotate = ABuAcos(tempangle); // określenie kąta // if (modelrotate>M_PI) modelrotate-=(2*M_PI); @@ -3730,8 +3730,8 @@ void TDynamicObject::Render() if (modelrotate < maxrot) renderme = true; - - if (renderme) +*/ + if (Global::pCamera->IsVisible(this)) { TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji // AnsiString asLoadName=""; diff --git a/EU07.cpp b/EU07.cpp index aeae755f..3e3eedcf 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -93,7 +93,7 @@ void window_resize_callback(GLFWwindow *window, int w, int h) { Global::ScreenWidth = w; Global::ScreenHeight = h; - Global::fDistanceFactor = h / 768.0f; // not sure if this is really something we want to use + Global::fDistanceFactor = std::max( 0.5f, h / 768.0f ); // not sure if this is really something we want to use glViewport(0, 0, w, h); } diff --git a/Globals.cpp b/Globals.cpp index b0e54344..9693076d 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -495,9 +495,9 @@ void Global::ConfigParse(cParser &Parser) { Parser.getTokens(); - Parser >> token; - - Global::bUseVBO = (token == "yes"); + Parser >> Global::bUseVBO; + // NOTE: temporary override until render paths are sorted out + Global::bUseVBO = false; } else if (token == "feedbackmode") { diff --git a/Model3d.cpp b/Model3d.cpp index d3378b69..040a0eec 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1050,7 +1050,9 @@ void TSubModel::RaAnimation(TAnimType a) void TSubModel::RenderDL() { // główna procedura renderowania przez DL - if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) + if( ( iVisible ) + && ( fSquareDist >= (fSquareMinDist / Global::fDistanceFactor) ) + && ( fSquareDist <= (fSquareMaxDist * Global::fDistanceFactor) ) ) { if (iFlags & 0xC000) { @@ -1147,7 +1149,9 @@ void TSubModel::RenderDL() void TSubModel::RenderAlphaDL() { // renderowanie przezroczystych przez DL - if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) + if( ( iVisible ) + && ( fSquareDist >= (fSquareMinDist / Global::fDistanceFactor) ) + && ( fSquareDist <= (fSquareMaxDist * Global::fDistanceFactor) ) ) { if (iFlags & 0xC000) { @@ -1227,7 +1231,9 @@ void TSubModel::RenderAlphaDL() void TSubModel::RenderVBO() { // główna procedura renderowania przez VBO - if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) + if( ( iVisible ) + && ( fSquareDist >= (fSquareMinDist / Global::fDistanceFactor) ) + && ( fSquareDist <= (fSquareMaxDist * Global::fDistanceFactor) ) ) { if (iFlags & 0xC000) { @@ -1400,7 +1406,9 @@ void TSubModel::RenderVBO() void TSubModel::RenderAlphaVBO() { // renderowanie przezroczystych przez VBO - if (iVisible && (fSquareDist >= fSquareMinDist) && (fSquareDist < fSquareMaxDist)) + if( ( iVisible ) + && ( fSquareDist >= (fSquareMinDist / Global::fDistanceFactor) ) + && ( fSquareDist <= (fSquareMaxDist * Global::fDistanceFactor) ) ) { if (iFlags & 0xC000) { @@ -1475,6 +1483,8 @@ void TSubModel::RaArrayFill(CVertNormTex *Vert) Next->RaArrayFill(Vert); }; +// NOTE: leftover from static distance factor adjustment. +// TODO: get rid of it, once we have the dynamic adjustment code in place void TSubModel::AdjustDist() { // aktualizacja odległości faz LoD, zależna od // rozdzielczości pionowej oraz multisamplingu @@ -2120,10 +2130,13 @@ void TModel3d::Init() } if (iNumVerts) { +/* // NOTE: we will be applying distance factor dynamically during render, + // so we're leaving the defined ranges intact if (Global::fDistanceFactor != 1.0) // trochę zaoszczędzi czasu na modelach z wieloma submocelami Root->AdjustDist(); // aktualizacja odległości faz LoD, zależnie od // rozdzielczości pionowej oraz multisamplingu +*/ if (Global::bUseVBO) { if (!m_pVNT) // jeśli nie ma jeszcze tablicy (wczytano z pliku diff --git a/World.cpp b/World.cpp index 3cf31fe2..94d7ab85 100644 --- a/World.cpp +++ b/World.cpp @@ -30,8 +30,6 @@ http://mozilla.org/MPL/2.0/. #include "Console.h" #include "color.h" -#define TEXTURE_FILTER_CONTROL_EXT 0x8500 -#define TEXTURE_LOD_BIAS_EXT 0x8501 //--------------------------------------------------------------------------- // GLUTAPI void APIENTRY glutBitmapCharacterDLL(void *font, int character); @@ -283,6 +281,7 @@ bool TWorld::Init( GLFWwindow *w ) { glEnable(GL_CULL_FACE); // Cull back-facing triangles glLineWidth(1.0f); glPointSize(3.0f); + glEnable( GL_POINT_SMOOTH ); #ifdef EU07_USE_OLD_LIGHTING_MODEL // ----------- LIGHTING SETUP ----------- // Light values and coordinates @@ -1110,13 +1109,22 @@ bool TWorld::Update() int updatecount = 1; if( dt > m_primaryupdaterate ) // normalnie 0.01s { +/* + // NOTE: experimentally disabled physics update cap auto const iterations = std::ceil(dt / m_primaryupdaterate); updatecount = std::min( 20, static_cast( iterations ) ); +*/ + updatecount = std::ceil( dt / m_primaryupdaterate ); +/* + // NOTE: changing dt wrecks things further down the code. re-acquire proper value later or cleanup here dt = dt / iterations; // Ra: fizykę lepiej by było przeliczać ze stałym krokiem +*/ } // NOTE: updates are limited to 20, but dt is distributed over potentially many more iterations // this means at count > 20 simulation and render are going to desync. is that right? - Ground.Update(dt, updatecount); // tu zrobić tylko coklatkową aktualizację przesunięć + // NOTE: experimentally changing this to prevent the desync. + // TODO: test what happens if we hit more than 20 * 0.01 sec slices, i.e. less than 5 fps + Ground.Update(dt / updatecount, updatecount); // tu zrobić tylko coklatkową aktualizację przesunięć /* if (DebugModeFlag) if (Global::bActive) // nie przyspieszać, gdy jedzie w tle :) @@ -1437,6 +1445,7 @@ bool TWorld::Render() glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glLoadIdentity(); Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii + Camera.SetFrustum(); // update camera frustum to match current data if( !Global::bWireFrame ) { // bez nieba w trybie rysowania linii diff --git a/frustum.cpp b/frustum.cpp new file mode 100644 index 00000000..f0244f5a --- /dev/null +++ b/frustum.cpp @@ -0,0 +1,178 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "frustum.h" + +void +cFrustum::calculate() { + + float proj[ 16 ]; + float modl[ 16 ]; + float clip[ 16 ]; + + glGetFloatv( GL_PROJECTION_MATRIX, proj ); + glGetFloatv( GL_MODELVIEW_MATRIX, modl ); + + // multiply the matrices to retrieve clipping planes + clip[ 0 ] = modl[ 0 ] * proj[ 0 ] + modl[ 1 ] * proj[ 4 ] + modl[ 2 ] * proj[ 8 ] + modl[ 3 ] * proj[ 12 ]; + clip[ 1 ] = modl[ 0 ] * proj[ 1 ] + modl[ 1 ] * proj[ 5 ] + modl[ 2 ] * proj[ 9 ] + modl[ 3 ] * proj[ 13 ]; + clip[ 2 ] = modl[ 0 ] * proj[ 2 ] + modl[ 1 ] * proj[ 6 ] + modl[ 2 ] * proj[ 10 ] + modl[ 3 ] * proj[ 14 ]; + clip[ 3 ] = modl[ 0 ] * proj[ 3 ] + modl[ 1 ] * proj[ 7 ] + modl[ 2 ] * proj[ 11 ] + modl[ 3 ] * proj[ 15 ]; + + clip[ 4 ] = modl[ 4 ] * proj[ 0 ] + modl[ 5 ] * proj[ 4 ] + modl[ 6 ] * proj[ 8 ] + modl[ 7 ] * proj[ 12 ]; + clip[ 5 ] = modl[ 4 ] * proj[ 1 ] + modl[ 5 ] * proj[ 5 ] + modl[ 6 ] * proj[ 9 ] + modl[ 7 ] * proj[ 13 ]; + clip[ 6 ] = modl[ 4 ] * proj[ 2 ] + modl[ 5 ] * proj[ 6 ] + modl[ 6 ] * proj[ 10 ] + modl[ 7 ] * proj[ 14 ]; + clip[ 7 ] = modl[ 4 ] * proj[ 3 ] + modl[ 5 ] * proj[ 7 ] + modl[ 6 ] * proj[ 11 ] + modl[ 7 ] * proj[ 15 ]; + + clip[ 8 ] = modl[ 8 ] * proj[ 0 ] + modl[ 9 ] * proj[ 4 ] + modl[ 10 ] * proj[ 8 ] + modl[ 11 ] * proj[ 12 ]; + clip[ 9 ] = modl[ 8 ] * proj[ 1 ] + modl[ 9 ] * proj[ 5 ] + modl[ 10 ] * proj[ 9 ] + modl[ 11 ] * proj[ 13 ]; + clip[ 10 ] = modl[ 8 ] * proj[ 2 ] + modl[ 9 ] * proj[ 6 ] + modl[ 10 ] * proj[ 10 ] + modl[ 11 ] * proj[ 14 ]; + clip[ 11 ] = modl[ 8 ] * proj[ 3 ] + modl[ 9 ] * proj[ 7 ] + modl[ 10 ] * proj[ 11 ] + modl[ 11 ] * proj[ 15 ]; + + clip[ 12 ] = modl[ 12 ] * proj[ 0 ] + modl[ 13 ] * proj[ 4 ] + modl[ 14 ] * proj[ 8 ] + modl[ 15 ] * proj[ 12 ]; + clip[ 13 ] = modl[ 12 ] * proj[ 1 ] + modl[ 13 ] * proj[ 5 ] + modl[ 14 ] * proj[ 9 ] + modl[ 15 ] * proj[ 13 ]; + clip[ 14 ] = modl[ 12 ] * proj[ 2 ] + modl[ 13 ] * proj[ 6 ] + modl[ 14 ] * proj[ 10 ] + modl[ 15 ] * proj[ 14 ]; + clip[ 15 ] = modl[ 12 ] * proj[ 3 ] + modl[ 13 ] * proj[ 7 ] + modl[ 14 ] * proj[ 11 ] + modl[ 15 ] * proj[ 15 ]; + + // get the sides of the frustum. + m_frustum[ side_RIGHT ][ plane_A ] = clip[ 3 ] - clip[ 0 ]; + m_frustum[ side_RIGHT ][ plane_B ] = clip[ 7 ] - clip[ 4 ]; + m_frustum[ side_RIGHT ][ plane_C ] = clip[ 11 ] - clip[ 8 ]; + m_frustum[ side_RIGHT ][ plane_D ] = clip[ 15 ] - clip[ 12 ]; + normalize_plane( side_RIGHT ); + + m_frustum[ side_LEFT ][ plane_A ] = clip[ 3 ] + clip[ 0 ]; + m_frustum[ side_LEFT ][ plane_B ] = clip[ 7 ] + clip[ 4 ]; + m_frustum[ side_LEFT ][ plane_C ] = clip[ 11 ] + clip[ 8 ]; + m_frustum[ side_LEFT ][ plane_D ] = clip[ 15 ] + clip[ 12 ]; + normalize_plane( side_LEFT ); + + m_frustum[ side_BOTTOM ][ plane_A ] = clip[ 3 ] + clip[ 1 ]; + m_frustum[ side_BOTTOM ][ plane_B ] = clip[ 7 ] + clip[ 5 ]; + m_frustum[ side_BOTTOM ][ plane_C ] = clip[ 11 ] + clip[ 9 ]; + m_frustum[ side_BOTTOM ][ plane_D ] = clip[ 15 ] + clip[ 13 ]; + normalize_plane( side_BOTTOM ); + + m_frustum[ side_TOP ][ plane_A ] = clip[ 3 ] - clip[ 1 ]; + m_frustum[ side_TOP ][ plane_B ] = clip[ 7 ] - clip[ 5 ]; + m_frustum[ side_TOP ][ plane_C ] = clip[ 11 ] - clip[ 9 ]; + m_frustum[ side_TOP ][ plane_D ] = clip[ 15 ] - clip[ 13 ]; + normalize_plane( side_TOP ); + + m_frustum[ side_BACK ][ plane_A ] = clip[ 3 ] - clip[ 2 ]; + m_frustum[ side_BACK ][ plane_B ] = clip[ 7 ] - clip[ 6 ]; + m_frustum[ side_BACK ][ plane_C ] = clip[ 11 ] - clip[ 10 ]; + m_frustum[ side_BACK ][ plane_D ] = clip[ 15 ] - clip[ 14 ]; + normalize_plane( side_BACK ); + + m_frustum[ side_FRONT ][ plane_A ] = clip[ 3 ] + clip[ 2 ]; + m_frustum[ side_FRONT ][ plane_B ] = clip[ 7 ] + clip[ 6 ]; + m_frustum[ side_FRONT ][ plane_C ] = clip[ 11 ] + clip[ 10 ]; + m_frustum[ side_FRONT ][ plane_D ] = clip[ 15 ] + clip[ 14 ]; + normalize_plane( side_FRONT ); +} + +bool +cFrustum::point_inside( float const X, float const Y, float const Z ) const { + + // cycle through the sides of the frustum, checking if the point is behind them + for( int idx = 0; idx < 6; ++idx ) { + if( m_frustum[ idx ][ plane_A ] * X + + m_frustum[ idx ][ plane_B ] * Y + + m_frustum[ idx ][ plane_C ] * Z + + m_frustum[ idx ][ plane_D ] <= 0 ) + return false; + } + + // the point is in front of each frustum plane, i.e. inside of the frustum + return true; +} + +float +cFrustum::sphere_inside( float const X, float const Y, float const Z, float const Radius ) const { + + float distance; + // go through all the sides of the frustum. bail out as soon as possible + for( int idx = 0; idx < 6; ++idx ) { + distance = + m_frustum[ idx ][ plane_A ] * X + + m_frustum[ idx ][ plane_B ] * Y + + m_frustum[ idx ][ plane_C ] * Z + + m_frustum[ idx ][ plane_D ]; + if( distance <= -Radius ) + return 0.0f; + } + return distance + Radius; +} + +bool +cFrustum::cube_inside( float const X, float const Y, float const Z, float const Size ) const { + + for( int idx = 0; idx < 6; ++idx ) { + if( m_frustum[ idx ][ plane_A ] * ( X - Size ) + + m_frustum[ idx ][ plane_B ] * ( Y - Size ) + + m_frustum[ idx ][ plane_C ] * ( Z - Size ) + + m_frustum[ idx ][ plane_D ] > 0 ) + continue; + if( m_frustum[ idx ][ plane_A ] * ( X + Size ) + + m_frustum[ idx ][ plane_B ] * ( Y - Size ) + + m_frustum[ idx ][ plane_C ] * ( Z - Size ) + + m_frustum[ idx ][ plane_D ] > 0 ) + continue; + if( m_frustum[ idx ][ plane_A ] * ( X - Size ) + + m_frustum[ idx ][ plane_B ] * ( Y + Size ) + + m_frustum[ idx ][ plane_C ] * ( Z - Size ) + + m_frustum[ idx ][ plane_D ] > 0 ) + continue; + if( m_frustum[ idx ][ plane_A ] * ( X + Size ) + + m_frustum[ idx ][ plane_B ] * ( Y + Size ) + + m_frustum[ idx ][ plane_C ] * ( Z - Size ) + + m_frustum[ idx ][ plane_D ] > 0 ) + continue; + if( m_frustum[ idx ][ plane_A ] * ( X - Size ) + + m_frustum[ idx ][ plane_B ] * ( Y - Size ) + + m_frustum[ idx ][ plane_C ] * ( Z + Size ) + + m_frustum[ idx ][ plane_D ] > 0 ) + continue; + if( m_frustum[ idx ][ plane_A ] * ( X + Size ) + + m_frustum[ idx ][ plane_B ] * ( Y - Size ) + + m_frustum[ idx ][ plane_C ] * ( Z + Size ) + + m_frustum[ idx ][ plane_D ] > 0 ) + continue; + if( m_frustum[ idx ][ plane_A ] * ( X - Size ) + + m_frustum[ idx ][ plane_B ] * ( Y + Size ) + + m_frustum[ idx ][ plane_C ] * ( Z + Size ) + + m_frustum[ idx ][ plane_D ] > 0 ) + continue; + if( m_frustum[ idx ][ plane_A ] * ( X + Size ) + + m_frustum[ idx ][ plane_B ] * ( Y + Size ) + + m_frustum[ idx ][ plane_C ] * ( Z + Size ) + + m_frustum[ idx ][ plane_D ] > 0 ) + continue; + + return false; + } + + return true; +} + +void cFrustum::normalize_plane( cFrustum::side const Side ) { + + float magnitude = + std::sqrt( + m_frustum[ Side ][ plane_A ] * m_frustum[ Side ][ plane_A ] + + m_frustum[ Side ][ plane_B ] * m_frustum[ Side ][ plane_B ] + + m_frustum[ Side ][ plane_C ] * m_frustum[ Side ][ plane_C ] ); + + m_frustum[ Side ][ plane_A ] /= magnitude; + m_frustum[ Side ][ plane_B ] /= magnitude; + m_frustum[ Side ][ plane_C ] /= magnitude; + m_frustum[ Side ][ plane_D ] /= magnitude; +} diff --git a/frustum.h b/frustum.h new file mode 100644 index 00000000..be8b9265 --- /dev/null +++ b/frustum.h @@ -0,0 +1,67 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "float3d.h" +#include "dumb3d.h" + +// generic frustum class. used to determine if objects are inside current view area + +class cFrustum { + +public: +// constructors: + +// methods: + // update the frustum to match current view orientation + void + calculate(); + // returns true if specified point is inside of the frustum + inline + bool + point_inside( float3 const &Point ) const { return point_inside( Point.x, Point.y, Point.z ); } + inline + bool + point_inside( Math3D::vector3 const &Point ) const { return point_inside( static_cast( Point.x ), static_cast( Point.y ), static_cast( Point.z ) ); } + bool + point_inside( float const X, float const Y, float const Z ) const; + // tests if the sphere is in frustum, returns the distance between origin and sphere centre + inline + float + sphere_inside( float3 const &Center, float const Radius ) const { return sphere_inside( Center.x, Center.y, Center.z, Radius ); } + inline + float + sphere_inside( Math3D::vector3 const &Center, float const Radius ) const { return sphere_inside( static_cast( Center.x ), static_cast( Center.y ), static_cast( Center.z ), Radius ); } + float + sphere_inside( float const X, float const Y, float const Z, float const Radius ) const; + // returns true if specified cube is inside of the frustum. Size = half of the length + inline + bool + cube_inside( float3 const &Center, float const Size ) const { return cube_inside( Center.x, Center.y, Center.z, Size ); } + inline + bool + cube_inside( Math3D::vector3 const &Center, float const Size ) const { return cube_inside( static_cast( Center.x ), static_cast( Center.y ), static_cast( Center.z ), Size ); } + bool + cube_inside( float const X, float const Y, float const Z, float const Size ) const; + +protected: +// types: + // planes of the frustum + enum side { side_RIGHT = 0, side_LEFT = 1, side_BOTTOM = 2, side_TOP = 3, side_BACK = 4, side_FRONT = 5 }; + // parameters of the frustum plane: A, B, C define plane normal, D defines distance from origin + enum plane { plane_A = 0, plane_B = 1, plane_C = 2, plane_D = 3 }; + +// methods: + void + normalize_plane( cFrustum::side const Side ); // normalizes a plane (A side) from the frustum + +// members: + float m_frustum[6][4]; // holds the A B C and D values (normal & distance) for each side of the frustum. +}; diff --git a/maszyna.vcxproj b/maszyna.vcxproj index 19e4a244..ad2f4f28 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -101,6 +101,7 @@ + @@ -166,6 +167,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 39c0f4ba..525c37ab 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -201,6 +201,9 @@ Source Files + + Source Files + @@ -389,6 +392,9 @@ Header Files + + Header Files + From 3708a01d262ef268bea005886b7799caab1f1898 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 10 Mar 2017 17:40:52 +0100 Subject: [PATCH 052/426] render code relocation, mouse wheel zoom control --- Camera.cpp | 13 --- Camera.h | 7 -- DynObj.cpp | 35 +----- DynObj.h | 5 + EU07.cpp | 24 +++- Float3d.h | 6 +- Globals.cpp | 12 +- Globals.h | 6 +- Model3d.cpp | 6 +- Model3d.h | 42 +++---- Track.cpp | 4 +- Train.cpp | 57 ++++----- World.cpp | 319 ++++++++++++++++++++++++--------------------------- World.h | 10 +- renderer.cpp | 278 +++++++++++++++++++++++++++++++++++++++++++- renderer.h | 37 ++++++ sky.cpp | 4 +- stars.cpp | 2 +- sun.cpp | 13 +++ sun.h | 7 +- 20 files changed, 579 insertions(+), 308 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index e92180ee..d02e6c9a 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -170,16 +170,3 @@ void TCamera::Stop() Velocity = vector3(0, 0, 0); }; -// returns true if specified object is within camera frustum, false otherwise -bool -TCamera::IsVisible( TDynamicObject const *Dynamic ) const { - - // sphere test is faster than AABB, so we'll use it here - float3 diagonal( - Dynamic->MoverParameters->Dim.L, - Dynamic->MoverParameters->Dim.H, - Dynamic->MoverParameters->Dim.W ); - float const radius = static_cast(diagonal.Length()) * 0.5f; - - return ( m_frustum.sphere_inside( Dynamic->GetPosition(), radius ) > 0.0f ); -} diff --git a/Camera.h b/Camera.h index 2ec975da..59145c05 100644 --- a/Camera.h +++ b/Camera.h @@ -11,7 +11,6 @@ http://mozilla.org/MPL/2.0/. #define CameraH #include "dumb3d.h" -#include "frustum.h" #include "dynobj.h" using namespace Math3D; @@ -28,7 +27,6 @@ class TCamera { private: vector3 pOffset; // nie używane (zerowe) - cFrustum m_frustum; public: // McZapkie: potrzebuje do kiwania na boki double Pitch; @@ -56,11 +54,6 @@ class TCamera void SetCabMatrix(vector3 &p); void RaLook(); void Stop(); - inline - void - SetFrustum() { m_frustum.calculate(); } - bool - IsVisible( TDynamicObject const *Dynamic ) const; // bool GetMatrix(matrix4x4 &Matrix); vector3 PtNext, PtPrev; }; diff --git a/DynObj.cpp b/DynObj.cpp index 1a3a2dc3..97517e77 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -523,7 +523,7 @@ void TDynamicObject::UpdateLeverEnum(TAnim *pAnim) }; // ABu 29.01.05 przeklejone z render i renderalpha: ********************* -void __inline TDynamicObject::ABuLittleUpdate(double ObjSqrDist) +void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) { // ABu290105: pozbierane i uporzadkowane powtarzajace // sie rzeczy z Render i RenderAlpha // dodatkowy warunek, if (ObjSqrDist<...) zeby niepotrzebnie nie zmianiec w @@ -3699,38 +3699,11 @@ void TDynamicObject::TurnOff() btMechanik1.TurnOff(); btMechanik2.TurnOff(); }; - +/* void TDynamicObject::Render() { // rysowanie elementów nieprzezroczystych // youBy - sprawdzamy, czy jest sens renderowac -/* - double modelrotate; - vector3 tempangle; - // zmienne - renderme = false; - // przeklejka - double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition) / Global::ZoomFactor; - // koniec przeklejki - if (ObjSqrDist < 500) // jak jest blisko - do 70m - modelrotate = 0.01; // mały kąt, żeby nie znikało - else - { // Global::pCameraRotation to kąt bewzględny w świecie (zero - na północ) - tempangle = (vPosition - Global::pCameraPosition); // wektor od kamery - modelrotate = ABuAcos(tempangle); // określenie kąta - // if (modelrotate>M_PI) modelrotate-=(2*M_PI); - modelrotate += Global::pCameraRotation; - } - if (modelrotate > M_PI) - modelrotate -= (2 * M_PI); - if (modelrotate < -M_PI) - modelrotate += (2 * M_PI); - ModCamRot = modelrotate; - modelrotate = abs(modelrotate); - - if (modelrotate < maxrot) - renderme = true; -*/ if (Global::pCamera->IsVisible(this)) { TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji @@ -3904,6 +3877,7 @@ void TDynamicObject::Render() TurnOff(); // przywrócenie domyślnych pozycji submodeli } // yB - koniec mieszania z grafika }; +*/ void TDynamicObject::RenderSounds() { // przeliczanie dźwięków, bo będzie @@ -4273,7 +4247,7 @@ void TDynamicObject::RenderSounds() } */ }; - +/* void TDynamicObject::RenderAlpha() { // rysowanie elementów półprzezroczystych if (renderme) @@ -4352,6 +4326,7 @@ void TDynamicObject::RenderAlpha() } return; } // koniec renderalpha +*/ // McZapkie-250202 // wczytywanie pliku z danymi multimedialnymi (dzwieki) diff --git a/DynObj.h b/DynObj.h index b3a48742..f1e0a391 100644 --- a/DynObj.h +++ b/DynObj.h @@ -141,6 +141,9 @@ class TAnim //--------------------------------------------------------------------------- class TDynamicObject { // klasa pojazdu + + friend class opengl_renderer; + private: // położenie pojazdu w świecie oraz parametry ruchu vector3 vPosition; // Ra: pozycja pojazdu liczona zaraz po przesunięciu vector3 vCoulpler[ 2 ]; // współrzędne sprzęgów do liczenia zderzeń czołowych @@ -417,8 +420,10 @@ public: // modele składowe pojazdu bool FastUpdate(double dt); void Move(double fDistance); void FastMove(double fDistance); +/* void Render(); void RenderAlpha(); +*/ void RenderSounds(); inline vector3 GetPosition() const { diff --git a/EU07.cpp b/EU07.cpp index 3e3eedcf..d32294d1 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -28,6 +28,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "World.h" #include "Mover.h" #include "usefull.h" +#include "timer.h" #pragma comment( lib, "glfw3dll.lib" ) #pragma comment( lib, "glew32.lib" ) @@ -148,7 +149,15 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo break; } case GLFW_KEY_F7: - if( DebugModeFlag ) { // siatki wyświetlane tyko w trybie testowym + if( DebugModeFlag ) { + + if( Global::ctrlState ) { + // ctrl + f7 toggles static daylight + World.ToggleDaylight(); + break; + } + // f7: wireframe toggle + // siatki wyświetlane tyko w trybie testowym Global::bWireFrame = !Global::bWireFrame; if( true == Global::bWireFrame ) { glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); @@ -177,6 +186,14 @@ void focus_callback( GLFWwindow *window, int focus ) Global::iPause |= 4; // włączenie pauzy, gdy nieaktywy } +void scroll_callback( GLFWwindow* window, double xoffset, double yoffset ) { + + if( DebugModeFlag && Global::ctrlState ) { + // ctrl + scroll wheel adjusts fov in debug mode + Global::FieldOfView = clamp( static_cast(Global::FieldOfView - yoffset * 20.0 / Global::fFpsAverage), 15.0f, 75.0f ); + } +} + #ifdef _WINDOWS extern "C" { @@ -283,6 +300,7 @@ int main(int argc, char *argv[]) glfwSetFramebufferSizeCallback(window, window_resize_callback); glfwSetCursorPosCallback(window, cursor_pos_callback); glfwSetKeyCallback(window, key_callback); + glfwSetScrollCallback( window, scroll_callback ); glfwSetWindowFocusCallback(window, focus_callback); { int width, height; @@ -329,7 +347,9 @@ int main(int argc, char *argv[]) } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć Console::On(); // włączenie konsoli - while (!glfwWindowShouldClose(window) && World.Update()) + while (!glfwWindowShouldClose(window) + && World.Update() + && GfxRenderer.Render()) { glfwSwapBuffers(window); glfwPollEvents(); diff --git a/Float3d.h b/Float3d.h index d6011163..c33a7283 100644 --- a/Float3d.h +++ b/Float3d.h @@ -23,7 +23,7 @@ class float3 y = b; z = c; }; - double inline Length() const; + float inline Length() const; }; inline bool operator==(const float3 &v1, const float3 &v2) @@ -49,9 +49,9 @@ inline float3 operator+(const float3 &v1, const float3 &v2) { return float3(v1.x + v2.x, v1.y + v2.y, v1.z + v2.z); }; -double inline float3::Length() const +float inline float3::Length() const { - return sqrt(x * x + y * y + z * z); + return std::sqrt(x * x + y * y + z * z); }; inline float3 operator*( float3 const &v, float const k ) { return float3( v.x * k, v.y * k, v.z * k ); diff --git a/Globals.cpp b/Globals.cpp index 9693076d..480c38a1 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -39,7 +39,6 @@ std::string Global::asCurrentDynamicPath = ""; int Global::iSlowMotion = 0; // info o malym FPS: 0-OK, 1-wyłączyć multisampling, 3-promień 1.5km, 7-1km TDynamicObject *Global::changeDynObj = NULL; // info o zmianie pojazdu -bool Global::detonatoryOK; // info o nowych detonatorach double Global::ABuDebug = 0; std::string Global::asSky = "1"; double Global::fOpenGL = 0.0; // wersja OpenGL - do sprawdzania obecności rozszerzeń @@ -80,7 +79,6 @@ cParser *Global::pParser = NULL; int Global::iSegmentsRendered = 90; // ilość segmentów do regulacji wydajności TCamera *Global::pCamera = NULL; // parametry kamery TDynamicObject *Global::pUserDynamic = NULL; // pojazd użytkownika, renderowany bez trzęsienia -bool Global::bSmudge = false; // czy wyświetlać smugę, a pojazd użytkownika na końcu /* std::string Global::asTranscript[5]; // napisy na ekranie (widoczne) */ @@ -125,7 +123,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::VSync{ false }; bool Global::bInactivePause = true; // automatyczna pauza, gdy okno nieaktywne float Global::fMouseXScale = 1.5f; float Global::fMouseYScale = 0.2f; @@ -133,6 +131,7 @@ std::string Global::SceneryFile = "td.scn"; std::string Global::asHumanCtrlVehicle = "EU07-424"; int Global::iMultiplayer = 0; // blokada działania niektórych funkcji na rzecz komunikacji double Global::fMoveLight = -1; // ruchome światło +bool Global::FakeLight{ false }; // toggle between fixed and dynamic daylight double Global::fLatitudeDeg = 52.0; // szerokość geograficzna float Global::fFriction = 1.0; // mnożnik tarcia - KURS90 double Global::fBrakeStep = 1.0; // krok zmiany hamulca dla klawiszy [Num3] i [Num9] @@ -282,8 +281,7 @@ void Global::ConfigParse(cParser &Parser) 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 ); + Global::FieldOfView = clamp( Global::FieldOfView, 15.0f, 75.0f ); } else if (token == "width") { @@ -583,8 +581,8 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens( 1, false ); Parser >> Global::DynamicLightCount; // clamp the light number - Global::DynamicLightCount = std::min( 7, Global::DynamicLightCount ); // max 8 lights per opengl specs, and one used for sun - Global::DynamicLightCount = std::max( 1, Global::DynamicLightCount ); // at least one light for controlled vehicle + // max 8 lights per opengl specs, minus one used for sun. at least one light for controlled vehicle + Global::DynamicLightCount = clamp( Global::DynamicLightCount, 1, 7 ); } else if (token == "smoothtraction") { diff --git a/Globals.h b/Globals.h index 1fdb847e..525201e3 100644 --- a/Globals.h +++ b/Globals.h @@ -244,7 +244,6 @@ class Global static int iSlowMotion; static TDynamicObject *changeDynObj; static double ABuDebug; - static bool detonatoryOK; static std::string asSky; static bool bnewAirCouplers; // Ra: nowe zmienne globalne @@ -274,13 +273,13 @@ class Global static int iCameraLast; static std::string asRelease; // numer static std::string asVersion; // z opisem - static int - iViewMode; // co aktualnie widać: 0-kabina, 1-latanie, 2-sprzęgi, 3-dokumenty, 4-obwody + static int iViewMode; // co aktualnie widać: 0-kabina, 1-latanie, 2-sprzęgi, 3-dokumenty, 4-obwody static GLint iMaxTextureSize; // maksymalny rozmiar tekstury static int iTextMode; // tryb pracy wyświetlacza tekstowego static int iScreenMode[12]; // numer ekranu wyświetlacza tekstowego static bool bDoubleAmbient; // podwójna jasność ambient static double fMoveLight; // numer dnia w roku albo -1 + static bool FakeLight; // toggle between fixed and dynamic daylight static bool bSmoothTraction; // wygładzanie drutów static double fSunDeclination; // deklinacja Słońca static double fTimeSpeed; // przyspieszenie czasu, zmienna do testów @@ -326,7 +325,6 @@ class Global // informacje podczas kalibracji static double fBrakeStep; // krok zmiany hamulca dla klawiszy [Num3] i [Num9] static bool bJoinEvents; // czy grupować eventy o tych samych nazwach - static bool bSmudge; // czy wyświetlać smugę, a pojazd użytkownika na końcu /* static std::string asTranscript[5]; // napisy na ekranie (widoczne) */ diff --git a/Model3d.cpp b/Model3d.cpp index 040a0eec..61a48c1e 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -29,7 +29,7 @@ using namespace Mtable; double TSubModel::fSquareDist = 0; size_t TSubModel::iInstance; // numer renderowanego egzemplarza obiektu -texture_manager::size_type *TSubModel::ReplacableSkinId = NULL; +texture_manager::size_type const *TSubModel::ReplacableSkinId = NULL; int TSubModel::iAlpha = 0x30300030; // maska do testowania flag tekstur wymiennych TModel3d *TSubModel::pRoot; // Ra: tymczasowo wskaźnik na model widoczny z submodelu std::string *TSubModel::pasText; @@ -2196,7 +2196,7 @@ Root->Render(ReplacableSkinId,iAlpha); glPopMatrix(); }; */ - +/* void TModel3d::Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) { iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste @@ -2217,7 +2217,7 @@ void TModel3d::RenderAlpha(double fSquareDistance, texture_manager::size_type *R Root->RenderAlphaDL(); } }; - +*/ /* void TModel3d::RaRender(vector3 pPosition,double fAngle,GLuint *ReplacableSkinId,int diff --git a/Model3d.h b/Model3d.h index a67bd66f..484652de 100644 --- a/Model3d.h +++ b/Model3d.h @@ -131,7 +131,10 @@ class TModel3d; class TSubModel { // klasa submodelu - pojedyncza siatka, punkt świetlny albo grupa punktów - //m7todo: zrobić normalną serializację + //m7todo: zrobić normalną serializację + + friend class opengl_renderer; + private: int iNext; int iChild; @@ -222,7 +225,7 @@ private: public: static size_t iInstance; // identyfikator egzemplarza, który aktualnie renderuje model - static texture_manager::size_type *ReplacableSkinId; + static texture_manager::size_type const *ReplacableSkinId; static int iAlpha; // maska bitowa dla danego przebiegu static double fSquareDist; static TModel3d *pRoot; @@ -279,7 +282,7 @@ public: void DisplayLists(); void BinInit(TSubModel *s, float4x4 *m, float8 *v, std::vector *t, std::vector *n, bool dynamic); - void ReplacableSet(texture_manager::size_type *r, int a) + void ReplacableSet(texture_manager::size_type const *r, int a) { ReplacableSkinId = r; iAlpha = a; @@ -322,6 +325,8 @@ public: class TModel3d : public CMesh { + friend class opengl_renderer; + private: // TMaterial *Materials; // int MaterialsCount; //Ra: nie używane @@ -355,32 +360,19 @@ public: void SaveToBinFile(char const *FileName); void BreakHierarhy(); // renderowanie specjalne +/* void Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); + void RenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); +*/ void RaRender(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RaRenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - // jeden kąt obrotu - void Render(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RenderAlpha(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RaRender(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RaRenderAlpha(vector3 pPosition, double fAngle = 0, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); + void RaRenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); // trzy kąty obrotu - void Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); - void RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, - int iAlpha = 0x30300030); + void Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); + void RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); + void RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); + void RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); // inline int GetSubModelsCount() { return (SubModelsCount); }; - int Flags() + int Flags() const { return iFlags; }; diff --git a/Track.cpp b/Track.cpp index d36ea6f1..7a4d2427 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2645,7 +2645,7 @@ void TTrack::RenderDyn() #else for( auto dynamic : Dynamics ) { // sam sprawdza, czy VBO; zmienia kontekst VBO! - dynamic->Render(); + GfxRenderer.Render( dynamic ); } #endif }; @@ -2662,7 +2662,7 @@ void TTrack::RenderDynAlpha() #else for( auto dynamic : Dynamics ) { // sam sprawdza, czy VBO; zmienia kontekst VBO! - dynamic->RenderAlpha(); + GfxRenderer.Render_Alpha( dynamic ); } #endif }; diff --git a/Train.cpp b/Train.cpp index 83489ad5..bf895e8c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1792,21 +1792,18 @@ if { // tryb freefly int CouplNr = -1; // normalnie żaden ze sprzęgów TDynamicObject *tmp; - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, - CouplNr); - if (tmp == NULL) - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, - 1500, CouplNr); - if (tmp && (CouplNr != -1)) + tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr); + if (tmp == nullptr) + tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr); + if( ( CouplNr != -1 ) + && ( tmp != nullptr ) + && ( tmp->MoverParameters->Couplers[ CouplNr ].Connected != nullptr ) ) { - if (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag == - 0) // najpierw hak + if (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag == 0) // najpierw hak { - if ((tmp->MoverParameters->Couplers[CouplNr] - .Connected->Couplers[CouplNr] - .AllowedFlag & - tmp->MoverParameters->Couplers[CouplNr].AllowedFlag & - ctrain_coupler) == ctrain_coupler) + if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag + & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag + & ctrain_coupler) == ctrain_coupler) if (tmp->MoverParameters->Attach( CouplNr, 2, tmp->MoverParameters->Couplers[CouplNr].Connected, @@ -1815,46 +1812,37 @@ if // tmp->MoverParameters->Couplers[CouplNr].Render=true; // //podłączony sprzęg będzie widoczny if (DynamicObject->Mechanik) // na wszelki wypadek - DynamicObject->Mechanik->CheckVehicles( - Connect); // aktualizacja flag kierunku w składzie + DynamicObject->Mechanik->CheckVehicles(Connect); // aktualizacja flag kierunku w składzie dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); dsbCouplerAttach->Play(0, 0, 0); } else WriteLog("Mechanical coupling failed."); } - else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, - ctrain_pneumatic)) // pneumatyka + else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_pneumatic)) // pneumatyka { - if ((tmp->MoverParameters->Couplers[CouplNr] - .Connected->Couplers[CouplNr] - .AllowedFlag & - tmp->MoverParameters->Couplers[CouplNr].AllowedFlag & - ctrain_pneumatic) == ctrain_pneumatic) + if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag + & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag + & ctrain_pneumatic) == ctrain_pneumatic) if (tmp->MoverParameters->Attach( CouplNr, 2, tmp->MoverParameters->Couplers[CouplNr].Connected, - tmp->MoverParameters->Couplers[CouplNr].CouplingFlag + - ctrain_pneumatic)) + tmp->MoverParameters->Couplers[CouplNr].CouplingFlag + ctrain_pneumatic)) { rsHiss.Play(1, DSBPLAY_LOOPING, true, tmp->GetPosition()); DynamicObject->SetPneumatic(CouplNr != 0, true); // Ra: to mi się nie podoba !!!! tmp->SetPneumatic(CouplNr != 0, true); } } - else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, - ctrain_scndpneumatic)) // zasilajacy + else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_scndpneumatic)) // zasilajacy { - if ((tmp->MoverParameters->Couplers[CouplNr] - .Connected->Couplers[CouplNr] - .AllowedFlag & - tmp->MoverParameters->Couplers[CouplNr].AllowedFlag & - ctrain_scndpneumatic) == ctrain_scndpneumatic) + if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag + & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag + & ctrain_scndpneumatic) == ctrain_scndpneumatic) if (tmp->MoverParameters->Attach( CouplNr, 2, tmp->MoverParameters->Couplers[CouplNr].Connected, - tmp->MoverParameters->Couplers[CouplNr].CouplingFlag + - ctrain_scndpneumatic)) + tmp->MoverParameters->Couplers[CouplNr].CouplingFlag + ctrain_scndpneumatic)) { // rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition()); dsbCouplerDetach->SetVolume(DSBVOLUME_MAX); @@ -1863,8 +1851,7 @@ if tmp->SetPneumatic(CouplNr != 0, false); } } - else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, - ctrain_controll)) // ukrotnionko + else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_controll)) // ukrotnionko { if ((tmp->MoverParameters->Couplers[CouplNr] .Connected->Couplers[CouplNr] diff --git a/World.cpp b/World.cpp index 94d7ab85..8ed14e17 100644 --- a/World.cpp +++ b/World.cpp @@ -168,7 +168,6 @@ bool TWorld::Init( GLFWwindow *w ) { window = w; Global::window = w; // do WM_COPYDATA Global::pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań - Global::detonatoryOK = true; WriteLog("Starting MaSzyna rail vehicle simulator."); WriteLog(Global::asVersion); /* @@ -1184,26 +1183,12 @@ bool TWorld::Update() // variable step render time routines Update_Camera( dt ); // TODO: move the fixed step cab camera updates to fixed step secondary routines section - // przy 0.25 smuga gaśnie o 6:37 w Quarku, a mogłaby już 5:40 - // Ra 2014-12: przy 0.15 się skarżyli, że nie widać smug => zmieniłem na 0.25 - // changed light activation threshold to 0.5, paired with strength reduction in daylight - if( Train ) { - // jeśli nie usunięty - Global::bSmudge = - ( FreeFlyModeFlag ? - false : - ( Train->Dynamic()->fShade <= 0.0 ? - ( Global::fLuminance <= 0.5 ) : - ( Train->Dynamic()->fShade * Global::fLuminance <= 0.5 ) ) ); - } + GfxRenderer.Update( dt ); + ResourceSweep(); m_init = true; - - // visualize state changes - if (!Render()) - return false; - - return (true); + + return true; }; void @@ -1430,36 +1415,9 @@ void TWorld::Update_Environment() { #endif } -bool TWorld::Render() +void TWorld::ResourceSweep() { - glColor3ub(255, 255, 255); - // glColor3b(255, 0, 255); - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - glDepthFunc( GL_LEQUAL ); - - glMatrixMode( GL_PROJECTION ); // select the Projection Matrix - glLoadIdentity(); // reset the Projection Matrix - // calculate the aspect ratio of the window - gluPerspective( Global::FieldOfView / Global::ZoomFactor, (GLdouble)Global::ScreenWidth / std::max((GLdouble)Global::ScreenHeight, 1.0), 0.1f * Global::ZoomFactor, 2500.0f * Global::ZoomFactor ); - - glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix - glLoadIdentity(); - Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii - Camera.SetFrustum(); // update camera frustum to match current data - - if( !Global::bWireFrame ) { - // bez nieba w trybie rysowania linii - Environment.render(); - } - - if( false == Ground.Render( Camera.Pos ) ) { return false; } - - Render_Cab(); - Render_UI(); - ResourceManager::Sweep( Timer::GetSimulationTime() ); - - return true; }; // rendering kabiny gdy jest oddzielnym modelem i ma byc wyswietlana @@ -1716,8 +1674,8 @@ TWorld::Render_Cab() { dynamic->mdKabina->RaRenderAlpha( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); } else { // renderowanie z Display List - dynamic->mdKabina->Render( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); - dynamic->mdKabina->RenderAlpha( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); + GfxRenderer.Render( dynamic->mdKabina, dynamic, 0.0 ); + GfxRenderer.Render_Alpha( dynamic->mdKabina, dynamic, 0.0 ); } #ifdef EU07_USE_OLD_LIGHTING_MODEL // TODO: re-implement this @@ -1765,13 +1723,14 @@ TWorld::Render_UI() { if( Global::iTextMode == GLFW_KEY_F8 ) { Global::iViewMode = GLFW_KEY_F8; - OutText1 = "FPS: "; - OutText1 += to_string( Timer::GetFPS(), 2 ); + OutText1 = "FPS: " + to_string( Timer::GetFPS(), 2 ); //OutText1 += sprintf(); if( Global::iSlowMotion ) OutText1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; - OutText1 += ", sectors: "; - OutText1 += to_string( Ground.iRendered ); + OutText1 += ", sectors: " + to_string( Ground.iRendered ); + if( DebugModeFlag ) { + OutText1 += " FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ); + } } // if (Console::Pressed(VK_F7)) @@ -2203,6 +2162,7 @@ TWorld::Render_UI() { .substr( 0 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); // current luminance level OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); + if( Global::FakeLight ) { OutText2 += "(*)"; } } // OutText3= AnsiString(" Online documentation (PL, ENG, DE, soon CZ): // http://www.eu07.pl"); @@ -2463,136 +2423,134 @@ TWorld::Render_UI() { // ABu 150205: prosty help, zeby sie na forum nikt nie pytal, jak ma ruszyc :) - if( Global::detonatoryOK ) { - // if (Console::Pressed(VK_F9)) ShowHints(); //to nie działa prawidłowo - prosili wyłączyć - if( Global::iTextMode == GLFW_KEY_F9 ) { // informacja o wersji, sposobie wyświetlania i błędach OpenGL - // Global::iViewMode=VK_F9; - OutText1 = Global::asVersion; // informacja o wersji - OutText2 = std::string( "Rendering mode: " ) + ( Global::bUseVBO ? "VBO" : "Display Lists" ); - if( Global::iMultiplayer ) - OutText2 += ". Multiplayer is active"; - OutText2 += "."; - GLenum err = glGetError(); - if( err != GL_NO_ERROR ) { - OutText3 = "OpenGL error " + to_string( err ) + ": " + - Global::Bezogonkow( ( (char *)gluErrorString( err ) ) ); - } + // if (Console::Pressed(VK_F9)) ShowHints(); //to nie działa prawidłowo - prosili wyłączyć + if( Global::iTextMode == GLFW_KEY_F9 ) { // informacja o wersji, sposobie wyświetlania i błędach OpenGL + // Global::iViewMode=VK_F9; + OutText1 = Global::asVersion; // informacja o wersji + OutText2 = std::string( "Rendering mode: " ) + ( Global::bUseVBO ? "VBO" : "Display Lists" ); + if( Global::iMultiplayer ) + OutText2 += ". Multiplayer is active"; + OutText2 += "."; + GLenum err = glGetError(); + if( err != GL_NO_ERROR ) { + OutText3 = "OpenGL error " + to_string( err ) + ": " + + Global::Bezogonkow( ( (char *)gluErrorString( err ) ) ); } - if( Global::iTextMode == GLFW_KEY_F3 ) { // wyświetlenie rozkładu jazdy, na razie jakkolwiek - TDynamicObject *tmp = FreeFlyModeFlag ? - Ground.DynamicNearest( Camera.Pos ) : - Controlled; // w trybie latania lokalizujemy wg mapy - Mtable::TTrainParameters *tt = NULL; - if( tmp ) - if( tmp->Mechanik ) { - tt = tmp->Mechanik->Timetable(); - if( tt ) // musi być rozkład - { // wyświetlanie rozkładu - glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy białym - // glTranslatef(0.0f,0.0f,-0.50f); - glRasterPos2f( -0.25f, 0.20f ); - OutText1 = tmp->Mechanik->Relation() + " (" + - tmp->Mechanik->Timetable()->TrainName + ")"; - glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); - glRasterPos2f( -0.25f, 0.19f ); - // glPrint("|============================|=======|=======|=====|"); - // glPrint("| Posterunek | Przyj.| Odjazd| Vmax|"); - // glPrint("|============================|=======|=======|=====|"); - glPrint( "|----------------------------|-------|-------|-----|" ); - TMTableLine *t; - for( int i = tmp->Mechanik->iStationStart; i <= tt->StationCount; ++i ) { // wyświetlenie pozycji z rozkładu - t = tt->TimeTable + i; // linijka rozkładu - OutText1 = ( t->StationName + - " " ).substr( 0, 26 ); - OutText2 = ( t->Ah >= 0 ) ? - to_string( int( 100 + t->Ah ) ).substr( 1, 2 ) + ":" + - to_string( int( 100 + t->Am ) ).substr( 1, 2 ) : - std::string( " " ); - OutText3 = ( t->Dh >= 0 ) ? - to_string( int( 100 + t->Dh ) ).substr( 1, 2 ) + ":" + - to_string( int( 100 + t->Dm ) ).substr( 1, 2 ) : - std::string( " " ); - OutText4 = " " + to_string( t->vmax, 0 ); - OutText4 = OutText4.substr( OutText4.length() - 3, - 3 ); // z wyrównaniem do prawej - // if (AnsiString(t->StationWare).Pos("@")) - OutText1 = "| " + OutText1 + " | " + OutText2 + " | " + OutText3 + - " | " + OutText4 + " | " + t->StationWare; - glRasterPos2f( -0.25f, - 0.18f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); - if( ( tmp->Mechanik->iStationStart < tt->StationIndex ) ? - ( i < tt->StationIndex ) : - false ) { // czas minął i odjazd był, to nazwa stacji będzie na zielono - glColor3f( 0.0f, 1.0f, 0.0f ); // zielone - glRasterPos2f( - -0.25f, - 0.18f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); // dopiero - // ustawienie - // pozycji - // ustala - // kolor, - // dziwne... - glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); - glColor3f( 1.0f, 1.0f, 1.0f ); // a reszta białym - } - else // normalne wyświetlanie, bez zmiany kolorów - glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); - glRasterPos2f( -0.25f, - 0.17f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); - glPrint( "|----------------------------|-------|-------|-----|" ); + } + if( Global::iTextMode == GLFW_KEY_F3 ) { // wyświetlenie rozkładu jazdy, na razie jakkolwiek + TDynamicObject *tmp = FreeFlyModeFlag ? + Ground.DynamicNearest( Camera.Pos ) : + Controlled; // w trybie latania lokalizujemy wg mapy + Mtable::TTrainParameters *tt = NULL; + if( tmp ) + if( tmp->Mechanik ) { + tt = tmp->Mechanik->Timetable(); + if( tt ) // musi być rozkład + { // wyświetlanie rozkładu + glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy białym + // glTranslatef(0.0f,0.0f,-0.50f); + glRasterPos2f( -0.25f, 0.20f ); + OutText1 = tmp->Mechanik->Relation() + " (" + + tmp->Mechanik->Timetable()->TrainName + ")"; + glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); + glRasterPos2f( -0.25f, 0.19f ); + // glPrint("|============================|=======|=======|=====|"); + // glPrint("| Posterunek | Przyj.| Odjazd| Vmax|"); + // glPrint("|============================|=======|=======|=====|"); + glPrint( "|----------------------------|-------|-------|-----|" ); + TMTableLine *t; + for( int i = tmp->Mechanik->iStationStart; i <= tt->StationCount; ++i ) { // wyświetlenie pozycji z rozkładu + t = tt->TimeTable + i; // linijka rozkładu + OutText1 = ( t->StationName + + " " ).substr( 0, 26 ); + OutText2 = ( t->Ah >= 0 ) ? + to_string( int( 100 + t->Ah ) ).substr( 1, 2 ) + ":" + + to_string( int( 100 + t->Am ) ).substr( 1, 2 ) : + std::string( " " ); + OutText3 = ( t->Dh >= 0 ) ? + to_string( int( 100 + t->Dh ) ).substr( 1, 2 ) + ":" + + to_string( int( 100 + t->Dm ) ).substr( 1, 2 ) : + std::string( " " ); + OutText4 = " " + to_string( t->vmax, 0 ); + OutText4 = OutText4.substr( OutText4.length() - 3, + 3 ); // z wyrównaniem do prawej + // if (AnsiString(t->StationWare).Pos("@")) + OutText1 = "| " + OutText1 + " | " + OutText2 + " | " + OutText3 + + " | " + OutText4 + " | " + t->StationWare; + glRasterPos2f( -0.25f, + 0.18f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); + if( ( tmp->Mechanik->iStationStart < tt->StationIndex ) ? + ( i < tt->StationIndex ) : + false ) { // czas minął i odjazd był, to nazwa stacji będzie na zielono + glColor3f( 0.0f, 1.0f, 0.0f ); // zielone + glRasterPos2f( + -0.25f, + 0.18f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); // dopiero + // ustawienie + // pozycji + // ustala + // kolor, + // dziwne... + glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); + glColor3f( 1.0f, 1.0f, 1.0f ); // a reszta białym } + else // normalne wyświetlanie, bez zmiany kolorów + glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); + glRasterPos2f( -0.25f, + 0.17f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); + glPrint( "|----------------------------|-------|-------|-----|" ); } } - OutText1 = OutText2 = OutText3 = OutText4 = ""; - } - else if( OutText1 != "" ) { // ABu: i od razu czyszczenie tego, co bylo napisane - // glTranslatef(0.0f,0.0f,-0.50f); - glRasterPos2f( -0.25f, 0.20f ); - glPrint( OutText1.c_str() ); - OutText1 = ""; - if( OutText2 != "" ) { - glRasterPos2f( -0.25f, 0.19f ); - glPrint( OutText2.c_str() ); - OutText2 = ""; } - if( OutText3 != "" ) { - glRasterPos2f( -0.25f, 0.18f ); - glPrint( OutText3.c_str() ); - OutText3 = ""; - if( OutText4 != "" ) { - glRasterPos2f( -0.25f, 0.17f ); - glPrint( OutText4.c_str() ); - OutText4 = ""; - } + OutText1 = OutText2 = OutText3 = OutText4 = ""; + } + else if( OutText1 != "" ) { // ABu: i od razu czyszczenie tego, co bylo napisane + // glTranslatef(0.0f,0.0f,-0.50f); + glRasterPos2f( -0.25f, 0.20f ); + glPrint( OutText1.c_str() ); + OutText1 = ""; + if( OutText2 != "" ) { + glRasterPos2f( -0.25f, 0.19f ); + glPrint( OutText2.c_str() ); + OutText2 = ""; + } + if( OutText3 != "" ) { + glRasterPos2f( -0.25f, 0.18f ); + glPrint( OutText3.c_str() ); + OutText3 = ""; + if( OutText4 != "" ) { + glRasterPos2f( -0.25f, 0.17f ); + glPrint( OutText4.c_str() ); + OutText4 = ""; } } - // if ((Global::iTextMode!=VK_F3)) - { // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) + } + // if ((Global::iTextMode!=VK_F3)) + { // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) /* - glColor3f( 1.0f, 1.0f, 0.0f ); //żółte - for( int i = 0; i < 5; ++i ) { // kilka linijek - if( Global::asTranscript[ i ].empty() ) - break; // dalej nie trzeba - else { - glRasterPos2f( -0.20f, -0.05f - 0.01f * i ); - glPrint( Global::Bezogonkow( Global::asTranscript[ i ] ).c_str() ); - } + glColor3f( 1.0f, 1.0f, 0.0f ); //żółte + for( int i = 0; i < 5; ++i ) { // kilka linijek + if( Global::asTranscript[ i ].empty() ) + break; // dalej nie trzeba + else { + glRasterPos2f( -0.20f, -0.05f - 0.01f * i ); + glPrint( Global::Bezogonkow( Global::asTranscript[ i ] ).c_str() ); } + } */ - int i = 0; - for( auto const &transcript : Global::tranTexts.aLines ) { + int i = 0; + for( auto const &transcript : Global::tranTexts.aLines ) { - if( Global::fTimeAngleDeg >= transcript.fShow ) { + if( Global::fTimeAngleDeg >= transcript.fShow ) { - cParser parser( transcript.asText ); - while( true == parser.getTokens(1, false, "|") ) { + cParser parser( transcript.asText ); + while( true == parser.getTokens(1, false, "|") ) { - std::string transcriptline; parser >> transcriptline; - ::glColor3f( 1.0f, 1.0f, 0.0f ); //żółte - ::glRasterPos2f( -0.20f, -0.05f - 0.01f * i ); - glPrint( transcriptline.c_str() ); - ++i; - } + std::string transcriptline; parser >> transcriptline; + ::glColor3f( 1.0f, 1.0f, 0.0f ); //żółte + ::glRasterPos2f( -0.20f, -0.05f - 0.01f * i ); + glPrint( transcriptline.c_str() ); + ++i; } } } @@ -2899,6 +2857,21 @@ void TWorld::CabChange(TDynamicObject *old, TDynamicObject *now) }; //--------------------------------------------------------------------------- +void +TWorld::ToggleDaylight() { + + Global::FakeLight = !Global::FakeLight; + + if( Global::FakeLight ) { + // for fake daylight enter fixed hour + Environment.time( 10, 30, 0 ); + } + else { + // local clock based calculation + Environment.time(); + } +} + void world_environment::init() { @@ -2976,3 +2949,9 @@ world_environment::render() { ::glEnable( GL_FOG ); ::glEnable( GL_LIGHTING ); } + +void +world_environment::time( int const Hour, int const Minute, int const Second ) { + + m_sun.setTime( Hour, Minute, Second ); +} diff --git a/World.h b/World.h index 67b0ece1..d9bbb954 100644 --- a/World.h +++ b/World.h @@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "stars.h" #include "skydome.h" #include "mczapkie/mover.h" -#include "glfw/glfw3.h" +#include "renderer.h" // wrapper for environment elements -- sky, sun, stars, clouds etc class world_environment { @@ -27,6 +27,7 @@ public: void init(); void update(); void render(); + void time( int const Hour = -1, int const Minute = -1, int const Second = -1 ); private: CSkyDome m_skydome; @@ -37,6 +38,9 @@ private: class TWorld { + // NOTE: direct access is a shortcut, but world etc needs some restructuring regardless + friend opengl_renderer; + void InOutKey( bool const Near = true ); void FollowView(bool wycisz = true); void DistantView( bool const Near = false ); @@ -53,6 +57,8 @@ class TWorld void OnCommandGet(DaneRozkaz *pRozkaz); bool Update(); void TrainDelete(TDynamicObject *d = NULL); + // switches between static and dynamic daylight calculation + void ToggleDaylight(); TWorld(); ~TWorld(); // double Aspect; @@ -63,7 +69,7 @@ class TWorld std::string OutText4; void Update_Environment(); void Update_Camera( const double Deltatime ); - bool Render(); + void ResourceSweep(); void Render_Cab(); void Render_UI(); TCamera Camera; diff --git a/renderer.cpp b/renderer.cpp index 3f539555..c038552a 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1,4 +1,4 @@ -/* +/* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not @@ -10,8 +10,25 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "renderer.h" #include "globals.h" +#include "world.h" +#include "dynobj.h" + +// returns true if specified object is within camera frustum, false otherwise +bool +opengl_camera::visible( TDynamicObject const *Dynamic ) const { + + // sphere test is faster than AABB, so we'll use it here + float3 diagonal( + Dynamic->MoverParameters->Dim.L, + Dynamic->MoverParameters->Dim.H, + Dynamic->MoverParameters->Dim.W ); + float const radius = diagonal.Length() * 0.5f; + + return ( m_frustum.sphere_inside( Dynamic->GetPosition(), radius ) > 0.0f ); +} opengl_renderer GfxRenderer; +extern TWorld World; void opengl_renderer::Init() { @@ -32,6 +49,265 @@ opengl_renderer::Init() { } } +bool +opengl_renderer::Render() { + + ::glColor3ub( 255, 255, 255 ); + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + ::glDepthFunc( GL_LEQUAL ); + + ::glMatrixMode( GL_PROJECTION ); // select the Projection Matrix + ::glLoadIdentity(); // reset the Projection Matrix + // calculate the aspect ratio of the window + ::gluPerspective( + Global::FieldOfView / Global::ZoomFactor, + (GLdouble)Global::ScreenWidth / std::max( (GLdouble)Global::ScreenHeight, 1.0 ), + 0.1f * Global::ZoomFactor, + m_drawrange ); + + ::glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix + ::glLoadIdentity(); + World.Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii + m_camera.update_frustum(); + + if( !Global::bWireFrame ) { + // bez nieba w trybie rysowania linii + World.Environment.render(); + } + + if( false == World.Ground.Render( World.Camera.Pos ) ) { return false; } + + World.Render_Cab(); + World.Render_UI(); + + return true; // for now always succeed +} + +bool +opengl_renderer::Render( TDynamicObject *Dynamic ) { + + if( false == m_camera.visible( Dynamic ) ) { + + Dynamic->renderme = false; + return false; + } + + Dynamic->renderme = true; + + TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji + double squaredistance = SquareMagnitude( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor; + Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu + + ::glPushMatrix(); + + if( Dynamic == Global::pUserDynamic ) { + //specjalne ustawienie, aby nie trzęsło + //tu trzeba by ustawić animacje na modelu zewnętrznym + ::glLoadIdentity(); // zacząć od macierzy jedynkowej + Global::pCamera->SetCabMatrix( Dynamic->vPosition ); // specjalne ustawienie kamery + } + else + ::glTranslated( Dynamic->vPosition.x, Dynamic->vPosition.y, Dynamic->vPosition.z ); // standardowe przesunięcie względem początku scenerii + + ::glMultMatrixd( Dynamic->mMatrix.getArray() ); + + // wersja Display Lists + // NOTE: VBO path is removed + // TODO: implement universal render path down the road + if( Dynamic->mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + // enable cab light if needed + if( Dynamic->InteriorLightLevel > 0.0f ) { + + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } + + Render( Dynamic->mdLowPolyInt, Dynamic, squaredistance ); + + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } + } + } + +// Dynamic->mdModel->Render( squaredistance, Dynamic->ReplacableSkinID, Dynamic->iAlpha ); + Render( Dynamic->mdModel, Dynamic, squaredistance ); + + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Render( Dynamic->mdLoad, Dynamic, squaredistance ); + if( Dynamic->mdPrzedsionek ) + Render( Dynamic->mdPrzedsionek, Dynamic, squaredistance ); + + ::glPopMatrix(); + + // TODO: check if this reset is needed. In theory each object should render all buttons based on its own instance data anyway? + if( Dynamic->btnOn ) + Dynamic->TurnOff(); // przywrócenie domyślnych pozycji submodeli + + return true; +} + +bool +opengl_renderer::Render( TModel3d *Model, TDynamicObject const *Instance, double const Squaredistance ) { + + auto alpha = + ( Instance != nullptr ? + Instance->iAlpha : + 0x30300030 ); + alpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste + if( 0 == ( alpha & Model->iFlags & 0x1F1F001F ) ) { + // czy w ogóle jest co robić w tym cyklu? + return false; + } + + Model->Root->fSquareDist = Squaredistance; // zmienna globalna! + + Model->Root->ReplacableSet( + ( Instance != nullptr ? + Instance->ReplacableSkinID : + nullptr ), + alpha ); + + Model->Root->RenderDL(); + + return true; +} + +bool +opengl_renderer::Render( TModel3d *Model, TDynamicObject const *Instance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { + + ::glPushMatrix(); + ::glTranslated( Position.x, Position.y, Position.z ); + if( Angle.y != 0.0 ) + ::glRotated( Angle.y, 0.0, 1.0, 0.0 ); + if( Angle.x != 0.0 ) + ::glRotated( Angle.x, 1.0, 0.0, 0.0 ); + if( Angle.z != 0.0 ) + ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); + + auto const result = Render( Model, Instance, SquareMagnitude( Position - Global::GetCameraPosition() ) ); + + ::glPopMatrix(); + + return result; +} + +bool +opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { + + if( false == Dynamic->renderme ) { + + return false; + } + + TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji + double squaredistance = SquareMagnitude( Global::pCameraPosition - Dynamic->vPosition ); + Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu + + ::glPushMatrix(); + if( Dynamic == Global::pUserDynamic ) { // specjalne ustawienie, aby nie trzęsło + ::glLoadIdentity(); // zacząć od macierzy jedynkowej + Global::pCamera->SetCabMatrix( Dynamic->vPosition ); // specjalne ustawienie kamery + } + else + ::glTranslated( Dynamic->vPosition.x, Dynamic->vPosition.y, Dynamic->vPosition.z ); // standardowe przesunięcie względem początku scenerii + + ::glMultMatrixd( Dynamic->mMatrix.getArray() ); + // wersja Display Lists + // NOTE: VBO path is removed + // TODO: implement universal render path down the road + if( Dynamic->mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + // enable cab light if needed + if( Dynamic->InteriorLightLevel > 0.0f ) { + + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } + + Render_Alpha( Dynamic->mdLowPolyInt, Dynamic, squaredistance ); + + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } + } + } + + Render_Alpha( Dynamic->mdModel, Dynamic, squaredistance ); + + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Render_Alpha( Dynamic->mdLoad, Dynamic, squaredistance ); + if( Dynamic->mdPrzedsionek ) + Render_Alpha( Dynamic->mdPrzedsionek, Dynamic, squaredistance ); + + ::glPopMatrix(); + + if( Dynamic->btnOn ) + Dynamic->TurnOff(); // przywrócenie domyślnych pozycji submodeli + + return true; +} + +bool +opengl_renderer::Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, double const Squaredistance ) { + + auto alpha = + ( Instance != nullptr ? + Instance->iAlpha : + 0x30300030 ); + + if( 0 == ( alpha & Model->iFlags & 0x2F2F002F ) ) { + // nothing to render + return false; + } + + Model->Root->fSquareDist = Squaredistance; // zmienna globalna! + + Model->Root->ReplacableSet( + ( Instance != nullptr ? + Instance->ReplacableSkinID : + nullptr ), + alpha ); + + Model->Root->RenderAlphaDL(); + + return true; +} + +bool +opengl_renderer::Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { + + ::glPushMatrix(); + ::glTranslated( Position.x, Position.y, Position.z ); + if( Angle.y != 0.0 ) + ::glRotated( Angle.y, 0.0, 1.0, 0.0 ); + if( Angle.x != 0.0 ) + ::glRotated( Angle.x, 1.0, 0.0, 0.0 ); + if( Angle.z != 0.0 ) + ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); + + auto const result = Render_Alpha( Model, Instance, SquareMagnitude( Position - Global::GetCameraPosition() ) ); + + ::glPopMatrix(); + + return result; +} + +void +opengl_renderer::Update ( double const Deltatile ) { + + // TODO: add garbage collection and other works here +}; + void opengl_renderer::Update_Lights( light_array const &Lights ) { diff --git a/renderer.h b/renderer.h index 719d78ae..0e32e093 100644 --- a/renderer.h +++ b/renderer.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "texture.h" #include "lightarray.h" #include "dumb3d.h" +#include "frustum.h" struct opengl_light { @@ -69,6 +70,22 @@ struct opengl_material { }; +// simple camera object. paired with 'virtual camera' in the scene +class opengl_camera { + +public: +// methods: + inline + void + update_frustum() { m_frustum.calculate(); } + bool + visible( TDynamicObject const *Dynamic ) const; + +private: +// members: + cFrustum m_frustum; +}; + // bare-bones render controller, in lack of anything better yet class opengl_renderer { @@ -78,6 +95,24 @@ public: // methods void Init(); + // main draw call. returns false on error + bool + Render(); + bool + Render( TDynamicObject *Dynamic ); + bool + Render( TModel3d *Model, TDynamicObject const *Instance, double const Squaredistance ); + bool + Render( TModel3d *Model, TDynamicObject const *Instance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + bool + Render_Alpha( TDynamicObject *Dynamic ); + bool + Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, double const Squaredistance ); + bool + Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + // maintenance jobs + void + Update( double const Deltatime); void Update_Lights( light_array const &Lights ); @@ -118,6 +153,8 @@ private: rendermode renderpass{ rendermode::color }; opengllight_array m_lights; texture_manager m_textures; + opengl_camera m_camera; + float m_drawrange{ 2500.0f }; // current drawing range }; extern opengl_renderer GfxRenderer; diff --git a/sky.cpp b/sky.cpp index 7c3aa79f..c7802f59 100644 --- a/sky.cpp +++ b/sky.cpp @@ -46,8 +46,8 @@ void TSky::Render( float3 const &Tint ) } else { // renderowanie z Display List - mdCloud->Render(100, 0); - mdCloud->RenderAlpha(100, 0); + GfxRenderer.Render( mdCloud, nullptr, 100.0 ); + GfxRenderer.Render_Alpha( mdCloud, nullptr, 100.0 ); } #ifdef EU07_USE_OLD_LIGHTING_MODEL glPopMatrix(); diff --git a/stars.cpp b/stars.cpp index 451d6aa0..0665ea17 100644 --- a/stars.cpp +++ b/stars.cpp @@ -21,7 +21,7 @@ cStars::render() { ::glRotatef( -std::fmod( Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX ::glPointSize( 2.0f ); - m_stars.Render( 1.0 ); + GfxRenderer.Render( &m_stars, nullptr, 1.0 ); ::glPointSize( 3.0f ); ::glPopMatrix(); diff --git a/sun.cpp b/sun.cpp index b21ef312..4a5699c2 100644 --- a/sun.cpp +++ b/sun.cpp @@ -3,6 +3,7 @@ #include "sun.h" #include "globals.h" #include "mtable.h" +#include "usefull.h" ////////////////////////////////////////////////////////////////////////////////////////// // cSun -- class responsible for dynamic calculation of position and intensity of the Sun, @@ -94,6 +95,14 @@ void cSun::setLocation( float const Longitude, float const Latitude ) { m_observer.latitude = (int)Latitude + (Latitude - (int)(Latitude)) * 100.0 / 60.0 ; } +// sets current time, overriding one acquired from the system clock +void cSun::setTime( int const Hour, int const Minute, int const Second ) { + + m_observer.hour = clamp( Hour, -1, 23 ); + m_observer.minute = clamp( Minute, 0, 59 ); + m_observer.second = clamp( Second, 0, 59 ); +} + void cSun::setTemperature( float const Temperature ) { m_observer.temp = Temperature; @@ -112,6 +121,10 @@ void cSun::move() { SYSTEMTIME localtime; // time for the calculation time( &localtime ); + if( m_observer.hour >= 0 ) { localtime.wHour = m_observer.hour; } + if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } + if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } + double ut = localtime.wHour + localtime.wMinute / 60.0 // too low resolution, noticeable skips + localtime.wSecond / 3600.0; // good enough in normal circumstances diff --git a/sun.h b/sun.h index 03711464..e15abbbf 100644 --- a/sun.h +++ b/sun.h @@ -27,6 +27,8 @@ public: float getAngle(); // returns current intensity of the sun float getIntensity(); + // sets current time, overriding one acquired from the system clock + void setTime( int const Hour, int const Minute, int const Second ); // sets current geographic location void setLocation( float const Longitude, float const Latitude ); // sets ambient temperature in degrees C. @@ -87,7 +89,10 @@ protected: double latitude; // latitude, degrees north (south negative) double longitude; // longitude, degrees east (west negative) - double utime; // universal (Greenwich) standard time + int hour{ -1 }; // current time, used for calculation of utime. if set to -1, time for + int minute{ -1 };// calculation will be obtained from the local clock + int second{ -1 }; + double utime; // universal (Greenwich) standard time double timezone; // time zone, east (west negative). USA: Mountain = -7, Central = -6, etc. double gmst; // Greenwich mean sidereal time, hours double lmst; // local mean sidereal time, degrees From 167213eff9f2c9654a58f5726e2b77c2e8512e38 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 11 Mar 2017 00:37:20 +0100 Subject: [PATCH 053/426] added headlights dimming switch, removed obsolete sub-model from dynamic object class --- DynObj.cpp | 14 ---------- DynObj.h | 2 +- Globals.cpp | 3 ++ Globals.h | 3 +- Train.cpp | 76 ++++++++++++++++++++++++-------------------------- Train.h | 1 + lightarray.cpp | 2 +- renderer.cpp | 6 +--- 8 files changed, 46 insertions(+), 61 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 97517e77..db47983b 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -557,8 +557,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) mdLoad->GetSMRoot()->SetTranslate(modelShake + vFloor); if (mdLowPolyInt) mdLowPolyInt->GetSMRoot()->SetTranslate(modelShake); - if (mdPrzedsionek) - mdPrzedsionek->GetSMRoot()->SetTranslate(modelShake); // ABu: koniec rzucania // ABu011104: liczenie obrotow wozkow ABuBogies(); @@ -1707,7 +1705,6 @@ TDynamicObject::TDynamicObject() smLoadMode = NULL; mdLoad = NULL; mdLowPolyInt = NULL; - mdPrzedsionek = NULL; //smMechanik0 = smMechanik1 = NULL; smBuforLewy[0] = smBuforLewy[1] = NULL; smBuforPrawy[0] = smBuforPrawy[1] = NULL; @@ -4503,15 +4500,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // w cyklu // nieprzezroczystych } -/* - // Winger 040304 - ladowanie przedsionkow dla EZT - if (MoverParameters->TrainType == dt_EZT) - { - asModel = "przedsionki.t3d"; - asModel = BaseDir + asModel; - mdPrzedsionek = TModelsManager::GetModel(asModel, true); - } -*/ if (!MoverParameters->LoadAccepted.empty()) // if (MoverParameters->LoadAccepted!=AnsiString("")); // && // MoverParameters->LoadType!=AnsiString("passengers")) @@ -5424,8 +5412,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // binarnego if (mdLoad) mdLoad->Init(); - if (mdPrzedsionek) - mdPrzedsionek->Init(); if (mdLowPolyInt) mdLowPolyInt->Init(); // sHorn2.CopyIfEmpty(sHorn1); ///żeby jednak trąbił też drugim diff --git a/DynObj.h b/DynObj.h index f1e0a391..2f47d63c 100644 --- a/DynObj.h +++ b/DynObj.h @@ -180,7 +180,6 @@ private: public: // modele składowe pojazdu TModel3d *mdModel; // model pudła TModel3d *mdLoad; // model zmiennego ładunku - TModel3d *mdPrzedsionek; // model przedsionków dla EZT - może użyć mdLoad zamiast? TModel3d *mdKabina; // model kabiny dla użytkownika; McZapkie-030303: to z train.h TModel3d *mdLowPolyInt; // ABu 010305: wnetrze lowpoly float3 InteriorLight{ 0.9f * 255.0f / 255.0f, 0.9f * 216.0f / 255.0f, 0.9f * 176.0f / 255.0f }; // tungsten light. TODO: allow definition of light type? @@ -346,6 +345,7 @@ public: // modele składowe pojazdu public: int *iLights; // wskaźnik na bity zapalonych świateł (własne albo innego członu) + bool DimHeadlights{ false }; // status of the headlight dimming toggle. NOTE: single toggle for all lights is a simplification. TODO: separate per-light switches double fTrackBlock; // odległość do przeszkody do dalszego ruchu (wykrywanie kolizji z innym // pojazdem) TDynamicObject * PrevAny(); diff --git a/Globals.cpp b/Globals.cpp index 480c38a1..826c8640 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -1043,9 +1043,12 @@ void Global::InitKeys() Keys[k_PantRearDown] = 'O'; // Winger 020304 - ogrzewanie Keys[k_Heating] = 'H'; + // headlights Keys[k_LeftSign] = 'Y'; Keys[k_UpperSign] = 'U'; Keys[k_RightSign] = 'I'; + Keys[k_DimHeadlights] = 'L'; + // tail lights Keys[k_EndSign] = 'T'; Keys[k_SmallCompressor] = 'V'; diff --git a/Globals.h b/Globals.h index 525201e3..8f154173 100644 --- a/Globals.h +++ b/Globals.h @@ -110,7 +110,8 @@ const int k_Active = 71; // Winger 020304 const int k_Battery = 72; const int k_WalkMode = 73; -const int MaxKeys = 74; +int const k_DimHeadlights = 74; +const int MaxKeys = 75; // klasy dla wskaźników globalnych class TGround; diff --git a/Train.cpp b/Train.cpp index bf895e8c..023adfd4 100644 --- a/Train.cpp +++ b/Train.cpp @@ -508,7 +508,7 @@ void TTrain::OnKeyDown(int cKey) } } } - else if (cKey == Global::Keys[k_StLinOff]) + else if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // shift&ctrl are used for light dimming { if (mvControlled->TrainType == dt_EZT) { @@ -2339,7 +2339,7 @@ if } } } - else if (cKey == Global::Keys[k_StLinOff]) // Winger 110904: wylacznik st. + else if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // Winger 110904: wylacznik st. // liniowych { if ((mvControlled->TrainType != dt_EZT) && (mvControlled->TrainType != dt_EP05) && @@ -2468,6 +2468,29 @@ if ++iRadioChannel; // 0=wyłączony } } + + // TODO: break the mess above into individual command-based routines. + // TODO: test for modifiers inside the routines, instead of grouping by the modifier + // TODO: do away with the modifier tests, each command should be separate and issued by input processor(s) up the chain + if( cKey == Global::Keys[ k_DimHeadlights ] ) { + // headlight strength toggle + if( !Global::ctrlState ) { + // switch uses either ctrl, or ctrl+shift, so we can bail early here + return; + } + if( DynamicObject->DimHeadlights && (!Global::shiftState)) { + DynamicObject->DimHeadlights = false; + // switch sound + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + } + else if( (!DynamicObject->DimHeadlights) && (Global::shiftState)) { + DynamicObject->DimHeadlights = true; + // switch sound + dsbSwitch->SetVolume( DSBVOLUME_MAX ); + dsbSwitch->Play( 0, 0, 0 ); + } + } } void TTrain::OnKeyUp(int cKey) @@ -2477,7 +2500,7 @@ void TTrain::OnKeyUp(int cKey) } else { - if (cKey == Global::Keys[k_StLinOff]) // Winger 110904: wylacznik st. liniowych + if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // Winger 110904: wylacznik st. liniowych { // zwolnienie klawisza daje powrót przycisku do zwykłego stanu if ((mvControlled->TrainType != dt_EZT) && (mvControlled->TrainType != dt_EP05) && (mvControlled->TrainType != dt_ET40)) @@ -3877,41 +3900,6 @@ bool TTrain::Update( double const Deltatime ) ggLeftEndLightButton.PutValue(0); } - //--------- - // hunter-101211: poprawka na zle obracajace sie przelaczniki - /* - if (((DynamicObject->iLights[0]&1)==1) - ||((DynamicObject->iLights[1]&1)==1)) - ggLeftLightButton.PutValue(1); - if (((DynamicObject->iLights[0]&16)==16) - ||((DynamicObject->iLights[1]&16)==16)) - ggRightLightButton.PutValue(1); - if (((DynamicObject->iLights[0]&4)==4) - ||((DynamicObject->iLights[1]&4)==4)) - ggUpperLightButton.PutValue(1); - - if (((DynamicObject->iLights[0]&2)==2) - ||((DynamicObject->iLights[1]&2)==2)) - if (ggLeftEndLightButton.SubModel) - { - ggLeftEndLightButton.PutValue(1); - ggLeftLightButton.PutValue(0); - } - else - ggLeftLightButton.PutValue(-1); - - if (((DynamicObject->iLights[0]&32)==32) - ||((DynamicObject->iLights[1]&32)==32)) - if (ggRightEndLightButton.SubModel) - { - ggRightEndLightButton.PutValue(1); - ggRightLightButton.PutValue(0); - } - else - ggRightLightButton.PutValue(-1); - */ - - //-------------- // hunter-230112 // REFLEKTOR LEWY @@ -4049,6 +4037,11 @@ bool TTrain::Update( double const Deltatime ) ggLightsButton.PutValue(mvOccupied->LightsPos - 1); ggLightsButton.Update(); } + if( ggDimHeadlightsButton.SubModel ) { + + ggDimHeadlightsButton.PutValue( DynamicObject->DimHeadlights ? 1.0 : 0.0 ); + ggDimHeadlightsButton.Update(); + } //--------- // Winger 010304 - pantografy @@ -5855,6 +5848,7 @@ void TTrain::clear_cab_controls() ggLeftLightButton.Clear(); ggRightLightButton.Clear(); ggUpperLightButton.Clear(); + ggDimHeadlightsButton.Clear(); ggLeftEndLightButton.Clear(); ggRightEndLightButton.Clear(); ggLightsButton.Clear(); @@ -6259,7 +6253,11 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con // swiatlo ggRightLightButton.Load(Parser, DynamicObject->mdKabina); } - else if (Label == "leftend_sw:") + else if( Label == "dimheadlights_sw:" ) { + // swiatlo + ggDimHeadlightsButton.Load( Parser, DynamicObject->mdKabina ); + } + else if( Label == "leftend_sw:" ) { // swiatlo ggLeftEndLightButton.Load(Parser, DynamicObject->mdKabina); diff --git a/Train.h b/Train.h index 560a75e9..3b31f20e 100644 --- a/Train.h +++ b/Train.h @@ -177,6 +177,7 @@ class TTrain TGauge ggLeftEndLightButton; TGauge ggRightEndLightButton; TGauge ggLightsButton; // przelacznik reflektorow (wszystkich) + TGauge ggDimHeadlightsButton; // headlights dimming switch // hunter-230112: przelacznik swiatel tylnich TGauge ggRearUpperLightButton; diff --git a/lightarray.cpp b/lightarray.cpp index 3ab1c448..3e28db7a 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -68,7 +68,7 @@ light_array::update() { if( light.count > 0 ) { // TODO: intensity can be affected further by dim switch or other factors light.intensity = std::max( 0.0f, std::log( (float)light.count + 1.0f ) ); -// light.intensity = std::max( 0.0f, std::log( (float)light.count + 3.0f ) ); + light.intensity *= ( light.owner->DimHeadlights ? 0.6f : 1.0f ); } else { light.intensity = 0.0f; diff --git a/renderer.cpp b/renderer.cpp index c038552a..de07596a 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -140,8 +140,6 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku Render( Dynamic->mdLoad, Dynamic, squaredistance ); - if( Dynamic->mdPrzedsionek ) - Render( Dynamic->mdPrzedsionek, Dynamic, squaredistance ); ::glPopMatrix(); @@ -246,8 +244,6 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku Render_Alpha( Dynamic->mdLoad, Dynamic, squaredistance ); - if( Dynamic->mdPrzedsionek ) - Render_Alpha( Dynamic->mdPrzedsionek, Dynamic, squaredistance ); ::glPopMatrix(); @@ -343,7 +339,7 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { renderlight->ambient[ 1 ] = std::max( 0.0, scenelight.color.y * scenelight.intensity - luminance ); renderlight->ambient[ 2 ] = std::max( 0.0, scenelight.color.z * scenelight.intensity - luminance ); - ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, (0.25f * scenelight.count) / std::pow( scenelight.count, 2 ) ); + ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, (0.25f * scenelight.count) / std::pow( scenelight.count, 2 ) * (scenelight.owner->DimHeadlights ? 1.25f : 1.0f) ); ::glEnable( renderlight->id ); renderlight->apply_intensity(); From 5439fd86f3c435518c63ed96de6a536c7fa96a2a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 11 Mar 2017 20:45:51 +0100 Subject: [PATCH 054/426] render code relocation continued --- AnimModel.cpp | 27 +++++++------- AnimModel.h | 15 ++++++-- DynObj.cpp | 99 ++++++++++++++++++++------------------------------- DynObj.h | 26 +++++++++++--- Float3d.h | 10 ++++-- Ground.cpp | 33 +++++++++-------- Ground.h | 8 +++++ Model3d.cpp | 5 +-- Model3d.h | 2 ++ Texture.cpp | 2 ++ World.cpp | 13 ++++--- renderer.cpp | 40 ++++++++++----------- renderer.h | 10 +++--- 13 files changed, 160 insertions(+), 130 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index e5828761..0adca933 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -411,11 +411,6 @@ TAnimModel::TAnimModel() pModel = NULL; iNumLights = 0; fBlinkTimer = 0; - ReplacableSkinId[0] = 0; - ReplacableSkinId[1] = 0; - ReplacableSkinId[2] = 0; - ReplacableSkinId[3] = 0; - ReplacableSkinId[4] = 0; for (int i = 0; i < iMaxNumLights; i++) { LightsOn[i] = LightsOff[i] = NULL; // normalnie nie ma @@ -448,16 +443,16 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable "*") // od gwiazdki zaczynają się teksty na wyświetlaczach asText = asReplacableTexture.substr(1, asReplacableTexture.length() - 1); // zapamiętanie tekstu else if (asReplacableTexture != "none") - ReplacableSkinId[1] = + m_materialdata.replacable_skins[1] = GfxRenderer.GetTextureId( asReplacableTexture, "" ); - if( ( ReplacableSkinId[ 1 ] != 0 ) - && ( GfxRenderer.Texture( ReplacableSkinId[ 1 ] ).has_alpha ) ) { + if( ( m_materialdata.replacable_skins[ 1 ] != 0 ) + && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) ) { // tekstura z kanałem alfa - nie renderować w cyklu nieprzezroczystych - iTexAlpha = 0x31310031; + m_materialdata.textures_alpha = 0x31310031; } else{ // tekstura nieprzezroczysta - nie renderować w cyklu - iTexAlpha = 0x30300030; + m_materialdata.textures_alpha = 0x30300030; } // przezroczystych return (Init(TModelsManager::GetModel(asName))); @@ -632,8 +627,8 @@ void TAnimModel::RenderAlphaDL(vector3 pPosition, double fAngle) int TAnimModel::Flags() { // informacja dla TGround, czy ma być w Render, RenderAlpha, czy RenderMixed int i = pModel ? pModel->Flags() : 0; // pobranie flag całego modelu - if (ReplacableSkinId[1] > 0) // jeśli ma wymienną teksturę 0 - i |= (i & 0x01010001) * ((iTexAlpha & 1) ? 0x20 : 0x10); + if( m_materialdata.replacable_skins[ 1 ] > 0 ) // jeśli ma wymienną teksturę 0 + i |= (i & 0x01010001) * ((m_materialdata.textures_alpha & 1) ? 0x20 : 0x10); // if (ReplacableSkinId[2]>0) //jeśli ma wymienną teksturę 1 // i|=(i&0x02020002)*((iTexAlpha&1)?0x10:0x08); // if (ReplacableSkinId[3]>0) //jeśli ma wymienną teksturę 2 @@ -651,15 +646,16 @@ void TAnimModel::RenderDL(vector3 *vPosition) { RaAnimate(); // jednorazowe przeliczenie animacji RaPrepare(); - if (pModel) // renderowanie rekurencyjne submodeli - pModel->Render(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); + if( pModel ) // renderowanie rekurencyjne submodeli + GfxRenderer.Render( pModel, Material(), *vPosition, vAngle ); }; void TAnimModel::RenderAlphaDL(vector3 *vPosition) { RaPrepare(); if (pModel) // renderowanie rekurencyjne submodeli - pModel->RenderAlpha(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); + GfxRenderer.Render_Alpha( pModel, Material(), *vPosition, vAngle ); }; +/* void TAnimModel::RenderVBO(vector3 *vPosition) { RaAnimate(); // jednorazowe przeliczenie animacji @@ -673,6 +669,7 @@ void TAnimModel::RenderAlphaVBO(vector3 *vPosition) if (pModel) // renderowanie rekurencyjne submodeli pModel->RaRenderAlpha(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); }; +*/ //--------------------------------------------------------------------------- bool TAnimModel::TerrainLoaded() diff --git a/AnimModel.h b/AnimModel.h index 5c2899b2..ab953b6a 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "Model3d.h" #include "Texture.h" +#include "DynObj.h" const int iMaxNumLights = 8; @@ -138,7 +139,11 @@ class TAnimModel TSubModel *LightsOn[iMaxNumLights]; // Ra: te wskaźniki powinny być w ramach TModel3d TSubModel *LightsOff[iMaxNumLights]; vector3 vAngle; // bazowe obroty egzemplarza względem osi +/* int iTexAlpha; //żeby nie sprawdzać za każdym razem, dla 4 wymiennych tekstur +*/ + material_data m_materialdata; + std::string asText; // tekst dla wyświetlacza znakowego TAnimAdvanced *pAdvanced; void Advanced(); @@ -149,9 +154,13 @@ class TAnimModel void RaAnimate(); // przeliczenie animacji egzemplarza void RaPrepare(); // ustawienie animacji egzemplarza na wzorcu public: +/* texture_manager::size_type ReplacableSkinId[5]; // McZapkie-020802: zmienialne skory - static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane - // również bez wyświetlania +*/ + static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania + inline + material_data const *Material() const { return &m_materialdata; } + TAnimModel(); ~TAnimModel(); bool Init(TModel3d *pNewModel); @@ -165,8 +174,10 @@ class TAnimModel void RenderAlphaVBO(vector3 pPosition = vector3(0, 0, 0), double fAngle = 0); */ void RenderDL(vector3 *vPosition); void RenderAlphaDL(vector3 *vPosition); +/* void RenderVBO(vector3 *vPosition); void RenderAlphaVBO(vector3 *vPosition); +*/ int Flags(); void RaAnglesSet(double a, double b, double c) { diff --git a/DynObj.cpp b/DynObj.cpp index db47983b..52ad9c0e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1692,12 +1692,6 @@ TDynamicObject::TDynamicObject() //} mdModel = NULL; mdKabina = NULL; - ReplacableSkinID[0] = 0; - ReplacableSkinID[1] = 0; - ReplacableSkinID[2] = 0; - ReplacableSkinID[3] = 0; - ReplacableSkinID[4] = 0; - iAlpha = 0x30300030; // tak gdy tekstury wymienne nie mają przezroczystości // smWiazary[0]=smWiazary[1]=NULL; smWahacze[0] = smWahacze[1] = smWahacze[2] = smWahacze[3] = NULL; fWahaczeAmp = 0; @@ -4350,12 +4344,12 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, if( token == "models:") { // modele i podmodele - iMultiTex = 0; // czy jest wiele tekstur wymiennych? + m_materialdata.multi_textures = 0; // czy jest wiele tekstur wymiennych? parser.getTokens(); parser >> asModel; if( asModel[asModel.size() - 1] == '#' ) // Ra 2015-01: nie podoba mi siê to { // model wymaga wielu tekstur wymiennych - iMultiTex = 1; + m_materialdata.multi_textures = 1; asModel.erase( asModel.length() - 1 ); } std::size_t i = asModel.find( ',' ); @@ -4365,11 +4359,8 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // liczba // tekstur? if (i < asModel.length()) - iMultiTex = asModel[i + 1] - '0'; - if (iMultiTex < 0) - iMultiTex = 0; - else if (iMultiTex > 1) - iMultiTex = 1; // na razie ustawiamy na 1 + m_materialdata.multi_textures = asModel[i + 1] - '0'; + m_materialdata.multi_textures = clamp( m_materialdata.multi_textures, 0, 1 ); // na razie ustawiamy na 1 } asModel = BaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje // modele w dynamics/basedir @@ -4382,7 +4373,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, Global::asCurrentTexturePath + ReplacableSkin; // skory tez z dynamic/... std::string x = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie if (!x.empty()) - ReplacableSkinID[4] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + "nowhere", "", 9); + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + "nowhere", "", 9 ); /* if ((i = ReplacableSkin.Pos("|")) > 0) // replacable dzielone { @@ -4443,62 +4434,53 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } } */ - if (iMultiTex > 0) + if (m_materialdata.multi_textures > 0) { // jeśli model ma 4 tekstury - ReplacableSkinID[1] = GfxRenderer.GetTextureId( + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( ReplacableSkin + ",1", "", Global::iDynamicFiltering); - if (ReplacableSkinID[1]) + if( m_materialdata.replacable_skins[ 1 ] ) { // pierwsza z zestawu znaleziona - ReplacableSkinID[2] = GfxRenderer.GetTextureId( + m_materialdata.replacable_skins[ 2 ] = GfxRenderer.GetTextureId( ReplacableSkin + ",2", "", Global::iDynamicFiltering); - if (ReplacableSkinID[2]) + if( m_materialdata.replacable_skins[ 2 ] ) { - iMultiTex = 2; // już są dwie - ReplacableSkinID[3] = GfxRenderer.GetTextureId( + m_materialdata.multi_textures = 2; // już są dwie + m_materialdata.replacable_skins[ 3 ] = GfxRenderer.GetTextureId( ReplacableSkin + ",3", "", Global::iDynamicFiltering); - if (ReplacableSkinID[3]) + if( m_materialdata.replacable_skins[ 3 ] ) { - iMultiTex = 3; // a teraz nawet trzy - ReplacableSkinID[4] = GfxRenderer.GetTextureId( + m_materialdata.multi_textures = 3; // a teraz nawet trzy + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( ReplacableSkin + ",4", "", Global::iDynamicFiltering); - if (ReplacableSkinID[4]) - iMultiTex = 4; // jak są cztery, to blokujemy podmianę tekstury + if( m_materialdata.replacable_skins[ 4 ] ) + m_materialdata.multi_textures = 4; // jak są cztery, to blokujemy podmianę tekstury // rozkładem } } } else { // zestaw nie zadziałał, próbujemy normanie - iMultiTex = 0; - ReplacableSkinID[1] = GfxRenderer.GetTextureId( + m_materialdata.multi_textures = 0; + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( ReplacableSkin, "", Global::iDynamicFiltering); } } else - ReplacableSkinID[1] = GfxRenderer.GetTextureId( + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( ReplacableSkin, "", Global::iDynamicFiltering); - if (GfxRenderer.Texture(ReplacableSkinID[1]).has_alpha) - iAlpha = 0x31310031; // tekstura -1 z kanałem alfa - nie renderować w cyklu - // nieprzezroczystych + if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) + m_materialdata.textures_alpha = 0x31310031; // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych else - iAlpha = 0x30300030; // wszystkie tekstury nieprzezroczyste - nie - // renderować w - // cyklu przezroczystych - if (ReplacableSkinID[2]) - if (GfxRenderer.Texture(ReplacableSkinID[2]).has_alpha) - iAlpha |= 0x02020002; // tekstura -2 z kanałem alfa - nie renderować - // w cyklu - // nieprzezroczystych - if (ReplacableSkinID[3]) - if (GfxRenderer.Texture(ReplacableSkinID[3]).has_alpha) - iAlpha |= 0x04040004; // tekstura -3 z kanałem alfa - nie renderować - // w cyklu - // nieprzezroczystych - if (ReplacableSkinID[4]) - if (GfxRenderer.Texture(ReplacableSkinID[4]).has_alpha) - iAlpha |= 0x08080008; // tekstura -4 z kanałem alfa - nie renderować - // w cyklu - // nieprzezroczystych + m_materialdata.textures_alpha = 0x30300030; // wszystkie tekstury nieprzezroczyste - nie renderować w cyklu przezroczystych + if( m_materialdata.replacable_skins[ 2 ] ) + if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 2 ] ).has_alpha ) + m_materialdata.textures_alpha |= 0x02020002; // tekstura -2 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + if( m_materialdata.replacable_skins[ 3 ] ) + if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 3 ] ).has_alpha ) + m_materialdata.textures_alpha |= 0x04040004; // tekstura -3 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + if( m_materialdata.replacable_skins[ 4 ] ) + if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 4 ] ).has_alpha ) + m_materialdata.textures_alpha |= 0x08080008; // tekstura -4 z kanałem alfa - nie renderować w cyklu nieprzezroczystych } if (!MoverParameters->LoadAccepted.empty()) // if (MoverParameters->LoadAccepted!=AnsiString("")); // && @@ -5782,15 +5764,12 @@ std::string TDynamicObject::TextureTest(std::string const &name) }; void TDynamicObject::DestinationSet(std::string to, std::string numer) -{ // ustawienie stacji - // docelowej oraz wymiennej - // tekstury 4, jeśli - // istnieje plik +{ // ustawienie stacji docelowej oraz wymiennej tekstury 4, jeśli istnieje plik // w zasadzie, to każdy wagon mógłby mieć inną stację docelową // zwłaszcza w towarowych, pod kątem zautomatyzowania maewrów albo pracy górki // ale to jeszcze potrwa, zanim będzie możliwe, na razie można wpisać stację z // rozkładu - if (abs(iMultiTex) >= 4) + if( std::abs( m_materialdata.multi_textures ) >= 4 ) return; // jak są 4 tekstury wymienne, to nie zmieniać rozkładem numer = Global::Bezogonkow(numer); asDestination = to; @@ -5798,13 +5777,13 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) std::string x = TextureTest(asBaseDir + numer + "@" + MoverParameters->TypeName); if (!x.empty()) { - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się return; } x = TextureTest(asBaseDir + numer ); if (!x.empty()) { - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się return; } if (to.empty()) @@ -5812,17 +5791,17 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) x = TextureTest(asBaseDir + to + "@" + MoverParameters->TypeName); // w pierwszej kolejności z nazwą FIZ/MMD if (!x.empty()) { - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się return; } x = TextureTest(asBaseDir + to); // na razie prymitywnie if (!x.empty()) - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się else { x = TextureTest(asBaseDir + "nowhere"); // jak nie znalazł dedykowanej, to niech daje nowhere if (!x.empty()) - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); } // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa // tekstury nr 4 diff --git a/DynObj.h b/DynObj.h index 2f47d63c..357fc061 100644 --- a/DynObj.h +++ b/DynObj.h @@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "AdvSound.h" #include "Button.h" #include "AirCoupler.h" +#include "texture.h" //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -140,6 +141,18 @@ class TAnim //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- +// parameters for the material object, as currently used by various simulator models +struct material_data { + + int textures_alpha{ 0x30300030 }; // maska przezroczystości tekstur. default: tekstury wymienne nie mają przezroczystości + texture_manager::size_type replacable_skins[ 5 ]; // McZapkie:zmienialne nadwozie + int multi_textures{ 0 }; //<0 tekstury wskazane wpisem, >0 tekstury z przecinkami, =0 jedna + + material_data() { + ::SecureZeroMemory( replacable_skins, sizeof( replacable_skins ) ); + } +}; + class TDynamicObject { // klasa pojazdu friend class opengl_renderer; @@ -175,8 +188,6 @@ public: // parametry położenia pojazdu dostępne publicznie TPowerSource ConnectedEnginePowerSource( TDynamicObject const *Caller ) const; -private: - // returns type of the nearest functional power source present in the trainset public: // modele składowe pojazdu TModel3d *mdModel; // model pudła TModel3d *mdLoad; // model zmiennego ładunku @@ -187,8 +198,13 @@ public: // modele składowe pojazdu float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) private: // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe - public: // tymczasowo udostępnione do wyszukiwania drutu - int iAnimType[ ANIM_TYPES ]; // 0-osie,1-drzwi,2-obracane,3-zderzaki,4-wózki,5-pantografy,6-tłoki + material_data m_materialdata; + + public: + inline + material_data const *Material() const { return &m_materialdata; } + // tymczasowo udostępnione do wyszukiwania drutu + int iAnimType[ ANIM_TYPES ]; // 0-osie,1-drzwi,2-obracane,3-zderzaki,4-wózki,5-pantografy,6-tłoki private: int iAnimations; // liczba obiektów animujących /* @@ -399,9 +415,11 @@ public: // modele składowe pojazdu int iCabs; // maski bitowe modeli kabin TTrack *MyTrack; // McZapkie-030303: tor na ktorym stoi, ABu std::string asBaseDir; +/* texture_manager::size_type ReplacableSkinID[5]; // McZapkie:zmienialne nadwozie int iAlpha; // maska przezroczystości tekstur int iMultiTex; //<0 tekstury wskazane wpisem, >0 tekstury z przecinkami, =0 jedna +*/ int iOverheadMask; // maska przydzielana przez AI pojazdom posiadającym pantograf, aby wymuszały // jazdę bezprądową TTractionParam tmpTraction; diff --git a/Float3d.h b/Float3d.h index c33a7283..355813c6 100644 --- a/Float3d.h +++ b/Float3d.h @@ -23,7 +23,8 @@ class float3 y = b; z = c; }; - float inline Length() const; + float Length() const; + float LengthSquared() const; }; inline bool operator==(const float3 &v1, const float3 &v2) @@ -49,10 +50,13 @@ inline float3 operator+(const float3 &v1, const float3 &v2) { return float3(v1.x + v2.x, v1.y + v2.y, v1.z + v2.z); }; -float inline float3::Length() const +inline float float3::Length() const { - return std::sqrt(x * x + y * y + z * z); + return std::sqrt(LengthSquared()); }; +inline float float3::LengthSquared() const { + return ( x * x + y * y + z * z ); +} inline float3 operator*( float3 const &v, float const k ) { return float3( v.x * k, v.y * k, v.z * k ); }; diff --git a/Ground.cpp b/Ground.cpp index 36c85663..1fa5180d 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -279,7 +279,7 @@ void TGroundNode::MoveMe(vector3 pPosition) ResourceManager::Unregister(this); } } - +/* void TGroundNode::RaRenderVBO() { // renderowanie z domyslnego bufora VBO glColor3ub(Diffuse[0], Diffuse[1], Diffuse[2]); @@ -444,7 +444,7 @@ void TGroundNode::RenderAlphaVBO() #endif return; } - +*/ void TGroundNode::Compile(bool many) { // tworzenie skompilowanej listy w wyświetlaniu DL if (!many) @@ -665,7 +665,7 @@ void TGroundNode::RenderAlphaDL() if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.35f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f }; #endif if (!DisplayListID) //||Global::bReCompile) //Ra: wymuszenie rekompilacji @@ -702,7 +702,7 @@ void TGroundNode::RenderAlphaDL() if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); + glAlphaFunc(GL_GREATER, 0.02f); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); }; #endif @@ -1183,7 +1183,7 @@ void TSubRect::RenderAlphaDL() for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach }; - +/* void TSubRect::RenderVBO() { // renderowanie nieprzezroczystych (VBO) TGroundNode *node; @@ -1217,7 +1217,7 @@ void TSubRect::RenderAlphaVBO() for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach }; - +*/ void TSubRect::RenderSounds() { // aktualizacja dźwięków w pojazdach sektora (sektor może nie być wyświetlany) for (int j = 0; j < iTracks; ++j) @@ -1264,7 +1264,7 @@ void TGroundRect::RenderDL() iLastDisplay = iFrameNumber; // drugi raz nie potrzeba } }; - +/* void TGroundRect::RenderVBO() { // renderowanie kwadratu kilometrowego (VBO), jeśli jeszcze nie zrobione if (iLastDisplay != iFrameNumber) @@ -1281,7 +1281,7 @@ void TGroundRect::RenderVBO() nTerrain->smTerrain->iVisible = iFrameNumber; // ma się wyświetlić w tej ramce } }; - +*/ //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -4829,27 +4829,30 @@ bool TGround::Render( Math3D::vector3 const &Camera ) { GfxRenderer.Update_Lights( m_lights ); - +/* if( Global::bUseVBO ) { // renderowanie przez VBO if( !RenderVBO( Camera ) ) return false; if( !RenderAlphaVBO( Camera ) ) return false; } - else { // renderowanie przez Display List + else { +*/ + // renderowanie przez Display List if( !RenderDL( Camera ) ) return false; if( !RenderAlphaDL( Camera ) ) return false; +/* } - +*/ return true; } bool TGround::RenderDL(vector3 pPosition) { // renderowanie scenerii z Display List - faza nieprzezroczystych glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.35f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) CameraDirection.x = sin(Global::pCameraRotation); // wektor kierunkowy CameraDirection.z = cos(Global::pCameraRotation); @@ -4909,7 +4912,7 @@ bool TGround::RenderDL(vector3 pPosition) bool TGround::RenderAlphaDL(vector3 pPosition) { // renderowanie scenerii z Display List - faza przezroczystych glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.02f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f TGroundNode *node; glColor4f(1.0f, 1.0f, 1.0f, 1.0f); TSubRect *tmp; @@ -4934,7 +4937,7 @@ bool TGround::RenderAlphaDL(vector3 pPosition) } return true; } - +/* bool TGround::RenderVBO(vector3 pPosition) { // renderowanie scenerii z VBO - faza nieprzezroczystych glDisable(GL_BLEND); @@ -5037,7 +5040,7 @@ bool TGround::RenderAlphaVBO(vector3 pPosition) } return true; }; - +*/ #ifdef _WINDOWS //--------------------------------------------------------------------------- void TGround::Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) diff --git a/Ground.h b/Ground.h index 57fa0d82..67ef46c2 100644 --- a/Ground.h +++ b/Ground.h @@ -178,9 +178,11 @@ class TGroundNode : public Resource void RenderDL(); // renderowanie nieprzezroczystych w Display Lists void RenderAlphaDL(); // renderowanie przezroczystych w Display Lists // (McZapkie-131202) +/* void RaRenderVBO(); // renderowanie (nieprzezroczystych) ze wspólnego VBO void RenderVBO(); // renderowanie nieprzezroczystych z własnego VBO void RenderAlphaVBO(); // renderowanie przezroczystych z (własnego) VBO +*/ }; class TSubRect : public Resource, public CMesh @@ -221,9 +223,11 @@ class TSubRect : public Resource, public CMesh void RaAnimate(); // przeliczenie animacji torów void RenderDL(); // renderowanie nieprzezroczystych w Display Lists void RenderAlphaDL(); // renderowanie przezroczystych w Display Lists +/* // (McZapkie-131202) void RenderVBO(); // renderowanie nieprzezroczystych z własnego VBO void RenderAlphaVBO(); // renderowanie przezroczystych z (własnego) VBO +*/ void RenderSounds(); // dźwięki pojazdów z niewidocznych sektorów }; @@ -271,7 +275,9 @@ class TGroundRect : public TSubRect pSubRects[i].Sort(); // optymalizacja obiektów w sektorach }; void RenderDL(); +/* void RenderVBO(); +*/ }; class TGround @@ -358,8 +364,10 @@ class TGround bool Render( Math3D::vector3 const &Camera ); bool RenderDL(vector3 pPosition); bool RenderAlphaDL(vector3 pPosition); +/* bool RenderVBO(vector3 pPosition); bool RenderAlphaVBO(vector3 pPosition); +*/ bool CheckQuery(); // GetRect(double x, double z) { return // &(Rects[int(x/fSubRectSize+fHalfNumRects)][int(z/fSubRectSize+fHalfNumRects)]); }; diff --git a/Model3d.cpp b/Model3d.cpp index 61a48c1e..2e958381 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -44,7 +44,7 @@ std::string *TSubModel::pasText; TSubModel::TSubModel() { - ZeroMemory(this, sizeof(TSubModel)); // istotne przy zapisywaniu wersji binarnej + ::SecureZeroMemory(this, sizeof(TSubModel)); // istotne przy zapisywaniu wersji binarnej FirstInit(); }; @@ -2305,7 +2305,7 @@ glPopMatrix(); //----------------------------------------------------------------------------- // 2011-03-16 cztery nowe funkcje renderowania z możliwością pochylania obiektów //----------------------------------------------------------------------------- - +/* void TModel3d::Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // nieprzezroczyste, Display List glPushMatrix(); @@ -2340,6 +2340,7 @@ void TModel3d::RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager: Root->RenderAlphaDL(); glPopMatrix(); }; +*/ void TModel3d::RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // nieprzezroczyste, VBO glPushMatrix(); diff --git a/Model3d.h b/Model3d.h index 484652de..753d8125 100644 --- a/Model3d.h +++ b/Model3d.h @@ -367,8 +367,10 @@ public: void RaRender(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); void RaRenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); // trzy kąty obrotu +/* void Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); void RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); +*/ void RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); void RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); // inline int GetSubModelsCount() { return (SubModelsCount); }; diff --git a/Texture.cpp b/Texture.cpp index b3b6732c..30559cc9 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -473,6 +473,8 @@ opengl_texture::load_TGA() { return; } + // TODO: add horizontal/vertical data flip, based on the descriptor (18th) header byte + // fill remaining data info data_mapcount = 1; data_format = GL_BGRA; diff --git a/World.cpp b/World.cpp index 8ed14e17..617521ed 100644 --- a/World.cpp +++ b/World.cpp @@ -1669,14 +1669,19 @@ TWorld::Render_Cab() { ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); } #endif - if( Global::bUseVBO ) { // renderowanie z użyciem VBO +/* + if( Global::bUseVBO ) { // renderowanie z użyciem VBO. NOTE: disabled for the time being dynamic->mdKabina->RaRender( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); dynamic->mdKabina->RaRenderAlpha( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); } - else { // renderowanie z Display List - GfxRenderer.Render( dynamic->mdKabina, dynamic, 0.0 ); - GfxRenderer.Render_Alpha( dynamic->mdKabina, dynamic, 0.0 ); + else { +*/ + // renderowanie z Display List + GfxRenderer.Render( dynamic->mdKabina, dynamic->Material(), 0.0 ); + GfxRenderer.Render_Alpha( dynamic->mdKabina, dynamic->Material(), 0.0 ); +/* } +*/ #ifdef EU07_USE_OLD_LIGHTING_MODEL // TODO: re-implement this // przywrócenie standardowych, bo zawsze są zmieniane diff --git a/renderer.cpp b/renderer.cpp index de07596a..2b0221db 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -125,7 +125,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); } - Render( Dynamic->mdLowPolyInt, Dynamic, squaredistance ); + Render( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); if( Dynamic->InteriorLightLevel > 0.0f ) { // reset the overall ambient @@ -136,10 +136,10 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { } // Dynamic->mdModel->Render( squaredistance, Dynamic->ReplacableSkinID, Dynamic->iAlpha ); - Render( Dynamic->mdModel, Dynamic, squaredistance ); + Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Render( Dynamic->mdLoad, Dynamic, squaredistance ); + Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); ::glPopMatrix(); @@ -151,11 +151,11 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { } bool -opengl_renderer::Render( TModel3d *Model, TDynamicObject const *Instance, double const Squaredistance ) { +opengl_renderer::Render( TModel3d *Model, material_data const *Material, double const Squaredistance ) { auto alpha = - ( Instance != nullptr ? - Instance->iAlpha : + ( Material != nullptr ? + Material->textures_alpha : 0x30300030 ); alpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste if( 0 == ( alpha & Model->iFlags & 0x1F1F001F ) ) { @@ -166,8 +166,8 @@ opengl_renderer::Render( TModel3d *Model, TDynamicObject const *Instance, double Model->Root->fSquareDist = Squaredistance; // zmienna globalna! Model->Root->ReplacableSet( - ( Instance != nullptr ? - Instance->ReplacableSkinID : + ( Material != nullptr ? + Material->replacable_skins : nullptr ), alpha ); @@ -177,7 +177,7 @@ opengl_renderer::Render( TModel3d *Model, TDynamicObject const *Instance, double } bool -opengl_renderer::Render( TModel3d *Model, TDynamicObject const *Instance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { +opengl_renderer::Render( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { ::glPushMatrix(); ::glTranslated( Position.x, Position.y, Position.z ); @@ -188,7 +188,7 @@ opengl_renderer::Render( TModel3d *Model, TDynamicObject const *Instance, Math3D if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); - auto const result = Render( Model, Instance, SquareMagnitude( Position - Global::GetCameraPosition() ) ); + auto const result = Render( Model, Material, SquareMagnitude( Position - Global::GetCameraPosition() ) ); ::glPopMatrix(); @@ -230,7 +230,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); } - Render_Alpha( Dynamic->mdLowPolyInt, Dynamic, squaredistance ); + Render_Alpha( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); if( Dynamic->InteriorLightLevel > 0.0f ) { // reset the overall ambient @@ -240,10 +240,10 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { } } - Render_Alpha( Dynamic->mdModel, Dynamic, squaredistance ); + Render_Alpha( Dynamic->mdModel, Dynamic->Material(), squaredistance ); if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Render_Alpha( Dynamic->mdLoad, Dynamic, squaredistance ); + Render_Alpha( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); ::glPopMatrix(); @@ -254,11 +254,11 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { } bool -opengl_renderer::Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, double const Squaredistance ) { +opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ) { auto alpha = - ( Instance != nullptr ? - Instance->iAlpha : + ( Material != nullptr ? + Material->textures_alpha : 0x30300030 ); if( 0 == ( alpha & Model->iFlags & 0x2F2F002F ) ) { @@ -269,8 +269,8 @@ opengl_renderer::Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, Model->Root->fSquareDist = Squaredistance; // zmienna globalna! Model->Root->ReplacableSet( - ( Instance != nullptr ? - Instance->ReplacableSkinID : + ( Material != nullptr ? + Material->replacable_skins : nullptr ), alpha ); @@ -280,7 +280,7 @@ opengl_renderer::Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, } bool -opengl_renderer::Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { +opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { ::glPushMatrix(); ::glTranslated( Position.x, Position.y, Position.z ); @@ -291,7 +291,7 @@ opengl_renderer::Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); - auto const result = Render_Alpha( Model, Instance, SquareMagnitude( Position - Global::GetCameraPosition() ) ); + auto const result = Render_Alpha( Model, Material, SquareMagnitude( Position - Global::GetCameraPosition() ) ); ::glPopMatrix(); diff --git a/renderer.h b/renderer.h index 0e32e093..f4dfe212 100644 --- a/renderer.h +++ b/renderer.h @@ -1,4 +1,4 @@ -/* +/* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not @@ -101,15 +101,15 @@ public: bool Render( TDynamicObject *Dynamic ); bool - Render( TModel3d *Model, TDynamicObject const *Instance, double const Squaredistance ); + Render( TModel3d *Model, material_data const *Material, double const Squaredistance ); bool - Render( TModel3d *Model, TDynamicObject const *Instance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + Render( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); bool Render_Alpha( TDynamicObject *Dynamic ); bool - Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, double const Squaredistance ); + Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); bool - Render_Alpha( TModel3d *Model, TDynamicObject const *Instance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); // maintenance jobs void Update( double const Deltatime); From 54a9642221249add7cda9bb99e7b8fe2da68c52b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 12 Mar 2017 01:04:41 +0100 Subject: [PATCH 055/426] terrain drawing moved to renderer --- EU07.cpp | 2 +- Globals.cpp | 6 +- Ground.cpp | 161 +++++++++++++++++++++++++++++++++++++++++++-------- Ground.h | 22 ++++--- World.cpp | 58 +++++++------------ renderer.cpp | 40 ++++++++++++- renderer.h | 5 ++ 7 files changed, 220 insertions(+), 74 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index d32294d1..d97b4b27 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -188,7 +188,7 @@ void focus_callback( GLFWwindow *window, int focus ) void scroll_callback( GLFWwindow* window, double xoffset, double yoffset ) { - if( DebugModeFlag && Global::ctrlState ) { + if( Global::ctrlState ) { // ctrl + scroll wheel adjusts fov in debug mode Global::FieldOfView = clamp( static_cast(Global::FieldOfView - yoffset * 20.0 / Global::fFpsAverage), 15.0f, 75.0f ); } diff --git a/Globals.cpp b/Globals.cpp index 826c8640..a8221a28 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -162,8 +162,8 @@ TAnimModel *Global::pTerrainCompact = NULL; // do zapisania terenu w pliku std::string Global::asTerrainModel = ""; // nazwa obiektu terenu do zapisania w pliku double Global::fFpsAverage = 20.0; // oczekiwana wartosć FPS double Global::fFpsDeviation = 5.0; // odchylenie standardowe FPS -double Global::fFpsMin = 0.0; // dolna granica FPS, przy której promień scenerii będzie zmniejszany -double Global::fFpsMax = 0.0; // górna granica FPS, przy której promień scenerii będzie zwiększany +double Global::fFpsMin = 30.0; // dolna granica FPS, przy której promień scenerii będzie zmniejszany +double Global::fFpsMax = 65.0; // górna granica FPS, przy której promień scenerii będzie zwiększany double Global::fFpsRadiusMax = 3000.0; // maksymalny promień renderowania int Global::iFpsRadiusMax = 225; // maksymalny promień renderowania double Global::fRadiusFactor = 1.1; // współczynnik jednorazowej zmiany promienia scenerii @@ -941,10 +941,12 @@ void Global::ConfigParse(cParser &Parser) // pauzowanie jest zablokowane dla (iMultiplayer&2)>0, więc iMultiplayer=1 da się zapauzować // (tryb instruktora) } +/* fFpsMin = fFpsAverage - fFpsDeviation; // dolna granica FPS, przy której promień scenerii będzie zmniejszany fFpsMax = fFpsAverage + fFpsDeviation; // górna granica FPS, przy której promień scenerii będzie zwiększany +*/ if (iPause) iTextMode = GLFW_KEY_F1; // jak pauza, to pokazać zegar /* this won't execute anymore with the old parser removed diff --git a/Ground.cpp b/Ground.cpp index 1fa5180d..59421974 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1168,6 +1168,45 @@ void TSubRect::RenderDL() node->RenderDL(); // nieprzezroczyste z mieszanych modeli for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDyn(); // nieprzezroczyste fragmenty pojazdów na torach + +/* + float width = 100.0f; + float height = 25.0f; + float3 vTopLeftFront( m_area.center.x - width, m_area.center.y + height, m_area.center.z + width ); + float3 vTopLeftBack( m_area.center.x - width, m_area.center.y + height, m_area.center.z - width ); + float3 vTopRightBack( m_area.center.x + width, m_area.center.y + height, m_area.center.z - width ); + float3 vTopRightFront( m_area.center.x + width, m_area.center.y + height, m_area.center.z + width ); + + float3 vBottom_LeftFront( m_area.center.x - width, m_area.center.y - height, m_area.center.z + width ); + float3 vBottom_LeftBack( m_area.center.x - width, m_area.center.y - height, m_area.center.z - width ); + float3 vBottomRightBack( m_area.center.x + width, m_area.center.y - height, m_area.center.z - width ); + float3 vBottomRightFront( m_area.center.x + width, m_area.center.y - height, m_area.center.z + width ); + + glDisable( GL_LIGHTING ); + glDisable( GL_TEXTURE_2D ); + glColor3ub( 255, 255, (iTracks ? 0 : 255) ); + glBegin( GL_LINE_LOOP ); + glVertex3fv( &vTopLeftFront.x ); + glVertex3fv( &vTopLeftBack.x ); + glVertex3fv( &vTopRightBack.x ); + glVertex3fv( &vTopRightFront.x ); + glEnd(); + glBegin( GL_LINE_LOOP ); + glVertex3fv( &vBottom_LeftFront.x ); + glVertex3fv( &vBottom_LeftBack.x ); + glVertex3fv( &vBottomRightBack.x ); + glVertex3fv( &vBottomRightFront.x ); + glEnd(); + glBegin( GL_LINES ); + glVertex3fv( &vTopLeftFront.x ); glVertex3fv( &vBottom_LeftFront.x ); + glVertex3fv( &vTopLeftBack.x ); glVertex3fv( &vBottom_LeftBack.x ); + glVertex3fv( &vTopRightBack.x ); glVertex3fv( &vBottomRightBack.x ); + glVertex3fv( &vTopRightFront.x ); glVertex3fv( &vBottomRightFront.x ); + glEnd(); + glColor3ub( 255, 255, 255 ); + glEnable( GL_TEXTURE_2D ); + glEnable( GL_LIGHTING ); +*/ }; void TSubRect::RenderAlphaDL() @@ -1228,17 +1267,31 @@ void TSubRect::RenderSounds() //--------------------------------------------------------------------------- int TGroundRect::iFrameNumber = 0; // licznik wyświetlanych klatek -TGroundRect::TGroundRect() -{ - pSubRects = NULL; - nTerrain = NULL; -}; +//TGroundRect::TGroundRect( float3 const &Position, float const Radius = 1000.0f * M_SQRT2 ) : TGroundRect::~TGroundRect() { SafeDeleteArray(pSubRects); }; +void +TGroundRect::Init() { + + pSubRects = new TSubRect[ iNumSubRects * iNumSubRects ]; + float const subrectsize = 1000.0f / iNumSubRects; + for( int column = 0; column < iNumSubRects; ++column ) { + for( int row = 0; row < iNumSubRects; ++row ) { + auto &area = FastGetRect(column, row)->m_area; + area.center = + m_area.center + - float3( 500.0f, 0.0f, 500.0f ) // 'upper left' corner of rectangle + + float3( subrectsize * 0.5f, 0.0f, subrectsize * 0.5f ) // center of sub-rectangle + + float3( subrectsize * column, 0.0f, subrectsize * row ); + area.radius = subrectsize * M_SQRT2; + } + } +}; + void TGroundRect::RenderDL() { // renderowanie kwadratu kilometrowego (DL), jeśli jeszcze nie zrobione if (iLastDisplay != iFrameNumber) @@ -1263,6 +1316,44 @@ void TGroundRect::RenderDL() nRootMesh->RenderDL(); iLastDisplay = iFrameNumber; // drugi raz nie potrzeba } +/* + float width = 500.0f; + float height = 50.0f; + float3 vTopLeftFront( m_area.center.x - width, m_area.center.y + height, m_area.center.z + width ); + float3 vTopLeftBack( m_area.center.x - width, m_area.center.y + height, m_area.center.z - width ); + float3 vTopRightBack( m_area.center.x + width, m_area.center.y + height, m_area.center.z - width ); + float3 vTopRightFront( m_area.center.x + width, m_area.center.y + height, m_area.center.z + width ); + + float3 vBottom_LeftFront( m_area.center.x - width, m_area.center.y - height, m_area.center.z + width ); + float3 vBottom_LeftBack( m_area.center.x - width, m_area.center.y - height, m_area.center.z - width ); + float3 vBottomRightBack( m_area.center.x + width, m_area.center.y - height, m_area.center.z - width ); + float3 vBottomRightFront( m_area.center.x + width, m_area.center.y - height, m_area.center.z + width ); + + glDisable( GL_LIGHTING ); + glDisable( GL_TEXTURE_2D ); + glColor3ub( 0, 255, 255 ); + glBegin( GL_LINE_LOOP ); + glVertex3fv( &vTopLeftFront.x ); + glVertex3fv( &vTopLeftBack.x ); + glVertex3fv( &vTopRightBack.x ); + glVertex3fv( &vTopRightFront.x ); + glEnd(); + glBegin( GL_LINE_LOOP ); + glVertex3fv( &vBottom_LeftFront.x ); + glVertex3fv( &vBottom_LeftBack.x ); + glVertex3fv( &vBottomRightBack.x ); + glVertex3fv( &vBottomRightFront.x ); + glEnd(); + glBegin( GL_LINES ); + glVertex3fv( &vTopLeftFront.x ); glVertex3fv( &vBottom_LeftFront.x ); + glVertex3fv( &vTopLeftBack.x ); glVertex3fv( &vBottom_LeftBack.x ); + glVertex3fv( &vTopRightBack.x ); glVertex3fv( &vBottomRightBack.x ); + glVertex3fv( &vTopRightFront.x ); glVertex3fv( &vBottomRightFront.x ); + glEnd(); + glColor3ub( 255, 255, 255 ); + glEnable( GL_TEXTURE_2D ); + glEnable( GL_LIGHTING ); +*/ }; /* void TGroundRect::RenderVBO() @@ -1340,6 +1431,22 @@ TGround::TGround() #endif ::SecureZeroMemory( TempConnectionType, sizeof( TempConnectionType ) ); ::SecureZeroMemory( pRendered, sizeof( pRendered ) ); + + // set bounding area information for ground rectangles + float const rectsize = 1000.0f; + float3 const worldcenter( 0.0f, 0.0f, 0.0f ); + for( int column = 0; column < iNumRects; ++column ) { + for( int row = 0; row < iNumRects; ++row ) { + auto &area = Rects[ column ][ row ].m_area; + // NOTE: in current implementation triangles can stick out to ~200m from the area, so we add extra padding + area.radius = 200.0f + rectsize * 0.5f * M_SQRT2; + area.center = + worldcenter + - float3( (iNumRects / 2) * rectsize, 0.0f, (iNumRects / 2) * rectsize ) // 'upper left' corner of the world + + float3( rectsize * 0.5f, 0.0f, rectsize * 0.5f ) // center of the rectangle + + float3( rectsize * column, 0.0f, rectsize * row ); + } + } } TGround::~TGround() @@ -4826,26 +4933,31 @@ bool TGround::GetTraction(TDynamicObject *model) }; bool -TGround::Render( Math3D::vector3 const &Camera ) { +TGround::Render_Hidden( Math3D::vector3 const &Camera ) { GfxRenderer.Update_Lights( m_lights ); -/* - if( Global::bUseVBO ) { // renderowanie przez VBO - if( !RenderVBO( Camera ) ) - return false; - if( !RenderAlphaVBO( Camera ) ) - return false; - } - else { -*/ - // renderowanie przez Display List - if( !RenderDL( Camera ) ) - return false; - if( !RenderAlphaDL( Camera ) ) - return false; -/* - } -*/ + + ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) + + TGroundNode *node; + int n = 2 * iNumSubRects; //(2*==2km) promień wyświetlanej mapy w sektorach + int c = GetColFromX( Camera.x ); + int r = GetRowFromZ( Camera.z ); + TSubRect *tmp; + for( node = srGlobal.nRenderHidden; node; node = node->nNext3 ) + node->RenderHidden(); // rednerowanie globalnych (nie za często?) + int i, j, k; + // renderowanie czołgowe dla obiektów aktywnych a niewidocznych + for( j = r - n; j <= r + n; j++ ) + for( i = c - n; i <= c + n; i++ ) + if( ( tmp = FastGetSubRect( i, j ) ) != NULL ) { + tmp->LoadNodes(); // oznaczanie aktywnych sektorów + for( node = tmp->nRenderHidden; node; node = node->nNext3 ) + node->RenderHidden(); + tmp->RenderSounds(); // jeszcze dźwięki pojazdów by się przydały, również + // niewidocznych + } + return true; } @@ -4897,8 +5009,11 @@ bool TGround::RenderDL(vector3 pPosition) if (CameraDirection.x * direction.x + CameraDirection.z * direction.z < 0.55) continue; // pomijanie sektorów poza kątem patrzenia } + // NOTE: terrain data is disabled, as it's moved to the renderer +/* Rects[(i + c) / iNumSubRects][(j + r) / iNumSubRects] .RenderDL(); // kwadrat kilometrowy nie zawsze, bo szkoda FPS +*/ if ((tmp = FastGetSubRect(i + c, j + r)) != NULL) if (tmp->iNodeCount) // o ile są jakieś obiekty, bo po co puste sektory przelatywać pRendered[iRendered++] = tmp; // tworzenie listy sektorów do renderowania diff --git a/Ground.h b/Ground.h index 67ef46c2..1354aa06 100644 --- a/Ground.h +++ b/Ground.h @@ -185,9 +185,16 @@ class TGroundNode : public Resource */ }; +struct bounding_area { + + float3 center; // mid point of the rectangle + float radius{ 0.0f }; // radius of the bounding sphere +}; + class TSubRect : public Resource, public CMesh { // sektor składowy kwadratu kilometrowego public: + bounding_area m_area; int iTracks = 0; // ilość torów w (tTracks) TTrack **tTracks = nullptr; // tory do renderowania pojazdów protected: @@ -209,7 +216,6 @@ class TSubRect : public Resource, public CMesh public: void LoadNodes(); // utworzenie VBO sektora public: -// TSubRect() = default; virtual ~TSubRect(); virtual void Release(); // zwalnianie VBO sektora void NodeAdd(TGroundNode *Node); // dodanie obiektu do sektora na etapie rozdzielania na sektory @@ -246,16 +252,12 @@ class TGroundRect : public TSubRect // Ra: 2012-02 doszły submodele terenu private: int iLastDisplay; // numer klatki w której był ostatnio wyświetlany - TSubRect *pSubRects; - void Init() - { - pSubRects = new TSubRect[iNumSubRects * iNumSubRects]; - }; + TSubRect *pSubRects{ nullptr }; + void Init(); public: static int iFrameNumber; // numer kolejny wyświetlanej klatki - TGroundNode *nTerrain; // model terenu z E3D - użyć nRootMesh? - TGroundRect(); + TGroundNode *nTerrain{ nullptr }; // model terenu z E3D - użyć nRootMesh? virtual ~TGroundRect(); TSubRect * SafeGetRect(int iCol, int iRow) @@ -282,6 +284,8 @@ class TGroundRect : public TSubRect class TGround { + friend class opengl_renderer; + vector3 CameraDirection; // zmienna robocza przy renderowaniu int const *iRange = nullptr; // tabela widoczności // TGroundNode *nRootNode; //lista wszystkich węzłów @@ -361,7 +365,7 @@ class TGround void Update_Lights(); // updates scene lights array bool AddToQuery(TEvent *Event, TDynamicObject *Node); bool GetTraction(TDynamicObject *model); - bool Render( Math3D::vector3 const &Camera ); + bool Render_Hidden( Math3D::vector3 const &Camera ); bool RenderDL(vector3 pPosition); bool RenderAlphaDL(vector3 pPosition); /* diff --git a/World.cpp b/World.cpp index 617521ed..e1be615d 100644 --- a/World.cpp +++ b/World.cpp @@ -1004,51 +1004,37 @@ bool TWorld::Update() --iCheckFPS; else { // jak doszło do zera, to sprawdzamy wydajność - if (Timer::GetFPS() < Global::fFpsMin) - { - Global::iSegmentsRendered -= - Random(10); // floor(0.5+Global::iSegmentsRendered/Global::fRadiusFactor); - if (Global::iSegmentsRendered < 10) // jeśli jest co zmniejszać - Global::iSegmentsRendered = 10; // 10=minimalny promień to 600m + auto const framerate = Timer::GetFPS(); + // NOTE: until we have quadtree in place we have to rely on the legacy rendering + // once this is resolved we should be able to simply adjust draw range + if( framerate > 65.0 ) { + + Global::iSegmentsRendered = std::min( 400, Global::iSegmentsRendered + 5 ); + Global::fDistanceFactor = std::min( 3.0f, Global::fDistanceFactor + 0.025f ); } - else if (Timer::GetFPS() > Global::fFpsMax) // jeśli jest dużo FPS - if (Global::iSegmentsRendered < Global::iFpsRadiusMax) // jeśli jest co zwiększać - { - Global::iSegmentsRendered += - Random(5); // floor(0.5+Global::iSegmentsRendered*Global::fRadiusFactor); - if (Global::iSegmentsRendered > Global::iFpsRadiusMax) // 5.6km (22*22*M_PI) - Global::iSegmentsRendered = Global::iFpsRadiusMax; - } - if ((Timer::GetFPS() < 12) && (Global::iSlowMotion < 7)) + else if( framerate > 45.0 ) { + + Global::iSegmentsRendered = std::min( 225, Global::iSegmentsRendered + 5 ); + } + else if ( framerate < Global::fFpsMin) { + // 9=minimalny promień to 600m + Global::iSegmentsRendered = std::max( 9, Global::iSegmentsRendered - 3 ); + Global::fDistanceFactor = std::max( Global::ScreenHeight / 768.0f * 0.75f, Global::fDistanceFactor - 0.1f ); + } + if ((framerate < 15.0) && (Global::iSlowMotion < 7)) { Global::iSlowMotion = (Global::iSlowMotion << 1) + 1; // zapalenie kolejnego bitu if (Global::iSlowMotionMask & 1) if (Global::iMultisampling) // a multisampling jest włączony glDisable(GL_MULTISAMPLE); // wyłączenie multisamplingu powinno poprawić FPS } - else if ((Timer::GetFPS() > 20) && Global::iSlowMotion) + else if ((framerate > 20.0) && Global::iSlowMotion) { // FPS się zwiększył, można włączyć bajery Global::iSlowMotion = (Global::iSlowMotion >> 1); // zgaszenie bitu if (Global::iSlowMotion == 0) // jeśli jest pełna prędkość if (Global::iMultisampling) // a multisampling jest włączony glEnable(GL_MULTISAMPLE); } - /* - if (!Global::bPause) - if (GetFPS()<=5) - {//zwiększenie kroku fizyki przy słabym FPS - if (fMaxDt<0.05) - {fMaxDt=0.05; //Ra: tak nie może być, bo są problemy na sprzęgach - WriteLog("Phisics step switched to 0.05s!"); - } - } - else if (GetFPS()>12) - if (fMaxDt>0.01) - {//powrót do podstawowego kroku fizyki - fMaxDt=0.01; - WriteLog("Phisics step switched to 0.01s!"); - } - */ iCheckFPS = 0.25 * Timer::GetFPS(); // tak za 0.25 sekundy sprawdzić ponownie (jeszcze przycina?) } Timer::UpdateTimers(Global::iPause != 0); @@ -1728,14 +1714,12 @@ TWorld::Render_UI() { if( Global::iTextMode == GLFW_KEY_F8 ) { Global::iViewMode = GLFW_KEY_F8; - OutText1 = "FPS: " + to_string( Timer::GetFPS(), 2 ); + OutText1 = "Draw range x " + to_string( Global::fDistanceFactor, 1 ) + "; FPS: " + to_string( Timer::GetFPS(), 2 ); //OutText1 += sprintf(); if( Global::iSlowMotion ) OutText1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; - OutText1 += ", sectors: " + to_string( Ground.iRendered ); - if( DebugModeFlag ) { - OutText1 += " FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ); - } + OutText1 += ", sectors: " + to_string( Ground.iRendered ) + "/" + to_string( Global::iSegmentsRendered ); + OutText1 += "; FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ); } // if (Console::Pressed(VK_F7)) diff --git a/renderer.cpp b/renderer.cpp index 2b0221db..23f25498 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -14,6 +14,12 @@ http://mozilla.org/MPL/2.0/. #include "dynobj.h" // returns true if specified object is within camera frustum, false otherwise +bool +opengl_camera::visible( bounding_area const &Area ) const { + + return ( m_frustum.sphere_inside( Area.center, Area.radius ) > 0.0f ); +} + bool opengl_camera::visible( TDynamicObject const *Dynamic ) const { @@ -63,7 +69,7 @@ opengl_renderer::Render() { Global::FieldOfView / Global::ZoomFactor, (GLdouble)Global::ScreenWidth / std::max( (GLdouble)Global::ScreenHeight, 1.0 ), 0.1f * Global::ZoomFactor, - m_drawrange ); + m_drawrange * Global::fDistanceFactor ); ::glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix ::glLoadIdentity(); @@ -75,7 +81,10 @@ opengl_renderer::Render() { World.Environment.render(); } - if( false == World.Ground.Render( World.Camera.Pos ) ) { return false; } + World.Ground.Render_Hidden( World.Camera.Pos ); + Render( &World.Ground ); + World.Ground.RenderDL( World.Camera.Pos ); + World.Ground.RenderAlphaDL( World.Camera.Pos ); World.Render_Cab(); World.Render_UI(); @@ -83,6 +92,33 @@ opengl_renderer::Render() { return true; // for now always succeed } +bool +opengl_renderer::Render( TGround *Ground ) { + + glDisable( GL_BLEND ); + glAlphaFunc( GL_GREATER, 0.35f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glEnable( GL_LIGHTING ); + glColor3f( 1.0f, 1.0f, 1.0f ); + + float3 const cameraposition = float3( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); + int const camerax = std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2; + int const cameraz = std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2; + int const segmentcount = 2 * static_cast(std::ceil( m_drawrange * Global::fDistanceFactor / 1000.0f )); + int const originx = std::max( 0, camerax - segmentcount / 2 ); + int const originz = std::max( 0, cameraz - segmentcount / 2 ); + + for( int column = originx; column <= originx + segmentcount; ++column ) { + for( int row = originz; row <= originz + segmentcount; ++row ) { + + auto &rectangle = Ground->Rects[ column ][ row ]; + if( m_camera.visible( rectangle.m_area ) ) { + rectangle.RenderDL(); + } + } + } + return true; +} + bool opengl_renderer::Render( TDynamicObject *Dynamic ) { diff --git a/renderer.h b/renderer.h index f4dfe212..5d340855 100644 --- a/renderer.h +++ b/renderer.h @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "lightarray.h" #include "dumb3d.h" #include "frustum.h" +#include "ground.h" struct opengl_light { @@ -78,6 +79,8 @@ public: inline void update_frustum() { m_frustum.calculate(); } + bool + visible( bounding_area const &Area ) const; bool visible( TDynamicObject const *Dynamic ) const; @@ -98,6 +101,8 @@ public: // main draw call. returns false on error bool Render(); + bool + Render( TGround *Ground ); bool Render( TDynamicObject *Dynamic ); bool From 0cd310958717245e65c8b8aa89d1190722465d0a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 12 Mar 2017 16:46:20 +0100 Subject: [PATCH 056/426] reverted terrain rendering, range adjustment moved to renderer, now based on frame drawing time instead of entire scene refresh rate. --- EU07.cpp | 11 +++++++++ Ground.cpp | 43 ++++++++++++++------------------- Ground.h | 2 +- World.cpp | 38 ----------------------------- World.h | 1 - renderer.cpp | 67 +++++++++++++++++++++++++++++++++++++++++++++++----- renderer.h | 4 ++++ 7 files changed, 95 insertions(+), 71 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index d97b4b27..ce879258 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -29,6 +29,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "Mover.h" #include "usefull.h" #include "timer.h" +#include "resource.h" #pragma comment( lib, "glfw3dll.lib" ) #pragma comment( lib, "glew32.lib" ) @@ -320,6 +321,16 @@ int main(int argc, char *argv[]) BaseWindowProc = (WNDPROC)::SetWindowLongPtr( Hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc ); // switch off the topmost flag ::SetWindowPos( Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); + + const HANDLE icon = ::LoadImage( + ::GetModuleHandle( 0 ), + MAKEINTRESOURCE( IDI_ICON1 ), + IMAGE_ICON, + ::GetSystemMetrics( SM_CXSMICON ), + ::GetSystemMetrics( SM_CYSMICON ), + 0 ); + if( icon ) + ::SendMessage( Hwnd, WM_SETICON, ICON_SMALL, reinterpret_cast( icon ) ); #endif GfxRenderer.Init(); diff --git a/Ground.cpp b/Ground.cpp index 59421974..2e581778 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -4933,31 +4933,26 @@ bool TGround::GetTraction(TDynamicObject *model) }; bool -TGround::Render_Hidden( Math3D::vector3 const &Camera ) { +TGround::Render( Math3D::vector3 const &Camera ) { GfxRenderer.Update_Lights( m_lights ); - - ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) - - TGroundNode *node; - int n = 2 * iNumSubRects; //(2*==2km) promień wyświetlanej mapy w sektorach - int c = GetColFromX( Camera.x ); - int r = GetRowFromZ( Camera.z ); - TSubRect *tmp; - for( node = srGlobal.nRenderHidden; node; node = node->nNext3 ) - node->RenderHidden(); // rednerowanie globalnych (nie za często?) - int i, j, k; - // renderowanie czołgowe dla obiektów aktywnych a niewidocznych - for( j = r - n; j <= r + n; j++ ) - for( i = c - n; i <= c + n; i++ ) - if( ( tmp = FastGetSubRect( i, j ) ) != NULL ) { - tmp->LoadNodes(); // oznaczanie aktywnych sektorów - for( node = tmp->nRenderHidden; node; node = node->nNext3 ) - node->RenderHidden(); - tmp->RenderSounds(); // jeszcze dźwięki pojazdów by się przydały, również - // niewidocznych - } - + /* + if( Global::bUseVBO ) { // renderowanie przez VBO + if( !RenderVBO( Camera ) ) + return false; + if( !RenderAlphaVBO( Camera ) ) + return false; + } + else { + */ + // renderowanie przez Display List + if( !RenderDL( Camera ) ) + return false; + if( !RenderAlphaDL( Camera ) ) + return false; + /* + } + */ return true; } @@ -5010,10 +5005,8 @@ bool TGround::RenderDL(vector3 pPosition) continue; // pomijanie sektorów poza kątem patrzenia } // NOTE: terrain data is disabled, as it's moved to the renderer -/* Rects[(i + c) / iNumSubRects][(j + r) / iNumSubRects] .RenderDL(); // kwadrat kilometrowy nie zawsze, bo szkoda FPS -*/ if ((tmp = FastGetSubRect(i + c, j + r)) != NULL) if (tmp->iNodeCount) // o ile są jakieś obiekty, bo po co puste sektory przelatywać pRendered[iRendered++] = tmp; // tworzenie listy sektorów do renderowania diff --git a/Ground.h b/Ground.h index 1354aa06..dda67bfd 100644 --- a/Ground.h +++ b/Ground.h @@ -365,7 +365,7 @@ class TGround void Update_Lights(); // updates scene lights array bool AddToQuery(TEvent *Event, TDynamicObject *Node); bool GetTraction(TDynamicObject *model); - bool Render_Hidden( Math3D::vector3 const &Camera ); + bool Render( Math3D::vector3 const &Camera ); bool RenderDL(vector3 pPosition); bool RenderAlphaDL(vector3 pPosition); /* diff --git a/World.cpp b/World.cpp index e1be615d..a94c0ea3 100644 --- a/World.cpp +++ b/World.cpp @@ -55,7 +55,6 @@ TWorld::TWorld() OutText1 = ""; // teksty wyświetlane na ekranie OutText2 = ""; OutText3 = ""; - iCheckFPS = 0; // kiedy znów sprawdzić FPS, żeby wyłączać optymalizacji od razu do zera pDynamicNearest = NULL; fTimeBuffer = 0.0; // bufor czasu aktualizacji dla stałego kroku fizyki fMaxDt = 0.01; //[s] początkowy krok czasowy fizyki @@ -1000,43 +999,6 @@ bool TWorld::Update() WriteLog("Scenery moved"); }; #endif - if (iCheckFPS) - --iCheckFPS; - else - { // jak doszło do zera, to sprawdzamy wydajność - auto const framerate = Timer::GetFPS(); - // NOTE: until we have quadtree in place we have to rely on the legacy rendering - // once this is resolved we should be able to simply adjust draw range - if( framerate > 65.0 ) { - - Global::iSegmentsRendered = std::min( 400, Global::iSegmentsRendered + 5 ); - Global::fDistanceFactor = std::min( 3.0f, Global::fDistanceFactor + 0.025f ); - } - else if( framerate > 45.0 ) { - - Global::iSegmentsRendered = std::min( 225, Global::iSegmentsRendered + 5 ); - } - else if ( framerate < Global::fFpsMin) { - // 9=minimalny promień to 600m - Global::iSegmentsRendered = std::max( 9, Global::iSegmentsRendered - 3 ); - Global::fDistanceFactor = std::max( Global::ScreenHeight / 768.0f * 0.75f, Global::fDistanceFactor - 0.1f ); - } - if ((framerate < 15.0) && (Global::iSlowMotion < 7)) - { - Global::iSlowMotion = (Global::iSlowMotion << 1) + 1; // zapalenie kolejnego bitu - if (Global::iSlowMotionMask & 1) - if (Global::iMultisampling) // a multisampling jest włączony - glDisable(GL_MULTISAMPLE); // wyłączenie multisamplingu powinno poprawić FPS - } - else if ((framerate > 20.0) && Global::iSlowMotion) - { // FPS się zwiększył, można włączyć bajery - Global::iSlowMotion = (Global::iSlowMotion >> 1); // zgaszenie bitu - if (Global::iSlowMotion == 0) // jeśli jest pełna prędkość - if (Global::iMultisampling) // a multisampling jest włączony - glEnable(GL_MULTISAMPLE); - } - iCheckFPS = 0.25 * Timer::GetFPS(); // tak za 0.25 sekundy sprawdzić ponownie (jeszcze przycina?) - } Timer::UpdateTimers(Global::iPause != 0); if( (Global::iPause == false) || (m_init == false) ) diff --git a/World.h b/World.h index d9bbb954..ab05255c 100644 --- a/World.h +++ b/World.h @@ -82,7 +82,6 @@ class TWorld texture_manager::size_type light; // numer tekstury dla smugi TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury TMoverParameters *mvControlled; // wskaźnik na człon silnikowy, do wyświetlania jego parametrów - int iCheckFPS; // kiedy znów sprawdzić FPS, żeby wyłączać optymalizacji od razu do zera double fTime50Hz; // bufor czasu dla komunikacji z PoKeys double fTimeBuffer; // bufor czasu aktualizacji dla stałego kroku fizyki double fMaxDt; //[s] krok czasowy fizyki (0.01 dla normalnych warunków) diff --git a/renderer.cpp b/renderer.cpp index 23f25498..992c335b 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -58,6 +58,8 @@ opengl_renderer::Init() { bool opengl_renderer::Render() { + auto timestart = std::chrono::steady_clock::now(); + ::glColor3ub( 255, 255, 255 ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); ::glDepthFunc( GL_LEQUAL ); @@ -81,14 +83,14 @@ opengl_renderer::Render() { World.Environment.render(); } - World.Ground.Render_Hidden( World.Camera.Pos ); - Render( &World.Ground ); - World.Ground.RenderDL( World.Camera.Pos ); - World.Ground.RenderAlphaDL( World.Camera.Pos ); + World.Ground.Render( World.Camera.Pos ); World.Render_Cab(); World.Render_UI(); + // accumulate last 20 frames worth of render time + m_drawtime = 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - timestart ) ).count(); + return true; // for now always succeed } @@ -116,6 +118,7 @@ opengl_renderer::Render( TGround *Ground ) { } } } + return true; } @@ -335,9 +338,61 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, M } void -opengl_renderer::Update ( double const Deltatile ) { +opengl_renderer::Update ( double const Deltatime ) { - // TODO: add garbage collection and other works here + m_updateaccumulator += Deltatime; + + if( m_updateaccumulator < 1.0 ) { + // too early for any work + return; + } + + m_updateaccumulator = 0.0; + + // adjust draw ranges etc, based on recent performance + auto const framerate = 1000.0f / (m_drawtime * 0.05f); + + // NOTE: until we have quadtree in place we have to rely on the legacy rendering + // once this is resolved we should be able to simply adjust draw range + int targetsegments; + float targetfactor; + + if( framerate > 65.0 ) { targetsegments = 400; targetfactor = 3.0f; } + else if( framerate > 40.0 ) { targetsegments = 225; targetfactor = 1.5f; } + else if( framerate > 15.0 ) { targetsegments = 90; targetfactor = Global::ScreenHeight / 768.0f; } + else { targetsegments = 9; targetfactor = Global::ScreenHeight / 768.0f * 0.75f; } + + if( targetsegments > Global::iSegmentsRendered ) { + + Global::iSegmentsRendered = std::min( targetsegments, Global::iSegmentsRendered + 5 ); + } + else if( targetsegments < Global::iSegmentsRendered ) { + + Global::iSegmentsRendered = std::max( targetsegments, Global::iSegmentsRendered - 5 ); + } + if( targetfactor > Global::fDistanceFactor ) { + + Global::fDistanceFactor = std::min( targetfactor, Global::fDistanceFactor + 0.05f ); + } + else if( targetfactor < Global::fDistanceFactor ) { + + Global::fDistanceFactor = std::max( targetfactor, Global::fDistanceFactor - 0.05f ); + } + + if( ( framerate < 15.0 ) && ( Global::iSlowMotion < 7 ) ) { + Global::iSlowMotion = ( Global::iSlowMotion << 1 ) + 1; // zapalenie kolejnego bitu + if( Global::iSlowMotionMask & 1 ) + if( Global::iMultisampling ) // a multisampling jest włączony + ::glDisable( GL_MULTISAMPLE ); // wyłączenie multisamplingu powinno poprawić FPS + } + else if( ( framerate > 20.0 ) && Global::iSlowMotion ) { // FPS się zwiększył, można włączyć bajery + Global::iSlowMotion = ( Global::iSlowMotion >> 1 ); // zgaszenie bitu + if( Global::iSlowMotion == 0 ) // jeśli jest pełna prędkość + if( Global::iMultisampling ) // a multisampling jest włączony + ::glEnable( GL_MULTISAMPLE ); + } + + // TODO: add garbage collection and other less frequent works here }; void diff --git a/renderer.h b/renderer.h index 5d340855..22ab85a3 100644 --- a/renderer.h +++ b/renderer.h @@ -153,6 +153,8 @@ private: }; typedef std::vector opengllight_array; + +// methods // members rendermode renderpass{ rendermode::color }; @@ -160,6 +162,8 @@ private: texture_manager m_textures; opengl_camera m_camera; float m_drawrange{ 2500.0f }; // current drawing range + float m_drawtime{ 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps + double m_updateaccumulator{ 0.0 }; }; extern opengl_renderer GfxRenderer; From e0bde30ee4748a6f55cb25d85580ecd03351166f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 13 Mar 2017 15:35:34 +0100 Subject: [PATCH 057/426] basic ui panels --- EU07.cpp | 10 +- Globals.cpp | 12 - Globals.h | 4 - Ground.cpp | 66 +--- World.cpp | 660 +++++----------------------------------- World.h | 2 - maszyna.vcxproj | 2 + maszyna.vcxproj.filters | 6 + parser.cpp | 26 ++ parser.h | 4 + renderer.cpp | 133 ++++++-- renderer.h | 6 +- uilayer.cpp | 203 ++++++++++++ uilayer.h | 86 ++++++ 14 files changed, 534 insertions(+), 686 deletions(-) create mode 100644 uilayer.cpp create mode 100644 uilayer.h diff --git a/EU07.cpp b/EU07.cpp index ce879258..8ad328f2 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -30,6 +30,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "usefull.h" #include "timer.h" #include "resource.h" +#include "uilayer.h" #pragma comment( lib, "glfw3dll.lib" ) #pragma comment( lib, "glew32.lib" ) @@ -333,12 +334,16 @@ int main(int argc, char *argv[]) ::SendMessage( Hwnd, WM_SETICON, ICON_SMALL, reinterpret_cast( icon ) ); #endif - GfxRenderer.Init(); + if( ( false == GfxRenderer.Init( window ) ) + || ( false == UILayer.init( window ) ) ) { + + return -1; + } Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów if (!World.Init(window)) { - std::cout << "failed to init TWorld" << std::endl; + ErrorLog( "Failed to init TWorld" ); return -1; } @@ -362,7 +367,6 @@ int main(int argc, char *argv[]) && World.Update() && GfxRenderer.Render()) { - glfwSwapBuffers(window); glfwPollEvents(); } Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) diff --git a/Globals.cpp b/Globals.cpp index a8221a28..5350728a 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -41,10 +41,6 @@ int Global::iSlowMotion = TDynamicObject *Global::changeDynObj = NULL; // info o zmianie pojazdu double Global::ABuDebug = 0; std::string Global::asSky = "1"; -double Global::fOpenGL = 0.0; // wersja OpenGL - do sprawdzania obecności rozszerzeń -/* -bool Global::bOpenGL_1_5 = false; // czy są dostępne funkcje OpenGL 1.5 -*/ double Global::fLuminance = 1.0; // jasność światła do automatycznego zapalania float Global::SunAngle = 0.0f; int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki @@ -805,12 +801,6 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(1, false); Parser >> Global::asLang; } - else if (token == "opengl") - { - // deklarowana wersja OpenGL, żeby powstrzymać błędy - Parser.getTokens(1, false); - Parser >> Global::fOpenGL; - } else if (token == "pyscreenrendererpriority") { // priority of python screen renderer @@ -929,8 +919,6 @@ void Global::ConfigParse(cParser &Parser) bEnableTraction = false; // false = pantograf się nie połamie bLiveTraction = false; // false = pantografy zawsze zbierają 95% MaxVoltage } - // if (fMoveLight>0) bDoubleAmbient=false; //wtedy tylko jedno światło ruchome - // if (fOpenGL<1.3) iMultisampling=0; //można by z góry wyłączyć, ale nie mamy jeszcze fOpenGL if (iMultisampling) { // antyaliasing całoekranowy wyłącza rozmywanie drutów bSmoothTraction = false; diff --git a/Globals.h b/Globals.h index 8f154173..33765bf0 100644 --- a/Globals.h +++ b/Globals.h @@ -257,10 +257,6 @@ class Global static bool bUseVBO; // czy jest VBO w karcie graficznej static int iFeedbackMode; // tryb pracy informacji zwrotnej static int iFeedbackPort; // dodatkowy adres dla informacji zwrotnych - static double fOpenGL; // wersja OpenGL - przyda się -/* - static bool bOpenGL_1_5; // czy są dostępne funkcje OpenGL 1.5 -*/ static double fLuminance; // jasność światła do automatycznego zapalania static float SunAngle; // angle of the sun relative to horizon static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji diff --git a/Ground.cpp b/Ground.cpp index 2e581778..547b19ee 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -36,6 +36,7 @@ http://mozilla.org/MPL/2.0/. #include "Driver.h" #include "Console.h" #include "Names.h" +#include "uilayer.h" #define _PROBLEND 1 //--------------------------------------------------------------------------- @@ -703,7 +704,6 @@ void TGroundNode::RenderAlphaDL() { glEnable(GL_BLEND); glAlphaFunc(GL_GREATER, 0.02f); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); }; #endif } @@ -2553,66 +2553,17 @@ void TGround::FirstInit() for (j = 0; j < iNumRects; ++j) Rects[i][j].Optimize(); // optymalizacja obiektów w sektorach WriteLog("InitNormals OK"); - WriteLog("InitTracks"); InitTracks(); //łączenie odcinków ze sobą i przyklejanie eventów WriteLog("InitTracks OK"); - WriteLog("InitTraction"); InitTraction(); //łączenie drutów ze sobą WriteLog("InitTraction OK"); - WriteLog("InitEvents"); InitEvents(); WriteLog("InitEvents OK"); - WriteLog("InitLaunchers"); InitLaunchers(); WriteLog("InitLaunchers OK"); - WriteLog("InitGlobalTime"); // ABu 160205: juz nie TODO :) Mtable::GlobalTime = std::make_shared( hh, mm, srh, srm, ssh, ssm ); // McZapkie-300302: inicjacja czasu rozkladowego - TODO: czytac z trasy! WriteLog("InitGlobalTime OK"); - // jeszcze ustawienie pogody, gdyby nie było w scenerii wpisów - glClearColor(Global::AtmoColor[0], Global::AtmoColor[1], Global::AtmoColor[2], - 0.0); // Background Color - if (Global::fFogEnd > 0) - { - glFogi(GL_FOG_MODE, GL_LINEAR); - glFogfv(GL_FOG_COLOR, Global::FogColor); // set fog color - glFogf(GL_FOG_START, Global::fFogStart); // fog start depth - glFogf(GL_FOG_END, Global::fFogEnd); // fog end depth - glEnable(GL_FOG); - } - else - glDisable(GL_FOG); - glDisable(GL_LIGHTING); -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO, TBD: re-implement this - glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); // daylight position - glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); // kolor wszechobceny - glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); // kolor padający - glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); // kolor odbity - // musi być tutaj, bo wcześniej nie mieliśmy wartości światła -#endif -/* - if (Global::fMoveLight >= 0.0) // albo tak, albo niech ustala minimum ciemności w nocy - { -*/ -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO, TBD: re-implement this - Global::fLuminance = // obliczenie luminacji "światła w ciemności" - +0.150 * Global::ambientDayLight[0] // R - + 0.295 * Global::ambientDayLight[1] // G - + 0.055 * Global::ambientDayLight[2]; // B - if (Global::fLuminance > 0.1) // jeśli miało by być za jasno - for (int i = 0; i < 3; i++) - Global::ambientDayLight[i] *= - 0.1 / Global::fLuminance; // ograniczenie jasności w nocy - glLightModelfv(GL_LIGHT_MODEL_AMBIENT, Global::ambientDayLight); -#endif -/* - } - else if (Global::bDoubleAmbient) // Ra: wcześniej było ambient dawane na obydwa światła - glLightModelfv(GL_LIGHT_MODEL_AMBIENT, Global::ambientDayLight); -*/ - glEnable(GL_LIGHTING); WriteLog("FirstInit is done"); }; @@ -2628,6 +2579,7 @@ bool TGround::Init(std::string File) // TFileStream *fs; // int size; std::string subpath = Global::asCurrentSceneryPath; // "scenery/"; + auto const tokencount = cParser::countTokens( File, subpath ); cParser parser(File, cParser::buffer_FILE, subpath, Global::bLoadTraction); std::string token; @@ -2663,17 +2615,17 @@ bool TGround::Init(std::string File) token = ""; parser.getTokens(); parser >> token; - int refresh = 0; + std::size_t processed = 0; while (token != "") //(!Parser->EndOfFile) { - if (refresh == 50) - { // SwapBuffers(hDC); //Ra: bez ogranicznika za bardzo spowalnia :( a u niektórych miga - refresh = 0; - Global::DoEvents(); + ++processed; + if( processed % 50 == 0 ) + { + UILayer.set_progress( parser.getProgress(), parser.getFullProgress() ); + GfxRenderer.Render(); + glfwPollEvents(); } - else - ++refresh; str = token; if (str == "node") { diff --git a/World.cpp b/World.cpp index a94c0ea3..018f7dd7 100644 --- a/World.cpp +++ b/World.cpp @@ -29,13 +29,15 @@ http://mozilla.org/MPL/2.0/. #include "Driver.h" #include "Console.h" #include "color.h" +#include "uilayer.h" //--------------------------------------------------------------------------- -// GLUTAPI void APIENTRY glutBitmapCharacterDLL(void *font, int character); TDynamicObject *Controlled = NULL; // pojazd, który prowadzimy -const double fTimeMax = 1.00; //[s] maksymalny czas aktualizacji w jednek klatce +std::shared_ptr UIHeader = std::make_shared( 20, 20 ); // header ui panel +std::shared_ptr UITable = std::make_shared( 100, 50 ); // schedule or scan table +std::shared_ptr UITranscripts = std::make_shared( 85, 600 ); // voice transcripts extern "C" { @@ -68,7 +70,6 @@ TWorld::~TWorld() // Ground.Free(); //Ra: usunięcie obiektów przed usunięciem dźwięków - sypie się TSoundsManager::Free(); TModelsManager::Free(); - glDeleteLists(base, 96); } void TWorld::TrainDelete(TDynamicObject *d) @@ -84,27 +85,6 @@ void TWorld::TrainDelete(TDynamicObject *d) Global::pUserDynamic = NULL; // tego też nie ma }; -GLvoid TWorld::glPrint( std::string const &Text ) // custom GL "Print" routine -{ // wypisywanie tekstu 2D na ekranie - if (true == Text.empty()) - return; -/* - if (Global::bGlutFont) - { // tekst generowany przez GLUT - int i, len = strlen(txt); - for (i = 0; i < len; i++) - glutBitmapCharacterDLL(GLUT_BITMAP_8_BY_13, txt[i]); // funkcja linkowana dynamicznie - } - else -*/ - { // generowanie przez Display Lists - glPushAttrib(GL_LIST_BIT); // pushes the display list bits - glListBase(base - 32); // sets the base character to 32 - glCallLists(Text.size(), GL_UNSIGNED_BYTE, Text.c_str()); // draws the display list text - glPopAttrib(); // pops the display list bits - } -} - /* Ra: do opracowania: wybor karty graficznej ~Intel gdy są dwie... BOOL GetDisplayMonitorInfo(int nDeviceIndex, LPSTR lpszMonitorInfo) { @@ -167,315 +147,39 @@ bool TWorld::Init( GLFWwindow *w ) { window = w; Global::window = w; // do WM_COPYDATA Global::pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań - WriteLog("Starting MaSzyna rail vehicle simulator."); + + WriteLog("\nStarting MaSzyna rail vehicle simulator."); WriteLog(Global::asVersion); -/* - if( sizeof( TSubModel ) != 256 ) { - Error( "Wrong sizeof(TSubModel) is " + std::to_string(sizeof( TSubModel )) ); - return false; - } -*/ WriteLog("Online documentation and additional files on http://eu07.pl"); 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"); - WriteLog("Renderer:"); - WriteLog((char *)glGetString(GL_RENDERER)); - WriteLog("Vendor:"); - // Winger030405: sprawdzanie sterownikow - WriteLog((char *)glGetString(GL_VENDOR)); - std::string glver = ((char *)glGetString(GL_VERSION)); - WriteLog("OpenGL Version:"); - WriteLog(glver); - if( !GLEW_VERSION_1_4 ) { - std::cout << "required opengl >= 1.4" << std::endl; - return false; - } + "ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others\n"); - // Ra: umieszczone w EU07.cpp jakoś nie chce działać - while( glver.rfind( '.' ) > glver.find( '.' ) ) { - glver = glver.substr( 0, glver.rfind( '.' ) - 1 ); // obcięcie od drugiej kropki - } - double ogl; - try - { - ogl = std::stod( glver ); - } - catch (...) - { - ogl = 0.0; - } - if (Global::fOpenGL > 0.0) // jeśli była wpisane maksymalna wersja w EU07.INI - { - if (ogl > 0.0) // zakładając, że się odczytało dobrze - if (ogl < Global::fOpenGL) // a karta oferuje niższą wersję niż wpisana - Global::fOpenGL = ogl; // to przyjąc to z karty - } - else if (false == GLEW_VERSION_1_3) // sprzętowa deompresja DDS zwykle wymaga 1.3 - Error("Missed OpenGL 1.3+ drivers!"); // błąd np. gdy wersja 1.1, a nie ma wpisu w EU07.INI -/* - Global::bOpenGL_1_5 = (Global::fOpenGL >= 1.5); // są fragmentaryczne animacje VBO -*/ - WriteLog("Supported extensions:"); - WriteLog((char *)glGetString(GL_EXTENSIONS)); - if (GLEW_ARB_vertex_buffer_object) // czy jest VBO w karcie graficznej - { - if (Global::bUseVBO) - WriteLog("Ra: The VBO is found and will be used."); - else - WriteLog("Ra: The VBO is found, but Display Lists are selected."); - } - else - { - WriteLog("Ra: No VBO found - Display Lists used. Graphics card too old?"); - Global::bUseVBO = false; // może być włączone parametrem w INI - } - if (Global::bDecompressDDS) // jeśli sprzętowa (domyślnie jest false) - WriteLog("DDS textures support at OpenGL level is disabled in INI file."); - else - { - Global::bDecompressDDS = - !(GLEW_EXT_texture_compression_s3tc); // czy obsługiwane? - if (Global::bDecompressDDS) // czy jest obsługa DDS w karcie graficznej - WriteLog("DDS textures are not supported."); - else // brak obsługi DDS - trzeba włączyć programową dekompresję - WriteLog("DDS textures are supported."); - } - if (Global::iMultisampling) - WriteLog("Used multisampling of " + std::to_string(Global::iMultisampling) + " samples."); - { // ograniczenie maksymalnego rozmiaru tekstur - parametr dla skalowania tekstur - GLint i; - glGetIntegerv(GL_MAX_TEXTURE_SIZE, &i); - if (i < Global::iMaxTextureSize) - Global::iMaxTextureSize = i; - WriteLog("Max texture size: " + std::to_string(Global::iMaxTextureSize)); - } - /*-----------------------Render Initialization----------------------*/ - glMatrixMode( GL_PROJECTION ); - glLoadIdentity(); - glMatrixMode( GL_MODELVIEW ); - glLoadIdentity(); + UILayer.set_background( "logo" ); - glClearDepth( 1.0f ); // ZBuffer Value - glClearColor( 51.0f / 255.0f, 102.0f / 255.0f, 85.0f / 255.0f, 1.0f ); // Background Color - glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); // Clear screen and depth buffer - - glEnable(GL_TEXTURE_2D); // Enable Texture Mapping - glShadeModel(GL_SMOOTH); // Enable Smooth Shading - glEnable(GL_DEPTH_TEST); - - // McZapkie:261102-uruchomienie polprzezroczystosci (na razie linie) pod kierunkiem Marcina - // if (Global::bRenderAlpha) //Ra: wywalam tę flagę - { - glEnable(GL_BLEND); - glEnable(GL_ALPHA_TEST); - glAlphaFunc(GL_GREATER, 0.04f); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDepthFunc(GL_LEQUAL); - } - - glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); // Really Nice Perspective Calculations - glPolygonMode(GL_FRONT, GL_FILL); - glFrontFace(GL_CCW); // Counter clock-wise polygons face out - glEnable(GL_CULL_FACE); // Cull back-facing triangles - glLineWidth(1.0f); - glPointSize(3.0f); - glEnable( GL_POINT_SMOOTH ); -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // ----------- LIGHTING SETUP ----------- - // Light values and coordinates - - vector3 lp = Normalize(vector3(-500, 500, 200)); - - Global::lightPos[0] = lp.x; - Global::lightPos[1] = lp.y; - Global::lightPos[2] = lp.z; - Global::lightPos[3] = 0.0f; - - // Ra: światła by sensowniej było ustawiać po wczytaniu scenerii - // TODO: re-implement this - // Ra: szczątkowe światło rozproszone - żeby było cokolwiek widać w ciemności - WriteLog("glLightModelfv(GL_LIGHT_MODEL_AMBIENT,darkLight);"); - glLightModelfv(GL_LIGHT_MODEL_AMBIENT, Global::darkLight); - - // Ra: światło 0 - główne światło zewnętrzne (Słońce, Księżyc) - WriteLog("glLightfv(GL_LIGHT0,GL_AMBIENT,ambientLight);"); - glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); - WriteLog("glLightfv(GL_LIGHT0,GL_DIFFUSE,diffuseLight);"); - glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); - WriteLog("glLightfv(GL_LIGHT0,GL_SPECULAR,specularLight);"); - glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); - WriteLog("glLightfv(GL_LIGHT0,GL_POSITION,lightPos);"); - glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); - WriteLog("glEnable(GL_LIGHT0);"); - glEnable(GL_LIGHT0); -#endif - // glColor() ma zmieniać kolor wybrany w glColorMaterial() - glEnable(GL_COLOR_MATERIAL); - - glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); - glColor4fv(Global::whiteLight); - - glEnable(GL_LIGHTING); - - glFogi(GL_FOG_MODE, GL_LINEAR); // Fog Mode - GLfloat FogColor[] = { 1.0f, 1.0f, 1.0f, 1.0f }; - glFogfv(GL_FOG_COLOR, FogColor); // Set Fog Color - glFogf(GL_FOG_START, 10.0f); // Fog Start Depth - glFogf(GL_FOG_END, 200.0f); // Fog End Depth - glEnable(GL_FOG); // Enables GL_FOG - - // Ra: ustawienia testowe - glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); - glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST); - - /*--------------------Render Initialization End---------------------*/ - - WriteLog("Font init"); // początek inicjacji fontów 2D - HFONT font; // Windows Font ID - base = ::glGenLists(96); // storage for 96 characters - HDC hDC = ::GetDC( glfwGetWin32Window( window ) ); - font = ::CreateFont( -MulDiv( 10, ::GetDeviceCaps( hDC, LOGPIXELSY ), 72 ), // height of font - 0, // width of font - 0, // angle of escapement - 0, // orientation angle - (Global::bGlutFont ? FW_MEDIUM : FW_HEAVY), // font weight - FALSE, // italic - FALSE, // underline - FALSE, // strikeout - DEFAULT_CHARSET, // character set identifier - OUT_DEFAULT_PRECIS, // output precision - CLIP_DEFAULT_PRECIS, // clipping precision - (Global::bGlutFont ? CLEARTYPE_QUALITY : PROOF_QUALITY), // output quality - DEFAULT_PITCH | FF_DONTCARE, // family and pitch - "Lucida Console"); // font name - ::SelectObject(hDC, font); // selects the font we want - ::wglUseFontBitmapsA(hDC, 32, 96, base); // builds 96 characters starting at character 32 - WriteLog("Display Lists font used."); //+AnsiString(glGetError()) - WriteLog("Font init OK"); //+AnsiString(glGetError()) - - glColor4f(1.0f, 3.0f, 3.0f, 0.0f); - // SwapBuffers(hDC); // Swap Buffers (Double Buffering) - // glClear(GL_COLOR_BUFFER_BIT); - // glFlush(); - - WriteLog("Sound Init"); - - glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - glDisable( GL_DEPTH_TEST ); // Disables depth testing -#ifndef EU07_USE_OLD_LIGHTING_MODEL - glEnable( GL_LIGHTING ); - glEnable( GL_LIGHT0 ); -#endif - - glLoadIdentity(); - // glColor4f(0.3f,0.0f,0.0f,0.0f); -// glTranslatef(0.0f, 0.0f, -0.50f); - // glRasterPos2f(-0.25f, -0.10f); -#ifdef EU07_USE_OLD_LIGHTING_MODEL - glColor3f( 3.0f, 3.0f, 3.0f ); -#else - glColor3f( 1.0f, 1.0f, 1.0f ); -#endif - - auto logo = GfxRenderer.GetTextureId( "logo", szTexturePath, 6 ); - GfxRenderer.Bind(logo); // Select our texture - - float const widthratio = ( 4.0f / 3.0f ) / ( (float)Global::iWindowWidth / Global::iWindowHeight ); - - glBegin(GL_QUADS); // Drawing using triangles - glTexCoord2f(0.0f, 0.0f); - glVertex2f( -widthratio, -1.0f ); // bottom left of the texture and quad - glTexCoord2f(1.0f, 0.0f); - glVertex2f(widthratio, -1.0f); // bottom right of the texture and quad - glTexCoord2f(1.0f, 1.0f); - glVertex2f(widthratio, 1.0f); // top right of the texture and quad - glTexCoord2f(0.0f, 1.0f); - glVertex2f( -widthratio, 1.0f ); // top left of the texture and quad - glEnd(); - - glColor3f(0.0f, 0.0f, 0.0f); - glRasterPos2f(-0.85f * widthratio, -0.25f); - glPrint("Uruchamianie / Initializing..."); - glfwSwapBuffers( window ); - - /*-----------------------Sound Initialization-----------------------*/ - glRasterPos2f( -0.85f * widthratio, -0.30f ); - glPrint( "Dzwiek / Sound..." ); + std::shared_ptr initpanel = std::make_shared(85, 600); TSoundsManager::Init( glfwGetWin32Window( window ) ); WriteLog("Sound Init OK"); - glRasterPos2f(-0.25f * widthratio, -0.30f); - glPrint("OK."); - glfwSwapBuffers( window ); - /*---------------------Sound Initialization End---------------------*/ - - WriteLog("Textures init"); - glRasterPos2f(-0.85f * widthratio, -0.35f); - glPrint("Tekstury / Textures..."); - glfwSwapBuffers( window ); - WriteLog("Textures init OK"); - glRasterPos2f( -0.25f * widthratio, -0.35f ); - glPrint("OK."); - glfwSwapBuffers( window ); - - WriteLog("Models init"); - glRasterPos2f( -0.85f * widthratio, -0.40f ); - glPrint("Modele / Models..."); - glfwSwapBuffers( window ); TModelsManager::Init(); WriteLog("Models init OK"); - glRasterPos2f( -0.25f * widthratio, -0.40f ); - glPrint("OK."); - glfwSwapBuffers( window ); - WriteLog("Ground init"); - glRasterPos2f( -0.85f * widthratio, -0.45f ); - glPrint("Sceneria / Scenery (please wait)..."); - glfwSwapBuffers( window ); - -#ifndef EU07_USE_OLD_LIGHTING_MODEL - // setup lighting -// GLfloat ambient[] = { 0.65f, 0.65f, 0.65f, 0.5f }; - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - - Global::DayLight.id = opengl_renderer::sunlight; - // directional light - // TODO, TBD: test omni-directional variant - Global::DayLight.position[ 3 ] = 1.0f; - ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); - // rgb value for 5780 kelvin - Global::DayLight.diffuse[ 0 ] = 255.0f / 255.0f; - Global::DayLight.diffuse[ 1 ] = 242.0f / 255.0f; - Global::DayLight.diffuse[ 2 ] = 231.0f / 255.0f; -#endif + initpanel->text_lines.emplace_back( "Loading scenery / Wczytywanie scenerii:", float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); + initpanel->text_lines.emplace_back( Global::SceneryFile.substr(0, 40), float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); + UILayer.push_back( initpanel ); + WriteLog( "Ground init" ); Ground.Init(Global::SceneryFile); - // Global::tSinceStart= 0; + WriteLog( "Ground init OK" ); + Environment.init(); - WriteLog("Ground init OK"); - glRasterPos2f( -0.25f * widthratio, -0.45f ); - glColor3f( 0.0f, 0.0f, 0.0f ); - glPrint( "OK." ); - glfwSwapBuffers( window ); - - // TTrack *Track=Ground.FindGroundNode("train_start",TP_TRACK)->pTrack; - - // Camera.Init(vector3(2700,10,6500),0,M_PI,0); - // Camera.Init(vector3(00,40,000),0,M_PI,0); - // Camera.Init(vector3(1500,5,-4000),0,M_PI,0); - // McZapkie-130302 - coby nie przekompilowywac: - // Camera.Init(Global::pFreeCameraInit,0,M_PI,0); Camera.Init(Global::FreeCameraInit[0], Global::FreeCameraInitAngle[0]); - char buff[255] = "Player train init: "; - glRasterPos2f( -0.85f * widthratio, -0.50f ); - glColor3f( 0.0f, 0.0f, 0.0f ); - glPrint( "Przygotowanie kabiny do sterowania..." ); - glfwSwapBuffers( window ); + initpanel->text_lines.clear(); + initpanel->text_lines.emplace_back( "Preparing train / Przygotowanie kabiny:", float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); + GfxRenderer.Render(); + + WriteLog( "Player train init: " + Global::asHumanCtrlVehicle ); - strcat(buff, Global::asHumanCtrlVehicle.c_str()); - WriteLog(buff); TGroundNode *nPlayerTrain = NULL; if (Global::asHumanCtrlVehicle != "ghostview") nPlayerTrain = Ground.DynamicFind(Global::asHumanCtrlVehicle); // szukanie w tych z obsadą @@ -488,20 +192,12 @@ bool TWorld::Init( GLFWwindow *w ) { mvControlled = Controlled->ControlledFind()->MoverParameters; Global::pUserDynamic = Controlled; // renerowanie pojazdu względem kabiny WriteLog("Player train init OK"); - glRasterPos2f( -0.25f * widthratio, -0.50f ); - glColor3f( 0.0f, 0.0f, 0.0f ); - glPrint( "OK." ); FollowView(); - glfwSwapBuffers( window ); } else { Error("Player train init failed!"); FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie - glRasterPos2f( -0.85f * widthratio, -0.50f ); - glColor3f( 0.0f, 0.0f, 0.0f ); - glPrint( "Blad inicjalizacji sterowanego pojazdu!" ); - glfwSwapBuffers( window ); Controlled = NULL; mvControlled = NULL; Camera.Type = tp_Free; @@ -511,10 +207,7 @@ bool TWorld::Init( GLFWwindow *w ) { { if (Global::asHumanCtrlVehicle != "ghostview") { - Error("Player train not exist!"); - glRasterPos2f( -0.85f * widthratio, -0.55f ); - glColor3f( 0.0f, 0.0f, 0.0f ); - glPrint( "Wybrany pojazd nie istnieje w scenerii!" ); + Error("Player train doesn't exist!"); } FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie glfwSwapBuffers( window ); @@ -522,8 +215,7 @@ bool TWorld::Init( GLFWwindow *w ) { mvControlled = NULL; Camera.Type = tp_Free; } - glEnable(GL_DEPTH_TEST); - // Ground.pTrain=Train; + // if (!Global::bMultiplayer) //na razie włączone { // eventy aktywowane z klawiatury tylko dla jednego użytkownika KeyEvents[0] = Ground.FindEvent("keyctrl00"); @@ -537,14 +229,8 @@ bool TWorld::Init( GLFWwindow *w ) { KeyEvents[8] = Ground.FindEvent("keyctrl08"); KeyEvents[9] = Ground.FindEvent("keyctrl09"); } - // glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); //{Texture blends with object - // background} - if (Global::bOldSmudge == true) - light = GfxRenderer.GetTextureId( "smuga.tga", szTexturePath ); - else - light = GfxRenderer.GetTextureId( "smuga2.tga", szTexturePath ); - // Camera.Reset(); - WriteLog( "Load time: " + + + WriteLog( "Load time: " + std::to_string( std::chrono::duration_cast(( std::chrono::system_clock::now() - timestart )).count() ) + " seconds"); if (DebugModeFlag) // w Debugmode automatyczne włączenie AI @@ -552,8 +238,22 @@ bool TWorld::Init( GLFWwindow *w ) { if (Train->Dynamic()->Mechanik) Train->Dynamic()->Mechanik->TakeControl(true); + UILayer.set_progress(); + UILayer.set_background( "" ); + UILayer.clear_texts(); + Timer::ResetTimers(); + // make 4 empty lines for the ui header, to cut down on work down the road + UIHeader->text_lines.emplace_back( "", float4( 100.0 / 255.0f, 230.0f / 255.0f, 230.0f / 255.0f, 1.0f ) ); + UIHeader->text_lines.emplace_back( "", float4( 100.0 / 255.0f, 230.0f / 255.0f, 230.0f / 255.0f, 1.0f ) ); + UIHeader->text_lines.emplace_back( "", float4( 100.0 / 255.0f, 230.0f / 255.0f, 230.0f / 255.0f, 1.0f ) ); + UIHeader->text_lines.emplace_back( "", float4( 100.0 / 255.0f, 230.0f / 255.0f, 230.0f / 255.0f, 1.0f ) ); + // bind the panels with ui object. maybe not the best place for this but, eh + UILayer.push_back( UIHeader ); + UILayer.push_back( UITable ); + UILayer.push_back( UITranscripts ); + return true; }; @@ -1649,7 +1349,7 @@ TWorld::Render_Cab() { void TWorld::Render_UI() { - +/* // set the UI mode projection. TODO: rework it all into somethinig more elegant... eventually glMatrixMode( GL_PROJECTION ); // select the Projection Matrix glLoadIdentity(); // reset the Projection Matrix @@ -1657,6 +1357,8 @@ TWorld::Render_UI() { gluPerspective( 45.0f, (GLdouble)Global::ScreenWidth / std::max((GLdouble)Global::ScreenHeight, 1.0), 0.2f, 2500.0f ); glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix glLoadIdentity(); +*/ + OutText1 = OutText2 = OutText3 = OutText4 = ""; if( DebugModeFlag && !Global::iTextMode ) { OutText1 = "FPS: "; @@ -1664,16 +1366,7 @@ TWorld::Render_UI() { OutText1 += Global::iSlowMotion ? "(s)" : "(n)"; OutText1 += ( Timer::GetDeltaTime() >= 0.2 ) ? "!" : " "; - // if (GetDeltaTime()>=0.2) //Ra: to za bardzo miota tekstem! - // { - // OutText1+= " Slowing Down !!! "; - // } } - /*if (Console::Pressed(VK_F5)) - {Global::slowmotion=true;}; - if (Console::Pressed(VK_F6)) - {Global::slowmotion=false;};*/ - if( Global::iTextMode == GLFW_KEY_F8 ) { Global::iViewMode = GLFW_KEY_F8; OutText1 = "Draw range x " + to_string( Global::fDistanceFactor, 1 ) + "; FPS: " + to_string( Timer::GetFPS(), 2 ); @@ -1683,52 +1376,6 @@ TWorld::Render_UI() { OutText1 += ", sectors: " + to_string( Ground.iRendered ) + "/" + to_string( Global::iSegmentsRendered ); OutText1 += "; FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ); } - - // if (Console::Pressed(VK_F7)) - //{ - // OutText1=FloatToStrF(Controlled->MoverParameters->Couplers[0].CouplingFlag,ffFixed,2,0)+", - // "; - // OutText1+=FloatToStrF(Controlled->MoverParameters->Couplers[1].CouplingFlag,ffFixed,2,0); - //} - - /* - if (Console::Pressed(VK_F5)) - { - int line=2; - OutText1="Time: "+FloatToStrF(GlobalTime->hh,ffFixed,2,0)+":" - +FloatToStrF(GlobalTime->mm,ffFixed,2,0)+", "; - OutText1+="distance: "; - OutText1+="34.94"; - OutText2="Next station: "; - OutText2+=FloatToStrF(Controlled->TrainParams->TimeTable[line].km,ffFixed,2,2)+" km, "; - OutText2+=AnsiString(Controlled->TrainParams->TimeTable[line].StationName)+", "; - OutText2+=AnsiString(Controlled->TrainParams->TimeTable[line].StationWare); - OutText3="Arrival: "; - if(Controlled->TrainParams->TimeTable[line].Ah==-1) - { - OutText3+="--:--"; - } - else - { - OutText3+=FloatToStrF(Controlled->TrainParams->TimeTable[line].Ah,ffFixed,2,0)+":"; - OutText3+=FloatToStrF(Controlled->TrainParams->TimeTable[line].Am,ffFixed,2,0)+" "; - } - OutText3+=" Departure: "; - OutText3+=FloatToStrF(Controlled->TrainParams->TimeTable[line].Dh,ffFixed,2,0)+":"; - OutText3+=FloatToStrF(Controlled->TrainParams->TimeTable[line].Dm,ffFixed,2,0)+" "; - }; - // */ - /* - if (Console::Pressed(VK_F6)) - { - //GlobalTime->UpdateMTableTime(100); - //OutText1=FloatToStrF(SquareMagnitude(Global::pCameraPosition-Controlled->GetPosition()),ffFixed,10,0); - //OutText1=FloatToStrF(Global::TnijSzczegoly,ffFixed,7,0)+", "; - //OutText1+=FloatToStrF(dta,ffFixed,2,4)+", "; - OutText1+= FloatToStrF(GetFPS(),ffFixed,6,2); - OutText1+= FloatToStrF(Global::ABuDebug,ffFixed,6,15); - }; - */ if( Global::changeDynObj ) { // ABu zmiana pojazdu - przejście do innego // Ra: to nie może być tak robione, to zbytnia proteza jest Train->Silence(); // wyłączenie dźwięków opuszczanej kabiny @@ -1744,27 +1391,9 @@ TWorld::Render_UI() { bh_NP ) ); //rozwala sterowanie hamulcem GF 04-2016 Train->Dynamic()->MechInside = false; } - // int CabNr; TDynamicObject *temp = Global::changeDynObj; - // CabNr=temp->MoverParameters->ActiveCab; - /* - if (Train->Dynamic()->MoverParameters->ActiveCab==-1) - { - temp=Train->Dynamic()->NextConnected; //pojazd od strony sprzęgu 1 - CabNr=(Train->Dynamic()->NextConnectedNo==0)?1:-1; - } - else - { - temp=Train->Dynamic()->PrevConnected; //pojazd od strony sprzęgu 0 - CabNr=(Train->Dynamic()->PrevConnectedNo==0)?1:-1; - } - */ Train->Dynamic()->bDisplayCab = false; Train->Dynamic()->ABuSetModelShake( vector3( 0, 0, 0 ) ); - /// Train->Dynamic()->MoverParameters->LimPipePress=-1; - /// Train->Dynamic()->MoverParameters->ActFlowSpeed=0; - /// Train->Dynamic()->Mechanik->CloseLog(); - /// SafeDelete(Train->Dynamic()->Mechanik); // Train->Dynamic()->mdKabina=NULL; if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść @@ -1780,16 +1409,10 @@ TWorld::Render_UI() { { Train->Dynamic()->MoverParameters->LimPipePress = Controlled->MoverParameters->PipePress; - // Train->Dynamic()->MoverParameters->ActFlowSpeed=0; - // Train->Dynamic()->MoverParameters->SecuritySystem.Status=1; - // Train->Dynamic()->MoverParameters->ActiveCab=CabNr; Train->Dynamic() ->MoverParameters->CabActivisation(); // załączenie rozrządu (wirtualne kabiny) Train->Dynamic()->Controller = Humandriver; Train->Dynamic()->MechInside = true; - // Train->Dynamic()->Mechanik=new - // TController(l,r,Controlled->Controller,&Controlled->MoverParameters,&Controlled->TrainParams,Aggressive); - // Train->InitializeCab(CabNr,Train->Dynamic()->asBaseDir+Train->Dynamic()->MoverParameters->TypeName+".mmd"); } Train->InitializeCab( Train->Dynamic()->MoverParameters->CabNo, Train->Dynamic()->asBaseDir + @@ -1835,11 +1458,7 @@ TWorld::Render_UI() { Global::Bezogonkow( OutText2 + ": -> " + Controlled->Mechanik->NextStop(), true ); // dopisanie punktu zatrzymania } - // double CtrlPos=mvControlled->MainCtrlPos; - // double CtrlPosNo=mvControlled->MainCtrlPosNo; - // OutText2="defrot="+FloatToStrF(1+0.4*(CtrlPos/CtrlPosNo),ffFixed,2,5); OutText3 = ""; // Pomoc w sterowaniu - [F9]"; - // OutText3=AnsiString(Global::pCameraRotationDeg); //kąt kamery względem północy } else if( Global::iTextMode == GLFW_KEY_F12 ) { // opcje włączenia i wyłączenia logowania OutText1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); @@ -1853,10 +1472,6 @@ TWorld::Render_UI() { if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 0 ) { // jeśli domyślny ekran po pierwszym naciśnięciu OutText3 = ""; OutText1 = "Vehicle name: " + tmp->MoverParameters->Name; - // yB OutText1+="; d: "+FloatToStrF(tmp->ABuGetDirection(),ffFixed,2,0); - // OutText1=FloatToStrF(tmp->MoverParameters->Couplers[0].CouplingFlag,ffFixed,3,2)+", - // "; - // OutText1+=FloatToStrF(tmp->MoverParameters->Couplers[1].CouplingFlag,ffFixed,3,2); if( tmp->Mechanik ) // jeśli jest prowadzący { // ostatnia komenda dla AI OutText1 += ", command: " + tmp->Mechanik->OrderCurrent(); @@ -1865,7 +1480,6 @@ TWorld::Render_UI() { OutText1 += ", owned by " + tmp->ctOwner->OwnerName(); if( !tmp->MoverParameters->CommandLast.empty() ) OutText1 += ", put: " + tmp->MoverParameters->CommandLast; - // OutText1+="; Cab="+AnsiString(tmp->MoverParameters->CabNo); OutText2 = "Damage status: " + tmp->MoverParameters->EngineDescription( 0 ); //+" Engine status: "; OutText2 += "; Brake delay: "; @@ -1879,18 +1493,11 @@ TWorld::Render_UI() { OutText2 += "+Mg"; OutText2 += ", BTP:" + to_string( tmp->MoverParameters->LoadFlag, 0 ); - // if ((tmp->MoverParameters->EnginePowerSource.SourceType==CurrentCollector) || - // (tmp->MoverParameters->TrainType==dt_EZT)) { OutText2 += "; pant. " + to_string( tmp->MoverParameters->PantPress, 2 ); OutText2 += ( tmp->MoverParameters->bPantKurek3 ? "MoverParameters->u,ffFixed,3,3); - // OutText2+=AnsiString(", - // N:")+FloatToStrF(tmp->MoverParameters->Ntotal,ffFixed,4,0); OutText2 += ", MED:" + to_string( tmp->MoverParameters->LocalBrakePosA, 2 ); OutText2 += "+" + @@ -1907,40 +1514,6 @@ TWorld::Render_UI() { to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 0 ], 0 ); OutText2 += " TC:" + to_string( tmp->MoverParameters->TotalCurrent, 0 ); - // OutText3= AnsiString("BP: - // ")+FloatToStrF(tmp->MoverParameters->BrakePress,ffFixed,5,2)+AnsiString(", - // "); - // OutText3+= AnsiString("PP: - // ")+FloatToStrF(tmp->MoverParameters->PipePress,ffFixed,5,2)+AnsiString(", - // "); - // OutText3+= AnsiString("BVP: - // ")+FloatToStrF(tmp->MoverParameters->Volume,ffFixed,5,3)+AnsiString(", - // "); - // OutText3+= - // FloatToStrF(tmp->MoverParameters->CntrlPipePress,ffFixed,5,3)+AnsiString(", - // "); - // OutText3+= - // FloatToStrF(tmp->MoverParameters->Hamulec->GetCRP(),ffFixed,5,3)+AnsiString(", - // "); - // OutText3+= - // FloatToStrF(tmp->MoverParameters->BrakeStatus,ffFixed,5,0)+AnsiString(", - // "); - // OutText3+= AnsiString("HP: - // ")+FloatToStrF(tmp->MoverParameters->ScndPipePress,ffFixed,5,2)+AnsiString(". - // "); - // OutText2+= - // FloatToStrF(tmp->MoverParameters->CompressorPower,ffFixed,5,0)+AnsiString(", - // "); - // yB if(tmp->MoverParameters->BrakeSubsystem==Knorr) OutText2+=" Knorr"; - // yB if(tmp->MoverParameters->BrakeSubsystem==Oerlikon) OutText2+=" Oerlikon"; - // yB if(tmp->MoverParameters->BrakeSubsystem==Hik) OutText2+=" Hik"; - // yB if(tmp->MoverParameters->BrakeSubsystem==WeLu) OutText2+=" Łestinghałs"; - // OutText2= " GetFirst: - // "+AnsiString(tmp->GetFirstDynamic(1)->MoverParameters->Name)+" Damage - // status="+tmp->MoverParameters->EngineDescription(0)+" Engine status: "; - // OutText2+= " GetLast: - // "+AnsiString(tmp->GetLastDynamic(1)->MoverParameters->Name)+" Damage - // status="+tmp->MoverParameters->EngineDescription(0)+" Engine status: "; OutText3 = ( "BP: " ) + to_string( tmp->MoverParameters->BrakePress, 2 ) + ( ", " ); @@ -1962,48 +1535,12 @@ TWorld::Render_UI() { ( ", " ); OutText3 += to_string( tmp->MoverParameters->BrakeStatus, 0 ) + ( ", " ); - // OutText3+=AnsiString("BVP: - // ")+FloatToStrF(tmp->MoverParameters->BrakeVP(),ffFixed,5,2)+AnsiString(", - // "); - - // OutText3+=FloatToStrF(tmp->MoverParameters->CntrlPipePress,ffFixed,5,2)+AnsiString(", - // "); - // OutText3+=FloatToStrF(tmp->MoverParameters->HighPipePress,ffFixed,5,2)+AnsiString(", - // "); - // OutText3+=FloatToStrF(tmp->MoverParameters->LowPipePress,ffFixed,5,2)+AnsiString(", - // "); - if( tmp->MoverParameters->ManualBrakePos > 0 ) OutText3 += ( "manual brake active. " ); else if( tmp->MoverParameters->LocalBrakePos > 0 ) OutText3 += ( "local brake active. " ); else OutText3 += ( "local brake inactive. " ); - /* - //OutText3+=AnsiString("LSwTim: - ")+FloatToStrF(tmp->MoverParameters->LastSwitchingTime,ffFixed,5,2); - //OutText3+=AnsiString(" Physic: - ")+FloatToStrF(tmp->MoverParameters->PhysicActivation,ffFixed,5,2); - //OutText3+=AnsiString(" ESF: - ")+FloatToStrF(tmp->MoverParameters->EndSignalsFlag,ffFixed,5,0); - OutText3+=AnsiString(" dPAngF: ")+FloatToStrF(tmp->dPantAngleF,ffFixed,5,0); - OutText3+=AnsiString(" dPAngFT: - ")+FloatToStrF(-(tmp->PantTraction1*28.9-136.938),ffFixed,5,0); - if (tmp->lastcabf==1) - { - OutText3+=AnsiString(" pcabc1: - ")+FloatToStrF(tmp->MoverParameters->PantFrontUp,ffFixed,5,0); - OutText3+=AnsiString(" pcabc2: - ")+FloatToStrF(tmp->MoverParameters->PantRearUp,ffFixed,5,0); - } - if (tmp->lastcabf==-1) - { - OutText3+=AnsiString(" pcabc1: - ")+FloatToStrF(tmp->MoverParameters->PantRearUp,ffFixed,5,0); - OutText3+=AnsiString(" pcabc2: - ")+FloatToStrF(tmp->MoverParameters->PantFrontUp,ffFixed,5,0); - } - */ OutText4 = ""; if( tmp->Mechanik ) { // o ile jest ktoś w środku // OutText4=tmp->Mechanik->StopReasonText(); @@ -2052,6 +1589,7 @@ TWorld::Render_UI() { } } // koniec treści podstawowego ekranu FK_V2 else { // ekran drugi, czyli tabelka skanowania AI +/* if( tmp->Mechanik ) //żeby była tabelka, musi być AI { // tabelka jest na użytek testujących scenerie, więc nie musi być "ładna" glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy zielony. GF: jednak biały @@ -2099,6 +1637,7 @@ TWorld::Render_UI() { glRasterPos2f( -0.25f, 0.19f - 0.01f * i ); glPrint( Global::Bezogonkow( OutText4 ).c_str() ); } +*/ } // koniec ekanu skanowania } // koniec obsługi, gdy mamy wskaźnik do pojazdu else { // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika @@ -2115,10 +1654,6 @@ TWorld::Render_UI() { OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); if( Global::FakeLight ) { OutText2 += "(*)"; } } - // OutText3= AnsiString(" Online documentation (PL, ENG, DE, soon CZ): - // http://www.eu07.pl"); - // OutText3="enrot="+FloatToStrF(Controlled->MoverParameters->enrot,ffFixed,6,2); - // OutText3="; n="+FloatToStrF(Controlled->MoverParameters->n,ffFixed,6,2); } // koniec treści podstawowego ekranu FK_V2 else if( Global::iTextMode == GLFW_KEY_F5 ) { // przesiadka do innego pojazdu if( FreeFlyModeFlag ) // jeśli tryb latania @@ -2150,32 +1685,6 @@ TWorld::Render_UI() { } Global::iTextMode = 0; // tryb neutralny } - /* - - OutText1=OutText2=OutText3=OutText4=""; - AnsiString flag[10]={"vmax", "tory", "smfr", "pjzd", "mnwr", "pstk", "brak", "brak", - "brak", "brak"}; - if(tmp) - if(tmp->Mechanik) - { - for(int i=0;i<15;i++) - { - int tmppar=floor(tmp->Mechanik->ProximityTable[i].Vel); - OutText2+=(tmppar<1000?(tmppar<100?((tmppar<10)&&(tmppar>=0)?" ":" "):" - "):"")+IntToStr(tmppar)+" "; - tmppar=floor(tmp->Mechanik->ProximityTable[i].Dist); - OutText3+=(tmppar<1000?(tmppar<100?((tmppar<10)&&(tmppar>=0)?" ":" "):" - "):"")+IntToStr(tmppar)+" "; - OutText1+=flag[tmp->Mechanik->ProximityTable[i].Flag]+" "; - } - for(int i=0;i<6;i++) - { - int tmppar=floor(tmp->Mechanik->ReducedTable[i]); - OutText4+=flag[i]+":"+(tmppar<1000?(tmppar<100?((tmppar<10)&&(tmppar>=0)?" ":" - "):" "):"")+IntToStr(tmppar)+" "; - } - } - */ } else if( Global::iTextMode == GLFW_KEY_F10 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy // Global::iViewMode=VK_F10; @@ -2246,7 +1755,9 @@ TWorld::Render_UI() { OutText4 = to_string( Controlled->MoverParameters->eimc[ i ], 3 ); else OutText4 = to_string( Controlled->MoverParameters->eimc[ i ], 3 ); +/* glPrint( OutText4.c_str() ); +*/ } for( int i = 0; i <= 20; i++ ) { glRasterPos2f( -0.2f, 0.16f - 0.01f * i ); @@ -2254,23 +1765,31 @@ TWorld::Render_UI() { OutText4 = to_string( Controlled->MoverParameters->eimv[ i ], 3 ); else OutText4 = to_string( Controlled->MoverParameters->eimv[ i ], 3 ); +/* glPrint( OutText4.c_str() ); +*/ } for( int i = 0; i <= 10; i++ ) { glRasterPos2f( -0.15f, 0.16f - 0.01f * i ); OutText4 = to_string( Train->fPress[ i ][ 0 ], 3 ); +/* glPrint( OutText4.c_str() ); +*/ } for( int i = 0; i <= 8; i++ ) { glRasterPos2f( -0.15f, 0.04f - 0.01f * i ); OutText4 = to_string( Controlled->MED[ 0 ][ i ], 3 ); +/* glPrint( OutText4.c_str() ); +*/ } for( int i = 0; i <= 8; i++ ) { for( int j = 0; j <= 9; j++ ) { glRasterPos2f( 0.05f + 0.03f * i, 0.16f - 0.01f * j ); OutText4 = to_string( Train->fEIMParams[ i ][ j ], 2 ); +/* glPrint( OutText4.c_str() ); +*/ } } OutText4 = ""; @@ -2278,28 +1797,6 @@ TWorld::Render_UI() { glColor3f( 1.0f, 0.0f, 0.0f ); // a, damy czerwonym } - // ABu: testy sprzegow-> (potem przeniesc te zmienne z public do protected!) - // OutText3+=AnsiString("; EnginePwr=")+FloatToStrF(mvControlled->EnginePower,ffFixed,1,5); - // OutText3+=AnsiString("; nn=")+FloatToStrF(Controlled->NextConnectedNo,ffFixed,1,0); - // OutText3+=AnsiString("; PR=")+FloatToStrF(Controlled->dPantAngleR,ffFixed,3,0); - // OutText3+=AnsiString("; PF=")+FloatToStrF(Controlled->dPantAngleF,ffFixed,3,0); - // if(Controlled->bDisplayCab==true) - // OutText3+=AnsiString("; Wysw. kab");//+Controlled->mdKabina->GetSMRoot()->Name; - // else - // OutText3+=AnsiString("; test:")+AnsiString(Controlled->MoverParameters->TrainType[1]); - - // OutText3+=FloatToStrF(Train->Dynamic()->MoverParameters->EndSignalsFlag,ffFixed,3,0);; - - // OutText3+=FloatToStrF(Train->Dynamic()->MoverParameters->EndSignalsFlag&byte(((((1+Train->Dynamic()->MoverParameters->CabNo)/2)*30)+2)),ffFixed,3,0);; - - // OutText3+=AnsiString("; - // Ftmax=")+FloatToStrF(Controlled->MoverParameters->Ftmax,ffFixed,3,0); - // OutText3+=AnsiString("; - // FTotal=")+FloatToStrF(Controlled->MoverParameters->FTotal/1000.0f,ffFixed,3,2); - // OutText3+=AnsiString("; - // FTrain=")+FloatToStrF(Controlled->MoverParameters->FTrain/1000.0f,ffFixed,3,2); - // Controlled->mdModel->GetSMRoot()->SetTranslate(vector3(0,1,0)); - // McZapkie: warto wiedziec w jakim stanie sa przelaczniki if( mvControlled->ConvOvldFlag ) OutText3 += " C! "; @@ -2335,10 +1832,6 @@ TWorld::Render_UI() { break; } } - // OutText3+=AnsiString("; dpLocal - // ")+FloatToStrF(Controlled->MoverParameters->dpLocalValve,ffFixed,10,8); - // OutText3+=AnsiString("; dpMain - // ")+FloatToStrF(Controlled->MoverParameters->dpMainValve,ffFixed,10,8); // McZapkie: predkosc szlakowa if( Controlled->MoverParameters->RunningTrack.Velmax == -1 ) { OutText3 += ( " Vtrack=Vmax" ); @@ -2393,6 +1886,7 @@ TWorld::Render_UI() { Ground.DynamicNearest( Camera.Pos ) : Controlled; // w trybie latania lokalizujemy wg mapy Mtable::TTrainParameters *tt = NULL; +/* if( tmp ) if( tmp->Mechanik ) { tt = tmp->Mechanik->Timetable(); @@ -2436,12 +1930,7 @@ TWorld::Render_UI() { glColor3f( 0.0f, 1.0f, 0.0f ); // zielone glRasterPos2f( -0.25f, - 0.18f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); // dopiero - // ustawienie - // pozycji - // ustala - // kolor, - // dziwne... + 0.18f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); glColor3f( 1.0f, 1.0f, 1.0f ); // a reszta białym } @@ -2453,8 +1942,9 @@ TWorld::Render_UI() { } } } - OutText1 = OutText2 = OutText3 = OutText4 = ""; +*/ } +/* else if( OutText1 != "" ) { // ABu: i od razu czyszczenie tego, co bylo napisane // glTranslatef(0.0f,0.0f,-0.50f); glRasterPos2f( -0.25f, 0.20f ); @@ -2476,20 +1966,18 @@ TWorld::Render_UI() { } } } - // if ((Global::iTextMode!=VK_F3)) - { // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) -/* - glColor3f( 1.0f, 1.0f, 0.0f ); //żółte - for( int i = 0; i < 5; ++i ) { // kilka linijek - if( Global::asTranscript[ i ].empty() ) - break; // dalej nie trzeba - else { - glRasterPos2f( -0.20f, -0.05f - 0.01f * i ); - glPrint( Global::Bezogonkow( Global::asTranscript[ i ] ).c_str() ); - } - } */ - int i = 0; + + // update the ui header texts + auto &headerdata = UIHeader->text_lines; + headerdata[ 0 ].data = OutText1; + headerdata[ 1 ].data = OutText2; + headerdata[ 2 ].data = OutText3; + headerdata[ 3 ].data = OutText4; + + { // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) + auto &transcripts = UITranscripts->text_lines; + transcripts.clear(); for( auto const &transcript : Global::tranTexts.aLines ) { if( Global::fTimeAngleDeg >= transcript.fShow ) { @@ -2498,20 +1986,14 @@ TWorld::Render_UI() { while( true == parser.getTokens(1, false, "|") ) { std::string transcriptline; parser >> transcriptline; - ::glColor3f( 1.0f, 1.0f, 0.0f ); //żółte - ::glRasterPos2f( -0.20f, -0.05f - 0.01f * i ); - glPrint( transcriptline.c_str() ); - ++i; + transcripts.emplace_back( transcriptline, float4( 1.0f, 1.0f, 0.0f, 1.0f ) ); } } } } - // if (Global::iViewMode!=Global::iTextMode) - //{//Ra: taka maksymalna prowizorka na razie - // WriteLog("Pressed function key F"+AnsiString(Global::iViewMode-111)); - // Global::iTextMode=Global::iViewMode; - //} +/* glEnable( GL_LIGHTING ); +*/ } //--------------------------------------------------------------------------- diff --git a/World.h b/World.h index ab05255c..3348b754 100644 --- a/World.h +++ b/World.h @@ -78,8 +78,6 @@ class TWorld TTrain *Train; TDynamicObject *pDynamicNearest; bool Paused{ true }; - GLuint base; // numer DL dla znaków w napisach - texture_manager::size_type light; // numer tekstury dla smugi TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury TMoverParameters *mvControlled; // wskaźnik na człon silnikowy, do wyświetlania jego parametrów double fTime50Hz; // bufor czasu dla komunikacji z PoKeys diff --git a/maszyna.vcxproj b/maszyna.vcxproj index ad2f4f28..5854590c 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -142,6 +142,7 @@ + @@ -207,6 +208,7 @@ + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 525c37ab..4c412ae9 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -204,6 +204,9 @@ Source Files + + Source Files + @@ -395,6 +398,9 @@ Header Files + + Header Files + diff --git a/parser.cpp b/parser.cpp index f66a3e99..a9171bd3 100644 --- a/parser.cpp +++ b/parser.cpp @@ -238,6 +238,32 @@ int cParser::getProgress() const return static_cast( mStream->rdbuf()->pubseekoff(0, std::ios_base::cur) * 100 / mSize ); } +int cParser::getFullProgress() const { + + int progress = getProgress(); + if( mIncludeParser ) return progress + ( ( 100 - progress )*( mIncludeParser->getProgress() ) / 100 ); + else return progress; +} + +std::size_t cParser::countTokens( std::string const &Stream, std::string Path ) { + + return cParser( Stream, buffer_FILE, Path ).count(); +} + +std::size_t cParser::count() { + + std::string token; + size_t count{ 0 }; + do { + token = ""; + token = readToken( false ); + ++count; + } while( false == token.empty() ); + + return count - 1; +} + + void cParser::addCommentStyle( std::string const &Commentstart, std::string const &Commentend ) { mComments.insert( commentmap::value_type(Commentstart, Commentend) ); diff --git a/parser.h b/parser.h index 9dd49df8..b08d5a2b 100644 --- a/parser.h +++ b/parser.h @@ -80,6 +80,9 @@ class cParser //: public std::stringstream bool getTokens(unsigned int Count = 1, bool ToLower = true, const char *Break = "\n\r\t ;"); // returns percentage of file processed so far int getProgress() const; + int getFullProgress() const; + // + static std::size_t countTokens( std::string const &Stream, std::string Path = "" ); // add custom definition of text which should be ignored when retrieving tokens void addCommentStyle( std::string const &Commentstart, std::string const &Commentend ); @@ -91,6 +94,7 @@ class cParser //: public std::stringstream // std::string trtest; bool findQuotes( std::string &String ); bool trimComments( std::string &String ); + std::size_t count(); // members: bool LoadTraction; // load traction? std::istream *mStream; // relevant kind of buffer is attached on creation. diff --git a/renderer.cpp b/renderer.cpp index 992c335b..b7460005 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -12,6 +12,11 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "world.h" #include "dynobj.h" +#include "uilayer.h" +#include "logs.h" + +opengl_renderer GfxRenderer; +extern TWorld World; // returns true if specified object is within camera frustum, false otherwise bool @@ -33,11 +38,67 @@ opengl_camera::visible( TDynamicObject const *Dynamic ) const { return ( m_frustum.sphere_inside( Dynamic->GetPosition(), radius ) > 0.0f ); } -opengl_renderer GfxRenderer; -extern TWorld World; +bool +opengl_renderer::Init( GLFWwindow *Window ) { -void -opengl_renderer::Init() { + if( false == Init_caps() ) { + + return false; + } + + m_window = Window; + + glClearDepth( 1.0f ); + glClearColor( 51.0f / 255.0f, 102.0f / 255.0f, 85.0f / 255.0f, 1.0f ); // initial background Color + + glPolygonMode( GL_FRONT, GL_FILL ); + glFrontFace( GL_CCW ); // Counter clock-wise polygons face out + glEnable( GL_CULL_FACE ); // Cull back-facing triangles + glShadeModel( GL_SMOOTH ); // Enable Smooth Shading + + glEnable( GL_DEPTH_TEST ); + glAlphaFunc( GL_GREATER, 0.04f ); + glEnable( GL_ALPHA_TEST ); + glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); + glEnable( GL_BLEND ); + glEnable( GL_TEXTURE_2D ); // Enable Texture Mapping + + glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST ); // Really Nice Perspective Calculations + glHint( GL_POLYGON_SMOOTH_HINT, GL_NICEST ); + glHint( GL_LINE_SMOOTH_HINT, GL_NICEST ); + glLineWidth( 1.0f ); + glPointSize( 3.0f ); + glEnable( GL_POINT_SMOOTH ); + + glEnable( GL_COLOR_MATERIAL ); + glColorMaterial( GL_FRONT, GL_AMBIENT_AND_DIFFUSE ); + + // setup lighting + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + glEnable( GL_LIGHTING ); + glEnable( GL_LIGHT0 ); + + Global::DayLight.id = opengl_renderer::sunlight; + // directional light + // TODO, TBD: test omni-directional variant + Global::DayLight.position[ 3 ] = 1.0f; + ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); + // rgb value for 5780 kelvin + Global::DayLight.diffuse[ 0 ] = 255.0f / 255.0f; + Global::DayLight.diffuse[ 1 ] = 242.0f / 255.0f; + Global::DayLight.diffuse[ 2 ] = 231.0f / 255.0f; + + // setup fog + if( Global::fFogEnd > 0 ) { + // fog setup + ::glFogi( GL_FOG_MODE, GL_LINEAR ); + ::glFogfv( GL_FOG_COLOR, Global::FogColor ); + ::glFogf( GL_FOG_START, Global::fFogStart ); + ::glFogf( GL_FOG_END, Global::fFogEnd ); + ::glEnable( GL_FOG ); + } + else { ::glDisable( GL_FOG ); } // create dynamic light pool for( int idx = 0; idx < Global::DynamicLightCount; ++idx ) { @@ -53,6 +114,8 @@ opengl_renderer::Init() { m_lights.emplace_back( light ); } + + return true; } bool @@ -60,7 +123,7 @@ opengl_renderer::Render() { auto timestart = std::chrono::steady_clock::now(); - ::glColor3ub( 255, 255, 255 ); +// ::glColor3ub( 255, 255, 255 ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); ::glDepthFunc( GL_LEQUAL ); @@ -75,22 +138,29 @@ opengl_renderer::Render() { ::glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix ::glLoadIdentity(); - World.Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii - m_camera.update_frustum(); - if( !Global::bWireFrame ) { - // bez nieba w trybie rysowania linii - World.Environment.render(); + if( World.InitPerformed() ) { + + World.Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii + m_camera.update_frustum(); + + if( !Global::bWireFrame ) { + // bez nieba w trybie rysowania linii + World.Environment.render(); + } + + World.Ground.Render( World.Camera.Pos ); + + World.Render_Cab(); + World.Render_UI(); + + // accumulate last 20 frames worth of render time + m_drawtime = 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - timestart ) ).count(); } - World.Ground.Render( World.Camera.Pos ); - - World.Render_Cab(); - World.Render_UI(); - - // accumulate last 20 frames worth of render time - m_drawtime = 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - timestart ) ).count(); + UILayer.render(); + glfwSwapBuffers( m_window ); return true; // for now always succeed } @@ -454,4 +524,33 @@ opengl_renderer::Disable_Lights() { ::glDisable( GL_LIGHT0 + (int)idx ); } } + +bool +opengl_renderer::Init_caps() { + + std::string oglversion = ( (char *)glGetString( GL_VERSION ) ); + + WriteLog( + "Gfx Renderer: " + std::string( (char *)glGetString( GL_RENDERER ) ) + + " Vendor: " + std::string( (char *)glGetString( GL_VENDOR ) ) + + " OpenGL Version: " + oglversion ); + + if( !GLEW_VERSION_1_4 ) { + ErrorLog( "Requires openGL >= 1.4" ); + return false; + } + + WriteLog( "Supported extensions:" + std::string((char *)glGetString( GL_EXTENSIONS )) ); + + if( Global::iMultisampling ) + WriteLog( "Using multisampling x" + std::to_string( 1 << Global::iMultisampling ) ); + { // ograniczenie maksymalnego rozmiaru tekstur - parametr dla skalowania tekstur + GLint i; + glGetIntegerv( GL_MAX_TEXTURE_SIZE, &i ); + if( i < Global::iMaxTextureSize ) + Global::iMaxTextureSize = i; + WriteLog( "Texture sizes capped at " + std::to_string( Global::iMaxTextureSize ) + " pixels" ); + + } +} //--------------------------------------------------------------------------- diff --git a/renderer.h b/renderer.h index 22ab85a3..444084fe 100644 --- a/renderer.h +++ b/renderer.h @@ -96,8 +96,8 @@ public: // types // methods - void - Init(); + bool + Init( GLFWwindow *Window ); // main draw call. returns false on error bool Render(); @@ -155,6 +155,7 @@ private: typedef std::vector opengllight_array; // methods + bool Init_caps(); // members rendermode renderpass{ rendermode::color }; @@ -164,6 +165,7 @@ private: float m_drawrange{ 2500.0f }; // current drawing range float m_drawtime{ 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps double m_updateaccumulator{ 0.0 }; + GLFWwindow *m_window{ nullptr }; }; extern opengl_renderer GfxRenderer; diff --git a/uilayer.cpp b/uilayer.cpp new file mode 100644 index 00000000..616f52cd --- /dev/null +++ b/uilayer.cpp @@ -0,0 +1,203 @@ + + +#include "stdafx.h" +#include "uilayer.h" +#include "globals.h" +#include "usefull.h" +#include "renderer.h" +#include "logs.h" + +ui_layer UILayer; + +extern "C" +{ + GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); //m7todo: potrzebne do directsound +} + +ui_layer::~ui_layer() { +/* +// this should be invoked manually, or we risk trying to delete the lists after the context is gone + if( m_fontbase != -1 ) + ::glDeleteLists( m_fontbase, 96 ); +*/ +} + +bool +ui_layer::init( GLFWwindow *Window ) { + + HFONT font; // Windows Font ID + m_fontbase = ::glGenLists(96); // storage for 96 characters + HDC hDC = ::GetDC( glfwGetWin32Window( Window ) ); + font = ::CreateFont( -MulDiv( 10, ::GetDeviceCaps( hDC, LOGPIXELSY ), 72 ), // height of font + 0, // width of font + 0, // angle of escapement + 0, // orientation angle + (Global::bGlutFont ? FW_MEDIUM : FW_HEAVY), // font weight + FALSE, // italic + FALSE, // underline + FALSE, // strikeout + DEFAULT_CHARSET, // character set identifier + OUT_DEFAULT_PRECIS, // output precision + CLIP_DEFAULT_PRECIS, // clipping precision + (Global::bGlutFont ? CLEARTYPE_QUALITY : PROOF_QUALITY), // output quality + DEFAULT_PITCH | FF_DONTCARE, // family and pitch + "Lucida Console"); // font name + ::SelectObject(hDC, font); // selects the font we want + ::wglUseFontBitmapsA(hDC, 32, 96, m_fontbase); // builds 96 characters starting at character 32 + WriteLog("Display Lists font used"); //+AnsiString(glGetError()) + WriteLog("Font init OK"); //+AnsiString(glGetError()) + + return true; +} + +void +ui_layer::render() { + + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho( 0.f, Global::ScreenWidth, Global::ScreenHeight, 0.f, -1.f, 1.f ); + + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + + glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); + glDisable( GL_LIGHTING ); + glDisable( GL_DEPTH_TEST ); + glDisable( GL_ALPHA_TEST ); + glEnable( GL_BLEND ); + + // render code here + render_background(); + render_progress(); + render_panels(); + + glPopAttrib(); +} + +void +ui_layer::set_progress( float const Progress, float const Subtaskprogress ) { + + m_progress = Progress * 0.01f; + m_subtaskprogress = Subtaskprogress * 0.01f; +} + +void +ui_layer::set_background( std::string const &Filename ) { + + if( false == Filename.empty() ) { + + m_background = GfxRenderer.GetTextureId( Filename, szTexturePath ); + } + else { + + m_background = 0; + } +} +/* +void cGuiLayer::setNote( const std::string Note ) { mNote = Note; } + +std::string cGuiLayer::getNote() { return mNote; } +*/ +void +ui_layer::render_progress() { + + if( (m_progress == 0.0f) && (m_subtaskprogress == 0.0f) ) return; + + float const width = ( 4.0f / 3.0f ) * Global::iWindowHeight; + float const height = Global::iWindowHeight / 768.0; + + glPushAttrib( GL_ENABLE_BIT ); + glDisable( GL_TEXTURE_2D ); + + quad( float4( 75.0f, 640.0f, 75.0f + 320.0f, 640.0f + 16.0f ), float4(0.0f, 0.0f, 0.0f, 0.25f) ); + glBegin( GL_TRIANGLE_STRIP ); + // secondary bar + if( m_subtaskprogress ) { + quad( + float4( 75.0f, 640.0f, 75.0f + 320.0f * m_subtaskprogress, 640.0f + 16.0f), + float4( 8.0f/255.0f, 160.0f/255.0f, 8.0f/255.0f, 0.35f ) ); + } + // primary bar + if( m_progress ) { + quad( + float4( 75.0f, 640.0f, 75.0f + 320.0f * m_progress, 640.0f + 16.0f ), + float4( 8.0f / 255.0f, 160.0f / 255.0f, 8.0f / 255.0f, 1.0f ) ); + } + glEnd(); + + glPopAttrib(); +} + +void +ui_layer::render_panels() { + + if( m_panels.empty() ) { return; } + + glPushAttrib( GL_ENABLE_BIT ); + glDisable( GL_TEXTURE_2D ); + + float const width = ( 4.0f / 3.0f ) * Global::iWindowHeight; + float const height = Global::iWindowHeight / 768.0; + + for( auto const &panel : m_panels ) { + + int lineidx = 0; + for( auto const &line : panel->text_lines ) { + + ::glColor4fv( &line.color.x ); + ::glRasterPos2f( + 0.5 * ( Global::iWindowWidth - width ) + panel->origin_x * height, + panel->origin_y * height + 20.0 * lineidx ); + print( line.data ); + ++lineidx; + } + } + + glPopAttrib(); +} + +void +ui_layer::render_background() { + + if( m_background == 0 ) return; + + auto const &texture = GfxRenderer.Texture( m_background ); + // NOTE: we limit/expect the background to come with 4:3 ratio. + // TODO, TBD: if we expose texture width or ratio from texture object, this limitation could be lifted + float const width = ( 4.0f / 3.0f ) * Global::iWindowHeight; + + GfxRenderer.Bind( m_background ); + quad( float4( 0.0f, 0.0f, 1024.0f, 768.0f ), float4( 1.0f, 1.0f, 1.0f, 1.0f ) ); +} + +void +ui_layer::print( std::string const &Text ) +{ + if( true == Text.empty() ) + return; + + ::glPushAttrib( GL_LIST_BIT ); + + ::glListBase( m_fontbase - 32 ); + ::glCallLists( Text.size(), GL_UNSIGNED_BYTE, Text.c_str() ); + + ::glPopAttrib(); +} + +void +ui_layer::quad( float4 const &Coordinates, float4 const &Color ) { + + float const width = ( 4.0f / 3.0f ) * Global::iWindowHeight; + float const height = Global::iWindowHeight / 768.0; + + glColor4fv(&Color.x); + + glBegin( GL_TRIANGLE_STRIP ); + + glTexCoord2f( 0.0f, 1.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.x * height, Coordinates.y * height ); + glTexCoord2f( 0.0f, 0.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.x * height, Coordinates.w * height ); + glTexCoord2f( 1.0f, 1.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.z * height, Coordinates.y * height ); + glTexCoord2f( 1.0f, 0.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.z * height, Coordinates.w * height ); + + glEnd(); +} diff --git a/uilayer.h b/uilayer.h new file mode 100644 index 00000000..65bcfefe --- /dev/null +++ b/uilayer.h @@ -0,0 +1,86 @@ + +#pragma once + +#include +#include "texture.h" +#include "float3d.h" + +// GuiLayer -- basic user interface class. draws requested information on top of openGL screen + +struct ui_panel { + + struct text_line { + + float4 color; + std::string data; + + text_line( std::string const &Data, float4 const &Color): + data(Data), color(Color) + {} + }; + + ui_panel( const int X, const int Y): + origin_x(X), origin_y(Y) + {} + + std::vector text_lines; + float origin_x; + float origin_y; +}; + +class ui_layer { + +public: +// parameters: + +// constructors: + +// destructor: + ~ui_layer(); + +// methods: + bool + init( GLFWwindow *Window ); + // draws requested UI elements + void + render(); + // stores operation progress + void + set_progress( float const Progress = 0.0f, float const Subtaskprogress = 0.0f ); + // sets the ui background texture, if any + void + set_background( std::string const &Filename = "" ); + void + clear_texts() { m_panels.clear(); } + void + push_back( std::shared_ptr Panel ) { m_panels.emplace_back( Panel ); } + +// members: + +private: +// methods: + // draws background quad with specified earlier texture + void + render_background(); + // draws a progress bar in defined earlier state + void + render_progress(); + void + render_panels(); + // prints specified text, using display lists font + void + print( std::string const &Text ); + // draws a quad between coordinates x,y and z,w with uv-coordinates spanning 0-1 + void + quad( float4 const &Coordinates, float4 const &Color ); + + +// members: + GLuint m_fontbase{ -1 }; // numer DL dla znakw w napisach + float m_progress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. + float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. + texture_manager::size_type m_background; // path to texture used as the background. size depends on mAspect. + std::vector > m_panels; +}; + +extern ui_layer UILayer; From ae39c824bb3d35278e33c29bec44492bf21ffaa4 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 14 Mar 2017 16:44:17 +0100 Subject: [PATCH 058/426] ui panels continued, early matrix stack work --- Camera.cpp | 51 +++--- Camera.h | 7 +- Float3d.h | 2 +- Globals.cpp | 1 - Globals.h | 1 - Ground.cpp | 2 +- World.cpp | 407 +++++++++++++++++++++++++++++++++--------------- World.h | 2 +- frustum.cpp | 21 ++- frustum.h | 2 +- maszyna.vcxproj | 4 +- renderer.cpp | 29 ++-- renderer.h | 4 +- stdafx.h | 6 +- 14 files changed, 368 insertions(+), 171 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index d02e6c9a..7b812b15 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -115,37 +115,48 @@ vector3 TCamera::GetDirection() // bool TCamera::GetMatrix(matrix4x4 &Matrix) bool TCamera::SetMatrix() { - glRotated(-Roll * 180.0f / M_PI, 0, 0, 1); // po wyłączeniu tego kręci się pojazd, a sceneria - // nie - glRotated(-Pitch * 180.0f / M_PI, 1, 0, 0); - glRotated(-Yaw * 180.0f / M_PI, 0, 1, 0); // w zewnętrznym widoku: kierunek patrzenia + glRotated( -Roll * 180.0f / M_PI, 0, 0, 1 ); // po wyłączeniu tego kręci się pojazd, a sceneria nie + glRotated( -Pitch * 180.0f / M_PI, 1, 0, 0 ); + glRotated( -Yaw * 180.0f / M_PI, 0, 1, 0 ); // w zewnętrznym widoku: kierunek patrzenia - if (Type == tp_Follow) + if( Type == tp_Follow ) { - // gluLookAt(Pos.x+pOffset.x,Pos.y+pOffset.y,Pos.z+pOffset.z, - // LookAt.x+pOffset.x,LookAt.y+pOffset.y,LookAt.z+pOffset.z,vUp.x,vUp.y,vUp.z); - // gluLookAt(Pos.x+pOffset.x,Pos.y+pOffset.y,Pos.z+pOffset.z, - // LookAt.x+pOffset.x,LookAt.y+pOffset.y,LookAt.z+pOffset.z,vUp.x,vUp.y,vUp.z); - gluLookAt(Pos.x, Pos.y, Pos.z, LookAt.x, LookAt.y, LookAt.z, vUp.x, vUp.y, - vUp.z); // Ra: pOffset is zero - // gluLookAt(Pos.x,Pos.y,Pos.z,Pos.x+Velocity.x,Pos.y+Velocity.y,Pos.z+Velocity.z,0,1,0); - // return true; + gluLookAt( + Pos.x, Pos.y, Pos.z, + LookAt.x, LookAt.y, LookAt.z, + vUp.x, vUp.y, vUp.z); // Ra: pOffset is zero } - - if (Type == tp_Satelite) - Pitch = M_PI * 0.5; - - if (Type != tp_Follow) - { - glTranslated(-Pos.x, -Pos.y, -Pos.z); // nie zmienia kierunku patrzenia + else { + glTranslated( -Pos.x, -Pos.y, -Pos.z ); // nie zmienia kierunku patrzenia } Global::SetCameraPosition(Pos); // było +pOffset return true; } +bool TCamera::SetMatrix( glm::mat4 &Matrix ) { + + Matrix = glm::rotate( Matrix, (float)-Roll, glm::vec3( 0.0f, 0.0f, 1.0f ) ); // po wyłączeniu tego kręci się pojazd, a sceneria nie + Matrix = glm::rotate( Matrix, (float)-Pitch, glm::vec3( 1.0f, 0.0f, 0.0f ) ); + Matrix = glm::rotate( Matrix, (float)-Yaw, glm::vec3( 0.0f, 1.0f, 0.0f ) ); // w zewnętrznym widoku: kierunek patrzenia + + if( Type == tp_Follow ) { + + Matrix = glm::lookAt( + glm::vec3( Pos.x, Pos.y, Pos.z ), + glm::vec3( LookAt.x, LookAt.y, LookAt.z ), + glm::vec3( vUp.x, vUp.y, vUp.z ) ); + } + else { + Matrix = glm::translate( Matrix, glm::vec3( -Pos.x, -Pos.y, -Pos.z ) ); // nie zmienia kierunku patrzenia + } + + return true; +} + void TCamera::SetCabMatrix(vector3 &p) { // ustawienie widoku z kamery bez przesunięcia robionego przez OpenGL - nie powinno tak trząść + glRotated(-Roll * 180.0f / M_PI, 0, 0, 1); glRotated(-Pitch * 180.0f / M_PI, 1, 0, 0); glRotated(-Yaw * 180.0f / M_PI, 0, 1, 0); // w zewnętrznym widoku: kierunek patrzenia diff --git a/Camera.h b/Camera.h index 59145c05..a7bcc0c8 100644 --- a/Camera.h +++ b/Camera.h @@ -7,8 +7,7 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef CameraH -#define CameraH +#pragma once #include "dumb3d.h" #include "dynobj.h" @@ -51,10 +50,10 @@ class TCamera // vector3 inline GetCrossPos() { return Pos+GetDirection()*CrossDist+CrossPos; }; bool SetMatrix(); - void SetCabMatrix(vector3 &p); + bool SetMatrix(glm::mat4 &Matrix); + void SetCabMatrix( vector3 &p ); void RaLook(); void Stop(); // bool GetMatrix(matrix4x4 &Matrix); vector3 PtNext, PtPrev; }; -#endif diff --git a/Float3d.h b/Float3d.h index 355813c6..0acc89cd 100644 --- a/Float3d.h +++ b/Float3d.h @@ -216,7 +216,7 @@ public: { return &e[i << 2]; } - const float * readArray(void) + const float * readArray(void) const { return e; } diff --git a/Globals.cpp b/Globals.cpp index 5350728a..b99d76a6 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -55,7 +55,6 @@ int Global::iCameraLast = -1; std::string Global::asRelease = "16.0.1172.482"; std::string Global::asVersion = "Compilation 2017-01-10, release " + Global::asRelease + "."; // tutaj, bo wysyłany -int Global::iViewMode = 0; // co aktualnie widać: 0-kabina, 1-latanie, 2-sprzęgi, 3-dokumenty int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // numer ekranu wyświetlacza tekstowego diff --git a/Globals.h b/Globals.h index 33765bf0..e0a2bac6 100644 --- a/Globals.h +++ b/Globals.h @@ -270,7 +270,6 @@ class Global static int iCameraLast; static std::string asRelease; // numer static std::string asVersion; // z opisem - static int iViewMode; // co aktualnie widać: 0-kabina, 1-latanie, 2-sprzęgi, 3-dokumenty, 4-obwody static GLint iMaxTextureSize; // maksymalny rozmiar tekstury static int iTextMode; // tryb pracy wyświetlacza tekstowego static int iScreenMode[12]; // numer ekranu wyświetlacza tekstowego diff --git a/Ground.cpp b/Ground.cpp index 547b19ee..1a693a09 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2620,7 +2620,7 @@ bool TGround::Init(std::string File) while (token != "") //(!Parser->EndOfFile) { ++processed; - if( processed % 50 == 0 ) + if( processed % 25 == 0 ) { UILayer.set_progress( parser.getProgress(), parser.getFullProgress() ); GfxRenderer.Render(); diff --git a/World.cpp b/World.cpp index 018f7dd7..df13de68 100644 --- a/World.cpp +++ b/World.cpp @@ -36,7 +36,7 @@ http://mozilla.org/MPL/2.0/. TDynamicObject *Controlled = NULL; // pojazd, który prowadzimy std::shared_ptr UIHeader = std::make_shared( 20, 20 ); // header ui panel -std::shared_ptr UITable = std::make_shared( 100, 50 ); // schedule or scan table +std::shared_ptr UITable = std::make_shared( 20, 100 ); // schedule or scan table std::shared_ptr UITranscripts = std::make_shared( 85, 600 ); // voice transcripts extern "C" @@ -166,6 +166,9 @@ bool TWorld::Init( GLFWwindow *w ) { initpanel->text_lines.emplace_back( "Loading scenery / Wczytywanie scenerii:", float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); initpanel->text_lines.emplace_back( Global::SceneryFile.substr(0, 40), float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); UILayer.push_back( initpanel ); + UILayer.set_progress(0.01); + + GfxRenderer.Render(); WriteLog( "Ground init" ); Ground.Init(Global::SceneryFile); @@ -245,10 +248,10 @@ bool TWorld::Init( GLFWwindow *w ) { Timer::ResetTimers(); // make 4 empty lines for the ui header, to cut down on work down the road - UIHeader->text_lines.emplace_back( "", float4( 100.0 / 255.0f, 230.0f / 255.0f, 230.0f / 255.0f, 1.0f ) ); - UIHeader->text_lines.emplace_back( "", float4( 100.0 / 255.0f, 230.0f / 255.0f, 230.0f / 255.0f, 1.0f ) ); - UIHeader->text_lines.emplace_back( "", float4( 100.0 / 255.0f, 230.0f / 255.0f, 230.0f / 255.0f, 1.0f ) ); - UIHeader->text_lines.emplace_back( "", float4( 100.0 / 255.0f, 230.0f / 255.0f, 230.0f / 255.0f, 1.0f ) ); + UIHeader->text_lines.emplace_back( "", float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ) ); + UIHeader->text_lines.emplace_back( "", float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ) ); + UIHeader->text_lines.emplace_back( "", float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ) ); + UIHeader->text_lines.emplace_back( "", float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ) ); // bind the panels with ui object. maybe not the best place for this but, eh UILayer.push_back( UIHeader ); UILayer.push_back( UITable ); @@ -641,9 +644,6 @@ void TWorld::DistantView( bool const Near ) void TWorld::FollowView(bool wycisz) { // ustawienie śledzenia pojazdu - // ABu 180404 powrot mechanika na siedzenie albo w okolicę pojazdu - // if (Console::Pressed(VK_F4)) Global::iViewMode=VK_F4; - // Ra: na zewnątrz wychodzimy w Train.cpp Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe if (Controlled) // jest pojazd do prowadzenia? { @@ -831,6 +831,8 @@ bool TWorld::Update() // variable step render time routines Update_Camera( dt ); // TODO: move the fixed step cab camera updates to fixed step secondary routines section + Update_UI(); + GfxRenderer.Update( dt ); ResourceSweep(); @@ -882,12 +884,6 @@ TWorld::Update_Camera( double const Deltatime ) { Global::ZoomFactor = std::max( 1.0f, Global::ZoomFactor - 15.0f * static_cast( Deltatime ) ); } - /* - else if( Global::iTextMode == -1 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy - WriteLog( "Number of textures used: " + std::to_string( Global::iTextures ) ); - return false; - } - */ Camera.Update(); // uwzględnienie ruchu wywołanego klawiszami /* if( Camera.Type == tp_Follow ) { @@ -1348,17 +1344,278 @@ TWorld::Render_Cab() { } void -TWorld::Render_UI() { -/* - // set the UI mode projection. TODO: rework it all into somethinig more elegant... eventually - glMatrixMode( GL_PROJECTION ); // select the Projection Matrix - glLoadIdentity(); // reset the Projection Matrix - // calculate the aspect ratio of the window - gluPerspective( 45.0f, (GLdouble)Global::ScreenWidth / std::max((GLdouble)Global::ScreenHeight, 1.0), 0.2f, 2500.0f ); - glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix - glLoadIdentity(); -*/ +TWorld::Update_UI() { + OutText1 = OutText2 = OutText3 = OutText4 = ""; + UITable->text_lines.clear(); + + switch( Global::iTextMode ) { + + case( GLFW_KEY_F1 ) : { + // f1, default mode: current time and timetable excerpt + OutText1 = + "Time: " + + to_string( (int)GlobalTime->hh ) + ":" + + ( GlobalTime->mm < 10 ? "0" : "" ) + to_string( GlobalTime->mm ) + ":" + + ( GlobalTime->mr < 10 ? "0" : "" ) + to_string( std::floor( GlobalTime->mr ) ); + if( Global::iPause ) { + OutText1 += " (paused)"; + } + if( Controlled + && Controlled->Mechanik ) { + OutText2 = Controlled->Mechanik->Relation(); + if( !OutText2.empty() ) { + // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania + OutText3 = " -> " + Global::Bezogonkow( Controlled->Mechanik->NextStop(), true ); + } + } + break; + } + + case( GLFW_KEY_F2 ) : { + + TDynamicObject *tmp = + ( FreeFlyModeFlag ? + Ground.DynamicNearest( Camera.Pos ) : + Controlled ); // w trybie latania lokalizujemy wg mapy + + if( tmp == nullptr ) { break; } + + // jeśli domyślny ekran po pierwszym naciśnięciu + OutText1 = "Vehicle name: " + tmp->MoverParameters->Name; + + if( (tmp->Mechanik == nullptr) && (tmp->ctOwner) ) { + // for cars other than leading unit indicate the leader + OutText1 += ", owned by " + tmp->ctOwner->OwnerName(); + } + // informacja o sprzęgach + OutText1 += + " C0:" + + ( tmp->PrevConnected ? + tmp->PrevConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) : + "none" ); + OutText1 += + " C1:" + + ( tmp->NextConnected ? + tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) : + "none" ); + + OutText2 = "Damage status: " + tmp->MoverParameters->EngineDescription( 0 ); + + OutText2 += "; Brake delay: "; + if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) + OutText2 += "G"; + if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) + OutText2 += "P"; + if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) + OutText2 += "R"; + if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) + OutText2 += "+Mg"; + + OutText2 += ", BTP:" + to_string( tmp->MoverParameters->LoadFlag, 0 ); + { + OutText2 += + "; pant. " + + to_string( tmp->MoverParameters->PantPress, 2 ) + + ( tmp->MoverParameters->bPantKurek3 ? "MoverParameters->LocalBrakePosA, 2 ) + + "+" + + to_string( tmp->MoverParameters->AnPos, 2 ); + + OutText2 += + ", Ft:" + + to_string( tmp->MoverParameters->Ft * 0.001f, 0 ); + + OutText2 += + "; TC:" + + to_string( tmp->MoverParameters->TotalCurrent, 0 ); + OutText2 += + ", HV0:" + + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 1 ], 0 ) + + "@" + + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 0 ], 0 ); + OutText2 += + ", HV1:" + + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 1 ], 0 ) + + "@" + + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 0 ], 0 ); + + OutText3 = + "BP: " + + to_string( tmp->MoverParameters->BrakePress, 2 ) + + ", " + + to_string( tmp->MoverParameters->BrakeStatus, 0 ) + + ", PP: " + + to_string( tmp->MoverParameters->PipePress, 2 ) + + "/" + + to_string( tmp->MoverParameters->ScndPipePress, 2 ) + + "/" + + to_string( tmp->MoverParameters->EqvtPipePress, 2 ) + + ", BVP: " + + to_string( tmp->MoverParameters->Volume, 3 ) + + ", " + + to_string( tmp->MoverParameters->CntrlPipePress, 3 ) + + ", " + + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ) + + ", " + + to_string( tmp->MoverParameters->BrakeStatus, 0 ); + + if( tmp->MoverParameters->ManualBrakePos > 0 ) { + + OutText3 += ", manual brake on"; + } + + if( tmp->MoverParameters->LocalBrakePos > 0 ) { + + OutText3 += ", local brake on"; + } + else { + + OutText3 += ", local brake off"; + } + + if( tmp->Mechanik ) { + // o ile jest ktoś w środku + std::string flags = "bwaccmlshhhoibsgvdp; "; // flagi AI (definicja w Driver.h) + for( int i = 0, j = 1; i < 19; ++i, j <<= 1 ) + if( tmp->Mechanik->DrivigFlags() & j ) // jak bit ustawiony + flags[ i + 1 ] = std::toupper( flags[ i + 1 ] ); // ^= 0x20; // to zmiana na wielką literę + + OutText4 = flags; + + OutText4 += + "Driver: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) + + " ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) + + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ) + + " VSm=" + to_string( tmp->Mechanik->VelSignalLast, 0 ) + + " VLm=" + to_string( tmp->Mechanik->VelLimitLast, 0 ) + + " VRd=" + to_string( tmp->Mechanik->VelRoad, 0 ); + + if( ( tmp->Mechanik->VelNext == 0.0 ) + && ( tmp->Mechanik->eSignNext ) ) { + // jeśli ma zapamiętany event semafora, nazwa eventu semafora + OutText4 += + " (" + + Global::Bezogonkow( tmp->Mechanik->eSignNext->asName ) + + ")"; + } + + // biezaca komenda dla AI + OutText4 += ", command: " + tmp->Mechanik->OrderCurrent(); + } + + if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] != 0 ) { + // f2 screen, track scan mode + if( tmp->Mechanik == nullptr ) { + //żeby była tabelka, musi być AI + break; + } + + float4 linecolor( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); + int i = 0; + do { + std::string scanline = tmp->Mechanik->TableText( i ); + if( scanline.empty() ) { break; } + UITable->text_lines.emplace_back( Global::Bezogonkow( scanline ), linecolor ); + ++i; + } while( i < 16 ); // TController:iSpeedTableSize TODO: change when the table gets recoded + } + + break; + } + + case( GLFW_KEY_F3 ) : { + // timetable + + TDynamicObject *tmp = + ( FreeFlyModeFlag ? + Ground.DynamicNearest( Camera.Pos ) : + Controlled ); // w trybie latania lokalizujemy wg mapy + + if( tmp == nullptr ) { break; } + if( tmp->Mechanik == nullptr ) { break; } + + auto const table = tmp->Mechanik->Timetable(); + if( table == nullptr ) { break; } + + OutText1 = + "Time: " + + to_string( (int)GlobalTime->hh ) + ":" + + ( GlobalTime->mm < 10 ? "0" : "" ) + to_string( GlobalTime->mm ) + ":" + + ( GlobalTime->mr < 10 ? "0" : "" ) + to_string( std::floor( GlobalTime->mr ) ); + if( Global::iPause ) { + OutText1 += " (paused)"; + } + + OutText2 = tmp->Mechanik->Relation() + " (" + tmp->Mechanik->Timetable()->TrainName + ")"; + + float4 linecolor( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); + + if( 0 == table->StationCount ) { + // only bother if there's stations to list + UITable->text_lines.emplace_back( "(no timetable)", linecolor ); + } + else { + // header + UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", linecolor ); + + TMTableLine *tableline; + for( int i = tmp->Mechanik->iStationStart; i <= std::min(15, table->StationCount); ++i ) { + // wyświetlenie pozycji z rozkładu + tableline = table->TimeTable + i; // linijka rozkładu + + std::string station = + ( tableline->StationName + " " ).substr( 0, 26 ); + std::string arrival = + ( tableline->Ah >= 0 ? + to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : + " " ); + std::string departure = + ( tableline->Dh >= 0 ? + to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : + " " ); + std::string vmax = + " " + + to_string( tableline->vmax, 0 ); + vmax = vmax.substr( vmax.length() - 3, 3 ); // z wyrównaniem do prawej + + UITable->text_lines.emplace_back( + Global::Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), + ( ( tmp->Mechanik->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) ? + float4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono + linecolor ) + ); + // divider/footer + UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", linecolor ); + } + } + + break; + } + + case( GLFW_KEY_F10 ) : { + + OutText1 = ( "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]." ); + break; + } + + default: { + // uncovered cases, nothing to do here + break; + } + + } + + + + + + if( DebugModeFlag && !Global::iTextMode ) { OutText1 = "FPS: "; @@ -1368,7 +1625,6 @@ TWorld::Render_UI() { OutText1 += ( Timer::GetDeltaTime() >= 0.2 ) ? "!" : " "; } if( Global::iTextMode == GLFW_KEY_F8 ) { - Global::iViewMode = GLFW_KEY_F8; OutText1 = "Draw range x " + to_string( Global::fDistanceFactor, 1 ) + "; FPS: " + to_string( Timer::GetFPS(), 2 ); //OutText1 += sprintf(); if( Global::iSlowMotion ) @@ -1440,6 +1696,7 @@ TWorld::Render_UI() { glTranslatef( 0.0f, 0.0f, -0.50f ); if( Global::iTextMode == GLFW_KEY_F1 ) { // tekst pokazywany po wciśnięciu [F1] +#ifdef EU07_OLD_UI_RENDERING // Global::iViewMode=VK_F1; glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy białym OutText1 = @@ -1459,6 +1716,7 @@ TWorld::Render_UI() { true ); // dopisanie punktu zatrzymania } OutText3 = ""; // Pomoc w sterowaniu - [F9]"; +#endif } else if( Global::iTextMode == GLFW_KEY_F12 ) { // opcje włączenia i wyłączenia logowania OutText1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); @@ -1466,6 +1724,7 @@ TWorld::Render_UI() { OutText3 = "[2] Console " + std::string( ( Global::iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); } else if( Global::iTextMode == GLFW_KEY_F2 ) { // ABu: info dla najblizszego pojazdu! +#ifdef EU07_OLD_UI_RENDERING TDynamicObject *tmp = FreeFlyModeFlag ? Ground.DynamicNearest( Camera.Pos ) : Controlled; // w trybie latania lokalizujemy wg mapy if( tmp ) { @@ -1589,7 +1848,6 @@ TWorld::Render_UI() { } } // koniec treści podstawowego ekranu FK_V2 else { // ekran drugi, czyli tabelka skanowania AI -/* if( tmp->Mechanik ) //żeby była tabelka, musi być AI { // tabelka jest na użytek testujących scenerie, więc nie musi być "ładna" glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy zielony. GF: jednak biały @@ -1637,7 +1895,6 @@ TWorld::Render_UI() { glRasterPos2f( -0.25f, 0.19f - 0.01f * i ); glPrint( Global::Bezogonkow( OutText4 ).c_str() ); } -*/ } // koniec ekanu skanowania } // koniec obsługi, gdy mamy wskaźnik do pojazdu else { // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika @@ -1654,6 +1911,7 @@ TWorld::Render_UI() { OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); if( Global::FakeLight ) { OutText2 += "(*)"; } } +#endif } // koniec treści podstawowego ekranu FK_V2 else if( Global::iTextMode == GLFW_KEY_F5 ) { // przesiadka do innego pojazdu if( FreeFlyModeFlag ) // jeśli tryb latania @@ -1686,12 +1944,6 @@ TWorld::Render_UI() { Global::iTextMode = 0; // tryb neutralny } } - else if( Global::iTextMode == GLFW_KEY_F10 ) { // tu mozna dodac dopisywanie do logu przebiegu lokomotywy - // Global::iViewMode=VK_F10; - // return false; - OutText1 = ( "To quit press [Y] key." ); - OutText3 = ( "Aby zakonczyc program, przycisnij klawisz [Y]." ); - } else if( Controlled && DebugModeFlag && !Global::iTextMode ) { OutText1 += ( "; vel " ) + to_string( Controlled->GetVelocity(), 2 ); OutText1 += ( "; pos " ) + to_string( Controlled->GetPosition().x, 2 ); @@ -1881,92 +2133,6 @@ TWorld::Render_UI() { Global::Bezogonkow( ( (char *)gluErrorString( err ) ) ); } } - if( Global::iTextMode == GLFW_KEY_F3 ) { // wyświetlenie rozkładu jazdy, na razie jakkolwiek - TDynamicObject *tmp = FreeFlyModeFlag ? - Ground.DynamicNearest( Camera.Pos ) : - Controlled; // w trybie latania lokalizujemy wg mapy - Mtable::TTrainParameters *tt = NULL; -/* - if( tmp ) - if( tmp->Mechanik ) { - tt = tmp->Mechanik->Timetable(); - if( tt ) // musi być rozkład - { // wyświetlanie rozkładu - glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy białym - // glTranslatef(0.0f,0.0f,-0.50f); - glRasterPos2f( -0.25f, 0.20f ); - OutText1 = tmp->Mechanik->Relation() + " (" + - tmp->Mechanik->Timetable()->TrainName + ")"; - glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); - glRasterPos2f( -0.25f, 0.19f ); - // glPrint("|============================|=======|=======|=====|"); - // glPrint("| Posterunek | Przyj.| Odjazd| Vmax|"); - // glPrint("|============================|=======|=======|=====|"); - glPrint( "|----------------------------|-------|-------|-----|" ); - TMTableLine *t; - for( int i = tmp->Mechanik->iStationStart; i <= tt->StationCount; ++i ) { // wyświetlenie pozycji z rozkładu - t = tt->TimeTable + i; // linijka rozkładu - OutText1 = ( t->StationName + - " " ).substr( 0, 26 ); - OutText2 = ( t->Ah >= 0 ) ? - to_string( int( 100 + t->Ah ) ).substr( 1, 2 ) + ":" + - to_string( int( 100 + t->Am ) ).substr( 1, 2 ) : - std::string( " " ); - OutText3 = ( t->Dh >= 0 ) ? - to_string( int( 100 + t->Dh ) ).substr( 1, 2 ) + ":" + - to_string( int( 100 + t->Dm ) ).substr( 1, 2 ) : - std::string( " " ); - OutText4 = " " + to_string( t->vmax, 0 ); - OutText4 = OutText4.substr( OutText4.length() - 3, - 3 ); // z wyrównaniem do prawej - // if (AnsiString(t->StationWare).Pos("@")) - OutText1 = "| " + OutText1 + " | " + OutText2 + " | " + OutText3 + - " | " + OutText4 + " | " + t->StationWare; - glRasterPos2f( -0.25f, - 0.18f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); - if( ( tmp->Mechanik->iStationStart < tt->StationIndex ) ? - ( i < tt->StationIndex ) : - false ) { // czas minął i odjazd był, to nazwa stacji będzie na zielono - glColor3f( 0.0f, 1.0f, 0.0f ); // zielone - glRasterPos2f( - -0.25f, - 0.18f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); - glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); - glColor3f( 1.0f, 1.0f, 1.0f ); // a reszta białym - } - else // normalne wyświetlanie, bez zmiany kolorów - glPrint( Global::Bezogonkow( OutText1, true ).c_str() ); - glRasterPos2f( -0.25f, - 0.17f - 0.02f * ( i - tmp->Mechanik->iStationStart ) ); - glPrint( "|----------------------------|-------|-------|-----|" ); - } - } - } -*/ - } -/* - else if( OutText1 != "" ) { // ABu: i od razu czyszczenie tego, co bylo napisane - // glTranslatef(0.0f,0.0f,-0.50f); - glRasterPos2f( -0.25f, 0.20f ); - glPrint( OutText1.c_str() ); - OutText1 = ""; - if( OutText2 != "" ) { - glRasterPos2f( -0.25f, 0.19f ); - glPrint( OutText2.c_str() ); - OutText2 = ""; - } - if( OutText3 != "" ) { - glRasterPos2f( -0.25f, 0.18f ); - glPrint( OutText3.c_str() ); - OutText3 = ""; - if( OutText4 != "" ) { - glRasterPos2f( -0.25f, 0.17f ); - glPrint( OutText4.c_str() ); - OutText4 = ""; - } - } - } -*/ // update the ui header texts auto &headerdata = UIHeader->text_lines; @@ -1991,9 +2157,6 @@ TWorld::Render_UI() { } } } -/* - glEnable( GL_LIGHTING ); -*/ } //--------------------------------------------------------------------------- diff --git a/World.h b/World.h index 3348b754..957d295f 100644 --- a/World.h +++ b/World.h @@ -69,9 +69,9 @@ class TWorld std::string OutText4; void Update_Environment(); void Update_Camera( const double Deltatime ); + void Update_UI(); void ResourceSweep(); void Render_Cab(); - void Render_UI(); TCamera Camera; TGround Ground; world_environment Environment; diff --git a/frustum.cpp b/frustum.cpp index f0244f5a..02b16f18 100644 --- a/frustum.cpp +++ b/frustum.cpp @@ -11,15 +11,30 @@ http://mozilla.org/MPL/2.0/. #include "frustum.h" void -cFrustum::calculate() { - +cFrustum::calculate( glm::mat4 &Projection, glm::mat4 &Modelview ) { +/* float proj[ 16 ]; +*/ float modl[ 16 ]; - float clip[ 16 ]; + float *proj = &Projection[ 0 ][ 0 ]; +/* + float *modl = &Modelview[ 0 ][ 0 ]; +*/ + float clip[ 16 ]; +/* glGetFloatv( GL_PROJECTION_MATRIX, proj ); +*/ glGetFloatv( GL_MODELVIEW_MATRIX, modl ); + glm::mat4 modelview = glm::make_mat4( modl ); + for( int col = 0; col < 4; ++col ) + for( int row = 0; row < 4; ++row ) { + + auto difference = modelview[ col ][ row ] - Modelview[ col ][ row ]; +// assert( difference <= 0.01f ); + } + // multiply the matrices to retrieve clipping planes clip[ 0 ] = modl[ 0 ] * proj[ 0 ] + modl[ 1 ] * proj[ 4 ] + modl[ 2 ] * proj[ 8 ] + modl[ 3 ] * proj[ 12 ]; clip[ 1 ] = modl[ 0 ] * proj[ 1 ] + modl[ 1 ] * proj[ 5 ] + modl[ 2 ] * proj[ 9 ] + modl[ 3 ] * proj[ 13 ]; diff --git a/frustum.h b/frustum.h index be8b9265..41ebb64a 100644 --- a/frustum.h +++ b/frustum.h @@ -22,7 +22,7 @@ public: // methods: // update the frustum to match current view orientation void - calculate(); + calculate(glm::mat4 &Projection, glm::mat4 &Modelview); // returns true if specified point is inside of the frustum inline bool diff --git a/maszyna.vcxproj b/maszyna.vcxproj index 5854590c..1658a871 100644 --- a/maszyna.vcxproj +++ b/maszyna.vcxproj @@ -51,7 +51,7 @@ WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) Level3 ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/glm;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) Use true false @@ -70,7 +70,7 @@ MultiThreadedDLL Level3 ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) + $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/glm;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) Use true diff --git a/renderer.cpp b/renderer.cpp index b7460005..2fc15605 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -8,6 +8,7 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" + #include "renderer.h" #include "globals.h" #include "world.h" @@ -123,26 +124,31 @@ opengl_renderer::Render() { auto timestart = std::chrono::steady_clock::now(); -// ::glColor3ub( 255, 255, 255 ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); ::glDepthFunc( GL_LEQUAL ); ::glMatrixMode( GL_PROJECTION ); // select the Projection Matrix - ::glLoadIdentity(); // reset the Projection Matrix - // calculate the aspect ratio of the window - ::gluPerspective( - Global::FieldOfView / Global::ZoomFactor, - (GLdouble)Global::ScreenWidth / std::max( (GLdouble)Global::ScreenHeight, 1.0 ), + glm::mat4 projection = glm::perspective( + Global::FieldOfView / Global::ZoomFactor * 0.0174532925f, + (float)Global::ScreenWidth / std::max( (float)Global::ScreenHeight, 1.0f ), 0.1f * Global::ZoomFactor, m_drawrange * Global::fDistanceFactor ); + ::glLoadMatrixf( &projection[0][0] ); ::glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix + glm::mat4 modelview( 1.0f ); ::glLoadIdentity(); if( World.InitPerformed() ) { + World.Camera.SetMatrix( modelview ); World.Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii - m_camera.update_frustum(); +/* + // NOTE: something in the cab mode render interferes with straightforward opengl matrix setup here + // until it's sorted out, we're relying on direct matrix configuration through setmatrix() variant + ::glLoadMatrixf( &modelview[ 0 ][ 0 ] ); +*/ + m_camera.update_frustum( projection, modelview ); if( !Global::bWireFrame ) { // bez nieba w trybie rysowania linii @@ -152,10 +158,9 @@ opengl_renderer::Render() { World.Ground.Render( World.Camera.Pos ); World.Render_Cab(); - World.Render_UI(); - // accumulate last 20 frames worth of render time - m_drawtime = 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - timestart ) ).count(); + // accumulate last 20 frames worth of render time (cap at 1000 fps to prevent calculations going awry) + m_drawtime = std::max( 20.0f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - timestart ) ).count()); } UILayer.render(); @@ -420,7 +425,7 @@ opengl_renderer::Update ( double const Deltatime ) { m_updateaccumulator = 0.0; // adjust draw ranges etc, based on recent performance - auto const framerate = 1000.0f / (m_drawtime * 0.05f); + auto const framerate = 1000.0f / (m_drawtime / 20.0f); // NOTE: until we have quadtree in place we have to rely on the legacy rendering // once this is resolved we should be able to simply adjust draw range @@ -552,5 +557,7 @@ opengl_renderer::Init_caps() { WriteLog( "Texture sizes capped at " + std::to_string( Global::iMaxTextureSize ) + " pixels" ); } + + return true; } //--------------------------------------------------------------------------- diff --git a/renderer.h b/renderer.h index 444084fe..0aceabe7 100644 --- a/renderer.h +++ b/renderer.h @@ -78,7 +78,7 @@ public: // methods: inline void - update_frustum() { m_frustum.calculate(); } + update_frustum(glm::mat4 &Projection, glm::mat4 &Modelview) { m_frustum.calculate(Projection, Modelview); } bool visible( bounding_area const &Area ) const; bool @@ -163,7 +163,7 @@ private: texture_manager m_textures; opengl_camera m_camera; float m_drawrange{ 2500.0f }; // current drawing range - float m_drawtime{ 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps + float m_drawtime{ 1000.0f / 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps double m_updateaccumulator{ 0.0 }; GLFWwindow *m_window{ nullptr }; }; diff --git a/stdafx.h b/stdafx.h index f4b609b7..135e2d1b 100644 --- a/stdafx.h +++ b/stdafx.h @@ -68,4 +68,8 @@ #endif #define GLFW_INCLUDE_GLU //m7todo: jest tu bo nie chciao mi si wpycha do wszystkich plikw -#include \ No newline at end of file +#include + +#include +#include +#include From 9486ba26cba25e3033b2cf20ccf3156b7b362fcc Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 15 Mar 2017 02:57:54 +0100 Subject: [PATCH 059/426] removed glGet() from frustum calculation --- Camera.cpp | 8 +- Camera.h | 3 +- Ground.cpp | 4 +- World.cpp | 314 ++++++++++----------------------------------------- frustum.cpp | 17 +-- renderer.cpp | 7 +- uilayer.cpp | 37 ++++-- 7 files changed, 94 insertions(+), 296 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index 7b812b15..f1c0db7e 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -111,8 +111,7 @@ vector3 TCamera::GetDirection() return (Normalize(Vec)); } - -// bool TCamera::GetMatrix(matrix4x4 &Matrix) +/* bool TCamera::SetMatrix() { glRotated( -Roll * 180.0f / M_PI, 0, 0, 1 ); // po wyłączeniu tego kręci się pojazd, a sceneria nie @@ -133,7 +132,7 @@ bool TCamera::SetMatrix() Global::SetCameraPosition(Pos); // było +pOffset return true; } - +*/ bool TCamera::SetMatrix( glm::mat4 &Matrix ) { Matrix = glm::rotate( Matrix, (float)-Roll, glm::vec3( 0.0f, 0.0f, 1.0f ) ); // po wyłączeniu tego kręci się pojazd, a sceneria nie @@ -142,7 +141,7 @@ bool TCamera::SetMatrix( glm::mat4 &Matrix ) { if( Type == tp_Follow ) { - Matrix = glm::lookAt( + Matrix *= glm::lookAt( glm::vec3( Pos.x, Pos.y, Pos.z ), glm::vec3( LookAt.x, LookAt.y, LookAt.z ), glm::vec3( vUp.x, vUp.y, vUp.z ) ); @@ -151,6 +150,7 @@ bool TCamera::SetMatrix( glm::mat4 &Matrix ) { Matrix = glm::translate( Matrix, glm::vec3( -Pos.x, -Pos.y, -Pos.z ) ); // nie zmienia kierunku patrzenia } + Global::SetCameraPosition( Pos ); // było +pOffset return true; } diff --git a/Camera.h b/Camera.h index a7bcc0c8..9a04bb96 100644 --- a/Camera.h +++ b/Camera.h @@ -48,8 +48,9 @@ class TCamera void Update(); vector3 GetDirection(); // vector3 inline GetCrossPos() { return Pos+GetDirection()*CrossDist+CrossPos; }; - +/* bool SetMatrix(); +*/ bool SetMatrix(glm::mat4 &Matrix); void SetCabMatrix( vector3 &p ); void RaLook(); diff --git a/Ground.cpp b/Ground.cpp index 1a693a09..44b0620b 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -666,7 +666,7 @@ void TGroundNode::RenderAlphaDL() if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.35f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f }; #endif if (!DisplayListID) //||Global::bReCompile) //Ra: wymuszenie rekompilacji @@ -4911,7 +4911,7 @@ TGround::Render( Math3D::vector3 const &Camera ) { bool TGround::RenderDL(vector3 pPosition) { // renderowanie scenerii z Display List - faza nieprzezroczystych glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.35f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) CameraDirection.x = sin(Global::pCameraRotation); // wektor kierunkowy CameraDirection.z = cos(Global::pCameraRotation); diff --git a/World.cpp b/World.cpp index df13de68..fda99799 100644 --- a/World.cpp +++ b/World.cpp @@ -140,12 +140,12 @@ BOOL GetDisplayMonitorInfo(int nDeviceIndex, LPSTR lpszMonitorInfo) } */ -bool TWorld::Init( GLFWwindow *w ) { +bool TWorld::Init( GLFWwindow *Window ) { auto timestart = std::chrono::system_clock::now(); - window = w; - Global::window = w; // do WM_COPYDATA + window = Window; + Global::window = Window; // do WM_COPYDATA Global::pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań WriteLog("\nStarting MaSzyna rail vehicle simulator."); @@ -374,7 +374,7 @@ void TWorld::OnKeyDown(int cKey) if( DebugModeFlag ) { if( Global::ctrlState ) { Global::fTimeSpeed = ( Global::shiftState ? 60.0 : 20.0 ); } - else { Global::fTimeSpeed = ( Global::shiftState ? 5.0 : 1.0 ); } + else { Global::fTimeSpeed = ( Global::shiftState ? 5.0 : 1.0 ); } } break; } @@ -1531,7 +1531,6 @@ TWorld::Update_UI() { case( GLFW_KEY_F3 ) : { // timetable - TDynamicObject *tmp = ( FreeFlyModeFlag ? Ground.DynamicNearest( Camera.Pos ) : @@ -1565,7 +1564,7 @@ TWorld::Update_UI() { UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", linecolor ); TMTableLine *tableline; - for( int i = tmp->Mechanik->iStationStart; i <= std::min(15, table->StationCount); ++i ) { + for( int i = tmp->Mechanik->iStationStart; i <= std::min( tmp->Mechanik->iStationStart + 15, table->StationCount ); ++i ) { // wyświetlenie pozycji z rozkładu tableline = table->TimeTable + i; // linijka rozkładu @@ -1598,17 +1597,67 @@ TWorld::Update_UI() { break; } + case( GLFW_KEY_F8 ) : { + + OutText1 = + "Draw range x " + to_string( Global::fDistanceFactor, 1 ) + + "; FPS: " + to_string( Timer::GetFPS(), 2 ); + if( Global::iSlowMotion ) { + OutText1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; + } + OutText1 += + ", sectors: " + to_string( Ground.iRendered ) + + "/" + to_string( Global::iSegmentsRendered ) + + "; FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ); + + break; + } + + case( GLFW_KEY_F9 ) : { + // informacja o wersji, sposobie wyświetlania i błędach OpenGL + OutText1 = Global::asVersion; // informacja o wersji + if( Global::iMultiplayer ) { + OutText1 += " (multiplayer mode is active)"; + } + + OutText2 = + std::string("Rendering mode: ") + + ( Global::bUseVBO ? + "VBO" : + "Display Lists" ); + + GLenum glerror = glGetError(); + if( glerror != GL_NO_ERROR ) { + // dump last opengl error, if any + OutText3 = + "OpenGL error " + + to_string( glerror ) + + ": " + + Global::Bezogonkow( ( (char *)gluErrorString( glerror ) ) ); + } + + break; + } + case( GLFW_KEY_F10 ) : { OutText1 = ( "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]." ); break; } + case( GLFW_KEY_F12 ) : { + // opcje włączenia i wyłączenia logowania + OutText1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); + OutText2 = "[1] log.txt " + std::string( ( Global::iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); + OutText3 = "[2] Console " + std::string( ( Global::iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); + + break; + } + default: { // uncovered cases, nothing to do here break; } - } @@ -1624,14 +1673,6 @@ TWorld::Update_UI() { OutText1 += ( Timer::GetDeltaTime() >= 0.2 ) ? "!" : " "; } - if( Global::iTextMode == GLFW_KEY_F8 ) { - OutText1 = "Draw range x " + to_string( Global::fDistanceFactor, 1 ) + "; FPS: " + to_string( Timer::GetFPS(), 2 ); - //OutText1 += sprintf(); - if( Global::iSlowMotion ) - OutText1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; - OutText1 += ", sectors: " + to_string( Ground.iRendered ) + "/" + to_string( Global::iSegmentsRendered ); - OutText1 += "; FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ); - } if( Global::changeDynObj ) { // ABu zmiana pojazdu - przejście do innego // Ra: to nie może być tak robione, to zbytnia proteza jest Train->Silence(); // wyłączenie dźwięków opuszczanej kabiny @@ -1684,236 +1725,12 @@ TWorld::Update_UI() { Global::changeDynObj = NULL; } - glDepthFunc( GL_ALWAYS ); - glDisable( GL_LIGHTING ); if( Controlled ) glfwSetWindowTitle( window, Controlled->MoverParameters->Name.c_str() ); else glfwSetWindowTitle( window, Global::SceneryFile.c_str() ); // nazwa scenerii - GfxRenderer.Bind( 0 ); - glColor4f( 1.0f, 0.0f, 0.0f, 1.0f ); - glLoadIdentity(); - glTranslatef( 0.0f, 0.0f, -0.50f ); - if( Global::iTextMode == GLFW_KEY_F1 ) { // tekst pokazywany po wciśnięciu [F1] -#ifdef EU07_OLD_UI_RENDERING - // Global::iViewMode=VK_F1; - glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy białym - OutText1 = - "Time: " - + to_string( (int)GlobalTime->hh ) + ":" - + ( GlobalTime->mm < 10 ? "0" : "" ) + to_string( GlobalTime->mm ) + ":" - + ( GlobalTime->mr < 10 ? "0" : "" ) + to_string( std::floor( GlobalTime->mr ) ); - if( Global::iPause ) - OutText1 += " - paused"; - if( Controlled ) - if( Controlled->Mechanik ) { - OutText2 = Controlled->Mechanik->Relation(); - if( !OutText2.empty() ) // jeśli jest podana relacja, to dodajemy punkt następnego - // zatrzymania - OutText2 = - Global::Bezogonkow( OutText2 + ": -> " + Controlled->Mechanik->NextStop(), - true ); // dopisanie punktu zatrzymania - } - OutText3 = ""; // Pomoc w sterowaniu - [F9]"; -#endif - } - else if( Global::iTextMode == GLFW_KEY_F12 ) { // opcje włączenia i wyłączenia logowania - OutText1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); - OutText2 = "[1] log.txt " + std::string( ( Global::iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); - OutText3 = "[2] Console " + std::string( ( Global::iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); - } - else if( Global::iTextMode == GLFW_KEY_F2 ) { // ABu: info dla najblizszego pojazdu! -#ifdef EU07_OLD_UI_RENDERING - TDynamicObject *tmp = FreeFlyModeFlag ? Ground.DynamicNearest( Camera.Pos ) : - Controlled; // w trybie latania lokalizujemy wg mapy - if( tmp ) { - if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 0 ) { // jeśli domyślny ekran po pierwszym naciśnięciu - OutText3 = ""; - OutText1 = "Vehicle name: " + tmp->MoverParameters->Name; - if( tmp->Mechanik ) // jeśli jest prowadzący - { // ostatnia komenda dla AI - OutText1 += ", command: " + tmp->Mechanik->OrderCurrent(); - } - else if( tmp->ctOwner ) - OutText1 += ", owned by " + tmp->ctOwner->OwnerName(); - if( !tmp->MoverParameters->CommandLast.empty() ) - OutText1 += ", put: " + tmp->MoverParameters->CommandLast; - OutText2 = "Damage status: " + - tmp->MoverParameters->EngineDescription( 0 ); //+" Engine status: "; - OutText2 += "; Brake delay: "; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) - OutText2 += "G"; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) - OutText2 += "P"; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) - OutText2 += "R"; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) - OutText2 += "+Mg"; - OutText2 += ", BTP:" + - to_string( tmp->MoverParameters->LoadFlag, 0 ); - { - OutText2 += "; pant. " + - to_string( tmp->MoverParameters->PantPress, 2 ); - OutText2 += ( tmp->MoverParameters->bPantKurek3 ? "MoverParameters->LocalBrakePosA, 2 ); - OutText2 += "+" + - to_string( tmp->MoverParameters->AnPos, 2 ); - OutText2 += ", Ft:" + - to_string( tmp->MoverParameters->Ft * 0.001f, 0 ); - OutText2 += ", HV0:" + - to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 1 ], 0 ); - OutText2 += "@" + - to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 0 ], 0 ); - OutText2 += "+HV1:" + - to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 1 ], 0 ); - OutText2 += "@" + - to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 0 ], 0 ); - OutText2 += " TC:" + - to_string( tmp->MoverParameters->TotalCurrent, 0 ); - OutText3 = ( "BP: " ) + - to_string( tmp->MoverParameters->BrakePress, 2 ) + - ( ", " ); - OutText3 += to_string( tmp->MoverParameters->BrakeStatus, 0 ) + - ( ", " ); - OutText3 += ( "PP: " ) + - to_string( tmp->MoverParameters->PipePress, 2 ) + - ( "/" ); - OutText3 += to_string( tmp->MoverParameters->ScndPipePress, 2 ) + - ( "/" ); - OutText3 += to_string( tmp->MoverParameters->EqvtPipePress, 2 ) + - ( ", " ); - OutText3 += ( "BVP: " ) + - to_string( tmp->MoverParameters->Volume, 3 ) + - ( ", " ); - OutText3 += to_string( tmp->MoverParameters->CntrlPipePress, 3 ) + - ( ", " ); - OutText3 += to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ) + - ( ", " ); - OutText3 += to_string( tmp->MoverParameters->BrakeStatus, 0 ) + - ( ", " ); - if( tmp->MoverParameters->ManualBrakePos > 0 ) - OutText3 += ( "manual brake active. " ); - else if( tmp->MoverParameters->LocalBrakePos > 0 ) - OutText3 += ( "local brake active. " ); - else - OutText3 += ( "local brake inactive. " ); - OutText4 = ""; - if( tmp->Mechanik ) { // o ile jest ktoś w środku - // OutText4=tmp->Mechanik->StopReasonText(); - // if (!OutText4.IsEmpty()) OutText4+="; "; //aby ładniejszy odstęp był - // if (Controlled->Mechanik && (Controlled->Mechanik->AIControllFlag==AIdriver)) - std::string flags = "bwaccmlshhhoibsgvdp; "; // flagi AI (definicja w Driver.h) - for( int i = 0, j = 1; i < 19; ++i, j <<= 1 ) - if( tmp->Mechanik->DrivigFlags() & j ) // jak bit ustawiony - flags[ i + 1 ] = std::toupper( flags[ i + 1 ] ); // ^= 0x20; // to zmiana na wielką literę - OutText4 = flags; - OutText4 += - ( "Driver: Vd=" ) + - to_string( tmp->Mechanik->VelDesired, 0 ) + ( " ad=" ) + - to_string( tmp->Mechanik->AccDesired, 2 ) + ( " Pd=" ) + - to_string( tmp->Mechanik->ActualProximityDist, 0 ) + - ( " Vn=" ) + to_string( tmp->Mechanik->VelNext, 0 ) + - ( " VSm=" ) + to_string( tmp->Mechanik->VelSignalLast, 0 ) + - ( " VLm=" ) + to_string( tmp->Mechanik->VelLimitLast, 0 ) + - ( " VRd=" ) + to_string( tmp->Mechanik->VelRoad, 0 ); - if( tmp->Mechanik->VelNext == 0.0 ) - if( tmp->Mechanik->eSignNext ) { // jeśli ma zapamiętany event semafora - // if (!OutText4.IsEmpty()) OutText4+=", "; //aby ładniejszy odstęp był - OutText4 += " (" + - Global::Bezogonkow( tmp->Mechanik->eSignNext->asName ) + - ")"; // nazwa eventu semafora - } - } - if( !OutText4.empty() ) - OutText4 += "; "; // aby ładniejszy odstęp był - // informacja o sprzęgach nawet bez mechanika - OutText4 += - "C0=" + ( tmp->PrevConnected ? - tmp->PrevConnected->GetName() + ":" + - to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) : - std::string( "NULL" ) ); - OutText4 += - " C1=" + ( tmp->NextConnected ? - tmp->NextConnected->GetName() + ":" + - to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) : - std::string( "NULL" ) ); - if( Console::Pressed( GLFW_KEY_F2 ) ) { - WriteLog( OutText1 ); - WriteLog( OutText2 ); - WriteLog( OutText3 ); - WriteLog( OutText4 ); - } - } // koniec treści podstawowego ekranu FK_V2 - else { // ekran drugi, czyli tabelka skanowania AI - if( tmp->Mechanik ) //żeby była tabelka, musi być AI - { // tabelka jest na użytek testujących scenerie, więc nie musi być "ładna" - glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy zielony. GF: jednak biały - // glTranslatef(0.0f,0.0f,-0.50f); - glRasterPos2f( -0.25f, 0.20f ); - // OutText1="Scan distance: "+AnsiString(tmp->Mechanik->scanmax)+", back: - // "+AnsiString(tmp->Mechanik->scanback); - OutText1 = "Time: " + to_string( (int)GlobalTime->hh ) + ":"; - int i = GlobalTime->mm; // bo inaczej potrafi zrobić "hh:010" - if( i < 10 ) - OutText1 += "0"; - OutText1 += to_string( i ); // minuty - OutText1 += ":"; - i = floor( GlobalTime->mr ); // bo inaczej potrafi zrobić "hh:mm:010" - if( i < 10 ) - OutText1 += "0"; - OutText1 += to_string( i ); - OutText1 += - ( ". Vel: " ) + to_string( tmp->GetVelocity(), 1 ); - OutText1 += ". Scan table:"; - glPrint( Global::Bezogonkow( OutText1 ).c_str() ); - i = -1; - while( ( OutText1 = tmp->Mechanik->TableText( ++i ) ) != "" ) { // wyświetlenie pozycji z tabelki - glRasterPos2f( -0.25f, 0.19f - 0.01f * i ); - glPrint( Global::Bezogonkow( OutText1 ).c_str() ); - } - // podsumowanie sensu tabelki - OutText4 = - ( "Driver: Vd=" ) + - to_string( tmp->Mechanik->VelDesired, 0 ) + ( " ad=" ) + - to_string( tmp->Mechanik->AccDesired, 2 ) + ( " Pd=" ) + - to_string( tmp->Mechanik->ActualProximityDist, 0 ) + - ( " Vn=" ) + to_string( tmp->Mechanik->VelNext, 0 ) + - ( "\n VSm=" ) + to_string( tmp->Mechanik->VelSignalLast, 0 ) + - ( " VLm=" ) + to_string( tmp->Mechanik->VelLimitLast, 0 ) + - ( " VRd=" ) + to_string( tmp->Mechanik->VelRoad, 0 ) + - ( " VSig=" ) + to_string( tmp->Mechanik->VelSignal, 0 ); - if( tmp->Mechanik->VelNext == 0.0 ) - if( tmp->Mechanik->eSignNext ) { // jeśli ma zapamiętany event semafora - // if (!OutText4.IsEmpty()) OutText4+=", "; //aby ładniejszy odstęp był - OutText4 += " (" + - Global::Bezogonkow( tmp->Mechanik->eSignNext->asName ) + - ")"; // nazwa eventu semafora - } - glRasterPos2f( -0.25f, 0.19f - 0.01f * i ); - glPrint( Global::Bezogonkow( OutText4 ).c_str() ); - } - } // koniec ekanu skanowania - } // koniec obsługi, gdy mamy wskaźnik do pojazdu - else { // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika - OutText1 = "Camera position: " + to_string( Camera.Pos.x, 2 ) + " " + - to_string( Camera.Pos.y, 2 ) + " " + - to_string( Camera.Pos.z, 2 ); - OutText1 += ", azimuth: " + - to_string( 180.0 - RadToDeg( Camera.Yaw ), 0 ); // ma być azymut, czyli 0 na północy i rośnie na wschód - OutText1 += - " " + - std::string( "S SEE NEN NWW SW" ) - .substr( 0 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); - // current luminance level - OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); - if( Global::FakeLight ) { OutText2 += "(*)"; } - } -#endif - } // koniec treści podstawowego ekranu FK_V2 - else if( Global::iTextMode == GLFW_KEY_F5 ) { // przesiadka do innego pojazdu + if( Global::iTextMode == GLFW_KEY_F5 ) { // przesiadka do innego pojazdu if( FreeFlyModeFlag ) // jeśli tryb latania { TDynamicObject *tmp = Ground.DynamicNearest( Camera.Pos, 50, true ); //łapiemy z obsadą @@ -2117,23 +1934,6 @@ TWorld::Update_UI() { ( " Vn=" ) + to_string( Controlled->Mechanik->VelNext, 0 ); } - // ABu 150205: prosty help, zeby sie na forum nikt nie pytal, jak ma ruszyc :) - - // if (Console::Pressed(VK_F9)) ShowHints(); //to nie działa prawidłowo - prosili wyłączyć - if( Global::iTextMode == GLFW_KEY_F9 ) { // informacja o wersji, sposobie wyświetlania i błędach OpenGL - // Global::iViewMode=VK_F9; - OutText1 = Global::asVersion; // informacja o wersji - OutText2 = std::string( "Rendering mode: " ) + ( Global::bUseVBO ? "VBO" : "Display Lists" ); - if( Global::iMultiplayer ) - OutText2 += ". Multiplayer is active"; - OutText2 += "."; - GLenum err = glGetError(); - if( err != GL_NO_ERROR ) { - OutText3 = "OpenGL error " + to_string( err ) + ": " + - Global::Bezogonkow( ( (char *)gluErrorString( err ) ) ); - } - } - // update the ui header texts auto &headerdata = UIHeader->text_lines; headerdata[ 0 ].data = OutText1; diff --git a/frustum.cpp b/frustum.cpp index 02b16f18..967e037c 100644 --- a/frustum.cpp +++ b/frustum.cpp @@ -14,26 +14,15 @@ void cFrustum::calculate( glm::mat4 &Projection, glm::mat4 &Modelview ) { /* float proj[ 16 ]; -*/ float modl[ 16 ]; - - float *proj = &Projection[ 0 ][ 0 ]; -/* - float *modl = &Modelview[ 0 ][ 0 ]; */ + float *proj = &Projection[ 0 ][ 0 ]; + float *modl = &Modelview[ 0 ][ 0 ]; float clip[ 16 ]; /* glGetFloatv( GL_PROJECTION_MATRIX, proj ); -*/ glGetFloatv( GL_MODELVIEW_MATRIX, modl ); - - glm::mat4 modelview = glm::make_mat4( modl ); - for( int col = 0; col < 4; ++col ) - for( int row = 0; row < 4; ++row ) { - - auto difference = modelview[ col ][ row ] - Modelview[ col ][ row ]; -// assert( difference <= 0.01f ); - } +*/ // multiply the matrices to retrieve clipping planes clip[ 0 ] = modl[ 0 ] * proj[ 0 ] + modl[ 1 ] * proj[ 4 ] + modl[ 2 ] * proj[ 8 ] + modl[ 3 ] * proj[ 12 ]; diff --git a/renderer.cpp b/renderer.cpp index 2fc15605..564acfaf 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -130,7 +130,7 @@ opengl_renderer::Render() { ::glMatrixMode( GL_PROJECTION ); // select the Projection Matrix glm::mat4 projection = glm::perspective( Global::FieldOfView / Global::ZoomFactor * 0.0174532925f, - (float)Global::ScreenWidth / std::max( (float)Global::ScreenHeight, 1.0f ), + std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), 0.1f * Global::ZoomFactor, m_drawrange * Global::fDistanceFactor ); ::glLoadMatrixf( &projection[0][0] ); @@ -142,12 +142,7 @@ opengl_renderer::Render() { if( World.InitPerformed() ) { World.Camera.SetMatrix( modelview ); - World.Camera.SetMatrix(); // ustawienie macierzy kamery względem początku scenerii -/* - // NOTE: something in the cab mode render interferes with straightforward opengl matrix setup here - // until it's sorted out, we're relying on direct matrix configuration through setmatrix() variant ::glLoadMatrixf( &modelview[ 0 ][ 0 ] ); -*/ m_camera.update_frustum( projection, modelview ); if( !Global::bWireFrame ) { diff --git a/uilayer.cpp b/uilayer.cpp index 616f52cd..736255f4 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -43,11 +43,16 @@ ui_layer::init( GLFWwindow *Window ) { DEFAULT_PITCH | FF_DONTCARE, // family and pitch "Lucida Console"); // font name ::SelectObject(hDC, font); // selects the font we want - ::wglUseFontBitmapsA(hDC, 32, 96, m_fontbase); // builds 96 characters starting at character 32 - WriteLog("Display Lists font used"); //+AnsiString(glGetError()) - WriteLog("Font init OK"); //+AnsiString(glGetError()) - - return true; + if( true == ::wglUseFontBitmaps( hDC, 32, 96, m_fontbase ) ) { + // builds 96 characters starting at character 32 + WriteLog( "Display Lists font used" ); //+AnsiString(glGetError()) + WriteLog( "Font init OK" ); //+AnsiString(glGetError()) + return true; + } + else { + ErrorLog( "Font init failed" ); + return false; + } } void @@ -136,7 +141,7 @@ ui_layer::render_panels() { glPushAttrib( GL_ENABLE_BIT ); glDisable( GL_TEXTURE_2D ); - float const width = ( 4.0f / 3.0f ) * Global::iWindowHeight; + float const width = std::min( 4.0f / 3.0f, static_cast(Global::iWindowWidth) / Global::iWindowHeight ) * Global::iWindowHeight; float const height = Global::iWindowHeight / 768.0; for( auto const &panel : m_panels ) { @@ -187,17 +192,25 @@ ui_layer::print( std::string const &Text ) void ui_layer::quad( float4 const &Coordinates, float4 const &Color ) { - float const width = ( 4.0f / 3.0f ) * Global::iWindowHeight; - float const height = Global::iWindowHeight / 768.0; + float const screenratio = static_cast( Global::iWindowWidth ) / Global::iWindowHeight; + float const width = + ( screenratio >= (4.0f/3.0f) ? + ( 4.0f / 3.0f ) * Global::iWindowHeight : + Global::iWindowWidth ); + float const heightratio = + ( screenratio >= ( 4.0f / 3.0f ) ? + Global::iWindowHeight / 768.0 : + Global::iWindowHeight / 768.0 * screenratio / ( 4.0f / 3.0f ) ); + float const height = 768.0f * heightratio; glColor4fv(&Color.x); glBegin( GL_TRIANGLE_STRIP ); - glTexCoord2f( 0.0f, 1.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.x * height, Coordinates.y * height ); - glTexCoord2f( 0.0f, 0.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.x * height, Coordinates.w * height ); - glTexCoord2f( 1.0f, 1.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.z * height, Coordinates.y * height ); - glTexCoord2f( 1.0f, 0.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.z * height, Coordinates.w * height ); + glTexCoord2f( 0.0f, 1.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5 * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); + glTexCoord2f( 0.0f, 0.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5 * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); + glTexCoord2f( 1.0f, 1.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5 * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); + glTexCoord2f( 1.0f, 0.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5 * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); glEnd(); } From dbc4be6bc6b2650448f78e7a52eb0100d0e5d700 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 15 Mar 2017 19:16:51 +0100 Subject: [PATCH 060/426] remote version sync --- EU07.cpp | 10 +- Globals.cpp | 7 +- Globals.h | 7 +- World.cpp | 796 +++++++++++++++++++++---------------------- World.h | 2 + maszyna.sln | 6 + maszyna.vcxproj | 226 ------------ maszyna.vcxproj.user | 9 + 8 files changed, 423 insertions(+), 640 deletions(-) delete mode 100644 maszyna.vcxproj diff --git a/EU07.cpp b/EU07.cpp index 8ad328f2..f0fdb3c4 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -287,8 +287,14 @@ int main(int argc, char *argv[]) } GLFWwindow *window = - glfwCreateWindow( Global::iWindowWidth, Global::iWindowHeight, - "EU07", Global::bFullScreen ? monitor : nullptr, nullptr ); + glfwCreateWindow( + Global::iWindowWidth, + Global::iWindowHeight, + Global::AppName.c_str(), + ( Global::bFullScreen ? + monitor : + nullptr), + nullptr ); if (!window) { diff --git a/Globals.cpp b/Globals.cpp index b99d76a6..75313f33 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -28,11 +28,7 @@ http://mozilla.org/MPL/2.0/. // parametry do użytku wewnętrznego // double Global::tSinceStart=0; TGround *Global::pGround = NULL; -// char Global::CreatorName1[30]="2001-2004 Maciej Czapkiewicz "; -// char Global::CreatorName2[30]="2001-2003 Marcin Woźniak "; -// char Global::CreatorName3[20]="2004-2005 Adam Bugiel "; -// char Global::CreatorName4[30]="2004 Arkadiusz Ślusarczyk "; -// char Global::CreatorName5[30]="2003-2009 Łukasz Kirchner "; +std::string Global::AppName{ "EU07" }; std::string Global::asCurrentSceneryPath = "scenery/"; std::string Global::asCurrentTexturePath = std::string(szTexturePath); std::string Global::asCurrentDynamicPath = ""; @@ -143,6 +139,7 @@ int Global::iBallastFiltering = 9; // domyślne rozmywanie tekstur podsypki int Global::iRailProFiltering = 5; // domyślne rozmywanie tekstur szyn int Global::iDynamicFiltering = 5; // domyślne rozmywanie tekstur pojazdów bool Global::bUseVBO = false; // czy jest VBO w karcie graficznej (czy użyć) +std::string Global::LastGLError; GLint Global::iMaxTextureSize = 16384; // maksymalny rozmiar tekstury bool Global::bSmoothTraction = false; // wygładzanie drutów starym sposobem std::string Global::szDefaultExt = Global::szTexturesDDS; // domyślnie od DDS diff --git a/Globals.h b/Globals.h index e0a2bac6..5189f2bc 100644 --- a/Globals.h +++ b/Globals.h @@ -200,11 +200,7 @@ class Global static TGround *pGround; static std::string szDefaultExt; static std::string SceneryFile; - static char CreatorName1[20]; - static char CreatorName2[20]; - static char CreatorName3[20]; - static char CreatorName4[30]; - static char CreatorName5[30]; + static std::string AppName; static std::string asCurrentSceneryPath; static std::string asCurrentTexturePath; static std::string asCurrentDynamicPath; @@ -255,6 +251,7 @@ class Global static int iDynamicFiltering; // domyślne rozmywanie tekstur pojazdów static int iReCompile; // zwiększany, gdy trzeba odświeżyć siatki static bool bUseVBO; // czy jest VBO w karcie graficznej + static std::string LastGLError; static int iFeedbackMode; // tryb pracy informacji zwrotnej static int iFeedbackPort; // dodatkowy adres dla informacji zwrotnych static double fLuminance; // jasność światła do automatycznego zapalania diff --git a/World.cpp b/World.cpp index fda99799..83fcb66b 100644 --- a/World.cpp +++ b/World.cpp @@ -174,6 +174,8 @@ bool TWorld::Init( GLFWwindow *Window ) { Ground.Init(Global::SceneryFile); WriteLog( "Ground init OK" ); + glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii + Environment.init(); Camera.Init(Global::FreeCameraInit[0], Global::FreeCameraInitAngle[0]); @@ -195,6 +197,9 @@ bool TWorld::Init( GLFWwindow *Window ) { mvControlled = Controlled->ControlledFind()->MoverParameters; Global::pUserDynamic = Controlled; // renerowanie pojazdu względem kabiny WriteLog("Player train init OK"); + + glfwSetWindowTitle( window, ( Global::AppName + " (" + Controlled->MoverParameters->Name + " @ " + Global::SceneryFile + ")" ).c_str() ); + FollowView(); } else @@ -365,7 +370,41 @@ void TWorld::OnKeyDown(int cKey) } case GLFW_KEY_F5: { // przesiadka do innego pojazdu - Global::iTextMode = cKey; + if( false == FreeFlyModeFlag ) { + // only available in free fly mode + break; + } + + TDynamicObject *tmp = Ground.DynamicNearest( Camera.Pos, 50, true ); //łapiemy z obsadą + if( ( tmp != nullptr ) + && ( tmp != Controlled ) ) { + + if( Controlled ) // jeśli mielismy pojazd + if( Controlled->Mechanik ) // na skutek jakiegoś błędu może czasem zniknąć + Controlled->Mechanik->TakeControl( true ); // oddajemy dotychczasowy AI + + if( DebugModeFlag + || (tmp->MoverParameters->Vel <= 5.0) ) { + // works always in debug mode, or for stopped/slow moving vehicles otherwise + Controlled = tmp; // przejmujemy nowy + mvControlled = Controlled->ControlledFind()->MoverParameters; + if( Train ) + Train->Silence(); // wyciszenie dźwięków opuszczanego pojazdu + else + Train = new TTrain(); // jeśli niczym jeszcze nie jeździlismy + if( Train->Init( Controlled ) ) { // przejmujemy sterowanie + if( !DebugModeFlag ) // w DebugMode nadal prowadzi AI + Controlled->Mechanik->TakeControl( false ); + } + else + SafeDelete( Train ); // i nie ma czym sterować + // Global::pUserDynamic=Controlled; //renerowanie pojazdu względem kabiny + // Global::iTextMode=VK_F4; + if( Train ) + InOutKey(); // do kabiny + } + } +// Global::iTextMode = cKey; break; } case GLFW_KEY_F6: { @@ -605,6 +644,17 @@ void TWorld::InOutKey( bool const Near ) else FreeFlyModeFlag = true; // nadal poza kabiną } + // update window title to reflect the situation + glfwSetWindowTitle( + window, + ( Global::AppName + + " (" + + ( Controlled != nullptr ? + Controlled->MoverParameters->Name : + "" ) + + " @ " + + Global::SceneryFile + + ")" ).c_str() ); }; // places camera outside the controlled vehicle, or nearest if nothing is under control @@ -806,6 +856,11 @@ bool TWorld::Update() } // variable step simulation time routines + if( Global::changeDynObj ) { + // ABu zmiana pojazdu - przejście do innego + ChangeDynamic(); + } + if( Train != nullptr ) { TSubModel::iInstance = reinterpret_cast( Train->Dynamic() ); Train->Update( dt ); @@ -1369,6 +1424,7 @@ TWorld::Update_UI() { OutText3 = " -> " + Global::Bezogonkow( Controlled->Mechanik->NextStop(), true ); } } + break; } @@ -1379,151 +1435,168 @@ TWorld::Update_UI() { Ground.DynamicNearest( Camera.Pos ) : Controlled ); // w trybie latania lokalizujemy wg mapy - if( tmp == nullptr ) { break; } + if( tmp != nullptr ) { + // + // jeśli domyślny ekran po pierwszym naciśnięciu + OutText1 = "Vehicle name: " + tmp->MoverParameters->Name; - // jeśli domyślny ekran po pierwszym naciśnięciu - OutText1 = "Vehicle name: " + tmp->MoverParameters->Name; - - if( (tmp->Mechanik == nullptr) && (tmp->ctOwner) ) { - // for cars other than leading unit indicate the leader - OutText1 += ", owned by " + tmp->ctOwner->OwnerName(); - } - // informacja o sprzęgach - OutText1 += - " C0:" + - ( tmp->PrevConnected ? + if( ( tmp->Mechanik == nullptr ) && ( tmp->ctOwner ) ) { + // for cars other than leading unit indicate the leader + OutText1 += ", owned by " + tmp->ctOwner->OwnerName(); + } + // informacja o sprzęgach + OutText1 += + " C0:" + + ( tmp->PrevConnected ? tmp->PrevConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) : "none" ); - OutText1 += - " C1:" + - ( tmp->NextConnected ? + OutText1 += + " C1:" + + ( tmp->NextConnected ? tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) : "none" ); - OutText2 = "Damage status: " + tmp->MoverParameters->EngineDescription( 0 ); + OutText2 = "Damage status: " + tmp->MoverParameters->EngineDescription( 0 ); - OutText2 += "; Brake delay: "; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) - OutText2 += "G"; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) - OutText2 += "P"; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) - OutText2 += "R"; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) - OutText2 += "+Mg"; + OutText2 += "; Brake delay: "; + if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) + OutText2 += "G"; + if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) + OutText2 += "P"; + if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) + OutText2 += "R"; + if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) + OutText2 += "+Mg"; - OutText2 += ", BTP:" + to_string( tmp->MoverParameters->LoadFlag, 0 ); - { - OutText2 += - "; pant. " - + to_string( tmp->MoverParameters->PantPress, 2 ) - + ( tmp->MoverParameters->bPantKurek3 ? "MoverParameters->LocalBrakePosA, 2 ) - + "+" - + to_string( tmp->MoverParameters->AnPos, 2 ); - - OutText2 += - ", Ft:" - + to_string( tmp->MoverParameters->Ft * 0.001f, 0 ); - - OutText2 += - "; TC:" - + to_string( tmp->MoverParameters->TotalCurrent, 0 ); - OutText2 += - ", HV0:" - + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 1 ], 0 ) - + "@" - + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 0 ], 0 ); - OutText2 += - ", HV1:" - + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 1 ], 0 ) - + "@" - + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 0 ], 0 ); - - OutText3 = - "BP: " - + to_string( tmp->MoverParameters->BrakePress, 2 ) - + ", " - + to_string( tmp->MoverParameters->BrakeStatus, 0 ) - + ", PP: " - + to_string( tmp->MoverParameters->PipePress, 2 ) - + "/" - + to_string( tmp->MoverParameters->ScndPipePress, 2 ) - + "/" - + to_string( tmp->MoverParameters->EqvtPipePress, 2 ) - + ", BVP: " - + to_string( tmp->MoverParameters->Volume, 3 ) - + ", " - + to_string( tmp->MoverParameters->CntrlPipePress, 3 ) - + ", " - + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ) - + ", " - + to_string( tmp->MoverParameters->BrakeStatus, 0 ); - - if( tmp->MoverParameters->ManualBrakePos > 0 ) { - - OutText3 += ", manual brake on"; - } - - if( tmp->MoverParameters->LocalBrakePos > 0 ) { - - OutText3 += ", local brake on"; - } - else { - - OutText3 += ", local brake off"; - } - - if( tmp->Mechanik ) { - // o ile jest ktoś w środku - std::string flags = "bwaccmlshhhoibsgvdp; "; // flagi AI (definicja w Driver.h) - for( int i = 0, j = 1; i < 19; ++i, j <<= 1 ) - if( tmp->Mechanik->DrivigFlags() & j ) // jak bit ustawiony - flags[ i + 1 ] = std::toupper( flags[ i + 1 ] ); // ^= 0x20; // to zmiana na wielką literę - - OutText4 = flags; - - OutText4 += - "Driver: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) - + " ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) - + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ) - + " VSm=" + to_string( tmp->Mechanik->VelSignalLast, 0 ) - + " VLm=" + to_string( tmp->Mechanik->VelLimitLast, 0 ) - + " VRd=" + to_string( tmp->Mechanik->VelRoad, 0 ); - - if( ( tmp->Mechanik->VelNext == 0.0 ) - && ( tmp->Mechanik->eSignNext ) ) { - // jeśli ma zapamiętany event semafora, nazwa eventu semafora - OutText4 += - " (" - + Global::Bezogonkow( tmp->Mechanik->eSignNext->asName ) - + ")"; - } - - // biezaca komenda dla AI - OutText4 += ", command: " + tmp->Mechanik->OrderCurrent(); - } - - if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] != 0 ) { - // f2 screen, track scan mode - if( tmp->Mechanik == nullptr ) { - //żeby była tabelka, musi być AI - break; + OutText2 += ", BTP:" + to_string( tmp->MoverParameters->LoadFlag, 0 ); + { + OutText2 += + "; pant. " + + to_string( tmp->MoverParameters->PantPress, 2 ) + + ( tmp->MoverParameters->bPantKurek3 ? "Mechanik->TableText( i ); - if( scanline.empty() ) { break; } - UITable->text_lines.emplace_back( Global::Bezogonkow( scanline ), linecolor ); - ++i; - } while( i < 16 ); // TController:iSpeedTableSize TODO: change when the table gets recoded + OutText2 += + ", MED:" + + to_string( tmp->MoverParameters->LocalBrakePosA, 2 ) + + "+" + + to_string( tmp->MoverParameters->AnPos, 2 ); + + OutText2 += + ", Ft:" + + to_string( tmp->MoverParameters->Ft * 0.001f, 0 ); + + OutText2 += + "; TC:" + + to_string( tmp->MoverParameters->TotalCurrent, 0 ); + OutText2 += + ", HV0:" + + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 1 ], 0 ) + + "@" + + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 0 ], 0 ); + OutText2 += + ", HV1:" + + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 1 ], 0 ) + + "@" + + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 0 ], 0 ); + + OutText3 = + "BP: " + + to_string( tmp->MoverParameters->BrakePress, 2 ) + + ", " + + to_string( tmp->MoverParameters->BrakeStatus, 0 ) + + ", PP: " + + to_string( tmp->MoverParameters->PipePress, 2 ) + + "/" + + to_string( tmp->MoverParameters->ScndPipePress, 2 ) + + "/" + + to_string( tmp->MoverParameters->EqvtPipePress, 2 ) + + ", BVP: " + + to_string( tmp->MoverParameters->Volume, 3 ) + + ", " + + to_string( tmp->MoverParameters->CntrlPipePress, 3 ) + + ", " + + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ) + + ", " + + to_string( tmp->MoverParameters->BrakeStatus, 0 ); + + if( tmp->MoverParameters->ManualBrakePos > 0 ) { + + OutText3 += ", manual brake on"; + } + + if( tmp->MoverParameters->LocalBrakePos > 0 ) { + + OutText3 += ", local brake on"; + } + else { + + OutText3 += ", local brake off"; + } + + if( tmp->Mechanik ) { + // o ile jest ktoś w środku + std::string flags = "bwaccmlshhhoibsgvdp; "; // flagi AI (definicja w Driver.h) + for( int i = 0, j = 1; i < 19; ++i, j <<= 1 ) + if( tmp->Mechanik->DrivigFlags() & j ) // jak bit ustawiony + flags[ i + 1 ] = std::toupper( flags[ i + 1 ] ); // ^= 0x20; // to zmiana na wielką literę + + OutText4 = flags; + + OutText4 += + "Driver: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) + + " ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) + + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ) + + " VSm=" + to_string( tmp->Mechanik->VelSignalLast, 0 ) + + " VLm=" + to_string( tmp->Mechanik->VelLimitLast, 0 ) + + " VRd=" + to_string( tmp->Mechanik->VelRoad, 0 ); + + if( ( tmp->Mechanik->VelNext == 0.0 ) + && ( tmp->Mechanik->eSignNext ) ) { + // jeśli ma zapamiętany event semafora, nazwa eventu semafora + OutText4 += + " (" + + Global::Bezogonkow( tmp->Mechanik->eSignNext->asName ) + + ")"; + } + + // biezaca komenda dla AI + OutText4 += ", command: " + tmp->Mechanik->OrderCurrent(); + } + + if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] != 0 ) { + // f2 screen, track scan mode + if( tmp->Mechanik == nullptr ) { + //żeby była tabelka, musi być AI + break; + } + + float4 linecolor( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); + int i = 0; + do { + std::string scanline = tmp->Mechanik->TableText( i ); + if( scanline.empty() ) { break; } + UITable->text_lines.emplace_back( Global::Bezogonkow( scanline ), linecolor ); + ++i; + } while( i < 16 ); // TController:iSpeedTableSize TODO: change when the table gets recoded + } + } + else { + // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika + OutText1 = + "Camera position: " + + to_string( Camera.Pos.x, 2 ) + " " + + to_string( Camera.Pos.y, 2 ) + " " + + to_string( Camera.Pos.z, 2 ) + + ", azimuth: " + + to_string( 180.0 - RadToDeg( Camera.Yaw ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód + + " " + + std::string( "S SEE NEN NWW SW" ) + .substr( 0 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); + // current luminance level + OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); + if( Global::FakeLight ) { OutText2 += "(*)"; } } break; @@ -1626,14 +1699,15 @@ TWorld::Update_UI() { "VBO" : "Display Lists" ); + // dump last opengl error, if any GLenum glerror = glGetError(); if( glerror != GL_NO_ERROR ) { - // dump last opengl error, if any + Global::LastGLError = to_string( glerror ) + " (" + Global::Bezogonkow( (char *)gluErrorString( glerror ) ) + ")"; + } + if( false == Global::LastGLError.empty() ) { OutText3 = - "OpenGL error " - + to_string( glerror ) - + ": " - + Global::Bezogonkow( ( (char *)gluErrorString( glerror ) ) ); + "Last openGL error: " + + Global::LastGLError; } break; @@ -1642,6 +1716,7 @@ TWorld::Update_UI() { case( GLFW_KEY_F10 ) : { OutText1 = ( "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]." ); + break; } @@ -1655,284 +1730,149 @@ TWorld::Update_UI() { } default: { - // uncovered cases, nothing to do here + // uncovered cases, nothing to do here... + // ... unless we're in debug mode + if( DebugModeFlag && Controlled ) { + + OutText1 = + "vel: " + to_string(Controlled->GetVelocity(), 2) + " km/h" + + "; dist: " + to_string(Controlled->MoverParameters->DistCounter, 2) + " km" + + "; pos: (" + + to_string( Controlled->GetPosition().x, 2 ) + ", " + + to_string( Controlled->GetPosition().y, 2 ) + ", " + + to_string( Controlled->GetPosition().z, 2 ) + + ")"; + + OutText2 = + "HamZ=" + to_string( Controlled->MoverParameters->fBrakeCtrlPos, 1 ) + + "; HamP=" + std::to_string( mvControlled->LocalBrakePos ) + "/" + to_string( Controlled->MoverParameters->LocalBrakePosA, 2 ) + + "; NasJ=" + std::to_string( mvControlled->MainCtrlPos ) + "(" + std::to_string( mvControlled->MainCtrlActualPos ) + ")" + + "; NasB=" + std::to_string( mvControlled->ScndCtrlPos ) + "(" + std::to_string( mvControlled->ScndCtrlActualPos ) + ")" + + "; I=" + + ( mvControlled->TrainType == dt_EZT ? + std::to_string( int( mvControlled->ShowCurrent( 0 ) ) ): + std::to_string( int( mvControlled->Im ) ) ) + + "; U=" + to_string( int( mvControlled->RunningTraction.TractionVoltage + 0.5 ) ) + + "; R=" + + ( Controlled->MoverParameters->RunningShape.R > 100000.0 ? + "~0.0" : + to_string( Controlled->MoverParameters->RunningShape.R, 1 ) ) + + " An=" + to_string( Controlled->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne + + if( tprev != int( GlobalTime->mr ) ) { + tprev = GlobalTime->mr; + Acc = ( Controlled->MoverParameters->Vel - VelPrev ) / 3.6; + VelPrev = Controlled->MoverParameters->Vel; + } + OutText2 += ( "; As=" ) + to_string( Acc, 2 ); // przyspieszenie wzdłużne + + OutText3 = + "cyl.ham. " + to_string( Controlled->MoverParameters->BrakePress, 2 ) + + "; prz.gl. " + to_string( Controlled->MoverParameters->PipePress, 2 ) + + "; zb.gl. " + to_string( Controlled->MoverParameters->CompressedVolume, 2 ) + // youBy - drugi wezyk + + "; p.zas. " + to_string( Controlled->MoverParameters->ScndPipePress, 2 ); + + // McZapkie: warto wiedziec w jakim stanie sa przelaczniki + if( mvControlled->ConvOvldFlag ) + OutText3 += " C! "; + else if( mvControlled->FuseFlag ) + OutText3 += " F! "; + else if( !mvControlled->Mains ) + OutText3 += " () "; + else { + switch( + mvControlled->ActiveDir * + ( mvControlled->Imin == mvControlled->IminLo ? + 1 : + 2 ) ) { + case 2: { OutText3 += " >> "; break; } + case 1: { OutText3 += " -> "; break; } + case 0: { OutText3 += " -- "; break; } + case -1: { OutText3 += " <- "; break; } + case -2: { OutText3 += " << "; break; } + } + } + // McZapkie: predkosc szlakowa + if( Controlled->MoverParameters->RunningTrack.Velmax == -1 ) { + OutText3 += " Vtrack=Vmax"; + } + else { + OutText3 += " Vtrack " + to_string( Controlled->MoverParameters->RunningTrack.Velmax, 2 ); + } + + if( ( mvControlled->EnginePowerSource.SourceType == CurrentCollector ) + || ( mvControlled->TrainType == dt_EZT ) ) { + OutText3 += + "; pant. " + to_string( mvControlled->PantPress, 2 ) + + ( mvControlled->bPantKurek3 ? "=" : "^" ) + "ZG"; + } + + // McZapkie: komenda i jej parametry + if( Controlled->MoverParameters->CommandIn.Command != ( "" ) ) { + OutText4 = + "C:" + Controlled->MoverParameters->CommandIn.Command + + " V1=" + to_string( Controlled->MoverParameters->CommandIn.Value1, 0 ) + + " V2=" + to_string( Controlled->MoverParameters->CommandIn.Value2, 0 ); + } + if( ( Controlled->Mechanik ) + && ( Controlled->Mechanik->AIControllFlag == AIdriver ) ) { + OutText4 += + "AI: Vd=" + to_string( Controlled->Mechanik->VelDesired, 0 ) + + " ad=" + to_string( Controlled->Mechanik->AccDesired, 2 ) + + " Pd=" + to_string( Controlled->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( Controlled->Mechanik->VelNext, 0 ); + } + + // induction motor data + if( Controlled->MoverParameters->EngineType == ElectricInductionMotor ) { + + float4 linecolor( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); + + UITable->text_lines.emplace_back( " eimc: eimv: press:", linecolor ); + for( int i = 0; i <= 20; ++i ) { + + std::string parameters = + to_string(Controlled->MoverParameters->eimc[i], 2, 9) + + " " + to_string( Controlled->MoverParameters->eimv[ i ], 2, 9 ); + + if( i <= 10 ) { + parameters += " " + to_string( Train->fPress[ i ][ 0 ], 2, 9 ); + } + else if( i == 12 ) { + parameters += " med:"; + } + else if( i >= 13 ) { + parameters += " " + to_string( Controlled->MED[ 0 ][ i - 13 ], 2, 9 ); + } + + UITable->text_lines.emplace_back( parameters, linecolor ); + } + } + + } // if( DebugModeFlag && Controlled ) + break; } } +#ifdef EU07_USE_OLD_UI_CODE + if( Controlled && DebugModeFlag && !Global::iTextMode ) { - - - - - - if( DebugModeFlag && !Global::iTextMode ) { - OutText1 = "FPS: "; - OutText1 += to_string( Timer::GetFPS(), 2 ); - OutText1 += Global::iSlowMotion ? "(s)" : "(n)"; - - OutText1 += ( Timer::GetDeltaTime() >= 0.2 ) ? "!" : " "; - } - if( Global::changeDynObj ) { // ABu zmiana pojazdu - przejście do innego - // Ra: to nie może być tak robione, to zbytnia proteza jest - Train->Silence(); // wyłączenie dźwięków opuszczanej kabiny - if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść - if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony - { // jeśli prowadzi AI, to mu nie robimy dywersji! - Train->Dynamic()->MoverParameters->CabDeactivisation(); - Train->Dynamic()->Controller = AIdriver; - // Train->Dynamic()->MoverParameters->SecuritySystem.Status=0; //rozwala CA w EZT - Train->Dynamic()->MoverParameters->ActiveCab = 0; - Train->Dynamic()->MoverParameters->BrakeLevelSet( - Train->Dynamic()->MoverParameters->Handle->GetPos( - bh_NP ) ); //rozwala sterowanie hamulcem GF 04-2016 - Train->Dynamic()->MechInside = false; - } - TDynamicObject *temp = Global::changeDynObj; - Train->Dynamic()->bDisplayCab = false; - Train->Dynamic()->ABuSetModelShake( vector3( 0, 0, 0 ) ); - - // Train->Dynamic()->mdKabina=NULL; - if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść - if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony - Train->Dynamic()->Mechanik->MoveTo( temp ); // przsunięcie obiektu zarządzającego - // Train->DynamicObject=NULL; - Train->DynamicSet( temp ); - Controlled = temp; - mvControlled = Controlled->ControlledFind()->MoverParameters; - Global::asHumanCtrlVehicle = Train->Dynamic()->GetName(); - if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść - if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony - { - Train->Dynamic()->MoverParameters->LimPipePress = - Controlled->MoverParameters->PipePress; - Train->Dynamic() - ->MoverParameters->CabActivisation(); // załączenie rozrządu (wirtualne kabiny) - Train->Dynamic()->Controller = Humandriver; - Train->Dynamic()->MechInside = true; - } - Train->InitializeCab( Train->Dynamic()->MoverParameters->CabNo, - Train->Dynamic()->asBaseDir + - Train->Dynamic()->MoverParameters->TypeName + ".mmd" ); - if( !FreeFlyModeFlag ) { - Global::pUserDynamic = Controlled; // renerowanie względem kamery - Train->Dynamic()->bDisplayCab = true; - Train->Dynamic()->ABuSetModelShake( - vector3( 0, 0, 0 ) ); // zerowanie przesunięcia przed powrotem? - Train->MechStop(); - FollowView(); // na pozycję mecha - } - Global::changeDynObj = NULL; - } - - if( Controlled ) - glfwSetWindowTitle( window, Controlled->MoverParameters->Name.c_str() ); - else - glfwSetWindowTitle( window, Global::SceneryFile.c_str() ); // nazwa scenerii - - if( Global::iTextMode == GLFW_KEY_F5 ) { // przesiadka do innego pojazdu - if( FreeFlyModeFlag ) // jeśli tryb latania - { - TDynamicObject *tmp = Ground.DynamicNearest( Camera.Pos, 50, true ); //łapiemy z obsadą - if( tmp ) - if( tmp != Controlled ) { - if( Controlled ) // jeśli mielismy pojazd - if( Controlled->Mechanik ) // na skutek jakiegoś błędu może czasem zniknąć - Controlled->Mechanik->TakeControl( true ); // oddajemy dotychczasowy AI - if( DebugModeFlag ? true : tmp->MoverParameters->Vel <= 5.0 ) { - Controlled = tmp; // przejmujemy nowy - mvControlled = Controlled->ControlledFind()->MoverParameters; - if( Train ) - Train->Silence(); // wyciszenie dźwięków opuszczanego pojazdu - else - Train = new TTrain(); // jeśli niczym jeszcze nie jeździlismy - if( Train->Init( Controlled ) ) { // przejmujemy sterowanie - if( !DebugModeFlag ) // w DebugMode nadal prowadzi AI - Controlled->Mechanik->TakeControl( false ); - } - else - SafeDelete( Train ); // i nie ma czym sterować - // Global::pUserDynamic=Controlled; //renerowanie pojazdu względem kabiny - // Global::iTextMode=VK_F4; - if( Train ) - InOutKey(); // do kabiny - } - } - Global::iTextMode = 0; // tryb neutralny - } - } - else if( Controlled && DebugModeFlag && !Global::iTextMode ) { - OutText1 += ( "; vel " ) + to_string( Controlled->GetVelocity(), 2 ); - OutText1 += ( "; pos " ) + to_string( Controlled->GetPosition().x, 2 ); - OutText1 += ( " ; " ) + to_string( Controlled->GetPosition().y, 2 ); - OutText1 += ( " ; " ) + to_string( Controlled->GetPosition().z, 2 ); - OutText1 += ( "; dist=" ) + to_string( Controlled->MoverParameters->DistCounter, 4 ); - - // double a= acos( DotProduct(Normalize(Controlled->GetDirection()),vWorldFront)); - // OutText+= AnsiString("; angle ")+FloatToStrF(a/M_PI*180,ffFixed,6,2); OutText1 += ( "; d_omega " ) + to_string( Controlled->MoverParameters->dizel_engagedeltaomega, 3 ); - OutText2 = ( "HamZ=" ) + to_string( Controlled->MoverParameters->fBrakeCtrlPos, 1 ); - OutText2 += ( "; HamP=" ) + to_string( mvControlled->LocalBrakePos ); - OutText2 += ( "/" ) + to_string( Controlled->MoverParameters->LocalBrakePosA, 2 ); - // mvControlled->MainCtrlPos; - // if (mvControlled->MainCtrlPos<0) - // OutText2+= AnsiString("; nastawnik 0"); - // if (mvControlled->MainCtrlPos>iPozSzereg) - OutText2 += ( "; NasJ=" ) + to_string( mvControlled->MainCtrlPos ); - // else - // OutText2+= AnsiString("; nastawnik S") + mvControlled->MainCtrlPos; - OutText2 += ( "(" ) + to_string( mvControlled->MainCtrlActualPos ); - - OutText2 += ( "); NasB=" ) + to_string( mvControlled->ScndCtrlPos ); - OutText2 += ( "(" ) + to_string( mvControlled->ScndCtrlActualPos ); - if( mvControlled->TrainType == dt_EZT ) - OutText2 += ( "); I=" ) + to_string( int( mvControlled->ShowCurrent( 0 ) ) ); - else - OutText2 += ( "); I=" ) + to_string( int( mvControlled->Im ) ); - // OutText2+=AnsiString("; - // I2=")+FloatToStrF(Controlled->NextConnected->MoverParameters->Im,ffFixed,6,2); - OutText2 += ( "; U=" ) + - to_string( int( mvControlled->RunningTraction.TractionVoltage + 0.5 ) ); - // OutText2+=AnsiString("; rvent=")+FloatToStrF(mvControlled->RventRot,ffFixed,6,2); - OutText2 += ( "; R=" ) + - to_string( Controlled->MoverParameters->RunningShape.R, 1 ); - OutText2 += ( " An=" ) + to_string( Controlled->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne - if( tprev != int( GlobalTime->mr ) ) { - tprev = GlobalTime->mr; - Acc = ( Controlled->MoverParameters->Vel - VelPrev ) / 3.6; - VelPrev = Controlled->MoverParameters->Vel; - } - OutText2 += ( "; As=" ) + to_string( Acc/*Controlled->MoverParameters->AccS*/, 2 ); // przyspieszenie wzdłużne - // OutText2+=AnsiString("; P=")+FloatToStrF(mvControlled->EnginePower,ffFixed,6,1); - OutText3 += ( "cyl.ham. " ) + - to_string( Controlled->MoverParameters->BrakePress, 2 ); - OutText3 += ( "; prz.gl. " ) + - to_string( Controlled->MoverParameters->PipePress, 2 ); - OutText3 += ( "; zb.gl. " ) + - to_string( Controlled->MoverParameters->CompressedVolume, 2 ); - // youBy - drugi wezyk - OutText3 += ( "; p.zas. " ) + - to_string( Controlled->MoverParameters->ScndPipePress, 2 ); if( Controlled->MoverParameters->EngineType == ElectricInductionMotor ) { - // glTranslatef(0.0f,0.0f,-0.50f); - glColor3f( 1.0f, 1.0f, 1.0f ); // a, damy białym - for( int i = 0; i <= 20; i++ ) { - glRasterPos2f( -0.25f, 0.16f - 0.01f * i ); - if( Controlled->MoverParameters->eimc[ i ] < 10 ) - OutText4 = to_string( Controlled->MoverParameters->eimc[ i ], 3 ); - else - OutText4 = to_string( Controlled->MoverParameters->eimc[ i ], 3 ); -/* - glPrint( OutText4.c_str() ); -*/ - } - for( int i = 0; i <= 20; i++ ) { - glRasterPos2f( -0.2f, 0.16f - 0.01f * i ); - if( Controlled->MoverParameters->eimv[ i ] < 10 ) - OutText4 = to_string( Controlled->MoverParameters->eimv[ i ], 3 ); - else - OutText4 = to_string( Controlled->MoverParameters->eimv[ i ], 3 ); -/* - glPrint( OutText4.c_str() ); -*/ - } - for( int i = 0; i <= 10; i++ ) { - glRasterPos2f( -0.15f, 0.16f - 0.01f * i ); - OutText4 = to_string( Train->fPress[ i ][ 0 ], 3 ); -/* - glPrint( OutText4.c_str() ); -*/ - } - for( int i = 0; i <= 8; i++ ) { - glRasterPos2f( -0.15f, 0.04f - 0.01f * i ); - OutText4 = to_string( Controlled->MED[ 0 ][ i ], 3 ); -/* - glPrint( OutText4.c_str() ); -*/ - } + for( int i = 0; i <= 8; i++ ) { for( int j = 0; j <= 9; j++ ) { glRasterPos2f( 0.05f + 0.03f * i, 0.16f - 0.01f * j ); OutText4 = to_string( Train->fEIMParams[ i ][ j ], 2 ); -/* - glPrint( OutText4.c_str() ); -*/ } } - OutText4 = ""; - // glTranslatef(0.0f,0.0f,+0.50f); - glColor3f( 1.0f, 0.0f, 0.0f ); // a, damy czerwonym } - - // McZapkie: warto wiedziec w jakim stanie sa przelaczniki - if( mvControlled->ConvOvldFlag ) - OutText3 += " C! "; - else if( mvControlled->FuseFlag ) - OutText3 += " F! "; - else if( !mvControlled->Mains ) - OutText3 += " () "; - else - switch( mvControlled->ActiveDir * ( mvControlled->Imin == mvControlled->IminLo ? 1 : 2 ) ) { - case 2: - { - OutText3 += " >> "; - break; - } - case 1: - { - OutText3 += " -> "; - break; - } - case 0: - { - OutText3 += " -- "; - break; - } - case -1: - { - OutText3 += " <- "; - break; - } - case -2: - { - OutText3 += " << "; - break; - } - } - // McZapkie: predkosc szlakowa - if( Controlled->MoverParameters->RunningTrack.Velmax == -1 ) { - OutText3 += ( " Vtrack=Vmax" ); - } - else { - OutText3 += - ( " Vtrack " ) + - to_string( Controlled->MoverParameters->RunningTrack.Velmax, 2 ); - } - // WriteLog(Controlled->MoverParameters->TrainType.c_str()); - if( ( mvControlled->EnginePowerSource.SourceType == CurrentCollector ) || - ( mvControlled->TrainType == dt_EZT ) ) { - OutText3 += - ( "; pant. " ) + to_string( mvControlled->PantPress, 2 ); - OutText3 += ( mvControlled->bPantKurek3 ? "=ZG" : "|ZG" ); - } - // McZapkie: komenda i jej parametry - if( Controlled->MoverParameters->CommandIn.Command != ( "" ) ) - OutText4 = ( "C:" ) + - ( Controlled->MoverParameters->CommandIn.Command ) + - ( " V1=" ) + - to_string( Controlled->MoverParameters->CommandIn.Value1, 0 ) + - ( " V2=" ) + - to_string( Controlled->MoverParameters->CommandIn.Value2, 0 ); - if( Controlled->Mechanik && ( Controlled->Mechanik->AIControllFlag == AIdriver ) ) - OutText4 += - ( "AI: Vd=" ) + - to_string( Controlled->Mechanik->VelDesired, 0 ) + ( " ad=" ) + - to_string( Controlled->Mechanik->AccDesired, 2 ) + ( " Pd=" ) + - to_string( Controlled->Mechanik->ActualProximityDist, 0 ) + - ( " Vn=" ) + to_string( Controlled->Mechanik->VelNext, 0 ); } +#endif // update the ui header texts auto &headerdata = UIHeader->text_lines; @@ -2251,6 +2191,58 @@ void TWorld::CabChange(TDynamicObject *old, TDynamicObject *now) if (Train->Dynamic() == old) Global::changeDynObj = now; // uruchomienie protezy }; + +void TWorld::ChangeDynamic() { + + // Ra: to nie może być tak robione, to zbytnia proteza jest + Train->Silence(); // wyłączenie dźwięków opuszczanej kabiny + if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść + if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony + { // jeśli prowadzi AI, to mu nie robimy dywersji! + Train->Dynamic()->MoverParameters->CabDeactivisation(); + Train->Dynamic()->Controller = AIdriver; + // Train->Dynamic()->MoverParameters->SecuritySystem.Status=0; //rozwala CA w EZT + Train->Dynamic()->MoverParameters->ActiveCab = 0; + Train->Dynamic()->MoverParameters->BrakeLevelSet( + Train->Dynamic()->MoverParameters->Handle->GetPos( + bh_NP ) ); //rozwala sterowanie hamulcem GF 04-2016 + Train->Dynamic()->MechInside = false; + } + TDynamicObject *temp = Global::changeDynObj; + Train->Dynamic()->bDisplayCab = false; + Train->Dynamic()->ABuSetModelShake( vector3( 0, 0, 0 ) ); + + if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść + if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony + Train->Dynamic()->Mechanik->MoveTo( temp ); // przsunięcie obiektu zarządzającego + + Train->DynamicSet( temp ); + Controlled = temp; + mvControlled = Controlled->ControlledFind()->MoverParameters; + Global::asHumanCtrlVehicle = Train->Dynamic()->GetName(); + if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść + if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony + { + Train->Dynamic()->MoverParameters->LimPipePress = + Controlled->MoverParameters->PipePress; + Train->Dynamic() + ->MoverParameters->CabActivisation(); // załączenie rozrządu (wirtualne kabiny) + Train->Dynamic()->Controller = Humandriver; + Train->Dynamic()->MechInside = true; + } + Train->InitializeCab( Train->Dynamic()->MoverParameters->CabNo, + Train->Dynamic()->asBaseDir + + Train->Dynamic()->MoverParameters->TypeName + ".mmd" ); + if( !FreeFlyModeFlag ) { + Global::pUserDynamic = Controlled; // renerowanie względem kamery + Train->Dynamic()->bDisplayCab = true; + Train->Dynamic()->ABuSetModelShake( + vector3( 0, 0, 0 ) ); // zerowanie przesunięcia przed powrotem? + Train->MechStop(); + FollowView(); // na pozycję mecha + } + Global::changeDynObj = NULL; +} //--------------------------------------------------------------------------- void diff --git a/World.h b/World.h index 957d295f..4813f497 100644 --- a/World.h +++ b/World.h @@ -96,6 +96,8 @@ class TWorld void ModifyTGA(std::string const &dir = ""); void CreateE3D(std::string const &dir = "", bool dyn = false); void CabChange(TDynamicObject *old, TDynamicObject *now); + // handles vehicle change flag + void ChangeDynamic(); }; //--------------------------------------------------------------------------- diff --git a/maszyna.sln b/maszyna.sln index 4e726218..a12e6c85 100644 --- a/maszyna.sln +++ b/maszyna.sln @@ -7,12 +7,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "maszyna", "maszyna.vcxproj" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x64.ActiveCfg = Debug|x64 + {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x64.Build.0 = Debug|x64 {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x86.ActiveCfg = Debug|Win32 {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Debug|x86.Build.0 = Debug|Win32 + {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x64.ActiveCfg = Release|x64 + {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x64.Build.0 = Release|x64 {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x86.ActiveCfg = Release|Win32 {8E0232E5-1C67-442F-9E04-45ED2DDFC960}.Release|x86.Build.0 = Release|Win32 EndGlobalSection diff --git a/maszyna.vcxproj b/maszyna.vcxproj deleted file mode 100644 index 1658a871..00000000 --- a/maszyna.vcxproj +++ /dev/null @@ -1,226 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {8E0232E5-1C67-442F-9E04-45ED2DDFC960} - Win32Proj - - - - Application - true - v120_xp - - - Application - false - v120_xp - - - - - - - - - - - - - eu07++ - $(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\ - $(SolutionDir)bin\ - - - eu07++ - $(SolutionDir)tmp\$(PlatformShortName)-$(Configuration)\$(ProjectName)\ - $(SolutionDir)bin\ - false - - - - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - Level3 - ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/glm;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) - Use - true - false - true - - - MachineX86 - true - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/libpng/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories) - Windows - - - - - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreadedDLL - Level3 - ProgramDatabase - $(SolutionDir);$(SolutionDir)console;$(SolutionDir)mczapkie;$(SolutionDir)ref/glfw/include;$(SolutionDir)ref/glew/include;$(SolutionDir)ref/glm;$(SolutionDir)ref/libpng/include;$(SolutionDir)ref/python/include;%(AdditionalIncludeDirectories) - Use - true - - - MachineX86 - true - true - true - $(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glew/lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/$(PlatformShortName);$(SolutionDir)ref/libpng/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);%(AdditionalLibraryDirectories) - Windows - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/maszyna.vcxproj.user b/maszyna.vcxproj.user index b99aece4..760c128e 100644 --- a/maszyna.vcxproj.user +++ b/maszyna.vcxproj.user @@ -4,9 +4,18 @@ ..\..\Projects\maszyna WindowsLocalDebugger + + ..\..\Projects\maszyna + WindowsLocalDebugger + ..\..\Projects\maszyna WindowsLocalDebugger _NO_DEBUG_HEAP=1 + + ..\..\Projects\maszyna + WindowsLocalDebugger + _NO_DEBUG_HEAP=1 + \ No newline at end of file From 441b39ce5ff8c697df7ea802cab136f520341a76 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 16 Mar 2017 22:18:14 +0100 Subject: [PATCH 061/426] partial render code revert, oerlikon brakes fix, sound fixes --- AdvSound.cpp | 4 + AnimModel.cpp | 55 +++++- AnimModel.h | 11 +- DynObj.cpp | 380 ++++++++++++++++++++++---------------- DynObj.h | 14 +- EU07.cpp | 8 +- Ground.cpp | 9 +- McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 13 +- McZapkie/Oerlikon_ESt.cpp | 139 +++++++------- McZapkie/Oerlikon_ESt.h | 2 +- McZapkie/hamulce.cpp | 2 +- McZapkie/hamulce.h | 12 +- Model3d.cpp | 93 +--------- Model3d.h | 6 +- Track.cpp | 8 + Train.cpp | 7 +- World.cpp | 147 ++++++++------- World.h | 4 +- frustum.cpp | 9 +- lightarray.cpp | 2 +- renderer.cpp | 2 + renderer.h | 7 +- sky.cpp | 9 +- stars.cpp | 4 + uilayer.cpp | 7 - 26 files changed, 518 insertions(+), 437 deletions(-) diff --git a/AdvSound.cpp b/AdvSound.cpp index 63149449..7aefa52f 100644 --- a/AdvSound.cpp +++ b/AdvSound.cpp @@ -128,6 +128,10 @@ void TAdvancedSound::Update(bool ListenerInside, vector3 NewPosition) void TAdvancedSound::UpdateAF(double A, double F, bool ListenerInside, vector3 NewPosition) { // update, ale z amplituda i czestotliwoscia + if( State == ss_Off ) { + return; + } + if ((State == ss_Commencing) && (SoundCommencing.AM > 0)) { SoundShut.Stop(); // hunter-311211 diff --git a/AnimModel.cpp b/AnimModel.cpp index 0adca933..97e0f1ca 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -411,6 +411,13 @@ TAnimModel::TAnimModel() pModel = NULL; iNumLights = 0; fBlinkTimer = 0; +#ifdef EU07_USE_OLD_RENDERCODE + ReplacableSkinId[ 0 ] = 0; + ReplacableSkinId[ 1 ] = 0; + ReplacableSkinId[ 2 ] = 0; + ReplacableSkinId[ 3 ] = 0; + ReplacableSkinId[ 4 ] = 0; +#endif for (int i = 0; i < iMaxNumLights; i++) { LightsOn[i] = LightsOff[i] = NULL; // normalnie nie ma @@ -436,7 +443,28 @@ bool TAnimModel::Init(TModel3d *pNewModel) pModel = pNewModel; return (pModel != NULL); } - +#ifdef EU07_USE_OLD_RENDERCODE +bool TAnimModel::Init(std::string const &asName, std::string const &asReplacableTexture) +{ + if (asReplacableTexture.substr(0, 1) == + "*") // od gwiazdki zaczynają się teksty na wyświetlaczach + asText = asReplacableTexture.substr(1, asReplacableTexture.length() - 1); // zapamiętanie tekstu + else if (asReplacableTexture != "none") + ReplacableSkinId[1] = + GfxRenderer.GetTextureId( asReplacableTexture, "" ); + if( ( ReplacableSkinId[ 1 ] != 0 ) + && ( GfxRenderer.Texture( ReplacableSkinId[ 1 ] ).has_alpha ) ) { + // tekstura z kanałem alfa - nie renderować w cyklu nieprzezroczystych + iTexAlpha = 0x31310031; + } + else{ + // tekstura nieprzezroczysta - nie renderować w cyklu + iTexAlpha = 0x30300030; + } + // przezroczystych + return (Init(TModelsManager::GetModel(asName))); +} +#else bool TAnimModel::Init(std::string const &asName, std::string const &asReplacableTexture) { if (asReplacableTexture.substr(0, 1) == @@ -457,6 +485,7 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable // przezroczystych return (Init(TModelsManager::GetModel(asName))); } +#endif bool TAnimModel::Load(cParser *parser, bool ter) { // rozpoznanie wpisu modelu i ustawienie świateł @@ -624,6 +653,21 @@ void TAnimModel::RenderAlphaDL(vector3 pPosition, double fAngle) pModel->RenderAlpha(pPosition, fAngle, ReplacableSkinId, iTexAlpha); }; */ +#ifdef EU07_USE_OLD_RENDERCODE +int TAnimModel::Flags() +{ // informacja dla TGround, czy ma być w Render, RenderAlpha, czy RenderMixed + int i = pModel ? pModel->Flags() : 0; // pobranie flag całego modelu + if (ReplacableSkinId[1] > 0) // jeśli ma wymienną teksturę 0 + i |= (i & 0x01010001) * ((iTexAlpha & 1) ? 0x20 : 0x10); + // if (ReplacableSkinId[2]>0) //jeśli ma wymienną teksturę 1 + // i|=(i&0x02020002)*((iTexAlpha&1)?0x10:0x08); + // if (ReplacableSkinId[3]>0) //jeśli ma wymienną teksturę 2 + // i|=(i&0x04040004)*((iTexAlpha&1)?0x08:0x04); + // if (ReplacableSkinId[4]>0) //jeśli ma wymienną teksturę 3 + // i|=(i&0x08080008)*((iTexAlpha&1)?0x04:0x02); + return i; +}; +#else int TAnimModel::Flags() { // informacja dla TGround, czy ma być w Render, RenderAlpha, czy RenderMixed int i = pModel ? pModel->Flags() : 0; // pobranie flag całego modelu @@ -637,6 +681,7 @@ int TAnimModel::Flags() // i|=(i&0x08080008)*((iTexAlpha&1)?0x04:0x02); return i; }; +#endif //----------------------------------------------------------------------------- // 2011-03-16 cztery nowe funkcje renderowania z możliwością pochylania obiektów @@ -647,13 +692,21 @@ void TAnimModel::RenderDL(vector3 *vPosition) RaAnimate(); // jednorazowe przeliczenie animacji RaPrepare(); if( pModel ) // renderowanie rekurencyjne submodeli +#ifdef EU07_USE_OLD_RENDERCODE + pModel->Render(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); +#else GfxRenderer.Render( pModel, Material(), *vPosition, vAngle ); +#endif }; void TAnimModel::RenderAlphaDL(vector3 *vPosition) { RaPrepare(); if (pModel) // renderowanie rekurencyjne submodeli +#ifdef EU07_USE_OLD_RENDERCODE + pModel->RenderAlpha(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); +#else GfxRenderer.Render_Alpha( pModel, Material(), *vPosition, vAngle ); +#endif }; /* void TAnimModel::RenderVBO(vector3 *vPosition) diff --git a/AnimModel.h b/AnimModel.h index ab953b6a..cee8f562 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -139,10 +139,11 @@ class TAnimModel TSubModel *LightsOn[iMaxNumLights]; // Ra: te wskaźniki powinny być w ramach TModel3d TSubModel *LightsOff[iMaxNumLights]; vector3 vAngle; // bazowe obroty egzemplarza względem osi -/* +#ifdef EU07_USE_OLD_RENDERCODE int iTexAlpha; //żeby nie sprawdzać za każdym razem, dla 4 wymiennych tekstur -*/ +#else material_data m_materialdata; +#endif std::string asText; // tekst dla wyświetlacza znakowego TAnimAdvanced *pAdvanced; @@ -154,12 +155,14 @@ class TAnimModel void RaAnimate(); // przeliczenie animacji egzemplarza void RaPrepare(); // ustawienie animacji egzemplarza na wzorcu public: -/* +#ifdef EU07_USE_OLD_RENDERCODE texture_manager::size_type ReplacableSkinId[5]; // McZapkie-020802: zmienialne skory -*/ +#endif static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania +#ifndef EU07_USE_OLD_RENDERCODE inline material_data const *Material() const { return &m_materialdata; } +#endif TAnimModel(); ~TAnimModel(); diff --git a/DynObj.cpp b/DynObj.cpp index 52ad9c0e..3df9af0a 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1692,6 +1692,14 @@ TDynamicObject::TDynamicObject() //} mdModel = NULL; mdKabina = NULL; +#ifdef EU07_USE_OLD_RENDERCODE + ReplacableSkinID[ 0 ] = 0; + ReplacableSkinID[ 1 ] = 0; + ReplacableSkinID[ 2 ] = 0; + ReplacableSkinID[ 3 ] = 0; + ReplacableSkinID[ 4 ] = 0; + iAlpha = 0x30300030; // tak gdy tekstury wymienne nie mają przezroczystości +#endif // smWiazary[0]=smWiazary[1]=NULL; smWahacze[0] = smWahacze[1] = smWahacze[2] = smWahacze[3] = NULL; fWahaczeAmp = 0; @@ -3690,12 +3698,12 @@ void TDynamicObject::TurnOff() btMechanik1.TurnOff(); btMechanik2.TurnOff(); }; -/* +#ifdef EU07_USE_OLD_RENDERCODE void TDynamicObject::Render() { // rysowanie elementów nieprzezroczystych // youBy - sprawdzamy, czy jest sens renderowac - if (Global::pCamera->IsVisible(this)) + if (GfxRenderer.Visible(this)) { TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji // AnsiString asLoadName=""; @@ -3766,8 +3774,6 @@ void TDynamicObject::Render() mdModel->RaRender(ObjSqrDist, ReplacableSkinID, iAlpha); if (mdLoad) // renderowanie nieprzezroczystego ładunku mdLoad->RaRender(ObjSqrDist, ReplacableSkinID, iAlpha); - if (mdPrzedsionek) - mdPrzedsionek->RaRender(ObjSqrDist, ReplacableSkinID, iAlpha); } else { // wersja Display Lists @@ -3794,8 +3800,6 @@ void TDynamicObject::Render() mdModel->Render(ObjSqrDist, ReplacableSkinID, iAlpha); if (mdLoad) // renderowanie nieprzezroczystego ładunku mdLoad->Render(ObjSqrDist, ReplacableSkinID, iAlpha); - if (mdPrzedsionek) - mdPrzedsionek->Render(ObjSqrDist, ReplacableSkinID, iAlpha); } // Ra: czy ta kabina tu ma sens? @@ -3868,12 +3872,84 @@ void TDynamicObject::Render() TurnOff(); // przywrócenie domyślnych pozycji submodeli } // yB - koniec mieszania z grafika }; -*/ + +void TDynamicObject::RenderAlpha() +{ // rysowanie elementów półprzezroczystych + if (renderme) + { + TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji + double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition); + ABuLittleUpdate(ObjSqrDist); // ustawianie zmiennych submodeli dla wspólnego modelu + glPushMatrix(); + if (this == Global::pUserDynamic) + { // specjalne ustawienie, aby nie trzęsło + glPopMatrix(); // to trzeba zebrać przed wyściem + return; + glLoadIdentity(); // zacząć od macierzy jedynkowej + Global::pCamera->SetCabMatrix(vPosition); // specjalne ustawienie kamery + } + else + glTranslated(vPosition.x, vPosition.y, + vPosition.z); // standardowe przesunięcie względem początku scenerii + glMultMatrixd(mMatrix.getArray()); +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this + if (fShade > 0.0) + { // Ra: zmiana oswietlenia w tunelu, wykopie + GLfloat ambientLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; + GLfloat diffuseLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; + GLfloat specularLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; + // trochę problem z ambientem w wykopie... + for (int li = 0; li < 3; li++) + { + ambientLight[li] = Global::ambientDayLight[li] * fShade; + diffuseLight[li] = Global::diffuseDayLight[li] * fShade; + specularLight[li] = Global::specularDayLight[li] * fShade; + } + glLightfv(GL_LIGHT0, GL_AMBIENT, ambientLight); + glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseLight); + glLightfv(GL_LIGHT0, GL_SPECULAR, specularLight); + } +#endif + if (Global::bUseVBO) + { // wersja VBO + if (mdLowPolyInt) + if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) + mdLowPolyInt->RaRenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); + mdModel->RaRenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); + if (mdLoad) + mdLoad->RaRenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); + } + else + { // wersja Display Lists + if (mdLowPolyInt) + if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) + mdLowPolyInt->RenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); + mdModel->RenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); + if (mdLoad) + mdLoad->RenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); + } +#ifdef EU07_USE_OLD_LIGHTING_MODEL + // TODO: re-implement this + if (fShade != 0.0) // tylko jeśli było zmieniane + { // przywrócenie standardowego oświetlenia + glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); + glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); + glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); + } +#endif + glPopMatrix(); + if (btnOn) + TurnOff(); // przywrócenie domyślnych pozycji submodeli + } + return; +} // koniec renderalpha +#endif void TDynamicObject::RenderSounds() -{ // przeliczanie dźwięków, bo będzie - // słychać bez wyświetlania sektora z - // pojazdem +{ // przeliczanie dźwięków, bo będzie słychać bez wyświetlania sektora z pojazdem +// if( Global::iPause > 0 ) { return; } + // McZapkie-010302: ulepszony dzwiek silnika double freq; double vol = 0; @@ -3884,11 +3960,10 @@ void TDynamicObject::RenderSounds() if (MoverParameters->Power > 0) { - if ((rsSilnik.AM != 0) && ((MoverParameters->Mains) || (MoverParameters->EngineType == - DieselEngine))) // McZapkie-280503: - // zeby dla dumb - // dzialal silnik na - // jalowych obrotach + if ((rsSilnik.AM != 0) + && ((MoverParameters->Mains) + // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach + || (MoverParameters->EngineType == DieselEngine))) { if ((fabs(MoverParameters->enrot) > 0.01) || (MoverParameters->EngineType == Dumb)) //&& (MoverParameters->EnginePower>0.1)) @@ -4093,9 +4168,8 @@ void TDynamicObject::RenderSounds() sSmallCompressor.Update(MechInside, GetPosition()); // youBy - przenioslem, bo diesel tez moze miec turbo - if ((MoverParameters->MainCtrlPos) >= - (MoverParameters->TurboTest)) // hunter-250312: dlaczego zakomentowane? - // Ra: bo nie działało dobrze + if( (MoverParameters->TurboTest > 0) + && (MoverParameters->MainCtrlPos >= MoverParameters->TurboTest)) { // udawanie turbo: (6.66*(eng_vol-0.85)) if (eng_turbo > 6.66 * (enginevolume - 0.8) + 0.2 * dt) @@ -4238,86 +4312,6 @@ void TDynamicObject::RenderSounds() } */ }; -/* -void TDynamicObject::RenderAlpha() -{ // rysowanie elementów półprzezroczystych - if (renderme) - { - TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji - double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition); - ABuLittleUpdate(ObjSqrDist); // ustawianie zmiennych submodeli dla wspólnego modelu - glPushMatrix(); - if (this == Global::pUserDynamic) - { // specjalne ustawienie, aby nie trzęsło - if (Global::bSmudge) - { // jak smuga, to rysować po smudze - glPopMatrix(); // to trzeba zebrać przed wyściem - return; - } - glLoadIdentity(); // zacząć od macierzy jedynkowej - Global::pCamera->SetCabMatrix(vPosition); // specjalne ustawienie kamery - } - else - glTranslated(vPosition.x, vPosition.y, - vPosition.z); // standardowe przesunięcie względem początku scenerii - glMultMatrixd(mMatrix.getArray()); -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this - if (fShade > 0.0) - { // Ra: zmiana oswietlenia w tunelu, wykopie - GLfloat ambientLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat diffuseLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat specularLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - // trochę problem z ambientem w wykopie... - for (int li = 0; li < 3; li++) - { - ambientLight[li] = Global::ambientDayLight[li] * fShade; - diffuseLight[li] = Global::diffuseDayLight[li] * fShade; - specularLight[li] = Global::specularDayLight[li] * fShade; - } - glLightfv(GL_LIGHT0, GL_AMBIENT, ambientLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, specularLight); - } -#endif - if (Global::bUseVBO) - { // wersja VBO - if (mdLowPolyInt) - if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) - mdLowPolyInt->RaRenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - mdModel->RaRenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - if (mdLoad) - mdLoad->RaRenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - // if (mdPrzedsionek) //Ra: przedsionków tu wcześniej nie było - włączyć? - // mdPrzedsionek->RaRenderAlpha(ObjSqrDist,ReplacableSkinID,iAlpha); - } - else - { // wersja Display Lists - if (mdLowPolyInt) - if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) - mdLowPolyInt->RenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - mdModel->RenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - if (mdLoad) - mdLoad->RenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - // if (mdPrzedsionek) //Ra: przedsionków tu wcześniej nie było - włączyć? - // mdPrzedsionek->RenderAlpha(ObjSqrDist,ReplacableSkinID,iAlpha); - } -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this - if (fShade != 0.0) // tylko jeśli było zmieniane - { // przywrócenie standardowego oświetlenia - glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); - } -#endif - glPopMatrix(); - if (btnOn) - TurnOff(); // przywrócenie domyślnych pozycji submodeli - } - return; -} // koniec renderalpha -*/ // McZapkie-250202 // wczytywanie pliku z danymi multimedialnymi (dzwieki) @@ -4344,6 +4338,26 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, if( token == "models:") { // modele i podmodele +#ifdef EU07_USE_OLD_RENDERCODE + iMultiTex = 0; // czy jest wiele tekstur wymiennych? + parser.getTokens(); + parser >> asModel; + if( asModel[asModel.size() - 1] == '#' ) // Ra 2015-01: nie podoba mi siê to + { // model wymaga wielu tekstur wymiennych + iMultiTex = 1; + asModel.erase( asModel.length() - 1 ); + } + std::size_t i = asModel.find( ',' ); + if ( i != std::string::npos ) + { // Ra 2015-01: może szukać przecinka w nazwie modelu, a po przecinku była by liczba tekstur? + if (i < asModel.length()) + iMultiTex = asModel[i + 1] - '0'; + if (iMultiTex < 0) + iMultiTex = 0; + else if (iMultiTex > 1) + iMultiTex = 1; // na razie ustawiamy na 1 + } +#else m_materialdata.multi_textures = 0; // czy jest wiele tekstur wymiennych? parser.getTokens(); parser >> asModel; @@ -4354,86 +4368,80 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } std::size_t i = asModel.find( ',' ); if ( i != std::string::npos ) - { // Ra 2015-01: może szukać przecinka w - // nazwie modelu, a po przecinku była by - // liczba - // tekstur? + { // Ra 2015-01: może szukać przecinka w nazwie modelu, a po przecinku była by liczba tekstur? if (i < asModel.length()) m_materialdata.multi_textures = asModel[i + 1] - '0'; m_materialdata.multi_textures = clamp( m_materialdata.multi_textures, 0, 1 ); // na razie ustawiamy na 1 } +#endif asModel = BaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje // modele w dynamics/basedir Global::asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... mdModel = TModelsManager::GetModel(asModel, true); assert( mdModel != nullptr ); // TODO: handle this more gracefully than all going to shit if (ReplacableSkin != "none") +#ifdef EU07_USE_OLD_RENDERCODE { // tekstura wymienna jest raczej jedynie w "dynamic\" ReplacableSkin = Global::asCurrentTexturePath + ReplacableSkin; // skory tez z dynamic/... - std::string x = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie - if (!x.empty()) - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + "nowhere", "", 9 ); - /* - if ((i = ReplacableSkin.Pos("|")) > 0) // replacable dzielone - { - iMultiTex = -1; - ReplacableSkinID[-iMultiTex] = TTexturesManager::GetTextureID( - NULL, NULL, ReplacableSkin.SubString(1, i - 1).c_str(), - Global::iDynamicFiltering); - ReplacableSkin.Delete(1, i); // usunięcie razem z pionową kreską - ReplacableSkin = Global::asCurrentTexturePath + - ReplacableSkin; // odtworzenie początku ścieżki - // sprawdzić, ile jest i ustawić iMultiTex na liczbę podanych tekstur - if (!ReplacableSkin.IsEmpty()) - { // próba wycięcia drugiej nazwy - iMultiTex = -2; // skoro zostało coś po kresce, to są co najmniej dwie - if ((i = ReplacableSkin.Pos("|")) == 0) // gdy nie ma już kreski - ReplacableSkinID[-iMultiTex] = TTexturesManager::GetTextureID( - NULL, NULL, ReplacableSkin.SubString(1, i - 1).c_str(), - Global::iDynamicFiltering); - else - { // jak jest kreska, to wczytać drugą i próbować trzecią - ReplacableSkinID[-iMultiTex] = TTexturesManager::GetTextureID( - NULL, NULL, ReplacableSkin.SubString(1, i - 1).c_str(), - Global::iDynamicFiltering); - ReplacableSkin.Delete(1, i); // usunięcie razem z pionową kreską - ReplacableSkin = Global::asCurrentTexturePath + - ReplacableSkin; // odtworzenie początku ścieżki - if (!ReplacableSkin.IsEmpty()) - { // próba wycięcia trzeciej nazwy - iMultiTex = - -3; // skoro zostało coś po kresce, to są co najmniej trzy - if ((i = ReplacableSkin.Pos("|")) == 0) // gdy nie ma już kreski - ReplacableSkinID[-iMultiTex] = TTexturesManager::GetTextureID( - NULL, NULL, ReplacableSkin.SubString(1, i - 1).c_str(), - Global::iDynamicFiltering); - else - { // jak jest kreska, to wczytać trzecią i próbować czwartą - ReplacableSkinID[-iMultiTex] = TTexturesManager::GetTextureID( - NULL, NULL, ReplacableSkin.SubString(1, i - 1).c_str(), - Global::iDynamicFiltering); - ReplacableSkin.Delete(1, i); // usunięcie razem z pionową kreską - ReplacableSkin = Global::asCurrentTexturePath + - ReplacableSkin; // odtworzenie początku ścieżki - if (!ReplacableSkin.IsEmpty()) - { // próba wycięcia trzeciej nazwy - iMultiTex = -4; // skoro zostało coś po kresce, to są co - // najmniej cztery - ReplacableSkinID[-iMultiTex] = - TTexturesManager::GetTextureID( - NULL, NULL, - ReplacableSkin.SubString(1, i - 1).c_str(), - Global::iDynamicFiltering); - // więcej na razie nie zadziała, a u tak trzeba to do modeli - // przenieść - } - } + std::string x = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie + if (!x.empty()) + ReplacableSkinID[4] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + "nowhere", "", 9); + + if (iMultiTex > 0) + { // jeśli model ma 4 tekstury + ReplacableSkinID[1] = GfxRenderer.GetTextureId( + ReplacableSkin + ",1", "", Global::iDynamicFiltering); + if (ReplacableSkinID[1]) + { // pierwsza z zestawu znaleziona + ReplacableSkinID[2] = GfxRenderer.GetTextureId( + ReplacableSkin + ",2", "", Global::iDynamicFiltering); + if (ReplacableSkinID[2]) + { + iMultiTex = 2; // już są dwie + ReplacableSkinID[3] = GfxRenderer.GetTextureId( + ReplacableSkin + ",3", "", Global::iDynamicFiltering); + if (ReplacableSkinID[3]) + { + iMultiTex = 3; // a teraz nawet trzy + ReplacableSkinID[4] = GfxRenderer.GetTextureId( + ReplacableSkin + ",4", "", Global::iDynamicFiltering); + if (ReplacableSkinID[4]) + iMultiTex = 4; // jak są cztery, to blokujemy podmianę tekstury rozkładem } } } + else + { // zestaw nie zadziałał, próbujemy normanie + iMultiTex = 0; + ReplacableSkinID[1] = GfxRenderer.GetTextureId( + ReplacableSkin, "", Global::iDynamicFiltering); + } } - */ + else + ReplacableSkinID[1] = GfxRenderer.GetTextureId( + ReplacableSkin, "", Global::iDynamicFiltering); + if (GfxRenderer.Texture(ReplacableSkinID[1]).has_alpha) + iAlpha = 0x31310031; // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + else + iAlpha = 0x30300030; // wszystkie tekstury nieprzezroczyste - nie renderować w cyklu przezroczystych + if (ReplacableSkinID[2]) + if (GfxRenderer.Texture(ReplacableSkinID[2]).has_alpha) + iAlpha |= 0x02020002; // tekstura -2 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + if (ReplacableSkinID[3]) + if (GfxRenderer.Texture(ReplacableSkinID[3]).has_alpha) + iAlpha |= 0x04040004; // tekstura -3 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + if (ReplacableSkinID[4]) + if (GfxRenderer.Texture(ReplacableSkinID[4]).has_alpha) + iAlpha |= 0x08080008; // tekstura -4 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + } +#else + { // tekstura wymienna jest raczej jedynie w "dynamic\" + ReplacableSkin = Global::asCurrentTexturePath + ReplacableSkin; // skory tez z dynamic/... + std::string x = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie + if (!x.empty()) + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + "nowhere", "", 9 ); + if (m_materialdata.multi_textures > 0) { // jeśli model ma 4 tekstury m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( @@ -4482,6 +4490,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 4 ] ).has_alpha ) m_materialdata.textures_alpha |= 0x08080008; // tekstura -4 z kanałem alfa - nie renderować w cyklu nieprzezroczystych } +#endif if (!MoverParameters->LoadAccepted.empty()) // if (MoverParameters->LoadAccepted!=AnsiString("")); // && // MoverParameters->LoadType!=AnsiString("passengers")) @@ -5763,6 +5772,54 @@ std::string TDynamicObject::TextureTest(std::string const &name) return ""; // nie znaleziona }; +#ifdef EU07_USE_OLD_RENDERCODE +void TDynamicObject::DestinationSet(std::string to, std::string numer) +{ // ustawienie stacji + // docelowej oraz wymiennej + // tekstury 4, jeśli + // istnieje plik + // w zasadzie, to każdy wagon mógłby mieć inną stację docelową + // zwłaszcza w towarowych, pod kątem zautomatyzowania maewrów albo pracy górki + // ale to jeszcze potrwa, zanim będzie możliwe, na razie można wpisać stację z + // rozkładu + if (abs(iMultiTex) >= 4) + return; // jak są 4 tekstury wymienne, to nie zmieniać rozkładem + numer = Global::Bezogonkow(numer); + asDestination = to; + to = Global::Bezogonkow(to); // do szukania pliku obcinamy ogonki + std::string x = TextureTest(asBaseDir + numer + "@" + MoverParameters->TypeName); + if (!x.empty()) + { + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + return; + } + x = TextureTest(asBaseDir + numer ); + if (!x.empty()) + { + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + return; + } + if (to.empty()) + to = "nowhere"; + x = TextureTest(asBaseDir + to + "@" + MoverParameters->TypeName); // w pierwszej kolejności z nazwą FIZ/MMD + if (!x.empty()) + { + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + return; + } + x = TextureTest(asBaseDir + to); // na razie prymitywnie + if (!x.empty()) + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się + else + { + x = TextureTest(asBaseDir + "nowhere"); // jak nie znalazł dedykowanej, to niech daje nowhere + if (!x.empty()) + ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); + } + // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa + // tekstury nr 4 +}; +#else void TDynamicObject::DestinationSet(std::string to, std::string numer) { // ustawienie stacji docelowej oraz wymiennej tekstury 4, jeśli istnieje plik // w zasadzie, to każdy wagon mógłby mieć inną stację docelową @@ -5806,6 +5863,7 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa // tekstury nr 4 }; +#endif void TDynamicObject::OverheadTrack(float o) { // ewentualne wymuszanie jazdy diff --git a/DynObj.h b/DynObj.h index 357fc061..b0efde63 100644 --- a/DynObj.h +++ b/DynObj.h @@ -141,6 +141,7 @@ class TAnim //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- +#ifndef EU07_USE_OLD_RENDERCODE // parameters for the material object, as currently used by various simulator models struct material_data { @@ -152,6 +153,7 @@ struct material_data { ::SecureZeroMemory( replacable_skins, sizeof( replacable_skins ) ); } }; +#endif class TDynamicObject { // klasa pojazdu @@ -198,11 +200,15 @@ public: // modele składowe pojazdu float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) private: // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe +#ifndef EU07_USE_OLD_RENDERCODE material_data m_materialdata; +#endif public: +#ifndef EU07_USE_OLD_RENDERCODE inline material_data const *Material() const { return &m_materialdata; } +#endif // tymczasowo udostępnione do wyszukiwania drutu int iAnimType[ ANIM_TYPES ]; // 0-osie,1-drzwi,2-obracane,3-zderzaki,4-wózki,5-pantografy,6-tłoki private: @@ -415,11 +421,11 @@ public: // modele składowe pojazdu int iCabs; // maski bitowe modeli kabin TTrack *MyTrack; // McZapkie-030303: tor na ktorym stoi, ABu std::string asBaseDir; -/* +#ifdef EU07_USE_OLD_RENDERCODE texture_manager::size_type ReplacableSkinID[5]; // McZapkie:zmienialne nadwozie int iAlpha; // maska przezroczystości tekstur int iMultiTex; //<0 tekstury wskazane wpisem, >0 tekstury z przecinkami, =0 jedna -*/ +#endif int iOverheadMask; // maska przydzielana przez AI pojazdom posiadającym pantograf, aby wymuszały // jazdę bezprądową TTractionParam tmpTraction; @@ -438,10 +444,10 @@ public: // modele składowe pojazdu bool FastUpdate(double dt); void Move(double fDistance); void FastMove(double fDistance); -/* +#ifdef EU07_USE_OLD_RENDERCODE void Render(); void RenderAlpha(); -*/ +#endif void RenderSounds(); inline vector3 GetPosition() const { diff --git a/EU07.cpp b/EU07.cpp index f0fdb3c4..721b18cf 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -134,13 +134,13 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo } #endif case GLFW_KEY_ESCAPE: { - +/* if( ( DebugModeFlag ) //[Esc] pauzuje tylko bez Debugmode && ( Global::iPause == 0 ) ) { // but unpausing should work always break; } - +*/ if( Global::iPause & 1 ) // jeśli pauza startowa Global::iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować else if( !( Global::iMultiplayer & 2 ) ) // w multiplayerze pauza nie ma sensu @@ -277,7 +277,9 @@ int main(int argc, char *argv[]) glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); glfwWindowHint(GLFW_AUTO_ICONIFY, GLFW_FALSE); - glfwWindowHint(GLFW_SAMPLES, 1 << Global::iMultisampling); + if( Global::iMultisampling > 0 ) { + glfwWindowHint( GLFW_SAMPLES, 1 << Global::iMultisampling ); + } if (Global::bFullScreen) { diff --git a/Ground.cpp b/Ground.cpp index 44b0620b..f0c37d03 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2085,9 +2085,12 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) // if the vehicle has defined light source, it can (potentially) emit light, so add it to the light array */ if( ( tmp != nullptr ) - && ( tmp->DynamicObject->MoverParameters->SecuritySystem.SystemType != 0 ) ) { - // we check for presence of security system, as a way to determine whether the vehicle is a controllable engine - // NOTE: this isn't 100% precise, e.g. middle EZT module comes with security system, while it has no lights + && ( tmp->DynamicObject->MoverParameters->CategoryFlag == 1 ) // trains only + && ( ( tmp->DynamicObject->MoverParameters->SecuritySystem.SystemType != 0 ) + || ( tmp->DynamicObject->MoverParameters->SandCapacity > 0.0 ) ) ) { + // we check for presence of security system or sand load, as a way to determine whether the vehicle is a controllable engine + // NOTE: this isn't 100% precise, e.g. middle EZT module comes with security system, while it has no lights, and some engines + // don't have security systems fitted m_lights.insert( tmp->DynamicObject ); } diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index ee072da9..aa11d20b 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1127,6 +1127,7 @@ private: void LoadFIZ_Circuit( std::string const &Input ); void LoadFIZ_RList( std::string const &Input ); void LoadFIZ_DList( std::string const &Input ); + void LoadFIZ_FFList( std::string const &Input ); void LoadFIZ_LightsList( std::string const &Input ); void LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparameters, std::string const Prefix, std::string const &Input ); TPowerType LoadFIZ_PowerDecode( std::string const &Power ); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index eb65d3c8..a53b6c36 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2421,7 +2421,7 @@ bool TMoverParameters::DecBrakeLevelOld(void) bool TMoverParameters::IncLocalBrakeLevel(int CtrlSpeed) { bool IBL; - if ((LocalBrakePos < LocalBrakePosNo) /*and (BrakeCtrlPos<1)*/) + if ((LocalBrakePos < LocalBrakePosNo) /*and (BrakeCtrlPos<1)*/) { while ((LocalBrakePos < LocalBrakePosNo) && (CtrlSpeed > 0)) { @@ -6139,7 +6139,8 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) if( issection( "ffList:", inputline ) ) { startBPT = false; startFFLIST = true; LISTLINE = 0; - continue; + LoadFIZ_FFList( inputline ); + continue; } if( issection( "WWList:", inputline ) ) @@ -6324,7 +6325,8 @@ void TMoverParameters::LoadFIZ_Wheels( std::string const &line ) { void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { - BrakeValveDecode( extract_value( "BrakeValve", line ) ); + extract_value( BrakeValveParams, "BrakeValve", line, "" ); + BrakeValveDecode( BrakeValveParams ); BrakeSubsystemDecode(); extract_value( NBpA, "NBpA", line, "" ); @@ -6951,6 +6953,11 @@ void TMoverParameters::LoadFIZ_DList( std::string const &Input ) { extract_value( dizel_Mstand, "Mstand", Input, "" ); } +void TMoverParameters::LoadFIZ_FFList( std::string const &Input ) { + + extract_value( RlistSize, "Size", Input, "" ); +} + void TMoverParameters::LoadFIZ_LightsList( std::string const &Input ) { extract_value( LightsPosNo, "Size", Input, "" ); diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index eded5cf6..ef433d64 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -63,10 +63,12 @@ void TPrzekladnik::Update(double dt) if ( BCP > P() ) dV = -PFVd(BCP, 0, d2A(10), P()) * dt; - else if ( BCP < P() ) - dV = PFVa(BVP, BCP, d2A(10), P()) * dt; - else - dV = 0; + else { + if( BCP < P() ) + dV = PFVa( BVP, BCP, d2A( 10 ), P() ) * dt; + else + dV = 0; + } Next->Flow(dV); if (dV > 0) @@ -86,8 +88,8 @@ void TRapid::SetRapidParams(double mult, double size) } else { - DN = d2A(5); - DL = d2A(5); + DN = d2A(5.0); + DL = d2A(5.0); } } @@ -117,10 +119,10 @@ void TRapid::Update(double dt) else if ((BCP * RapidMult) < (P() * ActMult)) dV = PFVa(BVP, BCP, DN, P() * ActMult / RapidMult) * dt; else - dV = 0; + dV = 0.0; Next->Flow(dV); - if (dV > 0) + if (dV > 0.0) BrakeRes->Flow(-dV); } @@ -128,7 +130,7 @@ void TRapid::Update(double dt) void TPrzekCiagly::SetMult(double m) { - mult = m; + Mult = m; } void TPrzekCiagly::Update(double dt) @@ -137,15 +139,15 @@ void TPrzekCiagly::Update(double dt) double const BCP{ Next->P() }; double dV; - if ( BCP > (P() * mult)) - dV = -PFVd(BCP, 0, d2A(8), P() * mult) * dt; - else if (BCP < (P() * mult)) - dV = PFVa(BVP, BCP, d2A(8), P() * mult) * dt; + if ( BCP > (P() * Mult)) + dV = -PFVd(BCP, 0, d2A(8.0), P() * Mult) * dt; + else if (BCP < (P() * Mult)) + dV = PFVa(BVP, BCP, d2A(8.0), P() * Mult) * dt; else - dV = 0; + dV = 0.0; Next->Flow(dV); - if (dV > 0) + if (dV > 0.0) BrakeRes->Flow(-dV); } @@ -165,14 +167,14 @@ void TPrzek_PZZ::Update(double dt) double dV; if (BCP > Pgr) - dV = -PFVd(BCP, 0, d2A(8), Pgr) * dt; + dV = -PFVd(BCP, 0, d2A(8.0), Pgr) * dt; else if (BCP < Pgr) - dV = PFVa(BVP, BCP, d2A(8), Pgr) * dt; + dV = PFVa(BVP, BCP, d2A(8.0), Pgr) * dt; else - dV = 0; + dV = 0.0; Next->Flow(dV); - if (dV > 0) + if (dV > 0.0) BrakeRes->Flow(-dV); } @@ -188,11 +190,11 @@ void TPrzekED::Update(double dt) if (Next->P() > MaxP) { BrakeRes->Flow(dVol); - Next->Flow(PFVd(Next->P(), 0, d2A(10) * dt, MaxP)); + Next->Flow(PFVd(Next->P(), 0, d2A(10.0) * dt, MaxP)); } else Next->Flow(dVol); - dVol = 0; + dVol = 0.0; } // ------ OERLIKON EST NA BOGATO ------ @@ -216,15 +218,17 @@ double TNESt3::GetPF( double const PP, double const dt, double const Vel ) // pr // luzowanie if ((BrakeStatus & b_hld) == b_off) - dV = PF(0, BCP, Nozzles[dTO] * nastG + (1.0 - nastG) * Nozzles[dOO]) * dt * - (0.1 + 4.9 * std::min(0.2, BCP - ((CVP - 0.05 - VVP) * BVM + 0.1))); + dV = + PF(0.0, BCP, Nozzles[dTO] * nastG + (1.0 - nastG) * Nozzles[dOO]) + * dt * (0.1 + 4.9 * std::min(0.2, BCP - ((CVP - 0.05 - VVP) * BVM + 0.1))); else - dV = 0; + dV = 0.0; // BrakeCyl.Flow(-dV); Przekladniki[1]->Flow(-dV); if ( ((BrakeStatus & b_on) == b_on) && (Przekladniki[1]->P() * HBG300 < MaxBP) ) - dV = PF( BVP, BCP, Nozzles[dTN] * (nastG + 2.0 * (BCP < Podskok ? 1.0 : 0.0)) + Nozzles[dON] * (1 - nastG) ) - * dt * (0.1 + 4.9 * std::min( 0.2, (CVP - 0.05 - VVP) * BVM - BCP ) ); + dV = + PF( BVP, BCP, Nozzles[dTN] * (nastG + 2.0 * (BCP < Podskok ? 1.0 : 0.0)) + Nozzles[dON] * (1.0 - nastG) ) + * dt * (0.1 + 4.9 * std::min( 0.2, (CVP - 0.05 - VVP) * BVM - BCP ) ); else dV = 0; // BrakeCyl.Flow(-dV); @@ -236,30 +240,32 @@ double TNESt3::GetPF( double const PP, double const dt, double const Vel ) // pr Przekladniki[i]->Update(dt); if (typeid(*Przekladniki[i]) == typeid(TRapid)) { - RapidStatus = - (((BrakeDelayFlag & bdelay_R) == bdelay_R) && - ((abs(Vel) > 70) || ((RapidStatus) && (abs(Vel) > 50)) || (RapidStaly))); + RapidStatus = ( ( ( BrakeDelayFlag & bdelay_R ) == bdelay_R ) + && ( ( std::abs( Vel ) > 70.0 ) + || ( ( std::abs( Vel ) > 50.0 ) && ( RapidStatus ) ) + || ( RapidStaly ) ) ); Przekladniki[i]->SetRapidStatus(RapidStatus); } - else if (typeid(*Przekladniki[i]) == typeid(TPrzeciwposlizg)) + else if( typeid( *Przekladniki[i] ) == typeid( TPrzeciwposlizg ) ) Przekladniki[i]->SetPoslizg((BrakeStatus & b_asb) == b_asb); - else if (typeid(*Przekladniki[i]) == typeid(TPrzekED)) - if (Vel < -15) - Przekladniki[i]->SetP(0); + else if( typeid( *Przekladniki[ i ] ) == typeid( TPrzekED ) ) { + if( Vel < -15.0 ) + Przekladniki[ i ]->SetP( 0.0 ); else - Przekladniki[i]->SetP(MaxBP * 3); - else if (typeid(*Przekladniki[i]) == typeid(TPrzekCiagly)) + Przekladniki[ i ]->SetP( MaxBP * 3.0 ); + } + else if( typeid( *Przekladniki[i] ) == typeid( TPrzekCiagly ) ) Przekladniki[i]->SetMult(LoadC); - else if (typeid(*Przekladniki[i]) == typeid(TPrzek_PZZ)) + else if( typeid( *Przekladniki[i] ) == typeid( TPrzek_PZZ ) ) Przekladniki[i]->SetLBP(LBP); } // przeplyw testowy miedzypojemnosci dV = PF(MPP, VVP, BVs(BCP)) + PF(MPP, CVP, CVs(BCP)); - if ((MPP - 0.05 > BVP)) + if ((MPP - 0.05) > BVP) dV += PF(MPP - 0.05, BVP, Nozzles[dPT] * nastG + (1.0 - nastG) * Nozzles[dPO]); if (MPP > VVP) - dV += PF(MPP, VVP, d2A(5)); + dV += PF(MPP, VVP, d2A(5.0)); Miedzypoj->Flow(dV * dt * 0.15); // przeplyw ZS <-> PG @@ -270,10 +276,10 @@ double TNESt3::GetPF( double const PP, double const dt, double const Vel ) // pr dV1 += 0.98 * dV; // przeplyw ZP <-> MPJ - if (MPP - 0.05 > BVP) + if ((MPP - 0.05) > BVP) dV = PF(BVP, MPP - 0.05, Nozzles[dPT] * nastG + (1.0 - nastG) * Nozzles[dPO]) * dt; else - dV = 0; + dV = 0.0; BrakeRes->Flow(dV); dV1 += dV * 0.98; ValveRes->Flow(-0.02 * dV); @@ -303,21 +309,23 @@ void TNESt3::Init( double const PP, double const HPP, double const LPP, double c BrakeCyl->CreatePress(BP); BrakeRes->CreatePress(PP); CntrlRes = std::make_shared(); - CntrlRes->CreateCap(15); + CntrlRes->CreateCap(15.0); CntrlRes->CreatePress(HPP); - BrakeStatus = static_cast(BP > 1.0); + BrakeStatus = (BP > 1.0 ? 1 : 0); Miedzypoj = std::make_shared(); - Miedzypoj->CreateCap(5); + Miedzypoj->CreateCap(5.0); Miedzypoj->CreatePress(PP); BVM = 1.0 / (HPP - 0.05 - LPP) * MaxBP; BrakeDelayFlag = BDF; - if (!(typeid(*FM) == typeid(TDisk1) || typeid(*FM) == typeid(TDisk2))) // jesli zeliwo to schodz - RapidStaly = false; - else + Zamykajacy = false; + + if ( (typeid(*FM) == typeid(TDisk1)) || (typeid(*FM) == typeid(TDisk2)) ) // jesli zeliwo to schodz RapidStaly = true; + else + RapidStaly = false; } double TNESt3::GetCRP() @@ -339,19 +347,19 @@ void TNESt3::CheckState(double const BCP, double &dV1) // glowny przyrzad rozrza // sprawdzanie stanu // if ((BrakeStatus and 1)=1)and(BCP>0.25)then - if ((VVP + 0.01 + BCP / BVM < CVP - 0.05) && (Przys_blok)) + if (((VVP + 0.01 + BCP / BVM) < (CVP - 0.05)) && (Przys_blok)) BrakeStatus |= ( b_on | b_hld ); // hamowanie stopniowe; - else if (VVP - 0.01 + (BCP - 0.1) / BVM > CVP - 0.05) + else if ((VVP - 0.01 + (BCP - 0.1) / BVM) > (CVP - 0.05)) BrakeStatus &= ~( b_on | b_hld ); // luzowanie; - else if (VVP + BCP / BVM > CVP - 0.05) + else if ((VVP + BCP / BVM) > (CVP - 0.05)) BrakeStatus &= ~b_on; // zatrzymanie napelaniania; - else if ((VVP + (BCP - 0.1) / BVM < CVP - 0.05) && (BCP > 0.25)) // zatrzymanie luzowania + else if (((VVP + (BCP - 0.1) / BVM) < (CVP - 0.05)) && (BCP > 0.25)) // zatrzymanie luzowania BrakeStatus |= b_hld; if( ( BrakeStatus & b_hld ) == 0 ) SoundFlag |= sf_CylU; - if ((VVP + 0.10 < CVP) && (BCP < 0.25)) // poczatek hamowania + if (((VVP + 0.10) < CVP) && (BCP < 0.25)) // poczatek hamowania if (false == Przys_blok) { ValveRes->CreatePress(0.1 * VVP); @@ -362,7 +370,7 @@ void TNESt3::CheckState(double const BCP, double &dV1) // glowny przyrzad rozrza if (BCP > 0.5) Zamykajacy = true; - else if (VVP - 0.6 < MPP) + else if ((VVP - 0.6) < MPP) Zamykajacy = false; } @@ -375,7 +383,7 @@ void TNESt3::CheckReleaser(double const dt) // odluzniacz if ((BrakeStatus & b_rls) == b_rls) { CntrlRes->Flow(PF(CVP, 0, 0.02) * dt); - if ((CVP < VVP + 0.3) || (false == autom)) + if ((CVP < (VVP + 0.3)) || (false == autom)) BrakeStatus &= ~b_rls; } } @@ -386,9 +394,9 @@ double TNESt3::CVs(double const BP) // napelniacz sterujacego double const MPP{ Miedzypoj->P() }; // przeplyw ZS <-> PG - if (MPP < CVP - 0.17) - return 0; - else if (MPP > CVP - 0.08) + if (MPP < (CVP - 0.17)) + return 0.0; + else if (MPP > (CVP - 0.08)) return Nozzles[dSd]; else return Nozzles[dSm]; @@ -400,15 +408,16 @@ double TNESt3::BVs(double const BCP) // napelniacz pomocniczego double const MPP{ Miedzypoj->P() }; // przeplyw ZP <-> rozdzielacz - if (MPP < CVP - 0.3) + if (MPP < (CVP - 0.3)) return Nozzles[dP]; - else if (BCP < 0.5) - if ( true == Zamykajacy) - return Nozzles[dPm]; // 1.25 + else if( BCP < 0.5 ) { + if( true == Zamykajacy ) + return Nozzles[ dPm ]; // 1.25 else - return Nozzles[dPd]; + return Nozzles[ dPd ]; + } else - return 0; + return 0.0; } void TNESt3::PLC(double const mass) @@ -461,7 +470,7 @@ void TNESt3::SetSize( int const size, std::string const ¶ms ) // ustawianie } else { - Podskok = -1; + Podskok = -1.0; Przekladniki[1] = std::make_shared(); if (params.find("-s216") != std::string::npos) Przekladniki[1]->SetRapidParams(2, 16); @@ -489,9 +498,9 @@ void TNESt3::SetSize( int const size, std::string const ¶ms ) // ustawianie else autom = true; if ((params.find("HBG300") != std::string::npos)) - HBG300 = 1; + HBG300 = 1.0; else - HBG300 = 0; + HBG300 = 0.0; switch (size) { diff --git a/McZapkie/Oerlikon_ESt.h b/McZapkie/Oerlikon_ESt.h index 88b07d27..62a64cee 100644 --- a/McZapkie/Oerlikon_ESt.h +++ b/McZapkie/Oerlikon_ESt.h @@ -133,7 +133,7 @@ class TRapid : public TPrzekladnik { class TPrzekCiagly : public TPrzekladnik { private: - double mult = 0.0; + double Mult = 0.0; public: void SetMult(double m); diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index ef93c067..daab0a22 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -193,7 +193,7 @@ double TBrakeCyl::P() static double const cD = 1; static double const pD = VD - cD; - double VtoC = ( Cap > 0.0 ) ? Vol / Cap : 0.0; // stosunek cisnienia do objetosci. + double VtoC = ( Cap > 0.0 ? Vol / Cap : 0.0 ); // stosunek cisnienia do objetosci. // Added div/0 trap for vehicles with incomplete definitions (cars etc) // P:=VtoC; if (VtoC < VS) diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index 962b6a87..d9cb56da 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -137,10 +137,10 @@ static int const i_bcpno = 6; //klasa obejmujaca pojedyncze zbiorniki class TReservoir { - protected: - double Cap = 1.0; - double Vol = 0.0; - double dVol = 0.0; +protected: + double Cap{ 1.0 }; + double Vol{ 0.0 }; + double dVol{ 0.0 }; public: void CreateCap(double Capacity); @@ -500,7 +500,7 @@ class TDriverHandle { public: bool Time = false; bool TimeEP = false; - double Sounds[ 5 ]; //wielkosci przeplywow dla dzwiekow + double Sounds[ 5 ]; //wielkosci przeplywow dla dzwiekow virtual double GetPF(double i_bcp, double PP, double HP, double dt, double ep); virtual void Init(double Press); @@ -509,6 +509,8 @@ class TDriverHandle { virtual double GetSound(int i); virtual double GetPos(int i); virtual double GetEP(double pos); + + inline TDriverHandle() { ::SecureZeroMemory( Sounds, sizeof( Sounds ) ); } }; class TFV4a : public TDriverHandle { diff --git a/Model3d.cpp b/Model3d.cpp index 2e958381..829245de 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -2164,39 +2164,7 @@ void TModel3d::BreakHierarhy() Error("Not implemented yet :("); }; -/* -void TModel3d::Render(vector3 pPosition,double fAngle,GLuint -ReplacableSkinId,int iAlpha) -{ -// glColor3f(1.0f,1.0f,1.0f); -// glColor3f(0.0f,0.0f,0.0f); -glPushMatrix(); - -glTranslated(pPosition.x,pPosition.y,pPosition.z); -if (fAngle!=0) -glRotatef(fAngle,0,1,0); -/* -matrix4x4 Identity; -Identity.Identity(); - -matrix4x4 CurrentMatrix; -glGetdoublev(GL_MODELVIEW_MATRIX,CurrentMatrix.getArray()); -vector3 pos=vector3(0,0,0); -pos=CurrentMatrix*pos; -fSquareDist=SquareMagnitude(pos); -* / -fSquareDist=SquareMagnitude(pPosition-Global::GetCameraPosition()); - -#ifdef _DEBUG -if (Root) -Root->Render(ReplacableSkinId,iAlpha); -#else -Root->Render(ReplacableSkinId,iAlpha); -#endif -glPopMatrix(); -}; -*/ -/* +#ifdef EU07_USE_OLD_RENDERCODE void TModel3d::Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) { iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste @@ -2217,40 +2185,6 @@ void TModel3d::RenderAlpha(double fSquareDistance, texture_manager::size_type *R Root->RenderAlphaDL(); } }; -*/ -/* -void TModel3d::RaRender(vector3 pPosition,double fAngle,GLuint -*ReplacableSkinId,int -iAlpha) -{ -// glColor3f(1.0f,1.0f,1.0f); -// glColor3f(0.0f,0.0f,0.0f); -glPushMatrix(); //zapamiętanie matrycy przekształcenia -glTranslated(pPosition.x,pPosition.y,pPosition.z); -if (fAngle!=0) -glRotatef(fAngle,0,1,0); -/* -matrix4x4 Identity; -Identity.Identity(); - -matrix4x4 CurrentMatrix; -glGetdoublev(GL_MODELVIEW_MATRIX,CurrentMatrix.getArray()); -vector3 pos=vector3(0,0,0); -pos=CurrentMatrix*pos; -fSquareDist=SquareMagnitude(pos); -*/ -/* -fSquareDist=SquareMagnitude(pPosition-Global::GetCameraPosition()); //zmienna -globalna! -if (StartVBO()) -{//odwrócenie flag, aby wyłapać nieprzezroczyste -Root->ReplacableSet(ReplacableSkinId,iAlpha^0x0F0F000F); -Root->RaRender(); -EndVBO(); -} -glPopMatrix(); //przywrócenie ustawień przekształcenia -}; -*/ void TModel3d::RaRender(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // renderowanie specjalne, np. kabiny @@ -2282,30 +2216,10 @@ void TModel3d::RaRenderAlpha(double fSquareDistance, texture_manager::size_type } }; -/* -void TModel3d::RaRenderAlpha(vector3 pPosition,double fAngle,GLuint -*ReplacableSkinId,int -iAlpha) -{ -glPushMatrix(); -glTranslatef(pPosition.x,pPosition.y,pPosition.z); -if (fAngle!=0) -glRotatef(fAngle,0,1,0); -fSquareDist=SquareMagnitude(pPosition-Global::GetCameraPosition()); //zmienna -globalna! -if (StartVBO()) -{Root->ReplacableSet(ReplacableSkinId,iAlpha); -Root->RaRenderAlpha(); -EndVBO(); -} -glPopMatrix(); -}; -*/ - //----------------------------------------------------------------------------- // 2011-03-16 cztery nowe funkcje renderowania z możliwością pochylania obiektów //----------------------------------------------------------------------------- -/* + void TModel3d::Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // nieprzezroczyste, Display List glPushMatrix(); @@ -2340,7 +2254,7 @@ void TModel3d::RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager: Root->RenderAlphaDL(); glPopMatrix(); }; -*/ + void TModel3d::RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // nieprzezroczyste, VBO glPushMatrix(); @@ -2382,6 +2296,7 @@ void TModel3d::RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manage } glPopMatrix(); }; +#endif //----------------------------------------------------------------------------- // 2012-02 funkcje do tworzenia terenu z E3D diff --git a/Model3d.h b/Model3d.h index 753d8125..b82a6f50 100644 --- a/Model3d.h +++ b/Model3d.h @@ -360,19 +360,17 @@ public: void SaveToBinFile(char const *FileName); void BreakHierarhy(); // renderowanie specjalne -/* +#ifdef EU07_USE_OLD_RENDERCODE void Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); void RenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); -*/ void RaRender(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); void RaRenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); // trzy kąty obrotu -/* void Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); void RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); -*/ void RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); void RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); +#endif // inline int GetSubModelsCount() { return (SubModelsCount); }; int Flags() const { diff --git a/Track.cpp b/Track.cpp index 7a4d2427..c596acb8 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2645,7 +2645,11 @@ void TTrack::RenderDyn() #else for( auto dynamic : Dynamics ) { // sam sprawdza, czy VBO; zmienia kontekst VBO! +#ifdef EU07_USE_OLD_RENDERCODE + dynamic->Render(); +#else GfxRenderer.Render( dynamic ); +#endif } #endif }; @@ -2662,7 +2666,11 @@ void TTrack::RenderDynAlpha() #else for( auto dynamic : Dynamics ) { // sam sprawdza, czy VBO; zmienia kontekst VBO! +#ifdef EU07_USE_OLD_RENDERCODE + dynamic->RenderAlpha(); +#else GfxRenderer.Render_Alpha( dynamic ); +#endif } #endif }; diff --git a/Train.cpp b/Train.cpp index 023adfd4..db3698c5 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2685,10 +2685,9 @@ bool TTrain::Update( double const Deltatime ) iSekunda=floor(GlobalTime->mr); } */ - // Ra 2014-09: napięcia i prądy muszą być ustalone najpierw, bo wysyłane są - // ewentualnie na - // PoKeys - if ((mvControlled->EngineType != DieselElectric) && (mvControlled->EngineType != ElectricInductionMotor)) // Ra 2014-09: czy taki rozdzia? ma sens? + // Ra 2014-09: napięcia i prądy muszą być ustalone najpierw, bo wysyłane są ewentualnie na PoKeys + if ((mvControlled->EngineType != DieselElectric) + && (mvControlled->EngineType != ElectricInductionMotor)) // Ra 2014-09: czy taki rozdzia? ma sens? fHVoltage = mvControlled->RunningTraction.TractionVoltage; // Winger czy to nie jest zle? // *mvControlled->Mains); else diff --git a/World.cpp b/World.cpp index 83fcb66b..536ac923 100644 --- a/World.cpp +++ b/World.cpp @@ -769,6 +769,7 @@ bool TWorld::Update() // poprzednie jakoś tam działało // fixed step, simulation time based updates + double dt = Timer::GetDeltaTime(); // 0.0 gdy pauza /* fTimeBuffer += dt; //[s] dodanie czasu od poprzedniej ramki @@ -834,6 +835,7 @@ bool TWorld::Update() } */ // secondary fixed step simulation time routines + while( m_secondaryupdateaccumulator >= m_secondaryupdaterate ) { Global::tranTexts.Update(); // obiekt obsługujący stenogramy dźwięków na ekranie @@ -856,6 +858,7 @@ bool TWorld::Update() } // variable step simulation time routines + if( Global::changeDynObj ) { // ABu zmiana pojazdu - przejście do innego ChangeDynamic(); @@ -874,9 +877,11 @@ bool TWorld::Update() Ground.Update_Lights(); // render time routines follow: + dt = Timer::GetDeltaRenderTime(); // nie uwzględnia pauzowania ani mnożenia czasu // fixed step render time routines + fTime50Hz += dt; // w pauzie też trzeba zliczać czas, bo przy dużym FPS będzie problem z odczytem ramek while( fTime50Hz >= 1.0 / 50.0 ) { Console::Update(); // to i tak trzeba wywoływać @@ -884,9 +889,10 @@ bool TWorld::Update() } // variable step render time routines - Update_Camera( dt ); // TODO: move the fixed step cab camera updates to fixed step secondary routines section - Update_UI(); + Update_Camera( dt ); + + Update_UI(); // TBD, TODO: move the ui updates to secondary fixed step routines, to reduce workload? GfxRenderer.Update( dt ); ResourceSweep(); @@ -1376,8 +1382,13 @@ TWorld::Render_Cab() { else { */ // renderowanie z Display List +#ifdef EU07_USE_OLD_RENDERCODE + dynamic->mdKabina->Render( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); + dynamic->mdKabina->RenderAlpha( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); +#else GfxRenderer.Render( dynamic->mdKabina, dynamic->Material(), 0.0 ); GfxRenderer.Render_Alpha( dynamic->mdKabina, dynamic->Material(), 0.0 ); +#endif /* } */ @@ -1501,24 +1512,16 @@ TWorld::Update_UI() { + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 0 ], 0 ); OutText3 = - "BP: " - + to_string( tmp->MoverParameters->BrakePress, 2 ) - + ", " - + to_string( tmp->MoverParameters->BrakeStatus, 0 ) - + ", PP: " - + to_string( tmp->MoverParameters->PipePress, 2 ) - + "/" - + to_string( tmp->MoverParameters->ScndPipePress, 2 ) - + "/" - + to_string( tmp->MoverParameters->EqvtPipePress, 2 ) - + ", BVP: " - + to_string( tmp->MoverParameters->Volume, 3 ) - + ", " - + to_string( tmp->MoverParameters->CntrlPipePress, 3 ) - + ", " - + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ) - + ", " - + to_string( tmp->MoverParameters->BrakeStatus, 0 ); + "BP: " + to_string( tmp->MoverParameters->BrakePress, 2 ) + + " (" + to_string( tmp->MoverParameters->BrakeStatus, 0 ) + + "), LBP: " + to_string( tmp->MoverParameters->LocBrakePress, 2 ) + + ", PP: " + to_string( tmp->MoverParameters->PipePress, 2 ) + + "/" + to_string( tmp->MoverParameters->ScndPipePress, 2 ) + + "/" + to_string( tmp->MoverParameters->EqvtPipePress, 2 ) + + ", BVP: " + to_string( tmp->MoverParameters->Volume, 3 ) + + ", " + to_string( tmp->MoverParameters->CntrlPipePress, 3 ) + + ", " + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ) + + ", " + to_string( tmp->MoverParameters->BrakeStatus, 0 ); if( tmp->MoverParameters->ManualBrakePos > 0 ) { @@ -1732,58 +1735,66 @@ TWorld::Update_UI() { default: { // uncovered cases, nothing to do here... // ... unless we're in debug mode - if( DebugModeFlag && Controlled ) { + if( DebugModeFlag ) { + + TDynamicObject *tmp = + ( FreeFlyModeFlag ? + Ground.DynamicNearest( Camera.Pos ) : + Controlled ); // w trybie latania lokalizujemy wg mapy + if( tmp == nullptr ) { + break; + } OutText1 = - "vel: " + to_string(Controlled->GetVelocity(), 2) + " km/h" - + "; dist: " + to_string(Controlled->MoverParameters->DistCounter, 2) + " km" + "vel: " + to_string(tmp->GetVelocity(), 2) + " km/h" + + "; dist: " + to_string(tmp->MoverParameters->DistCounter, 2) + " km" + "; pos: (" - + to_string( Controlled->GetPosition().x, 2 ) + ", " - + to_string( Controlled->GetPosition().y, 2 ) + ", " - + to_string( Controlled->GetPosition().z, 2 ) + + to_string( tmp->GetPosition().x, 2 ) + ", " + + to_string( tmp->GetPosition().y, 2 ) + ", " + + to_string( tmp->GetPosition().z, 2 ) + ")"; OutText2 = - "HamZ=" + to_string( Controlled->MoverParameters->fBrakeCtrlPos, 1 ) - + "; HamP=" + std::to_string( mvControlled->LocalBrakePos ) + "/" + to_string( Controlled->MoverParameters->LocalBrakePosA, 2 ) - + "; NasJ=" + std::to_string( mvControlled->MainCtrlPos ) + "(" + std::to_string( mvControlled->MainCtrlActualPos ) + ")" - + "; NasB=" + std::to_string( mvControlled->ScndCtrlPos ) + "(" + std::to_string( mvControlled->ScndCtrlActualPos ) + ")" + "HamZ=" + to_string( tmp->MoverParameters->fBrakeCtrlPos, 1 ) + + "; HamP=" + std::to_string( tmp->MoverParameters->LocalBrakePos ) + "/" + to_string( tmp->MoverParameters->LocalBrakePosA, 2 ) + + "; NasJ=" + std::to_string( tmp->MoverParameters->MainCtrlPos ) + "(" + std::to_string( tmp->MoverParameters->MainCtrlActualPos ) + ")" + + "; NasB=" + std::to_string( tmp->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( tmp->MoverParameters->ScndCtrlActualPos ) + ")" + "; I=" + - ( mvControlled->TrainType == dt_EZT ? - std::to_string( int( mvControlled->ShowCurrent( 0 ) ) ): - std::to_string( int( mvControlled->Im ) ) ) - + "; U=" + to_string( int( mvControlled->RunningTraction.TractionVoltage + 0.5 ) ) + ( tmp->MoverParameters->TrainType == dt_EZT ? + std::to_string( int( tmp->MoverParameters->ShowCurrent( 0 ) ) ) : + std::to_string( int( tmp->MoverParameters->Im ) ) ) + + "; U=" + to_string( int( tmp->MoverParameters->RunningTraction.TractionVoltage + 0.5 ) ) + "; R=" + - ( Controlled->MoverParameters->RunningShape.R > 100000.0 ? + ( tmp->MoverParameters->RunningShape.R > 100000.0 ? "~0.0" : - to_string( Controlled->MoverParameters->RunningShape.R, 1 ) ) - + " An=" + to_string( Controlled->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne + to_string( tmp->MoverParameters->RunningShape.R, 1 ) ) + + " An=" + to_string( tmp->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne if( tprev != int( GlobalTime->mr ) ) { tprev = GlobalTime->mr; - Acc = ( Controlled->MoverParameters->Vel - VelPrev ) / 3.6; - VelPrev = Controlled->MoverParameters->Vel; + Acc = ( tmp->MoverParameters->Vel - VelPrev ) / 3.6; + VelPrev = tmp->MoverParameters->Vel; } OutText2 += ( "; As=" ) + to_string( Acc, 2 ); // przyspieszenie wzdłużne OutText3 = - "cyl.ham. " + to_string( Controlled->MoverParameters->BrakePress, 2 ) - + "; prz.gl. " + to_string( Controlled->MoverParameters->PipePress, 2 ) - + "; zb.gl. " + to_string( Controlled->MoverParameters->CompressedVolume, 2 ) + "cyl.ham. " + to_string( tmp->MoverParameters->BrakePress, 2 ) + + "; prz.gl. " + to_string( tmp->MoverParameters->PipePress, 2 ) + + "; zb.gl. " + to_string( tmp->MoverParameters->CompressedVolume, 2 ) // youBy - drugi wezyk - + "; p.zas. " + to_string( Controlled->MoverParameters->ScndPipePress, 2 ); + + "; p.zas. " + to_string( tmp->MoverParameters->ScndPipePress, 2 ); // McZapkie: warto wiedziec w jakim stanie sa przelaczniki - if( mvControlled->ConvOvldFlag ) + if( tmp->MoverParameters->ConvOvldFlag ) OutText3 += " C! "; - else if( mvControlled->FuseFlag ) + else if( tmp->MoverParameters->FuseFlag ) OutText3 += " F! "; - else if( !mvControlled->Mains ) + else if( !tmp->MoverParameters->Mains ) OutText3 += " () "; else { switch( - mvControlled->ActiveDir * - ( mvControlled->Imin == mvControlled->IminLo ? + tmp->MoverParameters->ActiveDir * + ( tmp->MoverParameters->Imin == tmp->MoverParameters->IminLo ? 1 : 2 ) ) { case 2: { OutText3 += " >> "; break; } @@ -1794,38 +1805,38 @@ TWorld::Update_UI() { } } // McZapkie: predkosc szlakowa - if( Controlled->MoverParameters->RunningTrack.Velmax == -1 ) { + if( tmp->MoverParameters->RunningTrack.Velmax == -1 ) { OutText3 += " Vtrack=Vmax"; } else { - OutText3 += " Vtrack " + to_string( Controlled->MoverParameters->RunningTrack.Velmax, 2 ); + OutText3 += " Vtrack " + to_string( tmp->MoverParameters->RunningTrack.Velmax, 2 ); } - if( ( mvControlled->EnginePowerSource.SourceType == CurrentCollector ) - || ( mvControlled->TrainType == dt_EZT ) ) { + if( ( tmp->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) + || ( tmp->MoverParameters->TrainType == dt_EZT ) ) { OutText3 += - "; pant. " + to_string( mvControlled->PantPress, 2 ) - + ( mvControlled->bPantKurek3 ? "=" : "^" ) + "ZG"; + "; pant. " + to_string( tmp->MoverParameters->PantPress, 2 ) + + ( tmp->MoverParameters->bPantKurek3 ? "=" : "^" ) + "ZG"; } // McZapkie: komenda i jej parametry - if( Controlled->MoverParameters->CommandIn.Command != ( "" ) ) { + if( tmp->MoverParameters->CommandIn.Command != ( "" ) ) { OutText4 = - "C:" + Controlled->MoverParameters->CommandIn.Command - + " V1=" + to_string( Controlled->MoverParameters->CommandIn.Value1, 0 ) - + " V2=" + to_string( Controlled->MoverParameters->CommandIn.Value2, 0 ); + "C:" + tmp->MoverParameters->CommandIn.Command + + " V1=" + to_string( tmp->MoverParameters->CommandIn.Value1, 0 ) + + " V2=" + to_string( tmp->MoverParameters->CommandIn.Value2, 0 ); } - if( ( Controlled->Mechanik ) - && ( Controlled->Mechanik->AIControllFlag == AIdriver ) ) { + if( ( tmp->Mechanik ) + && ( tmp->Mechanik->AIControllFlag == AIdriver ) ) { OutText4 += - "AI: Vd=" + to_string( Controlled->Mechanik->VelDesired, 0 ) - + " ad=" + to_string( Controlled->Mechanik->AccDesired, 2 ) - + " Pd=" + to_string( Controlled->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( Controlled->Mechanik->VelNext, 0 ); + "AI: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) + + " ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) + + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ); } // induction motor data - if( Controlled->MoverParameters->EngineType == ElectricInductionMotor ) { + if( tmp->MoverParameters->EngineType == ElectricInductionMotor ) { float4 linecolor( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); @@ -1833,8 +1844,8 @@ TWorld::Update_UI() { for( int i = 0; i <= 20; ++i ) { std::string parameters = - to_string(Controlled->MoverParameters->eimc[i], 2, 9) - + " " + to_string( Controlled->MoverParameters->eimv[ i ], 2, 9 ); + to_string(tmp->MoverParameters->eimc[i], 2, 9) + + " " + to_string( tmp->MoverParameters->eimv[ i ], 2, 9 ); if( i <= 10 ) { parameters += " " + to_string( Train->fPress[ i ][ 0 ], 2, 9 ); @@ -1843,7 +1854,7 @@ TWorld::Update_UI() { parameters += " med:"; } else if( i >= 13 ) { - parameters += " " + to_string( Controlled->MED[ 0 ][ i - 13 ], 2, 9 ); + parameters += " " + to_string( tmp->MED[ 0 ][ i - 13 ], 2, 9 ); } UITable->text_lines.emplace_back( parameters, linecolor ); diff --git a/World.h b/World.h index 4813f497..551f8fed 100644 --- a/World.h +++ b/World.h @@ -84,9 +84,9 @@ class TWorld double fTimeBuffer; // bufor czasu aktualizacji dla stałego kroku fizyki double fMaxDt; //[s] krok czasowy fizyki (0.01 dla normalnych warunków) double m_primaryupdaterate{ 1.0 / 100.0 }; - double m_primaryupdateaccumulator{ 0.0 }; // keeps track of elapsed simulation time, for core fixed step routines double m_secondaryupdaterate{ 1.0 / 50.0 }; - double m_secondaryupdateaccumulator{ 0.0 }; // keeps track of elapsed simulation time, for less important fixed step routines + double m_primaryupdateaccumulator{ m_secondaryupdaterate }; // keeps track of elapsed simulation time, for core fixed step routines + double m_secondaryupdateaccumulator{ m_secondaryupdaterate }; // keeps track of elapsed simulation time, for less important fixed step routines int iPause; // wykrywanie zmian w zapauzowaniu double VelPrev; // poprzednia prędkość int tprev; // poprzedni czas diff --git a/frustum.cpp b/frustum.cpp index 967e037c..d9a9f3ad 100644 --- a/frustum.cpp +++ b/frustum.cpp @@ -12,17 +12,10 @@ http://mozilla.org/MPL/2.0/. void cFrustum::calculate( glm::mat4 &Projection, glm::mat4 &Modelview ) { -/* - float proj[ 16 ]; - float modl[ 16 ]; -*/ + float *proj = &Projection[ 0 ][ 0 ]; float *modl = &Modelview[ 0 ][ 0 ]; float clip[ 16 ]; -/* - glGetFloatv( GL_PROJECTION_MATRIX, proj ); - glGetFloatv( GL_MODELVIEW_MATRIX, modl ); -*/ // multiply the matrices to retrieve clipping planes clip[ 0 ] = modl[ 0 ] * proj[ 0 ] + modl[ 1 ] * proj[ 4 ] + modl[ 2 ] * proj[ 8 ] + modl[ 3 ] * proj[ 12 ]; diff --git a/lightarray.cpp b/lightarray.cpp index 3e28db7a..4d65666c 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -67,7 +67,7 @@ light_array::update() { if( light.count > 0 ) { // TODO: intensity can be affected further by dim switch or other factors - light.intensity = std::max( 0.0f, std::log( (float)light.count + 1.0f ) ); + light.intensity = std::max( 0.0f, std::log1p( (float)light.count ) ); light.intensity *= ( light.owner->DimHeadlights ? 0.6f : 1.0f ); } else { diff --git a/renderer.cpp b/renderer.cpp index 564acfaf..b40d0c60 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -164,6 +164,7 @@ opengl_renderer::Render() { return true; // for now always succeed } +#ifndef EU07_USE_OLD_RENDERCODE bool opengl_renderer::Render( TGround *Ground ) { @@ -406,6 +407,7 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, M return result; } +#endif void opengl_renderer::Update ( double const Deltatime ) { diff --git a/renderer.h b/renderer.h index 0aceabe7..af6038d2 100644 --- a/renderer.h +++ b/renderer.h @@ -101,6 +101,7 @@ public: // main draw call. returns false on error bool Render(); +#ifndef EU07_USE_OLD_RENDERCODE bool Render( TGround *Ground ); bool @@ -115,15 +116,17 @@ public: Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); bool Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); +#endif // maintenance jobs void Update( double const Deltatime); - void Update_Lights( light_array const &Lights ); - void Disable_Lights(); + inline + bool + Visible( TDynamicObject const *Dynamic ) const { return m_camera.visible( Dynamic ); } texture_manager::size_type GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ) { diff --git a/sky.cpp b/sky.cpp index c7802f59..e1641bbf 100644 --- a/sky.cpp +++ b/sky.cpp @@ -41,13 +41,20 @@ void TSky::Render( float3 const &Tint ) #endif if (Global::bUseVBO) { // renderowanie z VBO - mdCloud->RaRender(100, 0); +#ifdef EU07_USE_OLD_RENDERCODE + mdCloud->RaRender( 100, 0 ); mdCloud->RaRenderAlpha(100, 0); +#endif } else { // renderowanie z Display List +#ifdef EU07_USE_OLD_RENDERCODE + mdCloud->Render(100, 0); + mdCloud->RenderAlpha(100, 0); +#else GfxRenderer.Render( mdCloud, nullptr, 100.0 ); GfxRenderer.Render_Alpha( mdCloud, nullptr, 100.0 ); +#endif } #ifdef EU07_USE_OLD_LIGHTING_MODEL glPopMatrix(); diff --git a/stars.cpp b/stars.cpp index 0665ea17..1dafcdcb 100644 --- a/stars.cpp +++ b/stars.cpp @@ -21,7 +21,11 @@ cStars::render() { ::glRotatef( -std::fmod( Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX ::glPointSize( 2.0f ); +#ifdef EU07_USE_OLD_RENDERCODE + m_stars.Render( 1.0 ); +#else GfxRenderer.Render( &m_stars, nullptr, 1.0 ); +#endif ::glPointSize( 3.0f ); ::glPopMatrix(); diff --git a/uilayer.cpp b/uilayer.cpp index 736255f4..19312efd 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -108,14 +108,10 @@ ui_layer::render_progress() { if( (m_progress == 0.0f) && (m_subtaskprogress == 0.0f) ) return; - float const width = ( 4.0f / 3.0f ) * Global::iWindowHeight; - float const height = Global::iWindowHeight / 768.0; - glPushAttrib( GL_ENABLE_BIT ); glDisable( GL_TEXTURE_2D ); quad( float4( 75.0f, 640.0f, 75.0f + 320.0f, 640.0f + 16.0f ), float4(0.0f, 0.0f, 0.0f, 0.25f) ); - glBegin( GL_TRIANGLE_STRIP ); // secondary bar if( m_subtaskprogress ) { quad( @@ -128,7 +124,6 @@ ui_layer::render_progress() { float4( 75.0f, 640.0f, 75.0f + 320.0f * m_progress, 640.0f + 16.0f ), float4( 8.0f / 255.0f, 160.0f / 255.0f, 8.0f / 255.0f, 1.0f ) ); } - glEnd(); glPopAttrib(); } @@ -166,10 +161,8 @@ ui_layer::render_background() { if( m_background == 0 ) return; - auto const &texture = GfxRenderer.Texture( m_background ); // NOTE: we limit/expect the background to come with 4:3 ratio. // TODO, TBD: if we expose texture width or ratio from texture object, this limitation could be lifted - float const width = ( 4.0f / 3.0f ) * Global::iWindowHeight; GfxRenderer.Bind( m_background ); quad( float4( 0.0f, 0.0f, 1024.0f, 768.0f ), float4( 1.0f, 1.0f, 1.0f, 1.0f ) ); From 775e959bc923421d37078f97e7bfb2142216b03a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 18 Mar 2017 01:37:00 +0100 Subject: [PATCH 062/426] environment-centric light level, groundwork for delayed texture upload, minor bug fixes --- DynObj.cpp | 30 ++++++- EU07.cpp | 6 +- Ground.cpp | 3 +- Texture.cpp | 218 +++++++++++++++++++++++++++++++++---------------- Texture.h | 22 +++-- Track.cpp | 25 ++++++ World.cpp | 16 +++- lightarray.cpp | 2 +- renderer.cpp | 26 +++++- renderer.h | 24 +++++- 10 files changed, 277 insertions(+), 95 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 3df9af0a..3a59e335 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2340,8 +2340,7 @@ void TDynamicObject::Move(double fDistance) { // przeliczenie cienia TTrack *t0 = Axle0.GetTrack(); // już po przesunięciu TTrack *t1 = Axle1.GetTrack(); - if ((t0->eEnvironment == e_flat) && (t1->eEnvironment == e_flat)) // może być - // e_bridge... + if ((t0->eEnvironment == e_flat) && (t1->eEnvironment == e_flat)) // może być e_bridge... fShade = 0.0; // standardowe oświetlenie else { // jeżeli te tory mają niestandardowy stopień zacienienia @@ -2364,6 +2363,21 @@ void TDynamicObject::Move(double fDistance) if (Axle0.GetDirection() < 0) d = t0->fTrackLength - d; // od drugiej strony liczona długość d /= fAxleDist; // rozsataw osi procentowe znajdowanie się na torze + + float shadefrom = 1.0f, shadeto = 1.0f; + // NOTE, TODO: calculating brightness level is used enough times to warrant encapsulation into a function + switch( t0->eEnvironment ) { + case e_canyon: { shadeto = 0.65f; break; } + case e_tunnel: { shadeto = 0.2f; break; } + default: {break; } + } + switch( t1->eEnvironment ) { + case e_canyon: { shadefrom = 0.65f; break; } + case e_tunnel: { shadefrom = 0.2f; break; } + default: {break; } + } + fShade = interpolate( shadefrom, shadeto, static_cast( d ) ); +/* switch (t0->eEnvironment) { // typ zmiany oświetlenia - zakładam, że // drugi tor ma e_flat @@ -2384,6 +2398,7 @@ void TDynamicObject::Move(double fDistance) fShade = d + (1.0 - d) * 0.20; break; // zacienienie w tunelu } +*/ } } } @@ -3748,7 +3763,6 @@ void TDynamicObject::Render() vPosition.z); // standardowe przesunięcie względem początku scenerii glMultMatrixd(mMatrix.getArray()); #ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this if (fShade > 0.0) { // Ra: zmiana oswietlenia w tunelu, wykopie GLfloat ambientLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; @@ -3765,6 +3779,11 @@ void TDynamicObject::Render() glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseLight); glLightfv(GL_LIGHT0, GL_SPECULAR, specularLight); } +#else + if( fShade > 0.0f ) { + // change light level based on light level of the occupied track + Global::DayLight.apply_intensity( fShade ); + } #endif if (Global::bUseVBO) { // wersja VBO @@ -3866,6 +3885,11 @@ void TDynamicObject::Render() glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); } +#else + if( fShade > 0.0f ) { + // restore regular light level + Global::DayLight.apply_intensity(); + } #endif glPopMatrix(); if (btnOn) diff --git a/EU07.cpp b/EU07.cpp index 721b18cf..3317120d 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -94,8 +94,10 @@ void make_screenshot() void window_resize_callback(GLFWwindow *window, int w, int h) { - Global::ScreenWidth = w; - Global::ScreenHeight = h; + // NOTE: we have two variables which basically do the same thing as we don't have dynamic fullscreen toggle + // TBD, TODO: merge them? + Global::ScreenWidth = Global::iWindowWidth = w; + Global::ScreenHeight = Global::iWindowHeight = h; Global::fDistanceFactor = std::max( 0.5f, h / 768.0f ); // not sure if this is really something we want to use glViewport(0, 0, w, h); } diff --git a/Ground.cpp b/Ground.cpp index f0c37d03..11f2bae1 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2582,7 +2582,6 @@ bool TGround::Init(std::string File) // TFileStream *fs; // int size; std::string subpath = Global::asCurrentSceneryPath; // "scenery/"; - auto const tokencount = cParser::countTokens( File, subpath ); cParser parser(File, cParser::buffer_FILE, subpath, Global::bLoadTraction); std::string token; @@ -2623,7 +2622,7 @@ bool TGround::Init(std::string File) while (token != "") //(!Parser->EndOfFile) { ++processed; - if( processed % 25 == 0 ) + if( processed % 1000 == 0 ) { UILayer.set_progress( parser.getProgress(), parser.getFullProgress() ); GfxRenderer.Render(); diff --git a/Texture.cpp b/Texture.cpp index 30559cc9..2e313288 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -53,6 +53,13 @@ opengl_texture::load() { // data state will be set by called loader, so we're all done here if( data_state == resource_state::good ) { + has_alpha = ( + data_components == GL_RGBA ? + true : + false ); + + size = data.size() / 1024; + return; } @@ -487,82 +494,101 @@ opengl_texture::load_TGA() { return; } -void +resource_state +opengl_texture::bind() { + + if( false == is_ready ) { + + create(); + if( data_state != resource_state::good ) { + return data_state; + } + } + ::glBindTexture( GL_TEXTURE_2D, id ); + return data_state; +} + +resource_state opengl_texture::create() { if( data_state != resource_state::good ) { // don't bother until we have useful texture data - return; + return data_state; } - ::glGenTextures( 1, &id ); - ::glBindTexture( GL_TEXTURE_2D, id ); + // TODO: consider creating and storing low-res version of the texture if it's ever unloaded from the gfx card, + // as a placeholder until it can be loaded again + if( id == -1 ) { - // analyze specified texture traits - bool wraps{ true }; - bool wrapt{ true }; - for( auto const &trait : traits ) { + ::glGenTextures( 1, &id ); + ::glBindTexture( GL_TEXTURE_2D, id ); - switch( trait ) { + // analyze specified texture traits + bool wraps{ true }; + bool wrapt{ true }; + for( auto const &trait : traits ) { - case 's': { wraps = false; break; } - case 't': { wrapt = false; break; } + switch( trait ) { + + case 's': { wraps = false; break; } + case 't': { wrapt = false; break; } + } } - } - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, ( wraps == true ? GL_REPEAT : GL_CLAMP_TO_EDGE ) ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, ( wrapt == true ? GL_REPEAT : GL_CLAMP_TO_EDGE ) ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, ( wraps == true ? GL_REPEAT : GL_CLAMP_TO_EDGE ) ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, ( wrapt == true ? GL_REPEAT : GL_CLAMP_TO_EDGE ) ); - set_filtering(); + set_filtering(); - if( data_mapcount == 1 ) { - // fill missing mipmaps if needed - ::glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE ); - } - // upload texture data - int dataoffset = 0, - datasize = 0, - datawidth = data_width, - dataheight = data_height; - for( int maplevel = 0; maplevel < data_mapcount; ++maplevel ) { + if( data_mapcount == 1 ) { + // fill missing mipmaps if needed + ::glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE ); + } + // upload texture data + int dataoffset = 0, + datasize = 0, + datawidth = data_width, + dataheight = data_height; + for( int maplevel = 0; maplevel < data_mapcount; ++maplevel ) { - if( ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) - || ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) - || ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) ) { - // compressed dds formats - int const datablocksize = - ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ? + if( ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) + || ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) + || ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) ) { + // compressed dds formats + int const datablocksize = + ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ? 8 : 16 ); - datasize = ( ( std::max(datawidth, 4) + 3 ) / 4 ) * ( ( std::max(dataheight, 4) + 3 ) / 4 ) * datablocksize; + datasize = ( ( std::max( datawidth, 4 ) + 3 ) / 4 ) * ( ( std::max( dataheight, 4 ) + 3 ) / 4 ) * datablocksize; - ::glCompressedTexImage2D( - GL_TEXTURE_2D, maplevel, data_format, - datawidth, dataheight, 0, - datasize, (GLubyte *)&data[dataoffset] ); + ::glCompressedTexImage2D( + GL_TEXTURE_2D, maplevel, data_format, + datawidth, dataheight, 0, + datasize, (GLubyte *)&data[ dataoffset ] ); - dataoffset += datasize; - datawidth = std::max( datawidth / 2, 1 ); - dataheight = std::max( dataheight / 2, 1 ); - } - else{ - // uncompressed texture data - ::glTexImage2D( - GL_TEXTURE_2D, 0, GL_RGBA8, - data_width, data_height, 0, - data_format, GL_UNSIGNED_BYTE, (GLubyte *)&data[0] ); + dataoffset += datasize; + datawidth = std::max( datawidth / 2, 1 ); + dataheight = std::max( dataheight / 2, 1 ); + } + else { + // uncompressed texture data + ::glTexImage2D( + GL_TEXTURE_2D, 0, GL_RGBA8, + data_width, data_height, 0, + data_format, GL_UNSIGNED_BYTE, (GLubyte *)&data[ 0 ] ); + } } + + data.resize( 0 ); // TBD, TODO: keep the texture data if we start doing some gpu data cleaning down the road +/* + data_state = resource_state::none; +*/ + data_state = resource_state::good; + is_ready = true; } - is_ready = true; - has_alpha = ( - data_components == GL_RGBA ? - true : - false ); - - data.resize( 0 ); // TBD, TODO: keep the texture data if we start doing some gpu data cleaning down the road - data_state = resource_state::none; + return data_state; } void @@ -735,7 +761,9 @@ texture_manager::GetTextureId( std::string Filename, std::string const &Dir, int if( true == Loadnow ) { Texture( textureindex ).load(); +#ifndef EU07_DEFERRED_TEXTURE_UPLOAD Texture( textureindex ).create(); +#endif } return textureindex; @@ -755,20 +783,77 @@ texture_manager::Bind( texture_manager::size_type const Id ) { */ // TODO: do binding in texture object, add support for other types if( Id != 0 ) { - - auto const &texture = Texture( Id ); - if( true == texture.is_ready ) { - ::glBindTexture( GL_TEXTURE_2D, texture.id ); +#ifndef EU07_DEFERRED_TEXTURE_UPLOAD + ::glBindTexture( GL_TEXTURE_2D, Id ); + m_activetexture = 0; +#else + if( Texture( Id ).bind() == resource_state::good ) { m_activetexture = Id; - return; } + else { + // TODO: bind a special 'error' texture on failure + } +#endif } + else { - ::glBindTexture( GL_TEXTURE_2D, 0 ); - m_activetexture = 0; - + ::glBindTexture( GL_TEXTURE_2D, 0 ); + m_activetexture = 0; + } + // all done return; } + +void +texture_manager::Free() { + for( auto const &texture : m_textures ) { + // usunięcie wszyskich tekstur (bez usuwania struktury) + if( ( texture.id > 0 ) + && ( texture.id != -1 ) ) { + ::glDeleteTextures( 1, &texture.id ); + } + } +} + +// debug performance string +std::string +texture_manager::Info() const { + + // TODO: cache this data and update only during resource sweep + std::size_t totaltexturecount{ m_textures.size() - 1 }; + std::size_t totaltexturesize{ 0 }; +#ifdef EU07_DEFERRED_TEXTURE_UPLOAD + std::size_t readytexturecount{ 0 }; + std::size_t readytexturesize{ 0 }; +#endif + + for( auto const& texture : m_textures ) { + + totaltexturesize += texture.size; +#ifdef EU07_DEFERRED_TEXTURE_UPLOAD + + if( texture.is_ready ) { + + ++readytexturecount; + readytexturesize += texture.size; + } +#endif + } + + return + "Textures: " +#ifdef EU07_DEFERRED_TEXTURE_UPLOAD + + std::to_string( readytexturecount ) + + " (" + + to_string( readytexturesize / 1024.0f, 2 ) + " mb)" + + " in vram, "; +#endif + + std::to_string( totaltexturecount ) + + " (" + + to_string( totaltexturesize / 1024.0f, 2 ) + " mb)" + + " total"; +} + // checks whether specified texture is in the texture bank. returns texture id, or npos. texture_manager::size_type texture_manager::find_in_databank( std::string const &Texturename ) { @@ -808,12 +893,3 @@ texture_manager::find_on_disk( std::string const &Texturename ) { // no results either way, report failure return ""; } - -void -texture_manager::Free() -{ - for( auto const &texture : m_textures ) { - // usunięcie wszyskich tekstur (bez usuwania struktury) - ::glDeleteTextures( 1, &texture.id ); - } -} diff --git a/Texture.h b/Texture.h index 4c122e05..24e348ce 100644 --- a/Texture.h +++ b/Texture.h @@ -29,13 +29,15 @@ struct opengl_texture { // methods void load(); - void create(); + resource_state bind(); + resource_state create(); // members GLuint id{ (GLuint)-1 }; // associated GL resource bool has_alpha{ false }; // indicates the texture has alpha channel bool is_ready{ false }; // indicates the texture was processed and is ready for use std::string traits; // requested texture attributes: wrapping modes etc std::string name; // name of the texture source file + std::size_t size{ 0 }; // size of the texture data, in kb private: // methods @@ -71,11 +73,19 @@ public: texture_manager(); ~texture_manager() { Free(); } - size_type GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ); - void Bind( size_type const Id ); - opengl_texture &Texture( size_type const Id ) { return m_textures.at( Id ); } - void Init(); - void Free(); + size_type + GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ); + void + Bind( size_type const Id ); + opengl_texture & + Texture( size_type const Id ) { return m_textures[ Id ]; } + void + Init(); + void + Free(); + // debug performance string + std::string + Info() const; private: typedef std::unordered_map index_map; diff --git a/Track.cpp b/Track.cpp index c596acb8..e13c9eae 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2615,6 +2615,20 @@ void TTrack::EnvironmentSet() break; } } +#else + switch( eEnvironment ) { + case e_canyon: { + Global::DayLight.apply_intensity( 0.5f ); + break; + } + case e_tunnel: { + Global::DayLight.apply_intensity( 0.2f ); + break; + } + default: { + break; + } + } #endif }; @@ -2630,6 +2644,17 @@ void TTrack::EnvironmentReset() glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); } +#else + switch( eEnvironment ) { + case e_canyon: + case e_tunnel: { + Global::DayLight.apply_intensity(); + break; + } + default: { + break; + } + } #endif }; diff --git a/World.cpp b/World.cpp index 536ac923..69ae557f 100644 --- a/World.cpp +++ b/World.cpp @@ -1285,7 +1285,6 @@ TWorld::Render_Cab() { if( dynamic->mdKabina ) // bo mogła zniknąć przy przechodzeniu do innego pojazdu { #ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this // oswietlenie kabiny GLfloat ambientCabLight[ 4 ] = { 0.5f, 0.5f, 0.5f, 1.0f }; GLfloat diffuseCabLight[ 4 ] = { 0.5f, 0.5f, 0.5f, 1.0f }; @@ -1367,6 +1366,10 @@ TWorld::Render_Cab() { glLightfv( GL_LIGHT0, GL_DIFFUSE, diffuseCabLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, specularCabLight ); #else + if( dynamic->fShade > 0.0f ) { + // change light level based on light level of the occupied track + Global::DayLight.apply_intensity( dynamic->fShade ); + } if( dynamic->InteriorLightLevel > 0.0f ) { // crude way to light the cabin, until we have something more complete in place @@ -1393,12 +1396,15 @@ TWorld::Render_Cab() { } */ #ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this // przywrócenie standardowych, bo zawsze są zmieniane glLightfv( GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight ); glLightfv( GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight ); glLightfv( GL_LIGHT0, GL_SPECULAR, Global::specularDayLight ); #else + if( dynamic->fShade > 0.0f ) { + // change light level based on light level of the occupied track + Global::DayLight.apply_intensity(); + } if( dynamic->InteriorLightLevel > 0.0f ) { // reset the overall ambient GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; @@ -1429,7 +1435,7 @@ TWorld::Update_UI() { } if( Controlled && Controlled->Mechanik ) { - OutText2 = Controlled->Mechanik->Relation(); + OutText2 = Global::Bezogonkow( Controlled->Mechanik->Relation(), true ); if( !OutText2.empty() ) { // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania OutText3 = " -> " + Global::Bezogonkow( Controlled->Mechanik->NextStop(), true ); @@ -1700,7 +1706,9 @@ TWorld::Update_UI() { std::string("Rendering mode: ") + ( Global::bUseVBO ? "VBO" : - "Display Lists" ); + "Display Lists" ) + + ". " + + GfxRenderer.Info(); // dump last opengl error, if any GLenum glerror = glGetError(); diff --git a/lightarray.cpp b/lightarray.cpp index 4d65666c..923709fd 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -67,7 +67,7 @@ light_array::update() { if( light.count > 0 ) { // TODO: intensity can be affected further by dim switch or other factors - light.intensity = std::max( 0.0f, std::log1p( (float)light.count ) ); + light.intensity = std::max( 0.0f, std::log( (float)light.count + 1.0f ) ); light.intensity *= ( light.owner->DimHeadlights ? 0.6f : 1.0f ); } else { diff --git a/renderer.cpp b/renderer.cpp index b40d0c60..1f16c7d8 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -465,8 +465,17 @@ opengl_renderer::Update ( double const Deltatime ) { } // TODO: add garbage collection and other less frequent works here + if( DebugModeFlag ) + m_debuginfo = m_textures.Info(); }; +// debug performance string +std::string const & +opengl_renderer::Info() const { + + return m_debuginfo; +} + void opengl_renderer::Update_Lights( light_array const &Lights ) { @@ -494,14 +503,27 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { renderlight->set_position( scenelight.position ); renderlight->direction = scenelight.direction; - auto const luminance = Global::fLuminance; // TODO: adjust this based on location, e.g. for tunnels + auto luminance = Global::fLuminance; // TODO: adjust this based on location, e.g. for tunnels + auto const environment = scenelight.owner->fShade; + if( environment > 0.0f ) { + luminance *= environment; + } renderlight->diffuse[ 0 ] = std::max( 0.0, scenelight.color.x - luminance ); renderlight->diffuse[ 1 ] = std::max( 0.0, scenelight.color.y - luminance ); renderlight->diffuse[ 2 ] = std::max( 0.0, scenelight.color.z - luminance ); renderlight->ambient[ 0 ] = std::max( 0.0, scenelight.color.x * scenelight.intensity - luminance); renderlight->ambient[ 1 ] = std::max( 0.0, scenelight.color.y * scenelight.intensity - luminance ); renderlight->ambient[ 2 ] = std::max( 0.0, scenelight.color.z * scenelight.intensity - luminance ); - +/* + // NOTE: we have no simple way to determine whether the lights are falling on objects located in darker environment + // until this issue is resolved we're disabling reduction of light strenght based on the global luminance + renderlight->diffuse[ 0 ] = std::max( 0.0f, scenelight.color.x ); + renderlight->diffuse[ 1 ] = std::max( 0.0f, scenelight.color.y ); + renderlight->diffuse[ 2 ] = std::max( 0.0f, scenelight.color.z ); + renderlight->ambient[ 0 ] = std::max( 0.0f, scenelight.color.x * scenelight.intensity ); + renderlight->ambient[ 1 ] = std::max( 0.0f, scenelight.color.y * scenelight.intensity ); + renderlight->ambient[ 2 ] = std::max( 0.0f, scenelight.color.z * scenelight.intensity ); +*/ ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, (0.25f * scenelight.count) / std::pow( scenelight.count, 2 ) * (scenelight.owner->DimHeadlights ? 1.25f : 1.0f) ); ::glEnable( renderlight->id ); diff --git a/renderer.h b/renderer.h index af6038d2..f1ce4e0f 100644 --- a/renderer.h +++ b/renderer.h @@ -33,11 +33,23 @@ struct opengl_light { } inline - void apply_intensity() { + void apply_intensity( float const Factor = 1.0f ) { - glLightfv( id, GL_AMBIENT, ambient ); - glLightfv( id, GL_DIFFUSE, diffuse ); - glLightfv( id, GL_SPECULAR, specular ); + if( Factor == 1.0 ) { + + glLightfv( id, GL_AMBIENT, ambient ); + glLightfv( id, GL_DIFFUSE, diffuse ); + glLightfv( id, GL_SPECULAR, specular ); + } + else { + // temporary light scaling mechanics (ultimately this work will be left to the shaders + float4 scaledambient( ambient[ 0 ] * Factor, ambient[ 1 ] * Factor, ambient[ 2 ] * Factor, ambient[ 3 ] ); + float4 scaleddiffuse( diffuse[ 0 ] * Factor, diffuse[ 1 ] * Factor, diffuse[ 2 ] * Factor, diffuse[ 3 ] ); + float4 scaledspecular( specular[ 0 ] * Factor, specular[ 1 ] * Factor, specular[ 2 ] * Factor, specular[ 3 ] ); + glLightfv( id, GL_AMBIENT, &scaledambient.x ); + glLightfv( id, GL_DIFFUSE, &scaleddiffuse.x ); + glLightfv( id, GL_SPECULAR, &scaledspecular.x ); + } } inline void apply_angle() { @@ -127,6 +139,9 @@ public: inline bool Visible( TDynamicObject const *Dynamic ) const { return m_camera.visible( Dynamic ); } + // debug performance string + std::string const & + Info() const; texture_manager::size_type GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ) { @@ -168,6 +183,7 @@ private: float m_drawrange{ 2500.0f }; // current drawing range float m_drawtime{ 1000.0f / 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps double m_updateaccumulator{ 0.0 }; + std::string m_debuginfo; GLFWwindow *m_window{ nullptr }; }; From a5d01ef059ba380c0664397908cdb8c2c0759be5 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 19 Mar 2017 02:27:02 +0100 Subject: [PATCH 063/426] static linking, largeaddressaware, basic tga texture downsampling --- EU07.cpp | 9 +++++++ McZapkie/Mover.cpp | 50 ++++++++++++++++++++------------------- Texture.cpp | 33 ++++++++++++++++++++++++++ Texture.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++ Train.cpp | 25 +++++++------------- stdafx.h | 12 +++++++++- 6 files changed, 146 insertions(+), 41 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 3317120d..aac59792 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -32,8 +32,17 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "resource.h" #include "uilayer.h" +#ifdef EU07_BUILD_STATIC +#pragma comment( lib, "glfw3.lib" ) +#pragma comment( lib, "glew32s.lib" ) +#else +#ifdef _WINDOWS #pragma comment( lib, "glfw3dll.lib" ) +#else +#pragma comment( lib, "glfw3.lib" ) +#endif #pragma comment( lib, "glew32.lib" ) +#endif // build_static #pragma comment( lib, "opengl32.lib" ) #pragma comment( lib, "glu32.lib" ) #pragma comment( lib, "dsound.lib" ) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index a53b6c36..eed06456 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -428,45 +428,47 @@ double TMoverParameters::Distance(const vector3 &s1, const vector3 &s2, const ve */ double TMoverParameters::CouplerDist(int Coupler) { // obliczenie odległości pomiędzy sprzęgami (kula!) - return Couplers[Coupler].CoupleDist = - Distance(Loc, Couplers[Coupler].Connected->Loc, Dim, - Couplers[Coupler].Connected->Dim); // odległość pomiędzy sprzęgami (kula!) + Couplers[Coupler].CoupleDist = + Distance( + Loc, Couplers[Coupler].Connected->Loc, + Dim, Couplers[Coupler].Connected->Dim); // odległość pomiędzy sprzęgami (kula!) + + return Couplers[ Coupler ].CoupleDist; }; -bool TMoverParameters::Attach(int ConnectNo, int ConnectToNr, TMoverParameters *ConnectTo, - int CouplingType, bool Forced) +bool TMoverParameters::Attach(int ConnectNo, int ConnectToNr, TMoverParameters *ConnectTo, int CouplingType, bool Forced) { //łączenie do swojego sprzęgu (ConnectNo) pojazdu (ConnectTo) stroną (ConnectToNr) // Ra: zwykle wykonywane dwukrotnie, dla każdego pojazdu oddzielnie // Ra: trzeba by odróżnić wymóg dociśnięcia od uszkodzenia sprzęgu przy podczepianiu AI do // składu if (ConnectTo) // jeśli nie pusty { + auto &coupler = Couplers[ ConnectNo ]; if (ConnectToNr != 2) - Couplers[ConnectNo].ConnectedNr = ConnectToNr; // 2=nic nie podłączone - TCouplerType ct = ConnectTo->Couplers[Couplers[ConnectNo].ConnectedNr] - .CouplerType; // typ sprzęgu podłączanego pojazdu - Couplers[ConnectNo].Connected = - ConnectTo; // tak podpiąć (do siebie) zawsze można, najwyżej będzie wirtualny - CouplerDist(ConnectNo); // przeliczenie odległości pomiędzy sprzęgami + coupler.ConnectedNr = ConnectToNr; // 2=nic nie podłączone + coupler.Connected = ConnectTo; // tak podpiąć (do siebie) zawsze można, najwyżej będzie wirtualny + CouplerDist( ConnectNo ); // przeliczenie odległości pomiędzy sprzęgami + if (CouplingType == ctrain_virtual) return false; // wirtualny więcej nic nie robi - if (Forced ? true : ((Couplers[ConnectNo].CoupleDist <= dEpsilon) && - (Couplers[ConnectNo].CouplerType != NoCoupler) && - (Couplers[ConnectNo].CouplerType == ct))) + + auto &othercoupler = ConnectTo->Couplers[ coupler.ConnectedNr ]; + if( ( Forced ) + || ( ( coupler.CoupleDist <= dEpsilon ) + && ( coupler.CouplerType != NoCoupler ) + && ( coupler.CouplerType == othercoupler.CouplerType ) ) ) { // stykaja sie zderzaki i kompatybilne typy sprzegow, chyba że łączenie na starcie - if (Couplers[ConnectNo].CouplingFlag == - ctrain_virtual) // jeśli wcześniej nie było połączone - { // ustalenie z której strony rysować sprzęg - Couplers[ConnectNo].Render = true; // tego rysować - ConnectTo->Couplers[Couplers[ConnectNo].ConnectedNr].Render = false; // a tego nie + if( coupler.CouplingFlag == ctrain_virtual ) { + // jeśli wcześniej nie było połączone, ustalenie z której strony rysować sprzęg + coupler.Render = true; // tego rysować + othercoupler.Render = false; // a tego nie }; - Couplers[ConnectNo].CouplingFlag = CouplingType; // ustawienie typu sprzęgu + coupler.CouplingFlag = CouplingType; // ustawienie typu sprzęgu // if (CouplingType!=ctrain_virtual) //Ra: wirtualnego nie łączymy zwrotnie! //{//jeśli łączenie sprzęgiem niewirtualnym, ustawiamy połączenie zwrotne - ConnectTo->Couplers[Couplers[ConnectNo].ConnectedNr].CouplingFlag = CouplingType; - ConnectTo->Couplers[Couplers[ConnectNo].ConnectedNr].Connected = this; - ConnectTo->Couplers[Couplers[ConnectNo].ConnectedNr].CoupleDist = - Couplers[ConnectNo].CoupleDist; + othercoupler.CouplingFlag = CouplingType; + othercoupler.Connected = this; + othercoupler.CoupleDist = coupler.CoupleDist; return true; //} // podłączenie nie udało się - jest wirtualne diff --git a/Texture.cpp b/Texture.cpp index 2e313288..981193c8 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -480,6 +480,14 @@ opengl_texture::load_TGA() { return; } + downsize( GL_BGRA ); + if( ( data_width > Global::iMaxTextureSize ) || ( data_height > Global::iMaxTextureSize ) ) { + // for non-square textures there's currently possibility the scaling routine will have to abort + // before it gets all work done + data_state = resource_state::failed; + return; + } + // TODO: add horizontal/vertical data flip, based on the descriptor (18th) header byte // fill remaining data info @@ -656,6 +664,31 @@ opengl_texture::set_filtering() { } } +void +opengl_texture::downsize( GLuint const Format ) { + + while( ( data_width > Global::iMaxTextureSize ) || ( data_height > Global::iMaxTextureSize ) ) { + // scale down the base texture, if it's larger than allowed maximum + // NOTE: scaling is uniform along both axes, meaning non-square textures can drop below the maximum + // TODO: replace with proper scaling function once we have image middleware in place + if( ( data_width < 2 ) || ( data_height < 2 ) ) { + // can't go any smaller + break; + } + + switch( Format ) { + + case GL_RGB: { downsample< glm::tvec3 >( data_width, data_height, data.data() ); break; } + case GL_BGRA: + case GL_RGBA: { downsample< glm::tvec4 >( data_width, data_height, data.data() ); break; } + default: { break; } + } + data_width /= 2; + data_height /= 2; + data.resize( data.size() / 4 ); // not strictly needed, but, eh + }; +} + void texture_manager::Init() { } diff --git a/Texture.h b/Texture.h index 24e348ce..bfdd73c5 100644 --- a/Texture.h +++ b/Texture.h @@ -46,6 +46,7 @@ private: void load_TEX(); void load_TGA(); void set_filtering(); + void downsize( GLuint const Format ); // members std::vector data; // texture data @@ -113,3 +114,60 @@ private: index_map m_texturemappings; size_type m_activetexture{ 0 }; // last i.e. currently bound texture }; + +// reduces provided data image to half of original size, using basic 2x2 average +template +void +downsample( std::size_t const Width, std::size_t const Height, char *Imagedata ) { + + _Colortype *destination = reinterpret_cast<_Colortype*>( Imagedata ); + _Colortype *sampler = reinterpret_cast<_Colortype*>( Imagedata ); + + _Colortype accumulator, color; +/* + _Colortype color; + float component; +*/ + for( size_t row = 0; row < Height; row += 2, sampler += Width ) { // column movement advances us down another row + for( size_t column = 0; column < Width; column += 2, sampler += 2 ) { +/* + // straightforward, but won't work with byte data + auto color = ( + *sampler + + *( sampler + 1 ) + + *( sampler + Width ) + + *( sampler + Width + 1 ) ); + color /= 4; +*/ + // manual version of the above, but drops colour resolution to 6 bits + accumulator = *sampler; + accumulator /= 4; + color = accumulator; + accumulator = *(sampler + 1); + accumulator /= 4; + color += accumulator; + accumulator = *(sampler + Width); + accumulator /= 4; + color += accumulator; + accumulator = *(sampler + Width + 1); + accumulator /= 4; + color += accumulator; + + *destination++ = color; +/* + // "full" 8bit resolution + color = _Colortype(); component = 0; + for( int idx = 0; idx < sizeof( _Colortype ); ++idx ) { + + component = ( + (*sampler)[idx] + + ( *( sampler + 1 ) )[idx] + + ( *( sampler + Width ) )[idx] + + (*( sampler + Width + 1 ))[idx] ); + color[ idx ] = component /= 4; + } + *destination++ = color; +*/ + } + } +} diff --git a/Train.cpp b/Train.cpp index db3698c5..4ddd8b78 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1827,7 +1827,7 @@ if if (tmp->MoverParameters->Attach( CouplNr, 2, tmp->MoverParameters->Couplers[CouplNr].Connected, - tmp->MoverParameters->Couplers[CouplNr].CouplingFlag + ctrain_pneumatic)) + (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_pneumatic))) { rsHiss.Play(1, DSBPLAY_LOOPING, true, tmp->GetPosition()); DynamicObject->SetPneumatic(CouplNr != 0, true); // Ra: to mi się nie podoba !!!! @@ -1842,7 +1842,7 @@ if if (tmp->MoverParameters->Attach( CouplNr, 2, tmp->MoverParameters->Couplers[CouplNr].Connected, - tmp->MoverParameters->Couplers[CouplNr].CouplingFlag + ctrain_scndpneumatic)) + (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_scndpneumatic))) { // rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition()); dsbCouplerDetach->SetVolume(DSBVOLUME_MAX); @@ -1861,15 +1861,13 @@ if if (tmp->MoverParameters->Attach( CouplNr, 2, tmp->MoverParameters->Couplers[CouplNr].Connected, - tmp->MoverParameters->Couplers[CouplNr].CouplingFlag + - ctrain_controll)) + (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_controll))) { dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); dsbCouplerAttach->Play(0, 0, 0); } } - else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, - ctrain_passenger)) // mostek + else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_passenger)) // mostek { if ((tmp->MoverParameters->Couplers[CouplNr] .Connected->Couplers[CouplNr] @@ -1879,8 +1877,7 @@ if if (tmp->MoverParameters->Attach( CouplNr, 2, tmp->MoverParameters->Couplers[CouplNr].Connected, - tmp->MoverParameters->Couplers[CouplNr].CouplingFlag + - ctrain_passenger)) + (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_passenger))) { // rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition()); dsbCouplerDetach->SetVolume(DSBVOLUME_MAX); @@ -1899,8 +1896,7 @@ if // odlegle wagony if (iCabn > 0) { - if (!FreeFlyModeFlag) // tryb 'kabinowy' (pozwala również rozłączyć - // sprzęgi zablokowane) + if (!FreeFlyModeFlag) // tryb 'kabinowy' (pozwala również rozłączyć sprzęgi zablokowane) { if (DynamicObject->DettachStatus(iCabn - 1) < 0) // jeśli jest co odczepić if (DynamicObject->Dettach(iCabn - 1)) // iCab==1:przód,iCab==2:tył @@ -1913,15 +1909,12 @@ if { // tryb freefly int CouplNr = -1; TDynamicObject *tmp; - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, - CouplNr); + tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr); if (tmp == NULL) - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, - 1500, CouplNr); + tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr); if (tmp && (CouplNr != -1)) { - if ((tmp->MoverParameters->Couplers[CouplNr].CouplingFlag & ctrain_depot) == - 0) // jeżeli sprzęg niezablokowany + if ((tmp->MoverParameters->Couplers[CouplNr].CouplingFlag & ctrain_depot) == 0) // jeżeli sprzęg niezablokowany if (tmp->DettachStatus(CouplNr) < 0) // jeśli jest co odczepić i się da if (!tmp->Dettach(CouplNr)) { // dźwięk odczepiania diff --git a/stdafx.h b/stdafx.h index 135e2d1b..0110be36 100644 --- a/stdafx.h +++ b/stdafx.h @@ -61,10 +61,20 @@ #include #include +#ifdef NDEBUG +#define EU07_BUILD_STATIC +#endif + +#ifdef EU07_BUILD_STATIC +#define GLEW_STATIC +#else +#ifdef _WINDOWS +#define GLFW_DLL +#endif // _windows +#endif // build_static #include "GL/glew.h" #ifdef _WINDOWS #include "GL/wglew.h" -#define GLFW_DLL #endif #define GLFW_INCLUDE_GLU //m7todo: jest tu bo nie chciao mi si wpycha do wszystkich plikw From f10494fd6af4101488ccf42e209399e39f11ae78 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 19 Mar 2017 23:58:03 +0100 Subject: [PATCH 064/426] more parameters exposed to python, reworked ui screens, ui text color setting --- Driver.h | 1 + EU07.cpp | 3 +- Globals.cpp | 83 +++++++----------- Globals.h | 3 +- Train.cpp | 127 +++++++++++++++------------- Train.h | 3 +- World.cpp | 223 ++++++++++++++++++++++++++++--------------------- lightarray.cpp | 4 +- uilayer.cpp | 9 +- 9 files changed, 243 insertions(+), 213 deletions(-) diff --git a/Driver.h b/Driver.h index 4f27d920..eeddc1a1 100644 --- a/Driver.h +++ b/Driver.h @@ -399,4 +399,5 @@ class TController int CrossRoute(TTrack *tr); void RouteSwitch(int d); std::string OwnerName(); + TMoverParameters const *Controlling() const { return mvControlling; } }; diff --git a/EU07.cpp b/EU07.cpp index aac59792..c24f5e11 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -157,8 +157,9 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo else if( !( Global::iMultiplayer & 2 ) ) // w multiplayerze pauza nie ma sensu if( !Global::ctrlState ) // z [Ctrl] to radiostop jest Global::iPause ^= 2; // zmiana stanu zapauzowania - if( Global::iPause ) // jak pauza + if( Global::iPause ) {// jak pauza Global::iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację + } break; } case GLFW_KEY_F7: diff --git a/Globals.cpp b/Globals.cpp index 75313f33..c46a22c4 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -48,20 +48,18 @@ GLFWwindow *Global::window; bool Global::shiftState; bool Global::ctrlState; int Global::iCameraLast = -1; -std::string Global::asRelease = "16.0.1172.482"; +std::string Global::asRelease = "16.0.1172.482++"; std::string Global::asVersion = -"Compilation 2017-01-10, release " + Global::asRelease + "."; // tutaj, bo wysyłany +"Compilation 2017-03-19, release " + Global::asRelease + "."; // tutaj, bo wysyłany int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego -int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0}; // numer ekranu wyświetlacza tekstowego +int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // numer ekranu wyświetlacza tekstowego double Global::fSunDeclination = 0.0; // deklinacja Słońca double Global::fTimeAngleDeg = 0.0; // godzina w postaci kąta float Global::fClockAngleDeg[6]; // kąty obrotu cylindrów dla zegara cyfrowego std::string Global::szTexturesTGA = ".tga"; // lista tekstur od TGA std::string Global::szTexturesDDS = ".dds"; // lista tekstur od DDS int Global::iKeyLast = 0; // ostatnio naciśnięty klawisz w celu logowania -GLuint Global::iTextureId = 0; // ostatnio użyta tekstura 2D -int Global::iPause = 0x10; // globalna pauza ruchu +int Global::iPause = 0; // 0x10; // globalna pauza ruchu bool Global::bActive = true; // czy jest aktywnym oknem int Global::iErorrCounter = 0; // licznik sprawdzań do śledzenia błędów OpenGL int Global::iTextures = 0; // licznik użytych tekstur @@ -74,6 +72,7 @@ TDynamicObject *Global::pUserDynamic = NULL; // pojazd użytkownika, renderowany std::string Global::asTranscript[5]; // napisy na ekranie (widoczne) */ TTranscripts Global::tranTexts; // obiekt obsługujący stenogramy dźwięków na ekranie +float4 Global::UITextColor = float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); // parametry scenerii vector3 Global::pCameraPosition; @@ -140,10 +139,11 @@ int Global::iRailProFiltering = 5; // domyślne rozmywanie tekstur szyn int Global::iDynamicFiltering = 5; // domyślne rozmywanie tekstur pojazdów bool Global::bUseVBO = false; // czy jest VBO w karcie graficznej (czy użyć) std::string Global::LastGLError; -GLint Global::iMaxTextureSize = 16384; // maksymalny rozmiar tekstury +GLint Global::iMaxTextureSize = 4096; // maksymalny rozmiar tekstury bool Global::bSmoothTraction = false; // wygładzanie drutów starym sposobem std::string Global::szDefaultExt = Global::szTexturesDDS; // domyślnie od DDS int Global::iMultisampling = 2; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px +bool Global::DLFont{ false }; // switch indicating presence of basic font bool Global::bGlutFont = false; // czy tekst generowany przez GLUT32.DLL //int Global::iConvertModels = 7; // tworzenie plików binarnych, +2-optymalizacja transformów int Global::iConvertModels{ 0 }; // temporary override, to prevent generation of .e3d not compatible with old exe @@ -513,42 +513,15 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(1, false); int size; Parser >> size; - if (size <= 64) - { - Global::iMaxTextureSize = 64; - } - else if (size <= 128) - { - Global::iMaxTextureSize = 128; - } - else if (size <= 256) - { - Global::iMaxTextureSize = 256; - } - else if (size <= 512) - { - Global::iMaxTextureSize = 512; - } - else if (size <= 1024) - { - Global::iMaxTextureSize = 1024; - } - else if (size <= 2048) - { - Global::iMaxTextureSize = 2048; - } - else if (size <= 4096) - { - Global::iMaxTextureSize = 4096; - } - else if (size <= 8192) - { - Global::iMaxTextureSize = 8192; - } - else - { - Global::iMaxTextureSize = 16384; - } + if (size <= 64) { Global::iMaxTextureSize = 64; } + else if (size <= 128) { Global::iMaxTextureSize = 128; } + else if (size <= 256) { Global::iMaxTextureSize = 256; } + else if (size <= 512) { Global::iMaxTextureSize = 512; } + else if (size <= 1024) { Global::iMaxTextureSize = 1024; } + else if (size <= 2048) { Global::iMaxTextureSize = 2048; } + else if (size <= 4096) { Global::iMaxTextureSize = 4096; } + else if (size <= 8192) { Global::iMaxTextureSize = 8192; } + else { Global::iMaxTextureSize = 16384; } } else if (token == "doubleambient") { @@ -682,7 +655,8 @@ void Global::ConfigParse(cParser &Parser) in = 5; // na ostatni, bo i tak trzeba pominąć wartości } Parser.getTokens(4, false); - Parser >> Global::fCalibrateIn[in][0] // wyraz wolny + Parser + >> Global::fCalibrateIn[in][0] // wyraz wolny >> Global::fCalibrateIn[in][1] // mnożnik >> Global::fCalibrateIn[in][2] // mnożnik dla kwadratu >> Global::fCalibrateIn[in][3]; // mnożnik dla sześcianu @@ -797,6 +771,19 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(1, false); Parser >> Global::asLang; } + else if( token == "uitextcolor" ) { + // color of the ui text. NOTE: will be obsolete once the real ui is in place + Parser.getTokens( 3, false ); + Parser + >> Global::UITextColor.x + >> Global::UITextColor.y + >> Global::UITextColor.z; + Global::UITextColor.x = clamp( Global::UITextColor.x, 0.0f, 255.0f ); + Global::UITextColor.y = clamp( Global::UITextColor.y, 0.0f, 255.0f ); + Global::UITextColor.z = clamp( Global::UITextColor.z, 0.0f, 255.0f ); + Global::UITextColor = Global::UITextColor / 255.0f; + Global::UITextColor.w = 1.0f; + } else if (token == "pyscreenrendererpriority") { // priority of python screen renderer @@ -1067,14 +1054,6 @@ void Global::SetCameraRotation(double Yaw) pCameraRotationDeg = pCameraRotation * 180.0 / M_PI; } -void Global::BindTexture(GLuint t) -{ // ustawienie aktualnej tekstury, tylko gdy się zmienia - if (t != iTextureId) - { - iTextureId = t; - } -}; - void Global::TrainDelete(TDynamicObject *d) { // usunięcie pojazdu prowadzonego przez użytkownika if (pWorld) diff --git a/Globals.h b/Globals.h index 5189f2bc..5ef88689 100644 --- a/Globals.h +++ b/Globals.h @@ -163,7 +163,6 @@ private: class Global { private: - static GLuint iTextureId; // ostatnio użyta tekstura 2D public: // double Global::tSinceStart; static int Keys[MaxKeys]; @@ -282,6 +281,7 @@ class Global static std::string szTexturesTGA; // lista tekstur od TGA static std::string szTexturesDDS; // lista tekstur od DDS static int iMultisampling; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px + static bool DLFont; // switch indicating presence of basic font static bool bGlutFont; // tekst generowany przez GLUT static int iKeyLast; // ostatnio naciśnięty klawisz w celu logowania static int iPause; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie @@ -322,6 +322,7 @@ class Global static std::string asTranscript[5]; // napisy na ekranie (widoczne) */ static TTranscripts tranTexts; // obiekt obsługujący stenogramy dźwięków na ekranie + static float4 UITextColor; // base color of UI text static std::string asLang; // domyślny język - http://tools.ietf.org/html/bcp47 static int iHiddenEvents; // czy łączyć eventy z torami poprzez nazwę toru static TTextSound *tsRadioBusy[10]; // zajętość kanałów radiowych (wskaźnik na odgrywany dźwięk) diff --git a/Train.cpp b/Train.cpp index 4ddd8b78..007c6082 100644 --- a/Train.cpp +++ b/Train.cpp @@ -295,35 +295,58 @@ PyObject *TTrain::GetTrainState() { return NULL; } - PyDict_SetItemString( dict, "direction", PyGetInt( DynamicObject->MoverParameters->ActiveDir ) ); - PyDict_SetItemString( dict, "cab", PyGetInt( DynamicObject->MoverParameters->ActiveCab ) ); - PyDict_SetItemString( dict, "slipping_wheels", - PyGetBool( DynamicObject->MoverParameters->SlippingWheels ) ); - PyDict_SetItemString( dict, "converter", - PyGetBool( DynamicObject->MoverParameters->ConverterFlag ) ); - PyDict_SetItemString( dict, "main_ctrl_actual_pos", - PyGetInt( DynamicObject->MoverParameters->MainCtrlActualPos ) ); - PyDict_SetItemString( dict, "scnd_ctrl_actual_pos", - PyGetInt( DynamicObject->MoverParameters->ScndCtrlActualPos ) ); - PyDict_SetItemString( dict, "fuse", PyGetBool( DynamicObject->MoverParameters->FuseFlag ) ); - PyDict_SetItemString( dict, "converter_overload", - PyGetBool( DynamicObject->MoverParameters->ConvOvldFlag ) ); - PyDict_SetItemString( dict, "voltage", PyGetFloat( DynamicObject->MoverParameters->Voltage ) ); - PyDict_SetItemString( dict, "velocity", PyGetFloat( DynamicObject->MoverParameters->Vel ) ); - PyDict_SetItemString( dict, "im", PyGetFloat( DynamicObject->MoverParameters->Im ) ); - PyDict_SetItemString( dict, "compress", - PyGetBool( DynamicObject->MoverParameters->CompressorFlag ) ); - PyDict_SetItemString( dict, "hours", PyGetInt( GlobalTime->hh ) ); - PyDict_SetItemString( dict, "minutes", PyGetInt( GlobalTime->mm ) ); - PyDict_SetItemString( dict, "seconds", PyGetInt( GlobalTime->mr ) ); - PyDict_SetItemString( dict, "velocity_desired", PyGetFloat( DynamicObject->Mechanik->VelDesired ) ); + auto const &mover = DynamicObject->MoverParameters; + + PyDict_SetItemString( dict, "cab", PyGetInt( mover->ActiveCab ) ); + // basic systems state data + PyDict_SetItemString( dict, "battery", PyGetBool( mvControlled->Battery ) ); + PyDict_SetItemString( dict, "linebreaker", PyGetBool( mvControlled->Mains ) ); + PyDict_SetItemString( dict, "converter", PyGetBool( mover->ConverterFlag ) ); + PyDict_SetItemString( dict, "converter_overload", PyGetBool( mover->ConvOvldFlag ) ); + PyDict_SetItemString( dict, "compress", PyGetBool( mover->CompressorFlag ) ); + // reverser + PyDict_SetItemString( dict, "direction", PyGetInt( mover->ActiveDir ) ); + // throttle + PyDict_SetItemString( dict, "mainctrl_pos", PyGetInt( mover->MainCtrlPos ) ); + PyDict_SetItemString( dict, "main_ctrl_actual_pos", PyGetInt( mover->MainCtrlActualPos ) ); + PyDict_SetItemString( dict, "scndctrl_pos", PyGetInt( mover->ScndCtrlPos ) ); + PyDict_SetItemString( dict, "scnd_ctrl_actual_pos", PyGetInt( mover->ScndCtrlActualPos ) ); + // brakes + PyDict_SetItemString( dict, "manual_brake", PyGetBool( mvOccupied->ManualBrakePos > 0 ) ); + bool const bEP = ( mvControlled->LocHandle->GetCP()>0.2 ) || ( fEIMParams[ 0 ][ 2 ]>0.01 ); + PyDict_SetItemString( dict, "dir_brake", PyGetBool( bEP ) ); + bool bPN; + if( ( typeid( *mvControlled->Hamulec ) == typeid( TLSt ) ) + || ( typeid( *mvControlled->Hamulec ) == typeid( TEStED ) ) ) { + + TBrake* temp_ham = mvControlled->Hamulec.get(); + bPN = ( static_cast( temp_ham )->GetEDBCP()>0.2 ); + } + else + bPN = false; + PyDict_SetItemString( dict, "indir_brake", PyGetBool( bPN ) ); + // other controls + PyDict_SetItemString( dict, "ca", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) ); + PyDict_SetItemString( dict, "shp", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_active ) ) ); + PyDict_SetItemString( dict, "pantpress", PyGetFloat( mvControlled->PantPress ) ); + PyDict_SetItemString( dict, "universal3", PyGetBool( LampkaUniversal3_st ) ); + // movement data + PyDict_SetItemString( dict, "velocity", PyGetFloat( mover->Vel ) ); + PyDict_SetItemString( dict, "tractionforce", PyGetFloat( mover->Ft ) ); + PyDict_SetItemString( dict, "slipping_wheels", PyGetBool( mover->SlippingWheels ) ); + // electric current data + PyDict_SetItemString( dict, "traction_voltage", PyGetFloat( mover->RunningTraction.TractionVoltage ) ); + PyDict_SetItemString( dict, "voltage", PyGetFloat( mover->Voltage ) ); + PyDict_SetItemString( dict, "im", PyGetFloat( mover->Im ) ); + PyDict_SetItemString( dict, "fuse", PyGetBool( mover->FuseFlag ) ); + // induction motor state data char* TXTT[ 10 ] = { "fd", "fdt", "fdb", "pd", "pdt", "pdb", "itothv", "1", "2", "3" }; char* TXTC[ 10 ] = { "fr", "frt", "frb", "pr", "prt", "prb", "im", "vm", "ihv", "uhv" }; char* TXTP[ 3 ] = { "bc", "bp", "sp" }; - for( int j = 0; j<10; j++ ) + for( int j = 0; j < 10; ++j ) PyDict_SetItemString( dict, ( std::string( "eimp_t_" ) + std::string( TXTT[ j ] ) ).c_str(), PyGetFloatS( fEIMParams[ 0 ][ j ] ) ); - for( int i = 0; i<8; i++ ) { - for( int j = 0; j<10; j++ ) + for( int i = 0; i < 8; ++i ) { + for( int j = 0; j < 10; ++j ) PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_" ) + std::string( TXTC[ j ] ) ).c_str(), PyGetFloatS( fEIMParams[ i + 1 ][ j ] ) ); PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_ms" ) ).c_str(), PyGetBool( bMains[ i ] ) ); PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_cv" ) ).c_str(), PyGetFloatS( fCntVol[ i ] ) ); @@ -337,25 +360,17 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_heat" ) ).c_str(), PyGetBool( bHeat[ i ] ) ); } - for( int i = 0; i<20; i++ ) { - for( int j = 0; j<3; j++ ) + for( int i = 0; i < 20; ++i ) { + for( int j = 0; j < 3; ++j ) PyDict_SetItemString( dict, ( std::string( "eimp_pn" ) + std::to_string( i + 1 ) + std::string( "_" ) + std::string( TXTP[ j ] ) ).c_str(), PyGetFloatS( fPress[ i ][ j ] ) ); } - bool bEP, bPN; - bEP = ( mvControlled->LocHandle->GetCP()>0.2 ) || ( fEIMParams[ 0 ][ 2 ]>0.01 ); - PyDict_SetItemString( dict, "dir_brake", PyGetBool( bEP ) ); - if( ( typeid( *mvControlled->Hamulec ) == typeid( TLSt ) ) - || ( typeid( *mvControlled->Hamulec ) == typeid( TEStED ) ) ) { + // multi-unit state data + PyDict_SetItemString( dict, "car_no", PyGetInt( iCarNo ) ); + PyDict_SetItemString( dict, "power_no", PyGetInt( iPowerNo ) ); + PyDict_SetItemString( dict, "unit_no", PyGetInt( iUnitNo ) ); - TBrake* temp_ham = mvControlled->Hamulec.get(); - // TLSt* temp_ham2 = temp_ham; - bPN = ( static_cast( temp_ham )->GetEDBCP()>0.2 ); - } - else - bPN = false; - PyDict_SetItemString( dict, "indir_brake", PyGetBool( bPN ) ); - for( int i = 0; i<20; i++ ) { + for( int i = 0; i < 20; i++ ) { PyDict_SetItemString( dict, ( std::string( "doors_" ) + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 0 ] ) ); PyDict_SetItemString( dict, ( std::string( "doors_r_" ) + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 1 ] ) ); PyDict_SetItemString( dict, ( std::string( "doors_l_" ) + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 2 ] ) ); @@ -364,23 +379,21 @@ PyObject *TTrain::GetTrainState() { cCode[ i ] ).c_str() ) ); PyDict_SetItemString( dict, ( std::string( "car_name" ) + std::to_string( i + 1 ) ).c_str(), PyGetString( asCarName[ i ].c_str() ) ); } - PyDict_SetItemString( dict, "car_no", PyGetInt( iCarNo ) ); - PyDict_SetItemString( dict, "power_no", PyGetInt( iPowerNo ) ); - PyDict_SetItemString( dict, "unit_no", PyGetInt( iUnitNo ) ); - PyDict_SetItemString( dict, "universal3", PyGetBool( LampkaUniversal3_st ) ); - PyDict_SetItemString( dict, "ca", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) ); - PyDict_SetItemString( dict, "shp", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_active ) ) ); - PyDict_SetItemString( dict, "manual_brake", PyGetBool( mvOccupied->ManualBrakePos > 0 ) ); - PyDict_SetItemString( dict, "pantpress", PyGetFloat( mvControlled->PantPress ) ); - PyDict_SetItemString( dict, "trainnumber", PyGetString( DynamicObject->Mechanik->TrainName().c_str() ) ); - PyDict_SetItemString( dict, "velnext", PyGetFloat( DynamicObject->Mechanik->VelNext ) ); - PyDict_SetItemString( dict, "actualproximitydist", PyGetFloat( DynamicObject->Mechanik->ActualProximityDist ) ); - PyDict_SetItemString( dict, "velsignallast", PyGetFloat( DynamicObject->Mechanik->VelSignalLast ) ); - PyDict_SetItemString( dict, "vellimitlast", PyGetFloat( DynamicObject->Mechanik->VelLimitLast ) ); - PyDict_SetItemString( dict, "velroad", PyGetFloat( DynamicObject->Mechanik->VelRoad ) ); - PyDict_SetItemString( dict, "velsignalnext", PyGetFloat( DynamicObject->Mechanik->VelSignalNext ) ); - PyDict_SetItemString( dict, "battery", PyGetBool( mvControlled->Battery ) ); - PyDict_SetItemString( dict, "tractionforce", PyGetFloat( DynamicObject->MoverParameters->Ft ) ); + // ai state data + auto const &driver = DynamicObject->Mechanik; + + PyDict_SetItemString( dict, "velocity_desired", PyGetFloat( driver->VelDesired ) ); + PyDict_SetItemString( dict, "velroad", PyGetFloat( driver->VelRoad ) ); + PyDict_SetItemString( dict, "vellimitlast", PyGetFloat( driver->VelLimitLast ) ); + PyDict_SetItemString( dict, "velsignallast", PyGetFloat( driver->VelSignalLast ) ); + PyDict_SetItemString( dict, "velsignalnext", PyGetFloat( driver->VelSignalNext ) ); + PyDict_SetItemString( dict, "velnext", PyGetFloat( driver->VelNext ) ); + PyDict_SetItemString( dict, "actualproximitydist", PyGetFloat( driver->ActualProximityDist ) ); + PyDict_SetItemString( dict, "trainnumber", PyGetString( driver->TrainName().c_str() ) ); + // world state data + PyDict_SetItemString( dict, "hours", PyGetInt( GlobalTime->hh ) ); + PyDict_SetItemString( dict, "minutes", PyGetInt( GlobalTime->mm ) ); + PyDict_SetItemString( dict, "seconds", PyGetInt( GlobalTime->mr ) ); return dict; } diff --git a/Train.h b/Train.h index 3b31f20e..173d1489 100644 --- a/Train.h +++ b/Train.h @@ -252,8 +252,7 @@ class TTrain TButton btLampkaOpory; TButton btLampkaWysRozr; TButton btLampkaUniversal3; - int LampkaUniversal3_typ; // ABu 030405 - swiecenie uzaleznione od: 0-nic, - // 1-obw.gl, 2-przetw. + int LampkaUniversal3_typ; // ABu 030405 - swiecenie uzaleznione od: 0-nic, 1-obw.gl, 2-przetw. bool LampkaUniversal3_st; TButton btLampkaWentZaluzje; // ET22 TButton btLampkaOgrzewanieSkladu; diff --git a/World.cpp b/World.cpp index 69ae557f..f052b13b 100644 --- a/World.cpp +++ b/World.cpp @@ -253,10 +253,10 @@ bool TWorld::Init( GLFWwindow *Window ) { Timer::ResetTimers(); // make 4 empty lines for the ui header, to cut down on work down the road - UIHeader->text_lines.emplace_back( "", float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ) ); - UIHeader->text_lines.emplace_back( "", float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ) ); - UIHeader->text_lines.emplace_back( "", float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ) ); - UIHeader->text_lines.emplace_back( "", float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ) ); + UIHeader->text_lines.emplace_back( "", Global::UITextColor ); + UIHeader->text_lines.emplace_back( "", Global::UITextColor ); + UIHeader->text_lines.emplace_back( "", Global::UITextColor ); + UIHeader->text_lines.emplace_back( "", Global::UITextColor ); // bind the panels with ui object. maybe not the best place for this but, eh UILayer.push_back( UIHeader ); UILayer.push_back( UITable ); @@ -334,33 +334,42 @@ void TWorld::OnKeyDown(int cKey) if( ( false == Global::ctrlState ) && ( false == Global::shiftState ) ) { // czas i relacja - if( Global::iTextMode == cKey ) { - // wyłączenie napisów, chyba że pauza - Global::iTextMode = - ( Global::iPause && ( cKey != GLFW_KEY_F1 ) ? - GLFW_KEY_F1 : - 0 ); + if( Global::iTextMode == cKey ) { ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; } + if( Global::iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { + // wyłączenie napisów + Global::iTextMode = 0; + Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; } - else + else { Global::iTextMode = cKey; + } } break; } case GLFW_KEY_F2: { // parametry pojazdu - if( Global::iTextMode == cKey ) { - // jeśli kolejne naciśnięcie - ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; // kolejny ekran + if( Global::iTextMode == cKey ) { ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; } + if( Global::iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { + // wyłączenie napisów + Global::iTextMode = 0; + Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; } else { - // pierwsze naciśnięcie daje pierwszy (tzn. zerowy) ekran Global::iTextMode = cKey; - Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; } break; } case GLFW_KEY_F3: { - Global::iTextMode = cKey; + // timetable + if( Global::iTextMode == cKey ) { ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; } + if( Global::iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { + // wyłączenie napisów + Global::iTextMode = 0; + Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; + } + else { + Global::iTextMode = cKey; + } break; } case GLFW_KEY_F4: { @@ -408,7 +417,7 @@ void TWorld::OnKeyDown(int cKey) break; } case GLFW_KEY_F6: { - Global::iTextMode = cKey; +// Global::iTextMode = cKey; // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! if( DebugModeFlag ) { @@ -851,7 +860,7 @@ bool TWorld::Update() if( (Train != nullptr) && (Camera.Type == tp_Follow )) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery - Train->UpdateMechPosition( m_secondaryupdaterate / Global::fTimeSpeed ); // ograniczyć telepanie po przyspieszeniu + Train->UpdateMechPosition( m_secondaryupdaterate ); } m_secondaryupdateaccumulator -= m_secondaryupdaterate; // these should be inexpensive enough we have no cap @@ -1433,19 +1442,112 @@ TWorld::Update_UI() { if( Global::iPause ) { OutText1 += " (paused)"; } + + if( Controlled && ( Controlled->Mechanik != nullptr ) ) { + + auto const &mover = Controlled->MoverParameters; + auto const &driver = Controlled->Mechanik; + + OutText2 = "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ); + if( mover->ActiveDir > 0 ) { OutText2 += " D"; } + else if( mover->ActiveDir < 0 ) { OutText2 += " R"; } + else { OutText2 += " N"; } + + OutText3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + std::to_string( mover->LocalBrakePos ); + + if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { + // detail mode on second key press + OutText2 += + " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" + + " (limit: " + std::to_string( static_cast( std::floor( driver->VelDesired ) ) ) + " km/h" + + ", next limit: " + std::to_string( static_cast( std::floor( Controlled->Mechanik->VelNext ) ) ) + " km/h" + + " in " + to_string( Controlled->Mechanik->ActualProximityDist * 0.001, 1 ) + " km)"; + OutText3 += + " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; + } + } + + break; + } + + case( GLFW_KEY_F2 ) : { + // timetable + TDynamicObject *tmp = + ( FreeFlyModeFlag ? + Ground.DynamicNearest( Camera.Pos ) : + Controlled ); // w trybie latania lokalizujemy wg mapy + + if( tmp == nullptr ) { break; } + if( tmp->Mechanik == nullptr ) { break; } + + auto const table = tmp->Mechanik->Timetable(); + if( table == nullptr ) { break; } + + OutText1 = + "Time: " + + to_string( (int)GlobalTime->hh ) + ":" + + ( GlobalTime->mm < 10 ? "0" : "" ) + to_string( GlobalTime->mm ) + ":" + + ( GlobalTime->mr < 10 ? "0" : "" ) + to_string( std::floor( GlobalTime->mr ) ); + if( Global::iPause ) { + OutText1 += " (paused)"; + } + if( Controlled && Controlled->Mechanik ) { - OutText2 = Global::Bezogonkow( Controlled->Mechanik->Relation(), true ); + OutText2 = Global::Bezogonkow( Controlled->Mechanik->Relation(), true ) + " (" + tmp->Mechanik->Timetable()->TrainName + ")"; if( !OutText2.empty() ) { // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania OutText3 = " -> " + Global::Bezogonkow( Controlled->Mechanik->NextStop(), true ); } } + if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { + + if( 0 == table->StationCount ) { + // only bother if there's stations to list + UITable->text_lines.emplace_back( "(no timetable)", Global::UITextColor ); + } + else { + // header + UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global::UITextColor ); + + TMTableLine *tableline; + for( int i = tmp->Mechanik->iStationStart; i <= std::min( tmp->Mechanik->iStationStart + 15, table->StationCount ); ++i ) { + // wyświetlenie pozycji z rozkładu + tableline = table->TimeTable + i; // linijka rozkładu + + std::string station = + ( tableline->StationName + " " ).substr( 0, 26 ); + std::string arrival = + ( tableline->Ah >= 0 ? + to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : + " " ); + std::string departure = + ( tableline->Dh >= 0 ? + to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : + " " ); + std::string vmax = + " " + + to_string( tableline->vmax, 0 ); + vmax = vmax.substr( vmax.length() - 3, 3 ); // z wyrównaniem do prawej + + UITable->text_lines.emplace_back( + Global::Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), + ( ( tmp->Mechanik->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) ? + float4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono + Global::UITextColor ) + ); + // divider/footer + UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global::UITextColor ); + } + } + } + break; } - case( GLFW_KEY_F2 ) : { + case( GLFW_KEY_F3 ) : { TDynamicObject *tmp = ( FreeFlyModeFlag ? @@ -1574,19 +1676,18 @@ TWorld::Update_UI() { OutText4 += ", command: " + tmp->Mechanik->OrderCurrent(); } - if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] != 0 ) { + if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { // f2 screen, track scan mode if( tmp->Mechanik == nullptr ) { //żeby była tabelka, musi być AI break; } - float4 linecolor( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); int i = 0; do { std::string scanline = tmp->Mechanik->TableText( i ); if( scanline.empty() ) { break; } - UITable->text_lines.emplace_back( Global::Bezogonkow( scanline ), linecolor ); + UITable->text_lines.emplace_back( Global::Bezogonkow( scanline ), Global::UITextColor ); ++i; } while( i < 16 ); // TController:iSpeedTableSize TODO: change when the table gets recoded } @@ -1611,74 +1712,6 @@ TWorld::Update_UI() { break; } - case( GLFW_KEY_F3 ) : { - // timetable - TDynamicObject *tmp = - ( FreeFlyModeFlag ? - Ground.DynamicNearest( Camera.Pos ) : - Controlled ); // w trybie latania lokalizujemy wg mapy - - if( tmp == nullptr ) { break; } - if( tmp->Mechanik == nullptr ) { break; } - - auto const table = tmp->Mechanik->Timetable(); - if( table == nullptr ) { break; } - - OutText1 = - "Time: " - + to_string( (int)GlobalTime->hh ) + ":" - + ( GlobalTime->mm < 10 ? "0" : "" ) + to_string( GlobalTime->mm ) + ":" - + ( GlobalTime->mr < 10 ? "0" : "" ) + to_string( std::floor( GlobalTime->mr ) ); - if( Global::iPause ) { - OutText1 += " (paused)"; - } - - OutText2 = tmp->Mechanik->Relation() + " (" + tmp->Mechanik->Timetable()->TrainName + ")"; - - float4 linecolor( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); - - if( 0 == table->StationCount ) { - // only bother if there's stations to list - UITable->text_lines.emplace_back( "(no timetable)", linecolor ); - } - else { - // header - UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", linecolor ); - - TMTableLine *tableline; - for( int i = tmp->Mechanik->iStationStart; i <= std::min( tmp->Mechanik->iStationStart + 15, table->StationCount ); ++i ) { - // wyświetlenie pozycji z rozkładu - tableline = table->TimeTable + i; // linijka rozkładu - - std::string station = - ( tableline->StationName + " " ).substr( 0, 26 ); - std::string arrival = - ( tableline->Ah >= 0 ? - to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : - " " ); - std::string departure = - ( tableline->Dh >= 0 ? - to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : - " " ); - std::string vmax = - " " - + to_string( tableline->vmax, 0 ); - vmax = vmax.substr( vmax.length() - 3, 3 ); // z wyrównaniem do prawej - - UITable->text_lines.emplace_back( - Global::Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), - ( ( tmp->Mechanik->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) ? - float4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono - linecolor ) - ); - // divider/footer - UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", linecolor ); - } - } - - break; - } - case( GLFW_KEY_F8 ) : { OutText1 = @@ -1846,9 +1879,7 @@ TWorld::Update_UI() { // induction motor data if( tmp->MoverParameters->EngineType == ElectricInductionMotor ) { - float4 linecolor( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); - - UITable->text_lines.emplace_back( " eimc: eimv: press:", linecolor ); + UITable->text_lines.emplace_back( " eimc: eimv: press:", Global::UITextColor ); for( int i = 0; i <= 20; ++i ) { std::string parameters = @@ -1865,7 +1896,7 @@ TWorld::Update_UI() { parameters += " " + to_string( tmp->MED[ 0 ][ i - 13 ], 2, 9 ); } - UITable->text_lines.emplace_back( parameters, linecolor ); + UITable->text_lines.emplace_back( parameters, Global::UITextColor ); } } diff --git a/lightarray.cpp b/lightarray.cpp index 923709fd..d37082e3 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -46,12 +46,12 @@ light_array::update() { // update light parameters to match current data of the owner if( light.index == 0 ) { // front light set - light.position = light.owner->GetPosition() + ( light.owner->VectorFront() * light.owner->GetLength() * 0.45 ); + light.position = light.owner->GetPosition() + ( light.owner->VectorFront() * light.owner->GetLength() * 0.4 ); light.direction = light.owner->VectorFront(); } else { // rear light set - light.position = light.owner->GetPosition() - ( light.owner->VectorFront() * light.owner->GetLength() * 0.45 ); + light.position = light.owner->GetPosition() - ( light.owner->VectorFront() * light.owner->GetLength() * 0.4 ); light.direction = light.owner->VectorFront(); light.direction.x = -light.direction.x; light.direction.z = -light.direction.z; diff --git a/uilayer.cpp b/uilayer.cpp index 19312efd..a7e3f8ec 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -47,11 +47,15 @@ ui_layer::init( GLFWwindow *Window ) { // builds 96 characters starting at character 32 WriteLog( "Display Lists font used" ); //+AnsiString(glGetError()) WriteLog( "Font init OK" ); //+AnsiString(glGetError()) + Global::DLFont = true; return true; } else { ErrorLog( "Font init failed" ); - return false; +// return false; + // NOTE: we report success anyway, given some cards can't produce fonts in this manner + Global::DLFont = false; + return true; } } @@ -171,7 +175,8 @@ ui_layer::render_background() { void ui_layer::print( std::string const &Text ) { - if( true == Text.empty() ) + if( (false == Global::DLFont) + || (true == Text.empty()) ) return; ::glPushAttrib( GL_LIST_BIT ); From 4052bdea5c34f2dd8aa932f8512694f6e9476d3e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 20 Mar 2017 17:17:17 +0100 Subject: [PATCH 065/426] re-enabled vbo render path --- AnimModel.cpp | 8 ++--- AnimModel.h | 2 -- Globals.cpp | 2 -- Ground.cpp | 39 ++++++++++------------ Ground.h | 9 +---- Model3d.cpp | 16 ++++----- Model3d.h | 16 +++++---- World.cpp | 12 +++---- renderer.cpp | 91 ++++++++++++++++++++++++++++++++++++--------------- sky.cpp | 2 -- 10 files changed, 109 insertions(+), 88 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 97e0f1ca..6408a443 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -708,21 +708,21 @@ void TAnimModel::RenderAlphaDL(vector3 *vPosition) GfxRenderer.Render_Alpha( pModel, Material(), *vPosition, vAngle ); #endif }; -/* + void TAnimModel::RenderVBO(vector3 *vPosition) { RaAnimate(); // jednorazowe przeliczenie animacji RaPrepare(); if (pModel) // renderowanie rekurencyjne submodeli - pModel->RaRender(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); + pModel->RaRender(vPosition, &vAngle, Material()->replacable_skins, Material()->textures_alpha); }; void TAnimModel::RenderAlphaVBO(vector3 *vPosition) { RaPrepare(); if (pModel) // renderowanie rekurencyjne submodeli - pModel->RaRenderAlpha(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); + pModel->RaRenderAlpha(vPosition, &vAngle, Material()->replacable_skins, Material()->textures_alpha); }; -*/ + //--------------------------------------------------------------------------- bool TAnimModel::TerrainLoaded() diff --git a/AnimModel.h b/AnimModel.h index cee8f562..5c8693f2 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -177,10 +177,8 @@ class TAnimModel void RenderAlphaVBO(vector3 pPosition = vector3(0, 0, 0), double fAngle = 0); */ void RenderDL(vector3 *vPosition); void RenderAlphaDL(vector3 *vPosition); -/* void RenderVBO(vector3 *vPosition); void RenderAlphaVBO(vector3 *vPosition); -*/ int Flags(); void RaAnglesSet(double a, double b, double c) { diff --git a/Globals.cpp b/Globals.cpp index c46a22c4..db9399a0 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -486,8 +486,6 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::bUseVBO; - // NOTE: temporary override until render paths are sorted out - Global::bUseVBO = false; } else if (token == "feedbackmode") { diff --git a/Ground.cpp b/Ground.cpp index 11f2bae1..6126a70d 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -280,7 +280,7 @@ void TGroundNode::MoveMe(vector3 pPosition) ResourceManager::Unregister(this); } } -/* + void TGroundNode::RaRenderVBO() { // renderowanie z domyslnego bufora VBO glColor3ub(Diffuse[0], Diffuse[1], Diffuse[2]); @@ -445,7 +445,7 @@ void TGroundNode::RenderAlphaVBO() #endif return; } -*/ + void TGroundNode::Compile(bool many) { // tworzenie skompilowanej listy w wyświetlaniu DL if (!many) @@ -1222,7 +1222,7 @@ void TSubRect::RenderAlphaDL() for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach }; -/* + void TSubRect::RenderVBO() { // renderowanie nieprzezroczystych (VBO) TGroundNode *node; @@ -1256,7 +1256,7 @@ void TSubRect::RenderAlphaVBO() for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach }; -*/ + void TSubRect::RenderSounds() { // aktualizacja dźwięków w pojazdach sektora (sektor może nie być wyświetlany) for (int j = 0; j < iTracks; ++j) @@ -1355,7 +1355,7 @@ void TGroundRect::RenderDL() glEnable( GL_LIGHTING ); */ }; -/* + void TGroundRect::RenderVBO() { // renderowanie kwadratu kilometrowego (VBO), jeśli jeszcze nie zrobione if (iLastDisplay != iFrameNumber) @@ -1372,7 +1372,7 @@ void TGroundRect::RenderVBO() nTerrain->smTerrain->iVisible = iFrameNumber; // ma się wyświetlić w tej ramce } }; -*/ + //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -4890,23 +4890,20 @@ bool TGround::Render( Math3D::vector3 const &Camera ) { GfxRenderer.Update_Lights( m_lights ); - /* + if( Global::bUseVBO ) { // renderowanie przez VBO - if( !RenderVBO( Camera ) ) - return false; - if( !RenderAlphaVBO( Camera ) ) - return false; + if( !RenderVBO( Camera ) ) + return false; + if( !RenderAlphaVBO( Camera ) ) + return false; } else { - */ - // renderowanie przez Display List - if( !RenderDL( Camera ) ) - return false; - if( !RenderAlphaDL( Camera ) ) - return false; - /* + // renderowanie przez Display List + if( !RenderDL( Camera ) ) + return false; + if( !RenderAlphaDL( Camera ) ) + return false; } - */ return true; } @@ -4999,7 +4996,7 @@ bool TGround::RenderAlphaDL(vector3 pPosition) } return true; } -/* + bool TGround::RenderVBO(vector3 pPosition) { // renderowanie scenerii z VBO - faza nieprzezroczystych glDisable(GL_BLEND); @@ -5102,7 +5099,7 @@ bool TGround::RenderAlphaVBO(vector3 pPosition) } return true; }; -*/ + #ifdef _WINDOWS //--------------------------------------------------------------------------- void TGround::Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) diff --git a/Ground.h b/Ground.h index dda67bfd..9a8673c5 100644 --- a/Ground.h +++ b/Ground.h @@ -178,11 +178,10 @@ class TGroundNode : public Resource void RenderDL(); // renderowanie nieprzezroczystych w Display Lists void RenderAlphaDL(); // renderowanie przezroczystych w Display Lists // (McZapkie-131202) -/* void RaRenderVBO(); // renderowanie (nieprzezroczystych) ze wspólnego VBO void RenderVBO(); // renderowanie nieprzezroczystych z własnego VBO void RenderAlphaVBO(); // renderowanie przezroczystych z (własnego) VBO -*/ + }; struct bounding_area { @@ -229,11 +228,9 @@ class TSubRect : public Resource, public CMesh void RaAnimate(); // przeliczenie animacji torów void RenderDL(); // renderowanie nieprzezroczystych w Display Lists void RenderAlphaDL(); // renderowanie przezroczystych w Display Lists -/* // (McZapkie-131202) void RenderVBO(); // renderowanie nieprzezroczystych z własnego VBO void RenderAlphaVBO(); // renderowanie przezroczystych z (własnego) VBO -*/ void RenderSounds(); // dźwięki pojazdów z niewidocznych sektorów }; @@ -277,9 +274,7 @@ class TGroundRect : public TSubRect pSubRects[i].Sort(); // optymalizacja obiektów w sektorach }; void RenderDL(); -/* void RenderVBO(); -*/ }; class TGround @@ -368,10 +363,8 @@ class TGround bool Render( Math3D::vector3 const &Camera ); bool RenderDL(vector3 pPosition); bool RenderAlphaDL(vector3 pPosition); -/* bool RenderVBO(vector3 pPosition); bool RenderAlphaVBO(vector3 pPosition); -*/ bool CheckQuery(); // GetRect(double x, double z) { return // &(Rects[int(x/fSubRectSize+fHalfNumRects)][int(z/fSubRectSize+fHalfNumRects)]); }; diff --git a/Model3d.cpp b/Model3d.cpp index 829245de..0c588621 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -2185,8 +2185,8 @@ void TModel3d::RenderAlpha(double fSquareDistance, texture_manager::size_type *R Root->RenderAlphaDL(); } }; - -void TModel3d::RaRender(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) +#endif +void TModel3d::RaRender(double fSquareDistance, texture_manager::size_type const *ReplacableSkinId, int iAlpha) { // renderowanie specjalne, np. kabiny iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste if (iAlpha & iFlags & 0x1F1F001F) // czy w ogóle jest co robić w tym cyklu? @@ -2202,7 +2202,7 @@ void TModel3d::RaRender(double fSquareDistance, texture_manager::size_type *Repl } }; -void TModel3d::RaRenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) +void TModel3d::RaRenderAlpha(double fSquareDistance, texture_manager::size_type const *ReplacableSkinId, int iAlpha) { // renderowanie specjalne, np. kabiny if (iAlpha & iFlags & 0x2F2F002F) // czy w ogóle jest co robić w tym cyklu? { @@ -2219,7 +2219,7 @@ void TModel3d::RaRenderAlpha(double fSquareDistance, texture_manager::size_type //----------------------------------------------------------------------------- // 2011-03-16 cztery nowe funkcje renderowania z możliwością pochylania obiektów //----------------------------------------------------------------------------- - +#ifdef EU07_USE_OLD_RENDERCODE void TModel3d::Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha) { // nieprzezroczyste, Display List glPushMatrix(); @@ -2254,8 +2254,8 @@ void TModel3d::RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager: Root->RenderAlphaDL(); glPopMatrix(); }; - -void TModel3d::RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha) +#endif +void TModel3d::RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type const *ReplacableSkinId, int iAlpha) { // nieprzezroczyste, VBO glPushMatrix(); glTranslated(vPosition->x, vPosition->y, vPosition->z); @@ -2275,7 +2275,7 @@ void TModel3d::RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::si } glPopMatrix(); }; -void TModel3d::RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, +void TModel3d::RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type const *ReplacableSkinId, int iAlpha) { // przezroczyste, VBO glPushMatrix(); @@ -2296,7 +2296,7 @@ void TModel3d::RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manage } glPopMatrix(); }; -#endif + //----------------------------------------------------------------------------- // 2012-02 funkcje do tworzenia terenu z E3D diff --git a/Model3d.h b/Model3d.h index b82a6f50..12ab0a1c 100644 --- a/Model3d.h +++ b/Model3d.h @@ -363,14 +363,16 @@ public: #ifdef EU07_USE_OLD_RENDERCODE void Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); void RenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RaRender(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RaRenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - // trzy kąty obrotu - void Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); #endif + void RaRender(double fSquareDistance, texture_manager::size_type const *ReplacableSkinId = NULL, int iAlpha = 0x30300030); + void RaRenderAlpha(double fSquareDistance, texture_manager::size_type const *ReplacableSkinId = NULL, int iAlpha = 0x30300030); + // trzy kąty obrotu +#ifdef EU07_USE_OLD_RENDERCODE + void Render( vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030 ); + void RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); +#endif + void RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type const *ReplacableSkinId = NULL, int iAlpha = 0x30300030); + void RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type const *ReplacableSkinId = NULL, int iAlpha = 0x30300030); // inline int GetSubModelsCount() { return (SubModelsCount); }; int Flags() const { diff --git a/World.cpp b/World.cpp index f052b13b..07c1bba1 100644 --- a/World.cpp +++ b/World.cpp @@ -1386,13 +1386,13 @@ TWorld::Render_Cab() { ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); } #endif -/* - if( Global::bUseVBO ) { // renderowanie z użyciem VBO. NOTE: disabled for the time being - dynamic->mdKabina->RaRender( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); - dynamic->mdKabina->RaRenderAlpha( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); + + if( Global::bUseVBO ) { + // renderowanie z użyciem VBO. NOTE: needs update, and eventual merge into single render path down the road + dynamic->mdKabina->RaRender( 0.0, dynamic->Material()->replacable_skins, dynamic->Material()->textures_alpha ); + dynamic->mdKabina->RaRenderAlpha( 0.0, dynamic->Material()->replacable_skins, dynamic->Material()->textures_alpha ); } else { -*/ // renderowanie z Display List #ifdef EU07_USE_OLD_RENDERCODE dynamic->mdKabina->Render( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); @@ -1401,9 +1401,7 @@ TWorld::Render_Cab() { GfxRenderer.Render( dynamic->mdKabina, dynamic->Material(), 0.0 ); GfxRenderer.Render_Alpha( dynamic->mdKabina, dynamic->Material(), 0.0 ); #endif -/* } -*/ #ifdef EU07_USE_OLD_LIGHTING_MODEL // przywrócenie standardowych, bo zawsze są zmieniane glLightfv( GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight ); diff --git a/renderer.cpp b/renderer.cpp index 1f16c7d8..8c23dbb1 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -221,39 +221,76 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { ::glMultMatrixd( Dynamic->mMatrix.getArray() ); - // wersja Display Lists - // NOTE: VBO path is removed - // TODO: implement universal render path down the road - if( Dynamic->mdLowPolyInt ) { - // low poly interior - if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { - // enable cab light if needed - if( Dynamic->InteriorLightLevel > 0.0f ) { - - // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } - - Render( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); - - if( Dynamic->InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - } - } + if( Dynamic->fShade > 0.0f ) { + // change light level based on light level of the occupied track + Global::DayLight.apply_intensity( Dynamic->fShade ); } -// Dynamic->mdModel->Render( squaredistance, Dynamic->ReplacableSkinID, Dynamic->iAlpha ); - Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); + // TODO: implement universal render path down the road + if( Global::bUseVBO ) { + // wersja VBO + if( Dynamic->mdLowPolyInt ) { + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + // enable cab light if needed + if( Dynamic->InteriorLightLevel > 0.0f ) { - if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } + + Dynamic->mdLowPolyInt->RaRender( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); + + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } + } + } + + Dynamic->mdModel->RaRender( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); + + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Dynamic->mdLoad->RaRender( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); + } + else { + // wersja Display Lists + if( Dynamic->mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + // enable cab light if needed + if( Dynamic->InteriorLightLevel > 0.0f ) { + + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } + + Render( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); + + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } + } + } + + Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); + + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + } + + if( Dynamic->fShade > 0.0f ) { + // restore regular light level + Global::DayLight.apply_intensity(); + } ::glPopMatrix(); - // TODO: check if this reset is needed. In theory each object should render all buttons based on its own instance data anyway? + // TODO: check if this reset is needed. In theory each object should render all parts based on its own instance data anyway? if( Dynamic->btnOn ) Dynamic->TurnOff(); // przywrócenie domyślnych pozycji submodeli diff --git a/sky.cpp b/sky.cpp index e1641bbf..fa9baa14 100644 --- a/sky.cpp +++ b/sky.cpp @@ -41,10 +41,8 @@ void TSky::Render( float3 const &Tint ) #endif if (Global::bUseVBO) { // renderowanie z VBO -#ifdef EU07_USE_OLD_RENDERCODE mdCloud->RaRender( 100, 0 ); mdCloud->RaRenderAlpha(100, 0); -#endif } else { // renderowanie z Display List From 38acc083d16a0d846681e41bcc5d59cb3508baa2 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 20 Mar 2017 22:09:27 +0100 Subject: [PATCH 066/426] fixed light controls in EZT modules, added missing vbo code --- DynObj.cpp | 19 +++++++------- lightarray.cpp | 4 ++- renderer.cpp | 67 ++++++++++++++++++++++++++++++++++++-------------- stars.cpp | 9 +++++-- 4 files changed, 67 insertions(+), 32 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 3a59e335..e31f1d55 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2451,19 +2451,18 @@ void TDynamicObject::AttachPrev(TDynamicObject *Object, int iType) Object->NextConnected = this; // on ma nas z tyłu Object->NextConnectedNo = iDirection; } +/* + // NOTE: this appears unnecessary and only messes things for the programmable lights function, which walks along + // whole trainset and expects each module to point to its own lights. Disabled, TBD, TODO: test for side-effects and delete if there's none if (MoverParameters->TrainType & dt_EZT) // w przypadku łączenia członów, - // światła w rozrządczym zależą od - // stanu w silnikowym - if (MoverParameters->Couplers[iDirection].AllowedFlag & - ctrain_depot) // gdy sprzęgi łączone warsztatowo (powiedzmy) - if ((MoverParameters->Power < 1.0) && - (Object->MoverParameters->Power > 1.0)) // my nie mamy mocy, ale ten drugi ma - iLights = Object->MoverParameters->iLights; // to w tym z mocą będą światła - // załączane, a w tym bez tylko widoczne + // światła w rozrządczym zależą od stanu w silnikowym + if (MoverParameters->Couplers[iDirection].AllowedFlag & ctrain_depot) // gdy sprzęgi łączone warsztatowo (powiedzmy) + if ((MoverParameters->Power < 1.0) && (Object->MoverParameters->Power > 1.0)) // my nie mamy mocy, ale ten drugi ma + iLights = Object->MoverParameters->iLights; // to w tym z mocą będą światła załączane, a w tym bez tylko widoczne else if ((MoverParameters->Power > 1.0) && (Object->MoverParameters->Power < 1.0)) // my mamy moc, ale ten drugi nie ma - Object->iLights = MoverParameters->iLights; // to w tym z mocą będą światła - // załączane, a w tym bez tylko widoczne + Object->iLights = MoverParameters->iLights; // to w tym z mocą będą światła załączane, a w tym bez tylko widoczne +*/ return; // SetPneumatic(1,1); //Ra: to i tak się nie wykonywało po return // SetPneumatic(1,0); diff --git a/lightarray.cpp b/lightarray.cpp index d37082e3..5cc85168 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -73,16 +73,18 @@ light_array::update() { else { light.intensity = 0.0f; } - +/* // crude catch for unmanned modules which share the light state with the controlled unit. // why don't they get their own light bits btw ._. // TODO, TBD: have separate light bits for each vehicle, so this override isn't necessary + // NOTE: should be no longer needed, test and delete if there's no ill effects if( ( light.owner->Controller == AIdriver ) && ( light.owner->Mechanik == nullptr ) ) { light.intensity = 0.0f; light.count = 0; } +*/ } else { // with battery off the lights are off diff --git a/renderer.cpp b/renderer.cpp index 8c23dbb1..9fe8678c 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -363,34 +363,63 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { ::glTranslated( Dynamic->vPosition.x, Dynamic->vPosition.y, Dynamic->vPosition.z ); // standardowe przesunięcie względem początku scenerii ::glMultMatrixd( Dynamic->mMatrix.getArray() ); - // wersja Display Lists - // NOTE: VBO path is removed + // TODO: implement universal render path down the road - if( Dynamic->mdLowPolyInt ) { - // low poly interior - if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { - // enable cab light if needed - if( Dynamic->InteriorLightLevel > 0.0f ) { + if( Global::bUseVBO ) { + // wersja VBO + if( Dynamic->mdLowPolyInt ) { + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + // enable cab light if needed + if( Dynamic->InteriorLightLevel > 0.0f ) { - // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } - Render_Alpha( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); + Dynamic->mdLowPolyInt->RaRenderAlpha( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); - if( Dynamic->InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } } } + + Dynamic->mdModel->RaRenderAlpha( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); + + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Dynamic->mdLoad->RaRenderAlpha( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); } + else { + // wersja Display Lists + if( Dynamic->mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + // enable cab light if needed + if( Dynamic->InteriorLightLevel > 0.0f ) { - Render_Alpha( Dynamic->mdModel, Dynamic->Material(), squaredistance ); + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } - if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Render_Alpha( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + Render_Alpha( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); + + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + } + } + } + + Render_Alpha( Dynamic->mdModel, Dynamic->Material(), squaredistance ); + + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Render_Alpha( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + } ::glPopMatrix(); diff --git a/stars.cpp b/stars.cpp index 1dafcdcb..b8ee3aa8 100644 --- a/stars.cpp +++ b/stars.cpp @@ -21,11 +21,16 @@ cStars::render() { ::glRotatef( -std::fmod( Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX ::glPointSize( 2.0f ); + if( Global::bUseVBO ) { + m_stars.RaRender( 1.0, 0 ); + } + else { #ifdef EU07_USE_OLD_RENDERCODE - m_stars.Render( 1.0 ); + m_stars.Render( 1.0 ); #else - GfxRenderer.Render( &m_stars, nullptr, 1.0 ); + GfxRenderer.Render( &m_stars, nullptr, 1.0 ); #endif + } ::glPointSize( 3.0f ); ::glPopMatrix(); From f4a5f6046599ee5024e64c69d45dc3a9fbbabd47 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 21 Mar 2017 17:31:50 +0100 Subject: [PATCH 067/426] executable info, static daylight toggle fix --- EU07.cpp | 6 ++++++ Globals.cpp | 6 +++--- Globals.h | 1 + PyInt.cpp | 2 +- World.cpp | 2 +- maszyna.vcxproj.user | 9 +++++++++ sun.cpp | 4 ++-- 7 files changed, 23 insertions(+), 7 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index c24f5e11..e869980d 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -249,6 +249,12 @@ int main(int argc, char *argv[]) SetConsoleTextAttribute( GetStdHandle( STD_OUTPUT_HANDLE ), FOREGROUND_GREEN ); } + std::string executable( argv[ 0 ] ); auto const pathend = executable.rfind( '\\' ); + Global::ExecutableName = + ( pathend != std::string::npos ? + executable.substr( executable.rfind( '\\' ) + 1 ) : + executable ); + for (int i = 1; i < argc; ++i) { std::string token(argv[i]); diff --git a/Globals.cpp b/Globals.cpp index db9399a0..f468c33d 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -48,9 +48,9 @@ GLFWwindow *Global::window; bool Global::shiftState; bool Global::ctrlState; int Global::iCameraLast = -1; -std::string Global::asRelease = "16.0.1172.482++"; -std::string Global::asVersion = -"Compilation 2017-03-19, release " + Global::asRelease + "."; // tutaj, bo wysyłany +std::string Global::asRelease = "16.0.1172.482"; +std::string Global::asVersion = "Compilation 2017-03-19, release " + Global::asRelease; // tutaj, bo wysyłany +std::string Global::ExecutableName; int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // numer ekranu wyświetlacza tekstowego double Global::fSunDeclination = 0.0; // deklinacja Słońca diff --git a/Globals.h b/Globals.h index 5ef88689..ba81d91e 100644 --- a/Globals.h +++ b/Globals.h @@ -266,6 +266,7 @@ class Global static int iCameraLast; static std::string asRelease; // numer static std::string asVersion; // z opisem + static std::string ExecutableName; static GLint iMaxTextureSize; // maksymalny rozmiar tekstury static int iTextMode; // tryb pracy wyświetlacza tekstowego static int iScreenMode[12]; // numer ekranu wyświetlacza tekstowego diff --git a/PyInt.cpp b/PyInt.cpp index 5c6c9c91..84fd7847 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -307,7 +307,7 @@ void TPythonScreenRenderer::updateTexture() glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); } // build texture - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, textureData); + glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, textureData ); #ifdef _PY_INT_MORE_LOG GLenum status = glGetError(); diff --git a/World.cpp b/World.cpp index 07c1bba1..e50f21d2 100644 --- a/World.cpp +++ b/World.cpp @@ -149,7 +149,7 @@ bool TWorld::Init( GLFWwindow *Window ) { Global::pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań WriteLog("\nStarting MaSzyna rail vehicle simulator."); - WriteLog(Global::asVersion); + WriteLog( "Release " + Global::asRelease + " (executable: " + Global::ExecutableName + ")" ); WriteLog("Online documentation and additional files on http://eu07.pl"); 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\n"); diff --git a/maszyna.vcxproj.user b/maszyna.vcxproj.user index 760c128e..3aea8305 100644 --- a/maszyna.vcxproj.user +++ b/maszyna.vcxproj.user @@ -8,6 +8,10 @@ ..\..\Projects\maszyna WindowsLocalDebugger + + ..\..\Projects\maszyna + WindowsLocalDebugger + ..\..\Projects\maszyna WindowsLocalDebugger @@ -18,4 +22,9 @@ WindowsLocalDebugger _NO_DEBUG_HEAP=1 + + ..\..\Projects\maszyna + WindowsLocalDebugger + _NO_DEBUG_HEAP=1 + \ No newline at end of file diff --git a/sun.cpp b/sun.cpp index 4a5699c2..1d0fbfea 100644 --- a/sun.cpp +++ b/sun.cpp @@ -99,8 +99,8 @@ void cSun::setLocation( float const Longitude, float const Latitude ) { void cSun::setTime( int const Hour, int const Minute, int const Second ) { m_observer.hour = clamp( Hour, -1, 23 ); - m_observer.minute = clamp( Minute, 0, 59 ); - m_observer.second = clamp( Second, 0, 59 ); + m_observer.minute = clamp( Minute, -1, 59 ); + m_observer.second = clamp( Second, -1, 59 ); } void cSun::setTemperature( float const Temperature ) { From 2c76a4418eef90f54bec9e5573d978afc9bf236b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 23 Mar 2017 00:09:28 +0100 Subject: [PATCH 068/426] virtual opengl matrix stack, light glare billboards --- Camera.cpp | 16 +-- Camera.h | 2 - Ground.cpp | 4 + Model3d.cpp | 42 ++++--- Model3d.h | 7 +- World.cpp | 1 - dumb3d.h | 5 +- frustum.cpp | 15 ++- frustum.h | 4 +- maszyna.vcxproj.filters | 9 ++ openglmatrixstack.h | 183 ++++++++++++++++++++++++++++++ renderer.cpp | 238 +++++++++++++++++++++++++++++++++++++++- renderer.h | 8 ++ stars.cpp | 2 +- stdafx.h | 2 + 15 files changed, 498 insertions(+), 40 deletions(-) create mode 100644 openglmatrixstack.h diff --git a/Camera.cpp b/Camera.cpp index f1c0db7e..cceed381 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -111,12 +111,12 @@ vector3 TCamera::GetDirection() return (Normalize(Vec)); } -/* + bool TCamera::SetMatrix() { - glRotated( -Roll * 180.0f / M_PI, 0, 0, 1 ); // po wyłączeniu tego kręci się pojazd, a sceneria nie - glRotated( -Pitch * 180.0f / M_PI, 1, 0, 0 ); - glRotated( -Yaw * 180.0f / M_PI, 0, 1, 0 ); // w zewnętrznym widoku: kierunek patrzenia + glRotated( -Roll * 180.0 / M_PI, 0.0, 0.0, 1.0 ); // po wyłączeniu tego kręci się pojazd, a sceneria nie + glRotated( -Pitch * 180.0 / M_PI, 1.0, 0.0, 0.0 ); + glRotated( -Yaw * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // w zewnętrznym widoku: kierunek patrzenia if( Type == tp_Follow ) { @@ -132,7 +132,7 @@ bool TCamera::SetMatrix() Global::SetCameraPosition(Pos); // było +pOffset return true; } -*/ + bool TCamera::SetMatrix( glm::mat4 &Matrix ) { Matrix = glm::rotate( Matrix, (float)-Roll, glm::vec3( 0.0f, 0.0f, 1.0f ) ); // po wyłączeniu tego kręci się pojazd, a sceneria nie @@ -157,9 +157,9 @@ bool TCamera::SetMatrix( glm::mat4 &Matrix ) { void TCamera::SetCabMatrix(vector3 &p) { // ustawienie widoku z kamery bez przesunięcia robionego przez OpenGL - nie powinno tak trząść - glRotated(-Roll * 180.0f / M_PI, 0, 0, 1); - glRotated(-Pitch * 180.0f / M_PI, 1, 0, 0); - glRotated(-Yaw * 180.0f / M_PI, 0, 1, 0); // w zewnętrznym widoku: kierunek patrzenia + glRotated(-Roll * 180.0 / M_PI, 0.0, 0.0, 1.0); + glRotated(-Pitch * 180.0 / M_PI, 1.0, 0.0, 0.0); + glRotated(-Yaw * 180.0 / M_PI, 0.0, 1.0, 0.0); // w zewnętrznym widoku: kierunek patrzenia if (Type == tp_Follow) gluLookAt(Pos.x - p.x, Pos.y - p.y, Pos.z - p.z, LookAt.x - p.x, LookAt.y - p.y, LookAt.z - p.z, vUp.x, vUp.y, vUp.z); // Ra: pOffset is zero diff --git a/Camera.h b/Camera.h index 9a04bb96..ebc98a7a 100644 --- a/Camera.h +++ b/Camera.h @@ -48,9 +48,7 @@ class TCamera void Update(); vector3 GetDirection(); // vector3 inline GetCrossPos() { return Pos+GetDirection()*CrossDist+CrossPos; }; -/* bool SetMatrix(); -*/ bool SetMatrix(glm::mat4 &Matrix); void SetCabMatrix( vector3 &p ); void RaLook(); diff --git a/Ground.cpp b/Ground.cpp index 6126a70d..c7570483 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -571,7 +571,11 @@ void TGroundNode::RenderDL() { // obiekty renderowane niezależnie od odległości case TP_SUBMODEL: TSubModel::fSquareDist = 0; +#ifdef EU07_USE_OLD_RENDERCODE return smTerrain->RenderDL(); +#else + GfxRenderer.Render( smTerrain ); +#endif } // if (pTriGroup) if (pTriGroup!=this) return; //wyświetla go inny obiekt double mgn = SquareMagnitude(pCenter - Global::pCameraPosition) / Global::ZoomFactor; diff --git a/Model3d.cpp b/Model3d.cpp index 0c588621..49cc04a7 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -320,8 +320,10 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) fCosFalloffAngle = cos(DegToRad(0.5 * fCosFalloffAngle)); fCosHotspotAngle = cos(DegToRad(0.5 * fCosHotspotAngle)); iNumVerts = 1; - iFlags |= 0x4010; // rysowane w cyklu nieprzezroczystych, macierz musi - // zostać bez zmiany +/* + iFlags |= 0x4010; // rysowane w cyklu nieprzezroczystych, macierz musi zostać bez zmiany +*/ + iFlags |= 0x4030; // drawn both in solid (light point) and transparent (light glare) phases } else if (eType < TP_ROTATOR) { @@ -967,9 +969,9 @@ void TSubModel::RaAnimation(TAnimType a) if (iAnimOwner != iInstance) break; // cudza animacja glTranslatef(v_TransVector.x, v_TransVector.y, v_TransVector.z); - glRotatef(v_Angles.x, 1.0, 0.0, 0.0); - glRotatef(v_Angles.y, 0.0, 1.0, 0.0); - glRotatef(v_Angles.z, 0.0, 0.0, 1.0); + glRotatef(v_Angles.x, 1.0f, 0.0f, 0.0f); + glRotatef(v_Angles.y, 0.0f, 1.0f, 0.0f); + glRotatef(v_Angles.z, 0.0f, 0.0f, 1.0f); break; case at_SecondsJump: // sekundy z przeskokiem glRotatef(floor(GlobalTime->mr) * 6.0, 0.0, 1.0, 0.0); @@ -999,11 +1001,13 @@ void TSubModel::RaAnimation(TAnimType a) break; case at_Billboard: // obrót w pionie do kamery { +/* matrix4x4 mat; // potrzebujemy współrzędne przesunięcia środka układu // współrzędnych submodelu glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); // pobranie aktualnej matrycy - float3 gdzie = float3(mat[3][0], mat[3][1], - mat[3][2]); // początek układu współrzędnych submodelu względem kamery +*/ + matrix4x4 mat; mat.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); + float3 gdzie = float3(mat[3][0], mat[3][1], mat[3][2]); // początek układu współrzędnych submodelu względem kamery glLoadIdentity(); // macierz jedynkowa glTranslatef(gdzie.x, gdzie.y, gdzie.z); // początek układu zostaje bez // zmian @@ -1020,9 +1024,8 @@ void TSubModel::RaAnimation(TAnimType a) glRotated(-fmod(Global::fTimeAngleDeg, 360.0), 0.0, 1.0, 0.0); // obrót dobowy osi OX break; case at_IK11: // ostatni element animacji szkieletowej (podudzie, stopa) - glRotatef(v_Angles.z, 0.0, 1.0, 0.0); // obrót względem osi pionowej - // (azymut) - glRotatef(v_Angles.x, 1.0, 0.0, 0.0); // obrót względem poziomu (deklinacja) + glRotatef(v_Angles.z, 0.0f, 1.0f, 0.0f); // obrót względem osi pionowej (azymut) + glRotatef(v_Angles.x, 1.0f, 0.0f, 0.0f); // obrót względem poziomu (deklinacja) break; case at_DigiClk: // animacja zegara cyfrowego { // ustawienie animacji w submodelach potomnych @@ -1048,6 +1051,7 @@ void TSubModel::RaAnimation(TAnimType a) } }; +#ifdef EU07_USE_OLD_RENDERCODE void TSubModel::RenderDL() { // główna procedura renderowania przez DL if( ( iVisible ) @@ -1228,6 +1232,7 @@ void TSubModel::RenderAlphaDL() if (iAlpha & iFlags & 0x2F000000) Next->RenderAlphaDL(); }; // RenderAlpha +#endif void TSubModel::RenderVBO() { // główna procedura renderowania przez VBO @@ -1271,8 +1276,11 @@ void TSubModel::RenderVBO() } else if (eType == TP_FREESPOTLIGHT) { // wersja VBO +/* matrix4x4 mat; // macierz opisuje układ renderowania względem kamery glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); +*/ + matrix4x4 mat; mat.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); // kąt między kierunkiem światła a współrzędnymi kamery vector3 gdzie = mat * vector3(0, 0, 0); // pozycja punktu świecącego względem kamery fCosViewAngle = DotProduct(Normalize(mat * vector3(0, 0, 1) - gdzie), Normalize(gdzie)); @@ -2016,8 +2024,6 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, pName = ""; if (iTexture > 0) { // obsługa stałej tekstury - // TextureID=TTexturesManager::GetTextureID(t->String(TextureID)); - // asTexture=AnsiString(t->String(iTexture)); pTexture = t->at(iTexture); if (pTexture.find_last_of("/\\") == std::string::npos) pTexture.insert(0, Global::asCurrentTexturePath); @@ -2029,9 +2035,17 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, } else TextureID = iTexture; + b_aAnim = b_Anim; // skopiowanie animacji do drugiego cyklu - iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem - // tablic) + + if( (eType == TP_FREESPOTLIGHT) && (iFlags & 0x10)) { + // we've added light glare which needs to be rendered during transparent phase, + // but models converted to e3d before addition won't have the render flag set correctly for this + // so as a workaround we're doing it here manually + iFlags |= 0x20; + } + iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem tablic) + iVboPtr = tVboPtr; Vertices = v + iVboPtr; // if (!iNumVerts) eType=-1; //tymczasowo zmiana typu, żeby się nie diff --git a/Model3d.h b/Model3d.h index 12ab0a1c..580d2ec4 100644 --- a/Model3d.h +++ b/Model3d.h @@ -182,8 +182,7 @@ private: int iFarAttenDecay; // ta zmienna okresla typ zaniku natezenia swiatla (0:brak, 1,2: potega 1/R) float fFarDecayRadius; // normalizacja j.w. float fCosFalloffAngle; // cosinus kąta stożka pod którym widać światło - float fCosHotspotAngle; // cosinus kąta stożka pod którym widać aureolę i zwiększone natężenie - // światła + float fCosHotspotAngle; // cosinus kąta stożka pod którym widać aureolę i zwiększone natężenie światła float fCosViewAngle; // cos kata pod jakim sie teraz patrzy TSubModel *Next; @@ -256,9 +255,11 @@ public: void SetRotateIK1(float3 vNewAngles); TSubModel * GetFromName(std::string const &search, bool i = true); TSubModel * GetFromName(char const *search, bool i = true); +#ifdef EU07_USE_OLD_RENDERCODE void RenderDL(); void RenderAlphaDL(); - void RenderVBO(); +#endif + void RenderVBO(); void RenderAlphaVBO(); // inline matrix4x4* GetMatrix() {return dMatrix;}; inline float4x4 * GetMatrix() diff --git a/World.cpp b/World.cpp index e50f21d2..8a51474d 100644 --- a/World.cpp +++ b/World.cpp @@ -1153,7 +1153,6 @@ TWorld::Render_Cab() { // ABu: Rendering kabiny jako ostatniej, zeby bylo widac przez szyby, tylko w widoku ze srodka return; } - /* // ABu: Rendering kabiny jako ostatniej, zeby bylo widac przez szyby, tylko w widoku ze srodka if( ( Train->Dynamic()->mdKabina != Train->Dynamic()->mdModel ) && diff --git a/dumb3d.h b/dumb3d.h index 23dd5ce5..57de1f1b 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -139,14 +139,15 @@ class matrix4x4 // the column increasing fastest. However, some APIs (OpenGL in particular) do this // backwards, hence the "constructor" from C matrices, or from OpenGL matrices. // Note that matrices are stored internally in OpenGL format. - void C_Matrix(scalar_t *initArray) + void C_Matrix(scalar_t const *initArray) { int i = 0; for (int y = 0; y < 4; ++y) for (int x = 0; x < 4; ++x) (*this)(x)[y] = initArray[i++]; } - void OpenGL_Matrix(scalar_t *initArray) + template + void OpenGL_Matrix(_Type const *initArray) { int i = 0; for (int x = 0; x < 4; ++x) diff --git a/frustum.cpp b/frustum.cpp index d9a9f3ad..0f4624b7 100644 --- a/frustum.cpp +++ b/frustum.cpp @@ -11,10 +11,19 @@ http://mozilla.org/MPL/2.0/. #include "frustum.h" void -cFrustum::calculate( glm::mat4 &Projection, glm::mat4 &Modelview ) { +cFrustum::calculate() { - float *proj = &Projection[ 0 ][ 0 ]; - float *modl = &Modelview[ 0 ][ 0 ]; + auto const &projection = OpenGLMatrices.data( GL_PROJECTION ); + auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); + + calculate( projection, modelview ); +} + +void +cFrustum::calculate( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { + + float const *proj = &Projection[ 0 ][ 0 ]; + float const *modl = &Modelview[ 0 ][ 0 ]; float clip[ 16 ]; // multiply the matrices to retrieve clipping planes diff --git a/frustum.h b/frustum.h index 41ebb64a..19febbe3 100644 --- a/frustum.h +++ b/frustum.h @@ -21,8 +21,10 @@ public: // methods: // update the frustum to match current view orientation + void + calculate(); void - calculate(glm::mat4 &Projection, glm::mat4 &Modelview); + calculate(glm::mat4 const &Projection, glm::mat4 const &Modelview); // returns true if specified point is inside of the frustum inline bool diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 4c412ae9..edfae163 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -207,6 +207,9 @@ Source Files + + Source Files + @@ -401,6 +404,12 @@ Header Files + + Header Files + + + Header Files + diff --git a/openglmatrixstack.h b/openglmatrixstack.h new file mode 100644 index 00000000..1ba685a2 --- /dev/null +++ b/openglmatrixstack.h @@ -0,0 +1,183 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include +#include +#include "GL/glew.h" +#ifdef _WINDOWS +#include "GL/wglew.h" +#endif + +// encapsulation of the fixed pipeline opengl matrix stack +class opengl_matrices { + +// types: +class opengl_stack { + +public: +// constructors: + opengl_stack() { m_stack.emplace(1.0f); } + +// methods: + glm::mat4 const & + data() const { return m_stack.top(); } + void + push_matrix() { m_stack.emplace(m_stack.top()); } + void + pop_matrix() { + m_stack.pop(); + if( m_stack.empty() ) { m_stack.emplace(1.0f); } + upload(); } + void + load_identity() { + m_stack.top() = glm::mat4( 1.0f ); + upload(); } + void + rotate( float const Angle, glm::vec3 const &Axis ) { + m_stack.top() = glm::rotate( m_stack.top(), Angle, Axis ); + upload(); } + void + translate( glm::vec3 const &Translation ) { + m_stack.top() = glm::translate( m_stack.top(), Translation ); + upload(); } + void + multiply( glm::mat4 const &Matrix ) { + m_stack.top() *= Matrix; + upload(); } + void + perspective( float const Fovy, float const Aspect, float const Znear, float const Zfar ) { + m_stack.top() *= glm::perspective( Fovy, Aspect, Znear, Zfar ); + upload(); } + void + look_at( glm::vec3 const &Eye, glm::vec3 const &Center, glm::vec3 const &Up ) { + m_stack.top() *= glm::lookAt( Eye, Center, Up ); + upload(); } + +private: +// types: + typedef std::stack mat4_stack; + +// methods: + void + upload() { ::glLoadMatrixf( &m_stack.top()[0][0] ); } + +// members: + mat4_stack m_stack; +}; + +enum stack_mode { gl_projection = 0, gl_modelview = 1 }; +typedef std::vector openglstack_array; + +public: +// constructors: + opengl_matrices() { + m_stacks.emplace_back(); // projection + m_stacks.emplace_back(); // modelview + } + +// methods: + void + mode( GLuint const Mode ) { + switch( Mode ) { + case GL_PROJECTION: { m_mode = stack_mode::gl_projection; break; } + case GL_MODELVIEW: { m_mode = stack_mode::gl_modelview; break; } + default: { break; } } + glMatrixMode( Mode ); } + glm::mat4 const & + data( GLuint const Mode = -1 ) const { + switch( Mode ) { + case GL_PROJECTION: { return m_stacks[ stack_mode::gl_projection ].data(); } + case GL_MODELVIEW: { return m_stacks[ stack_mode::gl_modelview ].data(); } + default: { return m_stacks[ m_mode ].data(); } } } + float const * + data_array( GLuint const Mode = -1 ) const { + return glm::value_ptr( data( Mode ) ); } + void + push_matrix() { m_stacks[ m_mode ].push_matrix(); } + void + pop_matrix() { m_stacks[ m_mode ].pop_matrix(); } + void + load_identity() { m_stacks[ m_mode ].load_identity(); } + template + void + rotate( _Type const Angle, _Type const X, _Type const Y, _Type const Z ) { + m_stacks[ m_mode ].rotate( + static_cast(Angle) * 0.0174532925f, // deg2rad + glm::vec3( + static_cast(X), + static_cast(Y), + static_cast(Z) ) ); } + template + void + translate( _Type const X, _Type const Y, _Type const Z ) { + m_stacks[ m_mode ].translate( + glm::vec3( + static_cast( X ), + static_cast( Y ), + static_cast( Z ) ) ); } + template + void + multiply( _Type const *Matrix ) { + m_stacks[ m_mode ].multiply( + glm::make_mat4( Matrix ) ); } + template + void + perspective( _Type const Fovy, _Type const Aspect, _Type const Znear, _Type const Zfar ) { + m_stacks[ m_mode ].perspective( + static_cast( Fovy ), + static_cast( Aspect ), + static_cast( Znear ), + static_cast( Zfar ) ); } + template + void + look_at( _Type const Eyex, _Type const Eyey, _Type const Eyez, _Type const Centerx, _Type const Centery, _Type const Centerz, _Type const Upx, _Type const Upy, _Type const Upz ) { + m_stacks[ m_mode ].look_at( + glm::vec3( + static_cast( Eyex ), + static_cast( Eyey ), + static_cast( Eyez ) ), + glm::vec3( + static_cast( Centerx ), + static_cast( Centery ), + static_cast( Centerz ) ), + glm::vec3( + static_cast( Upx ), + static_cast( Upy ), + static_cast( Upz ) ) ); } + +private: +// members: + stack_mode m_mode{ stack_mode::gl_projection }; + openglstack_array m_stacks; + +}; + +extern opengl_matrices OpenGLMatrices; + +// NOTE: standard opengl calls re-definitions +#define glMatrixMode OpenGLMatrices.mode +#define glPushMatrix OpenGLMatrices.push_matrix +#define glPopMatrix OpenGLMatrices.pop_matrix +#define glLoadIdentity OpenGLMatrices.load_identity +#define glRotated OpenGLMatrices.rotate +#define glRotatef OpenGLMatrices.rotate +#define glTranslated OpenGLMatrices.translate +#define glTranslatef OpenGLMatrices.translate +// NOTE: no scale override as we aren't using it anywhere +#define glMultMatrixd OpenGLMatrices.multiply +#define glMultMatrixf OpenGLMatrices.multiply +#define gluPerspective OpenGLMatrices.perspective +#define gluLookAt OpenGLMatrices.look_at + +//--------------------------------------------------------------------------- diff --git a/renderer.cpp b/renderer.cpp index 9fe8678c..2f6b9cf6 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -15,8 +15,11 @@ http://mozilla.org/MPL/2.0/. #include "dynobj.h" #include "uilayer.h" #include "logs.h" +#include "usefull.h" +#include "glwidgetlibrary.h" opengl_renderer GfxRenderer; +opengl_matrices OpenGLMatrices; extern TWorld World; // returns true if specified object is within camera frustum, false otherwise @@ -115,6 +118,8 @@ opengl_renderer::Init( GLFWwindow *Window ) { m_lights.emplace_back( light ); } + // preload some common textures + m_glaretextureid = GetTextureId( "fx\\lightglare", szTexturePath ); return true; } @@ -128,22 +133,31 @@ opengl_renderer::Render() { ::glDepthFunc( GL_LEQUAL ); ::glMatrixMode( GL_PROJECTION ); // select the Projection Matrix + ::gluPerspective( + Global::FieldOfView / Global::ZoomFactor * 0.0174532925f, + std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), + 0.1f * Global::ZoomFactor, + m_drawrange * Global::fDistanceFactor ); +/* glm::mat4 projection = glm::perspective( Global::FieldOfView / Global::ZoomFactor * 0.0174532925f, std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), 0.1f * Global::ZoomFactor, m_drawrange * Global::fDistanceFactor ); ::glLoadMatrixf( &projection[0][0] ); - +*/ ::glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix - glm::mat4 modelview( 1.0f ); ::glLoadIdentity(); if( World.InitPerformed() ) { - +/* + glm::mat4 modelview( 1.0f ); World.Camera.SetMatrix( modelview ); ::glLoadMatrixf( &modelview[ 0 ][ 0 ] ); m_camera.update_frustum( projection, modelview ); +*/ + World.Camera.SetMatrix(); + m_camera.update_frustum(); if( !Global::bWireFrame ) { // bez nieba w trybie rysowania linii @@ -318,7 +332,7 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, double nullptr ), alpha ); - Model->Root->RenderDL(); + Render( Model->Root ); return true; } @@ -342,6 +356,85 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, Math3D: return result; } +void +opengl_renderer::Render( TSubModel *Submodel ) { + // główna procedura renderowania przez DL + if( ( Submodel->iVisible ) + && ( TSubModel::fSquareDist >= ( Submodel->fSquareMinDist / Global::fDistanceFactor ) ) + && ( TSubModel::fSquareDist <= ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ) { + + if( Submodel->iFlags & 0xC000 ) { + ::glPushMatrix(); + if( Submodel->fMatrix ) + ::glMultMatrixf( Submodel->fMatrix->readArray() ); + if( Submodel->b_Anim ) + Submodel->RaAnimation( Submodel->b_Anim ); + } + if( Submodel->eType < TP_ROTATOR ) { // renderowanie obiektów OpenGL + if( Submodel->iAlpha & Submodel->iFlags & 0x1F ) // rysuj gdy element nieprzezroczysty + { + if( Submodel->TextureID < 0 ) // && (ReplacableSkinId!=0)) + { // zmienialne skóry + GfxRenderer.Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury + } + else + GfxRenderer.Bind( Submodel->TextureID ); // również 0 + if( Global::fLuminance < Submodel->fLight ) { + ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo + ::glCallList( Submodel->uiDisplayList ); // tylko dla siatki + float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); + } + else + ::glCallList( Submodel->uiDisplayList ); // tylko dla siatki + } + } + else if( Submodel->eType == TP_FREESPOTLIGHT ) { + // wersja DL +/* + matrix4x4 modelview; + ::glGetDoublev( GL_MODELVIEW_MATRIX, modelview.getArray() ); +*/ + matrix4x4 modelview; modelview.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); + // kąt między kierunkiem światła a współrzędnymi kamery + auto const lightcenter = modelview * vector3( 0.0, 0.0, 0.0 ); // pozycja punktu świecącego względem kamery + Submodel->fCosViewAngle = DotProduct( Normalize( modelview * vector3( 0.0, 0.0, -1.0 ) - lightcenter ), Normalize( -lightcenter ) ); + if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) // kąt większy niż maksymalny stożek swiatła + { + double Distdimm = 1.0; + if( Submodel->fCosViewAngle < Submodel->fCosHotspotAngle ) // zmniejszona jasność między Hotspot a Falloff + if( Submodel->fCosFalloffAngle < Submodel->fCosHotspotAngle ) + Distdimm = 1.0 - ( Submodel->fCosHotspotAngle - Submodel->fCosViewAngle ) / ( Submodel->fCosHotspotAngle - Submodel->fCosFalloffAngle ); + ::glColor3f( Submodel->f4Diffuse[ 0 ] * Distdimm, Submodel->f4Diffuse[ 1 ] * Distdimm, Submodel->f4Diffuse[ 2 ] * Distdimm ); + ::glCallList( Submodel->uiDisplayList ); // wyświetlenie warunkowe + } + } + else if( Submodel->eType == TP_STARS ) { + // glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty swiecace sie blendowaly + if( Global::fLuminance < Submodel->fLight ) { + ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo + ::glCallList( Submodel->uiDisplayList ); // narysuj naraz wszystkie punkty z DL + float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); + } + } + if( Submodel->Child != NULL ) + if( Submodel->iAlpha & Submodel->iFlags & 0x001F0000 ) + Render( Submodel->Child ); + + if( Submodel->iFlags & 0xC000 ) + ::glPopMatrix(); + } + + if( Submodel->b_Anim < at_SecondsJump ) + Submodel->b_Anim = at_None; // wyłączenie animacji dla kolejnego użycia subm + + if( Submodel->Next ) + if( Submodel->iAlpha & Submodel->iFlags & 0x1F000000 ) + Render( Submodel->Next ); // dalsze rekurencyjnie +}; + bool opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { @@ -450,7 +543,7 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, d nullptr ), alpha ); - Model->Root->RenderAlphaDL(); + Render_Alpha( Model->Root ); return true; } @@ -473,6 +566,141 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, M return result; } + +void +opengl_renderer::Render_Alpha( TSubModel *Submodel ) { + // renderowanie przezroczystych przez DL + if( ( Submodel->iVisible ) + && ( TSubModel::fSquareDist >= ( Submodel->fSquareMinDist / Global::fDistanceFactor ) ) + && ( TSubModel::fSquareDist <= ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ) { + + if( Submodel->iFlags & 0xC000 ) { + ::glPushMatrix(); + if( Submodel->fMatrix ) + ::glMultMatrixf( Submodel->fMatrix->readArray() ); + if( Submodel->b_aAnim ) + Submodel->RaAnimation( Submodel->b_aAnim ); + } + + if( Submodel->eType < TP_ROTATOR ) { // renderowanie obiektów OpenGL + if( Submodel->iAlpha & Submodel->iFlags & 0x2F ) // rysuj gdy element przezroczysty + { + if( Submodel->TextureID < 0 ) // && (ReplacableSkinId!=0)) + { // zmienialne skóry + GfxRenderer.Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury + } + else + GfxRenderer.Bind( Submodel->TextureID ); // również 0 + if( Global::fLuminance < Submodel->fLight ) { + ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo + ::glCallList( Submodel->uiDisplayList ); // tylko dla siatki + float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); + } + else + ::glCallList( Submodel->uiDisplayList ); // tylko dla siatki + } + } + else if( Submodel->eType == TP_FREESPOTLIGHT ) { + // dorobić aureolę! + if( Global::fLuminance < Submodel->fLight ) { + // NOTE: we're forced here to redo view angle calculations etc, because this data isn't instanced but stored along with the single mesh + // TODO: separate instance data from reusable geometry +/* + matrix4x4 modelview; + ::glGetDoublev( GL_MODELVIEW_MATRIX, modelview.getArray() ); +*/ +/* + matrix4x4 modelview; modelview.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); + // kąt między kierunkiem światła a współrzędnymi kamery + auto const lightcenter = modelview * vector3( 0.0, 0.0, -0.05 ); // pozycja punktu świecącego względem kamery + Submodel->fCosViewAngle = DotProduct( Normalize( modelview * vector3( 0.0, 0.0, -1.0 ) - lightcenter ), Normalize( -lightcenter ) ); +*/ + auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); + auto const lightcenter = modelview * glm::vec4( 0.0f, 0.0f, -0.05f, 1.0f ); // pozycja punktu świecącego względem kamery + Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.0f, 0.0f, -1.0f, 1.0f ) - lightcenter ), glm::normalize( -lightcenter ) ); + + float fadelevel = 0.5f; + if( ( Submodel->fCosViewAngle > 0.0 ) && ( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) ) { + + fadelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0 - Submodel->fCosFalloffAngle ); + + ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); + Bind( m_glaretextureid ); + ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], fadelevel ); + ::glDisable( GL_LIGHTING ); + ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); + + ::glPushMatrix(); + ::glLoadIdentity(); // macierz jedynkowa + ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian + ::glRotated( atan2( lightcenter.x, lightcenter.z ) * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // jedynie obracamy w pionie o kąt + + ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo + + ::glBegin( GL_TRIANGLE_STRIP ); + float const size = 2.5f; + ::glTexCoord2f( 1.0f, 1.0f ); ::glVertex3f( -size, size, 0.0f ); + ::glTexCoord2f( 0.0f, 1.0f ); ::glVertex3f( size, size, 0.0f ); + ::glTexCoord2f( 1.0f, 0.0f ); ::glVertex3f( -size, -size, 0.0f ); + ::glTexCoord2f( 0.0f, 0.0f ); ::glVertex3f( size, -size, 0.0f ); +/* + // NOTE: we could do simply... + vec3 vertexPosition_worldspace = + particleCenter_wordspace + + CameraRight_worldspace * squareVertices.x * BillboardSize.x + + CameraUp_worldspace * squareVertices.y * BillboardSize.y; + // ...etc instead IF we had easy access to camera's forward and right vectors. TODO: check if Camera matrix is accessible +*/ + ::glEnd(); + + float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); + + ::glPopMatrix(); + ::glPopAttrib(); + } + } + } + + if( Submodel->Child != NULL ) { + if( Submodel->eType == TP_TEXT ) { // tekst renderujemy w specjalny sposób, zamiast submodeli z łańcucha Child + int i, j = (int)Submodel->pasText->size(); + TSubModel *p; + if( !Submodel->smLetter ) { // jeśli nie ma tablicy, to ją stworzyć; miejsce nieodpowiednie, ale tymczasowo może być + Submodel->smLetter = new TSubModel *[ 256 ]; // tablica wskaźników submodeli dla wyświetlania tekstu + ::ZeroMemory( Submodel->smLetter, 256 * sizeof( TSubModel * ) ); // wypełnianie zerami + p = Submodel->Child; + while( p ) { + Submodel->smLetter[ p->pName[ 0 ] ] = p; + p = p->Next; // kolejny znak + } + } + for( i = 1; i <= j; ++i ) { + p = Submodel->smLetter[ ( *( Submodel->pasText) )[ i ] ]; // znak do wyświetlenia + if( p ) { // na razie tylko jako przezroczyste + Render_Alpha( p ); + if( p->fMatrix ) + ::glMultMatrixf( p->fMatrix->readArray() ); // przesuwanie widoku + } + } + } + else if( Submodel->iAlpha & Submodel->iFlags & 0x002F0000 ) + Render_Alpha( Submodel->Child ); + } + + if( Submodel->iFlags & 0xC000 ) + ::glPopMatrix(); + } + + if( Submodel->b_aAnim < at_SecondsJump ) + Submodel->b_aAnim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu + + if( Submodel->Next != NULL ) + if( Submodel->iAlpha & Submodel->iFlags & 0x2F000000 ) + Render_Alpha( Submodel->Next ); +}; #endif void diff --git a/renderer.h b/renderer.h index f1ce4e0f..bb13ce4b 100644 --- a/renderer.h +++ b/renderer.h @@ -89,6 +89,9 @@ class opengl_camera { public: // methods: inline + void + update_frustum() { m_frustum.calculate(); } + inline void update_frustum(glm::mat4 &Projection, glm::mat4 &Modelview) { m_frustum.calculate(Projection, Modelview); } bool @@ -122,12 +125,16 @@ public: Render( TModel3d *Model, material_data const *Material, double const Squaredistance ); bool Render( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + void + Render( TSubModel *Submodel ); bool Render_Alpha( TDynamicObject *Dynamic ); bool Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); bool Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + void + Render_Alpha( TSubModel *Submodel ); #endif // maintenance jobs void @@ -185,6 +192,7 @@ private: double m_updateaccumulator{ 0.0 }; std::string m_debuginfo; GLFWwindow *m_window{ nullptr }; + texture_manager::size_type m_glaretextureid{ -1 }; }; extern opengl_renderer GfxRenderer; diff --git a/stars.cpp b/stars.cpp index b8ee3aa8..a5e93828 100644 --- a/stars.cpp +++ b/stars.cpp @@ -18,7 +18,7 @@ cStars::render() { ::glPushMatrix(); ::glRotatef( m_latitude, 1.0f, 0.0f, 0.0f ); // ustawienie osi OY na północ - ::glRotatef( -std::fmod( Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX + ::glRotatef( -std::fmod( (float)Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX ::glPointSize( 2.0f ); if( Global::bUseVBO ) { diff --git a/stdafx.h b/stdafx.h index 0110be36..1e060f74 100644 --- a/stdafx.h +++ b/stdafx.h @@ -83,3 +83,5 @@ #include #include #include + +#include "openglmatrixstack.h" \ No newline at end of file From 89a9a18428bdc12f874832d4d845bbdb57231c3d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 23 Mar 2017 16:47:29 +0100 Subject: [PATCH 069/426] maintenance: removed deprecated code from memcells, tracks, events --- Classes.h | 3 - Driver.cpp | 50 ++------- DynObj.cpp | 169 +--------------------------- EvLaunch.cpp | 16 +-- EvLaunch.h | 11 +- Event.cpp | 8 +- Ground.cpp | 237 ++++++---------------------------------- Ground.h | 4 - MemCell.cpp | 83 +------------- MemCell.h | 38 +------ Names.cpp | 176 ----------------------------- Names.h | 82 ++------------ Track.cpp | 112 ++----------------- Track.h | 13 --- maszyna.vcxproj.filters | 5 +- openglmatrixstack.cpp | 13 +++ openglmatrixstack.h | 2 +- renderer.cpp | 8 +- 18 files changed, 96 insertions(+), 934 deletions(-) create mode 100644 openglmatrixstack.cpp diff --git a/Classes.h b/Classes.h index 5bafa69d..b8967103 100644 --- a/Classes.h +++ b/Classes.h @@ -36,9 +36,6 @@ class TMtableTime; // czas dla danego posterunku }; class TController; // obiekt sterujący pociągiem (AI) -#ifdef EU07_USE_OLD_TNAMES_CLASS -class TNames; // obiekt sortujący nazwy -#endif typedef enum { // binarne odpowiedniki komend w komórce pamięci diff --git a/Driver.cpp b/Driver.cpp index e7f95040..f30d5268 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -87,7 +87,7 @@ const double HardAcceleration = 0.9; const double PrepareTime = 2.0; //[s] przebłyski świadomości przy odpalaniu bool WriteLogFlag = false; -string StopReasonTable[] = { +std::string StopReasonTable[] = { // przyczyny zatrzymania ruchu AI "", // stopNone, //nie ma powodu - powinien jechać "Off", // stopSleep, //nie został odpalony, to nie pojedzie @@ -240,23 +240,15 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) // głównej drogi - chyba że jest równorzędne... fVelNext = 30.0; // uzależnić prędkość od promienia; albo niech będzie // ograniczona w skrzyżowaniu (velocity z ujemną wartością) - if ((iFlags & spElapsed) == 0) // jeśli nie wjechał -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - if (trTrack->iNumDynamics > 0) // a skrzyżowanie zawiera pojazd - { - if (Global::iWriteLogEnabled & 8) - WriteLog("Tor " + trTrack->NameGet() + " zajety przed pojazdem. Num=" + std::to_string(trTrack->iNumDynamics) + "Dist= " + std::to_string(fDist)); - fVelNext = - 0.0; // to zabronić wjazdu (chyba że ten z przodu też jedzie prosto) - } -#else + if( ( iFlags & spElapsed ) == 0 ) { + // jeśli nie wjechał if( false == trTrack->Dynamics.empty() ) { if( Global::iWriteLogEnabled & 8 ) { WriteLog( "Tor " + trTrack->NameGet() + " zajety przed pojazdem. Num=" + std::to_string( trTrack->Dynamics.size() ) + "Dist= " + std::to_string( fDist ) ); fVelNext = 0.0; // to zabronić wjazdu (chyba że ten z przodu też jedzie prosto) } } -#endif + } } if (iFlags & spSwitch) // jeśli odcinek zmienny { @@ -271,19 +263,6 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) // na Mydelniczce potrafi skanować na wprost mimo pojechania na bok } // poniższe nie dotyczy trybu łączenia? -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - if ((iFlags & spElapsed) ? false : - trTrack->iNumDynamics > - 0) // jeśli jeszcze nie wjechano na tor, a coś na nim jest - { - if (Global::iWriteLogEnabled & 8) - WriteLog("Rozjazd " + trTrack->NameGet() + " zajety przed pojazdem. Num=" + std::to_string(trTrack->iNumDynamics) + "Dist= "+std::to_string(fDist)); - //fDist -= 30.0; - fVelNext = 0.0; // to niech stanie w zwiększonej odległości - // else if (fVelNext==0.0) //jeśli została wyzerowana - // fVelNext=trTrack->VelocityGet(); //odczyt prędkości - } -#else if( ( ( iFlags & spElapsed ) == 0 ) && ( false == trTrack->Dynamics.empty() ) ) { // jeśli jeszcze nie wjechano na tor, a coś na nim jest @@ -292,7 +271,6 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) } fVelNext = 0.0; // to niech stanie w zwiększonej odległości } -#endif } } } @@ -1504,10 +1482,10 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, if( WriteLogFlag ) { mkdir( "physicslog\\" ); - LogFile.open( string( "physicslog\\" + VehicleName + ".dat" ).c_str(), + LogFile.open( std::string( "physicslog\\" + VehicleName + ".dat" ).c_str(), std::ios::in | std::ios::out | std::ios::trunc ); #if LOGPRESS == 0 - LogFile << string( " Time [s] Velocity [m/s] Acceleration [m/ss] Coupler.Dist[m] " + LogFile << std::string( " Time [s] Velocity [m/s] Acceleration [m/ss] Coupler.Dist[m] " "Coupler.Force[N] TractionForce [kN] FrictionForce [kN] " "BrakeForce [kN] BrakePress [MPa] PipePress [MPa] " "MotorCurrent [A] MCP SCP BCP LBP DmgFlag Command CVal1 CVal2" ) @@ -1698,7 +1676,7 @@ void TController::AutoRewident() ustaw = 16 + bdelay_R; // lokomotywa luzem (może być wieloczłonowa) else { // jeśli są wagony - ustaw = (g < min(4, r + p) ? 16 : 0); + ustaw = (g < std::min(4, r + p) ? 16 : 0); if (ustaw) // jeśli towarowe < Min(4, pospieszne+osobowe) { // to skład pasażerski - nastawianie pasażerskiego ustaw += (g && (r < g + p)) ? bdelay_P : bdelay_R; @@ -4927,7 +4905,7 @@ void TController::OrdersInit(double fVel) // Ale mozna by je zapodac ze scenerii }; -string TController::StopReasonText() +std::string TController::StopReasonText() { // informacja tekstowa o przyczynie zatrzymania if (eStopReason != 7) // zawalidroga będzie inaczej return StopReasonTable[eStopReason]; @@ -4952,15 +4930,6 @@ double TController::Distance(vector3 &p1,vector3 &n,vector3 &p2) bool TController::BackwardTrackBusy(TTrack *Track) { // najpierw sprawdzamy, czy na danym torze są pojazdy z innego składu -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - if (Track->iNumDynamics) - { // jeśli tylko z własnego składu, to tor jest wolny - for (int i = 0; i < Track->iNumDynamics; ++i) - if (Track->Dynamics[i]->ctOwner != this) // jeśli jest jakiś cudzy - return true; // to tor jest zajęty i skanowanie nie obowiązuje - } - return false; // wolny -#else if( false == Track->Dynamics.empty() ) { for( auto dynamic : Track->Dynamics ) { if( dynamic->ctOwner != this ) { @@ -4970,7 +4939,6 @@ bool TController::BackwardTrackBusy(TTrack *Track) } } return false; // wolny -#endif }; TEvent * TController::CheckTrackEventBackward(double fDirection, TTrack *Track) @@ -5435,5 +5403,5 @@ void TController::RouteSwitch(int d) }; std::string TController::OwnerName() { - return pVehicle ? pVehicle->MoverParameters->Name : string("none"); + return ( pVehicle ? pVehicle->MoverParameters->Name : "none" ); }; diff --git a/DynObj.cpp b/DynObj.cpp index e31f1d55..78d5b437 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -950,69 +950,15 @@ double ABuAcos(const vector3 &calc_temp) return atan2(-calc_temp.x, calc_temp.z); // Ra: tak prościej } -TDynamicObject * TDynamicObject::ABuFindNearestObject(TTrack *Track, - TDynamicObject *MyPointer, - int &CouplNr) -{ // zwraca wskaznik do obiektu znajdujacego sie na torze - // (Track), którego sprzęg jest najblizszy - // kamerze +TDynamicObject * TDynamicObject::ABuFindNearestObject(TTrack *Track, TDynamicObject *MyPointer, int &CouplNr) +{ + // zwraca wskaznik do obiektu znajdujacego sie na torze (Track), którego sprzęg jest najblizszy kamerze // służy np. do łączenia i rozpinania sprzęgów // WE: Track - tor, na ktorym odbywa sie poszukiwanie // MyPointer - wskaznik do obiektu szukajacego // WY: CouplNr - który sprzęg znalezionego obiektu jest bliższy kamerze // Uwaga! Jesli CouplNr==-2 to szukamy njblizszego obiektu, a nie sprzegu!!! - -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - if ((Track->iNumDynamics) > 0) - { // o ile w ogóle jest co przeglądać na tym torze - // vector3 poz; //pozycja pojazdu XYZ w scenerii - // vector3 kon; //wektor czoła względem środka pojazdu wzglęem początku toru - vector3 tmp; // wektor pomiędzy kamerą i sprzęgiem - double dist; // odległość - for (int i = 0; i < Track->iNumDynamics; i++) - { - if (CouplNr == -2) - { // wektor [kamera-obiekt] - poszukiwanie obiektu - tmp = Global::GetCameraPosition() - Track->Dynamics[i]->vPosition; - dist = tmp.x * tmp.x + tmp.y * tmp.y + tmp.z * tmp.z; // odległość do kwadratu - if (dist < 100.0) // 10 metrów - return Track->Dynamics[i]; - } - else // jeśli (CouplNr) inne niz -2, szukamy sprzęgu - { // wektor [kamera-sprzeg0], potem [kamera-sprzeg1] - // Powinno byc wyliczone, ale nie zaszkodzi drugi raz: - //(bo co, jesli nie wykonuje sie obrotow wozkow?) - Ra: ale zawsze są - // liczone - // współrzędne sprzęgów - // Track->Dynamics[i]->modelRot.z=ABuAcos(Track->Dynamics[i]->Axle0.pPosition-Track->Dynamics[i]->Axle1.pPosition); - // poz=Track->Dynamics[i]->vPosition; //pozycja środka pojazdu - // kon=vector3( //położenie przodu względem środka - // -((0.5*Track->Dynamics[i]->MoverParameters->Dim.L)*sin(Track->Dynamics[i]->modelRot.z)), - // 0, //yyy... jeśli duże pochylenie i długi pojazd, to może być problem - // +((0.5*Track->Dynamics[i]->MoverParameters->Dim.L)*cos(Track->Dynamics[i]->modelRot.z)) - //); - tmp = - Global::GetCameraPosition() - - Track->Dynamics[i]->vCoulpler[0]; // Ra: pozycje sprzęgów też są zawsze liczone - dist = tmp.x * tmp.x + tmp.y * tmp.y + tmp.z * tmp.z; // odległość do kwadratu - if (dist < 25.0) // 5 metrów - { - CouplNr = 0; - return Track->Dynamics[i]; - } - tmp = Global::GetCameraPosition() - Track->Dynamics[i]->vCoulpler[1]; - dist = tmp.x * tmp.x + tmp.y * tmp.y + tmp.z * tmp.z; // odległość do kwadratu - if (dist < 25.0) // 5 metrów - { - CouplNr = 1; - return Track->Dynamics[i]; - } - } - } - return NULL; - } -#else for( auto dynamic : Track->Dynamics ) { if( CouplNr == -2 ) { @@ -1038,7 +984,6 @@ TDynamicObject * TDynamicObject::ABuFindNearestObject(TTrack *Track, } // empty track or nothing found return nullptr; -#endif } TDynamicObject * TDynamicObject::ABuScanNearestObject(TTrack *Track, double ScanDir, @@ -1160,21 +1105,13 @@ TDynamicObject * TDynamicObject::ABuFindObject(TTrack *Track, int ScanDir, // WY: wskaznik do znalezionego obiektu. // CouplFound - nr sprzegu znalezionego obiektu -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - if (Track->iNumDynamics > 0) -#else if( false == Track->Dynamics.empty() ) -#endif { // sens szukania na tym torze jest tylko, gdy są na nim pojazdy double MyTranslation; // pozycja szukającego na torze double MinDist = Track->Length(); // najmniejsza znaleziona odleglość // (zaczynamy od długości toru) double TestDist; // robocza odległość od kolejnych pojazdów na danym odcinku -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - int iMinDist = -1; // indeks wykrytego obiektu -#else TDynamicObject *collider = nullptr; -#endif // if (Track->iNumDynamics>1) // iMinDist+=0; //tymczasowo pułapka if (MyTrack == Track) // gdy szukanie na tym samym torze @@ -1186,54 +1123,6 @@ TDynamicObject * TDynamicObject::ABuFindObject(TTrack *Track, int ScanDir, MyTranslation = MinDist; // szukanie w kierunku Point1 (do zera) - jesteśmy w Point2 if (ScanDir >= 0) { // jeśli szukanie w kierunku Point2 -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for( int i = 0; i < Track->iNumDynamics; i++ ) - { // pętla po pojazdach - if (Track->Dynamics[i] != this) // szukający się nie liczy - { - TestDist = (Track->Dynamics[i]->RaTranslationGet()) - - MyTranslation; // odległogłość tamtego od szukającego - if ((TestDist > 0) && (TestDist <= MinDist)) - { // gdy jest po właściwej stronie i bliżej - // niż jakiś wcześniejszy - CouplFound = (Track->Dynamics[i]->RaDirectionGet() > 0) ? - 1 : - 0; // to, bo (ScanDir>=0) - if (Track->iCategoryFlag & 254) // trajektoria innego typu niż tor kolejowy - { // dla torów nie ma sensu tego sprawdzać, rzadko co jedzie po - // jednej - // szynie i się mija - // Ra: mijanie samochodów wcale nie jest proste - // Przesuniecie wzgledne pojazdow. Wyznaczane, zeby sprawdzic, - // czy pojazdy faktycznie sie zderzaja (moga byc przesuniete - // w/m siebie tak, ze nie zachodza na siebie i wtedy sie mijaja). - double RelOffsetH; // wzajemna odległość poprzeczna - if (CouplFound) // my na tym torze byśmy byli w kierunku Point2 - // dla CouplFound=1 są zwroty zgodne - istotna różnica - // przesunięć - RelOffsetH = (MoverParameters->OffsetTrackH - - Track->Dynamics[i]->MoverParameters->OffsetTrackH); - else - // dla CouplFound=0 są zwroty przeciwne - przesunięcia sumują - // się - RelOffsetH = (MoverParameters->OffsetTrackH + - Track->Dynamics[i]->MoverParameters->OffsetTrackH); - if (RelOffsetH < 0) - RelOffsetH = -RelOffsetH; - if (RelOffsetH + RelOffsetH > - MoverParameters->Dim.W + Track->Dynamics[i]->MoverParameters->Dim.W) - continue; // odległość większa od połowy sumy szerokości - - // kolizji - // nie będzie - // jeśli zahaczenie jest niewielkie, a jest miejsce na poboczu, to - // zjechać na pobocze - } - iMinDist = i; // potencjalna kolizja - MinDist = TestDist; // odleglość pomiędzy aktywnymi osiami pojazdów - } - } - } -#else for( auto dynamic : Track->Dynamics ) { // pętla po pojazdach if( dynamic == this ) { @@ -1277,56 +1166,9 @@ TDynamicObject * TDynamicObject::ABuFindObject(TTrack *Track, int ScanDir, } } -#endif } else //(ScanDir<0) { -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for( int i = 0; i < Track->iNumDynamics; i++ ) - { - if (Track->Dynamics[i] != this) - { - TestDist = MyTranslation - - (Track->Dynamics[i]->RaTranslationGet()); //???-przesunięcie wózka - // względem Point1 toru - if ((TestDist > 0) && (TestDist < MinDist)) - { - CouplFound = (Track->Dynamics[i]->RaDirectionGet() > 0) ? - 0 : - 1; // odwrotnie, bo (ScanDir<0) - if (Track->iCategoryFlag & 254) // trajektoria innego typu niż tor kolejowy - { // dla torów nie ma sensu tego sprawdzać, rzadko co jedzie po - // jednej - // szynie i się mija - // Ra: mijanie samochodów wcale nie jest proste - // Przesunięcie względne pojazdów. Wyznaczane, żeby sprawdzić, - // czy pojazdy faktycznie się zderzają (mogą być przesunięte - // w/m siebie tak, że nie zachodzą na siebie i wtedy sie mijają). - double RelOffsetH; // wzajemna odległość poprzeczna - if (CouplFound) // my na tym torze byśmy byli w kierunku Point1 - // dla CouplFound=1 są zwroty zgodne - istotna różnica - // przesunięć - RelOffsetH = (MoverParameters->OffsetTrackH - - Track->Dynamics[i]->MoverParameters->OffsetTrackH); - else - // dla CouplFound=0 są zwroty przeciwne - przesunięcia sumują - // się - RelOffsetH = (MoverParameters->OffsetTrackH + - Track->Dynamics[i]->MoverParameters->OffsetTrackH); - if (RelOffsetH < 0) - RelOffsetH = -RelOffsetH; - if (RelOffsetH + RelOffsetH > - MoverParameters->Dim.W + Track->Dynamics[i]->MoverParameters->Dim.W) - continue; // odległość większa od połowy sumy szerokości - - // kolizji - // nie będzie - } - iMinDist = i; // potencjalna kolizja - MinDist = TestDist; // odleglość pomiędzy aktywnymi osiami pojazdów - } - } - } -#else for( auto dynamic : Track->Dynamics ) { if( dynamic == this ) { continue; } @@ -1362,14 +1204,9 @@ TDynamicObject * TDynamicObject::ABuFindObject(TTrack *Track, int ScanDir, MinDist = TestDist; // odleglość pomiędzy aktywnymi osiami pojazdów } } -#endif } dist += MinDist; // doliczenie odległości przeszkody albo długości odcinka do przeskanowanej odległości -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - return ( iMinDist >= 0 ) ? Track->Dynamics[ iMinDist ] : NULL; -#else return collider; -#endif } dist += Track->Length(); // doliczenie długości odcinka do przeskanowanej // odległości diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 2d9a3652..c44cf1be 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -36,21 +36,13 @@ TEventLauncher::TEventLauncher() DeltaTime = -1; UpdatedTime = 0; fVal1 = fVal2 = 0; -#ifdef EU07_USE_OLD_TEVENTLAUNCHER_TEXT_ARRAY - szText = NULL; -#endif iHour = iMinute = -1; // takiego czasu nigdy nie będzie dRadius = 0; Event1 = Event2 = NULL; MemCell = NULL; iCheckMask = 0; } -#ifdef EU07_USE_OLD_TEVENTLAUNCHER_TEXT_ARRAY -TEventLauncher::~TEventLauncher() -{ - SafeDeleteArray(szText); -} -#endif + void TEventLauncher::Init() { } @@ -126,13 +118,7 @@ bool TEventLauncher::Load(cParser *parser) asMemCellName = token; parser->getTokens(); *parser >> token; -#ifdef EU07_USE_OLD_TEVENTLAUNCHER_TEXT_ARRAY - SafeDeleteArray(szText); - szText = new char[256]; - strcpy(szText, token.c_str()); -#else szText = token; -#endif if (token != "*") //*=nie brać command pod uwagę iCheckMask |= conditional_memstring; parser->getTokens(); diff --git a/EvLaunch.h b/EvLaunch.h index 491c14b3..42ce2c73 100644 --- a/EvLaunch.h +++ b/EvLaunch.h @@ -7,8 +7,7 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef EvLaunchH -#define EvLaunchH +#pragma once #include #include "Classes.h" @@ -21,11 +20,7 @@ class TEventLauncher double UpdatedTime; double fVal1; double fVal2; -#ifdef EU07_USE_OLD_TEVENTLAUNCHER_TEXT_ARRAY - char * szText; -#else std::string szText; -#endif int iHour, iMinute; // minuta uruchomienia public: double dRadius; @@ -37,9 +32,6 @@ class TEventLauncher TMemCell *MemCell; int iCheckMask; TEventLauncher(); -#ifdef EU07_USE_OLD_TEVENTLAUNCHER_TEXT_ARRAY - ~TEventLauncher(); -#endif void Init(); bool Load(cParser *parser); bool Render(); @@ -47,4 +39,3 @@ class TEventLauncher }; //--------------------------------------------------------------------------- -#endif diff --git a/Event.cpp b/Event.cpp index 566c4fd5..c27f9a4a 100644 --- a/Event.cpp +++ b/Event.cpp @@ -70,7 +70,7 @@ void TEvent::Init(){ }; -void TEvent::Conditions(cParser *parser, string s) +void TEvent::Conditions(cParser *parser, std::string s) { // przetwarzanie warunków, wspólne dla Multiple i UpdateValues if (s == "condition") { // jesli nie "endevent" @@ -623,14 +623,14 @@ void TEvent::AddToQuery(TEvent *e) //--------------------------------------------------------------------------- -string TEvent::CommandGet() +std::string TEvent::CommandGet() { // odczytanie komendy z eventu switch (Type) { // to się wykonuje również składu jadącego bez obsługi case tp_GetValues: - return string(Params[9].asMemCell->Text()); + return std::string(Params[9].asMemCell->Text()); case tp_PutValues: - return string(Params[0].asText); + return std::string(Params[0].asText); } return ""; // inne eventy się nie liczą }; diff --git a/Ground.cpp b/Ground.cpp index c7570483..9858d947 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -47,7 +47,7 @@ extern "C" } bool bCondition; // McZapkie: do testowania warunku na event multiple -string LogComment; +std::string LogComment; //--------------------------------------------------------------------------- // Obiekt renderujący siatkę jest sztucznie tworzonym obiektem pomocniczym, @@ -707,7 +707,7 @@ void TGroundNode::RenderAlphaDL() if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.02f); + glAlphaFunc(GL_GREATER, 0.04f); }; #endif } @@ -1430,9 +1430,6 @@ TGround::TGround() for( int i = 0; i < TP_LAST; ++i ) { nRootOfType[ i ] = nullptr; // zerowanie tablic wyszukiwania } -#ifdef EU07_USE_OLD_TNAMES_CLASS - sTracks = new TNames(); // nazwy torów - na razie tak -#endif ::SecureZeroMemory( TempConnectionType, sizeof( TempConnectionType ) ); ::SecureZeroMemory( pRendered, sizeof( pRendered ) ); @@ -1487,9 +1484,6 @@ void TGround::Free() iNumNodes = 0; // RootNode=NULL; nRootDynamic = NULL; -#ifdef EU07_USE_OLD_TNAMES_CLASS - delete sTracks; -#endif } TGroundNode * TGround::DynamicFindAny(std::string asNameToFind) @@ -1522,9 +1516,6 @@ TGroundNode * TGround::FindGroundNode(std::string asNameToFind, TGroundNodeType { // wyszukiwanie obiektu o podanej nazwie i konkretnym typie if ((iNodeType == TP_TRACK) || (iNodeType == TP_MEMCELL) || (iNodeType == TP_MODEL)) { // wyszukiwanie w drzewie binarnym -#ifdef EU07_USE_OLD_TNAMES_CLASS - return (TGroundNode *)sTracks->Find(iNodeType, asNameToFind.c_str()); -#else /* switch( iNodeType ) { @@ -1553,7 +1544,6 @@ TGroundNode * TGround::FindGroundNode(std::string asNameToFind, TGroundNodeType return nullptr; */ return m_trackmap.Find( iNodeType, asNameToFind ); -#endif } // standardowe wyszukiwanie liniowe TGroundNode *Current; @@ -1566,10 +1556,10 @@ TGroundNode * TGround::FindGroundNode(std::string asNameToFind, TGroundNodeType double fTrainSetVel = 0; double fTrainSetDir = 0; double fTrainSetDist = 0; // odległość składu od punktu 1 w stronę punktu 2 -string asTrainSetTrack = ""; +std::string asTrainSetTrack = ""; int iTrainSetConnection = 0; bool bTrainSet = false; -string asTrainName = ""; +std::string asTrainName = ""; int iTrainSetWehicleNumber = 0; TGroundNode *nTrainSetNode = NULL; // poprzedni pojazd do łączenia TGroundNode *nTrainSetDriver = NULL; // pojazd, któremu zostanie wysłany rozkład @@ -1703,7 +1693,7 @@ void TGround::RaTriangleDivider(TGroundNode *node) TGroundNode * TGround::AddGroundNode(cParser *parser) { // wczytanie wpisu typu "node" // parser->LoadTraction=Global::bLoadTraction; //Ra: tu nie potrzeba powtarzać - string str, str1, str2, str3, str4, Skin, DriverType, asNodeName; + std::string str, str1, str2, str3, str4, Skin, DriverType, asNodeName; int nv, i; double tf, r, rmin, tf1, tf3; int int1; @@ -1725,7 +1715,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) //str = AnsiString(token.c_str()); TGroundNode *tmp; tmp = new TGroundNode(); - tmp->asName = (asNodeName == "none" ? string("") : asNodeName); + tmp->asName = (asNodeName == "none" ? "" : asNodeName); if (r >= 0) tmp->fSquareRadius = r * r; tmp->fSquareMinRadius = rmin * rmin; @@ -1876,21 +1866,10 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->MemCell->Load(parser); if (!tmp->asName.empty()) // jest pusta gdy "none" { // dodanie do wyszukiwarki -#ifdef EU07_USE_OLD_TNAMES_CLASS - if (sTracks->Update(TP_MEMCELL, tmp->asName.c_str(), - tmp)) // najpierw sprawdzić, czy już jest - { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność - // wsteczna) - ErrorLog("Duplicated memcell: " + tmp->asName); // to zgłaszać duplikat - } - else - sTracks->Add(TP_MEMCELL, tmp->asName.c_str(), tmp); // nazwa jest unikalna -#else if( false == m_trackmap.Add( TP_MEMCELL, tmp->asName, tmp ) ) { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) ErrorLog( "Duplicated memcell: " + tmp->asName ); // to zgłaszać duplikat } -#endif } break; case TP_EVLAUNCH: @@ -1910,22 +1889,10 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->asName); // w nazwie może być nazwa odcinka izolowanego if (!tmp->asName.empty()) // jest pusta gdy "none" { // dodanie do wyszukiwarki -#ifdef EU07_USE_OLD_TNAMES_CLASS - if (sTracks->Update(TP_TRACK, tmp->asName.c_str(), - tmp)) // najpierw sprawdzić, czy już jest - { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność - // wsteczna) - if (tmp->pTrack->iCategoryFlag & 1) // jeśli jest zdublowany tor kolejowy - ErrorLog("Duplicated track: " + tmp->asName); // to zgłaszać duplikat - } - else - sTracks->Add(TP_TRACK, tmp->asName.c_str(), tmp); // nazwa jest unikalna -#else if( false == m_trackmap.Add( TP_TRACK, tmp->asName, tmp ) ) { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) ErrorLog( "Duplicated track: " + tmp->asName ); // to zgłaszać duplikat } -#endif } tmp->pCenter = (tmp->pTrack->CurrentSegment()->FastGetPoint_0() + tmp->pTrack->CurrentSegment()->FastGetPoint(0.5) + @@ -1969,7 +1936,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> str4; tf3 = fTrainSetVel; // prędkość int2 = str4.find("."); // yB: wykorzystuje tutaj zmienna, ktora potem bedzie ladunkiem - if (int2 != string::npos) // yB: jesli znalazl kropke, to ja przetwarza jako parametry + if (int2 != std::string::npos) // yB: jesli znalazl kropke, to ja przetwarza jako parametry { size_t dlugosc = str4.length(); int1 = atoi(str4.substr(0, int2).c_str()); // niech sprzegiem bedzie do kropki cos @@ -2165,21 +2132,10 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } else if (!tmp->asName.empty()) // jest pusta gdy "none" { // dodanie do wyszukiwarki -#ifdef EU07_USE_OLD_TNAMES_CLASS - if (sTracks->Update(TP_MODEL, tmp->asName.c_str(), - tmp)) // najpierw sprawdzić, czy już jest - { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność - // wsteczna) - ErrorLog("Duplicated model: " + tmp->asName); // to zgłaszać duplikat - } - else - sTracks->Add(TP_MODEL, tmp->asName.c_str(), tmp); // nazwa jest unikalna -#else if( false == m_trackmap.Add( TP_MODEL, tmp->asName, tmp ) ) { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) ErrorLog( "Duplicated model: " + tmp->asName ); // to zgłaszać duplikat } -#endif } // str=Parser->GetNextSymbol().LowerCase(); break; @@ -2239,7 +2195,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) // PROBLEND Q: 13122011 - Szociu: 27012012 PROBLEND = true; // domyslnie uruchomione nowe wyświetlanie tmp->PROBLEND = true; // odwolanie do tgroundnode, bo rendering jest w tej klasie - if (str.find('@') != string::npos) // sprawdza, czy w nazwie tekstury jest znak "@" + if (str.find('@') != std::string::npos) // sprawdza, czy w nazwie tekstury jest znak "@" { PROBLEND = false; // jeśli jest, wyswietla po staremu tmp->PROBLEND = false; @@ -2457,17 +2413,13 @@ TSubRect * TGround::GetSubRect(int iCol, int iRow) return (Rects[br][bc].SafeGetRect(sc, sr)); // pobranie małego kwadratu } -TEvent * TGround::FindEvent(const string &asEventName) +TEvent * TGround::FindEvent(const std::string &asEventName) { -#ifdef EU07_USE_OLD_TNAMES_CLASS - return (TEvent *)sTracks->Find(0, asEventName.c_str()); // wyszukiwanie w drzewie -#else auto const lookup = m_eventmap.find( asEventName ); return lookup != m_eventmap.end() ? lookup->second : nullptr; -#endif /* //powolna wyszukiwarka for (TEvent *Current=RootEvent;Current;Current=Current->Next2) { @@ -2478,27 +2430,19 @@ TEvent * TGround::FindEvent(const string &asEventName) */ } -TEvent * TGround::FindEventScan(const string &asEventName) +TEvent * TGround::FindEventScan( std::string const &asEventName ) { // wyszukanie eventu z opcją utworzenia niejawnego dla komórek skanowanych -#ifdef EU07_USE_OLD_TNAMES_CLASS - TEvent *e = (TEvent *)sTracks->Find( 0, asEventName.c_str() ); // wyszukiwanie w drzewie eventów -#else auto const lookup = m_eventmap.find( asEventName ); auto e = lookup != m_eventmap.end() ? lookup->second : nullptr; -#endif if (e) return e; // jak istnieje, to w porządku if (asEventName.rfind(":scan") != std::string::npos) // jeszcze może być event niejawny { // no to szukamy komórki pamięci o nazwie zawartej w evencie - string n = asEventName.substr(0, asEventName.length() - 5); // do dwukropka -#ifdef EU07_USE_OLD_TNAMES_CLASS - if( sTracks->Find( TP_MEMCELL, n.c_str() ) ) // jeśli jest takowa komórka pamięci -#else + std::string n = asEventName.substr(0, asEventName.length() - 5); // do dwukropka if( m_trackmap.Find( TP_MEMCELL, n ) != nullptr ) // jeśli jest takowa komórka pamięci -#endif e = new TEvent(n); // utworzenie niejawnego eventu jej odczytu } return e; // utworzony albo się nie udało @@ -2582,7 +2526,7 @@ bool TGround::Init(std::string File) Global::pGround = this; // pTrain=NULL; pOrigin = aRotate = vector3(0, 0, 0); // zerowanie przesunięcia i obrotu - string str = ""; + std::string str; // TFileStream *fs; // int size; std::string subpath = Global::asCurrentSceneryPath; // "scenery/"; @@ -2792,13 +2736,9 @@ bool TGround::Init(std::string File) // pierwszy if (RootEvent->Type != tp_Ignored) if (RootEvent->asName.find( - "onstart") != string::npos) // event uruchamiany automatycznie po starcie + "onstart") != std::string::npos) // event uruchamiany automatycznie po starcie AddToQuery(RootEvent, NULL); // dodanie do kolejki -#ifdef EU07_USE_OLD_TNAMES_CLASS - sTracks->Add(0, tmp->asName.c_str(), tmp); // dodanie do wyszukiwarki -#else m_eventmap.emplace( tmp->asName, tmp ); // dodanie do wyszukiwarki -#endif } } } @@ -3035,7 +2975,7 @@ bool TGround::Init(std::string File) WriteLog("Scenery sky definition"); parser.getTokens(); parser >> token; - string SkyTemp = token; + std::string SkyTemp = token; if (Global::asSky == "1") Global::asSky = SkyTemp; do @@ -3096,12 +3036,6 @@ bool TGround::Init(std::string File) parser >> token; } -#ifdef EU07_USE_OLD_TNAMES_CLASS - sTracks->Sort(TP_TRACK); // finalne sortowanie drzewa torów - sTracks->Sort(TP_MEMCELL); // finalne sortowanie drzewa komórek pamięci - sTracks->Sort(TP_MODEL); // finalne sortowanie drzewa modeli - sTracks->Sort(0); // finalne sortowanie drzewa eventów -#endif if (!bInitDone) FirstInit(); // jeśli nie było w scenerii if (Global::pTerrainCompact) @@ -3345,24 +3279,19 @@ bool TGround::InitEvents() Current->Params[9].asTrack = tmp->pTrack; if (!Current->Params[9].asTrack) { - ErrorLog("Bad event: Track \"" + string(buff) + - "\" does not exist in \"" + Current->asName + "\""); - Current->iFlags &= - ~(conditional_trackoccupied | conditional_trackfree); // zerowanie flag + ErrorLog("Bad event: Track \"" + std::string(buff) + "\" does not exist in \"" + Current->asName + "\""); + Current->iFlags &= ~(conditional_trackoccupied | conditional_trackfree); // zerowanie flag } } - else if (Current->iFlags & - (conditional_memstring | conditional_memval1 | conditional_memval2)) + else if (Current->iFlags & (conditional_memstring | conditional_memval1 | conditional_memval2)) { // jeśli chodzi o komorke pamieciową tmp = FindGroundNode(buff, TP_MEMCELL); if (tmp) Current->Params[9].asMemCell = tmp->MemCell; if (!Current->Params[9].asMemCell) { - ErrorLog("Bad event: MemCell \"" + string(buff) + - "\" does not exist in \"" + Current->asName + "\""); - Current->iFlags &= - ~(conditional_memstring | conditional_memval1 | conditional_memval2); + ErrorLog("Bad event: MemCell \"" + std::string(buff) + "\" does not exist in \"" + Current->asName + "\""); + Current->iFlags &= ~(conditional_memstring | conditional_memval1 | conditional_memval2); } } for (i = 0; i < 8; i++) @@ -3375,8 +3304,8 @@ bool TGround::InitEvents() if( !Current->Params[ i ].asEvent ) { // Ra: tylko w logu informacja o braku if( ( Current->Params[ i ].asText == NULL ) || ( std::string( Current->Params[ i ].asText ).substr( 0, 5 ) != "none_" ) ) { - WriteLog( "Event \"" + string( buff ) + "\" does not exist" ); - ErrorLog( "Missed event: " + string( buff ) + " in multiple " + Current->asName ); + WriteLog( "Event \"" + std::string( buff ) + "\" does not exist" ); + ErrorLog( "Missed event: " + std::string( buff ) + " in multiple " + Current->asName ); } } } @@ -3414,7 +3343,7 @@ void TGround::InitTracks() TTrack *tmp; // znaleziony tor TTrack *Track; int iConnection; - string name; + std::string name; // tracks=tracksfar=0; for (Current = nRootOfType[TP_TRACK]; Current; Current = Current->nNext) { @@ -3568,11 +3497,7 @@ void TGround::InitTracks() Current = new TGroundNode(); // to nie musi mieć nazwy, nazwa w wyszukiwarce wystarczy // Current->asName=p->asName; //mazwa identyczna, jak nazwa odcinka izolowanego Current->MemCell = new TMemCell(NULL); // nowa komórka -#ifdef EU07_USE_OLD_TNAMES_CLASS - sTracks->Add(TP_MEMCELL, p->asName.c_str(), Current); // dodanie do wyszukiwarki -#else m_trackmap.Add( TP_MEMCELL, p->asName, Current ); -#endif Current->nNext = nRootOfType[TP_MEMCELL]; // to nie powinno tutaj być, bo robi się śmietnik nRootOfType[TP_MEMCELL] = Current; @@ -3592,7 +3517,7 @@ void TGround::InitTraction() TTraction *tmp; // znalezione przęsło TTraction *Traction; int iConnection; - string name; + std::string name; for (nCurrent = nRootOfType[TP_TRACTION]; nCurrent; nCurrent = nCurrent->nNext) { // podłączenie do zasilacza, żeby można było sumować prąd kilku pojazdów // a jednocześnie z jednego miejsca zmieniać napięcie eventem @@ -4015,18 +3940,11 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) if (Event->Params[6].asTrack) { // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla // wszystkich 'dynamic' na danym torze -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for (int i = 0; i < Event->Params[6].asTrack->iNumDynamics; ++i) - Event->Params[5].asMemCell->PutCommand( - Event->Params[6].asTrack->Dynamics[i]->Mechanik, - &Event->Params[4].nGroundNode->pCenter); -#else for( auto dynamic : Event->Params[ 6 ].asTrack->Dynamics ) { Event->Params[ 5 ].asMemCell->PutCommand( dynamic->Mechanik, &Event->Params[ 4 ].nGroundNode->pCenter ); } -#endif //if (DebugModeFlag) WriteLog("EVENT EXECUTED: AddValues & Track command - " + std::string(Event->Params[0].asText) + " " + @@ -4045,8 +3963,7 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) } if (Event) { // standardowe dodanie do kolejki - WriteLog("EVENT ADDED TO QUEUE: " + Event->asName + - (Node ? (" by " + Node->asName) : string(""))); + WriteLog("EVENT ADDED TO QUEUE: " + Event->asName + (Node ? (" by " + Node->asName) : "")); Event->fStartTime = fabs(Event->fDelay) + Timer::GetTime(); // czas od uruchomienia scenerii if (Event->fRandomDelay > 0.0) @@ -4091,12 +4008,12 @@ bool TGround::EventConditon(TEvent *e) if (tmpEvent->Params[9].asMemCell->Compare(e->Params[10].asText, e->Params[11].asdouble, e->Params[12].asdouble, e->iFlags)) { //logowanie spełnionych warunków - LogComment = e->Params[9].asMemCell->Text() + string(" ") + + LogComment = e->Params[9].asMemCell->Text() + " " + to_string(e->Params[9].asMemCell->Value1(), 2, 8) + " " + to_string(tmpEvent->Params[9].asMemCell->Value2(), 2, 8) + " = "; if (TestFlag(e->iFlags, conditional_memstring)) - LogComment += string(tmpEvent->Params[10].asText); + LogComment += std::string(tmpEvent->Params[10].asText); else LogComment += "*"; if (TestFlag(tmpEvent->iFlags, conditional_memval1)) @@ -4113,7 +4030,7 @@ bool TGround::EventConditon(TEvent *e) //else if (Global::iWriteLogEnabled && DebugModeFlag) //zawsze bo to bardzo istotne w debugowaniu scenariuszy else { // nie zgadza się, więc sprawdzmy, co - LogComment = e->Params[9].asMemCell->Text() + string(" ") + + LogComment = e->Params[9].asMemCell->Text() + " " + to_string(e->Params[9].asMemCell->Value1(), 2, 8) + " " + to_string(tmpEvent->Params[9].asMemCell->Value2(), 2, 8) + " != "; @@ -4199,8 +4116,9 @@ bool TGround::CheckQuery() if (tmpEvent->bEnabled) { // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć WriteLog("EVENT LAUNCHED: " + tmpEvent->asName + - (tmpEvent->Activator ? string(" by " + tmpEvent->Activator->asName) : - string(""))); + (tmpEvent->Activator ? + std::string(" by " + tmpEvent->Activator->asName) : + "" )); switch (tmpEvent->Type) { case tp_CopyValues: // skopiowanie wartości z innej komórki @@ -4224,18 +4142,11 @@ bool TGround::CheckQuery() if (tmpEvent->Params[6].asTrack) { // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla // wszystkich 'dynamic' na danym torze -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for (int i = 0; i < tmpEvent->Params[6].asTrack->iNumDynamics; ++i) - tmpEvent->Params[5].asMemCell->PutCommand( - tmpEvent->Params[6].asTrack->Dynamics[i]->Mechanik, - &tmpEvent->Params[4].nGroundNode->pCenter); -#else for( auto dynamic : tmpEvent->Params[ 6 ].asTrack->Dynamics ) { tmpEvent->Params[ 5 ].asMemCell->PutCommand( dynamic->Mechanik, &tmpEvent->Params[ 4 ].nGroundNode->pCenter ); } -#endif //if (DebugModeFlag) WriteLog("Type: UpdateValues & Track command - " + tmpEvent->Params[5].asMemCell->Text() + " " + @@ -4409,71 +4320,31 @@ bool TGround::CheckQuery() if (tmpEvent->iFlags & update_load) { // jeśli pytanie o ładunek if (tmpEvent->iFlags & update_memadd) // jeśli typ pojazdu -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - tmpEvent->Params[ 9 ].asMemCell->UpdateValues( - strdup(tmpEvent->Activator->MoverParameters->TypeName.c_str()), // typ pojazdu - 0, // na razie nic - 0, // na razie nic - tmpEvent->iFlags & - (update_memstring | update_memval1 | update_memval2)); -#else tmpEvent->Params[ 9 ].asMemCell->UpdateValues( tmpEvent->Activator->MoverParameters->TypeName, // typ pojazdu 0, // na razie nic 0, // na razie nic tmpEvent->iFlags & (update_memstring | update_memval1 | update_memval2)); -#endif else // jeśli parametry ładunku -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - tmpEvent->Params[ 9 ].asMemCell->UpdateValues( - tmpEvent->Activator->MoverParameters->LoadType != "" ? - strdup(tmpEvent->Activator->MoverParameters->LoadType.c_str()) : - (char*)"none", // nazwa ładunku - tmpEvent->Activator->MoverParameters->Load, // aktualna ilość - tmpEvent->Activator->MoverParameters->MaxLoad, // maksymalna ilość - tmpEvent->iFlags & - (update_memstring | update_memval1 | update_memval2)); -#else tmpEvent->Params[ 9 ].asMemCell->UpdateValues( tmpEvent->Activator->MoverParameters->LoadType, // nazwa ładunku tmpEvent->Activator->MoverParameters->Load, // aktualna ilość tmpEvent->Activator->MoverParameters->MaxLoad, // maksymalna ilość tmpEvent->iFlags & (update_memstring | update_memval1 | update_memval2)); -#endif } else if (tmpEvent->iFlags & update_memadd) { // jeśli miejsce docelowe pojazdu -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - tmpEvent->Params[ 9 ].asMemCell->UpdateValues( - strdup(tmpEvent->Activator->asDestination.c_str()), // adres docelowy - tmpEvent->Activator->DirectionGet(), // kierunek pojazdu względem czoła - // składu (1=zgodny,-1=przeciwny) - tmpEvent->Activator->MoverParameters - ->Power, // moc pojazdu silnikowego: 0 dla wagonu - tmpEvent->iFlags & (update_memstring | update_memval1 | update_memval2)); -#else tmpEvent->Params[ 9 ].asMemCell->UpdateValues( tmpEvent->Activator->asDestination, // adres docelowy tmpEvent->Activator->DirectionGet(), // kierunek pojazdu względem czoła składu (1=zgodny,-1=przeciwny) tmpEvent->Activator->MoverParameters ->Power, // moc pojazdu silnikowego: 0 dla wagonu tmpEvent->iFlags & (update_memstring | update_memval1 | update_memval2)); -#endif } else if (tmpEvent->Activator->Mechanik) if (tmpEvent->Activator->Mechanik->Primary()) { // tylko jeśli ktoś tam siedzi - nie powinno dotyczyć pasażera! -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - tmpEvent->Params[ 9 ].asMemCell->UpdateValues( - const_cast(tmpEvent->Activator->Mechanik->TrainName().c_str()), - tmpEvent->Activator->Mechanik->StationCount() - - tmpEvent->Activator->Mechanik - ->StationIndex(), // ile przystanków do końca - tmpEvent->Activator->Mechanik->IsStop() ? 1 : - 0, // 1, gdy ma tu zatrzymanie - tmpEvent->iFlags); -#else tmpEvent->Params[ 9 ].asMemCell->UpdateValues( tmpEvent->Activator->Mechanik->TrainName(), tmpEvent->Activator->Mechanik->StationCount() - @@ -4482,7 +4353,6 @@ bool TGround::CheckQuery() tmpEvent->Activator->Mechanik->IsStop() ? 1 : 0, // 1, gdy ma tu zatrzymanie tmpEvent->iFlags); -#endif WriteLog("Train detected: " + tmpEvent->Activator->Mechanik->TrainName()); } break; @@ -4975,7 +4845,7 @@ bool TGround::RenderDL(vector3 pPosition) bool TGround::RenderAlphaDL(vector3 pPosition) { // renderowanie scenerii z Display List - faza przezroczystych glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.02f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.04f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f TGroundNode *node; glColor4f(1.0f, 1.0f, 1.0f, 1.0f); TSubRect *tmp; @@ -5269,13 +5139,13 @@ void TGround::WyslijObsadzone() } while (i <= 30) { - strcpy(r.cString + 64 * i, string("none").c_str()); + strcpy(r.cString + 64 * i, "none"); r.fPar[16 * i + 4] = 1; r.fPar[16 * i + 5] = 2; r.fPar[16 * i + 6] = 3; r.iPar[16 * i + 7] = 0; - strcpy(r.cString + 64 * i + 32, string("none").c_str()); - strcpy(r.cString + 64 * i + 48, string("none").c_str()); + strcpy(r.cString + 64 * i + 32, "none"); + strcpy(r.cString + 64 * i + 48, "none"); i++; } @@ -5345,18 +5215,6 @@ TDynamicObject * TGround::DynamicNearest(vector3 pPosition, double distance, boo if ((tmp = FastGetSubRect(i, j)) != NULL) for (node = tmp->nRootNode; node; node = node->nNext2) // następny z sektora if (node->iType == TP_TRACK) // Ra: przebudować na użycie tabeli torów? -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for( k = 0; k < node->pTrack->iNumDynamics; k++ ) - if (mech ? (node->pTrack->Dynamics[k]->Mechanik != NULL) : - true) // czy ma mieć obsadę - if ((sqd = SquareMagnitude( - node->pTrack->Dynamics[k]->GetPosition() - pPosition)) < - sqm) - { - sqm = sqd; // nowa odległość - dyn = node->pTrack->Dynamics[k]; // nowy lider - } -#else for( auto dynamic : node->pTrack->Dynamics ) { if( mech ? ( dynamic->Mechanik != nullptr ) : true ) { // czy ma mieć obsadę @@ -5366,7 +5224,6 @@ TDynamicObject * TGround::DynamicNearest(vector3 pPosition, double distance, boo } } } -#endif return dyn; }; TDynamicObject * TGround::CouplerNearest(vector3 pPosition, double distance, bool mech) @@ -5383,27 +5240,6 @@ TDynamicObject * TGround::CouplerNearest(vector3 pPosition, double distance, boo if ((tmp = FastGetSubRect(i, j)) != NULL) for (node = tmp->nRootNode; node; node = node->nNext2) // następny z sektora if (node->iType == TP_TRACK) // Ra: przebudować na użycie tabeli torów? -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for( k = 0; k < node->pTrack->iNumDynamics; k++ ) - if (mech ? (node->pTrack->Dynamics[k]->Mechanik != NULL) : - true) // czy ma mieć obsadę - { - if ((sqd = SquareMagnitude( - node->pTrack->Dynamics[k]->HeadPosition() - pPosition)) < - sqm) - { - sqm = sqd; // nowa odległość - dyn = node->pTrack->Dynamics[k]; // nowy lider - } - if ((sqd = SquareMagnitude( - node->pTrack->Dynamics[k]->RearPosition() - pPosition)) < - sqm) - { - sqm = sqd; // nowa odległość - dyn = node->pTrack->Dynamics[k]; // nowy lider - } - } -#else for( auto dynamic : node->pTrack->Dynamics ) { if( mech ? ( dynamic->Mechanik != nullptr ) : true ) { // czy ma mieć obsadę @@ -5417,7 +5253,6 @@ TDynamicObject * TGround::CouplerNearest(vector3 pPosition, double distance, boo } } } -#endif return dyn; }; //--------------------------------------------------------------------------- @@ -5556,11 +5391,7 @@ void TGround::TrackBusyList() TGroundNode *Current; for (Current = nRootOfType[TP_TRACK]; Current; Current = Current->nNext) if (!Current->asName.empty()) // musi być nazwa -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - if( Current->pTrack->iNumDynamics ) // osi to chyba nie ma jak policzyć -#else if( false == Current->pTrack->Dynamics.empty() ) -#endif WyslijString(Current->asName, 8); // zajęty }; //--------------------------------------------------------------------------- diff --git a/Ground.h b/Ground.h index 9a8673c5..44164d09 100644 --- a/Ground.h +++ b/Ground.h @@ -306,13 +306,9 @@ class TGround ssh = 0, ssm = 0; // ustawienia czasu // int tracks,tracksfar; //liczniki torów -#ifdef EU07_USE_OLD_TNAMES_CLASS - TNames *sTracks = nullptr; // posortowane nazwy torów i eventów -#else typedef std::unordered_map event_map; event_map m_eventmap; TNames m_trackmap; -#endif light_array m_lights; // collection of dynamic light sources present in the scene private: // metody prywatne diff --git a/MemCell.cpp b/MemCell.cpp index 49db62c3..9a9ad4fe 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -28,37 +28,20 @@ http://mozilla.org/MPL/2.0/. TMemCell::TMemCell(vector3 *p) { fValue1 = fValue2 = 0; -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - szText = new char[256]; // musi być dla automatycznie tworzonych komórek dla odcinków izolowanych -#endif vPosition = p ? *p : vector3(0, 0, 0); // ustawienie współrzędnych, bo do TGroundNode nie ma dostępu bCommand = false; // komenda wysłana OnSent = NULL; } -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY -TMemCell::~TMemCell() -{ - SafeDeleteArray(szText); -} -#endif void TMemCell::Init() { } -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY -void TMemCell::UpdateValues(char const *szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask) -#else void TMemCell::UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ) -#endif { if (CheckMask & update_memadd) { // dodawanie wartości if( TestFlag( CheckMask, update_memstring ) ) -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - strcat( szText, szNewText ); -#else szText += szNewText; -#endif if (TestFlag(CheckMask, update_memval1)) fValue1 += fNewValue1; if (TestFlag(CheckMask, update_memval2)) @@ -67,11 +50,7 @@ void TMemCell::UpdateValues( std::string const &szNewText, double const fNewValu else { if( TestFlag( CheckMask, update_memstring ) ) -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - strcpy( szText, szNewText ); -#else szText = szNewText; -#endif if (TestFlag(CheckMask, update_memval1)) fValue1 = fNewValue1; if (TestFlag(CheckMask, update_memval2)) @@ -83,56 +62,32 @@ void TMemCell::UpdateValues( std::string const &szNewText, double const fNewValu TCommandType TMemCell::CommandCheck() { // rozpoznanie komendy -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - if (strcmp(szText, "SetVelocity") == 0) // najpopularniejsze -#else if( szText == "SetVelocity" ) // najpopularniejsze -#endif { eCommand = cm_SetVelocity; bCommand = false; // ta komenda nie jest wysyłana } -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - else if( strcmp( szText, "ShuntVelocity" ) == 0 ) // w tarczach manewrowych -#else else if( szText == "ShuntVelocity" ) // w tarczach manewrowych -#endif { eCommand = cm_ShuntVelocity; bCommand = false; // ta komenda nie jest wysyłana } -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - else if( strcmp( szText, "Change_direction" ) == 0 ) // zdarza się -#else else if( szText == "Change_direction" ) // zdarza się -#endif { eCommand = cm_ChangeDirection; bCommand = true; // do wysłania } -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - else if( strcmp( szText, "OutsideStation" ) == 0 ) // zdarza się -#else else if( szText == "OutsideStation" ) // zdarza się -#endif { eCommand = cm_OutsideStation; bCommand = false; // tego nie powinno być w komórce } -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - else if( strncmp( szText, "PassengerStopPoint:", 19 ) == 0 ) // porównanie początków -#else else if( szText.compare( 0, 19, "PassengerStopPoint:" ) == 0 ) // porównanie początków -#endif { eCommand = cm_PassengerStopPoint; bCommand = false; // tego nie powinno być w komórce } -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - else if( strcmp( szText, "SetProximityVelocity" ) == 0 ) // nie powinno tego być -#else else if( szText == "SetProximityVelocity" ) // nie powinno tego być -#endif { eCommand = cm_SetProximityVelocity; bCommand = false; // ta komenda nie jest wysyłana @@ -149,14 +104,7 @@ bool TMemCell::Load(cParser *parser) { std::string token; parser->getTokens(1, false); // case sensitive -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - *parser >> token; - SafeDeleteArray(szText); - szText = new char[256]; // musi być bufor do łączenia tekstów - strcpy(szText, token.c_str()); -#else *parser >> szText; -#endif parser->getTokens( 2, false ); *parser >> fValue1 @@ -179,32 +127,6 @@ void TMemCell::PutCommand(TController *Mech, vector3 *Loc) Mech->PutCommand(szText, fValue1, fValue2, Loc); } -bool TMemCell::Compare(char const *szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask) -{ // porównanie zawartości komórki pamięci z podanymi wartościami - if (TestFlag(CheckMask, conditional_memstring)) - { // porównać teksty - std::string - match( szTestText ); - auto range = match.find( '*' ); - if( range != std::string::npos ) { - // compare string parts - if( 0 != szText.compare( 0, range, match, 0, range ) ) { - return false; - } - } - else { - // compare full strings - if( szText != match ) { - return false; - } - } - } - // tekst zgodny, porównać resztę - return ((!TestFlag(CheckMask, conditional_memval1) || (fValue1 == fTestValue1)) && - (!TestFlag(CheckMask, conditional_memval2) || (fValue2 == fTestValue2))); -}; - -#ifndef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ) { // porównanie zawartości komórki pamięci z podanymi wartościami if( TestFlag( CheckMask, conditional_memstring ) ) { @@ -224,10 +146,9 @@ bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, } } // tekst zgodny, porównać resztę - return ( ( !TestFlag( CheckMask, conditional_memval1 ) || ( fValue1 == fTestValue1 ) ) && - ( !TestFlag( CheckMask, conditional_memval2 ) || ( fValue2 == fTestValue2 ) ) ); + return ( ( !TestFlag( CheckMask, conditional_memval1 ) || ( fValue1 == fTestValue1 ) ) + && ( !TestFlag( CheckMask, conditional_memval2 ) || ( fValue2 == fTestValue2 ) ) ); }; -#endif bool TMemCell::Render() { diff --git a/MemCell.h b/MemCell.h index 730a5bf1..a4384b3f 100644 --- a/MemCell.h +++ b/MemCell.h @@ -7,56 +7,31 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef MemCellH -#define MemCellH +#pragma once #include "Classes.h" #include "dumb3d.h" -using namespace Math3D; -using namespace std; class TMemCell { private: - vector3 vPosition; -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - char *szText; -#else + Math3D::vector3 vPosition; std::string szText; -#endif double fValue1; double fValue2; TCommandType eCommand; bool bCommand; // czy zawiera komendę dla zatrzymanego AI TEvent *OnSent; // event dodawany do kolejki po wysłaniu komendy zatrzymującej skład public: - string - asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac - TMemCell(vector3 *p); -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - ~TMemCell(); -#endif + std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac + TMemCell( Math3D::vector3 *p ); void Init(); -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - void UpdateValues( char const *szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); -#else void UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); -#endif bool Load(cParser *parser); - void PutCommand(TController *Mech, vector3 *Loc); - bool Compare( char const *szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ); -#ifndef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY + void PutCommand( TController *Mech, Math3D::vector3 *Loc ); bool Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ); -#endif bool Render(); -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - inline char * Text() - { - return szText; - }; -#else inline std::string const &Text() { return szText; } -#endif inline double Value1() { return fValue1; @@ -65,7 +40,7 @@ class TMemCell { return fValue2; }; - inline vector3 Position() + inline Math3D::vector3 Position() { return vPosition; }; @@ -84,4 +59,3 @@ class TMemCell }; //--------------------------------------------------------------------------- -#endif diff --git a/Names.cpp b/Names.cpp index 1f6bcd54..c9f26e8e 100644 --- a/Names.cpp +++ b/Names.cpp @@ -11,179 +11,3 @@ http://mozilla.org/MPL/2.0/. #include "Names.h" //--------------------------------------------------------------------------- - -/* -Moduł zarządzający plikami oraz wyszukiwaniem obiektów wg nazw. -1. Ma przydzielony z góry (EU07.INI) obszar pamięci (rzędu 16MB). -2. W przypadku przepełnienia dostępnej pamięci wystąpi błąd wczytywania. -3. Obszar ten będzie zużywany na rekordy obiektów oraz ciągi tekstowe z nazwami. -4. Rekordy będą sortowane w ramach typu (tekstury, dźwięki, modele, node, eventy). -5. Pierwszy etap wyszukiwania to 5 bitów z pierwszego bajtu i 3 z drugiego (256). -6. Dla plików istnieje możliwość wczytania ich w innym terminie. -7. Możliwość wczytania plików w oddzielnym watku (np. tekstur). - -Obsługiwane pliki: -1. Tekstury, można wczytywać później, rekord przechowuje numer podany przez kartę graficzną. -2. Dźwięki, można wczytać później. -3. Modele, można wczytać później o ile nie mają animacji eventami i nie dotyczą pojazdów. - -Obiekty sortowane wg nazw, można dodawać i usuwać komórki scenerii: -4. Tory, drogi, rzeki - wyszukiwanie w celu sprawdzenia zajetości. -5. Eventy - wyszukiwane przy zewnętrznym wywołaniu oraz podczas wczytywania. -6. Pojazdy - wyszukiwane w celu wysyłania komend. -7. Egzemplarze modeli animowanych - wyszukiwanie w celu połączenia z animacjami. - -*/ - -#ifdef EU07_USE_OLD_TNAMES_CLASS - -void ItemRecord::TreeAdd(ItemRecord *r, int c) -{ // dodanie rekordu do drzewa - ustalenie w której gałęzi - // zapisać w (iFlags) ile znaków jest zgodnych z nadrzędnym, żeby nie sprawdzać wszystkich od - // zera - if ((cName[c] && r->cName[c]) ? cName[c] == r->cName[c] : false) - TreeAdd(r, c + 1); // ustawić wg kolejnego znaku, chyba że zero - else if ((unsigned char)(cName[c]) < (unsigned char)(r->cName[c])) - { // zero jest najmniejsze - doczepiamy jako (rNext) - if (!rNext) - rNext = r; - else - rNext->TreeAdd(r, 0); // doczepić do tej gałęzi - } - else - { - if (!rPrev) - rPrev = r; - else - rPrev->TreeAdd(r, 0); // doczepić do tej gałęzi - } -}; - -void ItemRecord::ListGet(ItemRecord *r, int *&n) -{ // rekurencyjne wypełnianie posortowanej listy na podstawie drzewa - if (rPrev) - rPrev->ListGet(r, n); // dodanie wszystkich wcześniejszych - *n++ = this - r; // dodanie swojego indeksu do tabeli - if (rNext) - rNext->ListGet(r, n); // dodanie wszystkich późniejszych -}; - -void * ItemRecord::TreeFind(const char *n) -{ // wyszukanie ciągu (n) - ItemRecord *r = TreeFindRecord(n); - return r ? r->pData : NULL; -}; - -ItemRecord * ItemRecord::TreeFindRecord(const char *n) -{ // wyszukanie ciągu (n) - ItemRecord *r = this; //żeby nie robić rekurencji - int i = 0; - do - { - if (!n[i]) - if (!r->cName[i]) - return r; // znaleziony - if (n[i] == r->cName[i]) - ++i; // porównać kolejny znak - else if ((unsigned char)(n[i]) < (unsigned char)(r->cName[i])) - { - i = 0; // porównywać od nowa - r = r->rPrev; // wcześniejsza gałąź drzewa - } - else - { - i = 0; // porównywać od nowa - r = r->rNext; // późniejsza gałąź drzewa - } - } while (r); - return NULL; -}; - -TNames::TNames() -{ // tworzenie bufora - iSize = 16 * 1024 * 1024; // rozmiar bufora w bajtach - cBuffer = new char[iSize]; - ZeroMemory(cBuffer, iSize); // nie trzymać jakiś starych śmieci - rRecords = (ItemRecord *)cBuffer; - cLast = cBuffer + iSize; // bajt za buforem - iLast = -1; - ZeroMemory(rTypes, 20 * sizeof(ItemRecord *)); -}; - -TNames::~TNames() { - - delete[] cBuffer; -} - -int TNames::Add(int t, const char *n) -{ // dodanie obiektu typu (t) o nazwie (n) - int len = strlen(n) + 1; // ze znacznikiem końca - cLast -= len; // rezerwacja miejsca - memcpy(cLast, n, len); // przekopiowanie tekstu do bufora - // cLast[len-1]='\0'; - rRecords[++iLast].cName = cLast; // połączenie nazwy z rekordem - rRecords[iLast].iFlags = t; - if (!rTypes[t]) - rTypes[t] = rRecords + iLast; // korzeń drzewa, bo nie było wcześniej - else - rTypes[t]->TreeAdd(rRecords + iLast, 0); // doczepienie jako gałąź - // rTypes[t]=Sort(t); //sortowanie uruchamiać ręcznie - if ((iLast & 0x3F) == 0) // nie za często, bo sortowania zajmą więcej czasu niż wyszukiwania - Sort(t); // optymalizacja drzewa co jakiś czas - return iLast; -} -int TNames::Add(int t, const char *n, void *d) -{ - int i = Add(t, n); - rRecords[iLast].pData = d; - return i; -}; - -bool TNames::Update(int t, const char *n, void *d) -{ // dodanie jeśli nie ma, wymiana (d), gdy jest - ItemRecord *r = FindRecord(t, n); // najpierw sprawdzić, czy już jest - if (r) - { // przy zdublowaniu nazwy podmieniać w drzewku na późniejszy - r->pData = d; - return true; // duplikat - } - // Add(t,n,d); //nazwa unikalna - return false; // został dodany nowy -}; - -ItemRecord * TNames::TreeSet(int *n, int d, int u) -{ // rekurencyjne wypełnianie drzewa pozycjami od (d) do (u) - if (d == u) - { - rRecords[n[d]].rPrev = rRecords[n[d]].rNext = NULL; - return rRecords + n[d]; // tej gałęzi nie ma - } - else if (d > u) - return NULL; - int p = (u + d) >> 1; // połowa - rRecords[n[p]].rPrev = TreeSet(n, d, p - 1); // zapisanie wcześniejszych gałęzi - rRecords[n[p]].rNext = TreeSet(n, p + 1, u); // zapisanie późniejszych gałęzi - return rRecords + n[p]; -}; - -void TNames::Sort(int t) -{ // przebudowa drzewa typu (t), zwraca wierzchołek drzewa - if (iLast < 3) - return; // jak jest mało, to nie ma sensu sortować - if (rTypes[t]) // jeśli jest jakiś rekord danego typu - { - int *r = new int[iLast + 1]; // robocza tablica indeksów - numery posortowanych rekordów - int *q = r; // wskaźnik roboczy, przekazywany przez referencję - rTypes[t]->ListGet(rRecords, q); // drzewo jest już posortowane - zamienić je na listę - rTypes[t] = TreeSet(r, 0, (q - r) - 1); - delete[] r; - } - return; -}; - -ItemRecord * TNames::FindRecord(const int t, const char *n) -{ // poszukiwanie rekordu w celu np. zmiany wskaźnika - return rTypes[t] ? rTypes[t]->TreeFindRecord(n) : NULL; -}; - -#endif diff --git a/Names.h b/Names.h index d9220fb1..a4bbdf70 100644 --- a/Names.h +++ b/Names.h @@ -1,4 +1,3 @@ -#pragma once /* This Source Code Form is subject to the terms of the Mozilla Public License, v. @@ -8,12 +7,12 @@ obtain one at http://mozilla.org/MPL/2.0/. */ +#pragma once + #include #include -#ifndef EU07_USE_OLD_TNAMES_CLASS - -template +template class TNames { public: @@ -27,7 +26,7 @@ public: // methods: // dodanie obiektu z wskaźnikiem. updates data field if the object already exists. returns true for insertion, false for update bool - Add( int const Type, std::string const &Name, _Pointer Data ) { + Add( int const Type, std::string const &Name, _Type Data ) { auto lookup = find_map( Type ).emplace( Name, Data ); if( lookup.second == false ) { @@ -41,7 +40,7 @@ public: } } // returns pointer associated with provided label, or nullptr if there's no match - _Pointer + _Type Find( int const Type, std::string const &Name ) { auto const &map = find_map( Type ); @@ -52,78 +51,17 @@ public: private: // types: - typedef std::unordered_map pointer_map; - typedef std::unordered_map pointermap_map; + typedef std::unordered_map type_map; + typedef std::unordered_map typemap_map; // methods: // returns database stored with specified type key; creates new database if needed. - pointer_map & + type_map & find_map( int const Type ) { - return m_maps.emplace( Type, pointer_map() ).first->second; + return m_maps.emplace( Type, type_map() ).first->second; } // members: - pointermap_map m_maps; // list of pointer maps of types specified so far + typemap_map m_maps; // list of object maps of types specified so far }; - -#else - -//--------------------------------------------------------------------------- -class ItemRecord -{ // rekord opisujący obiekt; raz utworzony nie przemieszcza się - // rozmiar rekordu można zmienić w razie potrzeby - public: - char *cName; // wskaźnik do nazwy umieszczonej w buforze - int iFlags; // flagi bitowe - ItemRecord *rPrev, *rNext; // posortowane drzewo (przebudowywane w razie potrzeby) - union - { - void *pData; // wskaźnik do obiektu - int iData; // albo numer obiektu (tekstury) - unsigned int uData; - }; - // typedef - void ListGet(ItemRecord *r, int *&n); - void TreeAdd(ItemRecord *r, int c); - template inline TOut *DataGet() - { - return (TOut *)pData; - }; - template inline void DataSet(TOut *x) - { - pData = (void *)x; - }; - void * TreeFind(const char *n); - ItemRecord * TreeFindRecord(const char *n); -}; - -class TNames -{ - public: - int iSize; // rozmiar bufora - char *cBuffer; // bufor dla rekordów (na początku) i nazw (na końcu) - ItemRecord *rRecords; // rekordy na początku bufora - char *cLast; // ostatni użyty bajt na nazwy - ItemRecord *rTypes[20]; // rożne typy obiektów (początek drzewa) - int iLast; // ostatnio użyty rekord - public: - TNames(); - ~TNames(); - int Add(int t, const char *n); // dodanie obiektu typu (t) - int Add(int t, const char *n, void *d); // dodanie obiektu z wskaźnikiem - int Add(int t, const char *n, int d); // dodanie obiektu z numerem - bool Update(int t, const char *n, void *d); // dodanie jeśli nie ma, wymiana (d), gdy jest - void TreeSet(); - ItemRecord * TreeSet(int *n, int d, int u); - void Sort(int t); // przebudowa drzewa typu (t) - ItemRecord * Item(int n); // rekord o numerze (n) - inline void *Find(const int t, const char *n) - { - return rTypes[t] ? rTypes[t]->TreeFind(n) : NULL; - }; - ItemRecord * FindRecord(const int t, const char *n); - // template inline TOut* Find(const int t,const char *n) - //{return (TOut*)(rTypes[t]->TreeFind(n));}; -}; -#endif diff --git a/Track.cpp b/Track.cpp index e13c9eae..d493055a 100644 --- a/Track.cpp +++ b/Track.cpp @@ -77,8 +77,8 @@ TIsolated::TIsolated() TIsolated("none", NULL); }; -TIsolated::TIsolated(const string &n, TIsolated *i) : - asName( n ), pNext( i ) +TIsolated::TIsolated(std::string const &n, TIsolated *i) : + asName( n ), pNext( i ) { // utworznie obwodu izolowanego. nothing to do here. }; @@ -96,7 +96,7 @@ TIsolated::~TIsolated(){ */ }; -TIsolated * TIsolated::Find(const string &n) +TIsolated * TIsolated::Find(std::string const &n) { // znalezienie obiektu albo utworzenie nowego TIsolated *p = pRoot; while (p) @@ -121,13 +121,8 @@ void TIsolated::Modify(int i, TDynamicObject *o) if (Global::iMultiplayer) // jeśli multiplayer Global::pGround->WyslijString(asName, 10); // wysłanie pakietu o zwolnieniu if (pMemCell) // w powiązanej komórce -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - pMemCell->UpdateValues( NULL, 0, int( pMemCell->Value2() ) & ~0xFF, - update_memval2); //"zerujemy" ostatnią wartość -#else pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) & ~0xFF, update_memval2 ); //"zerujemy" ostatnią wartość -#endif } } else @@ -140,12 +135,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) if (Global::iMultiplayer) // jeśli multiplayer Global::pGround->WyslijString(asName, 11); // wysłanie pakietu o zajęciu if (pMemCell) // w powiązanej komórce -#ifdef EU07_USE_OLD_TMEMCELL_TEXT_ARRAY - pMemCell->UpdateValues( NULL, 0, int( pMemCell->Value2() ) | 1, - update_memval2); // zmieniamy ostatnią wartość na nieparzystą -#else pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) | 1, update_memval2 ); // zmieniamy ostatnią wartość na nieparzystą -#endif } } }; @@ -154,9 +144,6 @@ void TIsolated::Modify(int i, TDynamicObject *o) TTrack::TTrack(TGroundNode *g) : pMyNode( g ) // Ra: proteza, żeby tor znał swoją nazwę TODO: odziedziczyć TTrack z TGroundNode { -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - ::SecureZeroMemory( Dynamics, sizeof( Dynamics ) ); -#endif fRadiusTable[ 0 ] = 0.0; fRadiusTable[ 1 ] = 0.0; nFouling[ 0 ] = nullptr; @@ -199,7 +186,7 @@ void TTrack::Init() break; case tt_Table: // oba potrzebne SwitchExtension = std::make_shared( this, 1 ); // kopia oryginalnego toru - Segment = make_shared(this); + Segment = std::make_shared(this); break; } } @@ -413,7 +400,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) { // pobranie obiektu trajektorii ruchu vector3 pt, vec, p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań double a1, a2, r1, r2, r3, r4; - string str; + std::string str; size_t i; //,state; //Ra: teraz już nie ma początkowego stanu zwrotnicy we wpisie std::string token; @@ -808,7 +795,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) } // alternatywny zapis nazwy odcinka izolowanego - po znaku "@" w nazwie toru if (!pIsolated) - if ((i = name.find("@")) != string::npos) + if ((i = name.find("@")) != std::string::npos) if (i < name.length()) // nie może być puste { pIsolated = TIsolated::Find(name.substr(i + 1, name.length())); @@ -976,7 +963,7 @@ bool TTrack::AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus) return false; }; -string TTrack::IsolatedName() +std::string TTrack::IsolatedName() { // podaje nazwę odcinka izolowanego, jesli nie ma on jeszcze przypisanych zdarzeń if (pIsolated) if (!pIsolated->evBusy && !pIsolated->evFree) @@ -1007,27 +994,6 @@ bool TTrack::AddDynamicObject(TDynamicObject *Dynamic) Dynamic->MyTrack = NULL; // trzeba by to uzależnić od kierunku ruchu... return true; } -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - if (Global::iMultiplayer) // jeśli multiplayer - if (!iNumDynamics) // pierwszy zajmujący - if (pMyNode->asName != "none") - Global::pGround->WyslijString(pMyNode->asName, - 8); // przekazanie informacji o zajętości toru - if (iNumDynamics < iMaxNumDynamics) - { // jeśli jest miejsce, dajemy na koniec - Dynamics[iNumDynamics++] = Dynamic; - Dynamic->MyTrack = this; // ABu: na ktorym torze jesteśmy - if (Dynamic->iOverheadMask) // jeśli ma pantografy - Dynamic->OverheadTrack( - fOverhead); // przekazanie informacji o jeździe bezprądowej na tym odcinku toru - return true; - } - else - { - Error("Too many dynamics on track " + pMyNode->asName); - return false; - } -#else if( Global::iMultiplayer ) { // jeśli multiplayer if( true == Dynamics.empty() ) { @@ -1045,7 +1011,6 @@ bool TTrack::AddDynamicObject(TDynamicObject *Dynamic) Dynamic->OverheadTrack( fOverhead ); // przekazanie informacji o jeździe bezprądowej na tym odcinku toru } return true; -#endif }; void TTrack::MoveMe(vector3 pPosition) @@ -1863,42 +1828,16 @@ void TTrack::Render() bool TTrack::CheckDynamicObject(TDynamicObject *Dynamic) { // sprawdzenie, czy pojazd jest przypisany do toru -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for (int i = 0; i < iNumDynamics; i++) - if (Dynamic == Dynamics[i]) - return true; - return false; -#else for( auto dynamic : Dynamics ) { if( dynamic == Dynamic ) { return true; } } return false; -#endif }; bool TTrack::RemoveDynamicObject(TDynamicObject *Dynamic) { // usunięcie pojazdu z listy przypisanych do toru -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for (int i = 0; i < iNumDynamics; i++) - { // sprawdzanie wszystkich po kolei - if (Dynamic == Dynamics[i]) - { // znaleziony, przepisanie następnych, żeby dziur nie było - --iNumDynamics; - for (i; i < iNumDynamics; i++) - Dynamics[i] = Dynamics[i + 1]; - if (Global::iMultiplayer) // jeśli multiplayer - if (!iNumDynamics) // jeśli już nie ma żadnego - if (pMyNode->asName != "none") - Global::pGround->WyslijString( - pMyNode->asName, 9); // przekazanie informacji o zwolnieniu toru - return true; - } - } - Error("Cannot remove dynamic from track"); - return false; -#else bool result = false; if( *Dynamics.begin() == Dynamic ) { // most likely the object getting removed is at the front... @@ -1935,7 +1874,6 @@ bool TTrack::RemoveDynamicObject(TDynamicObject *Dynamic) } return result; -#endif } bool TTrack::InMovement() @@ -2660,14 +2598,6 @@ void TTrack::EnvironmentReset() void TTrack::RenderDyn() { // renderowanie nieprzezroczystych fragmentów pojazdów -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - if (!iNumDynamics) - return; // po co kombinować, jeśli nie ma pojazdów? - // EnvironmentSet(); //Ra: pojazdy sobie same teraz liczą cienie - for (int i = 0; i < iNumDynamics; i++) - Dynamics[i]->Render(); // sam sprawdza, czy VBO; zmienia kontekst VBO! - // EnvironmentReset(); -#else for( auto dynamic : Dynamics ) { // sam sprawdza, czy VBO; zmienia kontekst VBO! #ifdef EU07_USE_OLD_RENDERCODE @@ -2676,19 +2606,10 @@ void TTrack::RenderDyn() GfxRenderer.Render( dynamic ); #endif } -#endif }; void TTrack::RenderDynAlpha() { // renderowanie przezroczystych fragmentów pojazdów -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - if (!iNumDynamics) - return; // po co kombinować, jeśli nie ma pojazdów? - // EnvironmentSet(); //Ra: pojazdy sobie same teraz liczą cienie - for (int i = 0; i < iNumDynamics; i++) - Dynamics[i]->RenderAlpha(); // sam sprawdza, czy VBO; zmienia kontekst VBO! - // EnvironmentReset(); -#else for( auto dynamic : Dynamics ) { // sam sprawdza, czy VBO; zmienia kontekst VBO! #ifdef EU07_USE_OLD_RENDERCODE @@ -2697,19 +2618,13 @@ void TTrack::RenderDynAlpha() GfxRenderer.Render_Alpha( dynamic ); #endif } -#endif }; void TTrack::RenderDynSounds() { // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for( int i = 0; i < iNumDynamics; i++ ) - Dynamics[i]->RenderSounds(); -#else for( auto dynamic : Dynamics ) { dynamic->RenderSounds(); } -#endif }; //--------------------------------------------------------------------------- bool TTrack::SetConnections(int i) @@ -3043,15 +2958,10 @@ TTrack * TTrack::RaAnimate() SwitchExtension->vTrans; // SwitchExtension->Segments[0]->FastGetPoint(0.5); Segment->Init(middle + vector3(sina, 0.0, cosa), middle - vector3(sina, 0.0, cosa), 5.0); // nowy odcinek -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for( int i = 0; i < iNumDynamics; i++ ) - Dynamics[i]->Move(0.000001); // minimalny ruch, aby przeliczyć pozycję i -#else for( auto dynamic : Dynamics ) { // minimalny ruch, aby przeliczyć pozycję dynamic->Move( 0.000001 ); } -#endif // kąty if (Global::bUseVBO) { // dla OpenGL 1.4 odświeży się cały sektor, w późniejszych poprawiamy fragment @@ -3083,15 +2993,9 @@ TTrack * TTrack::RaAnimate() //--------------------------------------------------------------------------- void TTrack::RadioStop() { // przekazanie pojazdom rozkazu zatrzymania -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - for (int i = 0; i < iNumDynamics; i++) - Dynamics[i]->RadioStop(); -#else for( auto dynamic : Dynamics ) { dynamic->RadioStop(); } -#endif - }; double TTrack::WidthTotal() @@ -3200,7 +3104,7 @@ void TTrack::MovedUp1(double dh) fTexHeight1 += dh; }; -string TTrack::NameGet() +std::string TTrack::NameGet() { // ustalenie nazwy toru if (this) if (pMyNode) diff --git a/Track.h b/Track.h index 3b33fd4d..07e971b5 100644 --- a/Track.h +++ b/Track.h @@ -95,10 +95,6 @@ class TSwitchExtension private: }; -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY -const int iMaxNumDynamics = 40; // McZapkie-100303 -#endif - class TIsolated { // obiekt zbierający zajętości z kilku odcinków int iAxles = 0; // ilość osi na odcinkach obsługiwanych przez obiekt @@ -152,13 +148,8 @@ class TTrack : public Resource TGroundNode * pMyNode = nullptr; // Ra: proteza, żeby tor znał swoją nazwę TODO: odziedziczyć TTrack z TGroundNode public: -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - int iNumDynamics = 0; - TDynamicObject *Dynamics[iMaxNumDynamics]; -#else typedef std::deque dynamics_sequence; dynamics_sequence Dynamics; -#endif int iEvents = 0; // Ra: flaga informująca o obecności eventów TEvent *evEventall0 = nullptr; // McZapkie-140302: wyzwalany gdy pojazd stoi TEvent *evEventall1 = nullptr; @@ -204,11 +195,7 @@ class TTrack : public Resource TTrack * NullCreate(int dir); inline bool IsEmpty() { -#ifdef EU07_USE_OLD_TTRACK_DYNAMICS_ARRAY - return (iNumDynamics <= 0); -#else return Dynamics.empty(); -#endif }; void ConnectPrevPrev(TTrack *pNewPrev, int typ); void ConnectPrevNext(TTrack *pNewPrev, int typ); diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index edfae163..ba97afe4 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -207,7 +207,7 @@ Source Files - + Source Files @@ -404,9 +404,6 @@ Header Files - - Header Files - Header Files diff --git a/openglmatrixstack.cpp b/openglmatrixstack.cpp new file mode 100644 index 00000000..f01c98e2 --- /dev/null +++ b/openglmatrixstack.cpp @@ -0,0 +1,13 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "openglmatrixstack.h" + +opengl_matrices OpenGLMatrices; diff --git a/openglmatrixstack.h b/openglmatrixstack.h index 1ba685a2..890843d3 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -135,7 +135,7 @@ public: void perspective( _Type const Fovy, _Type const Aspect, _Type const Znear, _Type const Zfar ) { m_stacks[ m_mode ].perspective( - static_cast( Fovy ), + static_cast(Fovy) * 0.0174532925f, // deg2rad static_cast( Aspect ), static_cast( Znear ), static_cast( Zfar ) ); } diff --git a/renderer.cpp b/renderer.cpp index 2f6b9cf6..300fc702 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -16,10 +16,8 @@ http://mozilla.org/MPL/2.0/. #include "uilayer.h" #include "logs.h" #include "usefull.h" -#include "glwidgetlibrary.h" opengl_renderer GfxRenderer; -opengl_matrices OpenGLMatrices; extern TWorld World; // returns true if specified object is within camera frustum, false otherwise @@ -134,7 +132,7 @@ opengl_renderer::Render() { ::glMatrixMode( GL_PROJECTION ); // select the Projection Matrix ::gluPerspective( - Global::FieldOfView / Global::ZoomFactor * 0.0174532925f, + Global::FieldOfView / Global::ZoomFactor, std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), 0.1f * Global::ZoomFactor, m_drawrange * Global::fDistanceFactor ); @@ -183,7 +181,7 @@ bool opengl_renderer::Render( TGround *Ground ) { glDisable( GL_BLEND ); - glAlphaFunc( GL_GREATER, 0.35f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc( GL_GREATER, 0.45f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f glEnable( GL_LIGHTING ); glColor3f( 1.0f, 1.0f, 1.0f ); @@ -444,7 +442,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { } TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - double squaredistance = SquareMagnitude( Global::pCameraPosition - Dynamic->vPosition ); + double squaredistance = SquareMagnitude( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor; Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); From 68473259c0ccd650510fbff78cf9baea5dba2045 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 23 Mar 2017 18:25:09 +0100 Subject: [PATCH 070/426] glare level influenced by global lighting level --- Ground.cpp | 5 ++--- renderer.cpp | 63 ++++++++++++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index 9858d947..f29c81ae 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -4005,9 +4005,8 @@ bool TGround::EventConditon(TEvent *e) ErrorLog( "Event " + e->asName + " trying conditional_memcompare with nonexistent memcell" ); return true; // though this is technically error, we report success to maintain backward compatibility } - if (tmpEvent->Params[9].asMemCell->Compare(e->Params[10].asText, e->Params[11].asdouble, - e->Params[12].asdouble, e->iFlags)) - { //logowanie spełnionych warunków + if (tmpEvent->Params[9].asMemCell->Compare( ( e->Params[ 10 ].asText != nullptr ? e->Params[10].asText : "" ), e->Params[11].asdouble, e->Params[12].asdouble, e->iFlags) ) { + //logowanie spełnionych warunków LogComment = e->Params[9].asMemCell->Text() + " " + to_string(e->Params[9].asMemCell->Value1(), 2, 8) + " " + to_string(tmpEvent->Params[9].asMemCell->Value2(), 2, 8) + diff --git a/renderer.cpp b/renderer.cpp index 300fc702..22184818 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -619,45 +619,50 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { auto const lightcenter = modelview * glm::vec4( 0.0f, 0.0f, -0.05f, 1.0f ); // pozycja punktu świecącego względem kamery Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.0f, 0.0f, -1.0f, 1.0f ) - lightcenter ), glm::normalize( -lightcenter ) ); - float fadelevel = 0.5f; + float glarelevel = 0.6f; // luminosity at night is at level of ~0.1, so the overall resulting transparency is ~0.5 at full 'brightness' if( ( Submodel->fCosViewAngle > 0.0 ) && ( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) ) { - fadelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0 - Submodel->fCosFalloffAngle ); + glarelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0 - Submodel->fCosFalloffAngle ); + glarelevel = std::max( 0.0f, glarelevel - static_cast(Global::fLuminance) ); - ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); - Bind( m_glaretextureid ); - ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], fadelevel ); - ::glDisable( GL_LIGHTING ); - ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); + if( glarelevel > 0.0f ) { - ::glPushMatrix(); - ::glLoadIdentity(); // macierz jedynkowa - ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian - ::glRotated( atan2( lightcenter.x, lightcenter.z ) * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // jedynie obracamy w pionie o kąt + ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); + Bind( m_glaretextureid ); + ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], glarelevel ); + ::glDisable( GL_LIGHTING ); + ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); - ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo + ::glPushMatrix(); + ::glLoadIdentity(); // macierz jedynkowa + ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian + ::glRotated( atan2( lightcenter.x, lightcenter.z ) * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // jedynie obracamy w pionie o kąt - ::glBegin( GL_TRIANGLE_STRIP ); - float const size = 2.5f; - ::glTexCoord2f( 1.0f, 1.0f ); ::glVertex3f( -size, size, 0.0f ); - ::glTexCoord2f( 0.0f, 1.0f ); ::glVertex3f( size, size, 0.0f ); - ::glTexCoord2f( 1.0f, 0.0f ); ::glVertex3f( -size, -size, 0.0f ); - ::glTexCoord2f( 0.0f, 0.0f ); ::glVertex3f( size, -size, 0.0f ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo + + // TODO: turn the drawing instructions into a compiled call / array + ::glBegin( GL_TRIANGLE_STRIP ); + float const size = 2.5f; + ::glTexCoord2f( 1.0f, 1.0f ); ::glVertex3f( -size, size, 0.0f ); + ::glTexCoord2f( 0.0f, 1.0f ); ::glVertex3f( size, size, 0.0f ); + ::glTexCoord2f( 1.0f, 0.0f ); ::glVertex3f( -size, -size, 0.0f ); + ::glTexCoord2f( 0.0f, 0.0f ); ::glVertex3f( size, -size, 0.0f ); /* - // NOTE: we could do simply... - vec3 vertexPosition_worldspace = - particleCenter_wordspace - + CameraRight_worldspace * squareVertices.x * BillboardSize.x - + CameraUp_worldspace * squareVertices.y * BillboardSize.y; - // ...etc instead IF we had easy access to camera's forward and right vectors. TODO: check if Camera matrix is accessible + // NOTE: we could do simply... + vec3 vertexPosition_worldspace = + particleCenter_wordspace + + CameraRight_worldspace * squareVertices.x * BillboardSize.x + + CameraUp_worldspace * squareVertices.y * BillboardSize.y; + // ...etc instead IF we had easy access to camera's forward and right vectors. TODO: check if Camera matrix is accessible */ - ::glEnd(); + ::glEnd(); - float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); - ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); + float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); - ::glPopMatrix(); - ::glPopAttrib(); + ::glPopMatrix(); + ::glPopAttrib(); + } } } } From df60a5230d31c04725d473b2b576445b258dadd2 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 24 Mar 2017 01:58:06 +0100 Subject: [PATCH 071/426] fog levels fix --- World.cpp | 13 +++++++++++-- renderer.cpp | 11 ----------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/World.cpp b/World.cpp index 8a51474d..e4623a96 100644 --- a/World.cpp +++ b/World.cpp @@ -2361,12 +2361,22 @@ world_environment::render() { GfxRenderer.Bind( 0 ); ::glDisable( GL_LIGHTING ); - ::glDisable( GL_FOG ); ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); ::glPushMatrix(); ::glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); + // setup fog + if( Global::fFogEnd > 0 ) { + // fog setup + ::glFogi( GL_FOG_MODE, GL_LINEAR ); + ::glFogfv( GL_FOG_COLOR, Global::FogColor ); + ::glFogf( GL_FOG_START, Global::fFogStart ); + ::glFogf( GL_FOG_END, Global::fFogEnd ); + ::glEnable( GL_FOG ); + } + else { ::glDisable( GL_FOG ); } + m_skydome.Render(); m_stars.render(); m_clouds.Render( m_skydome.GetAverageColor() * 2.5f ); @@ -2381,7 +2391,6 @@ world_environment::render() { ::glPopMatrix(); ::glDepthMask( GL_TRUE ); ::glEnable( GL_DEPTH_TEST ); - ::glEnable( GL_FOG ); ::glEnable( GL_LIGHTING ); } diff --git a/renderer.cpp b/renderer.cpp index 22184818..3824e678 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -91,17 +91,6 @@ opengl_renderer::Init( GLFWwindow *Window ) { Global::DayLight.diffuse[ 1 ] = 242.0f / 255.0f; Global::DayLight.diffuse[ 2 ] = 231.0f / 255.0f; - // setup fog - if( Global::fFogEnd > 0 ) { - // fog setup - ::glFogi( GL_FOG_MODE, GL_LINEAR ); - ::glFogfv( GL_FOG_COLOR, Global::FogColor ); - ::glFogf( GL_FOG_START, Global::fFogStart ); - ::glFogf( GL_FOG_END, Global::fFogEnd ); - ::glEnable( GL_FOG ); - } - else { ::glDisable( GL_FOG ); } - // create dynamic light pool for( int idx = 0; idx < Global::DynamicLightCount; ++idx ) { From f8673a9f416591c7900e9fd79405536827f489a4 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 25 Mar 2017 02:00:31 +0100 Subject: [PATCH 072/426] point light distance attenuation, partial unification of vbo/dl render paths --- AnimModel.cpp | 28 ++-- AnimModel.h | 8 +- Ground.cpp | 402 +++++++++++++++++++++++++------------------------- Model3d.cpp | 38 +---- Model3d.h | 2 +- Segment.cpp | 54 ++++--- Track.cpp | 189 ++++++++++-------------- World.cpp | 12 +- renderer.cpp | 375 +++++++++++++++++++++++++--------------------- renderer.h | 3 +- sky.cpp | 12 +- stars.cpp | 8 +- 12 files changed, 562 insertions(+), 569 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 6408a443..5417d042 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -686,27 +686,19 @@ int TAnimModel::Flags() //----------------------------------------------------------------------------- // 2011-03-16 cztery nowe funkcje renderowania z możliwością pochylania obiektów //----------------------------------------------------------------------------- - +#ifdef EU07_USE_OLD_RENDERCODE void TAnimModel::RenderDL(vector3 *vPosition) { RaAnimate(); // jednorazowe przeliczenie animacji RaPrepare(); if( pModel ) // renderowanie rekurencyjne submodeli -#ifdef EU07_USE_OLD_RENDERCODE pModel->Render(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); -#else - GfxRenderer.Render( pModel, Material(), *vPosition, vAngle ); -#endif }; void TAnimModel::RenderAlphaDL(vector3 *vPosition) { RaPrepare(); if (pModel) // renderowanie rekurencyjne submodeli -#ifdef EU07_USE_OLD_RENDERCODE pModel->RenderAlpha(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); -#else - GfxRenderer.Render_Alpha( pModel, Material(), *vPosition, vAngle ); -#endif }; void TAnimModel::RenderVBO(vector3 *vPosition) @@ -714,15 +706,27 @@ void TAnimModel::RenderVBO(vector3 *vPosition) RaAnimate(); // jednorazowe przeliczenie animacji RaPrepare(); if (pModel) // renderowanie rekurencyjne submodeli - pModel->RaRender(vPosition, &vAngle, Material()->replacable_skins, Material()->textures_alpha); + pModel->RaRender( vPosition, &vAngle, Material()->replacable_skins, Material()->textures_alpha ); }; void TAnimModel::RenderAlphaVBO(vector3 *vPosition) { RaPrepare(); if (pModel) // renderowanie rekurencyjne submodeli - pModel->RaRenderAlpha(vPosition, &vAngle, Material()->replacable_skins, Material()->textures_alpha); + pModel->RaRenderAlpha( vPosition, &vAngle, Material()->replacable_skins, Material()->textures_alpha ); }; - +#else +void TAnimModel::Render( vector3 *vPosition ) { + RaAnimate(); // jednorazowe przeliczenie animacji + RaPrepare(); + if( pModel ) // renderowanie rekurencyjne submodeli + GfxRenderer.Render( pModel, Material(), *vPosition, vAngle ); +}; +void TAnimModel::RenderAlpha( vector3 *vPosition ) { + RaPrepare(); + if( pModel ) // renderowanie rekurencyjne submodeli + GfxRenderer.Render_Alpha( pModel, Material(), *vPosition, vAngle ); +}; +#endif //--------------------------------------------------------------------------- bool TAnimModel::TerrainLoaded() diff --git a/AnimModel.h b/AnimModel.h index 5c8693f2..d8800e6b 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -175,10 +175,16 @@ class TAnimModel void RenderAlphaDL(vector3 pPosition = vector3(0, 0, 0), double fAngle = 0); void RenderVBO(vector3 pPosition = vector3(0, 0, 0), double fAngle = 0); void RenderAlphaVBO(vector3 pPosition = vector3(0, 0, 0), double fAngle = 0); -*/ void RenderDL(vector3 *vPosition); +*/ +#ifdef EU07_USE_OLD_RENDERCODE + void RenderDL( vector3 *vPosition ); void RenderAlphaDL(vector3 *vPosition); void RenderVBO(vector3 *vPosition); void RenderAlphaVBO(vector3 *vPosition); +#else + void Render( vector3 *vPosition ); + void RenderAlpha( vector3 *vPosition ); +#endif int Flags(); void RaAnglesSet(double a, double b, double c) { diff --git a/Ground.cpp b/Ground.cpp index f29c81ae..cafb4476 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -289,161 +289,145 @@ void TGroundNode::RaRenderVBO() glDrawArrays(iType, iVboPtr, iNumVerts); // Narysuj naraz wszystkie trójkąty } -void TGroundNode::RenderVBO() -{ // renderowanie obiektu z VBO - faza nieprzezroczystych - double mgn = SquareMagnitude(pCenter - Global::pCameraPosition); - if ((mgn > fSquareRadius || (mgn < fSquareMinRadius)) && - (iType != TP_EVLAUNCH)) // McZapkie-070602: nie rysuj odleglych obiektow ale sprawdzaj - // wyzwalacz zdarzen - return; - switch (iType) - { - case TP_TRACTION: - return; - case TP_TRACK: - if (iNumVerts) - pTrack->RaRenderVBO(iVboPtr); - return; - case TP_MODEL: - Model->RenderVBO(&pCenter); - return; - // case TP_SOUND: //McZapkie - dzwiek zapetlony w zaleznosci od odleglosci - // if ((pStaticSound->GetStatus()&DSBSTATUS_PLAYING)==DSBPLAY_LOOPING) - // { - // pStaticSound->Play(1,DSBPLAY_LOOPING,true,pStaticSound->vSoundPosition); - // pStaticSound->AdjFreq(1.0,Timer::GetDeltaTime()); - // } - // return; //Ra: TODO sprawdzić, czy dźwięki nie są tylko w RenderHidden - case TP_MEMCELL: - return; - case TP_EVLAUNCH: - if (EvLaunch->Render()) - if ((EvLaunch->dRadius < 0) || (mgn < EvLaunch->dRadius)) - { - if (Global::shiftState && EvLaunch->Event2 != NULL) - Global::AddToQuery(EvLaunch->Event2, NULL); - else if (EvLaunch->Event1 != NULL) - Global::AddToQuery(EvLaunch->Event1, NULL); - } - return; - case GL_LINES: - case GL_LINE_STRIP: - case GL_LINE_LOOP: - if (iNumPts) - { - float linealpha = 255000 * fLineThickness / (mgn + 1.0); - if (linealpha > 255) - linealpha = 255; - float r, g, b; -#ifdef EU07_USE_OLD_LIGHTING_MODEL - r = floor( Diffuse[ 0 ] * Global::ambientDayLight[ 0 ] ); // w zaleznosci od koloru swiatla - g = floor( Diffuse[ 1 ] * Global::ambientDayLight[ 1 ] ); - b = floor( Diffuse[ 2 ] * Global::ambientDayLight[ 2 ] ); +void TGroundNode::RenderVBO() { // renderowanie obiektu z VBO - faza nieprzezroczystych + switch( iType ) { // obiekty renderowane niezależnie od odległości + case TP_SUBMODEL: + TSubModel::fSquareDist = 0; +#ifdef EU07_USE_OLD_RENDERCODE + return smTerrain->RenderDL(); #else - r = floor( Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ); // w zaleznosci od koloru swiatla - g = floor( Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ); - b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); + GfxRenderer.Render( smTerrain ); #endif - glColor4ub(r, g, b, linealpha); // przezroczystosc dalekiej linii - // glDisable(GL_LIGHTING); //nie powinny świecić - glDrawArrays(iType, iVboPtr, iNumPts); // rysowanie linii - // glEnable(GL_LIGHTING); - } + } + + double distancesquared = SquareMagnitude( pCenter - Global::pCameraPosition ) / Global::ZoomFactor; + if( ( distancesquared > ( fSquareRadius * Global::fDistanceFactor ) ) + || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { return; - default: - if (iVboPtr >= 0) - RaRenderVBO(); - }; - return; + } + + switch( iType ) { + case TP_TRACK: { + if( iNumVerts ) + pTrack->RaRenderVBO( iVboPtr ); + return; + } + case TP_MODEL: { + Model->Render( &pCenter ); + return; + } + } + + if( ( iFlags & 0x10 ) || ( fLineThickness < 0 ) ) { + + if( ( iType == GL_LINES ) || ( iType == GL_LINE_STRIP ) || ( iType == GL_LINE_LOOP ) ) { + + if( iNumPts ) { + + float linealpha = 255000 * fLineThickness / ( distancesquared + 1.0 ); + if( linealpha > 255 ) + linealpha = 255; + float r, g, b; +#ifdef EU07_USE_OLD_LIGHTING_MODEL + r = floor( Diffuse[ 0 ] * Global::ambientDayLight[ 0 ] ); // w zaleznosci od koloru swiatla + g = floor( Diffuse[ 1 ] * Global::ambientDayLight[ 1 ] ); + b = floor( Diffuse[ 2 ] * Global::ambientDayLight[ 2 ] ); +#else + r = floor( Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ); // w zaleznosci od koloru swiatla + g = floor( Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ); + b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); +#endif + glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii + // glDisable(GL_LIGHTING); //nie powinny świecić + glDrawArrays( iType, iVboPtr, iNumPts ); // rysowanie linii + // glEnable(GL_LIGHTING); + } + } + // GL_TRIANGLE etc + else { + if( iVboPtr >= 0 ) { + RaRenderVBO(); + } + } + + SetLastUsage( Timer::GetSimulationTime() ); + } }; void TGroundNode::RenderAlphaVBO() { // renderowanie obiektu z VBO - faza przezroczystych - double mgn = SquareMagnitude(pCenter - Global::pCameraPosition); - float r, g, b; - if (mgn < fSquareMinRadius) + + double distancesquared = SquareMagnitude( pCenter - Global::pCameraPosition ) / Global::ZoomFactor; + if( ( distancesquared > ( fSquareRadius * Global::fDistanceFactor ) ) + || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { return; - if (mgn > fSquareRadius) - return; -#ifdef _PROBLEND - if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 - { - glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - }; -#endif - switch (iType) - { - case TP_TRACTION: - if (bVisible) - { -#ifdef _PROBLEND - glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -#endif - hvTraction->RenderVBO(mgn, iVboPtr); + } + + + switch( iType ) { + case TP_TRACTION: { + if( bVisible ) { + hvTraction->RenderVBO( distancesquared, iVboPtr ); + } + return; } - return; - case TP_MODEL: -#ifdef _PROBLEND - glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -#endif - Model->RenderAlphaVBO(&pCenter); - return; - case GL_LINES: - case GL_LINE_STRIP: - case GL_LINE_LOOP: - if (iNumPts) - { - float linealpha = 255000 * fLineThickness / (mgn + 1.0); - if (linealpha > 255) - linealpha = 255; -#ifdef EU07_USE_OLD_LIGHTING_MODEL - r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla - g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; - b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; -#else - r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla - g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; - b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; -#endif - glColor4ub(r, g, b, linealpha); // przezroczystosc dalekiej linii - // glDisable(GL_LIGHTING); //nie powinny świecić - glDrawArrays(iType, iVboPtr, iNumPts); // rysowanie linii -// glEnable(GL_LIGHTING); -#ifdef _PROBLEND - glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -#endif - } -#ifdef _PROBLEND - glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -#endif - return; - default: - if (iVboPtr >= 0) - { - RaRenderVBO(); -#ifdef _PROBLEND - glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); -#endif + case TP_MODEL: { + Model->RenderAlpha( &pCenter ); return; } } + + // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 + if( ( iNumVerts && ( iFlags & 0x20 ) ) + || ( iNumPts && ( fLineThickness > 0 ) ) ) { + #ifdef _PROBLEND - glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); - glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + if( ( PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 + { + glDisable( GL_BLEND ); + glAlphaFunc( GL_GREATER, 0.45f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + }; +#endif + + if( ( iType == GL_LINES ) + || ( iType == GL_LINE_STRIP ) + || ( iType == GL_LINE_LOOP ) ) { + + if( iNumPts ) { + + float linealpha = 255000 * fLineThickness / (distancesquared + 1.0); + if (linealpha > 255) + linealpha = 255; +#ifdef EU07_USE_OLD_LIGHTING_MODEL + r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla + g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; + b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; +#else + float r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla + float g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; + float b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; +#endif + glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii + + glDrawArrays( iType, iVboPtr, iNumPts ); // rysowanie linii + } + } + else { + if( iVboPtr >= 0 ) { + RaRenderVBO(); + } + } + + SetLastUsage( Timer::GetSimulationTime() ); + } + +#ifdef _PROBLEND + if( ( PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 + { + glEnable( GL_BLEND ); + glAlphaFunc( GL_GREATER, 0.04f ); + } #endif - return; } void TGroundNode::Compile(bool many) @@ -577,21 +561,26 @@ void TGroundNode::RenderDL() GfxRenderer.Render( smTerrain ); #endif } - // if (pTriGroup) if (pTriGroup!=this) return; //wyświetla go inny obiekt - double mgn = SquareMagnitude(pCenter - Global::pCameraPosition) / Global::ZoomFactor; - if ((mgn > fSquareRadius) || (mgn < fSquareMinRadius)) // McZapkie-070602: nie rysuj odleglych - // obiektow ale sprawdzaj wyzwalacz - // zdarzen + + double distancesquared = SquareMagnitude(pCenter - Global::pCameraPosition) / Global::ZoomFactor; + if( ( distancesquared > ( fSquareRadius * Global::fDistanceFactor ) ) + || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { return; + } + switch (iType) { - case TP_TRACK: - return pTrack->Render(); - case TP_MODEL: - return Model->RenderDL(&pCenter); + case TP_TRACK: { + pTrack->Render(); + return; + } + case TP_MODEL: { + Model->Render( &pCenter ); + return; + } } + // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 - // if ((iNumVerts&&(iFlags&0x10))||(iNumPts&&(fLineThickness<0))) if ((iFlags & 0x10) || (fLineThickness < 0)) { if (!DisplayListID || (iVersion != Global::iReCompile)) // Ra: wymuszenie rekompilacji @@ -602,26 +591,31 @@ void TGroundNode::RenderDL() }; if ((iType == GL_LINES) || (iType == GL_LINE_STRIP) || (iType == GL_LINE_LOOP)) - // if (iNumPts) { // wszelkie linie są rysowane na samym końcu - float r, g, b; + if( iNumPts ) { + + float linealpha = 255000 * fLineThickness / ( distancesquared + 1.0 ); + if( linealpha > 255 ) + linealpha = 255; + float r, g, b; #ifdef EU07_USE_OLD_LIGHTING_MODEL - r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla - g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; - b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; + r = floor( Diffuse[ 0 ] * Global::ambientDayLight[ 0 ] ); // w zaleznosci od koloru swiatla + g = floor( Diffuse[ 1 ] * Global::ambientDayLight[ 1 ] ); + b = floor( Diffuse[ 2 ] * Global::ambientDayLight[ 2 ] ); #else - r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla - g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; - b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; + r = floor( Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ); // w zaleznosci od koloru swiatla + g = floor( Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ); + b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); #endif - glColor4ub(r, g, b, 1.0); - glCallList(DisplayListID); - // glColor4fv(Diffuse); //przywrócenie koloru - // glColor3ub(Diffuse[0],Diffuse[1],Diffuse[2]); + glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii + + glCallList( DisplayListID ); + } } // GL_TRIANGLE etc else glCallList(DisplayListID); + SetLastUsage(Timer::GetSimulationTime()); }; }; @@ -642,30 +636,28 @@ void TGroundNode::RenderAlphaDL() // wlasciwie dla kazdego node'a // i jezeli tak to odpowiedni GL_GREATER w przeciwnym wypadku standardowy 0.04 - // if (pTriGroup) if (pTriGroup!=this) return; //wyświetla go inny obiekt - double mgn = SquareMagnitude(pCenter - Global::pCameraPosition) / Global::ZoomFactor; - float r, g, b; - if (mgn < fSquareMinRadius) - return; - if (mgn > fSquareRadius) - return; - switch (iType) - { - case TP_TRACTION: - if (bVisible) - hvTraction->RenderDL(mgn); - return; - case TP_MODEL: - Model->RenderAlphaDL(&pCenter); - return; - case TP_TRACK: - // pTrack->RenderAlpha(); + double distancesquared = SquareMagnitude( pCenter - Global::pCameraPosition ) / Global::ZoomFactor; + if( ( distancesquared > ( fSquareRadius * Global::fDistanceFactor ) ) + || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { return; + } + + switch( iType ) { + case TP_TRACTION: { + if( bVisible ) + hvTraction->RenderDL( distancesquared ); + return; + } + case TP_MODEL: { + Model->RenderAlpha( &pCenter ); + return; + } }; // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 - if ((iNumVerts && (iFlags & 0x20)) || (iNumPts && (fLineThickness > 0))) - { + if( ( iNumVerts && ( iFlags & 0x20 ) ) + || ( iNumPts && ( fLineThickness > 0 ) ) ) { + #ifdef _PROBLEND if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { @@ -680,35 +672,43 @@ void TGroundNode::RenderAlphaDL() ResourceManager::Register(this); }; - // GL_LINE, GL_LINE_STRIP, GL_LINE_LOOP - if (iNumPts) - { - float linealpha = 255000 * fLineThickness / (mgn + 1.0); - if (linealpha > 255) - linealpha = 255; + if( ( iType == GL_LINES ) + || ( iType == GL_LINE_STRIP ) + || ( iType == GL_LINE_LOOP ) ) { + + if( iNumPts ) { + + float linealpha = 255000 * fLineThickness / ( distancesquared + 1.0 ); + if (linealpha > 255) + linealpha = 255; #ifdef EU07_USE_OLD_LIGHTING_MODEL - r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla - g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; - b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; + r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla + g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; + b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; #else - r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla - g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; - b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; + float r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla + float g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; + float b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; #endif - glColor4ub(r, g, b, linealpha); // przezroczystosc dalekiej linii - glCallList(DisplayListID); + glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii + + glCallList( DisplayListID ); + } } // GL_TRIANGLE etc - else - glCallList(DisplayListID); + else { + glCallList( DisplayListID ); + } + SetLastUsage(Timer::GetSimulationTime()); - }; + } + #ifdef _PROBLEND if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glEnable(GL_BLEND); glAlphaFunc(GL_GREATER, 0.04f); - }; + } #endif } diff --git a/Model3d.cpp b/Model3d.cpp index 49cc04a7..4d9fb42d 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -646,7 +646,6 @@ void TSubModel::DisplayLists() { uiDisplayList = glGenLists(1); glNewList(uiDisplayList, GL_COMPILE); - glColor3fv(f4Diffuse); // McZapkie-240702: zamiast ub #ifdef USE_VERTEX_ARRAYS // ShaXbee-121209: przekazywanie wierzcholkow hurtem glVertexPointer(3, GL_DOUBLE, sizeof(GLVERTEX), &Vertices[0].Point.x); @@ -675,43 +674,22 @@ void TSubModel::DisplayLists() { uiDisplayList = glGenLists(1); glNewList(uiDisplayList, GL_COMPILE); - GfxRenderer.Bind(0); - // if (eType==smt_FreeSpotLight) - // { - // if (iFarAttenDecay==0) - // glColor3f(Diffuse[0],Diffuse[1],Diffuse[2]); - // } - // else - // TODO: poprawic zeby dzialalo - // glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); - glColorMaterial(GL_FRONT, GL_EMISSION); - glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly glBegin(GL_POINTS); glVertex3f( 0.0f, 0.0f, -0.05f ); // shift point towards the viewer, to avoid z-fighting with the light polygons glEnd(); - glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); glEndList(); } else if (eType == TP_STARS) { // punkty świecące dookólnie uiDisplayList = glGenLists(1); glNewList(uiDisplayList, GL_COMPILE); - GfxRenderer.Bind(0); // tekstury nie ma - glColorMaterial(GL_FRONT, GL_EMISSION); -// glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie blendowaly glBegin(GL_POINTS); for (int i = 0; i < iNumVerts; i++) { glColor3f(Vertices[i].Normal.x, Vertices[i].Normal.y, Vertices[i].Normal.z); - // glVertex3dv(&Vertices[i].Point.x); glVertex3fv(&Vertices[i].Point.x); }; glEnd(); -// glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); glEndList(); } // SafeDeleteArray(Vertices); //przy VBO muszą zostać do załadowania całego @@ -1232,7 +1210,6 @@ void TSubModel::RenderAlphaDL() if (iAlpha & iFlags & 0x2F000000) Next->RenderAlphaDL(); }; // RenderAlpha -#endif void TSubModel::RenderVBO() { // główna procedura renderowania przez VBO @@ -1466,7 +1443,7 @@ void TSubModel::RenderAlphaVBO() if (iAlpha & iFlags & 0x2F000000) Next->RenderAlphaVBO(); }; // RaRenderAlpha - +#endif //--------------------------------------------------------------------------- void TSubModel::RaArrayFill(CVertNormTex *Vert) @@ -2199,7 +2176,7 @@ void TModel3d::RenderAlpha(double fSquareDistance, texture_manager::size_type *R Root->RenderAlphaDL(); } }; -#endif + void TModel3d::RaRender(double fSquareDistance, texture_manager::size_type const *ReplacableSkinId, int iAlpha) { // renderowanie specjalne, np. kabiny iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste @@ -2229,7 +2206,7 @@ void TModel3d::RaRenderAlpha(double fSquareDistance, texture_manager::size_type } } }; - +#endif //----------------------------------------------------------------------------- // 2011-03-16 cztery nowe funkcje renderowania z możliwością pochylania obiektów //----------------------------------------------------------------------------- @@ -2268,7 +2245,7 @@ void TModel3d::RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager: Root->RenderAlphaDL(); glPopMatrix(); }; -#endif + void TModel3d::RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type const *ReplacableSkinId, int iAlpha) { // nieprzezroczyste, VBO glPushMatrix(); @@ -2310,7 +2287,7 @@ void TModel3d::RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manage } glPopMatrix(); }; - +#endif //----------------------------------------------------------------------------- // 2012-02 funkcje do tworzenia terenu z E3D @@ -2355,9 +2332,8 @@ void TModel3d::TerrainRenderVBO(int n) TSubModel *r = Root; while (r) { - if (r->iVisible == - n) // tylko jeśli ma być widoczny w danej ramce (problem dla 0==false) - r->RenderVBO(); // sub kolejne (Next) się nie wyrenderują + if (r->iVisible == n) // tylko jeśli ma być widoczny w danej ramce (problem dla 0==false) + GfxRenderer.Render(r); // sub kolejne (Next) się nie wyrenderują r = r->NextGet(); } EndVBO(); diff --git a/Model3d.h b/Model3d.h index 580d2ec4..cdca7c29 100644 --- a/Model3d.h +++ b/Model3d.h @@ -258,9 +258,9 @@ public: #ifdef EU07_USE_OLD_RENDERCODE void RenderDL(); void RenderAlphaDL(); -#endif void RenderVBO(); void RenderAlphaVBO(); +#endif // inline matrix4x4* GetMatrix() {return dMatrix;}; inline float4x4 * GetMatrix() { diff --git a/Segment.cpp b/Segment.cpp index 85f67dc3..e86071dc 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -42,10 +42,12 @@ TSegment::~TSegment() SafeDeleteArray(fTsBuffer); }; -bool TSegment::Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, double fNewRoll1, - double fNewRoll2) +bool TSegment::Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, double fNewRoll1, double fNewRoll2) { // wersja dla prostego - wyliczanie punktów kontrolnych vector3 dir; + + // NOTE: we're enforcing division also for straight track, to ensure dense enough mesh for per-vertex lighting +/* if (fNewRoll1 == fNewRoll2) { // faktyczny prosty dir = Normalize(NewPoint2 - NewPoint1); // wektor kierunku o długości 1 @@ -53,10 +55,13 @@ bool TSegment::Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, doubl false); } else +*/ { // prosty ze zmienną przechyłką musi być segmentowany jak krzywe dir = (NewPoint2 - NewPoint1) / 3.0; // punkty kontrolne prostego są w 1/3 długości - return TSegment::Init(NewPoint1, NewPoint1 + dir, NewPoint2 - dir, NewPoint2, fNewStep, - fNewRoll1, fNewRoll2, true); + return TSegment::Init( + NewPoint1, NewPoint1 + dir, + NewPoint2 - dir, NewPoint2, + fNewStep, fNewRoll1, fNewRoll2, true); } }; @@ -120,33 +125,24 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI fStoop = atan2((Point2.y - Point1.y), fLength); // pochylenie toru prostego, żeby nie liczyć wielokrotnie SafeDeleteArray(fTsBuffer); -/* - if ((bCurve) && (fStep > 0)) -*/ - // we're enforcing sub-division of even straight track, to have dense enough mesh for the spotlight to work with - if( fStep > 0 ) - { // Ra: prosty dostanie podział, jak ma różną przechyłkę na końcach - double s = 0; - int i = 0; - iSegCount = ceil(fLength / fStep); // potrzebne do VBO - // fStep=fLength/(double)(iSegCount-1); //wyrównanie podziału - fTsBuffer = new double[iSegCount + 1]; - fTsBuffer[0] = 0; /* TODO : fix fTsBuffer */ - while (s < fLength) - { - i++; - s += fStep; - if (s > fLength) - s = fLength; - fTsBuffer[i] = GetTFromS(s); + + if( ( bCurve ) && ( fStep > 0 ) ) { + if( fStep > 0 ) { // Ra: prosty dostanie podział, jak ma różną przechyłkę na końcach + double s = 0; + int i = 0; + iSegCount = ceil( fLength / fStep ); // potrzebne do VBO + // fStep=fLength/(double)(iSegCount-1); //wyrównanie podziału + fTsBuffer = new double[ iSegCount + 1 ]; + fTsBuffer[ 0 ] = 0; /* TODO : fix fTsBuffer */ + while( s < fLength ) { + i++; + s += fStep; + if( s > fLength ) + s = fLength; + fTsBuffer[ i ] = GetTFromS( s ); + } } } - if (fLength > 500) - { // tor ma pojemność 40 pojazdów, więc nie może być za długi - ErrorLog("Bad geometry: Length > 500m at " + Where(Point1)); - // MessageBox(0,"Length>500","TSegment::Init",MB_OK); - return false; - } return true; } diff --git a/Track.cpp b/Track.cpp index d493055a..84b0a334 100644 --- a/Track.cpp +++ b/Track.cpp @@ -541,8 +541,10 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) p2.y += 0.18; // na przechyłce doliczyć jeszcze pół przechyłki } - if (fRadius != 0) // gdy podany promień - segsize = Min0R(5.0, 0.2 + fabs(fRadius) * 0.02); // do 250m - 5, potem 1 co 50m + if( fRadius != 0 ) // gdy podany promień + segsize = Min0R( 5.0, 0.2 + fabs( fRadius ) * 0.02 ); // do 250m - 5, potem 1 co 50m + else + segsize = 10.0; // for straights, 10m per segment works good enough if ((((p1 + p1 + p2) / 3.0 - p1 - cp1).Length() < 0.02) || (((p1 + p2 + p2) / 3.0 - p2 + cp1).Length() < 0.02)) @@ -550,11 +552,9 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) if ((cp1 == vector3(0, 0, 0)) && (cp2 == vector3(0, 0, 0))) // Ra: hm, czasem dla prostego są podane... - Segment->Init(p1, p2, segsize, r1, - r2); // gdy prosty, kontrolne wyliczane przy zmiennej przechyłce + Segment->Init(p1, p2, segsize, r1, r2); // gdy prosty, kontrolne wyliczane przy zmiennej przechyłce else - Segment->Init(p1, cp1 + p1, cp2 + p2, p2, segsize, r1, - r2); // gdy łuk (ustawia bCurve=true) + Segment->Init(p1, cp1 + p1, cp2 + p2, p2, segsize, r1, r2); // gdy łuk (ustawia bCurve=true) if ((r1 != 0) || (r2 != 0)) iTrapezoid = 1; // są przechyłki do uwzględniania w rysowaniu if (eType == tt_Table) // obrotnica ma doklejkę @@ -2395,124 +2395,89 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) } }; -void TTrack::RaRenderVBO(int iPtr) -{ // renderowanie z użyciem VBO +void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO // Ra 2014-07: trzeba wymienić GL_TRIANGLE_STRIP na GL_TRIANGLES i renderować trójkąty sektora // dla kolejnych tekstur! EnvironmentSet(); int seg; int i; - switch (iCategoryFlag & 15) - { - case 1: // tor - if (eType == tt_Switch) // dla zwrotnicy tylko szyny - { - if (TextureID1) - if ((seg = SwitchExtension->Segments[0]->RaSegCount()) > 0) - { - GfxRenderer.Bind( TextureID1 ); // szyny + - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24); - iPtr += 24 * seg; // pominięcie lewej szyny - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24); - iPtr += 24 * seg; // pominięcie prawej szyny - } - if (TextureID2) - if ((seg = SwitchExtension->Segments[1]->RaSegCount()) > 0) - { - GfxRenderer.Bind( TextureID2 ); // szyny - - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24); - iPtr += 24 * seg; // pominięcie lewej szyny - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24); - } - } - else // dla toru podsypka plus szyny - { - if ((seg = Segment->RaSegCount()) > 0) + switch( iCategoryFlag & 15 ) { + case 1: // tor + if( eType == tt_Switch ) // dla zwrotnicy tylko szyny { - if (TextureID2) - { - GfxRenderer.Bind( TextureID2 ); // podsypka - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 8 * i, 8); - iPtr += 8 * seg; // pominięcie podsypki - } - if (TextureID1) - { - GfxRenderer.Bind( TextureID1 ); // szyny - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24); - iPtr += 24 * seg; // pominięcie lewej szyny - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24); - } - } - } - break; - case 2: // droga - if ((seg = Segment->RaSegCount()) > 0) - { - if (TextureID1) - { - GfxRenderer.Bind( TextureID1 ); // nawierzchnia - for (i = 0; i < seg; ++i) - { - glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 4); - iPtr += 4; - } - } - if (TextureID2) - { - GfxRenderer.Bind( TextureID2 ); // pobocze - if (fTexHeight1 >= 0.0) - { // normalna droga z poboczem - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6); - iPtr += 6 * seg; // pominięcie lewego pobocza - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6); - } - else - { // z chodnikami o różnych szerokociach - if (fTexWidth != 0.0) - { - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6); - iPtr += 6 * seg; // pominięcie lewego pobocza + if( TextureID1 ) + if( ( seg = SwitchExtension->Segments[ 0 ]->RaSegCount() ) > 0 ) { + GfxRenderer.Bind( TextureID1 ); // szyny + + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); + iPtr += 24 * seg; // pominięcie lewej szyny + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); + iPtr += 24 * seg; // pominięcie prawej szyny + } + if( TextureID2 ) + if( ( seg = SwitchExtension->Segments[ 1 ]->RaSegCount() ) > 0 ) { + GfxRenderer.Bind( TextureID2 ); // szyny - + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); + iPtr += 24 * seg; // pominięcie lewej szyny + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); + } + } + else // dla toru podsypka plus szyny + { + if( ( seg = Segment->RaSegCount() ) > 0 ) { + if( TextureID2 ) { + GfxRenderer.Bind( TextureID2 ); // podsypka + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 8 * seg ); + iPtr += 8 * seg; // pominięcie podsypki + } + if( TextureID1 ) { + GfxRenderer.Bind( TextureID1 ); // szyny + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); + iPtr += 24 * seg; // pominięcie lewej szyny + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); } - if (fTexSlope != 0.0) - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6); } } - } - break; - case 4: // rzeki - jeszcze do przemyślenia - if ((seg = Segment->RaSegCount()) > 0) - { - if (TextureID1) - { - GfxRenderer.Bind( TextureID1 ); // nawierzchnia - for (i = 0; i < seg; ++i) - { - glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 4); - iPtr += 4; + break; + case 2: // droga + if( ( seg = Segment->RaSegCount() ) > 0 ) { + if( TextureID1 ) { + GfxRenderer.Bind( TextureID1 ); // nawierzchnia + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 4 * seg ); + iPtr += 4 * seg; + } + if( TextureID2 ) { + GfxRenderer.Bind( TextureID2 ); // pobocze + if( fTexHeight1 >= 0.0 ) { // normalna droga z poboczem + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + iPtr += 6 * seg; // pominięcie lewego pobocza + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + } + else { // z chodnikami o różnych szerokociach + if( fTexWidth != 0.0 ) { + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + iPtr += 6 * seg; // pominięcie lewego pobocza + } + if( fTexSlope != 0.0 ) + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + } } } - if (TextureID2) - { - GfxRenderer.Bind( TextureID2 ); // pobocze - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6); - iPtr += 6 * seg; // pominięcie lewego pobocza - for (i = 0; i < seg; ++i) - glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6); + break; + case 4: // rzeki - jeszcze do przemyślenia + if( ( seg = Segment->RaSegCount() ) > 0 ) { + if( TextureID1 ) { + GfxRenderer.Bind( TextureID1 ); // nawierzchnia + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 4 * seg ); + iPtr += 4 * seg; + } + if( TextureID2 ) { + GfxRenderer.Bind( TextureID2 ); // pobocze + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + iPtr += 6 * seg; // pominięcie lewego pobocza + glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + } } - } - break; + break; } EnvironmentReset(); }; diff --git a/World.cpp b/World.cpp index e4623a96..3b1d837d 100644 --- a/World.cpp +++ b/World.cpp @@ -1386,21 +1386,21 @@ TWorld::Render_Cab() { } #endif +#ifdef EU07_USE_OLD_RENDERCODE if( Global::bUseVBO ) { // renderowanie z użyciem VBO. NOTE: needs update, and eventual merge into single render path down the road dynamic->mdKabina->RaRender( 0.0, dynamic->Material()->replacable_skins, dynamic->Material()->textures_alpha ); dynamic->mdKabina->RaRenderAlpha( 0.0, dynamic->Material()->replacable_skins, dynamic->Material()->textures_alpha ); } else { - // renderowanie z Display List -#ifdef EU07_USE_OLD_RENDERCODE + // renderowanie z Display List dynamic->mdKabina->Render( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); dynamic->mdKabina->RenderAlpha( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); -#else - GfxRenderer.Render( dynamic->mdKabina, dynamic->Material(), 0.0 ); - GfxRenderer.Render_Alpha( dynamic->mdKabina, dynamic->Material(), 0.0 ); -#endif } +#else + GfxRenderer.Render( dynamic->mdKabina, dynamic->Material(), 0.0 ); + GfxRenderer.Render_Alpha( dynamic->mdKabina, dynamic->Material(), 0.0 ); +#endif #ifdef EU07_USE_OLD_LIGHTING_MODEL // przywrócenie standardowych, bo zawsze są zmieniane glLightfv( GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight ); diff --git a/renderer.cpp b/renderer.cpp index 3824e678..ee4eeaaa 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -205,6 +205,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { Dynamic->renderme = true; + // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji double squaredistance = SquareMagnitude( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor; Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu @@ -227,63 +228,34 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { Global::DayLight.apply_intensity( Dynamic->fShade ); } - // TODO: implement universal render path down the road - if( Global::bUseVBO ) { - // wersja VBO - if( Dynamic->mdLowPolyInt ) { - if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { - // enable cab light if needed - if( Dynamic->InteriorLightLevel > 0.0f ) { + // render + if( Dynamic->mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + // enable cab light if needed + if( Dynamic->InteriorLightLevel > 0.0f ) { - // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } - Dynamic->mdLowPolyInt->RaRender( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); + Render( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); - if( Dynamic->InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - } + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); } } - - Dynamic->mdModel->RaRender( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); - - if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Dynamic->mdLoad->RaRender( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); - } - else { - // wersja Display Lists - if( Dynamic->mdLowPolyInt ) { - // low poly interior - if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { - // enable cab light if needed - if( Dynamic->InteriorLightLevel > 0.0f ) { - - // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } - - Render( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); - - if( Dynamic->InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - } - } - } - - Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); - - if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); } + Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); + + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + + // post-render cleanup if( Dynamic->fShade > 0.0f ) { // restore regular light level Global::DayLight.apply_intensity(); @@ -312,15 +284,30 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, double } Model->Root->fSquareDist = Squaredistance; // zmienna globalna! - + + // TODO: unify the render code after generic buffers are in place + // setup + if( Global::bUseVBO ) { + if( false == Model->StartVBO() ) + return false; + } + Model->Root->ReplacableSet( ( Material != nullptr ? Material->replacable_skins : nullptr ), alpha ); + Model->Root->pRoot = Model; + + // render Render( Model->Root ); + // post-render cleanup + if( Global::bUseVBO ) { + Model->EndVBO(); + } + return true; } @@ -345,7 +332,7 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, Math3D: void opengl_renderer::Render( TSubModel *Submodel ) { - // główna procedura renderowania przez DL + if( ( Submodel->iVisible ) && ( TSubModel::fSquareDist >= ( Submodel->fSquareMinDist / Global::fDistanceFactor ) ) && ( TSubModel::fSquareDist <= ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ) { @@ -357,53 +344,113 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Submodel->b_Anim ) Submodel->RaAnimation( Submodel->b_Anim ); } - if( Submodel->eType < TP_ROTATOR ) { // renderowanie obiektów OpenGL + + if( Submodel->eType < TP_ROTATOR ) { + // renderowanie obiektów OpenGL if( Submodel->iAlpha & Submodel->iFlags & 0x1F ) // rysuj gdy element nieprzezroczysty { - if( Submodel->TextureID < 0 ) // && (ReplacableSkinId!=0)) + // material configuration: + // textures... + if( Submodel->TextureID < 0 ) { // zmienialne skóry - GfxRenderer.Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); - // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury + Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); } - else - GfxRenderer.Bind( Submodel->TextureID ); // również 0 + else { + // również 0 + Bind( Submodel->TextureID ); + } + ::glColor3fv( Submodel->f4Diffuse ); // McZapkie-240702: zamiast ub + // ...luminance if( Global::fLuminance < Submodel->fLight ) { - ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo - ::glCallList( Submodel->uiDisplayList ); // tylko dla siatki - float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); - ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); + // zeby swiecilo na kolorowo + ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); + } + + // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc + if( Global::bUseVBO ) { + ::glDrawArrays( Submodel->eType, Submodel->iVboPtr, Submodel->iNumVerts ); + } + else { + ::glCallList( Submodel->uiDisplayList ); + } + + // post-draw reset + if( Global::fLuminance < Submodel->fLight ) { + // restore default (lack of) brightness + glm::vec4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( noemission ) ); } - else - ::glCallList( Submodel->uiDisplayList ); // tylko dla siatki } } else if( Submodel->eType == TP_FREESPOTLIGHT ) { - // wersja DL -/* - matrix4x4 modelview; - ::glGetDoublev( GL_MODELVIEW_MATRIX, modelview.getArray() ); -*/ - matrix4x4 modelview; modelview.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); - // kąt między kierunkiem światła a współrzędnymi kamery - auto const lightcenter = modelview * vector3( 0.0, 0.0, 0.0 ); // pozycja punktu świecącego względem kamery - Submodel->fCosViewAngle = DotProduct( Normalize( modelview * vector3( 0.0, 0.0, -1.0 ) - lightcenter ), Normalize( -lightcenter ) ); + + auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); + auto const lightcenter = modelview * glm::vec4( 0.0f, 0.0f, -0.05f, 1.0f ); // pozycja punktu świecącego względem kamery + Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.0f, 0.0f, -1.0f, 1.0f ) - lightcenter ), glm::normalize( -lightcenter ) ); + if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) // kąt większy niż maksymalny stożek swiatła { - double Distdimm = 1.0; - if( Submodel->fCosViewAngle < Submodel->fCosHotspotAngle ) // zmniejszona jasność między Hotspot a Falloff - if( Submodel->fCosFalloffAngle < Submodel->fCosHotspotAngle ) - Distdimm = 1.0 - ( Submodel->fCosHotspotAngle - Submodel->fCosViewAngle ) / ( Submodel->fCosHotspotAngle - Submodel->fCosFalloffAngle ); - ::glColor3f( Submodel->f4Diffuse[ 0 ] * Distdimm, Submodel->f4Diffuse[ 1 ] * Distdimm, Submodel->f4Diffuse[ 2 ] * Distdimm ); - ::glCallList( Submodel->uiDisplayList ); // wyświetlenie warunkowe + float lightlevel = 1.0f; + // view angle attenuation + float const anglefactor = ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); + // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation + // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances + float const distancefactor = std::max( 0.5, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ); + + if( lightlevel > 0.0f ) { + // material configuration: + ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); + + Bind( 0 ); + ::glPointSize( std::max( 2.0f, 4.0f * distancefactor * anglefactor ) ); + ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], lightlevel * anglefactor ); + ::glDisable( GL_LIGHTING ); + ::glEnable( GL_BLEND ); + + // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc + if( Global::bUseVBO ) { + ::glDrawArrays( GL_POINTS, Submodel->iVboPtr, Submodel->iNumVerts ); + } + else { + ::glCallList( Submodel->uiDisplayList ); + } + + // post-draw reset + ::glPopAttrib(); + } } } else if( Submodel->eType == TP_STARS ) { - // glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty swiecace sie blendowaly + if( Global::fLuminance < Submodel->fLight ) { - ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo - ::glCallList( Submodel->uiDisplayList ); // narysuj naraz wszystkie punkty z DL - float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); - ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); + + // material configuration: + ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); + + Bind( 0 ); + ::glDisable( GL_LIGHTING ); + + // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc + if( Global::bUseVBO ) { + // NOTE: we're doing manual switch to color vbo setup, because there doesn't seem to be any convenient way available atm + // TODO: implement easier way to go about it + ::glDisableClientState( GL_NORMAL_ARRAY ); + ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + ::glEnableClientState( GL_COLOR_ARRAY ); + ::glColorPointer( 3, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 12 ); // kolory + + ::glDrawArrays( GL_POINTS, Submodel->iVboPtr, Submodel->iNumVerts ); + + ::glDisableClientState( GL_COLOR_ARRAY ); + ::glEnableClientState( GL_NORMAL_ARRAY ); + ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + } + else { + ::glCallList( Submodel->uiDisplayList ); + } + + // post-draw reset + ::glPopAttrib(); } } if( Submodel->Child != NULL ) @@ -429,7 +476,8 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { return false; } - + + // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji double squaredistance = SquareMagnitude( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor; Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu @@ -444,61 +492,42 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { ::glMultMatrixd( Dynamic->mMatrix.getArray() ); - // TODO: implement universal render path down the road - if( Global::bUseVBO ) { - // wersja VBO - if( Dynamic->mdLowPolyInt ) { - if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { - // enable cab light if needed - if( Dynamic->InteriorLightLevel > 0.0f ) { - - // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } - - Dynamic->mdLowPolyInt->RaRenderAlpha( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); - - if( Dynamic->InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - } - } - } - - Dynamic->mdModel->RaRenderAlpha( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); - - if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Dynamic->mdLoad->RaRenderAlpha( squaredistance, Dynamic->Material()->replacable_skins, Dynamic->Material()->textures_alpha ); + if( Dynamic->fShade > 0.0f ) { + // change light level based on light level of the occupied track + Global::DayLight.apply_intensity( Dynamic->fShade ); } - else { - // wersja Display Lists - if( Dynamic->mdLowPolyInt ) { - // low poly interior - if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { - // enable cab light if needed - if( Dynamic->InteriorLightLevel > 0.0f ) { - // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } + // render + if( Dynamic->mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + // enable cab light if needed + if( Dynamic->InteriorLightLevel > 0.0f ) { - Render_Alpha( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } - if( Dynamic->InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - } + Render_Alpha( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); + + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); } } + } - Render_Alpha( Dynamic->mdModel, Dynamic->Material(), squaredistance ); + Render_Alpha( Dynamic->mdModel, Dynamic->Material(), squaredistance ); - if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Render_Alpha( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Render_Alpha( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + + // post-render cleanup + if( Dynamic->fShade > 0.0f ) { + // restore regular light level + Global::DayLight.apply_intensity(); } ::glPopMatrix(); @@ -524,14 +553,29 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, d Model->Root->fSquareDist = Squaredistance; // zmienna globalna! + // TODO: unify the render code after generic buffers are in place + // setup + if( Global::bUseVBO ) { + if( false == Model->StartVBO() ) + return false; + } + Model->Root->ReplacableSet( ( Material != nullptr ? - Material->replacable_skins : - nullptr ), + Material->replacable_skins : + nullptr ), alpha ); + Model->Root->pRoot = Model; + + // render Render_Alpha( Model->Root ); + // post-render cleanup + if( Global::bUseVBO ) { + Model->EndVBO(); + } + return true; } @@ -569,54 +613,60 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { Submodel->RaAnimation( Submodel->b_aAnim ); } - if( Submodel->eType < TP_ROTATOR ) { // renderowanie obiektów OpenGL + if( Submodel->eType < TP_ROTATOR ) { + // renderowanie obiektów OpenGL if( Submodel->iAlpha & Submodel->iFlags & 0x2F ) // rysuj gdy element przezroczysty { - if( Submodel->TextureID < 0 ) // && (ReplacableSkinId!=0)) - { // zmienialne skóry - GfxRenderer.Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); - // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury + // textures... + if( Submodel->TextureID < 0 ) { // zmienialne skóry + Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); } - else - GfxRenderer.Bind( Submodel->TextureID ); // również 0 + else { + // również 0 + Bind( Submodel->TextureID ); + } + ::glColor3fv( Submodel->f4Diffuse ); // McZapkie-240702: zamiast ub + // ...luminance if( Global::fLuminance < Submodel->fLight ) { - ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo - ::glCallList( Submodel->uiDisplayList ); // tylko dla siatki - float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); - ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); + // zeby swiecilo na kolorowo + ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); + } + + // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc + if( Global::bUseVBO ) { + ::glDrawArrays( Submodel->eType, Submodel->iVboPtr, Submodel->iNumVerts ); + } + else { + ::glCallList( Submodel->uiDisplayList ); + } + + // post-draw reset + if( Global::fLuminance < Submodel->fLight ) { + // restore default (lack of) brightness + glm::vec4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( noemission ) ); } - else - ::glCallList( Submodel->uiDisplayList ); // tylko dla siatki } } else if( Submodel->eType == TP_FREESPOTLIGHT ) { - // dorobić aureolę! + if( Global::fLuminance < Submodel->fLight ) { // NOTE: we're forced here to redo view angle calculations etc, because this data isn't instanced but stored along with the single mesh // TODO: separate instance data from reusable geometry -/* - matrix4x4 modelview; - ::glGetDoublev( GL_MODELVIEW_MATRIX, modelview.getArray() ); -*/ -/* - matrix4x4 modelview; modelview.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); - // kąt między kierunkiem światła a współrzędnymi kamery - auto const lightcenter = modelview * vector3( 0.0, 0.0, -0.05 ); // pozycja punktu świecącego względem kamery - Submodel->fCosViewAngle = DotProduct( Normalize( modelview * vector3( 0.0, 0.0, -1.0 ) - lightcenter ), Normalize( -lightcenter ) ); -*/ auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); auto const lightcenter = modelview * glm::vec4( 0.0f, 0.0f, -0.05f, 1.0f ); // pozycja punktu świecącego względem kamery Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.0f, 0.0f, -1.0f, 1.0f ) - lightcenter ), glm::normalize( -lightcenter ) ); float glarelevel = 0.6f; // luminosity at night is at level of ~0.1, so the overall resulting transparency is ~0.5 at full 'brightness' - if( ( Submodel->fCosViewAngle > 0.0 ) && ( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) ) { + if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) { - glarelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0 - Submodel->fCosFalloffAngle ); + glarelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); glarelevel = std::max( 0.0f, glarelevel - static_cast(Global::fLuminance) ); if( glarelevel > 0.0f ) { ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); + Bind( m_glaretextureid ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], glarelevel ); ::glDisable( GL_LIGHTING ); @@ -627,8 +677,6 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian ::glRotated( atan2( lightcenter.x, lightcenter.z ) * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // jedynie obracamy w pionie o kąt - ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); // zeby swiecilo na kolorowo - // TODO: turn the drawing instructions into a compiled call / array ::glBegin( GL_TRIANGLE_STRIP ); float const size = 2.5f; @@ -646,9 +694,6 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { */ ::glEnd(); - float4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); - ::glMaterialfv( GL_FRONT, GL_EMISSION, &noemission.x ); - ::glPopMatrix(); ::glPopAttrib(); } diff --git a/renderer.h b/renderer.h index bb13ce4b..1cc76d0c 100644 --- a/renderer.h +++ b/renderer.h @@ -180,7 +180,8 @@ private: typedef std::vector opengllight_array; // methods - bool Init_caps(); + bool + Init_caps(); // members rendermode renderpass{ rendermode::color }; diff --git a/sky.cpp b/sky.cpp index fa9baa14..54d47a09 100644 --- a/sky.cpp +++ b/sky.cpp @@ -39,21 +39,21 @@ void TSky::Render( float3 const &Tint ) GfxRenderer.Disable_Lights(); ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &Tint.x ); #endif - if (Global::bUseVBO) +#ifdef EU07_USE_OLD_RENDERCODE + if( Global::bUseVBO ) { // renderowanie z VBO mdCloud->RaRender( 100, 0 ); mdCloud->RaRenderAlpha(100, 0); } else { // renderowanie z Display List -#ifdef EU07_USE_OLD_RENDERCODE mdCloud->Render(100, 0); mdCloud->RenderAlpha(100, 0); -#else - GfxRenderer.Render( mdCloud, nullptr, 100.0 ); - GfxRenderer.Render_Alpha( mdCloud, nullptr, 100.0 ); -#endif } +#else + GfxRenderer.Render( mdCloud, nullptr, 100.0 ); + GfxRenderer.Render_Alpha( mdCloud, nullptr, 100.0 ); +#endif #ifdef EU07_USE_OLD_LIGHTING_MODEL glPopMatrix(); // TODO: re-implement this diff --git a/stars.cpp b/stars.cpp index a5e93828..dd7e9650 100644 --- a/stars.cpp +++ b/stars.cpp @@ -21,16 +21,16 @@ cStars::render() { ::glRotatef( -std::fmod( (float)Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX ::glPointSize( 2.0f ); +#ifdef EU07_USE_OLD_RENDERCODE if( Global::bUseVBO ) { m_stars.RaRender( 1.0, 0 ); } else { -#ifdef EU07_USE_OLD_RENDERCODE m_stars.Render( 1.0 ); -#else - GfxRenderer.Render( &m_stars, nullptr, 1.0 ); -#endif } +#else + GfxRenderer.Render( &m_stars, nullptr, 1.0 ); +#endif ::glPointSize( 3.0f ); ::glPopMatrix(); From fbba5589f70e45a74f981ac72bb5a657e1566056 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 26 Mar 2017 19:13:50 +0200 Subject: [PATCH 073/426] enabled hardware texture compression, minor debug info enhancements --- Ground.cpp | 2 +- Segment.cpp | 4 ++-- Texture.cpp | 4 ++-- renderer.cpp | 3 +++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index cafb4476..fe883149 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -290,6 +290,7 @@ void TGroundNode::RaRenderVBO() } void TGroundNode::RenderVBO() { // renderowanie obiektu z VBO - faza nieprzezroczystych + switch( iType ) { // obiekty renderowane niezależnie od odległości case TP_SUBMODEL: TSubModel::fSquareDist = 0; @@ -363,7 +364,6 @@ void TGroundNode::RenderAlphaVBO() return; } - switch( iType ) { case TP_TRACTION: { if( bVisible ) { diff --git a/Segment.cpp b/Segment.cpp index e86071dc..821bb407 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -118,7 +118,7 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI fStep = fNewStep; if (fLength <= 0) { - ErrorLog("Bad geometry: Length <= 0 in TSegment::Init at " + Where(Point1)); + ErrorLog( "Bad geometry (zero length) for spline \"" + pOwner->NameGet() + "\" at " + Where( Point1 ) ); // MessageBox(0,"Length<=0","TSegment::Init",MB_OK); return false; // zerowe nie mogą być } @@ -220,7 +220,7 @@ double TSegment::GetTFromS(double s) // Newton's method failed. If this happens, increase iterations or // tolerance or integration accuracy. // return -1; //Ra: tu nigdy nie dojdzie - ErrorLog( "Bad geometry: Too many iterations at " + Where( Point1 ) ); + ErrorLog( "Bad geometry (shape estimation failed) for spline \"" + pOwner->NameGet() + "\" at " + Where( Point1 ) ); // MessageBox(0,"Too many iterations","GetTFromS",MB_OK); return fTime; }; diff --git a/Texture.cpp b/Texture.cpp index 981193c8..cde00cf6 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -580,9 +580,9 @@ opengl_texture::create() { dataheight = std::max( dataheight / 2, 1 ); } else { - // uncompressed texture data + // uncompressed texture data. have the gfx card do the compression as it sees fit ::glTexImage2D( - GL_TEXTURE_2D, 0, GL_RGBA8, + GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA, data_width, data_height, 0, data_format, GL_UNSIGNED_BYTE, (GLubyte *)&data[ 0 ] ); } diff --git a/renderer.cpp b/renderer.cpp index ee4eeaaa..5d09d62b 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -106,7 +106,9 @@ opengl_renderer::Init( GLFWwindow *Window ) { m_lights.emplace_back( light ); } // preload some common textures + WriteLog( "Loading common gfx data..." ); m_glaretextureid = GetTextureId( "fx\\lightglare", szTexturePath ); + WriteLog( "...gfx data pre-loading done" ); return true; } @@ -897,6 +899,7 @@ opengl_renderer::Init_caps() { WriteLog( "Supported extensions:" + std::string((char *)glGetString( GL_EXTENSIONS )) ); + WriteLog( std::string("Render path: ") + ( Global::bUseVBO ? "VBO" : "Display lists" ) ); if( Global::iMultisampling ) WriteLog( "Using multisampling x" + std::to_string( 1 << Global::iMultisampling ) ); { // ograniczenie maksymalnego rozmiaru tekstur - parametr dla skalowania tekstur From 2ec6cad7cb465d4f3e0abd6fd04c8ac779c243dd Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 26 Mar 2017 20:20:29 +0200 Subject: [PATCH 074/426] texture binding fix --- Ground.cpp | 10 +++++----- Texture.cpp | 9 +++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index fe883149..df5cc8e6 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -339,9 +339,9 @@ void TGroundNode::RenderVBO() { // renderowanie obiektu z VBO - faza nieprzezroc b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); #endif glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii - // glDisable(GL_LIGHTING); //nie powinny świecić + GfxRenderer.Bind( 0 ); + glDrawArrays( iType, iVboPtr, iNumPts ); // rysowanie linii - // glEnable(GL_LIGHTING); } } // GL_TRIANGLE etc @@ -408,6 +408,7 @@ void TGroundNode::RenderAlphaVBO() float b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; #endif glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii + GfxRenderer.Bind( 0 ); glDrawArrays( iType, iVboPtr, iNumPts ); // rysowanie linii } @@ -447,9 +448,6 @@ void TGroundNode::Compile(bool many) { #ifdef USE_VERTEX_ARRAYS glVertexPointer(3, GL_DOUBLE, sizeof(vector3), &Points[0].x); -#endif - GfxRenderer.Bind(0); -#ifdef USE_VERTEX_ARRAYS glDrawArrays(iType, 0, iNumPts); #else glBegin(iType); @@ -608,6 +606,7 @@ void TGroundNode::RenderDL() b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); #endif glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii + GfxRenderer.Bind( 0 ); glCallList( DisplayListID ); } @@ -691,6 +690,7 @@ void TGroundNode::RenderAlphaDL() float b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; #endif glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii + GfxRenderer.Bind( 0 ); glCallList( DisplayListID ); } diff --git a/Texture.cpp b/Texture.cpp index cde00cf6..8f939e06 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -66,6 +66,8 @@ opengl_texture::load() { fail: data_state = resource_state::failed; ErrorLog( "Failed to load texture \"" + name + "\"" ); + // NOTE: temporary workaround for texture assignment errors + id = 0; return; } @@ -252,6 +254,7 @@ opengl_texture::load_DDS() { data_width /= 2; data_height /= 2; --data_mapcount; + WriteLog( "Texture size exceeds specified limits, skipping mipmap level" ); }; if( data_mapcount <= 0 ) { @@ -676,6 +679,7 @@ opengl_texture::downsize( GLuint const Format ) { break; } + WriteLog( "Texture size exceeds specified limits, downsampling data" ); switch( Format ) { case GL_RGB: { downsample< glm::tvec3 >( data_width, data_height, data.data() ); break; } @@ -817,8 +821,9 @@ texture_manager::Bind( texture_manager::size_type const Id ) { // TODO: do binding in texture object, add support for other types if( Id != 0 ) { #ifndef EU07_DEFERRED_TEXTURE_UPLOAD - ::glBindTexture( GL_TEXTURE_2D, Id ); - m_activetexture = 0; + // NOTE: we could bind dedicated 'error' texture here if the id isn't valid + ::glBindTexture( GL_TEXTURE_2D, Texture(Id).id ); + m_activetexture = Texture(Id).id; #else if( Texture( Id ).bind() == resource_state::good ) { m_activetexture = Id; From 9dda5037d38af32f1b9a205d5227547ad69f1951 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 28 Mar 2017 13:09:01 +0200 Subject: [PATCH 075/426] moon object, tweaks to the lighting model --- Globals.cpp | 5 +- Globals.h | 1 + Ground.cpp | 19 ++++- Model3d.cpp | 14 ++-- ResourceManager.cpp | 2 +- Segment.cpp | 4 +- World.cpp | 85 ++++++++++++++++----- World.h | 2 + maszyna.vcxproj.filters | 6 ++ skydome.cpp | 13 +++- sun.cpp | 161 +++++++++++++++++++++------------------- sun.h | 36 ++++----- 12 files changed, 220 insertions(+), 128 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index f468c33d..5663318f 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -80,11 +80,12 @@ double Global::pCameraRotation; double Global::pCameraRotationDeg; std::vector Global::FreeCameraInit; std::vector Global::FreeCameraInitAngle; -double Global::fFogStart = 1700; -double Global::fFogEnd = 2000; float Global::Background[3] = {0.2f, 0.4f, 0.33f}; GLfloat Global::AtmoColor[] = {0.423f, 0.702f, 1.0f}; GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; +double Global::fFogStart = 1700; +double Global::fFogEnd = 2000; +float Global::Overcast{ 0.1f }; // NOTE: all this weather stuff should be moved elsewhere #ifdef EU07_USE_OLD_LIGHTING_MODEL GLfloat Global::ambientDayLight[] = {0.40f, 0.40f, 0.45f, 1.0f}; // robocze GLfloat Global::diffuseDayLight[] = {0.55f, 0.54f, 0.50f, 1.0f}; diff --git a/Globals.h b/Globals.h index ba81d91e..26e9d8be 100644 --- a/Globals.h +++ b/Globals.h @@ -218,6 +218,7 @@ class Global static float Background[3]; static GLfloat AtmoColor[]; static GLfloat FogColor[]; + static float Overcast; // static bool bTimeChange; #ifdef EU07_USE_OLD_LIGHTING_MODEL static opengl_light AmbientLight; diff --git a/Ground.cpp b/Ground.cpp index df5cc8e6..7bfd2072 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2798,16 +2798,29 @@ bool TGround::Init(std::string File) { // Ra: ustawienie parametrów OpenGL przeniesione do FirstInit WriteLog("Scenery atmo definition"); parser.getTokens(3); - parser >> Global::AtmoColor[0] >> Global::AtmoColor[1] >> Global::AtmoColor[2]; + parser + >> Global::AtmoColor[0] + >> Global::AtmoColor[1] + >> Global::AtmoColor[2]; parser.getTokens(2); - parser >> Global::fFogStart >> Global::fFogEnd; + parser + >> Global::fFogStart + >> Global::fFogEnd; if (Global::fFogEnd > 0.0) { // ostatnie 3 parametry są opcjonalne parser.getTokens(3); - parser >> Global::FogColor[0] >> Global::FogColor[1] >> Global::FogColor[2]; + parser + >> Global::FogColor[0] + >> Global::FogColor[1] + >> Global::FogColor[2]; } parser.getTokens(); parser >> token; + if( token != "endatmo" ) { + // optional overcast parameter + // NOTE: parameter system needs some decent replacement, but not worth the effort if we're moving to built-in editor + Global::Overcast = clamp( std::stof( token ), 0.0f, 1.0f ); + } while (token.compare("endatmo") != 0) { // a kolejne parametry są pomijane parser.getTokens(); diff --git a/Model3d.cpp b/Model3d.cpp index 4d9fb42d..efd08a4b 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -313,12 +313,16 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) } std::string discard; parser.getTokens(13, false); - parser >> fNearAttenStart >> discard >> fNearAttenEnd >> discard >> bUseNearAtten >> - discard >> iFarAttenDecay >> discard >> fFarDecayRadius >> discard >> - fCosFalloffAngle // kąt liczony dla średnicy, a nie promienia + parser + >> fNearAttenStart + >> discard >> fNearAttenEnd + >> discard >> bUseNearAtten + >> discard >> iFarAttenDecay + >> discard >> fFarDecayRadius + >> discard >> fCosFalloffAngle // kąt liczony dla średnicy, a nie promienia >> discard >> fCosHotspotAngle; // kąt liczony dla średnicy, a nie promienia - fCosFalloffAngle = cos(DegToRad(0.5 * fCosFalloffAngle)); - fCosHotspotAngle = cos(DegToRad(0.5 * fCosHotspotAngle)); + fCosFalloffAngle = std::cos( DegToRad( 0.5f * fCosFalloffAngle ) ); + fCosHotspotAngle = std::cos( DegToRad( 0.5f * fCosHotspotAngle ) ); iNumVerts = 1; /* iFlags |= 0x4010; // rysowane w cyklu nieprzezroczystych, macierz musi zostać bez zmiany diff --git a/ResourceManager.cpp b/ResourceManager.cpp index 412aa853..12d44b38 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -18,7 +18,7 @@ double ResourceManager::_lastReport = 0.0f; void ResourceManager::Register(Resource *resource) { - _resources.push_back(resource); + _resources.emplace_back(resource); }; void ResourceManager::Unregister(Resource *resource) diff --git a/Segment.cpp b/Segment.cpp index 821bb407..3106ee28 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -401,7 +401,9 @@ void TSegment::RenderLoft(const vector6 *ShapePoints, int iNumShapePoints, doubl jmm1 * ShapePoints[j].z + m1 * ShapePoints[j + iNumShapePoints].z, tv1); glVertex3f(pt.x, pt.y, pt.z); // pt nie mamy gdzie zapamiętać? } - if (p) // jeśli jest wskaźnik do tablicy + // BUG: things blow up badly in the following part in 64bit version on baltyk.scn + // TODO: sort this mess out when the time comes to reorganize spline generation + if( p ) // jeśli jest wskaźnik do tablicy if (*p) if (!j) // to dla pierwszego punktu { diff --git a/World.cpp b/World.cpp index 3b1d837d..febe4749 100644 --- a/World.cpp +++ b/World.cpp @@ -2311,37 +2311,75 @@ void world_environment::init() { m_sun.init(); + m_moon.init(); m_stars.init(); m_clouds.Init(); } void world_environment::update() { - - // move sun... + // move celestial bodies... m_sun.update(); - auto const position = m_sun.getPosition(); - // ...update the global data to match new sun state... - Global::SunAngle = m_sun.getAngle(); - Global::DayLight.set_position( position ); - Global::DayLight.direction = -1.0 * m_sun.getDirection(); + m_moon.update(); + // ...determine source of key light and adjust global state accordingly... + auto const sunlightlevel = m_sun.getIntensity(); + auto const moonlightlevel = m_moon.getIntensity(); + float keylightintensity; + float twilightfactor; + float3 keylightcolor; + if( moonlightlevel > sunlightlevel ) { + // rare situations when the moon is brighter than the sun, typically at night + Global::SunAngle = m_moon.getAngle(); + Global::DayLight.set_position( m_moon.getPosition() ); + Global::DayLight.direction = -1.0 * m_moon.getDirection(); + keylightintensity = moonlightlevel; + // if the moon is up, it overrides the twilight + twilightfactor = 0.0f; + keylightcolor = float3( 255.0f / 255.0f, 242.0f / 255.0f, 202.0f / 255.0f ); + } + else { + // regular situation with sun as the key light + Global::SunAngle = m_sun.getAngle(); + Global::DayLight.set_position( m_sun.getPosition() ); + Global::DayLight.direction = -1.0 * m_sun.getDirection(); + keylightintensity = sunlightlevel; + // diffuse (sun) intensity goes down after twilight, and reaches minimum 18 degrees below horizon + twilightfactor = clamp( -Global::SunAngle, 0.0f, 18.0f ) / 18.0f; + // TODO: crank orange up at dawn/dusk + keylightcolor = float3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); + float const duskfactor = 1.0f - clamp( Global::SunAngle, 0.0f, 18.0f ) / 18.0f; + keylightcolor = interpolate( + float3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), + float3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), + duskfactor ); + } // ...update skydome to match the current sun position as well... - m_skydome.Update( position ); + m_skydome.SetOvercastFactor( Global::Overcast ); + m_skydome.Update( m_sun.getPosition() ); // ...retrieve current sky colour and brightness... auto const skydomecolour = m_skydome.GetAverageColor(); auto const skydomehsv = RGBtoHSV( skydomecolour ); - auto const intensity = std::min( 1.15f * (0.05f + m_sun.getIntensity() + skydomehsv.z), 1.25f ); - // ...update light colours and intensity. - // NOTE: intensity combines intensity of the sun and the light reflected by the sky dome + // sun strength is reduced by overcast level + keylightintensity *= ( 1.0f - Global::Overcast * 0.65f ); + + // intensity combines intensity of the sun and the light reflected by the sky dome // it'd be more technically correct to have just the intensity of the sun here, // but whether it'd _look_ better is something to be tested - Global::DayLight.diffuse[ 0 ] = intensity * 255.0f / 255.0f; - Global::DayLight.diffuse[ 1 ] = intensity * 242.0f / 255.0f; - Global::DayLight.diffuse[ 2 ] = intensity * 231.0f / 255.0f; + auto const intensity = std::min( 1.15f * ( 0.05f + keylightintensity + skydomehsv.z ), 1.25f ); + // the impact of sun component is reduced proportionally to overcast level, as overcast increases role of ambient light + auto const diffuselevel = interpolate( keylightintensity, intensity * ( 1.0f - twilightfactor ), 1.0f - Global::Overcast * 0.75f ); + // ...update light colours and intensity. + keylightcolor = keylightcolor * diffuselevel; + Global::DayLight.diffuse[ 0 ] = keylightcolor.x; + Global::DayLight.diffuse[ 1 ] = keylightcolor.y; + Global::DayLight.diffuse[ 2 ] = keylightcolor.z; - Global::DayLight.ambient[ 0 ] = skydomecolour.x; - Global::DayLight.ambient[ 1 ] = skydomecolour.y; - Global::DayLight.ambient[ 2 ] = skydomecolour.z; + // tonal impact of skydome color is inversely proportional to how high the sun is above the horizon + // (this is pure conjecture, aimed more to 'look right' than be accurate) + float const ambienttone = clamp( 1.0f - ( Global::SunAngle / 90.0f ), 0.0f, 1.0f ); + Global::DayLight.ambient[ 0 ] = interpolate( skydomehsv.z, skydomecolour.x, ambienttone ); + Global::DayLight.ambient[ 1 ] = interpolate( skydomehsv.z, skydomecolour.y, ambienttone ); + Global::DayLight.ambient[ 2 ] = interpolate( skydomehsv.z, skydomecolour.z, ambienttone ); Global::fLuminance = intensity; @@ -2379,11 +2417,22 @@ world_environment::render() { m_skydome.Render(); m_stars.render(); - m_clouds.Render( m_skydome.GetAverageColor() * 2.5f ); + float const duskfactor = 1.0f - clamp( std::abs(m_sun.getAngle()), 0.0f, 12.0f ) / 12.0f; + float3 suncolor = interpolate( + m_skydome.GetAverageColor(), + float3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), + duskfactor ) * m_skydome.GetAverageColor().z; + + m_clouds.Render( + interpolate( m_skydome.GetAverageColor(), suncolor, duskfactor * 0.65f ) +// m_skydome.GetAverageColor() + * ( 1.0f - Global::Overcast * 0.5f ) // overcast darkens the clouds + * 2.5f ); // arbitrary adjustment factor if( DebugModeFlag == true ) { // mark sun position for easier debugging m_sun.render(); + m_moon.render(); } Global::DayLight.apply_angle(); Global::DayLight.apply_intensity(); diff --git a/World.h b/World.h index 551f8fed..119f62ad 100644 --- a/World.h +++ b/World.h @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "Ground.h" #include "sky.h" #include "sun.h" +#include "moon.h" #include "stars.h" #include "skydome.h" #include "mczapkie/mover.h" @@ -33,6 +34,7 @@ private: CSkyDome m_skydome; cStars m_stars; cSun m_sun; + cMoon m_moon; TSky m_clouds; }; diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index ba97afe4..9ccc0f0b 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -210,6 +210,9 @@ Source Files + + Source Files + @@ -407,6 +410,9 @@ Header Files + + Header Files + diff --git a/skydome.cpp b/skydome.cpp index 2afb16c3..27074616 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -184,7 +184,7 @@ void CSkyDome::SetGammaCorrection( float const Gamma ) { void CSkyDome::SetOvercastFactor( float const Overcast ) { - m_overcast = clamp( Overcast, 0.0f, 1.0f ); + m_overcast = clamp( Overcast, 0.0f, 1.0f ) * 0.75f; // going above 0.65 makes the model go pretty bad, appearance-wise } void CSkyDome::GetPerez( float *Perez, float Distribution[ 5 ][ 2 ], const float Turbidity ) { @@ -277,7 +277,7 @@ void CSkyDome::RebuildColors() { // luminance(Y) for clear & overcast sky float const yclear = PerezFunctionO2( perezluminance, icostheta, gamma, cosgamma2, zenithluminance ); - float const yover = ( 1.0f + 2.0f * vertex.y ) / 3.0f; + float const yover = zenithluminance * ( 1.0f + 2.0f * vertex.y ) / 3.0f; float const Y = interpolate( yclear, yover, m_overcast ); float const X = (x / y) * Y; @@ -295,6 +295,11 @@ void CSkyDome::RebuildColors() { colorconverter.z = 1.0f - exp( -m_expfactor * colorconverter.z ); } + // desaturate sky colour, based on overcast level + if( colorconverter.y > 0.0f ) { + colorconverter.y *= ( 1.0f - m_overcast ); + } + // override the hue, based on sun height above the horizon. crude way to deal with model shortcomings // correction begins when the sun is higher than 10 degrees above the horizon, and fully in effect at 10+15 degrees float const degreesabovehorizon = 90.0f - m_thetasun * ( 180.0f / M_PI ); @@ -318,8 +323,8 @@ void CSkyDome::RebuildColors() { */ // crude correction for the times where the model breaks (late night) // TODO: use proper night sky calculation for these times instead - if( ( color.x <= 0.0f ) - && ( color.y <= 0.0f ) ) { + if( ( color.x <= 0.05f ) + && ( color.y <= 0.05f ) ) { // darken the sky as the sun goes deeper below the horizon // 15:50:75 is picture-based night sky colour. it may not be accurate but looks 'right enough' color.z = 0.75f * std::max( color.z + m_sundirection.y, 0.075f ); diff --git a/sun.cpp b/sun.cpp index 1d0fbfea..6d671212 100644 --- a/sun.cpp +++ b/sun.cpp @@ -48,8 +48,6 @@ cSun::render() { GLfloat LightPosition[]= { 10.0f, 50.0f, -5.0f, 1.0f }; // ambient glLightfv(GL_LIGHT1, GL_POSITION, LightPosition ); */ - glDisable(GL_LIGHTING); - glDisable(GL_FOG); glColor4f( 255.0f/255.0f, 242.0f/255.0f, 231.0f/255.0f, 1.f ); // debug line to locate the sun easier Math3D::vector3 position = m_position; @@ -62,8 +60,6 @@ cSun::render() { // radius is a result of scaling true distance down to 2km -- it's scaled by equal ratio gluSphere( sunsphere, (float)(m_body.distance * 9.359157), 12, 12 ); glPopMatrix(); - glEnable(GL_FOG); - glEnable(GL_LIGHTING); } Math3D::vector3 @@ -115,106 +111,117 @@ void cSun::setPressure( float const Pressure ) { void cSun::move() { - static double degrad = 57.295779513; // converts from radians to degrees - static double raddeg = 0.0174532925; // converts from degrees to radians + static double radtodeg = 57.295779513; // converts from radians to degrees + static double degtorad = 0.0174532925; // converts from degrees to radians SYSTEMTIME localtime; // time for the calculation time( &localtime ); - if( m_observer.hour >= 0 ) { localtime.wHour = m_observer.hour; } + if( m_observer.hour >= 0 ) { localtime.wHour = m_observer.hour; } if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } double ut = localtime.wHour - + localtime.wMinute / 60.0 // too low resolution, noticeable skips - + localtime.wSecond / 3600.0; // good enough in normal circumstances -/* - + localtime.wMilliseconds / 3600000.0; // for really smooth movement -*/ - double daynumber = 367 * localtime.wYear - - 7 * ( localtime.wYear + ( localtime.wMonth + 9 ) /12 ) / 4 - + 275 * localtime.wMonth / 9 - + localtime.wDay - - 730530 - + (ut / 24.0); + + localtime.wMinute / 60.0 // too low resolution, noticeable skips + + localtime.wSecond / 3600.0; // good enough in normal circumstances + /* + + localtime.wMilliseconds / 3600000.0; // for really smooth movement + */ + double daynumber = 367 * localtime.wYear + - 7 * ( localtime.wYear + ( localtime.wMonth + 9 ) / 12 ) / 4 + + 275 * localtime.wMonth / 9 + + localtime.wDay + - 730530 + + ( ut / 24.0 ); - // Universal Coordinated (Greenwich standard) time + // Universal Coordinated (Greenwich standard) time m_observer.utime = ut * 3600.0; m_observer.utime = m_observer.utime / 3600.0 - m_observer.timezone; - - // mean longitude - m_body.mnlong = 280.460 + 0.9856474 * daynumber; - m_body.mnlong -= 360.0 * (int) ( m_body.mnlong / 360.0 ); // clamp the range to 0-360 - if( m_body.mnlong < 0.0 ) m_body.mnlong += 360.0; - - // mean anomaly - m_body.mnanom = 357.528 + 0.9856003 * daynumber; - m_body.mnanom -= 360.0 * (int) ( m_body.mnanom / 360.0 ); // clamp the range to 0-360 - if( m_body.mnanom < 0.0 ) m_body.mnanom += 360.0; - - // ecliptic longitude - m_body.eclong = m_body.mnlong - + 1.915 * sin( m_body.mnanom * raddeg ) - + 0.020 * sin ( 2.0 * m_body.mnanom * raddeg ); - m_body.eclong -= 360.0 * (int)( m_body.eclong / 360.0 ); - if( m_body.eclong < 0.0 ) m_body.eclong += 360.0; // clamp the range to 0-360 - + // perihelion longitude + m_body.phlong = 282.9404 + 4.70935e-5 * daynumber; // w + // orbit eccentricity + double const e = 0.016709 - 1.151e-9 * daynumber; + // mean anomaly + m_body.mnanom = 356.0470 + 0.9856002585 * daynumber; // M + m_body.mnanom -= 360.0 * (int)( m_body.mnanom / 360.0 ); // clamp the range to 0-360 + if( m_body.mnanom < 0.0 ) m_body.mnanom += 360.0; // obliquity of the ecliptic - m_body.ecobli = 23.439 - 4.0e-07 * daynumber; + m_body.oblecl = 23.4393 - 3.563e-7 * daynumber; + // mean longitude + m_body.mnlong = m_body.phlong + m_body.mnanom; // L = w + M + m_body.mnlong -= 360.0 * (int)( m_body.mnlong / 360.0 ); // clamp the range to 0-360 + if( m_body.mnlong < 0.0 ) m_body.mnlong += 360.0; + // eccentric anomaly + double const E = m_body.mnanom + radtodeg * e * std::sin( degtorad * m_body.mnanom ) * ( 1.0 + e * std::cos( degtorad * m_body.mnanom ) ); + // ecliptic plane rectangular coordinates + double const xv = std::cos( degtorad * E ) - e; + double const yv = std::sin( degtorad * E ) * std::sqrt( 1.0 - e*e ); + // distance + m_body.distance = std::sqrt( xv*xv + yv*yv ); // r + // true anomaly + m_body.tranom = radtodeg * std::atan2( yv, xv ); // v + // ecliptic longitude + m_body.eclong = m_body.tranom + m_body.phlong; // lon = v + w + m_body.eclong -= 360.0 * (int)( m_body.eclong / 360.0 ); + if( m_body.eclong < 0.0 ) m_body.eclong += 360.0; // clamp the range to 0-360 +/* + // ecliptic rectangular coordinates + double const x = m_body.distance * std::cos( degtorad * m_body.eclong ); + double const y = m_body.distance * std::sin( degtorad * m_body.eclong ); + double const z = 0.0; + // equatorial rectangular coordinates + double const xequat = x; + double const yequat = y * std::cos( degtorad * m_body.oblecl ) - 0.0 * std::sin( degtorad * m_body.oblecl ); + double const zequat = y * std::sin( degtorad * m_body.oblecl ) + 0.0 * std::cos( degtorad * m_body.oblecl ); + // declination + m_body.declin = radtodeg * std::atan2( zequat, std::sqrt( xequat*xequat + yequat*yequat ) ); + // right ascension + m_body.rascen = radtodeg * std::atan2( yequat, xequat ); +*/ + // declination + m_body.declin = radtodeg * std::asin( std::sin( m_body.oblecl * degtorad ) * std::sin( m_body.eclong * degtorad ) ); - // declination - m_body.declin = degrad * asin( sin (m_body.ecobli * raddeg) * sin (m_body.eclong * raddeg) ); + // right ascension + double top = std::cos( degtorad * m_body.oblecl ) * std::sin( degtorad * m_body.eclong ); + double bottom = std::cos( degtorad * m_body.eclong ); - // right ascension - double top = cos ( raddeg * m_body.ecobli ) * sin ( raddeg * m_body.eclong ); - double bottom = cos ( raddeg * m_body.eclong ); + m_body.rascen = radtodeg * std::atan2( top, bottom ); + if( m_body.rascen < 0.0 ) m_body.rascen += 360.0; // (make it a positive angle) - m_body.rascen = degrad * atan2( top, bottom ); - if( m_body.rascen < 0.0 ) m_body.rascen += 360.0; // (make it a positive angle) + // Greenwich mean sidereal time + m_observer.gmst = 6.697375 + 0.0657098242 * daynumber + m_observer.utime; - // Greenwich mean sidereal time - m_observer.gmst = 6.697375 + 0.0657098242 * daynumber + m_observer.utime; + m_observer.gmst -= 24.0 * (int)( m_observer.gmst / 24.0 ); + if( m_observer.gmst < 0.0 ) m_observer.gmst += 24.0; - m_observer.gmst -= 24.0 * (int)( m_observer.gmst / 24.0 ); - if( m_observer.gmst < 0.0 ) m_observer.gmst += 24.0; + // local mean sidereal time + m_observer.lmst = m_observer.gmst * 15.0 + m_observer.longitude; - // local mean sidereal time - m_observer.lmst = m_observer.gmst * 15.0 + m_observer.longitude; + m_observer.lmst -= 360.0 * (int)( m_observer.lmst / 360.0 ); + if( m_observer.lmst < 0.0 ) m_observer.lmst += 360.0; - m_observer.lmst -= 360.0 * (int)( m_observer.lmst / 360.0 ); - if( m_observer.lmst < 0.0 ) m_observer.lmst += 360.0; + // hour angle + m_body.hrang = m_observer.lmst - m_body.rascen; - // hour angle - m_body.hrang = m_observer.lmst - m_body.rascen; - - if( m_body.hrang < -180.0 ) m_body.hrang += 360.0; // (force it between -180 and 180 degrees) + if( m_body.hrang < -180.0 ) m_body.hrang += 360.0; // (force it between -180 and 180 degrees) else if( m_body.hrang > 180.0 ) m_body.hrang -= 360.0; - double cz; // cosine of the solar zenith angle + double cz; // cosine of the solar zenith angle - double tdatcd = cos( raddeg * m_body.declin ); - double tdatch = cos( raddeg * m_body.hrang ); - double tdatcl = cos( raddeg * m_observer.latitude ); - double tdatsd = sin( raddeg * m_body.declin ); - double tdatsl = sin( raddeg * m_observer.latitude ); + double tdatcd = std::cos( degtorad * m_body.declin ); + double tdatch = std::cos( degtorad * m_body.hrang ); + double tdatcl = std::cos( degtorad * m_observer.latitude ); + double tdatsd = std::sin( degtorad * m_body.declin ); + double tdatsl = std::sin( degtorad * m_observer.latitude ); - cz = tdatsd * tdatsl + tdatcd * tdatcl * tdatch; + cz = tdatsd * tdatsl + tdatcd * tdatcl * tdatch; // (watch out for the roundoff errors) - if( fabs (cz) > 1.0 ) { cz >= 0.0 ? cz = 1.0 : cz = -1.0; } + if( fabs( cz ) > 1.0 ) { cz >= 0.0 ? cz = 1.0 : cz = -1.0; } - m_body.zenetr = acos( cz ) * degrad; - m_body.elevetr = 90.0 - m_body.zenetr; - refract(); - - // additional calculations for proper object sizing. - // orbit eccentricity - double e = 0.016709 - 1.151e-9 * daynumber; - // eccentric anomaly - double E = m_body.mnanom + e * degrad * sin(m_body.mnanom) * ( 1.0 + e * cos(m_body.mnanom) ); - double xv = cos(E) - e; - double yv = sqrt(1.0 - e*e) * sin(E); - m_body.distance = sqrt( xv*xv + yv*yv ); + m_body.zenetr = std::acos( cz ) * radtodeg; + m_body.elevetr = 90.0 - m_body.zenetr; + refract(); } void cSun::refract() { diff --git a/sun.h b/sun.h index e15abbbf..0834df73 100644 --- a/sun.h +++ b/sun.h @@ -66,23 +66,25 @@ protected: struct celestialbody { // main planet parameters - double dayang; // day angle (daynum*360/year-length) degrees - double mnlong; // mean longitude, degrees - double mnanom; // mean anomaly, degrees - double eclong; // ecliptic longitude, degrees. - double ecobli; // obliquity of ecliptic. - double declin; // declination--zenith angle of solar noon at equator, degrees NORTH. - double rascen; // right ascension, degrees - double hrang; // hour angle--hour of sun from solar noon, degrees WEST - double zenetr; // solar zenith angle, no atmospheric correction (= ETR) - double zenref; // solar zenith angle, deg. from zenith, refracted - double coszen; // cosine of refraction corrected solar zenith angle - double elevetr; // solar elevation, no atmospheric correction (= ETR) - double elevref; // solar elevation angle, deg. from horizon, refracted. - double distance; // distance from earth in AUs - double erv; // earth radius vector (multiplied to solar constant) - double etr; // extraterrestrial (top-of-atmosphere) W/sq m global horizontal solar irradiance - double etrn; // extraterrestrial (top-of-atmosphere) W/sq m direct normal solar irradiance + double dayang; // day angle (daynum*360/year-length) degrees + double phlong; // longitude of perihelion + double mnlong; // mean longitude, degrees + double mnanom; // mean anomaly, degrees + double tranom; // true anomaly, degrees + double eclong; // ecliptic longitude, degrees. + double oblecl; // obliquity of ecliptic. + double declin; // declination--zenith angle of solar noon at equator, degrees NORTH. + double rascen; // right ascension, degrees + double hrang; // hour angle--hour of sun from solar noon, degrees WEST + double zenetr; // solar zenith angle, no atmospheric correction (= ETR) + double zenref; // solar zenith angle, deg. from zenith, refracted + double coszen; // cosine of refraction corrected solar zenith angle + double elevetr; // solar elevation, no atmospheric correction (= ETR) + double elevref; // solar elevation angle, deg. from horizon, refracted. + double distance; // distance from earth in AUs + double erv; // earth radius vector (multiplied to solar constant) + double etr; // extraterrestrial (top-of-atmosphere) W/sq m global horizontal solar irradiance + double etrn; // extraterrestrial (top-of-atmosphere) W/sq m direct normal solar irradiance }; struct observer { // weather, time and position data in observer's location From 848db5878b103eb488c0a3f81f4918048efe82fd Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 29 Mar 2017 00:50:53 +0200 Subject: [PATCH 076/426] simulation time object --- Driver.cpp | 43 +++---- EvLaunch.cpp | 4 +- Ground.cpp | 58 ++------- Ground.h | 6 +- Model3d.cpp | 16 ++- Timer.h | 4 +- Track.cpp | 2 +- Train.cpp | 14 +-- World.cpp | 348 ++++++++++++++++++++++++++++++++++----------------- World.h | 61 +++++++-- mtable.cpp | 31 +++-- mtable.h | 24 ++-- renderer.cpp | 5 + sun.cpp | 71 ++--------- sun.h | 6 - usefull.h | 17 ++- 16 files changed, 379 insertions(+), 331 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index f30d5268..e2dbc091 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -826,19 +826,16 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN { // zaliczamy posterunek w pewnej odległości przed (choć W4 nie zasłania // już semafora) #if LOGSTOPS - WriteLog(pVehicle->asName + " as " + TrainParams->TrainName + ": at " + - std::to_string(GlobalTime->hh) + ":" + std::to_string(GlobalTime->mm) + - " skipped " + asNextStop); // informacja + WriteLog( + pVehicle->asName + " as " + TrainParams->TrainName + + ": at " + std::to_string(Simulation::Time.data().wHour) + ":" + std::to_string(Simulation::Time.data().wMinute) + + " skipped " + asNextStop); // informacja #endif - fLastStopExpDist = mvOccupied->DistCounter + 0.250 + - 0.001 * fLength; // przy jakim dystansie (stanie - // licznika) ma przesunąć na - // następny postój - TrainParams->UpdateMTable( - GlobalTime->hh, GlobalTime->mm, asNextStop); + // przy jakim dystansie (stanie licznika) ma przesunąć na następny postój + fLastStopExpDist = mvOccupied->DistCounter + 0.250 + 0.001 * fLength; + TrainParams->UpdateMTable( Simulation::Time, asNextStop ); TrainParams->StationIndexInc(); // przejście do następnej - asNextStop = - TrainParams->NextStop(); // pobranie kolejnego miejsca zatrzymania + asNextStop = TrainParams->NextStop(); // pobranie kolejnego miejsca zatrzymania // TableClear(); //aby od nowa sprawdziło W4 z inną nazwą już - to nie // jest dobry pomysł sSpeedTable[i].iFlags = 0; // nie liczy się już @@ -933,8 +930,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // niezależne od sposobu obsługi drzwi, bo // opóźnia również kierownika } - if (TrainParams->UpdateMTable( - GlobalTime->hh, GlobalTime->mm, asNextStop) ) + if (TrainParams->UpdateMTable( Simulation::Time, asNextStop) ) { // to się wykona tylko raz po zatrzymaniu na W4 if (TrainParams->CheckTrainLatency() < 0.0) iDrivigFlags |= moveLate; // odnotowano spóźnienie @@ -980,7 +976,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if (TrainParams->StationIndex < TrainParams->StationCount) { // jeśli są dalsze stacje, czekamy do godziny odjazdu - if (TrainParams->IsTimeToGo(GlobalTime->hh, GlobalTime->mm)) + if (TrainParams->IsTimeToGo(Simulation::Time.data().wHour, Simulation::Time.data().wMinute)) { // z dalszą akcją czekamy do godziny odjazdu /* potencjalny problem z ruszaniem z w4 if (TrainParams->CheckTrainLatency() < 0) @@ -997,10 +993,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN asNextStop = TrainParams->NextStop(); // pobranie kolejnego miejsca zatrzymania // TableClear(); //aby od nowa sprawdziło W4 z inną nazwą już - to nie jest dobry pomysł #if LOGSTOPS - WriteLog(pVehicle->asName + " as " + TrainParams->TrainName + - ": at " + std::to_string(GlobalTime->hh) + ":" + - std::to_string(GlobalTime->mm) + " next " + - asNextStop); // informacja + WriteLog( + pVehicle->asName + " as " + TrainParams->TrainName + + ": at " + std::to_string(Simulation::Time.data().wHour) + ":" + std::to_string(Simulation::Time.data().wMinute) + + " next " + asNextStop); // informacja #endif if (int(floor(sSpeedTable[i].evEvent->ValueGet(1))) & 1) iDrivigFlags |= moveStopHere; // nie podjeżdżać do semafora, @@ -1024,10 +1020,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else { // jeśli dojechaliśmy do końca rozkładu #if LOGSTOPS - WriteLog(pVehicle->asName + " as " + TrainParams->TrainName + - ": at " + std::to_string(GlobalTime->hh) + ":" + - std::to_string(GlobalTime->mm) + - " end of route."); // informacja + WriteLog( + pVehicle->asName + " as " + TrainParams->TrainName + + ": at " + std::to_string(Simulation::Time.data().wHour) + ":" + std::to_string(Simulation::Time.data().wMinute) + + " end of route."); // informacja #endif asNextStop = TrainParams->NextStop(); // informacja o końcu trasy TrainParams->NewName("none"); // czyszczenie nieaktualnego rozkładu @@ -2869,8 +2865,7 @@ bool TController::PutCommand(std::string NewCommand, double NewValue1, double Ne } else { // inicjacja pierwszego przystanku i pobranie jego nazwy - TrainParams->UpdateMTable(GlobalTime->hh, GlobalTime->mm, - TrainParams->NextStationName); + TrainParams->UpdateMTable( Simulation::Time, TrainParams->NextStationName ); TrainParams->StationIndexInc(); // przejście do następnej iStationStart = TrainParams->StationIndex; asNextStop = TrainParams->NextStop(); diff --git a/EvLaunch.cpp b/EvLaunch.cpp index c44cf1be..28789d14 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -177,9 +177,9 @@ bool TEventLauncher::Render() } else { // jeśli nie cykliczny, to sprawdzić czas - if (GlobalTime->hh == iHour) + if (Simulation::Time.data().wHour == iHour) { - if (GlobalTime->mm == iMinute) + if (Simulation::Time.data().wMinute == iMinute) { // zgodność czasu uruchomienia if (UpdatedTime < 10) { diff --git a/Ground.cpp b/Ground.cpp index 7bfd2072..a282326c 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -36,6 +36,7 @@ http://mozilla.org/MPL/2.0/. #include "Driver.h" #include "Console.h" #include "Names.h" +#include "world.h" #include "uilayer.h" #define _PROBLEND 1 @@ -2512,9 +2513,6 @@ void TGround::FirstInit() WriteLog("InitEvents OK"); InitLaunchers(); WriteLog("InitLaunchers OK"); - // ABu 160205: juz nie TODO :) - Mtable::GlobalTime = std::make_shared( hh, mm, srh, srm, ssh, ssm ); // McZapkie-300302: inicjacja czasu rozkladowego - TODO: czytac z trasy! - WriteLog("InitGlobalTime OK"); WriteLog("FirstInit is done"); }; @@ -2553,13 +2551,6 @@ bool TGround::Init(std::string File) int OriginStackTop = 0; vector3 OriginStack[OriginStackMaxDepth]; // stos zagnieżdżenia origin - // ABu: Jezeli nie ma definicji w scenerii to ustawiane ponizsze wartosci: - hh = 10; // godzina startu - mm = 30; // minuty startu - srh = 6; // godzina wschodu slonca - srm = 0; // minuty wschodu slonca - ssh = 20; // godzina zachodu slonca - ssm = 0; // minuty zachodu slonca TGroundNode *LastNode = NULL; // do użycia w trainset iNumNodes = 0; token = ""; @@ -2830,47 +2821,18 @@ bool TGround::Init(std::string File) else if (str == "time") { WriteLog("Scenery time definition"); - char temp_in[9]; - char temp_out[9]; - int i, j; parser.getTokens(); - parser >> temp_in; - for (j = 0; j <= 8; j++) - temp_out[j] = ' '; - for (i = 0; temp_in[i] != ':'; i++) - temp_out[i] = temp_in[i]; - hh = atoi(temp_out); - for (j = 0; j <= 8; j++) - temp_out[j] = ' '; - for (j = i + 1; j <= 8; j++) - temp_out[j - (i + 1)] = temp_in[j]; - mm = atoi(temp_out); + parser >> token; - parser.getTokens(); - parser >> temp_in; - for (j = 0; j <= 8; j++) - temp_out[j] = ' '; - for (i = 0; temp_in[i] != ':'; i++) - temp_out[i] = temp_in[i]; - srh = atoi(temp_out); - for (j = 0; j <= 8; j++) - temp_out[j] = ' '; - for (j = i + 1; j <= 8; j++) - temp_out[j - (i + 1)] = temp_in[j]; - srm = atoi(temp_out); + cParser timeparser( token ); + timeparser.getTokens( 2, false, ":" ); + auto &time = Simulation::Time.data(); + timeparser + >> time.wHour + >> time.wMinute; + + // NOTE: we ignore old sunrise and sunset definitions, as they're now calculated dynamically - parser.getTokens(); - parser >> temp_in; - for (j = 0; j <= 8; j++) - temp_out[j] = ' '; - for (i = 0; temp_in[i] != ':'; i++) - temp_out[i] = temp_in[i]; - ssh = atoi(temp_out); - for (j = 0; j <= 8; j++) - temp_out[j] = ' '; - for (j = i + 1; j <= 8; j++) - temp_out[j - (i + 1)] = temp_in[j]; - ssm = atoi(temp_out); while (token.compare("endtime") != 0) { parser.getTokens(); diff --git a/Ground.h b/Ground.h index 44164d09..27f48a30 100644 --- a/Ground.h +++ b/Ground.h @@ -300,11 +300,7 @@ class TGround // TGroundNode *nLastOfType[TP_LAST]; //ostatnia TSubRect srGlobal; // zawiera obiekty globalne (na razie wyzwalacze czasowe) int hh = 0, - mm = 0, - srh = 0, - srm = 0, - ssh = 0, - ssm = 0; // ustawienia czasu + mm = 0; // ustawienia czasu // int tracks,tracksfar; //liczniki torów typedef std::unordered_map event_map; event_map m_eventmap; diff --git a/Model3d.cpp b/Model3d.cpp index efd08a4b..64df1b84 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -956,29 +956,27 @@ void TSubModel::RaAnimation(TAnimType a) glRotatef(v_Angles.z, 0.0f, 0.0f, 1.0f); break; case at_SecondsJump: // sekundy z przeskokiem - glRotatef(floor(GlobalTime->mr) * 6.0, 0.0, 1.0, 0.0); + glRotatef(Simulation::Time.data().wSecond * 6.0, 0.0, 1.0, 0.0); break; case at_MinutesJump: // minuty z przeskokiem - glRotatef(GlobalTime->mm * 6.0, 0.0, 1.0, 0.0); + glRotatef(Simulation::Time.data().wMinute * 6.0, 0.0, 1.0, 0.0); break; case at_HoursJump: // godziny skokowo 12h/360° - glRotatef(GlobalTime->hh * 30.0 * 0.5, 0.0, 1.0, 0.0); + glRotatef(Simulation::Time.data().wHour * 30.0 * 0.5, 0.0, 1.0, 0.0); break; case at_Hours24Jump: // godziny skokowo 24h/360° - glRotatef(GlobalTime->hh * 15.0 * 0.25, 0.0, 1.0, 0.0); + glRotatef(Simulation::Time.data().wHour * 15.0 * 0.25, 0.0, 1.0, 0.0); break; case at_Seconds: // sekundy płynnie - glRotatef(GlobalTime->mr * 6.0, 0.0, 1.0, 0.0); + glRotatef(Simulation::Time.second() * 6.0, 0.0, 1.0, 0.0); break; case at_Minutes: // minuty płynnie - glRotatef(GlobalTime->mm * 6.0 + GlobalTime->mr * 0.1, 0.0, 1.0, 0.0); + glRotatef(Simulation::Time.data().wMinute * 6.0 + Simulation::Time.second() * 0.1, 0.0, 1.0, 0.0); break; case at_Hours: // godziny płynnie 12h/360° - // glRotatef(GlobalTime->hh*30.0+GlobalTime->mm*0.5+GlobalTime->mr/120.0,0.0,1.0,0.0); glRotatef(2.0 * Global::fTimeAngleDeg, 0.0, 1.0, 0.0); break; case at_Hours24: // godziny płynnie 24h/360° - // glRotatef(GlobalTime->hh*15.0+GlobalTime->mm*0.25+GlobalTime->mr/240.0,0.0,1.0,0.0); glRotatef(Global::fTimeAngleDeg, 0.0, 1.0, 0.0); break; case at_Billboard: // obrót w pionie do kamery @@ -998,7 +996,7 @@ void TSubModel::RaAnimation(TAnimType a) } break; case at_Wind: // ruch pod wpływem wiatru (wiatr będziemy liczyć potem...) - glRotated(1.5 * sin(M_PI * GlobalTime->mr / 6.0), 0.0, 1.0, 0.0); + glRotated(1.5 * std::sin(M_PI * Simulation::Time.second() / 6.0), 0.0, 1.0, 0.0); break; case at_Sky: // animacja nieba glRotated(Global::fLatitudeDeg, 1.0, 0.0, 0.0); // ustawienie osi OY na północ diff --git a/Timer.h b/Timer.h index b16d0d56..5a76ccbe 100644 --- a/Timer.h +++ b/Timer.h @@ -7,8 +7,7 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef TimerH -#define TimerH +#pragma once namespace Timer { @@ -36,4 +35,3 @@ void UpdateTimers(bool pause); }; //--------------------------------------------------------------------------- -#endif diff --git a/Track.cpp b/Track.cpp index 84b0a334..3864b93b 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2521,7 +2521,7 @@ void TTrack::EnvironmentSet() #else switch( eEnvironment ) { case e_canyon: { - Global::DayLight.apply_intensity( 0.5f ); + Global::DayLight.apply_intensity( 0.4f ); break; } case e_tunnel: { diff --git a/Train.cpp b/Train.cpp index 007c6082..ac3e74f8 100644 --- a/Train.cpp +++ b/Train.cpp @@ -391,9 +391,9 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "actualproximitydist", PyGetFloat( driver->ActualProximityDist ) ); PyDict_SetItemString( dict, "trainnumber", PyGetString( driver->TrainName().c_str() ) ); // world state data - PyDict_SetItemString( dict, "hours", PyGetInt( GlobalTime->hh ) ); - PyDict_SetItemString( dict, "minutes", PyGetInt( GlobalTime->mm ) ); - PyDict_SetItemString( dict, "seconds", PyGetInt( GlobalTime->mr ) ); + PyDict_SetItemString( dict, "hours", PyGetInt( Simulation::Time.data().wHour ) ); + PyDict_SetItemString( dict, "minutes", PyGetInt( Simulation::Time.data().wMinute ) ); + PyDict_SetItemString( dict, "seconds", PyGetInt( Simulation::Time.second() ) ); return dict; } @@ -2648,7 +2648,7 @@ bool TTrain::Update( double const Deltatime ) fTachoVelocity = Min0R(fabs(11.31 * mvControlled->WheelDiameter * mvControlled->nrot), mvControlled->Vmax * 1.05); { // skacze osobna zmienna - float ff = floor(GlobalTime->mr); // skacze co sekunde - pol sekundy + float ff = Simulation::Time.data().wSecond; // skacze co sekunde - pol sekundy // pomiar, pol sekundy ustawienie if (ff != fTachoTimer) // jesli w tej sekundzie nie zmienial { @@ -3326,11 +3326,11 @@ bool TTrain::Update( double const Deltatime ) // McZapkie-300302: zegarek if (ggClockMInd.SubModel) { - ggClockSInd.UpdateValue(int(GlobalTime->mr)); + ggClockSInd.UpdateValue(Simulation::Time.data().wSecond); ggClockSInd.Update(); - ggClockMInd.UpdateValue(GlobalTime->mm); + ggClockMInd.UpdateValue(Simulation::Time.data().wMinute); ggClockMInd.Update(); - ggClockHInd.UpdateValue(GlobalTime->hh + GlobalTime->mm / 60.0); + ggClockHInd.UpdateValue(Simulation::Time.data().wHour + Simulation::Time.data().wMinute / 60.0); ggClockHInd.Update(); } diff --git a/World.cpp b/World.cpp index febe4749..d4025696 100644 --- a/World.cpp +++ b/World.cpp @@ -39,11 +39,125 @@ std::shared_ptr UIHeader = std::make_shared( 20, 20 ); // he std::shared_ptr UITable = std::make_shared( 20, 100 ); // schedule or scan table std::shared_ptr UITranscripts = std::make_shared( 85, 600 ); // voice transcripts +namespace Simulation { + +simulation_time Time; + +} + extern "C" { GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); //m7todo: potrzebne do directsound } +void +simulation_time::init() { + + char monthdaycounts[ 2 ][ 13 ] = { + { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, + { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; + ::memcpy( m_monthdaycounts, monthdaycounts, sizeof( monthdaycounts ) ); + + // cache requested elements, if any + auto const requestedhour = m_time.wHour; + auto const requestedminute = m_time.wMinute; + + ::GetLocalTime( &m_time ); + + if( Global::fMoveLight > 0.0 ) { + // day and month of the year can be overriden by scenario setup + daymonth( m_time.wDay, m_time.wMonth, m_time.wYear, static_cast( Global::fMoveLight ) ); + } + + if( requestedhour != -1 ) { m_time.wHour = clamp( requestedhour, static_cast( 0 ), static_cast( 23 ) ); } + if( requestedminute != -1 ) { m_time.wMinute = clamp( requestedminute, static_cast( 0 ), static_cast( 59 ) ); } + // if the time is taken from the local clock leave the seconds intact, otherwise set them to zero + if( ( requestedhour != -1 ) || ( requestedminute != -1 ) ) { + m_time.wSecond = 0; + } + + m_yearday = yearday( m_time.wDay, m_time.wMonth, m_time.wYear ); +} + +void +simulation_time::update( double const Deltatime ) { + + // use large enough buffer to hold long time skips + auto milliseconds = m_time.wMilliseconds + static_cast(std::floor( 1000.0 * Deltatime )); + while( milliseconds >= 1000.0 ) { + + ++m_time.wSecond; + milliseconds -= 1000; + } + m_time.wMilliseconds = milliseconds; + while( m_time.wSecond >= 60 ) { + + ++m_time.wMinute; + m_time.wSecond -= 60; + } + while( m_time.wMinute >= 60 ) { + + ++m_time.wHour; + m_time.wMinute -= 60; + } + while( m_time.wHour >= 24 ) { + + ++m_time.wDay; + ++m_time.wDayOfWeek; + if( m_time.wDayOfWeek >= 7 ) { + m_time.wDayOfWeek -= 7; + } + m_time.wHour -= 24; + } + int leap = ( m_time.wYear % 4 == 0 ) && ( m_time.wYear % 100 != 0 ) || ( m_time.wYear % 400 == 0 ); + while( m_time.wDay > m_monthdaycounts[ leap ][ m_time.wMonth ] ) { + + m_time.wDay -= m_monthdaycounts[ leap ][ m_time.wMonth ]; + ++m_time.wMonth; + // unlikely but we might've entered a new year + if( m_time.wMonth > 12 ) { + + ++m_time.wYear; + leap = ( m_time.wYear % 4 == 0 ) && ( m_time.wYear % 100 != 0 ) || ( m_time.wYear % 400 == 0 ); + m_time.wMonth -= 12; + } + } +} + +int +simulation_time::yearday( int Day, const int Month, const int Year ) { + + char daytab[ 2 ][ 13 ] = { + { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, + { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } + }; + int i, leap; + + leap = ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ); + for( i = 1; i < Month; ++i ) + Day += daytab[ leap ][ i ]; + + return Day; +} + +void +simulation_time::daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ) { + + WORD daytab[ 2 ][ 13 ] = { + { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, + { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } + }; + + int leap = ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ); + WORD idx = 1; + while( ( idx < 13 ) && ( Yearday >= daytab[ leap ][ idx ] ) ) { + + ++idx; + } + Month = idx; + Day = Yearday - daytab[ leap ][ idx - 1 ]; +} + TWorld::TWorld() { // randomize(); @@ -54,9 +168,6 @@ TWorld::TWorld() KeyEvents[i] = NULL; // eventy wyzwalane klawiszami cyfrowymi Global::iSlowMotion = 0; // Global::changeDynObj=NULL; - OutText1 = ""; // teksty wyświetlane na ekranie - OutText2 = ""; - OutText3 = ""; pDynamicNearest = NULL; fTimeBuffer = 0.0; // bufor czasu aktualizacji dla stałego kroku fizyki fMaxDt = 0.01; //[s] początkowy krok czasowy fizyki @@ -176,6 +287,8 @@ bool TWorld::Init( GLFWwindow *Window ) { glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii + Simulation::Time.init(); + Environment.init(); Camera.Init(Global::FreeCameraInit[0], Global::FreeCameraInitAngle[0]); @@ -324,11 +437,11 @@ void TWorld::OnKeyDown(int cKey) // additional time speedup keys in debug mode if( Global::ctrlState ) { // ctrl-f3 - GlobalTime->UpdateMTableTime( 20.0 * 60.0 ); + Simulation::Time.update( 20.0 * 60.0 ); } else if( Global::shiftState ) { // shift-f3 - GlobalTime->UpdateMTableTime( 5.0 * 60.0 ); + Simulation::Time.update( 5.0 * 60.0 ); } } if( ( false == Global::ctrlState ) @@ -762,20 +875,19 @@ bool TWorld::Update() if( (Global::iPause == false) || (m_init == false) ) { // jak pauza, to nie ma po co tego przeliczać - GlobalTime->UpdateMTableTime(Timer::GetDeltaTime()); // McZapkie-300302: czas rozkladowy // Ra 2014-07: przeliczenie kąta czasu (do animacji zależnych od czasu) - Global::fTimeAngleDeg = - GlobalTime->hh * 15.0 + GlobalTime->mm * 0.25 + GlobalTime->mr / 240.0; - Global::fClockAngleDeg[0] = 36.0 * (int(GlobalTime->mr) % 10); // jednostki sekund - Global::fClockAngleDeg[1] = 36.0 * (int(GlobalTime->mr) / 10); // dziesiątki sekund - Global::fClockAngleDeg[2] = 36.0 * (GlobalTime->mm % 10); // jednostki minut - Global::fClockAngleDeg[3] = 36.0 * (GlobalTime->mm / 10); // dziesiątki minut - Global::fClockAngleDeg[4] = 36.0 * (GlobalTime->hh % 10); // jednostki godzin - Global::fClockAngleDeg[5] = 36.0 * (GlobalTime->hh / 10); // dziesiątki godzin + Simulation::Time.update( Timer::GetDeltaTime() ); + auto const &time = Simulation::Time.data(); + Global::fTimeAngleDeg = time.wHour * 15.0 + time.wMinute * 0.25 + ( ( time.wSecond + 0.001 * time.wMilliseconds ) / 240.0 ); + Global::fClockAngleDeg[ 0 ] = 36.0 * ( time.wSecond % 10 ); // jednostki sekund + Global::fClockAngleDeg[ 1 ] = 36.0 * ( time.wSecond / 10 ); // dziesiątki sekund + Global::fClockAngleDeg[ 2 ] = 36.0 * ( time.wMinute % 10 ); // jednostki minut + Global::fClockAngleDeg[ 3 ] = 36.0 * ( time.wMinute / 10 ); // dziesiątki minut + Global::fClockAngleDeg[ 4 ] = 36.0 * ( time.wHour % 10 ); // jednostki godzin + Global::fClockAngleDeg[ 5 ] = 36.0 * ( time.wHour / 10 ); // dziesiątki godzin Update_Environment(); } // koniec działań niewykonywanych podczas pauzy - // poprzednie jakoś tam działało // fixed step, simulation time based updates @@ -1424,20 +1536,21 @@ TWorld::Render_Cab() { void TWorld::Update_UI() { - OutText1 = OutText2 = OutText3 = OutText4 = ""; UITable->text_lines.clear(); + std::string uitextline1, uitextline2, uitextline3, uitextline4; switch( Global::iTextMode ) { case( GLFW_KEY_F1 ) : { // f1, default mode: current time and timetable excerpt - OutText1 = + auto const &time = Simulation::Time.data(); + uitextline1 = "Time: " - + to_string( (int)GlobalTime->hh ) + ":" - + ( GlobalTime->mm < 10 ? "0" : "" ) + to_string( GlobalTime->mm ) + ":" - + ( GlobalTime->mr < 10 ? "0" : "" ) + to_string( std::floor( GlobalTime->mr ) ); + + to_string( time.wHour ) + ":" + + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" + + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); if( Global::iPause ) { - OutText1 += " (paused)"; + uitextline1 += " (paused)"; } if( Controlled && ( Controlled->Mechanik != nullptr ) ) { @@ -1445,21 +1558,21 @@ TWorld::Update_UI() { auto const &mover = Controlled->MoverParameters; auto const &driver = Controlled->Mechanik; - OutText2 = "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ); - if( mover->ActiveDir > 0 ) { OutText2 += " D"; } - else if( mover->ActiveDir < 0 ) { OutText2 += " R"; } - else { OutText2 += " N"; } + uitextline2 = "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ); + if( mover->ActiveDir > 0 ) { uitextline2 += " D"; } + else if( mover->ActiveDir < 0 ) { uitextline2 += " R"; } + else { uitextline2 += " N"; } - OutText3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + std::to_string( mover->LocalBrakePos ); + uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + std::to_string( mover->LocalBrakePos ); if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { // detail mode on second key press - OutText2 += + uitextline2 += " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" + " (limit: " + std::to_string( static_cast( std::floor( driver->VelDesired ) ) ) + " km/h" + ", next limit: " + std::to_string( static_cast( std::floor( Controlled->Mechanik->VelNext ) ) ) + " km/h" + " in " + to_string( Controlled->Mechanik->ActualProximityDist * 0.001, 1 ) + " km)"; - OutText3 += + uitextline3 += " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; } @@ -1481,21 +1594,22 @@ TWorld::Update_UI() { auto const table = tmp->Mechanik->Timetable(); if( table == nullptr ) { break; } - OutText1 = + auto const &time = Simulation::Time.data(); + uitextline1 = "Time: " - + to_string( (int)GlobalTime->hh ) + ":" - + ( GlobalTime->mm < 10 ? "0" : "" ) + to_string( GlobalTime->mm ) + ":" - + ( GlobalTime->mr < 10 ? "0" : "" ) + to_string( std::floor( GlobalTime->mr ) ); + + to_string( time.wHour ) + ":" + + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" + + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); if( Global::iPause ) { - OutText1 += " (paused)"; + uitextline1 += " (paused)"; } if( Controlled && Controlled->Mechanik ) { - OutText2 = Global::Bezogonkow( Controlled->Mechanik->Relation(), true ) + " (" + tmp->Mechanik->Timetable()->TrainName + ")"; - if( !OutText2.empty() ) { + uitextline2 = Global::Bezogonkow( Controlled->Mechanik->Relation(), true ) + " (" + tmp->Mechanik->Timetable()->TrainName + ")"; + if( !uitextline2.empty() ) { // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania - OutText3 = " -> " + Global::Bezogonkow( Controlled->Mechanik->NextStop(), true ); + uitextline3 = " -> " + Global::Bezogonkow( Controlled->Mechanik->NextStop(), true ); } } @@ -1554,69 +1668,69 @@ TWorld::Update_UI() { if( tmp != nullptr ) { // // jeśli domyślny ekran po pierwszym naciśnięciu - OutText1 = "Vehicle name: " + tmp->MoverParameters->Name; + uitextline1 = "Vehicle name: " + tmp->MoverParameters->Name; if( ( tmp->Mechanik == nullptr ) && ( tmp->ctOwner ) ) { // for cars other than leading unit indicate the leader - OutText1 += ", owned by " + tmp->ctOwner->OwnerName(); + uitextline1 += ", owned by " + tmp->ctOwner->OwnerName(); } // informacja o sprzęgach - OutText1 += + uitextline1 += " C0:" + ( tmp->PrevConnected ? tmp->PrevConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) : "none" ); - OutText1 += + uitextline1 += " C1:" + ( tmp->NextConnected ? tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) : "none" ); - OutText2 = "Damage status: " + tmp->MoverParameters->EngineDescription( 0 ); + uitextline2 = "Damage status: " + tmp->MoverParameters->EngineDescription( 0 ); - OutText2 += "; Brake delay: "; + uitextline2 += "; Brake delay: "; if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) - OutText2 += "G"; + uitextline2 += "G"; if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) - OutText2 += "P"; + uitextline2 += "P"; if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) - OutText2 += "R"; + uitextline2 += "R"; if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) - OutText2 += "+Mg"; + uitextline2 += "+Mg"; - OutText2 += ", BTP:" + to_string( tmp->MoverParameters->LoadFlag, 0 ); + uitextline2 += ", BTP:" + to_string( tmp->MoverParameters->LoadFlag, 0 ); { - OutText2 += + uitextline2 += "; pant. " + to_string( tmp->MoverParameters->PantPress, 2 ) + ( tmp->MoverParameters->bPantKurek3 ? "MoverParameters->LocalBrakePosA, 2 ) + "+" + to_string( tmp->MoverParameters->AnPos, 2 ); - OutText2 += + uitextline2 += ", Ft:" + to_string( tmp->MoverParameters->Ft * 0.001f, 0 ); - OutText2 += + uitextline2 += "; TC:" + to_string( tmp->MoverParameters->TotalCurrent, 0 ); - OutText2 += + uitextline2 += ", HV0:" + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 1 ], 0 ) + "@" + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 0 ], 0 ); - OutText2 += + uitextline2 += ", HV1:" + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 1 ], 0 ) + "@" + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 0 ], 0 ); - OutText3 = + uitextline3 = "BP: " + to_string( tmp->MoverParameters->BrakePress, 2 ) + " (" + to_string( tmp->MoverParameters->BrakeStatus, 0 ) + "), LBP: " + to_string( tmp->MoverParameters->LocBrakePress, 2 ) @@ -1630,16 +1744,16 @@ TWorld::Update_UI() { if( tmp->MoverParameters->ManualBrakePos > 0 ) { - OutText3 += ", manual brake on"; + uitextline3 += ", manual brake on"; } if( tmp->MoverParameters->LocalBrakePos > 0 ) { - OutText3 += ", local brake on"; + uitextline3 += ", local brake on"; } else { - OutText3 += ", local brake off"; + uitextline3 += ", local brake off"; } if( tmp->Mechanik ) { @@ -1649,9 +1763,9 @@ TWorld::Update_UI() { if( tmp->Mechanik->DrivigFlags() & j ) // jak bit ustawiony flags[ i + 1 ] = std::toupper( flags[ i + 1 ] ); // ^= 0x20; // to zmiana na wielką literę - OutText4 = flags; + uitextline4 = flags; - OutText4 += + uitextline4 += "Driver: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) + " ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) @@ -1663,14 +1777,14 @@ TWorld::Update_UI() { if( ( tmp->Mechanik->VelNext == 0.0 ) && ( tmp->Mechanik->eSignNext ) ) { // jeśli ma zapamiętany event semafora, nazwa eventu semafora - OutText4 += + uitextline4 += " (" + Global::Bezogonkow( tmp->Mechanik->eSignNext->asName ) + ")"; } // biezaca komenda dla AI - OutText4 += ", command: " + tmp->Mechanik->OrderCurrent(); + uitextline4 += ", command: " + tmp->Mechanik->OrderCurrent(); } if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { @@ -1691,7 +1805,7 @@ TWorld::Update_UI() { } else { // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika - OutText1 = + uitextline1 = "Camera position: " + to_string( Camera.Pos.x, 2 ) + " " + to_string( Camera.Pos.y, 2 ) + " " @@ -1702,8 +1816,8 @@ TWorld::Update_UI() { + std::string( "S SEE NEN NWW SW" ) .substr( 0 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); // current luminance level - OutText2 = "Light level: " + to_string( Global::fLuminance, 3 ); - if( Global::FakeLight ) { OutText2 += "(*)"; } + uitextline2 = "Light level: " + to_string( Global::fLuminance, 3 ); + if( Global::FakeLight ) { uitextline2 += "(*)"; } } break; @@ -1711,13 +1825,13 @@ TWorld::Update_UI() { case( GLFW_KEY_F8 ) : { - OutText1 = + uitextline1 = "Draw range x " + to_string( Global::fDistanceFactor, 1 ) + "; FPS: " + to_string( Timer::GetFPS(), 2 ); if( Global::iSlowMotion ) { - OutText1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; + uitextline1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; } - OutText1 += + uitextline1 += ", sectors: " + to_string( Ground.iRendered ) + "/" + to_string( Global::iSegmentsRendered ) + "; FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ); @@ -1727,12 +1841,12 @@ TWorld::Update_UI() { case( GLFW_KEY_F9 ) : { // informacja o wersji, sposobie wyświetlania i błędach OpenGL - OutText1 = Global::asVersion; // informacja o wersji + uitextline1 = Global::asVersion; // informacja o wersji if( Global::iMultiplayer ) { - OutText1 += " (multiplayer mode is active)"; + uitextline1 += " (multiplayer mode is active)"; } - OutText2 = + uitextline2 = std::string("Rendering mode: ") + ( Global::bUseVBO ? "VBO" : @@ -1746,7 +1860,7 @@ TWorld::Update_UI() { Global::LastGLError = to_string( glerror ) + " (" + Global::Bezogonkow( (char *)gluErrorString( glerror ) ) + ")"; } if( false == Global::LastGLError.empty() ) { - OutText3 = + uitextline3 = "Last openGL error: " + Global::LastGLError; } @@ -1756,16 +1870,16 @@ TWorld::Update_UI() { case( GLFW_KEY_F10 ) : { - OutText1 = ( "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]." ); + uitextline1 = ( "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]." ); break; } case( GLFW_KEY_F12 ) : { // opcje włączenia i wyłączenia logowania - OutText1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); - OutText2 = "[1] log.txt " + std::string( ( Global::iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); - OutText3 = "[2] Console " + std::string( ( Global::iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); + uitextline1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); + uitextline2 = "[1] log.txt " + std::string( ( Global::iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); + uitextline3 = "[2] Console " + std::string( ( Global::iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); break; } @@ -1783,7 +1897,7 @@ TWorld::Update_UI() { break; } - OutText1 = + uitextline1 = "vel: " + to_string(tmp->GetVelocity(), 2) + " km/h" + "; dist: " + to_string(tmp->MoverParameters->DistCounter, 2) + " km" + "; pos: (" @@ -1792,7 +1906,7 @@ TWorld::Update_UI() { + to_string( tmp->GetPosition().z, 2 ) + ")"; - OutText2 = + uitextline2 = "HamZ=" + to_string( tmp->MoverParameters->fBrakeCtrlPos, 1 ) + "; HamP=" + std::to_string( tmp->MoverParameters->LocalBrakePos ) + "/" + to_string( tmp->MoverParameters->LocalBrakePosA, 2 ) + "; NasJ=" + std::to_string( tmp->MoverParameters->MainCtrlPos ) + "(" + std::to_string( tmp->MoverParameters->MainCtrlActualPos ) + ")" @@ -1808,14 +1922,14 @@ TWorld::Update_UI() { to_string( tmp->MoverParameters->RunningShape.R, 1 ) ) + " An=" + to_string( tmp->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne - if( tprev != int( GlobalTime->mr ) ) { - tprev = GlobalTime->mr; + if( tprev != Simulation::Time.data().wSecond ) { + tprev = Simulation::Time.data().wSecond; Acc = ( tmp->MoverParameters->Vel - VelPrev ) / 3.6; VelPrev = tmp->MoverParameters->Vel; } - OutText2 += ( "; As=" ) + to_string( Acc, 2 ); // przyspieszenie wzdłużne + uitextline2 += ( "; As=" ) + to_string( Acc, 2 ); // przyspieszenie wzdłużne - OutText3 = + uitextline3 = "cyl.ham. " + to_string( tmp->MoverParameters->BrakePress, 2 ) + "; prz.gl. " + to_string( tmp->MoverParameters->PipePress, 2 ) + "; zb.gl. " + to_string( tmp->MoverParameters->CompressedVolume, 2 ) @@ -1824,49 +1938,49 @@ TWorld::Update_UI() { // McZapkie: warto wiedziec w jakim stanie sa przelaczniki if( tmp->MoverParameters->ConvOvldFlag ) - OutText3 += " C! "; + uitextline3 += " C! "; else if( tmp->MoverParameters->FuseFlag ) - OutText3 += " F! "; + uitextline3 += " F! "; else if( !tmp->MoverParameters->Mains ) - OutText3 += " () "; + uitextline3 += " () "; else { switch( tmp->MoverParameters->ActiveDir * ( tmp->MoverParameters->Imin == tmp->MoverParameters->IminLo ? 1 : 2 ) ) { - case 2: { OutText3 += " >> "; break; } - case 1: { OutText3 += " -> "; break; } - case 0: { OutText3 += " -- "; break; } - case -1: { OutText3 += " <- "; break; } - case -2: { OutText3 += " << "; break; } + case 2: { uitextline3 += " >> "; break; } + case 1: { uitextline3 += " -> "; break; } + case 0: { uitextline3 += " -- "; break; } + case -1: { uitextline3 += " <- "; break; } + case -2: { uitextline3 += " << "; break; } } } // McZapkie: predkosc szlakowa if( tmp->MoverParameters->RunningTrack.Velmax == -1 ) { - OutText3 += " Vtrack=Vmax"; + uitextline3 += " Vtrack=Vmax"; } else { - OutText3 += " Vtrack " + to_string( tmp->MoverParameters->RunningTrack.Velmax, 2 ); + uitextline3 += " Vtrack " + to_string( tmp->MoverParameters->RunningTrack.Velmax, 2 ); } if( ( tmp->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) || ( tmp->MoverParameters->TrainType == dt_EZT ) ) { - OutText3 += + uitextline3 += "; pant. " + to_string( tmp->MoverParameters->PantPress, 2 ) + ( tmp->MoverParameters->bPantKurek3 ? "=" : "^" ) + "ZG"; } // McZapkie: komenda i jej parametry if( tmp->MoverParameters->CommandIn.Command != ( "" ) ) { - OutText4 = + uitextline4 = "C:" + tmp->MoverParameters->CommandIn.Command + " V1=" + to_string( tmp->MoverParameters->CommandIn.Value1, 0 ) + " V2=" + to_string( tmp->MoverParameters->CommandIn.Value2, 0 ); } if( ( tmp->Mechanik ) && ( tmp->Mechanik->AIControllFlag == AIdriver ) ) { - OutText4 += + uitextline4 += "AI: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) + " ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) @@ -1906,7 +2020,7 @@ TWorld::Update_UI() { #ifdef EU07_USE_OLD_UI_CODE if( Controlled && DebugModeFlag && !Global::iTextMode ) { - OutText1 += + uitextline1 += ( "; d_omega " ) + to_string( Controlled->MoverParameters->dizel_engagedeltaomega, 3 ); if( Controlled->MoverParameters->EngineType == ElectricInductionMotor ) { @@ -1914,7 +2028,7 @@ TWorld::Update_UI() { for( int i = 0; i <= 8; i++ ) { for( int j = 0; j <= 9; j++ ) { glRasterPos2f( 0.05f + 0.03f * i, 0.16f - 0.01f * j ); - OutText4 = to_string( Train->fEIMParams[ i ][ j ], 2 ); + uitextline4 = to_string( Train->fEIMParams[ i ][ j ], 2 ); } } } @@ -1923,24 +2037,23 @@ TWorld::Update_UI() { // update the ui header texts auto &headerdata = UIHeader->text_lines; - headerdata[ 0 ].data = OutText1; - headerdata[ 1 ].data = OutText2; - headerdata[ 2 ].data = OutText3; - headerdata[ 3 ].data = OutText4; + headerdata[ 0 ].data = uitextline1; + headerdata[ 1 ].data = uitextline2; + headerdata[ 2 ].data = uitextline3; + headerdata[ 3 ].data = uitextline4; - { // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) - auto &transcripts = UITranscripts->text_lines; - transcripts.clear(); - for( auto const &transcript : Global::tranTexts.aLines ) { + // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) + auto &transcripts = UITranscripts->text_lines; + transcripts.clear(); + for( auto const &transcript : Global::tranTexts.aLines ) { - if( Global::fTimeAngleDeg >= transcript.fShow ) { + if( Global::fTimeAngleDeg >= transcript.fShow ) { - cParser parser( transcript.asText ); - while( true == parser.getTokens(1, false, "|") ) { + cParser parser( transcript.asText ); + while( true == parser.getTokens( 1, false, "|" ) ) { - std::string transcriptline; parser >> transcriptline; - transcripts.emplace_back( transcriptline, float4( 1.0f, 1.0f, 0.0f, 1.0f ) ); - } + std::string transcriptline; parser >> transcriptline; + transcripts.emplace_back( transcriptline, float4( 1.0f, 1.0f, 0.0f, 1.0f ) ); } } } @@ -2015,15 +2128,12 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) if (*pRozkaz->iPar & 1) // ustawienie czasu { double t = pRozkaz->fPar[1]; - GlobalTime->dd = floor(t); // niby nie powinno być dnia, ale... + Simulation::Time.data().wDay = std::floor(t); // niby nie powinno być dnia, ale... if (Global::fMoveLight >= 0) Global::fMoveLight = t; // trzeba by deklinację Słońca przeliczyć - GlobalTime->hh = floor(24 * t) - 24.0 * GlobalTime->dd; - GlobalTime->mm = - floor(60 * 24 * t) - 60.0 * (24.0 * GlobalTime->dd + GlobalTime->hh); - GlobalTime->mr = - floor(60 * 60 * 24 * t) - - 60.0 * (60.0 * (24.0 * GlobalTime->dd + GlobalTime->hh) + GlobalTime->mm); + Simulation::Time.data().wHour = std::floor(24 * t) - 24.0 * Simulation::Time.data().wDay; + Simulation::Time.data().wMinute = std::floor(60 * 24 * t) - 60.0 * (24.0 * Simulation::Time.data().wDay + Simulation::Time.data().wHour); + Simulation::Time.data().wSecond = std::floor( 60 * 60 * 24 * t ) - 60.0 * ( 60.0 * ( 24.0 * Simulation::Time.data().wDay + Simulation::Time.data().wHour ) + Simulation::Time.data().wMinute ); } if (*pRozkaz->iPar & 2) { // ustawienie flag zapauzowania @@ -2407,10 +2517,12 @@ world_environment::render() { // setup fog if( Global::fFogEnd > 0 ) { // fog setup - ::glFogi( GL_FOG_MODE, GL_LINEAR ); ::glFogfv( GL_FOG_COLOR, Global::FogColor ); +/* ::glFogf( GL_FOG_START, Global::fFogStart ); ::glFogf( GL_FOG_END, Global::fFogEnd ); +*/ + ::glFogf( GL_FOG_DENSITY, 1.0f / Global::fFogEnd ); ::glEnable( GL_FOG ); } else { ::glDisable( GL_FOG ); } diff --git a/World.h b/World.h index 119f62ad..880bc161 100644 --- a/World.h +++ b/World.h @@ -21,6 +21,43 @@ http://mozilla.org/MPL/2.0/. #include "mczapkie/mover.h" #include "renderer.h" +// wrapper for simulation time +class simulation_time { + +public: + simulation_time() { m_time.wHour = -1; m_time.wMinute = -1; } + void + init(); + void + update( double const Deltatime ); + SYSTEMTIME & + data() { return m_time; } + SYSTEMTIME const & + data() const { return m_time; } + double + second() const { return ( m_time.wMilliseconds * 0.001 + m_time.wSecond ); } + int + year_day() const { return m_yearday; } + +private: + // calculates day of year from given date + int + yearday( int Day, int const Month, int const Year ); + // calculates day and month from given day of year + void + daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ); + + SYSTEMTIME m_time; + int m_yearday; + char m_monthdaycounts[ 2 ][ 13 ]; +}; + +namespace Simulation { + +extern simulation_time Time; + +} + // wrapper for environment elements -- sky, sun, stars, clouds etc class world_environment { @@ -47,11 +84,19 @@ class TWorld void FollowView(bool wycisz = true); void DistantView( bool const Near = false ); - public: +public: +// types + +// constructors +TWorld(); + +// destructor +~TWorld(); + +// methods bool Init( GLFWwindow *w ); bool InitPerformed() { return m_init; } GLFWwindow *window; - GLvoid glPrint(std::string const &Text); void OnKeyDown(int cKey); void OnKeyUp(int cKey); // void UpdateWindow(); @@ -61,19 +106,14 @@ class TWorld void TrainDelete(TDynamicObject *d = NULL); // switches between static and dynamic daylight calculation void ToggleDaylight(); - TWorld(); - ~TWorld(); - // double Aspect; - private: - std::string OutText1; // teksty na ekranie - std::string OutText2; - std::string OutText3; - std::string OutText4; + +private: void Update_Environment(); void Update_Camera( const double Deltatime ); void Update_UI(); void ResourceSweep(); void Render_Cab(); + TCamera Camera; TGround Ground; world_environment Environment; @@ -94,6 +134,7 @@ class TWorld int tprev; // poprzedni czas double Acc; // przyspieszenie styczne bool m_init{ false }; // indicates whether initial update of the world was performed + public: void ModifyTGA(std::string const &dir = ""); void CreateE3D(std::string const &dir = "", bool dyn = false); diff --git a/mtable.cpp b/mtable.cpp index f7b0948c..ea9b2a6c 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -1,7 +1,3 @@ -/** @file - @brief -*/ - /* This Source Code Form is subject to the terms of the Mozilla Public License, v. @@ -15,9 +11,6 @@ http://mozilla.org/MPL/2.0/. #include "mtable.h" #include "mczapkie/mctools.h" -// using namespace Mtable; -std::shared_ptr Mtable::GlobalTime; - double CompareTime(double t1h, double t1m, double t2h, double t2m) /*roznica czasu w minutach*/ // zwraca różnicę czasu // jeśli pierwsza jest aktualna, a druga rozkładowa, to ujemna oznacza opóżnienie @@ -73,7 +66,12 @@ bool TTrainParameters::IsStop() return true; // na ostatnim się zatrzymać zawsze } -bool TTrainParameters::UpdateMTable(double hh, double mm, std::string NewName) +bool TTrainParameters::UpdateMTable( simulation_time const &Time, std::string const &NewName ) { + + return UpdateMTable( Time.data().wHour, Time.data().wMinute, NewName ); +} + +bool TTrainParameters::UpdateMTable(double hh, double mm, std::string const &NewName) /*odfajkowanie dojechania do stacji (NewName) i przeliczenie opóźnienia*/ { bool OK; @@ -138,13 +136,13 @@ std::string TTrainParameters::ShowRelation() return ""; } -TTrainParameters::TTrainParameters(std::string NewTrainName) +TTrainParameters::TTrainParameters(std::string const &NewTrainName) /*wstępne ustawienie parametrów rozkładu jazdy*/ { NewName(NewTrainName); } -void TTrainParameters::NewName(std::string NewTrainName) +void TTrainParameters::NewName(std::string const &NewTrainName) /*wstępne ustawienie parametrów rozkładu jazdy*/ { TrainName = NewTrainName; @@ -519,30 +517,29 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) void TMTableTime::UpdateMTableTime(double deltaT) // dodanie czasu (deltaT) w sekundach, z przeliczeniem godziny { - mr = mr + deltaT; // dodawanie sekund - while (mr > 60.0) // przeliczenie sekund do właściwego przedziału + mr += deltaT; // dodawanie sekund + while (mr >= 60.0) // przeliczenie sekund do właściwego przedziału { - mr = mr - 60.0; + mr -= 60.0; ++mm; } while (mm > 59) // przeliczenie minut do właściwego przedziału { - mm = mm - 60; + mm -= 60; ++hh; } while (hh > 23) // przeliczenie godzin do właściwego przedziału { - hh = hh - 24; + hh -= 24; ++dd; // zwiększenie numeru dnia } - GameTime = GameTime + deltaT; } bool TTrainParameters::DirectionChange() // sprawdzenie, czy po zatrzymaniu wykonać kolejne komendy { if ((StationIndex > 0) && (StationIndex < StationCount)) // dla ostatniej stacji nie - if (TimeTable[StationIndex].StationWare.find("@") != std::string::npos) + if (TimeTable[StationIndex].StationWare.find('@') != std::string::npos) return true; return false; } diff --git a/mtable.h b/mtable.h index 3bc10f3f..958a4864 100644 --- a/mtable.h +++ b/mtable.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include +#include "world.h" namespace Mtable { @@ -73,9 +74,10 @@ class TTrainParameters std::string NextStop(); bool IsStop(); bool IsTimeToGo(double hh, double mm); - bool UpdateMTable(double hh, double mm, std::string NewName); - TTrainParameters(std::string NewTrainName); - void NewName(std::string NewTrainName); + bool UpdateMTable(double hh, double mm, std::string const &NewName); + bool UpdateMTable( simulation_time const &Time, std::string const &NewName ); + TTrainParameters( std::string const &NewTrainName ); + void NewName(std::string const &NewTrainName); void UpdateVelocity(int StationCount, double vActual); bool LoadTTfile(std::string scnpath, int iPlus, double vmax); bool DirectionChange(); @@ -86,29 +88,19 @@ class TMTableTime { public: - double GameTime = 0.0; int dd = 0; int hh = 0; int mm = 0; - int srh = 0; - int srm = 0; /*wschod slonca*/ - int ssh = 0; - int ssm = 0; /*zachod slonca*/ double mr = 0.0; void UpdateMTableTime(double deltaT); - TMTableTime(int InitH, int InitM, int InitSRH, int InitSRM, int InitSSH, int InitSSM) : - hh( InitH ), - mm( InitM ), - srh( InitSRH ), - srm( InitSRM ), - ssh( InitSSH ), - ssm( InitSSM ) + TMTableTime(int InitH, int InitM ) : + hh( InitH ), + mm( InitM ) {} TMTableTime() = default; }; -extern std::shared_ptr GlobalTime; } #if !defined(NO_IMPLICIT_NAMESPACE_USE) diff --git a/renderer.cpp b/renderer.cpp index 5d09d62b..d056c5d2 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -75,6 +75,11 @@ opengl_renderer::Init( GLFWwindow *Window ) { glEnable( GL_COLOR_MATERIAL ); glColorMaterial( GL_FRONT, GL_AMBIENT_AND_DIFFUSE ); + +// ::glFogi( GL_FOG_COORD_SRC, GL_FOG_COORD ); +// ::glFogi( GL_FOG_COORD_SRC, GL_FRAGMENT_DEPTH ); +// ::glFogi( GL_FOG_MODE, GL_LINEAR ); + // setup lighting GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); diff --git a/sun.cpp b/sun.cpp index 6d671212..486eff37 100644 --- a/sun.cpp +++ b/sun.cpp @@ -4,6 +4,7 @@ #include "globals.h" #include "mtable.h" #include "usefull.h" +#include "world.h" ////////////////////////////////////////////////////////////////////////////////////////// // cSun -- class responsible for dynamic calculation of position and intensity of the Sun, @@ -114,8 +115,7 @@ void cSun::move() { static double radtodeg = 57.295779513; // converts from radians to degrees static double degtorad = 0.0174532925; // converts from degrees to radians - SYSTEMTIME localtime; // time for the calculation - time( &localtime ); + SYSTEMTIME localtime = Simulation::Time.data(); // time for the calculation if( m_observer.hour >= 0 ) { localtime.wHour = m_observer.hour; } if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } @@ -142,15 +142,11 @@ void cSun::move() { // orbit eccentricity double const e = 0.016709 - 1.151e-9 * daynumber; // mean anomaly - m_body.mnanom = 356.0470 + 0.9856002585 * daynumber; // M - m_body.mnanom -= 360.0 * (int)( m_body.mnanom / 360.0 ); // clamp the range to 0-360 - if( m_body.mnanom < 0.0 ) m_body.mnanom += 360.0; + m_body.mnanom = clamp_circular( 356.0470 + 0.9856002585 * daynumber ); // M // obliquity of the ecliptic m_body.oblecl = 23.4393 - 3.563e-7 * daynumber; // mean longitude - m_body.mnlong = m_body.phlong + m_body.mnanom; // L = w + M - m_body.mnlong -= 360.0 * (int)( m_body.mnlong / 360.0 ); // clamp the range to 0-360 - if( m_body.mnlong < 0.0 ) m_body.mnlong += 360.0; + m_body.mnlong = clamp_circular( m_body.phlong + m_body.mnanom ); // L = w + M // eccentric anomaly double const E = m_body.mnanom + radtodeg * e * std::sin( degtorad * m_body.mnanom ) * ( 1.0 + e * std::cos( degtorad * m_body.mnanom ) ); // ecliptic plane rectangular coordinates @@ -161,9 +157,7 @@ void cSun::move() { // true anomaly m_body.tranom = radtodeg * std::atan2( yv, xv ); // v // ecliptic longitude - m_body.eclong = m_body.tranom + m_body.phlong; // lon = v + w - m_body.eclong -= 360.0 * (int)( m_body.eclong / 360.0 ); - if( m_body.eclong < 0.0 ) m_body.eclong += 360.0; // clamp the range to 0-360 + m_body.eclong = clamp_circular( m_body.tranom + m_body.phlong ); // lon = v + w /* // ecliptic rectangular coordinates double const x = m_body.distance * std::cos( degtorad * m_body.eclong ); @@ -185,8 +179,7 @@ void cSun::move() { double top = std::cos( degtorad * m_body.oblecl ) * std::sin( degtorad * m_body.eclong ); double bottom = std::cos( degtorad * m_body.eclong ); - m_body.rascen = radtodeg * std::atan2( top, bottom ); - if( m_body.rascen < 0.0 ) m_body.rascen += 360.0; // (make it a positive angle) + m_body.rascen = clamp_circular( radtodeg * std::atan2( top, bottom ) ); // Greenwich mean sidereal time m_observer.gmst = 6.697375 + 0.0657098242 * daynumber + m_observer.utime; @@ -265,10 +258,9 @@ void cSun::irradiance() { static double degrad = 57.295779513; // converts from radians to degrees static double raddeg = 0.0174532925; // converts from degrees to radians - SYSTEMTIME localtime; // time for the calculation - time( &localtime ); + auto const &localtime = Simulation::Time.data(); // time for the calculation - m_body.dayang = ( yearday( localtime.wDay, localtime.wMonth, localtime.wYear ) - 1 ) * 360.0 / 365.0; + m_body.dayang = ( Simulation::Time.year_day() - 1 ) * 360.0 / 365.0; double sd = sin( raddeg * m_body.dayang ); // sine of the day angle double cd = cos( raddeg * m_body.dayang ); // cosine of the day angle or delination m_body.erv = 1.000110 + 0.034221*cd + 0.001280*sd; @@ -289,50 +281,3 @@ void cSun::irradiance() { m_body.etr = 0.0; } } - -int cSun::yearday( int Day, const int Month, const int Year ) { - - char daytab[ 2 ][ 13 ] = { - { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, - { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } - }; - int i, leap; - - leap = ( Year%4 == 0 ) && ( Year%100 != 0 ) || ( Year%400 == 0 ); - for( i = 1; i < Month; ++i ) - Day += daytab[ leap ][ i ]; - - return Day; -} - -void cSun::daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ) { - - WORD daytab[ 2 ][ 13 ] = { - { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, - { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } - }; - - int leap = ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ); - WORD idx = 1; - while( (idx < 13) && ( Yearday <= daytab[ leap ][ idx ] )) { - - ++idx; - } - Month = idx + 1; - Day = Yearday - daytab[ leap ][ idx ]; -} - -// obtains current time for calculations -void -cSun::time( SYSTEMTIME *Time ) { - - ::GetLocalTime( Time ); - // NOTE: we're currently using local time to determine day/month/year - if( Global::fMoveLight > 0.0 ) { - // TODO: enter scenario-defined day/month/year instead. - daymonth( Time->wDay, Time->wMonth, Time->wYear, static_cast(Global::fMoveLight) ); - } - Time->wHour = GlobalTime->hh; - Time->wMinute = GlobalTime->mm; - Time->wSecond = std::floor( GlobalTime->mr ); -} diff --git a/sun.h b/sun.h index 0834df73..aa659a21 100644 --- a/sun.h +++ b/sun.h @@ -54,12 +54,6 @@ protected: void refract(); // calculates light intensity at current moment void irradiance(); - // calculates day of year from given date - int yearday( int Day, int const Month, int const Year ); - // calculates day and month from given day of year - void daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ); - // obtains current time for calculations - void time( SYSTEMTIME *Time ); // members: GLUquadricObj *sunsphere; // temporary handler for sun positioning test diff --git a/usefull.h b/usefull.h index 7c7cb2b6..43e1683f 100644 --- a/usefull.h +++ b/usefull.h @@ -35,7 +35,8 @@ http://mozilla.org/MPL/2.0/. #define MAKE_ID4(a,b,c,d) (((std::uint32_t)(d)<<24)|((std::uint32_t)(c)<<16)|((std::uint32_t)(b)<<8)|(std::uint32_t)(a)) template -_Type clamp( _Type const Value, _Type const Min, _Type const Max ) { +_Type +clamp( _Type const Value, _Type const Min, _Type const Max ) { _Type value = Value; if( value < Min ) { value = Min; } @@ -43,8 +44,20 @@ _Type clamp( _Type const Value, _Type const Min, _Type const Max ) { return value; } +// keeps the provided value in specified range 0-Range, as if the range was circular buffer template -_Type interpolate( _Type const First, _Type const Second, float const Factor ) { +_Type +clamp_circular( _Type Value, _Type const Range = static_cast<_Type>(360) ) { + + Value -= Range * (int)( Value / Range ); // clamp the range to 0-360 + if( Value < 0.0 ) Value += Range; + + return Value; +} + +template +_Type +interpolate( _Type const First, _Type const Second, float const Factor ) { return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); } From f2cd420bbb9418bb0e160ccd37b9f494f55a82e3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 29 Mar 2017 16:36:23 +0200 Subject: [PATCH 077/426] moon phases, sun & moon billboards --- World.cpp | 75 ++++-------- World.h | 6 +- moon.cpp | 325 +++++++++++++++++++++++++++++++++++++++++++++++++++ moon.h | 106 +++++++++++++++++ renderer.cpp | 156 ++++++++++++++++++++----- renderer.h | 8 +- 6 files changed, 593 insertions(+), 83 deletions(-) create mode 100644 moon.cpp create mode 100644 moon.h diff --git a/World.cpp b/World.cpp index d4025696..45284264 100644 --- a/World.cpp +++ b/World.cpp @@ -158,6 +158,29 @@ simulation_time::daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Y Day = Yearday - daytab[ leap ][ idx - 1 ]; } +int +simulation_time::julian_day() const { + + int yy = ( m_time.wYear < 0 ? m_time.wYear + 1 : m_time.wYear ) - std::floor( ( 12 - m_time.wMonth ) / 10.f ); + int mm = m_time.wMonth + 9; + if( mm >= 12 ) { mm -= 12; } + + int K1 = std::floor( 365.25 * ( yy + 4712 ) ); + int K2 = std::floor( 30.6 * mm + 0.5 ); + + // for dates in Julian calendar + int JD = K1 + K2 + m_time.wDay + 59; + // for dates in Gregorian calendar; 2299160 is October 15th, 1582 + const int gregorianswitchday = 2299160; + if( JD > gregorianswitchday ) { + + int K3 = std::floor( std::floor( ( yy * 0.01 ) + 49 ) * 0.75 ) - 38; + JD -= K3; + } + + return JD; +} + TWorld::TWorld() { // randomize(); @@ -2503,58 +2526,6 @@ world_environment::update() { ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 1.0f ); // kolor nieba } -void -world_environment::render() { - - GfxRenderer.Bind( 0 ); - - ::glDisable( GL_LIGHTING ); - ::glDisable( GL_DEPTH_TEST ); - ::glDepthMask( GL_FALSE ); - ::glPushMatrix(); - ::glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); - - // setup fog - if( Global::fFogEnd > 0 ) { - // fog setup - ::glFogfv( GL_FOG_COLOR, Global::FogColor ); -/* - ::glFogf( GL_FOG_START, Global::fFogStart ); - ::glFogf( GL_FOG_END, Global::fFogEnd ); -*/ - ::glFogf( GL_FOG_DENSITY, 1.0f / Global::fFogEnd ); - ::glEnable( GL_FOG ); - } - else { ::glDisable( GL_FOG ); } - - m_skydome.Render(); - m_stars.render(); - float const duskfactor = 1.0f - clamp( std::abs(m_sun.getAngle()), 0.0f, 12.0f ) / 12.0f; - float3 suncolor = interpolate( - m_skydome.GetAverageColor(), - float3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), - duskfactor ) * m_skydome.GetAverageColor().z; - - m_clouds.Render( - interpolate( m_skydome.GetAverageColor(), suncolor, duskfactor * 0.65f ) -// m_skydome.GetAverageColor() - * ( 1.0f - Global::Overcast * 0.5f ) // overcast darkens the clouds - * 2.5f ); // arbitrary adjustment factor - - if( DebugModeFlag == true ) { - // mark sun position for easier debugging - m_sun.render(); - m_moon.render(); - } - Global::DayLight.apply_angle(); - Global::DayLight.apply_intensity(); - - ::glPopMatrix(); - ::glDepthMask( GL_TRUE ); - ::glEnable( GL_DEPTH_TEST ); - ::glEnable( GL_LIGHTING ); -} - void world_environment::time( int const Hour, int const Minute, int const Second ) { diff --git a/World.h b/World.h index 880bc161..4e415b3c 100644 --- a/World.h +++ b/World.h @@ -19,7 +19,6 @@ http://mozilla.org/MPL/2.0/. #include "stars.h" #include "skydome.h" #include "mczapkie/mover.h" -#include "renderer.h" // wrapper for simulation time class simulation_time { @@ -38,6 +37,8 @@ public: second() const { return ( m_time.wMilliseconds * 0.001 + m_time.wSecond ); } int year_day() const { return m_yearday; } + int + julian_day() const; private: // calculates day of year from given date @@ -61,10 +62,11 @@ extern simulation_time Time; // wrapper for environment elements -- sky, sun, stars, clouds etc class world_environment { + friend opengl_renderer; + public: void init(); void update(); - void render(); void time( int const Hour = -1, int const Minute = -1, int const Second = -1 ); private: diff --git a/moon.cpp b/moon.cpp new file mode 100644 index 00000000..bde6f764 --- /dev/null +++ b/moon.cpp @@ -0,0 +1,325 @@ + +#include "stdafx.h" +#include "moon.h" +#include "globals.h" +#include "mtable.h" +#include "usefull.h" +#include "world.h" + +////////////////////////////////////////////////////////////////////////////////////////// +// cSun -- class responsible for dynamic calculation of position and intensity of the Sun, + +cMoon::cMoon() { + + setLocation( 19.00f, 52.00f ); // default location roughly in centre of Poland + m_observer.press = 1013.0; // surface pressure, millibars + m_observer.temp = 15.0; // ambient dry-bulb temperature, degrees C + + TIME_ZONE_INFORMATION timezoneinfo; // TODO: timezone dependant on geographic location + ::GetTimeZoneInformation( &timezoneinfo ); + m_observer.timezone = -timezoneinfo.Bias / 60.0f; +} + +cMoon::~cMoon() { gluDeleteQuadric( moonsphere ); } + +void +cMoon::init() { + + moonsphere = gluNewQuadric(); + gluQuadricNormals( moonsphere, GLU_SMOOTH ); + // NOTE: we're calculating phase just once, because it's unlikely simulation will last a few days, + // plus a sudden texture change would be pretty jarring + phase(); +} + +void +cMoon::update() { + + move(); + Math3D::vector3 position( 0.0f, 0.0f, -2000.0f ); + position.RotateX( (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); + position.RotateY( (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); + + m_position = position; +} + +void +cMoon::render() { + + glColor4f( 225.0f/255.0f, 225.0f/255.0f, 255.0f/255.0f, 1.f ); + // debug line to locate the sun easier + Math3D::vector3 position = m_position; + glBegin( GL_LINES ); + glVertex3f( position.x, position.y, position.z ); + glVertex3f( position.x, 0.0f, position.z ); + glEnd(); + glPushMatrix(); + glTranslatef( position.x, position.y, position.z ); + gluSphere( moonsphere, /* (float)( Global::ScreenHeight / Global::FieldOfView ) * 0.5 * */ ( m_body.distance / 60.2666 ) * 9.037461, 12, 12 ); + glPopMatrix(); +} + +Math3D::vector3 +cMoon::getDirection() { + + Math3D::vector3 position( 0.f, 0.f, -1.f ); + position.RotateX( (float)( m_body.elevref * (M_PI/180.0)) ); + position.RotateY( (float)( -m_body.hrang * (M_PI/180.0)) ); + position.Normalize(); + return position; +} + +float +cMoon::getAngle() const { + + return (float)m_body.elevref; +} + +float cMoon::getIntensity() { + + irradiance(); + // NOTE: we don't have irradiance model for the moon so we cheat here + // calculating intensity of the sun instead, and returning 15% of the value, + // which roughly matches how much sunlight is reflected by the moon + // We alter the intensity further based on current phase of the moon + auto const phasefactor = 1.0f - std::abs( m_phase - 29.53f * 0.5f ) / ( 29.53 * 0.5f ); + return (float)( m_body.etr/ 1399.0 ) * phasefactor * 0.15f; // arbitrary scaling factor taken from etrn value +} + +void cMoon::setLocation( float const Longitude, float const Latitude ) { + + // convert fraction from geographical base of 6o minutes + m_observer.longitude = (int)Longitude + (Longitude - (int)(Longitude)) * 100.0 / 60.0; + m_observer.latitude = (int)Latitude + (Latitude - (int)(Latitude)) * 100.0 / 60.0 ; +} + +// sets current time, overriding one acquired from the system clock +void cMoon::setTime( int const Hour, int const Minute, int const Second ) { + + m_observer.hour = clamp( Hour, -1, 23 ); + m_observer.minute = clamp( Minute, -1, 59 ); + m_observer.second = clamp( Second, -1, 59 ); +} + +void cMoon::setTemperature( float const Temperature ) { + + m_observer.temp = Temperature; +} + +void cMoon::setPressure( float const Pressure ) { + + m_observer.press = Pressure; +} + +void cMoon::move() { + + static double radtodeg = 57.295779513; // converts from radians to degrees + static double degtorad = 0.0174532925; // converts from degrees to radians + + SYSTEMTIME localtime = Simulation::Time.data(); // time for the calculation + + if( m_observer.hour >= 0 ) { localtime.wHour = m_observer.hour; } + if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } + if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } + + double ut = localtime.wHour + + localtime.wMinute / 60.0 // too low resolution, noticeable skips + + localtime.wSecond / 3600.0; // good enough in normal circumstances + /* + + localtime.wMilliseconds / 3600000.0; // for really smooth movement + */ + double daynumber = 367 * localtime.wYear + - 7 * ( localtime.wYear + ( localtime.wMonth + 9 ) / 12 ) / 4 + + 275 * localtime.wMonth / 9 + + localtime.wDay + - 730530 + + ( ut / 24.0 ); + + // Universal Coordinated (Greenwich standard) time + m_observer.utime = ut * 3600.0; + m_observer.utime = m_observer.utime / 3600.0 - m_observer.timezone; + + // obliquity of the ecliptic + m_body.oblecl = clamp_circular( 23.4393 - 3.563e-7 * daynumber ); + // moon parameters + double longascnode = clamp_circular( 125.1228 - 0.0529538083 * daynumber ); // N, degrees + double const inclination = 5.1454; // i, degrees + double const mndistance = 60.2666; // a, in earth radii + // argument of perigee + double const perigeearg = clamp_circular( 318.0634 + 0.1643573223 * daynumber ); // w, degrees + // mean anomaly + m_body.mnanom = clamp_circular( 115.3654 + 13.0649929509 * daynumber ); // M, degrees + // eccentricity + double const e = 0.054900; + // eccentric anomaly + double E0 = m_body.mnanom + radtodeg * e * std::sin( degtorad * m_body.mnanom ) * ( 1.0 + e * std::cos( degtorad * m_body.mnanom ) ); + double E1 = E0 - ( E0 - radtodeg * e * std::sin( degtorad * E0 ) - m_body.mnanom ) / ( 1.0 - e * std::cos( degtorad * E0 ) ); + while( std::abs( E0 - E1 ) > 0.005 ) { // arbitrary precision tolerance threshold + E0 = E1; + E1 = E0 - ( E0 - radtodeg * e * std::sin( degtorad * E0 ) - m_body.mnanom ) / ( 1.0 - e * std::cos( degtorad * E0 ) ); + } + double const E = E1; + // lunar orbit plane rectangular coordinates + double const xv = mndistance * ( std::cos( degtorad * E ) - e ); + double const yv = mndistance * std::sin( degtorad * E ) * std::sqrt( 1.0 - e*e ); + // distance + m_body.distance = std::sqrt( xv*xv + yv*yv ); // r + // true anomaly + m_body.tranom = clamp_circular( radtodeg * std::atan2( yv, xv ) ); // v + // ecliptic rectangular coordinates + double const vpluswinrad = degtorad * ( m_body.tranom + perigeearg ); + double const xeclip = m_body.distance * ( std::cos( degtorad * longascnode ) * std::cos( vpluswinrad ) - std::sin( degtorad * longascnode ) * std::sin( vpluswinrad ) * std::cos( degtorad * inclination ) ); + double const yeclip = m_body.distance * ( std::sin( degtorad * longascnode ) * std::cos( vpluswinrad ) + std::cos( degtorad * longascnode ) * std::sin( vpluswinrad ) * std::cos( degtorad * inclination ) ); + double const zeclip = m_body.distance * std::sin( vpluswinrad ) * std::sin( degtorad * inclination ); + // ecliptic coordinates + double ecliplat = radtodeg * std::atan2( zeclip, std::sqrt( xeclip*xeclip + yeclip*yeclip ) ); + m_body.eclong = clamp_circular( radtodeg * std::atan2( yeclip, xeclip ) ); + // distance + m_body.distance = std::sqrt( xeclip*xeclip + yeclip*yeclip + zeclip*zeclip ); + // perturbations + // NOTE: perturbation calculation can be safely disabled if we don't mind error of 1-2 degrees + // Sun's mean anomaly: Ms (already computed) + double const sunmnanom = clamp_circular( 356.0470 + 0.9856002585 * daynumber ); // M + // Sun's mean longitude: Ls (already computed) + double const sunphlong = clamp_circular( 282.9404 + 4.70935e-5 * daynumber ); + double const sunmnlong = clamp_circular( sunphlong + sunmnanom ); // L = w + M + // Moon's mean anomaly: Mm (already computed) + // Moon's mean longitude: Lm = N + w + M (for the Moon) + m_body.mnlong = clamp_circular( longascnode + perigeearg + m_body.mnanom ); + // Moon's mean elongation: D = Lm - Ls + double const mnelong = clamp_circular( m_body.mnlong - sunmnlong ); + // Moon's argument of latitude: F = Lm - N + double const arglat = clamp_circular( m_body.mnlong - longascnode ); + // longitude perturbations + double const pertevection = -1.274 * std::sin( degtorad * ( m_body.mnanom - 2.0 * mnelong ) ); // Evection + double const pertvariation = +0.658 * std::sin( degtorad * ( 2.0 * mnelong ) ); // Variation + double const pertyearlyeqt = -0.186 * std::sin( degtorad * sunmnanom ); // Yearly equation + // latitude perturbations + double const pertlat = -0.173 * std::sin( degtorad * ( arglat - 2.0 * mnelong ) ); + + m_body.eclong += pertevection + pertvariation + pertyearlyeqt; + ecliplat += pertlat; + // declination + m_body.declin = radtodeg * std::asin( std::sin (m_body.oblecl * degtorad) * std::sin(m_body.eclong * degtorad) ); + + // right ascension + double top = std::cos( degtorad * m_body.oblecl ) * std::sin( degtorad * m_body.eclong ); + double bottom = std::cos( degtorad * m_body.eclong ); + m_body.rascen = clamp_circular( radtodeg * std::atan2( top, bottom ) ); + + // Greenwich mean sidereal time + m_observer.gmst = 6.697375 + 0.0657098242 * daynumber + m_observer.utime; + + m_observer.gmst -= 24.0 * (int)( m_observer.gmst / 24.0 ); + if( m_observer.gmst < 0.0 ) m_observer.gmst += 24.0; + + // local mean sidereal time + m_observer.lmst = m_observer.gmst * 15.0 + m_observer.longitude; + + m_observer.lmst -= 360.0 * (int)( m_observer.lmst / 360.0 ); + if( m_observer.lmst < 0.0 ) m_observer.lmst += 360.0; + + // hour angle + m_body.hrang = m_observer.lmst - m_body.rascen; + + if( m_body.hrang < -180.0 ) m_body.hrang += 360.0; // (force it between -180 and 180 degrees) + else if( m_body.hrang > 180.0 ) m_body.hrang -= 360.0; + + double cz; // cosine of the solar zenith angle + + double tdatcd = std::cos( degtorad * m_body.declin ); + double tdatch = std::cos( degtorad * m_body.hrang ); + double tdatcl = std::cos( degtorad * m_observer.latitude ); + double tdatsd = std::sin( degtorad * m_body.declin ); + double tdatsl = std::sin( degtorad * m_observer.latitude ); + + cz = tdatsd * tdatsl + tdatcd * tdatcl * tdatch; + + // (watch out for the roundoff errors) + if( fabs (cz) > 1.0 ) { cz >= 0.0 ? cz = 1.0 : cz = -1.0; } + + m_body.zenetr = std::acos( cz ) * radtodeg; + m_body.elevetr = 90.0 - m_body.zenetr; + refract(); +} + +void cMoon::refract() { + + static double degtorad = 0.0174532925; // converts from degrees to radians + + double prestemp; // temporary pressure/temperature correction + double refcor; // temporary refraction correction + double tanelev; // tangent of the solar elevation angle + + // if the sun is near zenith, the algorithm bombs; refraction near 0. + if( m_body.elevetr > 85.0 ) + refcor = 0.0; + else { + + tanelev = tan( degtorad * m_body.elevetr ); + if( m_body.elevetr >= 5.0 ) + refcor = 58.1 / tanelev + - 0.07 / pow( tanelev, 3 ) + + 0.000086 / pow( tanelev, 5 ); + else if( m_body.elevetr >= -0.575 ) + refcor = 1735.0 + + m_body.elevetr * ( -518.2 + m_body.elevetr * + ( 103.4 + m_body.elevetr * ( -12.79 + m_body.elevetr * 0.711 ) ) ); + else + refcor = -20.774 / tanelev; + + prestemp = ( m_observer.press * 283.0 ) / ( 1013.0 * ( 273.0 + m_observer.temp ) ); + refcor *= prestemp / 3600.0; + } + + // refracted solar elevation angle + m_body.elevref = m_body.elevetr + refcor; + + // refracted solar zenith angle + m_body.zenref = 90.0 - m_body.elevref; +} + +void cMoon::irradiance() { + + static double radtodeg = 57.295779513; // converts from radians to degrees + static double degtorad = 0.0174532925; // converts from degrees to radians + + m_body.dayang = ( Simulation::Time.year_day() - 1 ) * 360.0 / 365.0; + double sd = sin( degtorad * m_body.dayang ); // sine of the day angle + double cd = cos( degtorad * m_body.dayang ); // cosine of the day angle or delination + m_body.erv = 1.000110 + 0.034221*cd + 0.001280*sd; + double d2 = 2.0 * m_body.dayang; + double c2 = cos( degtorad * d2 ); + double s2 = sin( degtorad * d2 ); + m_body.erv += 0.000719*c2 + 0.000077*s2; + + double solcon = 1367.0; // Solar constant, 1367 W/sq m + + m_body.coszen = cos( degtorad * m_body.zenref ); + if( m_body.coszen > 0.0 ) { + m_body.etrn = solcon * m_body.erv; + m_body.etr = m_body.etrn * m_body.coszen; + } + else { + m_body.etrn = 0.0; + m_body.etr = 0.0; + } +} + +void +cMoon::phase() { + + // calculate moon's age in days from new moon + float ip = normalize( ( Simulation::Time.julian_day() - 2451550.1f ) / 29.530588853f ); + m_phase = ip * 29.53f; +} + +// normalize values to range 0...1 +float +cMoon::normalize( const float Value ) const { + + float value = Value - floor( Value ); + if( value < 0.f ) { ++value; } + + return value; +} diff --git a/moon.h b/moon.h new file mode 100644 index 00000000..baa7030c --- /dev/null +++ b/moon.h @@ -0,0 +1,106 @@ +#pragma once + +#include "windows.h" +#include "GL/glew.h" +#include "GL/wglew.h" +#include "dumb3d.h" + + +// TODO: sun and moon share code as celestial bodies, we could make a base class out of it + +class cMoon { + +public: +// types: + +// methods: + void init(); + void update(); + void render(); + // returns location of the sun in the 3d scene + Math3D::vector3 getPosition() { return m_position; } + // returns vector pointing at the sun + Math3D::vector3 getDirection(); + // returns current elevation above horizon + float getAngle() const; + // returns current intensity of the sun + float getIntensity(); + // returns current phase of the moon + float getPhase() const { return m_phase; } + // sets current time, overriding one acquired from the system clock + void setTime( int const Hour, int const Minute, int const Second ); + // sets current geographic location + void setLocation( float const Longitude, float const Latitude ); + // sets ambient temperature in degrees C. + void setTemperature( float const Temperature ); + // sets surface pressure in milibars + void setPressure( float const Pressure ); + +// constructors: + cMoon(); + +// deconstructor: + ~cMoon(); + +// members: + +protected: +// types: + +// methods: + // calculates sun position on the sky given specified time and location + void move(); + // calculates position adjustment due to refraction + void refract(); + // calculates light intensity at current moment + void irradiance(); + void phase(); + // helper, normalize values to range 0...1 + float normalize( const float Value ) const; + +// members: + GLUquadricObj *moonsphere; // temporary handler for moon positioning test + + struct celestialbody { // main planet parameters + + double dayang; // day angle (daynum*360/year-length) degrees + double phlong; // longitude of perihelion + double mnlong; // mean longitude, degrees + double mnanom; // mean anomaly, degrees + double tranom; // true anomaly, degrees + double eclong; // ecliptic longitude, degrees. + double oblecl; // obliquity of ecliptic. + double declin; // declination--zenith angle of solar noon at equator, degrees NORTH. + double rascen; // right ascension, degrees + double hrang; // hour angle--hour of sun from solar noon, degrees WEST + double zenetr; // solar zenith angle, no atmospheric correction (= ETR) + double zenref; // solar zenith angle, deg. from zenith, refracted + double coszen; // cosine of refraction corrected solar zenith angle + double elevetr; // solar elevation, no atmospheric correction (= ETR) + double elevref; // solar elevation angle, deg. from horizon, refracted. + double distance; // distance from earth in AUs + double erv; // earth radius vector (multiplied to solar constant) + double etr; // extraterrestrial (top-of-atmosphere) W/sq m global horizontal solar irradiance + double etrn; // extraterrestrial (top-of-atmosphere) W/sq m direct normal solar irradiance + }; + + struct observer { // weather, time and position data in observer's location + + double latitude; // latitude, degrees north (south negative) + double longitude; // longitude, degrees east (west negative) + int hour{ -1 }; // current time, used for calculation of utime. if set to -1, time for + int minute{ -1 };// calculation will be obtained from the local clock + int second{ -1 }; + double utime; // universal (Greenwich) standard time + double timezone; // time zone, east (west negative). USA: Mountain = -7, Central = -6, etc. + double gmst; // Greenwich mean sidereal time, hours + double lmst; // local mean sidereal time, degrees + double temp; // ambient dry-bulb temperature, degrees C, used for refraction correction + double press; // surface pressure, millibars, used for refraction correction and ampress + }; + + celestialbody m_body; + observer m_observer; + Math3D::vector3 m_position; + float m_phase; +}; diff --git a/renderer.cpp b/renderer.cpp index d056c5d2..8b069c7d 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -75,11 +75,6 @@ opengl_renderer::Init( GLFWwindow *Window ) { glEnable( GL_COLOR_MATERIAL ); glColorMaterial( GL_FRONT, GL_AMBIENT_AND_DIFFUSE ); - -// ::glFogi( GL_FOG_COORD_SRC, GL_FOG_COORD ); -// ::glFogi( GL_FOG_COORD_SRC, GL_FRAGMENT_DEPTH ); -// ::glFogi( GL_FOG_MODE, GL_LINEAR ); - // setup lighting GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); @@ -113,6 +108,8 @@ opengl_renderer::Init( GLFWwindow *Window ) { // preload some common textures WriteLog( "Loading common gfx data..." ); m_glaretextureid = GetTextureId( "fx\\lightglare", szTexturePath ); + m_suntextureid = GetTextureId( "fx\\sun", szTexturePath ); + m_moontextureid = GetTextureId( "fx\\moon", szTexturePath ); WriteLog( "...gfx data pre-loading done" ); return true; @@ -132,32 +129,16 @@ opengl_renderer::Render() { std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), 0.1f * Global::ZoomFactor, m_drawrange * Global::fDistanceFactor ); -/* - glm::mat4 projection = glm::perspective( - Global::FieldOfView / Global::ZoomFactor * 0.0174532925f, - std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), - 0.1f * Global::ZoomFactor, - m_drawrange * Global::fDistanceFactor ); - ::glLoadMatrixf( &projection[0][0] ); -*/ + ::glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix ::glLoadIdentity(); if( World.InitPerformed() ) { -/* - glm::mat4 modelview( 1.0f ); - World.Camera.SetMatrix( modelview ); - ::glLoadMatrixf( &modelview[ 0 ][ 0 ] ); - m_camera.update_frustum( projection, modelview ); -*/ + World.Camera.SetMatrix(); m_camera.update_frustum(); - if( !Global::bWireFrame ) { - // bez nieba w trybie rysowania linii - World.Environment.render(); - } - + Render( &World.Environment ); World.Ground.Render( World.Camera.Pos ); World.Render_Cab(); @@ -172,7 +153,131 @@ opengl_renderer::Render() { return true; // for now always succeed } -#ifndef EU07_USE_OLD_RENDERCODE +bool +opengl_renderer::Render( world_environment *Environment ) { + + if( Global::bWireFrame ) { + // bez nieba w trybie rysowania linii + return false; + } + + Bind( 0 ); + + ::glDisable( GL_LIGHTING ); + ::glDisable( GL_DEPTH_TEST ); + ::glDepthMask( GL_FALSE ); + ::glPushMatrix(); + ::glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); + + // setup fog + if( Global::fFogEnd > 0 ) { + // fog setup + ::glFogfv( GL_FOG_COLOR, Global::FogColor ); + ::glFogf( GL_FOG_DENSITY, 1.0f / Global::fFogEnd ); + ::glEnable( GL_FOG ); + } + else { ::glDisable( GL_FOG ); } + + Environment->m_skydome.Render(); + Environment->m_stars.render(); + + float const duskfactor = 1.0f - clamp( std::abs( Environment->m_sun.getAngle() ), 0.0f, 12.0f ) / 12.0f; + float3 suncolor = interpolate( + float3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), + float3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), + duskfactor ); + + if( DebugModeFlag == true ) { + // mark sun position for easier debugging + Environment->m_sun.render(); + Environment->m_moon.render(); + } + // render actual sun and moon + ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); + + ::glDisable( GL_LIGHTING ); + ::glDisable( GL_ALPHA_TEST ); + ::glEnable( GL_BLEND ); + ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); + + auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); + // sun + { + Bind( m_suntextureid ); + ::glColor4f( suncolor.x, suncolor.y, suncolor.z, 1.0f ); + auto const sunvector = Environment->m_sun.getDirection(); + auto const sunposition = modelview * glm::vec4( sunvector.x, sunvector.y, sunvector.z, 1.0f ); + + ::glPushMatrix(); + ::glLoadIdentity(); // macierz jedynkowa + ::glTranslatef( sunposition.x, sunposition.y, sunposition.z ); // początek układu zostaje bez zmian + + float const size = 0.045f; + ::glBegin( GL_TRIANGLE_STRIP ); + ::glTexCoord2f( 1.0f, 1.0f ); ::glVertex3f( -size, size, 0.0f ); + ::glTexCoord2f( 1.0f, 0.0f ); ::glVertex3f( -size, -size, 0.0f ); + ::glTexCoord2f( 0.0f, 1.0f ); ::glVertex3f( size, size, 0.0f ); + ::glTexCoord2f( 0.0f, 0.0f ); ::glVertex3f( size, -size, 0.0f ); + ::glEnd(); + + ::glPopMatrix(); + } + // moon + { + Bind( m_moontextureid ); + float3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); + ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, 1.0f - Global::fLuminance * 0.5f ); + + auto const moonvector = Environment->m_moon.getDirection(); + auto const moonposition = modelview * glm::vec4( moonvector.x, moonvector.y, moonvector.z, 1.0f ); + ::glPushMatrix(); + ::glLoadIdentity(); // macierz jedynkowa + ::glTranslatef( moonposition.x, moonposition.y, moonposition.z ); + + float const size = 0.025f; // TODO: expose distance/scale factor from the moon object + // choose the moon appearance variant, based on current moon phase + // NOTE: implementation specific, 8 variants are laid out in 3x3 arrangement + // from new moon onwards, top left to right bottom (last spot is left for future use, if any) + auto const moonphase = Environment->m_moon.getPhase(); + float moonu, moonv; + if( moonphase < 1.84566f ) { moonv = 1.0f - 0.0f; moonu = 0.0f; } + else if( moonphase < 5.53699f ) { moonv = 1.0f - 0.0f; moonu = 0.333f; } + else if( moonphase < 9.22831f ) { moonv = 1.0f - 0.0f; moonu = 0.667f; } + else if( moonphase < 12.91963f ) { moonv = 1.0f - 0.333f; moonu = 0.0f; } + else if( moonphase < 16.61096f ) { moonv = 1.0f - 0.333f; moonu = 0.333f; } + else if( moonphase < 20.30228f ) { moonv = 1.0f - 0.333f; moonu = 0.667f; } + else if( moonphase < 23.99361f ) { moonv = 1.0f - 0.667f; moonu = 0.0f; } + else if( moonphase < 27.68493f ) { moonv = 1.0f - 0.667f; moonu = 0.333f; } + else { moonv = 1.0f - 0.0f; moonu = 0.0f; } + + ::glBegin( GL_TRIANGLE_STRIP ); + ::glTexCoord2f( moonu, moonv ); ::glVertex3f( -size, size, 0.0f ); + ::glTexCoord2f( moonu, moonv - 0.333f ); ::glVertex3f( -size, -size, 0.0f ); + ::glTexCoord2f( moonu + 0.333f, moonv ); ::glVertex3f( size, size, 0.0f ); + ::glTexCoord2f( moonu + 0.333f, moonv - 0.333f ); ::glVertex3f( size, -size, 0.0f ); + ::glEnd(); + + ::glPopMatrix(); + } + ::glPopAttrib(); + + // clouds + Environment->m_clouds.Render( + interpolate( Environment->m_skydome.GetAverageColor(), suncolor, duskfactor * 0.25f ) + * ( 1.0f - Global::Overcast * 0.5f ) // overcast darkens the clouds + * 2.5f ); // arbitrary adjustment factor + + Global::DayLight.apply_angle(); + Global::DayLight.apply_intensity(); + + ::glPopMatrix(); + ::glDepthMask( GL_TRUE ); + ::glEnable( GL_DEPTH_TEST ); + ::glEnable( GL_LIGHTING ); + + return true; +} + bool opengl_renderer::Render( TGround *Ground ) { @@ -745,7 +850,6 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { if( Submodel->iAlpha & Submodel->iFlags & 0x2F000000 ) Render_Alpha( Submodel->Next ); }; -#endif void opengl_renderer::Update ( double const Deltatime ) { diff --git a/renderer.h b/renderer.h index 1cc76d0c..2ac84e34 100644 --- a/renderer.h +++ b/renderer.h @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "lightarray.h" #include "dumb3d.h" #include "frustum.h" -#include "ground.h" +#include "world.h" struct opengl_light { @@ -116,7 +116,8 @@ public: // main draw call. returns false on error bool Render(); -#ifndef EU07_USE_OLD_RENDERCODE + bool + Render( world_environment *Environment ); bool Render( TGround *Ground ); bool @@ -135,7 +136,6 @@ public: Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); void Render_Alpha( TSubModel *Submodel ); -#endif // maintenance jobs void Update( double const Deltatime); @@ -194,6 +194,8 @@ private: std::string m_debuginfo; GLFWwindow *m_window{ nullptr }; texture_manager::size_type m_glaretextureid{ -1 }; + texture_manager::size_type m_suntextureid{ -1 }; + texture_manager::size_type m_moontextureid{ -1 }; }; extern opengl_renderer GfxRenderer; From 96b01c6205e7830a356fbf2a82bf27ced8ba8eeb Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 31 Mar 2017 00:56:33 +0200 Subject: [PATCH 078/426] key logging --- World.cpp | 64 +++++++++++++++++++++++++++++++++++++++++++--------- World.h | 2 +- moon.cpp | 2 +- renderer.cpp | 2 +- sun.cpp | 2 +- 5 files changed, 57 insertions(+), 15 deletions(-) diff --git a/World.cpp b/World.cpp index 45284264..421acbc8 100644 --- a/World.cpp +++ b/World.cpp @@ -59,8 +59,8 @@ simulation_time::init() { ::memcpy( m_monthdaycounts, monthdaycounts, sizeof( monthdaycounts ) ); // cache requested elements, if any - auto const requestedhour = m_time.wHour; - auto const requestedminute = m_time.wMinute; + WORD const requestedhour = m_time.wHour; + WORD const requestedminute = m_time.wMinute; ::GetLocalTime( &m_time ); @@ -69,10 +69,10 @@ simulation_time::init() { daymonth( m_time.wDay, m_time.wMonth, m_time.wYear, static_cast( Global::fMoveLight ) ); } - if( requestedhour != -1 ) { m_time.wHour = clamp( requestedhour, static_cast( 0 ), static_cast( 23 ) ); } - if( requestedminute != -1 ) { m_time.wMinute = clamp( requestedminute, static_cast( 0 ), static_cast( 59 ) ); } + if( requestedhour != (WORD)-1 ) { m_time.wHour = clamp( requestedhour, static_cast( 0 ), static_cast( 23 ) ); } + if( requestedminute != (WORD)-1 ) { m_time.wMinute = clamp( requestedminute, static_cast( 0 ), static_cast( 59 ) ); } // if the time is taken from the local clock leave the seconds intact, otherwise set them to zero - if( ( requestedhour != -1 ) || ( requestedminute != -1 ) ) { + if( ( requestedhour != (WORD)-1 ) || ( requestedminute != (WORD)-1 ) ) { m_time.wSecond = 0; } @@ -402,12 +402,54 @@ bool TWorld::Init( GLFWwindow *Window ) { }; void TWorld::OnKeyDown(int cKey) -{ //(cKey) to kod klawisza, cyfrowe i literowe się zgadzają - // Ra 2014-09: tu by można dodać tabelę konwersji: 256 wirtualnych kodów w kontekście dwóch - // przełączników [Shift] i [Ctrl] - // na każdy kod wirtualny niech przypadają 4 bajty: 2 dla naciśnięcia i 2 dla zwolnienia - // powtórzone 256 razy da 1kB na każdy stan przełączników, łącznie będzie 4kB pierwszej tabeli - // przekodowania +{ + // dump keypress info in the log + if( !Global::iPause ) { + // podczas pauzy klawisze nie działają + std::string keyinfo; + auto keyname = glfwGetKeyName( cKey, 0 ); + if( keyname != nullptr ) { + keyinfo += std::string( keyname ); + } + else { + switch( cKey ) { + + case GLFW_KEY_SPACE: { keyinfo += "Space"; break; } + case GLFW_KEY_ENTER: { keyinfo += "Enter"; break; } + case GLFW_KEY_ESCAPE: { keyinfo += "Esc"; break; } + case GLFW_KEY_TAB: { keyinfo += "Tab"; break; } + case GLFW_KEY_INSERT: { keyinfo += "Insert"; break; } + case GLFW_KEY_DELETE: { keyinfo += "Delete"; break; } + case GLFW_KEY_HOME: { keyinfo += "Home"; break; } + case GLFW_KEY_END: { keyinfo += "End"; break; } + case GLFW_KEY_F1: { keyinfo += "F1"; break; } + case GLFW_KEY_F2: { keyinfo += "F2"; break; } + case GLFW_KEY_F3: { keyinfo += "F3"; break; } + case GLFW_KEY_F4: { keyinfo += "F4"; break; } + case GLFW_KEY_F5: { keyinfo += "F5"; break; } + case GLFW_KEY_F6: { keyinfo += "F6"; break; } + case GLFW_KEY_F7: { keyinfo += "F7"; break; } + case GLFW_KEY_F8: { keyinfo += "F8"; break; } + case GLFW_KEY_F9: { keyinfo += "F9"; break; } + case GLFW_KEY_F10: { keyinfo += "F10"; break; } + case GLFW_KEY_F11: { keyinfo += "F11"; break; } + case GLFW_KEY_F12: { keyinfo += "F12"; break; } + } + } + if( keyinfo.empty() == false ) { + + std::string keymodifiers; + if( Global::shiftState ) + keymodifiers += "[Shift]+"; + if( Global::ctrlState ) + keymodifiers += "[Ctrl]+"; + + WriteLog( "Key pressed: " + keymodifiers + "[" + keyinfo + "]" ); + } + } + + // actual key processing + // TODO: redo the input system if( ( cKey >= GLFW_KEY_0 ) && ( cKey <= GLFW_KEY_9 ) ) // klawisze cyfrowe { int i = cKey - GLFW_KEY_0; // numer klawisza diff --git a/World.h b/World.h index 4e415b3c..dd15dbc3 100644 --- a/World.h +++ b/World.h @@ -24,7 +24,7 @@ http://mozilla.org/MPL/2.0/. class simulation_time { public: - simulation_time() { m_time.wHour = -1; m_time.wMinute = -1; } + simulation_time() { m_time.wHour = 10; m_time.wMinute = 30; } void init(); void diff --git a/moon.cpp b/moon.cpp index bde6f764..f3892960 100644 --- a/moon.cpp +++ b/moon.cpp @@ -36,7 +36,7 @@ void cMoon::update() { move(); - Math3D::vector3 position( 0.0f, 0.0f, -2000.0f ); + Math3D::vector3 position( 0.0f, 0.0f, -2000.0f * Global::fDistanceFactor ); position.RotateX( (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); position.RotateY( (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); diff --git a/renderer.cpp b/renderer.cpp index 8b069c7d..a0a2a24e 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -234,7 +234,7 @@ opengl_renderer::Render( world_environment *Environment ) { ::glLoadIdentity(); // macierz jedynkowa ::glTranslatef( moonposition.x, moonposition.y, moonposition.z ); - float const size = 0.025f; // TODO: expose distance/scale factor from the moon object + float const size = 0.02f; // TODO: expose distance/scale factor from the moon object // choose the moon appearance variant, based on current moon phase // NOTE: implementation specific, 8 variants are laid out in 3x3 arrangement // from new moon onwards, top left to right bottom (last spot is left for future use, if any) diff --git a/sun.cpp b/sun.cpp index 486eff37..258c4b9c 100644 --- a/sun.cpp +++ b/sun.cpp @@ -33,7 +33,7 @@ void cSun::update() { move(); - Math3D::vector3 position( 0.0f, 0.0f, -2000.0f ); + Math3D::vector3 position( 0.0f, 0.0f, -2000.0f * Global::fDistanceFactor ); position.RotateX( (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); position.RotateY( (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); From 886f0dad0f93303f0b10c7fca5a570dc53f80572 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 1 Apr 2017 13:56:18 +0200 Subject: [PATCH 079/426] glfw key callback cleanup --- EU07.cpp | 39 --------------------------------------- McZapkie/MOVER.h | 2 +- World.cpp | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 40 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index e869980d..09dacf5b 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -144,45 +144,6 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo break; } #endif - case GLFW_KEY_ESCAPE: { -/* - if( ( DebugModeFlag ) //[Esc] pauzuje tylko bez Debugmode - && ( Global::iPause == 0 ) ) { // but unpausing should work always - - break; - } -*/ - if( Global::iPause & 1 ) // jeśli pauza startowa - Global::iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować - else if( !( Global::iMultiplayer & 2 ) ) // w multiplayerze pauza nie ma sensu - if( !Global::ctrlState ) // z [Ctrl] to radiostop jest - Global::iPause ^= 2; // zmiana stanu zapauzowania - if( Global::iPause ) {// jak pauza - Global::iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację - } - break; - } - case GLFW_KEY_F7: - if( DebugModeFlag ) { - - if( Global::ctrlState ) { - // ctrl + f7 toggles static daylight - World.ToggleDaylight(); - break; - } - // f7: wireframe toggle - // siatki wyświetlane tyko w trybie testowym - Global::bWireFrame = !Global::bWireFrame; - if( true == Global::bWireFrame ) { - glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); - } - else { - glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); - } - ++Global::iReCompile; // odświeżyć siatki - // Ra: jeszcze usunąć siatki ze skompilowanych obiektów! - } - break; } } else if( action == GLFW_RELEASE ) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index aa11d20b..6d7d2c40 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -754,7 +754,7 @@ public: double DoorStayOpen = 0.0; /*jak dlugo otwarte w przypadku DoorCloseCtrl=2*/ bool DoorClosureWarning = false; /*czy jest ostrzeganie przed zamknieciem*/ double DoorOpenSpeed = 1.0; double DoorCloseSpeed = 1.0; /*predkosc otwierania i zamykania w j.u. */ - double DoorMaxShiftL = 0.5; double DoorMaxShiftR = 0.5; double DoorMaxPlugShift = 0.5;/*szerokosc otwarcia lub kat*/ + double DoorMaxShiftL = 0.5; double DoorMaxShiftR = 0.5; double DoorMaxPlugShift = 0.1;/*szerokosc otwarcia lub kat*/ int DoorOpenMethod = 2; /*sposob otwarcia - 1: przesuwne, 2: obrotowe, 3: trójelementowe*/ double PlatformSpeed = 0.25; /*szybkosc stopnia*/ double PlatformMaxShift = 0.5; /*wysuniecie stopnia*/ diff --git a/World.cpp b/World.cpp index 421acbc8..7feafa8c 100644 --- a/World.cpp +++ b/World.cpp @@ -604,6 +604,32 @@ void TWorld::OnKeyDown(int cKey) } break; } + case GLFW_KEY_F7: { + // debug mode functions + if( DebugModeFlag ) { + + if( Global::ctrlState ) { + // ctrl + f7 toggles static daylight + ToggleDaylight(); + break; + } + else { + // f7: wireframe toggle + Global::bWireFrame = !Global::bWireFrame; + if( true == Global::bWireFrame ) { + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + } + else { + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + } +/* + ++Global::iReCompile; // odświeżyć siatki + // Ra: jeszcze usunąć siatki ze skompilowanych obiektów! +*/ + } + } + break; + } case GLFW_KEY_F8: { Global::iTextMode = cKey; // FPS @@ -667,6 +693,16 @@ void TWorld::OnKeyDown(int cKey) // else if (cKey=='3') Global::iWriteLogEnabled^=4; //wypisywanie nazw torów } } + else if( cKey == GLFW_KEY_ESCAPE ) { + // toggle pause + if( Global::iPause & 1 ) // jeśli pauza startowa + Global::iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować + else if( !( Global::iMultiplayer & 2 ) ) // w multiplayerze pauza nie ma sensu + Global::iPause ^= 2; // zmiana stanu zapauzowania + if( Global::iPause ) {// jak pauza + Global::iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację + } + } else if( Global::ctrlState && cKey == GLFW_KEY_PAUSE ) //[Ctrl]+[Break] { // hamowanie wszystkich pojazdów w okolicy if (Controlled->MoverParameters->Radio) From b5b282f06e71c59f2c0787def4035c5ddba50b37 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 1 Apr 2017 14:56:26 +0200 Subject: [PATCH 080/426] fix for loading boolean settings from .fiz files --- McZapkie/MOVER.h | 40 ++++++++++++++++++++++------------------ McZapkie/Mover.cpp | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index aa11d20b..bd5683a7 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1150,6 +1150,23 @@ private: extern double Distance(TLocation Loc1, TLocation Loc2, TDimension Dim1, TDimension Dim2); +inline +std::string +extract_value( std::string const &Key, std::string const &Input ) { + + std::string value; + auto lookup = Input.find( Key + "=" ); + if( lookup != std::string::npos ) { + value = Input.substr( Input.find_first_not_of( ' ', lookup + Key.size() + 1 ) ); + lookup = value.find( ' ' ); + if( lookup != std::string::npos ) { + // trim everything past the value + value.erase( lookup ); + } + } + return value; +} + template bool extract_value( _Type &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { @@ -1169,23 +1186,10 @@ extract_value( _Type &Variable, std::string const &Key, std::string const &Input converter << Default; converter >> Variable; } - return false; // supplied the default - } + return false; // couldn't locate the variable in provided input + } } -inline -std::string -extract_value( std::string const &Key, std::string const &Input ) { - - std::string value; - auto lookup = Input.find( Key + "=" ); - if( lookup != std::string::npos ) { - value = Input.substr( Input.find_first_not_of( ' ', lookup + Key.size() + 1 ) ); - lookup = value.find( ' ' ); - if( lookup != std::string::npos ) { - // trim everything past the value - value.erase( lookup ); - } - } - return value; -} \ No newline at end of file +template <> +bool +extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ); \ No newline at end of file diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index eed06456..725754ab 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7912,3 +7912,23 @@ double TMoverParameters::ShowCurrentP(int AmpN) return current; } } + +template <> +bool +extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { + + auto value = extract_value( Key, Input ); + if( false == value.empty() ) { + // set the specified variable to retrieved value + Variable = ( value == "Yes" ); + return true; // located the variable + } + else { + // set the variable to provided default value + if( false == Default.empty() ) { + // (provided there's one) + Variable = ( Default == "Yes" ); + } + return false; // couldn't locate the variable in provided input + } +} From e6f488ed6f9af316185e031d77c36c38b743b5ea Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 7 Apr 2017 00:36:07 +0200 Subject: [PATCH 081/426] control messaging system, keyboard and gamepad inputs --- Camera.cpp | 475 +++++++++++++++++++++++++++++++++---- Camera.h | 17 +- Driver.cpp | 14 +- EU07.cpp | 23 +- EvLaunch.cpp | 4 +- Ground.cpp | 2 +- Model3d.cpp | 14 +- Train.cpp | 512 +++++++++++++++++++++++++++++++++++++--- Train.h | 20 +- World.cpp | 55 +++-- World.h | 3 +- command.cpp | 300 +++++++++++++++++++++++ command.h | 196 +++++++++++++++ gamepadinput.cpp | 352 +++++++++++++++++++++++++++ gamepadinput.h | 86 +++++++ keyboardinput.cpp | 204 ++++++++++++++++ keyboardinput.h | 61 +++++ maszyna.vcxproj.filters | 38 ++- moon.cpp | 6 +- sun.cpp | 6 +- 20 files changed, 2237 insertions(+), 151 deletions(-) create mode 100644 command.cpp create mode 100644 command.h create mode 100644 gamepadinput.cpp create mode 100644 gamepadinput.h create mode 100644 keyboardinput.cpp create mode 100644 keyboardinput.h diff --git a/Camera.cpp b/Camera.cpp index cceed381..75297e4f 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -15,23 +15,19 @@ http://mozilla.org/MPL/2.0/. #include "Console.h" #include "Timer.h" #include "mover.h" + //--------------------------------------------------------------------------- // TViewPyramid TCamera::OrgViewPyramid; //={vector3(-1,1,1),vector3(1,1,1),vector3(-1,-1,1),vector3(1,-1,1),vector3(0,0,0)}; -const vector3 OrgCrossPos = vector3(0, -10, 0); - void TCamera::Init(vector3 NPos, vector3 NAngle) { - pOffset = vector3(-0.0, 0, 0); vUp = vector3(0, 1, 0); // pOffset= vector3(-0.8,0,0); - CrossPos = OrgCrossPos; CrossDist = 10; Velocity = vector3(0, 0, 0); - OldVelocity = vector3(0, 0, 0); Pitch = NAngle.x; Yaw = NAngle.y; Roll = NAngle.z; @@ -54,52 +50,445 @@ void TCamera::OnCursorMove(double x, double y) if (Type == tp_Follow) // jeżeli jazda z pojazdem { clamp(Pitch, -M_PI_4, M_PI_4); // ograniczenie kąta spoglądania w dół i w górę - // Fix(Yaw,-M_PI,M_PI); + } +} + +void +TCamera::OnCommand( command_data const &Command ) { + + double const walkspeed = 1.0; + double const runspeed = ( DebugModeFlag ? 50.0 : 7.5 ); + double const speedmultiplier = ( DebugModeFlag ? 7.5 : 1.0 ); + + switch( Command.command ) { + + case user_command::viewturn: { + + OnCursorMove( + reinterpret_cast( Command.param1 ) * 0.005 * Global::fMouseXScale / Global::ZoomFactor, + reinterpret_cast( Command.param2 ) * -0.01 * Global::fMouseYScale / Global::ZoomFactor ); + break; + } + + case user_command::movevector: { + + auto const movespeed = + ( Type == tp_Free ? + runspeed * speedmultiplier : + walkspeed ); + + // left-right + double const movex = reinterpret_cast( Command.param1 ); + if( movex > 0.0 ) { + m_keys.right = true; + m_keys.left = false; + } + else if( movex < 0.0 ) { + m_keys.right = false; + m_keys.left = true; + } + else { + m_keys.right = false; + m_keys.left = false; + } + // 2/3rd of the stick range enables walk speed, past that we lerp between walk and run speed + m_moverate.x = + walkspeed + + ( std::max( 0.0, std::abs( movex ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ); + + // forward-back + double const movez = reinterpret_cast( Command.param2 ); + if( movez > 0.0 ) { + m_keys.forward = true; + m_keys.back = false; + } + else if( movez < 0.0 ) { + m_keys.forward = false; + m_keys.back = true; + } + else { + m_keys.forward = false; + m_keys.back = false; + } + m_moverate.z = + walkspeed + + ( std::max( 0.0, std::abs( movez ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ); + break; + } + + case user_command::moveforward: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.forward = true; + m_moverate.z = + ( Type == tp_Free ? + walkspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.forward = false; + } + break; + } + + case user_command::moveback: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.back = true; + m_moverate.z = + ( Type == tp_Free ? + walkspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.back = false; + } + break; + } + + case user_command::moveleft: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.left = true; + m_moverate.x = + ( Type == tp_Free ? + walkspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.left = false; + } + break; + } + + case user_command::moveright: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.right = true; + m_moverate.x = + ( Type == tp_Free ? + walkspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.right = false; + } + break; + } + + case user_command::moveup: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.up = true; + m_moverate.y = + ( Type == tp_Free ? + walkspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.up = false; + } + break; + } + + case user_command::movedown: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.down = true; + m_moverate.y = + ( Type == tp_Free ? + walkspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.down = false; + } + break; + } + + case user_command::moveforwardfast: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.forward = true; + m_moverate.z = + ( Type == tp_Free ? + runspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.forward = false; + } + break; + } + + case user_command::movebackfast: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.back = true; + m_moverate.z = + ( Type == tp_Free ? + runspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.back = false; + } + break; + } + + case user_command::moveleftfast: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.left = true; + m_moverate.x = + ( Type == tp_Free ? + runspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.left = false; + } + break; + } + + case user_command::moverightfast: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.right = true; + m_moverate.x = + ( Type == tp_Free ? + runspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.right = false; + } + break; + } + + case user_command::moveupfast: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.up = true; + m_moverate.y = + ( Type == tp_Free ? + runspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.up = false; + } + break; + } + + case user_command::movedownfast: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.down = true; + m_moverate.y = + ( Type == tp_Free ? + runspeed * speedmultiplier : + walkspeed ); + } + else { + m_keys.down = false; + } + break; + } +/* + case user_command::moveforwardfastest: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.forward = true; + m_moverate.z = + ( Type == tp_Free ? + 8.0 : + 0.8 ); + } + else { + m_keys.forward = false; + } + break; + } + + case user_command::movebackfastest: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.back = true; + m_moverate.z = + ( Type == tp_Free ? + 8.0 : + 0.8 ); + } + else { + m_keys.back = false; + } + break; + } + + case user_command::moveleftfastest: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.left = true; + m_moverate.x = + ( Type == tp_Free ? + 8.0 : + 0.8 ); + } + else { + m_keys.left = false; + } + break; + } + + case user_command::moverightfastest: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.right = true; + m_moverate.x = + ( Type == tp_Free ? + 8.0 : + 0.8 ); + } + else { + m_keys.right = false; + } + break; + } + + case user_command::moveupfastest: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.up = true; + m_moverate.y = + ( Type == tp_Free ? + 8.0 : + 0.8 ); + } + else { + m_keys.up = false; + } + break; + } + + case user_command::movedownfastest: { + + if( Command.action != GLFW_RELEASE ) { + m_keys.down = true; + m_moverate.y = + ( Type == tp_Free ? + 8.0 : + 0.8 ); + } + else { + m_keys.down = false; + } + break; + } +*/ } } void TCamera::Update() { - // ABu: zmiana i uniezaleznienie predkosci od FPS - double a = ( Global::shiftState ? 5.00 : 1.00); - if (Global::ctrlState) - a = a * 100; - // OldVelocity=Velocity; - if (FreeFlyModeFlag == true) - Type = tp_Free; - else - Type = tp_Follow; - if (Type == tp_Free) - { - if (Console::Pressed(Global::Keys[k_MechUp])) - Velocity.y += a; - if (Console::Pressed(Global::Keys[k_MechDown])) - Velocity.y -= a; + if( FreeFlyModeFlag == true ) { Type = tp_Free; } + else { Type = tp_Follow; } + + // check for sent user commands + // NOTE: this is a temporary arrangement, for the transition period from old command setup to the new one + // ultimately we'll need to track position of camera/driver for all human entities present in the scenario + command_data command; + // NOTE: currently we're only storing commands for local entity and there's no id system in place, + // so we're supplying 'default' entity id of 0 + while( simulation::Commands.pop( command, static_cast( command_target::entity ) | 0 ) ) { + + OnCommand( command ); + } + + auto const deltatime = Timer::GetDeltaRenderTime(); // czas bez pauzy + +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + double a = 0.8; // default (walk) movement speed + if( Type == tp_Free ) { + // when not in the cab the speed modifiers are active + if( Global::shiftState ) { a = 2.5; } + if( Global::ctrlState ) { a *= 10.0; } + } + + if( ( Type == tp_Free ) + || ( false == Global::ctrlState ) ) { + // ctrl is used for mirror view, so we ignore the controls when in vehicle if ctrl is pressed + if( Console::Pressed( Global::Keys[ k_MechUp ] ) ) + Velocity.y = clamp( Velocity.y + a * 10.0 * deltatime, -a, a ); + if( Console::Pressed( Global::Keys[ k_MechDown ] ) ) + Velocity.y = clamp( Velocity.y - a * 10.0 * deltatime, -a, a ); // McZapkie-170402: poruszanie i rozgladanie we free takie samo jak w follow - if (Console::Pressed(Global::Keys[k_MechRight])) - Velocity.x += a; - if (Console::Pressed(Global::Keys[k_MechLeft])) - Velocity.x -= a; - if (Console::Pressed(Global::Keys[k_MechForward])) - Velocity.z -= a; - if (Console::Pressed(Global::Keys[k_MechBackward])) - Velocity.z += a; - // gora-dol - // if (Console::Pressed(GLFW_KEY_KP_9)) Pos.y+=0.1; - // if (Console::Pressed(GLFW_KEY_KP_3)) Pos.y-=0.1; - - // McZapkie: zeby nie hustalo przy malym FPS: - // Velocity= (Velocity+OldVelocity)/2; - // matrix4x4 mat; - vector3 Vec = Velocity; - Vec.RotateY(Yaw); - Pos = Pos + Vec * Timer::GetDeltaRenderTime(); // czas bez pauzy - Velocity = Velocity / 2; // płynne hamowanie ruchu - // double tmp= 10*DeltaTime; - // Velocity+= -Velocity*10 * Timer::GetDeltaTime();//( tmp<1 ? tmp : 1 ); - // Type= tp_Free; + if( Console::Pressed( Global::Keys[ k_MechRight ] ) ) + Velocity.x = clamp( Velocity.x + a * 10.0 * deltatime, -a, a ); + if( Console::Pressed( Global::Keys[ k_MechLeft ] ) ) + Velocity.x = clamp( Velocity.x - a * 10.0 * deltatime, -a, a ); + if( Console::Pressed( Global::Keys[ k_MechForward ] ) ) + Velocity.z = clamp( Velocity.z - a * 10.0 * deltatime, -a, a ); + if( Console::Pressed( Global::Keys[ k_MechBackward ] ) ) + Velocity.z = clamp( Velocity.z + a * 10.0 * deltatime, -a, a ); } +#else +/* + m_moverate = 0.8; // default (walk) movement speed + if( Type == tp_Free ) { + // when not in the cab the speed modifiers are active + if( Global::shiftState ) { m_moverate = 2.5; } + if( Global::ctrlState ) { m_moverate *= 10.0; } + } +*/ + if( ( Type == tp_Free ) + || ( false == Global::ctrlState ) ) { + // ctrl is used for mirror view, so we ignore the controls when in vehicle if ctrl is pressed + if( m_keys.up ) + Velocity.y = clamp( Velocity.y + m_moverate.y * 10.0 * deltatime, -m_moverate.y, m_moverate.y ); + if( m_keys.down ) + Velocity.y = clamp( Velocity.y - m_moverate.y * 10.0 * deltatime, -m_moverate.y, m_moverate.y ); + + // McZapkie-170402: poruszanie i rozgladanie we free takie samo jak w follow + if( m_keys.right ) + Velocity.x = clamp( Velocity.x + m_moverate.x * 10.0 * deltatime, -m_moverate.x, m_moverate.x ); + if( m_keys.left ) + Velocity.x = clamp( Velocity.x - m_moverate.x * 10.0 * deltatime, -m_moverate.x, m_moverate.x ); + if( m_keys.forward ) + Velocity.z = clamp( Velocity.z - m_moverate.z * 10.0 * deltatime, -m_moverate.z, m_moverate.z ); + if( m_keys.back ) + Velocity.z = clamp( Velocity.z + m_moverate.z * 10.0 * deltatime, -m_moverate.z, m_moverate.z ); + } +#endif + + if( Type == tp_Free ) { + vector3 Vec = Velocity; + Vec.RotateY( Yaw ); + Pos += Vec * 5.0 * deltatime; + } + else { + + } +/* + if( deltatime < 1.0 / 20.0 ) { + // płynne hamowanie ruchu + Velocity -= Velocity * 20.0 * deltatime; + } + else { + // instant stop + Velocity.Zero(); + } + if( std::abs( Velocity.x ) < 0.01 ) { Velocity.x = 0.0; } + if( std::abs( Velocity.y ) < 0.01 ) { Velocity.y = 0.0; } + if( std::abs( Velocity.z ) < 0.01 ) { Velocity.z = 0.0; } +*/ +/* + Velocity *= 0.5; + if( std::abs( Velocity.x ) < 0.01 ) { Velocity.x = 0.0; } + if( std::abs( Velocity.y ) < 0.01 ) { Velocity.y = 0.0; } + if( std::abs( Velocity.z ) < 0.01 ) { Velocity.z = 0.0; } +*/ } vector3 TCamera::GetDirection() diff --git a/Camera.h b/Camera.h index ebc98a7a..c9ab5e05 100644 --- a/Camera.h +++ b/Camera.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "dumb3d.h" #include "dynobj.h" +#include "command.h" using namespace Math3D; @@ -25,7 +26,16 @@ enum TCameraType class TCamera { private: - vector3 pOffset; // nie używane (zerowe) + struct keys { + bool forward{ false }; + bool back{ false }; + bool left{ false }; + bool right{ false }; + bool up{ false }; + bool down{ false }; + bool run{ false }; + } m_keys; + glm::dvec3 m_moverate; public: // McZapkie: potrzebuje do kiwania na boki double Pitch; @@ -36,7 +46,6 @@ class TCamera vector3 LookAt; // współrzędne punktu, na który ma patrzeć vector3 vUp; vector3 Velocity; - vector3 OldVelocity; // lepiej usredniac zeby nie bylo rozbiezne przy malym FPS vector3 CrossPos; double CrossDist; void Init(vector3 NPos, vector3 NAngle); @@ -44,10 +53,10 @@ class TCamera { Pitch = Yaw = Roll = 0; }; - void OnCursorMove(double x, double y); + void OnCursorMove(double const x, double const y); + void OnCommand( command_data const &Command ); void Update(); vector3 GetDirection(); - // vector3 inline GetCrossPos() { return Pos+GetDirection()*CrossDist+CrossPos; }; bool SetMatrix(); bool SetMatrix(glm::mat4 &Matrix); void SetCabMatrix( vector3 &p ); diff --git a/Driver.cpp b/Driver.cpp index e2dbc091..5b88f354 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -828,12 +828,12 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN #if LOGSTOPS WriteLog( pVehicle->asName + " as " + TrainParams->TrainName - + ": at " + std::to_string(Simulation::Time.data().wHour) + ":" + std::to_string(Simulation::Time.data().wMinute) + + ": at " + std::to_string(simulation::Time.data().wHour) + ":" + std::to_string(simulation::Time.data().wMinute) + " skipped " + asNextStop); // informacja #endif // przy jakim dystansie (stanie licznika) ma przesunąć na następny postój fLastStopExpDist = mvOccupied->DistCounter + 0.250 + 0.001 * fLength; - TrainParams->UpdateMTable( Simulation::Time, asNextStop ); + TrainParams->UpdateMTable( simulation::Time, asNextStop ); TrainParams->StationIndexInc(); // przejście do następnej asNextStop = TrainParams->NextStop(); // pobranie kolejnego miejsca zatrzymania // TableClear(); //aby od nowa sprawdziło W4 z inną nazwą już - to nie @@ -930,7 +930,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // niezależne od sposobu obsługi drzwi, bo // opóźnia również kierownika } - if (TrainParams->UpdateMTable( Simulation::Time, asNextStop) ) + if (TrainParams->UpdateMTable( simulation::Time, asNextStop) ) { // to się wykona tylko raz po zatrzymaniu na W4 if (TrainParams->CheckTrainLatency() < 0.0) iDrivigFlags |= moveLate; // odnotowano spóźnienie @@ -976,7 +976,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if (TrainParams->StationIndex < TrainParams->StationCount) { // jeśli są dalsze stacje, czekamy do godziny odjazdu - if (TrainParams->IsTimeToGo(Simulation::Time.data().wHour, Simulation::Time.data().wMinute)) + if (TrainParams->IsTimeToGo(simulation::Time.data().wHour, simulation::Time.data().wMinute)) { // z dalszą akcją czekamy do godziny odjazdu /* potencjalny problem z ruszaniem z w4 if (TrainParams->CheckTrainLatency() < 0) @@ -995,7 +995,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN #if LOGSTOPS WriteLog( pVehicle->asName + " as " + TrainParams->TrainName - + ": at " + std::to_string(Simulation::Time.data().wHour) + ":" + std::to_string(Simulation::Time.data().wMinute) + + ": at " + std::to_string(simulation::Time.data().wHour) + ":" + std::to_string(simulation::Time.data().wMinute) + " next " + asNextStop); // informacja #endif if (int(floor(sSpeedTable[i].evEvent->ValueGet(1))) & 1) @@ -1022,7 +1022,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN #if LOGSTOPS WriteLog( pVehicle->asName + " as " + TrainParams->TrainName - + ": at " + std::to_string(Simulation::Time.data().wHour) + ":" + std::to_string(Simulation::Time.data().wMinute) + + ": at " + std::to_string(simulation::Time.data().wHour) + ":" + std::to_string(simulation::Time.data().wMinute) + " end of route."); // informacja #endif asNextStop = TrainParams->NextStop(); // informacja o końcu trasy @@ -2865,7 +2865,7 @@ bool TController::PutCommand(std::string NewCommand, double NewValue1, double Ne } else { // inicjacja pierwszego przystanku i pobranie jego nazwy - TrainParams->UpdateMTable( Simulation::Time, TrainParams->NextStationName ); + TrainParams->UpdateMTable( simulation::Time, TrainParams->NextStationName ); TrainParams->StationIndexInc(); // przejście do następnej iStationStart = TrainParams->StationIndex; asNextStop = TrainParams->NextStop(); diff --git a/EU07.cpp b/EU07.cpp index 09dacf5b..b69a5398 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -23,6 +23,8 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "Globals.h" #include "Logs.h" +#include "keyboardinput.h" +#include "gamepadinput.h" #include "Console.h" #include "PyInt.h" #include "World.h" @@ -60,6 +62,13 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others TWorld World; +namespace input { + +keyboard_input Keyboard; +gamepad_input Gamepad; + +} + #ifdef CAN_I_HAS_LIBPNG void screenshot_save_thread( char *img ) { @@ -113,12 +122,17 @@ void window_resize_callback(GLFWwindow *window, int w, int h) void cursor_pos_callback(GLFWwindow *window, double x, double y) { + input::Keyboard.mouse( x, y ); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM World.OnMouseMove(x * 0.005, y * 0.01); +#endif glfwSetCursorPos(window, 0.0, 0.0); } void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) { + input::Keyboard.key( key, action ); + Global::shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; Global::ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; @@ -144,6 +158,7 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo break; } #endif + default: { break; } } } else if( action == GLFW_RELEASE ) @@ -326,6 +341,7 @@ int main(int argc, char *argv[]) return -1; } + input::Gamepad.init(); Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów if (!World.Init(window)) @@ -335,9 +351,10 @@ int main(int argc, char *argv[]) } Console *pConsole = new Console(); // Ra: nie wiem, czy ma to sens, ale jakoś zainicjowac trzeba - +/* if( !joyGetNumDevs() ) WriteLog( "No joystick" ); +*/ if( Global::iModifyTGA < 0 ) { // tylko modyfikacja TGA, bez uruchamiania symulacji Global::iMaxTextureSize = 64; //żeby nie zamulać pamięci World.ModifyTGA(); // rekurencyjne przeglądanie katalogów @@ -354,7 +371,8 @@ int main(int argc, char *argv[]) && World.Update() && GfxRenderer.Render()) { - glfwPollEvents(); + glfwPollEvents(); + input::Gamepad.poll(); } Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) } @@ -364,5 +382,6 @@ int main(int argc, char *argv[]) glfwDestroyWindow(window); glfwTerminate(); + return 0; } diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 28789d14..4fda3368 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -177,9 +177,9 @@ bool TEventLauncher::Render() } else { // jeśli nie cykliczny, to sprawdzić czas - if (Simulation::Time.data().wHour == iHour) + if (simulation::Time.data().wHour == iHour) { - if (Simulation::Time.data().wMinute == iMinute) + if (simulation::Time.data().wMinute == iMinute) { // zgodność czasu uruchomienia if (UpdatedTime < 10) { diff --git a/Ground.cpp b/Ground.cpp index a282326c..393f2dbc 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2826,7 +2826,7 @@ bool TGround::Init(std::string File) cParser timeparser( token ); timeparser.getTokens( 2, false, ":" ); - auto &time = Simulation::Time.data(); + auto &time = simulation::Time.data(); timeparser >> time.wHour >> time.wMinute; diff --git a/Model3d.cpp b/Model3d.cpp index 64df1b84..d77e1204 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -956,22 +956,22 @@ void TSubModel::RaAnimation(TAnimType a) glRotatef(v_Angles.z, 0.0f, 0.0f, 1.0f); break; case at_SecondsJump: // sekundy z przeskokiem - glRotatef(Simulation::Time.data().wSecond * 6.0, 0.0, 1.0, 0.0); + glRotatef(simulation::Time.data().wSecond * 6.0, 0.0, 1.0, 0.0); break; case at_MinutesJump: // minuty z przeskokiem - glRotatef(Simulation::Time.data().wMinute * 6.0, 0.0, 1.0, 0.0); + glRotatef(simulation::Time.data().wMinute * 6.0, 0.0, 1.0, 0.0); break; case at_HoursJump: // godziny skokowo 12h/360° - glRotatef(Simulation::Time.data().wHour * 30.0 * 0.5, 0.0, 1.0, 0.0); + glRotatef(simulation::Time.data().wHour * 30.0 * 0.5, 0.0, 1.0, 0.0); break; case at_Hours24Jump: // godziny skokowo 24h/360° - glRotatef(Simulation::Time.data().wHour * 15.0 * 0.25, 0.0, 1.0, 0.0); + glRotatef(simulation::Time.data().wHour * 15.0 * 0.25, 0.0, 1.0, 0.0); break; case at_Seconds: // sekundy płynnie - glRotatef(Simulation::Time.second() * 6.0, 0.0, 1.0, 0.0); + glRotatef(simulation::Time.second() * 6.0, 0.0, 1.0, 0.0); break; case at_Minutes: // minuty płynnie - glRotatef(Simulation::Time.data().wMinute * 6.0 + Simulation::Time.second() * 0.1, 0.0, 1.0, 0.0); + glRotatef(simulation::Time.data().wMinute * 6.0 + simulation::Time.second() * 0.1, 0.0, 1.0, 0.0); break; case at_Hours: // godziny płynnie 12h/360° glRotatef(2.0 * Global::fTimeAngleDeg, 0.0, 1.0, 0.0); @@ -996,7 +996,7 @@ void TSubModel::RaAnimation(TAnimType a) } break; case at_Wind: // ruch pod wpływem wiatru (wiatr będziemy liczyć potem...) - glRotated(1.5 * std::sin(M_PI * Simulation::Time.second() / 6.0), 0.0, 1.0, 0.0); + glRotated(1.5 * std::sin(M_PI * simulation::Time.second() / 6.0), 0.0, 1.0, 0.0); break; case at_Sky: // animacja nieba glRotated(Global::fLatitudeDeg, 1.0, 0.0, 0.0); // ustawienie osi OY na północ diff --git a/Train.cpp b/Train.cpp index ac3e74f8..43ad864a 100644 --- a/Train.cpp +++ b/Train.cpp @@ -13,7 +13,6 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" - #include "Train.h" #include "Globals.h" @@ -22,12 +21,6 @@ http://mozilla.org/MPL/2.0/. #include "Timer.h" #include "Driver.h" #include "Console.h" -#include "McZapkie\hamulce.h" -#include "McZapkie\MOVER.h" -#include "Camera.h" -//--------------------------------------------------------------------------- - -using namespace Timer; TCab::TCab() { @@ -391,13 +384,390 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "actualproximitydist", PyGetFloat( driver->ActualProximityDist ) ); PyDict_SetItemString( dict, "trainnumber", PyGetString( driver->TrainName().c_str() ) ); // world state data - PyDict_SetItemString( dict, "hours", PyGetInt( Simulation::Time.data().wHour ) ); - PyDict_SetItemString( dict, "minutes", PyGetInt( Simulation::Time.data().wMinute ) ); - PyDict_SetItemString( dict, "seconds", PyGetInt( Simulation::Time.second() ) ); + PyDict_SetItemString( dict, "hours", PyGetInt( simulation::Time.data().wHour ) ); + PyDict_SetItemString( dict, "minutes", PyGetInt( simulation::Time.data().wMinute ) ); + PyDict_SetItemString( dict, "seconds", PyGetInt( simulation::Time.second() ) ); return dict; } +void +TTrain::OnCommand( command_data const &Command ) { + + bool const isEztOer = + ( ( mvControlled->TrainType == dt_EZT ) + && ( mvOccupied->BrakeSubsystem == ss_ESt ) + && ( mvControlled->Battery == true ) + && ( mvControlled->EpFuse == true ) + && ( mvControlled->ActiveDir != 0 ) ); // od yB + + switch( Command.command ) { + + case user_command::mastercontrollerincrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvControlled->IncMainCtrl( 1 ) ) { + // sound feedback + play_sound( dsbNastawnikJazdy ); + } + } + break; + } + + case user_command::mastercontrollerincreasefast: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvControlled->IncMainCtrl( 2 ) ) { + // sound feedback + play_sound( dsbNastawnikJazdy ); + } + } + break; + } + + case user_command::mastercontrollerdecrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvControlled->DecMainCtrl( 1 ) ) { + // sound feedback + play_sound( dsbNastawnikJazdy ); + } + } + break; + } + + case user_command::mastercontrollerdecreasefast: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvControlled->DecMainCtrl( 2 ) ) { + // sound feedback + play_sound( dsbNastawnikJazdy ); + } + } + break; + } + + case user_command::secondcontrollerincrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvControlled->ShuntMode ) { + mvControlled->AnPos += ( Command.time_delta * 0.75f ); + if( mvControlled->AnPos > 1 ) + mvControlled->AnPos = 1; + } + else if( mvControlled->IncScndCtrl( 1 ) ) { + // sound feedback + play_sound( dsbNastawnikBocz, dsbNastawnikJazdy ); + } + } + break; + } + + case user_command::secondcontrollerincreasefast: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvControlled->IncScndCtrl( 2 ) ) { + // sound feedback + play_sound( dsbNastawnikBocz, dsbNastawnikJazdy ); + } + } + break; + } + + case user_command::secondcontrollerdecrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvControlled->ShuntMode ) { + mvControlled->AnPos -= ( Command.time_delta * 0.75f ); + if( mvControlled->AnPos > 1 ) + mvControlled->AnPos = 1; + } + else if( mvControlled->DecScndCtrl( 1 ) ) { + // sound feedback + play_sound( dsbNastawnikBocz, dsbNastawnikJazdy ); + } + } + break; + } + + case user_command::secondcontrollerdecreasefast: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvControlled->DecScndCtrl( 2 ) ) { + // sound feedback + play_sound( dsbNastawnikBocz, dsbNastawnikJazdy ); + } + } + break; + } + + case user_command::independentbrakeincrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvOccupied->LocalBrake != ManualBrake ) { + mvOccupied->IncLocalBrakeLevel( 1 ); + } + } + break; + } + + case user_command::independentbrakeincreasefast: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvOccupied->LocalBrake != ManualBrake ) { + mvOccupied->IncLocalBrakeLevel( 2 ); + } + } + break; + } + + case user_command::independentbrakedecrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( ( mvOccupied->LocalBrake != ManualBrake ) + // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - odhamować jakoś trzeba + // TODO: sort AI out so it doesn't do things it doesn't have equipment for + || ( mvOccupied->LocalBrakePos != 0 ) ) { + mvOccupied->DecLocalBrakeLevel( 1 ); + } + } + break; + } + + case user_command::independentbrakedecreasefast: { + + if( Command.action != GLFW_RELEASE ) { + + if( ( mvOccupied->LocalBrake != ManualBrake ) + // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - odhamować jakoś trzeba + // TODO: sort AI out so it doesn't do things it doesn't have equipment for + || ( mvOccupied->LocalBrakePos != 0 ) ) { + mvOccupied->DecLocalBrakeLevel( 2 ); + } + } + break; + } + + case user_command::independentbrakebailoff: { + // TODO: check if this set of conditions can be simplified. + // it'd be more flexible to have an attribute indicating whether bail off position is supported + if( ( mvControlled->TrainType != dt_EZT ) + && ( ( mvControlled->EngineType == ElectricSeriesMotor ) + || ( mvControlled->EngineType == DieselElectric ) + || ( mvControlled->EngineType == ElectricInductionMotor ) ) + && ( mvOccupied->BrakeCtrlPosNo > 0 ) ) { + + if( Command.action != GLFW_RELEASE ) { + // press or hold + ggReleaserButton.UpdateValue( 1 ); + mvOccupied->BrakeReleaser( 1 ); + } + else { + // release + ggReleaserButton.UpdateValue( 0 ); + mvOccupied->BrakeReleaser( 0 ); + } + } + break; + } + + case user_command::trainbrakeincrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvOccupied->BrakeHandle == FV4a ) { + mvOccupied->BrakeLevelAdd( 0.1 /*15.0 * Command.time_delta*/ ); + } + else { + if( mvOccupied->BrakeLevelAdd( Global::fBrakeStep ) ) { + // nieodpowiedni warunek; true, jeśli można dalej kręcić + keybrakecount = 0; + if( ( isEztOer ) && ( mvOccupied->BrakeCtrlPos < 3 ) ) { + // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza + play_sound( dsbPneumaticSwitch ); + } + } + } + } + break; + } + + case user_command::trainbrakedecrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvOccupied->BrakeHandle == FV4a ) { + mvOccupied->BrakeLevelAdd( -0.1 /*-15.0 * Command.time_delta*/ ); + } + else { + // nową wersję dostarczył ZiomalCl ("fixed looped sound in ezt when using NUM_9 key") + if( ( mvOccupied->BrakeCtrlPos > -1 ) + || ( keybrakecount > 1 ) ) { + + if( ( isEztOer ) + && ( mvControlled->Mains ) + && ( mvOccupied->BrakeCtrlPos != -1 ) ) { + // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza + play_sound( dsbPneumaticSwitch ); + } + mvOccupied->BrakeLevelAdd( -Global::fBrakeStep ); + } + else + keybrakecount += 1; + // koniec wersji dostarczonej przez ZiomalCl + } + } + break; + } + + case user_command::trainbrakecharging: { + + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( isEztOer ) + && ( mvControlled->Mains ) + && ( mvOccupied->BrakeCtrlPos != -1 ) ) { + dsbPneumaticSwitch->Play( 0, 0, 0 ); + } + mvOccupied->BrakeLevelSet( -1 ); + } + break; + } + + case user_command::trainbrakerelease: { + + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( isEztOer ) + && ( ( mvOccupied->BrakeCtrlPos == 1 ) + || ( mvOccupied->BrakeCtrlPos == -1 ) ) ) { + dsbPneumaticSwitch->Play( 0, 0, 0 ); + } + mvOccupied->BrakeLevelSet( 0 ); + } + break; + } + + case user_command::trainbrakefirstservice: { + + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( isEztOer ) + && ( mvControlled->Mains ) + && ( mvOccupied->BrakeCtrlPos != 1 ) ) { + dsbPneumaticSwitch->Play( 0, 0, 0 ); + } + mvOccupied->BrakeLevelSet( 1 ); + } + break; + } + + case user_command::trainbrakeservice: { + + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( isEztOer ) + && ( mvControlled->Mains ) + && ( ( mvOccupied->BrakeCtrlPos == 1 ) + || ( mvOccupied->BrakeCtrlPos == -1 ) ) ) { + dsbPneumaticSwitch->Play( 0, 0, 0 ); + } + mvOccupied->BrakeLevelSet( + mvOccupied->BrakeCtrlPosNo / 2 + + ( mvOccupied->BrakeHandle == FV4a ? + 1 : + 0 ) ); + } + break; + } + + case user_command::trainbrakefullservice: { + + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( isEztOer ) + && ( mvControlled->Mains ) + && ( ( mvOccupied->BrakeCtrlPos == 1 ) + || ( mvOccupied->BrakeCtrlPos == -1 ) ) ) { + dsbPneumaticSwitch->Play( 0, 0, 0 ); + } + mvOccupied->BrakeLevelSet( mvOccupied->BrakeCtrlPosNo - 1 ); + } + break; + } + + case user_command::trainbrakeemergency: { + + if( Command.action != GLFW_RELEASE ) { + + mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_EB ) ); + if( mvOccupied->BrakeCtrlPosNo <= 0.1 ) { + // hamulec bezpieczeństwa dla wagonów + mvOccupied->EmergencyBrakeFlag = true; + } + } + break; + } + + case user_command::reverserincrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvOccupied->DirectionForward() ) { + // sound feedback + play_sound( dsbReverserKey, dsbSwitch ); + // aktualizacja skrajnych pojazdów w składzie + if( ( mvOccupied->ActiveDir ) + && ( DynamicObject->Mechanik ) ) { + + DynamicObject->Mechanik->CheckVehicles( Change_direction ); + } + } + } + break; + } + + case user_command::reverserdecrease: { + + if( Command.action != GLFW_RELEASE ) { + + if( mvOccupied->DirectionBackward() ) { + // sound feedback + play_sound( dsbReverserKey, dsbSwitch ); + // aktualizacja skrajnych pojazdów w składzie + if( ( mvOccupied->ActiveDir ) + && ( DynamicObject->Mechanik ) ) { + + DynamicObject->Mechanik->CheckVehicles( Change_direction ); + } + } + } + break; + } + + default: { + + break; + } + } +} + void TTrain::OnKeyDown(int cKey) { // naciśnięcie klawisza bool isEztOer; @@ -409,6 +779,7 @@ void TTrain::OnKeyDown(int cKey) if (Global::shiftState) { // wciśnięty [Shift] +#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (cKey == Global::Keys[k_IncMainCtrlFAST]) // McZapkie-200702: szybkie // przelaczanie na poz. // bezoporowa @@ -419,7 +790,8 @@ void TTrain::OnKeyDown(int cKey) dsbNastawnikJazdy->Play(0, 0, 0); } } - else if (cKey == Global::Keys[k_DirectionBackward]) +#endif + if (cKey == Global::Keys[k_DirectionBackward]) { if (mvOccupied->Radio == false) if (Global::ctrlState) @@ -429,6 +801,7 @@ void TTrain::OnKeyDown(int cKey) mvOccupied->Radio = true; } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_DecMainCtrlFAST]) if (mvControlled->DecMainCtrl(2)) { @@ -469,7 +842,7 @@ void TTrain::OnKeyDown(int cKey) } else ; - else if (cKey == Global::Keys[k_IncLocalBrakeLevelFAST]) + else if( cKey == Global::Keys[ k_IncLocalBrakeLevelFAST ] ) if (mvOccupied->IncLocalBrakeLevel(2)) ; else @@ -479,6 +852,7 @@ void TTrain::OnKeyDown(int cKey) ; else ; +#endif // McZapkie-240302 - wlaczanie glownego obwodu klawiszem M+shift //----------- // hunter-141211: wyl. szybki zalaczony przeniesiony do TTrain::Update() @@ -1177,7 +1551,8 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } else // McZapkie-240302 - klawisze bez shifta { - if (cKey == Global::Keys[k_IncMainCtrl]) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( cKey == Global::Keys[ k_IncMainCtrl ] ) { if (mvControlled->IncMainCtrl(1)) { @@ -1193,13 +1568,13 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } else ; - else if (cKey == Global::Keys[k_IncScndCtrl]) + if (cKey == Global::Keys[k_IncScndCtrl]) // if (MoverParameters->ScndCtrlPosScndCtrlPosNo) // if // (mvControlled->EnginePowerSource.SourceType==CurrentCollector) if (mvControlled->ShuntMode) { - mvControlled->AnPos += (GetDeltaTime() / 0.85f); + mvControlled->AnPos += (Timer::GetDeltaTime() / 0.85f); if (mvControlled->AnPos > 1) mvControlled->AnPos = 1; } @@ -1218,11 +1593,11 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } else ; - else if (cKey == Global::Keys[k_DecScndCtrl]) + else if( cKey == Global::Keys[ k_DecScndCtrl ] ) // if (mvControlled->EnginePowerSource.SourceType==CurrentCollector) if (mvControlled->ShuntMode) { - mvControlled->AnPos -= (GetDeltaTime() / 0.55f); + mvControlled->AnPos -= (Timer::GetDeltaTime() / 0.55f); if (mvControlled->AnPos < 0) mvControlled->AnPos = 0; } @@ -1244,7 +1619,8 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } else ; - else if (cKey == Global::Keys[k_IncLocalBrakeLevel]) +#endif + if( cKey == Global::Keys[ k_IncLocalBrakeLevel ] ) { // Ra 2014-09: w // trybie latania // obsługa jest w @@ -1258,8 +1634,10 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } else ; +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (mvOccupied->LocalBrake != ManualBrake) mvOccupied->IncLocalBrakeLevel(1); +#endif } } else if (cKey == Global::Keys[k_DecLocalBrakeLevel]) @@ -1274,12 +1652,15 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || mvOccupied->DecManualBrakeLevel(1); else ; +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - // odhamować jakoś trzeba if ((mvOccupied->LocalBrake != ManualBrake) || mvOccupied->LocalBrakePos) mvOccupied->DecLocalBrakeLevel(1); +#endif } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if ((cKey == Global::Keys[k_IncBrakeLevel]) && (mvOccupied->BrakeHandle != FV4a)) // if (mvOccupied->IncBrakeLevel()) if (mvOccupied->BrakeLevelAdd(Global::fBrakeStep)) // nieodpowiedni @@ -1330,14 +1711,16 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || else keybrakecount+=1; */ } - else if (cKey == Global::Keys[k_EmergencyBrake]) +#endif +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if( cKey == Global::Keys[ k_EmergencyBrake ] ) { // while (mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_EB)); if (mvOccupied->BrakeCtrlPosNo <= 0.1) // hamulec bezpieczeństwa dla wagonów mvOccupied->EmergencyBrakeFlag = true; } - else if (cKey == Global::Keys[k_Brake3]) + else if( cKey == Global::Keys[ k_Brake3 ] ) { if ((isEztOer) && ((mvOccupied->BrakeCtrlPos == 1) || (mvOccupied->BrakeCtrlPos == -1))) { @@ -1350,9 +1733,11 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(mvOccupied->BrakeCtrlPosNo - 1); } +#endif else if (cKey == Global::Keys[k_Brake2]) { - if ((isEztOer) && ((mvOccupied->BrakeCtrlPos == 1) || (mvOccupied->BrakeCtrlPos == -1))) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( ( isEztOer ) && ( ( mvOccupied->BrakeCtrlPos == 1 ) || ( mvOccupied->BrakeCtrlPos == -1 ) ) ) { dsbPneumaticSwitch->SetVolume(-10); dsbPneumaticSwitch->Play(0, 0, 0); @@ -1363,13 +1748,15 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(mvOccupied->BrakeCtrlPosNo / 2 + (mvOccupied->BrakeHandle == FV4a ? 1 : 0)); +#endif if (Global::ctrlState) mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos(bh_NP)); // yB: czy ten stos funkcji nie // powinien być jako oddzielna // funkcja movera? } - else if (cKey == Global::Keys[k_Brake1]) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if( cKey == Global::Keys[ k_Brake1 ] ) { if ((isEztOer) && (mvOccupied->BrakeCtrlPos != 1)) { @@ -1380,12 +1767,14 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // while (mvOccupied->BrakeCtrlPos<1 && mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(1); } +#endif else if (cKey == Global::Keys[k_Brake0]) { if (Global::ctrlState) { mvOccupied->BrakeCtrlPos2 = 0; // wyrownaj kapturek } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else { if ((isEztOer) && @@ -1398,7 +1787,9 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // while (mvOccupied->BrakeCtrlPos<0 && mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(0); } +#endif } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_WaveBrake]) //[Num.] { if ((isEztOer) && (mvControlled->Mains) && (mvOccupied->BrakeCtrlPos != -1)) @@ -1410,6 +1801,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || // while (mvOccupied->BrakeCtrlPos<-1 && mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(-1); } +#endif else if (cKey == Global::Keys[k_Czuwak]) //--------------- // hunter-131211: zbicie czuwaka przeniesione do TTrain::Update() @@ -1457,6 +1849,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || mvControlled->FuseOn(); } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_DirectionForward]) // McZapkie-240302 - zmiana kierunku: 'd' do przodu, 'r' do tylu { @@ -1483,6 +1876,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || Change_direction); // aktualizacja skrajnych pojazdów w składzie } } +#endif else if (cKey == Global::Keys[k_DirectionBackward]) // r { if (Global::ctrlState) @@ -1494,6 +1888,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || mvOccupied->Radio = false; } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (mvOccupied->DirectionBackward()) { //------------ @@ -1516,6 +1911,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || DynamicObject->Mechanik->CheckVehicles( Change_direction); // aktualizacja skrajnych pojazdów w składzie } +#endif } else if (cKey == Global::Keys[k_Main]) // McZapkie-240302 - wylaczanie glownego obwodu @@ -1634,7 +2030,8 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } } //----------- - else if (cKey == Global::Keys[k_Releaser]) // odluzniacz +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if( cKey == Global::Keys[ k_Releaser ] ) // odluzniacz { if (!FreeFlyModeFlag) { @@ -1654,6 +2051,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } } } +#endif else if (cKey == Global::Keys[k_SmallCompressor]) // Winger 160404: mala // sprezarka wl { // Ra: bez [Shift] też dać dźwięk @@ -2374,7 +2772,7 @@ if else { // McZapkie: poruszanie sie po kabinie, w updatemechpos zawarte sa wiezy - +/* auto step = 1.0f; auto const camerayaw = Global::pCamera->Yaw; Math3D::vector3 direction( 0.0f, 0.0f, step ); @@ -2428,6 +2826,7 @@ if else if (cKey == Global::Keys[k_MechDown]) pMechOffset.y -= 0.25; // McZapkie-120302 - siadanie } +*/ } // else @@ -2573,14 +2972,14 @@ void TTrain::UpdateMechPosition(double dt) vMechVelocity.y = -vMechVelocity.y; // ABu011104: 5*pMechShake.y, zeby ladnie pudlem rzucalo :) pMechPosition = pMechOffset + vector3( 1.5 * pMechShake.x, 2.0 * pMechShake.y, 1.5 * pMechShake.z ); - vMechMovement = 0.5 * vMechMovement; +// vMechMovement = 0.5 * vMechMovement; } else { // hamowanie rzucania przy spadku FPS pMechShake -= pMechShake * std::min( dt, 1.0 ); // po tym chyba potrafią zostać jakieś ułamki, które powodują zjazd pMechOffset += vMechMovement * dt; vMechVelocity.y = 0.5 * vMechVelocity.y; pMechPosition = pMechOffset + vector3( pMechShake.x, 5 * pMechShake.y, pMechShake.z ); - vMechMovement = 0.5 * vMechMovement; +// vMechMovement = 0.5 * vMechMovement; } // numer kabiny (-1: kabina B) if( DynamicObject->Mechanik ) // może nie być? @@ -2636,6 +3035,30 @@ TTrain::GetWorldMechPosition() { bool TTrain::Update( double const Deltatime ) { + // check for sent user commands + // NOTE: this is a temporary arrangement, for the transition period from old command setup to the new one + // eventually commands are going to be retrieved directly by the vehicle, filtered through active control stand + // and ultimately executed, provided the stand allows it. + command_data command; + // NOTE: currently we're only storing commands for local vehicle and there's no id system in place, + // so we're supplying 'default' vehicle id of 0 + while( simulation::Commands.pop( command, static_cast( command_target::vehicle ) | 0 ) ) { + + OnCommand( command ); + } + + // update driver's position + { + vector3 Vec = Global::pCamera->Velocity * -2.0;// -7.5 * Timer::GetDeltaRenderTime(); + Vec.y = -Vec.y; + if( mvOccupied->ActiveCab < 0 ) { + Vec *= -1.0f; + Vec.y = -Vec.y; + } + Vec.RotateY( Global::pCamera->Yaw ); + vMechMovement = Vec; + } + DWORD stat; double dt = Deltatime; // Timer::GetDeltaTime(); if (DynamicObject->mdKabina) @@ -2648,7 +3071,7 @@ bool TTrain::Update( double const Deltatime ) fTachoVelocity = Min0R(fabs(11.31 * mvControlled->WheelDiameter * mvControlled->nrot), mvControlled->Vmax * 1.05); { // skacze osobna zmienna - float ff = Simulation::Time.data().wSecond; // skacze co sekunde - pol sekundy + float ff = simulation::Time.data().wSecond; // skacze co sekunde - pol sekundy // pomiar, pol sekundy ustawienie if (ff != fTachoTimer) // jesli w tej sekundzie nie zmienial { @@ -3326,11 +3749,11 @@ bool TTrain::Update( double const Deltatime ) // McZapkie-300302: zegarek if (ggClockMInd.SubModel) { - ggClockSInd.UpdateValue(Simulation::Time.data().wSecond); + ggClockSInd.UpdateValue(simulation::Time.data().wSecond); ggClockSInd.Update(); - ggClockMInd.UpdateValue(Simulation::Time.data().wMinute); + ggClockMInd.UpdateValue(simulation::Time.data().wMinute); ggClockMInd.Update(); - ggClockHInd.UpdateValue(Simulation::Time.data().wHour + Simulation::Time.data().wMinute / 60.0); + ggClockHInd.UpdateValue(simulation::Time.data().wHour + simulation::Time.data().wMinute / 60.0); ggClockHInd.Update(); } @@ -4462,7 +4885,7 @@ bool TTrain::Update( double const Deltatime ) else */ //----------------- - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM if ((!FreeFlyModeFlag) && (!(DynamicObject->Mechanik ? DynamicObject->Mechanik->AIControllFlag : false))) { @@ -4486,6 +4909,7 @@ bool TTrain::Update( double const Deltatime ) else mvOccupied->BrakeReleaser(0); } // FFMF +#endif if (Console::Pressed(Global::Keys[k_Univ1])) { @@ -4742,6 +5166,7 @@ bool TTrain::Update( double const Deltatime ) if (mvOccupied->BrakeCtrlPos2 < -1.5) mvOccupied->BrakeCtrlPos2 = -1.5; } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else { // mvOccupied->BrakeCtrlPosR+=(mvOccupied->BrakeCtrlPosR>mvOccupied->BrakeCtrlPosNo?0:dt*2); @@ -4749,6 +5174,7 @@ bool TTrain::Update( double const Deltatime ) // mvOccupied->BrakeCtrlPos= // floor(mvOccupied->BrakeCtrlPosR+0.499); } +#endif } if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_DecBrakeLevel]))) @@ -4759,6 +5185,7 @@ bool TTrain::Update( double const Deltatime ) if (mvOccupied->BrakeCtrlPos2 < -3) mvOccupied->BrakeCtrlPos2 = -3; } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else { // mvOccupied->BrakeCtrlPosR-=(mvOccupied->BrakeCtrlPosR<-1?0:dt*2); @@ -4766,6 +5193,7 @@ bool TTrain::Update( double const Deltatime ) // floor(mvOccupied->BrakeCtrlPosR+0.499); mvOccupied->BrakeLevelAdd(-dt * 2); } +#endif } // bool kEP; @@ -5003,7 +5431,9 @@ bool TTrain::Update( double const Deltatime ) ggMainOffButton.UpdateValue(0); ggMainOnButton.UpdateValue(0); ggSecurityResetButton.UpdateValue(0); +/* ggReleaserButton.UpdateValue(0); +*/ ggSandButton.UpdateValue(0); ggAntiSlipButton.UpdateValue(0); ggDepartureSignalButton.UpdateValue(0); @@ -6609,3 +7039,23 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con return true; } + +void +TTrain::play_sound( PSound Sound, PSound Fallbacksound ) { + + if( Sound ) { + + Sound->SetCurrentPosition( 0 ); + Sound->SetVolume( DSBVOLUME_MAX ); + Sound->Play( 0, 0, 0 ); + return; + } + if( Fallbacksound ) { + + Fallbacksound->SetCurrentPosition( 0 ); + Fallbacksound->SetVolume( DSBVOLUME_MAX ); + Fallbacksound->Play( 0, 0, 0 ); + return; + } +} + diff --git a/Train.h b/Train.h index 173d1489..d34ff700 100644 --- a/Train.h +++ b/Train.h @@ -7,24 +7,17 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef TrainH -#define TrainH +#pragma once -//#include "Track.h" -//#include "TrkFoll.h" -#include "Button.h" +#include #include "DynObj.h" +#include "Button.h" #include "Gauge.h" -#include "Model3d.h" #include "Spring.h" -#include "mtable.h" - #include "AdvSound.h" #include "FadeSound.h" #include "PyInt.h" -#include "RealSound.h" -#include "Sound.h" -#include +#include "command.h" // typedef enum {st_Off, st_Starting, st_On, st_ShuttingDown} T4State; @@ -82,6 +75,7 @@ class TTrain bool Init(TDynamicObject *NewDynamicObject, bool e3d = false); void OnKeyDown(int cKey); void OnKeyUp(int cKey); + void OnCommand( command_data const &Command ); // bool SHP() { fShpTimer= 0; }; @@ -113,6 +107,9 @@ class TTrain // initializes a button matching provided label. returns: true if the label was found, false // otherwise bool initialize_button(cParser &Parser, std::string const &Label, int const Cabindex); + // plays specified sound, or fallback sound if the primary sound isn't presend + // NOTE: temporary routine until sound system is sorted out and paired with switches + void play_sound( PSound Sound, PSound Fallbacksound = nullptr ); private: //żeby go nic z zewnątrz nie przestawiało TDynamicObject *DynamicObject; // przestawia zmiana pojazdu [F5] @@ -438,4 +435,3 @@ class TTrain void Silence(); }; //--------------------------------------------------------------------------- -#endif diff --git a/World.cpp b/World.cpp index 7feafa8c..d42f7cfd 100644 --- a/World.cpp +++ b/World.cpp @@ -39,7 +39,7 @@ std::shared_ptr UIHeader = std::make_shared( 20, 20 ); // he std::shared_ptr UITable = std::make_shared( 20, 100 ); // schedule or scan table std::shared_ptr UITranscripts = std::make_shared( 85, 600 ); // voice transcripts -namespace Simulation { +namespace simulation { simulation_time Time; @@ -82,14 +82,13 @@ simulation_time::init() { void simulation_time::update( double const Deltatime ) { - // use large enough buffer to hold long time skips - auto milliseconds = m_time.wMilliseconds + static_cast(std::floor( 1000.0 * Deltatime )); - while( milliseconds >= 1000.0 ) { + m_milliseconds += ( 1000.0 * Deltatime ); + while( m_milliseconds >= 1000.0 ) { ++m_time.wSecond; - milliseconds -= 1000; + m_milliseconds -= 1000.0; } - m_time.wMilliseconds = milliseconds; + m_time.wMilliseconds = std::floor( m_milliseconds ); while( m_time.wSecond >= 60 ) { ++m_time.wMinute; @@ -310,7 +309,7 @@ bool TWorld::Init( GLFWwindow *Window ) { glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii - Simulation::Time.init(); + simulation::Time.init(); Environment.init(); Camera.Init(Global::FreeCameraInit[0], Global::FreeCameraInitAngle[0]); @@ -502,11 +501,11 @@ void TWorld::OnKeyDown(int cKey) // additional time speedup keys in debug mode if( Global::ctrlState ) { // ctrl-f3 - Simulation::Time.update( 20.0 * 60.0 ); + simulation::Time.update( 20.0 * 60.0 ); } else if( Global::shiftState ) { // shift-f3 - Simulation::Time.update( 5.0 * 60.0 ); + simulation::Time.update( 5.0 * 60.0 ); } } if( ( false == Global::ctrlState ) @@ -972,13 +971,15 @@ bool TWorld::Update() WriteLog("Scenery moved"); }; #endif + Timer::UpdateTimers(Global::iPause != 0); + if( (Global::iPause == false) - || (m_init == false) ) - { // jak pauza, to nie ma po co tego przeliczać + || (m_init == false) ) { + // jak pauza, to nie ma po co tego przeliczać + simulation::Time.update( Timer::GetDeltaTime() ); // Ra 2014-07: przeliczenie kąta czasu (do animacji zależnych od czasu) - Simulation::Time.update( Timer::GetDeltaTime() ); - auto const &time = Simulation::Time.data(); + auto const &time = simulation::Time.data(); Global::fTimeAngleDeg = time.wHour * 15.0 + time.wMinute * 0.25 + ( ( time.wSecond + 0.001 * time.wMilliseconds ) / 240.0 ); Global::fClockAngleDeg[ 0 ] = 36.0 * ( time.wSecond % 10 ); // jednostki sekund Global::fClockAngleDeg[ 1 ] = 36.0 * ( time.wSecond / 10 ); // dziesiątki sekund @@ -1107,6 +1108,13 @@ bool TWorld::Update() fTime50Hz += dt; // w pauzie też trzeba zliczać czas, bo przy dużym FPS będzie problem z odczytem ramek while( fTime50Hz >= 1.0 / 50.0 ) { Console::Update(); // to i tak trzeba wywoływać + Update_UI(); + + Camera.Velocity *= 0.65; + if( std::abs( Camera.Velocity.x ) < 0.01 ) { Camera.Velocity.x = 0.0; } + if( std::abs( Camera.Velocity.y ) < 0.01 ) { Camera.Velocity.y = 0.0; } + if( std::abs( Camera.Velocity.z ) < 0.01 ) { Camera.Velocity.z = 0.0; } + fTime50Hz -= 1.0 / 50.0; } @@ -1114,8 +1122,6 @@ bool TWorld::Update() Update_Camera( dt ); - Update_UI(); // TBD, TODO: move the ui updates to secondary fixed step routines, to reduce workload? - GfxRenderer.Update( dt ); ResourceSweep(); @@ -1644,7 +1650,7 @@ TWorld::Update_UI() { case( GLFW_KEY_F1 ) : { // f1, default mode: current time and timetable excerpt - auto const &time = Simulation::Time.data(); + auto const &time = simulation::Time.data(); uitextline1 = "Time: " + to_string( time.wHour ) + ":" @@ -1695,7 +1701,7 @@ TWorld::Update_UI() { auto const table = tmp->Mechanik->Timetable(); if( table == nullptr ) { break; } - auto const &time = Simulation::Time.data(); + auto const &time = simulation::Time.data(); uitextline1 = "Time: " + to_string( time.wHour ) + ":" @@ -2023,8 +2029,8 @@ TWorld::Update_UI() { to_string( tmp->MoverParameters->RunningShape.R, 1 ) ) + " An=" + to_string( tmp->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne - if( tprev != Simulation::Time.data().wSecond ) { - tprev = Simulation::Time.data().wSecond; + if( tprev != simulation::Time.data().wSecond ) { + tprev = simulation::Time.data().wSecond; Acc = ( tmp->MoverParameters->Vel - VelPrev ) / 3.6; VelPrev = tmp->MoverParameters->Vel; } @@ -2184,8 +2190,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) if (e) if ((e->Type == tp_Multiple) || (e->Type == tp_Lights) || (e->evJoined != 0)) // tylko jawne albo niejawne Multiple - Ground.AddToQuery(e, NULL); // drugi parametr to dynamic wywołujący - tu - // brak + Ground.AddToQuery(e, NULL); // drugi parametr to dynamic wywołujący - tu brak } break; case 3: // rozkaz dla AI @@ -2229,12 +2234,12 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) if (*pRozkaz->iPar & 1) // ustawienie czasu { double t = pRozkaz->fPar[1]; - Simulation::Time.data().wDay = std::floor(t); // niby nie powinno być dnia, ale... + simulation::Time.data().wDay = std::floor(t); // niby nie powinno być dnia, ale... if (Global::fMoveLight >= 0) Global::fMoveLight = t; // trzeba by deklinację Słońca przeliczyć - Simulation::Time.data().wHour = std::floor(24 * t) - 24.0 * Simulation::Time.data().wDay; - Simulation::Time.data().wMinute = std::floor(60 * 24 * t) - 60.0 * (24.0 * Simulation::Time.data().wDay + Simulation::Time.data().wHour); - Simulation::Time.data().wSecond = std::floor( 60 * 60 * 24 * t ) - 60.0 * ( 60.0 * ( 24.0 * Simulation::Time.data().wDay + Simulation::Time.data().wHour ) + Simulation::Time.data().wMinute ); + simulation::Time.data().wHour = std::floor(24 * t) - 24.0 * simulation::Time.data().wDay; + simulation::Time.data().wMinute = std::floor(60 * 24 * t) - 60.0 * (24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour); + simulation::Time.data().wSecond = std::floor( 60 * 60 * 24 * t ) - 60.0 * ( 60.0 * ( 24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour ) + simulation::Time.data().wMinute ); } if (*pRozkaz->iPar & 2) { // ustawienie flag zapauzowania diff --git a/World.h b/World.h index dd15dbc3..312bd3cf 100644 --- a/World.h +++ b/World.h @@ -49,11 +49,12 @@ private: daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ); SYSTEMTIME m_time; + double m_milliseconds{ 0.0 }; int m_yearday; char m_monthdaycounts[ 2 ][ 13 ]; }; -namespace Simulation { +namespace simulation { extern simulation_time Time; diff --git a/command.cpp b/command.cpp new file mode 100644 index 00000000..b1bde4f4 --- /dev/null +++ b/command.cpp @@ -0,0 +1,300 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "command.h" + +#include "globals.h" +#include "logs.h" +#include "timer.h" + +namespace simulation { + +command_queue Commands; + +} + +// posts specified command for specified recipient +void +command_queue::push( command_data const &Command, std::size_t const Recipient ) { + + auto lookup = m_commands.emplace( Recipient, commanddata_sequence() ); + // recipient stack was either located or created, so we can add to it quite safely + lookup.first->second.emplace( Command ); +} + +// retrieves oldest posted command for specified recipient, if any. returns: true on retrieval, false if there's nothing to retrieve +bool +command_queue::pop( command_data &Command, std::size_t const Recipient ) { + + auto lookup = m_commands.find( Recipient ); + if( lookup == m_commands.end() ) { + // no command stack for this recipient, so no commands + return false; + } + auto &commands = lookup->second; + if( true == commands.empty() ) { + + return false; + } + // we have command stack with command(s) on it, retrieve and pop the first one + Command = commands.front(); + commands.pop(); + + return true; +} + +command_relay::command_relay() { + + m_targets = commandtarget_map{ + + { user_command::mastercontrollerincrease, command_target::vehicle }, + { user_command::mastercontrollerincreasefast, command_target::vehicle }, + { user_command::mastercontrollerdecrease, command_target::vehicle }, + { user_command::mastercontrollerdecreasefast, command_target::vehicle }, + { user_command::secondcontrollerincrease, command_target::vehicle }, + { user_command::secondcontrollerincreasefast, command_target::vehicle }, + { user_command::secondcontrollerdecrease, command_target::vehicle }, + { user_command::secondcontrollerdecreasefast, command_target::vehicle }, + { user_command::independentbrakeincrease, command_target::vehicle }, + { user_command::independentbrakeincreasefast, command_target::vehicle }, + { user_command::independentbrakedecrease, command_target::vehicle }, + { user_command::independentbrakedecreasefast, command_target::vehicle }, + { user_command::independentbrakebailoff, command_target::vehicle }, + { user_command::trainbrakeincrease, command_target::vehicle }, + { user_command::trainbrakedecrease, command_target::vehicle }, + { user_command::trainbrakecharging, command_target::vehicle }, + { user_command::trainbrakerelease, command_target::vehicle }, + { user_command::trainbrakefirstservice, command_target::vehicle }, + { user_command::trainbrakeservice, command_target::vehicle }, + { user_command::trainbrakefullservice, command_target::vehicle }, + { user_command::trainbrakeemergency, command_target::vehicle }, +/* +const int k_AntiSlipping = 21; +const int k_Sand = 22; +const int k_Main = 23; +*/ + { user_command::reverserincrease, command_target::vehicle }, + { user_command::reverserdecrease, command_target::vehicle }, +/* +const int k_Fuse = 26; +const int k_Compressor = 27; +const int k_Converter = 28; +const int k_MaxCurrent = 29; +const int k_CurrentAutoRelay = 30; +const int k_BrakeProfile = 31; +const int k_Czuwak = 32; +const int k_Horn = 33; +const int k_Horn2 = 34; +const int k_FailedEngineCutOff = 35; +*/ + { user_command::viewturn, command_target::entity }, + { user_command::movevector, command_target::entity }, + { user_command::moveleft, command_target::entity }, + { user_command::moveright, command_target::entity }, + { user_command::moveforward, command_target::entity }, + { user_command::moveback, command_target::entity }, + { user_command::moveup, command_target::entity }, + { user_command::movedown, command_target::entity }, + { user_command::moveleftfast, command_target::entity }, + { user_command::moverightfast, command_target::entity }, + { user_command::moveforwardfast, command_target::entity }, + { user_command::movebackfast, command_target::entity }, + { user_command::moveupfast, command_target::entity }, + { user_command::movedownfast, command_target::entity } +/* + { user_command::moveleftfastest, command_target::entity }, + { user_command::moverightfastest, command_target::entity }, + { user_command::moveforwardfastest, command_target::entity }, + { user_command::movebackfastest, command_target::entity }, + { user_command::moveupfastest, command_target::entity }, + { user_command::movedownfastest, command_target::entity } +*/ +/* +const int k_CabForward = 42; +const int k_CabBackward = 43; +const int k_Couple = 44; +const int k_DeCouple = 45; +const int k_ProgramQuit = 46; +// const int k_ProgramPause= 47; +const int k_ProgramHelp = 48; +const int k_OpenLeft = 49; +const int k_OpenRight = 50; +const int k_CloseLeft = 51; +const int k_CloseRight = 52; +const int k_DepartureSignal = 53; +const int k_PantFrontUp = 54; +const int k_PantRearUp = 55; +const int k_PantFrontDown = 56; +const int k_PantRearDown = 57; +const int k_Heating = 58; +// const int k_FreeFlyMode= 59; +const int k_LeftSign = 60; +const int k_UpperSign = 61; +const int k_RightSign = 62; +const int k_SmallCompressor = 63; +const int k_StLinOff = 64; +const int k_CurrentNext = 65; +const int k_Univ1 = 66; +const int k_Univ2 = 67; +const int k_Univ3 = 68; +const int k_Univ4 = 69; +const int k_EndSign = 70; +const int k_Active = 71; +const int k_Battery = 72; +const int k_WalkMode = 73; +int const k_DimHeadlights = 74; +*/ + }; + +#ifdef _DEBUG + m_commandnames = { + + "mastercontrollerincrease", + "mastercontrollerincreasefast", + "mastercontrollerdecrease", + "mastercontrollerdecreasefast", + "secondcontrollerincrease", + "secondcontrollerincreasefast", + "secondcontrollerdecrease", + "secondcontrollerdecreasefast", + "independentbrakeincrease", + "independentbrakeincreasefast", + "independentbrakedecrease", + "independentbrakedecreasefast", + "independentbrakebailoff", + "trainbrakeincrease", + "trainbrakedecrease", + "trainbrakecharging", + "trainbrakerelease", + "trainbrakefirstservice", + "trainbrakeservice", + "trainbrakefullservice", + "trainbrakeemergency", +/* +const int k_AntiSlipping = 21; +const int k_Sand = 22; +const int k_Main = 23; +*/ + "reverserincrease", + "reverserdecrease", +/* +const int k_Fuse = 26; +const int k_Compressor = 27; +const int k_Converter = 28; +const int k_MaxCurrent = 29; +const int k_CurrentAutoRelay = 30; +const int k_BrakeProfile = 31; +const int k_Czuwak = 32; +const int k_Horn = 33; +const int k_Horn2 = 34; +const int k_FailedEngineCutOff = 35; +*/ + "", //"viewturn", + "", //"movevector", + "", //"moveleft", + "", //"moveright", + "", //"moveforward", + "", //"moveback", + "", //"moveup", + "", //"movedown", + "", //"moveleftfast", + "", //"moverightfast", + "", //"moveforwardfast", + "", //"movebackfast", + "", //"moveupfast", + "" //"movedownfast" +/* + "moveleftfastest", + "moverightfastest", + "moveforwardfastest", + "movebackfastest", + "moveupfastest", + "movedownfastest" +*/ +/* +const int k_CabForward = 42; +const int k_CabBackward = 43; +const int k_Couple = 44; +const int k_DeCouple = 45; +const int k_ProgramQuit = 46; +// const int k_ProgramPause= 47; +const int k_ProgramHelp = 48; +const int k_OpenLeft = 49; +const int k_OpenRight = 50; +const int k_CloseLeft = 51; +const int k_CloseRight = 52; +const int k_DepartureSignal = 53; +const int k_PantFrontUp = 54; +const int k_PantRearUp = 55; +const int k_PantFrontDown = 56; +const int k_PantRearDown = 57; +const int k_Heating = 58; +// const int k_FreeFlyMode= 59; +const int k_LeftSign = 60; +const int k_UpperSign = 61; +const int k_RightSign = 62; +const int k_SmallCompressor = 63; +const int k_StLinOff = 64; +const int k_CurrentNext = 65; +const int k_Univ1 = 66; +const int k_Univ2 = 67; +const int k_Univ3 = 68; +const int k_Univ4 = 69; +const int k_EndSign = 70; +const int k_Active = 71; +const int k_Battery = 72; +const int k_WalkMode = 73; +int const k_DimHeadlights = 74; +*/ + }; +#endif +} + +void +command_relay::post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, std::uint16_t const Recipient ) const { + + auto const &lookup = m_targets.find( Command ); + if( lookup == m_targets.end() ) { + // shouldn't be really needed but, eh + return; + } + if( ( lookup->second == command_target::vehicle ) + && ( true == FreeFlyModeFlag ) ) { + // don't pass vehicle commands if the user isn't in one + return; + } + + simulation::Commands.push( + command_data{ + Command, + Action, + Param1, + Param2, + Timer::GetDeltaTime() }, + static_cast( lookup->second ) | Recipient ); + +#ifdef _DEBUG + if( Action != GLFW_RELEASE ) { + // key was pressed or is still held + auto const &commandname = m_commandnames.at( static_cast( Command ) ); + if( false == commandname.empty() ) { + WriteLog( "Command issued: " + commandname ); + } + } +/* + else { + // key was released (but we don't log this) + WriteLog( "Key released: " + m_commandnames.at( static_cast( Command ) ) ); + } +*/ +#endif +} + +//--------------------------------------------------------------------------- diff --git a/command.h b/command.h new file mode 100644 index 00000000..ad02d2f7 --- /dev/null +++ b/command.h @@ -0,0 +1,196 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include + +enum class user_command { + + mastercontrollerincrease, + mastercontrollerincreasefast, + mastercontrollerdecrease, + mastercontrollerdecreasefast, + secondcontrollerincrease, + secondcontrollerincreasefast, + secondcontrollerdecrease, + secondcontrollerdecreasefast, + independentbrakeincrease, + independentbrakeincreasefast, + independentbrakedecrease, + independentbrakedecreasefast, + independentbrakebailoff, + trainbrakeincrease, + trainbrakedecrease, + trainbrakecharging, + trainbrakerelease, + trainbrakefirstservice, + trainbrakeservice, + trainbrakefullservice, + trainbrakeemergency, +/* +const int k_AntiSlipping = 21; +const int k_Sand = 22; +const int k_Main = 23; +*/ + reverserincrease, + reverserdecrease, +/* +const int k_Fuse = 26; +const int k_Compressor = 27; +const int k_Converter = 28; +const int k_MaxCurrent = 29; +const int k_CurrentAutoRelay = 30; +const int k_BrakeProfile = 31; +const int k_Czuwak = 32; +const int k_Horn = 33; +const int k_Horn2 = 34; +const int k_FailedEngineCutOff = 35; +*/ + viewturn, + movevector, + moveleft, + moveright, + moveforward, + moveback, + moveup, + movedown, + moveleftfast, + moverightfast, + moveforwardfast, + movebackfast, + moveupfast, + movedownfast +/* + moveleftfastest, + moverightfastest, + moveforwardfastest, + movebackfastest, + moveupfastest, + movedownfastest +*/ +/* +const int k_CabForward = 42; +const int k_CabBackward = 43; +const int k_Couple = 44; +const int k_DeCouple = 45; +const int k_ProgramQuit = 46; +// const int k_ProgramPause= 47; +const int k_ProgramHelp = 48; +const int k_OpenLeft = 49; +const int k_OpenRight = 50; +const int k_CloseLeft = 51; +const int k_CloseRight = 52; +const int k_DepartureSignal = 53; +const int k_PantFrontUp = 54; +const int k_PantRearUp = 55; +const int k_PantFrontDown = 56; +const int k_PantRearDown = 57; +const int k_Heating = 58; +// const int k_FreeFlyMode= 59; +const int k_LeftSign = 60; +const int k_UpperSign = 61; +const int k_RightSign = 62; +const int k_SmallCompressor = 63; +const int k_StLinOff = 64; +const int k_CurrentNext = 65; +const int k_Univ1 = 66; +const int k_Univ2 = 67; +const int k_Univ3 = 68; +const int k_Univ4 = 69; +const int k_EndSign = 70; +const int k_Active = 71; +const int k_Battery = 72; +const int k_WalkMode = 73; +int const k_DimHeadlights = 74; +*/ + +}; + +enum class command_target { + + userinterface, + simulation, +/* + // NOTE: there's no need for consist- and unit-specific commands at this point, but it's a possibility. + // since command targets are mutually exclusive these don't reduce ranges for individual vehicles etc + consist = 0x4000, + unit = 0x8000, +*/ + // values are combined with object id. 0xffff objects of each type should be quite enough ("for everyone") + vehicle = 0x10000, + signal = 0x20000, + entity = 0x40000 +}; + +struct command_data { + + user_command command; + int action; // press, repeat or release + std::uint64_t param1; + std::uint64_t param2; + double time_delta; +}; + +// command_queues: collects and holds commands from input sources, for processing by their intended recipients +// NOTE: this won't scale well. +// TODO: turn it into a dispatcher and build individual command sequences into the items, where they can be examined without lookups + +class command_queue { + +public: +// methods + // posts specified command for specified recipient + void + push( command_data const &Command, std::size_t const Recipient ); + // retrieves oldest posted command for specified recipient, if any. returns: true on retrieval, false if there's nothing to retrieve + bool + pop( command_data &Command, std::size_t const Recipient ); + +private: +// types + typedef std::queue commanddata_sequence; + typedef std::unordered_map commanddatasequence_map; +// members + commanddatasequence_map m_commands; + +}; + +// NOTE: simulation should be a (light) wrapper rather than namespace so we could potentially instance it, +// but realistically it's not like we're going to run more than one simulation at a time +namespace simulation { + +extern command_queue Commands; + +} + +// command_relay: composite class component, passes specified command to appropriate command stack + +class command_relay { + +public: +// constructors + command_relay(); +// methods + // posts specified command for the specified recipient + // TODO: replace uint16_t with recipient handle, based on item id + void + post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, std::uint16_t const Recipient ) const; +private: +// types + typedef std::unordered_map commandtarget_map; +// members + commandtarget_map m_targets; +#ifdef _DEBUG + std::vector m_commandnames; +#endif +}; + +//--------------------------------------------------------------------------- diff --git a/gamepadinput.cpp b/gamepadinput.cpp new file mode 100644 index 00000000..2c1dfa1a --- /dev/null +++ b/gamepadinput.cpp @@ -0,0 +1,352 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "gamepadinput.h" +#include "logs.h" +#include "timer.h" +#include "usefull.h" + +glm::vec2 circle_to_square( glm::vec2 const &Point, int const Roundness = 0 ) { + + // Determine the theta angle + auto angle = std::atan2( Point.x, Point.y ) + M_PI; + + glm::vec2 squared; + // Scale according to which wall we're clamping to + // X+ wall + if( angle <= M_PI_4 || angle > 7 * M_PI_4 ) + squared = Point * (float)( 1.0 / std::cos( angle ) ); + // Y+ wall + else if( angle > M_PI_4 && angle <= 3 * M_PI_4 ) + squared = Point * (float)( 1.0 / std::sin( angle ) ); + // X- wall + else if( angle > 3 * M_PI_4 && angle <= 5 * M_PI_4 ) + squared = Point * (float)( -1.0 / std::cos( angle ) ); + // Y- wall + else if( angle > 5 * M_PI_4 && angle <= 7 * M_PI_4 ) + squared = Point * (float)( -1.0 / std::sin( angle ) ); + + // Early-out for a perfect square output + if( Roundness == 0 ) + return squared; + + // Find the inner-roundness scaling factor and LERP + auto const length = glm::length( Point ); + auto const factor = std::pow( length, Roundness ); + return interpolate( Point, squared, factor ); +} + +gamepad_input::gamepad_input() { + + m_modecommands = { + + { user_command::mastercontrollerincrease, user_command::mastercontrollerdecrease }, + { user_command::trainbrakedecrease, user_command::trainbrakeincrease }, + { user_command::secondcontrollerincrease, user_command::secondcontrollerdecrease }, + { user_command::independentbrakedecrease, user_command::independentbrakeincrease } + }; +} + +bool +gamepad_input::init() { + + // NOTE: we're only checking for joystick_1 and rely for it to stay connected throughout. + // not exactly flexible, but for quick hack it'll do + auto const name = glfwGetJoystickName( GLFW_JOYSTICK_1 ); + if( name != nullptr ) { + WriteLog( "Connected gamepad: " + std::string( name ) ); + m_deviceid = GLFW_JOYSTICK_1; + } + else { + // no joystick, + WriteLog( "No gamepad detected" ); + m_axes.clear(); + m_buttons.clear(); + return false; + } + + int count; + + glfwGetJoystickAxes( m_deviceid, &count ); + m_axes.resize( count ); + + glfwGetJoystickButtons( m_deviceid, &count ); + m_buttons.resize( count ); + + return true; +} + +// checks state of the controls and sends issued commands +void +gamepad_input::poll() { + + int count; std::size_t idx = 0; + // poll button state + auto const buttons = glfwGetJoystickButtons( m_deviceid, &count ); + if( count ) { // safety check in case joystick gets pulled out + for( auto &button : m_buttons ) { + + if( button != buttons[ idx ] ) { + // button pressed or released, both are important + on_button( + static_cast( idx ), + ( buttons[ idx ] == 1 ? + GLFW_PRESS : + GLFW_RELEASE ) ); + } + else { + // otherwise we only pass info about button being held down + if( button == 1 ) { + + on_button( + static_cast( idx ), + GLFW_REPEAT ); + } + } + button = buttons[ idx ]; + ++idx; + } + } + + if( m_deviceid == -1 ) { + // if there's no gamepad we can skip the rest + return; + } + // poll axes state + idx = 0; + glm::vec2 leftstick, rightstick, triggers; + auto const axes = glfwGetJoystickAxes( m_deviceid, &count ); + if( count ) { + // safety check in case joystick gets pulled out + if( count >= 2 ) { + leftstick = glm::vec2( + ( std::abs( axes[ gamepad_axes::leftstick_x ] ) > m_deadzone ? + axes[ gamepad_axes::leftstick_x ] : + 0.0f ), + ( std::abs( axes[ gamepad_axes::leftstick_y ] ) > m_deadzone ? + axes[ gamepad_axes::leftstick_y ] : + 0.0f ) ); + } + if( count >= 4 ) { + rightstick = glm::vec2( + ( std::abs( axes[ gamepad_axes::rightstick_x ] ) > m_deadzone ? + axes[ gamepad_axes::rightstick_x ] : + 0.0f ), + ( std::abs( axes[ gamepad_axes::rightstick_y ] ) > m_deadzone ? + axes[ gamepad_axes::rightstick_y ] : + 0.0f ) ); + } + if( count >= 6 ) { + triggers = glm::vec2( + ( axes[ gamepad_axes::lefttrigger ] > m_deadzone ? + axes[ gamepad_axes::lefttrigger ] : + 0.0f ), + ( axes[ gamepad_axes::righttrigger ] > m_deadzone ? + axes[ gamepad_axes::righttrigger ] : + 0.0f ) ); + } + } + process_axes( leftstick, rightstick, triggers ); +} + +void +gamepad_input::on_button( gamepad_button const Button, int const Action ) { + + switch( Button ) { + // NOTE: this is rigid coupling, down the road we should support more flexible binding of functions with buttons + case gamepad_button::a: + case gamepad_button::b: + case gamepad_button::x: + case gamepad_button::y: { + + if( Action == GLFW_RELEASE ) { + // if the button was released the stick controls movement + m_mode = control_mode::entity; + // zero the stick and the accumulator so the input won't bleed between modes + m_leftstick = glm::vec2(); + m_modeaccumulator = 0.0f; + } + else { + // otherwise set control mode to match pressed button + m_mode = static_cast( Button ); + } + break; + } + default: { + break; + } + } +} + +void +gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, glm::vec2 const &Triggers ) { + + // left stick, look around + if( ( Rightstick.x != 0.0f ) || ( Rightstick.y != 0.0f ) ) { + // TODO: make toggles for the axis flip + auto const deltatime = Timer::GetDeltaRenderTime() * 60.0; + double const turnx = Rightstick.x * 10.0 * deltatime; + double const turny = -Rightstick.y * 10.0 * deltatime; + m_relay.post( + user_command::viewturn, + reinterpret_cast( turnx ), + reinterpret_cast( turny ), + GLFW_PRESS, + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + 0 ); + } + + // right stick, either movement or controls, depending on currently active mode + if( m_mode == control_mode::entity ) { + + if( ( Leftstick.x != 0.0 || Leftstick.y != 0.0 ) + || ( m_leftstick.x != 0.0 || m_leftstick.y != 0.0 ) ) { + double const movex = static_cast( Leftstick.x ); + double const movez = static_cast( Leftstick.y ); + m_relay.post( + user_command::movevector, + reinterpret_cast( movex ), + reinterpret_cast( movez ), + GLFW_PRESS, + 0 ); + } +/* + Leftstick = circle_to_square( Leftstick ); + if( Leftstick.y >= 0.0f ) { + // forward + process_axis( + Leftstick.y, m_leftstick.y, + 1.0, + user_command::moveforward, + user_command::moveforwardfast, + 0 ); + } + if( Leftstick.y <= 0.0f ) { + // back + process_axis( + Leftstick.y, m_leftstick.y, + -1.0, + user_command::moveback, + user_command::movebackfast, + 0 ); + } + if( Leftstick.x >= 0.0f ) { + // right + process_axis( + Leftstick.x, m_leftstick.x, + 1.0, + user_command::moveright, + user_command::moverightfast, + 0 ); + } + if( Leftstick.x <= 0.0f ) { + // left + process_axis( + Leftstick.x, m_leftstick.x, + -1.0, + user_command::moveleft, + user_command::moveleftfast, + 0 ); + } +*/ + } + else { + // vehicle control modes + process_mode( Leftstick.y, 0 ); + } + + m_rightstick = Rightstick; + m_leftstick = Leftstick; + m_triggers = Triggers; +} + +void +gamepad_input::process_axis( float const Value, float const Previousvalue, float const Multiplier, user_command Command, std::uint16_t const Recipient ) { + + process_axis( Value, Previousvalue, Multiplier, Command, Command, Recipient ); +} + +void +gamepad_input::process_axis( float const Value, float const Previousvalue, float const Multiplier, user_command Command1, user_command Command2, std::uint16_t const Recipient ) { + + user_command command{ Command1 }; + if( Value * Multiplier > 0.9 ) { + command = Command2; + } + + if( Value * Multiplier > 0.0f ) { + + m_relay.post( + command, + 0, 0, + GLFW_PRESS, + Recipient + ); + } + else { + // if we had movement before but not now, report this as 'button' release + if( Previousvalue != 0.0f ) { + m_relay.post( + command, // doesn't matter which movement 'mode' we report + 0, 0, + GLFW_RELEASE, + 0 + ); + } + } +} + +void +gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) { + + // TODO: separate multiplier for each mode, to allow different, customizable sensitivity for each control + auto const deltatime = Timer::GetDeltaTime() * 15.0; + auto const &lookup = m_modecommands.at( static_cast( m_mode ) ); + + if( Value >= 0.0f ) { + if( m_modeaccumulator < 0.0f ) { + // reset accumulator if we're going in the other direction i.e. issuing opposite control + m_modeaccumulator = 0.0f; + } + if( Value > m_deadzone ) { + m_modeaccumulator += Value * deltatime; + while( m_modeaccumulator >= 1.0f ) { + // send commands if the accumulator(s) was filled + m_relay.post( + lookup.first, + 0, 0, + GLFW_PRESS, + Recipient ); + m_modeaccumulator -= 1.0f; + } + } + } + else { + if( m_modeaccumulator > 0.0f ) { + // reset accumulator if we're going in the other direction i.e. issuing opposite control + m_modeaccumulator = 0.0f; + } + if( Value < m_deadzone ) { + m_modeaccumulator += Value * deltatime; + while( m_modeaccumulator <= -1.0f ) { + // send commands if the accumulator(s) was filled + m_relay.post( + lookup.second, + 0, 0, + GLFW_PRESS, + Recipient ); + m_modeaccumulator += 1.0f; + } + } + } +} + +//--------------------------------------------------------------------------- diff --git a/gamepadinput.h b/gamepadinput.h new file mode 100644 index 00000000..21b33cb7 --- /dev/null +++ b/gamepadinput.h @@ -0,0 +1,86 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include "command.h" + +class gamepad_input { + +public: +// constructors + gamepad_input(); + +// methods + // checks state of the controls and sends issued commands + bool + init(); + void + poll(); + +private: +// types + enum gamepad_button { + a, + b, + x, + y, + left_shoulder, + right_shoulder, + back, + start, + left_sticker, + right_sticker, + dpad_up, + dpad_right, + dpad_down, + dpad_left + }; + enum gamepad_axes { + leftstick_x, + leftstick_y, + rightstick_x, + rightstick_y, + lefttrigger, + righttrigger + }; + enum class control_mode { + entity = -1, + vehicle_mastercontroller, + vehicle_trainbrake, + vehicle_secondarycontroller, + vehicle_independentbrake + }; + typedef std::vector float_sequence; + typedef std::vector char_sequence; + typedef std::vector< std::pair< user_command, user_command > > commandpair_sequence; + +// methods + void on_button( gamepad_button const Button, int const Action ); + void process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, glm::vec2 const &Triggers ); + void process_axis( float const Value, float const Previousvalue, float const Multiplier, user_command Command, std::uint16_t const Recipient ); + void process_axis( float const Value, float const Previousvalue, float const Multiplier, user_command Command1, user_command Command2, /*user_command Command3,*/ std::uint16_t const Recipient ); + void process_mode( float const Value, std::uint16_t const Recipient ); + +// members + command_relay m_relay; + float_sequence m_axes; + char_sequence m_buttons; + int m_deviceid{ -1 }; + control_mode m_mode{ control_mode::entity }; + commandpair_sequence m_modecommands; // sets of commands issued depending on the active control mode + float m_deadzone{ 0.15f }; // TODO: allow to configure this + glm::vec2 m_leftstick; + glm::vec2 m_rightstick; + glm::vec2 m_triggers; + double m_modeaccumulator; // used to throttle command input rate for vehicle controls +}; + +//--------------------------------------------------------------------------- diff --git a/keyboardinput.cpp b/keyboardinput.cpp new file mode 100644 index 00000000..eacbee31 --- /dev/null +++ b/keyboardinput.cpp @@ -0,0 +1,204 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "keyboardinput.h" +#include "logs.h" + +void +keyboard_input::recall_bindings() { + + // TODO: implement + + bind(); +} + +bool +keyboard_input::key( int const Key, int const Action ) { + + bool modifier( false ); + + if( ( Key == GLFW_KEY_LEFT_SHIFT ) || ( Key == GLFW_KEY_RIGHT_SHIFT ) ) { + // update internal state, but don't bother passing these + m_shift = + ( Action == GLFW_RELEASE ? + false : + true ); + modifier = true; + } + if( ( Key == GLFW_KEY_LEFT_CONTROL ) || ( Key == GLFW_KEY_RIGHT_CONTROL ) ) { + // update internal state, but don't bother passing these + m_ctrl = + ( Action == GLFW_RELEASE ? + false : + true ); + modifier = true; + } + if( ( Key == GLFW_KEY_LEFT_ALT ) || ( Key == GLFW_KEY_RIGHT_ALT ) ) { + // currently we have no interest in these whatsoever + return false; + } + + // include active modifiers for currently pressed key, except if the key is a modifier itself + auto const key = + Key + | ( modifier ? 0 : ( m_shift ? keymodifier::shift : 0 ) ) + | ( modifier ? 0 : ( m_ctrl ? keymodifier::control : 0 ) ); + + auto const lookup = m_bindings.find( key ); + if( lookup == m_bindings.end() ) { + // no binding for this key + return false; + } + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( lookup->second, 0, 0, Action, 0 ); + + return true; +} + +void +keyboard_input::mouse( double Mousex, double Mousey ) { + + m_relay.post( + user_command::viewturn, + reinterpret_cast( Mousex ), + reinterpret_cast( Mousey ), + GLFW_PRESS, + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + 0 ); +} + +void +keyboard_input::default_bindings() { + + m_commands = { + + { "mastercontrollerincrease", command_target::vehicle, GLFW_KEY_KP_ADD }, + { "mastercontrollerincreasefast", command_target::vehicle, GLFW_KEY_KP_ADD | keymodifier::shift }, + { "mastercontrollerdecrease", command_target::vehicle, GLFW_KEY_KP_SUBTRACT }, + { "mastercontrollerdecreasefast", command_target::vehicle, GLFW_KEY_KP_SUBTRACT | keymodifier::shift }, + { "secondcontrollerincrease", command_target::vehicle, GLFW_KEY_KP_DIVIDE }, + { "secondcontrollerincreasefast", command_target::vehicle, GLFW_KEY_KP_DIVIDE | keymodifier::shift }, + { "secondcontrollerdecrease", command_target::vehicle, GLFW_KEY_KP_MULTIPLY }, + { "secondcontrollerdecreasefast", command_target::vehicle, GLFW_KEY_KP_MULTIPLY | keymodifier::shift }, + { "independentbrakeincrease", command_target::vehicle, GLFW_KEY_KP_1 }, + { "independentbrakeincreasefast", command_target::vehicle, GLFW_KEY_KP_1 | keymodifier::shift }, + { "independentbrakedecrease", command_target::vehicle, GLFW_KEY_KP_7 }, + { "independentbrakedecreasefast", command_target::vehicle, GLFW_KEY_KP_7 | keymodifier::shift }, + { "independentbrakebailoff", command_target::vehicle, GLFW_KEY_KP_4 }, + { "trainbrakeincrease", command_target::vehicle, GLFW_KEY_KP_3 }, + { "trainbrakedecrease", command_target::vehicle, GLFW_KEY_KP_9 }, + { "trainbrakecharging", command_target::vehicle, GLFW_KEY_KP_DECIMAL }, + { "trainbrakerelease", command_target::vehicle, GLFW_KEY_KP_6 }, + { "trainbrakefirstservice", command_target::vehicle, GLFW_KEY_KP_8 }, + { "trainbrakeservice", command_target::vehicle, GLFW_KEY_KP_5 }, + { "trainbrakefullservice", command_target::vehicle, GLFW_KEY_KP_2 }, + { "trainbrakeemergency", command_target::vehicle, GLFW_KEY_KP_0 }, +/* +const int k_AntiSlipping = 21; +const int k_Sand = 22; +const int k_Main = 23; +*/ + { "reverserincrease", command_target::vehicle, GLFW_KEY_D }, + { "reverserdecrease", command_target::vehicle, GLFW_KEY_R }, +/* +const int k_Fuse = 26; +const int k_Compressor = 27; +const int k_Converter = 28; +const int k_MaxCurrent = 29; +const int k_CurrentAutoRelay = 30; +const int k_BrakeProfile = 31; +const int k_Czuwak = 32; +const int k_Horn = 33; +const int k_Horn2 = 34; +const int k_FailedEngineCutOff = 35; +*/ + { "viewturn", command_target::entity, -1 }, + { "movevector", command_target::entity, -1 }, + { "moveleft", command_target::entity, GLFW_KEY_LEFT }, + { "moveright", command_target::entity, GLFW_KEY_RIGHT }, + { "moveforward", command_target::entity, GLFW_KEY_UP }, + { "moveback", command_target::entity, GLFW_KEY_DOWN }, + { "moveup", command_target::entity, GLFW_KEY_PAGE_UP }, + { "movedown", command_target::entity, GLFW_KEY_PAGE_DOWN }, + { "moveleftfast", command_target::entity, GLFW_KEY_LEFT | keymodifier::shift }, + { "moverightfast", command_target::entity, GLFW_KEY_RIGHT | keymodifier::shift }, + { "moveforwardfast", command_target::entity, GLFW_KEY_UP | keymodifier::shift }, + { "movebackfast", command_target::entity, GLFW_KEY_DOWN | keymodifier::shift }, + { "moveupfast", command_target::entity, GLFW_KEY_PAGE_UP | keymodifier::shift }, + { "movedownfast", command_target::entity, GLFW_KEY_PAGE_DOWN | keymodifier::shift } +/* + { "moveleftfastest", command_target::entity, GLFW_KEY_LEFT | keymodifier::control }, + { "moverightfastest", command_target::entity, GLFW_KEY_RIGHT | keymodifier::control }, + { "moveforwardfastest", command_target::entity, GLFW_KEY_UP | keymodifier::control }, + { "movebackfastest", command_target::entity, GLFW_KEY_DOWN | keymodifier::control }, + { "moveupfastest", command_target::entity, GLFW_KEY_PAGE_UP | keymodifier::control }, + { "movedownfastest", command_target::entity, GLFW_KEY_PAGE_DOWN | keymodifier::control } +*/ +/* +const int k_CabForward = 42; +const int k_CabBackward = 43; +const int k_Couple = 44; +const int k_DeCouple = 45; +const int k_ProgramQuit = 46; +// const int k_ProgramPause= 47; +const int k_ProgramHelp = 48; +const int k_OpenLeft = 49; +const int k_OpenRight = 50; +const int k_CloseLeft = 51; +const int k_CloseRight = 52; +const int k_DepartureSignal = 53; +const int k_PantFrontUp = 54; +const int k_PantRearUp = 55; +const int k_PantFrontDown = 56; +const int k_PantRearDown = 57; +const int k_Heating = 58; +// const int k_FreeFlyMode= 59; +const int k_LeftSign = 60; +const int k_UpperSign = 61; +const int k_RightSign = 62; +const int k_SmallCompressor = 63; +const int k_StLinOff = 64; +const int k_CurrentNext = 65; +const int k_Univ1 = 66; +const int k_Univ2 = 67; +const int k_Univ3 = 68; +const int k_Univ4 = 69; +const int k_EndSign = 70; +const int k_Active = 71; +const int k_Battery = 72; +const int k_WalkMode = 73; +int const k_DimHeadlights = 74; +*/ + }; + + bind(); +} + +void +keyboard_input::bind() { + + m_bindings.clear(); + + int commandcode{ 0 }; + for( auto const &command : m_commands ) { + + if( command.binding != -1 ) { + m_bindings.emplace( + command.binding, + static_cast( commandcode ) ); + } + ++commandcode; + } +} + +//--------------------------------------------------------------------------- diff --git a/keyboardinput.h b/keyboardinput.h new file mode 100644 index 00000000..c8e2fb43 --- /dev/null +++ b/keyboardinput.h @@ -0,0 +1,61 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include "command.h" + +class keyboard_input { + +public: +// constructors + keyboard_input() { default_bindings(); } + +// methods + void + recall_bindings(); + bool + key( int const Key, int const Action ); + void + mouse( double const Mousex, double const Mousey ); + +private: +// types + enum keymodifier : int { + + shift = 0x10000, + control = 0x20000 + }; + + struct command_setup { + + std::string name; + command_target target; + int binding; + }; + + typedef std::vector commandsetup_sequence; + typedef std::unordered_map usercommand_map; + +// methods + void + default_bindings(); + void + bind(); + +// members + commandsetup_sequence m_commands; + usercommand_map m_bindings; + command_relay m_relay; + bool m_shift{ false }; + bool m_ctrl{ false }; +}; + +//--------------------------------------------------------------------------- diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 9ccc0f0b..56dc3ce8 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -16,15 +16,15 @@ {fafd38ab-4c2a-48c8-8e66-ad0d928573b3} - - {2d73d7b2-5252-499c-963a-88fa3cb1af53} - {36684428-8a48-435f-bca4-a24d9bfe2587} - + {cdf75bec-91f7-413c-8b57-9e32cba49148} + + {2d73d7b2-5252-499c-963a-88fa3cb1af53} + @@ -157,7 +157,7 @@ Source Files\mczapkie - Source Files\console + Source Files\input Source Files\mczapkie @@ -169,13 +169,13 @@ Source Files\mczapkie - Source Files\console + Source Files\input Source Files - Source Files\console + Source Files\input Source Files @@ -213,6 +213,15 @@ Source Files + + Source Files + + + Source Files\input + + + Source Files + @@ -291,10 +300,10 @@ Header Files\mczapkie - Header Files\console + Header Files\input - Header Files\console + Header Files\input Header Files @@ -375,7 +384,7 @@ Header Files - Header Files\console + Header Files\input Header Files @@ -413,6 +422,15 @@ Header Files + + Header Files + + + Header Files\input + + + Header Files + diff --git a/moon.cpp b/moon.cpp index f3892960..a7db52e5 100644 --- a/moon.cpp +++ b/moon.cpp @@ -116,7 +116,7 @@ void cMoon::move() { static double radtodeg = 57.295779513; // converts from radians to degrees static double degtorad = 0.0174532925; // converts from degrees to radians - SYSTEMTIME localtime = Simulation::Time.data(); // time for the calculation + SYSTEMTIME localtime = simulation::Time.data(); // time for the calculation if( m_observer.hour >= 0 ) { localtime.wHour = m_observer.hour; } if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } @@ -284,7 +284,7 @@ void cMoon::irradiance() { static double radtodeg = 57.295779513; // converts from radians to degrees static double degtorad = 0.0174532925; // converts from degrees to radians - m_body.dayang = ( Simulation::Time.year_day() - 1 ) * 360.0 / 365.0; + m_body.dayang = ( simulation::Time.year_day() - 1 ) * 360.0 / 365.0; double sd = sin( degtorad * m_body.dayang ); // sine of the day angle double cd = cos( degtorad * m_body.dayang ); // cosine of the day angle or delination m_body.erv = 1.000110 + 0.034221*cd + 0.001280*sd; @@ -310,7 +310,7 @@ void cMoon::phase() { // calculate moon's age in days from new moon - float ip = normalize( ( Simulation::Time.julian_day() - 2451550.1f ) / 29.530588853f ); + float ip = normalize( ( simulation::Time.julian_day() - 2451550.1f ) / 29.530588853f ); m_phase = ip * 29.53f; } diff --git a/sun.cpp b/sun.cpp index 258c4b9c..879709cb 100644 --- a/sun.cpp +++ b/sun.cpp @@ -115,7 +115,7 @@ void cSun::move() { static double radtodeg = 57.295779513; // converts from radians to degrees static double degtorad = 0.0174532925; // converts from degrees to radians - SYSTEMTIME localtime = Simulation::Time.data(); // time for the calculation + SYSTEMTIME localtime = simulation::Time.data(); // time for the calculation if( m_observer.hour >= 0 ) { localtime.wHour = m_observer.hour; } if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } @@ -258,9 +258,9 @@ void cSun::irradiance() { static double degrad = 57.295779513; // converts from radians to degrees static double raddeg = 0.0174532925; // converts from degrees to radians - auto const &localtime = Simulation::Time.data(); // time for the calculation + auto const &localtime = simulation::Time.data(); // time for the calculation - m_body.dayang = ( Simulation::Time.year_day() - 1 ) * 360.0 / 365.0; + m_body.dayang = ( simulation::Time.year_day() - 1 ) * 360.0 / 365.0; double sd = sin( raddeg * m_body.dayang ); // sine of the day angle double cd = cos( raddeg * m_body.dayang ); // cosine of the day angle or delination m_body.erv = 1.000110 + 0.034221*cd + 0.001280*sd; From 1034fb8aa99eb3465b8a7c220e5f69784a99c7c1 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 10 Apr 2017 15:18:08 +0200 Subject: [PATCH 082/426] control for battery, pantographs, line breaker, converter and compressor --- Camera.cpp | 114 +------- DynObj.cpp | 3 +- Float3d.h | 26 +- Gauge.cpp | 17 +- Gauge.h | 15 +- McZapkie/Mover.cpp | 3 + Model3d.cpp | 17 +- Train.cpp | 659 +++++++++++++++++++++++++++++++++++++------ Train.h | 3 + command.cpp | 60 ++-- command.h | 31 +- gamepadinput.cpp | 47 +-- keyboardinput.cpp | 162 +++++++++-- keyboardinput.h | 15 + maszyna.vcxproj.user | 8 +- 15 files changed, 830 insertions(+), 350 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index 75297e4f..06b38254 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -295,97 +295,6 @@ TCamera::OnCommand( command_data const &Command ) { } break; } -/* - case user_command::moveforwardfastest: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.forward = true; - m_moverate.z = - ( Type == tp_Free ? - 8.0 : - 0.8 ); - } - else { - m_keys.forward = false; - } - break; - } - - case user_command::movebackfastest: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.back = true; - m_moverate.z = - ( Type == tp_Free ? - 8.0 : - 0.8 ); - } - else { - m_keys.back = false; - } - break; - } - - case user_command::moveleftfastest: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.left = true; - m_moverate.x = - ( Type == tp_Free ? - 8.0 : - 0.8 ); - } - else { - m_keys.left = false; - } - break; - } - - case user_command::moverightfastest: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.right = true; - m_moverate.x = - ( Type == tp_Free ? - 8.0 : - 0.8 ); - } - else { - m_keys.right = false; - } - break; - } - - case user_command::moveupfastest: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.up = true; - m_moverate.y = - ( Type == tp_Free ? - 8.0 : - 0.8 ); - } - else { - m_keys.up = false; - } - break; - } - - case user_command::movedownfastest: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.down = true; - m_moverate.y = - ( Type == tp_Free ? - 8.0 : - 0.8 ); - } - else { - m_keys.down = false; - } - break; - } -*/ } } @@ -463,32 +372,11 @@ void TCamera::Update() #endif if( Type == tp_Free ) { + // free movement position update is handled here, movement while in vehicle is handled by train update vector3 Vec = Velocity; Vec.RotateY( Yaw ); Pos += Vec * 5.0 * deltatime; } - else { - - } -/* - if( deltatime < 1.0 / 20.0 ) { - // płynne hamowanie ruchu - Velocity -= Velocity * 20.0 * deltatime; - } - else { - // instant stop - Velocity.Zero(); - } - if( std::abs( Velocity.x ) < 0.01 ) { Velocity.x = 0.0; } - if( std::abs( Velocity.y ) < 0.01 ) { Velocity.y = 0.0; } - if( std::abs( Velocity.z ) < 0.01 ) { Velocity.z = 0.0; } -*/ -/* - Velocity *= 0.5; - if( std::abs( Velocity.x ) < 0.01 ) { Velocity.x = 0.0; } - if( std::abs( Velocity.y ) < 0.01 ) { Velocity.y = 0.0; } - if( std::abs( Velocity.z ) < 0.01 ) { Velocity.z = 0.0; } -*/ } vector3 TCamera::GetDirection() diff --git a/DynObj.cpp b/DynObj.cpp index 78d5b437..d25a37af 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3291,8 +3291,7 @@ bool TDynamicObject::Update(double dt, double dt1) if (tmpTraction.TractionVoltage == 0) { // to coś wyłączało dźwięk silnika w ST43! MoverParameters->ConverterFlag = false; - MoverParameters->CompressorFlag = false; // Ra: to jest wątpliwe - wyłączenie - // sprężarki powinno być w jednym miejscu! + MoverParameters->CompressorFlag = false; // Ra: to jest wątpliwe - wyłączenie sprężarki powinno być w jednym miejscu! } } } diff --git a/Float3d.h b/Float3d.h index 0acc89cd..6c309357 100644 --- a/Float3d.h +++ b/Float3d.h @@ -66,7 +66,7 @@ inline float3 operator/( float3 const &v, float const k ) }; inline float3 SafeNormalize(const float3 &v) { // bezpieczna normalizacja (wektor długości 1.0) - double l = v.Length(); + auto const l = v.Length(); float3 retVal; if (l == 0) retVal.x = retVal.y = retVal.z = 0; @@ -104,11 +104,11 @@ class float4 z = c; w = d; }; - double inline float4::LengthSquared() const + float inline float4::LengthSquared() const { return x * x + y * y + z * z + w * w; }; - double inline float4::Length() const + float inline float4::Length() const { return sqrt(x * x + y * y + z * z + w * w); }; @@ -132,26 +132,26 @@ inline float4 operator+(const float4 &v1, const float4 &v2) { return float4(v1.x + v2.x, v1.y + v2.y, v1.z + v2.z, v1.w + v2.w); }; -inline float4 operator/(const float4 &v, double k) +inline float4 operator/(const float4 &v, float const k) { return float4(v.x / k, v.y / k, v.z / k, v.w / k); }; inline float4 Normalize(const float4 &v) { // bezpieczna normalizacja (wektor długości 1.0) - double l = v.LengthSquared(); - if (l == 1.0) + auto const lengthsquared = v.LengthSquared(); + if (lengthsquared == 1.0) return v; - if (l == 0.0) + if (lengthsquared == 0.0) return float4(); // wektor zerowy, w=1 else - return v / sqrt(l); // pierwiastek liczony tylko jeśli trzeba wykonać dzielenia + return v / std::sqrt(lengthsquared); // pierwiastek liczony tylko jeśli trzeba wykonać dzielenia }; inline float Dot(const float4 &q1, const float4 &q2) { // iloczyn skalarny return q1.x * q2.x + q1.y * q2.y + q1.z * q2.z + q1.w * q2.w; } -inline float4 &operator*=(float4 &v1, double d) +inline float4 &operator*=(float4 &v1, float const d) { // mnożenie przez skalar, jaki ma sens? v1.x *= d; v1.y *= d; @@ -172,7 +172,7 @@ inline float4 Slerp(const float4 &q0, const float4 &q1, float t) new_q1.w = -new_q1.w; cosOmega = -cosOmega; } - double k0, k1; + float k0, k1; if (cosOmega > 0.9999f) { // jeśli jesteśmy z (t) na maksimum kosinusa, to tam prawie liniowo jest k0 = 1.0f - t; @@ -180,9 +180,9 @@ inline float4 Slerp(const float4 &q0, const float4 &q1, float t) } else { // a w ogólnym przypadku trzeba liczyć na trygonometrię - double sinOmega = sqrt(1.0f - cosOmega * cosOmega); // sinus z jedynki tryg. - double omega = atan2(sinOmega, cosOmega); // wyznaczenie kąta - double oneOverSinOmega = 1.0f / sinOmega; // odwrotność sinusa, bo sinus w mianowniku + auto const sinOmega = std::sqrt(1.0f - cosOmega * cosOmega); // sinus z jedynki tryg. + auto const omega = std::atan2(sinOmega, cosOmega); // wyznaczenie kąta + auto const oneOverSinOmega = 1.0f / sinOmega; // odwrotność sinusa, bo sinus w mianowniku k0 = sin((1.0f - t) * omega) * oneOverSinOmega; k1 = sin(t * omega) * oneOverSinOmega; } diff --git a/Gauge.cpp b/Gauge.cpp index aead0cca..99b424a0 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -136,19 +136,22 @@ void TGauge::PutValue(double fNewDesired) fValue = fDesiredValue; }; +double TGauge::GetValue() const { + // we feed value in range 0-1 so we should be getting it reported in the same range + return ( fValue - fOffset ) / fScale; +} + void TGauge::Update() { float dt = Timer::GetDeltaTime(); - if ((fFriction > 0) && (dt < 0.5 * fFriction)) // McZapkie-281102: - // zabezpieczenie przed - // oscylacjami dla dlugich - // czasow - fValue += dt * (fDesiredValue - fValue) / fFriction; + if( ( fFriction > 0 ) && ( dt < 0.5 * fFriction ) ) { + // McZapkie-281102: zabezpieczenie przed oscylacjami dla dlugich czasow + fValue += dt * ( fDesiredValue - fValue ) / fFriction; + } else fValue = fDesiredValue; if (SubModel) - { // warunek na wszelki wypadek, gdyby się submodel nie - // podłączył + { // warunek na wszelki wypadek, gdyby się submodel nie podłączył TSubModel *sm; switch (eType) { diff --git a/Gauge.h b/Gauge.h index de6ba90b..e2236a8d 100644 --- a/Gauge.h +++ b/Gauge.h @@ -25,11 +25,11 @@ class TGauge // zmienne "gg" { // animowany wskaźnik, mogący przyjmować wiele stanów pośrednich private: TGaugeType eType; // typ ruchu - double fFriction; // hamowanie przy zliżaniu się do zadanej wartości - double fDesiredValue; // wartość docelowa - double fValue; // wartość obecna - double fOffset; // wartość początkowa ("0") - double fScale; // wartość końcowa ("1") + double fFriction{ 0.0 }; // hamowanie przy zliżaniu się do zadanej wartości + double fDesiredValue{ 0.0 }; // wartość docelowa + double fValue{ 0.0 }; // wartość obecna + double fOffset{ 0.0 }; // wartość początkowa ("0") + double fScale{ 1.0 }; // wartość końcowa ("1") double fStepSize; // nie używane char cDataType; // typ zmiennej parametru: f-float, d-double, i-int union @@ -51,10 +51,7 @@ class TGauge // zmienne "gg" void DecValue(double fNewDesired); void UpdateValue(double fNewDesired); void PutValue(double fNewDesired); - float GetValue() - { - return fValue; - }; + double GetValue() const; void Update(); void Render(); void AssignFloat(float *fValue); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index eed06456..7a114a15 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6891,6 +6891,9 @@ void TMoverParameters::LoadFIZ_Switches( std::string const &Input ) { extract_value( PantSwitchType, "Pantograph", Input, "" ); extract_value( ConvSwitchType, "Converter", Input, "" ); + // because people can't make up their minds whether it's "impulse" or "Impulse"... + PantSwitchType = ToLower( PantSwitchType ); + ConvSwitchType = ToLower( ConvSwitchType ); } void TMoverParameters::LoadFIZ_MotorParamTable( std::string const &Input ) { diff --git a/Model3d.cpp b/Model3d.cpp index d77e1204..297232a5 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -321,8 +321,13 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) >> discard >> fFarDecayRadius >> discard >> fCosFalloffAngle // kąt liczony dla średnicy, a nie promienia >> discard >> fCosHotspotAngle; // kąt liczony dla średnicy, a nie promienia - fCosFalloffAngle = std::cos( DegToRad( 0.5f * fCosFalloffAngle ) ); - fCosHotspotAngle = std::cos( DegToRad( 0.5f * fCosHotspotAngle ) ); + // convert conve parameters if specified in degrees + if( fCosFalloffAngle > 1.0 ) { + fCosFalloffAngle = std::cos( DegToRad( 0.5f * fCosFalloffAngle ) ); + } + if( fCosHotspotAngle > 1.0 ) { + fCosHotspotAngle = std::cos( DegToRad( 0.5f * fCosHotspotAngle ) ); + } iNumVerts = 1; /* iFlags |= 0x4010; // rysowane w cyklu nieprzezroczystych, macierz musi zostać bez zmiany @@ -2023,6 +2028,14 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, // so as a workaround we're doing it here manually iFlags |= 0x20; } + // intercept and fix hotspot values if specified in degrees and not directly + if( fCosFalloffAngle > 1.0 ) { + fCosFalloffAngle = std::cos( DegToRad( 0.5f * fCosFalloffAngle ) ); + } + if( fCosHotspotAngle > 1.0 ) { + fCosHotspotAngle = std::cos( DegToRad( 0.5f * fCosHotspotAngle ) ); + } + iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem tablic) iVboPtr = tVboPtr; diff --git a/Train.cpp b/Train.cpp index 43ad864a..ec477ff0 100644 --- a/Train.cpp +++ b/Train.cpp @@ -761,6 +761,525 @@ TTrain::OnCommand( command_data const &Command ) { break; } + case user_command::batterytoggle: { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == mvOccupied->Battery ) { + // turn on + // wyłącznik jest też w SN61, ewentualnie załączać prąd na stałe z poziomu FIZ + if( mvOccupied->BatterySwitch( true ) ) { + // bateria potrzebna np. do zapalenia świateł + if( ggBatteryButton.SubModel ) { + ggBatteryButton.UpdateValue( 1 ); + } + // audio feedback + play_sound( dsbSwitch ); + // side-effects + if( mvOccupied->LightsPosNo > 0 ) { + SetLights(); + } + if( TestFlag( mvOccupied->SecuritySystem.SystemType, 2 ) ) { + // Ra: znowu w kabinie jest coś, co być nie powinno! + SetFlag( mvOccupied->SecuritySystem.Status, s_active ); + SetFlag( mvOccupied->SecuritySystem.Status, s_SHPalarm ); + } + } + } + else { + //turn off + if( mvOccupied->BatterySwitch( false ) ) { + // ewentualnie zablokować z FIZ, np. w samochodach się nie odłącza akumulatora + if( ggBatteryButton.SubModel ) { + ggBatteryButton.UpdateValue( 0 ); + } + // audio feedback + play_sound( dsbSwitch ); + // side-effects + mvControlled->PantFront( false ); + mvControlled->PantRear( false ); + } + } + + } + break; + } + + case user_command::pantographtogglefront: { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == ( mvOccupied->ActiveCab == 1 ? mvControlled->PantFrontUp : mvControlled->PantRearUp ) ) { + // turn on... + if( mvOccupied->ActiveCab == 1 ) { + // przedni gdy w kabinie 1 + mvControlled->PantFrontSP = false; + if( mvControlled->PantFront( true ) ) { + if( mvControlled->PantFrontStart != 1 ) { + if( ggPantFrontButton.SubModel ) { + ggPantFrontButton.UpdateValue( 1.0 ); + } + play_sound( dsbSwitch ); + } + } + } + else { + // rear otherwise + mvControlled->PantRearSP = false; + if( mvControlled->PantRear( true ) ) { + if( mvControlled->PantRearStart != 1 ) { + if( ggPantRearButton.SubModel ) { + ggPantRearButton.UpdateValue( 1.0 ); + } + play_sound( dsbSwitch ); + } + } + } + } + else { + // ...or turn off + if( mvOccupied->ActiveCab == 1 ) { + // przedni gdy w kabinie 1 + mvControlled->PantFrontSP = false; + if( false == mvControlled->PantFront( false ) ) { + if( mvControlled->PantFrontStart != 0 ) { + if( ggPantFrontButton.SubModel ) { + ggPantFrontButton.UpdateValue( + ( mvOccupied->PantSwitchType != "impulse" ? + 0.0 : + 1.0 ) ); + } + play_sound( dsbSwitch ); + } + } + } + else { + // rear otherwise + mvControlled->PantRearSP = false; + if( false == mvControlled->PantRear( false ) ) { + if( mvControlled->PantRearStart != 0 ) { + if( ggPantRearButton.SubModel ) { + ggPantRearButton.UpdateValue( + ( mvOccupied->PantSwitchType != "impulse" ? + 0.0 : + 1.0 ) ); + } + play_sound( dsbSwitch ); + } + } + } + } + } + else if( Command.action == GLFW_RELEASE ) { + // impulse switches return automatically to neutral position + if( mvOccupied->PantSwitchType == "impulse" ) { + if( mvOccupied->ActiveCab == 1 ) { + // przedni gdy w kabinie 1 + if( ggPantFrontButton.GetValue() > 0.1 ) { + play_sound( dsbSwitch ); + } + if( ggPantFrontButton.SubModel ) { + ggPantFrontButton.UpdateValue( 0.0 ); + } + } + else { + // rear otherwise + if( ggPantRearButton.GetValue() > 0.1 ) { + play_sound( dsbSwitch ); + } + if( ggPantRearButton.SubModel ) { + ggPantRearButton.UpdateValue( 0.0 ); + } + } + } + } + break; + } + + case user_command::pantographtogglerear: { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == ( mvOccupied->ActiveCab == 1 ? mvControlled->PantRearUp : mvControlled->PantFrontUp ) ) { + // turn on... + if( mvOccupied->ActiveCab == 1 ) { + // rear if in front cab + mvControlled->PantRearSP = false; + if( mvControlled->PantRear( true ) ) { + if( mvControlled->PantRearStart != 1 ) { + if( ggPantRearButton.SubModel ) { + ggPantRearButton.UpdateValue( 1.0 ); + } + play_sound( dsbSwitch ); + } + } + } + else { + // front otherwise + mvControlled->PantFrontSP = false; + if( mvControlled->PantFront( true ) ) { + if( mvControlled->PantFrontStart != 1 ) { + if( ggPantFrontButton.SubModel ) { + ggPantFrontButton.UpdateValue( 1.0 ); + } + play_sound( dsbSwitch ); + } + } + } + } + else { + // ...or turn off + if( mvOccupied->ActiveCab == 1 ) { + // rear if in front cab + mvControlled->PantRearSP = false; + if( false == mvControlled->PantRear( false ) ) { + if( mvControlled->PantRearStart != 0 ) { + if( ggPantRearButton.SubModel ) { + ggPantRearButton.UpdateValue( + ( mvOccupied->PantSwitchType != "impulse" ? + 0.0 : + 1.0 ) ); + } + play_sound( dsbSwitch ); + } + } + } + else { + // front otherwise + mvControlled->PantFrontSP = false; + if( false == mvControlled->PantFront( false ) ) { + if( mvControlled->PantFrontStart != 0 ) { + if( ggPantFrontButton.SubModel ) { + ggPantFrontButton.UpdateValue( + ( mvOccupied->PantSwitchType != "impulse" ? + 0.0 : + 1.0 ) ); + } + play_sound( dsbSwitch ); + } + } + } + } + } + else if( Command.action == GLFW_RELEASE ) { + // impulse switches return automatically to neutral position + if( mvOccupied->PantSwitchType == "impulse" ) { + if( mvOccupied->ActiveCab == 1 ) { + // tylny gdy w kabinie 1 + if( ggPantRearButton.GetValue() > 0.1 ) { + play_sound( dsbSwitch ); + } + if( ggPantRearButton.SubModel ) { + ggPantRearButton.UpdateValue( 0.0 ); + } + } + else { + // front otherwise + if( ggPantFrontButton.GetValue() > 0.1 ) { + play_sound( dsbSwitch ); + } + if( ggPantFrontButton.SubModel ) { + ggPantFrontButton.UpdateValue( 0.0 ); + } + play_sound( dsbSwitch ); + } + } + } + break; + } + + case user_command::linebreakertoggle: { + + if( Command.action != GLFW_RELEASE ) { + // press or hold... + if( false == mvControlled->Mains ) { + // ...to close the circuit + if( false == m_linebreakerclosed ) { + // safety check so we don't close the circuit right after opening + if( ggMainOnButton.SubModel != nullptr ) { + // two separate switches to close and break the circuit + // audio feedback + if( Command.action == GLFW_PRESS ) { + play_sound( dsbSwitch ); + } + // visual feedback + ggMainOnButton.UpdateValue( 1.0 ); + } + else if( ggMainButton.SubModel != nullptr ) { + // single two-state switch + // audio feedback + if( Command.action == GLFW_PRESS ) { + play_sound( dsbSwitch ); + } + // visual feedback + ggMainButton.UpdateValue( 1.0 ); + } + // keep track of period the button is held down, to determine when/if circuit closes + fMainRelayTimer += 0.33; // Command.time_delta * 5.0; + // NOTE: this shouldn't be necessary, what exactly does it fix? + if( mvControlled->Mains != true ) { + // hunter-080812: poprawka + // adjusted further to take into account state of the switch + mvControlled->ConverterSwitch( ggConverterButton.GetValue() > 0.5 ); + mvControlled->CompressorSwitch( ggCompressorButton.GetValue() > 0.5 ); + } + if( fMainRelayTimer > mvControlled->InitialCtrlDelay ) { + // wlaczanie WSa z opoznieniem + if( mvControlled->MainSwitch( true ) ) { + // sound feedback, engine start for diesel vehicle + if( mvControlled->EngineType == DieselEngine ) { + play_sound( dsbDieselIgnition ); + } + } + } + } + } + else { + // ...to open the circuit + if( true == m_linebreakerclosed ) { + // safety check so we don't open the circuit right after closing + if( mvControlled->MainSwitch( false ) ) { + + if( ggMainOffButton.SubModel != nullptr ) { + // two separate switches to close and break the circuit + // audio feedback + if( Command.action == GLFW_PRESS ) { + play_sound( dsbSwitch ); + } + // visual feedback + ggMainOffButton.UpdateValue( 1.0 ); + } + else if( ggMainButton.SubModel != nullptr ) { + // single two-state switch + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( mvControlled->TrainType == dt_EZT ) { + // audio feedback + if( Command.action == GLFW_PRESS ) { + play_sound( dsbSwitch ); + } + // visual feedback + ggMainButton.UpdateValue( 1.0 ); + } + else { + // audio feedback + if( Command.action == GLFW_PRESS ) { + play_sound( dsbSwitch ); + } + // visual feedback + ggMainButton.UpdateValue( 0.0 ); + } + } + // side-effects + mvControlled->ConverterSwitch( ggConverterButton.GetValue() > 0.5 ); + mvControlled->CompressorSwitch( ggCompressorButton.GetValue() > 0.5 ); + } + // play sound immediately when the switch is hit, not after release + if( fMainRelayTimer > 0.0f ) { + play_sound( dsbRelay ); + fMainRelayTimer = 0.0f; + } + } + } + } + else { + // release... + if( false == mvControlled->Mains ) { + // ...after opening circuit, or holding for too short time to close it +/* + if( mvControlled->ConverterAllow ) { + // po puszczeniu przycisku od WSa odpalanie potwora + mvControlled->ConverterSwitch( true ); + } +*/ + // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, + if( fMainRelayTimer > 0.0f ) { + play_sound( dsbRelay ); + fMainRelayTimer = 0.0f; + } + // we don't exactly know which of the two buttons was used, so reset both + if( ggMainOnButton.SubModel != nullptr ) { + // setup with two separate swiches + ggMainOnButton.UpdateValue( 0.0 ); + } + if( ggMainOffButton.SubModel != nullptr ) { + // setup with two separate swiches + ggMainOffButton.UpdateValue( 0.0 ); + } + // and the two-state switch too, for good measure + if( ggMainButton.SubModel != nullptr ) { + ggMainButton.UpdateValue( 0.0 ); + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( mvControlled->TrainType == dt_EZT ) { + // audio feedback + play_sound( dsbSwitch ); + } + } + m_linebreakerclosed = false; + } + else { + // ...after closing the circuit + if( ggMainOnButton.SubModel != nullptr ) { + // setup with two separate switches + ggMainOnButton.UpdateValue( 0.0 ); + } + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( mvControlled->TrainType == dt_EZT ) { + if( ggMainButton.SubModel != nullptr ) { + ggMainButton.UpdateValue( 0.0 ); + // audio feedback + play_sound( dsbSwitch ); + } + } + m_linebreakerclosed = true; + } + } + break; + } + + case user_command::convertertoggle: { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == mvControlled->ConverterAllow ) { + // turn on + if( ( mvControlled->EnginePowerSource.SourceType != CurrentCollector ) + || ( mvControlled->PantRearVolt != 0.0 ) + || ( mvControlled->PantFrontVolt != 0.0 ) ) { + // visual feedback + ggConverterButton.UpdateValue( 1.0 ); + // sound feedback + if( ggConverterButton.GetValue() < 0.5 ) { + play_sound( dsbSwitch ); + } + // impulse type switch has no effect if there's no power + // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway + if( ( mvOccupied->ConvSwitchType != "impulse" ) + || ( mvControlled->Mains ) ) { + if( true == mvControlled->ConverterSwitch( true ) ) { + // side effects + // control the compressor, if it's paired with the converter + if( mvControlled->CompressorPower == 2 ) { + // hunter-091012: tak jest poprawnie + mvControlled->CompressorSwitch( true ); + } + } + } + } + } + else { + //turn off + if( true == mvControlled->ConverterSwitch( false ) ) { + // sound feedback + play_sound( dsbSwitch ); + // visual feedback + ggConverterButton.UpdateValue( 0.0 ); + if( ggConverterOffButton.SubModel != nullptr ) { + ggConverterOffButton.UpdateValue( 1.0 ); + } + // side effects + // control the compressor, if it's paired with the converter + if( mvControlled->CompressorPower == 2 ) { + // hunter-091012: tak jest poprawnie + mvControlled->CompressorSwitch( false ); + } + if( ( mvControlled->TrainType == dt_EZT ) + && ( !TestFlag( mvControlled->EngDmgFlag, 4 ) ) ) { + mvControlled->ConvOvldFlag = false; + } + } + } + } + else if( Command.action == GLFW_RELEASE ){ + // on button release... + if( mvOccupied->ConvSwitchType == "impulse" ) { + // ...return switches to start position if applicable + if( ( ggConverterButton.GetValue() > 0.0 ) + || ( ggConverterOffButton.GetValue() > 0.0 ) ) { + // sound feedback + play_sound( dsbSwitch ); + } + ggConverterButton.UpdateValue( 0.0 ); + ggConverterOffButton.UpdateValue( 0.0 ); + } + } + break; + } + + case user_command::compressortoggle: { + + if( mvControlled->CompressorPower < 2 ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == mvControlled->CompressorAllow ) { + // turn on + // visual feedback + ggCompressorButton.UpdateValue( 1.0 ); + // sound feedback + if( ggCompressorButton.GetValue() < 0.5 ) { + play_sound( dsbSwitch ); + } + // impulse type switch has no effect if there's no power + // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway + // (we're presuming impulse type switch for all EMUs for the time being) +/* + if( ( mvControlled->TrainType != dt_EZT ) + || ( mvControlled->Mains ) ) { +*/ + mvControlled->CompressorSwitch( true ); +/* + } +*/ + } + else { + //turn off + if( true == mvControlled->CompressorSwitch( false ) ) { + // sound feedback + play_sound( dsbSwitch ); + // NOTE: we don't have switch type definition for the compresor switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz +/* + if( mvControlled->TrainType == dt_EZT ) { + // visual feedback + ggCompressorButton.UpdateValue( 1.0 ); + } + else { +*/ + // visual feedback + ggCompressorButton.UpdateValue( 0.0 ); +/* + } +*/ + } + } + } + else if( Command.action == GLFW_RELEASE ) { + // on button release... +/* + // TODO: check if compressor switch is two-state or impulse type + // NOTE: we don't have switch type definition for the compresor switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( mvControlled->TrainType == dt_EZT ) { + if( ggCompressorButton.SubModel != nullptr ) { + ggCompressorButton.UpdateValue( 0.0 ); + // audio feedback + play_sound( dsbSwitch ); + } + } +*/ + } + } + break; + } + default: { break; @@ -852,23 +1371,7 @@ void TTrain::OnKeyDown(int cKey) ; else ; -#endif - // McZapkie-240302 - wlaczanie glownego obwodu klawiszem M+shift - //----------- - // hunter-141211: wyl. szybki zalaczony przeniesiony do TTrain::Update() - /* if (cKey==Global::Keys[k_Main]) - { - ggMainOnButton.PutValue(1); - if (mvControlled->MainSwitch(true)) - { - if (mvControlled->EngineType==DieselEngine) - dsbDieselIgnition->Play(0,0,0); - else - dsbNastawnikJazdy->Play(0,0,0); - } - } - else */ - if (cKey == Global::Keys[k_Battery]) + if( cKey == Global::Keys[ k_Battery ] ) { // if // (((mvControlled->TrainType==dt_EZT)||(mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->EngineType==DieselElectric))&&(!mvControlled->Battery)) @@ -895,7 +1398,8 @@ void TTrain::OnKeyDown(int cKey) } } } - else if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // shift&ctrl are used for light dimming +#endif + if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // shift&ctrl are used for light dimming { if (mvControlled->TrainType == dt_EZT) { @@ -930,7 +1434,8 @@ void TTrain::OnKeyDown(int cKey) } } } - if (cKey == Global::Keys[k_Main]) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( cKey == Global::Keys[ k_Main ] ) { if (fabs(ggMainOnButton.GetValue()) < 0.001) if (dsbSwitch) @@ -939,6 +1444,7 @@ void TTrain::OnKeyDown(int cKey) dsbSwitch->Play(0, 0, 0); } } +#endif else if (cKey == Global::Keys[k_BrakeProfile]) // McZapkie-240302-B: //----------- @@ -991,34 +1497,7 @@ void TTrain::OnKeyDown(int cKey) } } } - //----------- - // hunter-261211: przetwornica i sprzezarka przeniesione do - // TTrain::Update() - /* if (cKey==Global::Keys[k_Converter]) //NBMX 14-09-2003: -przetwornica wl - { -if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || -(mvControlled->EnginePowerSource.SourceType!=CurrentCollector) || -(!Global::bLiveTraction)) - if (mvControlled->ConverterSwitch(true)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0,0,0); - } - } - else - if (cKey==Global::Keys[k_Compressor]) //NBMX 14-09-2003: sprezarka wl - { - if ((mvControlled->ConverterFlag) || -(mvControlled->CompressorPower<2)) - if (mvControlled->CompressorSwitch(true)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0,0,0); - } - } - else */ - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_Converter]) { if (ggConverterButton.GetValue() == 0) @@ -1040,7 +1519,8 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || dsbSwitch->Play(0, 0, 0); } } - else if (cKey == Global::Keys[k_SmallCompressor]) // Winger 160404: mala +#endif + else if( cKey == Global::Keys[ k_SmallCompressor ] ) // Winger 160404: mala // sprezarka wl { // Ra: dźwięk, gdy razem z [Shift] if ((mvControlled->TrainType & dt_EZT) ? mvControlled == mvOccupied : @@ -1184,7 +1664,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } } } - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM //----------- else if (cKey == Global::Keys[k_PantFrontUp]) { // Winger 160204: podn. @@ -1243,7 +1723,8 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } } } - else if (cKey == Global::Keys[k_Active]) // yB 300407: przelacznik rozrzadu +#endif + else if( cKey == Global::Keys[ k_Active ] ) // yB 300407: przelacznik rozrzadu { // Ra 2014-06: uruchomiłem to, aby aktywować czuwak w zajmowanym członie, // a wyłączyć w innych // Ra 2014-03: aktywacja czuwaka przepięta na ustawienie kierunku w @@ -1839,7 +2320,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || if (Global::ctrlState) // z controlem { ggConverterFuseButton.PutValue(1); // hunter-261211 - if ((mvControlled->Mains == false) && (ggConverterButton.GetValue() == 0) && + if ((mvControlled->Mains == false) && (ggConverterButton.GetValue() < 0.01) && (mvControlled->TrainType != dt_EZT)) mvControlled->ConvOvldFlag = false; } @@ -1913,7 +2394,8 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } #endif } - else if (cKey == Global::Keys[k_Main]) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if( cKey == Global::Keys[ k_Main ] ) // McZapkie-240302 - wylaczanie glownego obwodu //----------- // hunter-141211: wyl. szybki wylaczony przeniesiony do TTrain::Update() @@ -1925,7 +2407,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || dsbSwitch->Play(0, 0, 0); } } - else if (cKey == Global::Keys[k_Battery]) + else if( cKey == Global::Keys[ k_Battery ] ) { // if ((mvControlled->TrainType==dt_EZT) || // (mvControlled->EngineType==ElectricSeriesMotor)|| @@ -1944,7 +2426,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || mvControlled->PantRear(false); } } - +#endif //----------- // if (cKey==Global::Keys[k_Active]) //yB 300407: przelacznik // rozrzadu @@ -2006,6 +2488,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_Converter]) //----------- // hunter-261211: przetwornica i sprzezarka przeniesione do @@ -2030,7 +2513,6 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } } //----------- -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if( cKey == Global::Keys[ k_Releaser ] ) // odluzniacz { if (!FreeFlyModeFlag) @@ -2052,8 +2534,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || } } #endif - else if (cKey == Global::Keys[k_SmallCompressor]) // Winger 160404: mala - // sprezarka wl + else if (cKey == Global::Keys[k_SmallCompressor]) // Winger 160404: mala sprezarka wl { // Ra: bez [Shift] też dać dźwięk if ((mvControlled->TrainType & dt_EZT) ? mvControlled == mvOccupied : !mvOccupied->ActiveCab) // tylko w maszynowym @@ -2164,9 +2645,7 @@ if ((mvControlled->PantFrontVolt) || (mvControlled->PantRearVolt) || false; // wyjście z maszynowego wyłącza sprężarkę pomocniczą } else if (cKey == Global::Keys[k_Couple]) - { // ABu051104: male zmiany, zeby - // mozna bylo laczyc odlegle - // wagony + { // ABu051104: male zmiany, zeby mozna bylo laczyc odlegle wagony // da sie zoptymalizowac, ale nie ma na to czasu :( if (iCabn > 0) { @@ -2409,6 +2888,7 @@ if } } //----------- +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_PantFrontDown]) // Winger 160204: // opuszczanie prz. patyka { @@ -2462,7 +2942,8 @@ if } } } - else if (cKey == Global::Keys[k_Heating]) // Winger 020304: ogrzewanie - +#endif + else if( cKey == Global::Keys[ k_Heating ] ) // Winger 020304: ogrzewanie - // wylaczenie { // Ra 2014-09: w trybie latania obsługa jest w World.cpp if (!FreeFlyModeFlag) @@ -3061,6 +3542,7 @@ bool TTrain::Update( double const Deltatime ) DWORD stat; double dt = Deltatime; // Timer::GetDeltaTime(); + if (DynamicObject->mdKabina) { // Ra: TODO: odczyty klawiatury/pulpitu nie // powinny być uzależnione od istnienia modelu @@ -3327,8 +3809,10 @@ bool TTrain::Update( double const Deltatime ) if (mvControlled->TrainType != dt_EZT) mvControlled->MainSwitch(false); } - else if (fConverterTimer >= fConverterPrzekaznik) - mvControlled->CompressorSwitch(true); + else if( fConverterTimer >= fConverterPrzekaznik ) { + // changed switch from always true to take into account state of the compressor switch + mvControlled->CompressorSwitch( mvControlled->CompressorAllow ); + } } } else @@ -4473,17 +4957,29 @@ bool TTrain::Update( double const Deltatime ) //--------- // Winger 010304 - pantografy - if (ggPantFrontButton.SubModel) + // NOTE: shouldn't the pantograph updates check whether it's front or rear cabin? + if (ggPantFrontButton.SubModel ) { - if (mvControlled->PantFrontUp) - ggPantFrontButton.PutValue(1); - else - ggPantFrontButton.PutValue(0); + if( mvOccupied->PantSwitchType != "impulse" ) { + ggPantFrontButton.UpdateValue( + ( mvOccupied->ActiveCab == 1 ? + mvControlled->PantFrontUp : + mvControlled->PantRearUp ) ? + 1.0 : + 0.0 ); + } ggPantFrontButton.Update(); } if (ggPantRearButton.SubModel) { - ggPantRearButton.PutValue(mvControlled->PantRearUp ? 1 : 0); + if( mvOccupied->PantSwitchType != "impulse" ) { + ggPantRearButton.UpdateValue( + ( mvOccupied->ActiveCab == 1 ? + mvControlled->PantRearUp : + mvControlled->PantFrontUp ) ? + 1.0 : + 0.0 ); + } ggPantRearButton.Update(); } if (ggPantFrontButtonOff.SubModel) @@ -4492,8 +4988,7 @@ bool TTrain::Update( double const Deltatime ) } // Winger 020304 - ogrzewanie //---------- - // hunter-080812: poprawka na ogrzewanie w elektrykach - usuniete - // uzaleznienie od przetwornicy + // hunter-080812: poprawka na ogrzewanie w elektrykach - usuniete uzaleznienie od przetwornicy if (ggTrainHeatingButton.SubModel) { if (mvControlled->Heating) @@ -4633,8 +5128,8 @@ bool TTrain::Update( double const Deltatime ) { SetFlag(mvOccupied->WarningSignal, 2); } - //---------------- +#ifdef EU07_USE_OLD_COMMAND_SYSTEM // hunter-141211: wyl. szybki zalaczony i wylaczony przeniesiony z // OnKeyPress() if (Global::shiftState && Console::Pressed(Global::Keys[k_Main])) @@ -4670,7 +5165,6 @@ bool TTrain::Update( double const Deltatime ) ggMainOnButton.UpdateValue(0); } //--- - if (!Global::shiftState && Console::Pressed(Global::Keys[k_Main])) { ggMainOffButton.PutValue(1); @@ -4679,7 +5173,7 @@ bool TTrain::Update( double const Deltatime ) } else ggMainOffButton.UpdateValue(0); - +#endif /* if (cKey==Global::Keys[k_Main]) //z shiftem { ggMainOnButton.PutValue(1); @@ -4809,6 +5303,7 @@ bool TTrain::Update( double const Deltatime ) else ggAntiSlipButton.UpdateValue(0); //----------------- +#ifdef EU07_USE_OLD_COMMAND_SYSTEM // hunter-261211: przetwornica i sprezarka if (Global::shiftState && Console::Pressed(Global::Keys[k_Converter])) // NBMX 14-09-2003: przetwornica wl @@ -4832,7 +5327,6 @@ bool TTrain::Update( double const Deltatime ) ggConverterOffButton.PutValue(0); } } - // if ( // Global::shiftState&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) // ) //NBMX 14-09-2003: sprezarka wl @@ -4842,7 +5336,6 @@ bool TTrain::Update( double const Deltatime ) ggCompressorButton.PutValue(1); mvControlled->CompressorSwitch(true); } - if (!Global::shiftState && Console::Pressed(Global::Keys[k_Converter])) // NBMX 14-09-2003: przetwornica wl { @@ -4852,7 +5345,6 @@ bool TTrain::Update( double const Deltatime ) if ((mvControlled->TrainType == dt_EZT) && (!TestFlag(mvControlled->EngDmgFlag, 4))) mvControlled->ConvOvldFlag = false; } - // if ( // !Global::shiftState&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) // ) //NBMX 14-09-2003: sprezarka wl @@ -4862,7 +5354,7 @@ bool TTrain::Update( double const Deltatime ) ggCompressorButton.PutValue(0); mvControlled->CompressorSwitch(false); } - +#endif /* bez szifta if (cKey==Global::Keys[k_Converter]) //NBMX wyl przetwornicy @@ -5231,7 +5723,7 @@ bool TTrain::Update( double const Deltatime ) if (!DynamicObject->Mechanik->AIControllFlag) // tylko jeśli nie prowadzi AI mvControlled->DepartureSignal = false; } - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (Console::Pressed(Global::Keys[k_Main])) //[] { if (Global::shiftState) @@ -5241,7 +5733,7 @@ bool TTrain::Update( double const Deltatime ) } else ggMainButton.PutValue(0); - +#endif if (Console::Pressed(Global::Keys[k_CurrentNext])) { if (mvControlled->TrainType != dt_EZT) @@ -5299,7 +5791,7 @@ bool TTrain::Update( double const Deltatime ) } } } - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM // Winger 010304 PantAllDownButton if (Console::Pressed(Global::Keys[k_PantFrontUp])) { @@ -5313,7 +5805,6 @@ bool TTrain::Update( double const Deltatime ) ggPantFrontButton.PutValue(0); ggPantAllDownButton.PutValue(0); } - if (Console::Pressed(Global::Keys[k_PantRearUp])) { if (Global::shiftState) @@ -5326,7 +5817,7 @@ bool TTrain::Update( double const Deltatime ) ggPantRearButton.PutValue(0); ggPantFrontButtonOff.PutValue(0); } - +#endif /* if ((mvControlled->Mains) && (mvControlled->EngineType==ElectricSeriesMotor)) { @@ -5428,8 +5919,10 @@ bool TTrain::Update( double const Deltatime ) ggUniversal4Button.PermIncValue(dt); ggUniversal4Button.Update(); +/* ggMainOffButton.UpdateValue(0); ggMainOnButton.UpdateValue(0); +*/ ggSecurityResetButton.UpdateValue(0); /* ggReleaserButton.UpdateValue(0); diff --git a/Train.h b/Train.h index d34ff700..11366a7d 100644 --- a/Train.h +++ b/Train.h @@ -111,6 +111,9 @@ class TTrain // NOTE: temporary routine until sound system is sorted out and paired with switches void play_sound( PSound Sound, PSound Fallbacksound = nullptr ); + // helper variable, to prevent immediate switch between closing and opening line breaker circuit + bool m_linebreakerclosed{ false }; + private: //żeby go nic z zewnątrz nie przestawiało TDynamicObject *DynamicObject; // przestawia zmiana pojazdu [F5] private: //żeby go nic z zewnątrz nie przestawiało diff --git a/command.cpp b/command.cpp index b1bde4f4..edbb388f 100644 --- a/command.cpp +++ b/command.cpp @@ -78,14 +78,16 @@ command_relay::command_relay() { /* const int k_AntiSlipping = 21; const int k_Sand = 22; -const int k_Main = 23; */ + { user_command::linebreakertoggle, command_target::vehicle }, { user_command::reverserincrease, command_target::vehicle }, { user_command::reverserdecrease, command_target::vehicle }, /* const int k_Fuse = 26; -const int k_Compressor = 27; -const int k_Converter = 28; +*/ + { user_command::compressortoggle, command_target::vehicle }, + { user_command::convertertoggle, command_target::vehicle }, +/* const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; @@ -107,15 +109,7 @@ const int k_FailedEngineCutOff = 35; { user_command::moveforwardfast, command_target::entity }, { user_command::movebackfast, command_target::entity }, { user_command::moveupfast, command_target::entity }, - { user_command::movedownfast, command_target::entity } -/* - { user_command::moveleftfastest, command_target::entity }, - { user_command::moverightfastest, command_target::entity }, - { user_command::moveforwardfastest, command_target::entity }, - { user_command::movebackfastest, command_target::entity }, - { user_command::moveupfastest, command_target::entity }, - { user_command::movedownfastest, command_target::entity } -*/ + { user_command::movedownfast, command_target::entity }, /* const int k_CabForward = 42; const int k_CabBackward = 43; @@ -129,10 +123,10 @@ const int k_OpenRight = 50; const int k_CloseLeft = 51; const int k_CloseRight = 52; const int k_DepartureSignal = 53; -const int k_PantFrontUp = 54; -const int k_PantRearUp = 55; -const int k_PantFrontDown = 56; -const int k_PantRearDown = 57; +*/ + { user_command::pantographtogglefront, command_target::vehicle }, + { user_command::pantographtogglerear, command_target::vehicle }, +/* const int k_Heating = 58; // const int k_FreeFlyMode= 59; const int k_LeftSign = 60; @@ -147,7 +141,9 @@ const int k_Univ3 = 68; const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; -const int k_Battery = 72; +*/ + { user_command::batterytoggle, command_target::vehicle } +/* const int k_WalkMode = 73; int const k_DimHeadlights = 74; */ @@ -180,14 +176,16 @@ int const k_DimHeadlights = 74; /* const int k_AntiSlipping = 21; const int k_Sand = 22; -const int k_Main = 23; */ + "linebreakertoggle", "reverserincrease", "reverserdecrease", /* const int k_Fuse = 26; -const int k_Compressor = 27; -const int k_Converter = 28; +*/ + "compressortoggle", + "convertertoggle", +/* const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; @@ -209,15 +207,7 @@ const int k_FailedEngineCutOff = 35; "", //"moveforwardfast", "", //"movebackfast", "", //"moveupfast", - "" //"movedownfast" -/* - "moveleftfastest", - "moverightfastest", - "moveforwardfastest", - "movebackfastest", - "moveupfastest", - "movedownfastest" -*/ + "", //"movedownfast" /* const int k_CabForward = 42; const int k_CabBackward = 43; @@ -231,10 +221,10 @@ const int k_OpenRight = 50; const int k_CloseLeft = 51; const int k_CloseRight = 52; const int k_DepartureSignal = 53; -const int k_PantFrontUp = 54; -const int k_PantRearUp = 55; -const int k_PantFrontDown = 56; -const int k_PantRearDown = 57; +*/ + "pantographtogglefront", + "pantographtogglerear", +/* const int k_Heating = 58; // const int k_FreeFlyMode= 59; const int k_LeftSign = 60; @@ -249,7 +239,9 @@ const int k_Univ3 = 68; const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; -const int k_Battery = 72; +*/ + "batterytoggle" +/* const int k_WalkMode = 73; int const k_DimHeadlights = 74; */ diff --git a/command.h b/command.h index ad02d2f7..313cc5bf 100644 --- a/command.h +++ b/command.h @@ -38,14 +38,16 @@ enum class user_command { /* const int k_AntiSlipping = 21; const int k_Sand = 22; -const int k_Main = 23; */ + linebreakertoggle, reverserincrease, reverserdecrease, /* const int k_Fuse = 26; -const int k_Compressor = 27; -const int k_Converter = 28; +*/ + compressortoggle, + convertertoggle, +/* const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; @@ -67,15 +69,7 @@ const int k_FailedEngineCutOff = 35; moveforwardfast, movebackfast, moveupfast, - movedownfast -/* - moveleftfastest, - moverightfastest, - moveforwardfastest, - movebackfastest, - moveupfastest, - movedownfastest -*/ + movedownfast, /* const int k_CabForward = 42; const int k_CabBackward = 43; @@ -89,10 +83,10 @@ const int k_OpenRight = 50; const int k_CloseLeft = 51; const int k_CloseRight = 52; const int k_DepartureSignal = 53; -const int k_PantFrontUp = 54; -const int k_PantRearUp = 55; -const int k_PantFrontDown = 56; -const int k_PantRearDown = 57; +*/ + pantographtogglefront, + pantographtogglerear, +/* const int k_Heating = 58; // const int k_FreeFlyMode= 59; const int k_LeftSign = 60; @@ -107,11 +101,12 @@ const int k_Univ3 = 68; const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; -const int k_Battery = 72; +*/ + batterytoggle +/* const int k_WalkMode = 73; int const k_DimHeadlights = 74; */ - }; enum class command_target { diff --git a/gamepadinput.cpp b/gamepadinput.cpp index 2c1dfa1a..3240b3cd 100644 --- a/gamepadinput.cpp +++ b/gamepadinput.cpp @@ -188,7 +188,7 @@ gamepad_input::on_button( gamepad_button const Button, int const Action ) { void gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, glm::vec2 const &Triggers ) { - // left stick, look around + // right stick, look around if( ( Rightstick.x != 0.0f ) || ( Rightstick.y != 0.0f ) ) { // TODO: make toggles for the axis flip auto const deltatime = Timer::GetDeltaRenderTime() * 60.0; @@ -204,7 +204,7 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g 0 ); } - // right stick, either movement or controls, depending on currently active mode + // left stick, either movement or controls, depending on currently active mode if( m_mode == control_mode::entity ) { if( ( Leftstick.x != 0.0 || Leftstick.y != 0.0 ) @@ -218,45 +218,6 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g GLFW_PRESS, 0 ); } -/* - Leftstick = circle_to_square( Leftstick ); - if( Leftstick.y >= 0.0f ) { - // forward - process_axis( - Leftstick.y, m_leftstick.y, - 1.0, - user_command::moveforward, - user_command::moveforwardfast, - 0 ); - } - if( Leftstick.y <= 0.0f ) { - // back - process_axis( - Leftstick.y, m_leftstick.y, - -1.0, - user_command::moveback, - user_command::movebackfast, - 0 ); - } - if( Leftstick.x >= 0.0f ) { - // right - process_axis( - Leftstick.x, m_leftstick.x, - 1.0, - user_command::moveright, - user_command::moverightfast, - 0 ); - } - if( Leftstick.x <= 0.0f ) { - // left - process_axis( - Leftstick.x, m_leftstick.x, - -1.0, - user_command::moveleft, - user_command::moveleftfast, - 0 ); - } -*/ } else { // vehicle control modes @@ -317,7 +278,7 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) m_modeaccumulator = 0.0f; } if( Value > m_deadzone ) { - m_modeaccumulator += Value * deltatime; + m_modeaccumulator += ( Value - m_deadzone ) / ( 1.0 - m_deadzone ) * deltatime; while( m_modeaccumulator >= 1.0f ) { // send commands if the accumulator(s) was filled m_relay.post( @@ -335,7 +296,7 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) m_modeaccumulator = 0.0f; } if( Value < m_deadzone ) { - m_modeaccumulator += Value * deltatime; + m_modeaccumulator += ( Value + m_deadzone ) / ( 1.0 - m_deadzone ) * deltatime; while( m_modeaccumulator <= -1.0f ) { // send commands if the accumulator(s) was filled m_relay.post( diff --git a/keyboardinput.cpp b/keyboardinput.cpp index eacbee31..03f48a13 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -31,6 +31,7 @@ keyboard_input::key( int const Key, int const Action ) { false : true ); modifier = true; + // whenever shift key is used it may affect currently pressed movement keys, so check and update these } if( ( Key == GLFW_KEY_LEFT_CONTROL ) || ( Key == GLFW_KEY_RIGHT_CONTROL ) ) { // update internal state, but don't bother passing these @@ -45,6 +46,16 @@ keyboard_input::key( int const Key, int const Action ) { return false; } + if( true == update_movement( Key, Action ) ) { + // if the received key was one of movement keys, it's been handled and we don't need to bother further + return true; + } + + // store key state + if( Key != -1 ) { + m_keys[ Key ] = Action; + } + // include active modifiers for currently pressed key, except if the key is a modifier itself auto const key = Key @@ -106,14 +117,16 @@ keyboard_input::default_bindings() { /* const int k_AntiSlipping = 21; const int k_Sand = 22; -const int k_Main = 23; */ + { "linebreakertoggle", command_target::vehicle, GLFW_KEY_M }, { "reverserincrease", command_target::vehicle, GLFW_KEY_D }, { "reverserdecrease", command_target::vehicle, GLFW_KEY_R }, /* const int k_Fuse = 26; -const int k_Compressor = 27; -const int k_Converter = 28; +*/ + { "compressortoggle", command_target::vehicle, GLFW_KEY_C }, + { "convertertoggle", command_target::vehicle, GLFW_KEY_X }, +/* const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; @@ -130,20 +143,12 @@ const int k_FailedEngineCutOff = 35; { "moveback", command_target::entity, GLFW_KEY_DOWN }, { "moveup", command_target::entity, GLFW_KEY_PAGE_UP }, { "movedown", command_target::entity, GLFW_KEY_PAGE_DOWN }, - { "moveleftfast", command_target::entity, GLFW_KEY_LEFT | keymodifier::shift }, - { "moverightfast", command_target::entity, GLFW_KEY_RIGHT | keymodifier::shift }, - { "moveforwardfast", command_target::entity, GLFW_KEY_UP | keymodifier::shift }, - { "movebackfast", command_target::entity, GLFW_KEY_DOWN | keymodifier::shift }, - { "moveupfast", command_target::entity, GLFW_KEY_PAGE_UP | keymodifier::shift }, - { "movedownfast", command_target::entity, GLFW_KEY_PAGE_DOWN | keymodifier::shift } -/* - { "moveleftfastest", command_target::entity, GLFW_KEY_LEFT | keymodifier::control }, - { "moverightfastest", command_target::entity, GLFW_KEY_RIGHT | keymodifier::control }, - { "moveforwardfastest", command_target::entity, GLFW_KEY_UP | keymodifier::control }, - { "movebackfastest", command_target::entity, GLFW_KEY_DOWN | keymodifier::control }, - { "moveupfastest", command_target::entity, GLFW_KEY_PAGE_UP | keymodifier::control }, - { "movedownfastest", command_target::entity, GLFW_KEY_PAGE_DOWN | keymodifier::control } -*/ + { "moveleftfast", command_target::entity, -1 }, + { "moverightfast", command_target::entity, -1 }, + { "moveforwardfast", command_target::entity, -1 }, + { "movebackfast", command_target::entity, -1 }, + { "moveupfast", command_target::entity, -1 }, + { "movedownfast", command_target::entity, -1 }, /* const int k_CabForward = 42; const int k_CabBackward = 43; @@ -157,10 +162,10 @@ const int k_OpenRight = 50; const int k_CloseLeft = 51; const int k_CloseRight = 52; const int k_DepartureSignal = 53; -const int k_PantFrontUp = 54; -const int k_PantRearUp = 55; -const int k_PantFrontDown = 56; -const int k_PantRearDown = 57; +*/ + { "pantographtogglefront", command_target::vehicle, GLFW_KEY_P }, + { "pantographtogglerear", command_target::vehicle, GLFW_KEY_O }, +/* const int k_Heating = 58; // const int k_FreeFlyMode= 59; const int k_LeftSign = 60; @@ -175,7 +180,9 @@ const int k_Univ3 = 68; const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; -const int k_Battery = 72; +*/ + { "batterytoggle", command_target::vehicle, GLFW_KEY_J } +/* const int k_WalkMode = 73; int const k_DimHeadlights = 74; */ @@ -199,6 +206,117 @@ keyboard_input::bind() { } ++commandcode; } + // cache movement key bindings, so we can test them faster in the input loop + m_bindingscache.forward = m_commands[ static_cast( user_command::moveforward ) ].binding; + m_bindingscache.back = m_commands[ static_cast( user_command::moveback ) ].binding; + m_bindingscache.left = m_commands[ static_cast( user_command::moveleft ) ].binding; + m_bindingscache.right = m_commands[ static_cast( user_command::moveright ) ].binding; + m_bindingscache.up = m_commands[ static_cast( user_command::moveup ) ].binding; + m_bindingscache.down = m_commands[ static_cast( user_command::movedown ) ].binding; +} + +// NOTE: ugliest code ever, gg +bool +keyboard_input::update_movement( int const Key, int const Action ) { + + bool shift = + ( ( Key == GLFW_KEY_LEFT_SHIFT ) + || ( Key == GLFW_KEY_RIGHT_SHIFT ) ); + bool movementkey = + ( ( Key == m_bindingscache.forward ) + || ( Key == m_bindingscache.back ) + || ( Key == m_bindingscache.left ) + || ( Key == m_bindingscache.right ) + || ( Key == m_bindingscache.up ) + || ( Key == m_bindingscache.down ) ); + + if( false == ( shift || movementkey ) ) { return false; } + + if( false == shift ) { + // TODO: pass correct entity id once the missing systems are in place + if( Key == m_bindingscache.forward ) { + m_keys[ Key ] = Action; + m_relay.post( + ( m_shift ? + user_command::moveforwardfast : + user_command::moveforward ), + 0, 0, + m_keys[ m_bindingscache.forward ], + 0 ); + return true; + } + else if( Key == m_bindingscache.back ) { + m_keys[ Key ] = Action; + m_relay.post( + ( m_shift ? + user_command::movebackfast : + user_command::moveback ), + 0, 0, + m_keys[ m_bindingscache.back ], + 0 ); + return true; + } + else if( Key == m_bindingscache.left ) { + m_keys[ Key ] = Action; + m_relay.post( + ( m_shift ? + user_command::moveleftfast : + user_command::moveleft ), + 0, 0, + m_keys[ m_bindingscache.left ], + 0 ); + return true; + } + else if( Key == m_bindingscache.right ) { + m_keys[ Key ] = Action; + m_relay.post( + ( m_shift ? + user_command::moverightfast : + user_command::moveright ), + 0, 0, + m_keys[ m_bindingscache.right ], + 0 ); + return true; + } + else if( Key == m_bindingscache.up ) { + m_keys[ Key ] = Action; + m_relay.post( + ( m_shift ? + user_command::moveupfast : + user_command::moveup ), + 0, 0, + m_keys[ m_bindingscache.up ], + 0 ); + return true; + } + else if( Key == m_bindingscache.down ) { + m_keys[ Key ] = Action; + m_relay.post( + ( m_shift ? + user_command::movedownfast : + user_command::movedown ), + 0, 0, + m_keys[ m_bindingscache.down ], + 0 ); + return true; + } + } + else { + // if it's not the movement keys but one of shift keys, we might potentially need to update movement state + if( m_keys[ Key ] == Action ) { + // but not if it's just repeat + return false; + } + // bit of recursion voodoo here, we fake relevant key presses so we don't have to duplicate the code from above + if( m_keys[ m_bindingscache.forward ] != GLFW_RELEASE ) { update_movement( m_bindingscache.forward, m_keys[ m_bindingscache.forward ] ); } + if( m_keys[ m_bindingscache.back ] != GLFW_RELEASE ) { update_movement( m_bindingscache.back, m_keys[ m_bindingscache.back ] ); } + if( m_keys[ m_bindingscache.left ] != GLFW_RELEASE ) { update_movement( m_bindingscache.left, m_keys[ m_bindingscache.left ] ); } + if( m_keys[ m_bindingscache.right ] != GLFW_RELEASE ) { update_movement( m_bindingscache.right, m_keys[ m_bindingscache.right ] ); } + if( m_keys[ m_bindingscache.up ] != GLFW_RELEASE ) { update_movement( m_bindingscache.up, m_keys[ m_bindingscache.up ] ); } + if( m_keys[ m_bindingscache.down ] != GLFW_RELEASE ) { update_movement( m_bindingscache.down, m_keys[ m_bindingscache.down ] ); } + } + + return false; } //--------------------------------------------------------------------------- diff --git a/keyboardinput.h b/keyboardinput.h index c8e2fb43..1c92acdf 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include +#include #include "command.h" class keyboard_input { @@ -44,11 +45,23 @@ private: typedef std::vector commandsetup_sequence; typedef std::unordered_map usercommand_map; + struct bindings_cache { + + int forward{ -1 }; + int back{ -1 }; + int left{ -1 }; + int right{ -1 }; + int up{ -1 }; + int down{ -1 }; + }; + // methods void default_bindings(); void bind(); + bool + update_movement( int const Key, int const Action ); // members commandsetup_sequence m_commands; @@ -56,6 +69,8 @@ private: command_relay m_relay; bool m_shift{ false }; bool m_ctrl{ false }; + bindings_cache m_bindingscache; + std::array m_keys; }; //--------------------------------------------------------------------------- diff --git a/maszyna.vcxproj.user b/maszyna.vcxproj.user index 3aea8305..803ce541 100644 --- a/maszyna.vcxproj.user +++ b/maszyna.vcxproj.user @@ -1,7 +1,7 @@  - ..\..\Projects\maszyna + ..\..\..\development\maszyna WindowsLocalDebugger @@ -9,11 +9,11 @@ WindowsLocalDebugger - ..\..\Projects\maszyna + ..\..\..\development\maszyna WindowsLocalDebugger - ..\..\Projects\maszyna + ..\..\..\development\maszyna WindowsLocalDebugger _NO_DEBUG_HEAP=1 @@ -23,7 +23,7 @@ _NO_DEBUG_HEAP=1 - ..\..\Projects\maszyna + ..\..\..\development\maszyna WindowsLocalDebugger _NO_DEBUG_HEAP=1 From fafb7a63c3951e8a29f9a34c7a1699cae4f45792 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 13 Apr 2017 15:56:28 +0200 Subject: [PATCH 083/426] control for alerter, doors, vehicle lights. support for multiple logs. fixes for relaytype 45, 46 --- EU07.cpp | 6 +- Globals.cpp | 7 +- Globals.h | 1 + Ground.cpp | 8 +- Logs.cpp | 47 +- McZapkie/MOVER.h | 21 +- McZapkie/Mover.cpp | 256 ++-- McZapkie/mctools.cpp | 20 +- McZapkie/mctools.h | 2 +- Train.cpp | 2529 ++++++++++++++++++++++++--------------- Train.h | 100 +- World.cpp | 31 +- command.cpp | 57 +- command.h | 26 +- keyboardinput.cpp | 27 +- maszyna.vcxproj.filters | 4 +- renderer.cpp | 2 +- stdafx.h | 1 + 18 files changed, 1951 insertions(+), 1194 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index b69a5398..f36b2573 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -214,7 +214,11 @@ int main(int argc, char *argv[]) if (!glfwInit()) return -1; - DeleteFile("errors.txt"); +#ifdef _WINDOWS + DeleteFile( "log.txt" ); + DeleteFile( "errors.txt" ); + _mkdir("logs"); +#endif Global::LoadIniFile("eu07.ini"); Global::InitKeys(); diff --git a/Globals.cpp b/Globals.cpp index 5663318f..e5cd1de9 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -166,6 +166,7 @@ bool Global::bOldSmudge = false; // Używanie starej smugi bool Global::bWireFrame = false; bool Global::bSoundEnabled = true; int Global::iWriteLogEnabled = 3; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów +bool Global::MultipleLogs{ false }; bool Global::bManageNodes = true; bool Global::bDecompressDDS = false; // czy programowa dekompresja DDS @@ -374,7 +375,11 @@ void Global::ConfigParse(cParser &Parser) Global::iWriteLogEnabled = stol_def(token,3); } } - else if (token == "adjustscreenfreq") + else if( token == "multiplelogs" ) { + Parser.getTokens(); + Parser >> Global::MultipleLogs; + } + else if( token == "adjustscreenfreq" ) { // McZapkie-240403 - czestotliwosc odswiezania ekranu Parser.getTokens(); diff --git a/Globals.h b/Globals.h index 26e9d8be..d2d48623 100644 --- a/Globals.h +++ b/Globals.h @@ -214,6 +214,7 @@ class Global static void SetCameraPosition(Math3D::vector3 pNewCameraPosition); static void SetCameraRotation(double Yaw); static int iWriteLogEnabled; // maska bitowa: 1-zapis do pliku, 2-okienko + static bool MultipleLogs; // McZapkie-221002: definicja swiatla dziennego static float Background[3]; static GLfloat AtmoColor[]; diff --git a/Ground.cpp b/Ground.cpp index 393f2dbc..c01957bb 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -386,7 +386,7 @@ void TGroundNode::RenderAlphaVBO() if( ( PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glDisable( GL_BLEND ); - glAlphaFunc( GL_GREATER, 0.45f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f }; #endif @@ -662,7 +662,7 @@ void TGroundNode::RenderAlphaDL() if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.50f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f }; #endif if (!DisplayListID) //||Global::bReCompile) //Ra: wymuszenie rekompilacji @@ -4758,7 +4758,7 @@ TGround::Render( Math3D::vector3 const &Camera ) { bool TGround::RenderDL(vector3 pPosition) { // renderowanie scenerii z Display List - faza nieprzezroczystych glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.50f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) CameraDirection.x = sin(Global::pCameraRotation); // wektor kierunkowy CameraDirection.z = cos(Global::pCameraRotation); @@ -4848,7 +4848,7 @@ bool TGround::RenderAlphaDL(vector3 pPosition) bool TGround::RenderVBO(vector3 pPosition) { // renderowanie scenerii z VBO - faza nieprzezroczystych glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.45f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc(GL_GREATER, 0.50f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek CameraDirection.x = sin(Global::pCameraRotation); // wektor kierunkowy CameraDirection.z = cos(Global::pCameraRotation); diff --git a/Logs.cpp b/Logs.cpp index eff68c90..a4a22fb0 100644 --- a/Logs.cpp +++ b/Logs.cpp @@ -18,6 +18,33 @@ std::ofstream comms; // lista komunikatow "comms.txt", można go wyłączyć char endstring[10] = "\n"; +std::string filename_date() { + + ::SYSTEMTIME st; + ::GetSystemTime( &st ); + char buffer[ 256 ]; + sprintf( buffer, + "%d%02d%02d_%02d%02d", + st.wYear, + st.wMonth, + st.wDay, + st.wHour, + st.wMinute ); + + return std::string( buffer ); +} + +std::string filename_scenery() { + + auto extension = Global::SceneryFile.rfind( '.' ); + if( extension != std::string::npos ) { + return Global::SceneryFile.substr( 0, extension ); + } + else { + return Global::SceneryFile; + } +} + void WriteConsoleOnly(const char *str, double value) { char buf[255]; @@ -57,8 +84,14 @@ void WriteLog(const char *str, bool newline) { if (Global::iWriteLogEnabled & 1) { - if (!output.is_open()) - output.open("log.txt", std::ios::trunc); + if( !output.is_open() ) { + + std::string const filename = + ( Global::MultipleLogs ? + "logs/log (" + filename_scenery() + ") " + filename_date() + ".txt" : + "log.txt" ); + output.open( filename, std::ios::trunc ); + } output << str; if (newline) output << "\n"; @@ -72,9 +105,13 @@ void WriteLog(const char *str, bool newline) void ErrorLog(const char *str) { // Ra: bezwarunkowa rejestracja poważnych błędów - if (!errors.is_open()) - { - errors.open("errors.txt", std::ios::trunc); + if (!errors.is_open()) { + + std::string const filename = + ( Global::MultipleLogs ? + "logs/errors (" + filename_scenery() + ") " + filename_date() + ".txt" : + "errors.txt" ); + errors.open( filename, std::ios::trunc ); errors << "EU07.EXE " + Global::asRelease << "\n"; } if (str) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 6d7d2c40..448a65b9 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -416,37 +416,30 @@ struct TPowerParameters struct { _mover__3 RHeater; - }; struct { _mover__2 RPowerCable; - }; struct { TCurrentCollector CollectorParameters; - }; struct { _mover__1 RAccumulator; - }; struct { TEngineTypes GeneratorEngine; - }; struct { double InputVoltage; - }; struct { TPowerType PowerType; - }; }; @@ -670,10 +663,18 @@ public: /*nastawniki:*/ int MainCtrlPosNo = 0; /*ilosc pozycji nastawnika*/ int ScndCtrlPosNo = 0; - int LightsPosNo = 0; // NOTE: values higher than 0 seem to break the current code for light switches + int LightsPosNo = 0; int LightsDefPos = 1; bool LightsWrap = false; int Lights[2][17]; // pozycje świateł, przód - tył, 1 .. 16 + enum light { + + headlight_left = 0x01, + redmarker_left = 0x02, + headlight_upper = 0x04, + headlight_right = 0x10, + redmarker_right = 0x20, + }; bool ScndInMain = false; /*zaleznosc bocznika od nastawnika*/ bool MBrake = false; /*Czy jest hamulec reczny*/ double StopBrakeDecc = 0.0; @@ -1173,6 +1174,10 @@ extract_value( _Type &Variable, std::string const &Key, std::string const &Input } } +template <> +bool +extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ); + inline std::string extract_value( std::string const &Key, std::string const &Input ) { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 7a114a15..debab692 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1814,8 +1814,9 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) LastRelayTime = 0; if ((OK) && (EngineType == ElectricInductionMotor)) + // NOTE: round() already adds 0.5, are the ones added here as well correct? if ((Vmax < 250)) - ScndCtrlActualPos = Round(Vel + 0.5f); + ScndCtrlActualPos = Round(Vel + 0.5); else ScndCtrlActualPos = Round(Vel * 1.0 / 2 + 0.5); @@ -2031,10 +2032,12 @@ void TMoverParameters::SecuritySystemCheck(double dt) (Battery)) // Ra: EZT ma teraz czuwak w rozrządczym { // CA - if (Vel >= - SecuritySystem - .AwareMinSpeed) // domyślnie predkość większa od 10% Vmax, albo podanej jawnie w FIZ - { + if( ( SecuritySystem.AwareMinSpeed > 0.0 ? + ( Vel >= SecuritySystem.AwareMinSpeed ) : + ( ActiveDir != 0 ) ) ) { + // domyślnie predkość większa od 10% Vmax, albo podanej jawnie w FIZ + // with defined minspeed of 0 the alerter will activate with reverser out of neutral position + // this emulates behaviour of engines like SM42 SecuritySystem.SystemTimer += dt; if (TestFlag(SecuritySystem.SystemType, 1) && TestFlag(SecuritySystem.Status, s_aware)) // jeśli świeci albo miga @@ -4087,106 +4090,152 @@ double TMoverParameters::TractionForce(double dt) if ((MainCtrlPos == 0) || (ShuntMode)) ScndCtrlPos = 0; - else if (AutoRelayFlag) - switch (RelayType) - { - case 0: - { - if ((Im <= (MPTRelay[ScndCtrlPos].Iup * PosRatio)) && - (ScndCtrlPos < ScndCtrlPosNo)) - ++ScndCtrlPos; - if ((Im >= (MPTRelay[ScndCtrlPos].Idown * PosRatio)) && (ScndCtrlPos > 0)) - --ScndCtrlPos; - break; - } - case 1: - { - if ((MPTRelay[ScndCtrlPos].Iup < Vel) && (ScndCtrlPos < ScndCtrlPosNo)) - ++ScndCtrlPos; - if ((MPTRelay[ScndCtrlPos].Idown > Vel) && (ScndCtrlPos > 0)) - --ScndCtrlPos; - break; - } - case 2: - { - if ((MPTRelay[ScndCtrlPos].Iup < Vel) && (ScndCtrlPos < ScndCtrlPosNo) && - (EnginePower < (tmp * 0.99))) - ++ScndCtrlPos; - if ((MPTRelay[ScndCtrlPos].Idown < Im) && (ScndCtrlPos > 0)) - --ScndCtrlPos; - break; - } - case 41: - { - if ((MainCtrlPos == MainCtrlPosNo) && - (tmpV * 3.6 > MPTRelay[ScndCtrlPos].Iup) && (ScndCtrlPos < ScndCtrlPosNo)) - { - ++ScndCtrlPos; - enrot = enrot * 0.73; - } - if ((Im > MPTRelay[ScndCtrlPos].Idown) && (ScndCtrlPos > 0)) - --ScndCtrlPos; - break; - } - case 45: - { - if ((MainCtrlPos > 11) && (ScndCtrlPos < ScndCtrlPosNo)) - if ((ScndCtrlPos == 0)) - if ((MPTRelay[ScndCtrlPos].Iup > Im)) - ++ScndCtrlPos; - else if ((MPTRelay[ScndCtrlPos].Iup < Vel)) - ++ScndCtrlPos; + else { + if( AutoRelayFlag ) { - // malenie - if ((ScndCtrlPos > 0) && (MainCtrlPos < 12)) - if ((ScndCtrlPos == ScndCtrlPosNo)) - if ((MPTRelay[ScndCtrlPos].Idown < Im)) - --ScndCtrlPos; - else if ((MPTRelay[ScndCtrlPos].Idown > Vel)) - --ScndCtrlPos; - if ((MainCtrlPos < 11) && (ScndCtrlPos > 2)) - ScndCtrlPos = 2; - if ((MainCtrlPos < 9) && (ScndCtrlPos > 0)) - ScndCtrlPos = 0; - } - case 46: - { - // wzrastanie - if ((MainCtrlPos > 9) && (ScndCtrlPos < ScndCtrlPosNo)) - if ((ScndCtrlPos) % 2 == 0) - if ((MPTRelay[ScndCtrlPos].Iup > Im)) - ++ScndCtrlPos; - else if ((MPTRelay[ScndCtrlPos - 1].Iup > Im) && - (MPTRelay[ScndCtrlPos].Iup < Vel)) - ++ScndCtrlPos; + switch( RelayType ) { - // malenie - if ((MainCtrlPos < 10) && (ScndCtrlPos > 0)) - if ((ScndCtrlPos) % 2 == 0) - if ((MPTRelay[ScndCtrlPos].Idown < Im)) + case 0: { + + if( ( Im <= ( MPTRelay[ ScndCtrlPos ].Iup * PosRatio ) ) && + ( ScndCtrlPos < ScndCtrlPosNo ) ) + ++ScndCtrlPos; + if( ( Im >= ( MPTRelay[ ScndCtrlPos ].Idown * PosRatio ) ) && ( ScndCtrlPos > 0 ) ) --ScndCtrlPos; - else if ((MPTRelay[ScndCtrlPos + 1].Idown < Im) && - (MPTRelay[ScndCtrlPos].Idown > Vel)) + break; + } + case 1: { + + if( ( MPTRelay[ ScndCtrlPos ].Iup < Vel ) && ( ScndCtrlPos < ScndCtrlPosNo ) ) + ++ScndCtrlPos; + if( ( MPTRelay[ ScndCtrlPos ].Idown > Vel ) && ( ScndCtrlPos > 0 ) ) --ScndCtrlPos; - if ((MainCtrlPos < 9) && (ScndCtrlPos > 2)) - ScndCtrlPos = 2; - if ((MainCtrlPos < 6) && (ScndCtrlPos > 0)) - ScndCtrlPos = 0; + break; + } + case 2: { + + if( ( MPTRelay[ ScndCtrlPos ].Iup < Vel ) && ( ScndCtrlPos < ScndCtrlPosNo ) && + ( EnginePower < ( tmp * 0.99 ) ) ) + ++ScndCtrlPos; + if( ( MPTRelay[ ScndCtrlPos ].Idown < Im ) && ( ScndCtrlPos > 0 ) ) + --ScndCtrlPos; + break; + } + case 41: + { + if( ( MainCtrlPos == MainCtrlPosNo ) + && ( tmpV * 3.6 > MPTRelay[ ScndCtrlPos ].Iup ) + && ( ScndCtrlPos < ScndCtrlPosNo ) ) { + ++ScndCtrlPos; + enrot = enrot * 0.73; + } + if( ( Im > MPTRelay[ ScndCtrlPos ].Idown ) + && ( ScndCtrlPos > 0 ) ) { + --ScndCtrlPos; + } + break; + } + case 45: + { + if( ( MainCtrlPos >= 10 ) && ( ScndCtrlPos < ScndCtrlPosNo ) ) { + if( ScndCtrlPos == 0 ) { + if( Im < MPTRelay[ ScndCtrlPos ].Iup ) { + ++ScndCtrlPos; + } + } + else { + if( Vel > MPTRelay[ ScndCtrlPos ].Iup ) { + ++ScndCtrlPos; + } + // check for cases where the speed drops below threshold for level 2 or 3 + if( ( ScndCtrlPos > 1 ) + && ( Vel < MPTRelay[ ScndCtrlPos - 1 ].Idown ) ){ + --ScndCtrlPos; + } + } + } + // malenie + if( ( ScndCtrlPos > 0 ) && ( MainCtrlPos < 10 ) ) { + if( ScndCtrlPos == 1 ) { + if( Im > MPTRelay[ ScndCtrlPos - 1 ].Idown ) { + --ScndCtrlPos; + } + } + else { + if( Vel < MPTRelay[ ScndCtrlPos ].Idown ) { + --ScndCtrlPos; + } + } + } + // 3rd level drops with master controller at position lower than 10... + if( MainCtrlPos < 10 ) { + ScndCtrlPos = std::min( 2, ScndCtrlPos ); + } + // ...and below position 7 field shunt drops altogether + if( MainCtrlPos < 7 ) { + ScndCtrlPos = 0; + } + break; + } + case 46: + { + // wzrastanie + if( ( MainCtrlPos >= 10 ) + && ( ScndCtrlPos < ScndCtrlPosNo ) ) { + if( ( ScndCtrlPos ) % 2 == 0 ) { + if( ( MPTRelay[ ScndCtrlPos ].Iup > Im ) ) { + ++ScndCtrlPos; + } + } + else { + if( ( MPTRelay[ ScndCtrlPos - 1 ].Iup > Im ) + && ( MPTRelay[ ScndCtrlPos ].Iup < Vel ) ) { + ++ScndCtrlPos; + } + } + } + // malenie + if( ( MainCtrlPos < 10 ) + && ( ScndCtrlPos > 0 ) ) { + if( ( ScndCtrlPos ) % 2 == 0 ) { + if( ( MPTRelay[ ScndCtrlPos ].Idown < Im ) ) { + --ScndCtrlPos; + } + } + else { + if( ( MPTRelay[ ScndCtrlPos + 1 ].Idown < Im ) + && ( MPTRelay[ ScndCtrlPos ].Idown > Vel ) ) { + --ScndCtrlPos; + } + } + } + if( MainCtrlPos < 10 ) { + ScndCtrlPos = std::min( 2, ScndCtrlPos ); + } + if( MainCtrlPos < 7 ) { + ScndCtrlPos = 0; + } + break; + } + default: { + break; + } + } // switch RelayType } - } // switch RelayType + } break; } // DieselElectric case ElectricInductionMotor: { - if ((Mains)) // nie wchodzić w funkcję bez potrzeby - if ((abs(Voltage) < EnginePowerSource.CollectorParameters.MinV) || - (abs(Voltage) > EnginePowerSource.CollectorParameters.MaxV + 200)) - { - MainSwitch(false); + if( ( Mains ) ) { + // nie wchodzić w funkcję bez potrzeby + if( ( abs( Voltage ) < EnginePowerSource.CollectorParameters.MinV ) + || ( abs( Voltage ) > EnginePowerSource.CollectorParameters.MaxV + 200 ) ) { + MainSwitch( false ); } - tmpV = abs(nrot) * (PI * WheelDiameter) * - 3.6; //*DirAbsolute*eimc[eimc_s_p]; - do przemyslenia dzialanie pp + } + tmpV = abs(nrot) * (PI * WheelDiameter) * 3.6; //*DirAbsolute*eimc[eimc_s_p]; - do przemyslenia dzialanie pp if ((Mains)) { @@ -7915,3 +7964,22 @@ double TMoverParameters::ShowCurrentP(int AmpN) return current; } } + +template <> +bool +extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { + + auto value = extract_value( Key, Input ); + if( false == value.empty() ) { + // set the specified variable to retrieved value + Variable = ( ToLower( value ) == "yes" ); + return true; // located the variable + } + else { + // set the variable to provided default value + if( false == Default.empty() ) { + Variable = ( ToLower( Default ) == "yes" ); + } + return false; // supplied the default + } +} diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index f91f7b9d..37c8b148 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -72,23 +72,11 @@ double Min0R(double x1, double x2) // TODO: replace with something sensible std::string Now() { - std::time_t timenow = std::time( nullptr ); - std::tm tm = *std::localtime( &timenow ); - std::stringstream converter; - converter << std::put_time( &tm, "%c" ); + std::time_t timenow = std::time( nullptr ); + std::tm tm = *std::localtime( &timenow ); + std::stringstream converter; + converter << std::put_time( &tm, "%c" ); return converter.str(); - -/* char buffer[ 256 ]; - sprintf( buffer, - "%d-%02d-%02d %02d:%02d:%02d.%03d", - st.wYear, - st.wMonth, - st.wDay, - st.wHour, - st.wMinute, - st.wSecond, - st.wMilliseconds ); -*/ } bool TestFlag(int Flag, int Value) diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index 817f34ec..a0ecf5af 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -62,7 +62,7 @@ inline double Sign(double x) return x >= 0 ? 1.0 : -1.0; } -inline long Round(float f) +inline long Round(double const f) { return (long)(f + 0.5); //return lround(f); diff --git a/Train.cpp b/Train.cpp index ec477ff0..d17783b0 100644 --- a/Train.cpp +++ b/Train.cpp @@ -131,6 +131,54 @@ void TCab::Update() } }; +// NOTE: we're currently using universal handlers and static handler map but it may be beneficial to have these implemented on individual class instance basis +// TBD, TODO: consider this approach if we ever want to have customized consist behaviour to received commands, based on the consist/vehicle type or whatever +TTrain::commandhandler_map const TTrain::m_commandhandlers = { + + { user_command::mastercontrollerincrease, &TTrain::OnCommand_mastercontrollerincrease }, + { user_command::mastercontrollerincreasefast, &TTrain::OnCommand_mastercontrollerincreasefast }, + { user_command::mastercontrollerdecrease, &TTrain::OnCommand_mastercontrollerdecrease }, + { user_command::mastercontrollerdecreasefast, &TTrain::OnCommand_mastercontrollerdecreasefast }, + { user_command::secondcontrollerincrease, &TTrain::OnCommand_secondcontrollerincrease }, + { user_command::secondcontrollerincreasefast, &TTrain::OnCommand_secondcontrollerincreasefast }, + { user_command::secondcontrollerdecrease, &TTrain::OnCommand_secondcontrollerdecrease }, + { user_command::secondcontrollerdecreasefast, &TTrain::OnCommand_secondcontrollerdecreasefast }, + { user_command::independentbrakeincrease, &TTrain::OnCommand_independentbrakeincrease }, + { user_command::independentbrakeincreasefast, &TTrain::OnCommand_independentbrakeincreasefast }, + { user_command::independentbrakedecrease, &TTrain::OnCommand_independentbrakedecrease }, + { user_command::independentbrakedecreasefast, &TTrain::OnCommand_independentbrakedecreasefast }, + { user_command::independentbrakebailoff, &TTrain::OnCommand_independentbrakebailoff }, + { user_command::trainbrakeincrease, &TTrain::OnCommand_trainbrakeincrease }, + { user_command::trainbrakedecrease, &TTrain::OnCommand_trainbrakedecrease }, + { user_command::trainbrakecharging, &TTrain::OnCommand_trainbrakecharging }, + { user_command::trainbrakerelease, &TTrain::OnCommand_trainbrakerelease }, + { user_command::trainbrakefirstservice, &TTrain::OnCommand_trainbrakefirstservice }, + { user_command::trainbrakeservice, &TTrain::OnCommand_trainbrakeservice }, + { user_command::trainbrakefullservice, &TTrain::OnCommand_trainbrakefullservice }, + { user_command::trainbrakeemergency, &TTrain::OnCommand_trainbrakeemergency }, + { user_command::reverserincrease, &TTrain::OnCommand_reverserincrease }, + { user_command::reverserdecrease, &TTrain::OnCommand_reverserdecrease }, + { user_command::alerteracknowledge, &TTrain::OnCommand_alerteracknowledge }, + { user_command::batterytoggle, &TTrain::OnCommand_batterytoggle }, + { user_command::pantographtogglefront, &TTrain::OnCommand_pantographtogglefront }, + { user_command::pantographtogglerear, &TTrain::OnCommand_pantographtogglerear }, + { user_command::linebreakertoggle, &TTrain::OnCommand_linebreakertoggle }, + { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, + { user_command::compressortoggle, &TTrain::OnCommand_compressortoggle }, + { user_command::headlighttoggleleft, &TTrain::OnCommand_headlighttoggleleft }, + { user_command::headlighttoggleright, &TTrain::OnCommand_headlighttoggleright }, + { user_command::headlighttoggleupper, &TTrain::OnCommand_headlighttoggleupper }, + { user_command::redmarkertoggleleft, &TTrain::OnCommand_redmarkertoggleleft }, + { user_command::redmarkertoggleright, &TTrain::OnCommand_redmarkertoggleright }, + { user_command::headlighttogglerearleft, &TTrain::OnCommand_headlighttogglerearleft }, + { user_command::headlighttogglerearright, &TTrain::OnCommand_headlighttogglerearright }, + { user_command::headlighttogglerearupper, &TTrain::OnCommand_headlighttogglerearupper }, + { user_command::redmarkertogglerearleft, &TTrain::OnCommand_redmarkertogglerearleft }, + { user_command::redmarkertogglerearright, &TTrain::OnCommand_redmarkertogglerearright }, + { user_command::doortoggleleft, &TTrain::OnCommand_doortoggleleft }, + { user_command::doortoggleright, &TTrain::OnCommand_doortoggleright } +}; + TTrain::TTrain() { ActiveUniversal4 = false; @@ -391,898 +439,1389 @@ PyObject *TTrain::GetTrainState() { return dict; } -void -TTrain::OnCommand( command_data const &Command ) { +bool TTrain::is_eztoer() const { - bool const isEztOer = + return ( ( mvControlled->TrainType == dt_EZT ) && ( mvOccupied->BrakeSubsystem == ss_ESt ) && ( mvControlled->Battery == true ) && ( mvControlled->EpFuse == true ) && ( mvControlled->ActiveDir != 0 ) ); // od yB +} - switch( Command.command ) { +// command handlers +void TTrain::OnCommand_mastercontrollerincrease( TTrain *Train, command_data const &Command ) { - case user_command::mastercontrollerincrease: { + if( Command.action != GLFW_RELEASE ) { + // on press or hold + if( Train->mvControlled->IncMainCtrl( 1 ) ) { + // sound feedback + Train->play_sound( Train->dsbNastawnikJazdy ); + } + } +} - if( Command.action != GLFW_RELEASE ) { +void TTrain::OnCommand_mastercontrollerincreasefast( TTrain *Train, command_data const &Command ) { - if( mvControlled->IncMainCtrl( 1 ) ) { - // sound feedback - play_sound( dsbNastawnikJazdy ); + if( Command.action != GLFW_RELEASE ) { + // on press or hold + if( Train->mvControlled->IncMainCtrl( 2 ) ) { + // sound feedback + Train->play_sound( Train->dsbNastawnikJazdy ); + } + } +} + +void TTrain::OnCommand_mastercontrollerdecrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + // on press or hold + if( Train->mvControlled->DecMainCtrl( 1 ) ) { + // sound feedback + Train->play_sound( Train->dsbNastawnikJazdy ); + } + } +} + +void TTrain::OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + // on press or hold + if( Train->mvControlled->DecMainCtrl( 2 ) ) { + // sound feedback + Train->play_sound( Train->dsbNastawnikJazdy ); + } + } +} + +void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + // on press or hold + if( Train->mvControlled->ShuntMode ) { + Train->mvControlled->AnPos += ( Command.time_delta * 0.75f ); + if( Train->mvControlled->AnPos > 1 ) + Train->mvControlled->AnPos = 1; + } + else if( Train->mvControlled->IncScndCtrl( 1 ) ) { + // sound feedback + Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); + } + } +} + +void TTrain::OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + // on press or hold + if( Train->mvControlled->IncScndCtrl( 2 ) ) { + // sound feedback + Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); + } + } +} + +void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + // on press or hold + if( Train->mvControlled->ShuntMode ) { + Train->mvControlled->AnPos -= ( Command.time_delta * 0.75f ); + if( Train->mvControlled->AnPos > 1 ) + Train->mvControlled->AnPos = 1; + } + else if( Train->mvControlled->DecScndCtrl( 1 ) ) { + // sound feedback + Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); + } + } +} + +void TTrain::OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + // on press or hold + if( Train->mvControlled->DecScndCtrl( 2 ) ) { + // sound feedback + Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); + } + } +} + +void TTrain::OnCommand_independentbrakeincrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + if( Train->mvOccupied->LocalBrake != ManualBrake ) { + Train->mvOccupied->IncLocalBrakeLevel( 1 ); + } + } +} + +void TTrain::OnCommand_independentbrakeincreasefast( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + if( Train->mvOccupied->LocalBrake != ManualBrake ) { + Train->mvOccupied->IncLocalBrakeLevel( 2 ); + } + } +} + +void TTrain::OnCommand_independentbrakedecrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + if( ( Train->mvOccupied->LocalBrake != ManualBrake ) + // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - odhamować jakoś trzeba + // TODO: sort AI out so it doesn't do things it doesn't have equipment for + || ( Train->mvOccupied->LocalBrakePos != 0 ) ) { + Train->mvOccupied->DecLocalBrakeLevel( 1 ); + } + } +} + +void TTrain::OnCommand_independentbrakedecreasefast( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + if( ( Train->mvOccupied->LocalBrake != ManualBrake ) + // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - odhamować jakoś trzeba + // TODO: sort AI out so it doesn't do things it doesn't have equipment for + || ( Train->mvOccupied->LocalBrakePos != 0 ) ) { + Train->mvOccupied->DecLocalBrakeLevel( 2 ); + } + } +} + +void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data const &Command ) { + // TODO: check if this set of conditions can be simplified. + // it'd be more flexible to have an attribute indicating whether bail off position is supported + if( ( Train->mvControlled->TrainType != dt_EZT ) + && ( ( Train->mvControlled->EngineType == ElectricSeriesMotor ) + || ( Train->mvControlled->EngineType == DieselElectric ) + || ( Train->mvControlled->EngineType == ElectricInductionMotor ) ) + && ( Train->mvOccupied->BrakeCtrlPosNo > 0 ) ) { + + if( Command.action != GLFW_RELEASE ) { + // press or hold + Train->ggReleaserButton.UpdateValue( 1 ); + Train->mvOccupied->BrakeReleaser( 1 ); + } + else { + // release + Train->ggReleaserButton.UpdateValue( 0 ); + Train->mvOccupied->BrakeReleaser( 0 ); + } + } +} + +void TTrain::OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + if( Train->mvOccupied->BrakeHandle == FV4a ) { + Train->mvOccupied->BrakeLevelAdd( 0.1 /*15.0 * Command.time_delta*/ ); + } + else { + if( Train->mvOccupied->BrakeLevelAdd( Global::fBrakeStep ) ) { + // nieodpowiedni warunek; true, jeśli można dalej kręcić + Train->keybrakecount = 0; + if( ( Train->is_eztoer() ) && ( Train->mvOccupied->BrakeCtrlPos < 3 ) ) { + // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza + Train->play_sound( Train->dsbPneumaticSwitch ); } } - break; + } + } +} + +void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + if( Train->mvOccupied->BrakeHandle == FV4a ) { + Train->mvOccupied->BrakeLevelAdd( -0.1 /*-15.0 * Command.time_delta*/ ); + } + else { + // nową wersję dostarczył ZiomalCl ("fixed looped sound in ezt when using NUM_9 key") + if( ( Train->mvOccupied->BrakeCtrlPos > -1 ) + || ( Train->keybrakecount > 1 ) ) { + + if( ( Train->is_eztoer() ) + && ( Train->mvControlled->Mains ) + && ( Train->mvOccupied->BrakeCtrlPos != -1 ) ) { + // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza + Train->play_sound( Train->dsbPneumaticSwitch ); + } + Train->mvOccupied->BrakeLevelAdd( -Global::fBrakeStep ); + } + else + Train->keybrakecount += 1; + // koniec wersji dostarczonej przez ZiomalCl + } + } +} + +void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( Train->is_eztoer() ) + && ( Train->mvControlled->Mains ) + && ( Train->mvOccupied->BrakeCtrlPos != -1 ) ) { + Train->play_sound( Train->dsbPneumaticSwitch ); } - case user_command::mastercontrollerincreasefast: { + Train->mvOccupied->BrakeLevelSet( -1 ); + } +} - if( Command.action != GLFW_RELEASE ) { +void TTrain::OnCommand_trainbrakerelease( TTrain *Train, command_data const &Command ) { - if( mvControlled->IncMainCtrl( 2 ) ) { - // sound feedback - play_sound( dsbNastawnikJazdy ); - } - } - break; + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( Train->is_eztoer() ) + && ( ( Train->mvOccupied->BrakeCtrlPos == 1 ) + || ( Train->mvOccupied->BrakeCtrlPos == -1 ) ) ) { + Train->play_sound( Train->dsbPneumaticSwitch ); } - case user_command::mastercontrollerdecrease: { + Train->mvOccupied->BrakeLevelSet( 0 ); + } +} - if( Command.action != GLFW_RELEASE ) { +void TTrain::OnCommand_trainbrakefirstservice( TTrain *Train, command_data const &Command ) { - if( mvControlled->DecMainCtrl( 1 ) ) { - // sound feedback - play_sound( dsbNastawnikJazdy ); - } - } - break; + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( Train->is_eztoer() ) + && ( Train->mvControlled->Mains ) + && ( Train->mvOccupied->BrakeCtrlPos != 1 ) ) { + Train->play_sound( Train->dsbPneumaticSwitch ); } - case user_command::mastercontrollerdecreasefast: { + Train->mvOccupied->BrakeLevelSet( 1 ); + } +} - if( Command.action != GLFW_RELEASE ) { +void TTrain::OnCommand_trainbrakeservice( TTrain *Train, command_data const &Command ) { - if( mvControlled->DecMainCtrl( 2 ) ) { - // sound feedback - play_sound( dsbNastawnikJazdy ); - } - } - break; + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( Train->is_eztoer() ) + && ( Train->mvControlled->Mains ) + && ( ( Train->mvOccupied->BrakeCtrlPos == 1 ) + || ( Train->mvOccupied->BrakeCtrlPos == -1 ) ) ) { + Train->play_sound( Train->dsbPneumaticSwitch ); } - case user_command::secondcontrollerincrease: { + Train->mvOccupied->BrakeLevelSet( + Train->mvOccupied->BrakeCtrlPosNo / 2 + + ( Train->mvOccupied->BrakeHandle == FV4a ? + 1 : + 0 ) ); + } +} - if( Command.action != GLFW_RELEASE ) { +void TTrain::OnCommand_trainbrakefullservice( TTrain *Train, command_data const &Command ) { - if( mvControlled->ShuntMode ) { - mvControlled->AnPos += ( Command.time_delta * 0.75f ); - if( mvControlled->AnPos > 1 ) - mvControlled->AnPos = 1; - } - else if( mvControlled->IncScndCtrl( 1 ) ) { - // sound feedback - play_sound( dsbNastawnikBocz, dsbNastawnikJazdy ); - } - } - break; + if( Command.action != GLFW_RELEASE ) { + + // sound feedback + if( ( Train->is_eztoer() ) + && ( Train->mvControlled->Mains ) + && ( ( Train->mvOccupied->BrakeCtrlPos == 1 ) + || ( Train->mvOccupied->BrakeCtrlPos == -1 ) ) ) { + Train->play_sound( Train->dsbPneumaticSwitch ); } + Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->BrakeCtrlPosNo - 1 ); + } +} - case user_command::secondcontrollerincreasefast: { +void TTrain::OnCommand_trainbrakeemergency( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action != GLFW_RELEASE ) { - if( mvControlled->IncScndCtrl( 2 ) ) { - // sound feedback - play_sound( dsbNastawnikBocz, dsbNastawnikJazdy ); - } - } - break; + Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->Handle->GetPos( bh_EB ) ); + if( Train->mvOccupied->BrakeCtrlPosNo <= 0.1 ) { + // hamulec bezpieczeństwa dla wagonów + Train->mvOccupied->EmergencyBrakeFlag = true; } + } +} - case user_command::secondcontrollerdecrease: { +void TTrain::OnCommand_reverserincrease( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action != GLFW_RELEASE ) { - if( mvControlled->ShuntMode ) { - mvControlled->AnPos -= ( Command.time_delta * 0.75f ); - if( mvControlled->AnPos > 1 ) - mvControlled->AnPos = 1; - } - else if( mvControlled->DecScndCtrl( 1 ) ) { - // sound feedback - play_sound( dsbNastawnikBocz, dsbNastawnikJazdy ); - } + if( Train->mvOccupied->DirectionForward() ) { + // sound feedback + Train->play_sound( Train->dsbReverserKey, Train->dsbSwitch, DSBVOLUME_MAX, 0 ); + // aktualizacja skrajnych pojazdów w składzie + if( ( Train->mvOccupied->ActiveDir ) + && ( Train->DynamicObject->Mechanik ) ) { + + Train->DynamicObject->Mechanik->CheckVehicles( Change_direction ); } - break; } + } +} - case user_command::secondcontrollerdecreasefast: { +void TTrain::OnCommand_reverserdecrease( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action != GLFW_RELEASE ) { - if( mvControlled->DecScndCtrl( 2 ) ) { - // sound feedback - play_sound( dsbNastawnikBocz, dsbNastawnikJazdy ); - } + if( Train->mvOccupied->DirectionBackward() ) { + // sound feedback + Train->play_sound( Train->dsbReverserKey, Train->dsbSwitch, DSBVOLUME_MAX, 0 ); + // aktualizacja skrajnych pojazdów w składzie + if( ( Train->mvOccupied->ActiveDir ) + && ( Train->DynamicObject->Mechanik ) ) { + + Train->DynamicObject->Mechanik->CheckVehicles( Change_direction ); } - break; } + } +} - case user_command::independentbrakeincrease: { +void TTrain::OnCommand_alerteracknowledge( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { - - if( mvOccupied->LocalBrake != ManualBrake ) { - mvOccupied->IncLocalBrakeLevel( 1 ); - } - } - break; + if( Command.action != GLFW_RELEASE ) { + // press or hold + Train->fCzuwakTestTimer += 0.035f; + if( Train->CAflag == false ) { + Train->CAflag = true; + Train->mvOccupied->SecuritySystemReset(); } - - case user_command::independentbrakeincreasefast: { - - if( Command.action != GLFW_RELEASE ) { - - if( mvOccupied->LocalBrake != ManualBrake ) { - mvOccupied->IncLocalBrakeLevel( 2 ); - } + else { + if( Train->fCzuwakTestTimer > 1.0 ) { + SetFlag( Train->mvOccupied->SecuritySystem.Status, s_CAtest ); } - break; } - - case user_command::independentbrakedecrease: { - - if( Command.action != GLFW_RELEASE ) { - - if( ( mvOccupied->LocalBrake != ManualBrake ) - // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - odhamować jakoś trzeba - // TODO: sort AI out so it doesn't do things it doesn't have equipment for - || ( mvOccupied->LocalBrakePos != 0 ) ) { - mvOccupied->DecLocalBrakeLevel( 1 ); - } - } - break; + // visual feedback + Train->ggSecurityResetButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggSecurityResetButton.GetValue() < 0.05 ) { + Train->play_sound( Train->dsbSwitch ); } - - case user_command::independentbrakedecreasefast: { - - if( Command.action != GLFW_RELEASE ) { - - if( ( mvOccupied->LocalBrake != ManualBrake ) - // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - odhamować jakoś trzeba - // TODO: sort AI out so it doesn't do things it doesn't have equipment for - || ( mvOccupied->LocalBrakePos != 0 ) ) { - mvOccupied->DecLocalBrakeLevel( 2 ); - } - } - break; + } + else { + // release + Train->fCzuwakTestTimer = 0.0f; + if( TestFlag( Train->mvOccupied->SecuritySystem.Status, s_CAtest ) ) { + SetFlag( Train->mvOccupied->SecuritySystem.Status, -s_CAtest ); + Train->mvOccupied->s_CAtestebrake = false; + Train->mvOccupied->SecuritySystem.SystemBrakeCATestTimer = 0.0; } + Train->CAflag = false; + // visual feedback + Train->ggSecurityResetButton.UpdateValue( 0.0 ); + } +} - case user_command::independentbrakebailoff: { - // TODO: check if this set of conditions can be simplified. - // it'd be more flexible to have an attribute indicating whether bail off position is supported - if( ( mvControlled->TrainType != dt_EZT ) - && ( ( mvControlled->EngineType == ElectricSeriesMotor ) - || ( mvControlled->EngineType == DieselElectric ) - || ( mvControlled->EngineType == ElectricInductionMotor ) ) - && ( mvOccupied->BrakeCtrlPosNo > 0 ) ) { +void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { - // press or hold - ggReleaserButton.UpdateValue( 1 ); - mvOccupied->BrakeReleaser( 1 ); + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvOccupied->Battery ) { + // turn on + // wyłącznik jest też w SN61, ewentualnie załączać prąd na stałe z poziomu FIZ + if( Train->mvOccupied->BatterySwitch( true ) ) { + // bateria potrzebna np. do zapalenia świateł + if( Train->ggBatteryButton.SubModel ) { + Train->ggBatteryButton.UpdateValue( 1 ); } - else { - // release - ggReleaserButton.UpdateValue( 0 ); - mvOccupied->BrakeReleaser( 0 ); + // audio feedback + Train->play_sound( Train->dsbSwitch ); + // side-effects + if( Train->mvOccupied->LightsPosNo > 0 ) { + Train->SetLights(); + } + if( TestFlag( Train->mvOccupied->SecuritySystem.SystemType, 2 ) ) { + // Ra: znowu w kabinie jest coś, co być nie powinno! + SetFlag( Train->mvOccupied->SecuritySystem.Status, s_active ); + SetFlag( Train->mvOccupied->SecuritySystem.Status, s_SHPalarm ); } } - break; } - - case user_command::trainbrakeincrease: { - - if( Command.action != GLFW_RELEASE ) { - - if( mvOccupied->BrakeHandle == FV4a ) { - mvOccupied->BrakeLevelAdd( 0.1 /*15.0 * Command.time_delta*/ ); - } - else { - if( mvOccupied->BrakeLevelAdd( Global::fBrakeStep ) ) { - // nieodpowiedni warunek; true, jeśli można dalej kręcić - keybrakecount = 0; - if( ( isEztOer ) && ( mvOccupied->BrakeCtrlPos < 3 ) ) { - // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza - play_sound( dsbPneumaticSwitch ); - } - } + else { + //turn off + if( Train->mvOccupied->BatterySwitch( false ) ) { + // ewentualnie zablokować z FIZ, np. w samochodach się nie odłącza akumulatora + if( Train->ggBatteryButton.SubModel ) { + Train->ggBatteryButton.UpdateValue( 0 ); } + // audio feedback + Train->play_sound( Train->dsbSwitch ); + // side-effects + Train->mvControlled->PantFront( false ); + Train->mvControlled->PantRear( false ); } - break; } + } +} - case user_command::trainbrakedecrease: { +void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { - - if( mvOccupied->BrakeHandle == FV4a ) { - mvOccupied->BrakeLevelAdd( -0.1 /*-15.0 * Command.time_delta*/ ); - } - else { - // nową wersję dostarczył ZiomalCl ("fixed looped sound in ezt when using NUM_9 key") - if( ( mvOccupied->BrakeCtrlPos > -1 ) - || ( keybrakecount > 1 ) ) { - - if( ( isEztOer ) - && ( mvControlled->Mains ) - && ( mvOccupied->BrakeCtrlPos != -1 ) ) { - // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza - play_sound( dsbPneumaticSwitch ); - } - mvOccupied->BrakeLevelAdd( -Global::fBrakeStep ); - } - else - keybrakecount += 1; - // koniec wersji dostarczonej przez ZiomalCl - } - } - break; - } - - case user_command::trainbrakecharging: { - - if( Command.action != GLFW_RELEASE ) { - - // sound feedback - if( ( isEztOer ) - && ( mvControlled->Mains ) - && ( mvOccupied->BrakeCtrlPos != -1 ) ) { - dsbPneumaticSwitch->Play( 0, 0, 0 ); - } - mvOccupied->BrakeLevelSet( -1 ); - } - break; - } - - case user_command::trainbrakerelease: { - - if( Command.action != GLFW_RELEASE ) { - - // sound feedback - if( ( isEztOer ) - && ( ( mvOccupied->BrakeCtrlPos == 1 ) - || ( mvOccupied->BrakeCtrlPos == -1 ) ) ) { - dsbPneumaticSwitch->Play( 0, 0, 0 ); - } - mvOccupied->BrakeLevelSet( 0 ); - } - break; - } - - case user_command::trainbrakefirstservice: { - - if( Command.action != GLFW_RELEASE ) { - - // sound feedback - if( ( isEztOer ) - && ( mvControlled->Mains ) - && ( mvOccupied->BrakeCtrlPos != 1 ) ) { - dsbPneumaticSwitch->Play( 0, 0, 0 ); - } - mvOccupied->BrakeLevelSet( 1 ); - } - break; - } - - case user_command::trainbrakeservice: { - - if( Command.action != GLFW_RELEASE ) { - - // sound feedback - if( ( isEztOer ) - && ( mvControlled->Mains ) - && ( ( mvOccupied->BrakeCtrlPos == 1 ) - || ( mvOccupied->BrakeCtrlPos == -1 ) ) ) { - dsbPneumaticSwitch->Play( 0, 0, 0 ); - } - mvOccupied->BrakeLevelSet( - mvOccupied->BrakeCtrlPosNo / 2 - + ( mvOccupied->BrakeHandle == FV4a ? - 1 : - 0 ) ); - } - break; - } - - case user_command::trainbrakefullservice: { - - if( Command.action != GLFW_RELEASE ) { - - // sound feedback - if( ( isEztOer ) - && ( mvControlled->Mains ) - && ( ( mvOccupied->BrakeCtrlPos == 1 ) - || ( mvOccupied->BrakeCtrlPos == -1 ) ) ) { - dsbPneumaticSwitch->Play( 0, 0, 0 ); - } - mvOccupied->BrakeLevelSet( mvOccupied->BrakeCtrlPosNo - 1 ); - } - break; - } - - case user_command::trainbrakeemergency: { - - if( Command.action != GLFW_RELEASE ) { - - mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_EB ) ); - if( mvOccupied->BrakeCtrlPosNo <= 0.1 ) { - // hamulec bezpieczeństwa dla wagonów - mvOccupied->EmergencyBrakeFlag = true; - } - } - break; - } - - case user_command::reverserincrease: { - - if( Command.action != GLFW_RELEASE ) { - - if( mvOccupied->DirectionForward() ) { - // sound feedback - play_sound( dsbReverserKey, dsbSwitch ); - // aktualizacja skrajnych pojazdów w składzie - if( ( mvOccupied->ActiveDir ) - && ( DynamicObject->Mechanik ) ) { - - DynamicObject->Mechanik->CheckVehicles( Change_direction ); - } - } - } - break; - } - - case user_command::reverserdecrease: { - - if( Command.action != GLFW_RELEASE ) { - - if( mvOccupied->DirectionBackward() ) { - // sound feedback - play_sound( dsbReverserKey, dsbSwitch ); - // aktualizacja skrajnych pojazdów w składzie - if( ( mvOccupied->ActiveDir ) - && ( DynamicObject->Mechanik ) ) { - - DynamicObject->Mechanik->CheckVehicles( Change_direction ); - } - } - } - break; - } - - case user_command::batterytoggle: { - - if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == mvOccupied->Battery ) { - // turn on - // wyłącznik jest też w SN61, ewentualnie załączać prąd na stałe z poziomu FIZ - if( mvOccupied->BatterySwitch( true ) ) { - // bateria potrzebna np. do zapalenia świateł - if( ggBatteryButton.SubModel ) { - ggBatteryButton.UpdateValue( 1 ); - } - // audio feedback - play_sound( dsbSwitch ); - // side-effects - if( mvOccupied->LightsPosNo > 0 ) { - SetLights(); - } - if( TestFlag( mvOccupied->SecuritySystem.SystemType, 2 ) ) { - // Ra: znowu w kabinie jest coś, co być nie powinno! - SetFlag( mvOccupied->SecuritySystem.Status, s_active ); - SetFlag( mvOccupied->SecuritySystem.Status, s_SHPalarm ); - } - } - } - else { - //turn off - if( mvOccupied->BatterySwitch( false ) ) { - // ewentualnie zablokować z FIZ, np. w samochodach się nie odłącza akumulatora - if( ggBatteryButton.SubModel ) { - ggBatteryButton.UpdateValue( 0 ); - } - // audio feedback - play_sound( dsbSwitch ); - // side-effects - mvControlled->PantFront( false ); - mvControlled->PantRear( false ); - } - } - - } - break; - } - - case user_command::pantographtogglefront: { - - if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == ( mvOccupied->ActiveCab == 1 ? mvControlled->PantFrontUp : mvControlled->PantRearUp ) ) { - // turn on... - if( mvOccupied->ActiveCab == 1 ) { - // przedni gdy w kabinie 1 - mvControlled->PantFrontSP = false; - if( mvControlled->PantFront( true ) ) { - if( mvControlled->PantFrontStart != 1 ) { - if( ggPantFrontButton.SubModel ) { - ggPantFrontButton.UpdateValue( 1.0 ); - } - play_sound( dsbSwitch ); - } - } - } - else { - // rear otherwise - mvControlled->PantRearSP = false; - if( mvControlled->PantRear( true ) ) { - if( mvControlled->PantRearStart != 1 ) { - if( ggPantRearButton.SubModel ) { - ggPantRearButton.UpdateValue( 1.0 ); - } - play_sound( dsbSwitch ); - } - } - } - } - else { - // ...or turn off - if( mvOccupied->ActiveCab == 1 ) { - // przedni gdy w kabinie 1 - mvControlled->PantFrontSP = false; - if( false == mvControlled->PantFront( false ) ) { - if( mvControlled->PantFrontStart != 0 ) { - if( ggPantFrontButton.SubModel ) { - ggPantFrontButton.UpdateValue( - ( mvOccupied->PantSwitchType != "impulse" ? - 0.0 : - 1.0 ) ); - } - play_sound( dsbSwitch ); - } - } - } - else { - // rear otherwise - mvControlled->PantRearSP = false; - if( false == mvControlled->PantRear( false ) ) { - if( mvControlled->PantRearStart != 0 ) { - if( ggPantRearButton.SubModel ) { - ggPantRearButton.UpdateValue( - ( mvOccupied->PantSwitchType != "impulse" ? - 0.0 : - 1.0 ) ); - } - play_sound( dsbSwitch ); - } - } - } - } - } - else if( Command.action == GLFW_RELEASE ) { - // impulse switches return automatically to neutral position - if( mvOccupied->PantSwitchType == "impulse" ) { - if( mvOccupied->ActiveCab == 1 ) { - // przedni gdy w kabinie 1 - if( ggPantFrontButton.GetValue() > 0.1 ) { - play_sound( dsbSwitch ); - } - if( ggPantFrontButton.SubModel ) { - ggPantFrontButton.UpdateValue( 0.0 ); - } - } - else { - // rear otherwise - if( ggPantRearButton.GetValue() > 0.1 ) { - play_sound( dsbSwitch ); - } - if( ggPantRearButton.SubModel ) { - ggPantRearButton.UpdateValue( 0.0 ); - } - } - } - } - break; - } - - case user_command::pantographtogglerear: { - - if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == ( mvOccupied->ActiveCab == 1 ? mvControlled->PantRearUp : mvControlled->PantFrontUp ) ) { - // turn on... - if( mvOccupied->ActiveCab == 1 ) { - // rear if in front cab - mvControlled->PantRearSP = false; - if( mvControlled->PantRear( true ) ) { - if( mvControlled->PantRearStart != 1 ) { - if( ggPantRearButton.SubModel ) { - ggPantRearButton.UpdateValue( 1.0 ); - } - play_sound( dsbSwitch ); - } - } - } - else { - // front otherwise - mvControlled->PantFrontSP = false; - if( mvControlled->PantFront( true ) ) { - if( mvControlled->PantFrontStart != 1 ) { - if( ggPantFrontButton.SubModel ) { - ggPantFrontButton.UpdateValue( 1.0 ); - } - play_sound( dsbSwitch ); - } - } - } - } - else { - // ...or turn off - if( mvOccupied->ActiveCab == 1 ) { - // rear if in front cab - mvControlled->PantRearSP = false; - if( false == mvControlled->PantRear( false ) ) { - if( mvControlled->PantRearStart != 0 ) { - if( ggPantRearButton.SubModel ) { - ggPantRearButton.UpdateValue( - ( mvOccupied->PantSwitchType != "impulse" ? - 0.0 : - 1.0 ) ); - } - play_sound( dsbSwitch ); - } - } - } - else { - // front otherwise - mvControlled->PantFrontSP = false; - if( false == mvControlled->PantFront( false ) ) { - if( mvControlled->PantFrontStart != 0 ) { - if( ggPantFrontButton.SubModel ) { - ggPantFrontButton.UpdateValue( - ( mvOccupied->PantSwitchType != "impulse" ? - 0.0 : - 1.0 ) ); - } - play_sound( dsbSwitch ); - } - } - } - } - } - else if( Command.action == GLFW_RELEASE ) { - // impulse switches return automatically to neutral position - if( mvOccupied->PantSwitchType == "impulse" ) { - if( mvOccupied->ActiveCab == 1 ) { - // tylny gdy w kabinie 1 - if( ggPantRearButton.GetValue() > 0.1 ) { - play_sound( dsbSwitch ); - } - if( ggPantRearButton.SubModel ) { - ggPantRearButton.UpdateValue( 0.0 ); - } - } - else { - // front otherwise - if( ggPantFrontButton.GetValue() > 0.1 ) { - play_sound( dsbSwitch ); - } - if( ggPantFrontButton.SubModel ) { - ggPantFrontButton.UpdateValue( 0.0 ); - } - play_sound( dsbSwitch ); - } - } - } - break; - } - - case user_command::linebreakertoggle: { - - if( Command.action != GLFW_RELEASE ) { - // press or hold... - if( false == mvControlled->Mains ) { - // ...to close the circuit - if( false == m_linebreakerclosed ) { - // safety check so we don't close the circuit right after opening - if( ggMainOnButton.SubModel != nullptr ) { - // two separate switches to close and break the circuit - // audio feedback - if( Command.action == GLFW_PRESS ) { - play_sound( dsbSwitch ); - } - // visual feedback - ggMainOnButton.UpdateValue( 1.0 ); - } - else if( ggMainButton.SubModel != nullptr ) { - // single two-state switch - // audio feedback - if( Command.action == GLFW_PRESS ) { - play_sound( dsbSwitch ); - } - // visual feedback - ggMainButton.UpdateValue( 1.0 ); - } - // keep track of period the button is held down, to determine when/if circuit closes - fMainRelayTimer += 0.33; // Command.time_delta * 5.0; - // NOTE: this shouldn't be necessary, what exactly does it fix? - if( mvControlled->Mains != true ) { - // hunter-080812: poprawka - // adjusted further to take into account state of the switch - mvControlled->ConverterSwitch( ggConverterButton.GetValue() > 0.5 ); - mvControlled->CompressorSwitch( ggCompressorButton.GetValue() > 0.5 ); - } - if( fMainRelayTimer > mvControlled->InitialCtrlDelay ) { - // wlaczanie WSa z opoznieniem - if( mvControlled->MainSwitch( true ) ) { - // sound feedback, engine start for diesel vehicle - if( mvControlled->EngineType == DieselEngine ) { - play_sound( dsbDieselIgnition ); - } - } - } - } - } - else { - // ...to open the circuit - if( true == m_linebreakerclosed ) { - // safety check so we don't open the circuit right after closing - if( mvControlled->MainSwitch( false ) ) { - - if( ggMainOffButton.SubModel != nullptr ) { - // two separate switches to close and break the circuit - // audio feedback - if( Command.action == GLFW_PRESS ) { - play_sound( dsbSwitch ); - } - // visual feedback - ggMainOffButton.UpdateValue( 1.0 ); - } - else if( ggMainButton.SubModel != nullptr ) { - // single two-state switch - // NOTE: we don't have switch type definition for the line breaker switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( mvControlled->TrainType == dt_EZT ) { - // audio feedback - if( Command.action == GLFW_PRESS ) { - play_sound( dsbSwitch ); - } - // visual feedback - ggMainButton.UpdateValue( 1.0 ); - } - else { - // audio feedback - if( Command.action == GLFW_PRESS ) { - play_sound( dsbSwitch ); - } - // visual feedback - ggMainButton.UpdateValue( 0.0 ); - } - } - // side-effects - mvControlled->ConverterSwitch( ggConverterButton.GetValue() > 0.5 ); - mvControlled->CompressorSwitch( ggCompressorButton.GetValue() > 0.5 ); - } - // play sound immediately when the switch is hit, not after release - if( fMainRelayTimer > 0.0f ) { - play_sound( dsbRelay ); - fMainRelayTimer = 0.0f; + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == ( Train->mvOccupied->ActiveCab == 1 ? Train->mvControlled->PantFrontUp : Train->mvControlled->PantRearUp ) ) { + // turn on... + if( Train->mvOccupied->ActiveCab == 1 ) { + // przedni gdy w kabinie 1 + Train->mvControlled->PantFrontSP = false; + if( Train->mvControlled->PantFront( true ) ) { + if( Train->mvControlled->PantFrontStart != 1 ) { + if( Train->ggPantFrontButton.SubModel ) { + Train->ggPantFrontButton.UpdateValue( 1.0 ); } + Train->play_sound( Train->dsbSwitch ); } } } else { - // release... - if( false == mvControlled->Mains ) { - // ...after opening circuit, or holding for too short time to close it -/* - if( mvControlled->ConverterAllow ) { - // po puszczeniu przycisku od WSa odpalanie potwora - mvControlled->ConverterSwitch( true ); + // rear otherwise + Train->mvControlled->PantRearSP = false; + if( Train->mvControlled->PantRear( true ) ) { + if( Train->mvControlled->PantRearStart != 1 ) { + if( Train->ggPantRearButton.SubModel ) { + Train->ggPantRearButton.UpdateValue( 1.0 ); + } + Train->play_sound( Train->dsbSwitch ); } -*/ - // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, - if( fMainRelayTimer > 0.0f ) { - play_sound( dsbRelay ); - fMainRelayTimer = 0.0f; + } + } + } + else { + // ...or turn off + if( Train->mvOccupied->ActiveCab == 1 ) { + // przedni gdy w kabinie 1 + Train->mvControlled->PantFrontSP = false; + if( false == Train->mvControlled->PantFront( false ) ) { + if( Train->mvControlled->PantFrontStart != 0 ) { + if( Train->ggPantFrontButton.SubModel ) { + Train->ggPantFrontButton.UpdateValue( + ( Train->mvOccupied->PantSwitchType != "impulse" ? + 0.0 : + 1.0 ) ); + } + Train->play_sound( Train->dsbSwitch ); } - // we don't exactly know which of the two buttons was used, so reset both - if( ggMainOnButton.SubModel != nullptr ) { - // setup with two separate swiches - ggMainOnButton.UpdateValue( 0.0 ); + } + } + else { + // rear otherwise + Train->mvControlled->PantRearSP = false; + if( false == Train->mvControlled->PantRear( false ) ) { + if( Train->mvControlled->PantRearStart != 0 ) { + if( Train->ggPantRearButton.SubModel ) { + Train->ggPantRearButton.UpdateValue( + ( Train->mvOccupied->PantSwitchType != "impulse" ? + 0.0 : + 1.0 ) ); + } + Train->play_sound( Train->dsbSwitch ); } - if( ggMainOffButton.SubModel != nullptr ) { - // setup with two separate swiches - ggMainOffButton.UpdateValue( 0.0 ); + } + } + } + } + else if( Command.action == GLFW_RELEASE ) { + // impulse switches return automatically to neutral position + if( Train->mvOccupied->PantSwitchType == "impulse" ) { + if( Train->mvOccupied->ActiveCab == 1 ) { + // przedni gdy w kabinie 1 + if( Train->ggPantFrontButton.GetValue() > 0.1 ) { + Train->play_sound( Train->dsbSwitch ); + } + if( Train->ggPantFrontButton.SubModel ) { + Train->ggPantFrontButton.UpdateValue( 0.0 ); + } + } + else { + // rear otherwise + if( Train->ggPantRearButton.GetValue() > 0.1 ) { + Train->play_sound( Train->dsbSwitch ); + } + if( Train->ggPantRearButton.SubModel ) { + Train->ggPantRearButton.UpdateValue( 0.0 ); + } + } + } + } +} + +void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == ( Train->mvOccupied->ActiveCab == 1 ? Train->mvControlled->PantRearUp : Train->mvControlled->PantFrontUp ) ) { + // turn on... + if( Train->mvOccupied->ActiveCab == 1 ) { + // rear if in front cab + Train->mvControlled->PantRearSP = false; + if( Train->mvControlled->PantRear( true ) ) { + if( Train->mvControlled->PantRearStart != 1 ) { + if( Train->ggPantRearButton.SubModel ) { + Train->ggPantRearButton.UpdateValue( 1.0 ); + } + Train->play_sound( Train->dsbSwitch ); } - // and the two-state switch too, for good measure - if( ggMainButton.SubModel != nullptr ) { - ggMainButton.UpdateValue( 0.0 ); + } + } + else { + // front otherwise + Train->mvControlled->PantFrontSP = false; + if( Train->mvControlled->PantFront( true ) ) { + if( Train->mvControlled->PantFrontStart != 1 ) { + if( Train->ggPantFrontButton.SubModel ) { + Train->ggPantFrontButton.UpdateValue( 1.0 ); + } + Train->play_sound( Train->dsbSwitch ); + } + } + } + } + else { + // ...or turn off + if( Train->mvOccupied->ActiveCab == 1 ) { + // rear if in front cab + Train->mvControlled->PantRearSP = false; + if( false == Train->mvControlled->PantRear( false ) ) { + if( Train->mvControlled->PantRearStart != 0 ) { + if( Train->ggPantRearButton.SubModel ) { + Train->ggPantRearButton.UpdateValue( + ( Train->mvOccupied->PantSwitchType != "impulse" ? + 0.0 : + 1.0 ) ); + } + Train->play_sound( Train->dsbSwitch ); + } + } + } + else { + // front otherwise + Train->mvControlled->PantFrontSP = false; + if( false == Train->mvControlled->PantFront( false ) ) { + if( Train->mvControlled->PantFrontStart != 0 ) { + if( Train->ggPantFrontButton.SubModel ) { + Train->ggPantFrontButton.UpdateValue( + ( Train->mvOccupied->PantSwitchType != "impulse" ? + 0.0 : + 1.0 ) ); + } + Train->play_sound( Train->dsbSwitch ); + } + } + } + } + } + else if( Command.action == GLFW_RELEASE ) { + // impulse switches return automatically to neutral position + if( Train->mvOccupied->PantSwitchType == "impulse" ) { + if( Train->mvOccupied->ActiveCab == 1 ) { + // tylny gdy w kabinie 1 + if( Train->ggPantRearButton.GetValue() > 0.1 ) { + Train->play_sound( Train->dsbSwitch ); + } + if( Train->ggPantRearButton.SubModel ) { + Train->ggPantRearButton.UpdateValue( 0.0 ); + } + } + else { + // front otherwise + if( Train->ggPantFrontButton.GetValue() > 0.1 ) { + Train->play_sound( Train->dsbSwitch ); + } + if( Train->ggPantFrontButton.SubModel ) { + Train->ggPantFrontButton.UpdateValue( 0.0 ); + } + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ) { + if( Command.action != GLFW_RELEASE ) { + // press or hold... + if( false == Train->mvControlled->Mains ) { + // ...to close the circuit + if( false == Train->m_linebreakerclosed ) { + // safety check so we don't close the circuit right after opening + if( Train->ggMainOnButton.SubModel != nullptr ) { + // two separate switches to close and break the circuit + // audio feedback + if( Command.action == GLFW_PRESS ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggMainOnButton.UpdateValue( 1.0 ); + } + else if( Train->ggMainButton.SubModel != nullptr ) { + // single two-state switch + // audio feedback + if( Command.action == GLFW_PRESS ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggMainButton.UpdateValue( 1.0 ); + } + // keep track of period the button is held down, to determine when/if circuit closes + Train->fMainRelayTimer += 0.33f; // Command.time_delta * 5.0; + // NOTE: this shouldn't be necessary, what exactly does it fix? + if( Train->mvControlled->Mains != true ) { + // hunter-080812: poprawka + // adjusted further to take into account state of the switch + Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); + Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); + } + if( Train->fMainRelayTimer > Train->mvControlled->InitialCtrlDelay ) { + // wlaczanie WSa z opoznieniem + if( Train->mvControlled->MainSwitch( true ) ) { + // sound feedback, engine start for diesel vehicle + if( Train->mvControlled->EngineType == DieselEngine ) { + Train->play_sound( Train->dsbDieselIgnition ); + } + } + } + } + } + else { + // ...to open the circuit + if( true == Train->m_linebreakerclosed ) { + // safety check so we don't open the circuit right after closing + if( Train->mvControlled->MainSwitch( false ) ) { + + if( Train->ggMainOffButton.SubModel != nullptr ) { + // two separate switches to close and break the circuit + // audio feedback + if( Command.action == GLFW_PRESS ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggMainOffButton.UpdateValue( 1.0 ); + } + else if( Train->ggMainButton.SubModel != nullptr ) { + // single two-state switch // NOTE: we don't have switch type definition for the line breaker switch // so for the time being we have hard coded "impulse" switches for all EMUs // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( mvControlled->TrainType == dt_EZT ) { + if( Train->mvControlled->TrainType == dt_EZT ) { // audio feedback - play_sound( dsbSwitch ); + if( Command.action == GLFW_PRESS ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggMainButton.UpdateValue( 1.0 ); + } + else { + // audio feedback + if( Command.action == GLFW_PRESS ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggMainButton.UpdateValue( 0.0 ); } } - m_linebreakerclosed = false; + // side-effects + Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); + Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); } - else { - // ...after closing the circuit - if( ggMainOnButton.SubModel != nullptr ) { - // setup with two separate switches - ggMainOnButton.UpdateValue( 0.0 ); - } - // NOTE: we don't have switch type definition for the line breaker switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( mvControlled->TrainType == dt_EZT ) { - if( ggMainButton.SubModel != nullptr ) { - ggMainButton.UpdateValue( 0.0 ); - // audio feedback - play_sound( dsbSwitch ); - } - } - m_linebreakerclosed = true; + // play sound immediately when the switch is hit, not after release + if( Train->fMainRelayTimer > 0.0f ) { + Train->play_sound( Train->dsbRelay ); + Train->fMainRelayTimer = 0.0f; } } - break; } - - case user_command::convertertoggle: { - - if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == mvControlled->ConverterAllow ) { - // turn on - if( ( mvControlled->EnginePowerSource.SourceType != CurrentCollector ) - || ( mvControlled->PantRearVolt != 0.0 ) - || ( mvControlled->PantFrontVolt != 0.0 ) ) { - // visual feedback - ggConverterButton.UpdateValue( 1.0 ); - // sound feedback - if( ggConverterButton.GetValue() < 0.5 ) { - play_sound( dsbSwitch ); - } - // impulse type switch has no effect if there's no power - // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway - if( ( mvOccupied->ConvSwitchType != "impulse" ) - || ( mvControlled->Mains ) ) { - if( true == mvControlled->ConverterSwitch( true ) ) { - // side effects - // control the compressor, if it's paired with the converter - if( mvControlled->CompressorPower == 2 ) { - // hunter-091012: tak jest poprawnie - mvControlled->CompressorSwitch( true ); - } - } - } - } + } + else { + // release... + if( false == Train->mvControlled->Mains ) { + // ...after opening circuit, or holding for too short time to close it + /* + if( mvControlled->ConverterAllow ) { + // po puszczeniu przycisku od WSa odpalanie potwora + mvControlled->ConverterSwitch( true ); + } + */ + // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, + if( Train->fMainRelayTimer > 0.0f ) { + Train->play_sound( Train->dsbRelay ); + Train->fMainRelayTimer = 0.0f; + } + // we don't exactly know which of the two buttons was used, so reset both + if( Train->ggMainOnButton.SubModel != nullptr ) { + // setup with two separate swiches + Train->ggMainOnButton.UpdateValue( 0.0 ); + } + if( Train->ggMainOffButton.SubModel != nullptr ) { + // setup with two separate swiches + Train->ggMainOffButton.UpdateValue( 0.0 ); + } + // and the two-state switch too, for good measure + if( Train->ggMainButton.SubModel != nullptr ) { + Train->ggMainButton.UpdateValue( 0.0 ); + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( Train->mvControlled->TrainType == dt_EZT ) { + // audio feedback + Train->play_sound( Train->dsbSwitch ); } - else { - //turn off - if( true == mvControlled->ConverterSwitch( false ) ) { - // sound feedback - play_sound( dsbSwitch ); - // visual feedback - ggConverterButton.UpdateValue( 0.0 ); - if( ggConverterOffButton.SubModel != nullptr ) { - ggConverterOffButton.UpdateValue( 1.0 ); - } + } + Train->m_linebreakerclosed = false; + } + else { + // ...after closing the circuit + if( Train->ggMainOnButton.SubModel != nullptr ) { + // setup with two separate switches + Train->ggMainOnButton.UpdateValue( 0.0 ); + } + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( Train->mvControlled->TrainType == dt_EZT ) { + if( Train->ggMainButton.SubModel != nullptr ) { + Train->ggMainButton.UpdateValue( 0.0 ); + // audio feedback + Train->play_sound( Train->dsbSwitch ); + } + } + Train->m_linebreakerclosed = true; + } + } +} + +void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->ConverterAllow ) { + // turn on + if( ( Train->mvControlled->EnginePowerSource.SourceType != CurrentCollector ) + || ( Train->mvControlled->PantRearVolt != 0.0 ) + || ( Train->mvControlled->PantFrontVolt != 0.0 ) ) { + // visual feedback + Train->ggConverterButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggConverterButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // impulse type switch has no effect if there's no power + // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway + if( ( Train->mvOccupied->ConvSwitchType != "impulse" ) + || ( Train->mvControlled->Mains ) ) { + if( true == Train->mvControlled->ConverterSwitch( true ) ) { // side effects // control the compressor, if it's paired with the converter - if( mvControlled->CompressorPower == 2 ) { + if( Train->mvControlled->CompressorPower == 2 ) { // hunter-091012: tak jest poprawnie - mvControlled->CompressorSwitch( false ); - } - if( ( mvControlled->TrainType == dt_EZT ) - && ( !TestFlag( mvControlled->EngDmgFlag, 4 ) ) ) { - mvControlled->ConvOvldFlag = false; + Train->mvControlled->CompressorSwitch( true ); } } } } - else if( Command.action == GLFW_RELEASE ){ - // on button release... - if( mvOccupied->ConvSwitchType == "impulse" ) { - // ...return switches to start position if applicable - if( ( ggConverterButton.GetValue() > 0.0 ) - || ( ggConverterOffButton.GetValue() > 0.0 ) ) { - // sound feedback - play_sound( dsbSwitch ); - } - ggConverterButton.UpdateValue( 0.0 ); - ggConverterOffButton.UpdateValue( 0.0 ); - } - } - break; } - - case user_command::compressortoggle: { - - if( mvControlled->CompressorPower < 2 ) { - - if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == mvControlled->CompressorAllow ) { - // turn on - // visual feedback - ggCompressorButton.UpdateValue( 1.0 ); - // sound feedback - if( ggCompressorButton.GetValue() < 0.5 ) { - play_sound( dsbSwitch ); - } - // impulse type switch has no effect if there's no power - // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway - // (we're presuming impulse type switch for all EMUs for the time being) -/* - if( ( mvControlled->TrainType != dt_EZT ) - || ( mvControlled->Mains ) ) { -*/ - mvControlled->CompressorSwitch( true ); -/* - } -*/ - } - else { - //turn off - if( true == mvControlled->CompressorSwitch( false ) ) { - // sound feedback - play_sound( dsbSwitch ); - // NOTE: we don't have switch type definition for the compresor switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz -/* - if( mvControlled->TrainType == dt_EZT ) { - // visual feedback - ggCompressorButton.UpdateValue( 1.0 ); - } - else { -*/ - // visual feedback - ggCompressorButton.UpdateValue( 0.0 ); -/* - } -*/ - } - } + else { + //turn off + if( true == Train->mvControlled->ConverterSwitch( false ) ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + Train->ggConverterButton.UpdateValue( 0.0 ); + if( Train->ggConverterOffButton.SubModel != nullptr ) { + Train->ggConverterOffButton.UpdateValue( 1.0 ); } - else if( Command.action == GLFW_RELEASE ) { - // on button release... -/* - // TODO: check if compressor switch is two-state or impulse type - // NOTE: we don't have switch type definition for the compresor switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( mvControlled->TrainType == dt_EZT ) { - if( ggCompressorButton.SubModel != nullptr ) { - ggCompressorButton.UpdateValue( 0.0 ); - // audio feedback - play_sound( dsbSwitch ); - } - } -*/ + // side effects + // control the compressor, if it's paired with the converter + if( Train->mvControlled->CompressorPower == 2 ) { + // hunter-091012: tak jest poprawnie + Train->mvControlled->CompressorSwitch( false ); + } + if( ( Train->mvControlled->TrainType == dt_EZT ) + && ( !TestFlag( Train->mvControlled->EngDmgFlag, 4 ) ) ) { + Train->mvControlled->ConvOvldFlag = false; } } - break; } + } + else if( Command.action == GLFW_RELEASE ) { + // on button release... + if( Train->mvOccupied->ConvSwitchType == "impulse" ) { + // ...return switches to start position if applicable + if( ( Train->ggConverterButton.GetValue() > 0.0 ) + || ( Train->ggConverterOffButton.GetValue() > 0.0 ) ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + } + Train->ggConverterButton.UpdateValue( 0.0 ); + Train->ggConverterOffButton.UpdateValue( 0.0 ); + } + } +} - default: { - - break; +void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Command ) { + + if( Train->mvControlled->CompressorPower >= 2 ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->CompressorAllow ) { + // turn on + // visual feedback + Train->ggCompressorButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggCompressorButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // impulse type switch has no effect if there's no power + // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway + // (we're presuming impulse type switch for all EMUs for the time being) +// if( ( mvControlled->TrainType != dt_EZT ) +// || ( mvControlled->Mains ) ) { + + Train->mvControlled->CompressorSwitch( true ); +// } + } + else { + //turn off + if( true == Train->mvControlled->CompressorSwitch( false ) ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // NOTE: we don't have switch type definition for the compresor switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz +// if( mvControlled->TrainType == dt_EZT ) { +// // visual feedback +// ggCompressorButton.UpdateValue( 1.0 ); +// } +// else { + // visual feedback + Train->ggCompressorButton.UpdateValue( 0.0 ); +// } + } + } + } +/* + // disabled because EMUs have basic switches. left in case impulse switch code is needed, so we don't have to reinvent the wheel + else if( Command.action == GLFW_RELEASE ) { + // on button release... + // TODO: check if compressor switch is two-state or impulse type + // NOTE: we don't have switch type definition for the compresor switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( mvControlled->TrainType == dt_EZT ) { + if( ggCompressorButton.SubModel != nullptr ) { + ggCompressorButton.UpdateValue( 0.0 ); + // audio feedback + play_sound( dsbSwitch ); + } + } + } +*/ +} + +void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 0 : + 1 ); + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_left ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; + // visual feedback + Train->ggLeftLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggLeftLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; + // visual feedback + Train->ggLeftLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggLeftLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 0 : + 1 ); + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_right ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; + // visual feedback + Train->ggRightLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggRightLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; + // visual feedback + Train->ggRightLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggRightLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 0 : + 1 ); + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_upper ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; + // visual feedback + Train->ggUpperLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggUpperLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; + // visual feedback + Train->ggUpperLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggUpperLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 0 : + 1 ); + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_left ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; + // visual feedback + Train->ggLeftEndLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggLeftEndLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; + // visual feedback + Train->ggLeftEndLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggLeftEndLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 0 : + 1 ); + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_right ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; + // visual feedback + Train->ggRightEndLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggRightEndLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; + // visual feedback + Train->ggRightEndLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggRightEndLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_headlighttogglerearleft( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 1 : + 0 ); + + if( Command.action == GLFW_PRESS ) { + // NOTE: we toggle the light on opposite side, as 'rear right' is 'front left' on the rear end etc + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_right ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; + // visual feedback + Train->ggRearLeftLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggRearLeftLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; + // visual feedback + Train->ggRearLeftLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggRearLeftLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_headlighttogglerearright( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 1 : + 0 ); + + if( Command.action == GLFW_PRESS ) { + // NOTE: we toggle the light on opposite side, as 'rear right' is 'front left' on the rear end etc + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_left ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; + // visual feedback + Train->ggRearRightLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggRearRightLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; + // visual feedback + Train->ggRearRightLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggRearRightLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_headlighttogglerearupper( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 1 : + 0 ); + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_upper ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; + // visual feedback + Train->ggRearUpperLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggRearUpperLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; + // visual feedback + Train->ggRearUpperLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggRearUpperLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_redmarkertogglerearleft( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 1 : + 0 ); + + if( Command.action == GLFW_PRESS ) { + // NOTE: we toggle the light on opposite side, as 'rear right' is 'front left' on the rear end etc + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_right ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; + // visual feedback + Train->ggRearLeftEndLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggRearLeftEndLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; + // visual feedback + Train->ggRearLeftEndLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggRearLeftEndLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + int const lightsindex = + ( Train->mvOccupied->ActiveCab == 1 ? + 1 : + 0 ); + + if( Command.action == GLFW_PRESS ) { + // NOTE: we toggle the light on opposite side, as 'rear right' is 'front left' on the rear end etc + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_left ) == 0 ) { + // turn on + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; + // visual feedback + Train->ggRearRightEndLightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggRearRightEndLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + //turn off + Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; + // visual feedback + Train->ggRearRightEndLightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggRearRightEndLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } +} + +void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->DoorOpenCtrl != 1 ) { + return; + } + if( Command.action == GLFW_PRESS ) { + // NOTE: test how the door state check works with consists where the occupied vehicle doesn't have opening doors + if( false == ( + Train->mvOccupied->ActiveCab == 1 ? + Train->mvOccupied->DoorLeftOpened : + Train->mvOccupied->DoorRightOpened ) ) { + // open + if( Train->mvOccupied->ActiveCab == 1 ) { + if( Train->mvOccupied->DoorLeft( true ) ) { + Train->ggDoorLeftButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggDoorLeftButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + Train->play_sound( Train->dsbDoorOpen ); + } + } + else { + // in the rear cab sides are reversed + if( Train->mvOccupied->DoorRight( true ) ) { + Train->ggDoorRightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggDoorRightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + Train->play_sound( Train->dsbDoorOpen ); + } + } + } + else { + // close + if( Train->mvOccupied->ActiveCab == 1 ) { + if( Train->mvOccupied->DoorLeft( false ) ) { + Train->ggDoorLeftButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + Train->play_sound( Train->dsbDoorOpen ); + } + } + else { + // in the rear cab sides are reversed + if( Train->mvOccupied->DoorRight( false ) ) { + Train->ggDoorRightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggDoorRightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + Train->play_sound( Train->dsbDoorOpen ); + } + } + } + } +} + +void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->DoorOpenCtrl != 1 ) { + return; + } + if( Command.action == GLFW_PRESS ) { + // NOTE: test how the door state check works with consists where the occupied vehicle doesn't have opening doors + if( false == ( + Train->mvOccupied->ActiveCab == 1 ? + Train->mvOccupied->DoorRightOpened : + Train->mvOccupied->DoorLeftOpened ) ) { + // open + if( Train->mvOccupied->ActiveCab == 1 ) { + if( Train->mvOccupied->DoorRight( true ) ) { + Train->ggDoorRightButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggDoorRightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + Train->play_sound( Train->dsbDoorOpen ); + } + } + else { + // in the rear cab sides are reversed + if( Train->mvOccupied->DoorLeft( true ) ) { + Train->ggDoorLeftButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggDoorLeftButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + Train->play_sound( Train->dsbDoorOpen ); + } + } + } + else { + // close + if( Train->mvOccupied->ActiveCab == 1 ) { + if( Train->mvOccupied->DoorRight( false ) ) { + Train->ggDoorRightButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggDoorRightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + Train->play_sound( Train->dsbDoorOpen ); + } + } + else { + // in the rear cab sides are reversed + if( Train->mvOccupied->DoorLeft( false ) ) { + Train->ggDoorLeftButton.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + Train->play_sound( Train->dsbDoorOpen ); + } + } } } } @@ -1315,8 +1854,7 @@ void TTrain::OnKeyDown(int cKey) if (mvOccupied->Radio == false) if (Global::ctrlState) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); mvOccupied->Radio = true; } } @@ -1405,7 +1943,7 @@ void TTrain::OnKeyDown(int cKey) { if ((mvControlled->Signalling == false)) { - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); mvControlled->Signalling = true; } } @@ -1419,7 +1957,7 @@ void TTrain::OnKeyDown(int cKey) if (!mvControlled->DoorSignalling) { mvOccupied->DoorBlocked = true; - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); mvControlled->DoorSignalling = true; } } @@ -1457,15 +1995,13 @@ void TTrain::OnKeyDown(int cKey) if (Global::ctrlState) if (mvOccupied->BrakeDelaySwitch(bdelay_R + bdelay_M)) { - dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); - dsbPneumaticRelay->Play(0, 0, 0); + play_sound( dsbPneumaticRelay ); } else ; else if (mvOccupied->BrakeDelaySwitch(bdelay_P)) { - dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); - dsbPneumaticRelay->Play(0, 0, 0); + play_sound( dsbPneumaticRelay ); } } else @@ -1484,15 +2020,13 @@ void TTrain::OnKeyDown(int cKey) if (Global::ctrlState) if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R + bdelay_M)) { - dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); - dsbPneumaticRelay->Play(0, 0, 0); + play_sound( dsbPneumaticRelay ); } else ; else if (temp->MoverParameters->BrakeDelaySwitch(bdelay_P)) { - dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); - dsbPneumaticRelay->Play(0, 0, 0); + play_sound( dsbPneumaticRelay ); } } } @@ -1534,8 +2068,7 @@ void TTrain::OnKeyDown(int cKey) if (mvControlled->PantPress < 4.8) // piszą, że to tak nie działa { mvControlled->PantCompFlag = true; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); // dźwięk tylko po naciśnięciu klawisza + play_sound( dsbSwitch ); // dźwięk tylko po naciśnięciu klawisza } } else if (cKey == GLFW_KEY_Q) // ze Shiftem - włączenie AI @@ -1561,8 +2094,7 @@ void TTrain::OnKeyDown(int cKey) } if (mvControlled->CurrentSwitch(true)) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } /* Ra: przeniesione do Mover.cpp if (mvControlled->TrainType!=dt_EZT) //to powinno być w fizyce, a @@ -1579,8 +2111,7 @@ void TTrain::OnKeyDown(int cKey) { if (mvControlled->AutoRelaySwitch(true)) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } } else if (cKey == Global::Keys[k_FailedEngineCutOff]) // McZapkie-060103: E @@ -1589,11 +2120,11 @@ void TTrain::OnKeyDown(int cKey) { if (mvControlled->CutOffEngine()) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } } - else if (cKey == Global::Keys[k_OpenLeft]) // NBMX 17-09-2003: otwieranie drzwi +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if( cKey == Global::Keys[ k_OpenLeft ] ) // NBMX 17-09-2003: otwieranie drzwi { if (mvOccupied->DoorOpenCtrl == 1) if (mvOccupied->CabNo < 0 ? mvOccupied->DoorRight(true) : mvOccupied->DoorLeft(true)) @@ -1621,6 +2152,7 @@ void TTrain::OnKeyDown(int cKey) } } } +#endif //----------- // hunter-131211: dzwiek dla przelacznika universala podniesionego // hunter-091012: ubajerowanie swiatla w kabinie (wyrzucenie @@ -1631,16 +2163,14 @@ void TTrain::OnKeyDown(int cKey) { if (bCabLight == false) //(ggCabLightButton.GetValue()==0) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } } else { if (ggUniversal3Button.GetValue() == 0) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } /* if (Global::ctrlState) @@ -1659,8 +2189,7 @@ void TTrain::OnKeyDown(int cKey) { if (bCabLightDim == false) //(ggCabLightDimButton.GetValue()==0) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } } } @@ -1749,12 +2278,12 @@ void TTrain::OnKeyDown(int cKey) (mvControlled->ConverterFlag))) { mvControlled->Heating = true; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } } } - else if (cKey == Global::Keys[k_LeftSign]) // lewe swiatlo - włączenie +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if( cKey == Global::Keys[ k_LeftSign ] ) // lewe swiatlo - włączenie // ABu 060205: dzielo Wingera po malutkim liftingu: { if (false == (mvOccupied->LightsPosNo > 0)) @@ -1862,6 +2391,7 @@ void TTrain::OnKeyDown(int cKey) } //----------- } } +#endif else if (cKey == Global::Keys[k_UpperSign]) // ABu 060205: światło górne - // włączenie { @@ -1874,11 +2404,11 @@ void TTrain::OnKeyDown(int cKey) { mvOccupied->LightsPos = 1; } - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); SetLights(); } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if ((Global::ctrlState) && (ggRearUpperLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu { @@ -1927,8 +2457,10 @@ void TTrain::OnKeyDown(int cKey) } } } +#endif } - else if (cKey == Global::Keys[k_RightSign]) // Winger 070304: swiatla +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if( cKey == Global::Keys[ k_RightSign ] ) // Winger 070304: swiatla // tylne (koncowki) - // wlaczenie { @@ -2029,6 +2561,7 @@ void TTrain::OnKeyDown(int cKey) } } } +#endif } else // McZapkie-240302 - klawisze bez shifta { @@ -2282,7 +2815,6 @@ void TTrain::OnKeyDown(int cKey) // while (mvOccupied->BrakeCtrlPos<-1 && mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(-1); } -#endif else if (cKey == Global::Keys[k_Czuwak]) //--------------- // hunter-131211: zbicie czuwaka przeniesione do TTrain::Update() @@ -2296,7 +2828,8 @@ void TTrain::OnKeyDown(int cKey) } // ggSecurityResetButton.PutValue(1); } - else if (cKey == Global::Keys[k_AntiSlipping]) +#endif + else if( cKey == Global::Keys[ k_AntiSlipping ] ) //--------------- // hunter-221211: hamulec przeciwposlizgowy przeniesiony do // TTrain::Update() @@ -2308,8 +2841,7 @@ void TTrain::OnKeyDown(int cKey) { // Dlaczego bylo '-50'??? // dsbSwitch->SetVolume(-50); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } // ggAntiSlipButton.PutValue(1); } @@ -2364,8 +2896,7 @@ void TTrain::OnKeyDown(int cKey) { // wciśnięty [Ctrl] if (mvOccupied->Radio == true) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); mvOccupied->Radio = false; } } @@ -2448,15 +2979,13 @@ void TTrain::OnKeyDown(int cKey) if (Global::ctrlState) if (mvOccupied->BrakeDelaySwitch(bdelay_R)) { - dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); - dsbPneumaticRelay->Play(0, 0, 0); + play_sound( dsbPneumaticRelay ); } else ; else if (mvOccupied->BrakeDelaySwitch(bdelay_G)) { - dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); - dsbPneumaticRelay->Play(0, 0, 0); + play_sound( dsbPneumaticRelay ); } } else @@ -2475,15 +3004,13 @@ void TTrain::OnKeyDown(int cKey) if (Global::ctrlState) if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R)) { - dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); - dsbPneumaticRelay->Play(0, 0, 0); + play_sound( dsbPneumaticRelay ); } else ; else if (temp->MoverParameters->BrakeDelaySwitch(bdelay_G)) { - dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); - dsbPneumaticRelay->Play(0, 0, 0); + play_sound( dsbPneumaticRelay ); } } } @@ -2547,8 +3074,7 @@ void TTrain::OnKeyDown(int cKey) if (mvControlled->PantPress < 4.8) // piszą, że to tak nie działa { mvControlled->PantCompFlag = true; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); // dźwięk tylko po naciśnięciu klawisza + play_sound( dsbSwitch ); // dźwięk tylko po naciśnięciu klawisza } } // McZapkie-240302 - wylaczanie automatycznego pilota (w trybie ~debugmode @@ -2567,8 +3093,7 @@ void TTrain::OnKeyDown(int cKey) } if (mvControlled->CurrentSwitch(false)) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } /* Ra: przeniesione do Mover.cpp if (mvControlled->TrainType!=dt_EZT) @@ -2584,8 +3109,7 @@ void TTrain::OnKeyDown(int cKey) { if (mvControlled->AutoRelaySwitch(false)) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } } @@ -2611,7 +3135,7 @@ void TTrain::OnKeyDown(int cKey) if (mvControlled->DoorSignalling) { mvOccupied->DoorBlocked = false; - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); mvControlled->DoorSignalling = false; } } @@ -2703,8 +3227,7 @@ if // //podłączony sprzęg będzie widoczny if (DynamicObject->Mechanik) // na wszelki wypadek DynamicObject->Mechanik->CheckVehicles(Connect); // aktualizacja flag kierunku w składzie - dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); - dsbCouplerAttach->Play(0, 0, 0); + play_sound( dsbCouplerAttach ); } else WriteLog("Mechanical coupling failed."); @@ -2735,8 +3258,7 @@ if (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_scndpneumatic))) { // rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition()); - dsbCouplerDetach->SetVolume(DSBVOLUME_MAX); - dsbCouplerDetach->Play(0, 0, 0); + play_sound( dsbCouplerDetach ); DynamicObject->SetPneumatic(CouplNr != 0, false); // Ra: to mi się nie podoba !!!! tmp->SetPneumatic(CouplNr != 0, false); } @@ -2753,8 +3275,7 @@ if tmp->MoverParameters->Couplers[CouplNr].Connected, (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_controll))) { - dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); - dsbCouplerAttach->Play(0, 0, 0); + play_sound( dsbCouplerAttach ); } } else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_passenger)) // mostek @@ -2770,8 +3291,7 @@ if (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_passenger))) { // rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition()); - dsbCouplerDetach->SetVolume(DSBVOLUME_MAX); - dsbCouplerDetach->Play(0, 0, 0); + play_sound( dsbCouplerDetach ); DynamicObject->SetPneumatic(CouplNr != 0, false); tmp->SetPneumatic(CouplNr != 0, false); } @@ -2791,8 +3311,7 @@ if if (DynamicObject->DettachStatus(iCabn - 1) < 0) // jeśli jest co odczepić if (DynamicObject->Dettach(iCabn - 1)) // iCab==1:przód,iCab==2:tył { - dsbCouplerDetach->SetVolume(DSBVOLUME_MAX); // w kabinie ten dźwięk? - dsbCouplerDetach->Play(0, 0, 0); + play_sound( dsbCouplerDetach ); // w kabinie ten dźwięk? } } else @@ -2808,8 +3327,7 @@ if if (tmp->DettachStatus(CouplNr) < 0) // jeśli jest co odczepić i się da if (!tmp->Dettach(CouplNr)) { // dźwięk odczepiania - dsbCouplerDetach->SetVolume(DSBVOLUME_MAX); - dsbCouplerDetach->Play(0, 0, 0); + play_sound( dsbCouplerDetach ); } } } @@ -2818,6 +3336,7 @@ if Disconnect); // aktualizacja skrajnych pojazdów w składzie } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_CloseLeft]) // NBMX 17-09-2003: zamykanie drzwi { if( mvOccupied->DoorCloseCtrl == 1 ) { @@ -2844,7 +3363,7 @@ if } } } - +#endif //----------- // hunter-131211: dzwiek dla przelacznika universala // hunter-091012: ubajerowanie swiatla w kabinie (wyrzucenie @@ -2855,16 +3374,14 @@ if { if (bCabLight == true) //(ggCabLightButton.GetValue()!=0) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } } else { if (ggUniversal3Button.GetValue() != 0) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } /* if (Global::ctrlState) @@ -2882,8 +3399,7 @@ if { if (bCabLightDim == true) //(ggCabLightDimButton.GetValue()!=0) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); } } } @@ -2950,12 +3466,12 @@ if { if (mvControlled->Heating == true) { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); mvControlled->Heating = false; } } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_LeftSign]) // ABu 060205: lewe swiatlo - // wylaczenie { @@ -3057,6 +3573,7 @@ if } } } +#endif else if (cKey == Global::Keys[k_UpperSign]) // ABu 060205: światło górne - // wyłączenie { @@ -3069,11 +3586,11 @@ if { mvOccupied->LightsPos = mvOccupied->LightsPosNo; } - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); SetLights(); } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if ((Global::ctrlState) && (ggRearUpperLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu { @@ -3122,7 +3639,9 @@ if } } } +#endif } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (cKey == Global::Keys[k_RightSign]) // Winger 070304: swiatla tylne // (koncowki) - wlaczenie { @@ -3224,6 +3743,7 @@ if } } } +#endif else if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // Winger 110904: wylacznik st. // liniowych { @@ -3231,21 +3751,19 @@ if (mvControlled->TrainType != dt_ET40)) { ggStLinOffButton.PutValue(1); // Ra: było Fuse... - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); if (mvControlled->MainCtrlPosNo > 0) { mvControlled->StLinFlag = false; // yBARC - zmienione na przeciwne, bo true to zalaczone - dsbRelay->SetVolume(DSBVOLUME_MAX); - dsbRelay->Play(0, 0, 0); + play_sound( dsbRelay ); } } if (mvControlled->TrainType == dt_EZT) { if (mvControlled->Signalling == true) { - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); mvControlled->Signalling = false; } } @@ -3367,14 +3885,12 @@ if if( DynamicObject->DimHeadlights && (!Global::shiftState)) { DynamicObject->DimHeadlights = false; // switch sound - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); + play_sound( dsbSwitch ); } else if( (!DynamicObject->DimHeadlights) && (Global::shiftState)) { DynamicObject->DimHeadlights = true; // switch sound - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); + play_sound( dsbSwitch ); } } } @@ -3520,12 +4036,16 @@ bool TTrain::Update( double const Deltatime ) // NOTE: this is a temporary arrangement, for the transition period from old command setup to the new one // eventually commands are going to be retrieved directly by the vehicle, filtered through active control stand // and ultimately executed, provided the stand allows it. - command_data command; + command_data commanddata; // NOTE: currently we're only storing commands for local vehicle and there's no id system in place, // so we're supplying 'default' vehicle id of 0 - while( simulation::Commands.pop( command, static_cast( command_target::vehicle ) | 0 ) ) { + while( simulation::Commands.pop( commanddata, static_cast( command_target::vehicle ) | 0 ) ) { - OnCommand( command ); + auto lookup = m_commandhandlers.find( commanddata.command ); + if( lookup != m_commandhandlers.end() ) { + // pass the command to the assigned handler + lookup->second( this, commanddata ); + } } // update driver's position @@ -4089,30 +4609,32 @@ bool TTrain::Update( double const Deltatime ) if (mvOccupied->EventFlag || TestFlag(mvOccupied->SoundFlag, sound_loud)) { mvOccupied->EventFlag = false; // Ra: w kabinie? - dsbRelay->SetVolume(DSBVOLUME_MAX); + if( dsbRelay != nullptr ) { dsbRelay->SetVolume( DSBVOLUME_MAX ); } } else { - dsbRelay->SetVolume(-40); + if( dsbRelay != nullptr ) { dsbRelay->SetVolume( -40 ); } } if (!TestFlag(mvOccupied->SoundFlag, sound_manyrelay)) - dsbRelay->Play(0, 0, 0); + play_sound( dsbRelay ); else { if (TestFlag(mvOccupied->SoundFlag, sound_loud)) - dsbWejscie_na_bezoporow->Play(0, 0, 0); + play_sound( dsbWejscie_na_bezoporow ); else - dsbWejscie_na_drugi_uklad->Play(0, 0, 0); + play_sound( dsbWejscie_na_drugi_uklad ); } } - if (TestFlag(mvOccupied->SoundFlag, sound_bufferclamp)) // zderzaki uderzaja o siebie - { - if (TestFlag(mvOccupied->SoundFlag, sound_loud)) - dsbBufferClamp->SetVolume(DSBVOLUME_MAX); - else - dsbBufferClamp->SetVolume(-20); - dsbBufferClamp->Play(0, 0, 0); + if( dsbBufferClamp != nullptr ) { + if( TestFlag( mvOccupied->SoundFlag, sound_bufferclamp ) ) // zderzaki uderzaja o siebie + { + if( TestFlag( mvOccupied->SoundFlag, sound_loud ) ) + dsbBufferClamp->SetVolume( DSBVOLUME_MAX ); + else + dsbBufferClamp->SetVolume( -20 ); + play_sound( dsbBufferClamp ); + } } if (dsbCouplerStretch) if (TestFlag(mvOccupied->SoundFlag, sound_couplerstretch)) // sprzegi sie rozciagaja @@ -4121,7 +4643,7 @@ bool TTrain::Update( double const Deltatime ) dsbCouplerStretch->SetVolume(DSBVOLUME_MAX); else dsbCouplerStretch->SetVolume(-20); - dsbCouplerStretch->Play(0, 0, 0); + play_sound( dsbCouplerStretch ); } if (mvOccupied->SoundFlag == 0) @@ -4358,19 +4880,16 @@ bool TTrain::Update( double const Deltatime ) { if (fabs(mvControlled->Im) > 10.0) btLampkaPoslizg.TurnOn(); - rsSlippery.Play(-rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, - DynamicObject->GetPosition()); - if (mvControlled->TrainType == - dt_181) // alarm przy poslizgu dla 181/182 - BOMBARDIER + rsSlippery.Play(-rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); + if (mvControlled->TrainType == dt_181) // alarm przy poslizgu dla 181/182 - BOMBARDIER if (dsbSlipAlarm) - dsbSlipAlarm->Play(0, 0, DSBPLAY_LOOPING); + play_sound( dsbSlipAlarm, DSBPLAY_LOOPING ); } else { if ((mvOccupied->UnitBrakeForce > 100.0) && (DynamicObject->GetVelocity() > 1.0)) { - rsSlippery.Play(rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, - DynamicObject->GetPosition()); + rsSlippery.Play(rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); if (mvControlled->TrainType == dt_181) if (dsbSlipAlarm) dsbSlipAlarm->Stop(); @@ -4446,8 +4965,7 @@ bool TTrain::Update( double const Deltatime ) else btLampkaBoczniki.TurnOff(); - btLampkaNapNastHam.Turn(mvControlled->ActiveDir != - 0); // napiecie na nastawniku hamulcowym + btLampkaNapNastHam.Turn(mvControlled->ActiveDir != 0); // napiecie na nastawniku hamulcowym btLampkaSprezarka.Turn(mvControlled->CompressorFlag); // mutopsitka dziala // boczniki unsigned char scp; // Ra: dopisałem "unsigned" @@ -4716,8 +5234,6 @@ bool TTrain::Update( double const Deltatime ) // ggBrakeCtrl.UpdateValue(double(mvOccupied->BrakeCtrlPos)); ggBrakeCtrl.UpdateValue(mvOccupied->fBrakeCtrlPos); ggBrakeCtrl.Update(); - - } if (ggLocalBrake.SubModel) { @@ -4774,12 +5290,16 @@ bool TTrain::Update( double const Deltatime ) // NBMX wrzesien 2003 - drzwi if (ggDoorLeftButton.SubModel) { - ggDoorLeftButton.PutValue(mvOccupied->DoorLeftOpened ? 1 : 0); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1 : 0 ); +#endif ggDoorLeftButton.Update(); } if (ggDoorRightButton.SubModel) { - ggDoorRightButton.PutValue(mvOccupied->DoorRightOpened ? 1 : 0); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + ggDoorRightButton.PutValue( mvOccupied->DoorRightOpened ? 1 : 0 ); +#endif ggDoorRightButton.Update(); } if (ggDepartureSignalButton.SubModel) @@ -4803,7 +5323,8 @@ bool TTrain::Update( double const Deltatime ) if (ggConverterOffButton.SubModel) ggConverterOffButton.Update(); - if (((DynamicObject->iLights[0]) == 0) && ((DynamicObject->iLights[1]) == 0)) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( ( ( DynamicObject->iLights[ 0 ] ) == 0 ) && ( ( DynamicObject->iLights[ 1 ] ) == 0 ) ) { ggRightLightButton.PutValue(0); ggLeftLightButton.PutValue(0); @@ -4813,7 +5334,6 @@ bool TTrain::Update( double const Deltatime ) } // hunter-230112 - // REFLEKTOR LEWY // glowne oswietlenie if ((DynamicObject->iLights[0] & 1) == 1) @@ -4944,6 +5464,7 @@ bool TTrain::Update( double const Deltatime ) else ggRearRightLightButton.PutValue(-1); } +#endif if (ggLightsButton.SubModel) { ggLightsButton.PutValue(mvOccupied->LightsPos - 1); @@ -4958,32 +5479,13 @@ bool TTrain::Update( double const Deltatime ) //--------- // Winger 010304 - pantografy // NOTE: shouldn't the pantograph updates check whether it's front or rear cabin? - if (ggPantFrontButton.SubModel ) - { - if( mvOccupied->PantSwitchType != "impulse" ) { - ggPantFrontButton.UpdateValue( - ( mvOccupied->ActiveCab == 1 ? - mvControlled->PantFrontUp : - mvControlled->PantRearUp ) ? - 1.0 : - 0.0 ); - } + if (ggPantFrontButton.SubModel ) { ggPantFrontButton.Update(); } - if (ggPantRearButton.SubModel) - { - if( mvOccupied->PantSwitchType != "impulse" ) { - ggPantRearButton.UpdateValue( - ( mvOccupied->ActiveCab == 1 ? - mvControlled->PantRearUp : - mvControlled->PantFrontUp ) ? - 1.0 : - 0.0 ); - } + if (ggPantRearButton.SubModel) { ggPantRearButton.Update(); } - if (ggPantFrontButtonOff.SubModel) - { + if (ggPantFrontButtonOff.SubModel) { ggPantFrontButtonOff.Update(); } // Winger 020304 - ogrzewanie @@ -5063,7 +5565,7 @@ bool TTrain::Update( double const Deltatime ) dsbBuzzer->GetStatus(&stat); if (!(stat & DSBSTATUS_PLAYING)) { - dsbBuzzer->Play(0, 0, DSBPLAY_LOOPING); + play_sound( dsbBuzzer, DSBVOLUME_MAX, DSBPLAY_LOOPING ); Console::BitsSet(1 << 14); // ustawienie bitu 16 na PoKeys } } @@ -5200,7 +5702,7 @@ bool TTrain::Update( double const Deltatime ) } } else */ - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM //---------------- // hunter-131211: czuwak przeniesiony z OnKeyPress // hunter-091012: zrobiony test czuwaka @@ -5233,6 +5735,7 @@ bool TTrain::Update( double const Deltatime ) } CAflag = false; } +#endif /* if ( Console::Pressed(Global::Keys[k_Czuwak]) ) { @@ -5611,8 +6114,7 @@ bool TTrain::Update( double const Deltatime ) if ((mvOccupied->TrainType == dt_EZT) && (mvControlled->Mains) && (mvControlled->ActiveDir != 0)) { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); + play_sound( dsbPneumaticSwitch ); } } @@ -5697,16 +6199,14 @@ bool TTrain::Update( double const Deltatime ) ggAntiSlipButton.UpdateValue(1); if (mvOccupied->SwitchEPBrake(1)) { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); + play_sound( dsbPneumaticSwitch ); } } else { if (mvOccupied->SwitchEPBrake(0)) { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); + play_sound( dsbPneumaticSwitch ); } } @@ -5743,8 +6243,7 @@ bool TTrain::Update( double const Deltatime ) if (ggNextCurrentButton.SubModel) { ggNextCurrentButton.UpdateValue(1); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); ShowNextCurrent = true; } } @@ -5757,8 +6256,7 @@ bool TTrain::Update( double const Deltatime ) { // Ra: było pod GLFW_KEY_F3 if ((mvOccupied->EpFuseSwitch(true))) { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); + play_sound( dsbPneumaticSwitch ); } } } @@ -5770,8 +6268,7 @@ bool TTrain::Update( double const Deltatime ) { if ((mvOccupied->EpFuseSwitch(false))) { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); + play_sound( dsbPneumaticSwitch ); } } } @@ -5785,8 +6282,7 @@ bool TTrain::Update( double const Deltatime ) if (ggNextCurrentButton.SubModel) { ggNextCurrentButton.UpdateValue(0); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); + play_sound( dsbSwitch ); ShowNextCurrent = false; } } @@ -5854,19 +6350,18 @@ bool TTrain::Update( double const Deltatime ) */ // if (fabs(DynamicObject->GetVelocity())>0.5) - if (FreeFlyModeFlag ? false : fTachoCount > maxtacho) - { - dsbHasler->GetStatus(&stat); - if (!(stat & DSBSTATUS_PLAYING)) - dsbHasler->Play(0, 0, DSBPLAY_LOOPING); - } - else - { - if (FreeFlyModeFlag ? true : fTachoCount < 1) - { - dsbHasler->GetStatus(&stat); - if (stat & DSBSTATUS_PLAYING) - dsbHasler->Stop(); + if( dsbHasler != nullptr ) { + if( ( false == FreeFlyModeFlag ) && ( fTachoCount > maxtacho ) ) { + dsbHasler->GetStatus( &stat ); + if( !( stat & DSBSTATUS_PLAYING ) ) + play_sound( dsbHasler, DSBVOLUME_MAX, DSBPLAY_LOOPING ); + } + else { + if( ( true == FreeFlyModeFlag ) || ( fTachoCount < 1 ) ) { + dsbHasler->GetStatus( &stat ); + if( stat & DSBSTATUS_PLAYING ) + dsbHasler->Stop(); + } } } @@ -5919,14 +6414,12 @@ bool TTrain::Update( double const Deltatime ) ggUniversal4Button.PermIncValue(dt); ggUniversal4Button.Update(); -/* +#ifdef EU07_USE_OLD_COMMAND_SYSTEM ggMainOffButton.UpdateValue(0); ggMainOnButton.UpdateValue(0); -*/ ggSecurityResetButton.UpdateValue(0); -/* ggReleaserButton.UpdateValue(0); -*/ +#endif ggSandButton.UpdateValue(0); ggAntiSlipButton.UpdateValue(0); ggDepartureSignalButton.UpdateValue(0); @@ -6473,8 +6966,8 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) pyScreens.start(); if (DynamicObject->mdKabina) { - DynamicObject->mdKabina->Init(); // obrócenie modelu oraz optymalizacja, - // również zapisanie binarnego + DynamicObject->mdKabina->Init(); // obrócenie modelu oraz optymalizacja, również zapisanie binarnego + set_cab_controls(); return true; } return (token == "none"); @@ -6790,6 +7283,70 @@ void TTrain::clear_cab_controls() btHaslerCurrent.Clear(13); // prąd na silnikach do odbijania na haslerze } +// NOTE: we can get rid of this function once we have per-cab persistent state +void TTrain::set_cab_controls() { + + // switches + // pantographs + if( mvOccupied->PantSwitchType != "impulse" ) { + ggPantFrontButton.PutValue( + ( mvOccupied->ActiveCab == 1 ? + mvControlled->PantFrontUp : + mvControlled->PantRearUp ) ? + 1.0 : + 0.0 ); + } + + if( mvOccupied->PantSwitchType != "impulse" ) { + ggPantRearButton.PutValue( + ( mvOccupied->ActiveCab == 1 ? + mvControlled->PantRearUp : + mvControlled->PantFrontUp ) ? + 1.0 : + 0.0 ); + } + + // converter + if( mvOccupied->ConvSwitchType != "impulse" ) { + ggConverterButton.PutValue( + mvControlled->ConverterAllow ? + 1.0 : + 0.0 ); + } + + // compressor + if( true == mvControlled->CompressorAllow ) { + ggCompressorButton.PutValue( 1.0 ); + } + + // lights + int const lightsindex = + ( mvOccupied->ActiveCab == 1 ? + 0 : + 1 ); + + if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_left ) != 0 ) { + ggLeftLightButton.PutValue( 1.0 ); + } + if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_right ) != 0 ) { + ggRightLightButton.PutValue( 1.0 ); + } + if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_upper ) != 0 ) { + ggUpperLightButton.PutValue( 1.0 ); + } + if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_left ) != 0 ) { + ggLeftEndLightButton.PutValue( 1.0 ); + } + if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_right ) != 0 ) { + ggRightEndLightButton.PutValue( 1.0 ); + } + + // doors + // NOTE: we're relying on the cab models to have switches reversed for the rear cab(?) + ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1.0 : 0.0 ); + ggDoorRightButton.PutValue( mvOccupied->DoorRightOpened ? 1.0 : 0.0 ); +} + // initializes a button matching provided label. returns: true if the label was found, false // otherwise // NOTE: this is temporary work-around for compiler else-if limit @@ -7534,20 +8091,28 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con } void -TTrain::play_sound( PSound Sound, PSound Fallbacksound ) { +TTrain::play_sound( PSound Sound, int const Volume, DWORD const Flags ) { if( Sound ) { Sound->SetCurrentPosition( 0 ); - Sound->SetVolume( DSBVOLUME_MAX ); - Sound->Play( 0, 0, 0 ); - return; - } - if( Fallbacksound ) { - - Fallbacksound->SetCurrentPosition( 0 ); - Fallbacksound->SetVolume( DSBVOLUME_MAX ); - Fallbacksound->Play( 0, 0, 0 ); + Sound->SetVolume( Volume ); + Sound->Play( 0, 0, Flags ); + return; + } +} + +void +TTrain::play_sound( PSound Sound, PSound Fallbacksound, int const Volume, DWORD const Flags ) { + + if( Sound ) { + + play_sound( Sound, Volume, Flags ); + return; + } + if( Fallbacksound ) { + + play_sound( Fallbacksound, Volume, Flags ); return; } } diff --git a/Train.h b/Train.h index 11366a7d..a14dacad 100644 --- a/Train.h +++ b/Train.h @@ -70,37 +70,32 @@ class TTrain bool InitializeCab(int NewCabNo, std::string const &asFileName); TTrain(); ~TTrain(); - // bool Init(TTrack *Track); // McZapkie-010302 bool Init(TDynamicObject *NewDynamicObject, bool e3d = false); void OnKeyDown(int cKey); void OnKeyUp(int cKey); - void OnCommand( command_data const &Command ); - // bool SHP() { fShpTimer= 0; }; - - inline vector3 GetDirection() - { - return DynamicObject->VectorFront(); - }; - inline vector3 GetUp() - { - return DynamicObject->VectorUp(); - }; + inline vector3 GetDirection() { return DynamicObject->VectorFront(); }; + inline vector3 GetUp() { return DynamicObject->VectorUp(); }; void UpdateMechPosition(double dt); vector3 GetWorldMechPosition(); bool Update( double const Deltatime ); bool m_updated = false; void MechStop(); void SetLights(); - // virtual bool RenderAlpha(); // McZapkie-310302: ladowanie parametrow z pliku bool LoadMMediaFile(std::string const &asFileName); PyObject *GetTrainState(); private: +// types + typedef void( *command_handler )( TTrain *Train, command_data const &Command ); + typedef std::unordered_map commandhandler_map; // clears state of all cabin controls void clear_cab_controls(); + // sets cabin controls based on current state of the vehicle + // NOTE: we can get rid of this function once we have per-cab persistent state + void set_cab_controls(); // initializes a gauge matching provided label. returns: true if the label was found, false // otherwise bool initialize_gauge(cParser &Parser, std::string const &Label, int const Cabindex); @@ -109,20 +104,67 @@ class TTrain bool initialize_button(cParser &Parser, std::string const &Label, int const Cabindex); // plays specified sound, or fallback sound if the primary sound isn't presend // NOTE: temporary routine until sound system is sorted out and paired with switches - void play_sound( PSound Sound, PSound Fallbacksound = nullptr ); + void play_sound( PSound Sound, int const Volume = DSBVOLUME_MAX, DWORD const Flags = 0 ); + void play_sound( PSound Sound, PSound Fallbacksound, int const Volume, DWORD const Flags ); + // helper, returns true for EMU with oerlikon brake + bool is_eztoer() const; + // command handlers + // NOTE: we're currently using universal handlers and static handler map but it may be beneficial to have these implemented on individual class instance basis + // TBD, TODO: consider this approach if we ever want to have customized consist behaviour to received commands, based on the consist/vehicle type or whatever + static void OnCommand_mastercontrollerincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_mastercontrollerincreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_mastercontrollerdecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_secondcontrollerincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_secondcontrollerdecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_independentbrakeincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_independentbrakeincreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_independentbrakedecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_independentbrakedecreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_independentbrakebailoff( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakecharging( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakerelease( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakefirstservice( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakeservice( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakefullservice( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakeemergency( TTrain *Train, command_data const &Command ); + static void OnCommand_reverserincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_reverserdecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_alerteracknowledge( TTrain *Train, command_data const &Command ); + static void OnCommand_batterytoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_pantographtogglefront( TTrain *Train, command_data const &Command ); + static void OnCommand_pantographtogglerear( TTrain *Train, command_data const &Command ); + static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_compressortoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ); + static void OnCommand_headlighttoggleright( TTrain *Train, command_data const &Command ); + static void OnCommand_headlighttoggleupper( TTrain *Train, command_data const &Command ); + static void OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &Command ); + static void OnCommand_redmarkertoggleright( TTrain *Train, command_data const &Command ); + static void OnCommand_headlighttogglerearleft( TTrain *Train, command_data const &Command ); + static void OnCommand_headlighttogglerearright( TTrain *Train, command_data const &Command ); + static void OnCommand_headlighttogglerearupper( TTrain *Train, command_data const &Command ); + static void OnCommand_redmarkertogglerearleft( TTrain *Train, command_data const &Command ); + static void OnCommand_redmarkertogglerearright( TTrain *Train, command_data const &Command ); + static void OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ); + static void OnCommand_doortoggleright( TTrain *Train, command_data const &Command ); - // helper variable, to prevent immediate switch between closing and opening line breaker circuit - bool m_linebreakerclosed{ false }; - - private: //żeby go nic z zewnątrz nie przestawiało +// members TDynamicObject *DynamicObject; // przestawia zmiana pojazdu [F5] - private: //żeby go nic z zewnątrz nie przestawiało TMoverParameters *mvControlled; // człon, w którym sterujemy silnikiem TMoverParameters *mvOccupied; // człon, w którym sterujemy hamulcem TMoverParameters *mvSecond; // drugi człon (ET40, ET41, ET42, ukrotnienia) TMoverParameters *mvThird; // trzeci człon (SN61) - public: // reszta może by?publiczna - // AnsiString asMessage; + // helper variable, to prevent immediate switch between closing and opening line breaker circuit + bool m_linebreakerclosed{ false }; + static const commandhandler_map m_commandhandlers; + +public: // reszta może by?publiczna // McZapkie: definicje wskaźników // Ra 2014-08: częsciowo przeniesione do tablicy w TCab @@ -220,7 +262,6 @@ class TTrain TGauge ggTrainHeatingButton; TGauge ggSignallingButton; TGauge ggDoorSignallingButton; - // TModel3d *mdKabina; McZapkie-030303: to do dynobj // TGauge ggDistCounter; //Ra 2014-07: licznik kilometrów // TGauge ggVelocityDgt; //i od razu prędkościomierz @@ -422,18 +463,9 @@ class TTrain public: float fPress[20][3]; // cisnienia dla wszystkich czlonow float fEIMParams[9][10]; // parametry dla silnikow asynchronicznych - int RadioChannel() - { - return iRadioChannel; - }; - inline TDynamicObject *Dynamic() - { - return DynamicObject; - }; - inline TMoverParameters *Controlled() - { - return mvControlled; - }; + int RadioChannel() { return iRadioChannel; }; + inline TDynamicObject *Dynamic() { return DynamicObject; }; + inline TMoverParameters *Controlled() { return mvControlled; }; void DynamicSet(TDynamicObject *d); void Silence(); }; diff --git a/World.cpp b/World.cpp index d42f7cfd..5dc73095 100644 --- a/World.cpp +++ b/World.cpp @@ -1692,13 +1692,18 @@ TWorld::Update_UI() { // timetable TDynamicObject *tmp = ( FreeFlyModeFlag ? - Ground.DynamicNearest( Camera.Pos ) : - Controlled ); // w trybie latania lokalizujemy wg mapy + Ground.DynamicNearest( Camera.Pos ) : + Controlled ); // w trybie latania lokalizujemy wg mapy if( tmp == nullptr ) { break; } - if( tmp->Mechanik == nullptr ) { break; } + // if the nearest located vehicle doesn't have a direct driver, try to query its owner + auto const owner = ( + tmp->Mechanik != nullptr ? + tmp->Mechanik : + tmp->ctOwner ); + if( owner == nullptr ){ break; } - auto const table = tmp->Mechanik->Timetable(); + auto const table = owner->Timetable(); if( table == nullptr ) { break; } auto const &time = simulation::Time.data(); @@ -1711,14 +1716,12 @@ TWorld::Update_UI() { uitextline1 += " (paused)"; } - if( Controlled - && Controlled->Mechanik ) { - uitextline2 = Global::Bezogonkow( Controlled->Mechanik->Relation(), true ) + " (" + tmp->Mechanik->Timetable()->TrainName + ")"; - if( !uitextline2.empty() ) { - // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania - uitextline3 = " -> " + Global::Bezogonkow( Controlled->Mechanik->NextStop(), true ); - } - } + uitextline2 = Global::Bezogonkow( owner->Relation(), true ) + " (" + owner->Timetable()->TrainName + ")"; + auto const nextstation = Global::Bezogonkow( owner->NextStop(), true ); + if( !nextstation.empty() ) { + // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania + uitextline3 = " -> " + nextstation; + } if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { @@ -1731,7 +1734,7 @@ TWorld::Update_UI() { UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global::UITextColor ); TMTableLine *tableline; - for( int i = tmp->Mechanik->iStationStart; i <= std::min( tmp->Mechanik->iStationStart + 15, table->StationCount ); ++i ) { + for( int i = owner->iStationStart; i <= std::min( owner->iStationStart + 15, table->StationCount ); ++i ) { // wyświetlenie pozycji z rozkładu tableline = table->TimeTable + i; // linijka rozkładu @@ -1752,7 +1755,7 @@ TWorld::Update_UI() { UITable->text_lines.emplace_back( Global::Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), - ( ( tmp->Mechanik->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) ? + ( ( owner->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) ? float4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono Global::UITextColor ) ); diff --git a/command.cpp b/command.cpp index edbb388f..eccb31e9 100644 --- a/command.cpp +++ b/command.cpp @@ -91,6 +91,9 @@ const int k_Fuse = 26; const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; +*/ + { user_command::alerteracknowledge, command_target::vehicle }, +/* const int k_Czuwak = 32; const int k_Horn = 33; const int k_Horn2 = 34; @@ -118,10 +121,10 @@ const int k_DeCouple = 45; const int k_ProgramQuit = 46; // const int k_ProgramPause= 47; const int k_ProgramHelp = 48; -const int k_OpenLeft = 49; -const int k_OpenRight = 50; -const int k_CloseLeft = 51; -const int k_CloseRight = 52; +*/ + { user_command::doortoggleleft, command_target::vehicle }, + { user_command::doortoggleright, command_target::vehicle }, +/* const int k_DepartureSignal = 53; */ { user_command::pantographtogglefront, command_target::vehicle }, @@ -129,9 +132,18 @@ const int k_DepartureSignal = 53; /* const int k_Heating = 58; // const int k_FreeFlyMode= 59; -const int k_LeftSign = 60; -const int k_UpperSign = 61; -const int k_RightSign = 62; +*/ + { user_command::headlighttoggleleft, command_target::vehicle }, + { user_command::headlighttoggleright, command_target::vehicle }, + { user_command::headlighttoggleupper, command_target::vehicle }, + { user_command::redmarkertoggleleft, command_target::vehicle }, + { user_command::redmarkertoggleright, command_target::vehicle }, + { user_command::headlighttogglerearleft, command_target::vehicle }, + { user_command::headlighttogglerearright, command_target::vehicle }, + { user_command::headlighttogglerearupper, command_target::vehicle }, + { user_command::redmarkertogglerearleft, command_target::vehicle }, + { user_command::redmarkertogglerearright, command_target::vehicle }, +/* const int k_SmallCompressor = 63; const int k_StLinOff = 64; const int k_CurrentNext = 65; @@ -189,6 +201,9 @@ const int k_Fuse = 26; const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; +*/ + "alerteracknowledge", +/* const int k_Czuwak = 32; const int k_Horn = 33; const int k_Horn2 = 34; @@ -216,10 +231,10 @@ const int k_DeCouple = 45; const int k_ProgramQuit = 46; // const int k_ProgramPause= 47; const int k_ProgramHelp = 48; -const int k_OpenLeft = 49; -const int k_OpenRight = 50; -const int k_CloseLeft = 51; -const int k_CloseRight = 52; +*/ + "doortoggleleft", + "doortoggleright", +/* const int k_DepartureSignal = 53; */ "pantographtogglefront", @@ -227,9 +242,18 @@ const int k_DepartureSignal = 53; /* const int k_Heating = 58; // const int k_FreeFlyMode= 59; -const int k_LeftSign = 60; -const int k_UpperSign = 61; -const int k_RightSign = 62; +*/ + "headlighttoggleleft", + "headlighttoggleright", + "headlighttoggleupper", + "redmarkertoggleleft", + "redmarkertoggleright", + "headlighttogglerearleft", + "headlighttogglerearright", + "headlighttogglerearupper", + "redmarkertogglerearleft", + "redmarkertogglerearright", +/* const int k_SmallCompressor = 63; const int k_StLinOff = 64; const int k_CurrentNext = 65; @@ -258,8 +282,9 @@ command_relay::post( user_command const Command, std::uint64_t const Param1, std return; } if( ( lookup->second == command_target::vehicle ) - && ( true == FreeFlyModeFlag ) ) { - // don't pass vehicle commands if the user isn't in one + && ( true == FreeFlyModeFlag ) + && ( false == DebugModeFlag ) ) { + // don't pass vehicle commands if the user isn't in one, unless we're in debug mode return; } diff --git a/command.h b/command.h index 313cc5bf..67d9da3d 100644 --- a/command.h +++ b/command.h @@ -51,6 +51,9 @@ const int k_Fuse = 26; const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; +*/ + alerteracknowledge, +/* const int k_Czuwak = 32; const int k_Horn = 33; const int k_Horn2 = 34; @@ -78,10 +81,10 @@ const int k_DeCouple = 45; const int k_ProgramQuit = 46; // const int k_ProgramPause= 47; const int k_ProgramHelp = 48; -const int k_OpenLeft = 49; -const int k_OpenRight = 50; -const int k_CloseLeft = 51; -const int k_CloseRight = 52; +*/ + doortoggleleft, + doortoggleright, +/* const int k_DepartureSignal = 53; */ pantographtogglefront, @@ -89,9 +92,18 @@ const int k_DepartureSignal = 53; /* const int k_Heating = 58; // const int k_FreeFlyMode= 59; -const int k_LeftSign = 60; -const int k_UpperSign = 61; -const int k_RightSign = 62; +*/ + headlighttoggleleft, + headlighttoggleright, + headlighttoggleupper, + redmarkertoggleleft, + redmarkertoggleright, + headlighttogglerearleft, + headlighttogglerearright, + headlighttogglerearupper, + redmarkertogglerearleft, + redmarkertogglerearright, + /* const int k_SmallCompressor = 63; const int k_StLinOff = 64; const int k_CurrentNext = 65; diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 03f48a13..ebf3547f 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -130,7 +130,9 @@ const int k_Fuse = 26; const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; -const int k_Czuwak = 32; +*/ + { "alerteracknowledge", command_target::vehicle, GLFW_KEY_SPACE }, +/* const int k_Horn = 33; const int k_Horn2 = 34; const int k_FailedEngineCutOff = 35; @@ -157,10 +159,10 @@ const int k_DeCouple = 45; const int k_ProgramQuit = 46; // const int k_ProgramPause= 47; const int k_ProgramHelp = 48; -const int k_OpenLeft = 49; -const int k_OpenRight = 50; -const int k_CloseLeft = 51; -const int k_CloseRight = 52; +*/ + { "doortoggleleft", command_target::vehicle, GLFW_KEY_COMMA }, + { "doortoggleright", command_target::vehicle, GLFW_KEY_PERIOD }, +/* const int k_DepartureSignal = 53; */ { "pantographtogglefront", command_target::vehicle, GLFW_KEY_P }, @@ -168,9 +170,18 @@ const int k_DepartureSignal = 53; /* const int k_Heating = 58; // const int k_FreeFlyMode= 59; -const int k_LeftSign = 60; -const int k_UpperSign = 61; -const int k_RightSign = 62; +*/ + { "headlighttoggleleft", command_target::vehicle, GLFW_KEY_Y }, + { "headlighttoggleright", command_target::vehicle, GLFW_KEY_I }, + { "headlighttoggleupper", command_target::vehicle, GLFW_KEY_U }, + { "redmarkertoggleleft", command_target::vehicle, GLFW_KEY_Y | keymodifier::shift }, + { "redmarkertoggleright", command_target::vehicle, GLFW_KEY_I | keymodifier::shift }, + { "headlighttogglerearleft", command_target::vehicle, GLFW_KEY_Y | keymodifier::control }, + { "headlighttogglerearright", command_target::vehicle, GLFW_KEY_I | keymodifier::control }, + { "headlighttogglerearupper", command_target::vehicle, GLFW_KEY_U | keymodifier::control }, + { "redmarkertogglerearleft", command_target::vehicle, GLFW_KEY_Y | keymodifier::control | keymodifier::shift }, + { "redmarkertogglerearright", command_target::vehicle, GLFW_KEY_I | keymodifier::control | keymodifier::shift }, +/* const int k_SmallCompressor = 63; const int k_StLinOff = 64; const int k_CurrentNext = 65; diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 56dc3ce8..dc09e535 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -220,7 +220,7 @@ Source Files\input - Source Files + Source Files\input @@ -429,7 +429,7 @@ Header Files\input - Header Files + Header Files\input diff --git a/renderer.cpp b/renderer.cpp index a0a2a24e..8c66ff86 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -282,7 +282,7 @@ bool opengl_renderer::Render( TGround *Ground ) { glDisable( GL_BLEND ); - glAlphaFunc( GL_GREATER, 0.45f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f glEnable( GL_LIGHTING ); glColor3f( 1.0f, 1.0f, 1.0f ); diff --git a/stdafx.h b/stdafx.h index 1e060f74..4cd20a12 100644 --- a/stdafx.h +++ b/stdafx.h @@ -25,6 +25,7 @@ #include #undef NOMINMAX #include +#include #endif // stl #include From 57c213fd1dd4ce863fc41c136e428c3329d90425 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 14 Apr 2017 15:17:32 +0200 Subject: [PATCH 084/426] overload relay control, generic brake handles sound fix --- McZapkie/Mover.cpp | 21 ++++-- RealSound.h | 1 + Train.cpp | 156 +++++++++++++++++++++++++++++++-------------- Train.h | 1 + command.cpp | 11 ++-- command.h | 6 +- gamepadinput.cpp | 58 ++++++++++++++--- keyboardinput.cpp | 6 +- 8 files changed, 189 insertions(+), 71 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index debab692..a9a76bdd 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -676,10 +676,23 @@ bool TMoverParameters::CurrentSwitch(int direction) if (TrainType != dt_EZT) return (MinCurrentSwitch(direction != 0)); } - if (EngineType == DieselEngine) // dla 2Ls150 - if (ShuntModeAllow) - if (ActiveDir == 0) // przed ustawieniem kierunku - ShuntMode = ( direction != 0 ); + // TBD, TODO: split off shunt mode toggle into a separate command? It doesn't make much sense to have these two together like that + // dla 2Ls150 + if( ( EngineType == DieselEngine ) + && ( true == ShuntModeAllow ) + && ( ActiveDir == 0 ) ) { + // przed ustawieniem kierunku + ShuntMode = ( direction != 0 ); + return true; + } + // for SM42/SP42 + if( ( EngineType == DieselElectric ) + && ( true == ShuntModeAllow ) + && ( MainCtrlPos == 0 ) ) { + ShuntMode = ( direction != 0 ); + return true; + } + return false; }; diff --git a/RealSound.h b/RealSound.h index e2312051..1eec3761 100644 --- a/RealSound.h +++ b/RealSound.h @@ -48,6 +48,7 @@ class TRealSound int GetStatus(); void ResetPosition(); // void FreqReset(float f=22050.0) {fFrequency=f;}; + bool Empty() { return ( pSound == nullptr ); } }; class TTextSound : public TRealSound diff --git a/Train.cpp b/Train.cpp index d17783b0..1b5b20ed 100644 --- a/Train.cpp +++ b/Train.cpp @@ -165,6 +165,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::linebreakertoggle, &TTrain::OnCommand_linebreakertoggle }, { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, { user_command::compressortoggle, &TTrain::OnCommand_compressortoggle }, + { user_command::motoroverloadrelaythresholdtoggle, &TTrain::OnCommand_motoroverloadrelaythresholdtoggle }, { user_command::headlighttoggleleft, &TTrain::OnCommand_headlighttoggleleft }, { user_command::headlighttoggleright, &TTrain::OnCommand_headlighttoggleright }, { user_command::headlighttoggleupper, &TTrain::OnCommand_headlighttoggleupper }, @@ -639,14 +640,14 @@ void TTrain::OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Co void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { - + // press or hold if( Train->mvOccupied->BrakeHandle == FV4a ) { Train->mvOccupied->BrakeLevelAdd( -0.1 /*-15.0 * Command.time_delta*/ ); } else { // nową wersję dostarczył ZiomalCl ("fixed looped sound in ezt when using NUM_9 key") if( ( Train->mvOccupied->BrakeCtrlPos > -1 ) - || ( Train->keybrakecount > 1 ) ) { + || ( Train->keybrakecount > 1 ) ) { if( ( Train->is_eztoer() ) && ( Train->mvControlled->Mains ) @@ -661,12 +662,29 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co // koniec wersji dostarczonej przez ZiomalCl } } + else { + // release + if( ( Train->mvOccupied->BrakeCtrlPos == -1 ) + && ( Train->mvOccupied->BrakeHandle == FVel6 ) + && ( Train->DynamicObject->Controller != AIdriver ) + && ( Global::iFeedbackMode != 4 ) + && ( !( Global::bMWDmasterEnable && Global::bMWDBreakEnable ) ) ) { + // Odskakiwanie hamulce EP + Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->BrakeCtrlPos + 1 ); + Train->keybrakecount = 0; + if( ( Train->mvOccupied->TrainType == dt_EZT ) + && ( Train->mvControlled->Mains ) + && ( Train->mvControlled->ActiveDir != 0 ) ) { + Train->play_sound( Train->dsbPneumaticSwitch ); + } + } + } } void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { - + // press or hold // sound feedback if( ( Train->is_eztoer() ) && ( Train->mvControlled->Mains ) @@ -676,6 +694,23 @@ void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Co Train->mvOccupied->BrakeLevelSet( -1 ); } + else { + // release + if( ( Train->mvOccupied->BrakeCtrlPos == -1 ) + && ( Train->mvOccupied->BrakeHandle == FVel6 ) + && ( Train->DynamicObject->Controller != AIdriver ) + && ( Global::iFeedbackMode != 4 ) + && ( !( Global::bMWDmasterEnable && Global::bMWDBreakEnable ) ) ) { + // Odskakiwanie hamulce EP + Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->BrakeCtrlPos + 1 ); + Train->keybrakecount = 0; + if( ( Train->mvOccupied->TrainType == dt_EZT ) + && ( Train->mvControlled->Mains ) + && ( Train->mvControlled->ActiveDir != 0 ) ) { + Train->play_sound( Train->dsbPneumaticSwitch ); + } + } + } } void TTrain::OnCommand_trainbrakerelease( TTrain *Train, command_data const &Command ) { @@ -1330,6 +1365,35 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm */ } +void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Train->mvControlled->Imax < Train->mvControlled->ImaxHi ) { + // turn on + if( true == Train->mvControlled->CurrentSwitch( true ) ) { + // visual feedback + Train->ggMaxCurrentCtrl.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggMaxCurrentCtrl.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } + else { + //turn off + if( true == Train->mvControlled->CurrentSwitch( false ) ) { + // visual feedback + Train->ggMaxCurrentCtrl.UpdateValue( 0.0 ); + // sound feedback + if( Train->ggMaxCurrentCtrl.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + } + } +} + void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ) { if( Train->mvOccupied->LightsPosNo > 0 ) { @@ -2084,9 +2148,9 @@ void TTrain::OnKeyDown(int cKey) DynamicObject->Mechanik->TakeControl(true); } } - else if (cKey == Global::Keys[k_MaxCurrent]) // McZapkie-160502: F - - // wysoki rozruch - { +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if (cKey == Global::Keys[k_MaxCurrent]) { + // McZapkie-160502: F - wysoki rozruch if ((mvControlled->EngineType == DieselElectric) && (mvControlled->ShuntModeAllow) && (mvControlled->MainCtrlPos == 0)) { @@ -2096,28 +2160,17 @@ void TTrain::OnKeyDown(int cKey) { play_sound( dsbSwitch ); } - /* Ra: przeniesione do Mover.cpp - if (mvControlled->TrainType!=dt_EZT) //to powinno być w fizyce, a - nie w kabinie! - if (mvControlled->MinCurrentSwitch(true)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0,0,0); - } - */ } - else if (cKey == Global::Keys[k_CurrentAutoRelay]) // McZapkie-241002: G - - // wlaczanie PSR - { +#endif + else if (cKey == Global::Keys[k_CurrentAutoRelay]) { + // McZapkie-241002: G - wlaczanie PSR if (mvControlled->AutoRelaySwitch(true)) { play_sound( dsbSwitch ); } } - else if (cKey == Global::Keys[k_FailedEngineCutOff]) // McZapkie-060103: E - // - wylaczanie - // sekcji silnikow - { + else if (cKey == Global::Keys[k_FailedEngineCutOff]) { + // McZapkie-060103: E - wylaczanie sekcji silnikow if (mvControlled->CutOffEngine()) { play_sound( dsbSwitch ); @@ -3084,7 +3137,8 @@ void TTrain::OnKeyDown(int cKey) if (DynamicObject->Mechanik) DynamicObject->Mechanik->TakeControl(false); } - else if (cKey == Global::Keys[k_MaxCurrent]) // McZapkie-160502: f - niski rozruch +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if( cKey == Global::Keys[ k_MaxCurrent ] ) // McZapkie-160502: f - niski rozruch { if ((mvControlled->EngineType == DieselElectric) && (mvControlled->ShuntModeAllow) && (mvControlled->MainCtrlPos == 0)) @@ -3095,15 +3149,8 @@ void TTrain::OnKeyDown(int cKey) { play_sound( dsbSwitch ); } - /* Ra: przeniesione do Mover.cpp - if (mvControlled->TrainType!=dt_EZT) - if (mvControlled->MinCurrentSwitch(false)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0,0,0); - } - */ } +#endif else if (cKey == Global::Keys[k_CurrentAutoRelay]) // McZapkie-241002: g - // wylaczanie PSR { @@ -4351,7 +4398,7 @@ bool TTrain::Update( double const Deltatime ) fPPress = (1 * fPPress + mvOccupied->Handle->GetSound(s_fv4a_b)) / (2); if (fPPress > 0) { - vol = 2 * rsHiss.AM * fPPress; + vol = 2.0 * rsHiss.AM * fPPress; } if (vol > 0.001) { @@ -4402,7 +4449,7 @@ bool TTrain::Update( double const Deltatime ) rsHissX.Stop(); } } - if (rsHissT.AM != 0) // upuszczanie z czasowego + if (rsHissT.AM != 0) // upuszczanie z czasowego { vol = mvOccupied->Handle->GetSound(s_fv4a_t) * rsHissT.AM; if (vol > 0.001) @@ -4418,13 +4465,12 @@ bool TTrain::Update( double const Deltatime ) } // koniec FV4a else // jesli nie FV4a { - if (rsHiss.AM != 0) // upuszczanie z PG + if (rsHiss.AM != 0.0) // upuszczanie z PG { - fPPress = (4 * fPPress + Max0R(mvOccupied->dpLocalValve, mvOccupied->dpMainValve)) / - (4 + 1); - if (fPPress > 0) + fPPress = (4.0f * fPPress + std::max(mvOccupied->dpLocalValve, mvOccupied->dpMainValve)) / (4.0f + 1.0f); + if (fPPress > 0.0f) { - vol = 2 * rsHiss.AM * fPPress * 0.01; + vol = 2.0 * rsHiss.AM * fPPress; } if (vol > 0.01) { @@ -4435,13 +4481,12 @@ bool TTrain::Update( double const Deltatime ) rsHiss.Stop(); } } - if (rsHissU.AM != 0) // napelnianie PG + if (rsHissU.AM != 0.0) // napelnianie PG { - fNPress = (4 * fNPress + Min0R(mvOccupied->dpLocalValve, mvOccupied->dpMainValve)) / - (4 + 1); - if (fNPress < 0) + fNPress = (4.0f * fNPress + Min0R(mvOccupied->dpLocalValve, mvOccupied->dpMainValve)) / (4.0f + 1.0f); + if (fNPress < 0.0f) { - vol = -2 * rsHissU.AM * fNPress * 0.004; + vol = -1.0 * rsHissU.AM * fNPress; } if (vol > 0.01) { @@ -4956,7 +5001,8 @@ bool TTrain::Update( double const Deltatime ) mvControlled->ResistorsFlagCheck()); //------- - btLampkaWysRozr.Turn(mvControlled->Imax == mvControlled->ImaxHi); + btLampkaWysRozr.Turn(!(mvControlled->Imax < mvControlled->ImaxHi)); + if (((mvControlled->ScndCtrlActualPos > 0) || ((mvControlled->RList[mvControlled->MainCtrlActualPos].ScndAct != 0) && (mvControlled->RList[mvControlled->MainCtrlActualPos].ScndAct != 255))) && @@ -5283,7 +5329,9 @@ bool TTrain::Update( double const Deltatime ) if (ggMaxCurrentCtrl.SubModel) { - ggMaxCurrentCtrl.UpdateValue(double(mvControlled->Imax == mvControlled->ImaxHi)); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + ggMaxCurrentCtrl.UpdateValue( double( mvControlled->Imax == mvControlled->ImaxHi ) ); +#endif ggMaxCurrentCtrl.Update(); } @@ -6101,6 +6149,7 @@ bool TTrain::Update( double const Deltatime ) } } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM // Odskakiwanie hamulce EP if ((!Console::Pressed(Global::Keys[k_DecBrakeLevel])) && (!Console::Pressed(Global::Keys[k_WaveBrake])) && (mvOccupied->BrakeCtrlPos == -1) && @@ -6117,7 +6166,10 @@ bool TTrain::Update( double const Deltatime ) play_sound( dsbPneumaticSwitch ); } } - +#endif +/* + // NOTE: disabled, as it doesn't seem to be used. + // TODO: get rid of it altogether when we're cleaninng // Ra: przeklejka z SPKS - płynne poruszanie hamulcem // if // ((mvOccupied->BrakeHandle==FV4a)&&(Console::Pressed(Global::Keys[k_IncBrakeLevel]))) @@ -6151,7 +6203,7 @@ bool TTrain::Update( double const Deltatime ) // mvOccupied->BrakeLevelAdd(mvOccupied->fBrakeCtrlPos<-1?0:-dt*2); } } - +*/ if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_IncBrakeLevel]))) { if (Global::ctrlState) @@ -7287,6 +7339,11 @@ void TTrain::clear_cab_controls() void TTrain::set_cab_controls() { // switches + // battery + if( true == mvOccupied->Battery ) { + ggBatteryButton.PutValue( 1.0 ); + } + // pantographs if( mvOccupied->PantSwitchType != "impulse" ) { ggPantFrontButton.PutValue( @@ -7319,6 +7376,11 @@ void TTrain::set_cab_controls() { ggCompressorButton.PutValue( 1.0 ); } + // motor overload relay threshold / shunt mode + if( mvControlled->Imax == mvControlled->ImaxHi ) { + ggMaxCurrentCtrl.PutValue( 1.0 ); + } + // lights int const lightsindex = ( mvOccupied->ActiveCab == 1 ? diff --git a/Train.h b/Train.h index a14dacad..5c5b7be1 100644 --- a/Train.h +++ b/Train.h @@ -141,6 +141,7 @@ class TTrain static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_compressortoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleright( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleupper( TTrain *Train, command_data const &Command ); diff --git a/command.cpp b/command.cpp index eccb31e9..576580e7 100644 --- a/command.cpp +++ b/command.cpp @@ -79,16 +79,16 @@ command_relay::command_relay() { const int k_AntiSlipping = 21; const int k_Sand = 22; */ - { user_command::linebreakertoggle, command_target::vehicle }, { user_command::reverserincrease, command_target::vehicle }, { user_command::reverserdecrease, command_target::vehicle }, + { user_command::linebreakertoggle, command_target::vehicle }, /* const int k_Fuse = 26; */ - { user_command::compressortoggle, command_target::vehicle }, { user_command::convertertoggle, command_target::vehicle }, + { user_command::compressortoggle, command_target::vehicle }, + { user_command::motoroverloadrelaythresholdtoggle, command_target::vehicle }, /* -const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; */ @@ -189,14 +189,15 @@ int const k_DimHeadlights = 74; const int k_AntiSlipping = 21; const int k_Sand = 22; */ - "linebreakertoggle", "reverserincrease", "reverserdecrease", + "linebreakertoggle", /* const int k_Fuse = 26; */ - "compressortoggle", "convertertoggle", + "compressortoggle", + "motoroverloadrelaythresholdtoggle", /* const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; diff --git a/command.h b/command.h index 67d9da3d..6a92b86d 100644 --- a/command.h +++ b/command.h @@ -39,14 +39,15 @@ enum class user_command { const int k_AntiSlipping = 21; const int k_Sand = 22; */ - linebreakertoggle, reverserincrease, reverserdecrease, + linebreakertoggle, /* const int k_Fuse = 26; */ - compressortoggle, convertertoggle, + compressortoggle, + motoroverloadrelaythresholdtoggle, /* const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; @@ -54,7 +55,6 @@ const int k_BrakeProfile = 31; */ alerteracknowledge, /* -const int k_Czuwak = 32; const int k_Horn = 33; const int k_Horn2 = 34; const int k_FailedEngineCutOff = 35; diff --git a/gamepadinput.cpp b/gamepadinput.cpp index 3240b3cd..7b756e14 100644 --- a/gamepadinput.cpp +++ b/gamepadinput.cpp @@ -87,6 +87,11 @@ gamepad_input::init() { void gamepad_input::poll() { + if( m_deviceid == -1 ) { + // if there's no gamepad we can skip the rest + return; + } + int count; std::size_t idx = 0; // poll button state auto const buttons = glfwGetJoystickButtons( m_deviceid, &count ); @@ -98,8 +103,8 @@ gamepad_input::poll() { on_button( static_cast( idx ), ( buttons[ idx ] == 1 ? - GLFW_PRESS : - GLFW_RELEASE ) ); + GLFW_PRESS : + GLFW_RELEASE ) ); } else { // otherwise we only pass info about button being held down @@ -115,10 +120,6 @@ gamepad_input::poll() { } } - if( m_deviceid == -1 ) { - // if there's no gamepad we can skip the rest - return; - } // poll axes state idx = 0; glm::vec2 leftstick, rightstick, triggers; @@ -167,7 +168,8 @@ gamepad_input::on_button( gamepad_button const Button, int const Action ) { case gamepad_button::y: { if( Action == GLFW_RELEASE ) { - // if the button was released the stick controls movement + // TODO: send GLFW_RELEASE for whatever command could be issued by the mode active until now + // if the button was released the stick switches to control the movement m_mode = control_mode::entity; // zero the stick and the accumulator so the input won't bleed between modes m_leftstick = glm::vec2(); @@ -275,11 +277,20 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) if( Value >= 0.0f ) { if( m_modeaccumulator < 0.0f ) { // reset accumulator if we're going in the other direction i.e. issuing opposite control + // this also means we should indicate the previous command no longer applies + // (normally it's handled when the stick enters dead zone, but it's possible there's no actual dead zone) + m_relay.post( + lookup.second, + 0, 0, + GLFW_RELEASE, + Recipient ); m_modeaccumulator = 0.0f; } if( Value > m_deadzone ) { m_modeaccumulator += ( Value - m_deadzone ) / ( 1.0 - m_deadzone ) * deltatime; - while( m_modeaccumulator >= 1.0f ) { + // we're making sure there's always a positive charge left in the accumulator, + // to more reliably decect when the stick goes from active to dead zone, below + while( m_modeaccumulator > 1.0f ) { // send commands if the accumulator(s) was filled m_relay.post( lookup.first, @@ -289,15 +300,34 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) m_modeaccumulator -= 1.0f; } } + else { + // if the accumulator isn't empty it's an indicator the stick moved from active to neutral zone + // indicate it with proper RELEASE command + m_relay.post( + lookup.first, + 0, 0, + GLFW_RELEASE, + Recipient ); + m_modeaccumulator = 0.0f; + } } else { if( m_modeaccumulator > 0.0f ) { // reset accumulator if we're going in the other direction i.e. issuing opposite control + // this also means we should indicate the previous command no longer applies + // (normally it's handled when the stick enters dead zone, but it's possible there's no actual dead zone) + m_relay.post( + lookup.first, + 0, 0, + GLFW_RELEASE, + Recipient ); m_modeaccumulator = 0.0f; } if( Value < m_deadzone ) { m_modeaccumulator += ( Value + m_deadzone ) / ( 1.0 - m_deadzone ) * deltatime; - while( m_modeaccumulator <= -1.0f ) { + // we're making sure there's always a negative charge left in the accumulator, + // to more reliably decect when the stick goes from active to dead zone, below + while( m_modeaccumulator < -1.0f ) { // send commands if the accumulator(s) was filled m_relay.post( lookup.second, @@ -307,6 +337,16 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) m_modeaccumulator += 1.0f; } } + else { + // if the accumulator isn't empty it's an indicator the stick moved from active to neutral zone + // indicate it with proper RELEASE command + m_relay.post( + lookup.second, + 0, 0, + GLFW_RELEASE, + Recipient ); + m_modeaccumulator = 0.0f; + } } } diff --git a/keyboardinput.cpp b/keyboardinput.cpp index ebf3547f..a2c148eb 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -118,16 +118,16 @@ keyboard_input::default_bindings() { const int k_AntiSlipping = 21; const int k_Sand = 22; */ - { "linebreakertoggle", command_target::vehicle, GLFW_KEY_M }, { "reverserincrease", command_target::vehicle, GLFW_KEY_D }, { "reverserdecrease", command_target::vehicle, GLFW_KEY_R }, + { "linebreakertoggle", command_target::vehicle, GLFW_KEY_M }, /* const int k_Fuse = 26; */ - { "compressortoggle", command_target::vehicle, GLFW_KEY_C }, { "convertertoggle", command_target::vehicle, GLFW_KEY_X }, + { "compressortoggle", command_target::vehicle, GLFW_KEY_C }, + { "motoroverloadrelaythresholdtoggle", command_target::vehicle, GLFW_KEY_F }, /* -const int k_MaxCurrent = 29; const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; */ From 2fd7bc5a935ad6559de7760a758506214c0ae561 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 16 Apr 2017 17:22:56 +0200 Subject: [PATCH 085/426] control for e-p brake system, brake acting speed, departure signal, heating, door lock. Support for rear pantograph lowering button, all pantographs lowering button. Increased recognition of converter as a valid low voltage power source. --- Button.cpp | 3 + DynObj.cpp | 27 +- Gauge.cpp | 7 +- Globals.cpp | 1 + Globals.h | 6 +- McZapkie/Mover.cpp | 91 +++-- McZapkie/hamulce.h | 1 - Model3d.cpp | 14 +- Model3d.h | 4 +- Timer.cpp | 31 +- Train.cpp | 721 +++++++++++++++++++++++++++++++--------- Train.h | 9 + command.cpp | 356 +++++++------------- command.h | 35 +- keyboardinput.cpp | 193 +++++++---- keyboardinput.h | 2 - lightarray.cpp | 4 +- maszyna.vcxproj.filters | 8 +- 18 files changed, 927 insertions(+), 586 deletions(-) diff --git a/Button.cpp b/Button.cpp index 77016856..b6ed1d3f 100644 --- a/Button.cpp +++ b/Button.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Button.h" #include "Console.h" +#include "logs.h" //--------------------------------------------------------------------------- @@ -57,6 +58,8 @@ void TButton::Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2) { pModelOn = NULL; pModelOff = NULL; + + ErrorLog( "Failed to locate sub-model \"" + token + "\" in 3d model \"" + pModel1->NameGet() + "\"" ); } }; diff --git a/DynObj.cpp b/DynObj.cpp index d25a37af..3ab622d3 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -798,7 +798,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) btnOn = true; } // else btCPass2.TurnOff(); - if (MoverParameters->Battery) + if( ( true == MoverParameters->Battery ) || ( true == MoverParameters->ConverterFlag ) ) { // sygnaly konca pociagu if (btEndSignals1.Active()) { @@ -900,10 +900,9 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) // Ra: przechyłkę załatwiamy na etapie przesuwania modelu // if (ObjSqrDist<80000) ABuModelRoll(); //przechyłki od 400m } - if (MoverParameters->Battery) - { // sygnały czoła pociagu //Ra: wyświetlamy bez - // ograniczeń odległości, by były widoczne z - // daleka + if( ( true == MoverParameters->Battery ) || ( true == MoverParameters->ConverterFlag ) ) { + // sygnały czoła pociagu + //Ra: wyświetlamy bez ograniczeń odległości, by były widoczne z daleka if (TestFlag(iLights[0], 1)) { btHeadSignals11.TurnOn(); @@ -986,11 +985,8 @@ TDynamicObject * TDynamicObject::ABuFindNearestObject(TTrack *Track, TDynamicObj return nullptr; } -TDynamicObject * TDynamicObject::ABuScanNearestObject(TTrack *Track, double ScanDir, - double ScanDist, int &CouplNr) -{ // skanowanie toru w poszukiwaniu obiektu najblizszego - // kamerze - // double MyScanDir=ScanDir; //Moja orientacja na torze. //Ra: nie używane +TDynamicObject * TDynamicObject::ABuScanNearestObject(TTrack *Track, double ScanDir, double ScanDist, int &CouplNr) +{ // skanowanie toru w poszukiwaniu obiektu najblizszego kamerze if (ABuGetDirection() < 0) ScanDir = -ScanDir; TDynamicObject *FoundedObj; @@ -2914,11 +2910,12 @@ bool TDynamicObject::Update(double dt, double dt1) // fragment "z EXE Kursa" if (MoverParameters->Mains) // nie wchodzić w funkcję bez potrzeby - if ((!MoverParameters->Battery) && (Controller == Humandriver) && - (MoverParameters->EngineType != DieselEngine) && - (MoverParameters->EngineType != WheelsDriven)) - { // jeśli bateria wyłączona, a nie diesel ani drezyna - // reczna + if ( ( false == MoverParameters->Battery) + && ( false == MoverParameters->ConverterFlag ) // added alternative power source. TODO: more generic power check + && ( Controller == Humandriver) + && ( MoverParameters->EngineType != DieselEngine ) + && ( MoverParameters->EngineType != WheelsDriven ) ) + { // jeśli bateria wyłączona, a nie diesel ani drezyna reczna if (MoverParameters->MainSwitch(false)) // wyłączyć zasilanie MoverParameters->EventFlag = true; } diff --git a/Gauge.cpp b/Gauge.cpp index 99b424a0..85ff23c6 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -15,9 +15,10 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Gauge.h" -#include "Timer.h" #include "parser.h" #include "Model3d.h" +#include "Timer.h" +#include "logs.h" TGauge::TGauge() { @@ -90,6 +91,10 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) md2 = NULL; // informacja, że znaleziony else if (md2) // a jest podany drugi model (np. zewnętrzny) sm = md2->GetFromName(str1.c_str()); // to może tam będzie, co za różnica gdzie + if( sm == nullptr ) { + ErrorLog( "Failed to locate sub-model \"" + str1 + "\" in 3d model \"" + md1->NameGet() + "\"" ); + } + if (str2 == "mov") Init(sm, gt_Move, val3, val4, val5); else if (str2 == "wip") diff --git a/Globals.cpp b/Globals.cpp index e5cd1de9..afd6a465 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -107,6 +107,7 @@ int Global::iHiddenEvents = 1; // czy łączyć eventy z torami poprzez nazwę t // parametry użytkowe (jak komu pasuje) int Global::Keys[MaxKeys]; +bool Global::RealisticControlMode{ false }; int Global::iWindowWidth = 800; int Global::iWindowHeight = 600; float Global::fDistanceFactor = Global::ScreenHeight / 768.0; // baza do przeliczania odległości dla LoD diff --git a/Globals.h b/Globals.h index d2d48623..ee866146 100644 --- a/Globals.h +++ b/Globals.h @@ -166,6 +166,7 @@ class Global public: // double Global::tSinceStart; static int Keys[MaxKeys]; + static bool RealisticControlMode; // controls ability to steer the vehicle from outside views static Math3D::vector3 pCameraPosition; // pozycja kamery w świecie static double pCameraRotation; // kierunek bezwzględny kamery w świecie: 0=północ, 90°=zachód (-azymut) @@ -207,10 +208,7 @@ class Global static std::string asHumanCtrlVehicle; static void LoadIniFile(std::string asFileName); static void InitKeys(); - inline static Math3D::vector3 GetCameraPosition() - { - return pCameraPosition; - }; + inline static Math3D::vector3 GetCameraPosition() { return pCameraPosition; }; static void SetCameraPosition(Math3D::vector3 pNewCameraPosition); static void SetCameraRotation(double Yaw); static int iWriteLogEnabled; // maska bitowa: 1-zapis do pliku, 2-okienko diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index a9a76bdd..9e7b5d7c 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4956,48 +4956,37 @@ bool TMoverParameters::AutoRelayCheck(void) // ************************************************************************************************* // Q: 20160713 -// Podnosi / opuszcza przedni pantograf +// Podnosi / opuszcza przedni pantograf. Returns: state of the pantograph after the operation // ************************************************************************************************* bool TMoverParameters::PantFront(bool State) { - double pf1 = 0; - bool PF = false; + if( ( true == Battery ) + || ( true == ConverterFlag ) ) { - if ((Battery == - true) /* and ((TrainType<>dt_ET40)or ((TrainType=dt_ET40) and (EnginePowerSource.CollectorsNo>1)))*/) - { - PF = true; - if (State == true) - pf1 = 1; - else - pf1 = 0; - if (PantFrontUp != State) - { + if( PantFrontUp != State ) { PantFrontUp = State; - if (State == true) - { + if( State == true ) { PantFrontStart = 0; - SendCtrlToNext("PantFront", 1, CabNo); + SendCtrlToNext( "PantFront", 1, CabNo ); } - else - { - PF = false; + else { PantFrontStart = 1; - SendCtrlToNext("PantFront", 0, CabNo); - //{Ra: nie ma potrzeby opuszczać obydwu na raz, jak mozemy każdy osobno - // if (TrainType == dt_EZT) && (ActiveCab == 1) - // { - // PantRearUp = false; - // PantRearStart = 1; - // SendCtrlToNext("PantRear", 0, CabNo); - // } - //} + SendCtrlToNext( "PantFront", 0, CabNo ); } } - else - SendCtrlToNext("PantFront", pf1, CabNo); } - return PF; + else { + // no power, drop the pantograph + // NOTE: this is a simplification as it should just drop on its own with loss of pressure without resupply from (dead) compressor + PantFrontStart = ( + PantFrontUp ? + 1 : + 0 ); + PantFrontUp = false; + SendCtrlToNext( "PantFront", 0, CabNo ); + } + + return PantFrontUp; } // ************************************************************************************************* @@ -5006,35 +4995,33 @@ bool TMoverParameters::PantFront(bool State) // ************************************************************************************************* bool TMoverParameters::PantRear(bool State) { - double pf1; - bool PR = false; + if( ( true == Battery ) + || ( true == ConverterFlag ) ) { - if (Battery == true) - { - PR = true; - if (State == true) - pf1 = 1; - else - pf1 = 0; - if (PantRearUp != State) - { + if( PantRearUp != State ) { PantRearUp = State; - if (State == true) - { + if( State == true ) { PantRearStart = 0; - SendCtrlToNext("PantRear", 1, CabNo); + SendCtrlToNext( "PantRear", 1, CabNo ); } - else - { - PR = false; + else { PantRearStart = 1; - SendCtrlToNext("PantRear", 0, CabNo); + SendCtrlToNext( "PantRear", 0, CabNo ); } } - else - SendCtrlToNext("PantRear", pf1, CabNo); } - return PR; + else { + // no power, drop the pantograph + // NOTE: this is a simplification as it should just drop on its own with loss of pressure without resupply from (dead) compressor + PantRearStart = ( + PantRearUp ? + 1 : + 0 ); + PantRearUp = false; + SendCtrlToNext( "PantRear", 0, CabNo ); + } + + return PantRearUp; } // ************************************************************************************************* diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index d9cb56da..661bfc7a 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -45,7 +45,6 @@ static int const bdelay_G = 1; //G static int const bdelay_P = 2; //P static int const bdelay_R = 4; //R static int const bdelay_M = 8; //Mg -static int const bdelay_GR = 128; //G-R /*stan hamulca*/ diff --git a/Model3d.cpp b/Model3d.cpp index 297232a5..c3f39b80 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1649,15 +1649,21 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) LoadFromBinFile(asBinary, dynamic); asBinary = ""; // wyłączenie zapisu Init(); - } + // cache the file name, in case someone wants it later + m_filename = name + ".e3d"; + } else { if (FileExists(name + ".t3d")) { LoadFromTextFile(FileName, dynamic); // wczytanie tekstowego - if (!dynamic) // pojazdy dopiero po ustawieniu animacji - Init(); // generowanie siatek i zapis E3D - } + if( !dynamic ) { + // pojazdy dopiero po ustawieniu animacji + Init(); // generowanie siatek i zapis E3D + } + // cache the file name, in case someone wants it later + m_filename = name + ".t3d"; + } } bool const result = Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem diff --git a/Model3d.h b/Model3d.h index cdca7c29..f3942b56 100644 --- a/Model3d.h +++ b/Model3d.h @@ -342,6 +342,7 @@ private: int *iModel; // zawartość pliku binarnego int iSubModelsCount; // Ra: używane do tworzenia binarnych std::string asBinary; // nazwa pod którą zapisać model binarny + std::string m_filename; public: inline TSubModel * GetSMRoot() { @@ -382,7 +383,8 @@ public: void Init(); std::string NameGet() { - return Root ? Root->pName : NULL; +// return Root ? Root->pName : NULL; + return m_filename; }; int TerrainCount(); TSubModel * TerrainSquare(int n); diff --git a/Timer.cpp b/Timer.cpp index d6934f65..21934834 100644 --- a/Timer.cpp +++ b/Timer.cpp @@ -15,12 +15,12 @@ namespace Timer { double DeltaTime, DeltaRenderTime; -double fFPS = 0.0f; -double fLastTime = 0.0f; -DWORD dwFrames = 0L; -double fSimulationTime = 0; -double fSoundTimer = 0; -double fSinceStart = 0; +double fFPS{ 0.0f }; +double fLastTime{ 0.0f }; +DWORD dwFrames{ 0 }; +double fSimulationTime{ 0.0 }; +double fSoundTimer{ 0.0 }; +double fSinceStart{ 0.0 }; double GetTime() { @@ -69,15 +69,10 @@ double GetFPS() void ResetTimers() { - // double CurrentTime= -#if _WIN32_WINNT >= _WIN32_WINNT_VISTA - ::GetTickCount64(); -#else - ::GetTickCount(); -#endif + UpdateTimers( Global::iPause != 0 ); DeltaTime = 0.1; - DeltaRenderTime = 0; - fSoundTimer = 0; + DeltaRenderTime = 0.0; + fSoundTimer = 0.0; }; LONGLONG fr, count, oldCount; @@ -92,17 +87,17 @@ void UpdateTimers(bool pause) DeltaTime = Global::fTimeSpeed * DeltaRenderTime; fSoundTimer += DeltaTime; if (fSoundTimer > 0.1) - fSoundTimer = 0; + fSoundTimer = 0.0; /* double CurrentTime= double(count)/double(fr);//GetTickCount(); DeltaTime= (CurrentTime-OldTime); OldTime= CurrentTime; */ - if (DeltaTime > 1) - DeltaTime = 1; + if (DeltaTime > 1.0) + DeltaTime = 1.0; } else - DeltaTime = 0; // wszystko stoi, bo czas nie płynie + DeltaTime = 0.0; // wszystko stoi, bo czas nie płynie oldCount = count; // Keep track of the time lapse and frame count diff --git a/Train.cpp b/Train.cpp index 1b5b20ed..da53bcd1 100644 --- a/Train.cpp +++ b/Train.cpp @@ -143,6 +143,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::secondcontrollerincreasefast, &TTrain::OnCommand_secondcontrollerincreasefast }, { user_command::secondcontrollerdecrease, &TTrain::OnCommand_secondcontrollerdecrease }, { user_command::secondcontrollerdecreasefast, &TTrain::OnCommand_secondcontrollerdecreasefast }, + { user_command::notchingrelaytoggle, &TTrain::OnCommand_notchingrelaytoggle }, { user_command::independentbrakeincrease, &TTrain::OnCommand_independentbrakeincrease }, { user_command::independentbrakeincreasefast, &TTrain::OnCommand_independentbrakeincreasefast }, { user_command::independentbrakedecrease, &TTrain::OnCommand_independentbrakedecrease }, @@ -156,16 +157,21 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::trainbrakeservice, &TTrain::OnCommand_trainbrakeservice }, { user_command::trainbrakefullservice, &TTrain::OnCommand_trainbrakefullservice }, { user_command::trainbrakeemergency, &TTrain::OnCommand_trainbrakeemergency }, + { user_command::epbrakecontroltoggle, &TTrain::OnCommand_epbrakecontroltoggle }, + { user_command::brakeactingspeedincrease, &TTrain::OnCommand_brakeactingspeedincrease }, + { user_command::brakeactingspeeddecrease, &TTrain::OnCommand_brakeactingspeeddecrease }, { user_command::reverserincrease, &TTrain::OnCommand_reverserincrease }, { user_command::reverserdecrease, &TTrain::OnCommand_reverserdecrease }, { user_command::alerteracknowledge, &TTrain::OnCommand_alerteracknowledge }, { user_command::batterytoggle, &TTrain::OnCommand_batterytoggle }, { user_command::pantographtogglefront, &TTrain::OnCommand_pantographtogglefront }, { user_command::pantographtogglerear, &TTrain::OnCommand_pantographtogglerear }, + { user_command::pantographlowerall, &TTrain::OnCommand_pantographlowerall }, { user_command::linebreakertoggle, &TTrain::OnCommand_linebreakertoggle }, { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, { user_command::compressortoggle, &TTrain::OnCommand_compressortoggle }, { user_command::motoroverloadrelaythresholdtoggle, &TTrain::OnCommand_motoroverloadrelaythresholdtoggle }, + { user_command::heatingtoggle, &TTrain::OnCommand_heatingtoggle }, { user_command::headlighttoggleleft, &TTrain::OnCommand_headlighttoggleleft }, { user_command::headlighttoggleright, &TTrain::OnCommand_headlighttoggleright }, { user_command::headlighttoggleupper, &TTrain::OnCommand_headlighttoggleupper }, @@ -177,7 +183,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::redmarkertogglerearleft, &TTrain::OnCommand_redmarkertogglerearleft }, { user_command::redmarkertogglerearright, &TTrain::OnCommand_redmarkertogglerearright }, { user_command::doortoggleleft, &TTrain::OnCommand_doortoggleleft }, - { user_command::doortoggleright, &TTrain::OnCommand_doortoggleright } + { user_command::doortoggleright, &TTrain::OnCommand_doortoggleright }, + { user_command::departureannounce, &TTrain::OnCommand_departureannounce }, + { user_command::doorlocktoggle, &TTrain::OnCommand_doorlocktoggle } }; TTrain::TTrain() @@ -522,6 +530,33 @@ void TTrain::OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data } } +void TTrain::OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvOccupied->AutoRelayFlag ) { + // turn on + if( Train->mvOccupied->AutoRelaySwitch( true ) ) { + // audio feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + // NOTE: there's no button for notching relay control + // TBD, TODO: add notching relay control button? + } + } + else { + //turn off + if( Train->mvOccupied->AutoRelaySwitch( false ) ) { + // audio feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + // NOTE: there's no button for notching relay control + // TBD, TODO: add notching relay control button? + } + } + } +} + void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { @@ -790,9 +825,112 @@ void TTrain::OnCommand_trainbrakeemergency( TTrain *Train, command_data const &C } } +void TTrain::OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvOccupied->EpFuse ) { + // turn on + if( Train->mvOccupied->EpFuseSwitch( true ) ) { + // audio feedback + Train->play_sound( Train->dsbPneumaticSwitch ); + // visual feedback + // NOTE: there's no button for ep brake control switch + // TBD, TODO: add ep brake control switch? + } + } + else { + //turn off + if( Train->mvOccupied->EpFuseSwitch( false ) ) { + // audio feedback + Train->play_sound( Train->dsbPneumaticSwitch ); + // visual feedback + // NOTE: there's no button for ep brake control switch + // TBD, TODO: add ep brake control switch? + } + } + } +} + +void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + if( ( Train->mvOccupied->BrakeDelayFlag & bdelay_M ) != 0 ) { + // can't speed it up any more than this + return; + } + auto const fasterbrakesetting = ( + Train->mvOccupied->BrakeDelayFlag < bdelay_R ? + Train->mvOccupied->BrakeDelayFlag << 1 : + Train->mvOccupied->BrakeDelayFlag | bdelay_M ); + if( true == Train->mvOccupied->BrakeDelaySwitch( fasterbrakesetting ) ) { + // audio feedback + Train->play_sound( Train->dsbSwitch ); + Train->play_sound( Train->dsbPneumaticRelay ); + // visual feedback + if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { + Train->ggBrakeProfileCtrl.UpdateValue( + ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 2.0 : + Train->mvOccupied->BrakeDelayFlag - 1 ) ); + } + if( Train->ggBrakeProfileG.SubModel != nullptr ) { + Train->ggBrakeProfileG.UpdateValue( + Train->mvOccupied->BrakeDelayFlag == bdelay_G ? + 1.0 : + 0.0 ); + } + if( Train->ggBrakeProfileR.SubModel != nullptr ) { + Train->ggBrakeProfileR.UpdateValue( + ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 1.0 : + 0.0 ); + } + } + } +} + +void TTrain::OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + if( Train->mvOccupied->BrakeDelayFlag == bdelay_G ) { + // can't slow it down any more than this + return; + } + auto const slowerbrakesetting = ( + Train->mvOccupied->BrakeDelayFlag < bdelay_M ? + Train->mvOccupied->BrakeDelayFlag >> 1 : + Train->mvOccupied->BrakeDelayFlag ^ bdelay_M ); + if( true == Train->mvOccupied->BrakeDelaySwitch( slowerbrakesetting ) ) { + // audio feedback + Train->play_sound( Train->dsbSwitch ); + Train->play_sound( Train->dsbPneumaticRelay ); + // visual feedback + if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { + Train->ggBrakeProfileCtrl.UpdateValue( + ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 2.0 : + Train->mvOccupied->BrakeDelayFlag - 1 ) ); + } + if( Train->ggBrakeProfileG.SubModel != nullptr ) { + Train->ggBrakeProfileG.UpdateValue( + Train->mvOccupied->BrakeDelayFlag == bdelay_G ? + 1.0 : + 0.0 ); + } + if( Train->ggBrakeProfileR.SubModel != nullptr ) { + Train->ggBrakeProfileR.UpdateValue( + ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 1.0 : + 0.0 ); + } + } + } +} + void TTrain::OnCommand_reverserincrease( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { if( Train->mvOccupied->DirectionForward() ) { // sound feedback @@ -809,7 +947,7 @@ void TTrain::OnCommand_reverserincrease( TTrain *Train, command_data const &Comm void TTrain::OnCommand_reverserdecrease( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { if( Train->mvOccupied->DirectionBackward() ) { // sound feedback @@ -894,8 +1032,11 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command // audio feedback Train->play_sound( Train->dsbSwitch ); // side-effects - Train->mvControlled->PantFront( false ); - Train->mvControlled->PantRear( false ); + if( false == Train->mvControlled->ConverterFlag ) { + // if there's no (low voltage) power source left, drop pantographs + Train->mvControlled->PantFront( false ); + Train->mvControlled->PantRear( false ); + } } } } @@ -912,10 +1053,16 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->mvControlled->PantFrontSP = false; if( Train->mvControlled->PantFront( true ) ) { if( Train->mvControlled->PantFrontStart != 1 ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback if( Train->ggPantFrontButton.SubModel ) { Train->ggPantFrontButton.UpdateValue( 1.0 ); } - Train->play_sound( Train->dsbSwitch ); + if( Train->ggPantFrontButtonOff.SubModel != nullptr ) { + // pantograph control can have two-button setup + Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); + } } } } @@ -924,28 +1071,41 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->mvControlled->PantRearSP = false; if( Train->mvControlled->PantRear( true ) ) { if( Train->mvControlled->PantRearStart != 1 ) { - if( Train->ggPantRearButton.SubModel ) { - Train->ggPantRearButton.UpdateValue( 1.0 ); - } + // sound feedback Train->play_sound( Train->dsbSwitch ); + // visual feedback + if( Train->ggPantFrontButton.SubModel ) { + Train->ggPantFrontButton.UpdateValue( 1.0 ); + } + if( Train->ggPantFrontButtonOff.SubModel != nullptr ) { + // pantograph control can have two-button setup + Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); + } } } } } else { // ...or turn off + if( ( Train->mvOccupied->PantSwitchType == "impulse" ) + && ( Train->ggPantFrontButtonOff.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; + } + if( Train->mvOccupied->ActiveCab == 1 ) { // przedni gdy w kabinie 1 Train->mvControlled->PantFrontSP = false; if( false == Train->mvControlled->PantFront( false ) ) { if( Train->mvControlled->PantFrontStart != 0 ) { - if( Train->ggPantFrontButton.SubModel ) { - Train->ggPantFrontButton.UpdateValue( - ( Train->mvOccupied->PantSwitchType != "impulse" ? - 0.0 : - 1.0 ) ); - } + // sound feedback Train->play_sound( Train->dsbSwitch ); + // visual feedback + Train->ggPantFrontButton.UpdateValue( 0.0 ); + // pantograph control can have two-button setup + Train->ggPantFrontButtonOff.UpdateValue( 1.0 ); } } } @@ -954,13 +1114,12 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->mvControlled->PantRearSP = false; if( false == Train->mvControlled->PantRear( false ) ) { if( Train->mvControlled->PantRearStart != 0 ) { - if( Train->ggPantRearButton.SubModel ) { - Train->ggPantRearButton.UpdateValue( - ( Train->mvOccupied->PantSwitchType != "impulse" ? - 0.0 : - 1.0 ) ); - } + // sound feedback Train->play_sound( Train->dsbSwitch ); + // visual feedback + Train->ggPantFrontButton.UpdateValue( 0.0 ); + // pantograph control can have two-button setup + Train->ggPantFrontButtonOff.UpdateValue( 1.0 ); } } } @@ -969,23 +1128,18 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( Train->mvOccupied->ActiveCab == 1 ) { - // przedni gdy w kabinie 1 - if( Train->ggPantFrontButton.GetValue() > 0.1 ) { - Train->play_sound( Train->dsbSwitch ); - } - if( Train->ggPantFrontButton.SubModel ) { - Train->ggPantFrontButton.UpdateValue( 0.0 ); - } + if( Train->ggPantFrontButton.GetValue() > 0.35 ) { + Train->play_sound( Train->dsbSwitch ); } - else { - // rear otherwise - if( Train->ggPantRearButton.GetValue() > 0.1 ) { - Train->play_sound( Train->dsbSwitch ); - } - if( Train->ggPantRearButton.SubModel ) { - Train->ggPantRearButton.UpdateValue( 0.0 ); - } + if( Train->ggPantFrontButton.SubModel ) { + Train->ggPantFrontButton.UpdateValue( 0.0 ); + } + // also the switch off button, in cabs which have it + if( Train->ggPantFrontButtonOff.GetValue() > 0.35 ) { + Train->play_sound( Train->dsbSwitch ); + } + if( Train->ggPantFrontButtonOff.SubModel ) { + Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); } } } @@ -1002,10 +1156,16 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & Train->mvControlled->PantRearSP = false; if( Train->mvControlled->PantRear( true ) ) { if( Train->mvControlled->PantRearStart != 1 ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback if( Train->ggPantRearButton.SubModel ) { Train->ggPantRearButton.UpdateValue( 1.0 ); } - Train->play_sound( Train->dsbSwitch ); + if( Train->ggPantRearButtonOff.SubModel != nullptr ) { + // pantograph control can have two-button setup + Train->ggPantRearButtonOff.UpdateValue( 0.0 ); + } } } } @@ -1014,44 +1174,52 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & Train->mvControlled->PantFrontSP = false; if( Train->mvControlled->PantFront( true ) ) { if( Train->mvControlled->PantFrontStart != 1 ) { - if( Train->ggPantFrontButton.SubModel ) { - Train->ggPantFrontButton.UpdateValue( 1.0 ); - } + // sound feedback Train->play_sound( Train->dsbSwitch ); + // visual feedback + if( Train->ggPantRearButton.SubModel ) { + Train->ggPantRearButton.UpdateValue( 1.0 ); + } + if( Train->ggPantRearButtonOff.SubModel != nullptr ) { + // pantograph control can have two-button setup + Train->ggPantRearButtonOff.UpdateValue( 0.0 ); + } } } } } else { // ...or turn off + if( ( Train->mvOccupied->PantSwitchType == "impulse" ) + && ( Train->ggPantRearButtonOff.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; + } + if( Train->mvOccupied->ActiveCab == 1 ) { // rear if in front cab Train->mvControlled->PantRearSP = false; if( false == Train->mvControlled->PantRear( false ) ) { - if( Train->mvControlled->PantRearStart != 0 ) { - if( Train->ggPantRearButton.SubModel ) { - Train->ggPantRearButton.UpdateValue( - ( Train->mvOccupied->PantSwitchType != "impulse" ? - 0.0 : - 1.0 ) ); - } - Train->play_sound( Train->dsbSwitch ); - } + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + Train->ggPantRearButton.UpdateValue( 0.0 ); + // pantograph control can have two-button setup + Train->ggPantRearButtonOff.UpdateValue( 1.0 ); } } else { // front otherwise Train->mvControlled->PantFrontSP = false; if( false == Train->mvControlled->PantFront( false ) ) { - if( Train->mvControlled->PantFrontStart != 0 ) { - if( Train->ggPantFrontButton.SubModel ) { - Train->ggPantFrontButton.UpdateValue( - ( Train->mvOccupied->PantSwitchType != "impulse" ? - 0.0 : - 1.0 ) ); - } - Train->play_sound( Train->dsbSwitch ); - } + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + Train->ggPantRearButton.UpdateValue( 0.0 ); + // pantograph control can have two-button setup + Train->ggPantRearButtonOff.UpdateValue( 1.0 ); } } } @@ -1059,29 +1227,61 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( Train->mvOccupied->ActiveCab == 1 ) { - // tylny gdy w kabinie 1 - if( Train->ggPantRearButton.GetValue() > 0.1 ) { - Train->play_sound( Train->dsbSwitch ); - } - if( Train->ggPantRearButton.SubModel ) { - Train->ggPantRearButton.UpdateValue( 0.0 ); - } - } - else { - // front otherwise - if( Train->ggPantFrontButton.GetValue() > 0.1 ) { - Train->play_sound( Train->dsbSwitch ); - } - if( Train->ggPantFrontButton.SubModel ) { - Train->ggPantFrontButton.UpdateValue( 0.0 ); - } + if( Train->ggPantRearButton.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); } + if( Train->ggPantRearButton.SubModel ) { + Train->ggPantRearButton.UpdateValue( 0.0 ); + } + // also the switch off button, in cabs which have it + if( Train->ggPantRearButtonOff.GetValue() > 0.35 ) { + Train->play_sound( Train->dsbSwitch ); + } + if( Train->ggPantRearButtonOff.SubModel ) { + Train->ggPantRearButtonOff.UpdateValue( 0.0 ); + } } } } +void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ) { + + if( Train->ggPantAllDownButton.SubModel == nullptr ) { + // TODO: expand definition of cab controls so we can know if the control is present without testing for presence of 3d switch + return; + } + if( Command.action == GLFW_PRESS ) { + // press the button + // since we're just lowering all potential pantographs we don't need to test for state and effect + // front... + Train->mvControlled->PantFrontSP = false; + Train->mvControlled->PantFront( false ); + // ...and rear + Train->mvControlled->PantRearSP = false; + Train->mvControlled->PantRear( false ); + // sound feedback + // TODO: separate sound effect for pneumatic buttons + if( Train->ggPantAllDownButton.GetValue() < 0.35 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggPantAllDownButton.UpdateValue( 1.0 ); + } + else if( Command.action == GLFW_RELEASE ) { + // release the button + // sound feedback +/* + // NOTE: release sound disabled as this is typically pneumatic button + // TODO: separate sound effect for pneumatic buttons + if( Train->ggPantAllDownButton.GetValue() > 0.65 ) { + Train->play_sound( Train->dsbSwitch ); + } +*/ + // visual feedback + Train->ggPantAllDownButton.UpdateValue( 0.0 ); + } +} + void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { // press or hold... @@ -1109,12 +1309,10 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } // keep track of period the button is held down, to determine when/if circuit closes Train->fMainRelayTimer += 0.33f; // Command.time_delta * 5.0; - // NOTE: this shouldn't be necessary, what exactly does it fix? if( Train->mvControlled->Mains != true ) { // hunter-080812: poprawka - // adjusted further to take into account state of the switch - Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); - Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); + Train->mvControlled->ConverterSwitch( false ); + Train->mvControlled->CompressorSwitch( false ); } if( Train->fMainRelayTimer > Train->mvControlled->InitialCtrlDelay ) { // wlaczanie WSa z opoznieniem @@ -1131,6 +1329,13 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // ...to open the circuit if( true == Train->m_linebreakerclosed ) { // safety check so we don't open the circuit right after closing + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( Train->mvControlled->TrainType == dt_EZT ) { + // a single impulse switch can't open the circuit, only close it + return; + } if( Train->mvControlled->MainSwitch( false ) ) { if( Train->ggMainOffButton.SubModel != nullptr ) { @@ -1144,6 +1349,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } else if( Train->ggMainButton.SubModel != nullptr ) { // single two-state switch +/* // NOTE: we don't have switch type definition for the line breaker switch // so for the time being we have hard coded "impulse" switches for all EMUs // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz @@ -1155,7 +1361,9 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // visual feedback Train->ggMainButton.UpdateValue( 1.0 ); } - else { + else +*/ + { // audio feedback if( Command.action == GLFW_PRESS ) { Train->play_sound( Train->dsbSwitch ); @@ -1164,9 +1372,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com Train->ggMainButton.UpdateValue( 0.0 ); } } - // side-effects - Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); - Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); } // play sound immediately when the switch is hit, not after release if( Train->fMainRelayTimer > 0.0f ) { @@ -1202,19 +1407,21 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } // and the two-state switch too, for good measure if( Train->ggMainButton.SubModel != nullptr ) { - Train->ggMainButton.UpdateValue( 0.0 ); - // NOTE: we don't have switch type definition for the line breaker switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( Train->mvControlled->TrainType == dt_EZT ) { - // audio feedback + // audio feedback + if( Train->ggMainButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } + // visual feedback + Train->ggMainButton.UpdateValue( 0.0 ); } Train->m_linebreakerclosed = false; } else { // ...after closing the circuit + // side-effects + Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); + Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); + // visual feedback if( Train->ggMainOnButton.SubModel != nullptr ) { // setup with two separate switches Train->ggMainOnButton.UpdateValue( 0.0 ); @@ -1224,9 +1431,12 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz if( Train->mvControlled->TrainType == dt_EZT ) { if( Train->ggMainButton.SubModel != nullptr ) { - Train->ggMainButton.UpdateValue( 0.0 ); // audio feedback - Train->play_sound( Train->dsbSwitch ); + if( Train->ggMainButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggMainButton.UpdateValue( 0.0 ); } } Train->m_linebreakerclosed = true; @@ -1238,7 +1448,8 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == Train->mvControlled->ConverterAllow ) { + if( ( false == Train->mvControlled->ConverterAllow ) + && ( Train->ggConverterButton.GetValue() < 0.5 ) ) { // turn on if( ( Train->mvControlled->EnginePowerSource.SourceType != CurrentCollector ) || ( Train->mvControlled->PantRearVolt != 0.0 ) @@ -1253,7 +1464,8 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway if( ( Train->mvOccupied->ConvSwitchType != "impulse" ) || ( Train->mvControlled->Mains ) ) { - if( true == Train->mvControlled->ConverterSwitch( true ) ) { + if( ( true == Train->m_linebreakerclosed ) // won't start if the line breaker button is still held + && ( true == Train->mvControlled->ConverterSwitch( true ) ) ) { // side effects // control the compressor, if it's paired with the converter if( Train->mvControlled->CompressorPower == 2 ) { @@ -1266,14 +1478,16 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } else { //turn off - if( true == Train->mvControlled->ConverterSwitch( false ) ) { - // sound feedback + // sound feedback + if( Train->ggConverterButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); - // visual feedback - Train->ggConverterButton.UpdateValue( 0.0 ); - if( Train->ggConverterOffButton.SubModel != nullptr ) { - Train->ggConverterOffButton.UpdateValue( 1.0 ); - } + } + // visual feedback + Train->ggConverterButton.UpdateValue( 0.0 ); + if( Train->ggConverterOffButton.SubModel != nullptr ) { + Train->ggConverterOffButton.UpdateValue( 1.0 ); + } + if( true == Train->mvControlled->ConverterSwitch( false ) ) { // side effects // control the compressor, if it's paired with the converter if( Train->mvControlled->CompressorPower == 2 ) { @@ -1284,6 +1498,11 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma && ( !TestFlag( Train->mvControlled->EngDmgFlag, 4 ) ) ) { Train->mvControlled->ConvOvldFlag = false; } + // if there's no (low voltage) power source left, drop pantographs + if( false == Train->mvControlled->Battery ) { + Train->mvControlled->PantFront( false ); + Train->mvControlled->PantRear( false ); + } } } } @@ -1768,6 +1987,42 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con } } +void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ) { + + if( Train->ggTrainHeatingButton.SubModel == nullptr ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->Heating ) { + // turn on + if( ( ( Train->mvControlled->EngineType == ElectricSeriesMotor ) + && ( Train->mvControlled->Mains == true ) ) + || ( Train->mvControlled->ConverterFlag ) ) { + + Train->mvControlled->Heating = true; + // audio feedback + if( Train->ggTrainHeatingButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggTrainHeatingButton.UpdateValue( 1.0 ); + } + } + else { + //turn off + Train->mvControlled->Heating = false; + // audio feedback + if( Train->ggTrainHeatingButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggTrainHeatingButton.UpdateValue( 0.0 ); + } + } +} + void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ) { if( Train->mvOccupied->DoorOpenCtrl != 1 ) { @@ -1890,6 +2145,72 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma } } +void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Command ) { + + if( Train->ggDepartureSignalButton.SubModel == nullptr ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the sound can loop uninterrupted + if( false == Train->mvControlled->DepartureSignal ) { + // turn on + Train->mvControlled->DepartureSignal = true; + // audio feedback + if( Train->ggDepartureSignalButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggDepartureSignalButton.UpdateValue( 1.0 ); + } + } + else if( Command.action == GLFW_RELEASE ) { + // turn off + Train->mvControlled->DepartureSignal = false; + // audio feedback + if( Train->ggDepartureSignalButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggDepartureSignalButton.UpdateValue( 0.0 ); + } +} + +void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ) { + + if( Train->ggDoorSignallingButton.SubModel == nullptr ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the sound can loop uninterrupted + if( false == Train->mvControlled->DoorSignalling ) { + // turn on + // TODO: check wheter we really need separate flags for this + Train->mvControlled->DoorSignalling = true; + Train->mvOccupied->DoorBlocked = true; + // audio feedback + if( Train->ggDoorSignallingButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggDoorSignallingButton.UpdateValue( 1.0 ); + } + else { + // turn off + // TODO: check wheter we really need separate flags for this + Train->mvControlled->DoorSignalling = false; + Train->mvOccupied->DoorBlocked = false; + // audio feedback + if( Train->ggDoorSignallingButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggDoorSignallingButton.UpdateValue( 0.0 ); + } + } +} + void TTrain::OnKeyDown(int cKey) { // naciśnięcie klawisza bool isEztOer; @@ -2014,7 +2335,8 @@ void TTrain::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_Sand]) { - if (mvControlled->TrainType == dt_EZT) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( mvControlled->TrainType == dt_EZT ) { if (ggDoorSignallingButton.SubModel != NULL) { @@ -2027,6 +2349,7 @@ void TTrain::OnKeyDown(int cKey) } } else if (mvControlled->TrainType != dt_EZT) +#endif { if (ggSandButton.SubModel != NULL) { @@ -2054,9 +2377,10 @@ void TTrain::OnKeyDown(int cKey) // hamowania { // yB://ABu: male poprawki, zeby bylo mozna ustawic dowolny wagon int CouplNr = -2; - if (!FreeFlyModeFlag) + if( !FreeFlyModeFlag ) { - if (Global::ctrlState) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( Global::ctrlState ) if (mvOccupied->BrakeDelaySwitch(bdelay_R + bdelay_M)) { play_sound( dsbPneumaticRelay ); @@ -2067,6 +2391,7 @@ void TTrain::OnKeyDown(int cKey) { play_sound( dsbPneumaticRelay ); } +#endif } else { @@ -2161,7 +2486,6 @@ void TTrain::OnKeyDown(int cKey) play_sound( dsbSwitch ); } } -#endif else if (cKey == Global::Keys[k_CurrentAutoRelay]) { // McZapkie-241002: G - wlaczanie PSR if (mvControlled->AutoRelaySwitch(true)) @@ -2169,7 +2493,8 @@ void TTrain::OnKeyDown(int cKey) play_sound( dsbSwitch ); } } - else if (cKey == Global::Keys[k_FailedEngineCutOff]) { +#endif + else if( cKey == Global::Keys[ k_FailedEngineCutOff ] ) { // McZapkie-060103: E - wylaczanie sekcji silnikow if (mvControlled->CutOffEngine()) { @@ -2305,7 +2630,6 @@ void TTrain::OnKeyDown(int cKey) } } } -#endif else if( cKey == Global::Keys[ k_Active ] ) // yB 300407: przelacznik rozrzadu { // Ra 2014-06: uruchomiłem to, aby aktywować czuwak w zajmowanym członie, // a wyłączyć w innych @@ -2320,7 +2644,7 @@ void TTrain::OnKeyDown(int cKey) // dsbSwitch->Play(0,0,0); // } } - else if (cKey == Global::Keys[k_Heating]) // Winger 020304: ogrzewanie + else if( cKey == Global::Keys[ k_Heating ] ) // Winger 020304: ogrzewanie // skladu - wlaczenie { // Ra 2014-09: w trybie latania obsługa jest w World.cpp if (!FreeFlyModeFlag) @@ -2335,7 +2659,6 @@ void TTrain::OnKeyDown(int cKey) } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if( cKey == Global::Keys[ k_LeftSign ] ) // lewe swiatlo - włączenie // ABu 060205: dzielo Wingera po malutkim liftingu: { @@ -3027,9 +3350,10 @@ void TTrain::OnKeyDown(int cKey) // bylo mozna ustawic dowolny // wagon int CouplNr = -2; - if (!FreeFlyModeFlag) + if( !FreeFlyModeFlag ) { - if (Global::ctrlState) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( Global::ctrlState ) if (mvOccupied->BrakeDelaySwitch(bdelay_R)) { play_sound( dsbPneumaticRelay ); @@ -3040,6 +3364,7 @@ void TTrain::OnKeyDown(int cKey) { play_sound( dsbPneumaticRelay ); } +#endif } else { @@ -3150,7 +3475,6 @@ void TTrain::OnKeyDown(int cKey) play_sound( dsbSwitch ); } } -#endif else if (cKey == Global::Keys[k_CurrentAutoRelay]) // McZapkie-241002: g - // wylaczanie PSR { @@ -3159,10 +3483,11 @@ void TTrain::OnKeyDown(int cKey) play_sound( dsbSwitch ); } } - +#endif // hunter-201211: piasecznica poprawiona oraz przeniesiona do // TTrain::Update() - else if (cKey == Global::Keys[k_Sand]) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if( cKey == Global::Keys[ k_Sand ] ) { /* if (mvControlled->TrainType!=dt_EZT) @@ -3188,6 +3513,7 @@ void TTrain::OnKeyDown(int cKey) } } } +#endif else if (cKey == Global::Keys[k_CabForward]) { if (!CabChange(1)) @@ -3505,7 +3831,6 @@ if } } } -#endif else if( cKey == Global::Keys[ k_Heating ] ) // Winger 020304: ogrzewanie - // wylaczenie { // Ra 2014-09: w trybie latania obsługa jest w World.cpp @@ -3518,7 +3843,6 @@ if } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_LeftSign]) // ABu 060205: lewe swiatlo - // wylaczenie { @@ -4850,10 +5174,16 @@ bool TTrain::Update( double const Deltatime ) // Winger 140404 - woltomierz NN if (ggLVoltage.SubModel) { - if (mvControlled->Battery == true) - ggLVoltage.UpdateValue(mvControlled->BatteryVoltage); - else - ggLVoltage.UpdateValue(0); + // NOTE: since we don't have functional converter object, we're faking it here by simple check whether converter is on + // TODO: implement object-based circuits and power systems model so we can have this working more properly + ggLVoltage.UpdateValue( + std::max( + ( mvControlled->ConverterFlag ? + mvControlled->NominalBatteryVoltage : + 0.0 ), + ( mvControlled->Battery ? + mvControlled->BatteryVoltage : + 0.0 ) ) ); ggLVoltage.Update(); } @@ -4959,11 +5289,21 @@ bool TTrain::Update( double const Deltatime ) btLampkaNadmSil.TurnOff(); } - if (mvControlled->Mains) + if (mvControlled->Battery || mvControlled->ConverterFlag) { - btLampkaWylSzybki.TurnOn(); - btLampkaOpory.Turn(mvControlled->StLinFlag ? mvControlled->ResistorsFlagCheck() : - false); + btLampkaWylSzybki.Turn( mvControlled->Mains ); + + // hunter-261211: jakis stary kod (i niezgodny z prawda), + // zahaszowalem i poprawilem + // youBy-220913: ale przyda sie do lampki samej przetwornicy + btLampkaPrzetw.Turn( !mvControlled->ConverterFlag ); + btLampkaNadmPrzetw.Turn( mvControlled->ConvOvldFlag ); + + btLampkaOpory.Turn( + mvControlled->StLinFlag ? + mvControlled->ResistorsFlagCheck() : + false ); + btLampkaBezoporowa.Turn(mvControlled->ResistorsFlagCheck() || (mvControlled->MainCtrlActualPos == 0)); // do EU04 if ((mvControlled->Itot != 0) || (mvOccupied->BrakePress > 2) || @@ -4981,24 +5321,12 @@ bool TTrain::Update( double const Deltatime ) btLampkaUkrotnienie.TurnOff(); // if - // ((TestFlag(mvControlled->BrakeStatus,+b_Rused+b_Ractive)))//Lampka - // drugiego stopnia hamowania - btLampkaHamPosp.Turn((TestFlag(mvOccupied->BrakeStatus, 1))); // lampka drugiego stopnia - // hamowania //TODO: youBy - // wyciągnąć flagę wysokiego - // stopnia - - // hunter-111211: wylacznik cisnieniowy - Ra: tutaj? w kabinie? //yBARC - - // omujborzegrzesiuzniszczylesmicalydzien - // if (mvControlled->TrainType!=dt_EZT) - // if (((mvOccupied->BrakePress > 2) || ( mvOccupied->PipePress < - // 3.6 )) && ( mvControlled->MainCtrlPos != 0 )) - // mvControlled->StLinFlag=true; - //------- + // ((TestFlag(mvControlled->BrakeStatus,+b_Rused+b_Ractive)))//Lampka drugiego stopnia hamowania + btLampkaHamPosp.Turn((TestFlag(mvOccupied->BrakeStatus, 1))); // lampka drugiego stopnia hamowania + //TODO: youBy wyciągnąć flagę wysokiego stopnia // hunter-121211: lampka zanikowo-pradowego wentylatorow: - btLampkaNadmWent.Turn((mvControlled->RventRot < 5.0) && - mvControlled->ResistorsFlagCheck()); + btLampkaNadmWent.Turn( ( mvControlled->RventRot < 5.0 ) && ( mvControlled->ResistorsFlagCheck() ) ); //------- btLampkaWysRozr.Turn(!(mvControlled->Imax < mvControlled->ImaxHi)); @@ -5050,12 +5378,14 @@ bool TTrain::Update( double const Deltatime ) else // wylaczone { btLampkaWylSzybki.TurnOff(); + btLampkaWysRozr.TurnOff(); btLampkaOpory.TurnOff(); btLampkaStyczn.TurnOff(); btLampkaUkrotnienie.TurnOff(); btLampkaHamPosp.TurnOff(); btLampkaBoczniki.TurnOff(); btLampkaNapNastHam.TurnOff(); + btLampkaPrzetw.TurnOff(); btLampkaSprezarka.TurnOff(); btLampkaBezoporowa.TurnOff(); } @@ -5167,7 +5497,7 @@ bool TTrain::Update( double const Deltatime ) // btLampkaNadmPrzetwB.TurnOn(); } //**************************************************** */ - if (mvControlled->Battery) + if( mvControlled->Battery || mvControlled->ConverterFlag ) { switch (mvControlled->TrainType) { // zależnie od typu lokomotywy @@ -5191,8 +5521,8 @@ bool TTrain::Update( double const Deltatime ) // NBMX wrzesien 2003 - drzwi oraz sygnał odjazdu btLampkaDoorLeft.Turn(mvOccupied->DoorLeftOpened); btLampkaDoorRight.Turn(mvOccupied->DoorRightOpened); - btLampkaNapNastHam.Turn((mvControlled->ActiveDir != 0) && - (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym + btLampkaDepartureSignal.Turn( mvControlled->DepartureSignal ); + btLampkaNapNastHam.Turn((mvControlled->ActiveDir != 0) && (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym btLampkaForward.Turn(mvControlled->ActiveDir > 0); // jazda do przodu btLampkaBackward.Turn(mvControlled->ActiveDir < 0); // jazda do tyłu btLampkaED.Turn(mvControlled->DynamicBrakeFlag); // hamulec ED @@ -5206,6 +5536,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaHamulecReczny.TurnOff(); btLampkaDoorLeft.TurnOff(); btLampkaDoorRight.TurnOff(); + btLampkaDepartureSignal.TurnOff(); btLampkaNapNastHam.TurnOff(); btLampkaForward.TurnOff(); btLampkaBackward.TurnOff(); @@ -5312,18 +5643,24 @@ bool TTrain::Update( double const Deltatime ) } if (ggBrakeProfileCtrl.SubModel) { +#ifdef EU07_USE_OLD_COMMAND_SYSTEM ggBrakeProfileCtrl.UpdateValue( double(mvOccupied->BrakeDelayFlag == 4 ? 2 : mvOccupied->BrakeDelayFlag - 1)); +#endif ggBrakeProfileCtrl.Update(); } if (ggBrakeProfileG.SubModel) { - ggBrakeProfileG.UpdateValue(double(mvOccupied->BrakeDelayFlag == bdelay_G ? 1 : 0)); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + ggBrakeProfileG.UpdateValue( double( mvOccupied->BrakeDelayFlag == bdelay_G ? 1 : 0 ) ); +#endif ggBrakeProfileG.Update(); } if (ggBrakeProfileR.SubModel) { - ggBrakeProfileR.UpdateValue(double(mvOccupied->BrakeDelayFlag == bdelay_R ? 1 : 0)); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + ggBrakeProfileR.UpdateValue( double( mvOccupied->BrakeDelayFlag == bdelay_R ? 1 : 0 ) ); +#endif ggBrakeProfileR.Update(); } @@ -5539,9 +5876,10 @@ bool TTrain::Update( double const Deltatime ) // Winger 020304 - ogrzewanie //---------- // hunter-080812: poprawka na ogrzewanie w elektrykach - usuniete uzaleznienie od przetwornicy - if (ggTrainHeatingButton.SubModel) + if( ggTrainHeatingButton.SubModel ) { - if (mvControlled->Heating) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( mvControlled->Heating ) { ggTrainHeatingButton.PutValue(1); // if (mvControlled->ConverterFlag==true) @@ -5552,16 +5890,19 @@ bool TTrain::Update( double const Deltatime ) ggTrainHeatingButton.PutValue(0); // btLampkaOgrzewanieSkladu.TurnOff(); } +#endif ggTrainHeatingButton.Update(); } - if (ggSignallingButton.SubModel != NULL) + if (ggSignallingButton.SubModel != nullptr) { ggSignallingButton.PutValue(mvControlled->Signalling ? 1 : 0); ggSignallingButton.Update(); } - if (ggDoorSignallingButton.SubModel != NULL) + if (ggDoorSignallingButton.SubModel != nullptr) { - ggDoorSignallingButton.PutValue(mvControlled->DoorSignalling ? 1 : 0); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + ggDoorSignallingButton.PutValue( mvControlled->DoorSignalling ? 1 : 0 ); +#endif ggDoorSignallingButton.Update(); } // if (ggDistCounter.SubModel) @@ -5578,12 +5919,6 @@ bool TTrain::Update( double const Deltatime ) btLampkaOgrzewanieSkladu.TurnOff(); //---------- - // hunter-261211: jakis stary kod (i niezgodny z prawda), - // zahaszowalem i poprawilem - // youBy-220913: ale przyda sie do lampki samej przetwornicy - btLampkaPrzetw.Turn(!mvControlled->ConverterFlag); - btLampkaNadmPrzetw.Turn(mvControlled->ConvOvldFlag); - //---------- // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa if (mvOccupied->SecuritySystem.Status > 0) @@ -6262,6 +6597,7 @@ bool TTrain::Update( double const Deltatime ) } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (Console::Pressed(Global::Keys[k_DepartureSignal])) { ggDepartureSignalButton.PutValue(1); @@ -6275,7 +6611,6 @@ bool TTrain::Update( double const Deltatime ) if (!DynamicObject->Mechanik->AIControllFlag) // tylko jeśli nie prowadzi AI mvControlled->DepartureSignal = false; } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (Console::Pressed(Global::Keys[k_Main])) //[] { if (Global::shiftState) @@ -6300,6 +6635,7 @@ bool TTrain::Update( double const Deltatime ) } } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else { if (Global::shiftState) @@ -6326,6 +6662,7 @@ bool TTrain::Update( double const Deltatime ) } } } +#endif } else { @@ -6474,8 +6811,10 @@ bool TTrain::Update( double const Deltatime ) #endif ggSandButton.UpdateValue(0); ggAntiSlipButton.UpdateValue(0); - ggDepartureSignalButton.UpdateValue(0); - ggFuseButton.UpdateValue(0); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + ggDepartureSignalButton.UpdateValue( 0 ); +#endif + ggFuseButton.UpdateValue( 0 ); ggConverterFuseButton.UpdateValue(0); pyScreens.update(); @@ -7352,7 +7691,13 @@ void TTrain::set_cab_controls() { mvControlled->PantRearUp ) ? 1.0 : 0.0 ); - } + ggPantFrontButtonOff.PutValue( + ( mvOccupied->ActiveCab == 1 ? + mvControlled->PantFrontUp : + mvControlled->PantRearUp ) ? + 0.0 : + 1.0 ); + } if( mvOccupied->PantSwitchType != "impulse" ) { ggPantRearButton.PutValue( @@ -7361,7 +7706,13 @@ void TTrain::set_cab_controls() { mvControlled->PantFrontUp ) ? 1.0 : 0.0 ); - } + ggPantRearButtonOff.PutValue( + ( mvOccupied->ActiveCab == 1 ? + mvControlled->PantRearUp : + mvControlled->PantFrontUp ) ? + 0.0 : + 1.0 ); + } // converter if( mvOccupied->ConvSwitchType != "impulse" ) { @@ -7384,8 +7735,8 @@ void TTrain::set_cab_controls() { // lights int const lightsindex = ( mvOccupied->ActiveCab == 1 ? - 0 : - 1 ); + 0 : + 1 ); if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_left ) != 0 ) { ggLeftLightButton.PutValue( 1.0 ); @@ -7405,8 +7756,42 @@ void TTrain::set_cab_controls() { // doors // NOTE: we're relying on the cab models to have switches reversed for the rear cab(?) - ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1.0 : 0.0 ); + ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1.0 : 0.0 ); ggDoorRightButton.PutValue( mvOccupied->DoorRightOpened ? 1.0 : 0.0 ); + // door lock + if( true == mvControlled->DoorSignalling ) { + ggDoorSignallingButton.PutValue( 1.0 ); + } + + // heating + if( true == mvControlled->Heating ) { + ggTrainHeatingButton.PutValue( 1.0 ); + } + + // brake acting time + // visual feedback + if( ggBrakeProfileCtrl.SubModel != nullptr ) { + ggBrakeProfileCtrl.PutValue( + ( ( mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 2.0 : + mvOccupied->BrakeDelayFlag - 1 ) ); + } + if( ggBrakeProfileG.SubModel != nullptr ) { + ggBrakeProfileG.PutValue( + mvOccupied->BrakeDelayFlag == bdelay_G ? + 1.0 : + 0.0 ); + } + if( ggBrakeProfileR.SubModel != nullptr ) { + ggBrakeProfileR.PutValue( + ( mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 1.0 : + 0.0 ); + } + + // we reset all indicators, as they're set during the update pass + // TODO: when cleaning up break setting indicator state into a separate function, so we can reuse it + } // initializes a button matching provided label. returns: true if the label was found, false @@ -7882,12 +8267,16 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con // patyk tylny ggPantRearButton.Load(Parser, DynamicObject->mdKabina); } - else if (Label == "pantfrontoff_sw:") + else if( Label == "pantfrontoff_sw:" ) { // patyk przedni w dol ggPantFrontButtonOff.Load(Parser, DynamicObject->mdKabina); } - else if (Label == "pantalloff_sw:") + else if( Label == "pantrearoff_sw:" ) { + // patyk przedni w dol + ggPantRearButtonOff.Load( Parser, DynamicObject->mdKabina ); + } + else if( Label == "pantalloff_sw:" ) { // patyk przedni w dol ggPantAllDownButton.Load(Parser, DynamicObject->mdKabina); diff --git a/Train.h b/Train.h index 5c5b7be1..3bca0aaf 100644 --- a/Train.h +++ b/Train.h @@ -119,6 +119,7 @@ class TTrain static void OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_secondcontrollerdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakeincrease( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakeincreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakedecrease( TTrain *Train, command_data const &Command ); @@ -132,16 +133,21 @@ class TTrain static void OnCommand_trainbrakeservice( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakefullservice( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakeemergency( TTrain *Train, command_data const &Command ); + static void OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data const &Command ); static void OnCommand_reverserincrease( TTrain *Train, command_data const &Command ); static void OnCommand_reverserdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_alerteracknowledge( TTrain *Train, command_data const &Command ); static void OnCommand_batterytoggle( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglefront( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglerear( TTrain *Train, command_data const &Command ); + static void OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_compressortoggle( TTrain *Train, command_data const &Command ); static void OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleright( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleupper( TTrain *Train, command_data const &Command ); @@ -154,6 +160,8 @@ class TTrain static void OnCommand_redmarkertogglerearright( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleright( TTrain *Train, command_data const &Command ); + static void OnCommand_departureannounce( TTrain *Train, command_data const &Command ); + static void OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ); // members TDynamicObject *DynamicObject; // przestawia zmiana pojazdu [F5] @@ -258,6 +266,7 @@ public: // reszta może by?publiczna TGauge ggPantFrontButton; TGauge ggPantRearButton; TGauge ggPantFrontButtonOff; // EZT + TGauge ggPantRearButtonOff; TGauge ggPantAllDownButton; // Winger 020304 - wlacznik ogrzewania TGauge ggTrainHeatingButton; diff --git a/command.cpp b/command.cpp index 576580e7..e228ed5f 100644 --- a/command.cpp +++ b/command.cpp @@ -17,6 +17,116 @@ http://mozilla.org/MPL/2.0/. namespace simulation { command_queue Commands; +commanddescription_sequence Commands_descriptions = { + + { "mastercontrollerincrease", command_target::vehicle }, + { "mastercontrollerincreasefast", command_target::vehicle }, + { "mastercontrollerdecrease", command_target::vehicle }, + { "mastercontrollerdecreasefast", command_target::vehicle }, + { "secondcontrollerincrease", command_target::vehicle }, + { "secondcontrollerincreasefast", command_target::vehicle }, + { "secondcontrollerdecrease", command_target::vehicle }, + { "secondcontrollerdecreasefast", command_target::vehicle }, + { "independentbrakeincrease", command_target::vehicle }, + { "independentbrakeincreasefast", command_target::vehicle }, + { "independentbrakedecrease", command_target::vehicle }, + { "independentbrakedecreasefast", command_target::vehicle }, + { "independentbrakebailoff", command_target::vehicle }, + { "trainbrakeincrease", command_target::vehicle }, + { "trainbrakedecrease", command_target::vehicle }, + { "trainbrakecharging", command_target::vehicle }, + { "trainbrakerelease", command_target::vehicle }, + { "trainbrakefirstservice", command_target::vehicle }, + { "trainbrakeservice", command_target::vehicle }, + { "trainbrakefullservice", command_target::vehicle }, + { "trainbrakeemergency", command_target::vehicle }, +/* +const int k_AntiSlipping = 21; +const int k_Sand = 22; +*/ + { "reverserincrease", command_target::vehicle }, + { "reverserdecrease", command_target::vehicle }, + { "linebreakertoggle", command_target::vehicle }, +/* +const int k_Fuse = 26; +*/ + { "convertertoggle", command_target::vehicle }, + { "compressortoggle", command_target::vehicle }, + { "motoroverloadrelaythresholdtoggle", command_target::vehicle }, + { "notchingrelaytoggle", command_target::vehicle }, + { "epbrakecontroltoggle", command_target::vehicle }, + { "brakeactingspeedincrease", command_target::vehicle }, + { "brakeactingspeeddecrease", command_target::vehicle }, +/* +const int k_BrakeProfile = 31; +*/ + { "alerteracknowledge", command_target::vehicle }, +/* +const int k_Horn = 33; +const int k_Horn2 = 34; +const int k_FailedEngineCutOff = 35; +*/ + { "viewturn", command_target::entity }, + { "movevector", command_target::entity }, + { "moveleft", command_target::entity }, + { "moveright", command_target::entity }, + { "moveforward", command_target::entity }, + { "moveback", command_target::entity }, + { "moveup", command_target::entity }, + { "movedown", command_target::entity }, + { "moveleftfast", command_target::entity }, + { "moverightfast", command_target::entity }, + { "moveforwardfast", command_target::entity }, + { "movebackfast", command_target::entity }, + { "moveupfast", command_target::entity }, + { "movedownfast", command_target::entity }, +/* +const int k_CabForward = 42; +const int k_CabBackward = 43; +const int k_Couple = 44; +const int k_DeCouple = 45; +const int k_ProgramQuit = 46; +// const int k_ProgramPause= 47; +const int k_ProgramHelp = 48; +*/ + { "doortoggleleft", command_target::vehicle }, + { "doortoggleright", command_target::vehicle }, + { "departureannounce", command_target::vehicle }, + { "doorlocktoggle", command_target::vehicle }, + { "pantographtogglefront", command_target::vehicle }, + { "pantographtogglerear", command_target::vehicle }, + { "pantographlowerall", command_target::vehicle }, + { "heatingtoggle", command_target::vehicle }, +/* +// const int k_FreeFlyMode= 59; +*/ + { "headlighttoggleleft", command_target::vehicle }, + { "headlighttoggleright", command_target::vehicle }, + { "headlighttoggleupper", command_target::vehicle }, + { "redmarkertoggleleft", command_target::vehicle }, + { "redmarkertoggleright", command_target::vehicle }, + { "headlighttogglerearleft", command_target::vehicle }, + { "headlighttogglerearright", command_target::vehicle }, + { "headlighttogglerearupper", command_target::vehicle }, + { "redmarkertogglerearleft", command_target::vehicle }, + { "redmarkertogglerearright", command_target::vehicle }, +/* +const int k_SmallCompressor = 63; +const int k_StLinOff = 64; +const int k_CurrentNext = 65; +const int k_Univ1 = 66; +const int k_Univ2 = 67; +const int k_Univ3 = 68; +const int k_Univ4 = 69; +const int k_EndSign = 70; +const int k_Active = 71; +*/ + { "batterytoggle", command_target::vehicle } +/* +const int k_WalkMode = 73; +int const k_DimHeadlights = 74; +*/ +}; } @@ -50,242 +160,15 @@ command_queue::pop( command_data &Command, std::size_t const Recipient ) { return true; } -command_relay::command_relay() { - - m_targets = commandtarget_map{ - - { user_command::mastercontrollerincrease, command_target::vehicle }, - { user_command::mastercontrollerincreasefast, command_target::vehicle }, - { user_command::mastercontrollerdecrease, command_target::vehicle }, - { user_command::mastercontrollerdecreasefast, command_target::vehicle }, - { user_command::secondcontrollerincrease, command_target::vehicle }, - { user_command::secondcontrollerincreasefast, command_target::vehicle }, - { user_command::secondcontrollerdecrease, command_target::vehicle }, - { user_command::secondcontrollerdecreasefast, command_target::vehicle }, - { user_command::independentbrakeincrease, command_target::vehicle }, - { user_command::independentbrakeincreasefast, command_target::vehicle }, - { user_command::independentbrakedecrease, command_target::vehicle }, - { user_command::independentbrakedecreasefast, command_target::vehicle }, - { user_command::independentbrakebailoff, command_target::vehicle }, - { user_command::trainbrakeincrease, command_target::vehicle }, - { user_command::trainbrakedecrease, command_target::vehicle }, - { user_command::trainbrakecharging, command_target::vehicle }, - { user_command::trainbrakerelease, command_target::vehicle }, - { user_command::trainbrakefirstservice, command_target::vehicle }, - { user_command::trainbrakeservice, command_target::vehicle }, - { user_command::trainbrakefullservice, command_target::vehicle }, - { user_command::trainbrakeemergency, command_target::vehicle }, -/* -const int k_AntiSlipping = 21; -const int k_Sand = 22; -*/ - { user_command::reverserincrease, command_target::vehicle }, - { user_command::reverserdecrease, command_target::vehicle }, - { user_command::linebreakertoggle, command_target::vehicle }, -/* -const int k_Fuse = 26; -*/ - { user_command::convertertoggle, command_target::vehicle }, - { user_command::compressortoggle, command_target::vehicle }, - { user_command::motoroverloadrelaythresholdtoggle, command_target::vehicle }, -/* -const int k_CurrentAutoRelay = 30; -const int k_BrakeProfile = 31; -*/ - { user_command::alerteracknowledge, command_target::vehicle }, -/* -const int k_Czuwak = 32; -const int k_Horn = 33; -const int k_Horn2 = 34; -const int k_FailedEngineCutOff = 35; -*/ - { user_command::viewturn, command_target::entity }, - { user_command::movevector, command_target::entity }, - { user_command::moveleft, command_target::entity }, - { user_command::moveright, command_target::entity }, - { user_command::moveforward, command_target::entity }, - { user_command::moveback, command_target::entity }, - { user_command::moveup, command_target::entity }, - { user_command::movedown, command_target::entity }, - { user_command::moveleftfast, command_target::entity }, - { user_command::moverightfast, command_target::entity }, - { user_command::moveforwardfast, command_target::entity }, - { user_command::movebackfast, command_target::entity }, - { user_command::moveupfast, command_target::entity }, - { user_command::movedownfast, command_target::entity }, -/* -const int k_CabForward = 42; -const int k_CabBackward = 43; -const int k_Couple = 44; -const int k_DeCouple = 45; -const int k_ProgramQuit = 46; -// const int k_ProgramPause= 47; -const int k_ProgramHelp = 48; -*/ - { user_command::doortoggleleft, command_target::vehicle }, - { user_command::doortoggleright, command_target::vehicle }, -/* -const int k_DepartureSignal = 53; -*/ - { user_command::pantographtogglefront, command_target::vehicle }, - { user_command::pantographtogglerear, command_target::vehicle }, -/* -const int k_Heating = 58; -// const int k_FreeFlyMode= 59; -*/ - { user_command::headlighttoggleleft, command_target::vehicle }, - { user_command::headlighttoggleright, command_target::vehicle }, - { user_command::headlighttoggleupper, command_target::vehicle }, - { user_command::redmarkertoggleleft, command_target::vehicle }, - { user_command::redmarkertoggleright, command_target::vehicle }, - { user_command::headlighttogglerearleft, command_target::vehicle }, - { user_command::headlighttogglerearright, command_target::vehicle }, - { user_command::headlighttogglerearupper, command_target::vehicle }, - { user_command::redmarkertogglerearleft, command_target::vehicle }, - { user_command::redmarkertogglerearright, command_target::vehicle }, -/* -const int k_SmallCompressor = 63; -const int k_StLinOff = 64; -const int k_CurrentNext = 65; -const int k_Univ1 = 66; -const int k_Univ2 = 67; -const int k_Univ3 = 68; -const int k_Univ4 = 69; -const int k_EndSign = 70; -const int k_Active = 71; -*/ - { user_command::batterytoggle, command_target::vehicle } -/* -const int k_WalkMode = 73; -int const k_DimHeadlights = 74; -*/ - }; - -#ifdef _DEBUG - m_commandnames = { - - "mastercontrollerincrease", - "mastercontrollerincreasefast", - "mastercontrollerdecrease", - "mastercontrollerdecreasefast", - "secondcontrollerincrease", - "secondcontrollerincreasefast", - "secondcontrollerdecrease", - "secondcontrollerdecreasefast", - "independentbrakeincrease", - "independentbrakeincreasefast", - "independentbrakedecrease", - "independentbrakedecreasefast", - "independentbrakebailoff", - "trainbrakeincrease", - "trainbrakedecrease", - "trainbrakecharging", - "trainbrakerelease", - "trainbrakefirstservice", - "trainbrakeservice", - "trainbrakefullservice", - "trainbrakeemergency", -/* -const int k_AntiSlipping = 21; -const int k_Sand = 22; -*/ - "reverserincrease", - "reverserdecrease", - "linebreakertoggle", -/* -const int k_Fuse = 26; -*/ - "convertertoggle", - "compressortoggle", - "motoroverloadrelaythresholdtoggle", -/* -const int k_MaxCurrent = 29; -const int k_CurrentAutoRelay = 30; -const int k_BrakeProfile = 31; -*/ - "alerteracknowledge", -/* -const int k_Czuwak = 32; -const int k_Horn = 33; -const int k_Horn2 = 34; -const int k_FailedEngineCutOff = 35; -*/ - "", //"viewturn", - "", //"movevector", - "", //"moveleft", - "", //"moveright", - "", //"moveforward", - "", //"moveback", - "", //"moveup", - "", //"movedown", - "", //"moveleftfast", - "", //"moverightfast", - "", //"moveforwardfast", - "", //"movebackfast", - "", //"moveupfast", - "", //"movedownfast" -/* -const int k_CabForward = 42; -const int k_CabBackward = 43; -const int k_Couple = 44; -const int k_DeCouple = 45; -const int k_ProgramQuit = 46; -// const int k_ProgramPause= 47; -const int k_ProgramHelp = 48; -*/ - "doortoggleleft", - "doortoggleright", -/* -const int k_DepartureSignal = 53; -*/ - "pantographtogglefront", - "pantographtogglerear", -/* -const int k_Heating = 58; -// const int k_FreeFlyMode= 59; -*/ - "headlighttoggleleft", - "headlighttoggleright", - "headlighttoggleupper", - "redmarkertoggleleft", - "redmarkertoggleright", - "headlighttogglerearleft", - "headlighttogglerearright", - "headlighttogglerearupper", - "redmarkertogglerearleft", - "redmarkertogglerearright", -/* -const int k_SmallCompressor = 63; -const int k_StLinOff = 64; -const int k_CurrentNext = 65; -const int k_Univ1 = 66; -const int k_Univ2 = 67; -const int k_Univ3 = 68; -const int k_Univ4 = 69; -const int k_EndSign = 70; -const int k_Active = 71; -*/ - "batterytoggle" -/* -const int k_WalkMode = 73; -int const k_DimHeadlights = 74; -*/ - }; -#endif -} - void command_relay::post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, std::uint16_t const Recipient ) const { - auto const &lookup = m_targets.find( Command ); - if( lookup == m_targets.end() ) { - // shouldn't be really needed but, eh - return; - } - if( ( lookup->second == command_target::vehicle ) + auto const &command = simulation::Commands_descriptions[ static_cast( Command ) ]; + if( ( command.target == command_target::vehicle ) && ( true == FreeFlyModeFlag ) - && ( false == DebugModeFlag ) ) { - // don't pass vehicle commands if the user isn't in one, unless we're in debug mode + && ( ( false == DebugModeFlag ) + && ( true == Global::RealisticControlMode ) ) ) { + // in realistic control mode don't pass vehicle commands if the user isn't in one, unless we're in debug mode return; } @@ -296,20 +179,19 @@ command_relay::post( user_command const Command, std::uint64_t const Param1, std Param1, Param2, Timer::GetDeltaTime() }, - static_cast( lookup->second ) | Recipient ); + static_cast( command.target ) | Recipient ); #ifdef _DEBUG if( Action != GLFW_RELEASE ) { // key was pressed or is still held - auto const &commandname = m_commandnames.at( static_cast( Command ) ); - if( false == commandname.empty() ) { - WriteLog( "Command issued: " + commandname ); + if( false == command.name.empty() ) { + WriteLog( "Command issued: " + command.name ); } } /* else { // key was released (but we don't log this) - WriteLog( "Key released: " + m_commandnames.at( static_cast( Command ) ) ); + WriteLog( "Key released: " + m_command.name ); } */ #endif diff --git a/command.h b/command.h index 6a92b86d..a6b9d7ea 100644 --- a/command.h +++ b/command.h @@ -48,11 +48,10 @@ const int k_Fuse = 26; convertertoggle, compressortoggle, motoroverloadrelaythresholdtoggle, -/* -const int k_MaxCurrent = 29; -const int k_CurrentAutoRelay = 30; -const int k_BrakeProfile = 31; -*/ + notchingrelaytoggle, + epbrakecontroltoggle, + brakeactingspeedincrease, + brakeactingspeeddecrease, alerteracknowledge, /* const int k_Horn = 33; @@ -84,13 +83,13 @@ const int k_ProgramHelp = 48; */ doortoggleleft, doortoggleright, -/* -const int k_DepartureSignal = 53; -*/ + departureannounce, + doorlocktoggle, pantographtogglefront, pantographtogglerear, + pantographlowerall, + heatingtoggle, /* -const int k_Heating = 58; // const int k_FreeFlyMode= 59; */ headlighttoggleleft, @@ -103,7 +102,7 @@ const int k_Heating = 58; headlighttogglerearupper, redmarkertogglerearleft, redmarkertogglerearright, - /* +/* const int k_SmallCompressor = 63; const int k_StLinOff = 64; const int k_CurrentNext = 65; @@ -137,6 +136,14 @@ enum class command_target { entity = 0x40000 }; +struct command_description { + + std::string name; + command_target target; +}; + +typedef std::vector commanddescription_sequence; + struct command_data { user_command command; @@ -175,6 +182,8 @@ private: namespace simulation { extern command_queue Commands; +// TODO: add name to command map, and wrap these two into helper object +extern commanddescription_sequence Commands_descriptions; } @@ -184,7 +193,6 @@ class command_relay { public: // constructors - command_relay(); // methods // posts specified command for the specified recipient // TODO: replace uint16_t with recipient handle, based on item id @@ -192,12 +200,7 @@ public: post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, std::uint16_t const Recipient ) const; private: // types - typedef std::unordered_map commandtarget_map; // members - commandtarget_map m_targets; -#ifdef _DEBUG - std::vector m_commandnames; -#endif }; //--------------------------------------------------------------------------- diff --git a/keyboardinput.cpp b/keyboardinput.cpp index a2c148eb..d455bf00 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -92,65 +92,113 @@ void keyboard_input::default_bindings() { m_commands = { - - { "mastercontrollerincrease", command_target::vehicle, GLFW_KEY_KP_ADD }, - { "mastercontrollerincreasefast", command_target::vehicle, GLFW_KEY_KP_ADD | keymodifier::shift }, - { "mastercontrollerdecrease", command_target::vehicle, GLFW_KEY_KP_SUBTRACT }, - { "mastercontrollerdecreasefast", command_target::vehicle, GLFW_KEY_KP_SUBTRACT | keymodifier::shift }, - { "secondcontrollerincrease", command_target::vehicle, GLFW_KEY_KP_DIVIDE }, - { "secondcontrollerincreasefast", command_target::vehicle, GLFW_KEY_KP_DIVIDE | keymodifier::shift }, - { "secondcontrollerdecrease", command_target::vehicle, GLFW_KEY_KP_MULTIPLY }, - { "secondcontrollerdecreasefast", command_target::vehicle, GLFW_KEY_KP_MULTIPLY | keymodifier::shift }, - { "independentbrakeincrease", command_target::vehicle, GLFW_KEY_KP_1 }, - { "independentbrakeincreasefast", command_target::vehicle, GLFW_KEY_KP_1 | keymodifier::shift }, - { "independentbrakedecrease", command_target::vehicle, GLFW_KEY_KP_7 }, - { "independentbrakedecreasefast", command_target::vehicle, GLFW_KEY_KP_7 | keymodifier::shift }, - { "independentbrakebailoff", command_target::vehicle, GLFW_KEY_KP_4 }, - { "trainbrakeincrease", command_target::vehicle, GLFW_KEY_KP_3 }, - { "trainbrakedecrease", command_target::vehicle, GLFW_KEY_KP_9 }, - { "trainbrakecharging", command_target::vehicle, GLFW_KEY_KP_DECIMAL }, - { "trainbrakerelease", command_target::vehicle, GLFW_KEY_KP_6 }, - { "trainbrakefirstservice", command_target::vehicle, GLFW_KEY_KP_8 }, - { "trainbrakeservice", command_target::vehicle, GLFW_KEY_KP_5 }, - { "trainbrakefullservice", command_target::vehicle, GLFW_KEY_KP_2 }, - { "trainbrakeemergency", command_target::vehicle, GLFW_KEY_KP_0 }, + //"mastercontrollerincrease" + { GLFW_KEY_KP_ADD }, + //"mastercontrollerincreasefast" + { GLFW_KEY_KP_ADD | keymodifier::shift }, + // "mastercontrollerdecrease" + { GLFW_KEY_KP_SUBTRACT }, + // "mastercontrollerdecreasefast" + { GLFW_KEY_KP_SUBTRACT | keymodifier::shift }, + // "secondcontrollerincrease" + { GLFW_KEY_KP_DIVIDE }, + // "secondcontrollerincreasefast" + { GLFW_KEY_KP_DIVIDE | keymodifier::shift }, + // "secondcontrollerdecrease" + { GLFW_KEY_KP_MULTIPLY }, + // "secondcontrollerdecreasefast" + { GLFW_KEY_KP_MULTIPLY | keymodifier::shift }, + // "independentbrakeincrease" + { GLFW_KEY_KP_1 }, + // "independentbrakeincreasefast" + { GLFW_KEY_KP_1 | keymodifier::shift }, + // "independentbrakedecrease" + { GLFW_KEY_KP_7 }, + // "independentbrakedecreasefast" + { GLFW_KEY_KP_7 | keymodifier::shift }, + // "independentbrakebailoff" + { GLFW_KEY_KP_4 }, + // "trainbrakeincrease" + { GLFW_KEY_KP_3 }, + // "trainbrakedecrease" + { GLFW_KEY_KP_9 }, + // "trainbrakecharging" + { GLFW_KEY_KP_DECIMAL }, + // "trainbrakerelease" + { GLFW_KEY_KP_6 }, + // "trainbrakefirstservice" + { GLFW_KEY_KP_8 }, + // "trainbrakeservice" + { GLFW_KEY_KP_5 }, + // "trainbrakefullservice" + { GLFW_KEY_KP_2 }, + // "trainbrakeemergency" + { GLFW_KEY_KP_0 }, /* const int k_AntiSlipping = 21; const int k_Sand = 22; */ - { "reverserincrease", command_target::vehicle, GLFW_KEY_D }, - { "reverserdecrease", command_target::vehicle, GLFW_KEY_R }, - { "linebreakertoggle", command_target::vehicle, GLFW_KEY_M }, + // "reverserincrease" + { GLFW_KEY_D }, + // "reverserdecrease" + { GLFW_KEY_R }, + // "linebreakertoggle" + { GLFW_KEY_M }, /* const int k_Fuse = 26; */ - { "convertertoggle", command_target::vehicle, GLFW_KEY_X }, - { "compressortoggle", command_target::vehicle, GLFW_KEY_C }, - { "motoroverloadrelaythresholdtoggle", command_target::vehicle, GLFW_KEY_F }, + // "convertertoggle" + { GLFW_KEY_X }, + // "compressortoggle" + { GLFW_KEY_C }, + // "motoroverloadrelaythresholdtoggle" + { GLFW_KEY_F }, + // "notchingrelaytoggle" + { GLFW_KEY_G }, + // "epbrakecontroltoggle" + { GLFW_KEY_Z | keymodifier::control }, + // "brakeactingspeedincrease" + { GLFW_KEY_B | keymodifier::shift }, + // "brakeactingspeeddecrease" + { GLFW_KEY_B }, /* -const int k_CurrentAutoRelay = 30; const int k_BrakeProfile = 31; */ - { "alerteracknowledge", command_target::vehicle, GLFW_KEY_SPACE }, + // "alerteracknowledge" + { GLFW_KEY_SPACE }, /* const int k_Horn = 33; const int k_Horn2 = 34; const int k_FailedEngineCutOff = 35; */ - { "viewturn", command_target::entity, -1 }, - { "movevector", command_target::entity, -1 }, - { "moveleft", command_target::entity, GLFW_KEY_LEFT }, - { "moveright", command_target::entity, GLFW_KEY_RIGHT }, - { "moveforward", command_target::entity, GLFW_KEY_UP }, - { "moveback", command_target::entity, GLFW_KEY_DOWN }, - { "moveup", command_target::entity, GLFW_KEY_PAGE_UP }, - { "movedown", command_target::entity, GLFW_KEY_PAGE_DOWN }, - { "moveleftfast", command_target::entity, -1 }, - { "moverightfast", command_target::entity, -1 }, - { "moveforwardfast", command_target::entity, -1 }, - { "movebackfast", command_target::entity, -1 }, - { "moveupfast", command_target::entity, -1 }, - { "movedownfast", command_target::entity, -1 }, + // "viewturn" + { -1 }, + // "movevector" + { -1 }, + // "moveleft" + { GLFW_KEY_LEFT }, + // "moveright" + { GLFW_KEY_RIGHT }, + // "moveforward" + { GLFW_KEY_UP }, + // "moveback" + { GLFW_KEY_DOWN }, + // "moveup" + { GLFW_KEY_PAGE_UP }, + // "movedown" + { GLFW_KEY_PAGE_DOWN }, + // "moveleftfast" + { -1 }, + // "moverightfast" + { -1 }, + // "moveforwardfast" + { -1 }, + // "movebackfast" + { -1 }, + // "moveupfast" + { -1 }, + // "movedownfast" + { -1 }, /* const int k_CabForward = 42; const int k_CabBackward = 43; @@ -160,27 +208,45 @@ const int k_ProgramQuit = 46; // const int k_ProgramPause= 47; const int k_ProgramHelp = 48; */ - { "doortoggleleft", command_target::vehicle, GLFW_KEY_COMMA }, - { "doortoggleright", command_target::vehicle, GLFW_KEY_PERIOD }, + // "doortoggleleft" + { GLFW_KEY_COMMA }, + // "doortoggleright" + { GLFW_KEY_PERIOD }, + // "departureannounce" + { GLFW_KEY_SLASH }, + // "doorlocktoggle" + { GLFW_KEY_S | keymodifier::shift }, + // "pantographtogglefront" + { GLFW_KEY_P }, + // "pantographtogglerear" + { GLFW_KEY_O }, + // "pantographlowerall" + { GLFW_KEY_P | keymodifier::control }, + // "heatingtoggle" + { GLFW_KEY_H }, /* -const int k_DepartureSignal = 53; -*/ - { "pantographtogglefront", command_target::vehicle, GLFW_KEY_P }, - { "pantographtogglerear", command_target::vehicle, GLFW_KEY_O }, -/* -const int k_Heating = 58; // const int k_FreeFlyMode= 59; */ - { "headlighttoggleleft", command_target::vehicle, GLFW_KEY_Y }, - { "headlighttoggleright", command_target::vehicle, GLFW_KEY_I }, - { "headlighttoggleupper", command_target::vehicle, GLFW_KEY_U }, - { "redmarkertoggleleft", command_target::vehicle, GLFW_KEY_Y | keymodifier::shift }, - { "redmarkertoggleright", command_target::vehicle, GLFW_KEY_I | keymodifier::shift }, - { "headlighttogglerearleft", command_target::vehicle, GLFW_KEY_Y | keymodifier::control }, - { "headlighttogglerearright", command_target::vehicle, GLFW_KEY_I | keymodifier::control }, - { "headlighttogglerearupper", command_target::vehicle, GLFW_KEY_U | keymodifier::control }, - { "redmarkertogglerearleft", command_target::vehicle, GLFW_KEY_Y | keymodifier::control | keymodifier::shift }, - { "redmarkertogglerearright", command_target::vehicle, GLFW_KEY_I | keymodifier::control | keymodifier::shift }, + // "headlighttoggleleft" + { GLFW_KEY_Y }, + // "headlighttoggleright" + { GLFW_KEY_I }, + // "headlighttoggleupper" + { GLFW_KEY_U }, + // "redmarkertoggleleft" + { GLFW_KEY_Y | keymodifier::shift }, + // "redmarkertoggleright" + { GLFW_KEY_I | keymodifier::shift }, + // "headlighttogglerearleft" + { GLFW_KEY_Y | keymodifier::control }, + // "headlighttogglerearright" + { GLFW_KEY_I | keymodifier::control }, + // "headlighttogglerearupper" + { GLFW_KEY_U | keymodifier::control }, + // "redmarkertogglerearleft" + { GLFW_KEY_Y | keymodifier::control | keymodifier::shift }, + // "redmarkertogglerearright" + { GLFW_KEY_I | keymodifier::control | keymodifier::shift }, /* const int k_SmallCompressor = 63; const int k_StLinOff = 64; @@ -192,7 +258,8 @@ const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; */ - { "batterytoggle", command_target::vehicle, GLFW_KEY_J } + // "batterytoggle" + { GLFW_KEY_J } /* const int k_WalkMode = 73; int const k_DimHeadlights = 74; diff --git a/keyboardinput.h b/keyboardinput.h index 1c92acdf..12301797 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -37,8 +37,6 @@ private: struct command_setup { - std::string name; - command_target target; int binding; }; diff --git a/lightarray.cpp b/lightarray.cpp index 5cc85168..8a9bc1a3 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -57,8 +57,8 @@ light_array::update() { light.direction.z = -light.direction.z; } // determine intensity of this light set - if( true == light.owner->MoverParameters->Battery ) { - // with battery on, the intensity depends on the state of activated switches + if( ( true == light.owner->MoverParameters->Battery ) || ( true == light.owner->MoverParameters->ConverterFlag ) ) { + // with power on, the intensity depends on the state of activated switches auto const &lightbits = light.owner->iLights[ light.index ]; light.count = 0 + ( ( lightbits & 1 ) ? 1 : 0 ) + diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index dc09e535..618b4702 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -213,14 +213,14 @@ Source Files - - Source Files + + Source Files\input Source Files\input - - Source Files\input + + Source Files From 4e516fd8073d533fa80a52ae7ace89ba521c0ccc Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 17 Apr 2017 13:59:43 +0200 Subject: [PATCH 086/426] support for specifying multiple replaceable skins --- DynObj.cpp | 77 ++++++++++++++++++++++++++++-------------------------- World.cpp | 2 +- 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 3ab622d3..36b09abb 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -798,7 +798,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) btnOn = true; } // else btCPass2.TurnOff(); - if( ( true == MoverParameters->Battery ) || ( true == MoverParameters->ConverterFlag ) ) + if (MoverParameters->Battery) { // sygnaly konca pociagu if (btEndSignals1.Active()) { @@ -900,9 +900,10 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) // Ra: przechyłkę załatwiamy na etapie przesuwania modelu // if (ObjSqrDist<80000) ABuModelRoll(); //przechyłki od 400m } - if( ( true == MoverParameters->Battery ) || ( true == MoverParameters->ConverterFlag ) ) { - // sygnały czoła pociagu - //Ra: wyświetlamy bez ograniczeń odległości, by były widoczne z daleka + if (MoverParameters->Battery) + { // sygnały czoła pociagu //Ra: wyświetlamy bez + // ograniczeń odległości, by były widoczne z + // daleka if (TestFlag(iLights[0], 1)) { btHeadSignals11.TurnOn(); @@ -4293,45 +4294,47 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } #else { // tekstura wymienna jest raczej jedynie w "dynamic\" - ReplacableSkin = Global::asCurrentTexturePath + ReplacableSkin; // skory tez z dynamic/... - std::string x = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie - if (!x.empty()) - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + "nowhere", "", 9 ); +// ReplacableSkin = Global::asCurrentTexturePath + ReplacableSkin; // skory tez z dynamic/... + std::string nowheretexture = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie + if( false == nowheretexture.empty() ) { + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( nowheretexture, "", 9 ); + } - if (m_materialdata.multi_textures > 0) - { // jeśli model ma 4 tekstury - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( - ReplacableSkin + ",1", "", Global::iDynamicFiltering); - if( m_materialdata.replacable_skins[ 1 ] ) - { // pierwsza z zestawu znaleziona - m_materialdata.replacable_skins[ 2 ] = GfxRenderer.GetTextureId( - ReplacableSkin + ",2", "", Global::iDynamicFiltering); - if( m_materialdata.replacable_skins[ 2 ] ) - { - m_materialdata.multi_textures = 2; // już są dwie - m_materialdata.replacable_skins[ 3 ] = GfxRenderer.GetTextureId( - ReplacableSkin + ",3", "", Global::iDynamicFiltering); - if( m_materialdata.replacable_skins[ 3 ] ) - { - m_materialdata.multi_textures = 3; // a teraz nawet trzy - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( - ReplacableSkin + ",4", "", Global::iDynamicFiltering); - if( m_materialdata.replacable_skins[ 4 ] ) - m_materialdata.multi_textures = 4; // jak są cztery, to blokujemy podmianę tekstury - // rozkładem - } + if (m_materialdata.multi_textures > 0) { + // jeśli model ma 4 tekstury + // check for the pipe method first + if( ReplacableSkin.find( '|' ) != std::string::npos ) { + cParser nameparser( ReplacableSkin ); + nameparser.getTokens( 4, true, "|" ); + int skinindex = 0; + std::string texturename; nameparser >> texturename; + while( ( texturename != "" ) && ( skinindex < 4 ) ) { + m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + texturename, "" ); + ++skinindex; + texturename = ""; nameparser >> texturename; } + m_materialdata.multi_textures = skinindex; } - else - { // zestaw nie zadziałał, próbujemy normanie - m_materialdata.multi_textures = 0; - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( - ReplacableSkin, "", Global::iDynamicFiltering); + else { + // otherwise try the basic approach + int skinindex = 0; + do { + texture_manager::size_type texture = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), "", Global::iDynamicFiltering, true ); + if( false == GfxRenderer.Texture( texture ).is_ready ) { + break; + } + m_materialdata.replacable_skins[ skinindex + 1 ] = texture; + ++skinindex; + } while( skinindex < 4 ); + m_materialdata.multi_textures = skinindex; + if( m_materialdata.multi_textures == 0 ) { + // zestaw nie zadziałał, próbujemy normanie + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); + } } } else - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( - ReplacableSkin, "", Global::iDynamicFiltering); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) m_materialdata.textures_alpha = 0x31310031; // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych else diff --git a/World.cpp b/World.cpp index 5dc73095..da1c2575 100644 --- a/World.cpp +++ b/World.cpp @@ -1716,7 +1716,7 @@ TWorld::Update_UI() { uitextline1 += " (paused)"; } - uitextline2 = Global::Bezogonkow( owner->Relation(), true ) + " (" + owner->Timetable()->TrainName + ")"; + uitextline2 = Global::Bezogonkow( owner->Relation(), true ) + " (" + Global::Bezogonkow( owner->Timetable()->TrainName, true ) + ")"; auto const nextstation = Global::Bezogonkow( owner->NextStop(), true ); if( !nextstation.empty() ) { // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania From 62520bd4e8a1d8dd0518baee19b477252aee420e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 18 Apr 2017 18:41:49 +0200 Subject: [PATCH 087/426] control for motor connectors, instrument and cab lighting. keyboard leds signalling, increased level of detail in zoom mode --- Console.cpp | 57 +++++------ McZapkie/MOVER.h | 3 +- McZapkie/Mover.cpp | 48 ++++++---- Train.cpp | 232 +++++++++++++++++++++++++++++++-------------- Train.h | 4 + command.cpp | 9 +- command.h | 9 +- keyboardinput.cpp | 141 ++++++++++++++------------- renderer.cpp | 4 +- 9 files changed, 316 insertions(+), 191 deletions(-) diff --git a/Console.cpp b/Console.cpp index efaadc5c..076d4332 100644 --- a/Console.cpp +++ b/Console.cpp @@ -82,29 +82,14 @@ public static Int32 GetScreenSaverTimeout() // static class member storage allocation TKeyTrans Console::ktTable[4 * 256]; -// Ra: do poprawienia -void SetLedState(unsigned char Code, bool bOn){ - // Ra: bajer do migania LED-ami w klawiaturze - // NOTE: disabled for the time being - // TODO: find non Borland specific equivalent, or get rid of it - /* if (Win32Platform == VER_PLATFORM_WIN32_NT) - { - // WriteLog(AnsiString(int(GetAsyncKeyState(Code)))); - if (bool(GetAsyncKeyState(Code)) != bOn) - { - keybd_event(Code, MapVirtualKey(Code, 0), KEYEVENTF_EXTENDEDKEY, 0); - keybd_event(Code, MapVirtualKey(Code, 0), KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, - 0); - } - } - else - { - TKeyboardState KBState; - GetKeyboardState(KBState); - KBState[Code] = bOn ? 1 : 0; - SetKeyboardState(KBState); - }; - */ +// Ra: bajer do migania LED-ami w klawiaturze +void SetLedState( unsigned char Code, bool bOn ) { +#ifdef _WINDOWS + if( bOn != ( ::GetKeyState( Code ) != 0 ) ) { + keybd_event( Code, MapVirtualKey( Code, 0 ), KEYEVENTF_EXTENDEDKEY | 0, 0 ); + keybd_event( Code, MapVirtualKey( Code, 0 ), KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0 ); + } +#endif }; //--------------------------------------------------------------------------- @@ -243,22 +228,24 @@ void Console::BitsUpdate(int mask) switch (iMode) { case 1: // sterowanie światełkami klawiatury: CA/SHP+opory - if (mask & 3) // gdy SHP albo CA - SetLedState(VK_CAPITAL, (iBits & 3) != 0); - if (mask & 4) // gdy jazda na oporach - { // Scroll Lock ma jakoś dziwnie... zmiana stanu na przeciwny - SetLedState(VK_SCROLL, true); // przyciśnięty - SetLedState(VK_SCROLL, false); // zwolniony + if( mask & 3 ) { + // gdy SHP albo CA + SetLedState( VK_CAPITAL, ( iBits & 3 ) != 0 ); + } + if (mask & 4) { + // gdy jazda na oporach + SetLedState( VK_SCROLL, ( iBits & 4 ) != 0 ); ++iConfig; // licznik użycia Scroll Lock } break; case 2: // sterowanie światełkami klawiatury: CA+SHP - if (mask & 2) // gdy CA - SetLedState(VK_CAPITAL, (iBits & 2) != 0); - if (mask & 1) // gdy SHP - { // Scroll Lock ma jakoś dziwnie... zmiana stanu na przeciwny - SetLedState(VK_SCROLL, true); // przyciśnięty - SetLedState(VK_SCROLL, false); // zwolniony + if( mask & 2 ) { + // gdy CA + SetLedState( VK_CAPITAL, ( iBits & 2 ) != 0 ); + } + if (mask & 1) { + // gdy SHP + SetLedState( VK_SCROLL, ( iBits & 1 ) != 0 ); ++iConfig; // licznik użycia Scroll Lock } break; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 448a65b9..75db0f36 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -675,7 +675,7 @@ public: headlight_right = 0x10, redmarker_right = 0x20, }; - bool ScndInMain = false; /*zaleznosc bocznika od nastawnika*/ + int ScndInMain{ 0 }; /*zaleznosc bocznika od nastawnika*/ bool MBrake = false; /*Czy jest hamulec reczny*/ double StopBrakeDecc = 0.0; TSecuritySystem SecuritySystem; @@ -880,6 +880,7 @@ public: bool FuseFlag = false; /*!o bezpiecznik nadmiarowy*/ bool ConvOvldFlag = false; /*! nadmiarowy przetwornicy i ogrzewania*/ bool StLinFlag = false; /*!o styczniki liniowe*/ + bool StLinSwitchOff{ false }; // state of the button forcing motor connectors open bool ResistorsFlag = false; /*!o jazda rezystorowa*/ double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/ bool UnBrake = false; /*w EZT - nacisniete odhamowywanie*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 9e7b5d7c..e9966a19 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -129,11 +129,15 @@ double TMoverParameters::current(double n, double U) R = RList[MainCtrlActualPos].R * Bn + CircuitRes; - if ((TrainType != dt_EZT) || (Imin != IminLo) || - (!ScndS)) // yBARC - boczniki na szeregu poprawnie - Mn = RList[MainCtrlActualPos].Mn; // to jest wykonywane dla EU07 - else - Mn = RList[MainCtrlActualPos].Mn * RList[MainCtrlActualPos].Bn; + if( ( TrainType != dt_EZT ) + || ( Imin != IminLo ) + || ( false == ScndS ) ) { + // yBARC - boczniki na szeregu poprawnie + Mn = RList[ MainCtrlActualPos ].Mn; // to jest wykonywane dla EU07 + } + else { + Mn = RList[ MainCtrlActualPos ].Mn * RList[ MainCtrlActualPos ].Bn; + } // writepaslog("#", // "C++-----------------------------------------------------------------------------"); @@ -154,21 +158,25 @@ double TMoverParameters::current(double n, double U) if (DynamicBrakeFlag && (!FuseFlag) && (DynamicBrakeType == dbrake_automatic) && ConverterFlag && Mains) // hamowanie EP09 //TUHEX { + // TODO: zrobic bardziej uniwersalne nie tylko dla EP09 MotorCurrent = - -Max0R(MotorParam[0].fi * (Vadd / (Vadd + MotorParam[0].Isat) - MotorParam[0].fi0), 0) * - n * 2.0 / ep09resED; // TODO: zrobic bardziej uniwersalne nie tylko dla EP09 + -Max0R(MotorParam[0].fi * (Vadd / (Vadd + MotorParam[0].Isat) - MotorParam[0].fi0), 0) * n * 2.0 / ep09resED; + } + else if( ( RList[ MainCtrlActualPos ].Bn == 0 ) + || ( false == StLinFlag ) ) { + // wylaczone + MotorCurrent = 0; } - else if ((RList[MainCtrlActualPos].Bn == 0) || (!StLinFlag)) - MotorCurrent = 0; // wylaczone else { // wlaczone... SP = ScndCtrlActualPos; if (ScndCtrlActualPos < 255) // tak smiesznie bede wylaczal { - if (ScndInMain) - if (!(RList[MainCtrlActualPos].ScndAct == 255)) - SP = RList[MainCtrlActualPos].ScndAct; + if( ( ScndInMain ) + && ( RList[ MainCtrlActualPos ].ScndAct != 255 ) ) { + SP = RList[ MainCtrlActualPos ].ScndAct; + } Rz = Mn * WindingRes + R; @@ -212,10 +220,10 @@ double TMoverParameters::current(double n, double U) { if (U > 0) MotorCurrent = - (U1 - Isf * Rz - Mn * MotorParam[SP].fi * n + sqrt(Delta)) / (2.0 * Rz); + (U1 - Isf * Rz - Mn * MotorParam[SP].fi * n + std::sqrt(Delta)) / (2.0 * Rz); else MotorCurrent = - (U1 - Isf * Rz - Mn * MotorParam[SP].fi * n - sqrt(Delta)) / (2.0 * Rz); + (U1 - Isf * Rz - Mn * MotorParam[SP].fi * n - std::sqrt(Delta)) / (2.0 * Rz); } else MotorCurrent = 0; @@ -1593,7 +1601,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) // OK = false; // } //} - } + } if( ( TrainType == dt_ET42 ) && ( true == DynamicBrakeFlag ) ) { if( MainCtrlPos > 20 ) { @@ -4895,7 +4903,8 @@ bool TMoverParameters::AutoRelayCheck(void) (MainCtrlActualPos == 0) && (ActiveDir != 0)) { //^^ TODO: sprawdzic BUG, prawdopodobnie w CreateBrakeSys() DelayCtrlFlag = true; - if (LastRelayTime >= InitialCtrlDelay) + if( (LastRelayTime >= InitialCtrlDelay) + && ( false == StLinSwitchOff ) ) { StLinFlag = true; // ybARC - zalaczenie stycznikow liniowych MainCtrlActualPos = 1; @@ -5975,10 +5984,15 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) continue; } - if( inputline.length() == 0 ) { + if( inputline[ 0 ] == ' ' ) { + // guard against malformed config files with leading spaces + inputline.erase( 0, inputline.find_first_not_of( ' ' ) ); + } + if( inputline.length() == 0 ) { startBPT = false; continue; } + // checking if table parsing should be switched off goes first... if( issection( "END-MPT", inputline ) ) { startBPT = false; diff --git a/Train.cpp b/Train.cpp index da53bcd1..d8f2235d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -170,6 +170,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::linebreakertoggle, &TTrain::OnCommand_linebreakertoggle }, { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, { user_command::compressortoggle, &TTrain::OnCommand_compressortoggle }, + { user_command::motorconnectorsopen, &TTrain::OnCommand_motorconnectorsopen }, { user_command::motoroverloadrelaythresholdtoggle, &TTrain::OnCommand_motoroverloadrelaythresholdtoggle }, { user_command::heatingtoggle, &TTrain::OnCommand_heatingtoggle }, { user_command::headlighttoggleleft, &TTrain::OnCommand_headlighttoggleleft }, @@ -182,6 +183,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::headlighttogglerearupper, &TTrain::OnCommand_headlighttogglerearupper }, { user_command::redmarkertogglerearleft, &TTrain::OnCommand_redmarkertogglerearleft }, { user_command::redmarkertogglerearright, &TTrain::OnCommand_redmarkertogglerearright }, + { user_command::interiorlighttoggle, &TTrain::OnCommand_interiorlighttoggle }, + { user_command::interiorlightdimtoggle, &TTrain::OnCommand_interiorlightdimtoggle }, + { user_command::instrumentlighttoggle, &TTrain::OnCommand_instrumentlighttoggle }, { user_command::doortoggleleft, &TTrain::OnCommand_doortoggleleft }, { user_command::doortoggleright, &TTrain::OnCommand_doortoggleright }, { user_command::departureannounce, &TTrain::OnCommand_departureannounce }, @@ -866,7 +870,9 @@ void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data con if( true == Train->mvOccupied->BrakeDelaySwitch( fasterbrakesetting ) ) { // audio feedback Train->play_sound( Train->dsbSwitch ); +/* Train->play_sound( Train->dsbPneumaticRelay ); +*/ // visual feedback if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { Train->ggBrakeProfileCtrl.UpdateValue( @@ -904,7 +910,9 @@ void TTrain::OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data con if( true == Train->mvOccupied->BrakeDelaySwitch( slowerbrakesetting ) ) { // audio feedback Train->play_sound( Train->dsbSwitch ); +/* Train->play_sound( Train->dsbPneumaticRelay ); +*/ // visual feedback if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { Train->ggBrakeProfileCtrl.UpdateValue( @@ -1584,6 +1592,36 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm */ } +void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &Command ) { + + // TODO: don't rely on presense of 3d model to determine presence of the switch + if( Train->ggStLinOffButton.SubModel == nullptr ) { + return; + } + + if( Command.action != GLFW_RELEASE ) { + // button works while it's held down + if( true == Train->mvControlled->StLinFlag ) { + // yBARC - zmienione na przeciwne, bo true to zalaczone + Train->mvControlled->StLinFlag = false; + Train->play_sound( Train->dsbRelay ); + } + Train->mvControlled->StLinSwitchOff = true; + // visual feedback + Train->ggStLinOffButton.UpdateValue( 1.0 ); + // sound feedback + if( Train->ggStLinOffButton.GetValue() < 0.05 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + // button released + Train->mvControlled->StLinSwitchOff = false; + // visual feedback + Train->ggStLinOffButton.UpdateValue( 0.0 ); + } +} + void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { @@ -1987,6 +2025,107 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con } } +void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &Command ) { + + // NOTE: the check is disabled, as we're presuming light control is present in every vehicle + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + if( Train->ggCabLightButton.SubModel == nullptr ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->bCabLight ) { + // turn on + Train->bCabLight = true; + Train->btCabLight.TurnOn(); + // audio feedback + if( Train->ggCabLightButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggCabLightButton.UpdateValue( 1.0 ); + } + else { + //turn off + Train->bCabLight = false; + Train->btCabLight.TurnOff(); + // audio feedback + if( Train->ggCabLightButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggCabLightButton.UpdateValue( 0.0 ); + } + } +} + +void TTrain::OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const &Command ) { + + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + if( Train->ggCabLightDimButton.SubModel == nullptr ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->bCabLightDim ) { + // turn on + Train->bCabLightDim = true; + // audio feedback + if( Train->ggCabLightDimButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggCabLightDimButton.UpdateValue( 1.0 ); + } + else { + //turn off + Train->bCabLightDim = false; + // audio feedback + if( Train->ggCabLightDimButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggCabLightDimButton.UpdateValue( 0.0 ); + } + } +} + +void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const &Command ) { + + // NOTE: the check is disabled, as we're presuming light control is present in every vehicle + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + if( Train->ggUniversal3Button.SubModel == nullptr ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + // NOTE: instrument lighting isn't fully implemented, so we have to rely on the state of the 'button' i.e. light itself + if( false == Train->LampkaUniversal3_st ) { + // turn on + Train->LampkaUniversal3_st = true; + // audio feedback + if( Train->ggUniversal3Button.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggUniversal3Button.UpdateValue( 1.0 ); + } + else { + //turn off + Train->LampkaUniversal3_st = false; + // audio feedback + if( Train->ggUniversal3Button.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggUniversal3Button.UpdateValue( 0.0 ); + } + } +} + void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ) { if( Train->ggTrainHeatingButton.SubModel == nullptr ) { @@ -2530,14 +2669,13 @@ void TTrain::OnKeyDown(int cKey) } } } -#endif //----------- // hunter-131211: dzwiek dla przelacznika universala podniesionego // hunter-091012: ubajerowanie swiatla w kabinie (wyrzucenie // przyciemnienia pod Univ4) else if (cKey == Global::Keys[k_Univ3]) { - if (Global::ctrlState) + if( Global::ctrlState ) { if (bCabLight == false) //(ggCabLightButton.GetValue()==0) { @@ -2571,7 +2709,6 @@ void TTrain::OnKeyDown(int cKey) } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM //----------- else if (cKey == Global::Keys[k_PantFrontUp]) { // Winger 160204: podn. @@ -3736,7 +3873,6 @@ if } } } -#endif //----------- // hunter-131211: dzwiek dla przelacznika universala // hunter-091012: ubajerowanie swiatla w kabinie (wyrzucenie @@ -3763,7 +3899,6 @@ if } */ } } - //----------- // hunter-091012: dzwiek dla przyciemnienia swiatelka w kabinie else if (cKey == Global::Keys[k_Univ4]) @@ -3777,7 +3912,6 @@ if } } //----------- -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_PantFrontDown]) // Winger 160204: // opuszczanie prz. patyka { @@ -4118,7 +4252,8 @@ if else if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // Winger 110904: wylacznik st. // liniowych { - if ((mvControlled->TrainType != dt_EZT) && (mvControlled->TrainType != dt_EP05) && +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( ( mvControlled->TrainType != dt_EZT ) && ( mvControlled->TrainType != dt_EP05 ) && (mvControlled->TrainType != dt_ET40)) { ggStLinOffButton.PutValue(1); // Ra: było Fuse... @@ -4130,6 +4265,7 @@ if play_sound( dsbRelay ); } } +#endif if (mvControlled->TrainType == dt_EZT) { if (mvControlled->Signalling == true) @@ -4268,7 +4404,8 @@ if void TTrain::OnKeyUp(int cKey) { // zwolnienie klawisza - if (Global::shiftState) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( Global::shiftState ) { // wciśnięty [Shift] } else @@ -4280,6 +4417,7 @@ void TTrain::OnKeyUp(int cKey) ggStLinOffButton.PutValue(0); } } +#endif }; // cab movement update, fixed step part @@ -5347,7 +5485,7 @@ bool TTrain::Update( double const Deltatime ) // - pokićkał ktoś? scp = mvControlled->RList[mvControlled->MainCtrlPos].ScndAct; scp = (scp == 255 ? 0 : scp); // Ra: whatta hella is this? - if ((mvControlled->ScndCtrlPos > 0) || (mvControlled->ScndInMain) && (scp > 0)) + if ((mvControlled->ScndCtrlPos > 0) || (mvControlled->ScndInMain != 0) && (scp > 0)) { // boczniki pojedynczo btLampkaBocznik1.TurnOn(); btLampkaBocznik2.Turn(mvControlled->ScndCtrlPos > 1); @@ -6305,6 +6443,7 @@ bool TTrain::Update( double const Deltatime ) if (DynamicObject->Mechanik ? !DynamicObject->Mechanik->AIControllFlag : false) // nie wyłączać, gdy AI mvControlled->PantCompFlag = false; // wyłączona, gdy nie trzymamy klawisza + if (Console::Pressed(Global::Keys[k_Univ2])) { if (!DebugModeFlag) @@ -6317,6 +6456,7 @@ bool TTrain::Update( double const Deltatime ) } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM // hunter-091012: zrobione z uwzglednieniem przelacznika swiatla if (Console::Pressed(Global::Keys[k_Univ3])) { @@ -6367,47 +6507,7 @@ bool TTrain::Update( double const Deltatime ) } } } - - // hunter-091012: to w ogole jest bez sensu i tak namodzone ze nie wiadomo o - // co chodzi - zakomentowalem i zrobilem po swojemu - /* - if ( Console::Pressed(Global::Keys[k_Univ3]) ) - { - if (ggUniversal3Button.SubModel) - - - if (Global::ctrlState) - {//z [Ctrl] zapalamy albo gasimy światełko w kabinie - //tutaj jest bez sensu, trzeba reagować na wciskanie klawisza! - if (Global::shiftState) - {//zapalenie - if (iCabLightFlag<2) ++iCabLightFlag; - } - else - {//gaszenie - if (iCabLightFlag) --iCabLightFlag; - } - - } - else - {//bez [Ctrl] przełączamy cośtem - if (Global::shiftState) - { - ggUniversal3Button.PutValue(1); //hunter-131211: z UpdateValue na - PutValue - by zachowywal sie jak pozostale przelaczniki - if (btLampkaUniversal3.Active()) - LampkaUniversal3_st=true; - } - else - { - ggUniversal3Button.PutValue(0); //hunter-131211: z UpdateValue na - PutValue - by zachowywal sie jak pozostale przelaczniki - if (btLampkaUniversal3.Active()) - LampkaUniversal3_st=false; - } - } - } */ - +#endif // ABu030405 obsluga lampki uniwersalnej: if (btLampkaUniversal3.Active()) // w ogóle jest if (LampkaUniversal3_st) // załączona @@ -6428,28 +6528,12 @@ bool TTrain::Update( double const Deltatime ) else btLampkaUniversal3.TurnOff(); - /* - if (Console::Pressed(Global::Keys[k_Univ4])) - { - if (ggUniversal4Button.SubModel) - if (Global::shiftState) - { - ActiveUniversal4=true; - //ggUniversal4Button.UpdateValue(1); - } - else - { - ActiveUniversal4=false; - //ggUniversal4Button.UpdateValue(0); - } - } - */ - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM // hunter-091012: przepisanie univ4 i zrobione z uwzglednieniem przelacznika // swiatla if (Console::Pressed(Global::Keys[k_Univ4])) { - if (Global::shiftState) + if( Global::shiftState ) { if (Global::ctrlState) { @@ -6484,7 +6568,6 @@ bool TTrain::Update( double const Deltatime ) } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM // Odskakiwanie hamulce EP if ((!Console::Pressed(Global::Keys[k_DecBrakeLevel])) && (!Console::Pressed(Global::Keys[k_WaveBrake])) && (mvOccupied->BrakeCtrlPos == -1) && @@ -7754,6 +7837,17 @@ void TTrain::set_cab_controls() { ggRightEndLightButton.PutValue( 1.0 ); } + // cab lights + if( true == bCabLight ) { + ggCabLightButton.PutValue( 1.0 ); + } + if( true == bCabLightDim ) { + ggCabLightDimButton.PutValue( 1.0 ); + } + if( true == LampkaUniversal3_st ) { + ggUniversal3Button.PutValue( 1.0 ); + } + // doors // NOTE: we're relying on the cab models to have switches reversed for the rear cab(?) ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1.0 : 0.0 ); diff --git a/Train.h b/Train.h index 3bca0aaf..875b9f32 100644 --- a/Train.h +++ b/Train.h @@ -146,6 +146,7 @@ class TTrain static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_compressortoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_motorconnectorsopen( TTrain *Train, command_data const &Command ); static void OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ); @@ -158,6 +159,9 @@ class TTrain static void OnCommand_headlighttogglerearupper( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertogglerearleft( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertogglerearright( TTrain *Train, command_data const &Command ); + static void OnCommand_interiorlighttoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_instrumentlighttoggle( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleright( TTrain *Train, command_data const &Command ); static void OnCommand_departureannounce( TTrain *Train, command_data const &Command ); diff --git a/command.cpp b/command.cpp index e228ed5f..cdc811a7 100644 --- a/command.cpp +++ b/command.cpp @@ -112,8 +112,15 @@ const int k_ProgramHelp = 48; { "redmarkertogglerearright", command_target::vehicle }, /* const int k_SmallCompressor = 63; -const int k_StLinOff = 64; +*/ + { "motorconnectorsopen", command_target::vehicle }, +/* const int k_CurrentNext = 65; +*/ + { "interiorlighttoggle", command_target::vehicle }, + { "interiorlightdimtoggle", command_target::vehicle }, + { "instrumentlighttoggle", command_target::vehicle }, +/* const int k_Univ1 = 66; const int k_Univ2 = 67; const int k_Univ3 = 68; diff --git a/command.h b/command.h index a6b9d7ea..5f0e4414 100644 --- a/command.h +++ b/command.h @@ -104,8 +104,15 @@ const int k_ProgramHelp = 48; redmarkertogglerearright, /* const int k_SmallCompressor = 63; -const int k_StLinOff = 64; +*/ + motorconnectorsopen, +/* const int k_CurrentNext = 65; +*/ + interiorlighttoggle, + interiorlightdimtoggle, + instrumentlighttoggle, +/* const int k_Univ1 = 66; const int k_Univ2 = 67; const int k_Univ3 = 68; diff --git a/keyboardinput.cpp b/keyboardinput.cpp index d455bf00..0c447184 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -92,112 +92,112 @@ void keyboard_input::default_bindings() { m_commands = { - //"mastercontrollerincrease" + // mastercontrollerincrease { GLFW_KEY_KP_ADD }, - //"mastercontrollerincreasefast" + // mastercontrollerincreasefast { GLFW_KEY_KP_ADD | keymodifier::shift }, - // "mastercontrollerdecrease" + // mastercontrollerdecrease { GLFW_KEY_KP_SUBTRACT }, - // "mastercontrollerdecreasefast" + // mastercontrollerdecreasefast { GLFW_KEY_KP_SUBTRACT | keymodifier::shift }, - // "secondcontrollerincrease" + // secondcontrollerincrease { GLFW_KEY_KP_DIVIDE }, - // "secondcontrollerincreasefast" + // secondcontrollerincreasefast { GLFW_KEY_KP_DIVIDE | keymodifier::shift }, - // "secondcontrollerdecrease" + // secondcontrollerdecrease { GLFW_KEY_KP_MULTIPLY }, - // "secondcontrollerdecreasefast" + // secondcontrollerdecreasefast { GLFW_KEY_KP_MULTIPLY | keymodifier::shift }, - // "independentbrakeincrease" + // independentbrakeincrease { GLFW_KEY_KP_1 }, - // "independentbrakeincreasefast" + // independentbrakeincreasefast { GLFW_KEY_KP_1 | keymodifier::shift }, - // "independentbrakedecrease" + // independentbrakedecrease { GLFW_KEY_KP_7 }, - // "independentbrakedecreasefast" + // independentbrakedecreasefast { GLFW_KEY_KP_7 | keymodifier::shift }, - // "independentbrakebailoff" + // independentbrakebailoff { GLFW_KEY_KP_4 }, - // "trainbrakeincrease" + // trainbrakeincrease { GLFW_KEY_KP_3 }, - // "trainbrakedecrease" + // trainbrakedecrease { GLFW_KEY_KP_9 }, - // "trainbrakecharging" + // trainbrakecharging { GLFW_KEY_KP_DECIMAL }, - // "trainbrakerelease" + // trainbrakerelease { GLFW_KEY_KP_6 }, - // "trainbrakefirstservice" + // trainbrakefirstservice { GLFW_KEY_KP_8 }, - // "trainbrakeservice" + // trainbrakeservice { GLFW_KEY_KP_5 }, - // "trainbrakefullservice" + // trainbrakefullservice { GLFW_KEY_KP_2 }, - // "trainbrakeemergency" + // trainbrakeemergency { GLFW_KEY_KP_0 }, /* const int k_AntiSlipping = 21; const int k_Sand = 22; */ - // "reverserincrease" + // reverserincrease { GLFW_KEY_D }, - // "reverserdecrease" + // reverserdecrease { GLFW_KEY_R }, - // "linebreakertoggle" + // linebreakertoggle { GLFW_KEY_M }, /* const int k_Fuse = 26; */ - // "convertertoggle" + // convertertoggle { GLFW_KEY_X }, - // "compressortoggle" + // compressortoggle { GLFW_KEY_C }, - // "motoroverloadrelaythresholdtoggle" + // motoroverloadrelaythresholdtoggle { GLFW_KEY_F }, - // "notchingrelaytoggle" + // notchingrelaytoggle { GLFW_KEY_G }, - // "epbrakecontroltoggle" + // epbrakecontroltoggle { GLFW_KEY_Z | keymodifier::control }, - // "brakeactingspeedincrease" + // brakeactingspeedincrease { GLFW_KEY_B | keymodifier::shift }, - // "brakeactingspeeddecrease" + // brakeactingspeeddecrease { GLFW_KEY_B }, /* const int k_BrakeProfile = 31; */ - // "alerteracknowledge" + // alerteracknowledge { GLFW_KEY_SPACE }, /* const int k_Horn = 33; const int k_Horn2 = 34; const int k_FailedEngineCutOff = 35; */ - // "viewturn" + // viewturn { -1 }, - // "movevector" + // movevector { -1 }, - // "moveleft" + // moveleft { GLFW_KEY_LEFT }, - // "moveright" + // moveright { GLFW_KEY_RIGHT }, - // "moveforward" + // moveforward { GLFW_KEY_UP }, - // "moveback" + // moveback { GLFW_KEY_DOWN }, - // "moveup" + // moveup { GLFW_KEY_PAGE_UP }, - // "movedown" + // movedown { GLFW_KEY_PAGE_DOWN }, - // "moveleftfast" + // moveleftfast { -1 }, - // "moverightfast" + // moverightfast { -1 }, - // "moveforwardfast" + // moveforwardfast { -1 }, - // "movebackfast" + // movebackfast { -1 }, - // "moveupfast" + // moveupfast { -1 }, - // "movedownfast" + // movedownfast { -1 }, /* const int k_CabForward = 42; @@ -208,49 +208,60 @@ const int k_ProgramQuit = 46; // const int k_ProgramPause= 47; const int k_ProgramHelp = 48; */ - // "doortoggleleft" + // doortoggleleft { GLFW_KEY_COMMA }, - // "doortoggleright" + // doortoggleright { GLFW_KEY_PERIOD }, - // "departureannounce" + // departureannounce { GLFW_KEY_SLASH }, - // "doorlocktoggle" + // doorlocktoggle { GLFW_KEY_S | keymodifier::shift }, - // "pantographtogglefront" + // pantographtogglefront { GLFW_KEY_P }, - // "pantographtogglerear" + // pantographtogglerear { GLFW_KEY_O }, - // "pantographlowerall" + // pantographlowerall { GLFW_KEY_P | keymodifier::control }, - // "heatingtoggle" + // heatingtoggle { GLFW_KEY_H }, /* // const int k_FreeFlyMode= 59; */ - // "headlighttoggleleft" + // headlighttoggleleft { GLFW_KEY_Y }, - // "headlighttoggleright" + // headlighttoggleright { GLFW_KEY_I }, - // "headlighttoggleupper" + // headlighttoggleupper { GLFW_KEY_U }, - // "redmarkertoggleleft" + // redmarkertoggleleft { GLFW_KEY_Y | keymodifier::shift }, - // "redmarkertoggleright" + // redmarkertoggleright { GLFW_KEY_I | keymodifier::shift }, - // "headlighttogglerearleft" + // headlighttogglerearleft { GLFW_KEY_Y | keymodifier::control }, - // "headlighttogglerearright" + // headlighttogglerearright { GLFW_KEY_I | keymodifier::control }, - // "headlighttogglerearupper" + // headlighttogglerearupper { GLFW_KEY_U | keymodifier::control }, - // "redmarkertogglerearleft" + // redmarkertogglerearleft { GLFW_KEY_Y | keymodifier::control | keymodifier::shift }, - // "redmarkertogglerearright" + // redmarkertogglerearright { GLFW_KEY_I | keymodifier::control | keymodifier::shift }, /* const int k_SmallCompressor = 63; -const int k_StLinOff = 64; +*/ + // motorconnectorsopen + { GLFW_KEY_L }, +/* const int k_CurrentNext = 65; +*/ + // interiorlighttoggle + { GLFW_KEY_APOSTROPHE }, + // interiorlightdimtoggle + { GLFW_KEY_APOSTROPHE | keymodifier::control }, + // instrumentlighttoggle + { GLFW_KEY_SEMICOLON }, +/* const int k_Univ1 = 66; const int k_Univ2 = 67; const int k_Univ3 = 68; diff --git a/renderer.cpp b/renderer.cpp index 8c66ff86..afa09dfc 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -319,7 +319,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - double squaredistance = SquareMagnitude( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor; + double squaredistance = SquareMagnitude( ( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); @@ -591,7 +591,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - double squaredistance = SquareMagnitude( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor; + double squaredistance = SquareMagnitude( ( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); From c43ac777f4707116b93634a5eae6d118927108c7 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 22 Apr 2017 15:48:02 +0200 Subject: [PATCH 088/426] control for overload relays, wheelspin brakes and sander, horns, radio, pantograph compressor. added basic air leaks for braking system --- Gauge.cpp | 4 + Logs.cpp | 2 +- McZapkie/Mover.cpp | 27 +- Train.cpp | 748 +++++++++++++++++++++++++++++++++++++-------- Train.h | 17 +- command.cpp | 49 +-- command.h | 28 +- keyboardinput.cpp | 43 +-- windows.cpp | 2 +- 9 files changed, 723 insertions(+), 197 deletions(-) diff --git a/Gauge.cpp b/Gauge.cpp index 85ff23c6..ef0c1efa 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -87,6 +87,10 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) >> val5; val3 *= mul; TSubModel *sm = md1->GetFromName( str1.c_str() ); + if( val3 == 0.0 ) { + ErrorLog( "Scale of 0.0 defined for sub-model \"" + str1 + "\" in 3d model \"" + md1->NameGet() + "\". Forcing scale of 1.0 to prevent division by 0" ); + val3 = 1.0; + } if (sm) // jeśli nie znaleziony md2 = NULL; // informacja, że znaleziony else if (md2) // a jest podany drugi model (np. zewnętrzny) diff --git a/Logs.cpp b/Logs.cpp index a4a22fb0..6b1bd677 100644 --- a/Logs.cpp +++ b/Logs.cpp @@ -21,7 +21,7 @@ char endstring[10] = "\n"; std::string filename_date() { ::SYSTEMTIME st; - ::GetSystemTime( &st ); + ::GetLocalTime( &st ); char buffer[ 256 ]; sprintf( buffer, "%d%02d%02d_%02d%02d", diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index e9966a19..98a48ea5 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2843,6 +2843,9 @@ void TMoverParameters::UpdateBrakePressure(double dt) // ************************************************************************************************* void TMoverParameters::CompressorCheck(double dt) { + // TODO: expose leak rate as a parameter to the .fiz file + CompressedVolume = std::max( 0.0, CompressedVolume - dt * 0.001 ); // nieszczelności: 0.001=1l/s + // if (CompressorSpeed>0.0) then //ten warunek został sprawdzony przy wywołaniu funkcji if (VeselVolume > 0) { @@ -2965,6 +2968,9 @@ void TMoverParameters::CompressorCheck(double dt) // ************************************************************************************************* void TMoverParameters::UpdatePipePressure(double dt) { + // TODO: expose leak rate as a parameter to the .fiz file + PipePress = std::max( 0.0, PipePress - dt * 0.001 ); // nieszczelności: 0.001=1l/s + const double LBDelay = 100; const double kL = 0.5; //double dV; @@ -3139,7 +3145,7 @@ void TMoverParameters::UpdatePipePressure(double dt) // temp = (Handle as TFVel6).GetCP temp = Handle->GetCP(); else - temp = 0; + temp = 0.0; Hamulec->SetEPS(temp); SendCtrlToNext("Brake", temp, CabNo); // Ra 2014-11: na tym się wysypuje, ale nie wiem, w jakich warunkach @@ -3148,9 +3154,9 @@ void TMoverParameters::UpdatePipePressure(double dt) Pipe->Act(); PipePress = Pipe->P(); if ((BrakeStatus & 128) == 128) // jesli hamulec wyłączony - temp = 0; // odetnij + temp = 0.0; // odetnij else - temp = 1; // połącz + temp = 1.0; // połącz Pipe->Flow(temp * Hamulec->GetPF(temp * PipePress, dt, Vel) + GetDVc(dt)); if (ASBType == 128) @@ -3162,17 +3168,17 @@ void TMoverParameters::UpdatePipePressure(double dt) Pipe->Act(); PipePress = Pipe->P(); - dpMainValve = dpMainValve / (100 * dt); // normalizacja po czasie do syczenia; + dpMainValve = dpMainValve / (100.0 * dt); // normalizacja po czasie do syczenia; - if (PipePress < -1) + if (PipePress < -1.0) { - PipePress = -1; - Pipe->CreatePress(-1); + PipePress = -1.0; + Pipe->CreatePress(-1.0); Pipe->Act(); } - if (CompressedVolume < 0) - CompressedVolume = 0; + if (CompressedVolume < 0.0) + CompressedVolume = 0.0; } // ************************************************************************************************* @@ -3181,6 +3187,9 @@ void TMoverParameters::UpdatePipePressure(double dt) // ************************************************************************************************* void TMoverParameters::UpdateScndPipePressure(double dt) { + // TODO: expose leak rate as a parameter to the .fiz file + ScndPipePress = std::max( 0.0, ScndPipePress - dt * 0.001 ); // nieszczelności: 0.001=0.1l/s + const double Spz = 0.5067; TMoverParameters *c; double dv1, dv2, dV; diff --git a/Train.cpp b/Train.cpp index d8f2235d..fdea2409 100644 --- a/Train.cpp +++ b/Train.cpp @@ -144,6 +144,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::secondcontrollerdecrease, &TTrain::OnCommand_secondcontrollerdecrease }, { user_command::secondcontrollerdecreasefast, &TTrain::OnCommand_secondcontrollerdecreasefast }, { user_command::notchingrelaytoggle, &TTrain::OnCommand_notchingrelaytoggle }, + { user_command::mucurrentindicatorsourcetoggle, &TTrain::OnCommand_mucurrentindicatorsourcetoggle }, { user_command::independentbrakeincrease, &TTrain::OnCommand_independentbrakeincrease }, { user_command::independentbrakeincreasefast, &TTrain::OnCommand_independentbrakeincreasefast }, { user_command::independentbrakedecrease, &TTrain::OnCommand_independentbrakedecrease }, @@ -157,21 +158,28 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::trainbrakeservice, &TTrain::OnCommand_trainbrakeservice }, { user_command::trainbrakefullservice, &TTrain::OnCommand_trainbrakefullservice }, { user_command::trainbrakeemergency, &TTrain::OnCommand_trainbrakeemergency }, + { user_command::wheelspinbrakeactivate, &TTrain::OnCommand_wheelspinbrakeactivate }, + { user_command::sandboxactivate, &TTrain::OnCommand_sandboxactivate }, { user_command::epbrakecontroltoggle, &TTrain::OnCommand_epbrakecontroltoggle }, { user_command::brakeactingspeedincrease, &TTrain::OnCommand_brakeactingspeedincrease }, { user_command::brakeactingspeeddecrease, &TTrain::OnCommand_brakeactingspeeddecrease }, + { user_command::mubrakingindicatortoggle, &TTrain::OnCommand_mubrakingindicatortoggle }, { user_command::reverserincrease, &TTrain::OnCommand_reverserincrease }, { user_command::reverserdecrease, &TTrain::OnCommand_reverserdecrease }, { user_command::alerteracknowledge, &TTrain::OnCommand_alerteracknowledge }, { user_command::batterytoggle, &TTrain::OnCommand_batterytoggle }, + { user_command::pantographcompressorvalvetoggle, &TTrain::OnCommand_pantographcompressorvalvetoggle }, + { user_command::pantographcompressoractivate, &TTrain::OnCommand_pantographcompressoractivate }, { user_command::pantographtogglefront, &TTrain::OnCommand_pantographtogglefront }, { user_command::pantographtogglerear, &TTrain::OnCommand_pantographtogglerear }, { user_command::pantographlowerall, &TTrain::OnCommand_pantographlowerall }, { user_command::linebreakertoggle, &TTrain::OnCommand_linebreakertoggle }, { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, + { user_command::converteroverloadrelayreset, &TTrain::OnCommand_converteroverloadrelayreset }, { user_command::compressortoggle, &TTrain::OnCommand_compressortoggle }, { user_command::motorconnectorsopen, &TTrain::OnCommand_motorconnectorsopen }, { user_command::motoroverloadrelaythresholdtoggle, &TTrain::OnCommand_motoroverloadrelaythresholdtoggle }, + { user_command::motoroverloadrelayreset, &TTrain::OnCommand_motoroverloadrelayreset }, { user_command::heatingtoggle, &TTrain::OnCommand_heatingtoggle }, { user_command::headlighttoggleleft, &TTrain::OnCommand_headlighttoggleleft }, { user_command::headlighttoggleright, &TTrain::OnCommand_headlighttoggleright }, @@ -183,13 +191,17 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::headlighttogglerearupper, &TTrain::OnCommand_headlighttogglerearupper }, { user_command::redmarkertogglerearleft, &TTrain::OnCommand_redmarkertogglerearleft }, { user_command::redmarkertogglerearright, &TTrain::OnCommand_redmarkertogglerearright }, + { user_command::headlightsdimtoggle, &TTrain::OnCommand_headlightsdimtoggle }, { user_command::interiorlighttoggle, &TTrain::OnCommand_interiorlighttoggle }, { user_command::interiorlightdimtoggle, &TTrain::OnCommand_interiorlightdimtoggle }, { user_command::instrumentlighttoggle, &TTrain::OnCommand_instrumentlighttoggle }, + { user_command::doorlocktoggle, &TTrain::OnCommand_doorlocktoggle }, { user_command::doortoggleleft, &TTrain::OnCommand_doortoggleleft }, { user_command::doortoggleright, &TTrain::OnCommand_doortoggleright }, { user_command::departureannounce, &TTrain::OnCommand_departureannounce }, - { user_command::doorlocktoggle, &TTrain::OnCommand_doorlocktoggle } + { user_command::hornlowactivate, &TTrain::OnCommand_hornlowactivate }, + { user_command::hornhighactivate, &TTrain::OnCommand_hornhighactivate }, + { user_command::radiotoggle, &TTrain::OnCommand_radiotoggle } }; TTrain::TTrain() @@ -561,6 +573,40 @@ void TTrain::OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &C } } +void TTrain::OnCommand_mucurrentindicatorsourcetoggle( TTrain *Train, command_data const &Command ) { + + if( Train->ggNextCurrentButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Current Indicator Source switch is missing, or wasn't defined" ); + } + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->ShowNextCurrent ) { + // turn on + Train->ShowNextCurrent = true; + // audio feedback + if( Train->ggNextCurrentButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggNextCurrentButton.UpdateValue( 1.0 ); + } + else { + //turn off + Train->ShowNextCurrent = false; + // audio feedback + if( Train->ggNextCurrentButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggNextCurrentButton.UpdateValue( 0.0 ); + } + } +} + void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { @@ -645,13 +691,19 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons if( Command.action != GLFW_RELEASE ) { // press or hold - Train->ggReleaserButton.UpdateValue( 1 ); Train->mvOccupied->BrakeReleaser( 1 ); + // audio feedback + if( Train->ggReleaserButton.GetValue() < 0.05 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggReleaserButton.UpdateValue( 1.0 ); } else { // release - Train->ggReleaserButton.UpdateValue( 0 ); Train->mvOccupied->BrakeReleaser( 0 ); + // visual feedback + Train->ggReleaserButton.UpdateValue( 0.0 ); } } } @@ -829,6 +881,76 @@ void TTrain::OnCommand_trainbrakeemergency( TTrain *Train, command_data const &C } } +void TTrain::OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const &Command ) { + + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + if( Train->ggAntiSlipButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Wheelspin Brake button is missing, or wasn't defined" ); + } + return; + } + if( Train->mvOccupied->BrakeSystem == ElectroPneumatic ) { + return; + } + + if( Command.action != GLFW_RELEASE ) { + // press or hold + Train->mvControlled->AntiSlippingBrake(); + // audio feedback + if( Train->ggAntiSlipButton.GetValue() < 0.05 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggAntiSlipButton.UpdateValue( 1.0 ); + } + else { + // release +/* + // audio feedback + if( Train->ggAntiSlipButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } +*/ + // visual feedback + Train->ggAntiSlipButton.UpdateValue( 0.0 ); + } +} + +void TTrain::OnCommand_sandboxactivate( TTrain *Train, command_data const &Command ) { + + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + if( Train->ggSandButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Wheelspin Brake button is missing, or wasn't defined" ); + } + return; + } + + if( Command.action != GLFW_RELEASE ) { + // press or hold + Train->mvControlled->SandDose = true; + // audio feedback + if( Train->ggSandButton.GetValue() < 0.05 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggSandButton.UpdateValue( 1.0 ); + } + else { + // release + Train->mvControlled->SandDose = false; +/* + // audio feedback + if( Train->ggAntiSlipButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } +*/ + // visual feedback + Train->ggSandButton.UpdateValue( 0.0 ); + } +} + void TTrain::OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { @@ -936,6 +1058,44 @@ void TTrain::OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data con } } +void TTrain::OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data const &Command ) { + + if( Train->ggSignallingButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Braking Indicator switch is missing, or wasn't defined" ); + } + return; + } + if( Train->mvControlled->TrainType != dt_EZT ) { + // + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->Signalling) { + // turn on + Train->mvControlled->Signalling = true; + // audio feedback + if( Train->ggSignallingButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggSignallingButton.UpdateValue( 1.0 ); + } + else { + //turn off + Train->mvControlled->Signalling = false; + // audio feedback + if( Train->ggSignallingButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggSignallingButton.UpdateValue( 0.0 ); + } + } +} + void TTrain::OnCommand_reverserincrease( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { @@ -1040,11 +1200,14 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command // audio feedback Train->play_sound( Train->dsbSwitch ); // side-effects +/* + // NOTE: on second thought, don't and let them drop when the pantograph tank pressure drops below threshold if( false == Train->mvControlled->ConverterFlag ) { // if there's no (low voltage) power source left, drop pantographs Train->mvControlled->PantFront( false ); Train->mvControlled->PantRear( false ); } +*/ } } } @@ -1210,24 +1373,28 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & // rear if in front cab Train->mvControlled->PantRearSP = false; if( false == Train->mvControlled->PantRear( false ) ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - Train->ggPantRearButton.UpdateValue( 0.0 ); - // pantograph control can have two-button setup - Train->ggPantRearButtonOff.UpdateValue( 1.0 ); + if( Train->mvControlled->PantRearStart != 0 ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + Train->ggPantRearButton.UpdateValue( 0.0 ); + // pantograph control can have two-button setup + Train->ggPantRearButtonOff.UpdateValue( 1.0 ); + } } } else { // front otherwise Train->mvControlled->PantFrontSP = false; if( false == Train->mvControlled->PantFront( false ) ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - Train->ggPantRearButton.UpdateValue( 0.0 ); - // pantograph control can have two-button setup - Train->ggPantRearButtonOff.UpdateValue( 1.0 ); + if( Train->mvControlled->PantFrontStart != 0 ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + Train->ggPantRearButton.UpdateValue( 0.0 ); + // pantograph control can have two-button setup + Train->ggPantRearButtonOff.UpdateValue( 1.0 ); + } } } } @@ -1252,10 +1419,68 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & } } +void TTrain::OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_data const &Command ) { + + if( ( Train->mvControlled->TrainType == dt_EZT ? + ( Train->mvControlled != Train->mvOccupied ) : + ( Train->mvOccupied->ActiveCab != 0 ) ) ) { + // tylko w maszynowym + return; + } + + if( Command.action == GLFW_PRESS ) { + // only react to press + if( Train->mvControlled->bPantKurek3 == false ) { + // connect pantographs with primary tank + Train->mvControlled->bPantKurek3 = true; + // audio feedback + Train->play_sound( Train->dsbSwitch ); + } + else { + // connect pantograps with pantograph compressor + Train->mvControlled->bPantKurek3 = false; + // audio feedback + Train->play_sound( Train->dsbSwitch ); + } + } +} + +void TTrain::OnCommand_pantographcompressoractivate( TTrain *Train, command_data const &Command ) { + + if( ( Train->mvControlled->TrainType == dt_EZT ? + ( Train->mvControlled != Train->mvOccupied ) : + ( Train->mvOccupied->ActiveCab != 0 ) ) ) { + // tylko w maszynowym + return; + } + + if( ( Train->mvControlled->PantPress > 4.8 ) + || ( false == Train->mvControlled->Battery ) ) { + // needs live power source and low enough pressure to work + return; + } + + if( Command.action != GLFW_RELEASE ) { + // press or hold to activate + Train->mvControlled->PantCompFlag = true; + // audio feedback + if( Command.action == GLFW_PRESS ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + // release to disable + Train->mvControlled->PantCompFlag = false; + } +} + void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ) { if( Train->ggPantAllDownButton.SubModel == nullptr ) { // TODO: expand definition of cab controls so we can know if the control is present without testing for presence of 3d switch + if( Command.action == GLFW_PRESS ) { + WriteLog( "Lower All Pantographs switch is missing, or wasn't defined" ); + } return; } if( Command.action == GLFW_PRESS ) { @@ -1291,6 +1516,25 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co } void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ) { + + if( ( Command.action == GLFW_PRESS ) + && ( true == Train->m_linebreakerclosed ) + && ( false == Train->mvControlled->Mains ) + && ( Train->ggMainButton.GetValue() < 0.05 ) ) { + // crude way to catch cases where the main was knocked out and the user is trying to restart it + // because the state of the line breaker isn't changed to match, we need to do it here manually + Train->m_linebreakerclosed = false; + } + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( ( true == Train->m_linebreakerclosed ) + && ( Train->mvControlled->TrainType == dt_EZT ) ) { + // a single impulse switch can't open the circuit, only close it + return; + } + + if( Command.action != GLFW_RELEASE ) { // press or hold... if( false == Train->mvControlled->Mains ) { @@ -1337,13 +1581,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // ...to open the circuit if( true == Train->m_linebreakerclosed ) { // safety check so we don't open the circuit right after closing - // NOTE: we don't have switch type definition for the line breaker switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( Train->mvControlled->TrainType == dt_EZT ) { - // a single impulse switch can't open the circuit, only close it - return; - } if( Train->mvControlled->MainSwitch( false ) ) { if( Train->ggMainOffButton.SubModel != nullptr ) { @@ -1393,24 +1630,21 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // release... if( false == Train->mvControlled->Mains ) { // ...after opening circuit, or holding for too short time to close it - /* - if( mvControlled->ConverterAllow ) { - // po puszczeniu przycisku od WSa odpalanie potwora - mvControlled->ConverterSwitch( true ); - } - */ // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, if( Train->fMainRelayTimer > 0.0f ) { Train->play_sound( Train->dsbRelay ); Train->fMainRelayTimer = 0.0f; } // we don't exactly know which of the two buttons was used, so reset both + // for setup with two separate swiches if( Train->ggMainOnButton.SubModel != nullptr ) { - // setup with two separate swiches Train->ggMainOnButton.UpdateValue( 0.0 ); + // audio feedback + if( Train->ggMainOnButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } } if( Train->ggMainOffButton.SubModel != nullptr ) { - // setup with two separate swiches Train->ggMainOffButton.UpdateValue( 0.0 ); } // and the two-state switch too, for good measure @@ -1429,6 +1663,10 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // side-effects Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); + // audio feedback + if( Train->ggMainOnButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } // visual feedback if( Train->ggMainOnButton.SubModel != nullptr ) { // setup with two separate switches @@ -1487,8 +1725,15 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma else { //turn off // sound feedback - if( Train->ggConverterButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); + if( Train->mvOccupied->ConvSwitchType == "impulse" ) { + if( Train->ggConverterOffButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + } + else { + if( Train->ggConverterButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } } // visual feedback Train->ggConverterButton.UpdateValue( 0.0 ); @@ -1507,10 +1752,13 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma Train->mvControlled->ConvOvldFlag = false; } // if there's no (low voltage) power source left, drop pantographs +/* + // NOTE: on second thought, don't and let them drop when the pantograph tank pressure drops below threshold if( false == Train->mvControlled->Battery ) { Train->mvControlled->PantFront( false ); Train->mvControlled->PantRear( false ); } +*/ } } } @@ -1529,6 +1777,40 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } } +void TTrain::OnCommand_converteroverloadrelayreset( TTrain *Train, command_data const &Command ) { + + if( Train->ggConverterFuseButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Converter Overload Relay Reset button is missing, or wasn't defined" ); + } +// return; + } + + if( Command.action == GLFW_PRESS ) { + // press + if( ( Train->mvControlled->Mains == false ) + && ( Train->ggConverterButton.GetValue() < 0.05 ) + && ( Train->mvControlled->TrainType != dt_EZT ) ) { + Train->mvControlled->ConvOvldFlag = false; + } + // sound feedback + if( Train->ggConverterFuseButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggConverterFuseButton.UpdateValue( 1.0 ); + } + else if( Command.action == GLFW_RELEASE ) { + // release + // sound feedback + if( Train->ggConverterFuseButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggConverterFuseButton.UpdateValue( 0.0 ); + } +} + void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Command ) { if( Train->mvControlled->CompressorPower >= 2 ) { @@ -1596,6 +1878,9 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C // TODO: don't rely on presense of 3d model to determine presence of the switch if( Train->ggStLinOffButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Open Motor Power Connectors button is missing, or wasn't defined" ); + } return; } @@ -1607,16 +1892,20 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C Train->play_sound( Train->dsbRelay ); } Train->mvControlled->StLinSwitchOff = true; - // visual feedback - Train->ggStLinOffButton.UpdateValue( 1.0 ); // sound feedback if( Train->ggStLinOffButton.GetValue() < 0.05 ) { Train->play_sound( Train->dsbSwitch ); } + // visual feedback + Train->ggStLinOffButton.UpdateValue( 1.0 ); } else { // button released Train->mvControlled->StLinSwitchOff = false; + // sound feedback + if( Train->ggStLinOffButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } // visual feedback Train->ggStLinOffButton.UpdateValue( 0.0 ); } @@ -1651,6 +1940,36 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command } } +void TTrain::OnCommand_motoroverloadrelayreset( TTrain *Train, command_data const &Command ) { + + if( Train->ggFuseButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Motor Overload Relay Reset button is missing, or wasn't defined" ); + } +// return; + } + + if( Command.action == GLFW_PRESS ) { + // press + Train->mvControlled->FuseOn(); + // sound feedback + if( Train->ggFuseButton.GetValue() < 0.05 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggFuseButton.UpdateValue( 1.0 ); + } + else if( Command.action == GLFW_RELEASE ) { + // release + // sound feedback + if( Train->ggFuseButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggFuseButton.UpdateValue( 0.0 ); + } +} + void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ) { if( Train->mvOccupied->LightsPosNo > 0 ) { @@ -2025,11 +2344,50 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con } } +void TTrain::OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &Command ) { + + // NOTE: the check is disabled, as we're presuming light control is present in every vehicle + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + if( Train->ggDimHeadlightsButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Dim Headlights switch is missing, or wasn't defined" ); + } + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->DynamicObject->DimHeadlights ) { + // turn on + Train->DynamicObject->DimHeadlights = true; + // audio feedback + if( Train->ggDimHeadlightsButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggDimHeadlightsButton.UpdateValue( 1.0 ); + } + else { + //turn off + Train->DynamicObject->DimHeadlights = false; + // audio feedback + if( Train->ggDimHeadlightsButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggDimHeadlightsButton.UpdateValue( 0.0 ); + } + } +} + void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &Command ) { // NOTE: the check is disabled, as we're presuming light control is present in every vehicle // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels if( Train->ggCabLightButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Interior Light switch is missing, or wasn't defined" ); + } return; } @@ -2064,6 +2422,9 @@ void TTrain::OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels if( Train->ggCabLightDimButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Dim Interior Light switch is missing, or wasn't defined" ); + } return; } @@ -2097,6 +2458,9 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const // NOTE: the check is disabled, as we're presuming light control is present in every vehicle // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels if( Train->ggUniversal3Button.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Universal3 switch is missing, or wasn't defined" ); + } return; } @@ -2129,6 +2493,9 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ) { if( Train->ggTrainHeatingButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Train Heating switch is missing, or wasn't defined" ); + } return; } @@ -2136,18 +2503,13 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->Heating ) { // turn on - if( ( ( Train->mvControlled->EngineType == ElectricSeriesMotor ) - && ( Train->mvControlled->Mains == true ) ) - || ( Train->mvControlled->ConverterFlag ) ) { - - Train->mvControlled->Heating = true; - // audio feedback - if( Train->ggTrainHeatingButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } - // visual feedback - Train->ggTrainHeatingButton.UpdateValue( 1.0 ); + Train->mvControlled->Heating = true; + // audio feedback + if( Train->ggTrainHeatingButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); } + // visual feedback + Train->ggTrainHeatingButton.UpdateValue( 1.0 ); } else { //turn off @@ -2162,6 +2524,44 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command } } +void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ) { + + if( Train->ggDoorSignallingButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Door Lock switch is missing, or wasn't defined" ); + } + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the sound can loop uninterrupted + if( false == Train->mvControlled->DoorSignalling ) { + // turn on + // TODO: check wheter we really need separate flags for this + Train->mvControlled->DoorSignalling = true; + Train->mvOccupied->DoorBlocked = true; + // audio feedback + if( Train->ggDoorSignallingButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggDoorSignallingButton.UpdateValue( 1.0 ); + } + else { + // turn off + // TODO: check wheter we really need separate flags for this + Train->mvControlled->DoorSignalling = false; + Train->mvOccupied->DoorBlocked = false; + // audio feedback + if( Train->ggDoorSignallingButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggDoorSignallingButton.UpdateValue( 0.0 ); + } + } +} + void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ) { if( Train->mvOccupied->DoorOpenCtrl != 1 ) { @@ -2287,6 +2687,9 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Command ) { if( Train->ggDepartureSignalButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Departure Signal button is missing, or wasn't defined" ); + } return; } @@ -2315,37 +2718,114 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com } } -void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ) { +void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Command ) { - if( Train->ggDoorSignallingButton.SubModel == nullptr ) { + if( Train->ggHornButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Horn button is missing, or wasn't defined" ); + } + return; + } + + if( Command.action == GLFW_PRESS ) { + // only need to react to press, sound will continue until stopped + if( false == TestFlag( Train->mvOccupied->WarningSignal, 1 ) ) { + // turn on + Train->mvOccupied->WarningSignal |= 1; + if( true == TestFlag( Train->mvOccupied->WarningSignal, 2 ) ) { + // low and high horn are treated as mutually exclusive + Train->mvControlled->WarningSignal &= ~2; + } + // audio feedback + if( Train->ggHornButton.GetValue() > -0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggHornButton.UpdateValue( -1.0 ); + } + } + else if( Command.action == GLFW_RELEASE ) { + // turn off + // NOTE: we turn off both low and high horn, due to unreliability of release event when shift key is involved + Train->mvControlled->WarningSignal &= ~( 1 | 2 ); + // audio feedback + if( Train->ggHornButton.GetValue() < -0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggHornButton.UpdateValue( 0.0 ); + } +} + +void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Command ) { + + if( Train->ggHornButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Horn button is missing, or wasn't defined" ); + } + return; + } + + if( Command.action == GLFW_PRESS ) { + // only need to react to press, sound will continue until stopped + if( false == TestFlag( Train->mvOccupied->WarningSignal, 2 ) ) { + // turn on + Train->mvOccupied->WarningSignal |= 2; + if( true == TestFlag( Train->mvOccupied->WarningSignal, 1 ) ) { + // low and high horn are treated as mutually exclusive + Train->mvControlled->WarningSignal &= ~1; + } + // audio feedback + if( Train->ggHornButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggHornButton.UpdateValue( 1.0 ); + } + } + else if( Command.action == GLFW_RELEASE ) { + // turn off + // NOTE: we turn off both low and high horn, due to unreliability of release event when shift key is involved + Train->mvControlled->WarningSignal &= ~( 1 | 2 ); + // audio feedback + if( Train->ggHornButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggHornButton.UpdateValue( 0.0 ); + } +} + +void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command ) { + + if( Train->ggRadioButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Radio switch is missing, or wasn't defined" ); + } return; } if( Command.action == GLFW_PRESS ) { // only reacting to press, so the sound can loop uninterrupted - if( false == Train->mvControlled->DoorSignalling ) { + if( false == Train->mvOccupied->Radio ) { // turn on - // TODO: check wheter we really need separate flags for this - Train->mvControlled->DoorSignalling = true; - Train->mvOccupied->DoorBlocked = true; + Train->mvOccupied->Radio = true; // audio feedback - if( Train->ggDoorSignallingButton.GetValue() < 0.5 ) { + if( Train->ggRadioButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } // visual feedback - Train->ggDoorSignallingButton.UpdateValue( 1.0 ); + Train->ggRadioButton.UpdateValue( 1.0 ); } else { // turn off - // TODO: check wheter we really need separate flags for this - Train->mvControlled->DoorSignalling = false; - Train->mvOccupied->DoorBlocked = false; + Train->mvOccupied->Radio = false; // audio feedback - if( Train->ggDoorSignallingButton.GetValue() > 0.5 ) { + if( Train->ggRadioButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } // visual feedback - Train->ggDoorSignallingButton.UpdateValue( 0.0 ); + Train->ggRadioButton.UpdateValue( 0.0 ); } } } @@ -2372,7 +2852,6 @@ void TTrain::OnKeyDown(int cKey) dsbNastawnikJazdy->Play(0, 0, 0); } } -#endif if (cKey == Global::Keys[k_DirectionBackward]) { if (mvOccupied->Radio == false) @@ -2382,7 +2861,6 @@ void TTrain::OnKeyDown(int cKey) mvOccupied->Radio = true; } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_DecMainCtrlFAST]) if (mvControlled->DecMainCtrl(2)) { @@ -2460,7 +2938,6 @@ void TTrain::OnKeyDown(int cKey) } } } -#endif if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // shift&ctrl are used for light dimming { if (mvControlled->TrainType == dt_EZT) @@ -2472,9 +2949,9 @@ void TTrain::OnKeyDown(int cKey) } } } - else if (cKey == Global::Keys[k_Sand]) + else + if( cKey == Global::Keys[ k_Sand ] ) { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM if( mvControlled->TrainType == dt_EZT ) { if (ggDoorSignallingButton.SubModel != NULL) @@ -2488,7 +2965,6 @@ void TTrain::OnKeyDown(int cKey) } } else if (mvControlled->TrainType != dt_EZT) -#endif { if (ggSandButton.SubModel != NULL) { @@ -2498,7 +2974,6 @@ void TTrain::OnKeyDown(int cKey) } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM if( cKey == Global::Keys[ k_Main ] ) { if (fabs(ggMainOnButton.GetValue()) < 0.001) @@ -2508,8 +2983,9 @@ void TTrain::OnKeyDown(int cKey) dsbSwitch->Play(0, 0, 0); } } + else #endif - else if (cKey == Global::Keys[k_BrakeProfile]) // McZapkie-240302-B: + if( cKey == Global::Keys[ k_BrakeProfile ] ) // McZapkie-240302-B: //----------- // przelacznik opoznienia @@ -2535,13 +3011,11 @@ void TTrain::OnKeyDown(int cKey) else { TDynamicObject *temp; - temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, - CouplNr)); + temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr)); if (temp == NULL) { CouplNr = -2; - temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, - CouplNr)); + temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr)); } if (temp) { @@ -2581,7 +3055,6 @@ void TTrain::OnKeyDown(int cKey) dsbSwitch->Play(0, 0, 0); } } -#endif else if( cKey == Global::Keys[ k_SmallCompressor ] ) // Winger 160404: mala // sprezarka wl { // Ra: dźwięk, gdy razem z [Shift] @@ -2589,7 +3062,7 @@ void TTrain::OnKeyDown(int cKey) !mvOccupied->ActiveCab) // tylko w maszynowym if (Global::ctrlState) // z [Ctrl] mvControlled->bPantKurek3 = true; // zbiornik pantografu połączony - // jest ze zbiornikiem głównym + // jest ze zbiornikiem głównym // (pompowanie nie ma sensu) else if (!mvControlled->PantCompFlag) // jeśli wyłączona if (mvControlled->Battery) // jeszcze musi być załączona bateria @@ -2599,7 +3072,8 @@ void TTrain::OnKeyDown(int cKey) play_sound( dsbSwitch ); // dźwięk tylko po naciśnięciu klawisza } } - else if (cKey == GLFW_KEY_Q) // ze Shiftem - włączenie AI +#endif + else if( cKey == GLFW_KEY_Q ) // ze Shiftem - włączenie AI { // McZapkie-240302 - wlaczanie automatycznego pilota (zadziala tylko w // trybie debugmode) if (DynamicObject->Mechanik) @@ -3238,8 +3712,6 @@ void TTrain::OnKeyDown(int cKey) else keybrakecount+=1; */ } -#endif -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if( cKey == Global::Keys[ k_EmergencyBrake ] ) { // while (mvOccupied->IncBrakeLevel()); @@ -3341,7 +3813,6 @@ void TTrain::OnKeyDown(int cKey) } // ggSecurityResetButton.PutValue(1); } -#endif else if( cKey == Global::Keys[ k_AntiSlipping ] ) //--------------- // hunter-221211: hamulec przeciwposlizgowy przeniesiony do @@ -3359,7 +3830,7 @@ void TTrain::OnKeyDown(int cKey) // ggAntiSlipButton.PutValue(1); } } - else if (cKey == Global::Keys[k_Fuse]) + else if( cKey == Global::Keys[ k_Fuse ] ) //--------------- { if (Global::ctrlState) // z controlem @@ -3375,7 +3846,6 @@ void TTrain::OnKeyDown(int cKey) mvControlled->FuseOn(); } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_DirectionForward]) // McZapkie-240302 - zmiana kierunku: 'd' do przodu, 'r' do tylu { @@ -3402,7 +3872,6 @@ void TTrain::OnKeyDown(int cKey) Change_direction); // aktualizacja skrajnych pojazdów w składzie } } -#endif else if (cKey == Global::Keys[k_DirectionBackward]) // r { if (Global::ctrlState) @@ -3413,7 +3882,6 @@ void TTrain::OnKeyDown(int cKey) mvOccupied->Radio = false; } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (mvOccupied->DirectionBackward()) { //------------ @@ -3436,9 +3904,7 @@ void TTrain::OnKeyDown(int cKey) DynamicObject->Mechanik->CheckVehicles( Change_direction); // aktualizacja skrajnych pojazdów w składzie } -#endif } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if( cKey == Global::Keys[ k_Main ] ) // McZapkie-240302 - wylaczanie glownego obwodu //----------- @@ -3506,13 +3972,11 @@ void TTrain::OnKeyDown(int cKey) else { TDynamicObject *temp; - temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, - CouplNr)); + temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr)); if (temp == NULL) { CouplNr = -2; - temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, - CouplNr)); + temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr)); } if (temp) { @@ -3575,7 +4039,6 @@ void TTrain::OnKeyDown(int cKey) } } } -#endif else if (cKey == Global::Keys[k_SmallCompressor]) // Winger 160404: mala sprezarka wl { // Ra: bez [Shift] też dać dźwięk if ((mvControlled->TrainType & dt_EZT) ? mvControlled == mvOccupied : @@ -3584,7 +4047,7 @@ void TTrain::OnKeyDown(int cKey) mvControlled->bPantKurek3 = false; // zbiornik pantografu połączony jest z małą sprężarką // (pompowanie ma sens, ale potem trzeba przełączyć) - else if (!mvControlled->PantCompFlag) // jeśli wyłączona + else if( !mvControlled->PantCompFlag ) // jeśli wyłączona if (mvControlled->Battery) // jeszcze musi być załączona bateria if (mvControlled->PantPress < 4.8) // piszą, że to tak nie działa { @@ -3592,6 +4055,7 @@ void TTrain::OnKeyDown(int cKey) play_sound( dsbSwitch ); // dźwięk tylko po naciśnięciu klawisza } } +#endif // McZapkie-240302 - wylaczanie automatycznego pilota (w trybie ~debugmode // mozna tylko raz) else if (cKey == GLFW_KEY_Q) // bez Shift @@ -3620,10 +4084,8 @@ void TTrain::OnKeyDown(int cKey) play_sound( dsbSwitch ); } } -#endif // hunter-201211: piasecznica poprawiona oraz przeniesiona do // TTrain::Update() -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if( cKey == Global::Keys[ k_Sand ] ) { /* @@ -3841,9 +4303,10 @@ if } } } - if (DynamicObject->Mechanik) // na wszelki wypadek - DynamicObject->Mechanik->CheckVehicles( - Disconnect); // aktualizacja skrajnych pojazdów w składzie + if( DynamicObject->Mechanik ) { + // aktualizacja skrajnych pojazdów w składzie + DynamicObject->Mechanik->CheckVehicles( Disconnect ); + } } } #ifdef EU07_USE_OLD_COMMAND_SYSTEM @@ -4248,11 +4711,9 @@ if } } } -#endif else if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // Winger 110904: wylacznik st. // liniowych { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM if( ( mvControlled->TrainType != dt_EZT ) && ( mvControlled->TrainType != dt_EP05 ) && (mvControlled->TrainType != dt_ET40)) { @@ -4265,7 +4726,6 @@ if play_sound( dsbRelay ); } } -#endif if (mvControlled->TrainType == dt_EZT) { if (mvControlled->Signalling == true) @@ -4275,6 +4735,7 @@ if } } } +#endif else { // McZapkie: poruszanie sie po kabinie, w updatemechpos zawarte sa wiezy @@ -4379,7 +4840,7 @@ if ++iRadioChannel; // 0=wyłączony } } - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM // TODO: break the mess above into individual command-based routines. // TODO: test for modifiers inside the routines, instead of grouping by the modifier // TODO: do away with the modifier tests, each command should be separate and issued by input processor(s) up the chain @@ -4400,6 +4861,7 @@ if play_sound( dsbSwitch ); } } +#endif } void TTrain::OnKeyUp(int cKey) @@ -4571,7 +5033,23 @@ bool TTrain::Update( double const Deltatime ) DWORD stat; double dt = Deltatime; // Timer::GetDeltaTime(); - +/* + // NOTE: disabled while switch state isn't preserved while moving between compartments + // check whether we should raise the pantographs, based on volume in pantograph tank + if( mvControlled->PantPress > ( + mvControlled->TrainType == dt_EZT ? + 2.4 : + 3.5 ) ) { + if( ( false == mvControlled->PantFrontUp ) + && ( ggPantFrontButton.GetValue() > 0.95 ) ) { + mvControlled->PantFront( true ); + } + if( ( false == mvControlled->PantRearUp ) + && ( ggPantRearButton.GetValue() > 0.95 ) ) { + mvControlled->PantRear( true ); + } + } +*/ if (DynamicObject->mdKabina) { // Ra: TODO: odczyty klawiatury/pulpitu nie // powinny być uzależnione od istnienia modelu @@ -5838,7 +6316,9 @@ bool TTrain::Update( double const Deltatime ) ggMainButton.Update(); if (ggRadioButton.SubModel) { - ggRadioButton.PutValue(mvOccupied->Radio ? 1 : 0); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + ggRadioButton.PutValue( mvOccupied->Radio ? 1 : 0 ); +#endif ggRadioButton.Update(); } if (ggConverterButton.SubModel) @@ -5994,8 +6474,9 @@ bool TTrain::Update( double const Deltatime ) ggLightsButton.Update(); } if( ggDimHeadlightsButton.SubModel ) { - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM ggDimHeadlightsButton.PutValue( DynamicObject->DimHeadlights ? 1.0 : 0.0 ); +#endif ggDimHeadlightsButton.Update(); } @@ -6033,7 +6514,9 @@ bool TTrain::Update( double const Deltatime ) } if (ggSignallingButton.SubModel != nullptr) { - ggSignallingButton.PutValue(mvControlled->Signalling ? 1 : 0); +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + ggSignallingButton.PutValue( mvControlled->Signalling ? 1 : 0 ); +#endif ggSignallingButton.Update(); } if (ggDoorSignallingButton.SubModel != nullptr) @@ -6122,7 +6605,8 @@ bool TTrain::Update( double const Deltatime ) //****************************************** // przelaczniki - if (Console::Pressed(Global::Keys[k_Horn])) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( Console::Pressed( Global::Keys[ k_Horn ] ) ) { if (Global::shiftState) { @@ -6152,7 +6636,6 @@ bool TTrain::Update( double const Deltatime ) SetFlag(mvOccupied->WarningSignal, 2); } //---------------- -#ifdef EU07_USE_OLD_COMMAND_SYSTEM // hunter-141211: wyl. szybki zalaczony i wylaczony przeniesiony z // OnKeyPress() if (Global::shiftState && Console::Pressed(Global::Keys[k_Main])) @@ -6295,7 +6778,8 @@ bool TTrain::Update( double const Deltatime ) } */ - if (Console::Pressed(Global::Keys[k_Sand])) +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( Console::Pressed( Global::Keys[ k_Sand ] ) ) { if (mvControlled->TrainType != dt_EZT && ggSandButton.SubModel != NULL) { @@ -6327,7 +6811,6 @@ bool TTrain::Update( double const Deltatime ) else ggAntiSlipButton.UpdateValue(0); //----------------- -#ifdef EU07_USE_OLD_COMMAND_SYSTEM // hunter-261211: przetwornica i sprezarka if (Global::shiftState && Console::Pressed(Global::Keys[k_Converter])) // NBMX 14-09-2003: przetwornica wl @@ -6438,12 +6921,23 @@ bool TTrain::Update( double const Deltatime ) ggUniversal1Button.DecValue(dt / 2); } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (!Console::Pressed(Global::Keys[k_SmallCompressor])) // Ra: przecieść to na zwolnienie klawisza if (DynamicObject->Mechanik ? !DynamicObject->Mechanik->AIControllFlag : false) // nie wyłączać, gdy AI mvControlled->PantCompFlag = false; // wyłączona, gdy nie trzymamy klawisza - +#else + if( ( ( DynamicObject->Mechanik != nullptr ) + && ( false == DynamicObject->Mechanik->AIControllFlag ) ) + && ( mvControlled->TrainType == dt_EZT ? + ( mvControlled != mvOccupied ) : + ( mvOccupied->ActiveCab != 0 ) ) ) { + // HACK: if we're in one of the cabs we can't be activating pantograph compressor + // NOTE: this will break in multiplayer setups, do a proper tracking of pantograph user then + mvControlled->PantCompFlag = false; + } +#endif if (Console::Pressed(Global::Keys[k_Univ2])) { if (!DebugModeFlag) @@ -6703,7 +7197,6 @@ bool TTrain::Update( double const Deltatime ) } else ggMainButton.PutValue(0); -#endif if (Console::Pressed(Global::Keys[k_CurrentNext])) { if (mvControlled->TrainType != dt_EZT) @@ -6718,7 +7211,6 @@ bool TTrain::Update( double const Deltatime ) } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else { if (Global::shiftState) @@ -6745,7 +7237,6 @@ bool TTrain::Update( double const Deltatime ) } } } -#endif } else { @@ -6759,7 +7250,6 @@ bool TTrain::Update( double const Deltatime ) } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM // Winger 010304 PantAllDownButton if (Console::Pressed(Global::Keys[k_PantFrontUp])) { @@ -6855,6 +7345,7 @@ bool TTrain::Update( double const Deltatime ) ggPantFrontButton.Update(); ggPantRearButton.Update(); ggPantFrontButtonOff.Update(); + ggPantRearButtonOff.Update(); ggUpperLightButton.Update(); ggLeftLightButton.Update(); ggRightLightButton.Update(); @@ -6891,15 +7382,12 @@ bool TTrain::Update( double const Deltatime ) ggMainOnButton.UpdateValue(0); ggSecurityResetButton.UpdateValue(0); ggReleaserButton.UpdateValue(0); -#endif ggSandButton.UpdateValue(0); ggAntiSlipButton.UpdateValue(0); -#ifdef EU07_USE_OLD_COMMAND_SYSTEM ggDepartureSignalButton.UpdateValue( 0 ); -#endif ggFuseButton.UpdateValue( 0 ); ggConverterFuseButton.UpdateValue(0); - +#endif pyScreens.update(); } // wyprowadzenie sygnałów dla haslera na PoKeys (zaznaczanie na taśmie) @@ -7759,13 +8247,15 @@ void TTrain::clear_cab_controls() // NOTE: we can get rid of this function once we have per-cab persistent state void TTrain::set_cab_controls() { - // switches // battery if( true == mvOccupied->Battery ) { ggBatteryButton.PutValue( 1.0 ); } - + // radio + if( true == mvOccupied->Radio ) { + ggRadioButton.PutValue( 1.0 ); + } // pantographs if( mvOccupied->PantSwitchType != "impulse" ) { ggPantFrontButton.PutValue( @@ -7781,7 +8271,6 @@ void TTrain::set_cab_controls() { 0.0 : 1.0 ); } - if( mvOccupied->PantSwitchType != "impulse" ) { ggPantRearButton.PutValue( ( mvOccupied->ActiveCab == 1 ? @@ -7796,7 +8285,6 @@ void TTrain::set_cab_controls() { 0.0 : 1.0 ); } - // converter if( mvOccupied->ConvSwitchType != "impulse" ) { ggConverterButton.PutValue( @@ -7804,17 +8292,14 @@ void TTrain::set_cab_controls() { 1.0 : 0.0 ); } - // compressor if( true == mvControlled->CompressorAllow ) { ggCompressorButton.PutValue( 1.0 ); } - // motor overload relay threshold / shunt mode if( mvControlled->Imax == mvControlled->ImaxHi ) { ggMaxCurrentCtrl.PutValue( 1.0 ); } - // lights int const lightsindex = ( mvOccupied->ActiveCab == 1 ? @@ -7836,7 +8321,9 @@ void TTrain::set_cab_controls() { if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_right ) != 0 ) { ggRightEndLightButton.PutValue( 1.0 ); } - + if( true == DynamicObject->DimHeadlights ) { + ggDimHeadlightsButton.PutValue( 1.0 ); + } // cab lights if( true == bCabLight ) { ggCabLightButton.PutValue( 1.0 ); @@ -7847,7 +8334,6 @@ void TTrain::set_cab_controls() { if( true == LampkaUniversal3_st ) { ggUniversal3Button.PutValue( 1.0 ); } - // doors // NOTE: we're relying on the cab models to have switches reversed for the rear cab(?) ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1.0 : 0.0 ); @@ -7856,14 +8342,11 @@ void TTrain::set_cab_controls() { if( true == mvControlled->DoorSignalling ) { ggDoorSignallingButton.PutValue( 1.0 ); } - // heating if( true == mvControlled->Heating ) { ggTrainHeatingButton.PutValue( 1.0 ); } - // brake acting time - // visual feedback if( ggBrakeProfileCtrl.SubModel != nullptr ) { ggBrakeProfileCtrl.PutValue( ( ( mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? @@ -7882,10 +8365,19 @@ void TTrain::set_cab_controls() { 1.0 : 0.0 ); } - + // brake signalling + ggSignallingButton.PutValue( + mvControlled->Signalling ? + 1.0 : + 0.0 ); + // multiple-unit current indicator source + ggNextCurrentButton.PutValue( + ShowNextCurrent ? + 1.0 : + 0.0 ); + // we reset all indicators, as they're set during the update pass // TODO: when cleaning up break setting indicator state into a separate function, so we can reuse it - } // initializes a button matching provided label. returns: true if the label was found, false diff --git a/Train.h b/Train.h index 875b9f32..1bce34d6 100644 --- a/Train.h +++ b/Train.h @@ -120,6 +120,7 @@ class TTrain static void OnCommand_secondcontrollerdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_mucurrentindicatorsourcetoggle( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakeincrease( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakeincreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakedecrease( TTrain *Train, command_data const &Command ); @@ -133,21 +134,28 @@ class TTrain static void OnCommand_trainbrakeservice( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakefullservice( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakeemergency( TTrain *Train, command_data const &Command ); + static void OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const &Command ); + static void OnCommand_sandboxactivate( TTrain *Train, command_data const &Command ); static void OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data const &Command ); static void OnCommand_reverserincrease( TTrain *Train, command_data const &Command ); static void OnCommand_reverserdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_alerteracknowledge( TTrain *Train, command_data const &Command ); static void OnCommand_batterytoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_pantographcompressoractivate( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglefront( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglerear( TTrain *Train, command_data const &Command ); static void OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_converteroverloadrelayreset( TTrain *Train, command_data const &Command ); static void OnCommand_compressortoggle( TTrain *Train, command_data const &Command ); static void OnCommand_motorconnectorsopen( TTrain *Train, command_data const &Command ); static void OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_motoroverloadrelayreset( TTrain *Train, command_data const &Command ); static void OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleright( TTrain *Train, command_data const &Command ); @@ -159,13 +167,17 @@ class TTrain static void OnCommand_headlighttogglerearupper( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertogglerearleft( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertogglerearright( TTrain *Train, command_data const &Command ); + static void OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_interiorlighttoggle( TTrain *Train, command_data const &Command ); static void OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_instrumentlighttoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleright( TTrain *Train, command_data const &Command ); static void OnCommand_departureannounce( TTrain *Train, command_data const &Command ); - static void OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_hornlowactivate( TTrain *Train, command_data const &Command ); + static void OnCommand_hornhighactivate( TTrain *Train, command_data const &Command ); + static void OnCommand_radiotoggle( TTrain *Train, command_data const &Command ); // members TDynamicObject *DynamicObject; // przestawia zmiana pojazdu [F5] @@ -222,8 +234,7 @@ public: // reszta może by?publiczna TGauge ggSandButton; // guzik piasecznicy TGauge ggAntiSlipButton; TGauge ggFuseButton; - TGauge ggConverterFuseButton; // hunter-261211: przycisk odblokowania - // nadmiarowego przetwornic i ogrzewania + TGauge ggConverterFuseButton; // hunter-261211: przycisk odblokowania nadmiarowego przetwornic i ogrzewania TGauge ggStLinOffButton; TGauge ggRadioButton; TGauge ggUpperLightButton; diff --git a/command.cpp b/command.cpp index cdc811a7..6d75124e 100644 --- a/command.cpp +++ b/command.cpp @@ -27,6 +27,7 @@ commanddescription_sequence Commands_descriptions = { { "secondcontrollerincreasefast", command_target::vehicle }, { "secondcontrollerdecrease", command_target::vehicle }, { "secondcontrollerdecreasefast", command_target::vehicle }, + { "mucurrentindicatorsourcetoggle", command_target::vehicle }, { "independentbrakeincrease", command_target::vehicle }, { "independentbrakeincreasefast", command_target::vehicle }, { "independentbrakedecrease", command_target::vehicle }, @@ -40,30 +41,26 @@ commanddescription_sequence Commands_descriptions = { { "trainbrakeservice", command_target::vehicle }, { "trainbrakefullservice", command_target::vehicle }, { "trainbrakeemergency", command_target::vehicle }, -/* -const int k_AntiSlipping = 21; -const int k_Sand = 22; -*/ + { "wheelspinbrakeactivate", command_target::vehicle }, + { "sandboxactivate", command_target::vehicle }, { "reverserincrease", command_target::vehicle }, { "reverserdecrease", command_target::vehicle }, { "linebreakertoggle", command_target::vehicle }, -/* -const int k_Fuse = 26; -*/ { "convertertoggle", command_target::vehicle }, + { "converteroverloadrelayreset", command_target::vehicle }, { "compressortoggle", command_target::vehicle }, { "motoroverloadrelaythresholdtoggle", command_target::vehicle }, + { "motoroverloadrelayreset", command_target::vehicle }, { "notchingrelaytoggle", command_target::vehicle }, { "epbrakecontroltoggle", command_target::vehicle }, { "brakeactingspeedincrease", command_target::vehicle }, { "brakeactingspeeddecrease", command_target::vehicle }, -/* -const int k_BrakeProfile = 31; -*/ + { "mubrakingindicatortoggle", command_target::vehicle }, { "alerteracknowledge", command_target::vehicle }, + { "hornlowactivate", command_target::vehicle }, + { "hornhighctivate", command_target::vehicle }, + { "radiotoggle", command_target::vehicle }, /* -const int k_Horn = 33; -const int k_Horn2 = 34; const int k_FailedEngineCutOff = 35; */ { "viewturn", command_target::entity }, @@ -93,6 +90,8 @@ const int k_ProgramHelp = 48; { "doortoggleright", command_target::vehicle }, { "departureannounce", command_target::vehicle }, { "doorlocktoggle", command_target::vehicle }, + { "pantographcompressorvalvetoggle", command_target::vehicle }, + { "pantographcompressoractivate", command_target::vehicle }, { "pantographtogglefront", command_target::vehicle }, { "pantographtogglerear", command_target::vehicle }, { "pantographlowerall", command_target::vehicle }, @@ -110,13 +109,8 @@ const int k_ProgramHelp = 48; { "headlighttogglerearupper", command_target::vehicle }, { "redmarkertogglerearleft", command_target::vehicle }, { "redmarkertogglerearright", command_target::vehicle }, -/* -const int k_SmallCompressor = 63; -*/ + { "headlightsdimtoggle", command_target::vehicle }, { "motorconnectorsopen", command_target::vehicle }, -/* -const int k_CurrentNext = 65; -*/ { "interiorlighttoggle", command_target::vehicle }, { "interiorlightdimtoggle", command_target::vehicle }, { "instrumentlighttoggle", command_target::vehicle }, @@ -131,7 +125,6 @@ const int k_Active = 71; { "batterytoggle", command_target::vehicle } /* const int k_WalkMode = 73; -int const k_DimHeadlights = 74; */ }; @@ -192,7 +185,23 @@ command_relay::post( user_command const Command, std::uint64_t const Param1, std if( Action != GLFW_RELEASE ) { // key was pressed or is still held if( false == command.name.empty() ) { - WriteLog( "Command issued: " + command.name ); + if( false == ( + ( Command == user_command::moveleft ) + || ( Command == user_command::moveleftfast ) + || ( Command == user_command::moveright ) + || ( Command == user_command::moverightfast ) + || ( Command == user_command::moveforward ) + || ( Command == user_command::moveforwardfast ) + || ( Command == user_command::moveback ) + || ( Command == user_command::movebackfast ) + || ( Command == user_command::moveup ) + || ( Command == user_command::moveupfast ) + || ( Command == user_command::movedown ) + || ( Command == user_command::movedownfast ) + || ( Command == user_command::movevector ) + || ( Command == user_command::viewturn ) ) ) { + WriteLog( "Command issued: " + command.name ); + } } } /* diff --git a/command.h b/command.h index 5f0e4414..2be03a0c 100644 --- a/command.h +++ b/command.h @@ -22,6 +22,7 @@ enum class user_command { secondcontrollerincreasefast, secondcontrollerdecrease, secondcontrollerdecreasefast, + mucurrentindicatorsourcetoggle, independentbrakeincrease, independentbrakeincreasefast, independentbrakedecrease, @@ -35,27 +36,26 @@ enum class user_command { trainbrakeservice, trainbrakefullservice, trainbrakeemergency, -/* -const int k_AntiSlipping = 21; -const int k_Sand = 22; -*/ + wheelspinbrakeactivate, + sandboxactivate, reverserincrease, reverserdecrease, linebreakertoggle, -/* -const int k_Fuse = 26; -*/ convertertoggle, + converteroverloadrelayreset, compressortoggle, motoroverloadrelaythresholdtoggle, + motoroverloadrelayreset, notchingrelaytoggle, epbrakecontroltoggle, brakeactingspeedincrease, brakeactingspeeddecrease, + mubrakingindicatortoggle, alerteracknowledge, + hornlowactivate, + hornhighactivate, + radiotoggle, /* -const int k_Horn = 33; -const int k_Horn2 = 34; const int k_FailedEngineCutOff = 35; */ viewturn, @@ -85,6 +85,8 @@ const int k_ProgramHelp = 48; doortoggleright, departureannounce, doorlocktoggle, + pantographcompressorvalvetoggle, + pantographcompressoractivate, pantographtogglefront, pantographtogglerear, pantographlowerall, @@ -102,13 +104,8 @@ const int k_ProgramHelp = 48; headlighttogglerearupper, redmarkertogglerearleft, redmarkertogglerearright, -/* -const int k_SmallCompressor = 63; -*/ + headlightsdimtoggle, motorconnectorsopen, -/* -const int k_CurrentNext = 65; -*/ interiorlighttoggle, interiorlightdimtoggle, instrumentlighttoggle, @@ -123,7 +120,6 @@ const int k_Active = 71; batterytoggle /* const int k_WalkMode = 73; -int const k_DimHeadlights = 74; */ }; diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 0c447184..af3e3ef8 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -108,6 +108,8 @@ keyboard_input::default_bindings() { { GLFW_KEY_KP_MULTIPLY }, // secondcontrollerdecreasefast { GLFW_KEY_KP_MULTIPLY | keymodifier::shift }, + // mucurrentindicatorsourcetoggle + { GLFW_KEY_Z | keymodifier::shift }, // independentbrakeincrease { GLFW_KEY_KP_1 }, // independentbrakeincreasefast @@ -134,25 +136,26 @@ keyboard_input::default_bindings() { { GLFW_KEY_KP_2 }, // trainbrakeemergency { GLFW_KEY_KP_0 }, -/* -const int k_AntiSlipping = 21; -const int k_Sand = 22; -*/ + // wheelspinbrakeactivate, + { GLFW_KEY_KP_ENTER }, + // sandboxactivate, + { GLFW_KEY_S }, // reverserincrease { GLFW_KEY_D }, // reverserdecrease { GLFW_KEY_R }, // linebreakertoggle { GLFW_KEY_M }, -/* -const int k_Fuse = 26; -*/ // convertertoggle { GLFW_KEY_X }, + // converteroverloadrelayreset + { GLFW_KEY_N | keymodifier::control }, // compressortoggle { GLFW_KEY_C }, // motoroverloadrelaythresholdtoggle { GLFW_KEY_F }, + // motoroverloadrelayreset + { GLFW_KEY_N }, // notchingrelaytoggle { GLFW_KEY_G }, // epbrakecontroltoggle @@ -161,14 +164,17 @@ const int k_Fuse = 26; { GLFW_KEY_B | keymodifier::shift }, // brakeactingspeeddecrease { GLFW_KEY_B }, -/* -const int k_BrakeProfile = 31; -*/ + // brakingindicatortoggle + { GLFW_KEY_L | keymodifier::shift }, // alerteracknowledge { GLFW_KEY_SPACE }, + // hornlowactivate + { GLFW_KEY_A }, + // hornhighactivate + { GLFW_KEY_A | keymodifier::shift }, + // radiotoggle + { GLFW_KEY_R | keymodifier::control }, /* -const int k_Horn = 33; -const int k_Horn2 = 34; const int k_FailedEngineCutOff = 35; */ // viewturn @@ -216,6 +222,10 @@ const int k_ProgramHelp = 48; { GLFW_KEY_SLASH }, // doorlocktoggle { GLFW_KEY_S | keymodifier::shift }, + // pantographcompressorvalvetoggle + { GLFW_KEY_V | keymodifier::control }, + // pantographcompressoractivate + { GLFW_KEY_V | keymodifier::shift }, // pantographtogglefront { GLFW_KEY_P }, // pantographtogglerear @@ -247,14 +257,10 @@ const int k_ProgramHelp = 48; { GLFW_KEY_Y | keymodifier::control | keymodifier::shift }, // redmarkertogglerearright { GLFW_KEY_I | keymodifier::control | keymodifier::shift }, -/* -const int k_SmallCompressor = 63; -*/ + // headlightsdimtoggle + { GLFW_KEY_L | keymodifier::control }, // motorconnectorsopen { GLFW_KEY_L }, -/* -const int k_CurrentNext = 65; -*/ // interiorlighttoggle { GLFW_KEY_APOSTROPHE }, // interiorlightdimtoggle @@ -273,7 +279,6 @@ const int k_Active = 71; { GLFW_KEY_J } /* const int k_WalkMode = 73; -int const k_DimHeadlights = 74; */ }; diff --git a/windows.cpp b/windows.cpp index 49ef578b..dd23a74d 100644 --- a/windows.cpp +++ b/windows.cpp @@ -18,7 +18,7 @@ LONG CALLBACK unhandled_handler(::EXCEPTION_POINTERS* e) { auto nameEnd = name + ::GetModuleFileNameA(::GetModuleHandleA(0), name, MAX_PATH); ::SYSTEMTIME t; - ::GetSystemTime(&t); + ::GetLocalTime(&t); wsprintfA(nameEnd - strlen(".exe"), "_crashdump_%4d%02d%02d_%02d%02d%02d.dmp", t.wYear, t.wMonth, t.wDay, t.wHour, t.wMinute, t.wSecond); From e84f4f53fdcadfd6affe260a5b4b18b51944ca32 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 23 Apr 2017 13:16:28 +0200 Subject: [PATCH 089/426] added support for redefinition of keyboard bindings. control for engine cutoff, minor changes to line breaker activation --- EU07.cpp | 1 + Train.cpp | 252 ++++++++++++++++++++++++++-------------------- Train.h | 5 +- command.cpp | 12 +-- command.h | 3 +- keyboardinput.cpp | 94 +++++++++++++++-- keyboardinput.h | 4 +- 7 files changed, 245 insertions(+), 126 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index f36b2573..4fbfa0c9 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -345,6 +345,7 @@ int main(int argc, char *argv[]) return -1; } + input::Keyboard.init(); input::Gamepad.init(); Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów diff --git a/Train.cpp b/Train.cpp index fdea2409..70fb0519 100644 --- a/Train.cpp +++ b/Train.cpp @@ -144,7 +144,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::secondcontrollerdecrease, &TTrain::OnCommand_secondcontrollerdecrease }, { user_command::secondcontrollerdecreasefast, &TTrain::OnCommand_secondcontrollerdecreasefast }, { user_command::notchingrelaytoggle, &TTrain::OnCommand_notchingrelaytoggle }, - { user_command::mucurrentindicatorsourcetoggle, &TTrain::OnCommand_mucurrentindicatorsourcetoggle }, + { user_command::mucurrentindicatorothersourceactivate, &TTrain::OnCommand_mucurrentindicatorothersourceactivate }, { user_command::independentbrakeincrease, &TTrain::OnCommand_independentbrakeincrease }, { user_command::independentbrakeincreasefast, &TTrain::OnCommand_independentbrakeincreasefast }, { user_command::independentbrakedecrease, &TTrain::OnCommand_independentbrakedecrease }, @@ -178,6 +178,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::converteroverloadrelayreset, &TTrain::OnCommand_converteroverloadrelayreset }, { user_command::compressortoggle, &TTrain::OnCommand_compressortoggle }, { user_command::motorconnectorsopen, &TTrain::OnCommand_motorconnectorsopen }, + { user_command::motordisconnect, &TTrain::OnCommand_motordisconnect }, { user_command::motoroverloadrelaythresholdtoggle, &TTrain::OnCommand_motoroverloadrelaythresholdtoggle }, { user_command::motoroverloadrelayreset, &TTrain::OnCommand_motoroverloadrelayreset }, { user_command::heatingtoggle, &TTrain::OnCommand_heatingtoggle }, @@ -573,7 +574,7 @@ void TTrain::OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &C } } -void TTrain::OnCommand_mucurrentindicatorsourcetoggle( TTrain *Train, command_data const &Command ) { +void TTrain::OnCommand_mucurrentindicatorothersourceactivate( TTrain *Train, command_data const &Command ) { if( Train->ggNextCurrentButton.SubModel == nullptr ) { if( Command.action == GLFW_PRESS ) { @@ -583,27 +584,24 @@ void TTrain::OnCommand_mucurrentindicatorsourcetoggle( TTrain *Train, command_da } if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == Train->ShowNextCurrent ) { - // turn on - Train->ShowNextCurrent = true; - // audio feedback - if( Train->ggNextCurrentButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } - // visual feedback - Train->ggNextCurrentButton.UpdateValue( 1.0 ); + // turn on + Train->ShowNextCurrent = true; + // audio feedback + if( Train->ggNextCurrentButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); } - else { - //turn off - Train->ShowNextCurrent = false; - // audio feedback - if( Train->ggNextCurrentButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } - // visual feedback - Train->ggNextCurrentButton.UpdateValue( 0.0 ); + // visual feedback + Train->ggNextCurrentButton.UpdateValue( 1.0 ); + } + else if( Command.action == GLFW_RELEASE ) { + //turn off + Train->ShowNextCurrent = false; + // audio feedback + if( Train->ggNextCurrentButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); } + // visual feedback + Train->ggNextCurrentButton.UpdateValue( 0.0 ); } } @@ -922,7 +920,7 @@ void TTrain::OnCommand_sandboxactivate( TTrain *Train, command_data const &Comma // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels if( Train->ggSandButton.SubModel == nullptr ) { if( Command.action == GLFW_PRESS ) { - WriteLog( "Wheelspin Brake button is missing, or wasn't defined" ); + WriteLog( "Sandbox activation button is missing, or wasn't defined" ); } return; } @@ -1200,14 +1198,11 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command // audio feedback Train->play_sound( Train->dsbSwitch ); // side-effects -/* - // NOTE: on second thought, don't and let them drop when the pantograph tank pressure drops below threshold if( false == Train->mvControlled->ConverterFlag ) { // if there's no (low voltage) power source left, drop pantographs Train->mvControlled->PantFront( false ); Train->mvControlled->PantRear( false ); } -*/ } } } @@ -1518,117 +1513,123 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ) { if( ( Command.action == GLFW_PRESS ) - && ( true == Train->m_linebreakerclosed ) + && ( Train->m_linebreakerstate == 1 ) && ( false == Train->mvControlled->Mains ) && ( Train->ggMainButton.GetValue() < 0.05 ) ) { // crude way to catch cases where the main was knocked out and the user is trying to restart it // because the state of the line breaker isn't changed to match, we need to do it here manually - Train->m_linebreakerclosed = false; + Train->m_linebreakerstate = 0; } // NOTE: we don't have switch type definition for the line breaker switch // so for the time being we have hard coded "impulse" switches for all EMUs // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( ( true == Train->m_linebreakerclosed ) + if( ( Train->m_linebreakerstate == 1 ) && ( Train->mvControlled->TrainType == dt_EZT ) ) { // a single impulse switch can't open the circuit, only close it return; } - if( Command.action != GLFW_RELEASE ) { // press or hold... - if( false == Train->mvControlled->Mains ) { + if( Train->m_linebreakerstate == 0 ) { // ...to close the circuit - if( false == Train->m_linebreakerclosed ) { - // safety check so we don't close the circuit right after opening - if( Train->ggMainOnButton.SubModel != nullptr ) { + if( Train->ggMainOnButton.SubModel != nullptr ) { + // two separate switches to close and break the circuit + // audio feedback + if( Command.action == GLFW_PRESS ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggMainOnButton.UpdateValue( 1.0 ); + } + else if( Train->ggMainButton.SubModel != nullptr ) { + // single two-state switch + // audio feedback + if( Command.action == GLFW_PRESS ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggMainButton.UpdateValue( 1.0 ); + } + // keep track of period the button is held down, to determine when/if circuit closes + if( ( false == ( Train->mvControlled->EnginePowerSource.PowerType == ElectricSeriesMotor ) || ( Train->mvControlled->EngineType == ElectricInductionMotor ) ) + || ( Train->fHVoltage > 0.0f ) ) { + // prevent the switch from working if there's no power + // TODO: consider whether it makes sense for diesel engines and such + Train->fMainRelayTimer += 0.33f; // Command.time_delta * 5.0; + } + if( Train->mvControlled->Mains != true ) { + // hunter-080812: poprawka + Train->mvControlled->ConverterSwitch( false ); + Train->mvControlled->CompressorSwitch( false ); + } + if( Train->fMainRelayTimer > Train->mvControlled->InitialCtrlDelay ) { + // wlaczanie WSa z opoznieniem + Train->m_linebreakerstate = 2; + // for diesels, we complete the engine start here + // TODO: consider arranging a better way to start the diesel engines + if( Train->mvControlled->EngineType == DieselEngine ) { + if( Train->mvControlled->MainSwitch( true ) ) { + // sound feedback, engine start for diesel vehicle + Train->play_sound( Train->dsbDieselIgnition ); + // side-effects + Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); + Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); + } + } + } + } + else if( Train->m_linebreakerstate == 1 ) { + // ...to open the circuit + if( true == Train->mvControlled->MainSwitch( false ) ) { + + Train->m_linebreakerstate = -1; + + if( Train->ggMainOffButton.SubModel != nullptr ) { // two separate switches to close and break the circuit // audio feedback if( Command.action == GLFW_PRESS ) { Train->play_sound( Train->dsbSwitch ); } // visual feedback - Train->ggMainOnButton.UpdateValue( 1.0 ); + Train->ggMainOffButton.UpdateValue( 1.0 ); } else if( Train->ggMainButton.SubModel != nullptr ) { // single two-state switch - // audio feedback - if( Command.action == GLFW_PRESS ) { - Train->play_sound( Train->dsbSwitch ); - } - // visual feedback - Train->ggMainButton.UpdateValue( 1.0 ); - } - // keep track of period the button is held down, to determine when/if circuit closes - Train->fMainRelayTimer += 0.33f; // Command.time_delta * 5.0; - if( Train->mvControlled->Mains != true ) { - // hunter-080812: poprawka - Train->mvControlled->ConverterSwitch( false ); - Train->mvControlled->CompressorSwitch( false ); - } - if( Train->fMainRelayTimer > Train->mvControlled->InitialCtrlDelay ) { - // wlaczanie WSa z opoznieniem - if( Train->mvControlled->MainSwitch( true ) ) { - // sound feedback, engine start for diesel vehicle - if( Train->mvControlled->EngineType == DieselEngine ) { - Train->play_sound( Train->dsbDieselIgnition ); - } - } - } - } - } - else { - // ...to open the circuit - if( true == Train->m_linebreakerclosed ) { - // safety check so we don't open the circuit right after closing - if( Train->mvControlled->MainSwitch( false ) ) { - - if( Train->ggMainOffButton.SubModel != nullptr ) { - // two separate switches to close and break the circuit +/* + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( Train->mvControlled->TrainType == dt_EZT ) { // audio feedback if( Command.action == GLFW_PRESS ) { Train->play_sound( Train->dsbSwitch ); } // visual feedback - Train->ggMainOffButton.UpdateValue( 1.0 ); + Train->ggMainButton.UpdateValue( 1.0 ); } - else if( Train->ggMainButton.SubModel != nullptr ) { - // single two-state switch -/* - // NOTE: we don't have switch type definition for the line breaker switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( Train->mvControlled->TrainType == dt_EZT ) { - // audio feedback - if( Command.action == GLFW_PRESS ) { - Train->play_sound( Train->dsbSwitch ); - } - // visual feedback - Train->ggMainButton.UpdateValue( 1.0 ); - } - else + else */ - { - // audio feedback - if( Command.action == GLFW_PRESS ) { - Train->play_sound( Train->dsbSwitch ); - } - // visual feedback - Train->ggMainButton.UpdateValue( 0.0 ); + { + // audio feedback + if( Command.action == GLFW_PRESS ) { + Train->play_sound( Train->dsbSwitch ); } + // visual feedback + Train->ggMainButton.UpdateValue( 0.0 ); } } - // play sound immediately when the switch is hit, not after release - if( Train->fMainRelayTimer > 0.0f ) { - Train->play_sound( Train->dsbRelay ); - Train->fMainRelayTimer = 0.0f; - } + } + // play sound immediately when the switch is hit, not after release + if( Train->fMainRelayTimer > 0.0f ) { + Train->play_sound( Train->dsbRelay ); + Train->fMainRelayTimer = 0.0f; } } } else { // release... - if( false == Train->mvControlled->Mains ) { + if( Train->m_linebreakerstate <= 0 ) { // ...after opening circuit, or holding for too short time to close it // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, if( Train->fMainRelayTimer > 0.0f ) { @@ -1656,13 +1657,19 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // visual feedback Train->ggMainButton.UpdateValue( 0.0 ); } - Train->m_linebreakerclosed = false; + // finalize the state of the line breaker + Train->m_linebreakerstate = 0; } else { // ...after closing the circuit - // side-effects - Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); - Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); + // we don't need to start the diesel twice, but the other types still need to be launched + if( Train->mvControlled->EngineType != DieselEngine ) { + if( Train->mvControlled->MainSwitch( true ) ) { + // side-effects + Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); + Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); + } + } // audio feedback if( Train->ggMainOnButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); @@ -1685,7 +1692,8 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com Train->ggMainButton.UpdateValue( 0.0 ); } } - Train->m_linebreakerclosed = true; + // finalize the state of the line breaker + Train->m_linebreakerstate = 1; } } } @@ -1710,8 +1718,8 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway if( ( Train->mvOccupied->ConvSwitchType != "impulse" ) || ( Train->mvControlled->Mains ) ) { - if( ( true == Train->m_linebreakerclosed ) // won't start if the line breaker button is still held - && ( true == Train->mvControlled->ConverterSwitch( true ) ) ) { + // won't start if the line breaker button is still held + if( true == Train->mvControlled->ConverterSwitch( true ) ) { // side effects // control the compressor, if it's paired with the converter if( Train->mvControlled->CompressorPower == 2 ) { @@ -1752,13 +1760,10 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma Train->mvControlled->ConvOvldFlag = false; } // if there's no (low voltage) power source left, drop pantographs -/* - // NOTE: on second thought, don't and let them drop when the pantograph tank pressure drops below threshold if( false == Train->mvControlled->Battery ) { Train->mvControlled->PantFront( false ); Train->mvControlled->PantRear( false ); } -*/ } } } @@ -1911,6 +1916,23 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C } } +void TTrain::OnCommand_motordisconnect( TTrain *Train, command_data const &Command ) { + + if( ( Train->mvControlled->TrainType == dt_EZT ? + ( Train->mvControlled != Train->mvOccupied ) : + ( Train->mvOccupied->ActiveCab != 0 ) ) ) { + // tylko w maszynowym + return; + } + + if( Command.action == GLFW_PRESS ) { + if( true == Train->mvControlled->CutOffEngine() ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + } + } +} + void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { @@ -3106,7 +3128,6 @@ void TTrain::OnKeyDown(int cKey) play_sound( dsbSwitch ); } } -#endif else if( cKey == Global::Keys[ k_FailedEngineCutOff ] ) { // McZapkie-060103: E - wylaczanie sekcji silnikow if (mvControlled->CutOffEngine()) @@ -3114,7 +3135,6 @@ void TTrain::OnKeyDown(int cKey) play_sound( dsbSwitch ); } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if( cKey == Global::Keys[ k_OpenLeft ] ) // NBMX 17-09-2003: otwieranie drzwi { if (mvOccupied->DoorOpenCtrl == 1) @@ -5014,6 +5034,10 @@ bool TTrain::Update( double const Deltatime ) auto lookup = m_commandhandlers.find( commanddata.command ); if( lookup != m_commandhandlers.end() ) { + // debug data + if( commanddata.action != GLFW_RELEASE ) { + WriteLog( mvOccupied->Name + " received command: [" + simulation::Commands_descriptions[ static_cast( commanddata.command ) ].name + "]" ); + } // pass the command to the assigned handler lookup->second( this, commanddata ); } @@ -5033,6 +5057,16 @@ bool TTrain::Update( double const Deltatime ) DWORD stat; double dt = Deltatime; // Timer::GetDeltaTime(); + + // catch cases where the power goes out, and the linebreaker state is left as closed + if( ( m_linebreakerstate == 1 ) + && ( false == mvControlled->Mains ) + && ( ggMainButton.GetValue() < 0.05 ) ) { + // crude way to catch cases where the main was knocked out and the user is trying to restart it + // because the state of the line breaker isn't changed to match, we need to do it here manually + m_linebreakerstate = 0; + } + /* // NOTE: disabled while switch state isn't preserved while moving between compartments // check whether we should raise the pantographs, based on volume in pantograph tank @@ -5907,7 +5941,7 @@ bool TTrain::Update( double const Deltatime ) if (mvControlled->Battery || mvControlled->ConverterFlag) { - btLampkaWylSzybki.Turn( mvControlled->Mains ); + btLampkaWylSzybki.Turn( ( m_linebreakerstate > 0 ? true : false ) ); // hunter-261211: jakis stary kod (i niezgodny z prawda), // zahaszowalem i poprawilem diff --git a/Train.h b/Train.h index 1bce34d6..786883c2 100644 --- a/Train.h +++ b/Train.h @@ -120,7 +120,7 @@ class TTrain static void OnCommand_secondcontrollerdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &Command ); - static void OnCommand_mucurrentindicatorsourcetoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_mucurrentindicatorothersourceactivate( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakeincrease( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakeincreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakedecrease( TTrain *Train, command_data const &Command ); @@ -154,6 +154,7 @@ class TTrain static void OnCommand_converteroverloadrelayreset( TTrain *Train, command_data const &Command ); static void OnCommand_compressortoggle( TTrain *Train, command_data const &Command ); static void OnCommand_motorconnectorsopen( TTrain *Train, command_data const &Command ); + static void OnCommand_motordisconnect( TTrain *Train, command_data const &Command ); static void OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_motoroverloadrelayreset( TTrain *Train, command_data const &Command ); static void OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ); @@ -186,7 +187,7 @@ class TTrain TMoverParameters *mvSecond; // drugi człon (ET40, ET41, ET42, ukrotnienia) TMoverParameters *mvThird; // trzeci człon (SN61) // helper variable, to prevent immediate switch between closing and opening line breaker circuit - bool m_linebreakerclosed{ false }; + int m_linebreakerstate{ 0 }; // -1: freshly open, 0: open, 1: closed, 2: freshly closed (and yes this is awful way to go about it) static const commandhandler_map m_commandhandlers; public: // reszta może by?publiczna diff --git a/command.cpp b/command.cpp index 6d75124e..4ad7c4e0 100644 --- a/command.cpp +++ b/command.cpp @@ -27,7 +27,7 @@ commanddescription_sequence Commands_descriptions = { { "secondcontrollerincreasefast", command_target::vehicle }, { "secondcontrollerdecrease", command_target::vehicle }, { "secondcontrollerdecreasefast", command_target::vehicle }, - { "mucurrentindicatorsourcetoggle", command_target::vehicle }, + { "mucurrentindicatorothersourceactivate", command_target::vehicle }, { "independentbrakeincrease", command_target::vehicle }, { "independentbrakeincreasefast", command_target::vehicle }, { "independentbrakedecrease", command_target::vehicle }, @@ -58,7 +58,7 @@ commanddescription_sequence Commands_descriptions = { { "mubrakingindicatortoggle", command_target::vehicle }, { "alerteracknowledge", command_target::vehicle }, { "hornlowactivate", command_target::vehicle }, - { "hornhighctivate", command_target::vehicle }, + { "hornhighactivate", command_target::vehicle }, { "radiotoggle", command_target::vehicle }, /* const int k_FailedEngineCutOff = 35; @@ -111,6 +111,7 @@ const int k_ProgramHelp = 48; { "redmarkertogglerearright", command_target::vehicle }, { "headlightsdimtoggle", command_target::vehicle }, { "motorconnectorsopen", command_target::vehicle }, + { "motordisconnect", command_target::vehicle }, { "interiorlighttoggle", command_target::vehicle }, { "interiorlightdimtoggle", command_target::vehicle }, { "instrumentlighttoggle", command_target::vehicle }, @@ -180,7 +181,7 @@ command_relay::post( user_command const Command, std::uint64_t const Param1, std Param2, Timer::GetDeltaTime() }, static_cast( command.target ) | Recipient ); - +/* #ifdef _DEBUG if( Action != GLFW_RELEASE ) { // key was pressed or is still held @@ -204,13 +205,12 @@ command_relay::post( user_command const Command, std::uint64_t const Param1, std } } } -/* else { // key was released (but we don't log this) - WriteLog( "Key released: " + m_command.name ); + WriteLog( "Key released: " + command.name ); } -*/ #endif +*/ } //--------------------------------------------------------------------------- diff --git a/command.h b/command.h index 2be03a0c..9ba1d725 100644 --- a/command.h +++ b/command.h @@ -22,7 +22,7 @@ enum class user_command { secondcontrollerincreasefast, secondcontrollerdecrease, secondcontrollerdecreasefast, - mucurrentindicatorsourcetoggle, + mucurrentindicatorothersourceactivate, independentbrakeincrease, independentbrakeincreasefast, independentbrakedecrease, @@ -106,6 +106,7 @@ const int k_ProgramHelp = 48; redmarkertogglerearright, headlightsdimtoggle, motorconnectorsopen, + motordisconnect, interiorlighttoggle, interiorlightdimtoggle, instrumentlighttoggle, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index af3e3ef8..2c32b9e4 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -10,13 +10,93 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "keyboardinput.h" #include "logs.h" +#include "parser.h" -void +bool keyboard_input::recall_bindings() { - // TODO: implement + // build helper translation tables + std::unordered_map nametocommandmap; + std::size_t commandid = 0; + for( auto const &description : simulation::Commands_descriptions ) { + nametocommandmap.emplace( + description.name, + static_cast( commandid ) ); + ++commandid; + } + std::unordered_map nametokeymap = { + { "a", GLFW_KEY_A }, { "b", GLFW_KEY_B }, { "c", GLFW_KEY_C }, { "d", GLFW_KEY_D }, { "e", GLFW_KEY_E }, + { "f", GLFW_KEY_F }, { "g", GLFW_KEY_G }, { "h", GLFW_KEY_H }, { "i", GLFW_KEY_I }, { "j", GLFW_KEY_J }, + { "k", GLFW_KEY_K }, { "l", GLFW_KEY_L }, { "m", GLFW_KEY_M }, { "n", GLFW_KEY_N }, { "o", GLFW_KEY_O }, + { "p", GLFW_KEY_P }, { "q", GLFW_KEY_Q }, { "r", GLFW_KEY_R }, { "s", GLFW_KEY_S }, { "t", GLFW_KEY_T }, + { "u", GLFW_KEY_U }, { "v", GLFW_KEY_V }, { "w", GLFW_KEY_W }, { "x", GLFW_KEY_X }, { "y", GLFW_KEY_Y }, { "z", GLFW_KEY_Z }, + { "-", GLFW_KEY_MINUS }, { "=", GLFW_KEY_EQUAL }, { "backspace", GLFW_KEY_BACKSPACE }, + { "[", GLFW_KEY_LEFT_BRACKET }, { "]", GLFW_KEY_RIGHT_BRACKET }, { "\\", GLFW_KEY_BACKSLASH }, + { ";", GLFW_KEY_SEMICOLON }, { "'", GLFW_KEY_APOSTROPHE }, { "enter", GLFW_KEY_ENTER }, + { ",", GLFW_KEY_COMMA }, { ".", GLFW_KEY_PERIOD }, { "/", GLFW_KEY_SLASH }, + { "space", GLFW_KEY_SPACE }, + // numpad block + { "num_/", GLFW_KEY_KP_DIVIDE }, { "num_*", GLFW_KEY_KP_MULTIPLY }, { "num_-", GLFW_KEY_KP_SUBTRACT }, + { "num_7", GLFW_KEY_KP_7 }, { "num_8", GLFW_KEY_KP_8 }, { "num_9", GLFW_KEY_KP_9 }, { "num_+", GLFW_KEY_KP_ADD }, + { "num_4", GLFW_KEY_KP_4 }, { "num_5", GLFW_KEY_KP_5 }, { "num_6", GLFW_KEY_KP_6 }, + { "num_1", GLFW_KEY_KP_1 }, { "num_2", GLFW_KEY_KP_2 }, { "num_3", GLFW_KEY_KP_3 }, { "num_enter", GLFW_KEY_KP_ENTER }, + { "num_0", GLFW_KEY_KP_0 }, { "num_.", GLFW_KEY_KP_DECIMAL } + }; + + cParser bindingparser( "eu07_input-keyboard.ini", cParser::buffer_FILE ); + if( false == bindingparser.ok() ) { + return false; + } + + while( true == bindingparser.getTokens( 1, true, "\n" ) ) { + + std::string bindingentry; + bindingparser >> bindingentry; + cParser entryparser( bindingentry ); + if( true == entryparser.getTokens( 1, true, "\n\r\t " ) ) { + + std::string commandname; + entryparser >> commandname; + + auto const lookup = nametocommandmap.find( commandname ); + if( lookup == nametocommandmap.end() ) { + + WriteLog( "Keyboard binding defined for unknown command, \"" + commandname + "\"" ); + } + else { + int binding{ 0 }; + while( entryparser.getTokens( 1, true, "\n\r\t " ) ) { + + std::string bindingkeyname; + entryparser >> bindingkeyname; + + if( bindingkeyname == "shift" ) { binding |= keymodifier::shift; } + else if( bindingkeyname == "ctrl" ) { binding |= keymodifier::control; } + else { + // regular key, convert it to glfw key code + auto const keylookup = nametokeymap.find( bindingkeyname ); + if( keylookup == nametokeymap.end() ) { + + WriteLog( "Keyboard binding included unrecognized key, \"" + bindingkeyname + "\"" ); + } + else { + // replace any existing binding, preserve modifiers + // (protection from cases where there's more than one key listed in the entry) + binding = keylookup->second | ( binding & 0xffff0000 ); + } + } + + if( ( binding & 0xffff ) != 0 ) { + m_commands.at( static_cast( lookup->second ) ).binding = binding; + } + } + } + } + } bind(); + + return true; } bool @@ -108,7 +188,7 @@ keyboard_input::default_bindings() { { GLFW_KEY_KP_MULTIPLY }, // secondcontrollerdecreasefast { GLFW_KEY_KP_MULTIPLY | keymodifier::shift }, - // mucurrentindicatorsourcetoggle + // mucurrentindicatorothersourceactivate { GLFW_KEY_Z | keymodifier::shift }, // independentbrakeincrease { GLFW_KEY_KP_1 }, @@ -164,7 +244,7 @@ keyboard_input::default_bindings() { { GLFW_KEY_B | keymodifier::shift }, // brakeactingspeeddecrease { GLFW_KEY_B }, - // brakingindicatortoggle + // mubrakingindicatortoggle { GLFW_KEY_L | keymodifier::shift }, // alerteracknowledge { GLFW_KEY_SPACE }, @@ -174,9 +254,6 @@ keyboard_input::default_bindings() { { GLFW_KEY_A | keymodifier::shift }, // radiotoggle { GLFW_KEY_R | keymodifier::control }, -/* -const int k_FailedEngineCutOff = 35; -*/ // viewturn { -1 }, // movevector @@ -261,6 +338,8 @@ const int k_ProgramHelp = 48; { GLFW_KEY_L | keymodifier::control }, // motorconnectorsopen { GLFW_KEY_L }, + // motordisconnect + { GLFW_KEY_E | keymodifier::shift }, // interiorlighttoggle { GLFW_KEY_APOSTROPHE }, // interiorlightdimtoggle @@ -300,6 +379,7 @@ keyboard_input::bind() { } ++commandcode; } + // cache movement key bindings, so we can test them faster in the input loop m_bindingscache.forward = m_commands[ static_cast( user_command::moveforward ) ].binding; m_bindingscache.back = m_commands[ static_cast( user_command::moveback ) ].binding; diff --git a/keyboardinput.h b/keyboardinput.h index 12301797..e2d78708 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -20,7 +20,9 @@ public: keyboard_input() { default_bindings(); } // methods - void + bool + init() { return recall_bindings(); } + bool recall_bindings(); bool key( int const Key, int const Action ); From da65fb7fac40870f14e3adc8d9edbd67935aa14d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 24 Apr 2017 14:37:19 +0200 Subject: [PATCH 090/426] leak rate as .fiz parameter, support for low and high horn buttons, brake .fiz parsing fix --- McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 26 ++++++++++++++++++-------- Train.cpp | 30 +++++++++++++++++++++++++----- Train.h | 2 ++ 4 files changed, 46 insertions(+), 13 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 75db0f36..bc08b127 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -659,6 +659,7 @@ public: double CompressorSpeed = 0.0; /*cisnienie wlaczania, zalaczania sprezarki, wydajnosc sprezarki*/ TBrakeDelayTable BrakeDelay; /*opoznienie hamowania/odhamowania t/o*/ + double AirLeakRate{ 0.01 }; // base rate of air leak from brake system components ( 0.001 = 1 l/sec ) int BrakeCtrlPosNo = 0; /*ilosc pozycji hamulca*/ /*nastawniki:*/ int MainCtrlPosNo = 0; /*ilosc pozycji nastawnika*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 98a48ea5..62678a41 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2843,8 +2843,7 @@ void TMoverParameters::UpdateBrakePressure(double dt) // ************************************************************************************************* void TMoverParameters::CompressorCheck(double dt) { - // TODO: expose leak rate as a parameter to the .fiz file - CompressedVolume = std::max( 0.0, CompressedVolume - dt * 0.001 ); // nieszczelności: 0.001=1l/s + CompressedVolume = std::max( 0.0, CompressedVolume - dt * AirLeakRate * 0.1 ); // nieszczelności: 0.001=1l/s // if (CompressorSpeed>0.0) then //ten warunek został sprawdzony przy wywołaniu funkcji if (VeselVolume > 0) @@ -2968,8 +2967,10 @@ void TMoverParameters::CompressorCheck(double dt) // ************************************************************************************************* void TMoverParameters::UpdatePipePressure(double dt) { - // TODO: expose leak rate as a parameter to the .fiz file - PipePress = std::max( 0.0, PipePress - dt * 0.001 ); // nieszczelności: 0.001=1l/s + if( PipePress > 1.0 ) { + Pipe->Flow( -(PipePress)* AirLeakRate * dt ); + Pipe->Act(); + } const double LBDelay = 100; const double kL = 0.5; @@ -3187,8 +3188,10 @@ void TMoverParameters::UpdatePipePressure(double dt) // ************************************************************************************************* void TMoverParameters::UpdateScndPipePressure(double dt) { - // TODO: expose leak rate as a parameter to the .fiz file - ScndPipePress = std::max( 0.0, ScndPipePress - dt * 0.001 ); // nieszczelności: 0.001=0.1l/s + if( ScndPipePress > 1.0 ) { + Pipe2->Flow( -(ScndPipePress)* AirLeakRate * dt ); + Pipe2->Act(); + } const double Spz = 0.5067; TMoverParameters *c; @@ -6494,6 +6497,11 @@ void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { lookup->second : 1; } + + if( true == extract_value( AirLeakRate, "AirLeakRate", line, "" ) ) { + // the parameter is provided in form of a multiplier, where 1.0 means the default rate of 0.001 + AirLeakRate *= 0.01; + } } void TMoverParameters::LoadFIZ_Doors( std::string const &line ) { @@ -6705,8 +6713,10 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { } // mbpm - extract_value( MBPM, "MaxBPMass", line, "" ); -// MBPM *= 1000; + if( true == extract_value( MBPM, "MaxBPMass", line, "" ) ) { + // NOTE: only convert the value from tons to kilograms if the entry is present in the config file + MBPM *= 1000.0; + } // asbtype std::string asb; diff --git a/Train.cpp b/Train.cpp index 70fb0519..5a860870 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2742,7 +2742,8 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Command ) { - if( Train->ggHornButton.SubModel == nullptr ) { + if( ( Train->ggHornButton.SubModel == nullptr ) + && ( Train->ggHornLowButton.SubModel == nullptr ) ) { if( Command.action == GLFW_PRESS ) { WriteLog( "Horn button is missing, or wasn't defined" ); } @@ -2759,11 +2760,13 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma Train->mvControlled->WarningSignal &= ~2; } // audio feedback - if( Train->ggHornButton.GetValue() > -0.5 ) { + if( ( Train->ggHornButton.GetValue() > -0.5 ) + || ( Train->ggHornLowButton.GetValue() < 0.5 ) ) { Train->play_sound( Train->dsbSwitch ); } // visual feedback Train->ggHornButton.UpdateValue( -1.0 ); + Train->ggHornLowButton.UpdateValue( 1.0 ); } } else if( Command.action == GLFW_RELEASE ) { @@ -2771,17 +2774,20 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma // NOTE: we turn off both low and high horn, due to unreliability of release event when shift key is involved Train->mvControlled->WarningSignal &= ~( 1 | 2 ); // audio feedback - if( Train->ggHornButton.GetValue() < -0.5 ) { + if( ( Train->ggHornButton.GetValue() < -0.5 ) + || ( Train->ggHornLowButton.GetValue() > 0.5 ) ) { Train->play_sound( Train->dsbSwitch ); } // visual feedback Train->ggHornButton.UpdateValue( 0.0 ); + Train->ggHornLowButton.UpdateValue( 0.0 ); } } void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Command ) { - if( Train->ggHornButton.SubModel == nullptr ) { + if( ( Train->ggHornButton.SubModel == nullptr ) + && ( Train->ggHornHighButton.SubModel == nullptr ) ) { if( Command.action == GLFW_PRESS ) { WriteLog( "Horn button is missing, or wasn't defined" ); } @@ -2803,6 +2809,7 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm } // visual feedback Train->ggHornButton.UpdateValue( 1.0 ); + Train->ggHornHighButton.UpdateValue( 1.0 ); } } else if( Command.action == GLFW_RELEASE ) { @@ -2815,6 +2822,7 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm } // visual feedback Train->ggHornButton.UpdateValue( 0.0 ); + Train->ggHornButton.UpdateValue( 0.0 ); } } @@ -7399,6 +7407,8 @@ bool TTrain::Update( double const Deltatime ) ggSignallingButton.Update(); ggNextCurrentButton.Update(); ggHornButton.Update(); + ggHornLowButton.Update(); + ggHornHighButton.Update(); ggUniversal1Button.Update(); ggUniversal2Button.Update(); ggUniversal3Button.Update(); @@ -8169,6 +8179,8 @@ void TTrain::clear_cab_controls() ggSandButton.Clear(); ggAntiSlipButton.Clear(); ggHornButton.Clear(); + ggHornLowButton.Clear(); + ggHornHighButton.Clear(); ggNextCurrentButton.Clear(); ggUniversal1Button.Clear(); ggUniversal2Button.Clear(); @@ -8759,7 +8771,15 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con // dzwignia syreny ggHornButton.Load(Parser, DynamicObject->mdKabina); } - else if (Label == "fuse_bt:") + else if( Label == "hornlow_bt:" ) { + // dzwignia syreny + ggHornLowButton.Load( Parser, DynamicObject->mdKabina ); + } + else if( Label == "hornhigh_bt:" ) { + // dzwignia syreny + ggHornHighButton.Load( Parser, DynamicObject->mdKabina ); + } + else if( Label == "fuse_bt:" ) { // bezp. nadmiarowy ggFuseButton.Load(Parser, DynamicObject->mdKabina); diff --git a/Train.h b/Train.h index 786883c2..e2658c1b 100644 --- a/Train.h +++ b/Train.h @@ -261,6 +261,8 @@ public: // reszta może by?publiczna // ABu 090305 - syrena i prad nastepnego czlonu TGauge ggHornButton; + TGauge ggHornLowButton; + TGauge ggHornHighButton; TGauge ggNextCurrentButton; // ABu 090305 - uniwersalne przyciski TGauge ggUniversal1Button; From c4e280f1c0c5dd5de5de3a9d0f2ff1383775c0be Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 24 Apr 2017 14:58:32 +0200 Subject: [PATCH 091/426] maintenance: removed deprecated code from train control --- EU07.cpp | 4 - Train.cpp | 1599 +---------------------------------------------------- Train.h | 8 +- World.cpp | 9 - World.h | 1 - 5 files changed, 2 insertions(+), 1619 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 4fbfa0c9..57162e81 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -161,10 +161,6 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo default: { break; } } } - else if( action == GLFW_RELEASE ) - { - World.OnKeyUp( key ); - } } void focus_callback( GLFWwindow *window, int focus ) diff --git a/Train.cpp b/Train.cpp index 5a860870..81d72c95 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2871,150 +2871,6 @@ void TTrain::OnKeyDown(int cKey) if (Global::shiftState) { // wciśnięty [Shift] -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if (cKey == Global::Keys[k_IncMainCtrlFAST]) // McZapkie-200702: szybkie - // przelaczanie na poz. - // bezoporowa - { - if (mvControlled->IncMainCtrl(2)) - { - dsbNastawnikJazdy->SetCurrentPosition(0); - dsbNastawnikJazdy->Play(0, 0, 0); - } - } - if (cKey == Global::Keys[k_DirectionBackward]) - { - if (mvOccupied->Radio == false) - if (Global::ctrlState) - { - play_sound( dsbSwitch ); - mvOccupied->Radio = true; - } - } - else if (cKey == Global::Keys[k_DecMainCtrlFAST]) - if (mvControlled->DecMainCtrl(2)) - { - dsbNastawnikJazdy->SetCurrentPosition(0); - dsbNastawnikJazdy->Play(0, 0, 0); - } - else - ; - else if (cKey == Global::Keys[k_IncScndCtrlFAST]) - if (mvControlled->IncScndCtrl(2)) - { - if (dsbNastawnikBocz) // hunter-081211 - { - dsbNastawnikBocz->SetCurrentPosition(0); - dsbNastawnikBocz->Play(0, 0, 0); - } - else if (!dsbNastawnikBocz) - { - dsbNastawnikJazdy->SetCurrentPosition(0); - dsbNastawnikJazdy->Play(0, 0, 0); - } - } - else - ; - else if (cKey == Global::Keys[k_DecScndCtrlFAST]) - if (mvControlled->DecScndCtrl(2)) - { - if (dsbNastawnikBocz) // hunter-081211 - { - dsbNastawnikBocz->SetCurrentPosition(0); - dsbNastawnikBocz->Play(0, 0, 0); - } - else if (!dsbNastawnikBocz) - { - dsbNastawnikJazdy->SetCurrentPosition(0); - dsbNastawnikJazdy->Play(0, 0, 0); - } - } - else - ; - else if( cKey == Global::Keys[ k_IncLocalBrakeLevelFAST ] ) - if (mvOccupied->IncLocalBrakeLevel(2)) - ; - else - ; - else if (cKey == Global::Keys[k_DecLocalBrakeLevelFAST]) - if (mvOccupied->DecLocalBrakeLevel(2)) - ; - else - ; - if( cKey == Global::Keys[ k_Battery ] ) - { - // if - // (((mvControlled->TrainType==dt_EZT)||(mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->EngineType==DieselElectric))&&(!mvControlled->Battery)) - if (!mvControlled->Battery) - { // wyłącznik jest też w SN61, ewentualnie - // załączać prąd na stałe z poziomu FIZ - if (mvOccupied->BatterySwitch(true)) // bateria potrzebna np. do zapalenia świateł - { - dsbSwitch->Play(0, 0, 0); - if (ggBatteryButton.SubModel) - { - ggBatteryButton.PutValue(1); - } - if (mvOccupied->LightsPosNo > 0) - { - SetLights(); - } - if (TestFlag(mvOccupied->SecuritySystem.SystemType, - 2)) // Ra: znowu w kabinie jest coś, co być nie powinno! - { - SetFlag(mvOccupied->SecuritySystem.Status, s_active); - SetFlag(mvOccupied->SecuritySystem.Status, s_SHPalarm); - } - } - } - } - if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // shift&ctrl are used for light dimming - { - if (mvControlled->TrainType == dt_EZT) - { - if ((mvControlled->Signalling == false)) - { - play_sound( dsbSwitch ); - mvControlled->Signalling = true; - } - } - } - else - if( cKey == Global::Keys[ k_Sand ] ) - { - if( mvControlled->TrainType == dt_EZT ) - { - if (ggDoorSignallingButton.SubModel != NULL) - { - if (!mvControlled->DoorSignalling) - { - mvOccupied->DoorBlocked = true; - play_sound( dsbSwitch ); - mvControlled->DoorSignalling = true; - } - } - } - else if (mvControlled->TrainType != dt_EZT) - { - if (ggSandButton.SubModel != NULL) - { - ggSandButton.PutValue(1); - // dsbPneumaticRelay->SetVolume(-80); - // dsbPneumaticRelay->Play(0, 0, 0); - } - } - } - if( cKey == Global::Keys[ k_Main ] ) - { - if (fabs(ggMainOnButton.GetValue()) < 0.001) - if (dsbSwitch) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - else -#endif if( cKey == Global::Keys[ k_BrakeProfile ] ) // McZapkie-240302-B: //----------- @@ -3063,46 +2919,6 @@ void TTrain::OnKeyDown(int cKey) } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if (cKey == Global::Keys[k_Converter]) - { - if (ggConverterButton.GetValue() == 0) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - else if ((cKey == Global::Keys[k_Compressor]) && - (mvControlled->CompressorPower < 2)) // hunter-091012: tak jest poprawnie - // if - // ((cKey==Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT))) - // //hunter-110212: poprawka dla EZT - - { - if (ggCompressorButton.GetValue() == 0) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - else if( cKey == Global::Keys[ k_SmallCompressor ] ) // Winger 160404: mala - // sprezarka wl - { // Ra: dźwięk, gdy razem z [Shift] - if ((mvControlled->TrainType & dt_EZT) ? mvControlled == mvOccupied : - !mvOccupied->ActiveCab) // tylko w maszynowym - if (Global::ctrlState) // z [Ctrl] - mvControlled->bPantKurek3 = true; // zbiornik pantografu połączony - // jest ze zbiornikiem głównym - // (pompowanie nie ma sensu) - else if (!mvControlled->PantCompFlag) // jeśli wyłączona - if (mvControlled->Battery) // jeszcze musi być załączona bateria - if (mvControlled->PantPress < 4.8) // piszą, że to tak nie działa - { - mvControlled->PantCompFlag = true; - play_sound( dsbSwitch ); // dźwięk tylko po naciśnięciu klawisza - } - } -#endif else if( cKey == GLFW_KEY_Q ) // ze Shiftem - włączenie AI { // McZapkie-240302 - wlaczanie automatycznego pilota (zadziala tylko w // trybie debugmode) @@ -3116,297 +2932,6 @@ void TTrain::OnKeyDown(int cKey) DynamicObject->Mechanik->TakeControl(true); } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if (cKey == Global::Keys[k_MaxCurrent]) { - // McZapkie-160502: F - wysoki rozruch - if ((mvControlled->EngineType == DieselElectric) && (mvControlled->ShuntModeAllow) && - (mvControlled->MainCtrlPos == 0)) - { - mvControlled->ShuntMode = true; - } - if (mvControlled->CurrentSwitch(true)) - { - play_sound( dsbSwitch ); - } - } - else if (cKey == Global::Keys[k_CurrentAutoRelay]) { - // McZapkie-241002: G - wlaczanie PSR - if (mvControlled->AutoRelaySwitch(true)) - { - play_sound( dsbSwitch ); - } - } - else if( cKey == Global::Keys[ k_FailedEngineCutOff ] ) { - // McZapkie-060103: E - wylaczanie sekcji silnikow - if (mvControlled->CutOffEngine()) - { - play_sound( dsbSwitch ); - } - } - else if( cKey == Global::Keys[ k_OpenLeft ] ) // NBMX 17-09-2003: otwieranie drzwi - { - if (mvOccupied->DoorOpenCtrl == 1) - if (mvOccupied->CabNo < 0 ? mvOccupied->DoorRight(true) : mvOccupied->DoorLeft(true)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (dsbDoorOpen) - { - dsbDoorOpen->SetCurrentPosition(0); - dsbDoorOpen->Play(0, 0, 0); - } - } - } - else if (cKey == Global::Keys[k_OpenRight]) // NBMX 17-09-2003: otwieranie drzwi - { - if (mvOccupied->DoorOpenCtrl == 1) - if (mvOccupied->CabNo < 0 ? mvOccupied->DoorLeft(true) : mvOccupied->DoorRight(true)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (dsbDoorOpen) - { - dsbDoorOpen->SetCurrentPosition(0); - dsbDoorOpen->Play(0, 0, 0); - } - } - } - //----------- - // hunter-131211: dzwiek dla przelacznika universala podniesionego - // hunter-091012: ubajerowanie swiatla w kabinie (wyrzucenie - // przyciemnienia pod Univ4) - else if (cKey == Global::Keys[k_Univ3]) - { - if( Global::ctrlState ) - { - if (bCabLight == false) //(ggCabLightButton.GetValue()==0) - { - play_sound( dsbSwitch ); - } - } - else - { - if (ggUniversal3Button.GetValue() == 0) - { - play_sound( dsbSwitch ); - } - /* - if (Global::ctrlState) - {//z [Ctrl] zapalamy albo gasimy światełko w kabinie - if (iCabLightFlag<2) ++iCabLightFlag; //zapalenie - } - */ - } - } - - //----------- - // hunter-091012: dzwiek dla przyciemnienia swiatelka w kabinie - else if (cKey == Global::Keys[k_Univ4]) - { - if (Global::ctrlState) - { - if (bCabLightDim == false) //(ggCabLightDimButton.GetValue()==0) - { - play_sound( dsbSwitch ); - } - } - } - //----------- - else if (cKey == Global::Keys[k_PantFrontUp]) - { // Winger 160204: podn. - // przedn. pantografu - if (mvOccupied->ActiveCab == - 1) //||((mvOccupied->ActiveCab<1)&&((mvControlled->TrainType&(dt_ET40|dt_ET41|dt_ET42|dt_EZT))==0))) - { // przedni gdy w kabinie 1 lub (z wyjątkiem ET40, ET41, ET42 i EZT) gdy - // w kabinie -1 - mvControlled->PantFrontSP = false; - if (mvControlled->PantFront(true)) - if (mvControlled->PantFrontStart != 1) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - else - // if - // ((mvOccupied->ActiveCab<1)&&(mvControlled->TrainType&(dt_ET40|dt_ET41|dt_ET42|dt_EZT))) - { // w kabinie -1 dla ET40, ET41, ET42 i EZT - mvControlled->PantRearSP = false; - if (mvControlled->PantRear(true)) - if (mvControlled->PantRearStart != 1) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - } - else if (cKey == Global::Keys[k_PantRearUp]) - { // Winger 160204: podn. - // tyln. pantografu - // względem kierunku jazdy - if (mvOccupied->ActiveCab == - 1) //||((mvOccupied->ActiveCab<1)&&((mvControlled->TrainType&(dt_ET40|dt_ET41|dt_ET42|dt_EZT))==0))) - { // tylny gdy w kabinie 1 lub (z wyjątkiem ET40, ET41, ET42 i EZT) gdy w - // kabinie -1 - mvControlled->PantRearSP = false; - if (mvControlled->PantRear(true)) - if (mvControlled->PantRearStart != 1) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - else - // if - // ((mvOccupied->ActiveCab<1)&&(mvControlled->TrainType&(dt_ET40|dt_ET41|dt_ET42|dt_EZT))) - { // przedni w kabinie -1 dla ET40, ET41, ET42 i EZT - mvControlled->PantFrontSP = false; - if (mvControlled->PantFront(true)) - if (mvControlled->PantFrontStart != 1) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - } - else if( cKey == Global::Keys[ k_Active ] ) // yB 300407: przelacznik rozrzadu - { // Ra 2014-06: uruchomiłem to, aby aktywować czuwak w zajmowanym członie, - // a wyłączyć w innych - // Ra 2014-03: aktywacja czuwaka przepięta na ustawienie kierunku w - // mvOccupied - // if (mvControlled->Battery) //jeśli bateria jest już załączona - // mvOccupied->BatterySwitch(true); //to w ten oto durny sposób aktywuje - // się CA/SHP - // if (mvControlled->CabActivisation()) - // { - // dsbSwitch->SetVolume(DSBVOLUME_MAX); - // dsbSwitch->Play(0,0,0); - // } - } - else if( cKey == Global::Keys[ k_Heating ] ) // Winger 020304: ogrzewanie - // skladu - wlaczenie - { // Ra 2014-09: w trybie latania obsługa jest w World.cpp - if (!FreeFlyModeFlag) - { - if ((mvControlled->Heating == false) && - ((mvControlled->EngineType == ElectricSeriesMotor) && - (mvControlled->Mains == true) || - (mvControlled->ConverterFlag))) - { - mvControlled->Heating = true; - play_sound( dsbSwitch ); - } - } - } - else if( cKey == Global::Keys[ k_LeftSign ] ) // lewe swiatlo - włączenie - // ABu 060205: dzielo Wingera po malutkim liftingu: - { - if (false == (mvOccupied->LightsPosNo > 0)) - { - if ((Global::ctrlState) && - (ggRearRightLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu. - // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view - // TODO: do it a more elegant way. preferably along with the rest of the controlling code - { - if (mvOccupied->ActiveCab == 1) - { // kabina 1 - if (((DynamicObject->iLights[1]) & 48) == 0) - { - DynamicObject->iLights[1] |= 16; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearRightLightButton.PutValue(1); - } - if (((DynamicObject->iLights[1]) & 48) == 32) - { - DynamicObject->iLights[1] &= (255 - 32); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRearRightEndLightButton.SubModel) - { - ggRearRightEndLightButton.PutValue(0); - ggRearRightLightButton.PutValue(0); - } - else - ggRearRightLightButton.PutValue(0); - } - } - else - { // kabina -1 - if (((DynamicObject->iLights[0]) & 48) == 0) - { - DynamicObject->iLights[0] |= 16; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearRightLightButton.PutValue(1); - } - if (((DynamicObject->iLights[0]) & 48) == 32) - { - DynamicObject->iLights[0] &= (255 - 32); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRearRightEndLightButton.SubModel) - { - ggRearRightEndLightButton.PutValue(0); - ggRearRightLightButton.PutValue(0); - } - else - ggRearRightLightButton.PutValue(0); - } - } - } - else - { - if (mvOccupied->ActiveCab == 1) - { // kabina 1 - if (((DynamicObject->iLights[0]) & 3) == 0) - { - DynamicObject->iLights[0] |= 1; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggLeftLightButton.PutValue(1); - } - if (((DynamicObject->iLights[0]) & 3) == 2) - { - DynamicObject->iLights[0] &= (255 - 2); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggLeftEndLightButton.SubModel) - { - ggLeftEndLightButton.PutValue(0); - ggLeftLightButton.PutValue(0); - } - else - ggLeftLightButton.PutValue(0); - } - } - else - { // kabina -1 - if (((DynamicObject->iLights[1]) & 3) == 0) - { - DynamicObject->iLights[1] |= 1; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggLeftLightButton.PutValue(1); - } - if (((DynamicObject->iLights[1]) & 3) == 2) - { - DynamicObject->iLights[1] &= (255 - 2); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggLeftEndLightButton.SubModel) - { - ggLeftEndLightButton.PutValue(0); - ggLeftLightButton.PutValue(0); - } - else - ggLeftLightButton.PutValue(0); - } - } - } //----------- - } - } -#endif else if (cKey == Global::Keys[k_UpperSign]) // ABu 060205: światło górne - // włączenie { @@ -3423,232 +2948,10 @@ void TTrain::OnKeyDown(int cKey) SetLights(); } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if ((Global::ctrlState) && - (ggRearUpperLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu - { - //------------------------------ - if ((mvOccupied->ActiveCab) == 1) - { // kabina 1 - if (((DynamicObject->iLights[1]) & 12) == 0) - { - DynamicObject->iLights[1] |= 4; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearUpperLightButton.PutValue(1); - } - } - else - { // kabina -1 - if (((DynamicObject->iLights[0]) & 12) == 0) - { - DynamicObject->iLights[0] |= 4; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearUpperLightButton.PutValue(1); - } - } - } //------------------------------ - else - { - if ((mvOccupied->ActiveCab) == 1) - { // kabina 1 - if (((DynamicObject->iLights[0]) & 12) == 0) - { - DynamicObject->iLights[0] |= 4; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggUpperLightButton.PutValue(1); - } - } - else - { // kabina -1 - if (((DynamicObject->iLights[1]) & 12) == 0) - { - DynamicObject->iLights[1] |= 4; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggUpperLightButton.PutValue(1); - } - } - } -#endif } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if( cKey == Global::Keys[ k_RightSign ] ) // Winger 070304: swiatla - // tylne (koncowki) - - // wlaczenie - { - if (false == (mvOccupied->LightsPosNo > 0)) - { - if ((Global::ctrlState) && - (ggRearLeftLightButton.SubModel)) // hunter-230112 - z controlem zapala z tylu - // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view - // TODO: do it a more elegant way. preferably along with the rest of the controlling code - { - if( mvOccupied->ActiveCab == 1 ) { // kabina 1 - if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 0 ) { - DynamicObject->iLights[ 1 ] |= 1; - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - ggRearLeftLightButton.PutValue( 1 ); - } - if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 2 ) { - DynamicObject->iLights[ 1 ] &= ( 255 - 2 ); - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - if( ggRearLeftEndLightButton.SubModel ) { - ggRearLeftEndLightButton.PutValue( 0 ); - ggRearLeftLightButton.PutValue( 0 ); - } - else - ggRearLeftLightButton.PutValue( 0 ); - } - } - else { // kabina -1 - if( ( ( DynamicObject->iLights[ 0 ] ) & 3 ) == 0 ) { - DynamicObject->iLights[ 0 ] |= 1; - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - ggRearLeftLightButton.PutValue( 1 ); - } - if( ( ( DynamicObject->iLights[ 0 ] ) & 3 ) == 2 ) { - DynamicObject->iLights[ 0 ] &= ( 255 - 2 ); - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - if( ggRearLeftEndLightButton.SubModel ) { - ggRearLeftEndLightButton.PutValue( 0 ); - ggRearLeftLightButton.PutValue( 0 ); - } - else - ggRearLeftLightButton.PutValue( 0 ); - } - } - } //------------------------------ - else - { - if (mvOccupied->ActiveCab == 1) - { // kabina 1 - if (((DynamicObject->iLights[0]) & 48) == 0) - { - DynamicObject->iLights[0] |= 16; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRightLightButton.PutValue(1); - } - if (((DynamicObject->iLights[0]) & 48) == 32) - { - DynamicObject->iLights[0] &= (255 - 32); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRightEndLightButton.SubModel) - { - ggRightEndLightButton.PutValue(0); - ggRightLightButton.PutValue(0); - } - else - ggRightLightButton.PutValue(0); - } - } - else - { // kabina -1 - if (((DynamicObject->iLights[1]) & 48) == 0) - { - DynamicObject->iLights[1] |= 16; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRightLightButton.PutValue(1); - } - if (((DynamicObject->iLights[1]) & 48) == 32) - { - DynamicObject->iLights[1] &= (255 - 32); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRightEndLightButton.SubModel) - { - ggRightEndLightButton.PutValue(0); - ggRightLightButton.PutValue(0); - } - else - ggRightLightButton.PutValue(0); - } - } - } - } - } -#endif } else // McZapkie-240302 - klawisze bez shifta { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if( cKey == Global::Keys[ k_IncMainCtrl ] ) - { - if (mvControlled->IncMainCtrl(1)) - { - dsbNastawnikJazdy->SetCurrentPosition(0); - dsbNastawnikJazdy->Play(0, 0, 0); - } - } - else if (cKey == Global::Keys[k_DecMainCtrl]) - if (mvControlled->DecMainCtrl(1)) - { - dsbNastawnikJazdy->SetCurrentPosition(0); - dsbNastawnikJazdy->Play(0, 0, 0); - } - else - ; - if (cKey == Global::Keys[k_IncScndCtrl]) - // if (MoverParameters->ScndCtrlPosScndCtrlPosNo) - // if - // (mvControlled->EnginePowerSource.SourceType==CurrentCollector) - if (mvControlled->ShuntMode) - { - mvControlled->AnPos += (Timer::GetDeltaTime() / 0.85f); - if (mvControlled->AnPos > 1) - mvControlled->AnPos = 1; - } - else if (mvControlled->IncScndCtrl(1)) - { - if (dsbNastawnikBocz) // hunter-081211 - { - dsbNastawnikBocz->SetCurrentPosition(0); - dsbNastawnikBocz->Play(0, 0, 0); - } - else if (!dsbNastawnikBocz) - { - dsbNastawnikJazdy->SetCurrentPosition(0); - dsbNastawnikJazdy->Play(0, 0, 0); - } - } - else - ; - else if( cKey == Global::Keys[ k_DecScndCtrl ] ) - // if (mvControlled->EnginePowerSource.SourceType==CurrentCollector) - if (mvControlled->ShuntMode) - { - mvControlled->AnPos -= (Timer::GetDeltaTime() / 0.55f); - if (mvControlled->AnPos < 0) - mvControlled->AnPos = 0; - } - else - - if (mvControlled->DecScndCtrl(1)) - // if (MoverParameters->ScndCtrlPos>0) - { - if (dsbNastawnikBocz) // hunter-081211 - { - dsbNastawnikBocz->SetCurrentPosition(0); - dsbNastawnikBocz->Play(0, 0, 0); - } - else if (!dsbNastawnikBocz) - { - dsbNastawnikJazdy->SetCurrentPosition(0); - dsbNastawnikJazdy->Play(0, 0, 0); - } - } - else - ; -#endif if( cKey == Global::Keys[ k_IncLocalBrakeLevel ] ) { // Ra 2014-09: w // trybie latania @@ -3661,8 +2964,6 @@ void TTrain::OnKeyDown(int cKey) { mvOccupied->IncManualBrakeLevel(1); } - else - ; #ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (mvOccupied->LocalBrake != ManualBrake) mvOccupied->IncLocalBrakeLevel(1); @@ -3679,8 +2980,6 @@ void TTrain::OnKeyDown(int cKey) if (Global::ctrlState) if ((mvOccupied->LocalBrake == ManualBrake) || (mvOccupied->MBrake == true)) mvOccupied->DecManualBrakeLevel(1); - else - ; #ifdef EU07_USE_OLD_COMMAND_SYSTEM else // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - // odhamować jakoś trzeba @@ -3689,293 +2988,19 @@ void TTrain::OnKeyDown(int cKey) #endif } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if ((cKey == Global::Keys[k_IncBrakeLevel]) && (mvOccupied->BrakeHandle != FV4a)) - // if (mvOccupied->IncBrakeLevel()) - if (mvOccupied->BrakeLevelAdd(Global::fBrakeStep)) // nieodpowiedni - // warunek; true, jeśli - // można dalej kręcić - { - keybrakecount = 0; - if ((isEztOer) && (mvOccupied->BrakeCtrlPos < 3)) - { // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); - } - } - else - ; - else if ((cKey == Global::Keys[k_DecBrakeLevel]) && (mvOccupied->BrakeHandle != FV4a)) - { - // nową wersję dostarczył ZiomalCl ("fixed looped sound in ezt when using - // NUM_9 key") - if ((mvOccupied->BrakeCtrlPos > -1) || (keybrakecount > 1)) - { - - if ((isEztOer) && (mvControlled->Mains) && (mvOccupied->BrakeCtrlPos != -1)) - { // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); - } - // mvOccupied->DecBrakeLevel(); - mvOccupied->BrakeLevelAdd(-Global::fBrakeStep); - } - else - keybrakecount += 1; - // koniec wersji dostarczonej przez ZiomalCl - /* wersja poprzednia - ten pierwszy if ze średnikiem nie działał jak - warunek - if ((mvOccupied->BrakeCtrlPos>-1)|| (keybrakecount>1)) - { - if (mvOccupied->DecBrakeLevel()); - { - if ((isEztOer) && - (mvOccupied->BrakeCtrlPos<2)&&(keybrakecount<=1)) - { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0,0,0); - } - } - } - else keybrakecount+=1; - */ - } - else if( cKey == Global::Keys[ k_EmergencyBrake ] ) - { - // while (mvOccupied->IncBrakeLevel()); - mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_EB)); - if (mvOccupied->BrakeCtrlPosNo <= 0.1) // hamulec bezpieczeństwa dla wagonów - mvOccupied->EmergencyBrakeFlag = true; - } - else if( cKey == Global::Keys[ k_Brake3 ] ) - { - if ((isEztOer) && ((mvOccupied->BrakeCtrlPos == 1) || (mvOccupied->BrakeCtrlPos == -1))) - { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); - } - // while (mvOccupied->BrakeCtrlPos>mvOccupied->BrakeCtrlPosNo-1 && - // mvOccupied->DecBrakeLevel()); - // while (mvOccupied->BrakeCtrlPosBrakeCtrlPosNo-1 && - // mvOccupied->IncBrakeLevel()); - mvOccupied->BrakeLevelSet(mvOccupied->BrakeCtrlPosNo - 1); - } -#endif else if (cKey == Global::Keys[k_Brake2]) { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if( ( isEztOer ) && ( ( mvOccupied->BrakeCtrlPos == 1 ) || ( mvOccupied->BrakeCtrlPos == -1 ) ) ) - { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); - } - // while (mvOccupied->BrakeCtrlPos>mvOccupied->BrakeCtrlPosNo/2 && - // mvOccupied->DecBrakeLevel()); - // while (mvOccupied->BrakeCtrlPosBrakeCtrlPosNo/2 && - // mvOccupied->IncBrakeLevel()); - mvOccupied->BrakeLevelSet(mvOccupied->BrakeCtrlPosNo / 2 + - (mvOccupied->BrakeHandle == FV4a ? 1 : 0)); -#endif if (Global::ctrlState) mvOccupied->BrakeLevelSet( - mvOccupied->Handle->GetPos(bh_NP)); // yB: czy ten stos funkcji nie - // powinien być jako oddzielna - // funkcja movera? + mvOccupied->Handle->GetPos(bh_NP)); // yB: czy ten stos funkcji nie powinien być jako oddzielna funkcja movera? } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if( cKey == Global::Keys[ k_Brake1 ] ) - { - if ((isEztOer) && (mvOccupied->BrakeCtrlPos != 1)) - { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); - } - // while (mvOccupied->BrakeCtrlPos>1 && mvOccupied->DecBrakeLevel()); - // while (mvOccupied->BrakeCtrlPos<1 && mvOccupied->IncBrakeLevel()); - mvOccupied->BrakeLevelSet(1); - } -#endif else if (cKey == Global::Keys[k_Brake0]) { if (Global::ctrlState) { mvOccupied->BrakeCtrlPos2 = 0; // wyrownaj kapturek } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else - { - if ((isEztOer) && - ((mvOccupied->BrakeCtrlPos == 1) || (mvOccupied->BrakeCtrlPos == -1))) - { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); - } - // while (mvOccupied->BrakeCtrlPos>0 && mvOccupied->DecBrakeLevel()); - // while (mvOccupied->BrakeCtrlPos<0 && mvOccupied->IncBrakeLevel()); - mvOccupied->BrakeLevelSet(0); - } -#endif } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if (cKey == Global::Keys[k_WaveBrake]) //[Num.] - { - if ((isEztOer) && (mvControlled->Mains) && (mvOccupied->BrakeCtrlPos != -1)) - { - dsbPneumaticSwitch->SetVolume(-10); - dsbPneumaticSwitch->Play(0, 0, 0); - } - // while (mvOccupied->BrakeCtrlPos>-1 && mvOccupied->DecBrakeLevel()); - // while (mvOccupied->BrakeCtrlPos<-1 && mvOccupied->IncBrakeLevel()); - mvOccupied->BrakeLevelSet(-1); - } - else if (cKey == Global::Keys[k_Czuwak]) - //--------------- - // hunter-131211: zbicie czuwaka przeniesione do TTrain::Update() - { // Ra: tu został tylko dźwięk - // dsbBuzzer->Stop(); - // if (mvOccupied->SecuritySystemReset()) - if (fabs(ggSecurityResetButton.GetValue()) < 0.001) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - // ggSecurityResetButton.PutValue(1); - } - else if( cKey == Global::Keys[ k_AntiSlipping ] ) - //--------------- - // hunter-221211: hamulec przeciwposlizgowy przeniesiony do - // TTrain::Update() - { - if (mvOccupied->BrakeSystem != ElectroPneumatic) - { - // if (mvControlled->AntiSlippingButton()) - if (fabs(ggAntiSlipButton.GetValue()) < 0.001) - { - // Dlaczego bylo '-50'??? - // dsbSwitch->SetVolume(-50); - play_sound( dsbSwitch ); - } - // ggAntiSlipButton.PutValue(1); - } - } - else if( cKey == Global::Keys[ k_Fuse ] ) - //--------------- - { - if (Global::ctrlState) // z controlem - { - ggConverterFuseButton.PutValue(1); // hunter-261211 - if ((mvControlled->Mains == false) && (ggConverterButton.GetValue() < 0.01) && - (mvControlled->TrainType != dt_EZT)) - mvControlled->ConvOvldFlag = false; - } - else - { - ggFuseButton.PutValue(1); - mvControlled->FuseOn(); - } - } - else if (cKey == Global::Keys[k_DirectionForward]) - // McZapkie-240302 - zmiana kierunku: 'd' do przodu, 'r' do tylu - { - if (mvOccupied->DirectionForward()) - { - //------------ - // hunter-121211: dzwiek kierunkowego - if (dsbReverserKey) - { - dsbReverserKey->SetCurrentPosition(0); - dsbReverserKey->SetVolume(DSBVOLUME_MAX); - dsbReverserKey->Play(0, 0, 0); - } - else if (!dsbReverserKey) - if (dsbSwitch) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - //------------ - if (mvOccupied->ActiveDir) // jeśli kierunek niezerowy - if (DynamicObject->Mechanik) // na wszelki wypadek - DynamicObject->Mechanik->CheckVehicles( - Change_direction); // aktualizacja skrajnych pojazdów w składzie - } - } - else if (cKey == Global::Keys[k_DirectionBackward]) // r - { - if (Global::ctrlState) - { // wciśnięty [Ctrl] - if (mvOccupied->Radio == true) - { - play_sound( dsbSwitch ); - mvOccupied->Radio = false; - } - } - else if (mvOccupied->DirectionBackward()) - { - //------------ - // hunter-121211: dzwiek kierunkowego - if (dsbReverserKey) - { - dsbReverserKey->SetCurrentPosition(0); - dsbReverserKey->SetVolume(DSBVOLUME_MAX); - dsbReverserKey->Play(0, 0, 0); - } - else if (!dsbReverserKey) - if (dsbSwitch) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - //------------ - if (mvOccupied->ActiveDir) // jeśli kierunek niezerowy - if (DynamicObject->Mechanik) // na wszelki wypadek - DynamicObject->Mechanik->CheckVehicles( - Change_direction); // aktualizacja skrajnych pojazdów w składzie - } - } - else if( cKey == Global::Keys[ k_Main ] ) - // McZapkie-240302 - wylaczanie glownego obwodu - //----------- - // hunter-141211: wyl. szybki wylaczony przeniesiony do TTrain::Update() - { - if (fabs(ggMainOffButton.GetValue()) < 0.001) - if (dsbSwitch) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - else if( cKey == Global::Keys[ k_Battery ] ) - { - // if ((mvControlled->TrainType==dt_EZT) || - // (mvControlled->EngineType==ElectricSeriesMotor)|| - // (mvControlled->EngineType==DieselElectric)) - if (mvOccupied->BatterySwitch(false)) - { // ewentualnie zablokować z FIZ, - // np. w samochodach się nie - // odłącza akumulatora - if (ggBatteryButton.SubModel) - { - ggBatteryButton.PutValue(0); - } - dsbSwitch->Play(0, 0, 0); - // mvOccupied->SecuritySystem.Status=0; - mvControlled->PantFront(false); - mvControlled->PantRear(false); - } - } -#endif - //----------- - // if (cKey==Global::Keys[k_Active]) //yB 300407: przelacznik - // rozrzadu - // { - // if (mvControlled->CabDeactivisation()) - // { - // dsbSwitch->SetVolume(DSBVOLUME_MAX); - // dsbSwitch->Play(0,0,0); - // } - // } - // else if (cKey == Global::Keys[k_BrakeProfile]) { // yB://ABu: male poprawki, zeby // bylo mozna ustawic dowolny @@ -4022,68 +3047,6 @@ void TTrain::OnKeyDown(int cKey) } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if (cKey == Global::Keys[k_Converter]) - //----------- - // hunter-261211: przetwornica i sprzezarka przeniesione do - // TTrain::Update() - { - if (ggConverterButton.GetValue() != 0) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - // if - // ((cKey==Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT))) - // //hunter-110212: poprawka dla EZT - else if ((cKey == Global::Keys[k_Compressor]) && - (mvControlled->CompressorPower < 2)) // hunter-091012: tak jest poprawnie - { - if (ggCompressorButton.GetValue() != 0) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - //----------- - else if( cKey == Global::Keys[ k_Releaser ] ) // odluzniacz - { - if (!FreeFlyModeFlag) - { - if ((mvControlled->EngineType == ElectricSeriesMotor) || - (mvControlled->EngineType == DieselElectric) || - (mvControlled->EngineType == ElectricInductionMotor)) - if (mvControlled->TrainType != dt_EZT) - if (mvOccupied->BrakeCtrlPosNo > 0) - { - ggReleaserButton.PutValue(1); - mvOccupied->BrakeReleaser(1); - // if (mvOccupied->BrakeReleaser(1)) - // { - // dsbPneumaticRelay->SetVolume(-80); - // dsbPneumaticRelay->Play(0, 0, 0); - // } - } - } - } - else if (cKey == Global::Keys[k_SmallCompressor]) // Winger 160404: mala sprezarka wl - { // Ra: bez [Shift] też dać dźwięk - if ((mvControlled->TrainType & dt_EZT) ? mvControlled == mvOccupied : - !mvOccupied->ActiveCab) // tylko w maszynowym - if (Global::ctrlState) // z [Ctrl] - mvControlled->bPantKurek3 = - false; // zbiornik pantografu połączony jest z małą sprężarką - // (pompowanie ma sens, ale potem trzeba przełączyć) - else if( !mvControlled->PantCompFlag ) // jeśli wyłączona - if (mvControlled->Battery) // jeszcze musi być załączona bateria - if (mvControlled->PantPress < 4.8) // piszą, że to tak nie działa - { - mvControlled->PantCompFlag = true; - play_sound( dsbSwitch ); // dźwięk tylko po naciśnięciu klawisza - } - } -#endif // McZapkie-240302 - wylaczanie automatycznego pilota (w trybie ~debugmode // mozna tylko raz) else if (cKey == GLFW_KEY_Q) // bez Shift @@ -4091,56 +3054,6 @@ void TTrain::OnKeyDown(int cKey) if (DynamicObject->Mechanik) DynamicObject->Mechanik->TakeControl(false); } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if( cKey == Global::Keys[ k_MaxCurrent ] ) // McZapkie-160502: f - niski rozruch - { - if ((mvControlled->EngineType == DieselElectric) && (mvControlled->ShuntModeAllow) && - (mvControlled->MainCtrlPos == 0)) - { - mvControlled->ShuntMode = false; - } - if (mvControlled->CurrentSwitch(false)) - { - play_sound( dsbSwitch ); - } - } - else if (cKey == Global::Keys[k_CurrentAutoRelay]) // McZapkie-241002: g - - // wylaczanie PSR - { - if (mvControlled->AutoRelaySwitch(false)) - { - play_sound( dsbSwitch ); - } - } - // hunter-201211: piasecznica poprawiona oraz przeniesiona do - // TTrain::Update() - else if( cKey == Global::Keys[ k_Sand ] ) - { - /* - if (mvControlled->TrainType!=dt_EZT) - { - if (mvControlled->SandDoseOn()) - if (mvControlled->SandDose) - { - dsbPneumaticRelay->SetVolume(-30); - dsbPneumaticRelay->Play(0,0,0); - } - } - */ - if (mvControlled->TrainType == dt_EZT) - { - if (ggDoorSignallingButton.SubModel != NULL) - { - if (mvControlled->DoorSignalling) - { - mvOccupied->DoorBlocked = false; - play_sound( dsbSwitch ); - mvControlled->DoorSignalling = false; - } - } - } - } -#endif else if (cKey == Global::Keys[k_CabForward]) { if (!CabChange(1)) @@ -4337,239 +3250,6 @@ if } } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if (cKey == Global::Keys[k_CloseLeft]) // NBMX 17-09-2003: zamykanie drzwi - { - if( mvOccupied->DoorCloseCtrl == 1 ) { - if( mvOccupied->CabNo < 0 ? mvOccupied->DoorRight( false ) : mvOccupied->DoorLeft( false ) ) { - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - if( dsbDoorClose ) { - dsbDoorClose->SetCurrentPosition( 0 ); - dsbDoorClose->Play( 0, 0, 0 ); - } - } - } - } - else if (cKey == Global::Keys[k_CloseRight]) // NBMX 17-09-2003: zamykanie drzwi - { - if( mvOccupied->DoorCloseCtrl == 1 ) { - if( mvOccupied->CabNo < 0 ? mvOccupied->DoorLeft( false ) : mvOccupied->DoorRight( false ) ) { - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - if( dsbDoorClose ) { - dsbDoorClose->SetCurrentPosition( 0 ); - dsbDoorClose->Play( 0, 0, 0 ); - } - } - } - } - //----------- - // hunter-131211: dzwiek dla przelacznika universala - // hunter-091012: ubajerowanie swiatla w kabinie (wyrzucenie - // przyciemnienia pod Univ4) - else if (cKey == Global::Keys[k_Univ3]) - { - if (Global::ctrlState) - { - if (bCabLight == true) //(ggCabLightButton.GetValue()!=0) - { - play_sound( dsbSwitch ); - } - } - else - { - if (ggUniversal3Button.GetValue() != 0) - { - play_sound( dsbSwitch ); - } - /* - if (Global::ctrlState) - {//z [Ctrl] zapalamy albo gasimy światełko w kabinie - if (iCabLightFlag) --iCabLightFlag; //gaszenie - } */ - } - } - //----------- - // hunter-091012: dzwiek dla przyciemnienia swiatelka w kabinie - else if (cKey == Global::Keys[k_Univ4]) - { - if (Global::ctrlState) - { - if (bCabLightDim == true) //(ggCabLightDimButton.GetValue()!=0) - { - play_sound( dsbSwitch ); - } - } - } - //----------- - else if (cKey == Global::Keys[k_PantFrontDown]) // Winger 160204: - // opuszczanie prz. patyka - { - if (mvOccupied->ActiveCab == - 1) //||((mvOccupied->ActiveCab<1)&&(mvControlled->TrainType!=dt_ET40)&&(mvControlled->TrainType!=dt_ET41)&&(mvControlled->TrainType!=dt_ET42)&&(mvControlled->TrainType!=dt_EZT))) - { - // if (!mvControlled->PantFrontUp) //jeśli był opuszczony - // if () //jeśli połamany - // //to powtórzone opuszczanie naprawia - if (mvControlled->PantFront(false)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - else - // if - // ((mvOccupied->ActiveCab<1)&&((mvControlled->TrainType==dt_ET40)||(mvControlled->TrainType==dt_ET41)||(mvControlled->TrainType==dt_ET42)||(mvControlled->TrainType==dt_EZT))) - { - if (mvControlled->PantRear(false)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - } - else if (cKey == Global::Keys[k_PantRearDown]) // Winger 160204: - // opuszczanie tyl. patyka - { - if (mvOccupied->ActiveCab == - 1) //||((mvOccupied->ActiveCab<1)&&(mvControlled->TrainType!=dt_ET40)&&(mvControlled->TrainType!=dt_ET41)&&(mvControlled->TrainType!=dt_ET42)&&(mvControlled->TrainType!=dt_EZT))) - { - if (mvControlled->PantSwitchType == "impulse") - ggPantFrontButtonOff.PutValue(1); - if (mvControlled->PantRear(false)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - else - // if - // ((mvOccupied->ActiveCab<1)&&((mvControlled->TrainType==dt_ET40)||(mvControlled->TrainType==dt_ET41)||(mvControlled->TrainType==dt_ET42)||(mvControlled->TrainType==dt_EZT))) - { - /* if (mvControlled->PantSwitchType=="impulse") - ggPantRearButtonOff.PutValue(1); */ - if (mvControlled->PantFront(false)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - } - } - } - else if( cKey == Global::Keys[ k_Heating ] ) // Winger 020304: ogrzewanie - - // wylaczenie - { // Ra 2014-09: w trybie latania obsługa jest w World.cpp - if (!FreeFlyModeFlag) - { - if (mvControlled->Heating == true) - { - play_sound( dsbSwitch ); - mvControlled->Heating = false; - } - } - } - else if (cKey == Global::Keys[k_LeftSign]) // ABu 060205: lewe swiatlo - - // wylaczenie - { - if (false == (mvOccupied->LightsPosNo > 0)) - { - if ((Global::ctrlState) && - (ggRearLeftLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu - // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view - // TODO: do it a more elegant way. preferably along with the rest of the controlling code - { - //------------------------------ - if( mvOccupied->ActiveCab == 1 ) { // kabina 1 (od strony 0) - if( ( ( DynamicObject->iLights[ 1 ] ) & 48 ) == 0 ) { - DynamicObject->iLights[ 1 ] |= 32; - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - if( ggRearRightEndLightButton.SubModel ) { - ggRearRightEndLightButton.PutValue( 1 ); - ggRearRightLightButton.PutValue( 0 ); - } - else - ggRearRightLightButton.PutValue( -1 ); - } - if( ( ( DynamicObject->iLights[ 1 ] ) & 48 ) == 16 ) { - DynamicObject->iLights[ 1 ] &= ( 255 - 16 ); - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - ggRearRightLightButton.PutValue( 0 ); - } - } - else { // kabina -1 - if( ( ( DynamicObject->iLights[ 0 ] ) & 48 ) == 0 ) { - DynamicObject->iLights[ 0 ] |= 32; - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - if( ggRearRightEndLightButton.SubModel ) { - ggRearRightEndLightButton.PutValue( 1 ); - ggRearRightLightButton.PutValue( 0 ); - } - else - ggRearRightLightButton.PutValue( -1 ); - } - if( ( ( DynamicObject->iLights[ 0 ] ) & 48 ) == 16 ) { - DynamicObject->iLights[ 0 ] &= ( 255 - 16 ); - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - ggRearRightLightButton.PutValue( 0 ); - } - } - } //------------------------------ - else - { - if (mvOccupied->ActiveCab == 1) - { // kabina 1 - if (((DynamicObject->iLights[0]) & 3) == 0) - { - DynamicObject->iLights[0] |= 2; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggLeftEndLightButton.SubModel) - { - ggLeftEndLightButton.PutValue(1); - ggLeftLightButton.PutValue(0); - } - else - ggLeftLightButton.PutValue(-1); - } - if (((DynamicObject->iLights[0]) & 3) == 1) - { - DynamicObject->iLights[0] &= (255 - 1); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggLeftLightButton.PutValue(0); - } - } - else - { // kabina -1 - if (((DynamicObject->iLights[1]) & 3) == 0) - { - DynamicObject->iLights[1] |= 2; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggLeftEndLightButton.SubModel) - { - ggLeftEndLightButton.PutValue(1); - ggLeftLightButton.PutValue(0); - } - else - ggLeftLightButton.PutValue(-1); - } - if (((DynamicObject->iLights[1]) & 3) == 1) - { - DynamicObject->iLights[1] &= (255 - 1); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggLeftLightButton.PutValue(0); - } - } - } - } - } -#endif else if (cKey == Global::Keys[k_UpperSign]) // ABu 060205: światło górne - // wyłączenie { @@ -4586,244 +3266,7 @@ if SetLights(); } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if ((Global::ctrlState) && - (ggRearUpperLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu - { - //------------------------------ - if (mvOccupied->ActiveCab == 1) - { // kabina 1 - if (((DynamicObject->iLights[1]) & 12) == 4) - { - DynamicObject->iLights[1] &= (255 - 4); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearUpperLightButton.PutValue(0); - } - } - else - { // kabina -1 - if (((DynamicObject->iLights[0]) & 12) == 4) - { - DynamicObject->iLights[0] &= (255 - 4); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRearUpperLightButton.PutValue(0); - } - } - } //------------------------------ - else - { - if (mvOccupied->ActiveCab == 1) - { // kabina 1 - if (((DynamicObject->iLights[0]) & 12) == 4) - { - DynamicObject->iLights[0] &= (255 - 4); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggUpperLightButton.PutValue(0); - } - } - else - { // kabina -1 - if (((DynamicObject->iLights[1]) & 12) == 4) - { - DynamicObject->iLights[1] &= (255 - 4); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggUpperLightButton.PutValue(0); - } - } - } -#endif } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if (cKey == Global::Keys[k_RightSign]) // Winger 070304: swiatla tylne - // (koncowki) - wlaczenie - { - if (false == (mvOccupied->LightsPosNo > 0)) - { - if ((Global::ctrlState) && - (ggRearRightLightButton.SubModel)) // hunter-230112 - z controlem gasi z tylu - // 17.02.17 changed rear to opposite side, so the same key actually controls both lights on the left side, from the driver's point of view - // TODO: do it a more elegant way. preferably along with the rest of the controlling code - { - //------------------------------ - if( mvOccupied->ActiveCab == 1 ) { // kabina 1 - if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 0 ) { - DynamicObject->iLights[ 1 ] |= 2; - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - if( ggRearLeftEndLightButton.SubModel ) { - ggRearLeftEndLightButton.PutValue( 1 ); - ggRearLeftLightButton.PutValue( 0 ); - } - else - ggRearLeftLightButton.PutValue( -1 ); - } - if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 1 ) { - DynamicObject->iLights[ 1 ] &= ( 255 - 1 ); - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - ggRearLeftLightButton.PutValue( 0 ); - } - } - else { // kabina -1 - if( ( ( DynamicObject->iLights[ 0 ] ) & 3 ) == 0 ) { - DynamicObject->iLights[ 0 ] |= 2; - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - if( ggRearLeftEndLightButton.SubModel ) { - ggRearLeftEndLightButton.PutValue( 1 ); - ggRearLeftLightButton.PutValue( 0 ); - } - else - ggRearLeftLightButton.PutValue( -1 ); - } - if( ( ( DynamicObject->iLights[ 1 ] ) & 3 ) == 1 ) { - DynamicObject->iLights[ 1 ] &= ( 255 - 1 ); - dsbSwitch->SetVolume( DSBVOLUME_MAX ); - dsbSwitch->Play( 0, 0, 0 ); - ggLeftLightButton.PutValue( 0 ); - } - } - } //------------------------------ - else - { - if (mvOccupied->ActiveCab == 1) - { // kabina 0 - if (((DynamicObject->iLights[0]) & 48) == 0) - { - DynamicObject->iLights[0] |= 32; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRightEndLightButton.SubModel) - { - ggRightEndLightButton.PutValue(1); - ggRightLightButton.PutValue(0); - } - else - ggRightLightButton.PutValue(-1); - } - if (((DynamicObject->iLights[0]) & 48) == 16) - { - DynamicObject->iLights[0] &= (255 - 16); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRightLightButton.PutValue(0); - } - } - else - { // kabina -1 - if (((DynamicObject->iLights[1]) & 48) == 0) - { - DynamicObject->iLights[1] |= 32; - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - if (ggRightEndLightButton.SubModel) - { - ggRightEndLightButton.PutValue(1); - ggRightLightButton.PutValue(0); - } - else - ggRightLightButton.PutValue(-1); - } - if (((DynamicObject->iLights[1]) & 48) == 16) - { - DynamicObject->iLights[1] &= (255 - 16); - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0, 0, 0); - ggRightLightButton.PutValue(0); - } - } - } - } - } - else if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // Winger 110904: wylacznik st. - // liniowych - { - if( ( mvControlled->TrainType != dt_EZT ) && ( mvControlled->TrainType != dt_EP05 ) && - (mvControlled->TrainType != dt_ET40)) - { - ggStLinOffButton.PutValue(1); // Ra: było Fuse... - play_sound( dsbSwitch ); - if (mvControlled->MainCtrlPosNo > 0) - { - mvControlled->StLinFlag = - false; // yBARC - zmienione na przeciwne, bo true to zalaczone - play_sound( dsbRelay ); - } - } - if (mvControlled->TrainType == dt_EZT) - { - if (mvControlled->Signalling == true) - { - play_sound( dsbSwitch ); - mvControlled->Signalling = false; - } - } - } -#endif - else - { - // McZapkie: poruszanie sie po kabinie, w updatemechpos zawarte sa wiezy -/* - auto step = 1.0f; - auto const camerayaw = Global::pCamera->Yaw; - Math3D::vector3 direction( 0.0f, 0.0f, step ); - direction.RotateY( camerayaw ); - Math3D::vector3 right( -step, 0.0f, 0.0f ); - right.RotateY( camerayaw ); - // auto right = Math3D::CrossProduct( direction, Math3D::vector3( 0.0f, 1.0f, 0.0f ) ); - - if( mvOccupied->ActiveCab < 0 ) { - - direction *= -1.0f; - right *= -1.0f; - } - // if (!GetAsyncKeyState(VK_SHIFT)<0) // bez shifta - if (!Global::ctrlState) // gdy [Ctrl] zwolniony (dodatkowe widoki) - { - if (cKey == Global::Keys[k_MechLeft]) - { - vMechMovement -= right; - if (DynamicObject->Mechanik) - if (!FreeFlyModeFlag) //żeby nie mieszać obserwując z zewnątrz - DynamicObject->Mechanik->RouteSwitch( - 1); // na skrzyżowaniu skręci w lewo - } - else if (cKey == Global::Keys[k_MechRight]) - { - vMechMovement += right; - if (DynamicObject->Mechanik) - if (!FreeFlyModeFlag) //żeby nie mieszać obserwując z zewnątrz - DynamicObject->Mechanik->RouteSwitch( - 2); // na skrzyżowaniu skręci w prawo - } - else if (cKey == Global::Keys[k_MechBackward]) - { - vMechMovement -= direction; - // if (DynamicObject->Mechanik) - // if (!FreeFlyModeFlag) //żeby nie mieszać obserwując z zewnątrz - // DynamicObject->Mechanik->RouteSwitch(0); //na skrzyżowaniu stanie - // i poczeka - } - else if (cKey == Global::Keys[k_MechForward]) - { - vMechMovement += direction; - if (DynamicObject->Mechanik) - if (!FreeFlyModeFlag) //żeby nie mieszać obserwując z zewnątrz - DynamicObject->Mechanik->RouteSwitch( - 3); // na skrzyżowaniu pojedzie prosto - } - else if (cKey == Global::Keys[k_MechUp]) - pMechOffset.y += 0.25; // McZapkie-120302 - wstawanie - else if (cKey == Global::Keys[k_MechDown]) - pMechOffset.y -= 0.25; // McZapkie-120302 - siadanie - } -*/ - } - // else if (DebugModeFlag) { // przesuwanie składu o 100m @@ -4868,48 +3311,8 @@ if ++iRadioChannel; // 0=wyłączony } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - // TODO: break the mess above into individual command-based routines. - // TODO: test for modifiers inside the routines, instead of grouping by the modifier - // TODO: do away with the modifier tests, each command should be separate and issued by input processor(s) up the chain - if( cKey == Global::Keys[ k_DimHeadlights ] ) { - // headlight strength toggle - if( !Global::ctrlState ) { - // switch uses either ctrl, or ctrl+shift, so we can bail early here - return; - } - if( DynamicObject->DimHeadlights && (!Global::shiftState)) { - DynamicObject->DimHeadlights = false; - // switch sound - play_sound( dsbSwitch ); - } - else if( (!DynamicObject->DimHeadlights) && (Global::shiftState)) { - DynamicObject->DimHeadlights = true; - // switch sound - play_sound( dsbSwitch ); - } - } -#endif } -void TTrain::OnKeyUp(int cKey) -{ // zwolnienie klawisza -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if( Global::shiftState ) - { // wciśnięty [Shift] - } - else - { - if ((cKey == Global::Keys[k_StLinOff]) && (!Global::shiftState) && (!Global::ctrlState)) // Winger 110904: wylacznik st. liniowych - { // zwolnienie klawisza daje powrót przycisku do zwykłego stanu - if ((mvControlled->TrainType != dt_EZT) && (mvControlled->TrainType != dt_EP05) && - (mvControlled->TrainType != dt_ET40)) - ggStLinOffButton.PutValue(0); - } - } -#endif -}; - // cab movement update, fixed step part void TTrain::UpdateMechPosition(double dt) { // Ra: mechanik powinien być diff --git a/Train.h b/Train.h index e2658c1b..60e212fb 100644 --- a/Train.h +++ b/Train.h @@ -23,16 +23,12 @@ http://mozilla.org/MPL/2.0/. const int maxcab = 2; -// const double fCzuwakTime= 90.0f; const double fCzuwakBlink = 0.15; const float fConverterPrzekaznik = 1.5f; // hunter-261211: do przekaznika nadmiarowego przetwornicy // 0.33f // const double fBuzzerTime= 5.0f; const float fHaslerTime = 1.2f; -// const double fStycznTime= 0.5f; -// const double fDblClickTime= 0.2f; - class TCab { public: @@ -73,7 +69,6 @@ class TTrain // McZapkie-010302 bool Init(TDynamicObject *NewDynamicObject, bool e3d = false); void OnKeyDown(int cKey); - void OnKeyUp(int cKey); inline vector3 GetDirection() { return DynamicObject->VectorFront(); }; inline vector3 GetUp() { return DynamicObject->VectorUp(); }; @@ -423,8 +418,7 @@ public: // reszta może by?publiczna // TFadeSound sConverter; //przetwornica // TFadeSound sSmallCompressor; //przetwornica - int iCabLightFlag; // McZapkie:120503: oswietlenie kabiny (0: wyl, 1: - // przyciemnione, 2: pelne) + int iCabLightFlag; // McZapkie:120503: oswietlenie kabiny (0: wyl, 1: przyciemnione, 2: pelne) bool bCabLight; // hunter-091012: czy swiatlo jest zapalone? bool bCabLightDim; // hunter-091012: czy przyciemnienie kabiny jest zapalone? diff --git a/World.cpp b/World.cpp index da1c2575..aaf67aa7 100644 --- a/World.cpp +++ b/World.cpp @@ -824,15 +824,6 @@ void TWorld::OnKeyDown(int cKey) //} } -void TWorld::OnKeyUp(int cKey) -{ // zwolnienie klawisza; (cKey) to kod klawisza, cyfrowe i literowe się zgadzają - if (!Global::iPause) // podczas pauzy sterownaie nie działa - if (Train) - if (Controlled) - if ((Controlled->Controller == Humandriver) ? true : DebugModeFlag || (cKey == 'Q')) - Train->OnKeyUp(cKey); // przekazanie zwolnienia klawisza do kabiny -}; - void TWorld::OnMouseMove(double x, double y) { // McZapkie:060503-definicja obracania myszy Camera.OnCursorMove(x * Global::fMouseXScale / Global::ZoomFactor, -y * Global::fMouseYScale / Global::ZoomFactor); diff --git a/World.h b/World.h index 312bd3cf..36ae1b76 100644 --- a/World.h +++ b/World.h @@ -101,7 +101,6 @@ TWorld(); bool InitPerformed() { return m_init; } GLFWwindow *window; void OnKeyDown(int cKey); - void OnKeyUp(int cKey); // void UpdateWindow(); void OnMouseMove(double x, double y); void OnCommandGet(DaneRozkaz *pRozkaz); From 3e000eae29e1180a51e67c9e774930bf001dcb85 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 28 Apr 2017 02:59:51 +0200 Subject: [PATCH 092/426] build 170427. improved multi-unit simulation accuracy, high voltage couplers modification --- DynObj.cpp | 98 +++++++----- McZapkie/MOVER.h | 58 +++++-- McZapkie/Mover.cpp | 365 ++++++++++++++++++++++++++++++--------------- Train.cpp | 256 +++++++++++++------------------ World.cpp | 44 ++++-- 5 files changed, 490 insertions(+), 331 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 36b09abb..f63f6c0e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -798,7 +798,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) btnOn = true; } // else btCPass2.TurnOff(); - if (MoverParameters->Battery) + if (MoverParameters->Battery || MoverParameters->ConverterFlag) { // sygnaly konca pociagu if (btEndSignals1.Active()) { @@ -900,7 +900,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) // Ra: przechyłkę załatwiamy na etapie przesuwania modelu // if (ObjSqrDist<80000) ABuModelRoll(); //przechyłki od 400m } - if (MoverParameters->Battery) + if( MoverParameters->Battery || MoverParameters->ConverterFlag ) { // sygnały czoła pociagu //Ra: wyświetlamy bez // ograniczeń odległości, by były widoczne z // daleka @@ -1778,9 +1778,9 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" MoverParameters->PipePress = 0.0; MoverParameters->Pipe2->CreatePress(0.0); MoverParameters->ScndPipePress = 0.0; - MoverParameters->PantVolume = 1; - MoverParameters->PantPress = 0; - MoverParameters->CompressedVolume = 0; + MoverParameters->PantVolume = 0.1; + MoverParameters->PantPress = 0.0; + MoverParameters->CompressedVolume = 0.0; } if (ActPar.find('1') != std::string::npos) // wylaczanie 10% @@ -2456,30 +2456,41 @@ bool TDynamicObject::Update(double dt, double dt1) // McZapkie-260202 if ((MoverParameters->EnginePowerSource.SourceType == CurrentCollector) && (MoverParameters->Power > 1.0)) // aby rozrządczy nie opuszczał silnikowemu +/* if ((MechInside) || (MoverParameters->TrainType == dt_EZT)) { +*/ // if // ((!MoverParameters->PantCompFlag)&&(MoverParameters->CompressedVolume>=2.8)) // MoverParameters->PantVolume=MoverParameters->CompressedVolume; - if (MoverParameters->PantPress < (MoverParameters->TrainType == dt_EZT ? 2.4 : 3.5)) - { // 3.5 wg - // http://www.transportszynowy.pl/eu06-07pneumat.php - //"Wyłączniki ciśnieniowe odbieraków prądu wyłączają sterowanie - // wyłącznika szybkiego - // oraz uniemożliwiają podniesienie odbieraków prądu, gdy w instalacji - // rozrządu - // ciśnienie spadnie poniżej wartości 3,5 bara." + if( MoverParameters->PantPress < ( MoverParameters->TrainType == dt_EZT ? 2.5 : 3.5 ) ) { + // 3.5 wg http://www.transportszynowy.pl/eu06-07pneumat.php // Ra 2013-12: Niebugocław mówi, że w EZT podnoszą się przy 2.5 - // if (!MoverParameters->PantCompFlag) - // MoverParameters->PantVolume=MoverParameters->CompressedVolume; - MoverParameters->PantFront(false); // opuszczenie pantografów przy niskim ciśnieniu - MoverParameters->PantRear(false); // to idzie w ukrotnieniu, a nie powinno... + if( true == MoverParameters->PantPressSwitchActive ) { + // opuszczenie pantografów przy niskim ciśnieniu + MoverParameters->PantFront( false, MoverParameters->TrainType == dt_EZT ); + MoverParameters->PantRear( false, MoverParameters->TrainType == dt_EZT ); + // pressure switch safety measure -- open the line breaker, unless there's alternate source of traction voltage + if( MoverParameters->GetTrainsetVoltage() == 0.0 ) { + MoverParameters->MainSwitch( false, false ); + } + // mark the pressure switch as spent + MoverParameters->PantPressSwitchActive = false; + } } - // Winger - automatyczne wylaczanie malej sprezarki - else if (MoverParameters->PantPress >= 4.8) - MoverParameters->PantCompFlag = false; - } // Ra: do Mover to trzeba przenieść, żeby AI też mogło sobie podpompować + else { + // prime the pressure switch + // TODO: check what decides whether the pressure switch is active, prototypically + MoverParameters->PantPressSwitchActive = true; + if( MoverParameters->PantPress >= 4.8 ) { + // Winger - automatyczne wylaczanie malej sprezarki + MoverParameters->PantCompFlag = false; + } + } +/* + } // Ra: do Mover to trzeba przenieść, żeby AI też mogło sobie podpompować +*/ double dDOMoveLen; TLocation l; @@ -2911,14 +2922,25 @@ bool TDynamicObject::Update(double dt, double dt1) // fragment "z EXE Kursa" if (MoverParameters->Mains) // nie wchodzić w funkcję bez potrzeby - if ( ( false == MoverParameters->Battery) + if ( ( false == MoverParameters->Battery ) && ( false == MoverParameters->ConverterFlag ) // added alternative power source. TODO: more generic power check - && ( Controller == Humandriver) +/* + // NOTE: disabled on account of multi-unit setups, where the unmanned unit wouldn't be affected + && ( Controller == Humandriver ) +*/ && ( MoverParameters->EngineType != DieselEngine ) && ( MoverParameters->EngineType != WheelsDriven ) ) { // jeśli bateria wyłączona, a nie diesel ani drezyna reczna - if (MoverParameters->MainSwitch(false)) // wyłączyć zasilanie + if( MoverParameters->MainSwitch( false, MoverParameters->TrainType == dt_EZT ) ) { + // wyłączyć zasilanie + // NOTE: we turn off entire EMU, but only the affected unit for other multi-unit consists MoverParameters->EventFlag = true; + // drop pantographs + // NOTE: this isn't universal behaviour + // TODO: have this dependant on .fiz-driven flag + MoverParameters->PantFront( false, MoverParameters->TrainType == dt_EZT ); + MoverParameters->PantRear( false, MoverParameters->TrainType == dt_EZT ); + } } if (MoverParameters->TrainType == dt_ET42) { // powinny być wszystkie dwuczłony oraz EZT @@ -3210,21 +3232,23 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->PantRearVolt = 0.0; break; } // pozostałe na razie nie obsługiwane - if (MoverParameters->PantPress > - (MoverParameters->TrainType == dt_EZT ? 2.5 : 3.3)) // Ra 2013-12: - // Niebugocław - // mówi, że w EZT - // podnoszą się - // przy 2.5 - pantspeedfactor = 0.015 * (MoverParameters->PantPress) * - dt1; // z EXE Kursa //Ra: wysokość zależy od ciśnienia !!! - else + if( MoverParameters->PantPress > ( + MoverParameters->TrainType == dt_EZT ? + 2.45 : // Ra 2013-12: Niebugocław mówi, że w EZT podnoszą się przy 2.5 + 3.45 ) ) { + // z EXE Kursa + // Ra: wysokość zależy od ciśnienia !!! + pantspeedfactor = 0.015 * ( MoverParameters->PantPress ) * dt1; + } + else { pantspeedfactor = 0.0; - if (pantspeedfactor < 0) - pantspeedfactor = 0; + } + pantspeedfactor = std::max( 0.0, pantspeedfactor ); k = p->fAngleL; - if (i ? MoverParameters->PantRearUp : - MoverParameters->PantFrontUp) // jeśli ma być podniesiony + if( ( pantspeedfactor > 0.0 ) + && ( i ? + MoverParameters->PantRearUp : + MoverParameters->PantFrontUp ) )// jeśli ma być podniesiony { if (PantDiff > 0.001) // jeśli nie dolega do drutu { // jeśli poprzednia wysokość jest mniejsza niż pożądana, zwiększyć kąt diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index c2c53086..9a390ae7 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -139,7 +139,17 @@ static int const ctrain_passenger = 16; //mostek przejściowy static int const ctrain_scndpneumatic = 32; //przewody 8 atm (żółte; zasilanie powietrzem) static int const ctrain_heating = 64; //przewody ogrzewania WN static int const ctrain_depot = 128; //nie rozłączalny podczas zwykłych manewrów (międzyczłonowy), we wpisie wartość ujemna - +enum coupling { + faux = 0x0, + coupler = 0x1, + brakehose = 0x2, + control = 0x4, + highvoltage = 0x8, + gangway = 0x10, + mainhose = 0x20, + heating = 0x40, + permanent = 0x80 +}; /*typ hamulca elektrodynamicznego*/ static int const dbrake_none = 0; static int const dbrake_passive = 1; @@ -360,14 +370,14 @@ struct TBoilerType { }; /*rodzaj odbieraka pradu*/ struct TCurrentCollector { - long CollectorsNo; //musi być tu, bo inaczej się kopie - double MinH; double MaxH; //zakres ruchu pantografu, nigdzie nie używany - double CSW; //szerokość części roboczej (styku) ślizgacza - double MinV; double MaxV; //minimalne i maksymalne akceptowane napięcie - double OVP; //czy jest przekaznik nadnapieciowy - double InsetV; //minimalne napięcie wymagane do załączenia - double MinPress; //minimalne ciśnienie do załączenia WS - double MaxPress; //maksymalne ciśnienie za reduktorem + long CollectorsNo{ 0.0 }; //musi być tu, bo inaczej się kopie + double MinH{ 0.0 }; double MaxH{ 0.0 }; //zakres ruchu pantografu, nigdzie nie używany + double CSW{ 0.0 }; //szerokość części roboczej (styku) ślizgacza + double MinV{ 0.0 }; double MaxV{ 0.0 }; //minimalne i maksymalne akceptowane napięcie + double OVP{ 0.0 }; //czy jest przekaznik nadnapieciowy + double InsetV{ 0.0 }; //minimalne napięcie wymagane do załączenia + double MinPress{ 0.0 }; //minimalne ciśnienie do załączenia WS + double MaxPress{ 0.0 }; //maksymalne ciśnienie za reduktorem //inline TCurrentCollector() { // CollectorsNo = 0; // MinH, MaxH, CSW, MinV, MaxV = 0.0; @@ -536,6 +546,11 @@ struct TTransmision enum TCouplerType { NoCoupler, Articulated, Bare, Chain, Screw, Automatic }; +struct power_coupling { + double outgoing{ 0.0 }; // power generated by coupling owner + double incoming{ 0.0 }; // power supplied from outside source +}; + struct TCoupling { /*parametry*/ double SpringKB = 1.0; /*stala sprezystosci zderzaka/sprzegu, %tlumiennosci */ @@ -556,6 +571,9 @@ struct TCoupling { double CForce = 0.0; /*sila z jaka dzialal*/ double Dist = 0.0; /*strzalka ugiecia zderzaków*/ bool CheckCollision = false; /*czy sprawdzac sile czy pedy*/ + + power_coupling power_high; + power_coupling power_low; // TODO: implement this }; class TMoverParameters @@ -768,7 +786,17 @@ public: TRotation Rot; std::string Name; /*nazwa wlasna*/ TCoupling Couplers[2]; //urzadzenia zderzno-sprzegowe, polaczenia miedzy wagonami - double HVCouplers[2][2]; //przewod WN + enum side { + front = 0, + rear + }; +#ifdef EU07_USE_OLD_HVCOUPLERS + double HVCouplers[ 2 ][ 2 ]; //przewod WN + enum hvcoupler { + incoming = 0, + outgoing + }; +#endif int ScanCounter = 0; /*pomocnicze do skanowania sprzegow*/ bool EventFlag = false; /*!o true jesli cos nietypowego sie wydarzy*/ int SoundFlag = 0; /*!o patrz stale sound_ */ @@ -804,6 +832,7 @@ public: bool CompressorFlag = false; /*!o czy wlaczona sprezarka*/ bool PantCompFlag = false; /*!o czy wlaczona sprezarka pantografow*/ bool CompressorAllow = false; /*! zezwolenie na uruchomienie sprezarki NBMX*/ + bool CompressorGovernorLock{ false }; // indicates whether compressor pressure switch was activated due to reaching cut-out pressure bool ConverterFlag = false ; /*! czy wlaczona przetwornica NBMX*/ bool ConverterAllow = false; /*zezwolenie na prace przetwornicy NBMX*/ int BrakeCtrlPos = -2; /*nastawa hamulca zespolonego*/ @@ -886,7 +915,8 @@ public: double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/ bool UnBrake = false; /*w EZT - nacisniete odhamowywanie*/ double PantPress = 0.0; /*Cisnienie w zbiornikach pantografow*/ - bool s_CAtestebrake = false; //hunter-091012: zmienna dla testu ca + bool PantPressSwitchActive{ false }; // state of the pantograph pressure switch. gets primed when the pantograph is up + bool s_CAtestebrake = false; //hunter-091012: zmienna dla testu ca /*-zmienne dla lokomotywy spalinowej z przekladnia mechaniczna*/ double dizel_fill = 0.0; /*napelnienie*/ @@ -1058,7 +1088,7 @@ public: /*--funkcje dla lokomotyw*/ bool DirectionBackward(void);/*! kierunek ruchu*/ - bool MainSwitch(bool State);/*! wylacznik glowny*/ + bool MainSwitch( bool const State, bool const Multiunitcontrol = true );/*! wylacznik glowny*/ bool ConverterSwitch(bool State);/*! wl/wyl przetwornicy*/ bool CompressorSwitch(bool State);/*! wl/wyl sprezarki*/ @@ -1086,8 +1116,8 @@ public: bool AutoRelayCheck(void);//symulacja automatycznego rozruchu bool ResistorsFlagCheck(void); //sprawdzenie kontrolki oporow rozruchowych NBMX - bool PantFront(bool State); //obsluga pantografou przedniego - bool PantRear(bool State); //obsluga pantografu tylnego + bool PantFront(bool const State, bool const Multiunitcontrol = true ); //obsluga pantografou przedniego + bool PantRear(bool const State, bool const Multiunitcontrol = true ); //obsluga pantografu tylnego /*-funkcje typowe dla lokomotywy spalinowej z przekladnia mechaniczna*/ bool dizel_EngageSwitch(double state); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index a5a10dd5..cd4ebad1 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -337,11 +337,12 @@ Name( NameInit ) Couplers[b].DmaxC = 0.1; Couplers[b].FmaxC = 1000.0; } - for(int b = 0; b < 2; ++b ) { +#ifdef EU07_USE_OLD_HVCOUPLERS + for( int b = 0; b < 2; ++b ) { HVCouplers[ b ][ 0 ] = 0.0; HVCouplers[ b ][ 1 ] = 0.0; } - +#endif for( int b = 0; b < 3; ++b ) { BrakeCylMult[ b ] = 0.0; } @@ -709,21 +710,19 @@ void TMoverParameters::UpdatePantVolume(double dt) // nie tak if (EnginePowerSource.SourceType == CurrentCollector) // tylko jeśli pantografujący { - // Ra 2014-07: zasadniczo, to istnieje zbiornik rozrządu i zbiornik pantografów - na razie - // mamy razem - // Ra 2014-07: kurek trójdrogowy łączy spr.pom. z pantografami i wyłącznikiem ciśnieniowym - // WS + // Ra 2014-07: zasadniczo, to istnieje zbiornik rozrządu i zbiornik pantografów - na razie mamy razem + // Ra 2014-07: kurek trójdrogowy łączy spr.pom. z pantografami i wyłącznikiem ciśnieniowym WS // Ra 2014-07: zbiornika rozrządu nie pompuje się tu, tylko pantografy; potem można zamknąć // WS i odpalić resztę + // NOTE: custom variant for EMU disabled because it pretty much doesn't work if ((TrainType == dt_EZT) ? (PantPress < ScndPipePress) : bPantKurek3) // kurek zamyka połączenie z ZG - { // zbiornik pantografu połączony ze zbiornikiem głównym - małą sprężarką się tego nie - // napompuje + { // zbiornik pantografu połączony ze zbiornikiem głównym - małą sprężarką się tego nie napompuje // Ra 2013-12: Niebugocław mówi, że w EZT nie ma potrzeby odcinać kurkiem - PantPress = EnginePowerSource.CollectorParameters - .MaxPress; // ograniczenie ciśnienia do MaxPress (tylko w pantografach!) - if (PantPress > ScndPipePress) - PantPress = ScndPipePress; // oraz do ScndPipePress + PantPress = ScndPipePress; + // ograniczenie ciśnienia do MaxPress (tylko w pantografach!) + PantPress = std::min( PantPress, EnginePowerSource.CollectorParameters.MaxPress ); + PantPress = std::max( PantPress, 0.0 ); PantVolume = (PantPress + 1.0) * 0.1; // objętość, na wypadek odcięcia kurkiem } else @@ -733,19 +732,34 @@ void TMoverParameters::UpdatePantVolume(double dt) (2.0 * 0.45 - ((0.1 / PantVolume / 10) - 0.1)) / 0.45; // napełnianie zbiornika pantografów // Ra 2013-12: Niebugocław mówi, że w EZT nabija 1.5 raz wolniej niż jak było 0.005 - PantPress = (10.0 * PantVolume) - 1.0; // tu by się przydała objętość zbiornika + PantPress = std::min( (10.0 * PantVolume) - 1.0, EnginePowerSource.CollectorParameters.MaxPress ); // tu by się przydała objętość zbiornika + PantPress = std::max( PantPress, 0.0 ); } if (!PantCompFlag && (PantVolume > 0.1)) PantVolume -= dt * 0.0003; // nieszczelności: 0.0003=0.3l/s - if (Mains) // nie wchodzić w funkcję bez potrzeby - if (EngineType == ElectricSeriesMotor) // nie dotyczy... czego właściwie? - if (PantPress < EnginePowerSource.CollectorParameters.MinPress) - if ((TrainType & (dt_EZT | dt_ET40 | dt_ET41 | dt_ET42)) ? - (GetTrainsetVoltage() < EnginePowerSource.CollectorParameters.MinV) : - true) // to jest trochę proteza; zasilanie członu może być przez sprzęg - // WN - if (MainSwitch(false)) - EventFlag = true; // wywalenie szybkiego z powodu niskiego ciśnienia + if( Mains ) { + // nie wchodzić w funkcję bez potrzeby + if( EngineType == ElectricSeriesMotor ) { + // nie dotyczy... czego właściwie? + if( ( true == PantPressSwitchActive ) + && ( PantPress < EnginePowerSource.CollectorParameters.MinPress ) ) { + // wywalenie szybkiego z powodu niskiego ciśnienia + if( GetTrainsetVoltage() < EnginePowerSource.CollectorParameters.MinV ) { + // to jest trochę proteza; zasilanie członu może być przez sprzęg WN + if( MainSwitch( false, TrainType == dt_EZT ) ) { + EventFlag = true; + } + } +/* + // NOTE: disabled, the flag gets set in dynobj.update() when the pantograph actually drops + // mark the pressure switch as spent, regardless whether line breaker actually opened + PantPressSwitchActive = false; +*/ + } + } + } +/* + // NOTE: pantograph tank pressure sharing experimentally disabled for more accurate simulation if (TrainType != dt_EZT) // w EN57 pompuje się tylko w silnikowym // pierwotnie w CHK pantografy miały również rozrządcze EZT for (int b = 0; b <= 1; ++b) @@ -757,6 +771,7 @@ void TMoverParameters::UpdatePantVolume(double dt) // czy np. w ET40, ET41, ET42 pantografy członów mają połączenie pneumatyczne? // Ra 2014-07: raczej nie - najpierw się załącza jeden człon, a potem można podnieść w // drugim +*/ } else { // a tu coś dla SM42 i SM31, aby pokazywać na manometrze @@ -1059,57 +1074,99 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap { const double Vepsilon = 1e-5; const double Aepsilon = 1e-3; // ASBSpeed=0.8; - int b; - double Vprev, AccSprev, d, hvc; + double Vprev, AccSprev, d; // T_MoverParameters::ComputeMovement(dt, dt1, Shape, Track, ElectricTraction, NewLoc, NewRot); // // najpierw kawalek z funkcji w pliku mover.pas TotalCurrent = 0; - hvc = Max0R(Max0R(PantFrontVolt, PantRearVolt), ElectricTraction.TractionVoltage * 0.9); - for (b = 0; b < 2; b++) // przekazywanie napiec - if (((Couplers[b].CouplingFlag & ctrain_power) == ctrain_power) || - (((Couplers[b].CouplingFlag & ctrain_heating) == ctrain_heating) && (Heating))) - { - HVCouplers[1 - b][1] = - Max0R(abs(hvc), Couplers[b].Connected->HVCouplers[Couplers[b].ConnectedNr][1] - - HVCouplers[b][0] * 0.02); + double hvc = + std::max( + std::max( + PantFrontVolt, + PantRearVolt ), + ElectricTraction.TractionVoltage * 0.9 ); + + for( int side = 0; side < 2; ++side ) { + // przekazywanie napiec + auto const oppositeside = ( side == side::front ? side::rear : side::front ); + + if( ( Couplers[ side ].CouplingFlag & ctrain_power ) + || ( ( Heating ) + && ( Couplers[ side ].CouplingFlag & ctrain_heating ) ) ) { +#ifdef EU07_USE_OLD_HVCOUPLERS + HVCouplers[ oppositeside ][ hvcoupler::outgoing ] = + std::max( + std::abs( hvc ), + Couplers[ side ].Connected->HVCouplers[ Couplers[ side ].ConnectedNr ][ hvcoupler::outgoing ] - HVCouplers[ side ][ hvcoupler::incoming ] * 0.02 ); +#else + auto const &connectedcoupler = Couplers[ side ].Connected->Couplers[ Couplers[ side ].ConnectedNr ]; + Couplers[ oppositeside ].power_high.outgoing = + std::max( + std::abs( hvc ), + connectedcoupler.power_high.outgoing - Couplers[ side ].power_high.incoming * 0.02 ); +#endif } - else - HVCouplers[1 - b][1] = abs(hvc) - HVCouplers[b][0] * 0.02; - // Max0R(Abs(Voltage),0); - // end; + else { +#ifdef EU07_USE_OLD_HVCOUPLERS + HVCouplers[ oppositeside ][ hvcoupler::outgoing ] = abs( hvc ) - HVCouplers[ side ][ hvcoupler::incoming ] * 0.02; +#else + Couplers[ oppositeside ].power_high.outgoing = std::abs( hvc ) - Couplers[ side ].power_high.incoming * 0.02; +#endif + } + } - hvc = HVCouplers[0][1] + HVCouplers[1][1]; +#ifdef EU07_USE_OLD_HVCOUPLERS + hvc = HVCouplers[ side::front ][ hvcoupler::outgoing ] + HVCouplers[ side::rear ][ hvcoupler::outgoing ]; +#else + hvc = Couplers[ side::front ].power_high.outgoing + Couplers[ side::rear ].power_high.outgoing; +#endif - if ((abs(PantFrontVolt) + abs(PantRearVolt) < 1) && - (hvc > 1)) // bez napiecia, ale jest cos na sprzegach: - { - for (b = 0; b < 2; ++b) // przekazywanie pradow - if (((Couplers[b].CouplingFlag & ctrain_power) == ctrain_power) || - (((Couplers[b].CouplingFlag & ctrain_heating) == ctrain_heating) && - (Heating))) // jesli spiety - { - HVCouplers[b][0] = - Couplers[b].Connected->HVCouplers[1 - Couplers[b].ConnectedNr][0] + - Itot * HVCouplers[b][1] / hvc; // obciążenie rozkladane stosownie do napiec - } - else // pierwszy pojazd - { - HVCouplers[b][0] = Itot * HVCouplers[b][1] / hvc; - } + if( ( std::abs( PantFrontVolt ) + std::abs( PantRearVolt ) < 1.0 ) + && ( hvc > 1.0 ) ) { + // bez napiecia, ale jest cos na sprzegach: + // przekazywanie pradow + for( int side = 0; side < 2; ++side ) { + + if( ( Couplers[ side ].CouplingFlag & ctrain_power ) + || ( ( Heating ) + && ( Couplers[ side ].CouplingFlag & ctrain_heating ) ) ) { +#ifdef EU07_USE_OLD_HVCOUPLERS + HVCouplers[ side ][ hvcoupler::incoming ] = + Couplers[side].Connected->HVCouplers[Couplers[side].ConnectedNr][hvcoupler::outgoing] + + Itot * HVCouplers[side][hvcoupler::outgoing] / hvc; // obciążenie rozkladane stosownie do napiec +#else + auto const &connectedcoupler = Couplers[ side ].Connected->Couplers[ Couplers[ side ].ConnectedNr ]; + Couplers[ side ].power_high.incoming = + connectedcoupler.power_high.outgoing + + Itot * Couplers[ side ].power_high.outgoing / hvc; // obciążenie rozkladane stosownie do napiec +#endif + } + else { +#ifdef EU07_USE_OLD_HVCOUPLERS + // pierwszy pojazd + HVCouplers[side][hvcoupler::incoming] = Itot * HVCouplers[side][hvcoupler::outgoing] / hvc; +#else + Couplers[ side ].power_high.incoming = Itot * Couplers[ side ].power_high.outgoing / hvc; +#endif + } + } } else { - if (((Couplers[0].CouplingFlag & ctrain_power) == ctrain_power) || - (((Couplers[0].CouplingFlag & ctrain_heating) == ctrain_heating) && (Heating))) - TotalCurrent += - Couplers[0].Connected->HVCouplers[1 - Couplers[0].ConnectedNr][0]; - if (((Couplers[1].CouplingFlag & ctrain_power) == ctrain_power) || - (((Couplers[1].CouplingFlag & ctrain_heating) == ctrain_heating) && (Heating))) - TotalCurrent += - Couplers[1].Connected->HVCouplers[1 - Couplers[1].ConnectedNr][0]; - HVCouplers[0][0] = 0; - HVCouplers[1][0] = 0; + for( int side = 0; side < 2; ++side ) { + if( ( Couplers[ side ].CouplingFlag & ctrain_power ) + || ( ( Heating ) + && ( Couplers[ side ].CouplingFlag & ctrain_heating ) ) ) { +#ifdef EU07_USE_OLD_HVCOUPLERS + TotalCurrent += Couplers[ side ].Connected->HVCouplers[ Couplers[ side ].ConnectedNr ][ hvcoupler::incoming ]; + HVCouplers[ side ][ hvcoupler::incoming ] = 0.0; +#else + auto const &connectedcoupler = Couplers[ side ].Connected->Couplers[ Couplers[ side ].ConnectedNr ]; + TotalCurrent += connectedcoupler.power_high.incoming; + Couplers[ side ].power_high.incoming = 0.0; +#endif + } + } } if (!TestFlag(DamageFlag, dtrain_out)) @@ -1225,7 +1282,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap // przesuniecie dL = (3.0 * V - Vprev) * dt / 2.0; // metoda Adamsa-Bashfortha} // ale jesli jest kolizja (zas. zach. pedu) to...} - for (b = 0; b < 2; b++) + for (int b = 0; b < 2; b++) if (Couplers[b].CheckCollision) CollisionDetect(b, dt); // zmienia niejawnie AccS, V !!! @@ -1463,10 +1520,14 @@ double TMoverParameters::ShowEngineRotation(int VehN) void TMoverParameters::ConverterCheck() { // sprawdzanie przetwornicy - if (ConverterAllow && Mains) + if( ( ConverterAllow ) + && ( ( Mains ) + || ( GetTrainsetVoltage() > 0.5 * EnginePowerSource.MaxVoltage ) ) ) { ConverterFlag = true; - else + } + else { ConverterFlag = false; + } }; double TMoverParameters::ShowCurrent(int AmpN) @@ -2210,7 +2271,7 @@ bool TMoverParameters::AntiSlippingButton(void) // Q: 20160713 // włączenie / wyłączenie obwodu głownego // ************************************************************************************************* -bool TMoverParameters::MainSwitch(bool State) +bool TMoverParameters::MainSwitch( bool const State, bool const Multiunitcontrol ) { bool MS; @@ -2222,13 +2283,21 @@ bool TMoverParameters::MainSwitch(bool State) (LastSwitchingTime > CtrlDelay) && !TestFlag(DamageFlag, dtrain_out) && !TestFlag(EngDmgFlag, 1))) { - if (Mains) // jeśli był załączony - SendCtrlToNext("MainSwitch", int(State), - CabNo); // wysłanie wyłączenia do pozostałych? + if( Mains ) { + // jeśli był załączony + if( true == Multiunitcontrol ) { + // wysłanie wyłączenia do pozostałych? + SendCtrlToNext( "MainSwitch", int( State ), CabNo ); + } + } Mains = State; - if (Mains) // jeśli został załączony - SendCtrlToNext("MainSwitch", int(State), - CabNo); // wyslanie po wlaczeniu albo przed wylaczeniem + if( Mains ) { + // jeśli został załączony + if( true == Multiunitcontrol ) { + // wyslanie po wlaczeniu albo przed wylaczeniem + SendCtrlToNext( "MainSwitch", int( State ), CabNo ); + } + } MS = true; // wartość zwrotna LastSwitchingTime = 0; if ((EngineType == DieselEngine) && Mains) @@ -2898,15 +2967,21 @@ void TMoverParameters::CompressorCheck(double dt) else CompressorFlag = (CompressorAllow) && ((ConverterFlag) || (CompressorPower == 0)) && (Mains); - if (Compressor > - MaxCompressor) // wyłącznik ciśnieniowy jest niezależny od sposobu zasilania + if( Compressor > MaxCompressor ) { + // wyłącznik ciśnieniowy jest niezależny od sposobu zasilania CompressorFlag = false; + CompressorGovernorLock = true; // prevent manual activation until the pressure goes below cut-in level + } } else // jeśli nie załączona - if ((Compressor < MinCompressor) && - (LastSwitchingTime > CtrlDelay)) // jeśli nie załączona, a ciśnienie za małe - { // załączenie przy małym ciśnieniu - if (CompressorPower == 5) // jeśli zasilanie z następnego członu + if( ( ( Compressor < MinCompressor ) + || ( ( Compressor < MaxCompressor ) + && ( false == CompressorGovernorLock ) ) ) + && (LastSwitchingTime > CtrlDelay) ) { + // załączenie przy małym ciśnieniu + // jeśli nie załączona, a ciśnienie za małe + // or if the switch is on and the pressure isn't maxed + if( CompressorPower == 5 ) // jeśli zasilanie z następnego członu { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if (Couplers[1].Connected != NULL) CompressorFlag = @@ -2927,8 +3002,14 @@ void TMoverParameters::CompressorCheck(double dt) else CompressorFlag = (CompressorAllow) && ((ConverterFlag) || (CompressorPower == 0)) && (Mains); - if (CompressorFlag) // jeśli została załączona + if( CompressorFlag ) { + // jeśli została załączona LastSwitchingTime = 0; // to trzeba ograniczyć ponowne włączenie + if( Compressor < MinCompressor ) { + // if the activation took place at pressure below the cut-in level, we can reset compressor governor + CompressorGovernorLock = false; + } + } } // for b:=0 to 1 do //z Megapacka // with Couplers[b] do @@ -3231,14 +3312,17 @@ void TMoverParameters::UpdateScndPipePressure(double dt) } Pipe2->Flow(Hamulec->GetHPFlow(ScndPipePress, dt)); - +/* + // NOTE: condition disabled to allow the air flow from the main hose to the main tank as well if (((Compressor > ScndPipePress) && (CompressorSpeed > 0.0001)) || (TrainType == dt_EZT)) { +*/ dV = PF(Compressor, ScndPipePress, Spz) * dt; CompressedVolume += dV / 1000.0; Pipe2->Flow(-dV); +/* } - +*/ Pipe2->Flow(dv1 + dv2); Pipe2->Act(); ScndPipePress = Pipe2->P(); @@ -3407,21 +3491,27 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) LastSwitchingTime += dt1; if (EngineType == ElectricSeriesMotor) LastRelayTime += dt1; - if (Mains && /*(abs(CabNo) < 2) &&*/ (EngineType == - ElectricSeriesMotor)) // potem ulepszyc! pantogtrafy! + if( Mains && /*(abs(CabNo) < 2) &&*/ ( EngineType == + ElectricSeriesMotor ) ) // potem ulepszyc! pantogtrafy! { // Ra 2014-03: uwzględnienie kierunku jazdy w napięciu na silnikach, a powinien być - // zdefiniowany nawrotnik - if (CabNo == 0) + // zdefiniowany nawrotnik + if( CabNo == 0 ) Voltage = RunningTraction.TractionVoltage * ActiveDir; else Voltage = RunningTraction.TractionVoltage * DirAbsolute; // ActiveDir*CabNo; } // bo nie dzialalo - else if ((EngineType == ElectricInductionMotor) || - (((Couplers[0].CouplingFlag & ctrain_power) == ctrain_power) || - ((Couplers[1].CouplingFlag & ctrain_power) == - ctrain_power))) // potem ulepszyc! pantogtrafy! - Voltage = - Max0R(Max0R(RunningTraction.TractionVoltage, HVCouplers[0][1]), HVCouplers[1][1]); + else if( ( EngineType == ElectricInductionMotor ) || + ( ( ( Couplers[ 0 ].CouplingFlag & ctrain_power ) == ctrain_power ) || + ( ( Couplers[ 1 ].CouplingFlag & ctrain_power ) == + ctrain_power ) ) ) // potem ulepszyc! pantogtrafy! + Voltage = + std::max( + RunningTraction.TractionVoltage, +#ifdef EU07_USE_OLD_HVCOUPLERS + std::max( HVCouplers[side::front][hvcoupler::incoming], HVCouplers[side::rear][hvcoupler::incoming] ) ); +#else + std::max( Couplers[ side::front ].power_high.incoming, Couplers[ side::rear ].power_high.incoming ) ); +#endif else Voltage = 0; //if (Mains && /*(abs(CabNo) < 2) &&*/ ( @@ -3975,10 +4065,10 @@ double TMoverParameters::TractionForce(double dt) FuseOff(); // wywalanie bezpiecznika z powodu przetezenia silnikow if ((Mains)) // nie wchodzić w funkcję bez potrzeby - if ((abs(Voltage) < EnginePowerSource.CollectorParameters.MinV) || - (abs(Voltage) * EnginePowerSource.CollectorParameters.OVP > + if ( (std::max(GetTrainsetVoltage(), std::abs(Voltage)) < EnginePowerSource.CollectorParameters.MinV) || + (std::max(GetTrainsetVoltage(), std::abs(Voltage)) * EnginePowerSource.CollectorParameters.OVP > EnginePowerSource.CollectorParameters.MaxV)) - if (MainSwitch(false)) + if (MainSwitch(false, TrainType == dt_EZT)) // TODO: check whether we need to send this EMU-wide EventFlag = true; // wywalanie szybkiego z powodu niewłaściwego napięcia if (((DynamicBrakeType == dbrake_automatic) || (DynamicBrakeType == dbrake_switch)) && @@ -4263,11 +4353,11 @@ double TMoverParameters::TractionForce(double dt) { if( ( Mains ) ) { // nie wchodzić w funkcję bez potrzeby - if( ( abs( Voltage ) < EnginePowerSource.CollectorParameters.MinV ) - || ( abs( Voltage ) > EnginePowerSource.CollectorParameters.MaxV + 200 ) ) { - MainSwitch( false ); - } + if( ( std::max( std::abs( Voltage ), GetTrainsetVoltage() ) < EnginePowerSource.CollectorParameters.MinV ) + || ( std::max( std::abs( Voltage ), GetTrainsetVoltage() ) > EnginePowerSource.CollectorParameters.MaxV + 200 ) ) { + MainSwitch( false, TrainType == dt_EZT ); // TODO: check whether we need to send this EMU-wide } + } tmpV = abs(nrot) * (PI * WheelDiameter) * 3.6; //*DirAbsolute*eimc[eimc_s_p]; - do przemyslenia dzialanie pp if ((Mains)) { @@ -4979,23 +5069,29 @@ bool TMoverParameters::AutoRelayCheck(void) // Q: 20160713 // Podnosi / opuszcza przedni pantograf. Returns: state of the pantograph after the operation // ************************************************************************************************* -bool TMoverParameters::PantFront(bool State) +bool TMoverParameters::PantFront(bool const State, bool const Multiunitcontrol) { +/* if( ( true == Battery ) || ( true == ConverterFlag ) ) { - +*/ if( PantFrontUp != State ) { PantFrontUp = State; if( State == true ) { PantFrontStart = 0; - SendCtrlToNext( "PantFront", 1, CabNo ); + if( true == Multiunitcontrol ) { + SendCtrlToNext( "PantFront", 1, CabNo ); + } } else { PantFrontStart = 1; - SendCtrlToNext( "PantFront", 0, CabNo ); - } + if( true == Multiunitcontrol ) { + SendCtrlToNext( "PantFront", 0, CabNo ); + } } } +/* + } else { // no power, drop the pantograph // NOTE: this is a simplification as it should just drop on its own with loss of pressure without resupply from (dead) compressor @@ -5004,9 +5100,11 @@ bool TMoverParameters::PantFront(bool State) 1 : 0 ); PantFrontUp = false; - SendCtrlToNext( "PantFront", 0, CabNo ); + if( true == Multiunitcontrol ) { + SendCtrlToNext( "PantFront", 0, CabNo ); + } } - +*/ return PantFrontUp; } @@ -5014,23 +5112,29 @@ bool TMoverParameters::PantFront(bool State) // Q: 20160713 // Podnoszenie / opuszczanie pantografu tylnego // ************************************************************************************************* -bool TMoverParameters::PantRear(bool State) +bool TMoverParameters::PantRear(bool const State, bool const Multiunitcontrol) { +/* if( ( true == Battery ) || ( true == ConverterFlag ) ) { - +*/ if( PantRearUp != State ) { PantRearUp = State; if( State == true ) { PantRearStart = 0; - SendCtrlToNext( "PantRear", 1, CabNo ); + if( true == Multiunitcontrol ) { + SendCtrlToNext( "PantRear", 1, CabNo ); + } } else { PantRearStart = 1; - SendCtrlToNext( "PantRear", 0, CabNo ); - } + if( true == Multiunitcontrol ) { + SendCtrlToNext( "PantRear", 0, CabNo ); + } } } +/* + } else { // no power, drop the pantograph // NOTE: this is a simplification as it should just drop on its own with loss of pressure without resupply from (dead) compressor @@ -5039,9 +5143,11 @@ bool TMoverParameters::PantRear(bool State) 1 : 0 ); PantRearUp = false; - SendCtrlToNext( "PantRear", 0, CabNo ); + if( true == Multiunitcontrol ) { + SendCtrlToNext( "PantRear", 0, CabNo ); + } } - +*/ return PantRearUp; } @@ -5476,7 +5582,7 @@ std::string TMoverParameters::EngineDescription(int what) case 0: { if (DamageFlag == 255) - outstr = "Totally destroyed!"; + outstr = "WRECKED"; else { if (TestFlag(DamageFlag, dtrain_thinwheel)) @@ -5500,13 +5606,13 @@ std::string TMoverParameters::EngineDescription(int what) if (Power > 0.1) outstr = "Engine damaged,"; else - outstr = "Load destroyed!,"; + outstr = "LOAD DESTROYED,"; if (TestFlag(DamageFlag, dtrain_axle)) outstr = "Axle broken,"; if (TestFlag(DamageFlag, dtrain_out)) - outstr = "DERAILED!"; + outstr = "DERAILED"; if (outstr == "") - outstr = "OK!"; + outstr = "OK"; } break; } @@ -5523,7 +5629,30 @@ std::string TMoverParameters::EngineDescription(int what) // ************************************************************************************************* double TMoverParameters::GetTrainsetVoltage(void) {//ABu: funkcja zwracajaca napiecie dla calego skladu, przydatna dla EZT - return Max0R(HVCouplers[1][1], HVCouplers[0][1]); +/* + return std::min( + std::max( HVCouplers[ 1 ][ 1 ], HVCouplers[ 0 ][ 1 ] ), // local + std::max( HVCouplers[ 1 ][ 0 ], HVCouplers[ 0 ][ 0 ] ) ); // remote +*/ + // TODO: investigate what exactly is reported on these couplers, does it include heating? +#ifdef EU07_USE_OLD_HVCOUPLERS + // TODO: if we ever revert to this version, match the expanded alternative below + return std::max( HVCouplers[ 1 ][ 0 ], HVCouplers[ 0 ][ 0 ] ); // incoming, external power +#else + return std::max( + ( ( ( Couplers[side::front].Connected ) + && ( ( Couplers[ side::front ].CouplingFlag & ctrain_power ) + || ( ( Heating ) + && ( Couplers[ side::front ].CouplingFlag & ctrain_heating ) ) ) ) ? + Couplers[side::front].Connected->Couplers[ Couplers[side::front].ConnectedNr ].power_high.outgoing : + 0.0 ), + ( ( ( Couplers[side::rear].Connected ) + && ( ( Couplers[ side::rear ].CouplingFlag & ctrain_power ) + || ( ( Heating ) + && ( Couplers[ side::rear ].CouplingFlag & ctrain_heating ) ) ) ) ? + Couplers[ side::rear ].Connected->Couplers[ Couplers[ side::rear ].ConnectedNr ].power_high.outgoing : + 0.0 ) ); +#endif } // ************************************************************************************************* diff --git a/Train.cpp b/Train.cpp index 81d72c95..4664648c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1533,6 +1533,10 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // press or hold... if( Train->m_linebreakerstate == 0 ) { // ...to close the circuit + if( Command.action == GLFW_PRESS ) { + // fresh press, start fresh closing delay calculation + Train->fMainRelayTimer = 0.0f; + } if( Train->ggMainOnButton.SubModel != nullptr ) { // two separate switches to close and break the circuit // audio feedback @@ -1552,8 +1556,9 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com Train->ggMainButton.UpdateValue( 1.0 ); } // keep track of period the button is held down, to determine when/if circuit closes - if( ( false == ( Train->mvControlled->EnginePowerSource.PowerType == ElectricSeriesMotor ) || ( Train->mvControlled->EngineType == ElectricInductionMotor ) ) - || ( Train->fHVoltage > 0.0f ) ) { + if( ( false == ( ( Train->mvControlled->EngineType == ElectricSeriesMotor ) + || ( Train->mvControlled->EngineType == ElectricInductionMotor ) ) ) + || ( Train->fHVoltage > 0.5 * Train->mvControlled->EnginePowerSource.MaxVoltage ) ) { // prevent the switch from working if there's no power // TODO: consider whether it makes sense for diesel engines and such Train->fMainRelayTimer += 0.33f; // Command.time_delta * 5.0; @@ -1695,6 +1700,8 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // finalize the state of the line breaker Train->m_linebreakerstate = 1; } + // on button release reset the closing timer, just in case something elsewhere tries to read it + Train->fMainRelayTimer = 0.0f; } } @@ -1705,15 +1712,17 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma if( ( false == Train->mvControlled->ConverterAllow ) && ( Train->ggConverterButton.GetValue() < 0.5 ) ) { // turn on + // sound feedback + if( Train->ggConverterButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggConverterButton.UpdateValue( 1.0 ); +/* if( ( Train->mvControlled->EnginePowerSource.SourceType != CurrentCollector ) || ( Train->mvControlled->PantRearVolt != 0.0 ) || ( Train->mvControlled->PantFrontVolt != 0.0 ) ) { - // visual feedback - Train->ggConverterButton.UpdateValue( 1.0 ); - // sound feedback - if( Train->ggConverterButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } +*/ // impulse type switch has no effect if there's no power // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway if( ( Train->mvOccupied->ConvSwitchType != "impulse" ) @@ -1728,7 +1737,9 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } } } +/* } +*/ } else { //turn off @@ -3141,11 +3152,13 @@ if if (DynamicObject->Mechanik) // na wszelki wypadek DynamicObject->Mechanik->CheckVehicles(Connect); // aktualizacja flag kierunku w składzie play_sound( dsbCouplerAttach ); + // one coupling type per key press + return; } else WriteLog("Mechanical coupling failed."); } - else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_pneumatic)) // pneumatyka + if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_pneumatic)) // pneumatyka { if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag @@ -3155,12 +3168,16 @@ if tmp->MoverParameters->Couplers[CouplNr].Connected, (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_pneumatic))) { - rsHiss.Play(1, DSBPLAY_LOOPING, true, tmp->GetPosition()); + // TODO: dedicated 'click' sound for connecting cable-type connections + play_sound( dsbCouplerDetach ); +// rsHiss.Play( 1, DSBPLAY_LOOPING, true, tmp->GetPosition() ); DynamicObject->SetPneumatic(CouplNr != 0, true); // Ra: to mi się nie podoba !!!! tmp->SetPneumatic(CouplNr != 0, true); + // one coupling type per key press + return; } } - else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_scndpneumatic)) // zasilajacy + if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_scndpneumatic)) // zasilajacy { if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag @@ -3170,17 +3187,18 @@ if tmp->MoverParameters->Couplers[CouplNr].Connected, (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_scndpneumatic))) { - // rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition()); + // TODO: dedicated 'click' sound for connecting cable-type connections play_sound( dsbCouplerDetach ); - DynamicObject->SetPneumatic(CouplNr != 0, false); // Ra: to mi się nie podoba !!!! +// rsHiss.Play( 1, DSBPLAY_LOOPING, true, tmp->GetPosition() ); + DynamicObject->SetPneumatic( CouplNr != 0, false ); // Ra: to mi się nie podoba !!!! tmp->SetPneumatic(CouplNr != 0, false); + // one coupling type per key press + return; } } - else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_controll)) // ukrotnionko + if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_controll)) // ukrotnionko { - if ((tmp->MoverParameters->Couplers[CouplNr] - .Connected->Couplers[CouplNr] - .AllowedFlag & + if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag & ctrain_controll) == ctrain_controll) if (tmp->MoverParameters->Attach( @@ -3188,14 +3206,15 @@ if tmp->MoverParameters->Couplers[CouplNr].Connected, (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_controll))) { + // TODO: dedicated 'click' sound for connecting cable-type connections play_sound( dsbCouplerAttach ); + // one coupling type per key press + return; } } - else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_passenger)) // mostek + if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_passenger)) // mostek { - if ((tmp->MoverParameters->Couplers[CouplNr] - .Connected->Couplers[CouplNr] - .AllowedFlag & + if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag & ctrain_passenger) == ctrain_passenger) if (tmp->MoverParameters->Attach( @@ -3203,10 +3222,29 @@ if tmp->MoverParameters->Couplers[CouplNr].Connected, (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_passenger))) { - // rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition()); - play_sound( dsbCouplerDetach ); + play_sound( dsbCouplerAttach ); +/* DynamicObject->SetPneumatic(CouplNr != 0, false); tmp->SetPneumatic(CouplNr != 0, false); +*/ + // one coupling type per key press + return; + } + } + if( false == TestFlag( tmp->MoverParameters->Couplers[ CouplNr ].CouplingFlag, ctrain_heating ) ) { + // heating + if( ( tmp->MoverParameters->Couplers[ CouplNr ].Connected->Couplers[ CouplNr ].AllowedFlag + & tmp->MoverParameters->Couplers[ CouplNr ].AllowedFlag + & ctrain_heating ) == ctrain_heating ) + if( tmp->MoverParameters->Attach( + CouplNr, 2, + tmp->MoverParameters->Couplers[ CouplNr ].Connected, + ( tmp->MoverParameters->Couplers[ CouplNr ].CouplingFlag | ctrain_heating ) ) ) { + + // TODO: dedicated 'click' sound for connecting cable-type connections + play_sound( dsbCouplerAttach ); + // one coupling type per key press + return; } } } @@ -3478,6 +3516,19 @@ bool TTrain::Update( double const Deltatime ) m_linebreakerstate = 0; } + // NOTE: crude way to have the pantographs go back up if they're dropped due to insufficient pressure etc + // TODO: rework it into something more elegant, when redoing the whole consist/unit/cab etc arrangement + if( ( mvControlled->Battery ) + || ( mvControlled->ConverterFlag ) ) { + if( ( false == mvControlled->PantFrontUp ) + && ( ggPantFrontButton.GetValue() > 0.95 ) ) { + mvControlled->PantFront( true ); + } + if( ( false == mvControlled->PantRearUp ) + && ( ggPantRearButton.GetValue() > 0.95 ) ) { + mvControlled->PantRear( true ); + } + } /* // NOTE: disabled while switch state isn't preserved while moving between compartments // check whether we should raise the pantographs, based on volume in pantograph tank @@ -3502,15 +3553,14 @@ bool TTrain::Update( double const Deltatime ) tor = DynamicObject->GetTrack(); // McZapkie-180203 // McZapkie: predkosc wyswietlana na tachometrze brana jest z obrotow kol float maxtacho = 3; - fTachoVelocity = Min0R(fabs(11.31 * mvControlled->WheelDiameter * mvControlled->nrot), - mvControlled->Vmax * 1.05); + fTachoVelocity = static_cast( std::min( std::abs(11.31 * mvControlled->WheelDiameter * mvControlled->nrot), mvControlled->Vmax * 1.05) ); { // skacze osobna zmienna float ff = simulation::Time.data().wSecond; // skacze co sekunde - pol sekundy // pomiar, pol sekundy ustawienie if (ff != fTachoTimer) // jesli w tej sekundzie nie zmienial { if (fTachoVelocity > 1) // jedzie - fTachoVelocityJump = fTachoVelocity + (2 - Random(3) + Random(3)) * 0.5; + fTachoVelocityJump = fTachoVelocity + (2.0 - Random(3) + Random(3)) * 0.5; else fTachoVelocityJump = 0; // stoi fTachoTimer = ff; // juz zmienil @@ -3725,12 +3775,14 @@ bool TTrain::Update( double const Deltatime ) // przy dowolnym ustawieniu kierunkowego // Ra: to już jest w T_MoverParameters::TractionForce(), ale zależy od // kierunku - if (mvControlled->EngineType == ElectricSeriesMotor) - if (fabs(mvControlled->RunningTraction.TractionVoltage) < - 0.5 * - mvControlled->EnginePowerSource - .MaxVoltage) // minimalne napięcie pobierać z FIZ? - mvControlled->MainSwitch(false); + if( mvControlled->EngineType == ElectricSeriesMotor ) { + if( std::max( mvControlled->GetTrainsetVoltage(), std::fabs( mvControlled->RunningTraction.TractionVoltage ) ) < 0.5 * mvControlled->EnginePowerSource.MaxVoltage ) { + // TODO: check whether it should affect entire consist for EMU + // TODO: check whether it should happen if there's power supplied alternatively through hvcouplers + // TODO: potentially move this to the mover module, as there isn't much reason to have this dependent on the operator presence + mvControlled->MainSwitch( false, false ); + } + } // hunter-091012: swiatlo if (bCabLight == true) @@ -3759,7 +3811,7 @@ bool TTrain::Update( double const Deltatime ) { mvControlled->ConvOvldFlag = true; if (mvControlled->TrainType != dt_EZT) - mvControlled->MainSwitch(false); + mvControlled->MainSwitch(false, mvControlled->TrainType == dt_EZT); } else if( fConverterTimer >= fConverterPrzekaznik ) { // changed switch from always true to take into account state of the compressor switch @@ -4702,74 +4754,20 @@ bool TTrain::Update( double const Deltatime ) ggManualBrake.UpdateValue(double(mvOccupied->ManualBrakePos)); ggManualBrake.Update(); } - if (ggBrakeProfileCtrl.SubModel) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggBrakeProfileCtrl.UpdateValue( - double(mvOccupied->BrakeDelayFlag == 4 ? 2 : mvOccupied->BrakeDelayFlag - 1)); -#endif - ggBrakeProfileCtrl.Update(); - } - if (ggBrakeProfileG.SubModel) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggBrakeProfileG.UpdateValue( double( mvOccupied->BrakeDelayFlag == bdelay_G ? 1 : 0 ) ); -#endif - ggBrakeProfileG.Update(); - } - if (ggBrakeProfileR.SubModel) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggBrakeProfileR.UpdateValue( double( mvOccupied->BrakeDelayFlag == bdelay_R ? 1 : 0 ) ); -#endif - ggBrakeProfileR.Update(); - } - - if (ggMaxCurrentCtrl.SubModel) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggMaxCurrentCtrl.UpdateValue( double( mvControlled->Imax == mvControlled->ImaxHi ) ); -#endif - ggMaxCurrentCtrl.Update(); - } - + ggBrakeProfileCtrl.Update(); + ggBrakeProfileG.Update(); + ggBrakeProfileR.Update(); + ggMaxCurrentCtrl.Update(); // NBMX wrzesien 2003 - drzwi - if (ggDoorLeftButton.SubModel) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1 : 0 ); -#endif - ggDoorLeftButton.Update(); - } - if (ggDoorRightButton.SubModel) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggDoorRightButton.PutValue( mvOccupied->DoorRightOpened ? 1 : 0 ); -#endif - ggDoorRightButton.Update(); - } - if (ggDepartureSignalButton.SubModel) - { - // ggDepartureSignalButton.UpdateValue(double()); - ggDepartureSignalButton.Update(); - } - + ggDoorLeftButton.Update(); + ggDoorRightButton.Update(); + ggDepartureSignalButton.Update(); // NBMX dzwignia sprezarki - if (ggCompressorButton.SubModel) // hunter-261211: poprawka - ggCompressorButton.Update(); - if (ggMainButton.SubModel) - ggMainButton.Update(); - if (ggRadioButton.SubModel) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggRadioButton.PutValue( mvOccupied->Radio ? 1 : 0 ); -#endif - ggRadioButton.Update(); - } - if (ggConverterButton.SubModel) - ggConverterButton.Update(); - if (ggConverterOffButton.SubModel) - ggConverterOffButton.Update(); + ggCompressorButton.Update(); + ggMainButton.Update(); + ggRadioButton.Update(); + ggConverterButton.Update(); + ggConverterOffButton.Update(); #ifdef EU07_USE_OLD_COMMAND_SYSTEM if( ( ( DynamicObject->iLights[ 0 ] ) == 0 ) && ( ( DynamicObject->iLights[ 1 ] ) == 0 ) ) @@ -4918,64 +4916,18 @@ bool TTrain::Update( double const Deltatime ) ggLightsButton.PutValue(mvOccupied->LightsPos - 1); ggLightsButton.Update(); } - if( ggDimHeadlightsButton.SubModel ) { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggDimHeadlightsButton.PutValue( DynamicObject->DimHeadlights ? 1.0 : 0.0 ); -#endif - ggDimHeadlightsButton.Update(); - } - + ggDimHeadlightsButton.Update(); //--------- // Winger 010304 - pantografy // NOTE: shouldn't the pantograph updates check whether it's front or rear cabin? - if (ggPantFrontButton.SubModel ) { - ggPantFrontButton.Update(); - } - if (ggPantRearButton.SubModel) { - ggPantRearButton.Update(); - } - if (ggPantFrontButtonOff.SubModel) { - ggPantFrontButtonOff.Update(); - } + ggPantFrontButton.Update(); + ggPantRearButton.Update(); + ggPantFrontButtonOff.Update(); + ggTrainHeatingButton.Update(); + ggSignallingButton.Update(); + ggDoorSignallingButton.Update(); // Winger 020304 - ogrzewanie - //---------- // hunter-080812: poprawka na ogrzewanie w elektrykach - usuniete uzaleznienie od przetwornicy - if( ggTrainHeatingButton.SubModel ) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if( mvControlled->Heating ) - { - ggTrainHeatingButton.PutValue(1); - // if (mvControlled->ConverterFlag==true) - // btLampkaOgrzewanieSkladu.TurnOn(); - } - else - { - ggTrainHeatingButton.PutValue(0); - // btLampkaOgrzewanieSkladu.TurnOff(); - } -#endif - ggTrainHeatingButton.Update(); - } - if (ggSignallingButton.SubModel != nullptr) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggSignallingButton.PutValue( mvControlled->Signalling ? 1 : 0 ); -#endif - ggSignallingButton.Update(); - } - if (ggDoorSignallingButton.SubModel != nullptr) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggDoorSignallingButton.PutValue( mvControlled->DoorSignalling ? 1 : 0 ); -#endif - ggDoorSignallingButton.Update(); - } - // if (ggDistCounter.SubModel) - //{//Ra 2014-07: licznik kilometrów - // ggDistCounter.PutValue(mvControlled->DistCounter); - // ggDistCounter.Update(); - //} if ((((mvControlled->EngineType == ElectricSeriesMotor) && (mvControlled->Mains == true) && (mvControlled->ConvOvldFlag == false)) || (mvControlled->ConverterFlag)) && diff --git a/World.cpp b/World.cpp index aaf67aa7..28555df2 100644 --- a/World.cpp +++ b/World.cpp @@ -1820,24 +1820,48 @@ TWorld::Update_UI() { uitextline2 += "; TC:" + to_string( tmp->MoverParameters->TotalCurrent, 0 ); +#ifdef EU07_USE_OLD_HVCOUPLERS uitextline2 += - ", HV0:" - + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 1 ], 0 ) - + "@" - + to_string( tmp->MoverParameters->HVCouplers[ 0 ][ 0 ], 0 ); + ", HV0: (" + + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::outgoing ], 0 ) + + ")<-" + + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::incoming ], 0 ); uitextline2 += - ", HV1:" - + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 1 ], 0 ) - + "@" - + to_string( tmp->MoverParameters->HVCouplers[ 1 ][ 0 ], 0 ); + ", HV1: (" + + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::outgoing ], 0 ) + + ")<-" + + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::incoming ], 0 ); +#else + uitextline2 += + ", HV: " + + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.incoming, 0 ) + + "->(" + + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.outgoing, 0 ) + + ")F" + (tmp->DirectionGet() ? "<<" : ">>") + "R(" + + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.outgoing, 0 ) + + ")<-" + + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.incoming, 0 ); +#endif + // equipment flags + uitextline3 = ""; + uitextline3 += ( tmp->MoverParameters->Battery ? "B" : "b" ); + uitextline3 += ( tmp->MoverParameters->Mains ? "M" : "m" ); + uitextline3 += ( tmp->MoverParameters->PantRearUp ? ( tmp->MoverParameters->PantPressSwitchActive ? "O" : "o" ) : "." );; + uitextline3 += ( tmp->MoverParameters->PantFrontUp ? ( tmp->MoverParameters->PantPressSwitchActive ? "P" : "p" ) : "." );; + uitextline3 += ( tmp->MoverParameters->PantPressSwitchActive ? "!" : "." ); + uitextline3 += ( tmp->MoverParameters->ConverterAllow ? ( tmp->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ); + uitextline3 += ( tmp->MoverParameters->ConvOvldFlag ? "!" : "." ); + uitextline3 += ( tmp->MoverParameters->CompressorAllow ? ( tmp->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ); + uitextline3 += ( tmp->MoverParameters->CompressorGovernorLock ? "!" : "." ); - uitextline3 = - "BP: " + to_string( tmp->MoverParameters->BrakePress, 2 ) + uitextline3 += + " BP: " + to_string( tmp->MoverParameters->BrakePress, 2 ) + " (" + to_string( tmp->MoverParameters->BrakeStatus, 0 ) + "), LBP: " + to_string( tmp->MoverParameters->LocBrakePress, 2 ) + ", PP: " + to_string( tmp->MoverParameters->PipePress, 2 ) + "/" + to_string( tmp->MoverParameters->ScndPipePress, 2 ) + "/" + to_string( tmp->MoverParameters->EqvtPipePress, 2 ) + + ", MT: " + to_string( tmp->MoverParameters->CompressedVolume, 3 ) + ", BVP: " + to_string( tmp->MoverParameters->Volume, 3 ) + ", " + to_string( tmp->MoverParameters->CntrlPipePress, 3 ) + ", " + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ) From 59db98e726998ed034958bee9a0c939fba60a51f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 28 Apr 2017 18:37:36 +0200 Subject: [PATCH 093/426] build 170428. command propagation based on coupler type, minor bug fixes --- DynObj.cpp | 41 +++++++-------- McZapkie/MOVER.h | 23 +++++--- McZapkie/Mover.cpp | 128 ++++++++++++++++++++++++++++----------------- Train.cpp | 89 +++++++++++++++---------------- 4 files changed, 159 insertions(+), 122 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index f63f6c0e..eb7989e5 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2468,11 +2468,12 @@ bool TDynamicObject::Update(double dt, double dt1) // Ra 2013-12: Niebugocław mówi, że w EZT podnoszą się przy 2.5 if( true == MoverParameters->PantPressSwitchActive ) { // opuszczenie pantografów przy niskim ciśnieniu - MoverParameters->PantFront( false, MoverParameters->TrainType == dt_EZT ); - MoverParameters->PantRear( false, MoverParameters->TrainType == dt_EZT ); + MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); + MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); // pressure switch safety measure -- open the line breaker, unless there's alternate source of traction voltage - if( MoverParameters->GetTrainsetVoltage() == 0.0 ) { - MoverParameters->MainSwitch( false, false ); + if( MoverParameters->GetTrainsetVoltage() < 0.5 * MoverParameters->EnginePowerSource.MaxVoltage ) { + // TODO: check whether line breaker should be open EMU-wide + MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); } // mark the pressure switch as spent MoverParameters->PantPressSwitchActive = false; @@ -2931,15 +2932,15 @@ bool TDynamicObject::Update(double dt, double dt1) && ( MoverParameters->EngineType != DieselEngine ) && ( MoverParameters->EngineType != WheelsDriven ) ) { // jeśli bateria wyłączona, a nie diesel ani drezyna reczna - if( MoverParameters->MainSwitch( false, MoverParameters->TrainType == dt_EZT ) ) { + if( MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ) ) { // wyłączyć zasilanie // NOTE: we turn off entire EMU, but only the affected unit for other multi-unit consists MoverParameters->EventFlag = true; // drop pantographs // NOTE: this isn't universal behaviour // TODO: have this dependant on .fiz-driven flag - MoverParameters->PantFront( false, MoverParameters->TrainType == dt_EZT ); - MoverParameters->PantRear( false, MoverParameters->TrainType == dt_EZT ); + MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); + MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); } } if (MoverParameters->TrainType == dt_ET42) @@ -4148,22 +4149,20 @@ void TDynamicObject::RenderSounds() sConverter.TurnOff(MechInside, GetPosition()); sConverter.Update(MechInside, GetPosition()); } - if (MoverParameters->WarningSignal > 0) - { - if (TestFlag(MoverParameters->WarningSignal, 1)) - sHorn1.TurnOn(MechInside, GetPosition()); - else - sHorn1.TurnOff(MechInside, GetPosition()); - if (TestFlag(MoverParameters->WarningSignal, 2)) - sHorn2.TurnOn(MechInside, GetPosition()); - else - sHorn2.TurnOff(MechInside, GetPosition()); + + if( TestFlag( MoverParameters->WarningSignal, 1 ) ) { + sHorn1.TurnOn( MechInside, GetPosition() ); } - else - { - sHorn1.TurnOff(MechInside, GetPosition()); - sHorn2.TurnOff(MechInside, GetPosition()); + else { + sHorn1.TurnOff( MechInside, GetPosition() ); } + if( TestFlag( MoverParameters->WarningSignal, 2 ) ) { + sHorn2.TurnOn( MechInside, GetPosition() ); + } + else { + sHorn2.TurnOff( MechInside, GetPosition() ); + } + if (MoverParameters->DoorClosureWarning) { if (MoverParameters->DepartureSignal) // NBMX sygnal odjazdu, MC: pod warunkiem ze jest diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 9a390ae7..e8a509f1 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -149,6 +149,12 @@ enum coupling { mainhose = 0x20, heating = 0x40, permanent = 0x80 +}; +/*! przesylanie komend sterujacych*/ +enum command_range { + local, + unit, + consist }; /*typ hamulca elektrodynamicznego*/ static int const dbrake_none = 0; @@ -279,7 +285,8 @@ struct TCommand std::string Command; /*komenda*/ double Value1 = 0.0; /*argumenty komendy*/ double Value2 = 0.0; - TLocation Location; + int Coupling{ ctrain_controll }; // coupler flag used to determine command propagation + TLocation Location; }; /*tory*/ @@ -1012,11 +1019,11 @@ public: /*! przesylanie komend sterujacych*/ bool SendCtrlBroadcast(std::string CtrlCommand, double ctrlvalue); - bool SendCtrlToNext(std::string CtrlCommand, double ctrlvalue, double dir); - bool SetInternalCommand(std::string NewCommand, double NewValue1, double NewValue2); + bool SendCtrlToNext(std::string const CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype = ctrain_controll); + bool SetInternalCommand( std::string NewCommand, double NewValue1, double NewValue2, int const Couplertype = ctrain_controll ); double GetExternalCommand(std::string &Command); - bool RunCommand(std::string Command, double CValue1, double CValue2); - bool RunInternalCommand(void); + bool RunCommand( std::string Command, double CValue1, double CValue2, int const Couplertype = ctrain_controll ); + bool RunInternalCommand(); void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation); bool CabActivisation(void); bool CabDeactivisation(void); @@ -1088,7 +1095,7 @@ public: /*--funkcje dla lokomotyw*/ bool DirectionBackward(void);/*! kierunek ruchu*/ - bool MainSwitch( bool const State, bool const Multiunitcontrol = true );/*! wylacznik glowny*/ + bool MainSwitch( bool const State, int const Notify = command_range::consist );/*! wylacznik glowny*/ bool ConverterSwitch(bool State);/*! wl/wyl przetwornicy*/ bool CompressorSwitch(bool State);/*! wl/wyl sprezarki*/ @@ -1116,8 +1123,8 @@ public: bool AutoRelayCheck(void);//symulacja automatycznego rozruchu bool ResistorsFlagCheck(void); //sprawdzenie kontrolki oporow rozruchowych NBMX - bool PantFront(bool const State, bool const Multiunitcontrol = true ); //obsluga pantografou przedniego - bool PantRear(bool const State, bool const Multiunitcontrol = true ); //obsluga pantografu tylnego + bool PantFront( bool const State, int const Notify = command_range::consist ); //obsluga pantografou przedniego + bool PantRear( bool const State, int const Notify = command_range::consist ); //obsluga pantografu tylnego /*-funkcje typowe dla lokomotywy spalinowej z przekladnia mechaniczna*/ bool dizel_EngageSwitch(double state); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index cd4ebad1..2e088303 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -744,9 +744,9 @@ void TMoverParameters::UpdatePantVolume(double dt) if( ( true == PantPressSwitchActive ) && ( PantPress < EnginePowerSource.CollectorParameters.MinPress ) ) { // wywalenie szybkiego z powodu niskiego ciśnienia - if( GetTrainsetVoltage() < EnginePowerSource.CollectorParameters.MinV ) { + if( GetTrainsetVoltage() < 0.5 * EnginePowerSource.MaxVoltage ) { // to jest trochę proteza; zasilanie członu może być przez sprzęg WN - if( MainSwitch( false, TrainType == dt_EZT ) ) { + if( MainSwitch( false, ( TrainType == dt_EZT ? command_range::unit : command_range::local ) ) ) { EventFlag = true; } } @@ -1522,7 +1522,7 @@ void TMoverParameters::ConverterCheck() { // sprawdzanie przetwornicy if( ( ConverterAllow ) && ( ( Mains ) - || ( GetTrainsetVoltage() > 0.5 * EnginePowerSource.MaxVoltage ) ) ) { + || ( GetTrainsetVoltage() > 0.5 * EnginePowerSource.MaxVoltage ) ) ) { ConverterFlag = true; } else { @@ -2271,7 +2271,7 @@ bool TMoverParameters::AntiSlippingButton(void) // Q: 20160713 // włączenie / wyłączenie obwodu głownego // ************************************************************************************************* -bool TMoverParameters::MainSwitch( bool const State, bool const Multiunitcontrol ) +bool TMoverParameters::MainSwitch( bool const State, int const Notify ) { bool MS; @@ -2285,17 +2285,25 @@ bool TMoverParameters::MainSwitch( bool const State, bool const Multiunitcontrol { if( Mains ) { // jeśli był załączony - if( true == Multiunitcontrol ) { + if( Notify != command_range::local ) { // wysłanie wyłączenia do pozostałych? - SendCtrlToNext( "MainSwitch", int( State ), CabNo ); + SendCtrlToNext( + "MainSwitch", int( State ), CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); } } Mains = State; if( Mains ) { // jeśli został załączony - if( true == Multiunitcontrol ) { - // wyslanie po wlaczeniu albo przed wylaczeniem - SendCtrlToNext( "MainSwitch", int( State ), CabNo ); + if( Notify != command_range::local ) { + // wysłanie wyłączenia do pozostałych? + SendCtrlToNext( + "MainSwitch", int( State ), CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); } } MS = true; // wartość zwrotna @@ -4068,7 +4076,7 @@ double TMoverParameters::TractionForce(double dt) if ( (std::max(GetTrainsetVoltage(), std::abs(Voltage)) < EnginePowerSource.CollectorParameters.MinV) || (std::max(GetTrainsetVoltage(), std::abs(Voltage)) * EnginePowerSource.CollectorParameters.OVP > EnginePowerSource.CollectorParameters.MaxV)) - if (MainSwitch(false, TrainType == dt_EZT)) // TODO: check whether we need to send this EMU-wide + if( MainSwitch( false, ( TrainType == dt_EZT ? command_range::unit : command_range::local ) ) ) // TODO: check whether we need to send this EMU-wide EventFlag = true; // wywalanie szybkiego z powodu niewłaściwego napięcia if (((DynamicBrakeType == dbrake_automatic) || (DynamicBrakeType == dbrake_switch)) && @@ -4355,7 +4363,7 @@ double TMoverParameters::TractionForce(double dt) // nie wchodzić w funkcję bez potrzeby if( ( std::max( std::abs( Voltage ), GetTrainsetVoltage() ) < EnginePowerSource.CollectorParameters.MinV ) || ( std::max( std::abs( Voltage ), GetTrainsetVoltage() ) > EnginePowerSource.CollectorParameters.MaxV + 200 ) ) { - MainSwitch( false, TrainType == dt_EZT ); // TODO: check whether we need to send this EMU-wide + MainSwitch( false, ( TrainType == dt_EZT ? command_range::unit : command_range::local ) ); // TODO: check whether we need to send this EMU-wide } } tmpV = abs(nrot) * (PI * WheelDiameter) * 3.6; //*DirAbsolute*eimc[eimc_s_p]; - do przemyslenia dzialanie pp @@ -5069,7 +5077,7 @@ bool TMoverParameters::AutoRelayCheck(void) // Q: 20160713 // Podnosi / opuszcza przedni pantograf. Returns: state of the pantograph after the operation // ************************************************************************************************* -bool TMoverParameters::PantFront(bool const State, bool const Multiunitcontrol) +bool TMoverParameters::PantFront( bool const State, int const Notify ) { /* if( ( true == Battery ) @@ -5079,14 +5087,24 @@ bool TMoverParameters::PantFront(bool const State, bool const Multiunitcontrol) PantFrontUp = State; if( State == true ) { PantFrontStart = 0; - if( true == Multiunitcontrol ) { - SendCtrlToNext( "PantFront", 1, CabNo ); + if( Notify != command_range::local ) { + // wysłanie wyłączenia do pozostałych? + SendCtrlToNext( + "PantFront", 1, CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); } } else { PantFrontStart = 1; - if( true == Multiunitcontrol ) { - SendCtrlToNext( "PantFront", 0, CabNo ); + if( Notify != command_range::local ) { + // wysłanie wyłączenia do pozostałych? + SendCtrlToNext( + "PantFront", 0, CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); } } } @@ -5112,7 +5130,7 @@ bool TMoverParameters::PantFront(bool const State, bool const Multiunitcontrol) // Q: 20160713 // Podnoszenie / opuszczanie pantografu tylnego // ************************************************************************************************* -bool TMoverParameters::PantRear(bool const State, bool const Multiunitcontrol) +bool TMoverParameters::PantRear( bool const State, int const Notify ) { /* if( ( true == Battery ) @@ -5122,14 +5140,24 @@ bool TMoverParameters::PantRear(bool const State, bool const Multiunitcontrol) PantRearUp = State; if( State == true ) { PantRearStart = 0; - if( true == Multiunitcontrol ) { - SendCtrlToNext( "PantRear", 1, CabNo ); + if( Notify != command_range::local ) { + // wysłanie wyłączenia do pozostałych? + SendCtrlToNext( + "PantRear", 1, CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); } } else { PantRearStart = 1; - if( true == Multiunitcontrol ) { - SendCtrlToNext( "PantRear", 0, CabNo ); + if( Notify != command_range::local ) { + // wysłanie wyłączenia do pozostałych? + SendCtrlToNext( + "PantRear", 0, CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); } } } @@ -7653,18 +7681,20 @@ bool TMoverParameters::SendCtrlBroadcast(std::string CtrlCommand, double ctrlval // Q: 20160714 // Ustawienie komendy wraz z parametrami // ************************************************************************************************* -bool TMoverParameters::SetInternalCommand(std::string NewCommand, double NewValue1, - double NewValue2) +bool TMoverParameters::SetInternalCommand(std::string NewCommand, double NewValue1, double NewValue2, int const Couplertype) { bool SIC; - if ((CommandIn.Command == NewCommand) && (CommandIn.Value1 == NewValue1) && - (CommandIn.Value2 == NewValue2)) + if( ( CommandIn.Command == NewCommand ) + && ( CommandIn.Value1 == NewValue1 ) + && ( CommandIn.Value2 == NewValue2 ) + && ( CommandIn.Coupling == Couplertype ) ) SIC = false; else { CommandIn.Command = NewCommand; CommandIn.Value1 = NewValue1; CommandIn.Value2 = NewValue2; + CommandIn.Coupling = Couplertype; SIC = true; LastLoadChangeTime = 0; // zerowanie czasu (roz)ładowania } @@ -7676,7 +7706,7 @@ bool TMoverParameters::SetInternalCommand(std::string NewCommand, double NewValu // Q: 20160714 // wysyłanie komendy w kierunku dir (1=przód, -1=tył) do kolejnego pojazdu (jednego) // ************************************************************************************************* -bool TMoverParameters::SendCtrlToNext( std::string CtrlCommand, double ctrlvalue, double dir ) { +bool TMoverParameters::SendCtrlToNext( std::string const CtrlCommand, double const ctrlvalue, double const dir, int const Couplertype ) { bool OK; int d; // numer sprzęgu w kierunku którego wysyłamy @@ -7687,15 +7717,15 @@ bool TMoverParameters::SendCtrlToNext( std::string CtrlCommand, double ctrlvalue if( OK ) { // musi być wybrana niezerowa kabina if( ( Couplers[ d ].Connected != nullptr ) - && ( TestFlag( Couplers[ d ].CouplingFlag, ctrain_controll ) ) ) { + && ( TestFlag( Couplers[ d ].CouplingFlag, Couplertype ) ) ) { if( Couplers[ d ].ConnectedNr != d ) { // jeśli ten nastpęny jest zgodny z aktualnym - if( Couplers[ d ].Connected->SetInternalCommand( CtrlCommand, ctrlvalue, dir ) ) + if( Couplers[ d ].Connected->SetInternalCommand( CtrlCommand, ctrlvalue, dir, Couplertype ) ) OK = ( Couplers[ d ].Connected->RunInternalCommand() && OK ); // tu jest rekurencja } else { // jeśli następny jest ustawiony przeciwnie, zmieniamy kierunek - if( Couplers[ d ].Connected->SetInternalCommand( CtrlCommand, ctrlvalue, -dir ) ) + if( Couplers[ d ].Connected->SetInternalCommand( CtrlCommand, ctrlvalue, -dir, Couplertype ) ) OK = ( Couplers[ d ].Connected->RunInternalCommand() && OK ); // tu jest rekurencja } } @@ -7714,7 +7744,7 @@ bool TMoverParameters::SendCtrlToNext( std::string CtrlCommand, double ctrlvalue // Komenda musi być zdefiniowana tutaj, a jeśli się wywołuje funkcję, to ona nie może // sama przesyłać do kolejnych pojazdów. Należy też się zastanowić, czy dla uzyskania // jakiejś zmiany (np. IncMainCtrl) lepiej wywołać funkcję, czy od razu wysłać komendę. -bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CValue2) +bool TMoverParameters::RunCommand( std::string Command, double CValue1, double CValue2, int const Couplertype ) { bool OK; std::string testload; @@ -7724,7 +7754,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV { if (MainCtrlPosNo >= floor(CValue1)) MainCtrlPos = static_cast(floor(CValue1)); - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext(Command, CValue1, CValue2, Couplertype); } else if (Command == "ScndCtrl") { @@ -7738,7 +7768,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV ScndCtrlActualPos = 0; if (ScndCtrlPosNo >= floor(CValue1)) ScndCtrlPos = static_cast(floor(CValue1)); - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } /* else if command='BrakeCtrl' then begin @@ -7753,7 +7783,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV Hamulec->SetEPS(CValue1); // fBrakeCtrlPos:=BrakeCtrlPos; //to powinnno być w jednym miejscu, aktualnie w C++!!! BrakePressureActual = BrakePressureTable[BrakeCtrlPos]; - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } // youby - odluzniacz hamulcow, przyda sie else if (Command == "BrakeReleaser") { @@ -7770,13 +7800,13 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV } else Mains = false; - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "Direction") { ActiveDir = static_cast(floor(CValue1)); DirAbsolute = ActiveDir * CabNo; - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "CabActivisation") { @@ -7797,7 +7827,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV } } DirAbsolute = ActiveDir * CabNo; - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "AutoRelaySwitch") { @@ -7805,7 +7835,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV AutoRelayFlag = true; else AutoRelayFlag = false; - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "FuseSwitch") { @@ -7817,7 +7847,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV // if ((EngineType=ElectricSeriesMotor)or(EngineType=DieselElectric)) and not FuseFlag and // (CValue1=0) and Mains then // FuseFlag:=true; - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "ConverterSwitch") /*NBMX*/ { @@ -7825,7 +7855,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV ConverterAllow = true; else if ((CValue1 == 0)) ConverterAllow = false; - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "BatterySwitch") /*NBMX*/ { @@ -7837,7 +7867,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV SecuritySystem.Status = SecuritySystem.Status || s_waiting; // aktywacja czuwaka else SecuritySystem.Status = 0; // wyłączenie czuwaka - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } // else if command='EpFuseSwitch' then {NBMX} // begin @@ -7851,7 +7881,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV CompressorAllow = true; else if ((CValue1 == 0)) CompressorAllow = false; - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "DoorOpen") /*NBMX*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów @@ -7869,7 +7899,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV if ((CValue1 == 1) || (CValue1 == 3)) DoorRightOpened = true; } - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "DoorClose") /*NBMX*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów @@ -7887,7 +7917,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV if ((CValue1 == 1) || (CValue1 == 3)) DoorRightOpened = false; } - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "PantFront") /*Winger 160204*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów @@ -7932,7 +7962,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV PantRearStart = 1; } } - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "PantRear") /*Winger 160204, ABu 310105 i 030305*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów @@ -7977,7 +8007,7 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV PantFrontStart = 1; } } - OK = SendCtrlToNext(Command, CValue1, CValue2); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "MaxCurrentSwitch") { @@ -8063,19 +8093,19 @@ bool TMoverParameters::RunCommand(std::string Command, double CValue1, double CV // Q: 20160714 // Uruchamia funkcję RunCommand aż do skutku. Jeśli będzie pozytywny to kasuje komendę. // ************************************************************************************************* -bool TMoverParameters::RunInternalCommand(void) +bool TMoverParameters::RunInternalCommand() { bool OK; if (!CommandIn.Command.empty()) { - OK = RunCommand(CommandIn.Command, CommandIn.Value1, CommandIn.Value2); - if (OK) + OK = RunCommand( CommandIn.Command, CommandIn.Value1, CommandIn.Value2, CommandIn.Coupling ); + if (OK) { - { CommandIn.Command.clear(); // kasowanie bo rozkaz wykonany CommandIn.Value1 = 0; CommandIn.Value2 = 0; + CommandIn.Coupling = 0; CommandIn.Location.X = 0; CommandIn.Location.Y = 0; CommandIn.Location.Z = 0; diff --git a/Train.cpp b/Train.cpp index 4664648c..a8a19ab0 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2783,7 +2783,7 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma else if( Command.action == GLFW_RELEASE ) { // turn off // NOTE: we turn off both low and high horn, due to unreliability of release event when shift key is involved - Train->mvControlled->WarningSignal &= ~( 1 | 2 ); + Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); // audio feedback if( ( Train->ggHornButton.GetValue() < -0.5 ) || ( Train->ggHornLowButton.GetValue() > 0.5 ) ) { @@ -2826,14 +2826,14 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm else if( Command.action == GLFW_RELEASE ) { // turn off // NOTE: we turn off both low and high horn, due to unreliability of release event when shift key is involved - Train->mvControlled->WarningSignal &= ~( 1 | 2 ); + Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); // audio feedback if( Train->ggHornButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } // visual feedback Train->ggHornButton.UpdateValue( 0.0 ); - Train->ggHornButton.UpdateValue( 0.0 ); + Train->ggHornHighButton.UpdateValue( 0.0 ); } } @@ -3507,45 +3507,6 @@ bool TTrain::Update( double const Deltatime ) DWORD stat; double dt = Deltatime; // Timer::GetDeltaTime(); - // catch cases where the power goes out, and the linebreaker state is left as closed - if( ( m_linebreakerstate == 1 ) - && ( false == mvControlled->Mains ) - && ( ggMainButton.GetValue() < 0.05 ) ) { - // crude way to catch cases where the main was knocked out and the user is trying to restart it - // because the state of the line breaker isn't changed to match, we need to do it here manually - m_linebreakerstate = 0; - } - - // NOTE: crude way to have the pantographs go back up if they're dropped due to insufficient pressure etc - // TODO: rework it into something more elegant, when redoing the whole consist/unit/cab etc arrangement - if( ( mvControlled->Battery ) - || ( mvControlled->ConverterFlag ) ) { - if( ( false == mvControlled->PantFrontUp ) - && ( ggPantFrontButton.GetValue() > 0.95 ) ) { - mvControlled->PantFront( true ); - } - if( ( false == mvControlled->PantRearUp ) - && ( ggPantRearButton.GetValue() > 0.95 ) ) { - mvControlled->PantRear( true ); - } - } -/* - // NOTE: disabled while switch state isn't preserved while moving between compartments - // check whether we should raise the pantographs, based on volume in pantograph tank - if( mvControlled->PantPress > ( - mvControlled->TrainType == dt_EZT ? - 2.4 : - 3.5 ) ) { - if( ( false == mvControlled->PantFrontUp ) - && ( ggPantFrontButton.GetValue() > 0.95 ) ) { - mvControlled->PantFront( true ); - } - if( ( false == mvControlled->PantRearUp ) - && ( ggPantRearButton.GetValue() > 0.95 ) ) { - mvControlled->PantRear( true ); - } - } -*/ if (DynamicObject->mdKabina) { // Ra: TODO: odczyty klawiatury/pulpitu nie // powinny być uzależnione od istnienia modelu @@ -3780,7 +3741,7 @@ bool TTrain::Update( double const Deltatime ) // TODO: check whether it should affect entire consist for EMU // TODO: check whether it should happen if there's power supplied alternatively through hvcouplers // TODO: potentially move this to the mover module, as there isn't much reason to have this dependent on the operator presence - mvControlled->MainSwitch( false, false ); + mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); } } @@ -3811,7 +3772,7 @@ bool TTrain::Update( double const Deltatime ) { mvControlled->ConvOvldFlag = true; if (mvControlled->TrainType != dt_EZT) - mvControlled->MainSwitch(false, mvControlled->TrainType == dt_EZT); + mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); } else if( fConverterTimer >= fConverterPrzekaznik ) { // changed switch from always true to take into account state of the compressor switch @@ -5827,6 +5788,46 @@ bool TTrain::Update( double const Deltatime ) } } + // catch cases where the power goes out, and the linebreaker state is left as closed + if( ( m_linebreakerstate == 1 ) + && ( false == mvControlled->Mains ) + && ( ggMainButton.GetValue() < 0.05 ) ) { + // crude way to catch cases where the main was knocked out and the user is trying to restart it + // because the state of the line breaker isn't changed to match, we need to do it here manually + m_linebreakerstate = 0; + } + + // NOTE: crude way to have the pantographs go back up if they're dropped due to insufficient pressure etc + // TODO: rework it into something more elegant, when redoing the whole consist/unit/cab etc arrangement + if( ( mvControlled->Battery ) + || ( mvControlled->ConverterFlag ) ) { + if( ( false == mvControlled->PantFrontUp ) + && ( ggPantFrontButton.GetValue() >= 1.0 ) ) { + mvControlled->PantFront( true ); + } + if( ( false == mvControlled->PantRearUp ) + && ( ggPantRearButton.GetValue() >= 1.0 ) ) { + mvControlled->PantRear( true ); + } + } +/* + // NOTE: disabled while switch state isn't preserved while moving between compartments + // check whether we should raise the pantographs, based on volume in pantograph tank + if( mvControlled->PantPress > ( + mvControlled->TrainType == dt_EZT ? + 2.4 : + 3.5 ) ) { + if( ( false == mvControlled->PantFrontUp ) + && ( ggPantFrontButton.GetValue() > 0.95 ) ) { + mvControlled->PantFront( true ); + } + if( ( false == mvControlled->PantRearUp ) + && ( ggPantRearButton.GetValue() > 0.95 ) ) { + mvControlled->PantRear( true ); + } + } +*/ + m_updated = true; return true; //(DynamicObject->Update(dt)); } // koniec update From ce7c2a3c49682379b805798c9002b19bdb178ed9 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 29 Apr 2017 14:35:50 +0200 Subject: [PATCH 094/426] build 170429. partial emulation of pwr system, fixed tracking of pantograph states, other minor bug fixes --- DynObj.cpp | 39 +++++--- McZapkie/MOVER.h | 7 +- McZapkie/Mover.cpp | 79 ++++++++++------ Train.cpp | 220 ++++++++++++++++----------------------------- World.cpp | 10 +-- 5 files changed, 164 insertions(+), 191 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index eb7989e5..938fc8f4 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2463,30 +2463,45 @@ bool TDynamicObject::Update(double dt, double dt1) // if // ((!MoverParameters->PantCompFlag)&&(MoverParameters->CompressedVolume>=2.8)) // MoverParameters->PantVolume=MoverParameters->CompressedVolume; - if( MoverParameters->PantPress < ( MoverParameters->TrainType == dt_EZT ? 2.5 : 3.5 ) ) { + + if( MoverParameters->PantPress < MoverParameters->EnginePowerSource.CollectorParameters.MinPress ) { // 3.5 wg http://www.transportszynowy.pl/eu06-07pneumat.php - // Ra 2013-12: Niebugocław mówi, że w EZT podnoszą się przy 2.5 if( true == MoverParameters->PantPressSwitchActive ) { // opuszczenie pantografów przy niskim ciśnieniu +/* + // NOTE: disabled, the pantographs drop by themseleves when the pantograph tank pressure gets low enough MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); - // pressure switch safety measure -- open the line breaker, unless there's alternate source of traction voltage - if( MoverParameters->GetTrainsetVoltage() < 0.5 * MoverParameters->EnginePowerSource.MaxVoltage ) { - // TODO: check whether line breaker should be open EMU-wide - MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); +*/ + if( MoverParameters->TrainType != dt_EZT ) { + // pressure switch safety measure -- open the line breaker, unless there's alternate source of traction voltage + if( MoverParameters->GetTrainsetVoltage() < 0.5 * MoverParameters->EnginePowerSource.MaxVoltage ) { + // TODO: check whether line breaker should be open EMU-wide + MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); + } + } + else { + // specialized variant for EMU -- pwr system disables converter and heating, + // and prevents their activation until pressure switch is set again + MoverParameters->PantPressLockActive = true; + // TODO: separate 'heating allowed' from actual heating flag, so we can disable it here without messing up heating toggle + MoverParameters->ConverterSwitch( false, command_range::unit ); } // mark the pressure switch as spent MoverParameters->PantPressSwitchActive = false; } } else { - // prime the pressure switch - // TODO: check what decides whether the pressure switch is active, prototypically - MoverParameters->PantPressSwitchActive = true; + if( MoverParameters->PantPress >= 4.6 ) { + // prime the pressure switch + MoverParameters->PantPressSwitchActive = true; + // turn off the subsystems lock + MoverParameters->PantPressLockActive = false; - if( MoverParameters->PantPress >= 4.8 ) { - // Winger - automatyczne wylaczanie malej sprezarki - MoverParameters->PantCompFlag = false; + if( MoverParameters->PantPress >= 4.8 ) { + // Winger - automatyczne wylaczanie malej sprezarki + MoverParameters->PantCompFlag = false; + } } } /* diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index e8a509f1..62ee65ad 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -922,7 +922,8 @@ public: double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/ bool UnBrake = false; /*w EZT - nacisniete odhamowywanie*/ double PantPress = 0.0; /*Cisnienie w zbiornikach pantografow*/ - bool PantPressSwitchActive{ false }; // state of the pantograph pressure switch. gets primed when the pantograph is up + bool PantPressSwitchActive{ false }; // state of the pantograph pressure switch. gets primed at defined pressure level in pantograph air system + bool PantPressLockActive{ false }; // pwr system state flag. fires when pressure switch activates by pantograph pressure dropping below defined level bool s_CAtestebrake = false; //hunter-091012: zmienna dla testu ca /*-zmienne dla lokomotywy spalinowej z przekladnia mechaniczna*/ @@ -1096,8 +1097,8 @@ public: /*--funkcje dla lokomotyw*/ bool DirectionBackward(void);/*! kierunek ruchu*/ bool MainSwitch( bool const State, int const Notify = command_range::consist );/*! wylacznik glowny*/ - bool ConverterSwitch(bool State);/*! wl/wyl przetwornicy*/ - bool CompressorSwitch(bool State);/*! wl/wyl sprezarki*/ + bool ConverterSwitch( bool State, int const Notify = command_range::consist );/*! wl/wyl przetwornicy*/ + bool CompressorSwitch( bool State, int const Notify = command_range::consist );/*! wl/wyl sprezarki*/ /*-funkcje typowe dla lokomotywy elektrycznej*/ void ConverterCheck(); // przetwornica diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 2e088303..9ef812d2 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -737,6 +737,11 @@ void TMoverParameters::UpdatePantVolume(double dt) } if (!PantCompFlag && (PantVolume > 0.1)) PantVolume -= dt * 0.0003; // nieszczelności: 0.0003=0.3l/s +/* + // NOTE: disabled as this is redundant with check done in dynobj.update() + // TODO: determine if this isn't a mistake -- + // though unlikely it's possible this is emulation of a different circuit than the pantograph pressure switch, with similar function? + // TBD, TODO: alternatively, move the dynobj.update() subroutine here, as it doesn't touch elements outside of the mover object if( Mains ) { // nie wchodzić w funkcję bez potrzeby if( EngineType == ElectricSeriesMotor ) { @@ -750,14 +755,15 @@ void TMoverParameters::UpdatePantVolume(double dt) EventFlag = true; } } -/* + // NOTE: disabled, the flag gets set in dynobj.update() when the pantograph actually drops // mark the pressure switch as spent, regardless whether line breaker actually opened PantPressSwitchActive = false; -*/ + } } } +*/ /* // NOTE: pantograph tank pressure sharing experimentally disabled for more accurate simulation if (TrainType != dt_EZT) // w EN57 pompuje się tylko w silnikowym @@ -1521,6 +1527,7 @@ double TMoverParameters::ShowEngineRotation(int VehN) void TMoverParameters::ConverterCheck() { // sprawdzanie przetwornicy if( ( ConverterAllow ) + && ( false == PantPressLockActive ) && ( ( Mains ) || ( GetTrainsetVoltage() > 0.5 * EnginePowerSource.MaxVoltage ) ) ) { ConverterFlag = true; @@ -2273,9 +2280,8 @@ bool TMoverParameters::AntiSlippingButton(void) // ************************************************************************************************* bool TMoverParameters::MainSwitch( bool const State, int const Notify ) { - bool MS; + bool MS = false; // Ra: przeniesione z końca - MS = false; // Ra: przeniesione z końca if ((Mains != State) && (MainCtrlPosNo > 0)) { if ((State == false) || @@ -2314,16 +2320,6 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) } if (((TrainType == dt_EZT) && (!State))) ConvOvldFlag = true; - // if (State=false) then //jeśli wyłączony - // begin - // SetFlag(SoundFlag,sound_relay); //hunter-091012: przeniesione do Train.cpp, zeby sie - // nie zapetlal - // if (SecuritySystem.Status<>12) then - // SecuritySystem.Status:=0; //deaktywacja czuwaka; Ra: a nie baterią? - // end - // else - // if (SecuritySystem.Status<>12) then - // SecuritySystem.Status:=s_waiting; //aktywacja czuwaka } } // else MainSwitch:=false; @@ -2334,9 +2330,10 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) // Q: 20160713 // włączenie / wyłączenie przetwornicy // ************************************************************************************************* -bool TMoverParameters::ConverterSwitch(bool State) +bool TMoverParameters::ConverterSwitch( bool State, int const Notify ) { bool CS = false; // Ra: normalnie chyba false? + if (ConverterAllow != State) { ConverterAllow = State; @@ -2344,10 +2341,24 @@ bool TMoverParameters::ConverterSwitch(bool State) if (CompressorPower == 2) CompressorAllow = ConverterAllow; } - if (ConverterAllow == true) - SendCtrlToNext("ConverterSwitch", 1, CabNo); - else - SendCtrlToNext("ConverterSwitch", 0, CabNo); + if( ConverterAllow == true ) { + if( Notify != command_range::local ) { + SendCtrlToNext( + "ConverterSwitch", 1, CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); + } + } + else { + if( Notify != command_range::local ) { + SendCtrlToNext( + "ConverterSwitch", 0, CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); + } + } return CS; } @@ -2356,7 +2367,7 @@ bool TMoverParameters::ConverterSwitch(bool State) // Q: 20160713 // włączenie / wyłączenie sprężarki // ************************************************************************************************* -bool TMoverParameters::CompressorSwitch(bool State) +bool TMoverParameters::CompressorSwitch( bool State, int const Notify ) { bool CS = false; // Ra: normalnie chyba tak? // if State=true then @@ -2367,10 +2378,24 @@ bool TMoverParameters::CompressorSwitch(bool State) CompressorAllow = State; CS = true; } - if (CompressorAllow == true) - SendCtrlToNext("CompressorSwitch", 1, CabNo); - else - SendCtrlToNext("CompressorSwitch", 0, CabNo); + if( CompressorAllow == true ) { + if( Notify != command_range::local ) { + SendCtrlToNext( + "CompressorSwitch", 1, CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); + } + } + else { + if( Notify != command_range::local ) { + SendCtrlToNext( + "CompressorSwitch", 0, CabNo, + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); + } + } return CS; } @@ -7246,8 +7271,8 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet extract_value( collectorparameters.MaxV, "MaxVoltage", Line, "" ); collectorparameters.OVP = //przekaźnik nadnapięciowy extract_value( "OverVoltProt", Line ) == "Yes" ? - 1 : - 0; + 1 : + 0; //napięcie rozłączające WS collectorparameters.MinV = 0.5 * collectorparameters.MaxV; //gdyby parametr nie podany extract_value( collectorparameters.MinV, "MinV", Line, "" ); @@ -7255,7 +7280,7 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet collectorparameters.InsetV = 0.6 * collectorparameters.MaxV; //gdyby parametr nie podany extract_value( collectorparameters.InsetV, "InsetV", Line, "" ); //ciśnienie rozłączające WS - extract_value( collectorparameters.MinPress, "MinPress", Line, "2.0" ); //domyślnie 2 bary do załączenia WS + extract_value( collectorparameters.MinPress, "MinPress", Line, "3.5" ); //domyślnie 2 bary do załączenia WS //maksymalne ciśnienie za reduktorem collectorparameters.MaxPress = 5.0 + 0.001 * ( Random( 50 ) - Random( 50 ) ); extract_value( collectorparameters.MaxPress, "MaxPress", Line, "" ); diff --git a/Train.cpp b/Train.cpp index a8a19ab0..0667248e 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1212,41 +1212,20 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == ( Train->mvOccupied->ActiveCab == 1 ? Train->mvControlled->PantFrontUp : Train->mvControlled->PantRearUp ) ) { + if( false == Train->mvControlled->PantFrontUp ) { // turn on... - if( Train->mvOccupied->ActiveCab == 1 ) { - // przedni gdy w kabinie 1 - Train->mvControlled->PantFrontSP = false; - if( Train->mvControlled->PantFront( true ) ) { - if( Train->mvControlled->PantFrontStart != 1 ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - if( Train->ggPantFrontButton.SubModel ) { - Train->ggPantFrontButton.UpdateValue( 1.0 ); - } - if( Train->ggPantFrontButtonOff.SubModel != nullptr ) { - // pantograph control can have two-button setup - Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); - } + Train->mvControlled->PantFrontSP = false; + if( Train->mvControlled->PantFront( true ) ) { + if( Train->mvControlled->PantFrontStart != 1 ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + if( Train->ggPantFrontButton.SubModel ) { + Train->ggPantFrontButton.UpdateValue( 1.0 ); } - } - } - else { - // rear otherwise - Train->mvControlled->PantRearSP = false; - if( Train->mvControlled->PantRear( true ) ) { - if( Train->mvControlled->PantRearStart != 1 ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - if( Train->ggPantFrontButton.SubModel ) { - Train->ggPantFrontButton.UpdateValue( 1.0 ); - } - if( Train->ggPantFrontButtonOff.SubModel != nullptr ) { - // pantograph control can have two-button setup - Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); - } + if( Train->ggPantFrontButtonOff.SubModel != nullptr ) { + // pantograph control can have two-button setup + Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); } } } @@ -1261,32 +1240,15 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const return; } - if( Train->mvOccupied->ActiveCab == 1 ) { - // przedni gdy w kabinie 1 - Train->mvControlled->PantFrontSP = false; - if( false == Train->mvControlled->PantFront( false ) ) { - if( Train->mvControlled->PantFrontStart != 0 ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - Train->ggPantFrontButton.UpdateValue( 0.0 ); - // pantograph control can have two-button setup - Train->ggPantFrontButtonOff.UpdateValue( 1.0 ); - } - } - } - else { - // rear otherwise - Train->mvControlled->PantRearSP = false; - if( false == Train->mvControlled->PantRear( false ) ) { - if( Train->mvControlled->PantRearStart != 0 ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - Train->ggPantFrontButton.UpdateValue( 0.0 ); - // pantograph control can have two-button setup - Train->ggPantFrontButtonOff.UpdateValue( 1.0 ); - } + Train->mvControlled->PantFrontSP = false; + if( false == Train->mvControlled->PantFront( false ) ) { + if( Train->mvControlled->PantFrontStart != 0 ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + Train->ggPantFrontButton.UpdateValue( 0.0 ); + // pantograph control can have two-button setup + Train->ggPantFrontButtonOff.UpdateValue( 1.0 ); } } } @@ -1315,41 +1277,20 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == ( Train->mvOccupied->ActiveCab == 1 ? Train->mvControlled->PantRearUp : Train->mvControlled->PantFrontUp ) ) { + if( false == Train->mvControlled->PantRearUp ) { // turn on... - if( Train->mvOccupied->ActiveCab == 1 ) { - // rear if in front cab - Train->mvControlled->PantRearSP = false; - if( Train->mvControlled->PantRear( true ) ) { - if( Train->mvControlled->PantRearStart != 1 ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - if( Train->ggPantRearButton.SubModel ) { - Train->ggPantRearButton.UpdateValue( 1.0 ); - } - if( Train->ggPantRearButtonOff.SubModel != nullptr ) { - // pantograph control can have two-button setup - Train->ggPantRearButtonOff.UpdateValue( 0.0 ); - } + Train->mvControlled->PantRearSP = false; + if( Train->mvControlled->PantRear( true ) ) { + if( Train->mvControlled->PantRearStart != 1 ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + if( Train->ggPantRearButton.SubModel ) { + Train->ggPantRearButton.UpdateValue( 1.0 ); } - } - } - else { - // front otherwise - Train->mvControlled->PantFrontSP = false; - if( Train->mvControlled->PantFront( true ) ) { - if( Train->mvControlled->PantFrontStart != 1 ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - if( Train->ggPantRearButton.SubModel ) { - Train->ggPantRearButton.UpdateValue( 1.0 ); - } - if( Train->ggPantRearButtonOff.SubModel != nullptr ) { - // pantograph control can have two-button setup - Train->ggPantRearButtonOff.UpdateValue( 0.0 ); - } + if( Train->ggPantRearButtonOff.SubModel != nullptr ) { + // pantograph control can have two-button setup + Train->ggPantRearButtonOff.UpdateValue( 0.0 ); } } } @@ -1364,32 +1305,15 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & return; } - if( Train->mvOccupied->ActiveCab == 1 ) { - // rear if in front cab - Train->mvControlled->PantRearSP = false; - if( false == Train->mvControlled->PantRear( false ) ) { - if( Train->mvControlled->PantRearStart != 0 ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - Train->ggPantRearButton.UpdateValue( 0.0 ); - // pantograph control can have two-button setup - Train->ggPantRearButtonOff.UpdateValue( 1.0 ); - } - } - } - else { - // front otherwise - Train->mvControlled->PantFrontSP = false; - if( false == Train->mvControlled->PantFront( false ) ) { - if( Train->mvControlled->PantFrontStart != 0 ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - Train->ggPantRearButton.UpdateValue( 0.0 ); - // pantograph control can have two-button setup - Train->ggPantRearButtonOff.UpdateValue( 1.0 ); - } + Train->mvControlled->PantRearSP = false; + if( false == Train->mvControlled->PantRear( false ) ) { + if( Train->mvControlled->PantRearStart != 0 ) { + // sound feedback + Train->play_sound( Train->dsbSwitch ); + // visual feedback + Train->ggPantRearButton.UpdateValue( 0.0 ); + // pantograph control can have two-button setup + Train->ggPantRearButtonOff.UpdateValue( 1.0 ); } } } @@ -1563,11 +1487,13 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // TODO: consider whether it makes sense for diesel engines and such Train->fMainRelayTimer += 0.33f; // Command.time_delta * 5.0; } +/* if( Train->mvControlled->Mains != true ) { // hunter-080812: poprawka Train->mvControlled->ConverterSwitch( false ); Train->mvControlled->CompressorSwitch( false ); } +*/ if( Train->fMainRelayTimer > Train->mvControlled->InitialCtrlDelay ) { // wlaczanie WSa z opoznieniem Train->m_linebreakerstate = 2; @@ -3067,16 +2993,19 @@ void TTrain::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_CabForward]) { - if (!CabChange(1)) - if (TestFlag(DynamicObject->MoverParameters->Couplers[0].CouplingFlag, - ctrain_passenger)) - { // przejscie do nastepnego pojazdu + if( !CabChange( 1 ) ) { + if( TestFlag( DynamicObject->MoverParameters->Couplers[ 0 ].CouplingFlag, + ctrain_passenger ) ) { // przejscie do nastepnego pojazdu Global::changeDynObj = DynamicObject->PrevConnected; Global::changeDynObj->MoverParameters->ActiveCab = DynamicObject->PrevConnectedNo ? -1 : 1; } + } +/* + NOTE: disabled to allow 'prototypical' 'tricking' pantograph compressor to run unattended if (DynamicObject->MoverParameters->ActiveCab) mvControlled->PantCompFlag = false; // wyjście z maszynowego wyłącza sprężarkę +*/ } else if (cKey == Global::Keys[k_CabBackward]) { @@ -3088,9 +3017,12 @@ void TTrain::OnKeyDown(int cKey) Global::changeDynObj->MoverParameters->ActiveCab = DynamicObject->NextConnectedNo ? -1 : 1; } +/* + NOTE: disabled to allow 'prototypical' 'tricking' pantograph compressor to run unattended if (DynamicObject->MoverParameters->ActiveCab) mvControlled->PantCompFlag = false; // wyjście z maszynowego wyłącza sprężarkę pomocniczą +*/ } else if (cKey == Global::Keys[k_Couple]) { // ABu051104: male zmiany, zeby mozna bylo laczyc odlegle wagony @@ -3736,7 +3668,8 @@ bool TTrain::Update( double const Deltatime ) // przy dowolnym ustawieniu kierunkowego // Ra: to już jest w T_MoverParameters::TractionForce(), ale zależy od // kierunku - if( mvControlled->EngineType == ElectricSeriesMotor ) { + if( ( mvControlled->Mains ) + && ( mvControlled->EngineType == ElectricSeriesMotor ) ) { if( std::max( mvControlled->GetTrainsetVoltage(), std::fabs( mvControlled->RunningTraction.TractionVoltage ) ) < 0.5 * mvControlled->EnginePowerSource.MaxVoltage ) { // TODO: check whether it should affect entire consist for EMU // TODO: check whether it should happen if there's power supplied alternatively through hvcouplers @@ -4365,7 +4298,11 @@ bool TTrain::Update( double const Deltatime ) if (mvControlled->Battery || mvControlled->ConverterFlag) { - btLampkaWylSzybki.Turn( ( m_linebreakerstate > 0 ? true : false ) ); + btLampkaWylSzybki.Turn( + ( ( (m_linebreakerstate > 0) + || (true == mvControlled->Mains) ) ? + true : + false ) ); // hunter-261211: jakis stary kod (i niezgodny z prawda), // zahaszowalem i poprawilem @@ -5286,6 +5223,8 @@ bool TTrain::Update( double const Deltatime ) false) // nie wyłączać, gdy AI mvControlled->PantCompFlag = false; // wyłączona, gdy nie trzymamy klawisza #else +/* + // NOTE: disabled to allow 'prototypical' 'tricking' pantograph compressor into running unattended if( ( ( DynamicObject->Mechanik != nullptr ) && ( false == DynamicObject->Mechanik->AIControllFlag ) ) && ( mvControlled->TrainType == dt_EZT ? @@ -5295,6 +5234,7 @@ bool TTrain::Update( double const Deltatime ) // NOTE: this will break in multiplayer setups, do a proper tracking of pantograph user then mvControlled->PantCompFlag = false; } +*/ #endif if (Console::Pressed(Global::Keys[k_Univ2])) { @@ -6661,31 +6601,23 @@ void TTrain::set_cab_controls() { // pantographs if( mvOccupied->PantSwitchType != "impulse" ) { ggPantFrontButton.PutValue( - ( mvOccupied->ActiveCab == 1 ? - mvControlled->PantFrontUp : - mvControlled->PantRearUp ) ? - 1.0 : - 0.0 ); + ( mvControlled->PantFrontUp ? + 1.0 : + 0.0 ) ); ggPantFrontButtonOff.PutValue( - ( mvOccupied->ActiveCab == 1 ? - mvControlled->PantFrontUp : - mvControlled->PantRearUp ) ? - 0.0 : - 1.0 ); + ( mvControlled->PantFrontUp ? + 0.0 : + 1.0 ) ); } if( mvOccupied->PantSwitchType != "impulse" ) { ggPantRearButton.PutValue( - ( mvOccupied->ActiveCab == 1 ? - mvControlled->PantRearUp : - mvControlled->PantFrontUp ) ? - 1.0 : - 0.0 ); + ( mvControlled->PantRearUp ? + 1.0 : + 0.0 ) ); ggPantRearButtonOff.PutValue( - ( mvOccupied->ActiveCab == 1 ? - mvControlled->PantRearUp : - mvControlled->PantFrontUp ) ? - 0.0 : - 1.0 ); + ( mvControlled->PantRearUp ? + 0.0 : + 1.0 ) ); } // converter if( mvOccupied->ConvSwitchType != "impulse" ) { diff --git a/World.cpp b/World.cpp index 28555df2..372527d7 100644 --- a/World.cpp +++ b/World.cpp @@ -1844,11 +1844,11 @@ TWorld::Update_UI() { #endif // equipment flags uitextline3 = ""; - uitextline3 += ( tmp->MoverParameters->Battery ? "B" : "b" ); - uitextline3 += ( tmp->MoverParameters->Mains ? "M" : "m" ); - uitextline3 += ( tmp->MoverParameters->PantRearUp ? ( tmp->MoverParameters->PantPressSwitchActive ? "O" : "o" ) : "." );; - uitextline3 += ( tmp->MoverParameters->PantFrontUp ? ( tmp->MoverParameters->PantPressSwitchActive ? "P" : "p" ) : "." );; - uitextline3 += ( tmp->MoverParameters->PantPressSwitchActive ? "!" : "." ); + uitextline3 += ( tmp->MoverParameters->Battery ? "B" : "." ); + uitextline3 += ( tmp->MoverParameters->Mains ? "M" : "." ); + uitextline3 += ( tmp->MoverParameters->PantRearUp ? ( tmp->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; + uitextline3 += ( tmp->MoverParameters->PantFrontUp ? ( tmp->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; + uitextline3 += ( tmp->MoverParameters->PantPressLockActive ? "!" : ( tmp->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); uitextline3 += ( tmp->MoverParameters->ConverterAllow ? ( tmp->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ); uitextline3 += ( tmp->MoverParameters->ConvOvldFlag ? "!" : "." ); uitextline3 += ( tmp->MoverParameters->CompressorAllow ? ( tmp->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ); From 473837395c80ece460143bf9e3d6565733e066f6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 2 May 2017 22:29:51 +0200 Subject: [PATCH 095/426] build 170502. minor fixes for brakes subsystem, distribution of sandbox commands to other consist units --- Driver.cpp | 32 +++- DynObj.cpp | 54 ++----- Globals.h | 2 + Ground.h | 2 +- McZapkie/MOVER.h | 19 ++- McZapkie/Mover.cpp | 365 +++++++++++++++++++++++++------------------ McZapkie/hamulce.cpp | 359 ++++++++++++++++++++++-------------------- McZapkie/hamulce.h | 4 +- Segment.cpp | 1 + Texture.cpp | 1 - Train.cpp | 16 +- World.cpp | 78 +++++---- gamepadinput.h | 2 +- renderer.cpp | 6 +- sun.cpp | 2 - 15 files changed, 523 insertions(+), 420 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 5b88f354..de34adbd 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2696,8 +2696,18 @@ void TController::SpeedSet() if (ReactionTime > 0.1) ReactionTime = 0.1; // orientuj się szybciej } // if (Im>Imin) - if (fabs(mvControlling->Im) > 0.75 * mvControlling->ImaxHi) // jeśli prąd jest duży - mvControlling->SandDoseOn(); // piaskujemy tory, coby się nie ślizgać + // NOTE: this step is likely to conflict with directive to operate sandbox based on the state of slipping wheels + // TODO: gather all sandbox operating logic in one place + if( fabs( mvControlling->Im ) > 0.75 * mvControlling->ImaxHi ) { + // jeśli prąd jest duży + mvControlling->Sandbox( true ); // piaskujemy tory, coby się nie ślizgać + } + else { + // otherwise we switch the sander off, if it's active + if( mvControlling->SandDose ) { + mvControlling->Sandbox( false ); + } + } if ((fabs(mvControlling->Im) > 0.96 * mvControlling->Imax) || mvControlling->SlippingWheels) // jeśli prąd jest duży (można 690 na 750) if (mvControlling->ScndCtrlPos > 0) // jeżeli jest bocznik @@ -3241,10 +3251,16 @@ bool TController::UpdateSituation(double dt) // mvOccupied->PipePress=0.5; //yB: w SPKS są poprawnie zrobione pozycje if (mvControlling->SlippingWheels) { - mvControlling->SandDoseOn(); // piasku! + mvControlling->Sandbox(true); // piasku! // Controlling->SlippingWheels=false; //a to tu nie ma sensu, flaga używana w dalszej // części } + else { + // deactivate sandbox if we aren't slipping + if( mvControlling->SandDose ) { + mvControlling->Sandbox( false ); + } + } } // ABu-160305 testowanie gotowości do jazdy // Ra: przeniesione z DynObj, skład użytkownika też jest testowany, żeby mu przekazać, że ma @@ -3293,6 +3309,16 @@ bool TController::UpdateSituation(double dt) if (fReady < 0.8) // delikatniejszy warunek, obejmuje wszystkie wagony Ready = true; //żeby uznać za odhamowany HelpMeFlag = false; + + // crude way to deal with automatic door opening on W4 preventing further ride + // for human-controlled vehicles with no door control and dynamic brake auto-activating with door open + if( ( false == AIControllFlag ) + && ( iDrivigFlags & moveDoorOpened ) + && ( mvOccupied->DoorOpenCtrl != 1 ) + && ( mvControlling->MainCtrlPos > 0 ) ) { + Doors( false ); + } + // Winger 020304 if (AIControllFlag) { diff --git a/DynObj.cpp b/DynObj.cpp index 938fc8f4..299fc598 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1753,27 +1753,22 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // wylaczanie hamulca if (ActPar.find("<>") != std::string::npos) // wylaczanie na probe hamowania naglego { - MoverParameters->BrakeStatus |= 128; // wylacz + MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz } if (ActPar.find('0') != std::string::npos) // wylaczanie na sztywno { - MoverParameters->BrakeStatus |= 128; // wylacz + MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz MoverParameters->Hamulec->ForceEmptiness(); - MoverParameters->BrakeReleaser(1); // odluznij automatycznie } if (ActPar.find('E') != std::string::npos) // oprozniony { MoverParameters->Hamulec->ForceEmptiness(); - MoverParameters->BrakeReleaser(1); // odluznij automatycznie MoverParameters->Pipe->CreatePress(0); MoverParameters->Pipe2->CreatePress(0); } if (ActPar.find('Q') != std::string::npos) // oprozniony { - // MoverParameters->Hamulec->ForceEmptiness(); //TODO: sprawdzic, - // dlaczego - // pojawia sie blad przy uzyciu tej linijki w lokomotywie - MoverParameters->BrakeReleaser(1); // odluznij automatycznie + MoverParameters->Hamulec->ForceEmptiness(); MoverParameters->Pipe->CreatePress(0.0); MoverParameters->PipePress = 0.0; MoverParameters->Pipe2->CreatePress(0.0); @@ -1787,18 +1782,16 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" { if (Random(10) < 1) // losowanie 1/10 { - MoverParameters->BrakeStatus |= 128; // wylacz + MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz MoverParameters->Hamulec->ForceEmptiness(); - MoverParameters->BrakeReleaser(1); // odluznij automatycznie } } if (ActPar.find('X') != std::string::npos) // agonalny wylaczanie 20%, usrednienie przekladni { if (Random(100) < 20) // losowanie 20/100 { - MoverParameters->BrakeStatus |= 128; // wylacz + MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz MoverParameters->Hamulec->ForceEmptiness(); - MoverParameters->BrakeReleaser(1); // odluznij automatycznie } if (MoverParameters->BrakeCylMult[2] * MoverParameters->BrakeCylMult[1] > 0.01) // jesli jest nastawiacz mechaniczny PL @@ -2443,16 +2436,6 @@ bool TDynamicObject::Update(double dt, double dt1) if (!bEnabled) return false; // a normalnie powinny mieć bEnabled==false - // Ra: przeniosłem - no już lepiej tu, niż w wyświetlaniu! - // if ((MoverParameters->ConverterFlag==false) && - // (MoverParameters->TrainType!=dt_ET22)) - // Ra: to nie może tu być, bo wyłącza sprężarkę w rozrządczym EZT! - // if - // ((MoverParameters->ConverterFlag==false)&&(MoverParameters->CompressorPower!=0)) - // MoverParameters->CompressorFlag=false; - // if (MoverParameters->CompressorPower==2) - // MoverParameters->CompressorAllow=MoverParameters->ConverterFlag; - // McZapkie-260202 if ((MoverParameters->EnginePowerSource.SourceType == CurrentCollector) && (MoverParameters->Power > 1.0)) // aby rozrządczy nie opuszczał silnikowemu @@ -2500,6 +2483,7 @@ bool TDynamicObject::Update(double dt, double dt1) if( MoverParameters->PantPress >= 4.8 ) { // Winger - automatyczne wylaczanie malej sprezarki + // TODO: governor lock, disables usage until pressure drop below 3.8 (should really make compressor object we could reuse) MoverParameters->PantCompFlag = false; } } @@ -2958,28 +2942,6 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); } } - if (MoverParameters->TrainType == dt_ET42) - { // powinny być wszystkie dwuczłony oraz EZT - /* - //Ra: to jest bez sensu, bo wyłącza WS przy przechodzeniu przez - "wewnętrzne" kabiny (z - powodu ActiveCab) - //trzeba to zrobić inaczej, np. dla członu A sprawdzać, czy jest B - //albo sprawdzać w momencie załączania WS i zmiany w sprzęgach - if - (((TestFlag(MoverParameters->Couplers[1].CouplingFlag,ctrain_controll))&&(MoverParameters->ActiveCab>0)&&(NextConnected->MoverParameters->TrainType!=dt_ET42))||((TestFlag(MoverParameters->Couplers[0].CouplingFlag,ctrain_controll))&&(MoverParameters->ActiveCab<0)&&(PrevConnected->MoverParameters->TrainType!=dt_ET42))) - {//sprawdzenie, czy z tyłu kabiny mamy drugi człon - if (MoverParameters->MainSwitch(false)) - MoverParameters->EventFlag=true; - } - if - ((!(TestFlag(MoverParameters->Couplers[1].CouplingFlag,ctrain_controll))&&(MoverParameters->ActiveCab>0))||(!(TestFlag(MoverParameters->Couplers[0].CouplingFlag,ctrain_controll))&&(MoverParameters->ActiveCab<0))) - { - if (MoverParameters->MainSwitch(false)) - MoverParameters->EventFlag=true; - } - */ - } // McZapkie-260202 - dMoveLen przyda sie przy stukocie kol dDOMoveLen = @@ -3323,6 +3285,9 @@ bool TDynamicObject::Update(double dt, double dt1) sPantDown.Play(vol, 0, MechInside, vPosition); MoverParameters->PantRearSP = true; } +/* + // NOTE: disabled because it's both redundant and doesn't take into account alternative power sources + // converter and compressor will (should) turn off during their individual checks, in the mover's (fast)computemovement() calls if (MoverParameters->EnginePowerSource.SourceType == CurrentCollector) { // Winger 240404 - wylaczanie sprezarki i // przetwornicy przy braku napiecia @@ -3332,6 +3297,7 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->CompressorFlag = false; // Ra: to jest wątpliwe - wyłączenie sprężarki powinno być w jednym miejscu! } } +*/ } else if (MoverParameters->EnginePowerSource.SourceType == InternalSource) if (MoverParameters->EnginePowerSource.PowerType == SteamPower) diff --git a/Globals.h b/Globals.h index ee866146..ca665df5 100644 --- a/Globals.h +++ b/Globals.h @@ -130,7 +130,9 @@ class TTranscript float fHide; // czas ukrycia/usunięcia std::string asText; // tekst gotowy do wyświetlenia (usunięte znaczniki czasu) bool bItalic; // czy kursywa (dźwięk nieistotny dla prowadzącego) +/* int iNext; // następna używana linijka, żeby nie przestawiać fizycznie tabeli +*/ }; /* diff --git a/Ground.h b/Ground.h index 27f48a30..0c5722d7 100644 --- a/Ground.h +++ b/Ground.h @@ -69,7 +69,7 @@ struct TGroundVertex { vector3 Point; vector3 Normal; - float tu, tv; + float tu{ 0.0f }, tv{ 0.0f }; void HalfSet(const TGroundVertex &v1, const TGroundVertex &v2) { // wyliczenie współrzędnych i mapowania punktu na środku odcinka v1<->v2 Point = 0.5 * (v1.Point + v2.Point); diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 62ee65ad..b381f0c8 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -377,7 +377,7 @@ struct TBoilerType { }; /*rodzaj odbieraka pradu*/ struct TCurrentCollector { - long CollectorsNo{ 0.0 }; //musi być tu, bo inaczej się kopie + long CollectorsNo{ 0 }; //musi być tu, bo inaczej się kopie double MinH{ 0.0 }; double MaxH{ 0.0 }; //zakres ruchu pantografu, nigdzie nie używany double CSW{ 0.0 }; //szerokość części roboczej (styku) ślizgacza double MinV{ 0.0 }; double MaxV{ 0.0 }; //minimalne i maksymalne akceptowane napięcie @@ -554,8 +554,9 @@ struct TTransmision enum TCouplerType { NoCoupler, Articulated, Bare, Chain, Screw, Automatic }; struct power_coupling { - double outgoing{ 0.0 }; // power generated by coupling owner - double incoming{ 0.0 }; // power supplied from outside source + double current{ 0.0 }; + double voltage{ 0.0 }; + bool local{ false }; // whether the power comes from external or onboard source }; struct TCoupling { @@ -800,8 +801,8 @@ public: #ifdef EU07_USE_OLD_HVCOUPLERS double HVCouplers[ 2 ][ 2 ]; //przewod WN enum hvcoupler { - incoming = 0, - outgoing + current = 0, + voltage }; #endif int ScanCounter = 0; /*pomocnicze do skanowania sprzegow*/ @@ -848,7 +849,9 @@ public: int LocalBrakePos = 0; /*nastawa hamulca indywidualnego*/ int ManualBrakePos = 0; /*nastawa hamulca recznego*/ double LocalBrakePosA = 0.0; - int BrakeStatus = b_off; /*0 - odham, 1 - ham., 2 - uszk., 4 - odluzniacz, 8 - antyposlizg, 16 - uzyte EP, 32 - pozycja R, 64 - powrot z R*/ +/* + int BrakeStatus = b_off; //0 - odham, 1 - ham., 2 - uszk., 4 - odluzniacz, 8 - antyposlizg, 16 - uzyte EP, 32 - pozycja R, 64 - powrot z R +*/ bool EmergencyBrakeFlag = false; /*hamowanie nagle*/ int BrakeDelayFlag = 0; /*nastawa opoznienia ham. osob/towar/posp/exp 0/1/2/4*/ int BrakeDelays = 0; /*nastawy mozliwe do uzyskania*/ @@ -1040,7 +1043,7 @@ public: bool AddPulseForce(int Multipler);/*dla drezyny*/ - bool SandDoseOn(void);/*wlacza/wylacza sypanie piasku*/ + bool Sandbox( bool const State, int const Notify = command_range::consist );/*wlacza/wylacza sypanie piasku*/ /*! zbijanie czuwaka/SHP*/ void SSReset(void); @@ -1112,7 +1115,7 @@ public: /*function ShowEngineRotation(VehN:int): integer; //Ra 2014-06: przeniesione do C++*/ /*funkcje uzalezniajace sile pociagowa od predkosci: v2n, n2r, current, momentum*/ double v2n(void); - double current(double n, double U); + double Current(double n, double U); double Momentum(double I); double MomentumF(double I, double Iw, int SCP); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 9ef812d2..63d3095b 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -76,7 +76,7 @@ int DirF(int CouplerN) // Q: 20160716 // Obliczanie natężenie prądu w silnikach // ************************************************************************************************* -double TMoverParameters::current(double n, double U) +double TMoverParameters::Current(double n, double U) { // wazna funkcja - liczy prad plynacy przez silniki polaczone szeregowo lub rownolegle // w zaleznosci od polozenia nastawnikow MainCtrl i ScndCtrl oraz predkosci obrotowej n @@ -338,9 +338,9 @@ Name( NameInit ) Couplers[b].FmaxC = 1000.0; } #ifdef EU07_USE_OLD_HVCOUPLERS - for( int b = 0; b < 2; ++b ) { - HVCouplers[ b ][ 0 ] = 0.0; - HVCouplers[ b ][ 1 ] = 0.0; + for( int side = 0; side < 2; ++side ) { + HVCouplers[ side ][ hvcoupler::current ] = 0.0; + HVCouplers[ side ][ hvcoupler::voltage ] = 0.0; } #endif for( int b = 0; b < 3; ++b ) { @@ -706,15 +706,22 @@ bool TMoverParameters::CurrentSwitch(int direction) }; void TMoverParameters::UpdatePantVolume(double dt) -{ // KURS90 - sprężarka pantografów; Ra 2014-07: teraz jest to zbiornik rozrządu, chociaż to jeszcze - // nie tak +{ // KURS90 - sprężarka pantografów; Ra 2014-07: teraz jest to zbiornik rozrządu, chociaż to jeszcze nie tak + + // check the pantograph compressor while at it + if( PantCompFlag ) { + if( ( false == Battery ) + && ( false == ConverterFlag ) ) { + PantCompFlag = false; + } + } + if (EnginePowerSource.SourceType == CurrentCollector) // tylko jeśli pantografujący { // Ra 2014-07: zasadniczo, to istnieje zbiornik rozrządu i zbiornik pantografów - na razie mamy razem // Ra 2014-07: kurek trójdrogowy łączy spr.pom. z pantografami i wyłącznikiem ciśnieniowym WS // Ra 2014-07: zbiornika rozrządu nie pompuje się tu, tylko pantografy; potem można zamknąć // WS i odpalić resztę - // NOTE: custom variant for EMU disabled because it pretty much doesn't work if ((TrainType == dt_EZT) ? (PantPress < ScndPipePress) : bPantKurek3) // kurek zamyka połączenie z ZG { // zbiornik pantografu połączony ze zbiornikiem głównym - małą sprężarką się tego nie napompuje @@ -727,16 +734,19 @@ void TMoverParameters::UpdatePantVolume(double dt) } else { // zbiornik główny odcięty, można pompować pantografy - if (PantCompFlag && Battery) // włączona bateria i mała sprężarka - PantVolume += dt * (TrainType == dt_EZT ? 0.003 : 0.005) * - (2.0 * 0.45 - ((0.1 / PantVolume / 10) - 0.1)) / - 0.45; // napełnianie zbiornika pantografów - // Ra 2013-12: Niebugocław mówi, że w EZT nabija 1.5 raz wolniej niż jak było 0.005 + if( PantCompFlag ) { + // włączona mała sprężarka + PantVolume += + dt + // Ra 2013-12: Niebugocław mówi, że w EZT nabija 1.5 raz wolniej niż jak było 0.005 + * ( TrainType == dt_EZT ? 0.003 : 0.005 ) / std::max( 1.0, PantPress ) + * ( 0.45 - ( ( 0.1 / PantVolume / 10 ) - 0.1 ) ) / 0.45; + } PantPress = std::min( (10.0 * PantVolume) - 1.0, EnginePowerSource.CollectorParameters.MaxPress ); // tu by się przydała objętość zbiornika PantPress = std::max( PantPress, 0.0 ); } - if (!PantCompFlag && (PantVolume > 0.1)) - PantVolume -= dt * 0.0003; // nieszczelności: 0.0003=0.3l/s + if( !PantCompFlag && ( PantVolume > 0.1 ) ) + PantVolume -= dt * 0.0003 * std::max( 1.0, PantPress * 0.5 ); // nieszczelności: 0.0003=0.3l/s /* // NOTE: disabled as this is redundant with check done in dynobj.update() // TODO: determine if this isn't a mistake -- @@ -1100,31 +1110,31 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap || ( ( Heating ) && ( Couplers[ side ].CouplingFlag & ctrain_heating ) ) ) { #ifdef EU07_USE_OLD_HVCOUPLERS - HVCouplers[ oppositeside ][ hvcoupler::outgoing ] = + HVCouplers[ oppositeside ][ hvcoupler::voltage ] = std::max( std::abs( hvc ), - Couplers[ side ].Connected->HVCouplers[ Couplers[ side ].ConnectedNr ][ hvcoupler::outgoing ] - HVCouplers[ side ][ hvcoupler::incoming ] * 0.02 ); + Couplers[ side ].Connected->HVCouplers[ Couplers[ side ].ConnectedNr ][ hvcoupler::voltage ] - HVCouplers[ side ][ hvcoupler::current ] * 0.02 ); #else auto const &connectedcoupler = Couplers[ side ].Connected->Couplers[ Couplers[ side ].ConnectedNr ]; - Couplers[ oppositeside ].power_high.outgoing = + Couplers[ oppositeside ].power_high.voltage = std::max( std::abs( hvc ), - connectedcoupler.power_high.outgoing - Couplers[ side ].power_high.incoming * 0.02 ); + connectedcoupler.power_high.voltage - Couplers[ side ].power_high.current * 0.02 ); #endif } else { #ifdef EU07_USE_OLD_HVCOUPLERS - HVCouplers[ oppositeside ][ hvcoupler::outgoing ] = abs( hvc ) - HVCouplers[ side ][ hvcoupler::incoming ] * 0.02; + HVCouplers[ oppositeside ][ hvcoupler::voltage ] = std::abs( hvc ) - HVCouplers[ side ][ hvcoupler::current ] * 0.02; #else - Couplers[ oppositeside ].power_high.outgoing = std::abs( hvc ) - Couplers[ side ].power_high.incoming * 0.02; + Couplers[ oppositeside ].power_high.voltage = std::abs( hvc ) - Couplers[ side ].power_high.current * 0.02; #endif } } #ifdef EU07_USE_OLD_HVCOUPLERS - hvc = HVCouplers[ side::front ][ hvcoupler::outgoing ] + HVCouplers[ side::rear ][ hvcoupler::outgoing ]; + hvc = HVCouplers[ side::front ][ hvcoupler::voltage ] + HVCouplers[ side::rear ][ hvcoupler::voltage ]; #else - hvc = Couplers[ side::front ].power_high.outgoing + Couplers[ side::rear ].power_high.outgoing; + hvc = Couplers[ side::front ].power_high.voltage + Couplers[ side::rear ].power_high.voltage; #endif if( ( std::abs( PantFrontVolt ) + std::abs( PantRearVolt ) < 1.0 ) @@ -1133,26 +1143,33 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap // przekazywanie pradow for( int side = 0; side < 2; ++side ) { + Couplers[ side ].power_high.local = false; // power, if any, will be from external source + if( ( Couplers[ side ].CouplingFlag & ctrain_power ) || ( ( Heating ) && ( Couplers[ side ].CouplingFlag & ctrain_heating ) ) ) { #ifdef EU07_USE_OLD_HVCOUPLERS - HVCouplers[ side ][ hvcoupler::incoming ] = - Couplers[side].Connected->HVCouplers[Couplers[side].ConnectedNr][hvcoupler::outgoing] + - Itot * HVCouplers[side][hvcoupler::outgoing] / hvc; // obciążenie rozkladane stosownie do napiec + auto const oppositeside = ( Couplers[side].ConnectedNr == side::front ? side::rear : side::front ); + HVCouplers[ side ][ hvcoupler::current ] = + Couplers[side].Connected->HVCouplers[oppositeside][hvcoupler::current] + + Itot * HVCouplers[side][hvcoupler::voltage] / hvc; // obciążenie rozkladane stosownie do napiec #else - auto const &connectedcoupler = Couplers[ side ].Connected->Couplers[ Couplers[ side ].ConnectedNr ]; - Couplers[ side ].power_high.incoming = - connectedcoupler.power_high.outgoing - + Itot * Couplers[ side ].power_high.outgoing / hvc; // obciążenie rozkladane stosownie do napiec + auto const &connectedsothercoupler = + Couplers[ side ].Connected->Couplers[ + ( Couplers[ side ].ConnectedNr == side::front ? + side::rear : + side::front ) ]; + Couplers[ side ].power_high.current = + connectedsothercoupler.power_high.current + + Itot * Couplers[ side ].power_high.voltage / hvc; // obciążenie rozkladane stosownie do napiec #endif } else { #ifdef EU07_USE_OLD_HVCOUPLERS // pierwszy pojazd - HVCouplers[side][hvcoupler::incoming] = Itot * HVCouplers[side][hvcoupler::outgoing] / hvc; + HVCouplers[side][hvcoupler::current] = Itot * HVCouplers[side][hvcoupler::voltage] / hvc; #else - Couplers[ side ].power_high.incoming = Itot * Couplers[ side ].power_high.outgoing / hvc; + Couplers[ side ].power_high.current = Itot * Couplers[ side ].power_high.voltage / hvc; #endif } } @@ -1160,16 +1177,24 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap else { for( int side = 0; side < 2; ++side ) { + + Couplers[ side ].power_high.local = true; // power is coming from local pantographs + if( ( Couplers[ side ].CouplingFlag & ctrain_power ) || ( ( Heating ) && ( Couplers[ side ].CouplingFlag & ctrain_heating ) ) ) { #ifdef EU07_USE_OLD_HVCOUPLERS - TotalCurrent += Couplers[ side ].Connected->HVCouplers[ Couplers[ side ].ConnectedNr ][ hvcoupler::incoming ]; - HVCouplers[ side ][ hvcoupler::incoming ] = 0.0; + auto const oppositeside = ( Couplers[ side ].ConnectedNr == side::front ? side::rear : side::front ); + TotalCurrent += Couplers[ side ].Connected->HVCouplers[ oppositeside ][ hvcoupler::current ]; + HVCouplers[ side ][ hvcoupler::current ] = 0.0; #else - auto const &connectedcoupler = Couplers[ side ].Connected->Couplers[ Couplers[ side ].ConnectedNr ]; - TotalCurrent += connectedcoupler.power_high.incoming; - Couplers[ side ].power_high.incoming = 0.0; + auto const &connectedsothercoupler = + Couplers[ side ].Connected->Couplers[ + ( Couplers[ side ].ConnectedNr == side::front ? + side::rear : + side::front ) ]; + TotalCurrent += connectedsothercoupler.power_high.current; + Couplers[ side ].power_high.current = 0.0; #endif } } @@ -1528,8 +1553,7 @@ void TMoverParameters::ConverterCheck() { // sprawdzanie przetwornicy if( ( ConverterAllow ) && ( false == PantPressLockActive ) - && ( ( Mains ) - || ( GetTrainsetVoltage() > 0.5 * EnginePowerSource.MaxVoltage ) ) ) { + && ( Mains ) ) { ConverterFlag = true; } else { @@ -2032,23 +2056,43 @@ bool TMoverParameters::AddPulseForce(int Multipler) // Q: 20160713 // sypanie piasku // ************************************************************************************************* -bool TMoverParameters::SandDoseOn(void) +bool TMoverParameters::Sandbox( bool const State, int const Notify ) { - bool SDO; - if (SandCapacity > 0) - { - SDO = true; - if (SandDose) - SandDose = false; - else if (Sand > 0) - SandDose = true; - if (CabNo != 0) - SendCtrlToNext("SandDoseOn", 1, CabNo); - } - else - SDO = false; + bool result{ false }; - return SDO; + if( SandDose != State ) { + if( SandDose == false ) { + // switch on + if( Sand > 0 ) { + SandDose = true; + result = true; + } + } + else { + // switch off + SandDose = false; + result = true; + } + } + + if( Notify != command_range::local ) { + // if requested pass the command on + auto const couplingtype = + ( Notify == command_range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ); + + if( State == true ) { + // switch on + SendCtrlToNext( "Sandbox", 1, CabNo, couplingtype ); + } + else { + // switch off + SendCtrlToNext( "Sandbox", 0, CabNo, couplingtype ); + } + } + + return result; } void TMoverParameters::SSReset(void) @@ -2271,7 +2315,8 @@ bool TMoverParameters::DirectionBackward(void) // ************************************************************************************************* bool TMoverParameters::AntiSlippingButton(void) { - return (AntiSlippingBrake() || SandDoseOn()); + // NOTE: disabled the sandbox part, it's already controlled by another part of the AI routine + return (AntiSlippingBrake() /*|| Sandbox(true)*/); } // ************************************************************************************************* @@ -2865,7 +2910,7 @@ bool TMoverParameters::BrakeDelaySwitch(int BDS) { BrakeDelayFlag = BDS; rBDS = true; - BrakeStatus &= 191; + Hamulec->SetBrakeStatus( Hamulec->GetBrakeStatus() & ~64 ); // kopowanie nastawy hamulca do kolejnego czlonu - do przemyślenia if (CabNo != 0) SendCtrlToNext("BrakeDelay", BrakeDelayFlag, CabNo); @@ -3108,12 +3153,17 @@ void TMoverParameters::UpdatePipePressure(double dt) else dpLocalValve = LocHandle->GetPF(LocalBrakePosA, Hamulec->GetBCP(), ScndPipePress, dt, 0); - if ((BrakeHandle == FV4a) && - ((PipePress < 2.75) && ((Hamulec->GetStatus() & b_rls) == 0)) && - (BrakeSubsystem == ss_LSt) && (TrainType != dt_EZT)) + + if( ( BrakeHandle == FV4a ) + && ( ( PipePress < 2.75 ) + && ( ( Hamulec->GetStatus() & b_rls ) == 0 ) ) + && ( BrakeSubsystem == ss_LSt ) + && ( TrainType != dt_EZT ) ) { temp = PipePress + 0.00001; - else + } + else { temp = ScndPipePress; + } Handle->SetReductor(BrakeCtrlPos2); if ((BrakeOpModeFlag != bom_PS)) @@ -3255,20 +3305,21 @@ void TMoverParameters::UpdatePipePressure(double dt) if ((BrakeHandle == FVel6) && (ActiveCab != 0)) { - if ((Battery) && (ActiveDir != 0) && - (EpFuse)) // tu powinien byc jeszcze bezpiecznik EP i baterie - + if ((Battery) + && (ActiveDir != 0) + && (EpFuse)) // tu powinien byc jeszcze bezpiecznik EP i baterie - // temp = (Handle as TFVel6).GetCP temp = Handle->GetCP(); else temp = 0.0; Hamulec->SetEPS(temp); - SendCtrlToNext("Brake", temp, - CabNo); // Ra 2014-11: na tym się wysypuje, ale nie wiem, w jakich warunkach + // Ra 2014-11: na tym się wysypuje, ale nie wiem, w jakich warunkach + SendCtrlToNext("Brake", temp, CabNo); } Pipe->Act(); PipePress = Pipe->P(); - if ((BrakeStatus & 128) == 128) // jesli hamulec wyłączony + if( ( Hamulec->GetBrakeStatus() & b_dmg ) == b_dmg ) // jesli hamulec wyłączony temp = 0.0; // odetnij else temp = 1.0; // połącz @@ -3524,8 +3575,7 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) LastSwitchingTime += dt1; if (EngineType == ElectricSeriesMotor) LastRelayTime += dt1; - if( Mains && /*(abs(CabNo) < 2) &&*/ ( EngineType == - ElectricSeriesMotor ) ) // potem ulepszyc! pantogtrafy! + if( Mains && /*(abs(CabNo) < 2) &&*/ ( EngineType == ElectricSeriesMotor ) ) // potem ulepszyc! pantogtrafy! { // Ra 2014-03: uwzględnienie kierunku jazdy w napięciu na silnikach, a powinien być // zdefiniowany nawrotnik if( CabNo == 0 ) @@ -3533,20 +3583,22 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) else Voltage = RunningTraction.TractionVoltage * DirAbsolute; // ActiveDir*CabNo; } // bo nie dzialalo - else if( ( EngineType == ElectricInductionMotor ) || - ( ( ( Couplers[ 0 ].CouplingFlag & ctrain_power ) == ctrain_power ) || - ( ( Couplers[ 1 ].CouplingFlag & ctrain_power ) == - ctrain_power ) ) ) // potem ulepszyc! pantogtrafy! + else if( ( EngineType == ElectricInductionMotor ) + || ( ( ( Couplers[ side::front ].CouplingFlag & ctrain_power ) == ctrain_power ) + || ( ( Couplers[ side::rear ].CouplingFlag & ctrain_power ) == ctrain_power ) ) ) { + // potem ulepszyc! pantogtrafy! Voltage = std::max( - RunningTraction.TractionVoltage, + RunningTraction.TractionVoltage, #ifdef EU07_USE_OLD_HVCOUPLERS - std::max( HVCouplers[side::front][hvcoupler::incoming], HVCouplers[side::rear][hvcoupler::incoming] ) ); + std::max( HVCouplers[side::front][hvcoupler::voltage], HVCouplers[side::rear][hvcoupler::voltage] ) ); #else - std::max( Couplers[ side::front ].power_high.incoming, Couplers[ side::rear ].power_high.incoming ) ); + std::max( Couplers[ side::front ].power_high.voltage, Couplers[ side::rear ].power_high.voltage ) ); #endif - else + } + else { Voltage = 0; + } //if (Mains && /*(abs(CabNo) < 2) &&*/ ( // EngineType == ElectricInductionMotor)) // potem ulepszyc! pantogtrafy! // Voltage = RunningTraction.TractionVoltage; @@ -4059,7 +4111,7 @@ double TMoverParameters::TractionForce(double dt) // yB: szereg dwoch sekcji w ET42 if ((TrainType == dt_ET42) && (Imax == ImaxHi)) Voltage = Voltage / 2.0; - Mm = Momentum(current(enrot, Voltage)); // oblicza tez prad p/slinik + Mm = Momentum(Current(enrot, Voltage)); // oblicza tez prad p/slinik if (TrainType == dt_ET42) { @@ -4253,73 +4305,85 @@ double TMoverParameters::TractionForce(double dt) case 0: { - if( ( Im <= ( MPTRelay[ ScndCtrlPos ].Iup * PosRatio ) ) && - ( ScndCtrlPos < ScndCtrlPosNo ) ) - ++ScndCtrlPos; - if( ( Im >= ( MPTRelay[ ScndCtrlPos ].Idown * PosRatio ) ) && ( ScndCtrlPos > 0 ) ) - --ScndCtrlPos; - break; - } + if( ( ScndCtrlPos < ScndCtrlPosNo ) + && ( Im <= ( MPTRelay[ ScndCtrlPos ].Iup * PosRatio ) ) ) { + ++ScndCtrlPos; + } + if( ( ScndCtrlPos > 0 ) + && ( Im >= ( MPTRelay[ScndCtrlPos].Idown * PosRatio ) ) ) { + --ScndCtrlPos; + } + break; + } case 1: { - if( ( MPTRelay[ ScndCtrlPos ].Iup < Vel ) && ( ScndCtrlPos < ScndCtrlPosNo ) ) - ++ScndCtrlPos; - if( ( MPTRelay[ ScndCtrlPos ].Idown > Vel ) && ( ScndCtrlPos > 0 ) ) - --ScndCtrlPos; - break; - } + if( ( ScndCtrlPos < ScndCtrlPosNo ) + && ( MPTRelay[ ScndCtrlPos ].Iup < Vel ) ) { + ++ScndCtrlPos; + } + if( ( ScndCtrlPos > 0 ) + && ( MPTRelay[ ScndCtrlPos ].Idown > Vel ) ) { + --ScndCtrlPos; + } + break; + } case 2: { - if( ( MPTRelay[ ScndCtrlPos ].Iup < Vel ) && ( ScndCtrlPos < ScndCtrlPosNo ) && - ( EnginePower < ( tmp * 0.99 ) ) ) - ++ScndCtrlPos; - if( ( MPTRelay[ ScndCtrlPos ].Idown < Im ) && ( ScndCtrlPos > 0 ) ) - --ScndCtrlPos; - break; - } - case 41: - { - if( ( MainCtrlPos == MainCtrlPosNo ) - && ( tmpV * 3.6 > MPTRelay[ ScndCtrlPos ].Iup ) - && ( ScndCtrlPos < ScndCtrlPosNo ) ) { - ++ScndCtrlPos; - enrot = enrot * 0.73; - } - if( ( Im > MPTRelay[ ScndCtrlPos ].Idown ) - && ( ScndCtrlPos > 0 ) ) { - --ScndCtrlPos; + if( ( ScndCtrlPos < ScndCtrlPosNo ) + && ( MPTRelay[ ScndCtrlPos ].Iup < Vel ) + && ( EnginePower < ( tmp * 0.99 ) ) ) { + ++ScndCtrlPos; } - break; - } - case 45: - { - if( ( MainCtrlPos >= 10 ) && ( ScndCtrlPos < ScndCtrlPosNo ) ) { + if( ( ScndCtrlPos > 0 ) + && ( MPTRelay[ ScndCtrlPos ].Idown < Im ) ) { + --ScndCtrlPos; + } + break; + } + case 41: + { + if( ( ScndCtrlPos < ScndCtrlPosNo ) + && ( MainCtrlPos == MainCtrlPosNo ) + && ( tmpV * 3.6 > MPTRelay[ ScndCtrlPos ].Iup ) ) { + ++ScndCtrlPos; + enrot = enrot * 0.73; + } + if( ( ScndCtrlPos > 0 ) + && ( Im > MPTRelay[ ScndCtrlPos ].Idown ) ) { + --ScndCtrlPos; + } + break; + } + case 45: + { + if( ( ScndCtrlPos < ScndCtrlPosNo ) + && ( MainCtrlPos >= 10 ) ) { if( ScndCtrlPos == 0 ) { if( Im < MPTRelay[ ScndCtrlPos ].Iup ) { - ++ScndCtrlPos; + ++ScndCtrlPos; } } else { if( Vel > MPTRelay[ ScndCtrlPos ].Iup ) { - ++ScndCtrlPos; + ++ScndCtrlPos; } // check for cases where the speed drops below threshold for level 2 or 3 if( ( ScndCtrlPos > 1 ) - && ( Vel < MPTRelay[ ScndCtrlPos - 1 ].Idown ) ){ + && ( Vel < MPTRelay[ ScndCtrlPos - 1 ].Idown ) ) { --ScndCtrlPos; } } } - // malenie + // malenie if( ( ScndCtrlPos > 0 ) && ( MainCtrlPos < 10 ) ) { if( ScndCtrlPos == 1 ) { if( Im > MPTRelay[ ScndCtrlPos - 1 ].Idown ) { - --ScndCtrlPos; + --ScndCtrlPos; } } else { if( Vel < MPTRelay[ ScndCtrlPos ].Idown ) { - --ScndCtrlPos; + --ScndCtrlPos; } } } @@ -4329,13 +4393,13 @@ double TMoverParameters::TractionForce(double dt) } // ...and below position 7 field shunt drops altogether if( MainCtrlPos < 7 ) { - ScndCtrlPos = 0; - } + ScndCtrlPos = 0; + } break; } - case 46: - { - // wzrastanie + case 46: + { + // wzrastanie if( ( MainCtrlPos >= 10 ) && ( ScndCtrlPos < ScndCtrlPosNo ) ) { if( ( ScndCtrlPos ) % 2 == 0 ) { @@ -4350,18 +4414,18 @@ double TMoverParameters::TractionForce(double dt) } } } - // malenie + // malenie if( ( MainCtrlPos < 10 ) && ( ScndCtrlPos > 0 ) ) { if( ( ScndCtrlPos ) % 2 == 0 ) { if( ( MPTRelay[ ScndCtrlPos ].Idown < Im ) ) { - --ScndCtrlPos; + --ScndCtrlPos; } } else { if( ( MPTRelay[ ScndCtrlPos + 1 ].Idown < Im ) && ( MPTRelay[ ScndCtrlPos ].Idown > Vel ) ) { - --ScndCtrlPos; + --ScndCtrlPos; } } } @@ -4369,14 +4433,14 @@ double TMoverParameters::TractionForce(double dt) ScndCtrlPos = std::min( 2, ScndCtrlPos ); } if( MainCtrlPos < 7 ) { - ScndCtrlPos = 0; - } + ScndCtrlPos = 0; + } break; } default: { break; } - } // switch RelayType + } // switch RelayType } } break; @@ -4455,26 +4519,28 @@ double TMoverParameters::TractionForce(double dt) dmoment = eimv[eimv_Fful]; // else // dmoment:=eimc[eimc_p_F0]*0.99; + // NOTE: the commands to operate the sandbox are likely to conflict with other similar ai decisions + // TODO: gather these in single place so they can be resolved together if ((abs((PosRatio + 9.66 * dizel_fill) * dmoment * 100) > 0.95 * Adhesive(RunningTrack.friction) * TotalMassxg)) { PosRatio = 0; tmp = 4; - SandDoseOn(); + Sandbox( true, command_range::local ); } // przeciwposlizg if ((abs((PosRatio + 9.80 * dizel_fill) * dmoment * 100) > 0.95 * Adhesive(RunningTrack.friction) * TotalMassxg)) { PosRatio = 0; tmp = 9; - SandDoseOn(); + Sandbox( true, command_range::local ); } // przeciwposlizg if ((SlippingWheels)) { // PosRatio = -PosRatio * 0; // serio -0 ??? PosRatio = 0; tmp = 9; - SandDoseOn(); + Sandbox( true, command_range::local ); } // przeciwposlizg dizel_fill += Max0R(Min0R(PosRatio - dizel_fill, 0.1), -0.1) * 2 * @@ -5682,28 +5748,28 @@ std::string TMoverParameters::EngineDescription(int what) // ************************************************************************************************* double TMoverParameters::GetTrainsetVoltage(void) {//ABu: funkcja zwracajaca napiecie dla calego skladu, przydatna dla EZT -/* - return std::min( - std::max( HVCouplers[ 1 ][ 1 ], HVCouplers[ 0 ][ 1 ] ), // local - std::max( HVCouplers[ 1 ][ 0 ], HVCouplers[ 0 ][ 0 ] ) ); // remote -*/ - // TODO: investigate what exactly is reported on these couplers, does it include heating? #ifdef EU07_USE_OLD_HVCOUPLERS - // TODO: if we ever revert to this version, match the expanded alternative below - return std::max( HVCouplers[ 1 ][ 0 ], HVCouplers[ 0 ][ 0 ] ); // incoming, external power + return std::max( + HVCouplers[ side::front ][ hvcoupler::voltage ], + HVCouplers[ side::rear ][ hvcoupler::voltage ] ); #else +/* + return std::max( + Couplers[ side::front ].power_high.voltage, + Couplers[ side::rear ].power_high.voltage ); +*/ return std::max( ( ( ( Couplers[side::front].Connected ) && ( ( Couplers[ side::front ].CouplingFlag & ctrain_power ) || ( ( Heating ) && ( Couplers[ side::front ].CouplingFlag & ctrain_heating ) ) ) ) ? - Couplers[side::front].Connected->Couplers[ Couplers[side::front].ConnectedNr ].power_high.outgoing : + Couplers[side::front].Connected->Couplers[ Couplers[side::front].ConnectedNr ].power_high.voltage : 0.0 ), ( ( ( Couplers[side::rear].Connected ) && ( ( Couplers[ side::rear ].CouplingFlag & ctrain_power ) || ( ( Heating ) && ( Couplers[ side::rear ].CouplingFlag & ctrain_heating ) ) ) ) ? - Couplers[ side::rear ].Connected->Couplers[ Couplers[ side::rear ].ConnectedNr ].power_high.outgoing : + Couplers[ side::rear ].Connected->Couplers[ Couplers[ side::rear ].ConnectedNr ].power_high.voltage : 0.0 ) ); #endif } @@ -8059,15 +8125,18 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "BrakeDelay") { - BrakeDelayFlag = static_cast(floor(CValue1)); - OK = true; + auto const brakesetting = static_cast( std::floor( CValue1 ) ); + if( true == Hamulec->SetBDF( brakesetting ) ) { + BrakeDelayFlag = brakesetting; + OK = true; + } + else { + OK = false; + } } - else if (Command == "SandDoseOn") + else if (Command == "Sandbox") { - if (SandDoseOn()) - OK = true; - else - OK = false; + OK = Sandbox( CValue1 == 1, command_range::local ); } else if (Command == "CabSignal") /*SHP,Indusi*/ { // Ra: to powinno działać tylko w członie obsadzonym diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index daab0a22..bdc01fee 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -16,6 +16,7 @@ Copyright (C) 2007-2014 Maciej Cierniak #include "hamulce.h" #include #include "Mover.h" +#include "usefull.h" //---FUNKCJE OGOLNE--- @@ -51,10 +52,10 @@ double PF_old(double P1, double P2, double S) double PF( double const P1, double const P2, double const S, double const DP ) { - double PH = std::max(P1, P2) + 1; // wyzsze cisnienie absolutne - double PL = P1 + P2 - PH + 2; // nizsze cisnienie absolutne - double sg = PL / PH; // bezwymiarowy stosunek cisnien - double FM = PH * 197 * S * Sign(P2 - P1); // najwyzszy mozliwy przeplyw, wraz z kierunkiem + double const PH = std::max(P1, P2) + 1.0; // wyzsze cisnienie absolutne + double const PL = P1 + P2 - PH + 2.0; // nizsze cisnienie absolutne + double const sg = PL / PH; // bezwymiarowy stosunek cisnien + double const FM = PH * 197.0 * S * Sign(P2 - P1); // najwyzszy mozliwy przeplyw, wraz z kierunkiem if (sg > 0.5) // jesli ponizej stosunku krytycznego if ((PH - PL) < DP) // niewielka roznica cisnien return (1.0 - sg) / DPL * FM * 2.0 * std::sqrt((DP) * (PH - DP)); @@ -69,15 +70,15 @@ double PF1( double const P1, double const P2, double const S ) { static double const DPS = 0.001; - double PH = std::max(P1, P2) + 1; // wyzsze cisnienie absolutne - double PL = P1 + P2 - PH + 2; // nizsze cisnienie absolutne - double sg = PL / PH; // bezwymiarowy stosunek cisnien - double FM = PH * 197 * S * Sign(P2 - P1); // najwyzszy mozliwy przeplyw, wraz z kierunkiem - if ((sg > 0.5)) // jesli ponizej stosunku krytycznego - if ((sg < DPS)) // niewielka roznica cisnien - return (1 - sg) / DPS * FM * 2 * std::sqrt((DPS) * (1 - DPS)); + double const PH = std::max(P1, P2) + 1.0; // wyzsze cisnienie absolutne + double const PL = P1 + P2 - PH + 2.0; // nizsze cisnienie absolutne + double const sg = PL / PH; // bezwymiarowy stosunek cisnien + double const FM = PH * 197.0 * S * Sign(P2 - P1); // najwyzszy mozliwy przeplyw, wraz z kierunkiem + if (sg > 0.5) // jesli ponizej stosunku krytycznego + if (sg < DPS) // niewielka roznica cisnien + return (1.0 - sg) / DPS * FM * 2.0 * std::sqrt((DPS) * (1.0 - DPS)); else - return FM * 2 * std::sqrt((sg) * (1 - sg)); + return FM * 2.0 * std::sqrt((sg) * (1.0 - sg)); else // powyzej stosunku krytycznego return FM; } @@ -1184,50 +1185,50 @@ void TESt3AL2::Init( double const PP, double const HPP, double const LPP, double double TLSt::GetPF( double const PP, double const dt, double const Vel ) { double result; - double dv; - double dV1; - double temp; - double VVP; - double BVP; - double BCP; - double CVP; // ValveRes.CreatePress(LBP); // LBP:=0; - BVP = BrakeRes->P(); - VVP = ValveRes->P(); - BCP = ImplsRes->P(); - CVP = CntrlRes->P(); + double const BVP{ BrakeRes->P() }; + double const VVP{ ValveRes->P() }; + double const BCP{ ImplsRes->P() }; + double const CVP{ CntrlRes->P() }; - dv = 0; - dV1 = 0; + double dV{ 0.0 }; + double dV1{ 0.0 }; // sprawdzanie stanu - if ((BrakeStatus & b_rls) == b_rls) - if ((CVP < 0)) + if( ( BrakeStatus & b_rls ) == b_rls ) { + if( CVP < 0.0 ) { BrakeStatus &= ~b_rls; + } else { // 008 - dv = PF1(CVP, BCP, 0.024) * dt; - CntrlRes->Flow(+dv); - // dV1:=+dV; //minus potem jest - // ImplsRes->Flow(-dV1); + dV = PF1( CVP, BCP, 0.024 ) * dt; + CntrlRes->Flow( dV ); +/* + // NOTE: attempted fix, disabled because it breaks when releaser is used while releasing breakes + dV = PF1(CVP, VVP, 0.024) * dt; + CntrlRes->Flow( dV ); + dV1 = dV; //minus potem jest + ImplsRes->Flow( -dV1 ); +*/ } + } - VVP = ValveRes->P(); + double temp; // przeplyw ZS <-> PG if (((CVP - BCP) * BVM > 0.5)) - temp = 0; + temp = 0.0; else if ((VVP > CVP + 0.4)) temp = 0.5; else temp = 0.5; - dv = PF1(CVP, VVP, 0.0015 * temp / 1.8 / 2) * dt; - CntrlRes->Flow(+dv); - ValveRes->Flow(-0.04 * dv); - dV1 = dV1 - 0.96 * dv; + dV = PF1(CVP, VVP, 0.0015 * temp / 1.8 / 2) * dt; + CntrlRes->Flow(+dV); + ValveRes->Flow(-0.04 * dV); + dV1 = dV1 - 0.96 * dV; // luzowanie KI {G} // if VVP>BCP then @@ -1236,26 +1237,38 @@ double TLSt::GetPF( double const PP, double const dt, double const Vel ) // dV:=PF(VVP,BCP,0.00020*(1.33-int((CVP-BCP)*BVM>0.65)))*dt // else dV:=0; 0.00025 P /*P*/ - if (VVP > BCP) - dv = PF(VVP, BCP, - 0.00043 * (1.5 - int(((CVP - BCP) * BVM > 1) && (BrakeDelayFlag == bdelay_G))), - 0.1) * - dt; - else if ((CVP - BCP) < 1.5) - dv = PF(VVP, BCP, - 0.001472 * (1.36 - int(((CVP - BCP) * BVM > 1) && (BrakeDelayFlag == bdelay_G))), - 0.1) * - dt; - else - dv = 0; + if( VVP > BCP ) { + dV = + PF( VVP, BCP, + 0.00043 * ( 1.5 - ( + true == ( ( ( CVP - BCP ) * BVM > 1.0 ) + && ( BrakeDelayFlag == bdelay_G ) ) ? + 1.0 : + 0.0 ) ), + 0.1 ) + * dt; + } + else if( ( CVP - BCP ) < 1.5 ) { + dV = PF( VVP, BCP, + 0.001472 * ( 1.36 - ( + true == ( ( ( CVP - BCP ) * BVM > 1.0 ) + && ( BrakeDelayFlag == bdelay_G ) ) ? + 1.0 : + 0.0 ) ), + 0.1 ) + * dt; + } + else { + dV = 0; + } - ImplsRes->Flow(-dv); - ValveRes->Flow(+dv); + ImplsRes->Flow(-dV); + ValveRes->Flow(+dV); // przeplyw PG <-> rozdzielacz - dv = PF(PP, VVP, 0.01, 0.1) * dt; - ValveRes->Flow(-dv); + dV = PF(PP, VVP, 0.01, 0.1) * dt; + ValveRes->Flow(-dV); - result = dv - dV1; + result = dV - dV1; // if Vel>55 then temp:=0.72 else // temp:=1;{R} @@ -1272,18 +1285,18 @@ double TLSt::GetPF( double const PP, double const dt, double const Vel ) if ((BrakeCyl->P() > temp + 0.005) || (temp < 0.28)) // dV:=PF(0,BrakeCyl->P(),0.0015*3*sizeBC)*dt // dV:=PF(0,BrakeCyl->P(),0.005*3*sizeBC)*dt - dv = PFVd(BrakeCyl->P(), 0, 0.005 * 7 * SizeBC, temp) * dt; + dV = PFVd(BrakeCyl->P(), 0, 0.005 * 7 * SizeBC, temp) * dt; else - dv = 0; - BrakeCyl->Flow(-dv); + dV = 0; + BrakeCyl->Flow(-dV); // przeplyw ZP <-> CH if ((BrakeCyl->P() < temp - 0.005) && (temp > 0.29)) // dV:=PF(BVP,BrakeCyl->P(),0.002*3*sizeBC*2)*dt - dv = -PFVa(BVP, BrakeCyl->P(), 0.002 * 7 * SizeBC * 2, temp) * dt; + dV = -PFVa(BVP, BrakeCyl->P(), 0.002 * 7 * SizeBC * 2, temp) * dt; else - dv = 0; - BrakeRes->Flow(dv); - BrakeCyl->Flow(-dv); + dV = 0; + BrakeRes->Flow(dV); + BrakeCyl->Flow(-dV); ImplsRes->Act(); ValveRes->Act(); @@ -2198,124 +2211,145 @@ double TFV4aM::GetPF(double i_bcp, double PP, double HP, double dt, double ep) static int const LBDelay = 100; static double const xpM = 0.3; // mnoznik membrany komory pod - double LimPP; - double dpPipe; - double dpMainValve; - double ActFlowSpeed; - double DP; - double pom; - int i; + ep = (PP / 2.0) * 1.5 + (ep / 2.0) * 0.5; // SPKS!! - ep = PP / 2 * 1.5 + ep / 2 * 0.5; // SPKS!! - // ep:=pp; - // ep:=cp/3+pp/3+ep/3; - // ep:=cp; + for( int idx = 0; idx < 5; ++idx ) { + Sounds[ idx ] = 0; + } - for (i = 0; i < 5; ++i) - Sounds[i] = 0; - DP = 0; + // na wszelki wypadek, zeby nie wyszlo poza zakres + i_bcp = clamp( i_bcp, -1.999, 5.999 ); - i_bcp = Max0R(Min0R(i_bcp, 5.999), -1.999); // na wszelki wypadek, zeby nie wyszlo poza zakres - - if ((TP > 0)) - { // jesli czasowy jest niepusty - // dp:=0.07; //od cisnienia 5 do 0 w 60 sekund ((5-0)*dt/75) + double DP{ 0.0 }; + if( TP > 0.0 ) { + // jesli czasowy jest niepusty DP = 0.045; // 2.5 w 55 sekund (5,35->5,15 w PG) - TP = TP - DP * dt; + TP -= DP * dt; Sounds[s_fv4a_t] = DP; } - else //.08 - { - TP = 0; + else { + //.08 + TP = 0.0; } - if ((XP > 0)) // jesli komora pod niepusta jest niepusty - { + if (XP > 0) { + // jesli komora pod niepusta jest niepusty DP = 2.5; Sounds[s_fv4a_x] = DP * XP; - XP = XP - dt * DP * 2; // od cisnienia 5 do 0 w 10 sekund ((5-0)*dt/10) + XP -= dt * DP * 2.0; // od cisnienia 5 do 0 w 10 sekund ((5-0)*dt/10) + } + else { + // jak pusty, to pusty + XP = 0.0; } - else //.75 - XP = 0; // jak pusty, to pusty - LimPP = Min0R(LPP_RP(i_bcp) + TP * 0.08 + RedAdj, HP); // pozycja + czasowy lub zasilanie - ActFlowSpeed = BPT[lround(i_bcp) + 2][0]; + double pom; + if( EQ( i_bcp, -1.0 ) ) { + pom = std::min( HP, 5.4 + RedAdj ); + } + else { + pom = std::min( CP, HP ); + } - if ((EQ(i_bcp, -1))) - pom = Min0R(HP, 5.4 + RedAdj); - else - pom = Min0R(CP, HP); - - if ((pom > RP + 0.25)) + if( pom > RP + 0.25 ) { Fala = true; - if ((Fala)) - if ((pom > RP + 0.3)) - // if(ep>rp+0.11)then - XP = XP - 20 * PR(pom, XP) * dt; - // else - // xp:=xp-16*(ep-(ep+0.01))/(0.1)*PR(ep,xp)*dt; - else + } + if( Fala ) { + if( pom > RP + 0.3 ) { + XP = XP - 20.0 * PR( pom, XP ) * dt; + } + else { Fala = false; + } + } - if ((LimPP > CP)) // podwyzszanie szybkie - CP = CP + 5 * 60 * Min0R(abs(LimPP - CP), 0.05) * PR(CP, LimPP) * dt; // zbiornik sterujacy; - else - CP = CP + 13 * Min0R(abs(LimPP - CP), 0.05) * PR(CP, LimPP) * dt; // zbiornik sterujacy + double LimPP = std::min( + LPP_RP( i_bcp ) + TP * 0.08 + RedAdj, + HP ); // pozycja + czasowy lub zasilanie + + // zbiornik sterujacy + if( LimPP > CP ) { + // podwyzszanie szybkie + CP += + 5.0 * 60.0 + * std::min( + std::abs( LimPP - CP ), + 0.05 ) + * PR( CP, LimPP ) + * dt; + } + else { + CP += + 13 + * std::min( + std::abs( LimPP - CP ), + 0.05 ) + * PR( CP, LimPP ) + * dt; + } LimPP = pom; // cp - dpPipe = Min0R(HP, LimPP + XP * xpM); + double const dpPipe = std::min(HP, LimPP + XP * xpM); - if (dpPipe > PP) - dpMainValve = -PFVa(HP, PP, ActFlowSpeed / LBDelay, dpPipe, 0.4); - else - dpMainValve = PFVd(PP, 0, ActFlowSpeed / LBDelay, dpPipe, 0.4); + double const ActFlowSpeed = BPT[ std::lround( i_bcp ) + 2 ][ 0 ]; - if (EQ(i_bcp, -1)) - { - if ((TP < 5)) - TP = TP + dt; // 5/10 - if ((TP < 1)) - TP = TP - 0.5 * dt; // 5/10 - // dpMainValve:=dpMainValve*2; - //+1*PF(dpPipe,pp,ActFlowSpeed/LBDelay)//coby - // nie przeszkadzal przy ladowaniu z zaworu obok + double dpMainValve; + if( dpPipe > PP ) { + dpMainValve = -PFVa( HP, PP, ActFlowSpeed / LBDelay, dpPipe, 0.4 ); + } + else { + dpMainValve = PFVd( PP, 0, ActFlowSpeed / LBDelay, dpPipe, 0.4 ); } - if (EQ(i_bcp, 0)) - { - if ((TP > 2)) - dpMainValve = dpMainValve * 1.5; //+0.5*PF(dpPipe,pp,ActFlowSpeed/LBDelay)//coby nie - // przeszkadzal przy ladowaniu z zaworu obok + if (EQ(i_bcp, -1)) { + + if( TP < 5 ) { TP += dt; } + if( TP < 1 ) { TP -= 0.5 * dt; } + } + + if (EQ(i_bcp, 0)) { + + if( TP > 2 ) { + dpMainValve *= 1.5; + } } ep = dpPipe; - if ((EQ(i_bcp, 0) || (RP > ep))) - RP = RP + PF(RP, ep, 0.0007) * dt; // powolne wzrastanie, ale szybsze na jezdzie; - else - RP = RP + PF(RP, ep, 0.000093 / 2 * 2) * dt; // powolne wzrastanie i to bardzo - // jednak trzeba wydluzyc, bo - // obecnie zle dziala - if ((RP < ep) && - (RP < - BPT[lround(i_bcpno) + 2][1])) // jesli jestesmy ponizej cisnienia w sterujacym (2.9 bar) - RP = RP + PF(RP, CP, 0.005) * dt; // przypisz cisnienie w PG - wydluzanie napelniania o czas - // potrzebny do napelnienia PG + if( ( EQ( i_bcp, 0 ) + || ( RP > ep ) ) ) { + // powolne wzrastanie, ale szybsze na jezdzie; + RP += PF( RP, ep, 0.0007 ) * dt; + } + else { + // powolne wzrastanie i to bardzo + RP += PF( RP, ep, 0.000093 / 2 * 2 ) * dt; + } + // jednak trzeba wydluzyc, bo obecnie zle dziala + if( ( RP < ep ) + && ( RP < BPT[ std::lround( i_bcpno ) + 2 ][ 1 ] ) ) { + // jesli jestesmy ponizej cisnienia w sterujacym (2.9 bar) + // przypisz cisnienie w PG - wydluzanie napelniania o czas potrzebny do napelnienia PG + RP += PF( RP, CP, 0.005 ) * dt; + } - if ((EQ(i_bcp, i_bcpno)) || (EQ(i_bcp, -2))) - { - DP = PF(0, PP, ActFlowSpeed / LBDelay); + if( ( EQ( i_bcp, i_bcpno ) ) + || ( EQ( i_bcp, -2 ) ) ) { + + DP = PF( 0.0, PP, ActFlowSpeed / LBDelay ); dpMainValve = DP; Sounds[s_fv4a_e] = DP; - Sounds[s_fv4a_u] = 0; - Sounds[s_fv4a_b] = 0; - Sounds[s_fv4a_x] = 0; + Sounds[s_fv4a_u] = 0.0; + Sounds[s_fv4a_b] = 0.0; + Sounds[s_fv4a_x] = 0.0; } - else - { - if (dpMainValve > 0) - Sounds[s_fv4a_b] = dpMainValve; - else - Sounds[s_fv4a_u] = -dpMainValve; + else { + + if( dpMainValve > 0.0 ) { + Sounds[ s_fv4a_b ] = dpMainValve; + } + else { + Sounds[ s_fv4a_u ] = -dpMainValve; + } } return dpMainValve * dt; @@ -2347,17 +2381,11 @@ double TFV4aM::GetPos(int i) double TFV4aM::LPP_RP(double pos) // cisnienie z zaokraglonej pozycji; { - int i_pos; + int const i_pos = 2 + std::floor( pos ); // zaokraglone w dol - i_pos = lround(pos - 0.5) + 2; // zaokraglone w dol - double i, j, k, l; - i = BPT[i_pos][1]; - j = BPT[i_pos + 1][1]; - k = pos + 2 - i_pos; - l = i + (j - i) * k; - double r = BPT[i_pos][1] + - (BPT[i_pos + 1][1] - BPT[i_pos][1]) * (pos + 2 - i_pos); // interpolacja liniowa - return r; + return + BPT[i_pos][1] + + (BPT[i_pos + 1][1] - BPT[i_pos][1]) * ((pos + 2) - i_pos); // interpolacja liniowa } bool TFV4aM::EQ(double pos, double i_pos) { @@ -2366,8 +2394,7 @@ bool TFV4aM::EQ(double pos, double i_pos) //---FV4a/M--- nowonapisany kran bez poprawki IC -double TMHZ_EN57::GetPF(double i_bcp, double PP, double HP, double dt, double ep) -{ +double TMHZ_EN57::GetPF( double i_bcp, double PP, double HP, double dt, double ep ) { static int const LBDelay = 100; double LimPP; @@ -2376,13 +2403,11 @@ double TMHZ_EN57::GetPF(double i_bcp, double PP, double HP, double dt, double ep double ActFlowSpeed; double DP; double pom; - int i; - { - long i_end = 5; - for (i = 0; i < i_end; ++i) - Sounds[i] = 0; + for( int idx = 0; idx < 5; ++idx ) { + Sounds[ idx ] = 0; } + DP = 0; i_bcp = Max0R(Min0R(i_bcp, 9.999), -0.999); // na wszelki wypadek, zeby nie wyszlo poza zakres diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index 661bfc7a..25de35db 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -184,7 +184,7 @@ class TBrake { bool DCV = false; //podwojny zawor zwrotny double ASBP = 0.0; //cisnienie hamulca pp - int BrakeStatus = 0; //flaga stanu + int BrakeStatus{ b_off }; //flaga stanu int SoundFlag = 0; public: @@ -213,6 +213,8 @@ class TBrake { void SetASBP( double const Press ); //ustalenie cisnienia pp virtual void ForceEmptiness(); int GetSoundFlag(); + int GetBrakeStatus() const { return BrakeStatus; } + void SetBrakeStatus( int const Status ) { BrakeStatus = Status; } virtual void SetED( double const EDstate ) {}; //stan hamulca ED do luzowania }; diff --git a/Segment.cpp b/Segment.cpp index 3106ee28..27c133a0 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -801,6 +801,7 @@ void TSegment::RaRenderLoft(CVertNormTex *&Vert, const vector6 *ShapePoints, int s = fStep * iSkip; // iSkip - ile odcinków z początku pominąć i = iSkip; // domyślnie 0 t = fTsBuffer[i]; // tabela wattości t dla segmentów + // BUG: length of spline can be 0, we should skip geometry generation for such cases fOffset = 0.1 / fLength; // pierwsze 10cm pos1 = FastGetPoint(t); // wektor początku segmentu dir = FastGetDirection(t, fOffset); // wektor kierunku diff --git a/Texture.cpp b/Texture.cpp index 8f939e06..3d2c2304 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -424,7 +424,6 @@ opengl_texture::load_TGA() { else if( tgaheader[ 2 ] == 10 ) { // compressed TGA int currentpixel = 0; - int currentbyte = 0; unsigned char buffer[ 4 ] = { 255, 255, 255, 255 }; const int pixelcount = data_width * data_height; diff --git a/Train.cpp b/Train.cpp index 0667248e..2e4ac040 100644 --- a/Train.cpp +++ b/Train.cpp @@ -925,19 +925,17 @@ void TTrain::OnCommand_sandboxactivate( TTrain *Train, command_data const &Comma return; } - if( Command.action != GLFW_RELEASE ) { - // press or hold - Train->mvControlled->SandDose = true; + if( Command.action == GLFW_PRESS ) { + // press + Train->mvControlled->Sandbox( true ); // audio feedback - if( Train->ggSandButton.GetValue() < 0.05 ) { - Train->play_sound( Train->dsbSwitch ); - } + Train->play_sound( Train->dsbSwitch ); // visual feedback Train->ggSandButton.UpdateValue( 1.0 ); } - else { + else if( Command.action == GLFW_RELEASE) { // release - Train->mvControlled->SandDose = false; + Train->mvControlled->Sandbox( false ); /* // audio feedback if( Train->ggAntiSlipButton.GetValue() > 0.5 ) { @@ -4333,7 +4331,7 @@ bool TTrain::Update( double const Deltatime ) // if // ((TestFlag(mvControlled->BrakeStatus,+b_Rused+b_Ractive)))//Lampka drugiego stopnia hamowania - btLampkaHamPosp.Turn((TestFlag(mvOccupied->BrakeStatus, 1))); // lampka drugiego stopnia hamowania + btLampkaHamPosp.Turn((TestFlag(mvOccupied->Hamulec->GetBrakeStatus(), 1))); // lampka drugiego stopnia hamowania //TODO: youBy wyciągnąć flagę wysokiego stopnia // hunter-121211: lampka zanikowo-pradowego wentylatorow: diff --git a/World.cpp b/World.cpp index 372527d7..ac5bf33f 100644 --- a/World.cpp +++ b/World.cpp @@ -714,6 +714,9 @@ void TWorld::OnKeyDown(int cKey) Train->OnKeyDown(cKey); // przekazanie klawisza do kabiny if (FreeFlyModeFlag) // aby nie odluźniało wagonu za lokomotywą { // operacje wykonywane na dowolnym pojeździe, przeniesione tu z kabiny +/* + // NOTE: disabled so it doesn't interfere with new system controls in outside view + // TODO: implement as part of the new system if (cKey == Global::Keys[k_Releaser]) // odluźniacz { // działa globalnie, sprawdzić zasięg TDynamicObject *temp = Global::DynamicNearest(); @@ -721,7 +724,7 @@ void TWorld::OnKeyDown(int cKey) { if (Global::ctrlState) // z ctrl odcinanie { - temp->MoverParameters->BrakeStatus ^= 128; + temp->MoverParameters->Hamulec->SetBrakeStatus( temp->MoverParameters->Hamulec->GetBrakeStatus() ^ 128 ); } else if (temp->MoverParameters->BrakeReleaser(1)) { @@ -731,7 +734,9 @@ void TWorld::OnKeyDown(int cKey) } } } - else if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy + else +*/ + if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy { // zmiana próżny/ładowny; Ra: zabrane z kabiny TDynamicObject *temp = Global::DynamicNearest(); if (temp) @@ -1799,12 +1804,12 @@ TWorld::Update_UI() { if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) uitextline2 += "+Mg"; - uitextline2 += ", BTP:" + to_string( tmp->MoverParameters->LoadFlag, 0 ); + uitextline2 += ", BTP: " + to_string( tmp->MoverParameters->LoadFlag, 0 ); { uitextline2 += - "; pant. " + "; pant: " + to_string( tmp->MoverParameters->PantPress, 2 ) - + ( tmp->MoverParameters->bPantKurek3 ? "MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" ); } uitextline2 += @@ -1822,25 +1827,37 @@ TWorld::Update_UI() { + to_string( tmp->MoverParameters->TotalCurrent, 0 ); #ifdef EU07_USE_OLD_HVCOUPLERS uitextline2 += - ", HV0: (" - + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::outgoing ], 0 ) - + ")<-" - + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::incoming ], 0 ); + ", HV0: " + + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::voltage ], 0 ) + + "@" + + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::current ], 0 ); uitextline2 += - ", HV1: (" - + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::outgoing ], 0 ) - + ")<-" - + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::incoming ], 0 ); + ", HV1: " + + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::voltage ], 0 ) + + "@" + + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::current ], 0 ); #else - uitextline2 += - ", HV: " - + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.incoming, 0 ) - + "->(" - + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.outgoing, 0 ) - + ")F" + (tmp->DirectionGet() ? "<<" : ">>") + "R(" - + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.outgoing, 0 ) - + ")<-" - + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.incoming, 0 ); + auto const frontcouplerhighvoltage = + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.voltage, 0 ) + + "@" + + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.current, 0 ); + auto const rearcouplerhighvoltage = + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.voltage, 0 ) + + "@" + + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.current, 0 ); + uitextline2 += ", HV: "; + if( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.local == false ) { + uitextline2 += + "(" + frontcouplerhighvoltage + ")-" + + ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:" + + "-(" + rearcouplerhighvoltage + ")"; + } + else { + uitextline2 += + frontcouplerhighvoltage + + ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:" + + rearcouplerhighvoltage; + } #endif // equipment flags uitextline3 = ""; @@ -1855,17 +1872,16 @@ TWorld::Update_UI() { uitextline3 += ( tmp->MoverParameters->CompressorGovernorLock ? "!" : "." ); uitextline3 += - " BP: " + to_string( tmp->MoverParameters->BrakePress, 2 ) - + " (" + to_string( tmp->MoverParameters->BrakeStatus, 0 ) - + "), LBP: " + to_string( tmp->MoverParameters->LocBrakePress, 2 ) - + ", PP: " + to_string( tmp->MoverParameters->PipePress, 2 ) + " TrB: " + to_string( tmp->MoverParameters->BrakePress, 2 ) + + ", " + to_hex_str( tmp->MoverParameters->Hamulec->GetBrakeStatus(), 2 ) + + ", LcB: " + to_string( tmp->MoverParameters->LocBrakePress, 2 ) + + ", pipes: " + to_string( tmp->MoverParameters->PipePress, 2 ) + "/" + to_string( tmp->MoverParameters->ScndPipePress, 2 ) + "/" + to_string( tmp->MoverParameters->EqvtPipePress, 2 ) + ", MT: " + to_string( tmp->MoverParameters->CompressedVolume, 3 ) - + ", BVP: " + to_string( tmp->MoverParameters->Volume, 3 ) - + ", " + to_string( tmp->MoverParameters->CntrlPipePress, 3 ) - + ", " + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ) - + ", " + to_string( tmp->MoverParameters->BrakeStatus, 0 ); + + ", BT: " + to_string( tmp->MoverParameters->Volume, 3 ) + + ", CtlP: " + to_string( tmp->MoverParameters->CntrlPipePress, 3 ) + + ", CtlT: " + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ); if( tmp->MoverParameters->ManualBrakePos > 0 ) { @@ -2579,8 +2595,6 @@ world_environment::update() { keylightintensity = sunlightlevel; // diffuse (sun) intensity goes down after twilight, and reaches minimum 18 degrees below horizon twilightfactor = clamp( -Global::SunAngle, 0.0f, 18.0f ) / 18.0f; - // TODO: crank orange up at dawn/dusk - keylightcolor = float3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); float const duskfactor = 1.0f - clamp( Global::SunAngle, 0.0f, 18.0f ) / 18.0f; keylightcolor = interpolate( float3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), diff --git a/gamepadinput.h b/gamepadinput.h index 21b33cb7..ea7db03e 100644 --- a/gamepadinput.h +++ b/gamepadinput.h @@ -80,7 +80,7 @@ private: glm::vec2 m_leftstick; glm::vec2 m_rightstick; glm::vec2 m_triggers; - double m_modeaccumulator; // used to throttle command input rate for vehicle controls + double m_modeaccumulator{ 0.0 }; // used to throttle command input rate for vehicle controls }; //--------------------------------------------------------------------------- diff --git a/renderer.cpp b/renderer.cpp index afa09dfc..92e0eff5 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -871,9 +871,9 @@ opengl_renderer::Update ( double const Deltatime ) { int targetsegments; float targetfactor; - if( framerate > 65.0 ) { targetsegments = 400; targetfactor = 3.0f; } - else if( framerate > 40.0 ) { targetsegments = 225; targetfactor = 1.5f; } - else if( framerate > 15.0 ) { targetsegments = 90; targetfactor = Global::ScreenHeight / 768.0f; } + if( framerate > 90.0 ) { targetsegments = 400; targetfactor = 3.0f; } + else if( framerate > 60.0 ) { targetsegments = 225; targetfactor = 1.5f; } + else if( framerate > 30.0 ) { targetsegments = 90; targetfactor = Global::ScreenHeight / 768.0f; } else { targetsegments = 9; targetfactor = Global::ScreenHeight / 768.0f * 0.75f; } if( targetsegments > Global::iSegmentsRendered ) { diff --git a/sun.cpp b/sun.cpp index 879709cb..d27e3619 100644 --- a/sun.cpp +++ b/sun.cpp @@ -258,8 +258,6 @@ void cSun::irradiance() { static double degrad = 57.295779513; // converts from radians to degrees static double raddeg = 0.0174532925; // converts from degrees to radians - auto const &localtime = simulation::Time.data(); // time for the calculation - m_body.dayang = ( simulation::Time.year_day() - 1 ) * 360.0 / 365.0; double sd = sin( raddeg * m_body.dayang ); // sine of the day angle double cd = cos( raddeg * m_body.dayang ); // cosine of the day angle or delination From 4977f0da17b9889687c15c5f99e0a5357d4da13e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 5 May 2017 15:09:40 +0200 Subject: [PATCH 096/426] build 170505. stl-based speed table replacement --- Driver.cpp | 980 ++++++++++++++++++++++++++++++++++------------------- Driver.h | 34 +- Train.cpp | 8 +- World.cpp | 10 +- 4 files changed, 668 insertions(+), 364 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index de34adbd..66e6b0b4 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -194,9 +194,27 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) // v.SafeNormalize(); //normalizacja w celu określenia znaku (nie potrzebna?) if (len == 0.0) { // jeżeli liczymy względem pojazdu - double iska = dir ? dir->x * v.x + dir->z * v.z : - fDist; // iloczyn skalarny to rzut na chwilową prostą ruchu - if (iska < 0.0) // iloczyn skalarny jest ujemny, gdy punkt jest z tyłu + double angle; + if( dir ) { + glm::vec3 target{ glm::normalize( glm::make_vec3( &v.x ) ) }; + glm::vec3 direction{ glm::normalize( glm::make_vec3( &dir->x ) ) }; + angle = glm::dot( target, direction ); +// assert( angle < M_PI_2 ); +/* + angle = std::atan2( + glm::length( + glm::cross( + target, + direction ) ), + glm::dot( + target, + direction ) ); +*/ + } + else { + angle = fDist; + } + if (angle < 0.0) // iloczyn skalarny jest ujemny, gdy punkt jest z tyłu { // jeśli coś jest z tyłu, to dokładna odległość nie ma już większego znaczenia fDist = -fDist; // potrzebne do badania wyjechania składem poza ograniczenie if (iFlags & spElapsed) // 32 ustawione, gdy obiekt już został minięty @@ -204,20 +222,27 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) } else { - iFlags ^= spElapsed; // 32-minięty - będziemy liczyć odległość względem przeciwnego końca + // minięty - będziemy liczyć odległość względem przeciwnego końca // toru (nadal może być z przodu i ograniczać) - if ((iFlags & 0x43) == 3) // tylko jeśli (istotny) tor, bo eventy są punktowe - if (trTrack) // może być NULL, jeśli koniec toru (????) + iFlags ^= spElapsed; + if ((iFlags & (spEnd | spTrack | spEnabled)) == (spTrack | spEnabled)) { + // tylko jeśli (istotny) tor, bo eventy są punktowe + if (trTrack) { + // może być NULL, jeśli koniec toru (????) vPos = (iFlags & spReverse) ? trTrack->CurrentSegment()->FastGetPoint_0() : trTrack->CurrentSegment()->FastGetPoint_1(); // drugi koniec istotny + } + } } } +/* else if (fDist < 50.0) // przy dużym kącie łuku iloczyn skalarny bardziej zaniży odległość // niż cięciwa fDist = iska; // ale przy małych odległościach rzut na chwilową prostą ruchu da // dokładniejsze wartości +*/ } if (fDist > 0.0) // nie może być 0.0, a przypadkiem mogło by się trafić i było by źle if ((iFlags & spElapsed) == 0) // 32 ustawione, gdy obiekt już został minięty @@ -297,7 +322,7 @@ std::string TSpeedPos::TableText() if (iFlags & spEnabled) { // o ile pozycja istotna return "Flags:" + to_hex_str(iFlags, 6) + ", Dist:" + to_string(fDist, 1, 6) + - ", Vel:" + (fVelNext == -1.0 ? " * " : to_string(static_cast(fVelNext), 0, 3)) + ", Name:" + GetName(); + ", Vel:" + (fVelNext == -1.0 ? " - " : to_string(static_cast(fVelNext), 0, 3)) + ", Name:" + GetName(); //if (iFlags & spTrack) // jeśli tor // return "Flags=#" + IntToHex(iFlags, 8) + ", Dist=" + FloatToStrF(fDist, ffFixed, 7, 1) + // ", Vel=" + AnsiString(fVelNext) + ", Track=" + trTrack->NameGet(); @@ -373,19 +398,22 @@ void TSpeedPos::Set(TTrack *track, double dist, int flag) } }; -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- //--------------------------------------------------------------------------- void TController::TableClear() { // wyczyszczenie tablicy +#ifdef EU07_USE_OLD_SPEEDTABLE iFirst = iLast = 0; - iTableDirection = 0; // nieznany for (int i = 0; i < iSpeedTableSize; ++i) // czyszczenie tabeli prędkości sSpeedTable[i].Clear(); - tLast = NULL; - fLastVel = -1; - eSignSkip = NULL; // nic nie pomijamy +#else + sSpeedTable.clear(); +#endif + iLast = -1; + iTableDirection = 0; // nieznany + tLast = nullptr; + fLastVel = -1.0; + eSignSkip = nullptr; // nic nie pomijamy }; TEvent * TController::CheckTrackEvent(double fDirection, TTrack *Track) @@ -401,17 +429,23 @@ TEvent * TController::CheckTrackEvent(double fDirection, TTrack *Track) bool TController::TableAddNew() { // zwiększenie użytej tabelki o jeden rekord - iLast = (iLast + 1) % iSpeedTableSize; +#ifdef EU07_USE_OLD_SPEEDTABLE + iLast = ( iLast + 1 ) % iSpeedTableSize; // TODO: jeszcze sprawdzić, czy się na iFirst nie nałoży // TODO: wstawić tu wywołanie odtykacza - teraz jest to w TableTraceRoute() // TODO: jeśli ostatnia pozycja zajęta, ustawiać dodatkowe flagi - teraz jest to w // TableTraceRoute() // TODO: przydało by się też posortować tabelkę wg odległości (ale nie w tym miejscu) +#else + sSpeedTable.emplace_back(); // add a new slot + iLast = sSpeedTable.size() - 1; +#endif return true; // false gdy się nałoży }; -bool TController::TableNotFound(TEvent *e) +bool TController::TableNotFound(TEvent const *Event) const { // sprawdzenie, czy nie został już dodany do tabelki (np. podwójne W4 robi problemy) +#ifdef EU07_USE_OLD_SPEEDTABLE int j = (iLast + 1) % iSpeedTableSize; // j, aby sprawdzić też ostatnią pozycję for (int i = iFirst; i != j; i = (i + 1) % iSpeedTableSize) if ((sSpeedTable[i].iFlags & (spEnabled | spEvent)) == (spEnabled | @@ -423,42 +457,59 @@ bool TController::TableNotFound(TEvent *e) return false; // już jest, drugi raz dodawać nie ma po co } return true; // nie ma, czyli można dodać +#else + auto lookup = std::find_if( + sSpeedTable.begin(), + sSpeedTable.end(), + [Event]( TSpeedPos const &speedpoint ){ + return ( ( true == TestFlag( speedpoint.iFlags, spEnabled | spEvent ) ) + && ( speedpoint.evEvent == Event ) ); } ); + + if( ( Global::iWriteLogEnabled & 8 ) + && ( lookup != sSpeedTable.end() ) ) { + WriteLog( "Speed table for " + OwnerName() + " already contains event " + lookup->evEvent->asName ); + } + + return lookup == sSpeedTable.end(); +#endif }; void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) { // skanowanie trajektorii na odległość (fDistance) od (pVehicle) w kierunku przodu składu i // uzupełnianie tabelki // WriteLog("Starting TableTraceRoute"); - if (!iDirection) // kierunek pojazdu z napędem - { // jeśli kierunek jazdy nie jest okreslony - iTableDirection = 0; // czekamy na ustawienie kierunku - } - TTrack *pTrack; // zaczynamy od ostatniego analizowanego toru - // double fDistChVel=-1; //odległość do toru ze zmianą prędkości - double fTrackLength; // długość aktualnego toru (krótsza dla pierwszego) - double fCurrentDistance; // aktualna przeskanowana długość - TEvent *pEvent; - double fLastDir; // kierunek na ostatnim torze - if (iTableDirection != iDirection) - { // jeśli zmiana kierunku, zaczynamy od toru ze wskazanym pojazdem + + TTrack *pTrack{ nullptr }; // zaczynamy od ostatniego analizowanego toru + double fTrackLength{ 0.0 }; // długość aktualnego toru (krótsza dla pierwszego) + double fCurrentDistance{ 0.0 }; // aktualna przeskanowana długość + TEvent *pEvent{ nullptr }; + double fLastDir{ 0.0 }; + + if (iTableDirection != iDirection) { + // jeśli zmiana kierunku, zaczynamy od toru ze wskazanym pojazdem + iTableDirection = iDirection; // ustalenie w jakim kierunku jest wypełniana tabelka względem pojazdu pTrack = pVehicle->RaTrackGet(); // odcinek, na którym stoi - fLastDir = pVehicle->DirectionGet() * - pVehicle->RaDirectionGet(); // ustalenie kierunku skanowania na torze - fCurrentDistance = 0; // na razie nic nie przeskanowano fTrackLength = pVehicle->RaTranslationGet(); // pozycja na tym torze (odległość od Point1) - if (fLastDir > 0) // jeśli w kierunku Point2 toru - fTrackLength = - pTrack->Length() - fTrackLength; // przeskanowana zostanie odległość do Point2 + fLastDir = pVehicle->DirectionGet() * pVehicle->RaDirectionGet(); // ustalenie kierunku skanowania na torze + if( fLastDir > 0.0 ) { + // jeśli w kierunku Point2 toru + fTrackLength = pTrack->Length() - fTrackLength; // przeskanowana zostanie odległość do Point2 + } fLastVel = pTrack->VelocityGet(); // aktualna prędkość - iTableDirection = - iDirection; // ustalenie w jakim kierunku jest wypełniana tabelka względem pojazdu +#ifdef EU07_USE_OLD_SPEEDTABLE iFirst = iLast = 0; - tLast = NULL; //żaden nie sprawdzony +#endif + sSpeedTable.clear(); + iLast = -1; + tLast = nullptr; //żaden nie sprawdzony + SemNextIndex = -1; + SemNextStopIndex = -1; } - else - { // kontynuacja skanowania od ostatnio sprawdzonego toru (w ostatniej pozycji zawsze jest tor) + else { + // kontynuacja skanowania od ostatnio sprawdzonego toru (w ostatniej pozycji zawsze jest tor) // WriteLog("TableTraceRoute: check last track"); - if (sSpeedTable[iLast].iFlags & spEndOfTable) // zatkanie +#ifdef EU07_USE_OLD_SPEEDTABLE + if( sSpeedTable[ iLast ].iFlags & spEndOfTable ) // zatkanie { // jeśli zapełniła się tabelka if ((iLast + 1) % iSpeedTableSize == iFirst) // jeśli nadal jest zapełniona { @@ -474,22 +525,38 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) } sSpeedTable[iLast].iFlags &= 0xBE; // kontynuować próby doskanowania } - // znaleziono semafor lub tarczę lub tor z prędkością zero - // trzeba sprawdzić czy to nadał semafor - // WriteLog("TableTraceRoute: "+OwnerName()+" check semaphor... "); - // if (sSemNext) - // WriteLog(sSemNext->TableText()); - if (sSemNextStop && - sSemNextStop->fVelNext == - 0.0) // jeśli jest następny semafor to sprawdzamy czy to on nadał zero - { - // WriteLog("TableTraceRoute: "+sSemNext->TableText()); - if ((OrderCurrentGet() & Obey_train) && (sSemNextStop->iFlags & spSemaphor)) - return; - else if ((OrderCurrentGet() < 0x40) && - (sSemNextStop->iFlags & (spSemaphor | spShuntSemaphor | spOutsideStation))) +#endif + // znaleziono semafor lub tarczę lub tor z prędkością zero, trzeba sprawdzić czy to nadał semafor +#ifdef EU07_USE_OLD_SPEEDTABLE + if( ( sSemNextStop != nullptr ) + && ( sSemNextStop->fVelNext < 1.0 ) ) { +#else + if( ( SemNextStopIndex != -1 ) + && ( sSpeedTable[SemNextStopIndex].fVelNext < 1.0 ) ) { +#endif + // jeśli jest następny semafor to sprawdzamy czy to on nadał zero +#ifdef EU07_USE_OLD_SPEEDTABLE + if( ( OrderCurrentGet() & Obey_train ) + && ( sSemNextStop->iFlags & spSemaphor ) ) { +#else + if( ( OrderCurrentGet() & Obey_train ) + && ( sSpeedTable[SemNextStopIndex].iFlags & spSemaphor ) ) { +#endif return; + } + else { +#ifdef EU07_USE_OLD_SPEEDTABLE + if( ( OrderCurrentGet() < 0x40 ) + && ( sSemNextStop->iFlags & ( spSemaphor | spShuntSemaphor | spOutsideStation ) ) ) { +#else + if( ( OrderCurrentGet() < 0x40 ) + && ( sSpeedTable[SemNextStopIndex].iFlags & ( spSemaphor | spShuntSemaphor | spOutsideStation ) ) ) { +#endif + return; + } + } } +#ifdef EU07_USE_OLD_SPEEDTABLE pTrack = sSpeedTable[iLast].trTrack; // ostatnio sprawdzony tor if (!pTrack) return; // koniec toru, to nie ma co sprawdzać (nie ma prawa tak być) @@ -498,217 +565,305 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) fTrackLength = (sSpeedTable[iLast].iFlags & (spElapsed | spEnd)) ? 0.0 : pTrack->Length(); // nie dolicza� d�ugo�ci gdy: // 32-minięty początek, // 64-jazda do końca toru +#else + auto const &lastspeedpoint = sSpeedTable[ iLast ]; + pTrack = lastspeedpoint.trTrack; + assert( pTrack != nullptr ); + // flaga ustawiona, gdy Point2 toru jest blizej + fLastDir = ( + TestFlag( lastspeedpoint.iFlags, spReverse ) ? + -1.0 : + 1.0 ); + // aktualna odleglosc do jego Point1 + fCurrentDistance = lastspeedpoint.fDist; + // nie doliczac dlugosci gdy: miniety początek lub jazda do konca toru + fTrackLength = ( + ( lastspeedpoint.iFlags & ( spElapsed | spEnd ) != 0 ) ? + 0.0 : + pTrack->Length() ); +#endif } - if (fCurrentDistance < fDistance) - { // jeśli w ogóle jest po co analizować - // WriteLog("TableTraceRoute: checking next tracks"); - --iLast; // jak coś się znajdzie, zostanie wpisane w tę pozycję, którą właśnie odczytano - while (fCurrentDistance < fDistance) - { - if (pTrack != tLast) // ostatni zapisany w tabelce nie był jeszcze sprawdzony - { // jeśli tor nie był jeszcze sprawdzany - // if (pTrack) - // WriteLog("TableTraceRoute: " + OwnerName() + " checking track " + - // pTrack->NameGet()); - if ((pEvent = CheckTrackEvent(fLastDir, pTrack)) != - NULL) // jeśli jest semafor na tym torze - { // trzeba sprawdzić tabelkę, bo dodawanie drugi raz tego samego przystanku nie - // jest korzystne - if (TableNotFound(pEvent)) // jeśli nie ma - if (TableAddNew()) + + if( fCurrentDistance >= fDistance ) { + // all done + return; + } + +#ifdef EU07_USE_OLD_SPEEDTABLE + // jak coś się znajdzie, zostanie wpisane w tę pozycję, którą właśnie odczytano + --iLast; +#endif + + while (fCurrentDistance < fDistance) + { + if (pTrack != tLast) // ostatni zapisany w tabelce nie był jeszcze sprawdzony + { // jeśli tor nie był jeszcze sprawdzany + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "Speed table for " + OwnerName() + " tracing through track " + pTrack->NameGet() ); + } + + if( ( pEvent = CheckTrackEvent( fLastDir, pTrack ) ) != nullptr ) // jeśli jest semafor na tym torze + { // trzeba sprawdzić tabelkę, bo dodawanie drugi raz tego samego przystanku nie jest korzystne + if (TableNotFound(pEvent)) // jeśli nie ma + if( TableAddNew() ) + { + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "Speed table for " + OwnerName() + " found new event, " + pEvent->asName ); + } +#ifdef EU07_USE_OLD_SPEEDTABLE + if( sSpeedTable[ iLast ].Set( pEvent, fCurrentDistance, OrderCurrentGet() ) ) // dodanie odczytu sygnału { + fDistance = fCurrentDistance; // jeśli sygnał stop, to nie ma + // potrzeby dalej skanować + sSemNextStop = &sSpeedTable[iLast]; + if (!sSemNext) + sSemNext = &sSpeedTable[iLast]; if (Global::iWriteLogEnabled & 8) - WriteLog("TableTraceRoute: new event found " + pEvent->asName + " by " + OwnerName()); - if (sSpeedTable[iLast].Set( pEvent, fCurrentDistance, OrderCurrentGet())) // dodanie odczytu sygnału + WriteLog("Signal stop. Next Semaphor ", false); + if (sSemNextStop) { - fDistance = fCurrentDistance; // jeśli sygnał stop, to nie ma - // potrzeby dalej skanować - sSemNextStop = &sSpeedTable[iLast]; - if (!sSemNext) - sSemNext = &sSpeedTable[iLast]; if (Global::iWriteLogEnabled & 8) - WriteLog("Signal stop. Next Semaphor ", false); - if (sSemNextStop) - { - if (Global::iWriteLogEnabled & 8) - WriteLog(sSemNextStop->GetName()); - } - else - { - if (Global::iWriteLogEnabled & 8) - WriteLog("none"); - } + WriteLog(sSemNextStop->GetName()); } else { - if (sSpeedTable[iLast].IsProperSemaphor(OrderCurrentGet()) && - sSemNext == NULL) - sSemNext = - &sSpeedTable[iLast]; // sprawdzamy czy pierwszy na drodze if (Global::iWriteLogEnabled & 8) - WriteLog("Signal forward. Next Semaphor ", false); - if (sSemNext) - { - if (Global::iWriteLogEnabled & 8) - WriteLog(sSemNext->GetName()); - } - else - { - if (Global::iWriteLogEnabled & 8) - WriteLog("none"); - } + WriteLog("none"); } } - } // event dodajemy najpierw, żeby móc sprawdzić, czy tor został dodany po - // odczytaniu prędkości następnego - if ((pTrack->VelocityGet() == 0.0) // zatrzymanie - || (pTrack->iAction) // jeśli tor ma własności istotne dla skanowania - || (pTrack->VelocityGet() != fLastVel)) // następuje zmiana prędkości - { // odcinek dodajemy do tabelki, gdy jest istotny dla ruchu - if (TableAddNew()) - { // teraz dodatkowo zapamiętanie wybranego segmentu dla skrzyżowania - sSpeedTable[iLast].Set( - pTrack, fCurrentDistance, - fLastDir < 0 ? - 5 : - 1); // dodanie odcinka do tabelki z flagą kierunku wejścia - if (pTrack->eType == tt_Cross) // na skrzyżowaniach trzeba wybrać segment, - // po którym pojedzie pojazd - { // dopiero tutaj jest ustalany kierunek segmentu na skrzyżowaniu - sSpeedTable[iLast].iFlags |= - (pTrack->CrossSegment((fLastDir < 0) ? tLast->iPrevDirection : - tLast->iNextDirection, - iRouteWanted) & - 15) - << 28; // ostatnie 4 bity pola flag - sSpeedTable[iLast].iFlags &= - ~spReverse; // usunięcie flagi kierunku, bo może być błędna - if (sSpeedTable[iLast].iFlags < 0) - sSpeedTable[iLast].iFlags |= - spReverse; // ustawienie flagi kierunku na podstawie wybranego segmentu - if (int(fLastDir) * sSpeedTable[iLast].iFlags < 0) - fLastDir = -fLastDir; - if (AIControllFlag) // dla AI na razie losujemy kierunek na kolejnym - // skrzyżowaniu - iRouteWanted = 1 + Random(3); + else { + if( sSpeedTable[ iLast ].IsProperSemaphor( OrderCurrentGet() ) && + sSemNext == NULL ) + sSemNext = + &sSpeedTable[ iLast ]; // sprawdzamy czy pierwszy na drodze + if( Global::iWriteLogEnabled & 8 ) + WriteLog( "Signal forward. Next Semaphor ", false ); + if( sSemNext ) { + if( Global::iWriteLogEnabled & 8 ) + WriteLog( sSemNext->GetName() ); + } + else { + if( Global::iWriteLogEnabled & 8 ) + WriteLog( "none" ); + } + } +#else + auto &newspeedpoint = sSpeedTable[ iLast ]; + if( newspeedpoint.Set( pEvent, fCurrentDistance, OrderCurrentGet() ) ) { + + fDistance = fCurrentDistance; // jeśli sygnał stop, to nie ma potrzeby dalej skanować +#ifdef EU07_USE_OLD_SPEEDTABLE + sSemNextStop = &newspeedpoint; + if( sSemNext == nullptr ) { + sSemNext = &newspeedpoint; + } + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "(stop signal from " + + ( sSemNextStop ? sSemNextStop->GetName() : "unknown semaphor" ) + + ")" ); + } +#else + SemNextStopIndex = iLast; + if( SemNextIndex == -1 ) { + SemNextIndex = iLast; + } + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "(stop signal from " + + ( SemNextStopIndex != -1 ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor" ) + + ")" ); + } +#endif + } + else { +#ifdef EU07_USE_OLD_SPEEDTABLE + if( ( true == newspeedpoint.IsProperSemaphor( OrderCurrentGet() ) ) + && ( sSemNext == nullptr ) ) { + sSemNext = &newspeedpoint; // sprawdzamy czy pierwszy na drodze + } + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "(forward signal for " + + ( sSemNext ? sSemNext->GetName() : "unknown semaphor" ) + + ")" ); + } +#else + if( ( true == newspeedpoint.IsProperSemaphor( OrderCurrentGet() ) ) + && ( SemNextIndex == -1 ) ) { + SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze + } + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "(forward signal for " + + ( SemNextIndex != -1 ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor" ) + + ")" ); + } +#endif + } +#endif + } + } // event dodajemy najpierw, żeby móc sprawdzić, czy tor został dodany po odczytaniu prędkości następnego + + if ((pTrack->VelocityGet() == 0.0) // zatrzymanie + || (pTrack->iAction) // jeśli tor ma własności istotne dla skanowania + || (pTrack->VelocityGet() != fLastVel)) // następuje zmiana prędkości + { // odcinek dodajemy do tabelki, gdy jest istotny dla ruchu + if (TableAddNew()) + { // teraz dodatkowo zapamiętanie wybranego segmentu dla skrzyżowania + sSpeedTable[ iLast ].Set( + pTrack, fCurrentDistance, + ( fLastDir < 0 ? + spEnabled | spReverse : + spEnabled ) ); // dodanie odcinka do tabelki z flagą kierunku wejścia + if (pTrack->eType == tt_Cross) { + // na skrzyżowaniach trzeba wybrać segment, po którym pojedzie pojazd + // dopiero tutaj jest ustalany kierunek segmentu na skrzyżowaniu + sSpeedTable[iLast].iFlags |= + ( ( pTrack->CrossSegment( + ( fLastDir < 0 ? + tLast->iPrevDirection : + tLast->iNextDirection ), + iRouteWanted ) & 0xf ) << 28 ); // ostatnie 4 bity pola flag + sSpeedTable[iLast].iFlags &= ~spReverse; // usunięcie flagi kierunku, bo może być błędna + if( sSpeedTable[ iLast ].iFlags < 0 ) { + sSpeedTable[ iLast ].iFlags |= spReverse; // ustawienie flagi kierunku na podstawie wybranego segmentu + } + if( int( fLastDir ) * sSpeedTable[ iLast ].iFlags < 0 ) { + fLastDir = -fLastDir; + } + if( AIControllFlag ) { + // dla AI na razie losujemy kierunek na kolejnym skrzyżowaniu + iRouteWanted = 1 + Random( 3 ); } } } - else if ((pTrack->fRadius != 0.0) // odległość na łuku lepiej aproksymować cięciwami - || (tLast ? tLast->fRadius != 0.0 : false)) // koniec łuku też jest istotny - { // albo dla liczenia odległości przy pomocy cięciw - te usuwać po przejechaniu - if (TableAddNew()) - sSpeedTable[iLast].Set(pTrack, fCurrentDistance, - fLastDir < 0 ? 0x85 : - 0x81); // dodanie odcinka do tabelki - // 0x85 = spEnabled, spReverse, SpCurve + } + else if ( ( pTrack->fRadius != 0.0 ) // odległość na łuku lepiej aproksymować cięciwami + || ( ( tLast != nullptr ) + && ( tLast->fRadius != 0.0 ) )) // koniec łuku też jest istotny + { // albo dla liczenia odległości przy pomocy cięciw - te usuwać po przejechaniu + if (TableAddNew()) + sSpeedTable[iLast].Set( + pTrack, fCurrentDistance, + ( fLastDir < 0 ? + spEnabled | spCurve | spReverse : + spEnabled | spCurve ) ); // dodanie odcinka do tabelki + } + } + + fCurrentDistance += fTrackLength; // doliczenie kolejnego odcinka do przeskanowanej długości + tLast = pTrack; // odhaczenie, że sprawdzony + fLastVel = pTrack->VelocityGet(); // prędkość na poprzednio sprawdzonym odcinku + pTrack = pTrack->Neightbour( + ( pTrack->eType == tt_Cross ? + (sSpeedTable[iLast].iFlags >> 28) : + static_cast(fLastDir) ), + fLastDir); // może być NULL + + if (pTrack != nullptr ) + { // jeśli kolejny istnieje + if( tLast != nullptr ) { + if( ( pTrack->VelocityGet() < 0 ? + tLast->VelocityGet() > 0 : + pTrack->VelocityGet() > tLast->VelocityGet() ) ) { + // jeśli kolejny ma większą prędkość niż poprzedni, to zapamiętać poprzedni (do czasu wyjechania) + if( ( ( ( iLast != -1 ) + && ( TestFlag( sSpeedTable[ iLast ].iFlags, spEnabled | spTrack ) ) ) ? + ( sSpeedTable[ iLast ].trTrack != tLast ) : + true ) ) { + // jeśli nie był dodany do tabelki + if( TableAddNew() ) { + // zapisanie toru z ograniczeniem prędkości + sSpeedTable[ iLast ].Set( + tLast, fCurrentDistance, + ( fLastDir > 0 ? + pTrack->iPrevDirection : + pTrack->iNextDirection ) ? + spEnabled : + spEnabled | spReverse ); + } + } } } - fCurrentDistance += - fTrackLength; // doliczenie kolejnego odcinka do przeskanowanej długości - tLast = pTrack; // odhaczenie, że sprawdzony - // Track->ScannedFlag=true; //do pokazywania przeskanowanych torów - fLastVel = pTrack->VelocityGet(); // prędkość na poprzednio sprawdzonym odcinku - pTrack = pTrack->Neightbour( - (pTrack->eType == tt_Cross) ? (sSpeedTable[iLast].iFlags >> 28) : int(fLastDir), - fLastDir); // może być NULL - /* - if (fLastDir>0) - {//jeśli szukanie od Point1 w kierunku Point2 - pTrack=pTrack->CurrentNext(); //może być NULL - if (pTrack) //jeśli dalej brakuje toru, to zostajemy na tym samym, z tą samą - orientacją - if (tLast->iNextDirection) - fLastDir=-fLastDir; //można by zamiętać i zmienić tylko jeśli jest pTrack - } - else //if (fDirection<0) - {//jeśli szukanie od Point2 w kierunku Point1 - pTrack=pTrack->CurrentPrev(); //może być NULL - if (pTrack) //jeśli dalej brakuje toru, to zostajemy na tym samym, z tą samą - orientacją - if (!tLast->iPrevDirection) - fLastDir=-fLastDir; - } - */ - if (pTrack) - { // jeśli kolejny istnieje - if (tLast) - if (pTrack->VelocityGet() < 0 ? tLast->VelocityGet() > 0 : - pTrack->VelocityGet() > tLast->VelocityGet()) - { // jeśli kolejny ma większą prędkość niż poprzedni, to zapamiętać poprzedni - // (do czasu wyjechania) - if ((sSpeedTable[iLast].iFlags & 3) == 3 ? - (sSpeedTable[iLast].trTrack != tLast) : - true) // jeśli nie był dodany do tabelki - if (TableAddNew()) - sSpeedTable[iLast].Set( - tLast, fCurrentDistance, - (fLastDir > 0 ? pTrack->iPrevDirection : - pTrack->iNextDirection) ? - 1 : - 5); // zapisanie toru z ograniczeniem prędkości - } +#ifdef EU07_USE_OLD_SPEEDTABLE + if( ( ( iLast + 3 ) % iSpeedTableSize == iFirst ) ? + true : + ((iLast + 2) % iSpeedTableSize == iFirst)) // czy tabelka się nie zatka? + { // jest ryzyko nieznalezienia ograniczenia - ograniczyć prędkość do pozwalającej + // na zatrzymanie na końcu przeskanowanej drogi + TablePurger(); // usunąć pilnie zbędne pozycje if (((iLast + 3) % iSpeedTableSize == iFirst) ? true : ((iLast + 2) % iSpeedTableSize == iFirst)) // czy tabelka się nie zatka? - { // jest ryzyko nieznalezienia ograniczenia - ograniczyć prędkość do pozwalającej - // na zatrzymanie na końcu przeskanowanej drogi - TablePurger(); // usunąć pilnie zbędne pozycje - if (((iLast + 3) % iSpeedTableSize == iFirst) ? - true : - ((iLast + 2) % iSpeedTableSize == iFirst)) // czy tabelka się nie zatka? - { // jeśli odtykacz nie pomógł (TODO: zwiększyć rozmiar tabelki) - if (TableAddNew()) - sSpeedTable[iLast].Set( - pTrack, fCurrentDistance, - fLastDir < 0 ? - 0x10045 : - 0x10041); // zapisanie toru jako końcowego (ogranicza prędkosć) - // zapisać w logu, że należy poprawić scenerię? - return; // nie skanujemy dalej, bo nie ma miejsca - } + { // jeśli odtykacz nie pomógł (TODO: zwiększyć rozmiar tabelki) + if (TableAddNew()) + sSpeedTable[iLast].Set( + pTrack, fCurrentDistance, + fLastDir < 0 ? + 0x10045 : + 0x10041); // zapisanie toru jako końcowego (ogranicza prędkosć) + // zapisać w logu, że należy poprawić scenerię? + return; // nie skanujemy dalej, bo nie ma miejsca } - fTrackLength = pTrack->Length(); // zwiększenie skanowanej odległości tylko jeśli - // istnieje dalszy tor } - else - { // definitywny koniec skanowania, chyba że dalej puszczamy samochód po gruncie... - if (TableAddNew()) // kolejny, bo się cofnęliśmy o 1 +#endif + // zwiększenie skanowanej odległości tylko jeśli istnieje dalszy tor + fTrackLength = pTrack->Length(); + } + else + { // definitywny koniec skanowania, chyba że dalej puszczamy samochód po gruncie... + if( ( iLast == -1 ) + || ( false == TestFlag( sSpeedTable[iLast].iFlags, spEnabled | spEnd ) ) ) { + // only if we haven't already marked end of the track + if( TableAddNew() ) sSpeedTable[iLast].Set( tLast, fCurrentDistance, - fLastDir < 0 ? 0x45 : 0x41); // zapisanie ostatniego sprawdzonego toru - return; // to ostatnia pozycja, bo NULL nic nie da, a może się podpiąć obrotnica, - // czy jakieś transportery + ( fLastDir < 0 ? + spEnabled | spEnd | spReverse : + spEnabled | spEnd )); // zapisanie ostatniego sprawdzonego toru } + // to ostatnia pozycja, bo NULL nic nie da, a może się podpiąć obrotnica, czy jakieś transportery + return; } - if (TableAddNew()) - sSpeedTable[iLast].Set(pTrack, fCurrentDistance, - fLastDir < 0 ? 4 : 0); // zapisanie ostatniego sprawdzonego toru + } + if( TableAddNew() ) { + // zapisanie ostatniego sprawdzonego toru + sSpeedTable[ iLast ].Set( + pTrack, fCurrentDistance, + ( fLastDir < 0 ? + spNone | spReverse : + spNone ) ); } }; void TController::TableCheck(double fDistance) { // przeliczenie odległości w tabelce, ewentualnie doskanowanie (bez analizy prędkości itp.) - if (iTableDirection != iDirection) - TableTraceRoute(fDistance, - pVehicles[1]); // jak zmiana kierunku, to skanujemy od końca składu + if( iTableDirection != iDirection ) { + // jak zmiana kierunku, to skanujemy od końca składu + TableTraceRoute( fDistance, pVehicles[ 1 ] ); + } else if (iTableDirection) { // trzeba sprawdzić, czy coś się zmieniło - vector3 dir = - pVehicles[0]->VectorFront() * pVehicles[0]->DirectionGet(); // wektor kierunku jazdy + vector3 dir = pVehicles[0]->VectorFront() * pVehicles[0]->DirectionGet(); // wektor kierunku jazdy vector3 pos = pVehicles[0]->HeadPosition(); // zaczynamy od pozycji pojazdu - // double lastspeed=-1; //prędkość na torze do usunięcia double len = 0.0; // odległość będziemy zliczać narastająco +#ifdef EU07_USE_OLD_SPEEDTABLE for (int i = iFirst; i != iLast; i = (i + 1) % iSpeedTableSize) +#else + assert( iLast == sSpeedTable.size() - 1 ); + for( int i = 0; i <= iLast; ++i ) +#endif { // aktualizacja rekordów z wyjątkiem ostatniego if (sSpeedTable[i].iFlags & spEnabled) // jeśli pozycja istotna { if (sSpeedTable[i].Update(&pos, &dir, len)) { - if (Global::iWriteLogEnabled & 8) - WriteLog("TableCheck: Switch change. Delete next entries. (" + sSpeedTable[i].trTrack->NameGet() + ")"); - int k = (iLast + 1) % iSpeedTableSize; // skanujemy razem z ostatnią pozycją - for (int j = (i+1) % iSpeedTableSize; j != k; j = (j + 1) % iSpeedTableSize) + if( Global::iWriteLogEnabled & 8 ) { +/* + WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->NameGet() + " (deleting subsequent records)" ); +*/ + WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->NameGet() + " (generating fresh trace)" ); + } +#ifdef EU07_USE_OLD_SPEEDTABLE + int k = ( iLast + 1 ) % iSpeedTableSize; // skanujemy razem z ostatnią pozycją + for (int j = (i+1) % iSpeedTableSize; j != k; j = (j + 1) % iSpeedTableSize) { // kasowanie wszystkich rekordów za zmienioną zwrotnicą if (Global::iWriteLogEnabled & 8) WriteLog("TableCheck: Delete from table: " + sSpeedTable[j].GetName()); @@ -718,69 +873,87 @@ void TController::TableCheck(double fDistance) if (&sSpeedTable[j] == sSemNextStop) sSemNextStop = NULL; // przy kasowaniu tabelki zrzucamy także semafor } +#else +/* + while( iLast > i ) { + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "Speed table for" + OwnerName() + " deleting record " + sSpeedTable[ iLast ].GetName() ); + } + // przy kasowaniu tabelki zrzucamy także semafor + if( sSemNext == &sSpeedTable[ iLast ] ) { + sSemNext = nullptr; + } + if( sSemNextStop == &sSpeedTable[ iLast ] ) { + sSemNextStop = nullptr; + } + sSpeedTable.pop_back(); + --iLast; + } + + tLast = sSpeedTable[ i ].trTrack; if (Global::iWriteLogEnabled & 8) { - WriteLog("TableCheck: Delete entries OK."); - WriteLog("TableCheck: New last element: " + sSpeedTable[i].GetName()); + WriteLog( "Speed table for" + OwnerName() + " has new last element, " + sSpeedTable[i].GetName() ); } - iLast = i; // pokazujemy gdzie jest ostatni kawałek +*/ + // NOTE: alternative to the above, dirty trick to perform scan from the beginning + // a workaround for current routines not preserving properly scan distance if started from the middle + // and the scan extending far beyond specified limit + iTableDirection = -iDirection; + TableTraceRoute( fDistance, pVehicles[ 1 ] ); +#endif +#ifdef EU07_USE_OLD_SPEEDTABLE + iLast = i; // pokazujemy gdzie jest ostatni kawałek +#endif break; // nie kontynuujemy pętli, trzeba doskanować ciąg dalszy } if (sSpeedTable[i].iFlags & spTrack) // jeśli odcinek { if (sSpeedTable[i].fDist < -fLength) // a skład wyjechał całą długością poza { // degradacja pozycji - // WriteLog( "TableCheck: Track is behind. Delete from table: " + sSpeedTable[i].trTrack->NameGet()); sSpeedTable[i].iFlags &= ~spEnabled; // nie liczy się } - else if ((sSpeedTable[i].iFlags & 0xF0000028) == - spElapsed) // jest z tyłu (najechany) i nie jest zwrotnicą ani skrzyżowaniem - if (sSpeedTable[i].fVelNext < 0) // a nie ma ograniczenia prędkości + else if( ( sSpeedTable[ i ].iFlags & 0xF0000028 ) == spElapsed ) { + // jest z tyłu (najechany) i nie jest zwrotnicą ani skrzyżowaniem + if( sSpeedTable[ i ].fVelNext < 0 ) // a nie ma ograniczenia prędkości { - sSpeedTable[i].iFlags = - 0; // to nie ma go po co trzymać (odtykacz usunie ze środka) - // WriteLog("TableCheck: Track without speed. Delete from table: " + sSpeedTable[i].trTrack->NameGet()); + sSpeedTable[ i ].iFlags = 0; // to nie ma go po co trzymać (odtykacz usunie ze środka) } + } } else if (sSpeedTable[i].iFlags & spEvent) // jeśli event { - if (sSpeedTable[i].fDist < (sSpeedTable[i].evEvent->Type == tp_PutValues ? - -fLength : - 0)) // jeśli jest z tyłu + if (sSpeedTable[i].fDist < ( + sSpeedTable[i].evEvent->Type == tp_PutValues ? + -fLength : + 0)) // jeśli jest z tyłu if ((mvOccupied->CategoryFlag & 1) ? false : sSpeedTable[i].fDist < -fLength) - { // pociąg staje zawsze, a samochód tylko jeśli nie przejedzie całą - // długością (może być zaskoczony zmianą) + { // pociąg staje zawsze, a samochód tylko jeśli nie przejedzie całą długością (może być zaskoczony zmianą) // WriteLog("TableCheck: Event is behind. Delete from table: " + sSpeedTable[i].evEvent->asName); - sSpeedTable[i].iFlags &= ~1; // degradacja pozycji dla samochodu; - // semafory usuwane tylko przy sprawdzaniu, - // bo wysyłają komendy + sSpeedTable[i].iFlags &= ~spEnabled; // degradacja pozycji dla samochodu; + // semafory usuwane tylko przy sprawdzaniu, bo wysyłają komendy } } - // if (sSpeedTable[i].fDist<-20.0*fLength) //jeśli to coś jest 20 razy dalej niż - // długość składu - //{sSpeedTable[i].iFlags&=~1; //to jest to jakby błąd w scenerii - // //WriteLog("Error: too distant object in scan table"); - //} - // if (sSpeedTable[i].fDist>20.0*fLength) //jeśli to coś jest 20 razy dalej niż - // długość składu - //{sSpeedTable[i].iFlags&=~1; //to jest to jakby błąd w scenerii - // //WriteLog("Error: too distant object in scan table"); - //} } - if (i == iFirst) // jeśli jest pierwszą pozycją tabeli +#ifdef EU07_USE_OLD_SPEEDTABLE + if( i == iFirst ) // jeśli jest pierwszą pozycją tabeli { // pozbycie się początkowej pozycji - if ((sSpeedTable[i].iFlags & 1) == - 0) // jeśli pozycja istotna (po Update() może się zmienić) + if ((sSpeedTable[i].iFlags & spEnabled) == 0) // jeśli pozycja istotna (po Update() może się zmienić) // if (iFirst!=iLast) //ostatnia musi zostać - to załatwia for() - iFirst = (iFirst + 1) % - iSpeedTableSize; // kolejne sprawdzanie będzie już od następnej pozycji + iFirst = (iFirst + 1) % iSpeedTableSize; // kolejne sprawdzanie będzie już od następnej pozycji } +#endif } sSpeedTable[iLast].Update(&pos, &dir, len); // aktualizacja ostatniego // WriteLog("TableCheck: Upate last track. Dist=" + AnsiString(sSpeedTable[iLast].fDist)); - if (sSpeedTable[iLast].fDist < fDistance) - TableTraceRoute(fDistance, pVehicles[1]); // doskanowanie dalszego odcinka + if( sSpeedTable[ iLast ].fDist < fDistance ) { + TableTraceRoute( fDistance, pVehicles[ 1 ] ); // doskanowanie dalszego odcinka + } +#ifndef EU07_USE_OLD_SPEEDTABLE + // garbage collection + TablePurger(); +#endif } }; @@ -796,12 +969,17 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN double d_to_next_sem = 10000.0; //ustaiwamy na pewno dalej niż widzi AI TCommandType go = cm_Unknown; eSignNext = NULL; + // te flagi są ustawiane tutaj, w razie potrzeby + iDrivigFlags &= ~(moveTrackEnd | moveSwitchFound | moveSemaphorFound | moveSpeedLimitFound); + +#ifdef EU07_USE_OLD_SPEEDTABLE int i, k = iLast - iFirst + 1; if (k < 0) k += iSpeedTableSize; // ilość pozycji do przeanalizowania - iDrivigFlags &= ~(moveTrackEnd | moveSwitchFound | moveSemaphorFound | - moveSpeedLimitFound); // te flagi są ustawiane tutaj, w razie potrzeby for (i = iFirst; k > 0; --k, i = (i + 1) % iSpeedTableSize) +#else + for( std::size_t i = 0; i < sSpeedTable.size(); ++i ) +#endif { // sprawdzenie rekordów od (iFirst) do (iLast), o ile są istotne if (sSpeedTable[i].iFlags & spEnabled) // badanie istotności { // o ile dana pozycja tabelki jest istotna @@ -810,21 +988,20 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // first 19 chars of the command is expected to be "PassengerStopPoint:" so we skip them if ( ToLower(sSpeedTable[i].evEvent->CommandGet()).compare( 19, sizeof(asNextStop), ToLower(asNextStop)) != 0 ) { // jeśli nazwa nie jest zgodna - if (sSpeedTable[i].fDist < -fLength) // jeśli został przejechany - sSpeedTable[i].iFlags = - 0; // to można usunąć (nie mogą być usuwane w skanowaniu) + if( sSpeedTable[ i ].fDist < -fLength ) { + // jeśli został przejechany + sSpeedTable[ i ].iFlags = 0; // to można usunąć (nie mogą być usuwane w skanowaniu) + } continue; // ignorowanie jakby nie było tej pozycji } - else if (iDrivigFlags & - moveStopPoint) // jeśli pomijanie W4, to nie sprawdza czasu odjazdu + else if (iDrivigFlags & moveStopPoint) // jeśli pomijanie W4, to nie sprawdza czasu odjazdu { // tylko gdy nazwa zatrzymania się zgadza if (!TrainParams->IsStop()) { // jeśli nie ma tu postoju sSpeedTable[i].fVelNext = -1; // maksymalna prędkość w tym miejscu - if (sSpeedTable[i].fDist < - 200.0) // przy 160km/h jedzie 44m/s, to da dokładność rzędu 5 sekund - { // zaliczamy posterunek w pewnej odległości przed (choć W4 nie zasłania -// już semafora) + // przy 160km/h jedzie 44m/s, to da dokładność rzędu 5 sekund + if (sSpeedTable[i].fDist < 200.0) { + // zaliczamy posterunek w pewnej odległości przed (choć W4 nie zasłania już semafora) #if LOGSTOPS WriteLog( pVehicle->asName + " as " + TrainParams->TrainName @@ -879,56 +1056,43 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN int p2 = int(floor(sSpeedTable[i].evEvent->ValueGet(2))) % 10; // p7=platform side (1:left, 2:right, 3:both) - int lewe = (iDirection > 0) ? 1 : 2; // jeśli jedzie do - // tyłu, to drzwi - // otwiera - // odwrotnie + int lewe = (iDirection > 0) ? 1 : 2; // jeśli jedzie do tyłu, to drzwi otwiera odwrotnie int prawe = (iDirection > 0) ? 2 : 1; if (p2 & lewe) mvOccupied->DoorLeft(true); if (p2 & prawe) mvOccupied->DoorRight(true); - // if (p2&3) //żeby jeszcze poczekał chwilę, zanim - // zamknie + // if (p2&3) //żeby jeszcze poczekał chwilę, zanim zamknie // WaitingSet(10); //10 sekund (wziąć z rozkładu????) } } else - { // otwieranie drzwi w składach wagonowych - docelowo wysyłać - // komendę zezwolenia na otwarcie drzwi - int p7, lewe, - prawe; // p7=platform side (1:left, 2:right, 3:both) - p7 = int(floor(sSpeedTable[i].evEvent->ValueGet(2))) % - 10; // tu będzie jeszcze długość peronu zaokrąglona do 10m + { // otwieranie drzwi w składach wagonowych - docelowo wysyłać komendę zezwolenia na otwarcie drzwi + int p7, lewe, prawe; // p7=platform side (1:left, 2:right, 3:both) + // tu będzie jeszcze długość peronu zaokrąglona do 10m // (20m bezpieczniej, bo nie modyfikuje bitu 1) + p7 = int(std::floor(sSpeedTable[i].evEvent->ValueGet(2))) % 10; TDynamicObject *p = pVehicles[0]; // pojazd na czole składu while (p) - { // otwieranie drzwi w pojazdach - flaga zezwolenia była by - // lepsza - lewe = (p->DirectionGet() > 0) ? 1 : 2; // jeśli jedzie do - // tyłu, to drzwi - // otwiera odwrotnie + { // otwieranie drzwi w pojazdach - flaga zezwolenia była by lepsza + // jeśli jedzie do tyłu, to drzwi otwiera odwrotnie + lewe = (p->DirectionGet() > 0) ? 1 : 2; prawe = 3 - lewe; - p->MoverParameters->BatterySwitch(true); // wagony muszą - // mieć baterię - // załączoną do - // otwarcia - // drzwi... + // wagony muszą mieć baterię załączoną do otwarcia drzwi... + p->MoverParameters->BatterySwitch(true); if (p7 & lewe) p->MoverParameters->DoorLeft(true); if (p7 & prawe) p->MoverParameters->DoorRight(true); - p = p->Next(); // pojazd podłączony z tyłu (patrząc od - // czoła) + // pojazd podłączony z tyłu (patrząc od czoła) + p = p->Next(); } // if (p7&3) //żeby jeszcze poczekał chwilę, zanim zamknie // WaitingSet(10); //10 sekund (wziąć z rozkładu????) } - if (fStopTime > - -5) // na końcu rozkładu się ustawia 60s i tu by było skrócenie + if (fStopTime > -5) // na końcu rozkładu się ustawia 60s i tu by było skrócenie WaitingSet(10); // 10 sekund (wziąć z rozkładu????) - czekanie - // niezależne od sposobu obsługi drzwi, bo - // opóźnia również kierownika + // niezależne od sposobu obsługi drzwi, bo opóźnia również kierownika } if (TrainParams->UpdateMTable( simulation::Time, asNextStop) ) { // to się wykona tylko raz po zatrzymaniu na W4 @@ -1062,35 +1226,71 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else if (sSpeedTable[i].iFlags & spEvent) // W4 może się deaktywować { // jeżeli event, może być potrzeba wysłania komendy, aby ruszył // sprawdzanie eventów pasywnych miniętych +#ifdef EU07_USE_OLD_SPEEDTABLE if (sSpeedTable[i].fDist < 0.0 && sSemNext == &sSpeedTable[i]) +#else + if( (sSpeedTable[ i ].fDist < 0.0) && (SemNextIndex == i) ) +#endif { - if (Global::iWriteLogEnabled & 8) - WriteLog("TableUpdate: semaphor " + sSemNext->GetName() + " passed by " + OwnerName()); - sSemNext = NULL; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze - // zmiennej sprawdzającej dla skanowania w przód + if( Global::iWriteLogEnabled & 8 ) { +#ifdef EU07_USE_OLD_SPEEDTABLE + WriteLog( "TableUpdate: semaphor " + sSemNext->GetName() + " passed by " + OwnerName() ); + } + sSemNext = NULL; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód +#else + WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextIndex ].GetName() ); + } + SemNextIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód +#endif } - if (sSpeedTable[i].fDist < 0.0 && sSemNextStop == &sSpeedTable[i]) +#ifdef EU07_USE_OLD_SPEEDTABLE + if( sSpeedTable[ i ].fDist < 0.0 && sSemNextStop == &sSpeedTable[ i ] ) +#else + if( (sSpeedTable[ i ].fDist < 0.0) && (SemNextStopIndex == i) ) +#endif { - if (Global::iWriteLogEnabled & 8) - WriteLog("TableUpdate: semaphor " + sSemNextStop->GetName() + " passed by " + OwnerName()); - sSemNextStop = NULL; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze - // zmiennej sprawdzającej dla skanowania w przód +#ifdef EU07_USE_OLD_SPEEDTABLE + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "TableUpdate: semaphor " + sSemNextStop->GetName() + " passed by " + OwnerName() ); + } + sSemNextStop = NULL; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód +#else + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextStopIndex ].GetName() ); + } + SemNextStopIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód +#endif } if (sSpeedTable[i].fDist > 0.0 && sSpeedTable[i].IsProperSemaphor(OrderCurrentGet())) { - if (!sSemNext) +#ifdef EU07_USE_OLD_SPEEDTABLE + if( !sSemNext ) { - sSemNext = &sSpeedTable[i]; // jeśli jest mienięty poprzedni - // semafor a wcześniej - // byl nowy to go dorzucamy do zmiennej, żeby cały - // czas widział najbliższy + // jeśli jest mienięty poprzedni semafor a wcześniej + // byl nowy to go dorzucamy do zmiennej, żeby cały czas widział najbliższy + sSemNext = &sSpeedTable[ i ]; if (Global::iWriteLogEnabled & 8) WriteLog("TableUpdate: Next semaphor: " + sSemNext->GetName() + " by " + OwnerName()); } - if (!sSemNextStop || (sSemNextStop && sSemNextStop->fVelNext != 0 && - sSpeedTable[i].fVelNext == 0)) - sSemNextStop = &sSpeedTable[i]; + if( !sSemNextStop || ( sSemNextStop && sSemNextStop->fVelNext != 0 && sSpeedTable[ i ].fVelNext == 0 ) ) { + sSemNextStop = &sSpeedTable[ i ]; + } +#else + if( SemNextIndex == -1 ) { + // jeśli jest mienięty poprzedni semafor a wcześniej + // byl nowy to go dorzucamy do zmiennej, żeby cały czas widział najbliższy + SemNextIndex = i; + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "Speed table update for " + OwnerName() + ", next semaphor is " + sSpeedTable[ SemNextIndex ].GetName() ); + } + } + if( ( SemNextStopIndex == -1 ) + || ( ( sSpeedTable[SemNextStopIndex].fVelNext != 0 ) + && ( sSpeedTable[ i ].fVelNext == 0 ) ) ) { + SemNextStopIndex = i; + } +#endif } if (sSpeedTable[i].iFlags & spOutsideStation) { // jeśli W5, to reakcja zależna od trybu jazdy @@ -1373,9 +1573,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN void TController::TablePurger() { // odtykacz: usuwa mniej istotne pozycje ze środka tabelki, aby uniknąć zatkania //(np. brak ograniczenia pomiędzy zwrotnicami, usunięte sygnały, minięte odcinki łuku) - if (Global::iWriteLogEnabled & 8) - WriteLog("TablePurger: Czyszczenie tabelki."); - int i, j, k = iLast - iFirst; // może być 15 albo 16 pozycji, ostatniej nie ma co sprawdzać +#ifdef EU07_USE_OLD_SPEEDPOS + if( Global::iWriteLogEnabled & 8 ) + WriteLog("Speed table garbage collection for " + OwnerName()); + int i, j, k = iLast - iFirst; // może być 15 albo 16 pozycji, ostatniej nie ma co sprawdzać if (k < 0) k += iSpeedTableSize; // ilość pozycji do przeanalizowania for (i = iFirst; k > 0; --k, i = (i + 1) % iSpeedTableSize) @@ -1394,7 +1595,7 @@ void TController::TablePurger() sSemNextStop = &sSpeedTable[i]; // przeniesienie znacznika o semaforze } if (Global::iWriteLogEnabled & 8) - WriteLog("Odtykacz usuwa pozycję"); + WriteLog("Speed table garbage collection for " + OwnerName() + ": slot removed"); iLast = (iLast - 1 + iSpeedTableSize) % iSpeedTableSize; // cofnięcie z zawinięciem return; } @@ -1419,10 +1620,57 @@ void TController::TablePurger() sSpeedTable = t; // bo jest nowe iSpeedTableSize += 16; if (Global::iWriteLogEnabled & 8) - WriteLog("Tabelka powiększona do "+std::to_string(iSpeedTableSize)+" pozycji"); + WriteLog("Speed table garbage collection for " + OwnerName() + ": table increased to "+std::to_string(iSpeedTableSize)+" slots"); +#else + // simplest approach should be good enough for start -- just copy whatever is still relevant, then swap + // do a trial run first, to see if we need to bother at all + std::size_t trimcount{ 0 }; + for( std::size_t idx = 0; idx < sSpeedTable.size() - 1; ++idx ) { + auto const &speedpoint = sSpeedTable[ idx ]; + if( ( 0 == ( speedpoint.iFlags & spEnabled ) ) + || ( ( speedpoint.iFlags & ( spElapsed | spTrack | spCurve | spSwitch ) == ( spElapsed | spTrack | spCurve ) ) + && ( speedpoint.fVelNext < 0.0 ) ) ) { + // NOTE: we could break out early here, but running through entire thing gives us exact size needed for new table + ++trimcount; + } + } + if( trimcount == 0 ) { + // there'd be no gain, may as well bail + return; + } + std::vector trimmedtable; trimmedtable.reserve( sSpeedTable.size() - trimcount ); + // we can only update pointers safely after new table is finalized, so record their indices until then + for( std::size_t idx = 0; idx < sSpeedTable.size() - 1; ++idx ) { + // cache placement of semaphors in the new table, if we encounter them + // NOTE: we rely on the semaphor actually getting added in the next step rather than skipped, but it's a pretty safe bet + if( idx == SemNextIndex ) { + SemNextIndex = trimmedtable.size(); + } + if( idx == SemNextStopIndex ) { + SemNextStopIndex = trimmedtable.size(); + } + auto const &speedpoint = sSpeedTable[ idx ]; + if( ( 0 == ( speedpoint.iFlags & spEnabled ) ) + || ( ( speedpoint.iFlags & ( spElapsed | spTrack | spCurve | spSwitch ) == ( spElapsed | spTrack | spCurve ) ) + && ( speedpoint.fVelNext < 0.0 ) ) ) { + continue; + } + // we're left with useful speed point record we should copy + trimmedtable.emplace_back( speedpoint ); + } + // always copy the last entry + trimmedtable.emplace_back( sSpeedTable.back() ); + + if( Global::iWriteLogEnabled & 8 ) { + WriteLog( "Speed table garbage collection for " + OwnerName() + " cut away " + std::to_string( trimcount ) + ( trimcount == 1 ? " record" : " records" ) ); + } + + // update the data + sSpeedTable = trimmedtable; + iLast = sSpeedTable.size() - 1; +#endif }; -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- + //--------------------------------------------------------------------------- TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, bool primary) :// czy ma aktywnie prowadzić? @@ -1473,7 +1721,9 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, } SetDriverPsyche(); // na końcu, bo wymaga ustawienia zmiennych +#ifdef EU07_USE_OLD_SPEEDTABLE sSpeedTable = new TSpeedPos[iSpeedTableSize]; +#endif TableClear(); if( WriteLogFlag ) { @@ -1512,7 +1762,9 @@ TController::~TController() { // wykopanie mechanika z roboty delete tsGuardSignal; delete TrainParams; +#ifdef EU07_USE_OLD_SPEEDTABLE delete[] sSpeedTable; +#endif CloseLog(); }; @@ -2302,7 +2554,7 @@ bool TController::IncBrake() if (mvOccupied->LocalBrake == ManualBrake) OK = mvOccupied->IncManualBrakeLevel( 1 + static_cast( std::floor( 0.5 + std::fabs(AccDesired))) ); else - OK = mvOccupied->IncLocalBrakeLevel( 1 + static_cast( std::floor( 0.5 + std::fabs(AccDesired))) ); + OK = mvOccupied->IncLocalBrakeLevel( std::floor( 1.5 + std::abs( AccDesired ) ) ); break; case Pneumatic: if ((mvOccupied->Couplers[0].Connected == NULL) && @@ -4180,7 +4432,13 @@ bool TController::UpdateSituation(double dt) TrainParams ->TTVmax); // jesli nie spozniony to nie przekraczać rozkladowej if (VelDesired > 0.0) - if ((sSemNext && sSemNext->fVelNext != 0.0) || (iDrivigFlags & moveStopHere)==0) +#ifdef EU07_USE_OLD_SPEEDPOS + if( ( sSemNext && sSemNext->fVelNext != 0.0 ) || ( iDrivigFlags & moveStopHere ) == 0 ) +#else + if( ( ( SemNextIndex != -1 ) + && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) + || ( ( iDrivigFlags & moveStopHere ) == 0 ) ) +#endif { // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w // składzie, jeśli nie mamy czekać na sygnał też trzeba odpalić @@ -5372,13 +5630,22 @@ void TController::ControllingSet() mvControlling = pVehicle->ControlledFind()->MoverParameters; // poszukiwanie członu sterowanego }; -std::string TController::TableText(int i) +std::string TController::TableText( std::size_t const Index ) { // pozycja tabelki prędkości +#ifdef EU07_USE_OLD_SPEEDTABLE i = (iFirst + i) % iSpeedTableSize; // numer pozycji if (i != iLast) // w (iLast) znajduje się kolejny tor do przeskanowania, ale nie jest ona // aktywną return sSpeedTable[i].TableText(); return ""; // wskaźnik końca +#else + if( Index < sSpeedTable.size() ) { + return sSpeedTable[ Index ].TableText(); + } + else { + return ""; + } +#endif }; int TController::CrossRoute(TTrack *tr) @@ -5386,13 +5653,19 @@ int TController::CrossRoute(TTrack *tr) // pożądany numer segmentu jest określany podczas skanowania drogi // droga powinna być określona sposobem przejazdu przez skrzyżowania albo współrzędnymi miejsca // docelowego +#ifdef EU07_USE_OLD_SPEEDTABLE for (int i = iFirst; i != iLast; i = (i + 1) % iSpeedTableSize) +#else + for( std::size_t i = 0; i < sSpeedTable.size(); ++i ) +#endif { // trzeba przejrzeć tabelę skanowania w poszukiwaniu (tr) // i jak się znajdzie, to zwrócić zapamiętany numer segmentu i kierunek przejazdu // (-6..-1,1..6) - if ((sSpeedTable[i].iFlags & 3) == 3) // jeśli pozycja istotna (1) oraz odcinek (2) - if (sSpeedTable[i].trTrack == tr) // jeśli pozycja odpowiadająca skrzyżowaniu (tr) - return (sSpeedTable[i].iFlags >> 28); // najstarsze 4 bity jako liczba -8..7 + if( ( true == TestFlag( sSpeedTable[ i ].iFlags, spEnabled | spTrack ) ) + && ( sSpeedTable[ i ].trTrack == tr ) ) { + // jeśli pozycja odpowiadająca skrzyżowaniu (tr) + return ( sSpeedTable[ i ].iFlags >> 28 ); // najstarsze 4 bity jako liczba -8..7 + } } return 0; // nic nie znaleziono? }; @@ -5400,29 +5673,48 @@ int TController::CrossRoute(TTrack *tr) void TController::RouteSwitch(int d) { // ustawienie kierunku jazdy z kabiny d &= 3; - if (d) - if (iRouteWanted != d) - { // nowy kierunek + if( d ) { + if( iRouteWanted != d ) { // nowy kierunek iRouteWanted = d; // zapamiętanie - if (mvOccupied->CategoryFlag & 2) // jeśli samochód - for (int i = iFirst; i != iLast; i = (i + 1) % iSpeedTableSize) - { // szukanie pierwszego skrzyżowania i resetowanie kierunku na nim - if ((sSpeedTable[i].iFlags & 3) == - 3) // jeśli pozycja istotna (1) oraz odcinek (2) - if ((sSpeedTable[i].iFlags & 32) == 0) // odcinek nie może być miniętym - if (sSpeedTable[i].trTrack->eType == tt_Cross) // jeśli skrzyżowanie - { // obcięcie tabelki skanowania przed skrzyżowaniem, aby ponownie - // wybrać drogę - iLast = i - 1; // ponowne skanowanie skrzyżowania (w zwrotnicach - // jest iLast=i, ale tam jest prościej) - if (iLast < 0) + if( mvOccupied->CategoryFlag & 2 ) { + // jeśli samochód +#ifdef EU07_USE_OLD_SPEEDTABLE + for( int i = iFirst; i != iLast; i = ( i + 1 ) % iSpeedTableSize ) { +#else + for( std::size_t i = 0; i < sSpeedTable.size(); ++i ) { +#endif + // szukanie pierwszego skrzyżowania i resetowanie kierunku na nim + if( true == TestFlag( sSpeedTable[ i ].iFlags, spEnabled | spTrack ) ) { + // jeśli pozycja istotna (1) oraz odcinek (2) + if( false == TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) ) { + // odcinek nie może być miniętym + if( sSpeedTable[ i ].trTrack->eType == tt_Cross ) // jeśli skrzyżowanie +#ifdef EU07_USE_OLD_SPEEDTABLE + { // obcięcie tabelki skanowania przed skrzyżowaniem, aby ponownie wybrać drogę + iLast = i - 1; // ponowne skanowanie skrzyżowania (w zwrotnicach jest iLast=i, ale tam jest prościej) + if( iLast < 0 ) iLast += iSpeedTableSize; // bo tabelka jest zapętlona return; } +#else + { + while( sSpeedTable.size() >= i ) { + // NOTE: we're ignoring semaphor flags and not resetting them like we do for train route trimming + // but what if there's street lights? + // TODO: investigate + sSpeedTable.pop_back(); + } + iLast = sSpeedTable.size(); + } +#endif + } + } } + } } + } }; -std::string TController::OwnerName() +std::string TController::OwnerName() const { return ( pVehicle ? pVehicle->MoverParameters->Name : "none" ); }; diff --git a/Driver.h b/Driver.h index eeddc1a1..4cc24ebb 100644 --- a/Driver.h +++ b/Driver.h @@ -102,6 +102,7 @@ enum TAction enum TSpeedPosFlag { // wartości dla iFlag w TSpeedPos + spNone = 0x0, spEnabled = 0x1, // pozycja brana pod uwagę spTrack = 0x2, // to jest tor spReverse = 0x4, // odwrotnie @@ -126,11 +127,11 @@ enum TSpeedPosFlag class TSpeedPos { // pozycja tabeli prędkości dla AI public: - double fDist; // aktualna odległość (ujemna gdy minięte) - double fVelNext; // prędkość obowiązująca od tego miejsca - double fSectionVelocityDist; // długość ograniczenia prędkości + double fDist{ 0.0 }; // aktualna odległość (ujemna gdy minięte) + double fVelNext{ -1.0 }; // prędkość obowiązująca od tego miejsca + double fSectionVelocityDist{ 0.0 }; // długość ograniczenia prędkości // double fAcc; - int iFlags; // flagi typu wpisu do tabelki + int iFlags{ spNone }; // flagi typu wpisu do tabelki // 1=istotny,2=tor,4=odwrotnie,8-zwrotnica (może się zmienić),16-stan // zwrotnicy,32-minięty,64=koniec,128=łuk // 0x100=event,0x200=manewrowa,0x400=przystanek,0x800=SBL,0x1000=wysłana komenda,0x2000=W5 @@ -138,8 +139,8 @@ class TSpeedPos vector3 vPos; // współrzędne XYZ do liczenia odległości struct { - TTrack *trTrack; // wskaźnik na tor o zmiennej prędkości (zwrotnica, obrotnica) - TEvent *evEvent; // połączenie z eventem albo komórką pamięci + TTrack *trTrack{ nullptr }; // wskaźnik na tor o zmiennej prędkości (zwrotnica, obrotnica) + TEvent *evEvent{ nullptr }; // połączenie z eventem albo komórką pamięci }; void CommandCheck(); @@ -166,16 +167,25 @@ extern bool WriteLogFlag; // logowanie parametrów fizycznych class TController { private: // obsługa tabelki prędkości (musi mieć możliwość odhaczania stacji w rozkładzie) +#ifdef EU07_USE_OLD_SPEEDTABLE TSpeedPos *sSpeedTable = nullptr; // najbliższe zmiany prędkości int iSpeedTableSize = 16; // wielkość tabelki int iFirst = 0; // aktualna pozycja w tabeli (modulo iSpeedTableSize) - int iLast = 0; // ostatnia wypełniona pozycja w tabeli sSpeedTable; +#endif double fLastVel = 0.0; // prędkość na poprzednio sprawdzonym torze TTrack *tLast = nullptr; // ostatni analizowany tor TEvent *eSignSkip = nullptr; // można pominąć ten SBL po zatrzymaniu +#ifdef EU07_USE_OLD_SPEEDTABLE TSpeedPos *sSemNext = nullptr; // następny semafor na drodze zależny od trybu jazdy TSpeedPos *sSemNextStop = nullptr; // następny semafor na drodze zależny od trybu jazdy i na stój +#else + std::size_t SemNextIndex{ -1 }; + std::size_t SemNextStopIndex{ -1 }; +#endif private: // parametry aktualnego składu double fLength = 0.0; // długość składu (do wyciągania z ograniczeń) double fMass = 0.0; // całkowita masa do liczenia stycznej składowej grawitacji @@ -358,13 +368,15 @@ class TController TEvent *CheckTrackEvent(double fDirection, TTrack *Track); bool TableCheckEvent(TEvent *e); bool TableAddNew(); - bool TableNotFound(TEvent *e); + bool TableNotFound(TEvent const *Event) const; void TableClear(); TEvent *TableCheckTrackEvent(double fDirection, TTrack *Track); void TableTraceRoute(double fDistance, TDynamicObject *pVehicle = NULL); void TableCheck(double fDistance); TCommandType TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc); void TablePurger(); +public: + std::size_t TableSize() const { return sSpeedTable.size(); } private: // Ra: stare funkcje skanujące, używane do szukania sygnalizatora z tyłu bool BackwardTrackBusy(TTrack *Track); @@ -395,9 +407,9 @@ class TController }; void MoveTo(TDynamicObject *to); void DirectionInitial(); - std::string TableText(int i); + std::string TableText(std::size_t const Index); int CrossRoute(TTrack *tr); void RouteSwitch(int d); - std::string OwnerName(); + std::string OwnerName() const; TMoverParameters const *Controlling() const { return mvControlling; } }; diff --git a/Train.cpp b/Train.cpp index 2e4ac040..f199dcc6 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2562,7 +2562,7 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } - Train->play_sound( Train->dsbDoorOpen ); + Train->play_sound( Train->dsbDoorClose ); } } else { @@ -2573,7 +2573,7 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman if( Train->ggDoorRightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } - Train->play_sound( Train->dsbDoorOpen ); + Train->play_sound( Train->dsbDoorClose ); } } } @@ -2623,7 +2623,7 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma if( Train->ggDoorRightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } - Train->play_sound( Train->dsbDoorOpen ); + Train->play_sound( Train->dsbDoorClose ); } } else { @@ -2634,7 +2634,7 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } - Train->play_sound( Train->dsbDoorOpen ); + Train->play_sound( Train->dsbDoorClose ); } } } diff --git a/World.cpp b/World.cpp index ac5bf33f..75b03532 100644 --- a/World.cpp +++ b/World.cpp @@ -1935,13 +1935,13 @@ TWorld::Update_UI() { break; } - int i = 0; + std::size_t i = 0; std::size_t const speedtablesize = std::min( 30, std::max( 0, static_cast(tmp->Mechanik->TableSize()) - 1 ) ); do { std::string scanline = tmp->Mechanik->TableText( i ); if( scanline.empty() ) { break; } UITable->text_lines.emplace_back( Global::Bezogonkow( scanline ), Global::UITextColor ); ++i; - } while( i < 16 ); // TController:iSpeedTableSize TODO: change when the table gets recoded + } while( i < speedtablesize ); // TController:iSpeedTableSize TODO: change when the table gets recoded } } else { @@ -2039,8 +2039,8 @@ TWorld::Update_UI() { } uitextline1 = - "vel: " + to_string(tmp->GetVelocity(), 2) + " km/h" - + "; dist: " + to_string(tmp->MoverParameters->DistCounter, 2) + " km" + "vel: " + to_string( tmp->GetVelocity(), 2 ) + " km/h" + ( tmp->MoverParameters->SlippingWheels ? " (!)" : "" ) + + "; dist: " + to_string( tmp->MoverParameters->DistCounter, 2 ) + " km" + "; pos: (" + to_string( tmp->GetPosition().x, 2 ) + ", " + to_string( tmp->GetPosition().y, 2 ) + ", " @@ -2573,7 +2573,7 @@ world_environment::update() { m_moon.update(); // ...determine source of key light and adjust global state accordingly... auto const sunlightlevel = m_sun.getIntensity(); - auto const moonlightlevel = m_moon.getIntensity(); + auto const moonlightlevel = m_moon.getIntensity() * 0.65f; // scaled down by arbitrary factor, it's pretty bright otherwise float keylightintensity; float twilightfactor; float3 keylightcolor; From 381eff2e8c89a25f60e625980e78901207264338 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 5 May 2017 19:19:26 +0200 Subject: [PATCH 097/426] maintenance: removed deprecated code from speed table --- Driver.cpp | 226 +++-------------------------------------------------- Driver.h | 11 --- World.cpp | 4 +- 3 files changed, 15 insertions(+), 226 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 66e6b0b4..c5d51c01 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -189,27 +189,15 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) { // przeliczenie odległości od punktu (*p), w kierunku (*dir), zaczynając od pojazdu // dla kolejnych pozycji podawane są współrzędne poprzedniego obiektu w (*p) vector3 v = vPos - *p; // wektor od poprzedniego obiektu (albo pojazdu) do punktu zmiany - fDist = - v.Length(); // długość wektora to odległość pomiędzy czołem a sygnałem albo początkiem toru - // v.SafeNormalize(); //normalizacja w celu określenia znaku (nie potrzebna?) + fDist = v.Length(); // długość wektora to odległość pomiędzy czołem a sygnałem albo początkiem toru if (len == 0.0) { // jeżeli liczymy względem pojazdu double angle; if( dir ) { - glm::vec3 target{ glm::normalize( glm::make_vec3( &v.x ) ) }; - glm::vec3 direction{ glm::normalize( glm::make_vec3( &dir->x ) ) }; - angle = glm::dot( target, direction ); -// assert( angle < M_PI_2 ); -/* - angle = std::atan2( - glm::length( - glm::cross( - target, - direction ) ), + angle = glm::dot( - target, - direction ) ); -*/ + glm::normalize( glm::make_vec3( &v.x ) ), // towards target + glm::normalize( glm::make_vec3( &dir->x ) ) ); // orientation at scan point } else { angle = fDist; @@ -217,8 +205,9 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) if (angle < 0.0) // iloczyn skalarny jest ujemny, gdy punkt jest z tyłu { // jeśli coś jest z tyłu, to dokładna odległość nie ma już większego znaczenia fDist = -fDist; // potrzebne do badania wyjechania składem poza ograniczenie - if (iFlags & spElapsed) // 32 ustawione, gdy obiekt już został minięty - { // jeśli minięty (musi być minięty również przez końcówkę składu) + if (iFlags & spElapsed) { + // jeśli minięty (musi być minięty również przez końcówkę składu) + // NOTE: empty branch, why? } else { @@ -237,13 +226,8 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) } } } -/* - else if (fDist < 50.0) // przy dużym kącie łuku iloczyn skalarny bardziej zaniży odległość - // niż cięciwa - fDist = iska; // ale przy małych odległościach rzut na chwilową prostą ruchu da - // dokładniejsze wartości -*/ } + if (fDist > 0.0) // nie może być 0.0, a przypadkiem mogło by się trafić i było by źle if ((iFlags & spElapsed) == 0) // 32 ustawione, gdy obiekt już został minięty { // jeśli obiekt nie został minięty, można od niego zliczać narastająco (inaczej może być @@ -844,68 +828,22 @@ void TController::TableCheck(double fDistance) vector3 dir = pVehicles[0]->VectorFront() * pVehicles[0]->DirectionGet(); // wektor kierunku jazdy vector3 pos = pVehicles[0]->HeadPosition(); // zaczynamy od pozycji pojazdu double len = 0.0; // odległość będziemy zliczać narastająco -#ifdef EU07_USE_OLD_SPEEDTABLE - for (int i = iFirst; i != iLast; i = (i + 1) % iSpeedTableSize) -#else - assert( iLast == sSpeedTable.size() - 1 ); for( int i = 0; i <= iLast; ++i ) -#endif { // aktualizacja rekordów z wyjątkiem ostatniego if (sSpeedTable[i].iFlags & spEnabled) // jeśli pozycja istotna { if (sSpeedTable[i].Update(&pos, &dir, len)) { if( Global::iWriteLogEnabled & 8 ) { -/* - WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->NameGet() + " (deleting subsequent records)" ); -*/ WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->NameGet() + " (generating fresh trace)" ); } -#ifdef EU07_USE_OLD_SPEEDTABLE - int k = ( iLast + 1 ) % iSpeedTableSize; // skanujemy razem z ostatnią pozycją - for (int j = (i+1) % iSpeedTableSize; j != k; j = (j + 1) % iSpeedTableSize) - { // kasowanie wszystkich rekordów za zmienioną zwrotnicą - if (Global::iWriteLogEnabled & 8) - WriteLog("TableCheck: Delete from table: " + sSpeedTable[j].GetName()); - sSpeedTable[j].iFlags = 0; - if (&sSpeedTable[j] == sSemNext) - sSemNext = NULL; // przy kasowaniu tabelki zrzucamy także semafor - if (&sSpeedTable[j] == sSemNextStop) - sSemNextStop = NULL; // przy kasowaniu tabelki zrzucamy także semafor - } -#else -/* - while( iLast > i ) { - if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "Speed table for" + OwnerName() + " deleting record " + sSpeedTable[ iLast ].GetName() ); - } - // przy kasowaniu tabelki zrzucamy także semafor - if( sSemNext == &sSpeedTable[ iLast ] ) { - sSemNext = nullptr; - } - if( sSemNextStop == &sSpeedTable[ iLast ] ) { - sSemNextStop = nullptr; - } - sSpeedTable.pop_back(); - --iLast; - } - - tLast = sSpeedTable[ i ].trTrack; - if (Global::iWriteLogEnabled & 8) - { - WriteLog( "Speed table for" + OwnerName() + " has new last element, " + sSpeedTable[i].GetName() ); - } -*/ - // NOTE: alternative to the above, dirty trick to perform scan from the beginning + // NOTE: dirty trick to perform scan from the beginning // a workaround for current routines not preserving properly scan distance if started from the middle - // and the scan extending far beyond specified limit + // and the scan extending far beyond specified limit as result iTableDirection = -iDirection; TableTraceRoute( fDistance, pVehicles[ 1 ] ); -#endif -#ifdef EU07_USE_OLD_SPEEDTABLE - iLast = i; // pokazujemy gdzie jest ostatni kawałek -#endif - break; // nie kontynuujemy pętli, trzeba doskanować ciąg dalszy + // nie kontynuujemy pętli, trzeba doskanować ciąg dalszy + break; } if (sSpeedTable[i].iFlags & spTrack) // jeśli odcinek { @@ -936,24 +874,14 @@ void TController::TableCheck(double fDistance) } } } -#ifdef EU07_USE_OLD_SPEEDTABLE - if( i == iFirst ) // jeśli jest pierwszą pozycją tabeli - { // pozbycie się początkowej pozycji - if ((sSpeedTable[i].iFlags & spEnabled) == 0) // jeśli pozycja istotna (po Update() może się zmienić) - // if (iFirst!=iLast) //ostatnia musi zostać - to załatwia for() - iFirst = (iFirst + 1) % iSpeedTableSize; // kolejne sprawdzanie będzie już od następnej pozycji - } -#endif } sSpeedTable[iLast].Update(&pos, &dir, len); // aktualizacja ostatniego // WriteLog("TableCheck: Upate last track. Dist=" + AnsiString(sSpeedTable[iLast].fDist)); if( sSpeedTable[ iLast ].fDist < fDistance ) { TableTraceRoute( fDistance, pVehicles[ 1 ] ); // doskanowanie dalszego odcinka } -#ifndef EU07_USE_OLD_SPEEDTABLE // garbage collection TablePurger(); -#endif } }; @@ -972,14 +900,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // te flagi są ustawiane tutaj, w razie potrzeby iDrivigFlags &= ~(moveTrackEnd | moveSwitchFound | moveSemaphorFound | moveSpeedLimitFound); -#ifdef EU07_USE_OLD_SPEEDTABLE - int i, k = iLast - iFirst + 1; - if (k < 0) - k += iSpeedTableSize; // ilość pozycji do przeanalizowania - for (i = iFirst; k > 0; --k, i = (i + 1) % iSpeedTableSize) -#else for( std::size_t i = 0; i < sSpeedTable.size(); ++i ) -#endif { // sprawdzenie rekordów od (iFirst) do (iLast), o ile są istotne if (sSpeedTable[i].iFlags & spEnabled) // badanie istotności { // o ile dana pozycja tabelki jest istotna @@ -1226,57 +1147,23 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else if (sSpeedTable[i].iFlags & spEvent) // W4 może się deaktywować { // jeżeli event, może być potrzeba wysłania komendy, aby ruszył // sprawdzanie eventów pasywnych miniętych -#ifdef EU07_USE_OLD_SPEEDTABLE - if (sSpeedTable[i].fDist < 0.0 && sSemNext == &sSpeedTable[i]) -#else if( (sSpeedTable[ i ].fDist < 0.0) && (SemNextIndex == i) ) -#endif { if( Global::iWriteLogEnabled & 8 ) { -#ifdef EU07_USE_OLD_SPEEDTABLE - WriteLog( "TableUpdate: semaphor " + sSemNext->GetName() + " passed by " + OwnerName() ); - } - sSemNext = NULL; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód -#else WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextIndex ].GetName() ); } SemNextIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód -#endif } -#ifdef EU07_USE_OLD_SPEEDTABLE - if( sSpeedTable[ i ].fDist < 0.0 && sSemNextStop == &sSpeedTable[ i ] ) -#else if( (sSpeedTable[ i ].fDist < 0.0) && (SemNextStopIndex == i) ) -#endif { -#ifdef EU07_USE_OLD_SPEEDTABLE - if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "TableUpdate: semaphor " + sSemNextStop->GetName() + " passed by " + OwnerName() ); - } - sSemNextStop = NULL; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód -#else if( Global::iWriteLogEnabled & 8 ) { WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextStopIndex ].GetName() ); } SemNextStopIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód -#endif } if (sSpeedTable[i].fDist > 0.0 && sSpeedTable[i].IsProperSemaphor(OrderCurrentGet())) { -#ifdef EU07_USE_OLD_SPEEDTABLE - if( !sSemNext ) - { - // jeśli jest mienięty poprzedni semafor a wcześniej - // byl nowy to go dorzucamy do zmiennej, żeby cały czas widział najbliższy - sSemNext = &sSpeedTable[ i ]; - if (Global::iWriteLogEnabled & 8) - WriteLog("TableUpdate: Next semaphor: " + sSemNext->GetName() + " by " + OwnerName()); - } - if( !sSemNextStop || ( sSemNextStop && sSemNextStop->fVelNext != 0 && sSpeedTable[ i ].fVelNext == 0 ) ) { - sSemNextStop = &sSpeedTable[ i ]; - } -#else if( SemNextIndex == -1 ) { // jeśli jest mienięty poprzedni semafor a wcześniej // byl nowy to go dorzucamy do zmiennej, żeby cały czas widział najbliższy @@ -1290,7 +1177,6 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN && ( sSpeedTable[ i ].fVelNext == 0 ) ) ) { SemNextStopIndex = i; } -#endif } if (sSpeedTable[i].iFlags & spOutsideStation) { // jeśli W5, to reakcja zależna od trybu jazdy @@ -1573,55 +1459,6 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN void TController::TablePurger() { // odtykacz: usuwa mniej istotne pozycje ze środka tabelki, aby uniknąć zatkania //(np. brak ograniczenia pomiędzy zwrotnicami, usunięte sygnały, minięte odcinki łuku) -#ifdef EU07_USE_OLD_SPEEDPOS - if( Global::iWriteLogEnabled & 8 ) - WriteLog("Speed table garbage collection for " + OwnerName()); - int i, j, k = iLast - iFirst; // może być 15 albo 16 pozycji, ostatniej nie ma co sprawdzać - if (k < 0) - k += iSpeedTableSize; // ilość pozycji do przeanalizowania - for (i = iFirst; k > 0; --k, i = (i + 1) % iSpeedTableSize) - { // sprawdzenie rekordów od (iFirst) do (iLast), o ile są istotne - if ((sSpeedTable[i].iFlags & spEnabled) ? - (sSpeedTable[i].fVelNext < 0) && ((sSpeedTable[i].iFlags & 0xAB) == 0xA3) : - true) - { // jeśli jest to minięty (0x20) tor (0x03) do liczenia cięciw (0x80), a nie zwrotnica - // (0x08) - for (; k > 0; --k, i = (i + 1) % iSpeedTableSize) - { - sSpeedTable[i] = sSpeedTable[(i + 1) % iSpeedTableSize]; // skopiowanie - if (&sSpeedTable[(i + 1) % iSpeedTableSize] == sSemNext) - sSemNext = &sSpeedTable[i]; // przeniesienie znacznika o semaforze - if (&sSpeedTable[(i + 1) % iSpeedTableSize] == sSemNextStop) - sSemNextStop = &sSpeedTable[i]; // przeniesienie znacznika o semaforze - } - if (Global::iWriteLogEnabled & 8) - WriteLog("Speed table garbage collection for " + OwnerName() + ": slot removed"); - iLast = (iLast - 1 + iSpeedTableSize) % iSpeedTableSize; // cofnięcie z zawinięciem - return; - } - } - // jeśli powyższe odtykane nie pomoże, można usunąć coś więcej, albo powiększyć tabelkę - TSpeedPos *t = new TSpeedPos[iSpeedTableSize + 16]; // zwiększenie - k = iLast - iFirst + 1; // tym razem wszystkie - if (k < 0) - k += iSpeedTableSize; // ilość pozycji do przeanalizowania - for (j = -1, i = iFirst; k > 0; --k) - { // przepisywanie rekordów iFirst..iLast na 0..k - t[++j] = sSpeedTable[i]; - if (&sSpeedTable[i] == sSemNext) - sSemNext = &t[j]; // przeniesienie znacznika o semaforze - if (&sSpeedTable[i] == sSemNextStop) - sSemNextStop = &t[j]; // przeniesienie znacznika o semaforze - i = (i + 1) % iSpeedTableSize; // kolejna pozycja mogą być zawinięta - } - iFirst = 0; // teraz będzie od zera - iLast = j; // ostatnia - delete[] sSpeedTable; // to już nie potrzebne - sSpeedTable = t; // bo jest nowe - iSpeedTableSize += 16; - if (Global::iWriteLogEnabled & 8) - WriteLog("Speed table garbage collection for " + OwnerName() + ": table increased to "+std::to_string(iSpeedTableSize)+" slots"); -#else // simplest approach should be good enough for start -- just copy whatever is still relevant, then swap // do a trial run first, to see if we need to bother at all std::size_t trimcount{ 0 }; @@ -1664,11 +1501,9 @@ void TController::TablePurger() if( Global::iWriteLogEnabled & 8 ) { WriteLog( "Speed table garbage collection for " + OwnerName() + " cut away " + std::to_string( trimcount ) + ( trimcount == 1 ? " record" : " records" ) ); } - // update the data sSpeedTable = trimmedtable; iLast = sSpeedTable.size() - 1; -#endif }; //--------------------------------------------------------------------------- @@ -1721,9 +1556,6 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, } SetDriverPsyche(); // na końcu, bo wymaga ustawienia zmiennych -#ifdef EU07_USE_OLD_SPEEDTABLE - sSpeedTable = new TSpeedPos[iSpeedTableSize]; -#endif TableClear(); if( WriteLogFlag ) { @@ -1762,9 +1594,6 @@ TController::~TController() { // wykopanie mechanika z roboty delete tsGuardSignal; delete TrainParams; -#ifdef EU07_USE_OLD_SPEEDTABLE - delete[] sSpeedTable; -#endif CloseLog(); }; @@ -4432,13 +4261,9 @@ bool TController::UpdateSituation(double dt) TrainParams ->TTVmax); // jesli nie spozniony to nie przekraczać rozkladowej if (VelDesired > 0.0) -#ifdef EU07_USE_OLD_SPEEDPOS - if( ( sSemNext && sSemNext->fVelNext != 0.0 ) || ( iDrivigFlags & moveStopHere ) == 0 ) -#else if( ( ( SemNextIndex != -1 ) - && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) + && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) || ( ( iDrivigFlags & moveStopHere ) == 0 ) ) -#endif { // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w // składzie, jeśli nie mamy czekać na sygnał też trzeba odpalić @@ -5632,20 +5457,12 @@ void TController::ControllingSet() std::string TController::TableText( std::size_t const Index ) { // pozycja tabelki prędkości -#ifdef EU07_USE_OLD_SPEEDTABLE - i = (iFirst + i) % iSpeedTableSize; // numer pozycji - if (i != iLast) // w (iLast) znajduje się kolejny tor do przeskanowania, ale nie jest ona - // aktywną - return sSpeedTable[i].TableText(); - return ""; // wskaźnik końca -#else if( Index < sSpeedTable.size() ) { return sSpeedTable[ Index ].TableText(); } else { return ""; } -#endif }; int TController::CrossRoute(TTrack *tr) @@ -5653,11 +5470,7 @@ int TController::CrossRoute(TTrack *tr) // pożądany numer segmentu jest określany podczas skanowania drogi // droga powinna być określona sposobem przejazdu przez skrzyżowania albo współrzędnymi miejsca // docelowego -#ifdef EU07_USE_OLD_SPEEDTABLE - for (int i = iFirst; i != iLast; i = (i + 1) % iSpeedTableSize) -#else for( std::size_t i = 0; i < sSpeedTable.size(); ++i ) -#endif { // trzeba przejrzeć tabelę skanowania w poszukiwaniu (tr) // i jak się znajdzie, to zwrócić zapamiętany numer segmentu i kierunek przejazdu // (-6..-1,1..6) @@ -5678,25 +5491,13 @@ void TController::RouteSwitch(int d) iRouteWanted = d; // zapamiętanie if( mvOccupied->CategoryFlag & 2 ) { // jeśli samochód -#ifdef EU07_USE_OLD_SPEEDTABLE - for( int i = iFirst; i != iLast; i = ( i + 1 ) % iSpeedTableSize ) { -#else for( std::size_t i = 0; i < sSpeedTable.size(); ++i ) { -#endif // szukanie pierwszego skrzyżowania i resetowanie kierunku na nim if( true == TestFlag( sSpeedTable[ i ].iFlags, spEnabled | spTrack ) ) { // jeśli pozycja istotna (1) oraz odcinek (2) if( false == TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) ) { // odcinek nie może być miniętym if( sSpeedTable[ i ].trTrack->eType == tt_Cross ) // jeśli skrzyżowanie -#ifdef EU07_USE_OLD_SPEEDTABLE - { // obcięcie tabelki skanowania przed skrzyżowaniem, aby ponownie wybrać drogę - iLast = i - 1; // ponowne skanowanie skrzyżowania (w zwrotnicach jest iLast=i, ale tam jest prościej) - if( iLast < 0 ) - iLast += iSpeedTableSize; // bo tabelka jest zapętlona - return; - } -#else { while( sSpeedTable.size() >= i ) { // NOTE: we're ignoring semaphor flags and not resetting them like we do for train route trimming @@ -5706,7 +5507,6 @@ void TController::RouteSwitch(int d) } iLast = sSpeedTable.size(); } -#endif } } } diff --git a/Driver.h b/Driver.h index 4cc24ebb..dcbd3b81 100644 --- a/Driver.h +++ b/Driver.h @@ -167,25 +167,14 @@ extern bool WriteLogFlag; // logowanie parametrów fizycznych class TController { private: // obsługa tabelki prędkości (musi mieć możliwość odhaczania stacji w rozkładzie) -#ifdef EU07_USE_OLD_SPEEDTABLE - TSpeedPos *sSpeedTable = nullptr; // najbliższe zmiany prędkości - int iSpeedTableSize = 16; // wielkość tabelki - int iFirst = 0; // aktualna pozycja w tabeli (modulo iSpeedTableSize) -#else int iLast{ 0 }; // ostatnia wypełniona pozycja w tabeli sSpeedTable; -#endif double fLastVel = 0.0; // prędkość na poprzednio sprawdzonym torze TTrack *tLast = nullptr; // ostatni analizowany tor TEvent *eSignSkip = nullptr; // można pominąć ten SBL po zatrzymaniu -#ifdef EU07_USE_OLD_SPEEDTABLE - TSpeedPos *sSemNext = nullptr; // następny semafor na drodze zależny od trybu jazdy - TSpeedPos *sSemNextStop = nullptr; // następny semafor na drodze zależny od trybu jazdy i na stój -#else std::size_t SemNextIndex{ -1 }; std::size_t SemNextStopIndex{ -1 }; -#endif private: // parametry aktualnego składu double fLength = 0.0; // długość składu (do wyciągania z ograniczeń) double fMass = 0.0; // całkowita masa do liczenia stycznej składowej grawitacji diff --git a/World.cpp b/World.cpp index 75b03532..4a760c3f 100644 --- a/World.cpp +++ b/World.cpp @@ -1916,7 +1916,7 @@ TWorld::Update_UI() { + " VRd=" + to_string( tmp->Mechanik->VelRoad, 0 ); if( ( tmp->Mechanik->VelNext == 0.0 ) - && ( tmp->Mechanik->eSignNext ) ) { + && ( tmp->Mechanik->eSignNext ) ) { // jeśli ma zapamiętany event semafora, nazwa eventu semafora uitextline4 += " (" @@ -1935,7 +1935,7 @@ TWorld::Update_UI() { break; } - std::size_t i = 0; std::size_t const speedtablesize = std::min( 30, std::max( 0, static_cast(tmp->Mechanik->TableSize()) - 1 ) ); + std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( tmp->Mechanik->TableSize() ) - 1, 0, 30 ); do { std::string scanline = tmp->Mechanik->TableText( i ); if( scanline.empty() ) { break; } From fc2fc3e27c91da8a53907f371a1f92c300491586 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 6 May 2017 14:31:53 +0200 Subject: [PATCH 098/426] build 170506. minor diagnostics, performance and rendering enhancements --- Driver.cpp | 200 ++++++--------------------------------------- DynObj.cpp | 22 ++++- DynObj.h | 1 + McZapkie/MOVER.h | 2 + McZapkie/Mover.cpp | 12 +++ Train.cpp | 8 ++ Train.h | 1 + World.cpp | 15 ++-- renderer.cpp | 8 +- 9 files changed, 80 insertions(+), 189 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index c5d51c01..cb32ce0b 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -386,13 +386,7 @@ void TSpeedPos::Set(TTrack *track, double dist, int flag) void TController::TableClear() { // wyczyszczenie tablicy -#ifdef EU07_USE_OLD_SPEEDTABLE - iFirst = iLast = 0; - for (int i = 0; i < iSpeedTableSize; ++i) // czyszczenie tabeli prędkości - sSpeedTable[i].Clear(); -#else sSpeedTable.clear(); -#endif iLast = -1; iTableDirection = 0; // nieznany tLast = nullptr; @@ -413,41 +407,20 @@ TEvent * TController::CheckTrackEvent(double fDirection, TTrack *Track) bool TController::TableAddNew() { // zwiększenie użytej tabelki o jeden rekord -#ifdef EU07_USE_OLD_SPEEDTABLE - iLast = ( iLast + 1 ) % iSpeedTableSize; - // TODO: jeszcze sprawdzić, czy się na iFirst nie nałoży - // TODO: wstawić tu wywołanie odtykacza - teraz jest to w TableTraceRoute() - // TODO: jeśli ostatnia pozycja zajęta, ustawiać dodatkowe flagi - teraz jest to w - // TableTraceRoute() - // TODO: przydało by się też posortować tabelkę wg odległości (ale nie w tym miejscu) -#else sSpeedTable.emplace_back(); // add a new slot iLast = sSpeedTable.size() - 1; -#endif return true; // false gdy się nałoży }; bool TController::TableNotFound(TEvent const *Event) const { // sprawdzenie, czy nie został już dodany do tabelki (np. podwójne W4 robi problemy) -#ifdef EU07_USE_OLD_SPEEDTABLE - int j = (iLast + 1) % iSpeedTableSize; // j, aby sprawdzić też ostatnią pozycję - for (int i = iFirst; i != j; i = (i + 1) % iSpeedTableSize) - if ((sSpeedTable[i].iFlags & (spEnabled | spEvent)) == (spEnabled | - spEvent)) // o ile używana pozycja - if (sSpeedTable[i].evEvent == e) - { - if (Global::iWriteLogEnabled & 8) - WriteLog("TableNotFound: Event already in SpeedTable: " + sSpeedTable[i].evEvent->asName); - return false; // już jest, drugi raz dodawać nie ma po co - } - return true; // nie ma, czyli można dodać -#else - auto lookup = std::find_if( - sSpeedTable.begin(), - sSpeedTable.end(), - [Event]( TSpeedPos const &speedpoint ){ - return ( ( true == TestFlag( speedpoint.iFlags, spEnabled | spEvent ) ) - && ( speedpoint.evEvent == Event ) ); } ); + auto lookup = + std::find_if( + sSpeedTable.begin(), + sSpeedTable.end(), + [Event]( TSpeedPos const &speedpoint ){ + return ( ( true == TestFlag( speedpoint.iFlags, spEnabled | spEvent ) ) + && ( speedpoint.evEvent == Event ) ); } ); if( ( Global::iWriteLogEnabled & 8 ) && ( lookup != sSpeedTable.end() ) ) { @@ -455,7 +428,6 @@ bool TController::TableNotFound(TEvent const *Event) const } return lookup == sSpeedTable.end(); -#endif }; void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) @@ -480,9 +452,6 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) fTrackLength = pTrack->Length() - fTrackLength; // przeskanowana zostanie odległość do Point2 } fLastVel = pTrack->VelocityGet(); // aktualna prędkość -#ifdef EU07_USE_OLD_SPEEDTABLE - iFirst = iLast = 0; -#endif sSpeedTable.clear(); iLast = -1; tLast = nullptr; //żaden nie sprawdzony @@ -491,65 +460,21 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) } else { // kontynuacja skanowania od ostatnio sprawdzonego toru (w ostatniej pozycji zawsze jest tor) - // WriteLog("TableTraceRoute: check last track"); -#ifdef EU07_USE_OLD_SPEEDTABLE - if( sSpeedTable[ iLast ].iFlags & spEndOfTable ) // zatkanie - { // jeśli zapełniła się tabelka - if ((iLast + 1) % iSpeedTableSize == iFirst) // jeśli nadal jest zapełniona - { - TablePurger(); // nic się nie da zrobić - return; - } - if ((iLast + 2) % iSpeedTableSize == iFirst) // musi być jeszcze miejsce wolne na - // ewentualny event, bo tor jeszcze nie - // sprawdzony - { - TablePurger(); - return; // już lepiej, ale jeszcze nie tym razem - } - sSpeedTable[iLast].iFlags &= 0xBE; // kontynuować próby doskanowania - } -#endif - // znaleziono semafor lub tarczę lub tor z prędkością zero, trzeba sprawdzić czy to nadał semafor -#ifdef EU07_USE_OLD_SPEEDTABLE - if( ( sSemNextStop != nullptr ) - && ( sSemNextStop->fVelNext < 1.0 ) ) { -#else if( ( SemNextStopIndex != -1 ) && ( sSpeedTable[SemNextStopIndex].fVelNext < 1.0 ) ) { -#endif + // znaleziono semafor lub tarczę lub tor z prędkością zero, trzeba sprawdzić czy to nadał semafor // jeśli jest następny semafor to sprawdzamy czy to on nadał zero -#ifdef EU07_USE_OLD_SPEEDTABLE - if( ( OrderCurrentGet() & Obey_train ) - && ( sSemNextStop->iFlags & spSemaphor ) ) { -#else if( ( OrderCurrentGet() & Obey_train ) && ( sSpeedTable[SemNextStopIndex].iFlags & spSemaphor ) ) { -#endif return; } else { -#ifdef EU07_USE_OLD_SPEEDTABLE - if( ( OrderCurrentGet() < 0x40 ) - && ( sSemNextStop->iFlags & ( spSemaphor | spShuntSemaphor | spOutsideStation ) ) ) { -#else if( ( OrderCurrentGet() < 0x40 ) && ( sSpeedTable[SemNextStopIndex].iFlags & ( spSemaphor | spShuntSemaphor | spOutsideStation ) ) ) { -#endif return; } } } -#ifdef EU07_USE_OLD_SPEEDTABLE - pTrack = sSpeedTable[iLast].trTrack; // ostatnio sprawdzony tor - if (!pTrack) - return; // koniec toru, to nie ma co sprawdzać (nie ma prawa tak być) - fLastDir = (sSpeedTable[iLast].iFlags & spReverse) ? -1.0 : 1.0; // flaga ustawiona, gdy Point2 toru jest bli�ej - fCurrentDistance = sSpeedTable[iLast].fDist; // aktualna odleg�o�� do jego Point1 - fTrackLength = (sSpeedTable[iLast].iFlags & (spElapsed | spEnd)) ? 0.0 : pTrack->Length(); // nie dolicza� d�ugo�ci gdy: - // 32-minięty początek, - // 64-jazda do końca toru -#else auto const &lastspeedpoint = sSpeedTable[ iLast ]; pTrack = lastspeedpoint.trTrack; assert( pTrack != nullptr ); @@ -565,7 +490,6 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) ( lastspeedpoint.iFlags & ( spElapsed | spEnd ) != 0 ) ? 0.0 : pTrack->Length() ); -#endif } if( fCurrentDistance >= fDistance ) { @@ -594,59 +518,10 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if( Global::iWriteLogEnabled & 8 ) { WriteLog( "Speed table for " + OwnerName() + " found new event, " + pEvent->asName ); } -#ifdef EU07_USE_OLD_SPEEDTABLE - if( sSpeedTable[ iLast ].Set( pEvent, fCurrentDistance, OrderCurrentGet() ) ) // dodanie odczytu sygnału - { - fDistance = fCurrentDistance; // jeśli sygnał stop, to nie ma - // potrzeby dalej skanować - sSemNextStop = &sSpeedTable[iLast]; - if (!sSemNext) - sSemNext = &sSpeedTable[iLast]; - if (Global::iWriteLogEnabled & 8) - WriteLog("Signal stop. Next Semaphor ", false); - if (sSemNextStop) - { - if (Global::iWriteLogEnabled & 8) - WriteLog(sSemNextStop->GetName()); - } - else - { - if (Global::iWriteLogEnabled & 8) - WriteLog("none"); - } - } - else { - if( sSpeedTable[ iLast ].IsProperSemaphor( OrderCurrentGet() ) && - sSemNext == NULL ) - sSemNext = - &sSpeedTable[ iLast ]; // sprawdzamy czy pierwszy na drodze - if( Global::iWriteLogEnabled & 8 ) - WriteLog( "Signal forward. Next Semaphor ", false ); - if( sSemNext ) { - if( Global::iWriteLogEnabled & 8 ) - WriteLog( sSemNext->GetName() ); - } - else { - if( Global::iWriteLogEnabled & 8 ) - WriteLog( "none" ); - } - } -#else auto &newspeedpoint = sSpeedTable[ iLast ]; if( newspeedpoint.Set( pEvent, fCurrentDistance, OrderCurrentGet() ) ) { fDistance = fCurrentDistance; // jeśli sygnał stop, to nie ma potrzeby dalej skanować -#ifdef EU07_USE_OLD_SPEEDTABLE - sSemNextStop = &newspeedpoint; - if( sSemNext == nullptr ) { - sSemNext = &newspeedpoint; - } - if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "(stop signal from " - + ( sSemNextStop ? sSemNextStop->GetName() : "unknown semaphor" ) - + ")" ); - } -#else SemNextStopIndex = iLast; if( SemNextIndex == -1 ) { SemNextIndex = iLast; @@ -656,20 +531,8 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) + ( SemNextStopIndex != -1 ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor" ) + ")" ); } -#endif } else { -#ifdef EU07_USE_OLD_SPEEDTABLE - if( ( true == newspeedpoint.IsProperSemaphor( OrderCurrentGet() ) ) - && ( sSemNext == nullptr ) ) { - sSemNext = &newspeedpoint; // sprawdzamy czy pierwszy na drodze - } - if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "(forward signal for " - + ( sSemNext ? sSemNext->GetName() : "unknown semaphor" ) - + ")" ); - } -#else if( ( true == newspeedpoint.IsProperSemaphor( OrderCurrentGet() ) ) && ( SemNextIndex == -1 ) ) { SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze @@ -679,15 +542,13 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) + ( SemNextIndex != -1 ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor" ) + ")" ); } -#endif } -#endif } } // event dodajemy najpierw, żeby móc sprawdzić, czy tor został dodany po odczytaniu prędkości następnego - if ((pTrack->VelocityGet() == 0.0) // zatrzymanie - || (pTrack->iAction) // jeśli tor ma własności istotne dla skanowania - || (pTrack->VelocityGet() != fLastVel)) // następuje zmiana prędkości + if( ( pTrack->VelocityGet() == 0.0 ) // zatrzymanie + || ( pTrack->iAction ) // jeśli tor ma własności istotne dla skanowania + || ( pTrack->VelocityGet() != fLastVel ) ) // następuje zmiana prędkości { // odcinek dodajemy do tabelki, gdy jest istotny dla ruchu if (TableAddNew()) { // teraz dodatkowo zapamiętanie wybranego segmentu dla skrzyżowania @@ -723,12 +584,14 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) || ( ( tLast != nullptr ) && ( tLast->fRadius != 0.0 ) )) // koniec łuku też jest istotny { // albo dla liczenia odległości przy pomocy cięciw - te usuwać po przejechaniu - if (TableAddNew()) + if (TableAddNew()) { + // dodanie odcinka do tabelki sSpeedTable[iLast].Set( pTrack, fCurrentDistance, ( fLastDir < 0 ? spEnabled | spCurve | spReverse : - spEnabled | spCurve ) ); // dodanie odcinka do tabelki + spEnabled | spCurve ) ); + } } } @@ -766,28 +629,6 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) } } } -#ifdef EU07_USE_OLD_SPEEDTABLE - if( ( ( iLast + 3 ) % iSpeedTableSize == iFirst ) ? - true : - ((iLast + 2) % iSpeedTableSize == iFirst)) // czy tabelka się nie zatka? - { // jest ryzyko nieznalezienia ograniczenia - ograniczyć prędkość do pozwalającej - // na zatrzymanie na końcu przeskanowanej drogi - TablePurger(); // usunąć pilnie zbędne pozycje - if (((iLast + 3) % iSpeedTableSize == iFirst) ? - true : - ((iLast + 2) % iSpeedTableSize == iFirst)) // czy tabelka się nie zatka? - { // jeśli odtykacz nie pomógł (TODO: zwiększyć rozmiar tabelki) - if (TableAddNew()) - sSpeedTable[iLast].Set( - pTrack, fCurrentDistance, - fLastDir < 0 ? - 0x10045 : - 0x10041); // zapisanie toru jako końcowego (ogranicza prędkosć) - // zapisać w logu, że należy poprawić scenerię? - return; // nie skanujemy dalej, bo nie ma miejsca - } - } -#endif // zwiększenie skanowanej odległości tylko jeśli istnieje dalszy tor fTrackLength = pTrack->Length(); } @@ -796,12 +637,14 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if( ( iLast == -1 ) || ( false == TestFlag( sSpeedTable[iLast].iFlags, spEnabled | spEnd ) ) ) { // only if we haven't already marked end of the track - if( TableAddNew() ) + if( TableAddNew() ) { + // zapisanie ostatniego sprawdzonego toru sSpeedTable[iLast].Set( tLast, fCurrentDistance, ( fLastDir < 0 ? spEnabled | spEnd | spReverse : - spEnabled | spEnd )); // zapisanie ostatniego sprawdzonego toru + spEnabled | spEnd )); + } } // to ostatnia pozycja, bo NULL nic nie da, a może się podpiąć obrotnica, czy jakieś transportery return; @@ -1459,6 +1302,9 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN void TController::TablePurger() { // odtykacz: usuwa mniej istotne pozycje ze środka tabelki, aby uniknąć zatkania //(np. brak ograniczenia pomiędzy zwrotnicami, usunięte sygnały, minięte odcinki łuku) + if( sSpeedTable.size() < 2 ) { + return; + } // simplest approach should be good enough for start -- just copy whatever is still relevant, then swap // do a trial run first, to see if we need to bother at all std::size_t trimcount{ 0 }; @@ -1502,7 +1348,7 @@ void TController::TablePurger() WriteLog( "Speed table garbage collection for " + OwnerName() + " cut away " + std::to_string( trimcount ) + ( trimcount == 1 ? " record" : " records" ) ); } // update the data - sSpeedTable = trimmedtable; + std::swap( sSpeedTable, trimmedtable ); iLast = sSpeedTable.size() - 1; }; diff --git a/DynObj.cpp b/DynObj.cpp index 299fc598..c0b3345d 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -45,6 +45,11 @@ http://mozilla.org/MPL/2.0/. #define M_2PI 6.283185307179586476925286766559; const float maxrot = (float)(M_PI / 3.0); // 60° +std::string const TDynamicObject::MED_labels[] = { + "masa: ", "amax: ", "Fzad: ", "FmPN: ", "FmED: ", "FrED: ", "FzPN: ", "nPrF: " +}; + + //--------------------------------------------------------------------------- void TAnimPant::AKP_4E() { // ustawienie wymiarów dla pantografu AKP-4E @@ -5275,10 +5280,19 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, //--------------------------------------------------------------------------- void TDynamicObject::RadioStop() { // zatrzymanie pojazdu - if (Mechanik) // o ile ktoś go prowadzi - if (MoverParameters->SecuritySystem.RadioStop && - MoverParameters->Radio) // jeśli pojazd ma RadioStop i jest on aktywny - Mechanik->PutCommand("Emergency_brake", 1.0, 1.0, &vPosition, stopRadio); + if( Mechanik ) { + // o ile ktoś go prowadzi + if( ( MoverParameters->SecuritySystem.RadioStop ) + && ( MoverParameters->Radio ) ) { + // jeśli pojazd ma RadioStop i jest on aktywny + Mechanik->PutCommand( "Emergency_brake", 1.0, 1.0, &vPosition, stopRadio ); + // add onscreen notification for human driver + // TODO: do it selectively for the 'local' driver once the multiplayer is in + if( false == Mechanik->AIControllFlag ) { + Global::tranTexts.AddLine( "!! RADIO-STOP !!", 0.0, 10.0, false ); + } + } + } }; //--------------------------------------------------------------------------- diff --git a/DynObj.h b/DynObj.h index b0efde63..34682611 100644 --- a/DynObj.h +++ b/DynObj.h @@ -546,6 +546,7 @@ public: // modele składowe pojazdu std::string TextureTest(std::string const &name); void OverheadTrack(float o); double MED[9][8]; // lista zmiennych do debugowania hamulca ED + static std::string const MED_labels[ 8 ]; }; //--------------------------------------------------------------------------- diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index b381f0c8..a7cea124 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -773,6 +773,7 @@ public: double Ftmax = 0.0; /*- dla lokomotyw z silnikami indukcyjnymi -*/ double eimc[26]; + static std::vector const eimc_labels; /*-dla wagonow*/ double MaxLoad = 0.0; /*masa w T lub ilosc w sztukach - ladownosc*/ std::string LoadAccepted; std::string LoadQuantity; /*co moze byc zaladowane, jednostki miary*/ @@ -939,6 +940,7 @@ public: /*- zmienne dla lokomotyw z silnikami indukcyjnymi -*/ double eimv[21]; + static std::vector const eimv_labels; /*-zmienne dla drezyny*/ double PulseForce = 0.0; /*przylozona sila*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 63d3095b..ff60e7cf 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -22,6 +22,18 @@ http://mozilla.org/MPL/2.0/. const double dEpsilon = 0.01; // 1cm (zależy od typu sprzęgu...) const double CouplerTune = 0.1; // skalowanie tlumiennosci +std::vector const TMoverParameters::eimc_labels = { + "dfic: ", "dfmax:", "p: ", "scfu: ", "cim: ", "icif: ", "Uzmax:", "Uzh: ", "DU: ", "I0: ", + "fcfu: ", "F0: ", "a1: ", "Pmax: ", "Fh: ", "Ph: ", "Vh0: ", "Vh1: ", "Imax: ", "abed: ", + "eped: " +}; + +std::vector const TMoverParameters::eimv_labels = { + "Fkrt:", "Fmax:", "ks: ", "df: ", "fp: ", "Us: ", "pole:", "Ic: ", "If: ", "M: ", + "Fr: ", "Ipoj:", "Pm: ", "Pe: ", "eta: ", "fkr: ", "Uzsm:", "Pmax:", "Fzad:", "Imax:", + "Fful:" +}; + inline long Trunc(float f) { return (long)f; diff --git a/Train.cpp b/Train.cpp index f199dcc6..d7444fe8 100644 --- a/Train.cpp +++ b/Train.cpp @@ -205,6 +205,11 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::radiotoggle, &TTrain::OnCommand_radiotoggle } }; +std::vector const TTrain::fPress_labels = { + + "ch1: ", "ch2: ", "ch3: ", "ch4: ", "ch5: ", "ch6: ", "ch7: ", "ch8: ", "ch9: ", "ch0: " +}; + TTrain::TTrain() { ActiveUniversal4 = false; @@ -2767,7 +2772,10 @@ void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command ) if( Command.action == GLFW_PRESS ) { WriteLog( "Radio switch is missing, or wasn't defined" ); } +/* + // NOTE: we ignore the lack of 3d model to allow system reset after receiving radio-stop signal return; +*/ } if( Command.action == GLFW_PRESS ) { diff --git a/Train.h b/Train.h index 60e212fb..31482dba 100644 --- a/Train.h +++ b/Train.h @@ -484,6 +484,7 @@ public: // reszta może by?publiczna public: float fPress[20][3]; // cisnienia dla wszystkich czlonow + static std::vector const fPress_labels; float fEIMParams[9][10]; // parametry dla silnikow asynchronicznych int RadioChannel() { return iRadioChannel; }; inline TDynamicObject *Dynamic() { return DynamicObject; }; diff --git a/World.cpp b/World.cpp index 4a760c3f..52050a68 100644 --- a/World.cpp +++ b/World.cpp @@ -2131,21 +2131,22 @@ TWorld::Update_UI() { // induction motor data if( tmp->MoverParameters->EngineType == ElectricInductionMotor ) { - UITable->text_lines.emplace_back( " eimc: eimv: press:", Global::UITextColor ); + UITable->text_lines.emplace_back( " eimc: eimv: press:", Global::UITextColor ); for( int i = 0; i <= 20; ++i ) { std::string parameters = - to_string(tmp->MoverParameters->eimc[i], 2, 9) - + " " + to_string( tmp->MoverParameters->eimv[ i ], 2, 9 ); + tmp->MoverParameters->eimc_labels[ i ] + to_string( tmp->MoverParameters->eimc[ i ], 2, 9 ) + + " | " + + tmp->MoverParameters->eimv_labels[ i ] + to_string( tmp->MoverParameters->eimv[ i ], 2, 9 ); - if( i <= 10 ) { - parameters += " " + to_string( Train->fPress[ i ][ 0 ], 2, 9 ); + if( i < 10 ) { + parameters += " | " + Train->fPress_labels[i] + to_string( Train->fPress[ i ][ 0 ], 2, 9 ); } else if( i == 12 ) { - parameters += " med:"; + parameters += " med:"; } else if( i >= 13 ) { - parameters += " " + to_string( tmp->MED[ 0 ][ i - 13 ], 2, 9 ); + parameters += " | " + tmp->MED_labels[ i - 13 ] + to_string( tmp->MED[ 0 ][ i - 13 ], 2, 9 ); } UITable->text_lines.emplace_back( parameters, Global::UITextColor ); diff --git a/renderer.cpp b/renderer.cpp index 92e0eff5..15348ec3 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -167,8 +167,14 @@ opengl_renderer::Render( world_environment *Environment ) { ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); ::glPushMatrix(); +/* ::glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); - +*/ + glm::mat4 worldcamera; + World.Camera.SetMatrix( worldcamera ); + glLoadIdentity(); + glMultMatrixf( glm::value_ptr( glm::mat4( glm::mat3( worldcamera ) ) ) ); + // setup fog if( Global::fFogEnd > 0 ) { // fog setup From 3203ad1f6cd5387c54534ff9737e12a4fc5c928d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 7 May 2017 15:30:28 +0200 Subject: [PATCH 099/426] build 170507. vs2015 compliance --- Driver.h | 4 ++-- uilayer.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Driver.h b/Driver.h index dcbd3b81..d33a2510 100644 --- a/Driver.h +++ b/Driver.h @@ -173,8 +173,8 @@ class TController double fLastVel = 0.0; // prędkość na poprzednio sprawdzonym torze TTrack *tLast = nullptr; // ostatni analizowany tor TEvent *eSignSkip = nullptr; // można pominąć ten SBL po zatrzymaniu - std::size_t SemNextIndex{ -1 }; - std::size_t SemNextStopIndex{ -1 }; + std::size_t SemNextIndex{ std::size_t(-1) }; + std::size_t SemNextStopIndex{ std::size_t( -1 ) }; private: // parametry aktualnego składu double fLength = 0.0; // długość składu (do wyciągania z ograniczeń) double fMass = 0.0; // całkowita masa do liczenia stycznej składowej grawitacji diff --git a/uilayer.h b/uilayer.h index 65bcfefe..8966ec8b 100644 --- a/uilayer.h +++ b/uilayer.h @@ -76,7 +76,7 @@ private: // members: - GLuint m_fontbase{ -1 }; // numer DL dla znakw w napisach + GLuint m_fontbase{ (GLuint)-1 }; // numer DL dla znakw w napisach float m_progress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. texture_manager::size_type m_background; // path to texture used as the background. size depends on mAspect. From 54fc93f6e54f5a23af0e30daec9facbec052c74a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 8 May 2017 22:41:56 +0200 Subject: [PATCH 100/426] build 170508. fixes for local brake use and 3-way crossroad setup --- Driver.cpp | 5 +++-- Ground.cpp | 34 +++++++++++++++++++++++++++++++--- Ground.h | 10 +++++----- Track.cpp | 42 ++++++++++++++---------------------------- World.cpp | 4 ++-- renderer.cpp | 24 +++++++++++++++++++++++- renderer.h | 8 ++++++++ uilayer.cpp | 2 +- 8 files changed, 87 insertions(+), 42 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index cb32ce0b..b032d8e4 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2232,8 +2232,9 @@ bool TController::IncBrake() OK = mvOccupied->IncLocalBrakeLevel( std::floor( 1.5 + std::abs( AccDesired ) ) ); break; case Pneumatic: - if ((mvOccupied->Couplers[0].Connected == NULL) && - (mvOccupied->Couplers[1].Connected == NULL)) + // NOTE: can't perform just test whether connected vehicle == nullptr, due to virtual couplers formed with nearby vehicles + if ((mvOccupied->Couplers[0].CouplingFlag == 0) && + (mvOccupied->Couplers[1].CouplingFlag == 0)) OK = mvOccupied->IncLocalBrakeLevel( 1 + static_cast( std::floor( 0.5 + std::fabs(AccDesired))) ); // hamowanie lokalnym bo luzem jedzie else diff --git a/Ground.cpp b/Ground.cpp index c01957bb..4fd4ff9e 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -304,7 +304,7 @@ void TGroundNode::RenderVBO() { // renderowanie obiektu z VBO - faza nieprzezroc double distancesquared = SquareMagnitude( pCenter - Global::pCameraPosition ) / Global::ZoomFactor; if( ( distancesquared > ( fSquareRadius * Global::fDistanceFactor ) ) - || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { + || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { return; } @@ -318,6 +318,10 @@ void TGroundNode::RenderVBO() { // renderowanie obiektu z VBO - faza nieprzezroc Model->Render( &pCenter ); return; } + case TP_MEMCELL: { + GfxRenderer.Render( MemCell ); + return; + } } if( ( iFlags & 0x10 ) || ( fLineThickness < 0 ) ) { @@ -577,6 +581,10 @@ void TGroundNode::RenderDL() Model->Render( &pCenter ); return; } + case TP_MEMCELL: { + GfxRenderer.Render( MemCell ); + return; + } } // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 @@ -847,7 +855,12 @@ void TSubRect::NodeAdd(TGroundNode *Node) // Node->nNext3=nMeshed; //dopisanie do listy sortowania // nMeshed=Node; break; - case TP_MEMCELL: +#ifdef EU07_SCENERY_EDITOR + case TP_MEMCELL: { + m_memcells.emplace_back( Node ); + break; + } +#endif case TP_TRACTIONPOWERSOURCE: // a te w ogóle pomijamy // case TP_ISOLATED: //lista torów w obwodzie izolowanym - na razie ignorowana break; @@ -1173,7 +1186,14 @@ void TSubRect::RenderDL() node->RenderDL(); // nieprzezroczyste z mieszanych modeli for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDyn(); // nieprzezroczyste fragmenty pojazdów na torach - +#ifdef EU07_SCENERY_EDITOR + // memcells + if( DebugModeFlag ) { + for( auto const memcell : m_memcells ) { + memcell->RenderDL(); + } + } +#endif /* float width = 100.0f; float height = 25.0f; @@ -1246,6 +1266,14 @@ void TSubRect::RenderVBO() node->RenderVBO(); // nieprzezroczyste z mieszanych modeli for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDyn(); // nieprzezroczyste fragmenty pojazdów na torach +#ifdef EU07_SCENERY_EDITOR + // memcells + if( DebugModeFlag ) { + for( auto const memcell : m_memcells ) { + memcell->RenderVBO(); + } + } +#endif }; void TSubRect::RenderAlphaVBO() diff --git a/Ground.h b/Ground.h index 0c5722d7..707c127f 100644 --- a/Ground.h +++ b/Ground.h @@ -172,7 +172,6 @@ class TGroundNode : public Resource void Compile(bool many = false); void Release(); - bool GetTraction(); void RenderHidden(); // obsługa dźwięków i wyzwalaczy zdarzeń void RenderDL(); // renderowanie nieprzezroczystych w Display Lists @@ -201,16 +200,17 @@ class TSubRect : public Resource, public CMesh TGroundNode *nRootMesh = nullptr; // obiekty renderujące wg tekstury (wtórne, lista po nNext2) TGroundNode *nMeshed = nullptr; // lista obiektów dla których istnieją obiekty renderujące grupowo public: - TGroundNode * - nRootNode = nullptr; // wszystkie obiekty w sektorze, z wyjątkiem renderujących i pojazdów (nNext2) - TGroundNode * - nRenderHidden = nullptr; // lista obiektów niewidocznych, "renderowanych" również z tyłu (nNext3) + TGroundNode * nRootNode = nullptr; // wszystkie obiekty w sektorze, z wyjątkiem renderujących i pojazdów (nNext2) + TGroundNode * nRenderHidden = nullptr; // lista obiektów niewidocznych, "renderowanych" również z tyłu (nNext3) TGroundNode *nRenderRect = nullptr; // z poziomu sektora - nieprzezroczyste (nNext3) TGroundNode *nRenderRectAlpha = nullptr; // z poziomu sektora - przezroczyste (nNext3) TGroundNode *nRenderWires = nullptr; // z poziomu sektora - druty i inne linie (nNext3) TGroundNode *nRender = nullptr; // indywidualnie - nieprzezroczyste (nNext3) TGroundNode *nRenderMixed = nullptr; // indywidualnie - nieprzezroczyste i przezroczyste (nNext3) TGroundNode *nRenderAlpha = nullptr; // indywidualnie - przezroczyste (nNext3) +#ifdef EU07_SCENERY_EDITOR + std::deque< TGroundNode* > m_memcells; // collection of memcells present in the sector +#endif int iNodeCount = 0; // licznik obiektów, do pomijania pustych sektorów public: void LoadNodes(); // utworzenie VBO sektora diff --git a/Track.cpp b/Track.cpp index 3864b93b..7c77ea1d 100644 --- a/Track.cpp +++ b/Track.cpp @@ -176,7 +176,7 @@ void TTrack::Init() break; case tt_Cross: // tylko dla skrzyżowania dróg SwitchExtension = std::make_shared( this, 6 ); // 6 po³¹czeñ - SwitchExtension->vPoints = NULL; // brak tablicy punktów + SwitchExtension->vPoints = nullptr; // brak tablicy punktów SwitchExtension->iPoints = 0; SwitchExtension->bPoints = false; // tablica punktów nie wypełniona SwitchExtension->iRoads = 4; // domyślnie 4 @@ -647,31 +647,26 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) if (eType != tt_Cross) SwitchExtension->Segments[1]->Init(p3, p3 + cp3, p4 + cp4, p4, segsize, r3, r4); else - SwitchExtension->Segments[1]->Init(p4, p4 + cp4, p3 + cp3, p3, segsize, r4, - r3); // odwrócony + SwitchExtension->Segments[1]->Init(p4, p4 + cp4, p3 + cp3, p3, segsize, r4, r3); // odwrócony } else SwitchExtension->Segments[1]->Init(p3, p4, segsize, r3, r4); if (eType == tt_Cross) { // Ra 2014-07: dla skrzyżowań będą dodatkowe segmenty - SwitchExtension->Segments[2]->Init(p2, cp2 + p2, cp4 + p4, p4, segsize, r2, - r4); // z punktu 2 do 4 - if (LengthSquared3(p3 - p1) < - 0.01) // gdy mniej niż 10cm, to mamy skrzyżowanie trzech dróg + SwitchExtension->Segments[2]->Init(p2, cp2 + p2, cp4 + p4, p4, segsize, r2, r4); // z punktu 2 do 4 + if (LengthSquared3(p3 - p1) < 0.01) // gdy mniej niż 10cm, to mamy skrzyżowanie trzech dróg SwitchExtension->iRoads = 3; else // dla 4 dróg będą dodatkowe 3 segmenty { - SwitchExtension->Segments[3]->Init(p4, p4 + cp4, p1 + cp1, p1, segsize, r4, - r1); // z punktu 4 do 1 - SwitchExtension->Segments[4]->Init(p1, p1 + cp1, p3 + cp3, p3, segsize, r1, - r3); // z punktu 1 do 3 - SwitchExtension->Segments[5]->Init(p3, p3 + cp3, p2 + cp2, p2, segsize, r3, - r2); // z punktu 3 do 2 + SwitchExtension->Segments[3]->Init(p4, p4 + cp4, p1 + cp1, p1, segsize, r4, r1); // z punktu 4 do 1 + SwitchExtension->Segments[4]->Init(p1, p1 + cp1, p3 + cp3, p3, segsize, r1, r3); // z punktu 1 do 3 + SwitchExtension->Segments[5]->Init(p3, p3 + cp3, p2 + cp2, p2, segsize, r3, r2); // z punktu 3 do 2 } } Switch(0); // na stałe w położeniu 0 - nie ma początkowego stanu zwrotnicy we wpisie + if( eType == tt_Switch ) // Ra: zamienić później na iloczyn wektorowy { vector3 v1, v2; @@ -1673,24 +1668,15 @@ void TTrack::Compile(GLuint tex) SwitchExtension->Segments[5]->RenderLoft( rpts2, -3, fTexLength, 0, 1, &b, render); // tylko jeśli jest z lewej } - else // to będzie ewentualnie dla prostego na skrzyżowaniu trzech dróg - { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być - // prostoliniowe + else + // to będzie ewentualnie dla prostego na skrzyżowaniu trzech dróg + { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) // OK - SwitchExtension->Segments[2]->RenderLoft(rpts2, -3, fTexLength, 0, 1, &b, - render); // z P2 do P4 + SwitchExtension->Segments[2]->RenderLoft(rpts2, -3, fTexLength, 0, 1, &b, render); // z P2 do P4 if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) // OK - SwitchExtension->Segments[1]->RenderLoft( - rpts2, -3, fTexLength, 0, 1, &b, render); // z P4 do P3=P1 (odwrócony) + SwitchExtension->Segments[1]->RenderLoft(rpts2, -3, fTexLength, 0, 1, &b, render); // z P4 do P3=P1 (odwrócony) if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) // OK - SwitchExtension->Segments[0]->RenderLoft(rpts2, -3, fTexLength, 0, 1, &b, - render); // z P1 do P2 - /* - if ((fTexHeight1>=0.0)?true:(slop!=0.0)) - Segment->RenderLoft(rpts1,3,fTexLength); - if ((fTexHeight1>=0.0)?true:(side!=0.0)) - Segment->RenderLoft(rpts2,3,fTexLength); - */ + SwitchExtension->Segments[0]->RenderLoft(rpts2, -3, fTexLength, 0, 1, &b, render); // z P1 do P2 } } // renderowanie nawierzchni na końcu diff --git a/World.cpp b/World.cpp index 52050a68..cb003bfe 100644 --- a/World.cpp +++ b/World.cpp @@ -702,8 +702,8 @@ void TWorld::OnKeyDown(int cKey) Global::iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację } } - else if( Global::ctrlState && cKey == GLFW_KEY_PAUSE ) //[Ctrl]+[Break] - { // hamowanie wszystkich pojazdów w okolicy + else if( ( cKey == GLFW_KEY_PAUSE ) && ( Global::ctrlState ) ) { + //[Ctrl]+[Break] hamowanie wszystkich pojazdów w okolicy if (Controlled->MoverParameters->Radio) Ground.RadioStop(Camera.Pos); } diff --git a/renderer.cpp b/renderer.cpp index 15348ec3..c3c7e85f 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -112,6 +112,10 @@ opengl_renderer::Init( GLFWwindow *Window ) { m_moontextureid = GetTextureId( "fx\\moon", szTexturePath ); WriteLog( "...gfx data pre-loading done" ); + // prepare debug mode objects + m_quadric = gluNewQuadric(); + gluQuadricNormals( m_quadric, GLU_FLAT ); + return true; } @@ -585,7 +589,25 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Submodel->Next ) if( Submodel->iAlpha & Submodel->iFlags & 0x1F000000 ) Render( Submodel->Next ); // dalsze rekurencyjnie -}; +} + +void +opengl_renderer::Render( TMemCell *Memcell ) { + + ::glPushAttrib( GL_ENABLE_BIT ); +// ::glDisable( GL_LIGHTING ); + ::glDisable( GL_TEXTURE_2D ); +// ::glEnable( GL_BLEND ); + ::glPushMatrix(); + + auto const position = Memcell->Position(); + ::glTranslated( position.x, position.y + 0.5, position.z ); + ::glColor3f( 0.36f, 0.75f, 0.35f ); + ::gluSphere( m_quadric, 0.35, 4, 2 ); + + ::glPopMatrix(); + ::glPopAttrib(); +} bool opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { diff --git a/renderer.h b/renderer.h index 2ac84e34..7f779308 100644 --- a/renderer.h +++ b/renderer.h @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "dumb3d.h" #include "frustum.h" #include "world.h" +#include "memcell.h" struct opengl_light { @@ -110,6 +111,9 @@ class opengl_renderer { public: // types +// destructor + ~opengl_renderer() { gluDeleteQuadric( m_quadric ); } + // methods bool Init( GLFWwindow *Window ); @@ -128,6 +132,8 @@ public: Render( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); void Render( TSubModel *Submodel ); + void + Render( TMemCell *Memcell ); bool Render_Alpha( TDynamicObject *Dynamic ); bool @@ -196,6 +202,8 @@ private: texture_manager::size_type m_glaretextureid{ -1 }; texture_manager::size_type m_suntextureid{ -1 }; texture_manager::size_type m_moontextureid{ -1 }; + GLUquadricObj *m_quadric; // helper object for drawing debug mode scene elements + }; extern opengl_renderer GfxRenderer; diff --git a/uilayer.cpp b/uilayer.cpp index a7e3f8ec..dcad5b58 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -140,7 +140,7 @@ ui_layer::render_panels() { glPushAttrib( GL_ENABLE_BIT ); glDisable( GL_TEXTURE_2D ); - float const width = std::min( 4.0f / 3.0f, static_cast(Global::iWindowWidth) / Global::iWindowHeight ) * Global::iWindowHeight; + float const width = std::min( 4.0f / 3.0f, static_cast(Global::iWindowWidth) / std::max( 1, Global::iWindowHeight ) ) * Global::iWindowHeight; float const height = Global::iWindowHeight / 768.0; for( auto const &panel : m_panels ) { From 6655011af77e255073a0513a4b0de62a3d87b4f1 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 9 May 2017 20:26:22 +0200 Subject: [PATCH 101/426] build 170509. minor fixes for pantograph logic and speed table calculations --- Driver.cpp | 11 +++++++++++ DynObj.cpp | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/Driver.cpp b/Driver.cpp index b032d8e4..6cde0078 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -226,6 +226,15 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) } } } + else { + if( fDist < 50.0 ) { + // old sceneries use trick of placing 'helper' semaphores underground, which can lead to vehicles running over them instead of stopping in front of them + // to account for it at short distances we redo distance calculation on 2d plane + fDist = glm::dot( + glm::vec3( v.x, 0.0, v.z ), + glm::vec3( dir->x, 0.0, dir->z ) ); + } + } } if (fDist > 0.0) // nie może być 0.0, a przypadkiem mogło by się trafić i było by źle @@ -391,6 +400,8 @@ void TController::TableClear() iTableDirection = 0; // nieznany tLast = nullptr; fLastVel = -1.0; + SemNextIndex = -1; + SemNextStopIndex = -1; eSignSkip = nullptr; // nic nie pomijamy }; diff --git a/DynObj.cpp b/DynObj.cpp index c0b3345d..28336bae 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2943,8 +2943,11 @@ bool TDynamicObject::Update(double dt, double dt1) // drop pantographs // NOTE: this isn't universal behaviour // TODO: have this dependant on .fiz-driven flag + // NOTE: moved to pantspeed calculation part a little later in the function. all remarks and todo still apply +/* MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); +*/ } } @@ -3226,6 +3229,10 @@ bool TDynamicObject::Update(double dt, double dt1) else { pantspeedfactor = 0.0; } + if( ( false == MoverParameters->Battery ) + && ( false == MoverParameters->ConverterFlag ) ) { + pantspeedfactor = 0.0; + } pantspeedfactor = std::max( 0.0, pantspeedfactor ); k = p->fAngleL; if( ( pantspeedfactor > 0.0 ) From 5544ed33e9c5eddd6a9cbfaa2cff3c797185d251 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 12 May 2017 00:10:40 +0200 Subject: [PATCH 102/426] build 170511. crossroad generation for vbo render path. partial unification of generation and render functions for tracks and ground nodes --- Driver.cpp | 4 +- Ground.cpp | 205 ++------ Ground.h | 45 +- Segment.cpp | 887 ++++++++-------------------------- Segment.h | 23 +- Track.cpp | 1298 ++++++++++++++++++++++++++++---------------------- dumb3d.h | 8 +- renderer.cpp | 305 +++++++++++- renderer.h | 4 + 9 files changed, 1250 insertions(+), 1529 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 6cde0078..cf192ad7 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -230,9 +230,7 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) if( fDist < 50.0 ) { // old sceneries use trick of placing 'helper' semaphores underground, which can lead to vehicles running over them instead of stopping in front of them // to account for it at short distances we redo distance calculation on 2d plane - fDist = glm::dot( - glm::vec3( v.x, 0.0, v.z ), - glm::vec3( dir->x, 0.0, dir->z ) ); + fDist = glm::length( glm::vec3( v.x, 0.0, v.z ) ); } } } diff --git a/Ground.cpp b/Ground.cpp index 4fd4ff9e..e8d6a2dc 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -290,16 +290,13 @@ void TGroundNode::RaRenderVBO() glDrawArrays(iType, iVboPtr, iNumVerts); // Narysuj naraz wszystkie trójkąty } +#ifdef EU07_USE_OLD_RENDERCODE void TGroundNode::RenderVBO() { // renderowanie obiektu z VBO - faza nieprzezroczystych switch( iType ) { // obiekty renderowane niezależnie od odległości case TP_SUBMODEL: TSubModel::fSquareDist = 0; -#ifdef EU07_USE_OLD_RENDERCODE - return smTerrain->RenderDL(); -#else GfxRenderer.Render( smTerrain ); -#endif } double distancesquared = SquareMagnitude( pCenter - Global::pCameraPosition ) / Global::ZoomFactor; @@ -334,15 +331,9 @@ void TGroundNode::RenderVBO() { // renderowanie obiektu z VBO - faza nieprzezroc if( linealpha > 255 ) linealpha = 255; float r, g, b; -#ifdef EU07_USE_OLD_LIGHTING_MODEL - r = floor( Diffuse[ 0 ] * Global::ambientDayLight[ 0 ] ); // w zaleznosci od koloru swiatla - g = floor( Diffuse[ 1 ] * Global::ambientDayLight[ 1 ] ); - b = floor( Diffuse[ 2 ] * Global::ambientDayLight[ 2 ] ); -#else r = floor( Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ); // w zaleznosci od koloru swiatla g = floor( Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ); b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); -#endif glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii GfxRenderer.Bind( 0 ); @@ -436,6 +427,8 @@ void TGroundNode::RenderAlphaVBO() #endif } +#endif + void TGroundNode::Compile(bool many) { // tworzenie skompilowanej listy w wyświetlaniu DL if (!many) @@ -451,49 +444,28 @@ void TGroundNode::Compile(bool many) } if ((iType == GL_LINES) || (iType == GL_LINE_STRIP) || (iType == GL_LINE_LOOP)) { -#ifdef USE_VERTEX_ARRAYS - glVertexPointer(3, GL_DOUBLE, sizeof(vector3), &Points[0].x); - glDrawArrays(iType, 0, iNumPts); -#else glBegin(iType); for (int i = 0; i < iNumPts; i++) glVertex3dv(&Points[i].x); glEnd(); -#endif } else if (iType == GL_TRIANGLE_STRIP || iType == GL_TRIANGLE_FAN || iType == GL_TRIANGLES) { // jak nie linie, to trójkąty TGroundNode *tri = this; do { // pętla po obiektach w grupie w celu połączenia siatek -#ifdef USE_VERTEX_ARRAYS - glVertexPointer(3, GL_DOUBLE, sizeof(TGroundVertex), &tri->Vertices[0].Point.x); - glNormalPointer(GL_DOUBLE, sizeof(TGroundVertex), &tri->Vertices[0].Normal.x); - glTexCoordPointer(2, GL_FLOAT, sizeof(TGroundVertex), &tri->Vertices[0].tu); -#endif + // TODO: eliminate these calls, they're duplicated by setup part in the unified render function glColor3ub(tri->Diffuse[0], tri->Diffuse[1], tri->Diffuse[2]); GfxRenderer.Bind(Global::bWireFrame ? 0 : tri->TextureID); -#ifdef USE_VERTEX_ARRAYS - glDrawArrays(Global::bWireFrame ? GL_LINE_LOOP : tri->iType, 0, tri->iNumVerts); -#else + glBegin(Global::bWireFrame ? GL_LINE_LOOP : tri->iType); for (int i = 0; i < tri->iNumVerts; i++) { - glNormal3d(tri->Vertices[i].Normal.x, tri->Vertices[i].Normal.y, - tri->Vertices[i].Normal.z); + glNormal3dv(&tri->Vertices[i].Normal.x); glTexCoord2f(tri->Vertices[i].tu, tri->Vertices[i].tv); glVertex3dv(&tri->Vertices[i].Point.x); }; glEnd(); -#endif - /* - if (tri->pTriGroup) //jeśli z grupy - {tri=tri->pNext2; //następny w sektorze - while (tri?!tri->pTriGroup:false) tri=tri->pNext2; //szukamy kolejnego należącego do - grupy - } - else - */ tri = NULL; // a jak nie, to koniec } while (tri); } @@ -552,17 +524,14 @@ void TGroundNode::RenderHidden() } }; +#ifdef EU07_USE_OLD_RENDERCODE void TGroundNode::RenderDL() { // wyświetlanie obiektu przez Display List switch (iType) { // obiekty renderowane niezależnie od odległości case TP_SUBMODEL: TSubModel::fSquareDist = 0; -#ifdef EU07_USE_OLD_RENDERCODE - return smTerrain->RenderDL(); -#else GfxRenderer.Render( smTerrain ); -#endif } double distancesquared = SquareMagnitude(pCenter - Global::pCameraPosition) / Global::ZoomFactor; @@ -605,15 +574,9 @@ void TGroundNode::RenderDL() if( linealpha > 255 ) linealpha = 255; float r, g, b; -#ifdef EU07_USE_OLD_LIGHTING_MODEL - r = floor( Diffuse[ 0 ] * Global::ambientDayLight[ 0 ] ); // w zaleznosci od koloru swiatla - g = floor( Diffuse[ 1 ] * Global::ambientDayLight[ 1 ] ); - b = floor( Diffuse[ 2 ] * Global::ambientDayLight[ 2 ] ); -#else r = floor( Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ); // w zaleznosci od koloru swiatla g = floor( Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ); b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); -#endif glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii GfxRenderer.Bind( 0 ); @@ -689,15 +652,9 @@ void TGroundNode::RenderAlphaDL() float linealpha = 255000 * fLineThickness / ( distancesquared + 1.0 ); if (linealpha > 255) linealpha = 255; -#ifdef EU07_USE_OLD_LIGHTING_MODEL - r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla - g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; - b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; -#else float r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla float g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; float b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; -#endif glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii GfxRenderer.Bind( 0 ); @@ -720,6 +677,7 @@ void TGroundNode::RenderAlphaDL() } #endif } +#endif //------------------------------------------------------------------------------ //------------------ Podstawowy pojemnik terenu - sektor ----------------------- @@ -1093,8 +1051,7 @@ void TSubRect::LoadNodes() case GL_LINE_STRIP: case GL_LINE_LOOP: n->iVboPtr = m_nVertexCount; // nowy początek - m_nVertexCount += - n->iNumPts; // miejsce w tablicach normalnych i teksturowania się zmarnuje... + m_nVertexCount += n->iNumPts; // miejsce w tablicach normalnych i teksturowania się zmarnuje... break; case TP_TRACK: n->iVboPtr = m_nVertexCount; // nowy początek @@ -1180,10 +1137,10 @@ void TSubRect::RenderDL() { // renderowanie nieprzezroczystych (DL) TGroundNode *node; RaAnimate(); // przeliczenia animacji torów w sektorze - for (node = nRender; node; node = node->nNext3) - node->RenderDL(); // nieprzezroczyste obiekty (oprócz pojazdów) + for( node = nRender; node; node = node->nNext3 ) + GfxRenderer.Render( node ); // nieprzezroczyste obiekty (oprócz pojazdów) for (node = nRenderMixed; node; node = node->nNext3) - node->RenderDL(); // nieprzezroczyste z mieszanych modeli + GfxRenderer.Render( node ); // nieprzezroczyste z mieszanych modeli for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDyn(); // nieprzezroczyste fragmenty pojazdów na torach #ifdef EU07_SCENERY_EDITOR @@ -1237,13 +1194,10 @@ void TSubRect::RenderDL() void TSubRect::RenderAlphaDL() { // renderowanie przezroczystych modeli oraz pojazdów (DL) TGroundNode *node; - for (node = nRenderMixed; node; node = node->nNext3) - node->RenderAlphaDL(); // przezroczyste z mieszanych modeli - for (node = nRenderAlpha; node; node = node->nNext3) - node->RenderAlphaDL(); // przezroczyste modele - // for (node=tmp->nRender;node;node=node->nNext3) - // if (node->iType==TP_TRACK) - // node->pTrack->RenderAlpha(); //przezroczyste fragmenty pojazdów na torach + for( node = nRenderMixed; node; node = node->nNext3 ) + GfxRenderer.Render_Alpha( node ); // przezroczyste z mieszanych modeli + for( node = nRenderAlpha; node; node = node->nNext3 ) + GfxRenderer.Render_Alpha( node ); // przezroczyste modele for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach }; @@ -1255,15 +1209,15 @@ void TSubRect::RenderVBO() LoadNodes(); // czemu tutaj? if (StartVBO()) { - for (node = nRenderRect; node; node = node->nNext3) - if (node->iVboPtr >= 0) - node->RenderVBO(); // nieprzezroczyste obiekty terenu + for( node = nRenderRect; node; node = node->nNext3 ) + if( node->iVboPtr >= 0 ) + GfxRenderer.Render( node ); // nieprzezroczyste obiekty terenu EndVBO(); } - for (node = nRender; node; node = node->nNext3) - node->RenderVBO(); // nieprzezroczyste obiekty (oprócz pojazdów) + for( node = nRender; node; node = node->nNext3 ) + GfxRenderer.Render( node ); // nieprzezroczyste obiekty (oprócz pojazdów) for (node = nRenderMixed; node; node = node->nNext3) - node->RenderVBO(); // nieprzezroczyste z mieszanych modeli + GfxRenderer.Render( node ); // nieprzezroczyste z mieszanych modeli for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDyn(); // nieprzezroczyste fragmenty pojazdów na torach #ifdef EU07_SCENERY_EDITOR @@ -1279,13 +1233,10 @@ void TSubRect::RenderVBO() void TSubRect::RenderAlphaVBO() { // renderowanie przezroczystych modeli oraz pojazdów (VBO) TGroundNode *node; - for (node = nRenderMixed; node; node = node->nNext3) - node->RenderAlphaVBO(); // przezroczyste z mieszanych modeli - for (node = nRenderAlpha; node; node = node->nNext3) - node->RenderAlphaVBO(); // przezroczyste modele - // for (node=tmp->nRender;node;node=node->nNext3) - // if (node->iType==TP_TRACK) - // node->pTrack->RenderAlpha(); //przezroczyste fragmenty pojazdów na torach + for( node = nRenderMixed; node; node = node->nNext3 ) + GfxRenderer.Render_Alpha( node ); // przezroczyste z mieszanych modeli + for( node = nRenderAlpha; node; node = node->nNext3 ) + GfxRenderer.Render_Alpha( node ); // przezroczyste modele for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach }; @@ -1300,8 +1251,6 @@ void TSubRect::RenderSounds() //--------------------------------------------------------------------------- int TGroundRect::iFrameNumber = 0; // licznik wyświetlanych klatek -//TGroundRect::TGroundRect( float3 const &Position, float const Radius = 1000.0f * M_SQRT2 ) : - TGroundRect::~TGroundRect() { SafeDeleteArray(pSubRects); @@ -1343,50 +1292,12 @@ void TGroundRect::RenderDL() node->Compile(true); glEndList(); } - nRender->RenderDL(); // nieprzezroczyste trójkąty kwadratu kilometrowego + GfxRenderer.Render( nRender ); // nieprzezroczyste trójkąty kwadratu kilometrowego } - if (nRootMesh) - nRootMesh->RenderDL(); + if( nRootMesh ) + GfxRenderer.Render( nRootMesh ); iLastDisplay = iFrameNumber; // drugi raz nie potrzeba } -/* - float width = 500.0f; - float height = 50.0f; - float3 vTopLeftFront( m_area.center.x - width, m_area.center.y + height, m_area.center.z + width ); - float3 vTopLeftBack( m_area.center.x - width, m_area.center.y + height, m_area.center.z - width ); - float3 vTopRightBack( m_area.center.x + width, m_area.center.y + height, m_area.center.z - width ); - float3 vTopRightFront( m_area.center.x + width, m_area.center.y + height, m_area.center.z + width ); - - float3 vBottom_LeftFront( m_area.center.x - width, m_area.center.y - height, m_area.center.z + width ); - float3 vBottom_LeftBack( m_area.center.x - width, m_area.center.y - height, m_area.center.z - width ); - float3 vBottomRightBack( m_area.center.x + width, m_area.center.y - height, m_area.center.z - width ); - float3 vBottomRightFront( m_area.center.x + width, m_area.center.y - height, m_area.center.z + width ); - - glDisable( GL_LIGHTING ); - glDisable( GL_TEXTURE_2D ); - glColor3ub( 0, 255, 255 ); - glBegin( GL_LINE_LOOP ); - glVertex3fv( &vTopLeftFront.x ); - glVertex3fv( &vTopLeftBack.x ); - glVertex3fv( &vTopRightBack.x ); - glVertex3fv( &vTopRightFront.x ); - glEnd(); - glBegin( GL_LINE_LOOP ); - glVertex3fv( &vBottom_LeftFront.x ); - glVertex3fv( &vBottom_LeftBack.x ); - glVertex3fv( &vBottomRightBack.x ); - glVertex3fv( &vBottomRightFront.x ); - glEnd(); - glBegin( GL_LINES ); - glVertex3fv( &vTopLeftFront.x ); glVertex3fv( &vBottom_LeftFront.x ); - glVertex3fv( &vTopLeftBack.x ); glVertex3fv( &vBottom_LeftBack.x ); - glVertex3fv( &vTopRightBack.x ); glVertex3fv( &vBottomRightBack.x ); - glVertex3fv( &vTopRightFront.x ); glVertex3fv( &vBottomRightFront.x ); - glEnd(); - glColor3ub( 255, 255, 255 ); - glEnable( GL_TEXTURE_2D ); - glEnable( GL_LIGHTING ); -*/ }; void TGroundRect::RenderVBO() @@ -1410,46 +1321,8 @@ void TGroundRect::RenderVBO() //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -void TGround::MoveGroundNode(vector3 pPosition) -{ // Ra: to wymaga gruntownej reformy - /* - TGroundNode *Current; - for (Current=RootNode;Current!=NULL;Current=Current->Next) - Current->MoveMe(pPosition); - - TGroundRect *Rectx=new TGroundRect; //kwadrat kilometrowy - for(int i=0;iNext) - {//rozłożenie obiektów na mapie - if (Current->iType!=TP_DYNAMIC) - {//pojazdów to w ogóle nie dotyczy - if ((Current->iType!=GL_TRIANGLES)&&(Current->iType!=GL_TRIANGLE_STRIP)?true //~czy trójkąt? - :(Current->iFlags&0x20)?true //~czy teksturę ma nieprzezroczystą? - //:(Current->iNumVerts!=3)?true //~czy tylko jeden trójkąt? - :(Current->fSquareMinRadius!=0.0)?true //~czy widoczny z bliska? - :(Current->fSquareRadius<=90000.0)) //~czy widoczny z daleka? - GetSubRect(Current->pCenter.x,Current->pCenter.z)->AddNode(Current); - else //dodajemy do kwadratu kilometrowego - GetRect(Current->pCenter.x,Current->pCenter.z)->AddNode(Current); - } - } - for (Current=RootDynamic;Current!=NULL;Current=Current->Next) - { - Current->pCenter+=pPosition; - Current->DynamicObject->UpdatePos(); - } - for (Current=RootDynamic;Current!=NULL;Current=Current->Next) - Current->DynamicObject->MoverParameters->Physic_ReActivation(); - */ -} - std::vector TempVerts; -/* -TGroundVertex TempVerts[ 10000 ]; // tu wczytywane s¹ trójk¹ty -*/ + BYTE TempConnectionType[ 200 ]; // Ra: sprzêgi w sk³adzie; ujemne, gdy odwrotnie TGround::TGround() @@ -4856,8 +4729,8 @@ bool TGround::RenderAlphaDL(vector3 pPosition) for (i = iRendered - 1; i >= 0; --i) // od najdalszych { // przezroczyste trójkąty w oddzielnym cyklu przed modelami tmp = pRendered[i]; - for (node = tmp->nRenderRectAlpha; node; node = node->nNext3) - node->RenderAlphaDL(); // przezroczyste modele + for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) + GfxRenderer.Render_Alpha( node ); // przezroczyste modele } for (i = iRendered - 1; i >= 0; --i) // od najdalszych { // renderowanie przezroczystych modeli oraz pojazdów @@ -4867,8 +4740,8 @@ bool TGround::RenderAlphaDL(vector3 pPosition) for (i = iRendered - 1; i >= 0; --i) // od najdalszych { // druty na końcu, żeby się nie robiły białe plamy na tle lasu tmp = pRendered[i]; - for (node = tmp->nRenderWires; node; node = node->nNext3) - node->RenderAlphaDL(); // druty + for( node = tmp->nRenderWires; node; node = node->nNext3 ) + GfxRenderer.Render_Alpha( node ); // druty } return true; } @@ -4954,9 +4827,9 @@ bool TGround::RenderAlphaVBO(vector3 pPosition) tmp->LoadNodes(); // ewentualne tworzenie siatek if (tmp->StartVBO()) { - for (node = tmp->nRenderRectAlpha; node; node = node->nNext3) - if (node->iVboPtr >= 0) - node->RenderAlphaVBO(); // nieprzezroczyste obiekty terenu + for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) + if( node->iVboPtr >= 0 ) + GfxRenderer.Render_Alpha( node ); // nieprzezroczyste obiekty terenu tmp->EndVBO(); } } @@ -4968,8 +4841,8 @@ bool TGround::RenderAlphaVBO(vector3 pPosition) tmp = pRendered[i]; if (tmp->StartVBO()) { - for (node = tmp->nRenderWires; node; node = node->nNext3) - node->RenderAlphaVBO(); // przezroczyste modele + for( node = tmp->nRenderWires; node; node = node->nNext3 ) + GfxRenderer.Render_Alpha( node ); // przezroczyste modele tmp->EndVBO(); } } diff --git a/Ground.h b/Ground.h index 707c127f..1a87a442 100644 --- a/Ground.h +++ b/Ground.h @@ -101,8 +101,11 @@ class TSubRect; // sektor (aktualnie 200m×200m, ale może być zmieniony) class TGroundNode : public Resource { // obiekt scenerii - private: - public: + + friend class opengl_renderer; + +private: +public: TGroundNodeType iType; // typ obiektu union { // Ra: wskażniki zależne od typu - zrobić klasy dziedziczone zamiast @@ -130,12 +133,7 @@ class TGroundNode : public Resource }; vector3 pCenter; // współrzędne środka do przydzielenia sektora - union - { - // double fAngle; //kąt obrotu dla modelu - double fLineThickness; // McZapkie-120702: grubosc linii - // int Status; //McZapkie-170303: status dzwieku - }; + double fLineThickness; // McZapkie-120702: grubosc linii double fSquareRadius; // kwadrat widoczności do double fSquareMinRadius; // kwadrat widoczności od // TGroundNode *nMeshGroup; //Ra: obiekt grupujący trójkąty w TSubRect dla tekstury @@ -174,12 +172,8 @@ class TGroundNode : public Resource void Release(); void RenderHidden(); // obsługa dźwięków i wyzwalaczy zdarzeń - void RenderDL(); // renderowanie nieprzezroczystych w Display Lists - void RenderAlphaDL(); // renderowanie przezroczystych w Display Lists // (McZapkie-131202) void RaRenderVBO(); // renderowanie (nieprzezroczystych) ze wspólnego VBO - void RenderVBO(); // renderowanie nieprzezroczystych z własnego VBO - void RenderAlphaVBO(); // renderowanie przezroczystych z (własnego) VBO }; @@ -313,9 +307,6 @@ class TGround public: bool bDynamicRemove = false; // czy uruchomić procedurę usuwania pojazdów TDynamicObject *LastDyn = nullptr; // ABu: paskudnie, ale na bardzo szybko moze jakos przejdzie... - // TTrain *pTrain; - // double fVDozwolona; - // bool bTrabil; TGround(); ~TGround(); @@ -329,7 +320,6 @@ class TGround TTrack * FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclude); TTraction * FindTraction(vector3 *Point, int &iConnection, TGroundNode *Exclude); TTraction * TractionNearestFind(vector3 &p, int dir, TGroundNode *n); - // TGroundNode* CreateGroundNode(); TGroundNode * AddGroundNode(cParser *parser); bool AddGroundNode(double x, double z, TGroundNode *Node) { @@ -342,11 +332,6 @@ class TGround else return false; }; - // bool Include(TQueryParserComp *Parser); - // TGroundNode* GetVisible(AnsiString asName); - TGroundNode * GetNode(std::string asName); - bool AddDynamic(TGroundNode *Node); - void MoveGroundNode(vector3 pPosition); void UpdatePhys(double dt, int iter); // aktualizacja fizyki stałym krokiem bool Update(double dt, int iter); // aktualizacja przesunięć zgodna z FPS void Update_Lights(); // updates scene lights array @@ -358,23 +343,6 @@ class TGround bool RenderVBO(vector3 pPosition); bool RenderAlphaVBO(vector3 pPosition); bool CheckQuery(); - // GetRect(double x, double z) { return - // &(Rects[int(x/fSubRectSize+fHalfNumRects)][int(z/fSubRectSize+fHalfNumRects)]); }; - /* - int GetRowFromZ(double z) { return (z/fRectSize+fHalfNumRects); }; - int GetColFromX(double x) { return (x/fRectSize+fHalfNumRects); }; - int GetSubRowFromZ(double z) { return (z/fSubRectSize+fHalfNumSubRects); }; - int GetSubColFromX(double x) { return (x/fSubRectSize+fHalfNumSubRects); }; - */ - /* - inline TGroundNode* FindGroundNode(const AnsiString &asNameToFind ) - { - if (RootNode) - return (RootNode->Find( asNameToFind )); - else - return NULL; - } - */ TGroundNode * DynamicFindAny(std::string asNameToFind); TGroundNode * DynamicFind(std::string asNameToFind); void DynamicList(bool all = false); @@ -419,7 +387,6 @@ class TGround void WyslijNamiary(TGroundNode *t); void WyslijParam(int nr, int fl); void WyslijUszkodzenia(const std::string &t, char fl); - void WyslijPojazdy(int nr); // -> skladanie wielu pojazdow void WyslijObsadzone(); // -> skladanie wielu pojazdow void RadioStop(vector3 pPosition); TDynamicObject * DynamicNearest(vector3 pPosition, double distance = 20.0, diff --git a/Segment.cpp b/Segment.cpp index 27c133a0..1455414b 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -19,12 +19,6 @@ http://mozilla.org/MPL/2.0/. // 101206 Ra: trapezoidalne drogi // 110806 Ra: odwrócone mapowanie wzdłuż - Point1 == 1.0 - -float Interpolate( float const First, float const Second, float const Factor ) { - - return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); -} - std::string Where(vector3 p) { // zamiana współrzędnych na tekst, używana w błędach return std::to_string(p.x) + " " + std::to_string(p.y) + " " + std::to_string(p.z); @@ -122,15 +116,14 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI // MessageBox(0,"Length<=0","TSegment::Init",MB_OK); return false; // zerowe nie mogą być } - fStoop = atan2((Point2.y - Point1.y), - fLength); // pochylenie toru prostego, żeby nie liczyć wielokrotnie + fStoop = std::atan2((Point2.y - Point1.y), fLength); // pochylenie toru prostego, żeby nie liczyć wielokrotnie SafeDeleteArray(fTsBuffer); if( ( bCurve ) && ( fStep > 0 ) ) { if( fStep > 0 ) { // Ra: prosty dostanie podział, jak ma różną przechyłkę na końcach double s = 0; int i = 0; - iSegCount = ceil( fLength / fStep ); // potrzebne do VBO + iSegCount = static_cast( std::ceil( fLength / fStep )); // potrzebne do VBO // fStep=fLength/(double)(iSegCount-1); //wyrównanie podziału fTsBuffer = new double[ iSegCount + 1 ]; fTsBuffer[ 0 ] = 0; /* TODO : fix fTsBuffer */ @@ -324,408 +317,213 @@ vector3 TSegment::FastGetPoint(double t) return (bCurve ? RaInterpolate(t) : ((1.0 - t) * Point1 + (t)*Point2)); } -void TSegment::RenderLoft(const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, - int iSkip, int iQualityFactor, vector3 **p, bool bRender) +void TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, bool Onlypositions, vector3 **p, bool bRender) { // generowanie trójkątów dla odcinka trajektorii ruchu // standardowo tworzy triangle_strip dla prostego albo ich zestaw dla łuku // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli // podany jest przekrój końcowy // podsypka toru jest robiona za pomocą 6 punktów, szyna 12, drogi i rzeki na 3+2+3 - if (iQualityFactor < 1) - iQualityFactor = 1; // co który segment ma być uwzględniony + if( !fTsBuffer ) + return; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę + vector3 pos1, pos2, dir, parallel1, parallel2, pt, norm; - double s, step, fOffset, tv1, tv2, t; - int i, j; - bool trapez = iNumShapePoints < 0; // sygnalizacja trapezowatości - iNumShapePoints = abs(iNumShapePoints); - if (bCurve) - { - double m1, jmm1, m2, jmm2; // pozycje względne na odcinku 0...1 (ale nie parametr Beziera) - tv1 = 1.0; // Ra: to by można było wyliczać dla odcinka, wyglądało by lepiej - step = fStep * iQualityFactor; - s = fStep * iSkip; // iSkip - ile odcinków z początku pominąć - i = iSkip; // domyślnie 0 - if (!fTsBuffer) - return; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę - if (i > iSegCount) - return; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę - t = fTsBuffer[i]; // tabela watości t dla segmentów - fOffset = 0.1 / fLength; // pierwsze 10cm - pos1 = FastGetPoint(t); // wektor początku segmentu - dir = FastGetDirection(t, fOffset); // wektor kierunku - // parallel1=Normalize(CrossProduct(dir,vector3(0,1,0))); //wektor poprzeczny - parallel1 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - m2 = s / fLength; - jmm2 = 1.0 - m2; - while (s < fLength) - { - // step=SquareMagnitude(Global::GetCameraPosition()+pos); - i += iQualityFactor; // kolejny punkt łamanej - s += step; // końcowa pozycja segmentu [m] - m1 = m2; - jmm1 = jmm2; // stara pozycja - m2 = s / fLength; - jmm2 = 1.0 - m2; // nowa pozycja - if (s > fLength - 0.5) // Ra: -0.5 żeby nie robiło cieniasa na końcu - { // gdy przekroczyliśmy koniec - stąd dziury w torach... - step -= (s - fLength); // jeszcze do wyliczenia mapowania potrzebny - s = fLength; - i = iSegCount; // 20/5 ma dawać 4 - m2 = 1.0; - jmm2 = 0.0; - } - while (tv1 < 0.0) - tv1 += 1.0; // przestawienie mapowania - tv2 = tv1 - step / fTextureLength; // mapowanie na końcu segmentu - t = fTsBuffer[i]; // szybsze od GetTFromS(s); - pos2 = FastGetPoint(t); - dir = FastGetDirection(t, fOffset); // nowy wektor kierunku - // parallel2=CrossProduct(dir,vector3(0,1,0)); //wektor poprzeczny - parallel2 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - glBegin(GL_TRIANGLE_STRIP); - if (trapez) - for (j = 0; j < iNumShapePoints; j++) - { - norm = (jmm1 * ShapePoints[j].n.x + m1 * ShapePoints[j + iNumShapePoints].n.x) * - parallel1; - norm.y += jmm1 * ShapePoints[j].n.y + m1 * ShapePoints[j + iNumShapePoints].n.y; - pt = parallel1 * - (jmm1 * ShapePoints[j].x + m1 * ShapePoints[j + iNumShapePoints].x) + - pos1; - pt.y += jmm1 * ShapePoints[j].y + m1 * ShapePoints[j + iNumShapePoints].y; - if (bRender) - { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale - // potrzebować punktów - glNormal3f(norm.x, norm.y, norm.z); - glTexCoord2f( - jmm1 * ShapePoints[j].z + m1 * ShapePoints[j + iNumShapePoints].z, tv1); - glVertex3f(pt.x, pt.y, pt.z); // pt nie mamy gdzie zapamiętać? - } - // BUG: things blow up badly in the following part in 64bit version on baltyk.scn - // TODO: sort this mess out when the time comes to reorganize spline generation - if( p ) // jeśli jest wskaźnik do tablicy - if (*p) - if (!j) // to dla pierwszego punktu - { - *(*p) = pt; - (*p)++; - } // zapamiętanie brzegu jezdni - // dla trapezu drugi koniec ma inne współrzędne - norm = (jmm1 * ShapePoints[j].n.x + m1 * ShapePoints[j + iNumShapePoints].n.x) * - parallel2; - norm.y += jmm1 * ShapePoints[j].n.y + m1 * ShapePoints[j + iNumShapePoints].n.y; - pt = parallel2 * - (jmm2 * ShapePoints[j].x + m2 * ShapePoints[j + iNumShapePoints].x) + - pos2; - pt.y += jmm2 * ShapePoints[j].y + m2 * ShapePoints[j + iNumShapePoints].y; - if (bRender) - { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale - // potrzebować punktów - glNormal3f(norm.x, norm.y, norm.z); - glTexCoord2f( - jmm2 * ShapePoints[j].z + m2 * ShapePoints[j + iNumShapePoints].z, tv2); - glVertex3f(pt.x, pt.y, pt.z); - } - if (p) // jeśli jest wskaźnik do tablicy - if (*p) - if (!j) // to dla pierwszego punktu - if (i == iSegCount) - { - *(*p) = pt; - (*p)++; - } // zapamiętanie brzegu jezdni - } - else - for (j = 0; j < iNumShapePoints; j++) - { //łuk z jednym profilem - norm = ShapePoints[j].n.x * parallel1; - norm.y += ShapePoints[j].n.y; - pt = parallel1 * ShapePoints[j].x + pos1; - pt.y += ShapePoints[j].y; - glNormal3f(norm.x, norm.y, norm.z); - glTexCoord2f(ShapePoints[j].z, tv1); - glVertex3f(pt.x, pt.y, pt.z); // punkt na początku odcinka - norm = ShapePoints[j].n.x * parallel2; - norm.y += ShapePoints[j].n.y; - pt = parallel2 * ShapePoints[j].x + pos2; - pt.y += ShapePoints[j].y; - glNormal3f(norm.x, norm.y, norm.z); - glTexCoord2f(ShapePoints[j].z, tv2); - glVertex3f(pt.x, pt.y, pt.z); // punkt na końcu odcinka - } - glEnd(); - pos1 = pos2; - parallel1 = parallel2; - tv1 = tv2; + double s, step, fOffset, tv1, tv2, t, fEnd; + bool const trapez = iNumShapePoints < 0; // sygnalizacja trapezowatości + iNumShapePoints = std::abs( iNumShapePoints ); + fTextureLength *= Texturescale; + + double m1, jmm1, m2, jmm2; // pozycje względne na odcinku 0...1 (ale nie parametr Beziera) + step = fStep; + tv1 = 1.0; // Ra: to by można było wyliczać dla odcinka, wyglądało by lepiej + s = fStep * iSkip; // iSkip - ile odcinków z początku pominąć + int i = iSkip; // domyślnie 0 + t = fTsBuffer[ i ]; // tabela wattości t dla segmentów + // BUG: length of spline can be 0, we should skip geometry generation for such cases + fOffset = 0.1 / fLength; // pierwsze 10cm + pos1 = FastGetPoint( t ); // wektor początku segmentu + dir = FastGetDirection( t, fOffset ); // wektor kierunku + parallel1 = Normalize( vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny + if( iEnd == 0 ) + iEnd = iSegCount; + fEnd = fLength * double( iEnd ) / double( iSegCount ); + m2 = s / fEnd; + jmm2 = 1.0 - m2; + while( i < iEnd ) { + + ++i; // kolejny punkt łamanej + s += step; // końcowa pozycja segmentu [m] + m1 = m2; + jmm1 = jmm2; // stara pozycja + m2 = s / fEnd; + jmm2 = 1.0 - m2; // nowa pozycja + if( i == iEnd ) { // gdy przekroczyliśmy koniec - stąd dziury w torach... + step -= ( s - fEnd ); // jeszcze do wyliczenia mapowania potrzebny + s = fEnd; + m2 = 1.0; + jmm2 = 0.0; } - } - else -#ifdef EU07_USE_OLD_LIGHTING_MODEL - { // gdy prosty, nie modyfikujemy wektora kierunkowego i poprzecznego - pos1 = FastGetPoint((fStep * iSkip) / fLength); - pos2 = FastGetPoint_1(); - dir = GetDirection(); - // parallel1=Normalize(CrossProduct(dir,vector3(0,1,0))); - parallel1 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - glBegin(GL_TRIANGLE_STRIP); - if (trapez) - for (j = 0; j < iNumShapePoints; j++) - { - norm = ShapePoints[j].n.x * parallel1; - norm.y += ShapePoints[j].n.y; - pt = parallel1 * ShapePoints[j].x + pos1; - pt.y += ShapePoints[j].y; - glNormal3f(norm.x, norm.y, norm.z); - glTexCoord2f(ShapePoints[j].z, 0); - glVertex3f(pt.x, pt.y, pt.z); - // dla trapezu drugi koniec ma inne współrzędne względne - norm = ShapePoints[j + iNumShapePoints].n.x * parallel1; - norm.y += ShapePoints[j + iNumShapePoints].n.y; - pt = parallel1 * ShapePoints[j + iNumShapePoints].x + pos2; // odsunięcie - pt.y += ShapePoints[j + iNumShapePoints].y; // wysokość - glNormal3f(norm.x, norm.y, norm.z); - glTexCoord2f(ShapePoints[j + iNumShapePoints].z, fLength / fTextureLength); - glVertex3f(pt.x, pt.y, pt.z); + + if( false == Onlypositions ) { + while( tv1 < 0.0 ) { + tv1 += 1.0; } - else - for (j = 0; j < iNumShapePoints; j++) - { - norm = ShapePoints[j].n.x * parallel1; - norm.y += ShapePoints[j].n.y; - pt = parallel1 * ShapePoints[j].x + pos1; - pt.y += ShapePoints[j].y; - glNormal3f(norm.x, norm.y, norm.z); - glTexCoord2f(ShapePoints[j].z, 0); - glVertex3f(pt.x, pt.y, pt.z); - pt = parallel1 * ShapePoints[j].x + pos2; - pt.y += ShapePoints[j].y; - glNormal3f(norm.x, norm.y, norm.z); - glTexCoord2f(ShapePoints[j].z, fLength / fTextureLength); - glVertex3f(pt.x, pt.y, pt.z); + tv2 = tv1 - step / fTextureLength; // mapowanie na końcu segmentu + } + + t = fTsBuffer[ i ]; // szybsze od GetTFromS(s); + pos2 = FastGetPoint( t ); + dir = FastGetDirection( t, fOffset ); // nowy wektor kierunku + parallel2 = Normalize( vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny + + if( Output == nullptr ) { + // immediate mode + ::glBegin( GL_TRIANGLE_STRIP ); + } + + if( trapez ) { + for( int j = 0; j < iNumShapePoints; ++j ) { + pt = parallel1 * ( jmm1 * ( ShapePoints[ j ].x - fOffsetX ) + m1 * ShapePoints[ j + iNumShapePoints ].x ) + pos1; + pt.y += jmm1 * ShapePoints[ j ].y + m1 * ShapePoints[ j + iNumShapePoints ].y; + if( false == Onlypositions ) { + norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel1; + norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; + } + if( bRender ) { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów + if( Output == nullptr ) { + // immediate mode + if( false == Onlypositions ) { + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale, tv1 ); + } + ::glVertex3f( pt.x, pt.y, pt.z ); // pt nie mamy gdzie zapamiętać? + } + else { + Output->x = pt.x; + Output->y = pt.y; + Output->z = pt.z; + if( false == Onlypositions ) { + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; + Output->v = tv1; + } + ++Output; + } + } + if( p ) // jeśli jest wskaźnik do tablicy + if( *p ) + if( !j ) // to dla pierwszego punktu + { + *( *p ) = pt; + ( *p )++; + } // zapamiętanie brzegu jezdni + // dla trapezu drugi koniec ma inne współrzędne + pt = parallel2 * ( jmm2 * ( ShapePoints[ j ].x - fOffsetX ) + m2 * ShapePoints[ j + iNumShapePoints ].x ) + pos2; + pt.y += jmm2 * ShapePoints[ j ].y + m2 * ShapePoints[ j + iNumShapePoints ].y; + if( false == Onlypositions ) { + norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel2; + norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; + } + if( bRender ) { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów + if( Output == nullptr ) { + // immediate mode + if( false == Onlypositions ) { + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale, tv2 ); + } + ::glVertex3f( pt.x, pt.y, pt.z ); + } + else { + Output->x = pt.x; + Output->y = pt.y; + Output->z = pt.z; + if( false == Onlypositions ) { + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; + Output->v = tv2; + } + ++Output; + } + } + if( p ) // jeśli jest wskaźnik do tablicy + if( *p ) + if( !j ) // to dla pierwszego punktu + if( i == iSegCount ) { + *( *p ) = pt; + ( *p )++; + } // zapamiętanie brzegu jezdni } - glEnd(); - } -#else -{ - Math3D::vector3 const pos0 = FastGetPoint( ( fStep * iSkip ) / fLength ); - Math3D::vector3 const pos1 = FastGetPoint_1(); - dir = GetDirection(); - Math3D::vector3 const parallel = Normalize( vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny - - Math3D::vector3 startnormal0, startnormal1, endnormal0, endnormal1; - Math3D::vector3 startvertex0, startvertex1, endvertex0, endvertex1; - float startuv0, startuv1, enduv0, enduv1; - - for( j = 0; j < iNumShapePoints - 1; ++j ) { - - startnormal0 = ShapePoints[ j ].n.x * parallel; - startnormal0.y += ShapePoints[ j ].n.y; - startvertex0 = parallel * ShapePoints[ j ].x + pos0; - startvertex0.y += ShapePoints[ j ].y; - startuv0 = ShapePoints[ j ].z; - startnormal1 = ShapePoints[ j + 1 ].n.x * parallel; - startnormal1.y += ShapePoints[ j + 1 ].n.y; - startvertex1 = parallel * ShapePoints[ j + 1 ].x + pos0; - startvertex1.y += ShapePoints[ j + 1 ].y; - startuv1 = ShapePoints[ j + 1 ].z; - - if( trapez == false ) { - // single profile throughout - endnormal0 = startnormal0; - endvertex0 = startvertex0 + ( pos1 - pos0 ); - enduv0 = startuv0; - endnormal1 = startnormal1; - endvertex1 = startvertex1 + ( pos1 - pos0 ); - enduv1 = startuv1; } else { - // end profile is different - endnormal0 = ShapePoints[ j + iNumShapePoints ].n.x * parallel; - endnormal0.y += ShapePoints[ j + iNumShapePoints ].n.y; - endvertex0 = parallel * ShapePoints[ j + iNumShapePoints ].x + pos1; // odsunięcie - endvertex0.y += ShapePoints[ j + iNumShapePoints ].y; // wysokość - enduv0 = ShapePoints[ j + iNumShapePoints ].z; - endnormal1 = ShapePoints[ j + iNumShapePoints + 1 ].n.x * parallel; - endnormal1.y += ShapePoints[ j + iNumShapePoints + 1 ].n.y; - endvertex1 = parallel * ShapePoints[ j + iNumShapePoints + 1 ].x + pos1; // odsunięcie - endvertex1.y += ShapePoints[ j + iNumShapePoints + 1 ].y; // wysokość - enduv1 = ShapePoints[ j + iNumShapePoints + 1 ].z; - } - // now build strips, lerping from start to endpoint - step = 10.0; // arbitrary segment size for straights - float s = 0.0, - t = 0.0, - uv = 0.0; - glBegin( GL_TRIANGLE_STRIP ); - while( s < fLength ) { - - t = s / fLength; - uv = s / fTextureLength; - - auto const normal1lerp = Interpolate( startnormal1, endnormal1, t ); - glNormal3dv( &normal1lerp.x ); - auto const uv1lerp = Interpolate( startuv1, enduv1, t ); - glTexCoord2f( uv1lerp, uv ); - auto const vertex1lerp = Interpolate( startvertex1, endvertex1, t ); - glVertex3dv( &vertex1lerp.x ); - - auto const normal0lerp = Interpolate( startnormal0, endnormal0, t ); - glNormal3dv( &normal0lerp.x ); - auto const uv0lerp = Interpolate( startuv0, enduv0, t ); - glTexCoord2f( uv0lerp, uv ); - auto const vertex0lerp = Interpolate( startvertex0, endvertex0, t ); - glVertex3dv( &vertex0lerp.x ); - - s += step; - } - // add ending vertex pair if needed - glNormal3dv( &endnormal1.x ); - glTexCoord2f( enduv1, fLength / fTextureLength ); - glVertex3dv( &endvertex1.x ); - glNormal3dv( &endnormal0.x ); - glTexCoord2f( enduv0, fLength / fTextureLength ); - glVertex3dv( &endvertex0.x ); - - glEnd(); - } -} -#endif -}; - -void TSegment::RenderSwitchRail(const vector6 *ShapePoints1, const vector6 *ShapePoints2, - int iNumShapePoints, double fTextureLength, int iSkip, - double fOffsetX) -{ // tworzenie siatki trójkątów dla iglicy - vector3 pos1, pos2, dir, parallel1, parallel2, pt; - double a1, a2, s, step, offset, tv1, tv2, t, t2step, oldt2; - int i, j; - if (bCurve) - { // dla toru odchylonego - // t2= 0; - t2step = 1 / double(iSkip); // przesunięcie tekstury? - oldt2 = 1; - tv1 = 1.0; - step = fStep; // długść segmentu - s = 0; - i = 0; - t = fTsBuffer[i]; // wartość t krzywej Beziera dla początku - a1 = 0; - // step= fStep/fLength; - offset = 0.1 / fLength; // około 10cm w sensie parametru t - pos1 = FastGetPoint(t); // współrzędne dla parmatru t - // dir= GetDirection1(); - dir = FastGetDirection(t, offset); // wektor wzdłużny - // parallel1=Normalize(CrossProduct(dir,vector3(0,1,0))); //poprzeczny? - parallel1 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - - while (s < fLength && i < iSkip) - { - // step= SquareMagnitude(Global::GetCameraPosition()+pos); - // t2= oldt2+t2step; - i++; - s += step; - - if (s > fLength) - { - step -= (s - fLength); - s = fLength; - } - - while (tv1 < 0.0) - tv1 += 1.0; - tv2 = tv1 - step / fTextureLength; - - t = fTsBuffer[i]; - pos2 = FastGetPoint(t); - dir = FastGetDirection(t, offset); - // parallel2=Normalize(CrossProduct(dir,vector3(0,1,0))); - parallel2 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - - a2 = double(i) / (iSkip); - glBegin(GL_TRIANGLE_STRIP); - for (j = 0; j < iNumShapePoints; j++) - { // po dwa punkty trapezu - pt = parallel1 * - (ShapePoints1[j].x * a1 + (ShapePoints2[j].x - fOffsetX) * (1.0 - a1)) + - pos1; - pt.y += ShapePoints1[j].y * a1 + ShapePoints2[j].y * (1.0 - a1); - glNormal3f(0.0f, 1.0f, 0.0f); - glTexCoord2f(ShapePoints1[j].z * a1 + ShapePoints2[j].z * (1.0 - a1), tv1); - glVertex3f(pt.x, pt.y, pt.z); - - pt = parallel2 * - (ShapePoints1[j].x * a2 + (ShapePoints2[j].x - fOffsetX) * (1.0 - a2)) + - pos2; - pt.y += ShapePoints1[j].y * a2 + ShapePoints2[j].y * (1.0 - a2); - glNormal3f(0.0f, 1.0f, 0.0f); - glTexCoord2f(ShapePoints1[j].z * a2 + ShapePoints2[j].z * (1.0 - a2), tv2); - glVertex3f(pt.x, pt.y, pt.z); + for( int j = 0; j < iNumShapePoints; ++j ) { + //łuk z jednym profilem + pt = parallel1 * ( ShapePoints[ j ].x - fOffsetX ) + pos1; + pt.y += ShapePoints[ j ].y; + if( false == Onlypositions ) { + norm = ShapePoints[ j ].n.x * parallel1; + norm.y += ShapePoints[ j ].n.y; + } + if( Output == nullptr ) { + // immediate mode + if( false == Onlypositions ) { + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv1 ); + } + ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na początku odcinka + } + else { + Output->x = pt.x; + Output->y = pt.y; + Output->z = pt.z; + if( false == Onlypositions ) { + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = ShapePoints[ j ].z / Texturescale; + Output->v = tv1; + } + ++Output; + } + pt = parallel2 * ShapePoints[ j ].x + pos2; + pt.y += ShapePoints[ j ].y; + if( false == Onlypositions ) { + norm = ShapePoints[ j ].n.x * parallel2; + norm.y += ShapePoints[ j ].n.y; + } + if( Output == nullptr ) { + // immediate mode + if( false == Onlypositions ) { + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv2 ); + } + ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na końcu odcinka + } + else { + Output->x = pt.x; + Output->y = pt.y; + Output->z = pt.z; + if( false == Onlypositions ) { + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = ShapePoints[ j ].z / Texturescale; + Output->v = tv2; + } + ++Output; + } } + } + if( Output == nullptr ) { + // immediate mode glEnd(); - pos1 = pos2; - parallel1 = parallel2; - tv1 = tv2; - a1 = a2; } - } - else - { // dla toru prostego - tv1 = 1.0; - s = 0; - i = 0; - // pos1= FastGetPoint( (5*iSkip)/fLength ); - pos1 = FastGetPoint_0(); - dir = GetDirection(); - // parallel1=CrossProduct(dir,vector3(0,1,0)); - parallel1 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - - step = 5; - a1 = 0; - - while (i < iSkip) - { - // step= SquareMagnitude(Global::GetCameraPosition()+pos); - i++; - s += step; - - if (s > fLength) - { - step -= (s - fLength); - s = fLength; - } - - while (tv1 < 0.0) - tv1 += 1.0; - - tv2 = tv1 - step / fTextureLength; - - t = s / fLength; - pos2 = FastGetPoint(t); - - a2 = double(i) / (iSkip); - glBegin(GL_TRIANGLE_STRIP); - for (j = 0; j < iNumShapePoints; j++) - { - pt = parallel1 * - (ShapePoints1[j].x * a1 + (ShapePoints2[j].x - fOffsetX) * (1.0 - a1)) + - pos1; - pt.y += ShapePoints1[j].y * a1 + ShapePoints2[j].y * (1.0 - a1); - glNormal3f(0.0f, 1.0f, 0.0f); - glTexCoord2f((ShapePoints1[j].z), tv1); - glVertex3f(pt.x, pt.y, pt.z); - - pt = parallel1 * - (ShapePoints1[j].x * a2 + (ShapePoints2[j].x - fOffsetX) * (1.0 - a2)) + - pos2; - pt.y += ShapePoints1[j].y * a2 + ShapePoints2[j].y * (1.0 - a2); - glNormal3f(0.0f, 1.0f, 0.0f); - glTexCoord2f(ShapePoints2[j].z, tv2); - glVertex3f(pt.x, pt.y, pt.z); - } - glEnd(); - pos1 = pos2; + pos1 = pos2; + parallel1 = parallel2; + if( false == Onlypositions ) { tv1 = tv2; - a1 = a2; } } }; @@ -778,301 +576,4 @@ void TSegment::Render() } } -void TSegment::RaRenderLoft(CVertNormTex *&Vert, const vector6 *ShapePoints, int iNumShapePoints, - double fTextureLength, int iSkip, int iEnd, double fOffsetX) -{ // generowanie trójkątów dla odcinka trajektorii ruchu - // standardowo tworzy triangle_strip dla prostego albo ich zestaw dla łuku - // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli - // podany jest przekrój końcowy - // podsypka toru jest robiona za pomocą 6 punktów, szyna 12, drogi i rzeki na 3+2+3 - // na użytek VBO strip dla łuków jest tworzony wzdłuż - // dla skróconego odcinka (iEndnx = norm.x; // niekoniecznie tak - Vert->ny = norm.y; - Vert->nz = norm.z; - Vert->u = jmm1 * ShapePoints[j].z + m1 * ShapePoints[j + iNumShapePoints].z; - Vert->v = tv1; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na początku odcinka - Vert++; - // dla trapezu drugi koniec ma inne współrzędne względne - norm = (jmm1 * ShapePoints[j].n.x + m1 * ShapePoints[j + iNumShapePoints].n.x) * - parallel2; - norm.y += jmm1 * ShapePoints[j].n.y + m1 * ShapePoints[j + iNumShapePoints].n.y; - pt = parallel2 * (jmm2 * (ShapePoints[j].x - fOffsetX) + - m2 * ShapePoints[j + iNumShapePoints].x) + - pos2; - pt.y += jmm2 * ShapePoints[j].y + m2 * ShapePoints[j + iNumShapePoints].y; - Vert->nx = norm.x; // niekoniecznie tak - Vert->ny = norm.y; - Vert->nz = norm.z; - Vert->u = jmm2 * ShapePoints[j].z + m2 * ShapePoints[j + iNumShapePoints].z; - Vert->v = tv2; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na końcu odcinka - Vert++; - } - else - for (j = 0; j < iNumShapePoints; j++) - { // współrzędne początku - norm = ShapePoints[j].n.x * parallel1; - norm.y += ShapePoints[j].n.y; - pt = parallel1 * (ShapePoints[j].x - fOffsetX) + pos1; - pt.y += ShapePoints[j].y; - Vert->nx = norm.x; // niekoniecznie tak - Vert->ny = norm.y; - Vert->nz = norm.z; - Vert->u = ShapePoints[j].z; - Vert->v = tv1; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na początku odcinka - Vert++; - norm = ShapePoints[j].n.x * parallel2; - norm.y += ShapePoints[j].n.y; - pt = parallel2 * ShapePoints[j].x + pos2; - pt.y += ShapePoints[j].y; - Vert->nx = norm.x; // niekoniecznie tak - Vert->ny = norm.y; - Vert->nz = norm.z; - Vert->u = ShapePoints[j].z; - Vert->v = tv2; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na końcu odcinka - Vert++; - } - pos1 = pos2; - parallel1 = parallel2; - tv1 = tv2; - } - } - else - { // gdy prosty - pos1 = FastGetPoint((fStep * iSkip) / fLength); - pos2 = FastGetPoint_1(); - dir = GetDirection(); - // parallel1=Normalize(CrossProduct(dir,vector3(0,1,0))); - parallel1 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - if (trapez) - for (j = 0; j < iNumShapePoints; j++) - { - norm = ShapePoints[j].n.x * parallel1; - norm.y += ShapePoints[j].n.y; - pt = parallel1 * (ShapePoints[j].x - fOffsetX) + pos1; - pt.y += ShapePoints[j].y; - Vert->nx = norm.x; // niekoniecznie tak - Vert->ny = norm.y; - Vert->nz = norm.z; - Vert->u = ShapePoints[j].z; - Vert->v = 0; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na początku odcinka - Vert++; - // dla trapezu drugi koniec ma inne współrzędne - norm = ShapePoints[j + iNumShapePoints].n.x * parallel1; - norm.y += ShapePoints[j + iNumShapePoints].n.y; - pt = parallel1 * (ShapePoints[j + iNumShapePoints].x - fOffsetX) + - pos2; // odsunięcie - pt.y += ShapePoints[j + iNumShapePoints].y; // wysokość - Vert->nx = norm.x; // niekoniecznie tak - Vert->ny = norm.y; - Vert->nz = norm.z; - Vert->u = ShapePoints[j + iNumShapePoints].z; - Vert->v = fLength / fTextureLength; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na końcu odcinka - Vert++; - } - else - for (j = 0; j < iNumShapePoints; j++) - { - norm = ShapePoints[j].n.x * parallel1; - norm.y += ShapePoints[j].n.y; - pt = parallel1 * (ShapePoints[j].x - fOffsetX) + pos1; - pt.y += ShapePoints[j].y; - Vert->nx = norm.x; // niekoniecznie tak - Vert->ny = norm.y; - Vert->nz = norm.z; - Vert->u = ShapePoints[j].z; - Vert->v = 0; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na początku odcinka - Vert++; - pt = parallel1 * (ShapePoints[j].x - fOffsetX) + pos2; - pt.y += ShapePoints[j].y; - Vert->nx = norm.x; // niekoniecznie tak - Vert->ny = norm.y; - Vert->nz = norm.z; - Vert->u = ShapePoints[j].z; - Vert->v = fLength / fTextureLength; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na końcu odcinka - Vert++; - } - } -}; - -void TSegment::RaAnimate(CVertNormTex *&Vert, const vector6 *ShapePoints, int iNumShapePoints, - double fTextureLength, int iSkip, int iEnd, double fOffsetX) -{ // jak wyżej, tylko z pominięciem mapowania i braku trapezowania - vector3 pos1, pos2, dir, parallel1, parallel2, pt; - double s, step, fOffset, t, fEnd; - int i, j; - bool trapez = iNumShapePoints < 0; // sygnalizacja trapezowatości - iNumShapePoints = abs(iNumShapePoints); - if (bCurve) - { - double m1, jmm1, m2, jmm2; // pozycje względne na odcinku 0...1 (ale nie parametr Beziera) - step = fStep; - s = fStep * iSkip; // iSkip - ile odcinków z początku pominąć - i = iSkip; // domyślnie 0 - t = fTsBuffer[i]; // tabela wattości t dla segmentów - fOffset = 0.1 / fLength; // pierwsze 10cm - pos1 = FastGetPoint(t); // wektor początku segmentu - dir = FastGetDirection(t, fOffset); // wektor kierunku - // parallel1=Normalize(CrossProduct(dir,vector3(0,1,0))); //wektor prostopadły - parallel1 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - if (iEnd == 0) - iEnd = iSegCount; - fEnd = fLength * double(iEnd) / double(iSegCount); - m2 = s / fEnd; - jmm2 = 1.0 - m2; - while (i < iEnd) - { - ++i; // kolejny punkt łamanej - s += step; // końcowa pozycja segmentu [m] - m1 = m2; - jmm1 = jmm2; // stara pozycja - m2 = s / fEnd; - jmm2 = 1.0 - m2; // nowa pozycja - if (i == iEnd) - { // gdy przekroczyliśmy koniec - stąd dziury w torach... - step -= (s - fEnd); // jeszcze do wyliczenia mapowania potrzebny - s = fEnd; - // i=iEnd; //20/5 ma dawać 4 - m2 = 1.0; - jmm2 = 0.0; - } - t = fTsBuffer[i]; // szybsze od GetTFromS(s); - pos2 = FastGetPoint(t); - dir = FastGetDirection(t, fOffset); // nowy wektor kierunku - // parallel2=Normalize(CrossProduct(dir,vector3(0,1,0))); - parallel2 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - if (trapez) - for (j = 0; j < iNumShapePoints; j++) - { // współrzędne początku - pt = parallel1 * (jmm1 * (ShapePoints[j].x - fOffsetX) + - m1 * ShapePoints[j + iNumShapePoints].x) + - pos1; - pt.y += jmm1 * ShapePoints[j].y + m1 * ShapePoints[j + iNumShapePoints].y; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na początku odcinka - Vert++; - // dla trapezu drugi koniec ma inne współrzędne - pt = parallel2 * (jmm2 * (ShapePoints[j].x - fOffsetX) + - m2 * ShapePoints[j + iNumShapePoints].x) + - pos2; - pt.y += jmm2 * ShapePoints[j].y + m2 * ShapePoints[j + iNumShapePoints].y; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na końcu odcinka - Vert++; - } - pos1 = pos2; - parallel1 = parallel2; - } - } - else - { // gdy prosty - pos1 = FastGetPoint((fStep * iSkip) / fLength); - pos2 = FastGetPoint_1(); - dir = GetDirection(); - // parallel1=Normalize(CrossProduct(dir,vector3(0,1,0))); - parallel1 = Normalize(vector3(-dir.z, 0.0, dir.x)); // wektor poprzeczny - if (trapez) - for (j = 0; j < iNumShapePoints; j++) - { - pt = parallel1 * (ShapePoints[j].x - fOffsetX) + pos1; - pt.y += ShapePoints[j].y; - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na początku odcinka - Vert++; - pt = parallel1 * (ShapePoints[j + iNumShapePoints].x - fOffsetX) + - pos2; // odsunięcie - pt.y += ShapePoints[j + iNumShapePoints].y; // wysokość - Vert->x = pt.x; - Vert->y = pt.y; - Vert->z = pt.z; // punkt na końcu odcinka - Vert++; - } - } -}; //--------------------------------------------------------------------------- diff --git a/Segment.h b/Segment.h index 380744e1..aa303484 100644 --- a/Segment.h +++ b/Segment.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "VBO.h" #include "dumb3d.h" #include "Classes.h" +#include "usefull.h" using namespace Math3D; @@ -61,8 +62,6 @@ class TSegment double fDirection = 0.0; // Ra: kąt prostego w planie; dla łuku kąt od Point1 double fStoop = 0.0; // Ra: kąt wzniesienia; dla łuku od Point1 vector3 vA, vB, vC; // współczynniki wielomianów trzeciego stopnia vD==Point1 - // TSegment *pPrev; //odcinek od strony punktu 1 - w segmencie, żeby nie skakać na zwrotnicach - // TSegment *pNext; //odcinek od strony punktu 2 TTrack *pOwner = nullptr; // wskaźnik na właściciela double fAngle[2]; // kąty zakończenia drogi na przejazdach @@ -71,12 +70,8 @@ class TSegment double GetTFromS(double s); vector3 RaInterpolate(double t); vector3 RaInterpolate0(double t); - // TSegment *segNeightbour[2]; //sąsiednie odcinki - musi być przeniesione z Track - // int iNeightbour[2]; //do którego końca doczepiony public: bool bCurve = false; - // int iShape; //Ra: flagi kształtu dadzą więcej możliwości optymalizacji - // (0-Bezier,1-prosty,2/3-łuk w lewo/prawo,6/7-przejściowa w lewo/prawo) TSegment(TTrack *owner); ~TSegment(); bool Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, double fNewRoll1 = 0, @@ -109,21 +104,16 @@ class TSegment { return Point2; }; - inline double GetRoll(double s) + inline double GetRoll(double const Distance) { - s /= fLength; - return ((1.0 - s) * fRoll1 + s * fRoll2); + return interpolate( fRoll1, fRoll2, Distance / fLength ); } void GetRolls(double &r1, double &r2) { // pobranie przechyłek (do generowania trójkątów) r1 = fRoll1; r2 = fRoll2; } - void RenderLoft(const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, - int iSkip = 0, int iQualityFactor = 1, vector3 **p = NULL, bool bRender = true); - void RenderSwitchRail(const vector6 *ShapePoints1, const vector6 *ShapePoints2, - int iNumShapePoints, double fTextureLength, int iSkip = 0, - double fOffsetX = 0.0f); + void RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, bool Onlypositions = false, vector3 **p = nullptr, bool bRender = true); void Render(); inline double GetLength() { @@ -143,15 +133,10 @@ class TSegment { return fTsBuffer ? iSegCount : 1; }; - void RaRenderLoft(CVertNormTex *&Vert, const vector6 *ShapePoints, int iNumShapePoints, - double fTextureLength, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0); - void RaAnimate(CVertNormTex *&Vert, const vector6 *ShapePoints, int iNumShapePoints, - double fTextureLength, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0); void AngleSet(int i, double a) { fAngle[i] = a; }; - void Rollment(double w1, double w2); // poprawianie przechyłki }; //--------------------------------------------------------------------------- diff --git a/Track.cpp b/Track.cpp index 7c77ea1d..2335248c 100644 --- a/Track.cpp +++ b/Track.cpp @@ -732,8 +732,8 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) parser->getTokens(); *parser >> fVelocity; //*0.28; McZapkie-010602 if (SwitchExtension) // jeśli tor ruchomy - if (fabs(fVelocity) >= 1.0) //żeby zero nie ograniczało dożywotnio - SwitchExtension->fVelocity = fVelocity; // zapamiętanie głównego ograniczenia; a + if (std::fabs(fVelocity) >= 1.0) //żeby zero nie ograniczało dożywotnio + SwitchExtension->fVelocity = static_cast(fVelocity); // zapamiętanie głównego ograniczenia; a // np. -40 ogranicza tylko na bok } else if (str == "isolated") @@ -1076,7 +1076,10 @@ const vector6 iglica[nnumPts] = // iglica - vextor3(x,y,mapowanie tekstury) }; void TTrack::Compile(GLuint tex) -{ // generowanie treści dla Display Lists - model proceduralny +{ + CVertNormTex *immediate{ nullptr }; + + // generowanie treści dla Display Lists - model proceduralny if (!tex) { // jeśli nie podana tekstura, to każdy tor ma wlasne DL if (DisplayListID) @@ -1134,26 +1137,42 @@ void TTrack::Compile(GLuint tex) int i; for (i = 0; i < 12; ++i) { - rpts1[i] = vector6((fHTW + szyna[i].x) * cos1 + szyna[i].y * sin1, - -(fHTW + szyna[i].x) * sin1 + szyna[i].y * cos1, szyna[i].z, - +szyna[i].n.x * cos1 + szyna[i].n.y * sin1, - -szyna[i].n.x * sin1 + szyna[i].n.y * cos1, 0.0); - rpts2[11 - i] = vector6((-fHTW - szyna[i].x) * cos1 + szyna[i].y * sin1, - -(-fHTW - szyna[i].x) * sin1 + szyna[i].y * cos1, szyna[i].z, - -szyna[i].n.x * cos1 + szyna[i].n.y * sin1, - +szyna[i].n.x * sin1 + szyna[i].n.y * cos1, 0.0); + rpts1[i] = + vector6( + (fHTW + szyna[i].x) * cos1 + szyna[i].y * sin1, + -(fHTW + szyna[i].x) * sin1 + szyna[i].y * cos1, + szyna[i].z, + +szyna[i].n.x * cos1 + szyna[i].n.y * sin1, + -szyna[i].n.x * sin1 + szyna[i].n.y * cos1, + 0.0); + rpts2[11 - i] = + vector6( + (-fHTW - szyna[i].x) * cos1 + szyna[i].y * sin1, + -(-fHTW - szyna[i].x) * sin1 + szyna[i].y * cos1, + szyna[i].z, + -szyna[i].n.x * cos1 + szyna[i].n.y * sin1, + +szyna[i].n.x * sin1 + szyna[i].n.y * cos1, + 0.0); } if (iTrapezoid) // jak trapez albo przechyłki, to oddzielne punkty na końcu for (i = 0; i < 12; ++i) { - rpts1[12 + i] = vector6((fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(fHTW2 + szyna[i].x) * sin2 + szyna[i].y * cos2, - szyna[i].z, +szyna[i].n.x * cos2 + szyna[i].n.y * sin2, - -szyna[i].n.x * sin2 + szyna[i].n.y * cos2, 0.0); - rpts2[23 - i] = vector6((-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + szyna[i].y * cos2, - szyna[i].z, -szyna[i].n.x * cos2 + szyna[i].n.y * sin2, - +szyna[i].n.x * sin2 + szyna[i].n.y * cos2, 0.0); + rpts1[12 + i] = + vector6( + (fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, + -(fHTW2 + szyna[i].x) * sin2 + szyna[i].y * cos2, + szyna[i].z, + +szyna[i].n.x * cos2 + szyna[i].n.y * sin2, + -szyna[i].n.x * sin2 + szyna[i].n.y * cos2, + 0.0); + rpts2[23 - i] = + vector6( + (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, + -(-fHTW2 - szyna[i].x) * sin2 + szyna[i].y * cos2, + szyna[i].z, + -szyna[i].n.x * cos2 + szyna[i].n.y * sin2, + +szyna[i].n.x * sin2 + szyna[i].n.y * cos2, + 0.0); } switch (eType) // dalej zależnie od typu { @@ -1163,10 +1182,8 @@ void TTrack::Compile(GLuint tex) if (TextureID2) if (tex ? TextureID2 == tex : true) // jeśli pasuje do grupy (tex) { // podsypka z podkładami jest tylko dla zwykłego toru - vector6 - bpts1[8]; // punkty głównej płaszczyzny nie przydają się do robienia boków - if (fTexLength == - 4.0) // jeśli stare mapowanie na profil 0.2 0.5 1.1 (również 6-9-9/noil) + vector6 bpts1[8]; // punkty głównej płaszczyzny nie przydają się do robienia boków + if (fTexLength == 4.0) // jeśli stare mapowanie na profil 0.2 0.5 1.1 (również 6-9-9/noil) { // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy // profil if (iTrapezoid) // trapez albo przechyłki @@ -1174,100 +1191,76 @@ void TTrack::Compile(GLuint tex) // ewentualnie poprawić mapowanie, żeby środek mapował się na // 1.435/4.671 ((0.3464,0.6536) // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.00, normal1.x, - -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, - 0.33, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[2] = - vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.67, -normal1.x, - -normal1.y, 0.0); // prawy brzeg początku symetrycznie - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.00, -normal1.x, - -normal1.y, 0.0); // prawy skos + bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.00, normal1.x, -normal1.y, 0.0); // lewy brzeg + bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.33, 0.0, 1.0, 0.0); // krawędź załamania + bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.67, -normal1.x, -normal1.y, 0.0); // prawy brzeg początku symetrycznie + bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.00, -normal1.x, -normal1.y, 0.0); // prawy skos // przekrój końcowy - bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.00, normal2.x, - -normal2.y, 0.0); // lewy brzeg - bpts1[5] = - vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, - 0.33, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.67, - 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 1.00, -normal2.x, - -normal2.y, 0.0); // prawy skos + bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.00, normal2.x, -normal2.y, 0.0); // lewy brzeg + bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, 0.33, 0.0, 1.0, 0.0); // krawędź załamania + bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.67, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie + bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 1.00, -normal2.x, -normal2.y, 0.0); // prawy skos } else { - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.0, +normal1.x, - -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6(fHTW + side, -0.18, 0.33, +normal1.x, -normal1.y, - 0.0); // krawędź załamania - bpts1[2] = vector6(-fHTW - side, -0.18, 0.67, -normal1.x, -normal1.y, - 0.0); // druga - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.0, -normal1.x, - -normal1.y, 0.0); // prawy skos + bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.0, +normal1.x, -normal1.y, 0.0); // lewy brzeg + bpts1[1] = vector6(fHTW + side, -0.18, 0.33, +normal1.x, -normal1.y, 0.0); // krawędź załamania + bpts1[2] = vector6(-fHTW - side, -0.18, 0.67, -normal1.x, -normal1.y, 0.0); // druga + bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.0, -normal1.x, -normal1.y, 0.0); // prawy skos } } else - { // mapowanie proporcjonalne do powierzchni, rozmiar w poprzek określa - // fTexLength - double max = fTexRatio2 * fTexLength; // szerokość proporcjonalna do - // długości - double map11 = - max > 0.0 ? (fHTW + side) / max : 0.25; // załamanie od strony 1 - double map12 = - max > 0.0 ? (fHTW + side + hypot1) / max : 0.5; // brzeg od strony 1 + { // mapowanie proporcjonalne do powierzchni, rozmiar w poprzek określa fTexLength + double max = fTexRatio2 * fTexLength; // szerokość proporcjonalna do długości + double map11 = ( + max > 0.0 ? + (fHTW + side) / max : + 0.25 ); // załamanie od strony 1 + double map12 = ( + max > 0.0 ? + (fHTW + side + hypot1) / max : + 0.5 ); // brzeg od strony 1 if (iTrapezoid) // trapez albo przechyłki { // podsypka z podkladami trapezowata - double map21 = - max > 0.0 ? (fHTW2 + side2) / max : 0.25; // załamanie od strony 2 - double map22 = max > 0.0 ? (fHTW2 + side2 + hypot2) / max : - 0.5; // brzeg od strony 2 - // ewentualnie poprawić mapowanie, żeby środek mapował się na - // 1.435/4.671 ((0.3464,0.6536) + double map21 = ( + max > 0.0 ? + (fHTW2 + side2) / max : + 0.25 ); // załamanie od strony 2 + double map22 = ( + max > 0.0 ? + (fHTW2 + side2 + hypot2) / max : + 0.5 ); // brzeg od strony 2 + // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 ((0.3464,0.6536) // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, normal1.x, - -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, - 0.5 - map11, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[2] = - vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.5 + map11, 0.0, - 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, - -normal1.y, 0.0); // prawy skos + bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, normal1.x, -normal1.y, 0.0); // lewy brzeg + bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.5 - map11, 0.0, 1.0, 0.0); // krawędź załamania + bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.5 + map11, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie + bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos // przekrój końcowy - bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.5 - map22, normal2.x, - -normal2.y, 0.0); // lewy brzeg - bpts1[5] = - vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, - 0.5 - map21, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[6] = - vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.5 + map21, - 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 0.5 + map22, -normal2.x, - -normal2.y, 0.0); // prawy skos + bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.5 - map22, normal2.x, -normal2.y, 0.0); // lewy brzeg + bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, 0.5 - map21, 0.0, 1.0, 0.0); // krawędź załamania + bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.5 + map21, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie + bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 0.5 + map22, -normal2.x, -normal2.y, 0.0); // prawy skos } else { - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, +normal1.x, - -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6(fHTW + side, -0.18, 0.5 - map11, +normal1.x, - -normal1.y, 0.0); // krawędź załamania - bpts1[2] = vector6(-fHTW - side, -0.18, 0.5 + map11, -normal1.x, - -normal1.y, 0.0); // druga - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, - -normal1.y, 0.0); // prawy skos + bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, +normal1.x, -normal1.y, 0.0); // lewy brzeg + bpts1[1] = vector6(fHTW + side, -0.18, 0.5 - map11, +normal1.x, -normal1.y, 0.0); // krawędź załamania + bpts1[2] = vector6(-fHTW - side, -0.18, 0.5 + map11, -normal1.x, -normal1.y, 0.0); // druga + bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos } } if (!tex) GfxRenderer.Bind( TextureID2 ); - Segment->RenderLoft(bpts1, iTrapezoid ? -4 : 4, fTexLength); + Segment->RenderLoft( immediate, bpts1, iTrapezoid ? -4 : 4, fTexLength); } if (TextureID1) if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) { // szyny if (!tex) GfxRenderer.Bind( TextureID1 ); - Segment->RenderLoft(rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - Segment->RenderLoft(rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + Segment->RenderLoft( immediate, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + Segment->RenderLoft( immediate, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); } break; case tt_Switch: // dla zwrotnicy dwa razy szyny @@ -1277,70 +1270,43 @@ void TTrack::Compile(GLuint tex) vector6 rpts3[24], rpts4[24]; for (i = 0; i < 12; ++i) { - rpts3[i] = vector6((fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, - -(fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, - iglica[i].z, +iglica[i].n.x * cos1 + iglica[i].n.y * sin1, - -iglica[i].n.x * sin1 + iglica[i].n.y * cos1, 0.0); + rpts3[i] = + vector6(+(fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, + -(+fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, iglica[i].z); + rpts3[i + 12] = + vector6(+(fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, + -(+fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, szyna[i].z); rpts4[11 - i] = vector6((-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, - -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, iglica[i].z, - -iglica[i].n.x * cos1 + iglica[i].n.y * sin1, - +iglica[i].n.x * sin1 + iglica[i].n.y * cos1, 0.0); + -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, iglica[i].z); + rpts4[23 - i] = + vector6((-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, + -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, szyna[i].z); } - if (iTrapezoid) // trapez albo przechyłki, to oddzielne punkty na końcu - for (i = 0; i < 12; ++i) - { - rpts3[12 + i] = - vector6((fHTW2 + iglica[i].x) * cos2 + iglica[i].y * sin2, - -(fHTW2 + iglica[i].x) * sin2 + iglica[i].y * cos2, iglica[i].z, - +iglica[i].n.x * cos2 + iglica[i].n.y * sin2, - -iglica[i].n.x * sin2 + iglica[i].n.y * cos2, 0.0); - rpts4[23 - i] = - vector6((-fHTW2 - iglica[i].x) * cos2 + iglica[i].y * sin2, - -(-fHTW2 - iglica[i].x) * sin2 + iglica[i].y * cos2, - iglica[i].z, -iglica[i].n.x * cos2 + iglica[i].n.y * sin2, - +iglica[i].n.x * sin2 + iglica[i].n.y * cos2, 0.0); - } // McZapkie-130302 - poprawione rysowanie szyn if (SwitchExtension->RightSwitch) { // zwrotnica prawa GfxRenderer.Bind( TextureID1 ); - SwitchExtension->Segments[0]->RenderLoft(rpts1, nnumPts, fTexLength, - 2); // prawa szyna za iglicą - SwitchExtension->Segments[0]->RenderSwitchRail( - rpts1, rpts3, nnumPts, fTexLength, 2, - SwitchExtension->fOffset2); // prawa iglica - SwitchExtension->Segments[0]->RenderLoft( - rpts2, nnumPts, fTexLength); // lewa szyna normalnie cała + SwitchExtension->Segments[0]->RenderLoft( immediate, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2); // prawa iglica + SwitchExtension->Segments[0]->RenderLoft( immediate, rpts1, nnumPts, fTexLength, 1.0, 2); // prawa szyna za iglicą + SwitchExtension->Segments[0]->RenderLoft( immediate, rpts2, nnumPts, fTexLength); // lewa szyna normalnie cała if (TextureID2 != TextureID1) // nie wiadomo, czy OpenGL to optymalizuje GfxRenderer.Bind( TextureID2 ); - SwitchExtension->Segments[1]->RenderLoft( - rpts1, nnumPts, fTexLength); // prawa szyna normalna cała - SwitchExtension->Segments[1]->RenderLoft(rpts2, nnumPts, fTexLength, - 2); // lewa szyna za iglicą - SwitchExtension->Segments[1]->RenderSwitchRail( - rpts2, rpts4, nnumPts, fTexLength, 2, - -fMaxOffset + SwitchExtension->fOffset1); // lewa iglica + SwitchExtension->Segments[1]->RenderLoft( immediate, rpts1, nnumPts, fTexLength); // prawa szyna normalna cała + SwitchExtension->Segments[1]->RenderLoft( immediate, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1); // lewa iglica + SwitchExtension->Segments[1]->RenderLoft( immediate, rpts2, nnumPts, fTexLength, 1.0, 2); // lewa szyna za iglicą } else { // lewa kiedyś działała lepiej niż prawa GfxRenderer.Bind( TextureID1 ); - SwitchExtension->Segments[0]->RenderLoft( - rpts1, nnumPts, fTexLength); // prawa szyna normalna cała - SwitchExtension->Segments[0]->RenderLoft(rpts2, nnumPts, fTexLength, - 2); // lewa szyna za iglicą - SwitchExtension->Segments[0]->RenderSwitchRail( - rpts2, rpts4, nnumPts, fTexLength, 2, - -SwitchExtension->fOffset2); // lewa iglica + SwitchExtension->Segments[0]->RenderLoft( immediate, rpts1, nnumPts, fTexLength); // prawa szyna normalna cała + SwitchExtension->Segments[0]->RenderLoft( immediate, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2); // lewa iglica + SwitchExtension->Segments[0]->RenderLoft( immediate, rpts2, nnumPts, fTexLength, 1.0, 2); // lewa szyna za iglicą if (TextureID2 != TextureID1) // nie wiadomo, czy OpenGL to optymalizuje GfxRenderer.Bind( TextureID2 ); - SwitchExtension->Segments[1]->RenderLoft(rpts1, nnumPts, fTexLength, - 2); // prawa szyna za iglicą - SwitchExtension->Segments[1]->RenderSwitchRail( - rpts1, rpts3, nnumPts, fTexLength, 2, - fMaxOffset - SwitchExtension->fOffset1); // prawa iglica - SwitchExtension->Segments[1]->RenderLoft( - rpts2, nnumPts, fTexLength); // lewa szyna normalnie cała + SwitchExtension->Segments[1]->RenderLoft( immediate, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1); // prawa iglica + SwitchExtension->Segments[1]->RenderLoft( immediate, rpts1, nnumPts, fTexLength, 1.0, 2); // prawa szyna za iglicą + SwitchExtension->Segments[1]->RenderLoft( immediate, rpts2, nnumPts, fTexLength); // lewa szyna normalnie cała } } break; @@ -1362,14 +1328,10 @@ void TTrack::Compile(GLuint tex) if (iTrapezoid) // trapez albo przechyłki { // nawierzchnia trapezowata Segment->GetRolls(roll1, roll2); - bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1, - sin(roll1), cos(roll1), 0.0); // lewy brzeg początku - bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1, -sin(roll1), - cos(roll1), 0.0); // prawy brzeg początku symetrycznie - bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2, - sin(roll2), cos(roll2), 0.0); // lewy brzeg końca - bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2, -sin(roll2), - cos(roll2), 0.0); // prawy brzeg początku symetrycznie + bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1, sin(roll1), cos(roll1), 0.0); // lewy brzeg początku + bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1, -sin(roll1), cos(roll1), 0.0); // prawy brzeg początku symetrycznie + bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2, sin(roll2), cos(roll2), 0.0); // lewy brzeg końca + bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2, -sin(roll2), cos(roll2), 0.0); // prawy brzeg początku symetrycznie } else { @@ -1382,106 +1344,100 @@ void TTrack::Compile(GLuint tex) { // tworzenie trójkątów nawierzchni szosy if (!tex) GfxRenderer.Bind( TextureID1 ); - Segment->RenderLoft(bpts1, iTrapezoid ? -2 : 2, fTexLength); + Segment->RenderLoft( immediate, bpts1, iTrapezoid ? -2 : 2, fTexLength); } if (TextureID2) if (tex ? TextureID2 == tex : true) // jeśli pasuje do grupy (tex) - { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak - // w Midtown Madness 2?) + { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) if (!tex) GfxRenderer.Bind( TextureID2 ); - vector6 rpts1[6], + vector6 + rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony if (fTexHeight1 >= 0.0) { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy - rpts1[1] = - vector6(bpts1[0].x + side, bpts1[0].y, 0.5); // lewa krawędź załamania - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, - 1.0); // lewy brzeg pobocza (mapowanie może być inne + rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5); // lewa krawędź załamania + rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 1.0); // lewy brzeg pobocza (mapowanie może być inne rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 1.0); // prawy brzeg pobocza - rpts2[1] = - vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania + rpts2[1] = vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania rpts2[2] = vector6(-rozp, -fTexHeight1, 0.0); // prawy brzeg podstawy if (iTrapezoid) // trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony - // odcinka - rpts1[3] = - vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza - rpts1[4] = - vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + rpts1[3] = vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza + rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 1.0); // brzeg pobocza rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); - rpts2[5] = - vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza + rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza } } else { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości // mapowanie propocjonalne do szerokości chodnika // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy - double d = - -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm - double max = - fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości - double map1l = max > 0.0 ? - side / max : - 0.484375; // obcięcie tekstury od lewej strony punktu 1 - double map1r = max > 0.0 ? - slop / max : - 0.484375; // obcięcie tekstury od prawej strony punktu 1 - rpts1[0] = vector6(bpts1[0].x + slop, bpts1[0].y - fTexHeight1, - 0.515625 + map1r); // prawy brzeg prawego chodnika - rpts1[1] = vector6(bpts1[0].x + d, bpts1[0].y - fTexHeight1, - 0.515625); // prawy krawężnik u góry - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, - 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, - 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[1] = vector6(bpts1[1].x - d, bpts1[1].y - fTexHeight1, - 0.484375); // lewy krawężnik u góry - rpts2[2] = vector6(bpts1[1].x - side, bpts1[1].y - fTexHeight1, - 0.484375 - map1l); // lewy brzeg lewego chodnika + double d = -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm + double max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości + double map1l = ( + max > 0.0 ? + side / max : + 0.484375 ); // obcięcie tekstury od lewej strony punktu 1 + double map1r = ( + max > 0.0 ? + slop / max : + 0.484375 ); // obcięcie tekstury od prawej strony punktu 1 + double h1r = ( + slop > d ? + -fTexHeight1 : + 0 ); + double h1l = ( + side > d ? + -fTexHeight1 : + 0 ); + rpts1[ 0 ] = vector6( bpts1[ 0 ].x + slop, bpts1[ 0 ].y + h1r, 0.515625 + map1r ); // prawy brzeg prawego chodnika + rpts1[ 1 ] = vector6( bpts1[ 0 ].x + d, bpts1[ 0 ].y + h1r, 0.515625 ); // prawy krawężnik u góry + rpts1[ 2 ] = vector6( bpts1[ 0 ].x, bpts1[ 0 ].y, 0.515625 - d / 2.56 ); // prawy krawężnik u dołu + rpts2[ 0 ] = vector6( bpts1[ 1 ].x, bpts1[ 1 ].y, 0.484375 + d / 2.56 ); // lewy krawężnik u dołu + rpts2[ 1 ] = vector6( bpts1[ 1 ].x - d, bpts1[ 1 ].y + h1l, 0.484375 ); // lewy krawężnik u góry + rpts2[ 2 ] = vector6( bpts1[ 1 ].x - side, bpts1[ 1 ].y + h1l, 0.484375 - map1l ); // lewy brzeg lewego chodnika if (iTrapezoid) // trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony - // odcinka - slop2 = fabs((iTrapezoid & 2) ? slop2 : - slop); // szerokość chodnika po prawej - double map2l = - max > 0.0 ? side2 / max : - 0.484375; // obcięcie tekstury od lewej strony punktu 2 - double map2r = - max > 0.0 ? slop2 / max : - 0.484375; // obcięcie tekstury od prawej strony punktu 2 - rpts1[3] = vector6(bpts1[2].x + slop2, bpts1[2].y - fTexHeight2, - 0.515625 + map2r); // prawy brzeg prawego chodnika - rpts1[4] = vector6(bpts1[2].x + d, bpts1[2].y - fTexHeight2, - 0.515625); // prawy krawężnik u góry - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, - 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, - 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[4] = vector6(bpts1[3].x - d, bpts1[3].y - fTexHeight2, - 0.484375); // lewy krawężnik u góry - rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y - fTexHeight2, - 0.484375 - map2l); // lewy brzeg lewego chodnika + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + slop2 = ( + fabs( ( iTrapezoid & 2 ) ? + slop2 : + slop ) ); // szerokość chodnika po prawej + double map2l = ( + max > 0.0 ? + side2 / max : + 0.484375 ); // obcięcie tekstury od lewej strony punktu 2 + double map2r = ( + max > 0.0 ? + slop2 / max : + 0.484375 ); // obcięcie tekstury od prawej strony punktu 2 + double h2r = ( slop2 > d ) ? -fTexHeight2 : 0; + double h2l = ( side2 > d ) ? -fTexHeight2 : 0; + rpts1[ 3 ] = vector6( bpts1[ 2 ].x + slop2, bpts1[ 2 ].y + h2r, 0.515625 + map2r ); // prawy brzeg prawego chodnika + rpts1[ 4 ] = vector6( bpts1[ 2 ].x + d, bpts1[ 2 ].y + h2r, 0.515625 ); // prawy krawężnik u góry + rpts1[ 5 ] = vector6( bpts1[ 2 ].x, bpts1[ 2 ].y, 0.515625 - d / 2.56 ); // prawy krawężnik u dołu + rpts2[ 3 ] = vector6( bpts1[ 3 ].x, bpts1[ 3 ].y, 0.484375 + d / 2.56 ); // lewy krawężnik u dołu + rpts2[ 4 ] = vector6( bpts1[ 3 ].x - d, bpts1[ 3 ].y + h2l, 0.484375 ); // lewy krawężnik u góry + rpts2[ 5 ] = vector6( bpts1[ 3 ].x - side2, bpts1[ 3 ].y + h2l, 0.484375 - map2l ); // lewy brzeg lewego chodnika } } if (iTrapezoid) // trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony // odcinka if ((fTexHeight1 >= 0.0) ? true : (slop != 0.0)) - Segment->RenderLoft(rpts1, -3, fTexLength); // tylko jeśli jest z prawej + Segment->RenderLoft( immediate, rpts1, -3, fTexLength); // tylko jeśli jest z prawej if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - Segment->RenderLoft(rpts2, -3, fTexLength); // tylko jeśli jest z lewej + Segment->RenderLoft( immediate, rpts2, -3, fTexLength); // tylko jeśli jest z lewej } else { // pobocza zwykłe, brak przechyłki if ((fTexHeight1 >= 0.0) ? true : (slop != 0.0)) - Segment->RenderLoft(rpts1, 3, fTexLength); + Segment->RenderLoft( immediate, rpts1, 3, fTexLength); if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - Segment->RenderLoft(rpts2, 3, fTexLength); + Segment->RenderLoft( immediate, rpts2, 3, fTexLength); } } break; @@ -1493,13 +1449,11 @@ void TTrack::Compile(GLuint tex) // na razie połowa odległości pomiędzy Point1 i Point2, potem się dopracuje a[0] = a[1] = 0.5; // parametr do poszukiwania przecięcia łuków // modyfikować a[0] i a[1] tak, aby trafić na przecięcie odcinka 34 - p[0] = SwitchExtension->Segments[0]->FastGetPoint( - a[0]); // współrzędne środka pierwszego odcinka + p[0] = SwitchExtension->Segments[0]->FastGetPoint(a[0]); // współrzędne środka pierwszego odcinka p[1] = SwitchExtension->Segments[1]->FastGetPoint(a[1]); //-//- drugiego // p[2]=p[1]-p[0]; //jeśli różne od zera, przeliczyć a[0] i a[1] i wyznaczyć nowe punkty vector3 oxz = p[0]; // punkt mapowania środka tekstury skrzyżowania - p[0] = SwitchExtension->Segments[0] - ->GetDirection1(); // Point1 - pobranie wektorów kontrolnych + p[0] = SwitchExtension->Segments[0]->GetDirection1(); // Point1 - pobranie wektorów kontrolnych p[1] = SwitchExtension->Segments[1]->GetDirection2(); // Point3 (bo zamienione) p[2] = SwitchExtension->Segments[0]->GetDirection2(); // Point2 p[3] = SwitchExtension->Segments[1]->GetDirection1(); // Point4 (bo zamienione) @@ -1507,37 +1461,36 @@ void TTrack::Compile(GLuint tex) a[1] = atan2(-p[1].x, p[1].z); a[2] = atan2(-p[2].x, p[2].z); a[3] = atan2(-p[3].x, p[3].z); - p[0] = SwitchExtension->Segments[0] - ->FastGetPoint_0(); // Point1 - pobranie współrzędnych końców + p[0] = SwitchExtension->Segments[0]->FastGetPoint_0(); // Point1 - pobranie współrzędnych końców p[1] = SwitchExtension->Segments[1]->FastGetPoint_1(); // Point3 p[2] = SwitchExtension->Segments[0]->FastGetPoint_1(); // Point2 - p[3] = SwitchExtension->Segments[1] - ->FastGetPoint_0(); // Point4 - przy trzech drogach pokrywa się z Point1 + p[3] = SwitchExtension->Segments[1]->FastGetPoint_0(); // Point4 - przy trzech drogach pokrywa się z Point1 // 2014-07: na początek rysować brzegi jak dla łuków - // punkty brzegu nawierzchni uzyskujemy podczas renderowania boków (bez sensu, ale - // najszybciej było zrobić) + // punkty brzegu nawierzchni uzyskujemy podczas renderowania boków (bez sensu, ale najszybciej było zrobić) int i; // ile punktów (może byc różna ilość punktów między drogami) if (!SwitchExtension->vPoints) { // jeśli tablica punktów nie jest jeszcze utworzona, zliczamy punkty i tworzymy ją - if (SwitchExtension->iRoads == 3) // mogą być tylko 3 drogi zamiast 4 - SwitchExtension->iPoints = 5 + SwitchExtension->Segments[0]->RaSegCount() + - SwitchExtension->Segments[1]->RaSegCount() + - SwitchExtension->Segments[2]->RaSegCount(); - else + if( SwitchExtension->iRoads == 3 ) { + // mogą być tylko 3 drogi zamiast 4 SwitchExtension->iPoints = - 5 + SwitchExtension->Segments[2]->RaSegCount() + - SwitchExtension->Segments[3]->RaSegCount() + - SwitchExtension->Segments[4]->RaSegCount() + - SwitchExtension->Segments[5]->RaSegCount(); // mogą być tylko 3 drogi - SwitchExtension->vPoints = - new vector3[SwitchExtension->iPoints]; // tablica utworzona z zapasem, ale nie - // wypełniona współrzędnymi + 5 + SwitchExtension->Segments[ 0 ]->RaSegCount() + + SwitchExtension->Segments[ 1 ]->RaSegCount() + + SwitchExtension->Segments[ 2 ]->RaSegCount(); + } + else { + SwitchExtension->iPoints = + 5 + SwitchExtension->Segments[ 2 ]->RaSegCount() + + SwitchExtension->Segments[ 3 ]->RaSegCount() + + SwitchExtension->Segments[ 4 ]->RaSegCount() + + SwitchExtension->Segments[ 5 ]->RaSegCount(); // mogą być tylko 3 drogi + } + // tablica utworzona z zapasem, ale nie wypełniona współrzędnymi + SwitchExtension->vPoints = new vector3[SwitchExtension->iPoints]; } vector3 *b = SwitchExtension->bPoints ? - NULL : - SwitchExtension - ->vPoints; // zmienna robocza, NULL gdy tablica punktów już jest wypełniona + nullptr : + SwitchExtension->vPoints; // zmienna robocza, NULL gdy tablica punktów już jest wypełniona vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% @@ -1547,136 +1500,101 @@ void TTrack::Compile(GLuint tex) // if (iTrapezoid) //trapez albo przechyłki { // nawierzchnia trapezowata Segment->GetRolls(roll1, roll2); - bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1, - sin(roll1), cos(roll1), 0.0); // lewy brzeg początku - bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1, -sin(roll1), - cos(roll1), 0.0); // prawy brzeg początku symetrycznie - bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2, - sin(roll2), cos(roll2), 0.0); // lewy brzeg końca - bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2, -sin(roll2), - cos(roll2), 0.0); // prawy brzeg początku symetrycznie + bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1, sin(roll1), cos(roll1), 0.0); // lewy brzeg początku + bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1, -sin(roll1), cos(roll1), 0.0); // prawy brzeg początku symetrycznie + bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2, sin(roll2), cos(roll2), 0.0); // lewy brzeg końca + bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2, -sin(roll2), cos(roll2), 0.0); // prawy brzeg początku symetrycznie } } // najpierw renderowanie poboczy i zapamiętywanie punktów - // problem ze skrzyżowaniami jest taki, że teren chce się pogrupować wg tekstur, ale - // zaczyna od nawierzchni + // problem ze skrzyżowaniami jest taki, że teren chce się pogrupować wg tekstur, ale zaczyna od nawierzchni // sama nawierzchnia nie wypełni tablicy punktów, bo potrzebne są pobocza - // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie - // w swoim czasie - // if (TextureID2) - // if (tex?TextureID2==tex:true) //jeśli pasuje do grupy (tex) - { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w - // Midtown Madness 2?) + // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie w swoim czasie + { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) if (TextureID2) if (!tex) GfxRenderer.Bind( TextureID2 ); vector6 rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony - // Ra 2014-07: trzeba to przerobić na pętlę i pobierać profile (przynajmniej 2..4) z - // sąsiednich dróg + // Ra 2014-07: trzeba to przerobić na pętlę i pobierać profile (przynajmniej 2..4) z sąsiednich dróg if (fTexHeight1 >= 0.0) { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy - rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5); // lewa krawędź - // załamania - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, - 1.0); // lewy brzeg pobocza (mapowanie może być inne + rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5); // lewa krawędź załamania + rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 1.0); // lewy brzeg pobocza (mapowanie może być inne rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 1.0); // prawy brzeg pobocza - rpts2[1] = - vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania + rpts2[1] = vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania rpts2[2] = vector6(-rozp, -fTexHeight1, 0.0); // prawy brzeg podstawy // if (iTrapezoid) //trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony - // odcinka + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka rpts1[3] = vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza - rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź - // załamania + rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 1.0); // brzeg pobocza rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); - rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego - // pobocza + rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza } } else { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości // mapowanie propocjonalne do szerokości chodnika // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy - double d = - -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm - double max = - fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości + double d = -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm + double max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości double map1l = max > 0.0 ? side / max : 0.484375; // obcięcie tekstury od lewej strony punktu 1 double map1r = max > 0.0 ? slop / max : 0.484375; // obcięcie tekstury od prawej strony punktu 1 - rpts1[0] = vector6(bpts1[0].x + slop, bpts1[0].y - fTexHeight1, - 0.515625 + map1r); // prawy brzeg prawego chodnika - rpts1[1] = vector6(bpts1[0].x + d, bpts1[0].y - fTexHeight1, - 0.515625); // prawy krawężnik u góry - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, - 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, - 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[1] = vector6(bpts1[1].x - d, bpts1[1].y - fTexHeight1, - 0.484375); // lewy krawężnik u góry - rpts2[2] = vector6(bpts1[1].x - side, bpts1[1].y - fTexHeight1, - 0.484375 - map1l); // lewy brzeg lewego chodnika + rpts1[0] = vector6(bpts1[0].x + slop, bpts1[0].y - fTexHeight1, 0.515625 + map1r); // prawy brzeg prawego chodnika + rpts1[1] = vector6(bpts1[0].x + d, bpts1[0].y - fTexHeight1, 0.515625); // prawy krawężnik u góry + rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu + rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu + rpts2[1] = vector6(bpts1[1].x - d, bpts1[1].y - fTexHeight1, 0.484375); // lewy krawężnik u góry + rpts2[2] = vector6(bpts1[1].x - side, bpts1[1].y - fTexHeight1, 0.484375 - map1l); // lewy brzeg lewego chodnika // if (iTrapezoid) //trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony - // odcinka - slop2 = - fabs((iTrapezoid & 2) ? slop2 : slop); // szerokość chodnika po prawej + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + slop2 = fabs((iTrapezoid & 2) ? slop2 : slop); // szerokość chodnika po prawej double map2l = max > 0.0 ? side2 / max : 0.484375; // obcięcie tekstury od lewej strony punktu 2 double map2r = max > 0.0 ? slop2 / max : 0.484375; // obcięcie tekstury od prawej strony punktu 2 - rpts1[3] = vector6(bpts1[2].x + slop2, bpts1[2].y - fTexHeight2, - 0.515625 + map2r); // prawy brzeg prawego chodnika - rpts1[4] = vector6(bpts1[2].x + d, bpts1[2].y - fTexHeight2, - 0.515625); // prawy krawężnik u góry - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, - 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, - 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[4] = vector6(bpts1[3].x - d, bpts1[3].y - fTexHeight2, - 0.484375); // lewy krawężnik u góry - rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y - fTexHeight2, - 0.484375 - map2l); // lewy brzeg lewego chodnika + rpts1[3] = vector6(bpts1[2].x + slop2, bpts1[2].y - fTexHeight2, 0.515625 + map2r); // prawy brzeg prawego chodnika + rpts1[4] = vector6(bpts1[2].x + d, bpts1[2].y - fTexHeight2, 0.515625); // prawy krawężnik u góry + rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu + rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu + rpts2[4] = vector6(bpts1[3].x - d, bpts1[3].y - fTexHeight2, 0.484375); // lewy krawężnik u góry + rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y - fTexHeight2, 0.484375 - map2l); // lewy brzeg lewego chodnika } } - bool render = TextureID2 ? (tex ? TextureID2 == tex : true) : - false; // renderować nie trzeba, ale trzeba wyznaczyć + bool render = ( + TextureID2 ? ( + tex ? + TextureID2 == tex : + true ) : + false ); // renderować nie trzeba, ale trzeba wyznaczyć // punkty brzegowe nawierzchni // if (iTrapezoid) //trapez albo przechyłki if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - SwitchExtension->Segments[2]->RenderLoft( - rpts2, -3, fTexLength, 0, 1, &b, render); // tylko jeśli jest z lewej - if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - SwitchExtension->Segments[3]->RenderLoft( - rpts2, -3, fTexLength, 0, 1, &b, render); // tylko jeśli jest z lewej - if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - SwitchExtension->Segments[4]->RenderLoft( - rpts2, -3, fTexLength, 0, 1, &b, render); // tylko jeśli jest z lewej - if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - SwitchExtension->Segments[5]->RenderLoft( - rpts2, -3, fTexLength, 0, 1, &b, render); // tylko jeśli jest z lewej + if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { + SwitchExtension->Segments[ 2 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 3 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 4 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 5 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + } } else // to będzie ewentualnie dla prostego na skrzyżowaniu trzech dróg { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe - if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) // OK - SwitchExtension->Segments[2]->RenderLoft(rpts2, -3, fTexLength, 0, 1, &b, render); // z P2 do P4 - if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) // OK - SwitchExtension->Segments[1]->RenderLoft(rpts2, -3, fTexLength, 0, 1, &b, render); // z P4 do P3=P1 (odwrócony) - if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) // OK - SwitchExtension->Segments[0]->RenderLoft(rpts2, -3, fTexLength, 0, 1, &b, render); // z P1 do P2 + if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { + SwitchExtension->Segments[ 2 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P2 do P4 + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P4 do P3=P1 (odwrócony) + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P1 do P2 + } } } // renderowanie nawierzchni na końcu @@ -1685,24 +1603,23 @@ void TTrack::Compile(GLuint tex) if (!SwitchExtension->bPoints) // jeśli tablica nie wypełniona if (b) // ale jest wskaźnik do tablicy - może nie być? { // coś się gubi w obliczeniach na wskaźnikach - i = (int)(((size_t)(b)) - ((size_t)(SwitchExtension->vPoints))) / - sizeof(vector3); // ustalenie liczby punktów, bo mogło wyjść inaczej niż + // ustalenie liczby punktów, bo mogło wyjść inaczej niż + i = (int)(((size_t)(b)) - ((size_t)(SwitchExtension->vPoints))) / sizeof(vector3); // policzone z góry if (i > 0) { // jeśli zostało to właśnie utworzone if (SwitchExtension->iPoints > i) // jeśli wyszło mniej niż było miejsca SwitchExtension->iPoints = i; // domknięcie wachlarza - else - --SwitchExtension->iPoints; // jak tutaj wejdzie, to błąd jest - zrobić - // miejsce na powtórzenie pierwszego punktu - // na końcu - SwitchExtension->vPoints[SwitchExtension->iPoints++] = - SwitchExtension->vPoints[0]; + else { + // jak tutaj wejdzie, to błąd jest - zrobić miejsce na powtórzenie pierwszego punktu na końcu + --SwitchExtension->iPoints; + } + SwitchExtension->vPoints[SwitchExtension->iPoints++] = SwitchExtension->vPoints[0]; SwitchExtension->bPoints = true; // tablica punktów została wypełniona } } if (TextureID1) // jeśli podana tekstura nawierzchni - if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) + if ( (tex == TextureID1) || (tex == 0) ) // jeśli pasuje do grupy (tex) { if (!tex) GfxRenderer.Bind( TextureID1 ); @@ -1711,15 +1628,18 @@ void TTrack::Compile(GLuint tex) glTexCoord2f(0.5, 0.5); //środek tekstury na środku skrzyżowania glVertex3f(oxz.x, oxz.y, oxz.z); for (i = SwitchExtension->iPoints - 1; i >= 0; --i) - // for (i=0;iiPoints;++i) { glNormal3f(0, 1, 0); - u = (SwitchExtension->vPoints[i].x - oxz.x) / - fTexLength; // mapowanie we współrzędnych scenerii + // mapowanie we współrzędnych scenerii + u = (SwitchExtension->vPoints[i].x - oxz.x) / fTexLength; v = (SwitchExtension->vPoints[i].z - oxz.z) / (fTexRatio1 * fTexLength); - glTexCoord2f(cosa0 * u + sina0 * v + 0.5, -sina0 * u + cosa0 * v + 0.5); - glVertex3f(SwitchExtension->vPoints[i].x, SwitchExtension->vPoints[i].y, - SwitchExtension->vPoints[i].z); + glTexCoord2f( + cosa0 * u + sina0 * v + 0.5, + -sina0 * u + cosa0 * v + 0.5); + glVertex3f( + SwitchExtension->vPoints[i].x, + SwitchExtension->vPoints[i].y, + SwitchExtension->vPoints[i].z); } glEnd(); } @@ -1738,7 +1658,7 @@ void TTrack::Compile(GLuint tex) { if (!tex) GfxRenderer.Bind( TextureID1 ); - Segment->RenderLoft(bpts1, numPts, fTexLength); + Segment->RenderLoft( immediate, bpts1, numPts, fTexLength); } if (TextureID2) if (tex ? TextureID2 == tex : true) // jeśli pasuje do grupy (tex) @@ -1750,8 +1670,8 @@ void TTrack::Compile(GLuint tex) vector6(-rozp, -fTexHeight1, 0.0)}; // Ra: po kiego 0.1? if (!tex) GfxRenderer.Bind( TextureID2 ); // brzeg rzeki - Segment->RenderLoft(rpts1, 3, fTexLength); - Segment->RenderLoft(rpts2, 3, fTexLength); + Segment->RenderLoft( immediate, rpts1, 3, fTexLength); + Segment->RenderLoft( immediate, rpts2, 3, fTexLength); } break; } @@ -1918,17 +1838,36 @@ int TTrack::RaArrayPrepare() case 2: // droga if (eType == tt_Cross) // tylko dla skrzyżowania dróg { // specjalny sposób obliczania liczby wierzchołków w skrzyżowaniu - // int n=0; //wierzchołki wewnętrzne do generowania nawierzchni - // int b=0; //wierzchołki do generowania boków - if (fTexHeight1 >= 0) // jeśli fTexHeight1<0, to są chodniki i może któregoś nie być - { // normalne pobocze, na razie się składa z - return (Segment->RaSegCount()) * ((TextureID1 ? 4 : 0) + (TextureID2 ? 12 : 0)); + if( SwitchExtension->iRoads == 3 ) { + // mogą być tylko 3 drogi zamiast 4 + SwitchExtension->iPoints = + 5 + + SwitchExtension->Segments[ 0 ]->RaSegCount() + + SwitchExtension->Segments[ 1 ]->RaSegCount() + + SwitchExtension->Segments[ 2 ]->RaSegCount(); + } + else { + SwitchExtension->iPoints = + 5 + + SwitchExtension->Segments[ 2 ]->RaSegCount() + + SwitchExtension->Segments[ 3 ]->RaSegCount() + + SwitchExtension->Segments[ 4 ]->RaSegCount() + + SwitchExtension->Segments[ 5 ]->RaSegCount(); + } + if (fTexHeight1 >= 0) { + // normalne pobocze, na razie się składa z + // NOTE: for the road part 1x the point amount would be enough, but we provide extra padding + // on account of unexamined issues with geometry data bleeding between vbo chunks + // TODO: sort this out if/when the vbo system is revised + return SwitchExtension->iPoints * ((TextureID1 ? 1 : 0) + (TextureID2 ? 12 : 0)); + } + else { + // jeśli fTexHeight1<0, to są chodniki i może któregoś nie być + // NOTE: for the road part 1x the point amount would be enough, but we provide extra padding + // on account of unexamined issues with geometry data bleeding between vbo chunks + // TODO: sort this out if/when the vbo system is revised + return SwitchExtension->iPoints * ((TextureID1 ? 1 : 0) + (TextureID2 ? 6 : 0 )); } - else - return (Segment->RaSegCount()) * - ((TextureID1 ? 4 : 0) + - (TextureID2 ? (fTexWidth != 0.0 ? 6 : 0) + (fTexSlope != 0.0 ? 6 : 0) : - 0)); } else // standardowo dla zwykłej drogi if (fTexHeight1 >= 0) // jeśli fTexHeight1<0, to są chodniki i może któregoś nie być @@ -2024,40 +1963,27 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) { // podsypka z podkładami jest tylko dla zwykłego toru vector6 bpts1[8]; // punkty głównej płaszczyzny nie przydają się do robienia boków if (fTexLength == 4.0) // jeśli stare mapowanie - { // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy - // profil + { // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy profil if (iTrapezoid) // trapez albo przechyłki { // podsypka z podkladami trapezowata - // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 - // ((0.3464,0.6536) + // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 ((0.3464,0.6536) // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.00, -0.707, 0.707, - 0.0); // lewy brzeg - bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.33, - -0.707, 0.707, 0.0); // krawędź załamania - bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.67, 0.707, - 0.707, 0.0); // prawy brzeg początku symetrycznie - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.00, 0.707, 0.707, - 0.0); // prawy skos + bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.00, -0.707, 0.707, 0.0); // lewy brzeg + bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.33, -0.707, 0.707, 0.0); // krawędź załamania + bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.67, 0.707, 0.707, 0.0); // prawy brzeg początku symetrycznie + bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.00, 0.707, 0.707, 0.0); // prawy skos // końcowy przekrój - bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.00, -0.707, 0.707, - 0.0); // lewy brzeg - bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, - 0.33, -0.707, 0.707, 0.0); // krawędź załamania - bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.67, 0.707, - 0.707, 0.0); // prawy brzeg początku symetrycznie - bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 1.00, 0.707, 0.707, - 0.0); // prawy skos + bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.00, -0.707, 0.707, 0.0); // lewy brzeg + bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, 0.33, -0.707, 0.707, 0.0); // krawędź załamania + bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.67, 0.707, 0.707, 0.0); // prawy brzeg początku symetrycznie + bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 1.00, 0.707, 0.707, 0.0); // prawy skos } else { - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.0, -0.707, 0.707, - 0.0); // lewy brzeg - bpts1[1] = vector6(fHTW + side, -0.18, 0.33, -0.707, 0.707, - 0.0); // krawędź załamania + bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.0, -0.707, 0.707, 0.0); // lewy brzeg + bpts1[1] = vector6(fHTW + side, -0.18, 0.33, -0.707, 0.707, 0.0); // krawędź załamania bpts1[2] = vector6(-fHTW - side, -0.18, 0.67, 0.707, 0.707, 0.0); // druga - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.0, 0.707, 0.707, - 0.0); // prawy skos + bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.0, 0.707, 0.707, 0.0); // prawy skos } } else @@ -2075,42 +2001,30 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 // ((0.3464,0.6536) // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, normal1.x, - -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, - 0.5 - map11, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.5 + map11, - 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, - -normal1.y, 0.0); // prawy skos + bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, normal1.x, -normal1.y, 0.0); // lewy brzeg + bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.5 - map11, 0.0, 1.0, 0.0); // krawędź załamania + bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.5 + map11, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie + bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos // przekrój końcowy - bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.5 - map22, normal2.x, - -normal2.y, 0.0); // lewy brzeg - bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, - 0.5 - map21, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.5 + map21, - 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 0.5 + map22, -normal2.x, - -normal2.y, 0.0); // prawy skos + bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.5 - map22, normal2.x, -normal2.y, 0.0); // lewy brzeg + bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, 0.5 - map21, 0.0, 1.0, 0.0); // krawędź załamania + bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.5 + map21, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie + bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 0.5 + map22, -normal2.x, -normal2.y, 0.0); // prawy skos } else { - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, +normal1.x, - -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6(fHTW + side, -0.18, 0.5 - map11, +normal1.x, -normal1.y, - 0.0); // krawędź załamania - bpts1[2] = vector6(-fHTW - side, -0.18, 0.5 + map11, -normal1.x, -normal1.y, - 0.0); // druga - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, - -normal1.y, 0.0); // prawy skos + bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, +normal1.x, -normal1.y, 0.0); // lewy brzeg + bpts1[1] = vector6(fHTW + side, -0.18, 0.5 - map11, +normal1.x, -normal1.y, 0.0); // krawędź załamania + bpts1[2] = vector6(-fHTW - side, -0.18, 0.5 + map11, -normal1.x, -normal1.y, 0.0); // druga + bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos } } - Segment->RaRenderLoft(Vert, bpts1, iTrapezoid ? -4 : 4, fTexLength); + Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -4 : 4, fTexLength); } if (TextureID1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną - Segment->RaRenderLoft(Vert, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - Segment->RaRenderLoft(Vert, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + Segment->RenderLoft(Vert, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + Segment->RenderLoft(Vert, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); } break; case tt_Switch: // dla zwrotnicy dwa razy szyny @@ -2135,35 +2049,26 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - SwitchExtension->Segments[0]->RaRenderLoft(Vert, rpts3, -nnumPts, fTexLength, 0, - 2, SwitchExtension->fOffset2); - SwitchExtension->Segments[0]->RaRenderLoft(Vert, rpts1, nnumPts, fTexLength, 2); - SwitchExtension->Segments[0]->RaRenderLoft(Vert, rpts2, nnumPts, fTexLength); - SwitchExtension->Segments[1]->RaRenderLoft(Vert, rpts1, nnumPts, fTexLength); + SwitchExtension->Segments[0]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2); + SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2); + SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength); + + SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength); SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - SwitchExtension->Segments[1]->RaRenderLoft(Vert, rpts4, -nnumPts, fTexLength, 0, - 2, -fMaxOffset + - SwitchExtension->fOffset1); - SwitchExtension->Segments[1]->RaRenderLoft(Vert, rpts2, nnumPts, fTexLength, 2); + SwitchExtension->Segments[1]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1); + SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2); } else { // lewa działa lepiej niż prawa - SwitchExtension->Segments[0]->RaRenderLoft( - Vert, rpts1, nnumPts, fTexLength); // lewa szyna normalna cała + SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength); // lewa szyna normalna cała SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - SwitchExtension->Segments[0]->RaRenderLoft( - Vert, rpts4, -nnumPts, fTexLength, 0, 2, - -SwitchExtension->fOffset2); // prawa iglica - SwitchExtension->Segments[0]->RaRenderLoft(Vert, rpts2, nnumPts, fTexLength, - 2); // prawa szyna za iglicą + SwitchExtension->Segments[0]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2); // prawa iglica + SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2); // prawa szyna za iglicą + SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - SwitchExtension->Segments[1]->RaRenderLoft( - Vert, rpts3, -nnumPts, fTexLength, 0, 2, - fMaxOffset - SwitchExtension->fOffset1); // lewa iglica - SwitchExtension->Segments[1]->RaRenderLoft(Vert, rpts1, nnumPts, fTexLength, - 2); // lewa szyna za iglicą - SwitchExtension->Segments[1]->RaRenderLoft( - Vert, rpts2, nnumPts, fTexLength); // prawa szyna normalnie cała + SwitchExtension->Segments[1]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1); // lewa iglica + SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2); // lewa szyna za iglicą + SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength); // prawa szyna normalnie cała } } break; @@ -2178,136 +2083,312 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% - double max = (iCategoryFlag & 4) ? - 0.0 : - fTexLength; // test: szerokość dróg proporcjonalna do długości + double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 double map2 = max > 0.0 ? fHTW2 / max : 0.5; // obcięcie tekstury od strony 2 if (iTrapezoid) // trapez albo przechyłki { // nawierzchnia trapezowata Segment->GetRolls(roll1, roll2); - bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), - 0.5 - map1); // lewy brzeg początku - bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, - 0.5 + map1); // prawy brzeg początku symetrycznie - bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), - 0.5 - map2); // lewy brzeg końca - bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, - 0.5 + map2); // prawy brzeg początku symetrycznie + bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1); // lewy brzeg początku + bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1); // prawy brzeg początku symetrycznie + bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2); // lewy brzeg końca + bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2); // prawy brzeg początku symetrycznie } else { - bpts1[0] = vector6(fHTW, 0.0, 0.5 - map1); // zawsze standardowe mapowanie - bpts1[1] = vector6(-fHTW, 0.0, 0.5 + map1); + bpts1[ 0 ] = vector6( fHTW, 0.0, 0.5 - map1, 0.0, 1.0, 0.0 ); + bpts1[ 1 ] = vector6( -fHTW, 0.0, 0.5 + map1, 0.0, 1.0, 0.0 ); } } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - Segment->RaRenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); } if (TextureID2) - { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w - // Midtown Madness 2?) - vector6 rpts1[6], + { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) + vector6 + rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony if (fTexHeight1 >= 0.0) { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy - rpts1[1] = - vector6(bpts1[0].x + side, bpts1[0].y, 0.5), // lewa krawędź załamania - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, - 1.0); // lewy brzeg pobocza (mapowanie może być inne + rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5), // lewa krawędź załamania + rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 1.0); // lewy brzeg pobocza (mapowanie może być inne rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 1.0); // prawy brzeg pobocza - rpts2[1] = - vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania + rpts2[1] = vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania rpts2[2] = vector6(-rozp, -fTexHeight1, 0.0); // prawy brzeg podstawy if (iTrapezoid) // trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony - // odcinka + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka rpts1[3] = vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza - rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź - // załamania + rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 1.0); // brzeg pobocza rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); - rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego - // pobocza - Segment->RaRenderLoft(Vert, rpts1, -3, fTexLength); - Segment->RaRenderLoft(Vert, rpts2, -3, fTexLength); - } - else - { // pobocza zwykłe, brak przechyłki - Segment->RaRenderLoft(Vert, rpts1, 3, fTexLength); - Segment->RaRenderLoft(Vert, rpts2, 3, fTexLength); + rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza } } else { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości // mapowanie propocjonalne do szerokości chodnika // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy - double d = - -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm - double max = - fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości + double d = -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm + double max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości + double map1l = ( + max > 0.0 ? + side / max : + 0.484375 ); // obcięcie tekstury od lewej strony punktu 1 + double map1r = ( + max > 0.0 ? + slop / max : + 0.484375 ); // obcięcie tekstury od prawej strony punktu 1 + double h1r = ( + slop > d ? + -fTexHeight1 : + 0 ); + double h1l = ( + side > d ? + -fTexHeight1 : + 0 ); + rpts1[0] = vector6(bpts1[0].x + slop, bpts1[0].y + h1r, 0.515625 + map1r); // prawy brzeg prawego chodnika + rpts1[1] = vector6(bpts1[0].x + d, bpts1[0].y + h1r, 0.515625); // prawy krawężnik u góry + rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu + rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu + rpts2[1] = vector6(bpts1[1].x - d, bpts1[1].y + h1l, 0.484375); // lewy krawężnik u góry + rpts2[2] = vector6(bpts1[1].x - side, bpts1[1].y + h1l, 0.484375 - map1l); // lewy brzeg lewego chodnika + if (iTrapezoid) // trapez albo przechyłki + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + slop2 = ( + fabs((iTrapezoid & 2) ? + slop2 : + slop) ); // szerokość chodnika po prawej + double map2l = ( + max > 0.0 ? + side2 / max : + 0.484375 ); // obcięcie tekstury od lewej strony punktu 2 + double map2r = ( + max > 0.0 ? + slop2 / max : + 0.484375 ); // obcięcie tekstury od prawej strony punktu 2 + double h2r = (slop2 > d) ? -fTexHeight2 : 0; + double h2l = (side2 > d) ? -fTexHeight2 : 0; + rpts1[3] = vector6(bpts1[2].x + slop2, bpts1[2].y + h2r, 0.515625 + map2r); // prawy brzeg prawego chodnika + rpts1[4] = vector6(bpts1[2].x + d, bpts1[2].y + h2r, 0.515625); // prawy krawężnik u góry + rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu + rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu + rpts2[4] = vector6(bpts1[3].x - d, bpts1[3].y + h2l, 0.484375); // lewy krawężnik u góry + rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y + h2l, 0.484375 - map2l); // lewy brzeg lewego chodnika + } + } + if( iTrapezoid ) // trapez albo przechyłki + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony + // odcinka + if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) + Segment->RenderLoft( Vert, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej + if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) + Segment->RenderLoft( Vert, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej + } + else { // pobocza zwykłe, brak przechyłki + if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) + Segment->RenderLoft( Vert, rpts1, 3, fTexLength ); + if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) + Segment->RenderLoft( Vert, rpts2, 3, fTexLength ); + } + } + break; + } + case tt_Cross: // skrzyżowanie dróg rysujemy inaczej + { // ustalenie współrzędnych środka - przecięcie Point1-Point2 z CV4-Point4 + double a[4]; // kąty osi ulic wchodzących + vector3 p[4]; // punkty się przydadzą do obliczeń + // na razie połowa odległości pomiędzy Point1 i Point2, potem się dopracuje + a[0] = a[1] = 0.5; // parametr do poszukiwania przecięcia łuków + // modyfikować a[0] i a[1] tak, aby trafić na przecięcie odcinka 34 + p[0] = SwitchExtension->Segments[0]->FastGetPoint(a[0]); // współrzędne środka pierwszego odcinka + p[1] = SwitchExtension->Segments[1]->FastGetPoint(a[1]); //-//- drugiego + // p[2]=p[1]-p[0]; //jeśli różne od zera, przeliczyć a[0] i a[1] i wyznaczyć nowe punkty + vector3 oxz = p[0]; // punkt mapowania środka tekstury skrzyżowania + p[0] = SwitchExtension->Segments[0]->GetDirection1(); // Point1 - pobranie wektorów kontrolnych + p[1] = SwitchExtension->Segments[1]->GetDirection2(); // Point3 (bo zamienione) + p[2] = SwitchExtension->Segments[0]->GetDirection2(); // Point2 + p[3] = SwitchExtension->Segments[1]->GetDirection1(); // Point4 (bo zamienione) + a[0] = atan2(-p[0].x, p[0].z); // kąty stycznych osi dróg + a[1] = atan2(-p[1].x, p[1].z); + a[2] = atan2(-p[2].x, p[2].z); + a[3] = atan2(-p[3].x, p[3].z); + p[0] = SwitchExtension->Segments[0]->FastGetPoint_0(); // Point1 - pobranie współrzędnych końców + p[1] = SwitchExtension->Segments[1]->FastGetPoint_1(); // Point3 + p[2] = SwitchExtension->Segments[0]->FastGetPoint_1(); // Point2 + p[3] = SwitchExtension->Segments[1]->FastGetPoint_0(); // Point4 - przy trzech drogach pokrywa się z Point1 + // 2014-07: na początek rysować brzegi jak dla łuków + // punkty brzegu nawierzchni uzyskujemy podczas renderowania boków (bez sensu, ale najszybciej było zrobić) + int i; // ile punktów (może byc różna ilość punktów między drogami) + if (!SwitchExtension->vPoints) + { // jeśli tablica punktów nie jest jeszcze utworzona, zliczamy punkty i tworzymy ją + if( SwitchExtension->iRoads == 3 ) { + // mogą być tylko 3 drogi zamiast 4 + SwitchExtension->iPoints = + 5 + + SwitchExtension->Segments[ 0 ]->RaSegCount() + + SwitchExtension->Segments[ 1 ]->RaSegCount() + + SwitchExtension->Segments[ 2 ]->RaSegCount(); + } + else { + SwitchExtension->iPoints = + 5 + + SwitchExtension->Segments[ 2 ]->RaSegCount() + + SwitchExtension->Segments[ 3 ]->RaSegCount() + + SwitchExtension->Segments[ 4 ]->RaSegCount() + + SwitchExtension->Segments[ 5 ]->RaSegCount(); + } + // tablica utworzona z zapasem, ale nie wypełniona współrzędnymi + SwitchExtension->vPoints = new vector3[SwitchExtension->iPoints]; + } + vector3 *b = + SwitchExtension->bPoints ? + nullptr : + SwitchExtension->vPoints; // zmienna robocza, NULL gdy tablica punktów już jest wypełniona + vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków + if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma + { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% + double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości + double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 + double map2 = max > 0.0 ? fHTW2 / max : 0.5; // obcięcie tekstury od strony 2 + // if (iTrapezoid) //trapez albo przechyłki + { // nawierzchnia trapezowata + Segment->GetRolls(roll1, roll2); + bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1, sin(roll1), cos(roll1), 0.0); // lewy brzeg początku + bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1, -sin(roll1), cos(roll1), 0.0); // prawy brzeg początku symetrycznie + bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2, sin(roll2), cos(roll2), 0.0); // lewy brzeg końca + bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2, -sin(roll2), cos(roll2), 0.0); // prawy brzeg początku symetrycznie + } + } + // najpierw renderowanie poboczy i zapamiętywanie punktów + // problem ze skrzyżowaniami jest taki, że teren chce się pogrupować wg tekstur, ale zaczyna od nawierzchni + // sama nawierzchnia nie wypełni tablicy punktów, bo potrzebne są pobocza + // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie w swoim czasie + if( TextureID2 ) + { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) + vector6 + rpts1[6], + rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony + // Ra 2014-07: trzeba to przerobić na pętlę i pobierać profile (przynajmniej 2..4) z sąsiednich dróg + if (fTexHeight1 >= 0.0) + { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo + rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy + rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5); // lewa krawędź załamania + rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 1.0); // lewy brzeg pobocza (mapowanie może być inne + rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 1.0); // prawy brzeg pobocza + rpts2[1] = vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania + rpts2[2] = vector6(-rozp, -fTexHeight1, 0.0); // prawy brzeg podstawy + // if (iTrapezoid) //trapez albo przechyłki + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + rpts1[3] = vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza + rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania + rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 1.0); // brzeg pobocza + rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); + rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); + rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza + } + } + else + { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości + // mapowanie propocjonalne do szerokości chodnika + // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy + double d = -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm + double max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości double map1l = max > 0.0 ? side / max : 0.484375; // obcięcie tekstury od lewej strony punktu 1 double map1r = max > 0.0 ? slop / max : 0.484375; // obcięcie tekstury od prawej strony punktu 1 - double h1r = (slop > d) ? -fTexHeight1 : 0; - double h1l = (side > d) ? -fTexHeight1 : 0; - rpts1[0] = vector6(bpts1[0].x + slop, bpts1[0].y + h1r, - 0.515625 + map1r); // prawy brzeg prawego chodnika - rpts1[1] = vector6(bpts1[0].x + d, bpts1[0].y + h1r, - 0.515625); // prawy krawężnik u góry - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, - 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, - 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[1] = vector6(bpts1[1].x - d, bpts1[1].y + h1l, - 0.484375); // lewy krawężnik u góry - rpts2[2] = vector6(bpts1[1].x - side, bpts1[1].y + h1l, - 0.484375 - map1l); // lewy brzeg lewego chodnika - if (iTrapezoid) // trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony - // odcinka - slop2 = - fabs((iTrapezoid & 2) ? slop2 : slop); // szerokość chodnika po prawej + rpts1[0] = vector6(bpts1[0].x + slop, bpts1[0].y - fTexHeight1, 0.515625 + map1r); // prawy brzeg prawego chodnika + rpts1[1] = vector6(bpts1[0].x + d, bpts1[0].y - fTexHeight1, 0.515625); // prawy krawężnik u góry + rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu + rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu + rpts2[1] = vector6(bpts1[1].x - d, bpts1[1].y - fTexHeight1, 0.484375); // lewy krawężnik u góry + rpts2[2] = vector6(bpts1[1].x - side, bpts1[1].y - fTexHeight1, 0.484375 - map1l); // lewy brzeg lewego chodnika + // if (iTrapezoid) //trapez albo przechyłki + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + slop2 = std::fabs((iTrapezoid & 2) ? slop2 : slop); // szerokość chodnika po prawej double map2l = max > 0.0 ? side2 / max : 0.484375; // obcięcie tekstury od lewej strony punktu 2 double map2r = max > 0.0 ? slop2 / max : 0.484375; // obcięcie tekstury od prawej strony punktu 2 - double h2r = (slop2 > d) ? -fTexHeight2 : 0; - double h2l = (side2 > d) ? -fTexHeight2 : 0; - rpts1[3] = vector6(bpts1[2].x + slop2, bpts1[2].y + h2r, - 0.515625 + map2r); // prawy brzeg prawego chodnika - rpts1[4] = vector6(bpts1[2].x + d, bpts1[2].y + h2r, - 0.515625); // prawy krawężnik u góry - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, - 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, - 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[4] = vector6(bpts1[3].x - d, bpts1[3].y + h2l, - 0.484375); // lewy krawężnik u góry - rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y + h2l, - 0.484375 - map2l); // lewy brzeg lewego chodnika - if (slop != 0.0) - Segment->RaRenderLoft(Vert, rpts1, -3, fTexLength); - if (side != 0.0) - Segment->RaRenderLoft(Vert, rpts2, -3, fTexLength); + rpts1[3] = vector6(bpts1[2].x + slop2, bpts1[2].y - fTexHeight2, 0.515625 + map2r); // prawy brzeg prawego chodnika + rpts1[4] = vector6(bpts1[2].x + d, bpts1[2].y - fTexHeight2, 0.515625); // prawy krawężnik u góry + rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu + rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu + rpts2[4] = vector6(bpts1[3].x - d, bpts1[3].y - fTexHeight2, 0.484375); // lewy krawężnik u góry + rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y - fTexHeight2, 0.484375 - map2l); // lewy brzeg lewego chodnika } - else - { // pobocza zwykłe, brak przechyłki - if (slop != 0.0) - Segment->RaRenderLoft(Vert, rpts1, 3, fTexLength); - if (side != 0.0) - Segment->RaRenderLoft(Vert, rpts2, 3, fTexLength); + } + bool render = ( TextureID2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni + // if (iTrapezoid) //trapez albo przechyłki + if (SwitchExtension->iRoads == 4) + { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { + SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 3 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 4 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 5 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + } + } + else { + // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe + if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { + SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P2 do P4 + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P4 do P3=P1 (odwrócony) + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P1 do P2 } } } + // renderowanie nawierzchni na końcu + double sina0 = sin(a[0]), cosa0 = cos(a[0]); + double u, v; + if (!SwitchExtension->bPoints) // jeśli tablica nie wypełniona + if (b) // ale jest wskaźnik do tablicy - może nie być? + { // coś się gubi w obliczeniach na wskaźnikach + // ustalenie liczby punktów, bo mogło wyjść inaczej niż policzone z góry + i = (int)(((size_t)(b)) - ((size_t)(SwitchExtension->vPoints))) / sizeof(vector3); + if (i > 0) + { // jeśli zostało to właśnie utworzone + SwitchExtension->iPoints = std::min( SwitchExtension->iPoints - 2, i ); + SwitchExtension->vPoints[SwitchExtension->iPoints++] = SwitchExtension->vPoints[0]; + ++SwitchExtension->iPoints; // we'll add one extra point in the middle + SwitchExtension->bPoints = true; // tablica punktów została wypełniona + } + } + if (TextureID1) { + // jeśli podana tekstura nawierzchni + Vert->nx = 0.0; + Vert->ny = 1.0; + Vert->nz = 0.0; + Vert->u = 0.5; + Vert->v = 0.5; + Vert->x = oxz.x; + Vert->y = oxz.y; + Vert->z = oxz.z; + ++Vert; + for (i = SwitchExtension->iPoints - 2; i >= 0; --i) + { + Vert->nx = 0.0; + Vert->ny = 1.0; + Vert->nz = 0.0; + // mapowanie we współrzędnych scenerii + u = (SwitchExtension->vPoints[i].x - oxz.x) / fTexLength; + v = (SwitchExtension->vPoints[i].z - oxz.z) / (fTexRatio1 * fTexLength); + Vert->u = cosa0 * u + sina0 * v + 0.5; + Vert->v = -sina0 * u + cosa0 * v + 0.5; + Vert->x = SwitchExtension->vPoints[ i ].x; + Vert->y = SwitchExtension->vPoints[ i ].y; + Vert->z = SwitchExtension->vPoints[ i ].z; + ++Vert; + } + } + break; } } break; @@ -2344,7 +2425,7 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - Segment->RaRenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); } if (TextureID2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w @@ -2366,13 +2447,13 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza - Segment->RaRenderLoft(Vert, rpts1, -3, fTexLength); - Segment->RaRenderLoft(Vert, rpts2, -3, fTexLength); + Segment->RenderLoft(Vert, rpts1, -3, fTexLength); + Segment->RenderLoft(Vert, rpts2, -3, fTexLength); } else { // pobocza zwykłe, brak przechyłki - Segment->RaRenderLoft(Vert, rpts1, 3, fTexLength); - Segment->RaRenderLoft(Vert, rpts2, 3, fTexLength); + Segment->RenderLoft(Vert, rpts1, 3, fTexLength); + Segment->RenderLoft(Vert, rpts2, 3, fTexLength); } } } @@ -2388,7 +2469,8 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO int seg; int i; switch( iCategoryFlag & 15 ) { - case 1: // tor + case 1: { + // tor if( eType == tt_Switch ) // dla zwrotnicy tylko szyny { if( TextureID1 ) @@ -2405,6 +2487,7 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); iPtr += 24 * seg; // pominięcie lewej szyny glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); + iPtr += 24 * seg; } } else // dla toru podsypka plus szyny @@ -2420,36 +2503,86 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); iPtr += 24 * seg; // pominięcie lewej szyny glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); + iPtr += 24 * seg; } } } break; - case 2: // droga - if( ( seg = Segment->RaSegCount() ) > 0 ) { - if( TextureID1 ) { - GfxRenderer.Bind( TextureID1 ); // nawierzchnia - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 4 * seg ); - iPtr += 4 * seg; - } - if( TextureID2 ) { - GfxRenderer.Bind( TextureID2 ); // pobocze - if( fTexHeight1 >= 0.0 ) { // normalna droga z poboczem - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); - iPtr += 6 * seg; // pominięcie lewego pobocza - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + } + case 2: { + // droga + switch( eType ) { + case tt_Normal: { + if( ( seg = Segment->RaSegCount() ) > 0 ) { + if( TextureID1 ) { + GfxRenderer.Bind( TextureID1 ); // nawierzchnia + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 4 * seg ); + iPtr += 4 * seg; } - else { // z chodnikami o różnych szerokociach - if( fTexWidth != 0.0 ) { - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + if( TextureID2 ) { + GfxRenderer.Bind( TextureID2 ); // pobocze + if( fTexHeight1 >= 0.0 ) { // normalna droga z poboczem + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); iPtr += 6 * seg; // pominięcie lewego pobocza + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + iPtr += 6 * seg; + } + else { // z chodnikami o różnych szerokociach + if( fTexWidth != 0.0 ) { + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + iPtr += 6 * seg; // pominięcie lewego pobocza + } + if( fTexSlope != 0.0 ) { + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + iPtr += 6 * seg; + } } - if( fTexSlope != 0.0 ) - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); } } + break; } + case tt_Cross: { + if( (seg = SwitchExtension->iPoints) > 0 ) { + if( TextureID2 ) { + // sidewalks + GfxRenderer.Bind( TextureID2 ); + if( fTexHeight1 != 0.0 ) { + if( SwitchExtension->iRoads == 4 ) { + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 2 ]->RaSegCount() ); + iPtr += 6 * SwitchExtension->Segments[ 2 ]->RaSegCount(); + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 3 ]->RaSegCount() ); + iPtr += 6 * SwitchExtension->Segments[ 3 ]->RaSegCount(); + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 4 ]->RaSegCount() ); + iPtr += 6 * SwitchExtension->Segments[ 4 ]->RaSegCount(); + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 5 ]->RaSegCount() ); + iPtr += 6 * SwitchExtension->Segments[ 5 ]->RaSegCount(); + } + else { + // presumed 3 roads otherwise, as we only support 3 & 4 road crossings + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 2 ]->RaSegCount() ); + iPtr += 6 * SwitchExtension->Segments[ 2 ]->RaSegCount(); + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 1 ]->RaSegCount() ); + iPtr += 6 * SwitchExtension->Segments[ 1 ]->RaSegCount(); + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 0 ]->RaSegCount() ); + iPtr += 6 * SwitchExtension->Segments[ 0 ]->RaSegCount(); + } + } + } + if( TextureID1 ) { + // roads + GfxRenderer.Bind( TextureID1 ); + ::glDrawArrays( GL_TRIANGLE_FAN, iPtr, SwitchExtension->iPoints ); + iPtr += SwitchExtension->iPoints; + } + } + break; + } + default: { break; } + } //switch etype break; - case 4: // rzeki - jeszcze do przemyślenia + } + case 4: { + // rzeki - jeszcze do przemyślenia if( ( seg = Segment->RaSegCount() ) > 0 ) { if( TextureID1 ) { GfxRenderer.Bind( TextureID1 ); // nawierzchnia @@ -2461,9 +2594,11 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); iPtr += 6 * seg; // pominięcie lewego pobocza glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); + iPtr += 6 * seg; } } break; + } } EnvironmentReset(); }; @@ -2821,17 +2956,25 @@ TTrack * TTrack::RaAnimate() for (int i = 0; i < 12; ++i) { rpts3[i] = - vector6((fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, - -(fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, iglica[i].z); + vector6( + (fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, + -(fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, + iglica[i].z); rpts3[i + 12] = - vector6((fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, szyna[i].z); - rpts4[11 - i] = vector6((-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, - -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, - iglica[i].z); + vector6( + (fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, + -(fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, + szyna[i].z); + rpts4[11 - i] = + vector6( + (-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, + -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, + iglica[i].z); rpts4[23 - i] = - vector6((-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, szyna[i].z); + vector6( + (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, + -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, + szyna[i].z); } CVertNormTex Vert[2 * 2 * 12]; // na razie 2 segmenty CVertNormTex *v = Vert; // bo RaAnimate() modyfikuje wskaźnik @@ -2840,42 +2983,41 @@ TTrack * TTrack::RaAnimate() 2 * 2 * 12 * sizeof(CVertNormTex), &Vert); // pobranie fragmentu bufora VBO if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - SwitchExtension->Segments[0]->RaAnimate(v, rpts3, -nnumPts, fTexLength, 0, - 2, SwitchExtension->fOffset2); - glBufferSubData(GL_ARRAY_BUFFER, - SwitchExtension->iLeftVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), - &Vert); // wysłanie fragmentu bufora VBO + SwitchExtension->Segments[ 0 ]->RenderLoft( v, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2, true ); + ::glBufferSubData( + GL_ARRAY_BUFFER, + SwitchExtension->iLeftVBO * sizeof(CVertNormTex), + 2 * 2 * 12 * sizeof(CVertNormTex), + &Vert); // wysłanie fragmentu bufora VBO v = Vert; - glGetBufferSubData(GL_ARRAY_BUFFER, - SwitchExtension->iRightVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), - &Vert); // pobranie fragmentu bufora VBO - SwitchExtension->Segments[1]->RaAnimate(v, rpts4, -nnumPts, fTexLength, 0, - 2, -fMaxOffset + - SwitchExtension->fOffset1); + ::glGetBufferSubData( + GL_ARRAY_BUFFER, + SwitchExtension->iRightVBO * sizeof(CVertNormTex), + 2 * 2 * 12 * sizeof(CVertNormTex), + &Vert); // pobranie fragmentu bufora VBO + SwitchExtension->Segments[ 1 ]->RenderLoft( v, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1, true ); } else { // oryginalnie lewa działała lepiej niż prawa - SwitchExtension->Segments[0]->RaAnimate( - v, rpts4, -nnumPts, fTexLength, 0, 2, - -SwitchExtension->fOffset2); // prawa iglica - glBufferSubData(GL_ARRAY_BUFFER, - SwitchExtension->iLeftVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), - &Vert); // wysłanie fragmentu bufora VBO + SwitchExtension->Segments[ 0 ]->RenderLoft( v, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2, true ); // prawa iglica + ::glBufferSubData( + GL_ARRAY_BUFFER, + SwitchExtension->iLeftVBO * sizeof(CVertNormTex), + 2 * 2 * 12 * sizeof(CVertNormTex), + &Vert); // wysłanie fragmentu bufora VBO v = Vert; - glGetBufferSubData(GL_ARRAY_BUFFER, - SwitchExtension->iRightVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), - &Vert); // pobranie fragmentu bufora VBO - SwitchExtension->Segments[1]->RaAnimate( - v, rpts3, -nnumPts, fTexLength, 0, 2, - fMaxOffset - SwitchExtension->fOffset1); // lewa iglica + ::glGetBufferSubData( + GL_ARRAY_BUFFER, + SwitchExtension->iRightVBO * sizeof(CVertNormTex), + 2 * 2 * 12 * sizeof(CVertNormTex), + &Vert); // pobranie fragmentu bufora VBO + SwitchExtension->Segments[ 1 ]->RenderLoft( v, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1, true ); // lewa iglica } - glBufferSubData( - GL_ARRAY_BUFFER, SwitchExtension->iRightVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), &Vert); // wysłanie fragmentu bufora VBO + ::glBufferSubData( + GL_ARRAY_BUFFER, + SwitchExtension->iRightVBO * sizeof(CVertNormTex), + 2 * 2 * 12 * sizeof(CVertNormTex), + &Vert); // wysłanie fragmentu bufora VBO } } else // gdy Display List @@ -2919,14 +3061,10 @@ TTrack * TTrack::RaAnimate() // aktualizacja pojazdów na torze if (GLEW_VERSION_1_5) // dla OpenGL 1.4 to się nie wykona poprawnie { - int size = - RaArrayPrepare(); // wielkość tabeli potrzebna dla tej obrotnicy + int size = RaArrayPrepare(); // wielkość tabeli potrzebna dla tej obrotnicy CVertNormTex *Vert = new CVertNormTex[size]; // bufor roboczy // CVertNormTex *v=Vert; //zmieniane przez - RaArrayFill(Vert, - Vert - - SwitchExtension - ->iLeftVBO); // iLeftVBO powinno zostać niezmienione + RaArrayFill(Vert, Vert - SwitchExtension->iLeftVBO); // iLeftVBO powinno zostać niezmienione glBufferSubData( GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(CVertNormTex), size * sizeof(CVertNormTex), Vert); // wysłanie fragmentu bufora VBO diff --git a/dumb3d.h b/dumb3d.h index 57de1f1b..818306d9 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -104,14 +104,8 @@ class vector3 return &x; } - // union - // { - // struct - // { double x, y, z; - // }; - // scalar_t e[3]; - // }; + bool inline Equal(vector3 *v) { // sprawdzenie odległości punktów if (std::fabs(x - v->x) > 0.02) diff --git a/renderer.cpp b/renderer.cpp index c3c7e85f..23150308 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -11,8 +11,11 @@ http://mozilla.org/MPL/2.0/. #include "renderer.h" #include "globals.h" +#include "timer.h" #include "world.h" #include "dynobj.h" +#include "animmodel.h" +#include "traction.h" #include "uilayer.h" #include "logs.h" #include "usefull.h" @@ -31,11 +34,11 @@ bool opengl_camera::visible( TDynamicObject const *Dynamic ) const { // sphere test is faster than AABB, so we'll use it here - float3 diagonal( - Dynamic->MoverParameters->Dim.L, - Dynamic->MoverParameters->Dim.H, - Dynamic->MoverParameters->Dim.W ); - float const radius = diagonal.Length() * 0.5f; + glm::vec3 diagonal( + static_cast( Dynamic->MoverParameters->Dim.L ), + static_cast( Dynamic->MoverParameters->Dim.H ), + static_cast( Dynamic->MoverParameters->Dim.W ) ); + float const radius = glm::length( diagonal ) * 0.5f; return ( m_frustum.sphere_inside( Dynamic->GetPosition(), radius ) > 0.0f ); } @@ -183,7 +186,7 @@ opengl_renderer::Render( world_environment *Environment ) { if( Global::fFogEnd > 0 ) { // fog setup ::glFogfv( GL_FOG_COLOR, Global::FogColor ); - ::glFogf( GL_FOG_DENSITY, 1.0f / Global::fFogEnd ); + ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / Global::fFogEnd ) ); ::glEnable( GL_FOG ); } else { ::glDisable( GL_FOG ); } @@ -236,7 +239,7 @@ opengl_renderer::Render( world_environment *Environment ) { { Bind( m_moontextureid ); float3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); - ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, 1.0f - Global::fLuminance * 0.5f ); + ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, static_cast( 1.0 - Global::fLuminance * 0.5 ) ); auto const moonvector = Environment->m_moon.getDirection(); auto const moonposition = modelview * glm::vec4( moonvector.x, moonvector.y, moonvector.z, 1.0f ); @@ -296,9 +299,9 @@ opengl_renderer::Render( TGround *Ground ) { glEnable( GL_LIGHTING ); glColor3f( 1.0f, 1.0f, 1.0f ); - float3 const cameraposition = float3( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); - int const camerax = std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2; - int const cameraz = std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2; + glm::vec3 const cameraposition( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); + int const camerax = static_cast( std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2 ); + int const cameraz = static_cast( std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2 ); int const segmentcount = 2 * static_cast(std::ceil( m_drawrange * Global::fDistanceFactor / 1000.0f )); int const originx = std::max( 0, camerax - segmentcount / 2 ); int const originz = std::max( 0, cameraz - segmentcount / 2 ); @@ -317,15 +320,133 @@ opengl_renderer::Render( TGround *Ground ) { } bool -opengl_renderer::Render( TDynamicObject *Dynamic ) { +opengl_renderer::Render( TGroundNode *Node ) { - if( false == m_camera.visible( Dynamic ) ) { + Node->SetLastUsage( Timer::GetSimulationTime() ); - Dynamic->renderme = false; + switch (Node->iType) + { // obiekty renderowane niezależnie od odległości + case TP_SUBMODEL: + TSubModel::fSquareDist = 0; + Render( Node->smTerrain ); + return true; + } + + double const distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); + if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) + || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { return false; } - Dynamic->renderme = true; + switch (Node->iType) + { + case TP_TRACK: { + // TODO: unify the render code after generic buffers are in place + if( Global::bUseVBO ) { + if( Node->iNumVerts ) { + Node->pTrack->RaRenderVBO( Node->iVboPtr ); + } + else { + return false; + } + } + else { + Node->pTrack->Render(); + } + return true; + } + case TP_MODEL: { + Node->Model->Render( &Node->pCenter ); + return true; + } + case TP_MEMCELL: { + GfxRenderer.Render( Node->MemCell ); + return true; + } + } + + // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 + if( ( Node->iFlags & 0x10 ) + || ( Node->fLineThickness < 0 ) ) { + // TODO: unify the render code after generic buffers are in place + if( false == Global::bUseVBO ) { + // additional setup for display lists + if( ( Node->DisplayListID == 0 ) + || ( Node->iVersion != Global::iReCompile ) ) { // Ra: wymuszenie rekompilacji + Node->Compile(); + if( Global::bManageNodes ) + ResourceManager::Register( Node ); + }; + } + + if( ( Node->iType == GL_LINES ) + || ( Node->iType == GL_LINE_STRIP ) + || ( Node->iType == GL_LINE_LOOP ) ) { + // wszelkie linie są rysowane na samym końcu + if( Node->iNumPts ) { + // setup + // w zaleznosci od koloru swiatla + ::glColor4ub( + static_cast( std::floor( Node->Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ) ), + static_cast( std::floor( Node->Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ) ), + static_cast( std::floor( Node->Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ) ), + static_cast( std::min( 255.0, 255000 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ); + + GfxRenderer.Bind( 0 ); + + // render + // TODO: unify the render code after generic buffers are in place + if( Global::bUseVBO ) { + ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumPts ); + } + else { + ::glCallList( Node->DisplayListID ); + } + return true; + } + else { + return false; + } + } + else { + // GL_TRIANGLE etc + // setup + ::glColor3ub( + static_cast( Node->Diffuse[ 0 ] ), + static_cast( Node->Diffuse[ 1 ] ), + static_cast( Node->Diffuse[ 2 ] ) ); + + Bind( Node->TextureID ); + + // render + // TODO: unify the render code after generic buffers are in place + if( Global::bUseVBO ) { + // vbo render path + if( Node->iVboPtr >= 0 ) { + ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumVerts ); + } + else { + return false; + } + } + else { + // display list render path + ::glCallList( Node->DisplayListID ); + } + return true; + } + } + // in theory we shouldn't ever get here but, eh + return false; +} + +bool +opengl_renderer::Render( TDynamicObject *Dynamic ) { + + Dynamic->renderme = m_camera.visible( Dynamic ); + if( false == Dynamic->renderme ) { + return false; + } // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji @@ -517,7 +638,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { float const anglefactor = ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances - float const distancefactor = std::max( 0.5, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ); + float const distancefactor = static_cast( std::max( 0.5, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ); if( lightlevel > 0.0f ) { // material configuration: @@ -609,6 +730,146 @@ opengl_renderer::Render( TMemCell *Memcell ) { ::glPopAttrib(); } +// NOTE: legacy render system switch +#define _PROBLEND + +bool +opengl_renderer::Render_Alpha( TGroundNode *Node ) { + + // SPOSOB NA POZBYCIE SIE RAMKI DOOKOLA TEXTURY ALPHA DLA OBIEKTOW ZAGNIEZDZONYCH W SCN JAKO + // NODE + + // W GROUND.H dajemy do klasy TGroundNode zmienna bool PROBLEND to samo robimy w klasie TGround + // nastepnie podczas wczytywania textury dla TRIANGLES w TGround::AddGroundNode + // sprawdzamy czy w nazwie jest @ i wg tego + // ustawiamy PROBLEND na true dla wlasnie wczytywanego trojkata (kazdy trojkat jest osobnym + // nodem) + // nastepnie podczas renderowania w bool TGroundNode::RenderAlpha() + // na poczatku ustawiamy standardowe GL_GREATER = 0.04 + // pozniej sprawdzamy czy jest wlaczony PROBLEND dla aktualnie renderowanego noda TRIANGLE, + // wlasciwie dla kazdego node'a + // i jezeli tak to odpowiedni GL_GREATER w przeciwnym wypadku standardowy 0.04 + + Node->SetLastUsage( Timer::GetSimulationTime() ); + + double const distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); + if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) + || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { + return false; + } + + switch (Node->iType) + { + case TP_TRACTION: { + // TODO: unify the render code after generic buffers are in place + if( Node->bVisible ) { + if( Global::bUseVBO ) { + Node->hvTraction->RenderVBO( distancesquared, Node->iVboPtr ); + } + else { + Node->hvTraction->RenderDL( distancesquared ); + } + return true; + } + else { + return false; + } + } + case TP_MODEL: { + Node->Model->RenderAlpha( &Node->pCenter ); + return true; + } + } + + // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 + if( ( Node->iNumVerts && ( Node->iFlags & 0x20 ) ) + || ( Node->iNumPts && ( Node->fLineThickness > 0 ) ) ) { + +#ifdef _PROBLEND + if( ( Node->PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 + { + ::glDisable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + }; +#endif + // TODO: unify the render code after generic buffers are in place + if( false == Global::bUseVBO ) { + // additional setup for display lists + if( ( Node->DisplayListID == 0 ) + || ( Node->iVersion != Global::iReCompile ) ) { // Ra: wymuszenie rekompilacji + Node->Compile(); + if( Global::bManageNodes ) + ResourceManager::Register( Node ); + }; + } + + bool result( false ); + + if( ( Node->iType == GL_LINES ) + || ( Node->iType == GL_LINE_STRIP ) + || ( Node->iType == GL_LINE_LOOP ) ) { + // wszelkie linie są rysowane na samym końcu + if( Node->iNumPts ) { + // setup + // w zaleznosci od koloru swiatla + ::glColor4ub( + static_cast( std::floor( Node->Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ) ), + static_cast( std::floor( Node->Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ) ), + static_cast( std::floor( Node->Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ) ), + static_cast( std::min( 255.0, 255000 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ); + + GfxRenderer.Bind( 0 ); + + // render + // TODO: unify the render code after generic buffers are in place + if( Global::bUseVBO ) { + ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumPts ); + } + else { + ::glCallList( Node->DisplayListID ); + } + result = true; + } + } + else { + // GL_TRIANGLE etc + // setup + ::glColor3ub( + static_cast( Node->Diffuse[ 0 ] ), + static_cast( Node->Diffuse[ 1 ] ), + static_cast( Node->Diffuse[ 2 ] ) ); + + Bind( Node->TextureID ); + + // render + // TODO: unify the render code after generic buffers are in place + if( Global::bUseVBO ) { + // vbo render path + if( Node->iVboPtr >= 0 ) { + ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumVerts ); + result = true; + } + } + else { + // display list render path + ::glCallList( Node->DisplayListID ); + result = true; + } + } + // post-render cleanup +#ifdef _PROBLEND + if( ( Node->PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 + { + ::glEnable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.04f ); + } +#endif + return result; + } + // in theory we shouldn't ever get here but, eh + return false; +} + bool opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { @@ -978,12 +1239,12 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { if( environment > 0.0f ) { luminance *= environment; } - renderlight->diffuse[ 0 ] = std::max( 0.0, scenelight.color.x - luminance ); - renderlight->diffuse[ 1 ] = std::max( 0.0, scenelight.color.y - luminance ); - renderlight->diffuse[ 2 ] = std::max( 0.0, scenelight.color.z - luminance ); - renderlight->ambient[ 0 ] = std::max( 0.0, scenelight.color.x * scenelight.intensity - luminance); - renderlight->ambient[ 1 ] = std::max( 0.0, scenelight.color.y * scenelight.intensity - luminance ); - renderlight->ambient[ 2 ] = std::max( 0.0, scenelight.color.z * scenelight.intensity - luminance ); + renderlight->diffuse[ 0 ] = static_cast( std::max( 0.0, scenelight.color.x - luminance ) ); + renderlight->diffuse[ 1 ] = static_cast( std::max( 0.0, scenelight.color.y - luminance ) ); + renderlight->diffuse[ 2 ] = static_cast( std::max( 0.0, scenelight.color.z - luminance ) ); + renderlight->ambient[ 0 ] = static_cast( std::max( 0.0, scenelight.color.x * scenelight.intensity - luminance) ); + renderlight->ambient[ 1 ] = static_cast( std::max( 0.0, scenelight.color.y * scenelight.intensity - luminance ) ); + renderlight->ambient[ 2 ] = static_cast( std::max( 0.0, scenelight.color.z * scenelight.intensity - luminance ) ); /* // NOTE: we have no simple way to determine whether the lights are falling on objects located in darker environment // until this issue is resolved we're disabling reduction of light strenght based on the global luminance @@ -994,7 +1255,7 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { renderlight->ambient[ 1 ] = std::max( 0.0f, scenelight.color.y * scenelight.intensity ); renderlight->ambient[ 2 ] = std::max( 0.0f, scenelight.color.z * scenelight.intensity ); */ - ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, (0.25f * scenelight.count) / std::pow( scenelight.count, 2 ) * (scenelight.owner->DimHeadlights ? 1.25f : 1.0f) ); + ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, static_cast( (0.25 * scenelight.count) / std::pow( scenelight.count, 2 ) * (scenelight.owner->DimHeadlights ? 1.25 : 1.0) ) ); ::glEnable( renderlight->id ); renderlight->apply_intensity(); diff --git a/renderer.h b/renderer.h index 7f779308..d14f2995 100644 --- a/renderer.h +++ b/renderer.h @@ -124,6 +124,8 @@ public: Render( world_environment *Environment ); bool Render( TGround *Ground ); + bool + Render( TGroundNode *Node ); bool Render( TDynamicObject *Dynamic ); bool @@ -134,6 +136,8 @@ public: Render( TSubModel *Submodel ); void Render( TMemCell *Memcell ); + bool + Render_Alpha( TGroundNode *Node ); bool Render_Alpha( TDynamicObject *Dynamic ); bool From 98d99baa82c6caa77afe243cf3ab9c949451f60d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 13 May 2017 17:11:35 +0200 Subject: [PATCH 103/426] build 170513. fix for switch animation for vbo render path. opengl requirement experimentally increased to 1.5+ --- Ground.cpp | 28 +++-- Track.cpp | 284 ++++++++++++++------------------------------------- Track.h | 2 +- renderer.cpp | 4 +- 4 files changed, 100 insertions(+), 218 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index e8d6a2dc..a8b74537 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1004,16 +1004,26 @@ bool TSubRect::RaTrackAnimAdd(TTrack *t) void TSubRect::RaAnimate() { // wykonanie animacji - if (!tTrackAnim) - return; // nie ma nic do animowania - if (Global::bUseVBO) - { // odświeżenie VBO sektora - if (GLEW_VERSION_1_5) // modyfikacje VBO są dostępne od OpenGL 1.5 - glBindBuffer(GL_ARRAY_BUFFER, m_nVBOVertices); - else // dla OpenGL 1.4 z GL_ARB_vertex_buffer_object odświeżenie całego sektora - Release(); // opróżnienie VBO sektora, aby się odświeżył z nowymi ustawieniami + if( !tTrackAnim ) { + // nie ma nic do animowania + return; } - tTrackAnim = tTrackAnim->RaAnimate(); // przeliczenie animacji kolejnego + // crude way to mark whether a vbo is bound, for the vbo render path + // TODO: sort this shit out and re-arrange into something more elegant... eventually + GLuint vertexbuffer{ static_cast(-1) }; + if (Global::bUseVBO) { + // odświeżenie VBO sektora + if( GLEW_VERSION_1_5 ) { + // modyfikacje VBO są dostępne od OpenGL 1.5 + vertexbuffer = m_nVBOVertices; + ::glBindBuffer( GL_ARRAY_BUFFER, vertexbuffer ); + } + else { + // dla OpenGL 1.4 z GL_ARB_vertex_buffer_object odświeżenie całego sektora + Release(); // opróżnienie VBO sektora, aby się odświeżył z nowymi ustawieniami + } + } + tTrackAnim = tTrackAnim->RaAnimate( vertexbuffer ); // przeliczenie animacji kolejnego }; TTraction * TSubRect::FindTraction(vector3 *Point, int &iConnection, TTraction *Exclude) diff --git a/Track.cpp b/Track.cpp index 2335248c..9769f613 100644 --- a/Track.cpp +++ b/Track.cpp @@ -454,16 +454,9 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) WriteLog(str); parser->getTokens(4); *parser >> fTrackLength >> fTrackWidth >> fFriction >> fSoundDistance; - // fTrackLength=Parser->GetNextSymbol().ToDouble(); //track length - // 100502 - // fTrackWidth=Parser->GetNextSymbol().ToDouble(); //track width - // fFriction=Parser->GetNextSymbol().ToDouble(); //friction coeff. - // fSoundDistance=Parser->GetNextSymbol().ToDouble(); //snd fTrackWidth2 = fTrackWidth; // rozstaw/szerokość w punkcie 2, na razie taka sama parser->getTokens(2); *parser >> iQualityFlag >> iDamageFlag; - // iQualityFlag=Parser->GetNextSymbol().ToInt(); //McZapkie: qualityflag - // iDamageFlag=Parser->GetNextSymbol().ToInt(); //damage if (iDamageFlag & 128) iAction |= 0x80; // flaga wykolejania z powodu uszkodzenia parser->getTokens(); @@ -511,9 +504,6 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) Global::iRailProFiltering)); parser->getTokens(3); *parser >> fTexHeight1 >> fTexWidth >> fTexSlope; - // fTexHeight=Parser->GetNextSymbol().ToDouble(); //tex sub height - // fTexWidth=Parser->GetNextSymbol().ToDouble(); //tex sub width - // fTexSlope=Parser->GetNextSymbol().ToDouble(); //tex sub slope width if (iCategoryFlag & 4) fTexHeight1 = -fTexHeight1; // rzeki mają wysokość odwrotnie niż drogi } @@ -767,8 +757,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) // nFouling[1]= } else if (str == "overhead") - { // informacja o stanie sieci: 0-jazda bezprądowa, >0-z opuszczonym i ograniczeniem - // prędkości + { // informacja o stanie sieci: 0-jazda bezprądowa, >0-z opuszczonym i ograniczeniem prędkości parser->getTokens(); *parser >> fOverhead; if (fOverhead > 0.0) @@ -776,8 +765,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) // ograniczenie dla pantografujących) } else if (str == "colides") - { // informacja o stanie sieci: 0-jazda bezprądowa, >0-z opuszczonym i ograniczeniem - // prędkości + { // informacja o stanie sieci: 0-jazda bezprądowa, >0-z opuszczonym i ograniczeniem prędkości parser->getTokens(); *parser >> token; // trColides=; //tor kolizyjny, na którym trzeba sprawdzać pojazdy pod kątem zderzenia @@ -821,8 +809,7 @@ bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent } else { - ErrorLog( - "Bad track: Event0 cannot be assigned to track, track already has one"); + ErrorLog( "Bad track: Event0 cannot be assigned to track, track already has one"); bError = true; } if (!evEvent1) @@ -835,15 +822,13 @@ bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent } else if (!asEvent1Name.empty()) { // Ra: tylko w logu informacja - ErrorLog("Bad track: Event1 \"" + asEvent1Name + - "\" does not exist"); + ErrorLog("Bad track: Event1 \"" + asEvent1Name + "\" does not exist"); bError = true; } } else { - ErrorLog( - "Bad track: Event1 cannot be assigned to track, track already has one"); + ErrorLog("Bad track: Event1 cannot be assigned to track, track already has one"); bError = true; } if (!evEvent2) @@ -856,15 +841,13 @@ bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent } else if (!asEvent2Name.empty()) { // Ra: tylko w logu informacja - ErrorLog("Bad track: Event2 \"" + asEvent2Name + - "\" does not exist"); + ErrorLog("Bad track: Event2 \"" + asEvent2Name + "\" does not exist"); bError = true; } } else { - ErrorLog( - "Bad track: Event2 cannot be assigned to track, track already has one"); + ErrorLog("Bad track: Event2 cannot be assigned to track, track already has one"); bError = true; } return !bError; @@ -908,8 +891,7 @@ bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEv { if (!asEvent0Name.empty()) { // Ra: tylko w logu informacja - WriteLog("Eventall1 \"" + asEventall1Name + - "\" does not exist"); + WriteLog("Eventall1 \"" + asEventall1Name + "\" does not exist"); bError = true; } } @@ -1026,23 +1008,7 @@ void TTrack::MoveMe(vector3 pPosition) const int numPts = 4; const int nnumPts = 12; -/* -const vector6 szyna[nnumPts]= //szyna - vextor6(x,y,mapowanie tekstury,xn,yn,zn) -{pierwotna szyna, opracował youBy, zmiany w celu uzyskania symetrii - vector6( 0.111,-0.180,0.00, 1.000, 0.000,0.000), - vector6( 0.045,-0.155,0.15, 0.707, 0.707,0.000), - vector6( 0.045,-0.070,0.25, 0.707,-0.707,0.000), - vector6( 0.071,-0.040,0.35, 0.707,-0.707,0.000), //albo tu 0.073 - vector6( 0.072,-0.010,0.40, 0.707, 0.707,0.000), - vector6( 0.052,-0.000,0.45, 0.000, 1.000,0.000), - vector6( 0.020,-0.000,0.55, 0.000, 1.000,0.000), - vector6( 0.000,-0.010,0.60,-0.707, 0.707,0.000), - vector6( 0.001,-0.040,0.65,-0.707,-0.707,0.000), //albo tu -0.001 - vector6( 0.027,-0.070,0.75,-0.707,-0.707,0.000), //albo zostanie asymetryczna - vector6( 0.027,-0.155,0.85,-0.707, 0.707,0.000), - vector6(-0.039,-0.180,1.00,-1.000, 0.000,0.000) -}; -*/ + const vector6 szyna[nnumPts] = // szyna - vextor6(x,y,mapowanie tekstury,xn,yn,zn) { // tę wersję opracował Tolein (bez pochylenia) vector6(0.111, -0.180, 0.00, 1.000, 0.000, 0.000), @@ -1188,8 +1154,7 @@ void TTrack::Compile(GLuint tex) // profil if (iTrapezoid) // trapez albo przechyłki { // podsypka z podkladami trapezowata - // ewentualnie poprawić mapowanie, żeby środek mapował się na - // 1.435/4.671 ((0.3464,0.6536) + // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 ((0.3464,0.6536) // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.00, normal1.x, -normal1.y, 0.0); // lewy brzeg bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.33, 0.0, 1.0, 0.0); // krawędź załamania @@ -1575,8 +1540,7 @@ void TTrack::Compile(GLuint tex) tex ? TextureID2 == tex : true ) : - false ); // renderować nie trzeba, ale trzeba wyznaczyć - // punkty brzegowe nawierzchni + false ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni // if (iTrapezoid) //trapez albo przechyłki if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka @@ -1703,33 +1667,7 @@ void TTrack::Render() EnvironmentReset(); // ustawienie oświetlenia na zwykłe if (InMovement()) Release(); // zwrotnica w trakcie animacji do odrysowania - }; -//#ifdef _DEBUG -#if 0 - if (DebugModeFlag && ScannedFlag) //McZapkie-230702 - //if (iNumDynamics) //będzie kreska na zajętym torze - { - vector3 pos1,pos2,pos3; - glDisable(GL_DEPTH_TEST); - glDisable(GL_LIGHTING); - glColor3ub(255,0,0); - glBindTexture(GL_TEXTURE_2D,0); - glBegin(GL_LINE_STRIP); - pos1=Segment->FastGetPoint_0(); - pos2=Segment->FastGetPoint(0.5); - pos3=Segment->FastGetPoint_1(); - glVertex3f(pos1.x,pos1.y,pos1.z); - glVertex3f(pos2.x,pos2.y+10,pos2.z); - glVertex3f(pos3.x,pos3.y,pos3.z); - glEnd(); - glEnable(GL_LIGHTING); - glEnable(GL_DEPTH_TEST); - ScannedFlag=false; - } -#endif - // glLightfv(GL_LIGHT0,GL_AMBIENT,Global::ambientDayLight); - // glLightfv(GL_LIGHT0,GL_DIFFUSE,Global::diffuseDayLight); - // glLightfv(GL_LIGHT0,GL_SPECULAR,Global::specularDayLight); + } }; bool TTrack::CheckDynamicObject(TDynamicObject *Dynamic) @@ -1856,16 +1794,10 @@ int TTrack::RaArrayPrepare() } if (fTexHeight1 >= 0) { // normalne pobocze, na razie się składa z - // NOTE: for the road part 1x the point amount would be enough, but we provide extra padding - // on account of unexamined issues with geometry data bleeding between vbo chunks - // TODO: sort this out if/when the vbo system is revised return SwitchExtension->iPoints * ((TextureID1 ? 1 : 0) + (TextureID2 ? 12 : 0)); } else { // jeśli fTexHeight1<0, to są chodniki i może któregoś nie być - // NOTE: for the road part 1x the point amount would be enough, but we provide extra padding - // on account of unexamined issues with geometry data bleeding between vbo chunks - // TODO: sort this out if/when the vbo system is revised return SwitchExtension->iPoints * ((TextureID1 ? 1 : 0) + (TextureID2 ? 6 : 0 )); } } @@ -2048,23 +1980,23 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) } if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - SwitchExtension->Segments[0]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2); - SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2); SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength); + SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2 ); + SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy + SwitchExtension->Segments[0]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); - SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength); SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - SwitchExtension->Segments[1]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1); - SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2); + SwitchExtension->Segments[1]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); + SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength ); } else { // lewa działa lepiej niż prawa SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength); // lewa szyna normalna cała + SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy SwitchExtension->Segments[0]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2); // prawa iglica - SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2); // prawa szyna za iglicą - + SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy SwitchExtension->Segments[1]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1); // lewa iglica SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2); // lewa szyna za iglicą @@ -2467,26 +2399,36 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO // dla kolejnych tekstur! EnvironmentSet(); int seg; - int i; switch( iCategoryFlag & 15 ) { case 1: { // tor if( eType == tt_Switch ) // dla zwrotnicy tylko szyny { + int const bladesegmentcount = 2; if( TextureID1 ) if( ( seg = SwitchExtension->Segments[ 0 ]->RaSegCount() ) > 0 ) { GfxRenderer.Bind( TextureID1 ); // szyny + - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); - iPtr += 24 * seg; // pominięcie lewej szyny - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); - iPtr += 24 * seg; // pominięcie prawej szyny + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); + iPtr += 24 * seg; + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * (seg - bladesegmentcount) ); + // NOTE: due to way blades bend need to render each segment separately, or some unwanted edges may show + iPtr += 24 * ( seg - bladesegmentcount ); + for( int i = 0; i < bladesegmentcount; ++i ) { + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 ); + iPtr += 24; + } } if( TextureID2 ) if( ( seg = SwitchExtension->Segments[ 1 ]->RaSegCount() ) > 0 ) { - GfxRenderer.Bind( TextureID2 ); // szyny - - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); - iPtr += 24 * seg; // pominięcie lewej szyny - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); + GfxRenderer.Bind( TextureID2 ); + // NOTE: due to way blades bend need to render each segment separately, or some unwanted edges may show + for( int i = 0; i < bladesegmentcount; ++i ) { + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 ); + iPtr += 24; + } + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * ( seg - bladesegmentcount ) ); + iPtr += 24 * ( seg - bladesegmentcount ); + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); iPtr += 24 * seg; } } @@ -2606,40 +2548,6 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO void TTrack::EnvironmentSet() { // ustawienie zmienionego światła glColor3f(1.0f, 1.0f, 1.0f); // Ra: potrzebne to? -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this - if (eEnvironment) - { // McZapkie-310702: zmiana oswietlenia w tunelu, wykopie - GLfloat ambientLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat diffuseLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat specularLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - switch (eEnvironment) - { // modyfikacje oświetlenia zależnie od środowiska - case e_canyon: - for (int li = 0; li < 3; li++) - { - // ambientLight[li]= Global::ambientDayLight[li]*0.8; //0.7 - diffuseLight[li] = Global::diffuseDayLight[li] * 0.4; // 0.3 - specularLight[li] = Global::specularDayLight[li] * 0.5; // 0.4 - } - // glLightfv(GL_LIGHT0,GL_AMBIENT,ambientLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, specularLight); - break; - case e_tunnel: - for (int li = 0; li < 3; li++) - { - ambientLight[li] = Global::ambientDayLight[li] * 0.2; - diffuseLight[li] = Global::diffuseDayLight[li] * 0.1; - specularLight[li] = Global::specularDayLight[li] * 0.2; - } - glLightfv(GL_LIGHT0, GL_AMBIENT, ambientLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, specularLight); - break; - } - } -#else switch( eEnvironment ) { case e_canyon: { Global::DayLight.apply_intensity( 0.4f ); @@ -2653,22 +2561,10 @@ void TTrack::EnvironmentSet() break; } } -#endif }; void TTrack::EnvironmentReset() { // przywrócenie domyślnego światła -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this - switch (eEnvironment) - { // przywrócenie globalnych ustawień światła, o ile było zmienione - case e_canyon: // wykop - case e_tunnel: // tunel - glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); - } -#else switch( eEnvironment ) { case e_canyon: case e_tunnel: { @@ -2679,7 +2575,6 @@ void TTrack::EnvironmentReset() break; } } -#endif }; void TTrack::RenderDyn() @@ -2911,7 +2806,7 @@ void TTrack::RaAnimListAdd(TTrack *t) } }; -TTrack * TTrack::RaAnimate() +TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) { // wykonanie rekurencyjne animacji, wywoływane przed wyświetleniem sektora // zwraca wskaźnik toru wymagającego dalszej animacji if (SwitchExtension->pNextAnim) @@ -2944,7 +2839,8 @@ TTrack * TTrack::RaAnimate() m = false; // koniec animacji } } - if (Global::bUseVBO) + if( ( Global::bUseVBO ) + && ( Vertexbuffer != -1 ) ) { // dla OpenGL 1.4 odświeży się cały sektor, w późniejszych poprawiamy fragment if (GLEW_VERSION_1_5) // dla OpenGL 1.4 to się nie wykona poprawnie if (TextureID1) // Ra: !!!! tu jest do poprawienia @@ -2953,71 +2849,47 @@ TTrack * TTrack::RaAnimate() double fHTW = 0.5 * fabs(fTrackWidth); double fHTW2 = fHTW; // Ra: na razie niech tak będzie double cos1 = 1.0, sin1 = 0.0, cos2 = 1.0, sin2 = 0.0; // Ra: ... - for (int i = 0; i < 12; ++i) - { - rpts3[i] = - vector6( - (fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, - -(fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, - iglica[i].z); - rpts3[i + 12] = - vector6( - (fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, - szyna[i].z); - rpts4[11 - i] = - vector6( - (-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, - -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, - iglica[i].z); - rpts4[23 - i] = - vector6( - (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, - szyna[i].z); + for( int i = 0; i < 12; ++i ) { + + rpts3[ i ] = + vector6( +( fHTW + iglica[ i ].x ) * cos1 + iglica[ i ].y * sin1, + -( +fHTW + iglica[ i ].x ) * sin1 + iglica[ i ].y * cos1, iglica[ i ].z ); + rpts3[ i + 12 ] = + vector6( +( fHTW2 + szyna[ i ].x ) * cos2 + szyna[ i ].y * sin2, + -( +fHTW2 + szyna[ i ].x ) * sin2 + iglica[ i ].y * cos2, szyna[ i ].z ); + rpts4[ 11 - i ] = + vector6( ( -fHTW - iglica[ i ].x ) * cos1 + iglica[ i ].y * sin1, + -( -fHTW - iglica[ i ].x ) * sin1 + iglica[ i ].y * cos1, iglica[ i ].z ); + rpts4[ 23 - i ] = + vector6( ( -fHTW2 - szyna[ i ].x ) * cos2 + szyna[ i ].y * sin2, + -( -fHTW2 - szyna[ i ].x ) * sin2 + iglica[ i ].y * cos2, szyna[ i ].z ); } - CVertNormTex Vert[2 * 2 * 12]; // na razie 2 segmenty - CVertNormTex *v = Vert; // bo RaAnimate() modyfikuje wskaźnik - glGetBufferSubData( - GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), &Vert); // pobranie fragmentu bufora VBO - if (SwitchExtension->RightSwitch) - { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - SwitchExtension->Segments[ 0 ]->RenderLoft( v, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2, true ); - ::glBufferSubData( - GL_ARRAY_BUFFER, - SwitchExtension->iLeftVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), - &Vert); // wysłanie fragmentu bufora VBO - v = Vert; - ::glGetBufferSubData( - GL_ARRAY_BUFFER, - SwitchExtension->iRightVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), - &Vert); // pobranie fragmentu bufora VBO - SwitchExtension->Segments[ 1 ]->RenderLoft( v, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1, true ); + // NOTE: performance-wise it'd make much more sense to keep the most recent shape cached as part of switch extension, + // and only send updates when/if they take place, instead of the current back-and-forth + // TODO: implement optimized version + + // fetch current blade geometry + std::vector bladesbuffer; bladesbuffer.resize( 2 * 2 * 24 ); // 2 blades, 2 segments each + ::glGetBufferSubData( + GL_ARRAY_BUFFER, + SwitchExtension->iLeftVBO * sizeof( CVertNormTex ), + bladesbuffer.size() * sizeof( CVertNormTex ), + bladesbuffer.data() ); + auto bladevertices = bladesbuffer.data(); + if( SwitchExtension->RightSwitch ) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa + SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2, true ); + SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1, true ); } - else - { // oryginalnie lewa działała lepiej niż prawa - SwitchExtension->Segments[ 0 ]->RenderLoft( v, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2, true ); // prawa iglica - ::glBufferSubData( - GL_ARRAY_BUFFER, - SwitchExtension->iLeftVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), - &Vert); // wysłanie fragmentu bufora VBO - v = Vert; - ::glGetBufferSubData( - GL_ARRAY_BUFFER, - SwitchExtension->iRightVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), - &Vert); // pobranie fragmentu bufora VBO - SwitchExtension->Segments[ 1 ]->RenderLoft( v, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1, true ); // lewa iglica + else { + SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2, true ); // prawa iglica + SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1, true ); // lewa iglica } + // push back updated geometry ::glBufferSubData( GL_ARRAY_BUFFER, - SwitchExtension->iRightVBO * sizeof(CVertNormTex), - 2 * 2 * 12 * sizeof(CVertNormTex), - &Vert); // wysłanie fragmentu bufora VBO + SwitchExtension->iLeftVBO * sizeof( CVertNormTex ), + bladesbuffer.size() * sizeof( CVertNormTex ), + bladesbuffer.data() ); } } else // gdy Display List diff --git a/Track.h b/Track.h index 07e971b5..6809afc6 100644 --- a/Track.h +++ b/Track.h @@ -256,7 +256,7 @@ class TTrack : public Resource void RaAssign(TGroundNode *gn, TAnimContainer *ac); void RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined); void RaAnimListAdd(TTrack *t); - TTrack * RaAnimate(); + TTrack * RaAnimate(GLuint const Vertexbuffer = -1); void RadioStop(); void AxleCounter(int i, TDynamicObject *o) diff --git a/renderer.cpp b/renderer.cpp index 23150308..bf92c7b9 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1290,8 +1290,8 @@ opengl_renderer::Init_caps() { + " Vendor: " + std::string( (char *)glGetString( GL_VENDOR ) ) + " OpenGL Version: " + oglversion ); - if( !GLEW_VERSION_1_4 ) { - ErrorLog( "Requires openGL >= 1.4" ); + if( !GLEW_VERSION_1_5 ) { + ErrorLog( "Requires openGL >= 1.5" ); return false; } From 52a76f0ba199471a283acfd6e885578d7da2fcee Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 15 May 2017 17:23:25 +0200 Subject: [PATCH 104/426] build 170515. added converter start parameters, partial unification for traction render paths, minor fixes for multi-unit cab instruments --- DynObj.cpp | 14 +- Ground.cpp | 54 ++-- Ground.h | 3 - McZapkie/MOVER.h | 33 ++- McZapkie/Mover.cpp | 90 ++++--- Traction.cpp | 602 +++++++++++++++++++++++++-------------------- Traction.h | 5 +- Train.cpp | 18 +- 8 files changed, 451 insertions(+), 368 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 28336bae..05d458ca 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2458,14 +2458,14 @@ bool TDynamicObject::Update(double dt, double dt1) // opuszczenie pantografów przy niskim ciśnieniu /* // NOTE: disabled, the pantographs drop by themseleves when the pantograph tank pressure gets low enough - MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); - MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); + MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ); + MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ); */ if( MoverParameters->TrainType != dt_EZT ) { // pressure switch safety measure -- open the line breaker, unless there's alternate source of traction voltage if( MoverParameters->GetTrainsetVoltage() < 0.5 * MoverParameters->EnginePowerSource.MaxVoltage ) { // TODO: check whether line breaker should be open EMU-wide - MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); + MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ); } } else { @@ -2473,7 +2473,7 @@ bool TDynamicObject::Update(double dt, double dt1) // and prevents their activation until pressure switch is set again MoverParameters->PantPressLockActive = true; // TODO: separate 'heating allowed' from actual heating flag, so we can disable it here without messing up heating toggle - MoverParameters->ConverterSwitch( false, command_range::unit ); + MoverParameters->ConverterSwitch( false, range::unit ); } // mark the pressure switch as spent MoverParameters->PantPressSwitchActive = false; @@ -2936,7 +2936,7 @@ bool TDynamicObject::Update(double dt, double dt1) && ( MoverParameters->EngineType != DieselEngine ) && ( MoverParameters->EngineType != WheelsDriven ) ) { // jeśli bateria wyłączona, a nie diesel ani drezyna reczna - if( MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ) ) { + if( MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ) ) { // wyłączyć zasilanie // NOTE: we turn off entire EMU, but only the affected unit for other multi-unit consists MoverParameters->EventFlag = true; @@ -2945,8 +2945,8 @@ bool TDynamicObject::Update(double dt, double dt1) // TODO: have this dependant on .fiz-driven flag // NOTE: moved to pantspeed calculation part a little later in the function. all remarks and todo still apply /* - MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); - MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); + MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ); + MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ); */ } } diff --git a/Ground.cpp b/Ground.cpp index a8b74537..7c6ab766 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -285,8 +285,7 @@ void TGroundNode::MoveMe(vector3 pPosition) void TGroundNode::RaRenderVBO() { // renderowanie z domyslnego bufora VBO glColor3ub(Diffuse[0], Diffuse[1], Diffuse[2]); - if (TextureID) - GfxRenderer.Bind(TextureID); // Ustaw aktywną teksturę + GfxRenderer.Bind( TextureID ); // Ustaw aktywną teksturę glDrawArrays(iType, iVboPtr, iNumVerts); // Narysuj naraz wszystkie trójkąty } @@ -2248,31 +2247,19 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) case GL_LINES: case GL_LINE_STRIP: case GL_LINE_LOOP: { - parser->getTokens( 3 ); - *parser >> tmp->Diffuse[ 0 ] >> tmp->Diffuse[ 1 ] >> tmp->Diffuse[ 2 ]; - // tmp->Diffuse[0]=Parser->GetNextSymbol().ToDouble()/255; - // tmp->Diffuse[1]=Parser->GetNextSymbol().ToDouble()/255; - // tmp->Diffuse[2]=Parser->GetNextSymbol().ToDouble()/255; - parser->getTokens(); - *parser >> tmp->fLineThickness; + parser->getTokens( 4 ); + *parser + >> tmp->Diffuse[ 0 ] + >> tmp->Diffuse[ 1 ] + >> tmp->Diffuse[ 2 ] + >> tmp->fLineThickness; TempVerts.clear(); TGroundVertex vertex; i = 0; parser->getTokens(); *parser >> token; do { - str = token; -/* - TempVerts[ i ].Point.x = atof( str.c_str() ); - parser->getTokens( 2 ); - *parser >> TempVerts[ i ].Point.y >> TempVerts[ i ].Point.z; - TempVerts[ i ].Point.RotateZ( aRotate.z / 180 * M_PI ); - TempVerts[ i ].Point.RotateX( aRotate.x / 180 * M_PI ); - TempVerts[ i ].Point.RotateY( aRotate.y / 180 * M_PI ); - TempVerts[ i ].Point += pOrigin; - tmp->pCenter += TempVerts[ i ].Point; -*/ - vertex.Point.x = std::atof( str.c_str() ); + vertex.Point.x = std::atof( token.c_str() ); parser->getTokens( 2 ); *parser >> vertex.Point.y @@ -2328,27 +2315,19 @@ TSubRect * TGround::GetSubRect(int iCol, int iRow) TEvent * TGround::FindEvent(const std::string &asEventName) { auto const lookup = m_eventmap.find( asEventName ); - return + return ( lookup != m_eventmap.end() ? - lookup->second : - nullptr; - /* //powolna wyszukiwarka - for (TEvent *Current=RootEvent;Current;Current=Current->Next2) - { - if (Current->asName==asEventName) - return Current; - } - return NULL; - */ + lookup->second : + nullptr ); } TEvent * TGround::FindEventScan( std::string const &asEventName ) { // wyszukanie eventu z opcją utworzenia niejawnego dla komórek skanowanych auto const lookup = m_eventmap.find( asEventName ); - auto e = + auto e = ( lookup != m_eventmap.end() ? - lookup->second : - nullptr; + lookup->second : + nullptr ); if (e) return e; // jak istnieje, to w porządku if (asEventName.rfind(":scan") != std::string::npos) // jeszcze może być event niejawny @@ -4290,11 +4269,6 @@ bool TGround::CheckQuery() return true; } -void TGround::OpenGLUpdate(HDC hDC) -{ - SwapBuffers(hDC); // swap buffers (double buffering) -}; - void TGround::UpdatePhys(double dt, int iter) { // aktualizacja fizyki stałym krokiem: dt=krok czasu [s], dt*iter=czas od ostatnich przeliczeń for (TGroundNode *Current = nRootOfType[TP_TRACTIONPOWERSOURCE]; Current; diff --git a/Ground.h b/Ground.h index 1a87a442..2fe2b4d6 100644 --- a/Ground.h +++ b/Ground.h @@ -293,8 +293,6 @@ class TGround TGroundNode *nRootOfType[TP_LAST]; // tablica grupująca obiekty, przyspiesza szukanie // TGroundNode *nLastOfType[TP_LAST]; //ostatnia TSubRect srGlobal; // zawiera obiekty globalne (na razie wyzwalacze czasowe) - int hh = 0, - mm = 0; // ustawienia czasu // int tracks,tracksfar; //liczniki torów typedef std::unordered_map event_map; event_map m_eventmap; @@ -374,7 +372,6 @@ class TGround void TrackJoin(TGroundNode *Current); private: - void OpenGLUpdate(HDC hDC); void RaTriangleDivider(TGroundNode *node); void Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam); bool PROBLEND; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index a7cea124..95c0adad 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -139,6 +139,7 @@ static int const ctrain_passenger = 16; //mostek przejściowy static int const ctrain_scndpneumatic = 32; //przewody 8 atm (żółte; zasilanie powietrzem) static int const ctrain_heating = 64; //przewody ogrzewania WN static int const ctrain_depot = 128; //nie rozłączalny podczas zwykłych manewrów (międzyczłonowy), we wpisie wartość ujemna +// possible coupling types; can be combined enum coupling { faux = 0x0, coupler = 0x1, @@ -150,11 +151,16 @@ enum coupling { heating = 0x40, permanent = 0x80 }; -/*! przesylanie komend sterujacych*/ -enum command_range { +// possible effect ranges for control commands; exclusive +enum range { local, unit, consist +}; +// start method for devices; exclusive +enum start { + manual, + automatic }; /*typ hamulca elektrodynamicznego*/ static int const dbrake_none = 0; @@ -842,9 +848,14 @@ public: bool PantCompFlag = false; /*!o czy wlaczona sprezarka pantografow*/ bool CompressorAllow = false; /*! zezwolenie na uruchomienie sprezarki NBMX*/ bool CompressorGovernorLock{ false }; // indicates whether compressor pressure switch was activated due to reaching cut-out pressure - bool ConverterFlag = false ; /*! czy wlaczona przetwornica NBMX*/ + // TODO converter parameters, for when we start cleaning up mover parameters + start ConverterStart{ manual }; // whether converter is started manually, or by other means + float ConverterStartDelay{ 0.0f }; // delay (in seconds) before the converter is started, once its activation conditions are met + double ConverterStartDelayTimer{ 0.0 }; // helper, for tracking whether converter start delay passed bool ConverterAllow = false; /*zezwolenie na prace przetwornicy NBMX*/ - int BrakeCtrlPos = -2; /*nastawa hamulca zespolonego*/ + bool ConverterFlag = false; /*! czy wlaczona przetwornica NBMX*/ + + int BrakeCtrlPos = -2; /*nastawa hamulca zespolonego*/ double BrakeCtrlPosR = 0.0; /*nastawa hamulca zespolonego - plynna dla FV4a*/ double BrakeCtrlPos2 = 0.0; /*nastawa hamulca zespolonego - kapturek dla FV4a*/ int LocalBrakePos = 0; /*nastawa hamulca indywidualnego*/ @@ -1045,7 +1056,7 @@ public: bool AddPulseForce(int Multipler);/*dla drezyny*/ - bool Sandbox( bool const State, int const Notify = command_range::consist );/*wlacza/wylacza sypanie piasku*/ + bool Sandbox( bool const State, int const Notify = range::consist );/*wlacza/wylacza sypanie piasku*/ /*! zbijanie czuwaka/SHP*/ void SSReset(void); @@ -1101,12 +1112,12 @@ public: /*--funkcje dla lokomotyw*/ bool DirectionBackward(void);/*! kierunek ruchu*/ - bool MainSwitch( bool const State, int const Notify = command_range::consist );/*! wylacznik glowny*/ - bool ConverterSwitch( bool State, int const Notify = command_range::consist );/*! wl/wyl przetwornicy*/ - bool CompressorSwitch( bool State, int const Notify = command_range::consist );/*! wl/wyl sprezarki*/ + bool MainSwitch( bool const State, int const Notify = range::consist );/*! wylacznik glowny*/ + bool ConverterSwitch( bool State, int const Notify = range::consist );/*! wl/wyl przetwornicy*/ + bool CompressorSwitch( bool State, int const Notify = range::consist );/*! wl/wyl sprezarki*/ /*-funkcje typowe dla lokomotywy elektrycznej*/ - void ConverterCheck(); // przetwornica + void ConverterCheck( double const Timestep ); // przetwornica bool FuseOn(void); //bezpiecznik nadamiary bool FuseFlagCheck(void); // sprawdzanie flagi nadmiarowego void FuseOff(void); // wylaczenie nadmiarowego @@ -1129,8 +1140,8 @@ public: bool AutoRelayCheck(void);//symulacja automatycznego rozruchu bool ResistorsFlagCheck(void); //sprawdzenie kontrolki oporow rozruchowych NBMX - bool PantFront( bool const State, int const Notify = command_range::consist ); //obsluga pantografou przedniego - bool PantRear( bool const State, int const Notify = command_range::consist ); //obsluga pantografu tylnego + bool PantFront( bool const State, int const Notify = range::consist ); //obsluga pantografou przedniego + bool PantRear( bool const State, int const Notify = range::consist ); //obsluga pantografu tylnego /*-funkcje typowe dla lokomotywy spalinowej z przekladnia mechaniczna*/ bool dizel_EngageSwitch(double state); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index ff60e7cf..c171722b 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -773,7 +773,7 @@ void TMoverParameters::UpdatePantVolume(double dt) // wywalenie szybkiego z powodu niskiego ciśnienia if( GetTrainsetVoltage() < 0.5 * EnginePowerSource.MaxVoltage ) { // to jest trochę proteza; zasilanie członu może być przez sprzęg WN - if( MainSwitch( false, ( TrainType == dt_EZT ? command_range::unit : command_range::local ) ) ) { + if( MainSwitch( false, ( TrainType == dt_EZT ? range::unit : range::local ) ) ) { EventFlag = true; } } @@ -1366,7 +1366,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap Compressor = 0; CompressorFlag = false; }; - ConverterCheck(); + ConverterCheck(dt); if (CompressorSpeed > 0.0) // sprężarka musi mieć jakąś niezerową wydajność CompressorCheck(dt); //żeby rozważać jej załączenie i pracę UpdateBrakePressure(dt); @@ -1522,7 +1522,7 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape Compressor = 0; CompressorFlag = false; }; - ConverterCheck(); + ConverterCheck(dt); if (CompressorSpeed > 0.0) // sprężarka musi mieć jakąś niezerową wydajność CompressorCheck(dt); //żeby rozważać jej załączenie i pracę UpdateBrakePressure(dt); @@ -1561,15 +1561,23 @@ double TMoverParameters::ShowEngineRotation(int VehN) return 0.0; }; -void TMoverParameters::ConverterCheck() -{ // sprawdzanie przetwornicy +// sprawdzanie przetwornicy +void TMoverParameters::ConverterCheck( double const Timestep ) { + // TODO: move other converter checks here, to have it all in one place for potential device object if( ( ConverterAllow ) && ( false == PantPressLockActive ) && ( Mains ) ) { - ConverterFlag = true; + // delay timer can be optionally configured, and is set anew whenever converter goes off + if( ConverterStartDelayTimer <= 0.0 ) { + ConverterFlag = true; + } + else { + ConverterStartDelayTimer -= Timestep; + } } else { ConverterFlag = false; + ConverterStartDelayTimer = static_cast( ConverterStartDelay ); } }; @@ -2087,10 +2095,10 @@ bool TMoverParameters::Sandbox( bool const State, int const Notify ) } } - if( Notify != command_range::local ) { + if( Notify != range::local ) { // if requested pass the command on auto const couplingtype = - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ); @@ -2348,11 +2356,11 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) { if( Mains ) { // jeśli był załączony - if( Notify != command_range::local ) { + if( Notify != range::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "MainSwitch", int( State ), CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -2360,11 +2368,11 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) Mains = State; if( Mains ) { // jeśli został załączony - if( Notify != command_range::local ) { + if( Notify != range::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "MainSwitch", int( State ), CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -2399,19 +2407,19 @@ bool TMoverParameters::ConverterSwitch( bool State, int const Notify ) CompressorAllow = ConverterAllow; } if( ConverterAllow == true ) { - if( Notify != command_range::local ) { + if( Notify != range::local ) { SendCtrlToNext( "ConverterSwitch", 1, CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } } else { - if( Notify != command_range::local ) { + if( Notify != range::local ) { SendCtrlToNext( "ConverterSwitch", 0, CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -2436,19 +2444,19 @@ bool TMoverParameters::CompressorSwitch( bool State, int const Notify ) CS = true; } if( CompressorAllow == true ) { - if( Notify != command_range::local ) { + if( Notify != range::local ) { SendCtrlToNext( "CompressorSwitch", 1, CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } } else { - if( Notify != command_range::local ) { + if( Notify != range::local ) { SendCtrlToNext( "CompressorSwitch", 0, CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -4165,7 +4173,7 @@ double TMoverParameters::TractionForce(double dt) if ( (std::max(GetTrainsetVoltage(), std::abs(Voltage)) < EnginePowerSource.CollectorParameters.MinV) || (std::max(GetTrainsetVoltage(), std::abs(Voltage)) * EnginePowerSource.CollectorParameters.OVP > EnginePowerSource.CollectorParameters.MaxV)) - if( MainSwitch( false, ( TrainType == dt_EZT ? command_range::unit : command_range::local ) ) ) // TODO: check whether we need to send this EMU-wide + if( MainSwitch( false, ( TrainType == dt_EZT ? range::unit : range::local ) ) ) // TODO: check whether we need to send this EMU-wide EventFlag = true; // wywalanie szybkiego z powodu niewłaściwego napięcia if (((DynamicBrakeType == dbrake_automatic) || (DynamicBrakeType == dbrake_switch)) && @@ -4464,7 +4472,7 @@ double TMoverParameters::TractionForce(double dt) // nie wchodzić w funkcję bez potrzeby if( ( std::max( std::abs( Voltage ), GetTrainsetVoltage() ) < EnginePowerSource.CollectorParameters.MinV ) || ( std::max( std::abs( Voltage ), GetTrainsetVoltage() ) > EnginePowerSource.CollectorParameters.MaxV + 200 ) ) { - MainSwitch( false, ( TrainType == dt_EZT ? command_range::unit : command_range::local ) ); // TODO: check whether we need to send this EMU-wide + MainSwitch( false, ( TrainType == dt_EZT ? range::unit : range::local ) ); // TODO: check whether we need to send this EMU-wide } } tmpV = abs(nrot) * (PI * WheelDiameter) * 3.6; //*DirAbsolute*eimc[eimc_s_p]; - do przemyslenia dzialanie pp @@ -4538,21 +4546,21 @@ double TMoverParameters::TractionForce(double dt) { PosRatio = 0; tmp = 4; - Sandbox( true, command_range::local ); + Sandbox( true, range::local ); } // przeciwposlizg if ((abs((PosRatio + 9.80 * dizel_fill) * dmoment * 100) > 0.95 * Adhesive(RunningTrack.friction) * TotalMassxg)) { PosRatio = 0; tmp = 9; - Sandbox( true, command_range::local ); + Sandbox( true, range::local ); } // przeciwposlizg if ((SlippingWheels)) { // PosRatio = -PosRatio * 0; // serio -0 ??? PosRatio = 0; tmp = 9; - Sandbox( true, command_range::local ); + Sandbox( true, range::local ); } // przeciwposlizg dizel_fill += Max0R(Min0R(PosRatio - dizel_fill, 0.1), -0.1) * 2 * @@ -5190,22 +5198,22 @@ bool TMoverParameters::PantFront( bool const State, int const Notify ) PantFrontUp = State; if( State == true ) { PantFrontStart = 0; - if( Notify != command_range::local ) { + if( Notify != range::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "PantFront", 1, CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } } else { PantFrontStart = 1; - if( Notify != command_range::local ) { + if( Notify != range::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "PantFront", 0, CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -5243,22 +5251,22 @@ bool TMoverParameters::PantRear( bool const State, int const Notify ) PantRearUp = State; if( State == true ) { PantRearStart = 0; - if( Notify != command_range::local ) { + if( Notify != range::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "PantRear", 1, CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } } else { PantRearStart = 1; - if( Notify != command_range::local ) { + if( Notify != range::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "PantRear", 0, CabNo, - ( Notify == command_range::unit ? + ( Notify == range::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -7048,6 +7056,20 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { 0; extract_value( StopBrakeDecc, "SBD", line, "" ); + + // converter + { + std::map starts{ + { "Manual", start::manual }, + { "Automatic", start::automatic } + }; + auto lookup = starts.find( extract_value( "ConverterStart", line ) ); + ConverterStart = + lookup != starts.end() ? + lookup->second : + start::manual; + } + extract_value( ConverterStartDelay, "ConverterStartDelay", line, "" ); } void TMoverParameters::LoadFIZ_Light( std::string const &line ) { @@ -8148,7 +8170,7 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "Sandbox") { - OK = Sandbox( CValue1 == 1, command_range::local ); + OK = Sandbox( CValue1 == 1, range::local ); } else if (Command == "CabSignal") /*SHP,Indusi*/ { // Ra: to powinno działać tylko w członie obsadzonym diff --git a/Traction.cpp b/Traction.cpp index c0b5f181..6aa04184 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -116,25 +116,22 @@ void TTraction::Optimize() uiDisplayList = glGenLists(1); glNewList(uiDisplayList, GL_COMPILE); - GfxRenderer.Bind(0); - // glColor3ub(0,0,0); McZapkie: to do render - - // glPushMatrix(); - // glTranslatef(pPosition.x,pPosition.y,pPosition.z); - if (Wires != 0) { // Dlugosc odcinka trakcji 'Winger - double ddp = hypot(pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z); - + double ddp = std::hypot(pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z); if (Wires == 2) WireOffset = 0; // Przewoz jezdny 1 'Marcin glBegin(GL_LINE_STRIP); - glVertex3f(pPoint1.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, pPoint1.y, - pPoint1.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); - glVertex3f(pPoint2.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, pPoint2.y, - pPoint2.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); + glVertex3f( + pPoint1.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, + pPoint1.y, + pPoint1.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); + glVertex3f( + pPoint2.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, + pPoint2.y, + pPoint2.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); glEnd(); // Nie wiem co 'Marcin Math3D::vector3 pt1, pt2, pt3, pt4, v1, v2; @@ -146,24 +143,25 @@ void TTraction::Optimize() float f = step; float mid = 0.5; float t; - // Przewod nosny 'Marcin - if (Wires != 1) + if (Wires > 1) { glBegin(GL_LINE_STRIP); glVertex3f(pPoint3.x, pPoint3.y, pPoint3.z); - for (int i = 0; i < iNumSections - 1; i++) + for (int i = 0; i < iNumSections - 1; ++i) { pt3 = pPoint3 + v1 * f; - t = (1 - fabs(f - mid) * 2); + t = (1 - std::fabs(f - mid) * 2); if ((Wires < 4) || ((i != 0) && (i != iNumSections - 2))) - glVertex3f(pt3.x, pt3.y - sqrt(t) * fHeightDifference, pt3.z); + glVertex3f( + pt3.x, + pt3.y - std::sqrt(t) * fHeightDifference, + pt3.z); f += step; } glVertex3f(pPoint4.x, pPoint4.y, pPoint4.z); glEnd(); } - // Drugi przewod jezdny 'Winger if (Wires > 2) { @@ -181,14 +179,17 @@ void TTraction::Optimize() { glBegin(GL_LINE_STRIP); glVertex3f(pPoint3.x, pPoint3.y - 0.65f * fHeightDifference, pPoint3.z); - for (int i = 0; i < iNumSections - 1; i++) + for (int i = 0; i < iNumSections - 1; ++i) { pt3 = pPoint3 + v1 * f; - t = (1 - fabs(f - mid) * 2); + t = (1 - std::fabs(f - mid) * 2); glVertex3f( pt3.x, - pt3.y - sqrt(t) * fHeightDifference - - ((i == 0) || (i == iNumSections - 2) ? 0.25f * fHeightDifference : +0.05), + pt3.y - std::sqrt( t ) * fHeightDifference - ( + ( ( i == 0 ) + || ( i == iNumSections - 2 ) ) ? + 0.25f * fHeightDifference : + 0.05 ), pt3.z); f += step; } @@ -202,36 +203,47 @@ void TTraction::Optimize() if (Wires != 1) { glBegin(GL_LINES); - for (int i = 0; i < iNumSections - 1; i++) + for (int i = 0; i < iNumSections - 1; ++i) { float flo, flo1; flo = (Wires == 4 ? 0.25f * fHeightDifference : 0); flo1 = (Wires == 4 ? +0.05 : 0); pt3 = pPoint3 + v1 * f; pt4 = pPoint1 + v2 * f; - t = (1 - fabs(f - mid) * 2); + t = (1 - std::fabs(f - mid) * 2); if ((i % 2) == 0) { - glVertex3f(pt3.x, pt3.y - sqrt(t) * fHeightDifference - - ((i == 0) || (i == iNumSections - 2) ? flo : flo1), - pt3.z); - glVertex3f(pt4.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, pt4.y, - pt4.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); + glVertex3f( + pt3.x, + pt3.y - std::sqrt(t) * fHeightDifference - ((i == 0) || (i == iNumSections - 2) ? flo : flo1), + pt3.z); + glVertex3f( + pt4.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, + pt4.y, + pt4.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); } else { - glVertex3f(pt3.x, pt3.y - sqrt(t) * fHeightDifference - - ((i == 0) || (i == iNumSections - 2) ? flo : flo1), - pt3.z); - glVertex3f(pt4.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, pt4.y, - pt4.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); + glVertex3f( + pt3.x, + pt3.y - std::sqrt(t) * fHeightDifference - ((i == 0) || (i == iNumSections - 2) ? flo : flo1), + pt3.z); + glVertex3f( + pt4.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, + pt4.y, + pt4.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); } if ((Wires == 4) && ((i == 1) || (i == iNumSections - 3))) { - glVertex3f(pt3.x, pt3.y - sqrt(t) * fHeightDifference - 0.05, pt3.z); - glVertex3f(pt3.x, pt3.y - sqrt(t) * fHeightDifference, pt3.z); + glVertex3f( + pt3.x, + pt3.y - std::sqrt(t) * fHeightDifference - 0.05, + pt3.z); + glVertex3f( + pt3.x, + pt3.y - std::sqrt(t) * fHeightDifference, + pt3.z); } - // endif; f += step; } glEnd(); @@ -249,146 +261,89 @@ void TTraction::InitCenter(vector3 Angles, vector3 pOrigin) void TTraction::RenderDL(float mgn) // McZapkie: mgn to odleglosc od obserwatora { // McZapkie: ustalanie przezroczystosci i koloru linii: - if (Wires != 0 && !TestFlag(DamageFlag, 128)) // rysuj jesli sa druty i nie zerwana + if( Wires != 0 && !TestFlag( DamageFlag, 128 ) ) // rysuj jesli sa druty i nie zerwana { - // glDisable(GL_LIGHTING); //aby nie używało wektorów normalnych do kolorowania - glColor4f(0, 0, 0, 1); // jak nieznany kolor to czarne nieprzezroczyste - if (!Global::bSmoothTraction) - glDisable(GL_LINE_SMOOTH); // na liniach kiepsko wygląda - robi gradient - float linealpha = 5000 * WireThickness / (mgn + 1.0); //*WireThickness - if (linealpha > 1.2f) - linealpha = 1.2f; // zbyt grube nie są dobre - glLineWidth(linealpha); - if (linealpha > 1.0f) - linealpha = 1.0f; - // McZapkie-261102: kolor zalezy od materialu i zasniedzenia - float r, g, b; - switch (Material) - { // Ra: kolory podzieliłem przez 2, bo po zmianie ambient za jasne były - // trzeba uwzględnić kierunek świecenia Słońca - tylko ze Słońcem widać kolor - case 1: - if (TestFlag(DamageFlag, 1)) - { - r = 0.00000f; - g = 0.32549f; - b = 0.2882353f; // zielona miedź - } - else - { - r = 0.35098f; - g = 0.22549f; - b = 0.1f; // czerwona miedź - } - break; - case 2: - if (TestFlag(DamageFlag, 1)) - { - r = 0.10f; - g = 0.10f; - b = 0.10f; // czarne Al - } - else - { - r = 0.25f; - g = 0.25f; - b = 0.25f; // srebrne Al - } - break; - // tymczasowo pokazanie zasilanych odcinków - case 4: - r = 0.5f; - g = 0.5f; - b = 1.0f; - break; // niebieskie z podłączonym zasilaniem - case 5: - r = 1.0f; - g = 0.0f; - b = 0.0f; - break; // czerwone z podłączonym zasilaniem 1 - case 6: - r = 0.0f; - g = 1.0f; - b = 0.0f; - break; // zielone z podłączonym zasilaniem 2 - case 7: - r = 1.0f; - g = 1.0f; - b = 0.0f; - break; //żółte z podłączonym zasilaniem z obu stron + // setup + GfxRenderer.Bind( 0 ); + if( !Global::bSmoothTraction ) { + // na liniach kiepsko wygląda - robi gradient + ::glDisable( GL_LINE_SMOOTH ); } - if (DebugModeFlag) - if (hvParallel) - { // jeśli z bieżnią wspólną, to dodatkowo przyciemniamy - r *= 0.6f; - g *= 0.6f; - b *= 0.6f; - } -#ifdef EU07_USE_OLD_LIGHTING_MODEL - r *= Global::ambientDayLight[ 0 ]; // w zaleźności od koloru swiatła - g *= Global::ambientDayLight[ 1 ]; - b *= Global::ambientDayLight[ 2 ]; -#else - r *= Global::DayLight.ambient[ 0 ]; // w zaleźności od koloru swiatła - g *= Global::DayLight.ambient[ 1 ]; - b *= Global::DayLight.ambient[2]; -#endif - if (linealpha > 1.0f) - linealpha = 1.0f; // trzeba ograniczyć do <=1 - glColor4f(r, g, b, linealpha); + float linealpha = 5000 * WireThickness / ( mgn + 1.0 ); //*WireThickness + linealpha = std::min( 1.2f, linealpha ); // zbyt grube nie są dobre + ::glLineWidth( linealpha ); + // McZapkie-261102: kolor zalezy od materialu i zasniedzenia + float + red{ 0.0f }, + green{ 0.0f }, + blue{ 0.0f }; + wire_color( red, green, blue ); + ::glColor4f( red, green, blue, linealpha ); + // draw code if (!uiDisplayList) Optimize(); // generowanie DL w miarę potrzeby - glCallList(uiDisplayList); - glLineWidth(1.0); - glEnable(GL_LINE_SMOOTH); - // glEnable(GL_LIGHTING); //bez tego się modele nie oświetlają + ::glCallList(uiDisplayList); + // cleanup + ::glLineWidth(1.0); + ::glEnable(GL_LINE_SMOOTH); } } +// przygotowanie tablic do skopiowania do VBO (zliczanie wierzchołków) int TTraction::RaArrayPrepare() -{ // przygotowanie tablic do skopiowania do VBO (zliczanie wierzchołków) - // if (bVisible) //o ile w ogóle widać - switch (Wires) - { - case 1: - iLines = 2; - break; - case 2: - iLines = iNumSections ? 4 * (iNumSections)-2 + 2 : 4; - break; - case 3: - iLines = iNumSections ? 4 * (iNumSections)-2 + 4 : 6; - break; - case 4: - iLines = iNumSections ? 4 * (iNumSections)-2 + 6 : 8; - break; - default: - iLines = 0; +{ + // jezdny + iLines = 2; + // przewod nosny + if( Wires > 1 ) { + iLines += 2 + ( + Wires < 4 ? + std::max( 0, iNumSections - 1 ) : + ( iNumSections > 2 ? + std::max( 0, iNumSections - 1 - 2 ) : + std::max( 0, iNumSections - 1 - 1 ) ) ); + } + // drugi przewod jezdny + if( Wires > 2 ) { + iLines += 2; + } + if( Wires == 4 ) { + iLines += 2 + std::max( 0, iNumSections - 1 ); + } + // przewody pionowe (wieszaki) + if( Wires > 1 ) { + iLines += 2 * ( std::max( 0, iNumSections - 1 ) ); + if( ( Wires == 4 ) + &&( iNumSections > 0 ) ) { + iLines += ( + iNumSections > 4 ? + 4 : + 2 ); + } } - // else iLines=0; return iLines; }; void TTraction::RaArrayFill(CVertNormTex *Vert) { // wypełnianie tablic VBO - CVertNormTex *old = Vert; - double ddp = hypot(pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z); + double ddp = std::hypot(pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z); if (Wires == 2) WireOffset = 0; // jezdny - Vert->x = pPoint1.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset; + Vert->x = pPoint1.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; Vert->y = pPoint1.y; - Vert->z = pPoint1.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset; + Vert->z = pPoint1.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; ++Vert; - Vert->x = pPoint2.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset; + Vert->x = pPoint2.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; Vert->y = pPoint2.y; - Vert->z = pPoint2.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset; + Vert->z = pPoint2.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; ++Vert; // Nie wiem co 'Marcin Math3D::vector3 pt1, pt2, pt3, pt4, v1, v2; v1 = pPoint4 - pPoint3; v2 = pPoint2 - pPoint1; float step = 0; - if (iNumSections > 0) + if( iNumSections > 0 ) step = 1.0f / (float)iNumSections; float f = step; float mid = 0.5; @@ -400,18 +355,18 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->y = pPoint3.y; Vert->z = pPoint3.z; ++Vert; - for (int i = 0; i < iNumSections - 1; i++) + for (int i = 0; i < iNumSections - 1; ++i) { pt3 = pPoint3 + v1 * f; - t = (1 - fabs(f - mid) * 2); - Vert->x = pt3.x; - Vert->y = pt3.y - sqrt(t) * fHeightDifference; - Vert->z = pt3.z; - ++Vert; - Vert->x = pt3.x; // drugi raz, bo nie jest line_strip - Vert->y = pt3.y - sqrt(t) * fHeightDifference; - Vert->z = pt3.z; - ++Vert; + t = (1 - std::fabs(f - mid) * 2); + if( ( Wires < 4 ) + || ( ( i != 0 ) + && ( i != iNumSections - 2 ) ) ) { + Vert->x = pt3.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference; + Vert->z = pt3.z; + ++Vert; + } f += step; } Vert->x = pPoint4.x; @@ -420,7 +375,7 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) ++Vert; } // Drugi przewod jezdny 'Winger - if (Wires == 3) + if (Wires > 2) { Vert->x = pPoint1.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset; Vert->y = pPoint1.y; @@ -431,124 +386,145 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->z = pPoint2.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset; ++Vert; } + f = step; - // Przewody pionowe (wieszaki) 'Marcin, poprawki na 2 przewody jezdne 'Winger - if (Wires > 1) - { - for (int i = 0; i < iNumSections - 1; i++) - { + + if( Wires == 4 ) { + Vert->x = pPoint3.x; + Vert->y = pPoint3.y - 0.65f * fHeightDifference; + Vert->z = pPoint3.z; + ++Vert; + for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; - pt4 = pPoint1 + v2 * f; - t = (1 - fabs(f - mid) * 2); + t = ( 1 - std::fabs( f - mid ) * 2 ); Vert->x = pt3.x; - Vert->y = pt3.y - sqrt(t) * fHeightDifference; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( + ( ( i == 0 ) + || ( i == iNumSections - 2 ) ) ? + 0.25f * fHeightDifference : + 0.05 ); Vert->z = pt3.z; ++Vert; - if ((i % 2) == 0) - { - Vert->x = pt4.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset; - Vert->y = pt4.y; - Vert->z = pt4.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset; - } - else - { - Vert->x = pt4.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset; - Vert->y = pt4.y; - Vert->z = pt4.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset; - } - ++Vert; + f += step; + } + Vert->x = pPoint4.x; + Vert->y = pPoint4.y - 0.65f * fHeightDifference; + Vert->z = pPoint4.z; + } + f = step; + + // Przewody pionowe (wieszaki) 'Marcin, poprawki na 2 przewody jezdne 'Winger + if (Wires > 1) + { + for (int i = 0; i < iNumSections - 1; ++i) + { + float flo, flo1; + flo = ( Wires == 4 ? 0.25f * fHeightDifference : 0 ); + flo1 = ( Wires == 4 ? +0.05 : 0 ); + pt3 = pPoint3 + v1 * f; + pt4 = pPoint1 + v2 * f; + t = (1 - std::fabs(f - mid) * 2); + + if( ( i % 2 ) == 0 ) { + Vert->x = pt3.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ); + Vert->z = pt3.z; + ++Vert; + Vert->x = pt4.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; + Vert->y = pt4.y; + Vert->z = pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; + ++Vert; + } + else { + Vert->x = pt3.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ); + Vert->z = pt3.z; + ++Vert; + Vert->x = pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; + Vert->y = pt4.y; + Vert->z = pt4.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; + ++Vert; + } + if( ( ( Wires == 4 ) + && ( ( i == 1 ) + || ( i == iNumSections - 3 ) ) ) ) { + Vert->x = pt3.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - 0.05; + Vert->z = pt3.z; + ++Vert; + Vert->x = pt3.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference; + Vert->z = pt3.z; + ++Vert; + } f += step; } } - if ((Vert - old) != iLines) - WriteLog("!!! Wygenerowano punktów " + std::to_string(Vert - old) + ", powinno być " + - std::to_string(iLines)); }; void TTraction::RenderVBO(float mgn, int iPtr) { // renderowanie z użyciem VBO if (Wires != 0 && !TestFlag(DamageFlag, 128)) // rysuj jesli sa druty i nie zerwana { + // setup GfxRenderer.Bind(0); - glDisable(GL_LIGHTING); // aby nie używało wektorów normalnych do kolorowania - glColor4f(0, 0, 0, 1); // jak nieznany kolor to czarne nieprzezroczyste - if (!Global::bSmoothTraction) - glDisable(GL_LINE_SMOOTH); // na liniach kiepsko wygląda - robi gradient - float linealpha = 5000 * WireThickness / (mgn + 1.0); //*WireThickness - if (linealpha > 1.2f) - linealpha = 1.2f; // zbyt grube nie są dobre - glLineWidth(linealpha); - // McZapkie-261102: kolor zalezy od materialu i zasniedzenia - float r, g, b; - switch (Material) - { // Ra: kolory podzieliłem przez 2, bo po zmianie ambient za jasne były - // trzeba uwzględnić kierunek świecenia Słońca - tylko ze Słońcem widać kolor - case 1: - if (TestFlag(DamageFlag, 1)) - { - r = 0.00000f; - g = 0.32549f; - b = 0.2882353f; // zielona miedź - } - else - { - r = 0.35098f; - g = 0.22549f; - b = 0.1f; // czerwona miedź - } - break; - case 2: - if (TestFlag(DamageFlag, 1)) - { - r = 0.10f; - g = 0.10f; - b = 0.10f; // czarne Al - } - else - { - r = 0.25f; - g = 0.25f; - b = 0.25f; // srebrne Al - } - break; - // tymczasowo pokazanie zasilanych odcinków - case 4: - r = 0.5f; - g = 0.5f; - b = 1.0f; - break; // niebieskie z podłączonym zasilaniem - case 5: - r = 1.0f; - g = 0.0f; - b = 0.0f; - break; // czerwone z podłączonym zasilaniem 1 - case 6: - r = 0.0f; - g = 1.0f; - b = 0.0f; - break; // zielone z podłączonym zasilaniem 2 - case 7: - r = 1.0f; - g = 1.0f; - b = 0.0f; - break; //żółte z podłączonym zasilaniem z obu stron + if( !Global::bSmoothTraction ) { + // na liniach kiepsko wygląda - robi gradient + ::glDisable( GL_LINE_SMOOTH ); } -#ifdef EU07_USE_OLD_LIGHTING_MODEL - r *= Global::ambientDayLight[ 0 ]; // w zaleźności od koloru swiatła - g *= Global::ambientDayLight[ 1 ]; - b *= Global::ambientDayLight[ 2 ]; -#else - r *= Global::DayLight.ambient[ 0 ]; // w zaleźności od koloru swiatła - g *= Global::DayLight.ambient[ 1 ]; - b *= Global::DayLight.ambient[ 2 ]; -#endif - if (linealpha > 1.0f) - linealpha = 1.0f; // trzeba ograniczyć do <=1 - glColor4f(r, g, b, linealpha); - glDrawArrays(GL_LINES, iPtr, iLines); - glLineWidth(1.0); - glEnable(GL_LINE_SMOOTH); - glEnable(GL_LIGHTING); // bez tego się modele nie oświetlają + float linealpha = 5000 * WireThickness / (mgn + 1.0); //*WireThickness + linealpha = std::min( 1.2f, linealpha ); // zbyt grube nie są dobre + ::glLineWidth(linealpha); + // McZapkie-261102: kolor zalezy od materialu i zasniedzenia + float + red{ 0.0f }, + green{ 0.0f }, + blue{ 0.0f }; + wire_color( red, green, blue ); + ::glColor4f(red, green, blue, linealpha); + // draw code + // jezdny + ::glDrawArrays( GL_LINE_STRIP, iPtr, 2 ); + iPtr += 2; + // przewod nosny + if( Wires > 1 ) { + auto const piececount = 2 + ( + Wires < 4 ? + std::max( 0 , iNumSections - 1 ) : + ( iNumSections > 2 ? + std::max( 0, iNumSections - 1 - 2 ) : + std::max( 0, iNumSections - 1 - 1 ) ) ); + ::glDrawArrays( GL_LINE_STRIP, iPtr, piececount ); + iPtr += piececount; + } + // drugi przewod jezdny + if( Wires > 2 ) { + ::glDrawArrays( GL_LINE_STRIP, iPtr, 2 ); + iPtr += 2; + } + if( Wires == 4 ) { + auto const piececount = 2 + std::max( 0, iNumSections - 1 ); + ::glDrawArrays( GL_LINE_STRIP, iPtr, piececount ); + iPtr += piececount; + } + // przewody pionowe (wieszaki) + if( Wires != 1 ) { + auto piececount = 2 * std::max( 0, iNumSections - 1 ); + if( ( Wires == 4 ) + && ( iNumSections > 0 ) ) { + piececount += ( + iNumSections > 4 ? + 4 : + 2 ); + } + if( piececount > 0 ) { + ::glDrawArrays( GL_LINES, iPtr, piececount ); + iPtr += piececount; + } + } + // cleanup + ::glLineWidth(1.0); + ::glEnable(GL_LINE_SMOOTH); } }; @@ -619,11 +595,16 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) else ps = psPower[d ^ 1]; // zasilacz od przeciwnej strony niż idzie analiza d = iNext[d]; // kierunek - // double r; //sumaryczna rezystancja +#ifdef EU07_USE_OLD_TRACTIONPOWER_CODE if (DebugModeFlag) // tylko podczas testów Material = 4; // pokazanie, że to przęsło ma podłączone zasilanie +#else + // TBD, TODO: we don't need to maintain 4-7 value range as it's part of legacy system + PowerState = 4; +#endif while (t ? !t->psPower[d] : false) // jeśli jest jakiś kolejny i nie ma ustalonego zasilacza { // ustawienie zasilacza i policzenie rezystancji zastępczej +#ifdef EU07_USE_OLD_TRACTIONPOWER_CODE if (DebugModeFlag) // tylko podczas testów if (t->Material != 4) // przęsła zasilającego nie modyfikować { @@ -631,6 +612,16 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) t->Material = 4; // tymczasowo, aby zmieniła kolor t->Material |= d ? 2 : 1; // kolor zależny od strony, z której jest zasilanie } +#else + if( t->PowerState != 4 ) { + // przęsła zasilającego nie modyfikować + if( t->PowerState < 4 ) { + // tymczasowo, aby zmieniła kolor + t->PowerState = 4; + } + t->PowerState |= d ? 2 : 1; // kolor zależny od strony, z której jest zasilanie + } +#endif t->psPower[d] = ps; // skopiowanie wskaźnika zasilacza od danej strony t->fResistance[d] = r; // wpisanie rezystancji w kierunku tego zasilacza r += t->fResistivity * Length3(t->vParametric); // doliczenie oporu kolejnego odcinka @@ -716,3 +707,84 @@ double TTraction::VoltageGet(double u, double i) return psPower[1]->CurrentGet(res + r1t) * res; return 0.0; // gdy nie podłączony wcale? }; + +void +TTraction::wire_color( float &Red, float &Green, float &Blue ) const { + + if( false == DebugModeFlag ) { + switch( Material ) { // Ra: kolory podzieliłem przez 2, bo po zmianie ambient za jasne były + // trzeba uwzględnić kierunek świecenia Słońca - tylko ze Słońcem widać kolor + case 1: { + if( TestFlag( DamageFlag, 1 ) ) { + Red = 0.00000f; + Green = 0.32549f; + Blue = 0.2882353f; // zielona miedź + } + else { + Red = 0.35098f; + Green = 0.22549f; + Blue = 0.1f; // czerwona miedź + } + break; + } + case 2: { + if( TestFlag( DamageFlag, 1 ) ) { + Red = 0.10f; + Green = 0.10f; + Blue = 0.10f; // czarne Al + } + else { + Red = 0.25f; + Green = 0.25f; + Blue = 0.25f; // srebrne Al + } + break; + } + default: {break; } + } + // w zaleźności od koloru swiatła + Red *= Global::DayLight.ambient[ 0 ]; + Green *= Global::DayLight.ambient[ 1 ]; + Blue *= Global::DayLight.ambient[ 2 ]; + } + else { + // tymczasowo pokazanie zasilanych odcinków + switch( PowerState ) { + + case 4: { + // niebieskie z podłączonym zasilaniem + Red = 0.5f; + Green = 0.5f; + Blue = 1.0f; + break; + } + case 5: { + // czerwone z podłączonym zasilaniem 1 + Red = 1.0f; + Green = 0.0f; + Blue = 0.0f; + break; + } + case 6: { + // zielone z podłączonym zasilaniem 2 + Red = 0.0f; + Green = 1.0f; + Blue = 0.0f; + break; + } + case 7: { + //żółte z podłączonym zasilaniem z obu stron + Red = 1.0f; + Green = 1.0f; + Blue = 0.0f; + break; + } + default: { break; } + } + if( hvParallel ) { // jeśli z bieżnią wspólną, to dodatkowo przyciemniamy + Red *= 0.6f; + Green *= 0.6f; + Blue *= 0.6f; + } + } +} \ No newline at end of file diff --git a/Traction.h b/Traction.h index 7dcbd496..e1484819 100644 --- a/Traction.h +++ b/Traction.h @@ -54,8 +54,7 @@ class TTraction TTraction *hvParallel = nullptr; // jednokierunkowa i zapętlona lista przęseł ewentualnej bieżni wspólnej float fResistance[2]; // rezystancja zastępcza do punktu zasilania (0: przęsło zasilane, <0: do policzenia) int iTries = 0; - // bool bVisible; - // DWORD dwFlags; + int PowerState{ 0 }; // type of incoming power, if any void Optimize(); @@ -78,5 +77,7 @@ class TTraction void ResistanceCalc(int d = -1, double r = 0, TTractionPowerSource *ps = NULL); void PowerSet(TTractionPowerSource *ps); double VoltageGet(double u, double i); +private: + void wire_color( float &Red, float &Green, float &Blue ) const; }; //--------------------------------------------------------------------------- diff --git a/Train.cpp b/Train.cpp index d7444fe8..b5525474 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1600,7 +1600,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com if( Train->mvControlled->EngineType != DieselEngine ) { if( Train->mvControlled->MainSwitch( true ) ) { // side-effects - Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); + Train->mvControlled->ConverterSwitch( ( Train->ggConverterButton.GetValue() > 0.5 ) || ( Train->mvControlled->ConverterStart == start::automatic ) ); Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); } } @@ -1636,6 +1636,11 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Command ) { + if( Train->mvControlled->ConverterStart == start::automatic ) { + // let the automatic thing do its automatic thing... + return; + } + if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down if( ( false == Train->mvControlled->ConverterAllow ) @@ -3680,7 +3685,7 @@ bool TTrain::Update( double const Deltatime ) // TODO: check whether it should affect entire consist for EMU // TODO: check whether it should happen if there's power supplied alternatively through hvcouplers // TODO: potentially move this to the mover module, as there isn't much reason to have this dependent on the operator presence - mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); + mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? range::unit : range::local ) ); } } @@ -3711,7 +3716,7 @@ bool TTrain::Update( double const Deltatime ) { mvControlled->ConvOvldFlag = true; if (mvControlled->TrainType != dt_EZT) - mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? command_range::unit : command_range::local ) ); + mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? range::unit : range::local ) ); } else if( fConverterTimer >= fConverterPrzekaznik ) { // changed switch from always true to take into account state of the compressor switch @@ -4440,9 +4445,10 @@ bool TTrain::Update( double const Deltatime ) tmp = DynamicObject->PrevConnected; if (tmp) - if (tmp->MoverParameters->Mains) + if ( mvControlled->Battery || mvControlled->ConverterFlag ) { - btLampkaWylSzybkiB.TurnOn(); + btLampkaWylSzybkiB.Turn( tmp->MoverParameters->Mains ); + btLampkaOporyB.Turn(tmp->MoverParameters->ResistorsFlagCheck()); btLampkaBezoporowaB.Turn( tmp->MoverParameters->ResistorsFlagCheck() || @@ -5312,7 +5318,7 @@ bool TTrain::Update( double const Deltatime ) switch (LampkaUniversal3_typ) { case 0: - btLampkaUniversal3.Turn(mvControlled->Battery); + btLampkaUniversal3.Turn( mvControlled->Battery || mvControlled->ConverterFlag ); break; case 1: btLampkaUniversal3.Turn(mvControlled->Mains); From 23f4892bcc2f74b490a62b25fd29d1ba73896117 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 16 May 2017 14:13:28 +0200 Subject: [PATCH 105/426] basic executable versioning --- EU07.cpp | 40 +++++++++++++++++++++++++++++++++++++++- Globals.cpp | 7 ++----- Globals.h | 2 -- Logs.cpp | 2 +- Traction.cpp | 33 ++++++++++++++++++--------------- World.cpp | 11 +++++------ maszyna.rc | Bin 5814 -> 6376 bytes maszyna.vcxproj.filters | 3 +++ stdafx.h | 1 + version.h | 5 +++++ 10 files changed, 74 insertions(+), 30 deletions(-) create mode 100644 version.h diff --git a/EU07.cpp b/EU07.cpp index 57162e81..291933d4 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -52,6 +52,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #pragma comment( lib, "setupapi.lib" ) #pragma comment( lib, "python27.lib" ) #pragma comment (lib, "dbghelp.lib") +#pragma comment (lib, "version.lib") #ifdef CAN_I_HAS_LIBPNG #pragma comment (lib, "libpng16.lib") #endif @@ -224,12 +225,49 @@ int main(int argc, char *argv[]) AllocConsole(); SetConsoleTextAttribute( GetStdHandle( STD_OUTPUT_HANDLE ), FOREGROUND_GREEN ); } - +/* std::string executable( argv[ 0 ] ); auto const pathend = executable.rfind( '\\' ); Global::ExecutableName = ( pathend != std::string::npos ? executable.substr( executable.rfind( '\\' ) + 1 ) : executable ); +*/ + // retrieve product version from the file's version data table + { + auto const fileversionsize = ::GetFileVersionInfoSize( argv[ 0 ], NULL ); + std::vectorfileversiondata; fileversiondata.resize( fileversionsize ); + if( ::GetFileVersionInfo( argv[ 0 ], NULL, fileversionsize, fileversiondata.data() ) ) { + + struct lang_codepage { + WORD language; + WORD codepage; + } *langcodepage; + UINT datasize; + + ::VerQueryValue( + fileversiondata.data(), + TEXT( "\\VarFileInfo\\Translation" ), + (LPVOID*)&langcodepage, + &datasize ); + + std::string subblock; subblock.resize( 50 ); + ::StringCchPrintf( + &subblock[0], subblock.size(), + TEXT( "\\StringFileInfo\\%04x%04x\\ProductVersion" ), + langcodepage->language, + langcodepage->codepage ); + + VOID *stringdata; + if( ::VerQueryValue( + fileversiondata.data(), + subblock.data(), + &stringdata, + &datasize ) ) { + + Global::asVersion = std::string( reinterpret_cast(stringdata) ); + } + } + } for (int i = 1; i < argc; ++i) { diff --git a/Globals.cpp b/Globals.cpp index afd6a465..d34088fe 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -32,8 +32,7 @@ std::string Global::AppName{ "EU07" }; std::string Global::asCurrentSceneryPath = "scenery/"; std::string Global::asCurrentTexturePath = std::string(szTexturePath); std::string Global::asCurrentDynamicPath = ""; -int Global::iSlowMotion = - 0; // info o malym FPS: 0-OK, 1-wyłączyć multisampling, 3-promień 1.5km, 7-1km +int Global::iSlowMotion = 0; // info o malym FPS: 0-OK, 1-wyłączyć multisampling, 3-promień 1.5km, 7-1km TDynamicObject *Global::changeDynObj = NULL; // info o zmianie pojazdu double Global::ABuDebug = 0; std::string Global::asSky = "1"; @@ -48,9 +47,7 @@ GLFWwindow *Global::window; bool Global::shiftState; bool Global::ctrlState; int Global::iCameraLast = -1; -std::string Global::asRelease = "16.0.1172.482"; -std::string Global::asVersion = "Compilation 2017-03-19, release " + Global::asRelease; // tutaj, bo wysyłany -std::string Global::ExecutableName; +std::string Global::asVersion = "couldn't retrieve version string"; int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // numer ekranu wyświetlacza tekstowego double Global::fSunDeclination = 0.0; // deklinacja Słońca diff --git a/Globals.h b/Globals.h index ca665df5..c44fef01 100644 --- a/Globals.h +++ b/Globals.h @@ -266,9 +266,7 @@ class Global 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 std::string asRelease; // numer static std::string asVersion; // z opisem - static std::string ExecutableName; static GLint iMaxTextureSize; // maksymalny rozmiar tekstury static int iTextMode; // tryb pracy wyświetlacza tekstowego static int iScreenMode[12]; // numer ekranu wyświetlacza tekstowego diff --git a/Logs.cpp b/Logs.cpp index 6b1bd677..3770f7d9 100644 --- a/Logs.cpp +++ b/Logs.cpp @@ -112,7 +112,7 @@ void ErrorLog(const char *str) "logs/errors (" + filename_scenery() + ") " + filename_date() + ".txt" : "errors.txt" ); errors.open( filename, std::ios::trunc ); - errors << "EU07.EXE " + Global::asRelease << "\n"; + errors << "EU07.EXE " + Global::asVersion << "\n"; } if (str) errors << str; diff --git a/Traction.cpp b/Traction.cpp index 6aa04184..4aa4d8d3 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -599,10 +599,10 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) if (DebugModeFlag) // tylko podczas testów Material = 4; // pokazanie, że to przęsło ma podłączone zasilanie #else - // TBD, TODO: we don't need to maintain 4-7 value range as it's part of legacy system PowerState = 4; #endif - while (t ? !t->psPower[d] : false) // jeśli jest jakiś kolejny i nie ma ustalonego zasilacza + while( ( t != nullptr ) + && ( t->psPower[d] == nullptr ) ) // jeśli jest jakiś kolejny i nie ma ustalonego zasilacza { // ustawienie zasilacza i policzenie rezystancji zastępczej #ifdef EU07_USE_OLD_TRACTIONPOWER_CODE if (DebugModeFlag) // tylko podczas testów @@ -615,11 +615,14 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) #else if( t->PowerState != 4 ) { // przęsła zasilającego nie modyfikować - if( t->PowerState < 4 ) { - // tymczasowo, aby zmieniła kolor + if( t->psPowered != nullptr ) { + t->PowerState = 4; } - t->PowerState |= d ? 2 : 1; // kolor zależny od strony, z której jest zasilanie + else { + // kolor zależny od strony, z której jest zasilanie + t->PowerState |= d ? 2 : 1; + } } #endif t->psPower[d] = ps; // skopiowanie wskaźnika zasilacza od danej strony @@ -751,34 +754,34 @@ TTraction::wire_color( float &Red, float &Green, float &Blue ) const { // tymczasowo pokazanie zasilanych odcinków switch( PowerState ) { - case 4: { - // niebieskie z podłączonym zasilaniem - Red = 0.5f; - Green = 0.5f; - Blue = 1.0f; - break; - } - case 5: { + case 1: { // czerwone z podłączonym zasilaniem 1 Red = 1.0f; Green = 0.0f; Blue = 0.0f; break; } - case 6: { + case 2: { // zielone z podłączonym zasilaniem 2 Red = 0.0f; Green = 1.0f; Blue = 0.0f; break; } - case 7: { + case 3: { //żółte z podłączonym zasilaniem z obu stron Red = 1.0f; Green = 1.0f; Blue = 0.0f; break; } + case 4: { + // niebieskie z podłączonym zasilaniem + Red = 0.5f; + Green = 0.5f; + Blue = 1.0f; + break; + } default: { break; } } if( hvParallel ) { // jeśli z bieżnią wspólną, to dodatkowo przyciemniamy diff --git a/World.cpp b/World.cpp index cb003bfe..b7a11860 100644 --- a/World.cpp +++ b/World.cpp @@ -281,11 +281,10 @@ bool TWorld::Init( GLFWwindow *Window ) { Global::window = Window; // do WM_COPYDATA Global::pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań - WriteLog("\nStarting MaSzyna rail vehicle simulator."); - WriteLog( "Release " + Global::asRelease + " (executable: " + Global::ExecutableName + ")" ); - WriteLog("Online documentation and additional files on http://eu07.pl"); - 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\n"); + WriteLog( "\nStarting MaSzyna rail vehicle simulator (release: " + Global::asVersion + ")" ); + WriteLog( "For online documentation and additional files refer to: http://eu07.pl"); + 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\n" ); UILayer.set_background( "logo" ); @@ -1982,7 +1981,7 @@ TWorld::Update_UI() { case( GLFW_KEY_F9 ) : { // informacja o wersji, sposobie wyświetlania i błędach OpenGL - uitextline1 = Global::asVersion; // informacja o wersji + uitextline1 = "MaSzyna " + Global::asVersion; // informacja o wersji if( Global::iMultiplayer ) { uitextline1 += " (multiplayer mode is active)"; } diff --git a/maszyna.rc b/maszyna.rc index ac76d2e13680f203d41ccdf7ae22f32e5ea40aa4..4736fb51865821fb456bc3acf5b565882f5eb1ab 100644 GIT binary patch delta 920 zcmdm{`@(R80@LJgj3UBi45z zH!HE-Ls5XLfAU0b(a8l|Vw*iUcQ7LB!=lWETWGTjcLeL?C;>67`HWFedh!+ltI6{O L#5T(arZEEmg|?y@iWmKH(CAe&I Vlc*GH9z#Au$;6GKlh=ug0RUdyG7ta& diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 618b4702..0dcd5af5 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -431,6 +431,9 @@ Header Files\input + + Header Files + diff --git a/stdafx.h b/stdafx.h index 4cd20a12..c331c425 100644 --- a/stdafx.h +++ b/stdafx.h @@ -26,6 +26,7 @@ #undef NOMINMAX #include #include +#include #endif // stl #include diff --git a/version.h b/version.h new file mode 100644 index 00000000..866a8597 --- /dev/null +++ b/version.h @@ -0,0 +1,5 @@ +#pragma once + +#define VERSION_MAJOR 17 +#define VERSION_MINOR 516 +#define VERSION_REVISION 0 From c6fbfbbb29f043e61f6b9bc16d543f131c9ac7dc Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 18 May 2017 01:52:04 +0200 Subject: [PATCH 106/426] build 170517. minor ai tweaks, scan direction update fix --- Driver.cpp | 103 ++++---- Driver.h | 12 +- Ground.cpp | 653 ++++++--------------------------------------------- Ground.h | 10 +- Track.cpp | 8 +- Train.cpp | 10 +- World.cpp | 19 +- renderer.cpp | 177 +++++++++++++- renderer.h | 2 + version.h | 2 +- 10 files changed, 332 insertions(+), 664 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index cf192ad7..5dc88575 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -82,8 +82,8 @@ Tutaj łączymy teorię z praktyką - tu nic nie działa i nikt nie wie dlaczego // stałe const double EasyReactionTime = 0.5; //[s] przebłyski świadomości dla zwykłej jazdy const double HardReactionTime = 0.2; -const double EasyAcceleration = 0.5; //[m/ss] -const double HardAcceleration = 0.9; +const double EasyAcceleration = 0.85; //[m/ss] +const double HardAcceleration = 9.81; const double PrepareTime = 2.0; //[s] przebłyski świadomości przy odpalaniu bool WriteLogFlag = false; @@ -450,7 +450,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) TEvent *pEvent{ nullptr }; double fLastDir{ 0.0 }; - if (iTableDirection != iDirection) { + if (iTableDirection != iDirection ) { // jeśli zmiana kierunku, zaczynamy od toru ze wskazanym pojazdem iTableDirection = iDirection; // ustalenie w jakim kierunku jest wypełniana tabelka względem pojazdu pTrack = pVehicle->RaTrackGet(); // odcinek, na którym stoi @@ -468,6 +468,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) SemNextStopIndex = -1; } else { + if( iTableDirection == 0 ) { return; } // kontynuacja skanowania od ostatnio sprawdzonego toru (w ostatniej pozycji zawsze jest tor) if( ( SemNextStopIndex != -1 ) && ( sSpeedTable[SemNextStopIndex].fVelNext < 1.0 ) ) { @@ -501,6 +502,11 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) pTrack->Length() ); } + if( iTableDirection == 0 ) { + // don't bother + return; + } + if( fCurrentDistance >= fDistance ) { // all done return; @@ -1664,14 +1670,20 @@ void TController::AutoRewident() } }; +int TController::CheckDirection() { + + int d = mvOccupied->DirAbsolute; // który sprzęg jest z przodu + if( !d ) // jeśli nie ma ustalonego kierunku + d = mvOccupied->CabNo; // to jedziemy wg aktualnej kabiny + iDirection = d; // ustalenie kierunku jazdy (powinno zrobić PrepareEngine?) + return d; +} + bool TController::CheckVehicles(TOrders user) { // sprawdzenie stanu posiadanych pojazdów w składzie i zapalenie świateł TDynamicObject *p; // roboczy wskaźnik na pojazd iVehicles = 0; // ilość pojazdów w składzie - int d = mvOccupied->DirAbsolute; // który sprzęg jest z przodu - if (!d) // jeśli nie ma ustalonego kierunku - d = mvOccupied->CabNo; // to jedziemy wg aktualnej kabiny - iDirection = d; // ustalenie kierunku jazdy (powinno zrobić PrepareEngine?) + int d = CheckDirection(); d = d >= 0 ? 0 : 1; // kierunek szukania czoła (numer sprzęgu) pVehicles[0] = p = pVehicle->FirstFind(d); // pojazd na czele składu // liczenie pojazdów w składzie i ustalenie parametrów @@ -2058,20 +2070,22 @@ bool TController::PrepareEngine() mvOccupied->BatterySwitch(true); if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { // jeśli silnikowy jest pantografującym - if (mvControlling->PantPress > 4.3) - { // jeżeli jest wystarczające ciśnienie w pantografach + mvControlling->PantFront( true ); + mvControlling->PantRear( true ); + if (mvControlling->PantPress < 4.2) { + // załączenie małej sprężarki + if( mvControlling->TrainType != dt_EZT ) { + // odłączenie zbiornika głównego, bo z nim nie da rady napompować + mvControlling->bPantKurek3 = false; + } + mvControlling->PantCompFlag = true; // załączenie sprężarki pantografów + } + else { + // jeżeli jest wystarczające ciśnienie w pantografach if ((!mvControlling->bPantKurek3) || (mvControlling->PantPress <= mvControlling->ScndPipePress)) // kurek przełączony albo główna już pompuje mvControlling->PantCompFlag = false; // sprężarkę pantografów można już wyłączyć - mvControlling->PantFront(true); - mvControlling->PantRear(true); - } - else if (mvControlling->PantPress < 4.2) //żeby nie załączał zaraz po przekroczeniu 4.0 - { // załączenie małej sprężarki - mvControlling->bPantKurek3 = - false; // odłączenie zbiornika głównego, bo z nim nie da rady napompować - mvControlling->PantCompFlag = true; // załączenie sprężarki pantografów } } // if (mvOccupied->TrainType==dt_EZT) @@ -2352,11 +2366,19 @@ bool TController::IncSpeed() if (tsGuardSignal->GetStatus() & DSBSTATUS_PLAYING) // jeśli gada, to nie jedziemy return false; bool OK = true; - if ( ( iDrivigFlags & moveDoorOpened ) - && ( VelDesired > 0.0 ) ) // to prevent door shuffle on stop - Doors(false); // zamykanie drzwi - tutaj wykonuje tylko AI (zmienia fActionTime) - if (fActionTime < 0.0) // gdy jest nakaz poczekać z jazdą, to nie ruszać + if( ( iDrivigFlags & moveDoorOpened ) + && ( VelDesired > 0.0 ) ) { // to prevent door shuffle on stop + // zamykanie drzwi - tutaj wykonuje tylko AI (zmienia fActionTime) + Doors( false ); + } + if( fActionTime < 0.0 ) { + // gdy jest nakaz poczekać z jazdą, to nie ruszać return false; + } + if( true == mvOccupied->DepartureSignal ) { + // shut off departure warning + mvOccupied->DepartureSignal = false; + } if (mvControlling->SlippingWheels) return false; // jak poślizg, to nie przyspieszamy switch (mvOccupied->EngineType) @@ -2528,8 +2550,6 @@ void TController::SpeedSet() switch (mvOccupied->EngineType) { case None: // McZapkie-041003: wagon sterowniczy - if (fActionTime >= -1.0) - mvOccupied->DepartureSignal = false; // trochę niech pobuczy, zanim pojedzie if (mvControlling->MainCtrlPosNo > 0) { // jeśli ma czym kręcić // TODO: sprawdzanie innego czlonu //if (!FuseFlagCheck()) @@ -2714,17 +2734,24 @@ void TController::Doors(bool what) { // zamykanie if (mvOccupied->DoorOpenCtrl == 1) { // jeśli drzwi sterowane z kabiny - if (AIControllFlag) - if (mvOccupied->DoorLeftOpened || mvOccupied->DoorRightOpened) - { // AI zamyka drzwi przed odjazdem - if (mvOccupied->DoorClosureWarning) + if( AIControllFlag ) { + if( mvOccupied->DoorLeftOpened || mvOccupied->DoorRightOpened ) { // AI zamyka drzwi przed odjazdem + if( ( true == mvOccupied->DoorClosureWarning ) + && ( false == mvOccupied->DepartureSignal ) + && ( true == TestFlag( iDrivigFlags, moveDoorOpened ) ) ) { mvOccupied->DepartureSignal = true; // załącenie bzyczka - mvOccupied->DoorLeft(false); // zamykanie drzwi - mvOccupied->DoorRight(false); + fActionTime = -3.0 - 0.1 * Random( 10 ); // 3-4 second wait + } + if( fActionTime > -0.5 ) { // Ra: trzeba by ustawić jakiś czas oczekiwania na zamknięcie się drzwi - fActionTime = -1.5 - 0.1 * Random(10); // czekanie sekundę, może trochę dłużej - iDrivigFlags &= ~moveDoorOpened; // nie wykonywać drugi raz + mvOccupied->DoorLeft( false ); // zamykanie drzwi + mvOccupied->DoorRight( false ); + iDrivigFlags &= ~moveDoorOpened; + // 1.5-2.5 sec wait, +potentially 0.5 remaining + fActionTime = -1.5 - 0.1 * Random( 10 ); + } } + } } else { // jeśli nie, to zamykanie w składzie wagonowym @@ -2736,7 +2763,7 @@ void TController::Doors(bool what) p = p->Next(); // pojazd podłączony z tyłu (patrząc od czoła) } // WaitingSet(5); //10 sekund tu to za długo, opóźnia odjazd o pół minuty - fActionTime = -1.5 - 0.1 * Random(10); // czekanie sekundę, może trochę dłużej + fActionTime = -3.0 - 0.1 * Random(10); // czekanie sekundę, może trochę dłużej iDrivigFlags &= ~moveDoorOpened; // zostały zamknięte - nie wykonywać drugi raz } } @@ -3261,18 +3288,12 @@ bool TController::UpdateSituation(double dt) { if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { - if (mvOccupied->ScndPipePress > 4.3) // gdy główna sprężarka bezpiecznie nabije - // ciśnienie - mvControlling->bPantKurek3 = - true; // to można przestawić kurek na zasilanie pantografów z głównej pneumatyki + if (mvOccupied->ScndPipePress > 4.3) // gdy główna sprężarka bezpiecznie nabije ciśnienie + mvControlling->bPantKurek3 = true; // to można przestawić kurek na zasilanie pantografów z głównej pneumatyki fVoltage = 0.5 * (fVoltage + fabs(mvControlling->RunningTraction.TractionVoltage)); // uśrednione napięcie - // sieci: przy spadku - // poniżej wartości - // minimalnej opóźnić - // rozruch o losowy - // czas + // sieci: przy spadku poniżej wartości minimalnej opóźnić rozruch o losowy czas if (fVoltage < mvControlling->EnginePowerSource.CollectorParameters .MinV) // gdy rozłączenie WS z powodu niskiego napięcia if (fActionTime >= 0) // jeśli czas oczekiwania nie został ustawiony diff --git a/Driver.h b/Driver.h index d33a2510..ea961098 100644 --- a/Driver.h +++ b/Driver.h @@ -320,9 +320,11 @@ class TController // procedury dotyczace rozkazow dla maszynisty void SetVelocity(double NewVel, double NewVelNext, TStopReason r = stopNone); // uaktualnia informacje o prędkości +/* bool SetProximityVelocity( double NewDist, double NewVelNext); // uaktualnia informacje o prędkości przy nastepnym semaforze +*/ public: void JumpToNextOrder(); void JumpToFirstOrder(); @@ -331,6 +333,7 @@ class TController inline TOrders OrderCurrentGet(); inline TOrders OrderNextGet(); bool CheckVehicles(TOrders user = Wait_for_orders); + int CheckDirection(); private: void CloseLog(); @@ -351,21 +354,22 @@ class TController void DirectionForward(bool forward); int OrderDirectionChange(int newdir, TMoverParameters *Vehicle); void Lights(int head, int rear); - double Distance(vector3 &p1, vector3 &n, vector3 &p2); +// double Distance(vector3 &p1, vector3 &n, vector3 &p2); private: // Ra: metody obsługujące skanowanie toru TEvent *CheckTrackEvent(double fDirection, TTrack *Track); - bool TableCheckEvent(TEvent *e); +// bool TableCheckEvent(TEvent *e); bool TableAddNew(); bool TableNotFound(TEvent const *Event) const; - void TableClear(); - TEvent *TableCheckTrackEvent(double fDirection, TTrack *Track); +// TEvent *TableCheckTrackEvent(double fDirection, TTrack *Track); void TableTraceRoute(double fDistance, TDynamicObject *pVehicle = NULL); void TableCheck(double fDistance); TCommandType TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc); void TablePurger(); public: std::size_t TableSize() const { return sSpeedTable.size(); } + void TableClear(); + int TableDirection() { return iTableDirection; } private: // Ra: stare funkcje skanujące, używane do szukania sygnalizatora z tyłu bool BackwardTrackBusy(TTrack *Track); diff --git a/Ground.cpp b/Ground.cpp index 7c6ab766..2ba293fa 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -50,6 +50,9 @@ extern "C" bool bCondition; // McZapkie: do testowania warunku na event multiple std::string LogComment; +// TODO: switch to the new unified code after we have in place merging of individual triangle nodes into material-based soups +#define EU07_USE_OLD_RENDERCODE + //--------------------------------------------------------------------------- // Obiekt renderujący siatkę jest sztucznie tworzonym obiektem pomocniczym, // grupującym siatki obiektów dla danej tekstury. Obiektami składowymi mogą @@ -289,145 +292,6 @@ void TGroundNode::RaRenderVBO() glDrawArrays(iType, iVboPtr, iNumVerts); // Narysuj naraz wszystkie trójkąty } -#ifdef EU07_USE_OLD_RENDERCODE -void TGroundNode::RenderVBO() { // renderowanie obiektu z VBO - faza nieprzezroczystych - - switch( iType ) { // obiekty renderowane niezależnie od odległości - case TP_SUBMODEL: - TSubModel::fSquareDist = 0; - GfxRenderer.Render( smTerrain ); - } - - double distancesquared = SquareMagnitude( pCenter - Global::pCameraPosition ) / Global::ZoomFactor; - if( ( distancesquared > ( fSquareRadius * Global::fDistanceFactor ) ) - || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { - return; - } - - switch( iType ) { - case TP_TRACK: { - if( iNumVerts ) - pTrack->RaRenderVBO( iVboPtr ); - return; - } - case TP_MODEL: { - Model->Render( &pCenter ); - return; - } - case TP_MEMCELL: { - GfxRenderer.Render( MemCell ); - return; - } - } - - if( ( iFlags & 0x10 ) || ( fLineThickness < 0 ) ) { - - if( ( iType == GL_LINES ) || ( iType == GL_LINE_STRIP ) || ( iType == GL_LINE_LOOP ) ) { - - if( iNumPts ) { - - float linealpha = 255000 * fLineThickness / ( distancesquared + 1.0 ); - if( linealpha > 255 ) - linealpha = 255; - float r, g, b; - r = floor( Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ); // w zaleznosci od koloru swiatla - g = floor( Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ); - b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); - glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii - GfxRenderer.Bind( 0 ); - - glDrawArrays( iType, iVboPtr, iNumPts ); // rysowanie linii - } - } - // GL_TRIANGLE etc - else { - if( iVboPtr >= 0 ) { - RaRenderVBO(); - } - } - - SetLastUsage( Timer::GetSimulationTime() ); - } -}; - -void TGroundNode::RenderAlphaVBO() -{ // renderowanie obiektu z VBO - faza przezroczystych - - double distancesquared = SquareMagnitude( pCenter - Global::pCameraPosition ) / Global::ZoomFactor; - if( ( distancesquared > ( fSquareRadius * Global::fDistanceFactor ) ) - || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { - return; - } - - switch( iType ) { - case TP_TRACTION: { - if( bVisible ) { - hvTraction->RenderVBO( distancesquared, iVboPtr ); - } - return; - } - case TP_MODEL: { - Model->RenderAlpha( &pCenter ); - return; - } - } - - // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 - if( ( iNumVerts && ( iFlags & 0x20 ) ) - || ( iNumPts && ( fLineThickness > 0 ) ) ) { - -#ifdef _PROBLEND - if( ( PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 - { - glDisable( GL_BLEND ); - glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - }; -#endif - - if( ( iType == GL_LINES ) - || ( iType == GL_LINE_STRIP ) - || ( iType == GL_LINE_LOOP ) ) { - - if( iNumPts ) { - - float linealpha = 255000 * fLineThickness / (distancesquared + 1.0); - if (linealpha > 255) - linealpha = 255; -#ifdef EU07_USE_OLD_LIGHTING_MODEL - r = Diffuse[ 0 ] * Global::ambientDayLight[ 0 ]; // w zaleznosci od koloru swiatla - g = Diffuse[ 1 ] * Global::ambientDayLight[ 1 ]; - b = Diffuse[ 2 ] * Global::ambientDayLight[ 2 ]; -#else - float r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla - float g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; - float b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; -#endif - glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii - GfxRenderer.Bind( 0 ); - - glDrawArrays( iType, iVboPtr, iNumPts ); // rysowanie linii - } - } - else { - if( iVboPtr >= 0 ) { - RaRenderVBO(); - } - } - - SetLastUsage( Timer::GetSimulationTime() ); - } - -#ifdef _PROBLEND - if( ( PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 - { - glEnable( GL_BLEND ); - glAlphaFunc( GL_GREATER, 0.04f ); - } -#endif -} - -#endif - void TGroundNode::Compile(bool many) { // tworzenie skompilowanej listy w wyświetlaniu DL if (!many) @@ -444,34 +308,32 @@ void TGroundNode::Compile(bool many) if ((iType == GL_LINES) || (iType == GL_LINE_STRIP) || (iType == GL_LINE_LOOP)) { glBegin(iType); - for (int i = 0; i < iNumPts; i++) + for (int i = 0; i < iNumPts; ++i) glVertex3dv(&Points[i].x); glEnd(); } else if (iType == GL_TRIANGLE_STRIP || iType == GL_TRIANGLE_FAN || iType == GL_TRIANGLES) { // jak nie linie, to trójkąty - TGroundNode *tri = this; - do - { // pętla po obiektach w grupie w celu połączenia siatek - // TODO: eliminate these calls, they're duplicated by setup part in the unified render function - glColor3ub(tri->Diffuse[0], tri->Diffuse[1], tri->Diffuse[2]); - GfxRenderer.Bind(Global::bWireFrame ? 0 : tri->TextureID); - - glBegin(Global::bWireFrame ? GL_LINE_LOOP : tri->iType); - for (int i = 0; i < tri->iNumVerts; i++) - { - glNormal3dv(&tri->Vertices[i].Normal.x); - glTexCoord2f(tri->Vertices[i].tu, tri->Vertices[i].tv); - glVertex3dv(&tri->Vertices[i].Point.x); - }; - glEnd(); - tri = NULL; // a jak nie, to koniec - } while (tri); + // TODO: eliminate these calls, they're duplicated by setup part in the unified render function +#ifdef EU07_USE_OLD_RENDERCODE + glColor3ub(Diffuse[0], Diffuse[1], Diffuse[2]); + GfxRenderer.Bind(TextureID); +#endif + glBegin(iType); + for (int i = 0; i < iNumVerts; ++i) + { + glNormal3dv(&Vertices[i].Normal.x); + glTexCoord2f(Vertices[i].tu, Vertices[i].tv); + glVertex3dv(&Vertices[i].Point.x); + }; + glEnd(); } else if (iType == TP_MESH) { // grupa ze wspólną teksturą - wrzucanie do wspólnego Display List +#ifdef EU07_USE_OLD_RENDERCODE if (TextureID) GfxRenderer.Bind(TextureID); // Ustaw aktywną teksturę +#endif TGroundNode *n = nNode; while (n ? n->TextureID == TextureID : false) { // wszystkie obiekty o tej samej testurze @@ -523,161 +385,6 @@ void TGroundNode::RenderHidden() } }; -#ifdef EU07_USE_OLD_RENDERCODE -void TGroundNode::RenderDL() -{ // wyświetlanie obiektu przez Display List - switch (iType) - { // obiekty renderowane niezależnie od odległości - case TP_SUBMODEL: - TSubModel::fSquareDist = 0; - GfxRenderer.Render( smTerrain ); - } - - double distancesquared = SquareMagnitude(pCenter - Global::pCameraPosition) / Global::ZoomFactor; - if( ( distancesquared > ( fSquareRadius * Global::fDistanceFactor ) ) - || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { - return; - } - - switch (iType) - { - case TP_TRACK: { - pTrack->Render(); - return; - } - case TP_MODEL: { - Model->Render( &pCenter ); - return; - } - case TP_MEMCELL: { - GfxRenderer.Render( MemCell ); - return; - } - } - - // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 - if ((iFlags & 0x10) || (fLineThickness < 0)) - { - if (!DisplayListID || (iVersion != Global::iReCompile)) // Ra: wymuszenie rekompilacji - { - Compile(); - if (Global::bManageNodes) - ResourceManager::Register(this); - }; - - if ((iType == GL_LINES) || (iType == GL_LINE_STRIP) || (iType == GL_LINE_LOOP)) - { // wszelkie linie są rysowane na samym końcu - if( iNumPts ) { - - float linealpha = 255000 * fLineThickness / ( distancesquared + 1.0 ); - if( linealpha > 255 ) - linealpha = 255; - float r, g, b; - r = floor( Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ); // w zaleznosci od koloru swiatla - g = floor( Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ); - b = floor( Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ); - glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii - GfxRenderer.Bind( 0 ); - - glCallList( DisplayListID ); - } - } - // GL_TRIANGLE etc - else - glCallList(DisplayListID); - - SetLastUsage(Timer::GetSimulationTime()); - }; -}; - -void TGroundNode::RenderAlphaDL() -{ - // SPOSOB NA POZBYCIE SIE RAMKI DOOKOLA TEXTURY ALPHA DLA OBIEKTOW ZAGNIEZDZONYCH W SCN JAKO - // NODE - - // W GROUND.H dajemy do klasy TGroundNode zmienna bool PROBLEND to samo robimy w klasie TGround - // nastepnie podczas wczytywania textury dla TRIANGLES w TGround::AddGroundNode - // sprawdzamy czy w nazwie jest @ i wg tego - // ustawiamy PROBLEND na true dla wlasnie wczytywanego trojkata (kazdy trojkat jest osobnym - // nodem) - // nastepnie podczas renderowania w bool TGroundNode::RenderAlpha() - // na poczatku ustawiamy standardowe GL_GREATER = 0.04 - // pozniej sprawdzamy czy jest wlaczony PROBLEND dla aktualnie renderowanego noda TRIANGLE, - // wlasciwie dla kazdego node'a - // i jezeli tak to odpowiedni GL_GREATER w przeciwnym wypadku standardowy 0.04 - - double distancesquared = SquareMagnitude( pCenter - Global::pCameraPosition ) / Global::ZoomFactor; - if( ( distancesquared > ( fSquareRadius * Global::fDistanceFactor ) ) - || ( distancesquared < ( fSquareMinRadius / Global::fDistanceFactor ) ) ) { - return; - } - - switch( iType ) { - case TP_TRACTION: { - if( bVisible ) - hvTraction->RenderDL( distancesquared ); - return; - } - case TP_MODEL: { - Model->RenderAlpha( &pCenter ); - return; - } - }; - - // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 - if( ( iNumVerts && ( iFlags & 0x20 ) ) - || ( iNumPts && ( fLineThickness > 0 ) ) ) { - -#ifdef _PROBLEND - if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 - { - glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.50f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - }; -#endif - if (!DisplayListID) //||Global::bReCompile) //Ra: wymuszenie rekompilacji - { - Compile(); - if (Global::bManageNodes) - ResourceManager::Register(this); - }; - - if( ( iType == GL_LINES ) - || ( iType == GL_LINE_STRIP ) - || ( iType == GL_LINE_LOOP ) ) { - - if( iNumPts ) { - - float linealpha = 255000 * fLineThickness / ( distancesquared + 1.0 ); - if (linealpha > 255) - linealpha = 255; - float r = Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ]; // w zaleznosci od koloru swiatla - float g = Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ]; - float b = Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ]; - glColor4ub( r, g, b, linealpha ); // przezroczystosc dalekiej linii - GfxRenderer.Bind( 0 ); - - glCallList( DisplayListID ); - } - } - // GL_TRIANGLE etc - else { - glCallList( DisplayListID ); - } - - SetLastUsage(Timer::GetSimulationTime()); - } - -#ifdef _PROBLEND - if ((PROBLEND)) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 - { - glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); - } -#endif -} -#endif - //------------------------------------------------------------------------------ //------------------ Podstawowy pojemnik terenu - sektor ----------------------- //------------------------------------------------------------------------------ @@ -701,7 +408,6 @@ void TSubRect::NodeAdd(TGroundNode *Node) // nRenderAlpha - lista grup renderowanych z własnych VBO albo DL z przezroczystością // nRenderWires - lista grup renderowanych z własnych VBO albo DL - druty i linie // nMeshed - obiekty do pogrupowania wg tekstur - GLuint t; // pomocniczy kod tekstury switch (Node->iType) { case TP_SOUND: // te obiekty są sprawdzanie niezależnie od kierunku patrzenia @@ -720,7 +426,7 @@ void TSubRect::NodeAdd(TGroundNode *Node) else { // tory nieruchome mogą być pogrupowane wg tekstury, przy VBO wszystkie Node->TextureID = Node->pTrack->TextureGet(0); // pobranie tekstury do sortowania - t = Node->pTrack->TextureGet(1); + GLuint t = Node->pTrack->TextureGet(1); if (Node->TextureID) // jeżeli jest pierwsza { if (t && (Node->TextureID != t)) @@ -757,6 +463,7 @@ void TSubRect::NodeAdd(TGroundNode *Node) Node->nNext3 = nRenderRectAlpha; nRenderRectAlpha = Node; } // DL: do przezroczystych z sektora +#ifdef EU07_USE_OLD_RENDERCODE else if (Global::bUseVBO) { Node->nNext3 = nRenderRect; @@ -767,23 +474,12 @@ void TSubRect::NodeAdd(TGroundNode *Node) Node->nNext3 = nRender; nRender = Node; } // DL: do nieprzezroczystych wszelakich - /* - //Ra: na razie wyłączone do testów VBO - //if - ((Node->iType==GL_TRIANGLE_STRIP)||(Node->iType==GL_TRIANGLE_FAN)||(Node->iType==GL_TRIANGLES)) - if (Node->fSquareMinRadius==0.0) //znikające z bliska nie mogą być optymalizowane - if (Node->fSquareRadius>=160000.0) //tak od 400m to już normalne trójkąty muszą być - //if (Node->iFlags&0x10) //i nieprzezroczysty - {if (pTriGroup) //jeżeli był już jakiś grupujący - {if (pTriGroup->fSquareRadius>Node->fSquareRadius) //i miał większy zasięg - Node->fSquareRadius=pTriGroup->fSquareRadius; //zwiększenie zakresu widoczności - grupującego - pTriGroup->pTriGroup=Node; //poprzedniemu doczepiamy nowy - } - Node->pTriGroup=Node; //nowy lider ma się sam wyświetlać - wskaźnik na siebie - pTriGroup=Node; //zapamiętanie lidera - } - */ +#else + else { + Node->nNext3 = nRenderRect; + nRenderRect = Node; + } // do nieprzezroczystych z sektora +#endif break; case TP_TRACTION: case GL_LINES: @@ -834,6 +530,7 @@ void TSubRect::RaNodeAdd(TGroundNode *Node) switch (Node->iType) { case TP_TRACK: +#ifdef EU07_USE_OLD_RENDERCODE if (Global::bUseVBO) { Node->nNext3 = nRenderRect; @@ -844,6 +541,10 @@ void TSubRect::RaNodeAdd(TGroundNode *Node) Node->nNext3 = nRender; nRender = Node; } // DL: do nieprzezroczystych +#else + Node->nNext3 = nRenderRect; + nRenderRect = Node; +#endif break; case GL_TRIANGLE_STRIP: case GL_TRIANGLE_FAN: @@ -853,6 +554,7 @@ void TSubRect::RaNodeAdd(TGroundNode *Node) Node->nNext3 = nRenderRectAlpha; nRenderRectAlpha = Node; } // DL: do przezroczystych z sektora +#ifdef EU07_USE_OLD_RENDERCODE else if (Global::bUseVBO) { Node->nNext3 = nRenderRect; @@ -863,6 +565,12 @@ void TSubRect::RaNodeAdd(TGroundNode *Node) Node->nNext3 = nRender; nRender = Node; } // DL: do nieprzezroczystych wszelakich +#else + else { + Node->nNext3 = nRenderRect; + nRenderRect = Node; + } // do nieprzezroczystych z sektora +#endif break; case TP_MODEL: // modele zawsze wyświetlane z własnego VBO if ((Node->iFlags & 0x20200020) == 0) // czy brak przezroczystości? @@ -1003,7 +711,7 @@ bool TSubRect::RaTrackAnimAdd(TTrack *t) void TSubRect::RaAnimate() { // wykonanie animacji - if( !tTrackAnim ) { + if( tTrackAnim == nullptr ) { // nie ma nic do animowania return; } @@ -1075,7 +783,7 @@ void TSubRect::LoadNodes() } n = n->nNext2; // następny z sektora } - if (!m_nVertexCount) + if (m_nVertexCount <= 0) return; // jeśli nie ma obiektów do wyświetlenia z VBO, to koniec if (Global::bUseVBO) { // tylko liczenie wierzchołów, gdy nie ma VBO @@ -1146,6 +854,12 @@ void TSubRect::RenderDL() { // renderowanie nieprzezroczystych (DL) TGroundNode *node; RaAnimate(); // przeliczenia animacji torów w sektorze +/* + LoadNodes(); // czemu tutaj? +*/ + for( node = nRenderRect; node; node = node->nNext3 ) { + GfxRenderer.Render( node ); // nieprzezroczyste obiekty terenu + } for( node = nRender; node; node = node->nNext3 ) GfxRenderer.Render( node ); // nieprzezroczyste obiekty (oprócz pojazdów) for (node = nRenderMixed; node; node = node->nNext3) @@ -1160,44 +874,6 @@ void TSubRect::RenderDL() } } #endif -/* - float width = 100.0f; - float height = 25.0f; - float3 vTopLeftFront( m_area.center.x - width, m_area.center.y + height, m_area.center.z + width ); - float3 vTopLeftBack( m_area.center.x - width, m_area.center.y + height, m_area.center.z - width ); - float3 vTopRightBack( m_area.center.x + width, m_area.center.y + height, m_area.center.z - width ); - float3 vTopRightFront( m_area.center.x + width, m_area.center.y + height, m_area.center.z + width ); - - float3 vBottom_LeftFront( m_area.center.x - width, m_area.center.y - height, m_area.center.z + width ); - float3 vBottom_LeftBack( m_area.center.x - width, m_area.center.y - height, m_area.center.z - width ); - float3 vBottomRightBack( m_area.center.x + width, m_area.center.y - height, m_area.center.z - width ); - float3 vBottomRightFront( m_area.center.x + width, m_area.center.y - height, m_area.center.z + width ); - - glDisable( GL_LIGHTING ); - glDisable( GL_TEXTURE_2D ); - glColor3ub( 255, 255, (iTracks ? 0 : 255) ); - glBegin( GL_LINE_LOOP ); - glVertex3fv( &vTopLeftFront.x ); - glVertex3fv( &vTopLeftBack.x ); - glVertex3fv( &vTopRightBack.x ); - glVertex3fv( &vTopRightFront.x ); - glEnd(); - glBegin( GL_LINE_LOOP ); - glVertex3fv( &vBottom_LeftFront.x ); - glVertex3fv( &vBottom_LeftBack.x ); - glVertex3fv( &vBottomRightBack.x ); - glVertex3fv( &vBottomRightFront.x ); - glEnd(); - glBegin( GL_LINES ); - glVertex3fv( &vTopLeftFront.x ); glVertex3fv( &vBottom_LeftFront.x ); - glVertex3fv( &vTopLeftBack.x ); glVertex3fv( &vBottom_LeftBack.x ); - glVertex3fv( &vTopRightBack.x ); glVertex3fv( &vBottomRightBack.x ); - glVertex3fv( &vTopRightFront.x ); glVertex3fv( &vBottomRightFront.x ); - glEnd(); - glColor3ub( 255, 255, 255 ); - glEnable( GL_TEXTURE_2D ); - glEnable( GL_LIGHTING ); -*/ }; void TSubRect::RenderAlphaDL() @@ -1215,7 +891,9 @@ void TSubRect::RenderVBO() { // renderowanie nieprzezroczystych (VBO) TGroundNode *node; RaAnimate(); // przeliczenia animacji torów w sektorze +/* LoadNodes(); // czemu tutaj? +*/ if (StartVBO()) { for( node = nRenderRect; node; node = node->nNext3 ) @@ -1285,6 +963,7 @@ TGroundRect::Init() { void TGroundRect::RenderDL() { // renderowanie kwadratu kilometrowego (DL), jeśli jeszcze nie zrobione +#ifdef EU07_USE_OLD_RENDERCODE if (iLastDisplay != iFrameNumber) { // tylko jezeli dany kwadrat nie był jeszcze renderowany // for (TGroundNode* node=pRender;node;node=node->pNext3) @@ -1307,6 +986,18 @@ void TGroundRect::RenderDL() GfxRenderer.Render( nRootMesh ); iLastDisplay = iFrameNumber; // drugi raz nie potrzeba } +#else + if( iLastDisplay != iFrameNumber ) { // tylko jezeli dany kwadrat nie był jeszcze renderowany + LoadNodes(); // ewentualne tworzenie siatek + if( nRenderRect ) { + for( TGroundNode *node = nRenderRect; node; node = node->nNext3 ) // następny tej grupy + GfxRenderer.Render( node ); // nieprzezroczyste trójkąty kwadratu kilometrowego + } + if( nRootMesh ) + GfxRenderer.Render( nRootMesh ); + iLastDisplay = iFrameNumber; + } +#endif }; void TGroundRect::RenderVBO() @@ -1314,10 +1005,14 @@ void TGroundRect::RenderVBO() if (iLastDisplay != iFrameNumber) { // tylko jezeli dany kwadrat nie był jeszcze renderowany LoadNodes(); // ewentualne tworzenie siatek - if (StartVBO()) + if ( nRenderRect && StartVBO()) { for (TGroundNode *node = nRenderRect; node; node = node->nNext3) // następny tej grupy +#ifdef EU07_USE_OLD_RENDERCODE node->RaRenderVBO(); // nieprzezroczyste trójkąty kwadratu kilometrowego +#else + GfxRenderer.Render( node ); // nieprzezroczyste trójkąty kwadratu kilometrowego +#endif EndVBO(); iLastDisplay = iFrameNumber; } @@ -4619,220 +4314,6 @@ bool TGround::GetTraction(TDynamicObject *model) return true; }; -bool -TGround::Render( Math3D::vector3 const &Camera ) { - - GfxRenderer.Update_Lights( m_lights ); - - if( Global::bUseVBO ) { // renderowanie przez VBO - if( !RenderVBO( Camera ) ) - return false; - if( !RenderAlphaVBO( Camera ) ) - return false; - } - else { - // renderowanie przez Display List - if( !RenderDL( Camera ) ) - return false; - if( !RenderAlphaDL( Camera ) ) - return false; - } - return true; -} - -bool TGround::RenderDL(vector3 pPosition) -{ // renderowanie scenerii z Display List - faza nieprzezroczystych - glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.50f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) - CameraDirection.x = sin(Global::pCameraRotation); // wektor kierunkowy - CameraDirection.z = cos(Global::pCameraRotation); - TGroundNode *node; - glColor3f(1.0f, 1.0f, 1.0f); - glEnable(GL_LIGHTING); - int n = 2 * iNumSubRects; //(2*==2km) promień wyświetlanej mapy w sektorach - int c = GetColFromX(pPosition.x); - int r = GetRowFromZ(pPosition.z); - TSubRect *tmp; - for (node = srGlobal.nRenderHidden; node; node = node->nNext3) - node->RenderHidden(); // rednerowanie globalnych (nie za często?) - int i, j, k; - // renderowanie czołgowe dla obiektów aktywnych a niewidocznych - for (j = r - n; j <= r + n; j++) - for (i = c - n; i <= c + n; i++) - if ((tmp = FastGetSubRect(i, j)) != NULL) - { - tmp->LoadNodes(); // oznaczanie aktywnych sektorów - for (node = tmp->nRenderHidden; node; node = node->nNext3) - node->RenderHidden(); - tmp->RenderSounds(); // jeszcze dźwięki pojazdów by się przydały, również - // niewidocznych - } - // renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - iRendered = 0; // ilość renderowanych sektorów - vector3 direction; - for (k = 0; k < Global::iSegmentsRendered; ++k) // sektory w kolejności odległości - { // przerobione na użycie SectorOrder - i = SectorOrder[k].x; // na starcie oba >=0 - j = SectorOrder[k].y; - do - { - if (j <= 0) - i = -i; // pierwszy przebieg: j<=0, i>=0; drugi: j>=0, i<=0; trzeci: j<=0, i<=0 - // czwarty: j>=0, i>=0; - j = -j; // i oraz j musi być zmienione wcześniej, żeby continue działało - direction = vector3(i, 0, j); // wektor od kamery do danego sektora - if (LengthSquared3(direction) > 5) // te blisko są zawsze wyświetlane - { - direction = SafeNormalize(direction); // normalizacja - if (CameraDirection.x * direction.x + CameraDirection.z * direction.z < 0.55) - continue; // pomijanie sektorów poza kątem patrzenia - } - // NOTE: terrain data is disabled, as it's moved to the renderer - Rects[(i + c) / iNumSubRects][(j + r) / iNumSubRects] - .RenderDL(); // kwadrat kilometrowy nie zawsze, bo szkoda FPS - if ((tmp = FastGetSubRect(i + c, j + r)) != NULL) - if (tmp->iNodeCount) // o ile są jakieś obiekty, bo po co puste sektory przelatywać - pRendered[iRendered++] = tmp; // tworzenie listy sektorów do renderowania - } while ((i < 0) || (j < 0)); // są 4 przypadki, oprócz i=j=0 - } - for (i = 0; i < iRendered; i++) - pRendered[i]->RenderDL(); // renderowanie nieprzezroczystych - return true; -} - -bool TGround::RenderAlphaDL(vector3 pPosition) -{ // renderowanie scenerii z Display List - faza przezroczystych - glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - TGroundNode *node; - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - TSubRect *tmp; - // Ra: renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - int i; - for (i = iRendered - 1; i >= 0; --i) // od najdalszych - { // przezroczyste trójkąty w oddzielnym cyklu przed modelami - tmp = pRendered[i]; - for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) - GfxRenderer.Render_Alpha( node ); // przezroczyste modele - } - for (i = iRendered - 1; i >= 0; --i) // od najdalszych - { // renderowanie przezroczystych modeli oraz pojazdów - pRendered[i]->RenderAlphaDL(); - } - glDisable(GL_LIGHTING); // linie nie powinny świecić - for (i = iRendered - 1; i >= 0; --i) // od najdalszych - { // druty na końcu, żeby się nie robiły białe plamy na tle lasu - tmp = pRendered[i]; - for( node = tmp->nRenderWires; node; node = node->nNext3 ) - GfxRenderer.Render_Alpha( node ); // druty - } - return true; -} - -bool TGround::RenderVBO(vector3 pPosition) -{ // renderowanie scenerii z VBO - faza nieprzezroczystych - glDisable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.50f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek - CameraDirection.x = sin(Global::pCameraRotation); // wektor kierunkowy - CameraDirection.z = cos(Global::pCameraRotation); - TGroundNode *node; - glColor3f(1.0f, 1.0f, 1.0f); - glEnable(GL_LIGHTING); - int n = 2 * iNumSubRects; //(2*==2km) promień wyświetlanej mapy w sektorach - int c = GetColFromX(pPosition.x); - int r = GetRowFromZ(pPosition.z); - TSubRect *tmp; - for (node = srGlobal.nRenderHidden; node; node = node->nNext3) - node->RenderHidden(); // rednerowanie globalnych (nie za często?) - int i, j, k; - // renderowanie czołgowe dla obiektów aktywnych a niewidocznych - for (j = r - n; j <= r + n; j++) - for (i = c - n; i <= c + n; i++) - { - if ((tmp = FastGetSubRect(i, j)) != NULL) - { - for (node = tmp->nRenderHidden; node; node = node->nNext3) - node->RenderHidden(); - tmp->RenderSounds(); // jeszcze dźwięki pojazdów by się przydały, również - // niewidocznych - } - } - // renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - iRendered = 0; // ilość renderowanych sektorów - vector3 direction; - for (k = 0; k < Global::iSegmentsRendered; ++k) // sektory w kolejności odległości - { // przerobione na użycie SectorOrder - i = SectorOrder[k].x; // na starcie oba >=0 - j = SectorOrder[k].y; - do - { - if (j <= 0) - i = -i; // pierwszy przebieg: j<=0, i>=0; drugi: j>=0, i<=0; trzeci: j<=0, i<=0 - // czwarty: j>=0, i>=0; - j = -j; // i oraz j musi być zmienione wcześniej, żeby continue działało - direction = vector3(i, 0, j); // wektor od kamery do danego sektora - if (LengthSquared3(direction) > 5) // te blisko są zawsze wyświetlane - { - direction = SafeNormalize(direction); // normalizacja - if (CameraDirection.x * direction.x + CameraDirection.z * direction.z < 0.55) - continue; // pomijanie sektorów poza kątem patrzenia - } - Rects[(i + c) / iNumSubRects][(j + r) / iNumSubRects] - .RenderVBO(); // kwadrat kilometrowy nie zawsze, bo szkoda FPS - if ((tmp = FastGetSubRect(i + c, j + r)) != NULL) - if (tmp->iNodeCount) // jeżeli są jakieś obiekty, bo po co puste sektory przelatywać - pRendered[iRendered++] = tmp; // tworzenie listy sektorów do renderowania - } while ((i < 0) || (j < 0)); // są 4 przypadki, oprócz i=j=0 - } - // dodać rednerowanie terenu z E3D - jedno VBO jest używane dla całego modelu, chyba że jest ich - // więcej - if (Global::pTerrainCompact) - Global::pTerrainCompact->TerrainRenderVBO(TGroundRect::iFrameNumber); - for (i = 0; i < iRendered; i++) - { // renderowanie nieprzezroczystych - pRendered[i]->RenderVBO(); - } - return true; -} - -bool TGround::RenderAlphaVBO(vector3 pPosition) -{ // renderowanie scenerii z VBO - faza przezroczystych - glEnable(GL_BLEND); - glAlphaFunc(GL_GREATER, 0.04f); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - TGroundNode *node; - glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - TSubRect *tmp; - int i; - for (i = iRendered - 1; i >= 0; --i) // od najdalszych - { // renderowanie przezroczystych trójkątów sektora - tmp = pRendered[i]; - tmp->LoadNodes(); // ewentualne tworzenie siatek - if (tmp->StartVBO()) - { - for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) - if( node->iVboPtr >= 0 ) - GfxRenderer.Render_Alpha( node ); // nieprzezroczyste obiekty terenu - tmp->EndVBO(); - } - } - for (i = iRendered - 1; i >= 0; --i) // od najdalszych - pRendered[i]->RenderAlphaVBO(); // przezroczyste modeli oraz pojazdy - glDisable(GL_LIGHTING); // linie nie powinny świecić - for (i = iRendered - 1; i >= 0; --i) // od najdalszych - { // druty na końcu, żeby się nie robiły białe plamy na tle lasu - tmp = pRendered[i]; - if (tmp->StartVBO()) - { - for( node = tmp->nRenderWires; node; node = node->nNext3 ) - GfxRenderer.Render_Alpha( node ); // przezroczyste modele - tmp->EndVBO(); - } - } - return true; -}; - #ifdef _WINDOWS //--------------------------------------------------------------------------- void TGround::Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) diff --git a/Ground.h b/Ground.h index 2fe2b4d6..ee20b738 100644 --- a/Ground.h +++ b/Ground.h @@ -97,8 +97,6 @@ struct TGroundVertex } }; -class TSubRect; // sektor (aktualnie 200m×200m, ale może być zmieniony) - class TGroundNode : public Resource { // obiekt scenerii @@ -216,8 +214,7 @@ class TSubRect : public Resource, public CMesh void Sort(); // optymalizacja obiektów w sektorze (sortowanie wg tekstur) TTrack * FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude); TTraction * FindTraction(vector3 *Point, int &iConnection, TTraction *Exclude); - bool StartVBO(); // ustwienie VBO sektora dla (nRenderRect), (nRenderRectAlpha) i - // (nRenderWires) + bool StartVBO(); // ustwienie VBO sektora dla (nRenderRect), (nRenderRectAlpha) i (nRenderWires) bool RaTrackAnimAdd(TTrack *t); // zgłoszenie toru do animacji void RaAnimate(); // przeliczenie animacji torów void RenderDL(); // renderowanie nieprzezroczystych w Display Lists @@ -335,11 +332,6 @@ class TGround void Update_Lights(); // updates scene lights array bool AddToQuery(TEvent *Event, TDynamicObject *Node); bool GetTraction(TDynamicObject *model); - bool Render( Math3D::vector3 const &Camera ); - bool RenderDL(vector3 pPosition); - bool RenderAlphaDL(vector3 pPosition); - bool RenderVBO(vector3 pPosition); - bool RenderAlphaVBO(vector3 pPosition); bool CheckQuery(); TGroundNode * DynamicFindAny(std::string asNameToFind); TGroundNode * DynamicFind(std::string asNameToFind); diff --git a/Track.cpp b/Track.cpp index 9769f613..17cbef7f 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2659,8 +2659,8 @@ bool TTrack::Switch(int i, double t, double d) true) // jeśli nie dodane do animacji { // nie ma się co bawić SwitchExtension->fOffset = SwitchExtension->fDesiredOffset; - RaAnimate(); // przeliczenie położenia iglic; czy zadziała na niewyświetlanym - // sektorze w VBO? + // przeliczenie położenia iglic; czy zadziała na niewyświetlanym sektorze w VBO? + RaAnimate(); } return true; } @@ -2809,8 +2809,8 @@ void TTrack::RaAnimListAdd(TTrack *t) TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) { // wykonanie rekurencyjne animacji, wywoływane przed wyświetleniem sektora // zwraca wskaźnik toru wymagającego dalszej animacji - if (SwitchExtension->pNextAnim) - SwitchExtension->pNextAnim = SwitchExtension->pNextAnim->RaAnimate(); + if( SwitchExtension->pNextAnim ) + SwitchExtension->pNextAnim = SwitchExtension->pNextAnim->RaAnimate( Vertexbuffer ); bool m = true; // animacja trwa if (eType == tt_Switch) // dla zwrotnicy tylko szyny { diff --git a/Train.cpp b/Train.cpp index b5525474..262f1c0c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5802,14 +5802,12 @@ bool TTrain::CabChange(int iDirection) DynamicObject->asBaseDir + DynamicObject->MoverParameters->TypeName + ".mmd")) { // zmiana kabiny w ramach tego samego pojazdu - DynamicObject->MoverParameters - ->CabActivisation(); // załączenie rozrządu (wirtualne kabiny) + DynamicObject->MoverParameters->CabActivisation(); // załączenie rozrządu (wirtualne kabiny) + DynamicObject->Mechanik->CheckVehicles( Change_direction ); return true; // udało się zmienić kabinę } - DynamicObject->MoverParameters->CabActivisation(); // aktywizacja - // poprzedniej, bo - // jeszcze nie wiadomo, - // czy jakiś pojazd jest + // aktywizacja poprzedniej, bo jeszcze nie wiadomo, czy jakiś pojazd jest + DynamicObject->MoverParameters->CabActivisation(); } return false; // ewentualna zmiana pojazdu } diff --git a/World.cpp b/World.cpp index b7a11860..5ca62383 100644 --- a/World.cpp +++ b/World.cpp @@ -620,10 +620,6 @@ void TWorld::OnKeyDown(int cKey) else { glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); } -/* - ++Global::iReCompile; // odświeżyć siatki - // Ra: jeszcze usunąć siatki ze skompilowanych obiektów! -*/ } } break; @@ -1750,9 +1746,12 @@ TWorld::Update_UI() { UITable->text_lines.emplace_back( Global::Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), - ( ( owner->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) ? - float4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono - Global::UITextColor ) + ( ( owner->iStationStart < table->StationIndex ) + && ( i < table->StationIndex ) + && ( time.wHour >= tableline->Dh ) + && ( time.wMinute >= tableline->Dm ) ? + float4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono + Global::UITextColor ) ); // divider/footer UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global::UITextColor ); @@ -1995,9 +1994,11 @@ TWorld::Update_UI() { + GfxRenderer.Info(); // dump last opengl error, if any - GLenum glerror = glGetError(); + GLenum glerror = ::glGetError(); if( glerror != GL_NO_ERROR ) { - Global::LastGLError = to_string( glerror ) + " (" + Global::Bezogonkow( (char *)gluErrorString( glerror ) ) + ")"; + std::string glerrorstring( (char *)::gluErrorString( glerror ) ); + win1250_to_ascii( glerrorstring ); + Global::LastGLError = std::to_string( glerror ) + " (" + glerrorstring + ")"; } if( false == Global::LastGLError.empty() ) { uitextline3 = diff --git a/renderer.cpp b/renderer.cpp index bf92c7b9..2fe2ede1 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "timer.h" #include "world.h" +#include "data.h" #include "dynobj.h" #include "animmodel.h" #include "traction.h" @@ -146,7 +147,7 @@ opengl_renderer::Render() { m_camera.update_frustum(); Render( &World.Environment ); - World.Ground.Render( World.Camera.Pos ); + Render( &World.Ground ); World.Render_Cab(); @@ -293,7 +294,7 @@ opengl_renderer::Render( world_environment *Environment ) { bool opengl_renderer::Render( TGround *Ground ) { - +/* glDisable( GL_BLEND ); glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f glEnable( GL_LIGHTING ); @@ -315,8 +316,102 @@ opengl_renderer::Render( TGround *Ground ) { } } } +*/ + ::glEnable( GL_LIGHTING ); + ::glDisable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + ::glColor3f( 1.0f, 1.0f, 1.0f ); + + ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) + + Update_Lights( Ground->m_lights ); + + Ground->CameraDirection.x = std::sin( Global::pCameraRotation ); // wektor kierunkowy + Ground->CameraDirection.z = std::cos( Global::pCameraRotation ); + TGroundNode *node; + // rednerowanie globalnych (nie za często?) + for( node = Ground->srGlobal.nRenderHidden; node; node = node->nNext3 ) { + node->RenderHidden(); + } + // renderowanie czołgowe dla obiektów aktywnych a niewidocznych + int n = 2 * iNumSubRects; //(2*==2km) promień wyświetlanej mapy w sektorach + int c = Ground->GetColFromX( Global::pCameraPosition.x ); + int r = Ground->GetRowFromZ( Global::pCameraPosition.z ); + TSubRect *tmp; + int i, j, k; + for( j = r - n; j <= r + n; j++ ) { + for( i = c - n; i <= c + n; i++ ) { + if( ( tmp = Ground->FastGetSubRect( i, j ) ) != nullptr ) { + // oznaczanie aktywnych sektorów + tmp->LoadNodes(); + + for( node = tmp->nRenderHidden; node; node = node->nNext3 ) { + node->RenderHidden(); + } + // jeszcze dźwięki pojazdów by się przydały, również niewidocznych + tmp->RenderSounds(); + } + } + } + // renderowanie progresywne - zależne od FPS oraz kierunku patrzenia + Ground->iRendered = 0; // ilość renderowanych sektorów + Math3D::vector3 direction; + for( k = 0; k < Global::iSegmentsRendered; ++k ) // sektory w kolejności odległości + { // przerobione na użycie SectorOrder + i = SectorOrder[ k ].x; // na starcie oba >=0 + j = SectorOrder[ k ].y; + do { + // pierwszy przebieg: j<=0, i>=0; drugi: j>=0, i<=0; trzeci: j<=0, i<=0 czwarty: j>=0, i>=0; + if( j <= 0 ) + i = -i; + j = -j; // i oraz j musi być zmienione wcześniej, żeby continue działało + direction = Math3D::vector3( i, 0, j ); // wektor od kamery do danego sektora + if( Math3D::LengthSquared3( direction ) > 5 ) // te blisko są zawsze wyświetlane + { + direction = Math3D::SafeNormalize( direction ); // normalizacja + if( Ground->CameraDirection.x * direction.x + Ground->CameraDirection.z * direction.z < 0.55 ) + continue; // pomijanie sektorów poza kątem patrzenia + } + // kwadrat kilometrowy nie zawsze, bo szkoda FPS + if( Global::bUseVBO ) { + // vbo render path + Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].RenderVBO(); + } + else { + // display list render path + Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].RenderDL(); + } + if( ( tmp = Ground->FastGetSubRect( i + c, j + r ) ) != nullptr ) { + if( tmp->iNodeCount ) { + // o ile są jakieś obiekty, bo po co puste sektory przelatywać + Ground->pRendered[ Ground->iRendered++ ] = tmp; // tworzenie listy sektorów do renderowania + } + } + } while( ( i < 0 ) || ( j < 0 ) ); // są 4 przypadki, oprócz i=j=0 + } + + // dodać renderowanie terenu z E3D - jedno VBO jest używane dla całego modelu, chyba że jest ich więcej + if( Global::bUseVBO ) { + if( Global::pTerrainCompact ) { + Global::pTerrainCompact->TerrainRenderVBO( TGroundRect::iFrameNumber ); + } + } + + // renderowanie nieprzezroczystych + for( i = 0; i < Ground->iRendered; ++i ) { + if( Global::bUseVBO ) { + // vbo render path + Ground->pRendered[ i ]->RenderVBO(); + } + else { + // display list render path + Ground->pRendered[ i ]->RenderDL(); + } + } + + // regular render takes care of all solid geometry present in the scene, thus we can launch alpha parts render here + return Render_Alpha( Ground ); - return true; } bool @@ -431,7 +526,12 @@ opengl_renderer::Render( TGroundNode *Node ) { } else { // display list render path - ::glCallList( Node->DisplayListID ); + if( Node->DisplayListID != 0 ) { + ::glCallList( Node->DisplayListID ); + } + else { + return false; + } } return true; } @@ -730,6 +830,75 @@ opengl_renderer::Render( TMemCell *Memcell ) { ::glPopAttrib(); } +bool +opengl_renderer::Render_Alpha( TGround *Ground ) { + + // legacy version of the code: + ::glEnable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.04f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + ::glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); + + TGroundNode *node; + TSubRect *tmp; + // Ra: renderowanie progresywne - zależne od FPS oraz kierunku patrzenia + for( int i = Ground->iRendered - 1; i >= 0; --i ) // od najdalszych + { // przezroczyste trójkąty w oddzielnym cyklu przed modelami + tmp = Ground->pRendered[ i ]; + if( Global::bUseVBO ) { + // vbo render path + if( tmp->StartVBO() ) { + for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { + if( node->iVboPtr >= 0 ) { + Render_Alpha( node ); + } + } + tmp->EndVBO(); + } + } + else { + // display list render path + for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { + Render_Alpha( node ); + } + } + } + for( int i = Ground->iRendered - 1; i >= 0; --i ) // od najdalszych + { // renderowanie przezroczystych modeli oraz pojazdów + if( Global::bUseVBO ) { + // vbo render path + Ground->pRendered[ i ]->RenderAlphaVBO(); + } + else { + // display list render path + Ground->pRendered[ i ]->RenderAlphaDL(); + } + } + + ::glDisable( GL_LIGHTING ); // linie nie powinny świecić + + for( int i = Ground->iRendered - 1; i >= 0; --i ) // od najdalszych + { // druty na końcu, żeby się nie robiły białe plamy na tle lasu + tmp = Ground->pRendered[ i ]; + if( Global::bUseVBO ) { + // vbo render path + if( tmp->StartVBO() ) { + for( node = tmp->nRenderWires; node; node = node->nNext3 ) { + Render_Alpha( node ); + } + tmp->EndVBO(); + } + } + else { + // display list render path + for( node = tmp->nRenderWires; node; node = node->nNext3 ) { + Render_Alpha( node ); // druty + } + } + } + + return true; +} + // NOTE: legacy render system switch #define _PROBLEND diff --git a/renderer.h b/renderer.h index d14f2995..65531612 100644 --- a/renderer.h +++ b/renderer.h @@ -136,6 +136,8 @@ public: Render( TSubModel *Submodel ); void Render( TMemCell *Memcell ); + bool + Render_Alpha( TGround *Ground ); bool Render_Alpha( TGroundNode *Node ); bool diff --git a/version.h b/version.h index 866a8597..5ecf5416 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 516 +#define VERSION_MINOR 517 #define VERSION_REVISION 0 From 93787db20d0792396ab93bd302be87a33167df90 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 19 May 2017 13:31:26 +0200 Subject: [PATCH 107/426] replaced char parameters in sound system with stl string --- DynObj.cpp | 2 +- FadeSound.cpp | 2 +- FadeSound.h | 2 +- Ground.cpp | 12 ++++- McZapkie/mctools.cpp | 95 +---------------------------------- McZapkie/mctools.h | 5 -- MdlMngr.cpp | 3 +- MdlMngr.h | 8 +-- Model3d.cpp | 58 ++++++++++++++++++---- RealSound.cpp | 29 ++--------- Sound.cpp | 116 ++++++++++--------------------------------- Sound.h | 38 +++++--------- Train.cpp | 50 +++++++++---------- VBO.cpp | 20 ++++++++ VBO.h | 7 +++ usefull.h | 24 +++++---- wavread.cpp | 33 +++--------- wavread.h | 10 ++-- 18 files changed, 184 insertions(+), 330 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 05d458ca..47e6e18b 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -5072,7 +5072,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // plik z przyspieszaczem (upust po zlapaniu hamowania) // sBrakeAcc.Init(str.c_str(),Parser->GetNextSymbol().ToDouble(),GetPosition().x,GetPosition().y,GetPosition().z,true); parser.getTokens( 1, false ); parser >> token; - sBrakeAcc = TSoundsManager::GetFromName( token.c_str(), true ); + sBrakeAcc = TSoundsManager::GetFromName( token, true ); bBrakeAcc = true; // sBrakeAcc.AM=1.0; // sBrakeAcc.AA=0.0; diff --git a/FadeSound.cpp b/FadeSound.cpp index c45d0176..fff7273f 100644 --- a/FadeSound.cpp +++ b/FadeSound.cpp @@ -25,7 +25,7 @@ void TFadeSound::Free() { } -void TFadeSound::Init(char *Name, float fNewFade) +void TFadeSound::Init(std::string const &Name, float fNewFade) { Sound = TSoundsManager::GetFromName(Name, false); if (Sound) diff --git a/FadeSound.h b/FadeSound.h index 4c93054c..6ce4e1b0 100644 --- a/FadeSound.h +++ b/FadeSound.h @@ -24,7 +24,7 @@ class TFadeSound public: TFadeSound(); ~TFadeSound(); - void Init(char *Name, float fNewFade); + void Init(std::string const &Name, float fNewFade); void TurnOn(); void TurnOff(); bool Playing() diff --git a/Ground.cpp b/Ground.cpp index 2ba293fa..d1ed6969 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -823,11 +823,19 @@ void TSubRect::LoadNodes() break; case TP_TRACK: if (n->iNumVerts) // bo tory zabezpieczające są niewidoczne - n->pTrack->RaArrayFill(m_pVNT + n->iVboPtr, m_pVNT); +#ifdef EU07_USE_OLD_VERTEXBUFFER + n->pTrack->RaArrayFill( m_pVNT + n->iVboPtr, m_pVNT ); +#else + n->pTrack->RaArrayFill(m_pVNT.data() + n->iVboPtr, m_pVNT.data()); +#endif break; case TP_TRACTION: if (n->iNumVerts) // druty mogą być niewidoczne...? - n->hvTraction->RaArrayFill(m_pVNT + n->iVboPtr); +#ifdef EU07_USE_OLD_VERTEXBUFFER + n->hvTraction->RaArrayFill( m_pVNT + n->iVboPtr ); +#else + n->hvTraction->RaArrayFill(m_pVNT.data() + n->iVboPtr); +#endif break; } n = n->nNext2; // następny z sektora diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index 37c8b148..42f6b17d 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -144,98 +144,6 @@ bool FuzzyLogicAI(double Test, double Threshold, double Probability) return false; } -std::string ReadWord(std::ifstream &infile) -{ - std::string s = ""; - char c; - bool nextword = false; - - while ((!infile.eof()) && (!nextword)) - { - infile.get(c); - if (_spacesigns.find(c) != std::string::npos) - if (s != "") - nextword = true; - if (_spacesigns.find(c) == std::string::npos) - s += c; - } - return s; -} - -std::string TrimSpace(std::string &s) -{ - /*int ii; - - switch (Just) - { - case CutLeft: - { - ii = 0; - while ((ii < s.length()) && (s[ii + 1] == (char)" ")) - ++ii; - s = s.substr(ii + 1, s.length() - ii); - } - case CutRight: - { - ii = s.length(); - while ((ii > 0) && (s[ii] == (char)" ")) - --ii; - s = s.substr(0, ii); - } - case CutBoth: - { - s = TrimSpace(s, CutLeft); - s = TrimSpace(s, CutRight); - } - } - return s;*/ - - if (s.empty()) - return ""; - size_t first = s.find_first_not_of(' '); - if (first == std::string::npos) - return ""; - size_t last = s.find_last_not_of(' '); - return s.substr(first, (last - first + 1)); -} - -char* TrimAndReduceSpaces(const char* s) -{ // redukuje spacje pomiedzy znakami do jednej - char* tmp = nullptr; - if (s) - { - - tmp = _strdup(s); - char* from = tmp + strspn(tmp, " "); - char* to = tmp; - - do if ((*to = *from++) == ' ') - from += strspn(from, " "); - while (*to++); - - while (*--to == ' ') - *to = '\0'; - } - return tmp; -} - -std::string ExtractKeyWord(std::string InS, std::string KeyWord) -{ - std::string s; - InS = InS + " "; - std::size_t kwp = InS.find(KeyWord); - if (kwp != std::string::npos) - { - s = InS.substr(kwp, InS.length()); - //s = Copy(InS, kwp, length(InS)); - s = s.substr(0, s.find_first_of(" ")); - //s = Copy(s, 1, Pos(" ", s) - 1); - } - else - s = ""; - return s; -} - std::string DUE(std::string s) /*Delete Before Equal sign*/ { //DUE = Copy(s, Pos("=", s) + 1, length(s)); @@ -473,8 +381,7 @@ void ComputeALine(double X0, double Y0, double Xn, double Yn, double L, double R bool FileExists( std::string const &Filename ) { std::ifstream file( Filename ); - if( file.is_open() == false ) { return false; } - else { return true; } + return( true == file.is_open() ); } /* diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index a0ecf5af..c6b7932b 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -105,11 +105,6 @@ bool FuzzyLogicAI(double Test, double Threshold, double Probability); /*to samo ale zawsze niezaleznie od DebugFlag*/ /*operacje na stringach*/ -std::string ReadWord( std::ifstream& infile); /*czyta slowo z wiersza pliku tekstowego*/ -//std::string Ups(std::string s); -//std::string TrimSpace(std::string &s); -//char* TrimAndReduceSpaces(const char* s); -//std::string ExtractKeyWord(std::string InS, std::string KeyWord); /*wyciaga slowo kluczowe i lancuch do pierwszej spacji*/ std::string DUE(std::string s); /*Delete Until Equal sign*/ std::string DWE(std::string s); /*Delete While Equal sign*/ std::string ExchangeCharInString(std::string const &s, const char &aim, const char &target); // zamienia jeden znak na drugi diff --git a/MdlMngr.cpp b/MdlMngr.cpp index f3663e10..fb55dfe9 100644 --- a/MdlMngr.cpp +++ b/MdlMngr.cpp @@ -56,7 +56,8 @@ void TModelsManager::Init() */ void TModelsManager::Free() { - SafeDeleteArray(Models); + delete[] Models; + Models = nullptr; } TModel3d * TModelsManager::LoadModel(std::string const &Name, bool dynamic) diff --git a/MdlMngr.h b/MdlMngr.h index bdd465cd..2162bf30 100644 --- a/MdlMngr.h +++ b/MdlMngr.h @@ -14,16 +14,12 @@ http://mozilla.org/MPL/2.0/. class TMdlContainer { friend class TModelsManager; - TMdlContainer() - { - Model = NULL; - }; ~TMdlContainer() { - SafeDelete(Model); + delete Model; }; TModel3d * LoadModel(std::string const &NewName, bool dynamic); - TModel3d *Model; + TModel3d *Model{ nullptr }; std::string Name; }; diff --git a/Model3d.cpp b/Model3d.cpp index c3f39b80..26bd823a 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1577,8 +1577,12 @@ TModel3d::~TModel3d() } else { // wczytano z pliku binarnego (jest właścicielem tablic) - m_pVNT = NULL; // nie usuwać tego, bo wskazuje na iModel - Root = NULL; +#ifdef EU07_USE_OLD_VERTEXBUFFER + m_pVNT = nullptr; // nie usuwać tego, bo wskazuje na iModel +#else + m_pVNT.clear(); +#endif + Root = nullptr; delete[] iModel; // usuwamy cały wczytany plik i to wystarczy } // później się jeszcze usuwa obiekt z którego dziedziczymy tabelę VBO @@ -1801,7 +1805,11 @@ void TModel3d::SaveToBinFile(char const *FileName) transforms[i].serialize_float32(s); MakeArray(iNumVerts); - Root->RaArrayFill(m_pVNT); +#ifdef EU07_USE_OLD_VERTEXBUFFER + Root->RaArrayFill(m_pVNT); +#else + Root->RaArrayFill( m_pVNT.data() ); +#endif sn_utils::ls_uint32(s, MAKE_ID4('V', 'N', 'T', '0')); sn_utils::ls_uint32(s, 8 + iNumVerts * 32); for (size_t i = 0; i < (size_t)iNumVerts; i++) @@ -1886,7 +1894,11 @@ void TSubModel::deserialize(std::istream &s) void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) { - m_pVNT = nullptr; +#ifdef EU07_USE_OLD_VERTEXBUFFER + m_pVNT = nullptr; +#else + m_pVNT.clear(); +#endif Root = nullptr; float4x4 *tm = nullptr; @@ -1900,13 +1912,22 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) if (type == MAKE_ID4('V', 'N', 'T', '0')) { - if (m_pVNT != nullptr) +#ifdef EU07_USE_OLD_VERTEXBUFFER + if (m_pVNT != nullptr) +#else + if( false == m_pVNT.empty() ) +#endif throw std::runtime_error("e3d: duplicated VNT chunk"); size_t vt_cnt = size / 32; iNumVerts = (int)vt_cnt; m_nVertexCount = (int)vt_cnt; - m_pVNT = new CVertNormTex[vt_cnt]; +#ifdef EU07_USE_OLD_VERTEXBUFFER + assert( m_pVNT == nullptr ); + m_pVNT = new CVertNormTex[vt_cnt]; +#else + m_pVNT.resize( vt_cnt ); +#endif for (size_t i = 0; i < vt_cnt; i++) m_pVNT[i].deserialize(s); } @@ -1967,12 +1988,20 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) if (!Root) throw std::runtime_error("e3d: no submodels"); - if (!m_pVNT) +#ifdef EU07_USE_OLD_VERTEXBUFFER + if (!m_pVNT) +#else + if(m_pVNT.empty() ) +#endif throw std::runtime_error("e3d: no vertices"); for (size_t i = 0; (int)i < iSubModelsCount; i++) { - Root[i].BinInit(Root, tm, (float8*)m_pVNT, &Textures, &Names, dynamic); +#ifdef EU07_USE_OLD_VERTEXBUFFER + Root[i].BinInit(Root, tm, (float8*)m_pVNT, &Textures, &Names, dynamic); +#else + Root[ i ].BinInit( Root, tm, (float8*)m_pVNT.data(), &Textures, &Names, dynamic ); +#endif if (Root[i].ChildGet()) Root[i].ChildGet()->Parent = &Root[i]; @@ -2151,11 +2180,18 @@ void TModel3d::Init() */ if (Global::bUseVBO) { - if (!m_pVNT) // jeśli nie ma jeszcze tablicy (wczytano z pliku - // tekstowego) +#ifdef EU07_USE_OLD_VERTEXBUFFER + if (!m_pVNT) // jeśli nie ma jeszcze tablicy (wczytano z pliku tekstowego) +#else + if( m_pVNT.empty() ) +#endif { // tworzenie tymczasowej tablicy z wierzchołkami całego modelu MakeArray(iNumVerts); // tworzenie tablic dla VBO - Root->RaArrayFill(m_pVNT); // wypełnianie tablicy +#ifdef EU07_USE_OLD_VERTEXBUFFER + Root->RaArrayFill(m_pVNT); // wypełnianie tablicy +#else + Root->RaArrayFill( m_pVNT.data() ); // wypełnianie tablicy +#endif BuildVBOs(); // tworzenie VBO i usuwanie tablicy z pamięci } else diff --git a/RealSound.cpp b/RealSound.cpp index 19b814e6..ce9c6a3b 100644 --- a/RealSound.cpp +++ b/RealSound.cpp @@ -40,7 +40,7 @@ void TRealSound::Init(std::string const &SoundName, double DistanceAttenuation, bool Dynamic, bool freqmod, double rmin) { // Nazwa=SoundName; //to tak raczej nie zadziała, (SoundName) jest tymczasowe - pSound = TSoundsManager::GetFromName(SoundName.c_str(), Dynamic, &fFrequency); + pSound = TSoundsManager::GetFromName(SoundName, Dynamic, &fFrequency); if (pSound) { if (freqmod) @@ -48,8 +48,7 @@ void TRealSound::Init(std::string const &SoundName, double DistanceAttenuation, { // dla modulowanych nie może być zmiany mnożnika, bo częstotliwość w nagłówku byłą // ignorowana, a mogła być inna niż 22050 fFrequency = 22050.0; - ErrorLog("Bad sound: " + std::string(SoundName) + - ", as modulated, should have 22.05kHz in header"); + ErrorLog("Bad sound: " + SoundName + ", as modulated, should have 22.05kHz in header"); } AM = 1.0; pSound->SetVolume(DSBVOLUME_MIN); @@ -57,7 +56,7 @@ void TRealSound::Init(std::string const &SoundName, double DistanceAttenuation, else { // nie ma dźwięku, to jest wysyp AM = 0; - ErrorLog("Missed sound: " + std::string(SoundName)); + ErrorLog("Missed sound: " + SoundName); } if (DistanceAttenuation > 0.0) { @@ -268,26 +267,8 @@ void TTextSound::Play(double Volume, int Looping, bool ListenerInside, vector3 N { // jeśli ma powiązany tekst DWORD stat; pSound->GetStatus(&stat); - if (!(stat & DSBSTATUS_PLAYING)) // jeśli nie jest aktualnie odgrywany - { -/* - std::string t( asText ); - size_t i; - do - { // na razie zrobione jakkolwiek, docelowo przenieść teksty do tablicy nazw - i = t.find('\r'); // znak nowej linii - if( i == std::string::npos ) { - Global::tranTexts.Add( t, fTime, true ); - } - else - { - Global::tranTexts.Add(t.substr(0, i), fTime, true); - t.erase(0, i + 1); - while (t.empty() ? false : (unsigned char)(t[1]) < 33) - t.erase(0, 1); - } - } while (i != std::string::npos); -*/ + if (!(stat & DSBSTATUS_PLAYING)) { + // jeśli nie jest aktualnie odgrywany Global::tranTexts.Add( asText, fTime, true ); } } diff --git a/Sound.cpp b/Sound.cpp index eb8c4893..c3101245 100644 --- a/Sound.cpp +++ b/Sound.cpp @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "Usefull.h" #include "mczapkie/mctools.h" #include "WavRead.h" -//#define SAFE_DELETE(p) { if(p) { delete (p); (p)=NULL; } } + #define SAFE_RELEASE(p) \ { \ if (p) \ @@ -24,43 +24,31 @@ http://mozilla.org/MPL/2.0/. } \ } -char Directory[] = "sounds\\"; - LPDIRECTSOUND TSoundsManager::pDS; LPDIRECTSOUNDNOTIFY TSoundsManager::pDSNotify; int TSoundsManager::Count = 0; TSoundContainer *TSoundsManager::First = NULL; -TSoundContainer::TSoundContainer(LPDIRECTSOUND pDS, const char *Directory, const char *strFileName, - int NConcurrent) +TSoundContainer::TSoundContainer(LPDIRECTSOUND pDS, std::string const &Directory, std::string const &Filename, int NConcurrent) { // wczytanie pliku dźwiękowego int hr = 111; - DSBuffer = NULL; // na początek, gdyby uruchomić dźwięków się nie udało - + DSBuffer = nullptr; // na początek, gdyby uruchomić dźwięków się nie udało Concurrent = NConcurrent; - Oldest = 0; - // strcpy(Name, strFileName); - - strcpy(Name, Directory); - strcat(Name, strFileName); - - CWaveSoundRead *pWaveSoundRead; + m_name = Directory + Filename; // Create a new wave file class - pWaveSoundRead = new CWaveSoundRead(); + std::shared_ptr pWaveSoundRead = std::make_shared(); // Load the wave file - if (FAILED(pWaveSoundRead->Open(Name))) - if (FAILED(pWaveSoundRead->Open(strdup(strFileName)))) - { - // SetFileUI( hDlg, TEXT("Bad wave file.") ); - ErrorLog( "Missed sound: " + std::string( strFileName ) ); - return; - } + if( ( FAILED( pWaveSoundRead->Open( m_name ) ) ) + && ( FAILED( pWaveSoundRead->Open( Filename ) ) ) ) { + ErrorLog( "Missed sound: " + Filename ); + return; + } - strcpy(Name, ToLower(strFileName).c_str()); + m_name = ToLower( Filename ); // Set up the direct sound buffer, and only request the flags needed // since each requires some overhead and limits if the buffer can @@ -133,27 +121,10 @@ TSoundContainer::TSoundContainer(LPDIRECTSOUND pDS, const char *Directory, const // We dont need the wav file data buffer anymore, so delete it delete[] pbWavData; - delete pWaveSoundRead; - DSBuffers.push(DSBuffer); - - /* - for (int i=1; iDuplicateSoundBuffer(pDSBuffer[0],&(pDSBuffer[i])))) - { - Concurrent= i; - break; - }; - - - };*/ }; TSoundContainer::~TSoundContainer() { - // for (int i=Concurrent-1; i>=0; i--) - // SAFE_RELEASE( pDSBuffer[i] ); - // free(pDSBuffer); while (!DSBuffers.empty()) { SAFE_RELEASE(DSBuffers.top()); @@ -185,84 +156,51 @@ void TSoundsManager::Free() SAFE_RELEASE(pDS); }; -TSoundContainer * TSoundsManager::LoadFromFile(const char *Dir, const char *Name, int Concurrent) +TSoundContainer * TSoundsManager::LoadFromFile( std::string const &Dir, std::string const &Filename, int Concurrent) { - TSoundContainer *Tmp = First; - First = new TSoundContainer(pDS, Dir, Name, Concurrent); - First->Next = Tmp; + TSoundContainer *tmp = First; + First = new TSoundContainer(pDS, Dir, Filename, Concurrent); + First->Next = tmp; Count++; return First; // albo NULL, jak nie wyjdzie (na razie zawsze wychodzi) }; -void TSoundsManager::LoadSounds(char *Directory) -{ // wczytanie wszystkich plików z katalogu - mało elastyczne - WIN32_FIND_DATA FindFileData; - HANDLE handle = FindFirstFile("sounds\\*.wav", &FindFileData); - if (handle != INVALID_HANDLE_VALUE) - do - { - LoadFromFile(Directory, FindFileData.cFileName, 1); - } while (FindNextFile(handle, &FindFileData)); - FindClose(handle); -}; - -LPDIRECTSOUNDBUFFER TSoundsManager::GetFromName(const char *Name, bool Dynamic, float *fSamplingRate) +LPDIRECTSOUNDBUFFER TSoundsManager::GetFromName(std::string const &Name, bool Dynamic, float *fSamplingRate) { // wyszukanie dźwięku w pamięci albo wczytanie z pliku + std::string name{ ToLower(Name) }; std::string file; if (Dynamic) { // próba wczytania z katalogu pojazdu - file = Global::asCurrentDynamicPath + Name; + file = Global::asCurrentDynamicPath + name; if (FileExists(file)) - Name = file.c_str(); // nowa nazwa + name = file; // nowa nazwa else Dynamic = false; // wczytanie z "sounds/" } TSoundContainer *Next = First; for (int i = 0; i < Count; i++) { - if (strcmp(Name, Next->Name) == 0) - { + if( name == Next->m_name ) { + if (fSamplingRate) *fSamplingRate = Next->fSamplingRate; // częstotliwość return (Next->GetUnique(pDS)); - // DSBuffers. - /* - Next->pDSBuffer[Next->Oldest]->Stop(); - Next->pDSBuffer[Next->Oldest]->SetCurrentPosition(0); - if (Next->OldestConcurrent-1) - { - Next->Oldest++; - return (Next->pDSBuffer[Next->Oldest-1]); - } - else - { - Next->Oldest= 0; - return (Next->pDSBuffer[Next->Concurrent-1]); - }; - - /* for (int j=0; jConcurrent; j++) - { - - Next->pDSBuffer[j]->GetStatus(&dwStatus); - if ((dwStatus & DSBSTATUS_PLAYING) != DSBSTATUS_PLAYING) - return (Next->pDSBuffer[j]); - } */ } else Next = Next->Next; }; if (Dynamic) // wczytanie z katalogu pojazdu - Next = LoadFromFile("", Name, 1); + Next = LoadFromFile("", name, 1); else - Next = LoadFromFile(Directory, Name, 1); + Next = LoadFromFile(szSoundPath, name, 1); if (Next) { // if (fSamplingRate) *fSamplingRate = Next->fSamplingRate; // częstotliwość return Next->GetUnique(pDS); } - ErrorLog("Missed sound: " + std::string(Name) ); - return (NULL); + ErrorLog("Missed sound: " + Name ); + return (nullptr); }; void TSoundsManager::RestoreAll() @@ -299,10 +237,6 @@ void TSoundsManager::RestoreAll() }; }; -// void TSoundsManager::Init(char *Name, int Concurrent) -// TSoundsManager::TSoundsManager(HWND hWnd) -// void TSoundsManager::Init(HWND hWnd, char *NDirectory) - void TSoundsManager::Init(HWND hWnd) { diff --git a/Sound.h b/Sound.h index e003ef8d..6b77d184 100644 --- a/Sound.h +++ b/Sound.h @@ -7,56 +7,44 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef SoundH -#define SoundH +#pragma once #include #include typedef LPDIRECTSOUNDBUFFER PSound; -// inline Playing(PSound Sound) -//{ - -//} - class TSoundContainer { - public: +public: int Concurrent; int Oldest; - char Name[80]; + std::string m_name; LPDIRECTSOUNDBUFFER DSBuffer; float fSamplingRate; // częstotliwość odczytana z pliku int iBitsPerSample; // ile bitów na próbkę TSoundContainer *Next; std::stack DSBuffers; - LPDIRECTSOUNDBUFFER GetUnique(LPDIRECTSOUND pDS); - TSoundContainer(LPDIRECTSOUND pDS, const char *Directory, const char *strFileName, int NConcurrent); + + TSoundContainer(LPDIRECTSOUND pDS, std::string const &Directory, std::string const &Filename, int NConcurrent); ~TSoundContainer(); + LPDIRECTSOUNDBUFFER GetUnique( LPDIRECTSOUND pDS ); }; class TSoundsManager { - private: +private: static LPDIRECTSOUND pDS; static LPDIRECTSOUNDNOTIFY pDSNotify; - // static char Directory[80]; - static int Count; static TSoundContainer *First; - static TSoundContainer * LoadFromFile(const char *Dir, const char *Name, int Concurrent); + static int Count; - public: - // TSoundsManager(HWND hWnd); - // static void Init(HWND hWnd, char *NDirectory); - static void Init(HWND hWnd); + static TSoundContainer * LoadFromFile( std::string const &Directory, std::string const &FileName, int Concurrent); + +public: ~TSoundsManager(); + static void Init( HWND hWnd ); static void Free(); - static void Init(char *Name, int Concurrent); - static void LoadSounds(char *Directory); - static LPDIRECTSOUNDBUFFER GetFromName(const char *Name, bool Dynamic, float *fSamplingRate = NULL); + static LPDIRECTSOUNDBUFFER GetFromName( std::string const &Name, bool Dynamic, float *fSamplingRate = NULL ); static void RestoreAll(); }; - -//--------------------------------------------------------------------------- -#endif diff --git a/Train.cpp b/Train.cpp index 262f1c0c..15d79f6c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5820,6 +5820,8 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) // NOTE: yaml-style comments are disabled until conflict in use of # is resolved // parser.addCommentStyle( "#", "\n" ); //Wartości domyślne by nie wysypywało przy wybrakowanych mmd @240816 Stele + // NOTE: should be no longer needed as safety checks were added, + // but leaving the defaults for the sake of incomplete mmd files dsbPneumaticSwitch = TSoundsManager::GetFromName("silence1.wav", true); dsbBufferClamp = TSoundsManager::GetFromName("en57_bufferclamp.wav", true); dsbCouplerDetach = TSoundsManager::GetFromName("couplerdetach.wav", true); @@ -5847,67 +5849,67 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) { // nastawnik: dsbNastawnikJazdy = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "ctrlscnd:") { // hunter-081211: nastawnik bocznikowania dsbNastawnikBocz = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "reverserkey:") { // hunter-131211: dzwiek kierunkowego dsbReverserKey = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "buzzer:") { // bzyczek shp: dsbBuzzer = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "slipalarm:") { // Bombardier 011010: alarm przy poslizgu: dsbSlipAlarm = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "tachoclock:") { // cykanie rejestratora: dsbHasler = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "switch:") { // przelaczniki: dsbSwitch = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "pneumaticswitch:") { // stycznik EP: dsbPneumaticSwitch = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "wejscie_na_bezoporow:") { // hunter-111211: wydzielenie wejscia na bezoporowa i na drugi uklad do pliku dsbWejscie_na_bezoporow = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "wejscie_na_drugi_uklad:") { dsbWejscie_na_drugi_uklad = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "relay:") { // styczniki itp: dsbRelay = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); if (!dsbWejscie_na_bezoporow) { // hunter-111211: domyslne, gdy brak dsbWejscie_na_bezoporow = @@ -5923,39 +5925,37 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) { // wylaczniki pneumatyczne: dsbPneumaticRelay = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "couplerattach:") { // laczenie: dsbCouplerAttach = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "couplerstretch:") { // laczenie: - dsbCouplerStretch = TSoundsManager::GetFromName( - parser.getToken().c_str(), - true); // McZapkie-090503: PROWIZORKA!!! "en57_couplerstretch.wav" + dsbCouplerStretch = + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "couplerdetach:") { // rozlaczanie: dsbCouplerDetach = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "bufferclamp:") { // laczenie: - dsbBufferClamp = TSoundsManager::GetFromName( - parser.getToken().c_str(), - true); // McZapkie-090503: PROWIZORKA!!! "en57_bufferclamp.wav" + dsbBufferClamp = + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "ignition:") { // odpalanie silnika dsbDieselIgnition = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "brakesound:") { @@ -6073,25 +6073,25 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) { // podniesienie patyka: dsbPantUp = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "pantographdown:") { // podniesienie patyka: dsbPantDown = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "doorclose:") { // zamkniecie drzwi: dsbDoorClose = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } else if (token == "dooropen:") { // otwarcie drzwi: dsbDoorOpen = - TSoundsManager::GetFromName(parser.getToken().c_str(), true); + TSoundsManager::GetFromName(parser.getToken(), true); } } while (token != ""); diff --git a/VBO.cpp b/VBO.cpp index cd9483d3..0de6cb14 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -44,7 +44,9 @@ void CVertNormTex::serialize(std::ostream &s) CMesh::CMesh() { // utworzenie pustego obiektu +#ifdef EU07_USE_OLD_VERTEXBUFFER m_pVNT = nullptr; +#endif m_nVertexCount = -1; m_nVBOVertices = 0; // nie zarezerwowane }; @@ -57,7 +59,13 @@ CMesh::~CMesh() void CMesh::MakeArray(int n) { // tworzenie tablic m_nVertexCount = n; +#ifdef EU07_USE_OLD_VERTEXBUFFER + assert( m_pVNT == nullptr ); m_pVNT = new CVertNormTex[m_nVertexCount]; // przydzielenie pamięci dla tablicy +#else + m_pVNT.clear(); + m_pVNT.resize( m_nVertexCount ); +#endif }; void CMesh::BuildVBOs(bool del) @@ -65,11 +73,19 @@ void CMesh::BuildVBOs(bool del) // pobierz numer VBO oraz ustaw go jako aktywny glGenBuffers(1, &m_nVBOVertices); // pobierz numer glBindBuffer(GL_ARRAY_BUFFER, m_nVBOVertices); // ustaw bufor jako aktualny +#ifdef EU07_USE_OLD_VERTEXBUFFER glBufferData(GL_ARRAY_BUFFER, m_nVertexCount * sizeof(CVertNormTex), m_pVNT, GL_STATIC_DRAW); +#else + glBufferData( GL_ARRAY_BUFFER, m_nVertexCount * sizeof( CVertNormTex ), m_pVNT.data(), GL_STATIC_DRAW ); +#endif // WriteLog("Assigned VBO number "+AnsiString(m_nVBOVertices)+", vertices: // "+AnsiString(m_nVertexCount)); +#ifdef EU07_USE_OLD_VERTEXBUFFER if (del) SafeDeleteArray(m_pVNT); // wierzchołki już się nie przydadzą +#else + m_pVNT.clear(); +#endif }; void CMesh::Clear() @@ -82,7 +98,11 @@ void CMesh::Clear() } m_nVBOVertices = 0; m_nVertexCount = -1; // do ponownego zliczenia +#ifdef EU07_USE_OLD_VERTEXBUFFER SafeDeleteArray(m_pVNT); // usuwanie tablic, gdy były użyte do Vertex Array +#else + m_pVNT.clear(); +#endif }; bool CMesh::StartVBO() diff --git a/VBO.h b/VBO.h index 3c0ec334..a5e4947a 100644 --- a/VBO.h +++ b/VBO.h @@ -9,6 +9,9 @@ http://mozilla.org/MPL/2.0/. #ifndef VBOH #define VBOH + +#define EU07_USE_OLD_VERTEXBUFFER + //--------------------------------------------------------------------------- class CVertNormTex { @@ -30,7 +33,11 @@ class CMesh { // wsparcie dla VBO public: int m_nVertexCount; // liczba wierzchołków +#ifdef EU07_USE_OLD_VERTEXBUFFER CVertNormTex *m_pVNT; +#else + std::vector m_pVNT; +#endif unsigned int m_nVBOVertices; // numer VBO z wierzchołkami CMesh(); ~CMesh(); diff --git a/usefull.h b/usefull.h index 43e1683f..a5c62578 100644 --- a/usefull.h +++ b/usefull.h @@ -11,17 +11,6 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" -#define SafeDelete(a) \ - { \ - delete (a); \ - a = nullptr; \ - } -#define SafeDeleteArray(a) \ - { \ - delete[](a); \ - a = nullptr; \ - } - #define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0)) #define DegToRad(a) ((M_PI / 180.0) * (a)) //(a) w nawiasie, bo może być dodawaniem @@ -31,9 +20,22 @@ http://mozilla.org/MPL/2.0/. #define asSceneryPath std::string("scenery\\") #define szSceneryPath "scenery\\" #define szTexturePath "textures\\" +#define szSoundPath "sounds\\" #define MAKE_ID4(a,b,c,d) (((std::uint32_t)(d)<<24)|((std::uint32_t)(c)<<16)|((std::uint32_t)(b)<<8)|(std::uint32_t)(a)) +template +void SafeDelete( _Type &Pointer ) { + delete Pointer; + Pointer = nullptr; +} + +template +void SafeDeleteArray( _Type &Pointer ) { + delete[] Pointer; + Pointer = nullptr; +} + template _Type clamp( _Type const Value, _Type const Min, _Type const Max ) { diff --git a/wavread.cpp b/wavread.cpp index d55dd9be..4dd527b1 100644 --- a/wavread.cpp +++ b/wavread.cpp @@ -17,26 +17,7 @@ http://mozilla.org/MPL/2.0/. //----------------------------------------------------------------------------- #include "stdafx.h" #include "WavRead.h" - -//----------------------------------------------------------------------------- -// Defines, constants, and global variables -//----------------------------------------------------------------------------- -#define SAFE_DELETE(p) \ - { \ - if (p) \ - { \ - delete (p); \ - (p) = NULL; \ - } \ - } -#define SAFE_RELEASE(p) \ - { \ - if (p) \ - { \ - (p)->Release(); \ - (p) = NULL; \ - } \ - } +#include "usefull.h" //----------------------------------------------------------------------------- // Name: ReadMMIO() @@ -122,13 +103,13 @@ HRESULT ReadMMIO(HMMIO hmmioIn, MMCKINFO *pckInRIFF, WAVEFORMATEX **ppwfxInfo) // so the data can be easily read with WaveReadFile. Returns 0 if // successful, the error code if not. //----------------------------------------------------------------------------- -HRESULT WaveOpenFile(CHAR *strFileName, HMMIO *phmmioIn, WAVEFORMATEX **ppwfxInfo, +HRESULT WaveOpenFile( std::string const &Filename, HMMIO *phmmioIn, WAVEFORMATEX **ppwfxInfo, MMCKINFO *pckInRIFF) { HRESULT hr; HMMIO hmmioIn = NULL; - if (NULL == (hmmioIn = mmioOpen(strFileName, NULL, MMIO_ALLOCBUF | MMIO_READ))) + if (NULL == (hmmioIn = mmioOpen(const_cast(Filename.c_str()), NULL, MMIO_ALLOCBUF | MMIO_READ))) return E_FAIL; if (FAILED(hr = ReadMMIO(hmmioIn, pckInRIFF, ppwfxInfo))) @@ -228,20 +209,20 @@ CWaveSoundRead::CWaveSoundRead() CWaveSoundRead::~CWaveSoundRead() { Close(); - SAFE_DELETE(m_pwfx); + SafeDelete(m_pwfx); } //----------------------------------------------------------------------------- // Name: Open() // Desc: Opens a wave file for reading //----------------------------------------------------------------------------- -HRESULT CWaveSoundRead::Open(CHAR *strFilename) +HRESULT CWaveSoundRead::Open(std::string const &Filename) { - SAFE_DELETE(m_pwfx); + SafeDelete(m_pwfx); HRESULT hr; - if (FAILED(hr = WaveOpenFile(strFilename, &m_hmmioIn, &m_pwfx, &m_ckInRiff))) + if (FAILED(hr = WaveOpenFile(Filename, &m_hmmioIn, &m_pwfx, &m_ckInRiff))) return hr; if (FAILED(hr = Reset())) diff --git a/wavread.h b/wavread.h index 68ce040e..707baa2a 100644 --- a/wavread.h +++ b/wavread.h @@ -15,12 +15,12 @@ http://mozilla.org/MPL/2.0/. // // Copyright (c) 1999 Microsoft Corp. All rights reserved. //----------------------------------------------------------------------------- -#ifndef WAVE_READ_H -#define WAVE_READ_H +#pragma once #include +#include -HRESULT WaveOpenFile(CHAR *strFileName, HMMIO *phmmioIn, WAVEFORMATEX **ppwfxInfo, +HRESULT WaveOpenFile(std::string const &Filename, HMMIO *phmmioIn, WAVEFORMATEX **ppwfxInfo, MMCKINFO *pckInRIFF); HRESULT WaveStartDataRead(HMMIO *phmmioIn, MMCKINFO *pckIn, MMCKINFO *pckInRIFF); HRESULT WaveReadFile(HMMIO hmmioIn, UINT cbRead, BYTE *pbDest, MMCKINFO *pckIn, UINT *cbActualRead); @@ -41,10 +41,8 @@ class CWaveSoundRead CWaveSoundRead(); ~CWaveSoundRead(); - HRESULT Open(CHAR *strFilename); + HRESULT Open(std::string const &Filename); HRESULT Reset(); HRESULT Read(UINT nSizeToRead, BYTE *pbData, UINT *pnSizeRead); HRESULT Close(); }; - -#endif WAVE_READ_H From c38511978d80dffee342dc31083b5b7d2b161015 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 19 May 2017 20:07:23 +0200 Subject: [PATCH 108/426] build 170519. fixes for buffer overflows in segment.cpp --- Ground.cpp | 27 +++++++-- Segment.cpp | 152 ++++++++++++++++++++++++++++----------------------- Segment.h | 2 +- Track.cpp | 138 +++++++++++++++++++++++++++++++--------------- Track.h | 2 +- Traction.cpp | 22 +++++++- Traction.h | 2 +- version.h | 2 +- 8 files changed, 226 insertions(+), 121 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index d1ed6969..087e76fb 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -787,6 +787,7 @@ void TSubRect::LoadNodes() return; // jeśli nie ma obiektów do wyświetlenia z VBO, to koniec if (Global::bUseVBO) { // tylko liczenie wierzchołów, gdy nie ma VBO + int debugvertexcount{ 0 }; MakeArray(m_nVertexCount); n = nRootNode; int i; @@ -808,7 +809,9 @@ void TSubRect::LoadNodes() m_pVNT[n->iVboPtr + i].nz = n->Vertices[i].Normal.z; m_pVNT[n->iVboPtr + i].u = n->Vertices[i].tu; m_pVNT[n->iVboPtr + i].v = n->Vertices[i].tv; + ++debugvertexcount; } + assert( debugvertexcount <= m_nVertexCount ); break; case GL_LINES: case GL_LINE_STRIP: @@ -819,23 +822,35 @@ void TSubRect::LoadNodes() m_pVNT[n->iVboPtr + i].y = n->Points[i].y; m_pVNT[n->iVboPtr + i].z = n->Points[i].z; // miejsce w tablicach normalnych i teksturowania się marnuje... + ++debugvertexcount; } + assert( debugvertexcount <= m_nVertexCount ); break; case TP_TRACK: - if (n->iNumVerts) // bo tory zabezpieczające są niewidoczne + if( n->iNumVerts ) { // bo tory zabezpieczające są niewidoczne #ifdef EU07_USE_OLD_VERTEXBUFFER - n->pTrack->RaArrayFill( m_pVNT + n->iVboPtr, m_pVNT ); + int const batch = n->pTrack->RaArrayFill( m_pVNT + n->iVboPtr, m_pVNT, std::min( n->iNumVerts, m_nVertexCount - n->iVboPtr ) ); #else - n->pTrack->RaArrayFill(m_pVNT.data() + n->iVboPtr, m_pVNT.data()); + int const batch = n->pTrack->RaArrayFill( m_pVNT.data() + n->iVboPtr, m_pVNT.data(), std::min( n->iNumVerts, m_nVertexCount - n->iVboPtr ) ); #endif + assert( batch == n->iNumVerts ); + assert( batch + n->iVboPtr <= m_nVertexCount ); + debugvertexcount += batch; + assert( debugvertexcount <= m_nVertexCount ); + } break; case TP_TRACTION: - if (n->iNumVerts) // druty mogą być niewidoczne...? + if( n->iNumVerts ) { // druty mogą być niewidoczne...? #ifdef EU07_USE_OLD_VERTEXBUFFER - n->hvTraction->RaArrayFill( m_pVNT + n->iVboPtr ); + int const batch = n->hvTraction->RaArrayFill( m_pVNT + n->iVboPtr ); #else - n->hvTraction->RaArrayFill(m_pVNT.data() + n->iVboPtr); + int const batch = n->hvTraction->RaArrayFill( m_pVNT.data() + n->iVboPtr ); #endif + assert( batch == n->iNumVerts ); + assert( batch + n->iVboPtr <= m_nVertexCount ); + debugvertexcount += batch; + assert( debugvertexcount <= m_nVertexCount ); + } break; } n = n->nNext2; // następny z sektora diff --git a/Segment.cpp b/Segment.cpp index 1455414b..75a8e335 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -116,26 +116,24 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI // MessageBox(0,"Length<=0","TSegment::Init",MB_OK); return false; // zerowe nie mogą być } + + if( ( pOwner->eType == tt_Switch ) + && ( fStep * 3.0 > fLength ) ) { + // NOTE: a workaround for too short switches (less than 3 segments) messing up animation/generation of blades + fStep = fLength / 3.0; + } + fStoop = std::atan2((Point2.y - Point1.y), fLength); // pochylenie toru prostego, żeby nie liczyć wielokrotnie SafeDeleteArray(fTsBuffer); - if( ( bCurve ) && ( fStep > 0 ) ) { - if( fStep > 0 ) { // Ra: prosty dostanie podział, jak ma różną przechyłkę na końcach - double s = 0; - int i = 0; - iSegCount = static_cast( std::ceil( fLength / fStep )); // potrzebne do VBO - // fStep=fLength/(double)(iSegCount-1); //wyrównanie podziału - fTsBuffer = new double[ iSegCount + 1 ]; - fTsBuffer[ 0 ] = 0; /* TODO : fix fTsBuffer */ - while( s < fLength ) { - i++; - s += fStep; - if( s > fLength ) - s = fLength; - fTsBuffer[ i ] = GetTFromS( s ); - } - } + iSegCount = static_cast( std::ceil( fLength / fStep ) ); // potrzebne do VBO + fTsBuffer = new double[ iSegCount + 1 ]; + fTsBuffer[ 0 ] = 0.0; + for( int i = 1; i < iSegCount; ++i ) { + fTsBuffer[ i ] = GetTFromS( i * fStep ); } + fTsBuffer[ iSegCount ] = 1.0; + return true; } @@ -317,14 +315,16 @@ vector3 TSegment::FastGetPoint(double t) return (bCurve ? RaInterpolate(t) : ((1.0 - t) * Point1 + (t)*Point2)); } -void TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, bool Onlypositions, vector3 **p, bool bRender) +int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, bool Onlypositions, vector3 **p, bool bRender) { // generowanie trójkątów dla odcinka trajektorii ruchu // standardowo tworzy triangle_strip dla prostego albo ich zestaw dla łuku // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli // podany jest przekrój końcowy // podsypka toru jest robiona za pomocą 6 punktów, szyna 12, drogi i rzeki na 3+2+3 + int debugvertexcount{ 0 }; + if( !fTsBuffer ) - return; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę + return debugvertexcount; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę vector3 pos1, pos2, dir, parallel1, parallel2, pt, norm; double s, step, fOffset, tv1, tv2, t, fEnd; @@ -348,6 +348,9 @@ void TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, in fEnd = fLength * double( iEnd ) / double( iSegCount ); m2 = s / fEnd; jmm2 = 1.0 - m2; + + int const debugvertexlimit = std::abs( iNumShapePoints ) * 2 * ( iEnd - iSkip ); + while( i < iEnd ) { ++i; // kolejny punkt łamanej @@ -410,6 +413,7 @@ void TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, in } ++Output; } + ++debugvertexcount; } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -447,6 +451,7 @@ void TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, in } ++Output; } + ++debugvertexcount; } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -455,64 +460,73 @@ void TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, in *( *p ) = pt; ( *p )++; } // zapamiętanie brzegu jezdni + + assert( debugvertexcount <= debugvertexlimit ); } } else { - for( int j = 0; j < iNumShapePoints; ++j ) { - //łuk z jednym profilem - pt = parallel1 * ( ShapePoints[ j ].x - fOffsetX ) + pos1; - pt.y += ShapePoints[ j ].y; - if( false == Onlypositions ) { - norm = ShapePoints[ j ].n.x * parallel1; - norm.y += ShapePoints[ j ].n.y; - } - if( Output == nullptr ) { - // immediate mode + if( bRender ) { + for( int j = 0; j < iNumShapePoints; ++j ) { + //łuk z jednym profilem + pt = parallel1 * ( ShapePoints[ j ].x - fOffsetX ) + pos1; + pt.y += ShapePoints[ j ].y; if( false == Onlypositions ) { - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv1 ); + norm = ShapePoints[ j ].n.x * parallel1; + norm.y += ShapePoints[ j ].n.y; } - ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na początku odcinka - } - else { - Output->x = pt.x; - Output->y = pt.y; - Output->z = pt.z; + if( Output == nullptr ) { + // immediate mode + if( false == Onlypositions ) { + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv1 ); + } + ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na początku odcinka + } + else { + Output->x = pt.x; + Output->y = pt.y; + Output->z = pt.z; + if( false == Onlypositions ) { + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = ShapePoints[ j ].z / Texturescale; + Output->v = tv1; + } + ++Output; + } + ++debugvertexcount; + + pt = parallel2 * ShapePoints[ j ].x + pos2; + pt.y += ShapePoints[ j ].y; if( false == Onlypositions ) { - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = ShapePoints[ j ].z / Texturescale; - Output->v = tv1; + norm = ShapePoints[ j ].n.x * parallel2; + norm.y += ShapePoints[ j ].n.y; } - ++Output; - } - pt = parallel2 * ShapePoints[ j ].x + pos2; - pt.y += ShapePoints[ j ].y; - if( false == Onlypositions ) { - norm = ShapePoints[ j ].n.x * parallel2; - norm.y += ShapePoints[ j ].n.y; - } - if( Output == nullptr ) { - // immediate mode - if( false == Onlypositions ) { - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv2 ); + if( Output == nullptr ) { + // immediate mode + if( false == Onlypositions ) { + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv2 ); + } + ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na końcu odcinka } - ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na końcu odcinka - } - else { - Output->x = pt.x; - Output->y = pt.y; - Output->z = pt.z; - if( false == Onlypositions ) { - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = ShapePoints[ j ].z / Texturescale; - Output->v = tv2; + else { + Output->x = pt.x; + Output->y = pt.y; + Output->z = pt.z; + if( false == Onlypositions ) { + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = ShapePoints[ j ].z / Texturescale; + Output->v = tv2; + } + ++Output; } - ++Output; + ++debugvertexcount; + + assert( debugvertexcount <= debugvertexlimit ); } } } @@ -526,6 +540,10 @@ void TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, in tv1 = tv2; } } + + assert( debugvertexcount == debugvertexlimit ); + + return debugvertexcount; }; void TSegment::Render() diff --git a/Segment.h b/Segment.h index aa303484..1c4c84ab 100644 --- a/Segment.h +++ b/Segment.h @@ -113,7 +113,7 @@ class TSegment r1 = fRoll1; r2 = fRoll2; } - void RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, bool Onlypositions = false, vector3 **p = nullptr, bool bRender = true); + int RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, bool Onlypositions = false, vector3 **p = nullptr, bool bRender = true); void Render(); inline double GetLength() { diff --git a/Track.cpp b/Track.cpp index 17cbef7f..56e21423 100644 --- a/Track.cpp +++ b/Track.cpp @@ -532,7 +532,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) // na przechyłce doliczyć jeszcze pół przechyłki } if( fRadius != 0 ) // gdy podany promień - segsize = Min0R( 5.0, 0.2 + fabs( fRadius ) * 0.02 ); // do 250m - 5, potem 1 co 50m + segsize = clamp( 0.2 + fabs( fRadius ) * 0.02, 2.5, 10.0 ); else segsize = 10.0; // for straights, 10m per segment works good enough @@ -595,13 +595,14 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) // na przechyłce doliczyć jeszcze pół przechyłki? } if (fRadiusTable[0] > 0) - segsize = Min0R(5.0, 0.2 + fRadiusTable[0] * 0.02); + segsize = clamp( 0.2 + fRadiusTable[0] * 0.02, 2.5, 5.0 ); else if (eType != tt_Cross) // dla skrzyżowań muszą być podane kontrolne { // jak promień zerowy, to przeliczamy punkty kontrolne cp1 = (p1 + p1 + p2) / 3.0 - p1; // jak jest prosty, to się zoptymalizuje cp2 = (p1 + p2 + p2) / 3.0 - p2; segsize = 5.0; } // ułomny prosty + if (!(cp1 == vector3(0, 0, 0)) && !(cp2 == vector3(0, 0, 0))) SwitchExtension->Segments[0]->Init(p1, p1 + cp1, p2 + cp2, p2, segsize, r1, r2); else @@ -624,7 +625,8 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) } if (fRadiusTable[1] > 0) - segsize = Min0R(5.0, 0.2 + fRadiusTable[1] * 0.02); + segsize = clamp( 0.2 + fRadiusTable[ 1 ] * 0.02, 2.5, 5.0 ); + else if (eType != tt_Cross) // dla skrzyżowań muszą być podane kontrolne { // jak promień zerowy, to przeliczamy punkty kontrolne cp3 = (p3 + p3 + p4) / 3.0 - p3; // jak jest prosty, to się zoptymalizuje @@ -641,6 +643,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) } else SwitchExtension->Segments[1]->Init(p3, p4, segsize, r3, r4); + if (eType == tt_Cross) { // Ra 2014-07: dla skrzyżowań będą dodatkowe segmenty SwitchExtension->Segments[2]->Init(p2, cp2 + p2, cp4 + p4, p4, segsize, r2, r4); // z punktu 2 do 4 @@ -1815,8 +1818,9 @@ int TTrack::RaArrayPrepare() return 0; }; -void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) +int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vertexcount) { // wypełnianie tablic VBO + int debugvertexcount{ 0 }; // Ra: trzeba rozdzielić szyny od podsypki, aby móc grupować wg tekstur double fHTW = 0.5 * fabs(fTrackWidth); double side = fabs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza @@ -1951,12 +1955,15 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos } } - Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -4 : 4, fTexLength); + debugvertexcount += Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -4 : 4, fTexLength); + assert( debugvertexcount <= Vertexcount ); } if (TextureID1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną - Segment->RenderLoft(Vert, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - Segment->RenderLoft(Vert, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + debugvertexcount += Segment->RenderLoft(Vert, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += Segment->RenderLoft(Vert, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + assert( debugvertexcount <= Vertexcount ); } break; case tt_Switch: // dla zwrotnicy dwa razy szyny @@ -1980,27 +1987,46 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) } if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength); - SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2 ); + int batch{ 0 }; + batch = SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength); + debugvertexcount += batch; + assert( debugvertexcount <= Vertexcount ); + batch = SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2 ); + debugvertexcount += batch; + assert( debugvertexcount <= Vertexcount ); SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - SwitchExtension->Segments[0]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + batch = SwitchExtension->Segments[0]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + debugvertexcount += batch; + assert( debugvertexcount <= Vertexcount ); SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - SwitchExtension->Segments[1]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); - SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); - SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength ); + batch = SwitchExtension->Segments[1]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + debugvertexcount += batch; + assert( debugvertexcount <= Vertexcount ); + batch = SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); + debugvertexcount += batch; + assert( debugvertexcount <= Vertexcount ); + batch = SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength ); + debugvertexcount += batch; + assert( debugvertexcount <= Vertexcount ); } else { // lewa działa lepiej niż prawa - SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength); // lewa szyna normalna cała - SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + debugvertexcount += SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength); // lewa szyna normalna cała + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + assert( debugvertexcount <= Vertexcount ); SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - SwitchExtension->Segments[0]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2); // prawa iglica - + debugvertexcount += SwitchExtension->Segments[0]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2); // prawa iglica + assert( debugvertexcount <= Vertexcount ); + SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - SwitchExtension->Segments[1]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1); // lewa iglica - SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2); // lewa szyna za iglicą - SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength); // prawa szyna normalnie cała + debugvertexcount += SwitchExtension->Segments[1]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1); // lewa iglica + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2); // lewa szyna za iglicą + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength); // prawa szyna normalnie cała + assert( debugvertexcount <= Vertexcount ); } } break; @@ -2034,7 +2060,8 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); + debugvertexcount += Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); + assert( debugvertexcount <= Vertexcount ); } if (TextureID2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) @@ -2114,16 +2141,24 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) if( iTrapezoid ) // trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony // odcinka - if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) - Segment->RenderLoft( Vert, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej - if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) - Segment->RenderLoft( Vert, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej + if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { + debugvertexcount += Segment->RenderLoft( Vert, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej + assert( debugvertexcount <= Vertexcount ); + } + if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { + debugvertexcount += Segment->RenderLoft( Vert, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej + assert( debugvertexcount <= Vertexcount ); + } } else { // pobocza zwykłe, brak przechyłki - if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) - Segment->RenderLoft( Vert, rpts1, 3, fTexLength ); - if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) - Segment->RenderLoft( Vert, rpts2, 3, fTexLength ); + if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { + debugvertexcount += Segment->RenderLoft( Vert, rpts1, 3, fTexLength ); + assert( debugvertexcount <= Vertexcount ); + } + if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { + debugvertexcount += Segment->RenderLoft( Vert, rpts2, 3, fTexLength ); + assert( debugvertexcount <= Vertexcount ); + } } } break; @@ -2262,18 +2297,25 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - SwitchExtension->Segments[ 3 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - SwitchExtension->Segments[ 4 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - SwitchExtension->Segments[ 5 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + debugvertexcount += SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += SwitchExtension->Segments[ 3 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += SwitchExtension->Segments[ 4 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += SwitchExtension->Segments[ 5 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + assert( debugvertexcount <= Vertexcount ); } } else { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P2 do P4 - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P4 do P3=P1 (odwrócony) - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P1 do P2 + debugvertexcount += SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P2 do P4 + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P4 do P3=P1 (odwrócony) + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P1 do P2 + assert( debugvertexcount <= Vertexcount ); } } } @@ -2304,6 +2346,7 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) Vert->y = oxz.y; Vert->z = oxz.z; ++Vert; + ++debugvertexcount; for (i = SwitchExtension->iPoints - 2; i >= 0; --i) { Vert->nx = 0.0; @@ -2318,7 +2361,9 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) Vert->y = SwitchExtension->vPoints[ i ].y; Vert->z = SwitchExtension->vPoints[ i ].z; ++Vert; + ++debugvertexcount; } + assert( debugvertexcount <= Vertexcount ); } break; } @@ -2357,7 +2402,8 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); + debugvertexcount += Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); + assert( debugvertexcount <= Vertexcount ); } if (TextureID2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w @@ -2379,19 +2425,24 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start) rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza - Segment->RenderLoft(Vert, rpts1, -3, fTexLength); - Segment->RenderLoft(Vert, rpts2, -3, fTexLength); + debugvertexcount += Segment->RenderLoft(Vert, rpts1, -3, fTexLength); + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += Segment->RenderLoft(Vert, rpts2, -3, fTexLength); + assert( debugvertexcount <= Vertexcount ); } else { // pobocza zwykłe, brak przechyłki - Segment->RenderLoft(Vert, rpts1, 3, fTexLength); - Segment->RenderLoft(Vert, rpts2, 3, fTexLength); + debugvertexcount += Segment->RenderLoft(Vert, rpts1, 3, fTexLength); + assert( debugvertexcount <= Vertexcount ); + debugvertexcount += Segment->RenderLoft(Vert, rpts2, 3, fTexLength); + assert( debugvertexcount <= Vertexcount ); } } } } break; } + return debugvertexcount; }; void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO @@ -2936,8 +2987,9 @@ TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) int size = RaArrayPrepare(); // wielkość tabeli potrzebna dla tej obrotnicy CVertNormTex *Vert = new CVertNormTex[size]; // bufor roboczy // CVertNormTex *v=Vert; //zmieniane przez - RaArrayFill(Vert, Vert - SwitchExtension->iLeftVBO); // iLeftVBO powinno zostać niezmienione - glBufferSubData( + auto const debugvertexcount = RaArrayFill(Vert, Vert - SwitchExtension->iLeftVBO, size); // iLeftVBO powinno zostać niezmienione + assert( debugvertexcount == size ); + ::glBufferSubData( GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(CVertNormTex), size * sizeof(CVertNormTex), Vert); // wysłanie fragmentu bufora VBO } diff --git a/Track.h b/Track.h index 6809afc6..8cab1b1d 100644 --- a/Track.h +++ b/Track.h @@ -240,7 +240,7 @@ class TTrack : public Resource void Render(); // renderowanie z Display Lists int RaArrayPrepare(); // zliczanie rozmiaru dla VBO sektroa - void RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start); // wypełnianie VBO + int RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vertexcount); // wypełnianie VBO void RaRenderVBO(int iPtr); // renderowanie z VBO sektora void RenderDyn(); // renderowanie nieprzezroczystych pojazdów (oba tryby) void RenderDynAlpha(); // renderowanie przezroczystych pojazdów (oba tryby) diff --git a/Traction.cpp b/Traction.cpp index 4aa4d8d3..8324854a 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -324,8 +324,10 @@ int TTraction::RaArrayPrepare() return iLines; }; -void TTraction::RaArrayFill(CVertNormTex *Vert) +int TTraction::RaArrayFill(CVertNormTex *Vert) { // wypełnianie tablic VBO + int debugvertexcount{ 0 }; + double ddp = std::hypot(pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z); if (Wires == 2) WireOffset = 0; @@ -334,10 +336,12 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->y = pPoint1.y; Vert->z = pPoint1.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; ++Vert; + ++debugvertexcount; Vert->x = pPoint2.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; Vert->y = pPoint2.y; Vert->z = pPoint2.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; ++Vert; + ++debugvertexcount; // Nie wiem co 'Marcin Math3D::vector3 pt1, pt2, pt3, pt4, v1, v2; v1 = pPoint4 - pPoint3; @@ -355,6 +359,7 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->y = pPoint3.y; Vert->z = pPoint3.z; ++Vert; + ++debugvertexcount; for (int i = 0; i < iNumSections - 1; ++i) { pt3 = pPoint3 + v1 * f; @@ -366,6 +371,7 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference; Vert->z = pt3.z; ++Vert; + ++debugvertexcount; } f += step; } @@ -373,6 +379,7 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->y = pPoint4.y; Vert->z = pPoint4.z; ++Vert; + ++debugvertexcount; } // Drugi przewod jezdny 'Winger if (Wires > 2) @@ -381,10 +388,12 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->y = pPoint1.y; Vert->z = pPoint1.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset; ++Vert; + ++debugvertexcount; Vert->x = pPoint2.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset; Vert->y = pPoint2.y; Vert->z = pPoint2.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset; ++Vert; + ++debugvertexcount; } f = step; @@ -394,6 +403,7 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->y = pPoint3.y - 0.65f * fHeightDifference; Vert->z = pPoint3.z; ++Vert; + ++debugvertexcount; for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; t = ( 1 - std::fabs( f - mid ) * 2 ); @@ -405,11 +415,14 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) 0.05 ); Vert->z = pt3.z; ++Vert; + ++debugvertexcount; f += step; } Vert->x = pPoint4.x; Vert->y = pPoint4.y - 0.65f * fHeightDifference; Vert->z = pPoint4.z; + ++Vert; + ++debugvertexcount; } f = step; @@ -430,20 +443,24 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ); Vert->z = pt3.z; ++Vert; + ++debugvertexcount; Vert->x = pt4.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; Vert->y = pt4.y; Vert->z = pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; ++Vert; + ++debugvertexcount; } else { Vert->x = pt3.x; Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ); Vert->z = pt3.z; ++Vert; + ++debugvertexcount; Vert->x = pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; Vert->y = pt4.y; Vert->z = pt4.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; ++Vert; + ++debugvertexcount; } if( ( ( Wires == 4 ) && ( ( i == 1 ) @@ -452,14 +469,17 @@ void TTraction::RaArrayFill(CVertNormTex *Vert) Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - 0.05; Vert->z = pt3.z; ++Vert; + ++debugvertexcount; Vert->x = pt3.x; Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference; Vert->z = pt3.z; ++Vert; + ++debugvertexcount; } f += step; } } + return debugvertexcount; }; void TTraction::RenderVBO(float mgn, int iPtr) diff --git a/Traction.h b/Traction.h index e1484819..e276bf59 100644 --- a/Traction.h +++ b/Traction.h @@ -68,7 +68,7 @@ class TTraction // virtual void SelectedRender(); void RenderDL(float mgn); int RaArrayPrepare(); - void RaArrayFill(CVertNormTex *Vert); + int RaArrayFill(CVertNormTex *Vert); void RenderVBO(float mgn, int iPtr); int TestPoint(Math3D::vector3 *Point); void Connect(int my, TTraction *with, int to); diff --git a/version.h b/version.h index 5ecf5416..b942025d 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 517 +#define VERSION_MINOR 519 #define VERSION_REVISION 0 From e805533f54f10f9d73913c349662fde595149b03 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 20 May 2017 21:09:03 +0200 Subject: [PATCH 109/426] build 170520. compressor activation for multi-unit engines, gamepad support toggle, local brake logic fix for multi-unit engines --- Driver.cpp | 137 +++++++++++++++++++++++---------------------- DynObj.cpp | 3 +- EU07.cpp | 4 +- Globals.cpp | 6 ++ Globals.h | 2 +- McZapkie/Mover.cpp | 132 +++++++++++++++++++++++++++++-------------- Segment.cpp | 3 + Track.cpp | 6 +- World.cpp | 9 ++- version.h | 2 +- 10 files changed, 182 insertions(+), 122 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 5dc88575..779fe395 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2246,76 +2246,79 @@ bool TController::ReleaseEngine() bool TController::IncBrake() { // zwiększenie hamowania bool OK = false; - switch (mvOccupied->BrakeSystem) - { - case Individual: - if (mvOccupied->LocalBrake == ManualBrake) - OK = mvOccupied->IncManualBrakeLevel( 1 + static_cast( std::floor( 0.5 + std::fabs(AccDesired))) ); - else - OK = mvOccupied->IncLocalBrakeLevel( std::floor( 1.5 + std::abs( AccDesired ) ) ); - break; - case Pneumatic: - // NOTE: can't perform just test whether connected vehicle == nullptr, due to virtual couplers formed with nearby vehicles - if ((mvOccupied->Couplers[0].CouplingFlag == 0) && - (mvOccupied->Couplers[1].CouplingFlag == 0)) - OK = mvOccupied->IncLocalBrakeLevel( - 1 + static_cast( std::floor( 0.5 + std::fabs(AccDesired))) ); // hamowanie lokalnym bo luzem jedzie - else - { - if (mvOccupied->BrakeCtrlPos + 1 == mvOccupied->BrakeCtrlPosNo) - { - if (AccDesired < -1.5) // hamowanie nagle - OK = mvOccupied->IncBrakeLevel(); - else - OK = false; + switch( mvOccupied->BrakeSystem ) { + case Individual: { + if( mvOccupied->LocalBrake == ManualBrake ) { + OK = mvOccupied->IncManualBrakeLevel( 1 + static_cast( std::floor( 0.5 + std::fabs( AccDesired ) ) ) ); + } + else { + OK = mvOccupied->IncLocalBrakeLevel( std::floor( 1.5 + std::abs( AccDesired ) ) ); + } + break; + } + case Pneumatic: { + // NOTE: can't perform just test whether connected vehicle == nullptr, due to virtual couplers formed with nearby vehicles + bool standalone{ true }; + if( ( mvOccupied->TrainType == dt_ET41 ) + || ( mvOccupied->TrainType == dt_ET42 ) ) { + // NOTE: we're doing simplified checks full of presuptions here. + // they'll break if someone does strange thing like turning around the second unit + if( ( mvOccupied->Couplers[ 1 ].CouplingFlag & coupling::permanent ) + && ( mvOccupied->Couplers[ 1 ].Connected->Couplers[ 1 ].CouplingFlag > 0 ) ) { + standalone = false; + } + if( ( mvOccupied->Couplers[ 0 ].CouplingFlag & coupling::permanent ) + && ( mvOccupied->Couplers[ 0 ].Connected->Couplers[ 0 ].CouplingFlag > 0 ) ) { + standalone = false; + } + } + else { + standalone = + ( ( mvOccupied->Couplers[ 0 ].CouplingFlag == 0 ) + && ( mvOccupied->Couplers[ 1 ].CouplingFlag == 0 ) ); + } + if( true == standalone ) { + OK = mvOccupied->IncLocalBrakeLevel( + 1 + static_cast( std::floor( 0.5 + std::fabs( AccDesired ) ) ) ); // hamowanie lokalnym bo luzem jedzie + } + else { + if( mvOccupied->BrakeCtrlPos + 1 == mvOccupied->BrakeCtrlPosNo ) { + if( AccDesired < -1.5 ) // hamowanie nagle + OK = mvOccupied->IncBrakeLevel(); + else + OK = false; + } + else { + // dodane dla towarowego + if( mvOccupied->BrakeDelayFlag == bdelay_G ? + -AccDesired * 6.6 > std::min( 2, mvOccupied->BrakeCtrlPos ) : + true ) { + OK = mvOccupied->IncBrakeLevel(); + } + else + OK = false; + } + } + if( mvOccupied->BrakeCtrlPos > 0 ) { + mvOccupied->BrakeReleaser( 0 ); + } + break; + } + case ElectroPneumatic: { + if( mvOccupied->EngineType == ElectricInductionMotor ) { + OK = mvOccupied->IncLocalBrakeLevel( 1 ); + } + else if( mvOccupied->fBrakeCtrlPos != mvOccupied->Handle->GetPos( bh_EPB ) ) { + mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_EPB ) ); + if( mvOccupied->Handle->GetPos( bh_EPR ) - mvOccupied->Handle->GetPos( bh_EPN ) < 0.1 ) + mvOccupied->SwitchEPBrake( 1 ); // to nie chce działać + OK = true; } else - { - /* - if (AccDesired>-0.2) and ((Vel<20) or (Vel-VelNext<10))) - begin - if BrakeCtrlPos>0) - OK:=IncBrakeLevel - else; - OK:=IncLocalBrakeLevel(1); //finezyjne hamowanie lokalnym - end - else - */ - // dodane dla towarowego - if (mvOccupied->BrakeDelayFlag == bdelay_G ? - -AccDesired * 6.6 > std::min(2, mvOccupied->BrakeCtrlPos) : - true) - { - OK = mvOccupied->IncBrakeLevel(); - } - else - OK = false; - } + OK = false; + break; } - if (mvOccupied->BrakeCtrlPos > 0) - mvOccupied->BrakeReleaser(0); - break; - case ElectroPneumatic: - if (mvOccupied->EngineType == ElectricInductionMotor) - { - OK = mvOccupied->IncLocalBrakeLevel(1); - } - else if (mvOccupied->fBrakeCtrlPos != mvOccupied->Handle->GetPos(bh_EPB)) - { - mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_EPB)); - if (mvOccupied->Handle->GetPos(bh_EPR) - mvOccupied->Handle->GetPos(bh_EPN) < 0.1) - mvOccupied->SwitchEPBrake(1); // to nie chce działać - OK = true; - } - else - OK = false; - // if (mvOccupied->BrakeCtrlPosBrakeCtrlPosNo) - // if - // (mvOccupied->BrakePressureTable[mvOccupied->BrakeCtrlPos+1+2].BrakeType==ElectroPneumatic) - // //+2 to indeks Pascala - // OK=mvOccupied->IncBrakeLevel(); - // else - // OK=false; + default: { break; } } return OK; } diff --git a/DynObj.cpp b/DynObj.cpp index 47e6e18b..3441c328 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1879,8 +1879,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" { // McZapkie-040602: jeśli coś siedzi w pojeździe if (Name == Global::asHumanCtrlVehicle) // jeśli pojazd wybrany do prowadzenia { - if (DebugModeFlag ? false : MoverParameters->EngineType != - Dumb) // jak nie Debugmode i nie jest dumbem + if ( MoverParameters->EngineType != Dumb) Controller = Humandriver; // wsadzamy tam sterującego else // w przeciwnym razie trzeba włączyć pokazywanie kabiny bDisplayCab = true; diff --git a/EU07.cpp b/EU07.cpp index 291933d4..90a57219 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -411,7 +411,9 @@ int main(int argc, char *argv[]) && GfxRenderer.Render()) { glfwPollEvents(); - input::Gamepad.poll(); + if( true == Global::InputGamepad ) { + input::Gamepad.poll(); + } } Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) } diff --git a/Globals.cpp b/Globals.cpp index d34088fe..277b01ad 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -110,6 +110,7 @@ int Global::iWindowHeight = 600; float Global::fDistanceFactor = Global::ScreenHeight / 768.0; // baza do przeliczania odległości dla LoD int Global::iFeedbackMode = 1; // tryb pracy informacji zwrotnej int Global::iFeedbackPort = 0; // dodatkowy adres dla informacji zwrotnych +bool Global::InputGamepad{ true }; bool Global::bFreeFly = false; bool Global::bFullScreen = false; bool Global::VSync{ false }; @@ -801,6 +802,11 @@ void Global::ConfigParse(cParser &Parser) >> Global::Background[1] // g >> Global::Background[2]; // b } + else if( token == "input.gamepad" ) { + // czy grupować eventy o tych samych nazwach + Parser.getTokens(); + Parser >> Global::InputGamepad; + } // maciek001: ustawienia MWD else if (token == "mwdmasterenable") { // główne włączenie maszyny! Parser.getTokens(); diff --git a/Globals.h b/Globals.h index c44fef01..91664442 100644 --- a/Globals.h +++ b/Globals.h @@ -255,6 +255,7 @@ class Global static std::string LastGLError; static int iFeedbackMode; // tryb pracy informacji zwrotnej static int iFeedbackPort; // dodatkowy adres dla informacji zwrotnych + static bool InputGamepad; // whether gamepad support is enabled static double fLuminance; // jasność światła do automatycznego zapalania static float SunAngle; // angle of the sun relative to horizon static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji @@ -287,7 +288,6 @@ class Global static int iKeyLast; // ostatnio naciśnięty klawisz w celu logowania static int iPause; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie static bool bActive; // czy jest aktywnym oknem - static void BindTexture(GLuint t); static int iConvertModels; // tworzenie plików binarnych static int iErorrCounter; // licznik sprawdzań do śledzenia błędów OpenGL static bool bInactivePause; // automatyczna pauza, gdy okno nieaktywne diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index c171722b..29475923 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3063,56 +3063,104 @@ void TMoverParameters::CompressorCheck(double dt) CompressorFlag = false; // bez tamtego członu nie zadziała } else - CompressorFlag = (CompressorAllow) && - ((ConverterFlag) || (CompressorPower == 0)) && (Mains); + CompressorFlag = + ( ( CompressorAllow ) + && ( Mains ) + && ( ( ConverterFlag ) + || ( CompressorPower == 0 ) ) ); + if( Compressor > MaxCompressor ) { // wyłącznik ciśnieniowy jest niezależny od sposobu zasilania CompressorFlag = false; CompressorGovernorLock = true; // prevent manual activation until the pressure goes below cut-in level } - } - else // jeśli nie załączona - if( ( ( Compressor < MinCompressor ) - || ( ( Compressor < MaxCompressor ) - && ( false == CompressorGovernorLock ) ) ) - && (LastSwitchingTime > CtrlDelay) ) { - // załączenie przy małym ciśnieniu - // jeśli nie załączona, a ciśnienie za małe - // or if the switch is on and the pressure isn't maxed - if( CompressorPower == 5 ) // jeśli zasilanie z następnego członu - { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if (Couplers[1].Connected != NULL) - CompressorFlag = - (Couplers[1].Connected->CompressorAllow && - Couplers[1].Connected->ConverterFlag && Couplers[1].Connected->Mains); - else - CompressorFlag = false; // bez tamtego członu nie zadziała - } - else if (CompressorPower == 4) // jeśli zasilanie z poprzedniego członu - { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if (Couplers[0].Connected != NULL) - CompressorFlag = - (Couplers[0].Connected->CompressorAllow && - Couplers[0].Connected->ConverterFlag && Couplers[0].Connected->Mains); - else - CompressorFlag = false; // bez tamtego członu nie zadziała - } - else - CompressorFlag = (CompressorAllow) && - ((ConverterFlag) || (CompressorPower == 0)) && (Mains); - if( CompressorFlag ) { - // jeśli została załączona - LastSwitchingTime = 0; // to trzeba ograniczyć ponowne włączenie - if( Compressor < MinCompressor ) { - // if the activation took place at pressure below the cut-in level, we can reset compressor governor - CompressorGovernorLock = false; + + if( ( TrainType == dt_ET41 ) + || ( TrainType == dt_ET42 ) ) { + // for these multi-unit engines compressors turn off whenever any of them was affected by the governor + // NOTE: this is crude implementation, TODO: re-implement when a more elegant/flexible system is in place + if( ( Couplers[ 1 ].Connected != nullptr ) + && ( true == TestFlag( Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + CompressorFlag &= ( Couplers[ 1 ].Connected->CompressorGovernorLock == false ); + } + if( ( Couplers[ 0 ].Connected != nullptr ) + && ( true == TestFlag( Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { + // the second unit isn't allowed to start its compressor until first unit can start its own as well + CompressorFlag &= ( Couplers[ 0 ].Connected->CompressorGovernorLock == false ); } } } - // for b:=0 to 1 do //z Megapacka - // with Couplers[b] do - // if TestFlag(CouplingFlag,ctrain_scndpneumatic) then - // Connected.CompressorFlag:=CompressorFlag; + else { + // jeśli nie załączona + if( Compressor < MinCompressor ) { + // if the pressure drops below the cut-in level, we can reset compressor governor + CompressorGovernorLock = false; + } + + if( ( ( Compressor < MinCompressor ) + || ( ( Compressor < MaxCompressor ) + && ( false == CompressorGovernorLock ) ) ) + && ( LastSwitchingTime > CtrlDelay ) ) { + // załączenie przy małym ciśnieniu + // jeśli nie załączona, a ciśnienie za małe + // or if the switch is on and the pressure isn't maxed + if( CompressorPower == 5 ) // jeśli zasilanie z następnego członu + { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) + if( Couplers[ 1 ].Connected != nullptr ) { + CompressorFlag = + ( Couplers[ 1 ].Connected->CompressorAllow + && Couplers[ 1 ].Connected->ConverterFlag + && Couplers[ 1 ].Connected->Mains ); + } + else { + CompressorFlag = false; // bez tamtego członu nie zadziała + } + } + else if( CompressorPower == 4 ) // jeśli zasilanie z poprzedniego członu + { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) + if( Couplers[ 0 ].Connected != nullptr ) { + CompressorFlag = + ( Couplers[ 0 ].Connected->CompressorAllow + && Couplers[ 0 ].Connected->ConverterFlag + && Couplers[ 0 ].Connected->Mains ); + } + else { + CompressorFlag = false; // bez tamtego członu nie zadziała + } + } + else { + CompressorFlag = + ( ( CompressorAllow ) + && ( Mains ) + && ( ( ConverterFlag ) + || ( CompressorPower == 0 ) ) ); + } + + // NOTE: crude way to enforce simultaneous activation of compressors in multi-unit setups + // TODO: replace this with a more universal activation system down the road + if( ( TrainType == dt_ET41 ) + || ( TrainType == dt_ET42 ) ) { + + if( ( Couplers[1].Connected != nullptr ) + && ( true == TestFlag( Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + CompressorFlag &= ( Couplers[ 1 ].Connected->CompressorGovernorLock == false ); + } + if( ( Couplers[ 0 ].Connected != nullptr ) + && ( true == TestFlag( Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { + // the second unit isn't allowed to start its compressor until first unit can start its own as well + CompressorFlag &= ( Couplers[ 0 ].Connected->CompressorGovernorLock == false ); + } + } + + if( CompressorFlag ) { + // jeśli została załączona + LastSwitchingTime = 0; // to trzeba ograniczyć ponowne włączenie + } + } + } + if (CompressorFlag) if ((EngineType == DieselElectric) && (CompressorPower > 0)) CompressedVolume += dt * CompressorSpeed * (2.0 * MaxCompressor - Compressor) / diff --git a/Segment.cpp b/Segment.cpp index 75a8e335..efbb6027 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -114,7 +114,10 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI { ErrorLog( "Bad geometry (zero length) for spline \"" + pOwner->NameGet() + "\" at " + Where( Point1 ) ); // MessageBox(0,"Length<=0","TSegment::Init",MB_OK); + fLength = 0.01; // crude workaround TODO: fix this properly +/* return false; // zerowe nie mogą być +*/ } if( ( pOwner->eType == tt_Switch ) diff --git a/Track.cpp b/Track.cpp index 56e21423..49d00988 100644 --- a/Track.cpp +++ b/Track.cpp @@ -532,7 +532,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) // na przechyłce doliczyć jeszcze pół przechyłki } if( fRadius != 0 ) // gdy podany promień - segsize = clamp( 0.2 + fabs( fRadius ) * 0.02, 2.5, 10.0 ); + segsize = clamp( 0.2 + std::fabs( fRadius ) * 0.02, 2.0, 10.0 ); else segsize = 10.0; // for straights, 10m per segment works good enough @@ -595,7 +595,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) // na przechyłce doliczyć jeszcze pół przechyłki? } if (fRadiusTable[0] > 0) - segsize = clamp( 0.2 + fRadiusTable[0] * 0.02, 2.5, 5.0 ); + segsize = clamp( 0.2 + fRadiusTable[0] * 0.02, 2.0, 5.0 ); else if (eType != tt_Cross) // dla skrzyżowań muszą być podane kontrolne { // jak promień zerowy, to przeliczamy punkty kontrolne cp1 = (p1 + p1 + p2) / 3.0 - p1; // jak jest prosty, to się zoptymalizuje @@ -625,7 +625,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) } if (fRadiusTable[1] > 0) - segsize = clamp( 0.2 + fRadiusTable[ 1 ] * 0.02, 2.5, 5.0 ); + segsize = clamp( 0.2 + fRadiusTable[ 1 ] * 0.02, 2.0, 5.0 ); else if (eType != tt_Cross) // dla skrzyżowań muszą być podane kontrolne { // jak promień zerowy, to przeliczamy punkty kontrolne diff --git a/World.cpp b/World.cpp index 5ca62383..1a0cf45e 100644 --- a/World.cpp +++ b/World.cpp @@ -375,11 +375,12 @@ bool TWorld::Init( GLFWwindow *Window ) { WriteLog( "Load time: " + std::to_string( std::chrono::duration_cast(( std::chrono::system_clock::now() - timestart )).count() ) + " seconds"); +/* if (DebugModeFlag) // w Debugmode automatyczne włączenie AI if (Train) if (Train->Dynamic()->Mechanik) Train->Dynamic()->Mechanik->TakeControl(true); - +*/ UILayer.set_progress(); UILayer.set_background( "" ); UILayer.clear_texts(); @@ -1748,11 +1749,9 @@ TWorld::Update_UI() { Global::Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), ( ( owner->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) - && ( time.wHour >= tableline->Dh ) - && ( time.wMinute >= tableline->Dm ) ? + && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ? float4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono - Global::UITextColor ) - ); + Global::UITextColor ) ); // divider/footer UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global::UITextColor ); } diff --git a/version.h b/version.h index b942025d..5102dd54 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 519 +#define VERSION_MINOR 520 #define VERSION_REVISION 0 From 9f07e2b5040a324205eed9e760c1095c7155dc91 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 23 May 2017 02:25:56 +0200 Subject: [PATCH 110/426] switches for local converter and compressor, motor connector fix for multi-unit engines, crossroad generation fixes for vbo render path --- Driver.cpp | 15 +-- Ground.cpp | 40 ++----- McZapkie/MOVER.h | 4 + McZapkie/Mover.cpp | 33 ++++-- Segment.cpp | 23 ++-- Segment.h | 2 + Track.cpp | 288 ++++++++++++++++++++------------------------- Track.h | 2 +- Train.cpp | 247 ++++++++++++++++++++++++++++++++++---- Train.h | 4 + World.cpp | 4 +- command.cpp | 2 + command.h | 2 + keyboardinput.cpp | 4 + keyboardinput.h | 2 +- version.h | 2 +- 16 files changed, 425 insertions(+), 249 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 779fe395..97c7ee03 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -869,8 +869,9 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // if (p7&3) //żeby jeszcze poczekał chwilę, zanim zamknie // WaitingSet(10); //10 sekund (wziąć z rozkładu????) } - if (fStopTime > -5) // na końcu rozkładu się ustawia 60s i tu by było skrócenie - WaitingSet(10); // 10 sekund (wziąć z rozkładu????) - czekanie + + if( fStopTime > -5 ) // na końcu rozkładu się ustawia 60s i tu by było skrócenie + WaitingSet( 15.0 + Random( 15.0 ) ); // 10 sekund (wziąć z rozkładu????) - czekanie // niezależne od sposobu obsługi drzwi, bo opóźnia również kierownika } if (TrainParams->UpdateMTable( simulation::Time, asNextStop) ) @@ -980,11 +981,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN sSpeedTable[i].fVelNext = -1; // można jechać za W4 fLastStopExpDist = -1.0f; // nie ma rozkładu, nie ma usuwania stacji WaitingSet(60); // tak ze 2 minuty, aż wszyscy wysiądą - JumpToNextOrder(); // wykonanie kolejnego rozkazu (Change_direction - // albo Shunt) - iDrivigFlags |= moveStopHere | moveStartHorn; // ma się nie ruszać - // aż do momentu - // podania sygnału + // wykonanie kolejnego rozkazu (Change_direction albo Shunt) + JumpToNextOrder(); + // ma się nie ruszać aż do momentu podania sygnału + iDrivigFlags |= moveStopHere | moveStartHorn; continue; // nie analizować prędkości } // koniec obsługi ostatniej stacji } // if (MoverParameters->Vel==0.0) @@ -4142,6 +4142,7 @@ bool TController::UpdateSituation(double dt) ->TTVmax); // jesli nie spozniony to nie przekraczać rozkladowej if (VelDesired > 0.0) if( ( ( SemNextIndex != -1 ) + && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) || ( ( iDrivigFlags & moveStopHere ) == 0 ) ) { // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w diff --git a/Ground.cpp b/Ground.cpp index 087e76fb..cbebea27 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -787,7 +787,6 @@ void TSubRect::LoadNodes() return; // jeśli nie ma obiektów do wyświetlenia z VBO, to koniec if (Global::bUseVBO) { // tylko liczenie wierzchołów, gdy nie ma VBO - int debugvertexcount{ 0 }; MakeArray(m_nVertexCount); n = nRootNode; int i; @@ -809,9 +808,7 @@ void TSubRect::LoadNodes() m_pVNT[n->iVboPtr + i].nz = n->Vertices[i].Normal.z; m_pVNT[n->iVboPtr + i].u = n->Vertices[i].tu; m_pVNT[n->iVboPtr + i].v = n->Vertices[i].tv; - ++debugvertexcount; } - assert( debugvertexcount <= m_nVertexCount ); break; case GL_LINES: case GL_LINE_STRIP: @@ -822,34 +819,24 @@ void TSubRect::LoadNodes() m_pVNT[n->iVboPtr + i].y = n->Points[i].y; m_pVNT[n->iVboPtr + i].z = n->Points[i].z; // miejsce w tablicach normalnych i teksturowania się marnuje... - ++debugvertexcount; } - assert( debugvertexcount <= m_nVertexCount ); break; case TP_TRACK: if( n->iNumVerts ) { // bo tory zabezpieczające są niewidoczne #ifdef EU07_USE_OLD_VERTEXBUFFER - int const batch = n->pTrack->RaArrayFill( m_pVNT + n->iVboPtr, m_pVNT, std::min( n->iNumVerts, m_nVertexCount - n->iVboPtr ) ); + n->pTrack->RaArrayFill( m_pVNT + n->iVboPtr, m_pVNT, std::min( n->iNumVerts, m_nVertexCount - n->iVboPtr ) ); #else - int const batch = n->pTrack->RaArrayFill( m_pVNT.data() + n->iVboPtr, m_pVNT.data(), std::min( n->iNumVerts, m_nVertexCount - n->iVboPtr ) ); + n->pTrack->RaArrayFill( m_pVNT.data() + n->iVboPtr, m_pVNT.data(), std::min( n->iNumVerts, m_nVertexCount - n->iVboPtr ) ); #endif - assert( batch == n->iNumVerts ); - assert( batch + n->iVboPtr <= m_nVertexCount ); - debugvertexcount += batch; - assert( debugvertexcount <= m_nVertexCount ); } break; case TP_TRACTION: if( n->iNumVerts ) { // druty mogą być niewidoczne...? #ifdef EU07_USE_OLD_VERTEXBUFFER - int const batch = n->hvTraction->RaArrayFill( m_pVNT + n->iVboPtr ); + n->hvTraction->RaArrayFill( m_pVNT + n->iVboPtr ); #else - int const batch = n->hvTraction->RaArrayFill( m_pVNT.data() + n->iVboPtr ); + n->hvTraction->RaArrayFill( m_pVNT.data() + n->iVboPtr ); #endif - assert( batch == n->iNumVerts ); - assert( batch + n->iVboPtr <= m_nVertexCount ); - debugvertexcount += batch; - assert( debugvertexcount <= m_nVertexCount ); } break; } @@ -1333,17 +1320,14 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) TGroundNode *tmp1; TTrack *Track; std::string token; - parser->getTokens(2); - *parser >> r >> rmin; - parser->getTokens(); - *parser >> token; - asNodeName = token; - parser->getTokens(); - *parser >> token; - str = token; + parser->getTokens(4); + *parser + >> r + >> rmin + >> asNodeName + >> str; //str = AnsiString(token.c_str()); - TGroundNode *tmp; - tmp = new TGroundNode(); + TGroundNode *tmp = new TGroundNode(); tmp->asName = (asNodeName == "none" ? "" : asNodeName); if (r >= 0) tmp->fSquareRadius = r * r; @@ -2186,7 +2170,7 @@ bool TGround::Init(std::string File) if (!LastNode->Vertices) SafeDelete(LastNode); // usuwamy nieprzezroczyste trójkąty terenu } - else if (Global::bLoadTraction ? false : LastNode->iType == TP_TRACTION) + else if ( ( LastNode->iType == TP_TRACTION ) && ( false == Global::bLoadTraction ) ) SafeDelete(LastNode); // usuwamy druty, jeśli wyłączone if (LastNode) // dopiero na koniec dopisujemy do tablic if (LastNode->iType != TP_DYNAMIC) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 95c0adad..36df83ce 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -847,12 +847,14 @@ public: bool CompressorFlag = false; /*!o czy wlaczona sprezarka*/ bool PantCompFlag = false; /*!o czy wlaczona sprezarka pantografow*/ bool CompressorAllow = false; /*! zezwolenie na uruchomienie sprezarki NBMX*/ + bool CompressorAllowLocal{ true }; // local device state override (most units don't have this fitted so it's set to true not to intefere) bool CompressorGovernorLock{ false }; // indicates whether compressor pressure switch was activated due to reaching cut-out pressure // TODO converter parameters, for when we start cleaning up mover parameters start ConverterStart{ manual }; // whether converter is started manually, or by other means float ConverterStartDelay{ 0.0f }; // delay (in seconds) before the converter is started, once its activation conditions are met double ConverterStartDelayTimer{ 0.0 }; // helper, for tracking whether converter start delay passed bool ConverterAllow = false; /*zezwolenie na prace przetwornicy NBMX*/ + bool ConverterAllowLocal{ true }; // local device state override (most units don't have this fitted so it's set to true not to intefere) bool ConverterFlag = false; /*! czy wlaczona przetwornica NBMX*/ int BrakeCtrlPos = -2; /*nastawa hamulca zespolonego*/ @@ -978,8 +980,10 @@ public: int PantRearStart = 0; double PantFrontVolt = 0.0; //pantograf pod napieciem? 'Winger 160404 double PantRearVolt = 0.0; + // TODO: move these switch types where they belong, cabin definition std::string PantSwitchType; std::string ConvSwitchType; + std::string StLinSwitchType; bool Heating = false; //ogrzewanie 'Winger 020304 int DoubleTr = 1; //trakcja ukrotniona - przedni pojazd 'Winger 160304 diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 29475923..74a80001 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1565,6 +1565,7 @@ double TMoverParameters::ShowEngineRotation(int VehN) void TMoverParameters::ConverterCheck( double const Timestep ) { // TODO: move other converter checks here, to have it all in one place for potential device object if( ( ConverterAllow ) + && ( ConverterAllowLocal ) && ( false == PantPressLockActive ) && ( Mains ) ) { // delay timer can be optionally configured, and is set anew whenever converter goes off @@ -3018,7 +3019,7 @@ void TMoverParameters::CompressorCheck(double dt) if (MaxCompressor - MinCompressor < 0.0001) { // if (Mains && (MainCtrlPos > 1)) - if (CompressorAllow && Mains && (MainCtrlPos > 0)) + if (CompressorAllow && CompressorAllowLocal && Mains && (MainCtrlPos > 0)) { if (Compressor < MaxCompressor) if ((EngineType == DieselElectric) && (CompressorPower > 0)) @@ -3048,8 +3049,10 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if (Couplers[1].Connected != NULL) CompressorFlag = - (Couplers[1].Connected->CompressorAllow && - Couplers[1].Connected->ConverterFlag && Couplers[1].Connected->Mains); + ( Couplers[ 1 ].Connected->CompressorAllow + && Couplers[ 1 ].Connected->CompressorAllowLocal + && Couplers[ 1 ].Connected->Mains + && Couplers[ 1 ].Connected->ConverterFlag ); else CompressorFlag = false; // bez tamtego członu nie zadziała } @@ -3057,14 +3060,17 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if (Couplers[0].Connected != NULL) CompressorFlag = - (Couplers[0].Connected->CompressorAllow && - Couplers[0].Connected->ConverterFlag && Couplers[0].Connected->Mains); + ( Couplers[ 0 ].Connected->CompressorAllow + && Couplers[ 0 ].Connected->CompressorAllowLocal + && Couplers[ 0 ].Connected->Mains + && Couplers[ 0 ].Connected->ConverterFlag ); else CompressorFlag = false; // bez tamtego członu nie zadziała } else CompressorFlag = ( ( CompressorAllow ) + && ( CompressorAllowLocal ) && ( Mains ) && ( ( ConverterFlag ) || ( CompressorPower == 0 ) ) ); @@ -3080,12 +3086,12 @@ void TMoverParameters::CompressorCheck(double dt) // for these multi-unit engines compressors turn off whenever any of them was affected by the governor // NOTE: this is crude implementation, TODO: re-implement when a more elegant/flexible system is in place if( ( Couplers[ 1 ].Connected != nullptr ) - && ( true == TestFlag( Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { + && ( true == TestFlag( Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { // the first unit isn't allowed to start its compressor until second unit can start its own as well CompressorFlag &= ( Couplers[ 1 ].Connected->CompressorGovernorLock == false ); } if( ( Couplers[ 0 ].Connected != nullptr ) - && ( true == TestFlag( Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { + && ( true == TestFlag( Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { // the second unit isn't allowed to start its compressor until first unit can start its own as well CompressorFlag &= ( Couplers[ 0 ].Connected->CompressorGovernorLock == false ); } @@ -3110,8 +3116,9 @@ void TMoverParameters::CompressorCheck(double dt) if( Couplers[ 1 ].Connected != nullptr ) { CompressorFlag = ( Couplers[ 1 ].Connected->CompressorAllow - && Couplers[ 1 ].Connected->ConverterFlag - && Couplers[ 1 ].Connected->Mains ); + && Couplers[ 1 ].Connected->CompressorAllowLocal + && Couplers[ 1 ].Connected->Mains + && Couplers[ 1 ].Connected->ConverterFlag ); } else { CompressorFlag = false; // bez tamtego członu nie zadziała @@ -3122,8 +3129,9 @@ void TMoverParameters::CompressorCheck(double dt) if( Couplers[ 0 ].Connected != nullptr ) { CompressorFlag = ( Couplers[ 0 ].Connected->CompressorAllow - && Couplers[ 0 ].Connected->ConverterFlag - && Couplers[ 0 ].Connected->Mains ); + && Couplers[ 0 ].Connected->CompressorAllowLocal + && Couplers[ 0 ].Connected->Mains + && Couplers[ 0 ].Connected->ConverterFlag ); } else { CompressorFlag = false; // bez tamtego członu nie zadziała @@ -3132,6 +3140,7 @@ void TMoverParameters::CompressorCheck(double dt) else { CompressorFlag = ( ( CompressorAllow ) + && ( CompressorAllowLocal ) && ( Mains ) && ( ( ConverterFlag ) || ( CompressorPower == 0 ) ) ); @@ -7303,9 +7312,11 @@ void TMoverParameters::LoadFIZ_Switches( std::string const &Input ) { extract_value( PantSwitchType, "Pantograph", Input, "" ); extract_value( ConvSwitchType, "Converter", Input, "" ); + extract_value( StLinSwitchType, "MotorConnectors", Input, "" ); // because people can't make up their minds whether it's "impulse" or "Impulse"... PantSwitchType = ToLower( PantSwitchType ); ConvSwitchType = ToLower( ConvSwitchType ); + StLinSwitchType = ToLower( StLinSwitchType ); } void TMoverParameters::LoadFIZ_MotorParamTable( std::string const &Input ) { diff --git a/Segment.cpp b/Segment.cpp index efbb6027..194c3209 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -130,6 +130,7 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI SafeDeleteArray(fTsBuffer); iSegCount = static_cast( std::ceil( fLength / fStep ) ); // potrzebne do VBO + fStep = fLength / iSegCount; // update step to equalize size of individual pieces fTsBuffer = new double[ iSegCount + 1 ]; fTsBuffer[ 0 ] = 0.0; for( int i = 1; i < iSegCount; ++i ) { @@ -324,10 +325,10 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli // podany jest przekrój końcowy // podsypka toru jest robiona za pomocą 6 punktów, szyna 12, drogi i rzeki na 3+2+3 - int debugvertexcount{ 0 }; + int vertexcount{ 0 }; if( !fTsBuffer ) - return debugvertexcount; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę + return vertexcount; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę vector3 pos1, pos2, dir, parallel1, parallel2, pt, norm; double s, step, fOffset, tv1, tv2, t, fEnd; @@ -352,8 +353,6 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int m2 = s / fEnd; jmm2 = 1.0 - m2; - int const debugvertexlimit = std::abs( iNumShapePoints ) * 2 * ( iEnd - iSkip ); - while( i < iEnd ) { ++i; // kolejny punkt łamanej @@ -416,7 +415,7 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int } ++Output; } - ++debugvertexcount; + ++vertexcount; } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -454,7 +453,7 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int } ++Output; } - ++debugvertexcount; + ++vertexcount; } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -463,8 +462,6 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int *( *p ) = pt; ( *p )++; } // zapamiętanie brzegu jezdni - - assert( debugvertexcount <= debugvertexlimit ); } } else { @@ -498,7 +495,7 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int } ++Output; } - ++debugvertexcount; + ++vertexcount; pt = parallel2 * ShapePoints[ j ].x + pos2; pt.y += ShapePoints[ j ].y; @@ -527,9 +524,7 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int } ++Output; } - ++debugvertexcount; - - assert( debugvertexcount <= debugvertexlimit ); + ++vertexcount; } } } @@ -544,9 +539,7 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int } } - assert( debugvertexcount == debugvertexlimit ); - - return debugvertexcount; + return vertexcount; }; void TSegment::Render() diff --git a/Segment.h b/Segment.h index 1c4c84ab..b027d123 100644 --- a/Segment.h +++ b/Segment.h @@ -17,6 +17,8 @@ http://mozilla.org/MPL/2.0/. using namespace Math3D; +#define EU07_DEBUG_VBO + // 110405 Ra: klasa punktów przekroju z normalnymi class vector6 : public vector3 diff --git a/Track.cpp b/Track.cpp index 49d00988..dd3d6a3b 100644 --- a/Track.cpp +++ b/Track.cpp @@ -405,8 +405,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) std::string token; parser->getTokens(); - *parser >> token; - str = token; // typ toru + *parser >> str; // typ toru if (str == "normal") { @@ -460,8 +459,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) if (iDamageFlag & 128) iAction |= 0x80; // flaga wykolejania z powodu uszkodzenia parser->getTokens(); - *parser >> token; - str = token; // environment + *parser >> str; // environment if (str == "flat") eEnvironment = e_flat; else if (str == "mountains" || str == "mountain") @@ -477,7 +475,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) else { eEnvironment = e_unknown; - Error("Unknown track environment: \"" + str + "\""); + Error( "Unknown track environment: \"" + str + "\"" ); } parser->getTokens(); *parser >> token; @@ -485,8 +483,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) if (bVisible) { parser->getTokens(); - *parser >> token; - str = token; // railtex + *parser >> str; // railtex TextureID1 = (str == "none" ? 0 : GfxRenderer.GetTextureId( str, szTexturePath, (iCategoryFlag & 1) ? Global::iRailProFiltering : @@ -496,8 +493,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) if (fTexLength < 0.01) fTexLength = 4; // Ra: zabezpiecznie przed zawieszeniem parser->getTokens(); - *parser >> token; - str = token; // sub || railtex + *parser >> str; // sub || railtex TextureID2 = (str == "none" ? 0 : GfxRenderer.GetTextureId( str, szTexturePath, (eType == tt_Normal) ? Global::iBallastFiltering : @@ -1232,7 +1228,7 @@ void TTrack::Compile(GLuint tex) } break; case tt_Switch: // dla zwrotnicy dwa razy szyny - if (TextureID1) // zwrotnice nie są grupowane, aby prościej było je animować + if (TextureID1 || TextureID2) // zwrotnice nie są grupowane, aby prościej było je animować { // iglice liczone tylko dla zwrotnic // Ra: TODO: oddzielna animacja każdej iglicy, opór na docisku vector6 rpts3[24], rpts4[24]; @@ -1254,27 +1250,34 @@ void TTrack::Compile(GLuint tex) // McZapkie-130302 - poprawione rysowanie szyn if (SwitchExtension->RightSwitch) { // zwrotnica prawa - GfxRenderer.Bind( TextureID1 ); - SwitchExtension->Segments[0]->RenderLoft( immediate, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2); // prawa iglica - SwitchExtension->Segments[0]->RenderLoft( immediate, rpts1, nnumPts, fTexLength, 1.0, 2); // prawa szyna za iglicą - SwitchExtension->Segments[0]->RenderLoft( immediate, rpts2, nnumPts, fTexLength); // lewa szyna normalnie cała - if (TextureID2 != TextureID1) // nie wiadomo, czy OpenGL to optymalizuje + if( TextureID1 ) { + GfxRenderer.Bind( TextureID1 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); // prawa iglica + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts1, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts2, nnumPts, fTexLength ); // lewa szyna normalnie cała + } + if( TextureID2 ) { GfxRenderer.Bind( TextureID2 ); - SwitchExtension->Segments[1]->RenderLoft( immediate, rpts1, nnumPts, fTexLength); // prawa szyna normalna cała - SwitchExtension->Segments[1]->RenderLoft( immediate, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1); // lewa iglica - SwitchExtension->Segments[1]->RenderLoft( immediate, rpts2, nnumPts, fTexLength, 1.0, 2); // lewa szyna za iglicą + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts1, nnumPts, fTexLength ); // prawa szyna normalna cała + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); // lewa iglica + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts2, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą + } } else { // lewa kiedyś działała lepiej niż prawa - GfxRenderer.Bind( TextureID1 ); - SwitchExtension->Segments[0]->RenderLoft( immediate, rpts1, nnumPts, fTexLength); // prawa szyna normalna cała - SwitchExtension->Segments[0]->RenderLoft( immediate, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2); // lewa iglica - SwitchExtension->Segments[0]->RenderLoft( immediate, rpts2, nnumPts, fTexLength, 1.0, 2); // lewa szyna za iglicą - if (TextureID2 != TextureID1) // nie wiadomo, czy OpenGL to optymalizuje + if( TextureID1 ) { + GfxRenderer.Bind( TextureID1 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts1, nnumPts, fTexLength ); // prawa szyna normalna cała + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); // lewa iglica + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts2, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą + } + if( TextureID2 ) { + // nie wiadomo, czy OpenGL to optymalizuje GfxRenderer.Bind( TextureID2 ); - SwitchExtension->Segments[1]->RenderLoft( immediate, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1); // prawa iglica - SwitchExtension->Segments[1]->RenderLoft( immediate, rpts1, nnumPts, fTexLength, 1.0, 2); // prawa szyna za iglicą - SwitchExtension->Segments[1]->RenderLoft( immediate, rpts2, nnumPts, fTexLength); // lewa szyna normalnie cała + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); // prawa iglica + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts1, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts2, nnumPts, fTexLength ); // lewa szyna normalnie cała + } } } break; @@ -1782,31 +1785,33 @@ int TTrack::RaArrayPrepare() if( SwitchExtension->iRoads == 3 ) { // mogą być tylko 3 drogi zamiast 4 SwitchExtension->iPoints = - 5 - + SwitchExtension->Segments[ 0 ]->RaSegCount() + SwitchExtension->Segments[ 0 ]->RaSegCount() + SwitchExtension->Segments[ 1 ]->RaSegCount() + SwitchExtension->Segments[ 2 ]->RaSegCount(); } else { SwitchExtension->iPoints = - 5 - + SwitchExtension->Segments[ 2 ]->RaSegCount() + SwitchExtension->Segments[ 2 ]->RaSegCount() + SwitchExtension->Segments[ 3 ]->RaSegCount() + SwitchExtension->Segments[ 4 ]->RaSegCount() + SwitchExtension->Segments[ 5 ]->RaSegCount(); } +/* if (fTexHeight1 >= 0) { // normalne pobocze, na razie się składa z - return SwitchExtension->iPoints * ((TextureID1 ? 1 : 0) + (TextureID2 ? 12 : 0)); + return ( ( TextureID1 ? SwitchExtension->iPoints + SwitchExtension->iRoads + 2 : 0 ) + ( TextureID2 ? SwitchExtension->iPoints * 12 : 0 ) ); } else { // jeśli fTexHeight1<0, to są chodniki i może któregoś nie być - return SwitchExtension->iPoints * ((TextureID1 ? 1 : 0) + (TextureID2 ? 6 : 0 )); + return ( ( TextureID1 ? SwitchExtension->iPoints + SwitchExtension->iRoads + 2 : 0 ) + ( TextureID2 ? SwitchExtension->iPoints * 6 : 0 ) ); } +*/ + // each sub-segment covers only one side of the road, so it has points for single sideroad, if any + return ( ( TextureID1 ? SwitchExtension->iPoints + SwitchExtension->iRoads + 2 : 0 ) + ( TextureID2 ? SwitchExtension->iPoints * 6 : 0 ) ); } else // standardowo dla zwykłej drogi if (fTexHeight1 >= 0) // jeśli fTexHeight1<0, to są chodniki i może któregoś nie być - return (Segment->RaSegCount()) * + return ( Segment->RaSegCount()) * ((TextureID1 ? 4 : 0) + (TextureID2 ? 12 : 0)); // może nie być poziomego! else return (Segment->RaSegCount()) * @@ -1818,9 +1823,8 @@ int TTrack::RaArrayPrepare() return 0; }; -int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vertexcount) +void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vertexcount) { // wypełnianie tablic VBO - int debugvertexcount{ 0 }; // Ra: trzeba rozdzielić szyny od podsypki, aby móc grupować wg tekstur double fHTW = 0.5 * fabs(fTrackWidth); double side = fabs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza @@ -1955,19 +1959,16 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos } } - debugvertexcount += Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -4 : 4, fTexLength); - assert( debugvertexcount <= Vertexcount ); + Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -4 : 4, fTexLength); } if (TextureID1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną - debugvertexcount += Segment->RenderLoft(Vert, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += Segment->RenderLoft(Vert, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - assert( debugvertexcount <= Vertexcount ); + Segment->RenderLoft(Vert, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + Segment->RenderLoft(Vert, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); } break; case tt_Switch: // dla zwrotnicy dwa razy szyny - if (TextureID1) // Ra: !!!! tu jest do poprawienia + if( TextureID1 || TextureID2 ) { // iglice liczone tylko dla zwrotnic vector6 rpts3[24], rpts4[24]; for (i = 0; i < 12; ++i) @@ -1987,46 +1988,34 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const } if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - int batch{ 0 }; - batch = SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength); - debugvertexcount += batch; - assert( debugvertexcount <= Vertexcount ); - batch = SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2 ); - debugvertexcount += batch; - assert( debugvertexcount <= Vertexcount ); - SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - batch = SwitchExtension->Segments[0]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); - debugvertexcount += batch; - assert( debugvertexcount <= Vertexcount ); + if( TextureID1 ) { + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, nnumPts, fTexLength ); + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2 ); - SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - batch = SwitchExtension->Segments[1]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); - debugvertexcount += batch; - assert( debugvertexcount <= Vertexcount ); - batch = SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); - debugvertexcount += batch; - assert( debugvertexcount <= Vertexcount ); - batch = SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength ); - debugvertexcount += batch; - assert( debugvertexcount <= Vertexcount ); + SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + } + if( TextureID2 ) { + SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts1, nnumPts, fTexLength ); + } } else { // lewa działa lepiej niż prawa - debugvertexcount += SwitchExtension->Segments[0]->RenderLoft( Vert, rpts1, nnumPts, fTexLength); // lewa szyna normalna cała - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += SwitchExtension->Segments[0]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą - assert( debugvertexcount <= Vertexcount ); - SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - debugvertexcount += SwitchExtension->Segments[0]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2); // prawa iglica - assert( debugvertexcount <= Vertexcount ); - - SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - debugvertexcount += SwitchExtension->Segments[1]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1); // lewa iglica - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += SwitchExtension->Segments[1]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2); // lewa szyna za iglicą - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += SwitchExtension->Segments[1]->RenderLoft( Vert, rpts2, nnumPts, fTexLength); // prawa szyna normalnie cała - assert( debugvertexcount <= Vertexcount ); + if( TextureID1 ) { + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); // prawa iglica + } + if( TextureID2 ) { + SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); // lewa iglica + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała + } } } break; @@ -2060,8 +2049,7 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - debugvertexcount += Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); - assert( debugvertexcount <= Vertexcount ); + Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); } if (TextureID2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) @@ -2142,25 +2130,21 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony // odcinka if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - debugvertexcount += Segment->RenderLoft( Vert, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej - assert( debugvertexcount <= Vertexcount ); + Segment->RenderLoft( Vert, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - debugvertexcount += Segment->RenderLoft( Vert, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej - assert( debugvertexcount <= Vertexcount ); + Segment->RenderLoft( Vert, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej } } else { // pobocza zwykłe, brak przechyłki if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - debugvertexcount += Segment->RenderLoft( Vert, rpts1, 3, fTexLength ); - assert( debugvertexcount <= Vertexcount ); + Segment->RenderLoft( Vert, rpts1, 3, fTexLength ); } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - debugvertexcount += Segment->RenderLoft( Vert, rpts2, 3, fTexLength ); - assert( debugvertexcount <= Vertexcount ); - } + Segment->RenderLoft( Vert, rpts2, 3, fTexLength ); } } + } break; } case tt_Cross: // skrzyżowanie dróg rysujemy inaczej @@ -2191,24 +2175,9 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const int i; // ile punktów (może byc różna ilość punktów między drogami) if (!SwitchExtension->vPoints) { // jeśli tablica punktów nie jest jeszcze utworzona, zliczamy punkty i tworzymy ją - if( SwitchExtension->iRoads == 3 ) { - // mogą być tylko 3 drogi zamiast 4 - SwitchExtension->iPoints = - 5 - + SwitchExtension->Segments[ 0 ]->RaSegCount() - + SwitchExtension->Segments[ 1 ]->RaSegCount() - + SwitchExtension->Segments[ 2 ]->RaSegCount(); - } - else { - SwitchExtension->iPoints = - 5 - + SwitchExtension->Segments[ 2 ]->RaSegCount() - + SwitchExtension->Segments[ 3 ]->RaSegCount() - + SwitchExtension->Segments[ 4 ]->RaSegCount() - + SwitchExtension->Segments[ 5 ]->RaSegCount(); - } - // tablica utworzona z zapasem, ale nie wypełniona współrzędnymi - SwitchExtension->vPoints = new vector3[SwitchExtension->iPoints]; + // points were already counted during preparation stage + // we'll need to add couple extra points for the complete fan we'll build + SwitchExtension->vPoints = new vector3[SwitchExtension->iPoints + SwitchExtension->iRoads]; } vector3 *b = SwitchExtension->bPoints ? @@ -2297,46 +2266,32 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - debugvertexcount += SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += SwitchExtension->Segments[ 3 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += SwitchExtension->Segments[ 4 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += SwitchExtension->Segments[ 5 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - assert( debugvertexcount <= Vertexcount ); + SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 3 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 4 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 5 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); } } else { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - debugvertexcount += SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P2 do P4 - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P4 do P3=P1 (odwrócony) - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P1 do P2 - assert( debugvertexcount <= Vertexcount ); + SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P2 do P4 + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P4 do P3=P1 (odwrócony) + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P1 do P2 } } } // renderowanie nawierzchni na końcu double sina0 = sin(a[0]), cosa0 = cos(a[0]); double u, v; - if (!SwitchExtension->bPoints) // jeśli tablica nie wypełniona - if (b) // ale jest wskaźnik do tablicy - może nie być? - { // coś się gubi w obliczeniach na wskaźnikach - // ustalenie liczby punktów, bo mogło wyjść inaczej niż policzone z góry - i = (int)(((size_t)(b)) - ((size_t)(SwitchExtension->vPoints))) / sizeof(vector3); - if (i > 0) - { // jeśli zostało to właśnie utworzone - SwitchExtension->iPoints = std::min( SwitchExtension->iPoints - 2, i ); - SwitchExtension->vPoints[SwitchExtension->iPoints++] = SwitchExtension->vPoints[0]; - ++SwitchExtension->iPoints; // we'll add one extra point in the middle - SwitchExtension->bPoints = true; // tablica punktów została wypełniona - } - } + if( ( false == SwitchExtension->bPoints ) // jeśli tablica nie wypełniona + && ( b != nullptr ) ) { + SwitchExtension->bPoints = true; // tablica punktów została wypełniona + } + if (TextureID1) { - // jeśli podana tekstura nawierzchni + // jeśli podana tekstura nawierzchni + // we start with a vertex in the middle... Vert->nx = 0.0; Vert->ny = 1.0; Vert->nz = 0.0; @@ -2346,8 +2301,21 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vert->y = oxz.y; Vert->z = oxz.z; ++Vert; - ++debugvertexcount; - for (i = SwitchExtension->iPoints - 2; i >= 0; --i) + // ...and add one extra vertex to close the fan... + Vert->nx = 0.0; + Vert->ny = 1.0; + Vert->nz = 0.0; + // mapowanie we współrzędnych scenerii + u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x ) / fTexLength; + v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z ) / ( fTexRatio1 * fTexLength ); + Vert->u = cosa0 * u + sina0 * v + 0.5; + Vert->v = -sina0 * u + cosa0 * v + 0.5; + Vert->x = SwitchExtension->vPoints[ 0 ].x; + Vert->y = SwitchExtension->vPoints[ 0 ].y; + Vert->z = SwitchExtension->vPoints[ 0 ].z; + ++Vert; + // ...then draw the precalculated rest + for (i = SwitchExtension->iPoints + SwitchExtension->iRoads - 1; i >= 0; --i) { Vert->nx = 0.0; Vert->ny = 1.0; @@ -2361,13 +2329,11 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vert->y = SwitchExtension->vPoints[ i ].y; Vert->z = SwitchExtension->vPoints[ i ].z; ++Vert; - ++debugvertexcount; } - assert( debugvertexcount <= Vertexcount ); } break; - } - } + } // tt_cross + } // road break; case 4: // Ra: rzeki na razie jak drogi, przechyłki na pewno nie mają switch (eType) // dalej zależnie od typu @@ -2402,8 +2368,7 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - debugvertexcount += Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); - assert( debugvertexcount <= Vertexcount ); + Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); } if (TextureID2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w @@ -2425,24 +2390,20 @@ int TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza - debugvertexcount += Segment->RenderLoft(Vert, rpts1, -3, fTexLength); - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += Segment->RenderLoft(Vert, rpts2, -3, fTexLength); - assert( debugvertexcount <= Vertexcount ); + Segment->RenderLoft(Vert, rpts1, -3, fTexLength); + Segment->RenderLoft(Vert, rpts2, -3, fTexLength); } else { // pobocza zwykłe, brak przechyłki - debugvertexcount += Segment->RenderLoft(Vert, rpts1, 3, fTexLength); - assert( debugvertexcount <= Vertexcount ); - debugvertexcount += Segment->RenderLoft(Vert, rpts2, 3, fTexLength); - assert( debugvertexcount <= Vertexcount ); + Segment->RenderLoft(Vert, rpts1, 3, fTexLength); + Segment->RenderLoft(Vert, rpts2, 3, fTexLength); } } } } break; } - return debugvertexcount; + return; }; void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO @@ -2456,12 +2417,12 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO if( eType == tt_Switch ) // dla zwrotnicy tylko szyny { int const bladesegmentcount = 2; - if( TextureID1 ) + if( TextureID1 ) { if( ( seg = SwitchExtension->Segments[ 0 ]->RaSegCount() ) > 0 ) { GfxRenderer.Bind( TextureID1 ); // szyny + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); iPtr += 24 * seg; - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * (seg - bladesegmentcount) ); + ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * ( seg - bladesegmentcount ) ); // NOTE: due to way blades bend need to render each segment separately, or some unwanted edges may show iPtr += 24 * ( seg - bladesegmentcount ); for( int i = 0; i < bladesegmentcount; ++i ) { @@ -2469,7 +2430,8 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO iPtr += 24; } } - if( TextureID2 ) + } + if( TextureID2 ) { if( ( seg = SwitchExtension->Segments[ 1 ]->RaSegCount() ) > 0 ) { GfxRenderer.Bind( TextureID2 ); // NOTE: due to way blades bend need to render each segment separately, or some unwanted edges may show @@ -2482,6 +2444,7 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); iPtr += 24 * seg; } + } } else // dla toru podsypka plus szyny { @@ -2564,7 +2527,7 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO if( TextureID1 ) { // roads GfxRenderer.Bind( TextureID1 ); - ::glDrawArrays( GL_TRIANGLE_FAN, iPtr, SwitchExtension->iPoints ); + ::glDrawArrays( GL_TRIANGLE_FAN, iPtr, SwitchExtension->iPoints + SwitchExtension->iRoads + 2 ); iPtr += SwitchExtension->iPoints; } } @@ -2921,19 +2884,21 @@ TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) // fetch current blade geometry std::vector bladesbuffer; bladesbuffer.resize( 2 * 2 * 24 ); // 2 blades, 2 segments each +/* ::glGetBufferSubData( GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof( CVertNormTex ), bladesbuffer.size() * sizeof( CVertNormTex ), bladesbuffer.data() ); +*/ auto bladevertices = bladesbuffer.data(); if( SwitchExtension->RightSwitch ) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2, true ); - SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1, true ); + SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 /*, true*/ ); + SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 /*, true*/ ); } else { - SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2, true ); // prawa iglica - SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1, true ); // lewa iglica + SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 /*, true*/ ); // prawa iglica + SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 /*, true*/ ); // lewa iglica } // push back updated geometry ::glBufferSubData( @@ -2987,8 +2952,7 @@ TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) int size = RaArrayPrepare(); // wielkość tabeli potrzebna dla tej obrotnicy CVertNormTex *Vert = new CVertNormTex[size]; // bufor roboczy // CVertNormTex *v=Vert; //zmieniane przez - auto const debugvertexcount = RaArrayFill(Vert, Vert - SwitchExtension->iLeftVBO, size); // iLeftVBO powinno zostać niezmienione - assert( debugvertexcount == size ); + RaArrayFill(Vert, Vert - SwitchExtension->iLeftVBO, size); // iLeftVBO powinno zostać niezmienione ::glBufferSubData( GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(CVertNormTex), size * sizeof(CVertNormTex), Vert); // wysłanie fragmentu bufora VBO diff --git a/Track.h b/Track.h index 8cab1b1d..be0f16c2 100644 --- a/Track.h +++ b/Track.h @@ -240,7 +240,7 @@ class TTrack : public Resource void Render(); // renderowanie z Display Lists int RaArrayPrepare(); // zliczanie rozmiaru dla VBO sektroa - int RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vertexcount); // wypełnianie VBO + void RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vertexcount); // wypełnianie VBO void RaRenderVBO(int iPtr); // renderowanie z VBO sektora void RenderDyn(); // renderowanie nieprzezroczystych pojazdów (oba tryby) void RenderDynAlpha(); // renderowanie przezroczystych pojazdów (oba tryby) diff --git a/Train.cpp b/Train.cpp index 15d79f6c..75bd2f53 100644 --- a/Train.cpp +++ b/Train.cpp @@ -175,8 +175,10 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::pantographlowerall, &TTrain::OnCommand_pantographlowerall }, { user_command::linebreakertoggle, &TTrain::OnCommand_linebreakertoggle }, { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, + { user_command::convertertogglelocal, &TTrain::OnCommand_convertertogglelocal }, { user_command::converteroverloadrelayreset, &TTrain::OnCommand_converteroverloadrelayreset }, { user_command::compressortoggle, &TTrain::OnCommand_compressortoggle }, + { user_command::compressortogglelocal, &TTrain::OnCommand_compressortogglelocal }, { user_command::motorconnectorsopen, &TTrain::OnCommand_motorconnectorsopen }, { user_command::motordisconnect, &TTrain::OnCommand_motordisconnect }, { user_command::motoroverloadrelaythresholdtoggle, &TTrain::OnCommand_motoroverloadrelaythresholdtoggle }, @@ -1727,6 +1729,69 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } } +void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->ConverterStart == start::automatic ) { + // let the automatic thing do its automatic thing... + return; + } + if( Train->ggConverterLocalButton.SubModel == nullptr ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( ( false == Train->mvOccupied->ConverterAllowLocal ) + && ( Train->ggConverterLocalButton.GetValue() < 0.5 ) ) { + // turn on + // sound feedback + if( Train->ggConverterLocalButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggConverterLocalButton.UpdateValue( 1.0 ); + // effect + Train->mvOccupied->ConverterAllowLocal = true; +/* + if( true == Train->mvControlled->ConverterSwitch( true, range::local ) ) { + // side effects + // control the compressor, if it's paired with the converter + if( Train->mvControlled->CompressorPower == 2 ) { + // hunter-091012: tak jest poprawnie + Train->mvControlled->CompressorSwitch( true, range::local ); + } + } +*/ + } + else { + //turn off + // sound feedback + if( Train->ggConverterLocalButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggConverterLocalButton.UpdateValue( 0.0 ); + // effect + Train->mvOccupied->ConverterAllowLocal = false; +/* + if( true == Train->mvControlled->ConverterSwitch( false, range::local ) ) { + // side effects + // control the compressor, if it's paired with the converter + if( Train->mvControlled->CompressorPower == 2 ) { + // hunter-091012: tak jest poprawnie + Train->mvControlled->CompressorSwitch( false, range::local ); + } + // if there's no (low voltage) power source left, drop pantographs + if( false == Train->mvControlled->Battery ) { + Train->mvControlled->PantFront( false, range::local ); + Train->mvControlled->PantRear( false, range::local ); + } + } +*/ + } + } +} + void TTrain::OnCommand_converteroverloadrelayreset( TTrain *Train, command_data const &Command ) { if( Train->ggConverterFuseButton.SubModel == nullptr ) { @@ -1824,6 +1889,42 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm */ } +void TTrain::OnCommand_compressortogglelocal( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->CompressorPower >= 2 ) { + return; + } + if( Train->ggCompressorLocalButton.SubModel == nullptr ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvOccupied->CompressorAllowLocal ) { + // turn on + // sound feedback + if( Train->ggCompressorLocalButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggCompressorLocalButton.UpdateValue( 1.0 ); + // effect + Train->mvOccupied->CompressorAllowLocal = true; + } + else { + //turn off + // sound feedback + if( Train->ggCompressorLocalButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggCompressorLocalButton.UpdateValue( 0.0 ); + // effect + Train->mvOccupied->CompressorAllowLocal = false; + } + } +} + void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &Command ) { // TODO: don't rely on presense of 3d model to determine presence of the switch @@ -1833,31 +1934,111 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C } return; } - - if( Command.action != GLFW_RELEASE ) { - // button works while it's held down - if( true == Train->mvControlled->StLinFlag ) { + // NOTE: because we don't have modeled actual circuits this is a simplification of the real mechanics + // namely, pressing the button will flip it in the entire unit, which isn't exactly physically possible + if( Command.action == GLFW_PRESS ) { + // button works while it's held down but we can only pay attention to initial press + if( false == Train->mvControlled->StLinSwitchOff ) { + // open the connectors + Train->mvControlled->StLinSwitchOff = true; + if( ( Train->mvControlled->TrainType == dt_ET41 ) + || ( Train->mvControlled->TrainType == dt_ET42 ) ) { + // crude implementation of the butto affecting entire unit for multi-unit engines + // TODO: rework it into part of standard command propagation system + if( ( Train->mvControlled->Couplers[ 0 ].Connected != nullptr ) + && ( true == TestFlag( Train->mvControlled->Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + Train->mvControlled->Couplers[ 0 ].Connected->StLinSwitchOff = true; + } + if( ( Train->mvControlled->Couplers[ 1 ].Connected != nullptr ) + && ( true == TestFlag( Train->mvControlled->Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = true; + } + } + // sound feedback + if( Train->ggStLinOffButton.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggStLinOffButton.UpdateValue( 1.0 ); + // effect + if( true == Train->mvControlled->StLinFlag ) { + Train->play_sound( Train->dsbRelay ); + } // yBARC - zmienione na przeciwne, bo true to zalaczone Train->mvControlled->StLinFlag = false; - Train->play_sound( Train->dsbRelay ); + if( ( Train->mvControlled->TrainType == dt_ET41 ) + || ( Train->mvControlled->TrainType == dt_ET42 ) ) { + // crude implementation of the butto affecting entire unit for multi-unit engines + // TODO: rework it into part of standard command propagation system + if( ( Train->mvControlled->Couplers[ 0 ].Connected != nullptr ) + && ( true == TestFlag( Train->mvControlled->Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + Train->mvControlled->Couplers[ 0 ].Connected->StLinFlag = false; + } + if( ( Train->mvControlled->Couplers[ 1 ].Connected != nullptr ) + && ( true == TestFlag( Train->mvControlled->Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + Train->mvControlled->Couplers[ 1 ].Connected->StLinFlag = false; + } + } } - Train->mvControlled->StLinSwitchOff = true; - // sound feedback - if( Train->ggStLinOffButton.GetValue() < 0.05 ) { - Train->play_sound( Train->dsbSwitch ); + else { + if( Train->mvControlled->StLinSwitchType == "toggle" ) { + // default type of button (impulse) has only one effect on press, but the toggle type can toggle the state + Train->mvControlled->StLinSwitchOff = false; + if( ( Train->mvControlled->TrainType == dt_ET41 ) + || ( Train->mvControlled->TrainType == dt_ET42 ) ) { + // crude implementation of the butto affecting entire unit for multi-unit engines + // TODO: rework it into part of standard command propagation system + if( ( Train->mvControlled->Couplers[ 0 ].Connected != nullptr ) + && ( true == TestFlag( Train->mvControlled->Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + Train->mvControlled->Couplers[ 0 ].Connected->StLinSwitchOff = false; + } + if( ( Train->mvControlled->Couplers[ 1 ].Connected != nullptr ) + && ( true == TestFlag( Train->mvControlled->Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false; + } + } + // sound feedback + if( Train->ggStLinOffButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggStLinOffButton.UpdateValue( 0.0 ); + } } - // visual feedback - Train->ggStLinOffButton.UpdateValue( 1.0 ); } - else { + else if( Command.action == GLFW_RELEASE ) { // button released - Train->mvControlled->StLinSwitchOff = false; - // sound feedback - if( Train->ggStLinOffButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); + if( Train->mvControlled->StLinSwitchType != "toggle" ) { + // default button type (impulse) works on button release + Train->mvControlled->StLinSwitchOff = false; + if( ( Train->mvControlled->TrainType == dt_ET41 ) + || ( Train->mvControlled->TrainType == dt_ET42 ) ) { + // crude implementation of the butto affecting entire unit for multi-unit engines + // TODO: rework it into part of standard command propagation system + if( ( Train->mvControlled->Couplers[ 0 ].Connected != nullptr ) + && ( true == TestFlag( Train->mvControlled->Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + Train->mvControlled->Couplers[ 0 ].Connected->StLinSwitchOff = false; + } + if( ( Train->mvControlled->Couplers[ 1 ].Connected != nullptr ) + && ( true == TestFlag( Train->mvControlled->Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false; + } + } + // sound feedback + if( Train->ggStLinOffButton.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + Train->ggStLinOffButton.UpdateValue( 0.0 ); } - // visual feedback - Train->ggStLinOffButton.UpdateValue( 0.0 ); } } @@ -4674,9 +4855,11 @@ bool TTrain::Update( double const Deltatime ) ggDepartureSignalButton.Update(); // NBMX dzwignia sprezarki ggCompressorButton.Update(); + ggCompressorLocalButton.Update(); ggMainButton.Update(); ggRadioButton.Update(); ggConverterButton.Update(); + ggConverterLocalButton.Update(); ggConverterOffButton.Update(); #ifdef EU07_USE_OLD_COMMAND_SYSTEM @@ -6604,6 +6787,11 @@ void TTrain::set_cab_controls() { if( true == mvOccupied->Battery ) { ggBatteryButton.PutValue( 1.0 ); } + // motor connectors + ggStLinOffButton.PutValue( + ( mvControlled->StLinSwitchOff ? + 1.0 : + 0.0 ) ); // radio if( true == mvOccupied->Radio ) { ggRadioButton.PutValue( 1.0 ); @@ -6636,10 +6824,19 @@ void TTrain::set_cab_controls() { 1.0 : 0.0 ); } + ggConverterLocalButton.PutValue( + mvControlled->ConverterAllowLocal ? + 1.0 : + 0.0 ); // compressor - if( true == mvControlled->CompressorAllow ) { - ggCompressorButton.PutValue( 1.0 ); - } + ggCompressorButton.PutValue( + mvControlled->CompressorAllow ? + 1.0 : + 0.0 ); + ggCompressorLocalButton.PutValue( + mvControlled->CompressorAllowLocal ? + 1.0 : + 0.0 ); // motor overload relay threshold / shunt mode if( mvControlled->Imax == mvControlled->ImaxHi ) { ggMaxCurrentCtrl.PutValue( 1.0 ); @@ -7175,11 +7372,19 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con // sprezarka ggCompressorButton.Load(Parser, DynamicObject->mdKabina); } + else if( Label == "compressorlocal_sw:" ) { + // sprezarka + ggCompressorLocalButton.Load( Parser, DynamicObject->mdKabina ); + } else if (Label == "converter_sw:") { // przetwornica ggConverterButton.Load(Parser, DynamicObject->mdKabina); } + else if( Label == "converterlocal_sw:" ) { + // przetwornica + ggConverterLocalButton.Load( Parser, DynamicObject->mdKabina ); + } else if (Label == "converteroff_sw:") { // przetwornica wyl diff --git a/Train.h b/Train.h index 31482dba..aab20177 100644 --- a/Train.h +++ b/Train.h @@ -146,8 +146,10 @@ class TTrain static void OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_convertertogglelocal( TTrain *Train, command_data const &Command ); static void OnCommand_converteroverloadrelayreset( TTrain *Train, command_data const &Command ); static void OnCommand_compressortoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_compressortogglelocal( TTrain *Train, command_data const &Command ); static void OnCommand_motorconnectorsopen( TTrain *Train, command_data const &Command ); static void OnCommand_motordisconnect( TTrain *Train, command_data const &Command ); static void OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ); @@ -251,7 +253,9 @@ public: // reszta może by?publiczna TGauge ggIgnitionKey; TGauge ggCompressorButton; + TGauge ggCompressorLocalButton; // controls only compressor of its own unit (et42-specific) TGauge ggConverterButton; + TGauge ggConverterLocalButton; // controls only converter of its own unit (et42-specific) TGauge ggConverterOffButton; // ABu 090305 - syrena i prad nastepnego czlonu diff --git a/World.cpp b/World.cpp index 1a0cf45e..dbafc975 100644 --- a/World.cpp +++ b/World.cpp @@ -1863,9 +1863,9 @@ TWorld::Update_UI() { uitextline3 += ( tmp->MoverParameters->PantRearUp ? ( tmp->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; uitextline3 += ( tmp->MoverParameters->PantFrontUp ? ( tmp->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; uitextline3 += ( tmp->MoverParameters->PantPressLockActive ? "!" : ( tmp->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); - uitextline3 += ( tmp->MoverParameters->ConverterAllow ? ( tmp->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ); + uitextline3 += ( false == tmp->MoverParameters->ConverterAllowLocal ? "-" : ( tmp->MoverParameters->ConverterAllow ? ( tmp->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); uitextline3 += ( tmp->MoverParameters->ConvOvldFlag ? "!" : "." ); - uitextline3 += ( tmp->MoverParameters->CompressorAllow ? ( tmp->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ); + uitextline3 += ( false == tmp->MoverParameters->CompressorAllowLocal ? "-" : ( tmp->MoverParameters->CompressorAllow ? ( tmp->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); uitextline3 += ( tmp->MoverParameters->CompressorGovernorLock ? "!" : "." ); uitextline3 += diff --git a/command.cpp b/command.cpp index 4ad7c4e0..426e1873 100644 --- a/command.cpp +++ b/command.cpp @@ -47,8 +47,10 @@ commanddescription_sequence Commands_descriptions = { { "reverserdecrease", command_target::vehicle }, { "linebreakertoggle", command_target::vehicle }, { "convertertoggle", command_target::vehicle }, + { "convertertogglelocal", command_target::vehicle }, { "converteroverloadrelayreset", command_target::vehicle }, { "compressortoggle", command_target::vehicle }, + { "compressortogglelocal", command_target::vehicle }, { "motoroverloadrelaythresholdtoggle", command_target::vehicle }, { "motoroverloadrelayreset", command_target::vehicle }, { "notchingrelaytoggle", command_target::vehicle }, diff --git a/command.h b/command.h index 9ba1d725..35649d9e 100644 --- a/command.h +++ b/command.h @@ -42,8 +42,10 @@ enum class user_command { reverserdecrease, linebreakertoggle, convertertoggle, + convertertogglelocal, converteroverloadrelayreset, compressortoggle, + compressortogglelocal, motoroverloadrelaythresholdtoggle, motoroverloadrelayreset, notchingrelaytoggle, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 2c32b9e4..79267cc3 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -228,10 +228,14 @@ keyboard_input::default_bindings() { { GLFW_KEY_M }, // convertertoggle { GLFW_KEY_X }, + // convertertogglelocal + { GLFW_KEY_X | keymodifier::shift }, // converteroverloadrelayreset { GLFW_KEY_N | keymodifier::control }, // compressortoggle { GLFW_KEY_C }, + // compressortoggleloal + { GLFW_KEY_C | keymodifier::shift }, // motoroverloadrelaythresholdtoggle { GLFW_KEY_F }, // motoroverloadrelayreset diff --git a/keyboardinput.h b/keyboardinput.h index e2d78708..65a4546c 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -70,7 +70,7 @@ private: bool m_shift{ false }; bool m_ctrl{ false }; bindings_cache m_bindingscache; - std::array m_keys; + std::array m_keys; }; //--------------------------------------------------------------------------- diff --git a/version.h b/version.h index 5102dd54..d30e7043 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 520 +#define VERSION_MINOR 522 #define VERSION_REVISION 0 From 03e231fbc16ae6c38ff15a3aa9e504f357953763 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 23 May 2017 23:57:29 +0200 Subject: [PATCH 111/426] build 170524. re-enabled support for -e3d command line option --- EU07.cpp | 34 +++++--- Track.cpp | 2 +- World.cpp | 196 +++++++++++++++++++++++-------------------- maszyna.vcxproj.user | 2 + version.h | 2 +- wavread.cpp | 4 +- wavread.h | 2 +- 7 files changed, 138 insertions(+), 104 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 90a57219..c73d9218 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -383,9 +383,15 @@ int main(int argc, char *argv[]) input::Gamepad.init(); Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów - if (!World.Init(window)) - { - ErrorLog( "Failed to init TWorld" ); + try { + if( false == World.Init( window ) ) { + ErrorLog( "Failed to init TWorld" ); + return -1; + } + } + catch( std::bad_alloc const &Error ) { + + ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) ); return -1; } @@ -406,15 +412,23 @@ int main(int argc, char *argv[]) } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć Console::On(); // włączenie konsoli - while (!glfwWindowShouldClose(window) - && World.Update() - && GfxRenderer.Render()) - { - glfwPollEvents(); - if( true == Global::InputGamepad ) { - input::Gamepad.poll(); + + try { + while( ( false == glfwWindowShouldClose( window ) ) + && ( true == World.Update() ) + && ( true == GfxRenderer.Render() ) ) { + glfwPollEvents(); + if( true == Global::InputGamepad ) { + input::Gamepad.poll(); + } } } + catch( std::bad_alloc const &Error ) { + + ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) ); + return -1; + } + Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) } diff --git a/Track.cpp b/Track.cpp index dd3d6a3b..c8672c80 100644 --- a/Track.cpp +++ b/Track.cpp @@ -198,7 +198,7 @@ TTrack * TTrack::Create400m(int what, double dx) trk->bVisible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur trk->iCategoryFlag = what; // taki sam typ plus informacja, że dodatkowy trk->Init(); // utworzenie segmentu - trk->Segment->Init(vector3(-dx, 0, 0), vector3(-dx, 0, 400), 0, 0, 0); // prosty + trk->Segment->Init(vector3(-dx, 0, 0), vector3(-dx, 0, 400), 10.0, 0, 0); // prosty tmp->pCenter = vector3(-dx, 0, 200); //środek, aby się mogło wyświetlić TSubRect *r = Global::pGround->GetSubRect(tmp->pCenter.x, tmp->pCenter.z); r->NodeAdd(tmp); // dodanie toru do segmentu diff --git a/World.cpp b/World.cpp index dbafc975..0bcfe03c 100644 --- a/World.cpp +++ b/World.cpp @@ -2384,103 +2384,119 @@ void TWorld::ModifyTGA(const std::string &dir) } */ }; + //--------------------------------------------------------------------------- -std::string last; // zmienne używane w rekurencji -double shift = 0; -void TWorld::CreateE3D(std::string const &dir, bool dyn) + +void TWorld::CreateE3D(std::string const &Path, bool Dynamic) { // rekurencyjna generowanie plików E3D -/* TODO: remove Borland file access stuff - TTrack *trk; - double at; - TSearchRec sr; - if (FindFirst(dir + "*.*", faDirectory | faArchive, sr) == 0) - { - do - { - if (sr.Name[1] != '.') - if ((sr.Attr & faDirectory)) // jeśli katalog, to rekurencja - CreateE3D(dir + sr.Name + "\\", dyn); - else if (dyn) - { - if (sr.Name.LowerCase().SubString(sr.Name.Length() - 3, 4) == ".mmd") - { - // konwersja pojazdów będzie ułomna, bo nie poustawiają się animacje na - // submodelach określonych w MMD - // TModelsManager::GetModel(AnsiString(dir+sr.Name).c_str(),true); - if (last != dir) - { // utworzenie toru dla danego pojazdu - last = dir; - trk = TTrack::Create400m(1, shift); - shift += 10.0; // następny tor będzie deczko dalej, aby nie zabić FPS - at = 400.0; - // if (shift>1000) break; //bezpiecznik + std::string last; // zmienne używane w rekurencji + TTrack *trk{ nullptr }; + double at{ 0.0 }; + double shift{ 0.0 }; + +#ifdef _WINDOWS + + std::string searchpattern( "*.*" ); + + ::WIN32_FIND_DATA filedata; + ::HANDLE search = ::FindFirstFile( ( Path + searchpattern ).c_str(), &filedata ); + + if( search == INVALID_HANDLE_VALUE ) { return; } // if nothing to do, bail out + + do { + + std::string filename = filedata.cFileName; + + if( filedata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) { + // launch recursive search for sub-directories... + if( filename == "." ) { continue; } + if( filename == ".." ) { continue; } + CreateE3D( Path + filename + "\\", Dynamic ); + } + else { + // process the file + if( filename.size() < 4 ) { continue; } + std::string const filetype = ToLower( filename.substr( filename.size() - 4, 4 ) ); + if( filetype == ".mmd" ) { + if( false == Dynamic ) { continue; } + + // konwersja pojazdów będzie ułomna, bo nie poustawiają się animacje na submodelach określonych w MMD + if( last != Path ) { // utworzenie toru dla danego pojazdu + last = Path; + trk = TTrack::Create400m( 1, shift ); + shift += 10.0; // następny tor będzie deczko dalej, aby nie zabić FPS + at = 400.0; + } + TGroundNode *tmp = new TGroundNode(); + tmp->DynamicObject = new TDynamicObject(); + + at -= tmp->DynamicObject->Init( + "", + Path.substr( 8, Path.size() - 9 ), // skip leading "dynamic/" and trailing slash + "none", + filename.substr( 0, filename.size() - 4 ), + trk, + at, + "nobody", 0.0, "none", 0.0, "", false, "" ); + + // po wczytaniu CHK zrobić pętlę po ładunkach, aby każdy z nich skonwertować + cParser loadparser( tmp->DynamicObject->MoverParameters->LoadAccepted ); // typy ładunków + std::string loadname; + loadparser.getTokens( 1, true, "," ); loadparser >> loadname; + while( loadname != "" ) { + + if( ( true == FileExists( Path + loadname + ".t3d" ) ) + && ( false == FileExists( Path + loadname + ".e3d" ) ) ) { + // a nie ma jeszcze odpowiednika binarnego + at -= tmp->DynamicObject->Init( + "", + Path.substr( 8, Path.size() - 9 ), // skip leading "dynamic/" and trailing slash + "none", + filename.substr( 0, filename.size() - 4 ), + trk, + at, + "nobody", 0.0, "none", 1.0, loadname, false, "" ); } - TGroundNode *tmp = new TGroundNode(); - tmp->DynamicObject = new TDynamicObject(); - // Global::asCurrentTexturePath=dir; //pojazdy mają tekstury we własnych - // katalogach - at -= tmp->DynamicObject->Init( - "", string((dir.SubString(9, dir.Length() - 9)).c_str()), "none", - string(sr.Name.SubString(1, sr.Name.Length() - 4).c_str()), trk, at, "nobody", 0.0, - "none", 0.0, "", false, ""); - // po wczytaniu CHK zrobić pętlę po ładunkach, aby każdy z nich skonwertować - AnsiString loads, load; - loads = AnsiString(tmp->DynamicObject->MoverParameters->LoadAccepted.c_str()); // typy ładunków - if (!loads.IsEmpty()) - { - loads += ","; // przecinek na końcu - int i = loads.Pos(","); - while (i > 1) - { // wypadało by sprawdzić, czy T3D ładunku jest - load = loads.SubString(1, i - 1); - if (FileExists(dir + load + ".t3d")) // o ile jest plik ładunku, bo - // inaczej nie ma to sensu - if (!FileExists( - dir + load + - ".e3d")) // a nie ma jeszcze odpowiednika binarnego - at -= tmp->DynamicObject->Init( - "", dir.SubString(9, dir.Length() - 9).c_str(), "none", - sr.Name.SubString(1, sr.Name.Length() - 4).c_str(), trk, at, - "nobody", 0.0, "none", 1.0, load.c_str(), false, ""); - loads.Delete(1, i); // usunięcie z następującym przecinkiem - i = loads.Pos(","); - } - } - if (tmp->DynamicObject->iCabs) - { // jeśli ma jakąkolwiek kabinę - delete Train; - Train = new TTrain(); - if (tmp->DynamicObject->iCabs & 1) - { - tmp->DynamicObject->MoverParameters->ActiveCab = 1; - Train->Init(tmp->DynamicObject, true); - } - if (tmp->DynamicObject->iCabs & 4) - { - tmp->DynamicObject->MoverParameters->ActiveCab = -1; - Train->Init(tmp->DynamicObject, true); - } - if (tmp->DynamicObject->iCabs & 2) - { - tmp->DynamicObject->MoverParameters->ActiveCab = 0; - Train->Init(tmp->DynamicObject, true); - } - } - Global::asCurrentTexturePath = - (szTexturePath); // z powrotem defaultowa sciezka do tekstur + + loadname = ""; + loadparser.getTokens( 1, true, "," ); loadparser >> loadname; + } + + if( tmp->DynamicObject->iCabs ) { // jeśli ma jakąkolwiek kabinę + delete Train; + Train = new TTrain(); + if( tmp->DynamicObject->iCabs & 1 ) { + tmp->DynamicObject->MoverParameters->ActiveCab = 1; + Train->Init( tmp->DynamicObject, true ); + } + if( tmp->DynamicObject->iCabs & 4 ) { + tmp->DynamicObject->MoverParameters->ActiveCab = -1; + Train->Init( tmp->DynamicObject, true ); + } + if( tmp->DynamicObject->iCabs & 2 ) { + tmp->DynamicObject->MoverParameters->ActiveCab = 0; + Train->Init( tmp->DynamicObject, true ); } } - else if (sr.Name.LowerCase().SubString(sr.Name.Length() - 3, 4) == ".t3d") - { // z modelami jest prościej - Global::asCurrentTexturePath = dir.c_str(); - TModelsManager::GetModel(AnsiString(dir + sr.Name).c_str(), false); - } - } while (FindNext(sr) == 0); - FindClose(sr); - } -*/ + // z powrotem defaultowa sciezka do tekstur + Global::asCurrentTexturePath = ( szTexturePath ); + } + else if( filetype == ".t3d" ) { + // z modelami jest prościej + Global::asCurrentTexturePath = Path; + TModelsManager::GetModel( Path + filename, false ); + } + } + + } while( ::FindNextFile( search, &filedata ) ); + + // all done, clean up + ::FindClose( search ); + +#endif }; + //--------------------------------------------------------------------------- void TWorld::CabChange(TDynamicObject *old, TDynamicObject *now) { // ewentualna zmiana kabiny użytkownikowi diff --git a/maszyna.vcxproj.user b/maszyna.vcxproj.user index 803ce541..8c698752 100644 --- a/maszyna.vcxproj.user +++ b/maszyna.vcxproj.user @@ -3,6 +3,8 @@ ..\..\..\development\maszyna WindowsLocalDebugger + + ..\..\Projects\maszyna diff --git a/version.h b/version.h index d30e7043..12dfa00e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 522 +#define VERSION_MINOR 524 #define VERSION_REVISION 0 diff --git a/wavread.cpp b/wavread.cpp index 4dd527b1..7b7e9698 100644 --- a/wavread.cpp +++ b/wavread.cpp @@ -257,6 +257,8 @@ HRESULT CWaveSoundRead::Read(UINT nSizeToRead, BYTE *pbData, UINT *pnSizeRead) //----------------------------------------------------------------------------- HRESULT CWaveSoundRead::Close() { - mmioClose(m_hmmioIn, 0); + if( m_hmmioIn != NULL ) { + mmioClose( m_hmmioIn, 0 ); + } return S_OK; } diff --git a/wavread.h b/wavread.h index 707baa2a..f0bc4357 100644 --- a/wavread.h +++ b/wavread.h @@ -33,7 +33,7 @@ class CWaveSoundRead { public: WAVEFORMATEX *m_pwfx; // Pointer to WAVEFORMATEX structure - HMMIO m_hmmioIn; // MM I/O handle for the WAVE + HMMIO m_hmmioIn{ NULL }; // MM I/O handle for the WAVE MMCKINFO m_ckIn; // Multimedia RIFF chunk MMCKINFO m_ckInRiff; // Use in opening a WAVE file From 7c5f5d3d04526dac5ec967de362be8b383230fe6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 24 May 2017 14:19:03 +0200 Subject: [PATCH 112/426] maintenance: removed deprecated render code --- AnimModel.cpp | 125 +----------- AnimModel.h | 26 +-- Driver.cpp | 5 - DynObj.cpp | 403 +----------------------------------- DynObj.h | 19 +- EU07.cpp | 1 - Globals.cpp | 9 - Globals.h | 11 +- Ground.cpp | 158 +-------------- Model3d.cpp | 549 -------------------------------------------------- Model3d.h | 20 -- Segment.h | 2 - Track.cpp | 8 - World.cpp | 393 ++++-------------------------------- sky.cpp | 27 +-- stars.cpp | 13 +- 16 files changed, 69 insertions(+), 1700 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 5417d042..a5303f08 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -411,13 +411,7 @@ TAnimModel::TAnimModel() pModel = NULL; iNumLights = 0; fBlinkTimer = 0; -#ifdef EU07_USE_OLD_RENDERCODE - ReplacableSkinId[ 0 ] = 0; - ReplacableSkinId[ 1 ] = 0; - ReplacableSkinId[ 2 ] = 0; - ReplacableSkinId[ 3 ] = 0; - ReplacableSkinId[ 4 ] = 0; -#endif + for (int i = 0; i < iMaxNumLights; i++) { LightsOn[i] = LightsOff[i] = NULL; // normalnie nie ma @@ -443,28 +437,7 @@ bool TAnimModel::Init(TModel3d *pNewModel) pModel = pNewModel; return (pModel != NULL); } -#ifdef EU07_USE_OLD_RENDERCODE -bool TAnimModel::Init(std::string const &asName, std::string const &asReplacableTexture) -{ - if (asReplacableTexture.substr(0, 1) == - "*") // od gwiazdki zaczynają się teksty na wyświetlaczach - asText = asReplacableTexture.substr(1, asReplacableTexture.length() - 1); // zapamiętanie tekstu - else if (asReplacableTexture != "none") - ReplacableSkinId[1] = - GfxRenderer.GetTextureId( asReplacableTexture, "" ); - if( ( ReplacableSkinId[ 1 ] != 0 ) - && ( GfxRenderer.Texture( ReplacableSkinId[ 1 ] ).has_alpha ) ) { - // tekstura z kanałem alfa - nie renderować w cyklu nieprzezroczystych - iTexAlpha = 0x31310031; - } - else{ - // tekstura nieprzezroczysta - nie renderować w cyklu - iTexAlpha = 0x30300030; - } - // przezroczystych - return (Init(TModelsManager::GetModel(asName))); -} -#else + bool TAnimModel::Init(std::string const &asName, std::string const &asReplacableTexture) { if (asReplacableTexture.substr(0, 1) == @@ -485,7 +458,6 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable // przezroczystych return (Init(TModelsManager::GetModel(asName))); } -#endif bool TAnimModel::Load(cParser *parser, bool ter) { // rozpoznanie wpisu modelu i ustawienie świateł @@ -622,99 +594,18 @@ void TAnimModel::RaPrepare() // for (pCurrent=pRoot;pCurrent!=NULL;pCurrent=pCurrent->pNext) //albo osobny łańcuch // pCurrent->UpdateModelIK(); //przeliczenie odwrotnej kinematyki } -/* -void TAnimModel::RenderVBO(vector3 pPosition, double fAngle) -{ // sprawdza światła i rekurencyjnie renderuje TModel3d - RaAnimate(); // jednorazowe przeliczenie animacji - RaPrepare(); - if (pModel) // renderowanie rekurencyjne submodeli - pModel->RaRender(pPosition, fAngle, ReplacableSkinId, iTexAlpha); -} -void TAnimModel::RenderAlphaVBO(vector3 pPosition, double fAngle) -{ - RaPrepare(); - if (pModel) // renderowanie rekurencyjne submodeli - pModel->RaRenderAlpha(pPosition, fAngle, ReplacableSkinId, iTexAlpha); -}; - -void TAnimModel::RenderDL(vector3 pPosition, double fAngle) -{ - RaAnimate(); // jednorazowe przeliczenie animacji - RaPrepare(); - if (pModel) // renderowanie rekurencyjne submodeli - pModel->Render(pPosition, fAngle, ReplacableSkinId, iTexAlpha); -} - -void TAnimModel::RenderAlphaDL(vector3 pPosition, double fAngle) -{ - RaPrepare(); - if (pModel) - pModel->RenderAlpha(pPosition, fAngle, ReplacableSkinId, iTexAlpha); -}; -*/ -#ifdef EU07_USE_OLD_RENDERCODE -int TAnimModel::Flags() -{ // informacja dla TGround, czy ma być w Render, RenderAlpha, czy RenderMixed - int i = pModel ? pModel->Flags() : 0; // pobranie flag całego modelu - if (ReplacableSkinId[1] > 0) // jeśli ma wymienną teksturę 0 - i |= (i & 0x01010001) * ((iTexAlpha & 1) ? 0x20 : 0x10); - // if (ReplacableSkinId[2]>0) //jeśli ma wymienną teksturę 1 - // i|=(i&0x02020002)*((iTexAlpha&1)?0x10:0x08); - // if (ReplacableSkinId[3]>0) //jeśli ma wymienną teksturę 2 - // i|=(i&0x04040004)*((iTexAlpha&1)?0x08:0x04); - // if (ReplacableSkinId[4]>0) //jeśli ma wymienną teksturę 3 - // i|=(i&0x08080008)*((iTexAlpha&1)?0x04:0x02); - return i; -}; -#else int TAnimModel::Flags() { // informacja dla TGround, czy ma być w Render, RenderAlpha, czy RenderMixed int i = pModel ? pModel->Flags() : 0; // pobranie flag całego modelu if( m_materialdata.replacable_skins[ 1 ] > 0 ) // jeśli ma wymienną teksturę 0 i |= (i & 0x01010001) * ((m_materialdata.textures_alpha & 1) ? 0x20 : 0x10); - // if (ReplacableSkinId[2]>0) //jeśli ma wymienną teksturę 1 - // i|=(i&0x02020002)*((iTexAlpha&1)?0x10:0x08); - // if (ReplacableSkinId[3]>0) //jeśli ma wymienną teksturę 2 - // i|=(i&0x04040004)*((iTexAlpha&1)?0x08:0x04); - // if (ReplacableSkinId[4]>0) //jeśli ma wymienną teksturę 3 - // i|=(i&0x08080008)*((iTexAlpha&1)?0x04:0x02); return i; }; -#endif //----------------------------------------------------------------------------- -// 2011-03-16 cztery nowe funkcje renderowania z możliwością pochylania obiektów +// 2011-03-16 funkcje renderowania z możliwością pochylania obiektów //----------------------------------------------------------------------------- -#ifdef EU07_USE_OLD_RENDERCODE -void TAnimModel::RenderDL(vector3 *vPosition) -{ - RaAnimate(); // jednorazowe przeliczenie animacji - RaPrepare(); - if( pModel ) // renderowanie rekurencyjne submodeli - pModel->Render(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); -}; -void TAnimModel::RenderAlphaDL(vector3 *vPosition) -{ - RaPrepare(); - if (pModel) // renderowanie rekurencyjne submodeli - pModel->RenderAlpha(vPosition, &vAngle, ReplacableSkinId, iTexAlpha); -}; - -void TAnimModel::RenderVBO(vector3 *vPosition) -{ - RaAnimate(); // jednorazowe przeliczenie animacji - RaPrepare(); - if (pModel) // renderowanie rekurencyjne submodeli - pModel->RaRender( vPosition, &vAngle, Material()->replacable_skins, Material()->textures_alpha ); -}; -void TAnimModel::RenderAlphaVBO(vector3 *vPosition) -{ - RaPrepare(); - if (pModel) // renderowanie rekurencyjne submodeli - pModel->RaRenderAlpha( vPosition, &vAngle, Material()->replacable_skins, Material()->textures_alpha ); -}; -#else void TAnimModel::Render( vector3 *vPosition ) { RaAnimate(); // jednorazowe przeliczenie animacji RaPrepare(); @@ -726,7 +617,6 @@ void TAnimModel::RenderAlpha( vector3 *vPosition ) { if( pModel ) // renderowanie rekurencyjne submodeli GfxRenderer.Render_Alpha( pModel, Material(), *vPosition, vAngle ); }; -#endif //--------------------------------------------------------------------------- bool TAnimModel::TerrainLoaded() @@ -901,13 +791,8 @@ void TAnimModel::LightSet(int n, float v) void TAnimModel::AnimUpdate(double dt) { // wykonanie zakolejkowanych animacji, nawet gdy modele nie są aktualnie wyświetlane TAnimContainer *p = TAnimModel::acAnimList; - while (p) - { // jeśli w ogóle jest co animować - // if ((*p)->fTranslateSpeed==0.0) - // if ((*p)->fRotateSpeed==0.0) - // {//jak się naanimował, to usunąć z listy - // *p=(*p)->ListRemove(); //zwraca wskaźnik do kolejnego z listy - // } + while( p ) { + p->UpdateModel(); p = p->acAnimNext; // na razie bez usuwania z listy, bo głównie obrotnica na nią wchodzi } diff --git a/AnimModel.h b/AnimModel.h index d8800e6b..760669e8 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -12,8 +12,7 @@ http://mozilla.org/MPL/2.0/. */ -#ifndef AnimModelH -#define AnimModelH +#pragma once #include "Model3d.h" #include "Texture.h" @@ -139,11 +138,7 @@ class TAnimModel TSubModel *LightsOn[iMaxNumLights]; // Ra: te wskaźniki powinny być w ramach TModel3d TSubModel *LightsOff[iMaxNumLights]; vector3 vAngle; // bazowe obroty egzemplarza względem osi -#ifdef EU07_USE_OLD_RENDERCODE - int iTexAlpha; //żeby nie sprawdzać za każdym razem, dla 4 wymiennych tekstur -#else material_data m_materialdata; -#endif std::string asText; // tekst dla wyświetlacza znakowego TAnimAdvanced *pAdvanced; @@ -155,14 +150,9 @@ class TAnimModel void RaAnimate(); // przeliczenie animacji egzemplarza void RaPrepare(); // ustawienie animacji egzemplarza na wzorcu public: -#ifdef EU07_USE_OLD_RENDERCODE - texture_manager::size_type ReplacableSkinId[5]; // McZapkie-020802: zmienialne skory -#endif static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania -#ifndef EU07_USE_OLD_RENDERCODE inline material_data const *Material() const { return &m_materialdata; } -#endif TAnimModel(); ~TAnimModel(); @@ -171,20 +161,8 @@ class TAnimModel bool Load(cParser *parser, bool ter = false); TAnimContainer * AddContainer(char *pName); TAnimContainer * GetContainer(char *pName); -/* void RenderDL(vector3 pPosition = vector3(0, 0, 0), double fAngle = 0); - void RenderAlphaDL(vector3 pPosition = vector3(0, 0, 0), double fAngle = 0); - void RenderVBO(vector3 pPosition = vector3(0, 0, 0), double fAngle = 0); - void RenderAlphaVBO(vector3 pPosition = vector3(0, 0, 0), double fAngle = 0); -*/ -#ifdef EU07_USE_OLD_RENDERCODE - void RenderDL( vector3 *vPosition ); - void RenderAlphaDL(vector3 *vPosition); - void RenderVBO(vector3 *vPosition); - void RenderAlphaVBO(vector3 *vPosition); -#else void Render( vector3 *vPosition ); void RenderAlpha( vector3 *vPosition ); -#endif int Flags(); void RaAnglesSet(double a, double b, double c) { @@ -201,6 +179,4 @@ class TAnimModel static void AnimUpdate(double dt); }; - //--------------------------------------------------------------------------- -#endif diff --git a/Driver.cpp b/Driver.cpp index 97c7ee03..dbb4b171 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -512,11 +512,6 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) return; } -#ifdef EU07_USE_OLD_SPEEDTABLE - // jak coś się znajdzie, zostanie wpisane w tę pozycję, którą właśnie odczytano - --iLast; -#endif - while (fCurrentDistance < fDistance) { if (pTrack != tLast) // ostatni zapisany w tabelce nie był jeszcze sprawdzony diff --git a/DynObj.cpp b/DynObj.cpp index 3441c328..16229e1d 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1531,14 +1531,6 @@ TDynamicObject::TDynamicObject() //} mdModel = NULL; mdKabina = NULL; -#ifdef EU07_USE_OLD_RENDERCODE - ReplacableSkinID[ 0 ] = 0; - ReplacableSkinID[ 1 ] = 0; - ReplacableSkinID[ 2 ] = 0; - ReplacableSkinID[ 3 ] = 0; - ReplacableSkinID[ 4 ] = 0; - iAlpha = 0x30300030; // tak gdy tekstury wymienne nie mają przezroczystości -#endif // smWiazary[0]=smWiazary[1]=NULL; smWahacze[0] = smWahacze[1] = smWahacze[2] = smWahacze[3] = NULL; fWahaczeAmp = 0; @@ -3563,262 +3555,6 @@ void TDynamicObject::TurnOff() btMechanik1.TurnOff(); btMechanik2.TurnOff(); }; -#ifdef EU07_USE_OLD_RENDERCODE -void TDynamicObject::Render() -{ // rysowanie elementów nieprzezroczystych - // youBy - sprawdzamy, czy jest sens renderowac - - if (GfxRenderer.Visible(this)) - { - TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji - // AnsiString asLoadName=""; - double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition) / Global::ZoomFactor; - ABuLittleUpdate(ObjSqrDist); // ustawianie zmiennych submodeli dla wspólnego modelu - -// Cone(vCoulpler[0],modelRot.z,0); -// Cone(vCoulpler[1],modelRot.z,1); - -// ActualTrack= GetTrack(); //McZapkie-240702 - -#if RENDER_CONE - { // Ra: testowe renderowanie pozycji wózków w postaci ostrosłupów, wymaga - // GLUT32.DLL - double dir = RadToDeg(atan2(vLeft.z, vLeft.x)); - Axle0.Render(0); - Axle1.Render(1); // bogieRot[0] - // if (PrevConnected) //renderowanie połączenia - } -#endif - - glPushMatrix(); - // vector3 pos= vPosition; - // double ObjDist= SquareMagnitude(Global::pCameraPosition-pos); - if (this == Global::pUserDynamic) - { // specjalne ustawienie, aby nie trzęsło -#ifdef EU07_USE_OLD_LIGHTING_MODEL - if (Global::bSmudge) - { // jak jest widoczna smuga, to pojazd renderować po - // wyrenderowaniu smugi - glPopMatrix(); // a to trzeba zebrać przed wyjściem - return; - } -#endif - // if (Global::pWorld->) //tu trzeba by ustawić animacje na modelu - // zewnętrznym - glLoadIdentity(); // zacząć od macierzy jedynkowej - Global::pCamera->SetCabMatrix(vPosition); // specjalne ustawienie kamery - } - else - glTranslated(vPosition.x, vPosition.y, - vPosition.z); // standardowe przesunięcie względem początku scenerii - glMultMatrixd(mMatrix.getArray()); -#ifdef EU07_USE_OLD_LIGHTING_MODEL - if (fShade > 0.0) - { // Ra: zmiana oswietlenia w tunelu, wykopie - GLfloat ambientLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat diffuseLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat specularLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - // trochę problem z ambientem w wykopie... - for (int li = 0; li < 3; li++) - { - ambientLight[li] = Global::ambientDayLight[li] * fShade; - diffuseLight[li] = Global::diffuseDayLight[li] * fShade; - specularLight[li] = Global::specularDayLight[li] * fShade; - } - glLightfv(GL_LIGHT0, GL_AMBIENT, ambientLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, specularLight); - } -#else - if( fShade > 0.0f ) { - // change light level based on light level of the occupied track - Global::DayLight.apply_intensity( fShade ); - } -#endif - if (Global::bUseVBO) - { // wersja VBO - if (mdLowPolyInt) - if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) - mdLowPolyInt->RaRender(ObjSqrDist, ReplacableSkinID, iAlpha); - mdModel->RaRender(ObjSqrDist, ReplacableSkinID, iAlpha); - if (mdLoad) // renderowanie nieprzezroczystego ładunku - mdLoad->RaRender(ObjSqrDist, ReplacableSkinID, iAlpha); - } - else - { // wersja Display Lists - if( mdLowPolyInt ) { - // low poly interior - if( FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab ) { - // enable cab light if needed - if( InteriorLightLevel > 0.0f ) { - - // crude way to light the cabin, until we have something more complete in place - auto const cablight = InteriorLight * InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } - - mdLowPolyInt->Render( ObjSqrDist, ReplacableSkinID, iAlpha ); - - if( InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - } - } - } - mdModel->Render(ObjSqrDist, ReplacableSkinID, iAlpha); - if (mdLoad) // renderowanie nieprzezroczystego ładunku - mdLoad->Render(ObjSqrDist, ReplacableSkinID, iAlpha); - } - - // Ra: czy ta kabina tu ma sens? - // Ra: czy nie renderuje się dwukrotnie? - // Ra: dlaczego jest zablokowana w przezroczystych? - if (mdKabina) // jeśli ma model kabiny - if ((mdKabina != mdModel) && bDisplayCab && FreeFlyModeFlag) - { // rendering kabiny gdy jest oddzielnym modelem i - // ma byc wyswietlana - // ABu: tylko w trybie FreeFly, zwykly tryb w world.cpp - // Ra: świetła są ustawione dla zewnętrza danego pojazdu -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-mplement this - // oswietlenie kabiny - GLfloat ambientCabLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat diffuseCabLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat specularCabLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - for (int li = 0; li < 3; li++) - { - ambientCabLight[li] = Global::ambientDayLight[li] * 0.9; - diffuseCabLight[li] = Global::diffuseDayLight[li] * 0.5; - specularCabLight[li] = Global::specularDayLight[li] * 0.5; - } - switch (MyTrack->eEnvironment) - { - case e_canyon: - { - for (int li = 0; li < 3; li++) - { - diffuseCabLight[li] *= 0.6f; - specularCabLight[li] *= 0.7f; - } - } - break; - case e_tunnel: - { - for (int li = 0; li < 3; li++) - { - ambientCabLight[li] *= 0.3f; - diffuseCabLight[li] *= 0.1f; - specularCabLight[li] *= 0.2f; - } - } - break; - } - glLightfv(GL_LIGHT0, GL_AMBIENT, ambientCabLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseCabLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, specularCabLight); -#endif - if (Global::bUseVBO) - mdKabina->RaRender(ObjSqrDist, 0); - else - mdKabina->Render(ObjSqrDist, 0); -#ifdef EU07_USE_OLD_LIGHTING_MODEL - glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); -#endif - } -#ifdef EU07_USE_OLD_LIGHTING_MODEL - if( fShade != 0.0 ) // tylko jeśli było zmieniane - { // przywrócenie standardowego oświetlenia - glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); - } -#else - if( fShade > 0.0f ) { - // restore regular light level - Global::DayLight.apply_intensity(); - } -#endif - glPopMatrix(); - if (btnOn) - TurnOff(); // przywrócenie domyślnych pozycji submodeli - } // yB - koniec mieszania z grafika -}; - -void TDynamicObject::RenderAlpha() -{ // rysowanie elementów półprzezroczystych - if (renderme) - { - TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji - double ObjSqrDist = SquareMagnitude(Global::pCameraPosition - vPosition); - ABuLittleUpdate(ObjSqrDist); // ustawianie zmiennych submodeli dla wspólnego modelu - glPushMatrix(); - if (this == Global::pUserDynamic) - { // specjalne ustawienie, aby nie trzęsło - glPopMatrix(); // to trzeba zebrać przed wyściem - return; - glLoadIdentity(); // zacząć od macierzy jedynkowej - Global::pCamera->SetCabMatrix(vPosition); // specjalne ustawienie kamery - } - else - glTranslated(vPosition.x, vPosition.y, - vPosition.z); // standardowe przesunięcie względem początku scenerii - glMultMatrixd(mMatrix.getArray()); -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this - if (fShade > 0.0) - { // Ra: zmiana oswietlenia w tunelu, wykopie - GLfloat ambientLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat diffuseLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - GLfloat specularLight[4] = {0.5f, 0.5f, 0.5f, 1.0f}; - // trochę problem z ambientem w wykopie... - for (int li = 0; li < 3; li++) - { - ambientLight[li] = Global::ambientDayLight[li] * fShade; - diffuseLight[li] = Global::diffuseDayLight[li] * fShade; - specularLight[li] = Global::specularDayLight[li] * fShade; - } - glLightfv(GL_LIGHT0, GL_AMBIENT, ambientLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuseLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, specularLight); - } -#endif - if (Global::bUseVBO) - { // wersja VBO - if (mdLowPolyInt) - if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) - mdLowPolyInt->RaRenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - mdModel->RaRenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - if (mdLoad) - mdLoad->RaRenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - } - else - { // wersja Display Lists - if (mdLowPolyInt) - if (FreeFlyModeFlag ? true : !mdKabina || !bDisplayCab) - mdLowPolyInt->RenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - mdModel->RenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - if (mdLoad) - mdLoad->RenderAlpha(ObjSqrDist, ReplacableSkinID, iAlpha); - } -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this - if (fShade != 0.0) // tylko jeśli było zmieniane - { // przywrócenie standardowego oświetlenia - glLightfv(GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight); - glLightfv(GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight); - glLightfv(GL_LIGHT0, GL_SPECULAR, Global::specularDayLight); - } -#endif - glPopMatrix(); - if (btnOn) - TurnOff(); // przywrócenie domyślnych pozycji submodeli - } - return; -} // koniec renderalpha -#endif void TDynamicObject::RenderSounds() { // przeliczanie dźwięków, bo będzie słychać bez wyświetlania sektora z pojazdem @@ -4210,26 +3946,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, if( token == "models:") { // modele i podmodele -#ifdef EU07_USE_OLD_RENDERCODE - iMultiTex = 0; // czy jest wiele tekstur wymiennych? - parser.getTokens(); - parser >> asModel; - if( asModel[asModel.size() - 1] == '#' ) // Ra 2015-01: nie podoba mi siê to - { // model wymaga wielu tekstur wymiennych - iMultiTex = 1; - asModel.erase( asModel.length() - 1 ); - } - std::size_t i = asModel.find( ',' ); - if ( i != std::string::npos ) - { // Ra 2015-01: może szukać przecinka w nazwie modelu, a po przecinku była by liczba tekstur? - if (i < asModel.length()) - iMultiTex = asModel[i + 1] - '0'; - if (iMultiTex < 0) - iMultiTex = 0; - else if (iMultiTex > 1) - iMultiTex = 1; // na razie ustawiamy na 1 - } -#else m_materialdata.multi_textures = 0; // czy jest wiele tekstur wymiennych? parser.getTokens(); parser >> asModel; @@ -4245,71 +3961,13 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, m_materialdata.multi_textures = asModel[i + 1] - '0'; m_materialdata.multi_textures = clamp( m_materialdata.multi_textures, 0, 1 ); // na razie ustawiamy na 1 } -#endif asModel = BaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje // modele w dynamics/basedir Global::asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... mdModel = TModelsManager::GetModel(asModel, true); assert( mdModel != nullptr ); // TODO: handle this more gracefully than all going to shit if (ReplacableSkin != "none") -#ifdef EU07_USE_OLD_RENDERCODE - { // tekstura wymienna jest raczej jedynie w "dynamic\" - ReplacableSkin = - Global::asCurrentTexturePath + ReplacableSkin; // skory tez z dynamic/... - std::string x = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie - if (!x.empty()) - ReplacableSkinID[4] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + "nowhere", "", 9); - - if (iMultiTex > 0) - { // jeśli model ma 4 tekstury - ReplacableSkinID[1] = GfxRenderer.GetTextureId( - ReplacableSkin + ",1", "", Global::iDynamicFiltering); - if (ReplacableSkinID[1]) - { // pierwsza z zestawu znaleziona - ReplacableSkinID[2] = GfxRenderer.GetTextureId( - ReplacableSkin + ",2", "", Global::iDynamicFiltering); - if (ReplacableSkinID[2]) - { - iMultiTex = 2; // już są dwie - ReplacableSkinID[3] = GfxRenderer.GetTextureId( - ReplacableSkin + ",3", "", Global::iDynamicFiltering); - if (ReplacableSkinID[3]) - { - iMultiTex = 3; // a teraz nawet trzy - ReplacableSkinID[4] = GfxRenderer.GetTextureId( - ReplacableSkin + ",4", "", Global::iDynamicFiltering); - if (ReplacableSkinID[4]) - iMultiTex = 4; // jak są cztery, to blokujemy podmianę tekstury rozkładem - } - } - } - else - { // zestaw nie zadziałał, próbujemy normanie - iMultiTex = 0; - ReplacableSkinID[1] = GfxRenderer.GetTextureId( - ReplacableSkin, "", Global::iDynamicFiltering); - } - } - else - ReplacableSkinID[1] = GfxRenderer.GetTextureId( - ReplacableSkin, "", Global::iDynamicFiltering); - if (GfxRenderer.Texture(ReplacableSkinID[1]).has_alpha) - iAlpha = 0x31310031; // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych - else - iAlpha = 0x30300030; // wszystkie tekstury nieprzezroczyste - nie renderować w cyklu przezroczystych - if (ReplacableSkinID[2]) - if (GfxRenderer.Texture(ReplacableSkinID[2]).has_alpha) - iAlpha |= 0x02020002; // tekstura -2 z kanałem alfa - nie renderować w cyklu nieprzezroczystych - if (ReplacableSkinID[3]) - if (GfxRenderer.Texture(ReplacableSkinID[3]).has_alpha) - iAlpha |= 0x04040004; // tekstura -3 z kanałem alfa - nie renderować w cyklu nieprzezroczystych - if (ReplacableSkinID[4]) - if (GfxRenderer.Texture(ReplacableSkinID[4]).has_alpha) - iAlpha |= 0x08080008; // tekstura -4 z kanałem alfa - nie renderować w cyklu nieprzezroczystych - } -#else - { // tekstura wymienna jest raczej jedynie w "dynamic\" -// ReplacableSkin = Global::asCurrentTexturePath + ReplacableSkin; // skory tez z dynamic/... + { std::string nowheretexture = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie if( false == nowheretexture.empty() ) { m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( nowheretexture, "", 9 ); @@ -4364,7 +4022,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 4 ] ).has_alpha ) m_materialdata.textures_alpha |= 0x08080008; // tekstura -4 z kanałem alfa - nie renderować w cyklu nieprzezroczystych } -#endif if (!MoverParameters->LoadAccepted.empty()) // if (MoverParameters->LoadAccepted!=AnsiString("")); // && // MoverParameters->LoadType!=AnsiString("passengers")) @@ -5655,62 +5312,16 @@ std::string TDynamicObject::TextureTest(std::string const &name) return ""; // nie znaleziona }; -#ifdef EU07_USE_OLD_RENDERCODE -void TDynamicObject::DestinationSet(std::string to, std::string numer) -{ // ustawienie stacji - // docelowej oraz wymiennej - // tekstury 4, jeśli - // istnieje plik - // w zasadzie, to każdy wagon mógłby mieć inną stację docelową - // zwłaszcza w towarowych, pod kątem zautomatyzowania maewrów albo pracy górki - // ale to jeszcze potrwa, zanim będzie możliwe, na razie można wpisać stację z - // rozkładu - if (abs(iMultiTex) >= 4) - return; // jak są 4 tekstury wymienne, to nie zmieniać rozkładem - numer = Global::Bezogonkow(numer); - asDestination = to; - to = Global::Bezogonkow(to); // do szukania pliku obcinamy ogonki - std::string x = TextureTest(asBaseDir + numer + "@" + MoverParameters->TypeName); - if (!x.empty()) - { - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się - return; - } - x = TextureTest(asBaseDir + numer ); - if (!x.empty()) - { - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się - return; - } - if (to.empty()) - to = "nowhere"; - x = TextureTest(asBaseDir + to + "@" + MoverParameters->TypeName); // w pierwszej kolejności z nazwą FIZ/MMD - if (!x.empty()) - { - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się - return; - } - x = TextureTest(asBaseDir + to); // na razie prymitywnie - if (!x.empty()) - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); // rozmywania 0,1,4,5 nie nadają się - else - { - x = TextureTest(asBaseDir + "nowhere"); // jak nie znalazł dedykowanej, to niech daje nowhere - if (!x.empty()) - ReplacableSkinID[4] = GfxRenderer.GetTextureId( x, "", 9); - } - // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa - // tekstury nr 4 -}; -#else void TDynamicObject::DestinationSet(std::string to, std::string numer) { // ustawienie stacji docelowej oraz wymiennej tekstury 4, jeśli istnieje plik // w zasadzie, to każdy wagon mógłby mieć inną stację docelową // zwłaszcza w towarowych, pod kątem zautomatyzowania maewrów albo pracy górki // ale to jeszcze potrwa, zanim będzie możliwe, na razie można wpisać stację z // rozkładu - if( std::abs( m_materialdata.multi_textures ) >= 4 ) - return; // jak są 4 tekstury wymienne, to nie zmieniać rozkładem + if( std::abs( m_materialdata.multi_textures ) >= 4 ) { + // jak są 4 tekstury wymienne, to nie zmieniać rozkładem + return; + } numer = Global::Bezogonkow(numer); asDestination = to; to = Global::Bezogonkow(to); // do szukania pliku obcinamy ogonki @@ -5743,10 +5354,8 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) if (!x.empty()) m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); } - // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa - // tekstury nr 4 + // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa tekstury nr 4 }; -#endif void TDynamicObject::OverheadTrack(float o) { // ewentualne wymuszanie jazdy diff --git a/DynObj.h b/DynObj.h index 34682611..c61254d3 100644 --- a/DynObj.h +++ b/DynObj.h @@ -137,11 +137,8 @@ class TAnim void Parovoz(); // wykonanie obliczeń animacji }; -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -#ifndef EU07_USE_OLD_RENDERCODE // parameters for the material object, as currently used by various simulator models struct material_data { @@ -153,7 +150,6 @@ struct material_data { ::SecureZeroMemory( replacable_skins, sizeof( replacable_skins ) ); } }; -#endif class TDynamicObject { // klasa pojazdu @@ -200,15 +196,11 @@ public: // modele składowe pojazdu float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) private: // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe -#ifndef EU07_USE_OLD_RENDERCODE material_data m_materialdata; -#endif public: -#ifndef EU07_USE_OLD_RENDERCODE inline - material_data const *Material() const { return &m_materialdata; } -#endif + material_data const *Material() const { return &m_materialdata; } // tymczasowo udostępnione do wyszukiwania drutu int iAnimType[ ANIM_TYPES ]; // 0-osie,1-drzwi,2-obracane,3-zderzaki,4-wózki,5-pantografy,6-tłoki private: @@ -421,11 +413,6 @@ public: // modele składowe pojazdu int iCabs; // maski bitowe modeli kabin TTrack *MyTrack; // McZapkie-030303: tor na ktorym stoi, ABu std::string asBaseDir; -#ifdef EU07_USE_OLD_RENDERCODE - texture_manager::size_type ReplacableSkinID[5]; // McZapkie:zmienialne nadwozie - int iAlpha; // maska przezroczystości tekstur - int iMultiTex; //<0 tekstury wskazane wpisem, >0 tekstury z przecinkami, =0 jedna -#endif int iOverheadMask; // maska przydzielana przez AI pojazdom posiadającym pantograf, aby wymuszały // jazdę bezprądową TTractionParam tmpTraction; @@ -444,10 +431,6 @@ public: // modele składowe pojazdu bool FastUpdate(double dt); void Move(double fDistance); void FastMove(double fDistance); -#ifdef EU07_USE_OLD_RENDERCODE - void Render(); - void RenderAlpha(); -#endif void RenderSounds(); inline vector3 GetPosition() const { diff --git a/EU07.cpp b/EU07.cpp index c73d9218..280f36fc 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -9,7 +9,6 @@ http://mozilla.org/MPL/2.0/. /* MaSzyna EU07 locomotive simulator Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others - */ /* Authors: diff --git a/Globals.cpp b/Globals.cpp index 277b01ad..7dddc20f 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -83,17 +83,8 @@ GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; double Global::fFogStart = 1700; double Global::fFogEnd = 2000; float Global::Overcast{ 0.1f }; // NOTE: all this weather stuff should be moved elsewhere -#ifdef EU07_USE_OLD_LIGHTING_MODEL -GLfloat Global::ambientDayLight[] = {0.40f, 0.40f, 0.45f, 1.0f}; // robocze -GLfloat Global::diffuseDayLight[] = {0.55f, 0.54f, 0.50f, 1.0f}; -GLfloat Global::specularDayLight[] = {0.95f, 0.94f, 0.90f, 1.0f}; -GLfloat Global::ambientLight[] = {0.80f, 0.80f, 0.85f, 1.0f}; // stałe -GLfloat Global::diffuseLight[] = {0.85f, 0.85f, 0.80f, 1.0f}; -GLfloat Global::specularLight[] = {0.95f, 0.94f, 0.90f, 1.0f}; -#else opengl_light Global::DayLight; int Global::DynamicLightCount{ 3 }; -#endif GLfloat Global::whiteLight[] = {1.00f, 1.00f, 1.00f, 1.0f}; GLfloat Global::noLight[] = {0.00f, 0.00f, 0.00f, 1.0f}; GLfloat Global::darkLight[] = {0.03f, 0.03f, 0.03f, 1.0f}; //śladowe diff --git a/Globals.h b/Globals.h index 91664442..9e0cf512 100644 --- a/Globals.h +++ b/Globals.h @@ -221,20 +221,11 @@ class Global static GLfloat FogColor[]; static float Overcast; // static bool bTimeChange; -#ifdef EU07_USE_OLD_LIGHTING_MODEL - static opengl_light AmbientLight; - static GLfloat ambientDayLight[]; - static GLfloat diffuseDayLight[]; - static GLfloat specularDayLight[]; - static GLfloat ambientLight[]; - static GLfloat diffuseLight[]; - static GLfloat specularLight[]; -#else // TODO: put these things in the renderer static opengl_light DayLight; static int DynamicLightCount; -#endif + static GLfloat whiteLight[]; static GLfloat noLight[]; static GLfloat darkLight[]; diff --git a/Ground.cpp b/Ground.cpp index cbebea27..879d1265 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1625,19 +1625,15 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) str4); if (tf3 != 0.0) // zero oznacza błąd { - fTrainSetDist -= - tf3; // przesunięcie dla kolejnego, minus bo idziemy w stronę punktu 1 + // przesunięcie dla kolejnego, minus bo idziemy w stronę punktu 1 + fTrainSetDist -= tf3; tmp->pCenter = tmp->DynamicObject->GetPosition(); -/* // NOTE: the ctrain_depot flag is used to mark merged together parts of modular trains - // clearing it here breaks this connection, so i'm disabling this piece of code. - // if it has some actual purpose and disabling it breaks that, a different solution has to be found - // either for modular trains, or whatever it is this code does. - if (TempConnectionType[iTrainSetWehicleNumber]) // jeśli jest sprzęg - if (tmp->DynamicObject->MoverParameters->Couplers[tf1 == -1.0 ? 0 : 1] - .AllowedFlag & - ctrain_depot) // jesli zablokowany - TempConnectionType[iTrainSetWehicleNumber] |= ctrain_depot; // będzie blokada -*/ + // automatically establish permanent connections for couplers which specify them in their definitions + if( TempConnectionType[ iTrainSetWehicleNumber ] ) { + if( tmp->DynamicObject->MoverParameters->Couplers[ ( tf1 == -1.0 ? 0 : 1 ) ].AllowedFlag & coupling::permanent ) { + TempConnectionType[ iTrainSetWehicleNumber ] |= coupling::permanent; + } + } iTrainSetWehicleNumber++; } else @@ -1825,29 +1821,12 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) parser->getTokens(); *parser >> token; } while (token.compare("endtri") != 0); - // delete tmp; //nie ma co tego trzymać - // tmp=NULL; //to jest błąd } else { -/* - i = 0; -*/ TempVerts.clear(); TGroundVertex vertex; - do - { -/* - if (i < 9999) // 3333 trójkąty - { // liczba wierzchołków nie jest nieograniczona -*/ -/* - parser->getTokens(3); - *parser >> TempVerts[i].Point.x >> TempVerts[i].Point.y >> TempVerts[i].Point.z; - parser->getTokens(3); - *parser >> TempVerts[i].Normal.x >> TempVerts[i].Normal.y >> - TempVerts[i].Normal.z; -*/ + do { parser->getTokens( 8, false ); *parser >> vertex.Point.x @@ -1858,49 +1837,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> vertex.Normal.z >> vertex.tu >> vertex.tv; - /* - str=Parser->GetNextSymbol().LowerCase(); - if (str==AnsiString("x")) - TempVerts[i].tu=(TempVerts[i].Point.x+Parser->GetNextSymbol().ToDouble())/Parser->GetNextSymbol().ToDouble(); - else - if (str==AnsiString("y")) - TempVerts[i].tu=(TempVerts[i].Point.y+Parser->GetNextSymbol().ToDouble())/Parser->GetNextSymbol().ToDouble(); - else - if (str==AnsiString("z")) - TempVerts[i].tu=(TempVerts[i].Point.z+Parser->GetNextSymbol().ToDouble())/Parser->GetNextSymbol().ToDouble(); - else - TempVerts[i].tu=str.ToDouble();; - - str=Parser->GetNextSymbol().LowerCase(); - if (str==AnsiString("x")) - TempVerts[i].tv=(TempVerts[i].Point.x+Parser->GetNextSymbol().ToDouble())/Parser->GetNextSymbol().ToDouble(); - else - if (str==AnsiString("y")) - TempVerts[i].tv=(TempVerts[i].Point.y+Parser->GetNextSymbol().ToDouble())/Parser->GetNextSymbol().ToDouble(); - else - if (str==AnsiString("z")) - TempVerts[i].tv=(TempVerts[i].Point.z+Parser->GetNextSymbol().ToDouble())/Parser->GetNextSymbol().ToDouble(); - else - TempVerts[i].tv=str.ToDouble();; - */ -/* - parser->getTokens(2); - *parser >> TempVerts[i].tu >> TempVerts[i].tv; -*/ - // tf=Parser->GetNextSymbol().ToDouble(); - // TempVerts[i].tu=tf; - // tf=Parser->GetNextSymbol().ToDouble(); - // TempVerts[i].tv=tf; -/* - TempVerts[i].Point.RotateZ(aRotate.z / 180 * M_PI); - TempVerts[i].Point.RotateX(aRotate.x / 180 * M_PI); - TempVerts[i].Point.RotateY(aRotate.y / 180 * M_PI); - TempVerts[i].Normal.RotateZ(aRotate.z / 180 * M_PI); - TempVerts[i].Normal.RotateX(aRotate.x / 180 * M_PI); - TempVerts[i].Normal.RotateY(aRotate.y / 180 * M_PI); - TempVerts[i].Point += pOrigin; - tmp->pCenter += TempVerts[i].Point; -*/ vertex.Point.RotateZ( aRotate.z / 180 * M_PI ); vertex.Point.RotateX( aRotate.x / 180 * M_PI ); vertex.Point.RotateY( aRotate.y / 180 * M_PI ); @@ -1911,27 +1847,15 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->pCenter += vertex.Point; TempVerts.emplace_back( vertex ); -/* - } - else if (i == 9999) - ErrorLog("Bad triangles: too many verices"); - i++; -*/ parser->getTokens(); *parser >> token; - // } - } while (token.compare("endtri") != 0); -/* - nv = i; -*/ + nv = (int)TempVerts.size(); tmp->Init(nv); // utworzenie tablicy wierzchołków tmp->pCenter /= (nv > 0 ? nv : 1); - // memcpy(tmp->Vertices,TempVerts,nv*sizeof(TGroundVertex)); - r = 0; for (int i = 0; i < nv; i++) { @@ -1940,7 +1864,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) if (tf > r) r = tf; } - // tmp->fSquareRadius=2000*2000+r; tmp->fSquareRadius += r; RaTriangleDivider(tmp); // Ra: dzielenie trójkątów jest teraz całkiem wydajne @@ -2123,22 +2046,6 @@ bool TGround::Init(std::string File) cParser parser(File, cParser::buffer_FILE, subpath, Global::bLoadTraction); std::string token; - /* - TFileStream *fs; - fs=new TFileStream(asFile , fmOpenRead | fmShareCompat ); - AnsiString str=""; - int size=fs->Size; - str.SetLength(size); - fs->Read(str.c_str(),size); - str+=""; - delete fs; - TQueryParserComp *Parser; - Parser=new TQueryParserComp(NULL); - Parser->TextToParse=str; - // Parser->LoadStringToParse(asFile); - Parser->First(); - AnsiString Token,asFileName; - */ const int OriginStackMaxDepth = 100; // rozmiar stosu dla zagnieżdżenia origin int OriginStackTop = 0; vector3 OriginStack[OriginStackMaxDepth]; // stos zagnieżdżenia origin @@ -2434,58 +2341,15 @@ bool TGround::Init(std::string File) else if (str == "light") { // Ra: ustawianie światła przeniesione do FirstInit WriteLog("Scenery light definition"); -#ifdef EU07_USE_OLD_LIGHTING_MODEL - vector3 lp; - parser.getTokens(); - parser >> lp.x; - parser.getTokens(); - parser >> lp.y; - parser.getTokens(); - parser >> lp.z; - lp = Normalize(lp); // kierunek padania - Global::lightPos[0] = lp.x; // daylight position - Global::lightPos[1] = lp.y; - Global::lightPos[2] = lp.z; -#else parser.getTokens(3, false); parser >> Global::DayLight.direction.x >> Global::DayLight.direction.y >> Global::DayLight.direction.z;; Global::DayLight.direction.Normalize(); -#endif parser.getTokens(9, false); -#ifdef EU07_USE_OLD_LIGHTING_MODEL - parser - >> Global::ambientDayLight[ 0 ] - >> Global::ambientDayLight[ 1 ] - >> Global::ambientDayLight[ 2 ] - >> Global::diffuseDayLight[ 0 ] - >> Global::diffuseDayLight[ 1 ] - >> Global::diffuseDayLight[ 2 ] - >> Global::specularDayLight[ 0 ] - >> Global::specularDayLight[ 1 ] - >> Global::specularDayLight[ 2 ]; -#else -/* - parser - // kolor wszechobceny - >> Global::DayLight.ambient[0] - >> Global::DayLight.ambient[1] - >> Global::DayLight.ambient[2] - // kolor padający - >> Global::DayLight.diffuse[0] - >> Global::DayLight.diffuse[1] - >> Global::DayLight.diffuse[2] - // kolor odbity - >> Global::DayLight.specular[0] - >> Global::DayLight.specular[1] - >> Global::DayLight.specular[2]; -*/ -#endif - do - { + do { parser.getTokens(); parser >> token; } while (token.compare("endlight") != 0); diff --git a/Model3d.cpp b/Model3d.cpp index 26bd823a..a6e0845f 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1036,421 +1036,6 @@ void TSubModel::RaAnimation(TAnimType a) } }; -#ifdef EU07_USE_OLD_RENDERCODE -void TSubModel::RenderDL() -{ // główna procedura renderowania przez DL - if( ( iVisible ) - && ( fSquareDist >= (fSquareMinDist / Global::fDistanceFactor) ) - && ( fSquareDist <= (fSquareMaxDist * Global::fDistanceFactor) ) ) - { - if (iFlags & 0xC000) - { - glPushMatrix(); - if (fMatrix) - glMultMatrixf(fMatrix->readArray()); - if (b_Anim) - RaAnimation(b_Anim); - } - if (eType < TP_ROTATOR) - { // renderowanie obiektów OpenGL - if (iAlpha & iFlags & 0x1F) // rysuj gdy element nieprzezroczysty - { - if (TextureID < 0) // && (ReplacableSkinId!=0)) - { // zmienialne skóry - GfxRenderer.Bind(ReplacableSkinId[-TextureID]); - // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury - } - else - GfxRenderer.Bind(TextureID); // również 0 - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glCallList(uiDisplayList); // tylko dla siatki - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - else - glCallList(uiDisplayList); // tylko dla siatki - } - } - else if (eType == TP_FREESPOTLIGHT) - { // wersja DL - matrix4x4 mat; // macierz opisuje układ renderowania względem kamery - glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); - // kąt między kierunkiem światła a współrzędnymi kamery - vector3 gdzie = mat * vector3(0, 0, 0); // pozycja punktu świecącego względem kamery - fCosViewAngle = DotProduct(Normalize(mat * vector3(0, 0, 1) - gdzie), Normalize(gdzie)); - if (fCosViewAngle > fCosFalloffAngle) // kąt większy niż maksymalny stożek swiatła - { - double Distdimm = 1.0; - if (fCosViewAngle < - fCosHotspotAngle) // zmniejszona jasność między Hotspot a Falloff - if (fCosFalloffAngle < fCosHotspotAngle) - Distdimm = 1.0 - - (fCosHotspotAngle - fCosViewAngle) / - (fCosHotspotAngle - fCosFalloffAngle); - glColor3f(f4Diffuse[0] * Distdimm, f4Diffuse[1] * Distdimm, - f4Diffuse[2] * Distdimm); - /* TODO: poprawic to zeby dzialalo - if (iFarAttenDecay>0) - switch (iFarAttenDecay) - { - case 1: - Distdimm=fFarDecayRadius/(1+sqrt(fSquareDist)); - //dorobic od kata - break; - case 2: - Distdimm=fFarDecayRadius/(1+fSquareDist); - //dorobic od kata - break; - } - if (Distdimm>1) - Distdimm=1; - glColor3f(Diffuse[0]*Distdimm,Diffuse[1]*Distdimm,Diffuse[2]*Distdimm); - */ - // glPopMatrix(); - // return; - glCallList(uiDisplayList); // wyświetlenie warunkowe - } - } - else if (eType == TP_STARS) - { - // glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty swiecace sie - // blendowaly - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glCallList(uiDisplayList); // narysuj naraz wszystkie punkty z DL - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - } - if (Child != NULL) - if (iAlpha & iFlags & 0x001F0000) - Child->RenderDL(); - if (iFlags & 0xC000) - glPopMatrix(); - } - if (b_Anim < at_SecondsJump) - b_Anim = at_None; // wyłączenie animacji dla kolejnego użycia subm - if (Next) - if (iAlpha & iFlags & 0x1F000000) - Next->RenderDL(); // dalsze rekurencyjnie -}; // Render - -void TSubModel::RenderAlphaDL() -{ // renderowanie przezroczystych przez DL - if( ( iVisible ) - && ( fSquareDist >= (fSquareMinDist / Global::fDistanceFactor) ) - && ( fSquareDist <= (fSquareMaxDist * Global::fDistanceFactor) ) ) - { - if (iFlags & 0xC000) - { - glPushMatrix(); - if (fMatrix) - glMultMatrixf(fMatrix->readArray()); - if (b_aAnim) - RaAnimation(b_aAnim); - } - if (eType < TP_ROTATOR) - { // renderowanie obiektów OpenGL - if (iAlpha & iFlags & 0x2F) // rysuj gdy element przezroczysty - { - if (TextureID < 0) // && (ReplacableSkinId!=0)) - { // zmienialne skóry - GfxRenderer.Bind(ReplacableSkinId[-TextureID]); - // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury - } - else - GfxRenderer.Bind(TextureID); // również 0 - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glCallList(uiDisplayList); // tylko dla siatki - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - else - glCallList(uiDisplayList); // tylko dla siatki - } - } - else if (eType == TP_FREESPOTLIGHT) - { - // dorobić aureolę! - } - if (Child != NULL) - if (eType == TP_TEXT) - { // tekst renderujemy w specjalny sposób, zamiast - // submodeli z łańcucha Child - int i, j = (int)pasText->size(); - TSubModel *p; - if (!smLetter) - { // jeśli nie ma tablicy, to ją stworzyć; miejsce - // nieodpowiednie, ale tymczasowo - // może być - smLetter = new TSubModel *[256]; // tablica wskaźników submodeli dla - // wyświetlania tekstu - ZeroMemory(smLetter, 256 * sizeof(TSubModel *)); // wypełnianie zerami - p = Child; - while (p) - { - smLetter[p->pName[0]] = p; - p = p->Next; // kolejny znak - } - } - for (i = 1; i <= j; ++i) - { - p = smLetter[(*pasText)[i]]; // znak do wyświetlenia - if (p) - { // na razie tylko jako przezroczyste - p->RenderAlphaDL(); - if (p->fMatrix) - glMultMatrixf(p->fMatrix->readArray()); // przesuwanie widoku - } - } - } - else if (iAlpha & iFlags & 0x002F0000) - Child->RenderAlphaDL(); - if (iFlags & 0xC000) - glPopMatrix(); - } - if (b_aAnim < at_SecondsJump) - b_aAnim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu - if (Next != NULL) - if (iAlpha & iFlags & 0x2F000000) - Next->RenderAlphaDL(); -}; // RenderAlpha - -void TSubModel::RenderVBO() -{ // główna procedura renderowania przez VBO - if( ( iVisible ) - && ( fSquareDist >= (fSquareMinDist / Global::fDistanceFactor) ) - && ( fSquareDist <= (fSquareMaxDist * Global::fDistanceFactor) ) ) - { - if (iFlags & 0xC000) - { - glPushMatrix(); - if (fMatrix) - glMultMatrixf(fMatrix->readArray()); - if (b_Anim) - RaAnimation(b_Anim); - } - if (eType < TP_ROTATOR) - { // renderowanie obiektów OpenGL - if (iAlpha & iFlags & 0x1F) // rysuj gdy element nieprzezroczysty - { - if (TextureID < 0) // && (ReplacableSkinId!=0)) - { // zmienialne skóry - GfxRenderer.Bind(ReplacableSkinId[-TextureID]); - // TexAlpha=!(iAlpha&1); //zmiana tylko w przypadku wymienej tekstury - } - else - GfxRenderer.Bind(TextureID); // również 0 - glColor3fv(f4Diffuse); // McZapkie-240702: zamiast ub - // glMaterialfv(GL_FRONT,GL_AMBIENT_AND_DIFFUSE,f4Diffuse); //to samo, - // co glColor - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glDrawArrays(eType, iVboPtr, - iNumVerts); // narysuj naraz wszystkie trójkąty z VBO - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - else - glDrawArrays(eType, iVboPtr, - iNumVerts); // narysuj naraz wszystkie trójkąty z VBO - } - } - else if (eType == TP_FREESPOTLIGHT) - { // wersja VBO -/* - matrix4x4 mat; // macierz opisuje układ renderowania względem kamery - glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); -*/ - matrix4x4 mat; mat.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); - // kąt między kierunkiem światła a współrzędnymi kamery - vector3 gdzie = mat * vector3(0, 0, 0); // pozycja punktu świecącego względem kamery - fCosViewAngle = DotProduct(Normalize(mat * vector3(0, 0, 1) - gdzie), Normalize(gdzie)); - if (fCosViewAngle > fCosFalloffAngle) // kąt większy niż maksymalny stożek swiatła - { - double Distdimm = 1.0; - if (fCosViewAngle < - fCosHotspotAngle) // zmniejszona jasność między Hotspot a Falloff - if (fCosFalloffAngle < fCosHotspotAngle) - Distdimm = 1.0 - - (fCosHotspotAngle - fCosViewAngle) / - (fCosHotspotAngle - fCosFalloffAngle); - - /* TODO: poprawic to zeby dzialalo - - 2- Inverse (Applies inverse decay. The formula is luminance=R0/R, where - R0 is - the radial source of the light if no attenuation is - used, or the Near End - value of the light if Attenuation is used. R is the - radial distance of the - illuminated surface from R0.) - - 3- Inverse Square (Applies inverse-square decay. The formula for this is - (R0/R)^2. - This is actually the "real-world" decay of light, but - you might find it too dim - in the world of computer graphics.) - - .DecayRadius -- The distance over which the decay occurs. - - if (iFarAttenDecay>0) - switch (iFarAttenDecay) - { - case 1: - Distdimm=fFarDecayRadius/(1+sqrt(fSquareDist)); - //dorobic od kata - break; - case 2: - Distdimm=fFarDecayRadius/(1+fSquareDist); - //dorobic od kata - break; - } - if (Distdimm>1) - Distdimm=1; - - */ - GfxRenderer.Bind(0); // nie teksturować - // glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); - // glColorMaterial(GL_FRONT,GL_EMISSION); - float color[4] = { (float)(f4Diffuse[0] * Distdimm), (float)(f4Diffuse[1] * Distdimm), - (float)(f4Diffuse[2] * Distdimm), 0 }; - // glColor3f(f4Diffuse[0]*Distdimm,f4Diffuse[1]*Distdimm,f4Diffuse[2]*Distdimm); - glColorMaterial(GL_FRONT, GL_EMISSION); - glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie - // blendowaly - glColor3fv(color); // inaczej są białe - glMaterialfv(GL_FRONT, GL_EMISSION, color); - glDrawArrays(GL_POINTS, iVboPtr, iNumVerts); // narysuj wierzchołek z - // VBO - glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); // co ma ustawiać glColor - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); // bez tego słupy się świecą - } - } - else if (eType == TP_STARS) - { - // glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty swiecace sie - // blendowaly - if (Global::fLuminance < fLight) - { // Ra: pewnie można by to zrobić - // lepiej, bez powtarzania StartVBO() - pRoot->EndVBO(); // Ra: to też nie jest zbyt ładne - if (pRoot->StartColorVBO()) - { // wyświetlanie kolorowych punktów zamiast - // trójkątów - GfxRenderer.Bind(0); // tekstury nie ma - glColorMaterial(GL_FRONT, GL_EMISSION); - glDisable(GL_LIGHTING); // Tolaris-030603: bo mu punkty swiecace sie - // blendowaly - // glMaterialfv(GL_FRONT,GL_EMISSION,f4Diffuse); //zeby swiecilo na - // kolorowo - glDrawArrays(GL_POINTS, iVboPtr, - iNumVerts); // narysuj naraz wszystkie punkty z VBO - glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE); - // glMaterialfv(GL_FRONT,GL_EMISSION,emm2); - pRoot->EndVBO(); - pRoot->StartVBO(); - } - } - } - /*Ra: tu coś jest bez sensu... - else - { - glBindTexture(GL_TEXTURE_2D, 0); - // if (eType==smt_FreeSpotLight) - // { - // if (iFarAttenDecay==0) - // glColor3f(Diffuse[0],Diffuse[1],Diffuse[2]); - // } - // else - //TODO: poprawic zeby dzialalo - glColor3f(f4Diffuse[0],f4Diffuse[1],f4Diffuse[2]); - glColorMaterial(GL_FRONT,GL_EMISSION); - glDisable(GL_LIGHTING); //Tolaris-030603: bo mu punkty - swiecace sie blendowaly - //glBegin(GL_POINTS); - glDrawArrays(GL_POINTS,iVboPtr,iNumVerts); //narysuj - wierzchołek z VBO - // glVertex3f(0,0,0); - //glEnd(); - glEnable(GL_LIGHTING); - glColorMaterial(GL_FRONT,GL_AMBIENT_AND_DIFFUSE); - glMaterialfv(GL_FRONT,GL_EMISSION,emm2); - //glEndList(); - } - */ - if (Child != NULL) - if (iAlpha & iFlags & 0x001F0000) - Child->RenderVBO(); - if (iFlags & 0xC000) - glPopMatrix(); - } - if (b_Anim < at_SecondsJump) - b_Anim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu - if (Next) - if (iAlpha & iFlags & 0x1F000000) - Next->RenderVBO(); // dalsze rekurencyjnie -}; // RaRender - -void TSubModel::RenderAlphaVBO() -{ // renderowanie przezroczystych przez VBO - if( ( iVisible ) - && ( fSquareDist >= (fSquareMinDist / Global::fDistanceFactor) ) - && ( fSquareDist <= (fSquareMaxDist * Global::fDistanceFactor) ) ) - { - if (iFlags & 0xC000) - { - glPushMatrix(); // zapamiętanie matrycy - if (fMatrix) - glMultMatrixf(fMatrix->readArray()); - if (b_aAnim) - RaAnimation(b_aAnim); - } - glColor3fv(f4Diffuse); - if (eType < TP_ROTATOR) - { // renderowanie obiektów OpenGL - if (iAlpha & iFlags & 0x2F) // rysuj gdy element przezroczysty - { - if (TextureID < 0) // && (ReplacableSkinId!=0)) - { // zmienialne skory - GfxRenderer.Bind(ReplacableSkinId[-TextureID]); - // TexAlpha=iAlpha&1; //zmiana tylko w przypadku wymienej tekstury - } - else - GfxRenderer.Bind(TextureID); // również 0 - if (Global::fLuminance < fLight) - { - glMaterialfv(GL_FRONT, GL_EMISSION, f4Diffuse); // zeby swiecilo na kolorowo - glDrawArrays(eType, iVboPtr, - iNumVerts); // narysuj naraz wszystkie trójkąty z VBO - glMaterialfv(GL_FRONT, GL_EMISSION, emm2); - } - else - glDrawArrays(eType, iVboPtr, - iNumVerts); // narysuj naraz wszystkie trójkąty z VBO - } - } - else if (eType == TP_FREESPOTLIGHT) - { - // dorobić aureolę! - } - if (Child) - if (iAlpha & iFlags & 0x002F0000) - Child->RenderAlphaVBO(); - if (iFlags & 0xC000) - glPopMatrix(); - } - if (b_aAnim < at_SecondsJump) - b_aAnim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu - if (Next) - if (iAlpha & iFlags & 0x2F000000) - Next->RenderAlphaVBO(); -}; // RaRenderAlpha -#endif //--------------------------------------------------------------------------- void TSubModel::RaArrayFill(CVertNormTex *Vert) @@ -2212,140 +1797,6 @@ void TModel3d::BreakHierarhy() Error("Not implemented yet :("); }; -#ifdef EU07_USE_OLD_RENDERCODE -void TModel3d::Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) -{ - iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste - if (iAlpha & iFlags & 0x1F1F001F) // czy w ogóle jest co robić w tym cyklu? - { - TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderDL(); - } -}; - -void TModel3d::RenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId, int iAlpha) -{ - if (iAlpha & iFlags & 0x2F2F002F) - { - TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderAlphaDL(); - } -}; - -void TModel3d::RaRender(double fSquareDistance, texture_manager::size_type const *ReplacableSkinId, int iAlpha) -{ // renderowanie specjalne, np. kabiny - iAlpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste - if (iAlpha & iFlags & 0x1F1F001F) // czy w ogóle jest co robić w tym cyklu? - { - TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! - if (StartVBO()) - { // odwrócenie flag, aby wyłapać nieprzezroczyste - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->pRoot = this; - Root->RenderVBO(); - EndVBO(); - } - } -}; - -void TModel3d::RaRenderAlpha(double fSquareDistance, texture_manager::size_type const *ReplacableSkinId, int iAlpha) -{ // renderowanie specjalne, np. kabiny - if (iAlpha & iFlags & 0x2F2F002F) // czy w ogóle jest co robić w tym cyklu? - { - TSubModel::fSquareDist = fSquareDistance; // zmienna globalna! - if (StartVBO()) - { - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderAlphaVBO(); - EndVBO(); - } - } -}; -#endif -//----------------------------------------------------------------------------- -// 2011-03-16 cztery nowe funkcje renderowania z możliwością pochylania obiektów -//----------------------------------------------------------------------------- -#ifdef EU07_USE_OLD_RENDERCODE -void TModel3d::Render(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, int iAlpha) -{ // nieprzezroczyste, Display List - glPushMatrix(); - glTranslated(vPosition->x, vPosition->y, vPosition->z); - if (vAngle->y != 0.0) - glRotated(vAngle->y, 0.0, 1.0, 0.0); - if (vAngle->x != 0.0) - glRotated(vAngle->x, 1.0, 0.0, 0.0); - if (vAngle->z != 0.0) - glRotated(vAngle->z, 0.0, 0.0, 1.0); - TSubModel::fSquareDist = - SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! - // odwrócenie flag, aby wyłapać nieprzezroczyste - Root->ReplacableSet(ReplacableSkinId, iAlpha ^ 0x0F0F000F); - Root->RenderDL(); - glPopMatrix(); -}; -void TModel3d::RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId, - int iAlpha) -{ // przezroczyste, Display List - glPushMatrix(); - glTranslated(vPosition->x, vPosition->y, vPosition->z); - if (vAngle->y != 0.0) - glRotated(vAngle->y, 0.0, 1.0, 0.0); - if (vAngle->x != 0.0) - glRotated(vAngle->x, 1.0, 0.0, 0.0); - if (vAngle->z != 0.0) - glRotated(vAngle->z, 0.0, 0.0, 1.0); - TSubModel::fSquareDist = - SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderAlphaDL(); - glPopMatrix(); -}; - -void TModel3d::RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type const *ReplacableSkinId, int iAlpha) -{ // nieprzezroczyste, VBO - glPushMatrix(); - glTranslated(vPosition->x, vPosition->y, vPosition->z); - if (vAngle->y != 0.0) - glRotated(vAngle->y, 0.0, 1.0, 0.0); - if (vAngle->x != 0.0) - glRotated(vAngle->x, 1.0, 0.0, 0.0); - if (vAngle->z != 0.0) - glRotated(vAngle->z, 0.0, 0.0, 1.0); - TSubModel::fSquareDist = - SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! - if (StartVBO()) - { // odwrócenie flag, aby wyłapać nieprzezroczyste - Root->ReplacableSet(ReplacableSkinId, iAlpha ^ 0x0F0F000F); - Root->RenderVBO(); - EndVBO(); - } - glPopMatrix(); -}; -void TModel3d::RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type const *ReplacableSkinId, - int iAlpha) -{ // przezroczyste, VBO - glPushMatrix(); - glTranslated(vPosition->x, vPosition->y, vPosition->z); - if (vAngle->y != 0.0) - glRotated(vAngle->y, 0.0, 1.0, 0.0); - if (vAngle->x != 0.0) - glRotated(vAngle->x, 1.0, 0.0, 0.0); - if (vAngle->z != 0.0) - glRotated(vAngle->z, 0.0, 0.0, 1.0); - TSubModel::fSquareDist = - SquareMagnitude(*vPosition - Global::GetCameraPosition()); // zmienna globalna! - if (StartVBO()) - { - Root->ReplacableSet(ReplacableSkinId, iAlpha); - Root->RenderAlphaVBO(); - EndVBO(); - } - glPopMatrix(); -}; -#endif - //----------------------------------------------------------------------------- // 2012-02 funkcje do tworzenia terenu z E3D //----------------------------------------------------------------------------- diff --git a/Model3d.h b/Model3d.h index f3942b56..ae650785 100644 --- a/Model3d.h +++ b/Model3d.h @@ -255,12 +255,6 @@ public: void SetRotateIK1(float3 vNewAngles); TSubModel * GetFromName(std::string const &search, bool i = true); TSubModel * GetFromName(char const *search, bool i = true); -#ifdef EU07_USE_OLD_RENDERCODE - void RenderDL(); - void RenderAlphaDL(); - void RenderVBO(); - void RenderAlphaVBO(); -#endif // inline matrix4x4* GetMatrix() {return dMatrix;}; inline float4x4 * GetMatrix() { @@ -361,20 +355,6 @@ public: bool LoadFromFile(std::string const &FileName, bool dynamic); void SaveToBinFile(char const *FileName); void BreakHierarhy(); - // renderowanie specjalne -#ifdef EU07_USE_OLD_RENDERCODE - void Render(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RenderAlpha(double fSquareDistance, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); -#endif - void RaRender(double fSquareDistance, texture_manager::size_type const *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RaRenderAlpha(double fSquareDistance, texture_manager::size_type const *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - // trzy kąty obrotu -#ifdef EU07_USE_OLD_RENDERCODE - void Render( vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030 ); - void RenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type *ReplacableSkinId = NULL, int iAlpha = 0x30300030); -#endif - void RaRender(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type const *ReplacableSkinId = NULL, int iAlpha = 0x30300030); - void RaRenderAlpha(vector3 *vPosition, vector3 *vAngle, texture_manager::size_type const *ReplacableSkinId = NULL, int iAlpha = 0x30300030); // inline int GetSubModelsCount() { return (SubModelsCount); }; int Flags() const { diff --git a/Segment.h b/Segment.h index b027d123..1c4c84ab 100644 --- a/Segment.h +++ b/Segment.h @@ -17,8 +17,6 @@ http://mozilla.org/MPL/2.0/. using namespace Math3D; -#define EU07_DEBUG_VBO - // 110405 Ra: klasa punktów przekroju z normalnymi class vector6 : public vector3 diff --git a/Track.cpp b/Track.cpp index c8672c80..b0920ad9 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2595,11 +2595,7 @@ void TTrack::RenderDyn() { // renderowanie nieprzezroczystych fragmentów pojazdów for( auto dynamic : Dynamics ) { // sam sprawdza, czy VBO; zmienia kontekst VBO! -#ifdef EU07_USE_OLD_RENDERCODE - dynamic->Render(); -#else GfxRenderer.Render( dynamic ); -#endif } }; @@ -2607,11 +2603,7 @@ void TTrack::RenderDynAlpha() { // renderowanie przezroczystych fragmentów pojazdów for( auto dynamic : Dynamics ) { // sam sprawdza, czy VBO; zmienia kontekst VBO! -#ifdef EU07_USE_OLD_RENDERCODE - dynamic->RenderAlpha(); -#else GfxRenderer.Render_Alpha( dynamic ); -#endif } }; diff --git a/World.cpp b/World.cpp index 0bcfe03c..d7fa9bae 100644 --- a/World.cpp +++ b/World.cpp @@ -906,43 +906,52 @@ void TWorld::DistantView( bool const Near ) Camera.RaLook(); // jednorazowe przestawienie kamery }; -void TWorld::FollowView(bool wycisz) -{ // ustawienie śledzenia pojazdu +// ustawienie śledzenia pojazdu +void TWorld::FollowView(bool wycisz) { + Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe + if (Controlled) // jest pojazd do prowadzenia? { - vector3 camStara = - Camera.Pos; // przestawianie kamery jest bez sensu: do przerobienia na potem - // Controlled->ABuSetModelShake(vector3(0,0,0)); + Ground.Silence( Camera.Pos ); // wyciszenie dźwięków z poprzedniej pozycji + if (FreeFlyModeFlag) { // jeżeli poza kabiną, przestawiamy w jej okolicę - OK - if (Train) - Train->Dynamic()->ABuSetModelShake( - vector3(0, 0, 0)); // wyłączenie trzęsienia na siłę? - // Camera.Pos=Train->pMechPosition+Normalize(Train->GetDirection())*20; + if( Train ) { + // wyłączenie trzęsienia na siłę? + Train->Dynamic()->ABuSetModelShake( vector3() ); + } + DistantView(); // przestawienie kamery //żeby nie bylo numerów z 'fruwajacym' lokiem - konsekwencja bujania pudła - Global::SetCameraPosition( - Camera.Pos); // tu ustawić nową, bo od niej liczą się odległości - Ground.Silence(camStara); // wyciszenie dźwięków z poprzedniej pozycji + // tu ustawić nową, bo od niej liczą się odległości + Global::SetCameraPosition( Camera.Pos ); } else if (Train) { // korekcja ustawienia w kabinie - OK - vector3 camStara = Camera.Pos; // przestawianie kamery jest bez sensu: do przerobienia na potem - // Ra: czy to tu jest potrzebne, bo przelicza się kawałek dalej? - Camera.Pos = Train->pMechPosition; // Train.GetPosition1(); + if( wycisz ) { + // wyciszenie dźwięków z poprzedniej pozycji + // trzymanie prawego w kabinie daje marny efekt + Ground.Silence( Camera.Pos ); + } + Camera.Pos = Train->pMechPosition; Camera.Roll = std::atan(Train->pMechShake.x * Train->fMechRoll); // hustanie kamery na boki Camera.Pitch -= 0.5 * std::atan(Train->vMechVelocity.z * Train->fMechPitch); // hustanie kamery przod tyl - if (Train->Dynamic()->MoverParameters->ActiveCab == 0) - Camera.LookAt = Train->pMechPosition + Train->GetDirection() * 5.0; - else // patrz w strone wlasciwej kabiny - Camera.LookAt = Train->pMechPosition + Train->GetDirection() * 5.0 * Train->Dynamic()->MoverParameters->ActiveCab; - Train->pMechOffset.x = Train->pMechSittingPosition.x; - Train->pMechOffset.y = Train->pMechSittingPosition.y; - Train->pMechOffset.z = Train->pMechSittingPosition.z; + + if( Train->Dynamic()->MoverParameters->ActiveCab == 0 ) { + Camera.LookAt = + Train->pMechPosition + + Train->GetDirection() * 5.0; + } + else { + // patrz w strone wlasciwej kabiny + Camera.LookAt = + Train->pMechPosition + + Train->GetDirection() * 5.0 * Train->Dynamic()->MoverParameters->ActiveCab; + } + Train->pMechOffset = Train->pMechSittingPosition; + Global::SetCameraPosition( Train->Dynamic() ->GetPosition()); // tu ustawić nową, bo od niej liczą się odległości - if (wycisz) // trzymanie prawego w kabinie daje marny efekt - Ground.Silence(camStara); // wyciszenie dźwięków z poprzedniej pozycji } } else @@ -1239,105 +1248,7 @@ TWorld::Update_Camera( double const Deltatime ) { void TWorld::Update_Environment() { -#ifdef EU07_USE_OLD_LIGHTING_MODEL - - if( Global::fMoveLight < 0.0 ) { - return; - } - - // double a=Global::fTimeAngleDeg/180.0*M_PI-M_PI; //kąt godzinny w radianach - double a = fmod( Global::fTimeAngleDeg, 360.0 ) / 180.0 * M_PI - - M_PI; // kąt godzinny w radianach - //(a) jest traktowane jako czas miejscowy, nie uwzględniający stref czasowych ani czasu - // letniego - // aby wyznaczyć strefę czasową, trzeba uwzględnić południk miejscowy - // aby uwzględnić czas letni, trzeba sprawdzić dzień roku - double L = Global::fLatitudeDeg / 180.0 * M_PI; // szerokość geograficzna - double H = asin( cos( L ) * cos( Global::fSunDeclination ) * cos( a ) + - sin( L ) * sin( Global::fSunDeclination ) ); // kąt ponad horyzontem - // double A=asin(cos(d)*sin(M_PI-a)/cos(H)); - // Declination=((0.322003-22.971*cos(t)-0.357898*cos(2*t)-0.14398*cos(3*t)+3.94638*sin(t)+0.019334*sin(2*t)+0.05928*sin(3*t)))*Pi/180 - // Altitude=asin(sin(Declination)*sin(latitude)+cos(Declination)*cos(latitude)*cos((15*(time-12))*(Pi/180))); - // Azimuth=(acos((cos(latitude)*sin(Declination)-cos(Declination)*sin(latitude)*cos((15*(time-12))*(Pi/180)))/cos(Altitude))); - // double A=acos(cos(L)*sin(d)-cos(d)*sin(L)*cos(M_PI-a)/cos(H)); - // dAzimuth = atan2(-sin( dHourAngle ),tan( dDeclination )*dCos_Latitude - - // dSin_Latitude*dCos_HourAngle ); - double A = atan2( sin( a ), tan( Global::fSunDeclination ) * cos( L ) - sin( L ) * cos( a ) ); - vector3 lp = vector3( sin( A ), tan( H ), cos( A ) ); - lp = Normalize( lp ); // przeliczenie na wektor długości 1.0 - Global::lightPos[ 0 ] = (float)lp.x; - Global::lightPos[ 1 ] = (float)lp.y; - Global::lightPos[ 2 ] = (float)lp.z; - glLightfv( GL_LIGHT0, GL_POSITION, Global::lightPos ); // daylight position - if( H > 0 ) { // słońce ponad horyzontem - Global::ambientDayLight[ 0 ] = Global::ambientLight[ 0 ]; - Global::ambientDayLight[ 1 ] = Global::ambientLight[ 1 ]; - Global::ambientDayLight[ 2 ] = Global::ambientLight[ 2 ]; - if( H > 0.02 ) // ponad 1.146° zaczynają się cienie - { - Global::diffuseDayLight[ 0 ] = - Global::diffuseLight[ 0 ]; // od wschodu do zachodu maksimum ??? - Global::diffuseDayLight[ 1 ] = Global::diffuseLight[ 1 ]; - Global::diffuseDayLight[ 2 ] = Global::diffuseLight[ 2 ]; - Global::specularDayLight[ 0 ] = Global::specularLight[ 0 ]; // podobnie specular - Global::specularDayLight[ 1 ] = Global::specularLight[ 1 ]; - Global::specularDayLight[ 2 ] = Global::specularLight[ 2 ]; - } - else { - Global::diffuseDayLight[ 0 ] = - 50 * H * Global::diffuseLight[ 0 ]; // wschód albo zachód - Global::diffuseDayLight[ 1 ] = 50 * H * Global::diffuseLight[ 1 ]; - Global::diffuseDayLight[ 2 ] = 50 * H * Global::diffuseLight[ 2 ]; - Global::specularDayLight[ 0 ] = - 50 * H * Global::specularLight[ 0 ]; // podobnie specular - Global::specularDayLight[ 1 ] = 50 * H * Global::specularLight[ 1 ]; - Global::specularDayLight[ 2 ] = 50 * H * Global::specularLight[ 2 ]; - } - } - else { // słońce pod horyzontem - GLfloat lum = 3.1831 * ( H > -0.314159 ? 0.314159 + H : - 0.0 ); // po zachodzie ambient się ściemnia - Global::ambientDayLight[ 0 ] = lum * Global::ambientLight[ 0 ]; - Global::ambientDayLight[ 1 ] = lum * Global::ambientLight[ 1 ]; - Global::ambientDayLight[ 2 ] = lum * Global::ambientLight[ 2 ]; - Global::diffuseDayLight[ 0 ] = - Global::noLight[ 0 ]; // od zachodu do wschodu nie ma diffuse - Global::diffuseDayLight[ 1 ] = Global::noLight[ 1 ]; - Global::diffuseDayLight[ 2 ] = Global::noLight[ 2 ]; - Global::specularDayLight[ 0 ] = Global::noLight[ 0 ]; // ani specular - Global::specularDayLight[ 1 ] = Global::noLight[ 1 ]; - Global::specularDayLight[ 2 ] = Global::noLight[ 2 ]; - } - // Calculate sky colour according to time of day. - // GLfloat sin_t = sin(PI * time_of_day / 12.0); - // back_red = 0.3 * (1.0 - sin_t); - // back_green = 0.9 * sin_t; - // back_blue = sin_t + 0.4, 1.0; - // aktualizacja świateł - glLightfv( GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight ); - glLightfv( GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight ); - glLightfv( GL_LIGHT0, GL_SPECULAR, Global::specularDayLight ); - - Global::fLuminance = // to posłuży również do zapalania latarń - +0.150 * ( Global::diffuseDayLight[ 0 ] + Global::ambientDayLight[ 0 ] ) // R - + 0.295 * ( Global::diffuseDayLight[ 1 ] + Global::ambientDayLight[ 1 ] ) // G - + 0.055 * ( Global::diffuseDayLight[ 2 ] + Global::ambientDayLight[ 2 ] ); // B - - vector3 sky = vector3( Global::AtmoColor[ 0 ], Global::AtmoColor[ 1 ], Global::AtmoColor[ 2 ] ); - if( Global::fLuminance < 0.25 ) { // przyspieszenie zachodu/wschodu - sky *= 4.0 * Global::fLuminance; // nocny kolor nieba - GLfloat fog[ 3 ]; - fog[ 0 ] = Global::FogColor[ 0 ] * 4.0 * Global::fLuminance; - fog[ 1 ] = Global::FogColor[ 1 ] * 4.0 * Global::fLuminance; - fog[ 2 ] = Global::FogColor[ 2 ] * 4.0 * Global::fLuminance; - glFogfv( GL_FOG_COLOR, fog ); // nocny kolor mgły - } - else { - glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły - } -#else Environment.update(); -#endif } void TWorld::ResourceSweep() @@ -1364,11 +1275,7 @@ TWorld::Render_Cab() { // ABu: Rendering kabiny jako ostatniej, zeby bylo widac przez szyby, tylko w widoku ze srodka return; } -/* - // ABu: Rendering kabiny jako ostatniej, zeby bylo widac przez szyby, tylko w widoku ze srodka - if( ( Train->Dynamic()->mdKabina != Train->Dynamic()->mdModel ) && - Train->Dynamic()->bDisplayCab && !FreeFlyModeFlag ) { -*/ + glPushMatrix(); vector3 pos = dynamic->GetPosition(); // wszpółrzędne pojazdu z kabiną // glTranslatef(pos.x,pos.y,pos.z); //przesunięcie o wektor (tak było i trzęsło) @@ -1377,247 +1284,24 @@ TWorld::Render_Cab() { glLoadIdentity(); // zacząć od macierzy jedynkowej Camera.SetCabMatrix( pos ); // widok z kamery po przesunięciu glMultMatrixd( dynamic->mMatrix.getArray() ); // ta macierz nie ma przesunięcia -/* - //*yB: moje smuuugi 1 - if( Global::bSmudge ) { // Ra: uwzględniłem zacienienie pojazdu przy zapalaniu smug - - // 1. warunek na smugę wyznaczyc wcześniej - // 2. jeśli smuga włączona, nie renderować pojazdu użytkownika w DynObj - // 3. jeśli smuga właczona, wyrenderować pojazd użytkownia po dodaniu smugi do sceny - auto const &frontlights = Train->Controlled()->iLights[ 0 ]; - float frontlightstrength = 0.f + - ( ( frontlights & 1 ) ? 0.3f : 0.f ) + - ( ( frontlights & 4 ) ? 0.3f : 0.f ) + - ( ( frontlights & 16 ) ? 0.3f : 0.f ); - frontlightstrength = std::max( frontlightstrength - Global::fLuminance, 0.0 ); - auto const &rearlights = Train->Controlled()->iLights[ 1 ]; - float rearlightstrength = 0.f + - ( ( rearlights & 1 ) ? 0.3f : 0.f ) + - ( ( rearlights & 4 ) ? 0.3f : 0.f ) + - ( ( rearlights & 16 ) ? 0.3f : 0.f ); - rearlightstrength = std::max( rearlightstrength - Global::fLuminance, 0.0 ); - - if( ( Train->Controlled()->Battery ) // trochę na skróty z tą baterią - && ( ( frontlightstrength > 0.f ) - || ( rearlightstrength > 0.f ) ) ) { - - if( Global::bOldSmudge == true ) { - glBlendFunc( GL_SRC_ALPHA, GL_ONE ); - // glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_DST_COLOR); - // glBlendFunc(GL_SRC_ALPHA_SATURATE,GL_ONE); - glDisable( GL_DEPTH_TEST ); - glDisable( GL_LIGHTING ); - glDisable( GL_FOG ); - GfxRenderer.Bind( light ); // Select our texture - glBegin( GL_QUADS ); - float fSmudge = - dynamic->MoverParameters->DimHalf.y + 7; // gdzie zaczynać smugę - if( frontlightstrength > 0.f ) { // wystarczy jeden zapalony z przodu - glColor4f( 1.0f, 1.0f, 1.0f, 0.5f * frontlightstrength ); - glTexCoord2f( 0, 0 ); - glVertex3f( 15.0, 0.0, +fSmudge ); // rysowanie względem położenia modelu - glTexCoord2f( 1, 0 ); - glVertex3f( -15.0, 0.0, +fSmudge ); - glTexCoord2f( 1, 1 ); - glVertex3f( -15.0, 2.5, 250.0 ); - glTexCoord2f( 0, 1 ); - glVertex3f( 15.0, 2.5, 250.0 ); - } - if( rearlightstrength > 0.f ) { // wystarczy jeden zapalony z tyłu - glColor4f( 1.0f, 1.0f, 1.0f, 0.5f * rearlightstrength ); - glTexCoord2f( 0, 0 ); - glVertex3f( -15.0, 0.0, -fSmudge ); - glTexCoord2f( 1, 0 ); - glVertex3f( 15.0, 0.0, -fSmudge ); - glTexCoord2f( 1, 1 ); - glVertex3f( 15.0, 2.5, -250.0 ); - glTexCoord2f( 0, 1 ); - glVertex3f( -15.0, 2.5, -250.0 ); - } - glEnd(); - - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - glEnable( GL_DEPTH_TEST ); - // glEnable(GL_LIGHTING); //i tak się włączy potem - glEnable( GL_FOG ); - } - else { - - glBlendFunc( GL_DST_COLOR, GL_ONE ); - glDepthFunc( GL_GEQUAL ); - glAlphaFunc( GL_GREATER, 0.004 ); - // glDisable(GL_DEPTH_TEST); - glDisable( GL_LIGHTING ); - glDisable( GL_FOG ); - //glColor4f(0.15f, 0.15f, 0.15f, 0.25f); - GfxRenderer.Bind( light ); // Select our texture - //float ddl = (0.15*Global::diffuseDayLight[0]+0.295*Global::diffuseDayLight[1]+0.055*Global::diffuseDayLight[2]); //0.24:0 - glBegin( GL_QUADS ); - float fSmudge = dynamic->MoverParameters->DimHalf.y + 7; // gdzie zaczynać smugę - if( frontlightstrength > 0.f ) { - // wystarczy jeden zapalony z przodu - for( int i = 15; i <= 35; i++ ) { - float z = i * i * i * 0.01f;//25/4; - //float C = (36 - i*0.5)*0.005*(1.5 - sqrt(ddl)); - float C = ( 36 - i*0.5 )*0.005*sqrt( ( 1 / sqrt( Global::fLuminance + 0.015 ) ) - 1 ) * frontlightstrength; - glColor4f( C, C, C, 1.0f );// *frontlightstrength ); - glTexCoord2f( 0, 0 ); glVertex3f( -10 / 2 - 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); - glTexCoord2f( 1, 0 ); glVertex3f( 10 / 2 + 2 * i / 4, 6.0 + 0.3*z, 13 + 1.7*z / 3 ); - glTexCoord2f( 1, 1 ); glVertex3f( 10 / 2 + 2 * i / 4, -5.0 - 0.5*z, 13 + 1.7*z / 3 ); - glTexCoord2f( 0, 1 ); glVertex3f( -10 / 2 - 2 * i / 4, -5.0 - 0.5*z, 13 + 1.7*z / 3 ); - } - } - if( rearlightstrength > 0.f ) { - // wystarczy jeden zapalony z tyłu - for( int i = 15; i <= 35; i++ ) { - float z = i * i * i * 0.01f;//25/4; - float C = ( 36 - i*0.5 )*0.005*sqrt( ( 1 / sqrt( Global::fLuminance + 0.015 ) ) - 1 ) * rearlightstrength; - glColor4f( C, C, C, 1.0f );// *rearlightstrength ); - glTexCoord2f( 0, 0 ); glVertex3f( 10 / 2 + 2 * i / 4, 6.0 + 0.3*z, -13 - 1.7*z / 3 ); - glTexCoord2f( 1, 0 ); glVertex3f( -10 / 2 - 2 * i / 4, 6.0 + 0.3*z, -13 - 1.7*z / 3 ); - glTexCoord2f( 1, 1 ); glVertex3f( -10 / 2 - 2 * i / 4, -5.0 - 0.5*z, -13 - 1.7*z / 3 ); - glTexCoord2f( 0, 1 ); glVertex3f( 10 / 2 + 2 * i / 4, -5.0 - 0.5*z, -13 - 1.7*z / 3 ); - } - } - glEnd(); - - glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - // glEnable(GL_DEPTH_TEST); - glAlphaFunc( GL_GREATER, 0.04 ); - glDepthFunc( GL_LEQUAL ); - glEnable( GL_LIGHTING ); //i tak się włączy potem - glEnable( GL_FOG ); - } - } - - glEnable( GL_LIGHTING ); // po renderowaniu smugi jest to wyłączone - // Ra: pojazd użytkownika należało by renderować po smudze, aby go nie rozświetlała - - Global::bSmudge = false; // aby model użytkownika się teraz wyrenderował - dynamic->Render(); - dynamic->RenderAlpha(); // przezroczyste fragmenty pojazdów na torach - - } // yB: moje smuuugi 1 - koniec - else -*/ glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone. TODO: have the wires render take care of its own shit + glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone. TODO: have the wires render take care of its own shit if( dynamic->mdKabina ) // bo mogła zniknąć przy przechodzeniu do innego pojazdu { -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // oswietlenie kabiny - GLfloat ambientCabLight[ 4 ] = { 0.5f, 0.5f, 0.5f, 1.0f }; - GLfloat diffuseCabLight[ 4 ] = { 0.5f, 0.5f, 0.5f, 1.0f }; - GLfloat specularCabLight[ 4 ] = { 0.5f, 0.5f, 0.5f, 1.0f }; - for( int li = 0; li < 3; li++ ) { // przyciemnienie standardowe - ambientCabLight[ li ] = Global::ambientDayLight[ li ] * 0.9; - diffuseCabLight[ li ] = Global::diffuseDayLight[ li ] * 0.5; - specularCabLight[ li ] = Global::specularDayLight[ li ] * 0.5; - } - switch( dynamic->MyTrack->eEnvironment ) { // wpływ świetła zewnętrznego - case e_canyon: - { - for( int li = 0; li < 3; li++ ) { - diffuseCabLight[ li ] *= 0.6; - specularCabLight[ li ] *= 0.7; - } - } - break; - case e_tunnel: - { - for( int li = 0; li < 3; li++ ) { - ambientCabLight[ li ] *= 0.3; - diffuseCabLight[ li ] *= 0.1; - specularCabLight[ li ] *= 0.2; - } - } - break; - } - switch( Train->iCabLightFlag ) // Ra: uzeleżnic od napięcia w obwodzie sterowania - { // hunter-091012: uzaleznienie jasnosci od przetwornicy - case 0: //światło wewnętrzne zgaszone - break; - case 1: //światło wewnętrzne przygaszone (255 216 176) - if( dynamic->MoverParameters->ConverterFlag == - true ) // jasnosc dla zalaczonej przetwornicy - { - ambientCabLight[ 0 ] = Max0R( 0.700, ambientCabLight[ 0 ] ) * 0.75; // R - ambientCabLight[ 1 ] = Max0R( 0.593, ambientCabLight[ 1 ] ) * 0.75; // G - ambientCabLight[ 2 ] = Max0R( 0.483, ambientCabLight[ 2 ] ) * 0.75; // B - - for( int i = 0; i < 3; i++ ) - if( ambientCabLight[ i ] <= ( Global::ambientDayLight[ i ] * 0.9 ) ) - ambientCabLight[ i ] = Global::ambientDayLight[ i ] * 0.9; - } - else { - ambientCabLight[ 0 ] = Max0R( 0.700, ambientCabLight[ 0 ] ) * 0.375; // R - ambientCabLight[ 1 ] = Max0R( 0.593, ambientCabLight[ 1 ] ) * 0.375; // G - ambientCabLight[ 2 ] = Max0R( 0.483, ambientCabLight[ 2 ] ) * 0.375; // B - - for( int i = 0; i < 3; i++ ) - if( ambientCabLight[ i ] <= ( Global::ambientDayLight[ i ] * 0.9 ) ) - ambientCabLight[ i ] = Global::ambientDayLight[ i ] * 0.9; - } - break; - case 2: //światło wewnętrzne zapalone (255 216 176) - if( dynamic->MoverParameters->ConverterFlag == - true ) // jasnosc dla zalaczonej przetwornicy - { - ambientCabLight[ 0 ] = Max0R( 1.000, ambientCabLight[ 0 ] ); // R - ambientCabLight[ 1 ] = Max0R( 0.847, ambientCabLight[ 1 ] ); // G - ambientCabLight[ 2 ] = Max0R( 0.690, ambientCabLight[ 2 ] ); // B - - for( int i = 0; i < 3; i++ ) - if( ambientCabLight[ i ] <= ( Global::ambientDayLight[ i ] * 0.9 ) ) - ambientCabLight[ i ] = Global::ambientDayLight[ i ] * 0.9; - } - else { - ambientCabLight[ 0 ] = Max0R( 1.000, ambientCabLight[ 0 ] ) * 0.5; // R - ambientCabLight[ 1 ] = Max0R( 0.847, ambientCabLight[ 1 ] ) * 0.5; // G - ambientCabLight[ 2 ] = Max0R( 0.690, ambientCabLight[ 2 ] ) * 0.5; // B - - for( int i = 0; i < 3; i++ ) - if( ambientCabLight[ i ] <= ( Global::ambientDayLight[ i ] * 0.9 ) ) - ambientCabLight[ i ] = Global::ambientDayLight[ i ] * 0.9; - } - break; - } - glLightfv( GL_LIGHT0, GL_AMBIENT, ambientCabLight ); - glLightfv( GL_LIGHT0, GL_DIFFUSE, diffuseCabLight ); - glLightfv( GL_LIGHT0, GL_SPECULAR, specularCabLight ); -#else + // setup if( dynamic->fShade > 0.0f ) { // change light level based on light level of the occupied track Global::DayLight.apply_intensity( dynamic->fShade ); } if( dynamic->InteriorLightLevel > 0.0f ) { - // crude way to light the cabin, until we have something more complete in place auto const cablight = dynamic->InteriorLight * dynamic->InteriorLightLevel; ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); } -#endif - -#ifdef EU07_USE_OLD_RENDERCODE - if( Global::bUseVBO ) { - // renderowanie z użyciem VBO. NOTE: needs update, and eventual merge into single render path down the road - dynamic->mdKabina->RaRender( 0.0, dynamic->Material()->replacable_skins, dynamic->Material()->textures_alpha ); - dynamic->mdKabina->RaRenderAlpha( 0.0, dynamic->Material()->replacable_skins, dynamic->Material()->textures_alpha ); - } - else { - // renderowanie z Display List - dynamic->mdKabina->Render( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); - dynamic->mdKabina->RenderAlpha( 0.0, dynamic->ReplacableSkinID, dynamic->iAlpha ); - } -#else + // render GfxRenderer.Render( dynamic->mdKabina, dynamic->Material(), 0.0 ); GfxRenderer.Render_Alpha( dynamic->mdKabina, dynamic->Material(), 0.0 ); -#endif -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // przywrócenie standardowych, bo zawsze są zmieniane - glLightfv( GL_LIGHT0, GL_AMBIENT, Global::ambientDayLight ); - glLightfv( GL_LIGHT0, GL_DIFFUSE, Global::diffuseDayLight ); - glLightfv( GL_LIGHT0, GL_SPECULAR, Global::specularDayLight ); -#else + // post-render restore if( dynamic->fShade > 0.0f ) { // change light level based on light level of the occupied track Global::DayLight.apply_intensity(); @@ -1627,7 +1311,6 @@ TWorld::Render_Cab() { GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); } -#endif } glPopMatrix(); } diff --git a/sky.cpp b/sky.cpp index 54d47a09..61aa81d1 100644 --- a/sky.cpp +++ b/sky.cpp @@ -31,39 +31,18 @@ void TSky::Render( float3 const &Tint ) { if (mdCloud) { // jeśli jest model nieba -#ifdef EU07_USE_OLD_LIGHTING_MODEL - // TODO: re-implement this - glLightfv(GL_LIGHT0, GL_POSITION, lightPos); -#else + // setup ::glEnable( GL_LIGHTING ); GfxRenderer.Disable_Lights(); ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &Tint.x ); -#endif -#ifdef EU07_USE_OLD_RENDERCODE - if( Global::bUseVBO ) - { // renderowanie z VBO - mdCloud->RaRender( 100, 0 ); - mdCloud->RaRenderAlpha(100, 0); - } - else - { // renderowanie z Display List - mdCloud->Render(100, 0); - mdCloud->RenderAlpha(100, 0); - } -#else + // render GfxRenderer.Render( mdCloud, nullptr, 100.0 ); GfxRenderer.Render_Alpha( mdCloud, nullptr, 100.0 ); -#endif -#ifdef EU07_USE_OLD_LIGHTING_MODEL - glPopMatrix(); - // TODO: re-implement this - glLightfv(GL_LIGHT0, GL_POSITION, Global::lightPos); -#else + // post-render cleanup GLfloat noambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, noambient ); ::glEnable( GL_LIGHT0 ); // other lights will be enabled during lights update ::glDisable( GL_LIGHTING ); -#endif } }; diff --git a/stars.cpp b/stars.cpp index dd7e9650..08b2b926 100644 --- a/stars.cpp +++ b/stars.cpp @@ -14,23 +14,16 @@ cStars::init() { void cStars::render() { - + // setup ::glPushMatrix(); ::glRotatef( m_latitude, 1.0f, 0.0f, 0.0f ); // ustawienie osi OY na północ ::glRotatef( -std::fmod( (float)Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX ::glPointSize( 2.0f ); -#ifdef EU07_USE_OLD_RENDERCODE - if( Global::bUseVBO ) { - m_stars.RaRender( 1.0, 0 ); - } - else { - m_stars.Render( 1.0 ); - } -#else + // render GfxRenderer.Render( &m_stars, nullptr, 1.0 ); -#endif + // post-render cleanup ::glPointSize( 3.0f ); ::glPopMatrix(); From ac61dbdf14a35472ca14c3bd4e48edf66c72c238 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 24 May 2017 15:31:53 +0200 Subject: [PATCH 113/426] stl-based origin stack replacement --- Ground.cpp | 60 ++++++++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 40 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index 879d1265..e4a6f45d 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2046,9 +2046,7 @@ bool TGround::Init(std::string File) cParser parser(File, cParser::buffer_FILE, subpath, Global::bLoadTraction); std::string token; - const int OriginStackMaxDepth = 100; // rozmiar stosu dla zagnieżdżenia origin - int OriginStackTop = 0; - vector3 OriginStack[OriginStackMaxDepth]; // stos zagnieżdżenia origin + std::stack OriginStack; // stos zagnieżdżenia origin TGroundNode *LastNode = NULL; // do użycia w trainset iNumNodes = 0; @@ -2222,8 +2220,7 @@ bool TGround::Init(std::string File) tmp->evNext2 = RootEvent; // lista wszystkich eventów (m.in. do InitEvents) RootEvent = tmp; if (!found) - { // jeśli nazwa wystąpiła, to do kolejki i wyszukiwarki dodawany jest tylko - // pierwszy + { // jeśli nazwa wystąpiła, to do kolejki i wyszukiwarki dodawany jest tylko pierwszy if (RootEvent->Type != tp_Ignored) if (RootEvent->asName.find( "onstart") != std::string::npos) // event uruchamiany automatycznie po starcie @@ -2233,56 +2230,39 @@ bool TGround::Init(std::string File) } } } - // else - // if (str==AnsiString("include")) //Tolaris to zrobil wewnatrz parsera - // { - // Include(Parser); - // } else if (str == "rotate") { // parser.getTokens(3); - // parser >> aRotate.x >> aRotate.y >> aRotate.z; //Ra: to potrafi dawać błędne - // rezultaty + // parser >> aRotate.x >> aRotate.y >> aRotate.z; //Ra: to potrafi dawać błędne rezultaty // ??? how so TODO: investigate parser.getTokens(); parser >> aRotate.x; parser.getTokens(); parser >> aRotate.y; parser.getTokens(); parser >> aRotate.z; - // WriteLog("*** rotate "+AnsiString(aRotate.x)+" "+AnsiString(aRotate.y)+" - // "+AnsiString(aRotate.z)); } else if (str == "origin") { - // str=Parser->GetNextSymbol().LowerCase(); - // if (str=="begin") - { - if (OriginStackTop >= OriginStackMaxDepth - 1) - { - MessageBox(0, "Origin stack overflow ", "Error", MB_OK); - break; - } - parser.getTokens(3); - parser >> OriginStack[OriginStackTop].x >> OriginStack[OriginStackTop].y >> - OriginStack[OriginStackTop].z; - pOrigin += OriginStack[OriginStackTop]; // sumowanie całkowitego przesunięcia - OriginStackTop++; // zwiększenie wskaźnika stosu - } + Math3D::vector3 offset; + parser.getTokens(3); + parser + >> offset.x + >> offset.y + >> offset.z; + // sumowanie całkowitego przesunięcia + OriginStack.emplace( + offset + ( + OriginStack.empty() ? + Math3D::vector3() : + OriginStack.top() ) ); + pOrigin = OriginStack.top(); } else if (str == "endorigin") { - // else - // if (str=="end") - { - if (OriginStackTop <= 0) - { - MessageBox(0, "Origin stack underflow ", "Error", MB_OK); - break; - } - - OriginStackTop--; // zmniejszenie wskaźnika stosu - pOrigin -= OriginStack[OriginStackTop]; - } + OriginStack.pop(); + pOrigin = ( OriginStack.empty() ? + Math3D::vector3() : + OriginStack.top() ); } else if (str == "atmo") // TODO: uporzadkowac gdzie maja byc parametry mgly! { // Ra: ustawienie parametrów OpenGL przeniesione do FirstInit From 2b6ea903bc63f46a7e823b83824b17ea5e1153e6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 25 May 2017 12:58:43 +0200 Subject: [PATCH 114/426] camera-centric rendering, initial implementation --- AnimModel.cpp | 8 +-- AnimModel.h | 4 +- Camera.cpp | 16 ++--- Camera.h | 2 +- Ground.cpp | 148 +++++++++++++++++++--------------------------- Ground.h | 14 ++--- Segment.cpp | 114 ++++++++++++++--------------------- Segment.h | 2 +- Track.cpp | 153 ++++++++++++++++++++++++----------------------- Traction.cpp | 99 ++++++++++++++++--------------- Traction.h | 2 +- World.cpp | 8 ++- frustum.h | 9 +++ renderer.cpp | 161 ++++++++++++++++++++++++++++++++++---------------- renderer.h | 2 +- 15 files changed, 385 insertions(+), 357 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index a5303f08..0e183997 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -606,16 +606,16 @@ int TAnimModel::Flags() //----------------------------------------------------------------------------- // 2011-03-16 funkcje renderowania z możliwością pochylania obiektów //----------------------------------------------------------------------------- -void TAnimModel::Render( vector3 *vPosition ) { +void TAnimModel::Render( vector3 const &Position ) { RaAnimate(); // jednorazowe przeliczenie animacji RaPrepare(); if( pModel ) // renderowanie rekurencyjne submodeli - GfxRenderer.Render( pModel, Material(), *vPosition, vAngle ); + GfxRenderer.Render( pModel, Material(), Position, vAngle ); }; -void TAnimModel::RenderAlpha( vector3 *vPosition ) { +void TAnimModel::RenderAlpha( vector3 const &Position ) { RaPrepare(); if( pModel ) // renderowanie rekurencyjne submodeli - GfxRenderer.Render_Alpha( pModel, Material(), *vPosition, vAngle ); + GfxRenderer.Render_Alpha( pModel, Material(), Position, vAngle ); }; //--------------------------------------------------------------------------- diff --git a/AnimModel.h b/AnimModel.h index 760669e8..36fa9c48 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -161,8 +161,8 @@ class TAnimModel bool Load(cParser *parser, bool ter = false); TAnimContainer * AddContainer(char *pName); TAnimContainer * GetContainer(char *pName); - void Render( vector3 *vPosition ); - void RenderAlpha( vector3 *vPosition ); + void Render( vector3 const &Position ); + void RenderAlpha( vector3 const &Position ); int Flags(); void RaAnglesSet(double a, double b, double c) { diff --git a/Camera.cpp b/Camera.cpp index 06b38254..b1354746 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -410,21 +410,21 @@ bool TCamera::SetMatrix() return true; } -bool TCamera::SetMatrix( glm::mat4 &Matrix ) { +bool TCamera::SetMatrix( glm::dmat4 &Matrix ) { - Matrix = glm::rotate( Matrix, (float)-Roll, glm::vec3( 0.0f, 0.0f, 1.0f ) ); // po wyłączeniu tego kręci się pojazd, a sceneria nie - Matrix = glm::rotate( Matrix, (float)-Pitch, glm::vec3( 1.0f, 0.0f, 0.0f ) ); - Matrix = glm::rotate( Matrix, (float)-Yaw, glm::vec3( 0.0f, 1.0f, 0.0f ) ); // w zewnętrznym widoku: kierunek patrzenia + Matrix = glm::rotate( Matrix, -Roll, glm::dvec3( 0.0, 0.0, 1.0 ) ); // po wyłączeniu tego kręci się pojazd, a sceneria nie + Matrix = glm::rotate( Matrix, -Pitch, glm::dvec3( 1.0, 0.0, 0.0 ) ); + Matrix = glm::rotate( Matrix, -Yaw, glm::dvec3( 0.0, 1.0, 0.0 ) ); // w zewnętrznym widoku: kierunek patrzenia if( Type == tp_Follow ) { Matrix *= glm::lookAt( - glm::vec3( Pos.x, Pos.y, Pos.z ), - glm::vec3( LookAt.x, LookAt.y, LookAt.z ), - glm::vec3( vUp.x, vUp.y, vUp.z ) ); + glm::dvec3( Pos.x, Pos.y, Pos.z ), + glm::dvec3( LookAt.x, LookAt.y, LookAt.z ), + glm::dvec3( vUp.x, vUp.y, vUp.z ) ); } else { - Matrix = glm::translate( Matrix, glm::vec3( -Pos.x, -Pos.y, -Pos.z ) ); // nie zmienia kierunku patrzenia + Matrix = glm::translate( Matrix, glm::dvec3( -Pos.x, -Pos.y, -Pos.z ) ); // nie zmienia kierunku patrzenia } Global::SetCameraPosition( Pos ); // było +pOffset diff --git a/Camera.h b/Camera.h index c9ab5e05..760a9294 100644 --- a/Camera.h +++ b/Camera.h @@ -58,7 +58,7 @@ class TCamera void Update(); vector3 GetDirection(); bool SetMatrix(); - bool SetMatrix(glm::mat4 &Matrix); + bool SetMatrix(glm::dmat4 &Matrix); void SetCabMatrix( vector3 &p ); void RaLook(); void Stop(); diff --git a/Ground.cpp b/Ground.cpp index e4a6f45d..fff7c1ed 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -248,43 +248,6 @@ void TGroundNode::InitNormals() } } -void TGroundNode::MoveMe(vector3 pPosition) -{ // przesuwanie obiektów scenerii o wektor w celu redukcji trzęsienia - pCenter += pPosition; - switch (iType) - { - case TP_TRACTION: - hvTraction->pPoint1 += pPosition; - hvTraction->pPoint2 += pPosition; - hvTraction->pPoint3 += pPosition; - hvTraction->pPoint4 += pPosition; - hvTraction->Optimize(); - break; - case TP_MODEL: - case TP_DYNAMIC: - case TP_MEMCELL: - case TP_EVLAUNCH: - break; - case TP_TRACK: - pTrack->MoveMe(pPosition); - break; - case TP_SOUND: // McZapkie - dzwiek zapetlony w zaleznosci od odleglosci - tsStaticSound->vSoundPosition += pPosition; - break; - case GL_LINES: - case GL_LINE_STRIP: - case GL_LINE_LOOP: - for (int i = 0; i < iNumPts; i++) - Points[i] += pPosition; - ResourceManager::Unregister(this); - break; - default: - for (int i = 0; i < iNumVerts; i++) - Vertices[i].Point += pPosition; - ResourceManager::Unregister(this); - } -} - void TGroundNode::RaRenderVBO() { // renderowanie z domyslnego bufora VBO glColor3ub(Diffuse[0], Diffuse[1], Diffuse[2]); @@ -309,7 +272,10 @@ void TGroundNode::Compile(bool many) { glBegin(iType); for (int i = 0; i < iNumPts; ++i) - glVertex3dv(&Points[i].x); + glVertex3d( + Points[i].x - m_rootposition.x, + Points[i].y - m_rootposition.y, + Points[i].z - m_rootposition.z ); glEnd(); } else if (iType == GL_TRIANGLE_STRIP || iType == GL_TRIANGLE_FAN || iType == GL_TRIANGLES) @@ -323,9 +289,14 @@ void TGroundNode::Compile(bool many) for (int i = 0; i < iNumVerts; ++i) { glNormal3dv(&Vertices[i].Normal.x); - glTexCoord2f(Vertices[i].tu, Vertices[i].tv); - glVertex3dv(&Vertices[i].Point.x); - }; + glTexCoord2f( + Vertices[i].tu, + Vertices[i].tv); + glVertex3d( + Points[i].x - m_rootposition.x, + Points[i].y - m_rootposition.y, + Points[i].z - m_rootposition.z ); + } glEnd(); } else if (iType == TP_MESH) @@ -408,6 +379,9 @@ void TSubRect::NodeAdd(TGroundNode *Node) // nRenderAlpha - lista grup renderowanych z własnych VBO albo DL z przezroczystością // nRenderWires - lista grup renderowanych z własnych VBO albo DL - druty i linie // nMeshed - obiekty do pogrupowania wg tekstur + + Node->m_rootposition = Math3D::vector3( m_area.center.x, m_area.center.y, m_area.center.z ) ; + switch (Node->iType) { case TP_SOUND: // te obiekty są sprawdzanie niezależnie od kierunku patrzenia @@ -418,11 +392,11 @@ void TSubRect::NodeAdd(TGroundNode *Node) case TP_TRACK: // TODO: tory z cieniem (tunel, canyon) też dać bez łączenia? ++iTracks; // jeden tor więcej Node->pTrack->RaOwnerSet(this); // do którego sektora ma zgłaszać animację - // if (Global::bUseVBO?false:!Node->pTrack->IsGroupable()) - if (Global::bUseVBO ? true : - !Node->pTrack->IsGroupable()) // TODO: tymczasowo dla VBO wyłączone - RaNodeAdd( - Node); // tory ruchome nie są grupowane przy Display Lists (wymagają odświeżania DL) + if( ( true == Global::bUseVBO ) + || ( false == Node->pTrack->IsGroupable() ) ) { + // tory ruchome nie są grupowane przy Display Lists (wymagają odświeżania DL) + RaNodeAdd( Node ); + } else { // tory nieruchome mogą być pogrupowane wg tekstury, przy VBO wszystkie Node->TextureID = Node->pTrack->TextureGet(0); // pobranie tekstury do sortowania @@ -800,9 +774,9 @@ void TSubRect::LoadNodes() case GL_TRIANGLES: for (i = 0; i < n->iNumVerts; ++i) { // Ra: trójkąty można od razu wczytywać do takich tablic... to może poczekać - m_pVNT[n->iVboPtr + i].x = n->Vertices[i].Point.x; - m_pVNT[n->iVboPtr + i].y = n->Vertices[i].Point.y; - m_pVNT[n->iVboPtr + i].z = n->Vertices[i].Point.z; + m_pVNT[n->iVboPtr + i].x = n->Vertices[i].Point.x - n->m_rootposition.x; + m_pVNT[n->iVboPtr + i].y = n->Vertices[i].Point.y - n->m_rootposition.y; + m_pVNT[n->iVboPtr + i].z = n->Vertices[i].Point.z - n->m_rootposition.z; m_pVNT[n->iVboPtr + i].nx = n->Vertices[i].Normal.x; m_pVNT[n->iVboPtr + i].ny = n->Vertices[i].Normal.y; m_pVNT[n->iVboPtr + i].nz = n->Vertices[i].Normal.z; @@ -815,9 +789,9 @@ void TSubRect::LoadNodes() case GL_LINE_LOOP: for (i = 0; i < n->iNumPts; ++i) { - m_pVNT[n->iVboPtr + i].x = n->Points[i].x; - m_pVNT[n->iVboPtr + i].y = n->Points[i].y; - m_pVNT[n->iVboPtr + i].z = n->Points[i].z; + m_pVNT[n->iVboPtr + i].x = n->Points[i].x - n->m_rootposition.x; + m_pVNT[n->iVboPtr + i].y = n->Points[i].y - n->m_rootposition.y; + m_pVNT[n->iVboPtr + i].z = n->Points[i].z - n->m_rootposition.z; // miejsce w tablicach normalnych i teksturowania się marnuje... } break; @@ -833,7 +807,7 @@ void TSubRect::LoadNodes() case TP_TRACTION: if( n->iNumVerts ) { // druty mogą być niewidoczne...? #ifdef EU07_USE_OLD_VERTEXBUFFER - n->hvTraction->RaArrayFill( m_pVNT + n->iVboPtr ); + n->hvTraction->RaArrayFill( m_pVNT + n->iVboPtr, n->m_rootposition ); #else n->hvTraction->RaArrayFill( m_pVNT.data() + n->iVboPtr ); #endif @@ -960,12 +934,14 @@ TGroundRect::Init() { float const subrectsize = 1000.0f / iNumSubRects; for( int column = 0; column < iNumSubRects; ++column ) { for( int row = 0; row < iNumSubRects; ++row ) { - auto &area = FastGetRect(column, row)->m_area; + auto &area = SafeGetRect(column, row)->m_area; area.center = m_area.center - - float3( 500.0f, 0.0f, 500.0f ) // 'upper left' corner of rectangle - + float3( subrectsize * 0.5f, 0.0f, subrectsize * 0.5f ) // center of sub-rectangle - + float3( subrectsize * column, 0.0f, subrectsize * row ); + - glm::vec3( 500.0f, 0.0f, 500.0f ) // 'upper left' corner of rectangle + + glm::vec3( subrectsize * 0.5f, 0.0f, subrectsize * 0.5f ) // center of sub-rectangle + + glm::vec3( subrectsize * column, 0.0f, subrectsize * row ); + // NOTE: the actual coordinates get swapped, as they're swapped in rest of the code :x + area.center = glm::vec3( area.center.z, area.center.y, area.center.x ); area.radius = subrectsize * M_SQRT2; } } @@ -1051,17 +1027,17 @@ TGround::TGround() // set bounding area information for ground rectangles float const rectsize = 1000.0f; - float3 const worldcenter( 0.0f, 0.0f, 0.0f ); + glm::vec3 const worldcenter( 0.0f, 0.0f, 0.0f ); for( int column = 0; column < iNumRects; ++column ) { for( int row = 0; row < iNumRects; ++row ) { auto &area = Rects[ column ][ row ].m_area; // NOTE: in current implementation triangles can stick out to ~200m from the area, so we add extra padding - area.radius = 200.0f + rectsize * 0.5f * M_SQRT2; + area.radius = ( rectsize * 0.5f * M_SQRT2 ) + 200.0f; area.center = worldcenter - - float3( (iNumRects / 2) * rectsize, 0.0f, (iNumRects / 2) * rectsize ) // 'upper left' corner of the world - + float3( rectsize * 0.5f, 0.0f, rectsize * 0.5f ) // center of the rectangle - + float3( rectsize * column, 0.0f, rectsize * row ); + - glm::vec3( (iNumRects / 2) * rectsize, 0.0f, (iNumRects / 2) * rectsize ) // 'upper left' corner of the world + + glm::vec3( rectsize * 0.5f, 0.0f, rectsize * 0.5f ) // center of the rectangle + + glm::vec3( rectsize * column, 0.0f, rectsize * row ); } } } @@ -1995,39 +1971,38 @@ void TGround::FirstInit() gr->RaNodeAdd(&Current->nNode[j]); } } - // else if - // ((Current->iType!=GL_TRIANGLES)&&(Current->iType!=GL_TRIANGLE_STRIP)?true - // //~czy trójkąt? - else if ((Current->iType != GL_TRIANGLES) ? - true //~czy trójkąt? - : - (Current->iFlags & 0x20) ? - true //~czy teksturę ma nieprzezroczystą? - : - (Current->fSquareMinRadius != 0.0) ? - true //~czy widoczny z bliska? - : - (Current->fSquareRadius <= 90000.0)) //~czy widoczny z daleka? - GetSubRect(Current->pCenter.x, Current->pCenter.z)->NodeAdd(Current); - else // dodajemy do kwadratu kilometrowego - GetRect(Current->pCenter.x, Current->pCenter.z)->NodeAdd(Current); + else if( ( Current->iType != GL_TRIANGLES ) + || ( Current->iFlags & 0x20 ) + || ( Current->fSquareMinRadius != 0.0 ) + || ( Current->fSquareRadius <= 90000.0 ) ) { + // add to sub-rectangle + GetSubRect( Current->pCenter.x, Current->pCenter.z )->NodeAdd( Current ); + } + else { + // dodajemy do kwadratu kilometrowego + GetRect( Current->pCenter.x, Current->pCenter.z )->NodeAdd( Current ); + } } - // if (Current->iType!=TP_DYNAMIC) - // GetSubRect(Current->pCenter.x,Current->pCenter.z)->AddNode(Current); } } for (i = 0; i < iNumRects; ++i) for (j = 0; j < iNumRects; ++j) Rects[i][j].Optimize(); // optymalizacja obiektów w sektorach + WriteLog("InitNormals OK"); + InitTracks(); //łączenie odcinków ze sobą i przyklejanie eventów WriteLog("InitTracks OK"); + InitTraction(); //łączenie drutów ze sobą WriteLog("InitTraction OK"); + InitEvents(); WriteLog("InitEvents OK"); + InitLaunchers(); WriteLog("InitLaunchers OK"); + WriteLog("FirstInit is done"); }; @@ -2077,13 +2052,14 @@ bool TGround::Init(std::string File) } else if ( ( LastNode->iType == TP_TRACTION ) && ( false == Global::bLoadTraction ) ) SafeDelete(LastNode); // usuwamy druty, jeśli wyłączone + if (LastNode) // dopiero na koniec dopisujemy do tablic if (LastNode->iType != TP_DYNAMIC) { // jeśli nie jest pojazdem - LastNode->nNext = nRootOfType[LastNode->iType]; // ostatni dodany dołączamy - // na końcu nowego - nRootOfType[LastNode->iType] = - LastNode; // ustawienie nowego na początku listy + // ostatni dodany dołączamy na końcu nowego + LastNode->nNext = nRootOfType[LastNode->iType]; + // ustawienie nowego na początku listy + nRootOfType[LastNode->iType] = LastNode; iNumNodes++; } else @@ -2437,10 +2413,6 @@ bool TGround::Init(std::string File) else // jak liczba to na pewno błąd Error("Unrecognized command: " + str); } -/* else if (str == "") - break; -*/ - // LastNode=NULL; token = ""; parser.getTokens(); diff --git a/Ground.h b/Ground.h index ee20b738..ca2aced2 100644 --- a/Ground.h +++ b/Ground.h @@ -122,19 +122,20 @@ public: TGroundNode *nNode; // obiekt renderujący grupowo ma tu wskaźnik na listę obiektów }; std::string asName; // nazwa (nie zawsze ma znaczenie) + + vector3 pCenter; // współrzędne środka do przydzielenia sektora + vector3 m_rootposition; // position of the ground (sub)rectangle holding the node, in the 3d world + // visualization-related data + // TODO: wrap these in a struct, when cleaning objects up union { int iNumVerts; // dla trójkątów int iNumPts; // dla linii int iCount; // dla terenu - // int iState; //Ra: nie używane - dźwięki zapętlone }; - vector3 pCenter; // współrzędne środka do przydzielenia sektora - double fLineThickness; // McZapkie-120702: grubosc linii double fSquareRadius; // kwadrat widoczności do double fSquareMinRadius; // kwadrat widoczności od - // TGroundNode *nMeshGroup; //Ra: obiekt grupujący trójkąty w TSubRect dla tekstury int iVersion; // wersja siatki (do wykonania rekompilacji) // union ? GLuint DisplayListID; // numer siatki DisplayLists @@ -144,6 +145,7 @@ public: int iFlags; // tryb przezroczystości: 0x10-nieprz.,0x20-przezroczysty,0x30-mieszany int Ambient[4], Diffuse[4], Specular[4]; // oświetlenie bool bVisible; + TGroundNode *nNext; // lista wszystkich w scenerii, ostatni na początku TGroundNode *nNext2; // lista obiektów w sektorze TGroundNode *nNext3; // lista obiektów renderowanych we wspólnym cyklu @@ -154,8 +156,6 @@ public: void InitCenter(); // obliczenie współrzędnych środka void InitNormals(); - void MoveMe(vector3 pPosition); // przesuwanie (nie działa) - // bool Disable(); inline TGroundNode * Find(const std::string &asNameToFind, TGroundNodeType iNodeType) { // wyszukiwanie czołgowe z typem @@ -177,7 +177,7 @@ public: struct bounding_area { - float3 center; // mid point of the rectangle + glm::vec3 center; // mid point of the rectangle float radius{ 0.0f }; // radius of the bounding sphere }; diff --git a/Segment.cpp b/Segment.cpp index 194c3209..c3fdb478 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -319,7 +319,7 @@ vector3 TSegment::FastGetPoint(double t) return (bCurve ? RaInterpolate(t) : ((1.0 - t) * Point1 + (t)*Point2)); } -int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, bool Onlypositions, vector3 **p, bool bRender) +int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, vector3 **p, bool bRender) { // generowanie trójkątów dla odcinka trajektorii ruchu // standardowo tworzy triangle_strip dla prostego albo ich zestaw dla łuku // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli @@ -368,12 +368,10 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int jmm2 = 0.0; } - if( false == Onlypositions ) { - while( tv1 < 0.0 ) { - tv1 += 1.0; - } - tv2 = tv1 - step / fTextureLength; // mapowanie na końcu segmentu + while( tv1 < 0.0 ) { + tv1 += 1.0; } + tv2 = tv1 - step / fTextureLength; // mapowanie na końcu segmentu t = fTsBuffer[ i ]; // szybsze od GetTFromS(s); pos2 = FastGetPoint( t ); @@ -389,30 +387,25 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int for( int j = 0; j < iNumShapePoints; ++j ) { pt = parallel1 * ( jmm1 * ( ShapePoints[ j ].x - fOffsetX ) + m1 * ShapePoints[ j + iNumShapePoints ].x ) + pos1; pt.y += jmm1 * ShapePoints[ j ].y + m1 * ShapePoints[ j + iNumShapePoints ].y; - if( false == Onlypositions ) { - norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel1; - norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; - } + pt -= Origin; + norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel1; + norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; if( bRender ) { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów if( Output == nullptr ) { // immediate mode - if( false == Onlypositions ) { - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale, tv1 ); - } + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale, tv1 ); ::glVertex3f( pt.x, pt.y, pt.z ); // pt nie mamy gdzie zapamiętać? } else { Output->x = pt.x; Output->y = pt.y; Output->z = pt.z; - if( false == Onlypositions ) { - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; - Output->v = tv1; - } + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; + Output->v = tv1; ++Output; } ++vertexcount; @@ -427,30 +420,25 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int // dla trapezu drugi koniec ma inne współrzędne pt = parallel2 * ( jmm2 * ( ShapePoints[ j ].x - fOffsetX ) + m2 * ShapePoints[ j + iNumShapePoints ].x ) + pos2; pt.y += jmm2 * ShapePoints[ j ].y + m2 * ShapePoints[ j + iNumShapePoints ].y; - if( false == Onlypositions ) { - norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel2; - norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; - } + pt -= Origin; + norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel2; + norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; if( bRender ) { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów if( Output == nullptr ) { // immediate mode - if( false == Onlypositions ) { - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale, tv2 ); - } + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale, tv2 ); ::glVertex3f( pt.x, pt.y, pt.z ); } else { Output->x = pt.x; Output->y = pt.y; Output->z = pt.z; - if( false == Onlypositions ) { - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; - Output->v = tv2; - } + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; + Output->v = tv2; ++Output; } ++vertexcount; @@ -470,58 +458,48 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int //łuk z jednym profilem pt = parallel1 * ( ShapePoints[ j ].x - fOffsetX ) + pos1; pt.y += ShapePoints[ j ].y; - if( false == Onlypositions ) { - norm = ShapePoints[ j ].n.x * parallel1; - norm.y += ShapePoints[ j ].n.y; - } + pt -= Origin; + norm = ShapePoints[ j ].n.x * parallel1; + norm.y += ShapePoints[ j ].n.y; if( Output == nullptr ) { // immediate mode - if( false == Onlypositions ) { - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv1 ); - } + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv1 ); ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na początku odcinka } else { Output->x = pt.x; Output->y = pt.y; Output->z = pt.z; - if( false == Onlypositions ) { - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = ShapePoints[ j ].z / Texturescale; - Output->v = tv1; - } + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = ShapePoints[ j ].z / Texturescale; + Output->v = tv1; ++Output; } ++vertexcount; pt = parallel2 * ShapePoints[ j ].x + pos2; pt.y += ShapePoints[ j ].y; - if( false == Onlypositions ) { - norm = ShapePoints[ j ].n.x * parallel2; - norm.y += ShapePoints[ j ].n.y; - } + pt -= Origin; + norm = ShapePoints[ j ].n.x * parallel2; + norm.y += ShapePoints[ j ].n.y; if( Output == nullptr ) { // immediate mode - if( false == Onlypositions ) { - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv2 ); - } + ::glNormal3f( norm.x, norm.y, norm.z ); + ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv2 ); ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na końcu odcinka } else { Output->x = pt.x; Output->y = pt.y; Output->z = pt.z; - if( false == Onlypositions ) { - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = ShapePoints[ j ].z / Texturescale; - Output->v = tv2; - } + Output->nx = norm.x; + Output->ny = norm.y; + Output->nz = norm.z; + Output->u = ShapePoints[ j ].z / Texturescale; + Output->v = tv2; ++Output; } ++vertexcount; @@ -534,9 +512,7 @@ int TSegment::RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int } pos1 = pos2; parallel1 = parallel2; - if( false == Onlypositions ) { - tv1 = tv2; - } + tv1 = tv2; } return vertexcount; diff --git a/Segment.h b/Segment.h index 1c4c84ab..25a9875f 100644 --- a/Segment.h +++ b/Segment.h @@ -113,7 +113,7 @@ class TSegment r1 = fRoll1; r2 = fRoll2; } - int RenderLoft( CVertNormTex* &Output, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, bool Onlypositions = false, vector3 **p = nullptr, bool bRender = true); + int RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, vector6 const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, vector3 **p = nullptr, bool bRender = true); void Render(); inline double GetLength() { diff --git a/Track.cpp b/Track.cpp index b0920ad9..ddb669cc 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1090,6 +1090,9 @@ void TTrack::Compile(GLuint tex) hypot2 = hypot1; normal2 = normal1; } + + auto const origin = pMyNode->m_rootposition; + double roll1, roll2; switch (iCategoryFlag & 15) { @@ -1216,15 +1219,15 @@ void TTrack::Compile(GLuint tex) } if (!tex) GfxRenderer.Bind( TextureID2 ); - Segment->RenderLoft( immediate, bpts1, iTrapezoid ? -4 : 4, fTexLength); + Segment->RenderLoft( immediate, origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); } if (TextureID1) if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) { // szyny if (!tex) GfxRenderer.Bind( TextureID1 ); - Segment->RenderLoft( immediate, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - Segment->RenderLoft( immediate, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + Segment->RenderLoft( immediate, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + Segment->RenderLoft( immediate, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); } break; case tt_Switch: // dla zwrotnicy dwa razy szyny @@ -1252,31 +1255,31 @@ void TTrack::Compile(GLuint tex) { // zwrotnica prawa if( TextureID1 ) { GfxRenderer.Bind( TextureID1 ); - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); // prawa iglica - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts1, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts2, nnumPts, fTexLength ); // lewa szyna normalnie cała + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); // prawa iglica + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts2, nnumPts, fTexLength ); // lewa szyna normalnie cała } if( TextureID2 ) { GfxRenderer.Bind( TextureID2 ); - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts1, nnumPts, fTexLength ); // prawa szyna normalna cała - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); // lewa iglica - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts2, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts1, nnumPts, fTexLength ); // prawa szyna normalna cała + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); // lewa iglica + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą } } else { // lewa kiedyś działała lepiej niż prawa if( TextureID1 ) { GfxRenderer.Bind( TextureID1 ); - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts1, nnumPts, fTexLength ); // prawa szyna normalna cała - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); // lewa iglica - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts2, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts1, nnumPts, fTexLength ); // prawa szyna normalna cała + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); // lewa iglica + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą } if( TextureID2 ) { // nie wiadomo, czy OpenGL to optymalizuje GfxRenderer.Bind( TextureID2 ); - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); // prawa iglica - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts1, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts2, nnumPts, fTexLength ); // lewa szyna normalnie cała + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); // prawa iglica + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts2, nnumPts, fTexLength ); // lewa szyna normalnie cała } } } @@ -1315,7 +1318,7 @@ void TTrack::Compile(GLuint tex) { // tworzenie trójkątów nawierzchni szosy if (!tex) GfxRenderer.Bind( TextureID1 ); - Segment->RenderLoft( immediate, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Segment->RenderLoft( immediate, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); } if (TextureID2) if (tex ? TextureID2 == tex : true) // jeśli pasuje do grupy (tex) @@ -1399,16 +1402,16 @@ void TTrack::Compile(GLuint tex) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony // odcinka if ((fTexHeight1 >= 0.0) ? true : (slop != 0.0)) - Segment->RenderLoft( immediate, rpts1, -3, fTexLength); // tylko jeśli jest z prawej + Segment->RenderLoft( immediate, origin, rpts1, -3, fTexLength); // tylko jeśli jest z prawej if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - Segment->RenderLoft( immediate, rpts2, -3, fTexLength); // tylko jeśli jest z lewej + Segment->RenderLoft( immediate, origin, rpts2, -3, fTexLength); // tylko jeśli jest z lewej } else { // pobocza zwykłe, brak przechyłki if ((fTexHeight1 >= 0.0) ? true : (slop != 0.0)) - Segment->RenderLoft( immediate, rpts1, 3, fTexLength); + Segment->RenderLoft( immediate, origin, rpts1, 3, fTexLength); if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - Segment->RenderLoft( immediate, rpts2, 3, fTexLength); + Segment->RenderLoft( immediate, origin, rpts2, 3, fTexLength); } } break; @@ -1551,19 +1554,19 @@ void TTrack::Compile(GLuint tex) if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - SwitchExtension->Segments[ 3 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - SwitchExtension->Segments[ 4 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - SwitchExtension->Segments[ 5 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 2 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 3 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 4 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 5 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); } } else // to będzie ewentualnie dla prostego na skrzyżowaniu trzech dróg { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P2 do P4 - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P4 do P3=P1 (odwrócony) - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P1 do P2 + SwitchExtension->Segments[ 2 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P2 do P4 + SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P4 do P3=P1 (odwrócony) + SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P1 do P2 } } } @@ -1628,7 +1631,7 @@ void TTrack::Compile(GLuint tex) { if (!tex) GfxRenderer.Bind( TextureID1 ); - Segment->RenderLoft( immediate, bpts1, numPts, fTexLength); + Segment->RenderLoft( immediate, origin, bpts1, numPts, fTexLength); } if (TextureID2) if (tex ? TextureID2 == tex : true) // jeśli pasuje do grupy (tex) @@ -1640,8 +1643,8 @@ void TTrack::Compile(GLuint tex) vector6(-rozp, -fTexHeight1, 0.0)}; // Ra: po kiego 0.1? if (!tex) GfxRenderer.Bind( TextureID2 ); // brzeg rzeki - Segment->RenderLoft( immediate, rpts1, 3, fTexLength); - Segment->RenderLoft( immediate, rpts2, 3, fTexLength); + Segment->RenderLoft( immediate, origin, rpts1, 3, fTexLength ); + Segment->RenderLoft( immediate, origin, rpts2, 3, fTexLength ); } break; } @@ -1858,6 +1861,9 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons hypot2 = hypot1; normal2 = normal1; } + + auto const origin = pMyNode->m_rootposition; + double roll1, roll2; switch (iCategoryFlag & 15) { @@ -1959,12 +1965,12 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos } } - Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -4 : 4, fTexLength); + Segment->RenderLoft(Vert, origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); } if (TextureID1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną - Segment->RenderLoft(Vert, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - Segment->RenderLoft(Vert, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + Segment->RenderLoft(Vert, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + Segment->RenderLoft(Vert, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); } break; case tt_Switch: // dla zwrotnicy dwa razy szyny @@ -1989,32 +1995,32 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa if( TextureID1 ) { - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, nnumPts, fTexLength ); - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts2, nnumPts, fTexLength ); + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); } if( TextureID2 ) { SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts1, nnumPts, fTexLength ); + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts1, nnumPts, fTexLength ); } } else { // lewa działa lepiej niż prawa if( TextureID1 ) { - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); // prawa iglica + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); // prawa iglica } if( TextureID2 ) { SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); // lewa iglica - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts1, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); // lewa iglica + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała } } } @@ -2049,7 +2055,7 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Segment->RenderLoft(Vert, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); } if (TextureID2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) @@ -2130,18 +2136,18 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony // odcinka if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - Segment->RenderLoft( Vert, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej + Segment->RenderLoft( Vert, origin, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - Segment->RenderLoft( Vert, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej + Segment->RenderLoft( Vert, origin, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej } } else { // pobocza zwykłe, brak przechyłki if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - Segment->RenderLoft( Vert, rpts1, 3, fTexLength ); + Segment->RenderLoft( Vert, origin, rpts1, 3, fTexLength ); } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - Segment->RenderLoft( Vert, rpts2, 3, fTexLength ); + Segment->RenderLoft( Vert, origin, rpts2, 3, fTexLength ); } } } @@ -2266,18 +2272,18 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - SwitchExtension->Segments[ 3 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - SwitchExtension->Segments[ 4 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); - SwitchExtension->Segments[ 5 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); + SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 3 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 4 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 5 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); } } else { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P2 do P4 - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P4 do P3=P1 (odwrócony) - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, false, &b, render ); // z P1 do P2 + SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P2 do P4 + SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P4 do P3=P1 (odwrócony) + SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P1 do P2 } } } @@ -2297,17 +2303,17 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons Vert->nz = 0.0; Vert->u = 0.5; Vert->v = 0.5; - Vert->x = oxz.x; - Vert->y = oxz.y; - Vert->z = oxz.z; + Vert->x = oxz.x - origin.x; + Vert->y = oxz.y - origin.y; + Vert->z = oxz.z - origin.z; ++Vert; // ...and add one extra vertex to close the fan... Vert->nx = 0.0; Vert->ny = 1.0; Vert->nz = 0.0; // mapowanie we współrzędnych scenerii - u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x ) / fTexLength; - v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z ) / ( fTexRatio1 * fTexLength ); + u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x + origin.x ) / fTexLength; + v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z + origin.z ) / ( fTexRatio1 * fTexLength ); Vert->u = cosa0 * u + sina0 * v + 0.5; Vert->v = -sina0 * u + cosa0 * v + 0.5; Vert->x = SwitchExtension->vPoints[ 0 ].x; @@ -2321,8 +2327,8 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons Vert->ny = 1.0; Vert->nz = 0.0; // mapowanie we współrzędnych scenerii - u = (SwitchExtension->vPoints[i].x - oxz.x) / fTexLength; - v = (SwitchExtension->vPoints[i].z - oxz.z) / (fTexRatio1 * fTexLength); + u = (SwitchExtension->vPoints[i].x - oxz.x + origin.x ) / fTexLength; + v = (SwitchExtension->vPoints[i].z - oxz.z + origin.z ) / (fTexRatio1 * fTexLength); Vert->u = cosa0 * u + sina0 * v + 0.5; Vert->v = -sina0 * u + cosa0 * v + 0.5; Vert->x = SwitchExtension->vPoints[ i ].x; @@ -2368,7 +2374,7 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - Segment->RenderLoft(Vert, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Segment->RenderLoft(Vert, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); } if (TextureID2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w @@ -2390,13 +2396,13 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza - Segment->RenderLoft(Vert, rpts1, -3, fTexLength); - Segment->RenderLoft(Vert, rpts2, -3, fTexLength); + Segment->RenderLoft(Vert, origin, rpts1, -3, fTexLength); + Segment->RenderLoft(Vert, origin, rpts2, -3, fTexLength); } else { // pobocza zwykłe, brak przechyłki - Segment->RenderLoft(Vert, rpts1, 3, fTexLength); - Segment->RenderLoft(Vert, rpts2, 3, fTexLength); + Segment->RenderLoft(Vert, origin, rpts1, 3, fTexLength); + Segment->RenderLoft(Vert, origin, rpts2, 3, fTexLength); } } } @@ -2884,13 +2890,14 @@ TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) bladesbuffer.data() ); */ auto bladevertices = bladesbuffer.data(); + auto const origin = pMyNode->m_rootposition; if( SwitchExtension->RightSwitch ) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 /*, true*/ ); - SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 /*, true*/ ); + SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 /*, true*/ ); + SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 /*, true*/ ); } else { - SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 /*, true*/ ); // prawa iglica - SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 /*, true*/ ); // lewa iglica + SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 /*, true*/ ); // prawa iglica + SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 /*, true*/ ); // lewa iglica } // push back updated geometry ::glBufferSubData( diff --git a/Traction.cpp b/Traction.cpp index 8324854a..6cf2842a 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -324,7 +324,7 @@ int TTraction::RaArrayPrepare() return iLines; }; -int TTraction::RaArrayFill(CVertNormTex *Vert) +int TTraction::RaArrayFill(CVertNormTex *Vert, Math3D::vector3 const &Origin) { // wypełnianie tablic VBO int debugvertexcount{ 0 }; @@ -332,14 +332,14 @@ int TTraction::RaArrayFill(CVertNormTex *Vert) if (Wires == 2) WireOffset = 0; // jezdny - Vert->x = pPoint1.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; - Vert->y = pPoint1.y; - Vert->z = pPoint1.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; + Vert->x = pPoint1.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x; + Vert->y = pPoint1.y - Origin.y; + Vert->z = pPoint1.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z; ++Vert; ++debugvertexcount; - Vert->x = pPoint2.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; - Vert->y = pPoint2.y; - Vert->z = pPoint2.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; + Vert->x = pPoint2.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x; + Vert->y = pPoint2.y - Origin.y; + Vert->z = pPoint2.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z; ++Vert; ++debugvertexcount; // Nie wiem co 'Marcin @@ -355,9 +355,9 @@ int TTraction::RaArrayFill(CVertNormTex *Vert) // Przewod nosny 'Marcin if (Wires > 1) { // lina nośna w kawałkach - Vert->x = pPoint3.x; - Vert->y = pPoint3.y; - Vert->z = pPoint3.z; + Vert->x = pPoint3.x - Origin.x; + Vert->y = pPoint3.y - Origin.y; + Vert->z = pPoint3.z - Origin.z; ++Vert; ++debugvertexcount; for (int i = 0; i < iNumSections - 1; ++i) @@ -367,31 +367,31 @@ int TTraction::RaArrayFill(CVertNormTex *Vert) if( ( Wires < 4 ) || ( ( i != 0 ) && ( i != iNumSections - 2 ) ) ) { - Vert->x = pt3.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference; - Vert->z = pt3.z; + Vert->x = pt3.x - Origin.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - Origin.y; + Vert->z = pt3.z - Origin.z; ++Vert; ++debugvertexcount; } f += step; } - Vert->x = pPoint4.x; - Vert->y = pPoint4.y; - Vert->z = pPoint4.z; + Vert->x = pPoint4.x - Origin.x; + Vert->y = pPoint4.y - Origin.y; + Vert->z = pPoint4.z - Origin.z; ++Vert; ++debugvertexcount; } // Drugi przewod jezdny 'Winger if (Wires > 2) { - Vert->x = pPoint1.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset; - Vert->y = pPoint1.y; - Vert->z = pPoint1.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset; + Vert->x = pPoint1.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x; + Vert->y = pPoint1.y - Origin.y; + Vert->z = pPoint1.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z; ++Vert; ++debugvertexcount; - Vert->x = pPoint2.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset; - Vert->y = pPoint2.y; - Vert->z = pPoint2.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset; + Vert->x = pPoint2.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x; + Vert->y = pPoint2.y - Origin.y; + Vert->z = pPoint2.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z; ++Vert; ++debugvertexcount; } @@ -399,28 +399,29 @@ int TTraction::RaArrayFill(CVertNormTex *Vert) f = step; if( Wires == 4 ) { - Vert->x = pPoint3.x; - Vert->y = pPoint3.y - 0.65f * fHeightDifference; - Vert->z = pPoint3.z; + Vert->x = pPoint3.x - Origin.x; + Vert->y = pPoint3.y - 0.65f * fHeightDifference - Origin.y; + Vert->z = pPoint3.z - Origin.z; ++Vert; ++debugvertexcount; for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; t = ( 1 - std::fabs( f - mid ) * 2 ); - Vert->x = pt3.x; + Vert->x = pt3.x - Origin.x; Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( ( i == 0 ) || ( i == iNumSections - 2 ) ) ? 0.25f * fHeightDifference : - 0.05 ); - Vert->z = pt3.z; + 0.05 ) + - Origin.y; + Vert->z = pt3.z - Origin.z; ++Vert; ++debugvertexcount; f += step; } - Vert->x = pPoint4.x; - Vert->y = pPoint4.y - 0.65f * fHeightDifference; - Vert->z = pPoint4.z; + Vert->x = pPoint4.x - Origin.x; + Vert->y = pPoint4.y - 0.65f * fHeightDifference - Origin.y; + Vert->z = pPoint4.z - Origin.z; ++Vert; ++debugvertexcount; } @@ -439,40 +440,40 @@ int TTraction::RaArrayFill(CVertNormTex *Vert) t = (1 - std::fabs(f - mid) * 2); if( ( i % 2 ) == 0 ) { - Vert->x = pt3.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ); - Vert->z = pt3.z; + Vert->x = pt3.x - Origin.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - Origin.y; + Vert->z = pt3.z - Origin.z; ++Vert; ++debugvertexcount; - Vert->x = pt4.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; - Vert->y = pt4.y; - Vert->z = pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; + Vert->x = pt4.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x; + Vert->y = pt4.y - Origin.y; + Vert->z = pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z; ++Vert; ++debugvertexcount; } else { - Vert->x = pt3.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ); - Vert->z = pt3.z; + Vert->x = pt3.x - Origin.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - Origin.y; + Vert->z = pt3.z - Origin.z; ++Vert; ++debugvertexcount; - Vert->x = pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset; - Vert->y = pt4.y; - Vert->z = pt4.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset; + Vert->x = pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x; + Vert->y = pt4.y - Origin.y; + Vert->z = pt4.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z; ++Vert; ++debugvertexcount; } if( ( ( Wires == 4 ) && ( ( i == 1 ) || ( i == iNumSections - 3 ) ) ) ) { - Vert->x = pt3.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - 0.05; - Vert->z = pt3.z; + Vert->x = pt3.x - Origin.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - 0.05 - Origin.y; + Vert->z = pt3.z - Origin.z; ++Vert; ++debugvertexcount; - Vert->x = pt3.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference; - Vert->z = pt3.z; + Vert->x = pt3.x - Origin.x; + Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - Origin.y; + Vert->z = pt3.z - Origin.z; ++Vert; ++debugvertexcount; } diff --git a/Traction.h b/Traction.h index e276bf59..5a68c359 100644 --- a/Traction.h +++ b/Traction.h @@ -68,7 +68,7 @@ class TTraction // virtual void SelectedRender(); void RenderDL(float mgn); int RaArrayPrepare(); - int RaArrayFill(CVertNormTex *Vert); + int RaArrayFill( CVertNormTex *Vert, Math3D::vector3 const &Origin ); void RenderVBO(float mgn, int iPtr); int TestPoint(Math3D::vector3 *Point); void Connect(int my, TTraction *with, int to); diff --git a/World.cpp b/World.cpp index d7fa9bae..dc3c4968 100644 --- a/World.cpp +++ b/World.cpp @@ -1276,6 +1276,8 @@ TWorld::Render_Cab() { return; } + ::glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone. TODO: have the wires render take care of its own shit +/* glPushMatrix(); vector3 pos = dynamic->GetPosition(); // wszpółrzędne pojazdu z kabiną // glTranslatef(pos.x,pos.y,pos.z); //przesunięcie o wektor (tak było i trzęsło) @@ -1284,7 +1286,11 @@ TWorld::Render_Cab() { glLoadIdentity(); // zacząć od macierzy jedynkowej Camera.SetCabMatrix( pos ); // widok z kamery po przesunięciu glMultMatrixd( dynamic->mMatrix.getArray() ); // ta macierz nie ma przesunięcia - glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone. TODO: have the wires render take care of its own shit +*/ + ::glPushMatrix(); + auto const originoffset = dynamic->GetPosition() - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + ::glMultMatrixd( dynamic->mMatrix.getArray() ); if( dynamic->mdKabina ) // bo mogła zniknąć przy przechodzeniu do innego pojazdu { diff --git a/frustum.h b/frustum.h index 19febbe3..360f8a5a 100644 --- a/frustum.h +++ b/frustum.h @@ -27,6 +27,9 @@ public: calculate(glm::mat4 const &Projection, glm::mat4 const &Modelview); // returns true if specified point is inside of the frustum inline + bool + point_inside( glm::vec3 const &Point ) const { return point_inside( Point.x, Point.y, Point.z ); } + inline bool point_inside( float3 const &Point ) const { return point_inside( Point.x, Point.y, Point.z ); } inline @@ -36,6 +39,9 @@ public: point_inside( float const X, float const Y, float const Z ) const; // tests if the sphere is in frustum, returns the distance between origin and sphere centre inline + float + sphere_inside( glm::vec3 const &Center, float const Radius ) const { return sphere_inside( Center.x, Center.y, Center.z, Radius ); } + inline float sphere_inside( float3 const &Center, float const Radius ) const { return sphere_inside( Center.x, Center.y, Center.z, Radius ); } inline @@ -45,6 +51,9 @@ public: sphere_inside( float const X, float const Y, float const Z, float const Radius ) const; // returns true if specified cube is inside of the frustum. Size = half of the length inline + bool + cube_inside( glm::vec3 const &Center, float const Size ) const { return cube_inside( Center.x, Center.y, Center.z, Size ); } + inline bool cube_inside( float3 const &Center, float const Size ) const { return cube_inside( Center.x, Center.y, Center.z, Size ); } inline diff --git a/renderer.cpp b/renderer.cpp index 2fe2ede1..0403e303 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -142,9 +142,16 @@ opengl_renderer::Render() { ::glLoadIdentity(); if( World.InitPerformed() ) { - +/* World.Camera.SetMatrix(); m_camera.update_frustum(); +*/ + glm::dmat4 worldcamera; + World.Camera.SetMatrix( worldcamera ); + m_camera.update_frustum( OpenGLMatrices.data( GL_PROJECTION ), worldcamera ); + // frustum tests are performed in 'world space' but after we set up frustum + // we no longer need camera translation, only rotation + ::glMultMatrixd( glm::value_ptr( glm::dmat4( glm::dmat3( worldcamera )))); Render( &World.Environment ); Render( &World.Ground ); @@ -178,11 +185,12 @@ opengl_renderer::Render( world_environment *Environment ) { /* ::glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); */ +/* glm::mat4 worldcamera; World.Camera.SetMatrix( worldcamera ); glLoadIdentity(); glMultMatrixf( glm::value_ptr( glm::mat4( glm::mat3( worldcamera ) ) ) ); - +*/ // setup fog if( Global::fFogEnd > 0 ) { // fog setup @@ -294,12 +302,16 @@ opengl_renderer::Render( world_environment *Environment ) { bool opengl_renderer::Render( TGround *Ground ) { -/* - glDisable( GL_BLEND ); - glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - glEnable( GL_LIGHTING ); - glColor3f( 1.0f, 1.0f, 1.0f ); + ::glEnable( GL_LIGHTING ); + ::glDisable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + ::glColor3f( 1.0f, 1.0f, 1.0f ); + + ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) + + Update_Lights( Ground->m_lights ); +/* glm::vec3 const cameraposition( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); int const camerax = static_cast( std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2 ); int const cameraz = static_cast( std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2 ); @@ -317,15 +329,6 @@ opengl_renderer::Render( TGround *Ground ) { } } */ - ::glEnable( GL_LIGHTING ); - ::glDisable( GL_BLEND ); - ::glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - ::glColor3f( 1.0f, 1.0f, 1.0f ); - - ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) - - Update_Lights( Ground->m_lights ); - Ground->CameraDirection.x = std::sin( Global::pCameraRotation ); // wektor kierunkowy Ground->CameraDirection.z = std::cos( Global::pCameraRotation ); TGroundNode *node; @@ -354,6 +357,16 @@ opengl_renderer::Render( TGround *Ground ) { } } // renderowanie progresywne - zależne od FPS oraz kierunku patrzenia + // pre-calculate camera view span + double const fieldofviewcosine = + std::cos( + std::max( + // vertical... + Global::FieldOfView / Global::ZoomFactor, + // ...or horizontal, whichever is bigger + Global::FieldOfView / Global::ZoomFactor + * std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ) ) ); + Ground->iRendered = 0; // ilość renderowanych sektorów Math3D::vector3 direction; for( k = 0; k < Global::iSegmentsRendered; ++k ) // sektory w kolejności odległości @@ -369,10 +382,16 @@ opengl_renderer::Render( TGround *Ground ) { if( Math3D::LengthSquared3( direction ) > 5 ) // te blisko są zawsze wyświetlane { direction = Math3D::SafeNormalize( direction ); // normalizacja - if( Ground->CameraDirection.x * direction.x + Ground->CameraDirection.z * direction.z < 0.55 ) + if( Ground->CameraDirection.x * direction.x + Ground->CameraDirection.z * direction.z < 0.5 ) continue; // pomijanie sektorów poza kątem patrzenia } // kwadrat kilometrowy nie zawsze, bo szkoda FPS + // TODO: unify all math objects + ::glPushMatrix(); + auto const &cellorigin = Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].m_area.center; + auto const originoffset = Math3D::vector3( cellorigin.x, cellorigin.y, cellorigin.z ) - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + if( Global::bUseVBO ) { // vbo render path Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].RenderVBO(); @@ -381,6 +400,8 @@ opengl_renderer::Render( TGround *Ground ) { // display list render path Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].RenderDL(); } + ::glPopMatrix(); + if( ( tmp = Ground->FastGetSubRect( i + c, j + r ) ) != nullptr ) { if( tmp->iNodeCount ) { // o ile są jakieś obiekty, bo po co puste sektory przelatywać @@ -389,16 +410,15 @@ opengl_renderer::Render( TGround *Ground ) { } } while( ( i < 0 ) || ( j < 0 ) ); // są 4 przypadki, oprócz i=j=0 } - // dodać renderowanie terenu z E3D - jedno VBO jest używane dla całego modelu, chyba że jest ich więcej if( Global::bUseVBO ) { if( Global::pTerrainCompact ) { Global::pTerrainCompact->TerrainRenderVBO( TGroundRect::iFrameNumber ); } } - // renderowanie nieprzezroczystych for( i = 0; i < Ground->iRendered; ++i ) { + if( Global::bUseVBO ) { // vbo render path Ground->pRendered[ i ]->RenderVBO(); @@ -408,10 +428,8 @@ opengl_renderer::Render( TGround *Ground ) { Ground->pRendered[ i ]->RenderDL(); } } - // regular render takes care of all solid geometry present in the scene, thus we can launch alpha parts render here return Render_Alpha( Ground ); - } bool @@ -436,22 +454,30 @@ opengl_renderer::Render( TGroundNode *Node ) { switch (Node->iType) { case TP_TRACK: { + + if( Global::bUseVBO && ( Node->iNumVerts <= 0 ) ) { + return false; + } + // setup + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // TODO: unify the render code after generic buffers are in place if( Global::bUseVBO ) { - if( Node->iNumVerts ) { - Node->pTrack->RaRenderVBO( Node->iVboPtr ); - } - else { - return false; - } + // vbo render path + Node->pTrack->RaRenderVBO( Node->iVboPtr ); } else { + // display list render path Node->pTrack->Render(); } + // post-render cleanup + ::glPopMatrix(); return true; } case TP_MODEL: { - Node->Model->Render( &Node->pCenter ); + Node->Model->Render( Node->pCenter - Global::pCameraPosition ); return true; } case TP_MEMCELL: { @@ -480,6 +506,9 @@ opengl_renderer::Render( TGroundNode *Node ) { // wszelkie linie są rysowane na samym końcu if( Node->iNumPts ) { // setup + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // w zaleznosci od koloru swiatla ::glColor4ub( static_cast( std::floor( Node->Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ) ), @@ -497,6 +526,9 @@ opengl_renderer::Render( TGroundNode *Node ) { else { ::glCallList( Node->DisplayListID ); } + + // post-render cleanup + ::glPopMatrix(); return true; } else { @@ -505,7 +537,17 @@ opengl_renderer::Render( TGroundNode *Node ) { } else { // GL_TRIANGLE etc + if( ( Global::bUseVBO ? + Node->iVboPtr < 0 : + Node->DisplayListID == 0 ) ) { + return false; + } + // setup + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + ::glColor3ub( static_cast( Node->Diffuse[ 0 ] ), static_cast( Node->Diffuse[ 1 ] ), @@ -517,22 +559,16 @@ opengl_renderer::Render( TGroundNode *Node ) { // TODO: unify the render code after generic buffers are in place if( Global::bUseVBO ) { // vbo render path - if( Node->iVboPtr >= 0 ) { - ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumVerts ); - } - else { - return false; - } + ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumVerts ); } else { // display list render path - if( Node->DisplayListID != 0 ) { - ::glCallList( Node->DisplayListID ); - } - else { - return false; - } + ::glCallList( Node->DisplayListID ); } + + // post-render cleanup + ::glPopMatrix(); + return true; } } @@ -550,11 +586,11 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - double squaredistance = SquareMagnitude( ( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor ); + auto const originoffset = Dynamic->vPosition - Global::pCameraPosition; + double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu - ::glPushMatrix(); - +/* if( Dynamic == Global::pUserDynamic ) { //specjalne ustawienie, aby nie trzęsło //tu trzeba by ustawić animacje na modelu zewnętrznym @@ -563,7 +599,8 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { } else ::glTranslated( Dynamic->vPosition.x, Dynamic->vPosition.y, Dynamic->vPosition.z ); // standardowe przesunięcie względem początku scenerii - +*/ + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); ::glMultMatrixd( Dynamic->mMatrix.getArray() ); if( Dynamic->fShade > 0.0f ) { @@ -666,7 +703,7 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, Math3D: if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); - auto const result = Render( Model, Material, SquareMagnitude( Position - Global::GetCameraPosition() ) ); + auto const result = Render( Model, Material, SquareMagnitude( Position / Global::ZoomFactor ) ); // position is effectively camera offset ::glPopMatrix(); @@ -932,12 +969,19 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { case TP_TRACTION: { // TODO: unify the render code after generic buffers are in place if( Node->bVisible ) { + // setup + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // render if( Global::bUseVBO ) { Node->hvTraction->RenderVBO( distancesquared, Node->iVboPtr ); } else { Node->hvTraction->RenderDL( distancesquared ); } + // post-render cleanup + ::glPopMatrix(); return true; } else { @@ -945,7 +989,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } } case TP_MODEL: { - Node->Model->RenderAlpha( &Node->pCenter ); + Node->Model->RenderAlpha( Node->pCenter - Global::pCameraPosition ); return true; } } @@ -980,6 +1024,9 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // wszelkie linie są rysowane na samym końcu if( Node->iNumPts ) { // setup + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // w zaleznosci od koloru swiatla ::glColor4ub( static_cast( std::floor( Node->Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ) ), @@ -997,12 +1044,18 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { else { ::glCallList( Node->DisplayListID ); } + // post-render cleanup + ::glPopMatrix(); result = true; } } else { // GL_TRIANGLE etc // setup + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + ::glColor3ub( static_cast( Node->Diffuse[ 0 ] ), static_cast( Node->Diffuse[ 1 ] ), @@ -1024,8 +1077,10 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { ::glCallList( Node->DisplayListID ); result = true; } + // post-render cleanup + ::glPopMatrix(); } - // post-render cleanup + #ifdef _PROBLEND if( ( Node->PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 { @@ -1049,17 +1104,19 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - double squaredistance = SquareMagnitude( ( Global::pCameraPosition - Dynamic->vPosition ) / Global::ZoomFactor ); + auto const originoffset = Dynamic->vPosition - Global::pCameraPosition; + double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu - ::glPushMatrix(); +/* if( Dynamic == Global::pUserDynamic ) { // specjalne ustawienie, aby nie trzęsło ::glLoadIdentity(); // zacząć od macierzy jedynkowej Global::pCamera->SetCabMatrix( Dynamic->vPosition ); // specjalne ustawienie kamery } else ::glTranslated( Dynamic->vPosition.x, Dynamic->vPosition.y, Dynamic->vPosition.z ); // standardowe przesunięcie względem początku scenerii - +*/ + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); ::glMultMatrixd( Dynamic->mMatrix.getArray() ); if( Dynamic->fShade > 0.0f ) { @@ -1161,7 +1218,7 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, M if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); - auto const result = Render_Alpha( Model, Material, SquareMagnitude( Position - Global::GetCameraPosition() ) ); + auto const result = Render_Alpha( Model, Material, SquareMagnitude( Position / Global::ZoomFactor ) ); // position is effectively camera offset ::glPopMatrix(); @@ -1400,7 +1457,7 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { continue; } // if the light passed tests so far, it's good enough - renderlight->set_position( scenelight.position ); + renderlight->set_position( scenelight.position - Global::pCameraPosition ); renderlight->direction = scenelight.direction; auto luminance = Global::fLuminance; // TODO: adjust this based on location, e.g. for tunnels diff --git a/renderer.h b/renderer.h index 65531612..1b478d3c 100644 --- a/renderer.h +++ b/renderer.h @@ -94,7 +94,7 @@ public: update_frustum() { m_frustum.calculate(); } inline void - update_frustum(glm::mat4 &Projection, glm::mat4 &Modelview) { m_frustum.calculate(Projection, Modelview); } + update_frustum(glm::mat4 const &Projection, glm::mat4 const &Modelview) { m_frustum.calculate(Projection, Modelview); } bool visible( bounding_area const &Area ) const; bool From 3068cc669eb2c066d627f452d6b8ab1a854e3867 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 26 May 2017 21:22:13 +0200 Subject: [PATCH 115/426] fixes for display list path camera-centric rendering, basic support for binary terrain object type, fix for assignment of 3d objects to terrain cells --- Ground.cpp | 41 +++++++++++++++------- Ground.h | 11 +++--- Model3d.cpp | 2 ++ Track.cpp | 64 +++++++++++++++++---------------- Traction.cpp | 99 ++++++++++++++++++++++++++++++---------------------- Traction.h | 4 +-- renderer.cpp | 39 +++++++++++---------- version.h | 2 +- 8 files changed, 150 insertions(+), 112 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index fff7c1ed..cad91fec 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -255,9 +255,9 @@ void TGroundNode::RaRenderVBO() glDrawArrays(iType, iVboPtr, iNumVerts); // Narysuj naraz wszystkie trójkąty } -void TGroundNode::Compile(bool many) +void TGroundNode::Compile( Math3D::vector3 const &Origin, bool const Multiple ) { // tworzenie skompilowanej listy w wyświetlaniu DL - if (!many) + if (false == Multiple) { // obsługa pojedynczej listy if (DisplayListID) Release(); @@ -273,9 +273,9 @@ void TGroundNode::Compile(bool many) glBegin(iType); for (int i = 0; i < iNumPts; ++i) glVertex3d( - Points[i].x - m_rootposition.x, - Points[i].y - m_rootposition.y, - Points[i].z - m_rootposition.z ); + Points[i].x - Origin.x, + Points[i].y - Origin.y, + Points[i].z - Origin.z ); glEnd(); } else if (iType == GL_TRIANGLE_STRIP || iType == GL_TRIANGLE_FAN || iType == GL_TRIANGLES) @@ -293,9 +293,9 @@ void TGroundNode::Compile(bool many) Vertices[i].tu, Vertices[i].tv); glVertex3d( - Points[i].x - m_rootposition.x, - Points[i].y - m_rootposition.y, - Points[i].z - m_rootposition.z ); + Vertices[i].Point.x - Origin.x, + Vertices[i].Point.y - Origin.y, + Vertices[i].Point.z - Origin.z ); } glEnd(); } @@ -318,7 +318,7 @@ void TGroundNode::Compile(bool many) n = n->nNext3; // następny z listy } } - if (!many) + if (false == Multiple) if (Global::bManageNodes) glEndList(); }; @@ -392,6 +392,7 @@ void TSubRect::NodeAdd(TGroundNode *Node) case TP_TRACK: // TODO: tory z cieniem (tunel, canyon) też dać bez łączenia? ++iTracks; // jeden tor więcej Node->pTrack->RaOwnerSet(this); // do którego sektora ma zgłaszać animację +/* if( ( true == Global::bUseVBO ) || ( false == Node->pTrack->IsGroupable() ) ) { // tory ruchome nie są grupowane przy Display Lists (wymagają odświeżania DL) @@ -427,6 +428,11 @@ void TSubRect::NodeAdd(TGroundNode *Node) nMeshed = Node; } // do podzielenia potem } +*/ + // NOTE: track merge code temporarily disabled to simplify implementation of camera-centric rendering + // TODO: re-implement merge for both render paths down the road + RaNodeAdd( Node ); + break; case GL_TRIANGLE_STRIP: case GL_TRIANGLE_FAN: @@ -940,8 +946,10 @@ TGroundRect::Init() { - glm::vec3( 500.0f, 0.0f, 500.0f ) // 'upper left' corner of rectangle + glm::vec3( subrectsize * 0.5f, 0.0f, subrectsize * 0.5f ) // center of sub-rectangle + glm::vec3( subrectsize * column, 0.0f, subrectsize * row ); +/* // NOTE: the actual coordinates get swapped, as they're swapped in rest of the code :x area.center = glm::vec3( area.center.z, area.center.y, area.center.x ); +*/ area.radius = subrectsize * M_SQRT2; } } @@ -962,16 +970,23 @@ void TGroundRect::RenderDL() nRender->DisplayListID = glGenLists(1); glNewList(nRender->DisplayListID, GL_COMPILE); nRender->iVersion = Global::iReCompile; // aktualna wersja siatek + auto const origin = Math3D::vector3( m_area.center.x, m_area.center.y, m_area.center.z ); for (TGroundNode *node = nRender; node; node = node->nNext3) // następny tej grupy - node->Compile(true); + node->Compile(origin, true); glEndList(); } GfxRenderer.Render( nRender ); // nieprzezroczyste trójkąty kwadratu kilometrowego } - if( nRootMesh ) + // submodels geometry is world-centric, so at least for the time being we need to pop the stack early + ::glPopMatrix(); + if( nRootMesh ) { GfxRenderer.Render( nRootMesh ); + } iLastDisplay = iFrameNumber; // drugi raz nie potrzeba } + else { + ::glPopMatrix(); + } #else if( iLastDisplay != iFrameNumber ) { // tylko jezeli dany kwadrat nie był jeszcze renderowany LoadNodes(); // ewentualne tworzenie siatek @@ -1898,7 +1913,7 @@ TSubRect * TGround::FastGetSubRect(int iCol, int iRow) sc = iCol - bc * iNumSubRects; if ((br < 0) || (bc < 0) || (br >= iNumRects) || (bc >= iNumRects)) return NULL; - return (Rects[br][bc].FastGetRect(sc, sr)); + return (Rects[bc][br].FastGetRect(sc, sr)); } TSubRect * TGround::GetSubRect(int iCol, int iRow) @@ -1910,7 +1925,7 @@ TSubRect * TGround::GetSubRect(int iCol, int iRow) sc = iCol - bc * iNumSubRects; if ((br < 0) || (bc < 0) || (br >= iNumRects) || (bc >= iNumRects)) return NULL; // jeśli poza mapą - return (Rects[br][bc].SafeGetRect(sc, sr)); // pobranie małego kwadratu + return (Rects[bc][br].SafeGetRect(sc, sr)); // pobranie małego kwadratu } TEvent * TGround::FindEvent(const std::string &asEventName) diff --git a/Ground.h b/Ground.h index ca2aced2..4ee33f16 100644 --- a/Ground.h +++ b/Ground.h @@ -166,7 +166,7 @@ public: return NULL; }; - void Compile(bool many = false); + void Compile(Math3D::vector3 const &Origin, bool const Multiple = false); void Release(); void RenderHidden(); // obsługa dźwięków i wyzwalaczy zdarzeń @@ -341,16 +341,15 @@ class TGround { return &Rects[GetColFromX(x) / iNumSubRects][GetRowFromZ(z) / iNumSubRects]; }; + TSubRect * GetSubRect( int iCol, int iRow ); TSubRect * GetSubRect(double x, double z) { return GetSubRect(GetColFromX(x), GetRowFromZ(z)); }; - TSubRect * FastGetSubRect(double x, double z) - { - return FastGetSubRect(GetColFromX(x), GetRowFromZ(z)); + TSubRect * FastGetSubRect( int iCol, int iRow ); + TSubRect * FastGetSubRect( double x, double z ) { + return FastGetSubRect( GetColFromX( x ), GetRowFromZ( z ) ); }; - TSubRect * GetSubRect(int iCol, int iRow); - TSubRect * FastGetSubRect(int iCol, int iRow); int GetRowFromZ(double z) { return (int)(z / fSubRectSize + fHalfTotalNumSubRects); diff --git a/Model3d.cpp b/Model3d.cpp index a6e0845f..7eb1493f 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1828,6 +1828,8 @@ TSubModel *TModel3d::TerrainSquare(int n) void TModel3d::TerrainRenderVBO(int n) { // renderowanie terenu z VBO glPushMatrix(); + ::glTranslated( -Global::pCameraPosition.x, -Global::pCameraPosition.y, -Global::pCameraPosition.z ); + // glTranslated(vPosition->x,vPosition->y,vPosition->z); // if (vAngle->y!=0.0) glRotated(vAngle->y,0.0,1.0,0.0); // if (vAngle->x!=0.0) glRotated(vAngle->x,1.0,0.0,0.0); diff --git a/Track.cpp b/Track.cpp index ddb669cc..d42a3c91 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1447,19 +1447,19 @@ void TTrack::Compile(GLuint tex) if( SwitchExtension->iRoads == 3 ) { // mogą być tylko 3 drogi zamiast 4 SwitchExtension->iPoints = - 5 + SwitchExtension->Segments[ 0 ]->RaSegCount() + - SwitchExtension->Segments[ 1 ]->RaSegCount() + - SwitchExtension->Segments[ 2 ]->RaSegCount(); + SwitchExtension->Segments[ 0 ]->RaSegCount() + + SwitchExtension->Segments[ 1 ]->RaSegCount() + + SwitchExtension->Segments[ 2 ]->RaSegCount(); } else { SwitchExtension->iPoints = - 5 + SwitchExtension->Segments[ 2 ]->RaSegCount() + - SwitchExtension->Segments[ 3 ]->RaSegCount() + - SwitchExtension->Segments[ 4 ]->RaSegCount() + - SwitchExtension->Segments[ 5 ]->RaSegCount(); // mogą być tylko 3 drogi + SwitchExtension->Segments[ 2 ]->RaSegCount() + + SwitchExtension->Segments[ 3 ]->RaSegCount() + + SwitchExtension->Segments[ 4 ]->RaSegCount() + + SwitchExtension->Segments[ 5 ]->RaSegCount(); } // tablica utworzona z zapasem, ale nie wypełniona współrzędnymi - SwitchExtension->vPoints = new vector3[SwitchExtension->iPoints]; + SwitchExtension->vPoints = new vector3[ SwitchExtension->iPoints + SwitchExtension->iRoads ]; } vector3 *b = SwitchExtension->bPoints ? @@ -1573,39 +1573,43 @@ void TTrack::Compile(GLuint tex) // renderowanie nawierzchni na końcu double sina0 = sin(a[0]), cosa0 = cos(a[0]); double u, v; - if (!SwitchExtension->bPoints) // jeśli tablica nie wypełniona - if (b) // ale jest wskaźnik do tablicy - może nie być? - { // coś się gubi w obliczeniach na wskaźnikach - // ustalenie liczby punktów, bo mogło wyjść inaczej niż - i = (int)(((size_t)(b)) - ((size_t)(SwitchExtension->vPoints))) / sizeof(vector3); - // policzone z góry - if (i > 0) - { // jeśli zostało to właśnie utworzone - if (SwitchExtension->iPoints > i) // jeśli wyszło mniej niż było miejsca - SwitchExtension->iPoints = i; // domknięcie wachlarza - else { - // jak tutaj wejdzie, to błąd jest - zrobić miejsce na powtórzenie pierwszego punktu na końcu - --SwitchExtension->iPoints; - } - SwitchExtension->vPoints[SwitchExtension->iPoints++] = SwitchExtension->vPoints[0]; - SwitchExtension->bPoints = true; // tablica punktów została wypełniona - } - } + if( ( false == SwitchExtension->bPoints ) // jeśli tablica nie wypełniona + && ( b != nullptr ) ) { + SwitchExtension->bPoints = true; // tablica punktów została wypełniona + } + if (TextureID1) // jeśli podana tekstura nawierzchni if ( (tex == TextureID1) || (tex == 0) ) // jeśli pasuje do grupy (tex) { if (!tex) GfxRenderer.Bind( TextureID1 ); glBegin(GL_TRIANGLE_FAN); // takie kółeczko będzie + // we start with a vertex in the middle... glNormal3f(0, 1, 0); glTexCoord2f(0.5, 0.5); //środek tekstury na środku skrzyżowania - glVertex3f(oxz.x, oxz.y, oxz.z); - for (i = SwitchExtension->iPoints - 1; i >= 0; --i) + glVertex3f( + oxz.x - origin.x, + oxz.y - origin.y, + oxz.z - origin.z ); + // ...and add one extra vertex to close the fan... + glNormal3f( 0, 1, 0 ); + // mapowanie we współrzędnych scenerii + u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x + origin.x ) / fTexLength; + v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z + origin.z ) / ( fTexRatio1 * fTexLength ); + glTexCoord2f( + cosa0 * u + sina0 * v + 0.5, + -sina0 * u + cosa0 * v + 0.5 ); + glVertex3f( + SwitchExtension->vPoints[ 0 ].x, + SwitchExtension->vPoints[ 0 ].y, + SwitchExtension->vPoints[ 0 ].z ); + + for ( i = SwitchExtension->iPoints + SwitchExtension->iRoads - 1; i >= 0; --i ) { glNormal3f(0, 1, 0); // mapowanie we współrzędnych scenerii - u = (SwitchExtension->vPoints[i].x - oxz.x) / fTexLength; - v = (SwitchExtension->vPoints[i].z - oxz.z) / (fTexRatio1 * fTexLength); + u = (SwitchExtension->vPoints[i].x - oxz.x + origin.x) / fTexLength; + v = (SwitchExtension->vPoints[i].z - oxz.z + origin.z) / (fTexRatio1 * fTexLength); glTexCoord2f( cosa0 * u + sina0 * v + 0.5, -sina0 * u + cosa0 * v + 0.5); diff --git a/Traction.cpp b/Traction.cpp index 6cf2842a..c7add93a 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -109,7 +109,7 @@ TTraction::~TTraction() glDeleteLists(uiDisplayList, 1); } -void TTraction::Optimize() +void TTraction::Optimize( Math3D::vector3 const &Origin ) { if (Global::bUseVBO) return; @@ -125,13 +125,13 @@ void TTraction::Optimize() // Przewoz jezdny 1 'Marcin glBegin(GL_LINE_STRIP); glVertex3f( - pPoint1.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, - pPoint1.y, - pPoint1.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); + pPoint1.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, + pPoint1.y - Origin.y, + pPoint1.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z); glVertex3f( - pPoint2.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, - pPoint2.y, - pPoint2.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); + pPoint2.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, + pPoint2.y - Origin.y, + pPoint2.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); glEnd(); // Nie wiem co 'Marcin Math3D::vector3 pt1, pt2, pt3, pt4, v1, v2; @@ -147,29 +147,39 @@ void TTraction::Optimize() if (Wires > 1) { glBegin(GL_LINE_STRIP); - glVertex3f(pPoint3.x, pPoint3.y, pPoint3.z); + glVertex3f( + pPoint3.x - Origin.x, + pPoint3.y - Origin.y, + pPoint3.z - Origin.z ); for (int i = 0; i < iNumSections - 1; ++i) { pt3 = pPoint3 + v1 * f; t = (1 - std::fabs(f - mid) * 2); if ((Wires < 4) || ((i != 0) && (i != iNumSections - 2))) glVertex3f( - pt3.x, - pt3.y - std::sqrt(t) * fHeightDifference, - pt3.z); + pt3.x - Origin.x, + pt3.y - std::sqrt(t) * fHeightDifference - Origin.y, + pt3.z - Origin.z ); f += step; } - glVertex3f(pPoint4.x, pPoint4.y, pPoint4.z); + glVertex3f( + pPoint4.x - Origin.x, + pPoint4.y - Origin.y, + pPoint4.z - Origin.z ); glEnd(); } // Drugi przewod jezdny 'Winger if (Wires > 2) { glBegin(GL_LINE_STRIP); - glVertex3f(pPoint1.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, pPoint1.y, - pPoint1.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); - glVertex3f(pPoint2.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, pPoint2.y, - pPoint2.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); + glVertex3f( + pPoint1.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, + pPoint1.y - Origin.y, + pPoint1.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); + glVertex3f( + pPoint2.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, + pPoint2.y - Origin.y, + pPoint2.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); glEnd(); } @@ -178,22 +188,29 @@ void TTraction::Optimize() if (Wires == 4) { glBegin(GL_LINE_STRIP); - glVertex3f(pPoint3.x, pPoint3.y - 0.65f * fHeightDifference, pPoint3.z); + glVertex3f( + pPoint3.x - Origin.x, + pPoint3.y - 0.65f * fHeightDifference - Origin.y, + pPoint3.z - Origin.z ); for (int i = 0; i < iNumSections - 1; ++i) { pt3 = pPoint3 + v1 * f; t = (1 - std::fabs(f - mid) * 2); glVertex3f( - pt3.x, + pt3.x - Origin.x, pt3.y - std::sqrt( t ) * fHeightDifference - ( ( ( i == 0 ) || ( i == iNumSections - 2 ) ) ? 0.25f * fHeightDifference : - 0.05 ), - pt3.z); + 0.05 ) + - Origin.y, + pt3.z - Origin.z ); f += step; } - glVertex3f(pPoint4.x, pPoint4.y - 0.65f * fHeightDifference, pPoint4.z); + glVertex3f( + pPoint4.x - Origin.x, + pPoint4.y - 0.65f * fHeightDifference - Origin.y, + pPoint4.z - Origin.z ); glEnd(); } @@ -214,35 +231,35 @@ void TTraction::Optimize() if ((i % 2) == 0) { glVertex3f( - pt3.x, - pt3.y - std::sqrt(t) * fHeightDifference - ((i == 0) || (i == iNumSections - 2) ? flo : flo1), - pt3.z); + pt3.x - Origin.x, + pt3.y - std::sqrt(t) * fHeightDifference - ((i == 0) || (i == iNumSections - 2) ? flo : flo1) - Origin.y, + pt3.z - Origin.z ); glVertex3f( - pt4.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, - pt4.y, - pt4.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); + pt4.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, + pt4.y - Origin.y, + pt4.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); } else { glVertex3f( - pt3.x, - pt3.y - std::sqrt(t) * fHeightDifference - ((i == 0) || (i == iNumSections - 2) ? flo : flo1), - pt3.z); + pt3.x - Origin.x, + pt3.y - std::sqrt(t) * fHeightDifference - ((i == 0) || (i == iNumSections - 2) ? flo : flo1) - Origin.y, + pt3.z - Origin.z ); glVertex3f( - pt4.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset, - pt4.y, - pt4.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset); + pt4.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, + pt4.y - Origin.y, + pt4.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); } if ((Wires == 4) && ((i == 1) || (i == iNumSections - 3))) { glVertex3f( - pt3.x, - pt3.y - std::sqrt(t) * fHeightDifference - 0.05, - pt3.z); + pt3.x - Origin.x, + pt3.y - std::sqrt(t) * fHeightDifference - 0.05 - Origin.y, + pt3.z - Origin.z ); glVertex3f( - pt3.x, - pt3.y - std::sqrt(t) * fHeightDifference, - pt3.z); + pt3.x - Origin.x, + pt3.y - std::sqrt(t) * fHeightDifference - Origin.y, + pt3.z - Origin.z ); } f += step; } @@ -258,7 +275,7 @@ void TTraction::InitCenter(vector3 Angles, vector3 pOrigin) fSquaredRadius= SquareMagnitude((pPoint2-pPoint1)*0.5f); } */ -void TTraction::RenderDL(float mgn) // McZapkie: mgn to odleglosc od obserwatora +void TTraction::RenderDL(float mgn, Math3D::vector3 const &Origin ) // McZapkie: mgn to odleglosc od obserwatora { // McZapkie: ustalanie przezroczystosci i koloru linii: if( Wires != 0 && !TestFlag( DamageFlag, 128 ) ) // rysuj jesli sa druty i nie zerwana @@ -281,7 +298,7 @@ void TTraction::RenderDL(float mgn) // McZapkie: mgn to odleglosc od obserwatora ::glColor4f( red, green, blue, linealpha ); // draw code if (!uiDisplayList) - Optimize(); // generowanie DL w miarę potrzeby + Optimize( Origin ); // generowanie DL w miarę potrzeby ::glCallList(uiDisplayList); // cleanup ::glLineWidth(1.0); diff --git a/Traction.h b/Traction.h index 5a68c359..62a635cb 100644 --- a/Traction.h +++ b/Traction.h @@ -56,7 +56,7 @@ class TTraction int iTries = 0; int PowerState{ 0 }; // type of incoming power, if any - void Optimize(); + void Optimize( Math3D::vector3 const &Origin ); TTraction(); ~TTraction(); @@ -66,7 +66,7 @@ class TTraction // { return TNode::Hit(x,z,hitPoint,hitDirection); }; // virtual bool Move(double dx, double dy, double dz) { return false; }; // virtual void SelectedRender(); - void RenderDL(float mgn); + void RenderDL(float mgn, Math3D::vector3 const &Origin ); int RaArrayPrepare(); int RaArrayFill( CVertNormTex *Vert, Math3D::vector3 const &Origin ); void RenderVBO(float mgn, int iPtr); diff --git a/renderer.cpp b/renderer.cpp index 0403e303..19ae8014 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -395,12 +395,12 @@ opengl_renderer::Render( TGround *Ground ) { if( Global::bUseVBO ) { // vbo render path Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].RenderVBO(); + ::glPopMatrix(); } else { // display list render path Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].RenderDL(); } - ::glPopMatrix(); if( ( tmp = Ground->FastGetSubRect( i + c, j + r ) ) != nullptr ) { if( tmp->iNodeCount ) { @@ -440,8 +440,12 @@ opengl_renderer::Render( TGroundNode *Node ) { switch (Node->iType) { // obiekty renderowane niezależnie od odległości case TP_SUBMODEL: + ::glPushMatrix(); + auto const originoffset = Node->pCenter - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); TSubModel::fSquareDist = 0; Render( Node->smTerrain ); + ::glPopMatrix(); return true; } @@ -494,7 +498,7 @@ opengl_renderer::Render( TGroundNode *Node ) { // additional setup for display lists if( ( Node->DisplayListID == 0 ) || ( Node->iVersion != Global::iReCompile ) ) { // Ra: wymuszenie rekompilacji - Node->Compile(); + Node->Compile(Node->m_rootposition); if( Global::bManageNodes ) ResourceManager::Register( Node ); }; @@ -506,9 +510,6 @@ opengl_renderer::Render( TGroundNode *Node ) { // wszelkie linie są rysowane na samym końcu if( Node->iNumPts ) { // setup - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // w zaleznosci od koloru swiatla ::glColor4ub( static_cast( std::floor( Node->Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ) ), @@ -521,14 +522,16 @@ opengl_renderer::Render( TGroundNode *Node ) { // render // TODO: unify the render code after generic buffers are in place if( Global::bUseVBO ) { + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumPts ); + ::glPopMatrix(); } else { ::glCallList( Node->DisplayListID ); } - // post-render cleanup - ::glPopMatrix(); return true; } else { @@ -542,12 +545,7 @@ opengl_renderer::Render( TGroundNode *Node ) { Node->DisplayListID == 0 ) ) { return false; } - // setup - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - ::glColor3ub( static_cast( Node->Diffuse[ 0 ] ), static_cast( Node->Diffuse[ 1 ] ), @@ -559,16 +557,17 @@ opengl_renderer::Render( TGroundNode *Node ) { // TODO: unify the render code after generic buffers are in place if( Global::bUseVBO ) { // vbo render path + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumVerts ); + ::glPopMatrix(); } else { // display list render path ::glCallList( Node->DisplayListID ); } - // post-render cleanup - ::glPopMatrix(); - return true; } } @@ -703,7 +702,8 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, Math3D: if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); - auto const result = Render( Model, Material, SquareMagnitude( Position / Global::ZoomFactor ) ); // position is effectively camera offset +// auto const result = Render( Model, Material, SquareMagnitude( Position / Global::ZoomFactor ) ); // position is effectively camera offset + auto const result = Render( Model, Material, SquareMagnitude( Position ) ); // position is effectively camera offset ::glPopMatrix(); @@ -978,7 +978,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { Node->hvTraction->RenderVBO( distancesquared, Node->iVboPtr ); } else { - Node->hvTraction->RenderDL( distancesquared ); + Node->hvTraction->RenderDL( distancesquared, Node->m_rootposition ); } // post-render cleanup ::glPopMatrix(); @@ -1010,7 +1010,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // additional setup for display lists if( ( Node->DisplayListID == 0 ) || ( Node->iVersion != Global::iReCompile ) ) { // Ra: wymuszenie rekompilacji - Node->Compile(); + Node->Compile(Node->m_rootposition); if( Global::bManageNodes ) ResourceManager::Register( Node ); }; @@ -1218,7 +1218,8 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, M if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); - auto const result = Render_Alpha( Model, Material, SquareMagnitude( Position / Global::ZoomFactor ) ); // position is effectively camera offset +// auto const result = Render_Alpha( Model, Material, SquareMagnitude( Position / Global::ZoomFactor ) ); // position is effectively camera offset + auto const result = Render_Alpha( Model, Material, SquareMagnitude( Position ) ); // position is effectively camera offset ::glPopMatrix(); diff --git a/version.h b/version.h index 12dfa00e..7667fb27 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 524 +#define VERSION_MINOR 525 #define VERSION_REVISION 0 From d2a9f7080e683cfb44a6f7d4ce86a27664458a1a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 29 May 2017 00:41:09 +0200 Subject: [PATCH 116/426] ground cells render code moved to renderer and partially unified; fix for slipping wheels calculation logic --- Ground.cpp | 147 ---------------------------------- Ground.h | 13 +--- McZapkie/Mover.cpp | 3 +- openglmatrixstack.h | 6 +- renderer.cpp | 186 +++++++++++++++++++++++++++++++++++--------- renderer.h | 6 ++ 6 files changed, 166 insertions(+), 195 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index cad91fec..4dfbaa9f 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -840,84 +840,6 @@ void TSubRect::Release() CMesh::Clear(); // usuwanie buforów }; -void TSubRect::RenderDL() -{ // renderowanie nieprzezroczystych (DL) - TGroundNode *node; - RaAnimate(); // przeliczenia animacji torów w sektorze -/* - LoadNodes(); // czemu tutaj? -*/ - for( node = nRenderRect; node; node = node->nNext3 ) { - GfxRenderer.Render( node ); // nieprzezroczyste obiekty terenu - } - for( node = nRender; node; node = node->nNext3 ) - GfxRenderer.Render( node ); // nieprzezroczyste obiekty (oprócz pojazdów) - for (node = nRenderMixed; node; node = node->nNext3) - GfxRenderer.Render( node ); // nieprzezroczyste z mieszanych modeli - for (int j = 0; j < iTracks; ++j) - tTracks[j]->RenderDyn(); // nieprzezroczyste fragmenty pojazdów na torach -#ifdef EU07_SCENERY_EDITOR - // memcells - if( DebugModeFlag ) { - for( auto const memcell : m_memcells ) { - memcell->RenderDL(); - } - } -#endif -}; - -void TSubRect::RenderAlphaDL() -{ // renderowanie przezroczystych modeli oraz pojazdów (DL) - TGroundNode *node; - for( node = nRenderMixed; node; node = node->nNext3 ) - GfxRenderer.Render_Alpha( node ); // przezroczyste z mieszanych modeli - for( node = nRenderAlpha; node; node = node->nNext3 ) - GfxRenderer.Render_Alpha( node ); // przezroczyste modele - for (int j = 0; j < iTracks; ++j) - tTracks[j]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach -}; - -void TSubRect::RenderVBO() -{ // renderowanie nieprzezroczystych (VBO) - TGroundNode *node; - RaAnimate(); // przeliczenia animacji torów w sektorze -/* - LoadNodes(); // czemu tutaj? -*/ - if (StartVBO()) - { - for( node = nRenderRect; node; node = node->nNext3 ) - if( node->iVboPtr >= 0 ) - GfxRenderer.Render( node ); // nieprzezroczyste obiekty terenu - EndVBO(); - } - for( node = nRender; node; node = node->nNext3 ) - GfxRenderer.Render( node ); // nieprzezroczyste obiekty (oprócz pojazdów) - for (node = nRenderMixed; node; node = node->nNext3) - GfxRenderer.Render( node ); // nieprzezroczyste z mieszanych modeli - for (int j = 0; j < iTracks; ++j) - tTracks[j]->RenderDyn(); // nieprzezroczyste fragmenty pojazdów na torach -#ifdef EU07_SCENERY_EDITOR - // memcells - if( DebugModeFlag ) { - for( auto const memcell : m_memcells ) { - memcell->RenderVBO(); - } - } -#endif -}; - -void TSubRect::RenderAlphaVBO() -{ // renderowanie przezroczystych modeli oraz pojazdów (VBO) - TGroundNode *node; - for( node = nRenderMixed; node; node = node->nNext3 ) - GfxRenderer.Render_Alpha( node ); // przezroczyste z mieszanych modeli - for( node = nRenderAlpha; node; node = node->nNext3 ) - GfxRenderer.Render_Alpha( node ); // przezroczyste modele - for (int j = 0; j < iTracks; ++j) - tTracks[j]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach -}; - void TSubRect::RenderSounds() { // aktualizacja dźwięków w pojazdach sektora (sektor może nie być wyświetlany) for (int j = 0; j < iTracks; ++j) @@ -955,75 +877,6 @@ TGroundRect::Init() { } }; -void TGroundRect::RenderDL() -{ // renderowanie kwadratu kilometrowego (DL), jeśli jeszcze nie zrobione -#ifdef EU07_USE_OLD_RENDERCODE - if (iLastDisplay != iFrameNumber) - { // tylko jezeli dany kwadrat nie był jeszcze renderowany - // for (TGroundNode* node=pRender;node;node=node->pNext3) - // node->Render(); //nieprzezroczyste trójkąty kwadratu kilometrowego - if (nRender) - { //łączenie trójkątów w jedną listę - trochę wioska - if (!nRender->DisplayListID || (nRender->iVersion != Global::iReCompile)) - { // jeżeli nie skompilowany, kompilujemy wszystkie trójkąty w jeden - nRender->fSquareRadius = 5000.0 * 5000.0; // aby agregat nigdy nie znikał - nRender->DisplayListID = glGenLists(1); - glNewList(nRender->DisplayListID, GL_COMPILE); - nRender->iVersion = Global::iReCompile; // aktualna wersja siatek - auto const origin = Math3D::vector3( m_area.center.x, m_area.center.y, m_area.center.z ); - for (TGroundNode *node = nRender; node; node = node->nNext3) // następny tej grupy - node->Compile(origin, true); - glEndList(); - } - GfxRenderer.Render( nRender ); // nieprzezroczyste trójkąty kwadratu kilometrowego - } - // submodels geometry is world-centric, so at least for the time being we need to pop the stack early - ::glPopMatrix(); - if( nRootMesh ) { - GfxRenderer.Render( nRootMesh ); - } - iLastDisplay = iFrameNumber; // drugi raz nie potrzeba - } - else { - ::glPopMatrix(); - } -#else - if( iLastDisplay != iFrameNumber ) { // tylko jezeli dany kwadrat nie był jeszcze renderowany - LoadNodes(); // ewentualne tworzenie siatek - if( nRenderRect ) { - for( TGroundNode *node = nRenderRect; node; node = node->nNext3 ) // następny tej grupy - GfxRenderer.Render( node ); // nieprzezroczyste trójkąty kwadratu kilometrowego - } - if( nRootMesh ) - GfxRenderer.Render( nRootMesh ); - iLastDisplay = iFrameNumber; - } -#endif -}; - -void TGroundRect::RenderVBO() -{ // renderowanie kwadratu kilometrowego (VBO), jeśli jeszcze nie zrobione - if (iLastDisplay != iFrameNumber) - { // tylko jezeli dany kwadrat nie był jeszcze renderowany - LoadNodes(); // ewentualne tworzenie siatek - if ( nRenderRect && StartVBO()) - { - for (TGroundNode *node = nRenderRect; node; node = node->nNext3) // następny tej grupy -#ifdef EU07_USE_OLD_RENDERCODE - node->RaRenderVBO(); // nieprzezroczyste trójkąty kwadratu kilometrowego -#else - GfxRenderer.Render( node ); // nieprzezroczyste trójkąty kwadratu kilometrowego -#endif - EndVBO(); - iLastDisplay = iFrameNumber; - } - if (nTerrain) - nTerrain->smTerrain->iVisible = iFrameNumber; // ma się wyświetlić w tej ramce - } -}; - -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- //--------------------------------------------------------------------------- std::vector TempVerts; diff --git a/Ground.h b/Ground.h index 4ee33f16..dd408880 100644 --- a/Ground.h +++ b/Ground.h @@ -192,8 +192,8 @@ class TSubRect : public Resource, public CMesh TGroundNode *nRootMesh = nullptr; // obiekty renderujące wg tekstury (wtórne, lista po nNext2) TGroundNode *nMeshed = nullptr; // lista obiektów dla których istnieją obiekty renderujące grupowo public: - TGroundNode * nRootNode = nullptr; // wszystkie obiekty w sektorze, z wyjątkiem renderujących i pojazdów (nNext2) - TGroundNode * nRenderHidden = nullptr; // lista obiektów niewidocznych, "renderowanych" również z tyłu (nNext3) + TGroundNode *nRootNode = nullptr; // wszystkie obiekty w sektorze, z wyjątkiem renderujących i pojazdów (nNext2) + TGroundNode *nRenderHidden = nullptr; // lista obiektów niewidocznych, "renderowanych" również z tyłu (nNext3) TGroundNode *nRenderRect = nullptr; // z poziomu sektora - nieprzezroczyste (nNext3) TGroundNode *nRenderRectAlpha = nullptr; // z poziomu sektora - przezroczyste (nNext3) TGroundNode *nRenderWires = nullptr; // z poziomu sektora - druty i inne linie (nNext3) @@ -217,11 +217,6 @@ class TSubRect : public Resource, public CMesh bool StartVBO(); // ustwienie VBO sektora dla (nRenderRect), (nRenderRectAlpha) i (nRenderWires) bool RaTrackAnimAdd(TTrack *t); // zgłoszenie toru do animacji void RaAnimate(); // przeliczenie animacji torów - void RenderDL(); // renderowanie nieprzezroczystych w Display Lists - void RenderAlphaDL(); // renderowanie przezroczystych w Display Lists - // (McZapkie-131202) - void RenderVBO(); // renderowanie nieprzezroczystych z własnego VBO - void RenderAlphaVBO(); // renderowanie przezroczystych z (własnego) VBO void RenderSounds(); // dźwięki pojazdów z niewidocznych sektorów }; @@ -238,6 +233,8 @@ class TGroundRect : public TSubRect { // kwadrat kilometrowy // obiekty o niewielkiej ilości wierzchołków będą renderowane stąd // Ra: 2012-02 doszły submodele terenu + friend class opengl_renderer; + private: int iLastDisplay; // numer klatki w której był ostatnio wyświetlany TSubRect *pSubRects{ nullptr }; @@ -264,8 +261,6 @@ class TGroundRect : public TSubRect for (int i = iNumSubRects * iNumSubRects - 1; i >= 0; --i) pSubRects[i].Sort(); // optymalizacja obiektów w sektorach }; - void RenderDL(); - void RenderVBO(); }; class TGround diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 74a80001..b707b944 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3685,7 +3685,8 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) else FTrain = 0; Fb = BrakeForce(RunningTrack); - if( std::max( std::abs( FTrain ), Fb ) > TotalMassxg * Adhesive( RunningTrack.friction ) ) // poslizg + if( ( Vel > 0.001 ) // crude trap, to prevent braked stationary vehicles from passing fb > mass * adhesive test + && ( std::max( std::abs( FTrain ), Fb ) > TotalMassxg * Adhesive( RunningTrack.friction ) ) ) // poslizg { SlippingWheels = true; } diff --git a/openglmatrixstack.h b/openglmatrixstack.h index 890843d3..85561d0f 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -82,9 +82,9 @@ typedef std::vector openglstack_array; public: // constructors: opengl_matrices() { - m_stacks.emplace_back(); // projection - m_stacks.emplace_back(); // modelview - } + m_stacks.emplace_back(); // projection + m_stacks.emplace_back(); // modelview + } // methods: void diff --git a/renderer.cpp b/renderer.cpp index 19ae8014..93789019 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -322,9 +322,9 @@ opengl_renderer::Render( TGround *Ground ) { for( int column = originx; column <= originx + segmentcount; ++column ) { for( int row = originz; row <= originz + segmentcount; ++row ) { - auto &rectangle = Ground->Rects[ column ][ row ]; - if( m_camera.visible( rectangle.m_area ) ) { - rectangle.RenderDL(); + auto *rectangle = &Ground->Rects[ column ][ row ]; + if( m_camera.visible( rectangle->m_area ) ) { + Render( rectangle ); } } } @@ -386,21 +386,7 @@ opengl_renderer::Render( TGround *Ground ) { continue; // pomijanie sektorów poza kątem patrzenia } // kwadrat kilometrowy nie zawsze, bo szkoda FPS - // TODO: unify all math objects - ::glPushMatrix(); - auto const &cellorigin = Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].m_area.center; - auto const originoffset = Math3D::vector3( cellorigin.x, cellorigin.y, cellorigin.z ) - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - if( Global::bUseVBO ) { - // vbo render path - Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].RenderVBO(); - ::glPopMatrix(); - } - else { - // display list render path - Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ].RenderDL(); - } + Render( &Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ] ); if( ( tmp = Ground->FastGetSubRect( i + c, j + r ) ) != nullptr ) { if( tmp->iNodeCount ) { @@ -418,20 +404,143 @@ opengl_renderer::Render( TGround *Ground ) { } // renderowanie nieprzezroczystych for( i = 0; i < Ground->iRendered; ++i ) { - - if( Global::bUseVBO ) { - // vbo render path - Ground->pRendered[ i ]->RenderVBO(); - } - else { - // display list render path - Ground->pRendered[ i ]->RenderDL(); - } + Render( Ground->pRendered[ i ] ); } // regular render takes care of all solid geometry present in the scene, thus we can launch alpha parts render here return Render_Alpha( Ground ); } +// TODO: unify ground render code, until then old version is in place +#define EU07_USE_OLD_RENDERCODE +bool +opengl_renderer::Render( TGroundRect *Groundcell ) { + + ::glPushMatrix(); + auto const &cellorigin = Groundcell->m_area.center; + // TODO: unify all math objects + auto const originoffset = Math3D::vector3( cellorigin.x, cellorigin.y, cellorigin.z ) - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + bool result{ false }; // will be true if we do any rendering + + // TODO: unify render paths + if( Global::bUseVBO ) { + + if ( Groundcell->iLastDisplay != Groundcell->iFrameNumber) + { // tylko jezeli dany kwadrat nie był jeszcze renderowany + Groundcell->LoadNodes(); // ewentualne tworzenie siatek + if ( Groundcell->nRenderRect && Groundcell->StartVBO()) + { + for (TGroundNode *node = Groundcell->nRenderRect; node; node = node->nNext3) // następny tej grupy +#ifdef EU07_USE_OLD_RENDERCODE + node->RaRenderVBO(); // nieprzezroczyste trójkąty kwadratu kilometrowego +#else + Render( node ); // nieprzezroczyste trójkąty kwadratu kilometrowego +#endif + Groundcell->EndVBO(); + Groundcell->iLastDisplay = Groundcell->iFrameNumber; + result = true; + } + if ( Groundcell->nTerrain) + Groundcell->nTerrain->smTerrain->iVisible = Groundcell->iFrameNumber; // ma się wyświetlić w tej ramce + } + ::glPopMatrix(); + } + else { +#ifdef EU07_USE_OLD_RENDERCODE + if (Groundcell->iLastDisplay != Groundcell->iFrameNumber) + { // tylko jezeli dany kwadrat nie był jeszcze renderowany + // for (TGroundNode* node=pRender;node;node=node->pNext3) + // node->Render(); //nieprzezroczyste trójkąty kwadratu kilometrowego + if ( Groundcell->nRender) + { //łączenie trójkątów w jedną listę - trochę wioska + if (!Groundcell->nRender->DisplayListID || ( Groundcell->nRender->iVersion != Global::iReCompile)) + { // jeżeli nie skompilowany, kompilujemy wszystkie trójkąty w jeden + Groundcell->nRender->fSquareRadius = 5000.0 * 5000.0; // aby agregat nigdy nie znikał + Groundcell->nRender->DisplayListID = glGenLists(1); + glNewList( Groundcell->nRender->DisplayListID, GL_COMPILE); + Groundcell->nRender->iVersion = Global::iReCompile; // aktualna wersja siatek + auto const origin = Math3D::vector3( Groundcell->m_area.center.x, Groundcell->m_area.center.y, Groundcell->m_area.center.z ); + for (TGroundNode *node = Groundcell->nRender; node; node = node->nNext3) // następny tej grupy + node->Compile(origin, true); + glEndList(); + } + Render( Groundcell->nRender ); // nieprzezroczyste trójkąty kwadratu kilometrowego + } + // submodels geometry is world-centric, so at least for the time being we need to pop the stack early + ::glPopMatrix(); + + if( Groundcell->nRootMesh ) { + Render( Groundcell->nRootMesh ); + } + Groundcell->iLastDisplay = Groundcell->iFrameNumber; // drugi raz nie potrzeba + result = true; + } + else { + ::glPopMatrix(); + } +#else + if( iLastDisplay != iFrameNumber ) { // tylko jezeli dany kwadrat nie był jeszcze renderowany + LoadNodes(); // ewentualne tworzenie siatek + if( nRenderRect ) { + for( TGroundNode *node = nRenderRect; node; node = node->nNext3 ) // następny tej grupy + Render( node ); // nieprzezroczyste trójkąty kwadratu kilometrowego + } + if( nRootMesh ) + Render( nRootMesh ); + iLastDisplay = iFrameNumber; + } +#endif + } + + return result; +} +#undef EU07_USE_OLD_RENDERCODE + +bool +opengl_renderer::Render( TSubRect *Groundsubcell ) { + + Groundsubcell->RaAnimate(); // przeliczenia animacji torów w sektorze + + TGroundNode *node; + // nieprzezroczyste obiekty terenu + if( Global::bUseVBO ) { + // vbo render path + if( Groundsubcell->StartVBO() ) { + for( node = Groundsubcell->nRenderRect; node; node = node->nNext3 ) { + if( node->iVboPtr >= 0 ) { + Render( node ); + } + } + Groundsubcell->EndVBO(); + } + } + else { + // display list render path + for( node = Groundsubcell->nRenderRect; node; node = node->nNext3 ) { + Render( node ); // nieprzezroczyste obiekty terenu + } + } + // nieprzezroczyste obiekty (oprócz pojazdów) + for( node = Groundsubcell->nRender; node; node = node->nNext3 ) + Render( node ); + // nieprzezroczyste z mieszanych modeli + for( node = Groundsubcell->nRenderMixed; node; node = node->nNext3 ) + Render( node ); + // nieprzezroczyste fragmenty pojazdów na torach + for( int j = 0; j < Groundsubcell->iTracks; ++j ) + Groundsubcell->tTracks[ j ]->RenderDyn(); +#ifdef EU07_SCENERY_EDITOR + // memcells + if( DebugModeFlag ) { + for( auto const memcell : m_memcells ) { + memcell->RenderDL(); + } + } +#endif + return true; +} + bool opengl_renderer::Render( TGroundNode *Node ) { @@ -901,14 +1010,7 @@ opengl_renderer::Render_Alpha( TGround *Ground ) { } for( int i = Ground->iRendered - 1; i >= 0; --i ) // od najdalszych { // renderowanie przezroczystych modeli oraz pojazdów - if( Global::bUseVBO ) { - // vbo render path - Ground->pRendered[ i ]->RenderAlphaVBO(); - } - else { - // display list render path - Ground->pRendered[ i ]->RenderAlphaDL(); - } + Render_Alpha( Ground->pRendered[ i ] ); } ::glDisable( GL_LIGHTING ); // linie nie powinny świecić @@ -936,6 +1038,20 @@ opengl_renderer::Render_Alpha( TGround *Ground ) { return true; } +bool +opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { + + TGroundNode *node; + for( node = Groundsubcell->nRenderMixed; node; node = node->nNext3 ) + Render_Alpha( node ); // przezroczyste z mieszanych modeli + for( node = Groundsubcell->nRenderAlpha; node; node = node->nNext3 ) + Render_Alpha( node ); // przezroczyste modele + for( int j = 0; j < Groundsubcell->iTracks; ++j ) + Groundsubcell->tTracks[ j ]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach + + return true; +} + // NOTE: legacy render system switch #define _PROBLEND diff --git a/renderer.h b/renderer.h index 1b478d3c..3cce3b05 100644 --- a/renderer.h +++ b/renderer.h @@ -124,6 +124,10 @@ public: Render( world_environment *Environment ); bool Render( TGround *Ground ); + bool + Render( TGroundRect *Groundcell ); + bool + Render( TSubRect *Groundsubcell ); bool Render( TGroundNode *Node ); bool @@ -138,6 +142,8 @@ public: Render( TMemCell *Memcell ); bool Render_Alpha( TGround *Ground ); + bool + Render_Alpha( TSubRect *Groundsubcell ); bool Render_Alpha( TGroundNode *Node ); bool From f48b61c65038c3a0a0dcf0892fff6bc7a8cee44c Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 30 May 2017 19:21:40 +0200 Subject: [PATCH 117/426] early implementation of geometry bank, partial replacement of math classes with glm --- Float3d.h | 7 + Ground.cpp | 18 +-- Model3d.cpp | 288 ++++++++++++++++++++++++---------------- Model3d.h | 152 +++------------------ Texture.h | 2 + VBO.cpp | 12 +- VBO.h | 22 +-- maszyna.vcxproj.filters | 6 + openglgeometrybank.cpp | 218 ++++++++++++++++++++++++++++++ openglgeometrybank.h | 122 +++++++++++++++++ renderer.cpp | 22 ++- 11 files changed, 592 insertions(+), 277 deletions(-) create mode 100644 openglgeometrybank.cpp create mode 100644 openglgeometrybank.h diff --git a/Float3d.h b/Float3d.h index 6c309357..f7217a11 100644 --- a/Float3d.h +++ b/Float3d.h @@ -263,6 +263,13 @@ inline float3 operator*(const float4x4 &m, const float3 &v) v.x * m[0][2] + v.y * m[1][2] + v.z * m[2][2] + m[3][2]); } +inline glm::vec3 operator*( const float4x4 &m, const glm::vec3 &v ) { // mnożenie wektora przez macierz + return glm::vec3( + v.x * m[ 0 ][ 0 ] + v.y * m[ 1 ][ 0 ] + v.z * m[ 2 ][ 0 ] + m[ 3 ][ 0 ], + v.x * m[ 0 ][ 1 ] + v.y * m[ 1 ][ 1 ] + v.z * m[ 2 ][ 1 ] + m[ 3 ][ 1 ], + v.x * m[ 0 ][ 2 ] + v.y * m[ 1 ][ 2 ] + v.z * m[ 2 ][ 2 ] + m[ 3 ][ 2 ] ); +} + inline float4x4 &float4x4::Rotation(double angle, float3 axis) { double c = cos(angle); diff --git a/Ground.cpp b/Ground.cpp index 4dfbaa9f..7f18da04 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -4348,7 +4348,7 @@ void TGround::TerrainWrite() // int ver=0; //całkowita ilość wierzchołków int i, j, k; // indeksy w pętli TGroundNode *Current; - float8 *ver; // trójkąty + basic_vertex *ver; // trójkąty TSubModel::iInstance = 0; // pozycja w tabeli wierzchołków liczona narastająco for (i = 0; i < iNumRects; ++i) // pętla po wszystkich kwadratach kilometrowych for (j = 0; j < iNumRects; ++j) @@ -4395,14 +4395,14 @@ void TGround::TerrainWrite() Current->iVboPtr = -1; // bo to było tymczasowo używane for (k = 0; k < Current->iNumVerts; ++k) { // przepisanie współrzędnych - ver[k].Point.x = Current->Vertices[k].Point.x; - ver[k].Point.y = Current->Vertices[k].Point.y; - ver[k].Point.z = Current->Vertices[k].Point.z; - ver[k].Normal.x = Current->Vertices[k].Normal.x; - ver[k].Normal.y = Current->Vertices[k].Normal.y; - ver[k].Normal.z = Current->Vertices[k].Normal.z; - ver[k].tu = Current->Vertices[k].tu; - ver[k].tv = Current->Vertices[k].tv; + ver[k].position.x = Current->Vertices[k].Point.x; + ver[k].position.y = Current->Vertices[k].Point.y; + ver[k].position.z = Current->Vertices[k].Point.z; + ver[k].normal.x = Current->Vertices[k].Normal.x; + ver[k].normal.y = Current->Vertices[k].Normal.y; + ver[k].normal.z = Current->Vertices[k].Normal.z; + ver[k].texture.s = Current->Vertices[k].tu; + ver[k].texture.t = Current->Vertices[k].tv; } break; case GL_TRIANGLE_STRIP: // na razie nie, bo trzeba przerabiać na pojedyncze diff --git a/Model3d.cpp b/Model3d.cpp index 7eb1493f..2d9ebfdb 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -113,11 +113,6 @@ TSubModel::~TSubModel() delete fMatrix; // własny transform trzeba usunąć (zawsze jeden) delete[] Vertices; } - /* - else - {//wczytano z pliku binarnego (nie jest właścicielem tablic) - } - */ delete[] smLetter; // używany tylko roboczo dla TP_TEXT, do przyspieszenia // wyświetlania }; @@ -141,23 +136,23 @@ void TSubModel::NameSet(const char *n) // int TSubModel::SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 // *pt,GLVERTEX // *Vertices) -int TSubModel::SeekFaceNormal(unsigned int *Masks, int f, unsigned int dwMask, float3 *pt, - float8 *Vertices) +int TSubModel::SeekFaceNormal(unsigned int *Masks, int f, unsigned int dwMask, glm::vec3 *pt, + basic_vertex *Vertices) { // szukanie punktu stycznego // do (pt), zwraca numer // wierzchołka, a nie trójkąta int iNumFaces = iNumVerts / 3; // bo maska powierzchni jest jedna na trójkąt // GLVERTEX *p; //roboczy wskaźnik - float8 *p; // roboczy wskaźnik + basic_vertex *p; // roboczy wskaźnik for (int i = f; i < iNumFaces; ++i) // pętla po trójkątach, od trójkąta (f) if (Masks[i] & dwMask) // jeśli wspólna maska powierzchni { p = Vertices + 3 * i; - if (p->Point == *pt) + if (p->position == *pt) return 3 * i; - if ((++p)->Point == *pt) + if ((++p)->position == *pt) return 3 * i + 1; - if ((++p)->Point == *pt) + if ((++p)->position == *pt) return 3 * i + 2; } return -1; // nie znaleziono stycznego wierzchołka @@ -446,7 +441,7 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) // Vertices=new GLVERTEX[iNumVerts]; if (iNumVerts) { - Vertices = new float8[iNumVerts]; + Vertices = new basic_vertex[iNumVerts]; iNumFaces = iNumVerts / 3; sg = new unsigned int[iNumFaces]; // maski powierzchni: 0 oznacza brak // użredniania wektorów normalnych @@ -467,21 +462,28 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) // wektorów normalnych } parser.getTokens(3, false); - parser >> Vertices[i].Point.x >> Vertices[i].Point.y >> Vertices[i].Point.z; + parser + >> Vertices[i].position.x + >> Vertices[i].position.y + >> Vertices[i].position.z; if (maska == -1) { // jeśli wektory normalne podane jawnie parser.getTokens(3, false); - parser >> Vertices[i].Normal.x >> Vertices[i].Normal.y >> - Vertices[i].Normal.z; + parser + >> Vertices[i].normal.x + >> Vertices[i].normal.y + >> Vertices[i].normal.z; wsp[i] = i; // wektory normalne "są już policzone" } parser.getTokens(2, false); - parser >> Vertices[i].tu >> Vertices[i].tv; + parser + >> Vertices[i].texture.s + >> Vertices[i].texture.t; if (i % 3 == 2) // jeżeli wczytano 3 punkty { - if (Vertices[i].Point == Vertices[i - 1].Point || - Vertices[i - 1].Point == Vertices[i - 2].Point || - Vertices[i - 2].Point == Vertices[i].Point) + if (Vertices[i].position == Vertices[i - 1].position + || Vertices[i - 1].position == Vertices[i - 2].position + || Vertices[i - 2].position == Vertices[i].position) { // jeżeli punkty się nakładają na siebie --iNumFaces; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki @@ -491,10 +493,9 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) } if (i > 0) // jeśli pierwszy trójkąt będzie zdegenerowany, to // zostanie usunięty i nie ma co sprawdzać - if (((Vertices[i].Point - Vertices[i - 1].Point).Length() > 1000.0) || - ((Vertices[i - 1].Point - Vertices[i - 2].Point).Length() > - 1000.0) || - ((Vertices[i - 2].Point - Vertices[i].Point).Length() > 1000.0)) + if ((glm::length(Vertices[i].position - Vertices[i - 1].position) > 1000.0) + || (glm::length(Vertices[i - 1].position - Vertices[i - 2].position) > 1000.0) + || (glm::length(Vertices[i - 2].position - Vertices[i].position) > 1000.0)) { // jeżeli są dalej niż 2km od siebie //Ra 15-01: // obiekt wstawiany nie powinien być większy niż // 300m (trójkąty terenu w E3D mogą mieć 1.5km) @@ -507,26 +508,27 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) } } int i; // indeks dla trójkątów - float3 *n = new float3[iNumFaces]; // tablica wektorów normalnych dla trójkątów - for (i = 0; i < iNumFaces; i++) // pętla po trójkątach - będzie + glm::vec3 *n = new glm::vec3[iNumFaces]; // tablica wektorów normalnych dla trójkątów + for (i = 0; i < iNumFaces; ++i) // pętla po trójkątach - będzie // szybciej, jak wstępnie przeliczymy // normalne trójkątów - n[i] = SafeNormalize( - CrossProduct(Vertices[i * 3].Point - Vertices[i * 3 + 1].Point, - Vertices[i * 3].Point - Vertices[i * 3 + 2].Point)); + n[i] = glm::normalize( + glm::cross( + Vertices[i * 3].position - Vertices[i * 3 + 1].position, + Vertices[i * 3].position - Vertices[i * 3 + 2].position)); int v; // indeks dla wierzchołków int f; // numer trójkąta stycznego - float3 norm; // roboczy wektor normalny - for (v = 0; v < iNumVerts; v++) + glm::vec3 norm; // roboczy wektor normalny + for (v = 0; v < iNumVerts; ++v) { // pętla po wierzchołkach trójkątów if (wsp[v] >= 0) // jeśli już był liczony wektor normalny z użyciem // tego wierzchołka - Vertices[v].Normal = - Vertices[wsp[v]].Normal; // to wystarczy skopiować policzony wcześniej + Vertices[v].normal = + Vertices[wsp[v]].normal; // to wystarczy skopiować policzony wcześniej else { // inaczej musimy dopiero policzyć i = v / 3; // numer trójkąta - norm = float3(0, 0, 0); // liczenie zaczynamy od zera + norm = glm::vec3(); // liczenie zaczynamy od zera f = v; // zaczynamy dodawanie wektorów normalnych od własnego while (f >= 0) { // sumowanie z wektorem normalnym sąsiada (włącznie @@ -534,13 +536,13 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) wsp[f] = v; // informacja, że w tym wierzchołku jest już policzony // wektor normalny norm += n[f / 3]; - f = SeekFaceNormal(sg, f / 3 + 1, sg[i], &Vertices[v].Point, + f = SeekFaceNormal(sg, f / 3 + 1, sg[i], &Vertices[v].position, Vertices); // i szukanie od kolejnego trójkąta } // Ra 15-01: należało by jeszcze uwzględnić skalowanie wprowadzane // przez transformy, aby normalne po przeskalowaniu były jednostkowe - Vertices[v].Normal = - SafeNormalize(norm); // przepisanie do wierzchołka trójkąta + Vertices[v].normal = + glm::normalize(norm); // przepisanie do wierzchołka trójkąta } } delete[] wsp; @@ -561,21 +563,24 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) parser.getTokens(2, false); parser >> discard >> iNumVerts; // Vertices=new GLVERTEX[iNumVerts]; - Vertices = new float8[iNumVerts]; + Vertices = new basic_vertex[iNumVerts]; int i, j; - for (i = 0; i < iNumVerts; i++) + for (i = 0; i < iNumVerts; ++i) { if (i % 3 == 0) { parser.ignoreToken(); // maska powierzchni trójkąta } parser.getTokens(5, false); - parser >> Vertices[i].Point.x >> Vertices[i].Point.y >> Vertices[i].Point.z >> - j // zakodowany kolor + parser + >> Vertices[i].position.x + >> Vertices[i].position.y + >> Vertices[i].position.z + >> j // zakodowany kolor >> discard; - Vertices[i].Normal.x = ((j) & 0xFF) / 255.0; // R - Vertices[i].Normal.y = ((j >> 8) & 0xFF) / 255.0; // G - Vertices[i].Normal.z = ((j >> 16) & 0xFF) / 255.0; // B + Vertices[i].normal.x = ((j) & 0xFF) / 255.0; // R + Vertices[i].normal.y = ((j >> 8) & 0xFF) / 255.0; // G + Vertices[i].normal.z = ((j >> 16) & 0xFF) / 255.0; // B } } // Visible=true; //się potem wyłączy w razie potrzeby @@ -605,11 +610,9 @@ int TSubModel::TriangleAdd(TModel3d *m, texture_manager::size_type tex, int tri) s = new TSubModel(); m->AddTo(this, s); } - // s->asTexture=AnsiString(TTexturesManager::GetName(tex).c_str()); s->TextureNameSet(GfxRenderer.Texture(tex).name.c_str()); s->TextureID = tex; s->eType = GL_TRIANGLES; - // iAnimOwner=0; //roboczy wskaźnik na wierzchołek } if (s->iNumVerts < 0) s->iNumVerts = tri; // bo na początku jest -1, czyli że nie wiadomo @@ -618,7 +621,7 @@ int TSubModel::TriangleAdd(TModel3d *m, texture_manager::size_type tex, int tri) return s->iNumVerts - tri; // zwraca pozycję tych trójkątów w submodelu }; -float8 *TSubModel::TrianglePtr(int tex, int pos, int *la, int *ld, int *ls) +basic_vertex *TSubModel::TrianglePtr(int tex, int pos, int *la, int *ld, int *ls) { // zwraca wskaźnik do wypełnienia tabeli wierzchołków, używane // przy tworzeniu E3D terenu TSubModel *s = this; @@ -633,9 +636,7 @@ float8 *TSubModel::TrianglePtr(int tex, int pos, int *la, int *ld, int *ls) return NULL; // coś nie tak poszło if (!s->Vertices) { // utworznie tabeli trójkątów - s->Vertices = new float8[s->iNumVerts]; - // iVboPtr=pos; //pozycja submodelu w tabeli wierzchołków - // pos+=iNumVerts; //rezerwacja miejsca w tabeli + s->Vertices = new basic_vertex[s->iNumVerts]; s->iVboPtr = iInstance; // pozycja submodelu w tabeli wierzchołków iInstance += s->iNumVerts; // pozycja dla następnego } @@ -648,7 +649,6 @@ void TSubModel::DisplayLists() // każdego submodelu if (Global::bUseVBO) return; // Ra: przy VBO to się nie przyda - // iFlags|=0x4000; //wyłączenie przeliczania wierzchołków, bo nie są zachowane if (eType < TP_ROTATOR) { if (iNumVerts > 0) @@ -670,9 +670,9 @@ void TSubModel::DisplayLists() glTexCoord2f(Vertices[i].tu,Vertices[i].tv); glVertex3dv(&Vertices[i].Point.x); */ - glNormal3fv(&Vertices[i].Normal.x); - glTexCoord2f(Vertices[i].tu, Vertices[i].tv); - glVertex3fv(&Vertices[i].Point.x); + glNormal3fv(glm::value_ptr(Vertices[i].normal)); + glTexCoord2fv(glm::value_ptr(Vertices[i].texture)); + glVertex3fv(glm::value_ptr(Vertices[i].position)); }; glEnd(); #endif @@ -693,10 +693,10 @@ void TSubModel::DisplayLists() uiDisplayList = glGenLists(1); glNewList(uiDisplayList, GL_COMPILE); glBegin(GL_POINTS); - for (int i = 0; i < iNumVerts; i++) + for (int i = 0; i < iNumVerts; ++i) { - glColor3f(Vertices[i].Normal.x, Vertices[i].Normal.y, Vertices[i].Normal.z); - glVertex3fv(&Vertices[i].Point.x); + glColor3fv(glm::value_ptr(Vertices[i].normal)); + glVertex3fv(glm::value_ptr(Vertices[i].position)); }; glEnd(); glEndList(); @@ -736,13 +736,13 @@ void TSubModel::InitialRotate(bool doit) if (Vertices) { for (int i = 0; i < iNumVerts; ++i) - Vertices[i].Point = (*mat) * Vertices[i].Point; + Vertices[i].position = (*mat) * Vertices[i].position; (*mat)(3)[0] = (*mat)(3)[1] = (*mat)(3)[2] = 0.0; // zerujemy przesunięcie przed obracaniem normalnych if (eType != TP_STARS) // gwiazdki mają kolory zamiast normalnych, to // ich wtedy nie ruszamy for (int i = 0; i < iNumVerts; ++i) - Vertices[i].Normal = SafeNormalize((*mat) * Vertices[i].Normal); + Vertices[i].normal = glm::normalize((*mat) * Vertices[i].normal); } mat->Identity(); // jedynkowanie transformu po przeliczeniu wierzchołków iFlags &= ~0x8000; // transform jedynkowy @@ -756,17 +756,17 @@ void TSubModel::InitialRotate(bool doit) if (Vertices) for (int i = 0; i < iNumVerts; ++i) { - Vertices[i].Point.x = -Vertices[i].Point.x; // zmiana znaku X - t = Vertices[i].Point.y; // zamiana Y i Z - Vertices[i].Point.y = Vertices[i].Point.z; - Vertices[i].Point.z = t; + Vertices[i].position.x = -Vertices[i].position.x; // zmiana znaku X + t = Vertices[i].position.y; // zamiana Y i Z + Vertices[i].position.y = Vertices[i].position.z; + Vertices[i].position.z = t; // wektory normalne również trzeba przekształcić, bo się źle oświetlają if( eType != TP_STARS ) { // gwiazdki mają kolory zamiast normalnych, to // ich wtedy nie ruszamy - Vertices[ i ].Normal.x = -Vertices[ i ].Normal.x; // zmiana znaku X - t = Vertices[ i ].Normal.y; // zamiana Y i Z - Vertices[ i ].Normal.y = Vertices[ i ].Normal.z; - Vertices[ i ].Normal.z = t; + Vertices[ i ].normal.x = -Vertices[ i ].normal.x; // zmiana znaku X + t = Vertices[ i ].normal.y; // zamiana Y i Z + Vertices[ i ].normal.y = Vertices[ i ].normal.z; + Vertices[ i ].normal.z = t; } } if (Child) @@ -1045,14 +1045,14 @@ void TSubModel::RaArrayFill(CVertNormTex *Vert) if ((eType < TP_ROTATOR) || (eType == TP_STARS)) for (int i = 0; i < iNumVerts; ++i) { - Vert[iVboPtr + i].x = Vertices[i].Point.x; - Vert[iVboPtr + i].y = Vertices[i].Point.y; - Vert[iVboPtr + i].z = Vertices[i].Point.z; - Vert[iVboPtr + i].nx = Vertices[i].Normal.x; - Vert[iVboPtr + i].ny = Vertices[i].Normal.y; - Vert[iVboPtr + i].nz = Vertices[i].Normal.z; - Vert[iVboPtr + i].u = Vertices[i].tu; - Vert[iVboPtr + i].v = Vertices[i].tv; + Vert[iVboPtr + i].x = Vertices[i].position.x; + Vert[iVboPtr + i].y = Vertices[i].position.y; + Vert[iVboPtr + i].z = Vertices[i].position.z; + Vert[iVboPtr + i].nx = Vertices[i].normal.x; + Vert[iVboPtr + i].ny = Vertices[i].normal.y; + Vert[iVboPtr + i].nz = Vertices[i].normal.z; + Vert[iVboPtr + i].u = Vertices[i].texture.s; + Vert[iVboPtr + i].v = Vertices[i].texture.t; } else if (eType == TP_FREESPOTLIGHT) Vert[iVboPtr].x = Vert[iVboPtr].y = Vert[iVboPtr].z = 0.0; @@ -1114,6 +1114,7 @@ float TSubModel::MaxY(const float4x4 &m) return 0; // tylko dla trójkątów liczymy if (iNumVerts < 1) return 0; +/* if (!Vertices) return 0; float y, @@ -1126,6 +1127,22 @@ float TSubModel::MaxY(const float4x4 &m) if (my < y) my = y; } +*/ + float my = + m[ 0 ][ 1 ] * Vertices[ 0 ].position.x + + m[ 1 ][ 1 ] * Vertices[ 0 ].position.y + + m[ 2 ][ 1 ] * Vertices[ 0 ].position.z + + m[ 3 ][ 1 ]; + float y; + for( int i = 1; i < iNumVerts; ++i ) { + y = + m[ 0 ][ 1 ] * Vertices[ i ].position.x + + m[ 1 ][ 1 ] * Vertices[ i ].position.y + + m[ 2 ][ 1 ] * Vertices[ i ].position.z + + m[ 3 ][ 1 ]; + + if( my < y ) { my = y; } + } return my; }; //--------------------------------------------------------------------------- @@ -1495,28 +1512,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) uint32_t size = sn_utils::ld_uint32(s) - 8; std::streampos end = s.tellg() + (std::streampos)size; - if (type == MAKE_ID4('V', 'N', 'T', '0')) - { -#ifdef EU07_USE_OLD_VERTEXBUFFER - if (m_pVNT != nullptr) -#else - if( false == m_pVNT.empty() ) -#endif - throw std::runtime_error("e3d: duplicated VNT chunk"); - - size_t vt_cnt = size / 32; - iNumVerts = (int)vt_cnt; - m_nVertexCount = (int)vt_cnt; -#ifdef EU07_USE_OLD_VERTEXBUFFER - assert( m_pVNT == nullptr ); - m_pVNT = new CVertNormTex[vt_cnt]; -#else - m_pVNT.resize( vt_cnt ); -#endif - for (size_t i = 0; i < vt_cnt; i++) - m_pVNT[i].deserialize(s); - } - else if ((type & 0x00FFFFFF) == MAKE_ID4('S', 'U', 'B', 0)) + if ((type & 0x00FFFFFF) == MAKE_ID4('S', 'U', 'B', 0)) { if (Root != nullptr) throw std::runtime_error("e3d: duplicated SUB chunk"); @@ -1532,6 +1528,66 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) Root[i].deserialize(s); } } + else if (type == MAKE_ID4('V', 'N', 'T', '0')) + { +#ifdef EU07_USE_OLD_VERTEXBUFFER + if (m_pVNT != nullptr) +#else + if( false == m_pVNT.empty() ) +#endif + throw std::runtime_error("e3d: duplicated VNT chunk"); + +/* + size_t vt_cnt = size / 32; + iNumVerts = (int)vt_cnt; + m_nVertexCount = (int)vt_cnt; +#ifdef EU07_USE_OLD_VERTEXBUFFER + assert( m_pVNT == nullptr ); + m_pVNT = new CVertNormTex[vt_cnt]; +#else + m_pVNT.resize( vt_cnt ); +#endif + for (size_t i = 0; i < vt_cnt; i++) + m_pVNT[i].deserialize(s); +*/ + + // we rely on the SUB chunk coming before the vertex data, and on the overall vertex count matching the size of data in the chunk + // geometry associated with chunks isn't stored in the order the actual chunks are listed, so we need to sort that out first + std::vector< std::pair > submodeloffsets; + submodeloffsets.reserve( iSubModelsCount ); + for( int idx = 0; idx < iSubModelsCount; ++idx ) { + auto &submodel = Root[ idx ]; + if( submodel.iNumVerts <= 0 ) { continue; } + submodeloffsets.emplace_back( submodel.tVboPtr, idx ); + } + std::sort( + submodeloffsets.begin(), + submodeloffsets.end(), + []( std::pair const &Left, std::pair const &Right ) { + return (Left.first) < (Right.first); } ); + // once sorted we can grab geometry for the chunks as they come + for( auto const &submodeloffset : submodeloffsets ) { + auto &submodel = Root[ submodeloffset.second ]; + vertex_array vertices; vertices.resize( submodel.iNumVerts ); + for( auto &vertex : vertices ) { + vertex.deserialize( s ); + } + // remap geometry type for custom type submodels + int type; + switch( submodel.eType ) { + case TP_FREESPOTLIGHT: + case TP_STARS: { + type = GL_POINTS; + break; } + default: { + type = submodel.eType; + break; + } + } + submodel.m_chunk = m_geometry->create( vertices, type ); + } + + } else if (type == MAKE_ID4('T', 'R', 'A', '0')) { if (tm != nullptr) @@ -1572,18 +1628,23 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) if (!Root) throw std::runtime_error("e3d: no submodels"); - +/* #ifdef EU07_USE_OLD_VERTEXBUFFER if (!m_pVNT) #else if(m_pVNT.empty() ) #endif throw std::runtime_error("e3d: no vertices"); - - for (size_t i = 0; (int)i < iSubModelsCount; i++) +*/ + for (size_t i = 0; (int)i < iSubModelsCount; ++i) { #ifdef EU07_USE_OLD_VERTEXBUFFER - Root[i].BinInit(Root, tm, (float8*)m_pVNT, &Textures, &Names, dynamic); + Root[i].BinInit( + Root, tm, + ( Root[i].m_chunk ? + &m_geometry->data(Root[i].m_chunk)[0] : + nullptr ), + &Textures, &Names, dynamic); #else Root[ i ].BinInit( Root, tm, (float8*)m_pVNT.data(), &Textures, &Names, dynamic ); #endif @@ -1595,7 +1656,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) } } -void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, +void TSubModel::BinInit(TSubModel *s, float4x4 *m, basic_vertex *v, std::vector *t, std::vector *n, bool dynamic) { // ustawienie wskaźników w submodelu //m7todo: brzydko @@ -1659,9 +1720,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, float8 *v, iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem tablic) iVboPtr = tVboPtr; - Vertices = v + iVboPtr; - // if (!iNumVerts) eType=-1; //tymczasowo zmiana typu, żeby się nie - // renderowało na siłę + Vertices = v; }; void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) @@ -1696,27 +1755,26 @@ void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic) // parser.getToken(parent); parser.getTokens(1, false); // nazwa submodelu nadrzędnego bez zmieny na małe parser >> parent; - if (parent == "") - break; + if( parent == "" ) { + break; + } SubModel = new TSubModel(); iNumVerts += SubModel->Load(parser, this, iNumVerts, dynamic); - SubModel->Parent = AddToNamed( - parent.c_str(), SubModel); // będzie potrzebne do wyliczenia pozycji, np. pantografu - // iSubModelsCount++; + + // będzie potrzebne do wyliczenia pozycji, np. pantografu + SubModel->Parent = AddToNamed(parent.c_str(), SubModel); + parser.getTokens(); parser >> token; } - // Ra: od wersji 334 przechylany jest cały model, a nie tylko pierwszy - // submodel - // ale bujanie kabiny nadal używa bananów :( od 393 przywrócone, ale z - // dodatkowym warunkiem + // Ra: od wersji 334 przechylany jest cały model, a nie tylko pierwszy submodel + // ale bujanie kabiny nadal używa bananów :( od 393 przywrócone, ale z dodatkowym warunkiem if (Global::iConvertModels & 4) { // automatyczne banany czasem psuły przechylanie kabin... if (dynamic && Root) { if (Root->NextGet()) // jeśli ma jakiekolwiek kolejne - { // dynamic musi mieć "banana", bo tylko pierwszy obiekt jest animowany, - // a następne nie + { // dynamic musi mieć "banana", bo tylko pierwszy obiekt jest animowany, a następne nie SubModel = new TSubModel(); // utworzenie pustego SubModel->ChildAdd(Root); Root = SubModel; diff --git a/Model3d.h b/Model3d.h index ae650785..06a5c985 100644 --- a/Model3d.h +++ b/Model3d.h @@ -19,82 +19,6 @@ http://mozilla.org/MPL/2.0/. using namespace Math3D; -struct GLVERTEX -{ - vector3 Point; - vector3 Normal; - float tu, tv; -}; - -class TMaterialColor -{ -public: - TMaterialColor() {}; - TMaterialColor(char V) - { - r = g = b = V; - }; - // TMaterialColor(double R, double G, double B) - TMaterialColor(char R, char G, char B) - { - r = R; - g = G; - b = B; - }; - - char r, g, b; -}; - -/* -struct TMaterial -{ -int ID; -AnsiString Name; -//McZapkie-240702: lepiej uzywac wartosci float do opisu koloru bo funkcje opengl chyba tego na ogol -uzywaja -float Ambient[4]; -float Diffuse[4]; -float Specular[4]; -float Transparency; -GLuint TextureID; -}; -*/ -/* -struct THitBoxContainer -{ -TPlane Planes[6]; -int Index; -inline void Reset() { Planes[0]= TPlane(vector3(0,0,0),0.0f); }; -inline bool Inside(vector3 Point) -{ -bool Hit= true; - -if (Planes[0].Defined()) -for (int i=0; i<6; i++) -{ -if (Planes[i].GetSide(Point)>0) -{ -Hit= false; -break; -}; - -} -else return(false); -return(Hit); -}; -}; -*/ - -/* Ra: tego nie będziemy już używać, bo można wycisnąć więcej -typedef enum -{smt_Unknown, //nieznany -smt_Mesh, //siatka -smt_Point, -smt_FreeSpotLight, //punkt świetlny -smt_Text, //generator tekstu -smt_Stars //wiele punktów świetlnych -} TSubModelType; -*/ // Ra: specjalne typy submodeli, poza tym GL_TRIANGLES itp. const int TP_ROTATOR = 256; const int TP_FREESPOTLIGHT = 257; @@ -134,6 +58,7 @@ class TSubModel //m7todo: zrobić normalną serializację friend class opengl_renderer; + friend class TModel3d; // temporary workaround. TODO: clean up class content/hierarchy private: int iNext; @@ -160,7 +85,6 @@ private: union { // transform, nie każdy submodel musi mieć float4x4 *fMatrix; // pojedyncza precyzja wystarcza - // matrix4x4 *dMatrix; //do testu macierz podwójnej precyzji int iMatrix; // w pliku binarnym jest numer matrycy }; int iNumVerts; // ilość wierzchołków (1 dla FreeSpotLight) @@ -188,21 +112,19 @@ private: TSubModel *Next; TSubModel *Child; intptr_t iVboPtr; + geometrychunk_handle m_chunk; // geometry of the submodel texture_manager::size_type TextureID; // numer tekstury, -1 wymienna, 0 brak bool bWire; // nie używane, ale wczytywane // short TexAlpha; //Ra: nie używane już GLuint uiDisplayList; // roboczy numer listy wyświetlania float Opacity; // nie używane, ale wczytywane //m7todo: wywalić to - // ABu: te same zmienne, ale zdublowane dla Render i RenderAlpha, - // bo sie chrzanilo przemieszczanie obiektow. - // Ra: już się nie chrzani float f_Angle; float3 v_RotateAxis; float3 v_Angles; public: // chwilowo float3 v_TransVector; - float8 *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO + basic_vertex *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO size_t iAnimOwner; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim; // kody animacji oddzielnie, bo zerowane public: @@ -212,14 +134,10 @@ public: smLetter; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) TSubModel *Parent; // nadrzędny, np. do wymnażania macierzy int iVisible; // roboczy stan widoczności - // AnsiString asTexture; //robocza nazwa tekstury do zapisania w pliku binarnym - // AnsiString asName; //robocza nazwa std::string pTexture; // robocza nazwa tekstury do zapisania w pliku binarnym std::string pName; // robocza nazwa private: - // int SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 *pt,GLVERTEX - // *Vertices); - int SeekFaceNormal(unsigned int *Masks, int f, unsigned int dwMask, float3 *pt, float8 *Vertices); + int SeekFaceNormal(unsigned int *Masks, int f, unsigned int dwMask, glm::vec3 *pt, basic_vertex *Vertices); void RaAnimation(TAnimType a); public: @@ -235,18 +153,10 @@ public: int Load(cParser &Parser, TModel3d *Model, int Pos, bool dynamic); void ChildAdd(TSubModel *SubModel); void NextAdd(TSubModel *SubModel); - TSubModel * NextGet() - { - return Next; - }; - TSubModel * ChildGet() - { - return Child; - }; + TSubModel * NextGet() { return Next; }; + TSubModel * ChildGet() { return Child; }; int TriangleAdd(TModel3d *m, texture_manager::size_type tex, int tri); - float8 * TrianglePtr(int tex, int pos, int *la, int *ld, int *ls); - // float8* TrianglePtr(const char *tex,int tri); - // void SetRotate(vector3 vNewRotateAxis,float fNewAngle); + basic_vertex * TrianglePtr(int tex, int pos, int *la, int *ld, int *ls); void SetRotate(float3 vNewRotateAxis, float fNewAngle); void SetRotateXYZ(vector3 vNewAngles); void SetRotateXYZ(float3 vNewAngles); @@ -255,18 +165,9 @@ public: void SetRotateIK1(float3 vNewAngles); TSubModel * GetFromName(std::string const &search, bool i = true); TSubModel * GetFromName(char const *search, bool i = true); - // inline matrix4x4* GetMatrix() {return dMatrix;}; - inline float4x4 * GetMatrix() - { - return fMatrix; - }; - // matrix4x4* GetTransform() {return Matrix;}; - inline void Hide() - { - iVisible = 0; - }; + inline float4x4 * GetMatrix() { return fMatrix; }; + inline void Hide() { iVisible = 0; }; void RaArrayFill(CVertNormTex *Vert); - // void Render(); int FlagsCheck(); void WillBeAnimated() { @@ -275,7 +176,7 @@ public: }; void InitialRotate(bool doit); void DisplayLists(); - void BinInit(TSubModel *s, float4x4 *m, float8 *v, + void BinInit(TSubModel *s, float4x4 *m, basic_vertex *v, std::vector *t, std::vector *n, bool dynamic); void ReplacableSet(texture_manager::size_type const *r, int a) { @@ -285,14 +186,8 @@ public: void TextureNameSet(const char *n); void NameSet(const char *n); // Ra: funkcje do budowania terenu z E3D - int Flags() - { - return iFlags; - }; - void UnFlagNext() - { - iFlags &= 0x00FFFFFF; - }; + int Flags() { return iFlags; }; + void UnFlagNext() { iFlags &= 0x00FFFFFF; }; void ColorsSet(int *a, int *d, int *s); inline float3 Translation1Get() { @@ -323,9 +218,6 @@ class TModel3d : public CMesh friend class opengl_renderer; private: - // TMaterial *Materials; - // int MaterialsCount; //Ra: nie używane - // bool TractionPart; //Ra: nie używane TSubModel *Root; // drzewo submodeli int iFlags; // Ra: czy submodele mają przezroczyste tekstury public: // Ra: tymczasowo @@ -338,16 +230,10 @@ private: std::string asBinary; // nazwa pod którą zapisać model binarny std::string m_filename; public: - inline TSubModel * GetSMRoot() - { - return (Root); - }; - // double Radius; //Ra: nie używane + inline TSubModel * GetSMRoot() { return (Root); }; TModel3d(); - TModel3d(char *FileName); ~TModel3d(); TSubModel * GetFromName(const char *sName); - // TMaterial* GetMaterialFromName(char *sName); TSubModel * AddToNamed(const char *Name, TSubModel *SubModel); void AddTo(TSubModel *tmp, TSubModel *SubModel); void LoadFromTextFile(std::string const &FileName, bool dynamic); @@ -355,17 +241,9 @@ public: bool LoadFromFile(std::string const &FileName, bool dynamic); void SaveToBinFile(char const *FileName); void BreakHierarhy(); - // inline int GetSubModelsCount() { return (SubModelsCount); }; - int Flags() const - { - return iFlags; - }; + int Flags() const { return iFlags; }; void Init(); - std::string NameGet() - { -// return Root ? Root->pName : NULL; - return m_filename; - }; + std::string NameGet() { return m_filename; }; int TerrainCount(); TSubModel * TerrainSquare(int n); void TerrainRenderVBO(int n); diff --git a/Texture.h b/Texture.h index bfdd73c5..8ed8c2dc 100644 --- a/Texture.h +++ b/Texture.h @@ -62,6 +62,8 @@ private: */ }; +typedef std::size_t texture_handle; + class texture_manager { private: diff --git a/VBO.cpp b/VBO.cpp index 0de6cb14..6fdba7c0 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -49,6 +49,9 @@ CMesh::CMesh() #endif m_nVertexCount = -1; m_nVBOVertices = 0; // nie zarezerwowane + + // TODO: bind proper subtype based on the settings + m_geometry = std::make_shared(); }; CMesh::~CMesh() @@ -107,6 +110,7 @@ void CMesh::Clear() bool CMesh::StartVBO() { // początek rysowania elementów z VBO + if (m_nVertexCount <= 0) return false; // nie ma nic do rysowania w ten sposób glEnableClientState(GL_VERTEX_ARRAY); @@ -118,12 +122,15 @@ bool CMesh::StartVBO() glVertexPointer( 3, GL_FLOAT, sizeof(CVertNormTex), static_cast(nullptr) ); // pozycje glNormalPointer( GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 12 ); // normalne glTexCoordPointer( 2, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 24 ); // wierzchołki + return true; // można rysować z VBO } - return true; // można rysować z VBO + + return false; }; bool CMesh::StartColorVBO() { // początek rysowania punktów świecących z VBO + if (m_nVertexCount <= 0) return false; // nie ma nic do rysowania w ten sposób glEnableClientState(GL_VERTEX_ARRAY); @@ -134,8 +141,9 @@ bool CMesh::StartColorVBO() glVertexPointer( 3, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) ); // pozycje // glColorPointer(3,GL_UNSIGNED_BYTE,sizeof(CVertNormTex),((char*)NULL)+12); //kolory glColorPointer( 3, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 12 ); // kolory + return true; // można rysować z VBO } - return true; // można rysować z VBO + return false; }; void CMesh::EndVBO() diff --git a/VBO.h b/VBO.h index a5e4947a..63a104fc 100644 --- a/VBO.h +++ b/VBO.h @@ -7,8 +7,9 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef VBOH -#define VBOH +#pragma once + +#include "openglgeometrybank.h" #define EU07_USE_OLD_VERTEXBUFFER @@ -32,13 +33,6 @@ class CVertNormTex class CMesh { // wsparcie dla VBO public: - int m_nVertexCount; // liczba wierzchołków -#ifdef EU07_USE_OLD_VERTEXBUFFER - CVertNormTex *m_pVNT; -#else - std::vector m_pVNT; -#endif - unsigned int m_nVBOVertices; // numer VBO z wierzchołkami CMesh(); ~CMesh(); void MakeArray(int n); // tworzenie tablicy z elementami VNT @@ -47,6 +41,14 @@ class CMesh bool StartVBO(); void EndVBO(); bool StartColorVBO(); -}; + int m_nVertexCount; // liczba wierzchołków +#ifdef EU07_USE_OLD_VERTEXBUFFER + CVertNormTex *m_pVNT; +#else + std::vector m_pVNT; #endif + unsigned int m_nVBOVertices; // numer VBO z wierzchołkami + + std::shared_ptr m_geometry; +}; diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 0dcd5af5..2e0bf701 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -222,6 +222,9 @@ Source Files + + Source Files + @@ -434,6 +437,9 @@ Header Files + + Header Files + diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp new file mode 100644 index 00000000..ec25b023 --- /dev/null +++ b/openglgeometrybank.cpp @@ -0,0 +1,218 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "openglgeometrybank.h" + +#include "sn_utils.h" + +void +basic_vertex::serialize( std::ostream &s ) { + + sn_utils::ls_float32( s, position.x ); + sn_utils::ls_float32( s, position.y ); + sn_utils::ls_float32( s, position.z ); + + sn_utils::ls_float32( s, normal.x ); + sn_utils::ls_float32( s, normal.y ); + sn_utils::ls_float32( s, normal.z ); + + sn_utils::ls_float32( s, texture.x ); + sn_utils::ls_float32( s, texture.y ); +} + +void +basic_vertex::deserialize( std::istream &s ) { + + position.x = sn_utils::ld_float32( s ); + position.y = sn_utils::ld_float32( s ); + position.z = sn_utils::ld_float32( s ); + + normal.x = sn_utils::ld_float32( s ); + normal.y = sn_utils::ld_float32( s ); + normal.z = sn_utils::ld_float32( s ); + + texture.x = sn_utils::ld_float32( s ); + texture.y = sn_utils::ld_float32( s ); +} + +// generic geometry bank class, allows storage, update and drawing of geometry chunks + +// creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk +geometrychunk_handle +geometry_bank::create( vertex_array &Vertices, int const Datatype ) { + + if( true == Vertices.empty() ) { return NULL; } + + m_chunks.emplace_back( Vertices, Datatype ); + // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication + return m_chunks.size(); +} + +// replaces data of specified chunk with the supplied vertex data, starting from specified offset +bool +geometry_bank::replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset ) { + + if( ( Chunk == 0 ) || ( Chunk > m_chunks.size() ) ) { return false; } + + auto &chunk = m_chunks[ Chunk - 1 ]; + + if( ( Offset == 0 ) + && ( Vertices.size() == chunk.vertices.size() ) ) { + // check first if we can get away with a simple swap... + chunk.vertices.swap( Vertices ); + } + else { + // ...otherwise we need to do some legwork + // NOTE: if the offset is larger than existing size of the chunk, it'll bridge the gap with 'blank' vertices + // TBD: we could bail out with an error instead if such request occurs + chunk.vertices.resize( Offset + Vertices.size(), basic_vertex() ); + chunk.vertices.insert( std::end( chunk.vertices ), std::begin( Vertices ), std::end( Vertices ) ); + } + return true; +} + +vertex_array & +geometry_bank::data( geometrychunk_handle const Chunk ) { + + return m_chunks.at( Chunk - 1 ).vertices; +} + +// opengl vbo-based variant of the geometry bank + +GLuint opengl_vbogeometrybank::m_activebuffer{ NULL }; // buffer bound currently on the opengl end, if any + +// creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk +geometrychunk_handle +opengl_vbogeometrybank::create( vertex_array &Vertices, int const Datatype ) { + + auto const handle = geometry_bank::create( Vertices, Datatype ); + if( handle == NULL ) { + // if we didn't get anything, bail early + return handle; + } + // adding a chunk means we'll be (re)building the buffer, which will fill the chunk records, amongst other things + // so we don't need to initialize the values here + m_chunkrecords.emplace_back( chunk_record() ); + // kiss the existing buffer goodbye, new overall data size means we'll be making a new one + delete_buffer(); + + return handle; +} + +// replaces data of specified chunk with the supplied vertex data, starting from specified offset +bool +opengl_vbogeometrybank::replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset ) { + + auto const result = geometry_bank::replace( Vertices, Chunk, Offset ); + if( false == result ) { + // if nothing happened we can bail out early + return result; + } + auto &chunkrecord = m_chunkrecords[ Chunk - 1 ]; + chunkrecord.is_good = false; + // if the overall length of the chunk didn't change we can get away with reusing the old buffer... + if( m_chunks[ Chunk - 1 ].vertices.size() != chunkrecord.size ) { + // ...but otherwise we'll need to allocate a new one + // TBD: we could keep and reuse the old buffer also if the new chunk is smaller than the old one, + // but it'd require some extra tracking and work to keep all chunks up to date; also wasting vram; may be not worth it? + delete_buffer(); + } + return result; +} + +// draws geometry stored in specified chunk +void +opengl_vbogeometrybank::draw( geometrychunk_handle const Chunk ) { + + if( m_buffer == NULL ) { + // if there's no buffer, we'll have to make one + // NOTE: this isn't exactly optimal in terms of ensuring the gfx card doesn't stall waiting for the data + // may be better to initiate upload earlier (during update phase) and trust this effort won't go to waste + if( true == m_chunks.empty() ) { return; } + + std::size_t datasize{ 0 }; + auto &chunkrecord = m_chunkrecords.begin(); + for( auto &chunk : m_chunks ) { + // fill all chunk records, based on the chunk data + chunkrecord->offset = datasize; + chunkrecord->size = chunk.vertices.size(); + datasize += chunkrecord->size; + ++chunkrecord; + } + // the odds for all created chunks to get replaced with empty ones are quite low, but the possibility does exist + if( datasize == 0 ) { return; } + // try to set up the buffer we need + ::glGenBuffers( 1, &m_buffer ); + bind_buffer(); + // NOTE: we're using static_draw since it's generally true for all we have implemented at the moment + // TODO: allow to specify usage hint at the object creation, and pass it here + ::glBufferData( + GL_ARRAY_BUFFER, + datasize * sizeof( basic_vertex ), + nullptr, + GL_STATIC_DRAW ); + m_buffercapacity = datasize; + } + // actual draw procedure starts here + // setup... + if( m_activebuffer != m_buffer ) { + bind_buffer(); + } + auto &chunkrecord = m_chunkrecords[ Chunk - 1 ]; + auto const &chunk = m_chunks[ Chunk - 1 ]; + if( false == chunkrecord.is_good ) { + // we may potentially need to upload new buffer data before we can draw it + ::glBufferSubData( + GL_ARRAY_BUFFER, + chunkrecord.offset * sizeof( basic_vertex ), + chunkrecord.size * sizeof( basic_vertex ), + chunk.vertices.data() ); + chunkrecord.is_good = true; + } + // ...render... + ::glDrawArrays( chunk.type, chunkrecord.offset, chunkrecord.size ); + // ...post-render cleanup +/* + ::glDisableClientState( GL_VERTEX_ARRAY ); + ::glDisableClientState( GL_NORMAL_ARRAY ); + ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + ::glBindBuffer( GL_ARRAY_BUFFER, 0 ); m_activebuffer = 0; +*/ +} + +void +opengl_vbogeometrybank::bind_buffer() { + + ::glBindBuffer( GL_ARRAY_BUFFER, m_buffer ); + // TODO: allow specifying other vertex data setups + ::glVertexPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) ); + ::glNormalPointer( GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + sizeof(float) * 3 ); // normalne + ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); // wierzchołki + // TODO: allow specifying other vertex data setups, either in the draw() parameters or during chunk or buffer creation + ::glEnableClientState( GL_VERTEX_ARRAY ); + ::glEnableClientState( GL_NORMAL_ARRAY ); + ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + + m_activebuffer = m_buffer; +} + +void +opengl_vbogeometrybank::delete_buffer() { + + if( m_buffer != NULL ) { + + ::glDeleteBuffers( 1, &m_buffer ); + if( m_activebuffer == m_buffer ) { + m_activebuffer = NULL; + } + m_buffer = NULL; + m_buffercapacity = 0; + } +} diff --git a/openglgeometrybank.h b/openglgeometrybank.h new file mode 100644 index 00000000..91969a29 --- /dev/null +++ b/openglgeometrybank.h @@ -0,0 +1,122 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include "GL/glew.h" +#ifdef _WINDOWS +#include "GL/wglew.h" +#endif + +struct basic_vertex { + glm::vec3 position; // 3d space + glm::vec3 normal; // 3d space + glm::vec2 texture; // uv space + + void serialize( std::ostream& ); + void deserialize( std::istream& ); +}; + +typedef std::vector vertex_array; + +// generic geometry bank class, allows storage, update and drawing of geometry chunks + +typedef std::size_t geometrychunk_handle; + +class geometry_bank { + +public: +// types: + +// constructors: + +// destructor: + virtual + ~geometry_bank() { ; } + +// methods: + // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk or NULL + virtual + geometrychunk_handle + create( vertex_array &Vertices, int const Datatype ); + // replaces data of specified chunk with the supplied vertex data, starting from specified offset + virtual + bool + replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset = 0 ); + // draws geometry stored in specified chunk + virtual + void + draw( geometrychunk_handle const Chunk ) = 0; + // draws geometry stored in supplied list of chunks + template + void + draw( _Iterator First, _Iterator Last ) { while( First != Last ) { draw( *First ); ++First; } } + vertex_array & + data( geometrychunk_handle const Chunk ); + +protected: +// types: + struct geometry_chunk { + int type; // kind of geometry used by the chunk + vertex_array vertices; // geometry data + + geometry_chunk( vertex_array &Vertices, int const Datatype ) : + vertices( Vertices ), type( Datatype ) + {} + }; + + typedef std::vector geometrychunk_sequence; + +// members: + geometrychunk_sequence m_chunks; + +}; + +// opengl vbo-based variant of the geometry bank + +class opengl_vbogeometrybank : public geometry_bank { + +public: +// methods: + // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk or NULL + geometrychunk_handle + create( vertex_array &Vertices, int const Datatype ); + // replaces data of specified chunk with the supplied vertex data, starting from specified offset + bool + replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset = 0 ); + // draws geometry stored in specified chunk + void + draw( geometrychunk_handle const Chunk ); + +private: +// types: + struct chunk_record{ + std::size_t offset{ 0 }; // beginning of the chunk data as offset from the beginning of the last established buffer + std::size_t size{ 0 }; // size of the chunk in the last established buffer + bool is_good{ false }; // true if local content of the chunk matches the data on the opengl end + }; + + typedef std::vector chunkrecord_sequence; + +// methods: + void + bind_buffer(); + void + delete_buffer(); + +// members: + static GLuint m_activebuffer; // buffer bound currently on the opengl end, if any + GLuint m_buffer{ NULL }; // id of the buffer holding data on the opengl end + std::size_t m_buffercapacity{ 0 }; // total capacity of the last established buffer + chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order + +}; diff --git a/renderer.cpp b/renderer.cpp index 93789019..177bbf89 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -775,11 +775,12 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, double // TODO: unify the render code after generic buffers are in place // setup +/* if( Global::bUseVBO ) { if( false == Model->StartVBO() ) return false; } - +*/ Model->Root->ReplacableSet( ( Material != nullptr ? Material->replacable_skins : @@ -793,7 +794,7 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, double // post-render cleanup if( Global::bUseVBO ) { - Model->EndVBO(); +// Model->EndVBO(); } return true; @@ -857,7 +858,10 @@ opengl_renderer::Render( TSubModel *Submodel ) { // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc if( Global::bUseVBO ) { +/* ::glDrawArrays( Submodel->eType, Submodel->iVboPtr, Submodel->iNumVerts ); +*/ + Submodel->pRoot->m_geometry->draw( Submodel->m_chunk ); } else { ::glCallList( Submodel->uiDisplayList ); @@ -898,7 +902,10 @@ opengl_renderer::Render( TSubModel *Submodel ) { // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc if( Global::bUseVBO ) { +/* ::glDrawArrays( GL_POINTS, Submodel->iVboPtr, Submodel->iNumVerts ); +*/ + Submodel->pRoot->m_geometry->draw( Submodel->m_chunk ); } else { ::glCallList( Submodel->uiDisplayList ); @@ -921,6 +928,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc if( Global::bUseVBO ) { +/* // NOTE: we're doing manual switch to color vbo setup, because there doesn't seem to be any convenient way available atm // TODO: implement easier way to go about it ::glDisableClientState( GL_NORMAL_ARRAY ); @@ -933,6 +941,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glDisableClientState( GL_COLOR_ARRAY ); ::glEnableClientState( GL_NORMAL_ARRAY ); ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); +*/ } else { ::glCallList( Submodel->uiDisplayList ); @@ -1298,11 +1307,12 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, d // TODO: unify the render code after generic buffers are in place // setup +/* if( Global::bUseVBO ) { if( false == Model->StartVBO() ) return false; } - +*/ Model->Root->ReplacableSet( ( Material != nullptr ? Material->replacable_skins : @@ -1315,10 +1325,11 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, d Render_Alpha( Model->Root ); // post-render cleanup +/* if( Global::bUseVBO ) { Model->EndVBO(); } - +*/ return true; } @@ -1378,7 +1389,10 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc if( Global::bUseVBO ) { +/* ::glDrawArrays( Submodel->eType, Submodel->iVboPtr, Submodel->iNumVerts ); +*/ + Submodel->pRoot->m_geometry->draw( Submodel->m_chunk ); } else { ::glCallList( Submodel->uiDisplayList ); From a28b3d5af9242184ec9cef6072681fc96903ede2 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 1 Jun 2017 16:21:17 +0200 Subject: [PATCH 118/426] build 170531. fix for pantograph pressure switch activation, partial fix for event sorting --- Driver.cpp | 76 +++++++++++++++++++++++++++++++++++++++++++----------- Driver.h | 4 +-- DynObj.cpp | 42 ++++++++++++++++++------------ Event.cpp | 6 +++-- Ground.cpp | 37 +++++++++++++------------- version.h | 2 +- 6 files changed, 113 insertions(+), 54 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index dbb4b171..35daf905 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -469,6 +469,16 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) } else { if( iTableDirection == 0 ) { return; } + // NOTE: provisory fix for BUG: sempahor indices no longer matching table size + // TODO: find and really fix the reason it happens + if( ( SemNextIndex != -1 ) + && ( SemNextIndex >= sSpeedTable.size() ) ) { + SemNextIndex = -1; + } + if( ( SemNextStopIndex != -1 ) + && ( SemNextStopIndex >= sSpeedTable.size() ) ) { + SemNextStopIndex = -1; + } // kontynuacja skanowania od ostatnio sprawdzonego toru (w ostatniej pozycji zawsze jest tor) if( ( SemNextStopIndex != -1 ) && ( sSpeedTable[SemNextStopIndex].fVelNext < 1.0 ) ) { @@ -1335,7 +1345,6 @@ void TController::TablePurger() // we can only update pointers safely after new table is finalized, so record their indices until then for( std::size_t idx = 0; idx < sSpeedTable.size() - 1; ++idx ) { // cache placement of semaphors in the new table, if we encounter them - // NOTE: we rely on the semaphor actually getting added in the next step rather than skipped, but it's a pretty safe bet if( idx == SemNextIndex ) { SemNextIndex = trimmedtable.size(); } @@ -1346,6 +1355,13 @@ void TController::TablePurger() if( ( 0 == ( speedpoint.iFlags & spEnabled ) ) || ( ( speedpoint.iFlags & ( spElapsed | spTrack | spCurve | spSwitch ) == ( spElapsed | spTrack | spCurve ) ) && ( speedpoint.fVelNext < 0.0 ) ) ) { + // if the trimmed point happens to be currently active semaphor we need to invalidate their placements + if( idx == SemNextIndex ) { + SemNextIndex = -1; + } + if( idx == SemNextStopIndex ) { + SemNextStopIndex = -1; + } continue; } // we're left with useful speed point record we should copy @@ -3365,8 +3381,8 @@ bool TController::UpdateSituation(double dt) } ElapsedTime += dt; WaitingTime += dt; - fBrakeTime -= - dt; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca + // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca + fBrakeTime -= dt; fStopTime += dt; // zliczanie czasu postoju, nie ruszy dopóki ujemne fActionTime += dt; // czas używany przy regulacji prędkości i zamykaniu drzwi if (WriteLogFlag) @@ -3384,7 +3400,7 @@ bool TController::UpdateSituation(double dt) LastUpdatedTime = LastUpdatedTime + dt; } // Ra: skanowanie również dla prowadzonego ręcznie, aby podpowiedzieć prędkość - if ((LastReactionTime > Min0R(ReactionTime, 2.0))) + if ((LastReactionTime > std::min(ReactionTime, 2.0))) { // Ra: nie wiem czemu ReactionTime potrafi dostać 12 sekund, to jest przegięcie, bo przeżyna // STÓJ @@ -3429,18 +3445,48 @@ bool TController::UpdateSituation(double dt) if (AIControllFlag) { // tu bedzie logika sterowania if (mvOccupied->CommandIn.Command != "") - if (!mvOccupied->RunInternalCommand()) // rozpoznaj komende bo lokomotywa jej nie - // rozpoznaje + if( !mvOccupied->RunInternalCommand() ) { + // rozpoznaj komende bo lokomotywa jej nie rozpoznaje RecognizeCommand(); // samo czyta komendę wstawioną do pojazdu? - if (mvOccupied->SecuritySystem.Status > 1) // jak zadziałało CA/SHP - if (!mvOccupied->SecuritySystemReset()) // to skasuj - // if - // ((TestFlag(mvOccupied->SecuritySystem.Status,s_ebrake))&&(mvOccupied->BrakeCtrlPos==0)&&(AccDesired>0.0)) - if ((TestFlag(mvOccupied->SecuritySystem.Status, s_SHPebrake) || - TestFlag(mvOccupied->SecuritySystem.Status, s_CAebrake)) && - (mvOccupied->BrakeCtrlPos == 0) && (AccDesired > 0.0)) - mvOccupied->BrakeLevelSet( - 0); //!!! hm, może po prostu normalnie sterować hamulcem? + } + if( mvOccupied->SecuritySystem.Status > 1 ) { + // jak zadziałało CA/SHP + if( !mvOccupied->SecuritySystemReset() ) { // to skasuj + if( ( mvOccupied->BrakeCtrlPos == 0 ) + && ( AccDesired > 0.0 ) + && ( ( TestFlag( mvOccupied->SecuritySystem.Status, s_SHPebrake ) ) + || ( TestFlag( mvOccupied->SecuritySystem.Status, s_CAebrake ) ) ) ) { + //!!! hm, może po prostu normalnie sterować hamulcem? + mvOccupied->BrakeLevelSet( 0 ); + } + } + } + // basic emergency stop handling, while at it + if( ( true == mvOccupied->EmergencyBrakeFlag ) // radio-stop + && ( mvOccupied->Vel < 0.01 ) // and actual stop + && ( true == mvOccupied->Radio ) ) { // and we didn't touch the radio yet + // turning off the radio should reset the flag, during security system check + if( m_radiocontroltime > 2.5 ) { + // arbitrary 2.5 sec delay between stop and disabling the radio + mvOccupied->Radio = false; + m_radiocontroltime = 0.0; + } + else { + m_radiocontroltime += LastReactionTime; + } + } + if( ( false == mvOccupied->Radio ) + && ( false == mvOccupied->EmergencyBrakeFlag ) ) { + // otherwise if it's safe to do so, turn the radio back on + if( m_radiocontroltime > 5.0 ) { + // arbitrary 5 sec delay before switching radio back on + mvOccupied->Radio = true; + m_radiocontroltime = 0.0; + } + else { + m_radiocontroltime += LastReactionTime; + } + } } switch (OrderList[OrderPos]) { // ustalenie prędkości przy doczepianiu i odczepianiu, dystansów w pozostałych przypadkach diff --git a/Driver.h b/Driver.h index ea961098..512e1d23 100644 --- a/Driver.h +++ b/Driver.h @@ -201,8 +201,7 @@ class TController public: double fLastStopExpDist = -1.0; // odległość wygasania ostateniego przystanku double ReactionTime = 0.0; // czas reakcji Ra: czego i na co? świadomości AI - double fBrakeTime = 0.0; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę - // hamulca + double fBrakeTime = 0.0; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca private: double fReady = 0.0; // poziom odhamowania wagonów bool Ready = false; // ABu: stan gotowosci do odjazdu - sprawdzenie odhamowania wagonow @@ -211,6 +210,7 @@ class TController double deltalog = 0.05; // przyrost czasu double LastReactionTime = 0.0; double fActionTime = 0.0; // czas używany przy regulacji prędkości i zamykaniu drzwi + double m_radiocontroltime{ 0.0 }; // timer used to control speed of radio operations TAction eAction = actSleep; // aktualny stan bool HelpMeFlag = false; // wystawiane True jesli cos niedobrego sie dzieje public: diff --git a/DynObj.cpp b/DynObj.cpp index 16229e1d..d13a2b7e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2472,10 +2472,15 @@ bool TDynamicObject::Update(double dt, double dt1) } else { if( MoverParameters->PantPress >= 4.6 ) { - // prime the pressure switch - MoverParameters->PantPressSwitchActive = true; - // turn off the subsystems lock - MoverParameters->PantPressLockActive = false; + // NOTE: we require active low power source to prime the pressure switch + // this is a work-around for potential isssues caused by the switch activating on otherwise idle vehicles, but should check whether it's accurate + if( ( true == MoverParameters->Battery ) + || ( true == MoverParameters->ConverterFlag ) ) { + // prime the pressure switch + MoverParameters->PantPressSwitchActive = true; + // turn off the subsystems lock + MoverParameters->PantPressLockActive = false; + } if( MoverParameters->PantPress >= 4.8 ) { // Winger - automatyczne wylaczanie malej sprezarki @@ -5233,22 +5238,27 @@ TDynamicObject * TDynamicObject::ControlledFind() // jeździć dobrze // również hamowanie wykonuje się zaworem w członie, a nie w silnikowym... TDynamicObject *d = this; // zaczynamy od aktualnego - if (d->MoverParameters->TrainType & dt_EZT) // na razie dotyczy to EZT - if (d->NextConnected ? d->MoverParameters->Couplers[1].AllowedFlag & ctrain_depot : false) - { // gdy jest człon od sprzęgu 1, a sprzęg łączony - // warsztatowo (powiedzmy) - if ((d->MoverParameters->Power < 1.0) && (d->NextConnected->MoverParameters->Power > - 1.0)) // my nie mamy mocy, ale ten drugi ma + if( d->MoverParameters->TrainType & dt_EZT ) { + // na razie dotyczy to EZT + if( ( d->NextConnected != nullptr ) + && ( true == TestFlag( d->MoverParameters->Couplers[ 1 ].AllowedFlag, coupling::permanent ) ) ) { + // gdy jest człon od sprzęgu 1, a sprzęg łączony warsztatowo (powiedzmy) + if( ( d->MoverParameters->Power < 1.0 ) + && ( d->NextConnected->MoverParameters->Power > 1.0 ) ) { + // my nie mamy mocy, ale ten drugi ma d = d->NextConnected; // będziemy sterować tym z mocą + } } - else if (d->PrevConnected ? d->MoverParameters->Couplers[0].AllowedFlag & ctrain_depot : - false) - { // gdy jest człon od sprzęgu 0, a sprzęg łączony - // warsztatowo (powiedzmy) - if ((d->MoverParameters->Power < 1.0) && (d->PrevConnected->MoverParameters->Power > - 1.0)) // my nie mamy mocy, ale ten drugi ma + else if( ( d->PrevConnected != nullptr ) + && ( true == TestFlag( d->MoverParameters->Couplers[ 0 ].AllowedFlag, coupling::permanent ) ) ) { + // gdy jest człon od sprzęgu 0, a sprzęg łączony warsztatowo (powiedzmy) + if( ( d->MoverParameters->Power < 1.0 ) + && ( d->PrevConnected->MoverParameters->Power > 1.0 ) ) { + // my nie mamy mocy, ale ten drugi ma d = d->PrevConnected; // będziemy sterować tym z mocą + } } + } return d; }; //--------------------------------------------------------------------------- diff --git a/Event.cpp b/Event.cpp index c27f9a4a..bcca997f 100644 --- a/Event.cpp +++ b/Event.cpp @@ -612,8 +612,10 @@ void TEvent::Load(cParser *parser, vector3 *org) void TEvent::AddToQuery(TEvent *e) { // dodanie eventu do kolejki - if (evNext ? (e->fStartTime >= evNext->fStartTime) : false) - evNext->AddToQuery(e); // sortowanie wg czasu + if( ( evNext != nullptr ) + && ( e->fStartTime > evNext->fStartTime ) ) { + evNext->AddToQuery( e ); // sortowanie wg czasu + } else { // dodanie z przodu e->evNext = evNext; diff --git a/Ground.cpp b/Ground.cpp index 4dfbaa9f..91ee13e3 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -3178,9 +3178,9 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) if (!Event->iQueued) // jeśli nie dodany jeszcze do kolejki { // kolejka eventów jest posortowana względem (fStartTime) Event->Activator = Node; - if (Event->Type == tp_AddValues ? (Event->fDelay == 0.0) : false) - { // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić - // jakieś dodawanie + if( ( Event->Type == tp_AddValues ) + && ( Event->fDelay == 0.0 ) ) { + // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję // wykonującą eventy i ją wywołać if (EventConditon(Event)) @@ -3208,11 +3208,10 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) std::to_string(Event->Params[1].asdouble) + " " + std::to_string(Event->Params[2].asdouble)); } - Event = - Event - ->evJoined; // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki + // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) + Event = Event->evJoined; } - if (Event) + if( Event != nullptr ) { // standardowe dodanie do kolejki WriteLog("EVENT ADDED TO QUEUE: " + Event->asName + (Node ? (" by " + Node->asName) : "")); Event->fStartTime = @@ -3221,10 +3220,13 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) Event->fStartTime += Event->fRandomDelay * Random(10000) * 0.0001; // doliczenie losowego czasu opóźnienia ++Event->iQueued; // zabezpieczenie przed podwójnym dodaniem do kolejki - if (QueryRootEvent ? Event->fStartTime >= QueryRootEvent->fStartTime : false) - QueryRootEvent->AddToQuery(Event); // dodanie gdzieś w środku - else - { // dodanie z przodu: albo nic nie ma, albo ma być wykonany szybciej niż pierwszy + if( ( QueryRootEvent != nullptr ) + && ( Event->fStartTime > QueryRootEvent->fStartTime ) ) { + // dodanie gdzieś w środku + QueryRootEvent->AddToQuery( Event ); + } + else { + // dodanie z przodu: albo nic nie ma, albo ma być wykonany szybciej niż pierwszy Event->evNext = QueryRootEvent; QueryRootEvent = Event; } @@ -3355,11 +3357,9 @@ bool TGround::CheckQuery() { // to teraz on będzie następny do wykonania QueryRootEvent = QueryRootEvent->evJoined; // następny będzie ten doczepiony QueryRootEvent->evNext = tmpEvent->evNext; // pamiętając o następnym z kolejki - QueryRootEvent->fStartTime = - tmpEvent->fStartTime; // czas musi być ten sam, bo nie jest aktualizowany + QueryRootEvent->fStartTime = tmpEvent->fStartTime; // czas musi być ten sam, bo nie jest aktualizowany QueryRootEvent->Activator = tmpEvent->Activator; // pojazd aktywujący - // w sumie można by go dodać normalnie do kolejki, ale trzeba te połączone posortować wg - // czasu wykonania + // w sumie można by go dodać normalnie do kolejki, ale trzeba te połączone posortować wg czasu wykonania } else // a jak nazwa jest unikalna, to kolejka idzie dalej QueryRootEvent = QueryRootEvent->evNext; // NULL w skrajnym przypadku @@ -3880,9 +3880,10 @@ bool TGround::GetTraction(TDynamicObject *model) node->hvTraction ->vParametric; // współczynniki równania parametrycznego fRaParam = -DotProduct(pant0, vFront); - fRaParam = -(DotProduct(node->hvTraction->pPoint1, vFront) + - fRaParam) / - DotProduct(vParam, vFront); + auto const paramfrontdot = DotProduct( vParam, vFront ); + fRaParam = + -( DotProduct( node->hvTraction->pPoint1, vFront ) + fRaParam ) + / ( paramfrontdot != 0.0 ? paramfrontdot : 0.001 ); // div0 trap if ((fRaParam >= -0.001) ? (fRaParam <= 1.001) : false) { // jeśli tylko jest w przedziale, wyznaczyć odległość wzdłuż // wektorów vUp i vLeft diff --git a/version.h b/version.h index 7667fb27..cbf2eb2e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 525 +#define VERSION_MINOR 531 #define VERSION_REVISION 0 From 5f0069bf609f2ab9bfd87a1a18faca8a02100957 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 2 Jun 2017 16:35:36 +0200 Subject: [PATCH 119/426] build 170602. completed fix for infinite event loop, modified horn controls to work independent of each other --- Event.cpp | 34 +++++++--- Event.h | 2 +- Ground.cpp | 189 ++++++++++++++++------------------------------------- Ground.h | 4 +- Train.cpp | 10 +++ version.h | 2 +- 6 files changed, 96 insertions(+), 145 deletions(-) diff --git a/Event.cpp b/Event.cpp index bcca997f..ee34478a 100644 --- a/Event.cpp +++ b/Event.cpp @@ -610,16 +610,32 @@ void TEvent::Load(cParser *parser, vector3 *org) } }; -void TEvent::AddToQuery(TEvent *e) -{ // dodanie eventu do kolejki - if( ( evNext != nullptr ) - && ( e->fStartTime > evNext->fStartTime ) ) { - evNext->AddToQuery( e ); // sortowanie wg czasu +void TEvent::AddToQuery( TEvent *Event, TEvent *&Start ) { + + TEvent *target( Start ); + TEvent *previous( nullptr ); + while( ( Event->fStartTime >= target->fStartTime ) + && ( target->evNext != nullptr ) ) { + previous = target; + target = target->evNext; } - else - { // dodanie z przodu - e->evNext = evNext; - evNext = e; + // the new event will be either before or after the one we located + if( Event->fStartTime >= target->fStartTime ) { + assert( target->evNext == nullptr ); + target->evNext = Event; + // if we have resurrected event land at the end of list, the link from previous run could potentially "add" unwanted events to the queue + Event->evNext = nullptr; + } + else { + if( previous != nullptr ) { + previous->evNext = Event; + Event->evNext = target; + } + else { + // special case, we're inserting our event before the provided start point + Event->evNext = Start; + Start = Event; + } } } diff --git a/Event.h b/Event.h index 110e3abc..7d020046 100644 --- a/Event.h +++ b/Event.h @@ -105,7 +105,7 @@ class TEvent // zmienne: ev* ~TEvent(); void Init(); void Load(cParser *parser, vector3 *org); - void AddToQuery(TEvent *e); + static void AddToQuery( TEvent *Event, TEvent *&Start ); std::string CommandGet(); TCommandType Command(); double ValueGet(int n); diff --git a/Ground.cpp b/Ground.cpp index 91ee13e3..54662956 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -3065,17 +3065,6 @@ TTrack * TGround::FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclud if ((tmp = sr->FindTrack(&Point, iConnection, Exclude->pTrack)) != NULL) return tmp; } -#if 0 - //wyszukiwanie czołgowe (po wszystkich jak leci) - nie ma chyba sensu - for (Current=nRootOfType[TP_TRACK];Current;Current=Current->Next) - { - if ((Current->iType==TP_TRACK) && (Current!=Exclude)) - { - iConnection=Current->pTrack->TestPoint(&Point); - if (iConnection>=0) return Current->pTrack; - } - } -#endif return NULL; } @@ -3174,22 +3163,21 @@ TTraction * TGround::TractionNearestFind(vector3 &p, int dir, TGroundNode *n) bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) { - if (Event->bEnabled) // jeśli może być dodany do kolejki (nie używany w skanowaniu) - if (!Event->iQueued) // jeśli nie dodany jeszcze do kolejki + if( Event->bEnabled ) { + // jeśli może być dodany do kolejki (nie używany w skanowaniu) + if( !Event->iQueued ) // jeśli nie dodany jeszcze do kolejki { // kolejka eventów jest posortowana względem (fStartTime) Event->Activator = Node; if( ( Event->Type == tp_AddValues ) - && ( Event->fDelay == 0.0 ) ) { - // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie - // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję - // wykonującą eventy i ją wywołać - if (EventConditon(Event)) - { // teraz mogą być warunki do tych eventów - Event->Params[5].asMemCell->UpdateValues( - Event->Params[0].asText, Event->Params[1].asdouble, - Event->Params[2].asdouble, Event->iFlags); - if (Event->Params[6].asTrack) - { // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla + && ( Event->fDelay == 0.0 ) ) { + // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie + // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję + // wykonującą eventy i ją wywołać + if( EventConditon( Event ) ) { // teraz mogą być warunki do tych eventów + Event->Params[ 5 ].asMemCell->UpdateValues( + Event->Params[ 0 ].asText, Event->Params[ 1 ].asdouble, + Event->Params[ 2 ].asdouble, Event->iFlags ); + if( Event->Params[ 6 ].asTrack ) { // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla // wszystkich 'dynamic' na danym torze for( auto dynamic : Event->Params[ 6 ].asTrack->Dynamics ) { Event->Params[ 5 ].asMemCell->PutCommand( @@ -3197,41 +3185,47 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) &Event->Params[ 4 ].nGroundNode->pCenter ); } //if (DebugModeFlag) - WriteLog("EVENT EXECUTED: AddValues & Track command - " + - std::string(Event->Params[0].asText) + " " + - std::to_string(Event->Params[1].asdouble) + " " + - std::to_string(Event->Params[2].asdouble)); + WriteLog( + "EVENT EXECUTED" + ( Node ? ( " by " + Node->asName ) : "" ) + ": AddValues & Track command ( " + + std::string( Event->Params[ 0 ].asText ) + " " + + std::to_string( Event->Params[ 1 ].asdouble ) + " " + + std::to_string( Event->Params[ 2 ].asdouble ) + " )" ); } //else if (DebugModeFlag) - WriteLog("EVENT EXECUTED: AddValues - " + - std::string(Event->Params[0].asText) + " " + - std::to_string(Event->Params[1].asdouble) + " " + - std::to_string(Event->Params[2].asdouble)); + WriteLog( + "EVENT EXECUTED" + ( Node ? ( " by " + Node->asName ) : "" ) + ": AddValues ( " + + std::string( Event->Params[ 0 ].asText ) + " " + + std::to_string( Event->Params[ 1 ].asdouble ) + " " + + std::to_string( Event->Params[ 2 ].asdouble ) + " )" ); } // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) - Event = Event->evJoined; + do { + Event = Event->evJoined; + // NOTE: we could've received a new event from joint event above, so we need to check conditions just in case and discard the bad events + // TODO: refactor this arrangement, it's hardly optimal + } while( ( Event != nullptr ) + && ( ( false == Event->bEnabled ) + || ( Event->iQueued > 0 ) ) ); } - if( Event != nullptr ) - { // standardowe dodanie do kolejki - WriteLog("EVENT ADDED TO QUEUE: " + Event->asName + (Node ? (" by " + Node->asName) : "")); - Event->fStartTime = - fabs(Event->fDelay) + Timer::GetTime(); // czas od uruchomienia scenerii - if (Event->fRandomDelay > 0.0) - Event->fStartTime += Event->fRandomDelay * Random(10000) * - 0.0001; // doliczenie losowego czasu opóźnienia + if( Event != nullptr ) { + // standardowe dodanie do kolejki ++Event->iQueued; // zabezpieczenie przed podwójnym dodaniem do kolejki - if( ( QueryRootEvent != nullptr ) - && ( Event->fStartTime > QueryRootEvent->fStartTime ) ) { - // dodanie gdzieś w środku - QueryRootEvent->AddToQuery( Event ); + WriteLog( "EVENT ADDED TO QUEUE" + ( Node ? ( " by " + Node->asName ) : "" ) + ": " + Event->asName ); + Event->fStartTime = std::abs( Event->fDelay ) + Timer::GetTime(); // czas od uruchomienia scenerii + if( Event->fRandomDelay > 0.0 ) { + // doliczenie losowego czasu opóźnienia + Event->fStartTime += Event->fRandomDelay * Random( 10000 ) * 0.0001; + } + if( QueryRootEvent != nullptr ) { + TEvent::AddToQuery( Event, QueryRootEvent ); } else { - // dodanie z przodu: albo nic nie ma, albo ma być wykonany szybciej niż pierwszy - Event->evNext = QueryRootEvent; QueryRootEvent = Event; + QueryRootEvent->evNext = nullptr; } } } + } return true; } @@ -3308,49 +3302,8 @@ bool TGround::CheckQuery() { // sprawdzenie kolejki eventów oraz wykonanie tych, którym czas minął TLocation loc; int i; - /* //Ra: to w ogóle jakiś chory kod jest; wygląda jak wyszukanie eventu z najlepszym czasem - Double evtime,evlowesttime; //Ra: co to za typ? - //evlowesttime=1000000; - if (QueryRootEvent) - { - OldQRE=QueryRootEvent; - tmpEvent=QueryRootEvent; - } - if (QueryRootEvent) - { - for (i=0;i<90;++i) - { - evtime=((tmpEvent->fStartTime)-(Timer::GetTime())); //pobranie wartości zmiennej - if (evtimeNext) - tmpEvent=tmpEvent->Next; - else - i=100; - } - if (OldQRE!=tmp2Event) - { - QueryRootEvent->AddToQuery(QueryRootEvent); - QueryRootEvent=tmp2Event; - } - } - */ - /* - if (QueryRootEvent) - {//wypisanie kolejki - tmpEvent=QueryRootEvent; - WriteLog("--> Event queue:"); - while (tmpEvent) - { - WriteLog(tmpEvent->asName+" "+AnsiString(tmpEvent->fStartTime)); - tmpEvent=tmpEvent->Next; - } - } - */ - while (QueryRootEvent ? QueryRootEvent->fStartTime < Timer::GetTime() : false) + while( ( QueryRootEvent != nullptr ) + && ( QueryRootEvent->fStartTime < Timer::GetTime() ) ) { // eventy są posortowana wg czasu wykonania tmpEvent = QueryRootEvent; // wyjęcie eventu z kolejki if (QueryRootEvent->evJoined) // jeśli jest kolejny o takiej samej nazwie @@ -3359,16 +3312,15 @@ bool TGround::CheckQuery() QueryRootEvent->evNext = tmpEvent->evNext; // pamiętając o następnym z kolejki QueryRootEvent->fStartTime = tmpEvent->fStartTime; // czas musi być ten sam, bo nie jest aktualizowany QueryRootEvent->Activator = tmpEvent->Activator; // pojazd aktywujący + QueryRootEvent->iQueued = 1; // w sumie można by go dodać normalnie do kolejki, ale trzeba te połączone posortować wg czasu wykonania } else // a jak nazwa jest unikalna, to kolejka idzie dalej QueryRootEvent = QueryRootEvent->evNext; // NULL w skrajnym przypadku if (tmpEvent->bEnabled) { // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć - WriteLog("EVENT LAUNCHED: " + tmpEvent->asName + - (tmpEvent->Activator ? - std::string(" by " + tmpEvent->Activator->asName) : - "" )); + --tmpEvent->iQueued; // teraz moze być ponownie dodany do kolejki + WriteLog( "EVENT LAUNCHED" + ( tmpEvent->Activator ? ( " by " + tmpEvent->Activator->asName ) : "" ) + ": " + tmpEvent->asName ); switch (tmpEvent->Type) { case tp_CopyValues: // skopiowanie wartości z innej komórki @@ -3530,29 +3482,20 @@ bool TGround::CheckQuery() conditional_anyelse)) // warunek spelniony albo było użyte else { WriteLog("Multiple passed"); - for (i = 0; i < 8; ++i) - { // dodawane do kolejki w kolejności zapisania - if (tmpEvent->Params[i].asEvent) - if (bCondition != (((tmpEvent->iFlags & (conditional_else << i)) != 0))) - { - if (tmpEvent->Params[i].asEvent != tmpEvent) - AddToQuery(tmpEvent->Params[i].asEvent, - tmpEvent->Activator); // normalnie dodać - else // jeśli ma być rekurencja - if (tmpEvent->fDelay >= - 5.0) // to musi mieć sensowny okres powtarzania - if (tmpEvent->iQueued < 2) - { // trzeba zrobić wyjątek, aby event mógł się sam dodać do - // kolejki, raz już jest, ale będzie usunięty - // pętla eventowa może być uruchomiona wiele razy, ale tylko - // pierwsze uruchomienie zadziała - tmpEvent->iQueued = - 0; // tymczasowo, aby był ponownie dodany do kolejki - AddToQuery(tmpEvent, tmpEvent->Activator); - tmpEvent->iQueued = - 2; // kolejny raz już absolutnie nie dodawać + for (i = 0; i < 8; ++i) { + // dodawane do kolejki w kolejności zapisania + if( tmpEvent->Params[ i ].asEvent ) { + if( bCondition != ( ( ( tmpEvent->iFlags & ( conditional_else << i ) ) != 0 ) ) ) { + if( tmpEvent->Params[ i ].asEvent != tmpEvent ) + AddToQuery( tmpEvent->Params[ i ].asEvent, tmpEvent->Activator ); // normalnie dodać + else { + // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania + if( tmpEvent->fDelay >= 5.0 ) { + AddToQuery( tmpEvent, tmpEvent->Activator ); } + } } + } } if (Global::iMultiplayer) // dajemy znać do serwera o wykonaniu if ((tmpEvent->iFlags & conditional_anyelse) == @@ -3635,22 +3578,6 @@ bool TGround::CheckQuery() break; } // switch (tmpEvent->Type) } // if (tmpEvent->bEnabled) - --tmpEvent->iQueued; // teraz moze być ponownie dodany do kolejki - /* - if (QueryRootEvent->eJoined) //jeśli jest kolejny o takiej samej nazwie - {//to teraz jego dajemy do wykonania - QueryRootEvent->eJoined->Next=QueryRootEvent->Next; //pamiętając o następnym z kolejki - QueryRootEvent->eJoined->fStartTime=QueryRootEvent->fStartTime; //czas musi być ten sam, - bo nie jest aktualizowany - //QueryRootEvent->fStartTime=0; - QueryRootEvent=QueryRootEvent->eJoined; //a wykonać ten doczepiony - } - else - {//a jak nazwa jest unikalna, to kolejka idzie dalej - //QueryRootEvent->fStartTime=0; - QueryRootEvent=QueryRootEvent->Next; //NULL w skrajnym przypadku - } - */ } // while return true; } diff --git a/Ground.h b/Ground.h index dd408880..d8d62ac5 100644 --- a/Ground.h +++ b/Ground.h @@ -274,9 +274,7 @@ class TGround TGroundRect Rects[iNumRects][iNumRects]; // mapa kwadratów kilometrowych TEvent *RootEvent = nullptr; // lista zdarzeń TEvent *QueryRootEvent = nullptr, - *tmpEvent = nullptr, - *tmp2Event = nullptr, - *OldQRE = nullptr; + *tmpEvent = nullptr; TSubRect *pRendered[1500]; // lista renderowanych sektorów int iNumNodes = 0; vector3 pOrigin; diff --git a/Train.cpp b/Train.cpp index 75bd2f53..61bc9138 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2881,10 +2881,12 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma if( false == TestFlag( Train->mvOccupied->WarningSignal, 1 ) ) { // turn on Train->mvOccupied->WarningSignal |= 1; +/* if( true == TestFlag( Train->mvOccupied->WarningSignal, 2 ) ) { // low and high horn are treated as mutually exclusive Train->mvControlled->WarningSignal &= ~2; } +*/ // audio feedback if( ( Train->ggHornButton.GetValue() > -0.5 ) || ( Train->ggHornLowButton.GetValue() < 0.5 ) ) { @@ -2897,8 +2899,11 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma } else if( Command.action == GLFW_RELEASE ) { // turn off +/* // NOTE: we turn off both low and high horn, due to unreliability of release event when shift key is involved Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); +*/ + Train->mvOccupied->WarningSignal &= ~1; // audio feedback if( ( Train->ggHornButton.GetValue() < -0.5 ) || ( Train->ggHornLowButton.GetValue() > 0.5 ) ) { @@ -2925,10 +2930,12 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm if( false == TestFlag( Train->mvOccupied->WarningSignal, 2 ) ) { // turn on Train->mvOccupied->WarningSignal |= 2; +/* if( true == TestFlag( Train->mvOccupied->WarningSignal, 1 ) ) { // low and high horn are treated as mutually exclusive Train->mvControlled->WarningSignal &= ~1; } +*/ // audio feedback if( Train->ggHornButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); @@ -2940,8 +2947,11 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm } else if( Command.action == GLFW_RELEASE ) { // turn off +/* // NOTE: we turn off both low and high horn, due to unreliability of release event when shift key is involved Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); +*/ + Train->mvOccupied->WarningSignal &= ~2; // audio feedback if( Train->ggHornButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); diff --git a/version.h b/version.h index cbf2eb2e..005e6949 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 531 +#define VERSION_MINOR 602 #define VERSION_REVISION 0 From 135ac514f4922fcdd65a8d93ccd021923f0aab93 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 3 Jun 2017 17:14:02 +0200 Subject: [PATCH 120/426] fix for trace route early return on full speed signal, fix for tachometers initialization --- Driver.cpp | 2 +- Ground.cpp | 8 ++++---- Train.cpp | 36 ++---------------------------------- Train.h | 22 ++++++++-------------- version.h | 2 +- 5 files changed, 16 insertions(+), 54 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 35daf905..98709cc7 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -481,7 +481,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) } // kontynuacja skanowania od ostatnio sprawdzonego toru (w ostatniej pozycji zawsze jest tor) if( ( SemNextStopIndex != -1 ) - && ( sSpeedTable[SemNextStopIndex].fVelNext < 1.0 ) ) { + && ( sSpeedTable[SemNextStopIndex].fVelNext == 0.0 ) ) { // znaleziono semafor lub tarczę lub tor z prędkością zero, trzeba sprawdzić czy to nadał semafor // jeśli jest następny semafor to sprawdzamy czy to on nadał zero if( ( OrderCurrentGet() & Obey_train ) diff --git a/Ground.cpp b/Ground.cpp index 54662956..c9fb6c68 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -3169,10 +3169,10 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) { // kolejka eventów jest posortowana względem (fStartTime) Event->Activator = Node; if( ( Event->Type == tp_AddValues ) - && ( Event->fDelay == 0.0 ) ) { - // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie - // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję - // wykonującą eventy i ją wywołać + && ( Event->fDelay == 0.0 ) ) { + // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie + // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję + // wykonującą eventy i ją wywołać if( EventConditon( Event ) ) { // teraz mogą być warunki do tych eventów Event->Params[ 5 ].asMemCell->UpdateValues( Event->Params[ 0 ].asText, Event->Params[ 1 ].asdouble, diff --git a/Train.cpp b/Train.cpp index 61bc9138..5a572617 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4400,16 +4400,6 @@ bool TTrain::Update( double const Deltatime ) { // ustawienie zmiennych dla silnika spalinowego fEngine[1] = mvControlled->ShowEngineRotation(1); fEngine[2] = mvControlled->ShowEngineRotation(2); - // if (ggEnrot1m.SubModel) - //{ - // ggEnrot1m.UpdateValue(mvControlled->ShowEngineRotation(1)); - // ggEnrot1m.Update(); - //} - // if (ggEnrot2m.SubModel) - //{ - // ggEnrot2m.UpdateValue(mvControlled->ShowEngineRotation(2)); - // ggEnrot2m.Update(); - //} } else if (mvControlled->EngineType == DieselEngine) @@ -4417,34 +4407,12 @@ bool TTrain::Update( double const Deltatime ) fEngine[1] = mvControlled->ShowEngineRotation(1); fEngine[2] = mvControlled->ShowEngineRotation(2); fEngine[3] = mvControlled->ShowEngineRotation(3); - // if (ggEnrot1m.SubModel) - //{ - // ggEnrot1m.UpdateValue(mvControlled->ShowEngineRotation(1)); - // ggEnrot1m.Update(); - //} - // if (ggEnrot2m.SubModel) - //{ - // ggEnrot2m.UpdateValue(mvControlled->ShowEngineRotation(2)); - // ggEnrot2m.Update(); - //} - // if (ggEnrot3m.SubModel) - // if (mvControlled->Couplers[1].Connected) - // { - // ggEnrot3m.UpdateValue(mvControlled->ShowEngineRotation(3)); - // ggEnrot3m.Update(); - // } - // if (ggEngageRatio.SubModel) - //{ - // ggEngageRatio.UpdateValue(mvControlled->dizel_engage); - // ggEngageRatio.Update(); - //} if (ggMainGearStatus.SubModel) { if (mvControlled->Mains) - ggMainGearStatus.UpdateValue(1.1 - - fabs(mvControlled->dizel_automaticgearstatus)); + ggMainGearStatus.UpdateValue(1.1 - std::abs(mvControlled->dizel_automaticgearstatus)); else - ggMainGearStatus.UpdateValue(0); + ggMainGearStatus.UpdateValue(0.0); ggMainGearStatus.Update(); } if (ggIgnitionKey.SubModel) diff --git a/Train.h b/Train.h index aab20177..c4b6b574 100644 --- a/Train.h +++ b/Train.h @@ -449,23 +449,17 @@ public: // reszta może by?publiczna int CAflag; // hunter-131211: dla osobnego zbijania CA i SHP double fPoslizgTimer; - // double fShpTimer; - // double fDblClickTimer; - // ABu: Przeniesione do public. - Wiem, ze to nieladnie... - // bool CabChange(int iDirection); - // bool InitializeCab(int NewCabNo, AnsiString asFileName); TTrack *tor; int keybrakecount; // McZapkie-240302 - przyda sie do tachometru - float fTachoVelocity; - float fTachoVelocityJump; // ze skakaniem - float fTachoTimer; - float fTachoCount; - float fHVoltage; // napi?cie dla dynamicznych ga?ek - float fHCurrent[4]; // pr?dy: suma i amperomierze 1,2,3 - float fEngine[4]; // obroty te? trzeba pobra? - int iCarNo, iPowerNo, iUnitNo; // liczba pojazdow, czlonow napednych i jednostek spiętych ze - // sobą + float fTachoVelocity{ 0.0f }; + float fTachoVelocityJump{ 0.0f }; // ze skakaniem + float fTachoTimer{ 0.0f }; + float fTachoCount{ 0.0f }; + float fHVoltage{ 0.0f }; // napi?cie dla dynamicznych ga?ek + float fHCurrent[ 4 ] = { 0.0f, 0.0f, 0.0f, 0.0f }; // pr?dy: suma i amperomierze 1,2,3 + float fEngine[ 4 ] = { 0.0f, 0.0f, 0.0f, 0.0f }; // obroty te? trzeba pobra? + int iCarNo, iPowerNo, iUnitNo; // liczba pojazdow, czlonow napednych i jednostek spiętych ze sobą bool bDoors[20][3]; // drzwi dla wszystkich czlonow int iUnits[20]; // numer jednostki int iDoorNo[20]; // liczba drzwi diff --git a/version.h b/version.h index 005e6949..b41d9f32 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 602 +#define VERSION_MINOR 603 #define VERSION_REVISION 0 From ba8c0dd96f1a8cb3574dfc58394d256ef3a37deb Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 3 Jun 2017 18:29:07 +0200 Subject: [PATCH 121/426] pre-merge with renderer_unification branch --- openglgeometrybank.cpp | 218 +++++++++++++++++++++++++++++++++++++++++ openglgeometrybank.h | 122 +++++++++++++++++++++++ 2 files changed, 340 insertions(+) create mode 100644 openglgeometrybank.cpp create mode 100644 openglgeometrybank.h diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp new file mode 100644 index 00000000..ec25b023 --- /dev/null +++ b/openglgeometrybank.cpp @@ -0,0 +1,218 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "openglgeometrybank.h" + +#include "sn_utils.h" + +void +basic_vertex::serialize( std::ostream &s ) { + + sn_utils::ls_float32( s, position.x ); + sn_utils::ls_float32( s, position.y ); + sn_utils::ls_float32( s, position.z ); + + sn_utils::ls_float32( s, normal.x ); + sn_utils::ls_float32( s, normal.y ); + sn_utils::ls_float32( s, normal.z ); + + sn_utils::ls_float32( s, texture.x ); + sn_utils::ls_float32( s, texture.y ); +} + +void +basic_vertex::deserialize( std::istream &s ) { + + position.x = sn_utils::ld_float32( s ); + position.y = sn_utils::ld_float32( s ); + position.z = sn_utils::ld_float32( s ); + + normal.x = sn_utils::ld_float32( s ); + normal.y = sn_utils::ld_float32( s ); + normal.z = sn_utils::ld_float32( s ); + + texture.x = sn_utils::ld_float32( s ); + texture.y = sn_utils::ld_float32( s ); +} + +// generic geometry bank class, allows storage, update and drawing of geometry chunks + +// creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk +geometrychunk_handle +geometry_bank::create( vertex_array &Vertices, int const Datatype ) { + + if( true == Vertices.empty() ) { return NULL; } + + m_chunks.emplace_back( Vertices, Datatype ); + // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication + return m_chunks.size(); +} + +// replaces data of specified chunk with the supplied vertex data, starting from specified offset +bool +geometry_bank::replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset ) { + + if( ( Chunk == 0 ) || ( Chunk > m_chunks.size() ) ) { return false; } + + auto &chunk = m_chunks[ Chunk - 1 ]; + + if( ( Offset == 0 ) + && ( Vertices.size() == chunk.vertices.size() ) ) { + // check first if we can get away with a simple swap... + chunk.vertices.swap( Vertices ); + } + else { + // ...otherwise we need to do some legwork + // NOTE: if the offset is larger than existing size of the chunk, it'll bridge the gap with 'blank' vertices + // TBD: we could bail out with an error instead if such request occurs + chunk.vertices.resize( Offset + Vertices.size(), basic_vertex() ); + chunk.vertices.insert( std::end( chunk.vertices ), std::begin( Vertices ), std::end( Vertices ) ); + } + return true; +} + +vertex_array & +geometry_bank::data( geometrychunk_handle const Chunk ) { + + return m_chunks.at( Chunk - 1 ).vertices; +} + +// opengl vbo-based variant of the geometry bank + +GLuint opengl_vbogeometrybank::m_activebuffer{ NULL }; // buffer bound currently on the opengl end, if any + +// creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk +geometrychunk_handle +opengl_vbogeometrybank::create( vertex_array &Vertices, int const Datatype ) { + + auto const handle = geometry_bank::create( Vertices, Datatype ); + if( handle == NULL ) { + // if we didn't get anything, bail early + return handle; + } + // adding a chunk means we'll be (re)building the buffer, which will fill the chunk records, amongst other things + // so we don't need to initialize the values here + m_chunkrecords.emplace_back( chunk_record() ); + // kiss the existing buffer goodbye, new overall data size means we'll be making a new one + delete_buffer(); + + return handle; +} + +// replaces data of specified chunk with the supplied vertex data, starting from specified offset +bool +opengl_vbogeometrybank::replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset ) { + + auto const result = geometry_bank::replace( Vertices, Chunk, Offset ); + if( false == result ) { + // if nothing happened we can bail out early + return result; + } + auto &chunkrecord = m_chunkrecords[ Chunk - 1 ]; + chunkrecord.is_good = false; + // if the overall length of the chunk didn't change we can get away with reusing the old buffer... + if( m_chunks[ Chunk - 1 ].vertices.size() != chunkrecord.size ) { + // ...but otherwise we'll need to allocate a new one + // TBD: we could keep and reuse the old buffer also if the new chunk is smaller than the old one, + // but it'd require some extra tracking and work to keep all chunks up to date; also wasting vram; may be not worth it? + delete_buffer(); + } + return result; +} + +// draws geometry stored in specified chunk +void +opengl_vbogeometrybank::draw( geometrychunk_handle const Chunk ) { + + if( m_buffer == NULL ) { + // if there's no buffer, we'll have to make one + // NOTE: this isn't exactly optimal in terms of ensuring the gfx card doesn't stall waiting for the data + // may be better to initiate upload earlier (during update phase) and trust this effort won't go to waste + if( true == m_chunks.empty() ) { return; } + + std::size_t datasize{ 0 }; + auto &chunkrecord = m_chunkrecords.begin(); + for( auto &chunk : m_chunks ) { + // fill all chunk records, based on the chunk data + chunkrecord->offset = datasize; + chunkrecord->size = chunk.vertices.size(); + datasize += chunkrecord->size; + ++chunkrecord; + } + // the odds for all created chunks to get replaced with empty ones are quite low, but the possibility does exist + if( datasize == 0 ) { return; } + // try to set up the buffer we need + ::glGenBuffers( 1, &m_buffer ); + bind_buffer(); + // NOTE: we're using static_draw since it's generally true for all we have implemented at the moment + // TODO: allow to specify usage hint at the object creation, and pass it here + ::glBufferData( + GL_ARRAY_BUFFER, + datasize * sizeof( basic_vertex ), + nullptr, + GL_STATIC_DRAW ); + m_buffercapacity = datasize; + } + // actual draw procedure starts here + // setup... + if( m_activebuffer != m_buffer ) { + bind_buffer(); + } + auto &chunkrecord = m_chunkrecords[ Chunk - 1 ]; + auto const &chunk = m_chunks[ Chunk - 1 ]; + if( false == chunkrecord.is_good ) { + // we may potentially need to upload new buffer data before we can draw it + ::glBufferSubData( + GL_ARRAY_BUFFER, + chunkrecord.offset * sizeof( basic_vertex ), + chunkrecord.size * sizeof( basic_vertex ), + chunk.vertices.data() ); + chunkrecord.is_good = true; + } + // ...render... + ::glDrawArrays( chunk.type, chunkrecord.offset, chunkrecord.size ); + // ...post-render cleanup +/* + ::glDisableClientState( GL_VERTEX_ARRAY ); + ::glDisableClientState( GL_NORMAL_ARRAY ); + ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + ::glBindBuffer( GL_ARRAY_BUFFER, 0 ); m_activebuffer = 0; +*/ +} + +void +opengl_vbogeometrybank::bind_buffer() { + + ::glBindBuffer( GL_ARRAY_BUFFER, m_buffer ); + // TODO: allow specifying other vertex data setups + ::glVertexPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) ); + ::glNormalPointer( GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + sizeof(float) * 3 ); // normalne + ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); // wierzchołki + // TODO: allow specifying other vertex data setups, either in the draw() parameters or during chunk or buffer creation + ::glEnableClientState( GL_VERTEX_ARRAY ); + ::glEnableClientState( GL_NORMAL_ARRAY ); + ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + + m_activebuffer = m_buffer; +} + +void +opengl_vbogeometrybank::delete_buffer() { + + if( m_buffer != NULL ) { + + ::glDeleteBuffers( 1, &m_buffer ); + if( m_activebuffer == m_buffer ) { + m_activebuffer = NULL; + } + m_buffer = NULL; + m_buffercapacity = 0; + } +} diff --git a/openglgeometrybank.h b/openglgeometrybank.h new file mode 100644 index 00000000..91969a29 --- /dev/null +++ b/openglgeometrybank.h @@ -0,0 +1,122 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include "GL/glew.h" +#ifdef _WINDOWS +#include "GL/wglew.h" +#endif + +struct basic_vertex { + glm::vec3 position; // 3d space + glm::vec3 normal; // 3d space + glm::vec2 texture; // uv space + + void serialize( std::ostream& ); + void deserialize( std::istream& ); +}; + +typedef std::vector vertex_array; + +// generic geometry bank class, allows storage, update and drawing of geometry chunks + +typedef std::size_t geometrychunk_handle; + +class geometry_bank { + +public: +// types: + +// constructors: + +// destructor: + virtual + ~geometry_bank() { ; } + +// methods: + // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk or NULL + virtual + geometrychunk_handle + create( vertex_array &Vertices, int const Datatype ); + // replaces data of specified chunk with the supplied vertex data, starting from specified offset + virtual + bool + replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset = 0 ); + // draws geometry stored in specified chunk + virtual + void + draw( geometrychunk_handle const Chunk ) = 0; + // draws geometry stored in supplied list of chunks + template + void + draw( _Iterator First, _Iterator Last ) { while( First != Last ) { draw( *First ); ++First; } } + vertex_array & + data( geometrychunk_handle const Chunk ); + +protected: +// types: + struct geometry_chunk { + int type; // kind of geometry used by the chunk + vertex_array vertices; // geometry data + + geometry_chunk( vertex_array &Vertices, int const Datatype ) : + vertices( Vertices ), type( Datatype ) + {} + }; + + typedef std::vector geometrychunk_sequence; + +// members: + geometrychunk_sequence m_chunks; + +}; + +// opengl vbo-based variant of the geometry bank + +class opengl_vbogeometrybank : public geometry_bank { + +public: +// methods: + // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk or NULL + geometrychunk_handle + create( vertex_array &Vertices, int const Datatype ); + // replaces data of specified chunk with the supplied vertex data, starting from specified offset + bool + replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset = 0 ); + // draws geometry stored in specified chunk + void + draw( geometrychunk_handle const Chunk ); + +private: +// types: + struct chunk_record{ + std::size_t offset{ 0 }; // beginning of the chunk data as offset from the beginning of the last established buffer + std::size_t size{ 0 }; // size of the chunk in the last established buffer + bool is_good{ false }; // true if local content of the chunk matches the data on the opengl end + }; + + typedef std::vector chunkrecord_sequence; + +// methods: + void + bind_buffer(); + void + delete_buffer(); + +// members: + static GLuint m_activebuffer; // buffer bound currently on the opengl end, if any + GLuint m_buffer{ NULL }; // id of the buffer holding data on the opengl end + std::size_t m_buffercapacity{ 0 }; // total capacity of the last established buffer + chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order + +}; From de5b245f2edb618d2cd9fba5a53e3e2ae02a8b54 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 8 Jun 2017 14:59:37 +0200 Subject: [PATCH 122/426] implemented geometry bank manager, unified traction render code --- DynObj.cpp | 2 +- DynObj.h | 2 +- Ground.cpp | 65 ++--- Ground.h | 58 ++-- McZapkie/MOVER.h | 4 +- Model3d.cpp | 177 ++++-------- Model3d.h | 21 +- Names.h | 8 +- Texture.cpp | 32 +-- Texture.h | 68 ++--- Track.h | 4 +- Traction.cpp | 625 +++++++++++------------------------------ Traction.h | 77 ++--- VBO.cpp | 4 +- VBO.h | 3 +- dumb3d.h | 4 +- openglgeometrybank.cpp | 209 +++++++++++--- openglgeometrybank.h | 172 ++++++++++-- openglmatrixstack.h | 20 +- parser.h | 8 +- renderer.cpp | 200 ++++++------- renderer.h | 113 ++++---- uilayer.h | 2 +- usefull.h | 28 +- 24 files changed, 875 insertions(+), 1031 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 16229e1d..9e588c3b 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3992,7 +3992,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // otherwise try the basic approach int skinindex = 0; do { - texture_manager::size_type texture = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), "", Global::iDynamicFiltering, true ); + texture_handle texture = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), "", Global::iDynamicFiltering, true ); if( false == GfxRenderer.Texture( texture ).is_ready ) { break; } diff --git a/DynObj.h b/DynObj.h index c61254d3..9b9cd735 100644 --- a/DynObj.h +++ b/DynObj.h @@ -143,7 +143,7 @@ class TAnim struct material_data { int textures_alpha{ 0x30300030 }; // maska przezroczystości tekstur. default: tekstury wymienne nie mają przezroczystości - texture_manager::size_type replacable_skins[ 5 ]; // McZapkie:zmienialne nadwozie + texture_handle replacable_skins[ 5 ]; // McZapkie:zmienialne nadwozie int multi_textures{ 0 }; //<0 tekstury wskazane wpisem, >0 tekstury z przecinkami, =0 jedna material_data() { diff --git a/Ground.cpp b/Ground.cpp index 7f18da04..62054b1d 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -380,7 +380,14 @@ void TSubRect::NodeAdd(TGroundNode *Node) // nRenderWires - lista grup renderowanych z własnych VBO albo DL - druty i linie // nMeshed - obiekty do pogrupowania wg tekstur - Node->m_rootposition = Math3D::vector3( m_area.center.x, m_area.center.y, m_area.center.z ) ; + Node->m_rootposition = Math3D::vector3( m_area.center.x, m_area.center.y, m_area.center.z ); + + // since ground rectangle can be empty, we're doing lazy initialization of the geometry bank, when something may actually use it + // NOTE: this method is called for both subcell and cell, but subcells get first created and passed the handle from their parent + // thus, this effectively only gets executed for the 'parent' ground cells. Not the most elegant, but for now it'll do + if( m_geometrybank == NULL ) { + m_geometrybank = GfxRenderer.Create_Bank(); + } switch (Node->iType) { @@ -756,9 +763,7 @@ void TSubRect::LoadNodes() m_nVertexCount += n->iNumVerts; break; case TP_TRACTION: - n->iVboPtr = m_nVertexCount; // nowy początek - n->iNumVerts = n->hvTraction->RaArrayPrepare(); // zliczenie wierzchołków - m_nVertexCount += n->iNumVerts; + n->hvTraction->create_geometry( m_geometrybank, n->m_rootposition ); break; } n = n->nNext2; // następny z sektora @@ -810,14 +815,7 @@ void TSubRect::LoadNodes() #endif } break; - case TP_TRACTION: - if( n->iNumVerts ) { // druty mogą być niewidoczne...? -#ifdef EU07_USE_OLD_VERTEXBUFFER - n->hvTraction->RaArrayFill( m_pVNT + n->iVboPtr, n->m_rootposition ); -#else - n->hvTraction->RaArrayFill( m_pVNT.data() + n->iVboPtr ); -#endif - } + default: break; } n = n->nNext2; // następny z sektora @@ -857,22 +855,25 @@ TGroundRect::~TGroundRect() void TGroundRect::Init() { + // since ground rectangle can be empty, we're doing lazy initialization of the geometry bank, when something may actually use it + if( m_geometrybank == NULL ) { + m_geometrybank = GfxRenderer.Create_Bank(); + } pSubRects = new TSubRect[ iNumSubRects * iNumSubRects ]; float const subrectsize = 1000.0f / iNumSubRects; for( int column = 0; column < iNumSubRects; ++column ) { for( int row = 0; row < iNumSubRects; ++row ) { - auto &area = SafeGetRect(column, row)->m_area; + auto subcell = FastGetRect( column, row ); + auto &area = subcell->m_area; area.center = m_area.center - glm::vec3( 500.0f, 0.0f, 500.0f ) // 'upper left' corner of rectangle + glm::vec3( subrectsize * 0.5f, 0.0f, subrectsize * 0.5f ) // center of sub-rectangle + glm::vec3( subrectsize * column, 0.0f, subrectsize * row ); -/* - // NOTE: the actual coordinates get swapped, as they're swapped in rest of the code :x - area.center = glm::vec3( area.center.z, area.center.y, area.center.x ); -*/ area.radius = subrectsize * M_SQRT2; + // all subcells share the same geometry bank with their parent, to reduce buffer switching during render + subcell->m_geometrybank = m_geometrybank; } } }; @@ -1822,8 +1823,11 @@ void TGround::FirstInit() Current->InitNormals(); if (Current->iType != TP_DYNAMIC) { // pojazdów w ogóle nie dotyczy dodawanie do mapy - if (i == TP_EVLAUNCH ? Current->EvLaunch->IsGlobal() : false) - srGlobal.NodeAdd(Current); // dodanie do globalnego obiektu + if( ( i == TP_EVLAUNCH ) + && ( true == Current->EvLaunch->IsGlobal() ) ) { + // dodanie do globalnego obiektu + srGlobal.NodeAdd( Current ); + } else if (i == TP_TERRAIN) { // specjalne przetwarzanie terenu wczytanego z pliku E3D TGroundRect *gr; @@ -1918,8 +1922,10 @@ bool TGround::Init(std::string File) if (!LastNode->Vertices) SafeDelete(LastNode); // usuwamy nieprzezroczyste trójkąty terenu } - else if ( ( LastNode->iType == TP_TRACTION ) && ( false == Global::bLoadTraction ) ) - SafeDelete(LastNode); // usuwamy druty, jeśli wyłączone + else if( ( LastNode->iType == TP_TRACTION ) + && ( false == Global::bLoadTraction ) ) { + SafeDelete( LastNode ); // usuwamy druty, jeśli wyłączone + } if (LastNode) // dopiero na koniec dopisujemy do tablic if (LastNode->iType != TP_DYNAMIC) @@ -4371,11 +4377,9 @@ void TGround::TerrainWrite() m->iNumVerts += Current->iNumVerts; // zwiększenie całkowitej ilości wierzchołków break; - case GL_TRIANGLE_STRIP: // na razie nie, bo trzeba przerabiać na pojedyncze - // trójkąty + case GL_TRIANGLE_STRIP: // na razie nie, bo trzeba przerabiać na pojedyncze trójkąty break; - case GL_TRIANGLE_FAN: // na razie nie, bo trzeba przerabiać na pojedyncze - // trójkąty + case GL_TRIANGLE_FAN: // na razie nie, bo trzeba przerabiać na pojedyncze trójkąty break; } for (Current = Rects[i][j].nRootNode; Current; Current = Current->nNext2) @@ -4383,15 +4387,10 @@ void TGround::TerrainWrite() switch (Current->iType) { // pętla po trójkątach - dopisywanie wierzchołków case GL_TRIANGLES: - // ver=sk->TrianglePtr(TTexturesManager::GetName(Current->TextureID).c_str(),Current->iNumVerts); // //wskaźnik na początek ver = sk->TrianglePtr(Current->TextureID, Current->iVboPtr, Current->Ambient, Current->Diffuse, Current->Specular); // wskaźnik na początek - // WriteLog("Zapis "+AnsiString(Current->iNumVerts)+" trójkątów w - // ("+AnsiString(i)+","+AnsiString(j)+") od - // "+AnsiString(Current->iVboPtr)+" dla - // "+AnsiString(Current->TextureID)); Current->iVboPtr = -1; // bo to było tymczasowo używane for (k = 0; k < Current->iNumVerts; ++k) { // przepisanie współrzędnych @@ -4405,11 +4404,9 @@ void TGround::TerrainWrite() ver[k].texture.t = Current->Vertices[k].tv; } break; - case GL_TRIANGLE_STRIP: // na razie nie, bo trzeba przerabiać na pojedyncze - // trójkąty + case GL_TRIANGLE_STRIP: // na razie nie, bo trzeba przerabiać na pojedyncze trójkąty break; - case GL_TRIANGLE_FAN: // na razie nie, bo trzeba przerabiać na pojedyncze - // trójkąty + case GL_TRIANGLE_FAN: // na razie nie, bo trzeba przerabiać na pojedyncze trójkąty break; } } diff --git a/Ground.h b/Ground.h index dd408880..08b6f4a7 100644 --- a/Ground.h +++ b/Ground.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include #include "GL/glew.h" +#include "openglgeometrybank.h" #include "VBO.h" #include "Classes.h" #include "ResourceManager.h" @@ -141,7 +142,7 @@ public: GLuint DisplayListID; // numer siatki DisplayLists bool PROBLEND; int iVboPtr; // indeks w buforze VBO - texture_manager::size_type TextureID; // główna (jedna) tekstura obiektu + texture_handle TextureID; // główna (jedna) tekstura obiektu int iFlags; // tryb przezroczystości: 0x10-nieprz.,0x20-przezroczysty,0x30-mieszany int Ambient[4], Diffuse[4], Specular[4]; // oświetlenie bool bVisible; @@ -235,32 +236,38 @@ class TGroundRect : public TSubRect // Ra: 2012-02 doszły submodele terenu friend class opengl_renderer; - private: +private: + TSubRect *pSubRects { nullptr }; int iLastDisplay; // numer klatki w której był ostatnio wyświetlany - TSubRect *pSubRects{ nullptr }; + void Init(); - public: - static int iFrameNumber; // numer kolejny wyświetlanej klatki - TGroundNode *nTerrain{ nullptr }; // model terenu z E3D - użyć nRootMesh? +public: virtual ~TGroundRect(); - - TSubRect * SafeGetRect(int iCol, int iRow) - { // pobranie wskaźnika do małego kwadratu, utworzenie jeśli trzeba - if (!pSubRects) - Init(); // utworzenie małych kwadratów + // pobranie wskaźnika do małego kwadratu, utworzenie jeśli trzeba + TSubRect * SafeGetRect(int iCol, int iRow) { + if( !pSubRects ) { + // utworzenie małych kwadratów + Init(); + } return pSubRects + iRow * iNumSubRects + iCol; // zwrócenie właściwego }; - TSubRect * FastGetRect(int iCol, int iRow) - { // pobranie wskaźnika do małego kwadratu, bez tworzenia jeśli nie ma + // pobranie wskaźnika do małego kwadratu, bez tworzenia jeśli nie ma + TSubRect * FastGetRect(int iCol, int iRow) { return (pSubRects ? pSubRects + iRow * iNumSubRects + iCol : NULL); }; - void Optimize() - { // optymalizacja obiektów w sektorach - if (pSubRects) - for (int i = iNumSubRects * iNumSubRects - 1; i >= 0; --i) - pSubRects[i].Sort(); // optymalizacja obiektów w sektorach + // optymalizacja obiektów w sektorach + void Optimize() { + if( pSubRects ) { + for( int i = iNumSubRects * iNumSubRects - 1; i >= 0; --i ) { + // optymalizacja obiektów w sektorach + pSubRects[ i ].Sort(); + } + } }; + + static int iFrameNumber; // numer kolejny wyświetlanej klatki + TGroundNode *nTerrain { nullptr }; // model terenu z E3D - użyć nRootMesh? }; class TGround @@ -269,7 +276,6 @@ class TGround vector3 CameraDirection; // zmienna robocza przy renderowaniu int const *iRange = nullptr; // tabela widoczności - // TGroundNode *nRootNode; //lista wszystkich węzłów TGroundNode *nRootDynamic = nullptr; // lista pojazdów TGroundRect Rects[iNumRects][iNumRects]; // mapa kwadratów kilometrowych TEvent *RootEvent = nullptr; // lista zdarzeń @@ -283,9 +289,7 @@ class TGround vector3 aRotate; bool bInitDone = false; TGroundNode *nRootOfType[TP_LAST]; // tablica grupująca obiekty, przyspiesza szukanie - // TGroundNode *nLastOfType[TP_LAST]; //ostatnia TSubRect srGlobal; // zawiera obiekty globalne (na razie wyzwalacze czasowe) - // int tracks,tracksfar; //liczniki torów typedef std::unordered_map event_map; event_map m_eventmap; TNames m_trackmap; @@ -296,7 +300,6 @@ class TGround public: bool bDynamicRemove = false; // czy uruchomić procedurę usuwania pojazdów - TDynamicObject *LastDyn = nullptr; // ABu: paskudnie, ale na bardzo szybko moze jakos przejdzie... TGround(); ~TGround(); @@ -311,17 +314,6 @@ class TGround TTraction * FindTraction(vector3 *Point, int &iConnection, TGroundNode *Exclude); TTraction * TractionNearestFind(vector3 &p, int dir, TGroundNode *n); TGroundNode * AddGroundNode(cParser *parser); - bool AddGroundNode(double x, double z, TGroundNode *Node) - { - TSubRect *tmp = GetSubRect(x, z); - if (tmp) - { - tmp->NodeAdd(Node); - return true; - } - else - return false; - }; void UpdatePhys(double dt, int iter); // aktualizacja fizyki stałym krokiem bool Update(double dt, int iter); // aktualizacja przesunięć zgodna z FPS void Update_Lights(); // updates scene lights array diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 36df83ce..26c3ad7b 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1228,9 +1228,9 @@ extract_value( std::string const &Key, std::string const &Input ) { return value; } -template +template bool -extract_value( _Type &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { +extract_value( Type_ &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { auto value = extract_value( Key, Input ); if( false == value.empty() ) { diff --git a/Model3d.cpp b/Model3d.cpp index 2d9ebfdb..3b86d474 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -29,7 +29,7 @@ using namespace Mtable; double TSubModel::fSquareDist = 0; size_t TSubModel::iInstance; // numer renderowanego egzemplarza obiektu -texture_manager::size_type const *TSubModel::ReplacableSkinId = NULL; +texture_handle const *TSubModel::ReplacableSkinId = NULL; int TSubModel::iAlpha = 0x30300030; // maska do testowania flag tekstur wymiennych TModel3d *TSubModel::pRoot; // Ra: tymczasowo wskaźnik na model widoczny z submodelu std::string *TSubModel::pasText; @@ -117,20 +117,20 @@ TSubModel::~TSubModel() // wyświetlania }; -void TSubModel::TextureNameSet(const char *n) +void TSubModel::TextureNameSet(std::string const &Name) { // ustawienie nazwy submodelu, o // ile nie jest wczytany z E3D if (iFlags & 0x0200) { // tylko jeżeli submodel zosta utworzony przez new - pTexture = std::string(n); + pTexture = Name; } }; -void TSubModel::NameSet(const char *n) +void TSubModel::NameSet(std::string const &Name) { // ustawienie nazwy submodelu, o ile // nie jest wczytany z E3D if (iFlags & 0x0200) - pName = std::string(n); + pName = Name; }; // int TSubModel::SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 @@ -204,9 +204,6 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) { // Ra: VBO tworzone na poziomie modelu, a nie submodeli iNumVerts = 0; iVboPtr = Pos; // pozycja w VBO - // TMaterialColorf Ambient,Diffuse,Specular; - // GLuint TextureID; - // char *extName; if (!parser.expectToken("type:")) Error("Model type parse failure!"); { @@ -224,22 +221,24 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) }; parser.ignoreToken(); std::string token; - // parser.getToken(token1); //ze zmianą na małe! parser.getTokens(1, false); // nazwa submodelu bez zmieny na małe parser >> token; - NameSet(token.c_str()); - if (dynamic) - { // dla pojazdu, blokujemy załączone submodele, które mogą być - // nieobsługiwane - if ( (token.size() >= 3) - && (token.find("_on") + 3 == token.length())) // jeśli nazwa kończy się na "_on" - iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z obiektem "_off" + NameSet(token); + if (dynamic) { + // dla pojazdu, blokujemy załączone submodele, które mogą być nieobsługiwane + if( ( token.size() >= 3 ) + && ( token.find( "_on" ) + 3 == token.length() ) ) { + // jeśli nazwa kończy się na "_on" to domyślnie wyłączyć, żeby się nie nakładało z obiektem "_off" + iVisible = 0; + } + } + else { + // dla pozostałych modeli blokujemy zapalone światła, które mogą być nieobsługiwane + if( token.compare( 0, 8, "Light_On" ) == 0 ) { + // jeśli nazwa zaczyna się od "Light_On" to domyślnie wyłączyć, żeby się nie nakładało z obiektem "Light_Off" + iVisible = 0; + } } - else // dla pozostałych modeli blokujemy zapalone światła, które mogą być - // nieobsługiwane - if (token.compare(0, 8, "Light_On") == 0) // jeśli nazwa zaczyna się od "Light_On" - iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z obiektem - // "Light_Off" if (parser.expectToken("anim:")) // Ra: ta informacja by się przydała! { // rodzaj animacji @@ -590,7 +589,7 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) return iNumVerts; // do określenia wielkości VBO }; -int TSubModel::TriangleAdd(TModel3d *m, texture_manager::size_type tex, int tri) +int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) { // dodanie trójkątów do submodelu, używane // przy tworzeniu E3D terenu TSubModel *s = this; @@ -644,6 +643,7 @@ basic_vertex *TSubModel::TrianglePtr(int tex, int pos, int *la, int *ld, int *ls return s->Vertices + pos; // wskaźnik na wolne miejsce w tabeli wierzchołków }; +#ifdef EU07_USE_OLD_RENDERCODE void TSubModel::DisplayLists() { // utworznie po jednej skompilowanej liście dla // każdego submodelu @@ -708,6 +708,7 @@ void TSubModel::DisplayLists() if (Next) Next->DisplayLists(); }; +#endif void TSubModel::InitialRotate(bool doit) { // konwersja układu współrzędnych na zgodny ze scenerią @@ -986,11 +987,6 @@ void TSubModel::RaAnimation(TAnimType a) break; case at_Billboard: // obrót w pionie do kamery { -/* - matrix4x4 mat; // potrzebujemy współrzędne przesunięcia środka układu - // współrzędnych submodelu - glGetDoublev(GL_MODELVIEW_MATRIX, mat.getArray()); // pobranie aktualnej matrycy -*/ matrix4x4 mat; mat.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); float3 gdzie = float3(mat[3][0], mat[3][1], mat[3][2]); // początek układu współrzędnych submodelu względem kamery glLoadIdentity(); // macierz jedynkowa @@ -1090,6 +1086,7 @@ void TSubModel::ColorsSet(int *a, int *d, int *s) for (i = 0; i < 4; ++i) f4Specular[i] = s[i] / 255.0; }; + void TSubModel::ParentMatrix(float4x4 *m) { // pobranie transformacji względem wstawienia modelu // jeśli nie zostało wykonane Init() (tzn. zaraz po wczytaniu T3D), to @@ -1107,68 +1104,41 @@ void TSubModel::ParentMatrix(float4x4 *m) // dla ostatniego może być potrzebny dodatkowy obrót, jeśli wczytano z T3D, a // nie obrócono jeszcze }; -float TSubModel::MaxY(const float4x4 &m) -{ // obliczenie maksymalnej wysokości, - // na początek ślizgu w pantografie - if (eType != 4) - return 0; // tylko dla trójkątów liczymy - if (iNumVerts < 1) - return 0; -/* - if (!Vertices) - return 0; - float y, - my = m[0][1] * Vertices[0].Point.x + m[1][1] * Vertices[0].Point.y + - m[2][1] * Vertices[0].Point.z + m[3][1]; - for (int i = 1; i < iNumVerts; ++i) - { - y = m[0][1] * Vertices[i].Point.x + m[1][1] * Vertices[i].Point.y + - m[2][1] * Vertices[i].Point.z + m[3][1]; - if (my < y) - my = y; - } -*/ - float my = - m[ 0 ][ 1 ] * Vertices[ 0 ].position.x - + m[ 1 ][ 1 ] * Vertices[ 0 ].position.y - + m[ 2 ][ 1 ] * Vertices[ 0 ].position.z - + m[ 3 ][ 1 ]; - float y; - for( int i = 1; i < iNumVerts; ++i ) { - y = - m[ 0 ][ 1 ] * Vertices[ i ].position.x - + m[ 1 ][ 1 ] * Vertices[ i ].position.y - + m[ 2 ][ 1 ] * Vertices[ i ].position.z - + m[ 3 ][ 1 ]; - if( my < y ) { my = y; } +float TSubModel::MaxY( float4x4 const &m ) +{ // obliczenie maksymalnej wysokości, na początek ślizgu w pantografie + if( eType != 4 ) { + // tylko dla trójkątów liczymy + return 0; } - return my; + if( m_geometry == NULL ) { + return 0; + } + + auto maxy { 0.0f }; + for( auto const &vertex : GfxRenderer.Vertices( m_geometry ) ) { + + maxy = std::max( + maxy, + m[ 0 ][ 1 ] * vertex.position.x + + m[ 1 ][ 1 ] * vertex.position.y + + m[ 2 ][ 1 ] * vertex.position.z + + m[ 3 ][ 1 ] ); + } + + return maxy; }; //--------------------------------------------------------------------------- TModel3d::TModel3d() { - // Materials=NULL; - // MaterialsCount=0; Root = NULL; iFlags = 0; iSubModelsCount = 0; iModel = NULL; // tylko jak wczytany model binarny iNumVerts = 0; // nie ma jeszcze wierzchołków }; -/* -TModel3d::TModel3d(char *FileName) -{ -// Root=NULL; -// Materials=NULL; -// MaterialsCount=0; -Root=NULL; -SubModelsCount=0; -iFlags=0; -LoadFromFile(FileName); -}; -*/ + TModel3d::~TModel3d() { // SafeDeleteArray(Materials); @@ -1227,18 +1197,6 @@ TSubModel *TModel3d::GetFromName(const char *sName) } }; -/* -TMaterial* TModel3d::GetMaterialFromName(char *sName) -{ -AnsiString tmp=AnsiString(sName).Trim(); -for (int i=0; i > submodeloffsets; submodeloffsets.reserve( iSubModelsCount ); - for( int idx = 0; idx < iSubModelsCount; ++idx ) { - auto &submodel = Root[ idx ]; + for( int submodelindex = 0; submodelindex < iSubModelsCount; ++submodelindex ) { + auto const &submodel = Root[ submodelindex ]; if( submodel.iNumVerts <= 0 ) { continue; } - submodeloffsets.emplace_back( submodel.tVboPtr, idx ); + submodeloffsets.emplace_back( submodel.tVboPtr, submodelindex ); } std::sort( submodeloffsets.begin(), submodeloffsets.end(), []( std::pair const &Left, std::pair const &Right ) { return (Left.first) < (Right.first); } ); - // once sorted we can grab geometry for the chunks as they come + // once sorted we can grab geometry as it comes, and assign it to the chunks it belongs to for( auto const &submodeloffset : submodeloffsets ) { auto &submodel = Root[ submodeloffset.second ]; vertex_array vertices; vertices.resize( submodel.iNumVerts ); @@ -1584,7 +1543,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) break; } } - submodel.m_chunk = m_geometry->create( vertices, type ); + submodel.m_geometry = GfxRenderer.Insert( vertices, m_geometrybank, type ); } } @@ -1639,12 +1598,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) for (size_t i = 0; (int)i < iSubModelsCount; ++i) { #ifdef EU07_USE_OLD_VERTEXBUFFER - Root[i].BinInit( - Root, tm, - ( Root[i].m_chunk ? - &m_geometry->data(Root[i].m_chunk)[0] : - nullptr ), - &Textures, &Names, dynamic); + Root[i].BinInit( Root, tm, &Textures, &Names, dynamic ); #else Root[ i ].BinInit( Root, tm, (float8*)m_pVNT.data(), &Textures, &Names, dynamic ); #endif @@ -1656,8 +1610,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) } } -void TSubModel::BinInit(TSubModel *s, float4x4 *m, basic_vertex *v, - std::vector *t, std::vector *n, bool dynamic) +void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, std::vector *n, bool dynamic) { // ustawienie wskaźników w submodelu //m7todo: brzydko iVisible = 1; // tymczasowo używane @@ -1720,7 +1673,6 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, basic_vertex *v, iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem tablic) iVboPtr = tVboPtr; - Vertices = v; }; void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) @@ -1812,15 +1764,9 @@ void TModel3d::Init() SaveToBinFile(asBinary.c_str()); // utworzy tablicę (m_pVNT) asBinary = ""; // zablokowanie powtórnego zapisu } - if (iNumVerts) +#ifdef EU07_USE_OLD_DRAW_CODE + if (iNumVerts) { -/* // NOTE: we will be applying distance factor dynamically during render, - // so we're leaving the defined ranges intact - if (Global::fDistanceFactor != - 1.0) // trochę zaoszczędzi czasu na modelach z wieloma submocelami - Root->AdjustDist(); // aktualizacja odległości faz LoD, zależnie od - // rozdzielczości pionowej oraz multisamplingu -*/ if (Global::bUseVBO) { #ifdef EU07_USE_OLD_VERTEXBUFFER @@ -1844,10 +1790,9 @@ void TModel3d::Init() { // przygotowanie skompilowanych siatek dla DisplayLists Root->DisplayLists(); // tworzenie skompilowanej listy dla submodelu } - // if (Root->TextureID) //o ile ma teksturę - // Root->iFlags|=0x80; //konieczność ustawienia tekstury } - } +#endif + } }; void TModel3d::BreakHierarhy() diff --git a/Model3d.h b/Model3d.h index 06a5c985..81049800 100644 --- a/Model3d.h +++ b/Model3d.h @@ -112,8 +112,8 @@ private: TSubModel *Next; TSubModel *Child; intptr_t iVboPtr; - geometrychunk_handle m_chunk; // geometry of the submodel - texture_manager::size_type TextureID; // numer tekstury, -1 wymienna, 0 brak + geometry_handle m_geometry; // geometry of the submodel + texture_handle TextureID; // numer tekstury, -1 wymienna, 0 brak bool bWire; // nie używane, ale wczytywane // short TexAlpha; //Ra: nie używane już GLuint uiDisplayList; // roboczy numer listy wyświetlania @@ -142,7 +142,7 @@ private: public: static size_t iInstance; // identyfikator egzemplarza, który aktualnie renderuje model - static texture_manager::size_type const *ReplacableSkinId; + static texture_handle const *ReplacableSkinId; static int iAlpha; // maska bitowa dla danego przebiegu static double fSquareDist; static TModel3d *pRoot; @@ -155,7 +155,7 @@ public: void NextAdd(TSubModel *SubModel); TSubModel * NextGet() { return Next; }; TSubModel * ChildGet() { return Child; }; - int TriangleAdd(TModel3d *m, texture_manager::size_type tex, int tri); + int TriangleAdd(TModel3d *m, texture_handle tex, int tri); basic_vertex * TrianglePtr(int tex, int pos, int *la, int *ld, int *ls); void SetRotate(float3 vNewRotateAxis, float fNewAngle); void SetRotateXYZ(vector3 vNewAngles); @@ -175,16 +175,17 @@ public: iFlags |= 0x4000; }; void InitialRotate(bool doit); +#ifdef EU07_USE_OLD_DRAW_CODE void DisplayLists(); - void BinInit(TSubModel *s, float4x4 *m, basic_vertex *v, - std::vector *t, std::vector *n, bool dynamic); - void ReplacableSet(texture_manager::size_type const *r, int a) +#endif + void BinInit(TSubModel *s, float4x4 *m, std::vector *t, std::vector *n, bool dynamic); + void ReplacableSet(texture_handle const *r, int a) { ReplacableSkinId = r; iAlpha = a; }; - void TextureNameSet(const char *n); - void NameSet(const char *n); + void TextureNameSet( std::string const &Name ); + void NameSet( std::string const &Name ); // Ra: funkcje do budowania terenu z E3D int Flags() { return iFlags; }; void UnFlagNext() { iFlags &= 0x00FFFFFF; }; @@ -202,7 +203,7 @@ public: return TextureID; } void ParentMatrix(float4x4 *m); - float MaxY(const float4x4 &m); + float MaxY( float4x4 const &m ); void AdjustDist(); void deserialize(std::istream&); diff --git a/Names.h b/Names.h index a4bbdf70..2a3addb6 100644 --- a/Names.h +++ b/Names.h @@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/. #include #include -template +template class TNames { public: @@ -26,7 +26,7 @@ public: // methods: // dodanie obiektu z wskaźnikiem. updates data field if the object already exists. returns true for insertion, false for update bool - Add( int const Type, std::string const &Name, _Type Data ) { + Add( int const Type, std::string const &Name, Type_ Data ) { auto lookup = find_map( Type ).emplace( Name, Data ); if( lookup.second == false ) { @@ -40,7 +40,7 @@ public: } } // returns pointer associated with provided label, or nullptr if there's no match - _Type + Type_ Find( int const Type, std::string const &Name ) { auto const &map = find_map( Type ); @@ -51,7 +51,7 @@ public: private: // types: - typedef std::unordered_map type_map; + typedef std::unordered_map type_map; typedef std::unordered_map typemap_map; // methods: diff --git a/Texture.cpp b/Texture.cpp index 3d2c2304..ba7abbfe 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -692,13 +692,9 @@ opengl_texture::downsize( GLuint const Format ) { }; } -void -texture_manager::Init() { -} - // ustalenie numeru tekstury, wczytanie jeśli jeszcze takiej nie było -texture_manager::size_type -texture_manager::GetTextureId( std::string Filename, std::string const &Dir, int const Filter, bool const Loadnow ) { +texture_handle +texture_manager::create( std::string Filename, std::string const &Dir, int const Filter, bool const Loadnow ) { if( Filename.find( '|' ) != std::string::npos ) Filename.erase( Filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury @@ -788,7 +784,7 @@ texture_manager::GetTextureId( std::string Filename, std::string const &Dir, int traits += '#'; } texture.traits = traits; - auto const textureindex = (texture_manager::size_type)m_textures.size(); + auto const textureindex = (texture_handle)m_textures.size(); m_textures.emplace_back( texture ); m_texturemappings.emplace( filename, textureindex ); @@ -796,9 +792,9 @@ texture_manager::GetTextureId( std::string Filename, std::string const &Dir, int if( true == Loadnow ) { - Texture( textureindex ).load(); + texture_manager::texture( textureindex ).load(); #ifndef EU07_DEFERRED_TEXTURE_UPLOAD - Texture( textureindex ).create(); + texture_manager::texture( textureindex ).create(); #endif } @@ -806,7 +802,7 @@ texture_manager::GetTextureId( std::string Filename, std::string const &Dir, int }; void -texture_manager::Bind( texture_manager::size_type const Id ) { +texture_manager::bind( texture_handle const Texture ) { /* // NOTE: this optimization disabled for the time being, until the render code is reviewed // having it active would lead to some terrain and spline chunks receiving wrong @@ -818,11 +814,11 @@ texture_manager::Bind( texture_manager::size_type const Id ) { } */ // TODO: do binding in texture object, add support for other types - if( Id != 0 ) { + if( Texture != 0 ) { #ifndef EU07_DEFERRED_TEXTURE_UPLOAD // NOTE: we could bind dedicated 'error' texture here if the id isn't valid - ::glBindTexture( GL_TEXTURE_2D, Texture(Id).id ); - m_activetexture = Texture(Id).id; + ::glBindTexture( GL_TEXTURE_2D, texture(Texture).id ); + m_activetexture = texture(Texture).id; #else if( Texture( Id ).bind() == resource_state::good ) { m_activetexture = Id; @@ -842,7 +838,7 @@ texture_manager::Bind( texture_manager::size_type const Id ) { } void -texture_manager::Free() { +texture_manager::delete_textures() { for( auto const &texture : m_textures ) { // usunięcie wszyskich tekstur (bez usuwania struktury) if( ( texture.id > 0 ) @@ -854,7 +850,7 @@ texture_manager::Free() { // debug performance string std::string -texture_manager::Info() const { +texture_manager::info() const { // TODO: cache this data and update only during resource sweep std::size_t totaltexturecount{ m_textures.size() - 1 }; @@ -892,8 +888,8 @@ texture_manager::Info() const { } // checks whether specified texture is in the texture bank. returns texture id, or npos. -texture_manager::size_type -texture_manager::find_in_databank( std::string const &Texturename ) { +texture_handle +texture_manager::find_in_databank( std::string const &Texturename ) const { auto lookup = m_texturemappings.find( Texturename ); if( lookup != m_texturemappings.end() ) { @@ -910,7 +906,7 @@ texture_manager::find_in_databank( std::string const &Texturename ) { // checks whether specified file exists. std::string -texture_manager::find_on_disk( std::string const &Texturename ) { +texture_manager::find_on_disk( std::string const &Texturename ) const { { std::ifstream file( Texturename ); diff --git a/Texture.h b/Texture.h index 8ed8c2dc..8ed49627 100644 --- a/Texture.h +++ b/Texture.h @@ -62,7 +62,7 @@ private: */ }; -typedef std::size_t texture_handle; +typedef int texture_handle; class texture_manager { @@ -70,68 +70,52 @@ private: typedef std::vector opengltexture_array; public: -// typedef opengltexture_array::size_type size_type; - typedef int size_type; - texture_manager(); - ~texture_manager() { Free(); } + ~texture_manager() { delete_textures(); } - size_type - GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ); + texture_handle + create( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ); void - Bind( size_type const Id ); + bind( texture_handle const Texture ); opengl_texture & - Texture( size_type const Id ) { return m_textures[ Id ]; } - void - Init(); - void - Free(); + texture( texture_handle const Texture ) { return m_textures[ Texture ]; } // debug performance string std::string - Info() const; + info() const; private: - typedef std::unordered_map index_map; -/* - opengltexture_array::size_type LoadFromFile(std::string name, int filter = -1); -*/ -/* - bool LoadBMP( std::string const &fileName); - bool LoadTEX( std::string fileName ); - bool LoadTGA( std::string fileName, int filter = -1 ); - bool LoadDDS( std::string fileName, int filter = -1 ); -*/ + typedef std::unordered_map index_map; + // checks whether specified texture is in the texture bank. returns texture id, or npos. - size_type find_in_databank( std::string const &Texturename ); + texture_handle + find_in_databank( std::string const &Texturename ) const; // checks whether specified file exists. returns name of the located file, or empty string. - std::string find_on_disk( std::string const &Texturename ); -/* - void SetFiltering(int filter); - void SetFiltering(bool alpha, bool hash); - GLuint CreateTexture(GLubyte *buff, GLint bpp, int width, int height, bool bHasAlpha, - bool bHash, bool bDollar = true, int filter = -1); -*/ - static const size_type npos{ 0 }; // should be -1, but the rest of the code uses -1 for something else + std::string + find_on_disk( std::string const &Texturename ) const; + void + delete_textures(); + + static const texture_handle npos{ 0 }; // should be -1, but the rest of the code uses -1 for something else opengltexture_array m_textures; index_map m_texturemappings; - size_type m_activetexture{ 0 }; // last i.e. currently bound texture + texture_handle m_activetexture{ 0 }; // last i.e. currently bound texture }; // reduces provided data image to half of original size, using basic 2x2 average -template +template void downsample( std::size_t const Width, std::size_t const Height, char *Imagedata ) { - _Colortype *destination = reinterpret_cast<_Colortype*>( Imagedata ); - _Colortype *sampler = reinterpret_cast<_Colortype*>( Imagedata ); + Colortype_ *destination = reinterpret_cast( Imagedata ); + Colortype_ *sampler = reinterpret_cast( Imagedata ); - _Colortype accumulator, color; + Colortype_ accumulator, color; /* _Colortype color; float component; */ - for( size_t row = 0; row < Height; row += 2, sampler += Width ) { // column movement advances us down another row - for( size_t column = 0; column < Width; column += 2, sampler += 2 ) { + for( std::size_t row = 0; row < Height; row += 2, sampler += Width ) { // column movement advances us down another row + for( std::size_t column = 0; column < Width; column += 2, sampler += 2 ) { /* // straightforward, but won't work with byte data auto color = ( @@ -158,8 +142,8 @@ downsample( std::size_t const Width, std::size_t const Height, char *Imagedata ) *destination++ = color; /* // "full" 8bit resolution - color = _Colortype(); component = 0; - for( int idx = 0; idx < sizeof( _Colortype ); ++idx ) { + color = Colortype_(); component = 0; + for( int idx = 0; idx < sizeof( Colortype_ ); ++idx ) { component = ( (*sampler)[idx] diff --git a/Track.h b/Track.h index be0f16c2..b51bb3a6 100644 --- a/Track.h +++ b/Track.h @@ -133,8 +133,8 @@ class TTrack : public Resource TTrack *trNext = nullptr; // odcinek od strony punktu 2 - to powinno być w segmencie TTrack *trPrev = nullptr; // odcinek od strony punktu 1 // McZapkie-070402: dodalem zmienne opisujace rozmiary tekstur - texture_manager::size_type TextureID1 = 0; // tekstura szyn albo nawierzchni - texture_manager::size_type TextureID2 = 0; // tekstura automatycznej podsypki albo pobocza + texture_handle TextureID1 = 0; // tekstura szyn albo nawierzchni + texture_handle TextureID2 = 0; // tekstura automatycznej podsypki albo pobocza float fTexLength = 4.0f; // długość powtarzania tekstury w metrach float fTexRatio1 = 1.0f; // proporcja boków tekstury nawierzchni (żeby zaoszczędzić na rozmiarach tekstur...) float fTexRatio2 = 1.0f; // proporcja boków tekstury chodnika (żeby zaoszczędzić na rozmiarach tekstur...) diff --git a/Traction.cpp b/Traction.cpp index c7add93a..da00856e 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -18,7 +18,6 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "mctools.h" #include "TractionPower.h" -#include "renderer.h" //--------------------------------------------------------------------------- /* @@ -91,274 +90,32 @@ jawnie nazwę sekcji, ewentualnie nazwę zasilacza (zostanie zastąpiona wskazan sekcji z sąsiedniego przęsła). */ -TTraction::TTraction() -{ - hvNext[ 0 ] = nullptr; - hvNext[ 1 ] = nullptr; - psPower[ 0 ] = nullptr; - psPower[ 1 ] = nullptr; // na początku zasilanie nie podłączone - iNext[ 0 ] = 0; - iNext[ 1 ] = 0; - fResistance[ 0 ] = -1.0; - fResistance[ 1 ] = -1.0; // trzeba dopiero policzyć -} +std::size_t +TTraction::create_geometry( geometrybank_handle const &Bank, Math3D::vector3 const &Origin ) { -TTraction::~TTraction() -{ - if (!Global::bUseVBO) - glDeleteLists(uiDisplayList, 1); -} - -void TTraction::Optimize( Math3D::vector3 const &Origin ) -{ - if (Global::bUseVBO) - return; - uiDisplayList = glGenLists(1); - glNewList(uiDisplayList, GL_COMPILE); - - if (Wires != 0) - { - // Dlugosc odcinka trakcji 'Winger - double ddp = std::hypot(pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z); - if (Wires == 2) - WireOffset = 0; - // Przewoz jezdny 1 'Marcin - glBegin(GL_LINE_STRIP); - glVertex3f( - pPoint1.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, - pPoint1.y - Origin.y, - pPoint1.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z); - glVertex3f( - pPoint2.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, - pPoint2.y - Origin.y, - pPoint2.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); - glEnd(); - // Nie wiem co 'Marcin - Math3D::vector3 pt1, pt2, pt3, pt4, v1, v2; - v1 = pPoint4 - pPoint3; - v2 = pPoint2 - pPoint1; - float step = 0; - if (iNumSections > 0) - step = 1.0f / (float)iNumSections; - float f = step; - float mid = 0.5; - float t; - // Przewod nosny 'Marcin - if (Wires > 1) - { - glBegin(GL_LINE_STRIP); - glVertex3f( - pPoint3.x - Origin.x, - pPoint3.y - Origin.y, - pPoint3.z - Origin.z ); - for (int i = 0; i < iNumSections - 1; ++i) - { - pt3 = pPoint3 + v1 * f; - t = (1 - std::fabs(f - mid) * 2); - if ((Wires < 4) || ((i != 0) && (i != iNumSections - 2))) - glVertex3f( - pt3.x - Origin.x, - pt3.y - std::sqrt(t) * fHeightDifference - Origin.y, - pt3.z - Origin.z ); - f += step; - } - glVertex3f( - pPoint4.x - Origin.x, - pPoint4.y - Origin.y, - pPoint4.z - Origin.z ); - glEnd(); - } - // Drugi przewod jezdny 'Winger - if (Wires > 2) - { - glBegin(GL_LINE_STRIP); - glVertex3f( - pPoint1.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, - pPoint1.y - Origin.y, - pPoint1.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); - glVertex3f( - pPoint2.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, - pPoint2.y - Origin.y, - pPoint2.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); - glEnd(); - } - - f = step; - - if (Wires == 4) - { - glBegin(GL_LINE_STRIP); - glVertex3f( - pPoint3.x - Origin.x, - pPoint3.y - 0.65f * fHeightDifference - Origin.y, - pPoint3.z - Origin.z ); - for (int i = 0; i < iNumSections - 1; ++i) - { - pt3 = pPoint3 + v1 * f; - t = (1 - std::fabs(f - mid) * 2); - glVertex3f( - pt3.x - Origin.x, - pt3.y - std::sqrt( t ) * fHeightDifference - ( - ( ( i == 0 ) - || ( i == iNumSections - 2 ) ) ? - 0.25f * fHeightDifference : - 0.05 ) - - Origin.y, - pt3.z - Origin.z ); - f += step; - } - glVertex3f( - pPoint4.x - Origin.x, - pPoint4.y - 0.65f * fHeightDifference - Origin.y, - pPoint4.z - Origin.z ); - glEnd(); - } - - f = step; - - // Przewody pionowe (wieszaki) 'Marcin, poprawki na 2 przewody jezdne 'Winger - if (Wires != 1) - { - glBegin(GL_LINES); - for (int i = 0; i < iNumSections - 1; ++i) - { - float flo, flo1; - flo = (Wires == 4 ? 0.25f * fHeightDifference : 0); - flo1 = (Wires == 4 ? +0.05 : 0); - pt3 = pPoint3 + v1 * f; - pt4 = pPoint1 + v2 * f; - t = (1 - std::fabs(f - mid) * 2); - if ((i % 2) == 0) - { - glVertex3f( - pt3.x - Origin.x, - pt3.y - std::sqrt(t) * fHeightDifference - ((i == 0) || (i == iNumSections - 2) ? flo : flo1) - Origin.y, - pt3.z - Origin.z ); - glVertex3f( - pt4.x - (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, - pt4.y - Origin.y, - pt4.z - (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); - } - else - { - glVertex3f( - pt3.x - Origin.x, - pt3.y - std::sqrt(t) * fHeightDifference - ((i == 0) || (i == iNumSections - 2) ? flo : flo1) - Origin.y, - pt3.z - Origin.z ); - glVertex3f( - pt4.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x, - pt4.y - Origin.y, - pt4.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z ); - } - if ((Wires == 4) && ((i == 1) || (i == iNumSections - 3))) - { - glVertex3f( - pt3.x - Origin.x, - pt3.y - std::sqrt(t) * fHeightDifference - 0.05 - Origin.y, - pt3.z - Origin.z ); - glVertex3f( - pt3.x - Origin.x, - pt3.y - std::sqrt(t) * fHeightDifference - Origin.y, - pt3.z - Origin.z ); - } - f += step; - } - glEnd(); - } - glEndList(); + if( m_geometry != NULL ) { + return GfxRenderer.Vertices( m_geometry ).size() / 2; } -} -/* -void TTraction::InitCenter(vector3 Angles, vector3 pOrigin) -{ - pPosition= (pPoint2+pPoint1)*0.5f; - fSquaredRadius= SquareMagnitude((pPoint2-pPoint1)*0.5f); -} */ -void TTraction::RenderDL(float mgn, Math3D::vector3 const &Origin ) // McZapkie: mgn to odleglosc od obserwatora -{ - // McZapkie: ustalanie przezroczystosci i koloru linii: - if( Wires != 0 && !TestFlag( DamageFlag, 128 ) ) // rysuj jesli sa druty i nie zerwana - { - // setup - GfxRenderer.Bind( 0 ); - if( !Global::bSmoothTraction ) { - // na liniach kiepsko wygląda - robi gradient - ::glDisable( GL_LINE_SMOOTH ); - } - float linealpha = 5000 * WireThickness / ( mgn + 1.0 ); //*WireThickness - linealpha = std::min( 1.2f, linealpha ); // zbyt grube nie są dobre - ::glLineWidth( linealpha ); - // McZapkie-261102: kolor zalezy od materialu i zasniedzenia - float - red{ 0.0f }, - green{ 0.0f }, - blue{ 0.0f }; - wire_color( red, green, blue ); - ::glColor4f( red, green, blue, linealpha ); - // draw code - if (!uiDisplayList) - Optimize( Origin ); // generowanie DL w miarę potrzeby - ::glCallList(uiDisplayList); - // cleanup - ::glLineWidth(1.0); - ::glEnable(GL_LINE_SMOOTH); - } -} + vertex_array vertices; -// przygotowanie tablic do skopiowania do VBO (zliczanie wierzchołków) -int TTraction::RaArrayPrepare() -{ - // jezdny - iLines = 2; - // przewod nosny - if( Wires > 1 ) { - iLines += 2 + ( - Wires < 4 ? - std::max( 0, iNumSections - 1 ) : - ( iNumSections > 2 ? - std::max( 0, iNumSections - 1 - 2 ) : - std::max( 0, iNumSections - 1 - 1 ) ) ); - } - // drugi przewod jezdny - if( Wires > 2 ) { - iLines += 2; - } - if( Wires == 4 ) { - iLines += 2 + std::max( 0, iNumSections - 1 ); - } - // przewody pionowe (wieszaki) - if( Wires > 1 ) { - iLines += 2 * ( std::max( 0, iNumSections - 1 ) ); - if( ( Wires == 4 ) - &&( iNumSections > 0 ) ) { - iLines += ( - iNumSections > 4 ? - 4 : - 2 ); - } - } - return iLines; -}; - -int TTraction::RaArrayFill(CVertNormTex *Vert, Math3D::vector3 const &Origin) -{ // wypełnianie tablic VBO - int debugvertexcount{ 0 }; - - double ddp = std::hypot(pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z); - if (Wires == 2) + double ddp = std::hypot( pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z ); + if( Wires == 2 ) WireOffset = 0; // jezdny - Vert->x = pPoint1.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x; - Vert->y = pPoint1.y - Origin.y; - Vert->z = pPoint1.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z; - ++Vert; - ++debugvertexcount; - Vert->x = pPoint2.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x; - Vert->y = pPoint2.y - Origin.y; - Vert->z = pPoint2.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z; - ++Vert; - ++debugvertexcount; + basic_vertex startvertex, endvertex; + startvertex.position = + glm::vec3( + pPoint1.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, + pPoint1.y - Origin.y, + pPoint1.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + endvertex.position = + glm::vec3( + pPoint2.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, + pPoint2.y - Origin.y, + pPoint2.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + vertices.emplace_back( startvertex ); + vertices.emplace_back( endvertex ); // Nie wiem co 'Marcin Math3D::vector3 pt1, pt2, pt3, pt4, v1, v2; v1 = pPoint4 - pPoint3; @@ -370,201 +127,152 @@ int TTraction::RaArrayFill(CVertNormTex *Vert, Math3D::vector3 const &Origin) float mid = 0.5; float t; // Przewod nosny 'Marcin - if (Wires > 1) - { // lina nośna w kawałkach - Vert->x = pPoint3.x - Origin.x; - Vert->y = pPoint3.y - Origin.y; - Vert->z = pPoint3.z - Origin.z; - ++Vert; - ++debugvertexcount; - for (int i = 0; i < iNumSections - 1; ++i) - { + if( Wires > 1 ) { // lina nośna w kawałkach + startvertex.position = + glm::vec3( + pPoint3.x - Origin.x, + pPoint3.y - Origin.y, + pPoint3.z - Origin.z ); + for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; - t = (1 - std::fabs(f - mid) * 2); + t = ( 1 - std::fabs( f - mid ) * 2 ); if( ( Wires < 4 ) || ( ( i != 0 ) && ( i != iNumSections - 2 ) ) ) { - Vert->x = pt3.x - Origin.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - Origin.y; - Vert->z = pt3.z - Origin.z; - ++Vert; - ++debugvertexcount; + endvertex.position = + glm::vec3( + pt3.x - Origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - Origin.y, + pt3.z - Origin.z ); + vertices.emplace_back( startvertex ); + vertices.emplace_back( endvertex ); + startvertex = endvertex; } f += step; } - Vert->x = pPoint4.x - Origin.x; - Vert->y = pPoint4.y - Origin.y; - Vert->z = pPoint4.z - Origin.z; - ++Vert; - ++debugvertexcount; + endvertex.position = + glm::vec3( + pPoint4.x - Origin.x, + pPoint4.y - Origin.y, + pPoint4.z - Origin.z ); + vertices.emplace_back( startvertex ); + vertices.emplace_back( endvertex ); } // Drugi przewod jezdny 'Winger - if (Wires > 2) - { - Vert->x = pPoint1.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x; - Vert->y = pPoint1.y - Origin.y; - Vert->z = pPoint1.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z; - ++Vert; - ++debugvertexcount; - Vert->x = pPoint2.x + (pPoint2.z / ddp - pPoint1.z / ddp) * WireOffset - Origin.x; - Vert->y = pPoint2.y - Origin.y; - Vert->z = pPoint2.z + (-pPoint2.x / ddp + pPoint1.x / ddp) * WireOffset - Origin.z; - ++Vert; - ++debugvertexcount; + if( Wires > 2 ) { + startvertex.position = + glm::vec3( + pPoint1.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, + pPoint1.y - Origin.y, + pPoint1.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + endvertex.position = + glm::vec3( + pPoint2.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, + pPoint2.y - Origin.y, + pPoint2.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + vertices.emplace_back( startvertex ); + vertices.emplace_back( endvertex ); } f = step; if( Wires == 4 ) { - Vert->x = pPoint3.x - Origin.x; - Vert->y = pPoint3.y - 0.65f * fHeightDifference - Origin.y; - Vert->z = pPoint3.z - Origin.z; - ++Vert; - ++debugvertexcount; + startvertex.position = + glm::vec3( + pPoint3.x - Origin.x, + pPoint3.y - 0.65f * fHeightDifference - Origin.y, + pPoint3.z - Origin.z ); for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; t = ( 1 - std::fabs( f - mid ) * 2 ); - Vert->x = pt3.x - Origin.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( - ( ( i == 0 ) - || ( i == iNumSections - 2 ) ) ? - 0.25f * fHeightDifference : - 0.05 ) - - Origin.y; - Vert->z = pt3.z - Origin.z; - ++Vert; - ++debugvertexcount; + endvertex.position = + glm::vec3( + pt3.x - Origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - ( + ( ( i == 0 ) + || ( i == iNumSections - 2 ) ) ? + 0.25f * fHeightDifference : + 0.05 ) + - Origin.y, + pt3.z - Origin.z ); + vertices.emplace_back( startvertex ); + vertices.emplace_back( endvertex ); + startvertex = endvertex; f += step; } - Vert->x = pPoint4.x - Origin.x; - Vert->y = pPoint4.y - 0.65f * fHeightDifference - Origin.y; - Vert->z = pPoint4.z - Origin.z; - ++Vert; - ++debugvertexcount; + endvertex.position = + glm::vec3( + pPoint4.x - Origin.x, + pPoint4.y - 0.65f * fHeightDifference - Origin.y, + pPoint4.z - Origin.z ); + vertices.emplace_back( startvertex ); + vertices.emplace_back( endvertex ); } f = step; // Przewody pionowe (wieszaki) 'Marcin, poprawki na 2 przewody jezdne 'Winger - if (Wires > 1) - { - for (int i = 0; i < iNumSections - 1; ++i) - { + if( Wires > 1 ) { + for( int i = 0; i < iNumSections - 1; ++i ) { float flo, flo1; flo = ( Wires == 4 ? 0.25f * fHeightDifference : 0 ); flo1 = ( Wires == 4 ? +0.05 : 0 ); pt3 = pPoint3 + v1 * f; pt4 = pPoint1 + v2 * f; - t = (1 - std::fabs(f - mid) * 2); + t = ( 1 - std::fabs( f - mid ) * 2 ); if( ( i % 2 ) == 0 ) { - Vert->x = pt3.x - Origin.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - Origin.y; - Vert->z = pt3.z - Origin.z; - ++Vert; - ++debugvertexcount; - Vert->x = pt4.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x; - Vert->y = pt4.y - Origin.y; - Vert->z = pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z; - ++Vert; - ++debugvertexcount; + startvertex.position = + glm::vec3( + pt3.x - Origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - Origin.y, + pt3.z - Origin.z ); + endvertex.position = + glm::vec3( + pt4.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, + pt4.y - Origin.y, + pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + vertices.emplace_back( startvertex ); + vertices.emplace_back( endvertex ); } else { - Vert->x = pt3.x - Origin.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - Origin.y; - Vert->z = pt3.z - Origin.z; - ++Vert; - ++debugvertexcount; - Vert->x = pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x; - Vert->y = pt4.y - Origin.y; - Vert->z = pt4.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z; - ++Vert; - ++debugvertexcount; + startvertex.position = + glm::vec3( + pt3.x - Origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - Origin.y, + pt3.z - Origin.z ); + endvertex.position = + glm::vec3( + pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, + pt4.y - Origin.y, + pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + vertices.emplace_back( startvertex ); + vertices.emplace_back( endvertex ); } if( ( ( Wires == 4 ) && ( ( i == 1 ) || ( i == iNumSections - 3 ) ) ) ) { - Vert->x = pt3.x - Origin.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - 0.05 - Origin.y; - Vert->z = pt3.z - Origin.z; - ++Vert; - ++debugvertexcount; - Vert->x = pt3.x - Origin.x; - Vert->y = pt3.y - std::sqrt( t ) * fHeightDifference - Origin.y; - Vert->z = pt3.z - Origin.z; - ++Vert; - ++debugvertexcount; + startvertex.position = + glm::vec3( + pt3.x - Origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - 0.05 - Origin.y, + pt3.z - Origin.z ); + endvertex.position = + glm::vec3( + pt3.x - Origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - Origin.y, + pt3.z - Origin.z ); + vertices.emplace_back( startvertex ); + vertices.emplace_back( endvertex ); } f += step; } } - return debugvertexcount; -}; -void TTraction::RenderVBO(float mgn, int iPtr) -{ // renderowanie z użyciem VBO - if (Wires != 0 && !TestFlag(DamageFlag, 128)) // rysuj jesli sa druty i nie zerwana - { - // setup - GfxRenderer.Bind(0); - if( !Global::bSmoothTraction ) { - // na liniach kiepsko wygląda - robi gradient - ::glDisable( GL_LINE_SMOOTH ); - } - float linealpha = 5000 * WireThickness / (mgn + 1.0); //*WireThickness - linealpha = std::min( 1.2f, linealpha ); // zbyt grube nie są dobre - ::glLineWidth(linealpha); - // McZapkie-261102: kolor zalezy od materialu i zasniedzenia - float - red{ 0.0f }, - green{ 0.0f }, - blue{ 0.0f }; - wire_color( red, green, blue ); - ::glColor4f(red, green, blue, linealpha); - // draw code - // jezdny - ::glDrawArrays( GL_LINE_STRIP, iPtr, 2 ); - iPtr += 2; - // przewod nosny - if( Wires > 1 ) { - auto const piececount = 2 + ( - Wires < 4 ? - std::max( 0 , iNumSections - 1 ) : - ( iNumSections > 2 ? - std::max( 0, iNumSections - 1 - 2 ) : - std::max( 0, iNumSections - 1 - 1 ) ) ); - ::glDrawArrays( GL_LINE_STRIP, iPtr, piececount ); - iPtr += piececount; - } - // drugi przewod jezdny - if( Wires > 2 ) { - ::glDrawArrays( GL_LINE_STRIP, iPtr, 2 ); - iPtr += 2; - } - if( Wires == 4 ) { - auto const piececount = 2 + std::max( 0, iNumSections - 1 ); - ::glDrawArrays( GL_LINE_STRIP, iPtr, piececount ); - iPtr += piececount; - } - // przewody pionowe (wieszaki) - if( Wires != 1 ) { - auto piececount = 2 * std::max( 0, iNumSections - 1 ); - if( ( Wires == 4 ) - && ( iNumSections > 0 ) ) { - piececount += ( - iNumSections > 4 ? - 4 : - 2 ); - } - if( piececount > 0 ) { - ::glDrawArrays( GL_LINES, iPtr, piececount ); - iPtr += piececount; - } - } - // cleanup - ::glLineWidth(1.0); - ::glEnable(GL_LINE_SMOOTH); - } -}; + auto const elementcount = vertices.size() / 2; + m_geometry = GfxRenderer.Insert( vertices, Bank, GL_LINES ); + + return elementcount; +} int TTraction::TestPoint(Math3D::vector3 *Point) { // sprawdzanie, czy przęsła można połączyć @@ -633,24 +341,10 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) else ps = psPower[d ^ 1]; // zasilacz od przeciwnej strony niż idzie analiza d = iNext[d]; // kierunek -#ifdef EU07_USE_OLD_TRACTIONPOWER_CODE - if (DebugModeFlag) // tylko podczas testów - Material = 4; // pokazanie, że to przęsło ma podłączone zasilanie -#else PowerState = 4; -#endif while( ( t != nullptr ) && ( t->psPower[d] == nullptr ) ) // jeśli jest jakiś kolejny i nie ma ustalonego zasilacza { // ustawienie zasilacza i policzenie rezystancji zastępczej -#ifdef EU07_USE_OLD_TRACTIONPOWER_CODE - if (DebugModeFlag) // tylko podczas testów - if (t->Material != 4) // przęsła zasilającego nie modyfikować - { - if (t->Material < 4) - t->Material = 4; // tymczasowo, aby zmieniła kolor - t->Material |= d ? 2 : 1; // kolor zależny od strony, z której jest zasilanie - } -#else if( t->PowerState != 4 ) { // przęsła zasilającego nie modyfikować if( t->psPowered != nullptr ) { @@ -662,7 +356,6 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) t->PowerState |= d ? 2 : 1; } } -#endif t->psPower[d] = ps; // skopiowanie wskaźnika zasilacza od danej strony t->fResistance[d] = r; // wpisanie rezystancji w kierunku tego zasilacza r += t->fResistivity * Length3(t->vParametric); // doliczenie oporu kolejnego odcinka @@ -749,44 +442,45 @@ double TTraction::VoltageGet(double u, double i) return 0.0; // gdy nie podłączony wcale? }; -void -TTraction::wire_color( float &Red, float &Green, float &Blue ) const { +glm::vec3 +TTraction::wire_color() const { + glm::vec3 color; if( false == DebugModeFlag ) { switch( Material ) { // Ra: kolory podzieliłem przez 2, bo po zmianie ambient za jasne były // trzeba uwzględnić kierunek świecenia Słońca - tylko ze Słońcem widać kolor case 1: { if( TestFlag( DamageFlag, 1 ) ) { - Red = 0.00000f; - Green = 0.32549f; - Blue = 0.2882353f; // zielona miedź + color.r = 0.00000f; + color.g = 0.32549f; + color.b = 0.2882353f; // zielona miedź } else { - Red = 0.35098f; - Green = 0.22549f; - Blue = 0.1f; // czerwona miedź + color.r = 0.35098f; + color.g = 0.22549f; + color.b = 0.1f; // czerwona miedź } break; } case 2: { if( TestFlag( DamageFlag, 1 ) ) { - Red = 0.10f; - Green = 0.10f; - Blue = 0.10f; // czarne Al + color.r = 0.10f; + color.g = 0.10f; + color.b = 0.10f; // czarne Al } else { - Red = 0.25f; - Green = 0.25f; - Blue = 0.25f; // srebrne Al + color.r = 0.25f; + color.g = 0.25f; + color.b = 0.25f; // srebrne Al } break; } default: {break; } } // w zaleźności od koloru swiatła - Red *= Global::DayLight.ambient[ 0 ]; - Green *= Global::DayLight.ambient[ 1 ]; - Blue *= Global::DayLight.ambient[ 2 ]; + color.r *= Global::DayLight.ambient[ 0 ]; + color.g *= Global::DayLight.ambient[ 1 ]; + color.b *= Global::DayLight.ambient[ 2 ]; } else { // tymczasowo pokazanie zasilanych odcinków @@ -794,38 +488,39 @@ TTraction::wire_color( float &Red, float &Green, float &Blue ) const { case 1: { // czerwone z podłączonym zasilaniem 1 - Red = 1.0f; - Green = 0.0f; - Blue = 0.0f; + color.r = 1.0f; + color.g = 0.0f; + color.b = 0.0f; break; } case 2: { // zielone z podłączonym zasilaniem 2 - Red = 0.0f; - Green = 1.0f; - Blue = 0.0f; + color.r = 0.0f; + color.g = 1.0f; + color.b = 0.0f; break; } case 3: { //żółte z podłączonym zasilaniem z obu stron - Red = 1.0f; - Green = 1.0f; - Blue = 0.0f; + color.r = 1.0f; + color.g = 1.0f; + color.b = 0.0f; break; } case 4: { // niebieskie z podłączonym zasilaniem - Red = 0.5f; - Green = 0.5f; - Blue = 1.0f; + color.r = 0.5f; + color.g = 0.5f; + color.b = 1.0f; break; } default: { break; } } if( hvParallel ) { // jeśli z bieżnią wspólną, to dodatkowo przyciemniamy - Red *= 0.6f; - Green *= 0.6f; - Blue *= 0.6f; + color.r *= 0.6f; + color.g *= 0.6f; + color.b *= 0.6f; } } -} \ No newline at end of file + return color; +} diff --git a/Traction.h b/Traction.h index 62a635cb..80bd9607 100644 --- a/Traction.h +++ b/Traction.h @@ -11,65 +11,47 @@ http://mozilla.org/MPL/2.0/. #include #include "GL/glew.h" -#include "VBO.h" #include "dumb3d.h" +#include "openglgeometrybank.h" class TTractionPowerSource; class TTraction { // drut zasilający, dla wskaźników używać przedrostka "hv" - private: - // vector3 vUp,vFront,vLeft; - // matrix4x4 mMatrix; - // matryca do wyliczania pozycji drutu w zależności od [X,Y,kąt] w scenerii: - // - x: odległość w bok (czy odbierak się nie zsunął) - // - y: przyjmuje wartość <0,1>, jeśli pod drutem (wzdłuż) - // - z: wysokość bezwzględna drutu w danym miejsu + friend class opengl_renderer; + public: // na razie - TTractionPowerSource *psPower[2]; // najbliższe zasilacze z obu kierunków - TTractionPowerSource *psPowered = nullptr; // ustawione tylko dla bezpośrednio zasilanego przęsła - TTraction *hvNext[2]; //łączenie drutów w sieć - int iNext[2]; // do którego końca się łączy - int iLast = 1; //że niby ostatni drut // ustawiony bit 0, jeśli jest ostatnim drutem w sekcji; bit1 - przedostatni + TTractionPowerSource *psPower[ 2 ] { nullptr, nullptr }; // najbliższe zasilacze z obu kierunków + TTractionPowerSource *psPowered { nullptr }; // ustawione tylko dla bezpośrednio zasilanego przęsła + TTraction *hvNext[ 2 ] { nullptr, nullptr }; //łączenie drutów w sieć + int iNext[ 2 ] { 0, 0 }; // do którego końca się łączy + int iLast { 1 }; //że niby ostatni drut // ustawiony bit 0, jeśli jest ostatnim drutem w sekcji; bit1 - przedostatni public: - GLuint uiDisplayList = 0; Math3D::vector3 pPoint1, pPoint2, pPoint3, pPoint4; Math3D::vector3 vParametric; // współczynniki równania parametrycznego odcinka - double fHeightDifference = 0.0; //,fMiddleHeight; - // int iCategory,iMaterial,iDamageFlag; - // float fU,fR,fMaxI,fWireThickness; - int iNumSections = 0; - int iLines = 0; // ilosc linii dla VBO - float NominalVoltage = 0.0; - float MaxCurrent = 0.0; - float fResistivity = 0.0; //[om/m], przeliczone z [om/km] - DWORD Material = 0; // 1: Cu, 2: Al - float WireThickness = 0.0; - DWORD DamageFlag = 0; // 1: zasniedziale, 128: zerwana - int Wires = 2; - float WireOffset = 0.0; + double fHeightDifference { 0.0 }; //,fMiddleHeight; + int iNumSections { 0 }; + float NominalVoltage { 0.0f }; + float MaxCurrent { 0.0f }; + float fResistivity { 0.0f }; //[om/m], przeliczone z [om/km] + DWORD Material { 0 }; // 1: Cu, 2: Al + float WireThickness { 0.0f }; + DWORD DamageFlag { 0 }; // 1: zasniedziale, 128: zerwana + int Wires { 2 }; + float WireOffset { 0.0f }; std::string asPowerSupplyName; // McZapkie: nazwa podstacji trakcyjnej - TTractionPowerSource *psSection = nullptr; // zasilacz (opcjonalnie może to być pulpit sterujący EL2 w hali!) + TTractionPowerSource *psSection { nullptr }; // zasilacz (opcjonalnie może to być pulpit sterujący EL2 w hali!) std::string asParallel; // nazwa przęsła, z którym może być bieżnia wspólna - TTraction *hvParallel = nullptr; // jednokierunkowa i zapętlona lista przęseł ewentualnej bieżni wspólnej - float fResistance[2]; // rezystancja zastępcza do punktu zasilania (0: przęsło zasilane, <0: do policzenia) - int iTries = 0; - int PowerState{ 0 }; // type of incoming power, if any + TTraction *hvParallel { nullptr }; // jednokierunkowa i zapętlona lista przęseł ewentualnej bieżni wspólnej + float fResistance[ 2 ] { -1.0f, -1.0f }; // rezystancja zastępcza do punktu zasilania (0: przęsło zasilane, <0: do policzenia) + int iTries { 0 }; + int PowerState { 0 }; // type of incoming power, if any + // visualization data + geometry_handle m_geometry; - void Optimize( Math3D::vector3 const &Origin ); - - TTraction(); - ~TTraction(); - - // virtual void InitCenter(vector3 Angles, vector3 pOrigin); - // virtual bool Hit(double x, double z, vector3 &hitPoint, vector3 &hitDirection) - // { return TNode::Hit(x,z,hitPoint,hitDirection); }; - // virtual bool Move(double dx, double dy, double dz) { return false; }; - // virtual void SelectedRender(); - void RenderDL(float mgn, Math3D::vector3 const &Origin ); - int RaArrayPrepare(); - int RaArrayFill( CVertNormTex *Vert, Math3D::vector3 const &Origin ); - void RenderVBO(float mgn, int iPtr); + // creates geometry data in specified geometry bank. returns: number of created elements, or NULL + // NOTE: deleting nodes doesn't currently release geometry data owned by the node. TODO: implement erasing individual geometry chunks and banks + std::size_t create_geometry( geometrybank_handle const &Bank, Math3D::vector3 const &Origin ); int TestPoint(Math3D::vector3 *Point); void Connect(int my, TTraction *with, int to); void Init(); @@ -78,6 +60,7 @@ class TTraction void PowerSet(TTractionPowerSource *ps); double VoltageGet(double u, double i); private: - void wire_color( float &Red, float &Green, float &Blue ) const; + glm::vec3 wire_color() const; }; + //--------------------------------------------------------------------------- diff --git a/VBO.cpp b/VBO.cpp index 6fdba7c0..a61e457a 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "GL/glew.h" #include "usefull.h" #include "sn_utils.h" +#include "globals.h" //--------------------------------------------------------------------------- void CVertNormTex::deserialize(std::istream &s) @@ -49,9 +50,6 @@ CMesh::CMesh() #endif m_nVertexCount = -1; m_nVBOVertices = 0; // nie zarezerwowane - - // TODO: bind proper subtype based on the settings - m_geometry = std::make_shared(); }; CMesh::~CMesh() diff --git a/VBO.h b/VBO.h index 63a104fc..d0228bfc 100644 --- a/VBO.h +++ b/VBO.h @@ -50,5 +50,6 @@ class CMesh #endif unsigned int m_nVBOVertices; // numer VBO z wierzchołkami - std::shared_ptr m_geometry; + geometrybank_handle m_geometrybank; + }; diff --git a/dumb3d.h b/dumb3d.h index 818306d9..3a666e4f 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -140,8 +140,8 @@ class matrix4x4 for (int x = 0; x < 4; ++x) (*this)(x)[y] = initArray[i++]; } - template - void OpenGL_Matrix(_Type const *initArray) + template + void OpenGL_Matrix(Type_ const *initArray) { int i = 0; for (int x = 0; x < 4; ++x) diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index ec25b023..a5fcb34f 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -11,6 +11,8 @@ http://mozilla.org/MPL/2.0/. #include "openglgeometrybank.h" #include "sn_utils.h" +#include "logs.h" +#include "globals.h" void basic_vertex::serialize( std::ostream &s ) { @@ -45,23 +47,27 @@ basic_vertex::deserialize( std::istream &s ) { // generic geometry bank class, allows storage, update and drawing of geometry chunks // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk -geometrychunk_handle -geometry_bank::create( vertex_array &Vertices, int const Datatype ) { +geometry_handle +geometry_bank::create( vertex_array &Vertices, int const Type ) { - if( true == Vertices.empty() ) { return NULL; } + if( true == Vertices.empty() ) { return geometry_handle( 0, 0 ); } - m_chunks.emplace_back( Vertices, Datatype ); + m_chunks.emplace_back( Vertices, Type ); // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication - return m_chunks.size(); + geometry_handle chunkhandle{ 0, m_chunks.size() }; + // template method + create_( chunkhandle ); + // all done + return chunkhandle; } // replaces data of specified chunk with the supplied vertex data, starting from specified offset bool -geometry_bank::replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset ) { +geometry_bank::replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset ) { - if( ( Chunk == 0 ) || ( Chunk > m_chunks.size() ) ) { return false; } + if( ( Geometry.chunk == 0 ) || ( Geometry.chunk > m_chunks.size() ) ) { return false; } - auto &chunk = m_chunks[ Chunk - 1 ]; + auto &chunk = geometry_bank::chunk( Geometry ); if( ( Offset == 0 ) && ( Vertices.size() == chunk.vertices.size() ) ) { @@ -75,61 +81,66 @@ geometry_bank::replace( vertex_array &Vertices, geometrychunk_handle const Chunk chunk.vertices.resize( Offset + Vertices.size(), basic_vertex() ); chunk.vertices.insert( std::end( chunk.vertices ), std::begin( Vertices ), std::end( Vertices ) ); } + // template method + replace_( Geometry ); + // all done return true; } -vertex_array & -geometry_bank::data( geometrychunk_handle const Chunk ) { +// adds supplied vertex data at the end of specified chunk +bool +geometry_bank::append( vertex_array &Vertices, geometry_handle const &Geometry ) { - return m_chunks.at( Chunk - 1 ).vertices; + if( ( Geometry.chunk == 0 ) || ( Geometry.chunk > m_chunks.size() ) ) { return false; } + + return replace( Vertices, Geometry, geometry_bank::chunk( Geometry ).vertices.size() ); +} + +// draws geometry stored in specified chunk +void +geometry_bank::draw( geometry_handle const &Geometry ) { + // template method + draw_( Geometry ); +} + +vertex_array const & +geometry_bank::vertices( geometry_handle const &Geometry ) const { + + return geometry_bank::chunk( Geometry ).vertices; } // opengl vbo-based variant of the geometry bank GLuint opengl_vbogeometrybank::m_activebuffer{ NULL }; // buffer bound currently on the opengl end, if any -// creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk -geometrychunk_handle -opengl_vbogeometrybank::create( vertex_array &Vertices, int const Datatype ) { - - auto const handle = geometry_bank::create( Vertices, Datatype ); - if( handle == NULL ) { - // if we didn't get anything, bail early - return handle; - } - // adding a chunk means we'll be (re)building the buffer, which will fill the chunk records, amongst other things - // so we don't need to initialize the values here +// create() subclass details +void +opengl_vbogeometrybank::create_( geometry_handle const &Geometry ) { + // adding a chunk means we'll be (re)building the buffer, which will fill the chunk records, amongst other things. + // thus we don't need to initialize the values here m_chunkrecords.emplace_back( chunk_record() ); // kiss the existing buffer goodbye, new overall data size means we'll be making a new one delete_buffer(); - - return handle; } -// replaces data of specified chunk with the supplied vertex data, starting from specified offset -bool -opengl_vbogeometrybank::replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset ) { +// replace() subclass details +void +opengl_vbogeometrybank::replace_( geometry_handle const &Geometry ) { - auto const result = geometry_bank::replace( Vertices, Chunk, Offset ); - if( false == result ) { - // if nothing happened we can bail out early - return result; - } - auto &chunkrecord = m_chunkrecords[ Chunk - 1 ]; + auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; chunkrecord.is_good = false; // if the overall length of the chunk didn't change we can get away with reusing the old buffer... - if( m_chunks[ Chunk - 1 ].vertices.size() != chunkrecord.size ) { + if( geometry_bank::chunk( Geometry ).vertices.size() != chunkrecord.size ) { // ...but otherwise we'll need to allocate a new one // TBD: we could keep and reuse the old buffer also if the new chunk is smaller than the old one, // but it'd require some extra tracking and work to keep all chunks up to date; also wasting vram; may be not worth it? delete_buffer(); } - return result; } -// draws geometry stored in specified chunk +// draw() subclass details void -opengl_vbogeometrybank::draw( geometrychunk_handle const Chunk ) { +opengl_vbogeometrybank::draw_( geometry_handle const &Geometry ) { if( m_buffer == NULL ) { // if there's no buffer, we'll have to make one @@ -138,13 +149,13 @@ opengl_vbogeometrybank::draw( geometrychunk_handle const Chunk ) { if( true == m_chunks.empty() ) { return; } std::size_t datasize{ 0 }; - auto &chunkrecord = m_chunkrecords.begin(); - for( auto &chunk : m_chunks ) { - // fill all chunk records, based on the chunk data - chunkrecord->offset = datasize; - chunkrecord->size = chunk.vertices.size(); - datasize += chunkrecord->size; - ++chunkrecord; + auto chunkiterator = m_chunks.cbegin(); + for( auto &chunkrecord : m_chunkrecords ) { + // fill records for all chunks, based on the chunk data + chunkrecord.offset = datasize; + chunkrecord.size = chunkiterator->vertices.size(); + datasize += chunkrecord.size; + ++chunkiterator; } // the odds for all created chunks to get replaced with empty ones are quite low, but the possibility does exist if( datasize == 0 ) { return; } @@ -158,6 +169,12 @@ opengl_vbogeometrybank::draw( geometrychunk_handle const Chunk ) { datasize * sizeof( basic_vertex ), nullptr, GL_STATIC_DRAW ); + if( ::glGetError() == GL_OUT_OF_MEMORY ) { + // TBD: throw a bad_alloc? + ErrorLog( "openGL error: out of memory; failed to create a geometry buffer" ); + delete_buffer(); + return; + } m_buffercapacity = datasize; } // actual draw procedure starts here @@ -165,8 +182,8 @@ opengl_vbogeometrybank::draw( geometrychunk_handle const Chunk ) { if( m_activebuffer != m_buffer ) { bind_buffer(); } - auto &chunkrecord = m_chunkrecords[ Chunk - 1 ]; - auto const &chunk = m_chunks[ Chunk - 1 ]; + auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; + auto const &chunk = geometry_bank::chunk( Geometry ); if( false == chunkrecord.is_good ) { // we may potentially need to upload new buffer data before we can draw it ::glBufferSubData( @@ -216,3 +233,103 @@ opengl_vbogeometrybank::delete_buffer() { m_buffercapacity = 0; } } + +// opengl display list based variant of the geometry bank + +// create() subclass details +void +opengl_dlgeometrybank::create_( geometry_handle const &Geometry ) { + + m_chunkrecords.emplace_back( chunk_record() ); +} + +// replace() subclass details +void +opengl_dlgeometrybank::replace_( geometry_handle const &Geometry ) { + + delete_list( Geometry ); +} + +// draw() subclass details +void +opengl_dlgeometrybank::draw_( geometry_handle const &Geometry ) { + + auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; + if( chunkrecord.list == 0 ) { + // we don't have a list ready, so compile one + chunkrecord.list = ::glGenLists( 1 ); + auto const &chunk = geometry_bank::chunk( Geometry ); + ::glNewList( chunkrecord.list, GL_COMPILE ); + + ::glBegin( chunk.type ); + // TODO: add specification of chunk vertex attributes + for( auto const &vertex : chunk.vertices ) { + ::glNormal3fv( glm::value_ptr( vertex.normal ) ); + ::glTexCoord2fv( glm::value_ptr( vertex.texture ) ); + ::glVertex3fv( glm::value_ptr( vertex.position ) ); + } + ::glEnd(); + ::glEndList(); + } + // with the list done we can just play it + ::glCallList( chunkrecord.list ); +} + +void +opengl_dlgeometrybank::delete_list( geometry_handle const &Geometry ) { + // NOTE: given it's our own internal method we trust it to be called with valid parameters + auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; + ::glDeleteLists( chunkrecord.list, 1 ); + chunkrecord.list = 0; +} + +// geometry bank manager, holds collection of geometry banks + +// creates a new geometry bank. returns: handle to the bank or NULL +geometrybank_handle +geometrybank_manager::create_bank() { + + if( true == Global::bUseVBO ) { m_geometrybanks.emplace_back( std::make_shared() ); } + else { m_geometrybanks.emplace_back( std::make_shared() ); } + // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication + return geometrybank_handle( m_geometrybanks.size(), 0 ); +} + +// creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL +geometry_handle +geometrybank_manager::create_chunk( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type ) { + + auto const newchunkhandle = bank( Geometry )->create( Vertices, Type ); + + if( newchunkhandle.chunk != 0 ) { return geometry_handle( Geometry.bank, newchunkhandle.chunk ); } + else { return geometry_handle( 0, 0 ); } +} + +// replaces data of specified chunk with the supplied vertex data, starting from specified offset +bool +geometrybank_manager::replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset ) { + + return bank( Geometry )->replace( Vertices, Geometry, Offset ); +} + +// adds supplied vertex data at the end of specified chunk +bool +geometrybank_manager::append( vertex_array &Vertices, geometry_handle const &Geometry ) { + + return bank( Geometry )->append( Vertices, Geometry ); +} +// draws geometry stored in specified chunk +void +geometrybank_manager::draw( geometry_handle const &Geometry ) { + + if( Geometry == NULL ) { return; } + + return bank( Geometry )->draw( Geometry ); +} + +// provides direct access to vertex data of specfied chunk +vertex_array const & +geometrybank_manager::vertices( geometry_handle const &Geometry ) const { + + return bank( Geometry )->vertices( Geometry ); +} diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 91969a29..a05a05ce 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -30,7 +30,23 @@ typedef std::vector vertex_array; // generic geometry bank class, allows storage, update and drawing of geometry chunks -typedef std::size_t geometrychunk_handle; +struct geometry_handle { +// constructors + geometry_handle() : + bank( 0 ), chunk( 0 ) + {} + geometry_handle( std::uint32_t const Bank, std::uint32_t const Chunk ) : + bank( Bank ), chunk( Chunk ) + {} +// methods + inline + operator std::uint32_t() const { + return bank << 12 | chunk; } +// members + std::uint32_t + bank : 20, // 1 mil banks + chunk : 12; // 4 k chunks per bank +}; class geometry_bank { @@ -41,27 +57,28 @@ public: // destructor: virtual - ~geometry_bank() { ; } + ~geometry_bank() {} // methods: // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk or NULL - virtual - geometrychunk_handle - create( vertex_array &Vertices, int const Datatype ); + geometry_handle + create( vertex_array &Vertices, int const Type ); // replaces data of specified chunk with the supplied vertex data, starting from specified offset - virtual bool - replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset = 0 ); + replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset = 0 ); + // adds supplied vertex data at the end of specified chunk + bool + append( vertex_array &Vertices, geometry_handle const &Geometry ); // draws geometry stored in specified chunk - virtual void - draw( geometrychunk_handle const Chunk ) = 0; + draw( geometry_handle const &Geometry ); // draws geometry stored in supplied list of chunks - template + template void - draw( _Iterator First, _Iterator Last ) { while( First != Last ) { draw( *First ); ++First; } } - vertex_array & - data( geometrychunk_handle const Chunk ); + draw( Iterator_ First, Iterator_ Last ) { while( First != Last ) { draw( *First ); ++First; } } + // provides direct access to vertex data of specfied chunk + vertex_array const & + vertices( geometry_handle const &Geometry ) const; protected: // types: @@ -69,16 +86,34 @@ protected: int type; // kind of geometry used by the chunk vertex_array vertices; // geometry data - geometry_chunk( vertex_array &Vertices, int const Datatype ) : - vertices( Vertices ), type( Datatype ) + geometry_chunk( vertex_array &Vertices, int const Type ) : + vertices( Vertices ), type( Type ) {} }; typedef std::vector geometrychunk_sequence; +// methods + inline + geometry_chunk & + chunk( geometry_handle const Geometry ) { + return m_chunks[ Geometry.chunk - 1 ]; } + inline + geometry_chunk const & + chunk( geometry_handle const Geometry ) const { + return m_chunks[ Geometry.chunk - 1 ]; } + // members: geometrychunk_sequence m_chunks; +private: +// methods: + // create() subclass details + virtual void create_( geometry_handle const &Geometry ) = 0; + // replace() subclass details + virtual void replace_( geometry_handle const &Geometry ) = 0; + // draw() subclass details + virtual void draw_( geometry_handle const &Geometry ) = 0; }; // opengl vbo-based variant of the geometry bank @@ -87,15 +122,8 @@ class opengl_vbogeometrybank : public geometry_bank { public: // methods: - // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk or NULL - geometrychunk_handle - create( vertex_array &Vertices, int const Datatype ); - // replaces data of specified chunk with the supplied vertex data, starting from specified offset - bool - replace( vertex_array &Vertices, geometrychunk_handle const Chunk, std::size_t const Offset = 0 ); - // draws geometry stored in specified chunk - void - draw( geometrychunk_handle const Chunk ); + ~opengl_vbogeometrybank() { + delete_buffer(); } private: // types: @@ -108,6 +136,15 @@ private: typedef std::vector chunkrecord_sequence; // methods: + // create() subclass details + void + create_( geometry_handle const &Geometry ); + // replace() subclass details + void + replace_( geometry_handle const &Geometry ); + // draw() subclass details + void + draw_( geometry_handle const &Geometry ); void bind_buffer(); void @@ -120,3 +157,90 @@ private: chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order }; + +// opengl display list based variant of the geometry bank + +class opengl_dlgeometrybank : public geometry_bank { + +public: +// methods: + ~opengl_dlgeometrybank() { + for( auto &chunkrecord : m_chunkrecords ) { + ::glDeleteLists( chunkrecord.list, 1 ); } } + +private: +// types: + struct chunk_record { + GLuint list{ 0 }; // display list associated with the chunk + }; + + typedef std::vector chunkrecord_sequence; + +// methods: + // create() subclass details + void + create_( geometry_handle const &Geometry ); + // replace() subclass details + void + replace_( geometry_handle const &Geometry ); + // draw() subclass details + void + draw_( geometry_handle const &Geometry ); + void + delete_list( geometry_handle const &Geometry ); + +// members: + chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order + +}; + +// geometry bank manager, holds collection of geometry banks + +typedef geometry_handle geometrybank_handle; + +class geometrybank_manager { + +public: +// methods: + // creates a new geometry bank. returns: handle to the bank or NULL + geometrybank_handle + create_bank(); + // creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL + geometry_handle + create_chunk( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type ); + // replaces data of specified chunk with the supplied vertex data, starting from specified offset + bool + replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset = 0 ); + // adds supplied vertex data at the end of specified chunk + bool + append( vertex_array &Vertices, geometry_handle const &Geometry ); + // draws geometry stored in specified chunk + void + draw( geometry_handle const &Geometry ); + // provides direct access to vertex data of specfied chunk + vertex_array const & + vertices( geometry_handle const &Geometry ) const; + +private: +// types: + typedef std::deque< std::shared_ptr > geometrybank_sequence; + +// members: + geometrybank_sequence m_geometrybanks; + +// methods + inline + bool + valid( geometry_handle const &Geometry ) { + return ( ( Geometry.bank != 0 ) + && ( Geometry.bank <= m_geometrybanks.size() ) ); } + inline + geometrybank_sequence::value_type & + bank( geometry_handle const Geometry ) { + return m_geometrybanks[ Geometry.bank - 1 ]; } + inline + geometrybank_sequence::value_type const & + bank( geometry_handle const Geometry ) const { + return m_geometrybanks[ Geometry.bank - 1 ]; } + +}; \ No newline at end of file diff --git a/openglmatrixstack.h b/openglmatrixstack.h index 85561d0f..b57f545b 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -109,39 +109,39 @@ public: pop_matrix() { m_stacks[ m_mode ].pop_matrix(); } void load_identity() { m_stacks[ m_mode ].load_identity(); } - template + template void - rotate( _Type const Angle, _Type const X, _Type const Y, _Type const Z ) { + rotate( Type_ const Angle, Type_ const X, Type_ const Y, Type_ const Z ) { m_stacks[ m_mode ].rotate( static_cast(Angle) * 0.0174532925f, // deg2rad glm::vec3( static_cast(X), static_cast(Y), static_cast(Z) ) ); } - template + template void - translate( _Type const X, _Type const Y, _Type const Z ) { + translate( Type_ const X, Type_ const Y, Type_ const Z ) { m_stacks[ m_mode ].translate( glm::vec3( static_cast( X ), static_cast( Y ), static_cast( Z ) ) ); } - template + template void - multiply( _Type const *Matrix ) { + multiply( Type_ const *Matrix ) { m_stacks[ m_mode ].multiply( glm::make_mat4( Matrix ) ); } - template + template void - perspective( _Type const Fovy, _Type const Aspect, _Type const Znear, _Type const Zfar ) { + perspective( Type_ const Fovy, Type_ const Aspect, Type_ const Znear, Type_ const Zfar ) { m_stacks[ m_mode ].perspective( static_cast(Fovy) * 0.0174532925f, // deg2rad static_cast( Aspect ), static_cast( Znear ), static_cast( Zfar ) ); } - template + template void - look_at( _Type const Eyex, _Type const Eyey, _Type const Eyez, _Type const Centerx, _Type const Centery, _Type const Centerz, _Type const Upx, _Type const Upy, _Type const Upz ) { + look_at( Type_ const Eyex, Type_ const Eyey, Type_ const Eyez, Type_ const Centerx, Type_ const Centery, Type_ const Centerz, Type_ const Upx, Type_ const Upy, Type_ const Upz ) { m_stacks[ m_mode ].look_at( glm::vec3( static_cast( Eyex ), diff --git a/parser.h b/parser.h index b08d5a2b..90fdfc6d 100644 --- a/parser.h +++ b/parser.h @@ -32,9 +32,9 @@ class cParser //: public std::stringstream // destructor: virtual ~cParser(); // methods: - template + template cParser& - operator>>( _Type &Right ); + operator>>( Type_ &Right ); template <> cParser& operator>>( std::string &Right ); @@ -107,9 +107,9 @@ class cParser //: public std::stringstream std::deque tokens; }; -template +template cParser& -cParser::operator>>( _Type &Right ) { +cParser::operator>>( Type_ &Right ) { if( true == this->tokens.empty() ) { return *this; } diff --git a/renderer.cpp b/renderer.cpp index 177bbf89..95137e19 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -142,10 +142,7 @@ opengl_renderer::Render() { ::glLoadIdentity(); if( World.InitPerformed() ) { -/* - World.Camera.SetMatrix(); - m_camera.update_frustum(); -*/ + glm::dmat4 worldcamera; World.Camera.SetMatrix( worldcamera ); m_camera.update_frustum( OpenGLMatrices.data( GL_PROJECTION ), worldcamera ); @@ -182,15 +179,6 @@ opengl_renderer::Render( world_environment *Environment ) { ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); ::glPushMatrix(); -/* - ::glTranslatef( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); -*/ -/* - glm::mat4 worldcamera; - World.Camera.SetMatrix( worldcamera ); - glLoadIdentity(); - glMultMatrixf( glm::value_ptr( glm::mat4( glm::mat3( worldcamera ) ) ) ); -*/ // setup fog if( Global::fFogEnd > 0 ) { // fog setup @@ -300,6 +288,63 @@ opengl_renderer::Render( world_environment *Environment ) { return true; } +// geometry methods +// creates a new geometry bank. returns: handle to the bank or NULL +geometrybank_handle +opengl_renderer::Create_Bank() { + + return m_geometry.create_bank(); +} + +// creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL +geometry_handle +opengl_renderer::Insert( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type ) { + + return m_geometry.create_chunk( Vertices, Geometry, Type ); +} + +// replaces data of specified chunk with the supplied vertex data, starting from specified offset +bool +opengl_renderer::Replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset ) { + + return m_geometry.replace( Vertices, Geometry, Offset ); +} + +// adds supplied vertex data at the end of specified chunk +bool +opengl_renderer::Append( vertex_array &Vertices, geometry_handle const &Geometry ) { + + return m_geometry.append( Vertices, Geometry ); +} + +// provides direct access to vertex data of specfied chunk +vertex_array const & +opengl_renderer::Vertices( geometry_handle const &Geometry ) const { + + return m_geometry.vertices( Geometry ); +} + +// texture methods +texture_handle +opengl_renderer::GetTextureId( std::string Filename, std::string const &Dir, int const Filter, bool const Loadnow ) { + + return m_textures.create( Filename, Dir, Filter, Loadnow ); +} + +void +opengl_renderer::Bind( texture_handle const Texture ) { + // temporary until we separate the renderer + m_textures.bind( Texture ); +} + +opengl_texture & +opengl_renderer::Texture( texture_handle const Texture ) { + + return m_textures.texture( Texture ); +} + + + bool opengl_renderer::Render( TGround *Ground ) { @@ -698,16 +743,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); -/* - if( Dynamic == Global::pUserDynamic ) { - //specjalne ustawienie, aby nie trzęsło - //tu trzeba by ustawić animacje na modelu zewnętrznym - ::glLoadIdentity(); // zacząć od macierzy jedynkowej - Global::pCamera->SetCabMatrix( Dynamic->vPosition ); // specjalne ustawienie kamery - } - else - ::glTranslated( Dynamic->vPosition.x, Dynamic->vPosition.y, Dynamic->vPosition.z ); // standardowe przesunięcie względem początku scenerii -*/ + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); ::glMultMatrixd( Dynamic->mMatrix.getArray() ); @@ -773,14 +809,7 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, double Model->Root->fSquareDist = Squaredistance; // zmienna globalna! - // TODO: unify the render code after generic buffers are in place // setup -/* - if( Global::bUseVBO ) { - if( false == Model->StartVBO() ) - return false; - } -*/ Model->Root->ReplacableSet( ( Material != nullptr ? Material->replacable_skins : @@ -793,9 +822,6 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, double Render( Model->Root ); // post-render cleanup - if( Global::bUseVBO ) { -// Model->EndVBO(); - } return true; } @@ -812,7 +838,6 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, Math3D: if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); -// auto const result = Render( Model, Material, SquareMagnitude( Position / Global::ZoomFactor ) ); // position is effectively camera offset auto const result = Render( Model, Material, SquareMagnitude( Position ) ); // position is effectively camera offset ::glPopMatrix(); @@ -856,16 +881,8 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); } - // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc - if( Global::bUseVBO ) { -/* - ::glDrawArrays( Submodel->eType, Submodel->iVboPtr, Submodel->iNumVerts ); -*/ - Submodel->pRoot->m_geometry->draw( Submodel->m_chunk ); - } - else { - ::glCallList( Submodel->uiDisplayList ); - } + // main draw call + m_geometry.draw( Submodel->m_geometry ); // post-draw reset if( Global::fLuminance < Submodel->fLight ) { @@ -900,16 +917,8 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glDisable( GL_LIGHTING ); ::glEnable( GL_BLEND ); - // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc - if( Global::bUseVBO ) { -/* - ::glDrawArrays( GL_POINTS, Submodel->iVboPtr, Submodel->iNumVerts ); -*/ - Submodel->pRoot->m_geometry->draw( Submodel->m_chunk ); - } - else { - ::glCallList( Submodel->uiDisplayList ); - } + // main draw call + m_geometry.draw( Submodel->m_geometry ); // post-draw reset ::glPopAttrib(); @@ -926,9 +935,11 @@ opengl_renderer::Render( TSubModel *Submodel ) { Bind( 0 ); ::glDisable( GL_LIGHTING ); - // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc - if( Global::bUseVBO ) { + // main draw call + // TODO: add support for colour data draw mode + m_geometry.draw( Submodel->m_geometry ); /* + if( Global::bUseVBO ) { // NOTE: we're doing manual switch to color vbo setup, because there doesn't seem to be any convenient way available atm // TODO: implement easier way to go about it ::glDisableClientState( GL_NORMAL_ARRAY ); @@ -941,12 +952,11 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glDisableClientState( GL_COLOR_ARRAY ); ::glEnableClientState( GL_NORMAL_ARRAY ); ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); -*/ } else { ::glCallList( Submodel->uiDisplayList ); } - +*/ // post-draw reset ::glPopAttrib(); } @@ -1094,18 +1104,39 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { case TP_TRACTION: { // TODO: unify the render code after generic buffers are in place if( Node->bVisible ) { + // rysuj jesli sa druty i nie zerwana + if( ( Node->hvTraction->Wires == 0 ) + || ( true == TestFlag( Node->hvTraction->DamageFlag, 128 ) ) ) { + return false; + } // setup ::glPushMatrix(); auto const originoffset = Node->m_rootposition - Global::pCameraPosition; ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + Bind( NULL ); + if( !Global::bSmoothTraction ) { + // na liniach kiepsko wygląda - robi gradient + ::glDisable( GL_LINE_SMOOTH ); + } + float const linealpha = static_cast( + std::min( + 1.2, + 5000 * Node->hvTraction->WireThickness / ( distancesquared + 1.0 ) ) ); // zbyt grube nie są dobre + ::glLineWidth( linealpha ); + // McZapkie-261102: kolor zalezy od materialu i zasniedzenia + auto const color { Node->hvTraction->wire_color() }; + ::glColor4f( color.r, color.g, color.b, linealpha ); + // render - if( Global::bUseVBO ) { - Node->hvTraction->RenderVBO( distancesquared, Node->iVboPtr ); - } - else { - Node->hvTraction->RenderDL( distancesquared, Node->m_rootposition ); - } + m_geometry.draw( Node->hvTraction->m_geometry ); + // post-render cleanup + ::glLineWidth( 1.0 ); + if( !Global::bSmoothTraction ) { + ::glEnable( GL_LINE_SMOOTH ); + } + ::glPopMatrix(); return true; } @@ -1233,14 +1264,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); -/* - if( Dynamic == Global::pUserDynamic ) { // specjalne ustawienie, aby nie trzęsło - ::glLoadIdentity(); // zacząć od macierzy jedynkowej - Global::pCamera->SetCabMatrix( Dynamic->vPosition ); // specjalne ustawienie kamery - } - else - ::glTranslated( Dynamic->vPosition.x, Dynamic->vPosition.y, Dynamic->vPosition.z ); // standardowe przesunięcie względem początku scenerii -*/ + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); ::glMultMatrixd( Dynamic->mMatrix.getArray() ); @@ -1305,18 +1329,11 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, d Model->Root->fSquareDist = Squaredistance; // zmienna globalna! - // TODO: unify the render code after generic buffers are in place // setup -/* - if( Global::bUseVBO ) { - if( false == Model->StartVBO() ) - return false; - } -*/ Model->Root->ReplacableSet( ( Material != nullptr ? - Material->replacable_skins : - nullptr ), + Material->replacable_skins : + nullptr ), alpha ); Model->Root->pRoot = Model; @@ -1325,11 +1342,7 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, d Render_Alpha( Model->Root ); // post-render cleanup -/* - if( Global::bUseVBO ) { - Model->EndVBO(); - } -*/ + return true; } @@ -1345,7 +1358,6 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, M if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); -// auto const result = Render_Alpha( Model, Material, SquareMagnitude( Position / Global::ZoomFactor ) ); // position is effectively camera offset auto const result = Render_Alpha( Model, Material, SquareMagnitude( Position ) ); // position is effectively camera offset ::glPopMatrix(); @@ -1387,16 +1399,8 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); } - // main draw call. TODO: generic buffer base class, specialized for vbo, dl etc - if( Global::bUseVBO ) { -/* - ::glDrawArrays( Submodel->eType, Submodel->iVboPtr, Submodel->iNumVerts ); -*/ - Submodel->pRoot->m_geometry->draw( Submodel->m_chunk ); - } - else { - ::glCallList( Submodel->uiDisplayList ); - } + // main draw call + m_geometry.draw( Submodel->m_geometry ); // post-draw reset if( Global::fLuminance < Submodel->fLight ) { @@ -1554,7 +1558,7 @@ opengl_renderer::Update ( double const Deltatime ) { // TODO: add garbage collection and other less frequent works here if( DebugModeFlag ) - m_debuginfo = m_textures.Info(); + m_debuginfo = m_textures.info(); }; // debug performance string diff --git a/renderer.h b/renderer.h index 3cce3b05..19e31d55 100644 --- a/renderer.h +++ b/renderer.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "GL/glew.h" +#include "openglgeometrybank.h" #include "texture.h" #include "lightarray.h" #include "dumb3d.h" @@ -120,71 +121,54 @@ public: // main draw call. returns false on error bool Render(); - bool - Render( world_environment *Environment ); - bool - Render( TGround *Ground ); - bool - Render( TGroundRect *Groundcell ); - bool - Render( TSubRect *Groundsubcell ); - bool - Render( TGroundNode *Node ); + // render sub-methods, temporarily exposed until we complete migrating render code to the renderer bool Render( TDynamicObject *Dynamic ); - bool - Render( TModel3d *Model, material_data const *Material, double const Squaredistance ); bool Render( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + bool + Render( TModel3d *Model, material_data const *Material, double const Squaredistance ); void Render( TSubModel *Submodel ); - void - Render( TMemCell *Memcell ); - bool - Render_Alpha( TGround *Ground ); - bool - Render_Alpha( TSubRect *Groundsubcell ); - bool - Render_Alpha( TGroundNode *Node ); bool Render_Alpha( TDynamicObject *Dynamic ); - bool - Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); bool Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); - void - Render_Alpha( TSubModel *Submodel ); + bool + Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); // maintenance jobs void - Update( double const Deltatime); - void - Update_Lights( light_array const &Lights ); - void - Disable_Lights(); - inline - bool - Visible( TDynamicObject const *Dynamic ) const { return m_camera.visible( Dynamic ); } + Update( double const Deltatime ); // debug performance string std::string const & Info() const; - - texture_manager::size_type - GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ) { - - return m_textures.GetTextureId( Filename, Dir, Filter, Loadnow ); - } - + // light methods void - Bind( texture_manager::size_type const Id ) { - // temporary until we separate the renderer - m_textures.Bind( Id ); - } - + Disable_Lights(); + // geometry methods + // NOTE: hands-on geometry management is exposed as a temporary measure; ultimately all visualization data should be generated/handled automatically by the renderer itself + // creates a new geometry bank. returns: handle to the bank or NULL + geometrybank_handle + Create_Bank(); + // creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL + geometry_handle + Insert( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type ); + // replaces data of specified chunk with the supplied vertex data, starting from specified offset + bool + Replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset = 0 ); + // adds supplied vertex data at the end of specified chunk + bool + Append( vertex_array &Vertices, geometry_handle const &Geometry ); + // provides direct access to vertex data of specfied chunk + vertex_array const & + Vertices( geometry_handle const &Geometry ) const; + // texture methods + texture_handle + GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ); + void + Bind( texture_handle const Texture ); opengl_texture & - Texture( texture_manager::size_type const Id ) { - - return m_textures.Texture( Id ); - } + Texture( texture_handle const Texture ); // members GLenum static const sunlight{ GL_LIGHT0 }; @@ -200,20 +184,43 @@ private: // methods bool Init_caps(); - + bool + Render( world_environment *Environment ); + bool + Render( TGround *Ground ); + bool + Render( TGroundRect *Groundcell ); + bool + Render( TSubRect *Groundsubcell ); + bool + Render( TGroundNode *Node ); + void + Render( TMemCell *Memcell ); + bool + Render_Alpha( TGround *Ground ); + bool + Render_Alpha( TSubRect *Groundsubcell ); + bool + Render_Alpha( TGroundNode *Node ); + void + Render_Alpha( TSubModel *Submodel ); + void + Update_Lights( light_array const &Lights ); + // members - rendermode renderpass{ rendermode::color }; opengllight_array m_lights; + geometrybank_manager m_geometry; texture_manager m_textures; opengl_camera m_camera; + rendermode renderpass{ rendermode::color }; float m_drawrange{ 2500.0f }; // current drawing range float m_drawtime{ 1000.0f / 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps double m_updateaccumulator{ 0.0 }; std::string m_debuginfo; GLFWwindow *m_window{ nullptr }; - texture_manager::size_type m_glaretextureid{ -1 }; - texture_manager::size_type m_suntextureid{ -1 }; - texture_manager::size_type m_moontextureid{ -1 }; + texture_handle m_glaretextureid{ -1 }; + texture_handle m_suntextureid{ -1 }; + texture_handle m_moontextureid{ -1 }; GLUquadricObj *m_quadric; // helper object for drawing debug mode scene elements }; diff --git a/uilayer.h b/uilayer.h index 8966ec8b..2fb8d30b 100644 --- a/uilayer.h +++ b/uilayer.h @@ -79,7 +79,7 @@ private: GLuint m_fontbase{ (GLuint)-1 }; // numer DL dla znakw w napisach float m_progress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. - texture_manager::size_type m_background; // path to texture used as the background. size depends on mAspect. + texture_handle m_background; // path to texture used as the background. size depends on mAspect. std::vector > m_panels; }; diff --git a/usefull.h b/usefull.h index a5c62578..e639caf4 100644 --- a/usefull.h +++ b/usefull.h @@ -24,32 +24,32 @@ http://mozilla.org/MPL/2.0/. #define MAKE_ID4(a,b,c,d) (((std::uint32_t)(d)<<24)|((std::uint32_t)(c)<<16)|((std::uint32_t)(b)<<8)|(std::uint32_t)(a)) -template -void SafeDelete( _Type &Pointer ) { +template +void SafeDelete( Type_ &Pointer ) { delete Pointer; Pointer = nullptr; } -template -void SafeDeleteArray( _Type &Pointer ) { +template +void SafeDeleteArray( Type_ &Pointer ) { delete[] Pointer; Pointer = nullptr; } -template -_Type -clamp( _Type const Value, _Type const Min, _Type const Max ) { +template +Type_ +clamp( Type_ const Value, Type_ const Min, Type_ const Max ) { - _Type value = Value; + Type_ value = Value; if( value < Min ) { value = Min; } if( value > Max ) { value = Max; } return value; } // keeps the provided value in specified range 0-Range, as if the range was circular buffer -template -_Type -clamp_circular( _Type Value, _Type const Range = static_cast<_Type>(360) ) { +template +Type_ +clamp_circular( Type_ Value, Type_ const Range = static_cast(360) ) { Value -= Range * (int)( Value / Range ); // clamp the range to 0-360 if( Value < 0.0 ) Value += Range; @@ -57,9 +57,9 @@ clamp_circular( _Type Value, _Type const Range = static_cast<_Type>(360) ) { return Value; } -template -_Type -interpolate( _Type const First, _Type const Second, float const Factor ) { +template +Type_ +interpolate( Type_ const First, Type_ const Second, float const Factor ) { return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); } From 22746bad21b43d736053ae08049da13f7a40f957 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 10 Jun 2017 22:51:51 +0200 Subject: [PATCH 123/426] partial replacement of math classes with glm --- AnimModel.cpp | 2 + AnimModel.h | 9 +- Ground.cpp | 795 +++++++++++++++++++++----------------------------- Ground.h | 93 +++--- Model3d.cpp | 97 +++--- Model3d.h | 17 +- Segment.cpp | 64 ++-- Track.cpp | 54 ++-- Traction.cpp | 16 +- Traction.h | 8 +- VBO.cpp | 6 +- VBO.h | 3 + dumb3d.h | 3 + renderer.cpp | 138 ++++----- stdafx.h | 3 + usefull.h | 9 +- 16 files changed, 603 insertions(+), 714 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 0e183997..95e45c41 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -631,11 +631,13 @@ TSubModel * TAnimModel::TerrainSquare(int n) { // pobieranie wskaźników do pierwszego submodelu return pModel ? pModel->TerrainSquare(n) : 0; }; +#ifdef EU07_USE_OLD_RENDERCODE void TAnimModel::TerrainRenderVBO(int n) { // renderowanie terenu z VBO if (pModel) pModel->TerrainRenderVBO(n); }; +#endif //--------------------------------------------------------------------------- void TAnimModel::Advanced() diff --git a/AnimModel.h b/AnimModel.h index 36fa9c48..17957f16 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -128,8 +128,11 @@ class TAnimAdvanced int SortByBone(); }; -class TAnimModel -{ // opakowanie modelu, określające stan egzemplarza +// opakowanie modelu, określające stan egzemplarza +class TAnimModel { + + friend class opengl_renderer; + private: TAnimContainer *pRoot; // pojemniki sterujące, tylko dla aniomowanych submodeli TModel3d *pModel; @@ -173,7 +176,9 @@ class TAnimModel bool TerrainLoaded(); int TerrainCount(); TSubModel * TerrainSquare(int n); +#ifdef EU07_USE_OLD_RENDERCODE void TerrainRenderVBO(int n); +#endif void AnimationVND(void *pData, double a, double b, double c, double d); void LightSet(int n, float v); static void AnimUpdate(double dt); diff --git a/Ground.cpp b/Ground.cpp index 62054b1d..e65f414d 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -70,7 +70,9 @@ TGroundNode::TGroundNode() iType = GL_POINTS; Vertices = NULL; nNext = nNext2 = NULL; +/* pCenter = vector3(0, 0, 0); +*/ iCount = 0; // wierzchołków w trójkącie // iNumPts=0; //punktów w linii TextureID = 0; @@ -81,15 +83,15 @@ TGroundNode::TGroundNode() fSquareRadius = 10000 * 10000; fSquareMinRadius = 0; asName = ""; - // Color= TMaterialColor(1); - // fAngle=0; //obrót dla modelu fLineThickness=1.0; //mm dla linii +/* for (int i = 0; i < 3; i++) { Ambient[i] = Global::whiteLight[i] * 255; Diffuse[i] = Global::whiteLight[i] * 255; Specular[i] = Global::noLight[i] * 255; } +*/ nNext3 = NULL; // nie wyświetla innych iVboPtr = -1; // indeks w VBO sektora (-1: nie używa VBO) iVersion = 0; // wersja siatki @@ -155,66 +157,65 @@ void TGroundNode::Init(int n) Vertices = new TGroundVertex[iNumVerts]; } -TGroundNode::TGroundNode(TGroundNodeType t, int n) -{ // utworzenie obiektu - TGroundNode(); // domyślne ustawienia +TGroundNode::TGroundNode( TGroundNodeType t, int n ) : + TGroundNode() { + // utworzenie obiektu iNumVerts = n; - if (iNumVerts) - Vertices = new TGroundVertex[iNumVerts]; - iType = t; - switch (iType) - { // zależnie od typu - case TP_TRACK: - pTrack = new TTrack(this); - break; + if( iNumVerts ) { + Vertices = new TGroundVertex[ iNumVerts ]; + } + iType = t; + switch (iType) { + // zależnie od typu + case TP_TRACK: { + pTrack = new TTrack( this ); + break; + } + default: { + break; + } } -} - -void TGroundNode::InitCenter() -{ // obliczenie środka ciężkości obiektu - for (int i = 0; i < iNumVerts; i++) - pCenter += Vertices[i].Point; - pCenter /= iNumVerts; } void TGroundNode::InitNormals() { // obliczenie wektorów normalnych - vector3 v1, v2, v3, v4, v5, n1, n2, n3, n4; - int i; - float tu, tv; + glm::dvec3 v1, v2, v3, v4, v5; + glm::vec3 n1, n2, n3, n4; + glm::vec2 t1; + std::size_t i; switch (iType) { case GL_TRIANGLE_STRIP: - v1 = Vertices[0].Point - Vertices[1].Point; - v2 = Vertices[1].Point - Vertices[2].Point; - n1 = SafeNormalize(CrossProduct(v1, v2)); - if (Vertices[0].Normal == vector3(0, 0, 0)) - Vertices[0].Normal = n1; - v3 = Vertices[2].Point - Vertices[3].Point; - n2 = SafeNormalize(CrossProduct(v3, v2)); - if (Vertices[1].Normal == vector3(0, 0, 0)) - Vertices[1].Normal = (n1 + n2) * 0.5; + v1 = Vertices[0].position - Vertices[1].position; + v2 = Vertices[1].position - Vertices[2].position; + n1 = glm::normalize(glm::cross(v1, v2)); + if (Vertices[0].normal == glm::vec3()) + Vertices[0].normal = n1; + v3 = Vertices[2].position - Vertices[3].position; + n2 = glm::normalize(glm::cross(v3, v2)); + if (Vertices[1].normal == glm::vec3()) + Vertices[1].normal = (n1 + n2) * 0.5f; - for (i = 2; i < iNumVerts - 2; i += 2) + for ( i = 2; i < iNumVerts - 2; i += 2) { - v4 = Vertices[i - 1].Point - Vertices[i].Point; - v5 = Vertices[i].Point - Vertices[i + 1].Point; - n3 = SafeNormalize(CrossProduct(v3, v4)); - n4 = SafeNormalize(CrossProduct(v5, v4)); - if (Vertices[i].Normal == vector3(0, 0, 0)) - Vertices[i].Normal = (n1 + n2 + n3) / 3; - if (Vertices[i + 1].Normal == vector3(0, 0, 0)) - Vertices[i + 1].Normal = (n2 + n3 + n4) / 3; + v4 = Vertices[i - 1].position - Vertices[i].position; + v5 = Vertices[i].position - Vertices[i + 1].position; + n3 = glm::normalize(glm::cross(v3, v4)); + n4 = glm::normalize(glm::cross(v5, v4)); + if (Vertices[i].normal == glm::vec3()) + Vertices[i].normal = (n1 + n2 + n3) / 3.0f; + if (Vertices[i + 1].normal == glm::vec3()) + Vertices[i + 1].normal = (n2 + n3 + n4) / 3.0f; n1 = n3; n2 = n4; v3 = v5; } - if (Vertices[i].Normal == vector3(0, 0, 0)) - Vertices[i].Normal = (n1 + n2) / 2; + if (Vertices[i].normal == glm::vec3()) + Vertices[i].normal = (n1 + n2) / 2.0f; if (i + 1 < iNumVerts) { - if (Vertices[i + 1].Normal == vector3(0, 0, 0)) - Vertices[i + 1].Normal = n2; + if (Vertices[i + 1].normal == glm::vec3()) + Vertices[i + 1].normal = n2; } else WriteLog("odd number of vertices, normals may be wrong!"); @@ -226,36 +227,34 @@ void TGroundNode::InitNormals() case GL_TRIANGLES: for (i = 0; i < iNumVerts; i += 3) { - v1 = Vertices[i + 0].Point - Vertices[i + 1].Point; - v2 = Vertices[i + 1].Point - Vertices[i + 2].Point; - n1 = SafeNormalize(CrossProduct(v1, v2)); - if (Vertices[i + 0].Normal == vector3(0, 0, 0)) - Vertices[i + 0].Normal = (n1); - if (Vertices[i + 1].Normal == vector3(0, 0, 0)) - Vertices[i + 1].Normal = (n1); - if (Vertices[i + 2].Normal == vector3(0, 0, 0)) - Vertices[i + 2].Normal = (n1); - tu = floor(Vertices[i + 0].tu); - tv = floor(Vertices[i + 0].tv); - Vertices[i + 1].tv -= tv; - Vertices[i + 2].tv -= tv; - Vertices[i + 0].tv -= tv; - Vertices[i + 1].tu -= tu; - Vertices[i + 2].tu -= tu; - Vertices[i + 0].tu -= tu; + v1 = Vertices[i + 0].position - Vertices[i + 1].position; + v2 = Vertices[i + 1].position - Vertices[i + 2].position; + n1 = glm::normalize(glm::cross(v1, v2)); + if (Vertices[i + 0].normal == glm::vec3()) + Vertices[i + 0].normal = (n1); + if (Vertices[i + 1].normal == glm::vec3()) + Vertices[i + 1].normal = (n1); + if (Vertices[i + 2].normal == glm::vec3()) + Vertices[i + 2].normal = (n1); + t1 = glm::vec2( + std::floor( Vertices[ i + 0 ].texture.s ), + std::floor( Vertices[ i + 0 ].texture.t ) ); + Vertices[ i + 1 ].texture -= t1; + Vertices[ i + 2 ].texture -= t1; + Vertices[ i + 0 ].texture -= t1; } break; } } - +/* void TGroundNode::RaRenderVBO() { // renderowanie z domyslnego bufora VBO glColor3ub(Diffuse[0], Diffuse[1], Diffuse[2]); GfxRenderer.Bind( TextureID ); // Ustaw aktywną teksturę glDrawArrays(iType, iVboPtr, iNumVerts); // Narysuj naraz wszystkie trójkąty } - -void TGroundNode::Compile( Math3D::vector3 const &Origin, bool const Multiple ) +*/ +void TGroundNode::Compile( glm::dvec3 const &Origin, bool const Multiple ) { // tworzenie skompilowanej listy w wyświetlaniu DL if (false == Multiple) { // obsługa pojedynczej listy @@ -272,33 +271,26 @@ void TGroundNode::Compile( Math3D::vector3 const &Origin, bool const Multiple ) { glBegin(iType); for (int i = 0; i < iNumPts; ++i) - glVertex3d( - Points[i].x - Origin.x, - Points[i].y - Origin.y, - Points[i].z - Origin.z ); + glVertex3dv( glm::value_ptr( Points[i] - Origin ) ); glEnd(); } else if (iType == GL_TRIANGLE_STRIP || iType == GL_TRIANGLE_FAN || iType == GL_TRIANGLES) { // jak nie linie, to trójkąty // TODO: eliminate these calls, they're duplicated by setup part in the unified render function #ifdef EU07_USE_OLD_RENDERCODE - glColor3ub(Diffuse[0], Diffuse[1], Diffuse[2]); + ::glColor3fv( glm::value_ptr( Diffuse ) ); GfxRenderer.Bind(TextureID); #endif glBegin(iType); for (int i = 0; i < iNumVerts; ++i) { - glNormal3dv(&Vertices[i].Normal.x); - glTexCoord2f( - Vertices[i].tu, - Vertices[i].tv); - glVertex3d( - Vertices[i].Point.x - Origin.x, - Vertices[i].Point.y - Origin.y, - Vertices[i].Point.z - Origin.z ); + glNormal3fv( glm::value_ptr( Vertices[ i ].normal ) ); + glTexCoord2fv( glm::value_ptr( Vertices[ i ].texture ) ); + glVertex3dv( glm::value_ptr( Vertices[ i ].position - Origin ) ); } glEnd(); } +/* else if (iType == TP_MESH) { // grupa ze wspólną teksturą - wrzucanie do wspólnego Display List #ifdef EU07_USE_OLD_RENDERCODE @@ -318,6 +310,7 @@ void TGroundNode::Compile( Math3D::vector3 const &Origin, bool const Multiple ) n = n->nNext3; // następny z listy } } +*/ if (false == Multiple) if (Global::bManageNodes) glEndList(); @@ -378,9 +371,8 @@ void TSubRect::NodeAdd(TGroundNode *Node) // nRender - lista grup renderowanych z własnych VBO albo DL // nRenderAlpha - lista grup renderowanych z własnych VBO albo DL z przezroczystością // nRenderWires - lista grup renderowanych z własnych VBO albo DL - druty i linie - // nMeshed - obiekty do pogrupowania wg tekstur - Node->m_rootposition = Math3D::vector3( m_area.center.x, m_area.center.y, m_area.center.z ); + Node->m_rootposition = m_area.center; // since ground rectangle can be empty, we're doing lazy initialization of the geometry bank, when something may actually use it // NOTE: this method is called for both subcell and cell, but subcells get first created and passed the handle from their parent @@ -399,47 +391,21 @@ void TSubRect::NodeAdd(TGroundNode *Node) case TP_TRACK: // TODO: tory z cieniem (tunel, canyon) też dać bez łączenia? ++iTracks; // jeden tor więcej Node->pTrack->RaOwnerSet(this); // do którego sektora ma zgłaszać animację -/* - if( ( true == Global::bUseVBO ) - || ( false == Node->pTrack->IsGroupable() ) ) { - // tory ruchome nie są grupowane przy Display Lists (wymagają odświeżania DL) - RaNodeAdd( Node ); - } - else - { // tory nieruchome mogą być pogrupowane wg tekstury, przy VBO wszystkie - Node->TextureID = Node->pTrack->TextureGet(0); // pobranie tekstury do sortowania - GLuint t = Node->pTrack->TextureGet(1); - if (Node->TextureID) // jeżeli jest pierwsza - { - if (t && (Node->TextureID != t)) - { // jeśli są dwie różne tekstury, dodajemy drugi obiekt dla danego toru - TGroundNode *n = new TGroundNode(); // BUG: source of a memory leak here - n->iType = TP_DUMMYTRACK; // obiekt renderujący siatki dla tekstury - n->TextureID = t; - n->pTrack = Node->pTrack; // wskazuje na ten sam tor - n->pCenter = Node->pCenter; - n->fSquareRadius = Node->fSquareRadius; - n->fSquareMinRadius = Node->fSquareMinRadius; - n->iFlags = Node->iFlags; - n->nNext2 = nRootMesh; - nRootMesh = n; // podczepienie do listy, żeby usunąć na końcu - n->nNext3 = nMeshed; - nMeshed = n; - } - } - else - Node->TextureID = t; // jest tylko druga tekstura - if (Node->TextureID) - { - Node->nNext3 = nMeshed; - nMeshed = Node; - } // do podzielenia potem - } -*/ - // NOTE: track merge code temporarily disabled to simplify implementation of camera-centric rendering - // TODO: re-implement merge for both render paths down the road - RaNodeAdd( Node ); - + // NOTE: track merge/sort temporarily disabled to simplify unification of render code + // TODO: refactor sorting as universal part of drawing process in the renderer +#ifdef EU07_USE_OLD_RENDERCODE + if( Global::bUseVBO ) { + Node->nNext3 = nRenderRect; + nRenderRect = Node; + } // VBO: do nieprzezroczystych z sektora + else { + Node->nNext3 = nRender; + nRender = Node; + } // DL: do nieprzezroczystych +#else + Node->nNext3 = nRenderRect; + nRenderRect = Node; +#endif break; case GL_TRIANGLE_STRIP: case GL_TRIANGLE_FAN: @@ -492,8 +458,6 @@ void TSubRect::NodeAdd(TGroundNode *Node) Node->nNext3 = nRenderMixed; nRenderMixed = Node; } // do mieszanych - // Node->nNext3=nMeshed; //dopisanie do listy sortowania - // nMeshed=Node; break; #ifdef EU07_SCENERY_EDITOR case TP_MEMCELL: { @@ -512,156 +476,21 @@ void TSubRect::NodeAdd(TGroundNode *Node) ++iNodeCount; // licznik obiektów } -void TSubRect::RaNodeAdd(TGroundNode *Node) -{ // finalna kwalifikacja na listy renderowania, jeśli nie obsługiwane grupowo - switch (Node->iType) - { - case TP_TRACK: -#ifdef EU07_USE_OLD_RENDERCODE - if (Global::bUseVBO) - { - Node->nNext3 = nRenderRect; - nRenderRect = Node; - } // VBO: do nieprzezroczystych z sektora - else - { - Node->nNext3 = nRender; - nRender = Node; - } // DL: do nieprzezroczystych -#else - Node->nNext3 = nRenderRect; - nRenderRect = Node; -#endif - break; - case GL_TRIANGLE_STRIP: - case GL_TRIANGLE_FAN: - case GL_TRIANGLES: - if (Node->iFlags & 0x20) // czy jest przezroczyste? - { - Node->nNext3 = nRenderRectAlpha; - nRenderRectAlpha = Node; - } // DL: do przezroczystych z sektora -#ifdef EU07_USE_OLD_RENDERCODE - else if (Global::bUseVBO) - { - Node->nNext3 = nRenderRect; - nRenderRect = Node; - } // VBO: do nieprzezroczystych z sektora - else - { - Node->nNext3 = nRender; - nRender = Node; - } // DL: do nieprzezroczystych wszelakich -#else - else { - Node->nNext3 = nRenderRect; - nRenderRect = Node; - } // do nieprzezroczystych z sektora -#endif - break; - case TP_MODEL: // modele zawsze wyświetlane z własnego VBO - if ((Node->iFlags & 0x20200020) == 0) // czy brak przezroczystości? - { - Node->nNext3 = nRender; - nRender = Node; - } // do nieprzezroczystych - else if ((Node->iFlags & 0x10100010) == 0) // czy brak nieprzezroczystości? - { - Node->nNext3 = nRenderAlpha; - nRenderAlpha = Node; - } // do przezroczystych - else // jak i take i takie, to będzie dwa razy renderowane... - { - Node->nNext3 = nRenderMixed; - nRenderMixed = Node; - } // do mieszanych - break; - case TP_MESH: // grupa ze wspólną teksturą - //{Node->nNext3=nRenderRect; nRenderRect=Node;} //do nieprzezroczystych z sektora - { - Node->nNext3 = nRender; - nRender = Node; - } // do nieprzezroczystych - break; - case TP_SUBMODEL: // submodele terenu w kwadracie kilometrowym idą do nRootMesh - // WriteLog("nRootMesh was "+AnsiString(nRootMesh?"not null ":"null - // ")+IntToHex(int(this),8)); - Node->nNext3 = nRootMesh; // przy VBO musi być inaczej - nRootMesh = Node; - break; - } -} +// przygotowanie sektora do renderowania +void TSubRect::Sort() { -void TSubRect::Sort() -{ // przygotowanie sektora do renderowania - TGroundNode **n0, *n1, *n2; // wskaźniki robocze - delete[] tTracks; // usunięcie listy - tTracks = - iTracks ? new TTrack *[iTracks] : NULL; // tworzenie tabeli torów do renderowania pojazdów - if (tTracks) - { // wypełnianie tabeli torów + assert( tTracks == nullptr ); + if( iTracks > 0 ) { + tTracks = new TTrack *[ iTracks ]; // tworzenie tabeli torów do renderowania pojazdów int i = 0; - for (n1 = nRootNode; n1; n1 = n1->nNext2) // kolejne obiekty z sektora - if (n1->iType == TP_TRACK) - tTracks[i++] = n1->pTrack; - } - // sortowanie obiektów w sektorze na listy renderowania - if (!nMeshed) - return; // nie ma nic do sortowania - bool sorted = false; - while (!sorted) - { // sortowanie bąbelkowe obiektów wg tekstury - sorted = true; // zakładamy posortowanie - n0 = &nMeshed; // wskaźnik niezbędny do zamieniania obiektów - n1 = nMeshed; // lista obiektów przetwarzanych na statyczne siatki - while (n1) - { // sprawdzanie stanu posortowania obiektów i ewentualne zamiany - n2 = n1->nNext3; // kolejny z tej listy - if (n2) // jeśli istnieje - if (n1->TextureID > n2->TextureID) - { // zamiana elementów miejscami - *n0 = n2; // drugi będzie na początku - n1->nNext3 = n2->nNext3; // ten zza drugiego będzie za pierwszym - n2->nNext3 = n1; // a za drugim będzie pierwszy - sorted = false; // potrzebny kolejny przebieg - } - n0 = &(n1->nNext3); - n1 = n2; - }; - } - // wyrzucenie z listy obiektów pojedynczych (nie ma z czym ich grupować) - // nawet jak są pojedyncze, to i tak lepiej, aby były w jednym Display List - /* - else - {//dodanie do zwykłej listy renderowania i usunięcie z grupowego - *n0=n2; //drugi będzie na początku - RaNodeAdd(n1); //nie ma go z czym zgrupować; (n1->nNext3) zostanie nadpisane - n1=n2; //potrzebne do ustawienia (n0) + for( TGroundNode *node = nRootNode; node != nullptr; node = node->nNext2 ) { + // kolejne obiekty z sektora + if( node->iType == TP_TRACK ) { + tTracks[ i++ ] = node->pTrack; + } } - */ - //... - // przeglądanie listy i tworzenie obiektów renderujących dla danej tekstury - int t = 0; // pomocniczy kod tekstury - n1 = nMeshed; // lista obiektów przetwarzanych na statyczne siatki - while (n1) - { // dla każdej tekstury powinny istnieć co najmniej dwa obiekty, ale dla DL nie ma to znaczenia - if (t < n1->TextureID) // jeśli (n1) ma inną teksturę niż poprzednie - { // można zrobić obiekt renderujący - t = n1->TextureID; - n2 = new TGroundNode(); // BUG: source of a memory leak here - n2->nNext2 = nRootMesh; - nRootMesh = n2; // podczepienie na początku listy - nRootMesh->iType = TP_MESH; // obiekt renderujący siatki dla tekstury - nRootMesh->TextureID = t; - nRootMesh->nNode = n1; // pierwszy element z listy - nRootMesh->pCenter = n1->pCenter; - nRootMesh->fSquareRadius = 1e8; // widać bez ograniczeń - nRootMesh->fSquareMinRadius = 0.0; - nRootMesh->iFlags = 0x10; - RaNodeAdd(nRootMesh); // dodanie do odpowiedniej listy renderowania - } - n1 = n1->nNext3; // kolejny z tej listy - }; + } + // NOTE: actual sort procedure temporarily removed as part of render code unification } TTrack * TSubRect::FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude) @@ -704,7 +533,7 @@ void TSubRect::RaAnimate() } // crude way to mark whether a vbo is bound, for the vbo render path // TODO: sort this shit out and re-arrange into something more elegant... eventually - GLuint vertexbuffer{ static_cast(-1) }; + GLuint vertexbuffer { static_cast(-1) }; if (Global::bUseVBO) { // odświeżenie VBO sektora if( GLEW_VERSION_1_5 ) { @@ -720,7 +549,7 @@ void TSubRect::RaAnimate() tTrackAnim = tTrackAnim->RaAnimate( vertexbuffer ); // przeliczenie animacji kolejnego }; -TTraction * TSubRect::FindTraction(vector3 *Point, int &iConnection, TTraction *Exclude) +TTraction * TSubRect::FindTraction(glm::dvec3 const &Point, int &iConnection, TTraction *Exclude) { // szukanie przęsła w sektorze, którego koniec jest najbliższy (*Point) TGroundNode *Current; for (Current = nRenderWires; Current; Current = Current->nNext3) @@ -772,7 +601,9 @@ void TSubRect::LoadNodes() return; // jeśli nie ma obiektów do wyświetlenia z VBO, to koniec if (Global::bUseVBO) { // tylko liczenie wierzchołów, gdy nie ma VBO + MakeArray(m_nVertexCount); + n = nRootNode; int i; while (n) @@ -785,14 +616,23 @@ void TSubRect::LoadNodes() case GL_TRIANGLES: for (i = 0; i < n->iNumVerts; ++i) { // Ra: trójkąty można od razu wczytywać do takich tablic... to może poczekać - m_pVNT[n->iVboPtr + i].x = n->Vertices[i].Point.x - n->m_rootposition.x; - m_pVNT[n->iVboPtr + i].y = n->Vertices[i].Point.y - n->m_rootposition.y; - m_pVNT[n->iVboPtr + i].z = n->Vertices[i].Point.z - n->m_rootposition.z; - m_pVNT[n->iVboPtr + i].nx = n->Vertices[i].Normal.x; - m_pVNT[n->iVboPtr + i].ny = n->Vertices[i].Normal.y; - m_pVNT[n->iVboPtr + i].nz = n->Vertices[i].Normal.z; + m_pVNT[ n->iVboPtr + i ].position = n->Vertices[ i ].position - n->m_rootposition; +/* + m_pVNT[n->iVboPtr + i].x = n->Vertices[i].position.x - n->m_rootposition.x; + m_pVNT[n->iVboPtr + i].y = n->Vertices[i].position.y - n->m_rootposition.y; + m_pVNT[n->iVboPtr + i].z = n->Vertices[i].position.z - n->m_rootposition.z; +*/ + m_pVNT[ n->iVboPtr + i ].normal = n->Vertices[ i ].normal; +/* + m_pVNT[n->iVboPtr + i].nx = n->Vertices[i].normal.x; + m_pVNT[n->iVboPtr + i].ny = n->Vertices[i].normal.y; + m_pVNT[n->iVboPtr + i].nz = n->Vertices[i].normal.z; +*/ + m_pVNT[ n->iVboPtr + i ].texture = n->Vertices[ i ].texture; +/* m_pVNT[n->iVboPtr + i].u = n->Vertices[i].tu; m_pVNT[n->iVboPtr + i].v = n->Vertices[i].tv; +*/ } break; case GL_LINES: @@ -800,9 +640,13 @@ void TSubRect::LoadNodes() case GL_LINE_LOOP: for (i = 0; i < n->iNumPts; ++i) { - m_pVNT[n->iVboPtr + i].x = n->Points[i].x - n->m_rootposition.x; - m_pVNT[n->iVboPtr + i].y = n->Points[i].y - n->m_rootposition.y; - m_pVNT[n->iVboPtr + i].z = n->Points[i].z - n->m_rootposition.z; + m_pVNT[ n->iVboPtr + i ].position = ( n->Points[ i ] - n->m_rootposition ); +/* + glm::vec3( + n->Points[ i ].x - n->m_rootposition.x, + n->Points[ i ].y - n->m_rootposition.y, + n->Points[ i ].z - n->m_rootposition.z ); +*/ // miejsce w tablicach normalnych i teksturowania się marnuje... } break; @@ -880,8 +724,6 @@ TGroundRect::Init() { //--------------------------------------------------------------------------- -std::vector TempVerts; - BYTE TempConnectionType[ 200 ]; // Ra: sprzêgi w sk³adzie; ujemne, gdy odwrotnie TGround::TGround() @@ -896,7 +738,7 @@ TGround::TGround() // set bounding area information for ground rectangles float const rectsize = 1000.0f; - glm::vec3 const worldcenter( 0.0f, 0.0f, 0.0f ); + glm::vec3 const worldcenter; for( int column = 0; column < iNumRects; ++column ) { for( int row = 0; row < iNumRects; ++row ) { auto &area = Rects[ column ][ row ].m_area; @@ -1038,12 +880,12 @@ void TGround::RaTriangleDivider(TGroundNode *node) double x1 = x0 + 1400.0; double z0 = 1000.0 * floor(0.001 * node->pCenter.z) - 200.0; double z1 = z0 + 1400.0; - if ((node->Vertices[0].Point.x >= x0) && (node->Vertices[0].Point.x <= x1) && - (node->Vertices[0].Point.z >= z0) && (node->Vertices[0].Point.z <= z1) && - (node->Vertices[1].Point.x >= x0) && (node->Vertices[1].Point.x <= x1) && - (node->Vertices[1].Point.z >= z0) && (node->Vertices[1].Point.z <= z1) && - (node->Vertices[2].Point.x >= x0) && (node->Vertices[2].Point.x <= x1) && - (node->Vertices[2].Point.z >= z0) && (node->Vertices[2].Point.z <= z1)) + if ((node->Vertices[0].position.x >= x0) && (node->Vertices[0].position.x <= x1) && + (node->Vertices[0].position.z >= z0) && (node->Vertices[0].position.z <= z1) && + (node->Vertices[1].position.x >= x0) && (node->Vertices[1].position.x <= x1) && + (node->Vertices[1].position.z >= z0) && (node->Vertices[1].position.z <= z1) && + (node->Vertices[2].position.x >= x0) && (node->Vertices[2].position.x <= x1) && + (node->Vertices[2].position.z >= z0) && (node->Vertices[2].position.z <= z1)) return; // trójkąt wystający mniej niż 200m z kw. kilometrowego jest do przyjęcia // Ra: przerobić na dzielenie na 2 trójkąty, podział w przecięciu z siatką kilometrową // Ra: i z rekurencją będzie dzielić trzy trójkąty, jeśli będzie taka potrzeba @@ -1053,40 +895,40 @@ void TGround::RaTriangleDivider(TGroundNode *node) x1 -= 200.0; // przestawienie na siatkę z0 += 200.0; z1 -= 200.0; - mul = (node->Vertices[0].Point.x - x0) * (node->Vertices[1].Point.x - x0); // AB na wschodzie + mul = (node->Vertices[0].position.x - x0) * (node->Vertices[1].position.x - x0); // AB na wschodzie if (mul < min) min = mul, divide = 0; - mul = (node->Vertices[1].Point.x - x0) * (node->Vertices[2].Point.x - x0); // BC na wschodzie + mul = (node->Vertices[1].position.x - x0) * (node->Vertices[2].position.x - x0); // BC na wschodzie if (mul < min) min = mul, divide = 1; - mul = (node->Vertices[2].Point.x - x0) * (node->Vertices[0].Point.x - x0); // CA na wschodzie + mul = (node->Vertices[2].position.x - x0) * (node->Vertices[0].position.x - x0); // CA na wschodzie if (mul < min) min = mul, divide = 2; - mul = (node->Vertices[0].Point.x - x1) * (node->Vertices[1].Point.x - x1); // AB na zachodzie + mul = (node->Vertices[0].position.x - x1) * (node->Vertices[1].position.x - x1); // AB na zachodzie if (mul < min) min = mul, divide = 8; - mul = (node->Vertices[1].Point.x - x1) * (node->Vertices[2].Point.x - x1); // BC na zachodzie + mul = (node->Vertices[1].position.x - x1) * (node->Vertices[2].position.x - x1); // BC na zachodzie if (mul < min) min = mul, divide = 9; - mul = (node->Vertices[2].Point.x - x1) * (node->Vertices[0].Point.x - x1); // CA na zachodzie + mul = (node->Vertices[2].position.x - x1) * (node->Vertices[0].position.x - x1); // CA na zachodzie if (mul < min) min = mul, divide = 10; - mul = (node->Vertices[0].Point.z - z0) * (node->Vertices[1].Point.z - z0); // AB na południu + mul = (node->Vertices[0].position.z - z0) * (node->Vertices[1].position.z - z0); // AB na południu if (mul < min) min = mul, divide = 4; - mul = (node->Vertices[1].Point.z - z0) * (node->Vertices[2].Point.z - z0); // BC na południu + mul = (node->Vertices[1].position.z - z0) * (node->Vertices[2].position.z - z0); // BC na południu if (mul < min) min = mul, divide = 5; - mul = (node->Vertices[2].Point.z - z0) * (node->Vertices[0].Point.z - z0); // CA na południu + mul = (node->Vertices[2].position.z - z0) * (node->Vertices[0].position.z - z0); // CA na południu if (mul < min) min = mul, divide = 6; - mul = (node->Vertices[0].Point.z - z1) * (node->Vertices[1].Point.z - z1); // AB na północy + mul = (node->Vertices[0].position.z - z1) * (node->Vertices[1].position.z - z1); // AB na północy if (mul < min) min = mul, divide = 12; - mul = (node->Vertices[1].Point.z - z1) * (node->Vertices[2].Point.z - z1); // BC na północy + mul = (node->Vertices[1].position.z - z1) * (node->Vertices[2].position.z - z1); // BC na północy if (mul < min) min = mul, divide = 13; - mul = (node->Vertices[2].Point.z - z1) * (node->Vertices[0].Point.z - z1); // CA na północy + mul = (node->Vertices[2].position.z - z1) * (node->Vertices[0].position.z - z1); // CA na północy if (mul < min) divide = 14; // tworzymy jeden dodatkowy trójkąt, dzieląc jeden bok na przecięciu siatki kilometrowej @@ -1096,19 +938,24 @@ void TGround::RaTriangleDivider(TGroundNode *node) ntri->Init(3); ntri->TextureID = node->TextureID; ntri->iFlags = node->iFlags; +/* for (int j = 0; j < 4; ++j) { ntri->Ambient[j] = node->Ambient[j]; ntri->Diffuse[j] = node->Diffuse[j]; ntri->Specular[j] = node->Specular[j]; } +*/ + ntri->Ambient = node->Ambient; + ntri->Diffuse = node->Diffuse; + ntri->Specular = node->Specular; ntri->asName = node->asName; ntri->fSquareRadius = node->fSquareRadius; ntri->fSquareMinRadius = node->fSquareMinRadius; ntri->bVisible = node->bVisible; // a są jakieś niewidoczne? ntri->nNext = nRootOfType[GL_TRIANGLES]; nRootOfType[GL_TRIANGLES] = ntri; // dopisanie z przodu do listy - iNumNodes++; + ++iNumNodes; switch (divide & 3) { // podzielenie jednego z boków, powstaje wierzchołek D case 0: // podział AB (0-1) -> ADC i DBC @@ -1143,17 +990,14 @@ void TGround::RaTriangleDivider(TGroundNode *node) break; } // przeliczenie środków ciężkości obu - node->pCenter = - (node->Vertices[0].Point + node->Vertices[1].Point + node->Vertices[2].Point) / 3.0; - ntri->pCenter = - (ntri->Vertices[0].Point + ntri->Vertices[1].Point + ntri->Vertices[2].Point) / 3.0; + node->pCenter = ( node->Vertices[ 0 ].position + node->Vertices[ 1 ].position + node->Vertices[ 2 ].position ) / 3.0; + ntri->pCenter = ( ntri->Vertices[ 0 ].position + ntri->Vertices[ 1 ].position + ntri->Vertices[ 2 ].position ) / 3.0; RaTriangleDivider(node); // rekurencja, bo nawet na TD raz nie wystarczy RaTriangleDivider(ntri); }; TGroundNode * TGround::AddGroundNode(cParser *parser) { // wczytanie wpisu typu "node" - // parser->LoadTraction=Global::bLoadTraction; //Ra: tu nie potrzeba powtarzać std::string str, str1, str2, str3, str4, Skin, DriverType, asNodeName; int nv, i; double tf, r, rmin, tf1, tf3; @@ -1171,7 +1015,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> rmin >> asNodeName >> str; - //str = AnsiString(token.c_str()); TGroundNode *tmp = new TGroundNode(); tmp->asName = (asNodeName == "none" ? "" : asNodeName); if (r >= 0) @@ -1223,6 +1066,9 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) delete tmp; return NULL; } + glm::dvec3 center; + std::vector importedvertices; + switch (tmp->iType) { case TP_TRACTION: @@ -1231,8 +1077,10 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) *parser >> token; tmp->hvTraction->asPowerSupplyName = token; // nazwa zasilacza parser->getTokens(3); - *parser >> tmp->hvTraction->NominalVoltage >> tmp->hvTraction->MaxCurrent >> - tmp->hvTraction->fResistivity; + *parser + >> tmp->hvTraction->NominalVoltage + >> tmp->hvTraction->MaxCurrent + >> tmp->hvTraction->fResistivity; if (tmp->hvTraction->fResistivity == 0.01f) // tyle jest w sceneriach [om/km] tmp->hvTraction->fResistivity = 0.075f; // taka sensowniejsza wartość za // http://www.ikolej.pl/fileadmin/user_upload/Seminaria_IK/13_05_07_Prezentacja_Kruczek.pdf @@ -1254,33 +1102,38 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) parser->getTokens(); *parser >> tmp->hvTraction->DamageFlag; parser->getTokens(3); - *parser >> tmp->hvTraction->pPoint1.x >> tmp->hvTraction->pPoint1.y >> - tmp->hvTraction->pPoint1.z; - tmp->hvTraction->pPoint1 += pOrigin; + *parser + >> tmp->hvTraction->pPoint1.x + >> tmp->hvTraction->pPoint1.y + >> tmp->hvTraction->pPoint1.z; + tmp->hvTraction->pPoint1 += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); parser->getTokens(3); - *parser >> tmp->hvTraction->pPoint2.x >> tmp->hvTraction->pPoint2.y >> - tmp->hvTraction->pPoint2.z; - tmp->hvTraction->pPoint2 += pOrigin; + *parser + >> tmp->hvTraction->pPoint2.x + >> tmp->hvTraction->pPoint2.y + >> tmp->hvTraction->pPoint2.z; + tmp->hvTraction->pPoint2 += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); parser->getTokens(3); - *parser >> tmp->hvTraction->pPoint3.x >> tmp->hvTraction->pPoint3.y >> - tmp->hvTraction->pPoint3.z; - tmp->hvTraction->pPoint3 += pOrigin; + *parser + >> tmp->hvTraction->pPoint3.x + >> tmp->hvTraction->pPoint3.y + >> tmp->hvTraction->pPoint3.z; + tmp->hvTraction->pPoint3 += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); parser->getTokens(3); - *parser >> tmp->hvTraction->pPoint4.x >> tmp->hvTraction->pPoint4.y >> - tmp->hvTraction->pPoint4.z; - tmp->hvTraction->pPoint4 += pOrigin; + *parser + >> tmp->hvTraction->pPoint4.x + >> tmp->hvTraction->pPoint4.y + >> tmp->hvTraction->pPoint4.z; + tmp->hvTraction->pPoint4 += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); parser->getTokens(); *parser >> tf1; tmp->hvTraction->fHeightDifference = - (tmp->hvTraction->pPoint3.y - tmp->hvTraction->pPoint1.y + tmp->hvTraction->pPoint4.y - - tmp->hvTraction->pPoint2.y) * - 0.5f - - tf1; + (tmp->hvTraction->pPoint3.y - tmp->hvTraction->pPoint1.y + tmp->hvTraction->pPoint4.y - tmp->hvTraction->pPoint2.y) * 0.5f - tf1; parser->getTokens(); *parser >> tf1; if (tf1 > 0) tmp->hvTraction->iNumSections = - (tmp->hvTraction->pPoint1 - tmp->hvTraction->pPoint2).Length() / tf1; + glm::length((tmp->hvTraction->pPoint1 - tmp->hvTraction->pPoint2)) / tf1; else tmp->hvTraction->iNumSections = 0; parser->getTokens(); @@ -1305,19 +1158,24 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->hvTraction->Init(); // przeliczenie parametrów // if (Global::bLoadTraction) // tmp->hvTraction->Optimize(); //generowanie DL dla wszystkiego przy wczytywaniu? - tmp->pCenter = (tmp->hvTraction->pPoint2 + tmp->hvTraction->pPoint1) * 0.5f; - // if (!Global::bLoadTraction) SafeDelete(tmp); //Ra: tak być nie może, bo NULL to błąd + tmp->pCenter = interpolate( tmp->hvTraction->pPoint2, tmp->hvTraction->pPoint1, 0.5 ); break; case TP_TRACTIONPOWERSOURCE: parser->getTokens(3); - *parser >> tmp->pCenter.x >> tmp->pCenter.y >> tmp->pCenter.z; + *parser + >> tmp->pCenter.x + >> tmp->pCenter.y + >> tmp->pCenter.z; tmp->pCenter += pOrigin; tmp->psTractionPowerSource = new TTractionPowerSource(tmp); tmp->psTractionPowerSource->Load(parser); break; case TP_MEMCELL: parser->getTokens(3); - *parser >> tmp->pCenter.x >> tmp->pCenter.y >> tmp->pCenter.z; + *parser + >> tmp->pCenter.x + >> tmp->pCenter.y + >> tmp->pCenter.z; tmp->pCenter.RotateY(aRotate.y / 180.0 * M_PI); // Ra 2014-11: uwzględnienie rotacji tmp->pCenter += pOrigin; tmp->MemCell = new TMemCell(&tmp->pCenter); @@ -1332,7 +1190,10 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) break; case TP_EVLAUNCH: parser->getTokens(3); - *parser >> tmp->pCenter.x >> tmp->pCenter.y >> tmp->pCenter.z; + *parser + >> tmp->pCenter.x + >> tmp->pCenter.y + >> tmp->pCenter.z; tmp->pCenter.RotateY(aRotate.y / 180.0 * M_PI); // Ra 2014-11: uwzględnienie rotacji tmp->pCenter += pOrigin; tmp->EvLaunch = new TEventLauncher(); @@ -1343,8 +1204,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) if (Global::iWriteLogEnabled & 4) if (!tmp->asName.empty()) WriteLog(tmp->asName); - tmp->pTrack->Load(parser, pOrigin, - tmp->asName); // w nazwie może być nazwa odcinka izolowanego + tmp->pTrack->Load(parser, pOrigin, tmp->asName); // w nazwie może być nazwa odcinka izolowanego if (!tmp->asName.empty()) // jest pusta gdy "none" { // dodanie do wyszukiwarki if( false == m_trackmap.Add( TP_TRACK, tmp->asName, tmp ) ) { @@ -1352,14 +1212,18 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) ErrorLog( "Duplicated track: " + tmp->asName ); // to zgłaszać duplikat } } - tmp->pCenter = (tmp->pTrack->CurrentSegment()->FastGetPoint_0() + - tmp->pTrack->CurrentSegment()->FastGetPoint(0.5) + - tmp->pTrack->CurrentSegment()->FastGetPoint_1()) / - 3.0; + tmp->pCenter = ( + tmp->pTrack->CurrentSegment()->FastGetPoint_0() + + tmp->pTrack->CurrentSegment()->FastGetPoint( 0.5 ) + + tmp->pTrack->CurrentSegment()->FastGetPoint_1() ) + / 3.0; break; case TP_SOUND: parser->getTokens(3); - *parser >> tmp->pCenter.x >> tmp->pCenter.y >> tmp->pCenter.z; + *parser + >> tmp->pCenter.x + >> tmp->pCenter.y + >> tmp->pCenter.z; tmp->pCenter.RotateY(aRotate.y / 180.0 * M_PI); // Ra 2014-11: uwzględnienie rotacji tmp->pCenter += pOrigin; parser->getTokens(); @@ -1368,11 +1232,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) //str = AnsiString(token.c_str()); tmp->tsStaticSound = new TTextSound(str, sqrt(tmp->fSquareRadius), tmp->pCenter.x, tmp->pCenter.y, tmp->pCenter.z, false, false, rmin); if (rmin < 0.0) - rmin = - 0.0; // przywrócenie poprawnej wartości, jeśli służyła do wyłączenia efektu Dopplera - - // tmp->pDirectSoundBuffer=TSoundsManager::GetFromName(str.c_str()); - // tmp->iState=(Parser->GetNextSymbol().LowerCase()=="loop"?DSBPLAY_LOOPING:0); + rmin = 0.0; // przywrócenie poprawnej wartości, jeśli służyła do wyłączenia efektu Dopplera parser->getTokens(); *parser >> token; break; @@ -1406,12 +1266,11 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) str4 = ""; } int2 = 0; // zeruje po wykorzystaniu - // *parser >> int1; //yB: nastawy i takie tam TUTAJ!!!!! if (int1 < 0) int1 = (-int1) | ctrain_depot; // sprzęg zablokowany (pojazdy nierozłączalne przy manewrach) if (tf1 != -1.0) - if (fabs(tf1) > 0.5) // maksymalna odległość między sprzęgami - do przemyślenia + if (std::fabs(tf1) > 0.5) // maksymalna odległość między sprzęgami - do przemyślenia int1 = 0; // likwidacja sprzęgu, jeśli odległość zbyt duża - to powinno być // uwzględniane w fizyce sprzęgów... TempConnectionType[iTrainSetWehicleNumber] = int1; // wartość dodatnia @@ -1534,37 +1393,19 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->pCenter.RotateY(aRotate.y / 180.0 * M_PI); // McZapkie-260402: model tez ma wspolrzedne wzgledne tmp->pCenter += pOrigin; - // tmp->fAngle+=aRotate.y; // /180*M_PI - /* - if (tmp->iType==TP_MODEL) - {//jeśli standardowy model - */ + tmp->Model = new TAnimModel(); - tmp->Model->RaAnglesSet(aRotate.x, tf1 + aRotate.y, - aRotate.z); // dostosowanie do pochylania linii - if (tmp->Model->Load( - parser, tmp->iType == TP_TERRAIN)) // wczytanie modelu, tekstury i stanu świateł... - tmp->iFlags = - tmp->Model->Flags() | 0x200; // ustalenie, czy przezroczysty; flaga usuwania + tmp->Model->RaAnglesSet(aRotate.x, tf1 + aRotate.y, aRotate.z); // dostosowanie do pochylania linii + if( tmp->Model->Load( parser, tmp->iType == TP_TERRAIN ) ) { + // wczytanie modelu, tekstury i stanu świateł... + tmp->iFlags = tmp->Model->Flags() | 0x200; // ustalenie, czy przezroczysty; flaga usuwania + } else if (tmp->iType != TP_TERRAIN) { // model nie wczytał się - ignorowanie node delete tmp; tmp = NULL; // nie może być tu return break; // nie może być tu return? } - /* - } - else if (tmp->iType==TP_TERRAIN) - {//nie potrzeba nakładki animującej submodele - *parser >> token; - tmp->pModel3D=TModelsManager::GetModel(token.c_str(),false); - do //Ra: z tym to trochę bez sensu jest - {parser->getTokens(); - *parser >> token; - str=AnsiString(token.c_str()); - } while (str!="endterrains"); - } - */ if (tmp->iType == TP_TERRAIN) { // jeśli model jest terenem, trzeba utworzyć dodatkowe obiekty // po wczytaniu model ma już utworzone DL albo VBO @@ -1608,30 +1449,30 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) { if (token.compare("ambient:") == 0) { - parser->getTokens(); - *parser >> tmp->Ambient[0]; - parser->getTokens(); - *parser >> tmp->Ambient[1]; - parser->getTokens(); - *parser >> tmp->Ambient[2]; + parser->getTokens(3); + *parser + >> tmp->Ambient.r + >> tmp->Ambient.g + >> tmp->Ambient.b; + tmp->Ambient /= 255.0f; } else if (token.compare("diffuse:") == 0) { // Ra: coś jest nie tak, bo w jednej linijce nie działa - parser->getTokens(); - *parser >> tmp->Diffuse[0]; - parser->getTokens(); - *parser >> tmp->Diffuse[1]; - parser->getTokens(); - *parser >> tmp->Diffuse[2]; + parser->getTokens( 3 ); + *parser + >> tmp->Diffuse.r + >> tmp->Diffuse.g + >> tmp->Diffuse.b; + tmp->Diffuse /= 255.0f; } else if (token.compare("specular:") == 0) { - parser->getTokens(); - *parser >> tmp->Specular[0]; - parser->getTokens(); - *parser >> tmp->Specular[1]; - parser->getTokens(); - *parser >> tmp->Specular[2]; + parser->getTokens( 3 ); + *parser + >> tmp->Specular.r + >> tmp->Specular.g + >> tmp->Specular.b; + tmp->Specular /= 255.0f; } else Error("Scene material failure!"); @@ -1669,47 +1510,53 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } else { - TempVerts.clear(); TGroundVertex vertex; do { parser->getTokens( 8, false ); *parser - >> vertex.Point.x - >> vertex.Point.y - >> vertex.Point.z - >> vertex.Normal.x - >> vertex.Normal.y - >> vertex.Normal.z - >> vertex.tu - >> vertex.tv; - vertex.Point.RotateZ( aRotate.z / 180 * M_PI ); - vertex.Point.RotateX( aRotate.x / 180 * M_PI ); - vertex.Point.RotateY( aRotate.y / 180 * M_PI ); - vertex.Normal.RotateZ( aRotate.z / 180 * M_PI ); - vertex.Normal.RotateX( aRotate.x / 180 * M_PI ); - vertex.Normal.RotateY( aRotate.y / 180 * M_PI ); - vertex.Point += pOrigin; - tmp->pCenter += vertex.Point; + >> vertex.position.x + >> vertex.position.y + >> vertex.position.z + >> vertex.normal.x + >> vertex.normal.y + >> vertex.normal.z + >> vertex.texture.s + >> vertex.texture.t; +/* + vertex.position.RotateZ( aRotate.z / 180 * M_PI ); + vertex.position.RotateX( aRotate.x / 180 * M_PI ); + vertex.position.RotateY( aRotate.y / 180 * M_PI ); + vertex.normal.RotateZ( aRotate.z / 180 * M_PI ); + vertex.normal.RotateX( aRotate.x / 180 * M_PI ); + vertex.normal.RotateY( aRotate.y / 180 * M_PI ); +*/ + vertex.position = glm::rotateZ( vertex.position, aRotate.z / 180 * M_PI ); + vertex.position = glm::rotateX( vertex.position, aRotate.x / 180 * M_PI ); + vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); + vertex.normal = glm::rotateZ( vertex.normal, static_cast( aRotate.z / 180 * M_PI ) ); + vertex.normal = glm::rotateX( vertex.normal, static_cast( aRotate.x / 180 * M_PI ) ); + vertex.normal = glm::rotateY( vertex.normal, static_cast( aRotate.y / 180 * M_PI ) ); + vertex.position += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); + tmp->pCenter += vertex.position; - TempVerts.emplace_back( vertex ); + importedvertices.emplace_back( vertex ); parser->getTokens(); *parser >> token; } while (token.compare("endtri") != 0); - nv = (int)TempVerts.size(); + nv = (int)importedvertices.size(); tmp->Init(nv); // utworzenie tablicy wierzchołków tmp->pCenter /= (nv > 0 ? nv : 1); r = 0; for (int i = 0; i < nv; i++) { - tmp->Vertices[i] = TempVerts[i]; - tf = SquareMagnitude(tmp->Vertices[i].Point - tmp->pCenter); + tmp->Vertices[i] = importedvertices[i]; + tf = SquareMagnitude( tmp->Vertices[ i ].position - tmp->pCenter ); if (tf > r) r = tf; } - // tmp->fSquareRadius=2000*2000+r; tmp->fSquareRadius += r; RaTriangleDivider(tmp); // Ra: dzielenie trójkątów jest teraz całkiem wydajne } // koniec wczytywania trójkątów @@ -1719,27 +1566,35 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) case GL_LINE_LOOP: { parser->getTokens( 4 ); *parser - >> tmp->Diffuse[ 0 ] - >> tmp->Diffuse[ 1 ] - >> tmp->Diffuse[ 2 ] + >> tmp->Diffuse.r + >> tmp->Diffuse.g + >> tmp->Diffuse.b >> tmp->fLineThickness; - TempVerts.clear(); + tmp->Diffuse /= 255.0f; TGroundVertex vertex; i = 0; parser->getTokens(); *parser >> token; do { - vertex.Point.x = std::atof( token.c_str() ); + vertex.position.x = std::atof( token.c_str() ); parser->getTokens( 2 ); *parser - >> vertex.Point.y - >> vertex.Point.z; - vertex.Point.RotateZ( aRotate.z / 180 * M_PI ); - vertex.Point.RotateX( aRotate.x / 180 * M_PI ); - vertex.Point.RotateY( aRotate.y / 180 * M_PI ); - vertex.Point += pOrigin; - tmp->pCenter += vertex.Point; - TempVerts.emplace_back( vertex ); + >> vertex.position.y + >> vertex.position.z; +/* + vertex.position.RotateZ( aRotate.z / 180 * M_PI ); + vertex.position.RotateX( aRotate.x / 180 * M_PI ); + vertex.position.RotateY( aRotate.y / 180 * M_PI ); +*/ + vertex.position = glm::rotateZ( vertex.position, aRotate.z / 180 * M_PI ); + vertex.position = glm::rotateX( vertex.position, aRotate.x / 180 * M_PI ); + vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); + + vertex.position += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); + + tmp->pCenter += vertex.position; + + importedvertices.emplace_back( vertex ); ++i; parser->getTokens(); @@ -1747,11 +1602,11 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } while( token.compare( "endline" ) != 0 ); nv = i; // tmp->Init(nv); - tmp->Points = new vector3[ nv ]; + tmp->Points = new glm::dvec3[ nv ]; tmp->iNumPts = nv; tmp->pCenter /= ( nv > 0 ? nv : 1 ); for( int i = 0; i < nv; i++ ) - tmp->Points[ i ] = TempVerts[ i ].Point; + tmp->Points[ i ] = importedvertices[ i ].position; break; } } @@ -1837,10 +1692,7 @@ void TGround::FirstInit() gr = GetRect( ( std::stoi( xxxzzz.substr( 0, 3 )) - 500 ) * 1000, ( std::stoi( xxxzzz.substr( 3, 3 )) - 500 ) * 1000 ); - if (Global::bUseVBO) - gr->nTerrain = Current->nNode + j; // zapamiętanie - else - gr->RaNodeAdd(&Current->nNode[j]); + gr->nTerrain = Current->nNode + j; // zapamiętanie } } else if( ( Current->iType != GL_TRIANGLES ) @@ -1852,6 +1704,10 @@ void TGround::FirstInit() } else { // dodajemy do kwadratu kilometrowego + // override visibility ranges, to ensure the content is drawn from far enough + // TODO: subclass NodeAdd() for the ground cell and specialize it, instead of this + Current->fSquareRadius = 50000.0 * 50000.0; + Current->fSquareMinRadius = 0.0; GetRect( Current->pCenter.x, Current->pCenter.z )->NodeAdd( Current ); } } @@ -2805,7 +2661,7 @@ void TGround::InitTraction() Traction = nCurrent->hvTraction; if (!Traction->hvNext[0]) // tylko jeśli jeszcze nie podłączony { - tmp = FindTraction(&Traction->pPoint1, iConnection, nCurrent); + tmp = FindTraction(Traction->pPoint1, iConnection, nCurrent); switch (iConnection) { case 0: @@ -2840,7 +2696,7 @@ void TGround::InitTraction() } if (!Traction->hvNext[1]) // tylko jeśli jeszcze nie podłączony { - tmp = FindTraction(&Traction->pPoint2, iConnection, nCurrent); + tmp = FindTraction(Traction->pPoint2, iConnection, nCurrent); switch (iConnection) { case 0: @@ -3085,14 +2941,14 @@ TTrack * TGround::FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclud return NULL; } -TTraction * TGround::FindTraction(vector3 *Point, int &iConnection, TGroundNode *Exclude) +TTraction * TGround::FindTraction(glm::dvec3 const &Point, int &iConnection, TGroundNode *Exclude) { // wyszukiwanie innego przęsła kończącego się w (Point) TTraction *tmp; iConnection = -1; TSubRect *sr; // najpierw szukamy w okolicznych segmentach - int c = GetColFromX(Point->x); - int r = GetRowFromZ(Point->z); + int c = GetColFromX(Point.x); + int r = GetRowFromZ(Point.z); if ((sr = FastGetSubRect(c, r)) != NULL) // większość będzie w tym samym sektorze if ((tmp = sr->FindTraction(Point, iConnection, Exclude->hvTraction)) != NULL) return tmp; @@ -3121,7 +2977,7 @@ TTraction * TGround::FindTraction(vector3 *Point, int &iConnection, TGroundNode return NULL; }; -TTraction * TGround::TractionNearestFind(vector3 &p, int dir, TGroundNode *n) +TTraction * TGround::TractionNearestFind(glm::dvec3 &p, int dir, TGroundNode *n) { // wyszukanie najbliższego do (p) przęsła o tej samej nazwie sekcji (ale innego niż podłączone) // oraz zasilanego z kierunku (dir) TGroundNode *nCurrent, *nBest = NULL; @@ -3144,7 +3000,7 @@ TTraction * TGround::TractionNearestFind(vector3 &p, int dir, TGroundNode *n) ->hvNext[0]) // ale nie jest bezpośrednio podłączonym if (nCurrent->hvTraction != n->hvTraction->hvNext[1]) if (nCurrent->hvTraction->psPower - [k = (DotProduct( + [k = (glm::dot( n->hvTraction->vParametric, nCurrent->hvTraction->vParametric) >= 0 ? dir ^ 1 : @@ -3153,10 +3009,7 @@ TTraction * TGround::TractionNearestFind(vector3 &p, int dir, TGroundNode *n) if (nCurrent->hvTraction->fResistance[k] >= 0.0) //żeby się nie propagowały jakieś ujemne { // znaleziony kandydat do połączenia - d = SquareMagnitude( - p - - nCurrent - ->pCenter); // kwadrat odległości środków + d = SquareMagnitude( p - nCurrent->pCenter ); // kwadrat odległości środków if (dist > d) { // zapamiętanie nowego najbliższego dist = d; // nowy rekord odległości @@ -3175,7 +3028,7 @@ TTraction * TGround::TractionNearestFind(vector3 &p, int dir, TGroundNode *n) // else // n->hvTraction->pPoint4=0.25*(nBest->pCenter+3*(zg?nBest->hvTraction->pPoint4:nBest->hvTraction->pPoint3)); } - return (nBest ? nBest->hvTraction : NULL); + return (nBest ? nBest->hvTraction : nullptr); }; bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) @@ -3768,15 +3621,16 @@ bool TGround::GetTraction(TDynamicObject *model) double fRaParam; // parametr równania parametrycznego odcinka drutu double fVertical; // odległość w pionie; musi być w zasięgu ruchu "pionowego" pantografu double fHorizontal; // odległość w bok; powinna być mniejsza niż pół szerokości pantografu - vector3 vLeft, vUp, vFront, dwys; - vector3 pant0; - vector3 vParam; // współczynniki równania parametrycznego drutu - vector3 vStyk; // punkt przebicia drutu przez płaszczyznę ruchu pantografu - vector3 vGdzie; // wektor położenia drutu względem pojazdu - vFront = model->VectorFront(); // wektor normalny dla płaszczyzny ruchu pantografu - vUp = model->VectorUp(); // wektor pionu pudła (pochylony od pionu na przechyłce) - vLeft = model->VectorLeft(); // wektor odległości w bok (odchylony od poziomu na przechyłce) - dwys = model->GetPosition(); // współrzędne środka pojazdu + glm::dvec3 vLeft, vUp, vFront, dwys; + glm::dvec3 pant0; + glm::dvec3 vParam; // współczynniki równania parametrycznego drutu + glm::dvec3 vStyk; // punkt przebicia drutu przez płaszczyznę ruchu pantografu + glm::dvec3 vGdzie; // wektor położenia drutu względem pojazdu + vFront = glm::make_vec3(model->VectorFront().getArray()); // wektor normalny dla płaszczyzny ruchu pantografu + vUp = glm::make_vec3(model->VectorUp().getArray()); // wektor pionu pudła (pochylony od pionu na przechyłce) + vLeft = glm::make_vec3(model->VectorLeft().getArray()); // wektor odległości w bok (odchylony od poziomu na przechyłce) + auto const position = model->GetPosition(); // współrzędne środka pojazdu + dwys = glm::dvec3( position.x, position.y, position.z ); TAnimPant *p; // wskaźnik do obiektu danych pantografu for (int k = 0; k < model->iAnimType[ANIM_PANTS]; ++k) { // pętla po pantografach @@ -3791,11 +3645,11 @@ bool TGround::GetTraction(TDynamicObject *model) { // powtarzane aż do znalezienia odpowiedniego odcinka na liście dwukierunkowej // obliczamy wyraz wolny równania płaszczyzny (to miejsce nie jest odpowienie) vParam = p->hvPowerWire->vParametric; // współczynniki równania parametrycznego - fRaParam = -DotProduct(pant0, vFront); + fRaParam = -glm::dot(pant0, vFront); // podstawiamy równanie parametryczne drutu do równania płaszczyzny pantografu // vFront.x*(t1x+t*vParam.x)+vFront.y*(t1y+t*vParam.y)+vFront.z*(t1z+t*vParam.z)+fRaDist=0; - fRaParam = -(DotProduct(p->hvPowerWire->pPoint1, vFront) + fRaParam) / - DotProduct(vParam, vFront); + fRaParam = -(glm::dot(p->hvPowerWire->pPoint1, vFront) + fRaParam) / + glm::dot(vParam, vFront); if (fRaParam < -0.001) // histereza rzędu 7cm na 70m typowego przęsła daje 1 promil p->hvPowerWire = p->hvPowerWire->hvNext[0]; @@ -3821,10 +3675,10 @@ bool TGround::GetTraction(TDynamicObject *model) // el.) vGdzie = vStyk - pant0; // wektor // odległość w pionie musi być w zasięgu ruchu "pionowego" pantografu - fVertical = DotProduct( + fVertical = glm::dot( vGdzie, vUp); // musi się mieścić w przedziale ruchu pantografu // odległość w bok powinna być mniejsza niż pół szerokości pantografu - fHorizontal = fabs(DotProduct(vGdzie, vLeft)) - + fHorizontal = std::fabs(glm::dot(vGdzie, vLeft)) - p->fWidth; // to się musi mieścić w przedziale zależnym od // szerokości pantografu // jeśli w pionie albo w bok jest za daleko, to dany drut jest nieużyteczny @@ -3885,10 +3739,10 @@ bool TGround::GetTraction(TDynamicObject *model) vParam = node->hvTraction ->vParametric; // współczynniki równania parametrycznego - fRaParam = -DotProduct(pant0, vFront); - fRaParam = -(DotProduct(node->hvTraction->pPoint1, vFront) + + fRaParam = -glm::dot(pant0, vFront); + fRaParam = -(glm::dot(node->hvTraction->pPoint1, vFront) + fRaParam) / - DotProduct(vParam, vFront); + glm::dot(vParam, vFront); if ((fRaParam >= -0.001) ? (fRaParam <= 1.001) : false) { // jeśli tylko jest w przedziale, wyznaczyć odległość wzdłuż // wektorów vUp i vLeft @@ -3897,7 +3751,7 @@ bool TGround::GetTraction(TDynamicObject *model) // drutem (dla generatora łuku // el.) vGdzie = vStyk - pant0; // wektor - fVertical = DotProduct( + fVertical = glm::dot( vGdzie, vUp); // musi się mieścić w przedziale ruchu pantografu if (fVertical >= 0.0) // jeśli ponad pantografem (bo może @@ -3910,7 +3764,7 @@ bool TGround::GetTraction(TDynamicObject *model) // (bEnableTraction) aby dało się jeździć na // koślawych // sceneriach - fHorizontal = fabs(DotProduct(vGdzie, vLeft)) - + fHorizontal = std::fabs(glm::dot(vGdzie, vLeft)) - p->fWidth; // i do tego jeszcze // wejdzie pod ślizg if (fHorizontal <= 0.0) // 0.635 dla AKP-1 AKP-4E @@ -3944,7 +3798,7 @@ bool TGround::GetTraction(TDynamicObject *model) // znaleziony { fHorizontal = - fabs(DotProduct(vGdzie, vLeft)) - p->fWidth; + std::fabs(glm::dot(vGdzie, vLeft)) - p->fWidth; if (fHorizontal <= 0.0) // 0.635 dla AKP-1 AKP-4E { // to się musi mieścić w przedziale zaleznym od // szerokości pantografu @@ -4394,14 +4248,19 @@ void TGround::TerrainWrite() Current->iVboPtr = -1; // bo to było tymczasowo używane for (k = 0; k < Current->iNumVerts; ++k) { // przepisanie współrzędnych - ver[k].position.x = Current->Vertices[k].Point.x; - ver[k].position.y = Current->Vertices[k].Point.y; - ver[k].position.z = Current->Vertices[k].Point.z; - ver[k].normal.x = Current->Vertices[k].Normal.x; - ver[k].normal.y = Current->Vertices[k].Normal.y; - ver[k].normal.z = Current->Vertices[k].Normal.z; + ver[ k ].position = Current->Vertices[ k ].position; + ver[ k ].normal = Current->Vertices[ k ].normal; + ver[ k ].texture = Current->Vertices[ k ].texture; +/* + ver[k].position.x = Current->Vertices[k].position.x; + ver[k].position.y = Current->Vertices[k].position.y; + ver[k].position.z = Current->Vertices[k].position.z; + ver[k].normal.x = Current->Vertices[k].normal.x; + ver[k].normal.y = Current->Vertices[k].normal.y; + ver[k].normal.z = Current->Vertices[k].normal.z; ver[k].texture.s = Current->Vertices[k].tu; ver[k].texture.t = Current->Vertices[k].tv; +*/ } break; case GL_TRIANGLE_STRIP: // na razie nie, bo trzeba przerabiać na pojedyncze trójkąty diff --git a/Ground.h b/Ground.h index 08b6f4a7..55b4a819 100644 --- a/Ground.h +++ b/Ground.h @@ -23,20 +23,27 @@ http://mozilla.org/MPL/2.0/. using namespace Math3D; +typedef int TGroundNodeType; // Ra: zmniejszone liczby, aby zrobić tabelkę i zoptymalizować wyszukiwanie const int TP_MODEL = 10; +/* const int TP_MESH = 11; // Ra: specjalny obiekt grupujący siatki dla tekstury const int TP_DUMMYTRACK = 12; // Ra: zdublowanie obiektu toru dla rozdzielenia tekstur +*/ const int TP_TERRAIN = 13; // Ra: specjalny model dla terenu const int TP_DYNAMIC = 14; const int TP_SOUND = 15; const int TP_TRACK = 16; -// const int TP_GEOMETRY=17; +/* +const int TP_GEOMETRY=17; +*/ const int TP_MEMCELL = 18; const int TP_EVLAUNCH = 19; // MC const int TP_TRACTION = 20; const int TP_TRACTIONPOWERSOURCE = 21; // MC -// const int TP_ISOLATED=22; //Ra +/* +const int TP_ISOLATED=22; //Ra +*/ const int TP_SUBMODEL = 22; // Ra: submodele terenu const int TP_LAST = 25; // rozmiar tablicy @@ -64,37 +71,28 @@ struct DaneRozkaz2 }; }; -typedef int TGroundNodeType; - struct TGroundVertex { - vector3 Point; - vector3 Normal; - float tu{ 0.0f }, tv{ 0.0f }; + glm::dvec3 position; + glm::vec3 normal; + glm::vec2 texture; + void HalfSet(const TGroundVertex &v1, const TGroundVertex &v2) { // wyliczenie współrzędnych i mapowania punktu na środku odcinka v1<->v2 - Point = 0.5 * (v1.Point + v2.Point); - Normal = 0.5 * (v1.Normal + v2.Normal); - tu = 0.5 * (v1.tu + v2.tu); - tv = 0.5 * (v1.tv + v2.tv); + interpolate_( v1, v2, 0.5 ); } void SetByX(const TGroundVertex &v1, const TGroundVertex &v2, double x) { // wyliczenie współrzędnych i mapowania punktu na odcinku v1<->v2 - double i = (x - v1.Point.x) / (v2.Point.x - v1.Point.x); // parametr równania - double j = 1.0 - i; - Point = j * v1.Point + i * v2.Point; - Normal = j * v1.Normal + i * v2.Normal; - tu = j * v1.tu + i * v2.tu; - tv = j * v1.tv + i * v2.tv; + interpolate_( v1, v2, ( x - v1.position.x ) / ( v2.position.x - v1.position.x ) ); } void SetByZ(const TGroundVertex &v1, const TGroundVertex &v2, double z) { // wyliczenie współrzędnych i mapowania punktu na odcinku v1<->v2 - double i = (z - v1.Point.z) / (v2.Point.z - v1.Point.z); // parametr równania - double j = 1.0 - i; - Point = j * v1.Point + i * v2.Point; - Normal = j * v1.Normal + i * v2.Normal; - tu = j * v1.tu + i * v2.tu; - tv = j * v1.tv + i * v2.tv; + interpolate_( v1, v2, ( z - v1.position.z ) / ( v2.position.z - v1.position.z ) ); + } + void interpolate_( const TGroundVertex &v1, const TGroundVertex &v2, double factor ) { + position = interpolate( v1.position, v2.position, factor ); + normal = interpolate( v1.normal, v2.normal, static_cast( factor ) ); + texture = interpolate( v1.texture, v2.texture, static_cast( factor ) ); } }; @@ -103,8 +101,11 @@ class TGroundNode : public Resource friend class opengl_renderer; -private: public: + TGroundNode *nNext; // lista wszystkich w scenerii, ostatni na początku + TGroundNode *nNext2; // lista obiektów w sektorze + TGroundNode *nNext3; // lista obiektów renderowanych we wspólnym cyklu + std::string asName; // nazwa (nie zawsze ma znaczenie) TGroundNodeType iType; // typ obiektu union { // Ra: wskażniki zależne od typu - zrobić klasy dziedziczone zamiast @@ -112,7 +113,7 @@ public: TSubModel *smTerrain; // modele terenu (kwadratow kilometrowych) TAnimModel *Model; // model z animacjami TDynamicObject *DynamicObject; // pojazd - vector3 *Points; // punkty dla linii + glm::dvec3 *Points; // punkty dla linii TTrack *pTrack; // trajektoria ruchu TGroundVertex *Vertices; // wierzchołki dla trójkątów TMemCell *MemCell; // komórka pamięci @@ -122,39 +123,35 @@ public: TTextSound *tsStaticSound; // dźwięk przestrzenny TGroundNode *nNode; // obiekt renderujący grupowo ma tu wskaźnik na listę obiektów }; - std::string asName; // nazwa (nie zawsze ma znaczenie) - - vector3 pCenter; // współrzędne środka do przydzielenia sektora - vector3 m_rootposition; // position of the ground (sub)rectangle holding the node, in the 3d world + Math3D::vector3 pCenter; // współrzędne środka do przydzielenia sektora + glm::dvec3 m_rootposition; // position of the ground (sub)rectangle holding the node, in the 3d world // visualization-related data // TODO: wrap these in a struct, when cleaning objects up + double fSquareMinRadius; // kwadrat widoczności od + double fSquareRadius; // kwadrat widoczności do union { int iNumVerts; // dla trójkątów int iNumPts; // dla linii int iCount; // dla terenu }; - double fLineThickness; // McZapkie-120702: grubosc linii - double fSquareRadius; // kwadrat widoczności do - double fSquareMinRadius; // kwadrat widoczności od int iVersion; // wersja siatki (do wykonania rekompilacji) - // union ? GLuint DisplayListID; // numer siatki DisplayLists - bool PROBLEND; int iVboPtr; // indeks w buforze VBO - texture_handle TextureID; // główna (jedna) tekstura obiektu int iFlags; // tryb przezroczystości: 0x10-nieprz.,0x20-przezroczysty,0x30-mieszany - int Ambient[4], Diffuse[4], Specular[4]; // oświetlenie + texture_handle TextureID; // główna (jedna) tekstura obiektu + glm::vec3 + Ambient{ 1.0f, 1.0f, 1.0f }, + Diffuse{ 1.0f, 1.0f, 1.0f }, + Specular{ 1.0f, 1.0f, 1.0f }; // oświetlenie + double fLineThickness; // McZapkie-120702: grubosc linii + bool PROBLEND; bool bVisible; - TGroundNode *nNext; // lista wszystkich w scenerii, ostatni na początku - TGroundNode *nNext2; // lista obiektów w sektorze - TGroundNode *nNext3; // lista obiektów renderowanych we wspólnym cyklu TGroundNode(); TGroundNode(TGroundNodeType t, int n = 0); ~TGroundNode(); void Init(int n); - void InitCenter(); // obliczenie współrzędnych środka void InitNormals(); // bool Disable(); @@ -167,19 +164,20 @@ public: return NULL; }; - void Compile(Math3D::vector3 const &Origin, bool const Multiple = false); + void Compile(glm::dvec3 const &Origin, bool const Multiple = false); void Release(); void RenderHidden(); // obsługa dźwięków i wyzwalaczy zdarzeń +#ifdef EU07_USE_OLD_RENDERCODE // (McZapkie-131202) void RaRenderVBO(); // renderowanie (nieprzezroczystych) ze wspólnego VBO - +#endif }; struct bounding_area { glm::vec3 center; // mid point of the rectangle - float radius{ 0.0f }; // radius of the bounding sphere + float radius { 0.0f }; // radius of the bounding sphere }; class TSubRect : public Resource, public CMesh @@ -190,8 +188,10 @@ class TSubRect : public Resource, public CMesh TTrack **tTracks = nullptr; // tory do renderowania pojazdów protected: TTrack *tTrackAnim = nullptr; // obiekty do przeliczenia animacji +#ifdef EU07_USE_OLD_RENDERCODE TGroundNode *nRootMesh = nullptr; // obiekty renderujące wg tekstury (wtórne, lista po nNext2) TGroundNode *nMeshed = nullptr; // lista obiektów dla których istnieją obiekty renderujące grupowo +#endif public: TGroundNode *nRootNode = nullptr; // wszystkie obiekty w sektorze, z wyjątkiem renderujących i pojazdów (nNext2) TGroundNode *nRenderHidden = nullptr; // lista obiektów niewidocznych, "renderowanych" również z tyłu (nNext3) @@ -211,10 +211,9 @@ class TSubRect : public Resource, public CMesh virtual ~TSubRect(); virtual void Release(); // zwalnianie VBO sektora void NodeAdd(TGroundNode *Node); // dodanie obiektu do sektora na etapie rozdzielania na sektory - void RaNodeAdd(TGroundNode *Node); // dodanie obiektu do listy renderowania void Sort(); // optymalizacja obiektów w sektorze (sortowanie wg tekstur) TTrack * FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude); - TTraction * FindTraction(vector3 *Point, int &iConnection, TTraction *Exclude); + TTraction * FindTraction(glm::dvec3 const &Point, int &iConnection, TTraction *Exclude); bool StartVBO(); // ustwienie VBO sektora dla (nRenderRect), (nRenderRectAlpha) i (nRenderWires) bool RaTrackAnimAdd(TTrack *t); // zgłoszenie toru do animacji void RaAnimate(); // przeliczenie animacji torów @@ -311,8 +310,8 @@ class TGround bool InitEvents(); bool InitLaunchers(); TTrack * FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclude); - TTraction * FindTraction(vector3 *Point, int &iConnection, TGroundNode *Exclude); - TTraction * TractionNearestFind(vector3 &p, int dir, TGroundNode *n); + TTraction * FindTraction(glm::dvec3 const &Point, int &iConnection, TGroundNode *Exclude); + TTraction * TractionNearestFind(glm::dvec3 &p, int dir, TGroundNode *n); TGroundNode * AddGroundNode(cParser *parser); void UpdatePhys(double dt, int iter); // aktualizacja fizyki stałym krokiem bool Update(double dt, int iter); // aktualizacja przesunięć zgodna z FPS diff --git a/Model3d.cpp b/Model3d.cpp index 3b86d474..1c5e444c 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -177,12 +177,19 @@ template inline void readColor(cParser &parser, ColorT *color) color[ 2 ] /= 255.0; }; -inline void readColor(cParser &parser, int &color) +inline void readColor(cParser &parser, glm::vec4 &color) { - int r, g, b, discard; + int discard; parser.getTokens(4, false); - parser >> discard >> r >> g >> b; + parser + >> discard + >> color.r + >> color.g + >> color.b; + color /= 255.0f; +/* color = r + (g << 8) + (b << 16); +*/ }; /* inline void readMatrix(cParser& parser,matrix4x4& matrix) @@ -620,7 +627,7 @@ int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) return s->iNumVerts - tri; // zwraca pozycję tych trójkątów w submodelu }; -basic_vertex *TSubModel::TrianglePtr(int tex, int pos, int *la, int *ld, int *ls) +basic_vertex *TSubModel::TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ) { // zwraca wskaźnik do wypełnienia tabeli wierzchołków, używane // przy tworzeniu E3D terenu TSubModel *s = this; @@ -639,7 +646,7 @@ basic_vertex *TSubModel::TrianglePtr(int tex, int pos, int *la, int *ld, int *ls s->iVboPtr = iInstance; // pozycja submodelu w tabeli wierzchołków iInstance += s->iNumVerts; // pozycja dla następnego } - s->ColorsSet(la, ld, ls); // ustawienie kolorów świateł + s->ColorsSet(Ambient, Diffuse, Specular); // ustawienie kolorów świateł return s->Vertices + pos; // wskaźnik na wolne miejsce w tabeli wierzchołków }; @@ -1038,20 +1045,24 @@ void TSubModel::RaArrayFill(CVertNormTex *Vert) { // wypełnianie tablic VBO if (Child) Child->RaArrayFill(Vert); - if ((eType < TP_ROTATOR) || (eType == TP_STARS)) - for (int i = 0; i < iNumVerts; ++i) - { - Vert[iVboPtr + i].x = Vertices[i].position.x; - Vert[iVboPtr + i].y = Vertices[i].position.y; - Vert[iVboPtr + i].z = Vertices[i].position.z; - Vert[iVboPtr + i].nx = Vertices[i].normal.x; - Vert[iVboPtr + i].ny = Vertices[i].normal.y; - Vert[iVboPtr + i].nz = Vertices[i].normal.z; - Vert[iVboPtr + i].u = Vertices[i].texture.s; - Vert[iVboPtr + i].v = Vertices[i].texture.t; - } - else if (eType == TP_FREESPOTLIGHT) - Vert[iVboPtr].x = Vert[iVboPtr].y = Vert[iVboPtr].z = 0.0; + if( ( eType < TP_ROTATOR ) || ( eType == TP_STARS ) ) + for( int i = 0; i < iNumVerts; ++i ) { + Vert[ iVboPtr + i ].position = Vertices[ i ].position; + Vert[ iVboPtr + i ].normal = Vertices[ i ].normal; + Vert[ iVboPtr + i ].texture = Vertices[ i ].texture; +/* + Vert[iVboPtr + i].x = Vertices[i].position.x; + Vert[iVboPtr + i].y = Vertices[i].position.y; + Vert[iVboPtr + i].z = Vertices[i].position.z; + Vert[iVboPtr + i].nx = Vertices[i].normal.x; + Vert[iVboPtr + i].ny = Vertices[i].normal.y; + Vert[iVboPtr + i].nz = Vertices[i].normal.z; + Vert[iVboPtr + i].u = Vertices[i].texture.s; + Vert[iVboPtr + i].v = Vertices[i].texture.t; +*/ + } + else if( eType == TP_FREESPOTLIGHT ) + Vert[ iVboPtr ].position = glm::vec3(); if (Next) Next->RaArrayFill(Vert); }; @@ -1073,9 +1084,13 @@ void TSubModel::AdjustDist() Next->AdjustDist(); }; -void TSubModel::ColorsSet(int *a, int *d, int *s) +void TSubModel::ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ) { // ustawienie kolorów dla modelu terenu - int i; + f4Ambient = glm::vec4( Ambient, 1.0f ); + f4Diffuse = glm::vec4( Diffuse, 1.0f ); + f4Specular = glm::vec4( Specular, 1.0f ); +/* + int i; if (a) for (i = 0; i < 4; ++i) f4Ambient[i] = a[i] / 255.0; @@ -1085,6 +1100,7 @@ void TSubModel::ColorsSet(int *a, int *d, int *s) if (s) for (i = 0; i < 4; ++i) f4Specular[i] = s[i] / 255.0; +*/ }; void TSubModel::ParentMatrix(float4x4 *m) @@ -1429,13 +1445,13 @@ void TSubModel::deserialize(std::istream &s) fVisible = sn_utils::ld_float32(s); fLight = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; i++) + for (size_t i = 0; i < 4; ++i) f4Ambient[i] = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; i++) + for (size_t i = 0; i < 4; ++i) f4Diffuse[i] = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; i++) + for (size_t i = 0; i < 4; ++i) f4Specular[i] = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; i++) + for (size_t i = 0; i < 4; ++i) f4Emision[i] = sn_utils::ld_float32(s); fWireSize = sn_utils::ld_float32(s); @@ -1828,28 +1844,17 @@ TSubModel *TModel3d::TerrainSquare(int n) r->UnFlagNext(); // blokowanie wyświetlania po Next głównej listy return r; }; +#ifdef EU07_USE_OLD_RENDERCODE void TModel3d::TerrainRenderVBO(int n) { // renderowanie terenu z VBO - glPushMatrix(); + ::glPushMatrix(); ::glTranslated( -Global::pCameraPosition.x, -Global::pCameraPosition.y, -Global::pCameraPosition.z ); - - // glTranslated(vPosition->x,vPosition->y,vPosition->z); - // if (vAngle->y!=0.0) glRotated(vAngle->y,0.0,1.0,0.0); - // if (vAngle->x!=0.0) glRotated(vAngle->x,1.0,0.0,0.0); - // if (vAngle->z!=0.0) glRotated(vAngle->z,0.0,0.0,1.0); - // TSubModel::fSquareDist=SquareMagnitude(*vPosition-Global::GetCameraPosition()); - // //zmienna globalna! - if (StartVBO()) - { // odwrócenie flag, aby wyłapać nieprzezroczyste - // Root->ReplacableSet(ReplacableSkinId,iAlpha^0x0F0F000F); - TSubModel *r = Root; - while (r) - { - if (r->iVisible == n) // tylko jeśli ma być widoczny w danej ramce (problem dla 0==false) - GfxRenderer.Render(r); // sub kolejne (Next) się nie wyrenderują - r = r->NextGet(); - } - EndVBO(); - } - glPopMatrix(); + TSubModel *r = Root; + while( r ) { + if( r->iVisible == n ) // tylko jeśli ma być widoczny w danej ramce (problem dla 0==false) + GfxRenderer.Render( r ); // sub kolejne (Next) się nie wyrenderują + r = r->NextGet(); + } + ::glPopMatrix(); }; +#endif \ No newline at end of file diff --git a/Model3d.h b/Model3d.h index 81049800..a78712eb 100644 --- a/Model3d.h +++ b/Model3d.h @@ -92,10 +92,11 @@ private: int iTexture; // numer nazwy tekstury, -1 wymienna, 0 brak float fVisible; // próg jasności światła do załączenia submodelu float fLight; // próg jasności światła do zadziałania selfillum - float f4Ambient[4]; - float f4Diffuse[4]; // float ze względu na glMaterialfv() - float f4Specular[4]; - float f4Emision[4]; + glm::vec4 + f4Ambient, + f4Diffuse, + f4Specular, + f4Emision; float fWireSize; // nie używane, ale wczytywane float fSquareMaxDist; float fSquareMinDist; @@ -156,7 +157,7 @@ public: TSubModel * NextGet() { return Next; }; TSubModel * ChildGet() { return Child; }; int TriangleAdd(TModel3d *m, texture_handle tex, int tri); - basic_vertex * TrianglePtr(int tex, int pos, int *la, int *ld, int *ls); + basic_vertex * TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ); void SetRotate(float3 vNewRotateAxis, float fNewAngle); void SetRotateXYZ(vector3 vNewAngles); void SetRotateXYZ(float3 vNewAngles); @@ -189,7 +190,7 @@ public: // Ra: funkcje do budowania terenu z E3D int Flags() { return iFlags; }; void UnFlagNext() { iFlags &= 0x00FFFFFF; }; - void ColorsSet(int *a, int *d, int *s); + void ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ); inline float3 Translation1Get() { return fMatrix ? *(fMatrix->TranslationGet()) + v_TransVector : v_TransVector; @@ -247,7 +248,9 @@ public: std::string NameGet() { return m_filename; }; int TerrainCount(); TSubModel * TerrainSquare(int n); - void TerrainRenderVBO(int n); +#ifdef EU07_USE_OLD_RENDERCODE + void TerrainRenderVBO(int n); +#endif void deserialize(std::istream &s, size_t size, bool dynamic); }; diff --git a/Segment.cpp b/Segment.cpp index c3fdb478..a39c46b6 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -398,14 +398,14 @@ int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, ::glVertex3f( pt.x, pt.y, pt.z ); // pt nie mamy gdzie zapamiętać? } else { - Output->x = pt.x; - Output->y = pt.y; - Output->z = pt.z; - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; - Output->v = tv1; + Output->position.x = pt.x; + Output->position.y = pt.y; + Output->position.z = pt.z; + Output->normal.x = norm.x; + Output->normal.y = norm.y; + Output->normal.z = norm.z; + Output->texture.s = (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; + Output->texture.t = tv1; ++Output; } ++vertexcount; @@ -431,14 +431,14 @@ int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, ::glVertex3f( pt.x, pt.y, pt.z ); } else { - Output->x = pt.x; - Output->y = pt.y; - Output->z = pt.z; - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; - Output->v = tv2; + Output->position.x = pt.x; + Output->position.y = pt.y; + Output->position.z = pt.z; + Output->normal.x = norm.x; + Output->normal.y = norm.y; + Output->normal.z = norm.z; + Output->texture.s = (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; + Output->texture.t = tv2; ++Output; } ++vertexcount; @@ -468,14 +468,14 @@ int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na początku odcinka } else { - Output->x = pt.x; - Output->y = pt.y; - Output->z = pt.z; - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = ShapePoints[ j ].z / Texturescale; - Output->v = tv1; + Output->position.x = pt.x; + Output->position.y = pt.y; + Output->position.z = pt.z; + Output->normal.x = norm.x; + Output->normal.y = norm.y; + Output->normal.z = norm.z; + Output->texture.s = ShapePoints[ j ].z / Texturescale; + Output->texture.t = tv1; ++Output; } ++vertexcount; @@ -492,14 +492,14 @@ int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na końcu odcinka } else { - Output->x = pt.x; - Output->y = pt.y; - Output->z = pt.z; - Output->nx = norm.x; - Output->ny = norm.y; - Output->nz = norm.z; - Output->u = ShapePoints[ j ].z / Texturescale; - Output->v = tv2; + Output->position.x = pt.x; + Output->position.y = pt.y; + Output->position.z = pt.z; + Output->normal.x = norm.x; + Output->normal.y = norm.y; + Output->normal.z = norm.z; + Output->texture.s = ShapePoints[ j ].z / Texturescale; + Output->texture.t = tv2; ++Output; } ++vertexcount; diff --git a/Track.cpp b/Track.cpp index d42a3c91..48e39a66 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1091,7 +1091,7 @@ void TTrack::Compile(GLuint tex) normal2 = normal1; } - auto const origin = pMyNode->m_rootposition; + auto const origin { pMyNode->m_rootposition }; double roll1, roll2; switch (iCategoryFlag & 15) @@ -1866,7 +1866,7 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons normal2 = normal1; } - auto const origin = pMyNode->m_rootposition; + auto const origin { pMyNode->m_rootposition }; double roll1, roll2; switch (iCategoryFlag & 15) @@ -2302,42 +2302,42 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons if (TextureID1) { // jeśli podana tekstura nawierzchni // we start with a vertex in the middle... - Vert->nx = 0.0; - Vert->ny = 1.0; - Vert->nz = 0.0; - Vert->u = 0.5; - Vert->v = 0.5; - Vert->x = oxz.x - origin.x; - Vert->y = oxz.y - origin.y; - Vert->z = oxz.z - origin.z; + Vert->normal.x = 0.0; + Vert->normal.y = 1.0; + Vert->normal.z = 0.0; + Vert->texture.s = 0.5; + Vert->texture.t = 0.5; + Vert->position.x = oxz.x - origin.x; + Vert->position.y = oxz.y - origin.y; + Vert->position.z = oxz.z - origin.z; ++Vert; // ...and add one extra vertex to close the fan... - Vert->nx = 0.0; - Vert->ny = 1.0; - Vert->nz = 0.0; + Vert->normal.x = 0.0; + Vert->normal.y = 1.0; + Vert->normal.z = 0.0; // mapowanie we współrzędnych scenerii u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x + origin.x ) / fTexLength; v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z + origin.z ) / ( fTexRatio1 * fTexLength ); - Vert->u = cosa0 * u + sina0 * v + 0.5; - Vert->v = -sina0 * u + cosa0 * v + 0.5; - Vert->x = SwitchExtension->vPoints[ 0 ].x; - Vert->y = SwitchExtension->vPoints[ 0 ].y; - Vert->z = SwitchExtension->vPoints[ 0 ].z; + Vert->texture.s = cosa0 * u + sina0 * v + 0.5; + Vert->texture.t = -sina0 * u + cosa0 * v + 0.5; + Vert->position.x = SwitchExtension->vPoints[ 0 ].x; + Vert->position.y = SwitchExtension->vPoints[ 0 ].y; + Vert->position.z = SwitchExtension->vPoints[ 0 ].z; ++Vert; // ...then draw the precalculated rest for (i = SwitchExtension->iPoints + SwitchExtension->iRoads - 1; i >= 0; --i) { - Vert->nx = 0.0; - Vert->ny = 1.0; - Vert->nz = 0.0; + Vert->normal.x = 0.0; + Vert->normal.y = 1.0; + Vert->normal.z = 0.0; // mapowanie we współrzędnych scenerii u = (SwitchExtension->vPoints[i].x - oxz.x + origin.x ) / fTexLength; v = (SwitchExtension->vPoints[i].z - oxz.z + origin.z ) / (fTexRatio1 * fTexLength); - Vert->u = cosa0 * u + sina0 * v + 0.5; - Vert->v = -sina0 * u + cosa0 * v + 0.5; - Vert->x = SwitchExtension->vPoints[ i ].x; - Vert->y = SwitchExtension->vPoints[ i ].y; - Vert->z = SwitchExtension->vPoints[ i ].z; + Vert->texture.s = cosa0 * u + sina0 * v + 0.5; + Vert->texture.t = -sina0 * u + cosa0 * v + 0.5; + Vert->position.x = SwitchExtension->vPoints[ i ].x; + Vert->position.y = SwitchExtension->vPoints[ i ].y; + Vert->position.z = SwitchExtension->vPoints[ i ].z; ++Vert; } } @@ -2894,7 +2894,7 @@ TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) bladesbuffer.data() ); */ auto bladevertices = bladesbuffer.data(); - auto const origin = pMyNode->m_rootposition; + auto const origin { pMyNode->m_rootposition }; if( SwitchExtension->RightSwitch ) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 /*, true*/ ); SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 /*, true*/ ); diff --git a/Traction.cpp b/Traction.cpp index da00856e..cb79da05 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -91,7 +91,7 @@ sekcji z sąsiedniego przęsła). */ std::size_t -TTraction::create_geometry( geometrybank_handle const &Bank, Math3D::vector3 const &Origin ) { +TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ) { if( m_geometry != NULL ) { return GfxRenderer.Vertices( m_geometry ).size() / 2; @@ -117,13 +117,13 @@ TTraction::create_geometry( geometrybank_handle const &Bank, Math3D::vector3 con vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); // Nie wiem co 'Marcin - Math3D::vector3 pt1, pt2, pt3, pt4, v1, v2; + glm::dvec3 pt1, pt2, pt3, pt4, v1, v2; v1 = pPoint4 - pPoint3; v2 = pPoint2 - pPoint1; float step = 0; if( iNumSections > 0 ) step = 1.0f / (float)iNumSections; - float f = step; + double f = step; float mid = 0.5; float t; // Przewod nosny 'Marcin @@ -274,13 +274,13 @@ TTraction::create_geometry( geometrybank_handle const &Bank, Math3D::vector3 con return elementcount; } -int TTraction::TestPoint(Math3D::vector3 *Point) +int TTraction::TestPoint(glm::dvec3 const &Point) { // sprawdzanie, czy przęsła można połączyć if (!hvNext[0]) - if (pPoint1.Equal(Point)) + if( glm::all( glm::epsilonEqual( Point, pPoint1, 0.025 ) ) ) return 0; if (!hvNext[1]) - if (pPoint2.Equal(Point)) + if( glm::all( glm::epsilonEqual( Point, pPoint2, 0.025 ) ) ) return 1; return -1; }; @@ -358,7 +358,7 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) } t->psPower[d] = ps; // skopiowanie wskaźnika zasilacza od danej strony t->fResistance[d] = r; // wpisanie rezystancji w kierunku tego zasilacza - r += t->fResistivity * Length3(t->vParametric); // doliczenie oporu kolejnego odcinka + r += t->fResistivity * glm::dot(t->vParametric, t->vParametric ); // doliczenie oporu kolejnego odcinka p = t; // zapamiętanie dotychczasowego t = p->hvNext[d ^ 1]; // podążanie w tę samą stronę d = p->iNext[d ^ 1]; @@ -368,7 +368,7 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) else { // podążanie w obu kierunkach, można by rekurencją, ale szkoda zasobów r = 0.5 * fResistivity * - Length3(vParametric); // powiedzmy, że w zasilanym przęśle jest połowa + glm::dot(vParametric, vParametric ); // powiedzmy, że w zasilanym przęśle jest połowa if (fResistance[0] == 0.0) ResistanceCalc(0, r); // do tyłu (w stronę Point1) if (fResistance[1] == 0.0) diff --git a/Traction.h b/Traction.h index 80bd9607..569d8f45 100644 --- a/Traction.h +++ b/Traction.h @@ -27,8 +27,8 @@ class TTraction int iNext[ 2 ] { 0, 0 }; // do którego końca się łączy int iLast { 1 }; //że niby ostatni drut // ustawiony bit 0, jeśli jest ostatnim drutem w sekcji; bit1 - przedostatni public: - Math3D::vector3 pPoint1, pPoint2, pPoint3, pPoint4; - Math3D::vector3 vParametric; // współczynniki równania parametrycznego odcinka + glm::dvec3 pPoint1, pPoint2, pPoint3, pPoint4; + glm::dvec3 vParametric; // współczynniki równania parametrycznego odcinka double fHeightDifference { 0.0 }; //,fMiddleHeight; int iNumSections { 0 }; float NominalVoltage { 0.0f }; @@ -51,8 +51,8 @@ class TTraction // creates geometry data in specified geometry bank. returns: number of created elements, or NULL // NOTE: deleting nodes doesn't currently release geometry data owned by the node. TODO: implement erasing individual geometry chunks and banks - std::size_t create_geometry( geometrybank_handle const &Bank, Math3D::vector3 const &Origin ); - int TestPoint(Math3D::vector3 *Point); + std::size_t create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ); + int TestPoint(glm::dvec3 const &Point); void Connect(int my, TTraction *with, int to); void Init(); bool WhereIs(); diff --git a/VBO.cpp b/VBO.cpp index a61e457a..d9c3a9dd 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "sn_utils.h" #include "globals.h" //--------------------------------------------------------------------------- - +/* void CVertNormTex::deserialize(std::istream &s) { x = sn_utils::ld_float32(s); @@ -42,7 +42,7 @@ void CVertNormTex::serialize(std::ostream &s) sn_utils::ls_float32(s, u); sn_utils::ls_float32(s, v); } - +*/ CMesh::CMesh() { // utworzenie pustego obiektu #ifdef EU07_USE_OLD_VERTEXBUFFER @@ -117,7 +117,7 @@ bool CMesh::StartVBO() if (m_nVBOVertices) { glBindBuffer(GL_ARRAY_BUFFER_ARB, m_nVBOVertices); - glVertexPointer( 3, GL_FLOAT, sizeof(CVertNormTex), static_cast(nullptr) ); // pozycje + glVertexPointer( 3, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) ); // pozycje glNormalPointer( GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 12 ); // normalne glTexCoordPointer( 2, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 24 ); // wierzchołki return true; // można rysować z VBO diff --git a/VBO.h b/VBO.h index d0228bfc..0f52b9d9 100644 --- a/VBO.h +++ b/VBO.h @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #define EU07_USE_OLD_VERTEXBUFFER //--------------------------------------------------------------------------- +/* class CVertNormTex { public: @@ -29,6 +30,8 @@ class CVertNormTex void deserialize(std::istream&); void serialize(std::ostream&); }; +*/ +typedef basic_vertex CVertNormTex; class CMesh { // wsparcie dla VBO diff --git a/dumb3d.h b/dumb3d.h index 3a666e4f..66e7fda3 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -72,6 +72,9 @@ class vector3 y = b; z = c; } + vector3( glm::dvec3 const &Vector ) : + x( Vector.x ), y( Vector.y ), z( Vector.z ) + {} // The int parameter is the number of elements to copy from initArray (3 or 4) // explicit vector3(scalar_t* initArray, int arraySize = 3) diff --git a/renderer.cpp b/renderer.cpp index 95137e19..d5ab5fa1 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -367,9 +367,9 @@ opengl_renderer::Render( TGround *Ground ) { for( int column = originx; column <= originx + segmentcount; ++column ) { for( int row = originz; row <= originz + segmentcount; ++row ) { - auto *rectangle = &Ground->Rects[ column ][ row ]; - if( m_camera.visible( rectangle->m_area ) ) { - Render( rectangle ); + auto *cell = &Ground->Rects[ column ][ row ]; + if( m_camera.visible( cell->m_area ) ) { + Render( cell ); } } } @@ -387,8 +387,8 @@ opengl_renderer::Render( TGround *Ground ) { int r = Ground->GetRowFromZ( Global::pCameraPosition.z ); TSubRect *tmp; int i, j, k; - for( j = r - n; j <= r + n; j++ ) { - for( i = c - n; i <= c + n; i++ ) { + for( j = r - n; j <= r + n; ++j ) { + for( i = c - n; i <= c + n; ++i ) { if( ( tmp = Ground->FastGetSubRect( i, j ) ) != nullptr ) { // oznaczanie aktywnych sektorów tmp->LoadNodes(); @@ -441,12 +441,29 @@ opengl_renderer::Render( TGround *Ground ) { } } while( ( i < 0 ) || ( j < 0 ) ); // są 4 przypadki, oprócz i=j=0 } +/* // dodać renderowanie terenu z E3D - jedno VBO jest używane dla całego modelu, chyba że jest ich więcej if( Global::bUseVBO ) { - if( Global::pTerrainCompact ) { + if( ( Global::pTerrainCompact != nullptr ) + && ( Global::pTerrainCompact->pModel != nullptr ) ) { +#ifdef EU07_USE_OLD_RENDERCODE Global::pTerrainCompact->TerrainRenderVBO( TGroundRect::iFrameNumber ); +#endif + // TODO: remap geometry of terrain cells to allow camera-centric rendering + ::glPushMatrix(); + ::glTranslated( -Global::pCameraPosition.x, -Global::pCameraPosition.y, -Global::pCameraPosition.z ); + TSubModel *submodel = Global::pTerrainCompact->pModel->Root; + while( submodel != nullptr ) { + if( submodel->iVisible == TGroundRect::iFrameNumber ) { + // tylko jeśli ma być widoczny w danej ramce (problem dla 0==false) + Render( submodel ); // sub kolejne (Next) się nie wyrenderują + } + submodel = submodel->NextGet(); + } + ::glPopMatrix(); } } +*/ // renderowanie nieprzezroczystych for( i = 0; i < Ground->iRendered; ++i ) { Render( Ground->pRendered[ i ] ); @@ -456,43 +473,42 @@ opengl_renderer::Render( TGround *Ground ) { } // TODO: unify ground render code, until then old version is in place -#define EU07_USE_OLD_RENDERCODE bool opengl_renderer::Render( TGroundRect *Groundcell ) { - ::glPushMatrix(); - auto const &cellorigin = Groundcell->m_area.center; - // TODO: unify all math objects - auto const originoffset = Math3D::vector3( cellorigin.x, cellorigin.y, cellorigin.z ) - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - bool result{ false }; // will be true if we do any rendering + bool result { false }; // will be true if we do any rendering // TODO: unify render paths if( Global::bUseVBO ) { - if ( Groundcell->iLastDisplay != Groundcell->iFrameNumber) - { // tylko jezeli dany kwadrat nie był jeszcze renderowany + if ( Groundcell->iLastDisplay != Groundcell->iFrameNumber) { + // tylko jezeli dany kwadrat nie był jeszcze renderowany Groundcell->LoadNodes(); // ewentualne tworzenie siatek - if ( Groundcell->nRenderRect && Groundcell->StartVBO()) - { - for (TGroundNode *node = Groundcell->nRenderRect; node; node = node->nNext3) // następny tej grupy -#ifdef EU07_USE_OLD_RENDERCODE - node->RaRenderVBO(); // nieprzezroczyste trójkąty kwadratu kilometrowego -#else - Render( node ); // nieprzezroczyste trójkąty kwadratu kilometrowego -#endif + + if( ( Groundcell->nRenderRect != nullptr ) + && ( true == Groundcell->StartVBO() ) ) { + // nieprzezroczyste trójkąty kwadratu kilometrowego + for( TGroundNode *node = Groundcell->nRenderRect; node; node = node->nNext3 ) { + Render( node ); + } Groundcell->EndVBO(); - Groundcell->iLastDisplay = Groundcell->iFrameNumber; - result = true; } - if ( Groundcell->nTerrain) - Groundcell->nTerrain->smTerrain->iVisible = Groundcell->iFrameNumber; // ma się wyświetlić w tej ramce + if( Groundcell->nTerrain ) { + + Render( Groundcell->nTerrain ); + } + Groundcell->iLastDisplay = Groundcell->iFrameNumber; // drugi raz nie potrzeba + result = true; } - ::glPopMatrix(); } else { -#ifdef EU07_USE_OLD_RENDERCODE + // display list render path + ::glPushMatrix(); + auto const &cellorigin = Groundcell->m_area.center; + // TODO: unify all math objects + auto const originoffset = Math3D::vector3( cellorigin.x, cellorigin.y, cellorigin.z ) - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + if (Groundcell->iLastDisplay != Groundcell->iFrameNumber) { // tylko jezeli dany kwadrat nie był jeszcze renderowany // for (TGroundNode* node=pRender;node;node=node->pNext3) @@ -505,7 +521,7 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { Groundcell->nRender->DisplayListID = glGenLists(1); glNewList( Groundcell->nRender->DisplayListID, GL_COMPILE); Groundcell->nRender->iVersion = Global::iReCompile; // aktualna wersja siatek - auto const origin = Math3D::vector3( Groundcell->m_area.center.x, Groundcell->m_area.center.y, Groundcell->m_area.center.z ); + auto const origin = glm::dvec3( Groundcell->m_area.center ); for (TGroundNode *node = Groundcell->nRender; node; node = node->nNext3) // następny tej grupy node->Compile(origin, true); glEndList(); @@ -515,32 +531,18 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { // submodels geometry is world-centric, so at least for the time being we need to pop the stack early ::glPopMatrix(); - if( Groundcell->nRootMesh ) { - Render( Groundcell->nRootMesh ); - } + if( Groundcell->nTerrain ) { Render( Groundcell->nTerrain ); } + Groundcell->iLastDisplay = Groundcell->iFrameNumber; // drugi raz nie potrzeba result = true; } else { ::glPopMatrix(); } -#else - if( iLastDisplay != iFrameNumber ) { // tylko jezeli dany kwadrat nie był jeszcze renderowany - LoadNodes(); // ewentualne tworzenie siatek - if( nRenderRect ) { - for( TGroundNode *node = nRenderRect; node; node = node->nNext3 ) // następny tej grupy - Render( node ); // nieprzezroczyste trójkąty kwadratu kilometrowego - } - if( nRootMesh ) - Render( nRootMesh ); - iLastDisplay = iFrameNumber; - } -#endif } return result; } -#undef EU07_USE_OLD_RENDERCODE bool opengl_renderer::Render( TSubRect *Groundsubcell ) { @@ -665,11 +667,13 @@ opengl_renderer::Render( TGroundNode *Node ) { if( Node->iNumPts ) { // setup // w zaleznosci od koloru swiatla - ::glColor4ub( - static_cast( std::floor( Node->Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ) ), - static_cast( std::floor( Node->Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ) ), - static_cast( std::floor( Node->Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ) ), - static_cast( std::min( 255.0, 255000 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ); + ::glColor4fv( + glm::value_ptr( + glm::vec4( + Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), + std::min( + 1.0, + 1000.0 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ) ); GfxRenderer.Bind( 0 ); @@ -700,10 +704,7 @@ opengl_renderer::Render( TGroundNode *Node ) { return false; } // setup - ::glColor3ub( - static_cast( Node->Diffuse[ 0 ] ), - static_cast( Node->Diffuse[ 1 ] ), - static_cast( Node->Diffuse[ 2 ] ) ); + ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); Bind( Node->TextureID ); @@ -874,11 +875,11 @@ opengl_renderer::Render( TSubModel *Submodel ) { // również 0 Bind( Submodel->TextureID ); } - ::glColor3fv( Submodel->f4Diffuse ); // McZapkie-240702: zamiast ub + ::glColor3fv( glm::value_ptr(Submodel->f4Diffuse) ); // McZapkie-240702: zamiast ub // ...luminance if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo - ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr(Submodel->f4Diffuse) ); } // main draw call @@ -1184,11 +1185,13 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { auto const originoffset = Node->m_rootposition - Global::pCameraPosition; ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // w zaleznosci od koloru swiatla - ::glColor4ub( - static_cast( std::floor( Node->Diffuse[ 0 ] * Global::DayLight.ambient[ 0 ] ) ), - static_cast( std::floor( Node->Diffuse[ 1 ] * Global::DayLight.ambient[ 1 ] ) ), - static_cast( std::floor( Node->Diffuse[ 2 ] * Global::DayLight.ambient[ 2 ] ) ), - static_cast( std::min( 255.0, 255000 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ); + ::glColor4fv( + glm::value_ptr( + glm::vec4( + Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), + std::min( + 1.0, + 1000.0 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ) ); GfxRenderer.Bind( 0 ); @@ -1212,10 +1215,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { auto const originoffset = Node->m_rootposition - Global::pCameraPosition; ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - ::glColor3ub( - static_cast( Node->Diffuse[ 0 ] ), - static_cast( Node->Diffuse[ 1 ] ), - static_cast( Node->Diffuse[ 2 ] ) ); + ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); Bind( Node->TextureID ); @@ -1392,11 +1392,11 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // również 0 Bind( Submodel->TextureID ); } - ::glColor3fv( Submodel->f4Diffuse ); // McZapkie-240702: zamiast ub + ::glColor3fv( glm::value_ptr(Submodel->f4Diffuse) ); // McZapkie-240702: zamiast ub // ...luminance if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo - ::glMaterialfv( GL_FRONT, GL_EMISSION, Submodel->f4Diffuse ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr(Submodel->f4Diffuse) ); } // main draw call diff --git a/stdafx.h b/stdafx.h index c331c425..e68efd55 100644 --- a/stdafx.h +++ b/stdafx.h @@ -85,5 +85,8 @@ #include #include #include +#include +#include +#include #include "openglmatrixstack.h" \ No newline at end of file diff --git a/usefull.h b/usefull.h index e639caf4..cd747876 100644 --- a/usefull.h +++ b/usefull.h @@ -59,9 +59,16 @@ clamp_circular( Type_ Value, Type_ const Range = static_cast(360) ) { template Type_ -interpolate( Type_ const First, Type_ const Second, float const Factor ) { +interpolate( Type_ const &First, Type_ const &Second, float const Factor ) { return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); } +template +Type_ +interpolate( Type_ const &First, Type_ const &Second, double const Factor ) { + + return ( First * ( 1.0 - Factor ) ) + ( Second * Factor ); +} + //--------------------------------------------------------------------------- From 21680a5d3017e56ac0e80da60194c503ea94577e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 13 Jun 2017 18:13:49 +0200 Subject: [PATCH 124/426] completed unification of render paths --- Ground.cpp | 557 +++++++++++++++++----------------------- Ground.h | 47 ++-- Model3d.cpp | 43 ++-- Model3d.h | 2 +- Segment.cpp | 113 ++------- Segment.h | 70 ++--- Track.cpp | 558 ++++++++++++++++++++++++---------------- Track.h | 138 +++++----- Traction.cpp | 5 +- Traction.h | 2 +- VBO.cpp | 145 ----------- VBO.h | 43 +--- World.cpp | 40 ++- openglgeometrybank.cpp | 6 +- openglgeometrybank.h | 54 +++- parser.cpp | 12 +- parser.h | 4 +- renderer.cpp | 564 ++++++++++++++++------------------------- renderer.h | 21 +- 19 files changed, 1040 insertions(+), 1384 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index e65f414d..b15c5421 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -247,82 +247,13 @@ void TGroundNode::InitNormals() } } /* -void TGroundNode::RaRenderVBO() -{ // renderowanie z domyslnego bufora VBO - glColor3ub(Diffuse[0], Diffuse[1], Diffuse[2]); - GfxRenderer.Bind( TextureID ); // Ustaw aktywną teksturę - glDrawArrays(iType, iVboPtr, iNumVerts); // Narysuj naraz wszystkie trójkąty -} -*/ -void TGroundNode::Compile( glm::dvec3 const &Origin, bool const Multiple ) -{ // tworzenie skompilowanej listy w wyświetlaniu DL - if (false == Multiple) - { // obsługa pojedynczej listy - if (DisplayListID) - Release(); - if (Global::bManageNodes) - { - DisplayListID = glGenLists(1); - glNewList(DisplayListID, GL_COMPILE); - iVersion = Global::iReCompile; // aktualna wersja siatek (do WireFrame) - } - } - if ((iType == GL_LINES) || (iType == GL_LINE_STRIP) || (iType == GL_LINE_LOOP)) - { - glBegin(iType); - for (int i = 0; i < iNumPts; ++i) - glVertex3dv( glm::value_ptr( Points[i] - Origin ) ); - glEnd(); - } - else if (iType == GL_TRIANGLE_STRIP || iType == GL_TRIANGLE_FAN || iType == GL_TRIANGLES) - { // jak nie linie, to trójkąty - // TODO: eliminate these calls, they're duplicated by setup part in the unified render function -#ifdef EU07_USE_OLD_RENDERCODE - ::glColor3fv( glm::value_ptr( Diffuse ) ); - GfxRenderer.Bind(TextureID); -#endif - glBegin(iType); - for (int i = 0; i < iNumVerts; ++i) - { - glNormal3fv( glm::value_ptr( Vertices[ i ].normal ) ); - glTexCoord2fv( glm::value_ptr( Vertices[ i ].texture ) ); - glVertex3dv( glm::value_ptr( Vertices[ i ].position - Origin ) ); - } - glEnd(); - } -/* - else if (iType == TP_MESH) - { // grupa ze wspólną teksturą - wrzucanie do wspólnego Display List -#ifdef EU07_USE_OLD_RENDERCODE - if (TextureID) - GfxRenderer.Bind(TextureID); // Ustaw aktywną teksturę -#endif - TGroundNode *n = nNode; - while (n ? n->TextureID == TextureID : false) - { // wszystkie obiekty o tej samej testurze - switch (n->iType) - { // poszczególne typy różnie się tworzy - case TP_TRACK: - case TP_DUMMYTRACK: - n->pTrack->Compile(TextureID); // dodanie trójkątów dla podanej tekstury - break; - } - n = n->nNext3; // następny z listy - } - } -*/ - if (false == Multiple) - if (Global::bManageNodes) - glEndList(); -}; - void TGroundNode::Release() { if (DisplayListID) glDeleteLists(DisplayListID, 1); DisplayListID = 0; }; - +*/ void TGroundNode::RenderHidden() { // renderowanie obiektów niewidocznych double mgn = SquareMagnitude(pCenter - Global::pCameraPosition); @@ -354,8 +285,10 @@ void TGroundNode::RenderHidden() //------------------------------------------------------------------------------ TSubRect::~TSubRect() { +/* if (Global::bManageNodes) // Ra: tu się coś sypie ResourceManager::Unregister(this); // wyrejestrowanie ze sprzątacza +*/ // TODO: usunąć obiekty z listy (nRootMesh), bo są one tworzone dla sektora delete[] tTracks; } @@ -393,46 +326,22 @@ void TSubRect::NodeAdd(TGroundNode *Node) Node->pTrack->RaOwnerSet(this); // do którego sektora ma zgłaszać animację // NOTE: track merge/sort temporarily disabled to simplify unification of render code // TODO: refactor sorting as universal part of drawing process in the renderer -#ifdef EU07_USE_OLD_RENDERCODE - if( Global::bUseVBO ) { - Node->nNext3 = nRenderRect; - nRenderRect = Node; - } // VBO: do nieprzezroczystych z sektora - else { - Node->nNext3 = nRender; - nRender = Node; - } // DL: do nieprzezroczystych -#else Node->nNext3 = nRenderRect; nRenderRect = Node; -#endif break; case GL_TRIANGLE_STRIP: case GL_TRIANGLE_FAN: case GL_TRIANGLES: - // Node->nNext3=nMeshed; nMeshed=Node; //do podzielenia potem - if (Node->iFlags & 0x20) // czy jest przezroczyste? - { + if (Node->iFlags & 0x20) { + // do przezroczystych z sektora Node->nNext3 = nRenderRectAlpha; nRenderRectAlpha = Node; - } // DL: do przezroczystych z sektora -#ifdef EU07_USE_OLD_RENDERCODE - else if (Global::bUseVBO) - { - Node->nNext3 = nRenderRect; - nRenderRect = Node; - } // VBO: do nieprzezroczystych z sektora - else - { - Node->nNext3 = nRender; - nRender = Node; - } // DL: do nieprzezroczystych wszelakich -#else + } else { + // do nieprzezroczystych z sektora Node->nNext3 = nRenderRect; nRenderRect = Node; - } // do nieprzezroczystych z sektora -#endif + } break; case TP_TRACTION: case GL_LINES: @@ -471,9 +380,11 @@ void TSubRect::NodeAdd(TGroundNode *Node) case TP_DYNAMIC: return; // tych nie dopisujemy wcale } - Node->nNext2 = nRootNode; // dopisanie do ogólnej listy + // dopisanie do ogólnej listy + Node->nNext2 = nRootNode; nRootNode = Node; - ++iNodeCount; // licznik obiektów + // licznik obiektów + ++iNodeCount; } // przygotowanie sektora do renderowania @@ -516,8 +427,10 @@ TTrack * TSubRect::FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude) bool TSubRect::RaTrackAnimAdd(TTrack *t) { // aktywacja animacji torów w VBO (zwrotnica, obrotnica) - if (m_nVertexCount < 0) - return true; // nie ma animacji, gdy nie widać + if( false == m_geometrycreated ) { + // nie ma animacji, gdy nie widać + return true; + } if (tTrackAnim) tTrackAnim->RaAnimListAdd(t); else @@ -531,22 +444,7 @@ void TSubRect::RaAnimate() // nie ma nic do animowania return; } - // crude way to mark whether a vbo is bound, for the vbo render path - // TODO: sort this shit out and re-arrange into something more elegant... eventually - GLuint vertexbuffer { static_cast(-1) }; - if (Global::bUseVBO) { - // odświeżenie VBO sektora - if( GLEW_VERSION_1_5 ) { - // modyfikacje VBO są dostępne od OpenGL 1.5 - vertexbuffer = m_nVBOVertices; - ::glBindBuffer( GL_ARRAY_BUFFER, vertexbuffer ); - } - else { - // dla OpenGL 1.4 z GL_ARB_vertex_buffer_object odświeżenie całego sektora - Release(); // opróżnienie VBO sektora, aby się odświeżył z nowymi ustawieniami - } - } - tTrackAnim = tTrackAnim->RaAnimate( vertexbuffer ); // przeliczenie animacji kolejnego + tTrackAnim = tTrackAnim->RaAnimate(); // przeliczenie animacji kolejnego }; TTraction * TSubRect::FindTraction(glm::dvec3 const &Point, int &iConnection, TTraction *Exclude) @@ -562,126 +460,69 @@ TTraction * TSubRect::FindTraction(glm::dvec3 const &Point, int &iConnection, TT return NULL; }; -void TSubRect::LoadNodes() -{ // utworzenie siatek VBO dla wszystkich node w sektorze - if (m_nVertexCount >= 0) - return; // obiekty były już sprawdzone - m_nVertexCount = 0; //-1 oznacza, że nie sprawdzono listy obiektów - if (!nRootNode) +// utworzenie siatek VBO dla wszystkich node w sektorze +void TSubRect::LoadNodes() { + + if( true == m_geometrycreated ) { + // obiekty były już sprawdzone return; - TGroundNode *n = nRootNode; - while (n) - { - switch (n->iType) - { - case GL_TRIANGLE_STRIP: - case GL_TRIANGLE_FAN: - case GL_TRIANGLES: - n->iVboPtr = m_nVertexCount; // nowy początek - m_nVertexCount += n->iNumVerts; - break; - case GL_LINES: - case GL_LINE_STRIP: - case GL_LINE_LOOP: - n->iVboPtr = m_nVertexCount; // nowy początek - m_nVertexCount += n->iNumPts; // miejsce w tablicach normalnych i teksturowania się zmarnuje... - break; - case TP_TRACK: - n->iVboPtr = m_nVertexCount; // nowy początek - n->iNumVerts = n->pTrack->RaArrayPrepare(); // zliczenie wierzchołków - m_nVertexCount += n->iNumVerts; - break; - case TP_TRACTION: - n->hvTraction->create_geometry( m_geometrybank, n->m_rootposition ); - break; - } - n = n->nNext2; // następny z sektora } - if (m_nVertexCount <= 0) - return; // jeśli nie ma obiektów do wyświetlenia z VBO, to koniec - if (Global::bUseVBO) - { // tylko liczenie wierzchołów, gdy nie ma VBO + else { + // mark it done for future checks + m_geometrycreated = true; + } - MakeArray(m_nVertexCount); - - n = nRootNode; - int i; - while (n) - { - if (n->iVboPtr >= 0) - switch (n->iType) - { - case GL_TRIANGLE_STRIP: - case GL_TRIANGLE_FAN: - case GL_TRIANGLES: - for (i = 0; i < n->iNumVerts; ++i) - { // Ra: trójkąty można od razu wczytywać do takich tablic... to może poczekać - m_pVNT[ n->iVboPtr + i ].position = n->Vertices[ i ].position - n->m_rootposition; -/* - m_pVNT[n->iVboPtr + i].x = n->Vertices[i].position.x - n->m_rootposition.x; - m_pVNT[n->iVboPtr + i].y = n->Vertices[i].position.y - n->m_rootposition.y; - m_pVNT[n->iVboPtr + i].z = n->Vertices[i].position.z - n->m_rootposition.z; -*/ - m_pVNT[ n->iVboPtr + i ].normal = n->Vertices[ i ].normal; -/* - m_pVNT[n->iVboPtr + i].nx = n->Vertices[i].normal.x; - m_pVNT[n->iVboPtr + i].ny = n->Vertices[i].normal.y; - m_pVNT[n->iVboPtr + i].nz = n->Vertices[i].normal.z; -*/ - m_pVNT[ n->iVboPtr + i ].texture = n->Vertices[ i ].texture; -/* - m_pVNT[n->iVboPtr + i].u = n->Vertices[i].tu; - m_pVNT[n->iVboPtr + i].v = n->Vertices[i].tv; -*/ - } - break; - case GL_LINES: - case GL_LINE_STRIP: - case GL_LINE_LOOP: - for (i = 0; i < n->iNumPts; ++i) - { - m_pVNT[ n->iVboPtr + i ].position = ( n->Points[ i ] - n->m_rootposition ); -/* - glm::vec3( - n->Points[ i ].x - n->m_rootposition.x, - n->Points[ i ].y - n->m_rootposition.y, - n->Points[ i ].z - n->m_rootposition.z ); -*/ - // miejsce w tablicach normalnych i teksturowania się marnuje... - } - break; - case TP_TRACK: - if( n->iNumVerts ) { // bo tory zabezpieczające są niewidoczne -#ifdef EU07_USE_OLD_VERTEXBUFFER - n->pTrack->RaArrayFill( m_pVNT + n->iVboPtr, m_pVNT, std::min( n->iNumVerts, m_nVertexCount - n->iVboPtr ) ); -#else - n->pTrack->RaArrayFill( m_pVNT.data() + n->iVboPtr, m_pVNT.data(), std::min( n->iNumVerts, m_nVertexCount - n->iVboPtr ) ); -#endif - } - break; - default: - break; + auto *node { nRootNode }; + while( node != nullptr ) { + switch (node->iType) { + case GL_TRIANGLES: { + vertex_array vertices; + for( std::size_t idx = 0; idx < node->iNumVerts; ++idx ) { + vertices.emplace_back( + node->Vertices[ idx ].position - node->m_rootposition, + node->Vertices[ idx ].normal, + node->Vertices[ idx ].texture ); } - n = n->nNext2; // następny z sektora + node->m_geometry = GfxRenderer.Insert( vertices, m_geometrybank, GL_TRIANGLES ); + SafeDeleteArray( node->Vertices ); + node->iNumVerts = 0; + break; + } + case GL_LINES: { + vertex_array vertices; + for( std::size_t idx = 0; idx < node->iNumPts; ++idx ) { + vertices.emplace_back( + node->Points[ idx ] - node->m_rootposition, + glm::vec3(), + glm::vec2() ); + } + node->m_geometry = GfxRenderer.Insert( vertices, m_geometrybank, GL_LINES ); + SafeDeleteArray( node->Vertices ); + node->iNumPts = 0; + break; + } + case TP_TRACK: + if( node->pTrack->bVisible ) { // bo tory zabezpieczające są niewidoczne + node->pTrack->create_geometry( m_geometrybank ); + } + break; + case TP_TRACTION: + node->hvTraction->create_geometry( m_geometrybank, node->m_rootposition ); + break; + default: { break; } } - BuildVBOs(); + node = node->nNext2; // następny z sektora } +/* if (Global::bManageNodes) ResourceManager::Register(this); // dodanie do automatu zwalniającego pamięć +*/ } - -bool TSubRect::StartVBO() -{ // początek rysowania elementów z VBO w sektorze - SetLastUsage(Timer::GetSimulationTime()); // te z tyłu będą niepotrzebnie zwalniane - return CMesh::StartVBO(); -}; - +/* void TSubRect::Release() { // wirtualne zwolnienie zasobów przez sprzątacz albo destruktor - if (Global::bUseVBO) - CMesh::Clear(); // usuwanie buforów }; - +*/ void TSubRect::RenderSounds() { // aktualizacja dźwięków w pojazdach sektora (sektor może nie być wyświetlany) for (int j = 0; j < iTracks; ++j) @@ -708,7 +549,7 @@ TGroundRect::Init() { float const subrectsize = 1000.0f / iNumSubRects; for( int column = 0; column < iNumSubRects; ++column ) { for( int row = 0; row < iNumSubRects; ++row ) { - auto subcell = FastGetRect( column, row ); + auto subcell = FastGetSubRect( column, row ); auto &area = subcell->m_area; area.center = m_area.center @@ -734,8 +575,9 @@ TGround::TGround() nRootOfType[ i ] = nullptr; // zerowanie tablic wyszukiwania } ::SecureZeroMemory( TempConnectionType, sizeof( TempConnectionType ) ); +/* ::SecureZeroMemory( pRendered, sizeof( pRendered ) ); - +*/ // set bounding area information for ground rectangles float const rectsize = 1000.0f; glm::vec3 const worldcenter; @@ -876,9 +718,9 @@ void TGround::RaTriangleDivider(TGroundNode *node) return; // tylko pojedyncze trójkąty if (node->iNumVerts != 3) return; // tylko gdy jeden trójkąt - double x0 = 1000.0 * floor(0.001 * node->pCenter.x) - 200.0; + double x0 = 1000.0 * std::floor(0.001 * node->pCenter.x) - 200.0; double x1 = x0 + 1400.0; - double z0 = 1000.0 * floor(0.001 * node->pCenter.z) - 200.0; + double z0 = 1000.0 * std::floor(0.001 * node->pCenter.z) - 200.0; double z1 = z0 + 1400.0; if ((node->Vertices[0].position.x >= x0) && (node->Vertices[0].position.x <= x1) && (node->Vertices[0].position.z >= z0) && (node->Vertices[0].position.z <= z1) && @@ -999,7 +841,6 @@ void TGround::RaTriangleDivider(TGroundNode *node) TGroundNode * TGround::AddGroundNode(cParser *parser) { // wczytanie wpisu typu "node" std::string str, str1, str2, str3, str4, Skin, DriverType, asNodeName; - int nv, i; double tf, r, rmin, tf1, tf3; int int1; size_t int2; @@ -1415,7 +1256,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->nNode[0].iType = TP_MODEL; // pierwszy zawiera model (dla delete) tmp->nNode[0].Model = Global::pTerrainCompact; tmp->nNode[0].iFlags = 0x200; // nie wyświetlany, ale usuwany - for (i = 1; i < tmp->iCount; ++i) + for (std::size_t i = 1; i < tmp->iCount; ++i) { // a reszta to submodele tmp->nNode[i].iType = TP_SUBMODEL; // tmp->nNode[i].smTerrain = Global::pTerrainCompact->TerrainSquare(i - 1); @@ -1498,19 +1339,20 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) #endif tmp->TextureID = GfxRenderer.GetTextureId( str, szTexturePath ); tmp->iFlags = GfxRenderer.Texture(tmp->TextureID).has_alpha ? 0x220 : 0x210; // z usuwaniem - if (((tmp->iType == GL_TRIANGLES) && (tmp->iFlags & 0x10)) ? - Global::pTerrainCompact->TerrainLoaded() : - false) - { // jeśli jest tekstura nieprzezroczysta, a teren załadowany, to pomijamy trójkąty - do - { // pomijanie trójkątów + if( (tmp->iType == GL_TRIANGLES) + && (tmp->iFlags & 0x10) + && (Global::pTerrainCompact->TerrainLoaded()) ) { + // jeśli jest tekstura nieprzezroczysta, a teren załadowany, to pomijamy trójkąty + do { + // pomijanie trójkątów parser->getTokens(); *parser >> token; } while (token.compare("endtri") != 0); } else { - TGroundVertex vertex; + TGroundVertex vertex, vertex1, vertex2; + std::size_t vertexcount { 0 }; do { parser->getTokens( 8, false ); *parser @@ -1522,14 +1364,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> vertex.normal.z >> vertex.texture.s >> vertex.texture.t; -/* - vertex.position.RotateZ( aRotate.z / 180 * M_PI ); - vertex.position.RotateX( aRotate.x / 180 * M_PI ); - vertex.position.RotateY( aRotate.y / 180 * M_PI ); - vertex.normal.RotateZ( aRotate.z / 180 * M_PI ); - vertex.normal.RotateX( aRotate.x / 180 * M_PI ); - vertex.normal.RotateY( aRotate.y / 180 * M_PI ); -*/ vertex.position = glm::rotateZ( vertex.position, aRotate.z / 180 * M_PI ); vertex.position = glm::rotateX( vertex.position, aRotate.x / 180 * M_PI ); vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); @@ -1538,19 +1372,52 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) vertex.normal = glm::rotateY( vertex.normal, static_cast( aRotate.y / 180 * M_PI ) ); vertex.position += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); tmp->pCenter += vertex.position; - - importedvertices.emplace_back( vertex ); + // convert all data to gl_triangles to allow data merge for matching nodes + switch( tmp->iType ) { + case GL_TRIANGLES: { + importedvertices.emplace_back( vertex ); + break; + } + case GL_TRIANGLE_FAN: { + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + importedvertices.emplace_back( vertex1 ); + importedvertices.emplace_back( vertex2 ); + importedvertices.emplace_back( vertex ); + vertex2 = vertex; + } + ++vertexcount; + break; + } + case GL_TRIANGLE_STRIP: { + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + importedvertices.emplace_back( vertex1 ); + importedvertices.emplace_back( vertex2 ); + importedvertices.emplace_back( vertex ); + vertex1 = vertex2; + vertex2 = vertex; + } + ++vertexcount; + break; + } + default: { break; } + } parser->getTokens(); *parser >> token; } while (token.compare("endtri") != 0); - nv = (int)importedvertices.size(); + tmp->iType = GL_TRIANGLES; + + auto const nv = importedvertices.size(); tmp->Init(nv); // utworzenie tablicy wierzchołków tmp->pCenter /= (nv > 0 ? nv : 1); r = 0; - for (int i = 0; i < nv; i++) + for (std::size_t i = 0; i < nv; ++i) { tmp->Vertices[i] = importedvertices[i]; tf = SquareMagnitude( tmp->Vertices[ i ].position - tmp->pCenter ); @@ -1571,8 +1438,10 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> tmp->Diffuse.b >> tmp->fLineThickness; tmp->Diffuse /= 255.0f; - TGroundVertex vertex; - i = 0; + + TGroundVertex vertex, vertex0, vertex1; + std::size_t vertexcount{ 0 }; + parser->getTokens(); *parser >> token; do { @@ -1581,32 +1450,64 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) *parser >> vertex.position.y >> vertex.position.z; -/* - vertex.position.RotateZ( aRotate.z / 180 * M_PI ); - vertex.position.RotateX( aRotate.x / 180 * M_PI ); - vertex.position.RotateY( aRotate.y / 180 * M_PI ); -*/ vertex.position = glm::rotateZ( vertex.position, aRotate.z / 180 * M_PI ); vertex.position = glm::rotateX( vertex.position, aRotate.x / 180 * M_PI ); vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); vertex.position += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); - tmp->pCenter += vertex.position; - - importedvertices.emplace_back( vertex ); - - ++i; + // convert all data to gl_lines to allow data merge for matching nodes + switch( tmp->iType ) { + case GL_LINES: { + importedvertices.emplace_back( vertex ); + break; + } + case GL_LINE_STRIP: { + if( vertexcount > 0 ) { + importedvertices.emplace_back( vertex1 ); + importedvertices.emplace_back( vertex ); + } + vertex1 = vertex; + ++vertexcount; + break; + } + case GL_LINE_LOOP: { + if( vertexcount == 0 ) { + vertex0 = vertex; + vertex1 = vertex; + } + else { + importedvertices.emplace_back( vertex1 ); + importedvertices.emplace_back( vertex ); + } + vertex1 = vertex; + ++vertexcount; + break; + } + default: { break; } + } parser->getTokens(); *parser >> token; } while( token.compare( "endline" ) != 0 ); - nv = i; - // tmp->Init(nv); + // add closing line for the loop + if( ( tmp->iType == GL_LINE_LOOP ) + && ( vertexcount > 2 ) ) { + importedvertices.emplace_back( vertex1 ); + importedvertices.emplace_back( vertex0 ); + } + if( importedvertices.size() % 2 != 0 ) { + ErrorLog( "Lines node specified odd number of vertices, encountered in file \"" + parser->Name() + "\"" ); + importedvertices.pop_back(); + } + tmp->iType = GL_LINES; + + auto const nv = importedvertices.size(); tmp->Points = new glm::dvec3[ nv ]; tmp->iNumPts = nv; tmp->pCenter /= ( nv > 0 ? nv : 1 ); - for( int i = 0; i < nv; i++ ) + for( std::size_t i = 0; i < nv; ++i ) { tmp->Points[ i ] = importedvertices[ i ].position; + } break; } } @@ -1622,7 +1523,7 @@ TSubRect * TGround::FastGetSubRect(int iCol, int iRow) sc = iCol - bc * iNumSubRects; if ((br < 0) || (bc < 0) || (br >= iNumRects) || (bc >= iNumRects)) return NULL; - return (Rects[bc][br].FastGetRect(sc, sr)); + return (Rects[bc][br].FastGetSubRect(sc, sr)); } TSubRect * TGround::GetSubRect(int iCol, int iRow) @@ -1634,7 +1535,7 @@ TSubRect * TGround::GetSubRect(int iCol, int iRow) sc = iCol - bc * iNumSubRects; if ((br < 0) || (bc < 0) || (br >= iNumRects) || (bc >= iNumRects)) return NULL; // jeśli poza mapą - return (Rects[bc][br].SafeGetRect(sc, sr)); // pobranie małego kwadratu + return (Rects[bc][br].SafeGetSubRect(sc, sr)); // pobranie małego kwadratu } TEvent * TGround::FindEvent(const std::string &asEventName) @@ -1670,23 +1571,21 @@ void TGround::FirstInit() return; // Ra: żeby nie robiło się dwa razy bInitDone = true; WriteLog("InitNormals"); - int i, j; - for (i = 0; i < TP_LAST; ++i) - { - for (TGroundNode *Current = nRootOfType[i]; Current; Current = Current->nNext) - { + for (int type = 0; type < TP_LAST; ++type) { + for (TGroundNode *Current = nRootOfType[type]; Current != nullptr; Current = Current->nNext) { + Current->InitNormals(); if (Current->iType != TP_DYNAMIC) { // pojazdów w ogóle nie dotyczy dodawanie do mapy - if( ( i == TP_EVLAUNCH ) + if( ( type == TP_EVLAUNCH ) && ( true == Current->EvLaunch->IsGlobal() ) ) { // dodanie do globalnego obiektu srGlobal.NodeAdd( Current ); } - else if (i == TP_TERRAIN) + else if (type == TP_TERRAIN) { // specjalne przetwarzanie terenu wczytanego z pliku E3D TGroundRect *gr; - for (j = 1; j < Current->iCount; ++j) + for (int j = 1; j < Current->iCount; ++j) { // od 1 do końca są zestawy trójkątów std::string xxxzzz = Current->nNode[j].smTerrain->pName; // pobranie nazwy gr = GetRect( @@ -1706,6 +1605,7 @@ void TGround::FirstInit() // dodajemy do kwadratu kilometrowego // override visibility ranges, to ensure the content is drawn from far enough // TODO: subclass NodeAdd() for the ground cell and specialize it, instead of this + // TODO: given their view ranges are the same, combine the geometry in single per-material nodes Current->fSquareRadius = 50000.0 * 50000.0; Current->fSquareMinRadius = 0.0; GetRect( Current->pCenter.x, Current->pCenter.z )->NodeAdd( Current ); @@ -1713,8 +1613,8 @@ void TGround::FirstInit() } } } - for (i = 0; i < iNumRects; ++i) - for (j = 0; j < iNumRects; ++j) + for (std::size_t i = 0; i < iNumRects; ++i) + for (std::size_t j = 0; j < iNumRects; ++j) Rects[i][j].Optimize(); // optymalizacja obiektów w sektorach WriteLog("InitNormals OK"); @@ -1751,7 +1651,7 @@ bool TGround::Init(std::string File) std::stack OriginStack; // stos zagnieżdżenia origin - TGroundNode *LastNode = NULL; // do użycia w trainset + TGroundNode *LastNode = nullptr; // do użycia w trainset iNumNodes = 0; token = ""; parser.getTokens(); @@ -1763,64 +1663,76 @@ bool TGround::Init(std::string File) ++processed; if( processed % 1000 == 0 ) { + glfwPollEvents(); UILayer.set_progress( parser.getProgress(), parser.getFullProgress() ); GfxRenderer.Render(); - glfwPollEvents(); } str = token; - if (str == "node") - { - LastNode = AddGroundNode(&parser); // rozpoznanie węzła - if (LastNode) - { // jeżeli przetworzony poprawnie - if (LastNode->iType == GL_TRIANGLES) - { - if (!LastNode->Vertices) - SafeDelete(LastNode); // usuwamy nieprzezroczyste trójkąty terenu - } - else if( ( LastNode->iType == TP_TRACTION ) - && ( false == Global::bLoadTraction ) ) { - SafeDelete( LastNode ); // usuwamy druty, jeśli wyłączone + if (str == "node") { + // rozpoznanie węzła + LastNode = AddGroundNode(&parser); + if (LastNode) { + // jeżeli przetworzony poprawnie + switch( LastNode->iType ) { + // validate the new node + case GL_TRIANGLES: { + if( LastNode->Vertices == nullptr ) { + SafeDelete( LastNode ); + } + break; + } + case TP_TRACTION: { + if( false == Global::bLoadTraction ) { + // usuwamy druty, jeśli wyłączone + SafeDelete( LastNode ); + } + break; + } + default: { + break; + } } - if (LastNode) // dopiero na koniec dopisujemy do tablic - if (LastNode->iType != TP_DYNAMIC) - { // jeśli nie jest pojazdem - // ostatni dodany dołączamy na końcu nowego - LastNode->nNext = nRootOfType[LastNode->iType]; + if( LastNode ) { + // dopiero na koniec dopisujemy do tablic + if( LastNode->iType != TP_DYNAMIC ) { + // jeśli nie jest pojazdem ostatni dodany dołączamy na końcu nowego + LastNode->nNext = nRootOfType[ LastNode->iType ]; // ustawienie nowego na początku listy - nRootOfType[LastNode->iType] = LastNode; - iNumNodes++; + nRootOfType[ LastNode->iType ] = LastNode; + ++iNumNodes; } - else - { // jeśli jest pojazdem - // if (!bInitDone) FirstInit(); //jeśli nie było w scenerii - if (LastNode->DynamicObject->Mechanik) // ale może być pasażer - if (LastNode->DynamicObject->Mechanik - ->Primary()) // jeśli jest głównym (pasażer nie jest) - nTrainSetDriver = - LastNode; // pojazd, któremu zostanie wysłany rozkład + else { // jeśli jest pojazdem + if( ( LastNode->DynamicObject->Mechanik != nullptr ) + && ( LastNode->DynamicObject->Mechanik->Primary() ) ) { + // jeśli jest głównym (pasażer nie jest) + nTrainSetDriver = LastNode; // pojazd, któremu zostanie wysłany rozkład + } LastNode->nNext = nRootDynamic; nRootDynamic = LastNode; // dopisanie z przodu do listy - // if (bTrainSet && (LastNode?(LastNode->iType==TP_DYNAMIC):false)) - if (nTrainSetNode) // jeżeli istnieje wcześniejszy TP_DYNAMIC + + if( nTrainSetNode != nullptr ) { + // jeżeli istnieje wcześniejszy TP_DYNAMIC nTrainSetNode->DynamicObject->AttachPrev( LastNode->DynamicObject, - TempConnectionType[iTrainSetWehicleNumber - 2]); + TempConnectionType[ iTrainSetWehicleNumber - 2 ] ); + } nTrainSetNode = LastNode; // ostatnio wczytany - if (TempConnectionType[iTrainSetWehicleNumber - 1] == - 0) // jeśli sprzęg jest zerowy, to wysłać rozkład do składu + + if( TempConnectionType[ iTrainSetWehicleNumber - 1 ] == 0 ) // jeśli sprzęg jest zerowy, to wysłać rozkład do składu { // powinien też tu wchodzić, gdy pojazd bez trainset - if (nTrainSetDriver) // pojazd, któremu zostanie wysłany rozkład + if( nTrainSetDriver ) // pojazd, któremu zostanie wysłany rozkład { // wysłanie komendy "Timetable" ustawia odpowiedni tryb jazdy nTrainSetDriver->DynamicObject->Mechanik->DirectionInitial(); nTrainSetDriver->DynamicObject->Mechanik->PutCommand( - "Timetable:" + asTrainName, fTrainSetVel, 0, NULL); - nTrainSetDriver = - NULL; // a przy "endtrainset" już wtedy nie potrzeba + "Timetable:" + asTrainName, + fTrainSetVel, 0, + nullptr ); + nTrainSetDriver = nullptr; // a przy "endtrainset" już wtedy nie potrzeba } } } + } } else { @@ -1927,10 +1839,11 @@ bool TGround::Init(std::string File) RootEvent = tmp; if (!found) { // jeśli nazwa wystąpiła, to do kolejki i wyszukiwarki dodawany jest tylko pierwszy - if (RootEvent->Type != tp_Ignored) - if (RootEvent->asName.find( - "onstart") != std::string::npos) // event uruchamiany automatycznie po starcie - AddToQuery(RootEvent, NULL); // dodanie do kolejki + if( ( RootEvent->Type != tp_Ignored ) + && ( RootEvent->asName.find( "onstart" ) != std::string::npos ) ) { + // event uruchamiany automatycznie po starcie + AddToQuery( RootEvent, NULL ); // dodanie do kolejki + } m_eventmap.emplace( tmp->asName, tmp ); // dodanie do wyszukiwarki } } diff --git a/Ground.h b/Ground.h index 55b4a819..99f639e9 100644 --- a/Ground.h +++ b/Ground.h @@ -21,8 +21,6 @@ http://mozilla.org/MPL/2.0/. #include "Names.h" #include "lightarray.h" -using namespace Math3D; - typedef int TGroundNodeType; // Ra: zmniejszone liczby, aby zrobić tabelkę i zoptymalizować wyszukiwanie const int TP_MODEL = 10; @@ -95,8 +93,14 @@ struct TGroundVertex texture = interpolate( v1.texture, v2.texture, static_cast( factor ) ); } }; - -class TGroundNode : public Resource +/* +// ground node holding single, unique piece of 3d geometry. TBD, TODO: unify this with basic 3d model node +struct mesh_node { + std::vector vertices; + geometry_handle geometry; // geometry prepared for drawing +}; +*/ +class TGroundNode /*: public Resource*/ { // obiekt scenerii friend class opengl_renderer; @@ -138,6 +142,9 @@ public: int iVersion; // wersja siatki (do wykonania rekompilacji) GLuint DisplayListID; // numer siatki DisplayLists int iVboPtr; // indeks w buforze VBO + // NOTE: geometry handle is duplicated in (anim)model(3d), as well as in track and traction type nodes + // TODO: clean this up when node types are refactored into an inheritance/composition scheme + geometry_handle m_geometry; // geometry of the submodel int iFlags; // tryb przezroczystości: 0x10-nieprz.,0x20-przezroczysty,0x30-mieszany texture_handle TextureID; // główna (jedna) tekstura obiektu glm::vec3 @@ -153,25 +160,10 @@ public: ~TGroundNode(); void Init(int n); void InitNormals(); - - // bool Disable(); - inline TGroundNode * Find(const std::string &asNameToFind, TGroundNodeType iNodeType) - { // wyszukiwanie czołgowe z typem - if ((iNodeType == iType) && (asNameToFind == asName)) - return this; - else if (nNext) - return nNext->Find(asNameToFind, iNodeType); - return NULL; - }; - - void Compile(glm::dvec3 const &Origin, bool const Multiple = false); +/* void Release(); - +*/ void RenderHidden(); // obsługa dźwięków i wyzwalaczy zdarzeń -#ifdef EU07_USE_OLD_RENDERCODE - // (McZapkie-131202) - void RaRenderVBO(); // renderowanie (nieprzezroczystych) ze wspólnego VBO -#endif }; struct bounding_area { @@ -180,7 +172,7 @@ struct bounding_area { float radius { 0.0f }; // radius of the bounding sphere }; -class TSubRect : public Resource, public CMesh +class TSubRect : /*public Resource,*/ public CMesh { // sektor składowy kwadratu kilometrowego public: bounding_area m_area; @@ -209,12 +201,13 @@ class TSubRect : public Resource, public CMesh void LoadNodes(); // utworzenie VBO sektora public: virtual ~TSubRect(); +/* virtual void Release(); // zwalnianie VBO sektora +*/ void NodeAdd(TGroundNode *Node); // dodanie obiektu do sektora na etapie rozdzielania na sektory void Sort(); // optymalizacja obiektów w sektorze (sortowanie wg tekstur) TTrack * FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude); TTraction * FindTraction(glm::dvec3 const &Point, int &iConnection, TTraction *Exclude); - bool StartVBO(); // ustwienie VBO sektora dla (nRenderRect), (nRenderRectAlpha) i (nRenderWires) bool RaTrackAnimAdd(TTrack *t); // zgłoszenie toru do animacji void RaAnimate(); // przeliczenie animacji torów void RenderSounds(); // dźwięki pojazdów z niewidocznych sektorów @@ -244,7 +237,7 @@ private: public: virtual ~TGroundRect(); // pobranie wskaźnika do małego kwadratu, utworzenie jeśli trzeba - TSubRect * SafeGetRect(int iCol, int iRow) { + TSubRect * SafeGetSubRect(int iCol, int iRow) { if( !pSubRects ) { // utworzenie małych kwadratów Init(); @@ -252,7 +245,7 @@ public: return pSubRects + iRow * iNumSubRects + iCol; // zwrócenie właściwego }; // pobranie wskaźnika do małego kwadratu, bez tworzenia jeśli nie ma - TSubRect * FastGetRect(int iCol, int iRow) { + TSubRect * FastGetSubRect(int iCol, int iRow) { return (pSubRects ? pSubRects + iRow * iNumSubRects + iCol : NULL); }; // optymalizacja obiektów w sektorach @@ -282,7 +275,9 @@ class TGround *tmpEvent = nullptr, *tmp2Event = nullptr, *OldQRE = nullptr; +/* TSubRect *pRendered[1500]; // lista renderowanych sektorów +*/ int iNumNodes = 0; vector3 pOrigin; vector3 aRotate; @@ -293,6 +288,7 @@ class TGround event_map m_eventmap; TNames m_trackmap; light_array m_lights; // collection of dynamic light sources present in the scene + bool PROBLEND; private: // metody prywatne bool EventConditon(TEvent *e); @@ -351,7 +347,6 @@ class TGround private: void RaTriangleDivider(TGroundNode *node); void Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam); - bool PROBLEND; public: void WyslijEvent(const std::string &e, const std::string &d); diff --git a/Model3d.cpp b/Model3d.cpp index 1c5e444c..7f13e17f 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1041,7 +1041,7 @@ void TSubModel::RaAnimation(TAnimType a) //--------------------------------------------------------------------------- -void TSubModel::RaArrayFill(CVertNormTex *Vert) +void TSubModel::RaArrayFill(basic_vertex *Vert) { // wypełnianie tablic VBO if (Child) Child->RaArrayFill(Vert); @@ -1159,17 +1159,11 @@ TModel3d::~TModel3d() { // SafeDeleteArray(Materials); if (iFlags & 0x0200) - { // wczytany z pliku tekstowego, submodele sprzątają - // same + { // wczytany z pliku tekstowego, submodele sprzątają same SafeDelete(Root); // submodele się usuną rekurencyjnie } else { // wczytano z pliku binarnego (jest właścicielem tablic) -#ifdef EU07_USE_OLD_VERTEXBUFFER - m_pVNT = nullptr; // nie usuwać tego, bo wskazuje na iModel -#else - m_pVNT.clear(); -#endif Root = nullptr; delete[] iModel; // usuwamy cały wczytany plik i to wystarczy } @@ -1344,6 +1338,9 @@ void TSubModel::serialize(std::ostream &s, void TModel3d::SaveToBinFile(char const *FileName) { + // TODO: re-implement! + return; + WriteLog("saving e3d model.."); //m7todo: można by zoptymalizować robiąc unordered_map @@ -1379,18 +1376,20 @@ void TModel3d::SaveToBinFile(char const *FileName) sn_utils::ls_uint32(s, 8 + (uint32_t)transforms.size() * 64); for (size_t i = 0; i < transforms.size(); i++) transforms[i].serialize_float32(s); - +/* MakeArray(iNumVerts); #ifdef EU07_USE_OLD_VERTEXBUFFER Root->RaArrayFill(m_pVNT); #else Root->RaArrayFill( m_pVNT.data() ); #endif +*/ sn_utils::ls_uint32(s, MAKE_ID4('V', 'N', 'T', '0')); sn_utils::ls_uint32(s, 8 + iNumVerts * 32); +/* for (size_t i = 0; i < (size_t)iNumVerts; i++) m_pVNT[i].serialize(s); - +*/ if (textures.size()) { sn_utils::ls_uint32(s, MAKE_ID4('T', 'E', 'X', '0')); @@ -1470,11 +1469,6 @@ void TSubModel::deserialize(std::istream &s) void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) { -#ifdef EU07_USE_OLD_VERTEXBUFFER - m_pVNT = nullptr; -#else - m_pVNT.clear(); -#endif Root = nullptr; float4x4 *tm = nullptr; if( m_geometrybank == NULL ) { @@ -1507,19 +1501,16 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) } else if (type == MAKE_ID4('V', 'N', 'T', '0')) { -#ifdef EU07_USE_OLD_VERTEXBUFFER - if (m_pVNT != nullptr) -#else - if( false == m_pVNT.empty() ) -#endif - throw std::runtime_error("e3d: duplicated VNT chunk"); /* - size_t vt_cnt = size / 32; + if (m_pVNT != nullptr) + throw std::runtime_error("e3d: duplicated VNT chunk"); + + size_t vt_cnt = size / 32; iNumVerts = (int)vt_cnt; m_nVertexCount = (int)vt_cnt; #ifdef EU07_USE_OLD_VERTEXBUFFER assert( m_pVNT == nullptr ); - m_pVNT = new CVertNormTex[vt_cnt]; + m_pVNT = new basic_vertex[vt_cnt]; #else m_pVNT.resize( vt_cnt ); #endif @@ -1613,13 +1604,9 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) */ for (size_t i = 0; (int)i < iSubModelsCount; ++i) { -#ifdef EU07_USE_OLD_VERTEXBUFFER Root[i].BinInit( Root, tm, &Textures, &Names, dynamic ); -#else - Root[ i ].BinInit( Root, tm, (float8*)m_pVNT.data(), &Textures, &Names, dynamic ); -#endif - if (Root[i].ChildGet()) + if (Root[i].ChildGet()) Root[i].ChildGet()->Parent = &Root[i]; if (Root[i].NextGet()) Root[i].NextGet()->Parent = Root[i].Parent; diff --git a/Model3d.h b/Model3d.h index a78712eb..136bfac7 100644 --- a/Model3d.h +++ b/Model3d.h @@ -168,7 +168,7 @@ public: TSubModel * GetFromName(char const *search, bool i = true); inline float4x4 * GetMatrix() { return fMatrix; }; inline void Hide() { iVisible = 0; }; - void RaArrayFill(CVertNormTex *Vert); + void RaArrayFill(basic_vertex *Vert); int FlagsCheck(); void WillBeAnimated() { diff --git a/Segment.cpp b/Segment.cpp index a39c46b6..c74451bd 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -319,16 +319,15 @@ vector3 TSegment::FastGetPoint(double t) return (bCurve ? RaInterpolate(t) : ((1.0 - t) * Point1 + (t)*Point2)); } -int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, vector3 **p, bool bRender) +bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, vector3 **p, bool bRender) { // generowanie trójkątów dla odcinka trajektorii ruchu // standardowo tworzy triangle_strip dla prostego albo ich zestaw dla łuku // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli // podany jest przekrój końcowy // podsypka toru jest robiona za pomocą 6 punktów, szyna 12, drogi i rzeki na 3+2+3 - int vertexcount{ 0 }; if( !fTsBuffer ) - return vertexcount; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę + return false; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę vector3 pos1, pos2, dir, parallel1, parallel2, pt, norm; double s, step, fOffset, tv1, tv2, t, fEnd; @@ -378,11 +377,6 @@ int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, dir = FastGetDirection( t, fOffset ); // nowy wektor kierunku parallel2 = Normalize( vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny - if( Output == nullptr ) { - // immediate mode - ::glBegin( GL_TRIANGLE_STRIP ); - } - if( trapez ) { for( int j = 0; j < iNumShapePoints; ++j ) { pt = parallel1 * ( jmm1 * ( ShapePoints[ j ].x - fOffsetX ) + m1 * ShapePoints[ j + iNumShapePoints ].x ) + pos1; @@ -390,25 +384,12 @@ int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, pt -= Origin; norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel1; norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; - if( bRender ) { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów - if( Output == nullptr ) { - // immediate mode - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale, tv1 ); - ::glVertex3f( pt.x, pt.y, pt.z ); // pt nie mamy gdzie zapamiętać? - } - else { - Output->position.x = pt.x; - Output->position.y = pt.y; - Output->position.z = pt.z; - Output->normal.x = norm.x; - Output->normal.y = norm.y; - Output->normal.z = norm.z; - Output->texture.s = (jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; - Output->texture.t = tv1; - ++Output; - } - ++vertexcount; + if( bRender ) { + // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów + Output.emplace_back( + glm::vec3 { pt.x, pt.y, pt.z }, + glm::vec3 { norm.x, norm.y, norm.z }, + glm::vec2 { ( jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z ) / Texturescale, tv1 } ); } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -423,25 +404,12 @@ int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, pt -= Origin; norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel2; norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; - if( bRender ) { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów - if( Output == nullptr ) { - // immediate mode - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale, tv2 ); - ::glVertex3f( pt.x, pt.y, pt.z ); - } - else { - Output->position.x = pt.x; - Output->position.y = pt.y; - Output->position.z = pt.z; - Output->normal.x = norm.x; - Output->normal.y = norm.y; - Output->normal.z = norm.z; - Output->texture.s = (jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z) / Texturescale; - Output->texture.t = tv2; - ++Output; - } - ++vertexcount; + if( bRender ) { + // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów + Output.emplace_back( + glm::vec3 { pt.x, pt.y, pt.z }, + glm::vec3 { norm.x, norm.y, norm.z }, + glm::vec2 { ( jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z ) / Texturescale, tv2 } ); } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -461,61 +429,30 @@ int TSegment::RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, pt -= Origin; norm = ShapePoints[ j ].n.x * parallel1; norm.y += ShapePoints[ j ].n.y; - if( Output == nullptr ) { - // immediate mode - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv1 ); - ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na początku odcinka - } - else { - Output->position.x = pt.x; - Output->position.y = pt.y; - Output->position.z = pt.z; - Output->normal.x = norm.x; - Output->normal.y = norm.y; - Output->normal.z = norm.z; - Output->texture.s = ShapePoints[ j ].z / Texturescale; - Output->texture.t = tv1; - ++Output; - } - ++vertexcount; + + Output.emplace_back( + glm::vec3 { pt.x, pt.y, pt.z }, + glm::vec3 { norm.x, norm.y, norm.z }, + glm::vec2 { ShapePoints[ j ].z / Texturescale, tv1 } ); pt = parallel2 * ShapePoints[ j ].x + pos2; pt.y += ShapePoints[ j ].y; pt -= Origin; norm = ShapePoints[ j ].n.x * parallel2; norm.y += ShapePoints[ j ].n.y; - if( Output == nullptr ) { - // immediate mode - ::glNormal3f( norm.x, norm.y, norm.z ); - ::glTexCoord2f( ShapePoints[ j ].z / Texturescale, tv2 ); - ::glVertex3f( pt.x, pt.y, pt.z ); // punkt na końcu odcinka - } - else { - Output->position.x = pt.x; - Output->position.y = pt.y; - Output->position.z = pt.z; - Output->normal.x = norm.x; - Output->normal.y = norm.y; - Output->normal.z = norm.z; - Output->texture.s = ShapePoints[ j ].z / Texturescale; - Output->texture.t = tv2; - ++Output; - } - ++vertexcount; + + Output.emplace_back( + glm::vec3 { pt.x, pt.y, pt.z }, + glm::vec3 { norm.x, norm.y, norm.z }, + glm::vec2 { ShapePoints[ j ].z / Texturescale, tv2 } ); } } } - if( Output == nullptr ) { - // immediate mode - glEnd(); - } pos1 = pos2; parallel1 = parallel2; tv1 = tv2; } - - return vertexcount; + return true; }; void TSegment::Render() diff --git a/Segment.h b/Segment.h index 25a9875f..90d0a6a8 100644 --- a/Segment.h +++ b/Segment.h @@ -9,8 +9,10 @@ http://mozilla.org/MPL/2.0/. #ifndef SegmentH #define SegmentH - +/* #include "VBO.h" +*/ +#include "openglgeometrybank.h" #include "dumb3d.h" #include "Classes.h" #include "usefull.h" @@ -74,51 +76,35 @@ class TSegment bool bCurve = false; TSegment(TTrack *owner); ~TSegment(); - bool Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, double fNewRoll1 = 0, - double fNewRoll2 = 0); + bool Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0); bool Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointIn, vector3 &NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0, bool bIsCurve = true); inline double ComputeLength(); // McZapkie-150503 - inline vector3 GetDirection1() - { - return bCurve ? CPointOut - Point1 : CPointOut; - }; - inline vector3 GetDirection2() - { - return bCurve ? CPointIn - Point2 : CPointIn; - }; + inline vector3 GetDirection1() { + return bCurve ? CPointOut - Point1 : CPointOut; }; + inline vector3 GetDirection2() { + return bCurve ? CPointIn - Point2 : CPointIn; }; vector3 GetDirection(double fDistance); - vector3 GetDirection() - { - return CPointOut; - }; + vector3 GetDirection() { + return CPointOut; }; vector3 FastGetDirection(double fDistance, double fOffset); vector3 GetPoint(double fDistance); void RaPositionGet(double fDistance, vector3 &p, vector3 &a); vector3 FastGetPoint(double t); - inline vector3 FastGetPoint_0() - { - return Point1; - }; - inline vector3 FastGetPoint_1() - { - return Point2; - }; - inline double GetRoll(double const Distance) - { - return interpolate( fRoll1, fRoll2, Distance / fLength ); - } - void GetRolls(double &r1, double &r2) - { // pobranie przechyłek (do generowania trójkątów) + inline vector3 FastGetPoint_0() { + return Point1; }; + inline vector3 FastGetPoint_1() { + return Point2; }; + inline double GetRoll(double const Distance) { + return interpolate( fRoll1, fRoll2, Distance / fLength ); } + void GetRolls(double &r1, double &r2) { + // pobranie przechyłek (do generowania trójkątów) r1 = fRoll1; - r2 = fRoll2; - } - int RenderLoft( CVertNormTex* &Output, Math3D::vector3 const &Origin, vector6 const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, vector3 **p = nullptr, bool bRender = true); + r2 = fRoll2; } + bool RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, vector6 const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, vector3 **p = nullptr, bool bRender = true); void Render(); - inline double GetLength() - { - return fLength; - }; + inline double GetLength() { + return fLength; }; void MoveMe(vector3 pPosition) { Point1 += pPosition; @@ -129,14 +115,10 @@ class TSegment CPointOut += pPosition; } } - int RaSegCount() - { - return fTsBuffer ? iSegCount : 1; - }; - void AngleSet(int i, double a) - { - fAngle[i] = a; - }; + int RaSegCount() { + return fTsBuffer ? iSegCount : 1; }; + void AngleSet(int i, double a) { + fAngle[i] = a; }; }; //--------------------------------------------------------------------------- diff --git a/Track.cpp b/Track.cpp index 48e39a66..67ffdc63 100644 --- a/Track.cpp +++ b/Track.cpp @@ -177,7 +177,6 @@ void TTrack::Init() case tt_Cross: // tylko dla skrzyżowania dróg SwitchExtension = std::make_shared( this, 6 ); // 6 po³¹czeñ SwitchExtension->vPoints = nullptr; // brak tablicy punktów - SwitchExtension->iPoints = 0; SwitchExtension->bPoints = false; // tablica punktów nie wypełniona SwitchExtension->iRoads = 4; // domyślnie 4 break; @@ -203,7 +202,9 @@ TTrack * TTrack::Create400m(int what, double dx) TSubRect *r = Global::pGround->GetSubRect(tmp->pCenter.x, tmp->pCenter.z); r->NodeAdd(tmp); // dodanie toru do segmentu r->Sort(); //żeby wyświetlał tabor z dodanego toru +/* r->Release(); // usunięcie skompilowanych zasobów +*/ return trk; }; @@ -313,7 +314,9 @@ TTrack * TTrack::NullCreate(int dir) if (tmp2) r->NodeAdd(tmp2); // drugiego też r->Sort(); //żeby wyświetlał tabor z dodanego toru +/* r->Release(); // usunięcie skompilowanych zasobów +*/ return trk; }; @@ -989,22 +992,6 @@ bool TTrack::AddDynamicObject(TDynamicObject *Dynamic) return true; }; -void TTrack::MoveMe(vector3 pPosition) -{ // to nie jest używane - if (SwitchExtension) - { - SwitchExtension->Segments[0]->MoveMe(1 * pPosition); - SwitchExtension->Segments[1]->MoveMe(1 * pPosition); - SwitchExtension->Segments[2]->MoveMe(3 * pPosition); // Ra: 3 razy? - SwitchExtension->Segments[3]->MoveMe(4 * pPosition); - } - else - { - Segment->MoveMe(pPosition); - }; - ResourceManager::Unregister(this); -}; - const int numPts = 4; const int nnumPts = 12; @@ -1039,10 +1026,10 @@ const vector6 iglica[nnumPts] = // iglica - vextor3(x,y,mapowanie tekstury) vector6(-0.040, -0.180, 1.00, -1.000, 0.000, 0.000) // 1mm więcej, żeby nie nachodziły tekstury? }; - +/* void TTrack::Compile(GLuint tex) { - CVertNormTex *immediate{ nullptr }; + basic_vertex *immediate{ nullptr }; // generowanie treści dla Display Lists - model proceduralny if (!tex) @@ -1656,14 +1643,16 @@ void TTrack::Compile(GLuint tex) if (Global::bManageNodes) glEndList(); }; - +*/ void TTrack::Release() { +/* if (DisplayListID) glDeleteLists(DisplayListID, 1); DisplayListID = 0; +*/ }; - +/* void TTrack::Render() { if (bVisible) // Ra: tory są renderowane sektorami i nie ma sensu każdorazowo liczyć odległości @@ -1682,7 +1671,7 @@ void TTrack::Render() Release(); // zwrotnica w trakcie animacji do odrysowania } }; - +*/ bool TTrack::CheckDynamicObject(TDynamicObject *Dynamic) { // sprawdzenie, czy pojazd jest przypisany do toru for( auto dynamic : Dynamics ) { @@ -1774,7 +1763,7 @@ void TTrack::RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joi am->GetContainer(NULL)->EventAssign(done); // zdarzenie zakończenia animacji } }; - +/* int TTrack::RaArrayPrepare() { // przygotowanie tablic do skopiowania do VBO (zliczanie wierzchołków) if (bVisible) // o ile w ogóle widać @@ -1803,16 +1792,6 @@ int TTrack::RaArrayPrepare() + SwitchExtension->Segments[ 4 ]->RaSegCount() + SwitchExtension->Segments[ 5 ]->RaSegCount(); } -/* - if (fTexHeight1 >= 0) { - // normalne pobocze, na razie się składa z - return ( ( TextureID1 ? SwitchExtension->iPoints + SwitchExtension->iRoads + 2 : 0 ) + ( TextureID2 ? SwitchExtension->iPoints * 12 : 0 ) ); - } - else { - // jeśli fTexHeight1<0, to są chodniki i może któregoś nie być - return ( ( TextureID1 ? SwitchExtension->iPoints + SwitchExtension->iRoads + 2 : 0 ) + ( TextureID2 ? SwitchExtension->iPoints * 6 : 0 ) ); - } -*/ // each sub-segment covers only one side of the road, so it has points for single sideroad, if any return ( ( TextureID1 ? SwitchExtension->iPoints + SwitchExtension->iRoads + 2 : 0 ) + ( TextureID2 ? SwitchExtension->iPoints * 6 : 0 ) ); } @@ -1829,28 +1808,28 @@ int TTrack::RaArrayPrepare() } return 0; }; - -void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vertexcount) -{ // wypełnianie tablic VBO +*/ +// wypełnianie tablic VBO +void TTrack::create_geometry( geometrybank_handle const &Bank ) { // Ra: trzeba rozdzielić szyny od podsypki, aby móc grupować wg tekstur - double fHTW = 0.5 * fabs(fTrackWidth); - double side = fabs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza - double slop = fabs(fTexSlope); // brzeg zewnętrzny - double rozp = fHTW + side + slop; // brzeg zewnętrzny - double hypot1 = hypot(slop, fTexHeight1); // rozmiar pochylenia do liczenia normalnych + double const fHTW = 0.5 * std::fabs(fTrackWidth); + double const side = std::fabs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza + double const slop = std::fabs(fTexSlope); // brzeg zewnętrzny + double const rozp = fHTW + side + slop; // brzeg zewnętrzny + double hypot1 = std::hypot(slop, fTexHeight1); // rozmiar pochylenia do liczenia normalnych if (hypot1 == 0.0) hypot1 = 1.0; - vector3 normal1 = vector3(fTexSlope / hypot1, fTexHeight1 / hypot1, 0.0); // wektor normalny + vector3 normal1 { fTexSlope / hypot1, fTexHeight1 / hypot1, 0.0 }; // wektor normalny double fHTW2, side2, slop2, rozp2, fTexHeight2, hypot2; vector3 normal2; if (iTrapezoid & 2) // ten bit oznacza, że istnieje odpowiednie pNext { // Ra: jest OK - fHTW2 = 0.5 * fabs(trNext->fTrackWidth); // połowa rozstawu/nawierzchni - side2 = fabs(trNext->fTexWidth); - slop2 = fabs(trNext->fTexSlope); // nie jest używane później + fHTW2 = 0.5 * std::fabs(trNext->fTrackWidth); // połowa rozstawu/nawierzchni + side2 = std::fabs(trNext->fTexWidth); + slop2 = std::fabs(trNext->fTexSlope); // nie jest używane później rozp2 = fHTW2 + side2 + slop2; fTexHeight2 = trNext->fTexHeight1; - hypot2 = hypot(slop2, fTexHeight2); + hypot2 = std::hypot(slop2, fTexHeight2); if (hypot2 == 0.0) hypot2 = 1.0; normal2 = vector3(trNext->fTexSlope / hypot2, fTexHeight2 / hypot2, 0.0); @@ -1877,37 +1856,48 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons Segment->GetRolls(roll1, roll2); else roll1 = roll2 = 0.0; // dla zwrotnic - double sin1 = sin(roll1), cos1 = cos(roll1), sin2 = sin(roll2), cos2 = cos(roll2); + double sin1 = std::sin(roll1), cos1 = std::cos(roll1), sin2 = std::sin(roll2), cos2 = std::cos(roll2); // zwykla szyna: //Ra: czemu główki są asymetryczne na wysokości 0.140? vector6 rpts1[24], rpts2[24], rpts3[24], rpts4[24]; int i; for (i = 0; i < 12; ++i) { - rpts1[i] = vector6((fHTW + szyna[i].x) * cos1 + szyna[i].y * sin1, - -(fHTW + szyna[i].x) * sin1 + szyna[i].y * cos1, szyna[i].z, - +szyna[i].n.x * cos1 + szyna[i].n.y * sin1, - -szyna[i].n.x * sin1 + szyna[i].n.y * cos1, 0.0); - rpts2[11 - i] = vector6((-fHTW - szyna[i].x) * cos1 + szyna[i].y * sin1, - -(-fHTW - szyna[i].x) * sin1 + szyna[i].y * cos1, szyna[i].z, - -szyna[i].n.x * cos1 + szyna[i].n.y * sin1, - +szyna[i].n.x * sin1 + szyna[i].n.y * cos1, 0.0); + rpts1[i] = vector6( + (fHTW + szyna[i].x) * cos1 + szyna[i].y * sin1, + -(fHTW + szyna[i].x) * sin1 + szyna[i].y * cos1, + szyna[i].z, + szyna[i].n.x * cos1 + szyna[i].n.y * sin1, + -szyna[i].n.x * sin1 + szyna[i].n.y * cos1, + 0.0); + rpts2[11 - i] = vector6( + (-fHTW - szyna[i].x) * cos1 + szyna[i].y * sin1, + -(-fHTW - szyna[i].x) * sin1 + szyna[i].y * cos1, + szyna[i].z, + -szyna[i].n.x * cos1 + szyna[i].n.y * sin1, + szyna[i].n.x * sin1 + szyna[i].n.y * cos1, + 0.0); } if (iTrapezoid) // trapez albo przechyłki, to oddzielne punkty na końcu for (i = 0; i < 12; ++i) { - rpts1[12 + i] = vector6((fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(fHTW2 + szyna[i].x) * sin2 + szyna[i].y * cos2, - szyna[i].z, +szyna[i].n.x * cos2 + szyna[i].n.y * sin2, - -szyna[i].n.x * sin2 + szyna[i].n.y * cos2, 0.0); - rpts2[23 - i] = vector6((-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + szyna[i].y * cos2, - szyna[i].z, -szyna[i].n.x * cos2 + szyna[i].n.y * sin2, - +szyna[i].n.x * sin2 + szyna[i].n.y * cos2, 0.0); + rpts1[12 + i] = vector6( + (fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, + -(fHTW2 + szyna[i].x) * sin2 + szyna[i].y * cos2, + szyna[i].z, + szyna[i].n.x * cos2 + szyna[i].n.y * sin2, + -szyna[i].n.x * sin2 + szyna[i].n.y * cos2, + 0.0); + rpts2[23 - i] = vector6( + (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, + -(-fHTW2 - szyna[i].x) * sin2 + szyna[i].y * cos2, + szyna[i].z, + -szyna[i].n.x * cos2 + szyna[i].n.y * sin2, + szyna[i].n.x * sin2 + szyna[i].n.y * cos2, + 0.0); } switch (eType) // dalej zależnie od typu { case tt_Table: // obrotnica jak zwykły tor, tylko animacja dochodzi - SwitchExtension->iLeftVBO = Vert - Start; // indeks toru obrotnicy case tt_Normal: if (TextureID2) { // podsypka z podkładami jest tylko dla zwykłego toru @@ -1969,12 +1959,33 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos } } - Segment->RenderLoft(Vert, origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); + vertex_array vertices; + Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); + if( ( Bank == 0 ) && ( false == Geometry2.empty() ) ) { + // special variant, replace existing data for a turntable track + GfxRenderer.Replace( vertices, Geometry2[ 0 ] ); + } + else { + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + } } if (TextureID1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną - Segment->RenderLoft(Vert, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - Segment->RenderLoft(Vert, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); + vertex_array vertices; + if( ( Bank == 0 ) && ( false == Geometry1.empty() ) ) { + Segment->RenderLoft( vertices, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + GfxRenderer.Replace( vertices, Geometry1[ 0 ] ); + vertices.clear(); // reuse the scratchpad + Segment->RenderLoft( vertices, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + GfxRenderer.Replace( vertices, Geometry1[ 1 ] ); + } + else { + Segment->RenderLoft( vertices, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); // reuse the scratchpad + Segment->RenderLoft( vertices, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + } } break; case tt_Switch: // dla zwrotnicy dwa razy szyny @@ -1984,47 +1995,85 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons for (i = 0; i < 12; ++i) { rpts3[i] = - vector6(+(fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, - -(+fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, iglica[i].z); + vector6( + +( fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, + -(+fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, + iglica[i].z); rpts3[i + 12] = - vector6(+(fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(+fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, szyna[i].z); + vector6( + +( fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, + -(+fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, + szyna[i].z); rpts4[11 - i] = - vector6((-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, - -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, iglica[i].z); + vector6( + (-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, + -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, + iglica[i].z); rpts4[23 - i] = - vector6((-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, szyna[i].z); + vector6( + (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, + -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, + szyna[i].z); } + // TODO, TBD: change all track geometry to triangles, to allow packing data in less, larger buffers if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa + vertex_array vertices; if( TextureID1 ) { - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts2, nnumPts, fTexLength ); - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); - - SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + // fixed parts + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength ); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + // left blade + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } if( TextureID2 ) { - SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts1, nnumPts, fTexLength ); + // fixed parts + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength ); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + // right blade + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } } else { // lewa działa lepiej niż prawa + vertex_array vertices; if( TextureID1 ) { - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą - SwitchExtension->iLeftVBO = Vert - Start; // indeks lewej iglicy - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); // prawa iglica + // fixed parts + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + // right blade + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } if( TextureID2 ) { - SwitchExtension->iRightVBO = Vert - Start; // indeks prawej iglicy - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); // lewa iglica - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała + // fixed parts + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + // left blade + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } } } @@ -2059,7 +2108,9 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - Segment->RenderLoft(Vert, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); + vertex_array vertices; + Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } if (TextureID2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) @@ -2136,22 +2187,31 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y + h2l, 0.484375 - map2l); // lewy brzeg lewego chodnika } } + vertex_array vertices; if( iTrapezoid ) // trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony // odcinka if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - Segment->RenderLoft( Vert, origin, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej + Segment->RenderLoft( vertices, origin, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - Segment->RenderLoft( Vert, origin, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej + Segment->RenderLoft( vertices, origin, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } } else { // pobocza zwykłe, brak przechyłki if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - Segment->RenderLoft( Vert, origin, rpts1, 3, fTexLength ); + Segment->RenderLoft( vertices, origin, rpts1, 3, fTexLength ); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - Segment->RenderLoft( Vert, origin, rpts2, 3, fTexLength ); + Segment->RenderLoft( vertices, origin, rpts2, 3, fTexLength ); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } } } @@ -2182,12 +2242,25 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons p[3] = SwitchExtension->Segments[1]->FastGetPoint_0(); // Point4 - przy trzech drogach pokrywa się z Point1 // 2014-07: na początek rysować brzegi jak dla łuków // punkty brzegu nawierzchni uzyskujemy podczas renderowania boków (bez sensu, ale najszybciej było zrobić) - int i; // ile punktów (może byc różna ilość punktów między drogami) + int pointcount; + if( SwitchExtension->iRoads == 3 ) { + // mogą być tylko 3 drogi zamiast 4 + pointcount = + SwitchExtension->Segments[ 0 ]->RaSegCount() + + SwitchExtension->Segments[ 1 ]->RaSegCount() + + SwitchExtension->Segments[ 2 ]->RaSegCount(); + } + else { + pointcount = + SwitchExtension->Segments[ 2 ]->RaSegCount() + + SwitchExtension->Segments[ 3 ]->RaSegCount() + + SwitchExtension->Segments[ 4 ]->RaSegCount() + + SwitchExtension->Segments[ 5 ]->RaSegCount(); + } if (!SwitchExtension->vPoints) { // jeśli tablica punktów nie jest jeszcze utworzona, zliczamy punkty i tworzymy ją - // points were already counted during preparation stage // we'll need to add couple extra points for the complete fan we'll build - SwitchExtension->vPoints = new vector3[SwitchExtension->iPoints + SwitchExtension->iRoads]; + SwitchExtension->vPoints = new vector3[pointcount + SwitchExtension->iRoads]; } vector3 *b = SwitchExtension->bPoints ? @@ -2272,22 +2345,50 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons } } bool render = ( TextureID2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni - // if (iTrapezoid) //trapez albo przechyłki + vertex_array vertices; if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); - SwitchExtension->Segments[ 3 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); - SwitchExtension->Segments[ 4 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); - SwitchExtension->Segments[ 5 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + if( true == render ) { + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + } + SwitchExtension->Segments[ 3 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + if( true == render ) { + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + } + SwitchExtension->Segments[ 4 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + if( true == render ) { + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + } + SwitchExtension->Segments[ 5 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + if( true == render ) { + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + } } } else { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P2 do P4 - SwitchExtension->Segments[ 1 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P4 do P3=P1 (odwrócony) - SwitchExtension->Segments[ 0 ]->RenderLoft( Vert, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P1 do P2 + SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P2 do P4 + if( true == render ) { + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + } + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P4 do P3=P1 (odwrócony) + if( true == render ) { + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + } + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P1 do P2 + if( true == render ) { + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + } } } } @@ -2299,47 +2400,47 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons SwitchExtension->bPoints = true; // tablica punktów została wypełniona } - if (TextureID1) { + if( TextureID1 ) { + vertex_array vertices; // jeśli podana tekstura nawierzchni // we start with a vertex in the middle... - Vert->normal.x = 0.0; - Vert->normal.y = 1.0; - Vert->normal.z = 0.0; - Vert->texture.s = 0.5; - Vert->texture.t = 0.5; - Vert->position.x = oxz.x - origin.x; - Vert->position.y = oxz.y - origin.y; - Vert->position.z = oxz.z - origin.z; - ++Vert; + vertices.emplace_back( + glm::vec3{ + oxz.x - origin.x, + oxz.y - origin.y, + oxz.z - origin.z }, + glm::vec3{ 0.0f, 1.0f, 0.0f }, + glm::vec2{ 0.5f, 0.5f } ); // ...and add one extra vertex to close the fan... - Vert->normal.x = 0.0; - Vert->normal.y = 1.0; - Vert->normal.z = 0.0; - // mapowanie we współrzędnych scenerii u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x + origin.x ) / fTexLength; v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z + origin.z ) / ( fTexRatio1 * fTexLength ); - Vert->texture.s = cosa0 * u + sina0 * v + 0.5; - Vert->texture.t = -sina0 * u + cosa0 * v + 0.5; - Vert->position.x = SwitchExtension->vPoints[ 0 ].x; - Vert->position.y = SwitchExtension->vPoints[ 0 ].y; - Vert->position.z = SwitchExtension->vPoints[ 0 ].z; - ++Vert; - // ...then draw the precalculated rest - for (i = SwitchExtension->iPoints + SwitchExtension->iRoads - 1; i >= 0; --i) - { - Vert->normal.x = 0.0; - Vert->normal.y = 1.0; - Vert->normal.z = 0.0; + vertices.emplace_back( + glm::vec3 { + SwitchExtension->vPoints[ 0 ].x, + SwitchExtension->vPoints[ 0 ].y, + SwitchExtension->vPoints[ 0 ].z }, + glm::vec3{ 0.0f, 1.0f, 0.0f }, // mapowanie we współrzędnych scenerii - u = (SwitchExtension->vPoints[i].x - oxz.x + origin.x ) / fTexLength; - v = (SwitchExtension->vPoints[i].z - oxz.z + origin.z ) / (fTexRatio1 * fTexLength); - Vert->texture.s = cosa0 * u + sina0 * v + 0.5; - Vert->texture.t = -sina0 * u + cosa0 * v + 0.5; - Vert->position.x = SwitchExtension->vPoints[ i ].x; - Vert->position.y = SwitchExtension->vPoints[ i ].y; - Vert->position.z = SwitchExtension->vPoints[ i ].z; - ++Vert; + glm::vec2{ + cosa0 * u + sina0 * v + 0.5, + -sina0 * u + cosa0 * v + 0.5 } ); + // ...then draw the precalculated rest + for (int i = pointcount + SwitchExtension->iRoads - 1; i >= 0; --i) { + // mapowanie we współrzędnych scenerii + u = ( SwitchExtension->vPoints[ i ].x - oxz.x + origin.x ) / fTexLength; + v = ( SwitchExtension->vPoints[ i ].z - oxz.z + origin.z ) / ( fTexRatio1 * fTexLength ); + vertices.emplace_back( + glm::vec3 { + SwitchExtension->vPoints[ i ].x, + SwitchExtension->vPoints[ i ].y, + SwitchExtension->vPoints[ i ].z }, + glm::vec3{ 0.0f, 1.0f, 0.0f }, + // mapowanie we współrzędnych scenerii + glm::vec2{ + cosa0 * u + sina0 * v + 0.5, + -sina0 * u + cosa0 * v + 0.5 } ); } + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_FAN ) ); } break; } // tt_cross @@ -2378,11 +2479,13 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons } if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - Segment->RenderLoft(Vert, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); + vertex_array vertices; + Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } if (TextureID2) - { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w - // Midtown Madness 2?) + { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) + vertex_array vertices; vector6 rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy @@ -2400,13 +2503,21 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza - Segment->RenderLoft(Vert, origin, rpts1, -3, fTexLength); - Segment->RenderLoft(Vert, origin, rpts2, -3, fTexLength); + Segment->RenderLoft(vertices, origin, rpts1, -3, fTexLength); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + Segment->RenderLoft(vertices, origin, rpts2, -3, fTexLength); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } else { // pobocza zwykłe, brak przechyłki - Segment->RenderLoft(Vert, origin, rpts1, 3, fTexLength); - Segment->RenderLoft(Vert, origin, rpts2, 3, fTexLength); + Segment->RenderLoft(vertices, origin, rpts1, 3, fTexLength); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); + Segment->RenderLoft(vertices, origin, rpts2, 3, fTexLength); + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); } } } @@ -2415,10 +2526,9 @@ void TTrack::RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int cons } return; }; - +/* void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO - // Ra 2014-07: trzeba wymienić GL_TRIANGLE_STRIP na GL_TRIANGLES i renderować trójkąty sektora - // dla kolejnych tekstur! + // Ra 2014-07: trzeba wymienić GL_TRIANGLE_STRIP na GL_TRIANGLES i renderować trójkąty sektora dla kolejnych tekstur! EnvironmentSet(); int seg; switch( iCategoryFlag & 15 ) { @@ -2568,7 +2678,7 @@ void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO } EnvironmentReset(); }; - +*/ void TTrack::EnvironmentSet() { // ustawienie zmienionego światła glColor3f(1.0f, 1.0f, 1.0f); // Ra: potrzebne to? @@ -2822,11 +2932,11 @@ void TTrack::RaAnimListAdd(TTrack *t) } }; -TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) +TTrack * TTrack::RaAnimate() { // wykonanie rekurencyjne animacji, wywoływane przed wyświetleniem sektora // zwraca wskaźnik toru wymagającego dalszej animacji if( SwitchExtension->pNextAnim ) - SwitchExtension->pNextAnim = SwitchExtension->pNextAnim->RaAnimate( Vertexbuffer ); + SwitchExtension->pNextAnim = SwitchExtension->pNextAnim->RaAnimate(); bool m = true; // animacja trwa if (eType == tt_Switch) // dla zwrotnicy tylko szyny { @@ -2855,77 +2965,85 @@ TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) m = false; // koniec animacji } } - if( ( Global::bUseVBO ) - && ( Vertexbuffer != -1 ) ) - { // dla OpenGL 1.4 odświeży się cały sektor, w późniejszych poprawiamy fragment - if (GLEW_VERSION_1_5) // dla OpenGL 1.4 to się nie wykona poprawnie - if (TextureID1) // Ra: !!!! tu jest do poprawienia - { // iglice liczone tylko dla zwrotnic - vector6 rpts3[24], rpts4[24]; - double fHTW = 0.5 * fabs(fTrackWidth); - double fHTW2 = fHTW; // Ra: na razie niech tak będzie - double cos1 = 1.0, sin1 = 0.0, cos2 = 1.0, sin2 = 0.0; // Ra: ... - for( int i = 0; i < 12; ++i ) { + // skip the geometry update if no geometry for this track was generated yet + if( ( ( TextureID1 != 0 ) + || ( TextureID2 != 0 ) ) + && ( ( false == Geometry1.empty() ) + || ( false == Geometry2.empty() ) ) ) { + // iglice liczone tylko dla zwrotnic + double fHTW = 0.5 * fabs( fTrackWidth ); + double fHTW2 = fHTW; // Ra: na razie niech tak będzie + double cos1 = 1.0, sin1 = 0.0, cos2 = 1.0, sin2 = 0.0; // Ra: ... + vector6 rpts3[ 24 ], rpts4[ 24 ]; + for (int i = 0; i < 12; ++i) + { + rpts3[i] = + vector6( + +( fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, + -(+fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, + iglica[i].z); + rpts3[i + 12] = + vector6( + +( fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, + -(+fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, + szyna[i].z); + rpts4[11 - i] = + vector6( + (-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, + -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, + iglica[i].z); + rpts4[23 - i] = + vector6( + (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, + -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, + szyna[i].z); + } - rpts3[ i ] = - vector6( +( fHTW + iglica[ i ].x ) * cos1 + iglica[ i ].y * sin1, - -( +fHTW + iglica[ i ].x ) * sin1 + iglica[ i ].y * cos1, iglica[ i ].z ); - rpts3[ i + 12 ] = - vector6( +( fHTW2 + szyna[ i ].x ) * cos2 + szyna[ i ].y * sin2, - -( +fHTW2 + szyna[ i ].x ) * sin2 + iglica[ i ].y * cos2, szyna[ i ].z ); - rpts4[ 11 - i ] = - vector6( ( -fHTW - iglica[ i ].x ) * cos1 + iglica[ i ].y * sin1, - -( -fHTW - iglica[ i ].x ) * sin1 + iglica[ i ].y * cos1, iglica[ i ].z ); - rpts4[ 23 - i ] = - vector6( ( -fHTW2 - szyna[ i ].x ) * cos2 + szyna[ i ].y * sin2, - -( -fHTW2 - szyna[ i ].x ) * sin2 + iglica[ i ].y * cos2, szyna[ i ].z ); - } - // NOTE: performance-wise it'd make much more sense to keep the most recent shape cached as part of switch extension, - // and only send updates when/if they take place, instead of the current back-and-forth - // TODO: implement optimized version + auto const origin { pMyNode->m_rootposition }; + vertex_array vertices; - // fetch current blade geometry - std::vector bladesbuffer; bladesbuffer.resize( 2 * 2 * 24 ); // 2 blades, 2 segments each -/* - ::glGetBufferSubData( - GL_ARRAY_BUFFER, - SwitchExtension->iLeftVBO * sizeof( CVertNormTex ), - bladesbuffer.size() * sizeof( CVertNormTex ), - bladesbuffer.data() ); -*/ - auto bladevertices = bladesbuffer.data(); - auto const origin { pMyNode->m_rootposition }; - if( SwitchExtension->RightSwitch ) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 /*, true*/ ); - SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 /*, true*/ ); - } - else { - SwitchExtension->Segments[ 0 ]->RenderLoft( bladevertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 /*, true*/ ); // prawa iglica - SwitchExtension->Segments[ 1 ]->RenderLoft( bladevertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 /*, true*/ ); // lewa iglica - } - // push back updated geometry - ::glBufferSubData( - GL_ARRAY_BUFFER, - SwitchExtension->iLeftVBO * sizeof( CVertNormTex ), - bladesbuffer.size() * sizeof( CVertNormTex ), - bladesbuffer.data() ); + if (SwitchExtension->RightSwitch) + { // nowa wersja z SPKS, ale odwrotnie lewa/prawa + vertex_array vertices; + if( TextureID1 ) { + // left blade + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); + vertices.clear(); } + if( TextureID2 ) { + // right blade + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); + vertices.clear(); + } + } + else { // lewa działa lepiej niż prawa + vertex_array vertices; + if( TextureID1 ) { + // right blade + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); + GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); + vertices.clear(); + } + if( TextureID2 ) { + // left blade + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); + GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); + vertices.clear(); + } + } } - else // gdy Display List - Release(); // niszczenie skompilowanej listy, aby się wygenerowała nowa } - else if (eType == tt_Table) // dla obrotnicy - szyny i podsypka - { + else if (eType == tt_Table) { + // dla obrotnicy - szyny i podsypka if (SwitchExtension->pModel && SwitchExtension->CurrentIndex) // 0=zablokowana się nie animuje { // trzeba każdorazowo porównywać z kątem modelu - // SwitchExtension->fOffset1=SwitchExtension->pAnim?SwitchExtension->pAnim->AngleGet():0.0; // //pobranie kąta z modelu TAnimContainer *ac = SwitchExtension->pModel ? SwitchExtension->pModel->GetContainer(NULL) : NULL; // pobranie głównego submodelu - // if (ac) ac->EventAssign(SwitchExtension->evMinus); //event zakończenia animacji, - // trochę bez sensu tutaj if (ac) if ((ac->AngleGet() != SwitchExtension->fOffset) || !(ac->TransGet() == @@ -2947,22 +3065,26 @@ TTrack * TTrack::RaAnimate(GLuint const Vertexbuffer) dynamic->Move( 0.000001 ); } // kąty +/* if (Global::bUseVBO) { // dla OpenGL 1.4 odświeży się cały sektor, w późniejszych poprawiamy fragment // aktualizacja pojazdów na torze if (GLEW_VERSION_1_5) // dla OpenGL 1.4 to się nie wykona poprawnie { int size = RaArrayPrepare(); // wielkość tabeli potrzebna dla tej obrotnicy - CVertNormTex *Vert = new CVertNormTex[size]; // bufor roboczy - // CVertNormTex *v=Vert; //zmieniane przez + basic_vertex *Vert = new basic_vertex[size]; // bufor roboczy + // basic_vertex *v=Vert; //zmieniane przez RaArrayFill(Vert, Vert - SwitchExtension->iLeftVBO, size); // iLeftVBO powinno zostać niezmienione ::glBufferSubData( - GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(CVertNormTex), - size * sizeof(CVertNormTex), Vert); // wysłanie fragmentu bufora VBO + GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(basic_vertex), + size * sizeof(basic_vertex), Vert); // wysłanie fragmentu bufora VBO } } else // gdy Display List Release(); // niszczenie skompilowanej listy, aby się wygenerowała nowa +*/ + // NOTE: passing empty handle is a bit of a hack here. could be refactored into something more elegant + create_geometry( geometrybank_handle() ); } // animacja trwa nadal } else diff --git a/Track.h b/Track.h index b51bb3a6..8ded71b5 100644 --- a/Track.h +++ b/Track.h @@ -15,8 +15,6 @@ http://mozilla.org/MPL/2.0/. #include "Segment.h" #include "Texture.h" -class TEvent; - typedef enum { tt_Unknown, @@ -39,6 +37,7 @@ typedef enum } TEnvironmentType; // Ra: opracować alternatywny system cieni/świateł z definiowaniem koloru oświetlenia w halach +class TEvent; class TTrack; class TGroundNode; class TSubRect; @@ -77,10 +76,10 @@ class TSwitchExtension }; struct { // zmienne dla skrzyżowania - vector3 *vPoints; // tablica wierzchołków nawierzchni, generowana przez pobocze - int iPoints; // liczba faktycznie użytych wierzchołków nawierzchni - bool bPoints; // czy utworzone? int iRoads; // ile dróg się spotyka? + vector3 *vPoints; // tablica wierzchołków nawierzchni, generowana przez pobocze +// int iPoints; // liczba faktycznie użytych wierzchołków nawierzchni + bool bPoints; // czy utworzone? }; }; bool bMovement = false; // czy w trakcie animacji @@ -108,46 +107,48 @@ class TIsolated TIsolated(); TIsolated(const std::string &n, TIsolated *i); ~TIsolated(); - static TIsolated * Find( - const std::string &n); // znalezienie obiektu albo utworzenie nowego + static TIsolated * Find(const std::string &n); // znalezienie obiektu albo utworzenie nowego void Modify(int i, TDynamicObject *o); // dodanie lub odjęcie osi - bool Busy() - { - return (iAxles > 0); - }; - static TIsolated * Root() - { - return (pRoot); - }; - TIsolated * Next() - { - return (pNext); - }; + bool Busy() { + return (iAxles > 0); }; + static TIsolated * Root() { + return (pRoot); }; + TIsolated * Next() { + return (pNext); }; }; -class TTrack : public Resource -{ // trajektoria ruchu - opakowanie - private: +// trajektoria ruchu - opakowanie +class TTrack : public Resource { + + friend class opengl_renderer; + +private: + TGroundNode * pMyNode = nullptr; // Ra: proteza, żeby tor znał swoją nazwę TODO: odziedziczyć TTrack z TGroundNode + TIsolated * pIsolated = nullptr; // obwód izolowany obsługujący zajęcia/zwolnienia grupy torów std::shared_ptr SwitchExtension; // dodatkowe dane do toru, który jest zwrotnicą std::shared_ptr Segment; - TTrack *trNext = nullptr; // odcinek od strony punktu 2 - to powinno być w segmencie - TTrack *trPrev = nullptr; // odcinek od strony punktu 1 + TTrack * trNext = nullptr; // odcinek od strony punktu 2 - to powinno być w segmencie + TTrack * trPrev = nullptr; // odcinek od strony punktu 1 + // McZapkie-070402: dodalem zmienne opisujace rozmiary tekstur - texture_handle TextureID1 = 0; // tekstura szyn albo nawierzchni - texture_handle TextureID2 = 0; // tekstura automatycznej podsypki albo pobocza + int iTrapezoid = 0; // 0-standard, 1-przechyłka, 2-trapez, 3-oba + double fRadiusTable[ 2 ]; // dwa promienie, drugi dla zwrotnicy float fTexLength = 4.0f; // długość powtarzania tekstury w metrach float fTexRatio1 = 1.0f; // proporcja boków tekstury nawierzchni (żeby zaoszczędzić na rozmiarach tekstur...) float fTexRatio2 = 1.0f; // proporcja boków tekstury chodnika (żeby zaoszczędzić na rozmiarach tekstur...) float fTexHeight1 = 0.6f; // wysokość brzegu względem trajektorii float fTexWidth = 0.9f; // szerokość boku float fTexSlope = 0.9f; - double fRadiusTable[ 2 ]; // dwa promienie, drugi dla zwrotnicy - int iTrapezoid = 0; // 0-standard, 1-przechyłka, 2-trapez, 3-oba +/* GLuint DisplayListID = 0; - TIsolated *pIsolated = nullptr; // obwód izolowany obsługujący zajęcia/zwolnienia grupy torów - TGroundNode * - pMyNode = nullptr; // Ra: proteza, żeby tor znał swoją nazwę TODO: odziedziczyć TTrack z TGroundNode - public: +*/ + texture_handle TextureID1 = 0; // tekstura szyn albo nawierzchni + texture_handle TextureID2 = 0; // tekstura automatycznej podsypki albo pobocza + typedef std::vector geometryhandle_sequence; + geometryhandle_sequence Geometry1; // geometry chunks textured with texture 1 + geometryhandle_sequence Geometry2; // geometry chunks textured with texture 2 + +public: typedef std::deque dynamics_sequence; dynamics_sequence Dynamics; int iEvents = 0; // Ra: flaga informująca o obecności eventów @@ -193,39 +194,30 @@ class TTrack : public Resource void Init(); static TTrack * Create400m(int what, double dx); TTrack * NullCreate(int dir); - inline bool IsEmpty() - { - return Dynamics.empty(); - }; + inline bool IsEmpty() { + return Dynamics.empty(); }; void ConnectPrevPrev(TTrack *pNewPrev, int typ); void ConnectPrevNext(TTrack *pNewPrev, int typ); void ConnectNextPrev(TTrack *pNewNext, int typ); void ConnectNextNext(TTrack *pNewNext, int typ); - inline double Length() - { - return Segment->GetLength(); - }; - inline std::shared_ptr CurrentSegment() - { - return Segment; - }; - inline TTrack * CurrentNext() - { - return (trNext); - }; - inline TTrack * CurrentPrev() - { - return (trPrev); - }; + inline double Length() { + return Segment->GetLength(); }; + inline std::shared_ptr CurrentSegment() { + return Segment; }; + inline TTrack * CurrentNext() { + return (trNext); }; + inline TTrack * CurrentPrev() { + return (trPrev); }; TTrack * Neightbour(int s, double &d); bool SetConnections(int i); bool Switch(int i, double t = -1.0, double d = -1.0); bool SwitchForced(int i, TDynamicObject *o); int CrossSegment(int from, int into); - inline int GetSwitchState() - { - return (SwitchExtension ? SwitchExtension->CurrentIndex : -1); - }; + inline int GetSwitchState() { + return ( + SwitchExtension ? + SwitchExtension->CurrentIndex : + -1); }; void Load(cParser *parser, vector3 pOrigin, std::string name); bool AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); bool AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); @@ -233,44 +225,42 @@ class TTrack : public Resource bool CheckDynamicObject(TDynamicObject *Dynamic); bool AddDynamicObject(TDynamicObject *Dynamic); bool RemoveDynamicObject(TDynamicObject *Dynamic); - void MoveMe(vector3 pPosition); void Release(); +/* void Compile(GLuint tex = 0); - void Render(); // renderowanie z Display Lists int RaArrayPrepare(); // zliczanie rozmiaru dla VBO sektroa - void RaArrayFill(CVertNormTex *Vert, const CVertNormTex *Start, int const Vertexcount); // wypełnianie VBO +*/ + void create_geometry(geometrybank_handle const &Bank); // wypełnianie VBO +/* void RaRenderVBO(int iPtr); // renderowanie z VBO sektora +*/ void RenderDyn(); // renderowanie nieprzezroczystych pojazdów (oba tryby) void RenderDynAlpha(); // renderowanie przezroczystych pojazdów (oba tryby) - void RenderDynSounds(); // odtwarzanie dźwięków pojazdów jest niezależne od ich - // wyświetlania + void RenderDynSounds(); // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania - void RaOwnerSet(TSubRect *o) - { + void RaOwnerSet(TSubRect *o) { if (SwitchExtension) - SwitchExtension->pOwner = o; - }; + SwitchExtension->pOwner = o; }; bool InMovement(); // czy w trakcie animacji? void RaAssign(TGroundNode *gn, TAnimContainer *ac); void RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined); void RaAnimListAdd(TTrack *t); - TTrack * RaAnimate(GLuint const Vertexbuffer = -1); + TTrack * RaAnimate(); void RadioStop(); - void AxleCounter(int i, TDynamicObject *o) - { + void AxleCounter(int i, TDynamicObject *o) { if (pIsolated) - pIsolated->Modify(i, o); - }; // dodanie lub odjęcie osi + pIsolated->Modify(i, o); }; // dodanie lub odjęcie osi std::string IsolatedName(); bool IsolatedEventsAssign(TEvent *busy, TEvent *free); double WidthTotal(); - GLuint TextureGet(int i) - { - return i ? TextureID1 : TextureID2; - }; + GLuint TextureGet(int i) { + return ( + i ? + TextureID1 : + TextureID2 ); }; bool IsGroupable(); int TestPoint(vector3 *Point); void MovedUp1(double dh); diff --git a/Traction.cpp b/Traction.cpp index cb79da05..0b6028fb 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -358,7 +358,7 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) } t->psPower[d] = ps; // skopiowanie wskaźnika zasilacza od danej strony t->fResistance[d] = r; // wpisanie rezystancji w kierunku tego zasilacza - r += t->fResistivity * glm::dot(t->vParametric, t->vParametric ); // doliczenie oporu kolejnego odcinka + r += t->fResistivity * glm::length(t->vParametric); // doliczenie oporu kolejnego odcinka p = t; // zapamiętanie dotychczasowego t = p->hvNext[d ^ 1]; // podążanie w tę samą stronę d = p->iNext[d ^ 1]; @@ -367,8 +367,7 @@ void TTraction::ResistanceCalc(int d, double r, TTractionPowerSource *ps) } else { // podążanie w obu kierunkach, można by rekurencją, ale szkoda zasobów - r = 0.5 * fResistivity * - glm::dot(vParametric, vParametric ); // powiedzmy, że w zasilanym przęśle jest połowa + r = 0.5 * fResistivity * glm::length(vParametric); // powiedzmy, że w zasilanym przęśle jest połowa if (fResistance[0] == 0.0) ResistanceCalc(0, r); // do tyłu (w stronę Point1) if (fResistance[1] == 0.0) diff --git a/Traction.h b/Traction.h index 569d8f45..49304a30 100644 --- a/Traction.h +++ b/Traction.h @@ -56,7 +56,7 @@ class TTraction void Connect(int my, TTraction *with, int to); void Init(); bool WhereIs(); - void ResistanceCalc(int d = -1, double r = 0, TTractionPowerSource *ps = NULL); + void ResistanceCalc(int d = -1, double r = 0, TTractionPowerSource *ps = nullptr); void PowerSet(TTractionPowerSource *ps); double VoltageGet(double u, double i); private: diff --git a/VBO.cpp b/VBO.cpp index d9c3a9dd..be4ea20a 100644 --- a/VBO.cpp +++ b/VBO.cpp @@ -9,148 +9,3 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "VBO.h" -#include "GL/glew.h" -#include "usefull.h" -#include "sn_utils.h" -#include "globals.h" -//--------------------------------------------------------------------------- -/* -void CVertNormTex::deserialize(std::istream &s) -{ - x = sn_utils::ld_float32(s); - y = sn_utils::ld_float32(s); - z = sn_utils::ld_float32(s); - - nx = sn_utils::ld_float32(s); - ny = sn_utils::ld_float32(s); - nz = sn_utils::ld_float32(s); - - u = sn_utils::ld_float32(s); - v = sn_utils::ld_float32(s); -} - -void CVertNormTex::serialize(std::ostream &s) -{ - sn_utils::ls_float32(s, x); - sn_utils::ls_float32(s, y); - sn_utils::ls_float32(s, z); - - sn_utils::ls_float32(s, nx); - sn_utils::ls_float32(s, ny); - sn_utils::ls_float32(s, nz); - - sn_utils::ls_float32(s, u); - sn_utils::ls_float32(s, v); -} -*/ -CMesh::CMesh() -{ // utworzenie pustego obiektu -#ifdef EU07_USE_OLD_VERTEXBUFFER - m_pVNT = nullptr; -#endif - m_nVertexCount = -1; - m_nVBOVertices = 0; // nie zarezerwowane -}; - -CMesh::~CMesh() -{ // usuwanie obiektu - Clear(); // zwolnienie zasobów -}; - -void CMesh::MakeArray(int n) -{ // tworzenie tablic - m_nVertexCount = n; -#ifdef EU07_USE_OLD_VERTEXBUFFER - assert( m_pVNT == nullptr ); - m_pVNT = new CVertNormTex[m_nVertexCount]; // przydzielenie pamięci dla tablicy -#else - m_pVNT.clear(); - m_pVNT.resize( m_nVertexCount ); -#endif -}; - -void CMesh::BuildVBOs(bool del) -{ // tworzenie VBO i kasowanie już niepotrzebnych tablic - // pobierz numer VBO oraz ustaw go jako aktywny - glGenBuffers(1, &m_nVBOVertices); // pobierz numer - glBindBuffer(GL_ARRAY_BUFFER, m_nVBOVertices); // ustaw bufor jako aktualny -#ifdef EU07_USE_OLD_VERTEXBUFFER - glBufferData(GL_ARRAY_BUFFER, m_nVertexCount * sizeof(CVertNormTex), m_pVNT, GL_STATIC_DRAW); -#else - glBufferData( GL_ARRAY_BUFFER, m_nVertexCount * sizeof( CVertNormTex ), m_pVNT.data(), GL_STATIC_DRAW ); -#endif - // WriteLog("Assigned VBO number "+AnsiString(m_nVBOVertices)+", vertices: - // "+AnsiString(m_nVertexCount)); -#ifdef EU07_USE_OLD_VERTEXBUFFER - if (del) - SafeDeleteArray(m_pVNT); // wierzchołki już się nie przydadzą -#else - m_pVNT.clear(); -#endif -}; - -void CMesh::Clear() -{ // niewirtualne zwolnienie zasobów przez sprzątacz albo destruktor - // inna nazwa, żeby nie mieszało się z funkcją wirtualną sprzątacza - if (m_nVBOVertices) // jeśli było coś rezerwowane - { - glDeleteBuffers(1, &m_nVBOVertices); // Free The Memory - // WriteLog("Released VBO number "+AnsiString(m_nVBOVertices)); - } - m_nVBOVertices = 0; - m_nVertexCount = -1; // do ponownego zliczenia -#ifdef EU07_USE_OLD_VERTEXBUFFER - SafeDeleteArray(m_pVNT); // usuwanie tablic, gdy były użyte do Vertex Array -#else - m_pVNT.clear(); -#endif -}; - -bool CMesh::StartVBO() -{ // początek rysowania elementów z VBO - - if (m_nVertexCount <= 0) - return false; // nie ma nic do rysowania w ten sposób - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_NORMAL_ARRAY); - glEnableClientState(GL_TEXTURE_COORD_ARRAY); - if (m_nVBOVertices) - { - glBindBuffer(GL_ARRAY_BUFFER_ARB, m_nVBOVertices); - glVertexPointer( 3, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) ); // pozycje - glNormalPointer( GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 12 ); // normalne - glTexCoordPointer( 2, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 24 ); // wierzchołki - return true; // można rysować z VBO - } - - return false; -}; - -bool CMesh::StartColorVBO() -{ // początek rysowania punktów świecących z VBO - - if (m_nVertexCount <= 0) - return false; // nie ma nic do rysowania w ten sposób - glEnableClientState(GL_VERTEX_ARRAY); - glEnableClientState(GL_COLOR_ARRAY); - if (m_nVBOVertices) - { - glBindBuffer(GL_ARRAY_BUFFER, m_nVBOVertices); - glVertexPointer( 3, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) ); // pozycje - // glColorPointer(3,GL_UNSIGNED_BYTE,sizeof(CVertNormTex),((char*)NULL)+12); //kolory - glColorPointer( 3, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 12 ); // kolory - return true; // można rysować z VBO - } - return false; -}; - -void CMesh::EndVBO() -{ // koniec użycia VBO - glDisableClientState(GL_VERTEX_ARRAY); - glDisableClientState(GL_NORMAL_ARRAY); - glDisableClientState(GL_TEXTURE_COORD_ARRAY); - glDisableClientState(GL_COLOR_ARRAY); - // glBindBuffer(GL_ARRAY_BUFFER,0); //takie coś psuje, mimo iż polecali użyć - glBindBuffer(GL_ARRAY_BUFFER, 0); - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); // Ra: to na przyszłość -}; diff --git a/VBO.h b/VBO.h index 0f52b9d9..99a3fac7 100644 --- a/VBO.h +++ b/VBO.h @@ -11,48 +11,9 @@ http://mozilla.org/MPL/2.0/. #include "openglgeometrybank.h" -#define EU07_USE_OLD_VERTEXBUFFER - -//--------------------------------------------------------------------------- -/* -class CVertNormTex +class CMesh { public: - float x = 0.0; // X wierzchołka - float y = 0.0; // Y wierzchołka - float z = 0.0; // Z wierzchołka - float nx = 0.0; // X wektora normalnego - float ny = 0.0; // Y wektora normalnego - float nz = 0.0; // Z wektora normalnego - float u = 0.0; // U mapowania - float v = 0.0; // V mapowania - - void deserialize(std::istream&); - void serialize(std::ostream&); -}; -*/ -typedef basic_vertex CVertNormTex; - -class CMesh -{ // wsparcie dla VBO - public: - CMesh(); - ~CMesh(); - void MakeArray(int n); // tworzenie tablicy z elementami VNT - void BuildVBOs(bool del = true); // zamiana tablic na VBO - void Clear(); // zwolnienie zasobów - bool StartVBO(); - void EndVBO(); - bool StartColorVBO(); - - int m_nVertexCount; // liczba wierzchołków -#ifdef EU07_USE_OLD_VERTEXBUFFER - CVertNormTex *m_pVNT; -#else - std::vector m_pVNT; -#endif - unsigned int m_nVBOVertices; // numer VBO z wierzchołkami - geometrybank_handle m_geometrybank; - + bool m_geometrycreated { false }; }; diff --git a/World.cpp b/World.cpp index dc3c4968..1723253d 100644 --- a/World.cpp +++ b/World.cpp @@ -1267,7 +1267,7 @@ TWorld::Render_Cab() { } TDynamicObject *dynamic = Train->Dynamic(); - TSubModel::iInstance = reinterpret_cast( dynamic ); + TSubModel::iInstance = reinterpret_cast( dynamic ); if( ( true == FreeFlyModeFlag ) || ( false == dynamic->bDisplayCab ) @@ -1275,8 +1275,6 @@ TWorld::Render_Cab() { // ABu: Rendering kabiny jako ostatniej, zeby bylo widac przez szyby, tylko w widoku ze srodka return; } - - ::glEnable( GL_LIGHTING ); // po renderowaniu drutów może być to wyłączone. TODO: have the wires render take care of its own shit /* glPushMatrix(); vector3 pos = dynamic->GetPosition(); // wszpółrzędne pojazdu z kabiną @@ -1651,7 +1649,7 @@ TWorld::Update_UI() { } case( GLFW_KEY_F8 ) : { - + // gfx renderer data uitextline1 = "Draw range x " + to_string( Global::fDistanceFactor, 1 ) + "; FPS: " + to_string( Timer::GetFPS(), 2 ); @@ -1659,28 +1657,16 @@ TWorld::Update_UI() { uitextline1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; } uitextline1 += - ", sectors: " + to_string( Ground.iRendered ) - + "/" + to_string( Global::iSegmentsRendered ) + ", sectors: " + std::to_string( GfxRenderer.m_drawcount ) + + "/" + std::to_string( Global::iSegmentsRendered ) + "; FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ); - break; - } - - case( GLFW_KEY_F9 ) : { - // informacja o wersji, sposobie wyświetlania i błędach OpenGL - uitextline1 = "MaSzyna " + Global::asVersion; // informacja o wersji - if( Global::iMultiplayer ) { - uitextline1 += " (multiplayer mode is active)"; - } - uitextline2 = - std::string("Rendering mode: ") + std::string( "Rendering mode: " ) + ( Global::bUseVBO ? "VBO" : "Display Lists" ) - + ". " - + GfxRenderer.Info(); - + + ". "; // dump last opengl error, if any GLenum glerror = ::glGetError(); if( glerror != GL_NO_ERROR ) { @@ -1689,10 +1675,22 @@ TWorld::Update_UI() { Global::LastGLError = std::to_string( glerror ) + " (" + glerrorstring + ")"; } if( false == Global::LastGLError.empty() ) { - uitextline3 = + uitextline2 += "Last openGL error: " + Global::LastGLError; } + // renderer stats + uitextline3 = GfxRenderer.Info(); + + break; + } + + case( GLFW_KEY_F9 ) : { + // informacja o wersji + uitextline1 = "MaSzyna " + Global::asVersion; // informacja o wersji + if( Global::iMultiplayer ) { + uitextline1 += " (multiplayer mode is active)"; + } break; } diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index a5fcb34f..f75906b1 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -48,13 +48,13 @@ basic_vertex::deserialize( std::istream &s ) { // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk geometry_handle -geometry_bank::create( vertex_array &Vertices, int const Type ) { +geometry_bank::create( vertex_array &Vertices, unsigned int const Type, unsigned int const Streams ) { if( true == Vertices.empty() ) { return geometry_handle( 0, 0 ); } - m_chunks.emplace_back( Vertices, Type ); + m_chunks.emplace_back( Vertices, Type, Streams ); // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication - geometry_handle chunkhandle{ 0, m_chunks.size() }; + geometry_handle chunkhandle { 0, static_cast(m_chunks.size()) }; // template method create_( chunkhandle ); // all done diff --git a/openglgeometrybank.h b/openglgeometrybank.h index a05a05ce..6974a47f 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -18,14 +18,30 @@ http://mozilla.org/MPL/2.0/. #endif struct basic_vertex { + glm::vec3 position; // 3d space glm::vec3 normal; // 3d space glm::vec2 texture; // uv space + basic_vertex() = default; + basic_vertex( glm::vec3 const&Position, glm::vec3 const &Normal, glm::vec2 const &Texture ) : + position( Position ), normal( Normal ), texture( Texture ) + {} void serialize( std::ostream& ); void deserialize( std::istream& ); }; +// data streams carried in a vertex +enum stream { + position = 0x1, + normal = 0x2, + color = 0x4, // currently normal and colour streams are stored in the same slot, and mutually exclusive + texture = 0x8 +}; + +unsigned int const basic_streams { stream::position | stream::normal | stream::texture }; +unsigned int const color_streams{ stream::position | stream::color | stream::texture }; + typedef std::vector vertex_array; // generic geometry bank class, allows storage, update and drawing of geometry chunks @@ -40,12 +56,20 @@ struct geometry_handle { {} // methods inline - operator std::uint32_t() const { - return bank << 12 | chunk; } + operator std::uint64_t() const { +/* + return bank << 14 | chunk; } +*/ + return bank << 32 | chunk; } + // members +/* std::uint32_t - bank : 20, // 1 mil banks - chunk : 12; // 4 k chunks per bank + bank : 18, // 250k banks + chunk : 14; // 16k chunks per bank +*/ + std::uint32_t bank; + std::uint32_t chunk; }; class geometry_bank { @@ -62,7 +86,7 @@ public: // methods: // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk or NULL geometry_handle - create( vertex_array &Vertices, int const Type ); + create( vertex_array &Vertices, unsigned int const Type, unsigned int const Streams = stream::position | stream::normal | stream::texture ); // replaces data of specified chunk with the supplied vertex data, starting from specified offset bool replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset = 0 ); @@ -83,11 +107,12 @@ public: protected: // types: struct geometry_chunk { - int type; // kind of geometry used by the chunk + unsigned int streams; // data streams carried by vertices + unsigned int type; // kind of geometry used by the chunk vertex_array vertices; // geometry data - geometry_chunk( vertex_array &Vertices, int const Type ) : - vertices( Vertices ), type( Type ) + geometry_chunk( vertex_array &Vertices, unsigned int const Type, unsigned int const Streams ) : + vertices( Vertices ), type( Type ), streams( Streams ) {} }; @@ -121,9 +146,14 @@ private: class opengl_vbogeometrybank : public geometry_bank { public: -// methods: +// destructor ~opengl_vbogeometrybank() { delete_buffer(); } +// methods: + static + void + reset() { + m_activebuffer = 0; } private: // types: @@ -217,6 +247,12 @@ public: // draws geometry stored in specified chunk void draw( geometry_handle const &Geometry ); + template + void + draw( Iterator_ First, Iterator_ Last ) { + while( First != Last ) { + draw( *First ); + ++First; } } // provides direct access to vertex data of specfied chunk vertex_array const & vertices( geometry_handle const &Geometry ) const; diff --git a/parser.cpp b/parser.cpp index a9171bd3..4b71b7cd 100644 --- a/parser.cpp +++ b/parser.cpp @@ -30,6 +30,9 @@ cParser::cParser( std::string const &Stream, buffertype const Type, std::string // mComments.insert(commentmap::value_type("--","\n")); //Ra: to chyba nie używane // store to calculate sub-sequent includes from relative path mPath = Path; + if( Type == buffertype::buffer_FILE ) { + mFile = Stream; + } // reset pointers and attach proper type of buffer switch (Type) { @@ -263,8 +266,15 @@ std::size_t cParser::count() { return count - 1; } - void cParser::addCommentStyle( std::string const &Commentstart, std::string const &Commentend ) { mComments.insert( commentmap::value_type(Commentstart, Commentend) ); } + +// returns name of currently open file, or empty string for text type stream +std::string +cParser::Name() { + + if( mIncludeParser ) { return mIncludeParser->Name(); } + else { return mPath + mFile; } +} diff --git a/parser.h b/parser.h index 90fdfc6d..1212fcc5 100644 --- a/parser.h +++ b/parser.h @@ -85,19 +85,21 @@ class cParser //: public std::stringstream static std::size_t countTokens( std::string const &Stream, std::string Path = "" ); // add custom definition of text which should be ignored when retrieving tokens void addCommentStyle( std::string const &Commentstart, std::string const &Commentend ); + // returns name of currently open file, or empty string for text type stream + std::string Name(); private: // methods: std::string readToken(bool ToLower = true, const char *Break = "\n\r\t ;"); std::string readQuotes( char const Quote = '\"' ); std::string readComment( std::string const &Break = "\n\r\t ;" ); -// std::string trtest; bool findQuotes( std::string &String ); bool trimComments( std::string &String ); std::size_t count(); // members: bool LoadTraction; // load traction? std::istream *mStream; // relevant kind of buffer is attached on creation. + std::string mFile; // name of the open file, if any std::string mPath; // path to open stream, for relative path lookups. std::streamoff mSize; // size of open stream, for progress report. typedef std::map commentmap; diff --git a/renderer.cpp b/renderer.cpp index d5ab5fa1..242d29ae 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -39,7 +39,8 @@ opengl_camera::visible( TDynamicObject const *Dynamic ) const { static_cast( Dynamic->MoverParameters->Dim.L ), static_cast( Dynamic->MoverParameters->Dim.H ), static_cast( Dynamic->MoverParameters->Dim.W ) ); - float const radius = glm::length( diagonal ) * 0.5f; + // we're giving vehicles some extra padding, to allow for things like shared bogeys extending past the main body + float const radius = glm::length( diagonal ) * 0.65f; return ( m_frustum.sphere_inside( Dynamic->GetPosition(), radius ) > 0.0f ); } @@ -47,10 +48,7 @@ opengl_camera::visible( TDynamicObject const *Dynamic ) const { bool opengl_renderer::Init( GLFWwindow *Window ) { - if( false == Init_caps() ) { - - return false; - } + if( false == Init_caps() ) { return false; } m_window = Window; @@ -111,11 +109,21 @@ opengl_renderer::Init( GLFWwindow *Window ) { } // preload some common textures WriteLog( "Loading common gfx data..." ); - m_glaretextureid = GetTextureId( "fx\\lightglare", szTexturePath ); - m_suntextureid = GetTextureId( "fx\\sun", szTexturePath ); - m_moontextureid = GetTextureId( "fx\\moon", szTexturePath ); + m_glaretexture = GetTextureId( "fx\\lightglare", szTexturePath ); + m_suntexture = GetTextureId( "fx\\sun", szTexturePath ); + m_moontexture = GetTextureId( "fx\\moon", szTexturePath ); WriteLog( "...gfx data pre-loading done" ); - + // prepare basic geometry chunks + auto const geometrybank = m_geometry.create_bank(); + float const size = 2.5f; + m_billboardgeometry = m_geometry.create_chunk( + vertex_array{ + { { -size, size, 0.0f }, glm::vec3(), { 1.0f, 1.0f } }, + { { size, size, 0.0f }, glm::vec3(), { 0.0f, 1.0f } }, + { { -size, -size, 0.0f }, glm::vec3(), { 1.0f, 0.0f } }, + { { size, -size, 0.0f }, glm::vec3(), { 0.0f, 0.0f } } }, + geometrybank, + GL_TRIANGLE_STRIP ); // prepare debug mode objects m_quadric = gluNewQuadric(); gluQuadricNormals( m_quadric, GLU_FLAT ); @@ -157,6 +165,7 @@ opengl_renderer::Render() { // accumulate last 20 frames worth of render time (cap at 1000 fps to prevent calculations going awry) m_drawtime = std::max( 20.0f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - timestart ) ).count()); + m_drawcount = m_drawqueue.size(); } UILayer.render(); @@ -189,6 +198,10 @@ opengl_renderer::Render( world_environment *Environment ) { else { ::glDisable( GL_FOG ); } Environment->m_skydome.Render(); + if( true == Global::bUseVBO ) { + // skydome uses a custom vbo which could potentially confuse the main geometry system. hardly elegant but, eh + opengl_vbogeometrybank::reset(); + } Environment->m_stars.render(); float const duskfactor = 1.0f - clamp( std::abs( Environment->m_sun.getAngle() ), 0.0f, 12.0f ) / 12.0f; @@ -213,7 +226,7 @@ opengl_renderer::Render( world_environment *Environment ) { auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); // sun { - Bind( m_suntextureid ); + Bind( m_suntexture ); ::glColor4f( suncolor.x, suncolor.y, suncolor.z, 1.0f ); auto const sunvector = Environment->m_sun.getDirection(); auto const sunposition = modelview * glm::vec4( sunvector.x, sunvector.y, sunvector.z, 1.0f ); @@ -234,7 +247,7 @@ opengl_renderer::Render( world_environment *Environment ) { } // moon { - Bind( m_moontextureid ); + Bind( m_moontexture ); float3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, static_cast( 1.0 - Global::fLuminance * 0.5 ) ); @@ -412,7 +425,8 @@ opengl_renderer::Render( TGround *Ground ) { Global::FieldOfView / Global::ZoomFactor * std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ) ) ); - Ground->iRendered = 0; // ilość renderowanych sektorów + m_drawqueue.clear(); + Math3D::vector3 direction; for( k = 0; k < Global::iSegmentsRendered; ++k ) // sektory w kolejności odległości { // przerobione na użycie SectorOrder @@ -436,37 +450,14 @@ opengl_renderer::Render( TGround *Ground ) { if( ( tmp = Ground->FastGetSubRect( i + c, j + r ) ) != nullptr ) { if( tmp->iNodeCount ) { // o ile są jakieś obiekty, bo po co puste sektory przelatywać - Ground->pRendered[ Ground->iRendered++ ] = tmp; // tworzenie listy sektorów do renderowania + m_drawqueue.emplace_back( tmp ); } } } while( ( i < 0 ) || ( j < 0 ) ); // są 4 przypadki, oprócz i=j=0 } -/* - // dodać renderowanie terenu z E3D - jedno VBO jest używane dla całego modelu, chyba że jest ich więcej - if( Global::bUseVBO ) { - if( ( Global::pTerrainCompact != nullptr ) - && ( Global::pTerrainCompact->pModel != nullptr ) ) { -#ifdef EU07_USE_OLD_RENDERCODE - Global::pTerrainCompact->TerrainRenderVBO( TGroundRect::iFrameNumber ); -#endif - // TODO: remap geometry of terrain cells to allow camera-centric rendering - ::glPushMatrix(); - ::glTranslated( -Global::pCameraPosition.x, -Global::pCameraPosition.y, -Global::pCameraPosition.z ); - TSubModel *submodel = Global::pTerrainCompact->pModel->Root; - while( submodel != nullptr ) { - if( submodel->iVisible == TGroundRect::iFrameNumber ) { - // tylko jeśli ma być widoczny w danej ramce (problem dla 0==false) - Render( submodel ); // sub kolejne (Next) się nie wyrenderują - } - submodel = submodel->NextGet(); - } - ::glPopMatrix(); - } - } -*/ - // renderowanie nieprzezroczystych - for( i = 0; i < Ground->iRendered; ++i ) { - Render( Ground->pRendered[ i ] ); + + for( auto subcell : m_drawqueue ) { + Render( subcell ); } // regular render takes care of all solid geometry present in the scene, thus we can launch alpha parts render here return Render_Alpha( Ground ); @@ -478,69 +469,23 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { bool result { false }; // will be true if we do any rendering - // TODO: unify render paths - if( Global::bUseVBO ) { + if( Groundcell->iLastDisplay != Groundcell->iFrameNumber ) { + // tylko jezeli dany kwadrat nie był jeszcze renderowany + Groundcell->LoadNodes(); // ewentualne tworzenie siatek - if ( Groundcell->iLastDisplay != Groundcell->iFrameNumber) { - // tylko jezeli dany kwadrat nie był jeszcze renderowany - Groundcell->LoadNodes(); // ewentualne tworzenie siatek - - if( ( Groundcell->nRenderRect != nullptr ) - && ( true == Groundcell->StartVBO() ) ) { - // nieprzezroczyste trójkąty kwadratu kilometrowego - for( TGroundNode *node = Groundcell->nRenderRect; node; node = node->nNext3 ) { - Render( node ); - } - Groundcell->EndVBO(); + if( Groundcell->nRenderRect != nullptr ) { + // nieprzezroczyste trójkąty kwadratu kilometrowego + for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { + Render( node ); } - if( Groundcell->nTerrain ) { - - Render( Groundcell->nTerrain ); - } - Groundcell->iLastDisplay = Groundcell->iFrameNumber; // drugi raz nie potrzeba - result = true; } + if( Groundcell->nTerrain ) { + + Render( Groundcell->nTerrain ); + } + Groundcell->iLastDisplay = Groundcell->iFrameNumber; // drugi raz nie potrzeba + result = true; } - else { - // display list render path - ::glPushMatrix(); - auto const &cellorigin = Groundcell->m_area.center; - // TODO: unify all math objects - auto const originoffset = Math3D::vector3( cellorigin.x, cellorigin.y, cellorigin.z ) - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - if (Groundcell->iLastDisplay != Groundcell->iFrameNumber) - { // tylko jezeli dany kwadrat nie był jeszcze renderowany - // for (TGroundNode* node=pRender;node;node=node->pNext3) - // node->Render(); //nieprzezroczyste trójkąty kwadratu kilometrowego - if ( Groundcell->nRender) - { //łączenie trójkątów w jedną listę - trochę wioska - if (!Groundcell->nRender->DisplayListID || ( Groundcell->nRender->iVersion != Global::iReCompile)) - { // jeżeli nie skompilowany, kompilujemy wszystkie trójkąty w jeden - Groundcell->nRender->fSquareRadius = 5000.0 * 5000.0; // aby agregat nigdy nie znikał - Groundcell->nRender->DisplayListID = glGenLists(1); - glNewList( Groundcell->nRender->DisplayListID, GL_COMPILE); - Groundcell->nRender->iVersion = Global::iReCompile; // aktualna wersja siatek - auto const origin = glm::dvec3( Groundcell->m_area.center ); - for (TGroundNode *node = Groundcell->nRender; node; node = node->nNext3) // następny tej grupy - node->Compile(origin, true); - glEndList(); - } - Render( Groundcell->nRender ); // nieprzezroczyste trójkąty kwadratu kilometrowego - } - // submodels geometry is world-centric, so at least for the time being we need to pop the stack early - ::glPopMatrix(); - - if( Groundcell->nTerrain ) { Render( Groundcell->nTerrain ); } - - Groundcell->iLastDisplay = Groundcell->iFrameNumber; // drugi raz nie potrzeba - result = true; - } - else { - ::glPopMatrix(); - } - } - return result; } @@ -551,32 +496,21 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { TGroundNode *node; // nieprzezroczyste obiekty terenu - if( Global::bUseVBO ) { - // vbo render path - if( Groundsubcell->StartVBO() ) { - for( node = Groundsubcell->nRenderRect; node; node = node->nNext3 ) { - if( node->iVboPtr >= 0 ) { - Render( node ); - } - } - Groundsubcell->EndVBO(); - } - } - else { - // display list render path - for( node = Groundsubcell->nRenderRect; node; node = node->nNext3 ) { - Render( node ); // nieprzezroczyste obiekty terenu - } + for( node = Groundsubcell->nRenderRect; node != nullptr; node = node->nNext3 ) { + Render( node ); } // nieprzezroczyste obiekty (oprócz pojazdów) - for( node = Groundsubcell->nRender; node; node = node->nNext3 ) + for( node = Groundsubcell->nRender; node != nullptr; node = node->nNext3 ) { Render( node ); + } // nieprzezroczyste z mieszanych modeli - for( node = Groundsubcell->nRenderMixed; node; node = node->nNext3 ) + for( node = Groundsubcell->nRenderMixed; node != nullptr; node = node->nNext3 ) { Render( node ); + } // nieprzezroczyste fragmenty pojazdów na torach - for( int j = 0; j < Groundsubcell->iTracks; ++j ) + for( int j = 0; j < Groundsubcell->iTracks; ++j ) { Groundsubcell->tTracks[ j ]->RenderDyn(); + } #ifdef EU07_SCENERY_EDITOR // memcells if( DebugModeFlag ) { @@ -590,9 +524,9 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { bool opengl_renderer::Render( TGroundNode *Node ) { - +/* Node->SetLastUsage( Timer::GetSimulationTime() ); - +*/ switch (Node->iType) { // obiekty renderowane niezależnie od odległości case TP_SUBMODEL: @@ -611,96 +545,58 @@ opengl_renderer::Render( TGroundNode *Node ) { return false; } - switch (Node->iType) - { - case TP_TRACK: { + switch (Node->iType) { - if( Global::bUseVBO && ( Node->iNumVerts <= 0 ) ) { - return false; - } + case TP_TRACK: { // setup ::glPushMatrix(); auto const originoffset = Node->m_rootposition - Global::pCameraPosition; ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - // TODO: unify the render code after generic buffers are in place - if( Global::bUseVBO ) { - // vbo render path - Node->pTrack->RaRenderVBO( Node->iVboPtr ); - } - else { - // display list render path - Node->pTrack->Render(); - } + // render + Render( Node->pTrack ); // post-render cleanup ::glPopMatrix(); return true; } + case TP_MODEL: { Node->Model->Render( Node->pCenter - Global::pCameraPosition ); return true; } - case TP_MEMCELL: { - GfxRenderer.Render( Node->MemCell ); - return true; - } - } - // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 - if( ( Node->iFlags & 0x10 ) - || ( Node->fLineThickness < 0 ) ) { - // TODO: unify the render code after generic buffers are in place - if( false == Global::bUseVBO ) { - // additional setup for display lists - if( ( Node->DisplayListID == 0 ) - || ( Node->iVersion != Global::iReCompile ) ) { // Ra: wymuszenie rekompilacji - Node->Compile(Node->m_rootposition); - if( Global::bManageNodes ) - ResourceManager::Register( Node ); - }; - } - - if( ( Node->iType == GL_LINES ) - || ( Node->iType == GL_LINE_STRIP ) - || ( Node->iType == GL_LINE_LOOP ) ) { - // wszelkie linie są rysowane na samym końcu - if( Node->iNumPts ) { - // setup - // w zaleznosci od koloru swiatla - ::glColor4fv( - glm::value_ptr( - glm::vec4( - Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), - std::min( - 1.0, - 1000.0 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ) ); - - GfxRenderer.Bind( 0 ); - - // render - // TODO: unify the render code after generic buffers are in place - if( Global::bUseVBO ) { - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumPts ); - ::glPopMatrix(); - } - else { - ::glCallList( Node->DisplayListID ); - } - // post-render cleanup - return true; - } - else { + case GL_LINES: { + if( ( Node->m_geometry == NULL ) + || ( Node->fLineThickness > 0.0 ) ) { return false; } + // setup + // w zaleznosci od koloru swiatla + ::glColor4fv( + glm::value_ptr( + glm::vec4( + Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), + std::min( + 1.0, + 1000.0 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ) ); + + GfxRenderer.Bind( 0 ); + + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + // render + m_geometry.draw( Node->m_geometry ); + + // post-render cleanup + ::glPopMatrix(); + + return true; } - else { - // GL_TRIANGLE etc - if( ( Global::bUseVBO ? - Node->iVboPtr < 0 : - Node->DisplayListID == 0 ) ) { + + case GL_TRIANGLES: { + if( ( Node->m_geometry == NULL ) + || ( ( Node->iFlags & 0x10 ) == 0 ) ) { return false; } // setup @@ -708,23 +604,25 @@ opengl_renderer::Render( TGroundNode *Node ) { Bind( Node->TextureID ); + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // render - // TODO: unify the render code after generic buffers are in place - if( Global::bUseVBO ) { - // vbo render path - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumVerts ); - ::glPopMatrix(); - } - else { - // display list render path - ::glCallList( Node->DisplayListID ); - } + m_geometry.draw( Node->m_geometry ); + // post-render cleanup + ::glPopMatrix(); + return true; } + + case TP_MEMCELL: { + Render( Node->MemCell ); + return true; + } + + default: { break; } } // in theory we shouldn't ever get here but, eh return false; @@ -946,7 +844,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glDisableClientState( GL_NORMAL_ARRAY ); ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); ::glEnableClientState( GL_COLOR_ARRAY ); - ::glColorPointer( 3, GL_FLOAT, sizeof( CVertNormTex ), static_cast( nullptr ) + 12 ); // kolory + ::glColorPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 12 ); // kolory ::glDrawArrays( GL_POINTS, Submodel->iVboPtr, Submodel->iNumVerts ); @@ -978,6 +876,28 @@ opengl_renderer::Render( TSubModel *Submodel ) { Render( Submodel->Next ); // dalsze rekurencyjnie } +void +opengl_renderer::Render( TTrack *Track ) { + + if( ( Track->TextureID1 == 0 ) + && ( Track->TextureID2 == 0 ) ) { + return; + } + + Track->EnvironmentSet(); + + if( Track->TextureID1 != 0 ) { + Bind( Track->TextureID1 ); + m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); + } + if( Track->TextureID2 != 0 ) { + Bind( Track->TextureID2 ); + m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); + } + + Track->EnvironmentReset(); +} + void opengl_renderer::Render( TMemCell *Memcell ) { @@ -999,7 +919,6 @@ opengl_renderer::Render( TMemCell *Memcell ) { bool opengl_renderer::Render_Alpha( TGround *Ground ) { - // legacy version of the code: ::glEnable( GL_BLEND ); ::glAlphaFunc( GL_GREATER, 0.04f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f ::glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); @@ -1007,54 +926,30 @@ opengl_renderer::Render_Alpha( TGround *Ground ) { TGroundNode *node; TSubRect *tmp; // Ra: renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - for( int i = Ground->iRendered - 1; i >= 0; --i ) // od najdalszych - { // przezroczyste trójkąty w oddzielnym cyklu przed modelami - tmp = Ground->pRendered[ i ]; - if( Global::bUseVBO ) { - // vbo render path - if( tmp->StartVBO() ) { - for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { - if( node->iVboPtr >= 0 ) { - Render_Alpha( node ); - } - } - tmp->EndVBO(); - } - } - else { - // display list render path - for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { - Render_Alpha( node ); - } + for( auto subcell = std::rbegin( m_drawqueue ); subcell != std::rend( m_drawqueue ); ++subcell ) { + // przezroczyste trójkąty w oddzielnym cyklu przed modelami + tmp = *subcell; + for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { + Render_Alpha( node ); } } - for( int i = Ground->iRendered - 1; i >= 0; --i ) // od najdalszych + for( auto subcell = std::rbegin( m_drawqueue ); subcell != std::rend( m_drawqueue ); ++subcell ) { // renderowanie przezroczystych modeli oraz pojazdów - Render_Alpha( Ground->pRendered[ i ] ); + Render_Alpha( *subcell ); } ::glDisable( GL_LIGHTING ); // linie nie powinny świecić - for( int i = Ground->iRendered - 1; i >= 0; --i ) // od najdalszych - { // druty na końcu, żeby się nie robiły białe plamy na tle lasu - tmp = Ground->pRendered[ i ]; - if( Global::bUseVBO ) { - // vbo render path - if( tmp->StartVBO() ) { - for( node = tmp->nRenderWires; node; node = node->nNext3 ) { - Render_Alpha( node ); - } - tmp->EndVBO(); - } - } - else { - // display list render path - for( node = tmp->nRenderWires; node; node = node->nNext3 ) { - Render_Alpha( node ); // druty - } + for( auto subcell = std::rbegin( m_drawqueue ); subcell != std::rend( m_drawqueue ); ++subcell ) { + // druty na końcu, żeby się nie robiły białe plamy na tle lasu + tmp = *subcell; + for( node = tmp->nRenderWires; node; node = node->nNext3 ) { + Render_Alpha( node ); } } + ::glEnable( GL_LIGHTING ); + return true; } @@ -1091,9 +986,9 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // pozniej sprawdzamy czy jest wlaczony PROBLEND dla aktualnie renderowanego noda TRIANGLE, // wlasciwie dla kazdego node'a // i jezeli tak to odpowiedni GL_GREATER w przeciwnym wypadku standardowy 0.04 - +/* Node->SetLastUsage( Timer::GetSimulationTime() ); - +*/ double const distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { @@ -1103,7 +998,6 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { switch (Node->iType) { case TP_TRACTION: { - // TODO: unify the render code after generic buffers are in place if( Node->bVisible ) { // rysuj jesli sa druty i nie zerwana if( ( Node->hvTraction->Wires == 0 ) @@ -1111,11 +1005,6 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { return false; } // setup - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - Bind( NULL ); if( !Global::bSmoothTraction ) { // na liniach kiepsko wygląda - robi gradient ::glDisable( GL_LINE_SMOOTH ); @@ -1129,16 +1018,23 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { auto const color { Node->hvTraction->wire_color() }; ::glColor4f( color.r, color.g, color.b, linealpha ); + Bind( NULL ); + + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // render m_geometry.draw( Node->hvTraction->m_geometry ); // post-render cleanup + ::glPopMatrix(); + ::glLineWidth( 1.0 ); if( !Global::bSmoothTraction ) { ::glEnable( GL_LINE_SMOOTH ); } - ::glPopMatrix(); return true; } else { @@ -1149,102 +1045,75 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { Node->Model->RenderAlpha( Node->pCenter - Global::pCameraPosition ); return true; } - } - // TODO: sprawdzic czy jest potrzebny warunek fLineThickness < 0 - if( ( Node->iNumVerts && ( Node->iFlags & 0x20 ) ) - || ( Node->iNumPts && ( Node->fLineThickness > 0 ) ) ) { - -#ifdef _PROBLEND - if( ( Node->PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 - { - ::glDisable( GL_BLEND ); - ::glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - }; -#endif - // TODO: unify the render code after generic buffers are in place - if( false == Global::bUseVBO ) { - // additional setup for display lists - if( ( Node->DisplayListID == 0 ) - || ( Node->iVersion != Global::iReCompile ) ) { // Ra: wymuszenie rekompilacji - Node->Compile(Node->m_rootposition); - if( Global::bManageNodes ) - ResourceManager::Register( Node ); - }; - } - - bool result( false ); - - if( ( Node->iType == GL_LINES ) - || ( Node->iType == GL_LINE_STRIP ) - || ( Node->iType == GL_LINE_LOOP ) ) { - // wszelkie linie są rysowane na samym końcu - if( Node->iNumPts ) { - // setup - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - // w zaleznosci od koloru swiatla - ::glColor4fv( - glm::value_ptr( - glm::vec4( - Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), - std::min( - 1.0, - 1000.0 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ) ); - - GfxRenderer.Bind( 0 ); - - // render - // TODO: unify the render code after generic buffers are in place - if( Global::bUseVBO ) { - ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumPts ); - } - else { - ::glCallList( Node->DisplayListID ); - } - // post-render cleanup - ::glPopMatrix(); - result = true; + case GL_LINES: { + if( ( Node->m_geometry == NULL ) + || ( Node->fLineThickness < 0.0 ) ) { + return false; } - } - else { - // GL_TRIANGLE etc // setup + // w zaleznosci od koloru swiatla + ::glColor4fv( + glm::value_ptr( + glm::vec4( + Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), + std::min( + 1.0, + 1000.0 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ) ); + + GfxRenderer.Bind( 0 ); + ::glPushMatrix(); auto const originoffset = Node->m_rootposition - Global::pCameraPosition; ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // render + m_geometry.draw( Node->m_geometry ); + + // post-render cleanup + ::glPopMatrix(); + + return true; + } + + case GL_TRIANGLES: { + if( ( Node->m_geometry == NULL ) + || ( ( Node->iFlags & 0x20 ) == 0 ) ) { + return false; + } + // setup +#ifdef _PROBLEND + if( ( Node->PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 + { + ::glDisable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f + }; +#endif ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); Bind( Node->TextureID ); + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // render - // TODO: unify the render code after generic buffers are in place - if( Global::bUseVBO ) { - // vbo render path - if( Node->iVboPtr >= 0 ) { - ::glDrawArrays( Node->iType, Node->iVboPtr, Node->iNumVerts ); - result = true; - } - } - else { - // display list render path - ::glCallList( Node->DisplayListID ); - result = true; - } + m_geometry.draw( Node->m_geometry ); + // post-render cleanup ::glPopMatrix(); - } #ifdef _PROBLEND - if( ( Node->PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 - { - ::glEnable( GL_BLEND ); - ::glAlphaFunc( GL_GREATER, 0.04f ); - } + if( ( Node->PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 + { + ::glEnable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.04f ); + } #endif - return result; + return true; + } + + default: { break; } } // in theory we shouldn't ever get here but, eh return false; @@ -1253,10 +1122,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { bool opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { - if( false == Dynamic->renderme ) { - - return false; - } + if( false == Dynamic->renderme ) { return false; } // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji @@ -1426,10 +1292,10 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { glarelevel = std::max( 0.0f, glarelevel - static_cast(Global::fLuminance) ); if( glarelevel > 0.0f ) { - + // setup ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); - Bind( m_glaretextureid ); + Bind( m_glaretexture ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], glarelevel ); ::glDisable( GL_LIGHTING ); ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); @@ -1437,15 +1303,10 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { ::glPushMatrix(); ::glLoadIdentity(); // macierz jedynkowa ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian - ::glRotated( atan2( lightcenter.x, lightcenter.z ) * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // jedynie obracamy w pionie o kąt + ::glRotated( std::atan2( lightcenter.x, lightcenter.z ) * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // jedynie obracamy w pionie o kąt - // TODO: turn the drawing instructions into a compiled call / array - ::glBegin( GL_TRIANGLE_STRIP ); - float const size = 2.5f; - ::glTexCoord2f( 1.0f, 1.0f ); ::glVertex3f( -size, size, 0.0f ); - ::glTexCoord2f( 0.0f, 1.0f ); ::glVertex3f( size, size, 0.0f ); - ::glTexCoord2f( 1.0f, 0.0f ); ::glVertex3f( -size, -size, 0.0f ); - ::glTexCoord2f( 0.0f, 0.0f ); ::glVertex3f( size, -size, 0.0f ); + // main draw call + m_geometry.draw( m_billboardgeometry ); /* // NOTE: we could do simply... vec3 vertexPosition_worldspace = @@ -1454,8 +1315,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { + CameraUp_worldspace * squareVertices.y * BillboardSize.y; // ...etc instead IF we had easy access to camera's forward and right vectors. TODO: check if Camera matrix is accessible */ - ::glEnd(); - + // post-render cleanup ::glPopMatrix(); ::glPopAttrib(); } @@ -1557,8 +1417,12 @@ opengl_renderer::Update ( double const Deltatime ) { } // TODO: add garbage collection and other less frequent works here - if( DebugModeFlag ) + if( true == DebugModeFlag ) { m_debuginfo = m_textures.info(); + } + else { + m_debuginfo.clear(); + } }; // debug performance string diff --git a/renderer.h b/renderer.h index 19e31d55..a1420e25 100644 --- a/renderer.h +++ b/renderer.h @@ -172,6 +172,7 @@ public: // members GLenum static const sunlight{ GL_LIGHT0 }; + std::size_t m_drawcount { 0 }; private: // types @@ -194,6 +195,8 @@ private: Render( TSubRect *Groundsubcell ); bool Render( TGroundNode *Node ); + void + Render( TTrack *Track ); void Render( TMemCell *Memcell ); bool @@ -212,16 +215,18 @@ private: geometrybank_manager m_geometry; texture_manager m_textures; opengl_camera m_camera; - rendermode renderpass{ rendermode::color }; - float m_drawrange{ 2500.0f }; // current drawing range - float m_drawtime{ 1000.0f / 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps - double m_updateaccumulator{ 0.0 }; + rendermode renderpass { rendermode::color }; + float m_drawrange { 2500.0f }; // current drawing range + float m_drawtime { 1000.0f / 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps + double m_updateaccumulator { 0.0 }; std::string m_debuginfo; - GLFWwindow *m_window{ nullptr }; - texture_handle m_glaretextureid{ -1 }; - texture_handle m_suntextureid{ -1 }; - texture_handle m_moontextureid{ -1 }; + GLFWwindow *m_window { nullptr }; + texture_handle m_glaretexture { -1 }; + texture_handle m_suntexture { -1 }; + texture_handle m_moontexture { -1 }; + geometry_handle m_billboardgeometry { 0, 0 }; GLUquadricObj *m_quadric; // helper object for drawing debug mode scene elements + std::vector< TSubRect* > m_drawqueue; // list of subcells to be drawn in current render pass }; From d87848ef9b59d98dc460aa0907fa6eb80cd7da08 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 13 Jun 2017 20:04:31 +0200 Subject: [PATCH 125/426] post-merge cleanup --- Ground.cpp | 85 ++---- Ground.h | 4 +- Model3d.cpp | 20 +- Track.cpp | 670 ------------------------------------------- Track.h | 6 +- openglgeometrybank.h | 3 +- version.h | 2 +- 7 files changed, 28 insertions(+), 762 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index 218b218f..bff36c80 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -70,31 +70,17 @@ TGroundNode::TGroundNode() iType = GL_POINTS; Vertices = NULL; nNext = nNext2 = NULL; -/* - pCenter = vector3(0, 0, 0); -*/ iCount = 0; // wierzchołków w trójkącie // iNumPts=0; //punktów w linii TextureID = 0; iFlags = 0; // tryb przezroczystości nie zbadany - DisplayListID = 0; Pointer = NULL; // zerowanie wskaźnika kontekstowego bVisible = false; // czy widoczny fSquareRadius = 10000 * 10000; fSquareMinRadius = 0; asName = ""; fLineThickness=1.0; //mm dla linii -/* - for (int i = 0; i < 3; i++) - { - Ambient[i] = Global::whiteLight[i] * 255; - Diffuse[i] = Global::whiteLight[i] * 255; - Specular[i] = Global::noLight[i] * 255; - } -*/ nNext3 = NULL; // nie wyświetla innych - iVboPtr = -1; // indeks w VBO sektora (-1: nie używa VBO) - iVersion = 0; // wersja siatki } TGroundNode::~TGroundNode() @@ -182,7 +168,7 @@ void TGroundNode::InitNormals() glm::dvec3 v1, v2, v3, v4, v5; glm::vec3 n1, n2, n3, n4; glm::vec2 t1; - std::size_t i; + int i; switch (iType) { case GL_TRIANGLE_STRIP: @@ -246,14 +232,7 @@ void TGroundNode::InitNormals() break; } } -/* -void TGroundNode::Release() -{ - if (DisplayListID) - glDeleteLists(DisplayListID, 1); - DisplayListID = 0; -}; -*/ + void TGroundNode::RenderHidden() { // renderowanie obiektów niewidocznych double mgn = SquareMagnitude(pCenter - Global::pCameraPosition); @@ -285,10 +264,6 @@ void TGroundNode::RenderHidden() //------------------------------------------------------------------------------ TSubRect::~TSubRect() { -/* - if (Global::bManageNodes) // Ra: tu się coś sypie - ResourceManager::Unregister(this); // wyrejestrowanie ze sprzątacza -*/ // TODO: usunąć obiekty z listy (nRootMesh), bo są one tworzone dla sektora delete[] tTracks; } @@ -477,7 +452,7 @@ void TSubRect::LoadNodes() { switch (node->iType) { case GL_TRIANGLES: { vertex_array vertices; - for( std::size_t idx = 0; idx < node->iNumVerts; ++idx ) { + for( int idx = 0; idx < node->iNumVerts; ++idx ) { vertices.emplace_back( node->Vertices[ idx ].position - node->m_rootposition, node->Vertices[ idx ].normal, @@ -490,7 +465,7 @@ void TSubRect::LoadNodes() { } case GL_LINES: { vertex_array vertices; - for( std::size_t idx = 0; idx < node->iNumPts; ++idx ) { + for( int idx = 0; idx < node->iNumPts; ++idx ) { vertices.emplace_back( node->Points[ idx ] - node->m_rootposition, glm::vec3(), @@ -513,16 +488,8 @@ void TSubRect::LoadNodes() { } node = node->nNext2; // następny z sektora } -/* - if (Global::bManageNodes) - ResourceManager::Register(this); // dodanie do automatu zwalniającego pamięć -*/ } -/* -void TSubRect::Release() -{ // wirtualne zwolnienie zasobów przez sprzątacz albo destruktor -}; -*/ + void TSubRect::RenderSounds() { // aktualizacja dźwięków w pojazdach sektora (sektor może nie być wyświetlany) for (int j = 0; j < iTracks; ++j) @@ -575,9 +542,6 @@ TGround::TGround() nRootOfType[ i ] = nullptr; // zerowanie tablic wyszukiwania } ::SecureZeroMemory( TempConnectionType, sizeof( TempConnectionType ) ); -/* - ::SecureZeroMemory( pRendered, sizeof( pRendered ) ); -*/ // set bounding area information for ground rectangles float const rectsize = 1000.0f; glm::vec3 const worldcenter; @@ -780,14 +744,6 @@ void TGround::RaTriangleDivider(TGroundNode *node) ntri->Init(3); ntri->TextureID = node->TextureID; ntri->iFlags = node->iFlags; -/* - for (int j = 0; j < 4; ++j) - { - ntri->Ambient[j] = node->Ambient[j]; - ntri->Diffuse[j] = node->Diffuse[j]; - ntri->Specular[j] = node->Specular[j]; - } -*/ ntri->Ambient = node->Ambient; ntri->Diffuse = node->Diffuse; ntri->Specular = node->Specular; @@ -1256,7 +1212,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->nNode[0].iType = TP_MODEL; // pierwszy zawiera model (dla delete) tmp->nNode[0].Model = Global::pTerrainCompact; tmp->nNode[0].iFlags = 0x200; // nie wyświetlany, ale usuwany - for (std::size_t i = 1; i < tmp->iCount; ++i) + for (int i = 1; i < tmp->iCount; ++i) { // a reszta to submodele tmp->nNode[i].iType = TP_SUBMODEL; // tmp->nNode[i].smTerrain = Global::pTerrainCompact->TerrainSquare(i - 1); @@ -2073,7 +2029,7 @@ bool TGround::Init(std::string File) bool TGround::InitEvents() { //łączenie eventów z pozostałymi obiektami TGroundNode *tmp, *trk; - char buff[255]; + char buff[ 255 ]; std::string cellastext; int i; for (TEvent *Current = RootEvent; Current; Current = Current->evNext2) { @@ -2166,19 +2122,16 @@ bool TGround::InitEvents() else ErrorLog("Bad copyvalues: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\""); - strcpy( - buff, - Current->Params[9].asText); // skopiowanie nazwy drugiej komórki do bufora roboczego + cellastext = Current->Params[ 9 ].asText; SafeDeleteArray(Current->Params[9].asText); // usunięcie nazwy komórki - tmp = FindGroundNode(buff, TP_MEMCELL); // komórka źódłowa - if (tmp) - { + tmp = FindGroundNode( cellastext, TP_MEMCELL); // komórka źódłowa + if (tmp != nullptr ) { Current->Params[8].nGroundNode = tmp; Current->Params[9].asMemCell = tmp->MemCell; // komórka źródłowa } else ErrorLog("Bad copyvalues: event \"" + Current->asName + - "\" cannot find memcell \"" + buff + "\""); + "\" cannot find memcell \"" + cellastext + "\""); break; case tp_Animation: // animacja modelu tmp = FindGroundNode(Current->asNodeName, TP_MODEL); // egzemplarza modelu do animowania @@ -4024,13 +3977,17 @@ void TGround::DynamicRemove(TDynamicObject *dyn) }; //--------------------------------------------------------------------------- + void TGround::TerrainRead(std::string const &f){ // Ra: wczytanie trójkątów terenu z pliku E3D }; //--------------------------------------------------------------------------- + void TGround::TerrainWrite() { // Ra: zapisywanie trójkątów terenu do pliku E3D + // TODO: re-implement +/* if (Global::pTerrainCompact->TerrainLoaded()) return; // jeśli zostało wczytane, to nie ma co dalej robić if (Global::asTerrainModel.empty()) @@ -4092,16 +4049,6 @@ void TGround::TerrainWrite() ver[ k ].position = Current->Vertices[ k ].position; ver[ k ].normal = Current->Vertices[ k ].normal; ver[ k ].texture = Current->Vertices[ k ].texture; -/* - ver[k].position.x = Current->Vertices[k].position.x; - ver[k].position.y = Current->Vertices[k].position.y; - ver[k].position.z = Current->Vertices[k].position.z; - ver[k].normal.x = Current->Vertices[k].normal.x; - ver[k].normal.y = Current->Vertices[k].normal.y; - ver[k].normal.z = Current->Vertices[k].normal.z; - ver[k].texture.s = Current->Vertices[k].tu; - ver[k].texture.t = Current->Vertices[k].tv; -*/ } break; case GL_TRIANGLE_STRIP: // na razie nie, bo trzeba przerabiać na pojedyncze trójkąty @@ -4111,7 +4058,9 @@ void TGround::TerrainWrite() } } m->SaveToBinFile(strdup(("models\\" + Global::asTerrainModel).c_str())); +*/ }; + //--------------------------------------------------------------------------- void TGround::TrackBusyList() diff --git a/Ground.h b/Ground.h index 966555a8..c3773de0 100644 --- a/Ground.h +++ b/Ground.h @@ -139,9 +139,6 @@ public: int iNumPts; // dla linii int iCount; // dla terenu }; - int iVersion; // wersja siatki (do wykonania rekompilacji) - GLuint DisplayListID; // numer siatki DisplayLists - int iVboPtr; // indeks w buforze VBO // NOTE: geometry handle is duplicated in (anim)model(3d), as well as in track and traction type nodes // TODO: clean this up when node types are refactored into an inheritance/composition scheme geometry_handle m_geometry; // geometry of the submodel @@ -273,6 +270,7 @@ class TGround TEvent *RootEvent = nullptr; // lista zdarzeń TEvent *QueryRootEvent = nullptr, *tmpEvent = nullptr; +/* TSubRect *pRendered[1500]; // lista renderowanych sektorów */ int iNumNodes = 0; diff --git a/Model3d.cpp b/Model3d.cpp index 7f13e17f..40db9adf 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -187,18 +187,8 @@ inline void readColor(cParser &parser, glm::vec4 &color) >> color.g >> color.b; color /= 255.0f; -/* - color = r + (g << 8) + (b << 16); -*/ }; -/* -inline void readMatrix(cParser& parser,matrix4x4& matrix) -{//Ra: wczytanie transforma -for (int x=0;x<=3;x++) //wiersze -for (int y=0;y<=3;y++) //kolumny -parser.getToken(matrix(x)[y]); -}; -*/ + inline void readMatrix(cParser &parser, float4x4 &matrix) { // Ra: wczytanie transforma parser.getTokens(16, false); @@ -597,8 +587,7 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) }; int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) -{ // dodanie trójkątów do submodelu, używane - // przy tworzeniu E3D terenu +{ // dodanie trójkątów do submodelu, używane przy tworzeniu E3D terenu TSubModel *s = this; while (s ? (s->TextureID != tex) : false) { // szukanie submodelu o danej teksturze @@ -616,7 +605,7 @@ int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) s = new TSubModel(); m->AddTo(this, s); } - s->TextureNameSet(GfxRenderer.Texture(tex).name.c_str()); + s->TextureNameSet(GfxRenderer.Texture(tex).name); s->TextureID = tex; s->eType = GL_TRIANGLES; } @@ -628,8 +617,7 @@ int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) }; basic_vertex *TSubModel::TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ) -{ // zwraca wskaźnik do wypełnienia tabeli wierzchołków, używane - // przy tworzeniu E3D terenu +{ // zwraca wskaźnik do wypełnienia tabeli wierzchołków, używane przy tworzeniu E3D terenu TSubModel *s = this; while (s ? s->TextureID != tex : false) { // szukanie submodelu o danej teksturze diff --git a/Track.cpp b/Track.cpp index 67ffdc63..2f58097d 100644 --- a/Track.cpp +++ b/Track.cpp @@ -202,9 +202,6 @@ TTrack * TTrack::Create400m(int what, double dx) TSubRect *r = Global::pGround->GetSubRect(tmp->pCenter.x, tmp->pCenter.z); r->NodeAdd(tmp); // dodanie toru do segmentu r->Sort(); //żeby wyświetlał tabor z dodanego toru -/* - r->Release(); // usunięcie skompilowanych zasobów -*/ return trk; }; @@ -314,9 +311,6 @@ TTrack * TTrack::NullCreate(int dir) if (tmp2) r->NodeAdd(tmp2); // drugiego też r->Sort(); //żeby wyświetlał tabor z dodanego toru -/* - r->Release(); // usunięcie skompilowanych zasobów -*/ return trk; }; @@ -1026,652 +1020,7 @@ const vector6 iglica[nnumPts] = // iglica - vextor3(x,y,mapowanie tekstury) vector6(-0.040, -0.180, 1.00, -1.000, 0.000, 0.000) // 1mm więcej, żeby nie nachodziły tekstury? }; -/* -void TTrack::Compile(GLuint tex) -{ - basic_vertex *immediate{ nullptr }; - - // generowanie treści dla Display Lists - model proceduralny - if (!tex) - { // jeśli nie podana tekstura, to każdy tor ma wlasne DL - if (DisplayListID) - Release(); // zwolnienie zasobów w celu ponownego utworzenia - if (Global::bManageNodes) - { - DisplayListID = glGenLists(1); // otwarcie nowej listy - glNewList(DisplayListID, GL_COMPILE); - }; - } - glColor3f(1.0f, 1.0f, 1.0f); // to tutaj potrzebne? - // Ra: nie zmieniamy oświetlenia przy kompilowaniu, ponieważ ono się zmienia w czasie! - // trochę podliczonych zmiennych, co się potem przydadzą - double fHTW = 0.5 * fabs(fTrackWidth); // połowa szerokości - double side = fabs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza - double slop = fabs(fTexSlope); // szerokość pochylenia - double rozp = fHTW + side + slop; // brzeg zewnętrzny - double hypot1 = hypot(slop, fTexHeight1); // rozmiar pochylenia do liczenia normalnych - if (hypot1 == 0.0) - hypot1 = 1.0; - vector3 normal1 = vector3(fTexSlope / hypot1, fTexHeight1 / hypot1, 0.0); // wektor normalny - double fHTW2, side2, slop2, rozp2, fTexHeight2, hypot2; - vector3 normal2; - if (iTrapezoid & 2) // ten bit oznacza, że istnieje odpowiednie pNext - { // Ra: jest OK - fHTW2 = 0.5 * fabs(trNext->fTrackWidth); // połowa rozstawu/nawierzchni - side2 = fabs(trNext->fTexWidth); - slop2 = fabs(trNext->fTexSlope); - rozp2 = fHTW2 + side2 + slop2; // szerokość podstawy - fTexHeight2 = trNext->fTexHeight1; - hypot2 = hypot(slop2, fTexHeight2); - if (hypot2 == 0.0) - hypot2 = 1.0; - normal2 = vector3(trNext->fTexSlope / hypot2, fTexHeight2 / hypot2, 0.0); - } - else // gdy nie ma następnego albo jest nieodpowiednim końcem podpięty - { - fHTW2 = fHTW; - side2 = side; - slop2 = slop; - rozp2 = rozp; - fTexHeight2 = fTexHeight1; - hypot2 = hypot1; - normal2 = normal1; - } - auto const origin { pMyNode->m_rootposition }; - - double roll1, roll2; - switch (iCategoryFlag & 15) - { - case 1: // tor - { - Segment->GetRolls(roll1, roll2); - double sin1 = sin(roll1), cos1 = cos(roll1), sin2 = sin(roll2), cos2 = cos(roll2); - // zwykla szyna: //Ra: czemu główki są asymetryczne na wysokości 0.140? - vector6 rpts1[24], rpts2[24], rpts3[24], rpts4[24]; - int i; - for (i = 0; i < 12; ++i) - { - rpts1[i] = - vector6( - (fHTW + szyna[i].x) * cos1 + szyna[i].y * sin1, - -(fHTW + szyna[i].x) * sin1 + szyna[i].y * cos1, - szyna[i].z, - +szyna[i].n.x * cos1 + szyna[i].n.y * sin1, - -szyna[i].n.x * sin1 + szyna[i].n.y * cos1, - 0.0); - rpts2[11 - i] = - vector6( - (-fHTW - szyna[i].x) * cos1 + szyna[i].y * sin1, - -(-fHTW - szyna[i].x) * sin1 + szyna[i].y * cos1, - szyna[i].z, - -szyna[i].n.x * cos1 + szyna[i].n.y * sin1, - +szyna[i].n.x * sin1 + szyna[i].n.y * cos1, - 0.0); - } - if (iTrapezoid) // jak trapez albo przechyłki, to oddzielne punkty na końcu - for (i = 0; i < 12; ++i) - { - rpts1[12 + i] = - vector6( - (fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(fHTW2 + szyna[i].x) * sin2 + szyna[i].y * cos2, - szyna[i].z, - +szyna[i].n.x * cos2 + szyna[i].n.y * sin2, - -szyna[i].n.x * sin2 + szyna[i].n.y * cos2, - 0.0); - rpts2[23 - i] = - vector6( - (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + szyna[i].y * cos2, - szyna[i].z, - -szyna[i].n.x * cos2 + szyna[i].n.y * sin2, - +szyna[i].n.x * sin2 + szyna[i].n.y * cos2, - 0.0); - } - switch (eType) // dalej zależnie od typu - { - case tt_Table: // obrotnica jak zwykły tor, animacja wykonywana w RaAnimate(), tutaj tylko - // regeneracja siatek - case tt_Normal: - if (TextureID2) - if (tex ? TextureID2 == tex : true) // jeśli pasuje do grupy (tex) - { // podsypka z podkładami jest tylko dla zwykłego toru - vector6 bpts1[8]; // punkty głównej płaszczyzny nie przydają się do robienia boków - if (fTexLength == 4.0) // jeśli stare mapowanie na profil 0.2 0.5 1.1 (również 6-9-9/noil) - { // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy - // profil - if (iTrapezoid) // trapez albo przechyłki - { // podsypka z podkladami trapezowata - // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 ((0.3464,0.6536) - // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.00, normal1.x, -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.33, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.67, -normal1.x, -normal1.y, 0.0); // prawy brzeg początku symetrycznie - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.00, -normal1.x, -normal1.y, 0.0); // prawy skos - // przekrój końcowy - bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.00, normal2.x, -normal2.y, 0.0); // lewy brzeg - bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, 0.33, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.67, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 1.00, -normal2.x, -normal2.y, 0.0); // prawy skos - } - else - { - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.0, +normal1.x, -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6(fHTW + side, -0.18, 0.33, +normal1.x, -normal1.y, 0.0); // krawędź załamania - bpts1[2] = vector6(-fHTW - side, -0.18, 0.67, -normal1.x, -normal1.y, 0.0); // druga - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.0, -normal1.x, -normal1.y, 0.0); // prawy skos - } - } - else - { // mapowanie proporcjonalne do powierzchni, rozmiar w poprzek określa fTexLength - double max = fTexRatio2 * fTexLength; // szerokość proporcjonalna do długości - double map11 = ( - max > 0.0 ? - (fHTW + side) / max : - 0.25 ); // załamanie od strony 1 - double map12 = ( - max > 0.0 ? - (fHTW + side + hypot1) / max : - 0.5 ); // brzeg od strony 1 - if (iTrapezoid) // trapez albo przechyłki - { // podsypka z podkladami trapezowata - double map21 = ( - max > 0.0 ? - (fHTW2 + side2) / max : - 0.25 ); // załamanie od strony 2 - double map22 = ( - max > 0.0 ? - (fHTW2 + side2 + hypot2) / max : - 0.5 ); // brzeg od strony 2 - // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 ((0.3464,0.6536) - // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, normal1.x, -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.5 - map11, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.5 + map11, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos - // przekrój końcowy - bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.5 - map22, normal2.x, -normal2.y, 0.0); // lewy brzeg - bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, 0.5 - map21, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.5 + map21, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 0.5 + map22, -normal2.x, -normal2.y, 0.0); // prawy skos - } - else - { - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, +normal1.x, -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6(fHTW + side, -0.18, 0.5 - map11, +normal1.x, -normal1.y, 0.0); // krawędź załamania - bpts1[2] = vector6(-fHTW - side, -0.18, 0.5 + map11, -normal1.x, -normal1.y, 0.0); // druga - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos - } - } - if (!tex) - GfxRenderer.Bind( TextureID2 ); - Segment->RenderLoft( immediate, origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); - } - if (TextureID1) - if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) - { // szyny - if (!tex) - GfxRenderer.Bind( TextureID1 ); - Segment->RenderLoft( immediate, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - Segment->RenderLoft( immediate, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength); - } - break; - case tt_Switch: // dla zwrotnicy dwa razy szyny - if (TextureID1 || TextureID2) // zwrotnice nie są grupowane, aby prościej było je animować - { // iglice liczone tylko dla zwrotnic - // Ra: TODO: oddzielna animacja każdej iglicy, opór na docisku - vector6 rpts3[24], rpts4[24]; - for (i = 0; i < 12; ++i) - { - rpts3[i] = - vector6(+(fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, - -(+fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, iglica[i].z); - rpts3[i + 12] = - vector6(+(fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(+fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, szyna[i].z); - rpts4[11 - i] = - vector6((-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, - -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, iglica[i].z); - rpts4[23 - i] = - vector6((-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, szyna[i].z); - } - // McZapkie-130302 - poprawione rysowanie szyn - if (SwitchExtension->RightSwitch) - { // zwrotnica prawa - if( TextureID1 ) { - GfxRenderer.Bind( TextureID1 ); - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); // prawa iglica - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts2, nnumPts, fTexLength ); // lewa szyna normalnie cała - } - if( TextureID2 ) { - GfxRenderer.Bind( TextureID2 ); - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts1, nnumPts, fTexLength ); // prawa szyna normalna cała - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); // lewa iglica - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą - } - } - else - { // lewa kiedyś działała lepiej niż prawa - if( TextureID1 ) { - GfxRenderer.Bind( TextureID1 ); - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts1, nnumPts, fTexLength ); // prawa szyna normalna cała - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); // lewa iglica - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą - } - if( TextureID2 ) { - // nie wiadomo, czy OpenGL to optymalizuje - GfxRenderer.Bind( TextureID2 ); - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); // prawa iglica - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts2, nnumPts, fTexLength ); // lewa szyna normalnie cała - } - } - } - break; - } - } // koniec obsługi torów - break; - case 2: // McZapkie-260302 - droga - rendering - // McZapkie:240702-zmieniony zakres widzialnosci - switch (eType) // dalej zależnie od typu - { - case tt_Normal: // drogi proste, bo skrzyżowania osobno - { - vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma - { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% - double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości - double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 - double map2 = max > 0.0 ? fHTW2 / max : 0.5; // obcięcie tekstury od strony 2 - if (iTrapezoid) // trapez albo przechyłki - { // nawierzchnia trapezowata - Segment->GetRolls(roll1, roll2); - bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1, sin(roll1), cos(roll1), 0.0); // lewy brzeg początku - bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1, -sin(roll1), cos(roll1), 0.0); // prawy brzeg początku symetrycznie - bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2, sin(roll2), cos(roll2), 0.0); // lewy brzeg końca - bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2, -sin(roll2), cos(roll2), 0.0); // prawy brzeg początku symetrycznie - } - else - { - bpts1[0] = vector6(fHTW, 0.0, 0.5 - map1, 0.0, 1.0, 0.0); - bpts1[1] = vector6(-fHTW, 0.0, 0.5 + map1, 0.0, 1.0, 0.0); - } - } - if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty - if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) - { // tworzenie trójkątów nawierzchni szosy - if (!tex) - GfxRenderer.Bind( TextureID1 ); - Segment->RenderLoft( immediate, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); - } - if (TextureID2) - if (tex ? TextureID2 == tex : true) // jeśli pasuje do grupy (tex) - { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) - if (!tex) - GfxRenderer.Bind( TextureID2 ); - vector6 - rpts1[6], - rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony - if (fTexHeight1 >= 0.0) - { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo - rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy - rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5); // lewa krawędź załamania - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 1.0); // lewy brzeg pobocza (mapowanie może być inne - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 1.0); // prawy brzeg pobocza - rpts2[1] = vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania - rpts2[2] = vector6(-rozp, -fTexHeight1, 0.0); // prawy brzeg podstawy - if (iTrapezoid) // trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - rpts1[3] = vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza - rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 1.0); // brzeg pobocza - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); - rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); - rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza - } - } - else - { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości - // mapowanie propocjonalne do szerokości chodnika - // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy - double d = -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm - double max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości - double map1l = ( - max > 0.0 ? - side / max : - 0.484375 ); // obcięcie tekstury od lewej strony punktu 1 - double map1r = ( - max > 0.0 ? - slop / max : - 0.484375 ); // obcięcie tekstury od prawej strony punktu 1 - double h1r = ( - slop > d ? - -fTexHeight1 : - 0 ); - double h1l = ( - side > d ? - -fTexHeight1 : - 0 ); - rpts1[ 0 ] = vector6( bpts1[ 0 ].x + slop, bpts1[ 0 ].y + h1r, 0.515625 + map1r ); // prawy brzeg prawego chodnika - rpts1[ 1 ] = vector6( bpts1[ 0 ].x + d, bpts1[ 0 ].y + h1r, 0.515625 ); // prawy krawężnik u góry - rpts1[ 2 ] = vector6( bpts1[ 0 ].x, bpts1[ 0 ].y, 0.515625 - d / 2.56 ); // prawy krawężnik u dołu - rpts2[ 0 ] = vector6( bpts1[ 1 ].x, bpts1[ 1 ].y, 0.484375 + d / 2.56 ); // lewy krawężnik u dołu - rpts2[ 1 ] = vector6( bpts1[ 1 ].x - d, bpts1[ 1 ].y + h1l, 0.484375 ); // lewy krawężnik u góry - rpts2[ 2 ] = vector6( bpts1[ 1 ].x - side, bpts1[ 1 ].y + h1l, 0.484375 - map1l ); // lewy brzeg lewego chodnika - if (iTrapezoid) // trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - slop2 = ( - fabs( ( iTrapezoid & 2 ) ? - slop2 : - slop ) ); // szerokość chodnika po prawej - double map2l = ( - max > 0.0 ? - side2 / max : - 0.484375 ); // obcięcie tekstury od lewej strony punktu 2 - double map2r = ( - max > 0.0 ? - slop2 / max : - 0.484375 ); // obcięcie tekstury od prawej strony punktu 2 - double h2r = ( slop2 > d ) ? -fTexHeight2 : 0; - double h2l = ( side2 > d ) ? -fTexHeight2 : 0; - rpts1[ 3 ] = vector6( bpts1[ 2 ].x + slop2, bpts1[ 2 ].y + h2r, 0.515625 + map2r ); // prawy brzeg prawego chodnika - rpts1[ 4 ] = vector6( bpts1[ 2 ].x + d, bpts1[ 2 ].y + h2r, 0.515625 ); // prawy krawężnik u góry - rpts1[ 5 ] = vector6( bpts1[ 2 ].x, bpts1[ 2 ].y, 0.515625 - d / 2.56 ); // prawy krawężnik u dołu - rpts2[ 3 ] = vector6( bpts1[ 3 ].x, bpts1[ 3 ].y, 0.484375 + d / 2.56 ); // lewy krawężnik u dołu - rpts2[ 4 ] = vector6( bpts1[ 3 ].x - d, bpts1[ 3 ].y + h2l, 0.484375 ); // lewy krawężnik u góry - rpts2[ 5 ] = vector6( bpts1[ 3 ].x - side2, bpts1[ 3 ].y + h2l, 0.484375 - map2l ); // lewy brzeg lewego chodnika - } - } - if (iTrapezoid) // trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony - // odcinka - if ((fTexHeight1 >= 0.0) ? true : (slop != 0.0)) - Segment->RenderLoft( immediate, origin, rpts1, -3, fTexLength); // tylko jeśli jest z prawej - if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - Segment->RenderLoft( immediate, origin, rpts2, -3, fTexLength); // tylko jeśli jest z lewej - } - else - { // pobocza zwykłe, brak przechyłki - if ((fTexHeight1 >= 0.0) ? true : (slop != 0.0)) - Segment->RenderLoft( immediate, origin, rpts1, 3, fTexLength); - if ((fTexHeight1 >= 0.0) ? true : (side != 0.0)) - Segment->RenderLoft( immediate, origin, rpts2, 3, fTexLength); - } - } - break; - } - case tt_Cross: // skrzyżowanie dróg rysujemy inaczej - { // ustalenie współrzędnych środka - przecięcie Point1-Point2 z CV4-Point4 - double a[4]; // kąty osi ulic wchodzących - vector3 p[4]; // punkty się przydadzą do obliczeń - // na razie połowa odległości pomiędzy Point1 i Point2, potem się dopracuje - a[0] = a[1] = 0.5; // parametr do poszukiwania przecięcia łuków - // modyfikować a[0] i a[1] tak, aby trafić na przecięcie odcinka 34 - p[0] = SwitchExtension->Segments[0]->FastGetPoint(a[0]); // współrzędne środka pierwszego odcinka - p[1] = SwitchExtension->Segments[1]->FastGetPoint(a[1]); //-//- drugiego - // p[2]=p[1]-p[0]; //jeśli różne od zera, przeliczyć a[0] i a[1] i wyznaczyć nowe punkty - vector3 oxz = p[0]; // punkt mapowania środka tekstury skrzyżowania - p[0] = SwitchExtension->Segments[0]->GetDirection1(); // Point1 - pobranie wektorów kontrolnych - p[1] = SwitchExtension->Segments[1]->GetDirection2(); // Point3 (bo zamienione) - p[2] = SwitchExtension->Segments[0]->GetDirection2(); // Point2 - p[3] = SwitchExtension->Segments[1]->GetDirection1(); // Point4 (bo zamienione) - a[0] = atan2(-p[0].x, p[0].z); // kąty stycznych osi dróg - a[1] = atan2(-p[1].x, p[1].z); - a[2] = atan2(-p[2].x, p[2].z); - a[3] = atan2(-p[3].x, p[3].z); - p[0] = SwitchExtension->Segments[0]->FastGetPoint_0(); // Point1 - pobranie współrzędnych końców - p[1] = SwitchExtension->Segments[1]->FastGetPoint_1(); // Point3 - p[2] = SwitchExtension->Segments[0]->FastGetPoint_1(); // Point2 - p[3] = SwitchExtension->Segments[1]->FastGetPoint_0(); // Point4 - przy trzech drogach pokrywa się z Point1 - // 2014-07: na początek rysować brzegi jak dla łuków - // punkty brzegu nawierzchni uzyskujemy podczas renderowania boków (bez sensu, ale najszybciej było zrobić) - int i; // ile punktów (może byc różna ilość punktów między drogami) - if (!SwitchExtension->vPoints) - { // jeśli tablica punktów nie jest jeszcze utworzona, zliczamy punkty i tworzymy ją - if( SwitchExtension->iRoads == 3 ) { - // mogą być tylko 3 drogi zamiast 4 - SwitchExtension->iPoints = - SwitchExtension->Segments[ 0 ]->RaSegCount() - + SwitchExtension->Segments[ 1 ]->RaSegCount() - + SwitchExtension->Segments[ 2 ]->RaSegCount(); - } - else { - SwitchExtension->iPoints = - SwitchExtension->Segments[ 2 ]->RaSegCount() - + SwitchExtension->Segments[ 3 ]->RaSegCount() - + SwitchExtension->Segments[ 4 ]->RaSegCount() - + SwitchExtension->Segments[ 5 ]->RaSegCount(); - } - // tablica utworzona z zapasem, ale nie wypełniona współrzędnymi - SwitchExtension->vPoints = new vector3[ SwitchExtension->iPoints + SwitchExtension->iRoads ]; - } - vector3 *b = - SwitchExtension->bPoints ? - nullptr : - SwitchExtension->vPoints; // zmienna robocza, NULL gdy tablica punktów już jest wypełniona - vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma - { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% - double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości - double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 - double map2 = max > 0.0 ? fHTW2 / max : 0.5; // obcięcie tekstury od strony 2 - // if (iTrapezoid) //trapez albo przechyłki - { // nawierzchnia trapezowata - Segment->GetRolls(roll1, roll2); - bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1, sin(roll1), cos(roll1), 0.0); // lewy brzeg początku - bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1, -sin(roll1), cos(roll1), 0.0); // prawy brzeg początku symetrycznie - bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2, sin(roll2), cos(roll2), 0.0); // lewy brzeg końca - bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2, -sin(roll2), cos(roll2), 0.0); // prawy brzeg początku symetrycznie - } - } - // najpierw renderowanie poboczy i zapamiętywanie punktów - // problem ze skrzyżowaniami jest taki, że teren chce się pogrupować wg tekstur, ale zaczyna od nawierzchni - // sama nawierzchnia nie wypełni tablicy punktów, bo potrzebne są pobocza - // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie w swoim czasie - { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) - if (TextureID2) - if (!tex) - GfxRenderer.Bind( TextureID2 ); - vector6 rpts1[6], - rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony - // Ra 2014-07: trzeba to przerobić na pętlę i pobierać profile (przynajmniej 2..4) z sąsiednich dróg - if (fTexHeight1 >= 0.0) - { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo - rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy - rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5); // lewa krawędź załamania - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 1.0); // lewy brzeg pobocza (mapowanie może być inne - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 1.0); // prawy brzeg pobocza - rpts2[1] = vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania - rpts2[2] = vector6(-rozp, -fTexHeight1, 0.0); // prawy brzeg podstawy - // if (iTrapezoid) //trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - rpts1[3] = vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza - rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 1.0); // brzeg pobocza - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); - rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); - rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza - } - } - else - { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości - // mapowanie propocjonalne do szerokości chodnika - // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy - double d = -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm - double max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości - double map1l = max > 0.0 ? - side / max : - 0.484375; // obcięcie tekstury od lewej strony punktu 1 - double map1r = max > 0.0 ? - slop / max : - 0.484375; // obcięcie tekstury od prawej strony punktu 1 - rpts1[0] = vector6(bpts1[0].x + slop, bpts1[0].y - fTexHeight1, 0.515625 + map1r); // prawy brzeg prawego chodnika - rpts1[1] = vector6(bpts1[0].x + d, bpts1[0].y - fTexHeight1, 0.515625); // prawy krawężnik u góry - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[1] = vector6(bpts1[1].x - d, bpts1[1].y - fTexHeight1, 0.484375); // lewy krawężnik u góry - rpts2[2] = vector6(bpts1[1].x - side, bpts1[1].y - fTexHeight1, 0.484375 - map1l); // lewy brzeg lewego chodnika - // if (iTrapezoid) //trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - slop2 = fabs((iTrapezoid & 2) ? slop2 : slop); // szerokość chodnika po prawej - double map2l = max > 0.0 ? - side2 / max : - 0.484375; // obcięcie tekstury od lewej strony punktu 2 - double map2r = max > 0.0 ? - slop2 / max : - 0.484375; // obcięcie tekstury od prawej strony punktu 2 - rpts1[3] = vector6(bpts1[2].x + slop2, bpts1[2].y - fTexHeight2, 0.515625 + map2r); // prawy brzeg prawego chodnika - rpts1[4] = vector6(bpts1[2].x + d, bpts1[2].y - fTexHeight2, 0.515625); // prawy krawężnik u góry - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[4] = vector6(bpts1[3].x - d, bpts1[3].y - fTexHeight2, 0.484375); // lewy krawężnik u góry - rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y - fTexHeight2, 0.484375 - map2l); // lewy brzeg lewego chodnika - } - } - bool render = ( - TextureID2 ? ( - tex ? - TextureID2 == tex : - true ) : - false ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni - // if (iTrapezoid) //trapez albo przechyłki - if (SwitchExtension->iRoads == 4) - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); - SwitchExtension->Segments[ 3 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); - SwitchExtension->Segments[ 4 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); - SwitchExtension->Segments[ 5 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); - } - } - else - // to będzie ewentualnie dla prostego na skrzyżowaniu trzech dróg - { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe - if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P2 do P4 - SwitchExtension->Segments[ 1 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P4 do P3=P1 (odwrócony) - SwitchExtension->Segments[ 0 ]->RenderLoft( immediate, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P1 do P2 - } - } - } - // renderowanie nawierzchni na końcu - double sina0 = sin(a[0]), cosa0 = cos(a[0]); - double u, v; - if( ( false == SwitchExtension->bPoints ) // jeśli tablica nie wypełniona - && ( b != nullptr ) ) { - SwitchExtension->bPoints = true; // tablica punktów została wypełniona - } - - if (TextureID1) // jeśli podana tekstura nawierzchni - if ( (tex == TextureID1) || (tex == 0) ) // jeśli pasuje do grupy (tex) - { - if (!tex) - GfxRenderer.Bind( TextureID1 ); - glBegin(GL_TRIANGLE_FAN); // takie kółeczko będzie - // we start with a vertex in the middle... - glNormal3f(0, 1, 0); - glTexCoord2f(0.5, 0.5); //środek tekstury na środku skrzyżowania - glVertex3f( - oxz.x - origin.x, - oxz.y - origin.y, - oxz.z - origin.z ); - // ...and add one extra vertex to close the fan... - glNormal3f( 0, 1, 0 ); - // mapowanie we współrzędnych scenerii - u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x + origin.x ) / fTexLength; - v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z + origin.z ) / ( fTexRatio1 * fTexLength ); - glTexCoord2f( - cosa0 * u + sina0 * v + 0.5, - -sina0 * u + cosa0 * v + 0.5 ); - glVertex3f( - SwitchExtension->vPoints[ 0 ].x, - SwitchExtension->vPoints[ 0 ].y, - SwitchExtension->vPoints[ 0 ].z ); - - for ( i = SwitchExtension->iPoints + SwitchExtension->iRoads - 1; i >= 0; --i ) - { - glNormal3f(0, 1, 0); - // mapowanie we współrzędnych scenerii - u = (SwitchExtension->vPoints[i].x - oxz.x + origin.x) / fTexLength; - v = (SwitchExtension->vPoints[i].z - oxz.z + origin.z) / (fTexRatio1 * fTexLength); - glTexCoord2f( - cosa0 * u + sina0 * v + 0.5, - -sina0 * u + cosa0 * v + 0.5); - glVertex3f( - SwitchExtension->vPoints[i].x, - SwitchExtension->vPoints[i].y, - SwitchExtension->vPoints[i].z); - } - glEnd(); - } - break; - } - } - break; - case 4: // McZapkie-260302 - rzeka- rendering - // Ra: rzeki na razie bez zmian, przechyłki na pewno nie mają - // Ra: przemyśleć wyrównanie u góry trawą do czworoboku - vector6 bpts1[numPts] = {vector6(fHTW, 0.0, 0.0), vector6(fHTW, 0.2, 0.33), - vector6(-fHTW, 0.0, 0.67), vector6(-fHTW, 0.0, 1.0)}; - // Ra: dziwnie ten kształt wygląda - if (TextureID1) - if (tex ? TextureID1 == tex : true) // jeśli pasuje do grupy (tex) - { - if (!tex) - GfxRenderer.Bind( TextureID1 ); - Segment->RenderLoft( immediate, origin, bpts1, numPts, fTexLength); - } - if (TextureID2) - if (tex ? TextureID2 == tex : true) // jeśli pasuje do grupy (tex) - { // brzegi rzeki prawie jak pobocze derogi, tylko inny znak ma wysokość - // znak jest zmieniany przy wczytywaniu, więc tu musi byc minus fTexHeight - vector6 rpts1[3] = {vector6(rozp, -fTexHeight1, 0.0), - vector6(fHTW + side, 0.0, 0.5), vector6(fHTW, 0.0, 1.0)}; - vector6 rpts2[3] = {vector6(-fHTW, 0.0, 1.0), vector6(-fHTW - side, 0.0, 0.5), - vector6(-rozp, -fTexHeight1, 0.0)}; // Ra: po kiego 0.1? - if (!tex) - GfxRenderer.Bind( TextureID2 ); // brzeg rzeki - Segment->RenderLoft( immediate, origin, rpts1, 3, fTexLength ); - Segment->RenderLoft( immediate, origin, rpts2, 3, fTexLength ); - } - break; - } - if (!tex) - if (Global::bManageNodes) - glEndList(); -}; -*/ -void TTrack::Release() -{ -/* - if (DisplayListID) - glDeleteLists(DisplayListID, 1); - DisplayListID = 0; -*/ -}; -/* -void TTrack::Render() -{ - if (bVisible) // Ra: tory są renderowane sektorami i nie ma sensu każdorazowo liczyć odległości - { - if (!DisplayListID) - { - Compile(); - if (Global::bManageNodes) - ResourceManager::Register(this); - }; - SetLastUsage(Timer::GetSimulationTime()); - EnvironmentSet(); // oświetlenie nie może być skompilowane, bo może się zmieniać z czasem - glCallList(DisplayListID); - EnvironmentReset(); // ustawienie oświetlenia na zwykłe - if (InMovement()) - Release(); // zwrotnica w trakcie animacji do odrysowania - } -}; -*/ bool TTrack::CheckDynamicObject(TDynamicObject *Dynamic) { // sprawdzenie, czy pojazd jest przypisany do toru for( auto dynamic : Dynamics ) { @@ -3064,25 +2413,6 @@ TTrack * TTrack::RaAnimate() // minimalny ruch, aby przeliczyć pozycję dynamic->Move( 0.000001 ); } - // kąty -/* - if (Global::bUseVBO) - { // dla OpenGL 1.4 odświeży się cały sektor, w późniejszych poprawiamy fragment - // aktualizacja pojazdów na torze - if (GLEW_VERSION_1_5) // dla OpenGL 1.4 to się nie wykona poprawnie - { - int size = RaArrayPrepare(); // wielkość tabeli potrzebna dla tej obrotnicy - basic_vertex *Vert = new basic_vertex[size]; // bufor roboczy - // basic_vertex *v=Vert; //zmieniane przez - RaArrayFill(Vert, Vert - SwitchExtension->iLeftVBO, size); // iLeftVBO powinno zostać niezmienione - ::glBufferSubData( - GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(basic_vertex), - size * sizeof(basic_vertex), Vert); // wysłanie fragmentu bufora VBO - } - } - else // gdy Display List - Release(); // niszczenie skompilowanej listy, aby się wygenerowała nowa -*/ // NOTE: passing empty handle is a bit of a hack here. could be refactored into something more elegant create_geometry( geometrybank_handle() ); } // animacja trwa nadal diff --git a/Track.h b/Track.h index 8ded71b5..f7bf31e6 100644 --- a/Track.h +++ b/Track.h @@ -118,7 +118,7 @@ class TIsolated }; // trajektoria ruchu - opakowanie -class TTrack : public Resource { +class TTrack /*: public Resource*/ { friend class opengl_renderer; @@ -225,9 +225,9 @@ public: bool CheckDynamicObject(TDynamicObject *Dynamic); bool AddDynamicObject(TDynamicObject *Dynamic); bool RemoveDynamicObject(TDynamicObject *Dynamic); - - void Release(); /* + void Release(); + void Compile(GLuint tex = 0); void Render(); // renderowanie z Display Lists int RaArrayPrepare(); // zliczanie rozmiaru dla VBO sektroa diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 6974a47f..4a41a51e 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -60,7 +60,8 @@ struct geometry_handle { /* return bank << 14 | chunk; } */ - return bank << 32 | chunk; } + return ( std::uint64_t { bank } << 32 | chunk ); + } // members /* diff --git a/version.h b/version.h index b41d9f32..b34c61ee 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 603 +#define VERSION_MINOR 613 #define VERSION_REVISION 0 From 0d805e8ba2a57c9cc634d646deed5b06d84acf77 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 14 Jun 2017 21:02:38 +0200 Subject: [PATCH 126/426] support for vertex data streams selection, t3d model loading fixes --- Model3d.cpp | 379 +++++++++++++++++++++-------------------- Model3d.h | 19 ++- Texture.cpp | 11 +- Track.cpp | 201 +--------------------- openglgeometrybank.cpp | 90 +++++++--- openglgeometrybank.h | 41 +++-- renderer.cpp | 25 +-- 7 files changed, 307 insertions(+), 459 deletions(-) diff --git a/Model3d.cpp b/Model3d.cpp index 40db9adf..ab655643 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -51,10 +51,14 @@ TSubModel::TSubModel() void TSubModel::FirstInit() { eType = TP_ROTATOR; +/* Vertices = NULL; uiDisplayList = 0; +*/ iNumVerts = -1; // do sprawdzenia +/* iVboPtr = -1; +*/ fLight = -1.0; //świetcenie wyłączone v_RotateAxis = float3(0, 0, 0); v_TransVector = float3(0, 0, 0); @@ -103,15 +107,19 @@ void TSubModel::FirstInit() TSubModel::~TSubModel() { +/* if (uiDisplayList) glDeleteLists(uiDisplayList, 1); +*/ if (iFlags & 0x0200) { // wczytany z pliku tekstowego musi sam posprzątać // SafeDeleteArray(Indices); SafeDelete(Next); SafeDelete(Child); delete fMatrix; // własny transform trzeba usunąć (zawsze jeden) +/* delete[] Vertices; +*/ } delete[] smLetter; // używany tylko roboczo dla TP_TEXT, do przyspieszenia // wyświetlania @@ -136,25 +144,20 @@ void TSubModel::NameSet(std::string const &Name) // int TSubModel::SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 // *pt,GLVERTEX // *Vertices) -int TSubModel::SeekFaceNormal(unsigned int *Masks, int f, unsigned int dwMask, glm::vec3 *pt, - basic_vertex *Vertices) -{ // szukanie punktu stycznego - // do (pt), zwraca numer - // wierzchołka, a nie trójkąta - int iNumFaces = iNumVerts / 3; // bo maska powierzchni jest jedna na trójkąt - // GLVERTEX *p; //roboczy wskaźnik - basic_vertex *p; // roboczy wskaźnik - for (int i = f; i < iNumFaces; ++i) // pętla po trójkątach, od trójkąta (f) - if (Masks[i] & dwMask) // jeśli wspólna maska powierzchni - { - p = Vertices + 3 * i; - if (p->position == *pt) - return 3 * i; - if ((++p)->position == *pt) - return 3 * i + 1; - if ((++p)->position == *pt) - return 3 * i + 2; - } +int TSubModel::SeekFaceNormal(std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, vertex_array const &Vertices) +{ // szukanie punktu stycznego do (pt), zwraca numer wierzchołka, a nie trójkąta + int facecount = iNumVerts / 3; // bo maska powierzchni jest jedna na trójkąt + for( int faceidx = Startface; faceidx < facecount; ++faceidx ) { + // pętla po trójkątach, od trójkąta (f) + if( Masks[ faceidx ] & Mask ) { + // jeśli wspólna maska powierzchni + for( int vertexidx = 0; vertexidx < 2; ++vertexidx ) { + if( Vertices[ 3 * faceidx + vertexidx ].position == Position ) { + return 3 * faceidx + vertexidx; + } + } + } + } return -1; // nie znaleziono stycznego wierzchołka } @@ -197,10 +200,12 @@ inline void readMatrix(cParser &parser, float4x4 &matrix) parser >> matrix(x)[y]; }; -int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) +int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic) { // Ra: VBO tworzone na poziomie modelu, a nie submodeli iNumVerts = 0; +/* iVboPtr = Pos; // pozycja w VBO +*/ if (!parser.expectToken("type:")) Error("Model type parse failure!"); { @@ -329,13 +334,18 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) { std::string discard; parser.getTokens(5, false); - parser >> discard >> bWire >> discard >> fWireSize >> discard; - Opacity = readIntAsDouble(parser, - 100.0f); // wymagane jest 0 dla szyb, 100 idzie w nieprzezroczyste + parser + >> discard >> bWire + >> discard >> fWireSize + >> discard; + // wymagane jest 0 dla szyb, 100 idzie w nieprzezroczyste + Opacity = readIntAsDouble(parser, 100.0f); if (Opacity > 1.0f) Opacity *= 0.01f; // w 2013 był błąd i aby go obejść, trzeba było wpisać 10000.0 +/* if ((Global::iConvertModels & 1) == 0) // dla zgodności wstecz Opacity = 0.0; // wszystko idzie w przezroczyste albo zależnie od tekstury +*/ if (!parser.expectToken("map:")) Error("Model map parse failure!"); std::string texture = parser.getToken(); @@ -371,20 +381,19 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) } else { // jeśli tylko nazwa pliku, to dawać bieżącą ścieżkę do tekstur - // asTexture=AnsiString(texture.c_str()); //zapamiętanie nazwy tekstury TextureNameSet(texture.c_str()); - if (texture.find_first_of("/\\") == texture.npos) - texture.insert(0, Global::asCurrentTexturePath.c_str()); + if( texture.find_first_of( "/\\" ) == texture.npos ) { + texture.insert( 0, Global::asCurrentTexturePath.c_str() ); + } TextureID = GfxRenderer.GetTextureId( texture, szTexturePath ); - // TexAlpha=TTexturesManager::GetAlpha(TextureID); - // iFlags|=TexAlpha?0x20:0x10; //0x10-nieprzezroczysta, 0x20-przezroczysta - iFlags |= - ( GfxRenderer.Texture(TextureID).has_alpha ? - 0x20 : - 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta // renderowanie w cyklu przezroczystych tylko jeśli: // 1. Opacity=0 (przejściowo <1, czy tam <100) oraz // 2. tekstura ma przezroczystość + iFlags |= + ( ( ( Opacity < 1.0 ) + && ( GfxRenderer.Texture(TextureID).has_alpha ) ) ? + 0x20 : + 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta }; } else @@ -407,8 +416,6 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) readMatrix(parser, *fMatrix); // wczytanie transform if (!fMatrix->IdentityIs()) iFlags |= 0x8000; // transform niejedynkowy - trzeba go przechować - int iNumFaces; // ilość trójkątów - unsigned int *sg; // maski przynależności trójkątów do powierzchni if (eType < TP_ROTATOR) { // wczytywanie wierzchołków parser.getTokens(2, false); @@ -423,11 +430,11 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) { // jeśli pierwszy znak jest gwiazdką, poszukać // submodelu o nazwie bez tej gwiazdki i wziąć z // niego wierzchołki - Error("Verticles reference not yet supported!"); + Error("Vertices reference not yet supported!"); } else { // normalna lista wierzchołków - iNumVerts = atoi(token.c_str()); + iNumVerts = std::atoi(token.c_str()); if (iNumVerts % 3) { iNumVerts = 0; @@ -435,27 +442,31 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) return 0; } // Vertices=new GLVERTEX[iNumVerts]; - if (iNumVerts) - { + if (iNumVerts) { +/* Vertices = new basic_vertex[iNumVerts]; - iNumFaces = iNumVerts / 3; - sg = new unsigned int[iNumFaces]; // maski powierzchni: 0 oznacza brak - // użredniania wektorów normalnych - int *wsp = new int[iNumVerts]; // z którego wierzchołka kopiować wektor - // normalny +*/ + Vertices.resize( iNumVerts ); + int facecount = iNumVerts / 3; +/* + unsigned int *sg; // maski przynależności trójkątów do powierzchni + sg = new unsigned int[iNumFaces]; // maski powierzchni: 0 oznacza brak użredniania wektorów normalnych + int *wsp = new int[iNumVerts]; // z którego wierzchołka kopiować wektor normalny +*/ + std::vector sg; sg.resize( facecount ); // maski przynależności trójkątów do powierzchni + std::vector wsp; wsp.resize( iNumVerts );// z którego wierzchołka kopiować wektor normalny int maska = 0; - for (int i = 0; i < iNumVerts; i++) - { // Ra: z konwersją na układ scenerii - będzie wydajniejsze - // wyświetlanie + for (int i = 0; i < iNumVerts; ++i) { + // Ra: z konwersją na układ scenerii - będzie wydajniejsze wyświetlanie wsp[i] = -1; // wektory normalne nie są policzone dla tego wierzchołka - if ((i % 3) == 0) - { // jeśli będzie maska -1, to dalej będą - // wierzchołki z wektorami normalnymi, podanymi - // jawnie + if ((i % 3) == 0) { + // jeśli będzie maska -1, to dalej będą wierzchołki z wektorami normalnymi, podanymi jawnie maska = parser.getToken(false); // maska powierzchni trójkąta - sg[i / 3] = (maska == -1) ? 0 : maska; // dla maski -1 będzie 0, - // czyli nie ma wspólnych - // wektorów normalnych + // dla maski -1 będzie 0, czyli nie ma wspólnych wektorów normalnych + sg[i / 3] = ( + ( maska == -1 ) ? + 0 : + maska ); } parser.getTokens(3, false); parser @@ -475,80 +486,77 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) parser >> Vertices[i].texture.s >> Vertices[i].texture.t; - if (i % 3 == 2) // jeżeli wczytano 3 punkty - { - if (Vertices[i].position == Vertices[i - 1].position + if (i % 3 == 2) { + // jeżeli wczytano 3 punkty + if (Vertices[i ].position == Vertices[i - 1].position || Vertices[i - 1].position == Vertices[i - 2].position - || Vertices[i - 2].position == Vertices[i].position) + || Vertices[i - 2].position == Vertices[i ].position) { // jeżeli punkty się nakładają na siebie - --iNumFaces; // o jeden trójkąt mniej + --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce - WriteLog(std::string("Degenerated triangle ignored in: \"") + pName + - "\", verticle " + std::to_string(i)); + WriteLog("Degenerated triangle ignored in: \"" + pName + "\", verticle " + std::to_string(i)); } - if (i > 0) // jeśli pierwszy trójkąt będzie zdegenerowany, to - // zostanie usunięty i nie ma co sprawdzać - if ((glm::length(Vertices[i].position - Vertices[i - 1].position) > 1000.0) - || (glm::length(Vertices[i - 1].position - Vertices[i - 2].position) > 1000.0) - || (glm::length(Vertices[i - 2].position - Vertices[i].position) > 1000.0)) - { // jeżeli są dalej niż 2km od siebie //Ra 15-01: - // obiekt wstawiany nie powinien być większy niż - // 300m (trójkąty terenu w E3D mogą mieć 1.5km) - --iNumFaces; // o jeden trójkąt mniej + if (i > 0) { + // jeśli pierwszy trójkąt będzie zdegenerowany, to zostanie usunięty i nie ma co sprawdzać + if ((glm::length(Vertices[i ].position - Vertices[i - 1].position) > 1000.0) + || (glm::length(Vertices[i - 1].position - Vertices[i - 2].position) > 1000.0) + || (glm::length(Vertices[i - 2].position - Vertices[i ].position) > 1000.0)) { + // jeżeli są dalej niż 2km od siebie //Ra 15-01: + // obiekt wstawiany nie powinien być większy niż 300m (trójkąty terenu w E3D mogą mieć 1.5km) + --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce - WriteLog(std::string("Too large triangle ignored in: \"") + pName + - "\""); + WriteLog( "Too large triangle ignored in: \"" + pName + "\"" ); } + } } } - int i; // indeks dla trójkątów +/* glm::vec3 *n = new glm::vec3[iNumFaces]; // tablica wektorów normalnych dla trójkątów - for (i = 0; i < iNumFaces; ++i) // pętla po trójkątach - będzie - // szybciej, jak wstępnie przeliczymy - // normalne trójkątów - n[i] = glm::normalize( - glm::cross( - Vertices[i * 3].position - Vertices[i * 3 + 1].position, - Vertices[i * 3].position - Vertices[i * 3 + 2].position)); - int v; // indeks dla wierzchołków - int f; // numer trójkąta stycznego - glm::vec3 norm; // roboczy wektor normalny - for (v = 0; v < iNumVerts; ++v) - { // pętla po wierzchołkach trójkątów - if (wsp[v] >= 0) // jeśli już był liczony wektor normalny z użyciem - // tego wierzchołka - Vertices[v].normal = - Vertices[wsp[v]].normal; // to wystarczy skopiować policzony wcześniej - else - { // inaczej musimy dopiero policzyć - i = v / 3; // numer trójkąta - norm = glm::vec3(); // liczenie zaczynamy od zera - f = v; // zaczynamy dodawanie wektorów normalnych od własnego - while (f >= 0) - { // sumowanie z wektorem normalnym sąsiada (włącznie - // ze sobą) - wsp[f] = v; // informacja, że w tym wierzchołku jest już policzony - // wektor normalny - norm += n[f / 3]; - f = SeekFaceNormal(sg, f / 3 + 1, sg[i], &Vertices[v].position, - Vertices); // i szukanie od kolejnego trójkąta +*/ + std::vector facenormals; + for( int i = 0; i < facecount; ++i ) { + // pętla po trójkątach - będzie szybciej, jak wstępnie przeliczymy normalne trójkątów + facenormals.emplace_back( + glm::normalize( + glm::cross( + Vertices[ i * 3 ].position - Vertices[ i * 3 + 1 ].position, + Vertices[ i * 3 ].position - Vertices[ i * 3 + 2 ].position ) ) ); + } + glm::vec3 vertexnormal; // roboczy wektor normalny + for (int vertexidx = 0; vertexidx < iNumVerts; ++vertexidx) { + // pętla po wierzchołkach trójkątów + if( wsp[ vertexidx ] >= 0 ) { + // jeśli już był liczony wektor normalny z użyciem tego wierzchołka to wystarczy skopiować policzony wcześniej + Vertices[ vertexidx ].normal = Vertices[ wsp[ vertexidx ] ].normal; + } + else { + // inaczej musimy dopiero policzyć + auto const faceidx = vertexidx / 3; // numer trójkąta + vertexnormal = glm::vec3(); // liczenie zaczynamy od zera + auto adjacenvertextidx = vertexidx; // zaczynamy dodawanie wektorów normalnych od własnego + while (adjacenvertextidx >= 0) { + // sumowanie z wektorem normalnym sąsiada (włącznie ze sobą) + wsp[adjacenvertextidx] = vertexidx; // informacja, że w tym wierzchołku jest już policzony wektor normalny + vertexnormal += facenormals[adjacenvertextidx / 3]; + // i szukanie od kolejnego trójkąta + adjacenvertextidx = SeekFaceNormal(sg, adjacenvertextidx / 3 + 1, sg[faceidx], Vertices[vertexidx].position, Vertices); } - // Ra 15-01: należało by jeszcze uwzględnić skalowanie wprowadzane - // przez transformy, aby normalne po przeskalowaniu były jednostkowe - Vertices[v].normal = - glm::normalize(norm); // przepisanie do wierzchołka trójkąta + // Ra 15-01: należało by jeszcze uwzględnić skalowanie wprowadzane przez transformy, aby normalne po przeskalowaniu były jednostkowe + Vertices[vertexidx].normal = glm::normalize(vertexnormal); // przepisanie do wierzchołka trójkąta } } +/* delete[] wsp; delete[] n; delete[] sg; +*/ } else // gdy brak wierzchołków { eType = TP_ROTATOR; // submodel pomocniczy, ma tylko macierz przekształcenia - iVboPtr = iNumVerts = 0; // dla formalności + /*iVboPtr =*/ iNumVerts = 0; // dla formalności } } // obsługa submodelu z własną listą wierzchołków } @@ -558,9 +566,13 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) std::string discard; parser.getTokens(2, false); parser >> discard >> iNumVerts; +/* // Vertices=new GLVERTEX[iNumVerts]; Vertices = new basic_vertex[iNumVerts]; - int i, j; +*/ + Vertices.resize( iNumVerts ); + int i; + unsigned int color; for (i = 0; i < iNumVerts; ++i) { if (i % 3 == 0) @@ -572,13 +584,17 @@ int TSubModel::Load(cParser &parser, TModel3d *Model, int Pos, bool dynamic) >> Vertices[i].position.x >> Vertices[i].position.y >> Vertices[i].position.z - >> j // zakodowany kolor + >> color // zakodowany kolor >> discard; - Vertices[i].normal.x = ((j) & 0xFF) / 255.0; // R - Vertices[i].normal.y = ((j >> 8) & 0xFF) / 255.0; // G - Vertices[i].normal.z = ((j >> 16) & 0xFF) / 255.0; // B + Vertices[i].normal.x = ((color) & 0xff) / 255.0f; // R + Vertices[i].normal.y = ((color >> 8) & 0xff) / 255.0f; // G + Vertices[i].normal.z = ((color >> 16) & 0xff) / 255.0f; // B } } + else if( eType == TP_FREESPOTLIGHT ) { + // single light points only have single data point, duh + Vertices.emplace_back(); + } // Visible=true; //się potem wyłączy w razie potrzeby // iFlags|=0x0200; //wczytano z pliku tekstowego (jest właścicielem tablic) if (iNumVerts < 1) @@ -615,9 +631,10 @@ int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) s->iNumVerts += tri; // aktualizacja ilości wierzchołków return s->iNumVerts - tri; // zwraca pozycję tych trójkątów w submodelu }; - +/* basic_vertex *TSubModel::TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ) { // zwraca wskaźnik do wypełnienia tabeli wierzchołków, używane przy tworzeniu E3D terenu + TSubModel *s = this; while (s ? s->TextureID != tex : false) { // szukanie submodelu o danej teksturze @@ -637,7 +654,7 @@ basic_vertex *TSubModel::TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, s->ColorsSet(Ambient, Diffuse, Specular); // ustawienie kolorów świateł return s->Vertices + pos; // wskaźnik na wolne miejsce w tabeli wierzchołków }; - +*/ #ifdef EU07_USE_OLD_RENDERCODE void TSubModel::DisplayLists() { // utworznie po jednej skompilowanej liście dla @@ -709,10 +726,10 @@ void TSubModel::InitialRotate(bool doit) { // konwersja układu współrzędnych na zgodny ze scenerią if (iFlags & 0xC000) // jeśli jest animacja albo niejednostkowy transform { // niejednostkowy transform jest mnożony i wystarczy zabawy - if (doit) - { // obrót lewostronny - if (!fMatrix) // macierzy może nie być w dodanym "bananie" - { + if (doit) { + // obrót lewostronny + if (!fMatrix) { + // macierzy może nie być w dodanym "bananie" fMatrix = new float4x4(); // tworzy macierz o przypadkowej zawartości fMatrix->Identity(); // a zaczynamy obracanie od jednostkowej } @@ -729,16 +746,18 @@ void TSubModel::InitialRotate(bool doit) { // jak nie ma potomnych, można wymnożyć przez transform i wyjedynkować // go float4x4 *mat = GetMatrix(); // transform submodelu - if (Vertices) - { - for (int i = 0; i < iNumVerts; ++i) - Vertices[i].position = (*mat) * Vertices[i].position; - (*mat)(3)[0] = (*mat)(3)[1] = (*mat)(3)[2] = - 0.0; // zerujemy przesunięcie przed obracaniem normalnych - if (eType != TP_STARS) // gwiazdki mają kolory zamiast normalnych, to - // ich wtedy nie ruszamy - for (int i = 0; i < iNumVerts; ++i) - Vertices[i].normal = glm::normalize((*mat) * Vertices[i].normal); + if( false == Vertices.empty() ) { + for( auto &vertex : Vertices ) { + vertex.position = (*mat) * vertex.position; + } + // zerujemy przesunięcie przed obracaniem normalnych + (*mat)(3)[0] = (*mat)(3)[1] = (*mat)(3)[2] = 0.0; + if( eType != TP_STARS ) { + // gwiazdki mają kolory zamiast normalnych, to ich wtedy nie ruszamy + for( auto &vertex : Vertices ) { + vertex.normal = glm::normalize( ( *mat ) * vertex.normal ); + } + } } mat->Identity(); // jedynkowanie transformu po przeliczeniu wierzchołków iFlags &= ~0x8000; // transform jedynkowy @@ -748,23 +767,26 @@ void TSubModel::InitialRotate(bool doit) if (doit) { // jeśli jest jednostkowy transform, to przeliczamy // wierzchołki, a mnożenie podajemy dalej - double t; - if (Vertices) - for (int i = 0; i < iNumVerts; ++i) - { - Vertices[i].position.x = -Vertices[i].position.x; // zmiana znaku X - t = Vertices[i].position.y; // zamiana Y i Z - Vertices[i].position.y = Vertices[i].position.z; - Vertices[i].position.z = t; + float swapcopy; +// if( false == Vertices.empty() ) { +/* + for( auto &vertex : Vertices ) { +*/ + for( int idx = 0; idx < iNumVerts; ++idx ) { + Vertices[idx].position.x = -Vertices[idx].position.x; // zmiana znaku X + swapcopy = Vertices[idx].position.y; // zamiana Y i Z + Vertices[idx].position.y = Vertices[idx].position.z; + Vertices[idx].position.z = swapcopy; // wektory normalne również trzeba przekształcić, bo się źle oświetlają if( eType != TP_STARS ) { // gwiazdki mają kolory zamiast normalnych, to // ich wtedy nie ruszamy - Vertices[ i ].normal.x = -Vertices[ i ].normal.x; // zmiana znaku X - t = Vertices[ i ].normal.y; // zamiana Y i Z - Vertices[ i ].normal.y = Vertices[ i ].normal.z; - Vertices[ i ].normal.z = t; + Vertices[idx].normal.x = -Vertices[idx].normal.x; // zmiana znaku X + swapcopy = Vertices[idx].normal.y; // zamiana Y i Z + Vertices[idx].normal.y = Vertices[idx].normal.z; + Vertices[idx].normal.z = swapcopy; } } + // } if (Child) Child->InitialRotate(doit); // potomne ewentualnie obrócimy } @@ -1028,7 +1050,7 @@ void TSubModel::RaAnimation(TAnimType a) }; //--------------------------------------------------------------------------- - +/* void TSubModel::RaArrayFill(basic_vertex *Vert) { // wypełnianie tablic VBO if (Child) @@ -1038,22 +1060,31 @@ void TSubModel::RaArrayFill(basic_vertex *Vert) Vert[ iVboPtr + i ].position = Vertices[ i ].position; Vert[ iVboPtr + i ].normal = Vertices[ i ].normal; Vert[ iVboPtr + i ].texture = Vertices[ i ].texture; -/* - Vert[iVboPtr + i].x = Vertices[i].position.x; - Vert[iVboPtr + i].y = Vertices[i].position.y; - Vert[iVboPtr + i].z = Vertices[i].position.z; - Vert[iVboPtr + i].nx = Vertices[i].normal.x; - Vert[iVboPtr + i].ny = Vertices[i].normal.y; - Vert[iVboPtr + i].nz = Vertices[i].normal.z; - Vert[iVboPtr + i].u = Vertices[i].texture.s; - Vert[iVboPtr + i].v = Vertices[i].texture.t; -*/ } else if( eType == TP_FREESPOTLIGHT ) Vert[ iVboPtr ].position = glm::vec3(); if (Next) Next->RaArrayFill(Vert); }; +*/ +void +TSubModel::create_geometry( geometrybank_handle const &Bank ) { + + if( Child ) + Child->create_geometry( Bank ); + + if( false == Vertices.empty() ) { + // conveniently all relevant custom node types use GL_POINTS, or we'd have to determine the type on individual basis + auto type = ( + eType < TP_ROTATOR ? + eType : + GL_POINTS ); + m_geometry = GfxRenderer.Insert( Vertices, Bank, type ); + } + + if( Next ) + Next->create_geometry( Bank ); +} // NOTE: leftover from static distance factor adjustment. // TODO: get rid of it, once we have the dynamic adjustment code in place @@ -1285,9 +1316,10 @@ void TSubModel::serialize(std::ostream &s, sn_utils::ls_int32(s, iFlags); sn_utils::ls_int32(s, (int32_t)get_container_pos(transforms, *fMatrix)); - +/* sn_utils::ls_int32(s, iNumVerts); sn_utils::ls_int32(s, (int)iVboPtr); +*/ if (TextureID <= 0) sn_utils::ls_int32(s, TextureID); else @@ -1324,7 +1356,7 @@ void TSubModel::serialize(std::ostream &s, s.put(0); } -void TModel3d::SaveToBinFile(char const *FileName) +void TModel3d::SaveToBinFile(std::string const &FileName) { // TODO: re-implement! return; @@ -1637,10 +1669,12 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, if (pTexture.find_last_of("/\\") == std::string::npos) pTexture.insert(0, Global::asCurrentTexturePath); TextureID = GfxRenderer.GetTextureId(pTexture, szTexturePath); +/* iFlags |= ( GfxRenderer.Texture( TextureID ).has_alpha ? 0x20 : 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta +*/ } else TextureID = iTexture; @@ -1662,8 +1696,9 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, } iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem tablic) - +/* iVboPtr = tVboPtr; +*/ }; void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) @@ -1702,7 +1737,7 @@ void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic) break; } SubModel = new TSubModel(); - iNumVerts += SubModel->Load(parser, this, iNumVerts, dynamic); + iNumVerts += SubModel->Load(parser, this, /*iNumVerts,*/ dynamic); // będzie potrzebne do wyliczenia pozycji, np. pantografu SubModel->Parent = AddToNamed(parent.c_str(), SubModel); @@ -1752,37 +1787,15 @@ void TModel3d::Init() if (false == asBinary.empty()) // jeśli jest podana nazwa { if (Global::iConvertModels) // i włączony zapis - SaveToBinFile(asBinary.c_str()); // utworzy tablicę (m_pVNT) + SaveToBinFile( asBinary ); // utworzy tablicę (m_pVNT) asBinary = ""; // zablokowanie powtórnego zapisu } -#ifdef EU07_USE_OLD_DRAW_CODE - if (iNumVerts) - { - if (Global::bUseVBO) - { -#ifdef EU07_USE_OLD_VERTEXBUFFER - if (!m_pVNT) // jeśli nie ma jeszcze tablicy (wczytano z pliku tekstowego) -#else - if( m_pVNT.empty() ) -#endif - { // tworzenie tymczasowej tablicy z wierzchołkami całego modelu - MakeArray(iNumVerts); // tworzenie tablic dla VBO -#ifdef EU07_USE_OLD_VERTEXBUFFER - Root->RaArrayFill(m_pVNT); // wypełnianie tablicy -#else - Root->RaArrayFill( m_pVNT.data() ); // wypełnianie tablicy -#endif - BuildVBOs(); // tworzenie VBO i usuwanie tablicy z pamięci - } - else - BuildVBOs(false); // tworzenie VBO bez usuwania tablicy z pamięci - } - else - { // przygotowanie skompilowanych siatek dla DisplayLists - Root->DisplayLists(); // tworzenie skompilowanej listy dla submodelu - } - } -#endif + if (iNumVerts) { + if( m_geometrybank == NULL ) { + m_geometrybank = GfxRenderer.Create_Bank(); + } + Root->create_geometry( m_geometrybank ); + } } }; diff --git a/Model3d.h b/Model3d.h index 136bfac7..90df8eaa 100644 --- a/Model3d.h +++ b/Model3d.h @@ -112,12 +112,15 @@ private: TSubModel *Next; TSubModel *Child; +/* intptr_t iVboPtr; +*/ geometry_handle m_geometry; // geometry of the submodel texture_handle TextureID; // numer tekstury, -1 wymienna, 0 brak bool bWire; // nie używane, ale wczytywane - // short TexAlpha; //Ra: nie używane już +/* GLuint uiDisplayList; // roboczy numer listy wyświetlania +*/ float Opacity; // nie używane, ale wczytywane //m7todo: wywalić to float f_Angle; float3 v_RotateAxis; @@ -125,7 +128,10 @@ private: public: // chwilowo float3 v_TransVector; +/* basic_vertex *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO +*/ + vertex_array Vertices; size_t iAnimOwner; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim; // kody animacji oddzielnie, bo zerowane public: @@ -138,7 +144,7 @@ public: std::string pTexture; // robocza nazwa tekstury do zapisania w pliku binarnym std::string pName; // robocza nazwa private: - int SeekFaceNormal(unsigned int *Masks, int f, unsigned int dwMask, glm::vec3 *pt, basic_vertex *Vertices); + int SeekFaceNormal( std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, vertex_array const &Vertices ); void RaAnimation(TAnimType a); public: @@ -151,13 +157,15 @@ public: TSubModel(); ~TSubModel(); void FirstInit(); - int Load(cParser &Parser, TModel3d *Model, int Pos, bool dynamic); + int Load(cParser &Parser, TModel3d *Model, /*int Pos,*/ bool dynamic); void ChildAdd(TSubModel *SubModel); void NextAdd(TSubModel *SubModel); TSubModel * NextGet() { return Next; }; TSubModel * ChildGet() { return Child; }; int TriangleAdd(TModel3d *m, texture_handle tex, int tri); +/* basic_vertex * TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ); +*/ void SetRotate(float3 vNewRotateAxis, float fNewAngle); void SetRotateXYZ(vector3 vNewAngles); void SetRotateXYZ(float3 vNewAngles); @@ -168,7 +176,10 @@ public: TSubModel * GetFromName(char const *search, bool i = true); inline float4x4 * GetMatrix() { return fMatrix; }; inline void Hide() { iVisible = 0; }; +/* void RaArrayFill(basic_vertex *Vert); +*/ + void create_geometry( geometrybank_handle const &Bank ); int FlagsCheck(); void WillBeAnimated() { @@ -241,7 +252,7 @@ public: void LoadFromTextFile(std::string const &FileName, bool dynamic); void LoadFromBinFile(std::string const &FileName, bool dynamic); bool LoadFromFile(std::string const &FileName, bool dynamic); - void SaveToBinFile(char const *FileName); + void SaveToBinFile(std::string const &FileName); void BreakHierarhy(); int Flags() const { return iFlags; }; void Init(); diff --git a/Texture.cpp b/Texture.cpp index ba7abbfe..9856a152 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -795,6 +795,8 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const texture_manager::texture( textureindex ).load(); #ifndef EU07_DEFERRED_TEXTURE_UPLOAD texture_manager::texture( textureindex ).create(); + // texture creation binds a different texture, force a re-bind on next use + m_activetexture = 0; #endif } @@ -803,16 +805,11 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const void texture_manager::bind( texture_handle const Texture ) { -/* - // NOTE: this optimization disabled for the time being, until the render code is reviewed - // having it active would lead to some terrain and spline chunks receiving wrong - // (the most recent?) texture, instead of the proper one. It'd also affect negatively - // light point rendering. - if( Id == m_activetexture ) { + + if( Texture == m_activetexture ) { // don't bind again what's already active return; } -*/ // TODO: do binding in texture object, add support for other types if( Texture != 0 ) { #ifndef EU07_DEFERRED_TEXTURE_UPLOAD diff --git a/Track.cpp b/Track.cpp index 2f58097d..5386a839 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1112,52 +1112,7 @@ void TTrack::RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joi am->GetContainer(NULL)->EventAssign(done); // zdarzenie zakończenia animacji } }; -/* -int TTrack::RaArrayPrepare() -{ // przygotowanie tablic do skopiowania do VBO (zliczanie wierzchołków) - if (bVisible) // o ile w ogóle widać - switch (iCategoryFlag & 15) - { - case 1: // tor - if (eType == tt_Switch) // dla zwrotnicy tylko szyny - return 48 * ((TextureID1 ? SwitchExtension->Segments[0]->RaSegCount() : 0) + - (TextureID2 ? SwitchExtension->Segments[1]->RaSegCount() : 0)); - else // dla toru podsypka plus szyny - return (Segment->RaSegCount()) * ((TextureID1 ? 48 : 0) + (TextureID2 ? 8 : 0)); - case 2: // droga - if (eType == tt_Cross) // tylko dla skrzyżowania dróg - { // specjalny sposób obliczania liczby wierzchołków w skrzyżowaniu - if( SwitchExtension->iRoads == 3 ) { - // mogą być tylko 3 drogi zamiast 4 - SwitchExtension->iPoints = - SwitchExtension->Segments[ 0 ]->RaSegCount() - + SwitchExtension->Segments[ 1 ]->RaSegCount() - + SwitchExtension->Segments[ 2 ]->RaSegCount(); - } - else { - SwitchExtension->iPoints = - SwitchExtension->Segments[ 2 ]->RaSegCount() - + SwitchExtension->Segments[ 3 ]->RaSegCount() - + SwitchExtension->Segments[ 4 ]->RaSegCount() - + SwitchExtension->Segments[ 5 ]->RaSegCount(); - } - // each sub-segment covers only one side of the road, so it has points for single sideroad, if any - return ( ( TextureID1 ? SwitchExtension->iPoints + SwitchExtension->iRoads + 2 : 0 ) + ( TextureID2 ? SwitchExtension->iPoints * 6 : 0 ) ); - } - else // standardowo dla zwykłej drogi - if (fTexHeight1 >= 0) // jeśli fTexHeight1<0, to są chodniki i może któregoś nie być - return ( Segment->RaSegCount()) * - ((TextureID1 ? 4 : 0) + (TextureID2 ? 12 : 0)); // może nie być poziomego! - else - return (Segment->RaSegCount()) * - ((TextureID1 ? 4 : 0) + - (TextureID2 ? (fTexWidth != 0.0 ? 6 : 0) + (fTexSlope != 0.0 ? 6 : 0) : 0)); - case 4: // rzeki do przemyślenia - return (Segment->RaSegCount()) * ((TextureID1 ? 4 : 0) + (TextureID2 ? 12 : 0)); - } - return 0; -}; -*/ + // wypełnianie tablic VBO void TTrack::create_geometry( geometrybank_handle const &Bank ) { // Ra: trzeba rozdzielić szyny od podsypki, aby móc grupować wg tekstur @@ -1875,159 +1830,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } return; }; -/* -void TTrack::RaRenderVBO( int iPtr ) { // renderowanie z użyciem VBO - // Ra 2014-07: trzeba wymienić GL_TRIANGLE_STRIP na GL_TRIANGLES i renderować trójkąty sektora dla kolejnych tekstur! - EnvironmentSet(); - int seg; - switch( iCategoryFlag & 15 ) { - case 1: { - // tor - if( eType == tt_Switch ) // dla zwrotnicy tylko szyny - { - int const bladesegmentcount = 2; - if( TextureID1 ) { - if( ( seg = SwitchExtension->Segments[ 0 ]->RaSegCount() ) > 0 ) { - GfxRenderer.Bind( TextureID1 ); // szyny + - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); - iPtr += 24 * seg; - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * ( seg - bladesegmentcount ) ); - // NOTE: due to way blades bend need to render each segment separately, or some unwanted edges may show - iPtr += 24 * ( seg - bladesegmentcount ); - for( int i = 0; i < bladesegmentcount; ++i ) { - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 ); - iPtr += 24; - } - } - } - if( TextureID2 ) { - if( ( seg = SwitchExtension->Segments[ 1 ]->RaSegCount() ) > 0 ) { - GfxRenderer.Bind( TextureID2 ); - // NOTE: due to way blades bend need to render each segment separately, or some unwanted edges may show - for( int i = 0; i < bladesegmentcount; ++i ) { - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 ); - iPtr += 24; - } - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * ( seg - bladesegmentcount ) ); - iPtr += 24 * ( seg - bladesegmentcount ); - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); - iPtr += 24 * seg; - } - } - } - else // dla toru podsypka plus szyny - { - if( ( seg = Segment->RaSegCount() ) > 0 ) { - if( TextureID2 ) { - GfxRenderer.Bind( TextureID2 ); // podsypka - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 8 * seg ); - iPtr += 8 * seg; // pominięcie podsypki - } - if( TextureID1 ) { - GfxRenderer.Bind( TextureID1 ); // szyny - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); - iPtr += 24 * seg; // pominięcie lewej szyny - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 24 * seg ); - iPtr += 24 * seg; - } - } - } - break; - } - case 2: { - // droga - switch( eType ) { - case tt_Normal: { - if( ( seg = Segment->RaSegCount() ) > 0 ) { - if( TextureID1 ) { - GfxRenderer.Bind( TextureID1 ); // nawierzchnia - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 4 * seg ); - iPtr += 4 * seg; - } - if( TextureID2 ) { - GfxRenderer.Bind( TextureID2 ); // pobocze - if( fTexHeight1 >= 0.0 ) { // normalna droga z poboczem - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); - iPtr += 6 * seg; // pominięcie lewego pobocza - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); - iPtr += 6 * seg; - } - else { // z chodnikami o różnych szerokociach - if( fTexWidth != 0.0 ) { - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); - iPtr += 6 * seg; // pominięcie lewego pobocza - } - if( fTexSlope != 0.0 ) { - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); - iPtr += 6 * seg; - } - } - } - } - break; - } - case tt_Cross: { - if( (seg = SwitchExtension->iPoints) > 0 ) { - if( TextureID2 ) { - // sidewalks - GfxRenderer.Bind( TextureID2 ); - if( fTexHeight1 != 0.0 ) { - if( SwitchExtension->iRoads == 4 ) { - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 2 ]->RaSegCount() ); - iPtr += 6 * SwitchExtension->Segments[ 2 ]->RaSegCount(); - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 3 ]->RaSegCount() ); - iPtr += 6 * SwitchExtension->Segments[ 3 ]->RaSegCount(); - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 4 ]->RaSegCount() ); - iPtr += 6 * SwitchExtension->Segments[ 4 ]->RaSegCount(); - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 5 ]->RaSegCount() ); - iPtr += 6 * SwitchExtension->Segments[ 5 ]->RaSegCount(); - } - else { - // presumed 3 roads otherwise, as we only support 3 & 4 road crossings - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 2 ]->RaSegCount() ); - iPtr += 6 * SwitchExtension->Segments[ 2 ]->RaSegCount(); - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 1 ]->RaSegCount() ); - iPtr += 6 * SwitchExtension->Segments[ 1 ]->RaSegCount(); - ::glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * SwitchExtension->Segments[ 0 ]->RaSegCount() ); - iPtr += 6 * SwitchExtension->Segments[ 0 ]->RaSegCount(); - } - } - } - if( TextureID1 ) { - // roads - GfxRenderer.Bind( TextureID1 ); - ::glDrawArrays( GL_TRIANGLE_FAN, iPtr, SwitchExtension->iPoints + SwitchExtension->iRoads + 2 ); - iPtr += SwitchExtension->iPoints; - } - } - break; - } - default: { break; } - } //switch etype - break; - } - case 4: { - // rzeki - jeszcze do przemyślenia - if( ( seg = Segment->RaSegCount() ) > 0 ) { - if( TextureID1 ) { - GfxRenderer.Bind( TextureID1 ); // nawierzchnia - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 4 * seg ); - iPtr += 4 * seg; - } - if( TextureID2 ) { - GfxRenderer.Bind( TextureID2 ); // pobocze - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); - iPtr += 6 * seg; // pominięcie lewego pobocza - glDrawArrays( GL_TRIANGLE_STRIP, iPtr, 6 * seg ); - iPtr += 6 * seg; - } - } - break; - } - } - EnvironmentReset(); -}; -*/ + void TTrack::EnvironmentSet() { // ustawienie zmienionego światła glColor3f(1.0f, 1.0f, 1.0f); // Ra: potrzebne to? diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index f75906b1..2f18a7c5 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -48,11 +48,11 @@ basic_vertex::deserialize( std::istream &s ) { // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk geometry_handle -geometry_bank::create( vertex_array &Vertices, unsigned int const Type, unsigned int const Streams ) { +geometry_bank::create( vertex_array &Vertices, unsigned int const Type ) { if( true == Vertices.empty() ) { return geometry_handle( 0, 0 ); } - m_chunks.emplace_back( Vertices, Type, Streams ); + m_chunks.emplace_back( Vertices, Type ); // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication geometry_handle chunkhandle { 0, static_cast(m_chunks.size()) }; // template method @@ -98,9 +98,9 @@ geometry_bank::append( vertex_array &Vertices, geometry_handle const &Geometry ) // draws geometry stored in specified chunk void -geometry_bank::draw( geometry_handle const &Geometry ) { +geometry_bank::draw( geometry_handle const &Geometry, unsigned int const Streams ) { // template method - draw_( Geometry ); + draw_( Geometry, Streams ); } vertex_array const & @@ -111,7 +111,8 @@ geometry_bank::vertices( geometry_handle const &Geometry ) const { // opengl vbo-based variant of the geometry bank -GLuint opengl_vbogeometrybank::m_activebuffer{ NULL }; // buffer bound currently on the opengl end, if any +GLuint opengl_vbogeometrybank::m_activebuffer { NULL }; // buffer bound currently on the opengl end, if any +unsigned int opengl_vbogeometrybank::m_activestreams { stream::none }; // currently enabled data type pointers // create() subclass details void @@ -140,7 +141,7 @@ opengl_vbogeometrybank::replace_( geometry_handle const &Geometry ) { // draw() subclass details void -opengl_vbogeometrybank::draw_( geometry_handle const &Geometry ) { +opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, unsigned int const Streams ) { if( m_buffer == NULL ) { // if there's no buffer, we'll have to make one @@ -152,6 +153,7 @@ opengl_vbogeometrybank::draw_( geometry_handle const &Geometry ) { auto chunkiterator = m_chunks.cbegin(); for( auto &chunkrecord : m_chunkrecords ) { // fill records for all chunks, based on the chunk data + chunkrecord.is_good = false; // if we're re-creating buffer, chunks might've been uploaded in the old one chunkrecord.offset = datasize; chunkrecord.size = chunkiterator->vertices.size(); datasize += chunkrecord.size; @@ -193,6 +195,9 @@ opengl_vbogeometrybank::draw_( geometry_handle const &Geometry ) { chunk.vertices.data() ); chunkrecord.is_good = true; } + if( m_activestreams != Streams ) { + bind_streams( Streams ); + } // ...render... ::glDrawArrays( chunk.type, chunkrecord.offset, chunkrecord.size ); // ...post-render cleanup @@ -208,16 +213,8 @@ void opengl_vbogeometrybank::bind_buffer() { ::glBindBuffer( GL_ARRAY_BUFFER, m_buffer ); - // TODO: allow specifying other vertex data setups - ::glVertexPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) ); - ::glNormalPointer( GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + sizeof(float) * 3 ); // normalne - ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); // wierzchołki - // TODO: allow specifying other vertex data setups, either in the draw() parameters or during chunk or buffer creation - ::glEnableClientState( GL_VERTEX_ARRAY ); - ::glEnableClientState( GL_NORMAL_ARRAY ); - ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); - m_activebuffer = m_buffer; + m_activestreams = stream::none; } void @@ -231,9 +228,47 @@ opengl_vbogeometrybank::delete_buffer() { } m_buffer = NULL; m_buffercapacity = 0; + // NOTE: since we've deleted the buffer all chunks it held were rendered invalid as well + // instead of clearing their state here we're delaying it until new buffer is created to avoid looping through chunk records twice } } +void +opengl_vbogeometrybank::bind_streams( unsigned int const Streams ) { + + if( Streams & stream::position ) { + ::glVertexPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) ); + ::glEnableClientState( GL_VERTEX_ARRAY ); + } + else { + ::glDisableClientState( GL_VERTEX_ARRAY ); + } + // NOTE: normal and color streams share the data, making them effectively mutually exclusive + if( Streams & stream::normal ) { + ::glNormalPointer( GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + sizeof( float ) * 3 ); + ::glEnableClientState( GL_NORMAL_ARRAY ); + } + else { + ::glDisableClientState( GL_NORMAL_ARRAY ); + } + if( Streams & stream::color ) { + ::glColorPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + sizeof( float ) * 3 ); + ::glEnableClientState( GL_COLOR_ARRAY ); + } + else { + ::glDisableClientState( GL_COLOR_ARRAY ); + } + if( Streams & stream::texture ) { + ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); + ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + } + else { + ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + } + + m_activestreams = Streams; +} + // opengl display list based variant of the geometry bank // create() subclass details @@ -252,21 +287,25 @@ opengl_dlgeometrybank::replace_( geometry_handle const &Geometry ) { // draw() subclass details void -opengl_dlgeometrybank::draw_( geometry_handle const &Geometry ) { +opengl_dlgeometrybank::draw_( geometry_handle const &Geometry, unsigned int const Streams ) { auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; + if( chunkrecord.streams != Streams ) { + delete_list( Geometry ); + } if( chunkrecord.list == 0 ) { // we don't have a list ready, so compile one + chunkrecord.streams = Streams; chunkrecord.list = ::glGenLists( 1 ); auto const &chunk = geometry_bank::chunk( Geometry ); ::glNewList( chunkrecord.list, GL_COMPILE ); ::glBegin( chunk.type ); - // TODO: add specification of chunk vertex attributes for( auto const &vertex : chunk.vertices ) { - ::glNormal3fv( glm::value_ptr( vertex.normal ) ); - ::glTexCoord2fv( glm::value_ptr( vertex.texture ) ); - ::glVertex3fv( glm::value_ptr( vertex.position ) ); + if( Streams & stream::normal ) { ::glNormal3fv( glm::value_ptr( vertex.normal ) ); } + else if( Streams & stream::color ) { ::glColor3fv( glm::value_ptr( vertex.normal ) ); } + if( Streams & stream::texture ) { ::glTexCoord2fv( glm::value_ptr( vertex.texture ) ); } + if( Streams & stream::position ) { ::glVertex3fv( glm::value_ptr( vertex.position ) ); } } ::glEnd(); ::glEndList(); @@ -279,8 +318,11 @@ void opengl_dlgeometrybank::delete_list( geometry_handle const &Geometry ) { // NOTE: given it's our own internal method we trust it to be called with valid parameters auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; - ::glDeleteLists( chunkrecord.list, 1 ); - chunkrecord.list = 0; + if( chunkrecord.list != 0 ) { + ::glDeleteLists( chunkrecord.list, 1 ); + chunkrecord.list = 0; + } + chunkrecord.streams = stream::none; } // geometry bank manager, holds collection of geometry banks @@ -320,11 +362,11 @@ geometrybank_manager::append( vertex_array &Vertices, geometry_handle const &Geo } // draws geometry stored in specified chunk void -geometrybank_manager::draw( geometry_handle const &Geometry ) { +geometrybank_manager::draw( geometry_handle const &Geometry, unsigned int const Streams ) { if( Geometry == NULL ) { return; } - return bank( Geometry )->draw( Geometry ); + return bank( Geometry )->draw( Geometry, Streams ); } // provides direct access to vertex data of specfied chunk diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 4a41a51e..a6868a2f 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -33,10 +33,11 @@ struct basic_vertex { // data streams carried in a vertex enum stream { + none = 0x0, position = 0x1, - normal = 0x2, - color = 0x4, // currently normal and colour streams are stored in the same slot, and mutually exclusive - texture = 0x8 + normal = 0x2, + color = 0x4, // currently normal and colour streams are stored in the same slot, and mutually exclusive + texture = 0x8 }; unsigned int const basic_streams { stream::position | stream::normal | stream::texture }; @@ -87,7 +88,7 @@ public: // methods: // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk or NULL geometry_handle - create( vertex_array &Vertices, unsigned int const Type, unsigned int const Streams = stream::position | stream::normal | stream::texture ); + create( vertex_array &Vertices, unsigned int const Type ); // replaces data of specified chunk with the supplied vertex data, starting from specified offset bool replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset = 0 ); @@ -96,11 +97,11 @@ public: append( vertex_array &Vertices, geometry_handle const &Geometry ); // draws geometry stored in specified chunk void - draw( geometry_handle const &Geometry ); + draw( geometry_handle const &Geometry, unsigned int const Streams = basic_streams ); // draws geometry stored in supplied list of chunks template void - draw( Iterator_ First, Iterator_ Last ) { while( First != Last ) { draw( *First ); ++First; } } + draw( Iterator_ First, Iterator_ Last, unsigned int const Streams = basic_streams ) { while( First != Last ) { draw( *First, Streams ); ++First; } } // provides direct access to vertex data of specfied chunk vertex_array const & vertices( geometry_handle const &Geometry ) const; @@ -108,12 +109,11 @@ public: protected: // types: struct geometry_chunk { - unsigned int streams; // data streams carried by vertices unsigned int type; // kind of geometry used by the chunk vertex_array vertices; // geometry data - geometry_chunk( vertex_array &Vertices, unsigned int const Type, unsigned int const Streams ) : - vertices( Vertices ), type( Type ), streams( Streams ) + geometry_chunk( vertex_array &Vertices, unsigned int const Type ) : + vertices( Vertices ), type( Type ) {} }; @@ -139,7 +139,7 @@ private: // replace() subclass details virtual void replace_( geometry_handle const &Geometry ) = 0; // draw() subclass details - virtual void draw_( geometry_handle const &Geometry ) = 0; + virtual void draw_( geometry_handle const &Geometry, unsigned int const Streams ) = 0; }; // opengl vbo-based variant of the geometry bank @@ -154,7 +154,8 @@ public: static void reset() { - m_activebuffer = 0; } + m_activebuffer = 0; + m_activestreams = stream::none; } private: // types: @@ -175,15 +176,18 @@ private: replace_( geometry_handle const &Geometry ); // draw() subclass details void - draw_( geometry_handle const &Geometry ); + draw_( geometry_handle const &Geometry, unsigned int const Streams ); void bind_buffer(); void delete_buffer(); + void + bind_streams( unsigned int const Streams ); // members: static GLuint m_activebuffer; // buffer bound currently on the opengl end, if any - GLuint m_buffer{ NULL }; // id of the buffer holding data on the opengl end + static unsigned int m_activestreams; + GLuint m_buffer { NULL }; // id of the buffer holding data on the opengl end std::size_t m_buffercapacity{ 0 }; // total capacity of the last established buffer chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order @@ -202,7 +206,8 @@ public: private: // types: struct chunk_record { - GLuint list{ 0 }; // display list associated with the chunk + GLuint list { 0 }; // display list associated with the chunk + unsigned int streams { 0 }; // stream combination used to generate the display list }; typedef std::vector chunkrecord_sequence; @@ -216,7 +221,7 @@ private: replace_( geometry_handle const &Geometry ); // draw() subclass details void - draw_( geometry_handle const &Geometry ); + draw_( geometry_handle const &Geometry, unsigned int const Streams ); void delete_list( geometry_handle const &Geometry ); @@ -247,12 +252,12 @@ public: append( vertex_array &Vertices, geometry_handle const &Geometry ); // draws geometry stored in specified chunk void - draw( geometry_handle const &Geometry ); + draw( geometry_handle const &Geometry, unsigned int const Streams = basic_streams ); template void - draw( Iterator_ First, Iterator_ Last ) { + draw( Iterator_ First, Iterator_ Last, unsigned int const Streams = basic_streams ) { while( First != Last ) { - draw( *First ); + draw( *First, Streams ); ++First; } } // provides direct access to vertex data of specfied chunk vertex_array const & diff --git a/renderer.cpp b/renderer.cpp index 242d29ae..f7970509 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -157,7 +157,6 @@ opengl_renderer::Render() { // frustum tests are performed in 'world space' but after we set up frustum // we no longer need camera translation, only rotation ::glMultMatrixd( glm::value_ptr( glm::dmat4( glm::dmat3( worldcamera )))); - Render( &World.Environment ); Render( &World.Ground ); @@ -835,27 +834,8 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glDisable( GL_LIGHTING ); // main draw call - // TODO: add support for colour data draw mode - m_geometry.draw( Submodel->m_geometry ); -/* - if( Global::bUseVBO ) { - // NOTE: we're doing manual switch to color vbo setup, because there doesn't seem to be any convenient way available atm - // TODO: implement easier way to go about it - ::glDisableClientState( GL_NORMAL_ARRAY ); - ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); - ::glEnableClientState( GL_COLOR_ARRAY ); - ::glColorPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 12 ); // kolory + m_geometry.draw( Submodel->m_geometry, color_streams ); - ::glDrawArrays( GL_POINTS, Submodel->iVboPtr, Submodel->iNumVerts ); - - ::glDisableClientState( GL_COLOR_ARRAY ); - ::glEnableClientState( GL_NORMAL_ARRAY ); - ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); - } - else { - ::glCallList( Submodel->uiDisplayList ); - } -*/ // post-draw reset ::glPopAttrib(); } @@ -986,9 +966,6 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // pozniej sprawdzamy czy jest wlaczony PROBLEND dla aktualnie renderowanego noda TRIANGLE, // wlasciwie dla kazdego node'a // i jezeli tak to odpowiedni GL_GREATER w przeciwnym wypadku standardowy 0.04 -/* - Node->SetLastUsage( Timer::GetSimulationTime() ); -*/ double const distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { From 34a899239f75ce501a263129c136d7205d295470 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 18 Jun 2017 01:16:28 +0200 Subject: [PATCH 127/426] build 170617. frustum based ground sector culling, fully view range based draw range limit, support for line width parameter for lines --- Ground.cpp | 30 ++--- Ground.h | 2 - Model3d.cpp | 244 ++++++++++++++++------------------------- Model3d.h | 110 +++++++++---------- PyInt.cpp | 2 +- World.cpp | 10 +- openglgeometrybank.cpp | 2 +- openglgeometrybank.h | 10 +- renderer.cpp | 181 +++++++++++------------------- renderer.h | 4 +- version.h | 2 +- 11 files changed, 240 insertions(+), 357 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index bff36c80..76666103 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -39,7 +39,6 @@ http://mozilla.org/MPL/2.0/. #include "world.h" #include "uilayer.h" -#define _PROBLEND 1 //--------------------------------------------------------------------------- extern "C" @@ -1283,18 +1282,16 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) *parser >> token; } str = token; -#ifdef _PROBLEND - // PROBLEND Q: 13122011 - Szociu: 27012012 - PROBLEND = true; // domyslnie uruchomione nowe wyświetlanie - tmp->PROBLEND = true; // odwolanie do tgroundnode, bo rendering jest w tej klasie - if (str.find('@') != std::string::npos) // sprawdza, czy w nazwie tekstury jest znak "@" - { - PROBLEND = false; // jeśli jest, wyswietla po staremu - tmp->PROBLEND = false; - } -#endif tmp->TextureID = GfxRenderer.GetTextureId( str, szTexturePath ); - tmp->iFlags = GfxRenderer.Texture(tmp->TextureID).has_alpha ? 0x220 : 0x210; // z usuwaniem + + tmp->iFlags |= 200; // z usuwaniem + // remainder of legacy 'problend' system -- geometry assigned a texture with '@' in its name is treated as translucent, opaque otherwise + tmp->iFlags |= ( + ( ( str.find( '@' ) != std::string::npos ) + && ( true == GfxRenderer.Texture( tmp->TextureID ).has_alpha ) ) ? + 0x20 : + 0x10 ); + if( (tmp->iType == GL_TRIANGLES) && (tmp->iFlags & 0x10) && (Global::pTerrainCompact->TerrainLoaded()) ) { @@ -1327,7 +1324,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) vertex.normal = glm::rotateX( vertex.normal, static_cast( aRotate.x / 180 * M_PI ) ); vertex.normal = glm::rotateY( vertex.normal, static_cast( aRotate.y / 180 * M_PI ) ); vertex.position += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); - tmp->pCenter += vertex.position; // convert all data to gl_triangles to allow data merge for matching nodes switch( tmp->iType ) { case GL_TRIANGLES: { @@ -1370,6 +1366,10 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) auto const nv = importedvertices.size(); tmp->Init(nv); // utworzenie tablicy wierzchołków + + for( std::size_t i = 0; i < nv; ++i ) { + tmp->pCenter += importedvertices[ i ].position; + } tmp->pCenter /= (nv > 0 ? nv : 1); r = 0; @@ -1411,7 +1411,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); vertex.position += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); - tmp->pCenter += vertex.position; // convert all data to gl_lines to allow data merge for matching nodes switch( tmp->iType ) { case GL_LINES: { @@ -1460,10 +1459,11 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) auto const nv = importedvertices.size(); tmp->Points = new glm::dvec3[ nv ]; tmp->iNumPts = nv; - tmp->pCenter /= ( nv > 0 ? nv : 1 ); for( std::size_t i = 0; i < nv; ++i ) { tmp->Points[ i ] = importedvertices[ i ].position; + tmp->pCenter += importedvertices[ i ].position; } + tmp->pCenter /= ( nv > 0 ? nv : 1 ); break; } } diff --git a/Ground.h b/Ground.h index c3773de0..4edf8976 100644 --- a/Ground.h +++ b/Ground.h @@ -149,7 +149,6 @@ public: Diffuse{ 1.0f, 1.0f, 1.0f }, Specular{ 1.0f, 1.0f, 1.0f }; // oświetlenie double fLineThickness; // McZapkie-120702: grubosc linii - bool PROBLEND; bool bVisible; TGroundNode(); @@ -283,7 +282,6 @@ class TGround event_map m_eventmap; TNames m_trackmap; light_array m_lights; // collection of dynamic light sources present in the scene - bool PROBLEND; private: // metody prywatne bool EventConditon(TEvent *e); diff --git a/Model3d.cpp b/Model3d.cpp index ab655643..e7617e06 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -42,69 +42,6 @@ std::string *TSubModel::pasText; // 0x3F3F003F - wszystkie wymienne tekstury używane w danym cyklu // Ale w TModel3d okerśla przezroczystość tekstur wymiennych! -TSubModel::TSubModel() -{ - ::SecureZeroMemory(this, sizeof(TSubModel)); // istotne przy zapisywaniu wersji binarnej - FirstInit(); -}; - -void TSubModel::FirstInit() -{ - eType = TP_ROTATOR; -/* - Vertices = NULL; - uiDisplayList = 0; -*/ - iNumVerts = -1; // do sprawdzenia -/* - iVboPtr = -1; -*/ - fLight = -1.0; //świetcenie wyłączone - v_RotateAxis = float3(0, 0, 0); - v_TransVector = float3(0, 0, 0); - f_Angle = 0; - b_Anim = at_None; - b_aAnim = at_None; - fVisible = 0.0; // zawsze widoczne - iVisible = 1; - fMatrix = NULL; // to samo co iMatrix=0; - Next = NULL; - Child = NULL; - TextureID = 0; - // TexAlpha=false; - iFlags = 0x0200; // bit 9=1: submodel został utworzony a nie ustawiony na - // wczytany plik - // TexHash=false; - // Hits=NULL; - // CollisionPts=NULL; - // CollisionPtsCount=0; - Opacity = 0.0f; // przy wczytywaniu modeli było dzielone przez 100... - bWire = false; - fWireSize = 0; - fNearAttenStart = 40; - fNearAttenEnd = 80; - bUseNearAtten = false; - iFarAttenDecay = 0; - fFarDecayRadius = 100.0f; - fCosFalloffAngle = 0.5f; // 120°? - fCosHotspotAngle = 0.3f; // 145°? - fCosViewAngle = 0; - fSquareMaxDist = 10000 * 10000; // 10km - fSquareMinDist = 0; - iName = -1; // brak nazwy - iTexture = 0; // brak tekstury - // asName=""; - // asTexture=""; - pName = ""; - pTexture = ""; - f4Ambient[0] = f4Ambient[1] = f4Ambient[2] = f4Ambient[3] = 1.0; //{1,1,1,1}; - f4Diffuse[0] = f4Diffuse[1] = f4Diffuse[2] = f4Diffuse[3] = 1.0; //{1,1,1,1}; - f4Specular[0] = f4Specular[1] = f4Specular[2] = 0.0; - f4Specular[3] = 1.0; //{0,0,0,1}; - f4Emision[0] = f4Emision[1] = f4Emision[2] = f4Emision[3] = 1.0; - smLetter = NULL; // używany tylko roboczo dla TP_TEXT, do przyspieszenia wyświetlania -}; - TSubModel::~TSubModel() { /* @@ -141,9 +78,6 @@ void TSubModel::NameSet(std::string const &Name) pName = Name; }; -// int TSubModel::SeekFaceNormal(DWORD *Masks, int f,DWORD dwMask,vector3 -// *pt,GLVERTEX -// *Vertices) int TSubModel::SeekFaceNormal(std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, vertex_array const &Vertices) { // szukanie punktu stycznego do (pt), zwraca numer wierzchołka, a nie trójkąta int facecount = iNumVerts / 3; // bo maska powierzchni jest jedna na trójkąt @@ -518,11 +452,14 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic std::vector facenormals; for( int i = 0; i < facecount; ++i ) { // pętla po trójkątach - będzie szybciej, jak wstępnie przeliczymy normalne trójkątów + auto facenormal = + glm::cross( + Vertices[ i * 3 ].position - Vertices[ i * 3 + 1 ].position, + Vertices[ i * 3 ].position - Vertices[ i * 3 + 2 ].position ); facenormals.emplace_back( - glm::normalize( - glm::cross( - Vertices[ i * 3 ].position - Vertices[ i * 3 + 1 ].position, - Vertices[ i * 3 ].position - Vertices[ i * 3 + 2 ].position ) ) ); + glm::length( facenormal ) > 0.0f ? + glm::normalize( facenormal ) : + glm::vec3() ); } glm::vec3 vertexnormal; // roboczy wektor normalny for (int vertexidx = 0; vertexidx < iNumVerts; ++vertexidx) { @@ -544,7 +481,10 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic adjacenvertextidx = SeekFaceNormal(sg, adjacenvertextidx / 3 + 1, sg[faceidx], Vertices[vertexidx].position, Vertices); } // Ra 15-01: należało by jeszcze uwzględnić skalowanie wprowadzane przez transformy, aby normalne po przeskalowaniu były jednostkowe - Vertices[vertexidx].normal = glm::normalize(vertexnormal); // przepisanie do wierzchołka trójkąta + Vertices[ vertexidx ].normal = ( + glm::length( vertexnormal ) > 0.0f ? + glm::normalize( vertexnormal ) : + glm::vec3() ); // przepisanie do wierzchołka trójkąta } } /* @@ -755,7 +695,10 @@ void TSubModel::InitialRotate(bool doit) if( eType != TP_STARS ) { // gwiazdki mają kolory zamiast normalnych, to ich wtedy nie ruszamy for( auto &vertex : Vertices ) { - vertex.normal = glm::normalize( ( *mat ) * vertex.normal ); + vertex.normal = ( + glm::length( vertex.normal ) > 0.0f ? + glm::normalize( ( *mat ) * vertex.normal ) : + glm::vec3() ); } } } @@ -772,18 +715,18 @@ void TSubModel::InitialRotate(bool doit) /* for( auto &vertex : Vertices ) { */ - for( int idx = 0; idx < iNumVerts; ++idx ) { - Vertices[idx].position.x = -Vertices[idx].position.x; // zmiana znaku X - swapcopy = Vertices[idx].position.y; // zamiana Y i Z - Vertices[idx].position.y = Vertices[idx].position.z; - Vertices[idx].position.z = swapcopy; + for( auto &vertex : Vertices ) { + vertex.position.x = -vertex.position.x; // zmiana znaku X + swapcopy = vertex.position.y; // zamiana Y i Z + vertex.position.y = vertex.position.z; + vertex.position.z = swapcopy; // wektory normalne również trzeba przekształcić, bo się źle oświetlają if( eType != TP_STARS ) { // gwiazdki mają kolory zamiast normalnych, to // ich wtedy nie ruszamy - Vertices[idx].normal.x = -Vertices[idx].normal.x; // zmiana znaku X - swapcopy = Vertices[idx].normal.y; // zamiana Y i Z - Vertices[idx].normal.y = Vertices[idx].normal.z; - Vertices[idx].normal.z = swapcopy; + vertex.normal.x = -vertex.normal.x; // zmiana znaku X + swapcopy = vertex.normal.y; // zamiana Y i Z + vertex.normal.y = vertex.normal.z; + vertex.normal.z = swapcopy; } } // } @@ -1050,30 +993,34 @@ void TSubModel::RaAnimation(TAnimType a) }; //--------------------------------------------------------------------------- -/* -void TSubModel::RaArrayFill(basic_vertex *Vert) -{ // wypełnianie tablic VBO - if (Child) - Child->RaArrayFill(Vert); - if( ( eType < TP_ROTATOR ) || ( eType == TP_STARS ) ) - for( int i = 0; i < iNumVerts; ++i ) { - Vert[ iVboPtr + i ].position = Vertices[ i ].position; - Vert[ iVboPtr + i ].normal = Vertices[ i ].normal; - Vert[ iVboPtr + i ].texture = Vertices[ i ].texture; + +void TSubModel::serialize_geometry( std::ostream &Output ) { + + if( Child ) { + Child->serialize_geometry( Output ); + } + if( m_geometry != NULL ) { + for( auto const &vertex : GfxRenderer.Vertices( m_geometry ) ) { + vertex.serialize( Output ); } - else if( eType == TP_FREESPOTLIGHT ) - Vert[ iVboPtr ].position = glm::vec3(); - if (Next) - Next->RaArrayFill(Vert); + } + if( Next ) { + Next->serialize_geometry( Output ); + } }; -*/ + void -TSubModel::create_geometry( geometrybank_handle const &Bank ) { +TSubModel::create_geometry( std::size_t &Dataoffset, geometrybank_handle const &Bank ) { + + // data offset is used to determine data offset of each submodel into single shared geometry bank + // (the offsets are part of legacy system which we now need to work around for backward compatibility) if( Child ) - Child->create_geometry( Bank ); + Child->create_geometry( Dataoffset, Bank ); if( false == Vertices.empty() ) { + tVboPtr = static_cast( Dataoffset ); + Dataoffset += Vertices.size(); // conveniently all relevant custom node types use GL_POINTS, or we'd have to determine the type on individual basis auto type = ( eType < TP_ROTATOR ? @@ -1083,7 +1030,7 @@ TSubModel::create_geometry( geometrybank_handle const &Bank ) { } if( Next ) - Next->create_geometry( Bank ); + Next->create_geometry( Dataoffset, Bank ); } // NOTE: leftover from static distance factor adjustment. @@ -1140,25 +1087,34 @@ void TSubModel::ParentMatrix(float4x4 *m) // nie obrócono jeszcze }; -float TSubModel::MaxY( float4x4 const &m ) -{ // obliczenie maksymalnej wysokości, na początek ślizgu w pantografie - if( eType != 4 ) { - // tylko dla trójkątów liczymy - return 0; - } - if( m_geometry == NULL ) { - return 0; - } +// obliczenie maksymalnej wysokości, na początek ślizgu w pantografie +float TSubModel::MaxY( float4x4 const &m ) { + // tylko dla trójkątów liczymy + if( eType != 4 ) { return 0; } auto maxy { 0.0f }; - for( auto const &vertex : GfxRenderer.Vertices( m_geometry ) ) { + // binary and text models invoke this function at different stages, either after or before geometry data was sent to the geometry manager + if( m_geometry != NULL ) { - maxy = std::max( - maxy, - m[ 0 ][ 1 ] * vertex.position.x - + m[ 1 ][ 1 ] * vertex.position.y - + m[ 2 ][ 1 ] * vertex.position.z - + m[ 3 ][ 1 ] ); + for( auto const &vertex : GfxRenderer.Vertices( m_geometry ) ) { + maxy = std::max( + maxy, + m[ 0 ][ 1 ] * vertex.position.x + + m[ 1 ][ 1 ] * vertex.position.y + + m[ 2 ][ 1 ] * vertex.position.z + + m[ 3 ][ 1 ] ); + } + } + else if( false == Vertices.empty() ) { + + for( auto const &vertex : Vertices ) { + maxy = std::max( + maxy, + m[ 0 ][ 1 ] * vertex.position.x + + m[ 1 ][ 1 ] * vertex.position.y + + m[ 2 ][ 1 ] * vertex.position.z + + m[ 3 ][ 1 ] ); + } } return maxy; @@ -1316,10 +1272,10 @@ void TSubModel::serialize(std::ostream &s, sn_utils::ls_int32(s, iFlags); sn_utils::ls_int32(s, (int32_t)get_container_pos(transforms, *fMatrix)); -/* + sn_utils::ls_int32(s, iNumVerts); - sn_utils::ls_int32(s, (int)iVboPtr); -*/ + sn_utils::ls_int32(s, tVboPtr); + if (TextureID <= 0) sn_utils::ls_int32(s, TextureID); else @@ -1358,9 +1314,6 @@ void TSubModel::serialize(std::ostream &s, void TModel3d::SaveToBinFile(std::string const &FileName) { - // TODO: re-implement! - return; - WriteLog("saving e3d model.."); //m7todo: można by zoptymalizować robiąc unordered_map @@ -1396,20 +1349,11 @@ void TModel3d::SaveToBinFile(std::string const &FileName) sn_utils::ls_uint32(s, 8 + (uint32_t)transforms.size() * 64); for (size_t i = 0; i < transforms.size(); i++) transforms[i].serialize_float32(s); -/* - MakeArray(iNumVerts); -#ifdef EU07_USE_OLD_VERTEXBUFFER - Root->RaArrayFill(m_pVNT); -#else - Root->RaArrayFill( m_pVNT.data() ); -#endif -*/ - sn_utils::ls_uint32(s, MAKE_ID4('V', 'N', 'T', '0')); + + sn_utils::ls_uint32(s, MAKE_ID4('V', 'N', 'T', '0')); sn_utils::ls_uint32(s, 8 + iNumVerts * 32); -/* - for (size_t i = 0; i < (size_t)iNumVerts; i++) - m_pVNT[i].serialize(s); -*/ + Root->serialize_geometry( s ); + if (textures.size()) { sn_utils::ls_uint32(s, MAKE_ID4('T', 'E', 'X', '0')); @@ -1555,6 +1499,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) for( auto const &submodeloffset : submodeloffsets ) { auto &submodel = Root[ submodeloffset.second ]; vertex_array vertices; vertices.resize( submodel.iNumVerts ); + iNumVerts += submodel.iNumVerts; for( auto &vertex : vertices ) { vertex.deserialize( s ); } @@ -1669,12 +1614,13 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, if (pTexture.find_last_of("/\\") == std::string::npos) pTexture.insert(0, Global::asCurrentTexturePath); TextureID = GfxRenderer.GetTextureId(pTexture, szTexturePath); -/* - iFlags |= - ( GfxRenderer.Texture( TextureID ).has_alpha ? - 0x20 : - 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta -*/ + if( ( iFlags & 0x30 ) == 0 ) { + // texture-alpha based fallback if for some reason we don't have opacity flag set yet + iFlags |= + ( GfxRenderer.Texture( TextureID ).has_alpha ? + 0x20 : + 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta + } } else TextureID = iTexture; @@ -1688,10 +1634,10 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, iFlags |= 0x20; } // intercept and fix hotspot values if specified in degrees and not directly - if( fCosFalloffAngle > 1.0 ) { + if( fCosFalloffAngle > 1.0f ) { fCosFalloffAngle = std::cos( DegToRad( 0.5f * fCosFalloffAngle ) ); } - if( fCosHotspotAngle > 1.0 ) { + if( fCosHotspotAngle > 1.0f ) { fCosHotspotAngle = std::cos( DegToRad( 0.5f * fCosHotspotAngle ) ); } @@ -1784,17 +1730,17 @@ void TModel3d::Init() Root->InitialRotate(true); // argumet określa, czy wykonać pierwotny obrót } iFlags |= Root->FlagsCheck() | 0x8000; // flagi całego modelu - if (false == asBinary.empty()) // jeśli jest podana nazwa - { - if (Global::iConvertModels) // i włączony zapis - SaveToBinFile( asBinary ); // utworzy tablicę (m_pVNT) - asBinary = ""; // zablokowanie powtórnego zapisu - } if (iNumVerts) { if( m_geometrybank == NULL ) { m_geometrybank = GfxRenderer.Create_Bank(); } - Root->create_geometry( m_geometrybank ); + std::size_t dataoffset = 0; + Root->create_geometry( dataoffset, m_geometrybank ); + } + if( ( Global::iConvertModels > 0 ) + && ( false == asBinary.empty() ) ) { + SaveToBinFile( asBinary ); + asBinary = ""; // zablokowanie powtórnego zapisu } } }; diff --git a/Model3d.h b/Model3d.h index 90df8eaa..fab31e2e 100644 --- a/Model3d.h +++ b/Model3d.h @@ -7,8 +7,7 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef Model3dH -#define Model3dH +#pragma once #include "GL/glew.h" #include "Parser.h" @@ -51,8 +50,6 @@ enum TAnimType // rodzaj animacji at_Undefined = 0x800000FF // animacja chwilowo nieokreślona }; -class TModel3d; - class TSubModel { // klasa submodelu - pojedyncza siatka, punkt świetlny albo grupa punktów //m7todo: zrobić normalną serializację @@ -61,15 +58,16 @@ class TSubModel friend class TModel3d; // temporary workaround. TODO: clean up class content/hierarchy private: - int iNext; - int iChild; - int eType; // Ra: modele binarne dają więcej możliwości niż mesh złożony z trójkątów - int iName; // numer łańcucha z nazwą submodelu, albo -1 gdy anonimowy + int iNext{ NULL }; + int iChild{ NULL }; + int eType{ TP_ROTATOR }; // Ra: modele binarne dają więcej możliwości niż mesh złożony z trójkątów + int iName{ -1 }; // numer łańcucha z nazwą submodelu, albo -1 gdy anonimowy public: // chwilowo - TAnimType b_Anim; + TAnimType b_Anim{ at_None }; private: - int iFlags; // flagi informacyjne: + int iFlags{ 0x0200 }; // bit 9=1: submodel został utworzony a nie ustawiony na wczytany plik + // flagi informacyjne: // bit 0: =1 faza rysowania zależy od wymiennej tekstury 0 // bit 1: =1 faza rysowania zależy od wymiennej tekstury 1 // bit 2: =1 faza rysowania zależy od wymiennej tekstury 2 @@ -84,63 +82,62 @@ private: // bit 15: =1 wymagane przechowanie macierzy (transform niejedynkowy) union { // transform, nie każdy submodel musi mieć - float4x4 *fMatrix; // pojedyncza precyzja wystarcza + float4x4 *fMatrix = nullptr; // pojedyncza precyzja wystarcza int iMatrix; // w pliku binarnym jest numer matrycy }; - int iNumVerts; // ilość wierzchołków (1 dla FreeSpotLight) + int iNumVerts{ -1 }; // ilość wierzchołków (1 dla FreeSpotLight) int tVboPtr; // początek na liście wierzchołków albo indeksów - int iTexture; // numer nazwy tekstury, -1 wymienna, 0 brak - float fVisible; // próg jasności światła do załączenia submodelu - float fLight; // próg jasności światła do zadziałania selfillum + int iTexture{ 0 }; // numer nazwy tekstury, -1 wymienna, 0 brak + float fVisible{ 0.0f }; // próg jasności światła do załączenia submodelu + float fLight{ -1.0f }; // próg jasności światła do zadziałania selfillum glm::vec4 - f4Ambient, - f4Diffuse, - f4Specular, - f4Emision; - float fWireSize; // nie używane, ale wczytywane - float fSquareMaxDist; - float fSquareMinDist; + f4Ambient{ 1.0f,1.0f,1.0f,1.0f }, + f4Diffuse{ 1.0f,1.0f,1.0f,1.0f }, + f4Specular{ 0.0f,0.0f,0.0f,1.0f }, + f4Emision{ 1.0f,1.0f,1.0f,1.0f }; + float fWireSize{ 0.0f }; // nie używane, ale wczytywane + float fSquareMaxDist{ 10000.0f * 10000.0f }; + float fSquareMinDist{ 0.0f }; // McZapkie-050702: parametry dla swiatla: - float fNearAttenStart; - float fNearAttenEnd; - bool bUseNearAtten; // te 3 zmienne okreslaja rysowanie aureoli wokol zrodla swiatla - int iFarAttenDecay; // ta zmienna okresla typ zaniku natezenia swiatla (0:brak, 1,2: potega 1/R) - float fFarDecayRadius; // normalizacja j.w. - float fCosFalloffAngle; // cosinus kąta stożka pod którym widać światło - float fCosHotspotAngle; // cosinus kąta stożka pod którym widać aureolę i zwiększone natężenie światła - float fCosViewAngle; // cos kata pod jakim sie teraz patrzy + float fNearAttenStart{ 40.0f }; + float fNearAttenEnd{ 80.0f }; + bool bUseNearAtten{ false }; // te 3 zmienne okreslaja rysowanie aureoli wokol zrodla swiatla + int iFarAttenDecay{ 0 }; // ta zmienna okresla typ zaniku natezenia swiatla (0:brak, 1,2: potega 1/R) + float fFarDecayRadius{ 100.0f }; // normalizacja j.w. + float fCosFalloffAngle{ 0.5f }; // cosinus kąta stożka pod którym widać światło + float fCosHotspotAngle{ 0.3f }; // cosinus kąta stożka pod którym widać aureolę i zwiększone natężenie światła + float fCosViewAngle{ 0.0f }; // cos kata pod jakim sie teraz patrzy - TSubModel *Next; - TSubModel *Child; + TSubModel *Next{ nullptr }; + TSubModel *Child{ nullptr }; /* intptr_t iVboPtr; */ - geometry_handle m_geometry; // geometry of the submodel - texture_handle TextureID; // numer tekstury, -1 wymienna, 0 brak - bool bWire; // nie używane, ale wczytywane + geometry_handle m_geometry{ NULL, NULL }; // geometry of the submodel + texture_handle TextureID{ NULL }; // numer tekstury, -1 wymienna, 0 brak + bool bWire{ false }; // nie używane, ale wczytywane /* GLuint uiDisplayList; // roboczy numer listy wyświetlania */ - float Opacity; // nie używane, ale wczytywane //m7todo: wywalić to - float f_Angle; - float3 v_RotateAxis; - float3 v_Angles; + float Opacity{ 1.0f }; + float f_Angle{ 0.0f }; + float3 v_RotateAxis{ 0.0f, 0.0f, 0.0f }; + float3 v_Angles { 0.0f, 0.0f, 0.0f }; public: // chwilowo - float3 v_TransVector; + float3 v_TransVector{ 0.0f, 0.0f, 0.0f }; /* basic_vertex *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO */ vertex_array Vertices; - size_t iAnimOwner; // roboczy numer egzemplarza, który ustawił animację - TAnimType b_aAnim; // kody animacji oddzielnie, bo zerowane + size_t iAnimOwner{ NULL }; // roboczy numer egzemplarza, który ustawił animację + TAnimType b_aAnim{ at_None }; // kody animacji oddzielnie, bo zerowane public: - float4x4 *mAnimMatrix; // macierz do animacji kwaternionowych (należy do AnimContainer) + float4x4 *mAnimMatrix{ nullptr }; // macierz do animacji kwaternionowych (należy do AnimContainer) public: - TSubModel ** - smLetter; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) - TSubModel *Parent; // nadrzędny, np. do wymnażania macierzy - int iVisible; // roboczy stan widoczności + TSubModel **smLetter{ nullptr }; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) + TSubModel *Parent{ nullptr }; // nadrzędny, np. do wymnażania macierzy + int iVisible{ 1 }; // roboczy stan widoczności std::string pTexture; // robocza nazwa tekstury do zapisania w pliku binarnym std::string pName; // robocza nazwa private: @@ -154,9 +151,7 @@ public: static double fSquareDist; static TModel3d *pRoot; static std::string *pasText; // tekst dla wyświetlacza (!!!! do przemyślenia) - TSubModel(); ~TSubModel(); - void FirstInit(); int Load(cParser &Parser, TModel3d *Model, /*int Pos,*/ bool dynamic); void ChildAdd(TSubModel *SubModel); void NextAdd(TSubModel *SubModel); @@ -176,10 +171,8 @@ public: TSubModel * GetFromName(char const *search, bool i = true); inline float4x4 * GetMatrix() { return fMatrix; }; inline void Hide() { iVisible = 0; }; -/* - void RaArrayFill(basic_vertex *Vert); -*/ - void create_geometry( geometrybank_handle const &Bank ); + + void create_geometry( std::size_t &Dataoffset, geometrybank_handle const &Bank ); int FlagsCheck(); void WillBeAnimated() { @@ -187,9 +180,6 @@ public: iFlags |= 0x4000; }; void InitialRotate(bool doit); -#ifdef EU07_USE_OLD_DRAW_CODE - void DisplayLists(); -#endif void BinInit(TSubModel *s, float4x4 *m, std::vector *t, std::vector *n, bool dynamic); void ReplacableSet(texture_handle const *r, int a) { @@ -219,11 +209,13 @@ public: void AdjustDist(); void deserialize(std::istream&); - void TSubModel::serialize(std::ostream&, + void serialize(std::ostream&, std::vector&, std::vector&, std::vector&, std::vector&); + void serialize_geometry( std::ostream &Output ); + }; class TModel3d : public CMesh @@ -259,11 +251,7 @@ public: std::string NameGet() { return m_filename; }; int TerrainCount(); TSubModel * TerrainSquare(int n); -#ifdef EU07_USE_OLD_RENDERCODE - void TerrainRenderVBO(int n); -#endif void deserialize(std::istream &s, size_t size, bool dynamic); }; //--------------------------------------------------------------------------- -#endif diff --git a/PyInt.cpp b/PyInt.cpp index 84fd7847..c55e371f 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -292,7 +292,7 @@ void TPythonScreenRenderer::updateTexture() WriteLog(buff); #endif // _PY_INT_MORE_LOG glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - glBindTexture(GL_TEXTURE_2D, _textureId); + GfxRenderer.Bind(_textureId); // setup texture parameters if( GLEW_VERSION_1_4 ) { diff --git a/World.cpp b/World.cpp index 1723253d..f6e53a81 100644 --- a/World.cpp +++ b/World.cpp @@ -1651,15 +1651,13 @@ TWorld::Update_UI() { case( GLFW_KEY_F8 ) : { // gfx renderer data uitextline1 = - "Draw range x " + to_string( Global::fDistanceFactor, 1 ) - + "; FPS: " + to_string( Timer::GetFPS(), 2 ); + "FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ) + + ", Draw range x " + to_string( Global::fDistanceFactor, 1 ) + + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) + + ", FPS: " + to_string( Timer::GetFPS(), 2 ); if( Global::iSlowMotion ) { uitextline1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; } - uitextline1 += - ", sectors: " + std::to_string( GfxRenderer.m_drawcount ) - + "/" + std::to_string( Global::iSegmentsRendered ) - + "; FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ); uitextline2 = std::string( "Rendering mode: " ) diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index 2f18a7c5..5c9fe8b0 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" void -basic_vertex::serialize( std::ostream &s ) { +basic_vertex::serialize( std::ostream &s ) const { sn_utils::ls_float32( s, position.x ); sn_utils::ls_float32( s, position.y ); diff --git a/openglgeometrybank.h b/openglgeometrybank.h index a6868a2f..0b174566 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -27,7 +27,7 @@ struct basic_vertex { basic_vertex( glm::vec3 const&Position, glm::vec3 const &Normal, glm::vec2 const &Texture ) : position( Position ), normal( Normal ), texture( Texture ) {} - void serialize( std::ostream& ); + void serialize( std::ostream& ) const; void deserialize( std::istream& ); }; @@ -111,10 +111,12 @@ protected: struct geometry_chunk { unsigned int type; // kind of geometry used by the chunk vertex_array vertices; // geometry data - + // NOTE: constructor doesn't copy provided vertex data, but moves it geometry_chunk( vertex_array &Vertices, unsigned int const Type ) : - vertices( Vertices ), type( Type ) - {} + type( Type ) + { + vertices.swap( Vertices ); + } }; typedef std::vector geometrychunk_sequence; diff --git a/renderer.cpp b/renderer.cpp index f7970509..27167c1e 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -368,7 +368,14 @@ opengl_renderer::Render( TGround *Ground ) { ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) Update_Lights( Ground->m_lights ); -/* + + m_drawqueue.clear(); + + // rednerowanie globalnych (nie za często?) + for( TGroundNode *node = Ground->srGlobal.nRenderHidden; node; node = node->nNext3 ) { + node->RenderHidden(); + } + glm::vec3 const cameraposition( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); int const camerax = static_cast( std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2 ); int const cameraz = static_cast( std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2 ); @@ -380,89 +387,40 @@ opengl_renderer::Render( TGround *Ground ) { for( int row = originz; row <= originz + segmentcount; ++row ) { auto *cell = &Ground->Rects[ column ][ row ]; + + for( int subcellcolumn = 0; subcellcolumn < iNumSubRects; ++subcellcolumn ) { + for( int subcellrow = 0; subcellrow < iNumSubRects; ++subcellrow ) { + auto subcell = cell->FastGetSubRect( subcellcolumn, subcellrow ); + if( subcell == nullptr ) { continue; } + // renderowanie obiektów aktywnych a niewidocznych + for( auto node = subcell->nRenderHidden; node; node = node->nNext3 ) { + node->RenderHidden(); + } + // jeszcze dźwięki pojazdów by się przydały, również niewidocznych + subcell->RenderSounds(); + } + } + if( m_camera.visible( cell->m_area ) ) { Render( cell ); } } } -*/ - Ground->CameraDirection.x = std::sin( Global::pCameraRotation ); // wektor kierunkowy - Ground->CameraDirection.z = std::cos( Global::pCameraRotation ); - TGroundNode *node; - // rednerowanie globalnych (nie za często?) - for( node = Ground->srGlobal.nRenderHidden; node; node = node->nNext3 ) { - node->RenderHidden(); + + // draw queue was filled while rendering content of ground cells. now sort the nodes based on their distance to viewer... + std::sort( + std::begin( m_drawqueue ), + std::end( m_drawqueue ), + []( distancesubcell_pair const &Left, distancesubcell_pair const &Right ) { + return ( Left.first ) < ( Right.first ); } ); + // ...then render the opaque content of the visible subcells. + for( auto subcellpair : m_drawqueue ) { + Render( subcellpair.second ); } - // renderowanie czołgowe dla obiektów aktywnych a niewidocznych - int n = 2 * iNumSubRects; //(2*==2km) promień wyświetlanej mapy w sektorach - int c = Ground->GetColFromX( Global::pCameraPosition.x ); - int r = Ground->GetRowFromZ( Global::pCameraPosition.z ); - TSubRect *tmp; - int i, j, k; - for( j = r - n; j <= r + n; ++j ) { - for( i = c - n; i <= c + n; ++i ) { - if( ( tmp = Ground->FastGetSubRect( i, j ) ) != nullptr ) { - // oznaczanie aktywnych sektorów - tmp->LoadNodes(); - - for( node = tmp->nRenderHidden; node; node = node->nNext3 ) { - node->RenderHidden(); - } - // jeszcze dźwięki pojazdów by się przydały, również niewidocznych - tmp->RenderSounds(); - } - } - } - // renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - // pre-calculate camera view span - double const fieldofviewcosine = - std::cos( - std::max( - // vertical... - Global::FieldOfView / Global::ZoomFactor, - // ...or horizontal, whichever is bigger - Global::FieldOfView / Global::ZoomFactor - * std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ) ) ); - - m_drawqueue.clear(); - - Math3D::vector3 direction; - for( k = 0; k < Global::iSegmentsRendered; ++k ) // sektory w kolejności odległości - { // przerobione na użycie SectorOrder - i = SectorOrder[ k ].x; // na starcie oba >=0 - j = SectorOrder[ k ].y; - do { - // pierwszy przebieg: j<=0, i>=0; drugi: j>=0, i<=0; trzeci: j<=0, i<=0 czwarty: j>=0, i>=0; - if( j <= 0 ) - i = -i; - j = -j; // i oraz j musi być zmienione wcześniej, żeby continue działało - direction = Math3D::vector3( i, 0, j ); // wektor od kamery do danego sektora - if( Math3D::LengthSquared3( direction ) > 5 ) // te blisko są zawsze wyświetlane - { - direction = Math3D::SafeNormalize( direction ); // normalizacja - if( Ground->CameraDirection.x * direction.x + Ground->CameraDirection.z * direction.z < 0.5 ) - continue; // pomijanie sektorów poza kątem patrzenia - } - // kwadrat kilometrowy nie zawsze, bo szkoda FPS - Render( &Ground->Rects[ ( i + c ) / iNumSubRects ][ ( j + r ) / iNumSubRects ] ); - - if( ( tmp = Ground->FastGetSubRect( i + c, j + r ) ) != nullptr ) { - if( tmp->iNodeCount ) { - // o ile są jakieś obiekty, bo po co puste sektory przelatywać - m_drawqueue.emplace_back( tmp ); - } - } - } while( ( i < 0 ) || ( j < 0 ) ); // są 4 przypadki, oprócz i=j=0 - } - - for( auto subcell : m_drawqueue ) { - Render( subcell ); - } - // regular render takes care of all solid geometry present in the scene, thus we can launch alpha parts render here + // now hand the control over to the renderer of translucent parts, it'll do the rest return Render_Alpha( Ground ); } -// TODO: unify ground render code, until then old version is in place bool opengl_renderer::Render( TGroundRect *Groundcell ) { @@ -484,6 +442,19 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { } Groundcell->iLastDisplay = Groundcell->iFrameNumber; // drugi raz nie potrzeba result = true; + + // add the subcells of the cell to the draw queue + if( Groundcell->pSubRects != nullptr ) { + for( std::size_t subcellindex = 0; subcellindex < iNumSubRects * iNumSubRects; ++subcellindex ) { + auto subcell = Groundcell->pSubRects + subcellindex; + if( subcell->iNodeCount ) { + // o ile są jakieś obiekty, bo po co puste sektory przelatywać + m_drawqueue.emplace_back( + ( Global::pCameraPosition - glm::dvec3( subcell->m_area.center ) ).LengthSquared(), + subcell ); + } + } + } } return result; } @@ -491,6 +462,9 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { bool opengl_renderer::Render( TSubRect *Groundsubcell ) { + // oznaczanie aktywnych sektorów + Groundsubcell->LoadNodes(); + Groundsubcell->RaAnimate(); // przeliczenia animacji torów w sektorze TGroundNode *node; @@ -906,23 +880,23 @@ opengl_renderer::Render_Alpha( TGround *Ground ) { TGroundNode *node; TSubRect *tmp; // Ra: renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - for( auto subcell = std::rbegin( m_drawqueue ); subcell != std::rend( m_drawqueue ); ++subcell ) { + for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { // przezroczyste trójkąty w oddzielnym cyklu przed modelami - tmp = *subcell; + tmp = subcellpair->second; for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { Render_Alpha( node ); } } - for( auto subcell = std::rbegin( m_drawqueue ); subcell != std::rend( m_drawqueue ); ++subcell ) + for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { // renderowanie przezroczystych modeli oraz pojazdów - Render_Alpha( *subcell ); + Render_Alpha( subcellpair->second ); } ::glDisable( GL_LIGHTING ); // linie nie powinny świecić - for( auto subcell = std::rbegin( m_drawqueue ); subcell != std::rend( m_drawqueue ); ++subcell ) { + for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { // druty na końcu, żeby się nie robiły białe plamy na tle lasu - tmp = *subcell; + tmp = subcellpair->second; for( node = tmp->nRenderWires; node; node = node->nNext3 ) { Render_Alpha( node ); } @@ -947,25 +921,9 @@ opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { return true; } -// NOTE: legacy render system switch -#define _PROBLEND - bool opengl_renderer::Render_Alpha( TGroundNode *Node ) { - // SPOSOB NA POZBYCIE SIE RAMKI DOOKOLA TEXTURY ALPHA DLA OBIEKTOW ZAGNIEZDZONYCH W SCN JAKO - // NODE - - // W GROUND.H dajemy do klasy TGroundNode zmienna bool PROBLEND to samo robimy w klasie TGround - // nastepnie podczas wczytywania textury dla TRIANGLES w TGround::AddGroundNode - // sprawdzamy czy w nazwie jest @ i wg tego - // ustawiamy PROBLEND na true dla wlasnie wczytywanego trojkata (kazdy trojkat jest osobnym - // nodem) - // nastepnie podczas renderowania w bool TGroundNode::RenderAlpha() - // na poczatku ustawiamy standardowe GL_GREATER = 0.04 - // pozniej sprawdzamy czy jest wlaczony PROBLEND dla aktualnie renderowanego noda TRIANGLE, - // wlasciwie dla kazdego node'a - // i jezeli tak to odpowiedni GL_GREATER w przeciwnym wypadku standardowy 0.04 double const distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { @@ -1029,14 +987,15 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { return false; } // setup - // w zaleznosci od koloru swiatla + auto const linewidth = clamp( 100.0 * Node->fLineThickness / ( distancesquared + 1.0 ), 1.0, 10.0 ); ::glColor4fv( glm::value_ptr( glm::vec4( - Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), - std::min( - 1.0, - 1000.0 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ) ); + Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla + std::min( 1.0, linewidth ) ) ) ); + if( linewidth > 1.0 ) { + ::glLineWidth( static_cast(linewidth) ); + } GfxRenderer.Bind( 0 ); @@ -1048,6 +1007,10 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { m_geometry.draw( Node->m_geometry ); // post-render cleanup + if( linewidth > 1.0 ) { + ::glLineWidth( 1.0f ); + } + ::glPopMatrix(); return true; @@ -1059,13 +1022,6 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { return false; } // setup -#ifdef _PROBLEND - if( ( Node->PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 - { - ::glDisable( GL_BLEND ); - ::glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - }; -#endif ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); Bind( Node->TextureID ); @@ -1080,13 +1036,6 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // post-render cleanup ::glPopMatrix(); -#ifdef _PROBLEND - if( ( Node->PROBLEND ) ) // sprawdza, czy w nazwie nie ma @ //Q: 13122011 - Szociu: 27012012 - { - ::glEnable( GL_BLEND ); - ::glAlphaFunc( GL_GREATER, 0.04f ); - } -#endif return true; } diff --git a/renderer.h b/renderer.h index a1420e25..43332c5b 100644 --- a/renderer.h +++ b/renderer.h @@ -182,6 +182,8 @@ private: typedef std::vector opengllight_array; + typedef std::pair< double, TSubRect * > distancesubcell_pair; + // methods bool Init_caps(); @@ -226,7 +228,7 @@ private: texture_handle m_moontexture { -1 }; geometry_handle m_billboardgeometry { 0, 0 }; GLUquadricObj *m_quadric; // helper object for drawing debug mode scene elements - std::vector< TSubRect* > m_drawqueue; // list of subcells to be drawn in current render pass + std::vector m_drawqueue; // list of subcells to be drawn in current render pass }; diff --git a/version.h b/version.h index b34c61ee..252fa070 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 613 +#define VERSION_MINOR 617 #define VERSION_REVISION 0 From 5d7b3fb036b4ddb240dbe511a87c9fe01bd011f3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 26 Jun 2017 16:57:25 +0200 Subject: [PATCH 128/426] build 170626. individual self-illumination levels for interior sections, automatic merging of suitable terrain geometry during load from text files, unused resource release by geometry bank manager, support for ui backgrounds with width:height ratio other than 4:3, comment parsing optimization, minor bug fixes --- DynObj.cpp | 89 ++++++++++ DynObj.h | 28 +-- Ground.cpp | 390 ++++++++++++++++++++++------------------- Ground.h | 45 ++--- Model3d.cpp | 54 +++--- Model3d.h | 83 ++++----- PyInt.cpp | 2 +- Texture.cpp | 8 +- Texture.h | 14 +- Track.cpp | 2 - Train.cpp | 9 +- openglgeometrybank.cpp | 76 ++++++-- openglgeometrybank.h | 39 ++++- parser.cpp | 17 +- parser.h | 2 +- renderer.cpp | 65 ++++--- uilayer.cpp | 22 ++- version.h | 2 +- 18 files changed, 608 insertions(+), 339 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 1442639c..0e6742f1 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -527,6 +527,39 @@ void TDynamicObject::UpdateLeverEnum(TAnim *pAnim) pAnim->smAnimated->SetRotate(float3(1, 0, 0), pAnim->fParam[*pAnim->iIntBase]); }; +// sets light levels for registered interior sections +void +TDynamicObject::toggle_lights() { + + if( true == SectionLightsActive ) { + // switch all lights off + for( auto §ionlight : SectionLightLevels ) { + sectionlight.level = 0.0f; + } + SectionLightsActive = false; + } + else { + std::string compartmentname; + // set lights with probability depending on the compartment type. TODO: expose this in .mmd file + for( auto §ionlight : SectionLightLevels ) { + + compartmentname = sectionlight.compartment->pName; + if( ( compartmentname.find( "corridor" ) != std::string::npos ) + || ( compartmentname.find( "korytarz" ) != std::string::npos ) ) { + // corridors are lit 100% of time + sectionlight.level = 0.75f; + } + else if( + ( compartmentname.find( "compartment" ) != std::string::npos ) + || ( compartmentname.find( "przedzial" ) != std::string::npos ) ) { + // compartments are lit with 75% probability + sectionlight.level = ( Random() < 0.75 ? 0.75f : 0.05f ); + } + } + SectionLightsActive = true; + } +} + // ABu 29.01.05 przeklejone z render i renderalpha: ********************* void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) { // ABu290105: pozbierane i uporzadkowane powtarzajace @@ -946,6 +979,13 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) } // else btHeadSignals23.TurnOff(); } + // interior light levels + for( auto const §ion : SectionLightLevels ) { + section.compartment->SetLightLevel( section.level, true ); + if( section.load != nullptr ) { + section.load->SetLightLevel( section.level, true ); + } + } } // ABu 29.01.05 koniec przeklejenia ************************************* @@ -1949,6 +1989,41 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" btMechanik1.Init("mechanik1", mdLowPolyInt, false); btMechanik2.Init("mechanik2", mdLowPolyInt, false); TurnOff(); // resetowanie zmiennych submodeli + + if( mdLowPolyInt != nullptr ) { + // check the low poly interior for potential compartments of interest, ie ones which can be individually lit + // TODO: definition of relevant compartments in the .mmd file + TSubModel *submodel { nullptr }; + if( ( submodel = mdLowPolyInt->GetFromName( "cab1" ) ) != nullptr ) { SectionLightLevels.emplace_back( submodel, nullptr, 0.0f ); } + if( ( submodel = mdLowPolyInt->GetFromName( "cab2" ) ) != nullptr ) { SectionLightLevels.emplace_back( submodel, nullptr, 0.0f ); } + if( ( submodel = mdLowPolyInt->GetFromName( "cab0" ) ) != nullptr ) { SectionLightLevels.emplace_back( submodel, nullptr, 0.0f ); } + // passenger car compartments + std::vector nameprefixes = { "corridor", "korytarz", "compartment", "przedzial" }; + int compartmentindex; + std::string compartmentname; + for( auto const &nameprefix : nameprefixes ) { + compartmentindex = 0; + do { + compartmentname = + nameprefix + ( + compartmentindex < 10 ? + "0" + std::to_string( compartmentindex ) : + std::to_string( compartmentindex ) ); + submodel = mdLowPolyInt->GetFromName( compartmentname.c_str() ); + if( submodel != nullptr ) { + // if specified compartment was found we check also for potential matching section in the currently assigned load + // NOTE: if the load gets changed this will invalidate stored pointers. TODO: rebuild the table on load change + SectionLightLevels.emplace_back( + submodel, + ( mdLoad != nullptr ? + mdLoad->GetFromName( compartmentname.c_str() ): + nullptr ), + 0.0f ); + } + ++compartmentindex; + } while( submodel != nullptr ); + } + } // wyszukiwanie zderzakow if (mdModel) // jeśli ma w czym szukać for (int i = 0; i < 2; i++) @@ -3416,6 +3491,20 @@ bool TDynamicObject::Update(double dt, double dt1) dDoorMoveR = 0; } + // compartment lights +/* + if( ( ctOwner != nullptr ? + ctOwner->Controlling()->Battery != SectionLightsActive : + MoverParameters->Battery != SectionLightsActive ) ) { + // if the vehicle has a controller, we base the light state on state of the controller otherwise we check the vehicle itself +*/ + // the version above won't work as the vehicles don't turn batteries off :| + if( ( ctOwner != nullptr ? + ctOwner->Controlling()->Battery != SectionLightsActive : + SectionLightsActive == true ) ) { // without controller lights are off. NOTE: this likely mess up the EMU + toggle_lights(); + } + // ABu-160303 sledzenie toru przed obiektem: ******************************* // Z obserwacji: v>0 -> Coupler 0; v<0 ->coupler1 (Ra: prędkość jest związana // z pojazdem) diff --git a/DynObj.h b/DynObj.h index 9b9cd735..3509696a 100644 --- a/DynObj.h +++ b/DynObj.h @@ -143,12 +143,8 @@ class TAnim struct material_data { int textures_alpha{ 0x30300030 }; // maska przezroczystości tekstur. default: tekstury wymienne nie mają przezroczystości - texture_handle replacable_skins[ 5 ]; // McZapkie:zmienialne nadwozie + texture_handle replacable_skins[ 5 ] = { NULL, NULL, NULL, NULL, NULL }; // McZapkie:zmienialne nadwozie int multi_textures{ 0 }; //<0 tekstury wskazane wpisem, >0 tekstury z przecinkami, =0 jedna - - material_data() { - ::SecureZeroMemory( replacable_skins, sizeof( replacable_skins ) ); - } }; class TDynamicObject { // klasa pojazdu @@ -169,8 +165,7 @@ private: // położenie pojazdu w świecie oraz parametry ruchu float fAxleDist; // rozstaw wózków albo osi do liczenia proporcji zacienienia vector3 modelRot; // obrot pudła względem świata - do przeanalizowania, czy potrzebne!!! // bool bCameraNear; //blisko kamer są potrzebne dodatkowe obliczenia szczegółów - TDynamicObject * ABuFindNearestObject( TTrack *Track, TDynamicObject *MyPointer, - int &CouplNr ); + TDynamicObject * ABuFindNearestObject( TTrack *Track, TDynamicObject *MyPointer, int &CouplNr ); public: // parametry położenia pojazdu dostępne publicznie std::string asTrack; // nazwa toru początkowego; wywalić? @@ -191,8 +186,18 @@ public: // modele składowe pojazdu TModel3d *mdLoad; // model zmiennego ładunku TModel3d *mdKabina; // model kabiny dla użytkownika; McZapkie-030303: to z train.h TModel3d *mdLowPolyInt; // ABu 010305: wnetrze lowpoly - float3 InteriorLight{ 0.9f * 255.0f / 255.0f, 0.9f * 216.0f / 255.0f, 0.9f * 176.0f / 255.0f }; // tungsten light. TODO: allow definition of light type? - float InteriorLightLevel{ 0.0f }; // current level of interior lighting + float3 InteriorLight { 0.9f * 255.0f / 255.0f, 0.9f * 216.0f / 255.0f, 0.9f * 176.0f / 255.0f }; // tungsten light. TODO: allow definition of light type? + float InteriorLightLevel { 0.0f }; // current level of interior lighting + struct section_light { + TSubModel *compartment; + TSubModel *load; + float level; + section_light( TSubModel *Compartment, TSubModel *Load, float const Level ) : + compartment(Compartment), load(Load), level(Level) + {} + }; + std::vector SectionLightLevels; // table of light levels for specific compartments of associated 3d model + bool SectionLightsActive { false }; // flag indicating whether section lights were set. float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) private: // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe @@ -200,7 +205,9 @@ public: // modele składowe pojazdu public: inline - material_data const *Material() const { return &m_materialdata; } + material_data const + *Material() const { + return &m_materialdata; } // tymczasowo udostępnione do wyszukiwania drutu int iAnimType[ ANIM_TYPES ]; // 0-osie,1-drzwi,2-obracane,3-zderzaki,4-wózki,5-pantografy,6-tłoki private: @@ -226,6 +233,7 @@ public: // modele składowe pojazdu void UpdateLeverFloat(TAnim *pAnim); // animacja gałki zależna od float void UpdateLeverInt(TAnim *pAnim); // animacja gałki zależna od int (wartość) void UpdateLeverEnum(TAnim *pAnim); // animacja gałki zależna od int (lista kątów) + void toggle_lights(); // switch light levels for registered interior sections private: // Ra: ciąg dalszy animacji, dopiero do ogarnięcia // ABuWozki 060504 vector3 bogieRot[2]; // Obroty wozkow w/m korpusu diff --git a/Ground.cpp b/Ground.cpp index 76666103..4f37e50b 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -67,7 +67,6 @@ std::string LogComment; TGroundNode::TGroundNode() { // nowy obiekt terenu - pusty iType = GL_POINTS; - Vertices = NULL; nNext = nNext2 = NULL; iCount = 0; // wierzchołków w trójkącie // iNumPts=0; //punktów w linii @@ -115,9 +114,6 @@ TGroundNode::~TGroundNode() break; case TP_TERRAIN: { // pierwsze nNode zawiera model E3D, reszta to trójkąty - for (int i = 1; i < iCount; ++i) - nNode->Vertices = - NULL; // zerowanie wskaźników w kolejnych elementach, bo nie są do usuwania delete[] nNode; // usunięcie tablicy i pierwszego elementu } case TP_SUBMODEL: // dla formalności, nie wymaga usuwania @@ -125,33 +121,31 @@ TGroundNode::~TGroundNode() case GL_LINES: case GL_LINE_STRIP: case GL_LINE_LOOP: - SafeDeleteArray(Points); - break; case GL_TRIANGLE_STRIP: case GL_TRIANGLE_FAN: case GL_TRIANGLES: - SafeDeleteArray(Vertices); + SafeDelete( Piece ); break; } } - +/* void TGroundNode::Init(int n) { // utworzenie tablicy wierzchołków bVisible = false; iNumVerts = n; Vertices = new TGroundVertex[iNumVerts]; } - -TGroundNode::TGroundNode( TGroundNodeType t, int n ) : +*/ +TGroundNode::TGroundNode( TGroundNodeType t ) : TGroundNode() { // utworzenie obiektu - iNumVerts = n; - if( iNumVerts ) { - Vertices = new TGroundVertex[ iNumVerts ]; - } iType = t; switch (iType) { // zależnie od typu + case GL_TRIANGLES: { + Piece = new piece_node; + break; + } case TP_TRACK: { pTrack = new TTrack( this ); break; @@ -171,36 +165,36 @@ void TGroundNode::InitNormals() switch (iType) { case GL_TRIANGLE_STRIP: - v1 = Vertices[0].position - Vertices[1].position; - v2 = Vertices[1].position - Vertices[2].position; + v1 = Piece->vertices[0].position - Piece->vertices[1].position; + v2 = Piece->vertices[1].position - Piece->vertices[2].position; n1 = glm::normalize(glm::cross(v1, v2)); - if (Vertices[0].normal == glm::vec3()) - Vertices[0].normal = n1; - v3 = Vertices[2].position - Vertices[3].position; + if (Piece->vertices[0].normal == glm::vec3()) + Piece->vertices[0].normal = n1; + v3 = Piece->vertices[2].position - Piece->vertices[3].position; n2 = glm::normalize(glm::cross(v3, v2)); - if (Vertices[1].normal == glm::vec3()) - Vertices[1].normal = (n1 + n2) * 0.5f; + if (Piece->vertices[1].normal == glm::vec3()) + Piece->vertices[1].normal = (n1 + n2) * 0.5f; for ( i = 2; i < iNumVerts - 2; i += 2) { - v4 = Vertices[i - 1].position - Vertices[i].position; - v5 = Vertices[i].position - Vertices[i + 1].position; + v4 = Piece->vertices[i - 1].position - Piece->vertices[i].position; + v5 = Piece->vertices[i].position - Piece->vertices[i + 1].position; n3 = glm::normalize(glm::cross(v3, v4)); n4 = glm::normalize(glm::cross(v5, v4)); - if (Vertices[i].normal == glm::vec3()) - Vertices[i].normal = (n1 + n2 + n3) / 3.0f; - if (Vertices[i + 1].normal == glm::vec3()) - Vertices[i + 1].normal = (n2 + n3 + n4) / 3.0f; + if (Piece->vertices[i].normal == glm::vec3()) + Piece->vertices[i].normal = (n1 + n2 + n3) / 3.0f; + if (Piece->vertices[i + 1].normal == glm::vec3()) + Piece->vertices[i + 1].normal = (n2 + n3 + n4) / 3.0f; n1 = n3; n2 = n4; v3 = v5; } - if (Vertices[i].normal == glm::vec3()) - Vertices[i].normal = (n1 + n2) / 2.0f; + if (Piece->vertices[i].normal == glm::vec3()) + Piece->vertices[i].normal = (n1 + n2) / 2.0f; if (i + 1 < iNumVerts) { - if (Vertices[i + 1].normal == glm::vec3()) - Vertices[i + 1].normal = n2; + if (Piece->vertices[i + 1].normal == glm::vec3()) + Piece->vertices[i + 1].normal = n2; } else WriteLog("odd number of vertices, normals may be wrong!"); @@ -212,21 +206,21 @@ void TGroundNode::InitNormals() case GL_TRIANGLES: for (i = 0; i < iNumVerts; i += 3) { - v1 = Vertices[i + 0].position - Vertices[i + 1].position; - v2 = Vertices[i + 1].position - Vertices[i + 2].position; + v1 = Piece->vertices[i + 0].position - Piece->vertices[i + 1].position; + v2 = Piece->vertices[i + 1].position - Piece->vertices[i + 2].position; n1 = glm::normalize(glm::cross(v1, v2)); - if (Vertices[i + 0].normal == glm::vec3()) - Vertices[i + 0].normal = (n1); - if (Vertices[i + 1].normal == glm::vec3()) - Vertices[i + 1].normal = (n1); - if (Vertices[i + 2].normal == glm::vec3()) - Vertices[i + 2].normal = (n1); + if( Piece->vertices[i + 0].normal == glm::vec3() ) + Piece->vertices[i + 0].normal = (n1); + if( Piece->vertices[i + 1].normal == glm::vec3() ) + Piece->vertices[i + 1].normal = (n1); + if( Piece->vertices[i + 2].normal == glm::vec3() ) + Piece->vertices[i + 2].normal = (n1); t1 = glm::vec2( - std::floor( Vertices[ i + 0 ].texture.s ), - std::floor( Vertices[ i + 0 ].texture.t ) ); - Vertices[ i + 1 ].texture -= t1; - Vertices[ i + 2 ].texture -= t1; - Vertices[ i + 0 ].texture -= t1; + std::floor( Piece->vertices[ i + 0 ].texture.s ), + std::floor( Piece->vertices[ i + 0 ].texture.t ) ); + Piece->vertices[ i + 1 ].texture -= t1; + Piece->vertices[ i + 2 ].texture -= t1; + Piece->vertices[ i + 0 ].texture -= t1; } break; } @@ -349,8 +343,10 @@ void TSubRect::NodeAdd(TGroundNode *Node) } #endif case TP_TRACTIONPOWERSOURCE: // a te w ogóle pomijamy +/* // case TP_ISOLATED: //lista torów w obwodzie izolowanym - na razie ignorowana break; +*/ case TP_DYNAMIC: return; // tych nie dopisujemy wcale } @@ -380,22 +376,14 @@ void TSubRect::Sort() { TTrack * TSubRect::FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude) { // szukanie toru, którego koniec jest najbliższy (*Point) - for (int i = 0; i < iTracks; ++i) - if (tTracks[i] != Exclude) // można użyć tabelę torów, bo jest mniejsza + for( int i = 0; i < iTracks; ++i ) { + if( tTracks[ i ] != Exclude ) // można użyć tabelę torów, bo jest mniejsza { - iConnection = tTracks[i]->TestPoint(Point); - if (iConnection >= 0) - return tTracks[i]; // szukanie TGroundNode nie jest potrzebne + iConnection = tTracks[ i ]->TestPoint( Point ); + if( iConnection >= 0 ) + return tTracks[ i ]; // szukanie TGroundNode nie jest potrzebne } - /* - TGroundNode *Current; - for (Current=nRootNode;Current;Current=Current->Next) - if ((Current->iType==TP_TRACK)&&(Current->pTrack!=Exclude)) //można użyć tabelę torów - { - iConnection=Current->pTrack->TestPoint(Point); - if (iConnection>=0) return Current; - } - */ + } return NULL; }; @@ -449,30 +437,20 @@ void TSubRect::LoadNodes() { auto *node { nRootNode }; while( node != nullptr ) { switch (node->iType) { - case GL_TRIANGLES: { - vertex_array vertices; - for( int idx = 0; idx < node->iNumVerts; ++idx ) { - vertices.emplace_back( - node->Vertices[ idx ].position - node->m_rootposition, - node->Vertices[ idx ].normal, - node->Vertices[ idx ].texture ); - } - node->m_geometry = GfxRenderer.Insert( vertices, m_geometrybank, GL_TRIANGLES ); - SafeDeleteArray( node->Vertices ); - node->iNumVerts = 0; - break; - } + case GL_TRIANGLES: case GL_LINES: { vertex_array vertices; - for( int idx = 0; idx < node->iNumPts; ++idx ) { + for( auto const &vertex : node->Piece->vertices ) { vertices.emplace_back( - node->Points[ idx ] - node->m_rootposition, - glm::vec3(), - glm::vec2() ); + vertex.position - node->m_rootposition, + vertex.normal, + vertex.texture ); } - node->m_geometry = GfxRenderer.Insert( vertices, m_geometrybank, GL_LINES ); - SafeDeleteArray( node->Vertices ); - node->iNumPts = 0; + node->Piece->geometry = GfxRenderer.Insert( vertices, m_geometrybank, node->iType ); + node->Piece->vertices.swap( std::vector() ); // hipster shrink_to_fit + // TODO: get rid of the vertex counters, they're obsolete at this point + if( node->iType == GL_LINES ) { node->iNumVerts = 0; } + else { node->iNumPts = 0; } break; } case TP_TRACK: @@ -529,6 +507,59 @@ TGroundRect::Init() { } }; +// dodanie obiektu do sektora na etapie rozdzielania na sektory +void +TGroundRect::NodeAdd( TGroundNode *Node ) { + + // override visibility ranges, to ensure the content is drawn from far enough + Node->fSquareRadius = 50000.0 * 50000.0; + Node->fSquareMinRadius = 0.0; + + // if the cell already has a node with matching material settings, we can just add the new geometry to it + if( ( Node->iType == GL_TRIANGLES ) ) { + // cell node only receives opaque geometry, so we can skip transparency test + auto matchingnode { nRenderRect }; + while( ( matchingnode != nullptr ) + && ( false == mergeable( *Node, *matchingnode ) ) ) { + // search will get us either a matching node, or a nullptr + matchingnode = matchingnode->nNext3; + } + if( matchingnode != nullptr ) { + // a valid match, so dump the content into it + // updating centre points isn't strictly necessary since render is based off the cell's middle, but, eh + matchingnode->pCenter = + interpolate( + matchingnode->pCenter, Node->pCenter, + static_cast( Node->iNumVerts ) / ( Node->iNumVerts + matchingnode->iNumVerts ) ); + matchingnode->iNumVerts += Node->iNumVerts; + matchingnode->Piece->vertices.resize( matchingnode->iNumVerts, TGroundVertex() ); + matchingnode->Piece->vertices.insert( + std::end( matchingnode->Piece->vertices ), + std::begin( Node->Piece->vertices ), std::end( Node->Piece->vertices ) ); + // clear content of the node we're copying. a minor memory saving at best, but still a saving + Node->Piece->vertices.swap( std::vector() ); + Node->iNumVerts = 0; + // since we've put the data in existing node we can skip adding the new one... + return; + // ...for others, they'll go through the regular procedure, along with other non-mergeable types + } + } + + return TSubRect::NodeAdd( Node ); +} + +// compares two provided nodes, returns true if their content can be merged +bool +TGroundRect::mergeable( TGroundNode const &Left, TGroundNode const &Right ) { + // since view ranges and transparency type for all nodes put through this method are guaranteed to be equal, + // we can skip their tests and only do the material check. + // TODO, TBD: material as dedicated type, and refactor this method into a simple equality test + return ( ( Left.TextureID == Right.TextureID ) + && ( Left.Ambient == Right.Ambient ) + && ( Left.Diffuse == Right.Diffuse ) + && ( Left.Specular == Right.Specular ) ); +} + //--------------------------------------------------------------------------- BYTE TempConnectionType[ 200 ]; // Ra: sprzêgi w sk³adzie; ujemne, gdy odwrotnie @@ -594,19 +625,19 @@ void TGround::Free() nRootDynamic = NULL; } -TGroundNode * TGround::DynamicFindAny(std::string asNameToFind) +TGroundNode * TGround::DynamicFindAny(std::string const &Name) { // wyszukanie pojazdu o podanej nazwie, szukanie po wszystkich (użyć drzewa!) for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) - if ((Current->asName == asNameToFind)) + if ((Current->asName == Name)) return Current; return NULL; }; -TGroundNode * TGround::DynamicFind(std::string asNameToFind) +TGroundNode * TGround::DynamicFind(std::string const &Name) { // wyszukanie pojazdu z obsadą o podanej nazwie (użyć drzewa!) for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) if (Current->DynamicObject->Mechanik) - if ((Current->asName == asNameToFind)) + if ((Current->asName == Name)) return Current; return NULL; }; @@ -685,12 +716,12 @@ void TGround::RaTriangleDivider(TGroundNode *node) double x1 = x0 + 1400.0; double z0 = 1000.0 * std::floor(0.001 * node->pCenter.z) - 200.0; double z1 = z0 + 1400.0; - if ((node->Vertices[0].position.x >= x0) && (node->Vertices[0].position.x <= x1) && - (node->Vertices[0].position.z >= z0) && (node->Vertices[0].position.z <= z1) && - (node->Vertices[1].position.x >= x0) && (node->Vertices[1].position.x <= x1) && - (node->Vertices[1].position.z >= z0) && (node->Vertices[1].position.z <= z1) && - (node->Vertices[2].position.x >= x0) && (node->Vertices[2].position.x <= x1) && - (node->Vertices[2].position.z >= z0) && (node->Vertices[2].position.z <= z1)) + if ((node->Piece->vertices[0].position.x >= x0) && (node->Piece->vertices[0].position.x <= x1) && + (node->Piece->vertices[0].position.z >= z0) && (node->Piece->vertices[0].position.z <= z1) && + (node->Piece->vertices[1].position.x >= x0) && (node->Piece->vertices[1].position.x <= x1) && + (node->Piece->vertices[1].position.z >= z0) && (node->Piece->vertices[1].position.z <= z1) && + (node->Piece->vertices[2].position.x >= x0) && (node->Piece->vertices[2].position.x <= x1) && + (node->Piece->vertices[2].position.z >= z0) && (node->Piece->vertices[2].position.z <= z1)) return; // trójkąt wystający mniej niż 200m z kw. kilometrowego jest do przyjęcia // Ra: przerobić na dzielenie na 2 trójkąty, podział w przecięciu z siatką kilometrową // Ra: i z rekurencją będzie dzielić trzy trójkąty, jeśli będzie taka potrzeba @@ -700,47 +731,46 @@ void TGround::RaTriangleDivider(TGroundNode *node) x1 -= 200.0; // przestawienie na siatkę z0 += 200.0; z1 -= 200.0; - mul = (node->Vertices[0].position.x - x0) * (node->Vertices[1].position.x - x0); // AB na wschodzie + mul = (node->Piece->vertices[0].position.x - x0) * (node->Piece->vertices[1].position.x - x0); // AB na wschodzie if (mul < min) min = mul, divide = 0; - mul = (node->Vertices[1].position.x - x0) * (node->Vertices[2].position.x - x0); // BC na wschodzie + mul = (node->Piece->vertices[1].position.x - x0) * (node->Piece->vertices[2].position.x - x0); // BC na wschodzie if (mul < min) min = mul, divide = 1; - mul = (node->Vertices[2].position.x - x0) * (node->Vertices[0].position.x - x0); // CA na wschodzie + mul = (node->Piece->vertices[2].position.x - x0) * (node->Piece->vertices[0].position.x - x0); // CA na wschodzie if (mul < min) min = mul, divide = 2; - mul = (node->Vertices[0].position.x - x1) * (node->Vertices[1].position.x - x1); // AB na zachodzie + mul = (node->Piece->vertices[0].position.x - x1) * (node->Piece->vertices[1].position.x - x1); // AB na zachodzie if (mul < min) min = mul, divide = 8; - mul = (node->Vertices[1].position.x - x1) * (node->Vertices[2].position.x - x1); // BC na zachodzie + mul = (node->Piece->vertices[1].position.x - x1) * (node->Piece->vertices[2].position.x - x1); // BC na zachodzie if (mul < min) min = mul, divide = 9; - mul = (node->Vertices[2].position.x - x1) * (node->Vertices[0].position.x - x1); // CA na zachodzie + mul = (node->Piece->vertices[2].position.x - x1) * (node->Piece->vertices[0].position.x - x1); // CA na zachodzie if (mul < min) min = mul, divide = 10; - mul = (node->Vertices[0].position.z - z0) * (node->Vertices[1].position.z - z0); // AB na południu + mul = (node->Piece->vertices[0].position.z - z0) * (node->Piece->vertices[1].position.z - z0); // AB na południu if (mul < min) min = mul, divide = 4; - mul = (node->Vertices[1].position.z - z0) * (node->Vertices[2].position.z - z0); // BC na południu + mul = (node->Piece->vertices[1].position.z - z0) * (node->Piece->vertices[2].position.z - z0); // BC na południu if (mul < min) min = mul, divide = 5; - mul = (node->Vertices[2].position.z - z0) * (node->Vertices[0].position.z - z0); // CA na południu + mul = (node->Piece->vertices[2].position.z - z0) * (node->Piece->vertices[0].position.z - z0); // CA na południu if (mul < min) min = mul, divide = 6; - mul = (node->Vertices[0].position.z - z1) * (node->Vertices[1].position.z - z1); // AB na północy + mul = (node->Piece->vertices[0].position.z - z1) * (node->Piece->vertices[1].position.z - z1); // AB na północy if (mul < min) min = mul, divide = 12; - mul = (node->Vertices[1].position.z - z1) * (node->Vertices[2].position.z - z1); // BC na północy + mul = (node->Piece->vertices[1].position.z - z1) * (node->Piece->vertices[2].position.z - z1); // BC na północy if (mul < min) min = mul, divide = 13; - mul = (node->Vertices[2].position.z - z1) * (node->Vertices[0].position.z - z1); // CA na północy + mul = (node->Piece->vertices[2].position.z - z1) * (node->Piece->vertices[0].position.z - z1); // CA na północy if (mul < min) divide = 14; // tworzymy jeden dodatkowy trójkąt, dzieląc jeden bok na przecięciu siatki kilometrowej TGroundNode *ntri; // wskaźnik na nowy trójkąt - ntri = new TGroundNode(); // a ten jest nowy - ntri->iType = GL_TRIANGLES; // kopiowanie parametrów, przydałby się konstruktor kopiujący - ntri->Init(3); + ntri = new TGroundNode(GL_TRIANGLES); // a ten jest nowy + // kopiowanie parametrów, przydałby się konstruktor kopiujący ntri->TextureID = node->TextureID; ntri->iFlags = node->iFlags; ntri->Ambient = node->Ambient; @@ -753,42 +783,44 @@ void TGround::RaTriangleDivider(TGroundNode *node) ntri->nNext = nRootOfType[GL_TRIANGLES]; nRootOfType[GL_TRIANGLES] = ntri; // dopisanie z przodu do listy ++iNumNodes; + ntri->iNumVerts = 3; + ntri->Piece->vertices.resize( 3 ); switch (divide & 3) { // podzielenie jednego z boków, powstaje wierzchołek D case 0: // podział AB (0-1) -> ADC i DBC - ntri->Vertices[2] = node->Vertices[2]; // wierzchołek C jest wspólny - ntri->Vertices[1] = node->Vertices[1]; // wierzchołek B przechodzi do nowego + ntri->Piece->vertices[2] = node->Piece->vertices[2]; // wierzchołek C jest wspólny + ntri->Piece->vertices[1] = node->Piece->vertices[1]; // wierzchołek B przechodzi do nowego // node->Vertices[1].HalfSet(node->Vertices[0],node->Vertices[1]); //na razie D tak if (divide & 4) - node->Vertices[1].SetByZ(node->Vertices[0], node->Vertices[1], (divide & 8) ? z1 : z0); + node->Piece->vertices[1].SetByZ(node->Piece->vertices[0], node->Piece->vertices[1], (divide & 8) ? z1 : z0); else - node->Vertices[1].SetByX(node->Vertices[0], node->Vertices[1], (divide & 8) ? x1 : x0); - ntri->Vertices[0] = node->Vertices[1]; // wierzchołek D jest wspólny + node->Piece->vertices[1].SetByX(node->Piece->vertices[0], node->Piece->vertices[1], (divide & 8) ? x1 : x0); + ntri->Piece->vertices[0] = node->Piece->vertices[1]; // wierzchołek D jest wspólny break; case 1: // podział BC (1-2) -> ABD i ADC - ntri->Vertices[0] = node->Vertices[0]; // wierzchołek A jest wspólny - ntri->Vertices[2] = node->Vertices[2]; // wierzchołek C przechodzi do nowego + ntri->Piece->vertices[0] = node->Piece->vertices[0]; // wierzchołek A jest wspólny + ntri->Piece->vertices[2] = node->Piece->vertices[2]; // wierzchołek C przechodzi do nowego // node->Vertices[2].HalfSet(node->Vertices[1],node->Vertices[2]); //na razie D tak if (divide & 4) - node->Vertices[2].SetByZ(node->Vertices[1], node->Vertices[2], (divide & 8) ? z1 : z0); + node->Piece->vertices[2].SetByZ(node->Piece->vertices[1], node->Piece->vertices[2], (divide & 8) ? z1 : z0); else - node->Vertices[2].SetByX(node->Vertices[1], node->Vertices[2], (divide & 8) ? x1 : x0); - ntri->Vertices[1] = node->Vertices[2]; // wierzchołek D jest wspólny + node->Piece->vertices[2].SetByX(node->Piece->vertices[1], node->Piece->vertices[2], (divide & 8) ? x1 : x0); + ntri->Piece->vertices[1] = node->Piece->vertices[2]; // wierzchołek D jest wspólny break; case 2: // podział CA (2-0) -> ABD i DBC - ntri->Vertices[1] = node->Vertices[1]; // wierzchołek B jest wspólny - ntri->Vertices[2] = node->Vertices[2]; // wierzchołek C przechodzi do nowego + ntri->Piece->vertices[1] = node->Piece->vertices[1]; // wierzchołek B jest wspólny + ntri->Piece->vertices[2] = node->Piece->vertices[2]; // wierzchołek C przechodzi do nowego // node->Vertices[2].HalfSet(node->Vertices[2],node->Vertices[0]); //na razie D tak if (divide & 4) - node->Vertices[2].SetByZ(node->Vertices[2], node->Vertices[0], (divide & 8) ? z1 : z0); + node->Piece->vertices[2].SetByZ(node->Piece->vertices[2], node->Piece->vertices[0], (divide & 8) ? z1 : z0); else - node->Vertices[2].SetByX(node->Vertices[2], node->Vertices[0], (divide & 8) ? x1 : x0); - ntri->Vertices[0] = node->Vertices[2]; // wierzchołek D jest wspólny + node->Piece->vertices[2].SetByX(node->Piece->vertices[2], node->Piece->vertices[0], (divide & 8) ? x1 : x0); + ntri->Piece->vertices[0] = node->Piece->vertices[2]; // wierzchołek D jest wspólny break; } // przeliczenie środków ciężkości obu - node->pCenter = ( node->Vertices[ 0 ].position + node->Vertices[ 1 ].position + node->Vertices[ 2 ].position ) / 3.0; - ntri->pCenter = ( ntri->Vertices[ 0 ].position + ntri->Vertices[ 1 ].position + ntri->Vertices[ 2 ].position ) / 3.0; + node->pCenter = ( node->Piece->vertices[ 0 ].position + node->Piece->vertices[ 1 ].position + node->Piece->vertices[ 2 ].position ) / 3.0; + ntri->pCenter = ( ntri->Piece->vertices[ 0 ].position + ntri->Piece->vertices[ 1 ].position + ntri->Piece->vertices[ 2 ].position ) / 3.0; RaTriangleDivider(node); // rekurencja, bo nawet na TD raz nie wystarczy RaTriangleDivider(ntri); }; @@ -1218,7 +1250,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->nNode[i].iFlags = 0x10; // nieprzezroczyste; nie usuwany tmp->nNode[i].bVisible = true; tmp->nNode[i].pCenter = tmp->pCenter; // nie przesuwamy w inne miejsce - // tmp->nNode[i].asName= } } else if (!tmp->asName.empty()) // jest pusta gdy "none" @@ -1291,18 +1322,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) && ( true == GfxRenderer.Texture( tmp->TextureID ).has_alpha ) ) ? 0x20 : 0x10 ); - - if( (tmp->iType == GL_TRIANGLES) - && (tmp->iFlags & 0x10) - && (Global::pTerrainCompact->TerrainLoaded()) ) { - // jeśli jest tekstura nieprzezroczysta, a teren załadowany, to pomijamy trójkąty - do { - // pomijanie trójkątów - parser->getTokens(); - *parser >> token; - } while (token.compare("endtri") != 0); - } - else { TGroundVertex vertex, vertex1, vertex2; std::size_t vertexcount { 0 }; @@ -1346,9 +1365,17 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) if( vertexcount == 0 ) { vertex1 = vertex; } else if( vertexcount == 1 ) { vertex2 = vertex; } else if( vertexcount >= 2 ) { - importedvertices.emplace_back( vertex1 ); - importedvertices.emplace_back( vertex2 ); + // swap order every other triangle, to maintain consistent winding + if( vertexcount % 2 == 0 ) { + importedvertices.emplace_back( vertex1 ); + importedvertices.emplace_back( vertex2 ); + } + else { + importedvertices.emplace_back( vertex2 ); + importedvertices.emplace_back( vertex1 ); + } importedvertices.emplace_back( vertex ); + vertex1 = vertex2; vertex2 = vertex; } @@ -1363,25 +1390,27 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } while (token.compare("endtri") != 0); tmp->iType = GL_TRIANGLES; + tmp->Piece = new piece_node(); + tmp->iNumVerts = importedvertices.size(); - auto const nv = importedvertices.size(); - tmp->Init(nv); // utworzenie tablicy wierzchołków + if( tmp->iNumVerts > 0 ) { - for( std::size_t i = 0; i < nv; ++i ) { - tmp->pCenter += importedvertices[ i ].position; + tmp->Piece->vertices.swap( importedvertices ); + + for( auto const &vertex : tmp->Piece->vertices ) { + tmp->pCenter += vertex.position; + } + tmp->pCenter /= tmp->iNumVerts; + + r = 0; + for( auto const &vertex : tmp->Piece->vertices ) { + tf = SquareMagnitude( vertex.position - tmp->pCenter ); + if( tf > r ) + r = tf; + } + tmp->fSquareRadius += r; + RaTriangleDivider( tmp ); // Ra: dzielenie trójkątów jest teraz całkiem wydajne } - tmp->pCenter /= (nv > 0 ? nv : 1); - - r = 0; - for (std::size_t i = 0; i < nv; ++i) - { - tmp->Vertices[i] = importedvertices[i]; - tf = SquareMagnitude( tmp->Vertices[ i ].position - tmp->pCenter ); - if (tf > r) - r = tf; - } - tmp->fSquareRadius += r; - RaTriangleDivider(tmp); // Ra: dzielenie trójkątów jest teraz całkiem wydajne } // koniec wczytywania trójkątów break; case GL_LINES: @@ -1394,6 +1423,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> tmp->Diffuse.b >> tmp->fLineThickness; tmp->Diffuse /= 255.0f; + tmp->fLineThickness = std::min( 30.0, tmp->fLineThickness ); // 30 pix equals rougly width of a signal pole viewed from ~1m away TGroundVertex vertex, vertex0, vertex1; std::size_t vertexcount{ 0 }; @@ -1455,15 +1485,25 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) importedvertices.pop_back(); } tmp->iType = GL_LINES; + tmp->Piece = new piece_node(); + tmp->iNumPts = importedvertices.size(); - auto const nv = importedvertices.size(); - tmp->Points = new glm::dvec3[ nv ]; - tmp->iNumPts = nv; - for( std::size_t i = 0; i < nv; ++i ) { - tmp->Points[ i ] = importedvertices[ i ].position; - tmp->pCenter += importedvertices[ i ].position; + if( false == importedvertices.empty() ) { + + tmp->Piece->vertices.swap( importedvertices ); + + glm::dvec3 minpoint( std::numeric_limits::max(), 0.0, std::numeric_limits::max() ); + glm::dvec3 maxpoint( std::numeric_limits::lowest(), 0.0, std::numeric_limits::lowest() ); + for( auto const &vertex : tmp->Piece->vertices ) { + tmp->pCenter += vertex.position; + minpoint.x = std::min( minpoint.x, vertex.position.x ); + minpoint.z = std::min( minpoint.z, vertex.position.z ); + maxpoint.x = std::max( maxpoint.x, vertex.position.x ); + maxpoint.z = std::max( maxpoint.z, vertex.position.z ); + } + tmp->pCenter /= tmp->iNumPts; + tmp->m_radius = static_cast( glm::distance( maxpoint, minpoint ) * 0.5 ); } - tmp->pCenter /= ( nv > 0 ? nv : 1 ); break; } } @@ -1559,11 +1599,6 @@ void TGround::FirstInit() } else { // dodajemy do kwadratu kilometrowego - // override visibility ranges, to ensure the content is drawn from far enough - // TODO: subclass NodeAdd() for the ground cell and specialize it, instead of this - // TODO: given their view ranges are the same, combine the geometry in single per-material nodes - Current->fSquareRadius = 50000.0 * 50000.0; - Current->fSquareMinRadius = 0.0; GetRect( Current->pCenter.x, Current->pCenter.z )->NodeAdd( Current ); } } @@ -1632,7 +1667,7 @@ bool TGround::Init(std::string File) switch( LastNode->iType ) { // validate the new node case GL_TRIANGLES: { - if( LastNode->Vertices == nullptr ) { + if( true == LastNode->Piece->vertices.empty() ) { SafeDelete( LastNode ); } break; @@ -1692,7 +1727,7 @@ bool TGround::Init(std::string File) } else { - Error("Scene parse error near " + token); + ErrorLog("Scene parsing error in file \"" + parser.Name() + "\", unexpected token \"" + token + "\""); // break; } } @@ -1722,20 +1757,21 @@ bool TGround::Init(std::string File) fTrainSetVel, 0, NULL); } } - if (LastNode) // ostatni wczytany obiekt - if (LastNode->iType == - TP_DYNAMIC) // o ile jest pojazdem (na ogół jest, ale kto wie...) - if (iTrainSetWehicleNumber ? !TempConnectionType[iTrainSetWehicleNumber - 1] : - false) // jeśli ostatni pojazd ma sprzęg 0 - LastNode->DynamicObject->RaLightsSet(-1, 2 + 32 + 64); // to założymy mu - // końcówki blaszane - // (jak AI się - // odpali, to sobie - // poprawi) + if( LastNode ) { + // ostatni wczytany obiekt + if( LastNode->iType == TP_DYNAMIC ) { + // o ile jest pojazdem (na ogół jest, ale kto wie...) + if( ( iTrainSetWehicleNumber > 0 ) + && ( TempConnectionType[ iTrainSetWehicleNumber - 1 ] == 0 ) ) { + // jeśli ostatni pojazd ma sprzęg 0 to założymy mu końcówki blaszane + // (jak AI się odpali, to sobie poprawi) + LastNode->DynamicObject->RaLightsSet( -1, 2 + 32 + 64 ); + } + } + } bTrainSet = false; fTrainSetVel = 0; - // iTrainSetConnection=0; - nTrainSetNode = nTrainSetDriver = NULL; + nTrainSetNode = nTrainSetDriver = nullptr; iTrainSetWehicleNumber = 0; } else if (str == "event") diff --git a/Ground.h b/Ground.h index 4edf8976..04e66754 100644 --- a/Ground.h +++ b/Ground.h @@ -93,15 +93,15 @@ struct TGroundVertex texture = interpolate( v1.texture, v2.texture, static_cast( factor ) ); } }; -/* + // ground node holding single, unique piece of 3d geometry. TBD, TODO: unify this with basic 3d model node -struct mesh_node { +struct piece_node { std::vector vertices; - geometry_handle geometry; // geometry prepared for drawing + geometry_handle geometry { 0,0 }; // geometry prepared for drawing }; -*/ -class TGroundNode /*: public Resource*/ -{ // obiekt scenerii + +// obiekt scenerii +class TGroundNode { friend class opengl_renderer; @@ -117,9 +117,8 @@ public: TSubModel *smTerrain; // modele terenu (kwadratow kilometrowych) TAnimModel *Model; // model z animacjami TDynamicObject *DynamicObject; // pojazd - glm::dvec3 *Points; // punkty dla linii + piece_node *Piece; // non-instanced piece of geometry TTrack *pTrack; // trajektoria ruchu - TGroundVertex *Vertices; // wierzchołki dla trójkątów TMemCell *MemCell; // komórka pamięci TEventLauncher *EvLaunch; // wyzwalacz zdarzeń TTraction *hvTraction; // drut zasilający @@ -128,6 +127,7 @@ public: TGroundNode *nNode; // obiekt renderujący grupowo ma tu wskaźnik na listę obiektów }; Math3D::vector3 pCenter; // współrzędne środka do przydzielenia sektora + float m_radius { 0.0f }; // bounding radius of geometry stored in the node. TODO: reuse bounding_area struct for radius and center glm::dvec3 m_rootposition; // position of the ground (sub)rectangle holding the node, in the 3d world // visualization-related data // TODO: wrap these in a struct, when cleaning objects up @@ -139,9 +139,6 @@ public: int iNumPts; // dla linii int iCount; // dla terenu }; - // NOTE: geometry handle is duplicated in (anim)model(3d), as well as in track and traction type nodes - // TODO: clean this up when node types are refactored into an inheritance/composition scheme - geometry_handle m_geometry; // geometry of the submodel int iFlags; // tryb przezroczystości: 0x10-nieprz.,0x20-przezroczysty,0x30-mieszany texture_handle TextureID; // główna (jedna) tekstura obiektu glm::vec3 @@ -152,9 +149,11 @@ public: bool bVisible; TGroundNode(); - TGroundNode(TGroundNodeType t, int n = 0); + TGroundNode(TGroundNodeType t); ~TGroundNode(); +/* void Init(int n); +*/ void InitNormals(); /* void Release(); @@ -200,7 +199,7 @@ class TSubRect : /*public Resource,*/ public CMesh /* virtual void Release(); // zwalnianie VBO sektora */ - void NodeAdd(TGroundNode *Node); // dodanie obiektu do sektora na etapie rozdzielania na sektory + virtual void NodeAdd(TGroundNode *Node); // dodanie obiektu do sektora na etapie rozdzielania na sektory void Sort(); // optymalizacja obiektów w sektorze (sortowanie wg tekstur) TTrack * FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude); TTraction * FindTraction(glm::dvec3 const &Point, int &iConnection, TTraction *Exclude); @@ -242,17 +241,19 @@ public: }; // pobranie wskaźnika do małego kwadratu, bez tworzenia jeśli nie ma TSubRect * FastGetSubRect(int iCol, int iRow) { - return (pSubRects ? pSubRects + iRow * iNumSubRects + iCol : NULL); - }; + return ( + pSubRects ? + pSubRects + iRow * iNumSubRects + iCol : + nullptr); }; + void NodeAdd( TGroundNode *Node ); // dodanie obiektu do sektora na etapie rozdzielania na sektory + // compares two provided nodes, returns true if their content can be merged + bool mergeable( TGroundNode const &Left, TGroundNode const &Right ); // optymalizacja obiektów w sektorach void Optimize() { if( pSubRects ) { for( int i = iNumSubRects * iNumSubRects - 1; i >= 0; --i ) { // optymalizacja obiektów w sektorach - pSubRects[ i ].Sort(); - } - } - }; + pSubRects[ i ].Sort(); } } }; static int iFrameNumber; // numer kolejny wyświetlanej klatki TGroundNode *nTerrain { nullptr }; // model terenu z E3D - użyć nRootMesh? @@ -308,8 +309,8 @@ class TGround bool AddToQuery(TEvent *Event, TDynamicObject *Node); bool GetTraction(TDynamicObject *model); bool CheckQuery(); - TGroundNode * DynamicFindAny(std::string asNameToFind); - TGroundNode * DynamicFind(std::string asNameToFind); + TGroundNode * DynamicFindAny(std::string const &Name); + TGroundNode * DynamicFind(std::string const &Name); void DynamicList(bool all = false); TGroundNode * FindGroundNode(std::string asNameToFind, TGroundNodeType iNodeType); TGroundRect * GetRect(double x, double z) @@ -343,7 +344,9 @@ class TGround public: void WyslijEvent(const std::string &e, const std::string &d); +/* int iRendered; // ilość renderowanych sektorów, pobierana przy pokazywniu FPS +*/ void WyslijString(const std::string &t, int n); void WyslijWolny(const std::string &t); void WyslijNamiary(TGroundNode *t); diff --git a/Model3d.cpp b/Model3d.cpp index e7617e06..1974ba5c 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -78,6 +78,23 @@ void TSubModel::NameSet(std::string const &Name) pName = Name; }; +// sets light level (alpha component of illumination color) to specified value +void +TSubModel::SetLightLevel( float const Level, bool const Includechildren, bool const Includesiblings ) { + + f4Emision.a = Level; + if( true == Includesiblings ) { + auto sibling { this }; + while( ( sibling = sibling->Next ) != nullptr ) { + sibling->f4Emision.a = Level; + } + } + if( ( true == Includechildren ) + && ( Child != nullptr ) ) { + Child->SetLightLevel( Level, true, true ); // node's children include child's siblings and children + } +} + int TSubModel::SeekFaceNormal(std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, vertex_array const &Vertices) { // szukanie punktu stycznego do (pt), zwraca numer wierzchołka, a nie trójkąta int facecount = iNumVerts / 3; // bo maska powierzchni jest jedna na trójkąt @@ -315,9 +332,9 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic } else { // jeśli tylko nazwa pliku, to dawać bieżącą ścieżkę do tekstur - TextureNameSet(texture.c_str()); + TextureNameSet(texture); if( texture.find_first_of( "/\\" ) == texture.npos ) { - texture.insert( 0, Global::asCurrentTexturePath.c_str() ); + texture.insert( 0, Global::asCurrentTexturePath ); } TextureID = GfxRenderer.GetTextureId( texture, szTexturePath ); // renderowanie w cyklu przezroczystych tylko jeśli: @@ -429,7 +446,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce - WriteLog("Degenerated triangle ignored in: \"" + pName + "\", verticle " + std::to_string(i)); + WriteLog("Degenerated triangle ignored in: \"" + pName + "\", vertice " + std::to_string(i)); } if (i > 0) { // jeśli pierwszy trójkąt będzie zdegenerowany, to zostanie usunięty i nie ma co sprawdzać @@ -487,6 +504,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic glm::vec3() ); // przepisanie do wierzchołka trójkąta } } + Vertices.resize( iNumVerts ); // in case we had some degenerate triangles along the way /* delete[] wsp; delete[] n; @@ -534,6 +552,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic else if( eType == TP_FREESPOTLIGHT ) { // single light points only have single data point, duh Vertices.emplace_back(); + iNumVerts = 1; } // Visible=true; //się potem wyłączy w razie potrzeby // iFlags|=0x0200; //wczytano z pliku tekstowego (jest właścicielem tablic) @@ -711,25 +730,20 @@ void TSubModel::InitialRotate(bool doit) { // jeśli jest jednostkowy transform, to przeliczamy // wierzchołki, a mnożenie podajemy dalej float swapcopy; -// if( false == Vertices.empty() ) { -/* - for( auto &vertex : Vertices ) { -*/ for( auto &vertex : Vertices ) { - vertex.position.x = -vertex.position.x; // zmiana znaku X - swapcopy = vertex.position.y; // zamiana Y i Z - vertex.position.y = vertex.position.z; - vertex.position.z = swapcopy; - // wektory normalne również trzeba przekształcić, bo się źle oświetlają - if( eType != TP_STARS ) { - // gwiazdki mają kolory zamiast normalnych, to // ich wtedy nie ruszamy - vertex.normal.x = -vertex.normal.x; // zmiana znaku X - swapcopy = vertex.normal.y; // zamiana Y i Z - vertex.normal.y = vertex.normal.z; - vertex.normal.z = swapcopy; - } + vertex.position.x = -vertex.position.x; // zmiana znaku X + swapcopy = vertex.position.y; // zamiana Y i Z + vertex.position.y = vertex.position.z; + vertex.position.z = swapcopy; + // wektory normalne również trzeba przekształcić, bo się źle oświetlają + if( eType != TP_STARS ) { + // gwiazdki mają kolory zamiast normalnych, to // ich wtedy nie ruszamy + vertex.normal.x = -vertex.normal.x; // zmiana znaku X + swapcopy = vertex.normal.y; // zamiana Y i Z + vertex.normal.y = vertex.normal.z; + vertex.normal.z = swapcopy; } - // } + } if (Child) Child->InitialRotate(doit); // potomne ewentualnie obrócimy } diff --git a/Model3d.h b/Model3d.h index fab31e2e..3c74b353 100644 --- a/Model3d.h +++ b/Model3d.h @@ -56,6 +56,7 @@ class TSubModel friend class opengl_renderer; friend class TModel3d; // temporary workaround. TODO: clean up class content/hierarchy + friend class TDynamicObject; // temporary etc private: int iNext{ NULL }; @@ -85,47 +86,41 @@ private: float4x4 *fMatrix = nullptr; // pojedyncza precyzja wystarcza int iMatrix; // w pliku binarnym jest numer matrycy }; - int iNumVerts{ -1 }; // ilość wierzchołków (1 dla FreeSpotLight) + int iNumVerts { -1 }; // ilość wierzchołków (1 dla FreeSpotLight) int tVboPtr; // początek na liście wierzchołków albo indeksów - int iTexture{ 0 }; // numer nazwy tekstury, -1 wymienna, 0 brak - float fVisible{ 0.0f }; // próg jasności światła do załączenia submodelu - float fLight{ -1.0f }; // próg jasności światła do zadziałania selfillum + int iTexture { 0 }; // numer nazwy tekstury, -1 wymienna, 0 brak + float fVisible { 0.0f }; // próg jasności światła do załączenia submodelu + float fLight { -1.0f }; // próg jasności światła do zadziałania selfillum glm::vec4 - f4Ambient{ 1.0f,1.0f,1.0f,1.0f }, - f4Diffuse{ 1.0f,1.0f,1.0f,1.0f }, - f4Specular{ 0.0f,0.0f,0.0f,1.0f }, - f4Emision{ 1.0f,1.0f,1.0f,1.0f }; - float fWireSize{ 0.0f }; // nie używane, ale wczytywane - float fSquareMaxDist{ 10000.0f * 10000.0f }; - float fSquareMinDist{ 0.0f }; + f4Ambient { 1.0f,1.0f,1.0f,1.0f }, + f4Diffuse { 1.0f,1.0f,1.0f,1.0f }, + f4Specular { 0.0f,0.0f,0.0f,1.0f }, + f4Emision { 1.0f,1.0f,1.0f,1.0f }; + float fWireSize { 0.0f }; // nie używane, ale wczytywane + float fSquareMaxDist { 10000.0f * 10000.0f }; + float fSquareMinDist { 0.0f }; // McZapkie-050702: parametry dla swiatla: - float fNearAttenStart{ 40.0f }; - float fNearAttenEnd{ 80.0f }; - bool bUseNearAtten{ false }; // te 3 zmienne okreslaja rysowanie aureoli wokol zrodla swiatla - int iFarAttenDecay{ 0 }; // ta zmienna okresla typ zaniku natezenia swiatla (0:brak, 1,2: potega 1/R) - float fFarDecayRadius{ 100.0f }; // normalizacja j.w. - float fCosFalloffAngle{ 0.5f }; // cosinus kąta stożka pod którym widać światło - float fCosHotspotAngle{ 0.3f }; // cosinus kąta stożka pod którym widać aureolę i zwiększone natężenie światła - float fCosViewAngle{ 0.0f }; // cos kata pod jakim sie teraz patrzy + float fNearAttenStart { 40.0f }; + float fNearAttenEnd { 80.0f }; + bool bUseNearAtten { false }; // te 3 zmienne okreslaja rysowanie aureoli wokol zrodla swiatla + int iFarAttenDecay { 0 }; // ta zmienna okresla typ zaniku natezenia swiatla (0:brak, 1,2: potega 1/R) + float fFarDecayRadius { 100.0f }; // normalizacja j.w. + float fCosFalloffAngle { 0.5f }; // cosinus kąta stożka pod którym widać światło + float fCosHotspotAngle { 0.3f }; // cosinus kąta stożka pod którym widać aureolę i zwiększone natężenie światła + float fCosViewAngle { 0.0f }; // cos kata pod jakim sie teraz patrzy - TSubModel *Next{ nullptr }; - TSubModel *Child{ nullptr }; -/* - intptr_t iVboPtr; -*/ - geometry_handle m_geometry{ NULL, NULL }; // geometry of the submodel - texture_handle TextureID{ NULL }; // numer tekstury, -1 wymienna, 0 brak - bool bWire{ false }; // nie używane, ale wczytywane -/* - GLuint uiDisplayList; // roboczy numer listy wyświetlania -*/ - float Opacity{ 1.0f }; - float f_Angle{ 0.0f }; - float3 v_RotateAxis{ 0.0f, 0.0f, 0.0f }; + TSubModel *Next { nullptr }; + TSubModel *Child { nullptr }; + geometry_handle m_geometry { NULL, NULL }; // geometry of the submodel + texture_handle TextureID { NULL }; // numer tekstury, -1 wymienna, 0 brak + bool bWire { false }; // nie używane, ale wczytywane + float Opacity { 1.0f }; + float f_Angle { 0.0f }; + float3 v_RotateAxis { 0.0f, 0.0f, 0.0f }; float3 v_Angles { 0.0f, 0.0f, 0.0f }; public: // chwilowo - float3 v_TransVector{ 0.0f, 0.0f, 0.0f }; + float3 v_TransVector { 0.0f, 0.0f, 0.0f }; /* basic_vertex *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO */ @@ -192,18 +187,14 @@ public: int Flags() { return iFlags; }; void UnFlagNext() { iFlags &= 0x00FFFFFF; }; void ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ); - inline float3 Translation1Get() - { - return fMatrix ? *(fMatrix->TranslationGet()) + v_TransVector : v_TransVector; - } - inline float3 Translation2Get() - { - return *(fMatrix->TranslationGet()) + Child->Translation1Get(); - } - int GetTextureId() - { - return TextureID; - } + // sets light level (alpha component of illumination color) to specified value + void SetLightLevel( float const Level, bool const Includechildren = false, bool const Includesiblings = false ); + inline float3 Translation1Get() { + return fMatrix ? *(fMatrix->TranslationGet()) + v_TransVector : v_TransVector; } + inline float3 Translation2Get() { + return *(fMatrix->TranslationGet()) + Child->Translation1Get(); } + int GetTextureId() { + return TextureID; } void ParentMatrix(float4x4 *m); float MaxY( float4x4 const &m ); void AdjustDist(); diff --git a/PyInt.cpp b/PyInt.cpp index c55e371f..8a6a74b4 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -457,7 +457,7 @@ void TPythonScreens::init(cParser &parser, TModel3d *model, std::string const &n WriteLog( "Python Screen: submodel " + subModelName + " not found - Ignoring screen" ); return; // nie ma takiego sub modelu w danej kabinie pomijamy } - int textureId = GfxRenderer.Texture(subModel->GetTextureId()).id; + auto textureId = subModel->GetTextureId(); if (textureId <= 0) { WriteLog( "Python Screen: invalid texture id " + std::to_string(textureId) + " - Ignoring screen" ); diff --git a/Texture.cpp b/Texture.cpp index 9856a152..64bd8d8f 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -817,8 +817,8 @@ texture_manager::bind( texture_handle const Texture ) { ::glBindTexture( GL_TEXTURE_2D, texture(Texture).id ); m_activetexture = texture(Texture).id; #else - if( Texture( Id ).bind() == resource_state::good ) { - m_activetexture = Id; + if( texture( Texture ).bind() == resource_state::good ) { + m_activetexture = Texture; } else { // TODO: bind a special 'error' texture on failure @@ -839,7 +839,7 @@ texture_manager::delete_textures() { for( auto const &texture : m_textures ) { // usunięcie wszyskich tekstur (bez usuwania struktury) if( ( texture.id > 0 ) - && ( texture.id != -1 ) ) { + && ( texture.id != -1 ) ) { ::glDeleteTextures( 1, &texture.id ); } } @@ -876,7 +876,7 @@ texture_manager::info() const { + std::to_string( readytexturecount ) + " (" + to_string( readytexturesize / 1024.0f, 2 ) + " mb)" - + " in vram, "; + + " in vram, " #endif + std::to_string( totaltexturecount ) + " (" diff --git a/Texture.h b/Texture.h index 8ed49627..17da9bca 100644 --- a/Texture.h +++ b/Texture.h @@ -29,8 +29,18 @@ struct opengl_texture { // methods void load(); - resource_state bind(); - resource_state create(); + resource_state + bind(); + resource_state + create(); + inline + int + width() const { + return data_width; } + inline + int + height() const { + return data_height; } // members GLuint id{ (GLuint)-1 }; // associated GL resource bool has_alpha{ false }; // indicates the texture has alpha channel diff --git a/Track.cpp b/Track.cpp index 5386a839..59a7a44f 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2156,7 +2156,6 @@ TTrack * TTrack::RaAnimate() if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - vertex_array vertices; if( TextureID1 ) { // left blade SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); @@ -2171,7 +2170,6 @@ TTrack * TTrack::RaAnimate() } } else { // lewa działa lepiej niż prawa - vertex_array vertices; if( TextureID1 ) { // right blade SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); diff --git a/Train.cpp b/Train.cpp index 5a572617..d37ddb84 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5889,9 +5889,8 @@ bool TTrain::Update( double const Deltatime ) } case 2: { //światło wewnętrzne zapalone (255 216 176) - if( mvOccupied->ConverterFlag == - true ) // jasnosc dla zalaczonej przetwornicy - { + if( mvOccupied->ConverterFlag == true ) { + // jasnosc dla zalaczonej przetwornicy DynamicObject->InteriorLightLevel = 1.0f; } else { @@ -6441,6 +6440,10 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { DynamicObject->mdKabina->Init(); // obrócenie modelu oraz optymalizacja, również zapisanie binarnego set_cab_controls(); + // HACK: for some reason simulation at the start is slow until a sound is played + // until we do a proper fix, try to play a 'silent' sound when cab is entered + // TBD: it could be instead a legit sound of door closing + play_sound( dsbSwitch, DSBVOLUME_MIN ); return true; } return (token == "none"); diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index 5c9fe8b0..759ffdeb 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -55,7 +55,7 @@ geometry_bank::create( vertex_array &Vertices, unsigned int const Type ) { m_chunks.emplace_back( Vertices, Type ); // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication geometry_handle chunkhandle { 0, static_cast(m_chunks.size()) }; - // template method + // template method implementation create_( chunkhandle ); // all done return chunkhandle; @@ -81,7 +81,7 @@ geometry_bank::replace( vertex_array &Vertices, geometry_handle const &Geometry, chunk.vertices.resize( Offset + Vertices.size(), basic_vertex() ); chunk.vertices.insert( std::end( chunk.vertices ), std::begin( Vertices ), std::end( Vertices ) ); } - // template method + // template method implementation replace_( Geometry ); // all done return true; @@ -99,10 +99,17 @@ geometry_bank::append( vertex_array &Vertices, geometry_handle const &Geometry ) // draws geometry stored in specified chunk void geometry_bank::draw( geometry_handle const &Geometry, unsigned int const Streams ) { - // template method + // template method implementation draw_( Geometry, Streams ); } +// frees subclass-specific resources associated with the bank, typically called when the bank wasn't in use for a period of time +void +geometry_bank::release() { + // template method implementation + release_(); +} + vertex_array const & geometry_bank::vertices( geometry_handle const &Geometry ) const { @@ -209,6 +216,13 @@ opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, unsigned int con */ } +// release () subclass details +void +opengl_vbogeometrybank::release_() { + + delete_buffer(); +} + void opengl_vbogeometrybank::bind_buffer() { @@ -225,6 +239,7 @@ opengl_vbogeometrybank::delete_buffer() { ::glDeleteBuffers( 1, &m_buffer ); if( m_activebuffer == m_buffer ) { m_activebuffer = NULL; + bind_streams( stream::none ); } m_buffer = NULL; m_buffercapacity = 0; @@ -314,6 +329,19 @@ opengl_dlgeometrybank::draw_( geometry_handle const &Geometry, unsigned int cons ::glCallList( chunkrecord.list ); } +// release () subclass details +void +opengl_dlgeometrybank::release_() { + + for( auto &chunkrecord : m_chunkrecords ) { + if( chunkrecord.list != 0 ) { + ::glDeleteLists( chunkrecord.list, 1 ); + chunkrecord.list = 0; + } + chunkrecord.streams = stream::none; + } +} + void opengl_dlgeometrybank::delete_list( geometry_handle const &Geometry ) { // NOTE: given it's our own internal method we trust it to be called with valid parameters @@ -327,12 +355,37 @@ opengl_dlgeometrybank::delete_list( geometry_handle const &Geometry ) { // geometry bank manager, holds collection of geometry banks +// performs a resource sweep +void +geometrybank_manager::update() { + + m_resourcetimestamp = std::chrono::steady_clock::now(); + // garbage collection sweep is limited to a number of records per call, to reduce impact on framerate + auto const sweeplastindex = + std::min( + m_resourcesweepindex + geometrybank_manager::unusedresourcesweepsize, + m_geometrybanks.size() ); + auto const blanktimestamp { std::chrono::steady_clock::time_point() }; + for( auto bankindex = m_resourcesweepindex; bankindex < sweeplastindex; ++bankindex ) { + if( ( m_geometrybanks[ bankindex ].second != blanktimestamp ) + && ( m_resourcetimestamp - m_geometrybanks[ bankindex ].second > geometrybank_manager::unusedresourcetimetolive ) ) { + + m_geometrybanks[ bankindex ].first->release(); + m_geometrybanks[ bankindex ].second = blanktimestamp; + } + } + m_resourcesweepindex = ( + m_resourcesweepindex + geometrybank_manager::unusedresourcesweepsize >= m_geometrybanks.size() ? + 0 : // if the next sweep chunk is beyond actual data, so start anew + m_resourcesweepindex + geometrybank_manager::unusedresourcesweepsize ); +} + // creates a new geometry bank. returns: handle to the bank or NULL geometrybank_handle geometrybank_manager::create_bank() { - if( true == Global::bUseVBO ) { m_geometrybanks.emplace_back( std::make_shared() ); } - else { m_geometrybanks.emplace_back( std::make_shared() ); } + if( true == Global::bUseVBO ) { m_geometrybanks.emplace_back( std::make_shared(), std::chrono::steady_clock::time_point() ); } + else { m_geometrybanks.emplace_back( std::make_shared(), std::chrono::steady_clock::time_point() ); } // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication return geometrybank_handle( m_geometrybanks.size(), 0 ); } @@ -341,7 +394,7 @@ geometrybank_manager::create_bank() { geometry_handle geometrybank_manager::create_chunk( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type ) { - auto const newchunkhandle = bank( Geometry )->create( Vertices, Type ); + auto const newchunkhandle = bank( Geometry ).first->create( Vertices, Type ); if( newchunkhandle.chunk != 0 ) { return geometry_handle( Geometry.bank, newchunkhandle.chunk ); } else { return geometry_handle( 0, 0 ); } @@ -351,14 +404,14 @@ geometrybank_manager::create_chunk( vertex_array &Vertices, geometrybank_handle bool geometrybank_manager::replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset ) { - return bank( Geometry )->replace( Vertices, Geometry, Offset ); + return bank( Geometry ).first->replace( Vertices, Geometry, Offset ); } // adds supplied vertex data at the end of specified chunk bool geometrybank_manager::append( vertex_array &Vertices, geometry_handle const &Geometry ) { - return bank( Geometry )->append( Vertices, Geometry ); + return bank( Geometry ).first->append( Vertices, Geometry ); } // draws geometry stored in specified chunk void @@ -366,12 +419,15 @@ geometrybank_manager::draw( geometry_handle const &Geometry, unsigned int const if( Geometry == NULL ) { return; } - return bank( Geometry )->draw( Geometry, Streams ); + auto &bankrecord = bank( Geometry ); + + bankrecord.second = m_resourcetimestamp; + bankrecord.first->draw( Geometry, Streams ); } // provides direct access to vertex data of specfied chunk vertex_array const & geometrybank_manager::vertices( geometry_handle const &Geometry ) const { - return bank( Geometry )->vertices( Geometry ); + return bank( Geometry ).first->vertices( Geometry ); } diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 0b174566..d799650b 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -102,6 +102,9 @@ public: template void draw( Iterator_ First, Iterator_ Last, unsigned int const Streams = basic_streams ) { while( First != Last ) { draw( *First, Streams ); ++First; } } + // frees subclass-specific resources associated with the bank, typically called when the bank wasn't in use for a period of time + void + release(); // provides direct access to vertex data of specfied chunk vertex_array const & vertices( geometry_handle const &Geometry ) const; @@ -142,6 +145,8 @@ private: virtual void replace_( geometry_handle const &Geometry ) = 0; // draw() subclass details virtual void draw_( geometry_handle const &Geometry, unsigned int const Streams ) = 0; + // resource release subclass details + virtual void release_() = 0; }; // opengl vbo-based variant of the geometry bank @@ -149,6 +154,8 @@ private: class opengl_vbogeometrybank : public geometry_bank { public: +// constructors: + opengl_vbogeometrybank() = default; // destructor ~opengl_vbogeometrybank() { delete_buffer(); } @@ -179,6 +186,9 @@ private: // draw() subclass details void draw_( geometry_handle const &Geometry, unsigned int const Streams ); + // release () subclass details + void + release_(); void bind_buffer(); void @@ -200,7 +210,9 @@ private: class opengl_dlgeometrybank : public geometry_bank { public: -// methods: +// constructors: + opengl_dlgeometrybank() = default; +// destructor: ~opengl_dlgeometrybank() { for( auto &chunkrecord : m_chunkrecords ) { ::glDeleteLists( chunkrecord.list, 1 ); } } @@ -224,6 +236,9 @@ private: // draw() subclass details void draw_( geometry_handle const &Geometry, unsigned int const Streams ); + // release () subclass details + void + release_(); void delete_list( geometry_handle const &Geometry ); @@ -240,6 +255,8 @@ class geometrybank_manager { public: // methods: + // performs a resource sweep + void update(); // creates a new geometry bank. returns: handle to the bank or NULL geometrybank_handle create_bank(); @@ -267,23 +284,31 @@ public: private: // types: - typedef std::deque< std::shared_ptr > geometrybank_sequence; + typedef std::pair< + std::shared_ptr, + std::chrono::steady_clock::time_point > geometrybanktimepoint_pair; + + typedef std::deque< geometrybanktimepoint_pair > geometrybanktimepointpair_sequence; // members: - geometrybank_sequence m_geometrybanks; + std::chrono::nanoseconds const unusedresourcetimetolive { std::chrono::seconds { 60 } }; + geometrybanktimepointpair_sequence::size_type const unusedresourcesweepsize { 300 }; + geometrybanktimepointpair_sequence m_geometrybanks; + geometrybanktimepointpair_sequence::size_type m_resourcesweepindex { 0 }; + std::chrono::steady_clock::time_point m_resourcetimestamp { std::chrono::steady_clock::now() }; // methods inline bool valid( geometry_handle const &Geometry ) { - return ( ( Geometry.bank != 0 ) - && ( Geometry.bank <= m_geometrybanks.size() ) ); } + return ( ( Geometry.bank != 0 ) + && ( Geometry.bank <= m_geometrybanks.size() ) ); } inline - geometrybank_sequence::value_type & + geometrybanktimepointpair_sequence::value_type & bank( geometry_handle const Geometry ) { return m_geometrybanks[ Geometry.bank - 1 ]; } inline - geometrybank_sequence::value_type const & + geometrybanktimepointpair_sequence::value_type const & bank( geometry_handle const Geometry ) const { return m_geometrybanks[ Geometry.bank - 1 ]; } diff --git a/parser.cpp b/parser.cpp index 4b71b7cd..b6b27dfd 100644 --- a/parser.cpp +++ b/parser.cpp @@ -201,14 +201,19 @@ std::string cParser::readQuotes(char const Quote) { // read the stream until spe return token; } -std::string cParser::readComment( std::string const &Break ) { // pobieranie znaków aż do znalezienia znacznika końca - std::string token = ""; +void cParser::skipComment( std::string const &Endmark ) { // pobieranie znaków aż do znalezienia znacznika końca + std::string input = ""; + auto const endmarksize = Endmark.size(); while( mStream->peek() != EOF ) { // o ile nie koniec pliku - token += mStream->get(); // pobranie znaku - if( token.rfind( Break ) != std::string::npos ) // szukanie znacznika końca + input += mStream->get(); // pobranie znaku + if( input.find( Endmark ) != std::string::npos ) // szukanie znacznika końca break; + if( input.size() >= endmarksize ) { + // keep the read text short, to avoid pointless string re-allocations on longer comments + input = input.substr( 1 ); + } } - return token; + return; } bool cParser::findQuotes( std::string &String ) { @@ -228,7 +233,7 @@ bool cParser::trimComments(std::string &String) { if (String.rfind((*cmIt).first) != std::string::npos) { - readComment((*cmIt).second); + skipComment((*cmIt).second); String.resize(String.rfind((*cmIt).first)); return true; } diff --git a/parser.h b/parser.h index 1212fcc5..7582c0e1 100644 --- a/parser.h +++ b/parser.h @@ -92,7 +92,7 @@ class cParser //: public std::stringstream // methods: std::string readToken(bool ToLower = true, const char *Break = "\n\r\t ;"); std::string readQuotes( char const Quote = '\"' ); - std::string readComment( std::string const &Break = "\n\r\t ;" ); + void skipComment( std::string const &Endmark ); bool findQuotes( std::string &String ); bool trimComments( std::string &String ); std::size_t count(); diff --git a/renderer.cpp b/renderer.cpp index 27167c1e..bc380ecb 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -157,6 +157,7 @@ opengl_renderer::Render() { // frustum tests are performed in 'world space' but after we set up frustum // we no longer need camera translation, only rotation ::glMultMatrixd( glm::value_ptr( glm::dmat4( glm::dmat3( worldcamera )))); + Render( &World.Environment ); Render( &World.Ground ); @@ -538,19 +539,26 @@ opengl_renderer::Render( TGroundNode *Node ) { } case GL_LINES: { - if( ( Node->m_geometry == NULL ) + if( ( Node->Piece->geometry == NULL ) || ( Node->fLineThickness > 0.0 ) ) { return false; } // setup - // w zaleznosci od koloru swiatla + auto const distance = std::sqrt( distancesquared ); + auto const linealpha = + 10.0 * Node->fLineThickness + / std::max( + 0.5 * Node->m_radius + 1.0, + distance - ( 0.5 * Node->m_radius ) ); ::glColor4fv( glm::value_ptr( glm::vec4( - Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), - std::min( - 1.0, - 1000.0 * Node->fLineThickness / ( distancesquared + 1.0 ) ) ) ) ); + Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla + 1.0 ) ) ); // if the thickness is defined negative, lines are always drawn opaque + auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 32.0 ); + if( linewidth > 1.0 ) { + ::glLineWidth( static_cast( linewidth ) ); + } GfxRenderer.Bind( 0 ); @@ -559,16 +567,18 @@ opengl_renderer::Render( TGroundNode *Node ) { ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render - m_geometry.draw( Node->m_geometry ); + m_geometry.draw( Node->Piece->geometry ); // post-render cleanup ::glPopMatrix(); + if( linewidth > 1.0 ) { ::glLineWidth( 1.0f ); } + return true; } case GL_TRIANGLES: { - if( ( Node->m_geometry == NULL ) + if( ( Node->Piece->geometry == NULL ) || ( ( Node->iFlags & 0x10 ) == 0 ) ) { return false; } @@ -582,7 +592,7 @@ opengl_renderer::Render( TGroundNode *Node ) { ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render - m_geometry.draw( Node->m_geometry ); + m_geometry.draw( Node->Piece->geometry ); // post-render cleanup ::glPopMatrix(); @@ -750,7 +760,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // ...luminance if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo - ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr(Submodel->f4Diffuse) ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); } // main draw call @@ -772,7 +782,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) // kąt większy niż maksymalny stożek swiatła { - float lightlevel = 1.0f; + float lightlevel = 1.0f; // TODO, TBD: parameter to control light strength // view angle attenuation float const anglefactor = ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation @@ -946,7 +956,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } float const linealpha = static_cast( std::min( - 1.2, + 1.25, 5000 * Node->hvTraction->WireThickness / ( distancesquared + 1.0 ) ) ); // zbyt grube nie są dobre ::glLineWidth( linealpha ); // McZapkie-261102: kolor zalezy od materialu i zasniedzenia @@ -982,17 +992,23 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } case GL_LINES: { - if( ( Node->m_geometry == NULL ) + if( ( Node->Piece->geometry == NULL ) || ( Node->fLineThickness < 0.0 ) ) { return false; } // setup - auto const linewidth = clamp( 100.0 * Node->fLineThickness / ( distancesquared + 1.0 ), 1.0, 10.0 ); + auto const distance = std::sqrt( distancesquared ); + auto const linealpha = + 10.0 * Node->fLineThickness + / std::max( + 0.5 * Node->m_radius + 1.0, + distance - ( 0.5 * Node->m_radius ) ); ::glColor4fv( glm::value_ptr( glm::vec4( Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla - std::min( 1.0, linewidth ) ) ) ); + std::min( 1.0, linealpha ) ) ) ); + auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 32.0 ); if( linewidth > 1.0 ) { ::glLineWidth( static_cast(linewidth) ); } @@ -1004,20 +1020,18 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render - m_geometry.draw( Node->m_geometry ); + m_geometry.draw( Node->Piece->geometry ); // post-render cleanup - if( linewidth > 1.0 ) { - ::glLineWidth( 1.0f ); - } - ::glPopMatrix(); + if( linewidth > 1.0 ) { ::glLineWidth( 1.0f ); } + return true; } case GL_TRIANGLES: { - if( ( Node->m_geometry == NULL ) + if( ( Node->Piece->geometry == NULL ) || ( ( Node->iFlags & 0x20 ) == 0 ) ) { return false; } @@ -1031,7 +1045,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render - m_geometry.draw( Node->m_geometry ); + m_geometry.draw( Node->Piece->geometry ); // post-render cleanup ::glPopMatrix(); @@ -1188,7 +1202,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // ...luminance if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo - ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr(Submodel->f4Diffuse) ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); } // main draw call @@ -1311,7 +1325,7 @@ opengl_renderer::Update ( double const Deltatime ) { else if( framerate > 60.0 ) { targetsegments = 225; targetfactor = 1.5f; } else if( framerate > 30.0 ) { targetsegments = 90; targetfactor = Global::ScreenHeight / 768.0f; } else { targetsegments = 9; targetfactor = Global::ScreenHeight / 768.0f * 0.75f; } - +/* if( targetsegments > Global::iSegmentsRendered ) { Global::iSegmentsRendered = std::min( targetsegments, Global::iSegmentsRendered + 5 ); @@ -1320,6 +1334,7 @@ opengl_renderer::Update ( double const Deltatime ) { Global::iSegmentsRendered = std::max( targetsegments, Global::iSegmentsRendered - 5 ); } +*/ if( targetfactor > Global::fDistanceFactor ) { Global::fDistanceFactor = std::min( targetfactor, Global::fDistanceFactor + 0.05f ); @@ -1343,6 +1358,8 @@ opengl_renderer::Update ( double const Deltatime ) { } // TODO: add garbage collection and other less frequent works here + m_geometry.update(); + if( true == DebugModeFlag ) { m_debuginfo = m_textures.info(); } diff --git a/uilayer.cpp b/uilayer.cpp index dcad5b58..7fb5f212 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -164,12 +164,22 @@ void ui_layer::render_background() { if( m_background == 0 ) return; - // NOTE: we limit/expect the background to come with 4:3 ratio. // TODO, TBD: if we expose texture width or ratio from texture object, this limitation could be lifted - GfxRenderer.Bind( m_background ); - quad( float4( 0.0f, 0.0f, 1024.0f, 768.0f ), float4( 1.0f, 1.0f, 1.0f, 1.0f ) ); + auto const height { 768.0f }; + auto const &texture = GfxRenderer.Texture( m_background ); + float const width = ( + texture.width() == texture.height() ? + 1024.0f : // legacy mode, square texture displayed as 4:3 image + texture.width() / ( texture.height() / 768.0f ) ); + quad( + float4( + ( 1024.0f * 0.5f ) - ( width * 0.5f ), + ( 768.0f * 0.5f ) - ( height * 0.5f ), + ( 1024.0f * 0.5f ) - ( width * 0.5f ) + width, + ( 768.0f * 0.5f ) - ( height * 0.5f ) + height ), + float4( 1.0f, 1.0f, 1.0f, 1.0f ) ); } void @@ -200,7 +210,11 @@ ui_layer::quad( float4 const &Coordinates, float4 const &Color ) { Global::iWindowHeight / 768.0 : Global::iWindowHeight / 768.0 * screenratio / ( 4.0f / 3.0f ) ); float const height = 768.0f * heightratio; - +/* + float const heightratio = Global::iWindowHeight / 768.0f; + float const height = 768.0f * heightratio; + float const width = Global::iWindowWidth * heightratio; +*/ glColor4fv(&Color.x); glBegin( GL_TRIANGLE_STRIP ); diff --git a/version.h b/version.h index 252fa070..9031f529 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 617 +#define VERSION_MINOR 626 #define VERSION_REVISION 0 From 8e37307ff5ab1b18a05c94b9cf1d81167ee7357b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 26 Jun 2017 22:31:42 +0200 Subject: [PATCH 129/426] minor diagnostics enhancements and null pointer safeguards --- DynObj.cpp | 20 ++++++++++++-------- Model3d.cpp | 2 +- parser.cpp | 9 +++++++-- renderer.cpp | 6 ++++-- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 0e6742f1..7dd448f4 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -539,11 +539,10 @@ TDynamicObject::toggle_lights() { SectionLightsActive = false; } else { - std::string compartmentname; // set lights with probability depending on the compartment type. TODO: expose this in .mmd file for( auto §ionlight : SectionLightLevels ) { - compartmentname = sectionlight.compartment->pName; + std::string const &compartmentname = sectionlight.compartment->pName; if( ( compartmentname.find( "corridor" ) != std::string::npos ) || ( compartmentname.find( "korytarz" ) != std::string::npos ) ) { // corridors are lit 100% of time @@ -584,8 +583,9 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) pAnimations[i].yUpdate(pAnimations + i); // aktualizacja animacji (położenia submodeli */ - if( ObjSqrDist < 2500 ) // gdy bliżej niż 50m - { + if( ( mdModel != nullptr ) + && ( ObjSqrDist < 2500 ) ) { + // gdy bliżej niż 50m // ABu290105: rzucanie pudlem // te animacje wymagają bananów w modelach! mdModel->GetSMRoot()->SetTranslate(modelShake); @@ -4033,12 +4033,17 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, bool Stop_InternalData = false; pants = NULL; // wskaźnik pierwszego obiektu animującego dla pantografów cParser parser( TypeName + ".mmd", cParser::buffer_FILE, BaseDir ); + if( false == parser.ok() ) { + ErrorLog( "Failed to load appearance data for vehicle " + MoverParameters->Name ); + return; + } std::string token; do { token = ""; parser.getTokens(); parser >> token; - if( token == "models:") { + if( ( token == "models:" ) + || ( token == "models:" ) ) { // crude way to handle utf8 bom potentially appearing before the first token // modele i podmodele m_materialdata.multi_textures = 0; // czy jest wiele tekstur wymiennych? parser.getTokens(); @@ -5024,13 +5029,12 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } if (mdModel) - mdModel->Init(); // obrócenie modelu oraz optymalizacja, również zapisanie - // binarnego + mdModel->Init(); // obrócenie modelu oraz optymalizacja, również zapisanie binarnego if (mdLoad) mdLoad->Init(); if (mdLowPolyInt) mdLowPolyInt->Init(); - // sHorn2.CopyIfEmpty(sHorn1); ///żeby jednak trąbił też drugim + Global::asCurrentTexturePath = szTexturePath; // kiedyś uproszczone wnętrze mieszało tekstury nieba } diff --git a/Model3d.cpp b/Model3d.cpp index 1974ba5c..a439772f 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -446,7 +446,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce - WriteLog("Degenerated triangle ignored in: \"" + pName + "\", vertice " + std::to_string(i)); + WriteLog("Degenerated triangle ignored in: \"" + pName + "\", vertices " + std::to_string(i) + "-" + std::to_string(i+2)); } if (i > 0) { // jeśli pierwszy trójkąt będzie zdegenerowany, to zostanie usunięty i nie ma co sprawdzać diff --git a/parser.cpp b/parser.cpp index b6b27dfd..68355475 100644 --- a/parser.cpp +++ b/parser.cpp @@ -50,8 +50,13 @@ cParser::cParser( std::string const &Stream, buffertype const Type, std::string // calculate stream size if (mStream) { - mSize = mStream->rdbuf()->pubseekoff(0, std::ios_base::end); - mStream->rdbuf()->pubseekoff(0, std::ios_base::beg); + if( true == mStream->fail() ) { + ErrorLog( "Failed to open file \"" + Path + "\"" ); + } + else { + mSize = mStream->rdbuf()->pubseekoff( 0, std::ios_base::end ); + mStream->rdbuf()->pubseekoff( 0, std::ios_base::beg ); + } } else mSize = 0; diff --git a/renderer.cpp b/renderer.cpp index bc380ecb..ddf75e44 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -656,7 +656,8 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { } } - Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); + if( Dynamic->mdModel ) + Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); @@ -1101,7 +1102,8 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { } } - Render_Alpha( Dynamic->mdModel, Dynamic->Material(), squaredistance ); + if( Dynamic->mdModel ) + Render_Alpha( Dynamic->mdModel, Dynamic->Material(), squaredistance ); if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku Render_Alpha( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); From 49aad8559734b70a6883083718384d95ac2d9c90 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 28 Jun 2017 21:02:54 +0200 Subject: [PATCH 130/426] build 170628. enabled support for specular component in lighting calculations --- Globals.cpp | 21 +++++-------- Globals.h | 5 +-- Ground.cpp | 2 +- Model3d.cpp | 76 ++++++++++++++++++++++++++++++++++----------- Model3d.h | 1 + World.cpp | 19 ++++++------ color.h | 74 ++++++++++++++++++++++---------------------- lightarray.cpp | 4 +-- lightarray.h | 2 +- moon.cpp | 14 +++------ moon.h | 7 ++--- renderer.cpp | 83 ++++++++++++++++++++++++++++++++++++-------------- renderer.h | 53 +++++++++++++++----------------- sky.cpp | 4 +-- sky.h | 3 +- skydome.cpp | 39 ++++++++++++------------ skydome.h | 17 +++++------ sun.cpp | 14 +++------ sun.h | 7 ++--- version.h | 2 +- 20 files changed, 249 insertions(+), 198 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index 7dddc20f..6401aa1e 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -82,13 +82,10 @@ GLfloat Global::AtmoColor[] = {0.423f, 0.702f, 1.0f}; GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; double Global::fFogStart = 1700; double Global::fFogEnd = 2000; -float Global::Overcast{ 0.1f }; // NOTE: all this weather stuff should be moved elsewhere +float Global::Overcast { 0.1f }; // NOTE: all this weather stuff should be moved elsewhere opengl_light Global::DayLight; -int Global::DynamicLightCount{ 3 }; -GLfloat Global::whiteLight[] = {1.00f, 1.00f, 1.00f, 1.0f}; -GLfloat Global::noLight[] = {0.00f, 0.00f, 0.00f, 1.0f}; -GLfloat Global::darkLight[] = {0.03f, 0.03f, 0.03f, 1.0f}; //śladowe -GLfloat Global::lightPos[4]; +int Global::DynamicLightCount { 3 }; +bool Global::ScaleSpecularValues { true }; bool Global::bRollFix = true; // czy wykonać przeliczanie przechyłki bool Global::bJoinEvents = false; // czy grupować eventy o tych samych nazwach int Global::iHiddenEvents = 1; // czy łączyć eventy z torami poprzez nazwę toru @@ -224,13 +221,6 @@ std::string Global::GetNextSymbol() void Global::LoadIniFile(std::string asFileName) { -/* - for (int i = 0; i < 10; ++i) - { // zerowanie pozycji kamer - pFreeCameraInit[i] = vector3(0, 0, 0); // współrzędne w scenerii - pFreeCameraInitAngle[i] = vector3(0, 0, 0); // kąty obrotu w radianach - } -*/ FreeCameraInit.resize( 10 ); FreeCameraInitAngle.resize( 10 ); cParser parser(asFileName, cParser::buffer_FILE); @@ -543,6 +533,11 @@ void Global::ConfigParse(cParser &Parser) // max 8 lights per opengl specs, minus one used for sun. at least one light for controlled vehicle Global::DynamicLightCount = clamp( Global::DynamicLightCount, 1, 7 ); } + else if( token == "scalespeculars" ) { + // whether strength of specular highlights should be adjusted (generally needed for legacy 3d models) + Parser.getTokens(); + Parser >> Global::ScaleSpecularValues; + } else if (token == "smoothtraction") { // podwójna jasność ambient diff --git a/Globals.h b/Globals.h index 9e0cf512..b4bc804c 100644 --- a/Globals.h +++ b/Globals.h @@ -225,11 +225,8 @@ class Global // TODO: put these things in the renderer static opengl_light DayLight; static int DynamicLightCount; + static bool ScaleSpecularValues; - static GLfloat whiteLight[]; - static GLfloat noLight[]; - static GLfloat darkLight[]; - static GLfloat lightPos[4]; static int iSlowMotion; static TDynamicObject *changeDynObj; static double ABuDebug; diff --git a/Ground.cpp b/Ground.cpp index 4f37e50b..a131644e 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1937,7 +1937,7 @@ bool TGround::Init(std::string File) >> Global::DayLight.direction.x >> Global::DayLight.direction.y >> Global::DayLight.direction.z;; - Global::DayLight.direction.Normalize(); + Global::DayLight.direction = glm::normalize( Global::DayLight.direction ); parser.getTokens(9, false); do { diff --git a/Model3d.cpp b/Model3d.cpp index a439772f..7c803815 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -240,8 +240,13 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic if (eType < TP_ROTATOR) readColor(parser, f4Ambient); // ignoruje token przed readColor(parser, f4Diffuse); - if (eType < TP_ROTATOR) - readColor(parser, f4Specular); + if( eType < TP_ROTATOR ) { + readColor( parser, f4Specular ); + if( pName == "cien" ) { + // crude workaround to kill specular on shadow geometry of legacy models + f4Specular = glm::vec4{ 0.0f, 0.0f, 0.0f, 1.0f }; + } + } parser.ignoreTokens(1); // zignorowanie nazwy "SelfIllum:" { std::string light = parser.getToken(); @@ -367,6 +372,10 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic readMatrix(parser, *fMatrix); // wczytanie transform if (!fMatrix->IdentityIs()) iFlags |= 0x8000; // transform niejedynkowy - trzeba go przechować + if( std::abs( Det( *fMatrix ) - 1.0f ) > 0.01f ) { + ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factor: " + to_string( Det( *fMatrix ), 2 ) + ")" ); + m_normalizenormals = true; + } if (eType < TP_ROTATOR) { // wczytywanie wierzchołków parser.getTokens(2, false); @@ -446,7 +455,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce - WriteLog("Degenerated triangle ignored in: \"" + pName + "\", vertices " + std::to_string(i) + "-" + std::to_string(i+2)); + WriteLog("Bad model: degenerated triangle ignored in: \"" + pName + "\", vertices " + std::to_string(i) + "-" + std::to_string(i+2)); } if (i > 0) { // jeśli pierwszy trójkąt będzie zdegenerowany, to zostanie usunięty i nie ma co sprawdzać @@ -458,7 +467,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce - WriteLog( "Too large triangle ignored in: \"" + pName + "\"" ); + WriteLog( "Bad model: too large triangle ignored in: \"" + pName + "\"" ); } } } @@ -474,7 +483,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic Vertices[ i * 3 ].position - Vertices[ i * 3 + 1 ].position, Vertices[ i * 3 ].position - Vertices[ i * 3 + 2 ].position ); facenormals.emplace_back( - glm::length( facenormal ) > 0.0f ? + glm::length2( facenormal ) > 0.0f ? glm::normalize( facenormal ) : glm::vec3() ); } @@ -492,16 +501,24 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic auto adjacenvertextidx = vertexidx; // zaczynamy dodawanie wektorów normalnych od własnego while (adjacenvertextidx >= 0) { // sumowanie z wektorem normalnym sąsiada (włącznie ze sobą) - wsp[adjacenvertextidx] = vertexidx; // informacja, że w tym wierzchołku jest już policzony wektor normalny - vertexnormal += facenormals[adjacenvertextidx / 3]; + if( glm::dot( vertexnormal, facenormals[ adjacenvertextidx / 3 ] ) > -0.99f ) { + wsp[ adjacenvertextidx ] = vertexidx; // informacja, że w tym wierzchołku jest już policzony wektor normalny + vertexnormal += facenormals[ adjacenvertextidx / 3 ]; + } + else { + ErrorLog( "Bad model: opposite normals in the same smoothing group, check sub-model \"" + pName + "\" for two-sided faces and/or scaling" ); + } // i szukanie od kolejnego trójkąta adjacenvertextidx = SeekFaceNormal(sg, adjacenvertextidx / 3 + 1, sg[faceidx], Vertices[vertexidx].position, Vertices); - } + } // Ra 15-01: należało by jeszcze uwzględnić skalowanie wprowadzane przez transformy, aby normalne po przeskalowaniu były jednostkowe + if( glm::length2( vertexnormal ) == 0.0f ) { + WriteLog( "Bad model: zero lenght normal vector generated for sub-model \"" + pName + "\"" ); + } Vertices[ vertexidx ].normal = ( - glm::length( vertexnormal ) > 0.0f ? + glm::length2( vertexnormal ) > 0.0f ? glm::normalize( vertexnormal ) : - glm::vec3() ); // przepisanie do wierzchołka trójkąta + facenormals[ vertexidx / 3 ] ); // przepisanie do wierzchołka trójkąta } } Vertices.resize( iNumVerts ); // in case we had some degenerate triangles along the way @@ -1516,6 +1533,15 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) iNumVerts += submodel.iNumVerts; for( auto &vertex : vertices ) { vertex.deserialize( s ); + if( submodel.eType < TP_ROTATOR ) { + // normal vectors debug routine + auto normallength = glm::length2( vertex.normal ); + if( ( false == submodel.m_normalizenormals ) + && ( std::abs( normallength - 1.0f ) > 0.01f ) ) { + submodel.m_normalizenormals = true; + WriteLog( "Bad model: non-unit normal vector(s) encountered during sub-model geometry deserialization" ); + } + } } // remap geometry type for custom type submodels int type; @@ -1599,6 +1625,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, Child = (iChild > 0) ? s + iChild : nullptr; // zerowy nie może być potomnym Next = (iNext > 0) ? s + iNext : nullptr; // zerowy nie może być następnym fMatrix = ((iMatrix >= 0) && m) ? m + iMatrix : nullptr; + if (n->size() && (iName >= 0)) { pName = n->at(iName); @@ -1612,12 +1639,16 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, // obiektem "Light_Off" else if (dynamic) { // inaczej wyłączało smugę w latarniach - if ((pName.size() >= 3) && (pName.substr(pName.size() - 3, 3) == "_on")) - { // jeśli jest kontrolką w stanie zapalonym - iVisible = 0; // to domyślnie wyłączyć, żeby się nie nakładało z + if ((pName.size() >= 3) && (pName.substr(pName.size() - 3, 3) == "_on")) { + // jeśli jest kontrolką w stanie zapalonym to domyślnie wyłączyć, + // żeby się nie nakładało z obiektem "_off" + iVisible = 0; } } - // obiektem "_off" + // hack: reset specular light value for shadow submodels + if( pName == "cien" ) { + f4Specular = glm::vec4 { 0.0f, 0.0f, 0.0f, 1.0f }; + } } } else @@ -1654,11 +1685,22 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, if( fCosHotspotAngle > 1.0f ) { fCosHotspotAngle = std::cos( DegToRad( 0.5f * fCosHotspotAngle ) ); } + // cap specular values for legacy models + f4Specular = glm::vec4{ + clamp( f4Specular.r, 0.0f, 1.0f ), + clamp( f4Specular.g, 0.0f, 1.0f ), + clamp( f4Specular.b, 0.0f, 1.0f ), + clamp( f4Specular.a, 0.0f, 1.0f ) }; iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem tablic) -/* - iVboPtr = tVboPtr; -*/ + + if( ( fMatrix != nullptr ) + && ( std::abs( Det( *fMatrix ) - 1.0f ) > 0.01f ) ) { + // check whether we need to enable normal vectors normalization for this submodel + ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factor: " + to_string( Det( *fMatrix ), 2 ) + ")" ); + m_normalizenormals = true; + } + }; void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) diff --git a/Model3d.h b/Model3d.h index 3c74b353..b47d1dce 100644 --- a/Model3d.h +++ b/Model3d.h @@ -96,6 +96,7 @@ private: f4Diffuse { 1.0f,1.0f,1.0f,1.0f }, f4Specular { 0.0f,0.0f,0.0f,1.0f }, f4Emision { 1.0f,1.0f,1.0f,1.0f }; + bool m_normalizenormals { false }; // indicates vectors need to be normalized due to scaling etc float fWireSize { 0.0f }; // nie używane, ale wczytywane float fSquareMaxDist { 10000.0f * 10000.0f }; float fSquareMinDist { 0.0f }; diff --git a/World.cpp b/World.cpp index f6e53a81..cf94dcee 100644 --- a/World.cpp +++ b/World.cpp @@ -2277,34 +2277,34 @@ world_environment::update() { auto const moonlightlevel = m_moon.getIntensity() * 0.65f; // scaled down by arbitrary factor, it's pretty bright otherwise float keylightintensity; float twilightfactor; - float3 keylightcolor; + glm::vec3 keylightcolor; if( moonlightlevel > sunlightlevel ) { // rare situations when the moon is brighter than the sun, typically at night Global::SunAngle = m_moon.getAngle(); Global::DayLight.set_position( m_moon.getPosition() ); - Global::DayLight.direction = -1.0 * m_moon.getDirection(); + Global::DayLight.direction = -1.0f * m_moon.getDirection(); keylightintensity = moonlightlevel; // if the moon is up, it overrides the twilight twilightfactor = 0.0f; - keylightcolor = float3( 255.0f / 255.0f, 242.0f / 255.0f, 202.0f / 255.0f ); + keylightcolor = glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 202.0f / 255.0f ); } else { // regular situation with sun as the key light Global::SunAngle = m_sun.getAngle(); Global::DayLight.set_position( m_sun.getPosition() ); - Global::DayLight.direction = -1.0 * m_sun.getDirection(); + Global::DayLight.direction = -1.0f * m_sun.getDirection(); keylightintensity = sunlightlevel; // diffuse (sun) intensity goes down after twilight, and reaches minimum 18 degrees below horizon twilightfactor = clamp( -Global::SunAngle, 0.0f, 18.0f ) / 18.0f; float const duskfactor = 1.0f - clamp( Global::SunAngle, 0.0f, 18.0f ) / 18.0f; keylightcolor = interpolate( - float3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), - float3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), + glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), + glm::vec3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), duskfactor ); } // ...update skydome to match the current sun position as well... m_skydome.SetOvercastFactor( Global::Overcast ); - m_skydome.Update( m_sun.getPosition() ); + m_skydome.Update( m_sun.getDirection() ); // ...retrieve current sky colour and brightness... auto const skydomecolour = m_skydome.GetAverageColor(); auto const skydomehsv = RGBtoHSV( skydomecolour ); @@ -2319,9 +2319,8 @@ world_environment::update() { auto const diffuselevel = interpolate( keylightintensity, intensity * ( 1.0f - twilightfactor ), 1.0f - Global::Overcast * 0.75f ); // ...update light colours and intensity. keylightcolor = keylightcolor * diffuselevel; - Global::DayLight.diffuse[ 0 ] = keylightcolor.x; - Global::DayLight.diffuse[ 1 ] = keylightcolor.y; - Global::DayLight.diffuse[ 2 ] = keylightcolor.z; + Global::DayLight.diffuse = glm::vec4( keylightcolor, Global::DayLight.diffuse.a ); + Global::DayLight.specular = glm::vec4( keylightcolor * 0.85f, diffuselevel ); // tonal impact of skydome color is inversely proportional to how high the sun is above the horizon // (this is pure conjecture, aimed more to 'look right' than be accurate) diff --git a/color.h b/color.h index ed334551..998331a9 100644 --- a/color.h +++ b/color.h @@ -3,28 +3,28 @@ #include "float3d.h" inline -float3 -XYZtoRGB( float3 const &XYZ ) { +glm::vec3 +XYZtoRGB( glm::vec3 const &XYZ ) { // M^-1 for Adobe RGB from http://www.brucelindbloom.com/Eqn_RGB_XYZ_Matrix.html float const mi[ 3 ][ 3 ] = { 2.041369f, -0.969266f, 0.0134474f, -0.5649464f, 1.8760108f, -0.1183897f, -0.3446944f, 0.041556f, 1.0154096f }; // m^-1 for sRGB: // float const mi[ 3 ][ 3 ] = { 3.240479f, -0.969256f, 0.055648f, -1.53715f, 1.875991f, -0.204043f, -0.49853f, 0.041556f, 1.057311f }; - return float3{ + return glm::vec3{ XYZ.x*mi[ 0 ][ 0 ] + XYZ.y*mi[ 1 ][ 0 ] + XYZ.z*mi[ 2 ][ 0 ], XYZ.x*mi[ 0 ][ 1 ] + XYZ.y*mi[ 1 ][ 1 ] + XYZ.z*mi[ 2 ][ 1 ], XYZ.x*mi[ 0 ][ 2 ] + XYZ.y*mi[ 1 ][ 2 ] + XYZ.z*mi[ 2 ][ 2 ] }; } inline -float3 -RGBtoHSV( float3 const &RGB ) { +glm::vec3 +RGBtoHSV( glm::vec3 const &RGB ) { - float3 hsv; + glm::vec3 hsv; - float const max = std::max( std::max( RGB.x, RGB.y ), RGB.z ); - float const min = std::min( std::min( RGB.x, RGB.y ), RGB.z ); + float const max = std::max( std::max( RGB.r, RGB.g ), RGB.b ); + float const min = std::min( std::min( RGB.r, RGB.g ), RGB.b ); float const delta = max - min; hsv.z = max; // v @@ -43,13 +43,13 @@ RGBtoHSV( float3 const &RGB ) { hsv.x = NAN; // its now undefined return hsv; } - if( RGB.x >= max ) // > is bogus, just keeps compilor happy - hsv.x = ( RGB.y - RGB.z ) / delta; // between yellow & magenta + if( RGB.r >= max ) // > is bogus, just keeps compilor happy + hsv.x = ( RGB.g - RGB.b ) / delta; // between yellow & magenta else - if( RGB.y >= max ) - hsv.x = 2.0 + ( RGB.y - RGB.x ) / delta; // between cyan & yellow + if( RGB.g >= max ) + hsv.x = 2.0 + ( RGB.g - RGB.r ) / delta; // between cyan & yellow else - hsv.x = 4.0 + ( RGB.x - RGB.y ) / delta; // between magenta & cyan + hsv.x = 4.0 + ( RGB.r - RGB.g ) / delta; // between magenta & cyan hsv.x *= 60.0; // degrees @@ -60,15 +60,15 @@ RGBtoHSV( float3 const &RGB ) { } inline -float3 -HSVtoRGB( float3 const &HSV ) { +glm::vec3 +HSVtoRGB( glm::vec3 const &HSV ) { - float3 rgb; + glm::vec3 rgb; if( HSV.y <= 0.0 ) { // < is bogus, just shuts up warnings - rgb.x = HSV.z; - rgb.y = HSV.z; - rgb.z = HSV.z; + rgb.r = HSV.z; + rgb.g = HSV.z; + rgb.b = HSV.z; return rgb; } float hh = HSV.x; @@ -82,36 +82,36 @@ HSVtoRGB( float3 const &HSV ) { switch( i ) { case 0: - rgb.x = HSV.z; - rgb.y = t; - rgb.z = p; + rgb.r = HSV.z; + rgb.g = t; + rgb.b = p; break; case 1: - rgb.x = q; - rgb.y = HSV.z; - rgb.z = p; + rgb.r = q; + rgb.g = HSV.z; + rgb.b = p; break; case 2: - rgb.x = p; - rgb.y = HSV.z; - rgb.z = t; + rgb.r = p; + rgb.g = HSV.z; + rgb.b = t; break; case 3: - rgb.x = p; - rgb.y = q; - rgb.z = HSV.z; + rgb.r = p; + rgb.g = q; + rgb.b = HSV.z; break; case 4: - rgb.x = t; - rgb.y = p; - rgb.z = HSV.z; + rgb.r = t; + rgb.g = p; + rgb.b = HSV.z; break; case 5: default: - rgb.x = HSV.z; - rgb.y = p; - rgb.z = q; + rgb.r = HSV.z; + rgb.g = p; + rgb.b = q; break; } return rgb; diff --git a/lightarray.cpp b/lightarray.cpp index 8a9bc1a3..8a0412a3 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -47,12 +47,12 @@ light_array::update() { if( light.index == 0 ) { // front light set light.position = light.owner->GetPosition() + ( light.owner->VectorFront() * light.owner->GetLength() * 0.4 ); - light.direction = light.owner->VectorFront(); + light.direction = glm::make_vec3( light.owner->VectorFront().getArray() ); } else { // rear light set light.position = light.owner->GetPosition() - ( light.owner->VectorFront() * light.owner->GetLength() * 0.4 ); - light.direction = light.owner->VectorFront(); + light.direction = glm::make_vec3( light.owner->VectorFront().getArray() ); light.direction.x = -light.direction.x; light.direction.z = -light.direction.z; } diff --git a/lightarray.h b/lightarray.h index 34b317d9..91e45ef0 100644 --- a/lightarray.h +++ b/lightarray.h @@ -20,7 +20,7 @@ public: TDynamicObject const *owner; // the object in world which 'carries' the light int index{ -1 }; // 0: front lights, 1: rear lights Math3D::vector3 position; // position of the light in 3d scene - Math3D::vector3 direction; // direction of the light in 3d scene + glm::vec3 direction; // direction of the light in 3d scene float3 color{ 255.0f / 255.0f, 241.0f / 255.0f, 224.0f / 255.0f }; // color of the light, default is halogen light float intensity{ 0.0f }; // (combined) intensity of the light(s) int count{ 0 }; // number (or pattern) of active light(s) diff --git a/moon.cpp b/moon.cpp index a7db52e5..a6566d5e 100644 --- a/moon.cpp +++ b/moon.cpp @@ -36,9 +36,9 @@ void cMoon::update() { move(); - Math3D::vector3 position( 0.0f, 0.0f, -2000.0f * Global::fDistanceFactor ); - position.RotateX( (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); - position.RotateY( (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); + glm::vec3 position( 0.0f, 0.0f, -2000.0f * Global::fDistanceFactor ); + position = glm::rotateX( position, (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); + position = glm::rotateY( position, (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); m_position = position; } @@ -59,14 +59,10 @@ cMoon::render() { glPopMatrix(); } -Math3D::vector3 +glm::vec3 cMoon::getDirection() { - Math3D::vector3 position( 0.f, 0.f, -1.f ); - position.RotateX( (float)( m_body.elevref * (M_PI/180.0)) ); - position.RotateY( (float)( -m_body.hrang * (M_PI/180.0)) ); - position.Normalize(); - return position; + return glm::normalize( m_position ); } float diff --git a/moon.h b/moon.h index baa7030c..c0caaa79 100644 --- a/moon.h +++ b/moon.h @@ -3,7 +3,6 @@ #include "windows.h" #include "GL/glew.h" #include "GL/wglew.h" -#include "dumb3d.h" // TODO: sun and moon share code as celestial bodies, we could make a base class out of it @@ -18,9 +17,9 @@ public: void update(); void render(); // returns location of the sun in the 3d scene - Math3D::vector3 getPosition() { return m_position; } + glm::vec3 getPosition() { return m_position; } // returns vector pointing at the sun - Math3D::vector3 getDirection(); + glm::vec3 getDirection(); // returns current elevation above horizon float getAngle() const; // returns current intensity of the sun @@ -101,6 +100,6 @@ protected: celestialbody m_body; observer m_observer; - Math3D::vector3 m_position; + glm::vec3 m_position; float m_phase; }; diff --git a/renderer.cpp b/renderer.cpp index ddf75e44..04b4c99e 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -24,6 +24,12 @@ http://mozilla.org/MPL/2.0/. opengl_renderer GfxRenderer; extern TWorld World; +namespace colors { + +glm::vec4 const none { 0.0f, 0.0f, 0.0f, 1.0f }; + +} // namespace colors + // returns true if specified object is within camera frustum, false otherwise bool opengl_camera::visible( bounding_area const &Area ) const { @@ -74,14 +80,19 @@ opengl_renderer::Init( GLFWwindow *Window ) { glPointSize( 3.0f ); glEnable( GL_POINT_SMOOTH ); - glEnable( GL_COLOR_MATERIAL ); - glColorMaterial( GL_FRONT, GL_AMBIENT_AND_DIFFUSE ); + ::glLightModeli( GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR ); + ::glMaterialf( GL_FRONT, GL_SHININESS, 15.0f ); + if( true == Global::ScaleSpecularValues ) { + m_specularopaquescalefactor = 0.25f; + m_speculartranslucentscalefactor = 1.5f; + } + ::glEnable( GL_COLOR_MATERIAL ); + ::glColorMaterial( GL_FRONT, GL_AMBIENT_AND_DIFFUSE ); // setup lighting - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - glEnable( GL_LIGHTING ); - glEnable( GL_LIGHT0 ); + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr(m_baseambient) ); + ::glEnable( GL_LIGHTING ); + ::glEnable( GL_LIGHT0 ); Global::DayLight.id = opengl_renderer::sunlight; // directional light @@ -205,9 +216,9 @@ opengl_renderer::Render( world_environment *Environment ) { Environment->m_stars.render(); float const duskfactor = 1.0f - clamp( std::abs( Environment->m_sun.getAngle() ), 0.0f, 12.0f ) / 12.0f; - float3 suncolor = interpolate( - float3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), - float3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), + glm::vec3 suncolor = interpolate( + glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), + glm::vec3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), duskfactor ); if( DebugModeFlag == true ) { @@ -248,11 +259,10 @@ opengl_renderer::Render( world_environment *Environment ) { // moon { Bind( m_moontexture ); - float3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); + glm::vec3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, static_cast( 1.0 - Global::fLuminance * 0.5 ) ); - auto const moonvector = Environment->m_moon.getDirection(); - auto const moonposition = modelview * glm::vec4( moonvector.x, moonvector.y, moonvector.z, 1.0f ); + auto const moonposition = modelview * glm::vec4( Environment->m_moon.getDirection(), 1.0f ); ::glPushMatrix(); ::glLoadIdentity(); // macierz jedynkowa ::glTranslatef( moonposition.x, moonposition.y, moonposition.z ); @@ -553,7 +563,7 @@ opengl_renderer::Render( TGroundNode *Node ) { ::glColor4fv( glm::value_ptr( glm::vec4( - Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla + Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla 1.0 ) ) ); // if the thickness is defined negative, lines are always drawn opaque auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 32.0 ); if( linewidth > 1.0 ) { @@ -633,6 +643,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { // change light level based on light level of the occupied track Global::DayLight.apply_intensity( Dynamic->fShade ); } + m_renderspecular = true; // vehicles are rendered with specular component. static models without, at least for the time being // render if( Dynamic->mdLowPolyInt ) { @@ -650,8 +661,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { if( Dynamic->InteriorLightLevel > 0.0f ) { // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr(m_baseambient) ); } } } @@ -663,6 +673,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); // post-render cleanup + m_renderspecular = false; if( Dynamic->fShade > 0.0f ) { // restore regular light level Global::DayLight.apply_intensity(); @@ -747,6 +758,9 @@ opengl_renderer::Render( TSubModel *Submodel ) { // renderowanie obiektów OpenGL if( Submodel->iAlpha & Submodel->iFlags & 0x1F ) // rysuj gdy element nieprzezroczysty { + if( true == Submodel->m_normalizenormals ) { + ::glEnable( GL_NORMALIZE ); + } // material configuration: // textures... if( Submodel->TextureID < 0 ) @@ -757,7 +771,12 @@ opengl_renderer::Render( TSubModel *Submodel ) { // również 0 Bind( Submodel->TextureID ); } + // ...colors... ::glColor3fv( glm::value_ptr(Submodel->f4Diffuse) ); // McZapkie-240702: zamiast ub + if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + // specular strength in legacy models is set uniformly to 150, 150, 150 so we scale it down for opaque elements + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_specularopaquescalefactor ) ); + } // ...luminance if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo @@ -768,10 +787,15 @@ opengl_renderer::Render( TSubModel *Submodel ) { m_geometry.draw( Submodel->m_geometry ); // post-draw reset + if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); + } if( Global::fLuminance < Submodel->fLight ) { // restore default (lack of) brightness - glm::vec4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); - ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( noemission ) ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); + } + if( true == Submodel->m_normalizenormals ) { + ::glDisable( GL_NORMALIZE ); } } } @@ -1007,7 +1031,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { ::glColor4fv( glm::value_ptr( glm::vec4( - Node->Diffuse * glm::make_vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla + Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla std::min( 1.0, linealpha ) ) ) ); auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 32.0 ); if( linewidth > 1.0 ) { @@ -1079,6 +1103,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { // change light level based on light level of the occupied track Global::DayLight.apply_intensity( Dynamic->fShade ); } + m_renderspecular = true; // render if( Dynamic->mdLowPolyInt ) { @@ -1096,8 +1121,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { if( Dynamic->InteriorLightLevel > 0.0f ) { // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( m_baseambient ) ); } } } @@ -1109,6 +1133,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { Render_Alpha( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); // post-render cleanup + m_renderspecular = false; if( Dynamic->fShade > 0.0f ) { // restore regular light level Global::DayLight.apply_intensity(); @@ -1192,6 +1217,9 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // renderowanie obiektów OpenGL if( Submodel->iAlpha & Submodel->iFlags & 0x2F ) // rysuj gdy element przezroczysty { + if( true == Submodel->m_normalizenormals ) { + ::glEnable( GL_NORMALIZE ); + } // textures... if( Submodel->TextureID < 0 ) { // zmienialne skóry Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); @@ -1200,7 +1228,11 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // również 0 Bind( Submodel->TextureID ); } + // ...colors... ::glColor3fv( glm::value_ptr(Submodel->f4Diffuse) ); // McZapkie-240702: zamiast ub + if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_speculartranslucentscalefactor ) ); + } // ...luminance if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo @@ -1211,10 +1243,15 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { m_geometry.draw( Submodel->m_geometry ); // post-draw reset + if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); + } if( Global::fLuminance < Submodel->fLight ) { // restore default (lack of) brightness - glm::vec4 const noemission( 0.0f, 0.0f, 0.0f, 1.0f ); - ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( noemission ) ); + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); + } + if( true == Submodel->m_normalizenormals ) { + ::glDisable( GL_NORMALIZE ); } } } @@ -1401,7 +1438,7 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { continue; } // if the light passed tests so far, it's good enough - renderlight->set_position( scenelight.position - Global::pCameraPosition ); + renderlight->set_position( glm::make_vec3( (scenelight.position - Global::pCameraPosition).readArray() ) ); renderlight->direction = scenelight.direction; auto luminance = Global::fLuminance; // TODO: adjust this based on location, e.g. for tunnels diff --git a/renderer.h b/renderer.h index 43332c5b..b17c3b23 100644 --- a/renderer.h +++ b/renderer.h @@ -21,53 +21,44 @@ http://mozilla.org/MPL/2.0/. struct opengl_light { GLuint id{ (GLuint)-1 }; - Math3D::vector3 direction; - GLfloat position[ 4 ]; // 4th parameter specifies directional(0) or omni-directional(1) light source - GLfloat ambient[ 4 ]; - GLfloat diffuse[ 4 ]; - GLfloat specular[ 4 ]; - - opengl_light() { - position[ 0 ] = position[ 1 ] = position[ 2 ] = 0.0f; position[ 3 ] = 1.0f; // 0,0,0,1 - ambient[ 0 ] = ambient[ 1 ] = ambient[ 2 ] = 0.0f; ambient[ 3 ] = 1.0f; // 0,0,0,1 - diffuse[ 0 ] = diffuse[ 1 ] = diffuse[ 2 ] = diffuse[ 3 ] = 1.0f; // 1,1,1,1 - specular[ 0 ] = specular[ 1 ] = specular[ 2 ] = specular[ 3 ] = 1.0f; // 1,1,1,1 - } + glm::vec3 direction; + glm::vec4 + position { 0.0f, 0.0f, 0.0f, 1.0f }, // 4th parameter specifies directional(0) or omni-directional(1) light source + ambient { 0.0f, 0.0f, 0.0f, 1.0f }, + diffuse { 1.0f, 1.0f, 1.0f, 1.0f }, + specular { 1.0f, 1.0f, 1.0f, 1.0f }; inline void apply_intensity( float const Factor = 1.0f ) { if( Factor == 1.0 ) { - glLightfv( id, GL_AMBIENT, ambient ); - glLightfv( id, GL_DIFFUSE, diffuse ); - glLightfv( id, GL_SPECULAR, specular ); + glLightfv( id, GL_AMBIENT, glm::value_ptr(ambient) ); + glLightfv( id, GL_DIFFUSE, glm::value_ptr(diffuse) ); + glLightfv( id, GL_SPECULAR, glm::value_ptr(specular) ); } else { // temporary light scaling mechanics (ultimately this work will be left to the shaders - float4 scaledambient( ambient[ 0 ] * Factor, ambient[ 1 ] * Factor, ambient[ 2 ] * Factor, ambient[ 3 ] ); - float4 scaleddiffuse( diffuse[ 0 ] * Factor, diffuse[ 1 ] * Factor, diffuse[ 2 ] * Factor, diffuse[ 3 ] ); - float4 scaledspecular( specular[ 0 ] * Factor, specular[ 1 ] * Factor, specular[ 2 ] * Factor, specular[ 3 ] ); - glLightfv( id, GL_AMBIENT, &scaledambient.x ); - glLightfv( id, GL_DIFFUSE, &scaleddiffuse.x ); - glLightfv( id, GL_SPECULAR, &scaledspecular.x ); + glm::vec4 scaledambient( ambient.r * Factor, ambient.g * Factor, ambient.b * Factor, ambient.a ); + glm::vec4 scaleddiffuse( diffuse.r * Factor, diffuse.g * Factor, diffuse.b * Factor, diffuse.a ); + glm::vec4 scaledspecular( specular.r * Factor, specular.g * Factor, specular.b * Factor, specular.a ); + glLightfv( id, GL_AMBIENT, glm::value_ptr(scaledambient) ); + glLightfv( id, GL_DIFFUSE, glm::value_ptr(scaleddiffuse) ); + glLightfv( id, GL_SPECULAR, glm::value_ptr(scaledspecular) ); } } inline void apply_angle() { - glLightfv( id, GL_POSITION, position ); - if( position[ 3 ] == 1.0f ) { - GLfloat directionarray[] = { (GLfloat)direction.x, (GLfloat)direction.y, (GLfloat)direction.z }; - glLightfv( id, GL_SPOT_DIRECTION, directionarray ); + glLightfv( id, GL_POSITION, glm::value_ptr(position) ); + if( position.w == 1.0f ) { + glLightfv( id, GL_SPOT_DIRECTION, glm::value_ptr(direction) ); } } inline - void set_position( Math3D::vector3 const &Position ) { + void set_position( glm::vec3 const &Position ) { - position[ 0 ] = Position.x; - position[ 1 ] = Position.y; - position[ 2 ] = Position.z; + position = glm::vec4( Position, position.w ); } }; @@ -229,6 +220,10 @@ private: geometry_handle m_billboardgeometry { 0, 0 }; GLUquadricObj *m_quadric; // helper object for drawing debug mode scene elements std::vector m_drawqueue; // list of subcells to be drawn in current render pass + glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; + bool m_renderspecular{ false }; // controls whether to include specular component in the calculations + float m_specularopaquescalefactor { 1.0f }; + float m_speculartranslucentscalefactor { 1.0f }; }; diff --git a/sky.cpp b/sky.cpp index 61aa81d1..284825ab 100644 --- a/sky.cpp +++ b/sky.cpp @@ -27,14 +27,14 @@ void TSky::Init() mdCloud = TModelsManager::GetModel( Global::asSky ); }; -void TSky::Render( float3 const &Tint ) +void TSky::Render( glm::vec3 const &Tint ) { if (mdCloud) { // jeśli jest model nieba // setup ::glEnable( GL_LIGHTING ); GfxRenderer.Disable_Lights(); - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &Tint.x ); + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr(Tint) ); // render GfxRenderer.Render( mdCloud, nullptr, 100.0 ); GfxRenderer.Render_Alpha( mdCloud, nullptr, 100.0 ); diff --git a/sky.h b/sky.h index 1117957a..ebee49a2 100644 --- a/sky.h +++ b/sky.h @@ -11,7 +11,6 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "Model3d.h" -#include "Float3d.h" class TSky { @@ -22,7 +21,7 @@ class TSky TSky(); ~TSky(); void Init(); - void Render( float3 const &Tint = float3(1.0f, 1.0f, 1.0f) ); + void Render( glm::vec3 const &Tint = glm::vec3(1.0f, 1.0f, 1.0f) ); }; //--------------------------------------------------------------------------- diff --git a/skydome.cpp b/skydome.cpp index 27074616..7d136971 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -86,8 +86,8 @@ void CSkyDome::Generate() { // 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 + m_vertices.emplace_back( glm::vec3( -x * zr, -z - offset, -y * zr ) * radius ); + m_colours.emplace_back( glm::vec3( 0.75f, 0.75f, 0.75f ) ); // placeholder if( (i == 0) || (j == 0) ) { // initial edge of the dome, don't start indices yet @@ -107,7 +107,7 @@ void CSkyDome::Generate() { } } -void CSkyDome::Update( Math3D::vector3 const &Sun ) { +void CSkyDome::Update( glm::vec3 const &Sun ) { if( true == SetSunPosition( Sun ) ) { // build colors if there's a change in sun position @@ -150,15 +150,14 @@ void CSkyDome::Render() { ::glDisableClientState( GL_VERTEX_ARRAY ); } -bool CSkyDome::SetSunPosition( Math3D::vector3 const &Direction ) { +bool CSkyDome::SetSunPosition( glm::vec3 const &Direction ) { - auto sundirection = SafeNormalize( float3( Direction.x, Direction.y, Direction.z) ); - if( sundirection == m_sundirection ) { + if( Direction == m_sundirection ) { return false; } - m_sundirection = sundirection; + m_sundirection = Direction; m_thetasun = std::acosf( m_sundirection.y ); m_phisun = std::atan2( m_sundirection.z, m_sundirection.x ); @@ -244,18 +243,18 @@ void CSkyDome::RebuildColors() { zenithluminance = PerezFunctionO1( perezluminance, m_thetasun, zenithluminance ); // start with fresh average for the new pass - float3 averagecolor{ 0.0f, 0.0f, 0.0f }; + glm::vec3 averagecolor { 0.0f, 0.0f, 0.0f }; // trough all vertices - float3 vertex; - float3 color, colorconverter, shiftedcolor; + glm::vec3 vertex; + glm::vec3 color, colorconverter, shiftedcolor; for ( unsigned int i = 0; i < m_vertices.size(); ++i ) { // grab it - vertex = SafeNormalize( m_vertices[ i ] ); + vertex = glm::normalize( m_vertices[ i ] ); // angle between sun and vertex - const float gamma = std::acos( DotProduct( vertex, m_sundirection ) ); + const float gamma = std::acos( glm::dot( vertex, m_sundirection ) ); // warning : major hack!!! .. i had to do something with values under horizon //vertex.y = Clamp( vertex.y, 0.05f, 1.0f ); @@ -283,7 +282,7 @@ void CSkyDome::RebuildColors() { float const X = (x / y) * Y; float const Z = ((1.0f - x - y) / y) * Y; - colorconverter = float3( X, Y, Z ); + colorconverter = glm::vec3( X, Y, Z ); color = XYZtoRGB( colorconverter ); colorconverter = RGBtoHSV(color); @@ -292,7 +291,7 @@ void CSkyDome::RebuildColors() { colorconverter.z *= m_expfactor; } else { // exp scale - colorconverter.z = 1.0f - exp( -m_expfactor * colorconverter.z ); + colorconverter.z = 1.0f - std::exp( -m_expfactor * colorconverter.z ); } // desaturate sky colour, based on overcast level @@ -309,12 +308,12 @@ void CSkyDome::RebuildColors() { // this height-based factor is reduced the farther the sky is up in the sky float const shiftfactor = clamp( interpolate(heightbasedphase, sunbasedphase, sunbasedphase), 0.0f, 1.0f ); // h = 210 makes for 'typical' sky tone - shiftedcolor = float3( 210.0f, colorconverter.y, colorconverter.z ); + shiftedcolor = glm::vec3( 210.0f, colorconverter.y, colorconverter.z ); shiftedcolor = HSVtoRGB( shiftedcolor ); color = HSVtoRGB(colorconverter); - color = Interpolate( color, shiftedcolor, shiftfactor ); + color = interpolate( color, shiftedcolor, shiftfactor ); /* // gamma control color.x = std::pow( color.x, m_gammacorrection ); @@ -338,10 +337,10 @@ void CSkyDome::RebuildColors() { } // NOTE: average reduced to 25% makes nice tint value for clouds lit from behind // down the road we could interpolate between it and full strength average, to improve accuracy of cloud appearance - m_averagecolour = averagecolor / m_indices.size(); - m_averagecolour.x = std::max( m_averagecolour.x, 0.0f ); - m_averagecolour.y = std::max( m_averagecolour.y, 0.0f ); - m_averagecolour.z = std::max( m_averagecolour.z, 0.0f ); + m_averagecolour = averagecolor / static_cast( m_indices.size() ); + m_averagecolour.r = std::max( m_averagecolour.r, 0.0f ); + m_averagecolour.g = std::max( m_averagecolour.g, 0.0f ); + m_averagecolour.b = std::max( m_averagecolour.b, 0.0f ); if( m_coloursbuffer != -1 ) { // the colour buffer was already initialized, so on this run we update its content diff --git a/skydome.h b/skydome.h index ba625975..e515bc3e 100644 --- a/skydome.h +++ b/skydome.h @@ -1,8 +1,5 @@ #pragma once -#include "dumb3d.h" -#include "float3d.h" - // sky gradient based on "A practical analytic model for daylight" // by A. J. Preetham Peter Shirley Brian Smits (University of Utah) @@ -13,7 +10,7 @@ public: void Generate(); void RebuildColors(); - bool SetSunPosition( Math3D::vector3 const &Direction ); + bool SetSunPosition( glm::vec3 const &Direction ); void SetTurbidity( const float Turbidity = 5.0f ); void SetExposure( const bool Linearexposure, const float Expfactor ); @@ -21,30 +18,30 @@ public: void SetGammaCorrection( const float Gamma = 2.2f ); // update skydome - void Update( Math3D::vector3 const &Sun ); + void Update( glm::vec3 const &Sun ); // render skydome to screen void Render(); // retrieves average colour of the sky dome - float3 GetAverageColor() { return m_averagecolour; } + glm::vec3 GetAverageColor() { return m_averagecolour; } private: // shading parametrs - float3 m_sundirection; + glm::vec3 m_sundirection; float m_thetasun, m_phisun; float m_turbidity; bool m_linearexpcontrol; float m_expfactor; float m_overcast; float m_gammacorrection; - float3 m_averagecolour; + glm::vec3 m_averagecolour; // data int const m_tesselation; - std::vector m_vertices; + std::vector m_vertices; std::vector m_indices; // std::vector m_normals; - std::vector m_colours; + std::vector m_colours; GLuint m_vertexbuffer{ (GLuint)-1 }; GLuint m_indexbuffer{ (GLuint)-1 }; GLuint m_coloursbuffer{ (GLuint)-1 }; diff --git a/sun.cpp b/sun.cpp index d27e3619..55db2f00 100644 --- a/sun.cpp +++ b/sun.cpp @@ -33,9 +33,9 @@ void cSun::update() { move(); - Math3D::vector3 position( 0.0f, 0.0f, -2000.0f * Global::fDistanceFactor ); - position.RotateX( (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); - position.RotateY( (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); + glm::vec3 position( 0.0f, 0.0f, -2000.0f * Global::fDistanceFactor ); + position = glm::rotateX( position, (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); + position = glm::rotateY( position, (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); m_position = position; } @@ -63,14 +63,10 @@ cSun::render() { glPopMatrix(); } -Math3D::vector3 +glm::vec3 cSun::getDirection() { - Math3D::vector3 position( 0.f, 0.f, -1.f ); - position.RotateX( (float)( m_body.elevref * (M_PI/180.0)) ); - position.RotateY( (float)( -m_body.hrang * (M_PI/180.0)) ); - position.Normalize(); - return position; + return glm::normalize( m_position ); } float diff --git a/sun.h b/sun.h index aa659a21..4ab54d10 100644 --- a/sun.h +++ b/sun.h @@ -3,7 +3,6 @@ #include "windows.h" #include "GL/glew.h" #include "GL/wglew.h" -#include "dumb3d.h" ////////////////////////////////////////////////////////////////////////////////////////// @@ -20,9 +19,9 @@ public: void update(); void render(); // returns location of the sun in the 3d scene - Math3D::vector3 getPosition() { return m_position; } + glm::vec3 getPosition() { return m_position; } // returns vector pointing at the sun - Math3D::vector3 getDirection(); + glm::vec3 getDirection(); // returns current elevation above horizon float getAngle(); // returns current intensity of the sun @@ -98,5 +97,5 @@ protected: celestialbody m_body; observer m_observer; - Math3D::vector3 m_position; + glm::vec3 m_position; }; diff --git a/version.h b/version.h index 9031f529..063844fb 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 626 +#define VERSION_MINOR 628 #define VERSION_REVISION 0 From 534a49b6369879a762a593c4f1f426312c7bac58 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 1 Jul 2017 12:36:19 +0200 Subject: [PATCH 131/426] selected pantograph control switches, minor bug fixes --- Gauge.cpp | 13 ++-- Model3d.cpp | 55 +++++++++++++---- Model3d.h | 9 ++- Texture.cpp | 2 +- Train.cpp | 170 ++++++++++++++++++++++++++++++++++----------------- Train.h | 2 + renderer.cpp | 39 +++++++++--- renderer.h | 2 +- stdafx.h | 1 + version.h | 2 +- 10 files changed, 209 insertions(+), 86 deletions(-) diff --git a/Gauge.cpp b/Gauge.cpp index ef0c1efa..f31138a5 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -150,16 +150,21 @@ double TGauge::GetValue() const { return ( fValue - fOffset ) / fScale; } -void TGauge::Update() -{ +void TGauge::Update() { + float dt = Timer::GetDeltaTime(); if( ( fFriction > 0 ) && ( dt < 0.5 * fFriction ) ) { // McZapkie-281102: zabezpieczenie przed oscylacjami dla dlugich czasow fValue += dt * ( fDesiredValue - fValue ) / fFriction; } - else + else { fValue = fDesiredValue; - if (SubModel) + } + if( std::abs( fDesiredValue - fValue ) <= 0.001 ) { + // close enough, we can stop updating the model + fValue = fDesiredValue; // set it exactly as requested just in case it matters + } + if( SubModel ) { // warunek na wszelki wypadek, gdyby się submodel nie podłączył TSubModel *sm; switch (eType) diff --git a/Model3d.cpp b/Model3d.cpp index 7c803815..56916097 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -102,7 +102,7 @@ int TSubModel::SeekFaceNormal(std::vector const &Masks, int const // pętla po trójkątach, od trójkąta (f) if( Masks[ faceidx ] & Mask ) { // jeśli wspólna maska powierzchni - for( int vertexidx = 0; vertexidx < 2; ++vertexidx ) { + for( int vertexidx = 0; vertexidx < 3; ++vertexidx ) { if( Vertices[ 3 * faceidx + vertexidx ].position == Position ) { return 3 * faceidx + vertexidx; } @@ -370,11 +370,27 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic // transformation matrix fMatrix = new float4x4(); readMatrix(parser, *fMatrix); // wczytanie transform - if (!fMatrix->IdentityIs()) - iFlags |= 0x8000; // transform niejedynkowy - trzeba go przechować - if( std::abs( Det( *fMatrix ) - 1.0f ) > 0.01f ) { - ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factor: " + to_string( Det( *fMatrix ), 2 ) + ")" ); - m_normalizenormals = true; + if( !fMatrix->IdentityIs() ) { + iFlags |= 0x8000; // transform niejedynkowy - trzeba go przechować + // check the scaling + auto const matrix = glm::make_mat4( fMatrix->readArray() ); + glm::vec3 const scale{ + glm::length( glm::vec3( glm::column( matrix, 0 ) ) ), + glm::length( glm::vec3( glm::column( matrix, 1 ) ) ), + glm::length( glm::vec3( glm::column( matrix, 2 ) ) ) }; + if( ( std::abs( scale.x - 1.0f ) > 0.01 ) + || ( std::abs( scale.y - 1.0f ) > 0.01 ) + || ( std::abs( scale.z - 1.0f ) > 0.01 ) ) { + ErrorLog( + "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " + + to_string( scale.x, 2 ) + ", " + + to_string( scale.y, 2 ) + ", " + + to_string( scale.z, 2 ) + ")" ); + m_normalizenormals = ( + ( ( std::abs( scale.x - scale.y ) < 0.01f ) && ( std::abs( scale.y - scale.z ) < 0.01f ) ) ? + rescale : + normalize ); + } } if (eType < TP_ROTATOR) { // wczytywanie wierzchołków @@ -1538,7 +1554,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) auto normallength = glm::length2( vertex.normal ); if( ( false == submodel.m_normalizenormals ) && ( std::abs( normallength - 1.0f ) > 0.01f ) ) { - submodel.m_normalizenormals = true; + submodel.m_normalizenormals = TSubModel::normalize; // we don't know if uniform scaling would suffice WriteLog( "Bad model: non-unit normal vector(s) encountered during sub-model geometry deserialization" ); } } @@ -1694,13 +1710,26 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, iFlags &= ~0x0200; // wczytano z pliku binarnego (nie jest właścicielem tablic) - if( ( fMatrix != nullptr ) - && ( std::abs( Det( *fMatrix ) - 1.0f ) > 0.01f ) ) { - // check whether we need to enable normal vectors normalization for this submodel - ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factor: " + to_string( Det( *fMatrix ), 2 ) + ")" ); - m_normalizenormals = true; + if( fMatrix != nullptr ) { + auto const matrix = glm::make_mat4( fMatrix->readArray() ); + glm::vec3 const scale { + glm::length( glm::vec3( glm::column( matrix, 0 ) ) ), + glm::length( glm::vec3( glm::column( matrix, 1 ) ) ), + glm::length( glm::vec3( glm::column( matrix, 2 ) ) ) }; + if( ( std::abs( scale.x - 1.0f ) > 0.01 ) + || ( std::abs( scale.y - 1.0f ) > 0.01 ) + || ( std::abs( scale.z - 1.0f ) > 0.01 ) ) { + ErrorLog( + "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " + + to_string( scale.x, 2 ) + ", " + + to_string( scale.y, 2 ) + ", " + + to_string( scale.z, 2 ) + ")" ); + m_normalizenormals = ( + ( ( std::abs( scale.x - scale.y ) < 0.01f ) && ( std::abs( scale.y - scale.z ) < 0.01f ) ) ? + rescale : + normalize ); + } } - }; void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) diff --git a/Model3d.h b/Model3d.h index b47d1dce..4a569ef4 100644 --- a/Model3d.h +++ b/Model3d.h @@ -58,6 +58,13 @@ class TSubModel friend class TModel3d; // temporary workaround. TODO: clean up class content/hierarchy friend class TDynamicObject; // temporary etc +public: + enum normalization { + none = 0, + rescale, + normalize + }; + private: int iNext{ NULL }; int iChild{ NULL }; @@ -96,7 +103,7 @@ private: f4Diffuse { 1.0f,1.0f,1.0f,1.0f }, f4Specular { 0.0f,0.0f,0.0f,1.0f }, f4Emision { 1.0f,1.0f,1.0f,1.0f }; - bool m_normalizenormals { false }; // indicates vectors need to be normalized due to scaling etc + normalization m_normalizenormals { normalization::none }; // indicates vectors need to be normalized due to scaling etc float fWireSize { 0.0f }; // nie używane, ale wczytywane float fSquareMaxDist { 10000.0f * 10000.0f }; float fSquareMinDist { 0.0f }; diff --git a/Texture.cpp b/Texture.cpp index 64bd8d8f..4bf8be4a 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -815,7 +815,7 @@ texture_manager::bind( texture_handle const Texture ) { #ifndef EU07_DEFERRED_TEXTURE_UPLOAD // NOTE: we could bind dedicated 'error' texture here if the id isn't valid ::glBindTexture( GL_TEXTURE_2D, texture(Texture).id ); - m_activetexture = texture(Texture).id; + m_activetexture = Texture; #else if( texture( Texture ).bind() == resource_state::good ) { m_activetexture = Texture; diff --git a/Train.cpp b/Train.cpp index d37ddb84..ead0b728 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1225,24 +1225,28 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const // sound feedback Train->play_sound( Train->dsbSwitch ); // visual feedback - if( Train->ggPantFrontButton.SubModel ) { - Train->ggPantFrontButton.UpdateValue( 1.0 ); - } - if( Train->ggPantFrontButtonOff.SubModel != nullptr ) { - // pantograph control can have two-button setup - Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); - } + Train->ggPantFrontButton.UpdateValue( 1.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedButton.UpdateValue( 1.0 ); + // pantograph control can have two-button setup + Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); } } } else { // ...or turn off - if( ( Train->mvOccupied->PantSwitchType == "impulse" ) - && ( Train->ggPantFrontButtonOff.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; + if( Train->mvOccupied->PantSwitchType == "impulse" ) { + if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; + } } Train->mvControlled->PantFrontSP = false; @@ -1252,8 +1256,14 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->play_sound( Train->dsbSwitch ); // visual feedback Train->ggPantFrontButton.UpdateValue( 0.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedButton.UpdateValue( 0.0 ); // pantograph control can have two-button setup Train->ggPantFrontButtonOff.UpdateValue( 1.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 1.0 ); } } } @@ -1264,9 +1274,10 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const if( Train->ggPantFrontButton.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); } - if( Train->ggPantFrontButton.SubModel ) { - Train->ggPantFrontButton.UpdateValue( 0.0 ); - } + Train->ggPantFrontButton.UpdateValue( 0.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedButton.UpdateValue( 0.0 ); // also the switch off button, in cabs which have it if( Train->ggPantFrontButtonOff.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); @@ -1274,6 +1285,11 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const if( Train->ggPantFrontButtonOff.SubModel ) { Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); } + if( Train->ggPantSelectedDownButton.SubModel ) { + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); + } } } } @@ -1290,24 +1306,28 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & // sound feedback Train->play_sound( Train->dsbSwitch ); // visual feedback - if( Train->ggPantRearButton.SubModel ) { - Train->ggPantRearButton.UpdateValue( 1.0 ); - } - if( Train->ggPantRearButtonOff.SubModel != nullptr ) { - // pantograph control can have two-button setup - Train->ggPantRearButtonOff.UpdateValue( 0.0 ); - } + Train->ggPantRearButton.UpdateValue( 1.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedButton.UpdateValue( 1.0 ); + // pantograph control can have two-button setup + Train->ggPantRearButtonOff.UpdateValue( 0.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); } } } else { // ...or turn off - if( ( Train->mvOccupied->PantSwitchType == "impulse" ) - && ( Train->ggPantRearButtonOff.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; + if( Train->mvOccupied->PantSwitchType == "impulse" ) { + if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; + } } Train->mvControlled->PantRearSP = false; @@ -1317,8 +1337,14 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & Train->play_sound( Train->dsbSwitch ); // visual feedback Train->ggPantRearButton.UpdateValue( 0.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedButton.UpdateValue( 0.0 ); // pantograph control can have two-button setup Train->ggPantRearButtonOff.UpdateValue( 1.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 1.0 ); } } } @@ -1329,9 +1355,10 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & if( Train->ggPantRearButton.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); } - if( Train->ggPantRearButton.SubModel ) { - Train->ggPantRearButton.UpdateValue( 0.0 ); - } + Train->ggPantRearButton.UpdateValue( 0.0 ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedButton.UpdateValue( 0.0 ); // also the switch off button, in cabs which have it if( Train->ggPantRearButtonOff.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); @@ -1339,6 +1366,11 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & if( Train->ggPantRearButtonOff.SubModel ) { Train->ggPantRearButtonOff.UpdateValue( 0.0 ); } + if( Train->ggPantSelectedDownButton.SubModel ) { + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); + } } } } @@ -1400,7 +1432,8 @@ void TTrain::OnCommand_pantographcompressoractivate( TTrain *Train, command_data void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ) { - if( Train->ggPantAllDownButton.SubModel == nullptr ) { + if( ( Train->ggPantAllDownButton.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { // TODO: expand definition of cab controls so we can know if the control is present without testing for presence of 3d switch if( Command.action == GLFW_PRESS ) { WriteLog( "Lower All Pantographs switch is missing, or wasn't defined" ); @@ -1423,6 +1456,9 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co } // visual feedback Train->ggPantAllDownButton.UpdateValue( 1.0 ); + if( Train->ggPantSelectedDownButton.SubModel != nullptr ) { + Train->ggPantSelectedDownButton.UpdateValue( 1.0 ); + } } else if( Command.action == GLFW_RELEASE ) { // release the button @@ -1436,6 +1472,9 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co */ // visual feedback Train->ggPantAllDownButton.UpdateValue( 0.0 ); + if( Train->ggPantSelectedDownButton.SubModel != nullptr ) { + Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); + } } } @@ -4830,15 +4869,10 @@ bool TTrain::Update( double const Deltatime ) // NBMX wrzesien 2003 - drzwi ggDoorLeftButton.Update(); ggDoorRightButton.Update(); - ggDepartureSignalButton.Update(); + ggDoorSignallingButton.Update(); // NBMX dzwignia sprezarki ggCompressorButton.Update(); ggCompressorLocalButton.Update(); - ggMainButton.Update(); - ggRadioButton.Update(); - ggConverterButton.Update(); - ggConverterLocalButton.Update(); - ggConverterOffButton.Update(); #ifdef EU07_USE_OLD_COMMAND_SYSTEM if( ( ( DynamicObject->iLights[ 0 ] ) == 0 ) && ( ( DynamicObject->iLights[ 1 ] ) == 0 ) ) @@ -4989,15 +5023,6 @@ bool TTrain::Update( double const Deltatime ) } ggDimHeadlightsButton.Update(); //--------- - // Winger 010304 - pantografy - // NOTE: shouldn't the pantograph updates check whether it's front or rear cabin? - ggPantFrontButton.Update(); - ggPantRearButton.Update(); - ggPantFrontButtonOff.Update(); - ggTrainHeatingButton.Update(); - ggSignallingButton.Update(); - ggDoorSignallingButton.Update(); - // Winger 020304 - ogrzewanie // hunter-080812: poprawka na ogrzewanie w elektrykach - usuniete uzaleznienie od przetwornicy if ((((mvControlled->EngineType == ElectricSeriesMotor) && (mvControlled->Mains == true) && (mvControlled->ConvOvldFlag == false)) || @@ -5813,10 +5838,15 @@ bool TTrain::Update( double const Deltatime ) ggStLinOffButton.Update(); ggRadioButton.Update(); ggDepartureSignalButton.Update(); + ggPantFrontButton.Update(); ggPantRearButton.Update(); + ggPantSelectedButton.Update(); ggPantFrontButtonOff.Update(); ggPantRearButtonOff.Update(); + ggPantSelectedDownButton.Update(); + ggPantAllDownButton.Update(); + ggUpperLightButton.Update(); ggLeftLightButton.Update(); ggRightLightButton.Update(); @@ -5829,8 +5859,8 @@ bool TTrain::Update( double const Deltatime ) ggRearLeftEndLightButton.Update(); ggRearRightEndLightButton.Update(); //------------ - ggPantAllDownButton.Update(); ggConverterButton.Update(); + ggConverterLocalButton.Update(); ggConverterOffButton.Update(); ggTrainHeatingButton.Update(); ggSignallingButton.Update(); @@ -6630,7 +6660,6 @@ void TTrain::SetLights() // clears state of all cabin controls void TTrain::clear_cab_controls() { - ggMainCtrl.Clear(); ggMainCtrlAct.Clear(); ggScndCtrl.Clear(); @@ -6670,7 +6699,10 @@ void TTrain::clear_cab_controls() ggConverterButton.Clear(); ggPantFrontButton.Clear(); ggPantRearButton.Clear(); + ggPantSelectedButton.Clear(); ggPantFrontButtonOff.Clear(); + ggPantRearButtonOff.Clear(); + ggPantSelectedDownButton.Clear(); ggPantAllDownButton.Clear(); ggZbS.Clear(); ggI1B.Clear(); @@ -6787,6 +6819,16 @@ void TTrain::set_cab_controls() { ( mvControlled->PantFrontUp ? 0.0 : 1.0 ) ); + // NOTE: currently we animate the selectable pantograph control for both pantographs + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + ggPantSelectedButton.PutValue( + ( mvControlled->PantFrontUp ? + 1.0 : + 0.0 ) ); + ggPantSelectedDownButton.PutValue( + ( mvControlled->PantFrontUp ? + 0.0 : + 1.0 ) ); } if( mvOccupied->PantSwitchType != "impulse" ) { ggPantRearButton.PutValue( @@ -6797,6 +6839,16 @@ void TTrain::set_cab_controls() { ( mvControlled->PantRearUp ? 0.0 : 1.0 ) ); + // NOTE: currently we animate the selectable pantograph control for both pantographs + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + ggPantSelectedButton.PutValue( + ( mvControlled->PantRearUp ? + 1.0 : + 0.0 ) ); + ggPantSelectedDownButton.PutValue( + ( mvControlled->PantRearUp ? + 0.0 : + 1.0 ) ); } // converter if( mvOccupied->ConvSwitchType != "impulse" ) { @@ -7397,16 +7449,22 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con ggPantFrontButtonOff.Load(Parser, DynamicObject->mdKabina); } else if( Label == "pantrearoff_sw:" ) { - // patyk przedni w dol + // rear pant down ggPantRearButtonOff.Load( Parser, DynamicObject->mdKabina ); } - else if( Label == "pantalloff_sw:" ) - { - // patyk przedni w dol + else if( Label == "pantalloff_sw:" ) { + // both pantographs down ggPantAllDownButton.Load(Parser, DynamicObject->mdKabina); } - else if (Label == "trainheating_sw:") - { + else if( Label == "pantselected_sw:" ) { + // operate selected pantograph(s) + ggPantSelectedButton.Load( Parser, DynamicObject->mdKabina ); + } + else if( Label == "pantselectedoff_sw:" ) { + // operate selected pantograph(s) + ggPantSelectedDownButton.Load( Parser, DynamicObject->mdKabina ); + } + else if (Label == "trainheating_sw:") { // grzanie skladu ggTrainHeatingButton.Load(Parser, DynamicObject->mdKabina); } diff --git a/Train.h b/Train.h index c4b6b574..2c70dc70 100644 --- a/Train.h +++ b/Train.h @@ -285,6 +285,8 @@ public: // reszta może by?publiczna TGauge ggPantFrontButtonOff; // EZT TGauge ggPantRearButtonOff; TGauge ggPantAllDownButton; + TGauge ggPantSelectedButton; + TGauge ggPantSelectedDownButton; // Winger 020304 - wlacznik ogrzewania TGauge ggTrainHeatingButton; TGauge ggSignallingButton; diff --git a/renderer.cpp b/renderer.cpp index 04b4c99e..7bb9c6c4 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -360,7 +360,7 @@ opengl_renderer::Bind( texture_handle const Texture ) { m_textures.bind( Texture ); } -opengl_texture & +opengl_texture const & opengl_renderer::Texture( texture_handle const Texture ) { return m_textures.texture( Texture ); @@ -758,9 +758,15 @@ opengl_renderer::Render( TSubModel *Submodel ) { // renderowanie obiektów OpenGL if( Submodel->iAlpha & Submodel->iFlags & 0x1F ) // rysuj gdy element nieprzezroczysty { - if( true == Submodel->m_normalizenormals ) { - ::glEnable( GL_NORMALIZE ); + switch( Submodel->m_normalizenormals ) { + case TSubModel::normalize: { + ::glEnable( GL_NORMALIZE ); break; } + case TSubModel::rescale: { + ::glEnable( GL_RESCALE_NORMAL ); break; } + default: { + break; } } + // material configuration: // textures... if( Submodel->TextureID < 0 ) @@ -794,8 +800,13 @@ opengl_renderer::Render( TSubModel *Submodel ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); } - if( true == Submodel->m_normalizenormals ) { - ::glDisable( GL_NORMALIZE ); + switch( Submodel->m_normalizenormals ) { + case TSubModel::normalize: { + ::glDisable( GL_NORMALIZE ); break; } + case TSubModel::rescale: { + ::glDisable( GL_RESCALE_NORMAL ); break; } + default: { + break; } } } } @@ -1217,8 +1228,13 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // renderowanie obiektów OpenGL if( Submodel->iAlpha & Submodel->iFlags & 0x2F ) // rysuj gdy element przezroczysty { - if( true == Submodel->m_normalizenormals ) { - ::glEnable( GL_NORMALIZE ); + switch( Submodel->m_normalizenormals ) { + case TSubModel::normalize: { + ::glEnable( GL_NORMALIZE ); break; } + case TSubModel::rescale: { + ::glEnable( GL_RESCALE_NORMAL ); break; } + default: { + break; } } // textures... if( Submodel->TextureID < 0 ) { // zmienialne skóry @@ -1250,8 +1266,13 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); } - if( true == Submodel->m_normalizenormals ) { - ::glDisable( GL_NORMALIZE ); + switch( Submodel->m_normalizenormals ) { + case TSubModel::normalize: { + ::glDisable( GL_NORMALIZE ); break; } + case TSubModel::rescale: { + ::glDisable( GL_RESCALE_NORMAL ); break; } + default: { + break; } } } } diff --git a/renderer.h b/renderer.h index b17c3b23..5a2cf095 100644 --- a/renderer.h +++ b/renderer.h @@ -158,7 +158,7 @@ public: GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ); void Bind( texture_handle const Texture ); - opengl_texture & + opengl_texture const & Texture( texture_handle const Texture ); // members diff --git a/stdafx.h b/stdafx.h index e68efd55..20302ae8 100644 --- a/stdafx.h +++ b/stdafx.h @@ -84,6 +84,7 @@ #include #include +#include #include #include #include diff --git a/version.h b/version.h index 063844fb..e7ef8285 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 628 +#define VERSION_MINOR 630 #define VERSION_REVISION 0 From d3b812ee9f099f09fca1569ab56bae7313adb442 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 2 Jul 2017 21:24:29 +0200 Subject: [PATCH 132/426] texture garbage collection, removed fixed binding with world camera in world render, cap on minimal volume held by reservoirs --- DynObj.cpp | 139 +++++++++++++++++++---------------------- McZapkie/hamulce.cpp | 55 +++++++--------- ResourceManager.cpp | 3 + ResourceManager.h | 67 ++++++++++++++++++-- Texture.cpp | 83 ++++++++++++++++++------ Texture.h | 41 ++++++++---- Train.cpp | 4 +- World.cpp | 4 +- openglgeometrybank.cpp | 22 +------ openglgeometrybank.h | 14 ++--- renderer.cpp | 59 ++++++++++------- renderer.h | 7 +++ version.h | 2 +- 13 files changed, 301 insertions(+), 199 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 7dd448f4..a47db564 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -989,12 +989,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) } // ABu 29.01.05 koniec przeklejenia ************************************* -double ABuAcos(const vector3 &calc_temp) -{ // Odpowiednik funkcji Arccos, bo cos - // mi tam nie dzialalo. - return atan2(-calc_temp.x, calc_temp.z); // Ra: tak prościej -} - TDynamicObject * TDynamicObject::ABuFindNearestObject(TTrack *Track, TDynamicObject *MyPointer, int &CouplNr) { // zwraca wskaznik do obiektu znajdujacego sie na torze (Track), którego sprzęg jest najblizszy kamerze @@ -4056,8 +4050,9 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, std::size_t i = asModel.find( ',' ); if ( i != std::string::npos ) { // Ra 2015-01: może szukać przecinka w nazwie modelu, a po przecinku była by liczba tekstur? - if (i < asModel.length()) - m_materialdata.multi_textures = asModel[i + 1] - '0'; + if( i < asModel.length() ) { + m_materialdata.multi_textures = asModel[ i + 1 ] - '0'; + } m_materialdata.multi_textures = clamp( m_materialdata.multi_textures, 0, 1 ); // na razie ustawiamy na 1 } asModel = BaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje @@ -4092,7 +4087,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, int skinindex = 0; do { texture_handle texture = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), "", Global::iDynamicFiltering, true ); - if( false == GfxRenderer.Texture( texture ).is_ready ) { + if( texture == NULL ) { break; } m_materialdata.replacable_skins[ skinindex + 1 ] = texture; @@ -4105,61 +4100,72 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } } } - else + else { m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); - if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) - m_materialdata.textures_alpha = 0x31310031; // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych - else - m_materialdata.textures_alpha = 0x30300030; // wszystkie tekstury nieprzezroczyste - nie renderować w cyklu przezroczystych - if( m_materialdata.replacable_skins[ 2 ] ) - if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 2 ] ).has_alpha ) - m_materialdata.textures_alpha |= 0x02020002; // tekstura -2 z kanałem alfa - nie renderować w cyklu nieprzezroczystych - if( m_materialdata.replacable_skins[ 3 ] ) - if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 3 ] ).has_alpha ) - m_materialdata.textures_alpha |= 0x04040004; // tekstura -3 z kanałem alfa - nie renderować w cyklu nieprzezroczystych - if( m_materialdata.replacable_skins[ 4 ] ) - if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 4 ] ).has_alpha ) - m_materialdata.textures_alpha |= 0x08080008; // tekstura -4 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + } + if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) { + // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + m_materialdata.textures_alpha = 0x31310031; + } + else { + // wszystkie tekstury nieprzezroczyste - nie renderować w cyklu przezroczystych + m_materialdata.textures_alpha = 0x30300030; + } + + if( ( m_materialdata.replacable_skins[ 2 ] ) + && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 2 ] ).has_alpha ) ) { + // tekstura -2 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + m_materialdata.textures_alpha |= 0x02020002; + } + if( ( m_materialdata.replacable_skins[ 3 ] ) + && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 3 ] ).has_alpha ) ) { + // tekstura -3 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + m_materialdata.textures_alpha |= 0x04040004; + } + if( ( m_materialdata.replacable_skins[ 4 ] ) + && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 4 ] ).has_alpha ) ) { + // tekstura -4 z kanałem alfa - nie renderować w cyklu nieprzezroczystych + m_materialdata.textures_alpha |= 0x08080008; + } } - if (!MoverParameters->LoadAccepted.empty()) - // if (MoverParameters->LoadAccepted!=AnsiString("")); // && - // MoverParameters->LoadType!=AnsiString("passengers")) - if (MoverParameters->EnginePowerSource.SourceType == CurrentCollector) - { // wartość niby "pantstate" - nazwa dla formalności, ważna jest ilość - if (MoverParameters->Load == 1) - MoverParameters->PantFront(true); - else if (MoverParameters->Load == 2) - MoverParameters->PantRear(true); - else if (MoverParameters->Load == 3) - { - MoverParameters->PantFront(true); - MoverParameters->PantRear(true); + if( !MoverParameters->LoadAccepted.empty() ) { + + if( MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) { + // wartość niby "pantstate" - nazwa dla formalności, ważna jest ilość + if( MoverParameters->Load == 1 ) { + MoverParameters->PantFront( true ); } - else if (MoverParameters->Load == 4) - MoverParameters->DoubleTr = -1; - else if (MoverParameters->Load == 5) - { - MoverParameters->DoubleTr = -1; - MoverParameters->PantRear(true); + else if( MoverParameters->Load == 2 ) { + MoverParameters->PantRear( true ); } - else if (MoverParameters->Load == 6) - { - MoverParameters->DoubleTr = -1; - MoverParameters->PantFront(true); + else if( MoverParameters->Load == 3 ) { + MoverParameters->PantFront( true ); + MoverParameters->PantRear( true ); } - else if (MoverParameters->Load == 7) - { + else if( MoverParameters->Load == 4 ) { MoverParameters->DoubleTr = -1; - MoverParameters->PantFront(true); - MoverParameters->PantRear(true); + } + else if( MoverParameters->Load == 5 ) { + MoverParameters->DoubleTr = -1; + MoverParameters->PantRear( true ); + } + else if( MoverParameters->Load == 6 ) { + MoverParameters->DoubleTr = -1; + MoverParameters->PantFront( true ); + } + else if( MoverParameters->Load == 7 ) { + MoverParameters->DoubleTr = -1; + MoverParameters->PantFront( true ); + MoverParameters->PantRear( true ); } } - else // Ra: tu wczytywanie modelu ładunku jest w porządku - { + else { + // Ra: tu wczytywanie modelu ładunku jest w porządku if( false == asLoadName.empty() ) { mdLoad = TModelsManager::GetModel( asLoadName, true ); // ladunek } } + } Global::asCurrentTexturePath = szTexturePath; // z powrotem defaultowa sciezka do tekstur do { token = ""; @@ -4198,11 +4204,9 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } // WriteLog("Total animations: "+AnsiString(iAnimations)); } -/* - if( nullptr == pAnimations ) -*/ - if( true == pAnimations.empty() ) - { // Ra: tworzenie tabeli animacji, jeśli jeszcze nie było + + if( true == pAnimations.empty() ) { + // Ra: tworzenie tabeli animacji, jeśli jeszcze nie było /* // disabled as default animation amounts are no longer supported if( !iAnimations ) { @@ -4217,9 +4221,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, iAnimType[ANIM_PANTS]=0; } */ -/* - pAnimations = new TAnim[iAnimations]; -*/ pAnimations.resize( iAnimations ); int i, j, k = 0, sm = 0; for (j = 0; j < ANIM_TYPES; ++j) @@ -4229,9 +4230,6 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, if (!pants) if (iAnimType[ANIM_PANTS]) // o ile jakieś pantografy są (a domyślnie są) pants = &pAnimations[k]; // zapamiętanie na potrzeby wyszukania submodeli -/* - pants = pAnimations + k; // zapamiętanie na potrzeby wyszukania submodeli -*/ pAnimations[k].iShift = sm; // przesunięcie do przydzielenia wskaźnika sm += pAnimations[k++].TypeSet(j); // ustawienie typu animacji i zliczanie tablicowanych submodeli } @@ -4281,8 +4279,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, if (pAnimations[i].smAnimated) { //++iAnimatedAxles; pAnimations[i].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu -/* pAnimations[i].yUpdate = UpdateAxle; // animacja osi -*/ pAnimations[ i ].yUpdate = std::bind( &TDynamicObject::UpdateAxle, this, std::placeholders::_1 ); + pAnimations[i].yUpdate = std::bind( &TDynamicObject::UpdateAxle, this, std::placeholders::_1 ); pAnimations[i].fMaxDist = 50 * MoverParameters->WheelDiameter; // nie kręcić w większej odległości pAnimations[i].fMaxDist *= pAnimations[i].fMaxDist * MoverParameters->WheelDiameter; // 50m do kwadratu, a średnica do trzeciej pAnimations[i].fMaxDist *= Global::fDistanceFactor; // współczynnik przeliczeniowy jakości ekranu @@ -4671,20 +4668,16 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, switch (MoverParameters->DoorOpenMethod) { // od razu zapinamy potrzebny typ animacji case 1: -/* pAnimations[i + j].yUpdate = UpdateDoorTranslate; -*/ pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdateDoorTranslate, this, std::placeholders::_1 ); + pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdateDoorTranslate, this, std::placeholders::_1 ); break; case 2: -/* pAnimations[i + j].yUpdate = UpdateDoorRotate; -*/ pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdateDoorRotate, this, std::placeholders::_1 ); + pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdateDoorRotate, this, std::placeholders::_1 ); break; case 3: -/* pAnimations[i + j].yUpdate = UpdateDoorFold; -*/ pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdateDoorFold, this, std::placeholders::_1 ); + pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdateDoorFold, this, std::placeholders::_1 ); break; // obrót 3 kolejnych submodeli case 4: -/* pAnimations[i + j].yUpdate = UpdateDoorPlug; -*/ pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdateDoorPlug, this, std::placeholders::_1 ); + pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdateDoorPlug, this, std::placeholders::_1 ); break; default: break; diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index bdc01fee..2a1b300b 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -113,17 +113,18 @@ double PFVd( double PH, double PL, double const S, double LIM, double const DP ) if (LIM < PH) { LIM = LIM + 1; - PH = PH + 1; // wyzsze cisnienie absolutne - PL = PL + 1; // nizsze cisnienie absolutne + PH = PH + 1.0; // wyzsze cisnienie absolutne + PL = PL + 1.0; // nizsze cisnienie absolutne + assert( PH != PL ); double sg = PL / PH; // bezwymiarowy stosunek cisnien - double FM = PH * 197 * S; // najwyzszy mozliwy przeplyw, wraz z kierunkiem + double FM = PH * 197.0 * S; // najwyzszy mozliwy przeplyw, wraz z kierunkiem if ((PH - LIM) < 0.1) FM = FM * (PH - LIM) / DP; // jesli jestesmy przy nastawieniu, to zawor sie przymyka if ((sg > 0.5)) // jesli ponizej stosunku krytycznego if ((PH - PL) < DPL) // niewielka roznica cisnien - return (PH - PL) / DPL * FM * 2 * std::sqrt((sg) * (1 - sg)); + return (PH - PL) / DPL * FM * 2.0 * std::sqrt((sg) * (1.0 - sg)); else - return FM * 2 * std::sqrt((sg) * (1 - sg)); + return FM * 2.0 * std::sqrt((sg) * (1.0 - sg)); else // powyzej stosunku krytycznego return FM; } @@ -150,7 +151,7 @@ void TReservoir::Flow(double dv) void TReservoir::Act() { - Vol = Vol + dVol; + Vol = std::max( 0.0, Vol + dVol ); dVol = 0; } @@ -2131,39 +2132,34 @@ double TFV4a::GetPF(double i_bcp, double PP, double HP, double dt, double ep) { static int const LBDelay = 100; - double LimPP; - double dpPipe; - double dpMainValve; - double ActFlowSpeed; - ep = PP; // SPKS!! - LimPP = Min0R(BPT[lround(i_bcp) + 2][1], HP); - ActFlowSpeed = BPT[lround(i_bcp) + 2][0]; + double LimPP = std::min(BPT[std::lround(i_bcp) + 2][1], HP); + double ActFlowSpeed = BPT[std::lround(i_bcp) + 2][0]; if ((i_bcp == i_bcpno)) LimPP = 2.9; - CP = CP + 20 * Min0R(abs(LimPP - CP), 0.05) * PR(CP, LimPP) * dt / 1; - RP = RP + 20 * Min0R(abs(ep - RP), 0.05) * PR(RP, ep) * dt / 2.5; + CP = CP + 20 * std::min(std::abs(LimPP - CP), 0.05) * PR(CP, LimPP) * dt / 1; + RP = RP + 20 * std::min(std::abs(ep - RP), 0.05) * PR(RP, ep) * dt / 2.5; LimPP = CP; - dpPipe = Min0R(HP, LimPP); + double dpPipe = std::min(HP, LimPP); - dpMainValve = PF(dpPipe, PP, ActFlowSpeed / LBDelay) * dt; + double dpMainValve = PF(dpPipe, PP, ActFlowSpeed / LBDelay) * dt; if ((CP > RP + 0.05)) - dpMainValve = PF(Min0R(CP + 0.1, HP), PP, 1.1 * ActFlowSpeed / LBDelay) * dt; + dpMainValve = PF(std::min(CP + 0.1, HP), PP, 1.1 * ActFlowSpeed / LBDelay) * dt; if ((CP < RP - 0.05)) dpMainValve = PF(CP - 0.1, PP, 1.1 * ActFlowSpeed / LBDelay) * dt; if (lround(i_bcp) == -1) { - CP = CP + 5 * Min0R(abs(LimPP - CP), 0.2) * PR(CP, LimPP) * dt / 2; + CP = CP + 5 * std::min(std::abs(LimPP - CP), 0.2) * PR(CP, LimPP) * dt / 2; if ((CP < RP + 0.03)) if ((TP < 5)) TP = TP + dt; // if(cp+0.03<5.4)then if ((RP + 0.03 < 5.4) || (CP + 0.03 < 5.4)) // fala - dpMainValve = PF(Min0R(HP, 17.1), PP, ActFlowSpeed / LBDelay) * dt; + dpMainValve = PF(std::min(HP, 17.1), PP, ActFlowSpeed / LBDelay) * dt; // dpMainValve:=20*Min0R(abs(ep-7.1),0.05)*PF(HP,pp,ActFlowSpeed/LBDelay)*dt; else { @@ -2183,9 +2179,9 @@ double TFV4a::GetPF(double i_bcp, double PP, double HP, double dt, double ep) TP = TP - dt / 12 / 2; } if ((CP > RP + 0.1) && (CP <= 5)) - dpMainValve = PF(Min0R(CP + 0.25, HP), PP, 2 * ActFlowSpeed / LBDelay) * dt; + dpMainValve = PF(std::min(CP + 0.25, HP), PP, 2 * ActFlowSpeed / LBDelay) * dt; else if (CP > 5) - dpMainValve = PF(Min0R(CP, HP), PP, 2 * ActFlowSpeed / LBDelay) * dt; + dpMainValve = PF(std::min(CP, HP), PP, 2 * ActFlowSpeed / LBDelay) * dt; else dpMainValve = PF(dpPipe, PP, ActFlowSpeed / LBDelay) * dt; } @@ -2208,8 +2204,8 @@ void TFV4a::Init(double Press) double TFV4aM::GetPF(double i_bcp, double PP, double HP, double dt, double ep) { - static int const LBDelay = 100; - static double const xpM = 0.3; // mnoznik membrany komory pod + int const LBDelay { 100 }; + double const xpM { 0.3 }; // mnoznik membrany komory pod ep = (PP / 2.0) * 1.5 + (ep / 2.0) * 0.5; // SPKS!! @@ -2293,13 +2289,10 @@ double TFV4aM::GetPF(double i_bcp, double PP, double HP, double dt, double ep) double const ActFlowSpeed = BPT[ std::lround( i_bcp ) + 2 ][ 0 ]; - double dpMainValve; - if( dpPipe > PP ) { - dpMainValve = -PFVa( HP, PP, ActFlowSpeed / LBDelay, dpPipe, 0.4 ); - } - else { - dpMainValve = PFVd( PP, 0, ActFlowSpeed / LBDelay, dpPipe, 0.4 ); - } + double dpMainValve = ( + dpPipe > PP ? + -PFVa( HP, PP, ActFlowSpeed / LBDelay, dpPipe, 0.4 ) : + PFVd( PP, 0, ActFlowSpeed / LBDelay, dpPipe, 0.4 ) ); if (EQ(i_bcp, -1)) { diff --git a/ResourceManager.cpp b/ResourceManager.cpp index 12d44b38..adbf4bf4 100644 --- a/ResourceManager.cpp +++ b/ResourceManager.cpp @@ -8,6 +8,8 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" + +/* #include "ResourceManager.h" #include "Logs.h" @@ -84,3 +86,4 @@ void ResourceManager::Sweep(double currentTime) _lastUpdate = currentTime; }; +*/ \ No newline at end of file diff --git a/ResourceManager.h b/ResourceManager.h index 93a73480..50e65600 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -7,14 +7,11 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef RESOURCEMANAGER_H -#define RESOURCEMANAGER_H 1 - +#pragma once +/* #include #include -#pragma hdrstop - class Resource { @@ -57,5 +54,63 @@ class ResourceManager static Resources _resources; }; +*/ -#endif +template +class garbage_collector { + +public: +// constructor: + garbage_collector( Container_ &Container, int const Secondstolive, int const Sweepsize, std::string const Resourcename = "resource" ) : + m_container( Container ), + m_unusedresourcetimetolive { std::chrono::seconds( Secondstolive ) }, + m_unusedresourcesweepsize( Sweepsize ), + m_resourcename( Resourcename ) + {} + +// methods: + // performs resource sweep. returns: number of released resources + int + sweep() { + m_resourcetimestamp = std::chrono::steady_clock::now(); + // garbage collection sweep is limited to a number of records per call, to reduce impact on framerate + auto const sweeplastindex = + std::min( + m_resourcesweepindex + m_unusedresourcesweepsize, + m_container.size() ); + auto const blanktimestamp { std::chrono::steady_clock::time_point() }; + int releasecount{ 0 }; + for( auto resourceindex = m_resourcesweepindex; resourceindex < sweeplastindex; ++resourceindex ) { + if( ( m_container[ resourceindex ].second != blanktimestamp ) + && ( m_resourcetimestamp - m_container[ resourceindex ].second > m_unusedresourcetimetolive ) ) { + + m_container[ resourceindex ].first->release(); + m_container[ resourceindex ].second = blanktimestamp; + ++releasecount; + } + } +/* + if( releasecount ) { + WriteLog( "Resource garbage sweep released " + std::to_string( releasecount ) + " " + ( releasecount == 1 ? m_resourcename : m_resourcename + "s" ) ); + } +*/ + m_resourcesweepindex = ( + m_resourcesweepindex + m_unusedresourcesweepsize >= m_container.size() ? + 0 : // if the next sweep chunk is beyond actual data, so start anew + m_resourcesweepindex + m_unusedresourcesweepsize ); + + return releasecount; } + + std::chrono::steady_clock::time_point + timestamp() const { + return m_resourcetimestamp; } + +private: +// members: + std::chrono::nanoseconds const m_unusedresourcetimetolive; + typename Container_::size_type const m_unusedresourcesweepsize; + std::string const m_resourcename; + typename Container_ &m_container; + typename Container_::size_type m_resourcesweepindex { 0 }; + std::chrono::steady_clock::time_point m_resourcetimestamp { std::chrono::steady_clock::now() }; +}; diff --git a/Texture.cpp b/Texture.cpp index 4bf8be4a..3dfbdcc5 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -24,10 +24,12 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "sn_utils.h" +#define EU07_DEFERRED_TEXTURE_UPLOAD + texture_manager::texture_manager() { // since index 0 is used to indicate no texture, we put a blank entry in the first texture slot - m_textures.emplace_back( opengl_texture() ); + m_textures.emplace_back( new opengl_texture(), std::chrono::steady_clock::time_point() ); } // loads texture data from specified file @@ -518,12 +520,12 @@ opengl_texture::bind() { return data_state; } -resource_state +bool opengl_texture::create() { if( data_state != resource_state::good ) { // don't bother until we have useful texture data - return data_state; + return false; } // TODO: consider creating and storing low-res version of the texture if it's ever unloaded from the gfx card, @@ -562,8 +564,8 @@ opengl_texture::create() { for( int maplevel = 0; maplevel < data_mapcount; ++maplevel ) { if( ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ) - || ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) - || ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) ) { + || ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT ) + || ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT ) ) { // compressed dds formats int const datablocksize = ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ? @@ -590,15 +592,44 @@ opengl_texture::create() { } } - data.resize( 0 ); // TBD, TODO: keep the texture data if we start doing some gpu data cleaning down the road + data.swap( std::vector() ); // TBD, TODO: keep the texture data if we start doing some gpu data cleaning down the road /* data_state = resource_state::none; */ - data_state = resource_state::good; + data_state = resource_state::none; is_ready = true; } - return data_state; + return true; +} + +// releases resources allocated on the opengl end, storing local copy if requested +void +opengl_texture::release( bool const Backup ) { + + if( id == -1 ) { return; } + + assert( is_ready ); + + if( true == Backup ) { + // query texture details needed to perform the backup... + ::glBindTexture( GL_TEXTURE_2D, id ); + ::glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, (GLint *)&data_format ); + GLint datasize; + ::glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, (GLint *)&datasize ); + data.resize( datasize ); + // ...fetch the data... + ::glGetCompressedTexImage( GL_TEXTURE_2D, 0, &data[ 0 ] ); + // ...and update texture object state + data_mapcount = 1; // we keep copy of only top mipmap level + data_state = resource_state::good; + } + // release opengl resources + ::glDeleteTextures( 1, &id ); + id = -1; + is_ready = false; + + return; } void @@ -773,8 +804,8 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const return npos; } - opengl_texture texture; - texture.name = filename; + auto texture = new opengl_texture(); + texture->name = filename; if( ( Filter > 0 ) && ( Filter < 10 ) ) { // temporary. TODO, TBD: check how it's used and possibly get rid of it traits += std::to_string( ( Filter < 4 ? Filter + 4 : Filter ) ); @@ -783,9 +814,9 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const // temporary code for legacy assets -- textures with names beginning with # are to be sharpened traits += '#'; } - texture.traits = traits; + texture->traits = traits; auto const textureindex = (texture_handle)m_textures.size(); - m_textures.emplace_back( texture ); + m_textures.emplace_back( texture, std::chrono::steady_clock::time_point() ); m_texturemappings.emplace( filename, textureindex ); WriteLog( "Created texture object for \"" + filename + "\"" ); @@ -796,7 +827,7 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const #ifndef EU07_DEFERRED_TEXTURE_UPLOAD texture_manager::texture( textureindex ).create(); // texture creation binds a different texture, force a re-bind on next use - m_activetexture = 0; + m_activetexture = -1; #endif } @@ -806,7 +837,9 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const void texture_manager::bind( texture_handle const Texture ) { - if( Texture == m_activetexture ) { + m_textures[ Texture ].second = m_garbagecollector.timestamp(); + + if( ( Texture != 0 ) && ( Texture == m_activetexture ) ) { // don't bind again what's already active return; } @@ -838,10 +871,20 @@ void texture_manager::delete_textures() { for( auto const &texture : m_textures ) { // usunięcie wszyskich tekstur (bez usuwania struktury) - if( ( texture.id > 0 ) - && ( texture.id != -1 ) ) { - ::glDeleteTextures( 1, &texture.id ); + if( ( texture.first->id > 0 ) + && ( texture.first->id != -1 ) ) { + ::glDeleteTextures( 1, &(texture.first->id) ); } + delete texture.first; + } +} + +// performs a resource sweep +void +texture_manager::update() { + + if( m_garbagecollector.sweep() > 0 ) { + m_activetexture = -1; } } @@ -859,13 +902,13 @@ texture_manager::info() const { for( auto const& texture : m_textures ) { - totaltexturesize += texture.size; + totaltexturesize += texture.first->size; #ifdef EU07_DEFERRED_TEXTURE_UPLOAD - if( texture.is_ready ) { + if( texture.first->is_ready ) { ++readytexturecount; - readytexturesize += texture.size; + readytexturesize += texture.first->size; } #endif } diff --git a/Texture.h b/Texture.h index 17da9bca..69119271 100644 --- a/Texture.h +++ b/Texture.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include "GL/glew.h" +#include "ResourceManager.h" enum class resource_state { none, @@ -27,12 +28,16 @@ struct opengl_texture { static DDPIXELFORMAT deserialize_ddpf(std::istream&); static DDSCAPS2 deserialize_ddscaps(std::istream&); - // methods - void load(); +// methods + void + load(); resource_state bind(); - resource_state + bool create(); + // releases resources allocated on the opengl end, storing local copy if requested + void + release( bool const Backup = true ); inline int width() const { @@ -41,7 +46,7 @@ struct opengl_texture { int height() const { return data_height; } - // members +// members GLuint id{ (GLuint)-1 }; // associated GL resource bool has_alpha{ false }; // indicates the texture has alpha channel bool is_ready{ false }; // indicates the texture was processed and is ready for use @@ -50,7 +55,7 @@ struct opengl_texture { std::size_t size{ 0 }; // size of the texture data, in kb private: - // methods +// methods void load_BMP(); void load_DDS(); void load_TEX(); @@ -58,7 +63,7 @@ private: void set_filtering(); void downsize( GLuint const Format ); - // members +// members std::vector data; // texture data resource_state data_state{ resource_state::none }; // current state of texture data int data_width{ 0 }, @@ -76,9 +81,6 @@ typedef int texture_handle; class texture_manager { -private: - typedef std::vector opengltexture_array; - public: texture_manager(); ~texture_manager() { delete_textures(); } @@ -88,14 +90,25 @@ public: void bind( texture_handle const Texture ); opengl_texture & - texture( texture_handle const Texture ) { return m_textures[ Texture ]; } + texture( texture_handle const Texture ) { return *(m_textures[ Texture ].first); } + // performs a resource sweep + void + update(); // debug performance string std::string info() const; private: +// types: + typedef std::pair< + opengl_texture *, + std::chrono::steady_clock::time_point > texturetimepoint_pair; + + typedef std::vector< texturetimepoint_pair > texturetimepointpair_sequence; + typedef std::unordered_map index_map; +// methods: // checks whether specified texture is in the texture bank. returns texture id, or npos. texture_handle find_in_databank( std::string const &Texturename ) const; @@ -105,10 +118,12 @@ private: void delete_textures(); - static const texture_handle npos{ 0 }; // should be -1, but the rest of the code uses -1 for something else - opengltexture_array m_textures; +// members: + texture_handle const npos { 0 }; // should be -1, but the rest of the code uses -1 for something else + texturetimepointpair_sequence m_textures; index_map m_texturemappings; - texture_handle m_activetexture{ 0 }; // last i.e. currently bound texture + garbage_collector m_garbagecollector { m_textures, 600, 60, "texture" }; + texture_handle m_activetexture { 0 }; // last i.e. currently bound texture }; // reduces provided data image to half of original size, using basic 2x2 average diff --git a/Train.cpp b/Train.cpp index ead0b728..1bc9832d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1524,8 +1524,8 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com Train->ggMainButton.UpdateValue( 1.0 ); } // keep track of period the button is held down, to determine when/if circuit closes - if( ( false == ( ( Train->mvControlled->EngineType == ElectricSeriesMotor ) - || ( Train->mvControlled->EngineType == ElectricInductionMotor ) ) ) + if( ( ( ( Train->mvControlled->EngineType != ElectricSeriesMotor ) + && ( Train->mvControlled->EngineType != ElectricInductionMotor ) ) ) || ( Train->fHVoltage > 0.5 * Train->mvControlled->EnginePowerSource.MaxVoltage ) ) { // prevent the switch from working if there's no power // TODO: consider whether it makes sense for diesel engines and such diff --git a/World.cpp b/World.cpp index cf94dcee..261e3308 100644 --- a/World.cpp +++ b/World.cpp @@ -1253,7 +1253,9 @@ void TWorld::Update_Environment() { void TWorld::ResourceSweep() { +/* ResourceManager::Sweep( Timer::GetSimulationTime() ); +*/ }; // rendering kabiny gdy jest oddzielnym modelem i ma byc wyswietlana @@ -1664,7 +1666,7 @@ TWorld::Update_UI() { + ( Global::bUseVBO ? "VBO" : "Display Lists" ) - + ". "; + + " "; // dump last opengl error, if any GLenum glerror = ::glGetError(); if( glerror != GL_NO_ERROR ) { diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index 759ffdeb..1c2dec5d 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -359,25 +359,7 @@ opengl_dlgeometrybank::delete_list( geometry_handle const &Geometry ) { void geometrybank_manager::update() { - m_resourcetimestamp = std::chrono::steady_clock::now(); - // garbage collection sweep is limited to a number of records per call, to reduce impact on framerate - auto const sweeplastindex = - std::min( - m_resourcesweepindex + geometrybank_manager::unusedresourcesweepsize, - m_geometrybanks.size() ); - auto const blanktimestamp { std::chrono::steady_clock::time_point() }; - for( auto bankindex = m_resourcesweepindex; bankindex < sweeplastindex; ++bankindex ) { - if( ( m_geometrybanks[ bankindex ].second != blanktimestamp ) - && ( m_resourcetimestamp - m_geometrybanks[ bankindex ].second > geometrybank_manager::unusedresourcetimetolive ) ) { - - m_geometrybanks[ bankindex ].first->release(); - m_geometrybanks[ bankindex ].second = blanktimestamp; - } - } - m_resourcesweepindex = ( - m_resourcesweepindex + geometrybank_manager::unusedresourcesweepsize >= m_geometrybanks.size() ? - 0 : // if the next sweep chunk is beyond actual data, so start anew - m_resourcesweepindex + geometrybank_manager::unusedresourcesweepsize ); + m_garbagecollector.sweep(); } // creates a new geometry bank. returns: handle to the bank or NULL @@ -421,7 +403,7 @@ geometrybank_manager::draw( geometry_handle const &Geometry, unsigned int const auto &bankrecord = bank( Geometry ); - bankrecord.second = m_resourcetimestamp; + bankrecord.second = m_garbagecollector.timestamp(); bankrecord.first->draw( Geometry, Streams ); } diff --git a/openglgeometrybank.h b/openglgeometrybank.h index d799650b..ca4246a0 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #ifdef _WINDOWS #include "GL/wglew.h" #endif +#include "ResourceManager.h" struct basic_vertex { @@ -275,9 +276,9 @@ public: template void draw( Iterator_ First, Iterator_ Last, unsigned int const Streams = basic_streams ) { - while( First != Last ) { - draw( *First, Streams ); - ++First; } } + while( First != Last ) { + draw( *First, Streams ); + ++First; } } // provides direct access to vertex data of specfied chunk vertex_array const & vertices( geometry_handle const &Geometry ) const; @@ -290,12 +291,9 @@ private: typedef std::deque< geometrybanktimepoint_pair > geometrybanktimepointpair_sequence; -// members: - std::chrono::nanoseconds const unusedresourcetimetolive { std::chrono::seconds { 60 } }; - geometrybanktimepointpair_sequence::size_type const unusedresourcesweepsize { 300 }; + // members: geometrybanktimepointpair_sequence m_geometrybanks; - geometrybanktimepointpair_sequence::size_type m_resourcesweepindex { 0 }; - std::chrono::steady_clock::time_point m_resourcetimestamp { std::chrono::steady_clock::now() }; + garbage_collector m_garbagecollector { m_geometrybanks, 60, 120, "geometry buffer" }; // methods inline diff --git a/renderer.cpp b/renderer.cpp index 7bb9c6c4..32c4272d 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -162,12 +162,22 @@ opengl_renderer::Render() { if( World.InitPerformed() ) { - glm::dmat4 worldcamera; - World.Camera.SetMatrix( worldcamera ); - m_camera.update_frustum( OpenGLMatrices.data( GL_PROJECTION ), worldcamera ); - // frustum tests are performed in 'world space' but after we set up frustum - // we no longer need camera translation, only rotation - ::glMultMatrixd( glm::value_ptr( glm::dmat4( glm::dmat3( worldcamera )))); + glm::dmat4 viewmatrix; + // camera view + World.Camera.SetMatrix( viewmatrix ); + m_camera.position() = glm::make_vec3( Global::pCameraPosition.getArray() ); +/* + // light view + m_camera.position() = glm::make_vec3( Global::pCameraPosition.getArray() ) - glm::dvec3( Global::DayLight.direction * 750.0f ); + m_camera.position().y = std::max( 50.0, m_camera.position().y ); // prevent shadow source from dipping too low + viewmatrix = glm::lookAt( + m_camera.position(), + glm::dvec3( Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z ), + glm::dvec3( 0.0f, 1.0f, 0.0f ) ); +*/ + m_camera.update_frustum( OpenGLMatrices.data( GL_PROJECTION ), viewmatrix ); + // frustum tests are performed in 'world space' but after we set up frustum we no longer need camera translation, only rotation + ::glMultMatrixd( glm::value_ptr( glm::dmat4( glm::dmat3( viewmatrix )))); Render( &World.Environment ); Render( &World.Ground ); @@ -193,7 +203,7 @@ opengl_renderer::Render( world_environment *Environment ) { return false; } - Bind( 0 ); + Bind( NULL ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_DEPTH_TEST ); @@ -387,7 +397,7 @@ opengl_renderer::Render( TGround *Ground ) { node->RenderHidden(); } - glm::vec3 const cameraposition( Global::pCameraPosition.x, Global::pCameraPosition.y, Global::pCameraPosition.z ); + glm::vec3 const cameraposition { m_camera.position() }; int const camerax = static_cast( std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2 ); int const cameraz = static_cast( std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2 ); int const segmentcount = 2 * static_cast(std::ceil( m_drawrange * Global::fDistanceFactor / 1000.0f )); @@ -461,7 +471,7 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { if( subcell->iNodeCount ) { // o ile są jakieś obiekty, bo po co puste sektory przelatywać m_drawqueue.emplace_back( - ( Global::pCameraPosition - glm::dvec3( subcell->m_area.center ) ).LengthSquared(), + glm::length2( m_camera.position() - glm::dvec3( subcell->m_area.center ) ), subcell ); } } @@ -515,7 +525,7 @@ opengl_renderer::Render( TGroundNode *Node ) { { // obiekty renderowane niezależnie od odległości case TP_SUBMODEL: ::glPushMatrix(); - auto const originoffset = Node->pCenter - Global::pCameraPosition; + auto const originoffset = Node->pCenter - m_camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); TSubModel::fSquareDist = 0; Render( Node->smTerrain ); @@ -523,7 +533,7 @@ opengl_renderer::Render( TGroundNode *Node ) { return true; } - double const distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); + double const distancesquared = SquareMagnitude( ( Node->pCenter - m_camera.position() ) / Global::ZoomFactor ); if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { return false; @@ -534,7 +544,7 @@ opengl_renderer::Render( TGroundNode *Node ) { case TP_TRACK: { // setup ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + auto const originoffset = Node->m_rootposition - m_camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render Render( Node->pTrack ); @@ -544,7 +554,7 @@ opengl_renderer::Render( TGroundNode *Node ) { } case TP_MODEL: { - Node->Model->Render( Node->pCenter - Global::pCameraPosition ); + Node->Model->Render( Node->pCenter - m_camera.position() ); return true; } @@ -573,7 +583,7 @@ opengl_renderer::Render( TGroundNode *Node ) { GfxRenderer.Bind( 0 ); ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + auto const originoffset = Node->m_rootposition - m_camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render @@ -598,7 +608,7 @@ opengl_renderer::Render( TGroundNode *Node ) { Bind( Node->TextureID ); ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + auto const originoffset = Node->m_rootposition - m_camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render @@ -631,7 +641,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - auto const originoffset = Dynamic->vPosition - Global::pCameraPosition; + auto const originoffset = Dynamic->vPosition - m_camera.position(); double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); @@ -970,7 +980,7 @@ opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { bool opengl_renderer::Render_Alpha( TGroundNode *Node ) { - double const distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); + double const distancesquared = SquareMagnitude( ( Node->pCenter - m_camera.position() ) / Global::ZoomFactor ); if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { return false; @@ -1002,7 +1012,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { Bind( NULL ); ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + auto const originoffset = Node->m_rootposition - m_camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render @@ -1023,7 +1033,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } } case TP_MODEL: { - Node->Model->RenderAlpha( Node->pCenter - Global::pCameraPosition ); + Node->Model->RenderAlpha( Node->pCenter - m_camera.position() ); return true; } @@ -1052,7 +1062,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { GfxRenderer.Bind( 0 ); ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + auto const originoffset = Node->m_rootposition - m_camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render @@ -1077,7 +1087,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { Bind( Node->TextureID ); ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - Global::pCameraPosition; + auto const originoffset = Node->m_rootposition - m_camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render @@ -1102,7 +1112,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - auto const originoffset = Dynamic->vPosition - Global::pCameraPosition; + auto const originoffset = Dynamic->vPosition - m_camera.position(); double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); @@ -1419,6 +1429,7 @@ opengl_renderer::Update ( double const Deltatime ) { // TODO: add garbage collection and other less frequent works here m_geometry.update(); + m_textures.update(); if( true == DebugModeFlag ) { m_debuginfo = m_textures.info(); @@ -1453,13 +1464,13 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { // all lights past this one are bound to be off break; } - if( ( Global::pCameraPosition - scenelight.position ).Length() > 1000.0f ) { + if( ( m_camera.position() - scenelight.position ).Length() > 1000.0f ) { // we don't care about lights past arbitrary limit of 1 km. // but there could still be weaker lights which are closer, so keep looking continue; } // if the light passed tests so far, it's good enough - renderlight->set_position( glm::make_vec3( (scenelight.position - Global::pCameraPosition).readArray() ) ); + renderlight->set_position( glm::make_vec3( (scenelight.position - m_camera.position()).readArray() ) ); renderlight->direction = scenelight.direction; auto luminance = Global::fLuminance; // TODO: adjust this based on location, e.g. for tunnels diff --git a/renderer.h b/renderer.h index 5a2cf095..2754feb3 100644 --- a/renderer.h +++ b/renderer.h @@ -91,10 +91,17 @@ public: visible( bounding_area const &Area ) const; bool visible( TDynamicObject const *Dynamic ) const; + inline + glm::dvec3 const & + position() const { return m_position; } + inline + glm::dvec3 & + position() { return m_position; } private: // members: cFrustum m_frustum; + glm::dvec3 m_position; }; // bare-bones render controller, in lack of anything better yet diff --git a/version.h b/version.h index e7ef8285..3be4407c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 630 +#define VERSION_MINOR 701 #define VERSION_REVISION 0 From 9a008ecff5e17f75425821aa1de3c52ac2b0e05d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 9 Jul 2017 16:45:40 +0200 Subject: [PATCH 133/426] build 170708. cursor-based item picking, mouse support for cab controls, rudimentary render modes support in renderer --- AnimModel.cpp | 4 +- Camera.cpp | 19 +- Camera.h | 1 - EU07.cpp | 45 +- Globals.cpp | 2 +- Globals.h | 2 +- Ground.cpp | 283 ++++++---- Ground.h | 30 +- McZapkie/Mover.cpp | 16 +- McZapkie/mctools.h | 9 +- Model3d.cpp | 12 +- Segment.cpp | 8 +- Track.cpp | 10 +- Train.cpp | 408 ++++---------- Train.h | 18 +- World.cpp | 170 +++--- World.h | 71 ++- command.h | 3 +- dumb3d.h | 16 +- keyboardinput.cpp | 256 +++++++++ keyboardinput.h | 20 + renderer.cpp | 1299 ++++++++++++++++++++++++++++++++++---------- renderer.h | 94 +++- uilayer.cpp | 45 +- uilayer.h | 19 +- version.h | 2 +- 26 files changed, 1931 insertions(+), 931 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 95e45c41..73b5524e 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -447,7 +447,7 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable m_materialdata.replacable_skins[1] = GfxRenderer.GetTextureId( asReplacableTexture, "" ); if( ( m_materialdata.replacable_skins[ 1 ] != 0 ) - && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) ) { + && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) ) { // tekstura z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha = 0x31310031; } @@ -470,7 +470,7 @@ bool TAnimModel::Load(cParser *parser, bool ter) if (ter) // jeśli teren { if( name.substr( name.rfind( '.' ) ) == ".t3d" ) { - name[ name.length() - 2 ] = 'e'; + name[ name.length() - 3 ] = 'e'; } Global::asTerrainModel = name; WriteLog("Terrain model \"" + name + "\" will be created."); diff --git a/Camera.cpp b/Camera.cpp index b1354746..2c59684f 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -419,29 +419,18 @@ bool TCamera::SetMatrix( glm::dmat4 &Matrix ) { if( Type == tp_Follow ) { Matrix *= glm::lookAt( - glm::dvec3( Pos.x, Pos.y, Pos.z ), - glm::dvec3( LookAt.x, LookAt.y, LookAt.z ), - glm::dvec3( vUp.x, vUp.y, vUp.z ) ); + glm::dvec3{ Pos }, + glm::dvec3{ LookAt }, + glm::dvec3{ vUp } ); } else { - Matrix = glm::translate( Matrix, glm::dvec3( -Pos.x, -Pos.y, -Pos.z ) ); // nie zmienia kierunku patrzenia + Matrix = glm::translate( Matrix, glm::dvec3{ -Pos } ); // nie zmienia kierunku patrzenia } Global::SetCameraPosition( Pos ); // było +pOffset return true; } -void TCamera::SetCabMatrix(vector3 &p) -{ // ustawienie widoku z kamery bez przesunięcia robionego przez OpenGL - nie powinno tak trząść - - glRotated(-Roll * 180.0 / M_PI, 0.0, 0.0, 1.0); - glRotated(-Pitch * 180.0 / M_PI, 1.0, 0.0, 0.0); - glRotated(-Yaw * 180.0 / M_PI, 0.0, 1.0, 0.0); // w zewnętrznym widoku: kierunek patrzenia - if (Type == tp_Follow) - gluLookAt(Pos.x - p.x, Pos.y - p.y, Pos.z - p.z, LookAt.x - p.x, LookAt.y - p.y, - LookAt.z - p.z, vUp.x, vUp.y, vUp.z); // Ra: pOffset is zero -} - void TCamera::RaLook() { // zmiana kierunku patrzenia - przelicza Yaw vector3 where = LookAt - Pos + vector3(0, 3, 0); // trochę w górę od szyn diff --git a/Camera.h b/Camera.h index 760a9294..f978047f 100644 --- a/Camera.h +++ b/Camera.h @@ -59,7 +59,6 @@ class TCamera vector3 GetDirection(); bool SetMatrix(); bool SetMatrix(glm::dmat4 &Matrix); - void SetCabMatrix( vector3 &p ); void RaLook(); void Stop(); // bool GetMatrix(matrix4x4 &Matrix); diff --git a/EU07.cpp b/EU07.cpp index 280f36fc..27aea200 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -66,6 +66,7 @@ namespace input { keyboard_input Keyboard; gamepad_input Gamepad; +glm::dvec2 mouse_pos; // stores last mouse position in control picking mode } @@ -122,11 +123,22 @@ void window_resize_callback(GLFWwindow *window, int w, int h) void cursor_pos_callback(GLFWwindow *window, double x, double y) { - input::Keyboard.mouse( x, y ); -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - World.OnMouseMove(x * 0.005, y * 0.01); -#endif - glfwSetCursorPos(window, 0.0, 0.0); + if( true == Global::ControlPicking ) { + glfwSetCursorPos( window, x, y ); + } + else { + input::Keyboard.mouse( x, y ); + glfwSetCursorPos( window, 0, 0 ); + } +} + +void mouse_button_callback( GLFWwindow* window, int button, int action, int mods ) { + + if( ( button == GLFW_MOUSE_BUTTON_LEFT ) + || ( button == GLFW_MOUSE_BUTTON_RIGHT ) ) { + // we don't care about other mouse buttons at the moment + input::Keyboard.mouse( button, action ); + } } void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) @@ -136,6 +148,27 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo Global::shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; Global::ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; + if( ( key == GLFW_KEY_LEFT_ALT ) + || ( key == GLFW_KEY_RIGHT_ALT ) ) { + // if the alt key was pressed toggle control picking mode and set matching cursor behaviour + if( action == GLFW_RELEASE ) { + + if( Global::ControlPicking ) { + // switch off + glfwGetCursorPos( window, &input::mouse_pos.x, &input::mouse_pos.y ); + glfwSetInputMode( window, GLFW_CURSOR, GLFW_CURSOR_DISABLED ); + glfwSetCursorPos( window, 0, 0 ); + } + else { + // enter picking mode + glfwSetInputMode( window, GLFW_CURSOR, GLFW_CURSOR_NORMAL ); + glfwSetCursorPos( window, input::mouse_pos.x, input::mouse_pos.y ); + } + // actually toggle the mode + Global::ControlPicking = !Global::ControlPicking; + } + } + if( ( key == GLFW_KEY_LEFT_SHIFT ) || ( key == GLFW_KEY_LEFT_CONTROL ) || ( key == GLFW_KEY_LEFT_ALT ) @@ -340,6 +373,7 @@ int main(int argc, char *argv[]) glfwSetCursorPos(window, 0.0, 0.0); glfwSetFramebufferSizeCallback(window, window_resize_callback); glfwSetCursorPosCallback(window, cursor_pos_callback); + glfwSetMouseButtonCallback( window, mouse_button_callback ); glfwSetKeyCallback(window, key_callback); glfwSetScrollCallback( window, scroll_callback ); glfwSetWindowFocusCallback(window, focus_callback); @@ -417,6 +451,7 @@ int main(int argc, char *argv[]) && ( true == World.Update() ) && ( true == GfxRenderer.Render() ) ) { glfwPollEvents(); + input::Keyboard.poll(); if( true == Global::InputGamepad ) { input::Gamepad.poll(); } diff --git a/Globals.cpp b/Globals.cpp index 6401aa1e..8712aeed 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -38,7 +38,6 @@ double Global::ABuDebug = 0; std::string Global::asSky = "1"; double Global::fLuminance = 1.0; // jasność światła do automatycznego zapalania float Global::SunAngle = 0.0f; -int Global::iReCompile = 0; // zwiększany, gdy trzeba odświeżyć siatki int Global::ScreenWidth = 1; int Global::ScreenHeight = 1; float Global::ZoomFactor = 1.0f; @@ -48,6 +47,7 @@ bool Global::shiftState; bool Global::ctrlState; int Global::iCameraLast = -1; std::string Global::asVersion = "couldn't retrieve version string"; +bool Global::ControlPicking = false; // indicates controls pick mode is enabled int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // numer ekranu wyświetlacza tekstowego double Global::fSunDeclination = 0.0; // deklinacja Słońca diff --git a/Globals.h b/Globals.h index b4bc804c..b31d6b94 100644 --- a/Globals.h +++ b/Globals.h @@ -238,7 +238,6 @@ class Global static int iBallastFiltering; // domyślne rozmywanie tekstury podsypki static int iRailProFiltering; // domyślne rozmywanie tekstury szyn static int iDynamicFiltering; // domyślne rozmywanie tekstur pojazdów - static int iReCompile; // zwiększany, gdy trzeba odświeżyć siatki static bool bUseVBO; // czy jest VBO w karcie graficznej static std::string LastGLError; static int iFeedbackMode; // tryb pracy informacji zwrotnej @@ -257,6 +256,7 @@ class Global static int iCameraLast; static std::string asVersion; // z opisem static GLint iMaxTextureSize; // maksymalny rozmiar tekstury + static bool ControlPicking; // indicates controls pick mode is enabled static int iTextMode; // tryb pracy wyświetlacza tekstowego static int iScreenMode[12]; // numer ekranu wyświetlacza tekstowego static bool bDoubleAmbient; // podwójna jasność ambient diff --git a/Ground.cpp b/Ground.cpp index a131644e..b4640ea4 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -49,8 +49,14 @@ extern "C" bool bCondition; // McZapkie: do testowania warunku na event multiple std::string LogComment; -// TODO: switch to the new unified code after we have in place merging of individual triangle nodes into material-based soups -#define EU07_USE_OLD_RENDERCODE +// tests whether provided points form a degenerate triangle +bool +degenerate( glm::dvec3 const &Vertex1, glm::dvec3 const &Vertex2, glm::dvec3 const &Vertex3 ) { + + return ( ( Vertex1 == Vertex2 ) + || ( Vertex2 == Vertex3 ) + || ( Vertex3 == Vertex1 ) ); +} //--------------------------------------------------------------------------- // Obiekt renderujący siatkę jest sztucznie tworzonym obiektem pomocniczym, @@ -692,6 +698,21 @@ TGroundNode * TGround::FindGroundNode(std::string asNameToFind, TGroundNodeType return NULL; } +TGroundRect * +TGround::GetRect( double x, double z ) { + + auto const column = GetColFromX( x ) / iNumSubRects; + auto const row = GetRowFromZ( z ) / iNumSubRects; + + if( ( column >= 0 ) && ( column < iNumRects ) + && ( row >= 0 ) && ( row < iNumRects ) ) { + return &Rects[ column ][ row ]; + } + else { + return nullptr; + } +}; + double fTrainSetVel = 0; double fTrainSetDir = 0; double fTrainSetDist = 0; // odległość składu od punktu 1 w stronę punktu 2 @@ -934,25 +955,25 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> tmp->hvTraction->pPoint1.x >> tmp->hvTraction->pPoint1.y >> tmp->hvTraction->pPoint1.z; - tmp->hvTraction->pPoint1 += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); + tmp->hvTraction->pPoint1 += glm::dvec3{ pOrigin }; parser->getTokens(3); *parser >> tmp->hvTraction->pPoint2.x >> tmp->hvTraction->pPoint2.y >> tmp->hvTraction->pPoint2.z; - tmp->hvTraction->pPoint2 += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); + tmp->hvTraction->pPoint2 += glm::dvec3{ pOrigin }; parser->getTokens(3); *parser >> tmp->hvTraction->pPoint3.x >> tmp->hvTraction->pPoint3.y >> tmp->hvTraction->pPoint3.z; - tmp->hvTraction->pPoint3 += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); + tmp->hvTraction->pPoint3 += glm::dvec3{ pOrigin }; parser->getTokens(3); *parser >> tmp->hvTraction->pPoint4.x >> tmp->hvTraction->pPoint4.y >> tmp->hvTraction->pPoint4.z; - tmp->hvTraction->pPoint4 += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); + tmp->hvTraction->pPoint4 += glm::dvec3{ pOrigin }; parser->getTokens(); *parser >> tf1; tmp->hvTraction->fHeightDifference = @@ -1238,6 +1259,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) { // jeśli model jest terenem, trzeba utworzyć dodatkowe obiekty // po wczytaniu model ma już utworzone DL albo VBO Global::pTerrainCompact = tmp->Model; // istnieje co najmniej jeden obiekt terenu + tmp->pCenter = Math3D::vector3( 0.0, 0.0, 0.0 ); // enforce placement in the world center tmp->iCount = Global::pTerrainCompact->TerrainCount() + 1; // zliczenie submodeli tmp->nNode = new TGroundNode[tmp->iCount]; // sztuczne node dla kwadratów tmp->nNode[0].iType = TP_MODEL; // pierwszy zawiera model (dla delete) @@ -1245,7 +1267,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->nNode[0].iFlags = 0x200; // nie wyświetlany, ale usuwany for (int i = 1; i < tmp->iCount; ++i) { // a reszta to submodele - tmp->nNode[i].iType = TP_SUBMODEL; // + tmp->nNode[i].iType = TP_SUBMODEL; tmp->nNode[i].smTerrain = Global::pTerrainCompact->TerrainSquare(i - 1); tmp->nNode[i].iFlags = 0x10; // nieprzezroczyste; nie usuwany tmp->nNode[i].bVisible = true; @@ -1264,27 +1286,24 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) // case TP_GEOMETRY : case GL_TRIANGLES: case GL_TRIANGLE_STRIP: - case GL_TRIANGLE_FAN: + case GL_TRIANGLE_FAN: { + parser->getTokens(); *parser >> token; // McZapkie-050702: opcjonalne wczytywanie parametrow materialu (ambient,diffuse,specular) - if (token.compare("material") == 0) - { + if( token.compare( "material" ) == 0 ) { parser->getTokens(); *parser >> token; - while (token.compare("endmaterial") != 0) - { - if (token.compare("ambient:") == 0) - { - parser->getTokens(3); + while( token.compare( "endmaterial" ) != 0 ) { + if( token.compare( "ambient:" ) == 0 ) { + parser->getTokens( 3 ); *parser >> tmp->Ambient.r >> tmp->Ambient.g >> tmp->Ambient.b; tmp->Ambient /= 255.0f; } - else if (token.compare("diffuse:") == 0) - { // Ra: coś jest nie tak, bo w jednej linijce nie działa + else if( token.compare( "diffuse:" ) == 0 ) { // Ra: coś jest nie tak, bo w jednej linijce nie działa parser->getTokens( 3 ); *parser >> tmp->Diffuse.r @@ -1292,8 +1311,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> tmp->Diffuse.b; tmp->Diffuse /= 255.0f; } - else if (token.compare("specular:") == 0) - { + else if( token.compare( "specular:" ) == 0 ) { parser->getTokens( 3 ); *parser >> tmp->Specular.r @@ -1302,18 +1320,25 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->Specular /= 255.0f; } else - Error("Scene material failure!"); + Error( "Scene material failure!" ); parser->getTokens(); *parser >> token; } } - if (token.compare("endmaterial") == 0) - { + if( token.compare( "endmaterial" ) == 0 ) { parser->getTokens(); *parser >> token; } str = token; tmp->TextureID = GfxRenderer.GetTextureId( str, szTexturePath ); + bool const clamps = ( + tmp->TextureID ? + GfxRenderer.Texture( tmp->TextureID ).traits.find( 's' ) != std::string::npos : + false ); + bool const clampt = ( + tmp->TextureID ? + GfxRenderer.Texture( tmp->TextureID ).traits.find( 't' ) != std::string::npos : + false ); tmp->iFlags |= 200; // z usuwaniem // remainder of legacy 'problend' system -- geometry assigned a texture with '@' in its name is treated as translucent, opaque otherwise @@ -1322,49 +1347,76 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) && ( true == GfxRenderer.Texture( tmp->TextureID ).has_alpha ) ) ? 0x20 : 0x10 ); - { - TGroundVertex vertex, vertex1, vertex2; - std::size_t vertexcount { 0 }; - do { - parser->getTokens( 8, false ); - *parser - >> vertex.position.x - >> vertex.position.y - >> vertex.position.z - >> vertex.normal.x - >> vertex.normal.y - >> vertex.normal.z - >> vertex.texture.s - >> vertex.texture.t; - vertex.position = glm::rotateZ( vertex.position, aRotate.z / 180 * M_PI ); - vertex.position = glm::rotateX( vertex.position, aRotate.x / 180 * M_PI ); - vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); - vertex.normal = glm::rotateZ( vertex.normal, static_cast( aRotate.z / 180 * M_PI ) ); - vertex.normal = glm::rotateX( vertex.normal, static_cast( aRotate.x / 180 * M_PI ) ); - vertex.normal = glm::rotateY( vertex.normal, static_cast( aRotate.y / 180 * M_PI ) ); - vertex.position += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); - // convert all data to gl_triangles to allow data merge for matching nodes - switch( tmp->iType ) { - case GL_TRIANGLES: { - importedvertices.emplace_back( vertex ); - break; + + TGroundVertex vertex, vertex1, vertex2; + std::size_t vertexcount{ 0 }; + do { + parser->getTokens( 8, false ); + *parser + >> vertex.position.x + >> vertex.position.y + >> vertex.position.z + >> vertex.normal.x + >> vertex.normal.y + >> vertex.normal.z + >> vertex.texture.s + >> vertex.texture.t; + vertex.position = glm::rotateZ( vertex.position, aRotate.z / 180 * M_PI ); + vertex.position = glm::rotateX( vertex.position, aRotate.x / 180 * M_PI ); + vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); + vertex.normal = glm::rotateZ( vertex.normal, static_cast( aRotate.z / 180 * M_PI ) ); + vertex.normal = glm::rotateX( vertex.normal, static_cast( aRotate.x / 180 * M_PI ) ); + vertex.normal = glm::rotateY( vertex.normal, static_cast( aRotate.y / 180 * M_PI ) ); + vertex.position += glm::dvec3{ pOrigin }; + if( true == clamps ) { vertex.texture.s = clamp( vertex.texture.s, 0.001f, 0.999f ); } + if( true == clampt ) { vertex.texture.t = clamp( vertex.texture.t, 0.001f, 0.999f ); } + // convert all data to gl_triangles to allow data merge for matching nodes + switch( tmp->iType ) { + case GL_TRIANGLES: { + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + if( false == degenerate( vertex1.position, vertex2.position, vertex.position ) ) { + importedvertices.emplace_back( vertex1 ); + importedvertices.emplace_back( vertex2 ); + importedvertices.emplace_back( vertex ); + } + else { + ErrorLog( + "Bad geometry: degenerate triangle encountered" + + ( tmp->asName != "" ? " in node \"" + tmp->asName + "\"" : "" ) + + " (vertices: " + to_string( vertex1.position ) + " + " + to_string( vertex2.position ) + " + " + to_string( vertex.position ) + ")" ); + } } - case GL_TRIANGLE_FAN: { - if( vertexcount == 0 ) { vertex1 = vertex; } - else if( vertexcount == 1 ) { vertex2 = vertex; } - else if( vertexcount >= 2 ) { + ++vertexcount; + if( vertexcount > 2 ) { vertexcount = 0; } // start new triangle if needed + break; + } + case GL_TRIANGLE_FAN: { + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + if( false == degenerate( vertex1.position, vertex2.position, vertex.position ) ) { importedvertices.emplace_back( vertex1 ); importedvertices.emplace_back( vertex2 ); importedvertices.emplace_back( vertex ); vertex2 = vertex; } - ++vertexcount; - break; + else { + ErrorLog( + "Bad geometry: degenerate triangle encountered" + + ( tmp->asName != "" ? " in node \"" + tmp->asName + "\"" : "" ) + + " (vertices: " + to_string( vertex1.position ) + " + " + to_string( vertex2.position ) + " + " + to_string( vertex.position ) + ")" ); + } } - case GL_TRIANGLE_STRIP: { - if( vertexcount == 0 ) { vertex1 = vertex; } - else if( vertexcount == 1 ) { vertex2 = vertex; } - else if( vertexcount >= 2 ) { + ++vertexcount; + break; + } + case GL_TRIANGLE_STRIP: { + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + if( false == degenerate( vertex1.position, vertex2.position, vertex.position ) ) { // swap order every other triangle, to maintain consistent winding if( vertexcount % 2 == 0 ) { importedvertices.emplace_back( vertex1 ); @@ -1379,40 +1431,47 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) vertex1 = vertex2; vertex2 = vertex; } - ++vertexcount; - break; + else { + ErrorLog( + "Bad geometry: degenerate triangle encountered" + + ( tmp->asName != "" ? " in node \"" + tmp->asName + "\"" : "" ) + + " (vertices: " + to_string( vertex1.position ) + " + " + to_string( vertex2.position ) + " + " + to_string( vertex.position ) + ")" ); + } } - default: { break; } + ++vertexcount; + break; } - parser->getTokens(); - *parser >> token; - - } while (token.compare("endtri") != 0); - - tmp->iType = GL_TRIANGLES; - tmp->Piece = new piece_node(); - tmp->iNumVerts = importedvertices.size(); - - if( tmp->iNumVerts > 0 ) { - - tmp->Piece->vertices.swap( importedvertices ); - - for( auto const &vertex : tmp->Piece->vertices ) { - tmp->pCenter += vertex.position; - } - tmp->pCenter /= tmp->iNumVerts; - - r = 0; - for( auto const &vertex : tmp->Piece->vertices ) { - tf = SquareMagnitude( vertex.position - tmp->pCenter ); - if( tf > r ) - r = tf; - } - tmp->fSquareRadius += r; - RaTriangleDivider( tmp ); // Ra: dzielenie trójkątów jest teraz całkiem wydajne + default: { break; } } + parser->getTokens(); + *parser >> token; + + } while( token.compare( "endtri" ) != 0 ); + + tmp->iType = GL_TRIANGLES; + tmp->Piece = new piece_node(); + tmp->iNumVerts = importedvertices.size(); + + if( tmp->iNumVerts > 0 ) { + + tmp->Piece->vertices.swap( importedvertices ); + + for( auto const &vertex : tmp->Piece->vertices ) { + tmp->pCenter += vertex.position; + } + tmp->pCenter /= tmp->iNumVerts; + + r = 0; + for( auto const &vertex : tmp->Piece->vertices ) { + tf = glm::length2( vertex.position - glm::dvec3{ tmp->pCenter } ); + if( tf > r ) + r = tf; + } + tmp->fSquareRadius += r; + RaTriangleDivider( tmp ); // Ra: dzielenie trójkątów jest teraz całkiem wydajne } // koniec wczytywania trójkątów break; + } case GL_LINES: case GL_LINE_STRIP: case GL_LINE_LOOP: { @@ -1440,7 +1499,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) vertex.position = glm::rotateX( vertex.position, aRotate.x / 180 * M_PI ); vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); - vertex.position += glm::dvec3( pOrigin.x, pOrigin.y, pOrigin.z ); + vertex.position += glm::dvec3{ pOrigin }; // convert all data to gl_lines to allow data merge for matching nodes switch( tmp->iType ) { case GL_LINES: { @@ -1578,11 +1637,11 @@ void TGround::FirstInit() // dodanie do globalnego obiektu srGlobal.NodeAdd( Current ); } - else if (type == TP_TERRAIN) - { // specjalne przetwarzanie terenu wczytanego z pliku E3D + else if (type == TP_TERRAIN) { + // specjalne przetwarzanie terenu wczytanego z pliku E3D TGroundRect *gr; - for (int j = 1; j < Current->iCount; ++j) - { // od 1 do końca są zestawy trójkątów + for (int j = 1; j < Current->iCount; ++j) { + // od 1 do końca są zestawy trójkątów std::string xxxzzz = Current->nNode[j].smTerrain->pName; // pobranie nazwy gr = GetRect( ( std::stoi( xxxzzz.substr( 0, 3 )) - 500 ) * 1000, @@ -1590,16 +1649,30 @@ void TGround::FirstInit() gr->nTerrain = Current->nNode + j; // zapamiętanie } } - else if( ( Current->iType != GL_TRIANGLES ) - || ( Current->iFlags & 0x20 ) - || ( Current->fSquareMinRadius != 0.0 ) - || ( Current->fSquareRadius <= 90000.0 ) ) { - // add to sub-rectangle - GetSubRect( Current->pCenter.x, Current->pCenter.z )->NodeAdd( Current ); - } else { - // dodajemy do kwadratu kilometrowego - GetRect( Current->pCenter.x, Current->pCenter.z )->NodeAdd( Current ); + TSubRect *targetcell { nullptr }; + // test whether we can add the node to a ground cell, or a subcell + if( ( Current->iType != GL_TRIANGLES ) + || ( Current->iFlags & 0x20 ) + || ( Current->fSquareMinRadius != 0.0 ) + || ( Current->fSquareRadius <= 90000.0 ) ) { + // add to sub-rectangle + targetcell = GetSubRect( Current->pCenter.x, Current->pCenter.z ); + } + else { + // dodajemy do kwadratu kilometrowego + targetcell = GetRect( Current->pCenter.x, Current->pCenter.z ); + } + if( targetcell != nullptr ) { + targetcell->NodeAdd( Current ); + } + else { + ErrorLog( "Scenery node" + ( + Current->asName == "" ? + "" : + " \"" + Current->asName + "\"" ) + + " placed in location outside of map bounds (location: " + to_string( glm::dvec3{ Current->pCenter } ) + ")" ); + } } } } @@ -2900,7 +2973,7 @@ TTraction * TGround::TractionNearestFind(glm::dvec3 &p, int dir, TGroundNode *n) if (nCurrent->hvTraction->fResistance[k] >= 0.0) //żeby się nie propagowały jakieś ujemne { // znaleziony kandydat do połączenia - d = SquareMagnitude( p - nCurrent->pCenter ); // kwadrat odległości środków + d = glm::length2( p - glm::dvec3{ nCurrent->pCenter } ); // kwadrat odległości środków if (dist > d) { // zapamiętanie nowego najbliższego dist = d; // nowy rekord odległości @@ -3568,10 +3641,10 @@ bool TGround::GetTraction(TDynamicObject *model) vParam = node->hvTraction ->vParametric; // współczynniki równania parametrycznego - fRaParam = -DotProduct(pant0, vFront); - auto const paramfrontdot = DotProduct( vParam, vFront ); + fRaParam = -glm::dot(pant0, vFront); + auto const paramfrontdot = glm::dot( vParam, vFront ); fRaParam = - -( DotProduct( node->hvTraction->pPoint1, vFront ) + fRaParam ) + -( glm::dot( node->hvTraction->pPoint1, vFront ) + fRaParam ) / ( paramfrontdot != 0.0 ? paramfrontdot : 0.001 ); // div0 trap if ((fRaParam >= -0.001) ? (fRaParam <= 1.001) : false) { // jeśli tylko jest w przedziale, wyznaczyć odległość wzdłuż diff --git a/Ground.h b/Ground.h index 04e66754..1005ab3f 100644 --- a/Ground.h +++ b/Ground.h @@ -313,27 +313,21 @@ class TGround TGroundNode * DynamicFind(std::string const &Name); void DynamicList(bool all = false); TGroundNode * FindGroundNode(std::string asNameToFind, TGroundNodeType iNodeType); - TGroundRect * GetRect(double x, double z) - { - return &Rects[GetColFromX(x) / iNumSubRects][GetRowFromZ(z) / iNumSubRects]; - }; + TGroundRect * GetRect( double x, double z ); TSubRect * GetSubRect( int iCol, int iRow ); - TSubRect * GetSubRect(double x, double z) - { - return GetSubRect(GetColFromX(x), GetRowFromZ(z)); - }; + inline + TSubRect * GetSubRect(double x, double z) { + return GetSubRect(GetColFromX(x), GetRowFromZ(z)); }; TSubRect * FastGetSubRect( int iCol, int iRow ); + inline TSubRect * FastGetSubRect( double x, double z ) { - return FastGetSubRect( GetColFromX( x ), GetRowFromZ( z ) ); - }; - int GetRowFromZ(double z) - { - return (int)(z / fSubRectSize + fHalfTotalNumSubRects); - }; - int GetColFromX(double x) - { - return (int)(x / fSubRectSize + fHalfTotalNumSubRects); - }; + return FastGetSubRect( GetColFromX( x ), GetRowFromZ( z ) ); }; + inline + int GetRowFromZ(double z) { + return (int)(z / fSubRectSize + fHalfTotalNumSubRects); }; + inline + int GetColFromX(double x) { + return (int)(x / fSubRectSize + fHalfTotalNumSubRects); }; TEvent * FindEvent(const std::string &asEventName); TEvent * FindEventScan(const std::string &asEventName); void TrackJoin(TGroundNode *Current); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b707b944..31a3226d 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -814,9 +814,11 @@ void TMoverParameters::UpdateBatteryVoltage(double dt) sn3 = 0.0, sn4 = 0.0, sn5 = 0.0; // Ra: zrobić z tego amperomierz NN - if ((BatteryVoltage > 0) && (EngineType != DieselEngine) && (EngineType != WheelsDriven) && - (NominalBatteryVoltage > 0)) - { + if( ( BatteryVoltage > 0 ) + && ( EngineType != DieselEngine ) + && ( EngineType != WheelsDriven ) + && ( NominalBatteryVoltage > 0 ) ) { + if ((NominalBatteryVoltage / BatteryVoltage < 1.22) && Battery) { // 110V if (!ConverterFlag) @@ -884,10 +886,10 @@ void TMoverParameters::UpdateBatteryVoltage(double dt) if (BatteryVoltage < 0.01) BatteryVoltage = 0.01; } - else if (NominalBatteryVoltage == 0) - BatteryVoltage = 0; - else - BatteryVoltage = 90; + else { + // TODO: check and implement proper way to handle this for diesel engines + BatteryVoltage = NominalBatteryVoltage; + } }; /* Ukrotnienie EN57: diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index c6b7932b..c8171572 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -121,11 +121,16 @@ std::string to_string(double _Val, int precision); std::string to_string(double _Val, int precision, int width); std::string to_hex_str( int const _Val, int const width = 4 ); -inline std::string to_string(bool _Val) -{ +inline std::string to_string(bool _Val) { + return _Val == true ? "true" : "false"; } +template +std::string to_string( glm::tvec3 const &Value ) { + return to_string( Value.x, 2 ) + ", " + to_string( Value.y, 2 ) + ", " + to_string( Value.z, 2 ); +} + int stol_def(const std::string & str, const int & DefaultValue); std::string ToLower(std::string const &text); diff --git a/Model3d.cpp b/Model3d.cpp index 56916097..27614b73 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -381,11 +381,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic if( ( std::abs( scale.x - 1.0f ) > 0.01 ) || ( std::abs( scale.y - 1.0f ) > 0.01 ) || ( std::abs( scale.z - 1.0f ) > 0.01 ) ) { - ErrorLog( - "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " - + to_string( scale.x, 2 ) + ", " - + to_string( scale.y, 2 ) + ", " - + to_string( scale.z, 2 ) + ")" ); + ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " + to_string( scale ) + ")" ); m_normalizenormals = ( ( ( std::abs( scale.x - scale.y ) < 0.01f ) && ( std::abs( scale.y - scale.z ) < 0.01f ) ) ? rescale : @@ -1719,11 +1715,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, if( ( std::abs( scale.x - 1.0f ) > 0.01 ) || ( std::abs( scale.y - 1.0f ) > 0.01 ) || ( std::abs( scale.z - 1.0f ) > 0.01 ) ) { - ErrorLog( - "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " - + to_string( scale.x, 2 ) + ", " - + to_string( scale.y, 2 ) + ", " - + to_string( scale.z, 2 ) + ")" ); + ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " + to_string( scale ) + ")" ); m_normalizenormals = ( ( ( std::abs( scale.x - scale.y ) < 0.01f ) && ( std::abs( scale.y - scale.z ) < 0.01f ) ) ? rescale : diff --git a/Segment.cpp b/Segment.cpp index c74451bd..ea9a8e6b 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -19,10 +19,6 @@ http://mozilla.org/MPL/2.0/. // 101206 Ra: trapezoidalne drogi // 110806 Ra: odwrócone mapowanie wzdłuż - Point1 == 1.0 -std::string Where(vector3 p) -{ // zamiana współrzędnych na tekst, używana w błędach - return std::to_string(p.x) + " " + std::to_string(p.y) + " " + std::to_string(p.z); -}; TSegment::TSegment(TTrack *owner) : pOwner( owner ) @@ -112,7 +108,7 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI fStep = fNewStep; if (fLength <= 0) { - ErrorLog( "Bad geometry (zero length) for spline \"" + pOwner->NameGet() + "\" at " + Where( Point1 ) ); + ErrorLog( "Bad geometry: zero length spline \"" + pOwner->NameGet() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); // MessageBox(0,"Length<=0","TSegment::Init",MB_OK); fLength = 0.01; // crude workaround TODO: fix this properly /* @@ -215,7 +211,7 @@ double TSegment::GetTFromS(double s) // Newton's method failed. If this happens, increase iterations or // tolerance or integration accuracy. // return -1; //Ra: tu nigdy nie dojdzie - ErrorLog( "Bad geometry (shape estimation failed) for spline \"" + pOwner->NameGet() + "\" at " + Where( Point1 ) ); + ErrorLog( "Bad geometry: shape estimation failed for spline \"" + pOwner->NameGet() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); // MessageBox(0,"Too many iterations","GetTFromS",MB_OK); return fTime; }; diff --git a/Track.cpp b/Track.cpp index 59a7a44f..29e85e3f 100644 --- a/Track.cpp +++ b/Track.cpp @@ -307,10 +307,12 @@ TTrack * TTrack::NullCreate(int dir) tmp2->pCenter = tmp->pCenter; // ten sam środek jest // Ra: to poniżej to porażka, ale na razie się nie da inaczej TSubRect *r = Global::pGround->GetSubRect(tmp->pCenter.x, tmp->pCenter.z); - r->NodeAdd(tmp); // dodanie toru do segmentu - if (tmp2) - r->NodeAdd(tmp2); // drugiego też - r->Sort(); //żeby wyświetlał tabor z dodanego toru + if( r != nullptr ) { + r->NodeAdd( tmp ); // dodanie toru do segmentu + if( tmp2 ) + r->NodeAdd( tmp2 ); // drugiego też + r->Sort(); //żeby wyświetlał tabor z dodanego toru + } return trk; }; diff --git a/Train.cpp b/Train.cpp index 1bc9832d..398cc87e 100644 --- a/Train.cpp +++ b/Train.cpp @@ -22,6 +22,27 @@ http://mozilla.org/MPL/2.0/. #include "Driver.h" #include "Console.h" +void +control_mapper::insert( TGauge const &Gauge, std::string const &Label ) { + + auto const submodel = Gauge.SubModel; + if( submodel != nullptr ) { + m_controlnames.emplace( submodel, Label ); + } +} + +std::string +control_mapper::find( TSubModel const *Control ) const { + + auto const lookup = m_controlnames.find( Control ); + if( lookup != m_controlnames.end() ) { + return lookup->second; + } + else { + return ""; + } +} + TCab::TCab() { CabPos1.x = -1.0; @@ -5943,13 +5964,16 @@ bool TTrain::Update( double const Deltatime ) // TODO: rework it into something more elegant, when redoing the whole consist/unit/cab etc arrangement if( ( mvControlled->Battery ) || ( mvControlled->ConverterFlag ) ) { - if( ( false == mvControlled->PantFrontUp ) - && ( ggPantFrontButton.GetValue() >= 1.0 ) ) { - mvControlled->PantFront( true ); - } - if( ( false == mvControlled->PantRearUp ) - && ( ggPantRearButton.GetValue() >= 1.0 ) ) { - mvControlled->PantRear( true ); + if( ggPantAllDownButton.GetValue() == 0.0 ) { + // the 'lower all' button overrides state of switches, while active itself + if( ( false == mvControlled->PantFrontUp ) + && ( ggPantFrontButton.GetValue() >= 1.0 ) ) { + mvControlled->PantFront( true ); + } + if( ( false == mvControlled->PantRearUp ) + && ( ggPantRearButton.GetValue() >= 1.0 ) ) { + mvControlled->PantRear( true ); + } } } /* @@ -6309,6 +6333,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { + m_controlmapper.clear(); pyScreens.reset(this); pyScreens.setLookupPath(DynamicObject->asBaseDir); bool parse = false; @@ -7195,309 +7220,78 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co // otherwise // NOTE: this is temporary work-around for compiler else-if limit // TODO: refactor the cabin controls into some sensible structure -bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int const Cabindex) -{ +bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int const Cabindex) { - TGauge *gg; // roboczy wskaźnik na obiekt animujący gałkę - - /* sanity check - if( !DynamicObject->mdKabina ) { - WriteLog( "Cab not initialised!" ); - return false; - } - */ - // SEKCJA REGULATOROW - if (Label == "mainctrl:") - { - // nastawnik - ggMainCtrl.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "mainctrlact:") - { - // zabek pozycji aktualnej - ggMainCtrlAct.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "scndctrl:") - { - // bocznik - ggScndCtrl.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "dirkey:") - { - // klucz kierunku - ggDirKey.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "brakectrl:") - { - // hamulec zasadniczy - ggBrakeCtrl.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "localbrake:") - { - // hamulec pomocniczy - ggLocalBrake.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "manualbrake:") - { - // hamulec reczny - ggManualBrake.Load(Parser, DynamicObject->mdKabina); - } - // sekcja przelacznikow obrotowych - else if (Label == "brakeprofile_sw:") - { - // przelacznik tow/osob/posp - ggBrakeProfileCtrl.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "brakeprofileg_sw:") - { - // przelacznik tow/osob - ggBrakeProfileG.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "brakeprofiler_sw:") - { - // przelacznik osob/posp - ggBrakeProfileR.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "maxcurrent_sw:") - { - // przelacznik rozruchu - ggMaxCurrentCtrl.Load(Parser, DynamicObject->mdKabina); - } - // SEKCJA przyciskow sprezynujacych - else if (Label == "main_off_bt:") - { - // przycisk wylaczajacy (w EU07 wyl szybki czerwony) - ggMainOffButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "main_on_bt:") - { - // przycisk wlaczajacy (w EU07 wyl szybki zielony) - ggMainOnButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "security_reset_bt:") - { - // przycisk zbijajacy SHP/czuwak - ggSecurityResetButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "releaser_bt:") - { - // przycisk odluzniacza - ggReleaserButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "sand_bt:") - { - // przycisk piasecznicy - ggSandButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "antislip_bt:") - { - // przycisk antyposlizgowy - ggAntiSlipButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "horn_bt:") - { - // dzwignia syreny - ggHornButton.Load(Parser, DynamicObject->mdKabina); - } - else if( Label == "hornlow_bt:" ) { - // dzwignia syreny - ggHornLowButton.Load( Parser, DynamicObject->mdKabina ); - } - else if( Label == "hornhigh_bt:" ) { - // dzwignia syreny - ggHornHighButton.Load( Parser, DynamicObject->mdKabina ); - } - else if( Label == "fuse_bt:" ) - { - // bezp. nadmiarowy - ggFuseButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "converterfuse_bt:") - { - // hunter-261211: - // odblokowanie przekaznika nadm. przetw. i ogrz. - ggConverterFuseButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "stlinoff_bt:") - { - // st. liniowe - ggStLinOffButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "door_left_sw:") - { - // drzwi lewe - ggDoorLeftButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "door_right_sw:") - { - // drzwi prawe - ggDoorRightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "departure_signal_bt:") - { - // sygnal odjazdu - ggDepartureSignalButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "upperlight_sw:") - { - // swiatlo - ggUpperLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "leftlight_sw:") - { - // swiatlo - ggLeftLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "rightlight_sw:") - { - // swiatlo - ggRightLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if( Label == "dimheadlights_sw:" ) { - // swiatlo - ggDimHeadlightsButton.Load( Parser, DynamicObject->mdKabina ); - } - else if( Label == "leftend_sw:" ) - { - // swiatlo - ggLeftEndLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "rightend_sw:") - { - // swiatlo - ggRightEndLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "lights_sw:") - { - // swiatla wszystkie - ggLightsButton.Load(Parser, DynamicObject->mdKabina); - } - //--------------------- - // hunter-230112: przelaczniki swiatel tylnich - else if (Label == "rearupperlight_sw:") - { - // swiatlo - ggRearUpperLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "rearleftlight_sw:") - { - // swiatlo - ggRearLeftLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "rearrightlight_sw:") - { - // swiatlo - ggRearRightLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "rearleftend_sw:") - { - // swiatlo - ggRearLeftEndLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "rearrightend_sw:") - { - // swiatlo - ggRearRightEndLightButton.Load(Parser, DynamicObject->mdKabina); - } - //------------------ - else if (Label == "compressor_sw:") - { - // sprezarka - ggCompressorButton.Load(Parser, DynamicObject->mdKabina); - } - else if( Label == "compressorlocal_sw:" ) { - // sprezarka - ggCompressorLocalButton.Load( Parser, DynamicObject->mdKabina ); - } - else if (Label == "converter_sw:") - { - // przetwornica - ggConverterButton.Load(Parser, DynamicObject->mdKabina); - } - else if( Label == "converterlocal_sw:" ) { - // przetwornica - ggConverterLocalButton.Load( Parser, DynamicObject->mdKabina ); - } - else if (Label == "converteroff_sw:") - { - // przetwornica wyl - ggConverterOffButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "main_sw:") - { - // wyl szybki (ezt) - ggMainButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "radio_sw:") - { - // radio - ggRadioButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "pantfront_sw:") - { - // patyk przedni - ggPantFrontButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "pantrear_sw:") - { - // patyk tylny - ggPantRearButton.Load(Parser, DynamicObject->mdKabina); - } - else if( Label == "pantfrontoff_sw:" ) - { - // patyk przedni w dol - ggPantFrontButtonOff.Load(Parser, DynamicObject->mdKabina); - } - else if( Label == "pantrearoff_sw:" ) { - // rear pant down - ggPantRearButtonOff.Load( Parser, DynamicObject->mdKabina ); - } - else if( Label == "pantalloff_sw:" ) { - // both pantographs down - ggPantAllDownButton.Load(Parser, DynamicObject->mdKabina); - } - else if( Label == "pantselected_sw:" ) { - // operate selected pantograph(s) - ggPantSelectedButton.Load( Parser, DynamicObject->mdKabina ); - } - else if( Label == "pantselectedoff_sw:" ) { - // operate selected pantograph(s) - ggPantSelectedDownButton.Load( Parser, DynamicObject->mdKabina ); - } - else if (Label == "trainheating_sw:") { - // grzanie skladu - ggTrainHeatingButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "signalling_sw:") - { - // Sygnalizacja hamowania - ggSignallingButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "door_signalling_sw:") - { - // Sygnalizacja blokady drzwi - ggDoorSignallingButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "nextcurrent_sw:") - { - // prąd drugiego członu - ggNextCurrentButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "cablight_sw:") - { - // hunter-091012: swiatlo w kabinie - ggCabLightButton.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "cablightdim_sw:") - { - // hunter-091012: przyciemnienie swiatla w kabinie - ggCabLightDimButton.Load(Parser, DynamicObject->mdKabina); - } - else if( Label == "battery_sw:" ) { - - ggBatteryButton.Load( Parser, DynamicObject->mdKabina ); + TGauge *gg { nullptr }; // roboczy wskaźnik na obiekt animujący gałkę + std::unordered_map gauges = { + { "mainctrl:", ggMainCtrl }, + { "scndctrl:", ggScndCtrl }, + { "dirkey:" , ggDirKey }, + { "brakectrl:", ggBrakeCtrl }, + { "localbrake:", ggLocalBrake }, + { "manualbrake:", ggManualBrake }, + { "brakeprofile_sw:", ggBrakeProfileCtrl }, + { "brakeprofileg_sw:", ggBrakeProfileG }, + { "brakeprofiler_sw:", ggBrakeProfileR }, + { "maxcurrent_sw:", ggMaxCurrentCtrl }, + { "main_off_bt:", ggMainOffButton }, + { "main_on_bt:", ggMainOnButton }, + { "security_reset_bt:", ggSecurityResetButton }, + { "releaser_bt:", ggReleaserButton }, + { "sand_bt:", ggSandButton }, + { "antislip_bt:", ggAntiSlipButton }, + { "horn_bt:", ggHornButton }, + { "hornlow_bt:", ggHornLowButton }, + { "hornhigh_bt:", ggHornHighButton }, + { "fuse_bt:", ggFuseButton }, + { "converterfuse_bt:", ggConverterFuseButton }, + { "stlinoff_bt:", ggStLinOffButton }, + { "door_left_sw:", ggDoorLeftButton }, + { "door_right_sw:", ggDoorRightButton }, + { "departure_signal_bt:", ggDepartureSignalButton }, + { "upperlight_sw:", ggUpperLightButton }, + { "leftlight_sw:", ggLeftLightButton }, + { "rightlight_sw:", ggRightLightButton }, + { "dimheadlights_sw:", ggDimHeadlightsButton }, + { "leftend_sw:", ggLeftEndLightButton }, + { "rightend_sw:", ggRightEndLightButton }, + { "lights_sw:", ggLightsButton }, + { "rearupperlight_sw:", ggRearUpperLightButton }, + { "rearleftlight_sw:", ggRearLeftLightButton }, + { "rearrightlight_sw:", ggRearRightLightButton }, + { "rearleftend_sw:", ggRearLeftEndLightButton }, + { "rearrightend_sw:", ggRearRightEndLightButton }, + { "compressor_sw:", ggCompressorButton }, + { "compressorlocal_sw:", ggCompressorLocalButton }, + { "converter_sw:", ggConverterButton }, + { "converterlocal_sw:", ggConverterLocalButton }, + { "converteroff_sw:", ggConverterOffButton }, + { "main_sw:", ggMainButton }, + { "radio_sw:", ggRadioButton }, + { "pantfront_sw:", ggPantFrontButton }, + { "pantrear_sw:", ggPantRearButton }, + { "pantfrontoff_sw:", ggPantFrontButtonOff }, + { "pantrearoff_sw:", ggPantRearButtonOff }, + { "pantalloff_sw:", ggPantAllDownButton }, + { "pantselected_sw:", ggPantSelectedButton }, + { "pantselectedoff_sw:", ggPantSelectedDownButton }, + { "trainheating_sw:", ggTrainHeatingButton }, + { "signalling_sw:", ggSignallingButton }, + { "door_signalling_sw:", ggDoorSignallingButton }, + { "nextcurrent_sw:", ggNextCurrentButton }, + { "cablight_sw:", ggCabLightButton }, + { "cablightdim_sw:", ggCabLightDimButton }, + { "battery_sw:", ggBatteryButton } + }; + auto lookup = gauges.find( Label ); + if( lookup != gauges.end() ) { + lookup->second.Load( Parser, DynamicObject->mdKabina ); + m_controlmapper.insert( lookup->second, lookup->first ); } // ABu 090305: uniwersalne przyciski lub inne rzeczy + else if( Label == "mainctrlact:" ) { + ggMainCtrlAct.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); + } else if (Label == "universal1:") { ggUniversal1Button.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); diff --git a/Train.h b/Train.h index 2c70dc70..6daf8ac7 100644 --- a/Train.h +++ b/Train.h @@ -57,6 +57,18 @@ class TCab void Update(); }; +class control_mapper { + typedef std::unordered_map< TSubModel const *, std::string> submodelstring_map; + submodelstring_map m_controlnames; +public: + void + clear() { m_controlnames.clear(); } + void + insert( TGauge const &Gauge, std::string const &Label ); + std::string + find( TSubModel const *Control ) const; +}; + class TTrain { public: @@ -72,6 +84,7 @@ class TTrain inline vector3 GetDirection() { return DynamicObject->VectorFront(); }; inline vector3 GetUp() { return DynamicObject->VectorUp(); }; + inline std::string GetLabel( TSubModel const *Control ) const { return m_controlmapper.find( Control ); } void UpdateMechPosition(double dt); vector3 GetWorldMechPosition(); bool Update( double const Deltatime ); @@ -84,7 +97,7 @@ class TTrain private: // types - typedef void( *command_handler )( TTrain *Train, command_data const &Command ); + typedef void( *command_handler )( TTrain *Train, command_data const &Command ); typedef std::unordered_map commandhandler_map; // clears state of all cabin controls void clear_cab_controls(); @@ -184,8 +197,9 @@ class TTrain TMoverParameters *mvSecond; // drugi człon (ET40, ET41, ET42, ukrotnienia) TMoverParameters *mvThird; // trzeci człon (SN61) // helper variable, to prevent immediate switch between closing and opening line breaker circuit - int m_linebreakerstate{ 0 }; // -1: freshly open, 0: open, 1: closed, 2: freshly closed (and yes this is awful way to go about it) + int m_linebreakerstate { 0 }; // -1: freshly open, 0: open, 1: closed, 2: freshly closed (and yes this is awful way to go about it) static const commandhandler_map m_commandhandlers; + control_mapper m_controlmapper; public: // reszta może by?publiczna diff --git a/World.cpp b/World.cpp index 261e3308..c01d1264 100644 --- a/World.cpp +++ b/World.cpp @@ -180,6 +180,20 @@ simulation_time::julian_day() const { return JD; } +namespace locale { + +std::string +control( std::string const &Label ) { + + auto const lookup = m_controls.find( Label ); + return ( + lookup != m_controls.end() ? + lookup->second : + "" ); +} + +} + TWorld::TWorld() { // randomize(); @@ -1135,43 +1149,44 @@ void TWorld::Update_Camera( double const Deltatime ) { // Console::Update(); //tu jest zależne od FPS, co nie jest korzystne - if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_LEFT ) == GLFW_PRESS ) { - Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe - // if (!FreeFlyModeFlag) //jeśli wewnątrz - patrzymy do tyłu - // Camera.LookAt=Train->pMechPosition-Normalize(Train->GetDirection())*10; - if( Controlled ? LengthSquared3( Controlled->GetPosition() - Camera.Pos ) < 2250000 : - false ) // gdy bliżej niż 1.5km - Camera.LookAt = Controlled->GetPosition(); - else { - TDynamicObject *d = - Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m - if( !d ) - d = Ground.DynamicNearest( Camera.Pos, - 1000 ); // dalej szukanie, jesli bliżej nie ma - if( d && pDynamicNearest ) // jeśli jakiś jest znaleziony wcześniej - if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > - LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) - d = pDynamicNearest; // jeśli najbliższy nie jest 10 razy bliżej niż - // poprzedni najbliższy, zostaje poprzedni - if( d ) - pDynamicNearest = d; // zmiana na nowy, jeśli coś znaleziony niepusty - if( pDynamicNearest ) - Camera.LookAt = pDynamicNearest->GetPosition(); + if( false == Global::ControlPicking ) { + if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_LEFT ) == GLFW_PRESS ) { + Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe + // if (!FreeFlyModeFlag) //jeśli wewnątrz - patrzymy do tyłu + // Camera.LookAt=Train->pMechPosition-Normalize(Train->GetDirection())*10; + if( Controlled && LengthSquared3( Controlled->GetPosition() - Camera.Pos ) < ( 1500 * 1500 ) ) // gdy bliżej niż 1.5km + Camera.LookAt = Controlled->GetPosition(); + else { + TDynamicObject *d = + Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m + if( !d ) + d = Ground.DynamicNearest( Camera.Pos, + 1000 ); // dalej szukanie, jesli bliżej nie ma + if( d && pDynamicNearest ) // jeśli jakiś jest znaleziony wcześniej + if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > + LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) + d = pDynamicNearest; // jeśli najbliższy nie jest 10 razy bliżej niż + // poprzedni najbliższy, zostaje poprzedni + if( d ) + pDynamicNearest = d; // zmiana na nowy, jeśli coś znaleziony niepusty + if( pDynamicNearest ) + Camera.LookAt = pDynamicNearest->GetPosition(); + } + if( FreeFlyModeFlag ) + Camera.RaLook(); // jednorazowe przestawienie kamery + } + else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_RIGHT ) == GLFW_PRESS ) { //||Console::Pressed(VK_F4)) + FollowView( false ); // bez wyciszania dźwięków + } + else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_MIDDLE ) == GLFW_PRESS ) { + // middle mouse button controls zoom. + Global::ZoomFactor = std::min( 4.5f, Global::ZoomFactor + 15.0f * static_cast( Deltatime ) ); + } + else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_MIDDLE ) != GLFW_PRESS ) { + // reset zoom level if the button is no longer held down. + // NOTE: yes, this is terrible way to go about it. it'll do for now. + Global::ZoomFactor = std::max( 1.0f, Global::ZoomFactor - 15.0f * static_cast( Deltatime ) ); } - if( FreeFlyModeFlag ) - Camera.RaLook(); // jednorazowe przestawienie kamery - } - else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_RIGHT ) == GLFW_PRESS ) { //||Console::Pressed(VK_F4)) - FollowView( false ); // bez wyciszania dźwięków - } - else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_MIDDLE ) == GLFW_PRESS ) { - // middle mouse button controls zoom. - Global::ZoomFactor = std::min( 4.5f, Global::ZoomFactor + 15.0f * static_cast( Deltatime ) ); - } - else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_MIDDLE ) != GLFW_PRESS ) { - // reset zoom level if the button is no longer held down. - // NOTE: yes, this is terrible way to go about it. it'll do for now. - Global::ZoomFactor = std::max( 1.0f, Global::ZoomFactor - 15.0f * static_cast( Deltatime ) ); } Camera.Update(); // uwzględnienie ruchu wywołanego klawiszami @@ -1258,74 +1273,28 @@ void TWorld::ResourceSweep() */ }; -// rendering kabiny gdy jest oddzielnym modelem i ma byc wyswietlana -void -TWorld::Render_Cab() { - - if( Train == nullptr ) { - - TSubModel::iInstance = 0; - return; - } - - TDynamicObject *dynamic = Train->Dynamic(); - TSubModel::iInstance = reinterpret_cast( dynamic ); - - if( ( true == FreeFlyModeFlag ) - || ( false == dynamic->bDisplayCab ) - || ( dynamic->mdKabina == dynamic->mdModel ) ) { - // ABu: Rendering kabiny jako ostatniej, zeby bylo widac przez szyby, tylko w widoku ze srodka - return; - } -/* - glPushMatrix(); - vector3 pos = dynamic->GetPosition(); // wszpółrzędne pojazdu z kabiną - // glTranslatef(pos.x,pos.y,pos.z); //przesunięcie o wektor (tak było i trzęsło) - // aby pozbyć się choć trochę trzęsienia, trzeba by nie przeliczać kabiny do punktu - // zerowego scenerii - glLoadIdentity(); // zacząć od macierzy jedynkowej - Camera.SetCabMatrix( pos ); // widok z kamery po przesunięciu - glMultMatrixd( dynamic->mMatrix.getArray() ); // ta macierz nie ma przesunięcia -*/ - ::glPushMatrix(); - auto const originoffset = dynamic->GetPosition() - Global::pCameraPosition; - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - ::glMultMatrixd( dynamic->mMatrix.getArray() ); - - if( dynamic->mdKabina ) // bo mogła zniknąć przy przechodzeniu do innego pojazdu - { - // setup - if( dynamic->fShade > 0.0f ) { - // change light level based on light level of the occupied track - Global::DayLight.apply_intensity( dynamic->fShade ); - } - if( dynamic->InteriorLightLevel > 0.0f ) { - // crude way to light the cabin, until we have something more complete in place - auto const cablight = dynamic->InteriorLight * dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); - } - // render - GfxRenderer.Render( dynamic->mdKabina, dynamic->Material(), 0.0 ); - GfxRenderer.Render_Alpha( dynamic->mdKabina, dynamic->Material(), 0.0 ); - // post-render restore - if( dynamic->fShade > 0.0f ) { - // change light level based on light level of the occupied track - Global::DayLight.apply_intensity(); - } - if( dynamic->InteriorLightLevel > 0.0f ) { - // reset the overall ambient - GLfloat ambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, ambient ); - } - } - glPopMatrix(); -} - void TWorld::Update_UI() { UITable->text_lines.clear(); std::string uitextline1, uitextline2, uitextline3, uitextline4; + UILayer.set_tooltip( "" ); + + if( ( Train != nullptr ) && ( false == FreeFlyModeFlag ) ) { + if( false == DebugModeFlag ) { + // in regular mode show control functions, for defined controls + UILayer.set_tooltip( locale::control( Train->GetLabel( GfxRenderer.Pick_Control() ) ) ); + } + else { + // in debug mode show names of submodels, to help with cab setup and/or debugging + auto const cabcontrol = GfxRenderer.Pick_Control(); + UILayer.set_tooltip( ( cabcontrol ? cabcontrol->pName : "" ) ); + } + } + if( ( true == Global::ControlPicking ) && ( true == FreeFlyModeFlag ) && ( true == DebugModeFlag ) ) { + auto const scenerynode = GfxRenderer.Pick_Node(); + UILayer.set_tooltip( ( scenerynode ? scenerynode->asName : "" ) ); + } switch( Global::iTextMode ) { @@ -2338,9 +2307,6 @@ world_environment::update() { Global::FogColor[ 0 ] = skydomecolour.x; Global::FogColor[ 1 ] = skydomecolour.y; Global::FogColor[ 2 ] = skydomecolour.z; - ::glFogfv( GL_FOG_COLOR, Global::FogColor ); // kolor mgły - - ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 1.0f ); // kolor nieba } void diff --git a/World.h b/World.h index 36ae1b76..67d8d2bb 100644 --- a/World.h +++ b/World.h @@ -60,6 +60,74 @@ extern simulation_time Time; } +namespace locale { + +std::string + control( std::string const &Label ); + +static std::unordered_map m_controls = { + { "mainctrl:", "master controller" }, + { "scndctrl:", "second controller" }, + { "dirkey:" , "reverser" }, + { "brakectrl:", "train brake" }, + { "localbrake:", "independent brake" }, + { "manualbrake:", "manual brake" }, + { "brakeprofile_sw:", "brake acting speed" }, + { "brakeprofileg_sw:", "brake acting speed: cargo" }, + { "brakeprofiler_sw:", "brake acting speed: rapid" }, + { "maxcurrent_sw:", "motor overload relay threshold" }, + { "main_off_bt:", "line breaker" }, + { "main_on_bt:", "line breaker" }, + { "security_reset_bt:", "alerter" }, + { "releaser_bt:", "independent brake releaser" }, + { "sand_bt:", "sandbox" }, + { "antislip_bt:", "wheelspin brake" }, + { "horn_bt:", "horn" }, + { "hornlow_bt:", "low tone horn" }, + { "hornhigh_bt:", "high tone horn" }, + { "fuse_bt:", "motor overload relay reset" }, + { "converterfuse_bt:", "converter overload relay reset" }, + { "stlinoff_bt:", "motor connectors" }, + { "door_left_sw:", "left door" }, + { "door_right_sw:", "right door" }, + { "departure_signal_bt:", "departure signal" }, + { "upperlight_sw:", "upper headlight" }, + { "leftlight_sw:", "left headlight" }, + { "rightlight_sw:", "right headlight" }, + { "dimheadlights_sw:", "headlights dimmer" }, + { "leftend_sw:", "left marker light" }, + { "rightend_sw:", "right marker light" }, + { "lights_sw:", "light pattern" }, + { "rearupperlight_sw:", "rear upper headlight" }, + { "rearleftlight_sw:", "rear left headlight" }, + { "rearrightlight_sw:", "rear right headlight" }, + { "rearleftend_sw:", "rear left marker light" }, + { "rearrightend_sw:", "rear right marker light" }, + { "compressor_sw:", "compressor" }, + { "compressorlocal_sw:", "local compressor" }, + { "converter_sw:", "converter" }, + { "converterlocal_sw:", "local converter" }, + { "converteroff_sw:", "converter" }, + { "main_sw:", "line breaker" }, + { "radio_sw:", "radio" }, + { "pantfront_sw:", "front pantograph" }, + { "pantrear_sw:", "rear pantograph" }, + { "pantfrontoff_sw:", "front pantograph" }, + { "pantrearoff_sw:", "rear pantograph" }, + { "pantalloff_sw:", "all pantographs" }, + { "pantselected_sw:", "selected pantograph" }, + { "pantselectedoff_sw:", "selected pantograph" }, + { "trainheating_sw:", "heating" }, + { "signalling_sw:", "braking indicator" }, + { "door_signalling_sw:", "door locking" }, + { "nextcurrent_sw:", "current indicator source" }, + { "cablight_sw:", "interior light" }, + { "cablightdim_sw:", "interior light dimmer" }, + { "battery_sw:", "battery" } +}; + +} + // wrapper for environment elements -- sky, sun, stars, clouds etc class world_environment { @@ -106,6 +174,8 @@ TWorld(); void OnCommandGet(DaneRozkaz *pRozkaz); bool Update(); void TrainDelete(TDynamicObject *d = NULL); + TTrain const * + train() const { return Train; } // switches between static and dynamic daylight calculation void ToggleDaylight(); @@ -114,7 +184,6 @@ private: void Update_Camera( const double Deltatime ); void Update_UI(); void ResourceSweep(); - void Render_Cab(); TCamera Camera; TGround Ground; diff --git a/command.h b/command.h index 35649d9e..5d688827 100644 --- a/command.h +++ b/command.h @@ -120,10 +120,11 @@ const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; */ - batterytoggle + batterytoggle, /* const int k_WalkMode = 73; */ + none = -1 }; enum class command_target { diff --git a/dumb3d.h b/dumb3d.h index 66e7fda3..74c4c312 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -64,18 +64,16 @@ class vector3 public: vector3(void) : x(0.0), y(0.0), z(0.0) - { - } - vector3(scalar_t a, scalar_t b, scalar_t c) - { - x = a; - y = b; - z = c; - } + {} + vector3( scalar_t X, scalar_t Y, scalar_t Z ) : + x( X ), y( Y ), z( Z ) + {} vector3( glm::dvec3 const &Vector ) : x( Vector.x ), y( Vector.y ), z( Vector.z ) {} - + template + operator glm::tvec3() const { + return glm::tvec3{ x, y, z }; } // The int parameter is the number of elements to copy from initArray (3 or 4) // explicit vector3(scalar_t* initArray, int arraySize = 3) // { for (int i = 0;iGetLabel( GfxRenderer.Update_Pick_Control() ) ); + if( lookup != m_mousecommands.end() ) { + mousecommand = ( + Button == GLFW_MOUSE_BUTTON_LEFT ? + lookup->second.left : + lookup->second.right + ); + if( mousecommand != user_command::none ) { + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( mousecommand, 0, 0, Action, 0 ); + m_updateaccumulator = 0.0; // prevent potential command repeat right after issuing one + } + } + } + } +} + +void +keyboard_input::poll() { + + m_updateaccumulator += Timer::GetDeltaRenderTime(); + + if( m_updateaccumulator < 0.2 ) { + // too early for any work + return; + } + m_updateaccumulator -= 0.2; + + if( m_mousecommandleft != user_command::none ) { + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( m_mousecommandleft, 0, 0, GLFW_REPEAT, 0 ); + } + if( m_mousecommandright != user_command::none ) { + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( m_mousecommandright, 0, 0, GLFW_REPEAT, 0 ); + } +} + void keyboard_input::default_bindings() { @@ -366,6 +445,183 @@ const int k_WalkMode = 73; }; bind(); + + m_mousecommands = { + { "mainctrl:", { + user_command::mastercontrollerincrease, + user_command::mastercontrollerdecrease } }, + { "scndctrl:", { + user_command::secondcontrollerincrease, + user_command::secondcontrollerdecrease } }, + { "dirkey:", { + user_command::reverserincrease, + user_command::reverserdecrease } }, + { "brakectrl:", { + user_command::trainbrakedecrease, + user_command::trainbrakeincrease } }, + { "localbrake:", { + user_command::independentbrakedecrease, + user_command::independentbrakeincrease } }, + { "manualbrake:", { + user_command::none, + user_command::none } }, + { "brakeprofile_sw:", { + user_command::brakeactingspeedincrease, + user_command::brakeactingspeeddecrease } }, + { "brakeprofileg_sw:", { + user_command::brakeactingspeeddecrease, + user_command::none } }, + { "brakeprofiler_sw:", { + user_command::brakeactingspeedincrease, + user_command::none } }, + { "maxcurrent_sw:", { + user_command::motoroverloadrelaythresholdtoggle, + user_command::none } }, + { "main_off_bt:", { + user_command::linebreakertoggle, + user_command::none } }, + { "main_on_bt:",{ + user_command::linebreakertoggle, + user_command::none } }, // TODO: dedicated on and off line breaker commands + { "security_reset_bt:", { + user_command::alerteracknowledge, + user_command::none } }, + { "releaser_bt:", { + user_command::independentbrakebailoff, + user_command::none } }, + { "sand_bt:", { + user_command::sandboxactivate, + user_command::none } }, + { "antislip_bt:", { + user_command::wheelspinbrakeactivate, + user_command::none } }, + { "horn_bt:", { + user_command::hornhighactivate, + user_command::hornlowactivate } }, + { "hornlow_bt:", { + user_command::hornlowactivate, + user_command::none } }, + { "hornhigh_bt:", { + user_command::hornhighactivate, + user_command::none } }, + { "fuse_bt:", { + user_command::motoroverloadrelayreset, + user_command::none } }, + { "converterfuse_bt:", { + user_command::converteroverloadrelayreset, + user_command::none } }, + { "stlinoff_bt:", { + user_command::motorconnectorsopen, + user_command::none } }, + { "door_left_sw:", { + user_command::doortoggleleft, + user_command::none } }, + { "door_right_sw:", { + user_command::doortoggleright, + user_command::none } }, + { "departure_signal_bt:", { + user_command::departureannounce, + user_command::none } }, + { "upperlight_sw:", { + user_command::headlighttoggleupper, + user_command::none } }, + { "leftlight_sw:", { + user_command::headlighttoggleleft, + user_command::none } }, + { "rightlight_sw:", { + user_command::headlighttoggleright, + user_command::none } }, + { "dimheadlights_sw:", { + user_command::headlightsdimtoggle, + user_command::none } }, + { "leftend_sw:", { + user_command::redmarkertoggleleft, + user_command::none } }, + { "rightend_sw:", { + user_command::redmarkertoggleright, + user_command::none } }, + { "lights_sw:", { + user_command::none, + user_command::none } }, // TODO: implement commands for lights controller + { "rearupperlight_sw:", { + user_command::headlighttogglerearupper, + user_command::none } }, + { "rearleftlight_sw:", { + user_command::headlighttogglerearleft, + user_command::none } }, + { "rearrightlight_sw:", { + user_command::headlighttogglerearright, + user_command::none } }, + { "rearleftend_sw:", { + user_command::redmarkertogglerearleft, + user_command::none } }, + { "rearrightend_sw:", { + user_command::redmarkertogglerearright, + user_command::none } }, + { "compressor_sw:", { + user_command::compressortoggle, + user_command::none } }, + { "compressorlocal_sw:", { + user_command::compressortogglelocal, + user_command::none } }, + { "converter_sw:", { + user_command::convertertoggle, + user_command::none } }, + { "converterlocal_sw:", { + user_command::convertertogglelocal, + user_command::none } }, + { "converteroff_sw:", { + user_command::convertertoggle, + user_command::none } }, // TODO: dedicated converter shutdown command + { "main_sw:", { + user_command::linebreakertoggle, + user_command::none } }, + { "radio_sw:", { + user_command::radiotoggle, + user_command::none } }, + { "pantfront_sw:", { + user_command::pantographtogglefront, + user_command::none } }, + { "pantrear_sw:", { + user_command::pantographtogglerear, + user_command::none } }, + { "pantfrontoff_sw:", { + user_command::pantographtogglefront, + user_command::none } }, // TODO: dedicated lower pantograph commands + { "pantrearoff_sw:", { + user_command::pantographtogglerear, + user_command::none } }, // TODO: dedicated lower pantograph commands + { "pantalloff_sw:", { + user_command::pantographlowerall, + user_command::none } }, + { "pantselected_sw:", { + user_command::none, + user_command::none } }, // TODO: selected pantograph(s) operation command + { "pantselectedoff_sw:", { + user_command::none, + user_command::none } }, // TODO: lower selected pantograp(s) command + { "trainheating_sw:", { + user_command::heatingtoggle, + user_command::none } }, + { "signalling_sw:", { + user_command::mubrakingindicatortoggle, + user_command::none } }, + { "door_signalling_sw:", { + user_command::doorlocktoggle, + user_command::none } }, + { "nextcurrent_sw:", { + user_command::mucurrentindicatorothersourceactivate, + user_command::none } }, + { "cablight_sw:", { + user_command::interiorlighttoggle, + user_command::none } }, + { "cablightdim_sw:", { + user_command::interiorlightdimtoggle, + user_command::none } }, + { "battery_sw:", { + user_command::batterytoggle, + user_command::none } } + }; } void diff --git a/keyboardinput.h b/keyboardinput.h index 65a4546c..dd15b2c1 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -28,6 +28,10 @@ public: key( int const Key, int const Action ); void mouse( double const Mousex, double const Mousey ); + void + mouse( int const Button, int const Action ); + void + poll(); private: // types @@ -45,6 +49,18 @@ private: typedef std::vector commandsetup_sequence; typedef std::unordered_map usercommand_map; + struct mouse_commands { + + user_command left; + user_command right; + + mouse_commands( user_command const Left, user_command const Right ): + left(Left), right(Right) + {} + }; + + typedef std::unordered_map controlcommands_map; + struct bindings_cache { int forward{ -1 }; @@ -66,9 +82,13 @@ private: // members commandsetup_sequence m_commands; usercommand_map m_bindings; + controlcommands_map m_mousecommands; + user_command m_mousecommandleft { user_command::none }; // last if any command issued with mouse + user_command m_mousecommandright { user_command::none }; command_relay m_relay; bool m_shift{ false }; bool m_ctrl{ false }; + double m_updateaccumulator { 0.0 }; bindings_cache m_bindingscache; std::array m_keys; }; diff --git a/renderer.cpp b/renderer.cpp index 32c4272d..bde34e81 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "timer.h" #include "world.h" +#include "train.h" #include "data.h" #include "dynobj.h" #include "animmodel.h" @@ -118,6 +119,42 @@ opengl_renderer::Init( GLFWwindow *Window ) { m_lights.emplace_back( light ); } +#ifdef EU07_USE_PICKING_FRAMEBUFFER + if( true == m_framebuffersupport ) { + // try to create the pick buffer. RGBA8 2D texture, 24 bit depth texture, 1024x512 + int const width { 1024 }; + int const height { 512 }; + // texture + ::glGenTextures( 1, &m_picktexture ); + ::glBindTexture( GL_TEXTURE_2D, m_picktexture ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); + // depth buffer + ::glGenRenderbuffersEXT( 1, &m_pickdepthbuffer ); + ::glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, m_pickdepthbuffer ); + ::glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, width, height ); + // create and set up the framebuffer + ::glGenFramebuffersEXT( 1, &m_pickframebuffer ); + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_pickframebuffer ); + ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_picktexture, 0 ); + ::glFramebufferRenderbufferEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_pickdepthbuffer ); + //------------------------- + //Does the GPU support current FBO configuration? + GLenum status = ::glCheckFramebufferStatusEXT( GL_FRAMEBUFFER_EXT ); + if( status == GL_FRAMEBUFFER_COMPLETE_EXT ) { + WriteLog( "Picking framebuffer setup complete" ); + } + else{ + ErrorLog( "Picking framebuffer setup failed" ); + m_framebuffersupport = false; + } + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now + } +#endif + ::glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); // preload some common textures WriteLog( "Loading common gfx data..." ); m_glaretexture = GetTextureId( "fx\\lightglare", szTexturePath ); @@ -136,8 +173,8 @@ opengl_renderer::Init( GLFWwindow *Window ) { geometrybank, GL_TRIANGLE_STRIP ); // prepare debug mode objects - m_quadric = gluNewQuadric(); - gluQuadricNormals( m_quadric, GLU_FLAT ); + m_quadric = ::gluNewQuadric(); + ::gluQuadricNormals( m_quadric, GLU_FLAT ); return true; } @@ -145,54 +182,252 @@ opengl_renderer::Init( GLFWwindow *Window ) { bool opengl_renderer::Render() { - auto timestart = std::chrono::steady_clock::now(); + auto const drawstart = std::chrono::steady_clock::now(); - ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - ::glDepthFunc( GL_LEQUAL ); + Render_pass( rendermode::color ); + glfwSwapBuffers( m_window ); - ::glMatrixMode( GL_PROJECTION ); // select the Projection Matrix - ::gluPerspective( - Global::FieldOfView / Global::ZoomFactor, - std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), - 0.1f * Global::ZoomFactor, - m_drawrange * Global::fDistanceFactor ); + m_drawcount = m_renderpass.draw_queue.size(); + // accumulate last 20 frames worth of render time (cap at 1000 fps to prevent calculations going awry) + m_drawtime = std::max( 20.0f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - drawstart ) ).count() ); + + return true; // for now always succeed +} + +// runs jobs needed to generate graphics for specified render pass +void +opengl_renderer::Render_pass( rendermode const Mode ) { + + m_renderpass.draw_mode = Mode; + switch( m_renderpass.draw_mode ) { + + case rendermode::color: { + + // TODO: run shadowmap pass before color + +// ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); + auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); + ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 0.0f ); // kolor nieba + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + + if( World.InitPerformed() ) { + // setup + m_renderpass.draw_range = 2500.0f; // arbitrary base draw range + Render_projection(); + Render_camera(); + ::glDepthFunc( GL_LEQUAL ); + // render + Render_setup( true ); + Render( &World.Environment ); + // opaque parts... + Render_setup(); + Render( &World.Ground ); + // ...translucent parts + Render_setup( true ); + Render_Alpha( &World.Ground ); + // cab render is done in translucent phase to deal with badly configured vehicles + if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } + } + UILayer.render(); + break; + } + + case rendermode::pickcontrols: { + +// ::glViewport( 0, 0, 1024, 512 ); + ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + + if( World.InitPerformed() ) { + // setup + m_pickcontrolsitems.clear(); + m_renderpass.draw_range = 50.0f; // doesn't really matter for control picking + Render_projection(); + Render_camera(); + ::glDepthFunc( GL_LEQUAL ); + // render + // opaque parts... + Render_setup(); + // cab render skips translucent parts, so we can do it here + if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } + } + // post-render cleanup + break; + } + + case rendermode::pickscenery: { + +// ::glViewport( 0, 0, 1024, 512 ); + ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + + if( World.InitPerformed() ) { + // setup + m_picksceneryitems.clear(); + m_renderpass.draw_range = 1000.0f; // scenery picking is likely to focus on nearby nodes + Render_projection(); + Render_camera(); + ::glDepthFunc( GL_LEQUAL ); + // render + // opaque parts... + Render_setup(); + Render( &World.Ground ); + } + break; + } + + default: { + break; + } + } + +} + +// configures projection matrix for the current render pass +void +opengl_renderer::Render_projection() { + + ::glMatrixMode( GL_PROJECTION ); + ::glLoadIdentity(); + + switch( m_renderpass.draw_mode ) { + + case rendermode::color: + case rendermode::pickcontrols: + case rendermode::pickscenery: { + ::gluPerspective( + Global::FieldOfView / Global::ZoomFactor, + std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), + 0.1f * Global::ZoomFactor, + m_renderpass.draw_range * Global::fDistanceFactor ); + break; + } +/* + // version for the smaller pickbuffer. ultimately scratched because resolution isn't comfortable/reliable enough for the user + case rendermode::pickcontrols: + case rendermode::pickscenery: { + // TODO: render to buffer and scissor test for pick modes + ::gluPerspective( + Global::FieldOfView / Global::ZoomFactor, + std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ) / ( Global::ScreenWidth / 1024.0f ), + 0.1f * Global::ZoomFactor, + m_renderpass.draw_range * Global::fDistanceFactor ); + break; + } +*/ + case rendermode::shadows: { + // TODO: set parallel projection + break; + } + + default: { + break; + } + } +} + +// configures modelview matrix for the current render pass +void +opengl_renderer::Render_camera() { ::glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix ::glLoadIdentity(); - if( World.InitPerformed() ) { + glm::dmat4 viewmatrix; - glm::dmat4 viewmatrix; - // camera view - World.Camera.SetMatrix( viewmatrix ); - m_camera.position() = glm::make_vec3( Global::pCameraPosition.getArray() ); -/* - // light view - m_camera.position() = glm::make_vec3( Global::pCameraPosition.getArray() ) - glm::dvec3( Global::DayLight.direction * 750.0f ); - m_camera.position().y = std::max( 50.0, m_camera.position().y ); // prevent shadow source from dipping too low - viewmatrix = glm::lookAt( - m_camera.position(), - glm::dvec3( Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z ), - glm::dvec3( 0.0f, 1.0f, 0.0f ) ); -*/ - m_camera.update_frustum( OpenGLMatrices.data( GL_PROJECTION ), viewmatrix ); - // frustum tests are performed in 'world space' but after we set up frustum we no longer need camera translation, only rotation - ::glMultMatrixd( glm::value_ptr( glm::dmat4( glm::dmat3( viewmatrix )))); - - Render( &World.Environment ); - Render( &World.Ground ); - - World.Render_Cab(); - - // accumulate last 20 frames worth of render time (cap at 1000 fps to prevent calculations going awry) - m_drawtime = std::max( 20.0f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - timestart ) ).count()); - m_drawcount = m_drawqueue.size(); + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::pickcontrols: + case rendermode::pickscenery: { + World.Camera.SetMatrix( viewmatrix ); + m_renderpass.camera.position() = Global::pCameraPosition; + break; + } + case rendermode::shadows: { + m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * 750.0f }; + m_renderpass.camera.position().y = std::max( 50.0, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low + viewmatrix = glm::lookAt( + m_renderpass.camera.position(), + glm::dvec3{ Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z }, + glm::dvec3{ 0.0f, 1.0f, 0.0f } ); + break; + } + default: { + break; } } - UILayer.render(); + m_renderpass.camera.update_frustum( OpenGLMatrices.data( GL_PROJECTION ), viewmatrix ); + // frustum tests are performed in 'world space' but after we set up frustum we no longer need camera translation, only rotation + ::glMultMatrixd( glm::value_ptr( glm::dmat4( glm::dmat3( viewmatrix ) ) ) ); +} - glfwSwapBuffers( m_window ); - return true; // for now always succeed +void +opengl_renderer::Render_setup( bool const Alpha ) { + + if( true == Alpha ) { + + ::glEnable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.04f ); + } + else { + ::glDisable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.50f ); + } + + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + ::glEnable( GL_LIGHTING ); + ::glShadeModel( GL_SMOOTH ); + // setup fog + if( Global::fFogEnd > 0 ) { + // fog setup + ::glFogfv( GL_FOG_COLOR, Global::FogColor ); + ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / Global::fFogEnd ) ); + ::glEnable( GL_FOG ); + } + else { ::glDisable( GL_FOG ); } + + if( m_texenvmode != m_renderpass.draw_mode ) { + // texture colour and alpha + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); +/* + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA ); +*/ + m_texenvmode = m_renderpass.draw_mode; + } + break; + } + case rendermode::shadows: + case rendermode::pickcontrols: + case rendermode::pickscenery: { + ::glDisable( GL_FOG ); + ::glDisable( GL_LIGHTING ); + ::glShadeModel( GL_FLAT ); + + if( m_texenvmode != m_renderpass.draw_mode ) { + // solid colour with texture alpha + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR ); // or GL_PREVIOUS + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); +/* + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA ); +*/ + m_texenvmode = m_renderpass.draw_mode; + } + break; + } + default: { + break; + } + } } bool @@ -209,14 +444,6 @@ opengl_renderer::Render( world_environment *Environment ) { ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); ::glPushMatrix(); - // setup fog - if( Global::fFogEnd > 0 ) { - // fog setup - ::glFogfv( GL_FOG_COLOR, Global::FogColor ); - ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / Global::fFogEnd ) ); - ::glEnable( GL_FOG ); - } - else { ::glDisable( GL_FOG ); } Environment->m_skydome.Render(); if( true == Global::bUseVBO ) { @@ -381,65 +608,96 @@ opengl_renderer::Texture( texture_handle const Texture ) { bool opengl_renderer::Render( TGround *Ground ) { - ::glEnable( GL_LIGHTING ); - ::glDisable( GL_BLEND ); - ::glAlphaFunc( GL_GREATER, 0.50f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - ::glColor3f( 1.0f, 1.0f, 1.0f ); - ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) - Update_Lights( Ground->m_lights ); + m_renderpass.draw_queue.clear(); - m_drawqueue.clear(); - - // rednerowanie globalnych (nie za często?) - for( TGroundNode *node = Ground->srGlobal.nRenderHidden; node; node = node->nNext3 ) { - node->RenderHidden(); - } - - glm::vec3 const cameraposition { m_camera.position() }; - int const camerax = static_cast( std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2 ); - int const cameraz = static_cast( std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2 ); - int const segmentcount = 2 * static_cast(std::ceil( m_drawrange * Global::fDistanceFactor / 1000.0f )); - int const originx = std::max( 0, camerax - segmentcount / 2 ); - int const originz = std::max( 0, cameraz - segmentcount / 2 ); - - for( int column = originx; column <= originx + segmentcount; ++column ) { - for( int row = originz; row <= originz + segmentcount; ++row ) { - - auto *cell = &Ground->Rects[ column ][ row ]; - - for( int subcellcolumn = 0; subcellcolumn < iNumSubRects; ++subcellcolumn ) { - for( int subcellrow = 0; subcellrow < iNumSubRects; ++subcellrow ) { - auto subcell = cell->FastGetSubRect( subcellcolumn, subcellrow ); - if( subcell == nullptr ) { continue; } - // renderowanie obiektów aktywnych a niewidocznych - for( auto node = subcell->nRenderHidden; node; node = node->nNext3 ) { - node->RenderHidden(); - } - // jeszcze dźwięki pojazdów by się przydały, również niewidocznych - subcell->RenderSounds(); - } - } - - if( m_camera.visible( cell->m_area ) ) { - Render( cell ); + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + // rednerowanie globalnych (nie za często?) + for( TGroundNode *node = Ground->srGlobal.nRenderHidden; node; node = node->nNext3 ) { + node->RenderHidden(); } + break; + } + default: { + break; } } - // draw queue was filled while rendering content of ground cells. now sort the nodes based on their distance to viewer... - std::sort( - std::begin( m_drawqueue ), - std::end( m_drawqueue ), - []( distancesubcell_pair const &Left, distancesubcell_pair const &Right ) { - return ( Left.first ) < ( Right.first ); } ); - // ...then render the opaque content of the visible subcells. - for( auto subcellpair : m_drawqueue ) { - Render( subcellpair.second ); + glm::vec3 const cameraposition { m_renderpass.camera.position() }; + int const camerax = static_cast( std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2 ); + int const cameraz = static_cast( std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2 ); + int const segmentcount = 2 * static_cast(std::ceil( m_renderpass.draw_range * Global::fDistanceFactor / 1000.0f )); + int const originx = std::max( 0, camerax - segmentcount / 2 ); + int const originz = std::max( 0, cameraz - segmentcount / 2 ); + + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + + Update_Lights( Ground->m_lights ); + + for( int column = originx; column <= originx + segmentcount; ++column ) { + for( int row = originz; row <= originz + segmentcount; ++row ) { + + auto *cell = &Ground->Rects[ column ][ row ]; + + for( int subcellcolumn = 0; subcellcolumn < iNumSubRects; ++subcellcolumn ) { + for( int subcellrow = 0; subcellrow < iNumSubRects; ++subcellrow ) { + auto subcell = cell->FastGetSubRect( subcellcolumn, subcellrow ); + if( subcell == nullptr ) { continue; } + // renderowanie obiektów aktywnych a niewidocznych + for( auto node = subcell->nRenderHidden; node; node = node->nNext3 ) { + node->RenderHidden(); + } + // jeszcze dźwięki pojazdów by się przydały, również niewidocznych + subcell->RenderSounds(); + } + } + + if( m_renderpass.camera.visible( cell->m_area ) ) { + Render( cell ); + } + } + } + // draw queue was filled while rendering content of ground cells. now sort the nodes based on their distance to viewer... + std::sort( + std::begin( m_renderpass.draw_queue ), + std::end( m_renderpass.draw_queue ), + []( distancesubcell_pair const &Left, distancesubcell_pair const &Right ) { + return ( Left.first ) < ( Right.first ); } ); + // ...then render the opaque content of the visible subcells. + for( auto subcellpair : m_renderpass.draw_queue ) { + Render( subcellpair.second ); + } + break; + } + case rendermode::shadows: + case rendermode::pickscenery: { + // these render modes don't bother with anything non-visual, or lights + for( int column = originx; column <= originx + segmentcount; ++column ) { + for( int row = originz; row <= originz + segmentcount; ++row ) { + + auto *cell = &Ground->Rects[ column ][ row ]; + if( m_renderpass.camera.visible( cell->m_area ) ) { + Render( cell ); + } + } + } + // they can also skip queue sorting, as they only deal with opaque geometry + // NOTE: there's benefit from rendering front-to-back, but is it significant enough? TODO: investigate + for( auto subcellpair : m_renderpass.draw_queue ) { + Render( subcellpair.second ); + } + break; + } + case rendermode::pickcontrols: + default: { + break; + } } - // now hand the control over to the renderer of translucent parts, it'll do the rest - return Render_Alpha( Ground ); + + return true; } bool @@ -451,6 +709,19 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { // tylko jezeli dany kwadrat nie był jeszcze renderowany Groundcell->LoadNodes(); // ewentualne tworzenie siatek + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // non-interactive scenery elements get neutral colour + ::glColor3fv( glm::value_ptr( colors::none ) ); + break; + } + case rendermode::shadows: + case rendermode::color: + case rendermode::pickcontrols: + default: { + break; + } + } if( Groundcell->nRenderRect != nullptr ) { // nieprzezroczyste trójkąty kwadratu kilometrowego for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { @@ -470,8 +741,8 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { auto subcell = Groundcell->pSubRects + subcellindex; if( subcell->iNodeCount ) { // o ile są jakieś obiekty, bo po co puste sektory przelatywać - m_drawqueue.emplace_back( - glm::length2( m_camera.position() - glm::dvec3( subcell->m_area.center ) ), + m_renderpass.draw_queue.emplace_back( + glm::length2( m_renderpass.camera.position() - glm::dvec3( subcell->m_area.center ) ), subcell ); } } @@ -489,43 +760,90 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { Groundsubcell->RaAnimate(); // przeliczenia animacji torów w sektorze TGroundNode *node; - // nieprzezroczyste obiekty terenu - for( node = Groundsubcell->nRenderRect; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - // nieprzezroczyste obiekty (oprócz pojazdów) - for( node = Groundsubcell->nRender; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - // nieprzezroczyste z mieszanych modeli - for( node = Groundsubcell->nRenderMixed; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - // nieprzezroczyste fragmenty pojazdów na torach - for( int j = 0; j < Groundsubcell->iTracks; ++j ) { - Groundsubcell->tTracks[ j ]->RenderDyn(); - } + + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::shadows: { + // nieprzezroczyste obiekty terenu + for( node = Groundsubcell->nRenderRect; node != nullptr; node = node->nNext3 ) { + Render( node ); + } + // nieprzezroczyste obiekty (oprócz pojazdów) + for( node = Groundsubcell->nRender; node != nullptr; node = node->nNext3 ) { + Render( node ); + } + // nieprzezroczyste z mieszanych modeli + for( node = Groundsubcell->nRenderMixed; node != nullptr; node = node->nNext3 ) { + Render( node ); + } + // nieprzezroczyste fragmenty pojazdów na torach + for( int trackidx = 0; trackidx < Groundsubcell->iTracks; ++trackidx ) { + for( auto dynamic : Groundsubcell->tTracks[ trackidx ]->Dynamics ) { + Render( dynamic ); + } + } #ifdef EU07_SCENERY_EDITOR - // memcells - if( DebugModeFlag ) { - for( auto const memcell : m_memcells ) { - memcell->RenderDL(); + // memcells + if( EditorModeFlag ) { + for( auto const memcell : m_memcells ) { + Render( memcell ); + } + } +#endif + break; + } + case rendermode::pickscenery: { + // same procedure like with regular render, but each node receives custom colour used for picking + // nieprzezroczyste obiekty terenu + for( node = Groundsubcell->nRenderRect; node != nullptr; node = node->nNext3 ) { + ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); + Render( node ); + } + // nieprzezroczyste obiekty (oprócz pojazdów) + for( node = Groundsubcell->nRender; node != nullptr; node = node->nNext3 ) { + ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); + Render( node ); + } + // nieprzezroczyste z mieszanych modeli + for( node = Groundsubcell->nRenderMixed; node != nullptr; node = node->nNext3 ) { + ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); + Render( node ); + } + // nieprzezroczyste fragmenty pojazdów na torach + for( int trackidx = 0; trackidx < Groundsubcell->iTracks; ++trackidx ) { + for( auto dynamic : Groundsubcell->tTracks[ trackidx ]->Dynamics ) { + ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); + Render( dynamic ); + } + } +#ifdef EU07_SCENERY_EDITOR + // memcells + if( EditorModeFlag ) { + for( auto const memcell : m_memcells ) { + ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); + Render( memcell ); + } + } +#endif + break; + } + case rendermode::pickcontrols: + default: { + break; } } -#endif + return true; } bool opengl_renderer::Render( TGroundNode *Node ) { -/* - Node->SetLastUsage( Timer::GetSimulationTime() ); -*/ + switch (Node->iType) { // obiekty renderowane niezależnie od odległości case TP_SUBMODEL: ::glPushMatrix(); - auto const originoffset = Node->pCenter - m_camera.position(); + auto const originoffset = Node->pCenter - m_renderpass.camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); TSubModel::fSquareDist = 0; Render( Node->smTerrain ); @@ -533,7 +851,7 @@ opengl_renderer::Render( TGroundNode *Node ) { return true; } - double const distancesquared = SquareMagnitude( ( Node->pCenter - m_camera.position() ) / Global::ZoomFactor ); + double const distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ); if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { return false; @@ -544,8 +862,18 @@ opengl_renderer::Render( TGroundNode *Node ) { case TP_TRACK: { // setup ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_camera.position(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } // render Render( Node->pTrack ); // post-render cleanup @@ -554,7 +882,17 @@ opengl_renderer::Render( TGroundNode *Node ) { } case TP_MODEL: { - Node->Model->Render( Node->pCenter - m_camera.position() ); + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } + Node->Model->Render( Node->pCenter - m_renderpass.camera.position() ); return true; } @@ -570,11 +908,23 @@ opengl_renderer::Render( TGroundNode *Node ) { / std::max( 0.5 * Node->m_radius + 1.0, distance - ( 0.5 * Node->m_radius ) ); - ::glColor4fv( - glm::value_ptr( - glm::vec4( - Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla - 1.0 ) ) ); // if the thickness is defined negative, lines are always drawn opaque + switch( m_renderpass.draw_mode ) { + // wire colouring is disabled for modes other than colour + case rendermode::color: { + ::glColor4fv( + glm::value_ptr( + glm::vec4( + Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla + 1.0 ) ) ); // if the thickness is defined negative, lines are always drawn opaque + break; + } + case rendermode::shadows: + case rendermode::pickcontrols: + case rendermode::pickscenery: + default: { + break; + } + } auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 32.0 ); if( linewidth > 1.0 ) { ::glLineWidth( static_cast( linewidth ) ); @@ -583,9 +933,19 @@ opengl_renderer::Render( TGroundNode *Node ) { GfxRenderer.Bind( 0 ); ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_camera.position(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } // render m_geometry.draw( Node->Piece->geometry ); @@ -603,14 +963,35 @@ opengl_renderer::Render( TGroundNode *Node ) { return false; } // setup - ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); - Bind( Node->TextureID ); + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); + break; + } + // pick modes get custom colours, and shadow pass doesn't use any + case rendermode::shadows: + case rendermode::pickcontrols: + case rendermode::pickscenery: + default: { + break; + } + } ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_camera.position(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } // render m_geometry.draw( Node->Piece->geometry ); @@ -621,6 +1002,16 @@ opengl_renderer::Render( TGroundNode *Node ) { } case TP_MEMCELL: { + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } Render( Node->MemCell ); return true; } @@ -634,14 +1025,14 @@ opengl_renderer::Render( TGroundNode *Node ) { bool opengl_renderer::Render( TDynamicObject *Dynamic ) { - Dynamic->renderme = m_camera.visible( Dynamic ); + Dynamic->renderme = m_renderpass.camera.visible( Dynamic ); if( false == Dynamic->renderme ) { return false; } // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - auto const originoffset = Dynamic->vPosition - m_camera.position(); + auto const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); @@ -649,44 +1040,68 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); ::glMultMatrixd( Dynamic->mMatrix.getArray() ); - if( Dynamic->fShade > 0.0f ) { - // change light level based on light level of the occupied track - Global::DayLight.apply_intensity( Dynamic->fShade ); - } - m_renderspecular = true; // vehicles are rendered with specular component. static models without, at least for the time being + switch( m_renderpass.draw_mode ) { - // render - if( Dynamic->mdLowPolyInt ) { - // low poly interior - if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { - // enable cab light if needed - if( Dynamic->InteriorLightLevel > 0.0f ) { + case rendermode::color: { + if( Dynamic->fShade > 0.0f ) { + // change light level based on light level of the occupied track + Global::DayLight.apply_intensity( Dynamic->fShade ); + } + m_renderspecular = true; // vehicles are rendered with specular component. static models without, at least for the time being + // render + if( Dynamic->mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + // enable cab light if needed + if( Dynamic->InteriorLightLevel > 0.0f ) { - // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } + + Render( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); + + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( m_baseambient ) ); + } + } } - Render( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); + if( Dynamic->mdModel ) + Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); - if( Dynamic->InteriorLightLevel > 0.0f ) { - // reset the overall ambient - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr(m_baseambient) ); + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + + // post-render cleanup + m_renderspecular = false; + if( Dynamic->fShade > 0.0f ) { + // restore regular light level + Global::DayLight.apply_intensity(); } + break; + } + case rendermode::shadows: { + if( Dynamic->mdLowPolyInt ) { + // low poly interior + if( FreeFlyModeFlag ? true : !Dynamic->mdKabina || !Dynamic->bDisplayCab ) { + Render( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); + } + } + if( Dynamic->mdModel ) + Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); + if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku + Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + // post-render cleanup + break; + } + case rendermode::pickcontrols: + case rendermode::pickscenery: + default: { + break; } - } - - if( Dynamic->mdModel ) - Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); - - if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); - - // post-render cleanup - m_renderspecular = false; - if( Dynamic->fShade > 0.0f ) { - // restore regular light level - Global::DayLight.apply_intensity(); } ::glPopMatrix(); @@ -698,6 +1113,77 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { return true; } +// rendering kabiny gdy jest oddzielnym modelem i ma byc wyswietlana +bool +opengl_renderer::Render_cab( TDynamicObject *Dynamic ) { + + if( Dynamic == nullptr ) { + + TSubModel::iInstance = 0; + return false; + } + + TSubModel::iInstance = reinterpret_cast( Dynamic ); + + if( ( true == FreeFlyModeFlag ) + || ( false == Dynamic->bDisplayCab ) + || ( Dynamic->mdKabina == Dynamic->mdModel ) ) { + // ABu: Rendering kabiny jako ostatniej, zeby bylo widac przez szyby, tylko w widoku ze srodka + return false; + } + + if( Dynamic->mdKabina ) { // bo mogła zniknąć przy przechodzeniu do innego pojazdu + // setup shared by all render paths + ::glPushMatrix(); + + auto const originoffset = Dynamic->GetPosition() - m_renderpass.camera.position(); + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + ::glMultMatrixd( Dynamic->mMatrix.getArray() ); + + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + // render path specific setup: + if( Dynamic->fShade > 0.0f ) { + // change light level based on light level of the occupied track + Global::DayLight.apply_intensity( Dynamic->fShade ); + } + if( Dynamic->InteriorLightLevel > 0.0f ) { + // crude way to light the cabin, until we have something more complete in place + auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + } + // render + Render( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); + Render_Alpha( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); + // post-render restore + if( Dynamic->fShade > 0.0f ) { + // change light level based on light level of the occupied track + Global::DayLight.apply_intensity(); + } + if( Dynamic->InteriorLightLevel > 0.0f ) { + // reset the overall ambient + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr(m_baseambient) ); + } + break; + } + case rendermode::pickcontrols: { + // control picking mode skips lighting setup and translucent parts + // render + Render( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); + // since the setup is simpler, there's nothing to reset afterwards + break; + } + default: { + break; + } + } + // post-render restore + ::glPopMatrix(); + } + + return true; +} + bool opengl_renderer::Render( TModel3d *Model, material_data const *Material, double const Squaredistance ) { @@ -766,108 +1252,167 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Submodel->eType < TP_ROTATOR ) { // renderowanie obiektów OpenGL - if( Submodel->iAlpha & Submodel->iFlags & 0x1F ) // rysuj gdy element nieprzezroczysty - { - switch( Submodel->m_normalizenormals ) { - case TSubModel::normalize: { - ::glEnable( GL_NORMALIZE ); break; } - case TSubModel::rescale: { - ::glEnable( GL_RESCALE_NORMAL ); break; } + if( Submodel->iAlpha & Submodel->iFlags & 0x1F ) { + // rysuj gdy element nieprzezroczysty + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + switch( Submodel->m_normalizenormals ) { + case TSubModel::normalize: { + ::glEnable( GL_NORMALIZE ); break; } + case TSubModel::rescale: { + ::glEnable( GL_RESCALE_NORMAL ); break; } + default: { + break; } + } + // material configuration: + // textures... + if( Submodel->TextureID < 0 ) { // zmienialne skóry + Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + } + else { + // również 0 + Bind( Submodel->TextureID ); + } + // ...colors... + ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub + if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + // specular strength in legacy models is set uniformly to 150, 150, 150 so we scale it down for opaque elements + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_specularopaquescalefactor ) ); + } + // ...luminance + if( Global::fLuminance < Submodel->fLight ) { + // zeby swiecilo na kolorowo + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); + } + + // main draw call + m_geometry.draw( Submodel->m_geometry ); + + // post-draw reset + if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); + } + if( Global::fLuminance < Submodel->fLight ) { + // restore default (lack of) brightness + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); + } + switch( Submodel->m_normalizenormals ) { + case TSubModel::normalize: { + ::glDisable( GL_NORMALIZE ); break; } + case TSubModel::rescale: { + ::glDisable( GL_RESCALE_NORMAL ); break; } + default: { + break; } + } + break; + } + case rendermode::shadows: + case rendermode::pickscenery: { + // scenery picking and shadow both use enforced colour and no frills + // material configuration: + // textures... + if( Submodel->TextureID < 0 ) { // zmienialne skóry + Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + } + else { + // również 0 + Bind( Submodel->TextureID ); + } + // main draw call + m_geometry.draw( Submodel->m_geometry ); + // post-draw reset + break; + } + case rendermode::pickcontrols: { + // material configuration: + // control picking applies individual colour for each submodel + m_pickcontrolsitems.emplace_back( Submodel ); + ::glColor3fv( glm::value_ptr( pick_color( m_pickcontrolsitems.size() ) ) ); + // textures... + if( Submodel->TextureID < 0 ) { // zmienialne skóry + Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + } + else { + // również 0 + Bind( Submodel->TextureID ); + } + // main draw call + m_geometry.draw( Submodel->m_geometry ); + // post-draw reset + break; + } default: { - break; } - } - - // material configuration: - // textures... - if( Submodel->TextureID < 0 ) - { // zmienialne skóry - Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); - } - else { - // również 0 - Bind( Submodel->TextureID ); - } - // ...colors... - ::glColor3fv( glm::value_ptr(Submodel->f4Diffuse) ); // McZapkie-240702: zamiast ub - if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { - // specular strength in legacy models is set uniformly to 150, 150, 150 so we scale it down for opaque elements - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_specularopaquescalefactor ) ); - } - // ...luminance - if( Global::fLuminance < Submodel->fLight ) { - // zeby swiecilo na kolorowo - ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); - } - - // main draw call - m_geometry.draw( Submodel->m_geometry ); - - // post-draw reset - if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); - } - if( Global::fLuminance < Submodel->fLight ) { - // restore default (lack of) brightness - ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); - } - switch( Submodel->m_normalizenormals ) { - case TSubModel::normalize: { - ::glDisable( GL_NORMALIZE ); break; } - case TSubModel::rescale: { - ::glDisable( GL_RESCALE_NORMAL ); break; } - default: { - break; } + break; + } } } } else if( Submodel->eType == TP_FREESPOTLIGHT ) { - auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); - auto const lightcenter = modelview * glm::vec4( 0.0f, 0.0f, -0.05f, 1.0f ); // pozycja punktu świecącego względem kamery - Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.0f, 0.0f, -1.0f, 1.0f ) - lightcenter ), glm::normalize( -lightcenter ) ); + switch( m_renderpass.draw_mode ) { + // spotlights are only rendered in colour mode(s) + case rendermode::color: { + auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); + auto const lightcenter = modelview * glm::vec4( 0.0f, 0.0f, -0.05f, 1.0f ); // pozycja punktu świecącego względem kamery + Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.0f, 0.0f, -1.0f, 1.0f ) - lightcenter ), glm::normalize( -lightcenter ) ); - if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) // kąt większy niż maksymalny stożek swiatła - { - float lightlevel = 1.0f; // TODO, TBD: parameter to control light strength - // view angle attenuation - float const anglefactor = ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); - // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation - // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances - float const distancefactor = static_cast( std::max( 0.5, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ); + if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) // kąt większy niż maksymalny stożek swiatła + { + float lightlevel = 1.0f; // TODO, TBD: parameter to control light strength + // view angle attenuation + float const anglefactor = ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); + // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation + // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances + float const distancefactor = static_cast( std::max( 0.5, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ); - if( lightlevel > 0.0f ) { - // material configuration: - ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); + if( lightlevel > 0.0f ) { + // material configuration: + ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); - Bind( 0 ); - ::glPointSize( std::max( 2.0f, 4.0f * distancefactor * anglefactor ) ); - ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], lightlevel * anglefactor ); - ::glDisable( GL_LIGHTING ); - ::glEnable( GL_BLEND ); + Bind( 0 ); + ::glPointSize( std::max( 2.0f, 4.0f * distancefactor * anglefactor ) ); + ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], lightlevel * anglefactor ); + ::glDisable( GL_LIGHTING ); + ::glEnable( GL_BLEND ); - // main draw call - m_geometry.draw( Submodel->m_geometry ); + // main draw call + m_geometry.draw( Submodel->m_geometry ); - // post-draw reset - ::glPopAttrib(); + // post-draw reset + ::glPopAttrib(); + } + } + break; + } + default: { + break; } } } else if( Submodel->eType == TP_STARS ) { - if( Global::fLuminance < Submodel->fLight ) { + switch( m_renderpass.draw_mode ) { + // colour points are only rendered in colour mode(s) + case rendermode::color: { + if( Global::fLuminance < Submodel->fLight ) { - // material configuration: - ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); + // material configuration: + ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); - Bind( 0 ); - ::glDisable( GL_LIGHTING ); + Bind( 0 ); + ::glDisable( GL_LIGHTING ); - // main draw call - m_geometry.draw( Submodel->m_geometry, color_streams ); + // main draw call + m_geometry.draw( Submodel->m_geometry, color_streams ); - // post-draw reset - ::glPopAttrib(); + // post-draw reset + ::glPopAttrib(); + } + break; + } + default: { + break; + } } } if( Submodel->Child != NULL ) @@ -877,10 +1422,10 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Submodel->iFlags & 0xC000 ) ::glPopMatrix(); } - +/* if( Submodel->b_Anim < at_SecondsJump ) Submodel->b_Anim = at_None; // wyłączenie animacji dla kolejnego użycia subm - +*/ if( Submodel->Next ) if( Submodel->iAlpha & Submodel->iFlags & 0x1F000000 ) Render( Submodel->Next ); // dalsze rekurencyjnie @@ -894,18 +1439,37 @@ opengl_renderer::Render( TTrack *Track ) { return; } - Track->EnvironmentSet(); - - if( Track->TextureID1 != 0 ) { - Bind( Track->TextureID1 ); - m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + Track->EnvironmentSet(); + if( Track->TextureID1 != 0 ) { + Bind( Track->TextureID1 ); + m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); + } + if( Track->TextureID2 != 0 ) { + Bind( Track->TextureID2 ); + m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); + } + Track->EnvironmentReset(); + break; + } + case rendermode::pickscenery: + case rendermode::shadows: { + if( Track->TextureID1 != 0 ) { + Bind( Track->TextureID1 ); + m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); + } + if( Track->TextureID2 != 0 ) { + Bind( Track->TextureID2 ); + m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); + } + break; + } + case rendermode::pickcontrols: + default: { + break; + } } - if( Track->TextureID2 != 0 ) { - Bind( Track->TextureID2 ); - m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); - } - - Track->EnvironmentReset(); } void @@ -929,28 +1493,24 @@ opengl_renderer::Render( TMemCell *Memcell ) { bool opengl_renderer::Render_Alpha( TGround *Ground ) { - ::glEnable( GL_BLEND ); - ::glAlphaFunc( GL_GREATER, 0.04f ); // im mniejsza wartość, tym większa ramka, domyślnie 0.1f - ::glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); - TGroundNode *node; TSubRect *tmp; // Ra: renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { + for( auto subcellpair = std::rbegin( m_renderpass.draw_queue ); subcellpair != std::rend( m_renderpass.draw_queue ); ++subcellpair ) { // przezroczyste trójkąty w oddzielnym cyklu przed modelami tmp = subcellpair->second; for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { Render_Alpha( node ); } } - for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) + for( auto subcellpair = std::rbegin( m_renderpass.draw_queue ); subcellpair != std::rend( m_renderpass.draw_queue ); ++subcellpair ) { // renderowanie przezroczystych modeli oraz pojazdów Render_Alpha( subcellpair->second ); } ::glDisable( GL_LIGHTING ); // linie nie powinny świecić - for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { + for( auto subcellpair = std::rbegin( m_renderpass.draw_queue ); subcellpair != std::rend( m_renderpass.draw_queue ); ++subcellpair ) { // druty na końcu, żeby się nie robiły białe plamy na tle lasu tmp = subcellpair->second; for( node = tmp->nRenderWires; node; node = node->nNext3 ) { @@ -980,7 +1540,7 @@ opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { bool opengl_renderer::Render_Alpha( TGroundNode *Node ) { - double const distancesquared = SquareMagnitude( ( Node->pCenter - m_camera.position() ) / Global::ZoomFactor ); + double const distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ); if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { return false; @@ -1012,7 +1572,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { Bind( NULL ); ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_camera.position(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render @@ -1033,7 +1593,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } } case TP_MODEL: { - Node->Model->RenderAlpha( Node->pCenter - m_camera.position() ); + Node->Model->RenderAlpha( Node->pCenter - m_renderpass.camera.position() ); return true; } @@ -1062,7 +1622,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { GfxRenderer.Bind( 0 ); ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_camera.position(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render @@ -1087,7 +1647,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { Bind( Node->TextureID ); ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_camera.position(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render @@ -1112,7 +1672,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - auto const originoffset = Dynamic->vPosition - m_camera.position(); + auto const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); @@ -1371,8 +1931,95 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { Render_Alpha( Submodel->Next ); }; +// utility methods +TSubModel const * +opengl_renderer::Update_Pick_Control() { + +#ifdef EU07_USE_PICKING_FRAMEBUFFER + if( true == m_framebuffersupport ) { + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_pickframebuffer ); + ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); + } + else { + ::glReadBuffer( GL_BACK ); + } +#else + ::glReadBuffer( GL_BACK ); +#endif + + Render_pass( rendermode::pickcontrols ); + // determine point to examine + glm::dvec2 mousepos; + glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); + mousepos.y = Global::ScreenHeight - mousepos.y; // cursor coordinates are flipped compared to opengl +/* + glm::ivec2 pickbufferpos { + mousepos.x * 1024.0f / Global::ScreenWidth, + mousepos.y * 512.0f / Global::ScreenHeight }; +*/ + glm::ivec2 pickbufferpos{ mousepos }; + + unsigned char pickreadout[4]; + ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); + auto const controlindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); + TSubModel const *control { nullptr }; + if( ( controlindex > 0 ) + && ( controlindex <= m_pickcontrolsitems.size() ) ) { + control = m_pickcontrolsitems[ controlindex - 1 ]; + } +#ifdef EU07_USE_PICKING_FRAMEBUFFER + if( true == m_framebuffersupport ) { + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); + } +#endif + return control; +} + +TGroundNode const * +opengl_renderer::Update_Pick_Node() { + +#ifdef EU07_USE_PICKING_FRAMEBUFFER + if( true == m_framebuffersupport ) { + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_pickframebuffer ); + ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); + } + else { + ::glReadBuffer( GL_BACK ); + } +#else + ::glReadBuffer( GL_BACK ); +#endif + + Render_pass( rendermode::pickscenery ); + // determine point to examine + glm::dvec2 mousepos; + glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); + mousepos.y = Global::ScreenHeight - mousepos.y; // cursor coordinates are flipped compared to opengl +/* + glm::ivec2 pickbufferpos { + mousepos.x * 1024.0f / Global::ScreenWidth, + mousepos.y * 512.0f / Global::ScreenHeight }; +*/ + glm::ivec2 pickbufferpos{ mousepos }; + + unsigned char pickreadout[4]; + ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); + auto const nodeindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); + TGroundNode const *node { nullptr }; + if( ( nodeindex > 0 ) + && ( nodeindex <= m_picksceneryitems.size() ) ) { + node = m_picksceneryitems[ nodeindex - 1 ]; + } +#ifdef EU07_USE_PICKING_FRAMEBUFFER + if( true == m_framebuffersupport ) { + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); + } +#endif + return node; +} + void -opengl_renderer::Update ( double const Deltatime ) { +opengl_renderer::Update( double const Deltatime ) { m_updateaccumulator += Deltatime; @@ -1395,16 +2042,7 @@ opengl_renderer::Update ( double const Deltatime ) { else if( framerate > 60.0 ) { targetsegments = 225; targetfactor = 1.5f; } else if( framerate > 30.0 ) { targetsegments = 90; targetfactor = Global::ScreenHeight / 768.0f; } else { targetsegments = 9; targetfactor = Global::ScreenHeight / 768.0f * 0.75f; } -/* - if( targetsegments > Global::iSegmentsRendered ) { - Global::iSegmentsRendered = std::min( targetsegments, Global::iSegmentsRendered + 5 ); - } - else if( targetsegments < Global::iSegmentsRendered ) { - - Global::iSegmentsRendered = std::max( targetsegments, Global::iSegmentsRendered - 5 ); - } -*/ if( targetfactor > Global::fDistanceFactor ) { Global::fDistanceFactor = std::min( targetfactor, Global::fDistanceFactor + 0.05f ); @@ -1427,9 +2065,11 @@ opengl_renderer::Update ( double const Deltatime ) { ::glEnable( GL_MULTISAMPLE ); } - // TODO: add garbage collection and other less frequent works here - m_geometry.update(); - m_textures.update(); + if( true == World.InitPerformed() ) { + // garbage collection + m_geometry.update(); + m_textures.update(); + } if( true == DebugModeFlag ) { m_debuginfo = m_textures.info(); @@ -1437,6 +2077,23 @@ opengl_renderer::Update ( double const Deltatime ) { else { m_debuginfo.clear(); } + + if( ( true == Global::ControlPicking ) + && ( false == FreeFlyModeFlag ) ) { + m_pickcontrolitem = Update_Pick_Control(); + } + else { + m_pickcontrolitem = nullptr; + } + // temporary conditions for testing. eventually will be coupled with editor mode + if( ( true == Global::ControlPicking ) + && ( true == DebugModeFlag ) + && ( true == FreeFlyModeFlag ) ) { + m_picksceneryitem = Update_Pick_Node(); + } + else { + m_picksceneryitem = nullptr; + } }; // debug performance string @@ -1464,13 +2121,13 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { // all lights past this one are bound to be off break; } - if( ( m_camera.position() - scenelight.position ).Length() > 1000.0f ) { + if( ( m_renderpass.camera.position() - scenelight.position ).Length() > 1000.0f ) { // we don't care about lights past arbitrary limit of 1 km. // but there could still be weaker lights which are closer, so keep looking continue; } // if the light passed tests so far, it's good enough - renderlight->set_position( glm::make_vec3( (scenelight.position - m_camera.position()).readArray() ) ); + renderlight->set_position( glm::make_vec3( (scenelight.position - m_renderpass.camera.position()).readArray() ) ); renderlight->direction = scenelight.direction; auto luminance = Global::fLuminance; // TODO: adjust this based on location, e.g. for tunnels @@ -1537,17 +2194,67 @@ opengl_renderer::Init_caps() { WriteLog( "Supported extensions:" + std::string((char *)glGetString( GL_EXTENSIONS )) ); WriteLog( std::string("Render path: ") + ( Global::bUseVBO ? "VBO" : "Display lists" ) ); +#ifdef EU07_USE_PICKING_FRAMEBUFFER + if( GLEW_EXT_framebuffer_object ) { + m_framebuffersupport = true; + WriteLog( "Framebuffer objects enabled" ); + } + else { + WriteLog( "Framebuffer objects not supported, resorting to back buffer rendering" ); + } +#endif if( Global::iMultisampling ) WriteLog( "Using multisampling x" + std::to_string( 1 << Global::iMultisampling ) ); - { // ograniczenie maksymalnego rozmiaru tekstur - parametr dla skalowania tekstur + // ograniczenie maksymalnego rozmiaru tekstur - parametr dla skalowania tekstur + { GLint i; glGetIntegerv( GL_MAX_TEXTURE_SIZE, &i ); if( i < Global::iMaxTextureSize ) Global::iMaxTextureSize = i; WriteLog( "Texture sizes capped at " + std::to_string( Global::iMaxTextureSize ) + " pixels" ); - } return true; } + +glm::vec3 +opengl_renderer::pick_color( std::size_t const Index ) { +/* + // pick colours are set with step of 4 for some slightly easier visual debugging. not strictly needed but, eh + int const colourstep = 4; + int const componentcapacity = 256 / colourstep; + auto const redgreen = std::div( Index, componentcapacity * componentcapacity ); + auto const greenblue = std::div( redgreen.rem, componentcapacity ); + auto const blue = Index % componentcapacity; + return + glm::vec3 { + redgreen.quot * colourstep / 255.0f, + greenblue.quot * colourstep / 255.0f, + greenblue.rem * colourstep / 255.0f }; +*/ + // alternatively + return + glm::vec3{ + ( ( Index & 0xff0000 ) >> 16 ) / 255.0f, + ( ( Index & 0x00ff00 ) >> 8 ) / 255.0f, + ( Index & 0x0000ff ) / 255.0f }; + +} + +std::size_t +opengl_renderer::pick_index( glm::ivec3 const &Color ) { +/* + return ( + std::floor( Color.b / 4 ) + + std::floor( Color.g / 4 ) * 64 + + std::floor( Color.r / 4 ) * 64 * 64 ); +*/ + // alternatively + return + Color.b + + ( Color.g * 256 ) + + ( Color.r * 256 * 256 ); + +} + //--------------------------------------------------------------------------- diff --git a/renderer.h b/renderer.h index 2754feb3..4459e48d 100644 --- a/renderer.h +++ b/renderer.h @@ -134,15 +134,6 @@ public: Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); bool Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); - // maintenance jobs - void - Update( double const Deltatime ); - // debug performance string - std::string const & - Info() const; - // light methods - void - Disable_Lights(); // geometry methods // NOTE: hands-on geometry management is exposed as a temporary measure; ultimately all visualization data should be generated/handled automatically by the renderer itself // creates a new geometry bank. returns: handle to the bank or NULL @@ -167,6 +158,24 @@ public: Bind( texture_handle const Texture ); opengl_texture const & Texture( texture_handle const Texture ); + // light methods + void + Disable_Lights(); + // utility methods + TSubModel const * + Pick_Control() const { return m_pickcontrolitem; } + TGroundNode const * + Pick_Node() const { return m_picksceneryitem; } + // maintenance jobs + void + Update( double const Deltatime ); + TSubModel const * + Update_Pick_Control(); + TGroundNode const * + Update_Pick_Node(); + // debug performance string + std::string const & + Info() const; // members GLenum static const sunlight{ GL_LIGHT0 }; @@ -175,16 +184,37 @@ public: private: // types enum class rendermode { - color + color, + shadows, + pickcontrols, + pickscenery + }; + + typedef std::pair< double, TSubRect * > distancesubcell_pair; + + struct renderpass_config { + opengl_camera camera; + rendermode draw_mode { rendermode::color }; + float draw_range { 0.0f }; + std::vector draw_queue; // list of subcells to be drawn in current render pass }; typedef std::vector opengllight_array; - typedef std::pair< double, TSubRect * > distancesubcell_pair; - // methods bool Init_caps(); + // runs jobs needed to generate graphics for specified render pass + void + Render_pass( rendermode const Mode ); + // configures projection matrix for the current render pass + void + Render_projection(); + // configures camera for the current render pass + void + Render_camera(); + void + Render_setup( bool const Alpha = false ); bool Render( world_environment *Environment ); bool @@ -197,6 +227,8 @@ private: Render( TGroundNode *Node ); void Render( TTrack *Track ); + bool + Render_cab( TDynamicObject *Dynamic ); void Render( TMemCell *Memcell ); bool @@ -209,29 +241,43 @@ private: Render_Alpha( TSubModel *Submodel ); void Update_Lights( light_array const &Lights ); - + glm::vec3 + pick_color( std::size_t const Index ); + std::size_t + pick_index( glm::ivec3 const &Color ); // members - opengllight_array m_lights; geometrybank_manager m_geometry; texture_manager m_textures; - opengl_camera m_camera; - rendermode renderpass { rendermode::color }; - float m_drawrange { 2500.0f }; // current drawing range - float m_drawtime { 1000.0f / 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps - double m_updateaccumulator { 0.0 }; - std::string m_debuginfo; + opengllight_array m_lights; GLFWwindow *m_window { nullptr }; +#ifdef EU07_USE_PICKING_FRAMEBUFFER + GLuint m_pickframebuffer { 0 }; // TODO: refactor pick framebuffer stuff into an object + GLuint m_picktexture { 0 }; + GLuint m_pickdepthbuffer { 0 }; +#endif + GLUquadricObj *m_quadric { nullptr }; // helper object for drawing debug mode scene elements + + geometry_handle m_billboardgeometry { 0, 0 }; texture_handle m_glaretexture { -1 }; texture_handle m_suntexture { -1 }; texture_handle m_moontexture { -1 }; - geometry_handle m_billboardgeometry { 0, 0 }; - GLUquadricObj *m_quadric; // helper object for drawing debug mode scene elements - std::vector m_drawqueue; // list of subcells to be drawn in current render pass + + float m_drawtime { 1000.0f / 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps + double m_updateaccumulator { 0.0 }; + std::string m_debuginfo; + glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; - bool m_renderspecular{ false }; // controls whether to include specular component in the calculations float m_specularopaquescalefactor { 1.0f }; float m_speculartranslucentscalefactor { 1.0f }; + bool m_framebuffersupport { false }; + rendermode m_texenvmode { rendermode::color }; // last configured texture environment + renderpass_config m_renderpass; + bool m_renderspecular { false }; // controls whether to include specular component in the calculations + std::vector m_picksceneryitems; + std::vector m_pickcontrolsitems; + TSubModel const *m_pickcontrolitem { nullptr }; + TGroundNode const *m_picksceneryitem { nullptr }; }; extern opengl_renderer GfxRenderer; diff --git a/uilayer.cpp b/uilayer.cpp index 7fb5f212..ef753b38 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -25,9 +25,10 @@ ui_layer::~ui_layer() { bool ui_layer::init( GLFWwindow *Window ) { + m_window = Window; HFONT font; // Windows Font ID m_fontbase = ::glGenLists(96); // storage for 96 characters - HDC hDC = ::GetDC( glfwGetWin32Window( Window ) ); + HDC hDC = ::GetDC( glfwGetWin32Window( m_window ) ); font = ::CreateFont( -MulDiv( 10, ::GetDeviceCaps( hDC, LOGPIXELSY ), 72 ), // height of font 0, // width of font 0, // angle of escapement @@ -79,6 +80,7 @@ ui_layer::render() { render_background(); render_progress(); render_panels(); + render_tooltip(); glPopAttrib(); } @@ -94,12 +96,14 @@ void ui_layer::set_background( std::string const &Filename ) { if( false == Filename.empty() ) { - m_background = GfxRenderer.GetTextureId( Filename, szTexturePath ); } else { - - m_background = 0; + m_background = NULL; + } + if( m_background != NULL ) { + auto const &texture = GfxRenderer.Texture( m_background ); + m_progressbottom = ( texture.width() != texture.height() ); } } /* @@ -115,17 +119,27 @@ ui_layer::render_progress() { glPushAttrib( GL_ENABLE_BIT ); glDisable( GL_TEXTURE_2D ); - quad( float4( 75.0f, 640.0f, 75.0f + 320.0f, 640.0f + 16.0f ), float4(0.0f, 0.0f, 0.0f, 0.25f) ); + glm::vec2 origin, size; + if( m_progressbottom == true ) { + origin = glm::vec2{ 0.0f, 768.0f - 20.0f }; + size = glm::vec2{ 1024.0f, 20.0f }; + } + else { + origin = glm::vec2{ 75.0f, 640.0f }; + size = glm::vec2{ 320.0f, 16.0f }; + } + + quad( float4( origin.x, origin.y, origin.x + size.x, origin.y + size.y ), float4(0.0f, 0.0f, 0.0f, 0.25f) ); // secondary bar if( m_subtaskprogress ) { quad( - float4( 75.0f, 640.0f, 75.0f + 320.0f * m_subtaskprogress, 640.0f + 16.0f), + float4( origin.x, origin.y, origin.x + size.x * m_subtaskprogress, origin.y + size.y), float4( 8.0f/255.0f, 160.0f/255.0f, 8.0f/255.0f, 0.35f ) ); } // primary bar if( m_progress ) { quad( - float4( 75.0f, 640.0f, 75.0f + 320.0f * m_progress, 640.0f + 16.0f ), + float4( origin.x, origin.y, origin.x + size.x * m_progress, origin.y + size.y ), float4( 8.0f / 255.0f, 160.0f / 255.0f, 8.0f / 255.0f, 1.0f ) ); } @@ -160,6 +174,23 @@ ui_layer::render_panels() { glPopAttrib(); } +void +ui_layer::render_tooltip() { + + if( m_tooltip.empty() ) { return; } + + glm::dvec2 mousepos; + glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); + + glPushAttrib( GL_ENABLE_BIT ); + glDisable( GL_TEXTURE_2D ); + ::glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); + ::glRasterPos2f( mousepos.x + 20.0f, mousepos.y + 25.0f ); + print( m_tooltip ); + + glPopAttrib(); +} + void ui_layer::render_background() { diff --git a/uilayer.h b/uilayer.h index 2fb8d30b..86ed2417 100644 --- a/uilayer.h +++ b/uilayer.h @@ -50,6 +50,8 @@ public: // sets the ui background texture, if any void set_background( std::string const &Filename = "" ); + void + set_tooltip( std::string const &Tooltip ) { m_tooltip = Tooltip; } void clear_texts() { m_panels.clear(); } void @@ -67,6 +69,8 @@ private: render_progress(); void render_panels(); + void + render_tooltip(); // prints specified text, using display lists font void print( std::string const &Text ); @@ -76,11 +80,18 @@ private: // members: - GLuint m_fontbase{ (GLuint)-1 }; // numer DL dla znakw w napisach - float m_progress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. - float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. - texture_handle m_background; // path to texture used as the background. size depends on mAspect. + GLFWwindow *m_window { nullptr }; + GLuint m_fontbase { (GLuint)-1 }; // numer DL dla znakw w napisach + + // progress bar config. TODO: put these together into an object + float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. + float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. + std::string m_progresstext; // label placed over the progress bar + bool m_progressbottom { false }; // location of the progress bar + + texture_handle m_background { NULL }; // path to texture used as the background. size depends on mAspect. std::vector > m_panels; + std::string m_tooltip; }; extern ui_layer UILayer; diff --git a/version.h b/version.h index 3be4407c..6ca9253b 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 701 +#define VERSION_MINOR 708 #define VERSION_REVISION 0 From 16718d53bba89dd17d664fae6a91c36eab964a47 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 10 Jul 2017 19:36:23 +0200 Subject: [PATCH 134/426] refactored mouse input processor, tweaks to mouse input support, fix for diesel engine compressor, added progress bar label --- EU07.cpp | 18 ++- Gauge.cpp | 24 +-- Globals.cpp | 6 + Globals.h | 3 +- McZapkie/Mover.cpp | 61 +++++--- World.cpp | 21 ++- keyboardinput.cpp | 267 +------------------------------- keyboardinput.h | 22 +-- maszyna.vcxproj.filters | 6 + mouseinput.cpp | 335 ++++++++++++++++++++++++++++++++++++++++ mouseinput.h | 60 +++++++ renderer.cpp | 12 +- uilayer.cpp | 24 ++- uilayer.h | 2 + version.h | 2 +- 15 files changed, 520 insertions(+), 343 deletions(-) create mode 100644 mouseinput.cpp create mode 100644 mouseinput.h diff --git a/EU07.cpp b/EU07.cpp index 27aea200..20b79d34 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -23,6 +23,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "Globals.h" #include "Logs.h" #include "keyboardinput.h" +#include "mouseinput.h" #include "gamepadinput.h" #include "Console.h" #include "PyInt.h" @@ -65,6 +66,7 @@ TWorld World; namespace input { keyboard_input Keyboard; +mouse_input Mouse; gamepad_input Gamepad; glm::dvec2 mouse_pos; // stores last mouse position in control picking mode @@ -123,11 +125,12 @@ void window_resize_callback(GLFWwindow *window, int w, int h) void cursor_pos_callback(GLFWwindow *window, double x, double y) { + input::Mouse.move( x, y ); + if( true == Global::ControlPicking ) { glfwSetCursorPos( window, x, y ); } else { - input::Keyboard.mouse( x, y ); glfwSetCursorPos( window, 0, 0 ); } } @@ -137,7 +140,7 @@ void mouse_button_callback( GLFWwindow* window, int button, int action, int mods if( ( button == GLFW_MOUSE_BUTTON_LEFT ) || ( button == GLFW_MOUSE_BUTTON_RIGHT ) ) { // we don't care about other mouse buttons at the moment - input::Keyboard.mouse( button, action ); + input::Mouse.button( button, action ); } } @@ -148,8 +151,9 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo Global::shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; Global::ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; - if( ( key == GLFW_KEY_LEFT_ALT ) - || ( key == GLFW_KEY_RIGHT_ALT ) ) { + if( ( true == Global::InputMouse ) + && ( ( key == GLFW_KEY_LEFT_ALT ) + || ( key == GLFW_KEY_RIGHT_ALT ) ) ) { // if the alt key was pressed toggle control picking mode and set matching cursor behaviour if( action == GLFW_RELEASE ) { @@ -413,6 +417,7 @@ int main(int argc, char *argv[]) return -1; } input::Keyboard.init(); + input::Mouse.init(); input::Gamepad.init(); Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów @@ -452,9 +457,8 @@ int main(int argc, char *argv[]) && ( true == GfxRenderer.Render() ) ) { glfwPollEvents(); input::Keyboard.poll(); - if( true == Global::InputGamepad ) { - input::Gamepad.poll(); - } + if( true == Global::InputMouse ) { input::Mouse.poll(); } + if( true == Global::InputGamepad ) { input::Gamepad.poll(); } } } catch( std::bad_alloc const &Error ) { diff --git a/Gauge.cpp b/Gauge.cpp index f31138a5..3883a231 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -152,17 +152,19 @@ double TGauge::GetValue() const { void TGauge::Update() { - float dt = Timer::GetDeltaTime(); - if( ( fFriction > 0 ) && ( dt < 0.5 * fFriction ) ) { - // McZapkie-281102: zabezpieczenie przed oscylacjami dla dlugich czasow - fValue += dt * ( fDesiredValue - fValue ) / fFriction; - } - else { - fValue = fDesiredValue; - } - if( std::abs( fDesiredValue - fValue ) <= 0.001 ) { - // close enough, we can stop updating the model - fValue = fDesiredValue; // set it exactly as requested just in case it matters + if( fValue != fDesiredValue ) { + float dt = Timer::GetDeltaTime(); + if( ( fFriction > 0 ) && ( dt < 0.5 * fFriction ) ) { + // McZapkie-281102: zabezpieczenie przed oscylacjami dla dlugich czasow + fValue += dt * ( fDesiredValue - fValue ) / fFriction; + if( std::abs( fDesiredValue - fValue ) <= 0.0001 ) { + // close enough, we can stop updating the model + fValue = fDesiredValue; // set it exactly as requested just in case it matters + } + } + else { + fValue = fDesiredValue; + } } if( SubModel ) { // warunek na wszelki wypadek, gdyby się submodel nie podłączył diff --git a/Globals.cpp b/Globals.cpp index 8712aeed..2a9aa97b 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -48,6 +48,7 @@ bool Global::ctrlState; int Global::iCameraLast = -1; std::string Global::asVersion = "couldn't retrieve version string"; bool Global::ControlPicking = false; // indicates controls pick mode is enabled +bool Global::InputMouse = true; // whether control pick mode can be activated int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // numer ekranu wyświetlacza tekstowego double Global::fSunDeclination = 0.0; // deklinacja Słońca @@ -371,6 +372,11 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(2, false); Parser >> Global::fMouseXScale >> Global::fMouseYScale; } + else if( token == "mousecontrol" ) { + // whether control pick mode can be activated + Parser.getTokens(); + Parser >> Global::InputMouse; + } else if (token == "enabletraction") { // Winger 040204 - 'zywe' patyki dostosowujace sie do trakcji; Ra 2014-03: teraz łamanie diff --git a/Globals.h b/Globals.h index b31d6b94..4aa05ee3 100644 --- a/Globals.h +++ b/Globals.h @@ -256,7 +256,8 @@ class Global static int iCameraLast; static std::string asVersion; // z opisem static GLint iMaxTextureSize; // maksymalny rozmiar tekstury - static bool ControlPicking; // indicates controls pick mode is enabled + static bool ControlPicking; // indicates controls pick mode is active + static bool InputMouse; // whether control pick mode can be activated static int iTextMode; // tryb pracy wyświetlacza tekstowego static int iScreenMode[12]; // numer ekranu wyświetlacza tekstowego static bool bDoubleAmbient; // podwójna jasność ambient diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 31a3226d..246575be 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1544,7 +1544,7 @@ double TMoverParameters::ShowEngineRotation(int VehN) switch (VehN) { // numer obrotomierza case 1: - return fabs(enrot); + return std::abs(enrot); case 2: for (b = 0; b <= 1; ++b) if (TestFlag(Couplers[b].CouplingFlag, ctrain_controll)) @@ -3045,6 +3045,11 @@ void TMoverParameters::CompressorCheck(double dt) } else { + if( ( EngineType == DieselEngine ) + && ( CompressorPower == 0 ) ) { + // experimental: make sure compressor coupled with diesel engine is always ready for work + CompressorAllow = true; + } if (CompressorFlag) // jeśli sprężarka załączona { // sprawdzić możliwe warunki wyłączenia sprężarki if (CompressorPower == 5) // jeśli zasilanie z sąsiedniego członu @@ -3172,29 +3177,38 @@ void TMoverParameters::CompressorCheck(double dt) } } - if (CompressorFlag) - if ((EngineType == DieselElectric) && (CompressorPower > 0)) - CompressedVolume += dt * CompressorSpeed * (2.0 * MaxCompressor - Compressor) / - MaxCompressor * - (DElist[MainCtrlPos].RPM / DElist[MainCtrlPosNo].RPM); - else - { + if( CompressorFlag ) { + if( ( EngineType == DieselElectric ) && ( CompressorPower > 0 ) ) { CompressedVolume += - dt * CompressorSpeed * (2.0 * MaxCompressor - Compressor) / MaxCompressor; - if ((CompressorPower == 5) && (Couplers[1].Connected != NULL)) - Couplers[1].Connected->TotalCurrent += - 0.0015 * Couplers[1].Connected->Voltage; // tymczasowo tylko obciążenie - // sprężarki, tak z 5A na - // sprężarkę - else if ((CompressorPower == 4) && (Couplers[0].Connected != NULL)) - Couplers[0].Connected->TotalCurrent += - 0.0015 * Couplers[0].Connected->Voltage; // tymczasowo tylko obciążenie - // sprężarki, tak z 5A na - // sprężarkę + dt * CompressorSpeed + * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor + * ( DElist[ MainCtrlPos ].RPM / DElist[ MainCtrlPosNo ].RPM ); + } + else if( ( EngineType == DieselEngine ) && ( CompressorPower == 0 ) ) { + // experimental: compressor coupled with diesel engine, output scaled by current engine rotational speed + CompressedVolume += + dt * CompressorSpeed + * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor + * ( std::abs( enrot ) / nmax ); + } + else { + CompressedVolume += + dt * CompressorSpeed * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor; + if( ( CompressorPower == 5 ) && ( Couplers[ 1 ].Connected != NULL ) ) + Couplers[ 1 ].Connected->TotalCurrent += + 0.0015 * Couplers[ 1 ].Connected->Voltage; // tymczasowo tylko obciążenie + // sprężarki, tak z 5A na + // sprężarkę + else if( ( CompressorPower == 4 ) && ( Couplers[ 0 ].Connected != NULL ) ) + Couplers[ 0 ].Connected->TotalCurrent += + 0.0015 * Couplers[ 0 ].Connected->Voltage; // tymczasowo tylko obciążenie + // sprężarki, tak z 5A na + // sprężarkę else TotalCurrent += 0.0015 * - Voltage; // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę + Voltage; // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę } + } } } } @@ -7236,9 +7250,10 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value( dizel_nmin, "nmin", Input, "" ); dizel_nmin /= 60.0; - extract_value( dizel_nmax, "nmax", Input, "" ); - dizel_nmax /= 60.0; - nmax = dizel_nmax; // not sure if this is needed, but just in case + // TODO: unify naming scheme and sort out which diesel engine params are used where and how + extract_value( nmax, "nmax", Input, "" ); + nmax /= 60.0; +// nmax = dizel_nmax; // not sure if this is needed, but just in case extract_value( dizel_nmax_cutoff, "nmax_cutoff", Input, "0.0" ); dizel_nmax_cutoff /= 60.0; extract_value( dizel_AIM, "AIM", Input, "1.0" ); diff --git a/World.cpp b/World.cpp index c01d1264..7b8120d4 100644 --- a/World.cpp +++ b/World.cpp @@ -301,34 +301,38 @@ bool TWorld::Init( GLFWwindow *Window ) { "ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others\n" ); UILayer.set_background( "logo" ); - +/* std::shared_ptr initpanel = std::make_shared(85, 600); - +*/ TSoundsManager::Init( glfwGetWin32Window( window ) ); WriteLog("Sound Init OK"); TModelsManager::Init(); WriteLog("Models init OK"); - +/* initpanel->text_lines.emplace_back( "Loading scenery / Wczytywanie scenerii:", float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); initpanel->text_lines.emplace_back( Global::SceneryFile.substr(0, 40), float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); UILayer.push_back( initpanel ); +*/ + glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii UILayer.set_progress(0.01); + UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" ); GfxRenderer.Render(); WriteLog( "Ground init" ); - Ground.Init(Global::SceneryFile); - WriteLog( "Ground init OK" ); - - glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii + if( true == Ground.Init( Global::SceneryFile ) ) { + WriteLog( "Ground init OK" ); + } simulation::Time.init(); Environment.init(); Camera.Init(Global::FreeCameraInit[0], Global::FreeCameraInitAngle[0]); - +/* initpanel->text_lines.clear(); initpanel->text_lines.emplace_back( "Preparing train / Przygotowanie kabiny:", float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); +*/ + UILayer.set_progress( "Preparing train / Przygotowanie kabiny" ); GfxRenderer.Render(); WriteLog( "Player train init: " + Global::asHumanCtrlVehicle ); @@ -396,6 +400,7 @@ bool TWorld::Init( GLFWwindow *Window ) { Train->Dynamic()->Mechanik->TakeControl(true); */ UILayer.set_progress(); + UILayer.set_progress( "" ); UILayer.set_background( "" ); UILayer.clear_texts(); diff --git a/keyboardinput.cpp b/keyboardinput.cpp index b28781f0..7a2969b6 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -11,11 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "keyboardinput.h" #include "logs.h" #include "parser.h" -#include "globals.h" -#include "timer.h" -//#include "world.h" -#include "train.h" -#include "renderer.h" +#include "world.h" extern TWorld World; @@ -162,91 +158,6 @@ keyboard_input::key( int const Key, int const Action ) { return true; } -void -keyboard_input::mouse( double Mousex, double Mousey ) { - - m_relay.post( - user_command::viewturn, - reinterpret_cast( Mousex ), - reinterpret_cast( Mousey ), - GLFW_PRESS, - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - 0 ); -} - -void -keyboard_input::mouse( int const Button, int const Action ) { - - if( false == Global::ControlPicking ) { return; } - if( true == FreeFlyModeFlag ) { - // for now we're only interested in cab controls - return; - } - - user_command &mousecommand = ( - Button == GLFW_MOUSE_BUTTON_LEFT ? - m_mousecommandleft : - m_mousecommandright - ); - - if( Action == GLFW_RELEASE ) { - if( mousecommand != user_command::none ) { - // NOTE: basic keyboard controls don't have any parameters - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, 0 ); - mousecommand = user_command::none; - } - } - else { - // if not release then it's press - auto train = World.train(); - if( train != nullptr ) { - auto lookup = m_mousecommands.find( train->GetLabel( GfxRenderer.Update_Pick_Control() ) ); - if( lookup != m_mousecommands.end() ) { - mousecommand = ( - Button == GLFW_MOUSE_BUTTON_LEFT ? - lookup->second.left : - lookup->second.right - ); - if( mousecommand != user_command::none ) { - // NOTE: basic keyboard controls don't have any parameters - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, 0 ); - m_updateaccumulator = 0.0; // prevent potential command repeat right after issuing one - } - } - } - } -} - -void -keyboard_input::poll() { - - m_updateaccumulator += Timer::GetDeltaRenderTime(); - - if( m_updateaccumulator < 0.2 ) { - // too early for any work - return; - } - m_updateaccumulator -= 0.2; - - if( m_mousecommandleft != user_command::none ) { - // NOTE: basic keyboard controls don't have any parameters - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( m_mousecommandleft, 0, 0, GLFW_REPEAT, 0 ); - } - if( m_mousecommandright != user_command::none ) { - // NOTE: basic keyboard controls don't have any parameters - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( m_mousecommandright, 0, 0, GLFW_REPEAT, 0 ); - } -} - void keyboard_input::default_bindings() { @@ -446,182 +357,6 @@ const int k_WalkMode = 73; bind(); - m_mousecommands = { - { "mainctrl:", { - user_command::mastercontrollerincrease, - user_command::mastercontrollerdecrease } }, - { "scndctrl:", { - user_command::secondcontrollerincrease, - user_command::secondcontrollerdecrease } }, - { "dirkey:", { - user_command::reverserincrease, - user_command::reverserdecrease } }, - { "brakectrl:", { - user_command::trainbrakedecrease, - user_command::trainbrakeincrease } }, - { "localbrake:", { - user_command::independentbrakedecrease, - user_command::independentbrakeincrease } }, - { "manualbrake:", { - user_command::none, - user_command::none } }, - { "brakeprofile_sw:", { - user_command::brakeactingspeedincrease, - user_command::brakeactingspeeddecrease } }, - { "brakeprofileg_sw:", { - user_command::brakeactingspeeddecrease, - user_command::none } }, - { "brakeprofiler_sw:", { - user_command::brakeactingspeedincrease, - user_command::none } }, - { "maxcurrent_sw:", { - user_command::motoroverloadrelaythresholdtoggle, - user_command::none } }, - { "main_off_bt:", { - user_command::linebreakertoggle, - user_command::none } }, - { "main_on_bt:",{ - user_command::linebreakertoggle, - user_command::none } }, // TODO: dedicated on and off line breaker commands - { "security_reset_bt:", { - user_command::alerteracknowledge, - user_command::none } }, - { "releaser_bt:", { - user_command::independentbrakebailoff, - user_command::none } }, - { "sand_bt:", { - user_command::sandboxactivate, - user_command::none } }, - { "antislip_bt:", { - user_command::wheelspinbrakeactivate, - user_command::none } }, - { "horn_bt:", { - user_command::hornhighactivate, - user_command::hornlowactivate } }, - { "hornlow_bt:", { - user_command::hornlowactivate, - user_command::none } }, - { "hornhigh_bt:", { - user_command::hornhighactivate, - user_command::none } }, - { "fuse_bt:", { - user_command::motoroverloadrelayreset, - user_command::none } }, - { "converterfuse_bt:", { - user_command::converteroverloadrelayreset, - user_command::none } }, - { "stlinoff_bt:", { - user_command::motorconnectorsopen, - user_command::none } }, - { "door_left_sw:", { - user_command::doortoggleleft, - user_command::none } }, - { "door_right_sw:", { - user_command::doortoggleright, - user_command::none } }, - { "departure_signal_bt:", { - user_command::departureannounce, - user_command::none } }, - { "upperlight_sw:", { - user_command::headlighttoggleupper, - user_command::none } }, - { "leftlight_sw:", { - user_command::headlighttoggleleft, - user_command::none } }, - { "rightlight_sw:", { - user_command::headlighttoggleright, - user_command::none } }, - { "dimheadlights_sw:", { - user_command::headlightsdimtoggle, - user_command::none } }, - { "leftend_sw:", { - user_command::redmarkertoggleleft, - user_command::none } }, - { "rightend_sw:", { - user_command::redmarkertoggleright, - user_command::none } }, - { "lights_sw:", { - user_command::none, - user_command::none } }, // TODO: implement commands for lights controller - { "rearupperlight_sw:", { - user_command::headlighttogglerearupper, - user_command::none } }, - { "rearleftlight_sw:", { - user_command::headlighttogglerearleft, - user_command::none } }, - { "rearrightlight_sw:", { - user_command::headlighttogglerearright, - user_command::none } }, - { "rearleftend_sw:", { - user_command::redmarkertogglerearleft, - user_command::none } }, - { "rearrightend_sw:", { - user_command::redmarkertogglerearright, - user_command::none } }, - { "compressor_sw:", { - user_command::compressortoggle, - user_command::none } }, - { "compressorlocal_sw:", { - user_command::compressortogglelocal, - user_command::none } }, - { "converter_sw:", { - user_command::convertertoggle, - user_command::none } }, - { "converterlocal_sw:", { - user_command::convertertogglelocal, - user_command::none } }, - { "converteroff_sw:", { - user_command::convertertoggle, - user_command::none } }, // TODO: dedicated converter shutdown command - { "main_sw:", { - user_command::linebreakertoggle, - user_command::none } }, - { "radio_sw:", { - user_command::radiotoggle, - user_command::none } }, - { "pantfront_sw:", { - user_command::pantographtogglefront, - user_command::none } }, - { "pantrear_sw:", { - user_command::pantographtogglerear, - user_command::none } }, - { "pantfrontoff_sw:", { - user_command::pantographtogglefront, - user_command::none } }, // TODO: dedicated lower pantograph commands - { "pantrearoff_sw:", { - user_command::pantographtogglerear, - user_command::none } }, // TODO: dedicated lower pantograph commands - { "pantalloff_sw:", { - user_command::pantographlowerall, - user_command::none } }, - { "pantselected_sw:", { - user_command::none, - user_command::none } }, // TODO: selected pantograph(s) operation command - { "pantselectedoff_sw:", { - user_command::none, - user_command::none } }, // TODO: lower selected pantograp(s) command - { "trainheating_sw:", { - user_command::heatingtoggle, - user_command::none } }, - { "signalling_sw:", { - user_command::mubrakingindicatortoggle, - user_command::none } }, - { "door_signalling_sw:", { - user_command::doorlocktoggle, - user_command::none } }, - { "nextcurrent_sw:", { - user_command::mucurrentindicatorothersourceactivate, - user_command::none } }, - { "cablight_sw:", { - user_command::interiorlighttoggle, - user_command::none } }, - { "cablightdim_sw:", { - user_command::interiorlightdimtoggle, - user_command::none } }, - { "battery_sw:", { - user_command::batterytoggle, - user_command::none } } - }; } void diff --git a/keyboardinput.h b/keyboardinput.h index dd15b2c1..d31a81f8 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -27,11 +27,7 @@ public: bool key( int const Key, int const Action ); void - mouse( double const Mousex, double const Mousey ); - void - mouse( int const Button, int const Action ); - void - poll(); + poll() {} private: // types @@ -49,18 +45,6 @@ private: typedef std::vector commandsetup_sequence; typedef std::unordered_map usercommand_map; - struct mouse_commands { - - user_command left; - user_command right; - - mouse_commands( user_command const Left, user_command const Right ): - left(Left), right(Right) - {} - }; - - typedef std::unordered_map controlcommands_map; - struct bindings_cache { int forward{ -1 }; @@ -82,13 +66,9 @@ private: // members commandsetup_sequence m_commands; usercommand_map m_bindings; - controlcommands_map m_mousecommands; - user_command m_mousecommandleft { user_command::none }; // last if any command issued with mouse - user_command m_mousecommandright { user_command::none }; command_relay m_relay; bool m_shift{ false }; bool m_ctrl{ false }; - double m_updateaccumulator { 0.0 }; bindings_cache m_bindingscache; std::array m_keys; }; diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 2e0bf701..a12e1e90 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -225,6 +225,9 @@ Source Files + + Source Files\input + @@ -440,6 +443,9 @@ Header Files + + Header Files\input + diff --git a/mouseinput.cpp b/mouseinput.cpp new file mode 100644 index 00000000..1b99fc27 --- /dev/null +++ b/mouseinput.cpp @@ -0,0 +1,335 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "mouseinput.h" +#include "globals.h" +#include "timer.h" +#include "world.h" +#include "train.h" +#include "renderer.h" + +extern TWorld World; + +void +mouse_input::move( double Mousex, double Mousey ) { + + if( false == Global::ControlPicking ) { + // default control mode + m_relay.post( + user_command::viewturn, + reinterpret_cast( Mousex ), + reinterpret_cast( Mousey ), + GLFW_PRESS, + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + 0 ); + } + else { + if( false == m_pickmodepanning ) { + // even if the view panning isn't active we capture the cursor position in case it does get activated + m_cursorposition.x = Mousex; + m_cursorposition.y = Mousey; + return; + } + glm::dvec2 cursorposition { Mousex, Mousey }; + auto const viewoffset = cursorposition - m_cursorposition; + m_relay.post( + user_command::viewturn, + reinterpret_cast( viewoffset.x ), + reinterpret_cast( viewoffset.y ), + GLFW_PRESS, + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + 0 ); + m_cursorposition = cursorposition; + } +} + +void +mouse_input::button( int const Button, int const Action ) { + + if( false == Global::ControlPicking ) { return; } + if( true == FreeFlyModeFlag ) { + // for now we're only interested in cab controls + return; + } + + user_command &mousecommand = ( + Button == GLFW_MOUSE_BUTTON_LEFT ? + m_mousecommandleft : + m_mousecommandright + ); + + if( Action == GLFW_RELEASE ) { + if( mousecommand != user_command::none ) { + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( mousecommand, 0, 0, Action, 0 ); + mousecommand = user_command::none; + } + else { + // if it's the right mouse button that got released, stop view panning + if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { + m_pickmodepanning = false; + } + } + } + else { + // if not release then it's press + auto train = World.train(); + if( train != nullptr ) { + auto lookup = m_mousecommands.find( train->GetLabel( GfxRenderer.Update_Pick_Control() ) ); + if( lookup != m_mousecommands.end() ) { + mousecommand = ( + Button == GLFW_MOUSE_BUTTON_LEFT ? + lookup->second.left : + lookup->second.right + ); + if( mousecommand != user_command::none ) { + // check manually for commands which have 'fast' variants launched with shift modifier + if( Global::shiftState ) { + switch( mousecommand ) { + case user_command::mastercontrollerincrease: { mousecommand = user_command::mastercontrollerincreasefast; break; } + case user_command::mastercontrollerdecrease: { mousecommand = user_command::mastercontrollerdecreasefast; break; } + case user_command::secondcontrollerincrease: { mousecommand = user_command::secondcontrollerincreasefast; break; } + case user_command::secondcontrollerdecrease: { mousecommand = user_command::secondcontrollerdecreasefast; break; } + case user_command::independentbrakeincrease: { mousecommand = user_command::independentbrakeincreasefast; break; } + case user_command::independentbrakedecrease: { mousecommand = user_command::independentbrakedecreasefast; break; } + default: { break; } + } + } + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( mousecommand, 0, 0, Action, 0 ); + m_updateaccumulator = 0.0; // prevent potential command repeat right after issuing one + if( mousecommand == user_command::mastercontrollerincrease ) { + m_updateaccumulator -= 0.15; // extra pause on first increase of master controller + } + } + } + else { + // if we don't have any recognized element under the cursor and the right button was pressed, enter view panning mode + if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { + m_pickmodepanning = true; + } + } + } + } +} + +void +mouse_input::poll() { + + m_updateaccumulator += Timer::GetDeltaRenderTime(); + + if( m_updateaccumulator < 0.1 ) { + // too early for any work + return; + } + m_updateaccumulator -= 0.1; + + if( m_mousecommandleft != user_command::none ) { + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( m_mousecommandleft, 0, 0, GLFW_REPEAT, 0 ); + } + if( m_mousecommandright != user_command::none ) { + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( m_mousecommandright, 0, 0, GLFW_REPEAT, 0 ); + } +} + +void +mouse_input::default_bindings() { + + m_mousecommands = { + { "mainctrl:", { + user_command::mastercontrollerincrease, + user_command::mastercontrollerdecrease } }, + { "scndctrl:", { + user_command::secondcontrollerincrease, + user_command::secondcontrollerdecrease } }, + { "dirkey:", { + user_command::reverserincrease, + user_command::reverserdecrease } }, + { "brakectrl:", { + user_command::trainbrakeincrease, + user_command::trainbrakedecrease } }, + { "localbrake:", { + user_command::independentbrakeincrease, + user_command::independentbrakedecrease } }, + { "manualbrake:", { + user_command::none, + user_command::none } }, + { "brakeprofile_sw:", { + user_command::brakeactingspeedincrease, + user_command::brakeactingspeeddecrease } }, + { "brakeprofileg_sw:", { + user_command::brakeactingspeeddecrease, + user_command::none } }, + { "brakeprofiler_sw:", { + user_command::brakeactingspeedincrease, + user_command::none } }, + { "maxcurrent_sw:", { + user_command::motoroverloadrelaythresholdtoggle, + user_command::none } }, + { "main_off_bt:", { + user_command::linebreakertoggle, + user_command::none } }, + { "main_on_bt:",{ + user_command::linebreakertoggle, + user_command::none } }, // TODO: dedicated on and off line breaker commands + { "security_reset_bt:", { + user_command::alerteracknowledge, + user_command::none } }, + { "releaser_bt:", { + user_command::independentbrakebailoff, + user_command::none } }, + { "sand_bt:", { + user_command::sandboxactivate, + user_command::none } }, + { "antislip_bt:", { + user_command::wheelspinbrakeactivate, + user_command::none } }, + { "horn_bt:", { + user_command::hornhighactivate, + user_command::hornlowactivate } }, + { "hornlow_bt:", { + user_command::hornlowactivate, + user_command::none } }, + { "hornhigh_bt:", { + user_command::hornhighactivate, + user_command::none } }, + { "fuse_bt:", { + user_command::motoroverloadrelayreset, + user_command::none } }, + { "converterfuse_bt:", { + user_command::converteroverloadrelayreset, + user_command::none } }, + { "stlinoff_bt:", { + user_command::motorconnectorsopen, + user_command::none } }, + { "door_left_sw:", { + user_command::doortoggleleft, + user_command::none } }, + { "door_right_sw:", { + user_command::doortoggleright, + user_command::none } }, + { "departure_signal_bt:", { + user_command::departureannounce, + user_command::none } }, + { "upperlight_sw:", { + user_command::headlighttoggleupper, + user_command::none } }, + { "leftlight_sw:", { + user_command::headlighttoggleleft, + user_command::none } }, + { "rightlight_sw:", { + user_command::headlighttoggleright, + user_command::none } }, + { "dimheadlights_sw:", { + user_command::headlightsdimtoggle, + user_command::none } }, + { "leftend_sw:", { + user_command::redmarkertoggleleft, + user_command::none } }, + { "rightend_sw:", { + user_command::redmarkertoggleright, + user_command::none } }, + { "lights_sw:", { + user_command::none, + user_command::none } }, // TODO: implement commands for lights controller + { "rearupperlight_sw:", { + user_command::headlighttogglerearupper, + user_command::none } }, + { "rearleftlight_sw:", { + user_command::headlighttogglerearleft, + user_command::none } }, + { "rearrightlight_sw:", { + user_command::headlighttogglerearright, + user_command::none } }, + { "rearleftend_sw:", { + user_command::redmarkertogglerearleft, + user_command::none } }, + { "rearrightend_sw:", { + user_command::redmarkertogglerearright, + user_command::none } }, + { "compressor_sw:", { + user_command::compressortoggle, + user_command::none } }, + { "compressorlocal_sw:", { + user_command::compressortogglelocal, + user_command::none } }, + { "converter_sw:", { + user_command::convertertoggle, + user_command::none } }, + { "converterlocal_sw:", { + user_command::convertertogglelocal, + user_command::none } }, + { "converteroff_sw:", { + user_command::convertertoggle, + user_command::none } }, // TODO: dedicated converter shutdown command + { "main_sw:", { + user_command::linebreakertoggle, + user_command::none } }, + { "radio_sw:", { + user_command::radiotoggle, + user_command::none } }, + { "pantfront_sw:", { + user_command::pantographtogglefront, + user_command::none } }, + { "pantrear_sw:", { + user_command::pantographtogglerear, + user_command::none } }, + { "pantfrontoff_sw:", { + user_command::pantographtogglefront, + user_command::none } }, // TODO: dedicated lower pantograph commands + { "pantrearoff_sw:", { + user_command::pantographtogglerear, + user_command::none } }, // TODO: dedicated lower pantograph commands + { "pantalloff_sw:", { + user_command::pantographlowerall, + user_command::none } }, + { "pantselected_sw:", { + user_command::none, + user_command::none } }, // TODO: selected pantograph(s) operation command + { "pantselectedoff_sw:", { + user_command::none, + user_command::none } }, // TODO: lower selected pantograp(s) command + { "trainheating_sw:", { + user_command::heatingtoggle, + user_command::none } }, + { "signalling_sw:", { + user_command::mubrakingindicatortoggle, + user_command::none } }, + { "door_signalling_sw:", { + user_command::doorlocktoggle, + user_command::none } }, + { "nextcurrent_sw:", { + user_command::mucurrentindicatorothersourceactivate, + user_command::none } }, + { "cablight_sw:", { + user_command::interiorlighttoggle, + user_command::none } }, + { "cablightdim_sw:", { + user_command::interiorlightdimtoggle, + user_command::none } }, + { "battery_sw:", { + user_command::batterytoggle, + user_command::none } } + }; +} + +//--------------------------------------------------------------------------- diff --git a/mouseinput.h b/mouseinput.h new file mode 100644 index 00000000..95a1f194 --- /dev/null +++ b/mouseinput.h @@ -0,0 +1,60 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include "command.h" + +class mouse_input { + +public: +// constructors + mouse_input() { default_bindings(); } + +// methods + bool + init() { return true; } + void + move( double const Mousex, double const Mousey ); + void + button( int const Button, int const Action ); + void + poll(); + +private: +// types + struct mouse_commands { + + user_command left; + user_command right; + + mouse_commands( user_command const Left, user_command const Right ): + left(Left), right(Right) + {} + }; + + typedef std::unordered_map controlcommands_map; + +// methods + void + default_bindings(); + +// members + controlcommands_map m_mousecommands; + user_command m_mousecommandleft { user_command::none }; // last if any command issued with left mouse button + user_command m_mousecommandright { user_command::none }; // last if any command issued with right mouse button + command_relay m_relay; + double m_updateaccumulator { 0.0 }; + bool m_pickmodepanning { false }; // indicates mouse is in view panning mode + glm::dvec2 m_cursorposition; // stored last mouse position, used for panning +}; + +//--------------------------------------------------------------------------- diff --git a/renderer.cpp b/renderer.cpp index bde34e81..c5739dad 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -206,8 +206,10 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // TODO: run shadowmap pass before color // ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); - auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); - ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 0.0f ); // kolor nieba + if( World.InitPerformed() ) { + auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); + ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 0.0f ); // kolor nieba + } ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); if( World.InitPerformed() ) { @@ -1972,6 +1974,7 @@ opengl_renderer::Update_Pick_Control() { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); } #endif + m_pickcontrolitem = control; return control; } @@ -2015,6 +2018,7 @@ opengl_renderer::Update_Pick_Node() { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); } #endif + m_picksceneryitem = node; return node; } @@ -2080,7 +2084,7 @@ opengl_renderer::Update( double const Deltatime ) { if( ( true == Global::ControlPicking ) && ( false == FreeFlyModeFlag ) ) { - m_pickcontrolitem = Update_Pick_Control(); + Update_Pick_Control(); } else { m_pickcontrolitem = nullptr; @@ -2089,7 +2093,7 @@ opengl_renderer::Update( double const Deltatime ) { if( ( true == Global::ControlPicking ) && ( true == DebugModeFlag ) && ( true == FreeFlyModeFlag ) ) { - m_picksceneryitem = Update_Pick_Node(); + Update_Pick_Node(); } else { m_picksceneryitem = nullptr; diff --git a/uilayer.cpp b/uilayer.cpp index ef753b38..e6ca85c5 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -143,7 +143,29 @@ ui_layer::render_progress() { float4( 8.0f / 255.0f, 160.0f / 255.0f, 8.0f / 255.0f, 1.0f ) ); } - glPopAttrib(); + if( false == m_progresstext.empty() ) { + float const screenratio = static_cast( Global::iWindowWidth ) / Global::iWindowHeight; + float const width = + ( screenratio >= (4.0f/3.0f) ? + ( 4.0f / 3.0f ) * Global::iWindowHeight : + Global::iWindowWidth ); + float const heightratio = + ( screenratio >= ( 4.0f / 3.0f ) ? + Global::iWindowHeight / 768.0 : + Global::iWindowHeight / 768.0 * screenratio / ( 4.0f / 3.0f ) ); + float const height = 768.0f * heightratio; + + ::glColor4f( 216.0f / 255.0f, 216.0f / 255.0f, 216.0f / 255.0f, 1.0f ); + auto const charsize = 9.0f; + auto const textwidth = m_progresstext.size() * charsize; + auto const textheight = 12.0f; + ::glRasterPos2f( + ( 0.5f * ( Global::iWindowWidth - width ) + origin.x * heightratio ) + ( ( size.x * heightratio - textwidth ) * 0.5f * heightratio ), + ( 0.5f * ( Global::iWindowHeight - height ) + origin.y * heightratio ) + ( charsize ) + ( ( size.y * heightratio - textheight ) * 0.5f * heightratio ) ); + print( m_progresstext ); + } + + glPopAttrib(); } void diff --git a/uilayer.h b/uilayer.h index 86ed2417..b49c0598 100644 --- a/uilayer.h +++ b/uilayer.h @@ -47,6 +47,8 @@ public: // stores operation progress void set_progress( float const Progress = 0.0f, float const Subtaskprogress = 0.0f ); + void + set_progress( std::string const &Text ) { m_progresstext = Text; } // sets the ui background texture, if any void set_background( std::string const &Filename = "" ); diff --git a/version.h b/version.h index 6ca9253b..4b87d6ad 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 708 +#define VERSION_MINOR 710 #define VERSION_REVISION 0 From 9877b37e1f116e2ff6120b2911fe4eb9f5a8f4ee Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 12 Jul 2017 18:09:51 +0200 Subject: [PATCH 135/426] build 170712. increased amount of generic cab items, varying command repeat rate for mouse control --- EU07.cpp | 14 +-- Timer.cpp | 10 --- Timer.h | 4 - Train.cpp | 190 ++++++++++++++++++++++++++-------------- Train.h | 14 +-- World.cpp | 21 +---- World.h | 68 -------------- command.cpp | 10 +++ command.h | 14 ++- keyboardinput.cpp | 22 +++++ maszyna.vcxproj.filters | 6 ++ mouseinput.cpp | 77 +++++++++++++++- mouseinput.h | 10 ++- stdafx.h | 1 + translation.cpp | 31 +++++++ translation.h | 95 ++++++++++++++++++++ version.h | 2 +- 17 files changed, 403 insertions(+), 186 deletions(-) create mode 100644 translation.cpp create mode 100644 translation.h diff --git a/EU07.cpp b/EU07.cpp index 20b79d34..c226a225 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -68,7 +68,7 @@ namespace input { keyboard_input Keyboard; mouse_input Mouse; gamepad_input Gamepad; -glm::dvec2 mouse_pos; // stores last mouse position in control picking mode +glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode } @@ -144,8 +144,8 @@ void mouse_button_callback( GLFWwindow* window, int button, int action, int mods } } -void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) -{ +void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) { + input::Keyboard.key( key, action ); Global::shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; @@ -159,14 +159,14 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo if( Global::ControlPicking ) { // switch off - glfwGetCursorPos( window, &input::mouse_pos.x, &input::mouse_pos.y ); + glfwGetCursorPos( window, &input::mouse_pickmodepos.x, &input::mouse_pickmodepos.y ); glfwSetInputMode( window, GLFW_CURSOR, GLFW_CURSOR_DISABLED ); glfwSetCursorPos( window, 0, 0 ); } else { // enter picking mode glfwSetInputMode( window, GLFW_CURSOR, GLFW_CURSOR_NORMAL ); - glfwSetCursorPos( window, input::mouse_pos.x, input::mouse_pos.y ); + glfwSetCursorPos( window, input::mouse_pickmodepos.x, input::mouse_pickmodepos.y ); } // actually toggle the mode Global::ControlPicking = !Global::ControlPicking; @@ -183,8 +183,8 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo return; } - if( action == GLFW_PRESS || action == GLFW_REPEAT ) - { + if( action == GLFW_PRESS || action == GLFW_REPEAT ) { + World.OnKeyDown( key ); switch( key ) diff --git a/Timer.cpp b/Timer.cpp index 21934834..1ddd600b 100644 --- a/Timer.cpp +++ b/Timer.cpp @@ -47,16 +47,6 @@ void SetDeltaTime(double t) DeltaTime = t; } -double GetSimulationTime() -{ - return fSimulationTime; -} - -void SetSimulationTime(double t) -{ - fSimulationTime = t; -} - bool GetSoundTimer() { // Ra: być może, by dźwięki nie modyfikowały się zbyt często, po 0.1s zeruje się ten licznik return (fSoundTimer == 0.0f); diff --git a/Timer.h b/Timer.h index 5a76ccbe..b6b58371 100644 --- a/Timer.h +++ b/Timer.h @@ -21,10 +21,6 @@ double GetfSinceStart(); void SetDeltaTime(double v); -double GetSimulationTime(); - -void SetSimulationTime(double v); - bool GetSoundTimer(); double GetFPS(); diff --git a/Train.cpp b/Train.cpp index 398cc87e..7e6a1a79 100644 --- a/Train.cpp +++ b/Train.cpp @@ -225,7 +225,17 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::departureannounce, &TTrain::OnCommand_departureannounce }, { user_command::hornlowactivate, &TTrain::OnCommand_hornlowactivate }, { user_command::hornhighactivate, &TTrain::OnCommand_hornhighactivate }, - { user_command::radiotoggle, &TTrain::OnCommand_radiotoggle } + { user_command::radiotoggle, &TTrain::OnCommand_radiotoggle }, + { user_command::generictoggle0, &TTrain::OnCommand_generictoggle }, + { user_command::generictoggle1, &TTrain::OnCommand_generictoggle }, + { user_command::generictoggle2, &TTrain::OnCommand_generictoggle }, + { user_command::generictoggle3, &TTrain::OnCommand_generictoggle }, + { user_command::generictoggle4, &TTrain::OnCommand_generictoggle }, + { user_command::generictoggle5, &TTrain::OnCommand_generictoggle }, + { user_command::generictoggle6, &TTrain::OnCommand_generictoggle }, + { user_command::generictoggle7, &TTrain::OnCommand_generictoggle }, + { user_command::generictoggle8, &TTrain::OnCommand_generictoggle }, + { user_command::generictoggle9, &TTrain::OnCommand_generictoggle } }; std::vector const TTrain::fPress_labels = { @@ -233,9 +243,10 @@ std::vector const TTrain::fPress_labels = { "ch1: ", "ch2: ", "ch3: ", "ch4: ", "ch5: ", "ch6: ", "ch7: ", "ch8: ", "ch9: ", "ch0: " }; -TTrain::TTrain() -{ - ActiveUniversal4 = false; +TTrain::TTrain() { +/* + Universal4Active = false; +*/ ShowNextCurrent = false; // McZapkie-240302 - przyda sie do tachometru fTachoVelocity = 0; @@ -257,7 +268,7 @@ TTrain::TTrain() bCabLightDim = false; //----- pMechSittingPosition = vector3(0, 0, 0); // ABu: 180404 - LampkaUniversal3_st = false; // ABu: 030405 + InstrumentLightActive = false; // ABu: 030405 dsbNastawnikJazdy = NULL; dsbNastawnikBocz = NULL; dsbRelay = NULL; @@ -424,7 +435,7 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "ca", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) ); PyDict_SetItemString( dict, "shp", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_active ) ) ); PyDict_SetItemString( dict, "pantpress", PyGetFloat( mvControlled->PantPress ) ); - PyDict_SetItemString( dict, "universal3", PyGetBool( LampkaUniversal3_st ) ); + PyDict_SetItemString( dict, "universal3", PyGetBool( InstrumentLightActive ) ); // movement data PyDict_SetItemString( dict, "velocity", PyGetFloat( mover->Vel ) ); PyDict_SetItemString( dict, "tractionforce", PyGetFloat( mover->Ft ) ); @@ -2665,7 +2676,7 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const // NOTE: the check is disabled, as we're presuming light control is present in every vehicle // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels - if( Train->ggUniversal3Button.SubModel == nullptr ) { + if( Train->ggInstrumentLightButton.SubModel == nullptr ) { if( Command.action == GLFW_PRESS ) { WriteLog( "Universal3 switch is missing, or wasn't defined" ); } @@ -2675,25 +2686,25 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down // NOTE: instrument lighting isn't fully implemented, so we have to rely on the state of the 'button' i.e. light itself - if( false == Train->LampkaUniversal3_st ) { + if( false == Train->InstrumentLightActive ) { // turn on - Train->LampkaUniversal3_st = true; + Train->InstrumentLightActive = true; // audio feedback - if( Train->ggUniversal3Button.GetValue() < 0.5 ) { + if( Train->ggInstrumentLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } // visual feedback - Train->ggUniversal3Button.UpdateValue( 1.0 ); + Train->ggInstrumentLightButton.UpdateValue( 1.0 ); } else { //turn off - Train->LampkaUniversal3_st = false; + Train->InstrumentLightActive = false; // audio feedback - if( Train->ggUniversal3Button.GetValue() > 0.5 ) { + if( Train->ggInstrumentLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } // visual feedback - Train->ggUniversal3Button.UpdateValue( 0.0 ); + Train->ggInstrumentLightButton.UpdateValue( 0.0 ); } } } @@ -2732,6 +2743,41 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command } } +void TTrain::OnCommand_generictoggle( TTrain *Train, command_data const &Command ) { + + auto const itemindex = static_cast( Command.command ) - static_cast( user_command::generictoggle0 ); + auto &item = Train->ggUniversals[ itemindex ]; + + if( item.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Train generic item " + std::to_string( itemindex ) + " is missing, or wasn't defined" ); + } + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( item.GetValue() < 0.25 ) { + // turn on + // audio feedback + if( item.GetValue() < 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + item.UpdateValue( 1.0 ); + } + else { + //turn off + // audio feedback + if( item.GetValue() > 0.5 ) { + Train->play_sound( Train->dsbSwitch ); + } + // visual feedback + item.UpdateValue( 0.0 ); + } + } +} + void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ) { if( Train->ggDoorSignallingButton.SubModel == nullptr ) { @@ -5193,7 +5239,6 @@ bool TTrain::Update( double const Deltatime ) } else ggMainOffButton.UpdateValue(0); -#endif /* if (cKey==Global::Keys[k_Main]) //z shiftem { ggMainOnButton.PutValue(1); @@ -5220,7 +5265,6 @@ bool TTrain::Update( double const Deltatime ) } } else */ -#ifdef EU07_USE_OLD_COMMAND_SYSTEM //---------------- // hunter-131211: czuwak przeniesiony z OnKeyPress // hunter-091012: zrobiony test czuwaka @@ -5253,7 +5297,6 @@ bool TTrain::Update( double const Deltatime ) } CAflag = false; } -#endif /* if ( Console::Pressed(Global::Keys[k_Czuwak]) ) { @@ -5292,7 +5335,6 @@ bool TTrain::Update( double const Deltatime ) } */ -#ifdef EU07_USE_OLD_COMMAND_SYSTEM if( Console::Pressed( Global::Keys[ k_Sand ] ) ) { if (mvControlled->TrainType != dt_EZT && ggSandButton.SubModel != NULL) @@ -5375,7 +5417,6 @@ bool TTrain::Update( double const Deltatime ) ggCompressorButton.PutValue(0); mvControlled->CompressorSwitch(false); } -#endif /* bez szifta if (cKey==Global::Keys[k_Converter]) //NBMX wyl przetwornicy @@ -5398,7 +5439,6 @@ bool TTrain::Update( double const Deltatime ) else */ //----------------- -#ifdef EU07_USE_OLD_COMMAND_SYSTEM if ((!FreeFlyModeFlag) && (!(DynamicObject->Mechanik ? DynamicObject->Mechanik->AIControllFlag : false))) { @@ -5422,7 +5462,6 @@ bool TTrain::Update( double const Deltatime ) else mvOccupied->BrakeReleaser(0); } // FFMF -#endif if (Console::Pressed(Global::Keys[k_Univ1])) { @@ -5435,13 +5474,11 @@ bool TTrain::Update( double const Deltatime ) ggUniversal1Button.DecValue(dt / 2); } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (!Console::Pressed(Global::Keys[k_SmallCompressor])) // Ra: przecieść to na zwolnienie klawisza if (DynamicObject->Mechanik ? !DynamicObject->Mechanik->AIControllFlag : false) // nie wyłączać, gdy AI mvControlled->PantCompFlag = false; // wyłączona, gdy nie trzymamy klawisza -#else /* // NOTE: disabled to allow 'prototypical' 'tricking' pantograph compressor into running unattended if( ( ( DynamicObject->Mechanik != nullptr ) @@ -5454,7 +5491,6 @@ bool TTrain::Update( double const Deltatime ) mvControlled->PantCompFlag = false; } */ -#endif if (Console::Pressed(Global::Keys[k_Univ2])) { if (!DebugModeFlag) @@ -5467,7 +5503,6 @@ bool TTrain::Update( double const Deltatime ) } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM // hunter-091012: zrobione z uwzglednieniem przelacznika swiatla if (Console::Pressed(Global::Keys[k_Univ3])) { @@ -5484,13 +5519,13 @@ bool TTrain::Update( double const Deltatime ) } else { - if (ggUniversal3Button.SubModel) + if (ggInstrumentLightButton.SubModel) { - ggUniversal3Button.PutValue(1); // hunter-131211: z UpdateValue na + ggInstrumentLightButton.PutValue(1); // hunter-131211: z UpdateValue na // PutValue - by zachowywal sie jak // pozostale przelaczniki - if (btLampkaUniversal3.Active()) - LampkaUniversal3_st = true; + if (btInstrumentLight.Active()) + InstrumentLightActive = true; } } } @@ -5507,37 +5542,37 @@ bool TTrain::Update( double const Deltatime ) } else { - if (ggUniversal3Button.SubModel) + if (ggInstrumentLightButton.SubModel) { - ggUniversal3Button.PutValue(0); // hunter-131211: z UpdateValue na + ggInstrumentLightButton.PutValue(0); // hunter-131211: z UpdateValue na // PutValue - by zachowywal sie jak // pozostale przelaczniki - if (btLampkaUniversal3.Active()) - LampkaUniversal3_st = false; + if (btInstrumentLight.Active()) + InstrumentLightActive = false; } } } } #endif // ABu030405 obsluga lampki uniwersalnej: - if (btLampkaUniversal3.Active()) // w ogóle jest - if (LampkaUniversal3_st) // załączona - switch (LampkaUniversal3_typ) + if (btInstrumentLight.Active()) // w ogóle jest + if (InstrumentLightActive) // załączona + switch (InstrumentLightType) { case 0: - btLampkaUniversal3.Turn( mvControlled->Battery || mvControlled->ConverterFlag ); + btInstrumentLight.Turn( mvControlled->Battery || mvControlled->ConverterFlag ); break; case 1: - btLampkaUniversal3.Turn(mvControlled->Mains); + btInstrumentLight.Turn(mvControlled->Mains); break; case 2: - btLampkaUniversal3.Turn(mvControlled->ConverterFlag); + btInstrumentLight.Turn(mvControlled->ConverterFlag); break; default: - btLampkaUniversal3.TurnOff(); + btInstrumentLight.TurnOff(); } else - btLampkaUniversal3.TurnOff(); + btInstrumentLight.TurnOff(); #ifdef EU07_USE_OLD_COMMAND_SYSTEM // hunter-091012: przepisanie univ4 i zrobione z uwzglednieniem przelacznika @@ -5556,7 +5591,7 @@ bool TTrain::Update( double const Deltatime ) } else { - ActiveUniversal4 = true; + Universal4Active = true; // ggUniversal4Button.UpdateValue(1); } } @@ -5574,7 +5609,7 @@ bool TTrain::Update( double const Deltatime ) } else { - ActiveUniversal4 = false; + Universal4Active = false; // ggUniversal4Button.UpdateValue(0); } } @@ -5889,18 +5924,23 @@ bool TTrain::Update( double const Deltatime ) ggHornButton.Update(); ggHornLowButton.Update(); ggHornHighButton.Update(); +/* ggUniversal1Button.Update(); ggUniversal2Button.Update(); - ggUniversal3Button.Update(); + if( Universal4Active ) { + ggUniversal4Button.PermIncValue( dt ); + } + ggUniversal4Button.Update(); +*/ + for( auto &universal : ggUniversals ) { + universal.Update(); + } // hunter-091012 + ggInstrumentLightButton.Update(); ggCabLightButton.Update(); ggCabLightDimButton.Update(); ggBatteryButton.Update(); //------ - if (ActiveUniversal4) - ggUniversal4Button.PermIncValue(dt); - - ggUniversal4Button.Update(); #ifdef EU07_USE_OLD_COMMAND_SYSTEM ggMainOffButton.UpdateValue(0); ggMainOnButton.UpdateValue(0); @@ -6460,7 +6500,9 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) DynamicObject ->mdModel; // McZapkie-170103: szukaj elementy kabiny w glownym modelu } - ActiveUniversal4 = false; +/* + Universal4Active = false; +*/ clear_cab_controls(); } if (nullptr == DynamicObject->mdKabina) @@ -6706,14 +6748,19 @@ void TTrain::clear_cab_controls() ggHornLowButton.Clear(); ggHornHighButton.Clear(); ggNextCurrentButton.Clear(); +/* ggUniversal1Button.Clear(); ggUniversal2Button.Clear(); - ggUniversal3Button.Clear(); + ggUniversal4Button.Clear(); +*/ + for( auto &universal : ggUniversals ) { + universal.Clear(); + } + ggInstrumentLightButton.Clear(); // hunter-091012 ggCabLightButton.Clear(); ggCabLightDimButton.Clear(); //------- - ggUniversal4Button.Clear(); ggFuseButton.Clear(); ggConverterFuseButton.Clear(); ggStLinOffButton.Clear(); @@ -6772,7 +6819,7 @@ void TTrain::clear_cab_controls() btLampkaRadio.Clear(); btLampkaHamulecReczny.Clear(); btLampkaBlokadaDrzwi.Clear(); - btLampkaUniversal3.Clear(); + btInstrumentLight.Clear(); btLampkaWentZaluzje.Clear(); btLampkaOgrzewanieSkladu.Clear(11); btLampkaSHP.Clear(0); @@ -6930,8 +6977,8 @@ void TTrain::set_cab_controls() { if( true == bCabLightDim ) { ggCabLightDimButton.PutValue( 1.0 ); } - if( true == LampkaUniversal3_st ) { - ggUniversal3Button.PutValue( 1.0 ); + if( true == InstrumentLightActive ) { + ggInstrumentLightButton.PutValue( 1.0 ); } // doors // NOTE: we're relying on the cab models to have switches reversed for the rear cab(?) @@ -7073,20 +7120,20 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { btLampkaWysRozr.Load(Parser, DynamicObject->mdKabina); } - else if (Label == "i-universal3:") + else if (Label == "i-instrumentlight:") { - btLampkaUniversal3.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); - LampkaUniversal3_typ = 0; + btInstrumentLight.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); + InstrumentLightType = 0; } - else if (Label == "i-universal3_M:") + else if (Label == "i-instrumentlight_M:") { - btLampkaUniversal3.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); - LampkaUniversal3_typ = 1; + btInstrumentLight.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); + InstrumentLightType = 1; } - else if (Label == "i-universal3_C:") + else if (Label == "i-instrumentlight_C:") { - btLampkaUniversal3.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); - LampkaUniversal3_typ = 2; + btInstrumentLight.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); + InstrumentLightType = 2; } else if (Label == "i-vent_trim:") { @@ -7279,9 +7326,20 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "signalling_sw:", ggSignallingButton }, { "door_signalling_sw:", ggDoorSignallingButton }, { "nextcurrent_sw:", ggNextCurrentButton }, + { "instrumentlight_sw:", ggInstrumentLightButton }, { "cablight_sw:", ggCabLightButton }, { "cablightdim_sw:", ggCabLightDimButton }, - { "battery_sw:", ggBatteryButton } + { "battery_sw:", ggBatteryButton }, + { "universal0:", ggUniversals[ 0 ] }, + { "universal1:", ggUniversals[ 1 ] }, + { "universal2:", ggUniversals[ 2 ] }, + { "universal3:", ggUniversals[ 3 ] }, + { "universal4:", ggUniversals[ 4 ] }, + { "universal5:", ggUniversals[ 5 ] }, + { "universal6:", ggUniversals[ 6 ] }, + { "universal7:", ggUniversals[ 7 ] }, + { "universal8:", ggUniversals[ 8 ] }, + { "universal9:", ggUniversals[ 9 ] } }; auto lookup = gauges.find( Label ); if( lookup != gauges.end() ) { @@ -7292,6 +7350,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con else if( Label == "mainctrlact:" ) { ggMainCtrlAct.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); } +/* else if (Label == "universal1:") { ggUniversal1Button.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); @@ -7302,12 +7361,13 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con } else if (Label == "universal3:") { - ggUniversal3Button.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); + ggInstrumentLightButton.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); } else if (Label == "universal4:") { ggUniversal4Button.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); } +*/ // SEKCJA WSKAZNIKOW else if ((Label == "tachometer:") || (Label == "tachometerb:")) { diff --git a/Train.h b/Train.h index 6daf8ac7..6d8fcef9 100644 --- a/Train.h +++ b/Train.h @@ -73,7 +73,6 @@ class TTrain { public: bool CabChange(int iDirection); - bool ActiveUniversal4; bool ShowNextCurrent; // pokaz przd w podlaczonej lokomotywie (ET41) bool InitializeCab(int NewCabNo, std::string const &asFileName); TTrain(); @@ -189,6 +188,7 @@ class TTrain static void OnCommand_hornlowactivate( TTrain *Train, command_data const &Command ); static void OnCommand_hornhighactivate( TTrain *Train, command_data const &Command ); static void OnCommand_radiotoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_generictoggle( TTrain *Train, command_data const &Command ); // members TDynamicObject *DynamicObject; // przestawia zmiana pojazdu [F5] @@ -277,12 +277,16 @@ public: // reszta może by?publiczna TGauge ggHornLowButton; TGauge ggHornHighButton; TGauge ggNextCurrentButton; +/* // ABu 090305 - uniwersalne przyciski TGauge ggUniversal1Button; TGauge ggUniversal2Button; - TGauge ggUniversal3Button; TGauge ggUniversal4Button; + bool Universal4Active; +*/ + std::array ggUniversals; // NOTE: temporary arrangement until we have dynamically built control table + TGauge ggInstrumentLightButton; TGauge ggCabLightButton; // hunter-091012: przelacznik oswietlania kabiny TGauge ggCabLightDimButton; // hunter-091012: przelacznik przyciemnienia TGauge ggBatteryButton; // Stele 161228 hebelek baterii @@ -335,9 +339,9 @@ public: // reszta może by?publiczna // TButton btLampkaUnknown; TButton btLampkaOpory; TButton btLampkaWysRozr; - TButton btLampkaUniversal3; - int LampkaUniversal3_typ; // ABu 030405 - swiecenie uzaleznione od: 0-nic, 1-obw.gl, 2-przetw. - bool LampkaUniversal3_st; + TButton btInstrumentLight; + int InstrumentLightType; // ABu 030405 - swiecenie uzaleznione od: 0-nic, 1-obw.gl, 2-przetw. + bool InstrumentLightActive; TButton btLampkaWentZaluzje; // ET22 TButton btLampkaOgrzewanieSkladu; TButton btLampkaSHP; diff --git a/World.cpp b/World.cpp index 7b8120d4..209104f6 100644 --- a/World.cpp +++ b/World.cpp @@ -30,6 +30,7 @@ http://mozilla.org/MPL/2.0/. #include "Console.h" #include "color.h" #include "uilayer.h" +#include "translation.h" //--------------------------------------------------------------------------- @@ -180,20 +181,6 @@ simulation_time::julian_day() const { return JD; } -namespace locale { - -std::string -control( std::string const &Label ) { - - auto const lookup = m_controls.find( Label ); - return ( - lookup != m_controls.end() ? - lookup->second : - "" ); -} - -} - TWorld::TWorld() { // randomize(); @@ -717,8 +704,8 @@ void TWorld::OnKeyDown(int cKey) Global::iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację } } - else if( ( cKey == GLFW_KEY_PAUSE ) && ( Global::ctrlState ) ) { - //[Ctrl]+[Break] hamowanie wszystkich pojazdów w okolicy + else if( ( cKey == GLFW_KEY_PAUSE ) && ( Global::ctrlState ) && ( Global::shiftState ) ) { + //[Ctrl]+[Break] hamowanie wszystkich pojazdów w okolicy // added shift to prevent odd issue with glfw producing pause presses on its own if (Controlled->MoverParameters->Radio) Ground.RadioStop(Camera.Pos); } @@ -1288,7 +1275,7 @@ TWorld::Update_UI() { if( ( Train != nullptr ) && ( false == FreeFlyModeFlag ) ) { if( false == DebugModeFlag ) { // in regular mode show control functions, for defined controls - UILayer.set_tooltip( locale::control( Train->GetLabel( GfxRenderer.Pick_Control() ) ) ); + UILayer.set_tooltip( locale::label_cab_control( Train->GetLabel( GfxRenderer.Pick_Control() ) ) ); } else { // in debug mode show names of submodels, to help with cab setup and/or debugging diff --git a/World.h b/World.h index 67d8d2bb..a7a26fea 100644 --- a/World.h +++ b/World.h @@ -60,74 +60,6 @@ extern simulation_time Time; } -namespace locale { - -std::string - control( std::string const &Label ); - -static std::unordered_map m_controls = { - { "mainctrl:", "master controller" }, - { "scndctrl:", "second controller" }, - { "dirkey:" , "reverser" }, - { "brakectrl:", "train brake" }, - { "localbrake:", "independent brake" }, - { "manualbrake:", "manual brake" }, - { "brakeprofile_sw:", "brake acting speed" }, - { "brakeprofileg_sw:", "brake acting speed: cargo" }, - { "brakeprofiler_sw:", "brake acting speed: rapid" }, - { "maxcurrent_sw:", "motor overload relay threshold" }, - { "main_off_bt:", "line breaker" }, - { "main_on_bt:", "line breaker" }, - { "security_reset_bt:", "alerter" }, - { "releaser_bt:", "independent brake releaser" }, - { "sand_bt:", "sandbox" }, - { "antislip_bt:", "wheelspin brake" }, - { "horn_bt:", "horn" }, - { "hornlow_bt:", "low tone horn" }, - { "hornhigh_bt:", "high tone horn" }, - { "fuse_bt:", "motor overload relay reset" }, - { "converterfuse_bt:", "converter overload relay reset" }, - { "stlinoff_bt:", "motor connectors" }, - { "door_left_sw:", "left door" }, - { "door_right_sw:", "right door" }, - { "departure_signal_bt:", "departure signal" }, - { "upperlight_sw:", "upper headlight" }, - { "leftlight_sw:", "left headlight" }, - { "rightlight_sw:", "right headlight" }, - { "dimheadlights_sw:", "headlights dimmer" }, - { "leftend_sw:", "left marker light" }, - { "rightend_sw:", "right marker light" }, - { "lights_sw:", "light pattern" }, - { "rearupperlight_sw:", "rear upper headlight" }, - { "rearleftlight_sw:", "rear left headlight" }, - { "rearrightlight_sw:", "rear right headlight" }, - { "rearleftend_sw:", "rear left marker light" }, - { "rearrightend_sw:", "rear right marker light" }, - { "compressor_sw:", "compressor" }, - { "compressorlocal_sw:", "local compressor" }, - { "converter_sw:", "converter" }, - { "converterlocal_sw:", "local converter" }, - { "converteroff_sw:", "converter" }, - { "main_sw:", "line breaker" }, - { "radio_sw:", "radio" }, - { "pantfront_sw:", "front pantograph" }, - { "pantrear_sw:", "rear pantograph" }, - { "pantfrontoff_sw:", "front pantograph" }, - { "pantrearoff_sw:", "rear pantograph" }, - { "pantalloff_sw:", "all pantographs" }, - { "pantselected_sw:", "selected pantograph" }, - { "pantselectedoff_sw:", "selected pantograph" }, - { "trainheating_sw:", "heating" }, - { "signalling_sw:", "braking indicator" }, - { "door_signalling_sw:", "door locking" }, - { "nextcurrent_sw:", "current indicator source" }, - { "cablight_sw:", "interior light" }, - { "cablightdim_sw:", "interior light dimmer" }, - { "battery_sw:", "battery" } -}; - -} - // wrapper for environment elements -- sky, sun, stars, clouds etc class world_environment { diff --git a/command.cpp b/command.cpp index 426e1873..f297c6be 100644 --- a/command.cpp +++ b/command.cpp @@ -125,6 +125,16 @@ const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; */ + { "generictoggle0", command_target::vehicle }, + { "generictoggle1", command_target::vehicle }, + { "generictoggle2", command_target::vehicle }, + { "generictoggle3", command_target::vehicle }, + { "generictoggle4", command_target::vehicle }, + { "generictoggle5", command_target::vehicle }, + { "generictoggle6", command_target::vehicle }, + { "generictoggle7", command_target::vehicle }, + { "generictoggle8", command_target::vehicle }, + { "generictoggle9", command_target::vehicle }, { "batterytoggle", command_target::vehicle } /* const int k_WalkMode = 73; diff --git a/command.h b/command.h index 5d688827..239b145e 100644 --- a/command.h +++ b/command.h @@ -120,6 +120,16 @@ const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; */ + generictoggle0, + generictoggle1, + generictoggle2, + generictoggle3, + generictoggle4, + generictoggle5, + generictoggle6, + generictoggle7, + generictoggle8, + generictoggle9, batterytoggle, /* const int k_WalkMode = 73; @@ -149,8 +159,6 @@ struct command_description { command_target target; }; -typedef std::vector commanddescription_sequence; - struct command_data { user_command command; @@ -188,6 +196,8 @@ private: // but realistically it's not like we're going to run more than one simulation at a time namespace simulation { +typedef std::vector commanddescription_sequence; + extern command_queue Commands; // TODO: add name to command map, and wrap these two into helper object extern commanddescription_sequence Commands_descriptions; diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 7a2969b6..959d3648 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -28,6 +28,8 @@ keyboard_input::recall_bindings() { ++commandid; } std::unordered_map nametokeymap = { + { "0", GLFW_KEY_0 }, { "1", GLFW_KEY_1 }, { "2", GLFW_KEY_2 }, { "3", GLFW_KEY_3 }, { "4", GLFW_KEY_4 }, + { "5", GLFW_KEY_5 }, { "6", GLFW_KEY_6 }, { "7", GLFW_KEY_7 }, { "8", GLFW_KEY_8 }, { "9", GLFW_KEY_9 }, { "a", GLFW_KEY_A }, { "b", GLFW_KEY_B }, { "c", GLFW_KEY_C }, { "d", GLFW_KEY_D }, { "e", GLFW_KEY_E }, { "f", GLFW_KEY_F }, { "g", GLFW_KEY_G }, { "h", GLFW_KEY_H }, { "i", GLFW_KEY_I }, { "j", GLFW_KEY_J }, { "k", GLFW_KEY_K }, { "l", GLFW_KEY_L }, { "m", GLFW_KEY_M }, { "n", GLFW_KEY_N }, { "o", GLFW_KEY_O }, @@ -348,6 +350,26 @@ const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; */ + // "generictoggle0" + { GLFW_KEY_0 }, + // "generictoggle1" + { GLFW_KEY_1 }, + // "generictoggle2" + { GLFW_KEY_2 }, + // "generictoggle3" + { GLFW_KEY_3 }, + // "generictoggle4" + { GLFW_KEY_4 }, + // "generictoggle5" + { GLFW_KEY_5 }, + // "generictoggle6" + { GLFW_KEY_6 }, + // "generictoggle7" + { GLFW_KEY_7 }, + // "generictoggle8" + { GLFW_KEY_8 }, + // "generictoggle9" + { GLFW_KEY_9 }, // "batterytoggle" { GLFW_KEY_J } /* diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index a12e1e90..67cb75d1 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -228,6 +228,9 @@ Source Files\input + + Source Files + @@ -446,6 +449,9 @@ Header Files\input + + Header Files + diff --git a/mouseinput.cpp b/mouseinput.cpp index 1b99fc27..c38b64f1 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "mouseinput.h" +#include "usefull.h" #include "globals.h" #include "timer.h" #include "world.h" @@ -17,6 +18,17 @@ http://mozilla.org/MPL/2.0/. extern TWorld World; +bool +mouse_input::init() { + +#ifdef _WINDOWS + DWORD systemkeyboardspeed; + ::SystemParametersInfo( SPI_GETKEYBOARDSPEED, 0, &systemkeyboardspeed, 0 ); + m_updaterate = interpolate( 0.5, 0.04, systemkeyboardspeed / 31.0 ); +#endif + return true; +} + void mouse_input::move( double Mousex, double Mousey ) { @@ -76,11 +88,13 @@ mouse_input::button( int const Button, int const Action ) { mousecommand = user_command::none; } else { - // if it's the right mouse button that got released, stop view panning + // if it's the right mouse button that got released and we had no command active, we were potentially in view panning mode; stop it if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { m_pickmodepanning = false; } } + // if we were in varying command repeat rate, we can stop that now. done without any conditions, to catch some unforeseen edge cases + m_varyingpollrate = false; } else { // if not release then it's press @@ -114,6 +128,25 @@ mouse_input::button( int const Button, int const Action ) { if( mousecommand == user_command::mastercontrollerincrease ) { m_updateaccumulator -= 0.15; // extra pause on first increase of master controller } + switch( mousecommand ) { + case user_command::mastercontrollerincrease: + case user_command::mastercontrollerdecrease: + case user_command::secondcontrollerincrease: + case user_command::secondcontrollerdecrease: + case user_command::trainbrakeincrease: + case user_command::trainbrakedecrease: + case user_command::independentbrakeincrease: + case user_command::independentbrakedecrease: { + // these commands trigger varying repeat rate mode, + // which scales the rate based on the distance of the cursor from its point when the command was first issued + m_commandstartcursor = m_cursorposition; + m_varyingpollrate = true; + break; + } + default: { + break; + } + } } } else { @@ -131,11 +164,16 @@ mouse_input::poll() { m_updateaccumulator += Timer::GetDeltaRenderTime(); - if( m_updateaccumulator < 0.1 ) { + auto updaterate { m_updaterate }; + if( m_varyingpollrate ) { + updaterate /= std::max( 0.15, 2.0 * glm::length( m_cursorposition - m_commandstartcursor ) / std::max( 1, Global::ScreenHeight ) ); + } + + if( m_updateaccumulator < updaterate ) { // too early for any work return; } - m_updateaccumulator -= 0.1; + m_updateaccumulator -= updaterate; if( m_mousecommandleft != user_command::none ) { // NOTE: basic keyboard controls don't have any parameters @@ -320,6 +358,9 @@ mouse_input::default_bindings() { { "nextcurrent_sw:", { user_command::mucurrentindicatorothersourceactivate, user_command::none } }, + { "instrumentlight_sw:", { + user_command::instrumentlighttoggle, + user_command::none } }, { "cablight_sw:", { user_command::interiorlighttoggle, user_command::none } }, @@ -328,6 +369,36 @@ mouse_input::default_bindings() { user_command::none } }, { "battery_sw:", { user_command::batterytoggle, + user_command::none } }, + { "universal0:", { + user_command::generictoggle0, + user_command::none } }, + { "universal1:", { + user_command::generictoggle1, + user_command::none } }, + { "universal2:", { + user_command::generictoggle2, + user_command::none } }, + { "universal3:", { + user_command::generictoggle3, + user_command::none } }, + { "universal4:", { + user_command::generictoggle4, + user_command::none } }, + { "universal5:", { + user_command::generictoggle5, + user_command::none } }, + { "universal6:", { + user_command::generictoggle6, + user_command::none } }, + { "universal7:", { + user_command::generictoggle7, + user_command::none } }, + { "universal8:", { + user_command::generictoggle8, + user_command::none } }, + { "universal9:", { + user_command::generictoggle9, user_command::none } } }; } diff --git a/mouseinput.h b/mouseinput.h index 95a1f194..346ab4e9 100644 --- a/mouseinput.h +++ b/mouseinput.h @@ -10,7 +10,6 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include #include "command.h" class mouse_input { @@ -21,7 +20,7 @@ public: // methods bool - init() { return true; } + init(); void move( double const Mousex, double const Mousey ); void @@ -48,13 +47,16 @@ private: default_bindings(); // members + command_relay m_relay; controlcommands_map m_mousecommands; user_command m_mousecommandleft { user_command::none }; // last if any command issued with left mouse button user_command m_mousecommandright { user_command::none }; // last if any command issued with right mouse button - command_relay m_relay; + double m_updaterate { 0.075 }; double m_updateaccumulator { 0.0 }; bool m_pickmodepanning { false }; // indicates mouse is in view panning mode - glm::dvec2 m_cursorposition; // stored last mouse position, used for panning + glm::dvec2 m_cursorposition; // stored last cursor position, used for panning + glm::dvec2 m_commandstartcursor; // helper, cursor position when the command was initiated + bool m_varyingpollrate { false }; // indicates rate of command repeats is affected by the cursor position }; //--------------------------------------------------------------------------- diff --git a/stdafx.h b/stdafx.h index 20302ae8..cca09510 100644 --- a/stdafx.h +++ b/stdafx.h @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include diff --git a/translation.cpp b/translation.cpp new file mode 100644 index 00000000..efa9efaf --- /dev/null +++ b/translation.cpp @@ -0,0 +1,31 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ +/* + MaSzyna EU07 locomotive simulator + Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others +*/ + +#include "stdafx.h" +#include "translation.h" + +namespace locale { + +std::string +label_cab_control( std::string const &Label ) { + + auto const lookup = m_cabcontrols.find( Label ); + return ( + lookup != m_cabcontrols.end() ? + lookup->second : + "" ); +} + +} // namespace locale + +//--------------------------------------------------------------------------- diff --git a/translation.h b/translation.h new file mode 100644 index 00000000..8ce582e0 --- /dev/null +++ b/translation.h @@ -0,0 +1,95 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include + +namespace locale { + +std::string + label_cab_control( std::string const &Label ); + +static std::unordered_map m_cabcontrols = { + { "mainctrl:", "master controller" }, + { "scndctrl:", "second controller" }, + { "dirkey:" , "reverser" }, + { "brakectrl:", "train brake" }, + { "localbrake:", "independent brake" }, + { "manualbrake:", "manual brake" }, + { "brakeprofile_sw:", "brake acting speed" }, + { "brakeprofileg_sw:", "brake acting speed: cargo" }, + { "brakeprofiler_sw:", "brake acting speed: rapid" }, + { "maxcurrent_sw:", "motor overload relay threshold" }, + { "main_off_bt:", "line breaker" }, + { "main_on_bt:", "line breaker" }, + { "security_reset_bt:", "alerter" }, + { "releaser_bt:", "independent brake releaser" }, + { "sand_bt:", "sandbox" }, + { "antislip_bt:", "wheelspin brake" }, + { "horn_bt:", "horn" }, + { "hornlow_bt:", "low tone horn" }, + { "hornhigh_bt:", "high tone horn" }, + { "fuse_bt:", "motor overload relay reset" }, + { "converterfuse_bt:", "converter overload relay reset" }, + { "stlinoff_bt:", "motor connectors" }, + { "door_left_sw:", "left door" }, + { "door_right_sw:", "right door" }, + { "departure_signal_bt:", "departure signal" }, + { "upperlight_sw:", "upper headlight" }, + { "leftlight_sw:", "left headlight" }, + { "rightlight_sw:", "right headlight" }, + { "dimheadlights_sw:", "headlights dimmer" }, + { "leftend_sw:", "left marker light" }, + { "rightend_sw:", "right marker light" }, + { "lights_sw:", "light pattern" }, + { "rearupperlight_sw:", "rear upper headlight" }, + { "rearleftlight_sw:", "rear left headlight" }, + { "rearrightlight_sw:", "rear right headlight" }, + { "rearleftend_sw:", "rear left marker light" }, + { "rearrightend_sw:", "rear right marker light" }, + { "compressor_sw:", "compressor" }, + { "compressorlocal_sw:", "local compressor" }, + { "converter_sw:", "converter" }, + { "converterlocal_sw:", "local converter" }, + { "converteroff_sw:", "converter" }, + { "main_sw:", "line breaker" }, + { "radio_sw:", "radio" }, + { "pantfront_sw:", "front pantograph" }, + { "pantrear_sw:", "rear pantograph" }, + { "pantfrontoff_sw:", "front pantograph" }, + { "pantrearoff_sw:", "rear pantograph" }, + { "pantalloff_sw:", "all pantographs" }, + { "pantselected_sw:", "selected pantograph" }, + { "pantselectedoff_sw:", "selected pantograph" }, + { "trainheating_sw:", "heating" }, + { "signalling_sw:", "braking indicator" }, + { "door_signalling_sw:", "door locking" }, + { "nextcurrent_sw:", "current indicator source" }, + { "instrumentlight_sw:", "instrument light" }, + { "cablight_sw:", "interior light" }, + { "cablightdim_sw:", "interior light dimmer" }, + { "battery_sw:", "battery" }, + { "universal0:", "generic" }, + { "universal1:", "generic" }, + { "universal2:", "generic" }, + { "universal3:", "generic" }, + { "universal4:", "generic" }, + { "universal5:", "generic" }, + { "universal6:", "generic" }, + { "universal7:", "generic" }, + { "universal8:", "generic" }, + { "universal9:", "generic" } +}; + +} + +//--------------------------------------------------------------------------- + diff --git a/version.h b/version.h index 4b87d6ad..2fe8cfad 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 710 +#define VERSION_MINOR 712 #define VERSION_REVISION 0 From 4f9000ebe2821ffc92e3aed23f5fbe5bbcf52854 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 13 Jul 2017 19:24:34 +0200 Subject: [PATCH 136/426] automatic alerter (de)activation on cab and vehicle change, minor diagnostics enhancements --- McZapkie/Mover.cpp | 3 ++ World.cpp | 108 ++++++++++++++++++++------------------------- 2 files changed, 51 insertions(+), 60 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 246575be..9c861dbc 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2023,6 +2023,7 @@ bool TMoverParameters::CabActivisation(void) { CabNo = ActiveCab; // sterowanie jest z kabiny z obsadą DirAbsolute = ActiveDir * CabNo; + SecuritySystem.Status |= s_waiting; // activate the alerter TODO: make it part of control based cab selection SendCtrlToNext("CabActivisation", 1, CabNo); } return OK; @@ -2042,6 +2043,8 @@ bool TMoverParameters::CabDeactivisation(void) CabNo = 0; DirAbsolute = ActiveDir * CabNo; DepartureSignal = false; // nie buczeć z nieaktywnej kabiny + SecuritySystem.Status = 0; // deactivate alerter TODO: make it part of control based cab selection + SendCtrlToNext("CabActivisation", 0, ActiveCab); // CabNo==0! } return OK; diff --git a/World.cpp b/World.cpp index 209104f6..198f4ed6 100644 --- a/World.cpp +++ b/World.cpp @@ -1427,9 +1427,10 @@ TWorld::Update_UI() { // for cars other than leading unit indicate the leader uitextline1 += ", owned by " + tmp->ctOwner->OwnerName(); } + uitextline1 += "; Status: " + tmp->MoverParameters->EngineDescription( 0 ); // informacja o sprzęgach uitextline1 += - " C0:" + + "; C0:" + ( tmp->PrevConnected ? tmp->PrevConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) : "none" ); @@ -1439,9 +1440,23 @@ TWorld::Update_UI() { tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) : "none" ); - uitextline2 = "Damage status: " + tmp->MoverParameters->EngineDescription( 0 ); - - uitextline2 += "; Brake delay: "; + // equipment flags + uitextline2 = ( tmp->MoverParameters->Battery ? "B" : "." ); + uitextline2 += ( tmp->MoverParameters->Mains ? "M" : "." ); + uitextline2 += ( tmp->MoverParameters->PantRearUp ? ( tmp->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; + uitextline2 += ( tmp->MoverParameters->PantFrontUp ? ( tmp->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; + uitextline2 += ( tmp->MoverParameters->PantPressLockActive ? "!" : ( tmp->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); + uitextline2 += ( false == tmp->MoverParameters->ConverterAllowLocal ? "-" : ( tmp->MoverParameters->ConverterAllow ? ( tmp->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); + uitextline2 += ( tmp->MoverParameters->ConvOvldFlag ? "!" : "." ); + uitextline2 += ( false == tmp->MoverParameters->CompressorAllowLocal ? "-" : ( tmp->MoverParameters->CompressorAllow ? ( tmp->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); + uitextline2 += ( tmp->MoverParameters->CompressorGovernorLock ? "!" : "." ); +/* + uitextline2 += + " AnlgB: " + to_string( tmp->MoverParameters->AnPos, 1 ) + + "+" + + to_string( tmp->MoverParameters->LocalBrakePosA, 1 ) +*/ + uitextline2 += " Bdelay: "; if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) uitextline2 += "G"; if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) @@ -1451,39 +1466,22 @@ TWorld::Update_UI() { if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) uitextline2 += "+Mg"; - uitextline2 += ", BTP: " + to_string( tmp->MoverParameters->LoadFlag, 0 ); - { - uitextline2 += - "; pant: " - + to_string( tmp->MoverParameters->PantPress, 2 ) - + ( tmp->MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" ); - } + uitextline2 += ", Load: " + to_string( tmp->MoverParameters->LoadFlag, 0 ); uitextline2 += - ", MED:" - + to_string( tmp->MoverParameters->LocalBrakePosA, 2 ) - + "+" - + to_string( tmp->MoverParameters->AnPos, 2 ); + "; Pant: " + + to_string( tmp->MoverParameters->PantPress, 2 ) + + ( tmp->MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" ); uitextline2 += - ", Ft:" - + to_string( tmp->MoverParameters->Ft * 0.001f, 0 ); + "; Ft: " + to_string( tmp->MoverParameters->Ft * 0.001f * tmp->MoverParameters->ActiveCab, 1 ) + + ", Fb: " + to_string( tmp->MoverParameters->Fb * 0.001f, 1 ) + + ", Fr: " + to_string( tmp->MoverParameters->RunningTrack.friction, 2 ) + + ( tmp->MoverParameters->SlippingWheels ? " (!)" : "" ); uitextline2 += "; TC:" + to_string( tmp->MoverParameters->TotalCurrent, 0 ); -#ifdef EU07_USE_OLD_HVCOUPLERS - uitextline2 += - ", HV0: " - + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::voltage ], 0 ) - + "@" - + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::front ][ TMoverParameters::hvcoupler::current ], 0 ); - uitextline2 += - ", HV1: " - + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::voltage ], 0 ) - + "@" - + to_string( tmp->MoverParameters->HVCouplers[ TMoverParameters::side::rear ][ TMoverParameters::hvcoupler::current ], 0 ); -#else auto const frontcouplerhighvoltage = to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.voltage, 0 ) + "@" @@ -1493,36 +1491,26 @@ TWorld::Update_UI() { + "@" + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.current, 0 ); uitextline2 += ", HV: "; - if( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.local == false ) { - uitextline2 += - "(" + frontcouplerhighvoltage + ")-" - + ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:" - + "-(" + rearcouplerhighvoltage + ")"; - } - else { - uitextline2 += - frontcouplerhighvoltage - + ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:" - + rearcouplerhighvoltage; - } -#endif - // equipment flags - uitextline3 = ""; - uitextline3 += ( tmp->MoverParameters->Battery ? "B" : "." ); - uitextline3 += ( tmp->MoverParameters->Mains ? "M" : "." ); - uitextline3 += ( tmp->MoverParameters->PantRearUp ? ( tmp->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; - uitextline3 += ( tmp->MoverParameters->PantFrontUp ? ( tmp->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; - uitextline3 += ( tmp->MoverParameters->PantPressLockActive ? "!" : ( tmp->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); - uitextline3 += ( false == tmp->MoverParameters->ConverterAllowLocal ? "-" : ( tmp->MoverParameters->ConverterAllow ? ( tmp->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); - uitextline3 += ( tmp->MoverParameters->ConvOvldFlag ? "!" : "." ); - uitextline3 += ( false == tmp->MoverParameters->CompressorAllowLocal ? "-" : ( tmp->MoverParameters->CompressorAllow ? ( tmp->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); - uitextline3 += ( tmp->MoverParameters->CompressorGovernorLock ? "!" : "." ); + if( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.local == false ) { + uitextline2 += + "(" + frontcouplerhighvoltage + ")-" + + ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:" + + "-(" + rearcouplerhighvoltage + ")"; + } + else { + uitextline2 += + frontcouplerhighvoltage + + ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:" + + rearcouplerhighvoltage; + } uitextline3 += - " TrB: " + to_string( tmp->MoverParameters->BrakePress, 2 ) - + ", " + to_hex_str( tmp->MoverParameters->Hamulec->GetBrakeStatus(), 2 ) - + ", LcB: " + to_string( tmp->MoverParameters->LocBrakePress, 2 ) - + ", pipes: " + to_string( tmp->MoverParameters->PipePress, 2 ) + "TrB: " + to_string( tmp->MoverParameters->BrakePress, 2 ) + + ", " + to_hex_str( tmp->MoverParameters->Hamulec->GetBrakeStatus(), 2 ); + + uitextline3 += + "; LcB: " + to_string( tmp->MoverParameters->LocBrakePress, 2 ) + + "; pipes: " + to_string( tmp->MoverParameters->PipePress, 2 ) + "/" + to_string( tmp->MoverParameters->ScndPipePress, 2 ) + "/" + to_string( tmp->MoverParameters->EqvtPipePress, 2 ) + ", MT: " + to_string( tmp->MoverParameters->CompressedVolume, 3 ) @@ -1532,9 +1520,9 @@ TWorld::Update_UI() { if( tmp->MoverParameters->ManualBrakePos > 0 ) { - uitextline3 += ", manual brake on"; + uitextline3 += "; manual brake on"; } - +/* if( tmp->MoverParameters->LocalBrakePos > 0 ) { uitextline3 += ", local brake on"; @@ -1543,7 +1531,7 @@ TWorld::Update_UI() { uitextline3 += ", local brake off"; } - +*/ if( tmp->Mechanik ) { // o ile jest ktoś w środku std::string flags = "bwaccmlshhhoibsgvdp; "; // flagi AI (definicja w Driver.h) From 3a67219e306ca206a3f1e7358210ee9d6b2dd424 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 15 Jul 2017 19:27:49 +0200 Subject: [PATCH 137/426] custom sounds for cab controls configurable on per-item basis --- DynObj.cpp | 2 +- FadeSound.h | 4 +- Gauge.cpp | 190 ++++++++++++------ Gauge.h | 47 +++-- McZapkie/MOVER.h | 51 +---- McZapkie/Mover.cpp | 67 +++---- McZapkie/mctools.cpp | 182 ++--------------- McZapkie/mctools.h | 121 +++++------- Model3d.cpp | 4 +- Train.cpp | 460 ++++++++++++++++++++++++++++++++++--------- Train.h | 46 ++--- TrkFoll.cpp | 8 +- parser.h | 39 ++-- uilayer.cpp | 34 ++-- version.h | 2 +- 15 files changed, 687 insertions(+), 570 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index a47db564..05b2ac47 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1717,7 +1717,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" if (ConversionError == -8) ErrorLog("Missed file: " + BaseDir + "\\" + Type_Name + ".fiz"); Error("Cannot load dynamic object " + asName + " from:\r\n" + BaseDir + "\\" + Type_Name + - ".fiz\r\nError " + to_string(ConversionError) + " in line " + to_string(LineCount)); + ".fiz\r\nError " + to_string(ConversionError)); return 0.0; // zerowa długość to brak pojazdu } bool driveractive = (fVel != 0.0); // jeśli prędkość niezerowa, to aktywujemy ruch diff --git a/FadeSound.h b/FadeSound.h index 6ce4e1b0..97c45eb0 100644 --- a/FadeSound.h +++ b/FadeSound.h @@ -21,8 +21,8 @@ class TFadeSound fTime = 0.0f; TSoundState State = ss_Off; - public: - TFadeSound(); +public: + TFadeSound() = default; ~TFadeSound(); void Init(std::string const &Name, float fNewFade); void TurnOn(); diff --git a/Gauge.cpp b/Gauge.cpp index 3883a231..e6e6f0ec 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -20,31 +20,7 @@ http://mozilla.org/MPL/2.0/. #include "Timer.h" #include "logs.h" -TGauge::TGauge() -{ - eType = gt_Unknown; - fFriction = 0.0; - fDesiredValue = 0.0; - fValue = 0.0; - fOffset = 0.0; - fScale = 1.0; - fStepSize = 5; - // iChannel=-1; //kanał analogowej komunikacji zwrotnej - SubModel = NULL; -}; - -TGauge::~TGauge(){}; - -void TGauge::Clear() -{ - SubModel = NULL; - eType = gt_Unknown; - fValue = 0; - fDesiredValue = 0; -}; - -void TGauge::Init(TSubModel *NewSubModel, TGaugeType eNewType, double fNewScale, double fNewOffset, - double fNewFriction, double fNewValue) +void TGauge::Init(TSubModel *NewSubModel, TGaugeType eNewType, double fNewScale, double fNewOffset, double fNewFriction, double fNewValue) { // ustawienie parametrów animacji submodelu if (NewSubModel) { // warunek na wszelki wypadek, gdyby się submodel nie @@ -75,41 +51,107 @@ void TGauge::Init(TSubModel *NewSubModel, TGaugeType eNewType, double fNewScale, } }; -bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) -{ - std::string str1 = Parser.getToken(false); - std::string str2 = Parser.getToken(); - Parser.getTokens( 3, false ); - double val3, val4, val5; - Parser - >> val3 - >> val4 - >> val5; - val3 *= mul; - TSubModel *sm = md1->GetFromName( str1.c_str() ); - if( val3 == 0.0 ) { - ErrorLog( "Scale of 0.0 defined for sub-model \"" + str1 + "\" in 3d model \"" + md1->NameGet() + "\". Forcing scale of 1.0 to prevent division by 0" ); - val3 = 1.0; +bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) { + + std::string submodelname, gaugetypename; + double scale, offset, friction; + + Parser.getTokens(); + if( Parser.peek() != "{" ) { + // old fixed size config + Parser >> submodelname; + gaugetypename = Parser.getToken( true ); + Parser.getTokens( 3, false ); + Parser + >> scale + >> offset + >> friction; } - if (sm) // jeśli nie znaleziony - md2 = NULL; // informacja, że znaleziony - else if (md2) // a jest podany drugi model (np. zewnętrzny) - sm = md2->GetFromName(str1.c_str()); // to może tam będzie, co za różnica gdzie - if( sm == nullptr ) { - ErrorLog( "Failed to locate sub-model \"" + str1 + "\" in 3d model \"" + md1->NameGet() + "\"" ); + else { + // new, block type config + // TODO: rework the base part into yaml-compatible flow style mapping + cParser mappingparser( Parser.getToken( false, "}" ) ); + submodelname = mappingparser.getToken( false ); + gaugetypename = mappingparser.getToken( true ); + mappingparser.getTokens( 3, false ); + mappingparser + >> scale + >> offset + >> friction; + // new, variable length section + while( true == Load_mapping( mappingparser ) ) { + ; // all work done by while() + } } - if (str2 == "mov") - Init(sm, gt_Move, val3, val4, val5); - else if (str2 == "wip") - Init(sm, gt_Wiper, val3, val4, val5); - else if (str2 == "dgt") - Init(sm, gt_Digital, val3, val4, val5); - else - Init(sm, gt_Rotate, val3, val4, val5); + scale *= mul; + TSubModel *submodel = md1->GetFromName( submodelname.c_str() ); + if( scale == 0.0 ) { + ErrorLog( "Scale of 0.0 defined for sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\". Forcing scale of 1.0 to prevent division by 0" ); + scale = 1.0; + } + if (submodel) // jeśli nie znaleziony + md2 = nullptr; // informacja, że znaleziony + else if (md2) // a jest podany drugi model (np. zewnętrzny) + submodel = md2->GetFromName(submodelname.c_str()); // to może tam będzie, co za różnica gdzie + if( submodel == nullptr ) { + ErrorLog( "Failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\"" ); + } + + std::map gaugetypes { + { "mov", gt_Move }, + { "wip", gt_Wiper }, + { "dgt", gt_Digital } + }; + auto lookup = gaugetypes.find( gaugetypename ); + auto const type = ( + lookup != gaugetypes.end() ? + lookup->second : + gt_Rotate ); + Init(submodel, type, scale, offset, friction); + return md2 != nullptr; // true, gdy podany model zewnętrzny, a w kabinie nie było }; +bool +TGauge::Load_mapping( cParser &Input ) { + + if( false == Input.getTokens( 2, true, ", " ) ) { + return false; + } + + std::string key, value; + Input + >> key + >> value; + + if( key == "soundinc:" ) { + m_soundfxincrease = ( + value != "none" ? + TSoundsManager::GetFromName( value, true ) : + nullptr ); + } + else if( key == "sounddec:" ) { + m_soundfxdecrease = ( + value != "none" ? + TSoundsManager::GetFromName( value, true ) : + nullptr ); + } + else if( key.find( "sound" ) == 0 ) { + // sounds assigned to specific gauge values, defined by key soundFoo: where Foo = value + auto const indexstart = key.find_first_of( "1234567890" ); + auto const indexend = key.find_first_not_of( "1234567890", indexstart ); + if( indexstart != std::string::npos ) { + m_soundfxvalues.emplace( + std::stoi( key.substr( indexstart, indexend - indexstart ) ), + ( value != "none" ? + TSoundsManager::GetFromName( value, true ) : + nullptr ) ); + } + } + return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized +} + void TGauge::PermIncValue(double fNewDesired) { fDesiredValue = fDesiredValue + fNewDesired * fScale + fOffset; @@ -134,9 +176,34 @@ void TGauge::DecValue(double fNewDesired) fDesiredValue = 0; }; -void TGauge::UpdateValue(double fNewDesired) -{ // ustawienie wartości docelowej +// ustawienie wartości docelowej. plays provided fallback sound, if no sound was defined in the control itself +void +TGauge::UpdateValue( double fNewDesired, PSound Fallbacksound ) { + + if( static_cast( std::round( ( fDesiredValue - fOffset ) / fScale ) ) == static_cast( fNewDesired ) ) { + return; + } fDesiredValue = fNewDesired * fScale + fOffset; + // if there's any sound associated with new requested value, play it + // check value-specific table first... + auto const desiredvalue = static_cast( std::round( fNewDesired ) ); + auto const lookup = m_soundfxvalues.find( desiredvalue ); + if( lookup != m_soundfxvalues.end() ) { + play( lookup->second ); + return; + } + // ...and if there isn't any, fall back on the basic set... + auto const currentvalue = GetValue(); + if( ( currentvalue < fNewDesired ) && ( m_soundfxincrease != nullptr ) ) { + play( m_soundfxincrease ); + } + else if( ( currentvalue > fNewDesired ) && ( m_soundfxdecrease != nullptr ) ) { + play( m_soundfxdecrease ); + } + else { + // ...and if that fails too, try the provided fallback sound from legacy system + play( Fallbacksound ); + } }; void TGauge::PutValue(double fNewDesired) @@ -245,4 +312,15 @@ void TGauge::UpdateValue() } }; +void +TGauge::play( PSound Sound ) { + + if( Sound == nullptr ) { return; } + + Sound->SetCurrentPosition( 0 ); + Sound->SetVolume( DSBVOLUME_MAX ); + Sound->Play( 0, 0, 0 ); + return; +} + //--------------------------------------------------------------------------- diff --git a/Gauge.h b/Gauge.h index e2236a8d..0147a61e 100644 --- a/Gauge.h +++ b/Gauge.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "Classes.h" +#include "sound.h" typedef enum { // typ ruchu @@ -21,35 +22,43 @@ typedef enum gt_Digital // licznik cyfrowy, np. kilometrów } TGaugeType; -class TGauge // zmienne "gg" -{ // animowany wskaźnik, mogący przyjmować wiele stanów pośrednich +// animowany wskaźnik, mogący przyjmować wiele stanów pośrednich +class TGauge { + private: - TGaugeType eType; // typ ruchu - double fFriction{ 0.0 }; // hamowanie przy zliżaniu się do zadanej wartości - double fDesiredValue{ 0.0 }; // wartość docelowa - double fValue{ 0.0 }; // wartość obecna - double fOffset{ 0.0 }; // wartość początkowa ("0") - double fScale{ 1.0 }; // wartość końcowa ("1") - double fStepSize; // nie używane + TGaugeType eType { gt_Unknown }; // typ ruchu + double fFriction { 0.0 }; // hamowanie przy zliżaniu się do zadanej wartości + double fDesiredValue { 0.0 }; // wartość docelowa + double fValue { 0.0 }; // wartość obecna + double fOffset { 0.0 }; // wartość początkowa ("0") + double fScale { 1.0 }; // wartość końcowa ("1") char cDataType; // typ zmiennej parametru: f-float, d-double, i-int - union - { // wskaźnik na parametr pokazywany przez animację + union { + // wskaźnik na parametr pokazywany przez animację float *fData; - double *dData; + double *dData { nullptr }; int *iData; }; + PSound m_soundfxincrease { nullptr }; // sound associated with increasing control's value + PSound m_soundfxdecrease { nullptr }; // sound associated with decreasing control's value + std::map m_soundfxvalues; // sounds associated with specific values +// methods + // plays specified sound + void + play( PSound Sound ); public: - TGauge(); - ~TGauge(); - void Clear(); - void Init(TSubModel *NewSubModel, TGaugeType eNewTyp, double fNewScale = 1, - double fNewOffset = 0, double fNewFriction = 0, double fNewValue = 0); - bool Load(cParser &Parser, TModel3d *md1, TModel3d *md2 = NULL, double mul = 1.0); + TGauge() = default; + ~TGauge() {} + inline + void Clear() { *this = TGauge(); } + void Init(TSubModel *NewSubModel, TGaugeType eNewTyp, double fNewScale = 1, double fNewOffset = 0, double fNewFriction = 0, double fNewValue = 0); + bool Load(cParser &Parser, TModel3d *md1, TModel3d *md2 = nullptr, double mul = 1.0); + bool Load_mapping( cParser &Input ); void PermIncValue(double fNewDesired); void IncValue(double fNewDesired); void DecValue(double fNewDesired); - void UpdateValue(double fNewDesired); + void UpdateValue(double fNewDesired, PSound Fallbacksound = nullptr ); void PutValue(double fNewDesired); double GetValue() const; void Update(); diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 26c3ad7b..a21608ba 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -78,7 +78,8 @@ zwiekszenie nacisku przy duzych predkosciach w hamulcach Oerlikona */ #include "dumb3d.h" -using namespace Math3D; + +extern int ConversionError; const double Steel2Steel_friction = 0.15; //tarcie statyczne const double g = 9.81; //przyspieszenie ziemskie @@ -996,8 +997,8 @@ public: double FrictConst2d= 0.0; double TotalMassxg = 0.0; /*TotalMass*g*/ - vector3 vCoulpler[2]; // powtórzenie współrzędnych sprzęgów z DynObj :/ - vector3 DimHalf; // połowy rozmiarów do obliczeń geometrycznych + Math3D::vector3 vCoulpler[2]; // powtórzenie współrzędnych sprzęgów z DynObj :/ + Math3D::vector3 DimHalf; // połowy rozmiarów do obliczeń geometrycznych // int WarningSignal; //0: nie trabi, 1,2: trabi syreną o podanym numerze int WarningSignal = 0; // tymczasowo 8bit, ze względu na funkcje w MTools double fBrakeCtrlPos = -2.0; // płynna nastawa hamulca zespolonego @@ -1210,47 +1211,3 @@ private: }; extern double Distance(TLocation Loc1, TLocation Loc2, TDimension Dim1, TDimension Dim2); - -inline -std::string -extract_value( std::string const &Key, std::string const &Input ) { - - std::string value; - auto lookup = Input.find( Key + "=" ); - if( lookup != std::string::npos ) { - value = Input.substr( Input.find_first_not_of( ' ', lookup + Key.size() + 1 ) ); - lookup = value.find( ' ' ); - if( lookup != std::string::npos ) { - // trim everything past the value - value.erase( lookup ); - } - } - return value; -} - -template -bool -extract_value( Type_ &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { - - auto value = extract_value( Key, Input ); - if( false == value.empty() ) { - // set the specified variable to retrieved value - std::stringstream converter; - converter << value; - converter >> Variable; - return true; // located the variable - } - else { - // set the variable to provided default value - if( false == Default.empty() ) { - std::stringstream converter; - converter << Default; - converter >> Variable; - } - return false; // couldn't locate the variable in provided input - } -} - -template <> -bool -extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 9c861dbc..b32c1e07 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "../logs.h" #include "Oerlikon_ESt.h" #include "../parser.h" +#include "mctools.h" //--------------------------------------------------------------------------- // Ra: tu należy przenosić funcje z mover.pas, które nie są z niego wywoływane. @@ -22,6 +23,8 @@ http://mozilla.org/MPL/2.0/. const double dEpsilon = 0.01; // 1cm (zależy od typu sprzęgu...) const double CouplerTune = 0.1; // skalowanie tlumiennosci +int ConversionError = 0; + std::vector const TMoverParameters::eimc_labels = { "dfic: ", "dfmax:", "p: ", "scfu: ", "cim: ", "icif: ", "Uzmax:", "Uzh: ", "DU: ", "I0: ", "fcfu: ", "F0: ", "a1: ", "Pmax: ", "Fh: ", "Ph: ", "Vh0: ", "Vh1: ", "Imax: ", "abed: ", @@ -5097,14 +5100,17 @@ bool TMoverParameters::AutoRelayCheck(void) // IminLo } // main bez samoczynnego rozruchu + if( ( MainCtrlActualPos < ( sizeof( RList ) / sizeof( TScheme ) - 1 ) ) // crude guard against running out of current fixed table + && ( ( RList[ MainCtrlActualPos ].Relay < MainCtrlPos ) + || ( RList[ MainCtrlActualPos + 1 ].Relay == MainCtrlPos ) + || ( ( TrainType == dt_ET22 ) + && ( DelayCtrlFlag ) ) ) ) { + + if( ( RList[MainCtrlPos].R == 0 ) + && ( MainCtrlPos > 0 ) + && ( MainCtrlPos != MainCtrlPosNo ) + && ( FastSerialCircuit == 1 ) ) { - if ((RList[MainCtrlActualPos].Relay < MainCtrlPos) || - (RList[MainCtrlActualPos + 1].Relay == MainCtrlPos) || - ((TrainType == dt_ET22) && (DelayCtrlFlag))) - { - if ((RList[MainCtrlPos].R == 0) && (MainCtrlPos > 0) && - (!(MainCtrlPos == MainCtrlPosNo)) && (FastSerialCircuit == 1)) - { MainCtrlActualPos++; // MainCtrlActualPos:=MainCtrlPos; //hunter-111012: // szybkie wchodzenie na bezoporowa (303E) @@ -5803,28 +5809,28 @@ std::string TMoverParameters::EngineDescription(int what) { if (TestFlag(DamageFlag, dtrain_thinwheel)) if (Power > 0.1) - outstr = "Thin wheel,"; + outstr = "Thin wheel"; else - outstr = "Load shifted,"; + outstr = "Load shifted"; if (TestFlag(DamageFlag, dtrain_wheelwear)) - outstr = "Wheel wear,"; + outstr = "Wheel wear"; if (TestFlag(DamageFlag, dtrain_bearing)) - outstr = "Bearing damaged,"; + outstr = "Bearing damaged"; if (TestFlag(DamageFlag, dtrain_coupling)) - outstr = "Coupler broken,"; + outstr = "Coupler broken"; if (TestFlag(DamageFlag, dtrain_loaddamage)) if (Power > 0.1) - outstr = "Ventilator damaged,"; + outstr = "Ventilator damaged"; else - outstr = "Load damaged,"; + outstr = "Load damaged"; if (TestFlag(DamageFlag, dtrain_loaddestroyed)) if (Power > 0.1) - outstr = "Engine damaged,"; + outstr = "Engine damaged"; else - outstr = "LOAD DESTROYED,"; + outstr = "LOAD DESTROYED"; if (TestFlag(DamageFlag, dtrain_axle)) - outstr = "Axle broken,"; + outstr = "Axle broken"; if (TestFlag(DamageFlag, dtrain_out)) outstr = "DERAILED"; if (outstr == "") @@ -6105,7 +6111,7 @@ bool TMoverParameters::readRList( std::string const &Input ) { return false; } auto idx = LISTLINE++; - if( idx >= sizeof( RList ) ) { + if( idx >= sizeof( RList ) / sizeof( TScheme ) ) { WriteLog( "Read RList: number of entries exceeded capacity of the data table" ); return false; } @@ -6127,7 +6133,7 @@ bool TMoverParameters::readDList( std::string const &line ) { cParser parser( line ); parser.getTokens( 3, false ); auto idx = LISTLINE++; - if( idx >= sizeof( RList ) ) { + if( idx >= sizeof( RList ) / sizeof( TScheme ) ) { WriteLog( "Read DList: number of entries exceeded capacity of the data table" ); return false; } @@ -6147,7 +6153,7 @@ bool TMoverParameters::readFFList( std::string const &line ) { return false; } int idx = LISTLINE++; - if( idx >= sizeof( DElist ) ) { + if( idx >= sizeof( DElist ) / sizeof( TDEScheme ) ) { WriteLog( "Read FList: number of entries exceeded capacity of the data table" ); return false; } @@ -6167,7 +6173,7 @@ bool TMoverParameters::readWWList( std::string const &line ) { return false; } int idx = LISTLINE++; - if( idx >= sizeof( DElist ) ) { + if( idx >= sizeof( DElist ) / sizeof( TDEScheme ) ) { WriteLog( "Read WWList: number of entries exceeded capacity of the data table" ); return false; } @@ -8364,22 +8370,3 @@ double TMoverParameters::ShowCurrentP(int AmpN) return current; } } - -template <> -bool -extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { - - auto value = extract_value( Key, Input ); - if( false == value.empty() ) { - // set the specified variable to retrieved value - Variable = ( ToLower( value ) == "yes" ); - return true; // located the variable - } - else { - // set the variable to provided default value - if( false == Default.empty() ) { - Variable = ( ToLower( Default ) == "yes" ); - } - return false; // couldn't locate the variable in provided input - } -} diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index 42f6b17d..33744897 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -17,41 +17,9 @@ Copyright (C) 2007-2014 Maciej Cierniak /*================================================*/ -int ConversionError = 0; -int LineCount = 0; bool DebugModeFlag = false; bool FreeFlyModeFlag = false; -//std::string Ups(std::string s) -//{ -// int jatka; -// std::string swy; -// -// swy = ""; -// { -// long jatka_end = s.length() + 1; -// for (jatka = 0; jatka < jatka_end; jatka++) -// swy = swy + UpCase(s[jatka]); -// } -// return swy; -//} /*=Ups=*/ - -int Max0(int x1, int x2) -{ - if (x1 > x2) - return x1; - else - return x2; -} - -int Min0(int x1, int x2) -{ - if (x1 < x2) - return x1; - else - return x2; -} - double Max0R(double x1, double x2) { if (x1 > x2) @@ -87,13 +55,8 @@ bool TestFlag(int Flag, int Value) return false; } -bool SetFlag(int &Flag, int Value) -{ - return iSetFlag(Flag, Value); -} +bool SetFlag(int &Flag, int Value) { -bool iSetFlag(int &Flag, int Value) -{ if (Value > 0) { if ((Flag & Value) == 0) @@ -263,33 +226,13 @@ std::string to_hex_str( int const Value, int const Width ) return converter.str(); }; -int stol_def(const std::string &str, const int &DefaultValue) -{ +int stol_def(const std::string &str, const int &DefaultValue) { + int result { DefaultValue }; std::stringstream converter; converter << str; converter >> result; return result; -/* - // this function was developed iteratively on Codereview.stackexchange - // with the assistance of @Corbin - std::size_t len = str.size(); - while (std::isspace(str[len - 1])) - len--; - if (len == 0) - return DefaultValue; - errno = 0; - char *s = new char[len + 1]; - std::strncpy(s, str.c_str(), len); - char *p; - int result = strtol(s, &p, 0); - delete[] s; - if( ( *p != '\0' ) || ( errno != 0 ) ) - { - return DefaultValue; - } - return result; -*/ } std::string ToLower(std::string const &text) @@ -321,114 +264,27 @@ win1250_to_ascii( std::string &Input ) { } } -void ComputeArc(double X0, double Y0, double Xn, double Yn, double R, double L, double dL, - double &phi, double &Xout, double &Yout) -/*wylicza polozenie Xout Yout i orientacje phi punktu na elemencie dL luku*/ -{ - double dX; - double dY; - double Xc; - double Yc; - double gamma; - double alfa; - double AbsR; +template <> +bool +extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { - if ((R != 0) && (L != 0)) - { - AbsR = abs(R); - dX = Xn - X0; - dY = Yn - Y0; - if (dX != 0) - gamma = atan(dY * 1.0 / dX); - else if (dY > 0) - gamma = M_PI * 1.0 / 2; - else - gamma = 3 * M_PI * 1.0 / 2; - alfa = L * 1.0 / R; - phi = gamma - (alfa + M_PI * Round(R * 1.0 / AbsR)) * 1.0 / 2; - Xc = X0 - AbsR * cos(phi); - Yc = Y0 - AbsR * sin(phi); - phi = phi + alfa * dL * 1.0 / L; - Xout = AbsR * cos(phi) + Xc; - Yout = AbsR * sin(phi) + Yc; + auto value = extract_value( Key, Input ); + if( false == value.empty() ) { + // set the specified variable to retrieved value + Variable = ( ToLower( value ) == "yes" ); + return true; // located the variable + } + else { + // set the variable to provided default value + if( false == Default.empty() ) { + Variable = ( ToLower( Default ) == "yes" ); + } + return false; // couldn't locate the variable in provided input } -} - -void ComputeALine(double X0, double Y0, double Xn, double Yn, double L, double R, double &Xout, - double &Yout) -{ - double dX; - double dY; - double gamma; - double alfa; - /* pX,pY : real;*/ - - alfa = 0; // ABu: bo nie bylo zainicjowane - dX = Xn - X0; - dY = Yn - Y0; - if (dX != 0) - gamma = atan(dY * 1.0 / dX); - else if (dY > 0) - gamma = M_PI * 1.0 / 2; - else - gamma = 3 * M_PI * 1.0 / 2; - if (R != 0) - alfa = L * 1.0 / R; - Xout = X0 + L * cos(alfa * 1.0 / 2 - gamma); - Yout = Y0 + L * sin(alfa * 1.0 / 2 - gamma); } bool FileExists( std::string const &Filename ) { - std::ifstream file( Filename ); + std::ifstream file( Filename ); return( true == file.is_open() ); } - -/* -//graficzne: - -double Xhor(double h) -{ - return h * Hstep + Xmin; -} - -double Yver(double v) -{ - return (Vsize - v) * Vstep + Ymin; -} - -long Horiz(double x) -{ - x = (x - Xmin) * 1.0 / Hstep; - if (x > -INT_MAX) - if (x < INT_MAX) - return Round(x); - else - return INT_MAX; - else - return -INT_MAX; -} - -long Vert(double Y) -{ - Y = (Y - Ymin) * 1.0 / Vstep; - if (Y > -INT_MAX) - if (Y < INT_MAX) - return Vsize - Round(Y); - else - return INT_MAX; - else - return -INT_MAX; -} -*/ - -// NOTE: this now does nothing. -void ClearPendingExceptions() -// resetuje błędy FPU, wymagane dla Trunc() -{ - ; /*?*/ /* ASM - FNCLEX - ASM END */ -} - -// END diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index c8171572..8f02ab11 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -15,48 +15,16 @@ http://mozilla.org/MPL/2.0/. #include #include #include -#include #include #include -/*Ra: te stałe nie są używane... - _FileName = ['a'..'z','A'..'Z',':','\','.','*','?','0'..'9','_','-']; - _RealNum = ['0'..'9','-','+','.','E','e']; - _Integer = ['0'..'9','-']; //Ra: to się gryzie z STLport w Builder 6 - _Plus_Int = ['0'..'9']; - _All = [' '..'ţ']; - _Delimiter= [',',';']+_EOL; - _Delimiter_Space=_Delimiter+[' ']; -*/ -static char _EOL[2] = { (char)13, (char)10 }; -static char _Spacesigns[4] = { (char)' ', (char)9, (char)13, (char)10 }; -static std::string _spacesigns = " " + (char)9 + (char)13 + (char)10; -static int const CutLeft = -1; -static int const CutRight = 1; -static int const CutBoth = 0; /*Cut_Space*/ - -extern int ConversionError; -extern int LineCount; extern bool DebugModeFlag; extern bool FreeFlyModeFlag; - -typedef unsigned long/*?*//*set of: char */ TableChar; /*MCTUTIL*/ - -/*konwersje*/ - /*funkcje matematyczne*/ -int Max0(int x1, int x2); -int Min0(int x1, int x2); - double Max0R(double x1, double x2); double Min0R(double x1, double x2); -inline int Sign(int x) -{ - return x >= 0 ? 1 : -1; -} - inline double Sign(double x) { return x >= 0 ? 1.0 : -1.0; @@ -68,7 +36,7 @@ inline long Round(double const f) //return lround(f); } -extern double Random(double a, double b); +double Random(double a, double b); inline double Random() { @@ -94,10 +62,9 @@ inline double BorlandTime() std::string Now(); /*funkcje logiczne*/ -extern bool TestFlag(int Flag, int Value); -extern bool SetFlag( int & Flag, int Value); -extern bool iSetFlag( int & Flag, int Value); -extern bool UnSetFlag(int &Flag, int Value); +bool TestFlag(int Flag, int Value); +bool SetFlag( int & Flag, int Value); +bool UnSetFlag(int &Flag, int Value); bool FuzzyLogic(double Test, double Threshold, double Probability); /*jesli Test>Threshold to losowanie*/ @@ -139,40 +106,48 @@ std::string ToUpper(std::string const &text); // replaces polish letters with basic ascii void win1250_to_ascii( std::string &Input ); -/*procedury, zmienne i funkcje graficzne*/ -void ComputeArc(double X0, double Y0, double Xn, double Yn, double R, double L, double dL, double & phi, double & Xout, double & Yout); -/*wylicza polozenie Xout Yout i orientacje phi punktu na elemencie dL luku*/ -void ComputeALine(double X0, double Y0, double Xn, double Yn, double L, double R, double & Xout, double & Yout); -/* -inline bool fileExists(const std::string &name) -{ - struct stat buffer; - return (stat(name.c_str(), &buffer) == 0); -}*/ +inline +std::string +extract_value( std::string const &Key, std::string const &Input ) { + + std::string value; + auto lookup = Input.find( Key + "=" ); + if( lookup != std::string::npos ) { + value = Input.substr( Input.find_first_not_of( ' ', lookup + Key.size() + 1 ) ); + lookup = value.find( ' ' ); + if( lookup != std::string::npos ) { + // trim everything past the value + value.erase( lookup ); + } + } + return value; +} + +template +bool +extract_value( Type_ &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { + + auto value = extract_value( Key, Input ); + if( false == value.empty() ) { + // set the specified variable to retrieved value + std::stringstream converter; + converter << value; + converter >> Variable; + return true; // located the variable + } + else { + // set the variable to provided default value + if( false == Default.empty() ) { + std::stringstream converter; + converter << Default; + converter >> Variable; + } + return false; // couldn't locate the variable in provided input + } +} + +template <> +bool +extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ); + bool FileExists( std::string const &Filename ); -/* -extern double Xmin; -extern double Ymin; -extern double Xmax; -extern double Ymax; -extern double Xaspect; -extern double Yaspect; -extern double Hstep; -extern double Vstep; -extern int Vsize; -extern int Hsize; - - -// Converts horizontal screen coordinate into real X-coordinate. -double Xhor( double h ); - -// Converts vertical screen coordinate into real Y-coordinate. -double Yver( double v ); - -long Horiz(double x); - -long Vert(double Y); -*/ - -void ClearPendingExceptions(); - diff --git a/Model3d.cpp b/Model3d.cpp index 27614b73..b77b9329 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1217,11 +1217,11 @@ TSubModel *TModel3d::GetFromName(const char *sName) if (!sName) return Root; // potrzebne do terenu z E3D if (iFlags & 0x0200) // wczytany z pliku tekstowego, wyszukiwanie rekurencyjne - return Root ? Root->GetFromName(sName) : NULL; + return Root ? Root->GetFromName(sName) : nullptr; else // wczytano z pliku binarnego, można wyszukać iteracyjnie { // for (int i=0;iGetFromName(sName) : NULL; + return Root ? Root->GetFromName(sName) : nullptr; } }; diff --git a/Train.cpp b/Train.cpp index 7e6a1a79..5f768b8e 100644 --- a/Train.cpp +++ b/Train.cpp @@ -56,14 +56,16 @@ TCab::TCab() dimm_r = dimm_g = dimm_b = 1; intlit_r = intlit_g = intlit_b = 0; intlitlow_r = intlitlow_g = intlitlow_b = 0; +/* iGaugesMax = 100; // 95 - trzeba pobierać to z pliku konfiguracyjnego ggList = new TGauge[iGaugesMax]; iGauges = 0; // na razie nie są dodane iButtonsMax = 60; // 55 - trzeba pobierać to z pliku konfiguracyjnego btList = new TButton[iButtonsMax]; iButtons = 0; +*/ } - +/* void TCab::Init(double Initx1, double Inity1, double Initz1, double Initx2, double Inity2, double Initz2, bool InitEnabled, bool InitOccupied) { @@ -76,9 +78,13 @@ void TCab::Init(double Initx1, double Inity1, double Initz1, double Initx2, doub bEnabled = InitEnabled; bOccupied = InitOccupied; } - +*/ void TCab::Load(cParser &Parser) { + // NOTE: clearing control tables here is bit of a crutch, imposed by current scheme of loading compartments anew on each cab change + ggList.clear(); + btList.clear(); + std::string token; Parser.getTokens(); Parser >> token; @@ -112,12 +118,15 @@ void TCab::Load(cParser &Parser) TCab::~TCab() { +/* delete[] ggList; delete[] btList; +*/ }; -TGauge *TCab::Gauge(int n) +TGauge &TCab::Gauge(int n) { // pobranie adresu obiektu aniomowanego ruchem +/* if (n < 0) { // rezerwacja wolnego ggList[iGauges].Clear(); @@ -126,9 +135,19 @@ TGauge *TCab::Gauge(int n) else if (n < iGauges) return ggList + n; return NULL; +*/ + if( n < 0 ) { + ggList.emplace_back(); + return ggList.back(); + } + else { + return ggList[ n ]; + } }; -TButton *TCab::Button(int n) + +TButton &TCab::Button(int n) { // pobranie adresu obiektu animowanego wyborem 1 z 2 +/* if (n < 0) { // rezerwacja wolnego return btList + iButtons++; @@ -136,10 +155,19 @@ TButton *TCab::Button(int n) else if (n < iButtons) return btList + n; return NULL; +*/ + if( n < 0 ) { + btList.emplace_back(); + return btList.back(); + } + else { + return btList[ n ]; + } }; void TCab::Update() { // odczyt parametrów i ustawienie animacji submodelom +/* int i; for (i = 0; i < iGauges; ++i) { // animacje izometryczne @@ -150,6 +178,16 @@ void TCab::Update() { // animacje dwustanowe btList[i].Update(); // odczyt parametru i wybór submodelu } +*/ + for( auto &gauge : ggList ) { + // animacje izometryczne + gauge.UpdateValue(); // odczyt parametru i przeliczenie na kąt + gauge.Update(); // ustawienie animacji + } + for( auto &button : btList ) { + // animacje dwustanowe + button.Update(); // odczyt parametru i wybór submodelu + } }; // NOTE: we're currently using universal handlers and static handler map but it may be beneficial to have these implemented on individual class instance basis @@ -519,10 +557,14 @@ void TTrain::OnCommand_mastercontrollerincrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->mvControlled->IncMainCtrl( 1 ) ) { // sound feedback Train->play_sound( Train->dsbNastawnikJazdy ); } +#else + Train->mvControlled->IncMainCtrl( 1 ); +#endif } } @@ -530,10 +572,14 @@ void TTrain::OnCommand_mastercontrollerincreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->mvControlled->IncMainCtrl( 2 ) ) { // sound feedback Train->play_sound( Train->dsbNastawnikJazdy ); } +#else + Train->mvControlled->IncMainCtrl( 2 ); +#endif } } @@ -541,10 +587,14 @@ void TTrain::OnCommand_mastercontrollerdecrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->mvControlled->DecMainCtrl( 1 ) ) { // sound feedback Train->play_sound( Train->dsbNastawnikJazdy ); } +#else + Train->mvControlled->DecMainCtrl( 1 ); +#endif } } @@ -552,10 +602,14 @@ void TTrain::OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->mvControlled->DecMainCtrl( 2 ) ) { // sound feedback Train->play_sound( Train->dsbNastawnikJazdy ); } +#else + Train->mvControlled->DecMainCtrl( 2 ); +#endif } } @@ -568,10 +622,16 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con if( Train->mvControlled->AnPos > 1 ) Train->mvControlled->AnPos = 1; } +#ifdef EU07_USE_OLD_CONTROLSOUNDS else if( Train->mvControlled->IncScndCtrl( 1 ) ) { // sound feedback Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); } +#else + else { + Train->mvControlled->IncScndCtrl( 1 ); + } +#endif } } @@ -579,10 +639,14 @@ void TTrain::OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->mvControlled->IncScndCtrl( 2 ) ) { // sound feedback Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); } +#else + Train->mvControlled->IncScndCtrl( 2 ); +#endif } } @@ -592,6 +656,7 @@ void TTrain::OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &C // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvOccupied->AutoRelayFlag ) { // turn on +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->mvOccupied->AutoRelaySwitch( true ) ) { // audio feedback Train->play_sound( Train->dsbSwitch ); @@ -599,9 +664,13 @@ void TTrain::OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &C // NOTE: there's no button for notching relay control // TBD, TODO: add notching relay control button? } +#else + Train->mvOccupied->AutoRelaySwitch( true ); +#endif } else { //turn off +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->mvOccupied->AutoRelaySwitch( false ) ) { // audio feedback Train->play_sound( Train->dsbSwitch ); @@ -609,6 +678,9 @@ void TTrain::OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &C // NOTE: there's no button for notching relay control // TBD, TODO: add notching relay control button? } +#else + Train->mvOccupied->AutoRelaySwitch( false ); +#endif } } } @@ -625,20 +697,24 @@ void TTrain::OnCommand_mucurrentindicatorothersourceactivate( TTrain *Train, com if( Command.action == GLFW_PRESS ) { // turn on Train->ShowNextCurrent = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggNextCurrentButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggNextCurrentButton.UpdateValue( 1.0 ); } else if( Command.action == GLFW_RELEASE ) { //turn off Train->ShowNextCurrent = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggNextCurrentButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggNextCurrentButton.UpdateValue( 0.0 ); } @@ -653,10 +729,14 @@ void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data con if( Train->mvControlled->AnPos > 1 ) Train->mvControlled->AnPos = 1; } +#ifdef EU07_USE_OLD_CONTROLSOUNDS else if( Train->mvControlled->DecScndCtrl( 1 ) ) { // sound feedback Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); } +#else + Train->mvControlled->DecScndCtrl( 1 ); +#endif } } @@ -664,10 +744,14 @@ void TTrain::OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->mvControlled->DecScndCtrl( 2 ) ) { // sound feedback Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); } +#else + Train->mvControlled->DecScndCtrl( 2 ); +#endif } } @@ -729,10 +813,12 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons if( Command.action != GLFW_RELEASE ) { // press or hold Train->mvOccupied->BrakeReleaser( 1 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggReleaserButton.GetValue() < 0.05 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggReleaserButton.UpdateValue( 1.0 ); } @@ -862,8 +948,8 @@ void TTrain::OnCommand_trainbrakefirstservice( TTrain *Train, command_data const // sound feedback if( ( Train->is_eztoer() ) - && ( Train->mvControlled->Mains ) - && ( Train->mvOccupied->BrakeCtrlPos != 1 ) ) { + && ( Train->mvControlled->Mains ) + && ( Train->mvOccupied->BrakeCtrlPos != 1 ) ) { Train->play_sound( Train->dsbPneumaticSwitch ); } @@ -934,10 +1020,12 @@ void TTrain::OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const if( Command.action != GLFW_RELEASE ) { // press or hold Train->mvControlled->AntiSlippingBrake(); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggAntiSlipButton.GetValue() < 0.05 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggAntiSlipButton.UpdateValue( 1.0 ); } @@ -967,8 +1055,10 @@ void TTrain::OnCommand_sandboxactivate( TTrain *Train, command_data const &Comma if( Command.action == GLFW_PRESS ) { // press Train->mvControlled->Sandbox( true ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback Train->play_sound( Train->dsbSwitch ); +#endif // visual feedback Train->ggSandButton.UpdateValue( 1.0 ); } @@ -1025,11 +1115,13 @@ void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data con Train->mvOccupied->BrakeDelayFlag << 1 : Train->mvOccupied->BrakeDelayFlag | bdelay_M ); if( true == Train->mvOccupied->BrakeDelaySwitch( fasterbrakesetting ) ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback Train->play_sound( Train->dsbSwitch ); /* Train->play_sound( Train->dsbPneumaticRelay ); */ +#endif // visual feedback if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { Train->ggBrakeProfileCtrl.UpdateValue( @@ -1065,11 +1157,13 @@ void TTrain::OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data con Train->mvOccupied->BrakeDelayFlag >> 1 : Train->mvOccupied->BrakeDelayFlag ^ bdelay_M ); if( true == Train->mvOccupied->BrakeDelaySwitch( slowerbrakesetting ) ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback Train->play_sound( Train->dsbSwitch ); /* Train->play_sound( Train->dsbPneumaticRelay ); */ +#endif // visual feedback if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { Train->ggBrakeProfileCtrl.UpdateValue( @@ -1111,20 +1205,24 @@ void TTrain::OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data con if( false == Train->mvControlled->Signalling) { // turn on Train->mvControlled->Signalling = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggSignallingButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggSignallingButton.UpdateValue( 1.0 ); } else { //turn off Train->mvControlled->Signalling = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggSignallingButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggSignallingButton.UpdateValue( 0.0 ); } @@ -1136,8 +1234,10 @@ void TTrain::OnCommand_reverserincrease( TTrain *Train, command_data const &Comm if( Command.action == GLFW_PRESS ) { if( Train->mvOccupied->DirectionForward() ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback Train->play_sound( Train->dsbReverserKey, Train->dsbSwitch, DSBVOLUME_MAX, 0 ); +#endif // aktualizacja skrajnych pojazdów w składzie if( ( Train->mvOccupied->ActiveDir ) && ( Train->DynamicObject->Mechanik ) ) { @@ -1153,8 +1253,10 @@ void TTrain::OnCommand_reverserdecrease( TTrain *Train, command_data const &Comm if( Command.action == GLFW_PRESS ) { if( Train->mvOccupied->DirectionBackward() ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback Train->play_sound( Train->dsbReverserKey, Train->dsbSwitch, DSBVOLUME_MAX, 0 ); +#endif // aktualizacja skrajnych pojazdów w składzie if( ( Train->mvOccupied->ActiveDir ) && ( Train->DynamicObject->Mechanik ) ) { @@ -1181,10 +1283,12 @@ void TTrain::OnCommand_alerteracknowledge( TTrain *Train, command_data const &Co } // visual feedback Train->ggSecurityResetButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggSecurityResetButton.GetValue() < 0.05 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { // release @@ -1212,8 +1316,10 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command if( Train->ggBatteryButton.SubModel ) { Train->ggBatteryButton.UpdateValue( 1 ); } +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback Train->play_sound( Train->dsbSwitch ); +#endif // side-effects if( Train->mvOccupied->LightsPosNo > 0 ) { Train->SetLights(); @@ -1232,8 +1338,10 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command if( Train->ggBatteryButton.SubModel ) { Train->ggBatteryButton.UpdateValue( 0 ); } +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback Train->play_sound( Train->dsbSwitch ); +#endif // side-effects if( false == Train->mvControlled->ConverterFlag ) { // if there's no (low voltage) power source left, drop pantographs @@ -1254,8 +1362,10 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->mvControlled->PantFrontSP = false; if( Train->mvControlled->PantFront( true ) ) { if( Train->mvControlled->PantFrontStart != 1 ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback Train->play_sound( Train->dsbSwitch ); +#endif // visual feedback Train->ggPantFrontButton.UpdateValue( 1.0 ); // NOTE: currently we animate the selectable pantograph control based on standard key presses @@ -1284,8 +1394,10 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->mvControlled->PantFrontSP = false; if( false == Train->mvControlled->PantFront( false ) ) { if( Train->mvControlled->PantFrontStart != 0 ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback Train->play_sound( Train->dsbSwitch ); +#endif // visual feedback Train->ggPantFrontButton.UpdateValue( 0.0 ); // NOTE: currently we animate the selectable pantograph control based on standard key presses @@ -1303,17 +1415,21 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position if( Train->mvOccupied->PantSwitchType == "impulse" ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->ggPantFrontButton.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->ggPantFrontButton.UpdateValue( 0.0 ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method Train->ggPantSelectedButton.UpdateValue( 0.0 ); // also the switch off button, in cabs which have it +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->ggPantFrontButtonOff.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); } +#endif if( Train->ggPantFrontButtonOff.SubModel ) { Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); } @@ -1335,8 +1451,10 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & Train->mvControlled->PantRearSP = false; if( Train->mvControlled->PantRear( true ) ) { if( Train->mvControlled->PantRearStart != 1 ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback Train->play_sound( Train->dsbSwitch ); +#endif // visual feedback Train->ggPantRearButton.UpdateValue( 1.0 ); // NOTE: currently we animate the selectable pantograph control based on standard key presses @@ -1365,8 +1483,10 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & Train->mvControlled->PantRearSP = false; if( false == Train->mvControlled->PantRear( false ) ) { if( Train->mvControlled->PantRearStart != 0 ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback Train->play_sound( Train->dsbSwitch ); +#endif // visual feedback Train->ggPantRearButton.UpdateValue( 0.0 ); // NOTE: currently we animate the selectable pantograph control based on standard key presses @@ -1384,17 +1504,21 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position if( Train->mvOccupied->PantSwitchType == "impulse" ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->ggPantRearButton.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->ggPantRearButton.UpdateValue( 0.0 ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method Train->ggPantSelectedButton.UpdateValue( 0.0 ); // also the switch off button, in cabs which have it +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->ggPantRearButtonOff.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); } +#endif if( Train->ggPantRearButtonOff.SubModel ) { Train->ggPantRearButtonOff.UpdateValue( 0.0 ); } @@ -1421,14 +1545,18 @@ void TTrain::OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_d if( Train->mvControlled->bPantKurek3 == false ) { // connect pantographs with primary tank Train->mvControlled->bPantKurek3 = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback Train->play_sound( Train->dsbSwitch ); +#endif } else { // connect pantograps with pantograph compressor Train->mvControlled->bPantKurek3 = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback Train->play_sound( Train->dsbSwitch ); +#endif } } } @@ -1451,10 +1579,12 @@ void TTrain::OnCommand_pantographcompressoractivate( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // press or hold to activate Train->mvControlled->PantCompFlag = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Command.action == GLFW_PRESS ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { // release to disable @@ -1481,11 +1611,13 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co // ...and rear Train->mvControlled->PantRearSP = false; Train->mvControlled->PantRear( false ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback // TODO: separate sound effect for pneumatic buttons if( Train->ggPantAllDownButton.GetValue() < 0.35 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggPantAllDownButton.UpdateValue( 1.0 ); if( Train->ggPantSelectedDownButton.SubModel != nullptr ) { @@ -1494,6 +1626,7 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co } else if( Command.action == GLFW_RELEASE ) { // release the button +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback /* // NOTE: release sound disabled as this is typically pneumatic button @@ -1502,6 +1635,7 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co Train->play_sound( Train->dsbSwitch ); } */ +#endif // visual feedback Train->ggPantAllDownButton.UpdateValue( 0.0 ); if( Train->ggPantSelectedDownButton.SubModel != nullptr ) { @@ -1539,19 +1673,23 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } if( Train->ggMainOnButton.SubModel != nullptr ) { // two separate switches to close and break the circuit +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Command.action == GLFW_PRESS ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggMainOnButton.UpdateValue( 1.0 ); } else if( Train->ggMainButton.SubModel != nullptr ) { // single two-state switch +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Command.action == GLFW_PRESS ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggMainButton.UpdateValue( 1.0 ); } @@ -1594,10 +1732,12 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com if( Train->ggMainOffButton.SubModel != nullptr ) { // two separate switches to close and break the circuit +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Command.action == GLFW_PRESS ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggMainOffButton.UpdateValue( 1.0 ); } @@ -1618,10 +1758,12 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com else */ { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Command.action == GLFW_PRESS ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggMainButton.UpdateValue( 0.0 ); } @@ -1647,20 +1789,24 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // for setup with two separate swiches if( Train->ggMainOnButton.SubModel != nullptr ) { Train->ggMainOnButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggMainOnButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } if( Train->ggMainOffButton.SubModel != nullptr ) { Train->ggMainOffButton.UpdateValue( 0.0 ); } // and the two-state switch too, for good measure if( Train->ggMainButton.SubModel != nullptr ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggMainButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggMainButton.UpdateValue( 0.0 ); } @@ -1677,10 +1823,12 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); } } +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggMainOnButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback if( Train->ggMainOnButton.SubModel != nullptr ) { // setup with two separate switches @@ -1691,10 +1839,12 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz if( Train->mvControlled->TrainType == dt_EZT ) { if( Train->ggMainButton.SubModel != nullptr ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggMainButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggMainButton.UpdateValue( 0.0 ); } @@ -1719,10 +1869,12 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma if( ( false == Train->mvControlled->ConverterAllow ) && ( Train->ggConverterButton.GetValue() < 0.5 ) ) { // turn on +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggConverterButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggConverterButton.UpdateValue( 1.0 ); /* @@ -1750,6 +1902,7 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } else { //turn off +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->mvOccupied->ConvSwitchType == "impulse" ) { if( Train->ggConverterOffButton.GetValue() < 0.5 ) { @@ -1761,6 +1914,7 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma Train->play_sound( Train->dsbSwitch ); } } +#endif // visual feedback Train->ggConverterButton.UpdateValue( 0.0 ); if( Train->ggConverterOffButton.SubModel != nullptr ) { @@ -1789,11 +1943,13 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma // on button release... if( Train->mvOccupied->ConvSwitchType == "impulse" ) { // ...return switches to start position if applicable +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( ( Train->ggConverterButton.GetValue() > 0.0 ) || ( Train->ggConverterOffButton.GetValue() > 0.0 ) ) { // sound feedback Train->play_sound( Train->dsbSwitch ); } +#endif Train->ggConverterButton.UpdateValue( 0.0 ); Train->ggConverterOffButton.UpdateValue( 0.0 ); } @@ -1815,10 +1971,12 @@ void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const & if( ( false == Train->mvOccupied->ConverterAllowLocal ) && ( Train->ggConverterLocalButton.GetValue() < 0.5 ) ) { // turn on +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggConverterLocalButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggConverterLocalButton.UpdateValue( 1.0 ); // effect @@ -1836,10 +1994,12 @@ void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const & } else { //turn off +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggConverterLocalButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggConverterLocalButton.UpdateValue( 0.0 ); // effect @@ -1879,19 +2039,23 @@ void TTrain::OnCommand_converteroverloadrelayreset( TTrain *Train, command_data && ( Train->mvControlled->TrainType != dt_EZT ) ) { Train->mvControlled->ConvOvldFlag = false; } +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggConverterFuseButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggConverterFuseButton.UpdateValue( 1.0 ); } else if( Command.action == GLFW_RELEASE ) { // release +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggConverterFuseButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggConverterFuseButton.UpdateValue( 0.0 ); } @@ -1909,10 +2073,12 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm // turn on // visual feedback Train->ggCompressorButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggCompressorButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // impulse type switch has no effect if there's no power // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway // (we're presuming impulse type switch for all EMUs for the time being) @@ -1925,8 +2091,10 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm else { //turn off if( true == Train->mvControlled->CompressorSwitch( false ) ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback Train->play_sound( Train->dsbSwitch ); +#endif // NOTE: we don't have switch type definition for the compresor switch // so for the time being we have hard coded "impulse" switches for all EMUs // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz @@ -1973,10 +2141,12 @@ void TTrain::OnCommand_compressortogglelocal( TTrain *Train, command_data const // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvOccupied->CompressorAllowLocal ) { // turn on +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggCompressorLocalButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggCompressorLocalButton.UpdateValue( 1.0 ); // effect @@ -1984,10 +2154,12 @@ void TTrain::OnCommand_compressortogglelocal( TTrain *Train, command_data const } else { //turn off +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggCompressorLocalButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggCompressorLocalButton.UpdateValue( 0.0 ); // effect @@ -2027,10 +2199,12 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = true; } } +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggStLinOffButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggStLinOffButton.UpdateValue( 1.0 ); // effect @@ -2074,10 +2248,12 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false; } } +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggStLinOffButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggStLinOffButton.UpdateValue( 0.0 ); } @@ -2103,10 +2279,12 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false; } } +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggStLinOffButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggStLinOffButton.UpdateValue( 0.0 ); } @@ -2123,10 +2301,14 @@ void TTrain::OnCommand_motordisconnect( TTrain *Train, command_data const &Comma } if( Command.action == GLFW_PRESS ) { +#ifdef EU07_USE_OLD_CONTROLSOUNDS if( true == Train->mvControlled->CutOffEngine() ) { // sound feedback Train->play_sound( Train->dsbSwitch ); } +#else + Train->mvControlled->CutOffEngine(); +#endif } } @@ -2139,10 +2321,12 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command if( true == Train->mvControlled->CurrentSwitch( true ) ) { // visual feedback Train->ggMaxCurrentCtrl.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggMaxCurrentCtrl.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } else { @@ -2150,10 +2334,12 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command if( true == Train->mvControlled->CurrentSwitch( false ) ) { // visual feedback Train->ggMaxCurrentCtrl.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggMaxCurrentCtrl.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2171,19 +2357,23 @@ void TTrain::OnCommand_motoroverloadrelayreset( TTrain *Train, command_data cons if( Command.action == GLFW_PRESS ) { // press Train->mvControlled->FuseOn(); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggFuseButton.GetValue() < 0.05 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggFuseButton.UpdateValue( 1.0 ); } else if( Command.action == GLFW_RELEASE ) { // release +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggFuseButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggFuseButton.UpdateValue( 0.0 ); } @@ -2208,20 +2398,24 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback Train->ggLeftLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggLeftLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback Train->ggLeftLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggLeftLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2245,20 +2439,24 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const & Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback Train->ggRightLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRightLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback Train->ggRightLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRightLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2282,20 +2480,24 @@ void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const & Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback Train->ggUpperLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggUpperLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback Train->ggUpperLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggUpperLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2319,20 +2521,24 @@ void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &C Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback Train->ggLeftEndLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggLeftEndLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback Train->ggLeftEndLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggLeftEndLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2356,20 +2562,24 @@ void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const & Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback Train->ggRightEndLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRightEndLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback Train->ggRightEndLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRightEndLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2394,20 +2604,24 @@ void TTrain::OnCommand_headlighttogglerearleft( TTrain *Train, command_data cons Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback Train->ggRearLeftLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearLeftLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback Train->ggRearLeftLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearLeftLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2432,20 +2646,24 @@ void TTrain::OnCommand_headlighttogglerearright( TTrain *Train, command_data con Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback Train->ggRearRightLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearRightLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback Train->ggRearRightLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearRightLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2469,20 +2687,24 @@ void TTrain::OnCommand_headlighttogglerearupper( TTrain *Train, command_data con Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback Train->ggRearUpperLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearUpperLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback Train->ggRearUpperLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearUpperLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2507,20 +2729,24 @@ void TTrain::OnCommand_redmarkertogglerearleft( TTrain *Train, command_data cons Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback Train->ggRearLeftEndLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearLeftEndLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback Train->ggRearLeftEndLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearLeftEndLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2545,20 +2771,24 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback Train->ggRearRightEndLightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearRightEndLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback Train->ggRearRightEndLightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearRightEndLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif } } } @@ -2579,20 +2809,24 @@ void TTrain::OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &C if( false == Train->DynamicObject->DimHeadlights ) { // turn on Train->DynamicObject->DimHeadlights = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggDimHeadlightsButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggDimHeadlightsButton.UpdateValue( 1.0 ); } else { //turn off Train->DynamicObject->DimHeadlights = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggDimHeadlightsButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggDimHeadlightsButton.UpdateValue( 0.0 ); } @@ -2616,10 +2850,12 @@ void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &C // turn on Train->bCabLight = true; Train->btCabLight.TurnOn(); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggCabLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggCabLightButton.UpdateValue( 1.0 ); } @@ -2627,10 +2863,12 @@ void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &C //turn off Train->bCabLight = false; Train->btCabLight.TurnOff(); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggCabLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggCabLightButton.UpdateValue( 0.0 ); } @@ -2652,20 +2890,24 @@ void TTrain::OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const if( false == Train->bCabLightDim ) { // turn on Train->bCabLightDim = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggCabLightDimButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggCabLightDimButton.UpdateValue( 1.0 ); } else { //turn off Train->bCabLightDim = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggCabLightDimButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggCabLightDimButton.UpdateValue( 0.0 ); } @@ -2689,20 +2931,24 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const if( false == Train->InstrumentLightActive ) { // turn on Train->InstrumentLightActive = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggInstrumentLightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggInstrumentLightButton.UpdateValue( 1.0 ); } else { //turn off Train->InstrumentLightActive = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggInstrumentLightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggInstrumentLightButton.UpdateValue( 0.0 ); } @@ -2723,20 +2969,24 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command if( false == Train->mvControlled->Heating ) { // turn on Train->mvControlled->Heating = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggTrainHeatingButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggTrainHeatingButton.UpdateValue( 1.0 ); } else { //turn off Train->mvControlled->Heating = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggTrainHeatingButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggTrainHeatingButton.UpdateValue( 0.0 ); } @@ -2759,19 +3009,23 @@ void TTrain::OnCommand_generictoggle( TTrain *Train, command_data const &Command // only reacting to press, so the switch doesn't flip back and forth if key is held down if( item.GetValue() < 0.25 ) { // turn on +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( item.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback item.UpdateValue( 1.0 ); } else { //turn off +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( item.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback item.UpdateValue( 0.0 ); } @@ -2794,10 +3048,12 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman // TODO: check wheter we really need separate flags for this Train->mvControlled->DoorSignalling = true; Train->mvOccupied->DoorBlocked = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggDoorSignallingButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggDoorSignallingButton.UpdateValue( 1.0 ); } @@ -2806,10 +3062,12 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman // TODO: check wheter we really need separate flags for this Train->mvControlled->DoorSignalling = false; Train->mvOccupied->DoorBlocked = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggDoorSignallingButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggDoorSignallingButton.UpdateValue( 0.0 ); } @@ -2831,10 +3089,12 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorLeft( true ) ) { Train->ggDoorLeftButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorLeftButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->play_sound( Train->dsbDoorOpen ); } } @@ -2842,10 +3102,12 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman // in the rear cab sides are reversed if( Train->mvOccupied->DoorRight( true ) ) { Train->ggDoorRightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorRightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->play_sound( Train->dsbDoorOpen ); } } @@ -2855,10 +3117,12 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorLeft( false ) ) { Train->ggDoorLeftButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->play_sound( Train->dsbDoorClose ); } } @@ -2866,10 +3130,12 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman // in the rear cab sides are reversed if( Train->mvOccupied->DoorRight( false ) ) { Train->ggDoorRightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorRightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->play_sound( Train->dsbDoorClose ); } } @@ -2892,10 +3158,12 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorRight( true ) ) { Train->ggDoorRightButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorRightButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->play_sound( Train->dsbDoorOpen ); } } @@ -2903,10 +3171,12 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma // in the rear cab sides are reversed if( Train->mvOccupied->DoorLeft( true ) ) { Train->ggDoorLeftButton.UpdateValue( 1.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorLeftButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->play_sound( Train->dsbDoorOpen ); } } @@ -2916,10 +3186,12 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorRight( false ) ) { Train->ggDoorRightButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorRightButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->play_sound( Train->dsbDoorClose ); } } @@ -2927,10 +3199,12 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma // in the rear cab sides are reversed if( Train->mvOccupied->DoorLeft( false ) ) { Train->ggDoorLeftButton.UpdateValue( 0.0 ); +#ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif Train->play_sound( Train->dsbDoorClose ); } } @@ -2952,10 +3226,12 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com if( false == Train->mvControlled->DepartureSignal ) { // turn on Train->mvControlled->DepartureSignal = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggDepartureSignalButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggDepartureSignalButton.UpdateValue( 1.0 ); } @@ -2963,10 +3239,12 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com else if( Command.action == GLFW_RELEASE ) { // turn off Train->mvControlled->DepartureSignal = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggDepartureSignalButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggDepartureSignalButton.UpdateValue( 0.0 ); } @@ -2993,11 +3271,13 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma Train->mvControlled->WarningSignal &= ~2; } */ +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( ( Train->ggHornButton.GetValue() > -0.5 ) || ( Train->ggHornLowButton.GetValue() < 0.5 ) ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggHornButton.UpdateValue( -1.0 ); Train->ggHornLowButton.UpdateValue( 1.0 ); @@ -3010,11 +3290,13 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); */ Train->mvOccupied->WarningSignal &= ~1; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( ( Train->ggHornButton.GetValue() < -0.5 ) || ( Train->ggHornLowButton.GetValue() > 0.5 ) ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggHornButton.UpdateValue( 0.0 ); Train->ggHornLowButton.UpdateValue( 0.0 ); @@ -3042,10 +3324,12 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm Train->mvControlled->WarningSignal &= ~1; } */ +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggHornButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggHornButton.UpdateValue( 1.0 ); Train->ggHornHighButton.UpdateValue( 1.0 ); @@ -3058,10 +3342,12 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); */ Train->mvOccupied->WarningSignal &= ~2; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggHornButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggHornButton.UpdateValue( 0.0 ); Train->ggHornHighButton.UpdateValue( 0.0 ); @@ -3085,20 +3371,24 @@ void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command ) if( false == Train->mvOccupied->Radio ) { // turn on Train->mvOccupied->Radio = true; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggRadioButton.GetValue() < 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggRadioButton.UpdateValue( 1.0 ); } else { // turn off Train->mvOccupied->Radio = false; +#ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggRadioButton.GetValue() > 0.5 ) { Train->play_sound( Train->dsbSwitch ); } +#endif // visual feedback Train->ggRadioButton.UpdateValue( 0.0 ); } @@ -6452,8 +6742,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { // ABu: wstawione warunki, wczesniej tylko to: // str=Parser->GetNextSymbol().LowerCase(); - if (parse == true) - { + if (parse == true) { token = ""; parser->getTokens(); @@ -7032,9 +7321,9 @@ void TTrain::set_cab_controls() { // TODO: refactor the cabin controls into some sensible structure bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int const Cabindex) { - +/* TButton *bt; // roboczy wskaźnik na obiekt animujący lampkę - +*/ // SEKCJA LAMPEK if (Label == "i-maxft:") { @@ -7250,9 +7539,9 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co else if (Label == "i-doors:") { int i = Parser.getToken() - 1; - bt = Cabine[Cabindex].Button(-1); // pierwsza wolna lampka - bt->Load(Parser, DynamicObject->mdKabina); - bt->AssignBool(bDoors[0] + 3 * i); + auto &button = Cabine[Cabindex].Button(-1); // pierwsza wolna lampka + button.Load(Parser, DynamicObject->mdKabina); + button.AssignBool(bDoors[0] + 3 * i); } else { @@ -7269,7 +7558,9 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co // TODO: refactor the cabin controls into some sensible structure bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int const Cabindex) { +/* TGauge *gg { nullptr }; // roboczy wskaźnik na obiekt animujący gałkę +*/ std::unordered_map gauges = { { "mainctrl:", ggMainCtrl }, { "scndctrl:", ggScndCtrl }, @@ -7350,73 +7641,55 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con else if( Label == "mainctrlact:" ) { ggMainCtrlAct.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); } -/* - else if (Label == "universal1:") - { - ggUniversal1Button.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); - } - else if (Label == "universal2:") - { - ggUniversal2Button.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); - } - else if (Label == "universal3:") - { - ggInstrumentLightButton.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); - } - else if (Label == "universal4:") - { - ggUniversal4Button.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); - } -*/ // SEKCJA WSKAZNIKOW else if ((Label == "tachometer:") || (Label == "tachometerb:")) { // predkosciomierz wskaźnikowy z szarpaniem - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(&fTachoVelocityJump); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(&fTachoVelocityJump); } else if (Label == "tachometern:") { // predkosciomierz wskaźnikowy bez szarpania - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(&fTachoVelocity); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(&fTachoVelocity); } else if (Label == "tachometerd:") { // predkosciomierz cyfrowy - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(&fTachoVelocity); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(&fTachoVelocity); } else if ((Label == "hvcurrent1:") || (Label == "hvcurrent1b:")) { // 1szy amperomierz - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(fHCurrent + 1); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(fHCurrent + 1); } else if ((Label == "hvcurrent2:") || (Label == "hvcurrent2b:")) { // 2gi amperomierz - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(fHCurrent + 2); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(fHCurrent + 2); } else if ((Label == "hvcurrent3:") || (Label == "hvcurrent3b:")) { // 3ci amperomierz - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałska - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(fHCurrent + 3); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałska + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(fHCurrent + 3); } else if ((Label == "hvcurrent:") || (Label == "hvcurrentb:")) { // amperomierz calkowitego pradu - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(fHCurrent); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(fHCurrent); } else if (Label == "eimscreen:") { @@ -7424,9 +7697,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con int i, j; Parser.getTokens(2, false); Parser >> i >> j; - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(&fEIMParams[i][j]); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(&fEIMParams[i][j]); } else if (Label == "brakes:") { @@ -7434,43 +7707,43 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con int i, j; Parser.getTokens(2, false); Parser >> i >> j; - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(&fPress[i - 1][j]); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(&fPress[i - 1][j]); } else if ((Label == "brakepress:") || (Label == "brakepressb:")) { // manometr cylindrow hamulcowych // Ra 2014-08: przeniesione do TCab - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina, NULL, 0.1); - gg->AssignDouble(&mvOccupied->BrakePress); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); + gauge.AssignDouble(&mvOccupied->BrakePress); } else if ((Label == "pipepress:") || (Label == "pipepressb:")) { // manometr przewodu hamulcowego - TGauge *gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina, NULL, 0.1); - gg->AssignDouble(&mvOccupied->PipePress); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); + gauge.AssignDouble(&mvOccupied->PipePress); } else if (Label == "limpipepress:") { // manometr zbiornika sterujacego zaworu maszynisty - ggZbS.Load(Parser, DynamicObject->mdKabina, NULL, 0.1); + ggZbS.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); } else if (Label == "cntrlpress:") { // manometr zbiornika kontrolnego/rorzďż˝du - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina, NULL, 0.1); - gg->AssignDouble(&mvControlled->PantPress); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); + gauge.AssignDouble(&mvControlled->PantPress); } else if ((Label == "compressor:") || (Label == "compressorb:")) { // manometr sprezarki/zbiornika glownego - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina, NULL, 0.1); - gg->AssignDouble(&mvOccupied->Compressor); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); + gauge.AssignDouble(&mvOccupied->Compressor); } // yB - dla drugiej sekcji else if (Label == "hvbcurrent1:") @@ -7500,12 +7773,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con if (Parser.getToken() == "analog") { // McZapkie-300302: zegarek - ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), gt_Rotate, - 0.016666667, 0, 0); - ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), gt_Rotate, - 0.016666667, 0, 0); - ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), gt_Rotate, - 0.083333333, 0, 0); + ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), gt_Rotate, 1.0/60.0, 0, 0); + ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), gt_Rotate, 1.0/60.0, 0, 0); + ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), gt_Rotate, 1.0/12.0, 0, 0); } } else if (Label == "evoltage:") @@ -7516,9 +7786,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con else if (Label == "hvoltage:") { // woltomierz wysokiego napiecia - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(&fHVoltage); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(&fHVoltage); } else if (Label == "lvoltage:") { @@ -7528,29 +7798,29 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con else if (Label == "enrot1m:") { // obrotomierz - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(fEngine + 1); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(fEngine + 1); } // ggEnrot1m.Load(Parser,DynamicObject->mdKabina); else if (Label == "enrot2m:") { // obrotomierz - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(fEngine + 2); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(fEngine + 2); } // ggEnrot2m.Load(Parser,DynamicObject->mdKabina); else if (Label == "enrot3m:") { // obrotomierz - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignFloat(fEngine + 3); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignFloat(fEngine + 3); } // ggEnrot3m.Load(Parser,DynamicObject->mdKabina); else if (Label == "engageratio:") { // np. ciśnienie sterownika sprzęgła - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignDouble(&mvControlled->dizel_engage); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignDouble(&mvControlled->dizel_engage); } // ggEngageRatio.Load(Parser,DynamicObject->mdKabina); else if (Label == "maingearstatus:") { @@ -7564,9 +7834,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con else if (Label == "distcounter:") { // Ra 2014-07: licznik kilometrów - gg = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gg->Load(Parser, DynamicObject->mdKabina); - gg->AssignDouble(&mvControlled->DistCounter); + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject->mdKabina); + gauge.AssignDouble(&mvControlled->DistCounter); } else { diff --git a/Train.h b/Train.h index 6d8fcef9..c9c9e6d2 100644 --- a/Train.h +++ b/Train.h @@ -34,8 +34,9 @@ class TCab public: TCab(); ~TCab(); - void Init(double Initx1, double Inity1, double Initz1, double Initx2, double Inity2, - double Initz2, bool InitEnabled, bool InitOccupied); +/* + void Init(double Initx1, double Inity1, double Initz1, double Initx2, double Inity2, double Initz2, bool InitEnabled, bool InitOccupied); +*/ void Load(cParser &Parser); vector3 CabPos1; vector3 CabPos2; @@ -43,17 +44,19 @@ class TCab bool bOccupied; double dimm_r, dimm_g, dimm_b; // McZapkie-120503: tlumienie swiatla double intlit_r, intlit_g, intlit_b; // McZapkie-120503: oswietlenie kabiny - double intlitlow_r, intlitlow_g, - intlitlow_b; // McZapkie-120503: przyciemnione oswietlenie kabiny + double intlitlow_r, intlitlow_g, intlitlow_b; // McZapkie-120503: przyciemnione oswietlenie kabiny private: - // bool bChangePossible; +/* TGauge *ggList; // Ra 2014-08: lista animacji macierzowych (gałek) w kabinie int iGaugesMax, iGauges; // ile miejsca w tablicy i ile jest w użyciu TButton *btList; // Ra 2014-08: lista animacji dwustanowych (lampek) w kabinie int iButtonsMax, iButtons; // ile miejsca w tablicy i ile jest w użyciu +*/ + std::vector ggList; + std::vector btList; public: - TGauge *Gauge(int n = -1); // pobranie adresu obiektu - TButton *Button(int n = -1); // pobranie adresu obiektu + TGauge &Gauge(int n = -1); // pobranie adresu obiektu + TButton &Button(int n = -1); // pobranie adresu obiektu void Update(); }; @@ -103,11 +106,9 @@ class TTrain // sets cabin controls based on current state of the vehicle // NOTE: we can get rid of this function once we have per-cab persistent state void set_cab_controls(); - // initializes a gauge matching provided label. returns: true if the label was found, false - // otherwise + // initializes a gauge matching provided label. returns: true if the label was found, false otherwise bool initialize_gauge(cParser &Parser, std::string const &Label, int const Cabindex); - // initializes a button matching provided label. returns: true if the label was found, false - // otherwise + // initializes a button matching provided label. returns: true if the label was found, false otherwise bool initialize_button(cParser &Parser, std::string const &Label, int const Cabindex); // plays specified sound, or fallback sound if the primary sound isn't presend // NOTE: temporary routine until sound system is sorted out and paired with switches @@ -209,12 +210,7 @@ public: // reszta może by?publiczna TGauge ggClockSInd; TGauge ggClockMInd; TGauge ggClockHInd; - // TGauge ggHVoltage; TGauge ggLVoltage; - // TGauge ggEnrot1m; - // TGauge ggEnrot2m; - // TGauge ggEnrot3m; - // TGauge ggEngageRatio; TGauge ggMainGearStatus; TGauge ggEngineVoltage; @@ -277,13 +273,7 @@ public: // reszta może by?publiczna TGauge ggHornLowButton; TGauge ggHornHighButton; TGauge ggNextCurrentButton; -/* - // ABu 090305 - uniwersalne przyciski - TGauge ggUniversal1Button; - TGauge ggUniversal2Button; - TGauge ggUniversal4Button; - bool Universal4Active; -*/ + std::array ggUniversals; // NOTE: temporary arrangement until we have dynamically built control table TGauge ggInstrumentLightButton; @@ -336,7 +326,6 @@ public: // reszta może by?publiczna TButton btLampkaRadio; TButton btLampkaHamowanie1zes; TButton btLampkaHamowanie2zes; - // TButton btLampkaUnknown; TButton btLampkaOpory; TButton btLampkaWysRozr; TButton btInstrumentLight; @@ -363,8 +352,6 @@ public: // reszta może by?publiczna TButton btLampkaBoczniki; TButton btLampkaMaxSila; TButton btLampkaPrzekrMaxSila; - // TButton bt; - // TButton btLampkaDoorLeft; TButton btLampkaDoorRight; TButton btLampkaDepartureSignal; @@ -439,8 +426,6 @@ public: // reszta może by?publiczna PSound dsbHasler; PSound dsbBuzzer; PSound dsbSlipAlarm; // Bombardier 011010: alarm przy poslizgu dla 181/182 - // TFadeSound sConverter; //przetwornica - // TFadeSound sSmallCompressor; //przetwornica int iCabLightFlag; // McZapkie:120503: oswietlenie kabiny (0: wyl, 1: przyciemnione, 2: pelne) bool bCabLight; // hunter-091012: czy swiatlo jest zapalone? @@ -454,11 +439,6 @@ public: // reszta może by?publiczna PSound dsbCouplerStretch; PSound dsbEN57_CouplerStretch; PSound dsbBufferClamp; - // TSubModel *smCzuwakShpOn; - // TSubModel *smCzuwakOn; - // TSubModel *smShpOn; - // TSubModel *smCzuwakShpOff; - // double fCzuwakTimer; double fBlinkTimer; float fHaslerTimer; float fConverterTimer; // hunter-261211: dla przekaznika diff --git a/TrkFoll.cpp b/TrkFoll.cpp index d610058e..77c0adf4 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -114,7 +114,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) { // omijamy cały ten blok, gdy tor nie ma on żadnych eventów (większość nie ma) if (fDistance < 0) { - if (iSetFlag(iEventFlag, -1)) // zawsze zeruje flagę sprawdzenia, jak mechanik + if (SetFlag(iEventFlag, -1)) // zawsze zeruje flagę sprawdzenia, jak mechanik // dosiądzie, to się nie wykona if (Owner->Mechanik->Primary()) // tylko dla jednego członu // if (TestFlag(iEventFlag,1)) //McZapkie-280503: wyzwalanie event tylko dla @@ -126,7 +126,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) // Owner->RaAxleEvent(pCurrentTrack->Event1); //Ra: dynamic zdecyduje, czy dodać do // kolejki // if (TestFlag(iEventallFlag,1)) - if (iSetFlag(iEventallFlag, + if (SetFlag(iEventallFlag, -1)) // McZapkie-280503: wyzwalanie eventall dla wszystkich pojazdow if (bPrimary && pCurrentTrack->evEventall1 && (!pCurrentTrack->evEventall1->iQueued)) @@ -136,7 +136,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) } else if (fDistance > 0) { - if (iSetFlag(iEventFlag, -2)) // zawsze ustawia flagę sprawdzenia, jak mechanik + if (SetFlag(iEventFlag, -2)) // zawsze ustawia flagę sprawdzenia, jak mechanik // dosiądzie, to się nie wykona if (Owner->Mechanik->Primary()) // tylko dla jednego członu // if (TestFlag(iEventFlag,2)) //sprawdzanie jest od razu w pierwszym @@ -147,7 +147,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) // Owner->RaAxleEvent(pCurrentTrack->Event2); //Ra: dynamic zdecyduje, czy dodać do // kolejki // if (TestFlag(iEventallFlag,2)) - if (iSetFlag(iEventallFlag, + if (SetFlag(iEventallFlag, -2)) // sprawdza i zeruje na przyszłość, true jeśli zmieni z 2 na 0 if (bPrimary && pCurrentTrack->evEventall2 && (!pCurrentTrack->evEventall2->iQueued)) diff --git a/parser.h b/parser.h index 7582c0e1..b8176c0a 100644 --- a/parser.h +++ b/parser.h @@ -33,29 +33,28 @@ class cParser //: public std::stringstream virtual ~cParser(); // methods: template - cParser& + cParser & operator>>( Type_ &Right ); template <> - cParser& + cParser & operator>>( std::string &Right ); template <> - cParser& + cParser & operator>>( bool &Right ); - template - _Output - getToken( bool const ToLower = true ) - { - getTokens( 1, ToLower ); - _Output output; - *this >> output; - return output; - }; + template + Output_ + getToken( bool const ToLower = true, const char *Break = "\n\r\t ;" ) { + getTokens( 1, ToLower, Break ); + Output_ output; + *this >> output; + return output; }; template <> bool - getToken( bool const ToLower ) { - - return ( getToken() == "true" ); - } + getToken( bool const ToLower, const char *Break ) { + auto const token = getToken( true, Break ); + return ( ( token == "true" ) + || ( token == "yes" ) + || ( token == "1" ) ); } inline void ignoreToken() { readToken(); @@ -77,7 +76,13 @@ class cParser //: public std::stringstream { return !mStream->fail(); }; - bool getTokens(unsigned int Count = 1, bool ToLower = true, const char *Break = "\n\r\t ;"); + bool getTokens(unsigned int Count = 1, bool ToLower = true, char const *Break = "\n\r\t ;"); + // returns next incoming token, if any, without removing it from the set + std::string peek() const { + return ( + false == tokens.empty() ? + tokens.front() : + "" ); } // returns percentage of file processed so far int getProgress() const; int getFullProgress() const; diff --git a/uilayer.cpp b/uilayer.cpp index e6ca85c5..0a98e41b 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -44,7 +44,7 @@ ui_layer::init( GLFWwindow *Window ) { DEFAULT_PITCH | FF_DONTCARE, // family and pitch "Lucida Console"); // font name ::SelectObject(hDC, font); // selects the font we want - if( true == ::wglUseFontBitmaps( hDC, 32, 96, m_fontbase ) ) { + if( TRUE == ::wglUseFontBitmaps( hDC, 32, 96, m_fontbase ) ) { // builds 96 characters starting at character 32 WriteLog( "Display Lists font used" ); //+AnsiString(glGetError()) WriteLog( "Font init OK" ); //+AnsiString(glGetError()) @@ -151,8 +151,8 @@ ui_layer::render_progress() { Global::iWindowWidth ); float const heightratio = ( screenratio >= ( 4.0f / 3.0f ) ? - Global::iWindowHeight / 768.0 : - Global::iWindowHeight / 768.0 * screenratio / ( 4.0f / 3.0f ) ); + Global::iWindowHeight / 768.f : + Global::iWindowHeight / 768.f * screenratio / ( 4.0f / 3.0f ) ); float const height = 768.0f * heightratio; ::glColor4f( 216.0f / 255.0f, 216.0f / 255.0f, 216.0f / 255.0f, 1.0f ); @@ -176,8 +176,8 @@ ui_layer::render_panels() { glPushAttrib( GL_ENABLE_BIT ); glDisable( GL_TEXTURE_2D ); - float const width = std::min( 4.0f / 3.0f, static_cast(Global::iWindowWidth) / std::max( 1, Global::iWindowHeight ) ) * Global::iWindowHeight; - float const height = Global::iWindowHeight / 768.0; + float const width = std::min( 4.f / 3.f, static_cast(Global::iWindowWidth) / std::max( 1, Global::iWindowHeight ) ) * Global::iWindowHeight; + float const height = Global::iWindowHeight / 768.f; for( auto const &panel : m_panels ) { @@ -186,8 +186,8 @@ ui_layer::render_panels() { ::glColor4fv( &line.color.x ); ::glRasterPos2f( - 0.5 * ( Global::iWindowWidth - width ) + panel->origin_x * height, - panel->origin_y * height + 20.0 * lineidx ); + 0.5f * ( Global::iWindowWidth - width ) + panel->origin_x * height, + panel->origin_y * height + 20.f * lineidx ); print( line.data ); ++lineidx; } @@ -255,14 +255,14 @@ ui_layer::quad( float4 const &Coordinates, float4 const &Color ) { float const screenratio = static_cast( Global::iWindowWidth ) / Global::iWindowHeight; float const width = - ( screenratio >= (4.0f/3.0f) ? - ( 4.0f / 3.0f ) * Global::iWindowHeight : + ( screenratio >= ( 4.f / 3.f ) ? + ( 4.f / 3.f ) * Global::iWindowHeight : Global::iWindowWidth ); float const heightratio = - ( screenratio >= ( 4.0f / 3.0f ) ? - Global::iWindowHeight / 768.0 : - Global::iWindowHeight / 768.0 * screenratio / ( 4.0f / 3.0f ) ); - float const height = 768.0f * heightratio; + ( screenratio >= ( 4.f / 3.f ) ? + Global::iWindowHeight / 768.f : + Global::iWindowHeight / 768.f * screenratio / ( 4.f / 3.f ) ); + float const height = 768.f * heightratio; /* float const heightratio = Global::iWindowHeight / 768.0f; float const height = 768.0f * heightratio; @@ -272,10 +272,10 @@ ui_layer::quad( float4 const &Coordinates, float4 const &Color ) { glBegin( GL_TRIANGLE_STRIP ); - glTexCoord2f( 0.0f, 1.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5 * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); - glTexCoord2f( 0.0f, 0.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5 * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); - glTexCoord2f( 1.0f, 1.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5 * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); - glTexCoord2f( 1.0f, 0.0f ); glVertex2f( 0.5 * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5 * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); + glTexCoord2f( 0.f, 1.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); + glTexCoord2f( 0.f, 0.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); + glTexCoord2f( 1.f, 1.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); + glTexCoord2f( 1.f, 0.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); glEnd(); } diff --git a/version.h b/version.h index 2fe8cfad..53cafe07 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 712 +#define VERSION_MINOR 714 #define VERSION_REVISION 0 From d51a4ea985a7518e3041cbc996989e839e9e3edb Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 16 Jul 2017 01:57:22 +0200 Subject: [PATCH 138/426] build 170715. custom sounds for cab lights, optional fallback on legacy sounds for controls without their own sound definitions --- Button.cpp | 158 ++++++++++++++++++------- Button.h | 75 ++++++------ Gauge.cpp | 2 +- Gauge.h | 5 +- Train.cpp | 323 ++++++++++++++++++++++++++++----------------------- renderer.cpp | 4 +- version.h | 2 +- 7 files changed, 338 insertions(+), 231 deletions(-) diff --git a/Button.cpp b/Button.cpp index b6ed1d3f..4af9a652 100644 --- a/Button.cpp +++ b/Button.cpp @@ -9,11 +9,11 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Button.h" +#include "parser.h" +#include "Model3d.h" #include "Console.h" #include "logs.h" -//--------------------------------------------------------------------------- - TButton::TButton() { iFeedbackBit = 0; @@ -21,13 +21,11 @@ TButton::TButton() Clear(); }; -TButton::~TButton(){}; - void TButton::Clear(int i) { - pModelOn = NULL; - pModelOff = NULL; - bOn = false; + pModelOn = nullptr; + pModelOff = nullptr; + m_state = false; if (i >= 0) FeedbackBitSet(i); Update(); // kasowanie bitu Feedback, o ile jakiś ustawiony @@ -35,52 +33,134 @@ void TButton::Clear(int i) void TButton::Init(std::string const &asName, TModel3d *pModel, bool bNewOn) { - if (!pModel) - return; // nie ma w czym szukać + if( pModel == nullptr ) { return; } + pModelOn = pModel->GetFromName( (asName + "_on").c_str() ); pModelOff = pModel->GetFromName( (asName + "_off").c_str() ); - bOn = bNewOn; + m_state = bNewOn; Update(); }; -void TButton::Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2) -{ - std::string const token = Parser.getToken(); - if (pModel1) - { // poszukiwanie submodeli w modelu - Init(token, pModel1, false); - if (pModel2) - if (!pModelOn && !pModelOff) - Init(token, pModel2, false); // może w drugim będzie (jak nie w kabinie, - // to w zewnętrznym) - } - else - { - pModelOn = NULL; - pModelOff = NULL; +void TButton::Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2) { - ErrorLog( "Failed to locate sub-model \"" + token + "\" in 3d model \"" + pModel1->NameGet() + "\"" ); + std::string submodelname; + + Parser.getTokens(); + if( Parser.peek() != "{" ) { + // old fixed size config + Parser >> submodelname; } + else { + // new, block type config + // TODO: rework the base part into yaml-compatible flow style mapping + cParser mappingparser( Parser.getToken( false, "}" ) ); + submodelname = mappingparser.getToken( false ); + // new, variable length section + while( true == Load_mapping( mappingparser ) ) { + ; // all work done by while() + } + } + + if( pModel1 ) { + // poszukiwanie submodeli w modelu + Init( submodelname, pModel1, false ); + if( ( pModelOn != nullptr ) || ( pModelOff != nullptr ) ) { + // we got our models, bail out + return; + } + } + if( pModel2 ) { + // poszukiwanie submodeli w modelu + Init( submodelname, pModel2, false ); + if( ( pModelOn != nullptr ) || ( pModelOff != nullptr ) ) { + // we got our models, bail out + return; + } + } + // if we failed to locate even one state submodel, cry + ErrorLog( "Failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + pModel1->NameGet() + "\"" ); }; -void TButton::Update() -{ - if (bData != NULL) - bOn = (*bData); - if (pModelOn) - pModelOn->iVisible = bOn; - if (pModelOff) - pModelOff->iVisible = !bOn; - if (iFeedbackBit) // jeżeli generuje informację zwrotną - { - if (bOn) // zapalenie +bool +TButton::Load_mapping( cParser &Input ) { + + if( false == Input.getTokens( 2, true, ", " ) ) { + return false; + } + + std::string key, value; + Input + >> key + >> value; + + if( key == "soundinc:" ) { + m_soundfxincrease = ( + value != "none" ? + TSoundsManager::GetFromName( value, true ) : + nullptr ); + } + else if( key == "sounddec:" ) { + m_soundfxdecrease = ( + value != "none" ? + TSoundsManager::GetFromName( value, true ) : + nullptr ); + } + return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized +} + +void +TButton::Turn( bool const State ) { + + if( State != m_state ) { + + m_state = State; + play(); + Update(); + } +} + +void TButton::Update() { + + if( ( bData != nullptr ) + && ( *bData != m_state ) ) { + + m_state = ( *bData ); + play(); + } + + if( pModelOn != nullptr ) { pModelOn->iVisible = m_state; } + if( pModelOff != nullptr ) { pModelOff->iVisible = (!m_state); } + + if (iFeedbackBit) { + // jeżeli generuje informację zwrotną + if (m_state) // zapalenie Console::BitsSet(iFeedbackBit); else Console::BitsClear(iFeedbackBit); } }; -void TButton::AssignBool(bool *bValue) -{ +void TButton::AssignBool(bool const *bValue) { + bData = bValue; } + +void +TButton::play() { + + play( + m_state == true ? + m_soundfxincrease : + m_soundfxdecrease ); +} + +void +TButton::play( PSound Sound ) { + + if( Sound == nullptr ) { return; } + + Sound->SetCurrentPosition( 0 ); + Sound->SetVolume( DSBVOLUME_MAX ); + Sound->Play( 0, 0, 0 ); + return; +} diff --git a/Button.h b/Button.h index 0b79c19f..76737cd8 100644 --- a/Button.h +++ b/Button.h @@ -7,59 +7,52 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef ButtonH -#define ButtonH +#pragma once -#include -#include "Model3d.h" -#include "parser.h" +#include "Classes.h" +#include "sound.h" class TButton { // animacja dwustanowa, włącza jeden z dwóch submodeli (jednego // z nich może nie być) private: - TSubModel *pModelOn, *pModelOff; // submodel dla stanu załączonego i wyłączonego - bool bOn; - bool *bData; - int iFeedbackBit; // Ra: bit informacji zwrotnej, do wyprowadzenia na pulpit + TSubModel + *pModelOn { nullptr }, + *pModelOff { nullptr }; // submodel dla stanu załączonego i wyłączonego + bool m_state { false }; + bool const *bData { nullptr }; + int iFeedbackBit { 0 }; // Ra: bit informacji zwrotnej, do wyprowadzenia na pulpit + PSound m_soundfxincrease { nullptr }; // sound associated with increasing control's value + PSound m_soundfxdecrease { nullptr }; // sound associated with decreasing control's value +// methods + // imports member data pair from the config file + bool + Load_mapping( cParser &Input ); + // plays the sound associated with current state + void + play(); + // plays specified sound + void + play( PSound Sound ); public: TButton(); - ~TButton(); - void Clear(int i = -1); - inline void FeedbackBitSet(int i) - { - iFeedbackBit = 1 << i; - }; - inline void Turn(bool to) - { - bOn = to; - Update(); - }; - inline void TurnOn() - { - bOn = true; - Update(); - }; - inline void TurnOff() - { - bOn = false; - Update(); - }; - inline void Switch() - { - bOn = !bOn; - Update(); - }; - inline bool Active() - { - return (pModelOn) || (pModelOff); - }; + void Clear(int const i = -1); + inline void FeedbackBitSet(int const i) { + iFeedbackBit = 1 << i; }; + void Turn( bool const State ); + inline void TurnOn() { + Turn( true ); }; + inline void TurnOff() { + Turn( false ); }; + inline void Switch() { + Turn( !m_state ); }; + inline bool Active() { + return (pModelOn) || (pModelOff); }; void Update(); void Init(std::string const &asName, TModel3d *pModel, bool bNewOn = false); void Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2 = NULL); - void AssignBool(bool *bValue); + void AssignBool(bool const *bValue); }; //--------------------------------------------------------------------------- -#endif diff --git a/Gauge.cpp b/Gauge.cpp index e6e6f0ec..125c1a1d 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -200,7 +200,7 @@ TGauge::UpdateValue( double fNewDesired, PSound Fallbacksound ) { else if( ( currentvalue > fNewDesired ) && ( m_soundfxdecrease != nullptr ) ) { play( m_soundfxdecrease ); } - else { + else if( Fallbacksound != nullptr ) { // ...and if that fails too, try the provided fallback sound from legacy system play( Fallbacksound ); } diff --git a/Gauge.h b/Gauge.h index 0147a61e..516294a7 100644 --- a/Gauge.h +++ b/Gauge.h @@ -43,18 +43,19 @@ class TGauge { PSound m_soundfxdecrease { nullptr }; // sound associated with decreasing control's value std::map m_soundfxvalues; // sounds associated with specific values // methods + // imports member data pair from the config file + bool + Load_mapping( cParser &Input ); // plays specified sound void play( PSound Sound ); public: TGauge() = default; - ~TGauge() {} inline void Clear() { *this = TGauge(); } void Init(TSubModel *NewSubModel, TGaugeType eNewTyp, double fNewScale = 1, double fNewOffset = 0, double fNewFriction = 0, double fNewValue = 0); bool Load(cParser &Parser, TModel3d *md1, TModel3d *md2 = nullptr, double mul = 1.0); - bool Load_mapping( cParser &Input ); void PermIncValue(double fNewDesired); void IncValue(double fNewDesired); void DecValue(double fNewDesired); diff --git a/Train.cpp b/Train.cpp index 5f768b8e..46dbb7b9 100644 --- a/Train.cpp +++ b/Train.cpp @@ -704,7 +704,7 @@ void TTrain::OnCommand_mucurrentindicatorothersourceactivate( TTrain *Train, com } #endif // visual feedback - Train->ggNextCurrentButton.UpdateValue( 1.0 ); + Train->ggNextCurrentButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Command.action == GLFW_RELEASE ) { //turn off @@ -716,7 +716,7 @@ void TTrain::OnCommand_mucurrentindicatorothersourceactivate( TTrain *Train, com } #endif // visual feedback - Train->ggNextCurrentButton.UpdateValue( 0.0 ); + Train->ggNextCurrentButton.UpdateValue( 0.0, Train->dsbSwitch ); } } @@ -820,13 +820,13 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons } #endif // visual feedback - Train->ggReleaserButton.UpdateValue( 1.0 ); + Train->ggReleaserButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { // release Train->mvOccupied->BrakeReleaser( 0 ); // visual feedback - Train->ggReleaserButton.UpdateValue( 0.0 ); + Train->ggReleaserButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -1027,7 +1027,7 @@ void TTrain::OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const } #endif // visual feedback - Train->ggAntiSlipButton.UpdateValue( 1.0 ); + Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { // release @@ -1060,7 +1060,7 @@ void TTrain::OnCommand_sandboxactivate( TTrain *Train, command_data const &Comma Train->play_sound( Train->dsbSwitch ); #endif // visual feedback - Train->ggSandButton.UpdateValue( 1.0 ); + Train->ggSandButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Command.action == GLFW_RELEASE) { // release @@ -1127,19 +1127,22 @@ void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data con Train->ggBrakeProfileCtrl.UpdateValue( ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? 2.0 : - Train->mvOccupied->BrakeDelayFlag - 1 ) ); + Train->mvOccupied->BrakeDelayFlag - 1 ), + Train->dsbSwitch ); } if( Train->ggBrakeProfileG.SubModel != nullptr ) { Train->ggBrakeProfileG.UpdateValue( - Train->mvOccupied->BrakeDelayFlag == bdelay_G ? + ( Train->mvOccupied->BrakeDelayFlag == bdelay_G ? 1.0 : - 0.0 ); + 0.0 ), + Train->dsbSwitch ); } if( Train->ggBrakeProfileR.SubModel != nullptr ) { Train->ggBrakeProfileR.UpdateValue( - ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? 1.0 : - 0.0 ); + 0.0 ), + Train->dsbSwitch ); } } } @@ -1169,19 +1172,22 @@ void TTrain::OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data con Train->ggBrakeProfileCtrl.UpdateValue( ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? 2.0 : - Train->mvOccupied->BrakeDelayFlag - 1 ) ); + Train->mvOccupied->BrakeDelayFlag - 1 ), + Train->dsbSwitch ); } if( Train->ggBrakeProfileG.SubModel != nullptr ) { Train->ggBrakeProfileG.UpdateValue( - Train->mvOccupied->BrakeDelayFlag == bdelay_G ? + ( Train->mvOccupied->BrakeDelayFlag == bdelay_G ? 1.0 : - 0.0 ); + 0.0 ), + Train->dsbSwitch ); } if( Train->ggBrakeProfileR.SubModel != nullptr ) { Train->ggBrakeProfileR.UpdateValue( - ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? 1.0 : - 0.0 ); + 0.0 ), + Train->dsbSwitch ); } } } @@ -1212,7 +1218,7 @@ void TTrain::OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data con } #endif // visual feedback - Train->ggSignallingButton.UpdateValue( 1.0 ); + Train->ggSignallingButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off @@ -1224,7 +1230,7 @@ void TTrain::OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data con } #endif // visual feedback - Train->ggSignallingButton.UpdateValue( 0.0 ); + Train->ggSignallingButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -1282,7 +1288,7 @@ void TTrain::OnCommand_alerteracknowledge( TTrain *Train, command_data const &Co } } // visual feedback - Train->ggSecurityResetButton.UpdateValue( 1.0 ); + Train->ggSecurityResetButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggSecurityResetButton.GetValue() < 0.05 ) { @@ -1314,7 +1320,7 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command if( Train->mvOccupied->BatterySwitch( true ) ) { // bateria potrzebna np. do zapalenia świateł if( Train->ggBatteryButton.SubModel ) { - Train->ggBatteryButton.UpdateValue( 1 ); + Train->ggBatteryButton.UpdateValue( 1.0, Train->dsbSwitch ); } #ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback @@ -1336,7 +1342,7 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command if( Train->mvOccupied->BatterySwitch( false ) ) { // ewentualnie zablokować z FIZ, np. w samochodach się nie odłącza akumulatora if( Train->ggBatteryButton.SubModel ) { - Train->ggBatteryButton.UpdateValue( 0 ); + Train->ggBatteryButton.UpdateValue( 0.0, Train->dsbSwitch ); } #ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback @@ -1367,15 +1373,19 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->play_sound( Train->dsbSwitch ); #endif // visual feedback - Train->ggPantFrontButton.UpdateValue( 1.0 ); + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 1.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedButton.UpdateValue( 1.0 ); + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); // pantograph control can have two-button setup - Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -1399,15 +1409,19 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->play_sound( Train->dsbSwitch ); #endif // visual feedback - Train->ggPantFrontButton.UpdateValue( 0.0 ); + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedButton.UpdateValue( 0.0 ); + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); // pantograph control can have two-button setup - Train->ggPantFrontButtonOff.UpdateValue( 1.0 ); + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 1.0 ); + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); } } } @@ -1420,23 +1434,24 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->play_sound( Train->dsbSwitch ); } #endif - Train->ggPantFrontButton.UpdateValue( 0.0 ); + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedButton.UpdateValue( 0.0 ); + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); // also the switch off button, in cabs which have it #ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->ggPantFrontButtonOff.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); } #endif - if( Train->ggPantFrontButtonOff.SubModel ) { - Train->ggPantFrontButtonOff.UpdateValue( 0.0 ); - } + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); if( Train->ggPantSelectedDownButton.SubModel ) { // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -1456,15 +1471,19 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & Train->play_sound( Train->dsbSwitch ); #endif // visual feedback - Train->ggPantRearButton.UpdateValue( 1.0 ); + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 1.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedButton.UpdateValue( 1.0 ); + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); // pantograph control can have two-button setup - Train->ggPantRearButtonOff.UpdateValue( 0.0 ); + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -1488,15 +1507,19 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & Train->play_sound( Train->dsbSwitch ); #endif // visual feedback - Train->ggPantRearButton.UpdateValue( 0.0 ); + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedButton.UpdateValue( 0.0 ); + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); // pantograph control can have two-button setup - Train->ggPantRearButtonOff.UpdateValue( 1.0 ); + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 1.0 ); + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); } } } @@ -1509,23 +1532,24 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & Train->play_sound( Train->dsbSwitch ); } #endif - Train->ggPantRearButton.UpdateValue( 0.0 ); + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedButton.UpdateValue( 0.0 ); + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); // also the switch off button, in cabs which have it #ifdef EU07_USE_OLD_CONTROLSOUNDS if( Train->ggPantRearButtonOff.GetValue() > 0.35 ) { Train->play_sound( Train->dsbSwitch ); } #endif - if( Train->ggPantRearButtonOff.SubModel ) { - Train->ggPantRearButtonOff.UpdateValue( 0.0 ); - } + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); if( Train->ggPantSelectedDownButton.SubModel ) { // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -1619,9 +1643,10 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co } #endif // visual feedback - Train->ggPantAllDownButton.UpdateValue( 1.0 ); - if( Train->ggPantSelectedDownButton.SubModel != nullptr ) { - Train->ggPantSelectedDownButton.UpdateValue( 1.0 ); + if( Train->ggPantAllDownButton.SubModel ) + Train->ggPantAllDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Train->ggPantSelectedDownButton.SubModel ) { + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); } } else if( Command.action == GLFW_RELEASE ) { @@ -1637,8 +1662,9 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co */ #endif // visual feedback - Train->ggPantAllDownButton.UpdateValue( 0.0 ); - if( Train->ggPantSelectedDownButton.SubModel != nullptr ) { + if( Train->ggPantAllDownButton.SubModel ) + Train->ggPantAllDownButton.UpdateValue( 0.0 ); + if( Train->ggPantSelectedDownButton.SubModel ) { Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); } } @@ -1680,7 +1706,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } #endif // visual feedback - Train->ggMainOnButton.UpdateValue( 1.0 ); + Train->ggMainOnButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Train->ggMainButton.SubModel != nullptr ) { // single two-state switch @@ -1691,7 +1717,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } #endif // visual feedback - Train->ggMainButton.UpdateValue( 1.0 ); + Train->ggMainButton.UpdateValue( 1.0, Train->dsbSwitch ); } // keep track of period the button is held down, to determine when/if circuit closes if( ( ( ( Train->mvControlled->EngineType != ElectricSeriesMotor ) @@ -1739,7 +1765,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } #endif // visual feedback - Train->ggMainOffButton.UpdateValue( 1.0 ); + Train->ggMainOffButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Train->ggMainButton.SubModel != nullptr ) { // single two-state switch @@ -1765,7 +1791,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } #endif // visual feedback - Train->ggMainButton.UpdateValue( 0.0 ); + Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -1788,7 +1814,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // we don't exactly know which of the two buttons was used, so reset both // for setup with two separate swiches if( Train->ggMainOnButton.SubModel != nullptr ) { - Train->ggMainOnButton.UpdateValue( 0.0 ); + Train->ggMainOnButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // audio feedback if( Train->ggMainOnButton.GetValue() > 0.5 ) { @@ -1797,7 +1823,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com #endif } if( Train->ggMainOffButton.SubModel != nullptr ) { - Train->ggMainOffButton.UpdateValue( 0.0 ); + Train->ggMainOffButton.UpdateValue( 0.0, Train->dsbSwitch ); } // and the two-state switch too, for good measure if( Train->ggMainButton.SubModel != nullptr ) { @@ -1808,7 +1834,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } #endif // visual feedback - Train->ggMainButton.UpdateValue( 0.0 ); + Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } // finalize the state of the line breaker Train->m_linebreakerstate = 0; @@ -1832,7 +1858,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // visual feedback if( Train->ggMainOnButton.SubModel != nullptr ) { // setup with two separate switches - Train->ggMainOnButton.UpdateValue( 0.0 ); + Train->ggMainOnButton.UpdateValue( 0.0, Train->dsbSwitch ); } // NOTE: we don't have switch type definition for the line breaker switch // so for the time being we have hard coded "impulse" switches for all EMUs @@ -1846,7 +1872,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } #endif // visual feedback - Train->ggMainButton.UpdateValue( 0.0 ); + Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } } // finalize the state of the line breaker @@ -1876,7 +1902,7 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } #endif // visual feedback - Train->ggConverterButton.UpdateValue( 1.0 ); + Train->ggConverterButton.UpdateValue( 1.0, Train->dsbSwitch ); /* if( ( Train->mvControlled->EnginePowerSource.SourceType != CurrentCollector ) || ( Train->mvControlled->PantRearVolt != 0.0 ) @@ -1916,9 +1942,9 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } #endif // visual feedback - Train->ggConverterButton.UpdateValue( 0.0 ); + Train->ggConverterButton.UpdateValue( 0.0, Train->dsbSwitch ); if( Train->ggConverterOffButton.SubModel != nullptr ) { - Train->ggConverterOffButton.UpdateValue( 1.0 ); + Train->ggConverterOffButton.UpdateValue( 1.0, Train->dsbSwitch ); } if( true == Train->mvControlled->ConverterSwitch( false ) ) { // side effects @@ -1950,8 +1976,8 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma Train->play_sound( Train->dsbSwitch ); } #endif - Train->ggConverterButton.UpdateValue( 0.0 ); - Train->ggConverterOffButton.UpdateValue( 0.0 ); + Train->ggConverterButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->ggConverterOffButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -1978,7 +2004,7 @@ void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const & } #endif // visual feedback - Train->ggConverterLocalButton.UpdateValue( 1.0 ); + Train->ggConverterLocalButton.UpdateValue( 1.0, Train->dsbSwitch ); // effect Train->mvOccupied->ConverterAllowLocal = true; /* @@ -2001,7 +2027,7 @@ void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const & } #endif // visual feedback - Train->ggConverterLocalButton.UpdateValue( 0.0 ); + Train->ggConverterLocalButton.UpdateValue( 0.0, Train->dsbSwitch ); // effect Train->mvOccupied->ConverterAllowLocal = false; /* @@ -2046,7 +2072,7 @@ void TTrain::OnCommand_converteroverloadrelayreset( TTrain *Train, command_data } #endif // visual feedback - Train->ggConverterFuseButton.UpdateValue( 1.0 ); + Train->ggConverterFuseButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Command.action == GLFW_RELEASE ) { // release @@ -2057,7 +2083,7 @@ void TTrain::OnCommand_converteroverloadrelayreset( TTrain *Train, command_data } #endif // visual feedback - Train->ggConverterFuseButton.UpdateValue( 0.0 ); + Train->ggConverterFuseButton.UpdateValue( 0.0, Train->dsbSwitch ); } } @@ -2072,7 +2098,7 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm if( false == Train->mvControlled->CompressorAllow ) { // turn on // visual feedback - Train->ggCompressorButton.UpdateValue( 1.0 ); + Train->ggCompressorButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggCompressorButton.GetValue() < 0.5 ) { @@ -2104,7 +2130,7 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm // } // else { // visual feedback - Train->ggCompressorButton.UpdateValue( 0.0 ); + Train->ggCompressorButton.UpdateValue( 0.0, Train->dsbSwitch ); // } } } @@ -2148,7 +2174,7 @@ void TTrain::OnCommand_compressortogglelocal( TTrain *Train, command_data const } #endif // visual feedback - Train->ggCompressorLocalButton.UpdateValue( 1.0 ); + Train->ggCompressorLocalButton.UpdateValue( 1.0, Train->dsbSwitch ); // effect Train->mvOccupied->CompressorAllowLocal = true; } @@ -2161,7 +2187,7 @@ void TTrain::OnCommand_compressortogglelocal( TTrain *Train, command_data const } #endif // visual feedback - Train->ggCompressorLocalButton.UpdateValue( 0.0 ); + Train->ggCompressorLocalButton.UpdateValue( 0.0, Train->dsbSwitch ); // effect Train->mvOccupied->CompressorAllowLocal = false; } @@ -2206,7 +2232,7 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C } #endif // visual feedback - Train->ggStLinOffButton.UpdateValue( 1.0 ); + Train->ggStLinOffButton.UpdateValue( 1.0, Train->dsbSwitch ); // effect if( true == Train->mvControlled->StLinFlag ) { Train->play_sound( Train->dsbRelay ); @@ -2255,7 +2281,7 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C } #endif // visual feedback - Train->ggStLinOffButton.UpdateValue( 0.0 ); + Train->ggStLinOffButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -2286,7 +2312,7 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C } #endif // visual feedback - Train->ggStLinOffButton.UpdateValue( 0.0 ); + Train->ggStLinOffButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -2320,7 +2346,7 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command // turn on if( true == Train->mvControlled->CurrentSwitch( true ) ) { // visual feedback - Train->ggMaxCurrentCtrl.UpdateValue( 1.0 ); + Train->ggMaxCurrentCtrl.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggMaxCurrentCtrl.GetValue() < 0.5 ) { @@ -2333,7 +2359,7 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command //turn off if( true == Train->mvControlled->CurrentSwitch( false ) ) { // visual feedback - Train->ggMaxCurrentCtrl.UpdateValue( 0.0 ); + Train->ggMaxCurrentCtrl.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggMaxCurrentCtrl.GetValue() > 0.5 ) { @@ -2364,7 +2390,7 @@ void TTrain::OnCommand_motoroverloadrelayreset( TTrain *Train, command_data cons } #endif // visual feedback - Train->ggFuseButton.UpdateValue( 1.0 ); + Train->ggFuseButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Command.action == GLFW_RELEASE ) { // release @@ -2375,7 +2401,7 @@ void TTrain::OnCommand_motoroverloadrelayreset( TTrain *Train, command_data cons } #endif // visual feedback - Train->ggFuseButton.UpdateValue( 0.0 ); + Train->ggFuseButton.UpdateValue( 0.0, Train->dsbSwitch ); } } @@ -2397,7 +2423,7 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback - Train->ggLeftLightButton.UpdateValue( 1.0 ); + Train->ggLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggLeftLightButton.GetValue() < 0.5 ) { @@ -2409,7 +2435,7 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback - Train->ggLeftLightButton.UpdateValue( 0.0 ); + Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggLeftLightButton.GetValue() > 0.5 ) { @@ -2438,7 +2464,7 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const & // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback - Train->ggRightLightButton.UpdateValue( 1.0 ); + Train->ggRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRightLightButton.GetValue() < 0.5 ) { @@ -2450,7 +2476,7 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const & //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback - Train->ggRightLightButton.UpdateValue( 0.0 ); + Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRightLightButton.GetValue() > 0.5 ) { @@ -2479,7 +2505,7 @@ void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const & // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback - Train->ggUpperLightButton.UpdateValue( 1.0 ); + Train->ggUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggUpperLightButton.GetValue() < 0.5 ) { @@ -2491,7 +2517,7 @@ void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const & //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback - Train->ggUpperLightButton.UpdateValue( 0.0 ); + Train->ggUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggUpperLightButton.GetValue() > 0.5 ) { @@ -2520,7 +2546,7 @@ void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &C // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback - Train->ggLeftEndLightButton.UpdateValue( 1.0 ); + Train->ggLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggLeftEndLightButton.GetValue() < 0.5 ) { @@ -2532,7 +2558,7 @@ void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &C //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback - Train->ggLeftEndLightButton.UpdateValue( 0.0 ); + Train->ggLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggLeftEndLightButton.GetValue() > 0.5 ) { @@ -2561,7 +2587,7 @@ void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const & // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback - Train->ggRightEndLightButton.UpdateValue( 1.0 ); + Train->ggRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRightEndLightButton.GetValue() < 0.5 ) { @@ -2573,7 +2599,7 @@ void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const & //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback - Train->ggRightEndLightButton.UpdateValue( 0.0 ); + Train->ggRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRightEndLightButton.GetValue() > 0.5 ) { @@ -2603,7 +2629,7 @@ void TTrain::OnCommand_headlighttogglerearleft( TTrain *Train, command_data cons // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback - Train->ggRearLeftLightButton.UpdateValue( 1.0 ); + Train->ggRearLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearLeftLightButton.GetValue() < 0.5 ) { @@ -2615,7 +2641,7 @@ void TTrain::OnCommand_headlighttogglerearleft( TTrain *Train, command_data cons //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback - Train->ggRearLeftLightButton.UpdateValue( 0.0 ); + Train->ggRearLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearLeftLightButton.GetValue() > 0.5 ) { @@ -2645,7 +2671,7 @@ void TTrain::OnCommand_headlighttogglerearright( TTrain *Train, command_data con // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback - Train->ggRearRightLightButton.UpdateValue( 1.0 ); + Train->ggRearRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearRightLightButton.GetValue() < 0.5 ) { @@ -2657,7 +2683,7 @@ void TTrain::OnCommand_headlighttogglerearright( TTrain *Train, command_data con //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback - Train->ggRearRightLightButton.UpdateValue( 0.0 ); + Train->ggRearRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearRightLightButton.GetValue() > 0.5 ) { @@ -2686,7 +2712,7 @@ void TTrain::OnCommand_headlighttogglerearupper( TTrain *Train, command_data con // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback - Train->ggRearUpperLightButton.UpdateValue( 1.0 ); + Train->ggRearUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearUpperLightButton.GetValue() < 0.5 ) { @@ -2698,7 +2724,7 @@ void TTrain::OnCommand_headlighttogglerearupper( TTrain *Train, command_data con //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback - Train->ggRearUpperLightButton.UpdateValue( 0.0 ); + Train->ggRearUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearUpperLightButton.GetValue() > 0.5 ) { @@ -2728,7 +2754,7 @@ void TTrain::OnCommand_redmarkertogglerearleft( TTrain *Train, command_data cons // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback - Train->ggRearLeftEndLightButton.UpdateValue( 1.0 ); + Train->ggRearLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearLeftEndLightButton.GetValue() < 0.5 ) { @@ -2740,7 +2766,7 @@ void TTrain::OnCommand_redmarkertogglerearleft( TTrain *Train, command_data cons //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback - Train->ggRearLeftEndLightButton.UpdateValue( 0.0 ); + Train->ggRearLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearLeftEndLightButton.GetValue() > 0.5 ) { @@ -2770,7 +2796,7 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback - Train->ggRearRightEndLightButton.UpdateValue( 1.0 ); + Train->ggRearRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearRightEndLightButton.GetValue() < 0.5 ) { @@ -2782,7 +2808,7 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback - Train->ggRearRightEndLightButton.UpdateValue( 0.0 ); + Train->ggRearRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggRearRightEndLightButton.GetValue() > 0.5 ) { @@ -2816,7 +2842,7 @@ void TTrain::OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &C } #endif // visual feedback - Train->ggDimHeadlightsButton.UpdateValue( 1.0 ); + Train->ggDimHeadlightsButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off @@ -2828,7 +2854,7 @@ void TTrain::OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &C } #endif // visual feedback - Train->ggDimHeadlightsButton.UpdateValue( 0.0 ); + Train->ggDimHeadlightsButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -2857,7 +2883,7 @@ void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &C } #endif // visual feedback - Train->ggCabLightButton.UpdateValue( 1.0 ); + Train->ggCabLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off @@ -2870,7 +2896,7 @@ void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &C } #endif // visual feedback - Train->ggCabLightButton.UpdateValue( 0.0 ); + Train->ggCabLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -2897,7 +2923,7 @@ void TTrain::OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const } #endif // visual feedback - Train->ggCabLightDimButton.UpdateValue( 1.0 ); + Train->ggCabLightDimButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off @@ -2909,7 +2935,7 @@ void TTrain::OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const } #endif // visual feedback - Train->ggCabLightDimButton.UpdateValue( 0.0 ); + Train->ggCabLightDimButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -2938,7 +2964,7 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const } #endif // visual feedback - Train->ggInstrumentLightButton.UpdateValue( 1.0 ); + Train->ggInstrumentLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off @@ -2950,7 +2976,7 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const } #endif // visual feedback - Train->ggInstrumentLightButton.UpdateValue( 0.0 ); + Train->ggInstrumentLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -2976,7 +3002,7 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command } #endif // visual feedback - Train->ggTrainHeatingButton.UpdateValue( 1.0 ); + Train->ggTrainHeatingButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off @@ -2988,7 +3014,7 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command } #endif // visual feedback - Train->ggTrainHeatingButton.UpdateValue( 0.0 ); + Train->ggTrainHeatingButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -3016,7 +3042,7 @@ void TTrain::OnCommand_generictoggle( TTrain *Train, command_data const &Command } #endif // visual feedback - item.UpdateValue( 1.0 ); + item.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off @@ -3027,7 +3053,7 @@ void TTrain::OnCommand_generictoggle( TTrain *Train, command_data const &Command } #endif // visual feedback - item.UpdateValue( 0.0 ); + item.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -3055,7 +3081,7 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman } #endif // visual feedback - Train->ggDoorSignallingButton.UpdateValue( 1.0 ); + Train->ggDoorSignallingButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { // turn off @@ -3069,7 +3095,7 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman } #endif // visual feedback - Train->ggDoorSignallingButton.UpdateValue( 0.0 ); + Train->ggDoorSignallingButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -3088,7 +3114,7 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman // open if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorLeft( true ) ) { - Train->ggDoorLeftButton.UpdateValue( 1.0 ); + Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorLeftButton.GetValue() < 0.5 ) { @@ -3101,7 +3127,7 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman else { // in the rear cab sides are reversed if( Train->mvOccupied->DoorRight( true ) ) { - Train->ggDoorRightButton.UpdateValue( 1.0 ); + Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorRightButton.GetValue() < 0.5 ) { @@ -3116,7 +3142,7 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman // close if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorLeft( false ) ) { - Train->ggDoorLeftButton.UpdateValue( 0.0 ); + Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { @@ -3129,7 +3155,7 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman else { // in the rear cab sides are reversed if( Train->mvOccupied->DoorRight( false ) ) { - Train->ggDoorRightButton.UpdateValue( 0.0 ); + Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorRightButton.GetValue() > 0.5 ) { @@ -3157,7 +3183,7 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma // open if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorRight( true ) ) { - Train->ggDoorRightButton.UpdateValue( 1.0 ); + Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorRightButton.GetValue() < 0.5 ) { @@ -3170,7 +3196,7 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma else { // in the rear cab sides are reversed if( Train->mvOccupied->DoorLeft( true ) ) { - Train->ggDoorLeftButton.UpdateValue( 1.0 ); + Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorLeftButton.GetValue() < 0.5 ) { @@ -3185,7 +3211,7 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma // close if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorRight( false ) ) { - Train->ggDoorRightButton.UpdateValue( 0.0 ); + Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorRightButton.GetValue() > 0.5 ) { @@ -3198,7 +3224,7 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma else { // in the rear cab sides are reversed if( Train->mvOccupied->DoorLeft( false ) ) { - Train->ggDoorLeftButton.UpdateValue( 0.0 ); + Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); #ifdef EU07_USE_OLD_CONTROLSOUNDS // sound feedback if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { @@ -3233,7 +3259,7 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com } #endif // visual feedback - Train->ggDepartureSignalButton.UpdateValue( 1.0 ); + Train->ggDepartureSignalButton.UpdateValue( 1.0, Train->dsbSwitch ); } } else if( Command.action == GLFW_RELEASE ) { @@ -3246,7 +3272,7 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com } #endif // visual feedback - Train->ggDepartureSignalButton.UpdateValue( 0.0 ); + Train->ggDepartureSignalButton.UpdateValue( 0.0, Train->dsbSwitch ); } } @@ -3378,7 +3404,7 @@ void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command ) } #endif // visual feedback - Train->ggRadioButton.UpdateValue( 1.0 ); + Train->ggRadioButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { // turn off @@ -3390,7 +3416,7 @@ void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command ) } #endif // visual feedback - Train->ggRadioButton.UpdateValue( 0.0 ); + Train->ggRadioButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -5121,13 +5147,18 @@ bool TTrain::Update( double const Deltatime ) btLampkaED.TurnOff(); } // McZapkie-080602: obroty (albo translacje) regulatorow - if (ggMainCtrl.SubModel) - { - if (mvControlled->CoupledCtrl) + if (ggMainCtrl.SubModel) { + + if( mvControlled->CoupledCtrl ) { ggMainCtrl.UpdateValue( - double(mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos)); - else - ggMainCtrl.UpdateValue(double(mvControlled->MainCtrlPos)); + double( mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos ), + dsbNastawnikJazdy ); + } + else { + ggMainCtrl.UpdateValue( + double( mvControlled->MainCtrlPos ), + dsbNastawnikJazdy ); + } ggMainCtrl.Update(); } if (ggMainCtrlAct.SubModel) @@ -5139,21 +5170,23 @@ bool TTrain::Update( double const Deltatime ) ggMainCtrlAct.UpdateValue(double(mvControlled->MainCtrlActualPos)); ggMainCtrlAct.Update(); } - if (ggScndCtrl.SubModel) - { // Ra: od byte odejmowane boolean i konwertowane - // potem na double? + if (ggScndCtrl.SubModel) { + // Ra: od byte odejmowane boolean i konwertowane potem na double? ggScndCtrl.UpdateValue( - double(mvControlled->ScndCtrlPos - - ((mvControlled->TrainType == dt_ET42) && mvControlled->DynamicBrakeFlag))); + double( mvControlled->ScndCtrlPos + - ( ( mvControlled->TrainType == dt_ET42 ) && mvControlled->DynamicBrakeFlag ) ), + dsbNastawnikBocz ); ggScndCtrl.Update(); } - if (ggDirKey.SubModel) - { + if (ggDirKey.SubModel) { if (mvControlled->TrainType != dt_EZT) - ggDirKey.UpdateValue(double(mvControlled->ActiveDir)); + ggDirKey.UpdateValue( + double(mvControlled->ActiveDir), + dsbReverserKey); else - ggDirKey.UpdateValue(double(mvControlled->ActiveDir) + - double(mvControlled->Imin == mvControlled->IminHi)); + ggDirKey.UpdateValue( + double(mvControlled->ActiveDir) + double(mvControlled->Imin == mvControlled->IminHi), + dsbReverserKey); ggDirKey.Update(); } if (ggBrakeCtrl.SubModel) diff --git a/renderer.cpp b/renderer.cpp index c5739dad..97690ec0 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -346,12 +346,12 @@ opengl_renderer::Render_camera() { break; } case rendermode::shadows: { - m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * 750.0f }; + m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * 750.f }; m_renderpass.camera.position().y = std::max( 50.0, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low viewmatrix = glm::lookAt( m_renderpass.camera.position(), glm::dvec3{ Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z }, - glm::dvec3{ 0.0f, 1.0f, 0.0f } ); + glm::dvec3{ 0.f, 1.f, 0.f } ); break; } default: { diff --git a/version.h b/version.h index 53cafe07..a4437670 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 714 +#define VERSION_MINOR 715 #define VERSION_REVISION 0 From 215a5b60392e799e5148f0baa4dd4e6cc7a5fd54 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 20 Jul 2017 03:51:44 +0200 Subject: [PATCH 139/426] gauge animation precision fix, visualization fix for turntable animations, mouse control repeat rate tweak, rudimentary framebuffer implementation --- Button.cpp | 7 --- Button.h | 2 +- Gauge.cpp | 2 +- Globals.cpp | 6 +++ Globals.h | 1 + Track.cpp | 21 ++++---- mouseinput.cpp | 2 + renderer.cpp | 144 +++++++++++++++++++++++++++++++++++++++++-------- renderer.h | 4 ++ version.h | 2 +- 10 files changed, 148 insertions(+), 43 deletions(-) diff --git a/Button.cpp b/Button.cpp index 4af9a652..06211b1d 100644 --- a/Button.cpp +++ b/Button.cpp @@ -14,13 +14,6 @@ http://mozilla.org/MPL/2.0/. #include "Console.h" #include "logs.h" -TButton::TButton() -{ - iFeedbackBit = 0; - bData = NULL; - Clear(); -}; - void TButton::Clear(int i) { pModelOn = nullptr; diff --git a/Button.h b/Button.h index 76737cd8..67061a47 100644 --- a/Button.h +++ b/Button.h @@ -36,7 +36,7 @@ class TButton play( PSound Sound ); public: - TButton(); + TButton() = default; void Clear(int const i = -1); inline void FeedbackBitSet(int const i) { iFeedbackBit = 1 << i; }; diff --git a/Gauge.cpp b/Gauge.cpp index 125c1a1d..c2206bb7 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -180,7 +180,7 @@ void TGauge::DecValue(double fNewDesired) void TGauge::UpdateValue( double fNewDesired, PSound Fallbacksound ) { - if( static_cast( std::round( ( fDesiredValue - fOffset ) / fScale ) ) == static_cast( fNewDesired ) ) { + if( static_cast( std::round( 100.0 * ( fDesiredValue - fOffset ) / fScale ) ) == static_cast( 100.0 * fNewDesired ) ) { return; } fDesiredValue = fNewDesired * fScale + fOffset; diff --git a/Globals.cpp b/Globals.cpp index 2a9aa97b..a21a4cac 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -87,6 +87,7 @@ float Global::Overcast { 0.1f }; // NOTE: all this weather stuff should be moved opengl_light Global::DayLight; int Global::DynamicLightCount { 3 }; bool Global::ScaleSpecularValues { true }; +bool Global::RenderShadows { false }; bool Global::bRollFix = true; // czy wykonać przeliczanie przechyłki bool Global::bJoinEvents = false; // czy grupować eventy o tych samych nazwach int Global::iHiddenEvents = 1; // czy łączyć eventy z torami poprzez nazwę toru @@ -544,6 +545,11 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::ScaleSpecularValues; } + else if( token == "shadows" ) { + // shadow render toggle + Parser.getTokens(); + Parser >> Global::RenderShadows; + } else if (token == "smoothtraction") { // podwójna jasność ambient diff --git a/Globals.h b/Globals.h index 4aa05ee3..948eae86 100644 --- a/Globals.h +++ b/Globals.h @@ -226,6 +226,7 @@ class Global static opengl_light DayLight; static int DynamicLightCount; static bool ScaleSpecularValues; + static bool RenderShadows; static int iSlowMotion; static TDynamicObject *changeDynObj; diff --git a/Track.cpp b/Track.cpp index 29e85e3f..433a344e 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1267,31 +1267,32 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } vertex_array vertices; Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); + if( ( Bank != 0 ) && ( true == Geometry2.empty() ) ) { + Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + } if( ( Bank == 0 ) && ( false == Geometry2.empty() ) ) { // special variant, replace existing data for a turntable track GfxRenderer.Replace( vertices, Geometry2[ 0 ] ); } - else { - Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); - } } if (TextureID1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną vertex_array vertices; + if( ( Bank != 0 ) && ( true == Geometry1.empty() ) ) { + Segment->RenderLoft( vertices, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + vertices.clear(); // reuse the scratchpad + Segment->RenderLoft( vertices, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); + } if( ( Bank == 0 ) && ( false == Geometry1.empty() ) ) { + // special variant, replace existing data for a turntable track Segment->RenderLoft( vertices, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); GfxRenderer.Replace( vertices, Geometry1[ 0 ] ); vertices.clear(); // reuse the scratchpad Segment->RenderLoft( vertices, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); GfxRenderer.Replace( vertices, Geometry1[ 1 ] ); } - else { - Segment->RenderLoft( vertices, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); - Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); - vertices.clear(); // reuse the scratchpad - Segment->RenderLoft( vertices, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); - Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); - } } break; case tt_Switch: // dla zwrotnicy dwa razy szyny diff --git a/mouseinput.cpp b/mouseinput.cpp index c38b64f1..97e1f6dc 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -125,9 +125,11 @@ mouse_input::button( int const Button, int const Action ) { // TODO: pass correct entity id once the missing systems are in place m_relay.post( mousecommand, 0, 0, Action, 0 ); m_updateaccumulator = 0.0; // prevent potential command repeat right after issuing one +/* if( mousecommand == user_command::mastercontrollerincrease ) { m_updateaccumulator -= 0.15; // extra pause on first increase of master controller } +*/ switch( mousecommand ) { case user_command::mastercontrollerincrease: case user_command::mastercontrollerdecrease: diff --git a/renderer.cpp b/renderer.cpp index 97690ec0..6800e1e4 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -120,10 +120,9 @@ opengl_renderer::Init( GLFWwindow *Window ) { m_lights.emplace_back( light ); } #ifdef EU07_USE_PICKING_FRAMEBUFFER + // pick buffer resources if( true == m_framebuffersupport ) { - // try to create the pick buffer. RGBA8 2D texture, 24 bit depth texture, 1024x512 - int const width { 1024 }; - int const height { 512 }; + // try to create the pick buffer. RGBA8 2D texture, 24 bit depth texture, 1024x1024 (height of 512 would suffice but, eh) // texture ::glGenTextures( 1, &m_picktexture ); ::glBindTexture( GL_TEXTURE_2D, m_picktexture ); @@ -131,18 +130,17 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); - ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, m_pickbuffersize, m_pickbuffersize, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); // depth buffer ::glGenRenderbuffersEXT( 1, &m_pickdepthbuffer ); ::glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, m_pickdepthbuffer ); - ::glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, width, height ); - // create and set up the framebuffer + ::glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, m_pickbuffersize, m_pickbuffersize ); + // create and assemble the framebuffer ::glGenFramebuffersEXT( 1, &m_pickframebuffer ); ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_pickframebuffer ); ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_picktexture, 0 ); ::glFramebufferRenderbufferEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_pickdepthbuffer ); - //------------------------- - //Does the GPU support current FBO configuration? + // check if we got it working GLenum status = ::glCheckFramebufferStatusEXT( GL_FRAMEBUFFER_EXT ); if( status == GL_FRAMEBUFFER_COMPLETE_EXT ) { WriteLog( "Picking framebuffer setup complete" ); @@ -154,6 +152,41 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now } #endif + // shadowmap resources + if( ( true == Global::RenderShadows ) + && ( true == m_framebuffersupport ) ) { + // texture: + ::glGenTextures( 1, &m_shadowtexture ); + ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); + // enable shadow comparison: true (ie not in shadow) if r<=texture... + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL ); + // ...shadow comparison should generate an INTENSITY result + ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY ); + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, m_shadowbuffersize, m_shadowbuffersize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL ); + // create and assemble the framebuffer + ::glGenFramebuffersEXT( 1, &m_shadowframebuffer ); + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); + ::glDrawBuffer( GL_NONE ); // we won't be rendering colour data, so can skip the colour attachment + ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_shadowtexture, 0 ); + // check if we got it working + GLenum status = ::glCheckFramebufferStatusEXT( GL_FRAMEBUFFER_EXT ); + if( status == GL_FRAMEBUFFER_COMPLETE_EXT ) { + WriteLog( "Shadows framebuffer setup complete" ); + } + else { + ErrorLog( "Shadows framebuffer setup failed" ); + m_framebuffersupport = false; + Global::RenderShadows = false; + } + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now + ::glDrawBuffer( GL_BACK ); + } + ::glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); // preload some common textures WriteLog( "Loading common gfx data..." ); @@ -205,7 +238,9 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // TODO: run shadowmap pass before color -// ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); +#ifdef EU07_USE_PICKING_FRAMEBUFFER + ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); +#endif if( World.InitPerformed() ) { auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 0.0f ); // kolor nieba @@ -234,9 +269,33 @@ opengl_renderer::Render_pass( rendermode const Mode ) { break; } + case rendermode::shadows: { + +#ifdef EU07_USE_PICKING_FRAMEBUFFER + ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); // TODO: separate shadow buffer +#endif + ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + + if( World.InitPerformed() ) { + // setup + m_renderpass.draw_range = 500.0f; // 1.5km square centered around camera + Render_projection(); + Render_camera(); + ::glDepthFunc( GL_LEQUAL ); + // render + // opaque parts... + Render_setup(); + Render( &World.Ground ); + } + break; + } + case rendermode::pickcontrols: { -// ::glViewport( 0, 0, 1024, 512 ); +#ifdef EU07_USE_PICKING_FRAMEBUFFER + ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); +#endif ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); @@ -259,7 +318,9 @@ opengl_renderer::Render_pass( rendermode const Mode ) { case rendermode::pickscenery: { -// ::glViewport( 0, 0, 1024, 512 ); +#ifdef EU07_USE_PICKING_FRAMEBUFFER + ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); +#endif ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); @@ -319,6 +380,12 @@ opengl_renderer::Render_projection() { */ case rendermode::shadows: { // TODO: set parallel projection + ::gluPerspective( + Global::FieldOfView, + 1.f, +// std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), + 2.f, + m_renderpass.draw_range * Global::fDistanceFactor ); break; } @@ -346,7 +413,7 @@ opengl_renderer::Render_camera() { break; } case rendermode::shadows: { - m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * 750.f }; + m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * 250.f }; m_renderpass.camera.position().y = std::max( 50.0, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low viewmatrix = glm::lookAt( m_renderpass.camera.position(), @@ -1258,6 +1325,9 @@ opengl_renderer::Render( TSubModel *Submodel ) { // rysuj gdy element nieprzezroczysty switch( m_renderpass.draw_mode ) { case rendermode::color: { +// NOTE: code disabled as normalization marking doesn't take into account scaling propagation down hierarchy chains +// for the time being we'll do with enforced worst-case scaling method, when speculars are enabled +#ifdef EU07_USE_OPTIMIZED_NORMALIZATION switch( Submodel->m_normalizenormals ) { case TSubModel::normalize: { ::glEnable( GL_NORMALIZE ); break; } @@ -1266,6 +1336,11 @@ opengl_renderer::Render( TSubModel *Submodel ) { default: { break; } } +#else + if( true == m_renderspecular ) { + ::glEnable( GL_NORMALIZE ); + } +#endif // material configuration: // textures... if( Submodel->TextureID < 0 ) { // zmienialne skóry @@ -1280,6 +1355,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { // specular strength in legacy models is set uniformly to 150, 150, 150 so we scale it down for opaque elements ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_specularopaquescalefactor ) ); + ::glEnable( GL_RESCALE_NORMAL ); } // ...luminance if( Global::fLuminance < Submodel->fLight ) { @@ -1298,6 +1374,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); } +#ifdef EU07_USE_OPTIMIZED_NORMALIZATION switch( Submodel->m_normalizenormals ) { case TSubModel::normalize: { ::glDisable( GL_NORMALIZE ); break; } @@ -1306,6 +1383,11 @@ opengl_renderer::Render( TSubModel *Submodel ) { default: { break; } } +#else + if( true == m_renderspecular ) { + ::glDisable( GL_NORMALIZE ); + } +#endif break; } case rendermode::shadows: @@ -1800,6 +1882,9 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // renderowanie obiektów OpenGL if( Submodel->iAlpha & Submodel->iFlags & 0x2F ) // rysuj gdy element przezroczysty { +// NOTE: code disabled as normalization marking doesn't take into account scaling propagation down hierarchy chains +// for the time being we'll do with enforced worst-case scaling method, when speculars are enabled +#ifdef EU07_USE_OPTIMIZED_NORMALIZATION switch( Submodel->m_normalizenormals ) { case TSubModel::normalize: { ::glEnable( GL_NORMALIZE ); break; } @@ -1808,6 +1893,11 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { default: { break; } } +#else + if( true == m_renderspecular ) { + ::glEnable( GL_NORMALIZE ); + } +#endif // textures... if( Submodel->TextureID < 0 ) { // zmienialne skóry Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); @@ -1838,6 +1928,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); } +#ifdef EU07_USE_OPTIMIZED_NORMALIZATION switch( Submodel->m_normalizenormals ) { case TSubModel::normalize: { ::glDisable( GL_NORMALIZE ); break; } @@ -1846,6 +1937,11 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { default: { break; } } +#else + if( true == m_renderspecular ) { + ::glDisable( GL_NORMALIZE ); + } +#endif } } else if( Submodel->eType == TP_FREESPOTLIGHT ) { @@ -1954,12 +2050,14 @@ opengl_renderer::Update_Pick_Control() { glm::dvec2 mousepos; glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); mousepos.y = Global::ScreenHeight - mousepos.y; // cursor coordinates are flipped compared to opengl -/* + +#ifdef EU07_USE_PICKING_FRAMEBUFFER glm::ivec2 pickbufferpos { - mousepos.x * 1024.0f / Global::ScreenWidth, - mousepos.y * 512.0f / Global::ScreenHeight }; -*/ + mousepos.x * m_pickbuffersize / Global::ScreenWidth, + mousepos.y * m_pickbuffersize / Global::ScreenHeight }; +#else glm::ivec2 pickbufferpos{ mousepos }; +#endif unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); @@ -1998,12 +2096,14 @@ opengl_renderer::Update_Pick_Node() { glm::dvec2 mousepos; glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); mousepos.y = Global::ScreenHeight - mousepos.y; // cursor coordinates are flipped compared to opengl -/* + +#ifdef EU07_USE_PICKING_FRAMEBUFFER glm::ivec2 pickbufferpos { - mousepos.x * 1024.0f / Global::ScreenWidth, - mousepos.y * 512.0f / Global::ScreenHeight }; -*/ + mousepos.x * m_pickbuffersize / Global::ScreenWidth, + mousepos.y * m_pickbuffersize / Global::ScreenHeight }; +#else glm::ivec2 pickbufferpos{ mousepos }; +#endif unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); @@ -2198,15 +2298,13 @@ opengl_renderer::Init_caps() { WriteLog( "Supported extensions:" + std::string((char *)glGetString( GL_EXTENSIONS )) ); WriteLog( std::string("Render path: ") + ( Global::bUseVBO ? "VBO" : "Display lists" ) ); -#ifdef EU07_USE_PICKING_FRAMEBUFFER if( GLEW_EXT_framebuffer_object ) { m_framebuffersupport = true; WriteLog( "Framebuffer objects enabled" ); } else { - WriteLog( "Framebuffer objects not supported, resorting to back buffer rendering" ); + WriteLog( "Framebuffer objects not supported, resorting to back buffer rendering where possible" ); } -#endif if( Global::iMultisampling ) WriteLog( "Using multisampling x" + std::to_string( 1 << Global::iMultisampling ) ); // ograniczenie maksymalnego rozmiaru tekstur - parametr dla skalowania tekstur diff --git a/renderer.h b/renderer.h index 4459e48d..1157e563 100644 --- a/renderer.h +++ b/renderer.h @@ -254,7 +254,11 @@ private: GLuint m_pickframebuffer { 0 }; // TODO: refactor pick framebuffer stuff into an object GLuint m_picktexture { 0 }; GLuint m_pickdepthbuffer { 0 }; + int m_pickbuffersize { 1024 }; // size of (square) textures bound with the pick framebuffer #endif + GLuint m_shadowframebuffer { 0 }; + GLuint m_shadowtexture { 0 }; + int m_shadowbuffersize { 2048 }; GLUquadricObj *m_quadric { nullptr }; // helper object for drawing debug mode scene elements geometry_handle m_billboardgeometry { 0, 0 }; diff --git a/version.h b/version.h index a4437670..dedc7d9c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 715 +#define VERSION_MINOR 717 #define VERSION_REVISION 0 From 8d5fde73710ba352da1519595c15973b3add8fc1 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 21 Jul 2017 01:27:20 +0200 Subject: [PATCH 140/426] completed basic separation of visual renderer from simulation --- AnimModel.cpp | 5 +- AnimModel.h | 2 + DynObj.cpp | 20 +++--- Ground.cpp | 7 +-- Model3d.cpp | 4 +- Track.cpp | 32 +++------- Track.h | 2 - renderer.cpp | 171 ++++++++++++++++++++++++++++++++++++-------------- renderer.h | 32 +++++----- sky.cpp | 15 +++-- sky.h | 16 ++--- stars.cpp | 8 ++- stars.h | 9 ++- stdafx.h | 2 +- uilayer.cpp | 2 +- 15 files changed, 197 insertions(+), 130 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 73b5524e..58d8ecb0 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -445,7 +445,7 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable asText = asReplacableTexture.substr(1, asReplacableTexture.length() - 1); // zapamiętanie tekstu else if (asReplacableTexture != "none") m_materialdata.replacable_skins[1] = - GfxRenderer.GetTextureId( asReplacableTexture, "" ); + GfxRenderer.Fetch_Texture( asReplacableTexture, "" ); if( ( m_materialdata.replacable_skins[ 1 ] != 0 ) && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) ) { // tekstura z kanałem alfa - nie renderować w cyklu nieprzezroczystych @@ -606,6 +606,7 @@ int TAnimModel::Flags() //----------------------------------------------------------------------------- // 2011-03-16 funkcje renderowania z możliwością pochylania obiektów //----------------------------------------------------------------------------- +#ifdef EU07_USE_OLD_RENDERCODE void TAnimModel::Render( vector3 const &Position ) { RaAnimate(); // jednorazowe przeliczenie animacji RaPrepare(); @@ -617,7 +618,7 @@ void TAnimModel::RenderAlpha( vector3 const &Position ) { if( pModel ) // renderowanie rekurencyjne submodeli GfxRenderer.Render_Alpha( pModel, Material(), Position, vAngle ); }; - +#endif //--------------------------------------------------------------------------- bool TAnimModel::TerrainLoaded() { // zliczanie kwadratów kilometrowych (główna linia po Next) do tworznia tablicy diff --git a/AnimModel.h b/AnimModel.h index 17957f16..69866f56 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -164,8 +164,10 @@ class TAnimModel { bool Load(cParser *parser, bool ter = false); TAnimContainer * AddContainer(char *pName); TAnimContainer * GetContainer(char *pName); +#ifdef EU07_USE_OLD_RENDERCODE void Render( vector3 const &Position ); void RenderAlpha( vector3 const &Position ); +#endif int Flags(); void RaAnglesSet(double a, double b, double c) { diff --git a/DynObj.cpp b/DynObj.cpp index 05b2ac47..2a5c9254 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4064,7 +4064,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, { std::string nowheretexture = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie if( false == nowheretexture.empty() ) { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( nowheretexture, "", 9 ); + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( nowheretexture, "", 9 ); } if (m_materialdata.multi_textures > 0) { @@ -4076,7 +4076,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, int skinindex = 0; std::string texturename; nameparser >> texturename; while( ( texturename != "" ) && ( skinindex < 4 ) ) { - m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + texturename, "" ); + m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + texturename, "" ); ++skinindex; texturename = ""; nameparser >> texturename; } @@ -4086,7 +4086,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // otherwise try the basic approach int skinindex = 0; do { - texture_handle texture = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), "", Global::iDynamicFiltering, true ); + texture_handle texture = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), "", Global::iDynamicFiltering, true ); if( texture == NULL ) { break; } @@ -4096,12 +4096,12 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, m_materialdata.multi_textures = skinindex; if( m_materialdata.multi_textures == 0 ) { // zestaw nie zadziałał, próbujemy normanie - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); } } } else { - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.GetTextureId( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); } if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) { // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych @@ -5424,13 +5424,13 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) std::string x = TextureTest(asBaseDir + numer + "@" + MoverParameters->TypeName); if (!x.empty()) { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się return; } x = TextureTest(asBaseDir + numer ); if (!x.empty()) { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się return; } if (to.empty()) @@ -5438,17 +5438,17 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) x = TextureTest(asBaseDir + to + "@" + MoverParameters->TypeName); // w pierwszej kolejności z nazwą FIZ/MMD if (!x.empty()) { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się return; } x = TextureTest(asBaseDir + to); // na razie prymitywnie if (!x.empty()) - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się else { x = TextureTest(asBaseDir + "nowhere"); // jak nie znalazł dedykowanej, to niech daje nowhere if (!x.empty()) - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.GetTextureId( x, "", 9 ); + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); } // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa tekstury nr 4 }; diff --git a/Ground.cpp b/Ground.cpp index b4640ea4..9f66a6e3 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -53,9 +53,8 @@ std::string LogComment; bool degenerate( glm::dvec3 const &Vertex1, glm::dvec3 const &Vertex2, glm::dvec3 const &Vertex3 ) { - return ( ( Vertex1 == Vertex2 ) - || ( Vertex2 == Vertex3 ) - || ( Vertex3 == Vertex1 ) ); +// degenerate( A, B, C, minarea ) = ( ( B - A ).cross( C - A ) ).lengthSquared() < ( 4.0f * minarea * minarea ); + return glm::length2( glm::cross( Vertex2 - Vertex1, Vertex3 - Vertex1 ) ) < std::numeric_limits::epsilon(); } //--------------------------------------------------------------------------- @@ -1330,7 +1329,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) *parser >> token; } str = token; - tmp->TextureID = GfxRenderer.GetTextureId( str, szTexturePath ); + tmp->TextureID = GfxRenderer.Fetch_Texture( str ); bool const clamps = ( tmp->TextureID ? GfxRenderer.Texture( tmp->TextureID ).traits.find( 's' ) != std::string::npos : diff --git a/Model3d.cpp b/Model3d.cpp index b77b9329..06a5f43c 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -341,7 +341,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic if( texture.find_first_of( "/\\" ) == texture.npos ) { texture.insert( 0, Global::asCurrentTexturePath ); } - TextureID = GfxRenderer.GetTextureId( texture, szTexturePath ); + TextureID = GfxRenderer.Fetch_Texture( texture ); // renderowanie w cyklu przezroczystych tylko jeśli: // 1. Opacity=0 (przejściowo <1, czy tam <100) oraz // 2. tekstura ma przezroczystość @@ -1670,7 +1670,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, pTexture = t->at(iTexture); if (pTexture.find_last_of("/\\") == std::string::npos) pTexture.insert(0, Global::asCurrentTexturePath); - TextureID = GfxRenderer.GetTextureId(pTexture, szTexturePath); + TextureID = GfxRenderer.Fetch_Texture(pTexture); if( ( iFlags & 0x30 ) == 0 ) { // texture-alpha based fallback if for some reason we don't have opacity flag set yet iFlags |= diff --git a/Track.cpp b/Track.cpp index 433a344e..8b55c4ca 100644 --- a/Track.cpp +++ b/Track.cpp @@ -483,20 +483,20 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) { parser->getTokens(); *parser >> str; // railtex - TextureID1 = (str == "none" ? 0 : GfxRenderer.GetTextureId( - str, szTexturePath, - (iCategoryFlag & 1) ? Global::iRailProFiltering : - Global::iBallastFiltering)); + TextureID1 = ( + str == "none" ? + NULL : + GfxRenderer.Fetch_Texture( str ) ); parser->getTokens(); *parser >> fTexLength; // tex tile length if (fTexLength < 0.01) fTexLength = 4; // Ra: zabezpiecznie przed zawieszeniem parser->getTokens(); *parser >> str; // sub || railtex - TextureID2 = (str == "none" ? 0 : GfxRenderer.GetTextureId( - str, szTexturePath, - (eType == tt_Normal) ? Global::iBallastFiltering : - Global::iRailProFiltering)); + TextureID2 = ( + str == "none" ? + NULL : + GfxRenderer.Fetch_Texture( str ) ); parser->getTokens(3); *parser >> fTexHeight1 >> fTexWidth >> fTexSlope; if (iCategoryFlag & 4) @@ -1866,22 +1866,6 @@ void TTrack::EnvironmentReset() } }; -void TTrack::RenderDyn() -{ // renderowanie nieprzezroczystych fragmentów pojazdów - for( auto dynamic : Dynamics ) { - // sam sprawdza, czy VBO; zmienia kontekst VBO! - GfxRenderer.Render( dynamic ); - } -}; - -void TTrack::RenderDynAlpha() -{ // renderowanie przezroczystych fragmentów pojazdów - for( auto dynamic : Dynamics ) { - // sam sprawdza, czy VBO; zmienia kontekst VBO! - GfxRenderer.Render_Alpha( dynamic ); - } -}; - void TTrack::RenderDynSounds() { // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania for( auto dynamic : Dynamics ) { diff --git a/Track.h b/Track.h index f7bf31e6..884d6907 100644 --- a/Track.h +++ b/Track.h @@ -236,8 +236,6 @@ public: /* void RaRenderVBO(int iPtr); // renderowanie z VBO sektora */ - void RenderDyn(); // renderowanie nieprzezroczystych pojazdów (oba tryby) - void RenderDynAlpha(); // renderowanie przezroczystych pojazdów (oba tryby) void RenderDynSounds(); // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania void RaOwnerSet(TSubRect *o) { diff --git a/renderer.cpp b/renderer.cpp index 6800e1e4..4ddb6df5 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -190,9 +190,9 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); // preload some common textures WriteLog( "Loading common gfx data..." ); - m_glaretexture = GetTextureId( "fx\\lightglare", szTexturePath ); - m_suntexture = GetTextureId( "fx\\sun", szTexturePath ); - m_moontexture = GetTextureId( "fx\\moon", szTexturePath ); + m_glaretexture = Fetch_Texture( "fx\\lightglare" ); + m_suntexture = Fetch_Texture( "fx\\sun" ); + m_moontexture = Fetch_Texture( "fx\\moon" ); WriteLog( "...gfx data pre-loading done" ); // prepare basic geometry chunks auto const geometrybank = m_geometry.create_bank(); @@ -236,15 +236,27 @@ opengl_renderer::Render_pass( rendermode const Mode ) { case rendermode::color: { - // TODO: run shadowmap pass before color + if( Global::RenderShadows && World.InitPerformed() ) { + // run shadowmap pass before color + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); + ::glDrawBuffer( GL_NONE ); // we won't be rendering colour data, so can skip the colour attachment + + Render_pass( rendermode::shadows ); + m_renderpass.draw_mode = rendermode::color; // restore draw mode. TODO: render mode stack + + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target + ::glDrawBuffer( GL_BACK ); + } -#ifdef EU07_USE_PICKING_FRAMEBUFFER ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); -#endif + if( World.InitPerformed() ) { auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 0.0f ); // kolor nieba } + else { + ::glClearColor( 51.0f / 255.0f, 102.0f / 255.0f, 85.0f / 255.0f, 1.0f ); // initial background Color + } ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); if( World.InitPerformed() ) { @@ -271,15 +283,14 @@ opengl_renderer::Render_pass( rendermode const Mode ) { case rendermode::shadows: { -#ifdef EU07_USE_PICKING_FRAMEBUFFER - ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); // TODO: separate shadow buffer -#endif + ::glViewport( 0, 0, m_shadowbuffersize, m_shadowbuffersize ); + ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); - ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + ::glClear( GL_DEPTH_BUFFER_BIT ); if( World.InitPerformed() ) { // setup - m_renderpass.draw_range = 500.0f; // 1.5km square centered around camera + m_renderpass.draw_range = 500.0f; // 1.0km square centered around camera Render_projection(); Render_camera(); ::glDepthFunc( GL_LEQUAL ); @@ -355,9 +366,11 @@ opengl_renderer::Render_projection() { switch( m_renderpass.draw_mode ) { - case rendermode::color: +#ifndef EU07_USE_PICKING_FRAMEBUFFER case rendermode::pickcontrols: - case rendermode::pickscenery: { + case rendermode::pickscenery: +#endif + case rendermode::color: { ::gluPerspective( Global::FieldOfView / Global::ZoomFactor, std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), @@ -365,19 +378,20 @@ opengl_renderer::Render_projection() { m_renderpass.draw_range * Global::fDistanceFactor ); break; } -/* - // version for the smaller pickbuffer. ultimately scratched because resolution isn't comfortable/reliable enough for the user +#ifdef EU07_USE_PICKING_FRAMEBUFFER case rendermode::pickcontrols: case rendermode::pickscenery: { - // TODO: render to buffer and scissor test for pick modes + // TODO: scissor test for pick modes + auto const angle = Global::FieldOfView / Global::ZoomFactor; + auto const height = std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ) / ( Global::ScreenWidth / m_pickbuffersize ); ::gluPerspective( Global::FieldOfView / Global::ZoomFactor, - std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ) / ( Global::ScreenWidth / 1024.0f ), + std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ) / ( Global::ScreenWidth / m_pickbuffersize ), 0.1f * Global::ZoomFactor, m_renderpass.draw_range * Global::fDistanceFactor ); break; } -*/ +#endif case rendermode::shadows: { // TODO: set parallel projection ::gluPerspective( @@ -447,6 +461,9 @@ opengl_renderer::Render_setup( bool const Alpha ) { case rendermode::color: { ::glEnable( GL_LIGHTING ); ::glShadeModel( GL_SMOOTH ); + if( Global::iMultisampling ) { + ::glEnable( GL_MULTISAMPLE ); + } // setup fog if( Global::fFogEnd > 0 ) { // fog setup @@ -474,9 +491,12 @@ opengl_renderer::Render_setup( bool const Alpha ) { case rendermode::shadows: case rendermode::pickcontrols: case rendermode::pickscenery: { - ::glDisable( GL_FOG ); ::glDisable( GL_LIGHTING ); ::glShadeModel( GL_FLAT ); + if( Global::iMultisampling ) { + ::glDisable( GL_MULTISAMPLE ); + } + ::glDisable( GL_FOG ); if( m_texenvmode != m_renderpass.draw_mode ) { // solid colour with texture alpha @@ -508,19 +528,32 @@ opengl_renderer::Render( world_environment *Environment ) { } Bind( NULL ); - ::glDisable( GL_LIGHTING ); ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); ::glPushMatrix(); + // skydome Environment->m_skydome.Render(); if( true == Global::bUseVBO ) { // skydome uses a custom vbo which could potentially confuse the main geometry system. hardly elegant but, eh opengl_vbogeometrybank::reset(); } - Environment->m_stars.render(); + // stars + if( Environment->m_stars.m_stars != nullptr ) { + // setup + ::glPushMatrix(); + ::glRotatef( Environment->m_stars.m_latitude, 1.f, 0.f, 0.f ); // ustawienie osi OY na północ + ::glRotatef( -std::fmod( (float)Global::fTimeAngleDeg, 360.f ), 0.f, 1.f, 0.f ); // obrót dobowy osi OX + ::glPointSize( 2.f ); + // render + GfxRenderer.Render( Environment->m_stars.m_stars, nullptr, 1.0 ); + // post-render cleanup + ::glPointSize( 3.f ); + ::glPopMatrix(); + } + // celestial bodies float const duskfactor = 1.0f - clamp( std::abs( Environment->m_sun.getAngle() ), 0.0f, 12.0f ) / 12.0f; glm::vec3 suncolor = interpolate( glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), @@ -601,10 +634,26 @@ opengl_renderer::Render( world_environment *Environment ) { ::glPopAttrib(); // clouds - Environment->m_clouds.Render( - interpolate( Environment->m_skydome.GetAverageColor(), suncolor, duskfactor * 0.25f ) - * ( 1.0f - Global::Overcast * 0.5f ) // overcast darkens the clouds - * 2.5f ); // arbitrary adjustment factor + if( Environment->m_clouds.mdCloud ) { + // setup + Disable_Lights(); + ::glEnable( GL_LIGHTING ); + ::glLightModelfv( + GL_LIGHT_MODEL_AMBIENT, + glm::value_ptr( + interpolate( Environment->m_skydome.GetAverageColor(), suncolor, duskfactor * 0.25f ) + * ( 1.0f - Global::Overcast * 0.5f ) // overcast darkens the clouds + * 2.5f // arbitrary adjustment factor + ) ); + // render + Render( Environment->m_clouds.mdCloud, nullptr, 100.0 ); + Render_Alpha( Environment->m_clouds.mdCloud, nullptr, 100.0 ); + // post-render cleanup + GLfloat noambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, noambient ); + ::glEnable( GL_LIGHT0 ); // other lights will be enabled during lights update + ::glDisable( GL_LIGHTING ); + } Global::DayLight.apply_angle(); Global::DayLight.apply_intensity(); @@ -655,7 +704,7 @@ opengl_renderer::Vertices( geometry_handle const &Geometry ) const { // texture methods texture_handle -opengl_renderer::GetTextureId( std::string Filename, std::string const &Dir, int const Filter, bool const Loadnow ) { +opengl_renderer::Fetch_Texture( std::string const &Filename, std::string const &Dir, int const Filter, bool const Loadnow ) { return m_textures.create( Filename, Dir, Filter, Loadnow ); } @@ -854,7 +903,7 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { #ifdef EU07_SCENERY_EDITOR // memcells if( EditorModeFlag ) { - for( auto const memcell : m_memcells ) { + for( auto const memcell : Groundsubcell->m_memcells ) { Render( memcell ); } } @@ -888,7 +937,7 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { #ifdef EU07_SCENERY_EDITOR // memcells if( EditorModeFlag ) { - for( auto const memcell : m_memcells ) { + for( auto const memcell : Groundsubcell->m_memcells ) { ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); Render( memcell ); } @@ -961,7 +1010,14 @@ opengl_renderer::Render( TGroundNode *Node ) { break; } } +#ifdef EU07_USE_OLD_RENDERCODE Node->Model->Render( Node->pCenter - m_renderpass.camera.position() ); +#else + Node->Model->RaAnimate(); // jednorazowe przeliczenie animacji + Node->Model->RaPrepare(); + if( Node->Model->pModel ) // renderowanie rekurencyjne submodeli + Render( Node->Model->pModel, Node->Model->Material(), Node->pCenter - m_renderpass.camera.position(), Node->Model->vAngle ); +#endif return true; } @@ -1559,19 +1615,35 @@ opengl_renderer::Render( TTrack *Track ) { void opengl_renderer::Render( TMemCell *Memcell ) { - ::glPushAttrib( GL_ENABLE_BIT ); -// ::glDisable( GL_LIGHTING ); - ::glDisable( GL_TEXTURE_2D ); -// ::glEnable( GL_BLEND ); ::glPushMatrix(); - - auto const position = Memcell->Position(); + auto const position = Memcell->Position() - m_renderpass.camera.position(); ::glTranslated( position.x, position.y + 0.5, position.z ); - ::glColor3f( 0.36f, 0.75f, 0.35f ); - ::gluSphere( m_quadric, 0.35, 4, 2 ); + + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + ::glPushAttrib( GL_ENABLE_BIT ); + ::glDisable( GL_TEXTURE_2D ); + ::glColor3f( 0.36f, 0.75f, 0.35f ); + + ::gluSphere( m_quadric, 0.35, 4, 2 ); + + ::glPopAttrib(); + break; + } + case rendermode::pickscenery: + case rendermode::shadows: { + ::gluSphere( m_quadric, 0.35, 4, 2 ); + break; + } + case rendermode::pickcontrols: { + break; + } + default: { + break; + } + } ::glPopMatrix(); - ::glPopAttrib(); } bool @@ -1615,8 +1687,11 @@ opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { Render_Alpha( node ); // przezroczyste z mieszanych modeli for( node = Groundsubcell->nRenderAlpha; node; node = node->nNext3 ) Render_Alpha( node ); // przezroczyste modele - for( int j = 0; j < Groundsubcell->iTracks; ++j ) - Groundsubcell->tTracks[ j ]->RenderDynAlpha(); // przezroczyste fragmenty pojazdów na torach + for( int trackidx = 0; trackidx < Groundsubcell->iTracks; ++trackidx ) { + for( auto dynamic : Groundsubcell->tTracks[ trackidx ]->Dynamics ) { + Render_Alpha( dynamic ); // przezroczyste fragmenty pojazdów na torach + } + } return true; } @@ -1677,7 +1752,13 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } } case TP_MODEL: { +#ifdef EU07_USE_OLD_RENDERCODE Node->Model->RenderAlpha( Node->pCenter - m_renderpass.camera.position() ); +#else + Node->Model->RaPrepare(); + if( Node->Model->pModel ) // renderowanie rekurencyjne submodeli + Render_Alpha( Node->Model->pModel, Node->Model->Material(), Node->pCenter - m_renderpass.camera.position(), Node->Model->vAngle ); +#endif return true; } @@ -2137,15 +2218,11 @@ opengl_renderer::Update( double const Deltatime ) { // adjust draw ranges etc, based on recent performance auto const framerate = 1000.0f / (m_drawtime / 20.0f); - // NOTE: until we have quadtree in place we have to rely on the legacy rendering - // once this is resolved we should be able to simply adjust draw range - int targetsegments; float targetfactor; - - if( framerate > 90.0 ) { targetsegments = 400; targetfactor = 3.0f; } - else if( framerate > 60.0 ) { targetsegments = 225; targetfactor = 1.5f; } - else if( framerate > 30.0 ) { targetsegments = 90; targetfactor = Global::ScreenHeight / 768.0f; } - else { targetsegments = 9; targetfactor = Global::ScreenHeight / 768.0f * 0.75f; } + if( framerate > 90.0 ) { targetfactor = 3.0f; } + else if( framerate > 60.0 ) { targetfactor = 1.5f; } + else if( framerate > 30.0 ) { targetfactor = Global::ScreenHeight / 768.0f; } + else { targetfactor = Global::ScreenHeight / 768.0f * 0.75f; } if( targetfactor > Global::fDistanceFactor ) { diff --git a/renderer.h b/renderer.h index 1157e563..8095a188 100644 --- a/renderer.h +++ b/renderer.h @@ -119,21 +119,6 @@ public: // main draw call. returns false on error bool Render(); - // render sub-methods, temporarily exposed until we complete migrating render code to the renderer - bool - Render( TDynamicObject *Dynamic ); - bool - Render( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); - bool - Render( TModel3d *Model, material_data const *Material, double const Squaredistance ); - void - Render( TSubModel *Submodel ); - bool - Render_Alpha( TDynamicObject *Dynamic ); - bool - Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); - bool - Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); // geometry methods // NOTE: hands-on geometry management is exposed as a temporary measure; ultimately all visualization data should be generated/handled automatically by the renderer itself // creates a new geometry bank. returns: handle to the bank or NULL @@ -153,7 +138,7 @@ public: Vertices( geometry_handle const &Geometry ) const; // texture methods texture_handle - GetTextureId( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ); + Fetch_Texture( std::string const &Filename, std::string const &Dir = szTexturePath, int const Filter = -1, bool const Loadnow = true ); void Bind( texture_handle const Texture ); opengl_texture const & @@ -225,6 +210,14 @@ private: Render( TSubRect *Groundsubcell ); bool Render( TGroundNode *Node ); + bool + Render( TDynamicObject *Dynamic ); + bool + Render( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + bool + Render( TModel3d *Model, material_data const *Material, double const Squaredistance ); + void + Render( TSubModel *Submodel ); void Render( TTrack *Track ); bool @@ -237,6 +230,12 @@ private: Render_Alpha( TSubRect *Groundsubcell ); bool Render_Alpha( TGroundNode *Node ); + bool + Render_Alpha( TDynamicObject *Dynamic ); + bool + Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + bool + Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); void Render_Alpha( TSubModel *Submodel ); void @@ -277,6 +276,7 @@ private: bool m_framebuffersupport { false }; rendermode m_texenvmode { rendermode::color }; // last configured texture environment renderpass_config m_renderpass; +// std::stack m_renderpasses; bool m_renderspecular { false }; // controls whether to include specular component in the calculations std::vector m_picksceneryitems; std::vector m_pickcontrolsitems; diff --git a/sky.cpp b/sky.cpp index 284825ab..86aba2fe 100644 --- a/sky.cpp +++ b/sky.cpp @@ -9,24 +9,22 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "sky.h" -#include "Logs.h" #include "Globals.h" #include "MdlMngr.h" //--------------------------------------------------------------------------- -GLfloat lightPos[4] = {0.0f, 0.0f, 0.0f, 1.0f}; +//GLfloat lightPos[4] = {0.0f, 0.0f, 0.0f, 1.0f}; -TSky::~TSky(){}; +void TSky::Init() { -TSky::TSky(){}; + if( ( Global::asSky != "1" ) + && ( Global::asSky != "0" ) ) { -void TSky::Init() -{ - WriteLog( "Clouds init" ); - if ((Global::asSky != "1") && (Global::asSky != "0")) mdCloud = TModelsManager::GetModel( Global::asSky ); + } }; +#ifdef EU07_USE_OLD_RENDERCODE void TSky::Render( glm::vec3 const &Tint ) { if (mdCloud) @@ -45,5 +43,6 @@ void TSky::Render( glm::vec3 const &Tint ) ::glDisable( GL_LIGHTING ); } }; +#endif //--------------------------------------------------------------------------- diff --git a/sky.h b/sky.h index ebee49a2..4b544e0e 100644 --- a/sky.h +++ b/sky.h @@ -12,16 +12,18 @@ http://mozilla.org/MPL/2.0/. #include "Model3d.h" -class TSky -{ - private: - TModel3d *mdCloud; +class TSky { - public: - TSky(); - ~TSky(); + friend class opengl_renderer; + +private: + TModel3d *mdCloud { nullptr }; + +public: void Init(); +#ifdef EU07_USE_OLD_RENDERCODE void Render( glm::vec3 const &Tint = glm::vec3(1.0f, 1.0f, 1.0f) ); +#endif }; //--------------------------------------------------------------------------- diff --git a/stars.cpp b/stars.cpp index 08b2b926..ebbd84a6 100644 --- a/stars.cpp +++ b/stars.cpp @@ -2,6 +2,7 @@ #include "stdafx.h" #include "stars.h" #include "globals.h" +#include "MdlMngr.h" ////////////////////////////////////////////////////////////////////////////////////////// // cStars -- simple starfield model, simulating appearance of starry sky @@ -9,9 +10,9 @@ void cStars::init() { - m_stars.LoadFromFile( "models\\skydome_stars.t3d", false ); + m_stars = TModelsManager::GetModel( "models\\skydome_stars.t3d", false ); } - +#ifdef EU07_USE_OLD_RENDERCODE void cStars::render() { // setup @@ -27,4 +28,5 @@ cStars::render() { ::glPointSize( 3.0f ); ::glPopMatrix(); -} \ No newline at end of file +} +#endif diff --git a/stars.h b/stars.h index d5eb7989..dc579ff5 100644 --- a/stars.h +++ b/stars.h @@ -8,13 +8,16 @@ class cStars { + friend class opengl_renderer; + public: // types: // methods: void init(); - void render(); - +#ifdef EU07_USE_OLD_RENDERCODE + void render(); +#endif // constructors: // deconstructor: @@ -29,5 +32,5 @@ private: // members: float m_longitude{ 19.0f }; // geograpic coordinates hardcoded roughly to Poland location, for the time being float m_latitude{ 52.0f }; - TModel3d m_stars; + TModel3d *m_stars { nullptr }; }; diff --git a/stdafx.h b/stdafx.h index cca09510..ca6107c9 100644 --- a/stdafx.h +++ b/stdafx.h @@ -91,4 +91,4 @@ #include #include -#include "openglmatrixstack.h" \ No newline at end of file +#include "openglmatrixstack.h" diff --git a/uilayer.cpp b/uilayer.cpp index 0a98e41b..0b1474f9 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -96,7 +96,7 @@ void ui_layer::set_background( std::string const &Filename ) { if( false == Filename.empty() ) { - m_background = GfxRenderer.GetTextureId( Filename, szTexturePath ); + m_background = GfxRenderer.Fetch_Texture( Filename ); } else { m_background = NULL; From ba5a3613adf29fdd811656b09f0a400079fa1651 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 22 Jul 2017 00:14:07 +0200 Subject: [PATCH 141/426] build 170721. increased size of light points at long distances --- Ground.cpp | 8 -------- Model3d.cpp | 6 ++---- renderer.cpp | 35 +++++++++++++++++++++++++---------- usefull.h | 9 +++++++++ version.h | 2 +- 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index 9f66a6e3..91f84e87 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -49,14 +49,6 @@ extern "C" bool bCondition; // McZapkie: do testowania warunku na event multiple std::string LogComment; -// tests whether provided points form a degenerate triangle -bool -degenerate( glm::dvec3 const &Vertex1, glm::dvec3 const &Vertex2, glm::dvec3 const &Vertex3 ) { - -// degenerate( A, B, C, minarea ) = ( ( B - A ).cross( C - A ) ).lengthSquared() < ( 4.0f * minarea * minarea ); - return glm::length2( glm::cross( Vertex2 - Vertex1, Vertex3 - Vertex1 ) ) < std::numeric_limits::epsilon(); -} - //--------------------------------------------------------------------------- // Obiekt renderujący siatkę jest sztucznie tworzonym obiektem pomocniczym, // grupującym siatki obiektów dla danej tekstury. Obiektami składowymi mogą diff --git a/Model3d.cpp b/Model3d.cpp index 06a5f43c..e2168583 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -460,10 +460,8 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic >> Vertices[i].texture.t; if (i % 3 == 2) { // jeżeli wczytano 3 punkty - if (Vertices[i ].position == Vertices[i - 1].position - || Vertices[i - 1].position == Vertices[i - 2].position - || Vertices[i - 2].position == Vertices[i ].position) - { // jeżeli punkty się nakładają na siebie + if( true == degenerate( Vertices[ i ].position, Vertices[ i - 1 ].position, Vertices[ i - 2 ].position ) ) { + // jeżeli punkty się nakładają na siebie --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce diff --git a/renderer.cpp b/renderer.cpp index 4ddb6df5..07453165 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1493,32 +1493,42 @@ opengl_renderer::Render( TSubModel *Submodel ) { // spotlights are only rendered in colour mode(s) case rendermode::color: { auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); - auto const lightcenter = modelview * glm::vec4( 0.0f, 0.0f, -0.05f, 1.0f ); // pozycja punktu świecącego względem kamery - Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.0f, 0.0f, -1.0f, 1.0f ) - lightcenter ), glm::normalize( -lightcenter ) ); + auto const lightcenter = + modelview + * interpolate( + glm::vec4( 0.f, 0.f, -0.05f, 1.f ), + glm::vec4( 0.f, 0.f, -0.25f, 1.f ), + static_cast( TSubModel::fSquareDist / Submodel->fSquareMaxDist ) ); // pozycja punktu świecącego względem kamery + Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.f, 0.f, -1.f, 1.f ) - lightcenter ), glm::normalize( -lightcenter ) ); - if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) // kąt większy niż maksymalny stożek swiatła - { - float lightlevel = 1.0f; // TODO, TBD: parameter to control light strength - // view angle attenuation + if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) { + // kąt większy niż maksymalny stożek swiatła + float lightlevel = 1.f; // TODO, TBD: parameter to control light strength + // view angle attenuation float const anglefactor = ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances float const distancefactor = static_cast( std::max( 0.5, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ); - if( lightlevel > 0.0f ) { + if( lightlevel > 0.f ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); Bind( 0 ); - ::glPointSize( std::max( 2.0f, 4.0f * distancefactor * anglefactor ) ); + ::glPointSize( std::max( 3.f, 5.f * distancefactor * anglefactor ) ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], lightlevel * anglefactor ); ::glDisable( GL_LIGHTING ); ::glEnable( GL_BLEND ); + ::glPushMatrix(); + ::glLoadIdentity(); + ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian + // main draw call m_geometry.draw( Submodel->m_geometry ); // post-draw reset + ::glPopMatrix(); ::glPopAttrib(); } } @@ -2031,8 +2041,13 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // NOTE: we're forced here to redo view angle calculations etc, because this data isn't instanced but stored along with the single mesh // TODO: separate instance data from reusable geometry auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); - auto const lightcenter = modelview * glm::vec4( 0.0f, 0.0f, -0.05f, 1.0f ); // pozycja punktu świecącego względem kamery - Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.0f, 0.0f, -1.0f, 1.0f ) - lightcenter ), glm::normalize( -lightcenter ) ); + auto const lightcenter = + modelview + * interpolate( + glm::vec4( 0.f, 0.f, -0.05f, 1.f ), + glm::vec4( 0.f, 0.f, -0.10f, 1.f ), + static_cast( TSubModel::fSquareDist / Submodel->fSquareMaxDist ) ); // pozycja punktu świecącego względem kamery + Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.f, 0.f, -1.f, 1.f ) - lightcenter ), glm::normalize( -lightcenter ) ); float glarelevel = 0.6f; // luminosity at night is at level of ~0.1, so the overall resulting transparency is ~0.5 at full 'brightness' if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) { diff --git a/usefull.h b/usefull.h index cd747876..6474da98 100644 --- a/usefull.h +++ b/usefull.h @@ -71,4 +71,13 @@ interpolate( Type_ const &First, Type_ const &Second, double const Factor ) { return ( First * ( 1.0 - Factor ) ) + ( Second * Factor ); } +// tests whether provided points form a degenerate triangle +template +bool +degenerate( VecType_ const &Vertex1, VecType_ const &Vertex2, VecType_ const &Vertex3 ) { + + // degenerate( A, B, C, minarea ) = ( ( B - A ).cross( C - A ) ).lengthSquared() < ( 4.0f * minarea * minarea ); + return glm::length2( glm::cross( Vertex2 - Vertex1, Vertex3 - Vertex1 ) ) < std::numeric_limits::epsilon(); +} + //--------------------------------------------------------------------------- diff --git a/version.h b/version.h index dedc7d9c..a54feaa0 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 717 +#define VERSION_MINOR 721 #define VERSION_REVISION 0 From d2d93616fa1889680f4ceda328a4226ea4f9f668 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 24 Jul 2017 01:26:05 +0200 Subject: [PATCH 142/426] build 170424. basic shadow mapping implementation, multi texturing unit setup --- Globals.cpp | 9 + Globals.h | 6 + McZapkie/mctools.h | 5 + World.cpp | 11 +- openglmatrixstack.h | 17 +- renderer.cpp | 642 +++++++++++++++++++++++++++++++++++--------- renderer.h | 41 ++- uilayer.cpp | 10 +- uilayer.h | 3 + version.h | 2 +- 10 files changed, 601 insertions(+), 145 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index a21a4cac..6073b44d 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -88,6 +88,7 @@ opengl_light Global::DayLight; int Global::DynamicLightCount { 3 }; bool Global::ScaleSpecularValues { true }; bool Global::RenderShadows { false }; +Global::shadowtune_t Global::shadowtune = { 2048, 200.0f, 150.0f, 100.0f }; bool Global::bRollFix = true; // czy wykonać przeliczanie przechyłki bool Global::bJoinEvents = false; // czy grupować eventy o tych samych nazwach int Global::iHiddenEvents = 1; // czy łączyć eventy z torami poprzez nazwę toru @@ -550,6 +551,14 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::RenderShadows; } + else if( token == "shadowtune" ) { + Parser.getTokens( 4, false ); + Parser + >> Global::shadowtune.map_size + >> Global::shadowtune.width + >> Global::shadowtune.depth + >> Global::shadowtune.distance; + } else if (token == "smoothtraction") { // podwójna jasność ambient diff --git a/Globals.h b/Globals.h index 948eae86..752aca31 100644 --- a/Globals.h +++ b/Globals.h @@ -227,6 +227,12 @@ class Global static int DynamicLightCount; static bool ScaleSpecularValues; static bool RenderShadows; + static struct shadowtune_t { + unsigned int map_size; + float width; + float depth; + float distance; + } shadowtune; static int iSlowMotion; static TDynamicObject *changeDynObj; diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index 8f02ab11..55a65447 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -98,6 +98,11 @@ std::string to_string( glm::tvec3 const &Value ) { return to_string( Value.x, 2 ) + ", " + to_string( Value.y, 2 ) + ", " + to_string( Value.z, 2 ); } +template +std::string to_string( glm::tvec4 const &Value, int const Width = 2 ) { + return to_string( Value.x, Width ) + ", " + to_string( Value.y, Width ) + ", " + to_string( Value.z, Width ) + ", " + to_string( Value.w, Width ); +} + int stol_def(const std::string & str, const int & DefaultValue); std::string ToLower(std::string const &text); diff --git a/World.cpp b/World.cpp index 198f4ed6..f11c1e80 100644 --- a/World.cpp +++ b/World.cpp @@ -32,6 +32,8 @@ http://mozilla.org/MPL/2.0/. #include "uilayer.h" #include "translation.h" +//#define EU07_USE_DEBUG_SHADOWMAP + //--------------------------------------------------------------------------- TDynamicObject *Controlled = NULL; // pojazd, który prowadzimy @@ -632,8 +634,13 @@ void TWorld::OnKeyDown(int cKey) break; } case GLFW_KEY_F8: { +#ifdef EU07_USE_DEBUG_SHADOWMAP + if( Global::iTextMode == cKey ) { ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; } + if( Global::iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { + Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; + } +#endif Global::iTextMode = cKey; - // FPS break; } case GLFW_KEY_F9: { @@ -1693,7 +1700,7 @@ TWorld::Update_UI() { std::to_string( int( tmp->MoverParameters->Im ) ) ) + "; U=" + to_string( int( tmp->MoverParameters->RunningTraction.TractionVoltage + 0.5 ) ) + "; R=" + - ( tmp->MoverParameters->RunningShape.R > 100000.0 ? + ( std::abs( tmp->MoverParameters->RunningShape.R ) > 10000.0 ? "~0.0" : to_string( tmp->MoverParameters->RunningShape.R, 1 ) ) + " An=" + to_string( tmp->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne diff --git a/openglmatrixstack.h b/openglmatrixstack.h index b57f545b..b75e37c7 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -55,6 +55,10 @@ public: multiply( glm::mat4 const &Matrix ) { m_stack.top() *= Matrix; upload(); } + void + ortho( float const Left, float const Right, float const Bottom, float const Top, float const Znear, float const Zfar ) { + m_stack.top() *= glm::ortho( Left, Right, Bottom, Top, Znear, Zfar ); + upload(); } void perspective( float const Fovy, float const Aspect, float const Znear, float const Zfar ) { m_stack.top() *= glm::perspective( Fovy, Aspect, Znear, Zfar ); @@ -132,10 +136,20 @@ public: m_stacks[ m_mode ].multiply( glm::make_mat4( Matrix ) ); } template + void + ortho( Type_ const Left, Type_ const Right, Type_ const Bottom, Type_ const Top, Type_ const Znear, Type_ const Zfar ) { + m_stacks[ m_mode ].ortho( + static_cast( Left ), + static_cast( Right ), + static_cast( Bottom ), + static_cast( Top ), + static_cast( Znear ), + static_cast( Zfar ) ); } + template void perspective( Type_ const Fovy, Type_ const Aspect, Type_ const Znear, Type_ const Zfar ) { m_stacks[ m_mode ].perspective( - static_cast(Fovy) * 0.0174532925f, // deg2rad + static_cast( glm::radians( Fovy ) ), static_cast( Aspect ), static_cast( Znear ), static_cast( Zfar ) ); } @@ -177,6 +191,7 @@ extern opengl_matrices OpenGLMatrices; // NOTE: no scale override as we aren't using it anywhere #define glMultMatrixd OpenGLMatrices.multiply #define glMultMatrixf OpenGLMatrices.multiply +#define glOrtho OpenGLMatrices.ortho #define gluPerspective OpenGLMatrices.perspective #define gluLookAt OpenGLMatrices.look_at diff --git a/renderer.cpp b/renderer.cpp index 07453165..c3ce5a93 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -25,9 +25,12 @@ http://mozilla.org/MPL/2.0/. opengl_renderer GfxRenderer; extern TWorld World; +//#define EU07_USE_ORTHO_SHADOWS + namespace colors { -glm::vec4 const none { 0.0f, 0.0f, 0.0f, 1.0f }; +glm::vec4 const none { 0.f, 0.f, 0.f, 1.f }; +glm::vec4 const white{ 1.f, 1.f, 1.f, 1.f }; } // namespace colors @@ -67,6 +70,10 @@ opengl_renderer::Init( GLFWwindow *Window ) { glEnable( GL_CULL_FACE ); // Cull back-facing triangles glShadeModel( GL_SMOOTH ); // Enable Smooth Shading + glActiveTexture( m_diffusetextureunit ); + glClientActiveTexture( m_diffusetextureunit ); + UILayer.set_unit( m_diffusetextureunit ); + glEnable( GL_DEPTH_TEST ); glAlphaFunc( GL_GREATER, 0.04f ); glEnable( GL_ALPHA_TEST ); @@ -152,22 +159,41 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now } #endif + + ::glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); + // preload some common textures + WriteLog( "Loading common gfx data..." ); + m_glaretexture = Fetch_Texture( "fx\\lightglare" ); + m_suntexture = Fetch_Texture( "fx\\sun" ); + m_moontexture = Fetch_Texture( "fx\\moon" ); + if( m_helpertextureunit >= 0 ) { + m_reflectiontexture = Fetch_Texture( "fx\\reflections" ); + } + WriteLog( "...gfx data pre-loading done" ); + // shadowmap resources if( ( true == Global::RenderShadows ) && ( true == m_framebuffersupport ) ) { // texture: ::glGenTextures( 1, &m_shadowtexture ); ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); + // allocate memory + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, m_shadowbuffersize, m_shadowbuffersize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL ); + // setup parameters ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); // enable shadow comparison: true (ie not in shadow) if r<=texture... ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL ); - // ...shadow comparison should generate an INTENSITY result - ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_INTENSITY ); - ::glTexImage2D( GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, m_shadowbuffersize, m_shadowbuffersize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL ); + ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE ); + // eye_linear is the default, so we could probably skip it + ::glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); + ::glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); + ::glTexGeni( GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); + ::glTexGeni( GL_Q, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); + ::glBindTexture( GL_TEXTURE_2D, 0 ); // create and assemble the framebuffer ::glGenFramebuffersEXT( 1, &m_shadowframebuffer ); ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); @@ -187,13 +213,6 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glDrawBuffer( GL_BACK ); } - ::glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); - // preload some common textures - WriteLog( "Loading common gfx data..." ); - m_glaretexture = Fetch_Texture( "fx\\lightglare" ); - m_suntexture = Fetch_Texture( "fx\\sun" ); - m_moontexture = Fetch_Texture( "fx\\moon" ); - WriteLog( "...gfx data pre-loading done" ); // prepare basic geometry chunks auto const geometrybank = m_geometry.create_bank(); float const size = 2.5f; @@ -217,6 +236,7 @@ opengl_renderer::Render() { auto const drawstart = std::chrono::steady_clock::now(); + m_renderpass.draw_mode = rendermode::none; // force setup anew Render_pass( rendermode::color ); glfwSwapBuffers( m_window ); @@ -248,7 +268,15 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glDrawBuffer( GL_BACK ); } - ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); + if( ( Global::iTextMode == GLFW_KEY_F8 ) && ( Global::iScreenMode[ GLFW_KEY_F8 - GLFW_KEY_F1 ] == 1 ) ) { + // debug shadowmap + ::glViewport( 0, 0, Global::ScreenHeight, Global::ScreenHeight ); + m_renderpass.draw_range = 1250.f; // 1.0km square centered around camera + } + else { + ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); + m_renderpass.draw_range = 2500.0f; // arbitrary base draw range + } if( World.InitPerformed() ) { auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); @@ -261,19 +289,22 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( World.InitPerformed() ) { // setup - m_renderpass.draw_range = 2500.0f; // arbitrary base draw range - Render_projection(); - Render_camera(); + setup_projection(); + setup_camera(); ::glDepthFunc( GL_LEQUAL ); // render - Render_setup( true ); + setup_drawing( true ); + setup_units( true, false, false ); Render( &World.Environment ); // opaque parts... - Render_setup(); + setup_drawing( false ); + setup_units( true, true, true ); Render( &World.Ground ); // ...translucent parts - Render_setup( true ); + setup_drawing( true ); Render_Alpha( &World.Ground ); + // cab render is performed without shadows, due to low resolution and number of models without windows :| + toggle_units( true, false, false ); // cab render is done in translucent phase to deal with badly configured vehicles if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } } @@ -283,21 +314,34 @@ opengl_renderer::Render_pass( rendermode const Mode ) { case rendermode::shadows: { - ::glViewport( 0, 0, m_shadowbuffersize, m_shadowbuffersize ); - - ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); - ::glClear( GL_DEPTH_BUFFER_BIT ); - if( World.InitPerformed() ) { // setup - m_renderpass.draw_range = 500.0f; // 1.0km square centered around camera - Render_projection(); - Render_camera(); + ::glViewport( 0, 0, m_shadowbuffersize, m_shadowbuffersize ); + + ::glClear( GL_DEPTH_BUFFER_BIT ); + ::glScissor( 1, 1, m_shadowbuffersize - 2, m_shadowbuffersize - 2 ); + ::glEnable( GL_SCISSOR_TEST ); + + m_renderpass.draw_range = 1250.f; // 1.0km square centered around camera + m_shadowtexturematrix = + glm::mat4{ + 0.5f, 0.0f, 0.0f, 0.0f, + 0.0f, 0.5f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.5f, 0.0f, + 0.5f, 0.5f, 0.5f, 1.0f }; //bias from [-1, 1] to [0, 1] }; + setup_projection(); + setup_camera(); ::glDepthFunc( GL_LEQUAL ); + ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting + ::glPolygonOffset( 4.f, 8.f ); // render // opaque parts... - Render_setup(); + setup_drawing( false ); + setup_units( false, false, false ); Render( &World.Ground ); + // post-render restore + ::glDisable( GL_POLYGON_OFFSET_FILL ); + ::glDisable( GL_SCISSOR_TEST ); } break; } @@ -307,19 +351,20 @@ opengl_renderer::Render_pass( rendermode const Mode ) { #ifdef EU07_USE_PICKING_FRAMEBUFFER ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); #endif - ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); - ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - if( World.InitPerformed() ) { // setup + ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + m_pickcontrolsitems.clear(); m_renderpass.draw_range = 50.0f; // doesn't really matter for control picking - Render_projection(); - Render_camera(); + setup_projection(); + setup_camera(); ::glDepthFunc( GL_LEQUAL ); // render // opaque parts... - Render_setup(); + setup_drawing( false ); + setup_units( false, false, false ); // cab render skips translucent parts, so we can do it here if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } } @@ -332,19 +377,20 @@ opengl_renderer::Render_pass( rendermode const Mode ) { #ifdef EU07_USE_PICKING_FRAMEBUFFER ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); #endif - ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); - ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - if( World.InitPerformed() ) { // setup + ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + m_picksceneryitems.clear(); m_renderpass.draw_range = 1000.0f; // scenery picking is likely to focus on nearby nodes - Render_projection(); - Render_camera(); + setup_projection(); + setup_camera(); ::glDepthFunc( GL_LEQUAL ); // render // opaque parts... - Render_setup(); + setup_drawing( false ); + setup_units( false, false, false ); Render( &World.Ground ); } break; @@ -354,12 +400,11 @@ opengl_renderer::Render_pass( rendermode const Mode ) { break; } } - } // configures projection matrix for the current render pass void -opengl_renderer::Render_projection() { +opengl_renderer::setup_projection() { ::glMatrixMode( GL_PROJECTION ); ::glLoadIdentity(); @@ -371,11 +416,17 @@ opengl_renderer::Render_projection() { case rendermode::pickscenery: #endif case rendermode::color: { - ::gluPerspective( - Global::FieldOfView / Global::ZoomFactor, - std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), - 0.1f * Global::ZoomFactor, - m_renderpass.draw_range * Global::fDistanceFactor ); + if( ( Global::iTextMode == GLFW_KEY_F8 ) && ( Global::iScreenMode[ GLFW_KEY_F8 - GLFW_KEY_F1 ] == 1 ) ) { + // debug shadowmap +#ifdef EU07_USE_ORTHO_SHADOWS + setup_projection_light_ortho(); +#else + setup_projection_light_perspective(); +#endif + } + else { + setup_projection_world(); + } break; } #ifdef EU07_USE_PICKING_FRAMEBUFFER @@ -393,13 +444,12 @@ opengl_renderer::Render_projection() { } #endif case rendermode::shadows: { - // TODO: set parallel projection - ::gluPerspective( - Global::FieldOfView, - 1.f, -// std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ), - 2.f, - m_renderpass.draw_range * Global::fDistanceFactor ); +#ifdef EU07_USE_ORTHO_SHADOWS + setup_projection_light_ortho(); +#else + setup_projection_light_perspective(); +#endif + m_shadowtexturematrix *= OpenGLMatrices.data( GL_PROJECTION ); break; } @@ -409,9 +459,38 @@ opengl_renderer::Render_projection() { } } +void +opengl_renderer::setup_projection_world() { + + ::gluPerspective( + Global::FieldOfView / Global::ZoomFactor, + std::max( 1.f, (float)Global::ScreenWidth ) / std::max( 1.f, (float)Global::ScreenHeight ), + 0.1f * Global::ZoomFactor, + m_renderpass.draw_range * Global::fDistanceFactor ); +} + +void +opengl_renderer::setup_projection_light_ortho() { + + ::glOrtho( + -250, 250, + -250, 250, + -2500, 2500 ); +} + +void +opengl_renderer::setup_projection_light_perspective() { + + ::gluPerspective( + 45.f, + 1.f, + 100.f, // light source is pulled back far enough we won't likely have anything too close to it, can get some z-range here + m_renderpass.draw_range * Global::fDistanceFactor ); +} + // configures modelview matrix for the current render pass void -opengl_renderer::Render_camera() { +opengl_renderer::setup_camera() { ::glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix ::glLoadIdentity(); @@ -422,17 +501,29 @@ opengl_renderer::Render_camera() { case rendermode::color: case rendermode::pickcontrols: case rendermode::pickscenery: { - World.Camera.SetMatrix( viewmatrix ); - m_renderpass.camera.position() = Global::pCameraPosition; + if( ( Global::iTextMode == GLFW_KEY_F8 ) && ( Global::iScreenMode[ GLFW_KEY_F8 - GLFW_KEY_F1 ] == 1 ) ) { +#ifdef EU07_USE_ORTHO_SHADOWS + setup_camera_light_ortho( viewmatrix ); +#else + setup_camera_light_perspective( viewmatrix ); +#endif + } + else { + setup_camera_world( viewmatrix ); + } break; } case rendermode::shadows: { - m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * 250.f }; - m_renderpass.camera.position().y = std::max( 50.0, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low - viewmatrix = glm::lookAt( - m_renderpass.camera.position(), - glm::dvec3{ Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z }, - glm::dvec3{ 0.f, 1.f, 0.f } ); +#ifdef EU07_USE_ORTHO_SHADOWS + setup_camera_light_ortho( viewmatrix ); +#else + setup_camera_light_perspective( viewmatrix ); +#endif + // during colour pass coordinates are moved from camera-centric to light-centric, essentially the difference between these two origins + m_shadowtexturematrix *= + glm::translate( + glm::mat4{ glm::dmat3{ viewmatrix } }, + glm::vec3{ glm::dvec3{ Global::pCameraPosition } - m_renderpass.camera.position() } ); break; } default: { @@ -445,7 +536,45 @@ opengl_renderer::Render_camera() { } void -opengl_renderer::Render_setup( bool const Alpha ) { +opengl_renderer::setup_camera_world( glm::dmat4 &Viewmatrix ) { + + World.Camera.SetMatrix( Viewmatrix ); + m_renderpass.camera.position() = Global::pCameraPosition; +} + +void +opengl_renderer::setup_camera_light_ortho( glm::dmat4 &Viewmatrix ) { +/* + m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * 250.f }; + m_renderpass.camera.position().y = std::max( 75.0, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low + Viewmatrix = glm::lookAt( + m_renderpass.camera.position(), + glm::dvec3{ Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z }, + glm::dvec3{ 0.f, 1.f, 0.f } ); +*/ + m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction }; + if( m_renderpass.camera.position().y - Global::pCameraPosition.y < 0.15 ) { + m_renderpass.camera.position().y = Global::pCameraPosition.y + 0.15; + } + Viewmatrix = glm::lookAt( + m_renderpass.camera.position(), + glm::dvec3{ Global::pCameraPosition }, + glm::dvec3{ 0.f, 1.f, 0.f } ); +} + +void +opengl_renderer::setup_camera_light_perspective( glm::dmat4 &Viewmatrix ) { + + m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * m_renderpass.draw_range * 0.5f }; + m_renderpass.camera.position().y = std::max( 75.0, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low + Viewmatrix = glm::lookAt( + m_renderpass.camera.position(), + glm::dvec3{ Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z }, + glm::dvec3{ 0.f, 1.f, 0.f } ); +} + +void +opengl_renderer::setup_drawing( bool const Alpha ) { if( true == Alpha ) { @@ -473,19 +602,6 @@ opengl_renderer::Render_setup( bool const Alpha ) { } else { ::glDisable( GL_FOG ); } - if( m_texenvmode != m_renderpass.draw_mode ) { - // texture colour and alpha - ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); -/* - ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA ); -*/ - m_texenvmode = m_renderpass.draw_mode; - } break; } case rendermode::shadows: @@ -498,19 +614,6 @@ opengl_renderer::Render_setup( bool const Alpha ) { } ::glDisable( GL_FOG ); - if( m_texenvmode != m_renderpass.draw_mode ) { - // solid colour with texture alpha - ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR ); // or GL_PREVIOUS - ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); -/* - ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA ); -*/ - m_texenvmode = m_renderpass.draw_mode; - } break; } default: { @@ -519,6 +622,169 @@ opengl_renderer::Render_setup( bool const Alpha ) { } } +// configures, enables and disables specified texture units +void +opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { + // helper texture unit. + // darkens previous stage, preparing data for the shadow texture unit to select from + if( m_helpertextureunit >= 0 ) { + if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + // setup reflection texture unit + ::glActiveTexture( m_helpertextureunit ); + ::glBindTexture( GL_TEXTURE_2D, m_reflectiontexture ); // TODO: move to reflection unit setup + ::glEnable( GL_TEXTURE_2D ); +/* + glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); + glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); + glEnable( GL_TEXTURE_GEN_S ); + glEnable( GL_TEXTURE_GEN_T ); +*/ + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( m_shadowcolor ) ); // TODO: dynamically calculated shadow colour, based on sun height + + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE ); // darken the previous stage + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PREVIOUS ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_CONSTANT ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR ); + + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // simply copy alpha from diffuse stage + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); + } + else { + ::glActiveTexture( m_helpertextureunit ); + ::glDisable( GL_TEXTURE_2D ); +/* + ::glDisable( GL_TEXTURE_GEN_S ); + ::glDisable( GL_TEXTURE_GEN_T ); + ::glDisable( GL_TEXTURE_GEN_R ); + ::glDisable( GL_TEXTURE_GEN_Q ); +*/ + } + } + // shadow texture unit. + // interpolates between primary colour and the previous unit, which should hold darkened variant of the primary colour + if( m_shadowtextureunit >= 0 ) { + if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + + ::glActiveTexture( m_shadowtextureunit ); + ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); + ::glEnable( GL_TEXTURE_2D ); + // s + ::glTexGenfv( GL_S, GL_EYE_PLANE, glm::value_ptr( glm::row( m_shadowtexturematrix, 0 ) ) ); + ::glEnable( GL_TEXTURE_GEN_S ); + // t + ::glTexGenfv( GL_T, GL_EYE_PLANE, glm::value_ptr( glm::row( m_shadowtexturematrix, 1 ) ) ); + ::glEnable( GL_TEXTURE_GEN_T ); + // r + ::glTexGenfv( GL_R, GL_EYE_PLANE, glm::value_ptr( glm::row( m_shadowtexturematrix, 2 ) ) ); + ::glEnable( GL_TEXTURE_GEN_R ); + // q + ::glTexGenfv( GL_Q, GL_EYE_PLANE, glm::value_ptr( glm::row( m_shadowtexturematrix, 3 ) ) ); + ::glEnable( GL_TEXTURE_GEN_Q ); + + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE ); // choose between lit and lit * shadow colour, based on depth test + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PREVIOUS ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR ); + + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // simply copy alpha from diffuse stage + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); + } + else { + // turn off shadow map tests + ::glActiveTexture( m_shadowtextureunit ); + + ::glDisable( GL_TEXTURE_2D ); + ::glDisable( GL_TEXTURE_GEN_S ); + ::glDisable( GL_TEXTURE_GEN_T ); + ::glDisable( GL_TEXTURE_GEN_R ); + ::glDisable( GL_TEXTURE_GEN_Q ); + } + } + // diffuse texture unit. + // NOTE: diffuse texture mapping is never fully disabled, alpha channel information is always included + ::glActiveTexture( m_diffusetextureunit ); + if( true == Diffuse ) { + // default behaviour, modulate with previous stage + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); +/* + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_MODULATE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA ); +*/ + } + else { + // solid colour with texture alpha + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PREVIOUS ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); +/* + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA ); +*/ + } +} + +// enables and disables specified texture units +void +opengl_renderer::toggle_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { + // helper texture unit. + if( m_helpertextureunit >= 0 ) { + if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + ::glActiveTexture( m_helpertextureunit ); + ::glEnable( GL_TEXTURE_2D ); + } + else { + ::glActiveTexture( m_helpertextureunit ); + ::glDisable( GL_TEXTURE_2D ); + } + } + // shadow texture unit. + if( m_shadowtextureunit >= 0 ) { + if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + + ::glActiveTexture( m_shadowtextureunit ); + ::glEnable( GL_TEXTURE_2D ); + } + else { + + ::glActiveTexture( m_shadowtextureunit ); + ::glDisable( GL_TEXTURE_2D ); + } + } + // diffuse texture unit. + // NOTE: toggle actually disables diffuse texture mapping, unlike setup counterpart + if( true == Diffuse ) { + + ::glActiveTexture( m_diffusetextureunit ); + ::glEnable( GL_TEXTURE_2D ); + } + else { + + ::glActiveTexture( m_diffusetextureunit ); + ::glDisable( GL_TEXTURE_2D ); + } +} + +void +opengl_renderer::setup_shadow_color( glm::vec4 const &Shadowcolor ) { + + ::glActiveTexture( m_helpertextureunit ); + ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( Shadowcolor ) ); // in-shadow colour multiplier + ::glActiveTexture( m_diffusetextureunit ); + +} + bool opengl_renderer::Render( world_environment *Environment ) { @@ -587,10 +853,10 @@ opengl_renderer::Render( world_environment *Environment ) { float const size = 0.045f; ::glBegin( GL_TRIANGLE_STRIP ); - ::glTexCoord2f( 1.0f, 1.0f ); ::glVertex3f( -size, size, 0.0f ); - ::glTexCoord2f( 1.0f, 0.0f ); ::glVertex3f( -size, -size, 0.0f ); - ::glTexCoord2f( 0.0f, 1.0f ); ::glVertex3f( size, size, 0.0f ); - ::glTexCoord2f( 0.0f, 0.0f ); ::glVertex3f( size, -size, 0.0f ); + ::glMultiTexCoord2f( m_diffusetextureunit, 1.f, 1.f ); ::glVertex3f( -size, size, 0.f ); + ::glMultiTexCoord2f( m_diffusetextureunit, 1.f, 0.f ); ::glVertex3f( -size, -size, 0.f ); + ::glMultiTexCoord2f( m_diffusetextureunit, 0.f, 1.f ); ::glVertex3f( size, size, 0.f ); + ::glMultiTexCoord2f( m_diffusetextureunit, 0.f, 0.f ); ::glVertex3f( size, -size, 0.f ); ::glEnd(); ::glPopMatrix(); @@ -623,10 +889,10 @@ opengl_renderer::Render( world_environment *Environment ) { else { moonv = 1.0f - 0.0f; moonu = 0.0f; } ::glBegin( GL_TRIANGLE_STRIP ); - ::glTexCoord2f( moonu, moonv ); ::glVertex3f( -size, size, 0.0f ); - ::glTexCoord2f( moonu, moonv - 0.333f ); ::glVertex3f( -size, -size, 0.0f ); - ::glTexCoord2f( moonu + 0.333f, moonv ); ::glVertex3f( size, size, 0.0f ); - ::glTexCoord2f( moonu + 0.333f, moonv - 0.333f ); ::glVertex3f( size, -size, 0.0f ); + ::glMultiTexCoord2f( m_diffusetextureunit, moonu, moonv ); ::glVertex3f( -size, size, 0.0f ); + ::glMultiTexCoord2f( m_diffusetextureunit, moonu, moonv - 0.333f ); ::glVertex3f( -size, -size, 0.0f ); + ::glMultiTexCoord2f( m_diffusetextureunit, moonu + 0.333f, moonv ); ::glVertex3f( size, size, 0.0f ); + ::glMultiTexCoord2f( m_diffusetextureunit, moonu + 0.333f, moonv - 0.333f ); ::glVertex3f( size, -size, 0.0f ); ::glEnd(); ::glPopMatrix(); @@ -831,21 +1097,23 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { case rendermode::pickscenery: { // non-interactive scenery elements get neutral colour ::glColor3fv( glm::value_ptr( colors::none ) ); - break; } case rendermode::shadows: - case rendermode::color: + case rendermode::color: { + if( Groundcell->nRenderRect != nullptr ) { + // nieprzezroczyste trójkąty kwadratu kilometrowego + for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { + Render( node ); + } + } + break; + } case rendermode::pickcontrols: default: { break; } } - if( Groundcell->nRenderRect != nullptr ) { - // nieprzezroczyste trójkąty kwadratu kilometrowego - for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - } + if( Groundcell->nTerrain ) { Render( Groundcell->nTerrain ); @@ -969,7 +1237,18 @@ opengl_renderer::Render( TGroundNode *Node ) { return true; } - double const distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ); + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need distance from actual camera + distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); + break; + } + default: { + distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ); + break; + } + } if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { return false; @@ -1015,8 +1294,30 @@ opengl_renderer::Render( TGroundNode *Node ) { #else Node->Model->RaAnimate(); // jednorazowe przeliczenie animacji Node->Model->RaPrepare(); - if( Node->Model->pModel ) // renderowanie rekurencyjne submodeli - Render( Node->Model->pModel, Node->Model->Material(), Node->pCenter - m_renderpass.camera.position(), Node->Model->vAngle ); + if( Node->Model->pModel ) { + // renderowanie rekurencyjne submodeli + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + Render( + Node->Model->pModel, + Node->Model->Material(), + SquareMagnitude( Node->pCenter - Global::pCameraPosition ), + Node->pCenter - m_renderpass.camera.position(), + Node->Model->vAngle ); + break; + } + default: { + auto const position = Node->pCenter - m_renderpass.camera.position(); + Render( + Node->Model->pModel, + Node->Model->Material(), + SquareMagnitude( position ), + position, + Node->Model->vAngle ); + break; + } + } + } #endif return true; } @@ -1154,11 +1455,20 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { if( false == Dynamic->renderme ) { return false; } - // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji auto const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); - double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); + double squaredistance; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + squaredistance = SquareMagnitude( ( Dynamic->vPosition - Global::pCameraPosition ) / Global::ZoomFactor ); + break; + } + default: { + squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); + break; + } + } Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); @@ -1342,7 +1652,7 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, double } bool -opengl_renderer::Render( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { +opengl_renderer::Render( TModel3d *Model, material_data const *Material, double const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { ::glPushMatrix(); ::glTranslated( Position.x, Position.y, Position.z ); @@ -1353,7 +1663,7 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, Math3D: if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); - auto const result = Render( Model, Material, SquareMagnitude( Position ) ); // position is effectively camera offset + auto const result = Render( Model, Material, Squaredistance ); ::glPopMatrix(); @@ -1417,6 +1727,8 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); + // disable shadows so they don't obstruct self-lit items + setup_shadow_color( colors::white ); } // main draw call @@ -1429,6 +1741,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Global::fLuminance < Submodel->fLight ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); + setup_shadow_color( m_shadowcolor ); } #ifdef EU07_USE_OPTIMIZED_NORMALIZATION switch( Submodel->m_normalizenormals ) { @@ -1524,10 +1837,14 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glLoadIdentity(); ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian + setup_shadow_color( colors::white ); + // main draw call m_geometry.draw( Submodel->m_geometry ); // post-draw reset + // re-enable shadows + setup_shadow_color( m_shadowcolor ); ::glPopMatrix(); ::glPopAttrib(); } @@ -1709,7 +2026,18 @@ opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { bool opengl_renderer::Render_Alpha( TGroundNode *Node ) { - double const distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ); + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need distance from actual camera + distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); + break; + } + default: { + distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ); + break; + } + } if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { return false; @@ -1766,8 +2094,30 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { Node->Model->RenderAlpha( Node->pCenter - m_renderpass.camera.position() ); #else Node->Model->RaPrepare(); - if( Node->Model->pModel ) // renderowanie rekurencyjne submodeli - Render_Alpha( Node->Model->pModel, Node->Model->Material(), Node->pCenter - m_renderpass.camera.position(), Node->Model->vAngle ); + if( Node->Model->pModel ) { + // renderowanie rekurencyjne submodeli + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + Render_Alpha( + Node->Model->pModel, + Node->Model->Material(), + SquareMagnitude( Node->pCenter - Global::pCameraPosition ), + Node->pCenter - m_renderpass.camera.position(), + Node->Model->vAngle ); + break; + } + default: { + auto const position = Node->pCenter - m_renderpass.camera.position(); + Render_Alpha( + Node->Model->pModel, + Node->Model->Material(), + SquareMagnitude( position ), + position, + Node->Model->vAngle ); + break; + } + } + } #endif return true; } @@ -1848,7 +2198,17 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji auto const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); - double const squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); + double squaredistance; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + squaredistance = SquareMagnitude( ( Dynamic->vPosition - Global::pCameraPosition ) / Global::ZoomFactor ); + break; + } + default: { + squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); + break; + } + } Dynamic->ABuLittleUpdate( squaredistance ); // ustawianie zmiennych submodeli dla wspólnego modelu ::glPushMatrix(); @@ -1936,7 +2296,7 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, d } bool -opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { +opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { ::glPushMatrix(); ::glTranslated( Position.x, Position.y, Position.z ); @@ -1947,7 +2307,7 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, M if( Angle.z != 0.0 ) ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); - auto const result = Render_Alpha( Model, Material, SquareMagnitude( Position ) ); // position is effectively camera offset + auto const result = Render_Alpha( Model, Material, Squaredistance ); // position is effectively camera offset ::glPopMatrix(); @@ -2006,6 +2366,8 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); + // disable shadows so they don't obstruct self-lit items + setup_shadow_color( colors::white ); } // main draw call @@ -2018,6 +2380,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { if( Global::fLuminance < Submodel->fLight ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); + setup_shadow_color( m_shadowcolor ); } #ifdef EU07_USE_OPTIMIZED_NORMALIZATION switch( Submodel->m_normalizenormals ) { @@ -2068,6 +2431,8 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { ::glLoadIdentity(); // macierz jedynkowa ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian ::glRotated( std::atan2( lightcenter.x, lightcenter.z ) * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // jedynie obracamy w pionie o kąt + // disable shadows so they don't obstruct self-lit items + setup_shadow_color( colors::white ); // main draw call m_geometry.draw( m_billboardgeometry ); @@ -2080,6 +2445,8 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // ...etc instead IF we had easy access to camera's forward and right vectors. TODO: check if Camera matrix is accessible */ // post-render cleanup + setup_shadow_color( m_shadowcolor ); + ::glPopMatrix(); ::glPopAttrib(); } @@ -2293,7 +2660,7 @@ opengl_renderer::Update( double const Deltatime ) { }; // debug performance string -std::string const & +std::string opengl_renderer::Info() const { return m_debuginfo; @@ -2397,15 +2764,36 @@ opengl_renderer::Init_caps() { else { WriteLog( "Framebuffer objects not supported, resorting to back buffer rendering where possible" ); } - if( Global::iMultisampling ) - WriteLog( "Using multisampling x" + std::to_string( 1 << Global::iMultisampling ) ); // ograniczenie maksymalnego rozmiaru tekstur - parametr dla skalowania tekstur { - GLint i; - glGetIntegerv( GL_MAX_TEXTURE_SIZE, &i ); - if( i < Global::iMaxTextureSize ) - Global::iMaxTextureSize = i; + GLint texturesize; + ::glGetIntegerv( GL_MAX_TEXTURE_SIZE, &texturesize ); + Global::iMaxTextureSize = std::min( Global::iMaxTextureSize, texturesize ); WriteLog( "Texture sizes capped at " + std::to_string( Global::iMaxTextureSize ) + " pixels" ); + m_shadowbuffersize = Global::shadowtune.map_size; + m_shadowbuffersize = std::min( m_shadowbuffersize, texturesize ); + WriteLog( "Shadows map size capped at " + std::to_string( m_shadowbuffersize ) + " pixels" ); + } + // cap the number of supported lights based on hardware + { + GLint maxlights; + ::glGetIntegerv( GL_MAX_LIGHTS, &maxlights ); + Global::DynamicLightCount = std::min( Global::DynamicLightCount, maxlights - 1 ); + WriteLog( "Dynamic light amount capped at " + std::to_string( Global::DynamicLightCount ) + " (" + std::to_string(maxlights) + " lights total supported by the gfx card)" ); + } + { + GLint maxtextureunits; + ::glGetIntegerv( GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &maxtextureunits ); + if( maxtextureunits < 4 ) { + WriteLog( "Less than 4 texture units, shadow and reflection mapping will be disabled" ); + Global::RenderShadows = false; + m_diffusetextureunit = GL_TEXTURE0; + m_shadowtextureunit = -1; + m_helpertextureunit = -1; + } + } + if( Global::iMultisampling ) { + WriteLog( "Using multisampling x" + std::to_string( 1 << Global::iMultisampling ) ); } return true; diff --git a/renderer.h b/renderer.h index 8095a188..8aab1794 100644 --- a/renderer.h +++ b/renderer.h @@ -159,7 +159,7 @@ public: TGroundNode const * Update_Pick_Node(); // debug performance string - std::string const & + std::string Info() const; // members @@ -169,6 +169,7 @@ public: private: // types enum class rendermode { + none, color, shadows, pickcontrols, @@ -194,12 +195,30 @@ private: Render_pass( rendermode const Mode ); // configures projection matrix for the current render pass void - Render_projection(); + setup_projection(); + void + setup_projection_world(); + void + setup_projection_light_ortho(); + void + setup_projection_light_perspective(); // configures camera for the current render pass void - Render_camera(); + setup_camera(); void - Render_setup( bool const Alpha = false ); + setup_camera_world( glm::dmat4 &Viewmatrix ); + void + setup_camera_light_ortho( glm::dmat4 &Viewmatrix ); + void + setup_camera_light_perspective( glm::dmat4 &Viewmatrix ); + void + setup_drawing( bool const Alpha = false ); + void + setup_units( bool const Diffuse, bool const Shadows, bool const Reflections ); + void + setup_shadow_color( glm::vec4 const &Shadowcolor ); + void + toggle_units( bool const Diffuse, bool const Shadows, bool const Reflections ); bool Render( world_environment *Environment ); bool @@ -213,7 +232,7 @@ private: bool Render( TDynamicObject *Dynamic ); bool - Render( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + Render( TModel3d *Model, material_data const *Material, double const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); bool Render( TModel3d *Model, material_data const *Material, double const Squaredistance ); void @@ -233,7 +252,7 @@ private: bool Render_Alpha( TDynamicObject *Dynamic ); bool - Render_Alpha( TModel3d *Model, material_data const *Material, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); bool Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); void @@ -257,13 +276,19 @@ private: #endif GLuint m_shadowframebuffer { 0 }; GLuint m_shadowtexture { 0 }; - int m_shadowbuffersize { 2048 }; + int m_shadowbuffersize { 4096 }; + glm::mat4 m_shadowtexturematrix; + glm::vec4 m_shadowcolor{ 0.5f, 0.5f, 0.5f, 1.f }; GLUquadricObj *m_quadric { nullptr }; // helper object for drawing debug mode scene elements + int m_shadowtextureunit { GL_TEXTURE1 }; + int m_helpertextureunit { GL_TEXTURE0 }; + int m_diffusetextureunit { GL_TEXTURE2 }; geometry_handle m_billboardgeometry { 0, 0 }; texture_handle m_glaretexture { -1 }; texture_handle m_suntexture { -1 }; texture_handle m_moontexture { -1 }; + texture_handle m_reflectiontexture { -1 }; float m_drawtime { 1000.0f / 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps double m_updateaccumulator { 0.0 }; @@ -274,9 +299,7 @@ private: float m_speculartranslucentscalefactor { 1.0f }; bool m_framebuffersupport { false }; - rendermode m_texenvmode { rendermode::color }; // last configured texture environment renderpass_config m_renderpass; -// std::stack m_renderpasses; bool m_renderspecular { false }; // controls whether to include specular component in the calculations std::vector m_picksceneryitems; std::vector m_pickcontrolsitems; diff --git a/uilayer.cpp b/uilayer.cpp index 0b1474f9..d3ee278e 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -65,7 +65,7 @@ ui_layer::render() { glMatrixMode(GL_PROJECTION); glLoadIdentity(); - glOrtho( 0.f, Global::ScreenWidth, Global::ScreenHeight, 0.f, -1.f, 1.f ); + glOrtho( 0, Global::ScreenWidth, Global::ScreenHeight, 0, -1, 1 ); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -272,10 +272,10 @@ ui_layer::quad( float4 const &Coordinates, float4 const &Color ) { glBegin( GL_TRIANGLE_STRIP ); - glTexCoord2f( 0.f, 1.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); - glTexCoord2f( 0.f, 0.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); - glTexCoord2f( 1.f, 1.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); - glTexCoord2f( 1.f, 0.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); + glMultiTexCoord2f( m_textureunit, 0.f, 1.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); + glMultiTexCoord2f( m_textureunit, 0.f, 0.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); + glMultiTexCoord2f( m_textureunit, 1.f, 1.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); + glMultiTexCoord2f( m_textureunit, 1.f, 0.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); glEnd(); } diff --git a/uilayer.h b/uilayer.h index b49c0598..40e851a1 100644 --- a/uilayer.h +++ b/uilayer.h @@ -41,6 +41,8 @@ public: // methods: bool init( GLFWwindow *Window ); + void + set_unit( GLint const Textureunit ) { m_textureunit = Textureunit; } // draws requested UI elements void render(); @@ -83,6 +85,7 @@ private: // members: GLFWwindow *m_window { nullptr }; + GLint m_textureunit{ GL_TEXTURE0 }; GLuint m_fontbase { (GLuint)-1 }; // numer DL dla znakw w napisach // progress bar config. TODO: put these together into an object diff --git a/version.h b/version.h index a54feaa0..3a7fa547 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 721 +#define VERSION_MINOR 724 #define VERSION_REVISION 0 From 2f1358422dfb1162ad176094fecfa77c8724891e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 25 Jul 2017 17:42:43 +0200 Subject: [PATCH 143/426] multi texturing support for display list mode --- World.cpp | 2 -- openglgeometrybank.cpp | 30 +++++++++++++++++++++--------- openglgeometrybank.h | 27 +++++++++++++++++++-------- renderer.cpp | 4 ++-- uilayer.cpp | 2 +- 5 files changed, 43 insertions(+), 22 deletions(-) diff --git a/World.cpp b/World.cpp index f11c1e80..e6b5fea7 100644 --- a/World.cpp +++ b/World.cpp @@ -963,8 +963,6 @@ void TWorld::FollowView(bool wycisz) { + Train->GetDirection() * 5.0 * Train->Dynamic()->MoverParameters->ActiveCab; } Train->pMechOffset = Train->pMechSittingPosition; - - Global::SetCameraPosition( Train->Dynamic() ->GetPosition()); // tu ustawić nową, bo od niej liczą się odległości } } else diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index 1c2dec5d..0a046ead 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -98,9 +98,9 @@ geometry_bank::append( vertex_array &Vertices, geometry_handle const &Geometry ) // draws geometry stored in specified chunk void -geometry_bank::draw( geometry_handle const &Geometry, unsigned int const Streams ) { +geometry_bank::draw( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ) { // template method implementation - draw_( Geometry, Streams ); + draw_( Geometry, Units, Streams ); } // frees subclass-specific resources associated with the bank, typically called when the bank wasn't in use for a period of time @@ -148,7 +148,7 @@ opengl_vbogeometrybank::replace_( geometry_handle const &Geometry ) { // draw() subclass details void -opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, unsigned int const Streams ) { +opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ) { if( m_buffer == NULL ) { // if there's no buffer, we'll have to make one @@ -203,7 +203,7 @@ opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, unsigned int con chunkrecord.is_good = true; } if( m_activestreams != Streams ) { - bind_streams( Streams ); + bind_streams( Units, Streams ); } // ...render... ::glDrawArrays( chunk.type, chunkrecord.offset, chunkrecord.size ); @@ -239,7 +239,7 @@ opengl_vbogeometrybank::delete_buffer() { ::glDeleteBuffers( 1, &m_buffer ); if( m_activebuffer == m_buffer ) { m_activebuffer = NULL; - bind_streams( stream::none ); + release_streams(); } m_buffer = NULL; m_buffercapacity = 0; @@ -249,7 +249,7 @@ opengl_vbogeometrybank::delete_buffer() { } void -opengl_vbogeometrybank::bind_streams( unsigned int const Streams ) { +opengl_vbogeometrybank::bind_streams( stream_units const &Units, unsigned int const Streams ) { if( Streams & stream::position ) { ::glVertexPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) ); @@ -274,6 +274,7 @@ opengl_vbogeometrybank::bind_streams( unsigned int const Streams ) { ::glDisableClientState( GL_COLOR_ARRAY ); } if( Streams & stream::texture ) { + ::glClientActiveTexture( Units.texture ); ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); } @@ -284,6 +285,17 @@ opengl_vbogeometrybank::bind_streams( unsigned int const Streams ) { m_activestreams = Streams; } +void +opengl_vbogeometrybank::release_streams() { + + ::glDisableClientState( GL_VERTEX_ARRAY ); + ::glDisableClientState( GL_NORMAL_ARRAY ); + ::glDisableClientState( GL_COLOR_ARRAY ); + ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + + m_activestreams = stream::none; +} + // opengl display list based variant of the geometry bank // create() subclass details @@ -302,7 +314,7 @@ opengl_dlgeometrybank::replace_( geometry_handle const &Geometry ) { // draw() subclass details void -opengl_dlgeometrybank::draw_( geometry_handle const &Geometry, unsigned int const Streams ) { +opengl_dlgeometrybank::draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ) { auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; if( chunkrecord.streams != Streams ) { @@ -319,7 +331,7 @@ opengl_dlgeometrybank::draw_( geometry_handle const &Geometry, unsigned int cons for( auto const &vertex : chunk.vertices ) { if( Streams & stream::normal ) { ::glNormal3fv( glm::value_ptr( vertex.normal ) ); } else if( Streams & stream::color ) { ::glColor3fv( glm::value_ptr( vertex.normal ) ); } - if( Streams & stream::texture ) { ::glTexCoord2fv( glm::value_ptr( vertex.texture ) ); } + if( Streams & stream::texture ) { ::glMultiTexCoord2fv( Units.texture, glm::value_ptr( vertex.texture ) ); } if( Streams & stream::position ) { ::glVertex3fv( glm::value_ptr( vertex.position ) ); } } ::glEnd(); @@ -404,7 +416,7 @@ geometrybank_manager::draw( geometry_handle const &Geometry, unsigned int const auto &bankrecord = bank( Geometry ); bankrecord.second = m_garbagecollector.timestamp(); - bankrecord.first->draw( Geometry, Streams ); + bankrecord.first->draw( Geometry, m_units, Streams ); } // provides direct access to vertex data of specfied chunk diff --git a/openglgeometrybank.h b/openglgeometrybank.h index ca4246a0..736f3d66 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -42,7 +42,12 @@ enum stream { }; unsigned int const basic_streams { stream::position | stream::normal | stream::texture }; -unsigned int const color_streams{ stream::position | stream::color | stream::texture }; +unsigned int const color_streams { stream::position | stream::color | stream::texture }; + +struct stream_units { + + GLint texture { GL_TEXTURE0 }; // unit associated with main texture data stream. TODO: allow multiple units per stream +}; typedef std::vector vertex_array; @@ -98,11 +103,11 @@ public: append( vertex_array &Vertices, geometry_handle const &Geometry ); // draws geometry stored in specified chunk void - draw( geometry_handle const &Geometry, unsigned int const Streams = basic_streams ); + draw( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams = basic_streams ); // draws geometry stored in supplied list of chunks template void - draw( Iterator_ First, Iterator_ Last, unsigned int const Streams = basic_streams ) { while( First != Last ) { draw( *First, Streams ); ++First; } } + draw( Iterator_ First, Iterator_ Last, stream_units const &Units, unsigned int const Streams = basic_streams ) { while( First != Last ) { draw( *First, Units, Streams ); ++First; } } // frees subclass-specific resources associated with the bank, typically called when the bank wasn't in use for a period of time void release(); @@ -145,7 +150,7 @@ private: // replace() subclass details virtual void replace_( geometry_handle const &Geometry ) = 0; // draw() subclass details - virtual void draw_( geometry_handle const &Geometry, unsigned int const Streams ) = 0; + virtual void draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ) = 0; // resource release subclass details virtual void release_() = 0; }; @@ -186,8 +191,8 @@ private: replace_( geometry_handle const &Geometry ); // draw() subclass details void - draw_( geometry_handle const &Geometry, unsigned int const Streams ); - // release () subclass details + draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ); + // release() subclass details void release_(); void @@ -195,7 +200,9 @@ private: void delete_buffer(); void - bind_streams( unsigned int const Streams ); + bind_streams( stream_units const &Units, unsigned int const Streams ); + void + release_streams(); // members: static GLuint m_activebuffer; // buffer bound currently on the opengl end, if any @@ -236,7 +243,7 @@ private: replace_( geometry_handle const &Geometry ); // draw() subclass details void - draw_( geometry_handle const &Geometry, unsigned int const Streams ); + draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ); // release () subclass details void release_(); @@ -282,6 +289,9 @@ public: // provides direct access to vertex data of specfied chunk vertex_array const & vertices( geometry_handle const &Geometry ) const; + // sets target texture unit for the texture data stream + stream_units & + units() { return m_units; } private: // types: @@ -294,6 +304,7 @@ private: // members: geometrybanktimepointpair_sequence m_geometrybanks; garbage_collector m_garbagecollector { m_geometrybanks, 60, 120, "geometry buffer" }; + stream_units m_units; // methods inline diff --git a/renderer.cpp b/renderer.cpp index c3ce5a93..3e59773f 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -71,7 +71,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { glShadeModel( GL_SMOOTH ); // Enable Smooth Shading glActiveTexture( m_diffusetextureunit ); - glClientActiveTexture( m_diffusetextureunit ); + m_geometry.units().texture = m_diffusetextureunit; UILayer.set_unit( m_diffusetextureunit ); glEnable( GL_DEPTH_TEST ); @@ -566,7 +566,7 @@ void opengl_renderer::setup_camera_light_perspective( glm::dmat4 &Viewmatrix ) { m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * m_renderpass.draw_range * 0.5f }; - m_renderpass.camera.position().y = std::max( 75.0, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low + m_renderpass.camera.position().y = std::max( m_renderpass.draw_range * 0.5f * 0.1f, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low Viewmatrix = glm::lookAt( m_renderpass.camera.position(), glm::dvec3{ Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z }, diff --git a/uilayer.cpp b/uilayer.cpp index d3ee278e..d4a574ca 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -65,7 +65,7 @@ ui_layer::render() { glMatrixMode(GL_PROJECTION); glLoadIdentity(); - glOrtho( 0, Global::ScreenWidth, Global::ScreenHeight, 0, -1, 1 ); + glOrtho( 0, std::max( 1, Global::ScreenWidth ), std::max( 1, Global::ScreenHeight ), 0, -1, 1 ); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); From 000603877ca4e75ea677fa040127baa2bb467f9a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 25 Jul 2017 18:34:24 +0200 Subject: [PATCH 144/426] build 170725. cab control sound support tweaks, excluded track nodes from casting shadows --- Gauge.cpp | 19 +++++++++++-------- renderer.cpp | 9 ++++++--- version.h | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/Gauge.cpp b/Gauge.cpp index c2206bb7..4c4da7b2 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -139,8 +139,8 @@ TGauge::Load_mapping( cParser &Input ) { } else if( key.find( "sound" ) == 0 ) { // sounds assigned to specific gauge values, defined by key soundFoo: where Foo = value - auto const indexstart = key.find_first_of( "1234567890" ); - auto const indexend = key.find_first_not_of( "1234567890", indexstart ); + auto const indexstart = key.find_first_of( "-1234567890" ); + auto const indexend = key.find_first_not_of( "-1234567890", indexstart ); if( indexstart != std::string::npos ) { m_soundfxvalues.emplace( std::stoi( key.substr( indexstart, indexend - indexstart ) ), @@ -180,17 +180,20 @@ void TGauge::DecValue(double fNewDesired) void TGauge::UpdateValue( double fNewDesired, PSound Fallbacksound ) { - if( static_cast( std::round( 100.0 * ( fDesiredValue - fOffset ) / fScale ) ) == static_cast( 100.0 * fNewDesired ) ) { + auto const desiredtimes100 = static_cast( 100.0 * fNewDesired ); + if( static_cast( std::round( 100.0 * ( fDesiredValue - fOffset ) / fScale ) ) == desiredtimes100 ) { return; } fDesiredValue = fNewDesired * fScale + fOffset; // if there's any sound associated with new requested value, play it // check value-specific table first... - auto const desiredvalue = static_cast( std::round( fNewDesired ) ); - auto const lookup = m_soundfxvalues.find( desiredvalue ); - if( lookup != m_soundfxvalues.end() ) { - play( lookup->second ); - return; + if( desiredtimes100 % 100 == 0 ) { + // filter out values other than full integers + auto const lookup = m_soundfxvalues.find( desiredtimes100 / 100 ); + if( lookup != m_soundfxvalues.end() ) { + play( lookup->second ); + return; + } } // ...and if there isn't any, fall back on the basic set... auto const currentvalue = GetValue(); diff --git a/renderer.cpp b/renderer.cpp index 3e59773f..a1243a02 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1258,10 +1258,10 @@ opengl_renderer::Render( TGroundNode *Node ) { case TP_TRACK: { // setup - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + return false; + } case rendermode::pickscenery: { // add the node to the pick list m_picksceneryitems.emplace_back( Node ); @@ -1271,6 +1271,9 @@ opengl_renderer::Render( TGroundNode *Node ) { break; } } + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render Render( Node->pTrack ); // post-render cleanup diff --git a/version.h b/version.h index 3a7fa547..122d37e8 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 724 +#define VERSION_MINOR 725 #define VERSION_REVISION 0 From bb58156513e739e54a8c8504eac86ee395c1f0d2 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 27 Jul 2017 18:23:48 +0200 Subject: [PATCH 145/426] shadow visibilty fixes, more strict degenerate triangle detection --- Globals.cpp | 2 +- Model3d.cpp | 4 +- Texture.cpp | 2 - World.cpp | 8 -- renderer.cpp | 239 ++++++++++++++++++++++++++------------------------- renderer.h | 22 +++-- uilayer.cpp | 26 ++++++ uilayer.h | 5 ++ usefull.h | 2 +- version.h | 2 +- 10 files changed, 173 insertions(+), 139 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index 6073b44d..4310ec3a 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -88,7 +88,7 @@ opengl_light Global::DayLight; int Global::DynamicLightCount { 3 }; bool Global::ScaleSpecularValues { true }; bool Global::RenderShadows { false }; -Global::shadowtune_t Global::shadowtune = { 2048, 200.0f, 150.0f, 100.0f }; +Global::shadowtune_t Global::shadowtune = { 2048, 250.f, 1250.f, 100.f }; bool Global::bRollFix = true; // czy wykonać przeliczanie przechyłki bool Global::bJoinEvents = false; // czy grupować eventy o tych samych nazwach int Global::iHiddenEvents = 1; // czy łączyć eventy z torami poprzez nazwę toru diff --git a/Model3d.cpp b/Model3d.cpp index e2168583..36715788 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -428,7 +428,9 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic std::vector sg; sg.resize( facecount ); // maski przynależności trójkątów do powierzchni std::vector wsp; wsp.resize( iNumVerts );// z którego wierzchołka kopiować wektor normalny int maska = 0; + int rawvertexcount = 0; // used to keep track of vertex indices in source file for (int i = 0; i < iNumVerts; ++i) { + ++rawvertexcount; // Ra: z konwersją na układ scenerii - będzie wydajniejsze wyświetlanie wsp[i] = -1; // wektory normalne nie są policzone dla tego wierzchołka if ((i % 3) == 0) { @@ -465,7 +467,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce - WriteLog("Bad model: degenerated triangle ignored in: \"" + pName + "\", vertices " + std::to_string(i) + "-" + std::to_string(i+2)); + WriteLog("Bad model: degenerated triangle ignored in: \"" + pName + "\", vertices " + std::to_string(rawvertexcount-2) + "-" + std::to_string(rawvertexcount)); } if (i > 0) { // jeśli pierwszy trójkąt będzie zdegenerowany, to zostanie usunięty i nie ma co sprawdzać diff --git a/Texture.cpp b/Texture.cpp index 3dfbdcc5..f6147f05 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -609,8 +609,6 @@ opengl_texture::release( bool const Backup ) { if( id == -1 ) { return; } - assert( is_ready ); - if( true == Backup ) { // query texture details needed to perform the backup... ::glBindTexture( GL_TEXTURE_2D, id ); diff --git a/World.cpp b/World.cpp index e6b5fea7..4ed9ac6e 100644 --- a/World.cpp +++ b/World.cpp @@ -32,8 +32,6 @@ http://mozilla.org/MPL/2.0/. #include "uilayer.h" #include "translation.h" -//#define EU07_USE_DEBUG_SHADOWMAP - //--------------------------------------------------------------------------- TDynamicObject *Controlled = NULL; // pojazd, który prowadzimy @@ -634,12 +632,6 @@ void TWorld::OnKeyDown(int cKey) break; } case GLFW_KEY_F8: { -#ifdef EU07_USE_DEBUG_SHADOWMAP - if( Global::iTextMode == cKey ) { ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; } - if( Global::iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { - Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; - } -#endif Global::iTextMode = cKey; break; } diff --git a/renderer.cpp b/renderer.cpp index a1243a02..9fbe6f33 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -62,6 +62,9 @@ opengl_renderer::Init( GLFWwindow *Window ) { m_window = Window; + ::glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); + ::glPixelStorei( GL_PACK_ALIGNMENT, 1 ); + glClearDepth( 1.0f ); glClearColor( 51.0f / 255.0f, 102.0f / 255.0f, 85.0f / 255.0f, 1.0f ); // initial background Color @@ -126,6 +129,16 @@ opengl_renderer::Init( GLFWwindow *Window ) { m_lights.emplace_back( light ); } + // preload some common textures + WriteLog( "Loading common gfx data..." ); + m_glaretexture = Fetch_Texture( "fx\\lightglare" ); + m_suntexture = Fetch_Texture( "fx\\sun" ); + m_moontexture = Fetch_Texture( "fx\\moon" ); + if( m_helpertextureunit >= 0 ) { + m_reflectiontexture = Fetch_Texture( "fx\\reflections" ); + } + WriteLog( "...gfx data pre-loading done" ); + #ifdef EU07_USE_PICKING_FRAMEBUFFER // pick buffer resources if( true == m_framebuffersupport ) { @@ -159,18 +172,6 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now } #endif - - ::glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); - // preload some common textures - WriteLog( "Loading common gfx data..." ); - m_glaretexture = Fetch_Texture( "fx\\lightglare" ); - m_suntexture = Fetch_Texture( "fx\\sun" ); - m_moontexture = Fetch_Texture( "fx\\moon" ); - if( m_helpertextureunit >= 0 ) { - m_reflectiontexture = Fetch_Texture( "fx\\reflections" ); - } - WriteLog( "...gfx data pre-loading done" ); - // shadowmap resources if( ( true == Global::RenderShadows ) && ( true == m_framebuffersupport ) ) { @@ -188,16 +189,27 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL ); ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE ); - // eye_linear is the default, so we could probably skip it - ::glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); - ::glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); - ::glTexGeni( GL_R, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); - ::glTexGeni( GL_Q, GL_TEXTURE_GEN_MODE, GL_EYE_LINEAR ); ::glBindTexture( GL_TEXTURE_2D, 0 ); +#ifdef EU07_USE_DEBUG_SHADOWMAP + ::glGenTextures( 1, &m_shadowdebugtexture ); + ::glBindTexture( GL_TEXTURE_2D, m_shadowdebugtexture ); + // allocate memory + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, m_shadowbuffersize, m_shadowbuffersize, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); + // setup parameters + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + ::glBindTexture( GL_TEXTURE_2D, 0 ); +#endif // create and assemble the framebuffer ::glGenFramebuffersEXT( 1, &m_shadowframebuffer ); ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); +#ifdef EU07_USE_DEBUG_SHADOWMAP + ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_shadowdebugtexture, 0 ); +#else ::glDrawBuffer( GL_NONE ); // we won't be rendering colour data, so can skip the colour attachment +#endif ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_shadowtexture, 0 ); // check if we got it working GLenum status = ::glCheckFramebufferStatusEXT( GL_FRAMEBUFFER_EXT ); @@ -210,7 +222,6 @@ opengl_renderer::Init( GLFWwindow *Window ) { Global::RenderShadows = false; } ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now - ::glDrawBuffer( GL_BACK ); } // prepare basic geometry chunks @@ -258,25 +269,15 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( Global::RenderShadows && World.InitPerformed() ) { // run shadowmap pass before color - ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); - ::glDrawBuffer( GL_NONE ); // we won't be rendering colour data, so can skip the colour attachment - Render_pass( rendermode::shadows ); +#ifdef EU07_USE_DEBUG_SHADOWMAP + UILayer.set_texture( m_shadowdebugtexture ); +#endif m_renderpass.draw_mode = rendermode::color; // restore draw mode. TODO: render mode stack - - ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target - ::glDrawBuffer( GL_BACK ); } - if( ( Global::iTextMode == GLFW_KEY_F8 ) && ( Global::iScreenMode[ GLFW_KEY_F8 - GLFW_KEY_F1 ] == 1 ) ) { - // debug shadowmap - ::glViewport( 0, 0, Global::ScreenHeight, Global::ScreenHeight ); - m_renderpass.draw_range = 1250.f; // 1.0km square centered around camera - } - else { - ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); - m_renderpass.draw_range = 2500.0f; // arbitrary base draw range - } + ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); + m_renderpass.draw_range = 2500.0f; // arbitrary base draw range if( World.InitPerformed() ) { auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); @@ -304,7 +305,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_drawing( true ); Render_Alpha( &World.Ground ); // cab render is performed without shadows, due to low resolution and number of models without windows :| - toggle_units( true, false, false ); + switch_units( true, false, false ); // cab render is done in translucent phase to deal with badly configured vehicles if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } } @@ -316,13 +317,20 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( World.InitPerformed() ) { // setup + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); + ::glViewport( 0, 0, m_shadowbuffersize, m_shadowbuffersize ); - ::glClear( GL_DEPTH_BUFFER_BIT ); +#ifdef EU07_USE_DEBUG_SHADOWMAP + ::glClearColor( 0.f / 255.0f, 0.f / 255.0f, 0.f / 255.f, 1.f ); // initial background Color + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); +#else + ::glClear( GL_DEPTH_BUFFER_BIT ); +#endif ::glScissor( 1, 1, m_shadowbuffersize - 2, m_shadowbuffersize - 2 ); ::glEnable( GL_SCISSOR_TEST ); - m_renderpass.draw_range = 1250.f; // 1.0km square centered around camera + m_renderpass.draw_range = Global::shadowtune.depth; // 1.0km square centered around camera m_shadowtexturematrix = glm::mat4{ 0.5f, 0.0f, 0.0f, 0.0f, @@ -333,27 +341,32 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_camera(); ::glDepthFunc( GL_LEQUAL ); ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting - ::glPolygonOffset( 4.f, 8.f ); + ::glPolygonOffset( 2.f, 4.f ); // render // opaque parts... setup_drawing( false ); +#ifdef EU07_USE_DEBUG_SHADOWMAP + setup_units( true, false, false ); +#else setup_units( false, false, false ); +#endif Render( &World.Ground ); // post-render restore ::glDisable( GL_POLYGON_OFFSET_FILL ); ::glDisable( GL_SCISSOR_TEST ); + + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target } break; } case rendermode::pickcontrols: { - -#ifdef EU07_USE_PICKING_FRAMEBUFFER - ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); -#endif if( World.InitPerformed() ) { // setup - ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); +#ifdef EU07_USE_PICKING_FRAMEBUFFER + ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); +#endif + ::glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); m_pickcontrolsitems.clear(); @@ -367,19 +380,18 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_units( false, false, false ); // cab render skips translucent parts, so we can do it here if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } + // post-render cleanup } - // post-render cleanup break; } case rendermode::pickscenery: { - -#ifdef EU07_USE_PICKING_FRAMEBUFFER - ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); -#endif if( World.InitPerformed() ) { // setup - ::glClearColor( 0.0f, 0.0f, 0.0f, 0.0f ); +#ifdef EU07_USE_PICKING_FRAMEBUFFER + ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); +#endif + ::glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); m_picksceneryitems.clear(); @@ -392,6 +404,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_drawing( false ); setup_units( false, false, false ); Render( &World.Ground ); + // post-render cleanup } break; } @@ -416,17 +429,7 @@ opengl_renderer::setup_projection() { case rendermode::pickscenery: #endif case rendermode::color: { - if( ( Global::iTextMode == GLFW_KEY_F8 ) && ( Global::iScreenMode[ GLFW_KEY_F8 - GLFW_KEY_F1 ] == 1 ) ) { - // debug shadowmap -#ifdef EU07_USE_ORTHO_SHADOWS - setup_projection_light_ortho(); -#else - setup_projection_light_perspective(); -#endif - } - else { - setup_projection_world(); - } + setup_projection_world(); break; } #ifdef EU07_USE_PICKING_FRAMEBUFFER @@ -471,11 +474,11 @@ opengl_renderer::setup_projection_world() { void opengl_renderer::setup_projection_light_ortho() { - + // TODO: calculate lightview boundaries based on area of the world camera frustum ::glOrtho( - -250, 250, - -250, 250, - -2500, 2500 ); + -Global::shadowtune.width, Global::shadowtune.width, + -Global::shadowtune.width, Global::shadowtune.width, + -Global::shadowtune.depth, Global::shadowtune.depth ); } void @@ -484,7 +487,7 @@ opengl_renderer::setup_projection_light_perspective() { ::gluPerspective( 45.f, 1.f, - 100.f, // light source is pulled back far enough we won't likely have anything too close to it, can get some z-range here + m_renderpass.draw_range * 0.1f, // light source is pulled back far enough we won't likely have anything too close to it, can get some z-range here m_renderpass.draw_range * Global::fDistanceFactor ); } @@ -501,16 +504,7 @@ opengl_renderer::setup_camera() { case rendermode::color: case rendermode::pickcontrols: case rendermode::pickscenery: { - if( ( Global::iTextMode == GLFW_KEY_F8 ) && ( Global::iScreenMode[ GLFW_KEY_F8 - GLFW_KEY_F1 ] == 1 ) ) { -#ifdef EU07_USE_ORTHO_SHADOWS - setup_camera_light_ortho( viewmatrix ); -#else - setup_camera_light_perspective( viewmatrix ); -#endif - } - else { - setup_camera_world( viewmatrix ); - } + setup_camera_world( viewmatrix ); break; } case rendermode::shadows: { @@ -544,19 +538,12 @@ opengl_renderer::setup_camera_world( glm::dmat4 &Viewmatrix ) { void opengl_renderer::setup_camera_light_ortho( glm::dmat4 &Viewmatrix ) { -/* - m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * 250.f }; - m_renderpass.camera.position().y = std::max( 75.0, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low - Viewmatrix = glm::lookAt( - m_renderpass.camera.position(), - glm::dvec3{ Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z }, - glm::dvec3{ 0.f, 1.f, 0.f } ); -*/ + m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction }; - if( m_renderpass.camera.position().y - Global::pCameraPosition.y < 0.15 ) { - m_renderpass.camera.position().y = Global::pCameraPosition.y + 0.15; + if( m_renderpass.camera.position().y - Global::pCameraPosition.y < 0.1 ) { + m_renderpass.camera.position().y = Global::pCameraPosition.y + 0.1; } - Viewmatrix = glm::lookAt( + Viewmatrix *= glm::lookAt( m_renderpass.camera.position(), glm::dvec3{ Global::pCameraPosition }, glm::dvec3{ 0.f, 1.f, 0.f } ); @@ -567,9 +554,9 @@ opengl_renderer::setup_camera_light_perspective( glm::dmat4 &Viewmatrix ) { m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * m_renderpass.draw_range * 0.5f }; m_renderpass.camera.position().y = std::max( m_renderpass.draw_range * 0.5f * 0.1f, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low - Viewmatrix = glm::lookAt( + Viewmatrix *= glm::lookAt( m_renderpass.camera.position(), - glm::dvec3{ Global::pCameraPosition.x, 0.0, Global::pCameraPosition.z }, + glm::dvec3{ Global::pCameraPosition }, glm::dvec3{ 0.f, 1.f, 0.f } ); } @@ -607,6 +594,7 @@ opengl_renderer::setup_drawing( bool const Alpha ) { case rendermode::shadows: case rendermode::pickcontrols: case rendermode::pickscenery: { + ::glColor4fv( glm::value_ptr( colors::white ) ); ::glDisable( GL_LIGHTING ); ::glShadeModel( GL_FLAT ); if( Global::iMultisampling ) { @@ -631,7 +619,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { // setup reflection texture unit ::glActiveTexture( m_helpertextureunit ); - ::glBindTexture( GL_TEXTURE_2D, m_reflectiontexture ); // TODO: move to reflection unit setup + Bind( m_reflectiontexture ); // TBD, TODO: move to reflection unit setup ::glEnable( GL_TEXTURE_2D ); /* glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); @@ -648,7 +636,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_CONSTANT ); ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // simply copy alpha from diffuse stage + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // pass the previous stage alpha down the chain ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); } else { @@ -692,7 +680,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE ); ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_COLOR ); - ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // simply copy alpha from diffuse stage + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // pass the previous stage alpha down the chain ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); } else { @@ -737,7 +725,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const // enables and disables specified texture units void -opengl_renderer::toggle_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { +opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { // helper texture unit. if( m_helpertextureunit >= 0 ) { if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { @@ -1098,7 +1086,6 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { // non-interactive scenery elements get neutral colour ::glColor3fv( glm::value_ptr( colors::none ) ); } - case rendermode::shadows: case rendermode::color: { if( Groundcell->nRenderRect != nullptr ) { // nieprzezroczyste trójkąty kwadratu kilometrowego @@ -1108,6 +1095,17 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { } break; } + case rendermode::shadows: { + if( Groundcell->nRenderRect != nullptr ) { + // experimental, for shadows render both back and front faces, to supply back faces of the 'forest strips' + ::glDisable( GL_CULL_FACE ); + // nieprzezroczyste trójkąty kwadratu kilometrowego + for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { + Render( node ); + } + ::glEnable( GL_CULL_FACE ); + } + } case rendermode::pickcontrols: default: { break; @@ -1240,7 +1238,7 @@ opengl_renderer::Render( TGroundNode *Node ) { double distancesquared; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { - // 'camera' for the light pass is the light source, but we need distance from actual camera + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); break; } @@ -1304,6 +1302,7 @@ opengl_renderer::Render( TGroundNode *Node ) { Render( Node->Model->pModel, Node->Model->Material(), + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees SquareMagnitude( Node->pCenter - Global::pCameraPosition ), Node->pCenter - m_renderpass.camera.position(), Node->Model->vAngle ); @@ -2032,7 +2031,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { double distancesquared; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { - // 'camera' for the light pass is the light source, but we need distance from actual camera + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); break; } @@ -2104,6 +2103,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { Render_Alpha( Node->Model->pModel, Node->Model->Material(), + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees SquareMagnitude( Node->pCenter - Global::pCameraPosition ), Node->pCenter - m_renderpass.camera.position(), Node->Model->vAngle ); @@ -2502,15 +2502,8 @@ opengl_renderer::Update_Pick_Control() { #ifdef EU07_USE_PICKING_FRAMEBUFFER if( true == m_framebuffersupport ) { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_pickframebuffer ); - ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); } - else { - ::glReadBuffer( GL_BACK ); - } -#else - ::glReadBuffer( GL_BACK ); #endif - Render_pass( rendermode::pickcontrols ); // determine point to examine glm::dvec2 mousepos; @@ -2518,13 +2511,22 @@ opengl_renderer::Update_Pick_Control() { mousepos.y = Global::ScreenHeight - mousepos.y; // cursor coordinates are flipped compared to opengl #ifdef EU07_USE_PICKING_FRAMEBUFFER - glm::ivec2 pickbufferpos { - mousepos.x * m_pickbuffersize / Global::ScreenWidth, - mousepos.y * m_pickbuffersize / Global::ScreenHeight }; + glm::ivec2 pickbufferpos; + if( true == m_framebuffersupport ) { +// ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); + pickbufferpos = glm::ivec2{ + mousepos.x * m_pickbuffersize / Global::ScreenWidth, + mousepos.y * m_pickbuffersize / Global::ScreenHeight + }; + } + else { +// ::glReadBuffer( GL_BACK ); + pickbufferpos = glm::ivec2{ mousepos }; + } #else +// ::glReadBuffer( GL_BACK ); glm::ivec2 pickbufferpos{ mousepos }; #endif - unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); auto const controlindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); @@ -2548,15 +2550,8 @@ opengl_renderer::Update_Pick_Node() { #ifdef EU07_USE_PICKING_FRAMEBUFFER if( true == m_framebuffersupport ) { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_pickframebuffer ); - ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); } - else { - ::glReadBuffer( GL_BACK ); - } -#else - ::glReadBuffer( GL_BACK ); #endif - Render_pass( rendermode::pickscenery ); // determine point to examine glm::dvec2 mousepos; @@ -2564,13 +2559,23 @@ opengl_renderer::Update_Pick_Node() { mousepos.y = Global::ScreenHeight - mousepos.y; // cursor coordinates are flipped compared to opengl #ifdef EU07_USE_PICKING_FRAMEBUFFER - glm::ivec2 pickbufferpos { - mousepos.x * m_pickbuffersize / Global::ScreenWidth, - mousepos.y * m_pickbuffersize / Global::ScreenHeight }; + glm::ivec2 pickbufferpos; + if( true == m_framebuffersupport ) { +// ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); + pickbufferpos = glm::ivec2{ + mousepos.x * m_pickbuffersize / Global::ScreenWidth, + mousepos.y * m_pickbuffersize / Global::ScreenHeight + }; + } + else { +// ::glReadBuffer( GL_BACK ); + pickbufferpos = glm::ivec2{ mousepos }; + } #else +// ::glReadBuffer( GL_BACK ); glm::ivec2 pickbufferpos{ mousepos }; #endif - + unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); auto const nodeindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); @@ -2663,7 +2668,7 @@ opengl_renderer::Update( double const Deltatime ) { }; // debug performance string -std::string +std::string const & opengl_renderer::Info() const { return m_debuginfo; diff --git a/renderer.h b/renderer.h index 8aab1794..05b5c6bc 100644 --- a/renderer.h +++ b/renderer.h @@ -18,6 +18,9 @@ http://mozilla.org/MPL/2.0/. #include "world.h" #include "memcell.h" +#define EU07_USE_PICKING_FRAMEBUFFER +//#define EU07_USE_DEBUG_SHADOWMAP + struct opengl_light { GLuint id{ (GLuint)-1 }; @@ -159,7 +162,7 @@ public: TGroundNode const * Update_Pick_Node(); // debug performance string - std::string + std::string const & Info() const; // members @@ -180,7 +183,7 @@ private: struct renderpass_config { opengl_camera camera; - rendermode draw_mode { rendermode::color }; + rendermode draw_mode { rendermode::none }; float draw_range { 0.0f }; std::vector draw_queue; // list of subcells to be drawn in current render pass }; @@ -218,7 +221,7 @@ private: void setup_shadow_color( glm::vec4 const &Shadowcolor ); void - toggle_units( bool const Diffuse, bool const Shadows, bool const Reflections ); + switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ); bool Render( world_environment *Environment ); bool @@ -269,13 +272,16 @@ private: opengllight_array m_lights; GLFWwindow *m_window { nullptr }; #ifdef EU07_USE_PICKING_FRAMEBUFFER - GLuint m_pickframebuffer { 0 }; // TODO: refactor pick framebuffer stuff into an object - GLuint m_picktexture { 0 }; - GLuint m_pickdepthbuffer { 0 }; + GLuint m_pickframebuffer { NULL }; // TODO: refactor pick framebuffer stuff into an object + GLuint m_picktexture { NULL }; + GLuint m_pickdepthbuffer { NULL }; int m_pickbuffersize { 1024 }; // size of (square) textures bound with the pick framebuffer #endif - GLuint m_shadowframebuffer { 0 }; - GLuint m_shadowtexture { 0 }; + GLuint m_shadowframebuffer { NULL }; + GLuint m_shadowtexture { NULL }; +#ifdef EU07_USE_DEBUG_SHADOWMAP + GLuint m_shadowdebugtexture{ NULL }; +#endif int m_shadowbuffersize { 4096 }; glm::mat4 m_shadowtexturematrix; glm::vec4 m_shadowcolor{ 0.5f, 0.5f, 0.5f, 1.f }; diff --git a/uilayer.cpp b/uilayer.cpp index d4a574ca..67ca6c60 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -78,6 +78,7 @@ ui_layer::render() { // render code here render_background(); + render_texture(); render_progress(); render_panels(); render_tooltip(); @@ -235,6 +236,31 @@ ui_layer::render_background() { float4( 1.0f, 1.0f, 1.0f, 1.0f ) ); } +void +ui_layer::render_texture() { + + if( m_texture != NULL ) { + ::glColor4f( 1.f, 1.f, 1.f, 1.f ); + ::glDisable( GL_BLEND ); + + GfxRenderer.Bind( NULL ); + ::glBindTexture( GL_TEXTURE_2D, m_texture ); + + auto const size = 512.f; + + glBegin( GL_TRIANGLE_STRIP ); + + glMultiTexCoord2f( m_textureunit, 0.f, 1.f ); glVertex2f( 0.f, 256.f ); + glMultiTexCoord2f( m_textureunit, 0.f, 0.f ); glVertex2f( 0.f, 256.f + size ); + glMultiTexCoord2f( m_textureunit, 1.f, 1.f ); glVertex2f( size, 256.f ); + glMultiTexCoord2f( m_textureunit, 1.f, 0.f ); glVertex2f( size, 256.f + size ); + + glEnd(); + + ::glEnable( GL_BLEND ); + } +} + void ui_layer::print( std::string const &Text ) { diff --git a/uilayer.h b/uilayer.h index 40e851a1..8b3f31bb 100644 --- a/uilayer.h +++ b/uilayer.h @@ -54,6 +54,8 @@ public: // sets the ui background texture, if any void set_background( std::string const &Filename = "" ); + void + set_texture( GLuint Texture = NULL ) { m_texture = Texture; } void set_tooltip( std::string const &Tooltip ) { m_tooltip = Tooltip; } void @@ -68,6 +70,8 @@ private: // draws background quad with specified earlier texture void render_background(); + void + render_texture(); // draws a progress bar in defined earlier state void render_progress(); @@ -95,6 +99,7 @@ private: bool m_progressbottom { false }; // location of the progress bar texture_handle m_background { NULL }; // path to texture used as the background. size depends on mAspect. + GLuint m_texture { NULL }; std::vector > m_panels; std::string m_tooltip; }; diff --git a/usefull.h b/usefull.h index 6474da98..91c27795 100644 --- a/usefull.h +++ b/usefull.h @@ -77,7 +77,7 @@ bool degenerate( VecType_ const &Vertex1, VecType_ const &Vertex2, VecType_ const &Vertex3 ) { // degenerate( A, B, C, minarea ) = ( ( B - A ).cross( C - A ) ).lengthSquared() < ( 4.0f * minarea * minarea ); - return glm::length2( glm::cross( Vertex2 - Vertex1, Vertex3 - Vertex1 ) ) < std::numeric_limits::epsilon(); + return ( glm::length2( glm::cross( Vertex2 - Vertex1, Vertex3 - Vertex1 ) ) == 0.0 ); } //--------------------------------------------------------------------------- diff --git a/version.h b/version.h index 122d37e8..5060e104 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 725 +#define VERSION_MINOR 727 #define VERSION_REVISION 0 From 9b4dc83a2d5650c02e1017836d9f01315da81328 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 27 Jul 2017 18:24:58 +0200 Subject: [PATCH 146/426] pantograph switch functionality swapped for the rear cab --- Gauge.cpp | 2 +- Train.cpp | 393 ++++++++++++++++++++++++++++++++++++------------------ Train.h | 2 + 3 files changed, 264 insertions(+), 133 deletions(-) diff --git a/Gauge.cpp b/Gauge.cpp index 4c4da7b2..c52de766 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -180,7 +180,7 @@ void TGauge::DecValue(double fNewDesired) void TGauge::UpdateValue( double fNewDesired, PSound Fallbacksound ) { - auto const desiredtimes100 = static_cast( 100.0 * fNewDesired ); + auto const desiredtimes100 = static_cast( std::round( 100.0 * fNewDesired ) ); if( static_cast( std::round( 100.0 * ( fDesiredValue - fOffset ) / fScale ) ) == desiredtimes100 ) { return; } diff --git a/Train.cpp b/Train.cpp index 46dbb7b9..066e98e1 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1361,6 +1361,14 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const &Command ) { + return ( + Train->mvControlled->ActiveCab < 0 ? + pantographtogglerear( Train, Command ) : + pantographtogglefront( Train, Command ) ); +} + +void TTrain::pantographtogglefront( TTrain *Train, command_data const &Command ) { + if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->PantFrontUp ) { @@ -1368,60 +1376,99 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const Train->mvControlled->PantFrontSP = false; if( Train->mvControlled->PantFront( true ) ) { if( Train->mvControlled->PantFrontStart != 1 ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - Train->play_sound( Train->dsbSwitch ); -#endif // visual feedback - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->mvControlled->ActiveCab < 0 ) { + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + else { + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + } } } } else { // ...or turn off if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) - && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; + if( Train->mvControlled->ActiveCab < 0 ) { + if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; + } + } + else { + if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; + } } } Train->mvControlled->PantFrontSP = false; if( false == Train->mvControlled->PantFront( false ) ) { if( Train->mvControlled->PantFrontStart != 0 ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - Train->play_sound( Train->dsbSwitch ); -#endif // visual feedback - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Train->mvControlled->ActiveCab < 0 ) { + // in rear cab switch functions are swapped + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // in front cab switches map normally + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + } } } } @@ -1429,29 +1476,37 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position if( Train->mvOccupied->PantSwitchType == "impulse" ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->ggPantFrontButton.GetValue() > 0.35 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // also the switch off button, in cabs which have it -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->ggPantFrontButtonOff.GetValue() > 0.35 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - if( Train->ggPantSelectedDownButton.SubModel ) { + if( Train->mvControlled->ActiveCab < 0 ) { + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // also the switch off button, in cabs which have it + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantSelectedDownButton.SubModel ) { + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + } + else { + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // also the switch off button, in cabs which have it + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantSelectedDownButton.SubModel ) { + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + } } } } @@ -1459,6 +1514,14 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const &Command ) { + return ( + Train->mvControlled->ActiveCab < 0 ? + pantographtogglefront( Train, Command ) : + pantographtogglerear( Train, Command ) ); +} + +void TTrain::pantographtogglerear( TTrain *Train, command_data const &Command ) { + if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->PantRearUp ) { @@ -1466,60 +1529,100 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & Train->mvControlled->PantRearSP = false; if( Train->mvControlled->PantRear( true ) ) { if( Train->mvControlled->PantRearStart != 1 ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - Train->play_sound( Train->dsbSwitch ); -#endif // visual feedback - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->mvControlled->ActiveCab < 0 ) { + // in rear cab switch functions are swapped + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + else { + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + } } } } else { // ...or turn off if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) - && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; + if( Train->mvControlled->ActiveCab < 0 ) { + // in rear cab switch functions are swapped + if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; + } + } + else { + if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; + } } } Train->mvControlled->PantRearSP = false; if( false == Train->mvControlled->PantRear( false ) ) { if( Train->mvControlled->PantRearStart != 0 ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - Train->play_sound( Train->dsbSwitch ); -#endif // visual feedback - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Train->mvControlled->ActiveCab < 0 ) { + // in rear cab switch functions are swapped + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + } } } } @@ -1527,29 +1630,38 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position if( Train->mvOccupied->PantSwitchType == "impulse" ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->ggPantRearButton.GetValue() > 0.35 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // also the switch off button, in cabs which have it -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->ggPantRearButtonOff.GetValue() > 0.35 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - if( Train->ggPantSelectedDownButton.SubModel ) { + if( Train->mvControlled->ActiveCab < 0 ) { + // in rear cab switch functions are swapped + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // also the switch off button, in cabs which have it + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantSelectedDownButton.SubModel ) { + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + } + else { + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // also the switch off button, in cabs which have it + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantSelectedDownButton.SubModel ) { + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + } } } } @@ -6329,12 +6441,21 @@ bool TTrain::Update( double const Deltatime ) || ( mvControlled->ConverterFlag ) ) { if( ggPantAllDownButton.GetValue() == 0.0 ) { // the 'lower all' button overrides state of switches, while active itself + // when in rear cab we treat switches as reversed, i.e. front controls physical rear + auto const frontpantographswitch = ( + mvControlled->ActiveCab < 0 ? + ggPantRearButton.GetValue() >= 1.0 : + ggPantFrontButton.GetValue() >= 1.0 ); + auto const rearpantographswitch = ( + mvControlled->ActiveCab < 0 ? + ggPantFrontButton.GetValue() >= 1.0 : + ggPantRearButton.GetValue() >= 1.0 ); if( ( false == mvControlled->PantFrontUp ) - && ( ggPantFrontButton.GetValue() >= 1.0 ) ) { + && ( frontpantographswitch ) ) { mvControlled->PantFront( true ); } if( ( false == mvControlled->PantRearUp ) - && ( ggPantRearButton.GetValue() >= 1.0 ) ) { + && ( rearpantographswitch ) ) { mvControlled->PantRear( true ); } } @@ -7205,42 +7326,50 @@ void TTrain::set_cab_controls() { } // pantographs if( mvOccupied->PantSwitchType != "impulse" ) { + auto const pantograph = ( + mvControlled->ActiveCab < 0 ? + mvControlled->PantRearUp : + mvControlled->PantFrontUp ); ggPantFrontButton.PutValue( - ( mvControlled->PantFrontUp ? + ( pantograph ? 1.0 : 0.0 ) ); ggPantFrontButtonOff.PutValue( - ( mvControlled->PantFrontUp ? + ( pantograph ? 0.0 : 1.0 ) ); // NOTE: currently we animate the selectable pantograph control for both pantographs // TODO: implement actual selection control, and refactor handling this control setup in a separate method ggPantSelectedButton.PutValue( - ( mvControlled->PantFrontUp ? + ( pantograph ? 1.0 : 0.0 ) ); ggPantSelectedDownButton.PutValue( - ( mvControlled->PantFrontUp ? + ( pantograph ? 0.0 : 1.0 ) ); } if( mvOccupied->PantSwitchType != "impulse" ) { + auto const pantograph = ( + mvControlled->ActiveCab < 0 ? + mvControlled->PantFrontUp : + mvControlled->PantRearUp ); ggPantRearButton.PutValue( - ( mvControlled->PantRearUp ? + ( pantograph ? 1.0 : 0.0 ) ); ggPantRearButtonOff.PutValue( - ( mvControlled->PantRearUp ? + ( pantograph ? 0.0 : 1.0 ) ); // NOTE: currently we animate the selectable pantograph control for both pantographs // TODO: implement actual selection control, and refactor handling this control setup in a separate method ggPantSelectedButton.PutValue( - ( mvControlled->PantRearUp ? + ( pantograph ? 1.0 : 0.0 ) ); ggPantSelectedDownButton.PutValue( - ( mvControlled->PantRearUp ? + ( pantograph ? 0.0 : 1.0 ) ); } diff --git a/Train.h b/Train.h index c9c9e6d2..5331386f 100644 --- a/Train.h +++ b/Train.h @@ -155,7 +155,9 @@ class TTrain static void OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_data const &Command ); static void OnCommand_pantographcompressoractivate( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglefront( TTrain *Train, command_data const &Command ); + static void pantographtogglefront( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglerear( TTrain *Train, command_data const &Command ); + static void pantographtogglerear( TTrain *Train, command_data const &Command ); static void OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); From 3a26ccb2fdd00b7657b2174a64bea35deb4b96bf Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 28 Jul 2017 20:28:08 +0200 Subject: [PATCH 147/426] reverted pantograph control changes, removed some of the type conversion warnings --- Camera.cpp | 32 +--- Camera.h | 1 - Driver.cpp | 6 +- DynObj.cpp | 126 +++++++--------- Float3d.h | 34 ++--- Ground.cpp | 18 +-- McZapkie/MOVER.h | 12 +- McZapkie/Mover.cpp | 6 +- Model3d.cpp | 26 ++-- Train.cpp | 357 ++++++++++++--------------------------------- Train.h | 2 - moon.cpp | 6 +- sun.cpp | 6 +- translation.h | 8 +- uilayer.h | 4 +- 15 files changed, 211 insertions(+), 433 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index 2c59684f..6d3a3adb 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -379,35 +379,9 @@ void TCamera::Update() } } -vector3 TCamera::GetDirection() -{ - matrix4x4 mat; - vector3 Vec; - Vec = vector3(0, 0, 1); - Vec.RotateY(Yaw); +vector3 TCamera::GetDirection() { - return (Normalize(Vec)); -} - -bool TCamera::SetMatrix() -{ - glRotated( -Roll * 180.0 / M_PI, 0.0, 0.0, 1.0 ); // po wyłączeniu tego kręci się pojazd, a sceneria nie - glRotated( -Pitch * 180.0 / M_PI, 1.0, 0.0, 0.0 ); - glRotated( -Yaw * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // w zewnętrznym widoku: kierunek patrzenia - - if( Type == tp_Follow ) - { - gluLookAt( - Pos.x, Pos.y, Pos.z, - LookAt.x, LookAt.y, LookAt.z, - vUp.x, vUp.y, vUp.z); // Ra: pOffset is zero - } - else { - glTranslated( -Pos.x, -Pos.y, -Pos.z ); // nie zmienia kierunku patrzenia - } - - Global::SetCameraPosition(Pos); // było +pOffset - return true; + return glm::normalize( glm::rotateY( glm::vec3{ 0.f, 0.f, 1.f }, Yaw ) ); } bool TCamera::SetMatrix( glm::dmat4 &Matrix ) { @@ -427,7 +401,6 @@ bool TCamera::SetMatrix( glm::dmat4 &Matrix ) { Matrix = glm::translate( Matrix, glm::dvec3{ -Pos } ); // nie zmienia kierunku patrzenia } - Global::SetCameraPosition( Pos ); // było +pOffset return true; } @@ -446,4 +419,3 @@ void TCamera::Stop() Type = tp_Follow; Velocity = vector3(0, 0, 0); }; - diff --git a/Camera.h b/Camera.h index f978047f..a6346f52 100644 --- a/Camera.h +++ b/Camera.h @@ -57,7 +57,6 @@ class TCamera void OnCommand( command_data const &Command ); void Update(); vector3 GetDirection(); - bool SetMatrix(); bool SetMatrix(glm::dmat4 &Matrix); void RaLook(); void Stop(); diff --git a/Driver.cpp b/Driver.cpp index 98709cc7..48aa14c4 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -507,7 +507,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) fCurrentDistance = lastspeedpoint.fDist; // nie doliczac dlugosci gdy: miniety początek lub jazda do konca toru fTrackLength = ( - ( lastspeedpoint.iFlags & ( spElapsed | spEnd ) != 0 ) ? + ( ( lastspeedpoint.iFlags & ( spElapsed | spEnd ) ) != 0 ) ? 0.0 : pTrack->Length() ); } @@ -1331,7 +1331,7 @@ void TController::TablePurger() for( std::size_t idx = 0; idx < sSpeedTable.size() - 1; ++idx ) { auto const &speedpoint = sSpeedTable[ idx ]; if( ( 0 == ( speedpoint.iFlags & spEnabled ) ) - || ( ( speedpoint.iFlags & ( spElapsed | spTrack | spCurve | spSwitch ) == ( spElapsed | spTrack | spCurve ) ) + || ( ( ( speedpoint.iFlags & ( spElapsed | spTrack | spCurve | spSwitch ) ) == ( spElapsed | spTrack | spCurve ) ) && ( speedpoint.fVelNext < 0.0 ) ) ) { // NOTE: we could break out early here, but running through entire thing gives us exact size needed for new table ++trimcount; @@ -1353,7 +1353,7 @@ void TController::TablePurger() } auto const &speedpoint = sSpeedTable[ idx ]; if( ( 0 == ( speedpoint.iFlags & spEnabled ) ) - || ( ( speedpoint.iFlags & ( spElapsed | spTrack | spCurve | spSwitch ) == ( spElapsed | spTrack | spCurve ) ) + || ( ( ( speedpoint.iFlags & ( spElapsed | spTrack | spCurve | spSwitch ) ) == ( spElapsed | spTrack | spCurve ) ) && ( speedpoint.fVelNext < 0.0 ) ) ) { // if the trimmed point happens to be currently active semaphor we need to invalidate their placements if( idx == SemNextIndex ) { diff --git a/DynObj.cpp b/DynObj.cpp index 2a5c9254..0f670004 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -185,9 +185,10 @@ float TDynamicObject::GetEPP() // od strony sprzegu (coupler_nr) obiektu (start) TDynamicObject *temp = this; int coupler_nr = 0; - float eq = 0, am = 0; + double eq = 0.0; + double am = 0.0; - for (int i = 0; i < 300; i++) // ograniczenie do 300 na wypadek zapętlenia składu + for (int i = 0; i < 300; ++i) // ograniczenie do 300 na wypadek zapętlenia składu { if (!temp) break; // Ra: zabezpieczenie przed ewentaulnymi błędami sprzęgów @@ -2732,26 +2733,20 @@ bool TDynamicObject::Update(double dt, double dt1) if (Mechanik) { // Ra 2F3F: do Driver.cpp to przenieść? MoverParameters->EqvtPipePress = GetEPP(); // srednie cisnienie w PG - if ((Mechanik->Primary()) && - (MoverParameters->EngineType == ElectricInductionMotor)) // jesli glowny i z - // asynchronami, to - // niech steruje - { // hamulcem lacznie dla calego pociagu/ezt - bool kier = (DirectionGet() * MoverParameters->ActiveCab > 0); - float FED = 0; - int np = 0; - float masa = 0; - float FrED = 0; - float masamax = 0; - float FmaxPN = 0; - float FfulED = 0; - float FmaxED = 0; - float Fzad = 0; - float FzadED = 0; - float FzadPN = 0; - float Frj = 0; - float amax = 0; - float osie = 0; + if( ( Mechanik->Primary() ) + && ( MoverParameters->EngineType == ElectricInductionMotor ) ) { + // jesli glowny i z asynchronami, to niech steruje hamulcem lacznie dla calego pociagu/ezt + auto const kier = (DirectionGet() * MoverParameters->ActiveCab > 0); + auto FED { 0.0 }; + auto np { 0 }; + auto masa { 0.0 }; + auto FrED { 0.0 }; + auto masamax { 0.0 }; + auto FmaxPN { 0.0 }; + auto FfulED { 0.0 }; + auto FmaxED { 0.0 }; + auto Frj { 0.0 }; + auto osie { 0 }; // 1. ustal wymagana sile hamowania calego pociagu // - opoznienie moze byc ustalane na podstawie charakterystyki // - opoznienie moze byc ustalane na podstawie mas i cisnien granicznych @@ -2762,11 +2757,14 @@ bool TDynamicObject::Update(double dt, double dt1) for (TDynamicObject *p = GetFirstDynamic(MoverParameters->ActiveCab < 0 ? 1 : 0, 4); p; (kier ? p = p->NextC(4) : p = p->PrevC(4))) { - np++; - masamax += p->MoverParameters->MBPM + - (p->MoverParameters->MBPM > 1 ? 0 : p->MoverParameters->Mass) + - p->MoverParameters->Mred; - float Nmax = ((p->MoverParameters->P2FTrans * p->MoverParameters->MaxBrakePress[0] - + ++np; + masamax += + p->MoverParameters->MBPM + + ( p->MoverParameters->MBPM > 1.0 ? + 0.0 : + p->MoverParameters->Mass ) + + p->MoverParameters->Mred; + auto const Nmax = ((p->MoverParameters->P2FTrans * p->MoverParameters->MaxBrakePress[0] - p->MoverParameters->BrakeCylSpring) * p->MoverParameters->BrakeCylMult[0] - p->MoverParameters->BrakeSlckAdj) * @@ -2780,18 +2778,19 @@ bool TDynamicObject::Update(double dt, double dt1) 0) ? p->MoverParameters->eimc[eimc_p_Fh] * 1000 : 0); // chwilowy max ED -> do rozdzialu sil - FED -= Min0R(p->MoverParameters->eimv[eimv_Fmax], 0) * + FED -= std::min(p->MoverParameters->eimv[eimv_Fmax], 0.0) * 1000; // chwilowy max ED -> do rozdzialu sil - FfulED = Min0R(p->MoverParameters->eimv[eimv_Fful], 0) * + FfulED = std::min(p->MoverParameters->eimv[eimv_Fful], 0.0) * 1000; // chwilowy max ED -> do rozdzialu sil - FrED -= Min0R(p->MoverParameters->eimv[eimv_Fr], 0) * + FrED -= std::min(p->MoverParameters->eimv[eimv_Fr], 0.0) * 1000; // chwilowo realizowane ED -> do pneumatyki - Frj += Max0R(p->MoverParameters->eimv[eimv_Fr], 0) * + Frj += std::max(p->MoverParameters->eimv[eimv_Fr], 0.0) * 1000;// chwilowo realizowany napęd -> do utrzymującego masa += p->MoverParameters->TotalMass; osie += p->MoverParameters->NAxles; } - amax = FmaxPN / masamax; + + auto const amax = FmaxPN / masamax; if ((MoverParameters->Vel < 0.5) && (MoverParameters->BrakePress > 0.2) || (dDoorMoveL > 0.001) || (dDoorMoveR > 0.001)) { @@ -2808,24 +2807,28 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->ShuntModeAllow = (MoverParameters->BrakePress > 0.2) && (MoverParameters->LocalBrakeRatio() < 0.01); } - Fzad = amax * MoverParameters->LocalBrakeRatio() * masa; + auto Fzad = amax * MoverParameters->LocalBrakeRatio() * masa; if ((MoverParameters->ScndS) && (MoverParameters->Vel > MoverParameters->eimc[eimc_p_Vh1]) && (FmaxED > 0)) { - Fzad = Min0R(MoverParameters->LocalBrakeRatio() * FmaxED, FfulED); + Fzad = std::min(MoverParameters->LocalBrakeRatio() * FmaxED, FfulED); } if (((MoverParameters->ShuntMode) && (Frj < 0.0015 * masa)) || (MoverParameters->V * MoverParameters->DirAbsolute < -0.2)) { - Fzad = Max0R(MoverParameters->StopBrakeDecc * masa, Fzad); + Fzad = std::max(MoverParameters->StopBrakeDecc * masa, Fzad); } - if (MoverParameters->BrakeHandle == MHZ_EN57?MoverParameters->BrakeOpModeFlag & bom_MED:MoverParameters->EpFuse) - FzadED = Min0R(Fzad, FmaxED); - else - FzadED = 0; - FzadPN = Fzad - FrED; + auto FzadED { 0.0 }; + if( ( MoverParameters->EpFuse ) + || ( ( MoverParameters->BrakeHandle == MHZ_EN57 ) + && ( MoverParameters->BrakeOpModeFlag & bom_MED ) ) ) { + FzadED = std::min( Fzad, FmaxED ); + } + auto const FzadPN = Fzad - FrED; //np = 0; + // BUG: likely memory leak, allocation per inner loop, deleted only once outside + // TODO: sort this shit out bool* PrzekrF = new bool[np]; float nPrzekrF = 0; bool test = true; @@ -2849,7 +2852,7 @@ bool TDynamicObject::Update(double dt, double dt1) for (TDynamicObject *p = GetFirstDynamic(MoverParameters->ActiveCab < 0 ? 1 : 0, 4); p; p = (kier == true ? p->NextC(4) : p->PrevC(4)) ) { - float Nmax = ((p->MoverParameters->P2FTrans * p->MoverParameters->MaxBrakePress[0] - + auto const Nmax = ((p->MoverParameters->P2FTrans * p->MoverParameters->MaxBrakePress[0] - p->MoverParameters->BrakeCylSpring) * p->MoverParameters->BrakeCylMult[0] - p->MoverParameters->BrakeSlckAdj) * @@ -2864,8 +2867,8 @@ bool TDynamicObject::Update(double dt, double dt1) FzED[i] = (FmaxED > 0 ? FzadED / FmaxED : 0); p->MoverParameters->AnPos = (MoverParameters->ScndS ? MoverParameters->LocalBrakeRatio() : FzED[i]); - FzEP[i] = FzadPN * p->MoverParameters->NAxles / osie; - i++; + FzEP[ i ] = static_cast( FzadPN * p->MoverParameters->NAxles ) / static_cast( osie ); + ++i; p->MoverParameters->ShuntMode = MoverParameters->ShuntMode; p->MoverParameters->ShuntModeAllow = MoverParameters->ShuntModeAllow; } @@ -2896,7 +2899,7 @@ bool TDynamicObject::Update(double dt, double dt1) FzEP[i] = 0; przek += przek1; } - i++; + ++i; } i = 0; przek = przek / (np - nPrzekrF); @@ -2907,7 +2910,7 @@ bool TDynamicObject::Update(double dt, double dt1) { FzEP[i] += przek; } - i++; + ++i; } } i = 0; @@ -2938,31 +2941,8 @@ bool TDynamicObject::Update(double dt, double dt1) p->MoverParameters->LocalBrakePosA = p->MoverParameters->LocalBrakePosA; else p->MoverParameters->LocalBrakePosA = 0; - i++; + ++i; } - /* ////ALGORYTM 1 - KAZDEMU PO ROWNO - for (TDynamicObject *p = GetFirstDynamic(MoverParameters->ActiveCab < 0 ? 1 : 0); p; - (iDirection > 0 ? p = p->NextC(4) : p = p->PrevC(4))) - { - - float Nmax = ((p->MoverParameters->P2FTrans * p->MoverParameters->MaxBrakePress[0] - - p->MoverParameters->BrakeCylSpring) * - p->MoverParameters->BrakeCylMult[0] - - p->MoverParameters->BrakeSlckAdj) * - p->MoverParameters->BrakeCylNo * p->MoverParameters->BrakeRigEff; - float FmaxPoj = Nmax * - p->MoverParameters->Hamulec->GetFC( - Nmax / (p->MoverParameters->NAxles * p->MoverParameters->NBpA), - p->MoverParameters->Vel) * - 1000; // sila hamowania pn - // Fpoj=(FED>0?-FzadED*p->MoverParameters->eimv[eimv_Fmax]*1000/FED:0); - // p->MoverParameters->AnPos=(p->MoverParameters->eimc[eimc_p_Fh]>1?0.001f*Fpoj/(p->MoverParameters->eimc[eimc_p_Fh]):0); - p->MoverParameters->AnPos = (FmaxED > 0 ? FzadED / FmaxED : 0); - // Fpoj = FzadPN * Min0R(p->MoverParameters->TotalMass / masa, 1); - // p->MoverParameters->LocalBrakePosA = - // (p->MoverParameters->SlippingWheels ? 0 : Min0R(Max0R(Fpoj / FmaxPoj, 0), 1)); - p->MoverParameters->LocalBrakePosA = (p->MoverParameters->SlippingWheels ? 0 : FzadPN / FmaxPN); - } */ MED[0][0] = masa*0.001; MED[0][1] = amax; @@ -2979,14 +2959,6 @@ bool TDynamicObject::Update(double dt, double dt1) delete[] FmaxEP; } - // yB: cos (AI) tu jest nie kompatybilne z czyms (hamulce) - // if (Controller!=Humandriver) - // if (Mechanik->LastReactionTime>0.5) - // { - // MoverParameters->BrakeCtrlPos=0; - // Mechanik->LastReactionTime=0; - // } - Mechanik->UpdateSituation(dt1); // przebłyski świadomości AI } diff --git a/Float3d.h b/Float3d.h index f7217a11..6afdaef3 100644 --- a/Float3d.h +++ b/Float3d.h @@ -241,7 +241,7 @@ public: e[i + 2] = f; // zamiana Y i Z } }; - inline float4x4 &Rotation(double angle, float3 axis); + inline float4x4 &Rotation(float const angle, float3 const &axis); inline bool IdentityIs() { // sprawdzenie jednostkowości for (int i = 0; i < 16; ++i) @@ -270,34 +270,30 @@ inline glm::vec3 operator*( const float4x4 &m, const glm::vec3 &v ) { // mnożen v.x * m[ 0 ][ 2 ] + v.y * m[ 1 ][ 2 ] + v.z * m[ 2 ][ 2 ] + m[ 3 ][ 2 ] ); } -inline float4x4 &float4x4::Rotation(double angle, float3 axis) +inline float4x4 &float4x4::Rotation(float const Angle, float3 const &Axis) { - double c = cos(angle); - double s = sin(angle); + auto const c = std::cos(Angle); + auto const s = std::sin(Angle); // One minus c (short name for legibility of formulai) - double omc = (1 - c); - if (axis.Length() != 1.0f) - axis = SafeNormalize(axis); - double x = axis.x; - double y = axis.y; - double z = axis.z; - double xs = x * s; - double ys = y * s; - double zs = z * s; - double xyomc = x * y * omc; - double xzomc = x * z * omc; - double yzomc = y * z * omc; - e[0] = x * x * omc + c; + auto const omc = (1.f - c); + auto const axis = SafeNormalize(Axis); + auto const xs = axis.x * s; + auto const ys = axis.y * s; + auto const zs = axis.z * s; + auto const xyomc = axis.x * axis.y * omc; + auto const xzomc = axis.x * axis.z * omc; + auto const yzomc = axis.y * axis.z * omc; + e[0] = axis.x * axis.x * omc + c; e[1] = xyomc + zs; e[2] = xzomc - ys; e[3] = 0; e[4] = xyomc - zs; - e[5] = y * y * omc + c; + e[5] = axis.y * axis.y * omc + c; e[6] = yzomc + xs; e[7] = 0; e[8] = xzomc + ys; e[9] = yzomc - xs; - e[10] = z * z * omc + c; + e[10] = axis.z * axis.z * omc + c; e[11] = 0; e[12] = 0; e[13] = 0; diff --git a/Ground.cpp b/Ground.cpp index 91f84e87..efe1721f 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1352,12 +1352,12 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> vertex.normal.z >> vertex.texture.s >> vertex.texture.t; - vertex.position = glm::rotateZ( vertex.position, aRotate.z / 180 * M_PI ); - vertex.position = glm::rotateX( vertex.position, aRotate.x / 180 * M_PI ); - vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); - vertex.normal = glm::rotateZ( vertex.normal, static_cast( aRotate.z / 180 * M_PI ) ); - vertex.normal = glm::rotateX( vertex.normal, static_cast( aRotate.x / 180 * M_PI ) ); - vertex.normal = glm::rotateY( vertex.normal, static_cast( aRotate.y / 180 * M_PI ) ); + vertex.position = glm::rotateZ( vertex.position, glm::radians( aRotate.z ) ); + vertex.position = glm::rotateX( vertex.position, glm::radians( aRotate.x ) ); + vertex.position = glm::rotateY( vertex.position, glm::radians( aRotate.y ) ); + vertex.normal = glm::rotateZ( vertex.normal, glm::radians( aRotate.z ) ); + vertex.normal = glm::rotateX( vertex.normal, glm::radians( aRotate.x ) ); + vertex.normal = glm::rotateY( vertex.normal, glm::radians( aRotate.y ) ); vertex.position += glm::dvec3{ pOrigin }; if( true == clamps ) { vertex.texture.s = clamp( vertex.texture.s, 0.001f, 0.999f ); } if( true == clampt ) { vertex.texture.t = clamp( vertex.texture.t, 0.001f, 0.999f ); } @@ -1486,9 +1486,9 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) *parser >> vertex.position.y >> vertex.position.z; - vertex.position = glm::rotateZ( vertex.position, aRotate.z / 180 * M_PI ); - vertex.position = glm::rotateX( vertex.position, aRotate.x / 180 * M_PI ); - vertex.position = glm::rotateY( vertex.position, aRotate.y / 180 * M_PI ); + vertex.position = glm::rotateZ( vertex.position, glm::radians( aRotate.z ) ); + vertex.position = glm::rotateX( vertex.position, glm::radians( aRotate.x ) ); + vertex.position = glm::rotateY( vertex.position, glm::radians( aRotate.y ) ); vertex.position += glm::dvec3{ pOrigin }; // convert all data to gl_lines to allow data merge for matching nodes diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index a21608ba..8a83e79a 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -624,14 +624,14 @@ public: bool Signalling = false; /*Czy jest zalaczona sygnalizacja hamowania ostatniego wagonu*/ bool DoorSignalling = false; /*Czy jest zalaczona sygnalizacja blokady drzwi*/ bool Radio = true; /*Czy jest zalaczony radiotelefon*/ - double NominalBatteryVoltage = 0.0; /*Winger - baterie w elektrykach*/ + float NominalBatteryVoltage = 0.f; /*Winger - baterie w elektrykach*/ TDimension Dim; /*wymiary*/ double Cx = 0.0; /*wsp. op. aerodyn.*/ - double Floor = 0.96; //poziom podłogi dla ładunków - double WheelDiameter = 1.0; /*srednica kol napednych*/ - double WheelDiameterL = 0.9; //Ra: srednica kol tocznych przednich - double WheelDiameterT = 0.9; //Ra: srednica kol tocznych tylnych - double TrackW = 1.435; /*nominalna szerokosc toru [m]*/ + float Floor = 0.96f; //poziom podłogi dla ładunków + float WheelDiameter = 1.f; /*srednica kol napednych*/ + float WheelDiameterL = 0.9f; //Ra: srednica kol tocznych przednich + float WheelDiameterT = 0.9f; //Ra: srednica kol tocznych tylnych + float TrackW = 1.435f; /*nominalna szerokosc toru [m]*/ double AxleInertialMoment = 0.0; /*moment bezwladnosci zestawu kolowego*/ std::string AxleArangement; /*uklad osi np. Bo'Bo' albo 1'C*/ int NPoweredAxles = 0; /*ilosc osi napednych liczona z powyzszego*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b32c1e07..b24b268e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8178,7 +8178,7 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C else if (Command == "PantRear") /*Winger 160204, ABu 310105 i 030305*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów if ((TrainType == dt_EZT)) - { /*'ezt'*/ + { //'ezt' if ((CValue1 == 1)) { PantRearUp = true; @@ -8191,9 +8191,9 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } } else - { /*nie 'ezt'*/ + { //nie 'ezt' if ((CValue1 == 1)) - /*if ostatni polaczony sprz. sterowania*/ + //if ostatni polaczony sprz. sterowania if ((TestFlag(Couplers[1].CouplingFlag, ctrain_controll) && (CValue2 == 1)) || (TestFlag(Couplers[0].CouplingFlag, ctrain_controll) && (CValue2 == -1))) { diff --git a/Model3d.cpp b/Model3d.cpp index 36715788..95880a02 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1667,16 +1667,22 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, pName = ""; if (iTexture > 0) { // obsługa stałej tekstury - pTexture = t->at(iTexture); - if (pTexture.find_last_of("/\\") == std::string::npos) - pTexture.insert(0, Global::asCurrentTexturePath); - TextureID = GfxRenderer.Fetch_Texture(pTexture); - if( ( iFlags & 0x30 ) == 0 ) { - // texture-alpha based fallback if for some reason we don't have opacity flag set yet - iFlags |= - ( GfxRenderer.Texture( TextureID ).has_alpha ? - 0x20 : - 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta + if( iTexture < t->size() ) { + pTexture = t->at( iTexture ); + if( pTexture.find_last_of( "/\\" ) == std::string::npos ) + pTexture.insert( 0, Global::asCurrentTexturePath ); + TextureID = GfxRenderer.Fetch_Texture( pTexture ); + if( ( iFlags & 0x30 ) == 0 ) { + // texture-alpha based fallback if for some reason we don't have opacity flag set yet + iFlags |= + ( GfxRenderer.Texture( TextureID ).has_alpha ? + 0x20 : + 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta + } + } + else { + ErrorLog( "Bad model: reference to non-existent texture index in sub-model" + ( pName.empty() ? "" : " \"" + pName + "\"" ) ); + TextureID = NULL; } } else diff --git a/Train.cpp b/Train.cpp index 066e98e1..3db1a780 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1361,14 +1361,6 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const &Command ) { - return ( - Train->mvControlled->ActiveCab < 0 ? - pantographtogglerear( Train, Command ) : - pantographtogglefront( Train, Command ) ); -} - -void TTrain::pantographtogglefront( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->PantFrontUp ) { @@ -1377,59 +1369,31 @@ void TTrain::pantographtogglefront( TTrain *Train, command_data const &Command ) if( Train->mvControlled->PantFront( true ) ) { if( Train->mvControlled->PantFrontStart != 1 ) { // visual feedback - if( Train->mvControlled->ActiveCab < 0 ) { - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - else { - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } else { // ...or turn off if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( Train->mvControlled->ActiveCab < 0 ) { - if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) - && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; - } - } - else { - if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) - && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; - } + if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; } } @@ -1437,38 +1401,19 @@ void TTrain::pantographtogglefront( TTrain *Train, command_data const &Command ) if( false == Train->mvControlled->PantFront( false ) ) { if( Train->mvControlled->PantFrontStart != 0 ) { // visual feedback - if( Train->mvControlled->ActiveCab < 0 ) { - // in rear cab switch functions are swapped - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - else { - // in front cab switches map normally - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); - } + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); } } } @@ -1476,37 +1421,19 @@ void TTrain::pantographtogglefront( TTrain *Train, command_data const &Command ) else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( Train->mvControlled->ActiveCab < 0 ) { - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // also the switch off button, in cabs which have it + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantSelectedDownButton.SubModel ) { // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // also the switch off button, in cabs which have it - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - if( Train->ggPantSelectedDownButton.SubModel ) { - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - } - else { - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // also the switch off button, in cabs which have it - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - if( Train->ggPantSelectedDownButton.SubModel ) { - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -1514,14 +1441,6 @@ void TTrain::pantographtogglefront( TTrain *Train, command_data const &Command ) void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const &Command ) { - return ( - Train->mvControlled->ActiveCab < 0 ? - pantographtogglefront( Train, Command ) : - pantographtogglerear( Train, Command ) ); -} - -void TTrain::pantographtogglerear( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->PantRearUp ) { @@ -1530,61 +1449,31 @@ void TTrain::pantographtogglerear( TTrain *Train, command_data const &Command ) if( Train->mvControlled->PantRear( true ) ) { if( Train->mvControlled->PantRearStart != 1 ) { // visual feedback - if( Train->mvControlled->ActiveCab < 0 ) { - // in rear cab switch functions are swapped - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - else { - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } else { // ...or turn off if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( Train->mvControlled->ActiveCab < 0 ) { - // in rear cab switch functions are swapped - if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) - && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; - } - } - else { - if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) - && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; - } + if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels + return; } } @@ -1592,37 +1481,19 @@ void TTrain::pantographtogglerear( TTrain *Train, command_data const &Command ) if( false == Train->mvControlled->PantRear( false ) ) { if( Train->mvControlled->PantRearStart != 0 ) { // visual feedback - if( Train->mvControlled->ActiveCab < 0 ) { - // in rear cab switch functions are swapped - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - else { - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); - } + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); } } } @@ -1630,38 +1501,19 @@ void TTrain::pantographtogglerear( TTrain *Train, command_data const &Command ) else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( Train->mvControlled->ActiveCab < 0 ) { - // in rear cab switch functions are swapped - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // also the switch off button, in cabs which have it + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggPantSelectedDownButton.SubModel ) { // NOTE: currently we animate the selectable pantograph control based on standard key presses // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // also the switch off button, in cabs which have it - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - if( Train->ggPantSelectedDownButton.SubModel ) { - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - } - else { - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // also the switch off button, in cabs which have it - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - if( Train->ggPantSelectedDownButton.SubModel ) { - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -6441,21 +6293,12 @@ bool TTrain::Update( double const Deltatime ) || ( mvControlled->ConverterFlag ) ) { if( ggPantAllDownButton.GetValue() == 0.0 ) { // the 'lower all' button overrides state of switches, while active itself - // when in rear cab we treat switches as reversed, i.e. front controls physical rear - auto const frontpantographswitch = ( - mvControlled->ActiveCab < 0 ? - ggPantRearButton.GetValue() >= 1.0 : - ggPantFrontButton.GetValue() >= 1.0 ); - auto const rearpantographswitch = ( - mvControlled->ActiveCab < 0 ? - ggPantFrontButton.GetValue() >= 1.0 : - ggPantRearButton.GetValue() >= 1.0 ); if( ( false == mvControlled->PantFrontUp ) - && ( frontpantographswitch ) ) { + && ( ggPantFrontButton.GetValue() >= 1.0 ) ) { mvControlled->PantFront( true ); } if( ( false == mvControlled->PantRearUp ) - && ( rearpantographswitch ) ) { + && ( ggPantRearButton.GetValue() >= 1.0 ) ) { mvControlled->PantRear( true ); } } @@ -7326,50 +7169,42 @@ void TTrain::set_cab_controls() { } // pantographs if( mvOccupied->PantSwitchType != "impulse" ) { - auto const pantograph = ( - mvControlled->ActiveCab < 0 ? - mvControlled->PantRearUp : - mvControlled->PantFrontUp ); ggPantFrontButton.PutValue( - ( pantograph ? + ( mvControlled->PantFrontUp ? 1.0 : 0.0 ) ); ggPantFrontButtonOff.PutValue( - ( pantograph ? + ( mvControlled->PantFrontUp ? 0.0 : 1.0 ) ); // NOTE: currently we animate the selectable pantograph control for both pantographs // TODO: implement actual selection control, and refactor handling this control setup in a separate method ggPantSelectedButton.PutValue( - ( pantograph ? + ( mvControlled->PantFrontUp ? 1.0 : 0.0 ) ); ggPantSelectedDownButton.PutValue( - ( pantograph ? + ( mvControlled->PantFrontUp ? 0.0 : 1.0 ) ); } if( mvOccupied->PantSwitchType != "impulse" ) { - auto const pantograph = ( - mvControlled->ActiveCab < 0 ? - mvControlled->PantFrontUp : - mvControlled->PantRearUp ); ggPantRearButton.PutValue( - ( pantograph ? + ( mvControlled->PantRearUp ? 1.0 : 0.0 ) ); ggPantRearButtonOff.PutValue( - ( pantograph ? + ( mvControlled->PantRearUp ? 0.0 : 1.0 ) ); // NOTE: currently we animate the selectable pantograph control for both pantographs // TODO: implement actual selection control, and refactor handling this control setup in a separate method ggPantSelectedButton.PutValue( - ( pantograph ? + ( mvControlled->PantRearUp ? 1.0 : 0.0 ) ); ggPantSelectedDownButton.PutValue( - ( pantograph ? + ( mvControlled->PantRearUp ? 0.0 : 1.0 ) ); } diff --git a/Train.h b/Train.h index 5331386f..c9c9e6d2 100644 --- a/Train.h +++ b/Train.h @@ -155,9 +155,7 @@ class TTrain static void OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_data const &Command ); static void OnCommand_pantographcompressoractivate( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglefront( TTrain *Train, command_data const &Command ); - static void pantographtogglefront( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglerear( TTrain *Train, command_data const &Command ); - static void pantographtogglerear( TTrain *Train, command_data const &Command ); static void OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); diff --git a/moon.cpp b/moon.cpp index a6566d5e..feb72ba3 100644 --- a/moon.cpp +++ b/moon.cpp @@ -36,9 +36,9 @@ void cMoon::update() { move(); - glm::vec3 position( 0.0f, 0.0f, -2000.0f * Global::fDistanceFactor ); - position = glm::rotateX( position, (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); - position = glm::rotateY( position, (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); + glm::vec3 position( 0.f, 0.f, -2000.f * Global::fDistanceFactor ); + position = glm::rotateX( position, glm::radians( m_body.elevref ) ); + position = glm::rotateY( position, glm::radians( -m_body.hrang ) ); m_position = position; } diff --git a/sun.cpp b/sun.cpp index 55db2f00..dc65d471 100644 --- a/sun.cpp +++ b/sun.cpp @@ -33,9 +33,9 @@ void cSun::update() { move(); - glm::vec3 position( 0.0f, 0.0f, -2000.0f * Global::fDistanceFactor ); - position = glm::rotateX( position, (float)( m_body.elevref * ( M_PI / 180.0 ) ) ); - position = glm::rotateY( position, (float)( -m_body.hrang * ( M_PI / 180.0 ) ) ); + glm::vec3 position( 0.f, 0.f, -2000.f * Global::fDistanceFactor ); + position = glm::rotateX( position, glm::radians( m_body.elevref ) ); + position = glm::rotateY( position, glm::radians( -m_body.hrang ) ); m_position = position; } diff --git a/translation.h b/translation.h index 8ce582e0..c18a865b 100644 --- a/translation.h +++ b/translation.h @@ -62,10 +62,10 @@ static std::unordered_map m_cabcontrols = { { "converteroff_sw:", "converter" }, { "main_sw:", "line breaker" }, { "radio_sw:", "radio" }, - { "pantfront_sw:", "front pantograph" }, - { "pantrear_sw:", "rear pantograph" }, - { "pantfrontoff_sw:", "front pantograph" }, - { "pantrearoff_sw:", "rear pantograph" }, + { "pantfront_sw:", "pantograph A" }, + { "pantrear_sw:", "pantograph B" }, + { "pantfrontoff_sw:", "pantograph A" }, + { "pantrearoff_sw:", "pantograph B" }, { "pantalloff_sw:", "all pantographs" }, { "pantselected_sw:", "selected pantograph" }, { "pantselectedoff_sw:", "selected pantograph" }, diff --git a/uilayer.h b/uilayer.h index 8b3f31bb..79863a38 100644 --- a/uilayer.h +++ b/uilayer.h @@ -24,8 +24,8 @@ struct ui_panel { {} std::vector text_lines; - float origin_x; - float origin_y; + int origin_x; + int origin_y; }; class ui_layer { From 4357919272d58c78d4c15d638e2a639aaa66255f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 29 Jul 2017 00:28:37 +0200 Subject: [PATCH 148/426] mvp matrices cached separately for each render pass, eliminated duplicate screen width/height variables --- EU07.cpp | 14 +- Globals.cpp | 6 +- Globals.h | 4 +- World.cpp | 34 +++-- frustum.cpp | 25 ++++ frustum.h | 18 ++- maszyna.vcxproj.filters | 6 - moon.cpp | 2 +- mouseinput.cpp | 2 +- openglmatrixstack.h | 21 ++- renderer.cpp | 284 +++++++++++++++++++++++----------------- renderer.h | 107 +++++++++------ uilayer.cpp | 15 +-- 13 files changed, 322 insertions(+), 216 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index c226a225..00852213 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -78,8 +78,8 @@ void screenshot_save_thread( char *img ) png_image png; memset(&png, 0, sizeof(png_image)); png.version = PNG_IMAGE_VERSION; - png.width = Global::ScreenWidth; - png.height = Global::ScreenHeight; + png.width = Global::iWindowWidth; + png.height = Global::iWindowHeight; png.format = PNG_FORMAT_RGB; char datetime[64]; @@ -95,7 +95,7 @@ void screenshot_save_thread( char *img ) std::string filename = "screenshots/" + std::string(datetime) + "_" + std::to_string(perf) + ".png"; - if (png_image_write_to_file(&png, filename.c_str(), 0, img, -Global::ScreenWidth * 3, nullptr) == 1) + if (png_image_write_to_file(&png, filename.c_str(), 0, img, -Global::iWindowWidth * 3, nullptr) == 1) WriteLog("saved " + filename + "."); else WriteLog("failed to save screenshot."); @@ -105,8 +105,8 @@ void screenshot_save_thread( char *img ) void make_screenshot() { - char *img = new char[Global::ScreenWidth * Global::ScreenHeight * 3]; - glReadPixels(0, 0, Global::ScreenWidth, Global::ScreenHeight, GL_RGB, GL_UNSIGNED_BYTE, (GLvoid*)img); + char *img = new char[Global::iWindowWidth * Global::iWindowHeight * 3]; + glReadPixels(0, 0, Global::iWindowWidth, Global::iWindowHeight, GL_RGB, GL_UNSIGNED_BYTE, (GLvoid*)img); std::thread t(screenshot_save_thread, img); t.detach(); @@ -117,8 +117,8 @@ void window_resize_callback(GLFWwindow *window, int w, int h) { // NOTE: we have two variables which basically do the same thing as we don't have dynamic fullscreen toggle // TBD, TODO: merge them? - Global::ScreenWidth = Global::iWindowWidth = w; - Global::ScreenHeight = Global::iWindowHeight = h; + Global::iWindowWidth = w; + Global::iWindowHeight = h; Global::fDistanceFactor = std::max( 0.5f, h / 768.0f ); // not sure if this is really something we want to use glViewport(0, 0, w, h); } diff --git a/Globals.cpp b/Globals.cpp index 4310ec3a..7aa9094f 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -66,9 +66,6 @@ cParser *Global::pParser = NULL; int Global::iSegmentsRendered = 90; // ilość segmentów do regulacji wydajności TCamera *Global::pCamera = NULL; // parametry kamery TDynamicObject *Global::pUserDynamic = NULL; // pojazd użytkownika, renderowany bez trzęsienia -/* -std::string Global::asTranscript[5]; // napisy na ekranie (widoczne) -*/ TTranscripts Global::tranTexts; // obiekt obsługujący stenogramy dźwięków na ekranie float4 Global::UITextColor = float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); @@ -84,6 +81,7 @@ GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; double Global::fFogStart = 1700; double Global::fFogEnd = 2000; float Global::Overcast { 0.1f }; // NOTE: all this weather stuff should be moved elsewhere +float Global::BaseDrawRange { 2500.f }; opengl_light Global::DayLight; int Global::DynamicLightCount { 3 }; bool Global::ScaleSpecularValues { true }; @@ -98,7 +96,7 @@ int Global::Keys[MaxKeys]; bool Global::RealisticControlMode{ false }; int Global::iWindowWidth = 800; int Global::iWindowHeight = 600; -float Global::fDistanceFactor = Global::ScreenHeight / 768.0; // baza do przeliczania odległości dla LoD +float Global::fDistanceFactor = Global::iWindowHeight / 768.0; // baza do przeliczania odległości dla LoD int Global::iFeedbackMode = 1; // tryb pracy informacji zwrotnej int Global::iFeedbackPort = 0; // dodatkowy adres dla informacji zwrotnych bool Global::InputGamepad{ true }; diff --git a/Globals.h b/Globals.h index 752aca31..485a8a2f 100644 --- a/Globals.h +++ b/Globals.h @@ -223,6 +223,7 @@ class Global // static bool bTimeChange; // TODO: put these things in the renderer + static float BaseDrawRange; static opengl_light DayLight; static int DynamicLightCount; static bool ScaleSpecularValues; @@ -315,9 +316,6 @@ class Global // informacje podczas kalibracji static double fBrakeStep; // krok zmiany hamulca dla klawiszy [Num3] i [Num9] static bool bJoinEvents; // czy grupować eventy o tych samych nazwach -/* - static std::string asTranscript[5]; // napisy na ekranie (widoczne) -*/ static TTranscripts tranTexts; // obiekt obsługujący stenogramy dźwięków na ekranie static float4 UITextColor; // base color of UI text static std::string asLang; // domyślny język - http://tools.ietf.org/html/bcp47 diff --git a/World.cpp b/World.cpp index 4ed9ac6e..c4c1d5fa 100644 --- a/World.cpp +++ b/World.cpp @@ -489,9 +489,8 @@ void TWorld::OnKeyDown(int cKey) } else // również przeskakiwanie { // Ra: to z tą kamerą (Camera.Pos i Global::pCameraPosition) jest trochę bez sensu - Global::SetCameraPosition( - Global::FreeCameraInit[i]); // nowa pozycja dla generowania obiektów - Ground.Silence(Camera.Pos); // wyciszenie wszystkiego z poprzedniej pozycji + Ground.Silence( Global::pCameraPosition ); // wyciszenie wszystkiego z poprzedniej pozycji + Global::SetCameraPosition( Global::FreeCameraInit[i] ); // nowa pozycja dla generowania obiektów Camera.Init(Global::FreeCameraInit[i], Global::FreeCameraInitAngle[i]); // przestawienie } @@ -1136,25 +1135,25 @@ bool TWorld::Update() void TWorld::Update_Camera( double const Deltatime ) { - // Console::Update(); //tu jest zależne od FPS, co nie jest korzystne if( false == Global::ControlPicking ) { if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_LEFT ) == GLFW_PRESS ) { Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe - // if (!FreeFlyModeFlag) //jeśli wewnątrz - patrzymy do tyłu - // Camera.LookAt=Train->pMechPosition-Normalize(Train->GetDirection())*10; - if( Controlled && LengthSquared3( Controlled->GetPosition() - Camera.Pos ) < ( 1500 * 1500 ) ) // gdy bliżej niż 1.5km + if( Controlled && LengthSquared3( Controlled->GetPosition() - Camera.Pos ) < ( 1500 * 1500 ) ) { + // gdy bliżej niż 1.5km Camera.LookAt = Controlled->GetPosition(); + } else { TDynamicObject *d = Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m if( !d ) - d = Ground.DynamicNearest( Camera.Pos, - 1000 ); // dalej szukanie, jesli bliżej nie ma - if( d && pDynamicNearest ) // jeśli jakiś jest znaleziony wcześniej - if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > - LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) + d = Ground.DynamicNearest( Camera.Pos, 1000 ); // dalej szukanie, jesli bliżej nie ma + if( d && pDynamicNearest ) { + // jeśli jakiś jest znaleziony wcześniej + if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) { d = pDynamicNearest; // jeśli najbliższy nie jest 10 razy bliżej niż + } + } // poprzedni najbliższy, zostaje poprzedni if( d ) pDynamicNearest = d; // zmiana na nowy, jeśli coś znaleziony niepusty @@ -1164,7 +1163,7 @@ TWorld::Update_Camera( double const Deltatime ) { if( FreeFlyModeFlag ) Camera.RaLook(); // jednorazowe przestawienie kamery } - else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_RIGHT ) == GLFW_PRESS ) { //||Console::Pressed(VK_F4)) + else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_RIGHT ) == GLFW_PRESS ) { FollowView( false ); // bez wyciszania dźwięków } else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_MIDDLE ) == GLFW_PRESS ) { @@ -1179,12 +1178,7 @@ TWorld::Update_Camera( double const Deltatime ) { } Camera.Update(); // uwzględnienie ruchu wywołanego klawiszami -/* - if( Camera.Type == tp_Follow ) { - if( Train ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery - Train->UpdateMechPosition( Deltatime / - Global::fTimeSpeed ); // ograniczyć telepanie po przyspieszeniu -*/ + if( (Train != nullptr) && (Camera.Type == tp_Follow )) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery @@ -1248,6 +1242,8 @@ TWorld::Update_Camera( double const Deltatime ) { else { // kamera nieruchoma Global::SetCameraRotation( Camera.Yaw - M_PI ); } + // all done, update camera position to the new value + Global::SetCameraPosition( Camera.Pos ); } void TWorld::Update_Environment() { diff --git a/frustum.cpp b/frustum.cpp index 0f4624b7..c2420c89 100644 --- a/frustum.cpp +++ b/frustum.cpp @@ -10,6 +10,10 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "frustum.h" +std::vector ndcfrustumshapepoints = { + { -1, -1, -1, 1 }, { 1, -1, -1, 1 }, { 1, 1, -1, 1 }, { -1, 1, -1, 1 }, // z-near + { -1, -1, 1, 1 }, { 1, -1, 1, 1 }, { 1, 1, 1, 1 }, { -1, 1, 1, 1 } }; // z-far + void cFrustum::calculate() { @@ -83,6 +87,14 @@ cFrustum::calculate( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { m_frustum[ side_FRONT ][ plane_C ] = clip[ 11 ] + clip[ 10 ]; m_frustum[ side_FRONT ][ plane_D ] = clip[ 15 ] + clip[ 14 ]; normalize_plane( side_FRONT ); + + m_inversetransformation = glm::inverse( Projection * Modelview ); + + // calculate frustum corners + m_frustumpoints = ndcfrustumshapepoints; + transform_to_world( + std::begin( m_frustumpoints ), + std::end( m_frustumpoints ) ); } bool @@ -169,6 +181,19 @@ cFrustum::cube_inside( float const X, float const Y, float const Z, float const return true; } +std::vector const frustumshapepoinstorder{ 0, 1, 1, 2, 2, 3, 3, 0, 4, 5, 5, 6, 6, 7, 7, 4, 0, 4, 1, 5, 2, 6, 3, 7 }; + +// debug helper, draws shape of frustum in world space +void +cFrustum::draw( glm::vec3 const &Offset ) const { + + ::glBegin( GL_LINES ); + for( auto const pointindex : frustumshapepoinstorder ) { + ::glVertex3fv( glm::value_ptr( glm::vec3{ m_frustumpoints[ pointindex ] } - Offset ) ); + } + ::glEnd(); +} + void cFrustum::normalize_plane( cFrustum::side const Side ) { float magnitude = diff --git a/frustum.h b/frustum.h index 360f8a5a..4333e25a 100644 --- a/frustum.h +++ b/frustum.h @@ -61,6 +61,20 @@ public: cube_inside( Math3D::vector3 const &Center, float const Size ) const { return cube_inside( static_cast( Center.x ), static_cast( Center.y ), static_cast( Center.z ), Size ); } bool cube_inside( float const X, float const Y, float const Z, float const Size ) const; + // transforms provided set of clip space points to world space + template + void + transform_to_world( Iterator_ First, Iterator_ Last ) { + std::for_each( + First, Last, + [this]( glm::vec4 &point ) { + // transform each point using the cached matrix... + point = this->m_inversetransformation * point; + // ...and scale by transformed w + point = glm::vec4{ glm::vec3{ point } / point.w, 1.f }; } ); } + // debug helper, draws shape of frustum in world space + void + draw( glm::vec3 const &Offset ) const; protected: // types: @@ -74,5 +88,7 @@ protected: normalize_plane( cFrustum::side const Side ); // normalizes a plane (A side) from the frustum // members: - float m_frustum[6][4]; // holds the A B C and D values (normal & distance) for each side of the frustum. + float m_frustum[6][4]; // holds the A B C and D values (normal & distance) for each side of the frustum. + glm::mat4 m_inversetransformation; // cached inverse transformation matrix + std::vector m_frustumpoints; // coordinates of corners for defined frustum, in world space }; diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 67cb75d1..b375a4c0 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -120,9 +120,6 @@ Source Files - - Source Files - Source Files @@ -374,9 +371,6 @@ Header Files - - Header Files - Header Files diff --git a/moon.cpp b/moon.cpp index feb72ba3..02db79f1 100644 --- a/moon.cpp +++ b/moon.cpp @@ -55,7 +55,7 @@ cMoon::render() { glEnd(); glPushMatrix(); glTranslatef( position.x, position.y, position.z ); - gluSphere( moonsphere, /* (float)( Global::ScreenHeight / Global::FieldOfView ) * 0.5 * */ ( m_body.distance / 60.2666 ) * 9.037461, 12, 12 ); + gluSphere( moonsphere, /* (float)( Global::iWindowHeight / Global::FieldOfView ) * 0.5 * */ ( m_body.distance / 60.2666 ) * 9.037461, 12, 12 ); glPopMatrix(); } diff --git a/mouseinput.cpp b/mouseinput.cpp index 97e1f6dc..e5b8c1de 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -168,7 +168,7 @@ mouse_input::poll() { auto updaterate { m_updaterate }; if( m_varyingpollrate ) { - updaterate /= std::max( 0.15, 2.0 * glm::length( m_cursorposition - m_commandstartcursor ) / std::max( 1, Global::ScreenHeight ) ); + updaterate /= std::max( 0.15, 2.0 * glm::length( m_cursorposition - m_commandstartcursor ) / std::max( 1, Global::iWindowHeight ) ); } if( m_updateaccumulator < updaterate ) { diff --git a/openglmatrixstack.h b/openglmatrixstack.h index b75e37c7..27a875ab 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -31,17 +31,23 @@ public: // methods: glm::mat4 const & - data() const { return m_stack.top(); } + data() const { + return m_stack.top(); } void - push_matrix() { m_stack.emplace(m_stack.top()); } + push_matrix() { + m_stack.emplace( m_stack.top() ); } void pop_matrix() { m_stack.pop(); - if( m_stack.empty() ) { m_stack.emplace(1.0f); } + if( m_stack.empty() ) { m_stack.emplace( 1.f ); } upload(); } void load_identity() { - m_stack.top() = glm::mat4( 1.0f ); + m_stack.top() = glm::mat4( 1.f ); + upload(); } + void + load_matrix( glm::mat4 const &Matrix ) { + m_stack.top() = Matrix; upload(); } void rotate( float const Angle, glm::vec3 const &Axis ) { @@ -113,6 +119,11 @@ public: pop_matrix() { m_stacks[ m_mode ].pop_matrix(); } void load_identity() { m_stacks[ m_mode ].load_identity(); } + void + load_matrix( glm::mat4 const &Matrix ) { m_stacks[ m_mode ].load_matrix( Matrix ); } + template + void + load_matrix( Type_ const *Matrix ) { load_matrix( glm::make_mat4( Matrix ) ); } template void rotate( Type_ const Angle, Type_ const X, Type_ const Y, Type_ const Z ) { @@ -184,6 +195,8 @@ extern opengl_matrices OpenGLMatrices; #define glPushMatrix OpenGLMatrices.push_matrix #define glPopMatrix OpenGLMatrices.pop_matrix #define glLoadIdentity OpenGLMatrices.load_identity +#define glLoadMatrixf OpenGLMatrices.load_matrix +#define glLoadMatrixd OpenGLMatrices.load_matrix #define glRotated OpenGLMatrices.rotate #define glRotatef OpenGLMatrices.rotate #define glTranslated OpenGLMatrices.translate diff --git a/renderer.cpp b/renderer.cpp index 9fbe6f33..ee935681 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -27,6 +27,8 @@ extern TWorld World; //#define EU07_USE_ORTHO_SHADOWS +int const EU07_PICKBUFFERSIZE { 1024 }; // size of (square) textures bound with the pick framebuffer + namespace colors { glm::vec4 const none { 0.f, 0.f, 0.f, 1.f }; @@ -77,6 +79,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { m_geometry.units().texture = m_diffusetextureunit; UILayer.set_unit( m_diffusetextureunit ); + ::glDepthFunc( GL_LEQUAL ); glEnable( GL_DEPTH_TEST ); glAlphaFunc( GL_GREATER, 0.04f ); glEnable( GL_ALPHA_TEST ); @@ -150,11 +153,11 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); - ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, m_pickbuffersize, m_pickbuffersize, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, EU07_PICKBUFFERSIZE, EU07_PICKBUFFERSIZE, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); // depth buffer ::glGenRenderbuffersEXT( 1, &m_pickdepthbuffer ); ::glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, m_pickdepthbuffer ); - ::glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, m_pickbuffersize, m_pickbuffersize ); + ::glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, EU07_PICKBUFFERSIZE, EU07_PICKBUFFERSIZE ); // create and assemble the framebuffer ::glGenFramebuffersEXT( 1, &m_pickframebuffer ); ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_pickframebuffer ); @@ -229,10 +232,10 @@ opengl_renderer::Init( GLFWwindow *Window ) { float const size = 2.5f; m_billboardgeometry = m_geometry.create_chunk( vertex_array{ - { { -size, size, 0.0f }, glm::vec3(), { 1.0f, 1.0f } }, - { { size, size, 0.0f }, glm::vec3(), { 0.0f, 1.0f } }, - { { -size, -size, 0.0f }, glm::vec3(), { 1.0f, 0.0f } }, - { { size, -size, 0.0f }, glm::vec3(), { 0.0f, 0.0f } } }, + { { -size, size, 0.f }, glm::vec3(), { 1.f, 1.f } }, + { { size, size, 0.f }, glm::vec3(), { 0.f, 1.f } }, + { { -size, -size, 0.f }, glm::vec3(), { 1.f, 0.f } }, + { { size, -size, 0.f }, glm::vec3(), { 0.f, 0.f } } }, geometrybank, GL_TRIANGLE_STRIP ); // prepare debug mode objects @@ -251,9 +254,9 @@ opengl_renderer::Render() { Render_pass( rendermode::color ); glfwSwapBuffers( m_window ); - m_drawcount = m_renderpass.draw_queue.size(); + m_drawcount = m_drawqueue.size(); // accumulate last 20 frames worth of render time (cap at 1000 fps to prevent calculations going awry) - m_drawtime = std::max( 20.0f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - drawstart ) ).count() ); + m_drawtime = std::max( 20.f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - drawstart ) ).count() ); return true; // for now always succeed } @@ -262,37 +265,46 @@ opengl_renderer::Render() { void opengl_renderer::Render_pass( rendermode const Mode ) { - m_renderpass.draw_mode = Mode; + m_renderpass.setup( Mode ); switch( m_renderpass.draw_mode ) { case rendermode::color: { + opengl_camera shadowcamera; if( Global::RenderShadows && World.InitPerformed() ) { // run shadowmap pass before color Render_pass( rendermode::shadows ); #ifdef EU07_USE_DEBUG_SHADOWMAP UILayer.set_texture( m_shadowdebugtexture ); #endif - m_renderpass.draw_mode = rendermode::color; // restore draw mode. TODO: render mode stack + shadowcamera = m_renderpass.camera; // cache shadow camera placement for visualization + + m_renderpass.setup( rendermode::color ); // restore draw mode. TBD, TODO: render mode stack + // setup shadowmap matrix + m_shadowtexturematrix = + //bias from [-1, 1] to [0, 1] }; + glm::mat4{ 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.5f, 0.5f, 0.5f, 1.0f } + * shadowcamera.projection() + // during colour pass coordinates are moved from camera-centric to light-centric, essentially the difference between these two origins + * glm::translate( + glm::mat4{ glm::mat3{ shadowcamera.modelview() } }, + glm::vec3{ m_renderpass.camera.position() - shadowcamera.position() } ); } - ::glViewport( 0, 0, Global::ScreenWidth, Global::ScreenHeight ); - m_renderpass.draw_range = 2500.0f; // arbitrary base draw range + ::glViewport( 0, 0, Global::iWindowWidth, Global::iWindowHeight ); if( World.InitPerformed() ) { auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); - ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 0.0f ); // kolor nieba + ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 0.f ); // kolor nieba } else { - ::glClearColor( 51.0f / 255.0f, 102.0f / 255.0f, 85.0f / 255.0f, 1.0f ); // initial background Color + ::glClearColor( 51.0f / 255.f, 102.0f / 255.f, 85.0f / 255.f, 1.f ); // initial background Color } ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); if( World.InitPerformed() ) { // setup - setup_projection(); - setup_camera(); - ::glDepthFunc( GL_LEQUAL ); + setup_matrices(); // render setup_drawing( true ); setup_units( true, false, false ); @@ -300,6 +312,19 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // opaque parts... setup_drawing( false ); setup_units( true, true, true ); + + if( DebugModeFlag ) { + // draw light frustum + ::glLineWidth( 2.f ); + ::glColor4f( 1.f, 0.9f, 0.8f, 1.f ); + ::glDisable( GL_LIGHTING ); + ::glDisable( GL_TEXTURE_2D ); + shadowcamera.frustum().draw( m_renderpass.camera.position() ); + ::glLineWidth( 1.f ); + ::glEnable( GL_LIGHTING ); + ::glEnable( GL_TEXTURE_2D ); + } + Render( &World.Ground ); // ...translucent parts setup_drawing( true ); @@ -322,31 +347,34 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glViewport( 0, 0, m_shadowbuffersize, m_shadowbuffersize ); #ifdef EU07_USE_DEBUG_SHADOWMAP - ::glClearColor( 0.f / 255.0f, 0.f / 255.0f, 0.f / 255.f, 1.f ); // initial background Color + ::glClearColor( 0.f / 255.f, 0.f / 255.f, 0.f / 255.f, 1.f ); // initial background Color ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + opengl_camera worldcamera{ m_renderpass.camera }; // cache shadow camera placement for visualization #else ::glClear( GL_DEPTH_BUFFER_BIT ); #endif ::glScissor( 1, 1, m_shadowbuffersize - 2, m_shadowbuffersize - 2 ); ::glEnable( GL_SCISSOR_TEST ); - - m_renderpass.draw_range = Global::shadowtune.depth; // 1.0km square centered around camera - m_shadowtexturematrix = - glm::mat4{ - 0.5f, 0.0f, 0.0f, 0.0f, - 0.0f, 0.5f, 0.0f, 0.0f, - 0.0f, 0.0f, 0.5f, 0.0f, - 0.5f, 0.5f, 0.5f, 1.0f }; //bias from [-1, 1] to [0, 1] }; - setup_projection(); - setup_camera(); - ::glDepthFunc( GL_LEQUAL ); + setup_matrices(); ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting - ::glPolygonOffset( 2.f, 4.f ); + ::glPolygonOffset( 4.f, 8.f ); // render // opaque parts... setup_drawing( false ); #ifdef EU07_USE_DEBUG_SHADOWMAP setup_units( true, false, false ); + + if( DebugModeFlag ) { + // draw camera frustum + ::glLineWidth( 2.f ); + ::glColor4f( 1.f, 0.9f, 0.8f, 1.f ); + ::glDisable( GL_LIGHTING ); + ::glDisable( GL_TEXTURE_2D ); + worldcamera.frustum().draw( m_renderpass.camera.position() ); + ::glLineWidth( 1.f ); + ::glEnable( GL_LIGHTING ); + ::glEnable( GL_TEXTURE_2D ); + } #else setup_units( false, false, false ); #endif @@ -364,16 +392,13 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( World.InitPerformed() ) { // setup #ifdef EU07_USE_PICKING_FRAMEBUFFER - ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); + ::glViewport( 0, 0, EU07_PICKBUFFERSIZE, EU07_PICKBUFFERSIZE ); #endif - ::glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); + ::glClearColor( 0.f, 0.f, 0.f, 1.f ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); m_pickcontrolsitems.clear(); - m_renderpass.draw_range = 50.0f; // doesn't really matter for control picking - setup_projection(); - setup_camera(); - ::glDepthFunc( GL_LEQUAL ); + setup_matrices(); // render // opaque parts... setup_drawing( false ); @@ -388,17 +413,14 @@ opengl_renderer::Render_pass( rendermode const Mode ) { case rendermode::pickscenery: { if( World.InitPerformed() ) { // setup + m_picksceneryitems.clear(); #ifdef EU07_USE_PICKING_FRAMEBUFFER - ::glViewport( 0, 0, m_pickbuffersize, m_pickbuffersize ); + ::glViewport( 0, 0, EU07_PICKBUFFERSIZE, EU07_PICKBUFFERSIZE ); #endif - ::glClearColor( 0.0f, 0.0f, 0.0f, 1.0f ); + ::glClearColor( 0.f, 0.f, 0.f, 1.f ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - m_picksceneryitems.clear(); - m_renderpass.draw_range = 1000.0f; // scenery picking is likely to focus on nearby nodes - setup_projection(); - setup_camera(); - ::glDepthFunc( GL_LEQUAL ); + setup_matrices(); // render // opaque parts... setup_drawing( false ); @@ -415,14 +437,32 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } } +void +opengl_renderer::renderpass_config::setup( rendermode const Mode ) { + + draw_mode = Mode; + + if( false == World.InitPerformed() ) { return; } + + switch( draw_mode ) { + case rendermode::color: { draw_range = Global::BaseDrawRange; break; } + case rendermode::shadows: { draw_range = Global::shadowtune.depth; break; } + case rendermode::pickcontrols: { draw_range = 50.f; break; } + case rendermode::pickscenery: { draw_range = Global::BaseDrawRange * 0.5f; break; } + default: { draw_range = 0.f; break; } + } + + setup_projection(); + setup_modelview(); +} + // configures projection matrix for the current render pass void -opengl_renderer::setup_projection() { +opengl_renderer::renderpass_config::setup_projection() { - ::glMatrixMode( GL_PROJECTION ); - ::glLoadIdentity(); + camera.projection() = glm::mat4( 1.f ); - switch( m_renderpass.draw_mode ) { + switch( draw_mode ) { #ifndef EU07_USE_PICKING_FRAMEBUFFER case rendermode::pickcontrols: @@ -437,12 +477,13 @@ opengl_renderer::setup_projection() { case rendermode::pickscenery: { // TODO: scissor test for pick modes auto const angle = Global::FieldOfView / Global::ZoomFactor; - auto const height = std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ) / ( Global::ScreenWidth / m_pickbuffersize ); - ::gluPerspective( - Global::FieldOfView / Global::ZoomFactor, - std::max( 1.0f, (float)Global::ScreenWidth ) / std::max( 1.0f, (float)Global::ScreenHeight ) / ( Global::ScreenWidth / m_pickbuffersize ), - 0.1f * Global::ZoomFactor, - m_renderpass.draw_range * Global::fDistanceFactor ); + auto const height = std::max( 1.0f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ); + camera.projection() *= + glm::perspective( + glm::radians( Global::FieldOfView / Global::ZoomFactor ), + std::max( 1.0f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ), + 0.1f * Global::ZoomFactor, + draw_range * Global::fDistanceFactor ); break; } #endif @@ -452,7 +493,6 @@ opengl_renderer::setup_projection() { #else setup_projection_light_perspective(); #endif - m_shadowtexturematrix *= OpenGLMatrices.data( GL_PROJECTION ); break; } @@ -463,103 +503,114 @@ opengl_renderer::setup_projection() { } void -opengl_renderer::setup_projection_world() { +opengl_renderer::renderpass_config::setup_projection_world() { - ::gluPerspective( - Global::FieldOfView / Global::ZoomFactor, - std::max( 1.f, (float)Global::ScreenWidth ) / std::max( 1.f, (float)Global::ScreenHeight ), - 0.1f * Global::ZoomFactor, - m_renderpass.draw_range * Global::fDistanceFactor ); + camera.projection() *= + glm::perspective( + glm::radians( Global::FieldOfView / Global::ZoomFactor ), + std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), + 0.1f * Global::ZoomFactor, + draw_range * Global::fDistanceFactor ); } void -opengl_renderer::setup_projection_light_ortho() { +opengl_renderer::renderpass_config::setup_projection_light_ortho() { // TODO: calculate lightview boundaries based on area of the world camera frustum - ::glOrtho( - -Global::shadowtune.width, Global::shadowtune.width, - -Global::shadowtune.width, Global::shadowtune.width, - -Global::shadowtune.depth, Global::shadowtune.depth ); + camera.projection() *= + glm::ortho( + -Global::shadowtune.width, Global::shadowtune.width, + -Global::shadowtune.width, Global::shadowtune.width, + -Global::shadowtune.depth, Global::shadowtune.depth ); } void -opengl_renderer::setup_projection_light_perspective() { +opengl_renderer::renderpass_config::setup_projection_light_perspective() { - ::gluPerspective( - 45.f, - 1.f, - m_renderpass.draw_range * 0.1f, // light source is pulled back far enough we won't likely have anything too close to it, can get some z-range here - m_renderpass.draw_range * Global::fDistanceFactor ); + camera.projection() *= + glm::perspective( + glm::radians( 45.f ), + 1.f, + draw_range * 0.1f, // light source is pulled back far enough we won't likely have anything too close to it, can get some z-range here + draw_range * Global::fDistanceFactor ); } // configures modelview matrix for the current render pass void -opengl_renderer::setup_camera() { +opengl_renderer::renderpass_config::setup_modelview() { - ::glMatrixMode( GL_MODELVIEW ); // Select The Modelview Matrix - ::glLoadIdentity(); + camera.modelview() = glm::mat4( 1.f ); glm::dmat4 viewmatrix; - switch( m_renderpass.draw_mode ) { + switch( draw_mode ) { case rendermode::color: case rendermode::pickcontrols: case rendermode::pickscenery: { - setup_camera_world( viewmatrix ); + setup_modelview_world( viewmatrix ); break; } case rendermode::shadows: { #ifdef EU07_USE_ORTHO_SHADOWS - setup_camera_light_ortho( viewmatrix ); + setup_modelview_light_ortho( viewmatrix ); #else - setup_camera_light_perspective( viewmatrix ); + setup_modelview_light_perspective( viewmatrix ); #endif - // during colour pass coordinates are moved from camera-centric to light-centric, essentially the difference between these two origins - m_shadowtexturematrix *= - glm::translate( - glm::mat4{ glm::dmat3{ viewmatrix } }, - glm::vec3{ glm::dvec3{ Global::pCameraPosition } - m_renderpass.camera.position() } ); break; } default: { break; } } - +#ifdef EU07_USE_ORTHO_SHADOWS m_renderpass.camera.update_frustum( OpenGLMatrices.data( GL_PROJECTION ), viewmatrix ); // frustum tests are performed in 'world space' but after we set up frustum we no longer need camera translation, only rotation ::glMultMatrixd( glm::value_ptr( glm::dmat4( glm::dmat3( viewmatrix ) ) ) ); +#else + camera.modelview() = viewmatrix; + camera.update_frustum(); +#endif } void -opengl_renderer::setup_camera_world( glm::dmat4 &Viewmatrix ) { +opengl_renderer::renderpass_config::setup_modelview_world( glm::dmat4 &Viewmatrix ) { + camera.position() = Global::pCameraPosition; World.Camera.SetMatrix( Viewmatrix ); - m_renderpass.camera.position() = Global::pCameraPosition; } void -opengl_renderer::setup_camera_light_ortho( glm::dmat4 &Viewmatrix ) { +opengl_renderer::renderpass_config::setup_modelview_light_ortho( glm::dmat4 &Viewmatrix ) { - m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction }; - if( m_renderpass.camera.position().y - Global::pCameraPosition.y < 0.1 ) { - m_renderpass.camera.position().y = Global::pCameraPosition.y + 0.1; + camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction }; + if( camera.position().y - Global::pCameraPosition.y < 0.1 ) { + camera.position().y = Global::pCameraPosition.y + 0.1; } Viewmatrix *= glm::lookAt( - m_renderpass.camera.position(), + camera.position(), glm::dvec3{ Global::pCameraPosition }, glm::dvec3{ 0.f, 1.f, 0.f } ); } void -opengl_renderer::setup_camera_light_perspective( glm::dmat4 &Viewmatrix ) { +opengl_renderer::renderpass_config::setup_modelview_light_perspective( glm::dmat4 &Viewmatrix ) { - m_renderpass.camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * m_renderpass.draw_range * 0.5f }; - m_renderpass.camera.position().y = std::max( m_renderpass.draw_range * 0.5f * 0.1f, m_renderpass.camera.position().y ); // prevent shadow source from dipping too low + camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * draw_range * 0.5f }; + camera.position().y = std::max( draw_range * 0.5f * 0.1f, camera.position().y ); // prevent shadow source from dipping too low Viewmatrix *= glm::lookAt( - m_renderpass.camera.position(), + camera.position(), glm::dvec3{ Global::pCameraPosition }, glm::dvec3{ 0.f, 1.f, 0.f } ); } +void +opengl_renderer::setup_matrices() { + + ::glMatrixMode( GL_PROJECTION ); + OpenGLMatrices.load_matrix( m_renderpass.camera.projection() ); + // trim modelview matrix just to rotation, since rendering is done in camera-centric world space + ::glMatrixMode( GL_MODELVIEW ); + OpenGLMatrices.load_matrix( glm::mat4( glm::mat3( m_renderpass.camera.modelview() ) ) ); +} + void opengl_renderer::setup_drawing( bool const Alpha ) { @@ -982,7 +1033,7 @@ opengl_renderer::Render( TGround *Ground ) { ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) - m_renderpass.draw_queue.clear(); + m_drawqueue.clear(); switch( m_renderpass.draw_mode ) { case rendermode::color: { @@ -1034,12 +1085,12 @@ opengl_renderer::Render( TGround *Ground ) { } // draw queue was filled while rendering content of ground cells. now sort the nodes based on their distance to viewer... std::sort( - std::begin( m_renderpass.draw_queue ), - std::end( m_renderpass.draw_queue ), + std::begin( m_drawqueue ), + std::end( m_drawqueue ), []( distancesubcell_pair const &Left, distancesubcell_pair const &Right ) { return ( Left.first ) < ( Right.first ); } ); // ...then render the opaque content of the visible subcells. - for( auto subcellpair : m_renderpass.draw_queue ) { + for( auto subcellpair : m_drawqueue ) { Render( subcellpair.second ); } break; @@ -1058,7 +1109,7 @@ opengl_renderer::Render( TGround *Ground ) { } // they can also skip queue sorting, as they only deal with opaque geometry // NOTE: there's benefit from rendering front-to-back, but is it significant enough? TODO: investigate - for( auto subcellpair : m_renderpass.draw_queue ) { + for( auto subcellpair : m_drawqueue ) { Render( subcellpair.second ); } break; @@ -1125,7 +1176,7 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { auto subcell = Groundcell->pSubRects + subcellindex; if( subcell->iNodeCount ) { // o ile są jakieś obiekty, bo po co puste sektory przelatywać - m_renderpass.draw_queue.emplace_back( + m_drawqueue.emplace_back( glm::length2( m_renderpass.camera.position() - glm::dvec3( subcell->m_area.center ) ), subcell ); } @@ -1290,9 +1341,6 @@ opengl_renderer::Render( TGroundNode *Node ) { break; } } -#ifdef EU07_USE_OLD_RENDERCODE - Node->Model->Render( Node->pCenter - m_renderpass.camera.position() ); -#else Node->Model->RaAnimate(); // jednorazowe przeliczenie animacji Node->Model->RaPrepare(); if( Node->Model->pModel ) { @@ -1320,7 +1368,6 @@ opengl_renderer::Render( TGroundNode *Node ) { } } } -#endif return true; } @@ -1981,21 +2028,21 @@ opengl_renderer::Render_Alpha( TGround *Ground ) { TGroundNode *node; TSubRect *tmp; // Ra: renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - for( auto subcellpair = std::rbegin( m_renderpass.draw_queue ); subcellpair != std::rend( m_renderpass.draw_queue ); ++subcellpair ) { + for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { // przezroczyste trójkąty w oddzielnym cyklu przed modelami tmp = subcellpair->second; for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { Render_Alpha( node ); } } - for( auto subcellpair = std::rbegin( m_renderpass.draw_queue ); subcellpair != std::rend( m_renderpass.draw_queue ); ++subcellpair ) + for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { // renderowanie przezroczystych modeli oraz pojazdów Render_Alpha( subcellpair->second ); } ::glDisable( GL_LIGHTING ); // linie nie powinny świecić - for( auto subcellpair = std::rbegin( m_renderpass.draw_queue ); subcellpair != std::rend( m_renderpass.draw_queue ); ++subcellpair ) { + for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { // druty na końcu, żeby się nie robiły białe plamy na tle lasu tmp = subcellpair->second; for( node = tmp->nRenderWires; node; node = node->nNext3 ) { @@ -2092,9 +2139,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } } case TP_MODEL: { -#ifdef EU07_USE_OLD_RENDERCODE - Node->Model->RenderAlpha( Node->pCenter - m_renderpass.camera.position() ); -#else + Node->Model->RaPrepare(); if( Node->Model->pModel ) { // renderowanie rekurencyjne submodeli @@ -2121,7 +2166,6 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } } } -#endif return true; } @@ -2508,15 +2552,15 @@ opengl_renderer::Update_Pick_Control() { // determine point to examine glm::dvec2 mousepos; glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); - mousepos.y = Global::ScreenHeight - mousepos.y; // cursor coordinates are flipped compared to opengl + mousepos.y = Global::iWindowHeight - mousepos.y; // cursor coordinates are flipped compared to opengl #ifdef EU07_USE_PICKING_FRAMEBUFFER glm::ivec2 pickbufferpos; if( true == m_framebuffersupport ) { // ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); pickbufferpos = glm::ivec2{ - mousepos.x * m_pickbuffersize / Global::ScreenWidth, - mousepos.y * m_pickbuffersize / Global::ScreenHeight + mousepos.x * EU07_PICKBUFFERSIZE / Global::iWindowWidth, + mousepos.y * EU07_PICKBUFFERSIZE / Global::iWindowHeight }; } else { @@ -2556,15 +2600,15 @@ opengl_renderer::Update_Pick_Node() { // determine point to examine glm::dvec2 mousepos; glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); - mousepos.y = Global::ScreenHeight - mousepos.y; // cursor coordinates are flipped compared to opengl + mousepos.y = Global::iWindowHeight - mousepos.y; // cursor coordinates are flipped compared to opengl #ifdef EU07_USE_PICKING_FRAMEBUFFER glm::ivec2 pickbufferpos; if( true == m_framebuffersupport ) { // ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); pickbufferpos = glm::ivec2{ - mousepos.x * m_pickbuffersize / Global::ScreenWidth, - mousepos.y * m_pickbuffersize / Global::ScreenHeight + mousepos.x * EU07_PICKBUFFERSIZE / Global::iWindowWidth, + mousepos.y * EU07_PICKBUFFERSIZE / Global::iWindowHeight }; } else { @@ -2611,8 +2655,8 @@ opengl_renderer::Update( double const Deltatime ) { float targetfactor; if( framerate > 90.0 ) { targetfactor = 3.0f; } else if( framerate > 60.0 ) { targetfactor = 1.5f; } - else if( framerate > 30.0 ) { targetfactor = Global::ScreenHeight / 768.0f; } - else { targetfactor = Global::ScreenHeight / 768.0f * 0.75f; } + else if( framerate > 30.0 ) { targetfactor = Global::iWindowHeight / 768.0f; } + else { targetfactor = Global::iWindowHeight / 768.0f * 0.75f; } if( targetfactor > Global::fDistanceFactor ) { diff --git a/renderer.h b/renderer.h index 05b5c6bc..81a85d19 100644 --- a/renderer.h +++ b/renderer.h @@ -26,10 +26,10 @@ struct opengl_light { GLuint id{ (GLuint)-1 }; glm::vec3 direction; glm::vec4 - position { 0.0f, 0.0f, 0.0f, 1.0f }, // 4th parameter specifies directional(0) or omni-directional(1) light source - ambient { 0.0f, 0.0f, 0.0f, 1.0f }, - diffuse { 1.0f, 1.0f, 1.0f, 1.0f }, - specular { 1.0f, 1.0f, 1.0f, 1.0f }; + position { 0.f, 0.f, 0.f, 1.f }, // 4th parameter specifies directional(0) or omni-directional(1) light source + ambient { 0.f, 0.f, 0.f, 1.f }, + diffuse { 1.f, 1.f, 1.f, 1.f }, + specular { 1.f, 1.f, 1.f, 1.f }; inline void apply_intensity( float const Factor = 1.0f ) { @@ -54,7 +54,7 @@ struct opengl_light { void apply_angle() { glLightfv( id, GL_POSITION, glm::value_ptr(position) ); - if( position.w == 1.0f ) { + if( position.w == 1.f ) { glLightfv( id, GL_SPOT_DIRECTION, glm::value_ptr(direction) ); } } @@ -86,7 +86,7 @@ public: // methods: inline void - update_frustum() { m_frustum.calculate(); } + update_frustum() { m_frustum.calculate( m_projection, m_modelview ); } inline void update_frustum(glm::mat4 const &Projection, glm::mat4 const &Modelview) { m_frustum.calculate(Projection, Modelview); } @@ -100,11 +100,28 @@ public: inline glm::dvec3 & position() { return m_position; } + inline + glm::mat4 const & + projection() const { return m_projection; } + inline + glm::mat4 & + projection() { return m_projection; } + inline + glm::mat4 const & + modelview() const { return m_modelview; } + inline + glm::mat4 & + modelview() { return m_modelview; } + inline + cFrustum const & + frustum() { return m_frustum; } private: // members: cFrustum m_frustum; glm::dvec3 m_position; + glm::mat4 m_projection; + glm::mat4 m_modelview; }; // bare-bones render controller, in lack of anything better yet @@ -185,7 +202,28 @@ private: opengl_camera camera; rendermode draw_mode { rendermode::none }; float draw_range { 0.0f }; - std::vector draw_queue; // list of subcells to be drawn in current render pass + + void + setup( rendermode const Mode ); + private: + // configures projection matrix for the current render pass + void + setup_projection(); + void + setup_projection_world(); + void + setup_projection_light_ortho(); + void + setup_projection_light_perspective(); + // configures camera for the current render pass + void + setup_modelview(); + void + setup_modelview_world( glm::dmat4 &Viewmatrix ); + void + setup_modelview_light_ortho( glm::dmat4 &Viewmatrix ); + void + setup_modelview_light_perspective( glm::dmat4 &Viewmatrix ); }; typedef std::vector opengllight_array; @@ -196,24 +234,8 @@ private: // runs jobs needed to generate graphics for specified render pass void Render_pass( rendermode const Mode ); - // configures projection matrix for the current render pass void - setup_projection(); - void - setup_projection_world(); - void - setup_projection_light_ortho(); - void - setup_projection_light_perspective(); - // configures camera for the current render pass - void - setup_camera(); - void - setup_camera_world( glm::dmat4 &Viewmatrix ); - void - setup_camera_light_ortho( glm::dmat4 &Viewmatrix ); - void - setup_camera_light_perspective( glm::dmat4 &Viewmatrix ); + setup_matrices(); void setup_drawing( bool const Alpha = false ); void @@ -267,46 +289,49 @@ private: std::size_t pick_index( glm::ivec3 const &Color ); // members + GLFWwindow *m_window { nullptr }; geometrybank_manager m_geometry; texture_manager m_textures; opengllight_array m_lights; - GLFWwindow *m_window { nullptr }; + + geometry_handle m_billboardgeometry { NULL, NULL }; + texture_handle m_glaretexture { -1 }; + texture_handle m_suntexture { -1 }; + texture_handle m_moontexture { -1 }; + texture_handle m_reflectiontexture { -1 }; + GLUquadricObj *m_quadric { nullptr }; // helper object for drawing debug mode scene elements + + bool m_framebuffersupport { false }; #ifdef EU07_USE_PICKING_FRAMEBUFFER GLuint m_pickframebuffer { NULL }; // TODO: refactor pick framebuffer stuff into an object GLuint m_picktexture { NULL }; GLuint m_pickdepthbuffer { NULL }; - int m_pickbuffersize { 1024 }; // size of (square) textures bound with the pick framebuffer #endif + int m_shadowbuffersize { 4096 }; GLuint m_shadowframebuffer { NULL }; GLuint m_shadowtexture { NULL }; #ifdef EU07_USE_DEBUG_SHADOWMAP GLuint m_shadowdebugtexture{ NULL }; #endif - int m_shadowbuffersize { 4096 }; - glm::mat4 m_shadowtexturematrix; - glm::vec4 m_shadowcolor{ 0.5f, 0.5f, 0.5f, 1.f }; - GLUquadricObj *m_quadric { nullptr }; // helper object for drawing debug mode scene elements + glm::mat4 m_shadowtexturematrix; // conversion from camera-centric world space to light-centric clip space + int m_shadowtextureunit { GL_TEXTURE1 }; int m_helpertextureunit { GL_TEXTURE0 }; int m_diffusetextureunit { GL_TEXTURE2 }; - geometry_handle m_billboardgeometry { 0, 0 }; - texture_handle m_glaretexture { -1 }; - texture_handle m_suntexture { -1 }; - texture_handle m_moontexture { -1 }; - texture_handle m_reflectiontexture { -1 }; - - float m_drawtime { 1000.0f / 30.0f * 20.0f }; // start with presumed 'neutral' average of 30 fps + float m_drawtime { 1000.f / 30.f * 20.f }; // start with presumed 'neutral' average of 30 fps double m_updateaccumulator { 0.0 }; std::string m_debuginfo; glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; - float m_specularopaquescalefactor { 1.0f }; - float m_speculartranslucentscalefactor { 1.0f }; + glm::vec4 m_shadowcolor { 0.5f, 0.5f, 0.5f, 1.f }; + float m_specularopaquescalefactor { 1.f }; + float m_speculartranslucentscalefactor { 1.f }; + bool m_renderspecular{ false }; // controls whether to include specular component in the calculations - bool m_framebuffersupport { false }; renderpass_config m_renderpass; - bool m_renderspecular { false }; // controls whether to include specular component in the calculations + std::vector m_drawqueue; // list of subcells to be drawn in current render pass + std::vector m_picksceneryitems; std::vector m_pickcontrolsitems; TSubModel const *m_pickcontrolitem { nullptr }; diff --git a/uilayer.cpp b/uilayer.cpp index 67ca6c60..4680a728 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -65,7 +65,7 @@ ui_layer::render() { glMatrixMode(GL_PROJECTION); glLoadIdentity(); - glOrtho( 0, std::max( 1, Global::ScreenWidth ), std::max( 1, Global::ScreenHeight ), 0, -1, 1 ); + glOrtho( 0, std::max( 1, Global::iWindowWidth ), std::max( 1, Global::iWindowHeight ), 0, -1, 1 ); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -107,11 +107,7 @@ ui_layer::set_background( std::string const &Filename ) { m_progressbottom = ( texture.width() != texture.height() ); } } -/* -void cGuiLayer::setNote( const std::string Note ) { mNote = Note; } -std::string cGuiLayer::getNote() { return mNote; } -*/ void ui_layer::render_progress() { @@ -247,13 +243,14 @@ ui_layer::render_texture() { ::glBindTexture( GL_TEXTURE_2D, m_texture ); auto const size = 512.f; + auto const offset = 64.f; glBegin( GL_TRIANGLE_STRIP ); - glMultiTexCoord2f( m_textureunit, 0.f, 1.f ); glVertex2f( 0.f, 256.f ); - glMultiTexCoord2f( m_textureunit, 0.f, 0.f ); glVertex2f( 0.f, 256.f + size ); - glMultiTexCoord2f( m_textureunit, 1.f, 1.f ); glVertex2f( size, 256.f ); - glMultiTexCoord2f( m_textureunit, 1.f, 0.f ); glVertex2f( size, 256.f + size ); + glMultiTexCoord2f( m_textureunit, 0.f, 1.f ); glVertex2f( offset, Global::iWindowHeight - offset - size ); + glMultiTexCoord2f( m_textureunit, 0.f, 0.f ); glVertex2f( offset, Global::iWindowHeight - offset ); + glMultiTexCoord2f( m_textureunit, 1.f, 1.f ); glVertex2f( offset + size, Global::iWindowHeight - offset - size ); + glMultiTexCoord2f( m_textureunit, 1.f, 0.f ); glVertex2f( offset + size, Global::iWindowHeight - offset ); glEnd(); From 01ef6b3887ed3ee1e408012f3c70552070938049 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 29 Jul 2017 02:02:02 +0200 Subject: [PATCH 149/426] minor c++ standard compliance fixes --- McZapkie/MOVER.h | 16 ++++----- ResourceManager.h | 2 +- Texture.cpp | 5 +-- parser.cpp | 36 +++++++++++++++++++ parser.h | 91 +++++++++++++++++------------------------------ 5 files changed, 78 insertions(+), 72 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 8a83e79a..2fe15ace 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -384,14 +384,14 @@ struct TBoilerType { }; /*rodzaj odbieraka pradu*/ struct TCurrentCollector { - long CollectorsNo{ 0 }; //musi być tu, bo inaczej się kopie - double MinH{ 0.0 }; double MaxH{ 0.0 }; //zakres ruchu pantografu, nigdzie nie używany - double CSW{ 0.0 }; //szerokość części roboczej (styku) ślizgacza - double MinV{ 0.0 }; double MaxV{ 0.0 }; //minimalne i maksymalne akceptowane napięcie - double OVP{ 0.0 }; //czy jest przekaznik nadnapieciowy - double InsetV{ 0.0 }; //minimalne napięcie wymagane do załączenia - double MinPress{ 0.0 }; //minimalne ciśnienie do załączenia WS - double MaxPress{ 0.0 }; //maksymalne ciśnienie za reduktorem + long CollectorsNo; //musi być tu, bo inaczej się kopie + double MinH; double MaxH; //zakres ruchu pantografu, nigdzie nie używany + double CSW; //szerokość części roboczej (styku) ślizgacza + double MinV; double MaxV; //minimalne i maksymalne akceptowane napięcie + double OVP; //czy jest przekaznik nadnapieciowy + double InsetV; //minimalne napięcie wymagane do załączenia + double MinPress; //minimalne ciśnienie do załączenia WS + double MaxPress; //maksymalne ciśnienie za reduktorem //inline TCurrentCollector() { // CollectorsNo = 0; // MinH, MaxH, CSW, MinV, MaxV = 0.0; diff --git a/ResourceManager.h b/ResourceManager.h index 50e65600..ae890b57 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -110,7 +110,7 @@ private: std::chrono::nanoseconds const m_unusedresourcetimetolive; typename Container_::size_type const m_unusedresourcesweepsize; std::string const m_resourcename; - typename Container_ &m_container; + Container_ &m_container; typename Container_::size_type m_resourcesweepindex { 0 }; std::chrono::steady_clock::time_point m_resourcetimestamp { std::chrono::steady_clock::now() }; }; diff --git a/Texture.cpp b/Texture.cpp index f6147f05..228d314d 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -592,10 +592,7 @@ opengl_texture::create() { } } - data.swap( std::vector() ); // TBD, TODO: keep the texture data if we start doing some gpu data cleaning down the road -/* - data_state = resource_state::none; -*/ + data = std::vector(); data_state = resource_state::none; is_ready = true; } diff --git a/parser.cpp b/parser.cpp index 68355475..c7bbebd5 100644 --- a/parser.cpp +++ b/parser.cpp @@ -72,6 +72,42 @@ cParser::~cParser() mComments.clear(); } +template<> +cParser& +cParser::operator>>( std::string &Right ) { + + if( true == this->tokens.empty() ) { return *this; } + + Right = this->tokens.front(); + this->tokens.pop_front(); + + return *this; +} + +template<> +cParser& +cParser::operator>>( bool &Right ) { + + if( true == this->tokens.empty() ) { return *this; } + + Right = ( ( this->tokens.front() == "true" ) + || ( this->tokens.front() == "yes" ) + || ( this->tokens.front() == "1" ) ); + this->tokens.pop_front(); + + return *this; +} + +template <> +bool +cParser::getToken( bool const ToLower, const char *Break ) { + + auto const token = getToken( true, Break ); + return ( ( token == "true" ) + || ( token == "yes" ) + || ( token == "1" ) ); +} + // methods bool cParser::getTokens(unsigned int Count, bool ToLower, const char *Break) { diff --git a/parser.h b/parser.h index b8176c0a..982959ef 100644 --- a/parser.h +++ b/parser.h @@ -35,12 +35,6 @@ class cParser //: public std::stringstream template cParser & operator>>( Type_ &Right ); - template <> - cParser & - operator>>( std::string &Right ); - template <> - cParser & - operator>>( bool &Right ); template Output_ getToken( bool const ToLower = true, const char *Break = "\n\r\t ;" ) { @@ -48,41 +42,34 @@ class cParser //: public std::stringstream Output_ output; *this >> output; return output; }; - template <> - bool - getToken( bool const ToLower, const char *Break ) { - auto const token = getToken( true, Break ); - return ( ( token == "true" ) - || ( token == "yes" ) - || ( token == "1" ) ); } - inline void ignoreToken() - { - readToken(); - }; - inline void ignoreTokens(int count) - { - for (int i = 0; i < count; i++) - readToken(); - }; - inline bool expectToken(std::string const &value) - { - return readToken() == value; - }; - bool eof() - { - return mStream->eof(); - }; - bool ok() - { - return !mStream->fail(); - }; - bool getTokens(unsigned int Count = 1, bool ToLower = true, char const *Break = "\n\r\t ;"); + inline + void + ignoreToken() { + readToken(); }; + inline + void + ignoreTokens(int count) { + for( int i = 0; i < count; ++i ) { + readToken(); } }; + inline + bool + expectToken( std::string const &Value ) { + return readToken() == Value; }; + bool + eof() { + return mStream->eof(); }; + bool + ok() { + return !mStream->fail(); }; + bool + getTokens( unsigned int Count = 1, bool ToLower = true, char const *Break = "\n\r\t ;" ); // returns next incoming token, if any, without removing it from the set - std::string peek() const { - return ( - false == tokens.empty() ? - tokens.front() : - "" ); } + std::string + peek() const { + return ( + false == tokens.empty() ? + tokens.front() : + "" ); } // returns percentage of file processed so far int getProgress() const; int getFullProgress() const; @@ -129,26 +116,12 @@ cParser::operator>>( Type_ &Right ) { template<> cParser& -cParser::operator>>( std::string &Right ) { - - if( true == this->tokens.empty() ) { return *this; } - - Right = this->tokens.front(); - this->tokens.pop_front(); - - return *this; -} +cParser::operator>>( std::string &Right ); template<> cParser& -cParser::operator>>( bool &Right ) { +cParser::operator>>( bool &Right ); - if( true == this->tokens.empty() ) { return *this; } - - Right = ( ( this->tokens.front() == "true" ) - || ( this->tokens.front() == "yes" ) - || ( this->tokens.front() == "1" ) ); - this->tokens.pop_front(); - - return *this; -} +template<> +bool +cParser::getToken( bool const ToLower, const char *Break ); From e88b85e72558337991879ce2a75164392ed3aee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Mon, 31 Jul 2017 17:31:29 +0200 Subject: [PATCH 150/426] AI z hamulcem co 0,25 pozycji --- Driver.cpp | 160 ++++++++++++++++++++++++++++++++----------- Driver.h | 6 ++ McZapkie/MOVER.h | 2 + McZapkie/Mover.cpp | 36 ++++++++++ World.cpp | 3 + maszyna.vcxproj.user | 2 +- 6 files changed, 169 insertions(+), 40 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 98709cc7..7e3fa07c 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1679,6 +1679,44 @@ void TController::AutoRewident() } d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } + //teraz zerujemy tabelkę opóźnienia hamowania + for (int i = 0; i < BrakeAccTableSize; i++) + { + fBrake_a0[i+1] = 0; + fBrake_a1[i+1] = 0; + } + d = pVehicles[0]; // pojazd na czele składu + float velstep = (mvOccupied->Vmax*0.5) / BrakeAccTableSize; + while (d) + { // 4. Przeliczanie siły hamowania + for (int i = 0; i < BrakeAccTableSize; i++) + { + fBrake_a0[i+1] += d->MoverParameters->BrakeForceR(0.25, velstep*(1 + 2 * i)); + fBrake_a1[i+1] += d->MoverParameters->BrakeForceR(1.00, velstep*(1 + 2 * i)); + } + d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) + } + for (int i = 0; i < BrakeAccTableSize; i++) + { + fBrake_a1[i+1] -= fBrake_a0[i+1]; + fBrake_a0[i+1] /= fMass; + fBrake_a1[i+1] /= (12*fMass); + } + if (mvOccupied->TrainType == dt_EZT) + { + fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 10 * fBrake_a1[BrakeAccTableSize]; + fBrakeReaction = 0.25; + } + else if (ustaw > 16) + { + fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 6 * fBrake_a1[BrakeAccTableSize]; + fBrakeReaction = 0.5; + } + else + { + fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 2 * fBrake_a1[BrakeAccTableSize]; + fBrakeReaction = 2.0; + } }; int TController::CheckDirection() { @@ -1951,6 +1989,12 @@ bool TController::SetProximityVelocity(double NewDist,double NewVelNext) } */ +double TController::BrakeAccFactor() +{ + double Factor = 1 + fBrakeReaction*mvOccupied->Vel / (std::max(0.0, ActualProximityDist) + 1); + return Factor; +} + void TController::SetDriverPsyche() { // double maxdist=0.5; //skalowanie dystansu od innego pojazdu, zmienic to!!! @@ -2294,17 +2338,20 @@ bool TController::IncBrake() } else { if( mvOccupied->BrakeCtrlPos + 1 == mvOccupied->BrakeCtrlPosNo ) { - if( AccDesired < -1.5 ) // hamowanie nagle - OK = mvOccupied->IncBrakeLevel(); + if (AccDesired < -1.5) // hamowanie nagle + OK = mvOccupied->BrakeLevelAdd(1.0); else OK = false; } else { // dodane dla towarowego - if( mvOccupied->BrakeDelayFlag == bdelay_G ? - -AccDesired * 6.6 > std::min( 2, mvOccupied->BrakeCtrlPos ) : - true ) { - OK = mvOccupied->IncBrakeLevel(); + double deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4 * (mvOccupied->BrakeCtrlPosR - 1)*fBrake_a1[0]); + + if( deltaAcc > 0) + { + OK = mvOccupied->BrakeLevelAdd(mvOccupied->BrakeCtrlPosR>0?0.25:1.0); + if ((deltaAcc > 5 * fBrake_a1[0])&&(mvOccupied->BrakeCtrlPosR<=3.0)) + mvOccupied->BrakeLevelAdd(1.0); } else OK = false; @@ -2337,6 +2384,7 @@ bool TController::IncBrake() bool TController::DecBrake() { // zmniejszenie siły hamowania bool OK = false; + double deltaAcc = 0; switch (mvOccupied->BrakeSystem) { case Individual: @@ -2346,8 +2394,18 @@ bool TController::DecBrake() OK = mvOccupied->DecLocalBrakeLevel(1 + floor(0.5 + fabs(AccDesired))); break; case Pneumatic: - if (mvOccupied->BrakeCtrlPos > 0) - OK = mvOccupied->DecBrakeLevel(); + deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4 * (mvOccupied->BrakeCtrlPosR - 0.75)*fBrake_a1[0]); + if (deltaAcc < 0) + { + if (mvOccupied->BrakeCtrlPosR > 0) + { + OK = mvOccupied->BrakeLevelAdd(-0.25); + //if ((deltaAcc < 5 * fBrake_a1[0]) && (mvOccupied->BrakeCtrlPosR >= 1.2)) + // mvOccupied->BrakeLevelAdd(-1.0); + if (mvOccupied->BrakeCtrlPosR < 0.74) + mvOccupied->BrakeLevelSet(0.0); + } + } if (!OK) OK = mvOccupied->DecLocalBrakeLevel(2); if (mvOccupied->PipePress < 3.0) @@ -3243,6 +3301,10 @@ bool TController::UpdateSituation(double dt) // ABu-160305 testowanie gotowości do jazdy // Ra: przeniesione z DynObj, skład użytkownika też jest testowany, żeby mu przekazać, że ma // odhamować + int index = double(BrakeAccTableSize) * (mvOccupied->Vel / mvOccupied->Vmax); + index = std::min(BrakeAccTableSize, std::max(1, index)); + fBrake_a0[0] = fBrake_a0[index]; + fBrake_a1[0] = fBrake_a1[index]; Ready = true; // wstępnie gotowy fReady = 0.0; // założenie, że odhamowany fAccGravity = 0.0; // przyspieszenie wynikające z pochylenia @@ -4226,8 +4288,18 @@ bool TController::UpdateSituation(double dt) if (mvOccupied->V == 0.0) AbsAccS = fAccGravity; // Ra 2014-03: jesli skład stoi, to działa na niego // składowa styczna grawitacji - else - AbsAccS = iDirection * mvOccupied->AccS; // przyspieszenie chwilowe, liczone + else + { + AbsAccS = 0; + TDynamicObject *d = pVehicles[0]; // pojazd na czele składu + while (d) + { + AbsAccS += d->MoverParameters->TotalMass * d->MoverParameters->AccS * iDirection; + d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) + } + AbsAccS /= fMass; + //AbsAccS = iDirection * mvOccupied->AccS; // przyspieszenie chwilowe, liczone + } // jako różnica skierowanej prędkości w // czasie // if (mvOccupied->V<0.0) AbsAccS=-AbsAccS; //Ra 2014-03: to trzeba przemyśleć @@ -4333,9 +4405,9 @@ bool TController::UpdateSituation(double dt) // krytycznym przedziale } } - else // przy dużej różnicy wysoki stopień (1,25 potrzebnego opoznienia) + else // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) AccDesired = (VelNext * VelNext - vel * vel) / - (20.73 * ActualProximityDist + + (25.92 * ActualProximityDist + 0.1); // najpierw hamuje mocniej, potem zluzuje if (AccPreferred < AccDesired) AccDesired = AccPreferred; //(1+abs(AccDesired)) @@ -4389,17 +4461,20 @@ bool TController::UpdateSituation(double dt) else AccDesired = fAccThreshold; // hamuj tak średnio // koniec predkosci aktualnej - if (fAccThreshold > -0.3) // bez sensu, ale dla towarowych korzystnie - { // Ra 2014-03: to nie uwzględnia odległości i zaczyna hamować, jak tylko zobaczy - // W4 - if ((AccDesired > 0.0) && - (VelNext >= 0.0)) // wybieg bądź lekkie hamowanie, warunki byly zamienione - if (vel > VelNext + 100.0) // lepiej zaczac hamowac - AccDesired = fAccThreshold; - else if (vel > VelNext + 70.0) - AccDesired = 0.0; // nie spiesz się, bo będzie hamowanie - // koniec wybiegu i hamowania - } +#ifdef DEBUGFAC + if (fAccThreshold > -0.3) // bez sensu, ale dla towarowych korzystnie + { // Ra 2014-03: to nie uwzględnia odległości i zaczyna hamować, jak tylko zobaczy + // W4 + if ((AccDesired > 0.0) && + (VelNext >= 0.0)) // wybieg bądź lekkie hamowanie, warunki byly zamienione + if (vel > VelNext + 100.0) // lepiej zaczac hamowac + AccDesired = fAccThreshold; + else if (vel > VelNext + 70.0) + AccDesired = 0.0; // nie spiesz się, bo będzie hamowanie + // koniec wybiegu i hamowania + } +#endif // DEBUGFAC + if (AIControllFlag) { // część wykonawcza tylko dla AI, dla człowieka jedynie napisy if (mvControlling->ConvOvldFlag || @@ -4434,6 +4509,8 @@ bool TController::UpdateSituation(double dt) SetDriverPsyche(); } } + if (-AccDesired * BrakeAccFactor() < (fReady > 0.4 ? fBrake_a0[0] : -fAccThreshold)) + AccDesired = std::max(-0.01, AccDesired); if (mvOccupied->BrakeSystem == Pneumatic) // napełnianie uderzeniowe if (mvOccupied->BrakeHandle == FV4a) { @@ -4464,12 +4541,12 @@ bool TController::UpdateSituation(double dt) } // if // ((mvOccupied->BrakeCtrlPos<0)&&(mvOccupied->BrakePress<0.3))//{(CntrlPipePress-(Volume/BrakeVVolume/10)<0.01)}) - if ((mvOccupied->BrakeCtrlPos < 0) && - (mvOccupied->EqvtPipePress > - (fReady < 0.25 ? - 5.1 : - 5.2))) //{(CntrlPipePress-(Volume/BrakeVVolume/10)<0.01)}) - mvOccupied->IncBrakeLevel(); + if ((mvOccupied->BrakeCtrlPos < 0) && + (mvOccupied->EqvtPipePress > + (fReady < 0.25 ? + 5.1 : + 5.2))) //{(CntrlPipePress-(Volume/BrakeVVolume/10)<0.01)}) + mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_RP)); } #if LOGVELOCITY WriteLog("Dist=" + FloatToStrF(ActualProximityDist, ffFixed, 7, 1) + @@ -4503,9 +4580,11 @@ bool TController::UpdateSituation(double dt) { while (DecBrake()) ; // jeśli przyspieszamy, to nie hamujemy - if (mvOccupied->BrakePress > 0.4) - mvOccupied->BrakeReleaser( - 1); // wyluzuj lokomotywę, to szybciej ruszymy + if ((mvOccupied->BrakePress > 0.4) && (mvOccupied->Hamulec->GetCRP() > 4.9)) + mvOccupied->BrakeReleaser( + 1); // wyluzuj lokomotywę, to szybciej ruszymy + else + mvOccupied->BrakeReleaser(0); } // margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest // większa od 5km/h @@ -4585,7 +4664,7 @@ bool TController::UpdateSituation(double dt) if (((fAccGravity < -0.05) && (vel < 0)) || ((AccDesired < fAccGravity - 0.1) && (AbsAccS > - AccDesired + 0.05))) // u góry ustawia się hamowanie na fAccThreshold + AccDesired + fBrake_a1[0]))) // u góry ustawia się hamowanie na fAccThreshold // if not MinVelFlag) if (fBrakeTime < 0 ? true : (AccDesired < fAccGravity - 0.3) || (mvOccupied->BrakeCtrlPos <= 0)) @@ -4605,7 +4684,7 @@ bool TController::UpdateSituation(double dt) // zatrzymania jest mniejszy fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } - if ((AccDesired < fAccGravity - 0.05) && (AbsAccS < AccDesired - 0.2)) + if ((AccDesired < fAccGravity - 0.05) && (AbsAccS < AccDesired - fBrake_a1[0])) // if ((AccDesired<0.0)&&(AbsAccSDecMainCtrl(1); if (mvOccupied->BrakeCtrlPos == mvOccupied->BrakeCtrlPosNo) // jeśli ostatnia pozycja hamowania + //yB: ten warunek wyżej nie ma sensu mvOccupied->DecBrakeLevel(); // to cofnij hamulec else mvControlling->AntiSlippingButton(); @@ -4679,11 +4759,13 @@ bool TController::UpdateSituation(double dt) } if (AIControllFlag) { // odhamowywanie składu po zatrzymaniu i zabezpieczanie lokomotywy - if ((OrderList[OrderPos] & (Disconnect | Connect)) == - 0) // przy (p)odłączaniu nie zwalniamy tu hamulca - if ((mvOccupied->V == 0.0) && ((VelDesired == 0.0) || (AccDesired == 0.0))) - if ((mvOccupied->BrakeCtrlPos < 1) || !mvOccupied->DecBrakeLevel()) - mvOccupied->IncLocalBrakeLevel(1); // dodatkowy na pozycję 1 + if ((OrderList[OrderPos] & (Disconnect | Connect)) == + 0) // przy (p)odłączaniu nie zwalniamy tu hamulca + if ((mvOccupied->V == 0.0) && ((VelDesired == 0.0) || (AccDesired == 0.0))) + if (mvOccupied->BrakeCtrlPos == mvOccupied->Handle->GetPos(bh_RP)) + mvOccupied->IncLocalBrakeLevel(1); // dodatkowy na pozycję 1 + else + mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_RP)); } break; // rzeczy robione przy jezdzie } // switch (OrderList[OrderPos]) diff --git a/Driver.h b/Driver.h index 512e1d23..8866194b 100644 --- a/Driver.h +++ b/Driver.h @@ -162,6 +162,7 @@ static const bool Humandriver = false; static const int maxorders = 32; // ilość rozkazów w tabelce static const int maxdriverfails = 4; // ile błędów może zrobić AI zanim zmieni nastawienie extern bool WriteLogFlag; // logowanie parametrów fizycznych +static const int BrakeAccTableSize = 20; //---------------------------------------------------------------------------- class TController @@ -197,7 +198,12 @@ class TController double fDriverDist = 0.0; // dopuszczalna odległość podjechania do przeszkody double fVelMax = -1.0; // maksymalna prędkość składu (sprawdzany każdy pojazd) double fBrakeDist = 0.0; // przybliżona droga hamowania + public: + double BrakeAccFactor(); + double fBrakeReaction = 1.0; //opóźnienie zadziałania hamulca - czas w s / (km/h) double fAccThreshold = 0.0; // próg opóźnienia dla zadziałania hamulca + double fBrake_a0[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca + double fBrake_a1[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca public: double fLastStopExpDist = -1.0; // odległość wygasania ostateniego przystanku double ReactionTime = 0.0; // czas reakcji Ra: czego i na co? świadomości AI diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index a21608ba..19e14c7d 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1109,6 +1109,8 @@ public: double Adhesive(double staticfriction); double TractionForce(double dt); double FrictionForce(double R, int TDamage); + double BrakeForceR(double ratio, double velocity); + double BrakeForceP(double press, double velocity); double BrakeForce(const TTrackParam &Track); double CouplerForce(int CouplerN, double dt); void CollisionDetect(int CouplerN, double dt); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b32c1e07..3d9f6416 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3766,6 +3766,39 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) //}; } +double TMoverParameters::BrakeForceR(double ratio, double velocity) +{ + double press = 0; + if (MBPM>2) + { + press = MaxBrakePress[1] + (MaxBrakePress[3] - MaxBrakePress[1]) * std::min(1.0, (TotalMass - Mass) / (MBPM - Mass)); + } + else + { + if (MaxBrakePress[1] > 0.1) + { + press = MaxBrakePress[LoadFlag]; + } + else + { + press = MaxBrakePress[3]; + if (DynamicBrakeType == dbrake_automatic) + ratio = ratio + (1.5 - ratio)*std::min(1.0, Vel*0.02); + } + + } + return BrakeForceP(press*ratio, velocity); +} + +double TMoverParameters::BrakeForceP(double press, double velocity) +{ + double BFP = 0; + double K = (((press * P2FTrans) - BrakeCylSpring) * BrakeCylMult[0] - BrakeSlckAdj) * BrakeRigEff; + K *= static_cast(BrakeCylNo) / (NAxles * std::max(1, NBpA)); + BFP = Hamulec->GetFC(velocity, K)*K*(NAxles * std::max(1, NBpA)) * 1000; + return BFP; +} + // ************************************************************************************************* // Q: 20160713 // oblicza siłę na styku koła i szyny @@ -3863,6 +3896,9 @@ double TMoverParameters::FrictionForce(double R, int TDamage) return FF; } + + + // ************************************************************************************************* // Q: 20160713 // Oblicza przyczepność diff --git a/World.cpp b/World.cpp index 198f4ed6..a7379ed0 100644 --- a/World.cpp +++ b/World.cpp @@ -1544,6 +1544,9 @@ TWorld::Update_UI() { uitextline4 += "Driver: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) + " ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) + + " ah=" + to_string(tmp->Mechanik->fAccThreshold, 2) + + "@" + to_string(tmp->Mechanik->fBrake_a0[0], 2) + + "+" + to_string(tmp->Mechanik->fBrake_a1[0], 2) + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ) + " VSm=" + to_string( tmp->Mechanik->VelSignalLast, 0 ) diff --git a/maszyna.vcxproj.user b/maszyna.vcxproj.user index 8c698752..7c32daec 100644 --- a/maszyna.vcxproj.user +++ b/maszyna.vcxproj.user @@ -1,7 +1,7 @@  - ..\..\..\development\maszyna + D:\MaSzyna WindowsLocalDebugger From c8a70e528053e3bbd600e1e1b096286bb4dd0b16 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 1 Aug 2017 03:15:19 +0200 Subject: [PATCH 151/426] build 170731. cascade shadow maps stub, support for additional debug camera --- Camera.cpp | 8 +- Globals.cpp | 3 +- Globals.h | 1 + McZapkie/mctools.cpp | 1 + McZapkie/mctools.h | 1 + World.cpp | 57 ++++----- World.h | 1 + frustum.cpp | 10 +- frustum.h | 12 +- renderer.cpp | 282 ++++++++++++++++++++----------------------- renderer.h | 34 +++--- usefull.h | 15 +++ version.h | 2 +- 13 files changed, 213 insertions(+), 214 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index 6d3a3adb..0c7c21ca 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -352,7 +352,8 @@ void TCamera::Update() } */ if( ( Type == tp_Free ) - || ( false == Global::ctrlState ) ) { + || ( false == Global::ctrlState ) + || ( true == DebugCameraFlag) ) { // ctrl is used for mirror view, so we ignore the controls when in vehicle if ctrl is pressed if( m_keys.up ) Velocity.y = clamp( Velocity.y + m_moverate.y * 10.0 * deltatime, -m_moverate.y, m_moverate.y ); @@ -371,7 +372,8 @@ void TCamera::Update() } #endif - if( Type == tp_Free ) { + if( ( Type == tp_Free ) + || ( true == DebugCameraFlag ) ) { // free movement position update is handled here, movement while in vehicle is handled by train update vector3 Vec = Velocity; Vec.RotateY( Yaw ); @@ -390,7 +392,7 @@ bool TCamera::SetMatrix( glm::dmat4 &Matrix ) { Matrix = glm::rotate( Matrix, -Pitch, glm::dvec3( 1.0, 0.0, 0.0 ) ); Matrix = glm::rotate( Matrix, -Yaw, glm::dvec3( 0.0, 1.0, 0.0 ) ); // w zewnętrznym widoku: kierunek patrzenia - if( Type == tp_Follow ) { + if( ( Type == tp_Follow ) && ( false == DebugCameraFlag ) ) { Matrix *= glm::lookAt( glm::dvec3{ Pos }, diff --git a/Globals.cpp b/Globals.cpp index 7aa9094f..80b4fa98 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -71,6 +71,7 @@ float4 Global::UITextColor = float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 2 // parametry scenerii vector3 Global::pCameraPosition; +vector3 Global::DebugCameraPosition; double Global::pCameraRotation; double Global::pCameraRotationDeg; std::vector Global::FreeCameraInit; @@ -86,7 +87,7 @@ opengl_light Global::DayLight; int Global::DynamicLightCount { 3 }; bool Global::ScaleSpecularValues { true }; bool Global::RenderShadows { false }; -Global::shadowtune_t Global::shadowtune = { 2048, 250.f, 1250.f, 100.f }; +Global::shadowtune_t Global::shadowtune = { 2048, 250.f, 250.f, 500.f }; bool Global::bRollFix = true; // czy wykonać przeliczanie przechyłki bool Global::bJoinEvents = false; // czy grupować eventy o tych samych nazwach int Global::iHiddenEvents = 1; // czy łączyć eventy z torami poprzez nazwę toru diff --git a/Globals.h b/Globals.h index 485a8a2f..376a45a0 100644 --- a/Globals.h +++ b/Globals.h @@ -170,6 +170,7 @@ class Global static int Keys[MaxKeys]; static bool RealisticControlMode; // controls ability to steer the vehicle from outside views static Math3D::vector3 pCameraPosition; // pozycja kamery w świecie + static Math3D::vector3 DebugCameraPosition; // pozycja kamery w świecie static double pCameraRotation; // kierunek bezwzględny kamery w świecie: 0=północ, 90°=zachód (-azymut) static double pCameraRotationDeg; // w stopniach, dla animacji billboard diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index 33744897..01a92684 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -19,6 +19,7 @@ Copyright (C) 2007-2014 Maciej Cierniak bool DebugModeFlag = false; bool FreeFlyModeFlag = false; +bool DebugCameraFlag = false; double Max0R(double x1, double x2) { diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index 55a65447..3611dcf2 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. extern bool DebugModeFlag; extern bool FreeFlyModeFlag; +extern bool DebugCameraFlag; /*funkcje matematyczne*/ double Max0R(double x1, double x2); diff --git a/World.cpp b/World.cpp index c4c1d5fa..a82dc753 100644 --- a/World.cpp +++ b/World.cpp @@ -288,24 +288,16 @@ bool TWorld::Init( GLFWwindow *Window ) { "ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others\n" ); UILayer.set_background( "logo" ); -/* - std::shared_ptr initpanel = std::make_shared(85, 600); -*/ + TSoundsManager::Init( glfwGetWin32Window( window ) ); WriteLog("Sound Init OK"); TModelsManager::Init(); WriteLog("Models init OK"); -/* - initpanel->text_lines.emplace_back( "Loading scenery / Wczytywanie scenerii:", float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); - initpanel->text_lines.emplace_back( Global::SceneryFile.substr(0, 40), float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); - UILayer.push_back( initpanel ); -*/ + glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii UILayer.set_progress(0.01); UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" ); - GfxRenderer.Render(); - WriteLog( "Ground init" ); if( true == Ground.Init( Global::SceneryFile ) ) { WriteLog( "Ground init OK" ); @@ -315,13 +307,8 @@ bool TWorld::Init( GLFWwindow *Window ) { Environment.init(); Camera.Init(Global::FreeCameraInit[0], Global::FreeCameraInitAngle[0]); -/* - initpanel->text_lines.clear(); - initpanel->text_lines.emplace_back( "Preparing train / Przygotowanie kabiny:", float4( 0.0f, 0.0f, 0.0f, 1.0f ) ); -*/ + UILayer.set_progress( "Preparing train / Przygotowanie kabiny" ); - GfxRenderer.Render(); - WriteLog( "Player train init: " + Global::asHumanCtrlVehicle ); TGroundNode *nPlayerTrain = NULL; @@ -631,12 +618,18 @@ void TWorld::OnKeyDown(int cKey) break; } case GLFW_KEY_F8: { - Global::iTextMode = cKey; + if( Global::ctrlState + && Global::shiftState ) { + DebugCameraFlag = !DebugCameraFlag; // taka opcjonalna funkcja, może się czasem przydać + } + else { + Global::iTextMode = cKey; + } break; } case GLFW_KEY_F9: { Global::iTextMode = cKey; - // wersja, typ wyświetlania, błędy OpenGL + // wersja break; } case GLFW_KEY_F10: { @@ -1074,8 +1067,9 @@ bool TWorld::Update() } // fixed step part of the camera update - if( (Train != nullptr) - && (Camera.Type == tp_Follow )) { + if( ( Train != nullptr ) + && ( Camera.Type == tp_Follow ) + && ( false == DebugCameraFlag ) ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery Train->UpdateMechPosition( m_secondaryupdaterate ); } @@ -1112,11 +1106,16 @@ bool TWorld::Update() while( fTime50Hz >= 1.0 / 50.0 ) { Console::Update(); // to i tak trzeba wywoływać Update_UI(); - + // decelerate camera Camera.Velocity *= 0.65; if( std::abs( Camera.Velocity.x ) < 0.01 ) { Camera.Velocity.x = 0.0; } if( std::abs( Camera.Velocity.y ) < 0.01 ) { Camera.Velocity.y = 0.0; } if( std::abs( Camera.Velocity.z ) < 0.01 ) { Camera.Velocity.z = 0.0; } + // decelerate debug camera too + DebugCamera.Velocity *= 0.65; + if( std::abs( DebugCamera.Velocity.x ) < 0.01 ) { DebugCamera.Velocity.x = 0.0; } + if( std::abs( DebugCamera.Velocity.y ) < 0.01 ) { DebugCamera.Velocity.y = 0.0; } + if( std::abs( DebugCamera.Velocity.z ) < 0.01 ) { DebugCamera.Velocity.z = 0.0; } fTime50Hz -= 1.0 / 50.0; } @@ -1177,10 +1176,12 @@ TWorld::Update_Camera( double const Deltatime ) { } } - Camera.Update(); // uwzględnienie ruchu wywołanego klawiszami + if( DebugCameraFlag ) { DebugCamera.Update(); } + else { Camera.Update(); } // uwzględnienie ruchu wywołanego klawiszami - if( (Train != nullptr) - && (Camera.Type == tp_Follow )) { + if( ( Train != nullptr ) + && ( Camera.Type == tp_Follow ) + && ( false == DebugCameraFlag ) ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery vector3 tempangle = Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); double modelrotate = atan2( -tempangle.x, tempangle.z ); @@ -1243,7 +1244,8 @@ TWorld::Update_Camera( double const Deltatime ) { Global::SetCameraRotation( Camera.Yaw - M_PI ); } // all done, update camera position to the new value - Global::SetCameraPosition( Camera.Pos ); + Global::pCameraPosition = Camera.Pos; + Global::DebugCameraPosition = DebugCamera.Pos; } void TWorld::Update_Environment() { @@ -1597,8 +1599,9 @@ TWorld::Update_UI() { uitextline1 = "FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ) + ", Draw range x " + to_string( Global::fDistanceFactor, 1 ) - + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) - + ", FPS: " + to_string( Timer::GetFPS(), 2 ); +// + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) +// + ", FPS: " + to_string( Timer::GetFPS(), 2 ); + + ", FPS: " + std::to_string( static_cast(std::round(GfxRenderer.Framerate())) ); if( Global::iSlowMotion ) { uitextline1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; } diff --git a/World.h b/World.h index a7a26fea..54517e7c 100644 --- a/World.h +++ b/World.h @@ -118,6 +118,7 @@ private: void ResourceSweep(); TCamera Camera; + TCamera DebugCamera; TGround Ground; world_environment Environment; TTrain *Train; diff --git a/frustum.cpp b/frustum.cpp index c2420c89..f1b3eba1 100644 --- a/frustum.cpp +++ b/frustum.cpp @@ -10,10 +10,6 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "frustum.h" -std::vector ndcfrustumshapepoints = { - { -1, -1, -1, 1 }, { 1, -1, -1, 1 }, { 1, 1, -1, 1 }, { -1, 1, -1, 1 }, // z-near - { -1, -1, 1, 1 }, { 1, -1, 1, 1 }, { 1, 1, 1, 1 }, { -1, 1, 1, 1 } }; // z-far - void cFrustum::calculate() { @@ -26,8 +22,8 @@ cFrustum::calculate() { void cFrustum::calculate( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { - float const *proj = &Projection[ 0 ][ 0 ]; - float const *modl = &Modelview[ 0 ][ 0 ]; + float const *proj = glm::value_ptr( Projection ); + float const *modl = glm::value_ptr( Modelview ); float clip[ 16 ]; // multiply the matrices to retrieve clipping planes @@ -88,7 +84,7 @@ cFrustum::calculate( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { m_frustum[ side_FRONT ][ plane_D ] = clip[ 15 ] + clip[ 14 ]; normalize_plane( side_FRONT ); - m_inversetransformation = glm::inverse( Projection * Modelview ); + m_inversetransformation = glm::inverse( Projection * glm::mat4{ glm::mat3{ Modelview } } ); // calculate frustum corners m_frustumpoints = ndcfrustumshapepoints; diff --git a/frustum.h b/frustum.h index 4333e25a..cd59dd85 100644 --- a/frustum.h +++ b/frustum.h @@ -12,6 +12,10 @@ http://mozilla.org/MPL/2.0/. #include "float3d.h" #include "dumb3d.h" +std::vector const ndcfrustumshapepoints = { + { -1, -1, -1, 1 },{ 1, -1, -1, 1 },{ 1, 1, -1, 1 },{ -1, 1, -1, 1 }, // z-near + { -1, -1, 1, 1 },{ 1, -1, 1, 1 },{ 1, 1, 1, 1 },{ -1, 1, 1, 1 } }; // z-far + // generic frustum class. used to determine if objects are inside current view area class cFrustum { @@ -64,7 +68,7 @@ public: // transforms provided set of clip space points to world space template void - transform_to_world( Iterator_ First, Iterator_ Last ) { + transform_to_world( Iterator_ First, Iterator_ Last ) const { std::for_each( First, Last, [this]( glm::vec4 &point ) { @@ -76,7 +80,10 @@ public: void draw( glm::vec3 const &Offset ) const; -protected: +// members: + std::vector m_frustumpoints; // coordinates of corners for defined frustum, in world space + +private: // types: // planes of the frustum enum side { side_RIGHT = 0, side_LEFT = 1, side_BOTTOM = 2, side_TOP = 3, side_BACK = 4, side_FRONT = 5 }; @@ -90,5 +97,4 @@ protected: // members: float m_frustum[6][4]; // holds the A B C and D values (normal & distance) for each side of the frustum. glm::mat4 m_inversetransformation; // cached inverse transformation matrix - std::vector m_frustumpoints; // coordinates of corners for defined frustum, in world space }; diff --git a/renderer.cpp b/renderer.cpp index ee935681..bdcd5dee 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -25,8 +25,6 @@ http://mozilla.org/MPL/2.0/. opengl_renderer GfxRenderer; extern TWorld World; -//#define EU07_USE_ORTHO_SHADOWS - int const EU07_PICKBUFFERSIZE { 1024 }; // size of (square) textures bound with the pick framebuffer namespace colors { @@ -212,6 +210,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_shadowdebugtexture, 0 ); #else ::glDrawBuffer( GL_NONE ); // we won't be rendering colour data, so can skip the colour attachment + ::glReadBuffer( GL_NONE ); #endif ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_shadowtexture, 0 ); // check if we got it working @@ -248,15 +247,21 @@ opengl_renderer::Init( GLFWwindow *Window ) { bool opengl_renderer::Render() { - auto const drawstart = std::chrono::steady_clock::now(); + if( m_drawstart != std::chrono::steady_clock::time_point() ) { + m_drawtime = std::max( 20.f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - m_drawstart ) ).count() / 1000.f ); + } + m_drawstart = std::chrono::steady_clock::now(); + auto const drawstartcolor = m_drawstart; m_renderpass.draw_mode = rendermode::none; // force setup anew Render_pass( rendermode::color ); - glfwSwapBuffers( m_window ); m_drawcount = m_drawqueue.size(); // accumulate last 20 frames worth of render time (cap at 1000 fps to prevent calculations going awry) - m_drawtime = std::max( 20.f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - drawstart ) ).count() ); + m_drawtimecolor = std::max( 20.f, 0.95f * m_drawtimecolor + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - drawstartcolor ) ).count() / 1000.f ); + m_debuginfo += " frame total: " + to_string( m_drawtimecolor / 20.f, 2 ) + " msec (" + std::to_string( m_drawqueue.size() ) + " sectors)"; + + glfwSwapBuffers( m_window ); return true; // for now always succeed } @@ -265,12 +270,12 @@ opengl_renderer::Render() { void opengl_renderer::Render_pass( rendermode const Mode ) { - m_renderpass.setup( Mode ); + m_renderpass.setup( Mode, m_framebuffersupport ); switch( m_renderpass.draw_mode ) { case rendermode::color: { - opengl_camera shadowcamera; + opengl_camera shadowcamera; // temporary helper, remove once ortho shadowmap code is done if( Global::RenderShadows && World.InitPerformed() ) { // run shadowmap pass before color Render_pass( rendermode::shadows ); @@ -279,7 +284,20 @@ opengl_renderer::Render_pass( rendermode const Mode ) { #endif shadowcamera = m_renderpass.camera; // cache shadow camera placement for visualization - m_renderpass.setup( rendermode::color ); // restore draw mode. TBD, TODO: render mode stack + m_renderpass.setup( rendermode::color, m_framebuffersupport ); // restore draw mode. TBD, TODO: render mode stack +#ifdef EU07_USE_DEBUG_CAMERA + m_worldcamera.setup( + rendermode::color, + m_framebuffersupport, + 0.f, + std::min( + 1.f, + Global::shadowtune.depth / ( Global::BaseDrawRange * Global::fDistanceFactor ) + * std::max( + 1.f, + Global::ZoomFactor * 0.5f ) ), + true ); +#endif // setup shadowmap matrix m_shadowtexturematrix = //bias from [-1, 1] to [0, 1] }; @@ -312,19 +330,23 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // opaque parts... setup_drawing( false ); setup_units( true, true, true ); - +#ifdef EU07_USE_DEBUG_CAMERA if( DebugModeFlag ) { // draw light frustum ::glLineWidth( 2.f ); ::glColor4f( 1.f, 0.9f, 0.8f, 1.f ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_TEXTURE_2D ); - shadowcamera.frustum().draw( m_renderpass.camera.position() ); + shadowcamera.frustum().draw( m_renderpass.camera.position() - shadowcamera.position() ); + if( DebugCameraFlag ) { + ::glColor4f( 0.8f, 1.f, 0.9f, 1.f ); + m_worldcamera.camera.frustum().draw( m_renderpass.camera.position() - m_worldcamera.camera.position() ); + } ::glLineWidth( 1.f ); ::glEnable( GL_LIGHTING ); ::glEnable( GL_TEXTURE_2D ); } - +#endif Render( &World.Ground ); // ...translucent parts setup_drawing( true ); @@ -342,6 +364,8 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( World.InitPerformed() ) { // setup + auto const shadowdrawstart = std::chrono::steady_clock::now(); + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); ::glViewport( 0, 0, m_shadowbuffersize, m_shadowbuffersize ); @@ -363,18 +387,6 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_drawing( false ); #ifdef EU07_USE_DEBUG_SHADOWMAP setup_units( true, false, false ); - - if( DebugModeFlag ) { - // draw camera frustum - ::glLineWidth( 2.f ); - ::glColor4f( 1.f, 0.9f, 0.8f, 1.f ); - ::glDisable( GL_LIGHTING ); - ::glDisable( GL_TEXTURE_2D ); - worldcamera.frustum().draw( m_renderpass.camera.position() ); - ::glLineWidth( 1.f ); - ::glEnable( GL_LIGHTING ); - ::glEnable( GL_TEXTURE_2D ); - } #else setup_units( false, false, false ); #endif @@ -384,6 +396,9 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glDisable( GL_SCISSOR_TEST ); ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target + + m_drawtimeshadows = 0.95f * m_drawtimeshadows + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - shadowdrawstart ) ).count() / 1000.f; + m_debuginfo = "shadows: " + to_string( m_drawtimeshadows / 20.f, 2 ) + " msec (" + std::to_string( m_drawqueue.size() ) + " sectors)"; } break; } @@ -438,7 +453,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } void -opengl_renderer::renderpass_config::setup( rendermode const Mode ) { +opengl_renderer::renderpass_config::setup( rendermode const Mode, bool const Framebuffersupport, float const Znear, float const Zfar, bool const Ignoredebug ) { draw_mode = Mode; @@ -446,159 +461,121 @@ opengl_renderer::renderpass_config::setup( rendermode const Mode ) { switch( draw_mode ) { case rendermode::color: { draw_range = Global::BaseDrawRange; break; } - case rendermode::shadows: { draw_range = Global::shadowtune.depth; break; } + case rendermode::shadows: { draw_range = Global::BaseDrawRange * 0.5f; break; } case rendermode::pickcontrols: { draw_range = 50.f; break; } case rendermode::pickscenery: { draw_range = Global::BaseDrawRange * 0.5f; break; } default: { draw_range = 0.f; break; } } - setup_projection(); - setup_modelview(); -} - -// configures projection matrix for the current render pass -void -opengl_renderer::renderpass_config::setup_projection() { - camera.projection() = glm::mat4( 1.f ); + glm::dmat4 viewmatrix( 1.0 ); switch( draw_mode ) { - -#ifndef EU07_USE_PICKING_FRAMEBUFFER - case rendermode::pickcontrols: - case rendermode::pickscenery: -#endif case rendermode::color: { - setup_projection_world(); - break; - } -#ifdef EU07_USE_PICKING_FRAMEBUFFER - case rendermode::pickcontrols: - case rendermode::pickscenery: { - // TODO: scissor test for pick modes - auto const angle = Global::FieldOfView / Global::ZoomFactor; - auto const height = std::max( 1.0f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ); + // projection + auto const zfar = draw_range * Global::fDistanceFactor * Zfar; + auto const znear = ( + Znear > 0.f ? + Znear * zfar : + 0.1f * Global::ZoomFactor ); camera.projection() *= glm::perspective( glm::radians( Global::FieldOfView / Global::ZoomFactor ), - std::max( 1.0f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ), - 0.1f * Global::ZoomFactor, - draw_range * Global::fDistanceFactor ); + std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), + znear, + zfar ); + // modelview + if( ( false == DebugCameraFlag ) || ( true == Ignoredebug ) ) { + camera.position() = Global::pCameraPosition; + World.Camera.SetMatrix( viewmatrix ); + } + else { + camera.position() = Global::DebugCameraPosition; + World.DebugCamera.SetMatrix( viewmatrix ); + } break; } -#endif + case rendermode::shadows: { -#ifdef EU07_USE_ORTHO_SHADOWS - setup_projection_light_ortho(); -#else - setup_projection_light_perspective(); -#endif + // calculate lightview boundaries based on relevant area of the world camera frustum: + // setup chunk of frustum we're interested in... + auto const znear = 0.f; + auto const zfar = std::min( 1.f, Global::shadowtune.depth / ( Global::BaseDrawRange * Global::fDistanceFactor ) * std::max( 1.f, Global::ZoomFactor * 0.5f ) ); + renderpass_config worldview; + worldview.setup( rendermode::color, Framebuffersupport, znear, zfar, true ); + // ...transform frustum shape to camera-centric world space... + auto frustumchunkshapepoints = ndcfrustumshapepoints; + worldview.camera.frustum().transform_to_world( std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); + // ...determine the centre of frustum chunk in world space... + glm::vec3 frustumchunkmin, frustumchunkmax; + bounding_box( frustumchunkmin, frustumchunkmax, std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); + auto const frustumchunkcentre = ( frustumchunkmin + frustumchunkmax ) * 0.5f; + auto const lighttarget = worldview.camera.position() + glm::dvec3{ frustumchunkcentre }; + + auto const lightvector = + glm::normalize( glm::vec3{ + -Global::DayLight.direction.x, + std::max( -Global::DayLight.direction.y, 0.15f ), + -Global::DayLight.direction.z } ); + // ...place the light source at the calculated centre... + camera.position() = lighttarget;// -glm::dvec3{ lightvector }; + // ...setup world space light view matrix... + viewmatrix *= glm::lookAt( + camera.position(), + camera.position() - glm::dvec3{ lightvector }, + glm::dvec3{ 0.f, 1.f, 0.f } ); + // ...calculate boundaries of the frustum chunk in light space... + auto const lightviewmatrix = + glm::translate( + glm::mat4{ glm::mat3{ viewmatrix } }, + -frustumchunkcentre ); + for( auto &point : frustumchunkshapepoints ) { + point = lightviewmatrix * point; + } + bounding_box( frustumchunkmin, frustumchunkmax, std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); + // ...use the dimensions to set up light projection boundaries + // NOTE: since we only have one cascade map stage, we extend the chunk forward/back to catch areas normally covered by other stages + camera.projection() *= + glm::ortho( + frustumchunkmin.x, frustumchunkmax.x, + frustumchunkmin.y, frustumchunkmax.y, + frustumchunkmin.z - 500.f, frustumchunkmax.z + 500.f ); break; } - default: { - break; - } - } -} - -void -opengl_renderer::renderpass_config::setup_projection_world() { - - camera.projection() *= - glm::perspective( - glm::radians( Global::FieldOfView / Global::ZoomFactor ), - std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), - 0.1f * Global::ZoomFactor, - draw_range * Global::fDistanceFactor ); -} - -void -opengl_renderer::renderpass_config::setup_projection_light_ortho() { - // TODO: calculate lightview boundaries based on area of the world camera frustum - camera.projection() *= - glm::ortho( - -Global::shadowtune.width, Global::shadowtune.width, - -Global::shadowtune.width, Global::shadowtune.width, - -Global::shadowtune.depth, Global::shadowtune.depth ); -} - -void -opengl_renderer::renderpass_config::setup_projection_light_perspective() { - - camera.projection() *= - glm::perspective( - glm::radians( 45.f ), - 1.f, - draw_range * 0.1f, // light source is pulled back far enough we won't likely have anything too close to it, can get some z-range here - draw_range * Global::fDistanceFactor ); -} - -// configures modelview matrix for the current render pass -void -opengl_renderer::renderpass_config::setup_modelview() { - - camera.modelview() = glm::mat4( 1.f ); - - glm::dmat4 viewmatrix; - - switch( draw_mode ) { - case rendermode::color: case rendermode::pickcontrols: case rendermode::pickscenery: { - setup_modelview_world( viewmatrix ); - break; - } - case rendermode::shadows: { -#ifdef EU07_USE_ORTHO_SHADOWS - setup_modelview_light_ortho( viewmatrix ); -#else - setup_modelview_light_perspective( viewmatrix ); -#endif + // TODO: scissor test for pick modes + // projection + if( true == Framebuffersupport ) { + auto const angle = Global::FieldOfView / Global::ZoomFactor; + auto const height = std::max( 1.0f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ); + camera.projection() *= + glm::perspective( + glm::radians( Global::FieldOfView / Global::ZoomFactor ), + std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ), + 0.1f * Global::ZoomFactor, + draw_range * Global::fDistanceFactor ); + } + else { + camera.projection() *= + glm::perspective( + glm::radians( Global::FieldOfView / Global::ZoomFactor ), + std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), + 0.1f * Global::ZoomFactor, + draw_range * Global::fDistanceFactor ); + } + // modelview + camera.position() = Global::pCameraPosition; + World.Camera.SetMatrix( viewmatrix ); break; } default: { - break; } + break; + } } -#ifdef EU07_USE_ORTHO_SHADOWS - m_renderpass.camera.update_frustum( OpenGLMatrices.data( GL_PROJECTION ), viewmatrix ); - // frustum tests are performed in 'world space' but after we set up frustum we no longer need camera translation, only rotation - ::glMultMatrixd( glm::value_ptr( glm::dmat4( glm::dmat3( viewmatrix ) ) ) ); -#else camera.modelview() = viewmatrix; camera.update_frustum(); -#endif -} - -void -opengl_renderer::renderpass_config::setup_modelview_world( glm::dmat4 &Viewmatrix ) { - - camera.position() = Global::pCameraPosition; - World.Camera.SetMatrix( Viewmatrix ); -} - -void -opengl_renderer::renderpass_config::setup_modelview_light_ortho( glm::dmat4 &Viewmatrix ) { - - camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction }; - if( camera.position().y - Global::pCameraPosition.y < 0.1 ) { - camera.position().y = Global::pCameraPosition.y + 0.1; - } - Viewmatrix *= glm::lookAt( - camera.position(), - glm::dvec3{ Global::pCameraPosition }, - glm::dvec3{ 0.f, 1.f, 0.f } ); -} - -void -opengl_renderer::renderpass_config::setup_modelview_light_perspective( glm::dmat4 &Viewmatrix ) { - - camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction * draw_range * 0.5f }; - camera.position().y = std::max( draw_range * 0.5f * 0.1f, camera.position().y ); // prevent shadow source from dipping too low - Viewmatrix *= glm::lookAt( - camera.position(), - glm::dvec3{ Global::pCameraPosition }, - glm::dvec3{ 0.f, 1.f, 0.f } ); } void @@ -2648,9 +2625,10 @@ opengl_renderer::Update( double const Deltatime ) { } m_updateaccumulator = 0.0; + m_framerate = 1000.f / ( m_drawtime / 20.f ); // adjust draw ranges etc, based on recent performance - auto const framerate = 1000.0f / (m_drawtime / 20.0f); + auto const framerate = 1000.0f / (m_drawtimecolor / 20.0f); float targetfactor; if( framerate > 90.0 ) { targetfactor = 3.0f; } diff --git a/renderer.h b/renderer.h index 81a85d19..001cf9b5 100644 --- a/renderer.h +++ b/renderer.h @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. #define EU07_USE_PICKING_FRAMEBUFFER //#define EU07_USE_DEBUG_SHADOWMAP +//#define EU07_USE_DEBUG_CAMERA struct opengl_light { @@ -139,6 +140,9 @@ public: // main draw call. returns false on error bool Render(); + inline + float + Framerate() { return m_framerate; } // geometry methods // NOTE: hands-on geometry management is exposed as a temporary measure; ultimately all visualization data should be generated/handled automatically by the renderer itself // creates a new geometry bank. returns: handle to the bank or NULL @@ -199,31 +203,13 @@ private: typedef std::pair< double, TSubRect * > distancesubcell_pair; struct renderpass_config { + opengl_camera camera; rendermode draw_mode { rendermode::none }; float draw_range { 0.0f }; void - setup( rendermode const Mode ); - private: - // configures projection matrix for the current render pass - void - setup_projection(); - void - setup_projection_world(); - void - setup_projection_light_ortho(); - void - setup_projection_light_perspective(); - // configures camera for the current render pass - void - setup_modelview(); - void - setup_modelview_world( glm::dmat4 &Viewmatrix ); - void - setup_modelview_light_ortho( glm::dmat4 &Viewmatrix ); - void - setup_modelview_light_perspective( glm::dmat4 &Viewmatrix ); + setup( rendermode const Mode, bool const Framebuffersupport, float const Znear = 0.f, float const Zfar = 1.f, bool const Ignoredebug = false ); }; typedef std::vector opengllight_array; @@ -288,6 +274,7 @@ private: pick_color( std::size_t const Index ); std::size_t pick_index( glm::ivec3 const &Color ); + // members GLFWwindow *m_window { nullptr }; geometrybank_manager m_geometry; @@ -320,6 +307,10 @@ private: int m_diffusetextureunit { GL_TEXTURE2 }; float m_drawtime { 1000.f / 30.f * 20.f }; // start with presumed 'neutral' average of 30 fps + std::chrono::steady_clock::time_point m_drawstart; // cached start time of previous frame + float m_framerate; + float m_drawtimecolor { 1000.f / 30.f * 20.f }; + float m_drawtimeshadows { 0.f }; double m_updateaccumulator { 0.0 }; std::string m_debuginfo; @@ -336,6 +327,9 @@ private: std::vector m_pickcontrolsitems; TSubModel const *m_pickcontrolitem { nullptr }; TGroundNode const *m_picksceneryitem { nullptr }; +#ifdef EU07_USE_DEBUG_CAMERA + renderpass_config m_worldcamera; // debug item +#endif }; extern opengl_renderer GfxRenderer; diff --git a/usefull.h b/usefull.h index 91c27795..1e38c215 100644 --- a/usefull.h +++ b/usefull.h @@ -80,4 +80,19 @@ degenerate( VecType_ const &Vertex1, VecType_ const &Vertex2, VecType_ const &Ve return ( glm::length2( glm::cross( Vertex2 - Vertex1, Vertex3 - Vertex1 ) ) == 0.0 ); } +// calculates bounding box for provided set of points +template +void +bounding_box( VecType_ &Mincorner, VecType_ &Maxcorner, Iterator_ First, Iterator_ Last ) { + + Mincorner = VecType_( typename std::numeric_limits::max() ); + Maxcorner = VecType_( typename std::numeric_limits::min() ); + + std::for_each( + First, Last, + [&]( typename Iterator_::value_type &point ) { + Mincorner = glm::min( Mincorner, VecType_{ point } ); + Maxcorner = glm::max( Maxcorner, VecType_{ point } ); } ); +} + //--------------------------------------------------------------------------- diff --git a/version.h b/version.h index 5060e104..68f79535 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 727 +#define VERSION_MINOR 731 #define VERSION_REVISION 0 From 238ea7547d22259145827c926197f0614f182a3f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 3 Aug 2017 16:00:48 +0200 Subject: [PATCH 152/426] minor refactoring, shadows colour influenced by sun/moon positions --- Ground.cpp | 12 ---- World.cpp | 9 +-- frustum.cpp | 21 ------ frustum.h | 22 +----- lightarray.cpp | 8 +-- lightarray.h | 4 +- renderer.cpp | 187 +++++++++++++++++++++++++++++++------------------ renderer.h | 36 +++++++--- sun.cpp | 13 ++-- 9 files changed, 162 insertions(+), 150 deletions(-) diff --git a/Ground.cpp b/Ground.cpp index efe1721f..6025fbee 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -3493,18 +3493,6 @@ void TGround::Update_Lights() { m_lights.update(); - // arrange the light array from closest to farthest from current position of the camera - auto const camera = Global::pCameraPosition; - std::sort( - m_lights.data.begin(), - m_lights.data.end(), - [&]( light_array::light_record const &Left, light_array::light_record const &Right ) { - // move lights which are off at the end... - if( Left.intensity == 0.0f ) { return false; } - if( Right.intensity == 0.0f ) { return true; } - // ...otherwise prefer closer and/or brigher light sources - return ((camera - Left.position).LengthSquared() * (1.0f - Left.intensity)) < ((camera - Right.position).LengthSquared() * (1.0f - Right.intensity)); - } ); } // Winger 170204 - szukanie trakcji nad pantografami diff --git a/World.cpp b/World.cpp index a82dc753..922135c2 100644 --- a/World.cpp +++ b/World.cpp @@ -2220,10 +2220,12 @@ world_environment::update() { m_sun.update(); m_moon.update(); // ...determine source of key light and adjust global state accordingly... - auto const sunlightlevel = m_sun.getIntensity(); + // diffuse (sun) intensity goes down after twilight, and reaches minimum 18 degrees below horizon + float twilightfactor = clamp( -m_sun.getAngle(), 0.0f, 18.0f ) / 18.0f; + // NOTE: sun light receives extra padding to prevent moon from kicking in too soon + auto const sunlightlevel = m_sun.getIntensity() + 0.05f * ( 1.f - twilightfactor ); auto const moonlightlevel = m_moon.getIntensity() * 0.65f; // scaled down by arbitrary factor, it's pretty bright otherwise float keylightintensity; - float twilightfactor; glm::vec3 keylightcolor; if( moonlightlevel > sunlightlevel ) { // rare situations when the moon is brighter than the sun, typically at night @@ -2241,8 +2243,7 @@ world_environment::update() { Global::DayLight.set_position( m_sun.getPosition() ); Global::DayLight.direction = -1.0f * m_sun.getDirection(); keylightintensity = sunlightlevel; - // diffuse (sun) intensity goes down after twilight, and reaches minimum 18 degrees below horizon - twilightfactor = clamp( -Global::SunAngle, 0.0f, 18.0f ) / 18.0f; + // include 'golden hour' effect in twilight lighting float const duskfactor = 1.0f - clamp( Global::SunAngle, 0.0f, 18.0f ) / 18.0f; keylightcolor = interpolate( glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), diff --git a/frustum.cpp b/frustum.cpp index f1b3eba1..a92f395f 100644 --- a/frustum.cpp +++ b/frustum.cpp @@ -83,14 +83,6 @@ cFrustum::calculate( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { m_frustum[ side_FRONT ][ plane_C ] = clip[ 11 ] + clip[ 10 ]; m_frustum[ side_FRONT ][ plane_D ] = clip[ 15 ] + clip[ 14 ]; normalize_plane( side_FRONT ); - - m_inversetransformation = glm::inverse( Projection * glm::mat4{ glm::mat3{ Modelview } } ); - - // calculate frustum corners - m_frustumpoints = ndcfrustumshapepoints; - transform_to_world( - std::begin( m_frustumpoints ), - std::end( m_frustumpoints ) ); } bool @@ -177,19 +169,6 @@ cFrustum::cube_inside( float const X, float const Y, float const Z, float const return true; } -std::vector const frustumshapepoinstorder{ 0, 1, 1, 2, 2, 3, 3, 0, 4, 5, 5, 6, 6, 7, 7, 4, 0, 4, 1, 5, 2, 6, 3, 7 }; - -// debug helper, draws shape of frustum in world space -void -cFrustum::draw( glm::vec3 const &Offset ) const { - - ::glBegin( GL_LINES ); - for( auto const pointindex : frustumshapepoinstorder ) { - ::glVertex3fv( glm::value_ptr( glm::vec3{ m_frustumpoints[ pointindex ] } - Offset ) ); - } - ::glEnd(); -} - void cFrustum::normalize_plane( cFrustum::side const Side ) { float magnitude = diff --git a/frustum.h b/frustum.h index cd59dd85..2029a412 100644 --- a/frustum.h +++ b/frustum.h @@ -12,10 +12,12 @@ http://mozilla.org/MPL/2.0/. #include "float3d.h" #include "dumb3d.h" -std::vector const ndcfrustumshapepoints = { +std::vector const ndcfrustumshapepoints { { -1, -1, -1, 1 },{ 1, -1, -1, 1 },{ 1, 1, -1, 1 },{ -1, 1, -1, 1 }, // z-near { -1, -1, 1, 1 },{ 1, -1, 1, 1 },{ 1, 1, 1, 1 },{ -1, 1, 1, 1 } }; // z-far +std::vector const frustumshapepoinstorder { 0, 1, 1, 2, 2, 3, 3, 0, 4, 5, 5, 6, 6, 7, 7, 4, 0, 4, 1, 5, 2, 6, 3, 7 }; + // generic frustum class. used to determine if objects are inside current view area class cFrustum { @@ -65,23 +67,6 @@ public: cube_inside( Math3D::vector3 const &Center, float const Size ) const { return cube_inside( static_cast( Center.x ), static_cast( Center.y ), static_cast( Center.z ), Size ); } bool cube_inside( float const X, float const Y, float const Z, float const Size ) const; - // transforms provided set of clip space points to world space - template - void - transform_to_world( Iterator_ First, Iterator_ Last ) const { - std::for_each( - First, Last, - [this]( glm::vec4 &point ) { - // transform each point using the cached matrix... - point = this->m_inversetransformation * point; - // ...and scale by transformed w - point = glm::vec4{ glm::vec3{ point } / point.w, 1.f }; } ); } - // debug helper, draws shape of frustum in world space - void - draw( glm::vec3 const &Offset ) const; - -// members: - std::vector m_frustumpoints; // coordinates of corners for defined frustum, in world space private: // types: @@ -96,5 +81,4 @@ private: // members: float m_frustum[6][4]; // holds the A B C and D values (normal & distance) for each side of the frustum. - glm::mat4 m_inversetransformation; // cached inverse transformation matrix }; diff --git a/lightarray.cpp b/lightarray.cpp index 8a0412a3..f0486b7f 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -60,10 +60,10 @@ light_array::update() { if( ( true == light.owner->MoverParameters->Battery ) || ( true == light.owner->MoverParameters->ConverterFlag ) ) { // with power on, the intensity depends on the state of activated switches auto const &lightbits = light.owner->iLights[ light.index ]; - light.count = 0 + - ( ( lightbits & 1 ) ? 1 : 0 ) + - ( ( lightbits & 4 ) ? 1 : 0 ) + - ( ( lightbits & 16 ) ? 1 : 0 ); + light.count = 0 + + ( ( lightbits & TMoverParameters::light::headlight_left ) ? 1 : 0 ) + + ( ( lightbits & TMoverParameters::light::headlight_right ) ? 1 : 0 ) + + ( ( lightbits & TMoverParameters::light::headlight_upper ) ? 1 : 0 ); if( light.count > 0 ) { // TODO: intensity can be affected further by dim switch or other factors diff --git a/lightarray.h b/lightarray.h index 91e45ef0..ff7b694e 100644 --- a/lightarray.h +++ b/lightarray.h @@ -19,9 +19,9 @@ public: TDynamicObject const *owner; // the object in world which 'carries' the light int index{ -1 }; // 0: front lights, 1: rear lights - Math3D::vector3 position; // position of the light in 3d scene + glm::dvec3 position; // position of the light in 3d scene glm::vec3 direction; // direction of the light in 3d scene - float3 color{ 255.0f / 255.0f, 241.0f / 255.0f, 224.0f / 255.0f }; // color of the light, default is halogen light + glm::vec3 color{ 255.0f / 255.0f, 241.0f / 255.0f, 224.0f / 255.0f }; // color of the light, default is halogen light float intensity{ 0.0f }; // (combined) intensity of the light(s) int count{ 0 }; // number (or pattern) of active light(s) }; diff --git a/renderer.cpp b/renderer.cpp index bdcd5dee..f78f2c52 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -34,6 +34,20 @@ glm::vec4 const white{ 1.f, 1.f, 1.f, 1.f }; } // namespace colors +void +opengl_camera::update_frustum( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { + + m_frustum.calculate( Projection, Modelview ); + // cache inverse tranformation matrix + // NOTE: transformation is done only to camera-centric space + m_inversetransformation = glm::inverse( Projection * glm::mat4{ glm::mat3{ Modelview } } ); + // calculate frustum corners + m_frustumpoints = ndcfrustumshapepoints; + transform_to_world( + std::begin( m_frustumpoints ), + std::end( m_frustumpoints ) ); +} + // returns true if specified object is within camera frustum, false otherwise bool opengl_camera::visible( bounding_area const &Area ) const { @@ -55,6 +69,17 @@ opengl_camera::visible( TDynamicObject const *Dynamic ) const { return ( m_frustum.sphere_inside( Dynamic->GetPosition(), radius ) > 0.0f ); } +// debug helper, draws shape of frustum in world space +void +opengl_camera::draw( glm::vec3 const &Offset ) const { + + ::glBegin( GL_LINES ); + for( auto const pointindex : frustumshapepoinstorder ) { + ::glVertex3fv( glm::value_ptr( glm::vec3{ m_frustumpoints[ pointindex ] } - Offset ) ); + } + ::glEnd(); +} + bool opengl_renderer::Init( GLFWwindow *Window ) { @@ -251,15 +276,16 @@ opengl_renderer::Render() { m_drawtime = std::max( 20.f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - m_drawstart ) ).count() / 1000.f ); } m_drawstart = std::chrono::steady_clock::now(); - auto const drawstartcolor = m_drawstart; + auto const drawstartcolorpass = m_drawstart; m_renderpass.draw_mode = rendermode::none; // force setup anew + m_debuginfo.clear(); Render_pass( rendermode::color ); m_drawcount = m_drawqueue.size(); // accumulate last 20 frames worth of render time (cap at 1000 fps to prevent calculations going awry) - m_drawtimecolor = std::max( 20.f, 0.95f * m_drawtimecolor + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - drawstartcolor ) ).count() / 1000.f ); - m_debuginfo += " frame total: " + to_string( m_drawtimecolor / 20.f, 2 ) + " msec (" + std::to_string( m_drawqueue.size() ) + " sectors)"; + m_drawtimecolorpass = std::max( 20.f, 0.95f * m_drawtimecolorpass + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - drawstartcolorpass ) ).count() / 1000.f ); + m_debuginfo += "frame total: " + to_string( m_drawtimecolorpass / 20.f, 2 ) + " msec (" + std::to_string( m_drawqueue.size() ) + " sectors) "; glfwSwapBuffers( m_window ); @@ -270,25 +296,26 @@ opengl_renderer::Render() { void opengl_renderer::Render_pass( rendermode const Mode ) { - m_renderpass.setup( Mode, m_framebuffersupport ); + setup_pass( m_renderpass, Mode ); switch( m_renderpass.draw_mode ) { case rendermode::color: { opengl_camera shadowcamera; // temporary helper, remove once ortho shadowmap code is done - if( Global::RenderShadows && World.InitPerformed() ) { + if( ( true == Global::RenderShadows ) + && ( true == World.InitPerformed() ) + && ( m_shadowcolor != colors::white ) ) { // run shadowmap pass before color Render_pass( rendermode::shadows ); #ifdef EU07_USE_DEBUG_SHADOWMAP UILayer.set_texture( m_shadowdebugtexture ); #endif shadowcamera = m_renderpass.camera; // cache shadow camera placement for visualization - - m_renderpass.setup( rendermode::color, m_framebuffersupport ); // restore draw mode. TBD, TODO: render mode stack + setup_pass( m_renderpass, Mode ); // restore draw mode. TBD, TODO: render mode stack #ifdef EU07_USE_DEBUG_CAMERA - m_worldcamera.setup( + setup_pass( + m_worldcamera, rendermode::color, - m_framebuffersupport, 0.f, std::min( 1.f, @@ -337,10 +364,10 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glColor4f( 1.f, 0.9f, 0.8f, 1.f ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_TEXTURE_2D ); - shadowcamera.frustum().draw( m_renderpass.camera.position() - shadowcamera.position() ); + shadowcamera.draw( m_renderpass.camera.position() - shadowcamera.position() ); if( DebugCameraFlag ) { ::glColor4f( 0.8f, 1.f, 0.9f, 1.f ); - m_worldcamera.camera.frustum().draw( m_renderpass.camera.position() - m_worldcamera.camera.position() ); + m_worldcamera.camera.draw( m_renderpass.camera.position() - m_worldcamera.camera.position() ); } ::glLineWidth( 1.f ); ::glEnable( GL_LIGHTING ); @@ -397,8 +424,8 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target - m_drawtimeshadows = 0.95f * m_drawtimeshadows + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - shadowdrawstart ) ).count() / 1000.f; - m_debuginfo = "shadows: " + to_string( m_drawtimeshadows / 20.f, 2 ) + " msec (" + std::to_string( m_drawqueue.size() ) + " sectors)"; + m_drawtimeshadowpass = 0.95f * m_drawtimeshadowpass + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - shadowdrawstart ) ).count() / 1000.f; + m_debuginfo += "shadows: " + to_string( m_drawtimeshadowpass / 20.f, 2 ) + " msec (" + std::to_string( m_drawqueue.size() ) + " sectors) "; } break; } @@ -453,27 +480,29 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } void -opengl_renderer::renderpass_config::setup( rendermode const Mode, bool const Framebuffersupport, float const Znear, float const Zfar, bool const Ignoredebug ) { +opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, float const Znear, float const Zfar, bool const Ignoredebug ) { - draw_mode = Mode; + Config.draw_mode = Mode; if( false == World.InitPerformed() ) { return; } - - switch( draw_mode ) { - case rendermode::color: { draw_range = Global::BaseDrawRange; break; } - case rendermode::shadows: { draw_range = Global::BaseDrawRange * 0.5f; break; } - case rendermode::pickcontrols: { draw_range = 50.f; break; } - case rendermode::pickscenery: { draw_range = Global::BaseDrawRange * 0.5f; break; } - default: { draw_range = 0.f; break; } + // setup draw range + switch( Mode ) { + case rendermode::color: { Config.draw_range = Global::BaseDrawRange; break; } + case rendermode::shadows: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } + case rendermode::pickcontrols: { Config.draw_range = 50.f; break; } + case rendermode::pickscenery: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } + default: { Config.draw_range = 0.f; break; } } + // setup camera + auto &camera = Config.camera; camera.projection() = glm::mat4( 1.f ); glm::dmat4 viewmatrix( 1.0 ); - switch( draw_mode ) { + switch( Mode ) { case rendermode::color: { // projection - auto const zfar = draw_range * Global::fDistanceFactor * Zfar; + auto const zfar = Config.draw_range * Global::fDistanceFactor * Zfar; auto const znear = ( Znear > 0.f ? Znear * zfar : @@ -498,33 +527,29 @@ opengl_renderer::renderpass_config::setup( rendermode const Mode, bool const Fra case rendermode::shadows: { // calculate lightview boundaries based on relevant area of the world camera frustum: - // setup chunk of frustum we're interested in... + // ...setup chunk of frustum we're interested in... auto const znear = 0.f; auto const zfar = std::min( 1.f, Global::shadowtune.depth / ( Global::BaseDrawRange * Global::fDistanceFactor ) * std::max( 1.f, Global::ZoomFactor * 0.5f ) ); renderpass_config worldview; - worldview.setup( rendermode::color, Framebuffersupport, znear, zfar, true ); - // ...transform frustum shape to camera-centric world space... - auto frustumchunkshapepoints = ndcfrustumshapepoints; - worldview.camera.frustum().transform_to_world( std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); - // ...determine the centre of frustum chunk in world space... + setup_pass( worldview, rendermode::color, znear, zfar, true ); + auto &frustumchunkshapepoints = worldview.camera.frustum_points(); + // ...modelview matrix: determine the centre of frustum chunk in world space... glm::vec3 frustumchunkmin, frustumchunkmax; bounding_box( frustumchunkmin, frustumchunkmax, std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); auto const frustumchunkcentre = ( frustumchunkmin + frustumchunkmax ) * 0.5f; - auto const lighttarget = worldview.camera.position() + glm::dvec3{ frustumchunkcentre }; - + // ...cap the vertical angle to keep shadows from getting too long... auto const lightvector = glm::normalize( glm::vec3{ - -Global::DayLight.direction.x, - std::max( -Global::DayLight.direction.y, 0.15f ), - -Global::DayLight.direction.z } ); - // ...place the light source at the calculated centre... - camera.position() = lighttarget;// -glm::dvec3{ lightvector }; - // ...setup world space light view matrix... + Global::DayLight.direction.x, + std::min( Global::DayLight.direction.y, -0.15f ), + Global::DayLight.direction.z } ); + // ...place the light source at the calculated centre and setup world space light view matrix... + camera.position() = worldview.camera.position() + glm::dvec3{ frustumchunkcentre }; viewmatrix *= glm::lookAt( camera.position(), - camera.position() - glm::dvec3{ lightvector }, + camera.position() + glm::dvec3{ lightvector }, glm::dvec3{ 0.f, 1.f, 0.f } ); - // ...calculate boundaries of the frustum chunk in light space... + // ...projection matrix: calculate boundaries of the frustum chunk in light space... auto const lightviewmatrix = glm::translate( glm::mat4{ glm::mat3{ viewmatrix } }, @@ -547,7 +572,7 @@ opengl_renderer::renderpass_config::setup( rendermode const Mode, bool const Fra case rendermode::pickscenery: { // TODO: scissor test for pick modes // projection - if( true == Framebuffersupport ) { + if( true == m_framebuffersupport ) { auto const angle = Global::FieldOfView / Global::ZoomFactor; auto const height = std::max( 1.0f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ); camera.projection() *= @@ -555,7 +580,7 @@ opengl_renderer::renderpass_config::setup( rendermode const Mode, bool const Fra glm::radians( Global::FieldOfView / Global::ZoomFactor ), std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ), 0.1f * Global::ZoomFactor, - draw_range * Global::fDistanceFactor ); + Config.draw_range * Global::fDistanceFactor ); } else { camera.projection() *= @@ -563,7 +588,7 @@ opengl_renderer::renderpass_config::setup( rendermode const Mode, bool const Fra glm::radians( Global::FieldOfView / Global::ZoomFactor ), std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), 0.1f * Global::ZoomFactor, - draw_range * Global::fDistanceFactor ); + Config.draw_range * Global::fDistanceFactor ); } // modelview camera.position() = Global::pCameraPosition; @@ -681,7 +706,9 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const // shadow texture unit. // interpolates between primary colour and the previous unit, which should hold darkened variant of the primary colour if( m_shadowtextureunit >= 0 ) { - if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + if( ( true == Global::RenderShadows ) + && ( true == Shadows ) + && ( m_shadowcolor != colors::white ) ) { ::glActiveTexture( m_shadowtextureunit ); ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); @@ -756,7 +783,9 @@ void opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { // helper texture unit. if( m_helpertextureunit >= 0 ) { - if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + if( ( true == Global::RenderShadows ) + && ( true == Shadows ) + && ( m_shadowcolor != colors::white ) ) { ::glActiveTexture( m_helpertextureunit ); ::glEnable( GL_TEXTURE_2D ); } @@ -804,6 +833,17 @@ opengl_renderer::setup_shadow_color( glm::vec4 const &Shadowcolor ) { bool opengl_renderer::Render( world_environment *Environment ) { + // calculate shadow tone, based on positions of celestial bodies + m_shadowcolor = interpolate( + glm::vec4{ 0.5f, 0.5f, 0.5f, 1.f }, + glm::vec4{ colors::white }, + clamp( -Environment->m_sun.getAngle(), 0.f, 6.f ) / 6.f ); + if( ( Environment->m_sun.getAngle() < -18.f ) + && ( Environment->m_moon.getAngle() > 0.f ) ) { + // turn on moon shadows after nautical twilight, if the moon is actually up + m_shadowcolor = glm::vec4{ 0.5f, 0.5f, 0.5f, 1.f }; + } + if( Global::bWireFrame ) { // bez nieba w trybie rysowania linii return false; @@ -888,7 +928,10 @@ opengl_renderer::Render( world_environment *Environment ) { ::glLoadIdentity(); // macierz jedynkowa ::glTranslatef( moonposition.x, moonposition.y, moonposition.z ); - float const size = 0.02f; // TODO: expose distance/scale factor from the moon object + float const size = interpolate( // TODO: expose distance/scale factor from the moon object + 0.0175f, + 0.015f, + clamp( Environment->m_moon.getAngle(), 0.f, 90.f ) / 90.f ); // choose the moon appearance variant, based on current moon phase // NOTE: implementation specific, 8 variants are laid out in 3x3 arrangement // from new moon onwards, top left to right bottom (last spot is left for future use, if any) @@ -2628,7 +2671,7 @@ opengl_renderer::Update( double const Deltatime ) { m_framerate = 1000.f / ( m_drawtime / 20.f ); // adjust draw ranges etc, based on recent performance - auto const framerate = 1000.0f / (m_drawtimecolor / 20.0f); + auto const framerate = 1000.0f / (m_drawtimecolorpass / 20.0f); float targetfactor; if( framerate > 90.0 ) { targetfactor = 3.0f; } @@ -2697,7 +2740,18 @@ opengl_renderer::Info() const { } void -opengl_renderer::Update_Lights( light_array const &Lights ) { +opengl_renderer::Update_Lights( light_array &Lights ) { + // arrange the light array from closest to farthest from current position of the camera + auto const camera = m_renderpass.camera.position(); + std::sort( + std::begin( Lights.data ), + std::end( Lights.data ), + [&camera]( light_array::light_record const &Left, light_array::light_record const &Right ) { + // move lights which are off at the end... + if( Left.intensity == 0.f ) { return false; } + if( Right.intensity == 0.f ) { return true; } + // ...otherwise prefer closer and/or brigher light sources + return ( glm::length2( camera - Left.position ) * ( 1.f - Left.intensity ) ) < ( glm::length2( camera - Right.position ) * ( 1.f - Right.intensity ) ); } ); size_t const count = std::min( m_lights.size(), Lights.data.size() ); if( count == 0 ) { return; } @@ -2710,40 +2764,35 @@ opengl_renderer::Update_Lights( light_array const &Lights ) { // we ran out of lights to assign break; } - if( scenelight.intensity == 0.0f ) { + if( scenelight.intensity == 0.f ) { // all lights past this one are bound to be off break; } - if( ( m_renderpass.camera.position() - scenelight.position ).Length() > 1000.0f ) { + auto const lightoffset = glm::vec3{ scenelight.position - camera }; + if( glm::length( lightoffset ) > 1000.f ) { // we don't care about lights past arbitrary limit of 1 km. // but there could still be weaker lights which are closer, so keep looking continue; } // if the light passed tests so far, it's good enough - renderlight->set_position( glm::make_vec3( (scenelight.position - m_renderpass.camera.position()).readArray() ) ); + renderlight->set_position( lightoffset ); renderlight->direction = scenelight.direction; - auto luminance = Global::fLuminance; // TODO: adjust this based on location, e.g. for tunnels + auto luminance = static_cast( Global::fLuminance ); + // adjust luminance level based on vehicle's location, e.g. tunnels auto const environment = scenelight.owner->fShade; - if( environment > 0.0f ) { + if( environment > 0.f ) { luminance *= environment; } - renderlight->diffuse[ 0 ] = static_cast( std::max( 0.0, scenelight.color.x - luminance ) ); - renderlight->diffuse[ 1 ] = static_cast( std::max( 0.0, scenelight.color.y - luminance ) ); - renderlight->diffuse[ 2 ] = static_cast( std::max( 0.0, scenelight.color.z - luminance ) ); - renderlight->ambient[ 0 ] = static_cast( std::max( 0.0, scenelight.color.x * scenelight.intensity - luminance) ); - renderlight->ambient[ 1 ] = static_cast( std::max( 0.0, scenelight.color.y * scenelight.intensity - luminance ) ); - renderlight->ambient[ 2 ] = static_cast( std::max( 0.0, scenelight.color.z * scenelight.intensity - luminance ) ); -/* - // NOTE: we have no simple way to determine whether the lights are falling on objects located in darker environment - // until this issue is resolved we're disabling reduction of light strenght based on the global luminance - renderlight->diffuse[ 0 ] = std::max( 0.0f, scenelight.color.x ); - renderlight->diffuse[ 1 ] = std::max( 0.0f, scenelight.color.y ); - renderlight->diffuse[ 2 ] = std::max( 0.0f, scenelight.color.z ); - renderlight->ambient[ 0 ] = std::max( 0.0f, scenelight.color.x * scenelight.intensity ); - renderlight->ambient[ 1 ] = std::max( 0.0f, scenelight.color.y * scenelight.intensity ); - renderlight->ambient[ 2 ] = std::max( 0.0f, scenelight.color.z * scenelight.intensity ); -*/ + renderlight->diffuse = + glm::vec4{ + glm::max( glm::vec3{ colors::none }, scenelight.color - glm::vec3{ luminance } ), + renderlight->diffuse[ 3 ] }; + renderlight->ambient = + glm::vec4{ + glm::max( glm::vec3{ colors::none }, scenelight.color * glm::vec3{ scenelight.intensity } - glm::vec3{ luminance } ), + renderlight->ambient[ 3 ] }; + ::glLightf( renderlight->id, GL_LINEAR_ATTENUATION, static_cast( (0.25 * scenelight.count) / std::pow( scenelight.count, 2 ) * (scenelight.owner->DimHeadlights ? 1.25 : 1.0) ) ); ::glEnable( renderlight->id ); diff --git a/renderer.h b/renderer.h index 001cf9b5..30e5dcad 100644 --- a/renderer.h +++ b/renderer.h @@ -87,10 +87,9 @@ public: // methods: inline void - update_frustum() { m_frustum.calculate( m_projection, m_modelview ); } - inline + update_frustum() { update_frustum( m_projection, m_modelview ); } void - update_frustum(glm::mat4 const &Projection, glm::mat4 const &Modelview) { m_frustum.calculate(Projection, Modelview); } + update_frustum( glm::mat4 const &Projection, glm::mat4 const &Modelview ); bool visible( bounding_area const &Area ) const; bool @@ -114,15 +113,31 @@ public: glm::mat4 & modelview() { return m_modelview; } inline - cFrustum const & - frustum() { return m_frustum; } + std::vector & + frustum_points() { return m_frustumpoints; } + // transforms provided set of clip space points to world space + template + void + transform_to_world( Iterator_ First, Iterator_ Last ) const { + std::for_each( + First, Last, + [this]( glm::vec4 &point ) { + // transform each point using the cached matrix... + point = this->m_inversetransformation * point; + // ...and scale by transformed w + point = glm::vec4{ glm::vec3{ point } / point.w, 1.f }; } ); } + // debug helper, draws shape of frustum in world space + void + draw( glm::vec3 const &Offset ) const; private: // members: cFrustum m_frustum; + std::vector m_frustumpoints; // visualization helper; corners of defined frustum, in world space glm::dvec3 m_position; glm::mat4 m_projection; glm::mat4 m_modelview; + glm::mat4 m_inversetransformation; // cached transformation to world space }; // bare-bones render controller, in lack of anything better yet @@ -207,9 +222,6 @@ private: opengl_camera camera; rendermode draw_mode { rendermode::none }; float draw_range { 0.0f }; - - void - setup( rendermode const Mode, bool const Framebuffersupport, float const Znear = 0.f, float const Zfar = 1.f, bool const Ignoredebug = false ); }; typedef std::vector opengllight_array; @@ -220,6 +232,8 @@ private: // runs jobs needed to generate graphics for specified render pass void Render_pass( rendermode const Mode ); + void + setup_pass( renderpass_config &Config, rendermode const Mode, float const Znear = 0.f, float const Zfar = 1.f, bool const Ignoredebug = false ); void setup_matrices(); void @@ -269,7 +283,7 @@ private: void Render_Alpha( TSubModel *Submodel ); void - Update_Lights( light_array const &Lights ); + Update_Lights( light_array &Lights ); glm::vec3 pick_color( std::size_t const Index ); std::size_t @@ -309,8 +323,8 @@ private: float m_drawtime { 1000.f / 30.f * 20.f }; // start with presumed 'neutral' average of 30 fps std::chrono::steady_clock::time_point m_drawstart; // cached start time of previous frame float m_framerate; - float m_drawtimecolor { 1000.f / 30.f * 20.f }; - float m_drawtimeshadows { 0.f }; + float m_drawtimecolorpass { 1000.f / 30.f * 20.f }; + float m_drawtimeshadowpass { 0.f }; double m_updateaccumulator { 0.0 }; std::string m_debuginfo; diff --git a/sun.cpp b/sun.cpp index dc65d471..ed08aa2b 100644 --- a/sun.cpp +++ b/sun.cpp @@ -251,21 +251,18 @@ void cSun::refract() { void cSun::irradiance() { - static double degrad = 57.295779513; // converts from radians to degrees - static double raddeg = 0.0174532925; // converts from degrees to radians - m_body.dayang = ( simulation::Time.year_day() - 1 ) * 360.0 / 365.0; - double sd = sin( raddeg * m_body.dayang ); // sine of the day angle - double cd = cos( raddeg * m_body.dayang ); // cosine of the day angle or delination + double sd = std::sin( glm::radians( m_body.dayang ) ); // sine of the day angle + double cd = std::cos( glm::radians( m_body.dayang ) ); // cosine of the day angle or delination m_body.erv = 1.000110 + 0.034221*cd + 0.001280*sd; double d2 = 2.0 * m_body.dayang; - double c2 = cos( raddeg * d2 ); - double s2 = sin( raddeg * d2 ); + double c2 = std::cos( glm::radians( d2 ) ); + double s2 = std::sin( glm::radians( d2 ) ); m_body.erv += 0.000719*c2 + 0.000077*s2; double solcon = 1367.0; // Solar constant, 1367 W/sq m - m_body.coszen = cos( raddeg * m_body.zenref ); + m_body.coszen = std::cos( glm::radians( m_body.zenref ) ); if( m_body.coszen > 0.0 ) { m_body.etrn = solcon * m_body.erv; m_body.etr = m_body.etrn * m_body.coszen; From 9cd20971f577160aa40abb2b5c152f8d08284d21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Thu, 3 Aug 2017 22:55:46 +0200 Subject: [PATCH 153/426] =?UTF-8?q?Korekta=20progu=20dzia=C5=82ania,=20wyl?= =?UTF-8?q?iczanie=20op=C3=B3=C5=BAnienia=20hamowania=20z=20uwzgl=C4=99dni?= =?UTF-8?q?eniem=20wcze=C5=9Bniejszego=20luzowania,=20dodanie=20poprawki?= =?UTF-8?q?=20wymaganej=20pozycji=20zaworu=20maszynisty=20(si=C5=82y=20ham?= =?UTF-8?q?owania)=20w=20zale=C5=BCno=C5=9Bci=20od=20wyczerpania=20i=20prz?= =?UTF-8?q?e=C5=82adowania=20hamulc=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Driver.cpp | 69 ++++++++++++++++++++++++++++++-------------- Driver.h | 1 + McZapkie/Mover.cpp | 4 ++- McZapkie/hamulce.cpp | 5 ++++ McZapkie/hamulce.h | 2 +- World.cpp | 6 +++- 6 files changed, 62 insertions(+), 25 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 7e3fa07c..58ea8e4d 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1680,13 +1680,13 @@ void TController::AutoRewident() d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } //teraz zerujemy tabelkę opóźnienia hamowania + double velstep = (mvOccupied->Vmax*0.5) / BrakeAccTableSize; for (int i = 0; i < BrakeAccTableSize; i++) { fBrake_a0[i+1] = 0; fBrake_a1[i+1] = 0; } d = pVehicles[0]; // pojazd na czele składu - float velstep = (mvOccupied->Vmax*0.5) / BrakeAccTableSize; while (d) { // 4. Przeliczanie siły hamowania for (int i = 0; i < BrakeAccTableSize; i++) @@ -1700,21 +1700,22 @@ void TController::AutoRewident() { fBrake_a1[i+1] -= fBrake_a0[i+1]; fBrake_a0[i+1] /= fMass; + fBrake_a0[i + 1] += 0.001*velstep*(1 + 2 * i); fBrake_a1[i+1] /= (12*fMass); } if (mvOccupied->TrainType == dt_EZT) { - fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 10 * fBrake_a1[BrakeAccTableSize]; + fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 8 * fBrake_a1[BrakeAccTableSize]; fBrakeReaction = 0.25; } else if (ustaw > 16) { - fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 6 * fBrake_a1[BrakeAccTableSize]; - fBrakeReaction = 0.5; + fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 4 * fBrake_a1[BrakeAccTableSize]; + fBrakeReaction = 0.75+fLength*0.001; } else { - fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 2 * fBrake_a1[BrakeAccTableSize]; + fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 1 * fBrake_a1[BrakeAccTableSize]; fBrakeReaction = 2.0; } }; @@ -1991,7 +1992,8 @@ bool TController::SetProximityVelocity(double NewDist,double NewVelNext) double TController::BrakeAccFactor() { - double Factor = 1 + fBrakeReaction*mvOccupied->Vel / (std::max(0.0, ActualProximityDist) + 1); +// double Factor = 1 + fBrakeReaction*mvOccupied->Vel / (std::max(0.0, ActualProximityDist) + 1); + double Factor = 1 + fBrakeReaction*mvOccupied->Vel / (std::max(0.0, ActualProximityDist) + 1) * ((AccDesired-AbsAccS_pub)/fAccThreshold); return Factor; } @@ -2345,13 +2347,34 @@ bool TController::IncBrake() } else { // dodane dla towarowego - double deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4 * (mvOccupied->BrakeCtrlPosR - 1)*fBrake_a1[0]); + float pos_corr = 0; - if( deltaAcc > 0) + TDynamicObject *d; + d = pVehicles[0]; // pojazd na czele składu + while (d) + { // przeliczanie dodatkowego potrzebnego spadku ciśnienia + pos_corr+=(d->MoverParameters->Hamulec->GetCRP() - 5.0)*d->MoverParameters->TotalMass; + d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) + } + pos_corr = pos_corr / fMass * 2.5; + + if (mvOccupied->BrakeHandle == FV4a) { - OK = mvOccupied->BrakeLevelAdd(mvOccupied->BrakeCtrlPosR>0?0.25:1.0); - if ((deltaAcc > 5 * fBrake_a1[0])&&(mvOccupied->BrakeCtrlPosR<=3.0)) - mvOccupied->BrakeLevelAdd(1.0); + pos_corr += mvOccupied->Handle->GetCP()*0.2; + + } + double deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4.0 * (mvOccupied->BrakeCtrlPosR - 1 - pos_corr)*fBrake_a1[0]); + + if( deltaAcc > fBrake_a1[0]) + { + if (mvOccupied->BrakeCtrlPosR<0.1) + OK = mvOccupied->BrakeLevelAdd(1.0); + else + { + OK = mvOccupied->BrakeLevelAdd(0.25); + if ((deltaAcc > 5 * fBrake_a1[0]) && (mvOccupied->BrakeCtrlPosR <= 3.0)) + mvOccupied->BrakeLevelAdd(0.75); + } } else OK = false; @@ -2394,7 +2417,7 @@ bool TController::DecBrake() OK = mvOccupied->DecLocalBrakeLevel(1 + floor(0.5 + fabs(AccDesired))); break; case Pneumatic: - deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4 * (mvOccupied->BrakeCtrlPosR - 0.75)*fBrake_a1[0]); + deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4 * (mvOccupied->BrakeCtrlPosR)*fBrake_a1[0]); if (deltaAcc < 0) { if (mvOccupied->BrakeCtrlPosR > 0) @@ -3278,7 +3301,7 @@ bool TController::UpdateSituation(double dt) if ((iDrivigFlags & movePrimary) == 0) return true; // pasywny nic nie robi - double AbsAccS; + double AbsAccS = 0; // double VelReduced; //o ile km/h może przekroczyć dozwoloną prędkość bez hamowania bool UpdateOK = false; if (AIControllFlag) @@ -4300,6 +4323,7 @@ bool TController::UpdateSituation(double dt) AbsAccS /= fMass; //AbsAccS = iDirection * mvOccupied->AccS; // przyspieszenie chwilowe, liczone } + AbsAccS_pub = AbsAccS; // jako różnica skierowanej prędkości w // czasie // if (mvOccupied->V<0.0) AbsAccS=-AbsAccS; //Ra 2014-03: to trzeba przemyśleć @@ -4341,7 +4365,7 @@ bool TController::UpdateSituation(double dt) { // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze // jest daleko if (vel < - VelNext + 40.0) // dwustopniowe hamowanie - niski przy małej różnicy + VelNext + 20.0) // dwustopniowe hamowanie - niski przy małej różnicy { // jeśli jedzie wolniej niż VelNext+35km/h //Ra: 40, żeby nie // kombinował na zwrotnicach if (VelNext == 0.0) @@ -4384,7 +4408,7 @@ bool TController::UpdateSituation(double dt) else AccDesired = -(vel * vel) / (25.92 * (ActualProximityDist + - 0.1)); //-fMinProximityDist));//-0.1; + 0.1-0.5*(fMinProximityDist+fMaxProximityDist))); //-fMinProximityDist));//-0.1; ////mniejsze opóźnienie przy // małej różnicy ReactionTime = 0.1; // i orientuj się szybciej, jak masz stanąć @@ -4405,10 +4429,12 @@ bool TController::UpdateSituation(double dt) // krytycznym przedziale } } - else // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) - AccDesired = (VelNext * VelNext - vel * vel) / - (25.92 * ActualProximityDist + - 0.1); // najpierw hamuje mocniej, potem zluzuje + else { // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) + double dist = (VelNext * VelNext - (VelNext + 20) * (VelNext + 20)) / (25.92)*(-1 / fBrake_a0[0] - 1 / fAccThreshold) + 1.5*VelNext; + AccDesired = (VelNext * VelNext - vel * vel) / + (25.92 * (std::max(ActualProximityDist - 2 * VelNext, std::min(ActualProximityDist, 2 * VelNext)) - dist) + + 0.1); // najpierw hamuje mocniej, potem zluzuje + } if (AccPreferred < AccDesired) AccDesired = AccPreferred; //(1+abs(AccDesired)) // ReactionTime=0.5*mvOccupied->BrakeDelay[2+2*mvOccupied->BrakeDelayFlag]; @@ -4459,7 +4485,7 @@ bool TController::UpdateSituation(double dt) AccDesired = 0.0; } else - AccDesired = fAccThreshold; // hamuj tak średnio + AccDesired = fBrake_a0[0]; // hamuj tak średnio // koniec predkosci aktualnej #ifdef DEBUGFAC if (fAccThreshold > -0.3) // bez sensu, ale dla towarowych korzystnie @@ -4684,7 +4710,7 @@ bool TController::UpdateSituation(double dt) // zatrzymania jest mniejszy fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } - if ((AccDesired < fAccGravity - 0.05) && (AbsAccS < AccDesired - fBrake_a1[0])) + if ((AccDesired < fAccGravity - 0.05) && (AbsAccS < AccDesired - fBrake_a1[0]*0.51)) // if ((AccDesired<0.0)&&(AbsAccSStationIndex; // zaktualizować wyświetlanie rozkładu fLastStopExpDist = -1.0f; // usunąć licznik } - if (AIControllFlag) { if (fWarningDuration > 0.0) // jeśli pozostało coś do wytrąbienia diff --git a/Driver.h b/Driver.h index 8866194b..c21eb050 100644 --- a/Driver.h +++ b/Driver.h @@ -202,6 +202,7 @@ class TController double BrakeAccFactor(); double fBrakeReaction = 1.0; //opóźnienie zadziałania hamulca - czas w s / (km/h) double fAccThreshold = 0.0; // próg opóźnienia dla zadziałania hamulca + double AbsAccS_pub = 0.0; // próg opóźnienia dla zadziałania hamulca double fBrake_a0[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca double fBrake_a1[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca public: diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 3d9f6416..3ad5ca42 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3784,6 +3784,8 @@ double TMoverParameters::BrakeForceR(double ratio, double velocity) press = MaxBrakePress[3]; if (DynamicBrakeType == dbrake_automatic) ratio = ratio + (1.5 - ratio)*std::min(1.0, Vel*0.02); + if ((BrakeDelayFlag&bdelay_R) && (BrakeMethod != bp_Cosid) && (BrakeMethod != bp_D1) && (BrakeMethod != bp_D2)&&(Power>1)) + ratio = ratio / 2; } } @@ -3842,7 +3844,7 @@ double TMoverParameters::BrakeForce(const TTrackParam &Track) Ntotal = u * BrakeRigEff; else { - u = (BrakePress * P2FTrans) * BrakeCylMult[0] - BrakeSlckAdj; + u = ((BrakePress * P2FTrans) - BrakeCylSpring) * BrakeCylMult[0] - BrakeSlckAdj; if (u * (2.0 - BrakeRigEff) < Ntotal) // histereza na nacisku klockow Ntotal = u * (2.0 - BrakeRigEff); } diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 2a1b300b..06e45445 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -2372,6 +2372,11 @@ double TFV4aM::GetPos(int i) return pos_table[i]; } +double TFV4aM::GetCP() +{ + return TP; +} + double TFV4aM::LPP_RP(double pos) // cisnienie z zaokraglonej pozycji; { int const i_pos = 2 + std::floor( pos ); // zaokraglone w dol diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index 25de35db..b23c6c06 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -551,7 +551,7 @@ class TFV4aM : public TDriverHandle { void SetReductor(double nAdj)/*override*/; double GetSound(int i)/*override*/; double GetPos(int i)/*override*/; - + double GetCP(); inline TFV4aM() : TDriverHandle() {} diff --git a/World.cpp b/World.cpp index 5c51f7b2..127a4aa6 100644 --- a/World.cpp +++ b/World.cpp @@ -1766,7 +1766,11 @@ TWorld::Update_UI() { && ( tmp->Mechanik->AIControllFlag == AIdriver ) ) { uitextline4 += "AI: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) - + " ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) + + " ad=" + to_string(tmp->Mechanik->AccDesired, 2) + + "/" + to_string(tmp->Mechanik->AccDesired*tmp->Mechanik->BrakeAccFactor(), 2) + + " atrain=" + to_string(tmp->Mechanik->fBrake_a0[0], 2) + + "+" + to_string(tmp->Mechanik->fBrake_a1[0], 2) + + " aS=" + to_string(tmp->Mechanik->AbsAccS_pub, 2) + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ); } From b783cd38a945d0e995d0e93798b34cf4feb5d202 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 5 Aug 2017 18:28:46 +0200 Subject: [PATCH 154/426] replaced basic array in the model manager with stl containers --- Event.cpp | 2 +- MdlMngr.cpp | 180 ++++++++++++------------------------------- MdlMngr.h | 41 +++++----- Texture.cpp | 2 +- World.cpp | 3 - openglgeometrybank.h | 4 +- renderer.cpp | 12 +-- version.h | 2 +- 8 files changed, 81 insertions(+), 165 deletions(-) diff --git a/Event.cpp b/Event.cpp index ee34478a..a56c5cdf 100644 --- a/Event.cpp +++ b/Event.cpp @@ -223,7 +223,7 @@ void TEvent::Load(cParser *parser, vector3 *org) parser->getTokens(1, false); // case sensitive *parser >> token; // str = AnsiString(token.c_str()); - Params[0].asText = new char[token.length() + 1]; + Params[0].asText = new char[token.length() + 1]; // BUG: source of memory leak strcpy(Params[0].asText, token.c_str()); if (token != "*") // czy ma zostać bez zmian? iFlags |= update_memstring; diff --git a/MdlMngr.cpp b/MdlMngr.cpp index fb55dfe9..fa1f6236 100644 --- a/MdlMngr.cpp +++ b/MdlMngr.cpp @@ -17,64 +17,45 @@ http://mozilla.org/MPL/2.0/. #include "MdlMngr.h" #include "Globals.h" -#include "Logs.h" #include "McZapkie/mctools.h" -//#define SeekFiles std::string("*.t3d") +// wczytanie modelu do kontenerka +TModel3d * +TMdlContainer::LoadModel(std::string const &Name, bool const Dynamic) { -TModel3d * TMdlContainer::LoadModel(std::string const &NewName, bool dynamic) -{ // wczytanie modelu do kontenerka - SafeDelete(Model); - Name = NewName; - Model = new TModel3d(); - if (!Model->LoadFromFile(Name, dynamic)) // np. "models\\pkp/head1-y.t3d" - SafeDelete(Model); - return Model; -}; - -TMdlContainer *TModelsManager::Models; -int TModelsManager::Count; -int const MAX_MODELS = 1000; - -void TModelsManager::Init() -{ - Models = new TMdlContainer[MAX_MODELS]; - Count = 0; -} -/* - TModelsManager::TModelsManager() -{ -// Models= NULL; - Models= new TMdlContainer[MAX_MODELS]; - Count= 0; -}; - - TModelsManager::~TModelsManager() -{ - Free(); -}; - */ -void TModelsManager::Free() -{ - delete[] Models; - Models = nullptr; -} - -TModel3d * TModelsManager::LoadModel(std::string const &Name, bool dynamic) -{ // wczytanie modelu do tablicy - TModel3d *mdl = NULL; - if (Count >= MAX_MODELS) - Error("FIXME: Too many models, program will now crash :)"); - else - { - mdl = Models[Count].LoadModel(Name, dynamic); - if (mdl) - Count++; // jeśli błąd wczytania modelu, to go nie wliczamy + Model = std::make_shared(); + if( true == Model->LoadFromFile( Name, Dynamic ) ) { + m_name = Name; + return Model.get(); + } + else { + m_name.clear(); + Model = nullptr; + return nullptr; + } +}; + +TModelsManager::modelcontainer_sequence TModelsManager::m_models; +TModelsManager::stringmodelcontainerindex_map TModelsManager::m_modelsmap; + +// wczytanie modelu do tablicy +TModel3d * +TModelsManager::LoadModel(std::string const &Name, bool dynamic) { + + m_models.emplace_back(); + auto model = m_models.back().LoadModel( Name, dynamic ); + if( model != nullptr ) { + m_modelsmap.emplace( Name, m_models.size() - 1 ); + return model; + } + else { + m_models.pop_back(); + return nullptr; } - return mdl; } -TModel3d * TModelsManager::GetModel(std::string const &Name, bool dynamic) +TModel3d * +TModelsManager::GetModel(std::string const &Name, bool const Dynamic) { // model może być we wpisie "node...model" albo "node...dynamic", a także być dodatkowym w dynamic // (kabina, wnętrze, ładunek) // dla "node...dynamic" mamy podaną ścieżkę w "\dynamic\" i musi być co najmniej 1 poziom, zwkle @@ -97,53 +78,10 @@ TModel3d * TModelsManager::GetModel(std::string const &Name, bool dynamic) // - niebo animowane, ścieżka brana ze wpisu, tekstury nieokreślone // - wczytanie modelu animowanego - Init() - sprawdzić std::string buf; - std::string buftp = Global::asCurrentTexturePath; // zapamiętanie aktualnej ścieżki do tekstur, - // bo będzie tyczmasowo zmieniana - /* - // Ra: niby tak jest lepiej, ale działa gorzej, więc przywrócone jest oryginalne - //nawet jeśli model będzie pobrany z tablicy, to trzeba ustalić ścieżkę dla tekstur - if (dynamic) //na razie tak, bo nie wiadomo, jaki może mieć wpływ na pozostałe modele - {//dla pojazdów podana jest zawsze pełna ścieżka do modelu - strcpy(buf,Name); - if (strchr(Name,'/')!=NULL) - {//pobieranie tekstur z katalogu, w którym jest model - Global::asCurrentTexturePath=Global::asCurrentTexturePath+AnsiString(Name); - Global::asCurrentTexturePath.Delete(Global::asCurrentTexturePath.Pos("/")+1,Global::asCurrentTexturePath.Length()); - } - } - else - {//dla modeli scenerii trzeba ustalić ścieżkę - if (strchr(Name,'\\')==NULL) - {//jeśli nie ma lewego ukośnika w ścieżce, a jest prawy, to zmienić ścieżkę dla tekstur na tę - z modelem - strcpy(buf,"models\\"); //Ra: było by lepiej katalog dodać w parserze - //strcpy(buf,"scenery\\"); //Ra: było by lepiej katalog dodać w parserze - strcat(buf,Name); - if (strchr(Name,'/')!=NULL) - {//jeszcze musi być prawy ukośnik - Global::asCurrentTexturePath=Global::asCurrentTexturePath+AnsiString(Name); - Global::asCurrentTexturePath.Delete(Global::asCurrentTexturePath.Pos("/")+1,Global::asCurrentTexturePath.Length()); - } - } - else - {//jeśli jest lewy ukośnik, to ścieżkę do tekstur zmienić tylko dla pojazdów - strcpy(buf,Name); - } - } - StrLower(buf); - for (int i=0;isecond ].Model.get() ); + } + + auto model = LoadModel(buf, Dynamic); // model nie znaleziony, to wczytać Global::asCurrentTexturePath = buftp; // odtworzenie ścieżki do tekstur - return (tmpModel); // NULL jeśli błąd + return model; // NULL jeśli błąd }; -/* -TModel3d TModelsManager::GetModel(char *Name, AnsiString asReplacableTexture) -{ - GLuint ReplacableTextureID= 0; - TModel3d NewModel; - - NewModel= *GetNextModel(Name); - - if (asReplacableTexture!=AnsiString("none")) - ReplacableTextureID= TTexturesManager::GetTextureID(asReplacableTexture.c_str()); - - NewModel.ReplacableSkinID=ReplacableTextureID; - - return NewModel; -}; -*/ - //--------------------------------------------------------------------------- diff --git a/MdlMngr.h b/MdlMngr.h index 2162bf30..b8f53687 100644 --- a/MdlMngr.h +++ b/MdlMngr.h @@ -9,33 +9,28 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "Model3d.h" -#include "usefull.h" -class TMdlContainer -{ +class TMdlContainer { friend class TModelsManager; - ~TMdlContainer() - { - delete Model; - }; - TModel3d * LoadModel(std::string const &NewName, bool dynamic); - TModel3d *Model{ nullptr }; - std::string Name; +private: + TModel3d *LoadModel( std::string const &Name, bool const Dynamic ); + std::shared_ptr Model { nullptr }; + std::string m_name; }; -class TModelsManager -{ // klasa statyczna, nie ma obiektu - private: - static TMdlContainer *Models; - static int Count; - static TModel3d * LoadModel(std::string const &Name, bool dynamic); - - public: - // TModelsManager(); - // ~TModelsManager(); - static void Init(); - static void Free(); +// klasa statyczna, nie ma obiektu +class TModelsManager { +// types: + typedef std::deque modelcontainer_sequence; + typedef std::unordered_map stringmodelcontainerindex_map; +// members: + static modelcontainer_sequence m_models; + static stringmodelcontainerindex_map m_modelsmap; +// methods: + static TModel3d *LoadModel( std::string const &Name, bool const Dynamic ); +public: // McZapkie: dodalem sciezke, notabene Path!=Patch :) - static TModel3d * GetModel(std::string const &Name, bool dynamic = false); + static TModel3d *GetModel( std::string const &Name, bool dynamic = false ); }; + //--------------------------------------------------------------------------- diff --git a/Texture.cpp b/Texture.cpp index 228d314d..ce557936 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -909,7 +909,7 @@ texture_manager::info() const { } return - "Textures: " + "; textures: " #ifdef EU07_DEFERRED_TEXTURE_UPLOAD + std::to_string( readytexturecount ) + " (" diff --git a/World.cpp b/World.cpp index 922135c2..89ca524a 100644 --- a/World.cpp +++ b/World.cpp @@ -203,7 +203,6 @@ TWorld::~TWorld() TrainDelete(); // Ground.Free(); //Ra: usunięcie obiektów przed usunięciem dźwięków - sypie się TSoundsManager::Free(); - TModelsManager::Free(); } void TWorld::TrainDelete(TDynamicObject *d) @@ -291,8 +290,6 @@ bool TWorld::Init( GLFWwindow *Window ) { TSoundsManager::Init( glfwGetWin32Window( window ) ); WriteLog("Sound Init OK"); - TModelsManager::Init(); - WriteLog("Models init OK"); glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii UILayer.set_progress(0.01); diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 736f3d66..90bec5a0 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -25,8 +25,8 @@ struct basic_vertex { glm::vec2 texture; // uv space basic_vertex() = default; - basic_vertex( glm::vec3 const&Position, glm::vec3 const &Normal, glm::vec2 const &Texture ) : - position( Position ), normal( Normal ), texture( Texture ) + basic_vertex( glm::vec3 const &Position, glm::vec3 const &Normal, glm::vec2 const &Texture ) : + position( Position ), normal( Normal ), texture( Texture ) {} void serialize( std::ostream& ) const; void deserialize( std::istream& ); diff --git a/renderer.cpp b/renderer.cpp index f78f2c52..e738a0c9 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -408,7 +408,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glEnable( GL_SCISSOR_TEST ); setup_matrices(); ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting - ::glPolygonOffset( 4.f, 8.f ); + ::glPolygonOffset( 2.f, 2.f ); // render // opaque parts... setup_drawing( false ); @@ -560,6 +560,11 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f bounding_box( frustumchunkmin, frustumchunkmax, std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); // ...use the dimensions to set up light projection boundaries // NOTE: since we only have one cascade map stage, we extend the chunk forward/back to catch areas normally covered by other stages + auto const quantizationstep = ( Global::shadowtune.depth + 1000.f ) / m_shadowbuffersize; + frustumchunkmin.x -= std::remainder( frustumchunkmin.x, quantizationstep ); + frustumchunkmin.y -= std::remainder( frustumchunkmin.y, quantizationstep ); + frustumchunkmax.x -= std::remainder( frustumchunkmax.x, quantizationstep ); + frustumchunkmax.y -= std::remainder( frustumchunkmax.y, quantizationstep ); camera.projection() *= glm::ortho( frustumchunkmin.x, frustumchunkmax.x, @@ -2708,10 +2713,7 @@ opengl_renderer::Update( double const Deltatime ) { } if( true == DebugModeFlag ) { - m_debuginfo = m_textures.info(); - } - else { - m_debuginfo.clear(); + m_debuginfo += m_textures.info(); } if( ( true == Global::ControlPicking ) diff --git a/version.h b/version.h index 68f79535..60e9869e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 731 +#define VERSION_MINOR 803 #define VERSION_REVISION 0 From 7e5b2d09cb194aba7004d94ce2f47c92eb71ba5d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 5 Aug 2017 18:41:39 +0200 Subject: [PATCH 155/426] conversion of legacy model-based terrain to camera-centric render system --- AnimModel.cpp | 10 +- AnimModel.h | 2 +- Ground.cpp | 245 ++++++++++++++++++----------- Ground.h | 7 +- Model3d.cpp | 76 +++++++-- Model3d.h | 6 +- Train.h | 1 - World.cpp | 23 +-- maszyna.vcxproj.filters | 6 - FadeSound.cpp => old/FadeSound.cpp | 0 FadeSound.h => old/FadeSound.h | 0 renderer.cpp | 7 +- usefull.h | 2 +- version.h | 2 +- 14 files changed, 248 insertions(+), 139 deletions(-) rename FadeSound.cpp => old/FadeSound.cpp (100%) rename FadeSound.h => old/FadeSound.h (100%) diff --git a/AnimModel.cpp b/AnimModel.cpp index 58d8ecb0..02e33d9c 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -472,8 +472,10 @@ bool TAnimModel::Load(cParser *parser, bool ter) if( name.substr( name.rfind( '.' ) ) == ".t3d" ) { name[ name.length() - 3 ] = 'e'; } +#ifdef EU07_USE_OLD_TERRAINCODE Global::asTerrainModel = name; WriteLog("Terrain model \"" + name + "\" will be created."); +#endif } else ErrorLog("Missed file: " + name); @@ -632,13 +634,7 @@ TSubModel * TAnimModel::TerrainSquare(int n) { // pobieranie wskaźników do pierwszego submodelu return pModel ? pModel->TerrainSquare(n) : 0; }; -#ifdef EU07_USE_OLD_RENDERCODE -void TAnimModel::TerrainRenderVBO(int n) -{ // renderowanie terenu z VBO - if (pModel) - pModel->TerrainRenderVBO(n); -}; -#endif + //--------------------------------------------------------------------------- void TAnimModel::Advanced() diff --git a/AnimModel.h b/AnimModel.h index 69866f56..73bad8f7 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -144,7 +144,7 @@ class TAnimModel { material_data m_materialdata; std::string asText; // tekst dla wyświetlacza znakowego - TAnimAdvanced *pAdvanced; + TAnimAdvanced *pAdvanced { nullptr }; void Advanced(); TLightState lsLights[iMaxNumLights]; float fDark; // poziom zapalanie światła (powinno być chyba powiązane z danym światłem?) diff --git a/Ground.cpp b/Ground.cpp index 6025fbee..57b76e36 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -153,73 +153,30 @@ TGroundNode::TGroundNode( TGroundNodeType t ) : } } -void TGroundNode::InitNormals() -{ // obliczenie wektorów normalnych - glm::dvec3 v1, v2, v3, v4, v5; - glm::vec3 n1, n2, n3, n4; +// obliczenie wektorów normalnych +void TGroundNode::InitNormals() { + + glm::dvec3 v1, v2; + glm::vec3 n1; glm::vec2 t1; - int i; - switch (iType) - { - case GL_TRIANGLE_STRIP: - v1 = Piece->vertices[0].position - Piece->vertices[1].position; - v2 = Piece->vertices[1].position - Piece->vertices[2].position; - n1 = glm::normalize(glm::cross(v1, v2)); - if (Piece->vertices[0].normal == glm::vec3()) - Piece->vertices[0].normal = n1; - v3 = Piece->vertices[2].position - Piece->vertices[3].position; - n2 = glm::normalize(glm::cross(v3, v2)); - if (Piece->vertices[1].normal == glm::vec3()) - Piece->vertices[1].normal = (n1 + n2) * 0.5f; - for ( i = 2; i < iNumVerts - 2; i += 2) - { - v4 = Piece->vertices[i - 1].position - Piece->vertices[i].position; - v5 = Piece->vertices[i].position - Piece->vertices[i + 1].position; - n3 = glm::normalize(glm::cross(v3, v4)); - n4 = glm::normalize(glm::cross(v5, v4)); - if (Piece->vertices[i].normal == glm::vec3()) - Piece->vertices[i].normal = (n1 + n2 + n3) / 3.0f; - if (Piece->vertices[i + 1].normal == glm::vec3()) - Piece->vertices[i + 1].normal = (n2 + n3 + n4) / 3.0f; - n1 = n3; - n2 = n4; - v3 = v5; - } - if (Piece->vertices[i].normal == glm::vec3()) - Piece->vertices[i].normal = (n1 + n2) / 2.0f; - if (i + 1 < iNumVerts) - { - if (Piece->vertices[i + 1].normal == glm::vec3()) - Piece->vertices[i + 1].normal = n2; - } - else - WriteLog("odd number of vertices, normals may be wrong!"); + for( auto i = 0; i < iNumVerts; i += 3 ) { - break; - case GL_TRIANGLE_FAN: - - break; - case GL_TRIANGLES: - for (i = 0; i < iNumVerts; i += 3) - { - v1 = Piece->vertices[i + 0].position - Piece->vertices[i + 1].position; - v2 = Piece->vertices[i + 1].position - Piece->vertices[i + 2].position; - n1 = glm::normalize(glm::cross(v1, v2)); - if( Piece->vertices[i + 0].normal == glm::vec3() ) - Piece->vertices[i + 0].normal = (n1); - if( Piece->vertices[i + 1].normal == glm::vec3() ) - Piece->vertices[i + 1].normal = (n1); - if( Piece->vertices[i + 2].normal == glm::vec3() ) - Piece->vertices[i + 2].normal = (n1); - t1 = glm::vec2( - std::floor( Piece->vertices[ i + 0 ].texture.s ), - std::floor( Piece->vertices[ i + 0 ].texture.t ) ); - Piece->vertices[ i + 1 ].texture -= t1; - Piece->vertices[ i + 2 ].texture -= t1; - Piece->vertices[ i + 0 ].texture -= t1; - } - break; + v1 = Piece->vertices[ i + 0 ].position - Piece->vertices[ i + 1 ].position; + v2 = Piece->vertices[ i + 1 ].position - Piece->vertices[ i + 2 ].position; + n1 = glm::normalize( glm::cross( v1, v2 ) ); + if( Piece->vertices[ i + 0 ].normal == glm::vec3() ) + Piece->vertices[ i + 0 ].normal = ( n1 ); + if( Piece->vertices[ i + 1 ].normal == glm::vec3() ) + Piece->vertices[ i + 1 ].normal = ( n1 ); + if( Piece->vertices[ i + 2 ].normal == glm::vec3() ) + Piece->vertices[ i + 2 ].normal = ( n1 ); + t1 = glm::vec2( + std::floor( Piece->vertices[ i + 0 ].texture.s ), + std::floor( Piece->vertices[ i + 0 ].texture.t ) ); + Piece->vertices[ i + 1 ].texture -= t1; + Piece->vertices[ i + 2 ].texture -= t1; + Piece->vertices[ i + 0 ].texture -= t1; } } @@ -704,6 +661,42 @@ TGround::GetRect( double x, double z ) { } }; +// convert tp_terrain model to a series of triangle nodes +void +TGround::convert_terrain( TGroundNode const *Terrain ) { + + TSubModel *submodel { nullptr }; + for( auto cellindex = 1; cellindex < Terrain->iCount; ++cellindex ) { + // go through all submodels for individual terrain cells... + submodel = Terrain->nNode[ cellindex ].smTerrain; + convert_terrain( submodel ); + // if there's more than one group of triangles in the cell they're held as children of the primary submodel + submodel = submodel->ChildGet(); + while( submodel != nullptr ) { + convert_terrain( submodel ); + submodel = submodel->NextGet(); + } + } +} + +void +TGround::convert_terrain( TSubModel const *Submodel ) { + + auto groundnode = new TGroundNode( GL_TRIANGLES ); + Submodel->convert( *groundnode ); + + if( groundnode->iNumVerts > 0 ) { + // jeśli nie jest pojazdem ostatni dodany dołączamy na końcu nowego + groundnode->nNext = nRootOfType[ groundnode->iType ]; + // ustawienie nowego na początku listy + nRootOfType[ groundnode->iType ] = groundnode; + ++iNumNodes; + } + else { + delete groundnode; + } +} + double fTrainSetVel = 0; double fTrainSetDir = 0; double fTrainSetDist = 0; // odległość składu od punktu 1 w stronę punktu 2 @@ -1219,61 +1212,123 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } break; - case TP_MODEL: - if (rmin < 0) - { + case TP_MODEL: { +#ifdef EU07_USE_OLD_TERRAINCODE + if( rmin < 0 ) { tmp->iType = TP_TERRAIN; tmp->fSquareMinRadius = 0; // to w ogóle potrzebne? } - parser->getTokens(3); + parser->getTokens( 3 ); *parser >> tmp->pCenter.x >> tmp->pCenter.y >> tmp->pCenter.z; parser->getTokens(); *parser >> tf1; // OlO_EU&KAKISH-030103: obracanie punktow zaczepien w modelu - tmp->pCenter.RotateY(aRotate.y / 180.0 * M_PI); + tmp->pCenter.RotateY( aRotate.y / 180.0 * M_PI ); // McZapkie-260402: model tez ma wspolrzedne wzgledne tmp->pCenter += pOrigin; tmp->Model = new TAnimModel(); - tmp->Model->RaAnglesSet(aRotate.x, tf1 + aRotate.y, aRotate.z); // dostosowanie do pochylania linii + tmp->Model->RaAnglesSet( aRotate.x, tf1 + aRotate.y, aRotate.z ); // dostosowanie do pochylania linii if( tmp->Model->Load( parser, tmp->iType == TP_TERRAIN ) ) { // wczytanie modelu, tekstury i stanu świateł... tmp->iFlags = tmp->Model->Flags() | 0x200; // ustalenie, czy przezroczysty; flaga usuwania } - else if (tmp->iType != TP_TERRAIN) - { // model nie wczytał się - ignorowanie node + else if( tmp->iType != TP_TERRAIN ) { // model nie wczytał się - ignorowanie node delete tmp; tmp = NULL; // nie może być tu return break; // nie może być tu return? } - if (tmp->iType == TP_TERRAIN) - { // jeśli model jest terenem, trzeba utworzyć dodatkowe obiekty + if( tmp->iType == TP_TERRAIN ) { // jeśli model jest terenem, trzeba utworzyć dodatkowe obiekty // po wczytaniu model ma już utworzone DL albo VBO Global::pTerrainCompact = tmp->Model; // istnieje co najmniej jeden obiekt terenu tmp->pCenter = Math3D::vector3( 0.0, 0.0, 0.0 ); // enforce placement in the world center tmp->iCount = Global::pTerrainCompact->TerrainCount() + 1; // zliczenie submodeli - tmp->nNode = new TGroundNode[tmp->iCount]; // sztuczne node dla kwadratów - tmp->nNode[0].iType = TP_MODEL; // pierwszy zawiera model (dla delete) - tmp->nNode[0].Model = Global::pTerrainCompact; - tmp->nNode[0].iFlags = 0x200; // nie wyświetlany, ale usuwany - for (int i = 1; i < tmp->iCount; ++i) - { // a reszta to submodele - tmp->nNode[i].iType = TP_SUBMODEL; - tmp->nNode[i].smTerrain = Global::pTerrainCompact->TerrainSquare(i - 1); - tmp->nNode[i].iFlags = 0x10; // nieprzezroczyste; nie usuwany - tmp->nNode[i].bVisible = true; - tmp->nNode[i].pCenter = tmp->pCenter; // nie przesuwamy w inne miejsce + tmp->nNode = new TGroundNode[ tmp->iCount ]; // sztuczne node dla kwadratów + tmp->nNode[ 0 ].iType = TP_MODEL; // pierwszy zawiera model (dla delete) + tmp->nNode[ 0 ].Model = Global::pTerrainCompact; + tmp->nNode[ 0 ].iFlags = 0x200; // nie wyświetlany, ale usuwany + for( int i = 1; i < tmp->iCount; ++i ) { // a reszta to submodele + tmp->nNode[ i ].iType = TP_SUBMODEL; + tmp->nNode[ i ].smTerrain = Global::pTerrainCompact->TerrainSquare( i - 1 ); + tmp->nNode[ i ].iFlags = 0x10; // nieprzezroczyste; nie usuwany + tmp->nNode[ i ].bVisible = true; + tmp->nNode[ i ].pCenter = tmp->pCenter; // nie przesuwamy w inne miejsce } } - else if (!tmp->asName.empty()) // jest pusta gdy "none" + else if( !tmp->asName.empty() ) // jest pusta gdy "none" { // dodanie do wyszukiwarki if( false == m_trackmap.Add( TP_MODEL, tmp->asName, tmp ) ) { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) ErrorLog( "Duplicated model: " + tmp->asName ); // to zgłaszać duplikat } } - // str=Parser->GetNextSymbol().LowerCase(); +#else + if( rmin < 0 ) { + // legacy leftover: special case, terrain provided as 3d model + tmp->iType = TP_TERRAIN; + tmp->fSquareMinRadius = 0; // to w ogóle potrzebne? + // we ignore center and rotation for terrain; they should be set to 0 anyway + parser->getTokens( 4 ); + + tmp->iFlags = 0x200; // flaga usuwania + tmp->Model = new TAnimModel(); + if( false == tmp->Model->Load( parser, true ) ) { + delete tmp; + tmp = nullptr; + break; + } + tmp->iFlags |= tmp->Model->Flags(); // ustalenie, czy przezroczysty + tmp->pCenter = Math3D::vector3(); // enforce placement in the world center + // jeśli model jest terenem, trzeba utworzyć dodatkowe obiekty + tmp->iCount = tmp->Model->TerrainCount() + 1; // zliczenie submodeli + Global::pTerrainCompact = tmp->Model; + tmp->nNode = new TGroundNode[ tmp->iCount ]; // sztuczne node dla kwadratów + tmp->nNode[ 0 ].iType = TP_MODEL; // pierwszy zawiera model (dla delete) + tmp->nNode[ 0 ].Model = Global::pTerrainCompact; + tmp->nNode[ 0 ].iFlags = 0x200; // nie wyświetlany, ale usuwany + for( auto i = 1; i < tmp->iCount; ++i ) { // a reszta to submodele + tmp->nNode[ i ].iType = TP_SUBMODEL; + tmp->nNode[ i ].smTerrain = Global::pTerrainCompact->TerrainSquare( i - 1 ); + tmp->nNode[ i ].iFlags = 0x10; // nieprzezroczyste; nie usuwany + tmp->nNode[ i ].bVisible = true; + tmp->nNode[ i ].pCenter = tmp->pCenter; // nie przesuwamy w inne miejsce + } + } + else { + // regular 3d model + parser->getTokens( 3 ); + *parser + >> tmp->pCenter.x + >> tmp->pCenter.y + >> tmp->pCenter.z; + parser->getTokens(); + *parser >> tf1; + // OlO_EU&KAKISH-030103: obracanie punktow zaczepien w modelu + tmp->pCenter.RotateY( glm::radians( aRotate.y ) ); + // McZapkie-260402: model tez ma wspolrzedne wzgledne + tmp->pCenter += pOrigin; + + tmp->iFlags = 0x200; // flaga usuwania + tmp->Model = new TAnimModel(); + tmp->Model->RaAnglesSet( aRotate.x, tf1 + aRotate.y, aRotate.z ); // dostosowanie do pochylania linii + if( false == tmp->Model->Load( parser, false ) ) { + // model nie wczytał się - ignorowanie node + delete tmp; + tmp = nullptr; // nie może być tu return + break; // nie może być tu return? + } + tmp->iFlags |= tmp->Model->Flags(); // ustalenie, czy przezroczysty + if( false == tmp->asName.empty() ) { // jest pusta gdy "none" + // dodanie do wyszukiwarki + if( false == m_trackmap.Add( TP_MODEL, tmp->asName, tmp ) ) { + // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) + ErrorLog( "Duplicated model: " + tmp->asName ); // to zgłaszać duplikat + } + } + } +#endif break; + } // case TP_GEOMETRY : case GL_TRIANGLES: case GL_TRIANGLE_STRIP: @@ -1620,7 +1675,8 @@ void TGround::FirstInit() for (int type = 0; type < TP_LAST; ++type) { for (TGroundNode *Current = nRootOfType[type]; Current != nullptr; Current = Current->nNext) { - Current->InitNormals(); + if( type == GL_TRIANGLES ) { Current->InitNormals(); } + if (Current->iType != TP_DYNAMIC) { // pojazdów w ogóle nie dotyczy dodawanie do mapy if( ( type == TP_EVLAUNCH ) @@ -1628,6 +1684,7 @@ void TGround::FirstInit() // dodanie do globalnego obiektu srGlobal.NodeAdd( Current ); } +#ifdef EU07_USE_OLD_TERRAINCODE else if (type == TP_TERRAIN) { // specjalne przetwarzanie terenu wczytanego z pliku E3D TGroundRect *gr; @@ -1640,6 +1697,7 @@ void TGround::FirstInit() gr->nTerrain = Current->nNode + j; // zapamiętanie } } +#endif else { TSubRect *targetcell { nullptr }; // test whether we can add the node to a ground cell, or a subcell @@ -1743,6 +1801,15 @@ bool TGround::Init(std::string File) } break; } +#ifndef EU07_SCENERY_EDITOR + case TP_TERRAIN: { + // convert legacy terrain model to a series of triangle nodes, to take advantage of camera-centric render and geometry merging + // NOTE: this leaves us with a large model we don't use loaded and taking space. it'll sort of solve itself when the binary scenery file is in place + convert_terrain( LastNode ); + SafeDelete( LastNode ); + Global::pTerrainCompact = nullptr; + } +#endif default: { break; } @@ -2120,8 +2187,10 @@ bool TGround::Init(std::string File) if (!bInitDone) FirstInit(); // jeśli nie było w scenerii +#ifdef EU07_USE_OLD_TERRAINCODE if (Global::pTerrainCompact) TerrainWrite(); // Ra: teraz można zapisać teren w jednym pliku +#endif Global::iPause &= ~0x10; // koniec pauzy wczytywania return true; } diff --git a/Ground.h b/Ground.h index 1005ab3f..d8b02ad9 100644 --- a/Ground.h +++ b/Ground.h @@ -175,10 +175,6 @@ class TSubRect : /*public Resource,*/ public CMesh TTrack **tTracks = nullptr; // tory do renderowania pojazdów protected: TTrack *tTrackAnim = nullptr; // obiekty do przeliczenia animacji -#ifdef EU07_USE_OLD_RENDERCODE - TGroundNode *nRootMesh = nullptr; // obiekty renderujące wg tekstury (wtórne, lista po nNext2) - TGroundNode *nMeshed = nullptr; // lista obiektów dla których istnieją obiekty renderujące grupowo -#endif public: TGroundNode *nRootNode = nullptr; // wszystkie obiekty w sektorze, z wyjątkiem renderujących i pojazdów (nNext2) TGroundNode *nRenderHidden = nullptr; // lista obiektów niewidocznych, "renderowanych" również z tyłu (nNext3) @@ -333,6 +329,9 @@ class TGround void TrackJoin(TGroundNode *Current); private: + // convert tp_terrain model to a series of triangle nodes + void convert_terrain( TGroundNode const *Terrain ); + void convert_terrain( TSubModel const *Submodel ); void RaTriangleDivider(TGroundNode *node); void Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam); diff --git a/Model3d.cpp b/Model3d.cpp index 95880a02..e9f3a8fc 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -19,6 +19,7 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others #include "logs.h" #include "mczapkie/mctools.h" #include "Usefull.h" +#include "ground.h" #include "renderer.h" #include "Timer.h" #include "mtable.h" @@ -1037,7 +1038,7 @@ void TSubModel::RaAnimation(TAnimType a) //--------------------------------------------------------------------------- -void TSubModel::serialize_geometry( std::ostream &Output ) { +void TSubModel::serialize_geometry( std::ostream &Output ) const { if( Child ) { Child->serialize_geometry( Output ); @@ -1076,6 +1077,65 @@ TSubModel::create_geometry( std::size_t &Dataoffset, geometrybank_handle const & Next->create_geometry( Dataoffset, Bank ); } +// places contained geometry in provided ground node +void +TSubModel::convert( TGroundNode &Groundnode ) const { + + Groundnode.asName = pName; + Groundnode.Ambient = f4Ambient; + Groundnode.Diffuse = f4Diffuse; + Groundnode.Specular = f4Specular; + Groundnode.TextureID = TextureID; + Groundnode.iFlags = ( + ( true == GfxRenderer.Texture( TextureID ).has_alpha ) ? + 0x20 : + 0x10 ); + + if( m_geometry == NULL ) { return; } + + std::size_t vertexcount { 0 }; + std::vector importedvertices; + TGroundVertex vertex, vertex1, vertex2; + for( auto const &sourcevertex : GfxRenderer.Vertices( m_geometry ) ) { + vertex.position = sourcevertex.position; + vertex.normal = sourcevertex.normal; + vertex.texture = sourcevertex.texture; + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + if( false == degenerate( vertex1.position, vertex2.position, vertex.position ) ) { + importedvertices.emplace_back( vertex1 ); + importedvertices.emplace_back( vertex2 ); + importedvertices.emplace_back( vertex ); + } + } + ++vertexcount; + if( vertexcount > 2 ) { vertexcount = 0; } // start new triangle if needed + } + if( Groundnode.Piece == nullptr ) { + Groundnode.Piece = new piece_node(); + } + Groundnode.iNumVerts = importedvertices.size(); + if( Groundnode.iNumVerts > 0 ) { + + Groundnode.Piece->vertices.swap( importedvertices ); + + for( auto const &vertex : Groundnode.Piece->vertices ) { + Groundnode.pCenter += vertex.position; + } + Groundnode.pCenter /= Groundnode.iNumVerts; + + double r { 0.0 }; + double tf; + for( auto const &vertex : Groundnode.Piece->vertices ) { + tf = glm::length2( vertex.position - glm::dvec3{ Groundnode.pCenter } ); + if( tf > r ) + r = tf; + } + Groundnode.fSquareRadius += r; + } +} + // NOTE: leftover from static distance factor adjustment. // TODO: get rid of it, once we have the dynamic adjustment code in place void TSubModel::AdjustDist() @@ -1861,17 +1921,3 @@ TSubModel *TModel3d::TerrainSquare(int n) r->UnFlagNext(); // blokowanie wyświetlania po Next głównej listy return r; }; -#ifdef EU07_USE_OLD_RENDERCODE -void TModel3d::TerrainRenderVBO(int n) -{ // renderowanie terenu z VBO - ::glPushMatrix(); - ::glTranslated( -Global::pCameraPosition.x, -Global::pCameraPosition.y, -Global::pCameraPosition.z ); - TSubModel *r = Root; - while( r ) { - if( r->iVisible == n ) // tylko jeśli ma być widoczny w danej ramce (problem dla 0==false) - GfxRenderer.Render( r ); // sub kolejne (Next) się nie wyrenderują - r = r->NextGet(); - } - ::glPopMatrix(); -}; -#endif \ No newline at end of file diff --git a/Model3d.h b/Model3d.h index 4a569ef4..4e72b3c4 100644 --- a/Model3d.h +++ b/Model3d.h @@ -50,6 +50,8 @@ enum TAnimType // rodzaj animacji at_Undefined = 0x800000FF // animacja chwilowo nieokreślona }; +class TGroundNode; + class TSubModel { // klasa submodelu - pojedyncza siatka, punkt świetlny albo grupa punktów //m7todo: zrobić normalną serializację @@ -213,7 +215,9 @@ public: std::vector&, std::vector&, std::vector&); - void serialize_geometry( std::ostream &Output ); + void serialize_geometry( std::ostream &Output ) const; + // places contained geometry in provided ground node + void convert( TGroundNode &Groundnode ) const; }; diff --git a/Train.h b/Train.h index c9c9e6d2..2b4b4595 100644 --- a/Train.h +++ b/Train.h @@ -15,7 +15,6 @@ http://mozilla.org/MPL/2.0/. #include "Gauge.h" #include "Spring.h" #include "AdvSound.h" -#include "FadeSound.h" #include "PyInt.h" #include "command.h" diff --git a/World.cpp b/World.cpp index 89ca524a..363defe2 100644 --- a/World.cpp +++ b/World.cpp @@ -294,6 +294,7 @@ bool TWorld::Init( GLFWwindow *Window ) { glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii UILayer.set_progress(0.01); UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" ); + GfxRenderer.Render(); WriteLog( "Ground init" ); if( true == Ground.Init( Global::SceneryFile ) ) { @@ -1039,17 +1040,17 @@ bool TWorld::Update() // NOTE: experimentally changing this to prevent the desync. // TODO: test what happens if we hit more than 20 * 0.01 sec slices, i.e. less than 5 fps Ground.Update(dt / updatecount, updatecount); // tu zrobić tylko coklatkową aktualizację przesunięć -/* - if (DebugModeFlag) - if (Global::bActive) // nie przyspieszać, gdy jedzie w tle :) - if( Console::Pressed( GLFW_KEY_ESCAPE ) ) { - // yB dodał przyspieszacz fizyki - Ground.Update(dt, n); - Ground.Update(dt, n); - Ground.Update(dt, n); - Ground.Update(dt, n); // 5 razy - } -*/ + + // yB dodał przyspieszacz fizyki + if( (true == DebugModeFlag) + && (true == Global::bActive) // nie przyspieszać, gdy jedzie w tle :) + && ( glfwGetKey( window, GLFW_KEY_PAUSE ) == GLFW_PRESS ) ) { + + Ground.Update( dt, updatecount ); + Ground.Update( dt, updatecount ); + Ground.Update( dt, updatecount ); + Ground.Update( dt, updatecount ); // 5 razy + } // secondary fixed step simulation time routines while( m_secondaryupdateaccumulator >= m_secondaryupdaterate ) { diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index b375a4c0..e4762bc0 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -63,9 +63,6 @@ Source Files - - Source Files - Source Files @@ -338,9 +335,6 @@ Header Files - - Header Files - Header Files diff --git a/FadeSound.cpp b/old/FadeSound.cpp similarity index 100% rename from FadeSound.cpp rename to old/FadeSound.cpp diff --git a/FadeSound.h b/old/FadeSound.h similarity index 100% rename from FadeSound.h rename to old/FadeSound.h diff --git a/renderer.cpp b/renderer.cpp index e738a0c9..e55a781d 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1187,11 +1187,12 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { break; } } - +#ifdef EU07_USE_OLD_TERRAINCODE if( Groundcell->nTerrain ) { Render( Groundcell->nTerrain ); } +#endif Groundcell->iLastDisplay = Groundcell->iFrameNumber; // drugi raz nie potrzeba result = true; @@ -1298,7 +1299,7 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { bool opengl_renderer::Render( TGroundNode *Node ) { - +#ifdef EU07_USE_OLD_TERRAINCODE switch (Node->iType) { // obiekty renderowane niezależnie od odległości case TP_SUBMODEL: @@ -1310,7 +1311,7 @@ opengl_renderer::Render( TGroundNode *Node ) { ::glPopMatrix(); return true; } - +#endif double distancesquared; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { diff --git a/usefull.h b/usefull.h index 1e38c215..0c4c398d 100644 --- a/usefull.h +++ b/usefull.h @@ -86,7 +86,7 @@ void bounding_box( VecType_ &Mincorner, VecType_ &Maxcorner, Iterator_ First, Iterator_ Last ) { Mincorner = VecType_( typename std::numeric_limits::max() ); - Maxcorner = VecType_( typename std::numeric_limits::min() ); + Maxcorner = VecType_( typename std::numeric_limits::lowest() ); std::for_each( First, Last, diff --git a/version.h b/version.h index 60e9869e..a572b462 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 803 +#define VERSION_MINOR 805 #define VERSION_REVISION 0 From bc22d582de24ae7e7792605fc518afa054aaba5b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 6 Aug 2017 17:14:20 +0200 Subject: [PATCH 156/426] compilation warnings fixes --- Driver.cpp | 14 ++++++++------ EU07.cpp | 6 +++--- Logs.cpp | 33 ++++++++++++++++----------------- McZapkie/MOVER.h | 2 +- McZapkie/Mover.cpp | 14 +++++++------- Model3d.cpp | 21 +++++++++++---------- Sound.cpp | 44 ++++++++++++++++---------------------------- Sound.h | 2 +- Track.cpp | 2 +- Track.h | 2 +- World.cpp | 17 +++++++++++++---- renderer.cpp | 8 ++++---- 12 files changed, 82 insertions(+), 83 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 48aa14c4..185affc7 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1431,7 +1431,7 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, TableClear(); if( WriteLogFlag ) { - mkdir( "physicslog\\" ); + _mkdir( "physicslog\\" ); LogFile.open( std::string( "physicslog\\" + VehicleName + ".dat" ).c_str(), std::ios::in | std::ios::out | std::ios::trunc ); #if LOGPRESS == 0 @@ -1579,12 +1579,14 @@ void TController::Activation() ControllingSet(); // utworzenie połączenia do sterowanego pojazdu (może się zmienić) - // silnikowy dla EZT } - if (mvControlling->EngineType == - DieselEngine) // dla 2Ls150 - przed ustawieniem kierunku - można zmienić tryb pracy - if (mvControlling->ShuntModeAllow) + if( mvControlling->EngineType == DieselEngine ) { + // dla 2Ls150 - przed ustawieniem kierunku - można zmienić tryb pracy + if( mvControlling->ShuntModeAllow ) { mvControlling->CurrentSwitch( - (OrderList[OrderPos] & Shunt) || - (fMass > 224000.0)); // do tego na wzniesieniu może nie dać rady na liniowym + ( ( OrderList[ OrderPos ] & Shunt ) == Shunt ) + || ( fMass > 224000.0 ) ); // do tego na wzniesieniu może nie dać rady na liniowym + } + } // Ra: to przełączanie poniżej jest tu bez sensu mvOccupied->ActiveCab = iDirection; // aktywacja kabiny w prowadzonym pojeżdzie (silnikowy może być odwrotnie?) diff --git a/EU07.cpp b/EU07.cpp index 00852213..71d90bfb 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -187,16 +187,16 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo World.OnKeyDown( key ); +#ifdef CAN_I_HAS_LIBPNG switch( key ) { -#ifdef CAN_I_HAS_LIBPNG case GLFW_KEY_F11: { make_screenshot(); break; } -#endif default: { break; } } +#endif } } @@ -423,7 +423,7 @@ int main(int argc, char *argv[]) Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów try { if( false == World.Init( window ) ) { - ErrorLog( "Failed to init TWorld" ); + ErrorLog( "Simulation setup failed" ); return -1; } } diff --git a/Logs.cpp b/Logs.cpp index 3770f7d9..13ae31bd 100644 --- a/Logs.cpp +++ b/Logs.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. std::ofstream output; // standardowy "log.txt", można go wyłączyć std::ofstream errors; // lista błędów "errors.txt", zawsze działa std::ofstream comms; // lista komunikatow "comms.txt", można go wyłączyć +char logbuffer[ 256 ]; char endstring[10] = "\n"; @@ -22,8 +23,9 @@ std::string filename_date() { ::SYSTEMTIME st; ::GetLocalTime( &st ); - char buffer[ 256 ]; - sprintf( buffer, + std::snprintf( + logbuffer, + sizeof(logbuffer), "%d%02d%02d_%02d%02d", st.wYear, st.wMonth, @@ -31,7 +33,7 @@ std::string filename_date() { st.wHour, st.wMinute ); - return std::string( buffer ); + return std::string( logbuffer ); } std::string filename_scenery() { @@ -45,13 +47,12 @@ std::string filename_scenery() { } } -void WriteConsoleOnly(const char *str, double value) -{ - char buf[255]; - sprintf(buf, "%s %f \n", str, value); +void WriteConsoleOnly(const char *str, double value) { + + std::snprintf(logbuffer , sizeof(logbuffer), "%s %f \n", str, value); // stdout= GetStdHandle(STD_OUTPUT_HANDLE); DWORD wr = 0; - WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), buf, (DWORD)strlen(buf), &wr, NULL); + WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), logbuffer, (DWORD)strlen(logbuffer), &wr, NULL); // WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE),endstring,strlen(endstring),&wr,NULL); } @@ -66,18 +67,16 @@ void WriteConsoleOnly(const char *str, bool newline) WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), endstring, (DWORD)strlen(endstring), &wr, NULL); } -void WriteLog(const char *str, double value) -{ - if (Global::iWriteLogEnabled) - { - if (str) - { - char buf[255]; - sprintf(buf, "%s %f", str, value); - WriteLog(buf); +void WriteLog(const char *str, double value) { + + if (Global::iWriteLogEnabled) { + if (str) { + std::snprintf(logbuffer, sizeof(logbuffer), "%s %f", str, value); + WriteLog(logbuffer); } } }; + void WriteLog(const char *str, bool newline) { if (str) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 2fe15ace..0fcef626 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1024,7 +1024,7 @@ public: bool IncBrakeLevel(); // wersja na użytek AI bool DecBrakeLevel(); bool ChangeCab(int direction); - bool CurrentSwitch(int direction); + bool CurrentSwitch(bool const State); void UpdateBatteryVoltage(double dt); double ComputeMovement(double dt, double dt1, const TTrackShape &Shape, TTrackParam &Track, TTractionParam &ElectricTraction, const TLocation &NewLoc, TRotation &NewRot); //oblicza przesuniecie pojazdu double FastComputeMovement(double dt, const TTrackShape &Shape, TTrackParam &Track, const TLocation &NewLoc, TRotation &NewRot); //oblicza przesuniecie pojazdu - wersja zoptymalizowana diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b24b268e..8c0cc17c 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -692,13 +692,13 @@ bool TMoverParameters::ChangeCab(int direction) return false; }; -bool TMoverParameters::CurrentSwitch(int direction) -{ // rozruch wysoki (true) albo niski (false) +// rozruch wysoki (true) albo niski (false) +bool +TMoverParameters::CurrentSwitch(bool const State) { // Ra: przeniosłem z Train.cpp, nie wiem czy ma to sens - if (MaxCurrentSwitch(direction != 0)) - { + if (MaxCurrentSwitch(State)) { if (TrainType != dt_EZT) - return (MinCurrentSwitch(direction != 0)); + return (MinCurrentSwitch(State)); } // TBD, TODO: split off shunt mode toggle into a separate command? It doesn't make much sense to have these two together like that // dla 2Ls150 @@ -706,14 +706,14 @@ bool TMoverParameters::CurrentSwitch(int direction) && ( true == ShuntModeAllow ) && ( ActiveDir == 0 ) ) { // przed ustawieniem kierunku - ShuntMode = ( direction != 0 ); + ShuntMode = State; return true; } // for SM42/SP42 if( ( EngineType == DieselElectric ) && ( true == ShuntModeAllow ) && ( MainCtrlPos == 0 ) ) { - ShuntMode = ( direction != 0 ); + ShuntMode = State; return true; } diff --git a/Model3d.cpp b/Model3d.cpp index e9f3a8fc..2d1442af 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1433,16 +1433,16 @@ void TModel3d::SaveToBinFile(std::string const &FileName) std::ofstream s(FileName, std::ios::binary); sn_utils::ls_uint32(s, MAKE_ID4('E', '3', 'D', '0')); - size_t e3d_spos = s.tellp(); + auto const e3d_spos = s.tellp(); sn_utils::ls_uint32(s, 0); { sn_utils::ls_uint32(s, MAKE_ID4('S', 'U', 'B', '0')); - size_t sub_spos = s.tellp(); + auto const sub_spos = s.tellp(); sn_utils::ls_uint32(s, 0); for (size_t i = 0; i < models.size(); i++) models[i]->serialize(s, models, names, textures, transforms); - size_t pos = s.tellp(); + auto const pos = s.tellp(); s.seekp(sub_spos); sn_utils::ls_uint32(s, (uint32_t)(4 + pos - sub_spos)); s.seekp(pos); @@ -1460,11 +1460,11 @@ void TModel3d::SaveToBinFile(std::string const &FileName) if (textures.size()) { sn_utils::ls_uint32(s, MAKE_ID4('T', 'E', 'X', '0')); - size_t tex_spos = s.tellp(); + auto const tex_spos = s.tellp(); sn_utils::ls_uint32(s, 0); for (size_t i = 0; i < textures.size(); i++) sn_utils::s_str(s, textures[i]); - size_t pos = s.tellp(); + auto const pos = s.tellp(); s.seekp(tex_spos); sn_utils::ls_uint32(s, (uint32_t)(4 + pos - tex_spos)); s.seekp(pos); @@ -1473,17 +1473,17 @@ void TModel3d::SaveToBinFile(std::string const &FileName) if (names.size()) { sn_utils::ls_uint32(s, MAKE_ID4('N', 'A', 'M', '0')); - size_t nam_spos = s.tellp(); + auto const nam_spos = s.tellp(); sn_utils::ls_uint32(s, 0); for (size_t i = 0; i < names.size(); i++) sn_utils::s_str(s, names[i]); - size_t pos = s.tellp(); + auto const pos = s.tellp(); s.seekp(nam_spos); sn_utils::ls_uint32(s, (uint32_t)(4 + pos - nam_spos)); s.seekp(pos); } - size_t end = s.tellp(); + auto const end = s.tellp(); s.seekp(e3d_spos); sn_utils::ls_uint32(s, (uint32_t)(4 + end - e3d_spos)); s.close(); @@ -1727,8 +1727,9 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, pName = ""; if (iTexture > 0) { // obsługa stałej tekstury - if( iTexture < t->size() ) { - pTexture = t->at( iTexture ); + auto const textureindex = static_cast( iTexture ); + if( textureindex < t->size() ) { + pTexture = t->at( textureindex ); if( pTexture.find_last_of( "/\\" ) == std::string::npos ) pTexture.insert( 0, Global::asCurrentTexturePath ); TextureID = GfxRenderer.Fetch_Texture( pTexture ); diff --git a/Sound.cpp b/Sound.cpp index c3101245..dc559fe4 100644 --- a/Sound.cpp +++ b/Sound.cpp @@ -237,38 +237,22 @@ void TSoundsManager::RestoreAll() }; }; -void TSoundsManager::Init(HWND hWnd) -{ +bool TSoundsManager::Init(HWND hWnd) { - First = NULL; + First = nullptr; Count = 0; - pDS = NULL; - pDSNotify = NULL; + pDS = nullptr; + pDSNotify = nullptr; HRESULT hr; //=222; - LPDIRECTSOUNDBUFFER pDSBPrimary = NULL; - - // strcpy(Directory, NDirectory); + LPDIRECTSOUNDBUFFER pDSBPrimary = nullptr; // Create IDirectSound using the primary sound device hr = DirectSoundCreate(NULL, &pDS, NULL); - if (hr != DS_OK) - { + if (hr != DS_OK) { - if (hr == DSERR_ALLOCATED) - return; - if (hr == DSERR_INVALIDPARAM) - return; - if (hr == DSERR_NOAGGREGATION) - return; - if (hr == DSERR_NODRIVER) - return; - if (hr == DSERR_OUTOFMEMORY) - return; - - // hr=0; + return false; }; - // return ; // Set coop level to DSSCL_PRIORITY // if( FAILED( hr = pDS->SetCooperativeLevel( hWnd, DSSCL_PRIORITY ) ) ); @@ -285,8 +269,9 @@ void TSoundsManager::Init(HWND hWnd) dsbd.dwBufferBytes = 0; dsbd.lpwfxFormat = NULL; - if (FAILED(hr = pDS->CreateSoundBuffer(&dsbd, &pDSBPrimary, NULL))) - return; + if( FAILED( hr = pDS->CreateSoundBuffer( &dsbd, &pDSBPrimary, NULL ) ) ) { + return false; + } // Set primary buffer format to 22kHz and 16-bit output. WAVEFORMATEX wfx; @@ -298,8 +283,11 @@ void TSoundsManager::Init(HWND hWnd) wfx.nBlockAlign = wfx.wBitsPerSample / 8 * wfx.nChannels; wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; - if (FAILED(hr = pDSBPrimary->SetFormat(&wfx))) - return; + if( FAILED( hr = pDSBPrimary->SetFormat( &wfx ) ) ) { + return false; + } SAFE_RELEASE(pDSBPrimary); -}; \ No newline at end of file + + return true; +}; diff --git a/Sound.h b/Sound.h index 6b77d184..393d7dad 100644 --- a/Sound.h +++ b/Sound.h @@ -43,7 +43,7 @@ private: public: ~TSoundsManager(); - static void Init( HWND hWnd ); + static bool Init( HWND hWnd ); static void Free(); static LPDIRECTSOUNDBUFFER GetFromName( std::string const &Name, bool Dynamic, float *fSamplingRate = NULL ); static void RestoreAll(); diff --git a/Track.cpp b/Track.cpp index 8b55c4ca..27d41f9d 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2319,7 +2319,7 @@ int TTrack::TestPoint(vector3 *Point) return -1; }; -void TTrack::MovedUp1(double dh) +void TTrack::MovedUp1(float const dh) { // poprawienie przechyłki wymaga wydłużenia podsypki fTexHeight1 += dh; }; diff --git a/Track.h b/Track.h index 884d6907..573fca5f 100644 --- a/Track.h +++ b/Track.h @@ -261,7 +261,7 @@ public: TextureID2 ); }; bool IsGroupable(); int TestPoint(vector3 *Point); - void MovedUp1(double dh); + void MovedUp1(float const dh); std::string NameGet(); void VelocitySet(float v); float VelocityGet(); diff --git a/World.cpp b/World.cpp index 363defe2..51707372 100644 --- a/World.cpp +++ b/World.cpp @@ -288,17 +288,26 @@ bool TWorld::Init( GLFWwindow *Window ) { UILayer.set_background( "logo" ); - TSoundsManager::Init( glfwGetWin32Window( window ) ); - WriteLog("Sound Init OK"); + if( true == TSoundsManager::Init( glfwGetWin32Window( window ) ) ) { + WriteLog( "Sound subsystem setup complete" ); + } + else { + ErrorLog( "Sound subsystem setup failed" ); + return false; + } glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii UILayer.set_progress(0.01); UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" ); GfxRenderer.Render(); - WriteLog( "Ground init" ); + WriteLog( "World setup..." ); if( true == Ground.Init( Global::SceneryFile ) ) { - WriteLog( "Ground init OK" ); + WriteLog( "...world setup done" ); + } + else { + ErrorLog( "...world setup failed" ); + return false; } simulation::Time.init(); diff --git a/renderer.cpp b/renderer.cpp index e55a781d..081bdd91 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1431,7 +1431,7 @@ opengl_renderer::Render( TGroundNode *Node ) { ::glLineWidth( static_cast( linewidth ) ); } - GfxRenderer.Bind( 0 ); + GfxRenderer.Bind( NULL ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -1902,7 +1902,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); - Bind( 0 ); + Bind( NULL ); ::glPointSize( std::max( 3.f, 5.f * distancefactor * anglefactor ) ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], lightlevel * anglefactor ); ::glDisable( GL_LIGHTING ); @@ -1941,7 +1941,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); - Bind( 0 ); + Bind( NULL ); ::glDisable( GL_LIGHTING ); // main draw call @@ -2217,7 +2217,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { ::glLineWidth( static_cast(linewidth) ); } - GfxRenderer.Bind( 0 ); + GfxRenderer.Bind( NULL ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); From 846ed2139429e020b93b8e9ba47820b70b4ea723 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 10 Aug 2017 18:19:21 +0200 Subject: [PATCH 157/426] build 170810. multi-texture materials, reflection map support --- AnimModel.cpp | 17 +-- AnimModel.h | 2 +- Driver.cpp | 34 +++--- DynObj.cpp | 68 +++++------ DynObj.h | 2 +- Ground.cpp | 39 ++++-- Ground.h | 4 +- Model3d.cpp | 97 +++++++-------- Model3d.h | 20 ++-- PyInt.cpp | 25 ++-- Segment.cpp | 2 +- Sound.cpp | 40 +------ Texture.cpp | 123 ++++++++----------- Texture.h | 25 +++- Track.cpp | 60 +++++----- Track.h | 10 +- maszyna.vcxproj.filters | 6 + material.cpp | 143 ++++++++++++++++++++++ material.h | 64 ++++++++++ openglgeometrybank.cpp | 24 +++- openglgeometrybank.h | 3 +- renderer.cpp | 257 +++++++++++++++++++++++++--------------- renderer.h | 42 ++++--- uilayer.cpp | 6 +- version.h | 4 +- 25 files changed, 687 insertions(+), 430 deletions(-) create mode 100644 material.cpp create mode 100644 material.h diff --git a/AnimModel.cpp b/AnimModel.cpp index 02e33d9c..09a53eb9 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -440,14 +440,15 @@ bool TAnimModel::Init(TModel3d *pNewModel) bool TAnimModel::Init(std::string const &asName, std::string const &asReplacableTexture) { - if (asReplacableTexture.substr(0, 1) == - "*") // od gwiazdki zaczynają się teksty na wyświetlaczach - asText = asReplacableTexture.substr(1, asReplacableTexture.length() - 1); // zapamiętanie tekstu - else if (asReplacableTexture != "none") - m_materialdata.replacable_skins[1] = - GfxRenderer.Fetch_Texture( asReplacableTexture, "" ); - if( ( m_materialdata.replacable_skins[ 1 ] != 0 ) - && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) ) { + if( asReplacableTexture.substr( 0, 1 ) == "*" ) { + // od gwiazdki zaczynają się teksty na wyświetlaczach + asText = asReplacableTexture.substr( 1, asReplacableTexture.length() - 1 ); // zapamiętanie tekstu + } + else if( asReplacableTexture != "none" ) { + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( asReplacableTexture ); + } + if( ( m_materialdata.replacable_skins[ 1 ] != NULL ) + && ( GfxRenderer.Material( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) ) { // tekstura z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha = 0x31310031; } diff --git a/AnimModel.h b/AnimModel.h index 73bad8f7..cd5018ef 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "Model3d.h" -#include "Texture.h" +#include "material.h" #include "DynObj.h" const int iMaxNumLights = 8; diff --git a/Driver.cpp b/Driver.cpp index 185affc7..d8f60a17 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4591,20 +4591,20 @@ bool TController::UpdateSituation(double dt) // if not MinVelFlag) if (fBrakeTime < 0 ? true : (AccDesired < fAccGravity - 0.3) || (mvOccupied->BrakeCtrlPos <= 0)) - if (!IncBrake()) // jeśli upłynął czas reakcji hamulca, chyba że - // nagłe albo luzował + if( false == IncBrake() ) { + // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował MinVelFlag = true; - else - { + } + else { MinVelFlag = false; fBrakeTime = - 3 + - 0.5 * - (mvOccupied - ->BrakeDelay[2 + 2 * mvOccupied->BrakeDelayFlag] - - 3); - // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do - // zatrzymania jest mniejszy + 3.0 + + 0.5 * ( ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 1 ] : + mvOccupied->BrakeDelay[ 3 ] ) + - 3.0 ); + // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } if ((AccDesired < fAccGravity - 0.05) && (AbsAccS < AccDesired - 0.2)) @@ -4613,11 +4613,15 @@ bool TController::UpdateSituation(double dt) // if (fBrakeTime<0) { // jak hamuje, to nie tykaj kranu za często // yB: luzuje hamulec dopiero przy różnicy opóźnień rzędu 0.2 - if (OrderList[OrderPos] != - Disconnect) // przy odłączaniu nie zwalniamy tu hamulca + if( OrderList[ OrderPos ] != Disconnect ) { + // przy odłączaniu nie zwalniamy tu hamulca DecBrake(); // tutaj zmniejszało o 1 przy odczepianiu - fBrakeTime = - (mvOccupied->BrakeDelay[1 + 2 * mvOccupied->BrakeDelayFlag]) / 3.0; + } + fBrakeTime = ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 0 ] : + mvOccupied->BrakeDelay[ 2 ] ) + / 3.0; fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } } diff --git a/DynObj.cpp b/DynObj.cpp index 0f670004..01f263e6 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4036,7 +4036,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, { std::string nowheretexture = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie if( false == nowheretexture.empty() ) { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( nowheretexture, "", 9 ); + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Material( nowheretexture ); } if (m_materialdata.multi_textures > 0) { @@ -4048,7 +4048,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, int skinindex = 0; std::string texturename; nameparser >> texturename; while( ( texturename != "" ) && ( skinindex < 4 ) ) { - m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + texturename, "" ); + m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + texturename ); ++skinindex; texturename = ""; nameparser >> texturename; } @@ -4058,24 +4058,24 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // otherwise try the basic approach int skinindex = 0; do { - texture_handle texture = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), "", Global::iDynamicFiltering, true ); - if( texture == NULL ) { + material_handle material = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), true ); + if( material == NULL ) { break; } - m_materialdata.replacable_skins[ skinindex + 1 ] = texture; + m_materialdata.replacable_skins[ skinindex + 1 ] = material; ++skinindex; } while( skinindex < 4 ); m_materialdata.multi_textures = skinindex; if( m_materialdata.multi_textures == 0 ) { // zestaw nie zadziałał, próbujemy normanie - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin ); } } } else { - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin ); } - if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) { + if( GfxRenderer.Material( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) { // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha = 0x31310031; } @@ -4085,17 +4085,17 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } if( ( m_materialdata.replacable_skins[ 2 ] ) - && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 2 ] ).has_alpha ) ) { + && ( GfxRenderer.Material( m_materialdata.replacable_skins[ 2 ] ).has_alpha ) ) { // tekstura -2 z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha |= 0x02020002; } if( ( m_materialdata.replacable_skins[ 3 ] ) - && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 3 ] ).has_alpha ) ) { + && ( GfxRenderer.Material( m_materialdata.replacable_skins[ 3 ] ).has_alpha ) ) { // tekstura -3 z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha |= 0x04040004; } if( ( m_materialdata.replacable_skins[ 4 ] ) - && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 4 ] ).has_alpha ) ) { + && ( GfxRenderer.Material( m_materialdata.replacable_skins[ 4 ] ).has_alpha ) ) { // tekstura -4 z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha |= 0x08080008; } @@ -5371,7 +5371,7 @@ int TDynamicObject::RouteWish(TTrack *tr) std::string TDynamicObject::TextureTest(std::string const &name) { // Ra 2015-01: sprawdzenie dostępności tekstury o podanej nazwie - std::vector extensions = { ".dds", ".tga", ".bmp" }; + std::vector extensions = { ".mat", ".dds", ".tga", ".bmp" }; for( auto const &extension : extensions ) { if( true == FileExists( name + extension ) ) { return name + extension; @@ -5393,36 +5393,22 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) numer = Global::Bezogonkow(numer); asDestination = to; to = Global::Bezogonkow(to); // do szukania pliku obcinamy ogonki - std::string x = TextureTest(asBaseDir + numer + "@" + MoverParameters->TypeName); - if (!x.empty()) - { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się - return; + + std::vector destinations = { + asBaseDir + numer + "@" + MoverParameters->TypeName, + asBaseDir + numer, + asBaseDir + to + "@" + MoverParameters->TypeName, + asBaseDir + to, + asBaseDir + "nowhere" }; + + for( auto const &destination : destinations ) { + + auto material = TextureTest( destination ); + if( false == material.empty() ) { + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Material( material ); + break; + } } - x = TextureTest(asBaseDir + numer ); - if (!x.empty()) - { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się - return; - } - if (to.empty()) - to = "nowhere"; - x = TextureTest(asBaseDir + to + "@" + MoverParameters->TypeName); // w pierwszej kolejności z nazwą FIZ/MMD - if (!x.empty()) - { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się - return; - } - x = TextureTest(asBaseDir + to); // na razie prymitywnie - if (!x.empty()) - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się - else - { - x = TextureTest(asBaseDir + "nowhere"); // jak nie znalazł dedykowanej, to niech daje nowhere - if (!x.empty()) - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); - } - // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa tekstury nr 4 }; void TDynamicObject::OverheadTrack(float o) diff --git a/DynObj.h b/DynObj.h index 3509696a..f4b7c329 100644 --- a/DynObj.h +++ b/DynObj.h @@ -143,7 +143,7 @@ class TAnim struct material_data { int textures_alpha{ 0x30300030 }; // maska przezroczystości tekstur. default: tekstury wymienne nie mają przezroczystości - texture_handle replacable_skins[ 5 ] = { NULL, NULL, NULL, NULL, NULL }; // McZapkie:zmienialne nadwozie + material_handle replacable_skins[ 5 ] = { NULL, NULL, NULL, NULL, NULL }; // McZapkie:zmienialne nadwozie int multi_textures{ 0 }; //<0 tekstury wskazane wpisem, >0 tekstury z przecinkami, =0 jedna }; diff --git a/Ground.cpp b/Ground.cpp index 57b76e36..d4725ff4 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -67,7 +67,7 @@ TGroundNode::TGroundNode() nNext = nNext2 = NULL; iCount = 0; // wierzchołków w trójkącie // iNumPts=0; //punktów w linii - TextureID = 0; + m_material = 0; iFlags = 0; // tryb przezroczystości nie zbadany Pointer = NULL; // zerowanie wskaźnika kontekstowego bVisible = false; // czy widoczny @@ -508,7 +508,7 @@ TGroundRect::mergeable( TGroundNode const &Left, TGroundNode const &Right ) { // since view ranges and transparency type for all nodes put through this method are guaranteed to be equal, // we can skip their tests and only do the material check. // TODO, TBD: material as dedicated type, and refactor this method into a simple equality test - return ( ( Left.TextureID == Right.TextureID ) + return ( ( Left.m_material == Right.m_material ) && ( Left.Ambient == Right.Ambient ) && ( Left.Diffuse == Right.Diffuse ) && ( Left.Specular == Right.Specular ) ); @@ -776,7 +776,7 @@ void TGround::RaTriangleDivider(TGroundNode *node) TGroundNode *ntri; // wskaźnik na nowy trójkąt ntri = new TGroundNode(GL_TRIANGLES); // a ten jest nowy // kopiowanie parametrów, przydałby się konstruktor kopiujący - ntri->TextureID = node->TextureID; + ntri->m_material = node->m_material; ntri->iFlags = node->iFlags; ntri->Ambient = node->Ambient; ntri->Diffuse = node->Diffuse; @@ -1376,23 +1376,36 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) *parser >> token; } str = token; - tmp->TextureID = GfxRenderer.Fetch_Texture( str ); + tmp->m_material = GfxRenderer.Fetch_Material( str ); + auto const texturehandle = ( + tmp->m_material != NULL ? + GfxRenderer.Material( tmp->m_material ).texture1 : + NULL ); + auto const &texture = ( + texturehandle ? + GfxRenderer.Texture( texturehandle ) : + opengl_texture() ); // dirty workaround for lack of better api bool const clamps = ( - tmp->TextureID ? - GfxRenderer.Texture( tmp->TextureID ).traits.find( 's' ) != std::string::npos : + texturehandle ? + texture.traits.find( 's' ) != std::string::npos : false ); bool const clampt = ( - tmp->TextureID ? - GfxRenderer.Texture( tmp->TextureID ).traits.find( 't' ) != std::string::npos : + texturehandle ? + texture.traits.find( 't' ) != std::string::npos : false ); tmp->iFlags |= 200; // z usuwaniem // remainder of legacy 'problend' system -- geometry assigned a texture with '@' in its name is treated as translucent, opaque otherwise - tmp->iFlags |= ( - ( ( str.find( '@' ) != std::string::npos ) - && ( true == GfxRenderer.Texture( tmp->TextureID ).has_alpha ) ) ? - 0x20 : - 0x10 ); + if( texturehandle != NULL ) { + tmp->iFlags |= ( + ( ( texture.name.find( '@' ) != std::string::npos ) + && ( true == texture.has_alpha ) ) ? + 0x20 : + 0x10 ); + } + else { + tmp->iFlags |= 0x10; + } TGroundVertex vertex, vertex1, vertex2; std::size_t vertexcount{ 0 }; diff --git a/Ground.h b/Ground.h index d8b02ad9..13bc46cd 100644 --- a/Ground.h +++ b/Ground.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "VBO.h" #include "Classes.h" #include "ResourceManager.h" -#include "Texture.h" +#include "material.h" #include "dumb3d.h" #include "Float3d.h" #include "Names.h" @@ -140,7 +140,7 @@ public: int iCount; // dla terenu }; int iFlags; // tryb przezroczystości: 0x10-nieprz.,0x20-przezroczysty,0x30-mieszany - texture_handle TextureID; // główna (jedna) tekstura obiektu + material_handle m_material; // główna (jedna) tekstura obiektu glm::vec3 Ambient{ 1.0f, 1.0f, 1.0f }, Diffuse{ 1.0f, 1.0f, 1.0f }, diff --git a/Model3d.cpp b/Model3d.cpp index 2d1442af..be23304f 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -63,16 +63,16 @@ TSubModel::~TSubModel() // wyświetlania }; -void TSubModel::TextureNameSet(std::string const &Name) +void TSubModel::Name_Material(std::string const &Name) { // ustawienie nazwy submodelu, o // ile nie jest wczytany z E3D if (iFlags & 0x0200) { // tylko jeżeli submodel zosta utworzony przez new - pTexture = Name; + m_materialname = Name; } }; -void TSubModel::NameSet(std::string const &Name) +void TSubModel::Name(std::string const &Name) { // ustawienie nazwy submodelu, o ile // nie jest wczytany z E3D if (iFlags & 0x0200) @@ -177,7 +177,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic std::string token; parser.getTokens(1, false); // nazwa submodelu bez zmieny na małe parser >> token; - NameSet(token); + Name(token); if (dynamic) { // dla pojazdu, blokujemy załączone submodele, które mogą być nieobsługiwane if( ( token.size() >= 3 ) @@ -305,50 +305,51 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic */ if (!parser.expectToken("map:")) Error("Model map parse failure!"); - std::string texture = parser.getToken(); - if (texture == "none") + std::string material = parser.getToken(); + if (material == "none") { // rysowanie podanym kolorem - TextureID = 0; + m_material = NULL; iFlags |= 0x10; // rysowane w cyklu nieprzezroczystych } - else if (texture.find("replacableskin") != texture.npos) + else if (material.find("replacableskin") != material.npos) { // McZapkie-060702: zmienialne skory modelu - TextureID = -1; + m_material = -1; iFlags |= (Opacity < 1.0) ? 1 : 0x10; // zmienna tekstura 1 } - else if (texture == "-1") + else if (material == "-1") { - TextureID = -1; + m_material = -1; iFlags |= (Opacity < 1.0) ? 1 : 0x10; // zmienna tekstura 1 } - else if (texture == "-2") + else if (material == "-2") { - TextureID = -2; + m_material = -2; iFlags |= (Opacity < 1.0) ? 2 : 0x10; // zmienna tekstura 2 } - else if (texture == "-3") + else if (material == "-3") { - TextureID = -3; + m_material = -3; iFlags |= (Opacity < 1.0) ? 4 : 0x10; // zmienna tekstura 3 } - else if (texture == "-4") + else if (material == "-4") { - TextureID = -4; + m_material = -4; iFlags |= (Opacity < 1.0) ? 8 : 0x10; // zmienna tekstura 4 } else { // jeśli tylko nazwa pliku, to dawać bieżącą ścieżkę do tekstur - TextureNameSet(texture); - if( texture.find_first_of( "/\\" ) == texture.npos ) { - texture.insert( 0, Global::asCurrentTexturePath ); + Name_Material(material); + if( material.find_first_of( "/\\" ) == material.npos ) { + material.insert( 0, Global::asCurrentTexturePath ); } - TextureID = GfxRenderer.Fetch_Texture( texture ); + m_material = GfxRenderer.Fetch_Material( material ); // renderowanie w cyklu przezroczystych tylko jeśli: // 1. Opacity=0 (przejściowo <1, czy tam <100) oraz // 2. tekstura ma przezroczystość iFlags |= ( ( ( Opacity < 1.0 ) - && ( GfxRenderer.Texture(TextureID).has_alpha ) ) ? + && ( ( m_material != NULL ) + && ( GfxRenderer.Material( m_material ).has_alpha ) ) ) ? 0x20 : 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta }; @@ -591,10 +592,10 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic return iNumVerts; // do określenia wielkości VBO }; -int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) +int TSubModel::TriangleAdd(TModel3d *m, material_handle tex, int tri) { // dodanie trójkątów do submodelu, używane przy tworzeniu E3D terenu TSubModel *s = this; - while (s ? (s->TextureID != tex) : false) + while (s ? (s->m_material != tex) : false) { // szukanie submodelu o danej teksturze if (s == this) s = Child; @@ -603,15 +604,15 @@ int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) } if (!s) { - if (TextureID <= 0) + if (m_material <= 0) s = this; // użycie głównego else { // dodanie nowego submodelu do listy potomnych s = new TSubModel(); m->AddTo(this, s); } - s->TextureNameSet(GfxRenderer.Texture(tex).name); - s->TextureID = tex; + s->Name_Material(GfxRenderer.Material(tex).name); + s->m_material = tex; s->eType = GL_TRIANGLES; } if (s->iNumVerts < 0) @@ -672,7 +673,7 @@ void TSubModel::DisplayLists() glVertex3dv(&Vertices[i].Point.x); */ glNormal3fv(glm::value_ptr(Vertices[i].normal)); - glTexCoord2fv(glm::value_ptr(Vertices[i].texture)); + glTexCoord2fv(glm::value_ptr(Vertices[i].material)); glVertex3fv(glm::value_ptr(Vertices[i].position)); }; glEnd(); @@ -806,8 +807,8 @@ int TSubModel::FlagsCheck() int i = 0; if (Child) { // Child jest renderowany po danym submodelu - if (Child->TextureID) // o ile ma teksturę - if (Child->TextureID != TextureID) // i jest ona inna niż rodzica + if (Child->m_material) // o ile ma teksturę + if (Child->m_material != m_material) // i jest ona inna niż rodzica Child->iFlags |= 0x80; // to trzeba sprawdzać, jak z teksturami jest i = Child->FlagsCheck(); iFlags |= 0x00FF0000 & ((i << 16) | (i) | (i >> 8)); // potomny, rodzeństwo i dzieci @@ -825,8 +826,8 @@ int TSubModel::FlagsCheck() if (Next) { // Next jest renderowany po danym submodelu (kolejność odwrócona // po wczytaniu T3D) - if (TextureID) // o ile dany ma teksturę - if ((TextureID != Next->TextureID) || + if (m_material) // o ile dany ma teksturę + if ((m_material != Next->m_material) || (i & 0x00800000)) // a ma inną albo dzieci zmieniają iFlags |= 0x80; // to dany submodel musi sobie ją ustawiać i = Next->FlagsCheck(); @@ -1085,9 +1086,9 @@ TSubModel::convert( TGroundNode &Groundnode ) const { Groundnode.Ambient = f4Ambient; Groundnode.Diffuse = f4Diffuse; Groundnode.Specular = f4Specular; - Groundnode.TextureID = TextureID; + Groundnode.m_material = m_material; Groundnode.iFlags = ( - ( true == GfxRenderer.Texture( TextureID ).has_alpha ) ? + ( true == GfxRenderer.Material( m_material ).has_alpha ) ? 0x20 : 0x10 ); @@ -1379,10 +1380,10 @@ void TSubModel::serialize(std::ostream &s, sn_utils::ls_int32(s, iNumVerts); sn_utils::ls_int32(s, tVboPtr); - if (TextureID <= 0) - sn_utils::ls_int32(s, TextureID); + if (m_material <= 0) + sn_utils::ls_int32(s, m_material); else - sn_utils::ls_int32(s, (int32_t)get_container_pos(textures, pTexture)); + sn_utils::ls_int32(s, (int32_t)get_container_pos(textures, m_materialname)); sn_utils::ls_float32(s, fVisible); sn_utils::ls_float32(s, fLight); @@ -1727,27 +1728,29 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, pName = ""; if (iTexture > 0) { // obsługa stałej tekstury - auto const textureindex = static_cast( iTexture ); - if( textureindex < t->size() ) { - pTexture = t->at( textureindex ); - if( pTexture.find_last_of( "/\\" ) == std::string::npos ) - pTexture.insert( 0, Global::asCurrentTexturePath ); - TextureID = GfxRenderer.Fetch_Texture( pTexture ); + auto const materialindex = static_cast( iTexture ); + if( materialindex < t->size() ) { + m_materialname = t->at( materialindex ); + if( m_materialname.find_last_of( "/\\" ) == std::string::npos ) { + m_materialname = Global::asCurrentTexturePath + m_materialname; + } + m_material = GfxRenderer.Fetch_Material( m_materialname ); if( ( iFlags & 0x30 ) == 0 ) { // texture-alpha based fallback if for some reason we don't have opacity flag set yet - iFlags |= - ( GfxRenderer.Texture( TextureID ).has_alpha ? + iFlags |= ( + ( ( m_material != NULL ) + && ( GfxRenderer.Material( m_material ).has_alpha ) ) ? 0x20 : 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta } } else { ErrorLog( "Bad model: reference to non-existent texture index in sub-model" + ( pName.empty() ? "" : " \"" + pName + "\"" ) ); - TextureID = NULL; + m_material = NULL; } } else - TextureID = iTexture; + m_material = iTexture; b_aAnim = b_Anim; // skopiowanie animacji do drugiego cyklu diff --git a/Model3d.h b/Model3d.h index 4e72b3c4..17efe8d2 100644 --- a/Model3d.h +++ b/Model3d.h @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "dumb3d.h" #include "Float3d.h" #include "VBO.h" -#include "Texture.h" +#include "material.h" using namespace Math3D; @@ -122,7 +122,7 @@ private: TSubModel *Next { nullptr }; TSubModel *Child { nullptr }; geometry_handle m_geometry { NULL, NULL }; // geometry of the submodel - texture_handle TextureID { NULL }; // numer tekstury, -1 wymienna, 0 brak + material_handle m_material { NULL }; // numer tekstury, -1 wymienna, 0 brak bool bWire { false }; // nie używane, ale wczytywane float Opacity { 1.0f }; float f_Angle { 0.0f }; @@ -143,7 +143,7 @@ public: TSubModel **smLetter{ nullptr }; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) TSubModel *Parent{ nullptr }; // nadrzędny, np. do wymnażania macierzy int iVisible{ 1 }; // roboczy stan widoczności - std::string pTexture; // robocza nazwa tekstury do zapisania w pliku binarnym + std::string m_materialname; // robocza nazwa tekstury do zapisania w pliku binarnym std::string pName; // robocza nazwa private: int SeekFaceNormal( std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, vertex_array const &Vertices ); @@ -151,7 +151,7 @@ private: public: static size_t iInstance; // identyfikator egzemplarza, który aktualnie renderuje model - static texture_handle const *ReplacableSkinId; + static material_handle const *ReplacableSkinId; static int iAlpha; // maska bitowa dla danego przebiegu static double fSquareDist; static TModel3d *pRoot; @@ -162,7 +162,7 @@ public: void NextAdd(TSubModel *SubModel); TSubModel * NextGet() { return Next; }; TSubModel * ChildGet() { return Child; }; - int TriangleAdd(TModel3d *m, texture_handle tex, int tri); + int TriangleAdd(TModel3d *m, material_handle tex, int tri); /* basic_vertex * TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ); */ @@ -186,13 +186,13 @@ public: }; void InitialRotate(bool doit); void BinInit(TSubModel *s, float4x4 *m, std::vector *t, std::vector *n, bool dynamic); - void ReplacableSet(texture_handle const *r, int a) + void ReplacableSet(material_handle const *r, int a) { ReplacableSkinId = r; iAlpha = a; }; - void TextureNameSet( std::string const &Name ); - void NameSet( std::string const &Name ); + void Name_Material( std::string const &Name ); + void Name( std::string const &Name ); // Ra: funkcje do budowania terenu z E3D int Flags() { return iFlags; }; void UnFlagNext() { iFlags &= 0x00FFFFFF; }; @@ -203,8 +203,8 @@ public: return fMatrix ? *(fMatrix->TranslationGet()) + v_TransVector : v_TransVector; } inline float3 Translation2Get() { return *(fMatrix->TranslationGet()) + Child->Translation1Get(); } - int GetTextureId() { - return TextureID; } + material_handle GetMaterial() { + return m_material; } void ParentMatrix(float4x4 *m); float MaxY( float4x4 const &m ); void AdjustDist(); diff --git a/PyInt.cpp b/PyInt.cpp index 8a6a74b4..5203afbb 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -291,21 +291,16 @@ void TPythonScreenRenderer::updateTexture() sprintf(buff, "Sending texture id: %d w: %d h: %d", _textureId, width, height); WriteLog(buff); #endif // _PY_INT_MORE_LOG - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - GfxRenderer.Bind(_textureId); +/* + glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); + glPixelStorei( GL_PACK_ALIGNMENT, 1 ); +*/ + GfxRenderer.Bind_Material(_textureId); // setup texture parameters - if( GLEW_VERSION_1_4 ) { - - glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE ); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); - glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0 ); - } - else { - - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - } + glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); + glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0 ); // build texture glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, textureData ); @@ -457,7 +452,7 @@ void TPythonScreens::init(cParser &parser, TModel3d *model, std::string const &n WriteLog( "Python Screen: submodel " + subModelName + " not found - Ignoring screen" ); return; // nie ma takiego sub modelu w danej kabinie pomijamy } - auto textureId = subModel->GetTextureId(); + auto textureId = subModel->GetMaterial(); if (textureId <= 0) { WriteLog( "Python Screen: invalid texture id " + std::to_string(textureId) + " - Ignoring screen" ); diff --git a/Segment.cpp b/Segment.cpp index ea9a8e6b..a6b84785 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -454,7 +454,7 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, void TSegment::Render() { vector3 pt; - GfxRenderer.Bind(0); + GfxRenderer.Bind_Material( NULL ); if (bCurve) { diff --git a/Sound.cpp b/Sound.cpp index dc559fe4..71198f62 100644 --- a/Sound.cpp +++ b/Sound.cpp @@ -244,50 +244,14 @@ bool TSoundsManager::Init(HWND hWnd) { pDS = nullptr; pDSNotify = nullptr; - HRESULT hr; //=222; - LPDIRECTSOUNDBUFFER pDSBPrimary = nullptr; - // Create IDirectSound using the primary sound device - hr = DirectSoundCreate(NULL, &pDS, NULL); + auto hr = ::DirectSoundCreate(NULL, &pDS, NULL); if (hr != DS_OK) { return false; }; - // Set coop level to DSSCL_PRIORITY - // if( FAILED( hr = pDS->SetCooperativeLevel( hWnd, DSSCL_PRIORITY ) ) ); - // return ; - pDS->SetCooperativeLevel(hWnd, DSSCL_PRIORITY); - - // Get the primary buffer - DSBUFFERDESC dsbd; - ZeroMemory(&dsbd, sizeof(DSBUFFERDESC)); - dsbd.dwSize = sizeof(DSBUFFERDESC); - dsbd.dwFlags = DSBCAPS_PRIMARYBUFFER; - if (!Global::bInactivePause) // jeśli przełączony w tło ma nadal działać - dsbd.dwFlags |= DSBCAPS_GLOBALFOCUS; // to dźwięki mają być również słyszalne - dsbd.dwBufferBytes = 0; - dsbd.lpwfxFormat = NULL; - - if( FAILED( hr = pDS->CreateSoundBuffer( &dsbd, &pDSBPrimary, NULL ) ) ) { - return false; - } - - // Set primary buffer format to 22kHz and 16-bit output. - WAVEFORMATEX wfx; - ZeroMemory(&wfx, sizeof(WAVEFORMATEX)); - wfx.wFormatTag = WAVE_FORMAT_PCM; - wfx.nChannels = 2; - wfx.nSamplesPerSec = 44100; - wfx.wBitsPerSample = 16; - wfx.nBlockAlign = wfx.wBitsPerSample / 8 * wfx.nChannels; - wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; - - if( FAILED( hr = pDSBPrimary->SetFormat( &wfx ) ) ) { - return false; - } - - SAFE_RELEASE(pDSBPrimary); + pDS->SetCooperativeLevel(hWnd, DSSCL_NORMAL); return true; }; diff --git a/Texture.cpp b/Texture.cpp index ce557936..1f603e97 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -506,18 +506,15 @@ opengl_texture::load_TGA() { return; } -resource_state +bool opengl_texture::bind() { - if( false == is_ready ) { - - create(); - if( data_state != resource_state::good ) { - return data_state; - } + if( ( false == is_ready ) + && ( false == create() ) ) { + return false; } ::glBindTexture( GL_TEXTURE_2D, id ); - return data_state; + return true; } bool @@ -645,40 +642,7 @@ opengl_texture::set_filtering() { switch( trait ) { case '#': { sharpen = true; break; } -/* - // legacy filter modes. TODO, TBD: get rid of them? - // let's just turn them off and see if anyone notices. - case '4': { - // najbliższy z tekstury - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); - break; - } - case '5': { - //średnia z tekstury - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - break; - } - case '6': { - // najbliższy z mipmapy - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST ); - break; - } - case '7': { - //średnia z mipmapy - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST ); - break; - } - case '8': { - // najbliższy z dwóch mipmap - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR ); - break; - } - case '9': { - //średnia z dwóch mipmap - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); - break; - } -*/ + default: { break; } } } @@ -718,9 +682,27 @@ opengl_texture::downsize( GLuint const Format ) { }; } +void +texture_manager::assign_units( GLint const Helper, GLint const Shadows, GLint const Normals, GLint const Diffuse ) { + + m_units[ 0 ].unit = Helper; + m_units[ 1 ].unit = Shadows; + m_units[ 2 ].unit = Normals; + m_units[ 3 ].unit = Diffuse; +} + +void +texture_manager::unit( GLint const Textureunit ) { + + if( m_activeunit == Textureunit ) { return; } + + m_activeunit = Textureunit; + ::glActiveTexture( Textureunit ); +} + // ustalenie numeru tekstury, wczytanie jeśli jeszcze takiej nie było texture_handle -texture_manager::create( std::string Filename, std::string const &Dir, int const Filter, bool const Loadnow ) { +texture_manager::create( std::string Filename, bool const Loadnow ) { if( Filename.find( '|' ) != std::string::npos ) Filename.erase( Filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury @@ -801,11 +783,7 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const auto texture = new opengl_texture(); texture->name = filename; - if( ( Filter > 0 ) && ( Filter < 10 ) ) { - // temporary. TODO, TBD: check how it's used and possibly get rid of it - traits += std::to_string( ( Filter < 4 ? Filter + 4 : Filter ) ); - } - if( Filename.find('#') !=std::string::npos ) { + if( Filename.find('#') != std::string::npos ) { // temporary code for legacy assets -- textures with names beginning with # are to be sharpened traits += '#'; } @@ -830,33 +808,37 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const }; void -texture_manager::bind( texture_handle const Texture ) { +texture_manager::bind( std::size_t const Unit, texture_handle const Texture ) { m_textures[ Texture ].second = m_garbagecollector.timestamp(); - if( ( Texture != 0 ) && ( Texture == m_activetexture ) ) { + if( Texture == m_units[ Unit ].texture ) { // don't bind again what's already active return; } - // TODO: do binding in texture object, add support for other types - if( Texture != 0 ) { + // TBD, TODO: do binding in texture object, add support for other types than 2d + if( m_units[ Unit ].unit == NULL ) { return; } + unit( m_units[ Unit ].unit ); + if( Texture != NULL ) { #ifndef EU07_DEFERRED_TEXTURE_UPLOAD // NOTE: we could bind dedicated 'error' texture here if the id isn't valid ::glBindTexture( GL_TEXTURE_2D, texture(Texture).id ); - m_activetexture = Texture; + m_units[ Unit ].texture = Texture; #else - if( texture( Texture ).bind() == resource_state::good ) { - m_activetexture = Texture; + if( true == texture( Texture ).bind() ) { + m_units[ Unit ].texture = Texture; } else { // TODO: bind a special 'error' texture on failure + ::glBindTexture( GL_TEXTURE_2D, NULL ); + m_units[ Unit ].texture = NULL; } #endif } else { - ::glBindTexture( GL_TEXTURE_2D, 0 ); - m_activetexture = 0; + ::glBindTexture( GL_TEXTURE_2D, NULL ); + m_units[ Unit ].texture = NULL; } // all done return; @@ -879,7 +861,9 @@ void texture_manager::update() { if( m_garbagecollector.sweep() > 0 ) { - m_activetexture = -1; + for( auto &unit : m_units ) { + unit.texture = -1; + } } } @@ -943,21 +927,10 @@ texture_manager::find_in_databank( std::string const &Texturename ) const { std::string texture_manager::find_on_disk( std::string const &Texturename ) const { - { - std::ifstream file( Texturename ); - if( true == file.is_open() ) { - // success - return Texturename; - } - } - // if we fail make a last ditch attempt in the default textures directory - { - std::ifstream file( szTexturePath + Texturename ); - if( true == file.is_open() ) { - // success - return szTexturePath + Texturename; - } - } - // no results either way, report failure - return ""; + return( + FileExists( Texturename ) ? Texturename : + FileExists( szTexturePath + Texturename ) ? szTexturePath + Texturename : + "" ); } + +//--------------------------------------------------------------------------- diff --git a/Texture.h b/Texture.h index 69119271..41d1407e 100644 --- a/Texture.h +++ b/Texture.h @@ -31,7 +31,7 @@ struct opengl_texture { // methods void load(); - resource_state + bool bind(); bool create(); @@ -85,12 +85,17 @@ public: texture_manager(); ~texture_manager() { delete_textures(); } - texture_handle - create( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ); void - bind( texture_handle const Texture ); + assign_units( GLint const Helper, GLint const Shadows, GLint const Normals, GLint const Diffuse ); + void + unit( GLint const Textureunit ); + texture_handle + create( std::string Filename, bool const Loadnow = true ); + // binds specified texture to specified texture unit + void + bind( std::size_t const Unit, texture_handle const Texture ); opengl_texture & - texture( texture_handle const Texture ) { return *(m_textures[ Texture ].first); } + texture( texture_handle const Texture ) const { return *(m_textures[ Texture ].first); } // performs a resource sweep void update(); @@ -108,6 +113,11 @@ private: typedef std::unordered_map index_map; + struct texture_unit { + GLint unit { NULL }; + texture_handle texture { NULL }; // current (most recently bound) texture + }; + // methods: // checks whether specified texture is in the texture bank. returns texture id, or npos. texture_handle @@ -123,7 +133,8 @@ private: texturetimepointpair_sequence m_textures; index_map m_texturemappings; garbage_collector m_garbagecollector { m_textures, 600, 60, "texture" }; - texture_handle m_activetexture { 0 }; // last i.e. currently bound texture + std::array m_units; + GLint m_activeunit { NULL }; }; // reduces provided data image to half of original size, using basic 2x2 average @@ -182,3 +193,5 @@ downsample( std::size_t const Width, std::size_t const Height, char *Imagedata ) } } } + +//--------------------------------------------------------------------------- diff --git a/Track.cpp b/Track.cpp index 27d41f9d..da96f6d2 100644 --- a/Track.cpp +++ b/Track.cpp @@ -483,20 +483,20 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) { parser->getTokens(); *parser >> str; // railtex - TextureID1 = ( + m_material1 = ( str == "none" ? NULL : - GfxRenderer.Fetch_Texture( str ) ); + GfxRenderer.Fetch_Material( str ) ); parser->getTokens(); *parser >> fTexLength; // tex tile length if (fTexLength < 0.01) fTexLength = 4; // Ra: zabezpiecznie przed zawieszeniem parser->getTokens(); *parser >> str; // sub || railtex - TextureID2 = ( + m_material2 = ( str == "none" ? NULL : - GfxRenderer.Fetch_Texture( str ) ); + GfxRenderer.Fetch_Material( str ) ); parser->getTokens(3); *parser >> fTexHeight1 >> fTexWidth >> fTexSlope; if (iCategoryFlag & 4) @@ -547,15 +547,15 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) SwitchExtension->Segments[0]->Init(p1, p2, segsize); // kopia oryginalnego toru } else if (iCategoryFlag & 2) - if (TextureID1 && fTexLength) + if (m_material1 && fTexLength) { // dla drogi trzeba ustalić proporcje boków nawierzchni float w, h; - GfxRenderer.Bind(TextureID1); + GfxRenderer.Bind_Material(m_material1); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h); if (h != 0.0) fTexRatio1 = w / h; // proporcja boków - GfxRenderer.Bind(TextureID2); + GfxRenderer.Bind_Material(m_material2); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h); if (h != 0.0) @@ -1205,7 +1205,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { case tt_Table: // obrotnica jak zwykły tor, tylko animacja dochodzi case tt_Normal: - if (TextureID2) + if (m_material2) { // podsypka z podkładami jest tylko dla zwykłego toru vector6 bpts1[8]; // punkty głównej płaszczyzny nie przydają się do robienia boków if (fTexLength == 4.0) // jeśli stare mapowanie @@ -1275,7 +1275,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { GfxRenderer.Replace( vertices, Geometry2[ 0 ] ); } } - if (TextureID1) + if (m_material1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną vertex_array vertices; if( ( Bank != 0 ) && ( true == Geometry1.empty() ) ) { @@ -1296,7 +1296,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } break; case tt_Switch: // dla zwrotnicy dwa razy szyny - if( TextureID1 || TextureID2 ) + if( m_material1 || m_material2 ) { // iglice liczone tylko dla zwrotnic vector6 rpts3[24], rpts4[24]; for (i = 0; i < 12; ++i) @@ -1326,7 +1326,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa vertex_array vertices; - if( TextureID1 ) { + if( m_material1 ) { // fixed parts SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1339,7 +1339,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - if( TextureID2 ) { + if( m_material2 ) { // fixed parts SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1356,7 +1356,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { else { // lewa działa lepiej niż prawa vertex_array vertices; - if( TextureID1 ) { + if( m_material1 ) { // fixed parts SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1369,7 +1369,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - if( TextureID2 ) { + if( m_material2 ) { // fixed parts SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1394,7 +1394,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { case tt_Normal: // drogi proste, bo skrzyżowania osobno { vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma + if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 @@ -1413,13 +1413,13 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { bpts1[ 1 ] = vector6( -fHTW, 0.0, 0.5 + map1, 0.0, 1.0, 0.0 ); } } - if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty + if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy vertex_array vertices; Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } - if (TextureID2) + if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) vector6 rpts1[6], @@ -1574,7 +1574,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { nullptr : SwitchExtension->vPoints; // zmienna robocza, NULL gdy tablica punktów już jest wypełniona vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma + if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 @@ -1592,7 +1592,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { // problem ze skrzyżowaniami jest taki, że teren chce się pogrupować wg tekstur, ale zaczyna od nawierzchni // sama nawierzchnia nie wypełni tablicy punktów, bo potrzebne są pobocza // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie w swoim czasie - if( TextureID2 ) + if( m_material2 ) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) vector6 rpts1[6], @@ -1651,7 +1651,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y - fTexHeight2, 0.484375 - map2l); // lewy brzeg lewego chodnika } } - bool render = ( TextureID2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni + bool render = ( m_material2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni vertex_array vertices; if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka @@ -1707,7 +1707,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { SwitchExtension->bPoints = true; // tablica punktów została wypełniona } - if( TextureID1 ) { + if( m_material1 ) { vertex_array vertices; // jeśli podana tekstura nawierzchni // we start with a vertex in the middle... @@ -1759,7 +1759,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { case tt_Normal: // drogi proste, bo skrzyżowania osobno { vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma + if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% double max = (iCategoryFlag & 4) ? 0.0 : @@ -1784,13 +1784,13 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { bpts1[1] = vector6(-fHTW, 0.0, 0.5 + map1); } } - if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty + if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy vertex_array vertices; Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } - if (TextureID2) + if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) vertex_array vertices; vector6 rpts1[6], @@ -2105,8 +2105,8 @@ TTrack * TTrack::RaAnimate() } } // skip the geometry update if no geometry for this track was generated yet - if( ( ( TextureID1 != 0 ) - || ( TextureID2 != 0 ) ) + if( ( ( m_material1 != 0 ) + || ( m_material2 != 0 ) ) && ( ( false == Geometry1.empty() ) || ( false == Geometry2.empty() ) ) ) { // iglice liczone tylko dla zwrotnic @@ -2143,13 +2143,13 @@ TTrack * TTrack::RaAnimate() if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - if( TextureID1 ) { + if( m_material1 ) { // left blade SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } - if( TextureID2 ) { + if( m_material2 ) { // right blade SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); @@ -2157,13 +2157,13 @@ TTrack * TTrack::RaAnimate() } } else { // lewa działa lepiej niż prawa - if( TextureID1 ) { + if( m_material1 ) { // right blade SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } - if( TextureID2 ) { + if( m_material2 ) { // left blade SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); diff --git a/Track.h b/Track.h index 573fca5f..2211ff10 100644 --- a/Track.h +++ b/Track.h @@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "GL/glew.h" #include "ResourceManager.h" #include "Segment.h" -#include "Texture.h" +#include "material.h" typedef enum { @@ -142,8 +142,8 @@ private: /* GLuint DisplayListID = 0; */ - texture_handle TextureID1 = 0; // tekstura szyn albo nawierzchni - texture_handle TextureID2 = 0; // tekstura automatycznej podsypki albo pobocza + material_handle m_material1 = 0; // tekstura szyn albo nawierzchni + material_handle m_material2 = 0; // tekstura automatycznej podsypki albo pobocza typedef std::vector geometryhandle_sequence; geometryhandle_sequence Geometry1; // geometry chunks textured with texture 1 geometryhandle_sequence Geometry2; // geometry chunks textured with texture 2 @@ -257,8 +257,8 @@ public: GLuint TextureGet(int i) { return ( i ? - TextureID1 : - TextureID2 ); }; + m_material1 : + m_material2 ); }; bool IsGroupable(); int TestPoint(vector3 *Point); void MovedUp1(float const dh); diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index e4762bc0..00ac0856 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -225,6 +225,9 @@ Source Files + + Source Files + @@ -440,6 +443,9 @@ Header Files + + Header Files + diff --git a/material.cpp b/material.cpp new file mode 100644 index 00000000..c9c82eed --- /dev/null +++ b/material.cpp @@ -0,0 +1,143 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" + +#include "material.h" +#include "renderer.h" +#include "usefull.h" +#include "globals.h" + +bool +opengl_material::deserialize( cParser &Input, bool const Loadnow ) { + + bool result { false }; + while( true == deserialize_mapping( Input, Loadnow ) ) { + result = true; // once would suffice but, eh + } + + has_alpha = ( + texture1 != NULL ? + GfxRenderer.Texture( texture1 ).has_alpha : + false ); + + return result; +} + +// imports member data pair from the config file +bool +opengl_material::deserialize_mapping( cParser &Input, bool const Loadnow ) { + + if( false == Input.getTokens( 2, true, "\n\r\t;, " ) ) { + return false; + } + + std::string path; + if( name.rfind( '\\' ) != std::string::npos ) { + path = name.substr( 0, name.rfind( '\\' ) + 1 ); + } + + std::string key, value; + Input + >> key + >> value; + + if( key == "texture1:" ) { texture1 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); } + else if( key == "texture2:" ) { texture2 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); } + + return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized +} + + +// create material object from data stored in specified file. +// NOTE: the deferred load parameter is passed to textures defined by material, the material itself is always loaded immediately +material_handle +material_manager::create( std::string const &Filename, bool const Loadnow ) { + + auto filename { Filename }; + + if( filename.find( '|' ) != std::string::npos ) + filename.erase( filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury + + if( filename.rfind( '.' ) != std::string::npos ) { + // we can get extension for .mat or, in legacy files, some image format. just trim it and set it to material file extension + filename.erase( filename.rfind( '.' ) ); + } + filename += ".mat"; + + for( char &c : filename ) { + // change forward slashes to windows ones. NOTE: probably not strictly necessary, but eh + c = ( c == '/' ? '\\' : c ); + } + if( filename.find( '\\' ) == std::string::npos ) { + // jeśli bieżaca ścieżka do tekstur nie została dodana to dodajemy domyślną + filename = szTexturePath + filename; + } + + // try to locate requested material in the databank + auto const databanklookup = find_in_databank( filename ); + if( databanklookup != npos ) { + return databanklookup; + } + // if this fails, try to look for it on disk + opengl_material material; + material.name = filename; + auto const disklookup = find_on_disk( filename ); + if( disklookup != "" ) { + cParser materialparser( disklookup, cParser::buffer_FILE ); + if( false == material.deserialize( materialparser, Loadnow ) ) { + // deserialization failed but the .mat file does exist, so we give up at this point + return NULL; + } + } + else { + // if there's no .mat file, this could be legacy method of referring just to diffuse texture directly, make a material out of it in such case + material.texture1 = GfxRenderer.Fetch_Texture( Filename, Loadnow ); + if( material.texture1 == NULL ) { + // if there's also no texture, give up + return NULL; + } + material.has_alpha = GfxRenderer.Texture( material.texture1 ).has_alpha; + } + + material_handle handle = m_materials.size(); + m_materials.emplace_back( material ); + m_materialmappings.emplace( material.name, handle ); + return handle; +}; + +// checks whether specified texture is in the texture bank. returns texture id, or npos. +material_handle +material_manager::find_in_databank( std::string const &Materialname ) const { + + auto lookup = m_materialmappings.find( Materialname ); + if( lookup != m_materialmappings.end() ) { + return lookup->second; + } + // jeszcze próba z dodatkową ścieżką + lookup = m_materialmappings.find( szTexturePath + Materialname ); + + return ( + lookup != m_materialmappings.end() ? + lookup->second : + npos ); +} + +// checks whether specified file exists. +// NOTE: this is direct copy of the method used by texture manager. TBD, TODO: refactor into common routine? +std::string +material_manager::find_on_disk( std::string const &Materialname ) const { + + return( + FileExists( Materialname ) ? Materialname : + FileExists( szTexturePath + Materialname ) ? szTexturePath + Materialname : + "" ); +} + +//--------------------------------------------------------------------------- diff --git a/material.h b/material.h new file mode 100644 index 00000000..52e863f1 --- /dev/null +++ b/material.h @@ -0,0 +1,64 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "texture.h" +#include "parser.h" + +typedef int material_handle; + +// a collection of parameters for the rendering setup. +// for modern opengl this translates to set of attributes for the active shaders, +// for legacy opengl this is basically just texture(s) assigned to geometry +struct opengl_material { + + texture_handle texture1 { NULL }; // primary texture, typically diffuse+apha + texture_handle texture2 { NULL }; // secondary texture, typically normal+reflection + + bool has_alpha { false }; // alpha state, calculated from presence of alpha in texture1 + std::string name; +// methods: + bool + deserialize( cParser &Input, bool const Loadnow ); +private: + // imports member data pair from the config file + bool + deserialize_mapping( cParser &Input, bool const Loadnow ); +}; + +class material_manager { + +public: + material_manager() { m_materials.emplace_back( opengl_material() ); } // empty bindings for null material + + material_handle + create( std::string const &Filename, bool const Loadnow ); + opengl_material const & + material( material_handle const Material ) const { return m_materials[ Material ]; } + +private: +// types + typedef std::vector material_sequence; + typedef std::unordered_map index_map; +// methods: + // checks whether specified texture is in the texture bank. returns texture id, or npos. + texture_handle + find_in_databank( std::string const &Materialname ) const; + // checks whether specified file exists. returns name of the located file, or empty string. + std::string + find_on_disk( std::string const &Materialname ) const; +// members: + material_handle const npos { -1 }; + material_sequence m_materials; + index_map m_materialmappings; + +}; + +//--------------------------------------------------------------------------- diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index 0a046ead..9d622f3a 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -120,6 +120,7 @@ geometry_bank::vertices( geometry_handle const &Geometry ) const { GLuint opengl_vbogeometrybank::m_activebuffer { NULL }; // buffer bound currently on the opengl end, if any unsigned int opengl_vbogeometrybank::m_activestreams { stream::none }; // currently enabled data type pointers +std::vector opengl_vbogeometrybank::m_activetexturearrays; // currently enabled texture coord arrays // create() subclass details void @@ -274,12 +275,19 @@ opengl_vbogeometrybank::bind_streams( stream_units const &Units, unsigned int co ::glDisableClientState( GL_COLOR_ARRAY ); } if( Streams & stream::texture ) { - ::glClientActiveTexture( Units.texture ); - ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); - ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + for( auto unit : Units.texture ) { + ::glClientActiveTexture( unit ); + ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); + ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + } + m_activetexturearrays = Units.texture; } else { - ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + for( auto unit : Units.texture ) { + ::glClientActiveTexture( unit ); + ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + } + m_activetexturearrays.clear(); // NOTE: we're simplifying here, since we always toggle the same texture coord sets } m_activestreams = Streams; @@ -291,9 +299,13 @@ opengl_vbogeometrybank::release_streams() { ::glDisableClientState( GL_VERTEX_ARRAY ); ::glDisableClientState( GL_NORMAL_ARRAY ); ::glDisableClientState( GL_COLOR_ARRAY ); - ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + for( auto unit : m_activetexturearrays ) { + ::glClientActiveTexture( unit ); + ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + } m_activestreams = stream::none; + m_activetexturearrays.clear(); } // opengl display list based variant of the geometry bank @@ -331,7 +343,7 @@ opengl_dlgeometrybank::draw_( geometry_handle const &Geometry, stream_units cons for( auto const &vertex : chunk.vertices ) { if( Streams & stream::normal ) { ::glNormal3fv( glm::value_ptr( vertex.normal ) ); } else if( Streams & stream::color ) { ::glColor3fv( glm::value_ptr( vertex.normal ) ); } - if( Streams & stream::texture ) { ::glMultiTexCoord2fv( Units.texture, glm::value_ptr( vertex.texture ) ); } + if( Streams & stream::texture ) { for( auto unit : Units.texture ) { ::glMultiTexCoord2fv( unit, glm::value_ptr( vertex.texture ) ); } } if( Streams & stream::position ) { ::glVertex3fv( glm::value_ptr( vertex.position ) ); } } ::glEnd(); diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 90bec5a0..9a4a7773 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -46,7 +46,7 @@ unsigned int const color_streams { stream::position | stream::color | stream::te struct stream_units { - GLint texture { GL_TEXTURE0 }; // unit associated with main texture data stream. TODO: allow multiple units per stream + std::vector texture { GL_TEXTURE0 }; // unit associated with main texture data stream. TODO: allow multiple units per stream }; typedef std::vector vertex_array; @@ -207,6 +207,7 @@ private: // members: static GLuint m_activebuffer; // buffer bound currently on the opengl end, if any static unsigned int m_activestreams; + static std::vector m_activetexturearrays; GLuint m_buffer { NULL }; // id of the buffer holding data on the opengl end std::size_t m_buffercapacity{ 0 }; // total capacity of the last established buffer chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order diff --git a/renderer.cpp b/renderer.cpp index 081bdd91..1085ee52 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -98,9 +98,10 @@ opengl_renderer::Init( GLFWwindow *Window ) { glEnable( GL_CULL_FACE ); // Cull back-facing triangles glShadeModel( GL_SMOOTH ); // Enable Smooth Shading - glActiveTexture( m_diffusetextureunit ); - m_geometry.units().texture = m_diffusetextureunit; + m_geometry.units().texture = std::vector{ m_normaltextureunit, m_diffusetextureunit }; + m_textures.assign_units( m_helpertextureunit, m_shadowtextureunit, m_normaltextureunit, m_diffusetextureunit ); // TODO: add reflections unit UILayer.set_unit( m_diffusetextureunit ); + Active_Texture( m_diffusetextureunit ); ::glDepthFunc( GL_LEQUAL ); glEnable( GL_DEPTH_TEST ); @@ -215,7 +216,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL ); ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE ); - ::glBindTexture( GL_TEXTURE_2D, 0 ); + ::glBindTexture( GL_TEXTURE_2D, NULL ); #ifdef EU07_USE_DEBUG_SHADOWMAP ::glGenTextures( 1, &m_shadowdebugtexture ); ::glBindTexture( GL_TEXTURE_2D, m_shadowdebugtexture ); @@ -577,24 +578,12 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f case rendermode::pickscenery: { // TODO: scissor test for pick modes // projection - if( true == m_framebuffersupport ) { - auto const angle = Global::FieldOfView / Global::ZoomFactor; - auto const height = std::max( 1.0f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ); - camera.projection() *= - glm::perspective( - glm::radians( Global::FieldOfView / Global::ZoomFactor ), - std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ), - 0.1f * Global::ZoomFactor, - Config.draw_range * Global::fDistanceFactor ); - } - else { - camera.projection() *= - glm::perspective( - glm::radians( Global::FieldOfView / Global::ZoomFactor ), - std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), - 0.1f * Global::ZoomFactor, - Config.draw_range * Global::fDistanceFactor ); - } + camera.projection() *= + glm::perspective( + glm::radians( Global::FieldOfView / Global::ZoomFactor ), + std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), + 0.1f * Global::ZoomFactor, + Config.draw_range * Global::fDistanceFactor ); // modelview camera.position() = Global::pCameraPosition; World.Camera.SetMatrix( viewmatrix ); @@ -674,17 +663,20 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const // helper texture unit. // darkens previous stage, preparing data for the shadow texture unit to select from if( m_helpertextureunit >= 0 ) { - if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { - // setup reflection texture unit - ::glActiveTexture( m_helpertextureunit ); - Bind( m_reflectiontexture ); // TBD, TODO: move to reflection unit setup + + Active_Texture( m_helpertextureunit ); + + if( ( true == Reflections ) + || ( ( true == Global::RenderShadows ) && ( true == Shadows ) ) ) { + m_textures.bind( textureunit::helper, m_reflectiontexture ); ::glEnable( GL_TEXTURE_2D ); -/* - glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); - glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); - glEnable( GL_TEXTURE_GEN_S ); - glEnable( GL_TEXTURE_GEN_T ); -*/ + } + else { + ::glDisable( GL_TEXTURE_2D ); + } + + if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( m_shadowcolor ) ); // TODO: dynamically calculated shadow colour, based on sun height @@ -698,14 +690,24 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); } else { - ::glActiveTexture( m_helpertextureunit ); - ::glDisable( GL_TEXTURE_2D ); -/* + + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE ); // pass the previous stage colour down the chain + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PREVIOUS ); + + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // pass the previous stage alpha down the chain + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); + } + + if( true == Reflections ) { + ::glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); + ::glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); + ::glEnable( GL_TEXTURE_GEN_S ); + ::glEnable( GL_TEXTURE_GEN_T ); + } + else { ::glDisable( GL_TEXTURE_GEN_S ); ::glDisable( GL_TEXTURE_GEN_T ); - ::glDisable( GL_TEXTURE_GEN_R ); - ::glDisable( GL_TEXTURE_GEN_Q ); -*/ } } // shadow texture unit. @@ -715,7 +717,8 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const && ( true == Shadows ) && ( m_shadowcolor != colors::white ) ) { - ::glActiveTexture( m_shadowtextureunit ); + Active_Texture( m_shadowtextureunit ); + // NOTE: shadowmap isn't part of regular texture system, so we use direct bind call here ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); ::glEnable( GL_TEXTURE_2D ); // s @@ -745,7 +748,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const } else { // turn off shadow map tests - ::glActiveTexture( m_shadowtextureunit ); + Active_Texture( m_shadowtextureunit ); ::glDisable( GL_TEXTURE_2D ); ::glDisable( GL_TEXTURE_GEN_S ); @@ -754,9 +757,35 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const ::glDisable( GL_TEXTURE_GEN_Q ); } } + // reflections/normals texture unit + // NOTE: comes after diffuse stage in the operation chain + if( m_normaltextureunit >= 0 ) { + + Active_Texture( m_normaltextureunit ); + + if( true == Reflections ) { + ::glEnable( GL_TEXTURE_2D ); + + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE ); // blend between object colour and env.reflection + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0 ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PREVIOUS ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE ); // alpha channel of the normal map controls reflection strength + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA ); + + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // pass the previous stage alpha down the chain + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); + } + else { + ::glDisable( GL_TEXTURE_2D ); + } + } // diffuse texture unit. // NOTE: diffuse texture mapping is never fully disabled, alpha channel information is always included - ::glActiveTexture( m_diffusetextureunit ); + Active_Texture( m_diffusetextureunit ); + ::glEnable( GL_TEXTURE_2D ); if( true == Diffuse ) { // default behaviour, modulate with previous stage ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); @@ -788,14 +817,15 @@ void opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { // helper texture unit. if( m_helpertextureunit >= 0 ) { - if( ( true == Global::RenderShadows ) - && ( true == Shadows ) - && ( m_shadowcolor != colors::white ) ) { - ::glActiveTexture( m_helpertextureunit ); + if( ( true == Reflections ) + || ( ( true == Global::RenderShadows ) + && ( true == Shadows ) + && ( m_shadowcolor != colors::white ) ) ) { + Active_Texture( m_helpertextureunit ); ::glEnable( GL_TEXTURE_2D ); } else { - ::glActiveTexture( m_helpertextureunit ); + Active_Texture( m_helpertextureunit ); ::glDisable( GL_TEXTURE_2D ); } } @@ -803,25 +833,35 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons if( m_shadowtextureunit >= 0 ) { if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { - ::glActiveTexture( m_shadowtextureunit ); + Active_Texture( m_shadowtextureunit ); ::glEnable( GL_TEXTURE_2D ); } else { - ::glActiveTexture( m_shadowtextureunit ); + Active_Texture( m_shadowtextureunit ); ::glDisable( GL_TEXTURE_2D ); } } + // normal/reflection texture unit + if( true == Reflections ) { + + Active_Texture( m_normaltextureunit ); + ::glEnable( GL_TEXTURE_2D ); + } + else { + Active_Texture( m_normaltextureunit ); + ::glDisable( GL_TEXTURE_2D ); + } // diffuse texture unit. // NOTE: toggle actually disables diffuse texture mapping, unlike setup counterpart if( true == Diffuse ) { - ::glActiveTexture( m_diffusetextureunit ); + Active_Texture( m_diffusetextureunit ); ::glEnable( GL_TEXTURE_2D ); } else { - ::glActiveTexture( m_diffusetextureunit ); + Active_Texture( m_diffusetextureunit ); ::glDisable( GL_TEXTURE_2D ); } } @@ -829,10 +869,9 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons void opengl_renderer::setup_shadow_color( glm::vec4 const &Shadowcolor ) { - ::glActiveTexture( m_helpertextureunit ); + Active_Texture( m_helpertextureunit ); ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( Shadowcolor ) ); // in-shadow colour multiplier - ::glActiveTexture( m_diffusetextureunit ); - + Active_Texture( m_diffusetextureunit ); } bool @@ -854,7 +893,7 @@ opengl_renderer::Render( world_environment *Environment ) { return false; } - Bind( NULL ); + Bind_Material( NULL ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); @@ -903,7 +942,7 @@ opengl_renderer::Render( world_environment *Environment ) { auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); // sun { - Bind( m_suntexture ); + Bind_Texture( m_suntexture ); ::glColor4f( suncolor.x, suncolor.y, suncolor.z, 1.0f ); auto const sunvector = Environment->m_sun.getDirection(); auto const sunposition = modelview * glm::vec4( sunvector.x, sunvector.y, sunvector.z, 1.0f ); @@ -924,7 +963,7 @@ opengl_renderer::Render( world_environment *Environment ) { } // moon { - Bind( m_moontexture ); + Bind_Texture( m_moontexture ); glm::vec3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, static_cast( 1.0 - Global::fLuminance * 0.5 ) ); @@ -1032,21 +1071,48 @@ opengl_renderer::Vertices( geometry_handle const &Geometry ) const { return m_geometry.vertices( Geometry ); } -// texture methods -texture_handle -opengl_renderer::Fetch_Texture( std::string const &Filename, std::string const &Dir, int const Filter, bool const Loadnow ) { +// material methods +material_handle +opengl_renderer::Fetch_Material( std::string const &Filename, bool const Loadnow ) { - return m_textures.create( Filename, Dir, Filter, Loadnow ); + return m_materials.create( Filename, Loadnow ); } void -opengl_renderer::Bind( texture_handle const Texture ) { - // temporary until we separate the renderer - m_textures.bind( Texture ); +opengl_renderer::Bind_Material( material_handle const Material ) { + + auto const &material = m_materials.material( Material ); + m_textures.bind( textureunit::normals, material.texture2 ); + m_textures.bind( textureunit::diffuse, material.texture1 ); +} + +opengl_material const & +opengl_renderer::Material( material_handle const Material ) const { + + return m_materials.material( Material ); +} + +// texture methods +void +opengl_renderer::Active_Texture( GLint const Textureunit ) { + + return m_textures.unit( Textureunit ); +} + +texture_handle +opengl_renderer::Fetch_Texture( std::string const &Filename, bool const Loadnow ) { + + return m_textures.create( Filename, Loadnow ); +} + +void +opengl_renderer::Bind_Texture( texture_handle const Texture ) { + + m_textures.bind( textureunit::diffuse, Texture ); } opengl_texture const & -opengl_renderer::Texture( texture_handle const Texture ) { +opengl_renderer::Texture( texture_handle const Texture ) const { return m_textures.texture( Texture ); } @@ -1431,7 +1497,7 @@ opengl_renderer::Render( TGroundNode *Node ) { ::glLineWidth( static_cast( linewidth ) ); } - GfxRenderer.Bind( NULL ); + GfxRenderer.Bind_Material( NULL ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -1464,7 +1530,7 @@ opengl_renderer::Render( TGroundNode *Node ) { return false; } // setup - Bind( Node->TextureID ); + Bind_Material( Node->m_material ); switch( m_renderpass.draw_mode ) { case rendermode::color: { ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); @@ -1784,12 +1850,12 @@ opengl_renderer::Render( TSubModel *Submodel ) { #endif // material configuration: // textures... - if( Submodel->TextureID < 0 ) { // zmienialne skóry - Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); } else { // również 0 - Bind( Submodel->TextureID ); + Bind_Material( Submodel->m_material ); } // ...colors... ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub @@ -1839,12 +1905,12 @@ opengl_renderer::Render( TSubModel *Submodel ) { // scenery picking and shadow both use enforced colour and no frills // material configuration: // textures... - if( Submodel->TextureID < 0 ) { // zmienialne skóry - Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); } else { // również 0 - Bind( Submodel->TextureID ); + Bind_Material( Submodel->m_material ); } // main draw call m_geometry.draw( Submodel->m_geometry ); @@ -1857,12 +1923,12 @@ opengl_renderer::Render( TSubModel *Submodel ) { m_pickcontrolsitems.emplace_back( Submodel ); ::glColor3fv( glm::value_ptr( pick_color( m_pickcontrolsitems.size() ) ) ); // textures... - if( Submodel->TextureID < 0 ) { // zmienialne skóry - Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); } else { // również 0 - Bind( Submodel->TextureID ); + Bind_Material( Submodel->m_material ); } // main draw call m_geometry.draw( Submodel->m_geometry ); @@ -1902,7 +1968,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); - Bind( NULL ); + Bind_Material( NULL ); ::glPointSize( std::max( 3.f, 5.f * distancefactor * anglefactor ) ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], lightlevel * anglefactor ); ::glDisable( GL_LIGHTING ); @@ -1941,7 +2007,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); - Bind( NULL ); + Bind_Material( NULL ); ::glDisable( GL_LIGHTING ); // main draw call @@ -1976,20 +2042,20 @@ opengl_renderer::Render( TSubModel *Submodel ) { void opengl_renderer::Render( TTrack *Track ) { - if( ( Track->TextureID1 == 0 ) - && ( Track->TextureID2 == 0 ) ) { + if( ( Track->m_material1 == 0 ) + && ( Track->m_material2 == 0 ) ) { return; } switch( m_renderpass.draw_mode ) { case rendermode::color: { Track->EnvironmentSet(); - if( Track->TextureID1 != 0 ) { - Bind( Track->TextureID1 ); + if( Track->m_material1 != 0 ) { + Bind_Material( Track->m_material1 ); m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); } - if( Track->TextureID2 != 0 ) { - Bind( Track->TextureID2 ); + if( Track->m_material2 != 0 ) { + Bind_Material( Track->m_material2 ); m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); } Track->EnvironmentReset(); @@ -1997,12 +2063,12 @@ opengl_renderer::Render( TTrack *Track ) { } case rendermode::pickscenery: case rendermode::shadows: { - if( Track->TextureID1 != 0 ) { - Bind( Track->TextureID1 ); + if( Track->m_material1 != 0 ) { + Bind_Material( Track->m_material1 ); m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); } - if( Track->TextureID2 != 0 ) { - Bind( Track->TextureID2 ); + if( Track->m_material2 != 0 ) { + Bind_Material( Track->m_material2 ); m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); } break; @@ -2141,7 +2207,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { auto const color { Node->hvTraction->wire_color() }; ::glColor4f( color.r, color.g, color.b, linealpha ); - Bind( NULL ); + Bind_Material( NULL ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -2217,7 +2283,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { ::glLineWidth( static_cast(linewidth) ); } - GfxRenderer.Bind( NULL ); + GfxRenderer.Bind_Material( NULL ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -2242,7 +2308,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // setup ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); - Bind( Node->TextureID ); + Bind_Material( Node->m_material ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -2423,12 +2489,12 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { } #endif // textures... - if( Submodel->TextureID < 0 ) { // zmienialne skóry - Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); } else { // również 0 - Bind( Submodel->TextureID ); + Bind_Material( Submodel->m_material ); } // ...colors... ::glColor3fv( glm::value_ptr(Submodel->f4Diffuse) ); // McZapkie-240702: zamiast ub @@ -2495,7 +2561,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // setup ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); - Bind( m_glaretexture ); + Bind_Texture( m_glaretexture ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], glarelevel ); ::glDisable( GL_LIGHTING ); ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); @@ -2585,9 +2651,8 @@ opengl_renderer::Update_Pick_Control() { if( true == m_framebuffersupport ) { // ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); pickbufferpos = glm::ivec2{ - mousepos.x * EU07_PICKBUFFERSIZE / Global::iWindowWidth, - mousepos.y * EU07_PICKBUFFERSIZE / Global::iWindowHeight - }; + mousepos.x * EU07_PICKBUFFERSIZE / std::max( 1, Global::iWindowWidth ), + mousepos.y * EU07_PICKBUFFERSIZE / std::max( 1, Global::iWindowHeight ) }; } else { // ::glReadBuffer( GL_BACK ); diff --git a/renderer.h b/renderer.h index 30e5dcad..2ecad49c 100644 --- a/renderer.h +++ b/renderer.h @@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "GL/glew.h" #include "openglgeometrybank.h" -#include "texture.h" +#include "material.h" #include "lightarray.h" #include "dumb3d.h" #include "frustum.h" @@ -73,13 +73,6 @@ struct opengl_technique { }; -// a collection of parameters for the rendering setup. -// for modern opengl this translates to set of attributes for the active shaders, -// for legacy opengl this is basically just texture(s) assigned to geometry -struct opengl_material { - -}; - // simple camera object. paired with 'virtual camera' in the scene class opengl_camera { @@ -175,13 +168,22 @@ public: // provides direct access to vertex data of specfied chunk vertex_array const & Vertices( geometry_handle const &Geometry ) const; - // texture methods - texture_handle - Fetch_Texture( std::string const &Filename, std::string const &Dir = szTexturePath, int const Filter = -1, bool const Loadnow = true ); + // material methods + material_handle + Fetch_Material( std::string const &Filename, bool const Loadnow = true ); void - Bind( texture_handle const Texture ); + Bind_Material( material_handle const Material ); + opengl_material const & + Material( material_handle const Material ) const; + // texture methods + void + Active_Texture( GLint const Textureunit ); + texture_handle + Fetch_Texture( std::string const &Filename, bool const Loadnow = true ); + void + Bind_Texture( texture_handle const Texture ); opengl_texture const & - Texture( texture_handle const Texture ); + Texture( texture_handle const Texture ) const; // light methods void Disable_Lights(); @@ -215,6 +217,13 @@ private: pickscenery }; + enum textureunit { + helper = 0, + shadows, + normals, + diffuse + }; + typedef std::pair< double, TSubRect * > distancesubcell_pair; struct renderpass_config { @@ -292,6 +301,7 @@ private: // members GLFWwindow *m_window { nullptr }; geometrybank_manager m_geometry; + material_manager m_materials; texture_manager m_textures; opengllight_array m_lights; @@ -316,9 +326,10 @@ private: #endif glm::mat4 m_shadowtexturematrix; // conversion from camera-centric world space to light-centric clip space - int m_shadowtextureunit { GL_TEXTURE1 }; int m_helpertextureunit { GL_TEXTURE0 }; - int m_diffusetextureunit { GL_TEXTURE2 }; + int m_shadowtextureunit { GL_TEXTURE1 }; + int m_normaltextureunit { GL_TEXTURE2 }; + int m_diffusetextureunit{ GL_TEXTURE3 }; float m_drawtime { 1000.f / 30.f * 20.f }; // start with presumed 'neutral' average of 30 fps std::chrono::steady_clock::time_point m_drawstart; // cached start time of previous frame @@ -327,6 +338,7 @@ private: float m_drawtimeshadowpass { 0.f }; double m_updateaccumulator { 0.0 }; std::string m_debuginfo; + std::string m_pickdebuginfo; glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; glm::vec4 m_shadowcolor { 0.5f, 0.5f, 0.5f, 1.f }; diff --git a/uilayer.cpp b/uilayer.cpp index 4680a728..d05adbcc 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -216,7 +216,7 @@ ui_layer::render_background() { if( m_background == 0 ) return; // NOTE: we limit/expect the background to come with 4:3 ratio. // TODO, TBD: if we expose texture width or ratio from texture object, this limitation could be lifted - GfxRenderer.Bind( m_background ); + GfxRenderer.Bind_Texture( m_background ); auto const height { 768.0f }; auto const &texture = GfxRenderer.Texture( m_background ); float const width = ( @@ -239,7 +239,7 @@ ui_layer::render_texture() { ::glColor4f( 1.f, 1.f, 1.f, 1.f ); ::glDisable( GL_BLEND ); - GfxRenderer.Bind( NULL ); + GfxRenderer.Bind_Texture( NULL ); ::glBindTexture( GL_TEXTURE_2D, m_texture ); auto const size = 512.f; @@ -254,6 +254,8 @@ ui_layer::render_texture() { glEnd(); + ::glBindTexture( GL_TEXTURE_2D, NULL ); + ::glEnable( GL_BLEND ); } } diff --git a/version.h b/version.h index a572b462..48e719be 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 805 -#define VERSION_REVISION 0 +#define VERSION_MINOR 810 +#define VERSION_REVISION 1 From 611ebed7ab045861ce808391356187071e0161dc Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 10 Aug 2017 18:19:21 +0200 Subject: [PATCH 158/426] build 170810. multi-texture materials, reflection map support --- AnimModel.cpp | 17 +-- AnimModel.h | 2 +- Driver.cpp | 34 +++--- DynObj.cpp | 68 +++++------ DynObj.h | 2 +- Ground.cpp | 39 ++++-- Ground.h | 4 +- Model3d.cpp | 97 +++++++-------- Model3d.h | 20 ++-- PyInt.cpp | 25 ++-- Segment.cpp | 2 +- Sound.cpp | 40 +------ Texture.cpp | 123 ++++++++----------- Texture.h | 25 +++- Track.cpp | 60 +++++----- Track.h | 10 +- maszyna.vcxproj.filters | 6 + material.cpp | 143 ++++++++++++++++++++++ material.h | 64 ++++++++++ openglgeometrybank.cpp | 24 +++- openglgeometrybank.h | 3 +- renderer.cpp | 257 +++++++++++++++++++++++++--------------- renderer.h | 42 ++++--- uilayer.cpp | 6 +- version.h | 4 +- 25 files changed, 687 insertions(+), 430 deletions(-) create mode 100644 material.cpp create mode 100644 material.h diff --git a/AnimModel.cpp b/AnimModel.cpp index 02e33d9c..09a53eb9 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -440,14 +440,15 @@ bool TAnimModel::Init(TModel3d *pNewModel) bool TAnimModel::Init(std::string const &asName, std::string const &asReplacableTexture) { - if (asReplacableTexture.substr(0, 1) == - "*") // od gwiazdki zaczynają się teksty na wyświetlaczach - asText = asReplacableTexture.substr(1, asReplacableTexture.length() - 1); // zapamiętanie tekstu - else if (asReplacableTexture != "none") - m_materialdata.replacable_skins[1] = - GfxRenderer.Fetch_Texture( asReplacableTexture, "" ); - if( ( m_materialdata.replacable_skins[ 1 ] != 0 ) - && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) ) { + if( asReplacableTexture.substr( 0, 1 ) == "*" ) { + // od gwiazdki zaczynają się teksty na wyświetlaczach + asText = asReplacableTexture.substr( 1, asReplacableTexture.length() - 1 ); // zapamiętanie tekstu + } + else if( asReplacableTexture != "none" ) { + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( asReplacableTexture ); + } + if( ( m_materialdata.replacable_skins[ 1 ] != NULL ) + && ( GfxRenderer.Material( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) ) { // tekstura z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha = 0x31310031; } diff --git a/AnimModel.h b/AnimModel.h index 73bad8f7..cd5018ef 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "Model3d.h" -#include "Texture.h" +#include "material.h" #include "DynObj.h" const int iMaxNumLights = 8; diff --git a/Driver.cpp b/Driver.cpp index 185affc7..d8f60a17 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4591,20 +4591,20 @@ bool TController::UpdateSituation(double dt) // if not MinVelFlag) if (fBrakeTime < 0 ? true : (AccDesired < fAccGravity - 0.3) || (mvOccupied->BrakeCtrlPos <= 0)) - if (!IncBrake()) // jeśli upłynął czas reakcji hamulca, chyba że - // nagłe albo luzował + if( false == IncBrake() ) { + // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował MinVelFlag = true; - else - { + } + else { MinVelFlag = false; fBrakeTime = - 3 + - 0.5 * - (mvOccupied - ->BrakeDelay[2 + 2 * mvOccupied->BrakeDelayFlag] - - 3); - // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do - // zatrzymania jest mniejszy + 3.0 + + 0.5 * ( ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 1 ] : + mvOccupied->BrakeDelay[ 3 ] ) + - 3.0 ); + // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } if ((AccDesired < fAccGravity - 0.05) && (AbsAccS < AccDesired - 0.2)) @@ -4613,11 +4613,15 @@ bool TController::UpdateSituation(double dt) // if (fBrakeTime<0) { // jak hamuje, to nie tykaj kranu za często // yB: luzuje hamulec dopiero przy różnicy opóźnień rzędu 0.2 - if (OrderList[OrderPos] != - Disconnect) // przy odłączaniu nie zwalniamy tu hamulca + if( OrderList[ OrderPos ] != Disconnect ) { + // przy odłączaniu nie zwalniamy tu hamulca DecBrake(); // tutaj zmniejszało o 1 przy odczepianiu - fBrakeTime = - (mvOccupied->BrakeDelay[1 + 2 * mvOccupied->BrakeDelayFlag]) / 3.0; + } + fBrakeTime = ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 0 ] : + mvOccupied->BrakeDelay[ 2 ] ) + / 3.0; fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } } diff --git a/DynObj.cpp b/DynObj.cpp index 0f670004..01f263e6 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4036,7 +4036,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, { std::string nowheretexture = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie if( false == nowheretexture.empty() ) { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( nowheretexture, "", 9 ); + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Material( nowheretexture ); } if (m_materialdata.multi_textures > 0) { @@ -4048,7 +4048,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, int skinindex = 0; std::string texturename; nameparser >> texturename; while( ( texturename != "" ) && ( skinindex < 4 ) ) { - m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + texturename, "" ); + m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + texturename ); ++skinindex; texturename = ""; nameparser >> texturename; } @@ -4058,24 +4058,24 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // otherwise try the basic approach int skinindex = 0; do { - texture_handle texture = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), "", Global::iDynamicFiltering, true ); - if( texture == NULL ) { + material_handle material = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), true ); + if( material == NULL ) { break; } - m_materialdata.replacable_skins[ skinindex + 1 ] = texture; + m_materialdata.replacable_skins[ skinindex + 1 ] = material; ++skinindex; } while( skinindex < 4 ); m_materialdata.multi_textures = skinindex; if( m_materialdata.multi_textures == 0 ) { // zestaw nie zadziałał, próbujemy normanie - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin ); } } } else { - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Texture( Global::asCurrentTexturePath + ReplacableSkin, "", Global::iDynamicFiltering ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin ); } - if( GfxRenderer.Texture( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) { + if( GfxRenderer.Material( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) { // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha = 0x31310031; } @@ -4085,17 +4085,17 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } if( ( m_materialdata.replacable_skins[ 2 ] ) - && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 2 ] ).has_alpha ) ) { + && ( GfxRenderer.Material( m_materialdata.replacable_skins[ 2 ] ).has_alpha ) ) { // tekstura -2 z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha |= 0x02020002; } if( ( m_materialdata.replacable_skins[ 3 ] ) - && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 3 ] ).has_alpha ) ) { + && ( GfxRenderer.Material( m_materialdata.replacable_skins[ 3 ] ).has_alpha ) ) { // tekstura -3 z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha |= 0x04040004; } if( ( m_materialdata.replacable_skins[ 4 ] ) - && ( GfxRenderer.Texture( m_materialdata.replacable_skins[ 4 ] ).has_alpha ) ) { + && ( GfxRenderer.Material( m_materialdata.replacable_skins[ 4 ] ).has_alpha ) ) { // tekstura -4 z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha |= 0x08080008; } @@ -5371,7 +5371,7 @@ int TDynamicObject::RouteWish(TTrack *tr) std::string TDynamicObject::TextureTest(std::string const &name) { // Ra 2015-01: sprawdzenie dostępności tekstury o podanej nazwie - std::vector extensions = { ".dds", ".tga", ".bmp" }; + std::vector extensions = { ".mat", ".dds", ".tga", ".bmp" }; for( auto const &extension : extensions ) { if( true == FileExists( name + extension ) ) { return name + extension; @@ -5393,36 +5393,22 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) numer = Global::Bezogonkow(numer); asDestination = to; to = Global::Bezogonkow(to); // do szukania pliku obcinamy ogonki - std::string x = TextureTest(asBaseDir + numer + "@" + MoverParameters->TypeName); - if (!x.empty()) - { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się - return; + + std::vector destinations = { + asBaseDir + numer + "@" + MoverParameters->TypeName, + asBaseDir + numer, + asBaseDir + to + "@" + MoverParameters->TypeName, + asBaseDir + to, + asBaseDir + "nowhere" }; + + for( auto const &destination : destinations ) { + + auto material = TextureTest( destination ); + if( false == material.empty() ) { + m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Material( material ); + break; + } } - x = TextureTest(asBaseDir + numer ); - if (!x.empty()) - { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się - return; - } - if (to.empty()) - to = "nowhere"; - x = TextureTest(asBaseDir + to + "@" + MoverParameters->TypeName); // w pierwszej kolejności z nazwą FIZ/MMD - if (!x.empty()) - { - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się - return; - } - x = TextureTest(asBaseDir + to); // na razie prymitywnie - if (!x.empty()) - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); // rozmywania 0,1,4,5 nie nadają się - else - { - x = TextureTest(asBaseDir + "nowhere"); // jak nie znalazł dedykowanej, to niech daje nowhere - if (!x.empty()) - m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Texture( x, "", 9 ); - } - // Ra 2015-01: żeby zalogować błąd, trzeba by mieć pewność, że model używa tekstury nr 4 }; void TDynamicObject::OverheadTrack(float o) diff --git a/DynObj.h b/DynObj.h index 3509696a..f4b7c329 100644 --- a/DynObj.h +++ b/DynObj.h @@ -143,7 +143,7 @@ class TAnim struct material_data { int textures_alpha{ 0x30300030 }; // maska przezroczystości tekstur. default: tekstury wymienne nie mają przezroczystości - texture_handle replacable_skins[ 5 ] = { NULL, NULL, NULL, NULL, NULL }; // McZapkie:zmienialne nadwozie + material_handle replacable_skins[ 5 ] = { NULL, NULL, NULL, NULL, NULL }; // McZapkie:zmienialne nadwozie int multi_textures{ 0 }; //<0 tekstury wskazane wpisem, >0 tekstury z przecinkami, =0 jedna }; diff --git a/Ground.cpp b/Ground.cpp index 57b76e36..d4725ff4 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -67,7 +67,7 @@ TGroundNode::TGroundNode() nNext = nNext2 = NULL; iCount = 0; // wierzchołków w trójkącie // iNumPts=0; //punktów w linii - TextureID = 0; + m_material = 0; iFlags = 0; // tryb przezroczystości nie zbadany Pointer = NULL; // zerowanie wskaźnika kontekstowego bVisible = false; // czy widoczny @@ -508,7 +508,7 @@ TGroundRect::mergeable( TGroundNode const &Left, TGroundNode const &Right ) { // since view ranges and transparency type for all nodes put through this method are guaranteed to be equal, // we can skip their tests and only do the material check. // TODO, TBD: material as dedicated type, and refactor this method into a simple equality test - return ( ( Left.TextureID == Right.TextureID ) + return ( ( Left.m_material == Right.m_material ) && ( Left.Ambient == Right.Ambient ) && ( Left.Diffuse == Right.Diffuse ) && ( Left.Specular == Right.Specular ) ); @@ -776,7 +776,7 @@ void TGround::RaTriangleDivider(TGroundNode *node) TGroundNode *ntri; // wskaźnik na nowy trójkąt ntri = new TGroundNode(GL_TRIANGLES); // a ten jest nowy // kopiowanie parametrów, przydałby się konstruktor kopiujący - ntri->TextureID = node->TextureID; + ntri->m_material = node->m_material; ntri->iFlags = node->iFlags; ntri->Ambient = node->Ambient; ntri->Diffuse = node->Diffuse; @@ -1376,23 +1376,36 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) *parser >> token; } str = token; - tmp->TextureID = GfxRenderer.Fetch_Texture( str ); + tmp->m_material = GfxRenderer.Fetch_Material( str ); + auto const texturehandle = ( + tmp->m_material != NULL ? + GfxRenderer.Material( tmp->m_material ).texture1 : + NULL ); + auto const &texture = ( + texturehandle ? + GfxRenderer.Texture( texturehandle ) : + opengl_texture() ); // dirty workaround for lack of better api bool const clamps = ( - tmp->TextureID ? - GfxRenderer.Texture( tmp->TextureID ).traits.find( 's' ) != std::string::npos : + texturehandle ? + texture.traits.find( 's' ) != std::string::npos : false ); bool const clampt = ( - tmp->TextureID ? - GfxRenderer.Texture( tmp->TextureID ).traits.find( 't' ) != std::string::npos : + texturehandle ? + texture.traits.find( 't' ) != std::string::npos : false ); tmp->iFlags |= 200; // z usuwaniem // remainder of legacy 'problend' system -- geometry assigned a texture with '@' in its name is treated as translucent, opaque otherwise - tmp->iFlags |= ( - ( ( str.find( '@' ) != std::string::npos ) - && ( true == GfxRenderer.Texture( tmp->TextureID ).has_alpha ) ) ? - 0x20 : - 0x10 ); + if( texturehandle != NULL ) { + tmp->iFlags |= ( + ( ( texture.name.find( '@' ) != std::string::npos ) + && ( true == texture.has_alpha ) ) ? + 0x20 : + 0x10 ); + } + else { + tmp->iFlags |= 0x10; + } TGroundVertex vertex, vertex1, vertex2; std::size_t vertexcount{ 0 }; diff --git a/Ground.h b/Ground.h index d8b02ad9..13bc46cd 100644 --- a/Ground.h +++ b/Ground.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "VBO.h" #include "Classes.h" #include "ResourceManager.h" -#include "Texture.h" +#include "material.h" #include "dumb3d.h" #include "Float3d.h" #include "Names.h" @@ -140,7 +140,7 @@ public: int iCount; // dla terenu }; int iFlags; // tryb przezroczystości: 0x10-nieprz.,0x20-przezroczysty,0x30-mieszany - texture_handle TextureID; // główna (jedna) tekstura obiektu + material_handle m_material; // główna (jedna) tekstura obiektu glm::vec3 Ambient{ 1.0f, 1.0f, 1.0f }, Diffuse{ 1.0f, 1.0f, 1.0f }, diff --git a/Model3d.cpp b/Model3d.cpp index 2d1442af..be23304f 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -63,16 +63,16 @@ TSubModel::~TSubModel() // wyświetlania }; -void TSubModel::TextureNameSet(std::string const &Name) +void TSubModel::Name_Material(std::string const &Name) { // ustawienie nazwy submodelu, o // ile nie jest wczytany z E3D if (iFlags & 0x0200) { // tylko jeżeli submodel zosta utworzony przez new - pTexture = Name; + m_materialname = Name; } }; -void TSubModel::NameSet(std::string const &Name) +void TSubModel::Name(std::string const &Name) { // ustawienie nazwy submodelu, o ile // nie jest wczytany z E3D if (iFlags & 0x0200) @@ -177,7 +177,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic std::string token; parser.getTokens(1, false); // nazwa submodelu bez zmieny na małe parser >> token; - NameSet(token); + Name(token); if (dynamic) { // dla pojazdu, blokujemy załączone submodele, które mogą być nieobsługiwane if( ( token.size() >= 3 ) @@ -305,50 +305,51 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic */ if (!parser.expectToken("map:")) Error("Model map parse failure!"); - std::string texture = parser.getToken(); - if (texture == "none") + std::string material = parser.getToken(); + if (material == "none") { // rysowanie podanym kolorem - TextureID = 0; + m_material = NULL; iFlags |= 0x10; // rysowane w cyklu nieprzezroczystych } - else if (texture.find("replacableskin") != texture.npos) + else if (material.find("replacableskin") != material.npos) { // McZapkie-060702: zmienialne skory modelu - TextureID = -1; + m_material = -1; iFlags |= (Opacity < 1.0) ? 1 : 0x10; // zmienna tekstura 1 } - else if (texture == "-1") + else if (material == "-1") { - TextureID = -1; + m_material = -1; iFlags |= (Opacity < 1.0) ? 1 : 0x10; // zmienna tekstura 1 } - else if (texture == "-2") + else if (material == "-2") { - TextureID = -2; + m_material = -2; iFlags |= (Opacity < 1.0) ? 2 : 0x10; // zmienna tekstura 2 } - else if (texture == "-3") + else if (material == "-3") { - TextureID = -3; + m_material = -3; iFlags |= (Opacity < 1.0) ? 4 : 0x10; // zmienna tekstura 3 } - else if (texture == "-4") + else if (material == "-4") { - TextureID = -4; + m_material = -4; iFlags |= (Opacity < 1.0) ? 8 : 0x10; // zmienna tekstura 4 } else { // jeśli tylko nazwa pliku, to dawać bieżącą ścieżkę do tekstur - TextureNameSet(texture); - if( texture.find_first_of( "/\\" ) == texture.npos ) { - texture.insert( 0, Global::asCurrentTexturePath ); + Name_Material(material); + if( material.find_first_of( "/\\" ) == material.npos ) { + material.insert( 0, Global::asCurrentTexturePath ); } - TextureID = GfxRenderer.Fetch_Texture( texture ); + m_material = GfxRenderer.Fetch_Material( material ); // renderowanie w cyklu przezroczystych tylko jeśli: // 1. Opacity=0 (przejściowo <1, czy tam <100) oraz // 2. tekstura ma przezroczystość iFlags |= ( ( ( Opacity < 1.0 ) - && ( GfxRenderer.Texture(TextureID).has_alpha ) ) ? + && ( ( m_material != NULL ) + && ( GfxRenderer.Material( m_material ).has_alpha ) ) ) ? 0x20 : 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta }; @@ -591,10 +592,10 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic return iNumVerts; // do określenia wielkości VBO }; -int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) +int TSubModel::TriangleAdd(TModel3d *m, material_handle tex, int tri) { // dodanie trójkątów do submodelu, używane przy tworzeniu E3D terenu TSubModel *s = this; - while (s ? (s->TextureID != tex) : false) + while (s ? (s->m_material != tex) : false) { // szukanie submodelu o danej teksturze if (s == this) s = Child; @@ -603,15 +604,15 @@ int TSubModel::TriangleAdd(TModel3d *m, texture_handle tex, int tri) } if (!s) { - if (TextureID <= 0) + if (m_material <= 0) s = this; // użycie głównego else { // dodanie nowego submodelu do listy potomnych s = new TSubModel(); m->AddTo(this, s); } - s->TextureNameSet(GfxRenderer.Texture(tex).name); - s->TextureID = tex; + s->Name_Material(GfxRenderer.Material(tex).name); + s->m_material = tex; s->eType = GL_TRIANGLES; } if (s->iNumVerts < 0) @@ -672,7 +673,7 @@ void TSubModel::DisplayLists() glVertex3dv(&Vertices[i].Point.x); */ glNormal3fv(glm::value_ptr(Vertices[i].normal)); - glTexCoord2fv(glm::value_ptr(Vertices[i].texture)); + glTexCoord2fv(glm::value_ptr(Vertices[i].material)); glVertex3fv(glm::value_ptr(Vertices[i].position)); }; glEnd(); @@ -806,8 +807,8 @@ int TSubModel::FlagsCheck() int i = 0; if (Child) { // Child jest renderowany po danym submodelu - if (Child->TextureID) // o ile ma teksturę - if (Child->TextureID != TextureID) // i jest ona inna niż rodzica + if (Child->m_material) // o ile ma teksturę + if (Child->m_material != m_material) // i jest ona inna niż rodzica Child->iFlags |= 0x80; // to trzeba sprawdzać, jak z teksturami jest i = Child->FlagsCheck(); iFlags |= 0x00FF0000 & ((i << 16) | (i) | (i >> 8)); // potomny, rodzeństwo i dzieci @@ -825,8 +826,8 @@ int TSubModel::FlagsCheck() if (Next) { // Next jest renderowany po danym submodelu (kolejność odwrócona // po wczytaniu T3D) - if (TextureID) // o ile dany ma teksturę - if ((TextureID != Next->TextureID) || + if (m_material) // o ile dany ma teksturę + if ((m_material != Next->m_material) || (i & 0x00800000)) // a ma inną albo dzieci zmieniają iFlags |= 0x80; // to dany submodel musi sobie ją ustawiać i = Next->FlagsCheck(); @@ -1085,9 +1086,9 @@ TSubModel::convert( TGroundNode &Groundnode ) const { Groundnode.Ambient = f4Ambient; Groundnode.Diffuse = f4Diffuse; Groundnode.Specular = f4Specular; - Groundnode.TextureID = TextureID; + Groundnode.m_material = m_material; Groundnode.iFlags = ( - ( true == GfxRenderer.Texture( TextureID ).has_alpha ) ? + ( true == GfxRenderer.Material( m_material ).has_alpha ) ? 0x20 : 0x10 ); @@ -1379,10 +1380,10 @@ void TSubModel::serialize(std::ostream &s, sn_utils::ls_int32(s, iNumVerts); sn_utils::ls_int32(s, tVboPtr); - if (TextureID <= 0) - sn_utils::ls_int32(s, TextureID); + if (m_material <= 0) + sn_utils::ls_int32(s, m_material); else - sn_utils::ls_int32(s, (int32_t)get_container_pos(textures, pTexture)); + sn_utils::ls_int32(s, (int32_t)get_container_pos(textures, m_materialname)); sn_utils::ls_float32(s, fVisible); sn_utils::ls_float32(s, fLight); @@ -1727,27 +1728,29 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, pName = ""; if (iTexture > 0) { // obsługa stałej tekstury - auto const textureindex = static_cast( iTexture ); - if( textureindex < t->size() ) { - pTexture = t->at( textureindex ); - if( pTexture.find_last_of( "/\\" ) == std::string::npos ) - pTexture.insert( 0, Global::asCurrentTexturePath ); - TextureID = GfxRenderer.Fetch_Texture( pTexture ); + auto const materialindex = static_cast( iTexture ); + if( materialindex < t->size() ) { + m_materialname = t->at( materialindex ); + if( m_materialname.find_last_of( "/\\" ) == std::string::npos ) { + m_materialname = Global::asCurrentTexturePath + m_materialname; + } + m_material = GfxRenderer.Fetch_Material( m_materialname ); if( ( iFlags & 0x30 ) == 0 ) { // texture-alpha based fallback if for some reason we don't have opacity flag set yet - iFlags |= - ( GfxRenderer.Texture( TextureID ).has_alpha ? + iFlags |= ( + ( ( m_material != NULL ) + && ( GfxRenderer.Material( m_material ).has_alpha ) ) ? 0x20 : 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta } } else { ErrorLog( "Bad model: reference to non-existent texture index in sub-model" + ( pName.empty() ? "" : " \"" + pName + "\"" ) ); - TextureID = NULL; + m_material = NULL; } } else - TextureID = iTexture; + m_material = iTexture; b_aAnim = b_Anim; // skopiowanie animacji do drugiego cyklu diff --git a/Model3d.h b/Model3d.h index 4e72b3c4..17efe8d2 100644 --- a/Model3d.h +++ b/Model3d.h @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "dumb3d.h" #include "Float3d.h" #include "VBO.h" -#include "Texture.h" +#include "material.h" using namespace Math3D; @@ -122,7 +122,7 @@ private: TSubModel *Next { nullptr }; TSubModel *Child { nullptr }; geometry_handle m_geometry { NULL, NULL }; // geometry of the submodel - texture_handle TextureID { NULL }; // numer tekstury, -1 wymienna, 0 brak + material_handle m_material { NULL }; // numer tekstury, -1 wymienna, 0 brak bool bWire { false }; // nie używane, ale wczytywane float Opacity { 1.0f }; float f_Angle { 0.0f }; @@ -143,7 +143,7 @@ public: TSubModel **smLetter{ nullptr }; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) TSubModel *Parent{ nullptr }; // nadrzędny, np. do wymnażania macierzy int iVisible{ 1 }; // roboczy stan widoczności - std::string pTexture; // robocza nazwa tekstury do zapisania w pliku binarnym + std::string m_materialname; // robocza nazwa tekstury do zapisania w pliku binarnym std::string pName; // robocza nazwa private: int SeekFaceNormal( std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, vertex_array const &Vertices ); @@ -151,7 +151,7 @@ private: public: static size_t iInstance; // identyfikator egzemplarza, który aktualnie renderuje model - static texture_handle const *ReplacableSkinId; + static material_handle const *ReplacableSkinId; static int iAlpha; // maska bitowa dla danego przebiegu static double fSquareDist; static TModel3d *pRoot; @@ -162,7 +162,7 @@ public: void NextAdd(TSubModel *SubModel); TSubModel * NextGet() { return Next; }; TSubModel * ChildGet() { return Child; }; - int TriangleAdd(TModel3d *m, texture_handle tex, int tri); + int TriangleAdd(TModel3d *m, material_handle tex, int tri); /* basic_vertex * TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ); */ @@ -186,13 +186,13 @@ public: }; void InitialRotate(bool doit); void BinInit(TSubModel *s, float4x4 *m, std::vector *t, std::vector *n, bool dynamic); - void ReplacableSet(texture_handle const *r, int a) + void ReplacableSet(material_handle const *r, int a) { ReplacableSkinId = r; iAlpha = a; }; - void TextureNameSet( std::string const &Name ); - void NameSet( std::string const &Name ); + void Name_Material( std::string const &Name ); + void Name( std::string const &Name ); // Ra: funkcje do budowania terenu z E3D int Flags() { return iFlags; }; void UnFlagNext() { iFlags &= 0x00FFFFFF; }; @@ -203,8 +203,8 @@ public: return fMatrix ? *(fMatrix->TranslationGet()) + v_TransVector : v_TransVector; } inline float3 Translation2Get() { return *(fMatrix->TranslationGet()) + Child->Translation1Get(); } - int GetTextureId() { - return TextureID; } + material_handle GetMaterial() { + return m_material; } void ParentMatrix(float4x4 *m); float MaxY( float4x4 const &m ); void AdjustDist(); diff --git a/PyInt.cpp b/PyInt.cpp index 8a6a74b4..5203afbb 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -291,21 +291,16 @@ void TPythonScreenRenderer::updateTexture() sprintf(buff, "Sending texture id: %d w: %d h: %d", _textureId, width, height); WriteLog(buff); #endif // _PY_INT_MORE_LOG - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - GfxRenderer.Bind(_textureId); +/* + glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); + glPixelStorei( GL_PACK_ALIGNMENT, 1 ); +*/ + GfxRenderer.Bind_Material(_textureId); // setup texture parameters - if( GLEW_VERSION_1_4 ) { - - glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE ); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); - glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0 ); - } - else { - - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - } + glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); + glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0 ); // build texture glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, textureData ); @@ -457,7 +452,7 @@ void TPythonScreens::init(cParser &parser, TModel3d *model, std::string const &n WriteLog( "Python Screen: submodel " + subModelName + " not found - Ignoring screen" ); return; // nie ma takiego sub modelu w danej kabinie pomijamy } - auto textureId = subModel->GetTextureId(); + auto textureId = subModel->GetMaterial(); if (textureId <= 0) { WriteLog( "Python Screen: invalid texture id " + std::to_string(textureId) + " - Ignoring screen" ); diff --git a/Segment.cpp b/Segment.cpp index ea9a8e6b..a6b84785 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -454,7 +454,7 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, void TSegment::Render() { vector3 pt; - GfxRenderer.Bind(0); + GfxRenderer.Bind_Material( NULL ); if (bCurve) { diff --git a/Sound.cpp b/Sound.cpp index dc559fe4..71198f62 100644 --- a/Sound.cpp +++ b/Sound.cpp @@ -244,50 +244,14 @@ bool TSoundsManager::Init(HWND hWnd) { pDS = nullptr; pDSNotify = nullptr; - HRESULT hr; //=222; - LPDIRECTSOUNDBUFFER pDSBPrimary = nullptr; - // Create IDirectSound using the primary sound device - hr = DirectSoundCreate(NULL, &pDS, NULL); + auto hr = ::DirectSoundCreate(NULL, &pDS, NULL); if (hr != DS_OK) { return false; }; - // Set coop level to DSSCL_PRIORITY - // if( FAILED( hr = pDS->SetCooperativeLevel( hWnd, DSSCL_PRIORITY ) ) ); - // return ; - pDS->SetCooperativeLevel(hWnd, DSSCL_PRIORITY); - - // Get the primary buffer - DSBUFFERDESC dsbd; - ZeroMemory(&dsbd, sizeof(DSBUFFERDESC)); - dsbd.dwSize = sizeof(DSBUFFERDESC); - dsbd.dwFlags = DSBCAPS_PRIMARYBUFFER; - if (!Global::bInactivePause) // jeśli przełączony w tło ma nadal działać - dsbd.dwFlags |= DSBCAPS_GLOBALFOCUS; // to dźwięki mają być również słyszalne - dsbd.dwBufferBytes = 0; - dsbd.lpwfxFormat = NULL; - - if( FAILED( hr = pDS->CreateSoundBuffer( &dsbd, &pDSBPrimary, NULL ) ) ) { - return false; - } - - // Set primary buffer format to 22kHz and 16-bit output. - WAVEFORMATEX wfx; - ZeroMemory(&wfx, sizeof(WAVEFORMATEX)); - wfx.wFormatTag = WAVE_FORMAT_PCM; - wfx.nChannels = 2; - wfx.nSamplesPerSec = 44100; - wfx.wBitsPerSample = 16; - wfx.nBlockAlign = wfx.wBitsPerSample / 8 * wfx.nChannels; - wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; - - if( FAILED( hr = pDSBPrimary->SetFormat( &wfx ) ) ) { - return false; - } - - SAFE_RELEASE(pDSBPrimary); + pDS->SetCooperativeLevel(hWnd, DSSCL_NORMAL); return true; }; diff --git a/Texture.cpp b/Texture.cpp index ce557936..1f603e97 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -506,18 +506,15 @@ opengl_texture::load_TGA() { return; } -resource_state +bool opengl_texture::bind() { - if( false == is_ready ) { - - create(); - if( data_state != resource_state::good ) { - return data_state; - } + if( ( false == is_ready ) + && ( false == create() ) ) { + return false; } ::glBindTexture( GL_TEXTURE_2D, id ); - return data_state; + return true; } bool @@ -645,40 +642,7 @@ opengl_texture::set_filtering() { switch( trait ) { case '#': { sharpen = true; break; } -/* - // legacy filter modes. TODO, TBD: get rid of them? - // let's just turn them off and see if anyone notices. - case '4': { - // najbliższy z tekstury - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); - break; - } - case '5': { - //średnia z tekstury - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - break; - } - case '6': { - // najbliższy z mipmapy - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST ); - break; - } - case '7': { - //średnia z mipmapy - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST ); - break; - } - case '8': { - // najbliższy z dwóch mipmap - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_LINEAR ); - break; - } - case '9': { - //średnia z dwóch mipmap - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); - break; - } -*/ + default: { break; } } } @@ -718,9 +682,27 @@ opengl_texture::downsize( GLuint const Format ) { }; } +void +texture_manager::assign_units( GLint const Helper, GLint const Shadows, GLint const Normals, GLint const Diffuse ) { + + m_units[ 0 ].unit = Helper; + m_units[ 1 ].unit = Shadows; + m_units[ 2 ].unit = Normals; + m_units[ 3 ].unit = Diffuse; +} + +void +texture_manager::unit( GLint const Textureunit ) { + + if( m_activeunit == Textureunit ) { return; } + + m_activeunit = Textureunit; + ::glActiveTexture( Textureunit ); +} + // ustalenie numeru tekstury, wczytanie jeśli jeszcze takiej nie było texture_handle -texture_manager::create( std::string Filename, std::string const &Dir, int const Filter, bool const Loadnow ) { +texture_manager::create( std::string Filename, bool const Loadnow ) { if( Filename.find( '|' ) != std::string::npos ) Filename.erase( Filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury @@ -801,11 +783,7 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const auto texture = new opengl_texture(); texture->name = filename; - if( ( Filter > 0 ) && ( Filter < 10 ) ) { - // temporary. TODO, TBD: check how it's used and possibly get rid of it - traits += std::to_string( ( Filter < 4 ? Filter + 4 : Filter ) ); - } - if( Filename.find('#') !=std::string::npos ) { + if( Filename.find('#') != std::string::npos ) { // temporary code for legacy assets -- textures with names beginning with # are to be sharpened traits += '#'; } @@ -830,33 +808,37 @@ texture_manager::create( std::string Filename, std::string const &Dir, int const }; void -texture_manager::bind( texture_handle const Texture ) { +texture_manager::bind( std::size_t const Unit, texture_handle const Texture ) { m_textures[ Texture ].second = m_garbagecollector.timestamp(); - if( ( Texture != 0 ) && ( Texture == m_activetexture ) ) { + if( Texture == m_units[ Unit ].texture ) { // don't bind again what's already active return; } - // TODO: do binding in texture object, add support for other types - if( Texture != 0 ) { + // TBD, TODO: do binding in texture object, add support for other types than 2d + if( m_units[ Unit ].unit == NULL ) { return; } + unit( m_units[ Unit ].unit ); + if( Texture != NULL ) { #ifndef EU07_DEFERRED_TEXTURE_UPLOAD // NOTE: we could bind dedicated 'error' texture here if the id isn't valid ::glBindTexture( GL_TEXTURE_2D, texture(Texture).id ); - m_activetexture = Texture; + m_units[ Unit ].texture = Texture; #else - if( texture( Texture ).bind() == resource_state::good ) { - m_activetexture = Texture; + if( true == texture( Texture ).bind() ) { + m_units[ Unit ].texture = Texture; } else { // TODO: bind a special 'error' texture on failure + ::glBindTexture( GL_TEXTURE_2D, NULL ); + m_units[ Unit ].texture = NULL; } #endif } else { - ::glBindTexture( GL_TEXTURE_2D, 0 ); - m_activetexture = 0; + ::glBindTexture( GL_TEXTURE_2D, NULL ); + m_units[ Unit ].texture = NULL; } // all done return; @@ -879,7 +861,9 @@ void texture_manager::update() { if( m_garbagecollector.sweep() > 0 ) { - m_activetexture = -1; + for( auto &unit : m_units ) { + unit.texture = -1; + } } } @@ -943,21 +927,10 @@ texture_manager::find_in_databank( std::string const &Texturename ) const { std::string texture_manager::find_on_disk( std::string const &Texturename ) const { - { - std::ifstream file( Texturename ); - if( true == file.is_open() ) { - // success - return Texturename; - } - } - // if we fail make a last ditch attempt in the default textures directory - { - std::ifstream file( szTexturePath + Texturename ); - if( true == file.is_open() ) { - // success - return szTexturePath + Texturename; - } - } - // no results either way, report failure - return ""; + return( + FileExists( Texturename ) ? Texturename : + FileExists( szTexturePath + Texturename ) ? szTexturePath + Texturename : + "" ); } + +//--------------------------------------------------------------------------- diff --git a/Texture.h b/Texture.h index 69119271..41d1407e 100644 --- a/Texture.h +++ b/Texture.h @@ -31,7 +31,7 @@ struct opengl_texture { // methods void load(); - resource_state + bool bind(); bool create(); @@ -85,12 +85,17 @@ public: texture_manager(); ~texture_manager() { delete_textures(); } - texture_handle - create( std::string Filename, std::string const &Dir, int const Filter = -1, bool const Loadnow = true ); void - bind( texture_handle const Texture ); + assign_units( GLint const Helper, GLint const Shadows, GLint const Normals, GLint const Diffuse ); + void + unit( GLint const Textureunit ); + texture_handle + create( std::string Filename, bool const Loadnow = true ); + // binds specified texture to specified texture unit + void + bind( std::size_t const Unit, texture_handle const Texture ); opengl_texture & - texture( texture_handle const Texture ) { return *(m_textures[ Texture ].first); } + texture( texture_handle const Texture ) const { return *(m_textures[ Texture ].first); } // performs a resource sweep void update(); @@ -108,6 +113,11 @@ private: typedef std::unordered_map index_map; + struct texture_unit { + GLint unit { NULL }; + texture_handle texture { NULL }; // current (most recently bound) texture + }; + // methods: // checks whether specified texture is in the texture bank. returns texture id, or npos. texture_handle @@ -123,7 +133,8 @@ private: texturetimepointpair_sequence m_textures; index_map m_texturemappings; garbage_collector m_garbagecollector { m_textures, 600, 60, "texture" }; - texture_handle m_activetexture { 0 }; // last i.e. currently bound texture + std::array m_units; + GLint m_activeunit { NULL }; }; // reduces provided data image to half of original size, using basic 2x2 average @@ -182,3 +193,5 @@ downsample( std::size_t const Width, std::size_t const Height, char *Imagedata ) } } } + +//--------------------------------------------------------------------------- diff --git a/Track.cpp b/Track.cpp index 27d41f9d..da96f6d2 100644 --- a/Track.cpp +++ b/Track.cpp @@ -483,20 +483,20 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) { parser->getTokens(); *parser >> str; // railtex - TextureID1 = ( + m_material1 = ( str == "none" ? NULL : - GfxRenderer.Fetch_Texture( str ) ); + GfxRenderer.Fetch_Material( str ) ); parser->getTokens(); *parser >> fTexLength; // tex tile length if (fTexLength < 0.01) fTexLength = 4; // Ra: zabezpiecznie przed zawieszeniem parser->getTokens(); *parser >> str; // sub || railtex - TextureID2 = ( + m_material2 = ( str == "none" ? NULL : - GfxRenderer.Fetch_Texture( str ) ); + GfxRenderer.Fetch_Material( str ) ); parser->getTokens(3); *parser >> fTexHeight1 >> fTexWidth >> fTexSlope; if (iCategoryFlag & 4) @@ -547,15 +547,15 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) SwitchExtension->Segments[0]->Init(p1, p2, segsize); // kopia oryginalnego toru } else if (iCategoryFlag & 2) - if (TextureID1 && fTexLength) + if (m_material1 && fTexLength) { // dla drogi trzeba ustalić proporcje boków nawierzchni float w, h; - GfxRenderer.Bind(TextureID1); + GfxRenderer.Bind_Material(m_material1); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h); if (h != 0.0) fTexRatio1 = w / h; // proporcja boków - GfxRenderer.Bind(TextureID2); + GfxRenderer.Bind_Material(m_material2); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &w); glGetTexLevelParameterfv(GL_TEXTURE_2D, 0, GL_TEXTURE_HEIGHT, &h); if (h != 0.0) @@ -1205,7 +1205,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { case tt_Table: // obrotnica jak zwykły tor, tylko animacja dochodzi case tt_Normal: - if (TextureID2) + if (m_material2) { // podsypka z podkładami jest tylko dla zwykłego toru vector6 bpts1[8]; // punkty głównej płaszczyzny nie przydają się do robienia boków if (fTexLength == 4.0) // jeśli stare mapowanie @@ -1275,7 +1275,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { GfxRenderer.Replace( vertices, Geometry2[ 0 ] ); } } - if (TextureID1) + if (m_material1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną vertex_array vertices; if( ( Bank != 0 ) && ( true == Geometry1.empty() ) ) { @@ -1296,7 +1296,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } break; case tt_Switch: // dla zwrotnicy dwa razy szyny - if( TextureID1 || TextureID2 ) + if( m_material1 || m_material2 ) { // iglice liczone tylko dla zwrotnic vector6 rpts3[24], rpts4[24]; for (i = 0; i < 12; ++i) @@ -1326,7 +1326,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa vertex_array vertices; - if( TextureID1 ) { + if( m_material1 ) { // fixed parts SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1339,7 +1339,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - if( TextureID2 ) { + if( m_material2 ) { // fixed parts SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1356,7 +1356,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { else { // lewa działa lepiej niż prawa vertex_array vertices; - if( TextureID1 ) { + if( m_material1 ) { // fixed parts SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1369,7 +1369,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - if( TextureID2 ) { + if( m_material2 ) { // fixed parts SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1394,7 +1394,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { case tt_Normal: // drogi proste, bo skrzyżowania osobno { vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma + if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 @@ -1413,13 +1413,13 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { bpts1[ 1 ] = vector6( -fHTW, 0.0, 0.5 + map1, 0.0, 1.0, 0.0 ); } } - if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty + if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy vertex_array vertices; Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } - if (TextureID2) + if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) vector6 rpts1[6], @@ -1574,7 +1574,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { nullptr : SwitchExtension->vPoints; // zmienna robocza, NULL gdy tablica punktów już jest wypełniona vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma + if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 @@ -1592,7 +1592,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { // problem ze skrzyżowaniami jest taki, że teren chce się pogrupować wg tekstur, ale zaczyna od nawierzchni // sama nawierzchnia nie wypełni tablicy punktów, bo potrzebne są pobocza // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie w swoim czasie - if( TextureID2 ) + if( m_material2 ) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) vector6 rpts1[6], @@ -1651,7 +1651,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y - fTexHeight2, 0.484375 - map2l); // lewy brzeg lewego chodnika } } - bool render = ( TextureID2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni + bool render = ( m_material2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni vertex_array vertices; if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka @@ -1707,7 +1707,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { SwitchExtension->bPoints = true; // tablica punktów została wypełniona } - if( TextureID1 ) { + if( m_material1 ) { vertex_array vertices; // jeśli podana tekstura nawierzchni // we start with a vertex in the middle... @@ -1759,7 +1759,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { case tt_Normal: // drogi proste, bo skrzyżowania osobno { vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (TextureID1 || TextureID2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma + if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% double max = (iCategoryFlag & 4) ? 0.0 : @@ -1784,13 +1784,13 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { bpts1[1] = vector6(-fHTW, 0.0, 0.5 + map1); } } - if (TextureID1) // jeśli podana była tekstura, generujemy trójkąty + if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy vertex_array vertices; Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } - if (TextureID2) + if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) vertex_array vertices; vector6 rpts1[6], @@ -2105,8 +2105,8 @@ TTrack * TTrack::RaAnimate() } } // skip the geometry update if no geometry for this track was generated yet - if( ( ( TextureID1 != 0 ) - || ( TextureID2 != 0 ) ) + if( ( ( m_material1 != 0 ) + || ( m_material2 != 0 ) ) && ( ( false == Geometry1.empty() ) || ( false == Geometry2.empty() ) ) ) { // iglice liczone tylko dla zwrotnic @@ -2143,13 +2143,13 @@ TTrack * TTrack::RaAnimate() if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - if( TextureID1 ) { + if( m_material1 ) { // left blade SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } - if( TextureID2 ) { + if( m_material2 ) { // right blade SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); @@ -2157,13 +2157,13 @@ TTrack * TTrack::RaAnimate() } } else { // lewa działa lepiej niż prawa - if( TextureID1 ) { + if( m_material1 ) { // right blade SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } - if( TextureID2 ) { + if( m_material2 ) { // left blade SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); diff --git a/Track.h b/Track.h index 573fca5f..2211ff10 100644 --- a/Track.h +++ b/Track.h @@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "GL/glew.h" #include "ResourceManager.h" #include "Segment.h" -#include "Texture.h" +#include "material.h" typedef enum { @@ -142,8 +142,8 @@ private: /* GLuint DisplayListID = 0; */ - texture_handle TextureID1 = 0; // tekstura szyn albo nawierzchni - texture_handle TextureID2 = 0; // tekstura automatycznej podsypki albo pobocza + material_handle m_material1 = 0; // tekstura szyn albo nawierzchni + material_handle m_material2 = 0; // tekstura automatycznej podsypki albo pobocza typedef std::vector geometryhandle_sequence; geometryhandle_sequence Geometry1; // geometry chunks textured with texture 1 geometryhandle_sequence Geometry2; // geometry chunks textured with texture 2 @@ -257,8 +257,8 @@ public: GLuint TextureGet(int i) { return ( i ? - TextureID1 : - TextureID2 ); }; + m_material1 : + m_material2 ); }; bool IsGroupable(); int TestPoint(vector3 *Point); void MovedUp1(float const dh); diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index e4762bc0..00ac0856 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -225,6 +225,9 @@ Source Files + + Source Files + @@ -440,6 +443,9 @@ Header Files + + Header Files + diff --git a/material.cpp b/material.cpp new file mode 100644 index 00000000..c9c82eed --- /dev/null +++ b/material.cpp @@ -0,0 +1,143 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" + +#include "material.h" +#include "renderer.h" +#include "usefull.h" +#include "globals.h" + +bool +opengl_material::deserialize( cParser &Input, bool const Loadnow ) { + + bool result { false }; + while( true == deserialize_mapping( Input, Loadnow ) ) { + result = true; // once would suffice but, eh + } + + has_alpha = ( + texture1 != NULL ? + GfxRenderer.Texture( texture1 ).has_alpha : + false ); + + return result; +} + +// imports member data pair from the config file +bool +opengl_material::deserialize_mapping( cParser &Input, bool const Loadnow ) { + + if( false == Input.getTokens( 2, true, "\n\r\t;, " ) ) { + return false; + } + + std::string path; + if( name.rfind( '\\' ) != std::string::npos ) { + path = name.substr( 0, name.rfind( '\\' ) + 1 ); + } + + std::string key, value; + Input + >> key + >> value; + + if( key == "texture1:" ) { texture1 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); } + else if( key == "texture2:" ) { texture2 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); } + + return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized +} + + +// create material object from data stored in specified file. +// NOTE: the deferred load parameter is passed to textures defined by material, the material itself is always loaded immediately +material_handle +material_manager::create( std::string const &Filename, bool const Loadnow ) { + + auto filename { Filename }; + + if( filename.find( '|' ) != std::string::npos ) + filename.erase( filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury + + if( filename.rfind( '.' ) != std::string::npos ) { + // we can get extension for .mat or, in legacy files, some image format. just trim it and set it to material file extension + filename.erase( filename.rfind( '.' ) ); + } + filename += ".mat"; + + for( char &c : filename ) { + // change forward slashes to windows ones. NOTE: probably not strictly necessary, but eh + c = ( c == '/' ? '\\' : c ); + } + if( filename.find( '\\' ) == std::string::npos ) { + // jeśli bieżaca ścieżka do tekstur nie została dodana to dodajemy domyślną + filename = szTexturePath + filename; + } + + // try to locate requested material in the databank + auto const databanklookup = find_in_databank( filename ); + if( databanklookup != npos ) { + return databanklookup; + } + // if this fails, try to look for it on disk + opengl_material material; + material.name = filename; + auto const disklookup = find_on_disk( filename ); + if( disklookup != "" ) { + cParser materialparser( disklookup, cParser::buffer_FILE ); + if( false == material.deserialize( materialparser, Loadnow ) ) { + // deserialization failed but the .mat file does exist, so we give up at this point + return NULL; + } + } + else { + // if there's no .mat file, this could be legacy method of referring just to diffuse texture directly, make a material out of it in such case + material.texture1 = GfxRenderer.Fetch_Texture( Filename, Loadnow ); + if( material.texture1 == NULL ) { + // if there's also no texture, give up + return NULL; + } + material.has_alpha = GfxRenderer.Texture( material.texture1 ).has_alpha; + } + + material_handle handle = m_materials.size(); + m_materials.emplace_back( material ); + m_materialmappings.emplace( material.name, handle ); + return handle; +}; + +// checks whether specified texture is in the texture bank. returns texture id, or npos. +material_handle +material_manager::find_in_databank( std::string const &Materialname ) const { + + auto lookup = m_materialmappings.find( Materialname ); + if( lookup != m_materialmappings.end() ) { + return lookup->second; + } + // jeszcze próba z dodatkową ścieżką + lookup = m_materialmappings.find( szTexturePath + Materialname ); + + return ( + lookup != m_materialmappings.end() ? + lookup->second : + npos ); +} + +// checks whether specified file exists. +// NOTE: this is direct copy of the method used by texture manager. TBD, TODO: refactor into common routine? +std::string +material_manager::find_on_disk( std::string const &Materialname ) const { + + return( + FileExists( Materialname ) ? Materialname : + FileExists( szTexturePath + Materialname ) ? szTexturePath + Materialname : + "" ); +} + +//--------------------------------------------------------------------------- diff --git a/material.h b/material.h new file mode 100644 index 00000000..a53aac01 --- /dev/null +++ b/material.h @@ -0,0 +1,64 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "texture.h" +#include "parser.h" + +typedef int material_handle; + +// a collection of parameters for the rendering setup. +// for modern opengl this translates to set of attributes for the active shaders, +// for legacy opengl this is basically just texture(s) assigned to geometry +struct opengl_material { + + texture_handle texture1 { NULL }; // primary texture, typically diffuse+apha + texture_handle texture2 { NULL }; // secondary texture, typically normal+reflection + + bool has_alpha { false }; // alpha state, calculated from presence of alpha in texture1 + std::string name; +// methods: + bool + deserialize( cParser &Input, bool const Loadnow ); +private: + // imports member data pair from the config file + bool + deserialize_mapping( cParser &Input, bool const Loadnow ); +}; + +class material_manager { + +public: + material_manager() { m_materials.emplace_back( opengl_material() ); } // empty bindings for null material + + material_handle + create( std::string const &Filename, bool const Loadnow ); + opengl_material const & + material( material_handle const Material ) const { return m_materials[ Material ]; } + +private: +// types + typedef std::vector material_sequence; + typedef std::unordered_map index_map; +// methods: + // checks whether specified texture is in the texture bank. returns texture id, or npos. + material_handle + find_in_databank( std::string const &Materialname ) const; + // checks whether specified file exists. returns name of the located file, or empty string. + std::string + find_on_disk( std::string const &Materialname ) const; +// members: + material_handle const npos { -1 }; + material_sequence m_materials; + index_map m_materialmappings; + +}; + +//--------------------------------------------------------------------------- diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index 0a046ead..9d622f3a 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -120,6 +120,7 @@ geometry_bank::vertices( geometry_handle const &Geometry ) const { GLuint opengl_vbogeometrybank::m_activebuffer { NULL }; // buffer bound currently on the opengl end, if any unsigned int opengl_vbogeometrybank::m_activestreams { stream::none }; // currently enabled data type pointers +std::vector opengl_vbogeometrybank::m_activetexturearrays; // currently enabled texture coord arrays // create() subclass details void @@ -274,12 +275,19 @@ opengl_vbogeometrybank::bind_streams( stream_units const &Units, unsigned int co ::glDisableClientState( GL_COLOR_ARRAY ); } if( Streams & stream::texture ) { - ::glClientActiveTexture( Units.texture ); - ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); - ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + for( auto unit : Units.texture ) { + ::glClientActiveTexture( unit ); + ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); + ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + } + m_activetexturearrays = Units.texture; } else { - ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + for( auto unit : Units.texture ) { + ::glClientActiveTexture( unit ); + ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + } + m_activetexturearrays.clear(); // NOTE: we're simplifying here, since we always toggle the same texture coord sets } m_activestreams = Streams; @@ -291,9 +299,13 @@ opengl_vbogeometrybank::release_streams() { ::glDisableClientState( GL_VERTEX_ARRAY ); ::glDisableClientState( GL_NORMAL_ARRAY ); ::glDisableClientState( GL_COLOR_ARRAY ); - ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + for( auto unit : m_activetexturearrays ) { + ::glClientActiveTexture( unit ); + ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); + } m_activestreams = stream::none; + m_activetexturearrays.clear(); } // opengl display list based variant of the geometry bank @@ -331,7 +343,7 @@ opengl_dlgeometrybank::draw_( geometry_handle const &Geometry, stream_units cons for( auto const &vertex : chunk.vertices ) { if( Streams & stream::normal ) { ::glNormal3fv( glm::value_ptr( vertex.normal ) ); } else if( Streams & stream::color ) { ::glColor3fv( glm::value_ptr( vertex.normal ) ); } - if( Streams & stream::texture ) { ::glMultiTexCoord2fv( Units.texture, glm::value_ptr( vertex.texture ) ); } + if( Streams & stream::texture ) { for( auto unit : Units.texture ) { ::glMultiTexCoord2fv( unit, glm::value_ptr( vertex.texture ) ); } } if( Streams & stream::position ) { ::glVertex3fv( glm::value_ptr( vertex.position ) ); } } ::glEnd(); diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 90bec5a0..9a4a7773 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -46,7 +46,7 @@ unsigned int const color_streams { stream::position | stream::color | stream::te struct stream_units { - GLint texture { GL_TEXTURE0 }; // unit associated with main texture data stream. TODO: allow multiple units per stream + std::vector texture { GL_TEXTURE0 }; // unit associated with main texture data stream. TODO: allow multiple units per stream }; typedef std::vector vertex_array; @@ -207,6 +207,7 @@ private: // members: static GLuint m_activebuffer; // buffer bound currently on the opengl end, if any static unsigned int m_activestreams; + static std::vector m_activetexturearrays; GLuint m_buffer { NULL }; // id of the buffer holding data on the opengl end std::size_t m_buffercapacity{ 0 }; // total capacity of the last established buffer chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order diff --git a/renderer.cpp b/renderer.cpp index 081bdd91..1085ee52 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -98,9 +98,10 @@ opengl_renderer::Init( GLFWwindow *Window ) { glEnable( GL_CULL_FACE ); // Cull back-facing triangles glShadeModel( GL_SMOOTH ); // Enable Smooth Shading - glActiveTexture( m_diffusetextureunit ); - m_geometry.units().texture = m_diffusetextureunit; + m_geometry.units().texture = std::vector{ m_normaltextureunit, m_diffusetextureunit }; + m_textures.assign_units( m_helpertextureunit, m_shadowtextureunit, m_normaltextureunit, m_diffusetextureunit ); // TODO: add reflections unit UILayer.set_unit( m_diffusetextureunit ); + Active_Texture( m_diffusetextureunit ); ::glDepthFunc( GL_LEQUAL ); glEnable( GL_DEPTH_TEST ); @@ -215,7 +216,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL ); ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE ); - ::glBindTexture( GL_TEXTURE_2D, 0 ); + ::glBindTexture( GL_TEXTURE_2D, NULL ); #ifdef EU07_USE_DEBUG_SHADOWMAP ::glGenTextures( 1, &m_shadowdebugtexture ); ::glBindTexture( GL_TEXTURE_2D, m_shadowdebugtexture ); @@ -577,24 +578,12 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f case rendermode::pickscenery: { // TODO: scissor test for pick modes // projection - if( true == m_framebuffersupport ) { - auto const angle = Global::FieldOfView / Global::ZoomFactor; - auto const height = std::max( 1.0f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ); - camera.projection() *= - glm::perspective( - glm::radians( Global::FieldOfView / Global::ZoomFactor ), - std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.0f, (float)Global::iWindowHeight ) / ( Global::iWindowWidth / EU07_PICKBUFFERSIZE ), - 0.1f * Global::ZoomFactor, - Config.draw_range * Global::fDistanceFactor ); - } - else { - camera.projection() *= - glm::perspective( - glm::radians( Global::FieldOfView / Global::ZoomFactor ), - std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), - 0.1f * Global::ZoomFactor, - Config.draw_range * Global::fDistanceFactor ); - } + camera.projection() *= + glm::perspective( + glm::radians( Global::FieldOfView / Global::ZoomFactor ), + std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), + 0.1f * Global::ZoomFactor, + Config.draw_range * Global::fDistanceFactor ); // modelview camera.position() = Global::pCameraPosition; World.Camera.SetMatrix( viewmatrix ); @@ -674,17 +663,20 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const // helper texture unit. // darkens previous stage, preparing data for the shadow texture unit to select from if( m_helpertextureunit >= 0 ) { - if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { - // setup reflection texture unit - ::glActiveTexture( m_helpertextureunit ); - Bind( m_reflectiontexture ); // TBD, TODO: move to reflection unit setup + + Active_Texture( m_helpertextureunit ); + + if( ( true == Reflections ) + || ( ( true == Global::RenderShadows ) && ( true == Shadows ) ) ) { + m_textures.bind( textureunit::helper, m_reflectiontexture ); ::glEnable( GL_TEXTURE_2D ); -/* - glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); - glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); - glEnable( GL_TEXTURE_GEN_S ); - glEnable( GL_TEXTURE_GEN_T ); -*/ + } + else { + ::glDisable( GL_TEXTURE_2D ); + } + + if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( m_shadowcolor ) ); // TODO: dynamically calculated shadow colour, based on sun height @@ -698,14 +690,24 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); } else { - ::glActiveTexture( m_helpertextureunit ); - ::glDisable( GL_TEXTURE_2D ); -/* + + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE ); // pass the previous stage colour down the chain + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PREVIOUS ); + + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // pass the previous stage alpha down the chain + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); + } + + if( true == Reflections ) { + ::glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); + ::glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); + ::glEnable( GL_TEXTURE_GEN_S ); + ::glEnable( GL_TEXTURE_GEN_T ); + } + else { ::glDisable( GL_TEXTURE_GEN_S ); ::glDisable( GL_TEXTURE_GEN_T ); - ::glDisable( GL_TEXTURE_GEN_R ); - ::glDisable( GL_TEXTURE_GEN_Q ); -*/ } } // shadow texture unit. @@ -715,7 +717,8 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const && ( true == Shadows ) && ( m_shadowcolor != colors::white ) ) { - ::glActiveTexture( m_shadowtextureunit ); + Active_Texture( m_shadowtextureunit ); + // NOTE: shadowmap isn't part of regular texture system, so we use direct bind call here ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); ::glEnable( GL_TEXTURE_2D ); // s @@ -745,7 +748,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const } else { // turn off shadow map tests - ::glActiveTexture( m_shadowtextureunit ); + Active_Texture( m_shadowtextureunit ); ::glDisable( GL_TEXTURE_2D ); ::glDisable( GL_TEXTURE_GEN_S ); @@ -754,9 +757,35 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const ::glDisable( GL_TEXTURE_GEN_Q ); } } + // reflections/normals texture unit + // NOTE: comes after diffuse stage in the operation chain + if( m_normaltextureunit >= 0 ) { + + Active_Texture( m_normaltextureunit ); + + if( true == Reflections ) { + ::glEnable( GL_TEXTURE_2D ); + + ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE ); // blend between object colour and env.reflection + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0 ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PREVIOUS ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR ); + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE ); // alpha channel of the normal map controls reflection strength + ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA ); + + ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE ); // pass the previous stage alpha down the chain + ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS ); + } + else { + ::glDisable( GL_TEXTURE_2D ); + } + } // diffuse texture unit. // NOTE: diffuse texture mapping is never fully disabled, alpha channel information is always included - ::glActiveTexture( m_diffusetextureunit ); + Active_Texture( m_diffusetextureunit ); + ::glEnable( GL_TEXTURE_2D ); if( true == Diffuse ) { // default behaviour, modulate with previous stage ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); @@ -788,14 +817,15 @@ void opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { // helper texture unit. if( m_helpertextureunit >= 0 ) { - if( ( true == Global::RenderShadows ) - && ( true == Shadows ) - && ( m_shadowcolor != colors::white ) ) { - ::glActiveTexture( m_helpertextureunit ); + if( ( true == Reflections ) + || ( ( true == Global::RenderShadows ) + && ( true == Shadows ) + && ( m_shadowcolor != colors::white ) ) ) { + Active_Texture( m_helpertextureunit ); ::glEnable( GL_TEXTURE_2D ); } else { - ::glActiveTexture( m_helpertextureunit ); + Active_Texture( m_helpertextureunit ); ::glDisable( GL_TEXTURE_2D ); } } @@ -803,25 +833,35 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons if( m_shadowtextureunit >= 0 ) { if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { - ::glActiveTexture( m_shadowtextureunit ); + Active_Texture( m_shadowtextureunit ); ::glEnable( GL_TEXTURE_2D ); } else { - ::glActiveTexture( m_shadowtextureunit ); + Active_Texture( m_shadowtextureunit ); ::glDisable( GL_TEXTURE_2D ); } } + // normal/reflection texture unit + if( true == Reflections ) { + + Active_Texture( m_normaltextureunit ); + ::glEnable( GL_TEXTURE_2D ); + } + else { + Active_Texture( m_normaltextureunit ); + ::glDisable( GL_TEXTURE_2D ); + } // diffuse texture unit. // NOTE: toggle actually disables diffuse texture mapping, unlike setup counterpart if( true == Diffuse ) { - ::glActiveTexture( m_diffusetextureunit ); + Active_Texture( m_diffusetextureunit ); ::glEnable( GL_TEXTURE_2D ); } else { - ::glActiveTexture( m_diffusetextureunit ); + Active_Texture( m_diffusetextureunit ); ::glDisable( GL_TEXTURE_2D ); } } @@ -829,10 +869,9 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons void opengl_renderer::setup_shadow_color( glm::vec4 const &Shadowcolor ) { - ::glActiveTexture( m_helpertextureunit ); + Active_Texture( m_helpertextureunit ); ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( Shadowcolor ) ); // in-shadow colour multiplier - ::glActiveTexture( m_diffusetextureunit ); - + Active_Texture( m_diffusetextureunit ); } bool @@ -854,7 +893,7 @@ opengl_renderer::Render( world_environment *Environment ) { return false; } - Bind( NULL ); + Bind_Material( NULL ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); @@ -903,7 +942,7 @@ opengl_renderer::Render( world_environment *Environment ) { auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); // sun { - Bind( m_suntexture ); + Bind_Texture( m_suntexture ); ::glColor4f( suncolor.x, suncolor.y, suncolor.z, 1.0f ); auto const sunvector = Environment->m_sun.getDirection(); auto const sunposition = modelview * glm::vec4( sunvector.x, sunvector.y, sunvector.z, 1.0f ); @@ -924,7 +963,7 @@ opengl_renderer::Render( world_environment *Environment ) { } // moon { - Bind( m_moontexture ); + Bind_Texture( m_moontexture ); glm::vec3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, static_cast( 1.0 - Global::fLuminance * 0.5 ) ); @@ -1032,21 +1071,48 @@ opengl_renderer::Vertices( geometry_handle const &Geometry ) const { return m_geometry.vertices( Geometry ); } -// texture methods -texture_handle -opengl_renderer::Fetch_Texture( std::string const &Filename, std::string const &Dir, int const Filter, bool const Loadnow ) { +// material methods +material_handle +opengl_renderer::Fetch_Material( std::string const &Filename, bool const Loadnow ) { - return m_textures.create( Filename, Dir, Filter, Loadnow ); + return m_materials.create( Filename, Loadnow ); } void -opengl_renderer::Bind( texture_handle const Texture ) { - // temporary until we separate the renderer - m_textures.bind( Texture ); +opengl_renderer::Bind_Material( material_handle const Material ) { + + auto const &material = m_materials.material( Material ); + m_textures.bind( textureunit::normals, material.texture2 ); + m_textures.bind( textureunit::diffuse, material.texture1 ); +} + +opengl_material const & +opengl_renderer::Material( material_handle const Material ) const { + + return m_materials.material( Material ); +} + +// texture methods +void +opengl_renderer::Active_Texture( GLint const Textureunit ) { + + return m_textures.unit( Textureunit ); +} + +texture_handle +opengl_renderer::Fetch_Texture( std::string const &Filename, bool const Loadnow ) { + + return m_textures.create( Filename, Loadnow ); +} + +void +opengl_renderer::Bind_Texture( texture_handle const Texture ) { + + m_textures.bind( textureunit::diffuse, Texture ); } opengl_texture const & -opengl_renderer::Texture( texture_handle const Texture ) { +opengl_renderer::Texture( texture_handle const Texture ) const { return m_textures.texture( Texture ); } @@ -1431,7 +1497,7 @@ opengl_renderer::Render( TGroundNode *Node ) { ::glLineWidth( static_cast( linewidth ) ); } - GfxRenderer.Bind( NULL ); + GfxRenderer.Bind_Material( NULL ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -1464,7 +1530,7 @@ opengl_renderer::Render( TGroundNode *Node ) { return false; } // setup - Bind( Node->TextureID ); + Bind_Material( Node->m_material ); switch( m_renderpass.draw_mode ) { case rendermode::color: { ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); @@ -1784,12 +1850,12 @@ opengl_renderer::Render( TSubModel *Submodel ) { #endif // material configuration: // textures... - if( Submodel->TextureID < 0 ) { // zmienialne skóry - Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); } else { // również 0 - Bind( Submodel->TextureID ); + Bind_Material( Submodel->m_material ); } // ...colors... ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub @@ -1839,12 +1905,12 @@ opengl_renderer::Render( TSubModel *Submodel ) { // scenery picking and shadow both use enforced colour and no frills // material configuration: // textures... - if( Submodel->TextureID < 0 ) { // zmienialne skóry - Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); } else { // również 0 - Bind( Submodel->TextureID ); + Bind_Material( Submodel->m_material ); } // main draw call m_geometry.draw( Submodel->m_geometry ); @@ -1857,12 +1923,12 @@ opengl_renderer::Render( TSubModel *Submodel ) { m_pickcontrolsitems.emplace_back( Submodel ); ::glColor3fv( glm::value_ptr( pick_color( m_pickcontrolsitems.size() ) ) ); // textures... - if( Submodel->TextureID < 0 ) { // zmienialne skóry - Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); } else { // również 0 - Bind( Submodel->TextureID ); + Bind_Material( Submodel->m_material ); } // main draw call m_geometry.draw( Submodel->m_geometry ); @@ -1902,7 +1968,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); - Bind( NULL ); + Bind_Material( NULL ); ::glPointSize( std::max( 3.f, 5.f * distancefactor * anglefactor ) ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], lightlevel * anglefactor ); ::glDisable( GL_LIGHTING ); @@ -1941,7 +2007,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); - Bind( NULL ); + Bind_Material( NULL ); ::glDisable( GL_LIGHTING ); // main draw call @@ -1976,20 +2042,20 @@ opengl_renderer::Render( TSubModel *Submodel ) { void opengl_renderer::Render( TTrack *Track ) { - if( ( Track->TextureID1 == 0 ) - && ( Track->TextureID2 == 0 ) ) { + if( ( Track->m_material1 == 0 ) + && ( Track->m_material2 == 0 ) ) { return; } switch( m_renderpass.draw_mode ) { case rendermode::color: { Track->EnvironmentSet(); - if( Track->TextureID1 != 0 ) { - Bind( Track->TextureID1 ); + if( Track->m_material1 != 0 ) { + Bind_Material( Track->m_material1 ); m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); } - if( Track->TextureID2 != 0 ) { - Bind( Track->TextureID2 ); + if( Track->m_material2 != 0 ) { + Bind_Material( Track->m_material2 ); m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); } Track->EnvironmentReset(); @@ -1997,12 +2063,12 @@ opengl_renderer::Render( TTrack *Track ) { } case rendermode::pickscenery: case rendermode::shadows: { - if( Track->TextureID1 != 0 ) { - Bind( Track->TextureID1 ); + if( Track->m_material1 != 0 ) { + Bind_Material( Track->m_material1 ); m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); } - if( Track->TextureID2 != 0 ) { - Bind( Track->TextureID2 ); + if( Track->m_material2 != 0 ) { + Bind_Material( Track->m_material2 ); m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); } break; @@ -2141,7 +2207,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { auto const color { Node->hvTraction->wire_color() }; ::glColor4f( color.r, color.g, color.b, linealpha ); - Bind( NULL ); + Bind_Material( NULL ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -2217,7 +2283,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { ::glLineWidth( static_cast(linewidth) ); } - GfxRenderer.Bind( NULL ); + GfxRenderer.Bind_Material( NULL ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -2242,7 +2308,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // setup ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); - Bind( Node->TextureID ); + Bind_Material( Node->m_material ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -2423,12 +2489,12 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { } #endif // textures... - if( Submodel->TextureID < 0 ) { // zmienialne skóry - Bind( Submodel->ReplacableSkinId[ -Submodel->TextureID ] ); + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); } else { // również 0 - Bind( Submodel->TextureID ); + Bind_Material( Submodel->m_material ); } // ...colors... ::glColor3fv( glm::value_ptr(Submodel->f4Diffuse) ); // McZapkie-240702: zamiast ub @@ -2495,7 +2561,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // setup ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); - Bind( m_glaretexture ); + Bind_Texture( m_glaretexture ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], glarelevel ); ::glDisable( GL_LIGHTING ); ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); @@ -2585,9 +2651,8 @@ opengl_renderer::Update_Pick_Control() { if( true == m_framebuffersupport ) { // ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); pickbufferpos = glm::ivec2{ - mousepos.x * EU07_PICKBUFFERSIZE / Global::iWindowWidth, - mousepos.y * EU07_PICKBUFFERSIZE / Global::iWindowHeight - }; + mousepos.x * EU07_PICKBUFFERSIZE / std::max( 1, Global::iWindowWidth ), + mousepos.y * EU07_PICKBUFFERSIZE / std::max( 1, Global::iWindowHeight ) }; } else { // ::glReadBuffer( GL_BACK ); diff --git a/renderer.h b/renderer.h index 30e5dcad..2ecad49c 100644 --- a/renderer.h +++ b/renderer.h @@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "GL/glew.h" #include "openglgeometrybank.h" -#include "texture.h" +#include "material.h" #include "lightarray.h" #include "dumb3d.h" #include "frustum.h" @@ -73,13 +73,6 @@ struct opengl_technique { }; -// a collection of parameters for the rendering setup. -// for modern opengl this translates to set of attributes for the active shaders, -// for legacy opengl this is basically just texture(s) assigned to geometry -struct opengl_material { - -}; - // simple camera object. paired with 'virtual camera' in the scene class opengl_camera { @@ -175,13 +168,22 @@ public: // provides direct access to vertex data of specfied chunk vertex_array const & Vertices( geometry_handle const &Geometry ) const; - // texture methods - texture_handle - Fetch_Texture( std::string const &Filename, std::string const &Dir = szTexturePath, int const Filter = -1, bool const Loadnow = true ); + // material methods + material_handle + Fetch_Material( std::string const &Filename, bool const Loadnow = true ); void - Bind( texture_handle const Texture ); + Bind_Material( material_handle const Material ); + opengl_material const & + Material( material_handle const Material ) const; + // texture methods + void + Active_Texture( GLint const Textureunit ); + texture_handle + Fetch_Texture( std::string const &Filename, bool const Loadnow = true ); + void + Bind_Texture( texture_handle const Texture ); opengl_texture const & - Texture( texture_handle const Texture ); + Texture( texture_handle const Texture ) const; // light methods void Disable_Lights(); @@ -215,6 +217,13 @@ private: pickscenery }; + enum textureunit { + helper = 0, + shadows, + normals, + diffuse + }; + typedef std::pair< double, TSubRect * > distancesubcell_pair; struct renderpass_config { @@ -292,6 +301,7 @@ private: // members GLFWwindow *m_window { nullptr }; geometrybank_manager m_geometry; + material_manager m_materials; texture_manager m_textures; opengllight_array m_lights; @@ -316,9 +326,10 @@ private: #endif glm::mat4 m_shadowtexturematrix; // conversion from camera-centric world space to light-centric clip space - int m_shadowtextureunit { GL_TEXTURE1 }; int m_helpertextureunit { GL_TEXTURE0 }; - int m_diffusetextureunit { GL_TEXTURE2 }; + int m_shadowtextureunit { GL_TEXTURE1 }; + int m_normaltextureunit { GL_TEXTURE2 }; + int m_diffusetextureunit{ GL_TEXTURE3 }; float m_drawtime { 1000.f / 30.f * 20.f }; // start with presumed 'neutral' average of 30 fps std::chrono::steady_clock::time_point m_drawstart; // cached start time of previous frame @@ -327,6 +338,7 @@ private: float m_drawtimeshadowpass { 0.f }; double m_updateaccumulator { 0.0 }; std::string m_debuginfo; + std::string m_pickdebuginfo; glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; glm::vec4 m_shadowcolor { 0.5f, 0.5f, 0.5f, 1.f }; diff --git a/uilayer.cpp b/uilayer.cpp index 4680a728..d05adbcc 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -216,7 +216,7 @@ ui_layer::render_background() { if( m_background == 0 ) return; // NOTE: we limit/expect the background to come with 4:3 ratio. // TODO, TBD: if we expose texture width or ratio from texture object, this limitation could be lifted - GfxRenderer.Bind( m_background ); + GfxRenderer.Bind_Texture( m_background ); auto const height { 768.0f }; auto const &texture = GfxRenderer.Texture( m_background ); float const width = ( @@ -239,7 +239,7 @@ ui_layer::render_texture() { ::glColor4f( 1.f, 1.f, 1.f, 1.f ); ::glDisable( GL_BLEND ); - GfxRenderer.Bind( NULL ); + GfxRenderer.Bind_Texture( NULL ); ::glBindTexture( GL_TEXTURE_2D, m_texture ); auto const size = 512.f; @@ -254,6 +254,8 @@ ui_layer::render_texture() { glEnd(); + ::glBindTexture( GL_TEXTURE_2D, NULL ); + ::glEnable( GL_BLEND ); } } diff --git a/version.h b/version.h index a572b462..48e719be 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 805 -#define VERSION_REVISION 0 +#define VERSION_MINOR 810 +#define VERSION_REVISION 1 From 2014494c2a8f43624af7348490007d652d8c03f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Fri, 11 Aug 2017 18:38:03 +0200 Subject: [PATCH 159/426] braking distance (fBrakeDist) calculation depends on train brakes performance, better braking - removed old conditions and phases --- Driver.cpp | 46 ++++++++++++++++++++++++++-------------------- McZapkie/Mover.cpp | 2 +- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 58ea8e4d..d8f4df3a 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1711,12 +1711,12 @@ void TController::AutoRewident() else if (ustaw > 16) { fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 4 * fBrake_a1[BrakeAccTableSize]; - fBrakeReaction = 0.75+fLength*0.001; + fBrakeReaction = 0.75 + fLength*0.002; } else { fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 1 * fBrake_a1[BrakeAccTableSize]; - fBrakeReaction = 2.0; + fBrakeReaction = 1.5 + fLength*0.002; } }; @@ -2417,7 +2417,7 @@ bool TController::DecBrake() OK = mvOccupied->DecLocalBrakeLevel(1 + floor(0.5 + fabs(AccDesired))); break; case Pneumatic: - deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4 * (mvOccupied->BrakeCtrlPosR)*fBrake_a1[0]); + deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4 * (mvOccupied->BrakeCtrlPosR-1.0)*fBrake_a1[0]); if (deltaAcc < 0) { if (mvOccupied->BrakeCtrlPosR > 0) @@ -3507,6 +3507,8 @@ bool TController::UpdateSituation(double dt) // zalecane ciśnienie if (fMass > 1000000.0) fBrakeDist *= 2.0; // korekta dla ciężkich, bo przeżynają - da to coś? + if ((fAccThreshold>0.05)&&(mvOccupied->CategoryFlag==1)) + fBrakeDist = mvOccupied->Vel * mvOccupied->Vel / 25.92 / fAccThreshold; if (mvOccupied->BrakeDelayFlag == bdelay_G) fBrakeDist = fBrakeDist + 2 * mvOccupied->Vel; // dla nastawienia G // koniecznie należy wydłużyć drogę na czas reakcji @@ -4364,21 +4366,24 @@ bool TController::UpdateSituation(double dt) else if (ActualProximityDist > fMinProximityDist) { // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze // jest daleko - if (vel < - VelNext + 20.0) // dwustopniowe hamowanie - niski przy małej różnicy + if (ActualProximityDist < + fMaxProximityDist) // jak minął już maksymalny dystans + { // po prostu hamuj (niski stopień) //ma stanąć, a jest w + // drodze hamowania albo ma jechać + AccDesired = (VelNext * VelNext - vel * vel) / + (25.92 * (ActualProximityDist + + 0.1 - 0.5*fMinProximityDist)); // hamowanie tak, aby stanąć + AccDesired = std::min(AccDesired, fAccThreshold); + VelDesired = 0.0; // Min0R(VelDesired,VelNext); + } + else if ((vel < + VelNext + 20.0)&&(false)) // dwustopniowe hamowanie - niski przy małej różnicy { // jeśli jedzie wolniej niż VelNext+35km/h //Ra: 40, żeby nie // kombinował na zwrotnicach if (VelNext == 0.0) { // jeśli ma się zatrzymać, musi być to robione precyzyjnie i // skutecznie - if (ActualProximityDist < - fMaxProximityDist) // jak minął już maksymalny dystans - { // po prostu hamuj (niski stopień) //ma stanąć, a jest w - // drodze hamowania albo ma jechać - AccDesired = fAccThreshold; // hamowanie tak, aby stanąć - VelDesired = 0.0; // Min0R(VelDesired,VelNext); - } - else if (ActualProximityDist > fBrakeDist) + if (ActualProximityDist > fBrakeDist) { // jeśli ma stanąć, a mieści się w drodze hamowania if (vel < 10.0) // jeśli prędkość jest łatwa do zatrzymania { // tu jest trochę problem, bo do punktu zatrzymania dobija @@ -4430,9 +4435,9 @@ bool TController::UpdateSituation(double dt) } } else { // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) - double dist = (VelNext * VelNext - (VelNext + 20) * (VelNext + 20)) / (25.92)*(-1 / fBrake_a0[0] - 1 / fAccThreshold) + 1.5*VelNext; + double dist = 0;// (VelNext * VelNext - (VelNext + 20) * (VelNext + 20)) / (25.92)*(-1 / fBrake_a0[0] - 1 / fAccThreshold); AccDesired = (VelNext * VelNext - vel * vel) / - (25.92 * (std::max(ActualProximityDist - 2 * VelNext, std::min(ActualProximityDist, 2 * VelNext)) - dist) + + (25.92 * std::max(ActualProximityDist - VelNext - dist, std::min(ActualProximityDist, VelNext+dist)) + 0.1); // najpierw hamuje mocniej, potem zluzuje } if (AccPreferred < AccDesired) @@ -4535,8 +4540,10 @@ bool TController::UpdateSituation(double dt) SetDriverPsyche(); } } - if (-AccDesired * BrakeAccFactor() < (fReady > 0.4 ? fBrake_a0[0] : -fAccThreshold)) - AccDesired = std::max(-0.01, AccDesired); + if (-AccDesired * BrakeAccFactor() < ((fReady > 0.4)||(VelDesiredBrakeSystem == Pneumatic) // napełnianie uderzeniowe if (mvOccupied->BrakeHandle == FV4a) { @@ -4600,9 +4607,8 @@ bool TController::UpdateSituation(double dt) mvOccupied->BrakeReleaser(1); // wyluzuj lokomotywę - może być więcej! else if (OrderList[OrderPos] != Disconnect) // przy odłączaniu nie zwalniamy tu hamulca - if ((AccDesired > 0.0) || - (fAccGravity * fAccGravity < - 0.001)) // luzuj tylko na plaskim lub przy ruszaniu + if (fAccGravity * fAccGravity < + 0.001) // luzuj tylko na plaskim lub przy ruszaniu { while (DecBrake()) ; // jeśli przyspieszamy, to nie hamujemy diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 3ad5ca42..1a371675 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3784,7 +3784,7 @@ double TMoverParameters::BrakeForceR(double ratio, double velocity) press = MaxBrakePress[3]; if (DynamicBrakeType == dbrake_automatic) ratio = ratio + (1.5 - ratio)*std::min(1.0, Vel*0.02); - if ((BrakeDelayFlag&bdelay_R) && (BrakeMethod != bp_Cosid) && (BrakeMethod != bp_D1) && (BrakeMethod != bp_D2)&&(Power>1)) + if ((BrakeDelayFlag&bdelay_R) && (BrakeMethod%128 != bp_Cosid) && (BrakeMethod % 128 != bp_D1) && (BrakeMethod % 128 != bp_D2) && (Power<1) && (velocity<40)) ratio = ratio / 2; } From 30fc01c65a7c38b604a4c6bbf5ad680c146d6859 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 11 Aug 2017 23:45:38 +0200 Subject: [PATCH 160/426] upgraded reflection map to dynamic environment cube map --- openglmatrixstack.h | 17 ++- renderer.cpp | 327 +++++++++++++++++++++++++++++++++++++++----- renderer.h | 30 +++- 3 files changed, 326 insertions(+), 48 deletions(-) diff --git a/openglmatrixstack.h b/openglmatrixstack.h index 27a875ab..4d988b8a 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -27,7 +27,7 @@ class opengl_stack { public: // constructors: - opengl_stack() { m_stack.emplace(1.0f); } + opengl_stack() { m_stack.emplace(1.f); } // methods: glm::mat4 const & @@ -86,29 +86,32 @@ private: mat4_stack m_stack; }; -enum stack_mode { gl_projection = 0, gl_modelview = 1 }; +enum stack_mode { gl_modelview = 0, gl_projection = 1, gl_texture = 2 }; typedef std::vector openglstack_array; public: // constructors: opengl_matrices() { - m_stacks.emplace_back(); // projection m_stacks.emplace_back(); // modelview + m_stacks.emplace_back(); // projection + m_stacks.emplace_back(); // texture } // methods: void mode( GLuint const Mode ) { switch( Mode ) { - case GL_PROJECTION: { m_mode = stack_mode::gl_projection; break; } case GL_MODELVIEW: { m_mode = stack_mode::gl_modelview; break; } + case GL_PROJECTION: { m_mode = stack_mode::gl_projection; break; } + case GL_TEXTURE: { m_mode = stack_mode::gl_texture; break; } default: { break; } } - glMatrixMode( Mode ); } + ::glMatrixMode( Mode ); } glm::mat4 const & data( GLuint const Mode = -1 ) const { switch( Mode ) { - case GL_PROJECTION: { return m_stacks[ stack_mode::gl_projection ].data(); } case GL_MODELVIEW: { return m_stacks[ stack_mode::gl_modelview ].data(); } + case GL_PROJECTION: { return m_stacks[ stack_mode::gl_projection ].data(); } + case GL_TEXTURE: { return m_stacks[ stack_mode::gl_texture ].data(); } default: { return m_stacks[ m_mode ].data(); } } } float const * data_array( GLuint const Mode = -1 ) const { @@ -128,7 +131,7 @@ public: void rotate( Type_ const Angle, Type_ const X, Type_ const Y, Type_ const Z ) { m_stacks[ m_mode ].rotate( - static_cast(Angle) * 0.0174532925f, // deg2rad + static_cast(glm::radians(Angle)), glm::vec3( static_cast(X), static_cast(Y), diff --git a/renderer.cpp b/renderer.cpp index 1085ee52..8e0f3810 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -26,6 +26,7 @@ opengl_renderer GfxRenderer; extern TWorld World; int const EU07_PICKBUFFERSIZE { 1024 }; // size of (square) textures bound with the pick framebuffer +int const EU07_ENVIRONMENTBUFFERSIZE { 256 }; // size of (square) environmental cube map texture namespace colors { @@ -173,11 +174,11 @@ opengl_renderer::Init( GLFWwindow *Window ) { // texture ::glGenTextures( 1, &m_picktexture ); ::glBindTexture( GL_TEXTURE_2D, m_picktexture ); + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, EU07_PICKBUFFERSIZE, EU07_PICKBUFFERSIZE, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST ); - ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, EU07_PICKBUFFERSIZE, EU07_PICKBUFFERSIZE, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); // depth buffer ::glGenRenderbuffersEXT( 1, &m_pickdepthbuffer ); ::glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, m_pickdepthbuffer ); @@ -251,7 +252,42 @@ opengl_renderer::Init( GLFWwindow *Window ) { } ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now } - + // environment cube map resources + if( true == m_framebuffersupport ) { + // texture: + ::glGenTextures( 1, &m_environmentcubetexture ); + ::glBindTexture( GL_TEXTURE_CUBE_MAP, m_environmentcubetexture ); + // allocate space + for( GLuint faceindex = GL_TEXTURE_CUBE_MAP_POSITIVE_X; faceindex < GL_TEXTURE_CUBE_MAP_POSITIVE_X + 6; ++faceindex ) { + ::glTexImage2D( faceindex, 0, GL_RGBA8, EU07_ENVIRONMENTBUFFERSIZE, EU07_ENVIRONMENTBUFFERSIZE, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); + } + // setup parameters + ::glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + ::glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + ::glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE ); + // depth buffer + ::glGenRenderbuffersEXT( 1, &m_environmentdepthbuffer ); + ::glBindRenderbufferEXT( GL_RENDERBUFFER_EXT, m_environmentdepthbuffer ); + ::glRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT24, EU07_ENVIRONMENTBUFFERSIZE, EU07_ENVIRONMENTBUFFERSIZE ); + // create and assemble the framebuffer + ::glGenFramebuffersEXT( 1, &m_environmentframebuffer ); + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_environmentframebuffer ); + ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_CUBE_MAP_POSITIVE_X, m_environmentcubetexture, 0 ); + ::glFramebufferRenderbufferEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, m_environmentdepthbuffer ); + // check if we got it working + GLenum status = ::glCheckFramebufferStatusEXT( GL_FRAMEBUFFER_EXT ); + if( status == GL_FRAMEBUFFER_COMPLETE_EXT ) { + WriteLog( "Reflections framebuffer setup complete" ); + m_environmentcubetexturesupport = true; + } + else { + ErrorLog( "Reflections framebuffer setup failed" ); + m_environmentcubetexturesupport = false; + } + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now + } // prepare basic geometry chunks auto const geometrybank = m_geometry.create_bank(); float const size = 2.5f; @@ -337,6 +373,14 @@ opengl_renderer::Render_pass( rendermode const Mode ) { glm::vec3{ m_renderpass.camera.position() - shadowcamera.position() } ); } + if( ( true == m_environmentcubetexturesupport ) + && ( true == World.InitPerformed() ) ) { + // potentially update environmental cube map + if( true == Render_reflections() ) { + setup_pass( m_renderpass, Mode ); // restore draw mode. TBD, TODO: render mode stack + } + } + ::glViewport( 0, 0, Global::iWindowWidth, Global::iWindowHeight ); if( World.InitPerformed() ) { @@ -383,6 +427,15 @@ opengl_renderer::Render_pass( rendermode const Mode ) { switch_units( true, false, false ); // cab render is done in translucent phase to deal with badly configured vehicles if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } + + if( m_environmentcubetexturesupport ) { + // restore default texture matrix for reflections cube map + Active_Texture( m_helpertextureunit ); + ::glMatrixMode( GL_TEXTURE ); + ::glPopMatrix(); + Active_Texture( m_diffusetextureunit ); + ::glMatrixMode( GL_MODELVIEW ); + } } UILayer.render(); break; @@ -394,7 +447,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // setup auto const shadowdrawstart = std::chrono::steady_clock::now(); - ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); + ::glBindFramebufferEXT( GL_FRAMEBUFFER, m_shadowframebuffer ); ::glViewport( 0, 0, m_shadowbuffersize, m_shadowbuffersize ); @@ -431,6 +484,39 @@ opengl_renderer::Render_pass( rendermode const Mode ) { break; } + case rendermode::reflections: { + // NOTE: buffer and viewport setup in this mode is handled by the wrapper method + ::glClearColor( 0.f, 0.f, 0.f, 1.f ); + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + + if( World.InitPerformed() ) { + + ::glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE ); + // setup + setup_matrices(); + // render + setup_drawing( true ); + setup_units( true, false, false ); + Render( &World.Environment ); + // opaque parts... + setup_drawing( false ); + setup_units( true, true, true ); + Render( &World.Ground ); +/* + // reflections are limited to sky and ground only, the update rate is too low for anything else + // ...translucent parts + setup_drawing( true ); + Render_Alpha( &World.Ground ); + // cab render is performed without shadows, due to low resolution and number of models without windows :| + switch_units( true, false, false ); + // cab render is done in translucent phase to deal with badly configured vehicles + if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } +*/ + ::glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE ); + } + break; + } + case rendermode::pickcontrols: { if( World.InitPerformed() ) { // setup @@ -480,6 +566,32 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } } +// creates dynamic environment cubemap +bool +opengl_renderer::Render_reflections() { + + auto const &time = simulation::Time.data(); + auto const timestamp = time.wDay * 60 * 24 + time.wHour * 60 + time.wMinute; + if( timestamp - m_environmenttimestamp < 5 ) { + // run update every 5+ mins of simulation time + return false; + } + m_environmenttimestamp = timestamp; + + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_environmentframebuffer ); + ::glViewport( 0, 0, EU07_ENVIRONMENTBUFFERSIZE, EU07_ENVIRONMENTBUFFERSIZE ); + for( m_environmentcubetextureface = GL_TEXTURE_CUBE_MAP_POSITIVE_X; + m_environmentcubetextureface < GL_TEXTURE_CUBE_MAP_POSITIVE_X + 6; + ++m_environmentcubetextureface ) { + + ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0, m_environmentcubetextureface, m_environmentcubetexture, 0 ); + Render_pass( rendermode::reflections ); + } + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); + + return true; +} + void opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, float const Znear, float const Zfar, bool const Ignoredebug ) { @@ -490,6 +602,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f switch( Mode ) { case rendermode::color: { Config.draw_range = Global::BaseDrawRange; break; } case rendermode::shadows: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } + case rendermode::reflections: { Config.draw_range = Global::BaseDrawRange; break; } case rendermode::pickcontrols: { Config.draw_range = 50.f; break; } case rendermode::pickscenery: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } default: { Config.draw_range = 0.f; break; } @@ -573,6 +686,29 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f frustumchunkmin.z - 500.f, frustumchunkmax.z + 500.f ); break; } + case rendermode::reflections: { + // projection + camera.projection() *= + glm::perspective( + glm::radians( 90.f ), + 1.f, + 0.1f * Global::ZoomFactor, + Config.draw_range * Global::fDistanceFactor ); + // modelview + camera.position() = ( + ( ( true == DebugCameraFlag ) && ( false == Ignoredebug ) ) ? + Global::DebugCameraPosition : + Global::pCameraPosition ); + glm::dvec3 const cubefacetargetvectors[ 6 ] = { { 1.0, 0.0, 0.0 }, { -1.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }, { 0.0, -1.0, 0.0 }, { 0.0, 0.0, 1.0 }, { 0.0, 0.0, -1.0 } }; + glm::dvec3 const cubefaceupvectors[ 6 ] = { { 0.0, -1.0, 0.0 }, { 0.0, -1.0, 0.0 }, { 0.0, 0.0, 1.0 }, { 0.0, 0.0, -1.0 }, { 0.0, -1.0, 0.0 }, { 0.0, -1.0, 0.0 } }; + auto const cubefaceindex = m_environmentcubetextureface - GL_TEXTURE_CUBE_MAP_POSITIVE_X; + viewmatrix *= + glm::lookAt( + camera.position(), + camera.position() + cubefacetargetvectors[ cubefaceindex ], + cubefaceupvectors[ cubefaceindex ] ); + break; + } case rendermode::pickcontrols: case rendermode::pickscenery: { @@ -602,6 +738,17 @@ opengl_renderer::setup_matrices() { ::glMatrixMode( GL_PROJECTION ); OpenGLMatrices.load_matrix( m_renderpass.camera.projection() ); + + if( ( m_renderpass.draw_mode == rendermode::color ) + && ( m_environmentcubetexturesupport ) ) { + // special case, for colour render pass setup texture matrix for reflections cube map + Active_Texture( m_helpertextureunit ); + ::glMatrixMode( GL_TEXTURE ); + ::glPushMatrix(); + ::glMultMatrixf( glm::value_ptr( glm::inverse( glm::mat4{ glm::mat3{ m_renderpass.camera.modelview() } } ) ) ); + Active_Texture( m_diffusetextureunit ); + } + // trim modelview matrix just to rotation, since rendering is done in camera-centric world space ::glMatrixMode( GL_MODELVIEW ); OpenGLMatrices.load_matrix( glm::mat4( glm::mat3( m_renderpass.camera.modelview() ) ) ); @@ -621,7 +768,8 @@ opengl_renderer::setup_drawing( bool const Alpha ) { } switch( m_renderpass.draw_mode ) { - case rendermode::color: { + case rendermode::color: + case rendermode::reflections: { ::glEnable( GL_LIGHTING ); ::glShadeModel( GL_SMOOTH ); if( Global::iMultisampling ) { @@ -668,11 +816,26 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const if( ( true == Reflections ) || ( ( true == Global::RenderShadows ) && ( true == Shadows ) ) ) { - m_textures.bind( textureunit::helper, m_reflectiontexture ); - ::glEnable( GL_TEXTURE_2D ); + // we need to have texture on the helper for either the reflection and shadow generation (or both) + if( true == m_environmentcubetexturesupport ) { + // bind dynamic environment cube if it's enabled... + // NOTE: environment cube map isn't part of regular texture system, so we use direct bind call here + ::glBindTexture( GL_TEXTURE_CUBE_MAP, m_environmentcubetexture ); + ::glEnable( GL_TEXTURE_CUBE_MAP ); + } + else { + // ...otherwise fallback on static spherical image + m_textures.bind( textureunit::helper, m_reflectiontexture ); + ::glEnable( GL_TEXTURE_2D ); + } } else { - ::glDisable( GL_TEXTURE_2D ); + if( true == m_environmentcubetexturesupport ) { + ::glDisable( GL_TEXTURE_CUBE_MAP ); + } + else { + ::glDisable( GL_TEXTURE_2D ); + } } if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { @@ -700,14 +863,32 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const } if( true == Reflections ) { - ::glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); - ::glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); - ::glEnable( GL_TEXTURE_GEN_S ); - ::glEnable( GL_TEXTURE_GEN_T ); + if( true == m_environmentcubetexturesupport ) { + ::glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP ); + ::glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP ); + ::glTexGeni( GL_R, GL_TEXTURE_GEN_MODE, GL_REFLECTION_MAP ); + ::glEnable( GL_TEXTURE_GEN_S ); + ::glEnable( GL_TEXTURE_GEN_T ); + ::glEnable( GL_TEXTURE_GEN_R ); + } + else { + // fixed texture fall back + ::glTexGeni( GL_S, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); + ::glTexGeni( GL_T, GL_TEXTURE_GEN_MODE, GL_SPHERE_MAP ); + ::glEnable( GL_TEXTURE_GEN_S ); + ::glEnable( GL_TEXTURE_GEN_T ); + } } else { - ::glDisable( GL_TEXTURE_GEN_S ); - ::glDisable( GL_TEXTURE_GEN_T ); + if( true == m_environmentcubetexturesupport ) { + ::glDisable( GL_TEXTURE_GEN_S ); + ::glDisable( GL_TEXTURE_GEN_T ); + ::glDisable( GL_TEXTURE_GEN_R ); + } + else { + ::glDisable( GL_TEXTURE_GEN_S ); + ::glDisable( GL_TEXTURE_GEN_T ); + } } } // shadow texture unit. @@ -810,6 +991,10 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const ::glTexEnvi( GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA ); */ } + // update unit state + m_unitstate.diffuse = Diffuse; + m_unitstate.shadows = Shadows; + m_unitstate.reflections = Reflections; } // enables and disables specified texture units @@ -817,16 +1002,25 @@ void opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { // helper texture unit. if( m_helpertextureunit >= 0 ) { + Active_Texture( m_helpertextureunit ); if( ( true == Reflections ) || ( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( m_shadowcolor != colors::white ) ) ) { - Active_Texture( m_helpertextureunit ); - ::glEnable( GL_TEXTURE_2D ); + if( true == m_environmentcubetexturesupport ) { + ::glEnable( GL_TEXTURE_CUBE_MAP ); + } + else { + ::glEnable( GL_TEXTURE_2D ); + } } else { - Active_Texture( m_helpertextureunit ); - ::glDisable( GL_TEXTURE_2D ); + if( true == m_environmentcubetexturesupport ) { + ::glDisable( GL_TEXTURE_CUBE_MAP ); + } + else { + ::glDisable( GL_TEXTURE_2D ); + } } } // shadow texture unit. @@ -864,6 +1058,10 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons Active_Texture( m_diffusetextureunit ); ::glDisable( GL_TEXTURE_2D ); } + // update unit state + m_unitstate.diffuse = Diffuse; + m_unitstate.shadows = Shadows; + m_unitstate.reflections = Reflections; } void @@ -1186,6 +1384,19 @@ opengl_renderer::Render( TGround *Ground ) { } break; } + case rendermode::reflections: { + // reflections render only terrain geometry + for( int column = originx; column <= originx + segmentcount; ++column ) { + for( int row = originz; row <= originz + segmentcount; ++row ) { + + auto *cell = &Ground->Rects[ column ][ row ]; + if( m_renderpass.camera.visible( cell->m_area ) ) { + Render( cell ); + } + } + } + break; + } case rendermode::shadows: case rendermode::pickscenery: { // these render modes don't bother with anything non-visual, or lights @@ -1228,7 +1439,8 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { // non-interactive scenery elements get neutral colour ::glColor3fv( glm::value_ptr( colors::none ) ); } - case rendermode::color: { + case rendermode::color: + case rendermode::reflections: { if( Groundcell->nRenderRect != nullptr ) { // nieprzezroczyste trójkąty kwadratu kilometrowego for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { @@ -1263,15 +1475,27 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { result = true; // add the subcells of the cell to the draw queue - if( Groundcell->pSubRects != nullptr ) { - for( std::size_t subcellindex = 0; subcellindex < iNumSubRects * iNumSubRects; ++subcellindex ) { - auto subcell = Groundcell->pSubRects + subcellindex; - if( subcell->iNodeCount ) { - // o ile są jakieś obiekty, bo po co puste sektory przelatywać - m_drawqueue.emplace_back( - glm::length2( m_renderpass.camera.position() - glm::dvec3( subcell->m_area.center ) ), - subcell ); + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::shadows: + case rendermode::pickscenery: { + if( Groundcell->pSubRects != nullptr ) { + for( std::size_t subcellindex = 0; subcellindex < iNumSubRects * iNumSubRects; ++subcellindex ) { + auto subcell = Groundcell->pSubRects + subcellindex; + if( subcell->iNodeCount ) { + // o ile są jakieś obiekty, bo po co puste sektory przelatywać + m_drawqueue.emplace_back( + glm::length2( m_renderpass.camera.position() - glm::dvec3( subcell->m_area.center ) ), + subcell ); + } + } } + break; + } + case rendermode::reflections: + case rendermode::pickcontrols: + default: { + break; } } } @@ -1831,7 +2055,8 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Submodel->iAlpha & Submodel->iFlags & 0x1F ) { // rysuj gdy element nieprzezroczysty switch( m_renderpass.draw_mode ) { - case rendermode::color: { + case rendermode::color: + case rendermode::reflections: { // NOTE: code disabled as normalization marking doesn't take into account scaling propagation down hierarchy chains // for the time being we'll do with enforced worst-case scaling method, when speculars are enabled #ifdef EU07_USE_OPTIMIZED_NORMALIZATION @@ -1865,11 +2090,15 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glEnable( GL_RESCALE_NORMAL ); } // ...luminance + auto const unitstate = m_unitstate; if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); // disable shadows so they don't obstruct self-lit items +/* setup_shadow_color( colors::white ); +*/ + switch_units( m_unitstate.diffuse, false, false ); } // main draw call @@ -1882,7 +2111,10 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Global::fLuminance < Submodel->fLight ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); +/* setup_shadow_color( m_shadowcolor ); +*/ + switch_units( m_unitstate.diffuse, unitstate.shadows, unitstate.reflections ); } #ifdef EU07_USE_OPTIMIZED_NORMALIZATION switch( Submodel->m_normalizenormals ) { @@ -1945,7 +2177,8 @@ opengl_renderer::Render( TSubModel *Submodel ) { switch( m_renderpass.draw_mode ) { // spotlights are only rendered in colour mode(s) - case rendermode::color: { + case rendermode::color: + case rendermode::reflections: { auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); auto const lightcenter = modelview @@ -1977,15 +2210,22 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glPushMatrix(); ::glLoadIdentity(); ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian - +/* setup_shadow_color( colors::white ); +*/ + auto const unitstate = m_unitstate; + switch_units( m_unitstate.diffuse, false, false ); // main draw call m_geometry.draw( Submodel->m_geometry ); // post-draw reset // re-enable shadows +/* setup_shadow_color( m_shadowcolor ); +*/ + switch_units( m_unitstate.diffuse, unitstate.shadows, unitstate.reflections ); + ::glPopMatrix(); ::glPopAttrib(); } @@ -2001,7 +2241,8 @@ opengl_renderer::Render( TSubModel *Submodel ) { switch( m_renderpass.draw_mode ) { // colour points are only rendered in colour mode(s) - case rendermode::color: { + case rendermode::color: + case rendermode::reflections: { if( Global::fLuminance < Submodel->fLight ) { // material configuration: @@ -2048,7 +2289,8 @@ opengl_renderer::Render( TTrack *Track ) { } switch( m_renderpass.draw_mode ) { - case rendermode::color: { + case rendermode::color: + case rendermode::reflections: { Track->EnvironmentSet(); if( Track->m_material1 != 0 ) { Bind_Material( Track->m_material1 ); @@ -2061,8 +2303,8 @@ opengl_renderer::Render( TTrack *Track ) { Track->EnvironmentReset(); break; } - case rendermode::pickscenery: - case rendermode::shadows: { + case rendermode::shadows: + case rendermode::pickscenery: { if( Track->m_material1 != 0 ) { Bind_Material( Track->m_material1 ); m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); @@ -2098,11 +2340,12 @@ opengl_renderer::Render( TMemCell *Memcell ) { ::glPopAttrib(); break; } - case rendermode::pickscenery: - case rendermode::shadows: { + case rendermode::shadows: + case rendermode::pickscenery: { ::gluSphere( m_quadric, 0.35, 4, 2 ); break; } + case rendermode::reflections: case rendermode::pickcontrols: { break; } @@ -2502,11 +2745,15 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_speculartranslucentscalefactor ) ); } // ...luminance + auto const unitstate = m_unitstate; if( Global::fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); // disable shadows so they don't obstruct self-lit items +/* setup_shadow_color( colors::white ); +*/ + switch_units( m_unitstate.diffuse, false, false ); } // main draw call @@ -2519,7 +2766,10 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { if( Global::fLuminance < Submodel->fLight ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); +/* setup_shadow_color( m_shadowcolor ); +*/ + switch_units( m_unitstate.diffuse, unitstate.shadows, unitstate.reflections ); } #ifdef EU07_USE_OPTIMIZED_NORMALIZATION switch( Submodel->m_normalizenormals ) { @@ -2571,7 +2821,11 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian ::glRotated( std::atan2( lightcenter.x, lightcenter.z ) * 180.0 / M_PI, 0.0, 1.0, 0.0 ); // jedynie obracamy w pionie o kąt // disable shadows so they don't obstruct self-lit items +/* setup_shadow_color( colors::white ); +*/ + auto const unitstate = m_unitstate; + switch_units( m_unitstate.diffuse, false, false ); // main draw call m_geometry.draw( m_billboardgeometry ); @@ -2584,7 +2838,10 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // ...etc instead IF we had easy access to camera's forward and right vectors. TODO: check if Camera matrix is accessible */ // post-render cleanup +/* setup_shadow_color( m_shadowcolor ); +*/ + switch_units( m_unitstate.diffuse, unitstate.shadows, unitstate.reflections ); ::glPopMatrix(); ::glPopAttrib(); diff --git a/renderer.h b/renderer.h index 2ecad49c..28eac084 100644 --- a/renderer.h +++ b/renderer.h @@ -213,6 +213,7 @@ private: none, color, shadows, + reflections, pickcontrols, pickscenery }; @@ -233,14 +234,18 @@ private: float draw_range { 0.0f }; }; + struct units_state { + + bool diffuse { false }; + bool shadows { false }; + bool reflections { false }; + }; + typedef std::vector opengllight_array; // methods bool Init_caps(); - // runs jobs needed to generate graphics for specified render pass - void - Render_pass( rendermode const Mode ); void setup_pass( renderpass_config &Config, rendermode const Mode, float const Znear = 0.f, float const Zfar = 1.f, bool const Ignoredebug = false ); void @@ -253,6 +258,12 @@ private: setup_shadow_color( glm::vec4 const &Shadowcolor ); void switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ); + // runs jobs needed to generate graphics for specified render pass + void + Render_pass( rendermode const Mode ); + // creates dynamic environment cubemap + bool + Render_reflections(); bool Render( world_environment *Environment ); bool @@ -311,25 +322,32 @@ private: texture_handle m_moontexture { -1 }; texture_handle m_reflectiontexture { -1 }; GLUquadricObj *m_quadric { nullptr }; // helper object for drawing debug mode scene elements - + // TODO: refactor framebuffer stuff into an object bool m_framebuffersupport { false }; #ifdef EU07_USE_PICKING_FRAMEBUFFER - GLuint m_pickframebuffer { NULL }; // TODO: refactor pick framebuffer stuff into an object + GLuint m_pickframebuffer { NULL }; GLuint m_picktexture { NULL }; GLuint m_pickdepthbuffer { NULL }; #endif - int m_shadowbuffersize { 4096 }; + int m_shadowbuffersize { 2048 }; GLuint m_shadowframebuffer { NULL }; GLuint m_shadowtexture { NULL }; #ifdef EU07_USE_DEBUG_SHADOWMAP GLuint m_shadowdebugtexture{ NULL }; #endif glm::mat4 m_shadowtexturematrix; // conversion from camera-centric world space to light-centric clip space + GLuint m_environmentframebuffer { NULL }; + GLuint m_environmentcubetexture { NULL }; + GLuint m_environmentdepthbuffer { NULL }; + bool m_environmentcubetexturesupport { false }; // indicates whether we can use the dynamic environment cube map + int m_environmentcubetextureface { NULL }; // helper, currently processed cube map face + int m_environmenttimestamp { 0 }; // time of the most recent environment map update int m_helpertextureunit { GL_TEXTURE0 }; int m_shadowtextureunit { GL_TEXTURE1 }; int m_normaltextureunit { GL_TEXTURE2 }; int m_diffusetextureunit{ GL_TEXTURE3 }; + units_state m_unitstate; float m_drawtime { 1000.f / 30.f * 20.f }; // start with presumed 'neutral' average of 30 fps std::chrono::steady_clock::time_point m_drawstart; // cached start time of previous frame From 7068a4ceff4d846b4b685b4e04cb1e1c7d67847d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 14 Aug 2017 15:51:08 +0200 Subject: [PATCH 161/426] ai improvements and fixes for acceleration and brake handling, fix for automatic sandbox activation --- Driver.cpp | 259 ++++++++++++++++++++++++------------------- Driver.h | 6 +- McZapkie/Mover.cpp | 30 ++--- McZapkie/mctools.cpp | 42 +++---- McZapkie/mctools.h | 6 +- World.cpp | 16 +-- maszyna.vcxproj.user | 2 +- renderer.cpp | 10 +- renderer.h | 3 +- version.h | 2 +- 10 files changed, 195 insertions(+), 181 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index b9683083..ed06a615 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1223,42 +1223,49 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } } else if (sSpeedTable[i].evEvent->StopCommand()) - { // jeśli prędkość jest zerowa, a komórka zawiera komendę - eSignNext = sSpeedTable[i].evEvent; // dla informacji - if (iDrivigFlags & - moveStopHere) // jeśli ma stać, dostaje komendę od razu - go = cm_Command; // komenda z komórki, do wykonania po zatrzymaniu - else if (sSpeedTable[i].fDist <= 20.0) // jeśli ma dociągnąć, to niech - // dociąga (moveStopCloser - // dotyczy dociągania do W4, nie - // semafora) - go = cm_Command; // komenda z komórki, do wykonania po zatrzymaniu + { // jeśli prędkość jest zerowa, a komórka zawiera komendę + eSignNext = sSpeedTable[ i ].evEvent; // dla informacji + if( true == TestFlag( iDrivigFlags, moveStopHere ) ) { + // jeśli ma stać, dostaje komendę od razu + go = cm_Command; // komenda z komórki, do wykonania po zatrzymaniu + } + else if( sSpeedTable[ i ].fDist <= 20.0 ) { + // jeśli ma dociągnąć, to niech dociąga + // (moveStopCloser dotyczy dociągania do W4, nie semafora) + go = cm_Command; // komenda z komórki, do wykonania po zatrzymaniu + } } } // jeśli nie ma zawalidrogi } // jeśli event if (v >= 0.0) { // pozycje z prędkością -1 można spokojnie pomijać d = sSpeedTable[i].fDist; - if ((sSpeedTable[i].iFlags & spElapsed) ? - false : - d > 0.0) // sygnał lub ograniczenie z przodu (+32=przejechane) - { // 2014-02: jeśli stoi, a ma do przejechania kawałek, to niech jedzie - if ((mvOccupied->Vel == 0.0) ? - ((sSpeedTable[i].iFlags & - (spEnabled | spEvent | spPassengerStopPoint)) == - (spEnabled | spEvent | spPassengerStopPoint)) && - (d > fMaxProximityDist) : - false) - a = (iDrivigFlags & moveStopCloser) ? fAcc : 0.0; // ma podjechać bliżej - - // czy na pewno w tym - // miejscu taki warunek? - else - { - a = (v * v - mvOccupied->Vel * mvOccupied->Vel) / - (25.92 * d); // przyspieszenie: ujemne, gdy trzeba hamować - if (d < fMinProximityDist) // jak jest już blisko - if (v < fVelDes) - fVelDes = v; // ograniczenie aktualnej prędkości + if( ( d > 0.0 ) + && ( false == TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) ) ) { + // sygnał lub ograniczenie z przodu (+32=przejechane) + // 2014-02: jeśli stoi, a ma do przejechania kawałek, to niech jedzie + if( ( mvOccupied->Vel == 0.0 ) + && ( d > fMaxProximityDist ) + && ( true == TestFlag( sSpeedTable[ i ].iFlags, ( spEnabled | spEvent | spPassengerStopPoint ) ) ) ) { + // ma podjechać bliżej - czy na pewno w tym miejscu taki warunek? + a = ( + iDrivigFlags & moveStopCloser ? + fAcc : + 0.0 ); + } + else { + // przyspieszenie: ujemne, gdy trzeba hamować + a = ( v * v - mvOccupied->Vel * mvOccupied->Vel ) / ( 25.92 * d ); + if( fBrakeDist > 0.0 ) { + // maintain desired acc while we have enough room to brake safely, when close enough start paying attention + // try to make a smooth transition instead of sharp change + a = interpolate( a, fAcc, clamp( ( d - fBrakeDist ) / fBrakeDist, 0.0, 1.0 ) ); + } + if( ( d < fMinProximityDist ) + && ( v < fVelDes ) ) { + // jak jest już blisko, ograniczenie aktualnej prędkości + fVelDes = v; + } } } else if (sSpeedTable[i].iFlags & spTrack) // jeśli tor @@ -4350,12 +4357,12 @@ bool TController::UpdateSituation(double dt) //(AbsAccS) - chwilowe przyspieszenie pojazu (uwzględnia grawitację), ujemne działa // przeciwnie do zadanego kierunku jazdy //(AccDesired) porównujemy z (fAccGravity) albo (AbsAccS) - // if ((VelNext>=0.0)&&(ActualProximityDist>=0)&&(mvOccupied->Vel>=VelNext)) //gdy - // zbliza sie i jest za szybko do NOWEGO - if ((VelNext >= 0.0) && (ActualProximityDist <= scanmax) && (vel >= VelNext)) - { // gdy zbliża się i jest za szybki do nowej prędkości, albo stoi na zatrzymaniu - if (vel > 0.0) - { // jeśli jedzie + if( ( VelNext >= 0.0 ) + && ( ActualProximityDist <= scanmax ) + && ( vel >= VelNext ) ) { + // gdy zbliża się i jest za szybki do nowej prędkości, albo stoi na zatrzymaniu + if (vel > 0.0) { + // jeśli jedzie if ((vel < VelNext) ? (ActualProximityDist > fMaxProximityDist * (1 + 0.1 * vel)) : false) // dojedz do semafora/przeszkody @@ -4365,21 +4372,17 @@ bool TController::UpdateSituation(double dt) AccDesired = AccPreferred; // VelDesired:=Min0R(VelDesired,VelReduced+VelNext); } - else if (ActualProximityDist > fMinProximityDist) - { // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze - // jest daleko - if (ActualProximityDist < - fMaxProximityDist) // jak minął już maksymalny dystans - { // po prostu hamuj (niski stopień) //ma stanąć, a jest w - // drodze hamowania albo ma jechać - AccDesired = (VelNext * VelNext - vel * vel) / - (25.92 * (ActualProximityDist + - 0.1 - 0.5*fMinProximityDist)); // hamowanie tak, aby stanąć + else if (ActualProximityDist > fMinProximityDist) { + // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze jest daleko + if (ActualProximityDist < fMaxProximityDist) { + // jak minął już maksymalny dystans po prostu hamuj (niski stopień) + // ma stanąć, a jest w drodze hamowania albo ma jechać + // hamowanie tak, aby stanąć + AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); AccDesired = std::min(AccDesired, fAccThreshold); - VelDesired = 0.0; // Min0R(VelDesired,VelNext); + VelDesired = 0.0; } - else if ((vel < - VelNext + 20.0)&&(false)) // dwustopniowe hamowanie - niski przy małej różnicy + else if ((vel < VelNext + 20.0)&&(false)) // dwustopniowe hamowanie - niski przy małej różnicy { // jeśli jedzie wolniej niż VelNext+35km/h //Ra: 40, żeby nie // kombinował na zwrotnicach if (VelNext == 0.0) @@ -4431,16 +4434,24 @@ bool TController::UpdateSituation(double dt) AccDesired = (VelNext * VelNext - vel * vel) / (25.92 * ActualProximityDist + 0.1); // mniejsze opóźnienie przy małej różnicy - if (ActualProximityDist < fMaxProximityDist) - ReactionTime = 0.1; // i orientuj się szybciej, jeśli w - // krytycznym przedziale + if( ActualProximityDist < fMaxProximityDist ) { + // i orientuj się szybciej, jeśli w krytycznym przedziale + ReactionTime = 0.1; + } } } else { // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) double dist = 0;// (VelNext * VelNext - (VelNext + 20) * (VelNext + 20)) / (25.92)*(-1 / fBrake_a0[0] - 1 / fAccThreshold); - AccDesired = (VelNext * VelNext - vel * vel) / - (25.92 * std::max(ActualProximityDist - VelNext - dist, std::min(ActualProximityDist, VelNext+dist)) + - 0.1); // najpierw hamuje mocniej, potem zluzuje + // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever + AccDesired = + ( VelNext * VelNext - vel * vel ) + / ( 25.92 + * std::max( + ActualProximityDist - VelNext - dist, + std::min( + ActualProximityDist, + VelNext + dist ) ) + + 0.1 ); // najpierw hamuje mocniej, potem zluzuje } if (AccPreferred < AccDesired) AccDesired = AccPreferred; //(1+abs(AccDesired)) @@ -4451,33 +4462,35 @@ bool TController::UpdateSituation(double dt) // //aby szybkosc hamowania zalezala od przyspieszenia i opoznienia // hamulcow } - else - { // jest bliżej niż fMinProximityDist - VelDesired = - Min0R(VelDesired, VelNext); // utrzymuj predkosc bo juz blisko - if (vel < - VelNext + fVelPlus) // jeśli niewielkie przekroczenie, ale ma jechać - AccDesired = Min0R(0.0, AccPreferred); // to olej (zacznij luzować) + else { + // jest bliżej niż fMinProximityDist + VelDesired = std::min( VelDesired, VelNext ); // utrzymuj predkosc bo juz blisko + if( vel < VelNext + fVelPlus ) { + // jeśli niewielkie przekroczenie, ale ma jechać + AccDesired = std::min( 0.0, AccPreferred ); // to olej (zacznij luzować) + } ReactionTime = 0.1; // i orientuj się szybciej } } - else // zatrzymany (vel==0.0) - // if (iDrivigFlags&moveStopHere) //to nie dotyczy podczepiania - // if ((VelNext>0.0)||(ActualProximityDist>fMaxProximityDist*1.2)) - if (VelNext > 0.0) - AccDesired = AccPreferred; // można jechać - else // jeśli daleko jechać nie można - if (ActualProximityDist > - fMaxProximityDist) // ale ma kawałek do sygnalizatora - { // if ((iDrivigFlags&moveStopHere)?false:AccPreferred>0) - if (AccPreferred > 0) - AccDesired = AccPreferred; // dociagnij do semafora; - else - VelDesired = 0.0; //,AccDesired=-fabs(fAccGravity); //stoj (hamuj z siłą - // równą składowej stycznej grawitacji) + else { + // zatrzymany (vel==0.0) + if( VelNext > 0.0 ) { + // można jechać + AccDesired = AccPreferred; + } + else { + // jeśli daleko jechać nie można + if( ActualProximityDist > fMaxProximityDist ) { + // ale ma kawałek do sygnalizatora + if( AccPreferred > 0 ) { AccDesired = AccPreferred; } // dociagnij do semafora; + else { VelDesired = 0.0; } //stoj + } + else { + // VelNext=0 i stoi bliżej niż fMaxProximityDist + VelDesired = 0.0; + } + } } - else - VelDesired = 0.0; // VelNext=0 i stoi bliżej niż fMaxProximityDist } else // gdy jedzie wolniej niż potrzeba, albo nie ma przeszkód na drodze AccDesired = (VelDesired != 0.0 ? AccPreferred : -0.01); // normalna jazda @@ -4601,48 +4614,68 @@ bool TController::UpdateSituation(double dt) AccDesired = fAccDesiredAv = 0.2 * AccDesired + 0.8 * fAccDesiredAv; // uśrednione, żeby ograniczyć migotanie - if (VelDesired == 0.0) - if (AccDesired >= -0.01) - AccDesired = -0.01; // Ra 2F1J: jeszcze jedna prowizoryczna łatka - if (AccDesired >= 0.0) - if (iDrivigFlags & movePress) - mvOccupied->BrakeReleaser(1); // wyluzuj lokomotywę - może być więcej! - else if (OrderList[OrderPos] != - Disconnect) // przy odłączaniu nie zwalniamy tu hamulca - if (fAccGravity * fAccGravity < - 0.001) // luzuj tylko na plaskim lub przy ruszaniu - { - while (DecBrake()) - ; // jeśli przyspieszamy, to nie hamujemy - if ((mvOccupied->BrakePress > 0.4) && (mvOccupied->Hamulec->GetCRP() > 4.9)) - mvOccupied->BrakeReleaser( - 1); // wyluzuj lokomotywę, to szybciej ruszymy - else - mvOccupied->BrakeReleaser(0); + if( VelDesired == 0.0 ) { + // Ra 2F1J: jeszcze jedna prowizoryczna łatka + if( AccDesired >= -0.01 ) { + AccDesired = -0.01; + } + } + if( AccDesired >= 0.0 ) { + if( true == TestFlag( iDrivigFlags, movePress ) ) { + // wyluzuj lokomotywę - może być więcej! + mvOccupied->BrakeReleaser( 1 ); + } + else if( OrderList[ OrderPos ] != Disconnect ) { + // przy odłączaniu nie zwalniamy tu hamulca + if( ( fAccGravity * fAccGravity < 0.001 ? + true : + AccDesired > 0.0 ) ) { + // on slopes disengage the brakes only if you actually intend to accelerate + while( true == DecBrake() ) { ; } // jeśli przyspieszamy, to nie hamujemy + if( ( mvOccupied->BrakePress > 0.4 ) + && ( mvOccupied->Hamulec->GetCRP() > 4.9 ) ) { + // wyluzuj lokomotywę, to szybciej ruszymy + mvOccupied->BrakeReleaser( 1 ); + } + else { + if( mvOccupied->PipePress >= 3.0 ) { + // TODO: combine all releaser handling in single decision tree instead of having bits all over the place + mvOccupied->BrakeReleaser( 0 ); + } + } } - // margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest - // większa od 5km/h - if (!(iDrivigFlags & movePress)) - { // jeśli nie dociskanie - if (AccDesired < -0.1) - while (DecSpeed()) - ; // jeśli hamujemy, to nie przyspieszamy - else if (((fAccGravity < -0.01) ? AccDesired < 0.0 : - AbsAccS > AccDesired) || - (vel > VelDesired)) // jak za bardzo przyspiesza albo prędkość - // przekroczona + } + } + // margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest większa od 5km/h + if( false == TestFlag( iDrivigFlags, movePress ) ) { + // jeśli nie dociskanie + if( AccDesired < -0.1 ) { + while( true == DecSpeed() ) { ; } // jeśli hamujemy, to nie przyspieszamy + } + else if( ( vel > VelDesired ) + || ( fAccGravity < -0.01 ? + AccDesired < 0.0 : + AbsAccS > AccDesired ) ) { + // jak za bardzo przyspiesza albo prędkość przekroczona DecSpeed(); // pojedyncze cofnięcie pozycji, bo na zero to przesada + } } // yB: usunięte różne dziwne warunki, oddzielamy część zadającą od wykonawczej // zwiekszanie predkosci // Ra 2F1H: jest konflikt histerezy pomiędzy nastawioną pozycją a uzyskiwanym // przyspieszeniem - utrzymanie pozycji powoduje przekroczenie przyspieszenia - if (AbsAccS < - AccDesired) // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz - if (vel < VelDesired - fVelMinus) // jeśli prędkość w kierunku czoła jest - // mniejsza od dozwolonej o margines - if ((ActualProximityDist > fMaxProximityDist) ? true : (vel < VelNext)) - IncSpeed(); // to można przyspieszyć + if( AbsAccS < AccDesired ) { + // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz + if( vel < VelDesired - fVelMinus ) { + // jeśli prędkość w kierunku czoła jest mniejsza od dozwolonej o margines + if( ( ActualProximityDist > fMaxProximityDist ? + true : + vel < VelNext ) ) { + // to można przyspieszyć + IncSpeed(); + } + } + } // if ((AbsAccS - 0.95 * Adhesive(RunningTrack.friction) * TotalMassxg)) - { + if( ( std::abs( ( PosRatio + 9.66 * dizel_fill ) * dmoment * 100 ) > 0.95 * Adhesive( RunningTrack.friction ) * TotalMassxg ) ) { PosRatio = 0; tmp = 4; - Sandbox( true, range::local ); } // przeciwposlizg - if ((abs((PosRatio + 9.80 * dizel_fill) * dmoment * 100) > - 0.95 * Adhesive(RunningTrack.friction) * TotalMassxg)) - { + if( ( std::abs( ( PosRatio + 9.80 * dizel_fill ) * dmoment * 100 ) > 0.95 * Adhesive( RunningTrack.friction ) * TotalMassxg ) ) { + PosRatio = 0; + tmp = 9; + } // przeciwposlizg + if( ( SlippingWheels ) ) { PosRatio = 0; tmp = 9; Sandbox( true, range::local ); } // przeciwposlizg - if ((SlippingWheels)) - { - // PosRatio = -PosRatio * 0; // serio -0 ??? - PosRatio = 0; - tmp = 9; - Sandbox( true, range::local ); - } // przeciwposlizg + else { + // switch sandbox off + Sandbox( false, range::local ); + } dizel_fill += Max0R(Min0R(PosRatio - dizel_fill, 0.1), -0.1) * 2 * (tmp /*2{+4*byte(PosRatio 0) - { - if ((Flag & Value) == 0) - { + if( Value > 0 ) { + if( false == TestFlag( Flag, Value ) ) { Flag |= Value; return true; // true, gdy było wcześniej 0 i zostało ustawione } } - else if (Value < 0) - { - Value = abs(Value); - if ((Flag & Value) == Value) - { - Flag &= ~Value; // Value jest ujemne, czyli zerowanie flagi - return true; // true, gdy było wcześniej 1 i zostało wyzerowane - } + else if( Value < 0 ) { + // Value jest ujemne, czyli zerowanie flagi + return ClearFlag( Flag, -Value ); } - return false; + return false; } -bool UnSetFlag(int &Flag, int Value) -{ - Flag &= ~Value; - return true; +bool ClearFlag( int &Flag, int const Value ) { + + if( true == TestFlag( Flag, Value ) ) { + Flag &= ~Value; + return true; + } + else { + return false; + } } inline double Random(double a, double b) diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index 3611dcf2..9af628f7 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -63,9 +63,9 @@ inline double BorlandTime() std::string Now(); /*funkcje logiczne*/ -bool TestFlag(int Flag, int Value); -bool SetFlag( int & Flag, int Value); -bool UnSetFlag(int &Flag, int Value); +inline bool TestFlag( int const Flag, int const Value ) { return ( ( Flag & Value ) == Value ); } +bool SetFlag( int &Flag, int const Value); +bool ClearFlag(int &Flag, int const Value); bool FuzzyLogic(double Test, double Threshold, double Probability); /*jesli Test>Threshold to losowanie*/ diff --git a/World.cpp b/World.cpp index 24712046..94ee4e06 100644 --- a/World.cpp +++ b/World.cpp @@ -1536,23 +1536,23 @@ TWorld::Update_UI() { */ if( tmp->Mechanik ) { // o ile jest ktoś w środku - std::string flags = "bwaccmlshhhoibsgvdp; "; // flagi AI (definicja w Driver.h) - for( int i = 0, j = 1; i < 19; ++i, j <<= 1 ) - if( tmp->Mechanik->DrivigFlags() & j ) // jak bit ustawiony - flags[ i + 1 ] = std::toupper( flags[ i + 1 ] ); // ^= 0x20; // to zmiana na wielką literę + std::string flags = "cpapcplhhndoiefgvdpseil "; // flagi AI (definicja w Driver.h) + for( int i = 0, j = 1; i < 23; ++i, j <<= 1 ) + if( false == ( tmp->Mechanik->DrivigFlags() & j ) ) // jak bit ustawiony + flags[ i ] = '.';// std::toupper( flags[ i ] ); // ^= 0x20; // to zmiana na wielką literę uitextline4 = flags; uitextline4 += "Driver: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) - + " ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) - + " ah=" + to_string(tmp->Mechanik->fAccThreshold, 2) + + " Ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) + + " Ah=" + to_string(tmp->Mechanik->fAccThreshold, 2) + "@" + to_string(tmp->Mechanik->fBrake_a0[0], 2) + "+" + to_string(tmp->Mechanik->fBrake_a1[0], 2) + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ) - + " VSm=" + to_string( tmp->Mechanik->VelSignalLast, 0 ) - + " VLm=" + to_string( tmp->Mechanik->VelLimitLast, 0 ) + + " VSl=" + to_string( tmp->Mechanik->VelSignalLast, 0 ) + + " VLl=" + to_string( tmp->Mechanik->VelLimitLast, 0 ) + " VRd=" + to_string( tmp->Mechanik->VelRoad, 0 ); if( ( tmp->Mechanik->VelNext == 0.0 ) diff --git a/maszyna.vcxproj.user b/maszyna.vcxproj.user index 7c32daec..8c698752 100644 --- a/maszyna.vcxproj.user +++ b/maszyna.vcxproj.user @@ -1,7 +1,7 @@  - D:\MaSzyna + ..\..\..\development\maszyna WindowsLocalDebugger diff --git a/renderer.cpp b/renderer.cpp index 8e0f3810..212d0eb8 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -572,11 +572,13 @@ opengl_renderer::Render_reflections() { auto const &time = simulation::Time.data(); auto const timestamp = time.wDay * 60 * 24 + time.wHour * 60 + time.wMinute; - if( timestamp - m_environmenttimestamp < 5 ) { - // run update every 5+ mins of simulation time + if( ( timestamp - m_environmentupdatetime < 5 ) + && ( glm::length( m_renderpass.camera.position() - m_environmentupdatelocation ) < 1000.0 ) ) { + // run update every 5+ mins of simulation time, or at least 1km from the last location return false; } - m_environmenttimestamp = timestamp; + m_environmentupdatetime = timestamp; + m_environmentupdatelocation = m_renderpass.camera.position(); ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_environmentframebuffer ); ::glViewport( 0, 0, EU07_ENVIRONMENTBUFFERSIZE, EU07_ENVIRONMENTBUFFERSIZE ); @@ -655,7 +657,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f auto const lightvector = glm::normalize( glm::vec3{ Global::DayLight.direction.x, - std::min( Global::DayLight.direction.y, -0.15f ), + std::min( Global::DayLight.direction.y, -0.2f ), Global::DayLight.direction.z } ); // ...place the light source at the calculated centre and setup world space light view matrix... camera.position() = worldview.camera.position() + glm::dvec3{ frustumchunkcentre }; diff --git a/renderer.h b/renderer.h index 28eac084..e581347e 100644 --- a/renderer.h +++ b/renderer.h @@ -341,7 +341,8 @@ private: GLuint m_environmentdepthbuffer { NULL }; bool m_environmentcubetexturesupport { false }; // indicates whether we can use the dynamic environment cube map int m_environmentcubetextureface { NULL }; // helper, currently processed cube map face - int m_environmenttimestamp { 0 }; // time of the most recent environment map update + int m_environmentupdatetime { 0 }; // time of the most recent environment map update + glm::dvec3 m_environmentupdatelocation; // coordinates of most recent environment map update int m_helpertextureunit { GL_TEXTURE0 }; int m_shadowtextureunit { GL_TEXTURE1 }; diff --git a/version.h b/version.h index 48e719be..c2fc5b53 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 810 +#define VERSION_MINOR 814 #define VERSION_REVISION 1 From 7e51d5d2e084952908dba890970e4f0a5c58c396 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 15 Aug 2017 00:55:38 +0200 Subject: [PATCH 162/426] changed NULL use to c++11 compliant --- AnimModel.cpp | 2 +- Console/PoKeys55.cpp | 2 +- Driver.cpp | 2 +- Driver.h | 2 +- DynObj.cpp | 2 +- DynObj.h | 2 +- EU07.cpp | 2 +- Ground.cpp | 10 +++++----- McZapkie/mctools.cpp | 5 ++--- Model3d.cpp | 18 +++++++++--------- Model3d.h | 10 +++++----- Segment.cpp | 2 +- Sound.cpp | 2 +- Texture.cpp | 13 ++++++------- Texture.h | 7 ++++--- Track.cpp | 4 ++-- Traction.cpp | 2 +- color.h | 4 ++-- material.cpp | 8 ++++---- material.h | 4 ++-- openglgeometrybank.cpp | 12 ++++++------ openglgeometrybank.h | 2 +- renderer.cpp | 28 ++++++++++++++-------------- renderer.h | 22 +++++++++++----------- stdafx.h | 1 + uilayer.cpp | 10 +++++----- uilayer.h | 6 +++--- 27 files changed, 92 insertions(+), 92 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 09a53eb9..64eab101 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -447,7 +447,7 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable else if( asReplacableTexture != "none" ) { m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( asReplacableTexture ); } - if( ( m_materialdata.replacable_skins[ 1 ] != NULL ) + if( ( m_materialdata.replacable_skins[ 1 ] != null_handle ) && ( GfxRenderer.Material( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) ) { // tekstura z kanałem alfa - nie renderować w cyklu nieprzezroczystych m_materialdata.textures_alpha = 0x31310031; diff --git a/Console/PoKeys55.cpp b/Console/PoKeys55.cpp index 8fbb4dbd..c27efaaf 100644 --- a/Console/PoKeys55.cpp +++ b/Console/PoKeys55.cpp @@ -156,7 +156,7 @@ bool TPoKeys55::Connect() // get the structure (after we have allocated enough memory for the structure.) DetailedInterfaceDataStructure->cbSize = sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA); // First call populates "StructureSize" with the correct value - SetupDiGetDeviceInterfaceDetail(DeviceInfoTable, InterfaceDataStructure, NULL, NULL, + SetupDiGetDeviceInterfaceDetail(DeviceInfoTable, InterfaceDataStructure, NULL, 0, &StructureSize, NULL); DetailedInterfaceDataStructure = (PSP_DEVICE_INTERFACE_DETAIL_DATA)(malloc(StructureSize)); // Allocate enough memory diff --git a/Driver.cpp b/Driver.cpp index ed06a615..9118a9e5 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2928,7 +2928,7 @@ bool TController::PutCommand(std::string NewCommand, double NewValue1, double Ne else TrainParams->NewName(NewCommand); // czyści tabelkę przystanków delete tsGuardSignal; - tsGuardSignal = NULL; // wywalenie kierownika + tsGuardSignal = nullptr; // wywalenie kierownika if (NewCommand != "none") { if (!TrainParams->LoadTTfile( diff --git a/Driver.h b/Driver.h index 866bd7a7..b2efddcc 100644 --- a/Driver.h +++ b/Driver.h @@ -367,7 +367,7 @@ class TController bool TableAddNew(); bool TableNotFound(TEvent const *Event) const; // TEvent *TableCheckTrackEvent(double fDirection, TTrack *Track); - void TableTraceRoute(double fDistance, TDynamicObject *pVehicle = NULL); + void TableTraceRoute(double fDistance, TDynamicObject *pVehicle = nullptr); void TableCheck(double fDistance); TCommandType TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc); void TablePurger(); diff --git a/DynObj.cpp b/DynObj.cpp index 01f263e6..2a39c768 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4059,7 +4059,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, int skinindex = 0; do { material_handle material = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), true ); - if( material == NULL ) { + if( material == null_handle ) { break; } m_materialdata.replacable_skins[ skinindex + 1 ] = material; diff --git a/DynObj.h b/DynObj.h index f4b7c329..c14cdfd7 100644 --- a/DynObj.h +++ b/DynObj.h @@ -143,7 +143,7 @@ class TAnim struct material_data { int textures_alpha{ 0x30300030 }; // maska przezroczystości tekstur. default: tekstury wymienne nie mają przezroczystości - material_handle replacable_skins[ 5 ] = { NULL, NULL, NULL, NULL, NULL }; // McZapkie:zmienialne nadwozie + material_handle replacable_skins[ 5 ] = { null_handle, null_handle, null_handle, null_handle, null_handle }; // McZapkie:zmienialne nadwozie int multi_textures{ 0 }; //<0 tekstury wskazane wpisem, >0 tekstury z przecinkami, =0 jedna }; diff --git a/EU07.cpp b/EU07.cpp index 71d90bfb..78d26c69 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -272,7 +272,7 @@ int main(int argc, char *argv[]) { auto const fileversionsize = ::GetFileVersionInfoSize( argv[ 0 ], NULL ); std::vectorfileversiondata; fileversiondata.resize( fileversionsize ); - if( ::GetFileVersionInfo( argv[ 0 ], NULL, fileversionsize, fileversiondata.data() ) ) { + if( ::GetFileVersionInfo( argv[ 0 ], 0, fileversionsize, fileversiondata.data() ) ) { struct lang_codepage { WORD language; diff --git a/Ground.cpp b/Ground.cpp index d4725ff4..14722660 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -232,7 +232,7 @@ void TSubRect::NodeAdd(TGroundNode *Node) // since ground rectangle can be empty, we're doing lazy initialization of the geometry bank, when something may actually use it // NOTE: this method is called for both subcell and cell, but subcells get first created and passed the handle from their parent // thus, this effectively only gets executed for the 'parent' ground cells. Not the most elegant, but for now it'll do - if( m_geometrybank == NULL ) { + if( m_geometrybank == null_handle ) { m_geometrybank = GfxRenderer.Create_Bank(); } @@ -439,7 +439,7 @@ TGroundRect::~TGroundRect() void TGroundRect::Init() { // since ground rectangle can be empty, we're doing lazy initialization of the geometry bank, when something may actually use it - if( m_geometrybank == NULL ) { + if( m_geometrybank == null_handle ) { m_geometrybank = GfxRenderer.Create_Bank(); } @@ -1378,9 +1378,9 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) str = token; tmp->m_material = GfxRenderer.Fetch_Material( str ); auto const texturehandle = ( - tmp->m_material != NULL ? + tmp->m_material != null_handle ? GfxRenderer.Material( tmp->m_material ).texture1 : - NULL ); + null_handle ); auto const &texture = ( texturehandle ? GfxRenderer.Texture( texturehandle ) : @@ -1396,7 +1396,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->iFlags |= 200; // z usuwaniem // remainder of legacy 'problend' system -- geometry assigned a texture with '@' in its name is treated as translucent, opaque otherwise - if( texturehandle != NULL ) { + if( texturehandle != null_handle ) { tmp->iFlags |= ( ( ( texture.name.find( '@' ) != std::string::npos ) && ( true == texture.has_alpha ) ) ? diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index 276b3a4d..ab66f304 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -118,9 +118,8 @@ std::string ExchangeCharInString( std::string const &Source, char const &From, c { std::string replacement; replacement.reserve( Source.size() ); std::for_each(Source.cbegin(), Source.cend(), [&](char const idx) { - if( idx != From ) { replacement += idx; } - else { - if( To != NULL ) { replacement += To; } } + if( idx != From ) { replacement += idx; } + else { replacement += To; } } ); return replacement; diff --git a/Model3d.cpp b/Model3d.cpp index be23304f..e6149df5 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -308,7 +308,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic std::string material = parser.getToken(); if (material == "none") { // rysowanie podanym kolorem - m_material = NULL; + m_material = null_handle; iFlags |= 0x10; // rysowane w cyklu nieprzezroczystych } else if (material.find("replacableskin") != material.npos) @@ -348,7 +348,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic // 2. tekstura ma przezroczystość iFlags |= ( ( ( Opacity < 1.0 ) - && ( ( m_material != NULL ) + && ( ( m_material != null_handle ) && ( GfxRenderer.Material( m_material ).has_alpha ) ) ) ? 0x20 : 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta @@ -1044,7 +1044,7 @@ void TSubModel::serialize_geometry( std::ostream &Output ) const { if( Child ) { Child->serialize_geometry( Output ); } - if( m_geometry != NULL ) { + if( m_geometry != null_handle ) { for( auto const &vertex : GfxRenderer.Vertices( m_geometry ) ) { vertex.serialize( Output ); } @@ -1092,7 +1092,7 @@ TSubModel::convert( TGroundNode &Groundnode ) const { 0x20 : 0x10 ); - if( m_geometry == NULL ) { return; } + if( m_geometry == null_handle ) { return; } std::size_t vertexcount { 0 }; std::vector importedvertices; @@ -1198,7 +1198,7 @@ float TSubModel::MaxY( float4x4 const &m ) { auto maxy { 0.0f }; // binary and text models invoke this function at different stages, either after or before geometry data was sent to the geometry manager - if( m_geometry != NULL ) { + if( m_geometry != null_handle ) { for( auto const &vertex : GfxRenderer.Vertices( m_geometry ) ) { maxy = std::max( @@ -1539,7 +1539,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) { Root = nullptr; float4x4 *tm = nullptr; - if( m_geometrybank == NULL ) { + if( m_geometrybank == null_handle ) { m_geometrybank = GfxRenderer.Create_Bank(); } @@ -1738,7 +1738,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, if( ( iFlags & 0x30 ) == 0 ) { // texture-alpha based fallback if for some reason we don't have opacity flag set yet iFlags |= ( - ( ( m_material != NULL ) + ( ( m_material != null_handle ) && ( GfxRenderer.Material( m_material ).has_alpha ) ) ? 0x20 : 0x10 ); // 0x10-nieprzezroczysta, 0x20-przezroczysta @@ -1746,7 +1746,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, } else { ErrorLog( "Bad model: reference to non-existent texture index in sub-model" + ( pName.empty() ? "" : " \"" + pName + "\"" ) ); - m_material = NULL; + m_material = null_handle; } } else @@ -1878,7 +1878,7 @@ void TModel3d::Init() } iFlags |= Root->FlagsCheck() | 0x8000; // flagi całego modelu if (iNumVerts) { - if( m_geometrybank == NULL ) { + if( m_geometrybank == null_handle ) { m_geometrybank = GfxRenderer.Create_Bank(); } std::size_t dataoffset = 0; diff --git a/Model3d.h b/Model3d.h index 17efe8d2..0861a6f1 100644 --- a/Model3d.h +++ b/Model3d.h @@ -68,8 +68,8 @@ public: }; private: - int iNext{ NULL }; - int iChild{ NULL }; + int iNext{ 0 }; + int iChild{ 0 }; int eType{ TP_ROTATOR }; // Ra: modele binarne dają więcej możliwości niż mesh złożony z trójkątów int iName{ -1 }; // numer łańcucha z nazwą submodelu, albo -1 gdy anonimowy public: // chwilowo @@ -121,8 +121,8 @@ private: TSubModel *Next { nullptr }; TSubModel *Child { nullptr }; - geometry_handle m_geometry { NULL, NULL }; // geometry of the submodel - material_handle m_material { NULL }; // numer tekstury, -1 wymienna, 0 brak + geometry_handle m_geometry { 0, 0 }; // geometry of the submodel + material_handle m_material { null_handle }; // numer tekstury, -1 wymienna, 0 brak bool bWire { false }; // nie używane, ale wczytywane float Opacity { 1.0f }; float f_Angle { 0.0f }; @@ -135,7 +135,7 @@ public: // chwilowo basic_vertex *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO */ vertex_array Vertices; - size_t iAnimOwner{ NULL }; // roboczy numer egzemplarza, który ustawił animację + size_t iAnimOwner{ 0 }; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim{ at_None }; // kody animacji oddzielnie, bo zerowane public: float4x4 *mAnimMatrix{ nullptr }; // macierz do animacji kwaternionowych (należy do AnimContainer) diff --git a/Segment.cpp b/Segment.cpp index a6b84785..19a0fa15 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -454,7 +454,7 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, void TSegment::Render() { vector3 pt; - GfxRenderer.Bind_Material( NULL ); + GfxRenderer.Bind_Material( null_handle ); if (bCurve) { diff --git a/Sound.cpp b/Sound.cpp index 71198f62..9c026893 100644 --- a/Sound.cpp +++ b/Sound.cpp @@ -224,7 +224,7 @@ void TSoundsManager::RestoreAll() hr = Next->DSBuffer->Restore(); if (hr == DSERR_BUFFERLOST) Sleep(10); - } while ((hr = Next->DSBuffer->Restore()) != NULL); + } while ((hr = Next->DSBuffer->Restore()) != 0); // char *Name= Next->Name; // int cc= Next->Concurrent; diff --git a/Texture.cpp b/Texture.cpp index 1f603e97..f2a294f4 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -817,9 +817,9 @@ texture_manager::bind( std::size_t const Unit, texture_handle const Texture ) { return; } // TBD, TODO: do binding in texture object, add support for other types than 2d - if( m_units[ Unit ].unit == NULL ) { return; } + if( m_units[ Unit ].unit == 0 ) { return; } unit( m_units[ Unit ].unit ); - if( Texture != NULL ) { + if( Texture != null_handle ) { #ifndef EU07_DEFERRED_TEXTURE_UPLOAD // NOTE: we could bind dedicated 'error' texture here if the id isn't valid ::glBindTexture( GL_TEXTURE_2D, texture(Texture).id ); @@ -830,15 +830,14 @@ texture_manager::bind( std::size_t const Unit, texture_handle const Texture ) { } else { // TODO: bind a special 'error' texture on failure - ::glBindTexture( GL_TEXTURE_2D, NULL ); - m_units[ Unit ].texture = NULL; + ::glBindTexture( GL_TEXTURE_2D, 0 ); + m_units[ Unit ].texture = 0; } #endif } else { - - ::glBindTexture( GL_TEXTURE_2D, NULL ); - m_units[ Unit ].texture = NULL; + ::glBindTexture( GL_TEXTURE_2D, 0 ); + m_units[ Unit ].texture = 0; } // all done return; diff --git a/Texture.h b/Texture.h index 41d1407e..62235f4a 100644 --- a/Texture.h +++ b/Texture.h @@ -78,6 +78,7 @@ private: }; typedef int texture_handle; +int const null_handle = 0; class texture_manager { @@ -114,8 +115,8 @@ private: typedef std::unordered_map index_map; struct texture_unit { - GLint unit { NULL }; - texture_handle texture { NULL }; // current (most recently bound) texture + GLint unit { 0 }; + texture_handle texture { null_handle }; // current (most recently bound) texture }; // methods: @@ -134,7 +135,7 @@ private: index_map m_texturemappings; garbage_collector m_garbagecollector { m_textures, 600, 60, "texture" }; std::array m_units; - GLint m_activeunit { NULL }; + GLint m_activeunit { 0 }; }; // reduces provided data image to half of original size, using basic 2x2 average diff --git a/Track.cpp b/Track.cpp index da96f6d2..7dbb6be7 100644 --- a/Track.cpp +++ b/Track.cpp @@ -485,7 +485,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) *parser >> str; // railtex m_material1 = ( str == "none" ? - NULL : + null_handle : GfxRenderer.Fetch_Material( str ) ); parser->getTokens(); *parser >> fTexLength; // tex tile length @@ -495,7 +495,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) *parser >> str; // sub || railtex m_material2 = ( str == "none" ? - NULL : + null_handle : GfxRenderer.Fetch_Material( str ) ); parser->getTokens(3); *parser >> fTexHeight1 >> fTexWidth >> fTexSlope; diff --git a/Traction.cpp b/Traction.cpp index 0b6028fb..4f1ab726 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -93,7 +93,7 @@ sekcji z sąsiedniego przęsła). std::size_t TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ) { - if( m_geometry != NULL ) { + if( m_geometry != null_handle ) { return GfxRenderer.Vertices( m_geometry ).size() / 2; } diff --git a/color.h b/color.h index 998331a9..56a15abb 100644 --- a/color.h +++ b/color.h @@ -47,9 +47,9 @@ RGBtoHSV( glm::vec3 const &RGB ) { hsv.x = ( RGB.g - RGB.b ) / delta; // between yellow & magenta else if( RGB.g >= max ) - hsv.x = 2.0 + ( RGB.g - RGB.r ) / delta; // between cyan & yellow + hsv.x = 2.f + ( RGB.g - RGB.r ) / delta; // between cyan & yellow else - hsv.x = 4.0 + ( RGB.r - RGB.g ) / delta; // between magenta & cyan + hsv.x = 4.f + ( RGB.r - RGB.g ) / delta; // between magenta & cyan hsv.x *= 60.0; // degrees diff --git a/material.cpp b/material.cpp index c9c82eed..c93ca908 100644 --- a/material.cpp +++ b/material.cpp @@ -23,7 +23,7 @@ opengl_material::deserialize( cParser &Input, bool const Loadnow ) { } has_alpha = ( - texture1 != NULL ? + texture1 != null_handle ? GfxRenderer.Texture( texture1 ).has_alpha : false ); @@ -93,15 +93,15 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { cParser materialparser( disklookup, cParser::buffer_FILE ); if( false == material.deserialize( materialparser, Loadnow ) ) { // deserialization failed but the .mat file does exist, so we give up at this point - return NULL; + return null_handle; } } else { // if there's no .mat file, this could be legacy method of referring just to diffuse texture directly, make a material out of it in such case material.texture1 = GfxRenderer.Fetch_Texture( Filename, Loadnow ); - if( material.texture1 == NULL ) { + if( material.texture1 == null_handle ) { // if there's also no texture, give up - return NULL; + return null_handle; } material.has_alpha = GfxRenderer.Texture( material.texture1 ).has_alpha; } diff --git a/material.h b/material.h index a53aac01..841d1861 100644 --- a/material.h +++ b/material.h @@ -19,8 +19,8 @@ typedef int material_handle; // for legacy opengl this is basically just texture(s) assigned to geometry struct opengl_material { - texture_handle texture1 { NULL }; // primary texture, typically diffuse+apha - texture_handle texture2 { NULL }; // secondary texture, typically normal+reflection + texture_handle texture1 { null_handle }; // primary texture, typically diffuse+apha + texture_handle texture2 { null_handle }; // secondary texture, typically normal+reflection bool has_alpha { false }; // alpha state, calculated from presence of alpha in texture1 std::string name; diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index 9d622f3a..d1e47062 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -118,7 +118,7 @@ geometry_bank::vertices( geometry_handle const &Geometry ) const { // opengl vbo-based variant of the geometry bank -GLuint opengl_vbogeometrybank::m_activebuffer { NULL }; // buffer bound currently on the opengl end, if any +GLuint opengl_vbogeometrybank::m_activebuffer { 0 }; // buffer bound currently on the opengl end, if any unsigned int opengl_vbogeometrybank::m_activestreams { stream::none }; // currently enabled data type pointers std::vector opengl_vbogeometrybank::m_activetexturearrays; // currently enabled texture coord arrays @@ -151,7 +151,7 @@ opengl_vbogeometrybank::replace_( geometry_handle const &Geometry ) { void opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ) { - if( m_buffer == NULL ) { + if( m_buffer == 0 ) { // if there's no buffer, we'll have to make one // NOTE: this isn't exactly optimal in terms of ensuring the gfx card doesn't stall waiting for the data // may be better to initiate upload earlier (during update phase) and trust this effort won't go to waste @@ -235,14 +235,14 @@ opengl_vbogeometrybank::bind_buffer() { void opengl_vbogeometrybank::delete_buffer() { - if( m_buffer != NULL ) { + if( m_buffer != 0 ) { ::glDeleteBuffers( 1, &m_buffer ); if( m_activebuffer == m_buffer ) { - m_activebuffer = NULL; + m_activebuffer = 0; release_streams(); } - m_buffer = NULL; + m_buffer = 0; m_buffercapacity = 0; // NOTE: since we've deleted the buffer all chunks it held were rendered invalid as well // instead of clearing their state here we're delaying it until new buffer is created to avoid looping through chunk records twice @@ -423,7 +423,7 @@ geometrybank_manager::append( vertex_array &Vertices, geometry_handle const &Geo void geometrybank_manager::draw( geometry_handle const &Geometry, unsigned int const Streams ) { - if( Geometry == NULL ) { return; } + if( Geometry == null_handle ) { return; } auto &bankrecord = bank( Geometry ); diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 9a4a7773..ee0aa234 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -208,7 +208,7 @@ private: static GLuint m_activebuffer; // buffer bound currently on the opengl end, if any static unsigned int m_activestreams; static std::vector m_activetexturearrays; - GLuint m_buffer { NULL }; // id of the buffer holding data on the opengl end + GLuint m_buffer { 0 }; // id of the buffer holding data on the opengl end std::size_t m_buffercapacity{ 0 }; // total capacity of the last established buffer chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order diff --git a/renderer.cpp b/renderer.cpp index 212d0eb8..cb7bdb61 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -217,7 +217,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL ); ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE ); - ::glBindTexture( GL_TEXTURE_2D, NULL ); + ::glBindTexture( GL_TEXTURE_2D, 0 ); #ifdef EU07_USE_DEBUG_SHADOWMAP ::glGenTextures( 1, &m_shadowdebugtexture ); ::glBindTexture( GL_TEXTURE_2D, m_shadowdebugtexture ); @@ -1093,7 +1093,7 @@ opengl_renderer::Render( world_environment *Environment ) { return false; } - Bind_Material( NULL ); + Bind_Material( null_handle ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); @@ -1690,7 +1690,7 @@ opengl_renderer::Render( TGroundNode *Node ) { } case GL_LINES: { - if( ( Node->Piece->geometry == NULL ) + if( ( Node->Piece->geometry == null_handle ) || ( Node->fLineThickness > 0.0 ) ) { return false; } @@ -1723,7 +1723,7 @@ opengl_renderer::Render( TGroundNode *Node ) { ::glLineWidth( static_cast( linewidth ) ); } - GfxRenderer.Bind_Material( NULL ); + GfxRenderer.Bind_Material( null_handle ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -1751,7 +1751,7 @@ opengl_renderer::Render( TGroundNode *Node ) { } case GL_TRIANGLES: { - if( ( Node->Piece->geometry == NULL ) + if( ( Node->Piece->geometry == null_handle ) || ( ( Node->iFlags & 0x10 ) == 0 ) ) { return false; } @@ -2203,7 +2203,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); - Bind_Material( NULL ); + Bind_Material( null_handle ); ::glPointSize( std::max( 3.f, 5.f * distancefactor * anglefactor ) ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], lightlevel * anglefactor ); ::glDisable( GL_LIGHTING ); @@ -2250,7 +2250,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); - Bind_Material( NULL ); + Bind_Material( null_handle ); ::glDisable( GL_LIGHTING ); // main draw call @@ -2266,7 +2266,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { } } } - if( Submodel->Child != NULL ) + if( Submodel->Child != nullptr ) if( Submodel->iAlpha & Submodel->iFlags & 0x001F0000 ) Render( Submodel->Child ); @@ -2452,7 +2452,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { auto const color { Node->hvTraction->wire_color() }; ::glColor4f( color.r, color.g, color.b, linealpha ); - Bind_Material( NULL ); + Bind_Material( null_handle ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -2507,7 +2507,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } case GL_LINES: { - if( ( Node->Piece->geometry == NULL ) + if( ( Node->Piece->geometry == null_handle ) || ( Node->fLineThickness < 0.0 ) ) { return false; } @@ -2528,7 +2528,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { ::glLineWidth( static_cast(linewidth) ); } - GfxRenderer.Bind_Material( NULL ); + GfxRenderer.Bind_Material( null_handle ); ::glPushMatrix(); auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); @@ -2546,7 +2546,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { } case GL_TRIANGLES: { - if( ( Node->Piece->geometry == NULL ) + if( ( Node->Piece->geometry == null_handle ) || ( ( Node->iFlags & 0x20 ) == 0 ) ) { return false; } @@ -2852,7 +2852,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { } } - if( Submodel->Child != NULL ) { + if( Submodel->Child != nullptr ) { if( Submodel->eType == TP_TEXT ) { // tekst renderujemy w specjalny sposób, zamiast submodeli z łańcucha Child int i, j = (int)Submodel->pasText->size(); TSubModel *p; @@ -2885,7 +2885,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { if( Submodel->b_aAnim < at_SecondsJump ) Submodel->b_aAnim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu - if( Submodel->Next != NULL ) + if( Submodel->Next != nullptr ) if( Submodel->iAlpha & Submodel->iFlags & 0x2F000000 ) Render_Alpha( Submodel->Next ); }; diff --git a/renderer.h b/renderer.h index e581347e..81d991a7 100644 --- a/renderer.h +++ b/renderer.h @@ -316,7 +316,7 @@ private: texture_manager m_textures; opengllight_array m_lights; - geometry_handle m_billboardgeometry { NULL, NULL }; + geometry_handle m_billboardgeometry { 0, 0 }; texture_handle m_glaretexture { -1 }; texture_handle m_suntexture { -1 }; texture_handle m_moontexture { -1 }; @@ -325,22 +325,22 @@ private: // TODO: refactor framebuffer stuff into an object bool m_framebuffersupport { false }; #ifdef EU07_USE_PICKING_FRAMEBUFFER - GLuint m_pickframebuffer { NULL }; - GLuint m_picktexture { NULL }; - GLuint m_pickdepthbuffer { NULL }; + GLuint m_pickframebuffer { 0 }; + GLuint m_picktexture { 0 }; + GLuint m_pickdepthbuffer { 0 }; #endif int m_shadowbuffersize { 2048 }; - GLuint m_shadowframebuffer { NULL }; - GLuint m_shadowtexture { NULL }; + GLuint m_shadowframebuffer { 0 }; + GLuint m_shadowtexture { 0 }; #ifdef EU07_USE_DEBUG_SHADOWMAP - GLuint m_shadowdebugtexture{ NULL }; + GLuint m_shadowdebugtexture{ 0 }; #endif glm::mat4 m_shadowtexturematrix; // conversion from camera-centric world space to light-centric clip space - GLuint m_environmentframebuffer { NULL }; - GLuint m_environmentcubetexture { NULL }; - GLuint m_environmentdepthbuffer { NULL }; + GLuint m_environmentframebuffer { 0 }; + GLuint m_environmentcubetexture { 0 }; + GLuint m_environmentdepthbuffer { 0 }; bool m_environmentcubetexturesupport { false }; // indicates whether we can use the dynamic environment cube map - int m_environmentcubetextureface { NULL }; // helper, currently processed cube map face + int m_environmentcubetextureface { 0 }; // helper, currently processed cube map face int m_environmentupdatetime { 0 }; // time of the most recent environment map update glm::dvec3 m_environmentupdatelocation; // coordinates of most recent environment map update diff --git a/stdafx.h b/stdafx.h index ca6107c9..c9a7f419 100644 --- a/stdafx.h +++ b/stdafx.h @@ -29,6 +29,7 @@ #include #endif // stl +#include #include #include #define _USE_MATH_DEFINES diff --git a/uilayer.cpp b/uilayer.cpp index d05adbcc..cf1f0fbc 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -100,9 +100,9 @@ ui_layer::set_background( std::string const &Filename ) { m_background = GfxRenderer.Fetch_Texture( Filename ); } else { - m_background = NULL; + m_background = null_handle; } - if( m_background != NULL ) { + if( m_background != null_handle ) { auto const &texture = GfxRenderer.Texture( m_background ); m_progressbottom = ( texture.width() != texture.height() ); } @@ -235,11 +235,11 @@ ui_layer::render_background() { void ui_layer::render_texture() { - if( m_texture != NULL ) { + if( m_texture != 0 ) { ::glColor4f( 1.f, 1.f, 1.f, 1.f ); ::glDisable( GL_BLEND ); - GfxRenderer.Bind_Texture( NULL ); + GfxRenderer.Bind_Texture( null_handle ); ::glBindTexture( GL_TEXTURE_2D, m_texture ); auto const size = 512.f; @@ -254,7 +254,7 @@ ui_layer::render_texture() { glEnd(); - ::glBindTexture( GL_TEXTURE_2D, NULL ); + ::glBindTexture( GL_TEXTURE_2D, 0 ); ::glEnable( GL_BLEND ); } diff --git a/uilayer.h b/uilayer.h index 79863a38..0a0e1fd6 100644 --- a/uilayer.h +++ b/uilayer.h @@ -55,7 +55,7 @@ public: void set_background( std::string const &Filename = "" ); void - set_texture( GLuint Texture = NULL ) { m_texture = Texture; } + set_texture( GLuint Texture = 0 ) { m_texture = Texture; } void set_tooltip( std::string const &Tooltip ) { m_tooltip = Tooltip; } void @@ -98,8 +98,8 @@ private: std::string m_progresstext; // label placed over the progress bar bool m_progressbottom { false }; // location of the progress bar - texture_handle m_background { NULL }; // path to texture used as the background. size depends on mAspect. - GLuint m_texture { NULL }; + texture_handle m_background { null_handle }; // path to texture used as the background. size depends on mAspect. + GLuint m_texture { 0 }; std::vector > m_panels; std::string m_tooltip; }; From e31c7d8f608b75adc54bc15c6006662161f8572a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Tue, 15 Aug 2017 18:32:42 +0200 Subject: [PATCH 163/426] AI: better braking with small difference of velocity --- Driver.cpp | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index d8f4df3a..7442464d 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -70,6 +70,8 @@ Tutaj łączymy teorię z praktyką - tu nic nie działa i nikt nie wie dlaczego // 17. otwieranie/zamykanie drzwi // 18. Ra: odczepianie z zahamowaniem i podczepianie // 19. dla Humandriver: tasma szybkosciomierza - zapis do pliku! +// 20. wybór pozycji zaworu maszynisty w oparciu o zadane opoznienie hamowania + // do zrobienia: // 1. kierownik pociagu @@ -1711,12 +1713,12 @@ void TController::AutoRewident() else if (ustaw > 16) { fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 4 * fBrake_a1[BrakeAccTableSize]; - fBrakeReaction = 0.75 + fLength*0.002; + fBrakeReaction = 1.00 + fLength*0.004; } else { fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 1 * fBrake_a1[BrakeAccTableSize]; - fBrakeReaction = 1.5 + fLength*0.002; + fBrakeReaction = 1.00 + fLength*0.005; } }; @@ -1993,7 +1995,9 @@ bool TController::SetProximityVelocity(double NewDist,double NewVelNext) double TController::BrakeAccFactor() { // double Factor = 1 + fBrakeReaction*mvOccupied->Vel / (std::max(0.0, ActualProximityDist) + 1); - double Factor = 1 + fBrakeReaction*mvOccupied->Vel / (std::max(0.0, ActualProximityDist) + 1) * ((AccDesired-AbsAccS_pub)/fAccThreshold); + double Factor = 1; + if((ActualProximityDist>fMinProximityDist)||(mvOccupied->VelBrakeCtrlPosR < 0.5 ? 1.5 : 1))*mvOccupied->Vel / (std::max(0.0, ActualProximityDist) + 1) * ((AccDesired - AbsAccS_pub) / fAccThreshold); return Factor; } @@ -3507,8 +3511,8 @@ bool TController::UpdateSituation(double dt) // zalecane ciśnienie if (fMass > 1000000.0) fBrakeDist *= 2.0; // korekta dla ciężkich, bo przeżynają - da to coś? - if ((fAccThreshold>0.05)&&(mvOccupied->CategoryFlag==1)) - fBrakeDist = mvOccupied->Vel * mvOccupied->Vel / 25.92 / fAccThreshold; + if ((-fAccThreshold>0.05)&&(mvOccupied->CategoryFlag==1)) + fBrakeDist = mvOccupied->Vel * mvOccupied->Vel / 25.92 / -fAccThreshold; if (mvOccupied->BrakeDelayFlag == bdelay_G) fBrakeDist = fBrakeDist + 2 * mvOccupied->Vel; // dla nastawienia G // koniecznie należy wydłużyć drogę na czas reakcji @@ -4363,6 +4367,8 @@ bool TController::UpdateSituation(double dt) AccDesired = AccPreferred; // VelDesired:=Min0R(VelDesired,VelReduced+VelNext); } + + else if (ActualProximityDist > fMinProximityDist) { // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze // jest daleko @@ -4376,6 +4382,15 @@ bool TController::UpdateSituation(double dt) AccDesired = std::min(AccDesired, fAccThreshold); VelDesired = 0.0; // Min0R(VelDesired,VelNext); } + else if ((vel < VelNext + fVelPlus)||((vel 2*vel*vel) + { // jeśli ma stanąć, a mieści się w drodze hamowania + AccDesired = AccPreferred; + } else if ((vel < VelNext + 20.0)&&(false)) // dwustopniowe hamowanie - niski przy małej różnicy { // jeśli jedzie wolniej niż VelNext+35km/h //Ra: 40, żeby nie @@ -4403,14 +4418,9 @@ bool TController::UpdateSituation(double dt) AccDesired = 0.0; } else // 25.92 (=3.6*3.6*2) - przelicznik z km/h na m/s - if (vel < - VelNext + fVelPlus) // jeśli niewielkie przekroczenie - // AccDesired=0.0; - AccDesired = Min0R(0.0, AccPreferred); // proteza trochę: to // niech nie hamuje, // chyba że coś z // przodu - else AccDesired = -(vel * vel) / (25.92 * (ActualProximityDist + 0.1-0.5*(fMinProximityDist+fMaxProximityDist))); //-fMinProximityDist));//-0.1; @@ -4483,14 +4493,14 @@ bool TController::UpdateSituation(double dt) if ((VelDesired >= 0.0) && (vel > VelDesired)) // jesli jedzie za szybko do AKTUALNEGO if (VelDesired == 0.0) // jesli stoj, to hamuj, ale i tak juz za pozno :) - AccDesired = -0.9; // hamuj solidnie + AccDesired = std::min(AccDesired,-0.9); // hamuj solidnie else if ((vel < VelDesired + fVelPlus)) // o 5 km/h to olej { if ((AccDesired > 0.0)) AccDesired = 0.0; } else - AccDesired = fBrake_a0[0]; // hamuj tak średnio + AccDesired = std::min(AccDesired,fBrake_a0[0]); // hamuj tak średnio // koniec predkosci aktualnej #ifdef DEBUGFAC if (fAccThreshold > -0.3) // bez sensu, ale dla towarowych korzystnie @@ -4540,7 +4550,7 @@ bool TController::UpdateSituation(double dt) SetDriverPsyche(); } } - if (-AccDesired * BrakeAccFactor() < ((fReady > 0.4)||(VelDesired 0.4)||(VelNext>vel-40.0) ? fBrake_a0[0]*0.8 : -fAccThreshold)) AccDesired = std::max(-0.06, AccDesired); else ReactionTime = 0.25; // i orientuj się szybciej, jeśli hamujesz @@ -4607,8 +4617,8 @@ bool TController::UpdateSituation(double dt) mvOccupied->BrakeReleaser(1); // wyluzuj lokomotywę - może być więcej! else if (OrderList[OrderPos] != Disconnect) // przy odłączaniu nie zwalniamy tu hamulca - if (fAccGravity * fAccGravity < - 0.001) // luzuj tylko na plaskim lub przy ruszaniu + if ((AccDesired > 0.0) || (fAccGravity * fAccGravity < + 0.001)) // luzuj tylko na plaskim lub przy ruszaniu { while (DecBrake()) ; // jeśli przyspieszamy, to nie hamujemy From 72760ee9a8327da443dbb7d6154175831ab3408f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 15 Aug 2017 19:10:43 +0200 Subject: [PATCH 164/426] bug fixes for speed table creation and update --- Driver.cpp | 41 ++++++++++++++++++++++++----------------- Ground.cpp | 4 +++- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 9118a9e5..495832e0 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -633,8 +633,8 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) // jeśli kolejny ma większą prędkość niż poprzedni, to zapamiętać poprzedni (do czasu wyjechania) if( ( ( ( iLast != -1 ) && ( TestFlag( sSpeedTable[ iLast ].iFlags, spEnabled | spTrack ) ) ) ? - ( sSpeedTable[ iLast ].trTrack != tLast ) : - true ) ) { + ( sSpeedTable[ iLast ].trTrack != tLast ) : + true ) ) { // jeśli nie był dodany do tabelki if( TableAddNew() ) { // zapisanie toru z ograniczeniem prędkości @@ -657,13 +657,22 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if( ( iLast == -1 ) || ( false == TestFlag( sSpeedTable[iLast].iFlags, spEnabled | spEnd ) ) ) { // only if we haven't already marked end of the track - if( TableAddNew() ) { - // zapisanie ostatniego sprawdzonego toru - sSpeedTable[iLast].Set( - tLast, fCurrentDistance, - ( fLastDir < 0 ? + if( tLast == sSpeedTable[ iLast ].trTrack ) { + // don't add the same track twice, it messes up distance calculations in speed point update + sSpeedTable[ iLast ].iFlags |= ( + fLastDir < 0 ? spEnabled | spEnd | spReverse : - spEnabled | spEnd )); + spEnabled | spEnd ); + } + else { + if( TableAddNew() ) { + // zapisanie ostatniego sprawdzonego toru + sSpeedTable[ iLast ].Set( + tLast, fCurrentDistance, + ( fLastDir < 0 ? + spEnabled | spEnd | spReverse : + spEnabled | spEnd ) ); + } } } // to ostatnia pozycja, bo NULL nic nie da, a może się podpiąć obrotnica, czy jakieś transportery @@ -691,7 +700,7 @@ void TController::TableCheck(double fDistance) vector3 dir = pVehicles[0]->VectorFront() * pVehicles[0]->DirectionGet(); // wektor kierunku jazdy vector3 pos = pVehicles[0]->HeadPosition(); // zaczynamy od pozycji pojazdu double len = 0.0; // odległość będziemy zliczać narastająco - for( int i = 0; i <= iLast; ++i ) + for( int i = 0; i < iLast; ++i ) { // aktualizacja rekordów z wyjątkiem ostatniego if (sSpeedTable[i].iFlags & spEnabled) // jeśli pozycja istotna { @@ -1283,20 +1292,18 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else // event trzyma tylko jeśli VelNext=0, nawet po przejechaniu (nie powinno // dotyczyć samochodów?) a = (v == 0.0 ? -1.0 : fAcc); // ruszanie albo hamowanie - if (a < fAcc && v == Min0R(v, fNext)) - { // mniejsze przyspieszenie to mniejsza możliwość rozpędzenia się albo konieczność - // hamowania + + if ((a < fAcc) && (v == std::min(v, fNext))) { + // mniejsze przyspieszenie to mniejsza możliwość rozpędzenia się albo konieczność hamowania // jeśli droga wolna, to może być a>1.0 i się tu nie załapuje - // if (mvOccupied->Vel>10.0) fAcc = a; // zalecane przyspieszenie (nie musi być uwzględniane przez AI) fNext = v; // istotna jest prędkość na końcu tego odcinka fDist = d; // dlugość odcinka } - else if ((fAcc > 0) && (v > 0) && (v <= fNext)) - { // jeśli nie ma wskazań do hamowania, można podać drogę i prędkość na jej końcu + else if ((fAcc > 0) && (v > 0) && (v <= fNext)) { + // jeśli nie ma wskazań do hamowania, można podać drogę i prędkość na jej końcu fNext = v; // istotna jest prędkość na końcu tego odcinka - fDist = d; // dlugość odcinka (kolejne pozycje mogą wydłużać drogę, jeśli - // prędkość jest stała) + fDist = d; // dlugość odcinka (kolejne pozycje mogą wydłużać drogę, jeśli prędkość jest stała) } } // if (v>=0.0) if (fNext >= 0.0) diff --git a/Ground.cpp b/Ground.cpp index 14722660..f87bb069 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -314,7 +314,9 @@ void TSubRect::NodeAdd(TGroundNode *Node) // przygotowanie sektora do renderowania void TSubRect::Sort() { - assert( tTracks == nullptr ); + if( tTracks != nullptr ) { + SafeDelete( tTracks ); + } if( iTracks > 0 ) { tTracks = new TTrack *[ iTracks ]; // tworzenie tabeli torów do renderowania pojazdów int i = 0; From 4ee618a3c14db8ca632623c877e0083fddeb9745 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 15 Aug 2017 22:47:31 +0200 Subject: [PATCH 165/426] build 170815. --- Driver.cpp | 21 ++++++--------------- version.h | 4 ++-- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 5ef2a886..9972d848 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -659,22 +659,13 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if( ( iLast == -1 ) || ( false == TestFlag( sSpeedTable[iLast].iFlags, spEnabled | spEnd ) ) ) { // only if we haven't already marked end of the track - if( tLast == sSpeedTable[ iLast ].trTrack ) { - // don't add the same track twice, it messes up distance calculations in speed point update - sSpeedTable[ iLast ].iFlags |= ( - fLastDir < 0 ? + if( TableAddNew() ) { + // zapisanie ostatniego sprawdzonego toru + sSpeedTable[iLast].Set( + tLast, fCurrentDistance, + ( fLastDir < 0 ? spEnabled | spEnd | spReverse : - spEnabled | spEnd ); - } - else { - if( TableAddNew() ) { - // zapisanie ostatniego sprawdzonego toru - sSpeedTable[ iLast ].Set( - tLast, fCurrentDistance, - ( fLastDir < 0 ? - spEnabled | spEnd | spReverse : - spEnabled | spEnd ) ); - } + spEnabled | spEnd )); } } // to ostatnia pozycja, bo NULL nic nie da, a może się podpiąć obrotnica, czy jakieś transportery diff --git a/version.h b/version.h index c2fc5b53..f3543435 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 814 -#define VERSION_REVISION 1 +#define VERSION_MINOR 815 +#define VERSION_REVISION 0 From f06f997946f4b719445f07574021c8cf5fd532f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 20 Aug 2017 20:22:04 +0200 Subject: [PATCH 166/426] AI: Better acceleration with ElectricSeriesMotor - motor current is set acording to ahdesion and fuse limit --- Driver.cpp | 139 +++++++++++++++++++++++++++++++++++------------------ Driver.h | 1 + 2 files changed, 94 insertions(+), 46 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 7442464d..42d3c222 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1720,7 +1720,41 @@ void TController::AutoRewident() fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 1 * fBrake_a1[BrakeAccTableSize]; fBrakeReaction = 1.00 + fLength*0.005; } -}; +} + +double TController::ESMVelocity(bool Main) +{ + double fCurrentCoeff = 0.9; + double fFrictionCoeff = 0.85; + double ESMVel = 9999; + int MCPN = mvControlling->MainCtrlActualPos; + int SCPN = mvControlling->ScndCtrlActualPos; + if (Main) + MCPN += 1; + else + SCPN += 1; + if ((mvControlling->RList[MCPN].ScndAct < 255)&&(mvControlling->ScndCtrlActualPos==0)) + SCPN = mvControlling->RList[MCPN].ScndAct; + double FrictionMax = mvControlling->Mass*9.81*mvControlling->Adhesive(mvControlling->RunningTrack.friction)*fFrictionCoeff; + double IF = mvControlling->Imax; + double MS = 0; + double Fmax = 0; + for (int i = 0; i < 5; i++) + { + MS = mvControlling->MomentumF(IF, IF, SCPN); + Fmax = MS * mvControlling->RList[MCPN].Bn*mvControlling->RList[MCPN].Mn * 2 / mvControlling->WheelDiameter * mvControlling->Transmision.Ratio; + IF = 0.5*IF*(1 + FrictionMax/Fmax); + } + IF = std::min(IF, mvControlling->Imax*fCurrentCoeff); + double R = mvControlling->RList[MCPN].R + mvControlling->CircuitRes + mvControlling->RList[MCPN].Mn*mvControlling->WindingRes; + double pole = mvControlling->MotorParam[SCPN].fi * + std::max(abs(IF) / (abs(IF) + mvControlling->MotorParam[SCPN].Isat) - mvControlling->MotorParam[SCPN].fi0, 0.0); + double Us = abs(mvControlling->Voltage) - IF*R; + double ns = std::max(0.0, Us / (pole*mvControlling->RList[MCPN].Mn)); + ESMVel = ns * mvControlling->WheelDiameter*M_PI*3.6/mvControlling->Transmision.Ratio; + return ESMVel; +} +; int TController::CheckDirection() { @@ -2499,51 +2533,64 @@ bool TController::IncSpeed() (mvControlling->StLinFlag)) // youBy polecił dodać 2012-09-08 v367 // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe // (zgaśnie DelayCtrlFlag) - if (Ready || (iDrivigFlags & movePress)) - if (fabs(mvControlling->Im) < - (fReady < 0.4 ? mvControlling->Imin : mvControlling->IminLo)) - { // Ra: wywalał nadmiarowy, bo Im może być ujemne; jak nie odhamowany, to nie - // przesadzać z prądem - if ((mvOccupied->Vel <= 30) || - (mvControlling->Imax > mvControlling->ImaxLo) || - (fVoltage + fVoltage < - mvControlling->EnginePowerSource.CollectorParameters.MinV + - mvControlling->EnginePowerSource.CollectorParameters.MaxV)) - { // bocznik na szeregowej przy ciezkich bruttach albo przy wysokim rozruchu - // pod górę albo przy niskim napięciu - if (mvControlling->MainCtrlPos ? - mvControlling->RList[mvControlling->MainCtrlPos].R > 0.0 : - true) // oporowa - { - OK = (mvControlling->DelayCtrlFlag ? - true : - mvControlling->IncMainCtrl(1)); // kręcimy nastawnik jazdy - if ((OK) && - (mvControlling->MainCtrlPos == - 1)) // czekaj na 1 pozycji, zanim się nie włączą liniowe - iDrivigFlags |= moveIncSpeed; - else - iDrivigFlags &= ~moveIncSpeed; // usunięcie flagi czekania - } - else // jeśli bezoporowa (z wyjątekiem 0) - OK = false; // to dać bocznik - } - else - { // przekroczone 30km/h, można wejść na jazdę równoległą - if (mvControlling->ScndCtrlPos) // jeśli ustawiony bocznik - if (mvControlling->MainCtrlPos < - mvControlling->MainCtrlPosNo - 1) // a nie jest ostatnia pozycja - mvControlling->DecScndCtrl(2); // to bocznik na zero po chamsku - // (ktoś miał to poprawić...) - OK = mvControlling->IncMainCtrl(1); - } - if ((mvControlling->MainCtrlPos > 2) && - (mvControlling->Im == 0)) // brak prądu na dalszych pozycjach - Need_TryAgain = true; // nie załączona lokomotywa albo wywalił - // nadmiarowy - else if (!OK) // nie da się wrzucić kolejnej pozycji - OK = mvControlling->IncScndCtrl(1); // to dać bocznik - } + if (Ready || (iDrivigFlags & movePress)) + { + bool scndctrl = ((mvOccupied->Vel <= 30) || + (mvControlling->Imax > mvControlling->ImaxLo) || + (fVoltage + fVoltage < + mvControlling->EnginePowerSource.CollectorParameters.MinV + + mvControlling->EnginePowerSource.CollectorParameters.MaxV) || + (mvControlling->MainCtrlPos == mvControlling->MainCtrlPosNo)); + scndctrl = ((scndctrl) && (mvControlling->MainCtrlPos > 1) && (mvControlling->RList[mvControlling->MainCtrlActualPos].R < 0.01)&& (mvControlling->ScndCtrlPos != mvControlling->ScndCtrlPosNo)); + double Vs = 99999; + if((mvControlling->MainCtrlPos != mvControlling->MainCtrlPosNo)||(mvControlling->ScndCtrlPos!=mvControlling->ScndCtrlPosNo)) + Vs = ESMVelocity(!scndctrl); + + if ((fabs(mvControlling->Im) < + (fReady < 0.4 ? mvControlling->Imin : mvControlling->IminLo))||(mvControlling->Vel>Vs)) + { // Ra: wywalał nadmiarowy, bo Im może być ujemne; jak nie odhamowany, to nie + // przesadzać z prądem + if ((mvOccupied->Vel <= 30) || + (mvControlling->Imax > mvControlling->ImaxLo) || + (fVoltage + fVoltage < + mvControlling->EnginePowerSource.CollectorParameters.MinV + + mvControlling->EnginePowerSource.CollectorParameters.MaxV)) + { // bocznik na szeregowej przy ciezkich bruttach albo przy wysokim rozruchu + // pod górę albo przy niskim napięciu + if (mvControlling->MainCtrlPos ? + mvControlling->RList[mvControlling->MainCtrlPos].R > 0.0 : + true) // oporowa + { + OK = (mvControlling->DelayCtrlFlag ? + true : + mvControlling->IncMainCtrl(1)); // kręcimy nastawnik jazdy + if ((OK) && + (mvControlling->MainCtrlPos == + 1)) // czekaj na 1 pozycji, zanim się nie włączą liniowe + iDrivigFlags |= moveIncSpeed; + else + iDrivigFlags &= ~moveIncSpeed; // usunięcie flagi czekania + } + else // jeśli bezoporowa (z wyjątekiem 0) + OK = false; // to dać bocznik + } + else + { // przekroczone 30km/h, można wejść na jazdę równoległą + if (mvControlling->ScndCtrlPos) // jeśli ustawiony bocznik + if (mvControlling->MainCtrlPos < + mvControlling->MainCtrlPosNo - 1) // a nie jest ostatnia pozycja + mvControlling->DecScndCtrl(2); // to bocznik na zero po chamsku + // (ktoś miał to poprawić...) + OK = mvControlling->IncMainCtrl(1); + } + if ((mvControlling->MainCtrlPos > 2) && + (mvControlling->Im == 0)) // brak prądu na dalszych pozycjach + Need_TryAgain = true; // nie załączona lokomotywa albo wywalił + // nadmiarowy + else if (!OK) // nie da się wrzucić kolejnej pozycji + OK = mvControlling->IncScndCtrl(1); // to dać bocznik + } + } mvControlling->AutoRelayCheck(); // sprawdzenie logiki sterowania break; case Dumb: diff --git a/Driver.h b/Driver.h index c21eb050..dc89a672 100644 --- a/Driver.h +++ b/Driver.h @@ -314,6 +314,7 @@ class TController void Activation(); // umieszczenie obsady w odpowiednim członie void ControllingSet(); // znajduje człon do sterowania void AutoRewident(); // ustawia hamulce w składzie + double ESMVelocity(bool Main); public: Mtable::TTrainParameters *Timetable() { From 318dd9a0fe97389d6a3340ef1c72e0f7ee533874 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 21 Aug 2017 01:29:01 +0200 Subject: [PATCH 167/426] build 170820. tweaks and fixes to car detection, proximity scanning, car handling; support for basic diffuse-only gfx renderer mode --- Driver.cpp | 1019 ++++++++++++++++++++------------------------ Driver.h | 6 +- DynObj.cpp | 513 +++++++++------------- DynObj.h | 4 +- Globals.cpp | 12 +- Globals.h | 1 + McZapkie/Mover.cpp | 8 +- Model3d.cpp | 17 - Model3d.h | 1 - World.cpp | 21 +- renderer.cpp | 53 ++- version.h | 2 +- 12 files changed, 743 insertions(+), 914 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 9972d848..7b653b34 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -187,7 +187,7 @@ void TSpeedPos::CommandCheck() } }; -bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) +bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len, TOrders const &Orders ) { // przeliczenie odległości od punktu (*p), w kierunku (*dir), zaczynając od pojazdu // dla kolejnych pozycji podawane są współrzędne poprzedniego obiektu w (*p) vector3 v = vPos - *p; // wektor od poprzedniego obiektu (albo pojazdu) do punktu zmiany @@ -245,49 +245,53 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len) *p = vPos; // nowy punkt odniesienia *dir = Normalize(v); // nowy wektor kierunku od poprzedniego obiektu do aktualnego } - if (iFlags & spTrack) // jeśli tor + if (iFlags & spTrack) // road/track { - if (trTrack) // może być NULL, jeśli koniec toru (???) - { - fVelNext = trTrack->VelocityGet(); // aktualizacja prędkości (może być zmieniana - // eventem) - int i; - if ((i = iFlags & 0xF0000000) != 0) - { // jeśli skrzyżowanie, ograniczyć prędkość przy skręcaniu - if (abs(i) > 0x10000000) //±1 to jazda na wprost, ±2 nieby też, ale z przecięciem - // głównej drogi - chyba że jest równorzędne... - fVelNext = 30.0; // uzależnić prędkość od promienia; albo niech będzie - // ograniczona w skrzyżowaniu (velocity z ujemną wartością) + if (trTrack) { + // może być NULL, jeśli koniec toru (???) + fVelNext = trTrack->VelocityGet(); // aktualizacja prędkości (może być zmieniana eventem) + + if( trTrack->iCategoryFlag & 1 ) { + // railways +/* if( ( iFlags & spElapsed ) == 0 ) { // jeśli nie wjechał + // TODO: remove this block when the detection of vehicles ahead is working properly if( false == trTrack->Dynamics.empty() ) { + // to zabronić wjazdu (chyba że ten z przodu też jedzie prosto) + fVelNext = 25.0; // can't force full stop as it can prevent vehicles from leaving the track. slow down should be enough to ensure slow enough movement to stop if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "Tor " + trTrack->NameGet() + " zajety przed pojazdem. Num=" + std::to_string( trTrack->Dynamics.size() ) + "Dist= " + std::to_string( fDist ) ); - fVelNext = 0.0; // to zabronić wjazdu (chyba że ten z przodu też jedzie prosto) + WriteLog( "Track " + trTrack->NameGet() + " is occupied. Vehicle count: " + std::to_string( trTrack->Dynamics.size() ) + ", distance: " + std::to_string( fDist ) + " m." ); + } + } + } +*/ + if( iFlags & spSwitch ) { + // jeśli odcinek zmienny + if( ( ( trTrack->GetSwitchState() & 1 ) != 0 ) != + ( ( iFlags & spSwitchStatus ) != 0 ) ) { + // czy stan się zmienił? + // Ra: zakładam, że są tylko 2 możliwe stany + iFlags ^= spSwitchStatus; + if( ( iFlags & spElapsed ) == 0 ) { + // jeszcze trzeba skanowanie wykonać od tego toru + // problem jest chyba, jeśli zwrotnica się przełoży zaraz po zjechaniu z niej + // na Mydelniczce potrafi skanować na wprost mimo pojechania na bok + return true; } } } } - if (iFlags & spSwitch) // jeśli odcinek zmienny - { - if (((trTrack->GetSwitchState() & 1) != 0) != - ((iFlags & spSwitchStatus) != 0)) // czy stan się zmienił? - { // Ra: zakładam, że są tylko 2 możliwe stany - iFlags ^= spSwitchStatus; - // fVelNext=trTrack->VelocityGet(); //nowa prędkość - if ((iFlags & spElapsed) == 0) - return true; // jeszcze trzeba skanowanie wykonać od tego toru - // problem jest chyba, jeśli zwrotnica się przełoży zaraz po zjechaniu z niej - // na Mydelniczce potrafi skanować na wprost mimo pojechania na bok - } - // poniższe nie dotyczy trybu łączenia? - if( ( ( iFlags & spElapsed ) == 0 ) - && ( false == trTrack->Dynamics.empty() ) ) { - // jeśli jeszcze nie wjechano na tor, a coś na nim jest - if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "Rozjazd " + trTrack->NameGet() + " zajety przed pojazdem. Num=" + std::to_string( trTrack->Dynamics.size() ) + "Dist= " + std::to_string( fDist ) ); + else { + // roads and others + if( iFlags & 0xF0000000 ) { + // jeśli skrzyżowanie, ograniczyć prędkość przy skręcaniu + if( ( iFlags & 0xF0000000 ) > 0x10000000 ) { + // ±1 to jazda na wprost, ±2 nieby też, ale z przecięciem głównej drogi - chyba że jest równorzędne... + // TODO: uzależnić prędkość od promienia; + // albo niech będzie ograniczona w skrzyżowaniu (velocity z ujemną wartością) + fVelNext = 30.0; } - fVelNext = 0.0; // to niech stanie w zwiększonej odległości } } } @@ -314,7 +318,7 @@ std::string TSpeedPos::TableText() { // pozycja tabelki pr?dko?ci if (iFlags & spEnabled) { // o ile pozycja istotna - return "Flags:" + to_hex_str(iFlags, 6) + ", Dist:" + to_string(fDist, 1, 6) + + return "Flags:" + to_hex_str(iFlags, 8) + ", Dist:" + to_string(fDist, 1, 6) + ", Vel:" + (fVelNext == -1.0 ? " - " : to_string(static_cast(fVelNext), 0, 3)) + ", Name:" + GetName(); //if (iFlags & spTrack) // jeśli tor // return "Flags=#" + IntToHex(iFlags, 8) + ", Dist=" + FloatToStrF(fDist, ffFixed, 7, 1) + @@ -374,7 +378,7 @@ void TSpeedPos::Set(TTrack *track, double dist, int flag) trTrack = track; // TODO: (t) może być NULL i nie odczytamy końca poprzedniego :/ if (trTrack) { - iFlags = flag | (trTrack->eType == tt_Normal ? 2 : 10); // zapamiętanie kierunku wraz z typem + iFlags = flag | (trTrack->eType == tt_Normal ? spTrack : (spTrack | spSwitch) ); // zapamiętanie kierunku wraz z typem if (iFlags & spSwitch) if (trTrack->GetSwitchState() & 1) iFlags |= spSwitchStatus; @@ -570,8 +574,8 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if( ( pTrack->VelocityGet() == 0.0 ) // zatrzymanie || ( pTrack->iAction ) // jeśli tor ma własności istotne dla skanowania - || ( pTrack->VelocityGet() != fLastVel ) ) // następuje zmiana prędkości - { // odcinek dodajemy do tabelki, gdy jest istotny dla ruchu + || ( pTrack->VelocityGet() != fLastVel ) ) { // następuje zmiana prędkości + // odcinek dodajemy do tabelki, gdy jest istotny dla ruchu if (TableAddNew()) { // teraz dodatkowo zapamiętanie wybranego segmentu dla skrzyżowania sSpeedTable[ iLast ].Set( @@ -697,7 +701,7 @@ void TController::TableCheck(double fDistance) { // aktualizacja rekordów z wyjątkiem ostatniego if (sSpeedTable[i].iFlags & spEnabled) // jeśli pozycja istotna { - if (sSpeedTable[i].Update(&pos, &dir, len)) + if (sSpeedTable[i].Update(&pos, &dir, len, OrderCurrentGet())) { if( Global::iWriteLogEnabled & 8 ) { WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->NameGet() + " (generating fresh trace)" ); @@ -740,7 +744,7 @@ void TController::TableCheck(double fDistance) } } } - sSpeedTable[iLast].Update(&pos, &dir, len); // aktualizacja ostatniego + sSpeedTable[iLast].Update(&pos, &dir, len, OrderCurrentGet()); // aktualizacja ostatniego // WriteLog("TableCheck: Upate last track. Dist=" + AnsiString(sSpeedTable[iLast].fDist)); if( sSpeedTable[ iLast ].fDist < fDistance ) { TableTraceRoute( fDistance, pVehicles[ 1 ] ); // doskanowanie dalszego odcinka @@ -1154,10 +1158,11 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } //sprawdzenie eventów pasywnych przed nami - if ((mvOccupied->CategoryFlag & 1) ? - sSpeedTable[i].fDist > pVehicles[0]->fTrackBlock - 20.0 : - false) // jak sygnał jest dalej niż zawalidroga + if( ( mvOccupied->CategoryFlag & 1 ) + && ( sSpeedTable[ i ].fDist > pVehicles[ 0 ]->fTrackBlock - 20.0 ) ) { + // jak sygnał jest dalej niż zawalidroga v = 0.0; // to może być podany dla tamtego: jechać tak, jakby tam stop był + } else { // zawalidrogi nie ma (albo pojazd jest samochodem), sprawdzić sygnał if (sSpeedTable[i].iFlags & spShuntSemaphor) // jeśli Tm - w zasadzie to sprawdzić @@ -1824,8 +1829,7 @@ bool TController::CheckVehicles(TOrders user) 1 : 0); //światła manewrowe (Tb1) na pojeździe z napędem if (OrderCurrentGet() & Connect) // jeśli łączenie, skanować dalej - pVehicles[0]->fScanDist = - 5000.0; // odległość skanowania w poszukiwaniu innych pojazdów + pVehicles[0]->fScanDist = 5000.0; // odległość skanowania w poszukiwaniu innych pojazdów } else if (OrderCurrentGet() == Disconnect) if (mvOccupied->ActiveDir > 0) // jak ma kierunek do przodu @@ -1936,17 +1940,7 @@ void TController::WaitingSet(double Seconds) void TController::SetVelocity(double NewVel, double NewVelNext, TStopReason r) { // ustawienie nowej prędkości - WaitingTime = -WaitingExpireTime; // przypisujemy -WaitingExpireTime, a potem porównujemy z - // zerem - MaxVelFlag = false; // Ra: to nie jest używane - MinVelFlag = false; // Ra: to nie jest używane - /* nie używane - if ((NewVel>NewVelNext) //jeśli oczekiwana większa niż następna - || (NewVelVel)) //albo aktualna jest mniejsza niż aktualna - fProximityDist=-800.0; //droga hamowania do zmiany prędkości - else - fProximityDist=-300.0; //Ra: ujemne wartości są ignorowane - */ + WaitingTime = -WaitingExpireTime; // przypisujemy -WaitingExpireTime, a potem porównujemy z zerem if (NewVel == 0.0) // jeśli ma stanąć { if (r != stopNone) // a jest powód podany @@ -1981,24 +1975,6 @@ void TController::SetVelocity(double NewVel, double NewVelNext, TStopReason r) VelNext = NewVelNext; // prędkość przy następnym obiekcie } -/* //funkcja do niczego nie potrzebna (ew. do przesunięcia pojazdu o odległość NewDist) -bool TController::SetProximityVelocity(double NewDist,double NewVelNext) -{//informacja o prędkości w pewnej odległości -#if 0 - if (NewVelNext==0.0) - WaitingTime=0.0; //nie trzeba już czekać - //if ((NewVelNext>=0)&&((VelNext>=0)&&(NewVelNextVel / (std::max(0.0, ActualProximityDist) + 1); @@ -3394,7 +3370,7 @@ bool TController::UpdateSituation(double dt) } // Winger 020304 - if (AIControllFlag) + if (true == AIControllFlag) { if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { @@ -3416,6 +3392,10 @@ bool TController::UpdateSituation(double dt) if (mvOccupied->Vel > 1.0) // nie zamykać drzwi przy drganiach, bo zatrzymanie na W4 // akceptuje niewielkie prędkości Doors(false); +/* + // NOTE: this section moved all cars to the edge of their respective roads + // it may have some use eventually for collision avoidance, + // but when enabled all the time it produces silly effect // przy prowadzeniu samochodu trzeba każdą oś odsuwać oddzielnie, inaczej kicha wychodzi if (mvOccupied->CategoryFlag & 2) // jeśli samochód // if (fabs(mvOccupied->OffsetTrackH)Dim.W) //Ra: szerokość drogi tu @@ -3424,6 +3404,7 @@ bool TController::UpdateSituation(double dt) // drogi mvOccupied->ChangeOffsetH(0.01 * mvOccupied->Vel * dt); // Ra: co to miało być, to nie wiem +*/ if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { if ((fOverhead2 >= 0.0) || iOverheadZero) @@ -3462,23 +3443,20 @@ bool TController::UpdateSituation(double dt) } } } - if (iDrivigFlags & moveStartHornNow) // czy ma zatrąbić przed ruszeniem? - if (Ready) // gotów do jazdy - if (iEngineActive) // jeszcze się odpalić musi - if (fStopTime >= 0) // i nie musi czekać - { // uruchomienie trąbienia - fWarningDuration = 0.3; // czas trąbienia - // if (AIControllFlag) //jak siedzi krasnoludek, to włączy trąbienie - mvOccupied->WarningSignal = - pVehicle->iHornWarning; // wysokość tonu (2=wysoki) - iDrivigFlags |= moveStartHornDone; // nie trąbić aż do ruszenia - iDrivigFlags &= ~moveStartHornNow; // trąbienie zostało zorganizowane - } + if( ( true == TestFlag( iDrivigFlags, moveStartHornNow ) ) + && ( true == Ready ) + && ( iEngineActive != 0 ) + && ( fStopTime >= 0 ) ) { + // uruchomienie trąbienia przed ruszeniem + fWarningDuration = 0.3; // czas trąbienia + mvOccupied->WarningSignal = pVehicle->iHornWarning; // wysokość tonu (2=wysoki) + iDrivigFlags |= moveStartHornDone; // nie trąbić aż do ruszenia + iDrivigFlags &= ~moveStartHornNow; // trąbienie zostało zorganizowane + } } ElapsedTime += dt; WaitingTime += dt; - // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca - fBrakeTime -= dt; + fBrakeTime -= dt; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca fStopTime += dt; // zliczanie czasu postoju, nie ruszy dopóki ujemne fActionTime += dt; // czas używany przy regulacji prędkości i zamykaniu drzwi if (WriteLogFlag) @@ -3498,15 +3476,12 @@ bool TController::UpdateSituation(double dt) // Ra: skanowanie również dla prowadzonego ręcznie, aby podpowiedzieć prędkość if ((LastReactionTime > std::min(ReactionTime, 2.0))) { - // Ra: nie wiem czemu ReactionTime potrafi dostać 12 sekund, to jest przegięcie, bo przeżyna - // STÓJ + // Ra: nie wiem czemu ReactionTime potrafi dostać 12 sekund, to jest przegięcie, bo przeżyna STÓJ // yB: otóż jest to jedna trzecia czasu napełniania na towarowym; może się przydać przy // wdrażaniu hamowania, żeby nie ruszało kranem jak głupie // Ra: ale nie może się budzić co pół minuty, bo przeżyna semafory // Ra: trzeba by tak: // 1. Ustalić istotną odległość zainteresowania (np. 3×droga hamowania z V.max). - fBrakeDist = fDriverBraking * mvOccupied->Vel * - (40.0 + mvOccupied->Vel); // przybliżona droga hamowania // dla hamowania -0.2 [m/ss] droga wynosi 0.389*Vel*Vel [km/h], czyli 600m dla 40km/h, 3.8km // dla 100km/h i 9.8km dla 160km/h // dla hamowania -0.4 [m/ss] droga wynosi 0.096*Vel*Vel [km/h], czyli 150m dla 40km/h, 1.0km @@ -3514,21 +3489,28 @@ bool TController::UpdateSituation(double dt) // ogólnie droga hamowania przy stałym opóźnieniu to Vel*Vel/(3.6*3.6*a) [m] // fBrakeDist powinno być wyznaczane dla danego składu za pomocą sieci neuronowych, w // zależności od prędkości i siły (ciśnienia) hamowania - // następnie w drugą stronę, z drogi hamowania i chwilowej prędkości powinno być wyznaczane - // zalecane ciśnienie - if (fMass > 1000000.0) - fBrakeDist *= 2.0; // korekta dla ciężkich, bo przeżynają - da to coś? - if ((-fAccThreshold>0.05)&&(mvOccupied->CategoryFlag==1)) - fBrakeDist = mvOccupied->Vel * mvOccupied->Vel / 25.92 / -fAccThreshold; - if (mvOccupied->BrakeDelayFlag == bdelay_G) - fBrakeDist = fBrakeDist + 2 * mvOccupied->Vel; // dla nastawienia G - // koniecznie należy wydłużyć drogę na czas reakcji + // następnie w drugą stronę, z drogi hamowania i chwilowej prędkości powinno być wyznaczane zalecane ciśnienie + + // przybliżona droga hamowania + fBrakeDist = fDriverBraking * mvOccupied->Vel * ( 40.0 + mvOccupied->Vel ); + if( fMass > 1000000.0 ) { + // korekta dla ciężkich, bo przeżynają - da to coś? + fBrakeDist *= 2.0; + } + if( ( -fAccThreshold > 0.05 ) + && ( mvOccupied->CategoryFlag == 1 ) ) { + fBrakeDist = mvOccupied->Vel * mvOccupied->Vel / 25.92 / -fAccThreshold; + } + if( mvOccupied->BrakeDelayFlag == bdelay_G ) { + // dla nastawienia G koniecznie należy wydłużyć drogę na czas reakcji + fBrakeDist += 2 * mvOccupied->Vel; + } // double scanmax=(mvOccupied->Vel>0.0)?3*fDriverDist+fBrakeDist:10.0*fDriverDist; - double scanmax = (mvOccupied->Vel > 5.0) ? - 400 + fBrakeDist : - 30.0 * fDriverDist; // 1500m dla stojących pociągów; Ra 2015-01: przy - //double scanmax = Max0R(400 + fBrakeDist, 1500); - // dłuższej drodze skanowania AI jeździ spokojniej + double scanmax = ( + mvOccupied->Vel > 5.0 ? + 400 + fBrakeDist : + 30.0 * fDriverDist ); // 1500m dla stojących pociągów; + // Ra 2015-01: przy dłuższej drodze skanowania AI jeździ spokojniej // 2. Sprawdzić, czy tabelka pokrywa założony odcinek (nie musi, jeśli jest STOP). // 3. Sprawdzić, czy trajektoria ruchu przechodzi przez zwrotnice - jeśli tak, to sprawdzić, // czy stan się nie zmienił. @@ -3540,6 +3522,43 @@ bool TController::UpdateSituation(double dt) // 7. Jeśli jest inny pojazd z przodu, ewentualnie skorygować odległość i prędkość. // 8. Ustalić częstotliwość świadomości AI (zatrzymanie precyzyjne - częściej, brak atrakcji // - rzadziej). + // check for potential colliders + { + auto const scandistance = 300.0 + fBrakeDist; + auto rearvehicle = ( + pVehicles[ 0 ] == pVehicles[ 1 ] ? + pVehicles[ 0 ] : + pVehicles[ 1 ] ); + if( iDirection > 0 ) { + // towards coupler 0 + if( ( rearvehicle->NextConnected != nullptr ) + && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 1 : 0 ) ].CouplingFlag == ctrain_virtual ) ) { + // scan behind if we had something connected there and are moving away + rearvehicle->ABuScanObjects( -1, fMaxProximityDist ); + } + pVehicles[ 0 ]->ABuScanObjects( 1, scandistance ); + } + else { + // towards coupler 1 + if( ( rearvehicle->PrevConnected != nullptr ) + && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 0 : 1 ) ].CouplingFlag == ctrain_virtual ) ) { + // scan behind if we had something connected there and are moving away + rearvehicle->ABuScanObjects( 1, fMaxProximityDist ); + } + pVehicles[ 0 ]->ABuScanObjects( -1, scandistance ); + } + } +/* + pVehicles[ 0 ]->fScanDist = ( + mvOccupied->Vel > 5.0 ? + 400 + fBrakeDist : + 300.0 ); + pVehicles[ 0 ]->Update_scan(); + if( pVehicles[ 1 ] != pVehicles[ 0 ] ) { + pVehicles[ 1 ]->fScanDist = pVehicles[ 0 ]->fScanDist; + pVehicles[ 1 ]->Update_scan(); + } +*/ if (AIControllFlag) { // tu bedzie logika sterowania if (mvOccupied->CommandIn.Command != "") @@ -3586,13 +3605,15 @@ bool TController::UpdateSituation(double dt) } } } + switch (OrderList[OrderPos]) { // ustalenie prędkości przy doczepianiu i odczepianiu, dystansów w pozostałych przypadkach - case Connect: // podłączanie do składu - if (iDrivigFlags & moveConnect) - { // jeśli stanął już blisko, unikając zderzenia i można próbować podłączyć - fMinProximityDist = -0.01; - fMaxProximityDist = 0.0; //[m] dojechać maksymalnie + case Connect: { + // podłączanie do składu + if (iDrivigFlags & moveConnect) { + // jeśli stanął już blisko, unikając zderzenia i można próbować podłączyć + fMinProximityDist = -0.5; + fMaxProximityDist = 0.0; //[m] dojechać maksymalnie fVelPlus = 0.5; // dopuszczalne przekroczenie prędkości na ograniczeniu bez // hamowania fVelMinus = 0.5; // margines prędkości powodujący załączenie napędu @@ -3647,52 +3668,33 @@ bool TController::UpdateSituation(double dt) else SetVelocity(2.0, 0.0); // jazda w ustawionym kierunku z prędkością 2 (18s) } // if (AIControllFlag) //koniec zblokowania, bo była zmienna lokalna - /* //Ra 2014-02: lepiej tam, bo jak tam się odźwieży skład, to tu pVehicles[0] - będzie czymś innym - else - {//jeśli człowiek ma podłączyć, to czekamy na zmianę stanu sprzęgów na końcach - dotychczasowego składu - bool ok; //true gdy się podłączy (uzyskany sprzęg będzie zgodny z żądanym) - if (pVehicles[0]->DirectionGet()>0) //jeśli sprzęg 0 - ok=(pVehicles[0]->MoverParameters->Couplers[0].CouplingFlag>0); - //==iCoupler); //udało się? (mogło częściowo) - else //if (pVehicles[0]->MoverParameters->DirAbsolute<0) //jeśli sprzęg 1 - ok=(pVehicles[0]->MoverParameters->Couplers[1].CouplingFlag>0); - //==iCoupler); //udało się? (mogło częściowo) - if (ok) - {//jeżeli został podłączony - iDrivigFlags&=~moveConnect; //zdjęcie flagi doczepiania - JumpToNextOrder(); //wykonanie następnej komendy - } - } - */ } - else - { // jak daleko, to jazda jak dla Shunt na kolizję - fMinProximityDist = 0.0; + else { + // jak daleko, to jazda jak dla Shunt na kolizję + fMinProximityDist = 2.0; fMaxProximityDist = 5.0; //[m] w takim przedziale odległości powinien stanąć - fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez - // hamowania + fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania fVelMinus = 1.0; // margines prędkości powodujący załączenie napędu - // VelReduced=5; //[km/h] - // if (mvOccupied->Vel<0.5) //jeśli już prawie stanął - if (pVehicles[0]->fTrackBlock <= - 20.0) // przy zderzeniu fTrackBlock nie jest miarodajne - iDrivigFlags |= - moveConnect; // początek podczepiania, z wyłączeniem sprawdzania fTrackBlock + if( pVehicles[ 0 ]->fTrackBlock <= 20.0 ) { + // przy zderzeniu fTrackBlock nie jest miarodajne + // początek podczepiania, z wyłączeniem sprawdzania fTrackBlock + iDrivigFlags |= moveConnect; + } } break; - case Disconnect: // 20.07.03 - manewrowanie wagonami + } + case Disconnect: { + // 20.07.03 - manewrowanie wagonami fMinProximityDist = 1.0; fMaxProximityDist = 10.0; //[m] fVelPlus = 1.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania fVelMinus = 0.5; // margines prędkości powodujący załączenie napędu - if (AIControllFlag) - { - if (iVehicleCount >= 0) // jeśli była podana ilość wagonów - { - if (iDrivigFlags & movePress) // jeśli dociskanie w celu odczepienia - { // 3. faza odczepiania. + if (AIControllFlag) { + if (iVehicleCount >= 0) { + // jeśli była podana ilość wagonów + if (iDrivigFlags & movePress) { + // jeśli dociskanie w celu odczepienia + // 3. faza odczepiania. SetVelocity(2, 0); // jazda w ustawionym kierunku z prędkością 2 if ((mvControlling->MainCtrlPos > 0) || (mvOccupied->BrakeSystem == ElectroPneumatic)) // jeśli jazda @@ -3714,10 +3716,8 @@ bool TController::UpdateSituation(double dt) // if (p->GetTrack()->) //a nie stoi na torze warsztatowym // (ustalić po czym poznać taki tor) ++n; // to liczymy człony jako jeden - p->MoverParameters->BrakeReleaser( - 1); // wyluzuj pojazd, aby dało się dopychać - p->MoverParameters->BrakeLevelSet( - 0); // hamulec na zero, aby nie hamował + p->MoverParameters->BrakeReleaser(1); // wyluzuj pojazd, aby dało się dopychać + p->MoverParameters->BrakeLevelSet(0); // hamulec na zero, aby nie hamował if (n) { // jeśli jeszcze nie koniec p = p->Prev(); // kolejny w stronę czoła składu (licząc od @@ -3727,11 +3727,12 @@ bool TController::UpdateSituation(double dt) n = 0; // nie ma co dalej sprawdzać, doczepianie zakończone } } while (n--); - if (p ? p->MoverParameters->Couplers[d].CouplingFlag == 0 : true) + if( p ? p->MoverParameters->Couplers[ d ].CouplingFlag == coupling::faux : true ) { + // no target, or already just virtual coupling + WriteLog( mvOccupied->Name + " didn't find anything to disconnect." ); iVehicleCount = -2; // odczepiono, co było do odczepienia - else if (!p->Dettach(d)) // zwraca maskę bitową połączenia; usuwa - // własność pojazdów - { // tylko jeśli odepnie + } else if ( p->Dettach(d) == coupling::faux ) { + // tylko jeśli odepnie WriteLog( mvOccupied->Name + " odczepiony." ); iVehicleCount = -2; } // a jak nie, to dociskać dalej @@ -3750,15 +3751,14 @@ bool TController::UpdateSituation(double dt) // za radą yB ustawiamy pozycję 3 kranu (ruszanie kranem w innych miejscach // powino zostać wyłączone) // WriteLog("Zahamowanie składu"); - // while ((mvOccupied->BrakeCtrlPos>3)&&mvOccupied->DecBrakeLevel()); - // while ((mvOccupied->BrakeCtrlPos<3)&&mvOccupied->IncBrakeLevel()); mvOccupied->BrakeLevelSet(mvOccupied->BrakeSystem == ElectroPneumatic ? 1 : 3); - double p = mvOccupied->BrakePressureActual - .PipePressureVal; // tu może być 0 albo -1 nawet - if (p < 3.9) - p = 3.9; // TODO: zabezpieczenie przed dziwnymi CHK do czasu wyjaśnienia - // sensu 0 oraz -1 w tym miejscu + double p = mvOccupied->BrakePressureActual.PipePressureVal; + if( p < 3.9 ) { + // tu może być 0 albo -1 nawet + // TODO: zabezpieczenie przed dziwnymi CHK do czasu wyjaśnienia sensu 0 oraz -1 w tym miejscu + p = 3.9; + } if (mvOccupied->BrakeSystem == ElectroPneumatic ? mvOccupied->BrakePress > 2 : mvOccupied->PipePress < p + 0.1) @@ -3772,10 +3772,8 @@ bool TController::UpdateSituation(double dt) mvOccupied->BrakeReleaser(1); // wyluzuj lokomotywę; a ST45? mvOccupied->DecLocalBrakeLevel(10); // zwolnienie hamulca iDrivigFlags |= movePress; // następnie będzie dociskanie - DirectionForward(mvOccupied->ActiveDir < - 0); // zmiana kierunku jazdy na przeciwny (dociskanie) - CheckVehicles(); // od razu zmienić światła (zgasić) - bez tego się nie - // odczepi + DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na przeciwny (dociskanie) + CheckVehicles(); // od razu zmienić światła (zgasić) - bez tego się nie odczepi fStopTime = 0.0; // nie ma na co czekać z odczepianiem } } @@ -3787,8 +3785,7 @@ bool TController::UpdateSituation(double dt) if (!DecSpeed()) // jeśli już bardziej wyłączyć się nie da { // ponowna zmiana kierunku WriteLog( mvOccupied->Name + " ponowna zmiana kierunku" ); - DirectionForward(mvOccupied->ActiveDir < - 0); // zmiana kierunku jazdy na właściwy + DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na właściwy iDrivigFlags &= ~movePress; // koniec dociskania JumpToNextOrder(); // zmieni światła TableClear(); // skanowanie od nowa @@ -3798,63 +3795,58 @@ bool TController::UpdateSituation(double dt) } } break; - case Shunt: + } + case Shunt: { // na jaką odleglość i z jaką predkością ma podjechać - fMinProximityDist = 2.0; - fMaxProximityDist = 4.0; //[m] + fMinProximityDist = 5.0; + fMaxProximityDist = 10.0; //[m] fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania - fVelMinus = 3.0; // margines prędkości powodujący załączenie napędu - if (fVelMinus > 0.1 * fShuntVelocity) - fVelMinus = - 0.1 * - fShuntVelocity; // były problemy z jazdą np. 3km/h podczas ładowania wagonów + // margines prędkości powodujący załączenie napędu + // były problemy z jazdą np. 3km/h podczas ładowania wagonów + fVelMinus = std::min( 0.1 * fShuntVelocity, 3.0 ); break; - case Obey_train: + } + case Obey_train: { // na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody - if (mvOccupied->CategoryFlag & 1) // jeśli pociąg - { - fMinProximityDist = 10.0; + if( mvOccupied->CategoryFlag & 1 ) { + // jeśli pociąg + fMinProximityDist = 15.0; fMaxProximityDist = - (mvOccupied->Vel > 0.0) ? - 20.0 : + ( mvOccupied->Vel > 0.0 ) ? + 25.0 : 50.0; //[m] jak stanie za daleko, to niech nie dociąga paru metrów - if (iDrivigFlags & moveLate) - { - fVelMinus = 1.0; // jeśli spóźniony, to gna - fVelPlus = - 5.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + if( iDrivigFlags & moveLate ) { + // jeśli spóźniony, to gna + fVelMinus = 1.0; + // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + fVelPlus = 5.0; } - else - { // gdy nie musi się sprężać - fVelMinus = - int(0.05 * VelDesired); // margines prędkości powodujący załączenie napędu - if (fVelMinus > 5.0) - fVelMinus = 5.0; - else if (fVelMinus < 1.0) - fVelMinus = 1.0; //żeby nie ruszał przy 0.1 - fVelPlus = int( - 0.5 + - 0.05 * VelDesired); // normalnie dopuszczalne przekroczenie to 5% prędkości - if (fVelPlus > 5.0) - fVelPlus = 5.0; // ale nie więcej niż 5km/h + else { + // gdy nie musi się sprężać + // margines prędkości powodujący załączenie napędu; min 1.0 żeby nie ruszał przy 0.1 + fVelMinus = clamp( std::round( 0.05 * VelDesired ), 1.0, 5.0 ); + // normalnie dopuszczalne przekroczenie to 5% prędkości ale nie więcej niż 5km/h + fVelPlus = std::min( 5.0, std::ceil( 0.05 * VelDesired ) ); } } - else // samochod (sokista też) - { - fMinProximityDist = 7.0; - fMaxProximityDist = 10.0; //[m] - fVelPlus = - 10.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania - fVelMinus = 2.0; // margines prędkości powodujący załączenie napędu + else { + // samochod (sokista też) + fMinProximityDist = std::max( 4.0, mvOccupied->Vel * 0.2 ); + fMaxProximityDist = std::max( 8.0, mvOccupied->Vel * 0.375 ); //[m] + // margines prędkości powodujący załączenie napędu + fVelMinus = 2.0; + // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + fVelPlus = std::min( 10.0, mvOccupied->Vel * 0.1 ); } - // VelReduced=4; //[km/h] break; - default: + } + default: { fMinProximityDist = 0.01; fMaxProximityDist = 2.0; //[m] fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania fVelMinus = 5.0; // margines prędkości powodujący załączenie napędu - } // switch + } + } // switch OrderList[OrderPos] switch (OrderList[OrderPos]) { // co robi maszynista @@ -3889,25 +3881,6 @@ bool TController::UpdateSituation(double dt) #endif break; case Wait_for_orders: // jeśli czeka, też ma skanować, żeby odpalić się od semafora - /* - if ((mvOccupied->ActiveDir!=0)) - {//jeśli jest wybrany kierunek jazdy, można ustalić prędkość jazdy - VelDesired=fVelMax; //wstępnie prędkość maksymalna dla pojazdu(-ów), będzie następnie - ograniczana - SetDriverPsyche(); //ustawia AccPreferred (potrzebne tu?) - //Ra: odczyt (ActualProximityDist), (VelNext) i (AccPreferred) z tabelki prędkosci - AccDesired=AccPreferred; //AccPreferred wynika z osobowości mechanika - VelNext=VelDesired; //maksymalna prędkość wynikająca z innych czynników niż - trajektoria ruchu - ActualProximityDist=scanmax; //funkcja Update() może pozostawić wartości bez zmian - //hm, kiedyś semafory wysyłały SetVelocity albo ShuntVelocity i ustawły tak VelSignal - - a teraz jak to zrobić? - TCommandType - comm=TableUpdate(mvOccupied->Vel,VelDesired,ActualProximityDist,VelNext,AccDesired); - //szukanie optymalnych wartości - } - */ - // break; case Shunt: case Obey_train: case Connect: @@ -3918,17 +3891,21 @@ bool TController::UpdateSituation(double dt) if (OrderList[OrderPos] != Obey_train) // spokojne manewry { VelSignal = Global::Min0RSpeed(VelSignal, 40); // jeśli manewry, to ograniczamy prędkość - if (AIControllFlag) - { // to poniżej tylko dla AI - if (iVehicleCount >= 0) // jeśli jest co odczepić - if (!(iDrivigFlags & movePress)) - if (mvOccupied->Vel > 0.0) - if (!iCoupler) // jeśli nie ma wcześniej potrzeby podczepienia - { - SetVelocity(0, 0, stopJoin); // 1. faza odczepiania: zatrzymanie - // WriteLog("Zatrzymanie w celu odczepienia"); - } + + // NOTE: this section should be moved to disconnect or plain removed, but it seems to be (mis)used by some scenarios + // to keep vehicle idling without moving :| + if( ( true == AIControllFlag ) + && ( iVehicleCount >= 0 ) + && ( false == TestFlag( iDrivigFlags, movePress ) ) + && ( iCoupler == 0 ) +// && ( mvOccupied->Vel > 0.0 ) + && ( pVehicle->PrevConnected == nullptr ) + && ( pVehicle->NextConnected == nullptr ) ) { + SetVelocity(0, 0, stopJoin); // 1. faza odczepiania: zatrzymanie + // WriteLog("Zatrzymanie w celu odczepienia"); + AccPreferred = std::min( 0.0, AccPreferred ); } + } else SetDriverPsyche(); // Ra: było w PrepareEngine(), potrzebne tu? @@ -3978,9 +3955,10 @@ bool TController::UpdateSituation(double dt) SetVelocity(-1, -1); // jak się nastał, to niech jedzie WaitingTime = 0.0; } - else - SetVelocity(-1, - -1); // użytkownikowi pozwalamy jechać (samochodem?) + else { + // użytkownikowi pozwalamy jechać (samochodem?) + SetVelocity( -1, -1 ); + } } } else if ((VelSignal == 0.0) && (VelNext > 0.0) && (mvOccupied->Vel < 1.0)) @@ -3990,58 +3968,42 @@ bool TController::UpdateSituation(double dt) // manewrowym !!!! SetVelocity(VelNext, VelNext, stopSem); // omijanie SBL } // koniec samoistnego odjeżdżania - if (AIControllFlag) - if ((HelpMeFlag) || (mvControlling->DamageFlag > 0)) - { + + if( ( true == AIControllFlag ) + && ( ( true == HelpMeFlag ) + || ( mvControlling->DamageFlag > 0 ) ) ) { HelpMeFlag = false; - /* - if (WriteLogFlag) - with Controlling do - { - append(AIlogFile); - writeln(AILogFile,ElapsedTime:5:2,": ",Name," HelpMe! - (",DamageFlag,")"); - close(AILogFile); - } - */ - } - if (AIControllFlag) - if (OrderList[OrderPos] & - Change_direction) // może być zmieszane z jeszcze jakąś komendą - { // sprobuj zmienic kierunek - SetVelocity(0, 0, stopDir); // najpierw trzeba się zatrzymać - if (mvOccupied->Vel < 0.1) - { // jeśli się zatrzymał, to zmieniamy kierunek jazdy, a nawet kabinę/człon - Activation(); // ustawienie zadanego wcześniej kierunku i ewentualne - // przemieszczenie AI - PrepareEngine(); - JumpToNextOrder(); // następnie robimy, co jest do zrobienia (Shunt albo - // Obey_train) - if (OrderList[OrderPos] & (Shunt | Connect)) // jeśli dalej mamy manewry - if ((iDrivigFlags & moveStopHere) == 0) // o ile nie stać w miejscu - { // jechać od razu w przeciwną stronę i nie trąbić z tego tytułu - iDrivigFlags &= ~moveStartHorn; // bez trąbienia przed ruszeniem - SetVelocity(fShuntVelocity, fShuntVelocity); // to od razu jedziemy - } - // iDrivigFlags|=moveStartHorn; //a później już można trąbić - /* - if (WriteLogFlag) - { - append(AIlogFile); - writeln(AILogFile,ElapsedTime:5:2,": ",Name," Direction changed!"); - close(AILogFile); - } - */ + } + + if( ( true == AIControllFlag) + && ( true == TestFlag( OrderList[ OrderPos ], Change_direction ) ) ) { + // sprobuj zmienic kierunek (może być zmieszane z jeszcze jakąś komendą) + SetVelocity( 0, 0, stopDir ); // najpierw trzeba się zatrzymać + if( mvOccupied->Vel < 0.1 ) { + // jeśli się zatrzymał, to zmieniamy kierunek jazdy, a nawet kabinę/człon + Activation(); // ustawienie zadanego wcześniej kierunku i ewentualne przemieszczenie AI + PrepareEngine(); + JumpToNextOrder(); // następnie robimy, co jest do zrobienia (Shunt albo Obey_train) + if( OrderList[ OrderPos ] & ( Shunt | Connect ) ) { + // jeśli dalej mamy manewry + if( false == TestFlag( iDrivigFlags, moveStopHere ) ) { + // o ile nie ma stać w miejscu, + // jechać od razu w przeciwną stronę i nie trąbić z tego tytułu: + iDrivigFlags &= ~moveStartHorn; + SetVelocity( fShuntVelocity, fShuntVelocity ); + } } - // else - // VelSignal:=0.0; //na wszelki wypadek niech zahamuje - } // Change_direction (tylko dla AI) + } + } // Change_direction (tylko dla AI) + + if( ( true == AIControllFlag ) + && ( iEngineActive == 0 ) + && ( OrderList[ OrderPos ] & ( Change_direction | Connect | Disconnect | Shunt | Obey_train ) ) ) { + // jeśli coś ma robić to niech odpala do skutku + PrepareEngine(); + } + // ustalanie zadanej predkosci - if (AIControllFlag) // jeśli prowadzi AI - if (!iEngineActive) // jeśli silnik nie odpalony, to próbować naprawić - if (OrderList[OrderPos] & (Change_direction | Connect | Disconnect | Shunt | - Obey_train)) // jeśli coś ma robić - PrepareEngine(); // to niech odpala do skutku if (iDrivigFlags & moveActive) // jeśli może skanować sygnały i reagować na komendy { // jeśli jest wybrany kierunek jazdy, można ustalić prędkość jazdy // Ra: tu by jeszcze trzeba było wstawić uzależnienie (VelDesired) od odległości od @@ -4056,16 +4018,10 @@ bool TController::UpdateSituation(double dt) SetDriverPsyche(); // ustawia AccPreferred (potrzebne tu?) // Ra: odczyt (ActualProximityDist), (VelNext) i (AccPreferred) z tabelki prędkosci AccDesired = AccPreferred; // AccPreferred wynika z osobowości mechanika - VelNext = VelDesired; // maksymalna prędkość wynikająca z innych czynników niż - // trajektoria ruchu - ActualProximityDist = scanmax; // funkcja Update() może pozostawić wartości bez - // zmian - // hm, kiedyś semafory wysyłały SetVelocity albo ShuntVelocity i ustawły tak - // VelSignal - a teraz jak to zrobić? - TCommandType comm = TableUpdate(VelDesired, ActualProximityDist, VelNext, - AccDesired); // szukanie optymalnych wartości - // if (VelSignal!=VelDesired) //jeżeli prędkość zalecana jest inna (ale tryb też - // może być inny) + VelNext = VelDesired; // maksymalna prędkość wynikająca z innych czynników niż trajektoria ruchu + ActualProximityDist = scanmax; // funkcja Update() może pozostawić wartości bez zmian + // szukanie optymalnych wartości + TCommandType comm = TableUpdate(VelDesired, ActualProximityDist, VelNext, AccDesired); switch (comm) { // ustawienie VelSignal - trochę proteza = do przemyślenia case cm_Ready: // W4 zezwolił na jazdę @@ -4143,111 +4099,86 @@ bool TController::UpdateSituation(double dt) vel = -vel; // ujemna, gdy jedzie w przeciwną stronę, niż powinien if (VelDesired < 0.0) VelDesired = fVelMax; // bo VelDesired<0 oznacza prędkość maksymalną + // Ra: jazda na widoczność - if (pVehicles[0]->fTrackBlock < 1000.0) // przy 300m stał z zapamiętaną kolizją - { // Ra 2F3F: przy jeździe pociągowej nie powinien dojeżdżać do poprzedzającego - // składu - if ((mvOccupied->CategoryFlag & 1) ? - ((OrderCurrentGet() & (Connect | Obey_train)) == Obey_train) : - false) // jeśli jesteśmy pociągiem a jazda pociągowa i nie ściąganie ze - // szlaku - { - pVehicles[0]->ABuScanObjects(pVehicles[0]->DirectionGet(), - 1000.0); // skanowanie sprawdzające - // Ra 2F3F: i jest problem, jak droga za semaforem kieruje na jakiś pojazd - // (np. w Skwarkach na ET22) - if (pVehicles[0]->fTrackBlock < 1000.0) // i jeśli nadal coś jest - if (VelNext != 0.0) // a następny sygnał zezwala na jazdę - if (pVehicles[0]->fTrackBlock < - ActualProximityDist) // i jest bliżej (tu by trzeba było wstawić - // odległość do semafora, z pominięciem SBL - VelDesired = 0.0; // to stoimy - } - else - pVehicles[0]->ABuScanObjects(pVehicles[0]->DirectionGet(), - 300.0); // skanowanie sprawdzające - } - // if (mvOccupied->Vel>=0.1) //o ile jedziemy; jak stoimy to też trzeba jakoś - // zatrzymywać +/* + // condition disabled, it'd prevent setting reduced acceleration in the last connect stage if ((iDrivigFlags & moveConnect) == 0) // przy końcówce podłączania nie hamować +*/ { // sprawdzenie jazdy na widoczność - TCoupling *c = - pVehicles[0]->MoverParameters->Couplers + - (pVehicles[0]->DirectionGet() > 0 ? 0 : 1); // sprzęg z przodu składu - if (c->Connected) // a mamy coś z przodu - if (c->CouplingFlag == - 0) // jeśli to coś jest podłączone sprzęgiem wirtualnym - { // wyliczanie optymalnego przyspieszenia do jazdy na widoczność - double k = c->Connected->Vel; // prędkość pojazdu z przodu (zakładając, - // że jedzie w tę samą stronę!!!) - if (k < vel + 10) // porównanie modułów prędkości [km/h] - { // zatroszczyć się trzeba, jeśli tamten nie jedzie znacząco szybciej - double d = - pVehicles[0]->fTrackBlock - 0.5 * vel - - fMaxProximityDist; // odległość bezpieczna zależy od prędkości - if (d < 0) // jeśli odległość jest zbyt mała - { // AccPreferred=-0.9; //hamowanie maksymalne, bo jest za blisko - if (k < 10.0) // k - prędkość tego z przodu - { // jeśli tamten porusza się z niewielką prędkością albo stoi - if (OrderCurrentGet() & Connect) - { // jeśli spinanie, to jechać dalej - AccPreferred = 0.2; // nie hamuj - VelNext = VelDesired = 2.0; // i pakuj się na tamtego - } - else // a normalnie to hamować - { - AccPreferred = -1.0; // to hamuj maksymalnie - VelNext = VelDesired = 0.0; // i nie pakuj się na - // tamtego + auto const vehicle = pVehicles[ 0 ]; // base calculactions off relevant end of the consist + auto const coupler = + vehicle->MoverParameters->Couplers + ( + vehicle->DirectionGet() > 0 ? + 0 : + 1 ); // sprzęg z przodu składu + if( ( coupler->Connected ) + && ( coupler->CouplingFlag == 0 ) ) { + // mamy coś z przodu podłączone sprzęgiem wirtualnym + // wyliczanie optymalnego przyspieszenia do jazdy na widoczność + ActualProximityDist = std::min( + ActualProximityDist, + vehicle->fTrackBlock - ( + mvOccupied->CategoryFlag & 2 ? + fMinProximityDist : // cars can bunch up tighter + fMaxProximityDist ) ); // other vehicle types less so + double k = coupler->Connected->Vel; // prędkość pojazdu z przodu (zakładając, + // że jedzie w tę samą stronę!!!) + if( k < vel + 10 ) { + // porównanie modułów prędkości [km/h] + // zatroszczyć się trzeba, jeśli tamten nie jedzie znacząco szybciej + double const distance = vehicle->fTrackBlock - fMaxProximityDist - ( fBrakeDist * 1.15 ); // odległość bezpieczna zależy od prędkości + if( distance < 0 ) { + // jeśli odległość jest zbyt mała + if( k < 10.0 ) // k - prędkość tego z przodu + { // jeśli tamten porusza się z niewielką prędkością albo stoi + if( OrderCurrentGet() & Connect ) { + // jeśli spinanie, to jechać dalej + AccPreferred = std::min( 0.25, AccPreferred ); // nie hamuj + VelDesired = Global::Min0RSpeed( 20.0, VelDesired ); + VelNext = 2.0; // i pakuj się na tamtego + } + else { + // a normalnie to hamować + VelNext = 0.0; + if( vehicle->fTrackBlock <= fMinProximityDist ) { + VelDesired = 0.0; } } - else // jeśli oba jadą, to przyhamuj lekko i ogranicz prędkość - { - if (k < vel) // jak tamten jedzie wolniej - if (d < fBrakeDist) // a jest w drodze hamowania - { - if (AccPreferred > fAccThreshold) - AccPreferred = - fAccThreshold; // to przyhamuj troszkę - VelNext = VelDesired = int(k); // to chyba już sobie - // dohamuje według - // uznania - } - } - ReactionTime = 0.1; // orientuj się, bo jest goraco } - else - { // jeśli odległość jest większa, ustalić maksymalne możliwe - // przyspieszenie (hamowanie) - k = (k * k - vel * vel) / (25.92 * d); // energia kinetyczna - // dzielona przez masę i - // drogę daje - // przyspieszenie - if (k > 0.0) - k *= 1.5; // jedź szybciej, jeśli możesz - // double ak=(c->Connected->V>0?1.0:-1.0)*c->Connected->AccS; - // //przyspieszenie tamtego - if (d < fBrakeDist) // a jest w drodze hamowania - if (k < AccPreferred) - { // jeśli nie ma innych powodów do wolniejszej jazdy - AccPreferred = k; - if (VelNext > c->Connected->Vel) - { - VelNext = - c->Connected - ->Vel; // ograniczenie do prędkości tamtego - ActualProximityDist = - d; // i odległość od tamtego jest istotniejsza - } - ReactionTime = 0.2; // zwiększ czujność + else { + // jeśli oba jadą, to przyhamuj lekko i ogranicz prędkość + if( vehicle->fTrackBlock < ( + mvOccupied->CategoryFlag & 2 ? + fMaxProximityDist + 0.5 * vel : // cars + 2.0 * fMaxProximityDist + 2.0 * vel ) ) { //others + // jak tamten jedzie wolniej a jest w drodze hamowania + AccPreferred = std::min( -0.9, AccPreferred ); + VelNext = Global::Min0RSpeed( std::round( k ) - 5.0, VelDesired ); + if( vehicle->fTrackBlock <= ( + mvOccupied->CategoryFlag & 2 ? + fMaxProximityDist : // cars + 2.0 * fMaxProximityDist ) ) { //others + // try to force speed change if obstacle is really close + VelDesired = VelNext; } -#if LOGVELOCITY - WriteLog("Collision: AccPreferred=" + AnsiString(k)); -#endif + } + } + ReactionTime = ( + vel != 0.0 ? + 0.1 : // orientuj się, bo jest goraco + 2.0 ); // we're already standing still, so take it easy + } + else { + if( OrderCurrentGet() & Connect ) { + // if there's something nearby in the connect mode don't speed up too much + VelDesired = Global::Min0RSpeed( 20.0, VelDesired ); } } } + } } + // sprawdzamy możliwe ograniczenia prędkości if (OrderCurrentGet() & (Shunt | Obey_train)) // w Connect nie, bo moveStopHere // odnosi się do stanu po połączeniu @@ -4280,13 +4211,12 @@ bool TController::UpdateSituation(double dt) TrainParams ->TTVmax); // jesli nie spozniony to nie przekraczać rozkladowej if (VelDesired > 0.0) - if( ( ( SemNextIndex != -1 ) + if( ( ( iDrivigFlags & moveStopHere ) == 0 ) + || ( ( SemNextIndex != -1 ) && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) - && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) - || ( ( iDrivigFlags & moveStopHere ) == 0 ) ) - { // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w + && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) ) { + // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w // składzie, jeśli nie mamy czekać na sygnał też trzeba odpalić - if (iDrivigFlags & moveGuardSignal) { // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas // stania @@ -4304,21 +4234,20 @@ bool TController::UpdateSituation(double dt) // pobliżu, a drugi radiowy, słyszalny w innych lokomotywach // na razie zakładam, że to nie jest dźwięk radiowy, bo trzeba by zrobić // obsługę kanałów radiowych itd. - if (!iGuardRadio) // jeśli nie przez radio - tsGuardSignal->Play( - 1.0, 0, !FreeFlyModeFlag, - pVehicle->GetPosition()); // dla true jest głośniej - else + if( !iGuardRadio ) { + // jeśli nie przez radio + tsGuardSignal->Play( 1.0, 0, !FreeFlyModeFlag, pVehicle->GetPosition() ); // dla true jest głośniej + } + else { // if (iGuardRadio==iRadioChannel) //zgodność kanału // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu // (albo może mieć radio przenośne) - kierownik mógłby powtarzać // przy braku reakcji - if (SquareMagnitude(pVehicle->GetPosition() - - Global::pCameraPosition) < - 2000 * 2000) // w odległości mniejszej niż 2km - tsGuardSignal->Play( - 1.0, 0, true, - pVehicle->GetPosition()); // dźwięk niby przez radio + if( SquareMagnitude( pVehicle->GetPosition() - Global::pCameraPosition ) < 2000 * 2000 ) { + // w odległości mniejszej niż 2km + tsGuardSignal->Play( 1.0, 0, true, pVehicle->GetPosition() ); // dźwięk niby przez radio + } + } } } if (mvOccupied->V == 0.0) @@ -4389,7 +4318,7 @@ bool TController::UpdateSituation(double dt) { // AccDesired=0.0; AccDesired = 0.01; // proteza trochę: to } - else if (ActualProximityDist*25.92*fBrake_a0[0] > 2*vel*vel) + else if( (mvControlling->CategoryFlag == 1) && (ActualProximityDist*25.92*fBrake_a0[0] > 2*vel*vel)) { // jeśli ma stanąć, a mieści się w drodze hamowania AccDesired = AccPreferred; } @@ -4420,20 +4349,16 @@ bool TController::UpdateSituation(double dt) AccDesired = 0.0; } else // 25.92 (=3.6*3.6*2) - przelicznik z km/h na m/s - // niech nie hamuje, - // chyba że coś z - // przodu + // niech nie hamuje, chyba że coś z przodu AccDesired = -(vel * vel) / (25.92 * (ActualProximityDist + 0.1-0.5*(fMinProximityDist+fMaxProximityDist))); //-fMinProximityDist));//-0.1; - ////mniejsze opóźnienie przy - // małej różnicy + ////mniejsze opóźnienie przy małej różnicy ReactionTime = 0.1; // i orientuj się szybciej, jak masz stanąć } else if (vel < VelNext + fVelPlus) // jeśli niewielkie // przekroczenie, ale ma jechać - AccDesired = - Min0R(0.0, AccPreferred); // to olej (zacznij luzować) + AccDesired = std::min( 0.0, AccPreferred ); // to olej (zacznij luzować) else { // jeśli większe przekroczenie niż fVelPlus [km/h], ale ma jechać // Ra 2F1I: jak było (VelNext+fVelPlus) tu, to hamował zbyt @@ -4471,7 +4396,7 @@ bool TController::UpdateSituation(double dt) } else { // jest bliżej niż fMinProximityDist - VelDesired = std::min( VelDesired, VelNext ); // utrzymuj predkosc bo juz blisko + VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); // utrzymuj predkosc bo juz blisko if( vel < VelNext + fVelPlus ) { // jeśli niewielkie przekroczenie, ale ma jechać AccDesired = std::min( 0.0, AccPreferred ); // to olej (zacznij luzować) @@ -4487,10 +4412,19 @@ bool TController::UpdateSituation(double dt) } else { // jeśli daleko jechać nie można - if( ActualProximityDist > fMaxProximityDist ) { + if( ActualProximityDist > ( + mvOccupied->CategoryFlag & 2 ? + fMinProximityDist : // cars + fMaxProximityDist ) ) { // trains and others // ale ma kawałek do sygnalizatora - if( AccPreferred > 0 ) { AccDesired = AccPreferred; } // dociagnij do semafora; - else { VelDesired = 0.0; } //stoj + if( AccPreferred > 0.0 ) { + // dociagnij do semafora; + AccDesired = AccPreferred; + } + else { + //stoj + VelDesired = 0.0; + } } else { // VelNext=0 i stoi bliżej niż fMaxProximityDist @@ -4527,6 +4461,8 @@ bool TController::UpdateSituation(double dt) // koniec wybiegu i hamowania } #endif // DEBUGFAC + // last step sanity check, until the whole calculation is straightened out + AccDesired = std::min( AccDesired, AccPreferred ); if (AIControllFlag) { // część wykonawcza tylko dla AI, dla człowieka jedynie napisy @@ -4562,46 +4498,48 @@ bool TController::UpdateSituation(double dt) SetDriverPsyche(); } } - if (-AccDesired * BrakeAccFactor() < ((fReady > 0.4)||(VelNext>vel-40.0) ? fBrake_a0[0]*0.8 : -fAccThreshold)) - AccDesired = std::max(-0.06, AccDesired); - else - ReactionTime = 0.25; // i orientuj się szybciej, jeśli hamujesz + // NOTE: stop-gap measure, effect limited to trains only while car calculations seem off + if( mvControlling->CategoryFlag == 1 ) { + if( -AccDesired * BrakeAccFactor() < ( ( fReady > 0.4 ) || ( VelNext > vel - 40.0 ) ? fBrake_a0[ 0 ] * 0.8 : -fAccThreshold ) ) + AccDesired = std::max( -0.06, AccDesired ); + else + ReactionTime = 0.25; // i orientuj się szybciej, jeśli hamujesz + } if (mvOccupied->BrakeSystem == Pneumatic) // napełnianie uderzeniowe if (mvOccupied->BrakeHandle == FV4a) { - if (mvOccupied->BrakeCtrlPos == -2) - mvOccupied->BrakeLevelSet(0); - // if - // ((mvOccupied->BrakeCtrlPos<0)&&(mvOccupied->PipeBrakePress<0.01))//{(CntrlPipePress-(Volume/BrakeVVolume/10)<0.01)}) - // mvOccupied->IncBrakeLevel(); - if ((mvOccupied->PipePress < 3.0) && (AccDesired > -0.03)) - mvOccupied->BrakeReleaser(1); - if ((mvOccupied->BrakeCtrlPos == 0) && (AbsAccS < 0.0) && - (AccDesired > -0.03)) - // if FuzzyLogicAI(CntrlPipePress-PipePress,0.01,1)) - // if - // ((mvOccupied->BrakePress>0.5)&&(mvOccupied->LocalBrakePos<0.5))//{((Volume/BrakeVVolume/10)<0.485)}) - if ((mvOccupied->EqvtPipePress < 4.95) && - (fReady > 0.35)) //{((Volume/BrakeVVolume/10)<0.485)}) - { - if (iDrivigFlags & - moveOerlikons) // a reszta składu jest na to gotowa - mvOccupied->BrakeLevelSet(-1); // napełnianie w Oerlikonie + if( mvOccupied->BrakeCtrlPos == -2 ) { + mvOccupied->BrakeLevelSet( 0 ); + } + if( ( mvOccupied->PipePress < 3.0 ) + && ( AccDesired > -0.03 ) ) { + mvOccupied->BrakeReleaser( 1 ); + } + if( ( mvOccupied->BrakeCtrlPos == 0 ) + && ( AbsAccS < 0.0 ) + && ( AccDesired > -0.03 ) ) { + + if( ( mvOccupied->EqvtPipePress < 4.95 ) + && ( fReady > 0.35 ) ) { // a reszta składu jest na to gotowa + + if( iDrivigFlags & moveOerlikons ) { + // napełnianie w Oerlikonie + mvOccupied->BrakeLevelSet( -1 ); + } } - else if (Need_BrakeRelease) - { + else if( Need_BrakeRelease ) { Need_BrakeRelease = false; - mvOccupied->BrakeReleaser(1); - // DecBrakeLevel(); //z tym by jeszcze miało jakiś sens + mvOccupied->BrakeReleaser( 1 ); } - // if - // ((mvOccupied->BrakeCtrlPos<0)&&(mvOccupied->BrakePress<0.3))//{(CntrlPipePress-(Volume/BrakeVVolume/10)<0.01)}) - if ((mvOccupied->BrakeCtrlPos < 0) && - (mvOccupied->EqvtPipePress > - (fReady < 0.25 ? - 5.1 : - 5.2))) //{(CntrlPipePress-(Volume/BrakeVVolume/10)<0.01)}) - mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_RP)); + } + + if( ( mvOccupied->BrakeCtrlPos < 0 ) + && ( mvOccupied->EqvtPipePress > ( + fReady < 0.25 ? + 5.1 : + 5.2 ) ) ) { + mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_RP ) ); + } } #if LOGVELOCITY WriteLog("Dist=" + FloatToStrF(ActualProximityDist, ffFixed, 7, 1) + @@ -4610,13 +4548,15 @@ bool TController::UpdateSituation(double dt) ", VelSignal=" + AnsiString(VelSignal) + ", VelNext=" + AnsiString(VelNext)); #endif - if (AccDesired > 0.1) - if (vel < 10.0) // Ra 2F1H: jeśli prędkość jest mała, a można przyspieszać, - // to nie ograniczać przyspieszenia do 0.5m/ss - AccDesired = 0.9; // przy małych prędkościach może być trudno utrzymać + if( ( vel < 10.0 ) + && ( AccDesired > 0.1 ) ) { + // Ra 2F1H: jeśli prędkość jest mała, a można przyspieszać, + // to nie ograniczać przyspieszenia do 0.5m/ss + // przy małych prędkościach może być trudno utrzymać + AccDesired = std::max( 0.9, AccDesired ); + } // małe przyspieszenie - // Ra 2F1I: wyłączyć kiedyś to uśrednianie i przeanalizować skanowanie, czemu - // migocze + // Ra 2F1I: wyłączyć kiedyś to uśrednianie i przeanalizować skanowanie, czemu migocze if (AccDesired > -0.15) // hamowania lepeiej nie uśredniać AccDesired = fAccDesiredAv = 0.2 * AccDesired + @@ -4675,79 +4615,58 @@ bool TController::UpdateSituation(double dt) // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz if( vel < VelDesired - fVelMinus ) { // jeśli prędkość w kierunku czoła jest mniejsza od dozwolonej o margines - if( ( ActualProximityDist > fMaxProximityDist ? - true : - vel < VelNext ) ) { + if( ( ActualProximityDist > ( + mvOccupied->CategoryFlag & 2 ? + fMinProximityDist : // cars are allowed to move within min proximity distance + fMaxProximityDist ) ? // other vehicle types keep wider margin + true : + vel < VelNext ) ) { // to można przyspieszyć IncSpeed(); } } } - // if ((AbsAccS0) and - // (EngineType=ElectricSeriesMotor) - // and (RList[MainCtrlPos].R>0.0) and (not DelayCtrlFlag)) - // if (ImTrainType & - dt_EZT) // właściwie, to warunek powinien być na działający EP - { // Ra: to dobrze hamuje EP w EZT - if ((AccDesired <= fAccThreshold) ? // jeśli hamować - u góry ustawia się - // hamowanie na fAccThreshold - ((AbsAccS > AccDesired) || (mvOccupied->BrakeCtrlPos < 0)) : - false) // hamować bardziej, gdy aktualne opóźnienie hamowania - // mniejsze niż (AccDesired) + if( mvOccupied->TrainType & dt_EZT ) { + // właściwie, to warunek powinien być na działający EP + // Ra: to dobrze hamuje EP w EZT + if( ( AccDesired <= fAccThreshold ) // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold + && ( ( AbsAccS > AccDesired ) + || ( mvOccupied->BrakeCtrlPos < 0 ) ) ) { + // hamować bardziej, gdy aktualne opóźnienie hamowania mniejsze niż (AccDesired) IncBrake(); - else if (OrderList[OrderPos] != - Disconnect) // przy odłączaniu nie zwalniamy tu hamulca - if (AbsAccS < - AccDesired - - 0.05) // jeśli opóźnienie większe od wymaganego (z histerezą) - { // luzowanie, gdy za dużo - if (mvOccupied->BrakeCtrlPos >= 0) + } + else if( OrderList[ OrderPos ] != Disconnect ) { + // przy odłączaniu nie zwalniamy tu hamulca + if( AbsAccS < AccDesired - 0.05 ) { + // jeśli opóźnienie większe od wymaganego (z histerezą) luzowanie, gdy za dużo + if( mvOccupied->BrakeCtrlPos >= 0 ) { DecBrake(); // tutaj zmniejszało o 1 przy odczepianiu + } } - else if (mvOccupied->Handle->TimeEP) - { - if (mvOccupied->Handle->GetPos(bh_EPR) - - mvOccupied->Handle->GetPos(bh_EPN) < - 0.1) - mvOccupied->SwitchEPBrake(0); - else - mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_EPN)); - } - // else if (mvOccupied->BrakeCtrlPos<0) IncBrake(); //ustawienie - // jazdy (pozycja 0) - // else if (mvOccupied->BrakeCtrlPos>0) DecBrake(); - } - else - { // a stara wersja w miarę dobrze działa na składy wagonowe - // if (mvOccupied->Handle->Time) - // mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_MB)); - // //najwyzej sobie przestawi - if (((fAccGravity < -0.05) && (vel < 0)) || - ((AccDesired < fAccGravity - 0.1) && - (AbsAccS > - AccDesired + fBrake_a1[0]))) // u góry ustawia się hamowanie na fAccThreshold - // if not MinVelFlag) - if (fBrakeTime < 0 ? true : (AccDesired < fAccGravity - 0.3) || - (mvOccupied->BrakeCtrlPos <= 0)) - if( false == IncBrake() ) { - // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował - MinVelFlag = true; + else if( mvOccupied->Handle->TimeEP ) { + if( mvOccupied->Handle->GetPos( bh_EPR ) - + mvOccupied->Handle->GetPos( bh_EPN ) < + 0.1 ) { + mvOccupied->SwitchEPBrake( 0 ); } else { - MinVelFlag = false; + mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_EPN ) ); + } + } + } // order != disconnect + } // type & dt_ezt + else { + // a stara wersja w miarę dobrze działa na składy wagonowe + if( ( ( fAccGravity < -0.05 ) && ( vel < 0.0 ) ) + || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { + // u góry ustawia się hamowanie na fAccThreshold + if( ( fBrakeTime < 0.0 ) + || ( AccDesired < fAccGravity - 0.3 ) + || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { + // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował + if( true == IncBrake() ) { fBrakeTime = 3.0 + 0.5 * ( ( @@ -4758,11 +4677,10 @@ bool TController::UpdateSituation(double dt) // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } - if ((AccDesired < fAccGravity - 0.05) && (AbsAccS < AccDesired - fBrake_a1[0]*0.51)) - // if ((AccDesired<0.0)&&(AbsAccSBrakeDelayFlag > bdelay_G ? - mvOccupied->BrakeDelay[ 0 ] : - mvOccupied->BrakeDelay[ 2 ] ) + mvOccupied->BrakeDelay[ 0 ] : + mvOccupied->BrakeDelay[ 2 ] ) / 3.0; fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } + // stop-gap measure to ensure cars actually brake to stop even when above calculactions go awry + // instead of releasing the brakes and creeping into obstacle at 1-2 km/h + if( mvControlling->CategoryFlag == 2 ) { + if( ( VelDesired == 0.0 ) + && ( vel > VelDesired ) + && ( ActualProximityDist <= fMinProximityDist ) + && ( mvOccupied->LocalBrakePos == 0 ) ) { + IncBrake(); + } + } } // Mietek-end1 SpeedSet(); // ciągla regulacja prędkości @@ -4782,33 +4710,22 @@ bool TController::UpdateSituation(double dt) WriteLog("BrakePos=" + AnsiString(mvOccupied->BrakeCtrlPos) + ", MainCtrl=" + AnsiString(mvControlling->MainCtrlPos)); #endif - - /* //Ra: mamy teraz wskażnik na człon silnikowy, gorzej jak są dwa w - ukrotnieniu... - //zapobieganie poslizgowi w czlonie silnikowym; Ra: Couplers[1] powinno - być - if (Controlling->Couplers[0].Connected!=NULL) - if (TestFlag(Controlling->Couplers[0].CouplingFlag,ctrain_controll)) - if (Controlling->Couplers[0].Connected->SlippingWheels) - if (Controlling->ScndCtrlPos>0?!Controlling->DecScndCtrl(1):true) - { - if (!Controlling->DecMainCtrl(1)) - if (mvOccupied->BrakeCtrlPos==mvOccupied->BrakeCtrlPosNo) - mvOccupied->DecBrakeLevel(); - ++iDriverFailCount; - } - */ // zapobieganie poslizgowi u nas if (mvControlling->SlippingWheels) { if (!mvControlling->DecScndCtrl(2)) // bocznik na zero mvControlling->DecMainCtrl(1); +/* if (mvOccupied->BrakeCtrlPos == mvOccupied->BrakeCtrlPosNo) // jeśli ostatnia pozycja hamowania //yB: ten warunek wyżej nie ma sensu mvOccupied->DecBrakeLevel(); // to cofnij hamulec + DecBrake(); // to cofnij hamulec else mvControlling->AntiSlippingButton(); +*/ + DecBrake(); // to cofnij hamulec + mvControlling->AntiSlippingButton(); ++iDriverFailCount; mvControlling->SlippingWheels = false; // flaga już wykorzystana } @@ -4819,10 +4736,6 @@ bool TController::UpdateSituation(double dt) SetDriverPsyche(); } } // if (AIControllFlag) - else - { // tu mozna dać komunikaty tekstowe albo słowne: przyspiesz, hamuj (lekko, - // średnio, mocno) - } } // kierunek różny od zera else { // tutaj, gdy pojazd jest wyłączony diff --git a/Driver.h b/Driver.h index b2efddcc..68d44633 100644 --- a/Driver.h +++ b/Driver.h @@ -144,7 +144,7 @@ class TSpeedPos public: void Clear(); - bool Update(vector3 *p, vector3 *dir, double &len); + bool Update(vector3 *p, vector3 *dir, double &len, TOrders const &Orders ); bool Set(TEvent *e, double d, TOrders order = Wait_for_orders); void Set(TTrack *t, double d, int f); std::string TableText(); @@ -195,8 +195,8 @@ class TController double fDriverBraking = 0.0; // po pomnożeniu przez v^2 [km/h] daje ~drogę hamowania [m] double fDriverDist = 0.0; // dopuszczalna odległość podjechania do przeszkody double fVelMax = -1.0; // maksymalna prędkość składu (sprawdzany każdy pojazd) - double fBrakeDist = 0.0; // przybliżona droga hamowania public: + double fBrakeDist = 0.0; // przybliżona droga hamowania double BrakeAccFactor(); double fBrakeReaction = 1.0; //opóźnienie zadziałania hamulca - czas w s / (km/h) double fAccThreshold = 0.0; // próg opóźnienia dla zadziałania hamulca @@ -270,8 +270,6 @@ class TController OrderTop = 0; // rozkaz aktualny oraz wolne miejsce do wstawiania nowych std::ofstream LogFile; // zapis parametrow fizycznych std::ofstream AILogFile; // log AI - bool MaxVelFlag = false; - bool MinVelFlag = false; // Ra: to nie jest używane int iDirection = 0; // kierunek jazdy względem sprzęgów pojazdu, w którym siedzi AI (1=przód,-1=tył) int iDirectionOrder = 0; //żadany kierunek jazdy (służy do zmiany kierunku) int iVehicleCount = -2; // wartość neutralna // ilość pojazdów do odłączenia albo zabrania ze składu (-1=wszystkie) diff --git a/DynObj.cpp b/DynObj.cpp index 2a39c768..67ce1097 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1126,128 +1126,96 @@ void TDynamicObject::ABuCheckMyTrack() } // Ra: w poniższej funkcji jest problem ze sprzęgami -TDynamicObject * TDynamicObject::ABuFindObject(TTrack *Track, int ScanDir, - BYTE &CouplFound, double &dist) +TDynamicObject * +TDynamicObject::ABuFindObject( int &Foundcoupler, double &Distance, TTrack *Track, int const Direction, int const Mycoupler ) { // Zwraca wskaźnik najbliższego obiektu znajdującego się // na torze w określonym kierunku, ale tylko wtedy, kiedy // obiekty mogą się zderzyć, tzn. nie mijają się. + // WE: + // Track - tor, na ktorym odbywa sie poszukiwanie, + // Direction - kierunek szukania na torze (+1:w stronę Point2, -1:w stronę Point1) + // Mycoupler - nr sprzegu obiektu szukajacego; + // WY: + // wskaznik do znalezionego obiektu. + // Foundcoupler - nr sprzegu znalezionego obiektu + // Distance - distance to found object - // WE: Track - tor, na ktorym odbywa sie poszukiwanie, - // MyPointer - wskaznik do obiektu szukajacego. //Ra: zamieniłem na "this" - // ScanDir - kierunek szukania na torze (+1:w stronę Point2, -1:w stronę - // Point1) - // MyScanDir - kierunek szukania obiektu szukajacego (na jego torze); Ra: - // nie potrzebne - // MyCouplFound - nr sprzegu obiektu szukajacego; Ra: nie potrzebne - - // WY: wskaznik do znalezionego obiektu. - // CouplFound - nr sprzegu znalezionego obiektu - if( false == Track->Dynamics.empty() ) - { // sens szukania na tym torze jest tylko, gdy są na nim pojazdy - double MyTranslation; // pozycja szukającego na torze - double MinDist = Track->Length(); // najmniejsza znaleziona odleglość - // (zaczynamy od długości toru) - double TestDist; // robocza odległość od kolejnych pojazdów na danym odcinku - TDynamicObject *collider = nullptr; - // if (Track->iNumDynamics>1) - // iMinDist+=0; //tymczasowo pułapka - if (MyTrack == Track) // gdy szukanie na tym samym torze - MyTranslation = RaTranslationGet(); // położenie wózka względem Point1 toru - else // gdy szukanie na innym torze - if (ScanDir > 0) - MyTranslation = 0; // szukanie w kierunku Point2 (od zera) - jesteśmy w Point1 - else - MyTranslation = MinDist; // szukanie w kierunku Point1 (do zera) - jesteśmy w Point2 - if (ScanDir >= 0) - { // jeśli szukanie w kierunku Point2 - for( auto dynamic : Track->Dynamics ) { - // pętla po pojazdach - if( dynamic == this ) { - // szukający się nie liczy - continue; - } - - TestDist = ( dynamic->RaTranslationGet() ) - MyTranslation; // odległogłość tamtego od szukającego - if( ( TestDist > 0 ) && ( TestDist <= MinDist ) ) { // gdy jest po właściwej stronie i bliżej - // niż jakiś wcześniejszy - CouplFound = ( dynamic->RaDirectionGet() > 0 ) ? 1 : 0; // to, bo (ScanDir>=0) - if( Track->iCategoryFlag & 254 ) { - // trajektoria innego typu niż tor kolejowy - // dla torów nie ma sensu tego sprawdzać, rzadko co jedzie po jednej szynie i się mija - // Ra: mijanie samochodów wcale nie jest proste - // Przesuniecie wzgledne pojazdow. Wyznaczane, zeby sprawdzic, - // czy pojazdy faktycznie sie zderzaja (moga byc przesuniete - // w/m siebie tak, ze nie zachodza na siebie i wtedy sie mijaja). - double RelOffsetH; // wzajemna odległość poprzeczna - if( CouplFound ) { - // my na tym torze byśmy byli w kierunku Point2 - // dla CouplFound=1 są zwroty zgodne - istotna różnica przesunięć - RelOffsetH = ( MoverParameters->OffsetTrackH - dynamic->MoverParameters->OffsetTrackH ); - } - else { - // dla CouplFound=0 są zwroty przeciwne - przesunięcia sumują się - RelOffsetH = ( MoverParameters->OffsetTrackH + dynamic->MoverParameters->OffsetTrackH ); - } - if( RelOffsetH < 0 ) { - RelOffsetH = -RelOffsetH; - } - if( RelOffsetH + RelOffsetH > MoverParameters->Dim.W + dynamic->MoverParameters->Dim.W ) { - // odległość większa od połowy sumy szerokości - kolizji nie będzie - continue; - } - // jeśli zahaczenie jest niewielkie, a jest miejsce na poboczu, to - // zjechać na pobocze - } - collider = dynamic; // potencjalna kolizja - MinDist = TestDist; // odleglość pomiędzy aktywnymi osiami pojazdów - } - - } - } - else //(ScanDir<0) - { - for( auto dynamic : Track->Dynamics ) { - - if( dynamic == this ) { continue; } - - TestDist = MyTranslation - ( dynamic->RaTranslationGet() ); //???-przesunięcie wózka względem Point1 toru - if( ( TestDist > 0 ) && ( TestDist < MinDist ) ) { - CouplFound = ( dynamic->RaDirectionGet() > 0 ) ? 0 : 1; // odwrotnie, bo (ScanDir<0) - if( Track->iCategoryFlag & 254 ) // trajektoria innego typu niż tor kolejowy - { // dla torów nie ma sensu tego sprawdzać, rzadko co jedzie po jednej szynie i się mija - // Ra: mijanie samochodów wcale nie jest proste - // Przesunięcie względne pojazdów. Wyznaczane, żeby sprawdzić, - // czy pojazdy faktycznie się zderzają (mogą być przesunięte - // w/m siebie tak, że nie zachodzą na siebie i wtedy sie mijają). - double RelOffsetH; // wzajemna odległość poprzeczna - if( CouplFound ) { - // my na tym torze byśmy byli w kierunku Point1 - // dla CouplFound=1 są zwroty zgodne - istotna różnica przesunięć - RelOffsetH = ( MoverParameters->OffsetTrackH - dynamic->MoverParameters->OffsetTrackH ); - } - else { - // dla CouplFound=0 są zwroty przeciwne - przesunięcia sumują się - RelOffsetH = ( MoverParameters->OffsetTrackH + dynamic->MoverParameters->OffsetTrackH ); - } - if( RelOffsetH < 0 ) { - RelOffsetH = -RelOffsetH; - } - if( RelOffsetH + RelOffsetH > MoverParameters->Dim.W + dynamic->MoverParameters->Dim.W ) { - // odległość większa od połowy sumy szerokości - kolizji nie będzie - continue; - } - } - collider = dynamic; // potencjalna kolizja - MinDist = TestDist; // odleglość pomiędzy aktywnymi osiami pojazdów - } - } - } - dist += MinDist; // doliczenie odległości przeszkody albo długości odcinka do przeskanowanej odległości - return collider; + if( true == Track->Dynamics.empty() ) { + // sens szukania na tym torze jest tylko, gdy są na nim pojazdy + Distance += Track->Length(); // doliczenie długości odcinka do przeskanowanej odległości + return nullptr; // nie ma pojazdów na torze, to jest NULL } - dist += Track->Length(); // doliczenie długości odcinka do przeskanowanej - // odległości - return nullptr; // nie ma pojazdów na torze, to jest NULL + + double distance = Track->Length(); // najmniejsza znaleziona odleglość (zaczynamy od długości toru) + double myposition; // pozycja szukającego na torze + TDynamicObject *foundobject = nullptr; + if( MyTrack == Track ) { + // gdy szukanie na tym samym torze + myposition = RaTranslationGet(); // położenie wózka względem Point1 toru + } + else { + // gdy szukanie na innym torze + if( Direction > 0 ) { + // szukanie w kierunku Point2 (od zera) - jesteśmy w Point1 + myposition = 0; + } + else { + // szukanie w kierunku Point1 (do zera) - jesteśmy w Point2 + myposition = distance; + } + } + + double objectposition; // robocza odległość od kolejnych pojazdów na danym odcinku + for( auto dynamic : Track->Dynamics ) { + + if( dynamic == this ) { continue; } // szukający się nie liczy + + if( Direction > 0 ) { + // jeśli szukanie w kierunku Point2 + objectposition = ( dynamic->RaTranslationGet() ) - myposition; // odległogłość tamtego od szukającego + if( ( objectposition > 0 ) + && ( objectposition < distance ) ) { + // gdy jest po właściwej stronie i bliżej niż jakiś wcześniejszy + Foundcoupler = ( dynamic->RaDirectionGet() > 0 ) ? 1 : 0; // to, bo (ScanDir>=0) + } + else { continue; } + } + else { + objectposition = myposition - ( dynamic->RaTranslationGet() ); //???-przesunięcie wózka względem Point1 toru + if( ( objectposition > 0 ) + && ( objectposition < distance ) ) { + Foundcoupler = ( dynamic->RaDirectionGet() > 0 ) ? 0 : 1; // odwrotnie, bo (ScanDir<0) + } + else { continue; } + } + + if( Track->iCategoryFlag & 254 ) { + // trajektoria innego typu niż tor kolejowy + // dla torów nie ma sensu tego sprawdzać, rzadko co jedzie po jednej szynie i się mija + // Ra: mijanie samochodów wcale nie jest proste + // Przesuniecie wzgledne pojazdow. Wyznaczane, zeby sprawdzic, + // czy pojazdy faktycznie sie zderzaja (moga byc przesuniete + // w/m siebie tak, ze nie zachodza na siebie i wtedy sie mijaja). + double relativeoffset; // wzajemna odległość poprzeczna + if( Foundcoupler != Mycoupler ) { + // facing the same direction + relativeoffset = std::abs( MoverParameters->OffsetTrackH - dynamic->MoverParameters->OffsetTrackH ); + } + else { + relativeoffset = std::abs( MoverParameters->OffsetTrackH + dynamic->MoverParameters->OffsetTrackH ); + } + if( relativeoffset + relativeoffset > MoverParameters->Dim.W + dynamic->MoverParameters->Dim.W ) { + // odległość większa od połowy sumy szerokości - kolizji nie będzie + continue; + } + // jeśli zahaczenie jest niewielkie, a jest miejsce na poboczu, to zjechać na pobocze + } + foundobject = dynamic; // potencjalna kolizja + distance = objectposition; // odleglość pomiędzy aktywnymi osiami pojazdów + } + + Distance += distance; // doliczenie odległości przeszkody albo długości odcinka do przeskanowanej odległości + return foundobject; } int TDynamicObject::DettachStatus(int dir) @@ -1294,9 +1262,9 @@ void TDynamicObject::CouplersDettach(double MinDist, int MyScanDir) { if (PrevConnected) // pojazd od strony sprzęgu 0 { - if (MoverParameters->Couplers[0].CoupleDist > - MinDist) // sprzęgi wirtualne zawsze przekraczają - { + if (MoverParameters->Couplers[0].CoupleDist > MinDist) { + // sprzęgi wirtualne zawsze przekraczają + if ((PrevConnectedNo ? PrevConnected->NextConnected : PrevConnected->PrevConnected) == this) { // Ra: nie rozłączamy znalezionego, jeżeli nie do nas @@ -1314,10 +1282,11 @@ void TDynamicObject::CouplersDettach(double MinDist, int MyScanDir) PrevConnected->NextConnected = NULL; } } + // za to zawsze odłączamy siebie PrevConnected = NULL; PrevConnectedNo = 2; // sprzęg 0 nie podłączony - MoverParameters->Couplers[0].Connected = NULL; + MoverParameters->Couplers[0].Connected = nullptr; } } } @@ -1325,9 +1294,9 @@ void TDynamicObject::CouplersDettach(double MinDist, int MyScanDir) { if (NextConnected) // pojazd od strony sprzęgu 1 { - if (MoverParameters->Couplers[1].CoupleDist > - MinDist) // sprzęgi wirtualne zawsze przekraczają - { + if (MoverParameters->Couplers[1].CoupleDist > MinDist) { + // sprzęgi wirtualne zawsze przekraczają + if ((NextConnectedNo ? NextConnected->NextConnected : NextConnected->PrevConnected) == this) { // Ra: nie rozłączamy znalezionego, jeżeli nie do nas @@ -1345,180 +1314,147 @@ void TDynamicObject::CouplersDettach(double MinDist, int MyScanDir) NextConnected->NextConnected = NULL; } } + NextConnected = NULL; NextConnectedNo = 2; // sprzęg 1 nie podłączony - MoverParameters->Couplers[1].Connected = NULL; + MoverParameters->Couplers[1].Connected = nullptr; } } } } -void TDynamicObject::ABuScanObjects(int ScanDir, double ScanDist) +void TDynamicObject::ABuScanObjects( int Direction, double Distance ) { // skanowanie toru w poszukiwaniu kolidujących pojazdów // ScanDir - określa kierunek poszukiwania zależnie od zwrotu prędkości // pojazdu // ScanDir=1 - od strony Coupler0, ScanDir=-1 - od strony Coupler1 - int MyScanDir = ScanDir; // zapamiętanie kierunku poszukiwań na torze - // początkowym, względem sprzęgów - TTrackFollower *FirstAxle = (MyScanDir > 0 ? &Axle0 : &Axle1); // można by to trzymać w trainset - TTrack *Track = FirstAxle->GetTrack(); // tor na którym "stoi" skrajny wózek + int initialdirection = Direction; // zapamiętanie kierunku poszukiwań na torze początkowym, względem sprzęgów + TTrackFollower *firstaxle = (initialdirection > 0 ? &Axle0 : &Axle1); // można by to trzymać w trainset + TTrack *track = firstaxle->GetTrack(); // tor na którym "stoi" skrajny wózek // (może być inny niż tor pojazdu) - if (FirstAxle->GetDirection() < 0) // czy oś jest ustawiona w stronę Point1? - ScanDir = -ScanDir; // jeśli tak, to kierunek szukania będzie przeciwny + if( firstaxle->GetDirection() < 0 ) { + // czy oś jest ustawiona w stronę Point1? + Direction = -Direction; // jeśli tak, to kierunek szukania będzie przeciwny + } // (teraz względem // toru) - BYTE MyCouplFound; // numer sprzęgu do podłączenia w obiekcie szukajacym - MyCouplFound = (MyScanDir < 0) ? 1 : 0; - BYTE CouplFound; // numer sprzęgu w znalezionym obiekcie (znaleziony wypełni) - TDynamicObject *FoundedObj; // znaleziony obiekt - double ActDist = 0; // przeskanowana odleglość; odległość do zawalidrogi - FoundedObj = ABuFindObject(Track, ScanDir, CouplFound, - ActDist); // zaczynamy szukać na tym samym torze + int const mycoupler = ( initialdirection < 0 ? 1 : 0 ); // numer sprzęgu do podłączenia w obiekcie szukajacym + int foundcoupler { -1 }; // numer sprzęgu w znalezionym obiekcie (znaleziony wypełni) + double distance = 0; // przeskanowana odleglość; odległość do zawalidrogi + TDynamicObject *foundobject = ABuFindObject( foundcoupler, distance, track, Direction, mycoupler ); // zaczynamy szukać na tym samym torze - /* - if (FoundedObj) //jak coś znajdzie, to śledzimy - {//powtórzenie wyszukiwania tylko do zastawiania pułepek podczas testów - if (ABuGetDirection()<0) ScanDir=ScanDir; //ustalenie kierunku względem toru - FoundedObj=ABuFindObject(Track,this,ScanDir,CouplFound); - } - */ - - if (DebugModeFlag) - if (FoundedObj) // kod służący do logowania błędów - if (CouplFound == 0) - { - if (FoundedObj->PrevConnected) - if (FoundedObj->PrevConnected != this) // odświeżenie tego samego się nie liczy - WriteLog("0! Coupler warning on " + asName + ":" + - to_string(MyCouplFound) + " - " + FoundedObj->asName + - ":0 connected to " + FoundedObj->PrevConnected->asName + ":" + - to_string(FoundedObj->PrevConnectedNo)); - } - else - { - if (FoundedObj->NextConnected) - if (FoundedObj->NextConnected != this) // odświeżenie tego samego się nie liczy - WriteLog("0! Coupler warning on " + asName + ":" + - to_string(MyCouplFound) + " - " + FoundedObj->asName + - ":1 connected to " + FoundedObj->NextConnected->asName + ":" + - to_string(FoundedObj->NextConnectedNo)); - } - - if (FoundedObj == NULL) // jeśli nie ma na tym samym, szukamy po okolicy - { // szukanie najblizszego toru z jakims obiektem + if( foundobject == nullptr ) { + // jeśli nie ma na tym samym, szukamy po okolicy szukanie najblizszego toru z jakims obiektem // praktycznie przeklejone z TraceRoute()... - // double CurrDist=0; //aktualna dlugosc toru - if (ScanDir >= 0) // uwzględniamy kawalek przeanalizowanego wcześniej toru - ActDist = Track->Length() - FirstAxle->GetTranslation(); // odległość osi od Point2 toru + if (Direction >= 0) // uwzględniamy kawalek przeanalizowanego wcześniej toru + distance = track->Length() - firstaxle->GetTranslation(); // odległość osi od Point2 toru else - ActDist = FirstAxle->GetTranslation(); // odległość osi od Point1 toru - while (ActDist < ScanDist) - { - // ActDist+=CurrDist; //odległość już przeanalizowana - if (ScanDir > 0) // w kierunku Point2 toru - { - if (Track ? Track->iNextDirection : - false) // jeśli następny tor jest podpięty od Point2 - ScanDir = -ScanDir; // to zmieniamy kierunek szukania na tym torze - Track = Track->CurrentNext(); // potem dopiero zmieniamy wskaźnik + distance = firstaxle->GetTranslation(); // odległość osi od Point1 toru + + while (distance < Distance) { + if (Direction > 0) { + // w kierunku Point2 toru + if( track ? + track->iNextDirection : + false ) { + // jeśli następny tor jest podpięty od Point2 + Direction = -Direction; // to zmieniamy kierunek szukania na tym torze + } + track = track->CurrentNext(); // potem dopiero zmieniamy wskaźnik } - else // w kierunku Point1 - { - if (Track ? !Track->iPrevDirection : - true) // jeśli poprzedni tor nie jest podpięty od Point2 - ScanDir = -ScanDir; // to zmieniamy kierunek szukania na tym torze - Track = Track->CurrentPrev(); // potem dopiero zmieniamy wskaźnik + else { + // w kierunku Point1 + if( track ? + !track->iPrevDirection : + true ) { + // jeśli poprzedni tor nie jest podpięty od Point2 + Direction = -Direction; // to zmieniamy kierunek szukania na tym torze + } + track = track->CurrentPrev(); // potem dopiero zmieniamy wskaźnik } - if (Track) - { // jesli jest kolejny odcinek toru - // CurrDist=Track->Length(); //doliczenie tego toru do przejrzanego - // dystandu - FoundedObj = ABuFindObject(Track, ScanDir, CouplFound, - ActDist); // przejrzenie pojazdów tego toru - if (FoundedObj) - { - // ActDist=ScanDist; //wyjście z pętli poszukiwania + if (track) { + // jesli jest kolejny odcinek toru + foundobject = ABuFindObject(foundcoupler, distance, track, Direction, mycoupler); // przejrzenie pojazdów tego toru + if (foundobject) { break; } } - else // jeśli toru nie ma, to wychodzimy - { - ActDist = ScanDist + 1.0; // koniec przeglądania torów + else { + // jeśli toru nie ma, to wychodzimy + distance = Distance + 1.0; // koniec przeglądania torów break; } } } // Koniec szukania najbliższego toru z jakimś obiektem. + // teraz odczepianie i jeśli coś się znalazło, doczepianie. - if (MyScanDir > 0 ? PrevConnected : NextConnected) - if ((MyScanDir > 0 ? PrevConnected : NextConnected) != FoundedObj) - CouplersDettach(1.0, MyScanDir); // odłączamy, jeśli dalej niż metr - // i łączenie sprzęgiem wirtualnym - if (FoundedObj) - { // siebie można bezpiecznie podłączyć jednostronnie do - // znalezionego - MoverParameters->Attach(MyCouplFound, CouplFound, FoundedObj->MoverParameters, - ctrain_virtual); - // MoverParameters->Couplers[MyCouplFound].Render=false; //wirtualnego nie - // renderujemy - if (MyCouplFound == 0) - { - PrevConnected = FoundedObj; // pojazd od strony sprzęgu 0 - PrevConnectedNo = CouplFound; + auto connectedobject = ( + initialdirection > 0 ? + PrevConnected : + NextConnected ); + if( ( connectedobject != nullptr ) + && ( connectedobject != foundobject ) ) { + // odłączamy, jeśli dalej niż metr i łączenie sprzęgiem wirtualnym + CouplersDettach( 1.0, initialdirection ); + } + + if (foundobject) { + // siebie można bezpiecznie podłączyć jednostronnie do znalezionego + MoverParameters->Attach( mycoupler, foundcoupler, foundobject->MoverParameters, coupling::faux ); + // MoverParameters->Couplers[MyCouplFound].Render=false; //wirtualnego nie renderujemy + if( mycoupler == TMoverParameters::side::front ) { + PrevConnected = foundobject; // pojazd od strony sprzęgu 0 + PrevConnectedNo = foundcoupler; } - else - { - NextConnected = FoundedObj; // pojazd od strony sprzęgu 1 - NextConnectedNo = CouplFound; + else { + NextConnected = foundobject; // pojazd od strony sprzęgu 1 + NextConnectedNo = foundcoupler; } - if (FoundedObj->MoverParameters->Couplers[CouplFound].CouplingFlag == ctrain_virtual) - { // Ra: wpinamy się wirtualnym tylko jeśli znaleziony - // ma wirtualny sprzęg - FoundedObj->MoverParameters->Attach(CouplFound, MyCouplFound, this->MoverParameters, - ctrain_virtual); - if (CouplFound == 0) // jeśli widoczny sprzęg 0 znalezionego - { - if (DebugModeFlag) - if (FoundedObj->PrevConnected) - if (FoundedObj->PrevConnected != this) - WriteLog("1! Coupler warning on " + asName + ":" + - to_string(MyCouplFound) + " - " + FoundedObj->asName + - ":0 connected to " + FoundedObj->PrevConnected->asName + ":" + - to_string(FoundedObj->PrevConnectedNo)); - FoundedObj->PrevConnected = this; - FoundedObj->PrevConnectedNo = MyCouplFound; + + if( foundobject->MoverParameters->Couplers[ foundcoupler ].CouplingFlag == coupling::faux ) { + // Ra: wpinamy się wirtualnym tylko jeśli znaleziony ma wirtualny sprzęg + foundobject->MoverParameters->Attach( foundcoupler, mycoupler, this->MoverParameters, coupling::faux ); + + if( foundcoupler == TMoverParameters::side::front ) { + // jeśli widoczny sprzęg 0 znalezionego + if( ( DebugModeFlag ) + && ( foundobject->PrevConnected ) + && ( foundobject->PrevConnected != this ) ) { + WriteLog( "ScanObjects(): formed virtual link between \"" + asName + "\" (coupler " + to_string( mycoupler ) + ") and \"" + foundobject->asName + "\" (coupler " + to_string( foundcoupler ) + ")" ); + } + foundobject->PrevConnected = this; + foundobject->PrevConnectedNo = mycoupler; } - else // jeśli widoczny sprzęg 1 znalezionego - { - if (DebugModeFlag) - if (FoundedObj->NextConnected) - if (FoundedObj->NextConnected != this) - WriteLog("1! Coupler warning on " + asName + ":" + - to_string(MyCouplFound) + " - " + FoundedObj->asName + - ":1 connected to " + FoundedObj->NextConnected->asName + ":" + - to_string(FoundedObj->NextConnectedNo)); - FoundedObj->NextConnected = this; - FoundedObj->NextConnectedNo = MyCouplFound; + else { + // jeśli widoczny sprzęg 1 znalezionego + if( ( DebugModeFlag ) + && ( foundobject->NextConnected ) + && ( foundobject->NextConnected != this ) ) { + WriteLog( "ScanObjects(): formed virtual link between \"" + asName + "\" (coupler " + to_string( mycoupler ) + ") and \"" + foundobject->asName + "\" (coupler " + to_string( foundcoupler ) + ")" ); + } + foundobject->NextConnected = this; + foundobject->NextConnectedNo = mycoupler; } } - // Ra: jeśli dwa samochody się mijają na odcinku przed zawrotką, to - // odległość między nimi - // nie może być liczona w linii prostej! - fTrackBlock = MoverParameters->Couplers[MyCouplFound] - .CoupleDist; // odległość do najbliższego pojazdu w linii prostej - if (Track->iCategoryFlag > 1) // jeśli samochód - if (ActDist > MoverParameters->Dim.L + - FoundedObj->MoverParameters->Dim - .L) // przeskanowana odległość większa od długości pojazdów + + // odległość do najbliższego pojazdu w linii prostej + // Ra: jeśli dwa samochody się mijają na odcinku przed zawrotką, to odległość między nimi nie może być liczona w linii prostej! + fTrackBlock = MoverParameters->Couplers[mycoupler].CoupleDist; + if( track->iCategoryFlag & 254 ) { + // jeśli samochód + if( distance > MoverParameters->Dim.L + foundobject->MoverParameters->Dim.L ) { + // przeskanowana odległość większa od długości pojazdów // else if (ActDistasName); + fTrackBlock = distance; // ta odległość jest wiecej warta + } + } } - else // nic nie znalezione, to nie ma przeszkód + else { + // nic nie znalezione, to nie ma przeszkód fTrackBlock = 10000.0; + } } //----------ABu: koniec skanowania pojazdow @@ -1540,7 +1476,6 @@ TDynamicObject::TDynamicObject() bBrakeAcc = false; NextConnected = PrevConnected = NULL; NextConnectedNo = PrevConnectedNo = 2; // ABu: Numery sprzegow. 2=nie podłączony - CouplCounter = 50; // będzie sprawdzać na początku asName = ""; bEnabled = true; MyTrack = NULL; @@ -1880,14 +1815,20 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" if (MoverParameters->CategoryFlag & 2) // jeśli samochód { // ustawianie samochodow na poboczu albo na środku drogi - if (Track->fTrackWidth < 3.5) // jeśli droga wąska + if( Track->fTrackWidth < 3.5 ) // jeśli droga wąska MoverParameters->OffsetTrackH = 0.0; // to stawiamy na środku, niezależnie od stanu // ruchu - else if (driveractive) // od 3.5m do 8.0m jedzie po środku pasa, dla + else if( driveractive ) {// od 3.5m do 8.0m jedzie po środku pasa, dla // szerszych w odległości // 1.5m - MoverParameters->OffsetTrackH = - Track->fTrackWidth <= 8.0 ? -Track->fTrackWidth * 0.25 : -1.5; + auto const lanefreespace = 0.5 * Track->fTrackWidth - MoverParameters->Dim.W; + MoverParameters->OffsetTrackH = ( + lanefreespace > 1.5 ? + -0.5 * MoverParameters->Dim.W - 0.75 : // wide road, keep near centre with safe margin + ( lanefreespace > 0.1 ? + -0.25 * Track->fTrackWidth : // narrow fit, stay on the middle + -0.5 * MoverParameters->Dim.W - 0.075 ) ); // too narrow, just keep some minimal clearance + } else // jak stoi, to kołem na poboczu i pobieramy szerokość razem z // poboczem, ale nie z // chodnikiem @@ -3471,45 +3412,6 @@ bool TDynamicObject::Update(double dt, double dt1) toggle_lights(); } - // ABu-160303 sledzenie toru przed obiektem: ******************************* - // Z obserwacji: v>0 -> Coupler 0; v<0 ->coupler1 (Ra: prędkość jest związana - // z pojazdem) - // Rozroznienie jest tutaj, zeby niepotrzebnie nie skakac do funkcji. Nie jest - // uzaleznione - // od obecnosci AI, zeby uwzglednic np. jadace bez lokomotywy wagony. - // Ra: można by przenieść na poziom obiektu reprezentującego skład, aby nie - // sprawdzać środkowych - if (CouplCounter > 25) // licznik, aby nie robić za każdym razem - { // poszukiwanie czegoś do zderzenia się - fTrackBlock = 10000.0; // na razie nie ma przeszkód (na wypadek nie - // uruchomienia skanowania) - // jeśli nie ma zwrotnicy po drodze, to tylko przeliczyć odległość? - if (MoverParameters->V > 0.03) //[m/s] jeśli jedzie do przodu (w kierunku Coupler 0) - { - if (MoverParameters->Couplers[0].CouplingFlag == - ctrain_virtual) // brak pojazdu podpiętego? - { - ABuScanObjects(1, fScanDist); // szukanie czegoś do podłączenia - // WriteLog(asName+" - block 0: "+AnsiString(fTrackBlock)); - } - } - else if (MoverParameters->V < -0.03) //[m/s] jeśli jedzie do tyłu (w kierunku Coupler 1) - if (MoverParameters->Couplers[1].CouplingFlag == - ctrain_virtual) // brak pojazdu podpiętego? - { - ABuScanObjects(-1, fScanDist); - // WriteLog(asName+" - block 1: "+AnsiString(fTrackBlock)); - } - CouplCounter = Random(20); // ponowne sprawdzenie po losowym czasie - } - if (MoverParameters->Vel > 0.1) //[km/h] - ++CouplCounter; // jazda sprzyja poszukiwaniu połączenia - else - { - CouplCounter = 25; // a bezruch nie, ale trzeba zaktualizować odległość, bo - // zawalidroga może - // sobie pojechać - } if (MoverParameters->DerailReason > 0) { switch (MoverParameters->DerailReason) @@ -5137,7 +5039,6 @@ void TDynamicObject::RaLightsSet(int head, int rear) int TDynamicObject::DirectionSet(int d) { // ustawienie kierunku w składzie (wykonuje AI) iDirection = d > 0 ? 1 : 0; // d:1=zgodny,-1=przeciwny; iDirection:1=zgodny,0=przeciwny; - CouplCounter = 20; //żeby normalnie skanować kolizje, to musi ruszyć z miejsca if (MyTrack) { // podczas wczytywania wstawiane jest AI, ale może jeszcze nie // być toru diff --git a/DynObj.h b/DynObj.h index c14cdfd7..8095c7f3 100644 --- a/DynObj.h +++ b/DynObj.h @@ -354,15 +354,13 @@ public: // modele składowe pojazdu // TTrackFollower Axle2; //dwie osie z czterech (te są protected) // TTrackFollower Axle3; //Ra: wyłączyłem, bo kąty są liczone w Segment.cpp int iNumAxles; // ilość osi - int CouplCounter; std::string asModel; public: void ABuScanObjects(int ScanDir, double ScanDist); protected: - TDynamicObject * ABuFindObject(TTrack *Track, int ScanDir, BYTE &CouplFound, - double &dist); + TDynamicObject *ABuFindObject( int &Foundcoupler, double &Distance, TTrack *Track, int const Direction, int const Mycoupler ); void ABuCheckMyTrack(); public: diff --git a/Globals.cpp b/Globals.cpp index 80b4fa98..6bc61dc2 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -86,7 +86,8 @@ float Global::BaseDrawRange { 2500.f }; opengl_light Global::DayLight; int Global::DynamicLightCount { 3 }; bool Global::ScaleSpecularValues { true }; -bool Global::RenderShadows { false }; +bool Global::BasicRenderer { false }; +bool Global::RenderShadows { true }; Global::shadowtune_t Global::shadowtune = { 2048, 250.f, 250.f, 500.f }; bool Global::bRollFix = true; // czy wykonać przeliczanie przechyłki bool Global::bJoinEvents = false; // czy grupować eventy o tych samych nazwach @@ -545,6 +546,13 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::ScaleSpecularValues; } + else if( token == "gfxrenderer" ) { + // shadow render toggle + std::string gfxrenderer; + Parser.getTokens(); + Parser >> gfxrenderer; + Global::BasicRenderer = ( gfxrenderer == "simple" ); + } else if( token == "shadows" ) { // shadow render toggle Parser.getTokens(); @@ -1304,7 +1312,7 @@ double Global::Min0RSpeed(double vel1, double vel2) { vel2 = std::numeric_limits::max(); } - return Min0R(vel1, vel2); + return std::min(vel1, vel2); }; double Global::CutValueToRange(double min, double value, double max) diff --git a/Globals.h b/Globals.h index 376a45a0..73f52cb2 100644 --- a/Globals.h +++ b/Globals.h @@ -228,6 +228,7 @@ class Global static opengl_light DayLight; static int DynamicLightCount; static bool ScaleSpecularValues; + static bool BasicRenderer; static bool RenderShadows; static struct shadowtune_t { unsigned int map_size; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 714d7c2b..1a1a0cfa 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2623,7 +2623,7 @@ bool TMoverParameters::DecBrakeLevelOld(void) bool TMoverParameters::IncLocalBrakeLevel(int CtrlSpeed) { bool IBL; - if ((LocalBrakePos < LocalBrakePosNo) /*and (BrakeCtrlPos<1)*/) + if ((LocalBrakePos < LocalBrakePosNo) /*and (BrakeCtrlPos<1)*/) { while ((LocalBrakePos < LocalBrakePosNo) && (CtrlSpeed > 0)) { @@ -4009,17 +4009,17 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) // blablabla // ABu: proby znalezienia problemu ze zle odbijajacymi sie skladami - //***if (Couplers[CouplerN].CouplingFlag=ctrain_virtual) and (newdist>0) then + //if (Couplers[CouplerN].CouplingFlag=ctrain_virtual) and (newdist>0) then if ((Couplers[CouplerN].CouplingFlag == ctrain_virtual) && (Couplers[CouplerN].CoupleDist > 0)) { CF = 0; // kontrola zderzania sie - OK ScanCounter++; if ((newdist > MaxDist) || ((ScanCounter > MaxCount) && (newdist > MinDist))) - //***if (tempdist>MaxDist) or ((ScanCounter>MaxCount)and(tempdist>MinDist)) then + //if (tempdist>MaxDist) or ((ScanCounter>MaxCount)and(tempdist>MinDist)) then { // zerwij kontrolnie wirtualny sprzeg // Connected.Couplers[CNext].Connected:=nil; //Ra: ten podłączony niekoniecznie jest // wirtualny - Couplers[CouplerN].Connected = NULL; +// Couplers[CouplerN].Connected = NULL; ScanCounter = static_cast(Random(500.0)); // Q: TODO: cy dobrze przetlumaczone? // WriteLog(FloatToStr(ScanCounter)); } diff --git a/Model3d.cpp b/Model3d.cpp index e6149df5..1eea864a 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1137,23 +1137,6 @@ TSubModel::convert( TGroundNode &Groundnode ) const { } } -// NOTE: leftover from static distance factor adjustment. -// TODO: get rid of it, once we have the dynamic adjustment code in place -void TSubModel::AdjustDist() -{ // aktualizacja odległości faz LoD, zależna od - // rozdzielczości pionowej oraz multisamplingu - if (fSquareMaxDist > 0.0) - fSquareMaxDist *= Global::fDistanceFactor; - if (fSquareMinDist > 0.0) - fSquareMinDist /= Global::fDistanceFactor; - // if (fNearAttenStart>0.0) fNearAttenStart*=Global::fDistanceFactor; - // if (fNearAttenEnd>0.0) fNearAttenEnd*=Global::fDistanceFactor; - if (Child) - Child->AdjustDist(); - if (Next) - Next->AdjustDist(); -}; - void TSubModel::ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ) { // ustawienie kolorów dla modelu terenu f4Ambient = glm::vec4( Ambient, 1.0f ); diff --git a/Model3d.h b/Model3d.h index 0861a6f1..a1072228 100644 --- a/Model3d.h +++ b/Model3d.h @@ -207,7 +207,6 @@ public: return m_material; } void ParentMatrix(float4x4 *m); float MaxY( float4x4 const &m ); - void AdjustDist(); void deserialize(std::istream&); void serialize(std::ostream&, diff --git a/World.cpp b/World.cpp index 94ee4e06..4d4451da 100644 --- a/World.cpp +++ b/World.cpp @@ -1434,13 +1434,19 @@ TWorld::Update_UI() { uitextline1 += "; C0:" + ( tmp->PrevConnected ? - tmp->PrevConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) : - "none" ); + tmp->PrevConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) + ( + tmp->MoverParameters->Couplers[ 0 ].CouplingFlag == 0 ? + " (" + to_string( tmp->MoverParameters->Couplers[ 0 ].CoupleDist, 1 ) + " m)" : + "" ) : + "none" ); uitextline1 += " C1:" + ( tmp->NextConnected ? - tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) : - "none" ); + tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) + ( + tmp->MoverParameters->Couplers[ 1 ].CouplingFlag == 0 ? + " (" + to_string( tmp->MoverParameters->Couplers[ 1 ].CoupleDist, 1 ) + " m)" : + "" ) : + "none" ); // equipment flags uitextline2 = ( tmp->MoverParameters->Battery ? "B" : "." ); @@ -1546,9 +1552,10 @@ TWorld::Update_UI() { uitextline4 += "Driver: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) + " Ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) - + " Ah=" + to_string(tmp->Mechanik->fAccThreshold, 2) - + "@" + to_string(tmp->Mechanik->fBrake_a0[0], 2) - + "+" + to_string(tmp->Mechanik->fBrake_a1[0], 2) + + " Ah=" + to_string( tmp->Mechanik->fAccThreshold, 2 ) + + "@" + to_string( tmp->Mechanik->fBrake_a0[0], 2 ) + + "+" + to_string( tmp->Mechanik->fBrake_a1[0], 2 ) + + " Bd=" + to_string( tmp->Mechanik->fBrakeDist, 0 ) + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ) + " VSl=" + to_string( tmp->Mechanik->VelSignalLast, 0 ) diff --git a/renderer.cpp b/renderer.cpp index cb7bdb61..e741a261 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -99,7 +99,10 @@ opengl_renderer::Init( GLFWwindow *Window ) { glEnable( GL_CULL_FACE ); // Cull back-facing triangles glShadeModel( GL_SMOOTH ); // Enable Smooth Shading - m_geometry.units().texture = std::vector{ m_normaltextureunit, m_diffusetextureunit }; + m_geometry.units().texture = ( + Global::BasicRenderer ? + std::vector{ m_diffusetextureunit } : + std::vector{ m_normaltextureunit, m_diffusetextureunit } ); m_textures.assign_units( m_helpertextureunit, m_shadowtextureunit, m_normaltextureunit, m_diffusetextureunit ); // TODO: add reflections unit UILayer.set_unit( m_diffusetextureunit ); Active_Texture( m_diffusetextureunit ); @@ -253,7 +256,8 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now } // environment cube map resources - if( true == m_framebuffersupport ) { + if( ( false == Global::BasicRenderer ) + && ( true == m_framebuffersupport ) ) { // texture: ::glGenTextures( 1, &m_environmentcubetexture ); ::glBindTexture( GL_TEXTURE_CUBE_MAP, m_environmentcubetexture ); @@ -1004,6 +1008,7 @@ void opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { // helper texture unit. if( m_helpertextureunit >= 0 ) { + Active_Texture( m_helpertextureunit ); if( ( true == Reflections ) || ( ( true == Global::RenderShadows ) @@ -1039,14 +1044,16 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons } } // normal/reflection texture unit - if( true == Reflections ) { + if( m_normaltextureunit >= 0 ) { + if( true == Reflections ) { - Active_Texture( m_normaltextureunit ); - ::glEnable( GL_TEXTURE_2D ); - } - else { - Active_Texture( m_normaltextureunit ); - ::glDisable( GL_TEXTURE_2D ); + Active_Texture( m_normaltextureunit ); + ::glEnable( GL_TEXTURE_2D ); + } + else { + Active_Texture( m_normaltextureunit ); + ::glDisable( GL_TEXTURE_2D ); + } } // diffuse texture unit. // NOTE: toggle actually disables diffuse texture mapping, unlike setup counterpart @@ -1282,7 +1289,9 @@ void opengl_renderer::Bind_Material( material_handle const Material ) { auto const &material = m_materials.material( Material ); - m_textures.bind( textureunit::normals, material.texture2 ); + if( false == Global::BasicRenderer ) { + m_textures.bind( textureunit::normals, material.texture2 ); + } m_textures.bind( textureunit::diffuse, material.texture1 ); } @@ -2041,8 +2050,8 @@ void opengl_renderer::Render( TSubModel *Submodel ) { if( ( Submodel->iVisible ) - && ( TSubModel::fSquareDist >= ( Submodel->fSquareMinDist / Global::fDistanceFactor ) ) - && ( TSubModel::fSquareDist <= ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ) { + && ( TSubModel::fSquareDist >= ( Submodel->fSquareMinDist / std::max( 1.f, Global::fDistanceFactor ) ) ) + && ( TSubModel::fSquareDist <= ( Submodel->fSquareMaxDist * std::max( 1.f, Global::fDistanceFactor ) ) ) ) { if( Submodel->iFlags & 0xC000 ) { ::glPushMatrix(); @@ -2702,8 +2711,8 @@ void opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // renderowanie przezroczystych przez DL if( ( Submodel->iVisible ) - && ( TSubModel::fSquareDist >= ( Submodel->fSquareMinDist / Global::fDistanceFactor ) ) - && ( TSubModel::fSquareDist <= ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ) { + && ( TSubModel::fSquareDist >= ( Submodel->fSquareMinDist / std::max( 1.f, Global::fDistanceFactor ) ) ) + && ( TSubModel::fSquareDist <= ( Submodel->fSquareMaxDist * std::max( 1.f, Global::fDistanceFactor ) ) ) ) { if( Submodel->iFlags & 0xC000 ) { ::glPushMatrix(); @@ -3187,17 +3196,29 @@ opengl_renderer::Init_caps() { Global::DynamicLightCount = std::min( Global::DynamicLightCount, maxlights - 1 ); WriteLog( "Dynamic light amount capped at " + std::to_string( Global::DynamicLightCount ) + " (" + std::to_string(maxlights) + " lights total supported by the gfx card)" ); } - { + // select renderer mode + if( true == Global::BasicRenderer ) { + WriteLog( "Basic renderer selected, shadow and reflection mapping will be disabled" ); + Global::RenderShadows = false; + m_diffusetextureunit = GL_TEXTURE0; + m_helpertextureunit = -1; + m_shadowtextureunit = -1; + m_normaltextureunit = -1; + } + else { GLint maxtextureunits; ::glGetIntegerv( GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &maxtextureunits ); if( maxtextureunits < 4 ) { WriteLog( "Less than 4 texture units, shadow and reflection mapping will be disabled" ); + Global::BasicRenderer = true; Global::RenderShadows = false; m_diffusetextureunit = GL_TEXTURE0; - m_shadowtextureunit = -1; m_helpertextureunit = -1; + m_shadowtextureunit = -1; + m_normaltextureunit = -1; } } + if( Global::iMultisampling ) { WriteLog( "Using multisampling x" + std::to_string( 1 << Global::iMultisampling ) ); } diff --git a/version.h b/version.h index f3543435..3221e61c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 815 +#define VERSION_MINOR 820 #define VERSION_REVISION 0 From 2b5a8288fe3e67e8ac7cd4e2c76071655b89c418 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 21 Aug 2017 18:32:34 +0200 Subject: [PATCH 168/426] maintenance: removed deprecated render code --- AnimModel.cpp | 17 +------------ AnimModel.h | 7 ------ Driver.cpp | 19 +++------------ Driver.h | 2 +- Model3d.cpp | 66 --------------------------------------------------- renderer.cpp | 1 - sky.cpp | 21 ---------------- sky.h | 3 --- stars.cpp | 18 -------------- stars.h | 3 --- 10 files changed, 5 insertions(+), 152 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 64eab101..778b4704 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -606,23 +606,8 @@ int TAnimModel::Flags() return i; }; -//----------------------------------------------------------------------------- -// 2011-03-16 funkcje renderowania z możliwością pochylania obiektów -//----------------------------------------------------------------------------- -#ifdef EU07_USE_OLD_RENDERCODE -void TAnimModel::Render( vector3 const &Position ) { - RaAnimate(); // jednorazowe przeliczenie animacji - RaPrepare(); - if( pModel ) // renderowanie rekurencyjne submodeli - GfxRenderer.Render( pModel, Material(), Position, vAngle ); -}; -void TAnimModel::RenderAlpha( vector3 const &Position ) { - RaPrepare(); - if( pModel ) // renderowanie rekurencyjne submodeli - GfxRenderer.Render_Alpha( pModel, Material(), Position, vAngle ); -}; -#endif //--------------------------------------------------------------------------- + bool TAnimModel::TerrainLoaded() { // zliczanie kwadratów kilometrowych (główna linia po Next) do tworznia tablicy return (this ? pModel != NULL : false); diff --git a/AnimModel.h b/AnimModel.h index cd5018ef..a542fe50 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -164,10 +164,6 @@ class TAnimModel { bool Load(cParser *parser, bool ter = false); TAnimContainer * AddContainer(char *pName); TAnimContainer * GetContainer(char *pName); -#ifdef EU07_USE_OLD_RENDERCODE - void Render( vector3 const &Position ); - void RenderAlpha( vector3 const &Position ); -#endif int Flags(); void RaAnglesSet(double a, double b, double c) { @@ -178,9 +174,6 @@ class TAnimModel { bool TerrainLoaded(); int TerrainCount(); TSubModel * TerrainSquare(int n); -#ifdef EU07_USE_OLD_RENDERCODE - void TerrainRenderVBO(int n); -#endif void AnimationVND(void *pData, double a, double b, double c, double d); void LightSet(int n, float v); static void AnimUpdate(double dt); diff --git a/Driver.cpp b/Driver.cpp index 7b653b34..177a280b 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -187,7 +187,7 @@ void TSpeedPos::CommandCheck() } }; -bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len, TOrders const &Orders ) +bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len ) { // przeliczenie odległości od punktu (*p), w kierunku (*dir), zaczynając od pojazdu // dla kolejnych pozycji podawane są współrzędne poprzedniego obiektu w (*p) vector3 v = vPos - *p; // wektor od poprzedniego obiektu (albo pojazdu) do punktu zmiany @@ -253,19 +253,6 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len, TOrders const &Ord if( trTrack->iCategoryFlag & 1 ) { // railways -/* - if( ( iFlags & spElapsed ) == 0 ) { - // jeśli nie wjechał - // TODO: remove this block when the detection of vehicles ahead is working properly - if( false == trTrack->Dynamics.empty() ) { - // to zabronić wjazdu (chyba że ten z przodu też jedzie prosto) - fVelNext = 25.0; // can't force full stop as it can prevent vehicles from leaving the track. slow down should be enough to ensure slow enough movement to stop - if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "Track " + trTrack->NameGet() + " is occupied. Vehicle count: " + std::to_string( trTrack->Dynamics.size() ) + ", distance: " + std::to_string( fDist ) + " m." ); - } - } - } -*/ if( iFlags & spSwitch ) { // jeśli odcinek zmienny if( ( ( trTrack->GetSwitchState() & 1 ) != 0 ) != @@ -701,7 +688,7 @@ void TController::TableCheck(double fDistance) { // aktualizacja rekordów z wyjątkiem ostatniego if (sSpeedTable[i].iFlags & spEnabled) // jeśli pozycja istotna { - if (sSpeedTable[i].Update(&pos, &dir, len, OrderCurrentGet())) + if(sSpeedTable[i].Update( &pos, &dir, len )) { if( Global::iWriteLogEnabled & 8 ) { WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->NameGet() + " (generating fresh trace)" ); @@ -744,7 +731,7 @@ void TController::TableCheck(double fDistance) } } } - sSpeedTable[iLast].Update(&pos, &dir, len, OrderCurrentGet()); // aktualizacja ostatniego + sSpeedTable[iLast].Update( &pos, &dir, len ); // aktualizacja ostatniego // WriteLog("TableCheck: Upate last track. Dist=" + AnsiString(sSpeedTable[iLast].fDist)); if( sSpeedTable[ iLast ].fDist < fDistance ) { TableTraceRoute( fDistance, pVehicles[ 1 ] ); // doskanowanie dalszego odcinka diff --git a/Driver.h b/Driver.h index 68d44633..2079a8e0 100644 --- a/Driver.h +++ b/Driver.h @@ -144,7 +144,7 @@ class TSpeedPos public: void Clear(); - bool Update(vector3 *p, vector3 *dir, double &len, TOrders const &Orders ); + bool Update(vector3 *p, vector3 *dir, double &len ); bool Set(TEvent *e, double d, TOrders order = Wait_for_orders); void Set(TTrack *t, double d, int f); std::string TableText(); diff --git a/Model3d.cpp b/Model3d.cpp index 1eea864a..12862a9d 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -645,72 +645,6 @@ basic_vertex *TSubModel::TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, return s->Vertices + pos; // wskaźnik na wolne miejsce w tabeli wierzchołków }; */ -#ifdef EU07_USE_OLD_RENDERCODE -void TSubModel::DisplayLists() -{ // utworznie po jednej skompilowanej liście dla - // każdego submodelu - if (Global::bUseVBO) - return; // Ra: przy VBO to się nie przyda - if (eType < TP_ROTATOR) - { - if (iNumVerts > 0) - { - uiDisplayList = glGenLists(1); - glNewList(uiDisplayList, GL_COMPILE); -#ifdef USE_VERTEX_ARRAYS - // ShaXbee-121209: przekazywanie wierzcholkow hurtem - glVertexPointer(3, GL_DOUBLE, sizeof(GLVERTEX), &Vertices[0].Point.x); - glNormalPointer(GL_DOUBLE, sizeof(GLVERTEX), &Vertices[0].Normal.x); - glTexCoordPointer(2, GL_FLOAT, sizeof(GLVERTEX), &Vertices[0].tu); - glDrawArrays(eType, 0, iNumVerts); -#else - glBegin(eType); - for (int i = 0; i < iNumVerts; i++) - { - /* - glNormal3dv(&Vertices[i].Normal.x); - glTexCoord2f(Vertices[i].tu,Vertices[i].tv); - glVertex3dv(&Vertices[i].Point.x); - */ - glNormal3fv(glm::value_ptr(Vertices[i].normal)); - glTexCoord2fv(glm::value_ptr(Vertices[i].material)); - glVertex3fv(glm::value_ptr(Vertices[i].position)); - }; - glEnd(); -#endif - glEndList(); - } - } - else if (eType == TP_FREESPOTLIGHT) - { - uiDisplayList = glGenLists(1); - glNewList(uiDisplayList, GL_COMPILE); - glBegin(GL_POINTS); - glVertex3f( 0.0f, 0.0f, -0.05f ); // shift point towards the viewer, to avoid z-fighting with the light polygons - glEnd(); - glEndList(); - } - else if (eType == TP_STARS) - { // punkty świecące dookólnie - uiDisplayList = glGenLists(1); - glNewList(uiDisplayList, GL_COMPILE); - glBegin(GL_POINTS); - for (int i = 0; i < iNumVerts; ++i) - { - glColor3fv(glm::value_ptr(Vertices[i].normal)); - glVertex3fv(glm::value_ptr(Vertices[i].position)); - }; - glEnd(); - glEndList(); - } - // SafeDeleteArray(Vertices); //przy VBO muszą zostać do załadowania całego - // modelu - if (Child) - Child->DisplayLists(); - if (Next) - Next->DisplayLists(); -}; -#endif void TSubModel::InitialRotate(bool doit) { // konwersja układu współrzędnych na zgodny ze scenerią diff --git a/renderer.cpp b/renderer.cpp index e741a261..39e4cd5c 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -250,7 +250,6 @@ opengl_renderer::Init( GLFWwindow *Window ) { } else { ErrorLog( "Shadows framebuffer setup failed" ); - m_framebuffersupport = false; Global::RenderShadows = false; } ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now diff --git a/sky.cpp b/sky.cpp index 86aba2fe..7d6ee679 100644 --- a/sky.cpp +++ b/sky.cpp @@ -24,25 +24,4 @@ void TSky::Init() { } }; -#ifdef EU07_USE_OLD_RENDERCODE -void TSky::Render( glm::vec3 const &Tint ) -{ - if (mdCloud) - { // jeśli jest model nieba - // setup - ::glEnable( GL_LIGHTING ); - GfxRenderer.Disable_Lights(); - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr(Tint) ); - // render - GfxRenderer.Render( mdCloud, nullptr, 100.0 ); - GfxRenderer.Render_Alpha( mdCloud, nullptr, 100.0 ); - // post-render cleanup - GLfloat noambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, noambient ); - ::glEnable( GL_LIGHT0 ); // other lights will be enabled during lights update - ::glDisable( GL_LIGHTING ); - } -}; -#endif - //--------------------------------------------------------------------------- diff --git a/sky.h b/sky.h index 4b544e0e..ca48434e 100644 --- a/sky.h +++ b/sky.h @@ -21,9 +21,6 @@ private: public: void Init(); -#ifdef EU07_USE_OLD_RENDERCODE - void Render( glm::vec3 const &Tint = glm::vec3(1.0f, 1.0f, 1.0f) ); -#endif }; //--------------------------------------------------------------------------- diff --git a/stars.cpp b/stars.cpp index ebbd84a6..b7c9ef79 100644 --- a/stars.cpp +++ b/stars.cpp @@ -12,21 +12,3 @@ cStars::init() { m_stars = TModelsManager::GetModel( "models\\skydome_stars.t3d", false ); } -#ifdef EU07_USE_OLD_RENDERCODE -void -cStars::render() { - // setup - ::glPushMatrix(); - - ::glRotatef( m_latitude, 1.0f, 0.0f, 0.0f ); // ustawienie osi OY na północ - ::glRotatef( -std::fmod( (float)Global::fTimeAngleDeg, 360.0f ), 0.0f, 1.0f, 0.0f ); // obrót dobowy osi OX - - ::glPointSize( 2.0f ); - // render - GfxRenderer.Render( &m_stars, nullptr, 1.0 ); - // post-render cleanup - ::glPointSize( 3.0f ); - - ::glPopMatrix(); -} -#endif diff --git a/stars.h b/stars.h index dc579ff5..7541bf77 100644 --- a/stars.h +++ b/stars.h @@ -15,9 +15,6 @@ public: // methods: void init(); -#ifdef EU07_USE_OLD_RENDERCODE - void render(); -#endif // constructors: // deconstructor: From c3975e96a02b60a824271473ea387d71ee932bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 20 Aug 2017 20:22:04 +0200 Subject: [PATCH 169/426] AI: Better acceleration with ElectricSeriesMotor - motor current is set acording to ahdesion and fuse limit --- Driver.cpp | 139 +++++++++++++++++++++++++++++++++++------------------ Driver.h | 1 + 2 files changed, 94 insertions(+), 46 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 177a280b..dd7a5004 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1719,7 +1719,41 @@ void TController::AutoRewident() fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 1 * fBrake_a1[BrakeAccTableSize]; fBrakeReaction = 1.00 + fLength*0.005; } -}; +} + +double TController::ESMVelocity(bool Main) +{ + double fCurrentCoeff = 0.9; + double fFrictionCoeff = 0.85; + double ESMVel = 9999; + int MCPN = mvControlling->MainCtrlActualPos; + int SCPN = mvControlling->ScndCtrlActualPos; + if (Main) + MCPN += 1; + else + SCPN += 1; + if ((mvControlling->RList[MCPN].ScndAct < 255)&&(mvControlling->ScndCtrlActualPos==0)) + SCPN = mvControlling->RList[MCPN].ScndAct; + double FrictionMax = mvControlling->Mass*9.81*mvControlling->Adhesive(mvControlling->RunningTrack.friction)*fFrictionCoeff; + double IF = mvControlling->Imax; + double MS = 0; + double Fmax = 0; + for (int i = 0; i < 5; i++) + { + MS = mvControlling->MomentumF(IF, IF, SCPN); + Fmax = MS * mvControlling->RList[MCPN].Bn*mvControlling->RList[MCPN].Mn * 2 / mvControlling->WheelDiameter * mvControlling->Transmision.Ratio; + IF = 0.5*IF*(1 + FrictionMax/Fmax); + } + IF = std::min(IF, mvControlling->Imax*fCurrentCoeff); + double R = mvControlling->RList[MCPN].R + mvControlling->CircuitRes + mvControlling->RList[MCPN].Mn*mvControlling->WindingRes; + double pole = mvControlling->MotorParam[SCPN].fi * + std::max(abs(IF) / (abs(IF) + mvControlling->MotorParam[SCPN].Isat) - mvControlling->MotorParam[SCPN].fi0, 0.0); + double Us = abs(mvControlling->Voltage) - IF*R; + double ns = std::max(0.0, Us / (pole*mvControlling->RList[MCPN].Mn)); + ESMVel = ns * mvControlling->WheelDiameter*M_PI*3.6/mvControlling->Transmision.Ratio; + return ESMVel; +} +; int TController::CheckDirection() { @@ -2469,51 +2503,64 @@ bool TController::IncSpeed() (mvControlling->StLinFlag)) // youBy polecił dodać 2012-09-08 v367 // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe // (zgaśnie DelayCtrlFlag) - if (Ready || (iDrivigFlags & movePress)) - if (fabs(mvControlling->Im) < - (fReady < 0.4 ? mvControlling->Imin : mvControlling->IminLo)) - { // Ra: wywalał nadmiarowy, bo Im może być ujemne; jak nie odhamowany, to nie - // przesadzać z prądem - if ((mvOccupied->Vel <= 30) || - (mvControlling->Imax > mvControlling->ImaxLo) || - (fVoltage + fVoltage < - mvControlling->EnginePowerSource.CollectorParameters.MinV + - mvControlling->EnginePowerSource.CollectorParameters.MaxV)) - { // bocznik na szeregowej przy ciezkich bruttach albo przy wysokim rozruchu - // pod górę albo przy niskim napięciu - if (mvControlling->MainCtrlPos ? - mvControlling->RList[mvControlling->MainCtrlPos].R > 0.0 : - true) // oporowa - { - OK = (mvControlling->DelayCtrlFlag ? - true : - mvControlling->IncMainCtrl(1)); // kręcimy nastawnik jazdy - if ((OK) && - (mvControlling->MainCtrlPos == - 1)) // czekaj na 1 pozycji, zanim się nie włączą liniowe - iDrivigFlags |= moveIncSpeed; - else - iDrivigFlags &= ~moveIncSpeed; // usunięcie flagi czekania - } - else // jeśli bezoporowa (z wyjątekiem 0) - OK = false; // to dać bocznik - } - else - { // przekroczone 30km/h, można wejść na jazdę równoległą - if (mvControlling->ScndCtrlPos) // jeśli ustawiony bocznik - if (mvControlling->MainCtrlPos < - mvControlling->MainCtrlPosNo - 1) // a nie jest ostatnia pozycja - mvControlling->DecScndCtrl(2); // to bocznik na zero po chamsku - // (ktoś miał to poprawić...) - OK = mvControlling->IncMainCtrl(1); - } - if ((mvControlling->MainCtrlPos > 2) && - (mvControlling->Im == 0)) // brak prądu na dalszych pozycjach - Need_TryAgain = true; // nie załączona lokomotywa albo wywalił - // nadmiarowy - else if (!OK) // nie da się wrzucić kolejnej pozycji - OK = mvControlling->IncScndCtrl(1); // to dać bocznik - } + if (Ready || (iDrivigFlags & movePress)) + { + bool scndctrl = ((mvOccupied->Vel <= 30) || + (mvControlling->Imax > mvControlling->ImaxLo) || + (fVoltage + fVoltage < + mvControlling->EnginePowerSource.CollectorParameters.MinV + + mvControlling->EnginePowerSource.CollectorParameters.MaxV) || + (mvControlling->MainCtrlPos == mvControlling->MainCtrlPosNo)); + scndctrl = ((scndctrl) && (mvControlling->MainCtrlPos > 1) && (mvControlling->RList[mvControlling->MainCtrlActualPos].R < 0.01)&& (mvControlling->ScndCtrlPos != mvControlling->ScndCtrlPosNo)); + double Vs = 99999; + if((mvControlling->MainCtrlPos != mvControlling->MainCtrlPosNo)||(mvControlling->ScndCtrlPos!=mvControlling->ScndCtrlPosNo)) + Vs = ESMVelocity(!scndctrl); + + if ((fabs(mvControlling->Im) < + (fReady < 0.4 ? mvControlling->Imin : mvControlling->IminLo))||(mvControlling->Vel>Vs)) + { // Ra: wywalał nadmiarowy, bo Im może być ujemne; jak nie odhamowany, to nie + // przesadzać z prądem + if ((mvOccupied->Vel <= 30) || + (mvControlling->Imax > mvControlling->ImaxLo) || + (fVoltage + fVoltage < + mvControlling->EnginePowerSource.CollectorParameters.MinV + + mvControlling->EnginePowerSource.CollectorParameters.MaxV)) + { // bocznik na szeregowej przy ciezkich bruttach albo przy wysokim rozruchu + // pod górę albo przy niskim napięciu + if (mvControlling->MainCtrlPos ? + mvControlling->RList[mvControlling->MainCtrlPos].R > 0.0 : + true) // oporowa + { + OK = (mvControlling->DelayCtrlFlag ? + true : + mvControlling->IncMainCtrl(1)); // kręcimy nastawnik jazdy + if ((OK) && + (mvControlling->MainCtrlPos == + 1)) // czekaj na 1 pozycji, zanim się nie włączą liniowe + iDrivigFlags |= moveIncSpeed; + else + iDrivigFlags &= ~moveIncSpeed; // usunięcie flagi czekania + } + else // jeśli bezoporowa (z wyjątekiem 0) + OK = false; // to dać bocznik + } + else + { // przekroczone 30km/h, można wejść na jazdę równoległą + if (mvControlling->ScndCtrlPos) // jeśli ustawiony bocznik + if (mvControlling->MainCtrlPos < + mvControlling->MainCtrlPosNo - 1) // a nie jest ostatnia pozycja + mvControlling->DecScndCtrl(2); // to bocznik na zero po chamsku + // (ktoś miał to poprawić...) + OK = mvControlling->IncMainCtrl(1); + } + if ((mvControlling->MainCtrlPos > 2) && + (mvControlling->Im == 0)) // brak prądu na dalszych pozycjach + Need_TryAgain = true; // nie załączona lokomotywa albo wywalił + // nadmiarowy + else if (!OK) // nie da się wrzucić kolejnej pozycji + OK = mvControlling->IncScndCtrl(1); // to dać bocznik + } + } mvControlling->AutoRelayCheck(); // sprawdzenie logiki sterowania break; case Dumb: diff --git a/Driver.h b/Driver.h index 2079a8e0..a182f9b1 100644 --- a/Driver.h +++ b/Driver.h @@ -310,6 +310,7 @@ class TController void Activation(); // umieszczenie obsady w odpowiednim członie void ControllingSet(); // znajduje człon do sterowania void AutoRewident(); // ustawia hamulce w składzie + double ESMVelocity(bool Main); public: Mtable::TTrainParameters *Timetable() { From 18043f2a0e302e2f3cd46fe24fdcf3638de34a0b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 21 Aug 2017 20:25:41 +0200 Subject: [PATCH 170/426] maintenance: removed deprecated audio code --- Train.cpp | 658 +----------------------------------------------------- 1 file changed, 2 insertions(+), 656 deletions(-) diff --git a/Train.cpp b/Train.cpp index 3db1a780..c46ff0bf 100644 --- a/Train.cpp +++ b/Train.cpp @@ -557,14 +557,7 @@ void TTrain::OnCommand_mastercontrollerincrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->mvControlled->IncMainCtrl( 1 ) ) { - // sound feedback - Train->play_sound( Train->dsbNastawnikJazdy ); - } -#else Train->mvControlled->IncMainCtrl( 1 ); -#endif } } @@ -572,14 +565,7 @@ void TTrain::OnCommand_mastercontrollerincreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->mvControlled->IncMainCtrl( 2 ) ) { - // sound feedback - Train->play_sound( Train->dsbNastawnikJazdy ); - } -#else Train->mvControlled->IncMainCtrl( 2 ); -#endif } } @@ -587,14 +573,7 @@ void TTrain::OnCommand_mastercontrollerdecrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->mvControlled->DecMainCtrl( 1 ) ) { - // sound feedback - Train->play_sound( Train->dsbNastawnikJazdy ); - } -#else Train->mvControlled->DecMainCtrl( 1 ); -#endif } } @@ -602,14 +581,7 @@ void TTrain::OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->mvControlled->DecMainCtrl( 2 ) ) { - // sound feedback - Train->play_sound( Train->dsbNastawnikJazdy ); - } -#else Train->mvControlled->DecMainCtrl( 2 ); -#endif } } @@ -622,16 +594,9 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con if( Train->mvControlled->AnPos > 1 ) Train->mvControlled->AnPos = 1; } -#ifdef EU07_USE_OLD_CONTROLSOUNDS - else if( Train->mvControlled->IncScndCtrl( 1 ) ) { - // sound feedback - Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); - } -#else else { Train->mvControlled->IncScndCtrl( 1 ); } -#endif } } @@ -639,14 +604,7 @@ void TTrain::OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->mvControlled->IncScndCtrl( 2 ) ) { - // sound feedback - Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); - } -#else Train->mvControlled->IncScndCtrl( 2 ); -#endif } } @@ -656,31 +614,11 @@ void TTrain::OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &C // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvOccupied->AutoRelayFlag ) { // turn on -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->mvOccupied->AutoRelaySwitch( true ) ) { - // audio feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - // NOTE: there's no button for notching relay control - // TBD, TODO: add notching relay control button? - } -#else Train->mvOccupied->AutoRelaySwitch( true ); -#endif } else { //turn off -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->mvOccupied->AutoRelaySwitch( false ) ) { - // audio feedback - Train->play_sound( Train->dsbSwitch ); - // visual feedback - // NOTE: there's no button for notching relay control - // TBD, TODO: add notching relay control button? - } -#else Train->mvOccupied->AutoRelaySwitch( false ); -#endif } } } @@ -697,24 +635,12 @@ void TTrain::OnCommand_mucurrentindicatorothersourceactivate( TTrain *Train, com if( Command.action == GLFW_PRESS ) { // turn on Train->ShowNextCurrent = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggNextCurrentButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggNextCurrentButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Command.action == GLFW_RELEASE ) { //turn off Train->ShowNextCurrent = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggNextCurrentButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggNextCurrentButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -729,14 +655,7 @@ void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data con if( Train->mvControlled->AnPos > 1 ) Train->mvControlled->AnPos = 1; } -#ifdef EU07_USE_OLD_CONTROLSOUNDS - else if( Train->mvControlled->DecScndCtrl( 1 ) ) { - // sound feedback - Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); - } -#else Train->mvControlled->DecScndCtrl( 1 ); -#endif } } @@ -744,14 +663,7 @@ void TTrain::OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( Train->mvControlled->DecScndCtrl( 2 ) ) { - // sound feedback - Train->play_sound( Train->dsbNastawnikBocz, Train->dsbNastawnikJazdy, DSBVOLUME_MAX, 0 ); - } -#else Train->mvControlled->DecScndCtrl( 2 ); -#endif } } @@ -813,12 +725,6 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons if( Command.action != GLFW_RELEASE ) { // press or hold Train->mvOccupied->BrakeReleaser( 1 ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggReleaserButton.GetValue() < 0.05 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggReleaserButton.UpdateValue( 1.0, Train->dsbSwitch ); } @@ -1020,12 +926,6 @@ void TTrain::OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const if( Command.action != GLFW_RELEASE ) { // press or hold Train->mvControlled->AntiSlippingBrake(); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggAntiSlipButton.GetValue() < 0.05 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbSwitch ); } @@ -1055,10 +955,6 @@ void TTrain::OnCommand_sandboxactivate( TTrain *Train, command_data const &Comma if( Command.action == GLFW_PRESS ) { // press Train->mvControlled->Sandbox( true ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - Train->play_sound( Train->dsbSwitch ); -#endif // visual feedback Train->ggSandButton.UpdateValue( 1.0, Train->dsbSwitch ); } @@ -1115,13 +1011,6 @@ void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data con Train->mvOccupied->BrakeDelayFlag << 1 : Train->mvOccupied->BrakeDelayFlag | bdelay_M ); if( true == Train->mvOccupied->BrakeDelaySwitch( fasterbrakesetting ) ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - Train->play_sound( Train->dsbSwitch ); -/* - Train->play_sound( Train->dsbPneumaticRelay ); -*/ -#endif // visual feedback if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { Train->ggBrakeProfileCtrl.UpdateValue( @@ -1160,13 +1049,6 @@ void TTrain::OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data con Train->mvOccupied->BrakeDelayFlag >> 1 : Train->mvOccupied->BrakeDelayFlag ^ bdelay_M ); if( true == Train->mvOccupied->BrakeDelaySwitch( slowerbrakesetting ) ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - Train->play_sound( Train->dsbSwitch ); -/* - Train->play_sound( Train->dsbPneumaticRelay ); -*/ -#endif // visual feedback if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { Train->ggBrakeProfileCtrl.UpdateValue( @@ -1211,24 +1093,12 @@ void TTrain::OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data con if( false == Train->mvControlled->Signalling) { // turn on Train->mvControlled->Signalling = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggSignallingButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggSignallingButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off Train->mvControlled->Signalling = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggSignallingButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggSignallingButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -1240,10 +1110,6 @@ void TTrain::OnCommand_reverserincrease( TTrain *Train, command_data const &Comm if( Command.action == GLFW_PRESS ) { if( Train->mvOccupied->DirectionForward() ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - Train->play_sound( Train->dsbReverserKey, Train->dsbSwitch, DSBVOLUME_MAX, 0 ); -#endif // aktualizacja skrajnych pojazdów w składzie if( ( Train->mvOccupied->ActiveDir ) && ( Train->DynamicObject->Mechanik ) ) { @@ -1259,10 +1125,6 @@ void TTrain::OnCommand_reverserdecrease( TTrain *Train, command_data const &Comm if( Command.action == GLFW_PRESS ) { if( Train->mvOccupied->DirectionBackward() ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - Train->play_sound( Train->dsbReverserKey, Train->dsbSwitch, DSBVOLUME_MAX, 0 ); -#endif // aktualizacja skrajnych pojazdów w składzie if( ( Train->mvOccupied->ActiveDir ) && ( Train->DynamicObject->Mechanik ) ) { @@ -1289,12 +1151,6 @@ void TTrain::OnCommand_alerteracknowledge( TTrain *Train, command_data const &Co } // visual feedback Train->ggSecurityResetButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggSecurityResetButton.GetValue() < 0.05 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { // release @@ -1322,10 +1178,6 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command if( Train->ggBatteryButton.SubModel ) { Train->ggBatteryButton.UpdateValue( 1.0, Train->dsbSwitch ); } -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - Train->play_sound( Train->dsbSwitch ); -#endif // side-effects if( Train->mvOccupied->LightsPosNo > 0 ) { Train->SetLights(); @@ -1344,10 +1196,6 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command if( Train->ggBatteryButton.SubModel ) { Train->ggBatteryButton.UpdateValue( 0.0, Train->dsbSwitch ); } -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - Train->play_sound( Train->dsbSwitch ); -#endif // side-effects if( false == Train->mvControlled->ConverterFlag ) { // if there's no (low voltage) power source left, drop pantographs @@ -1533,18 +1381,10 @@ void TTrain::OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_d if( Train->mvControlled->bPantKurek3 == false ) { // connect pantographs with primary tank Train->mvControlled->bPantKurek3 = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - Train->play_sound( Train->dsbSwitch ); -#endif } else { // connect pantograps with pantograph compressor Train->mvControlled->bPantKurek3 = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - Train->play_sound( Train->dsbSwitch ); -#endif } } } @@ -1567,12 +1407,6 @@ void TTrain::OnCommand_pantographcompressoractivate( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // press or hold to activate Train->mvControlled->PantCompFlag = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Command.action == GLFW_PRESS ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { // release to disable @@ -1599,13 +1433,6 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co // ...and rear Train->mvControlled->PantRearSP = false; Train->mvControlled->PantRear( false ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - // TODO: separate sound effect for pneumatic buttons - if( Train->ggPantAllDownButton.GetValue() < 0.35 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback if( Train->ggPantAllDownButton.SubModel ) Train->ggPantAllDownButton.UpdateValue( 1.0, Train->dsbSwitch ); @@ -1615,16 +1442,6 @@ void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Co } else if( Command.action == GLFW_RELEASE ) { // release the button -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback -/* - // NOTE: release sound disabled as this is typically pneumatic button - // TODO: separate sound effect for pneumatic buttons - if( Train->ggPantAllDownButton.GetValue() > 0.65 ) { - Train->play_sound( Train->dsbSwitch ); - } -*/ -#endif // visual feedback if( Train->ggPantAllDownButton.SubModel ) Train->ggPantAllDownButton.UpdateValue( 0.0 ); @@ -1663,23 +1480,11 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } if( Train->ggMainOnButton.SubModel != nullptr ) { // two separate switches to close and break the circuit -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Command.action == GLFW_PRESS ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggMainOnButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Train->ggMainButton.SubModel != nullptr ) { // single two-state switch -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Command.action == GLFW_PRESS ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggMainButton.UpdateValue( 1.0, Train->dsbSwitch ); } @@ -1722,12 +1527,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com if( Train->ggMainOffButton.SubModel != nullptr ) { // two separate switches to close and break the circuit -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Command.action == GLFW_PRESS ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggMainOffButton.UpdateValue( 1.0, Train->dsbSwitch ); } @@ -1748,12 +1547,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com else */ { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Command.action == GLFW_PRESS ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -1779,24 +1572,12 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // for setup with two separate swiches if( Train->ggMainOnButton.SubModel != nullptr ) { Train->ggMainOnButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggMainOnButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } if( Train->ggMainOffButton.SubModel != nullptr ) { Train->ggMainOffButton.UpdateValue( 0.0, Train->dsbSwitch ); } // and the two-state switch too, for good measure if( Train->ggMainButton.SubModel != nullptr ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggMainButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -1813,12 +1594,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); } } -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggMainOnButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback if( Train->ggMainOnButton.SubModel != nullptr ) { // setup with two separate switches @@ -1829,12 +1604,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz if( Train->mvControlled->TrainType == dt_EZT ) { if( Train->ggMainButton.SubModel != nullptr ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggMainButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -1859,12 +1628,6 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma if( ( false == Train->mvControlled->ConverterAllow ) && ( Train->ggConverterButton.GetValue() < 0.5 ) ) { // turn on -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggConverterButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggConverterButton.UpdateValue( 1.0, Train->dsbSwitch ); /* @@ -1892,19 +1655,6 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } else { //turn off -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->mvOccupied->ConvSwitchType == "impulse" ) { - if( Train->ggConverterOffButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } - } - else { - if( Train->ggConverterButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } - } -#endif // visual feedback Train->ggConverterButton.UpdateValue( 0.0, Train->dsbSwitch ); if( Train->ggConverterOffButton.SubModel != nullptr ) { @@ -1933,13 +1683,6 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma // on button release... if( Train->mvOccupied->ConvSwitchType == "impulse" ) { // ...return switches to start position if applicable -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( ( Train->ggConverterButton.GetValue() > 0.0 ) - || ( Train->ggConverterOffButton.GetValue() > 0.0 ) ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - } -#endif Train->ggConverterButton.UpdateValue( 0.0, Train->dsbSwitch ); Train->ggConverterOffButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -1961,12 +1704,6 @@ void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const & if( ( false == Train->mvOccupied->ConverterAllowLocal ) && ( Train->ggConverterLocalButton.GetValue() < 0.5 ) ) { // turn on -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggConverterLocalButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggConverterLocalButton.UpdateValue( 1.0, Train->dsbSwitch ); // effect @@ -1984,12 +1721,6 @@ void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const & } else { //turn off -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggConverterLocalButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggConverterLocalButton.UpdateValue( 0.0, Train->dsbSwitch ); // effect @@ -2029,23 +1760,11 @@ void TTrain::OnCommand_converteroverloadrelayreset( TTrain *Train, command_data && ( Train->mvControlled->TrainType != dt_EZT ) ) { Train->mvControlled->ConvOvldFlag = false; } -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggConverterFuseButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggConverterFuseButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Command.action == GLFW_RELEASE ) { // release -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggConverterFuseButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggConverterFuseButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2063,12 +1782,6 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm // turn on // visual feedback Train->ggCompressorButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggCompressorButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // impulse type switch has no effect if there's no power // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway // (we're presuming impulse type switch for all EMUs for the time being) @@ -2081,10 +1794,6 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm else { //turn off if( true == Train->mvControlled->CompressorSwitch( false ) ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - Train->play_sound( Train->dsbSwitch ); -#endif // NOTE: we don't have switch type definition for the compresor switch // so for the time being we have hard coded "impulse" switches for all EMUs // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz @@ -2131,25 +1840,13 @@ void TTrain::OnCommand_compressortogglelocal( TTrain *Train, command_data const // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvOccupied->CompressorAllowLocal ) { // turn on -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggCompressorLocalButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggCompressorLocalButton.UpdateValue( 1.0, Train->dsbSwitch ); // effect Train->mvOccupied->CompressorAllowLocal = true; } else { - //turn off -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggCompressorLocalButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif + // turn off // visual feedback Train->ggCompressorLocalButton.UpdateValue( 0.0, Train->dsbSwitch ); // effect @@ -2189,12 +1886,6 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = true; } } -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggStLinOffButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggStLinOffButton.UpdateValue( 1.0, Train->dsbSwitch ); // effect @@ -2238,12 +1929,6 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false; } } -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggStLinOffButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggStLinOffButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2269,12 +1954,6 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false; } } -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggStLinOffButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggStLinOffButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2291,14 +1970,7 @@ void TTrain::OnCommand_motordisconnect( TTrain *Train, command_data const &Comma } if( Command.action == GLFW_PRESS ) { -#ifdef EU07_USE_OLD_CONTROLSOUNDS - if( true == Train->mvControlled->CutOffEngine() ) { - // sound feedback - Train->play_sound( Train->dsbSwitch ); - } -#else Train->mvControlled->CutOffEngine(); -#endif } } @@ -2311,12 +1983,6 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command if( true == Train->mvControlled->CurrentSwitch( true ) ) { // visual feedback Train->ggMaxCurrentCtrl.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggMaxCurrentCtrl.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } else { @@ -2324,12 +1990,6 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command if( true == Train->mvControlled->CurrentSwitch( false ) ) { // visual feedback Train->ggMaxCurrentCtrl.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggMaxCurrentCtrl.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2347,23 +2007,11 @@ void TTrain::OnCommand_motoroverloadrelayreset( TTrain *Train, command_data cons if( Command.action == GLFW_PRESS ) { // press Train->mvControlled->FuseOn(); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggFuseButton.GetValue() < 0.05 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggFuseButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Command.action == GLFW_RELEASE ) { // release -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggFuseButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggFuseButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2388,24 +2036,12 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback Train->ggLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggLeftLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggLeftLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2429,24 +2065,12 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const & Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback Train->ggRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRightLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRightLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2470,24 +2094,12 @@ void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const & Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback Train->ggUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggUpperLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback Train->ggUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggUpperLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2511,24 +2123,12 @@ void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &C Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback Train->ggLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggLeftEndLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback Train->ggLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggLeftEndLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2552,24 +2152,12 @@ void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const & Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback Train->ggRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRightEndLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback Train->ggRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRightEndLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2594,24 +2182,12 @@ void TTrain::OnCommand_headlighttogglerearleft( TTrain *Train, command_data cons Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback Train->ggRearLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearLeftLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback Train->ggRearLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearLeftLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2636,24 +2212,12 @@ void TTrain::OnCommand_headlighttogglerearright( TTrain *Train, command_data con Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback Train->ggRearRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearRightLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback Train->ggRearRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearRightLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2677,24 +2241,12 @@ void TTrain::OnCommand_headlighttogglerearupper( TTrain *Train, command_data con Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback Train->ggRearUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearUpperLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; // visual feedback Train->ggRearUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearUpperLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2719,24 +2271,12 @@ void TTrain::OnCommand_redmarkertogglerearleft( TTrain *Train, command_data cons Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback Train->ggRearLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearLeftEndLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback Train->ggRearLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearLeftEndLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2761,24 +2301,12 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback Train->ggRearRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearRightEndLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback Train->ggRearRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggRearRightEndLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif } } } @@ -2799,24 +2327,12 @@ void TTrain::OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &C if( false == Train->DynamicObject->DimHeadlights ) { // turn on Train->DynamicObject->DimHeadlights = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggDimHeadlightsButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggDimHeadlightsButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off Train->DynamicObject->DimHeadlights = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggDimHeadlightsButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggDimHeadlightsButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2840,12 +2356,6 @@ void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &C // turn on Train->bCabLight = true; Train->btCabLight.TurnOn(); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggCabLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggCabLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } @@ -2853,12 +2363,6 @@ void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &C //turn off Train->bCabLight = false; Train->btCabLight.TurnOff(); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggCabLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggCabLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2880,24 +2384,12 @@ void TTrain::OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const if( false == Train->bCabLightDim ) { // turn on Train->bCabLightDim = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggCabLightDimButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggCabLightDimButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off Train->bCabLightDim = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggCabLightDimButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggCabLightDimButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2921,24 +2413,12 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const if( false == Train->InstrumentLightActive ) { // turn on Train->InstrumentLightActive = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggInstrumentLightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggInstrumentLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off Train->InstrumentLightActive = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggInstrumentLightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggInstrumentLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2959,24 +2439,12 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command if( false == Train->mvControlled->Heating ) { // turn on Train->mvControlled->Heating = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggTrainHeatingButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggTrainHeatingButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off Train->mvControlled->Heating = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggTrainHeatingButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggTrainHeatingButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2999,23 +2467,11 @@ void TTrain::OnCommand_generictoggle( TTrain *Train, command_data const &Command // only reacting to press, so the switch doesn't flip back and forth if key is held down if( item.GetValue() < 0.25 ) { // turn on -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( item.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback item.UpdateValue( 1.0, Train->dsbSwitch ); } else { - //turn off -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( item.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif + // turn off // visual feedback item.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -3038,12 +2494,6 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman // TODO: check wheter we really need separate flags for this Train->mvControlled->DoorSignalling = true; Train->mvOccupied->DoorBlocked = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggDoorSignallingButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggDoorSignallingButton.UpdateValue( 1.0, Train->dsbSwitch ); } @@ -3052,12 +2502,6 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman // TODO: check wheter we really need separate flags for this Train->mvControlled->DoorSignalling = false; Train->mvOccupied->DoorBlocked = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggDoorSignallingButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggDoorSignallingButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -3079,12 +2523,6 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorLeft( true ) ) { Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggDoorLeftButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif Train->play_sound( Train->dsbDoorOpen ); } } @@ -3092,12 +2530,6 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman // in the rear cab sides are reversed if( Train->mvOccupied->DoorRight( true ) ) { Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggDoorRightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif Train->play_sound( Train->dsbDoorOpen ); } } @@ -3107,12 +2539,6 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorLeft( false ) ) { Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif Train->play_sound( Train->dsbDoorClose ); } } @@ -3120,12 +2546,6 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman // in the rear cab sides are reversed if( Train->mvOccupied->DoorRight( false ) ) { Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggDoorRightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif Train->play_sound( Train->dsbDoorClose ); } } @@ -3148,12 +2568,6 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorRight( true ) ) { Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggDoorRightButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif Train->play_sound( Train->dsbDoorOpen ); } } @@ -3161,12 +2575,6 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma // in the rear cab sides are reversed if( Train->mvOccupied->DoorLeft( true ) ) { Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggDoorLeftButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif Train->play_sound( Train->dsbDoorOpen ); } } @@ -3176,12 +2584,6 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorRight( false ) ) { Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggDoorRightButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif Train->play_sound( Train->dsbDoorClose ); } } @@ -3189,12 +2591,6 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma // in the rear cab sides are reversed if( Train->mvOccupied->DoorLeft( false ) ) { Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // sound feedback - if( Train->ggDoorLeftButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif Train->play_sound( Train->dsbDoorClose ); } } @@ -3216,12 +2612,6 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com if( false == Train->mvControlled->DepartureSignal ) { // turn on Train->mvControlled->DepartureSignal = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggDepartureSignalButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggDepartureSignalButton.UpdateValue( 1.0, Train->dsbSwitch ); } @@ -3229,12 +2619,6 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com else if( Command.action == GLFW_RELEASE ) { // turn off Train->mvControlled->DepartureSignal = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggDepartureSignalButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggDepartureSignalButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -3261,13 +2645,6 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma Train->mvControlled->WarningSignal &= ~2; } */ -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( ( Train->ggHornButton.GetValue() > -0.5 ) - || ( Train->ggHornLowButton.GetValue() < 0.5 ) ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggHornButton.UpdateValue( -1.0 ); Train->ggHornLowButton.UpdateValue( 1.0 ); @@ -3280,13 +2657,6 @@ void TTrain::OnCommand_hornlowactivate( TTrain *Train, command_data const &Comma Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); */ Train->mvOccupied->WarningSignal &= ~1; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( ( Train->ggHornButton.GetValue() < -0.5 ) - || ( Train->ggHornLowButton.GetValue() > 0.5 ) ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggHornButton.UpdateValue( 0.0 ); Train->ggHornLowButton.UpdateValue( 0.0 ); @@ -3314,12 +2684,6 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm Train->mvControlled->WarningSignal &= ~1; } */ -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggHornButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggHornButton.UpdateValue( 1.0 ); Train->ggHornHighButton.UpdateValue( 1.0 ); @@ -3332,12 +2696,6 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm Train->mvOccupied->WarningSignal &= ~( 1 | 2 ); */ Train->mvOccupied->WarningSignal &= ~2; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggHornButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggHornButton.UpdateValue( 0.0 ); Train->ggHornHighButton.UpdateValue( 0.0 ); @@ -3361,24 +2719,12 @@ void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command ) if( false == Train->mvOccupied->Radio ) { // turn on Train->mvOccupied->Radio = true; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggRadioButton.GetValue() < 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggRadioButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { // turn off Train->mvOccupied->Radio = false; -#ifdef EU07_USE_OLD_CONTROLSOUNDS - // audio feedback - if( Train->ggRadioButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -#endif // visual feedback Train->ggRadioButton.UpdateValue( 0.0, Train->dsbSwitch ); } From a3bde32bc640db0b041fa52cab1a6b772442075b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 21 Aug 2017 20:32:24 +0200 Subject: [PATCH 171/426] build 170821. --- color.h | 6 +++--- moon.cpp | 29 ++++++++++++++--------------- sun.cpp | 29 +++++++++++------------------ version.h | 2 +- 4 files changed, 29 insertions(+), 37 deletions(-) diff --git a/color.h b/color.h index 56a15abb..0a618426 100644 --- a/color.h +++ b/color.h @@ -76,9 +76,9 @@ HSVtoRGB( glm::vec3 const &HSV ) { hh /= 60.0; int const i = (int)hh; float const ff = hh - i; - float const p = HSV.z * ( 1.0 - HSV.y ); - float const q = HSV.z * ( 1.0 - ( HSV.y * ff ) ); - float const t = HSV.z * ( 1.0 - ( HSV.y * ( 1.0 - ff ) ) ); + float const p = HSV.z * ( 1.f - HSV.y ); + float const q = HSV.z * ( 1.f - ( HSV.y * ff ) ); + float const t = HSV.z * ( 1.f - ( HSV.y * ( 1.f - ff ) ) ); switch( i ) { case 0: diff --git a/moon.cpp b/moon.cpp index 02db79f1..d4da4c38 100644 --- a/moon.cpp +++ b/moon.cpp @@ -37,8 +37,8 @@ cMoon::update() { move(); glm::vec3 position( 0.f, 0.f, -2000.f * Global::fDistanceFactor ); - position = glm::rotateX( position, glm::radians( m_body.elevref ) ); - position = glm::rotateY( position, glm::radians( -m_body.hrang ) ); + position = glm::rotateX( position, glm::radians( static_cast( m_body.elevref ) ) ); + position = glm::rotateY( position, glm::radians( static_cast( -m_body.hrang ) ) ); m_position = position; } @@ -46,17 +46,16 @@ cMoon::update() { void cMoon::render() { - glColor4f( 225.0f/255.0f, 225.0f/255.0f, 255.0f/255.0f, 1.f ); - // debug line to locate the sun easier - Math3D::vector3 position = m_position; - glBegin( GL_LINES ); - glVertex3f( position.x, position.y, position.z ); - glVertex3f( position.x, 0.0f, position.z ); - glEnd(); - glPushMatrix(); - glTranslatef( position.x, position.y, position.z ); - gluSphere( moonsphere, /* (float)( Global::iWindowHeight / Global::FieldOfView ) * 0.5 * */ ( m_body.distance / 60.2666 ) * 9.037461, 12, 12 ); - glPopMatrix(); + ::glColor4f( 225.f / 255.f, 225.f / 255.f, 255.f / 255.f, 1.f ); + // debug line to locate the moon easier + ::glBegin( GL_LINES ); + ::glVertex3fv( glm::value_ptr( m_position ) ); + ::glVertex3f( m_position.x, 0.f, m_position.z ); + ::glEnd(); + ::glPushMatrix(); + ::glTranslatef( m_position.x, m_position.y, m_position.z ); + ::gluSphere( moonsphere, /* (float)( Global::iWindowHeight / Global::FieldOfView ) * 0.5 * */ ( m_body.distance / 60.2666 ) * 9.037461, 12, 12 ); + ::glPopMatrix(); } glm::vec3 @@ -78,8 +77,8 @@ float cMoon::getIntensity() { // calculating intensity of the sun instead, and returning 15% of the value, // which roughly matches how much sunlight is reflected by the moon // We alter the intensity further based on current phase of the moon - auto const phasefactor = 1.0f - std::abs( m_phase - 29.53f * 0.5f ) / ( 29.53 * 0.5f ); - return (float)( m_body.etr/ 1399.0 ) * phasefactor * 0.15f; // arbitrary scaling factor taken from etrn value + auto const phasefactor = 1.0f - std::abs( m_phase - 29.53f * 0.5f ) / ( 29.53f * 0.5f ); + return static_cast( ( m_body.etr/ 1399.0 ) * phasefactor * 0.15 ); // arbitrary scaling factor taken from etrn value } void cMoon::setLocation( float const Longitude, float const Latitude ) { diff --git a/sun.cpp b/sun.cpp index ed08aa2b..9f4ac2b5 100644 --- a/sun.cpp +++ b/sun.cpp @@ -34,8 +34,8 @@ cSun::update() { move(); glm::vec3 position( 0.f, 0.f, -2000.f * Global::fDistanceFactor ); - position = glm::rotateX( position, glm::radians( m_body.elevref ) ); - position = glm::rotateY( position, glm::radians( -m_body.hrang ) ); + position = glm::rotateX( position, glm::radians( static_cast( m_body.elevref ) ) ); + position = glm::rotateY( position, glm::radians( static_cast( -m_body.hrang ) ) ); m_position = position; } @@ -43,24 +43,17 @@ cSun::update() { void cSun::render() { -/* - glLightfv(GL_LIGHT0, GL_POSITION, position.getVector() ); // sun - - GLfloat LightPosition[]= { 10.0f, 50.0f, -5.0f, 1.0f }; // ambient - glLightfv(GL_LIGHT1, GL_POSITION, LightPosition ); -*/ - glColor4f( 255.0f/255.0f, 242.0f/255.0f, 231.0f/255.0f, 1.f ); + ::glColor4f( 255.f / 255.f, 242.f / 255.f, 231.f / 255.f, 1.f ); // debug line to locate the sun easier - Math3D::vector3 position = m_position; - glBegin( GL_LINES ); - glVertex3f( position.x, position.y, position.z ); - glVertex3f( position.x, 0.0f, position.z ); - glEnd(); - glPushMatrix(); - glTranslatef( position.x, position.y, position.z ); + ::glBegin( GL_LINES ); + ::glVertex3fv( glm::value_ptr( m_position ) ); + ::glVertex3f( m_position.x, 0.f, m_position.z ); + ::glEnd(); + ::glPushMatrix(); + ::glTranslatef( m_position.x, m_position.y, m_position.z ); // radius is a result of scaling true distance down to 2km -- it's scaled by equal ratio - gluSphere( sunsphere, (float)(m_body.distance * 9.359157), 12, 12 ); - glPopMatrix(); + ::gluSphere( sunsphere, m_body.distance * 9.359157, 12, 12 ); + ::glPopMatrix(); } glm::vec3 diff --git a/version.h b/version.h index 3221e61c..99ba44c0 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 820 +#define VERSION_MINOR 821 #define VERSION_REVISION 0 From 3a63d1d346f2d961b35dbf51bbf19515b979e1c9 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 22 Aug 2017 20:07:27 +0200 Subject: [PATCH 172/426] better AI handling of emergency stop procedure, simplified lod visibility calculations, adjustable track geometry fidelity --- Driver.cpp | 96 +++++++++++++++++++++++-------------------- Globals.cpp | 17 ++++---- Globals.h | 4 +- Model3d.cpp | 2 +- Model3d.h | 2 +- Track.cpp | 2 +- renderer.cpp | 114 +++++++++++++++++++-------------------------------- renderer.h | 8 ++-- 8 files changed, 109 insertions(+), 136 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index dd7a5004..cb0aa49c 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -3614,11 +3614,11 @@ bool TController::UpdateSituation(double dt) } // basic emergency stop handling, while at it if( ( true == mvOccupied->EmergencyBrakeFlag ) // radio-stop - && ( mvOccupied->Vel < 0.01 ) // and actual stop + && ( mvOccupied->Vel == 0.0 ) // and actual stop && ( true == mvOccupied->Radio ) ) { // and we didn't touch the radio yet // turning off the radio should reset the flag, during security system check - if( m_radiocontroltime > 2.5 ) { - // arbitrary 2.5 sec delay between stop and disabling the radio + if( m_radiocontroltime > 5.0 ) { + // arbitrary delay between stop and disabling the radio mvOccupied->Radio = false; m_radiocontroltime = 0.0; } @@ -3629,7 +3629,7 @@ bool TController::UpdateSituation(double dt) if( ( false == mvOccupied->Radio ) && ( false == mvOccupied->EmergencyBrakeFlag ) ) { // otherwise if it's safe to do so, turn the radio back on - if( m_radiocontroltime > 5.0 ) { + if( m_radiocontroltime > 10.0 ) { // arbitrary 5 sec delay before switching radio back on mvOccupied->Radio = true; m_radiocontroltime = 0.0; @@ -4200,8 +4200,8 @@ bool TController::UpdateSituation(double dt) } ReactionTime = ( vel != 0.0 ? - 0.1 : // orientuj się, bo jest goraco - 2.0 ); // we're already standing still, so take it easy + 0.1 : // orientuj się, bo jest goraco + 2.0 ); // we're already standing still, so take it easy } else { if( OrderCurrentGet() & Connect ) { @@ -4498,13 +4498,47 @@ bool TController::UpdateSituation(double dt) // last step sanity check, until the whole calculation is straightened out AccDesired = std::min( AccDesired, AccPreferred ); - if (AIControllFlag) - { // część wykonawcza tylko dla AI, dla człowieka jedynie napisy + + + if (AIControllFlag) { + // część wykonawcza tylko dla AI, dla człowieka jedynie napisy + + // zapobieganie poslizgowi u nas + if (mvControlling->SlippingWheels) { + + if (!mvControlling->DecScndCtrl(2)) // bocznik na zero + mvControlling->DecMainCtrl(1); +/* + if (mvOccupied->BrakeCtrlPos == + mvOccupied->BrakeCtrlPosNo) // jeśli ostatnia pozycja hamowania + //yB: ten warunek wyżej nie ma sensu + mvOccupied->DecBrakeLevel(); // to cofnij hamulec + DecBrake(); // to cofnij hamulec + else + mvControlling->AntiSlippingButton(); +*/ + DecBrake(); // to cofnij hamulec + mvControlling->AntiSlippingButton(); + ++iDriverFailCount; + mvControlling->SlippingWheels = false; // flaga już wykorzystana + } + if (iDriverFailCount > maxdriverfails) + { + Psyche = Easyman; + if (iDriverFailCount > maxdriverfails * 2) + SetDriverPsyche(); + } + + if( ( true == mvOccupied->EmergencyBrakeFlag ) // radio-stop + && ( mvOccupied->Vel > 0.0 ) ) { // and still moving + // if the radio-stop was issued don't waste effort trying to fight it + while( true == DecSpeed() ) { ; } // just throttle down... + goto maintenance; // ...and don't touch any other controls + } + if (mvControlling->ConvOvldFlag || !mvControlling->Mains) // WS może wywalić z powodu błędu w drutach { // wywalił bezpiecznik nadmiarowy przetwornicy - // while (DecSpeed()); //zerowanie napędu - // Controlling->ConvOvldFlag=false; //reset nadmiarowego PrepareEngine(); // próba ponownego załączenia } // włączanie bezpiecznika @@ -4513,14 +4547,10 @@ bool TController::UpdateSituation(double dt) (mvControlling->EngineType == DieselElectric)) if (mvControlling->FuseFlag || Need_TryAgain) { - Need_TryAgain = - false; // true, jeśli druga pozycja w elektryku nie załapała - // if (!Controlling->DecScndCtrl(1)) //kręcenie po mału - // if (!Controlling->DecMainCtrl(1)) //nastawnik jazdy na 0 + Need_TryAgain = false; // true, jeśli druga pozycja w elektryku nie załapała mvControlling->DecScndCtrl(2); // nastawnik bocznikowania na 0 mvControlling->DecMainCtrl(2); // nastawnik jazdy na 0 - mvControlling->MainSwitch( - true); // Ra: dodałem, bo EN57 stawały po wywaleniu + mvControlling->MainSwitch(true); // Ra: dodałem, bo EN57 stawały po wywaleniu if (!mvControlling->FuseOn()) HelpMeFlag = true; else @@ -4532,7 +4562,7 @@ bool TController::UpdateSituation(double dt) SetDriverPsyche(); } } - // NOTE: stop-gap measure, effect limited to trains only while car calculations seem off + // NOTE: as a stop-gap measure the routine is limited to trains only while car calculations seem off if( mvControlling->CategoryFlag == 1 ) { if( -AccDesired * BrakeAccFactor() < ( ( fReady > 0.4 ) || ( VelNext > vel - 40.0 ) ? fBrake_a0[ 0 ] * 0.8 : -fAccThreshold ) ) AccDesired = std::max( -0.06, AccDesired ); @@ -4744,31 +4774,6 @@ bool TController::UpdateSituation(double dt) WriteLog("BrakePos=" + AnsiString(mvOccupied->BrakeCtrlPos) + ", MainCtrl=" + AnsiString(mvControlling->MainCtrlPos)); #endif - // zapobieganie poslizgowi u nas - if (mvControlling->SlippingWheels) - { - if (!mvControlling->DecScndCtrl(2)) // bocznik na zero - mvControlling->DecMainCtrl(1); -/* - if (mvOccupied->BrakeCtrlPos == - mvOccupied->BrakeCtrlPosNo) // jeśli ostatnia pozycja hamowania - //yB: ten warunek wyżej nie ma sensu - mvOccupied->DecBrakeLevel(); // to cofnij hamulec - DecBrake(); // to cofnij hamulec - else - mvControlling->AntiSlippingButton(); -*/ - DecBrake(); // to cofnij hamulec - mvControlling->AntiSlippingButton(); - ++iDriverFailCount; - mvControlling->SlippingWheels = false; // flaga już wykorzystana - } - if (iDriverFailCount > maxdriverfails) - { - Psyche = Easyman; - if (iDriverFailCount > maxdriverfails * 2) - SetDriverPsyche(); - } } // if (AIControllFlag) } // kierunek różny od zera else @@ -4801,6 +4806,8 @@ bool TController::UpdateSituation(double dt) else LastReactionTime += dt; +maintenance: + if ((fLastStopExpDist > 0.0) && (mvOccupied->DistCounter > fLastStopExpDist)) { iStationStart = TrainParams->StationIndex; // zaktualizować wyświetlanie rozkładu @@ -4817,9 +4824,8 @@ bool TController::UpdateSituation(double dt) ReactionTime = fWarningDuration; // wcześniejszy przebłysk świadomości, by zakończyć trąbienie } - if (mvOccupied->Vel >= - 3.0) // jesli jedzie, można odblokować trąbienie, bo się wtedy nie włączy - { + if (mvOccupied->Vel >= 3.0) { + // jesli jedzie, można odblokować trąbienie, bo się wtedy nie włączy iDrivigFlags &= ~moveStartHornDone; // zatrąbi dopiero jak następnym razem stanie iDrivigFlags |= moveStartHorn; // i trąbić przed następnym ruszeniem } diff --git a/Globals.cpp b/Globals.cpp index 6bc61dc2..323c849d 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -51,7 +51,6 @@ bool Global::ControlPicking = false; // indicates controls pick mode is enabled bool Global::InputMouse = true; // whether control pick mode can be activated int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // numer ekranu wyświetlacza tekstowego -double Global::fSunDeclination = 0.0; // deklinacja Słońca double Global::fTimeAngleDeg = 0.0; // godzina w postaci kąta float Global::fClockAngleDeg[6]; // kąty obrotu cylindrów dla zegara cyfrowego std::string Global::szTexturesTGA = ".tga"; // lista tekstur od TGA @@ -63,7 +62,6 @@ int Global::iErorrCounter = 0; // licznik sprawdzań do śledzenia błędów Ope int Global::iTextures = 0; // licznik użytych tekstur TWorld *Global::pWorld = NULL; cParser *Global::pParser = NULL; -int Global::iSegmentsRendered = 90; // ilość segmentów do regulacji wydajności TCamera *Global::pCamera = NULL; // parametry kamery TDynamicObject *Global::pUserDynamic = NULL; // pojazd użytkownika, renderowany bez trzęsienia TTranscripts Global::tranTexts; // obiekt obsługujący stenogramy dźwięków na ekranie @@ -132,6 +130,7 @@ bool Global::bUseVBO = false; // czy jest VBO w karcie graficznej (czy użyć) std::string Global::LastGLError; GLint Global::iMaxTextureSize = 4096; // maksymalny rozmiar tekstury bool Global::bSmoothTraction = false; // wygładzanie drutów starym sposobem +float Global::SplineFidelity { 1.f }; // determines segment size during conversion of splines to geometry std::string Global::szDefaultExt = Global::szTexturesDDS; // domyślnie od DDS int Global::iMultisampling = 2; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px bool Global::DLFont{ false }; // switch indicating presence of basic font @@ -150,7 +149,6 @@ double Global::fFpsMax = 65.0; // górna granica FPS, przy której promień scen double Global::fFpsRadiusMax = 3000.0; // maksymalny promień renderowania int Global::iFpsRadiusMax = 225; // maksymalny promień renderowania double Global::fRadiusFactor = 1.1; // współczynnik jednorazowej zmiany promienia scenerii -bool Global::bOldSmudge = false; // Używanie starej smugi // parametry testowe (do testowania scenerii i obiektów) bool Global::bWireFrame = false; @@ -572,6 +570,13 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::bSmoothTraction; } + else if( token == "splinefidelity" ) { + // segment size during spline->geometry conversion + float splinefidelity; + Parser.getTokens(); + Parser >> splinefidelity; + Global::SplineFidelity = clamp( splinefidelity, 1.f, 4.f ); + } else if (token == "timespeed") { // przyspieszenie czasu, zmienna do testów @@ -631,12 +636,6 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::bHideConsole; } - else if (token == "oldsmudge") - { - - Parser.getTokens(); - Parser >> Global::bOldSmudge; - } else if (token == "rollfix") { // Ra: poprawianie przechyłki, aby wewnętrzna szyna była "pozioma" diff --git a/Globals.h b/Globals.h index 73f52cb2..db70de30 100644 --- a/Globals.h +++ b/Globals.h @@ -274,7 +274,7 @@ class Global static double fMoveLight; // numer dnia w roku albo -1 static bool FakeLight; // toggle between fixed and dynamic daylight static bool bSmoothTraction; // wygładzanie drutów - static double fSunDeclination; // deklinacja Słońca + static float SplineFidelity; // determines segment size during conversion of splines to geometry static double fTimeSpeed; // przyspieszenie czasu, zmienna do testów static double fTimeAngleDeg; // godzina w postaci kąta static float fClockAngleDeg[6]; // kąty obrotu cylindrów dla zegara cyfrowego @@ -294,14 +294,12 @@ class Global static int iSlowMotionMask; // maska wyłączanych właściwości static int iModifyTGA; // czy korygować pliki TGA dla szybszego wczytywania static bool bHideConsole; // hunter-271211: ukrywanie konsoli - static bool bOldSmudge; // Używanie starej smugi static TWorld *pWorld; // wskaźnik na świat do usuwania pojazdów static TAnimModel *pTerrainCompact; // obiekt terenu do ewentualnego zapisania w pliku static std::string asTerrainModel; // nazwa obiektu terenu do zapisania w pliku static bool bRollFix; // czy wykonać przeliczanie przechyłki static cParser *pParser; - static int iSegmentsRendered; // ilość segmentów do regulacji wydajności static double fFpsAverage; // oczekiwana wartosć FPS static double fFpsDeviation; // odchylenie standardowe FPS static double fFpsMin; // dolna granica FPS, przy której promień scenerii będzie zmniejszany diff --git a/Model3d.cpp b/Model3d.cpp index 12862a9d..802e918e 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -28,7 +28,7 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others using namespace Mtable; -double TSubModel::fSquareDist = 0; +float TSubModel::fSquareDist = 0.f; size_t TSubModel::iInstance; // numer renderowanego egzemplarza obiektu texture_handle const *TSubModel::ReplacableSkinId = NULL; int TSubModel::iAlpha = 0x30300030; // maska do testowania flag tekstur wymiennych diff --git a/Model3d.h b/Model3d.h index a1072228..395bf40a 100644 --- a/Model3d.h +++ b/Model3d.h @@ -153,7 +153,7 @@ public: static size_t iInstance; // identyfikator egzemplarza, który aktualnie renderuje model static material_handle const *ReplacableSkinId; static int iAlpha; // maska bitowa dla danego przebiegu - static double fSquareDist; + static float fSquareDist; static TModel3d *pRoot; static std::string *pasText; // tekst dla wyświetlacza (!!!! do przemyślenia) ~TSubModel(); diff --git a/Track.cpp b/Track.cpp index 7dbb6be7..528b955c 100644 --- a/Track.cpp +++ b/Track.cpp @@ -527,7 +527,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) // na przechyłce doliczyć jeszcze pół przechyłki } if( fRadius != 0 ) // gdy podany promień - segsize = clamp( 0.2 + std::fabs( fRadius ) * 0.02, 2.0, 10.0 ); + segsize = clamp( std::fabs( fRadius ) * ( 0.02 / Global::SplineFidelity ), 2.0 / Global::SplineFidelity, 10.0 ); else segsize = 10.0; // for straights, 10m per segment works good enough diff --git a/renderer.cpp b/renderer.cpp index 39e4cd5c..4359b3f4 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1616,16 +1616,16 @@ opengl_renderer::Render( TGroundNode *Node ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); + distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ); + distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } } - if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) - || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { + if( ( distancesquared > Node->fSquareRadius ) + || ( distancesquared < Node->fSquareMinRadius ) ) { return false; } @@ -1671,28 +1671,12 @@ opengl_renderer::Render( TGroundNode *Node ) { Node->Model->RaPrepare(); if( Node->Model->pModel ) { // renderowanie rekurencyjne submodeli - switch( m_renderpass.draw_mode ) { - case rendermode::shadows: { - Render( - Node->Model->pModel, - Node->Model->Material(), - // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - SquareMagnitude( Node->pCenter - Global::pCameraPosition ), - Node->pCenter - m_renderpass.camera.position(), - Node->Model->vAngle ); - break; - } - default: { - auto const position = Node->pCenter - m_renderpass.camera.position(); - Render( - Node->Model->pModel, - Node->Model->Material(), - SquareMagnitude( position ), - position, - Node->Model->vAngle ); - break; - } - } + Render( + Node->Model->pModel, + Node->Model->Material(), + distancesquared, + Node->pCenter - m_renderpass.camera.position(), + Node->Model->vAngle ); } return true; } @@ -1726,7 +1710,7 @@ opengl_renderer::Render( TGroundNode *Node ) { break; } } - auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 32.0 ); + auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 8.0 ); if( linewidth > 1.0 ) { ::glLineWidth( static_cast( linewidth ) ); } @@ -1832,15 +1816,16 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { } // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - auto const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); - double squaredistance; + glm::dvec3 const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); + // lod visibility ranges are defined for base (x 1.0) viewing distance. for render we adjust them for actual range multiplier and zoom + float squaredistance; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { - squaredistance = SquareMagnitude( ( Dynamic->vPosition - Global::pCameraPosition ) / Global::ZoomFactor ); + squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global::pCameraPosition } } / Global::ZoomFactor ) / Global::fDistanceFactor; break; } default: { - squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); + squaredistance = glm::length2( glm::vec3{ originoffset } / Global::ZoomFactor ) / Global::fDistanceFactor; break; } } @@ -1995,7 +1980,7 @@ opengl_renderer::Render_cab( TDynamicObject *Dynamic ) { } bool -opengl_renderer::Render( TModel3d *Model, material_data const *Material, double const Squaredistance ) { +opengl_renderer::Render( TModel3d *Model, material_data const *Material, float const Squaredistance ) { auto alpha = ( Material != nullptr ? @@ -2027,7 +2012,7 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, double } bool -opengl_renderer::Render( TModel3d *Model, material_data const *Material, double const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { +opengl_renderer::Render( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { ::glPushMatrix(); ::glTranslated( Position.x, Position.y, Position.z ); @@ -2049,8 +2034,8 @@ void opengl_renderer::Render( TSubModel *Submodel ) { if( ( Submodel->iVisible ) - && ( TSubModel::fSquareDist >= ( Submodel->fSquareMinDist / std::max( 1.f, Global::fDistanceFactor ) ) ) - && ( TSubModel::fSquareDist <= ( Submodel->fSquareMaxDist * std::max( 1.f, Global::fDistanceFactor ) ) ) ) { + && ( TSubModel::fSquareDist >= Submodel->fSquareMinDist ) + && ( TSubModel::fSquareDist <= Submodel->fSquareMaxDist ) ) { if( Submodel->iFlags & 0xC000 ) { ::glPushMatrix(); @@ -2205,7 +2190,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { float const anglefactor = ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances - float const distancefactor = static_cast( std::max( 0.5, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / ( Submodel->fSquareMaxDist * Global::fDistanceFactor ) ) ); + float const distancefactor = std::max( 0.5f, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / Submodel->fSquareMaxDist ); if( lightlevel > 0.f ) { // material configuration: @@ -2424,16 +2409,16 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ); + distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ); + distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } } - if( ( distancesquared > ( Node->fSquareRadius * Global::fDistanceFactor ) ) - || ( distancesquared < ( Node->fSquareMinRadius / Global::fDistanceFactor ) ) ) { + if( ( distancesquared > Node->fSquareRadius ) + || ( distancesquared < Node->fSquareMinRadius ) ) { return false; } @@ -2488,28 +2473,12 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { Node->Model->RaPrepare(); if( Node->Model->pModel ) { // renderowanie rekurencyjne submodeli - switch( m_renderpass.draw_mode ) { - case rendermode::shadows: { - Render_Alpha( - Node->Model->pModel, - Node->Model->Material(), - // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - SquareMagnitude( Node->pCenter - Global::pCameraPosition ), - Node->pCenter - m_renderpass.camera.position(), - Node->Model->vAngle ); - break; - } - default: { - auto const position = Node->pCenter - m_renderpass.camera.position(); - Render_Alpha( - Node->Model->pModel, - Node->Model->Material(), - SquareMagnitude( position ), - position, - Node->Model->vAngle ); - break; - } - } + Render_Alpha( + Node->Model->pModel, + Node->Model->Material(), + distancesquared, + Node->pCenter - m_renderpass.camera.position(), + Node->Model->vAngle ); } return true; } @@ -2531,7 +2500,7 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { glm::vec4( Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla std::min( 1.0, linealpha ) ) ) ); - auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 32.0 ); + auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 8.0 ); if( linewidth > 1.0 ) { ::glLineWidth( static_cast(linewidth) ); } @@ -2589,15 +2558,16 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji - auto const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); - double squaredistance; + glm::dvec3 const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); + // lod visibility ranges are defined for base (x 1.0) viewing distance. for render we adjust them for actual range multiplier and zoom + float squaredistance; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { - squaredistance = SquareMagnitude( ( Dynamic->vPosition - Global::pCameraPosition ) / Global::ZoomFactor ); + squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global::pCameraPosition } } / Global::ZoomFactor ) / Global::fDistanceFactor; break; } default: { - squaredistance = SquareMagnitude( originoffset / Global::ZoomFactor ); + squaredistance = glm::length2( glm::vec3{ originoffset } / Global::ZoomFactor ) / Global::fDistanceFactor; break; } } @@ -2656,7 +2626,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { } bool -opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ) { +opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance ) { auto alpha = ( Material != nullptr ? @@ -2688,7 +2658,7 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, d } bool -opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { +opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { ::glPushMatrix(); ::glTranslated( Position.x, Position.y, Position.z ); @@ -2710,8 +2680,8 @@ void opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // renderowanie przezroczystych przez DL if( ( Submodel->iVisible ) - && ( TSubModel::fSquareDist >= ( Submodel->fSquareMinDist / std::max( 1.f, Global::fDistanceFactor ) ) ) - && ( TSubModel::fSquareDist <= ( Submodel->fSquareMaxDist * std::max( 1.f, Global::fDistanceFactor ) ) ) ) { + && ( TSubModel::fSquareDist >= Submodel->fSquareMinDist ) + && ( TSubModel::fSquareDist <= Submodel->fSquareMaxDist ) ) { if( Submodel->iFlags & 0xC000 ) { ::glPushMatrix(); @@ -3009,7 +2979,7 @@ opengl_renderer::Update( double const Deltatime ) { m_framerate = 1000.f / ( m_drawtime / 20.f ); // adjust draw ranges etc, based on recent performance - auto const framerate = 1000.0f / (m_drawtimecolorpass / 20.0f); + auto const framerate = 1000.f / (m_drawtimecolorpass / 20.f); float targetfactor; if( framerate > 90.0 ) { targetfactor = 3.0f; } diff --git a/renderer.h b/renderer.h index 81d991a7..51b3b374 100644 --- a/renderer.h +++ b/renderer.h @@ -277,9 +277,9 @@ private: bool Render( TDynamicObject *Dynamic ); bool - Render( TModel3d *Model, material_data const *Material, double const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + Render( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); bool - Render( TModel3d *Model, material_data const *Material, double const Squaredistance ); + Render( TModel3d *Model, material_data const *Material, float const Squaredistance ); void Render( TSubModel *Submodel ); void @@ -297,9 +297,9 @@ private: bool Render_Alpha( TDynamicObject *Dynamic ); bool - Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); bool - Render_Alpha( TModel3d *Model, material_data const *Material, double const Squaredistance ); + Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance ); void Render_Alpha( TSubModel *Submodel ); void From a41a666184fb4a803036cf960e5ecef0f786fdb9 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 23 Aug 2017 16:56:56 +0200 Subject: [PATCH 173/426] fixed animation rate of scene elements --- AnimModel.cpp | 43 +++++++++++-------- AnimModel.h | 5 ++- Driver.cpp | 14 +++---- Ground.cpp | 12 +++--- Ground.h | 8 +--- renderer.cpp | 113 ++++++++++++++++++++++++-------------------------- renderer.h | 1 + 7 files changed, 98 insertions(+), 98 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 778b4704..c0ff498b 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -205,8 +205,9 @@ void TAnimContainer::AnimSetVMD(double fNewSpeed) // "+AnsiString(pMovementData->f3Vector.y)+" "+AnsiString(pMovementData->f3Vector.z)); } -void TAnimContainer::UpdateModel() -{ // przeliczanie animacji wykonać tylko raz na model +// przeliczanie animacji wykonać tylko raz na model +void TAnimContainer::UpdateModel() { + if (pSubModel) // pozbyć się tego - sprawdzać wcześniej { if (fTranslateSpeed != 0.0) @@ -236,7 +237,7 @@ void TAnimContainer::UpdateModel() // zakończeniu } } - if (fRotateSpeed != 0) + if (fRotateSpeed != 0.0) { /* @@ -303,8 +304,9 @@ void TAnimContainer::UpdateModel() // zakończeniu } } - if (fAngleSpeed != 0.0) - { // obrót kwaternionu (interpolacja) + if( fAngleSpeed != 0.f ) { + // NOTE: this is angle- not quaternion-based rotation TBD, TODO: switch to quaternion rotations? + fAngleCurrent += fAngleSpeed * Timer::GetDeltaTime(); // aktualny parametr interpolacji } } }; @@ -322,15 +324,14 @@ void TAnimContainer::PrepareModel() { if (fAngleSpeed > 0.0f) { - fAngleCurrent += - fAngleSpeed * Timer::GetDeltaTime(); // aktualny parametr interpolacji if (fAngleCurrent >= 1.0f) { // interpolacja zakończona, ustawienie na pozycję końcową qCurrent = qDesired; fAngleSpeed = 0.0; // wyłączenie przeliczania wektora - if (evDone) - Global::AddToQuery(evDone, - NULL); // wykonanie eventu informującego o zakończeniu + if( evDone ) { + // wykonanie eventu informującego o zakończeniu + Global::AddToQuery( evDone, NULL ); + } } else { // obliczanie pozycji pośredniej @@ -412,9 +413,9 @@ TAnimModel::TAnimModel() iNumLights = 0; fBlinkTimer = 0; - for (int i = 0; i < iMaxNumLights; i++) + for (int i = 0; i < iMaxNumLights; ++i) { - LightsOn[i] = LightsOff[i] = NULL; // normalnie nie ma + LightsOn[i] = LightsOff[i] = nullptr; // normalnie nie ma lsLights[i] = ls_Off; // a jeśli są, to wyłączone } vAngle.x = vAngle.y = vAngle.z = 0.0; // zerowanie obrotów egzemplarza @@ -550,8 +551,15 @@ TAnimContainer * TAnimModel::GetContainer(char *pName) return AddContainer(pName); } -void TAnimModel::RaAnimate() -{ // przeliczenie animacji - jednorazowo na klatkę +// przeliczenie animacji - jednorazowo na klatkę +void TAnimModel::RaAnimate( unsigned int const Framestamp ) { + + if( Framestamp == m_framestamp ) { return; } + + fBlinkTimer -= Timer::GetDeltaTime(); + if( fBlinkTimer <= 0 ) + fBlinkTimer += fOffTime; + // Ra 2F1I: to by można pomijać dla modeli bez animacji, których jest większość TAnimContainer *pCurrent; for (pCurrent = pRoot; pCurrent != NULL; pCurrent = pCurrent->pNext) @@ -560,15 +568,14 @@ void TAnimModel::RaAnimate() // if () //tylko dla modeli z IK !!!! for (pCurrent = pRoot; pCurrent != NULL; pCurrent = pCurrent->pNext) // albo osobny łańcuch pCurrent->UpdateModelIK(); // przeliczenie odwrotnej kinematyki + + m_framestamp = Framestamp; }; void TAnimModel::RaPrepare() { // ustawia światła i animacje we wzorcu modelu przed renderowaniem egzemplarza - fBlinkTimer -= Timer::GetDeltaTime(); - if (fBlinkTimer <= 0) - fBlinkTimer = fOffTime; bool state; // stan światła - for (int i = 0; i < iNumLights; i++) + for (int i = 0; i < iNumLights; ++i) { switch (lsLights[i]) { diff --git a/AnimModel.h b/AnimModel.h index a542fe50..1aa11735 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -149,8 +149,9 @@ class TAnimModel { TLightState lsLights[iMaxNumLights]; float fDark; // poziom zapalanie światła (powinno być chyba powiązane z danym światłem?) float fOnTime, fOffTime; // były stałymi, teraz mogą być zmienne dla każdego egzemplarza - private: - void RaAnimate(); // przeliczenie animacji egzemplarza + unsigned int m_framestamp { 0 }; // id of last rendered gfx frame +private: + void RaAnimate( unsigned int const Framestamp ); // przeliczenie animacji egzemplarza void RaPrepare(); // ustawienie animacji egzemplarza na wzorcu public: static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania diff --git a/Driver.cpp b/Driver.cpp index cb0aa49c..ee243d95 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1253,7 +1253,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if( fBrakeDist > 0.0 ) { // maintain desired acc while we have enough room to brake safely, when close enough start paying attention // try to make a smooth transition instead of sharp change - a = interpolate( a, fAcc, clamp( ( d - fBrakeDist ) / fBrakeDist, 0.0, 1.0 ) ); + a = interpolate( a, AccPreferred, clamp( ( d - fBrakeDist ) / fBrakeDist, 0.0, 1.0 ) ); } if( ( d < fMinProximityDist ) && ( v < fVelDes ) ) { @@ -4059,17 +4059,13 @@ bool TController::UpdateSituation(double dt) switch (comm) { // ustawienie VelSignal - trochę proteza = do przemyślenia case cm_Ready: // W4 zezwolił na jazdę - TableCheck( - scanmax); // ewentualne doskanowanie trasy za W4, który zezwolił na jazdę - TableUpdate(VelDesired, ActualProximityDist, VelNext, - AccDesired); // aktualizacja po skanowaniu - // if (comm!=cm_SetVelocity) //jeśli dalej jest kolejny W4, to ma zwrócić - // cm_SetVelocity + // ewentualne doskanowanie trasy za W4, który zezwolił na jazdę + TableCheck( scanmax); + TableUpdate(VelDesired, ActualProximityDist, VelNext, AccDesired); // aktualizacja po skanowaniu if (VelNext == 0.0) break; // ale jak coś z przodu zamyka, to ma stać if (iDrivigFlags & moveStopCloser) - VelSignal = -1.0; // niech jedzie, jak W4 puściło - nie, ma czekać na - // sygnał z sygnalizatora! + VelSignal = -1.0; // ma czekać na sygnał z sygnalizatora! case cm_SetVelocity: // od wersji 357 semafor nie budzi wyłączonej lokomotywy if (!(OrderList[OrderPos] & ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders diff --git a/Ground.cpp b/Ground.cpp index f87bb069..d5f309dc 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -356,13 +356,17 @@ bool TSubRect::RaTrackAnimAdd(TTrack *t) return false; // będzie animowane... } -void TSubRect::RaAnimate() -{ // wykonanie animacji - if( tTrackAnim == nullptr ) { +// wykonanie animacji +void TSubRect::RaAnimate( unsigned int const Framestamp ) { + + if( ( tTrackAnim == nullptr ) + || ( Framestamp == m_framestamp ) ) { // nie ma nic do animowania return; } tTrackAnim = tTrackAnim->RaAnimate(); // przeliczenie animacji kolejnego + + m_framestamp = Framestamp; }; TTraction * TSubRect::FindTraction(glm::dvec3 const &Point, int &iConnection, TTraction *Exclude) @@ -431,8 +435,6 @@ void TSubRect::RenderSounds() //--------------------------------------------------------------------------- //------------------ Kwadrat kilometrowy ------------------------------------ //--------------------------------------------------------------------------- -int TGroundRect::iFrameNumber = 0; // licznik wyświetlanych klatek - TGroundRect::~TGroundRect() { SafeDeleteArray(pSubRects); diff --git a/Ground.h b/Ground.h index 13bc46cd..21dd6399 100644 --- a/Ground.h +++ b/Ground.h @@ -171,6 +171,7 @@ class TSubRect : /*public Resource,*/ public CMesh { // sektor składowy kwadratu kilometrowego public: bounding_area m_area; + unsigned int m_framestamp { 0 }; // id of last rendered gfx frame int iTracks = 0; // ilość torów w (tTracks) TTrack **tTracks = nullptr; // tory do renderowania pojazdów protected: @@ -192,15 +193,12 @@ class TSubRect : /*public Resource,*/ public CMesh void LoadNodes(); // utworzenie VBO sektora public: virtual ~TSubRect(); -/* - virtual void Release(); // zwalnianie VBO sektora -*/ virtual void NodeAdd(TGroundNode *Node); // dodanie obiektu do sektora na etapie rozdzielania na sektory void Sort(); // optymalizacja obiektów w sektorze (sortowanie wg tekstur) TTrack * FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude); TTraction * FindTraction(glm::dvec3 const &Point, int &iConnection, TTraction *Exclude); bool RaTrackAnimAdd(TTrack *t); // zgłoszenie toru do animacji - void RaAnimate(); // przeliczenie animacji torów + void RaAnimate( unsigned int const Framestamp ); // przeliczenie animacji torów void RenderSounds(); // dźwięki pojazdów z niewidocznych sektorów }; @@ -221,7 +219,6 @@ class TGroundRect : public TSubRect private: TSubRect *pSubRects { nullptr }; - int iLastDisplay; // numer klatki w której był ostatnio wyświetlany void Init(); @@ -251,7 +248,6 @@ public: // optymalizacja obiektów w sektorach pSubRects[ i ].Sort(); } } }; - static int iFrameNumber; // numer kolejny wyświetlanej klatki TGroundNode *nTerrain { nullptr }; // model terenu z E3D - użyć nRootMesh? }; diff --git a/renderer.cpp b/renderer.cpp index 4359b3f4..4cd8d5da 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -320,6 +320,7 @@ opengl_renderer::Render() { m_renderpass.draw_mode = rendermode::none; // force setup anew m_debuginfo.clear(); + ++m_framestamp; Render_pass( rendermode::color ); m_drawcount = m_drawqueue.size(); @@ -1330,8 +1331,6 @@ opengl_renderer::Texture( texture_handle const Texture ) const { bool opengl_renderer::Render( TGround *Ground ) { - ++TGroundRect::iFrameNumber; // zwięszenie licznika ramek (do usuwniania nadanimacji) - m_drawqueue.clear(); switch( m_renderpass.draw_mode ) { @@ -1440,73 +1439,70 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { bool result { false }; // will be true if we do any rendering - if( Groundcell->iLastDisplay != Groundcell->iFrameNumber ) { - // tylko jezeli dany kwadrat nie był jeszcze renderowany - Groundcell->LoadNodes(); // ewentualne tworzenie siatek + Groundcell->LoadNodes(); // ewentualne tworzenie siatek - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // non-interactive scenery elements get neutral colour - ::glColor3fv( glm::value_ptr( colors::none ) ); - } - case rendermode::color: - case rendermode::reflections: { - if( Groundcell->nRenderRect != nullptr ) { - // nieprzezroczyste trójkąty kwadratu kilometrowego - for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { - Render( node ); - } + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // non-interactive scenery elements get neutral colour + ::glColor3fv( glm::value_ptr( colors::none ) ); + } + case rendermode::color: + case rendermode::reflections: { + if( Groundcell->nRenderRect != nullptr ) { + // nieprzezroczyste trójkąty kwadratu kilometrowego + for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { + Render( node ); } - break; + result = true; } - case rendermode::shadows: { - if( Groundcell->nRenderRect != nullptr ) { - // experimental, for shadows render both back and front faces, to supply back faces of the 'forest strips' - ::glDisable( GL_CULL_FACE ); - // nieprzezroczyste trójkąty kwadratu kilometrowego - for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - ::glEnable( GL_CULL_FACE ); + break; + } + case rendermode::shadows: { + if( Groundcell->nRenderRect != nullptr ) { + // experimental, for shadows render both back and front faces, to supply back faces of the 'forest strips' + ::glDisable( GL_CULL_FACE ); + // nieprzezroczyste trójkąty kwadratu kilometrowego + for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { + Render( node ); } - } - case rendermode::pickcontrols: - default: { - break; + result = true; + ::glEnable( GL_CULL_FACE ); } } + case rendermode::pickcontrols: + default: { + break; + } + } #ifdef EU07_USE_OLD_TERRAINCODE - if( Groundcell->nTerrain ) { + if( Groundcell->nTerrain ) { - Render( Groundcell->nTerrain ); - } + Render( Groundcell->nTerrain ); + } #endif - Groundcell->iLastDisplay = Groundcell->iFrameNumber; // drugi raz nie potrzeba - result = true; - // add the subcells of the cell to the draw queue - switch( m_renderpass.draw_mode ) { - case rendermode::color: - case rendermode::shadows: - case rendermode::pickscenery: { - if( Groundcell->pSubRects != nullptr ) { - for( std::size_t subcellindex = 0; subcellindex < iNumSubRects * iNumSubRects; ++subcellindex ) { - auto subcell = Groundcell->pSubRects + subcellindex; - if( subcell->iNodeCount ) { - // o ile są jakieś obiekty, bo po co puste sektory przelatywać - m_drawqueue.emplace_back( - glm::length2( m_renderpass.camera.position() - glm::dvec3( subcell->m_area.center ) ), - subcell ); - } + // add the subcells of the cell to the draw queue + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::shadows: + case rendermode::pickscenery: { + if( Groundcell->pSubRects != nullptr ) { + for( std::size_t subcellindex = 0; subcellindex < iNumSubRects * iNumSubRects; ++subcellindex ) { + auto subcell = Groundcell->pSubRects + subcellindex; + if( subcell->iNodeCount ) { + // o ile są jakieś obiekty, bo po co puste sektory przelatywać + m_drawqueue.emplace_back( + glm::length2( m_renderpass.camera.position() - glm::dvec3( subcell->m_area.center ) ), + subcell ); } } - break; - } - case rendermode::reflections: - case rendermode::pickcontrols: - default: { - break; } + break; + } + case rendermode::reflections: + case rendermode::pickcontrols: + default: { + break; } } return result; @@ -1518,7 +1514,8 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { // oznaczanie aktywnych sektorów Groundsubcell->LoadNodes(); - Groundsubcell->RaAnimate(); // przeliczenia animacji torów w sektorze + // przeliczenia animacji torów w sektorze + Groundsubcell->RaAnimate( m_framestamp ); TGroundNode *node; @@ -1667,7 +1664,7 @@ opengl_renderer::Render( TGroundNode *Node ) { break; } } - Node->Model->RaAnimate(); // jednorazowe przeliczenie animacji + Node->Model->RaAnimate( m_framestamp ); // jednorazowe przeliczenie animacji Node->Model->RaPrepare(); if( Node->Model->pModel ) { // renderowanie rekurencyjne submodeli diff --git a/renderer.h b/renderer.h index 51b3b374..067f64c0 100644 --- a/renderer.h +++ b/renderer.h @@ -350,6 +350,7 @@ private: int m_diffusetextureunit{ GL_TEXTURE3 }; units_state m_unitstate; + unsigned int m_framestamp; // id of currently rendered gfx frame float m_drawtime { 1000.f / 30.f * 20.f }; // start with presumed 'neutral' average of 30 fps std::chrono::steady_clock::time_point m_drawstart; // cached start time of previous frame float m_framerate; From 42aab5203806b32a57d7a91b5d3d54dc17dab397 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 24 Aug 2017 03:12:04 +0200 Subject: [PATCH 174/426] Build 170823. tweaks to AI brake handling --- Driver.cpp | 126 +++++++++++++++++++++++++++++++---------------------- Driver.h | 3 ++ World.cpp | 2 +- version.h | 2 +- 4 files changed, 78 insertions(+), 55 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index ee243d95..2872d265 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1250,10 +1250,11 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else { // przyspieszenie: ujemne, gdy trzeba hamować a = ( v * v - mvOccupied->Vel * mvOccupied->Vel ) / ( 25.92 * d ); - if( fBrakeDist > 0.0 ) { + auto const brakingdistance = fBrakeDist * braking_distance_multiplier( v ); + if( brakingdistance > 0.0 ) { // maintain desired acc while we have enough room to brake safely, when close enough start paying attention // try to make a smooth transition instead of sharp change - a = interpolate( a, AccPreferred, clamp( ( d - fBrakeDist ) / fBrakeDist, 0.0, 1.0 ) ); + a = interpolate( a, AccPreferred, clamp( ( d - brakingdistance ) / brakingdistance, 0.0, 1.0 ) ); } if( ( d < fMinProximityDist ) && ( v < fVelDes ) ) { @@ -1318,6 +1319,16 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN return go; }; +// modifies brake distance for low target speeds, to ease braking rate in such situations +float +TController::braking_distance_multiplier( float const Targetvelocity ) { + + if( Targetvelocity > 65.f ) { return 1.f; } + if( Targetvelocity < 5.f ) { return 1.f; } + // stretch the braking distance up to 3 times; the lower the speed, the greater the stretch + return interpolate( 3.f, 1.f, ( Targetvelocity - 5.f ) / 60.f ); +} + void TController::TablePurger() { // odtykacz: usuwa mniej istotne pozycje ze środka tabelki, aby uniknąć zatkania //(np. brak ograniczenia pomiędzy zwrotnicami, usunięte sygnały, minięte odcinki łuku) @@ -1998,10 +2009,11 @@ void TController::SetVelocity(double NewVel, double NewVelNext, TStopReason r) double TController::BrakeAccFactor() { -// double Factor = 1 + fBrakeReaction*mvOccupied->Vel / (std::max(0.0, ActualProximityDist) + 1); - double Factor = 1; - if((ActualProximityDist>fMinProximityDist)||(mvOccupied->VelBrakeCtrlPosR < 0.5 ? 1.5 : 1))*mvOccupied->Vel / (std::max(0.0, ActualProximityDist) + 1) * ((AccDesired - AbsAccS_pub) / fAccThreshold); + double Factor = 1.0; + if( ( ActualProximityDist > fMinProximityDist ) + || ( mvOccupied->Vel > VelDesired + fVelPlus ) ) { + Factor += ( fBrakeReaction * ( mvOccupied->BrakeCtrlPosR < 0.5 ? 1.5 : 1 ) ) * mvOccupied->Vel / ( std::max( 0.0, ActualProximityDist ) + 1 ) * ( ( AccDesired - AbsAccS_pub ) / fAccThreshold ); + } return Factor; } @@ -2375,8 +2387,12 @@ bool TController::IncBrake() if( deltaAcc > fBrake_a1[0]) { - if (mvOccupied->BrakeCtrlPosR<0.1) - OK = mvOccupied->BrakeLevelAdd(1.0); + if( mvOccupied->BrakeCtrlPosR < 0.1 ) { + OK = mvOccupied->BrakeLevelAdd( ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + 1.0 : + 1.25 ) ); + } else { OK = mvOccupied->BrakeLevelAdd(0.25); @@ -3860,7 +3876,8 @@ bool TController::UpdateSituation(double dt) // margines prędkości powodujący załączenie napędu; min 1.0 żeby nie ruszał przy 0.1 fVelMinus = clamp( std::round( 0.05 * VelDesired ), 1.0, 5.0 ); // normalnie dopuszczalne przekroczenie to 5% prędkości ale nie więcej niż 5km/h - fVelPlus = std::min( 5.0, std::ceil( 0.05 * VelDesired ) ); + // bottom margin raised to 2 km/h to give the AI more leeway at low speed limits + fVelPlus = clamp( std::ceil( 0.05 * VelDesired ), 2.0, 5.0 ); } } else { @@ -4324,24 +4341,24 @@ bool TController::UpdateSituation(double dt) // gdy zbliża się i jest za szybki do nowej prędkości, albo stoi na zatrzymaniu if (vel > 0.0) { // jeśli jedzie - if ((vel < VelNext) ? - (ActualProximityDist > fMaxProximityDist * (1 + 0.1 * vel)) : - false) // dojedz do semafora/przeszkody - { // jeśli jedzie wolniej niż można i jest wystarczająco daleko, to można - // przyspieszyć + if( ( vel < VelNext ) + && ( ActualProximityDist > fMaxProximityDist * ( 1.0 + 0.1 * vel ) ) ) { + // dojedz do semafora/przeszkody + // jeśli jedzie wolniej niż można i jest wystarczająco daleko, to można przyspieszyć if (AccPreferred > 0.0) // jeśli nie ma zawalidrogi AccDesired = AccPreferred; - // VelDesired:=Min0R(VelDesired,VelReduced+VelNext); } else if (ActualProximityDist > fMinProximityDist) { // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze jest daleko if (ActualProximityDist < fMaxProximityDist) { // jak minął już maksymalny dystans po prostu hamuj (niski stopień) // ma stanąć, a jest w drodze hamowania albo ma jechać - // hamowanie tak, aby stanąć - AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); - AccDesired = std::min(AccDesired, fAccThreshold); - VelDesired = 0.0; + VelDesired = VelNext; + if( VelDesired == 0.0 ) { + // hamowanie tak, aby stanąć + AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); + AccDesired = std::min( AccDesired, fAccThreshold ); + } } else if ((vel < VelNext + fVelPlus)||((vel fBrakeDist) { // jeśli ma stanąć, a mieści się w drodze hamowania if (vel < 10.0) // jeśli prędkość jest łatwa do zatrzymania @@ -4402,7 +4418,9 @@ bool TController::UpdateSituation(double dt) } } } - else { // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) +*/ + else { + // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) double dist = 0;// (VelNext * VelNext - (VelNext + 20) * (VelNext + 20)) / (25.92)*(-1 / fBrake_a0[0] - 1 / fAccThreshold); // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever AccDesired = @@ -4415,21 +4433,14 @@ bool TController::UpdateSituation(double dt) VelNext + dist ) ) + 0.1 ); // najpierw hamuje mocniej, potem zluzuje } - if (AccPreferred < AccDesired) - AccDesired = AccPreferred; //(1+abs(AccDesired)) - // ReactionTime=0.5*mvOccupied->BrakeDelay[2+2*mvOccupied->BrakeDelayFlag]; - // //aby szybkosc hamowania zalezala od przyspieszenia i opoznienia - // hamulcow - // fBrakeTime=0.5*mvOccupied->BrakeDelay[2+2*mvOccupied->BrakeDelayFlag]; - // //aby szybkosc hamowania zalezala od przyspieszenia i opoznienia - // hamulcow + AccDesired = std::min( AccDesired, AccPreferred ); } else { // jest bliżej niż fMinProximityDist VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); // utrzymuj predkosc bo juz blisko - if( vel < VelNext + fVelPlus ) { + if( vel <= VelNext + fVelPlus ) { // jeśli niewielkie przekroczenie, ale ma jechać - AccDesired = std::min( 0.0, AccPreferred ); // to olej (zacznij luzować) + AccDesired = std::max( 0.0, AccPreferred ); // to olej (zacznij luzować) } ReactionTime = 0.1; // i orientuj się szybciej } @@ -4560,10 +4571,16 @@ bool TController::UpdateSituation(double dt) } // NOTE: as a stop-gap measure the routine is limited to trains only while car calculations seem off if( mvControlling->CategoryFlag == 1 ) { - if( -AccDesired * BrakeAccFactor() < ( ( fReady > 0.4 ) || ( VelNext > vel - 40.0 ) ? fBrake_a0[ 0 ] * 0.8 : -fAccThreshold ) ) + if( -AccDesired * BrakeAccFactor() < ( + ( ( fReady > 0.4 ) || ( VelNext > vel - 40.0 ) ) ? + fBrake_a0[ 0 ] * 0.8 : + -fAccThreshold ) + / braking_distance_multiplier( VelNext ) ) { AccDesired = std::max( -0.06, AccDesired ); - else + } + else { ReactionTime = 0.25; // i orientuj się szybciej, jeśli hamujesz + } } if (mvOccupied->BrakeSystem == Pneumatic) // napełnianie uderzeniowe if (mvOccupied->BrakeHandle == FV4a) @@ -4719,23 +4736,26 @@ bool TController::UpdateSituation(double dt) } // type & dt_ezt else { // a stara wersja w miarę dobrze działa na składy wagonowe - if( ( ( fAccGravity < -0.05 ) && ( vel < 0.0 ) ) - || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { - // u góry ustawia się hamowanie na fAccThreshold - if( ( fBrakeTime < 0.0 ) - || ( AccDesired < fAccGravity - 0.3 ) - || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { - // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował - if( true == IncBrake() ) { - fBrakeTime = - 3.0 - + 0.5 * ( ( - mvOccupied->BrakeDelayFlag > bdelay_G ? - mvOccupied->BrakeDelay[ 1 ] : - mvOccupied->BrakeDelay[ 3 ] ) - - 3.0 ); - // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy - fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 + if( ( VelNext == 0.0 ) + || ( vel > VelNext + fVelPlus ) ) { + if( ( ( fAccGravity < -0.05 ) && ( vel < 0.0 ) ) + || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { + // u góry ustawia się hamowanie na fAccThreshold + if( ( fBrakeTime < 0.0 ) + || ( AccDesired < fAccGravity - 0.3 ) + || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { + // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował + if( true == IncBrake() ) { + fBrakeTime = + 3.0 + + 0.5 * ( ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 1 ] : + mvOccupied->BrakeDelay[ 3 ] ) + - 3.0 ); + // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy + fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 + } } } } diff --git a/Driver.h b/Driver.h index a182f9b1..e0c145e7 100644 --- a/Driver.h +++ b/Driver.h @@ -369,6 +369,9 @@ class TController void TableTraceRoute(double fDistance, TDynamicObject *pVehicle = nullptr); void TableCheck(double fDistance); TCommandType TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc); + // modifies brake distance for low target speeds, to ease braking rate in such situations + float + braking_distance_multiplier( float const Targetvelocity ); void TablePurger(); public: std::size_t TableSize() const { return sSpeedTable.size(); } diff --git a/World.cpp b/World.cpp index 4d4451da..56ec89a8 100644 --- a/World.cpp +++ b/World.cpp @@ -1696,7 +1696,7 @@ TWorld::Update_UI() { + ")"; uitextline2 = - "HamZ=" + to_string( tmp->MoverParameters->fBrakeCtrlPos, 1 ) + "HamZ=" + to_string( tmp->MoverParameters->fBrakeCtrlPos, 2 ) + "; HamP=" + std::to_string( tmp->MoverParameters->LocalBrakePos ) + "/" + to_string( tmp->MoverParameters->LocalBrakePosA, 2 ) + "; NasJ=" + std::to_string( tmp->MoverParameters->MainCtrlPos ) + "(" + std::to_string( tmp->MoverParameters->MainCtrlActualPos ) + ")" + "; NasB=" + std::to_string( tmp->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( tmp->MoverParameters->ScndCtrlActualPos ) + ")" diff --git a/version.h b/version.h index 99ba44c0..1db998a7 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 821 +#define VERSION_MINOR 823 #define VERSION_REVISION 0 From 110bdf63bb9518e8d3f1f0a89a8e68cef4361765 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 25 Aug 2017 21:06:43 +0200 Subject: [PATCH 175/426] build 170825. tweaks and fixes to AI brake handling, scan table distance calculation fix --- Driver.cpp | 216 +++++++++++++++++++++------------------------------- Driver.h | 11 ++- TrkFoll.cpp | 66 ++++++++++------ World.cpp | 6 +- version.h | 2 +- 5 files changed, 138 insertions(+), 163 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 2872d265..ed929c83 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -222,8 +222,8 @@ bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len ) // może być NULL, jeśli koniec toru (????) vPos = (iFlags & spReverse) ? - trTrack->CurrentSegment()->FastGetPoint_0() : - trTrack->CurrentSegment()->FastGetPoint_1(); // drugi koniec istotny + trTrack->CurrentSegment()->FastGetPoint_1() : // drugi koniec istotny + trTrack->CurrentSegment()->FastGetPoint_0(); } } } @@ -1250,11 +1250,15 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else { // przyspieszenie: ujemne, gdy trzeba hamować a = ( v * v - mvOccupied->Vel * mvOccupied->Vel ) / ( 25.92 * d ); - auto const brakingdistance = fBrakeDist * braking_distance_multiplier( v ); - if( brakingdistance > 0.0 ) { - // maintain desired acc while we have enough room to brake safely, when close enough start paying attention - // try to make a smooth transition instead of sharp change - a = interpolate( a, AccPreferred, clamp( ( d - brakingdistance ) / brakingdistance, 0.0, 1.0 ) ); + if( ( mvOccupied->Vel < v ) + || ( v == 0.0 ) ) { + // if we're going slower than the target velocity and there's enough room for safe stop, speed up + auto const brakingdistance = fBrakeDist * braking_distance_multiplier( v ); + if( brakingdistance > 0.0 ) { + // maintain desired acc while we have enough room to brake safely, when close enough start paying attention + // try to make a smooth transition instead of sharp change + a = interpolate( a, AccPreferred, clamp( ( d - brakingdistance ) / brakingdistance, 0.0, 1.0 ) ); + } } if( ( d < fMinProximityDist ) && ( v < fVelDes ) ) { @@ -3850,6 +3854,12 @@ bool TController::UpdateSituation(double dt) // na jaką odleglość i z jaką predkością ma podjechać fMinProximityDist = 5.0; fMaxProximityDist = 10.0; //[m] + if( pVehicles[ 0 ] != pVehicles[ 1 ] ) { + // for larger consists increase margins to account for slower braking etc + // NOTE: this will affect also multi-unit vehicles TBD: is this what we want? + fMinProximityDist *= 2.0; + fMaxProximityDist *= 2.0; + } fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania // margines prędkości powodujący załączenie napędu // były problemy z jazdą np. 3km/h podczas ładowania wagonów @@ -4062,10 +4072,11 @@ bool TController::UpdateSituation(double dt) // no chyba żeby to uwzgldnić już w (ActualProximityDist) VelDesired = fVelMax; // wstępnie prędkość maksymalna dla pojazdu(-ów), będzie // następnie ograniczana - if (TrainParams) // jeśli ma rozkład - if (TrainParams->TTVmax > 0.0) // i ograniczenie w rozkładzie - VelDesired = Global::Min0RSpeed(VelDesired, - TrainParams->TTVmax); // to nie przekraczać rozkladowej + if( ( TrainParams ) + && ( TrainParams->TTVmax > 0.0 ) ) { + // jeśli ma rozkład i ograniczenie w rozkładzie to nie przekraczać rozkladowej + VelDesired = Global::Min0RSpeed( VelDesired, TrainParams->TTVmax ); + } SetDriverPsyche(); // ustawia AccPreferred (potrzebne tu?) // Ra: odczyt (ActualProximityDist), (VelNext) i (AccPreferred) z tabelki prędkosci AccDesired = AccPreferred; // AccPreferred wynika z osobowości mechanika @@ -4131,14 +4142,11 @@ bool TController::UpdateSituation(double dt) // i dopiero wtedy zmienić kierunek jazdy, oczekując podania // prędkości >0.5 if (comm == cm_Command) // jeśli komenda Shunt - iDrivigFlags |= - moveStopHere; // to ją odbierz bez przemieszczania się (np. + iDrivigFlags |= moveStopHere; // to ją odbierz bez przemieszczania się (np. // odczep wagony po dopchnięciu do końca toru) iDirectionOrder = -iDirection; // zmiana kierunku jazdy - OrderList[OrderPos] = TOrders(OrderList[OrderPos] | - Change_direction); // zmiana kierunku - // bez psucia - // kolejnych komend + // zmiana kierunku bez psucia kolejnych komend + OrderList[OrderPos] = TOrders(OrderList[OrderPos] | Change_direction); } } double vel = mvOccupied->Vel; // prędkość w kierunku jazdy @@ -4297,11 +4305,11 @@ bool TController::UpdateSituation(double dt) } } } - if (mvOccupied->V == 0.0) - AbsAccS = fAccGravity; // Ra 2014-03: jesli skład stoi, to działa na niego - // składowa styczna grawitacji - else - { + if( mvOccupied->V == 0.0 ) { + // Ra 2014-03: jesli skład stoi, to działa na niego składowa styczna grawitacji + AbsAccS = fAccGravity; + } + else { AbsAccS = 0; TDynamicObject *d = pVehicles[0]; // pojazd na czele składu while (d) @@ -4310,15 +4318,9 @@ bool TController::UpdateSituation(double dt) d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } AbsAccS /= fMass; - //AbsAccS = iDirection * mvOccupied->AccS; // przyspieszenie chwilowe, liczone } AbsAccS_pub = AbsAccS; -// jako różnica skierowanej prędkości w -// czasie -// if (mvOccupied->V<0.0) AbsAccS=-AbsAccS; //Ra 2014-03: to trzeba przemyśleć -// if (vel<0) //jeżeli się stacza w tył; 2014-03: to jest bez sensu, bo vel>=0 -// AbsAccS=-AbsAccS; //to przyspieszenie też działa wtedy w nieodpowiednią stronę -// AbsAccS+=fAccGravity; //wypadkowe przyspieszenie (czy to ma sens?) + #if LOGVELOCITY // WriteLog("VelDesired="+AnsiString(VelDesired)+", // VelSignal="+AnsiString(VelSignal)); @@ -4343,10 +4345,11 @@ bool TController::UpdateSituation(double dt) // jeśli jedzie if( ( vel < VelNext ) && ( ActualProximityDist > fMaxProximityDist * ( 1.0 + 0.1 * vel ) ) ) { - // dojedz do semafora/przeszkody // jeśli jedzie wolniej niż można i jest wystarczająco daleko, to można przyspieszyć - if (AccPreferred > 0.0) // jeśli nie ma zawalidrogi + if( AccPreferred > 0.0 ) { + // jeśli nie ma zawalidrogi dojedz do semafora/przeszkody AccDesired = AccPreferred; + } } else if (ActualProximityDist > fMinProximityDist) { // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze jest daleko @@ -4360,84 +4363,27 @@ bool TController::UpdateSituation(double dt) AccDesired = std::min( AccDesired, fAccThreshold ); } } - else if ((vel < VelNext + fVelPlus)||((velCategoryFlag == 1) && (ActualProximityDist*25.92*fBrake_a0[0] > 2*vel*vel)) - { // jeśli ma stanąć, a mieści się w drodze hamowania - AccDesired = AccPreferred; - } -/* - else if ((vel < VelNext + 20.0)&&(false)) // dwustopniowe hamowanie - niski przy małej różnicy - { // jeśli jedzie wolniej niż VelNext+35km/h //Ra: 40, żeby nie - // kombinował na zwrotnicach - if (VelNext == 0.0) - { // jeśli ma się zatrzymać, musi być to robione precyzyjnie i skutecznie - if (ActualProximityDist > fBrakeDist) - { // jeśli ma stanąć, a mieści się w drodze hamowania - if (vel < 10.0) // jeśli prędkość jest łatwa do zatrzymania - { // tu jest trochę problem, bo do punktu zatrzymania dobija - // na raty - // AccDesired=AccDesired<0.0?0.0:0.1*AccPreferred; - AccDesired = AccPreferred; // proteza trochę; jak tu - // wychodzi 0.05, to loki - // mają problem utrzymać - // takie przyspieszenie - } - else if (vel <= 30.0) // trzymaj 30 km/h - AccDesired = Min0R(0.5 * AccDesired, - AccPreferred); // jak jest tu 0.5, to - // samochody się - // dobijają do siebie - else - AccDesired = 0.0; - } - else // 25.92 (=3.6*3.6*2) - przelicznik z km/h na m/s - // niech nie hamuje, chyba że coś z przodu - AccDesired = -(vel * vel) / - (25.92 * (ActualProximityDist + - 0.1-0.5*(fMinProximityDist+fMaxProximityDist))); //-fMinProximityDist));//-0.1; - ////mniejsze opóźnienie przy małej różnicy - ReactionTime = 0.1; // i orientuj się szybciej, jak masz stanąć - } - else if (vel < VelNext + fVelPlus) // jeśli niewielkie - // przekroczenie, ale ma jechać - AccDesired = std::min( 0.0, AccPreferred ); // to olej (zacznij luzować) - else - { // jeśli większe przekroczenie niż fVelPlus [km/h], ale ma jechać - // Ra 2F1I: jak było (VelNext+fVelPlus) tu, to hamował zbyt - // późno przed 40, a potem zbyt mocno i zwalniał do 30 - AccDesired = (VelNext * VelNext - vel * vel) / - (25.92 * ActualProximityDist + - 0.1); // mniejsze opóźnienie przy małej różnicy - if( ActualProximityDist < fMaxProximityDist ) { - // i orientuj się szybciej, jeśli w krytycznym przedziale - ReactionTime = 0.1; - } - } - } -*/ else { // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) - double dist = 0;// (VelNext * VelNext - (VelNext + 20) * (VelNext + 20)) / (25.92)*(-1 / fBrake_a0[0] - 1 / fAccThreshold); // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever - AccDesired = + auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); + AccDesired = std::min( + AccDesired, ( VelNext * VelNext - vel * vel ) / ( 25.92 * std::max( - ActualProximityDist - VelNext - dist, + ActualProximityDist - brakingpointoffset, std::min( ActualProximityDist, - VelNext + dist ) ) - + 0.1 ); // najpierw hamuje mocniej, potem zluzuje + brakingpointoffset ) ) + + 0.1 ) ); // najpierw hamuje mocniej, potem zluzuje } AccDesired = std::min( AccDesired, AccPreferred ); } else { // jest bliżej niż fMinProximityDist - VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); // utrzymuj predkosc bo juz blisko + // utrzymuj predkosc bo juz blisko + VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); if( vel <= VelNext + fVelPlus ) { // jeśli niewielkie przekroczenie, ale ma jechać AccDesired = std::max( 0.0, AccPreferred ); // to olej (zacznij luzować) @@ -4474,21 +4420,38 @@ bool TController::UpdateSituation(double dt) } } } - else // gdy jedzie wolniej niż potrzeba, albo nie ma przeszkód na drodze - AccDesired = (VelDesired != 0.0 ? AccPreferred : -0.01); // normalna jazda + else { + // gdy jedzie wolniej niż potrzeba, albo nie ma przeszkód na drodze + // normalna jazda + AccDesired = ( + VelDesired != 0.0 ? + AccPreferred : + -0.01 ); + } // koniec predkosci nastepnej - if ((VelDesired >= 0.0) && - (vel > VelDesired)) // jesli jedzie za szybko do AKTUALNEGO - if (VelDesired == 0.0) // jesli stoj, to hamuj, ale i tak juz za pozno :) - AccDesired = std::min(AccDesired,-0.9); // hamuj solidnie - else if ((vel < VelDesired + fVelPlus)) // o 5 km/h to olej - { - if ((AccDesired > 0.0)) - AccDesired = 0.0; + + if( vel > VelDesired ) { + // jesli jedzie za szybko do AKTUALNEGO + if( VelDesired == 0.0 ) { + // jesli stoj, to hamuj, ale i tak juz za pozno :) + AccDesired = std::min( AccDesired, -0.9 ); // hamuj solidnie } - else - AccDesired = std::min(AccDesired,fBrake_a0[0]); // hamuj tak średnio + else { + // slow down, not full stop + if( vel > ( VelDesired + fVelPlus ) ) { + // hamuj tak średnio + AccDesired = std::min( AccDesired, -fBrake_a0[ 0 ] * 0.5 ); + } + else { + // o 5 km/h to olej (zacznij luzować) + AccDesired = std::min( + AccDesired, // but don't override decceleration for VelNext + std::max( 0.0, AccPreferred ) ); + } + } + } // koniec predkosci aktualnej + #ifdef DEBUGFAC if (fAccThreshold > -0.3) // bez sensu, ale dla towarowych korzystnie { // Ra 2014-03: to nie uwzględnia odległości i zaczyna hamować, jak tylko zobaczy @@ -4736,26 +4699,23 @@ bool TController::UpdateSituation(double dt) } // type & dt_ezt else { // a stara wersja w miarę dobrze działa na składy wagonowe - if( ( VelNext == 0.0 ) - || ( vel > VelNext + fVelPlus ) ) { - if( ( ( fAccGravity < -0.05 ) && ( vel < 0.0 ) ) - || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { - // u góry ustawia się hamowanie na fAccThreshold - if( ( fBrakeTime < 0.0 ) - || ( AccDesired < fAccGravity - 0.3 ) - || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { - // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował - if( true == IncBrake() ) { - fBrakeTime = - 3.0 - + 0.5 * ( ( - mvOccupied->BrakeDelayFlag > bdelay_G ? - mvOccupied->BrakeDelay[ 1 ] : - mvOccupied->BrakeDelay[ 3 ] ) - - 3.0 ); - // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy - fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 - } + if( ( ( fAccGravity < -0.05 ) && ( vel < 0.0 ) ) + || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { + // u góry ustawia się hamowanie na fAccThreshold + if( ( fBrakeTime < 0.0 ) + || ( AccDesired < fAccGravity - 0.5 ) + || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { + // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował + if( true == IncBrake() ) { + fBrakeTime = + 3.0 + + 0.5 * ( ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 1 ] : + mvOccupied->BrakeDelay[ 3 ] ) + - 3.0 ); + // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy + fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } } } diff --git a/Driver.h b/Driver.h index e0c145e7..69f636b0 100644 --- a/Driver.h +++ b/Driver.h @@ -397,12 +397,11 @@ public: int StationCount(); int StationIndex(); bool IsStop(); - bool Primary() - { - return this ? ((iDrivigFlags & movePrimary) != 0) : false; - }; - int inline DrivigFlags() - { + inline + bool Primary() const { + return ( ( iDrivigFlags & movePrimary ) != 0 ); }; + inline + int DrivigFlags() const { return iDrivigFlags; }; void MoveTo(TDynamicObject *to); diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 77c0adf4..7e9007d3 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -114,15 +114,20 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) { // omijamy cały ten blok, gdy tor nie ma on żadnych eventów (większość nie ma) if (fDistance < 0) { - if (SetFlag(iEventFlag, -1)) // zawsze zeruje flagę sprawdzenia, jak mechanik - // dosiądzie, to się nie wykona - if (Owner->Mechanik->Primary()) // tylko dla jednego członu - // if (TestFlag(iEventFlag,1)) //McZapkie-280503: wyzwalanie event tylko dla - // pojazdow z obsada - if (bPrimary && pCurrentTrack->evEvent1 && - (!pCurrentTrack->evEvent1->iQueued)) - Global::AddToQuery(pCurrentTrack->evEvent1, Owner); // dodanie do - // kolejki + if( SetFlag( iEventFlag, -1 ) ) { + // zawsze zeruje flagę sprawdzenia, jak mechanik dosiądzie, to się nie wykona + if( ( Owner->Mechanik != nullptr ) + && ( Owner->Mechanik->Primary() ) ) { + // tylko dla jednego członu + // McZapkie-280503: wyzwalanie event tylko dla pojazdow z obsada + if( ( bPrimary ) + && ( pCurrentTrack->evEvent1 ) + && ( !pCurrentTrack->evEvent1->iQueued ) ) { + // dodanie do kolejki + Global::AddToQuery( pCurrentTrack->evEvent1, Owner ); + } + } + } // Owner->RaAxleEvent(pCurrentTrack->Event1); //Ra: dynamic zdecyduje, czy dodać do // kolejki // if (TestFlag(iEventallFlag,1)) @@ -136,31 +141,42 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) } else if (fDistance > 0) { - if (SetFlag(iEventFlag, -2)) // zawsze ustawia flagę sprawdzenia, jak mechanik + if( SetFlag( iEventFlag, -2 ) ) { + // zawsze ustawia flagę sprawdzenia, jak mechanik // dosiądzie, to się nie wykona - if (Owner->Mechanik->Primary()) // tylko dla jednego członu - // if (TestFlag(iEventFlag,2)) //sprawdzanie jest od razu w pierwszym - // warunku - if (bPrimary && pCurrentTrack->evEvent2 && - (!pCurrentTrack->evEvent2->iQueued)) - Global::AddToQuery(pCurrentTrack->evEvent2, Owner); + if( ( Owner->Mechanik != nullptr ) + && ( Owner->Mechanik->Primary() ) ) { + // tylko dla jednego członu + if( ( bPrimary ) + && ( pCurrentTrack->evEvent2 ) + && ( !pCurrentTrack->evEvent2->iQueued ) ) { + Global::AddToQuery( pCurrentTrack->evEvent2, Owner ); + } + } + } // Owner->RaAxleEvent(pCurrentTrack->Event2); //Ra: dynamic zdecyduje, czy dodać do // kolejki // if (TestFlag(iEventallFlag,2)) - if (SetFlag(iEventallFlag, - -2)) // sprawdza i zeruje na przyszłość, true jeśli zmieni z 2 na 0 - if (bPrimary && pCurrentTrack->evEventall2 && - (!pCurrentTrack->evEventall2->iQueued)) - Global::AddToQuery(pCurrentTrack->evEventall2, Owner); + if( SetFlag( iEventallFlag, -2 ) ) { + // sprawdza i zeruje na przyszłość, true jeśli zmieni z 2 na 0 + if( ( bPrimary ) + && ( pCurrentTrack->evEventall2 ) + && ( !pCurrentTrack->evEventall2->iQueued ) ) { + Global::AddToQuery( pCurrentTrack->evEventall2, Owner ); + } + } // Owner->RaAxleEvent(pCurrentTrack->Eventall2); //Ra: dynamic zdecyduje, czy dodać // do kolejki } else // if (fDistance==0) //McZapkie-140602: wyzwalanie zdarzenia gdy pojazd stoi { - if (Owner->Mechanik->Primary()) // tylko dla jednego członu - if (pCurrentTrack->evEvent0) - if (!pCurrentTrack->evEvent0->iQueued) - Global::AddToQuery(pCurrentTrack->evEvent0, Owner); + if( ( Owner->Mechanik != nullptr ) + && ( Owner->Mechanik->Primary() ) ) { + // tylko dla jednego członu + if( pCurrentTrack->evEvent0 ) + if( !pCurrentTrack->evEvent0->iQueued ) + Global::AddToQuery( pCurrentTrack->evEvent0, Owner ); + } // Owner->RaAxleEvent(pCurrentTrack->Event0); //Ra: dynamic zdecyduje, czy dodać do // kolejki if (pCurrentTrack->evEventall0) diff --git a/World.cpp b/World.cpp index 56ec89a8..6612b6b0 100644 --- a/World.cpp +++ b/World.cpp @@ -1314,7 +1314,7 @@ TWorld::Update_UI() { else if( mover->ActiveDir < 0 ) { uitextline2 += " R"; } else { uitextline2 += " N"; } - uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + std::to_string( mover->LocalBrakePos ); + uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + std::to_string( mover->LocalBrakePos ) + ( mover->SlippingWheels ? " !" : " " ); if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { // detail mode on second key press @@ -1324,7 +1324,7 @@ TWorld::Update_UI() { + ", next limit: " + std::to_string( static_cast( std::floor( Controlled->Mechanik->VelNext ) ) ) + " km/h" + " in " + to_string( Controlled->Mechanik->ActualProximityDist * 0.001, 1 ) + " km)"; uitextline3 += - " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; } } @@ -1342,7 +1342,7 @@ TWorld::Update_UI() { if( tmp == nullptr ) { break; } // if the nearest located vehicle doesn't have a direct driver, try to query its owner auto const owner = ( - tmp->Mechanik != nullptr ? + ( ( tmp->Mechanik != nullptr ) && ( tmp->Mechanik->Primary() ) ) ? tmp->Mechanik : tmp->ctOwner ); if( owner == nullptr ){ break; } diff --git a/version.h b/version.h index 1db998a7..13f434c4 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 823 +#define VERSION_MINOR 825 #define VERSION_REVISION 0 From 3a6e2869ae4a78b6576ac453a72cbcdbaf85cc16 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 28 Aug 2017 00:07:47 +0200 Subject: [PATCH 176/426] maintenance: minor refactoring, removed deprecated code and variables --- Button.cpp | 2 +- Console.cpp | 2 +- Driver.cpp | 15 +-------------- DynObj.h | 2 +- Event.cpp | 3 +-- Gauge.cpp | 2 +- Globals.cpp | 7 ------- Globals.h | 1 - Ground.cpp | 16 +++------------- Ground.h | 31 +++++++++---------------------- McZapkie/mctools.cpp | 11 ++++++----- McZapkie/mctools.h | 2 +- Track.cpp | 6 ------ Track.h | 14 +------------- Train.cpp | 12 ++++++------ renderer.cpp | 9 +++------ skydome.cpp | 10 +++++----- 17 files changed, 40 insertions(+), 105 deletions(-) diff --git a/Button.cpp b/Button.cpp index 06211b1d..a673bbfd 100644 --- a/Button.cpp +++ b/Button.cpp @@ -77,7 +77,7 @@ void TButton::Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2) { bool TButton::Load_mapping( cParser &Input ) { - if( false == Input.getTokens( 2, true, ", " ) ) { + if( false == Input.getTokens( 2, true, " ,\n\r\t" ) ) { return false; } diff --git a/Console.cpp b/Console.cpp index 076d4332..5f67d082 100644 --- a/Console.cpp +++ b/Console.cpp @@ -359,7 +359,7 @@ void Console::ValueSet(int x, double y) WriteLog("CalibrateOutDebugInfo: oryginal=" + std::to_string(y), false); if (Global::fCalibrateOutMax[x] > 0) { - y = Global::CutValueToRange(0, y, Global::fCalibrateOutMax[x]); + y = clamp( y, 0.0, Global::fCalibrateOutMax[x]); if (Global::iCalibrateOutDebugInfo == x) WriteLog(" cutted=" + std::to_string(y), false); y = y / Global::fCalibrateOutMax[x]; // sprowadzenie do <0,1> jeśli podana diff --git a/Driver.cpp b/Driver.cpp index ed929c83..a3d39221 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4356,7 +4356,7 @@ bool TController::UpdateSituation(double dt) if (ActualProximityDist < fMaxProximityDist) { // jak minął już maksymalny dystans po prostu hamuj (niski stopień) // ma stanąć, a jest w drodze hamowania albo ma jechać - VelDesired = VelNext; + VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); if( VelDesired == 0.0 ) { // hamowanie tak, aby stanąć AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); @@ -4452,19 +4452,6 @@ bool TController::UpdateSituation(double dt) } // koniec predkosci aktualnej -#ifdef DEBUGFAC - if (fAccThreshold > -0.3) // bez sensu, ale dla towarowych korzystnie - { // Ra 2014-03: to nie uwzględnia odległości i zaczyna hamować, jak tylko zobaczy - // W4 - if ((AccDesired > 0.0) && - (VelNext >= 0.0)) // wybieg bądź lekkie hamowanie, warunki byly zamienione - if (vel > VelNext + 100.0) // lepiej zaczac hamowac - AccDesired = fAccThreshold; - else if (vel > VelNext + 70.0) - AccDesired = 0.0; // nie spiesz się, bo będzie hamowanie - // koniec wybiegu i hamowania - } -#endif // DEBUGFAC // last step sanity check, until the whole calculation is straightened out AccDesired = std::min( AccDesired, AccPreferred ); diff --git a/DynObj.h b/DynObj.h index 8095c7f3..59efe6e2 100644 --- a/DynObj.h +++ b/DynObj.h @@ -186,7 +186,7 @@ public: // modele składowe pojazdu TModel3d *mdLoad; // model zmiennego ładunku TModel3d *mdKabina; // model kabiny dla użytkownika; McZapkie-030303: to z train.h TModel3d *mdLowPolyInt; // ABu 010305: wnetrze lowpoly - float3 InteriorLight { 0.9f * 255.0f / 255.0f, 0.9f * 216.0f / 255.0f, 0.9f * 176.0f / 255.0f }; // tungsten light. TODO: allow definition of light type? + glm::vec3 InteriorLight { 0.9f * 255.f / 255.f, 0.9f * 216.f / 255.f, 0.9f * 176.f / 255.f }; // tungsten light. TODO: allow definition of light type? float InteriorLightLevel { 0.0f }; // current level of interior lighting struct section_light { TSubModel *compartment; diff --git a/Event.cpp b/Event.cpp index a56c5cdf..ae9836c3 100644 --- a/Event.cpp +++ b/Event.cpp @@ -431,8 +431,7 @@ void TEvent::Load(cParser *parser, vector3 *org) *parser >> token; break; case tp_Exit: - while ((ptr = strchr(strdup(asNodeName.c_str()), '_')) != NULL) - *ptr = ' '; + asNodeName = ExchangeCharInString( asNodeName, '_', ' ' ); parser->getTokens(); *parser >> token; break; diff --git a/Gauge.cpp b/Gauge.cpp index c52de766..2c262268 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -116,7 +116,7 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) { bool TGauge::Load_mapping( cParser &Input ) { - if( false == Input.getTokens( 2, true, ", " ) ) { + if( false == Input.getTokens( 2, true, ", \n\r\t" ) ) { return false; } diff --git a/Globals.cpp b/Globals.cpp index 323c849d..f83d9e89 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -1313,10 +1313,3 @@ double Global::Min0RSpeed(double vel1, double vel2) } return std::min(vel1, vel2); }; - -double Global::CutValueToRange(double min, double value, double max) -{ // przycinanie wartosci do podanych granic - value = Max0R(value, min); - value = Min0R(value, max); - return value; -}; diff --git a/Globals.h b/Globals.h index db70de30..37fefd65 100644 --- a/Globals.h +++ b/Globals.h @@ -336,7 +336,6 @@ class Global static bool DoEvents(); static std::string Bezogonkow(std::string str, bool _ = false); static double Min0RSpeed(double vel1, double vel2); - static double CutValueToRange(double min, double value, double max); // maciek001: zmienne dla MWD static bool bMWDmasterEnable; // główne włączenie portu COM diff --git a/Ground.cpp b/Ground.cpp index d5f309dc..6c5b29e1 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -490,12 +490,11 @@ TGroundRect::NodeAdd( TGroundNode *Node ) { matchingnode->pCenter, Node->pCenter, static_cast( Node->iNumVerts ) / ( Node->iNumVerts + matchingnode->iNumVerts ) ); matchingnode->iNumVerts += Node->iNumVerts; - matchingnode->Piece->vertices.resize( matchingnode->iNumVerts, TGroundVertex() ); matchingnode->Piece->vertices.insert( std::end( matchingnode->Piece->vertices ), std::begin( Node->Piece->vertices ), std::end( Node->Piece->vertices ) ); // clear content of the node we're copying. a minor memory saving at best, but still a saving - Node->Piece->vertices.swap( std::vector() ); + std::vector().swap( Node->Piece->vertices ); Node->iNumVerts = 0; // since we've put the data in existing node we can skip adding the new one... return; @@ -578,7 +577,6 @@ void TGround::Free() Current = Current->nNext; delete tmpn; } - iNumNodes = 0; // RootNode=NULL; nRootDynamic = NULL; } @@ -694,7 +692,6 @@ TGround::convert_terrain( TSubModel const *Submodel ) { groundnode->nNext = nRootOfType[ groundnode->iType ]; // ustawienie nowego na początku listy nRootOfType[ groundnode->iType ] = groundnode; - ++iNumNodes; } else { delete groundnode; @@ -791,7 +788,6 @@ void TGround::RaTriangleDivider(TGroundNode *node) ntri->bVisible = node->bVisible; // a są jakieś niewidoczne? ntri->nNext = nRootOfType[GL_TRIANGLES]; nRootOfType[GL_TRIANGLES] = ntri; // dopisanie z przodu do listy - ++iNumNodes; ntri->iNumVerts = 3; ntri->Piece->vertices.resize( 3 ); switch (divide & 3) @@ -1773,7 +1769,6 @@ bool TGround::Init(std::string File) // pTrain=NULL; pOrigin = aRotate = vector3(0, 0, 0); // zerowanie przesunięcia i obrotu std::string str; - // TFileStream *fs; // int size; std::string subpath = Global::asCurrentSceneryPath; // "scenery/"; cParser parser(File, cParser::buffer_FILE, subpath, Global::bLoadTraction); @@ -1782,7 +1777,6 @@ bool TGround::Init(std::string File) std::stack OriginStack; // stos zagnieżdżenia origin TGroundNode *LastNode = nullptr; // do użycia w trainset - iNumNodes = 0; token = ""; parser.getTokens(); parser >> token; @@ -1839,7 +1833,6 @@ bool TGround::Init(std::string File) LastNode->nNext = nRootOfType[ LastNode->iType ]; // ustawienie nowego na początku listy nRootOfType[ LastNode->iType ] = LastNode; - ++iNumNodes; } else { // jeśli jest pojazdem if( ( LastNode->DynamicObject->Mechanik != nullptr ) @@ -2666,7 +2659,6 @@ void TGround::InitTracks() Current->nNext = nRootOfType[TP_MEMCELL]; // to nie powinno tutaj być, bo robi się śmietnik nRootOfType[TP_MEMCELL] = Current; - iNumNodes++; p->pMemCell = Current->MemCell; // wskaźnik komóki przekazany do odcinka izolowanego } p = p->Next(); @@ -2705,7 +2697,6 @@ void TGround::InitTraction() nTemp->nNext = nRootOfType[nTemp->iType]; // ostatni dodany dołączamy na końcu // nowego nRootOfType[nTemp->iType] = nTemp; // ustawienie nowego na początku listy - iNumNodes++; } } for (nCurrent = nRootOfType[TP_TRACTION]; nCurrent; nCurrent = nCurrent->nNext) @@ -3151,9 +3142,8 @@ bool TGround::EventConditon(TEvent *e) return (e->Params[9].asTrack->IsEmpty()); else if (e->iFlags & conditional_propability) { - double rprobability = 1.0 * rand() / RAND_MAX; - WriteLog("Random integer: " + std::to_string(rprobability) + "/" + - std::to_string(e->Params[10].asdouble)); + double rprobability = Random(); + WriteLog("Random integer: " + std::to_string(rprobability) + " / " + std::to_string(e->Params[10].asdouble)); return (e->Params[10].asdouble > rprobability); } else if (e->iFlags & conditional_memcompare) diff --git a/Ground.h b/Ground.h index 21dd6399..a35f69f5 100644 --- a/Ground.h +++ b/Ground.h @@ -151,13 +151,8 @@ public: TGroundNode(); TGroundNode(TGroundNodeType t); ~TGroundNode(); -/* - void Init(int n); -*/ + void InitNormals(); -/* - void Release(); -*/ void RenderHidden(); // obsługa dźwięków i wyzwalaczy zdarzeń }; @@ -205,7 +200,6 @@ class TSubRect : /*public Resource,*/ public CMesh // Ra: trzeba sprawdzić wydajność siatki const int iNumSubRects = 5; // na ile dzielimy kilometr const int iNumRects = 500; -// const double fHalfNumRects=iNumRects/2.0; //połowa do wyznaczenia środka const int iTotalNumSubRects = iNumRects * iNumSubRects; const double fHalfTotalNumSubRects = iTotalNumSubRects / 2.0; const double fSubRectSize = 1000.0 / iNumSubRects; @@ -255,27 +249,22 @@ class TGround { friend class opengl_renderer; - vector3 CameraDirection; // zmienna robocza przy renderowaniu - int const *iRange = nullptr; // tabela widoczności + TGroundRect Rects[ iNumRects ][ iNumRects ]; // mapa kwadratów kilometrowych + TSubRect srGlobal; // zawiera obiekty globalne (na razie wyzwalacze czasowe) TGroundNode *nRootDynamic = nullptr; // lista pojazdów - TGroundRect Rects[iNumRects][iNumRects]; // mapa kwadratów kilometrowych + TGroundNode *nRootOfType[ TP_LAST ]; // tablica grupująca obiekty, przyspiesza szukanie TEvent *RootEvent = nullptr; // lista zdarzeń TEvent *QueryRootEvent = nullptr, *tmpEvent = nullptr; -/* - TSubRect *pRendered[1500]; // lista renderowanych sektorów -*/ - int iNumNodes = 0; - vector3 pOrigin; - vector3 aRotate; - bool bInitDone = false; - TGroundNode *nRootOfType[TP_LAST]; // tablica grupująca obiekty, przyspiesza szukanie - TSubRect srGlobal; // zawiera obiekty globalne (na razie wyzwalacze czasowe) typedef std::unordered_map event_map; event_map m_eventmap; TNames m_trackmap; light_array m_lights; // collection of dynamic light sources present in the scene + vector3 pOrigin; + vector3 aRotate; + bool bInitDone = false; + private: // metody prywatne bool EventConditon(TEvent *e); @@ -333,9 +322,6 @@ class TGround public: void WyslijEvent(const std::string &e, const std::string &d); -/* - int iRendered; // ilość renderowanych sektorów, pobierana przy pokazywniu FPS -*/ void WyslijString(const std::string &t, int n); void WyslijWolny(const std::string &t); void WyslijNamiary(TGroundNode *t); @@ -355,4 +341,5 @@ class TGround void IsolatedBusy(const std::string t); void Silence(vector3 gdzie); }; + //--------------------------------------------------------------------------- diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index ab66f304..f249de8f 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -114,13 +114,14 @@ std::string DWE(std::string s) /*Delete After Equal sign*/ return s; } -std::string ExchangeCharInString( std::string const &Source, char const &From, char const &To ) +std::string ExchangeCharInString( std::string const &Source, char const From, char const To ) { std::string replacement; replacement.reserve( Source.size() ); - std::for_each(Source.cbegin(), Source.cend(), [&](char const idx) { - if( idx != From ) { replacement += idx; } - else { replacement += To; } - } ); + std::for_each( + std::begin( Source ), std::end( Source ), + [&](char const idx) { + if( idx != From ) { replacement += idx; } + else { replacement += To; } } ); return replacement; } diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index 9af628f7..9c0c4f5d 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -75,7 +75,7 @@ bool FuzzyLogicAI(double Test, double Threshold, double Probability); /*operacje na stringach*/ std::string DUE(std::string s); /*Delete Until Equal sign*/ std::string DWE(std::string s); /*Delete While Equal sign*/ -std::string ExchangeCharInString(std::string const &s, const char &aim, const char &target); // zamienia jeden znak na drugi +std::string ExchangeCharInString( std::string const &Source, char const From, char const To ); // zamienia jeden znak na drugi std::vector &Split(const std::string &s, char delim, std::vector &elems); std::vector Split(const std::string &s, char delim); //std::vector Split(const std::string &s); diff --git a/Track.cpp b/Track.cpp index 528b955c..dddd9e59 100644 --- a/Track.cpp +++ b/Track.cpp @@ -762,12 +762,6 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) iAction |= 0x40; // flaga opuszczenia pantografu (tor uwzględniany w skanowaniu jako // ograniczenie dla pantografujących) } - else if (str == "colides") - { // informacja o stanie sieci: 0-jazda bezprądowa, >0-z opuszczonym i ograniczeniem prędkości - parser->getTokens(); - *parser >> token; - // trColides=; //tor kolizyjny, na którym trzeba sprawdzać pojazdy pod kątem zderzenia - } else ErrorLog("Unknown property: \"" + str + "\" in track \"" + name + "\""); parser->getTokens(); diff --git a/Track.h b/Track.h index 2211ff10..7b791a05 100644 --- a/Track.h +++ b/Track.h @@ -139,9 +139,7 @@ private: float fTexHeight1 = 0.6f; // wysokość brzegu względem trajektorii float fTexWidth = 0.9f; // szerokość boku float fTexSlope = 0.9f; -/* - GLuint DisplayListID = 0; -*/ + material_handle m_material1 = 0; // tekstura szyn albo nawierzchni material_handle m_material2 = 0; // tekstura automatycznej podsypki albo pobocza typedef std::vector geometryhandle_sequence; @@ -187,7 +185,6 @@ public: bool ScannedFlag = false; // McZapkie: do zaznaczania kolorem torów skanowanych przez AI TTraction *hvOverhead = nullptr; // drut zasilający do szybkiego znalezienia (nie używany) TGroundNode *nFouling[ 2 ]; // współrzędne ukresu albo oporu kozła - TTrack *trColides = nullptr; // tor kolizyjny, na którym trzeba sprawdzać pojazdy pod kątem zderzenia TTrack(TGroundNode *g); ~TTrack(); @@ -225,17 +222,8 @@ public: bool CheckDynamicObject(TDynamicObject *Dynamic); bool AddDynamicObject(TDynamicObject *Dynamic); bool RemoveDynamicObject(TDynamicObject *Dynamic); -/* - void Release(); - void Compile(GLuint tex = 0); - void Render(); // renderowanie z Display Lists - int RaArrayPrepare(); // zliczanie rozmiaru dla VBO sektroa -*/ void create_geometry(geometrybank_handle const &Bank); // wypełnianie VBO -/* - void RaRenderVBO(int iPtr); // renderowanie z VBO sektora -*/ void RenderDynSounds(); // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania void RaOwnerSet(TSubRect *o) { diff --git a/Train.cpp b/Train.cpp index c46ff0bf..5a1e2671 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4510,8 +4510,8 @@ bool TTrain::Update( double const Deltatime ) if (mvOccupied->BrakeHandle == FV4a) { double b = Console::AnalogCalibrateGet(0); - b = b * 8 - 2; - b = Global::CutValueToRange(-2.0, b, mvOccupied->BrakeCtrlPosNo); // przycięcie zmiennej do granic + b = b * 8.0 - 2.0; + b = clamp( b, -2.0, mvOccupied->BrakeCtrlPosNo ); // przycięcie zmiennej do granic if (Global::bMWDdebugEnable && Global::iMWDDebugMode & 4) WriteLog("FV4a break position = " + to_string(b)); ggBrakeCtrl.UpdateValue(b); // przesów bez zaokrąglenia mvOccupied->BrakeLevelSet(b); @@ -4519,8 +4519,8 @@ bool TTrain::Update( double const Deltatime ) if (mvOccupied->BrakeHandle == FVel6) // może można usunąć ograniczenie do FV4a i FVel6? { double b = Console::AnalogCalibrateGet(0); - b = b * 7 - 1; - b = Global::CutValueToRange(-1.0, b, mvOccupied->BrakeCtrlPosNo); // przycięcie zmiennej do granic + b = b * 7.0 - 1.0; + b = clamp( b, -1.0, mvOccupied->BrakeCtrlPosNo ); // przycięcie zmiennej do granic if (Global::bMWDdebugEnable && Global::iMWDDebugMode & 4) WriteLog("FVel6 break position = " + to_string(b)); ggBrakeCtrl.UpdateValue(b); // przesów bez zaokrąglenia mvOccupied->BrakeLevelSet(b); @@ -4543,8 +4543,8 @@ bool TTrain::Update( double const Deltatime ) if ((mvOccupied->BrakeLocHandle == FD1)) { double b = Console::AnalogCalibrateGet(1); - b *= 10; - b = Global::CutValueToRange(0.0, b, LocalBrakePosNo); // przycięcie zmiennej do granic + b *= 10.0; + b = clamp( b, 0.0, LocalBrakePosNo); // przycięcie zmiennej do granic ggLocalBrake.UpdateValue(b); // przesów bez zaokrąglenia if (Global::bMWDdebugEnable && Global::iMWDDebugMode & 4) WriteLog("FD1 break position = " + to_string(b)); mvOccupied->LocalBrakePos = diff --git a/renderer.cpp b/renderer.cpp index 4cd8d5da..530e4c25 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1848,8 +1848,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { if( Dynamic->InteriorLightLevel > 0.0f ) { // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( Dynamic->InteriorLight * Dynamic->InteriorLightLevel ) ); } Render( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); @@ -1941,8 +1940,7 @@ opengl_renderer::Render_cab( TDynamicObject *Dynamic ) { } if( Dynamic->InteriorLightLevel > 0.0f ) { // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( Dynamic->InteriorLight * Dynamic->InteriorLightLevel ) ); } // render Render( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); @@ -2588,8 +2586,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { if( Dynamic->InteriorLightLevel > 0.0f ) { // crude way to light the cabin, until we have something more complete in place - auto const cablight = Dynamic->InteriorLight * Dynamic->InteriorLightLevel; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, &cablight.x ); + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( Dynamic->InteriorLight * Dynamic->InteriorLightLevel ) ); } Render_Alpha( Dynamic->mdLowPolyInt, Dynamic->Material(), squaredistance ); diff --git a/skydome.cpp b/skydome.cpp index 7d136971..342a8e00 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -122,11 +122,11 @@ void CSkyDome::Render() { // build the buffers ::glGenBuffers( 1, &m_vertexbuffer ); ::glBindBuffer( GL_ARRAY_BUFFER, m_vertexbuffer ); - ::glBufferData( GL_ARRAY_BUFFER, m_vertices.size() * sizeof( float3 ), m_vertices.data(), GL_STATIC_DRAW ); + ::glBufferData( GL_ARRAY_BUFFER, m_vertices.size() * sizeof( glm::vec3 ), m_vertices.data(), GL_STATIC_DRAW ); ::glGenBuffers( 1, &m_coloursbuffer ); ::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer ); - ::glBufferData( GL_ARRAY_BUFFER, m_colours.size() * sizeof( float3 ), m_colours.data(), GL_DYNAMIC_DRAW ); + ::glBufferData( GL_ARRAY_BUFFER, m_colours.size() * sizeof( glm::vec3 ), m_colours.data(), GL_DYNAMIC_DRAW ); ::glGenBuffers( 1, &m_indexbuffer ); ::glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_indexbuffer ); @@ -138,10 +138,10 @@ void CSkyDome::Render() { ::glEnableClientState( GL_COLOR_ARRAY ); // positions ::glBindBuffer( GL_ARRAY_BUFFER, m_vertexbuffer ); - ::glVertexPointer( 3, GL_FLOAT, sizeof( float3 ), reinterpret_cast( 0 ) ); + ::glVertexPointer( 3, GL_FLOAT, sizeof( glm::vec3 ), reinterpret_cast( 0 ) ); // colours ::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer ); - ::glColorPointer( 3, GL_FLOAT, sizeof( float3 ), reinterpret_cast( 0 ) ); + ::glColorPointer( 3, GL_FLOAT, sizeof( glm::vec3 ), reinterpret_cast( 0 ) ); // indices ::glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_indexbuffer ); ::glDrawElements( GL_TRIANGLES, static_cast( m_indices.size() ), GL_UNSIGNED_SHORT, reinterpret_cast( 0 ) ); @@ -345,7 +345,7 @@ void CSkyDome::RebuildColors() { if( m_coloursbuffer != -1 ) { // the colour buffer was already initialized, so on this run we update its content ::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer ); - ::glBufferSubData( GL_ARRAY_BUFFER, 0, m_colours.size() * sizeof( float3 ), m_colours.data() ); + ::glBufferSubData( GL_ARRAY_BUFFER, 0, m_colours.size() * sizeof( glm::vec3 ), m_colours.data() ); } } From decbcd8055a10af35c658a128ce328d6f7f163bf Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 28 Aug 2017 20:23:16 +0200 Subject: [PATCH 177/426] build 170828. track scanning fix, vbo render path made default --- Driver.cpp | 54 +++++++++++++++++++++++++++++++---------------------- Globals.cpp | 2 +- version.h | 2 +- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index a3d39221..6c7f97a5 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -3583,36 +3583,46 @@ bool TController::UpdateSituation(double dt) pVehicles[ 0 ] == pVehicles[ 1 ] ? pVehicles[ 0 ] : pVehicles[ 1 ] ); - if( iDirection > 0 ) { + if( mvOccupied->V >= 0.0 ) { // towards coupler 0 - if( ( rearvehicle->NextConnected != nullptr ) - && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 1 : 0 ) ].CouplingFlag == ctrain_virtual ) ) { - // scan behind if we had something connected there and are moving away - rearvehicle->ABuScanObjects( -1, fMaxProximityDist ); + if( ( mvOccupied->V * iDirection < 0.0 ) + || ( ( rearvehicle->NextConnected != nullptr ) + && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 1 : 0 ) ].CouplingFlag == ctrain_virtual ) ) ) { + // scan behind if we're moving backward, or if we had something connected there and are moving away + rearvehicle->ABuScanObjects( ( + pVehicle->DirectionGet() == rearvehicle->DirectionGet() ? + -1 : + 1 ), + fMaxProximityDist ); } - pVehicles[ 0 ]->ABuScanObjects( 1, scandistance ); + pVehicles[ 0 ]->ABuScanObjects( ( + pVehicle->DirectionGet() == pVehicles[ 0 ]->DirectionGet() ? + 1 : + -1 ), + scandistance ); } else { // towards coupler 1 - if( ( rearvehicle->PrevConnected != nullptr ) - && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 0 : 1 ) ].CouplingFlag == ctrain_virtual ) ) { - // scan behind if we had something connected there and are moving away - rearvehicle->ABuScanObjects( 1, fMaxProximityDist ); + if( ( mvOccupied->V * iDirection < 0.0 ) + || ( ( rearvehicle->PrevConnected != nullptr ) + && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 0 : 1 ) ].CouplingFlag == ctrain_virtual ) ) ) { + // scan behind if we're moving backward, or if we had something connected there and are moving away + rearvehicle->ABuScanObjects( ( + pVehicle->DirectionGet() == rearvehicle->DirectionGet() ? + 1 : + -1 ), + fMaxProximityDist ); } - pVehicles[ 0 ]->ABuScanObjects( -1, scandistance ); + pVehicles[ 0 ]->ABuScanObjects( ( + pVehicle->DirectionGet() == pVehicles[ 0 ]->DirectionGet() ? + -1 : + 1 ), + scandistance ); } } -/* - pVehicles[ 0 ]->fScanDist = ( - mvOccupied->Vel > 5.0 ? - 400 + fBrakeDist : - 300.0 ); - pVehicles[ 0 ]->Update_scan(); - if( pVehicles[ 1 ] != pVehicles[ 0 ] ) { - pVehicles[ 1 ]->fScanDist = pVehicles[ 0 ]->fScanDist; - pVehicles[ 1 ]->Update_scan(); - } -*/ + + + if (AIControllFlag) { // tu bedzie logika sterowania if (mvOccupied->CommandIn.Command != "") diff --git a/Globals.cpp b/Globals.cpp index f83d9e89..780b5697 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -126,7 +126,7 @@ int Global::iDefaultFiltering = 9; // domyślne rozmywanie tekstur TGA bez alfa int Global::iBallastFiltering = 9; // domyślne rozmywanie tekstur podsypki int Global::iRailProFiltering = 5; // domyślne rozmywanie tekstur szyn int Global::iDynamicFiltering = 5; // domyślne rozmywanie tekstur pojazdów -bool Global::bUseVBO = false; // czy jest VBO w karcie graficznej (czy użyć) +bool Global::bUseVBO = true; // czy jest VBO w karcie graficznej (czy użyć) std::string Global::LastGLError; GLint Global::iMaxTextureSize = 4096; // maksymalny rozmiar tekstury bool Global::bSmoothTraction = false; // wygładzanie drutów starym sposobem diff --git a/version.h b/version.h index 13f434c4..7525fac4 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 825 +#define VERSION_MINOR 828 #define VERSION_REVISION 0 From e5980f946ce980a269f1037a3fe419fdca099230 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 30 Aug 2017 19:54:43 +0200 Subject: [PATCH 178/426] minor refactoring and diagnostics enhancements, fixed some memory leaks, radiostop test command --- AirCoupler.cpp | 6 +- AnimModel.cpp | 12 +- AnimModel.h | 4 +- Button.cpp | 4 +- Driver.cpp | 2483 ++++++++++++++++++++++---------------------- Driver.h | 3 +- DynObj.cpp | 22 +- DynObj.h | 3 +- Event.cpp | 16 +- Event.h | 5 +- Gauge.cpp | 4 +- Ground.cpp | 151 ++- McZapkie/MOVER.h | 5 +- McZapkie/Mover.cpp | 16 +- Model3d.cpp | 84 +- Model3d.h | 7 +- PyInt.cpp | 2 +- Track.cpp | 186 ++-- Track.h | 1 - Train.cpp | 70 +- Train.h | 1 + command.cpp | 5 +- command.h | 1 + keyboardinput.cpp | 2 + parser.cpp | 93 +- parser.h | 11 +- version.h | 4 +- 27 files changed, 1584 insertions(+), 1617 deletions(-) diff --git a/AirCoupler.cpp b/AirCoupler.cpp index 62b72624..5c6c0b09 100644 --- a/AirCoupler.cpp +++ b/AirCoupler.cpp @@ -42,9 +42,9 @@ void TAirCoupler::Init(std::string const &asName, TModel3d *pModel) { // wyszukanie submodeli if (!pModel) return; // nie ma w czym szukać - pModelOn = pModel->GetFromName( (asName + "_on").c_str() ); // połączony na wprost - pModelOff = pModel->GetFromName( (asName + "_off").c_str() ); // odwieszony - pModelxOn = pModel->GetFromName( (asName + "_xon").c_str() ); // połączony na skos + pModelOn = pModel->GetFromName( asName + "_on" ); // połączony na wprost + pModelOff = pModel->GetFromName( asName + "_off" ); // odwieszony + pModelxOn = pModel->GetFromName( asName + "_xon" ); // połączony na skos } void TAirCoupler::Load(cParser *Parser, TModel3d *pModel) diff --git a/AnimModel.cpp b/AnimModel.cpp index c0ff498b..b956331a 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -523,11 +523,11 @@ bool TAnimModel::Load(cParser *parser, bool ter) return true; } -TAnimContainer * TAnimModel::AddContainer(char *pName) +TAnimContainer * TAnimModel::AddContainer(std::string const &Name) { // dodanie sterowania submodelem dla egzemplarza if (!pModel) return NULL; - TSubModel *tsb = pModel->GetFromName(pName); + TSubModel *tsb = pModel->GetFromName(Name); if (tsb) { TAnimContainer *tmp = new TAnimContainer(); @@ -539,16 +539,16 @@ TAnimContainer * TAnimModel::AddContainer(char *pName) return NULL; } -TAnimContainer * TAnimModel::GetContainer(char *pName) +TAnimContainer * TAnimModel::GetContainer(std::string const &Name) { // szukanie/dodanie sterowania submodelem dla egzemplarza - if (!pName) + if (true == Name.empty()) return pRoot; // pobranie pierwszego (dla obrotnicy) TAnimContainer *pCurrent; for (pCurrent = pRoot; pCurrent != NULL; pCurrent = pCurrent->pNext) // if (pCurrent->GetName()==pName) - if (std::string(pName) == pCurrent->NameGet()) + if (Name == pCurrent->NameGet()) return pCurrent; - return AddContainer(pName); + return AddContainer(Name); } // przeliczenie animacji - jednorazowo na klatkę diff --git a/AnimModel.h b/AnimModel.h index 1aa11735..e24ab335 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -163,8 +163,8 @@ private: bool Init(TModel3d *pNewModel); bool Init(std::string const &asName, std::string const &asReplacableTexture); bool Load(cParser *parser, bool ter = false); - TAnimContainer * AddContainer(char *pName); - TAnimContainer * GetContainer(char *pName); + TAnimContainer * AddContainer(std::string const &Name); + TAnimContainer * GetContainer(std::string const &Name = ""); int Flags(); void RaAnglesSet(double a, double b, double c) { diff --git a/Button.cpp b/Button.cpp index a673bbfd..8629da2b 100644 --- a/Button.cpp +++ b/Button.cpp @@ -28,8 +28,8 @@ void TButton::Init(std::string const &asName, TModel3d *pModel, bool bNewOn) { if( pModel == nullptr ) { return; } - pModelOn = pModel->GetFromName( (asName + "_on").c_str() ); - pModelOff = pModel->GetFromName( (asName + "_off").c_str() ); + pModelOn = pModel->GetFromName( asName + "_on" ); + pModelOff = pModel->GetFromName( asName + "_off" ); m_state = bNewOn; Update(); }; diff --git a/Driver.cpp b/Driver.cpp index 6c7f97a5..d6ace476 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1446,7 +1446,7 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, if( WriteLogFlag ) { _mkdir( "physicslog\\" ); - LogFile.open( std::string( "physicslog\\" + VehicleName + ".dat" ).c_str(), + LogFile.open( std::string( "physicslog\\" + VehicleName + ".dat" ), std::ios::in | std::ios::out | std::ios::trunc ); #if LOGPRESS == 0 LogFile << std::string( " Time [s] Velocity [m/s] Acceleration [m/ss] Coupler.Dist[m] " @@ -3337,34 +3337,37 @@ void TController::PhysicsLog() } }; -bool TController::UpdateSituation(double dt) -{ // uruchamiać przynajmniej raz na sekundę - if ((iDrivigFlags & movePrimary) == 0) - return true; // pasywny nic nie robi +void +TController::UpdateSituation(double dt) { + // uruchamiać przynajmniej raz na sekundę + if( ( iDrivigFlags & movePrimary ) == 0 ) { return; } // pasywny nic nie robi - double AbsAccS = 0; - // double VelReduced; //o ile km/h może przekroczyć dozwoloną prędkość bez hamowania - bool UpdateOK = false; - if (AIControllFlag) - { // yb: zeby EP nie musial sie bawic z ciesnieniem w PG - // if (mvOccupied->BrakeSystem==ElectroPneumatic) - // mvOccupied->PipePress=0.5; //yB: w SPKS są poprawnie zrobione pozycje - if (mvControlling->SlippingWheels) - { - mvControlling->Sandbox(true); // piasku! - // Controlling->SlippingWheels=false; //a to tu nie ma sensu, flaga używana w dalszej - // części - } - else { - // deactivate sandbox if we aren't slipping - if( mvControlling->SandDose ) { - mvControlling->Sandbox( false ); - } - } + // update timers + ElapsedTime += dt; + WaitingTime += dt; + fBrakeTime -= dt; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca + fStopTime += dt; // zliczanie czasu postoju, nie ruszy dopóki ujemne + fActionTime += dt; // czas używany przy regulacji prędkości i zamykaniu drzwi + LastReactionTime += dt; + LastUpdatedTime += dt; + + // log vehicle data + if( ( WriteLogFlag ) + && ( LastUpdatedTime > deltalog ) ) { + // zapis do pliku DAT + PhysicsLog(); + LastUpdatedTime -= deltalog; } + + if( ( fLastStopExpDist > 0.0 ) + && ( mvOccupied->DistCounter > fLastStopExpDist ) ) { + // zaktualizować wyświetlanie rozkładu + iStationStart = TrainParams->StationIndex; + fLastStopExpDist = -1.0; // usunąć licznik + } + // ABu-160305 testowanie gotowości do jazdy - // Ra: przeniesione z DynObj, skład użytkownika też jest testowany, żeby mu przekazać, że ma - // odhamować + // Ra: przeniesione z DynObj, skład użytkownika też jest testowany, żeby mu przekazać, że ma odhamować int index = double(BrakeAccTableSize) * (mvOccupied->Vel / mvOccupied->Vmax); index = std::min(BrakeAccTableSize, std::max(1, index)); fBrake_a0[0] = fBrake_a0[index]; @@ -3373,6 +3376,7 @@ bool TController::UpdateSituation(double dt) fReady = 0.0; // założenie, że odhamowany fAccGravity = 0.0; // przyspieszenie wynikające z pochylenia double dy; // składowa styczna grawitacji, w przedziale <0,1> + double AbsAccS = 0; TDynamicObject *p = pVehicles[0]; // pojazd na czole składu while (p) { // sprawdzenie odhamowania wszystkich połączonych pojazdów @@ -3397,22 +3401,22 @@ bool TController::UpdateSituation(double dt) } if (fReady < p->MoverParameters->BrakePress) fReady = p->MoverParameters->BrakePress; // szukanie najbardziej zahamowanego - if ((dy = p->VectorFront().y) != 0.0) // istotne tylko dla pojazdów na pochyleniu - fAccGravity -= p->DirectionGet() * p->MoverParameters->TotalMassxg * - dy; // ciężar razy składowa styczna grawitacji + if( ( dy = p->VectorFront().y ) != 0.0 ) { + // istotne tylko dla pojazdów na pochyleniu + // ciężar razy składowa styczna grawitacji + fAccGravity -= p->DirectionGet() * p->MoverParameters->TotalMassxg * dy; + } p = p->Next(); // pojazd podłączony z tyłu (patrząc od czoła) } - if (iDirection) - fAccGravity /= - iDirection * - fMass; // siłę generują pojazdy na pochyleniu ale działa ona całość składu, więc a=F/m + if( iDirection ) { + // siłę generują pojazdy na pochyleniu ale działa ona całość składu, więc a=F/m + fAccGravity /= iDirection * fMass; + } if (!Ready) // v367: jeśli wg powyższych warunków skład nie jest odhamowany if (fAccGravity < -0.05) // jeśli ma pod górę na tyle, by się stoczyć - // if (mvOccupied->BrakePress<0.08) //to wystarczy, że zadziałają liniowe (nie ma ich - // jeszcze!!!) + // if (mvOccupied->BrakePress<0.08) //to wystarczy, że zadziałają liniowe (nie ma ich jeszcze!!!) if (fReady < 0.8) // delikatniejszy warunek, obejmuje wszystkie wagony Ready = true; //żeby uznać za odhamowany - HelpMeFlag = false; // crude way to deal with automatic door opening on W4 preventing further ride // for human-controlled vehicles with no door control and dynamic brake auto-activating with door open @@ -3423,29 +3427,48 @@ bool TController::UpdateSituation(double dt) Doors( false ); } - // Winger 020304 - if (true == AIControllFlag) - { - if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) - { - if (mvOccupied->ScndPipePress > 4.3) // gdy główna sprężarka bezpiecznie nabije ciśnienie - mvControlling->bPantKurek3 = true; // to można przestawić kurek na zasilanie pantografów z głównej pneumatyki - fVoltage = - 0.5 * (fVoltage + - fabs(mvControlling->RunningTraction.TractionVoltage)); // uśrednione napięcie - // sieci: przy spadku poniżej wartości minimalnej opóźnić rozruch o losowy czas - if (fVoltage < mvControlling->EnginePowerSource.CollectorParameters - .MinV) // gdy rozłączenie WS z powodu niskiego napięcia - if (fActionTime >= 0) // jeśli czas oczekiwania nie został ustawiony - fActionTime = - -2 - Random(10); // losowy czas oczekiwania przed ponownym załączeniem jazdy + // basic situational ai operations + // TBD, TODO: move these to main routine, if it's not neccessary for them to fire every time? + if( AIControllFlag ) { + + // wheel slip + if( mvControlling->SlippingWheels ) { + mvControlling->Sandbox( true ); // piasku! } - if (mvOccupied->Vel > 0.0) - { // jeżeli jedzie - if (iDrivigFlags & moveDoorOpened) // jeśli drzwi otwarte - if (mvOccupied->Vel > 1.0) // nie zamykać drzwi przy drganiach, bo zatrzymanie na W4 - // akceptuje niewielkie prędkości - Doors(false); + else { + // deactivate sandbox if we aren't slipping + if( mvControlling->SandDose ) { + mvControlling->Sandbox( false ); + } + } + + if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { + + if( mvOccupied->ScndPipePress > 4.3 ) { + // gdy główna sprężarka bezpiecznie nabije ciśnienie to można przestawić kurek na zasilanie pantografów z głównej pneumatyki + mvControlling->bPantKurek3 = true; + } + + // uśrednione napięcie sieci: przy spadku poniżej wartości minimalnej opóźnić rozruch o losowy czas + fVoltage = 0.5 * (fVoltage + std::abs(mvControlling->RunningTraction.TractionVoltage)); + if( fVoltage < mvControlling->EnginePowerSource.CollectorParameters.MinV ) { + // gdy rozłączenie WS z powodu niskiego napięcia + if( fActionTime >= 0 ) { + // jeśli czas oczekiwania nie został ustawiony, losowy czas oczekiwania przed ponownym załączeniem jazdy + fActionTime = -2.0 - Random( 10 ); + } + } + } + + if (mvOccupied->Vel > 0.0) { + // jeżeli jedzie + if( iDrivigFlags & moveDoorOpened ) { + // jeśli drzwi otwarte + if( mvOccupied->Vel > 1.0 ) { + // nie zamykać drzwi przy drganiach, bo zatrzymanie na W4 akceptuje niewielkie prędkości + Doors( false ); + } + } /* // NOTE: this section moved all cars to the edge of their respective roads // it may have some use eventually for collision avoidance, @@ -3463,8 +3486,7 @@ bool TController::UpdateSituation(double dt) { if ((fOverhead2 >= 0.0) || iOverheadZero) { // jeśli jazda bezprądowa albo z opuszczonym pantografem - while (DecSpeed(true)) - ; // zerowanie napędu + while( DecSpeed( true ) ) { ; } // zerowanie napędu } if ((fOverhead2 > 0.0) || iOverheadDown) { // jazda z opuszczonymi pantografami @@ -3497,6 +3519,20 @@ bool TController::UpdateSituation(double dt) } } } + + // horn control + if( fWarningDuration > 0.0 ) { + // jeśli pozostało coś do wytrąbienia trąbienie trwa nadal + fWarningDuration -= dt; + if( fWarningDuration < 0.05 ) + mvOccupied->WarningSignal = 0; // a tu się kończy + } + if( mvOccupied->Vel >= 3.0 ) { + // jesli jedzie, można odblokować trąbienie, bo się wtedy nie włączy + iDrivigFlags &= ~moveStartHornDone; // zatrąbi dopiero jak następnym razem stanie + iDrivigFlags |= moveStartHorn; // i trąbić przed następnym ruszeniem + } + if( ( true == TestFlag( iDrivigFlags, moveStartHornNow ) ) && ( true == Ready ) && ( iEngineActive != 0 ) @@ -3508,1304 +3544,1249 @@ bool TController::UpdateSituation(double dt) iDrivigFlags &= ~moveStartHornNow; // trąbienie zostało zorganizowane } } - ElapsedTime += dt; - WaitingTime += dt; - fBrakeTime -= dt; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca - fStopTime += dt; // zliczanie czasu postoju, nie ruszy dopóki ujemne - fActionTime += dt; // czas używany przy regulacji prędkości i zamykaniu drzwi - if (WriteLogFlag) - { - if (LastUpdatedTime > deltalog) - { // zapis do pliku DAT - PhysicsLog(); - if (fabs(mvOccupied->V) > 0.1) // Ra: [m/s] - deltalog = 0.05; // 0.2; - else - deltalog = 0.05; // 1.0; - LastUpdatedTime = 0.0; - } - else - LastUpdatedTime = LastUpdatedTime + dt; - } - // Ra: skanowanie również dla prowadzonego ręcznie, aby podpowiedzieć prędkość - if ((LastReactionTime > std::min(ReactionTime, 2.0))) - { - // Ra: nie wiem czemu ReactionTime potrafi dostać 12 sekund, to jest przegięcie, bo przeżyna STÓJ - // yB: otóż jest to jedna trzecia czasu napełniania na towarowym; może się przydać przy - // wdrażaniu hamowania, żeby nie ruszało kranem jak głupie - // Ra: ale nie może się budzić co pół minuty, bo przeżyna semafory - // Ra: trzeba by tak: - // 1. Ustalić istotną odległość zainteresowania (np. 3×droga hamowania z V.max). - // dla hamowania -0.2 [m/ss] droga wynosi 0.389*Vel*Vel [km/h], czyli 600m dla 40km/h, 3.8km - // dla 100km/h i 9.8km dla 160km/h - // dla hamowania -0.4 [m/ss] droga wynosi 0.096*Vel*Vel [km/h], czyli 150m dla 40km/h, 1.0km - // dla 100km/h i 2.5km dla 160km/h - // ogólnie droga hamowania przy stałym opóźnieniu to Vel*Vel/(3.6*3.6*a) [m] - // fBrakeDist powinno być wyznaczane dla danego składu za pomocą sieci neuronowych, w - // zależności od prędkości i siły (ciśnienia) hamowania - // następnie w drugą stronę, z drogi hamowania i chwilowej prędkości powinno być wyznaczane zalecane ciśnienie - // przybliżona droga hamowania - fBrakeDist = fDriverBraking * mvOccupied->Vel * ( 40.0 + mvOccupied->Vel ); - if( fMass > 1000000.0 ) { - // korekta dla ciężkich, bo przeżynają - da to coś? - fBrakeDist *= 2.0; - } - if( ( -fAccThreshold > 0.05 ) - && ( mvOccupied->CategoryFlag == 1 ) ) { - fBrakeDist = mvOccupied->Vel * mvOccupied->Vel / 25.92 / -fAccThreshold; - } - if( mvOccupied->BrakeDelayFlag == bdelay_G ) { - // dla nastawienia G koniecznie należy wydłużyć drogę na czas reakcji - fBrakeDist += 2 * mvOccupied->Vel; - } - // double scanmax=(mvOccupied->Vel>0.0)?3*fDriverDist+fBrakeDist:10.0*fDriverDist; - double scanmax = ( - mvOccupied->Vel > 5.0 ? - 400 + fBrakeDist : - 30.0 * fDriverDist ); // 1500m dla stojących pociągów; - // Ra 2015-01: przy dłuższej drodze skanowania AI jeździ spokojniej - // 2. Sprawdzić, czy tabelka pokrywa założony odcinek (nie musi, jeśli jest STOP). - // 3. Sprawdzić, czy trajektoria ruchu przechodzi przez zwrotnice - jeśli tak, to sprawdzić, - // czy stan się nie zmienił. - // 4. Ewentualnie uzupełnić tabelkę informacjami o sygnałach i ograniczeniach, jeśli się - // "zużyła". - TableCheck(scanmax); // wypełnianie tabelki i aktualizacja odległości - // 5. Sprawdzić stany sygnalizacji zapisanej w tabelce, wyznaczyć prędkości. - // 6. Z tabelki wyznaczyć krytyczną odległość i prędkość (najmniejsze przyspieszenie). - // 7. Jeśli jest inny pojazd z przodu, ewentualnie skorygować odległość i prędkość. - // 8. Ustalić częstotliwość świadomości AI (zatrzymanie precyzyjne - częściej, brak atrakcji - // - rzadziej). - // check for potential colliders - { - auto const scandistance = 300.0 + fBrakeDist; - auto rearvehicle = ( - pVehicles[ 0 ] == pVehicles[ 1 ] ? - pVehicles[ 0 ] : - pVehicles[ 1 ] ); - if( mvOccupied->V >= 0.0 ) { - // towards coupler 0 - if( ( mvOccupied->V * iDirection < 0.0 ) - || ( ( rearvehicle->NextConnected != nullptr ) - && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 1 : 0 ) ].CouplingFlag == ctrain_virtual ) ) ) { - // scan behind if we're moving backward, or if we had something connected there and are moving away - rearvehicle->ABuScanObjects( ( - pVehicle->DirectionGet() == rearvehicle->DirectionGet() ? - -1 : - 1 ), - fMaxProximityDist ); - } - pVehicles[ 0 ]->ABuScanObjects( ( - pVehicle->DirectionGet() == pVehicles[ 0 ]->DirectionGet() ? - 1 : - -1 ), - scandistance ); - } - else { - // towards coupler 1 - if( ( mvOccupied->V * iDirection < 0.0 ) - || ( ( rearvehicle->PrevConnected != nullptr ) - && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 0 : 1 ) ].CouplingFlag == ctrain_virtual ) ) ) { - // scan behind if we're moving backward, or if we had something connected there and are moving away - rearvehicle->ABuScanObjects( ( - pVehicle->DirectionGet() == rearvehicle->DirectionGet() ? - 1 : - -1 ), - fMaxProximityDist ); - } - pVehicles[ 0 ]->ABuScanObjects( ( - pVehicle->DirectionGet() == pVehicles[ 0 ]->DirectionGet() ? + // main ai update routine + auto const reactiontime = std::min( ReactionTime, 2.0 ); + if( LastReactionTime < reactiontime ) { return; } + + LastReactionTime -= reactiontime; + // Ra: nie wiem czemu ReactionTime potrafi dostać 12 sekund, to jest przegięcie, bo przeżyna STÓJ + // yB: otóż jest to jedna trzecia czasu napełniania na towarowym; może się przydać przy + // wdrażaniu hamowania, żeby nie ruszało kranem jak głupie + // Ra: ale nie może się budzić co pół minuty, bo przeżyna semafory + // Ra: trzeba by tak: + // 1. Ustalić istotną odległość zainteresowania (np. 3×droga hamowania z V.max). + // dla hamowania -0.2 [m/ss] droga wynosi 0.389*Vel*Vel [km/h], czyli 600m dla 40km/h, 3.8km + // dla 100km/h i 9.8km dla 160km/h + // dla hamowania -0.4 [m/ss] droga wynosi 0.096*Vel*Vel [km/h], czyli 150m dla 40km/h, 1.0km + // dla 100km/h i 2.5km dla 160km/h + // ogólnie droga hamowania przy stałym opóźnieniu to Vel*Vel/(3.6*3.6*a) [m] + // fBrakeDist powinno być wyznaczane dla danego składu za pomocą sieci neuronowych, w + // zależności od prędkości i siły (ciśnienia) hamowania + // następnie w drugą stronę, z drogi hamowania i chwilowej prędkości powinno być wyznaczane zalecane ciśnienie + + // przybliżona droga hamowania + fBrakeDist = fDriverBraking * mvOccupied->Vel * ( 40.0 + mvOccupied->Vel ); + if( fMass > 1000000.0 ) { + // korekta dla ciężkich, bo przeżynają - da to coś? + fBrakeDist *= 2.0; + } + if( ( -fAccThreshold > 0.05 ) + && ( mvOccupied->CategoryFlag == 1 ) ) { + fBrakeDist = mvOccupied->Vel * mvOccupied->Vel / 25.92 / -fAccThreshold; + } + if( mvOccupied->BrakeDelayFlag == bdelay_G ) { + // dla nastawienia G koniecznie należy wydłużyć drogę na czas reakcji + fBrakeDist += 2 * mvOccupied->Vel; + } + // route scan + double routescanrange = ( + mvOccupied->Vel > 5.0 ? + 400 + fBrakeDist : + 30.0 * fDriverDist ); // 1500m dla stojących pociągów; + // Ra 2015-01: przy dłuższej drodze skanowania AI jeździ spokojniej + // 2. Sprawdzić, czy tabelka pokrywa założony odcinek (nie musi, jeśli jest STOP). + // 3. Sprawdzić, czy trajektoria ruchu przechodzi przez zwrotnice - jeśli tak, to sprawdzić, + // czy stan się nie zmienił. + // 4. Ewentualnie uzupełnić tabelkę informacjami o sygnałach i ograniczeniach, jeśli się + // "zużyła". + TableCheck(routescanrange); // wypełnianie tabelki i aktualizacja odległości + // 5. Sprawdzić stany sygnalizacji zapisanej w tabelce, wyznaczyć prędkości. + // 6. Z tabelki wyznaczyć krytyczną odległość i prędkość (najmniejsze przyspieszenie). + // 7. Jeśli jest inny pojazd z przodu, ewentualnie skorygować odległość i prędkość. + // 8. Ustalić częstotliwość świadomości AI (zatrzymanie precyzyjne - częściej, brak atrakcji + // - rzadziej). + + // check for potential colliders + { + auto const collisionscanrange = 300.0 + fBrakeDist; + auto rearvehicle = ( + pVehicles[ 0 ] == pVehicles[ 1 ] ? + pVehicles[ 0 ] : + pVehicles[ 1 ] ); + // for moving vehicle determine heading from velocity; for standing fall back on the set direction + if( ( mvOccupied->V != 0.0 ? + mvOccupied->V > 0.0 : + iDirection > 0 ) ) { + // towards coupler 0 + if( ( mvOccupied->V * iDirection < 0.0 ) + || ( ( rearvehicle->NextConnected != nullptr ) + && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 1 : 0 ) ].CouplingFlag == ctrain_virtual ) ) ) { + // scan behind if we're moving backward, or if we had something connected there and are moving away + rearvehicle->ABuScanObjects( ( + pVehicle->DirectionGet() == rearvehicle->DirectionGet() ? -1 : 1 ), - scandistance ); + fMaxProximityDist ); } + pVehicles[ 0 ]->ABuScanObjects( ( + pVehicle->DirectionGet() == pVehicles[ 0 ]->DirectionGet() ? + 1 : + -1 ), + collisionscanrange ); } - - - - if (AIControllFlag) - { // tu bedzie logika sterowania - if (mvOccupied->CommandIn.Command != "") - if( !mvOccupied->RunInternalCommand() ) { - // rozpoznaj komende bo lokomotywa jej nie rozpoznaje - RecognizeCommand(); // samo czyta komendę wstawioną do pojazdu? - } - if( mvOccupied->SecuritySystem.Status > 1 ) { - // jak zadziałało CA/SHP - if( !mvOccupied->SecuritySystemReset() ) { // to skasuj - if( ( mvOccupied->BrakeCtrlPos == 0 ) - && ( AccDesired > 0.0 ) - && ( ( TestFlag( mvOccupied->SecuritySystem.Status, s_SHPebrake ) ) - || ( TestFlag( mvOccupied->SecuritySystem.Status, s_CAebrake ) ) ) ) { - //!!! hm, może po prostu normalnie sterować hamulcem? - mvOccupied->BrakeLevelSet( 0 ); - } - } + else { + // towards coupler 1 + if( ( mvOccupied->V * iDirection < 0.0 ) + || ( ( rearvehicle->PrevConnected != nullptr ) + && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 0 : 1 ) ].CouplingFlag == ctrain_virtual ) ) ) { + // scan behind if we're moving backward, or if we had something connected there and are moving away + rearvehicle->ABuScanObjects( ( + pVehicle->DirectionGet() == rearvehicle->DirectionGet() ? + 1 : + -1 ), + fMaxProximityDist ); } - // basic emergency stop handling, while at it - if( ( true == mvOccupied->EmergencyBrakeFlag ) // radio-stop - && ( mvOccupied->Vel == 0.0 ) // and actual stop - && ( true == mvOccupied->Radio ) ) { // and we didn't touch the radio yet - // turning off the radio should reset the flag, during security system check - if( m_radiocontroltime > 5.0 ) { - // arbitrary delay between stop and disabling the radio - mvOccupied->Radio = false; - m_radiocontroltime = 0.0; - } - else { - m_radiocontroltime += LastReactionTime; - } + pVehicles[ 0 ]->ABuScanObjects( ( + pVehicle->DirectionGet() == pVehicles[ 0 ]->DirectionGet() ? + -1 : + 1 ), + collisionscanrange ); + } + } + + // tu bedzie logika sterowania + if (AIControllFlag) { + + if (mvOccupied->CommandIn.Command != "") + if( !mvOccupied->RunInternalCommand() ) { + // rozpoznaj komende bo lokomotywa jej nie rozpoznaje + RecognizeCommand(); // samo czyta komendę wstawioną do pojazdu? } - if( ( false == mvOccupied->Radio ) - && ( false == mvOccupied->EmergencyBrakeFlag ) ) { - // otherwise if it's safe to do so, turn the radio back on - if( m_radiocontroltime > 10.0 ) { - // arbitrary 5 sec delay before switching radio back on - mvOccupied->Radio = true; - m_radiocontroltime = 0.0; - } - else { - m_radiocontroltime += LastReactionTime; + if( mvOccupied->SecuritySystem.Status > 1 ) { + // jak zadziałało CA/SHP + if( !mvOccupied->SecuritySystemReset() ) { // to skasuj + if( ( mvOccupied->BrakeCtrlPos == 0 ) + && ( AccDesired > 0.0 ) + && ( ( TestFlag( mvOccupied->SecuritySystem.Status, s_SHPebrake ) ) + || ( TestFlag( mvOccupied->SecuritySystem.Status, s_CAebrake ) ) ) ) { + //!!! hm, może po prostu normalnie sterować hamulcem? + mvOccupied->BrakeLevelSet( 0 ); } } } - - switch (OrderList[OrderPos]) - { // ustalenie prędkości przy doczepianiu i odczepianiu, dystansów w pozostałych przypadkach - case Connect: { - // podłączanie do składu - if (iDrivigFlags & moveConnect) { - // jeśli stanął już blisko, unikając zderzenia i można próbować podłączyć - fMinProximityDist = -0.5; - fMaxProximityDist = 0.0; //[m] dojechać maksymalnie - fVelPlus = 0.5; // dopuszczalne przekroczenie prędkości na ograniczeniu bez - // hamowania - fVelMinus = 0.5; // margines prędkości powodujący załączenie napędu - if (AIControllFlag) - { // to robi tylko AI, wersję dla człowieka trzeba dopiero zrobić - // sprzęgi sprawdzamy w pierwszej kolejności, bo jak połączony, to koniec - bool ok; // true gdy się podłączy (uzyskany sprzęg będzie zgodny z żądanym) - if (pVehicles[0]->DirectionGet() > 0) // jeśli sprzęg 0 - { // sprzęg 0 - próba podczepienia - if (pVehicles[0]->MoverParameters->Couplers[0].Connected) // jeśli jest coś - // wykryte (a - // chyba jest, - // nie?) - if (pVehicles[0]->MoverParameters->Attach( - 0, 2, pVehicles[0]->MoverParameters->Couplers[0].Connected, - iCoupler)) - { - // pVehicles[0]->dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); - // pVehicles[0]->dsbCouplerAttach->Play(0,0,0); - } - // WriteLog("CoupleDist[0]="+AnsiString(pVehicles[0]->MoverParameters->Couplers[0].CoupleDist)+", - // Connected[0]="+AnsiString(pVehicles[0]->MoverParameters->Couplers[0].CouplingFlag)); - ok = (pVehicles[0]->MoverParameters->Couplers[0].CouplingFlag == - iCoupler); // udało się? (mogło częściowo) - } - else // if (pVehicles[0]->MoverParameters->DirAbsolute<0) //jeśli sprzęg 1 - { // sprzęg 1 - próba podczepienia - if (pVehicles[0]->MoverParameters->Couplers[1].Connected) // jeśli jest coś - // wykryte (a - // chyba jest, - // nie?) - if (pVehicles[0]->MoverParameters->Attach( - 1, 2, pVehicles[0]->MoverParameters->Couplers[1].Connected, - iCoupler)) - { - // pVehicles[0]->dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); - // pVehicles[0]->dsbCouplerAttach->Play(0,0,0); - } - // WriteLog("CoupleDist[1]="+AnsiString(Controlling->Couplers[1].CoupleDist)+", - // Connected[0]="+AnsiString(Controlling->Couplers[1].CouplingFlag)); - ok = (pVehicles[0]->MoverParameters->Couplers[1].CouplingFlag == - iCoupler); // udało się? (mogło częściowo) - } - if (ok) - { // jeżeli został podłączony - iCoupler = 0; // dalsza jazda manewrowa już bez łączenia - iDrivigFlags &= ~moveConnect; // zdjęcie flagi doczepiania - SetVelocity(0, 0, stopJoin); // wyłączyć przyspieszanie - CheckVehicles(); // sprawdzić światła nowego składu - JumpToNextOrder(); // wykonanie następnej komendy - } - else - SetVelocity(2.0, 0.0); // jazda w ustawionym kierunku z prędkością 2 (18s) - } // if (AIControllFlag) //koniec zblokowania, bo była zmienna lokalna + // basic emergency stop handling, while at it + if( ( true == mvOccupied->RadioStopFlag ) // radio-stop + && ( mvOccupied->Vel == 0.0 ) // and actual stop + && ( true == mvOccupied->Radio ) ) { // and we didn't touch the radio yet + // turning off the radio should reset the flag, during security system check + if( m_radiocontroltime > 5.0 ) { + // arbitrary delay between stop and disabling the radio + mvOccupied->Radio = false; + m_radiocontroltime = 0.0; } else { - // jak daleko, to jazda jak dla Shunt na kolizję - fMinProximityDist = 2.0; - fMaxProximityDist = 5.0; //[m] w takim przedziale odległości powinien stanąć - fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania - fVelMinus = 1.0; // margines prędkości powodujący załączenie napędu - if( pVehicles[ 0 ]->fTrackBlock <= 20.0 ) { - // przy zderzeniu fTrackBlock nie jest miarodajne - // początek podczepiania, z wyłączeniem sprawdzania fTrackBlock - iDrivigFlags |= moveConnect; - } + m_radiocontroltime += reactiontime; } - break; } - case Disconnect: { - // 20.07.03 - manewrowanie wagonami - fMinProximityDist = 1.0; - fMaxProximityDist = 10.0; //[m] - fVelPlus = 1.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + if( ( false == mvOccupied->Radio ) + && ( false == mvOccupied->RadioStopFlag ) ) { + // otherwise if it's safe to do so, turn the radio back on + if( m_radiocontroltime > 10.0 ) { + // arbitrary 5 sec delay before switching radio back on + mvOccupied->Radio = true; + m_radiocontroltime = 0.0; + } + else { + m_radiocontroltime += reactiontime; + } + } + } + + switch (OrderList[OrderPos]) + { // ustalenie prędkości przy doczepianiu i odczepianiu, dystansów w pozostałych przypadkach + case Connect: { + // podłączanie do składu + if (iDrivigFlags & moveConnect) { + // jeśli stanął już blisko, unikając zderzenia i można próbować podłączyć + fMinProximityDist = -0.5; + fMaxProximityDist = 0.0; //[m] dojechać maksymalnie + fVelPlus = 0.5; // dopuszczalne przekroczenie prędkości na ograniczeniu bez + // hamowania fVelMinus = 0.5; // margines prędkości powodujący załączenie napędu - if (AIControllFlag) { - if (iVehicleCount >= 0) { - // jeśli była podana ilość wagonów - if (iDrivigFlags & movePress) { - // jeśli dociskanie w celu odczepienia - // 3. faza odczepiania. - SetVelocity(2, 0); // jazda w ustawionym kierunku z prędkością 2 - if ((mvControlling->MainCtrlPos > 0) || - (mvOccupied->BrakeSystem == ElectroPneumatic)) // jeśli jazda + if (AIControllFlag) + { // to robi tylko AI, wersję dla człowieka trzeba dopiero zrobić + // sprzęgi sprawdzamy w pierwszej kolejności, bo jak połączony, to koniec + bool ok; // true gdy się podłączy (uzyskany sprzęg będzie zgodny z żądanym) + if (pVehicles[0]->DirectionGet() > 0) // jeśli sprzęg 0 + { // sprzęg 0 - próba podczepienia + if (pVehicles[0]->MoverParameters->Couplers[0].Connected) // jeśli jest coś + // wykryte (a + // chyba jest, + // nie?) + if (pVehicles[0]->MoverParameters->Attach( + 0, 2, pVehicles[0]->MoverParameters->Couplers[0].Connected, + iCoupler)) { - WriteLog(mvOccupied->Name + " odczepianie w kierunku " + std::to_string(mvOccupied->DirAbsolute)); - TDynamicObject *p = - pVehicle; // pojazd do odczepienia, w (pVehicle) siedzi AI - int d; // numer sprzęgu, który sprawdzamy albo odczepiamy - int n = iVehicleCount; // ile wagonów ma zostać - do - { // szukanie pojazdu do odczepienia - d = p->DirectionGet() > 0 ? - 0 : - 1; // numer sprzęgu od strony czoła składu - // if (p->MoverParameters->Couplers[d].CouplerType==Articulated) - // //jeśli sprzęg typu wózek (za mało) - if (p->MoverParameters->Couplers[d].CouplingFlag & - ctrain_depot) // jeżeli sprzęg zablokowany - // if (p->GetTrack()->) //a nie stoi na torze warsztatowym - // (ustalić po czym poznać taki tor) - ++n; // to liczymy człony jako jeden - p->MoverParameters->BrakeReleaser(1); // wyluzuj pojazd, aby dało się dopychać - p->MoverParameters->BrakeLevelSet(0); // hamulec na zero, aby nie hamował - if (n) - { // jeśli jeszcze nie koniec - p = p->Prev(); // kolejny w stronę czoła składu (licząc od - // tyłu), bo dociskamy - if (!p) - iVehicleCount = -2, - n = 0; // nie ma co dalej sprawdzać, doczepianie zakończone - } - } while (n--); - if( p ? p->MoverParameters->Couplers[ d ].CouplingFlag == coupling::faux : true ) { - // no target, or already just virtual coupling - WriteLog( mvOccupied->Name + " didn't find anything to disconnect." ); - iVehicleCount = -2; // odczepiono, co było do odczepienia - } else if ( p->Dettach(d) == coupling::faux ) { - // tylko jeśli odepnie - WriteLog( mvOccupied->Name + " odczepiony." ); - iVehicleCount = -2; - } // a jak nie, to dociskać dalej + // pVehicles[0]->dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); + // pVehicles[0]->dsbCouplerAttach->Play(0,0,0); } - if (iVehicleCount >= 0) // zmieni się po odczepieniu - if (!mvOccupied->DecLocalBrakeLevel(1)) - { // dociśnij sklad - WriteLog( mvOccupied->Name + " dociskanie..." ); - // mvOccupied->BrakeReleaser(); //wyluzuj lokomotywę - // Ready=true; //zamiast sprawdzenia odhamowania całego składu - IncSpeed(); // dla (Ready)==false nie ruszy - } - } - if ((mvOccupied->Vel == 0.0) && !(iDrivigFlags & movePress)) - { // 2. faza odczepiania: zmień kierunek na przeciwny i dociśnij - // za radą yB ustawiamy pozycję 3 kranu (ruszanie kranem w innych miejscach - // powino zostać wyłączone) - // WriteLog("Zahamowanie składu"); - mvOccupied->BrakeLevelSet(mvOccupied->BrakeSystem == ElectroPneumatic ? 1 : - 3); - double p = mvOccupied->BrakePressureActual.PipePressureVal; - if( p < 3.9 ) { - // tu może być 0 albo -1 nawet - // TODO: zabezpieczenie przed dziwnymi CHK do czasu wyjaśnienia sensu 0 oraz -1 w tym miejscu - p = 3.9; - } - if (mvOccupied->BrakeSystem == ElectroPneumatic ? - mvOccupied->BrakePress > 2 : - mvOccupied->PipePress < p + 0.1) - { // jeśli w miarę został zahamowany (ciśnienie mniejsze niż podane na - // pozycji 3, zwyle 0.37) - if (mvOccupied->BrakeSystem == ElectroPneumatic) - mvOccupied->BrakeLevelSet(0); // wyłączenie EP, gdy wystarczy (może - // nie być potrzebne, bo na początku - // jest) - WriteLog("Luzowanie lokomotywy i zmiana kierunku"); - mvOccupied->BrakeReleaser(1); // wyluzuj lokomotywę; a ST45? - mvOccupied->DecLocalBrakeLevel(10); // zwolnienie hamulca - iDrivigFlags |= movePress; // następnie będzie dociskanie - DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na przeciwny (dociskanie) - CheckVehicles(); // od razu zmienić światła (zgasić) - bez tego się nie odczepi - fStopTime = 0.0; // nie ma na co czekać z odczepianiem + // WriteLog("CoupleDist[0]="+AnsiString(pVehicles[0]->MoverParameters->Couplers[0].CoupleDist)+", + // Connected[0]="+AnsiString(pVehicles[0]->MoverParameters->Couplers[0].CouplingFlag)); + ok = (pVehicles[0]->MoverParameters->Couplers[0].CouplingFlag == + iCoupler); // udało się? (mogło częściowo) + } + else // if (pVehicles[0]->MoverParameters->DirAbsolute<0) //jeśli sprzęg 1 + { // sprzęg 1 - próba podczepienia + if( pVehicles[ 0 ]->MoverParameters->Couplers[ 1 ].Connected ) { + // jeśli jest coś wykryte (a chyba jest, nie?) + if( pVehicles[ 0 ]->MoverParameters->Attach( + 1, 2, pVehicles[ 0 ]->MoverParameters->Couplers[ 1 ].Connected, + iCoupler ) ) { + // pVehicles[0]->dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); + // pVehicles[0]->dsbCouplerAttach->Play(0,0,0); } } - } // odczepiania - else // to poniżej jeśli ilość wagonów ujemna - if (iDrivigFlags & movePress) - { // 4. faza odczepiania: zwolnij i zmień kierunek + // WriteLog("CoupleDist[1]="+AnsiString(Controlling->Couplers[1].CoupleDist)+", + // Connected[0]="+AnsiString(Controlling->Couplers[1].CouplingFlag)); + ok = (pVehicles[0]->MoverParameters->Couplers[1].CouplingFlag == + iCoupler); // udało się? (mogło częściowo) + } + if (ok) + { // jeżeli został podłączony + iCoupler = 0; // dalsza jazda manewrowa już bez łączenia + iDrivigFlags &= ~moveConnect; // zdjęcie flagi doczepiania SetVelocity(0, 0, stopJoin); // wyłączyć przyspieszanie - if (!DecSpeed()) // jeśli już bardziej wyłączyć się nie da - { // ponowna zmiana kierunku - WriteLog( mvOccupied->Name + " ponowna zmiana kierunku" ); - DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na właściwy - iDrivigFlags &= ~movePress; // koniec dociskania - JumpToNextOrder(); // zmieni światła - TableClear(); // skanowanie od nowa - iDrivigFlags &= ~moveStartHorn; // bez trąbienia przed ruszeniem - SetVelocity(fShuntVelocity, fShuntVelocity); // ustawienie prędkości jazdy + CheckVehicles(); // sprawdzić światła nowego składu + JumpToNextOrder(); // wykonanie następnej komendy + } + else + SetVelocity(2.0, 0.0); // jazda w ustawionym kierunku z prędkością 2 (18s) + } // if (AIControllFlag) //koniec zblokowania, bo była zmienna lokalna + } + else { + // jak daleko, to jazda jak dla Shunt na kolizję + fMinProximityDist = 2.0; + fMaxProximityDist = 5.0; //[m] w takim przedziale odległości powinien stanąć + fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + fVelMinus = 1.0; // margines prędkości powodujący załączenie napędu + if( pVehicles[ 0 ]->fTrackBlock <= 20.0 ) { + // przy zderzeniu fTrackBlock nie jest miarodajne + // początek podczepiania, z wyłączeniem sprawdzania fTrackBlock + iDrivigFlags |= moveConnect; + } + } + break; + } + case Disconnect: { + // 20.07.03 - manewrowanie wagonami + fMinProximityDist = 1.0; + fMaxProximityDist = 10.0; //[m] + fVelPlus = 1.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + fVelMinus = 0.5; // margines prędkości powodujący załączenie napędu + if (AIControllFlag) { + if (iVehicleCount >= 0) { + // jeśli była podana ilość wagonów + if (iDrivigFlags & movePress) { + // jeśli dociskanie w celu odczepienia + // 3. faza odczepiania. + SetVelocity(2, 0); // jazda w ustawionym kierunku z prędkością 2 + if ((mvControlling->MainCtrlPos > 0) || + (mvOccupied->BrakeSystem == ElectroPneumatic)) // jeśli jazda + { + WriteLog(mvOccupied->Name + " odczepianie w kierunku " + std::to_string(mvOccupied->DirAbsolute)); + TDynamicObject *p = + pVehicle; // pojazd do odczepienia, w (pVehicle) siedzi AI + int d; // numer sprzęgu, który sprawdzamy albo odczepiamy + int n = iVehicleCount; // ile wagonów ma zostać + do + { // szukanie pojazdu do odczepienia + d = p->DirectionGet() > 0 ? + 0 : + 1; // numer sprzęgu od strony czoła składu + // if (p->MoverParameters->Couplers[d].CouplerType==Articulated) + // //jeśli sprzęg typu wózek (za mało) + if (p->MoverParameters->Couplers[d].CouplingFlag & + ctrain_depot) // jeżeli sprzęg zablokowany + // if (p->GetTrack()->) //a nie stoi na torze warsztatowym + // (ustalić po czym poznać taki tor) + ++n; // to liczymy człony jako jeden + p->MoverParameters->BrakeReleaser(1); // wyluzuj pojazd, aby dało się dopychać + p->MoverParameters->BrakeLevelSet(0); // hamulec na zero, aby nie hamował + if (n) + { // jeśli jeszcze nie koniec + p = p->Prev(); // kolejny w stronę czoła składu (licząc od + // tyłu), bo dociskamy + if (!p) + iVehicleCount = -2, + n = 0; // nie ma co dalej sprawdzać, doczepianie zakończone + } + } while (n--); + if( p ? p->MoverParameters->Couplers[ d ].CouplingFlag == coupling::faux : true ) { + // no target, or already just virtual coupling + WriteLog( mvOccupied->Name + " didn't find anything to disconnect." ); + iVehicleCount = -2; // odczepiono, co było do odczepienia + } else if ( p->Dettach(d) == coupling::faux ) { + // tylko jeśli odepnie + WriteLog( mvOccupied->Name + " odczepiony." ); + iVehicleCount = -2; + } // a jak nie, to dociskać dalej + } + if (iVehicleCount >= 0) // zmieni się po odczepieniu + if (!mvOccupied->DecLocalBrakeLevel(1)) + { // dociśnij sklad + WriteLog( mvOccupied->Name + " dociskanie..." ); + // mvOccupied->BrakeReleaser(); //wyluzuj lokomotywę + // Ready=true; //zamiast sprawdzenia odhamowania całego składu + IncSpeed(); // dla (Ready)==false nie ruszy + } + } + if ((mvOccupied->Vel == 0.0) && !(iDrivigFlags & movePress)) + { // 2. faza odczepiania: zmień kierunek na przeciwny i dociśnij + // za radą yB ustawiamy pozycję 3 kranu (ruszanie kranem w innych miejscach + // powino zostać wyłączone) + // WriteLog("Zahamowanie składu"); + mvOccupied->BrakeLevelSet( + mvOccupied->BrakeSystem == ElectroPneumatic ? + 1 : + 3 ); + double p = mvOccupied->BrakePressureActual.PipePressureVal; + if( p < 3.9 ) { + // tu może być 0 albo -1 nawet + // TODO: zabezpieczenie przed dziwnymi CHK do czasu wyjaśnienia sensu 0 oraz -1 w tym miejscu + p = 3.9; + } + if (mvOccupied->BrakeSystem == ElectroPneumatic ? + mvOccupied->BrakePress > 2 : + mvOccupied->PipePress < p + 0.1) + { // jeśli w miarę został zahamowany (ciśnienie mniejsze niż podane na + // pozycji 3, zwyle 0.37) + if (mvOccupied->BrakeSystem == ElectroPneumatic) + mvOccupied->BrakeLevelSet(0); // wyłączenie EP, gdy wystarczy (może + // nie być potrzebne, bo na początku + // jest) + WriteLog("Luzowanie lokomotywy i zmiana kierunku"); + mvOccupied->BrakeReleaser(1); // wyluzuj lokomotywę; a ST45? + mvOccupied->DecLocalBrakeLevel(10); // zwolnienie hamulca + iDrivigFlags |= movePress; // następnie będzie dociskanie + DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na przeciwny (dociskanie) + CheckVehicles(); // od razu zmienić światła (zgasić) - bez tego się nie odczepi + fStopTime = 0.0; // nie ma na co czekać z odczepianiem } } - } - break; - } - case Shunt: { - // na jaką odleglość i z jaką predkością ma podjechać - fMinProximityDist = 5.0; - fMaxProximityDist = 10.0; //[m] - if( pVehicles[ 0 ] != pVehicles[ 1 ] ) { - // for larger consists increase margins to account for slower braking etc - // NOTE: this will affect also multi-unit vehicles TBD: is this what we want? - fMinProximityDist *= 2.0; - fMaxProximityDist *= 2.0; - } - fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania - // margines prędkości powodujący załączenie napędu - // były problemy z jazdą np. 3km/h podczas ładowania wagonów - fVelMinus = std::min( 0.1 * fShuntVelocity, 3.0 ); - break; - } - case Obey_train: { - // na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody - if( mvOccupied->CategoryFlag & 1 ) { - // jeśli pociąg - fMinProximityDist = 15.0; - fMaxProximityDist = - ( mvOccupied->Vel > 0.0 ) ? - 25.0 : - 50.0; //[m] jak stanie za daleko, to niech nie dociąga paru metrów - if( iDrivigFlags & moveLate ) { - // jeśli spóźniony, to gna - fVelMinus = 1.0; - // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania - fVelPlus = 5.0; - } - else { - // gdy nie musi się sprężać - // margines prędkości powodujący załączenie napędu; min 1.0 żeby nie ruszał przy 0.1 - fVelMinus = clamp( std::round( 0.05 * VelDesired ), 1.0, 5.0 ); - // normalnie dopuszczalne przekroczenie to 5% prędkości ale nie więcej niż 5km/h - // bottom margin raised to 2 km/h to give the AI more leeway at low speed limits - fVelPlus = clamp( std::ceil( 0.05 * VelDesired ), 2.0, 5.0 ); + } // odczepiania + else // to poniżej jeśli ilość wagonów ujemna + if (iDrivigFlags & movePress) + { // 4. faza odczepiania: zwolnij i zmień kierunek + SetVelocity(0, 0, stopJoin); // wyłączyć przyspieszanie + if (!DecSpeed()) // jeśli już bardziej wyłączyć się nie da + { // ponowna zmiana kierunku + WriteLog( mvOccupied->Name + " ponowna zmiana kierunku" ); + DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na właściwy + iDrivigFlags &= ~movePress; // koniec dociskania + JumpToNextOrder(); // zmieni światła + TableClear(); // skanowanie od nowa + iDrivigFlags &= ~moveStartHorn; // bez trąbienia przed ruszeniem + SetVelocity(fShuntVelocity, fShuntVelocity); // ustawienie prędkości jazdy } } + } + break; + } + case Shunt: { + // na jaką odleglość i z jaką predkością ma podjechać + fMinProximityDist = 5.0; + fMaxProximityDist = 10.0; //[m] + if( pVehicles[ 0 ] != pVehicles[ 1 ] ) { + // for larger consists increase margins to account for slower braking etc + // NOTE: this will affect also multi-unit vehicles TBD: is this what we want? + fMinProximityDist *= 2.0; + fMaxProximityDist *= 2.0; + } + fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + // margines prędkości powodujący załączenie napędu + // były problemy z jazdą np. 3km/h podczas ładowania wagonów + fVelMinus = std::min( 0.1 * fShuntVelocity, 3.0 ); + break; + } + case Obey_train: { + // na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody + if( mvOccupied->CategoryFlag & 1 ) { + // jeśli pociąg + fMinProximityDist = 15.0; + fMaxProximityDist = + ( mvOccupied->Vel > 0.0 ) ? + 25.0 : + 50.0; //[m] jak stanie za daleko, to niech nie dociąga paru metrów + if( iDrivigFlags & moveLate ) { + // jeśli spóźniony, to gna + fVelMinus = 1.0; + // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + fVelPlus = 5.0; + } else { - // samochod (sokista też) - fMinProximityDist = std::max( 4.0, mvOccupied->Vel * 0.2 ); - fMaxProximityDist = std::max( 8.0, mvOccupied->Vel * 0.375 ); //[m] - // margines prędkości powodujący załączenie napędu - fVelMinus = 2.0; - // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania - fVelPlus = std::min( 10.0, mvOccupied->Vel * 0.1 ); + // gdy nie musi się sprężać + // margines prędkości powodujący załączenie napędu; min 1.0 żeby nie ruszał przy 0.1 + fVelMinus = clamp( std::round( 0.05 * VelDesired ), 1.0, 5.0 ); + // normalnie dopuszczalne przekroczenie to 5% prędkości ale nie więcej niż 5km/h + // bottom margin raised to 2 km/h to give the AI more leeway at low speed limits + fVelPlus = clamp( std::ceil( 0.05 * VelDesired ), 2.0, 5.0 ); } - break; } - default: { - fMinProximityDist = 0.01; - fMaxProximityDist = 2.0; //[m] - fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania - fVelMinus = 5.0; // margines prędkości powodujący załączenie napędu + else { + // samochod (sokista też) + fMinProximityDist = std::max( 4.0, mvOccupied->Vel * 0.2 ); + fMaxProximityDist = std::max( 8.0, mvOccupied->Vel * 0.375 ); //[m] + // margines prędkości powodujący załączenie napędu + fVelMinus = 2.0; + // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + fVelPlus = std::min( 10.0, mvOccupied->Vel * 0.1 ); } - } // switch OrderList[OrderPos] + break; + } + default: { + fMinProximityDist = 0.01; + fMaxProximityDist = 2.0; //[m] + fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + fVelMinus = 5.0; // margines prędkości powodujący załączenie napędu + } + } // switch OrderList[OrderPos] - switch (OrderList[OrderPos]) - { // co robi maszynista - case Prepare_engine: // odpala silnik - // if (AIControllFlag) - if (PrepareEngine()) // dla użytkownika tylko sprawdza, czy uruchomił - { // gotowy do drogi? - SetDriverPsyche(); - // OrderList[OrderPos]:=Shunt; //Ra: to nie może tak być, bo scenerie robią - // Jump_to_first_order i przechodzi w manewrowy - JumpToNextOrder(); // w następnym jest Shunt albo Obey_train, moze też być - // Change_direction, Connect albo Disconnect - // if OrderList[OrderPos]<>Wait_for_Orders) - // if BrakeSystem=Pneumatic) //napelnianie uderzeniowe na wstepie - // if BrakeSubsystem=Oerlikon) - // if (BrakeCtrlPos=0)) - // DecBrakeLevel; - } - break; - case Release_engine: - if( ReleaseEngine() ) // zdana maszyna? - JumpToNextOrder(); - break; - case Jump_to_first_order: - if (OrderPos > 1) - OrderPos = 1; // w zerowym zawsze jest czekanie - else - ++OrderPos; + switch (OrderList[OrderPos]) + { // co robi maszynista + case Prepare_engine: // odpala silnik + // if (AIControllFlag) + if (PrepareEngine()) // dla użytkownika tylko sprawdza, czy uruchomił + { // gotowy do drogi? + SetDriverPsyche(); + // OrderList[OrderPos]:=Shunt; //Ra: to nie może tak być, bo scenerie robią + // Jump_to_first_order i przechodzi w manewrowy + JumpToNextOrder(); // w następnym jest Shunt albo Obey_train, moze też być + // Change_direction, Connect albo Disconnect + // if OrderList[OrderPos]<>Wait_for_Orders) + // if BrakeSystem=Pneumatic) //napelnianie uderzeniowe na wstepie + // if BrakeSubsystem=Oerlikon) + // if (BrakeCtrlPos=0)) + // DecBrakeLevel; + } + break; + case Release_engine: + if( ReleaseEngine() ) // zdana maszyna? + JumpToNextOrder(); + break; + case Jump_to_first_order: + if (OrderPos > 1) + OrderPos = 1; // w zerowym zawsze jest czekanie + else + ++OrderPos; #if LOGORDERS - WriteLog("--> Jump_to_first_order"); - OrdersDump(); + WriteLog("--> Jump_to_first_order"); + OrdersDump(); #endif - break; - case Wait_for_orders: // jeśli czeka, też ma skanować, żeby odpalić się od semafora - case Shunt: - case Obey_train: - case Connect: - case Disconnect: - case Change_direction: // tryby wymagające jazdy - case Change_direction | Shunt: // zmiana kierunku podczas manewrów - case Change_direction | Connect: // zmiana kierunku podczas podłączania - if (OrderList[OrderPos] != Obey_train) // spokojne manewry - { - VelSignal = Global::Min0RSpeed(VelSignal, 40); // jeśli manewry, to ograniczamy prędkość - - // NOTE: this section should be moved to disconnect or plain removed, but it seems to be (mis)used by some scenarios - // to keep vehicle idling without moving :| - if( ( true == AIControllFlag ) - && ( iVehicleCount >= 0 ) - && ( false == TestFlag( iDrivigFlags, movePress ) ) - && ( iCoupler == 0 ) -// && ( mvOccupied->Vel > 0.0 ) - && ( pVehicle->PrevConnected == nullptr ) - && ( pVehicle->NextConnected == nullptr ) ) { - SetVelocity(0, 0, stopJoin); // 1. faza odczepiania: zatrzymanie - // WriteLog("Zatrzymanie w celu odczepienia"); - AccPreferred = std::min( 0.0, AccPreferred ); - } + break; + case Wait_for_orders: // jeśli czeka, też ma skanować, żeby odpalić się od semafora + case Shunt: + case Obey_train: + case Connect: + case Disconnect: + case Change_direction: // tryby wymagające jazdy + case Change_direction | Shunt: // zmiana kierunku podczas manewrów + case Change_direction | Connect: // zmiana kierunku podczas podłączania + if (OrderList[OrderPos] != Obey_train) // spokojne manewry + { + VelSignal = Global::Min0RSpeed(VelSignal, 40); // jeśli manewry, to ograniczamy prędkość + // NOTE: this section should be moved to disconnect or plain removed, but it seems to be (mis)used by some scenarios + // to keep vehicle idling without moving :| + if( ( true == AIControllFlag ) + && ( iVehicleCount >= 0 ) + && ( false == TestFlag( iDrivigFlags, movePress ) ) + && ( iCoupler == 0 ) +// && ( mvOccupied->Vel > 0.0 ) + && ( pVehicle->PrevConnected == nullptr ) + && ( pVehicle->NextConnected == nullptr ) ) { + SetVelocity(0, 0, stopJoin); // 1. faza odczepiania: zatrzymanie + // WriteLog("Zatrzymanie w celu odczepienia"); + AccPreferred = std::min( 0.0, AccPreferred ); } - else - SetDriverPsyche(); // Ra: było w PrepareEngine(), potrzebne tu? - // no albo przypisujemy -WaitingExpireTime, albo porównujemy z WaitingExpireTime - // if - // ((VelSignal==0.0)&&(WaitingTime>WaitingExpireTime)&&(mvOccupied->RunningTrack.Velmax!=0.0)) - if (OrderList[OrderPos] & - (Shunt | Obey_train | Connect)) // odjechać sam może tylko jeśli jest w trybie jazdy - { // automatyczne ruszanie po odstaniu albo spod SBL - if ((VelSignal == 0.0) && (WaitingTime > 0.0) && - (mvOccupied->RunningTrack.Velmax != 0.0)) - { // jeśli stoi, a upłynął czas oczekiwania i tor ma niezerową prędkość - /* - if (WriteLogFlag) - { - append(AIlogFile); - writeln(AILogFile,ElapsedTime:5:2,": ",Name," V=0 waiting time expired! - (",WaitingTime:4:1,")"); - close(AILogFile); - } - */ - if ((OrderList[OrderPos] & (Obey_train | Shunt)) ? - (iDrivigFlags & moveStopHere) : - false) - WaitingTime = -WaitingExpireTime; // zakaz ruszania z miejsca bez otrzymania - // wolnej drogi - else if (mvOccupied->CategoryFlag & 1) - { // jeśli pociąg - if (AIControllFlag) + + } + else + SetDriverPsyche(); // Ra: było w PrepareEngine(), potrzebne tu? + // no albo przypisujemy -WaitingExpireTime, albo porównujemy z WaitingExpireTime + // if + // ((VelSignal==0.0)&&(WaitingTime>WaitingExpireTime)&&(mvOccupied->RunningTrack.Velmax!=0.0)) + if (OrderList[OrderPos] & + (Shunt | Obey_train | Connect)) // odjechać sam może tylko jeśli jest w trybie jazdy + { // automatyczne ruszanie po odstaniu albo spod SBL + if ((VelSignal == 0.0) && (WaitingTime > 0.0) && + (mvOccupied->RunningTrack.Velmax != 0.0)) + { // jeśli stoi, a upłynął czas oczekiwania i tor ma niezerową prędkość + /* + if (WriteLogFlag) { - PrepareEngine(); // zmieni ustawiony kierunek - SetVelocity(20, 20); // jak się nastał, to niech jedzie 20km/h - WaitingTime = 0.0; - fWarningDuration = 1.5; // a zatrąbić trochę - mvOccupied->WarningSignal = 1; + append(AIlogFile); + writeln(AILogFile,ElapsedTime:5:2,": ",Name," V=0 waiting time expired! + (",WaitingTime:4:1,")"); + close(AILogFile); } - else - SetVelocity(20, 20); // użytkownikowi zezwalamy jechać + */ + if ((OrderList[OrderPos] & (Obey_train | Shunt)) ? + (iDrivigFlags & moveStopHere) : + false) + WaitingTime = -WaitingExpireTime; // zakaz ruszania z miejsca bez otrzymania + // wolnej drogi + else if (mvOccupied->CategoryFlag & 1) + { // jeśli pociąg + if (AIControllFlag) + { + PrepareEngine(); // zmieni ustawiony kierunek + SetVelocity(20, 20); // jak się nastał, to niech jedzie 20km/h + WaitingTime = 0.0; + fWarningDuration = 1.5; // a zatrąbić trochę + mvOccupied->WarningSignal = 1; } else - { // samochód ma stać, aż dostanie odjazd, chyba że stoi przez kolizję - if (eStopReason == stopBlock) - if (pVehicles[0]->fTrackBlock > fDriverDist) - if (AIControllFlag) - { - PrepareEngine(); // zmieni ustawiony kierunek - SetVelocity(-1, -1); // jak się nastał, to niech jedzie - WaitingTime = 0.0; - } - else { - // użytkownikowi pozwalamy jechać (samochodem?) - SetVelocity( -1, -1 ); - } - } + SetVelocity(20, 20); // użytkownikowi zezwalamy jechać + } + else + { // samochód ma stać, aż dostanie odjazd, chyba że stoi przez kolizję + if (eStopReason == stopBlock) + if (pVehicles[0]->fTrackBlock > fDriverDist) + if (AIControllFlag) + { + PrepareEngine(); // zmieni ustawiony kierunek + SetVelocity(-1, -1); // jak się nastał, to niech jedzie + WaitingTime = 0.0; + } + else { + // użytkownikowi pozwalamy jechać (samochodem?) + SetVelocity( -1, -1 ); + } } - else if ((VelSignal == 0.0) && (VelNext > 0.0) && (mvOccupied->Vel < 1.0)) - if (iCoupler ? true : (iDrivigFlags & moveStopHere) == 0) // Ra: tu jest coś nie - // tak, bo bez tego - // warunku ruszało w - // manewrowym !!!! - SetVelocity(VelNext, VelNext, stopSem); // omijanie SBL - } // koniec samoistnego odjeżdżania - - if( ( true == AIControllFlag ) - && ( ( true == HelpMeFlag ) - || ( mvControlling->DamageFlag > 0 ) ) ) { - HelpMeFlag = false; } - - if( ( true == AIControllFlag) - && ( true == TestFlag( OrderList[ OrderPos ], Change_direction ) ) ) { - // sprobuj zmienic kierunek (może być zmieszane z jeszcze jakąś komendą) - SetVelocity( 0, 0, stopDir ); // najpierw trzeba się zatrzymać - if( mvOccupied->Vel < 0.1 ) { - // jeśli się zatrzymał, to zmieniamy kierunek jazdy, a nawet kabinę/człon - Activation(); // ustawienie zadanego wcześniej kierunku i ewentualne przemieszczenie AI - PrepareEngine(); - JumpToNextOrder(); // następnie robimy, co jest do zrobienia (Shunt albo Obey_train) - if( OrderList[ OrderPos ] & ( Shunt | Connect ) ) { - // jeśli dalej mamy manewry - if( false == TestFlag( iDrivigFlags, moveStopHere ) ) { - // o ile nie ma stać w miejscu, - // jechać od razu w przeciwną stronę i nie trąbić z tego tytułu: - iDrivigFlags &= ~moveStartHorn; - SetVelocity( fShuntVelocity, fShuntVelocity ); - } - } + else if( ( VelSignal == 0.0 ) && ( VelNext > 0.0 ) && ( mvOccupied->Vel < 1.0 ) ) { + if( iCoupler ? true : ( iDrivigFlags & moveStopHere ) == 0 ) { + // Ra: tu jest coś nie tak, bo bez tego warunku ruszało w manewrowym !!!! + SetVelocity( VelNext, VelNext, stopSem ); // omijanie SBL } - } // Change_direction (tylko dla AI) + } + } // koniec samoistnego odjeżdżania - if( ( true == AIControllFlag ) - && ( iEngineActive == 0 ) - && ( OrderList[ OrderPos ] & ( Change_direction | Connect | Disconnect | Shunt | Obey_train ) ) ) { - // jeśli coś ma robić to niech odpala do skutku + if( ( true == AIControllFlag) + && ( true == TestFlag( OrderList[ OrderPos ], Change_direction ) ) ) { + // sprobuj zmienic kierunek (może być zmieszane z jeszcze jakąś komendą) + SetVelocity( 0, 0, stopDir ); // najpierw trzeba się zatrzymać + if( mvOccupied->Vel < 0.1 ) { + // jeśli się zatrzymał, to zmieniamy kierunek jazdy, a nawet kabinę/człon + Activation(); // ustawienie zadanego wcześniej kierunku i ewentualne przemieszczenie AI PrepareEngine(); + JumpToNextOrder(); // następnie robimy, co jest do zrobienia (Shunt albo Obey_train) + if( OrderList[ OrderPos ] & ( Shunt | Connect ) ) { + // jeśli dalej mamy manewry + if( false == TestFlag( iDrivigFlags, moveStopHere ) ) { + // o ile nie ma stać w miejscu, + // jechać od razu w przeciwną stronę i nie trąbić z tego tytułu: + iDrivigFlags &= ~moveStartHorn; + SetVelocity( fShuntVelocity, fShuntVelocity ); + } + } + } + } // Change_direction (tylko dla AI) + + if( ( true == AIControllFlag ) + && ( iEngineActive == 0 ) + && ( OrderList[ OrderPos ] & ( Change_direction | Connect | Disconnect | Shunt | Obey_train ) ) ) { + // jeśli coś ma robić to niech odpala do skutku + PrepareEngine(); + } + + // ustalanie zadanej predkosci + if (iDrivigFlags & moveActive) // jeśli może skanować sygnały i reagować na komendy + { // jeśli jest wybrany kierunek jazdy, można ustalić prędkość jazdy + // Ra: tu by jeszcze trzeba było wstawić uzależnienie (VelDesired) od odległości od + // przeszkody + // no chyba żeby to uwzgldnić już w (ActualProximityDist) + VelDesired = fVelMax; // wstępnie prędkość maksymalna dla pojazdu(-ów), będzie + // następnie ograniczana + if( ( TrainParams ) + && ( TrainParams->TTVmax > 0.0 ) ) { + // jeśli ma rozkład i ograniczenie w rozkładzie to nie przekraczać rozkladowej + VelDesired = Global::Min0RSpeed( VelDesired, TrainParams->TTVmax ); } - // ustalanie zadanej predkosci - if (iDrivigFlags & moveActive) // jeśli może skanować sygnały i reagować na komendy - { // jeśli jest wybrany kierunek jazdy, można ustalić prędkość jazdy - // Ra: tu by jeszcze trzeba było wstawić uzależnienie (VelDesired) od odległości od - // przeszkody - // no chyba żeby to uwzgldnić już w (ActualProximityDist) - VelDesired = fVelMax; // wstępnie prędkość maksymalna dla pojazdu(-ów), będzie - // następnie ograniczana - if( ( TrainParams ) - && ( TrainParams->TTVmax > 0.0 ) ) { - // jeśli ma rozkład i ograniczenie w rozkładzie to nie przekraczać rozkladowej - VelDesired = Global::Min0RSpeed( VelDesired, TrainParams->TTVmax ); - } - SetDriverPsyche(); // ustawia AccPreferred (potrzebne tu?) - // Ra: odczyt (ActualProximityDist), (VelNext) i (AccPreferred) z tabelki prędkosci - AccDesired = AccPreferred; // AccPreferred wynika z osobowości mechanika - VelNext = VelDesired; // maksymalna prędkość wynikająca z innych czynników niż trajektoria ruchu - ActualProximityDist = scanmax; // funkcja Update() może pozostawić wartości bez zmian - // szukanie optymalnych wartości - TCommandType comm = TableUpdate(VelDesired, ActualProximityDist, VelNext, AccDesired); - switch (comm) - { // ustawienie VelSignal - trochę proteza = do przemyślenia - case cm_Ready: // W4 zezwolił na jazdę - // ewentualne doskanowanie trasy za W4, który zezwolił na jazdę - TableCheck( scanmax); - TableUpdate(VelDesired, ActualProximityDist, VelNext, AccDesired); // aktualizacja po skanowaniu - if (VelNext == 0.0) - break; // ale jak coś z przodu zamyka, to ma stać - if (iDrivigFlags & moveStopCloser) - VelSignal = -1.0; // ma czekać na sygnał z sygnalizatora! - case cm_SetVelocity: // od wersji 357 semafor nie budzi wyłączonej lokomotywy - if (!(OrderList[OrderPos] & - ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders - if (fabs(VelSignal) >= - 1.0) // 0.1 nie wysyła się do samochodow, bo potem nie ruszą - PutCommand("SetVelocity", VelSignal, VelNext, - NULL); // komenda robi dodatkowe operacje - break; - case cm_ShuntVelocity: // od wersji 357 Tm nie budzi wyłączonej lokomotywy - if (!(OrderList[OrderPos] & - ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders - PutCommand("ShuntVelocity", VelSignal, VelNext, NULL); - else if (iCoupler) // jeśli jedzie w celu połączenia - SetVelocity(VelSignal, VelNext); - break; - case cm_Command: // komenda z komórki - if (!(OrderList[OrderPos] & - ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders - if (mvOccupied->Vel < 0.1) // dopiero jak stanie - // iDrivigFlags|=moveStopHere moveStopCloser) //chyba że stanął za daleko - // (SU46 w WK staje za daleko) - { - PutCommand(eSignNext->CommandGet(), eSignNext->ValueGet(1), - eSignNext->ValueGet(2), NULL); - eSignNext->StopCommandSent(); // się wykonało już - } - break; - } - if (VelNext == 0.0) - if (!(OrderList[OrderPos] & - ~(Shunt | Connect))) // jedzie w Shunt albo Connect, albo Wait_for_orders - { // jeżeli wolnej drogi nie ma, a jest w trybie manewrowym albo oczekiwania - // if - // ((OrderList[OrderPos]&Connect)?pVehicles[0]->fTrackBlock>ActualProximityDist:true) - // //pomiar odległości nie działa dobrze? - // w trybie Connect skanować do tyłu tylko jeśli przed kolejnym sygnałem nie - // ma taboru do podłączenia - // Ra 2F1H: z tym (fTrackBlock) to nie jest najlepszy pomysł, bo lepiej by - // było porównać z odległością od sygnalizatora z przodu - if ((OrderList[OrderPos] & Connect) ? (pVehicles[0]->fTrackBlock > 2000 || pVehicles[0]->fTrackBlock > FirstSemaphorDist) : - true) - if ((comm = BackwardScan()) != cm_Unknown) // jeśli w drugą można jechać - { // należy sprawdzać odległość od znalezionego sygnalizatora, - // aby w przypadku prędkości 0.1 wyciągnąć najpierw skład za - // sygnalizator - // i dopiero wtedy zmienić kierunek jazdy, oczekując podania - // prędkości >0.5 - if (comm == cm_Command) // jeśli komenda Shunt - iDrivigFlags |= moveStopHere; // to ją odbierz bez przemieszczania się (np. - // odczep wagony po dopchnięciu do końca toru) - iDirectionOrder = -iDirection; // zmiana kierunku jazdy - // zmiana kierunku bez psucia kolejnych komend - OrderList[OrderPos] = TOrders(OrderList[OrderPos] | Change_direction); - } - } - double vel = mvOccupied->Vel; // prędkość w kierunku jazdy - if (iDirection * mvOccupied->V < 0) - vel = -vel; // ujemna, gdy jedzie w przeciwną stronę, niż powinien - if (VelDesired < 0.0) - VelDesired = fVelMax; // bo VelDesired<0 oznacza prędkość maksymalną + SetDriverPsyche(); // ustawia AccPreferred (potrzebne tu?) - // Ra: jazda na widoczność + // szukanie optymalnych wartości + AccDesired = AccPreferred; // AccPreferred wynika z osobowości mechanika + VelNext = VelDesired; // maksymalna prędkość wynikająca z innych czynników niż trajektoria ruchu + ActualProximityDist = routescanrange; // funkcja Update() może pozostawić wartości bez zmian + // Ra: odczyt (ActualProximityDist), (VelNext) i (AccPreferred) z tabelki prędkosci + TCommandType comm = TableUpdate(VelDesired, ActualProximityDist, VelNext, AccDesired); + + switch (comm) + { // ustawienie VelSignal - trochę proteza = do przemyślenia + case cm_Ready: // W4 zezwolił na jazdę + // ewentualne doskanowanie trasy za W4, który zezwolił na jazdę + TableCheck( routescanrange); + TableUpdate(VelDesired, ActualProximityDist, VelNext, AccDesired); // aktualizacja po skanowaniu + if (VelNext == 0.0) + break; // ale jak coś z przodu zamyka, to ma stać + if (iDrivigFlags & moveStopCloser) + VelSignal = -1.0; // ma czekać na sygnał z sygnalizatora! + case cm_SetVelocity: // od wersji 357 semafor nie budzi wyłączonej lokomotywy + if (!(OrderList[OrderPos] & + ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders + if (fabs(VelSignal) >= + 1.0) // 0.1 nie wysyła się do samochodow, bo potem nie ruszą + PutCommand("SetVelocity", VelSignal, VelNext, + NULL); // komenda robi dodatkowe operacje + break; + case cm_ShuntVelocity: // od wersji 357 Tm nie budzi wyłączonej lokomotywy + if (!(OrderList[OrderPos] & + ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders + PutCommand("ShuntVelocity", VelSignal, VelNext, NULL); + else if (iCoupler) // jeśli jedzie w celu połączenia + SetVelocity(VelSignal, VelNext); + break; + case cm_Command: // komenda z komórki + if( !( OrderList[ OrderPos ] & ~( Obey_train | Shunt ) ) ) { + // jedzie w dowolnym trybie albo Wait_for_orders + if( mvOccupied->Vel < 0.1 ) { + // dopiero jak stanie + PutCommand( eSignNext->CommandGet(), eSignNext->ValueGet( 1 ), eSignNext->ValueGet( 2 ), nullptr ); + eSignNext->StopCommandSent(); // się wykonało już + } + } + break; + } + + if( VelNext == 0.0 ) { + if( !( OrderList[ OrderPos ] & ~( Shunt | Connect ) ) ) { + // jedzie w Shunt albo Connect, albo Wait_for_orders + // w trybie Connect skanować do tyłu tylko jeśli przed kolejnym sygnałem nie ma taboru do podłączenia + // Ra 2F1H: z tym (fTrackBlock) to nie jest najlepszy pomysł, bo lepiej by + // było porównać z odległością od sygnalizatora z przodu + if( ( OrderList[ OrderPos ] & Connect ) ? + ( pVehicles[ 0 ]->fTrackBlock > 2000 || pVehicles[ 0 ]->fTrackBlock > FirstSemaphorDist ) : + true ) { + if( ( comm = BackwardScan() ) != cm_Unknown ) { + // jeśli w drugą można jechać + // należy sprawdzać odległość od znalezionego sygnalizatora, + // aby w przypadku prędkości 0.1 wyciągnąć najpierw skład za sygnalizator + // i dopiero wtedy zmienić kierunek jazdy, oczekując podania prędkości >0.5 + if( comm == cm_Command ) { + // jeśli komenda Shunt to ją odbierz bez przemieszczania się (np. odczep wagony po dopchnięciu do końca toru) + iDrivigFlags |= moveStopHere; + } + iDirectionOrder = -iDirection; // zmiana kierunku jazdy + // zmiana kierunku bez psucia kolejnych komend + OrderList[ OrderPos ] = TOrders( OrderList[ OrderPos ] | Change_direction ); + } + } + } + } + + double vel = mvOccupied->Vel; // prędkość w kierunku jazdy + if (iDirection * mvOccupied->V < 0) + vel = -vel; // ujemna, gdy jedzie w przeciwną stronę, niż powinien + if (VelDesired < 0.0) + VelDesired = fVelMax; // bo VelDesired<0 oznacza prędkość maksymalną + + // Ra: jazda na widoczność /* - // condition disabled, it'd prevent setting reduced acceleration in the last connect stage - if ((iDrivigFlags & moveConnect) == 0) // przy końcówce podłączania nie hamować + // condition disabled, it'd prevent setting reduced acceleration in the last connect stage + if ((iDrivigFlags & moveConnect) == 0) // przy końcówce podłączania nie hamować */ - { // sprawdzenie jazdy na widoczność - auto const vehicle = pVehicles[ 0 ]; // base calculactions off relevant end of the consist - auto const coupler = - vehicle->MoverParameters->Couplers + ( - vehicle->DirectionGet() > 0 ? - 0 : - 1 ); // sprzęg z przodu składu - if( ( coupler->Connected ) - && ( coupler->CouplingFlag == 0 ) ) { - // mamy coś z przodu podłączone sprzęgiem wirtualnym - // wyliczanie optymalnego przyspieszenia do jazdy na widoczność - ActualProximityDist = std::min( - ActualProximityDist, - vehicle->fTrackBlock - ( - mvOccupied->CategoryFlag & 2 ? - fMinProximityDist : // cars can bunch up tighter - fMaxProximityDist ) ); // other vehicle types less so - double k = coupler->Connected->Vel; // prędkość pojazdu z przodu (zakładając, - // że jedzie w tę samą stronę!!!) - if( k < vel + 10 ) { - // porównanie modułów prędkości [km/h] - // zatroszczyć się trzeba, jeśli tamten nie jedzie znacząco szybciej - double const distance = vehicle->fTrackBlock - fMaxProximityDist - ( fBrakeDist * 1.15 ); // odległość bezpieczna zależy od prędkości - if( distance < 0 ) { - // jeśli odległość jest zbyt mała - if( k < 10.0 ) // k - prędkość tego z przodu - { // jeśli tamten porusza się z niewielką prędkością albo stoi - if( OrderCurrentGet() & Connect ) { - // jeśli spinanie, to jechać dalej - AccPreferred = std::min( 0.25, AccPreferred ); // nie hamuj - VelDesired = Global::Min0RSpeed( 20.0, VelDesired ); - VelNext = 2.0; // i pakuj się na tamtego - } - else { - // a normalnie to hamować - VelNext = 0.0; - if( vehicle->fTrackBlock <= fMinProximityDist ) { - VelDesired = 0.0; - } - } + { // sprawdzenie jazdy na widoczność + auto const vehicle = pVehicles[ 0 ]; // base calculactions off relevant end of the consist + auto const coupler = + vehicle->MoverParameters->Couplers + ( + vehicle->DirectionGet() > 0 ? + 0 : + 1 ); // sprzęg z przodu składu + if( ( coupler->Connected ) + && ( coupler->CouplingFlag == 0 ) ) { + // mamy coś z przodu podłączone sprzęgiem wirtualnym + // wyliczanie optymalnego przyspieszenia do jazdy na widoczność + ActualProximityDist = std::min( + ActualProximityDist, + vehicle->fTrackBlock - ( + mvOccupied->CategoryFlag & 2 ? + fMinProximityDist : // cars can bunch up tighter + fMaxProximityDist ) ); // other vehicle types less so + double k = coupler->Connected->Vel; // prędkość pojazdu z przodu (zakładając, + // że jedzie w tę samą stronę!!!) + if( k < vel + 10 ) { + // porównanie modułów prędkości [km/h] + // zatroszczyć się trzeba, jeśli tamten nie jedzie znacząco szybciej + double const distance = vehicle->fTrackBlock - fMaxProximityDist - ( fBrakeDist * 1.15 ); // odległość bezpieczna zależy od prędkości + if( distance < 0 ) { + // jeśli odległość jest zbyt mała + if( k < 10.0 ) // k - prędkość tego z przodu + { // jeśli tamten porusza się z niewielką prędkością albo stoi + if( OrderCurrentGet() & Connect ) { + // jeśli spinanie, to jechać dalej + AccPreferred = std::min( 0.25, AccPreferred ); // nie hamuj + VelDesired = Global::Min0RSpeed( 20.0, VelDesired ); + VelNext = 2.0; // i pakuj się na tamtego } else { - // jeśli oba jadą, to przyhamuj lekko i ogranicz prędkość - if( vehicle->fTrackBlock < ( - mvOccupied->CategoryFlag & 2 ? - fMaxProximityDist + 0.5 * vel : // cars - 2.0 * fMaxProximityDist + 2.0 * vel ) ) { //others - // jak tamten jedzie wolniej a jest w drodze hamowania - AccPreferred = std::min( -0.9, AccPreferred ); - VelNext = Global::Min0RSpeed( std::round( k ) - 5.0, VelDesired ); - if( vehicle->fTrackBlock <= ( - mvOccupied->CategoryFlag & 2 ? - fMaxProximityDist : // cars - 2.0 * fMaxProximityDist ) ) { //others - // try to force speed change if obstacle is really close - VelDesired = VelNext; - } + // a normalnie to hamować + VelNext = 0.0; + if( vehicle->fTrackBlock <= fMinProximityDist ) { + VelDesired = 0.0; } } - ReactionTime = ( - vel != 0.0 ? - 0.1 : // orientuj się, bo jest goraco - 2.0 ); // we're already standing still, so take it easy } else { - if( OrderCurrentGet() & Connect ) { - // if there's something nearby in the connect mode don't speed up too much - VelDesired = Global::Min0RSpeed( 20.0, VelDesired ); + // jeśli oba jadą, to przyhamuj lekko i ogranicz prędkość + if( vehicle->fTrackBlock < ( + mvOccupied->CategoryFlag & 2 ? + fMaxProximityDist + 0.5 * vel : // cars + 2.0 * fMaxProximityDist + 2.0 * vel ) ) { //others + // jak tamten jedzie wolniej a jest w drodze hamowania + AccPreferred = std::min( -0.9, AccPreferred ); + VelNext = Global::Min0RSpeed( std::round( k ) - 5.0, VelDesired ); + if( vehicle->fTrackBlock <= ( + mvOccupied->CategoryFlag & 2 ? + fMaxProximityDist : // cars + 2.0 * fMaxProximityDist ) ) { //others + // try to force speed change if obstacle is really close + VelDesired = VelNext; + } } } + ReactionTime = ( + vel != 0.0 ? + 0.1 : // orientuj się, bo jest goraco + 2.0 ); // we're already standing still, so take it easy + } + else { + if( OrderCurrentGet() & Connect ) { + // if there's something nearby in the connect mode don't speed up too much + VelDesired = Global::Min0RSpeed( 20.0, VelDesired ); + } } } } + } - // sprawdzamy możliwe ograniczenia prędkości - if (OrderCurrentGet() & (Shunt | Obey_train)) // w Connect nie, bo moveStopHere - // odnosi się do stanu po połączeniu - if (iDrivigFlags & moveStopHere) // jeśli ma czekać na wolną drogę - if (vel == 0.0) // a stoi - if (VelNext == 0.0) // a wyjazdu nie ma - VelDesired = 0.0; // to ma stać - if (fStopTime < 0) // czas postoju przed dalszą jazdą (np. na przystanku) - VelDesired = 0.0; // jak ma czekać, to nie ma jazdy - // else if (VelSignal<0) - // VelDesired=fVelMax; //ile fabryka dala (Ra: uwzględione wagony) - else if (VelSignal >= 0) // jeśli skład był zatrzymany na początku i teraz już może jechać - VelDesired = Global::Min0RSpeed(VelDesired, VelSignal); + // sprawdzamy możliwe ograniczenia prędkości + if (OrderCurrentGet() & (Shunt | Obey_train)) // w Connect nie, bo moveStopHere + // odnosi się do stanu po połączeniu + if (iDrivigFlags & moveStopHere) // jeśli ma czekać na wolną drogę + if (vel == 0.0) // a stoi + if (VelNext == 0.0) // a wyjazdu nie ma + VelDesired = 0.0; // to ma stać + if (fStopTime < 0) // czas postoju przed dalszą jazdą (np. na przystanku) + VelDesired = 0.0; // jak ma czekać, to nie ma jazdy + // else if (VelSignal<0) + // VelDesired=fVelMax; //ile fabryka dala (Ra: uwzględione wagony) + else if (VelSignal >= 0) // jeśli skład był zatrzymany na początku i teraz już może jechać + VelDesired = Global::Min0RSpeed(VelDesired, VelSignal); - if (mvOccupied->RunningTrack.Velmax >= - 0) // ograniczenie prędkości z trajektorii ruchu - VelDesired = - Global::Min0RSpeed(VelDesired, - mvOccupied->RunningTrack.Velmax); // uwaga na ograniczenia szlakowej! - if (VelforDriver >= 0) // tu jest zero przy zmianie kierunku jazdy - VelDesired = Global::Min0RSpeed(VelDesired, VelforDriver); // Ra: tu może być 40, jeśli - // mechanik nie ma znajomości - // szlaaku, albo kierowca jeździ - // 70 - if (TrainParams) - if (TrainParams->CheckTrainLatency() < 5.0) - if (TrainParams->TTVmax > 0.0) - VelDesired = Global::Min0RSpeed( - VelDesired, - TrainParams - ->TTVmax); // jesli nie spozniony to nie przekraczać rozkladowej - if (VelDesired > 0.0) - if( ( ( iDrivigFlags & moveStopHere ) == 0 ) - || ( ( SemNextIndex != -1 ) - && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) - && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) ) { - // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w - // składzie, jeśli nie mamy czekać na sygnał też trzeba odpalić - if (iDrivigFlags & moveGuardSignal) - { // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas - // stania - iDrivigFlags &= ~moveGuardSignal; // tylko raz nadać + if (mvOccupied->RunningTrack.Velmax >= + 0) // ograniczenie prędkości z trajektorii ruchu + VelDesired = + Global::Min0RSpeed(VelDesired, + mvOccupied->RunningTrack.Velmax); // uwaga na ograniczenia szlakowej! + if (VelforDriver >= 0) // tu jest zero przy zmianie kierunku jazdy + VelDesired = Global::Min0RSpeed(VelDesired, VelforDriver); // Ra: tu może być 40, jeśli + // mechanik nie ma znajomości + // szlaaku, albo kierowca jeździ + // 70 + if (TrainParams) + if (TrainParams->CheckTrainLatency() < 5.0) + if (TrainParams->TTVmax > 0.0) + VelDesired = Global::Min0RSpeed( + VelDesired, + TrainParams + ->TTVmax); // jesli nie spozniony to nie przekraczać rozkladowej + if (VelDesired > 0.0) + if( ( ( iDrivigFlags & moveStopHere ) == 0 ) + || ( ( SemNextIndex != -1 ) + && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) + && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) ) { + // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w + // składzie, jeśli nie mamy czekać na sygnał też trzeba odpalić + if (iDrivigFlags & moveGuardSignal) + { // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas + // stania + iDrivigFlags &= ~moveGuardSignal; // tylko raz nadać - if( iDrivigFlags & moveDoorOpened ) // jeśli drzwi otwarte - if( !mvOccupied - ->DoorOpenCtrl ) // jeśli drzwi niesterowane przez maszynistę - Doors( false ); // a EZT zamknie dopiero po odegraniu komunikatu kierownika + if( iDrivigFlags & moveDoorOpened ) // jeśli drzwi otwarte + if( !mvOccupied + ->DoorOpenCtrl ) // jeśli drzwi niesterowane przez maszynistę + Doors( false ); // a EZT zamknie dopiero po odegraniu komunikatu kierownika - tsGuardSignal->Stop(); - // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy - // bezpośrednim - // albo trzeba zrobić dwa dźwięki, jeden bezpośredni, słyszalny w - // pobliżu, a drugi radiowy, słyszalny w innych lokomotywach - // na razie zakładam, że to nie jest dźwięk radiowy, bo trzeba by zrobić - // obsługę kanałów radiowych itd. - if( !iGuardRadio ) { - // jeśli nie przez radio - tsGuardSignal->Play( 1.0, 0, !FreeFlyModeFlag, pVehicle->GetPosition() ); // dla true jest głośniej - } - else { - // if (iGuardRadio==iRadioChannel) //zgodność kanału - // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu - // (albo może mieć radio przenośne) - kierownik mógłby powtarzać - // przy braku reakcji - if( SquareMagnitude( pVehicle->GetPosition() - Global::pCameraPosition ) < 2000 * 2000 ) { - // w odległości mniejszej niż 2km - tsGuardSignal->Play( 1.0, 0, true, pVehicle->GetPosition() ); // dźwięk niby przez radio - } + tsGuardSignal->Stop(); + // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy + // bezpośrednim + // albo trzeba zrobić dwa dźwięki, jeden bezpośredni, słyszalny w + // pobliżu, a drugi radiowy, słyszalny w innych lokomotywach + // na razie zakładam, że to nie jest dźwięk radiowy, bo trzeba by zrobić + // obsługę kanałów radiowych itd. + if( !iGuardRadio ) { + // jeśli nie przez radio + tsGuardSignal->Play( 1.0, 0, !FreeFlyModeFlag, pVehicle->GetPosition() ); // dla true jest głośniej + } + else { + // if (iGuardRadio==iRadioChannel) //zgodność kanału + // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu + // (albo może mieć radio przenośne) - kierownik mógłby powtarzać + // przy braku reakcji + if( SquareMagnitude( pVehicle->GetPosition() - Global::pCameraPosition ) < 2000 * 2000 ) { + // w odległości mniejszej niż 2km + tsGuardSignal->Play( 1.0, 0, true, pVehicle->GetPosition() ); // dźwięk niby przez radio } } } - if( mvOccupied->V == 0.0 ) { - // Ra 2014-03: jesli skład stoi, to działa na niego składowa styczna grawitacji - AbsAccS = fAccGravity; } - else { - AbsAccS = 0; - TDynamicObject *d = pVehicles[0]; // pojazd na czele składu - while (d) - { - AbsAccS += d->MoverParameters->TotalMass * d->MoverParameters->AccS * iDirection; - d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) - } - AbsAccS /= fMass; + if( mvOccupied->V == 0.0 ) { + // Ra 2014-03: jesli skład stoi, to działa na niego składowa styczna grawitacji + AbsAccS = fAccGravity; + } + else { + AbsAccS = 0; + TDynamicObject *d = pVehicles[0]; // pojazd na czele składu + while (d) + { + AbsAccS += d->MoverParameters->TotalMass * d->MoverParameters->AccS * iDirection; + d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } - AbsAccS_pub = AbsAccS; + AbsAccS /= fMass; + } + AbsAccS_pub = AbsAccS; #if LOGVELOCITY - // WriteLog("VelDesired="+AnsiString(VelDesired)+", - // VelSignal="+AnsiString(VelSignal)); - WriteLog("Vel=" + AnsiString(vel) + ", AbsAccS=" + AnsiString(AbsAccS) + - ", AccGrav=" + AnsiString(fAccGravity)); + // WriteLog("VelDesired="+AnsiString(VelDesired)+", + // VelSignal="+AnsiString(VelSignal)); + WriteLog("Vel=" + AnsiString(vel) + ", AbsAccS=" + AnsiString(AbsAccS) + + ", AccGrav=" + AnsiString(fAccGravity)); #endif - // ustalanie zadanego przyspieszenia - //(ActualProximityDist) - odległość do miejsca zmniejszenia prędkości - //(AccPreferred) - wynika z psychyki oraz uwzglęnia już ewentualne zderzenie z - // pojazdem z przodu, ujemne gdy należy hamować - //(AccDesired) - uwzględnia sygnały na drodze ruchu, ujemne gdy należy hamować - //(fAccGravity) - chwilowe przspieszenie grawitacyjne, ujemne działa przeciwnie do - // zadanego kierunku jazdy - //(AbsAccS) - chwilowe przyspieszenie pojazu (uwzględnia grawitację), ujemne działa - // przeciwnie do zadanego kierunku jazdy - //(AccDesired) porównujemy z (fAccGravity) albo (AbsAccS) - if( ( VelNext >= 0.0 ) - && ( ActualProximityDist <= scanmax ) - && ( vel >= VelNext ) ) { - // gdy zbliża się i jest za szybki do nowej prędkości, albo stoi na zatrzymaniu - if (vel > 0.0) { - // jeśli jedzie - if( ( vel < VelNext ) - && ( ActualProximityDist > fMaxProximityDist * ( 1.0 + 0.1 * vel ) ) ) { - // jeśli jedzie wolniej niż można i jest wystarczająco daleko, to można przyspieszyć - if( AccPreferred > 0.0 ) { - // jeśli nie ma zawalidrogi dojedz do semafora/przeszkody - AccDesired = AccPreferred; - } - } - else if (ActualProximityDist > fMinProximityDist) { - // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze jest daleko - if (ActualProximityDist < fMaxProximityDist) { - // jak minął już maksymalny dystans po prostu hamuj (niski stopień) - // ma stanąć, a jest w drodze hamowania albo ma jechać - VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); - if( VelDesired == 0.0 ) { - // hamowanie tak, aby stanąć - AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); - AccDesired = std::min( AccDesired, fAccThreshold ); - } - } - else { - // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) - // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever - auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); - AccDesired = std::min( - AccDesired, - ( VelNext * VelNext - vel * vel ) - / ( 25.92 - * std::max( - ActualProximityDist - brakingpointoffset, - std::min( - ActualProximityDist, - brakingpointoffset ) ) - + 0.1 ) ); // najpierw hamuje mocniej, potem zluzuje - } - AccDesired = std::min( AccDesired, AccPreferred ); - } - else { - // jest bliżej niż fMinProximityDist - // utrzymuj predkosc bo juz blisko - VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); - if( vel <= VelNext + fVelPlus ) { - // jeśli niewielkie przekroczenie, ale ma jechać - AccDesired = std::max( 0.0, AccPreferred ); // to olej (zacznij luzować) - } - ReactionTime = 0.1; // i orientuj się szybciej - } - } - else { - // zatrzymany (vel==0.0) - if( VelNext > 0.0 ) { - // można jechać + // ustalanie zadanego przyspieszenia + //(ActualProximityDist) - odległość do miejsca zmniejszenia prędkości + //(AccPreferred) - wynika z psychyki oraz uwzglęnia już ewentualne zderzenie z + // pojazdem z przodu, ujemne gdy należy hamować + //(AccDesired) - uwzględnia sygnały na drodze ruchu, ujemne gdy należy hamować + //(fAccGravity) - chwilowe przspieszenie grawitacyjne, ujemne działa przeciwnie do + // zadanego kierunku jazdy + //(AbsAccS) - chwilowe przyspieszenie pojazu (uwzględnia grawitację), ujemne działa + // przeciwnie do zadanego kierunku jazdy + //(AccDesired) porównujemy z (fAccGravity) albo (AbsAccS) + if( ( VelNext >= 0.0 ) + && ( ActualProximityDist <= routescanrange ) + && ( vel >= VelNext ) ) { + // gdy zbliża się i jest za szybki do nowej prędkości, albo stoi na zatrzymaniu + if (vel > 0.0) { + // jeśli jedzie + if( ( vel < VelNext ) + && ( ActualProximityDist > fMaxProximityDist * ( 1.0 + 0.1 * vel ) ) ) { + // jeśli jedzie wolniej niż można i jest wystarczająco daleko, to można przyspieszyć + if( AccPreferred > 0.0 ) { + // jeśli nie ma zawalidrogi dojedz do semafora/przeszkody AccDesired = AccPreferred; } - else { - // jeśli daleko jechać nie można - if( ActualProximityDist > ( - mvOccupied->CategoryFlag & 2 ? - fMinProximityDist : // cars - fMaxProximityDist ) ) { // trains and others - // ale ma kawałek do sygnalizatora - if( AccPreferred > 0.0 ) { - // dociagnij do semafora; - AccDesired = AccPreferred; - } - else { - //stoj - VelDesired = 0.0; - } + } + else if (ActualProximityDist > fMinProximityDist) { + // jedzie szybciej, niż trzeba na końcu ActualProximityDist, ale jeszcze jest daleko + if (ActualProximityDist < fMaxProximityDist) { + // jak minął już maksymalny dystans po prostu hamuj (niski stopień) + // ma stanąć, a jest w drodze hamowania albo ma jechać + VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); + if( VelDesired == 0.0 ) { + // hamowanie tak, aby stanąć + AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); + AccDesired = std::min( AccDesired, fAccThreshold ); + } + } + else { + // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) + // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever + auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); + AccDesired = std::min( + AccDesired, + ( VelNext * VelNext - vel * vel ) + / ( 25.92 + * std::max( + ActualProximityDist - brakingpointoffset, + std::min( + ActualProximityDist, + brakingpointoffset ) ) + + 0.1 ) ); // najpierw hamuje mocniej, potem zluzuje + } + AccDesired = std::min( AccDesired, AccPreferred ); + } + else { + // jest bliżej niż fMinProximityDist + // utrzymuj predkosc bo juz blisko + VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); + if( vel <= VelNext + fVelPlus ) { + // jeśli niewielkie przekroczenie, ale ma jechać + AccDesired = std::max( 0.0, AccPreferred ); // to olej (zacznij luzować) + } + ReactionTime = 0.1; // i orientuj się szybciej + } + } + else { + // zatrzymany (vel==0.0) + if( VelNext > 0.0 ) { + // można jechać + AccDesired = AccPreferred; + } + else { + // jeśli daleko jechać nie można + if( ActualProximityDist > ( + mvOccupied->CategoryFlag & 2 ? + fMinProximityDist : // cars + fMaxProximityDist ) ) { // trains and others + // ale ma kawałek do sygnalizatora + if( AccPreferred > 0.0 ) { + // dociagnij do semafora; + AccDesired = AccPreferred; } else { - // VelNext=0 i stoi bliżej niż fMaxProximityDist + //stoj VelDesired = 0.0; } } + else { + // VelNext=0 i stoi bliżej niż fMaxProximityDist + VelDesired = 0.0; + } } } + } + else { + // gdy jedzie wolniej niż potrzeba, albo nie ma przeszkód na drodze + // normalna jazda + AccDesired = ( + VelDesired != 0.0 ? + AccPreferred : + -0.01 ); + } + // koniec predkosci nastepnej + + if( vel > VelDesired ) { + // jesli jedzie za szybko do AKTUALNEGO + if( VelDesired == 0.0 ) { + // jesli stoj, to hamuj, ale i tak juz za pozno :) + AccDesired = std::min( AccDesired, -0.9 ); // hamuj solidnie + } else { - // gdy jedzie wolniej niż potrzeba, albo nie ma przeszkód na drodze - // normalna jazda - AccDesired = ( - VelDesired != 0.0 ? - AccPreferred : - -0.01 ); - } - // koniec predkosci nastepnej - - if( vel > VelDesired ) { - // jesli jedzie za szybko do AKTUALNEGO - if( VelDesired == 0.0 ) { - // jesli stoj, to hamuj, ale i tak juz za pozno :) - AccDesired = std::min( AccDesired, -0.9 ); // hamuj solidnie + // slow down, not full stop + if( vel > ( VelDesired + fVelPlus ) ) { + // hamuj tak średnio + AccDesired = std::min( AccDesired, -fBrake_a0[ 0 ] * 0.5 ); } else { - // slow down, not full stop - if( vel > ( VelDesired + fVelPlus ) ) { - // hamuj tak średnio - AccDesired = std::min( AccDesired, -fBrake_a0[ 0 ] * 0.5 ); - } - else { - // o 5 km/h to olej (zacznij luzować) - AccDesired = std::min( - AccDesired, // but don't override decceleration for VelNext - std::max( 0.0, AccPreferred ) ); - } + // o 5 km/h to olej (zacznij luzować) + AccDesired = std::min( + AccDesired, // but don't override decceleration for VelNext + std::max( 0.0, AccPreferred ) ); } } - // koniec predkosci aktualnej + } + // koniec predkosci aktualnej - // last step sanity check, until the whole calculation is straightened out - AccDesired = std::min( AccDesired, AccPreferred ); + // last step sanity check, until the whole calculation is straightened out + AccDesired = std::min( AccDesired, AccPreferred ); - if (AIControllFlag) { - // część wykonawcza tylko dla AI, dla człowieka jedynie napisy + if (AIControllFlag) { + // część wykonawcza tylko dla AI, dla człowieka jedynie napisy - // zapobieganie poslizgowi u nas - if (mvControlling->SlippingWheels) { + // zapobieganie poslizgowi u nas + if (mvControlling->SlippingWheels) { - if (!mvControlling->DecScndCtrl(2)) // bocznik na zero - mvControlling->DecMainCtrl(1); + if (!mvControlling->DecScndCtrl(2)) // bocznik na zero + mvControlling->DecMainCtrl(1); /* - if (mvOccupied->BrakeCtrlPos == - mvOccupied->BrakeCtrlPosNo) // jeśli ostatnia pozycja hamowania - //yB: ten warunek wyżej nie ma sensu - mvOccupied->DecBrakeLevel(); // to cofnij hamulec - DecBrake(); // to cofnij hamulec - else - mvControlling->AntiSlippingButton(); -*/ + if (mvOccupied->BrakeCtrlPos == + mvOccupied->BrakeCtrlPosNo) // jeśli ostatnia pozycja hamowania + //yB: ten warunek wyżej nie ma sensu + mvOccupied->DecBrakeLevel(); // to cofnij hamulec DecBrake(); // to cofnij hamulec + else mvControlling->AntiSlippingButton(); - ++iDriverFailCount; - mvControlling->SlippingWheels = false; // flaga już wykorzystana - } - if (iDriverFailCount > maxdriverfails) +*/ + DecBrake(); // to cofnij hamulec + mvControlling->AntiSlippingButton(); + ++iDriverFailCount; + mvControlling->SlippingWheels = false; // flaga już wykorzystana + } + if (iDriverFailCount > maxdriverfails) + { + Psyche = Easyman; + if (iDriverFailCount > maxdriverfails * 2) + SetDriverPsyche(); + } + + if( ( true == mvOccupied->RadioStopFlag ) // radio-stop + && ( mvOccupied->Vel > 0.0 ) ) { // and still moving + // if the radio-stop was issued don't waste effort trying to fight it + while( true == DecSpeed() ) { ; } // just throttle down... + return; // ...and don't touch any other controls + } + + if (mvControlling->ConvOvldFlag || + !mvControlling->Mains) // WS może wywalić z powodu błędu w drutach + { // wywalił bezpiecznik nadmiarowy przetwornicy + PrepareEngine(); // próba ponownego załączenia + } + // włączanie bezpiecznika + if ((mvControlling->EngineType == ElectricSeriesMotor) || + (mvControlling->TrainType & dt_EZT) || + (mvControlling->EngineType == DieselElectric)) + if (mvControlling->FuseFlag || Need_TryAgain) { - Psyche = Easyman; - if (iDriverFailCount > maxdriverfails * 2) - SetDriverPsyche(); - } - - if( ( true == mvOccupied->EmergencyBrakeFlag ) // radio-stop - && ( mvOccupied->Vel > 0.0 ) ) { // and still moving - // if the radio-stop was issued don't waste effort trying to fight it - while( true == DecSpeed() ) { ; } // just throttle down... - goto maintenance; // ...and don't touch any other controls - } - - if (mvControlling->ConvOvldFlag || - !mvControlling->Mains) // WS może wywalić z powodu błędu w drutach - { // wywalił bezpiecznik nadmiarowy przetwornicy - PrepareEngine(); // próba ponownego załączenia - } - // włączanie bezpiecznika - if ((mvControlling->EngineType == ElectricSeriesMotor) || - (mvControlling->TrainType & dt_EZT) || - (mvControlling->EngineType == DieselElectric)) - if (mvControlling->FuseFlag || Need_TryAgain) - { - Need_TryAgain = false; // true, jeśli druga pozycja w elektryku nie załapała - mvControlling->DecScndCtrl(2); // nastawnik bocznikowania na 0 - mvControlling->DecMainCtrl(2); // nastawnik jazdy na 0 - mvControlling->MainSwitch(true); // Ra: dodałem, bo EN57 stawały po wywaleniu - if (!mvControlling->FuseOn()) - HelpMeFlag = true; - else - { - ++iDriverFailCount; - if (iDriverFailCount > maxdriverfails) - Psyche = Easyman; - if (iDriverFailCount > maxdriverfails * 2) - SetDriverPsyche(); - } - } - // NOTE: as a stop-gap measure the routine is limited to trains only while car calculations seem off - if( mvControlling->CategoryFlag == 1 ) { - if( -AccDesired * BrakeAccFactor() < ( - ( ( fReady > 0.4 ) || ( VelNext > vel - 40.0 ) ) ? - fBrake_a0[ 0 ] * 0.8 : - -fAccThreshold ) - / braking_distance_multiplier( VelNext ) ) { - AccDesired = std::max( -0.06, AccDesired ); - } - else { - ReactionTime = 0.25; // i orientuj się szybciej, jeśli hamujesz + Need_TryAgain = false; // true, jeśli druga pozycja w elektryku nie załapała + mvControlling->DecScndCtrl(2); // nastawnik bocznikowania na 0 + mvControlling->DecMainCtrl(2); // nastawnik jazdy na 0 + mvControlling->MainSwitch(true); // Ra: dodałem, bo EN57 stawały po wywaleniu + if (mvControlling->FuseOn()) { + ++iDriverFailCount; + if (iDriverFailCount > maxdriverfails) + Psyche = Easyman; + if (iDriverFailCount > maxdriverfails * 2) + SetDriverPsyche(); } } - if (mvOccupied->BrakeSystem == Pneumatic) // napełnianie uderzeniowe - if (mvOccupied->BrakeHandle == FV4a) - { - if( mvOccupied->BrakeCtrlPos == -2 ) { - mvOccupied->BrakeLevelSet( 0 ); - } - if( ( mvOccupied->PipePress < 3.0 ) - && ( AccDesired > -0.03 ) ) { - mvOccupied->BrakeReleaser( 1 ); - } - if( ( mvOccupied->BrakeCtrlPos == 0 ) - && ( AbsAccS < 0.0 ) - && ( AccDesired > -0.03 ) ) { - - if( ( mvOccupied->EqvtPipePress < 4.95 ) - && ( fReady > 0.35 ) ) { // a reszta składu jest na to gotowa - - if( iDrivigFlags & moveOerlikons ) { - // napełnianie w Oerlikonie - mvOccupied->BrakeLevelSet( -1 ); - } - } - else if( Need_BrakeRelease ) { - Need_BrakeRelease = false; - mvOccupied->BrakeReleaser( 1 ); - } - } - - if( ( mvOccupied->BrakeCtrlPos < 0 ) - && ( mvOccupied->EqvtPipePress > ( - fReady < 0.25 ? - 5.1 : - 5.2 ) ) ) { - mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_RP ) ); - } - } -#if LOGVELOCITY - WriteLog("Dist=" + FloatToStrF(ActualProximityDist, ffFixed, 7, 1) + - ", VelDesired=" + FloatToStrF(VelDesired, ffFixed, 7, 1) + - ", AccDesired=" + FloatToStrF(AccDesired, ffFixed, 7, 3) + - ", VelSignal=" + AnsiString(VelSignal) + ", VelNext=" + - AnsiString(VelNext)); -#endif - if( ( vel < 10.0 ) - && ( AccDesired > 0.1 ) ) { - // Ra 2F1H: jeśli prędkość jest mała, a można przyspieszać, - // to nie ograniczać przyspieszenia do 0.5m/ss - // przy małych prędkościach może być trudno utrzymać - AccDesired = std::max( 0.9, AccDesired ); + // NOTE: as a stop-gap measure the routine is limited to trains only while car calculations seem off + if( mvControlling->CategoryFlag == 1 ) { + if( -AccDesired * BrakeAccFactor() < ( + ( ( fReady > 0.4 ) || ( VelNext > vel - 40.0 ) ) ? + fBrake_a0[ 0 ] * 0.8 : + -fAccThreshold ) + / braking_distance_multiplier( VelNext ) ) { + AccDesired = std::max( -0.06, AccDesired ); } - // małe przyspieszenie - // Ra 2F1I: wyłączyć kiedyś to uśrednianie i przeanalizować skanowanie, czemu migocze - if (AccDesired > -0.15) // hamowania lepeiej nie uśredniać - AccDesired = fAccDesiredAv = - 0.2 * AccDesired + - 0.8 * fAccDesiredAv; // uśrednione, żeby ograniczyć migotanie - if( VelDesired == 0.0 ) { - // Ra 2F1J: jeszcze jedna prowizoryczna łatka - if( AccDesired >= -0.01 ) { - AccDesired = -0.01; - } + else { + ReactionTime = 0.25; // i orientuj się szybciej, jeśli hamujesz } - if( AccDesired >= 0.0 ) { - if( true == TestFlag( iDrivigFlags, movePress ) ) { - // wyluzuj lokomotywę - może być więcej! + } + if (mvOccupied->BrakeSystem == Pneumatic) // napełnianie uderzeniowe + if (mvOccupied->BrakeHandle == FV4a) + { + if( mvOccupied->BrakeCtrlPos == -2 ) { + mvOccupied->BrakeLevelSet( 0 ); + } + if( ( mvOccupied->PipePress < 3.0 ) + && ( AccDesired > -0.03 ) ) { mvOccupied->BrakeReleaser( 1 ); } - else if( OrderList[ OrderPos ] != Disconnect ) { - // przy odłączaniu nie zwalniamy tu hamulca - if( ( fAccGravity * fAccGravity < 0.001 ? - true : - AccDesired > 0.0 ) ) { - // on slopes disengage the brakes only if you actually intend to accelerate - while( true == DecBrake() ) { ; } // jeśli przyspieszamy, to nie hamujemy - if( ( mvOccupied->BrakePress > 0.4 ) - && ( mvOccupied->Hamulec->GetCRP() > 4.9 ) ) { - // wyluzuj lokomotywę, to szybciej ruszymy - mvOccupied->BrakeReleaser( 1 ); + if( ( mvOccupied->BrakeCtrlPos == 0 ) + && ( AbsAccS < 0.0 ) + && ( AccDesired > -0.03 ) ) { + + if( ( mvOccupied->EqvtPipePress < 4.95 ) + && ( fReady > 0.35 ) ) { // a reszta składu jest na to gotowa + + if( iDrivigFlags & moveOerlikons ) { + // napełnianie w Oerlikonie + mvOccupied->BrakeLevelSet( -1 ); } - else { - if( mvOccupied->PipePress >= 3.0 ) { - // TODO: combine all releaser handling in single decision tree instead of having bits all over the place - mvOccupied->BrakeReleaser( 0 ); - } + } + else if( Need_BrakeRelease ) { + Need_BrakeRelease = false; + mvOccupied->BrakeReleaser( 1 ); + } + } + + if( ( mvOccupied->BrakeCtrlPos < 0 ) + && ( mvOccupied->EqvtPipePress > ( + fReady < 0.25 ? + 5.1 : + 5.2 ) ) ) { + mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_RP ) ); + } + } +#if LOGVELOCITY + WriteLog("Dist=" + FloatToStrF(ActualProximityDist, ffFixed, 7, 1) + + ", VelDesired=" + FloatToStrF(VelDesired, ffFixed, 7, 1) + + ", AccDesired=" + FloatToStrF(AccDesired, ffFixed, 7, 3) + + ", VelSignal=" + AnsiString(VelSignal) + ", VelNext=" + + AnsiString(VelNext)); +#endif + if( ( vel < 10.0 ) + && ( AccDesired > 0.1 ) ) { + // Ra 2F1H: jeśli prędkość jest mała, a można przyspieszać, + // to nie ograniczać przyspieszenia do 0.5m/ss + // przy małych prędkościach może być trudno utrzymać + AccDesired = std::max( 0.9, AccDesired ); + } + // małe przyspieszenie + // Ra 2F1I: wyłączyć kiedyś to uśrednianie i przeanalizować skanowanie, czemu migocze + if (AccDesired > -0.15) // hamowania lepeiej nie uśredniać + AccDesired = fAccDesiredAv = + 0.2 * AccDesired + + 0.8 * fAccDesiredAv; // uśrednione, żeby ograniczyć migotanie + if( VelDesired == 0.0 ) { + // Ra 2F1J: jeszcze jedna prowizoryczna łatka + if( AccDesired >= -0.01 ) { + AccDesired = -0.01; + } + } + if( AccDesired >= 0.0 ) { + if( true == TestFlag( iDrivigFlags, movePress ) ) { + // wyluzuj lokomotywę - może być więcej! + mvOccupied->BrakeReleaser( 1 ); + } + else if( OrderList[ OrderPos ] != Disconnect ) { + // przy odłączaniu nie zwalniamy tu hamulca + if( ( fAccGravity * fAccGravity < 0.001 ? + true : + AccDesired > 0.0 ) ) { + // on slopes disengage the brakes only if you actually intend to accelerate + while( true == DecBrake() ) { ; } // jeśli przyspieszamy, to nie hamujemy + if( ( mvOccupied->BrakePress > 0.4 ) + && ( mvOccupied->Hamulec->GetCRP() > 4.9 ) ) { + // wyluzuj lokomotywę, to szybciej ruszymy + mvOccupied->BrakeReleaser( 1 ); + } + else { + if( mvOccupied->PipePress >= 3.0 ) { + // TODO: combine all releaser handling in single decision tree instead of having bits all over the place + mvOccupied->BrakeReleaser( 0 ); } } } } - // margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest większa od 5km/h - if( false == TestFlag( iDrivigFlags, movePress ) ) { - // jeśli nie dociskanie - if( AccDesired < -0.1 ) { - while( true == DecSpeed() ) { ; } // jeśli hamujemy, to nie przyspieszamy - } - else if( ( vel > VelDesired ) - || ( fAccGravity < -0.01 ? - AccDesired < 0.0 : - AbsAccS > AccDesired ) ) { - // jak za bardzo przyspiesza albo prędkość przekroczona - DecSpeed(); // pojedyncze cofnięcie pozycji, bo na zero to przesada + } + // margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest większa od 5km/h + if( false == TestFlag( iDrivigFlags, movePress ) ) { + // jeśli nie dociskanie + if( AccDesired < -0.1 ) { + while( true == DecSpeed() ) { ; } // jeśli hamujemy, to nie przyspieszamy + } + else if( ( vel > VelDesired ) + || ( fAccGravity < -0.01 ? + AccDesired < 0.0 : + AbsAccS > AccDesired ) ) { + // jak za bardzo przyspiesza albo prędkość przekroczona + DecSpeed(); // pojedyncze cofnięcie pozycji, bo na zero to przesada + } + } + // yB: usunięte różne dziwne warunki, oddzielamy część zadającą od wykonawczej + // zwiekszanie predkosci + // Ra 2F1H: jest konflikt histerezy pomiędzy nastawioną pozycją a uzyskiwanym + // przyspieszeniem - utrzymanie pozycji powoduje przekroczenie przyspieszenia + if( AbsAccS < AccDesired ) { + // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz + if( vel < VelDesired - fVelMinus ) { + // jeśli prędkość w kierunku czoła jest mniejsza od dozwolonej o margines + if( ( ActualProximityDist > ( + mvOccupied->CategoryFlag & 2 ? + fMinProximityDist : // cars are allowed to move within min proximity distance + fMaxProximityDist ) ? // other vehicle types keep wider margin + true : + vel < VelNext ) ) { + // to można przyspieszyć + IncSpeed(); } } - // yB: usunięte różne dziwne warunki, oddzielamy część zadającą od wykonawczej - // zwiekszanie predkosci - // Ra 2F1H: jest konflikt histerezy pomiędzy nastawioną pozycją a uzyskiwanym - // przyspieszeniem - utrzymanie pozycji powoduje przekroczenie przyspieszenia - if( AbsAccS < AccDesired ) { - // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz - if( vel < VelDesired - fVelMinus ) { - // jeśli prędkość w kierunku czoła jest mniejsza od dozwolonej o margines - if( ( ActualProximityDist > ( - mvOccupied->CategoryFlag & 2 ? - fMinProximityDist : // cars are allowed to move within min proximity distance - fMaxProximityDist ) ? // other vehicle types keep wider margin - true : - vel < VelNext ) ) { - // to można przyspieszyć - IncSpeed(); - } - } + } + // yB: usunięte różne dziwne warunki, oddzielamy część zadającą od wykonawczej + // zmniejszanie predkosci + if( mvOccupied->TrainType & dt_EZT ) { + // właściwie, to warunek powinien być na działający EP + // Ra: to dobrze hamuje EP w EZT + if( ( AccDesired <= fAccThreshold ) // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold + && ( ( AbsAccS > AccDesired ) + || ( mvOccupied->BrakeCtrlPos < 0 ) ) ) { + // hamować bardziej, gdy aktualne opóźnienie hamowania mniejsze niż (AccDesired) + IncBrake(); } - // yB: usunięte różne dziwne warunki, oddzielamy część zadającą od wykonawczej - // zmniejszanie predkosci - if( mvOccupied->TrainType & dt_EZT ) { - // właściwie, to warunek powinien być na działający EP - // Ra: to dobrze hamuje EP w EZT - if( ( AccDesired <= fAccThreshold ) // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold - && ( ( AbsAccS > AccDesired ) - || ( mvOccupied->BrakeCtrlPos < 0 ) ) ) { - // hamować bardziej, gdy aktualne opóźnienie hamowania mniejsze niż (AccDesired) - IncBrake(); - } - else if( OrderList[ OrderPos ] != Disconnect ) { - // przy odłączaniu nie zwalniamy tu hamulca - if( AbsAccS < AccDesired - 0.05 ) { - // jeśli opóźnienie większe od wymaganego (z histerezą) luzowanie, gdy za dużo - if( mvOccupied->BrakeCtrlPos >= 0 ) { - DecBrake(); // tutaj zmniejszało o 1 przy odczepianiu - } - } - else if( mvOccupied->Handle->TimeEP ) { - if( mvOccupied->Handle->GetPos( bh_EPR ) - - mvOccupied->Handle->GetPos( bh_EPN ) < - 0.1 ) { - mvOccupied->SwitchEPBrake( 0 ); - } - else { - mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_EPN ) ); - } - } - } // order != disconnect - } // type & dt_ezt - else { - // a stara wersja w miarę dobrze działa na składy wagonowe - if( ( ( fAccGravity < -0.05 ) && ( vel < 0.0 ) ) - || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { - // u góry ustawia się hamowanie na fAccThreshold - if( ( fBrakeTime < 0.0 ) - || ( AccDesired < fAccGravity - 0.5 ) - || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { - // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował - if( true == IncBrake() ) { - fBrakeTime = - 3.0 - + 0.5 * ( ( - mvOccupied->BrakeDelayFlag > bdelay_G ? - mvOccupied->BrakeDelay[ 1 ] : - mvOccupied->BrakeDelay[ 3 ] ) - - 3.0 ); - // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy - fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 - } - } - } - if ((AccDesired < fAccGravity - 0.05) && (AbsAccS < AccDesired - fBrake_a1[0]*0.51)) { - // jak hamuje, to nie tykaj kranu za często - // yB: luzuje hamulec dopiero przy różnicy opóźnień rzędu 0.2 - if( OrderList[ OrderPos ] != Disconnect ) { - // przy odłączaniu nie zwalniamy tu hamulca + else if( OrderList[ OrderPos ] != Disconnect ) { + // przy odłączaniu nie zwalniamy tu hamulca + if( AbsAccS < AccDesired - 0.05 ) { + // jeśli opóźnienie większe od wymaganego (z histerezą) luzowanie, gdy za dużo + if( mvOccupied->BrakeCtrlPos >= 0 ) { DecBrake(); // tutaj zmniejszało o 1 przy odczepianiu } - fBrakeTime = ( - mvOccupied->BrakeDelayFlag > bdelay_G ? - mvOccupied->BrakeDelay[ 0 ] : - mvOccupied->BrakeDelay[ 2 ] ) - / 3.0; - fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } - // stop-gap measure to ensure cars actually brake to stop even when above calculactions go awry - // instead of releasing the brakes and creeping into obstacle at 1-2 km/h - if( mvControlling->CategoryFlag == 2 ) { - if( ( VelDesired == 0.0 ) - && ( vel > VelDesired ) - && ( ActualProximityDist <= fMinProximityDist ) - && ( mvOccupied->LocalBrakePos == 0 ) ) { - IncBrake(); + else if( mvOccupied->Handle->TimeEP ) { + if( mvOccupied->Handle->GetPos( bh_EPR ) - + mvOccupied->Handle->GetPos( bh_EPN ) < + 0.1 ) { + mvOccupied->SwitchEPBrake( 0 ); + } + else { + mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_EPN ) ); + } + } + } // order != disconnect + } // type & dt_ezt + else { + // a stara wersja w miarę dobrze działa na składy wagonowe + if( ( ( fAccGravity < -0.05 ) && ( vel < 0.0 ) ) + || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { + // u góry ustawia się hamowanie na fAccThreshold + if( ( fBrakeTime < 0.0 ) + || ( AccDesired < fAccGravity - 0.5 ) + || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { + // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował + if( true == IncBrake() ) { + fBrakeTime = + 3.0 + + 0.5 * ( ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 1 ] : + mvOccupied->BrakeDelay[ 3 ] ) + - 3.0 ); + // Ra: ten czas należy zmniejszyć, jeśli czas dojazdu do zatrzymania jest mniejszy + fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 } } } - // Mietek-end1 - SpeedSet(); // ciągla regulacja prędkości -#if LOGVELOCITY - WriteLog("BrakePos=" + AnsiString(mvOccupied->BrakeCtrlPos) + ", MainCtrl=" + - AnsiString(mvControlling->MainCtrlPos)); -#endif - } // if (AIControllFlag) - } // kierunek różny od zera - else - { // tutaj, gdy pojazd jest wyłączony - if (!AIControllFlag) // jeśli sterowanie jest w gestii użytkownika - if (mvOccupied->Battery) // czy użytkownik załączył baterię? - if (mvOccupied->ActiveDir) // czy ustawił kierunek - { // jeśli tak, to uruchomienie skanowania - CheckVehicles(); // sprawdzić skład - TableClear(); // resetowanie tabelki skanowania - PrepareEngine(); // uruchomienie + if ((AccDesired < fAccGravity - 0.05) && (AbsAccS < AccDesired - fBrake_a1[0]*0.51)) { + // jak hamuje, to nie tykaj kranu za często + // yB: luzuje hamulec dopiero przy różnicy opóźnień rzędu 0.2 + if( OrderList[ OrderPos ] != Disconnect ) { + // przy odłączaniu nie zwalniamy tu hamulca + DecBrake(); // tutaj zmniejszało o 1 przy odczepianiu } - } - if (AIControllFlag) - { // odhamowywanie składu po zatrzymaniu i zabezpieczanie lokomotywy - if ((OrderList[OrderPos] & (Disconnect | Connect)) == - 0) // przy (p)odłączaniu nie zwalniamy tu hamulca - if ((mvOccupied->V == 0.0) && ((VelDesired == 0.0) || (AccDesired == 0.0))) - if (mvOccupied->BrakeCtrlPos == mvOccupied->Handle->GetPos(bh_RP)) - mvOccupied->IncLocalBrakeLevel(1); // dodatkowy na pozycję 1 - else - mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_RP)); - } - break; // rzeczy robione przy jezdzie - } // switch (OrderList[OrderPos]) - // kasowanie licznika czasu - LastReactionTime = 0.0; - UpdateOK = true; - } // if ((LastReactionTime>Min0R(ReactionTime,2.0))) - else - LastReactionTime += dt; - -maintenance: - - if ((fLastStopExpDist > 0.0) && (mvOccupied->DistCounter > fLastStopExpDist)) - { - iStationStart = TrainParams->StationIndex; // zaktualizować wyświetlanie rozkładu - fLastStopExpDist = -1.0f; // usunąć licznik - } - if (AIControllFlag) - { - if (fWarningDuration > 0.0) // jeśli pozostało coś do wytrąbienia - { // trąbienie trwa nadal - fWarningDuration = fWarningDuration - dt; - if (fWarningDuration < 0.05) - mvOccupied->WarningSignal = 0; // a tu się kończy - if (ReactionTime > fWarningDuration) - ReactionTime = - fWarningDuration; // wcześniejszy przebłysk świadomości, by zakończyć trąbienie + fBrakeTime = ( + mvOccupied->BrakeDelayFlag > bdelay_G ? + mvOccupied->BrakeDelay[ 0 ] : + mvOccupied->BrakeDelay[ 2 ] ) + / 3.0; + fBrakeTime *= 0.5; // Ra: tymczasowo, bo przeżyna S1 + } + // stop-gap measure to ensure cars actually brake to stop even when above calculactions go awry + // instead of releasing the brakes and creeping into obstacle at 1-2 km/h + if( mvControlling->CategoryFlag == 2 ) { + if( ( VelDesired == 0.0 ) + && ( vel > VelDesired ) + && ( ActualProximityDist <= fMinProximityDist ) + && ( mvOccupied->LocalBrakePos == 0 ) ) { + IncBrake(); + } + } + } + // Mietek-end1 + SpeedSet(); // ciągla regulacja prędkości +#if LOGVELOCITY + WriteLog("BrakePos=" + AnsiString(mvOccupied->BrakeCtrlPos) + ", MainCtrl=" + + AnsiString(mvControlling->MainCtrlPos)); +#endif + } // if (AIControllFlag) + } // kierunek różny od zera + else + { // tutaj, gdy pojazd jest wyłączony + if (!AIControllFlag) // jeśli sterowanie jest w gestii użytkownika + if (mvOccupied->Battery) // czy użytkownik załączył baterię? + if (mvOccupied->ActiveDir) // czy ustawił kierunek + { // jeśli tak, to uruchomienie skanowania + CheckVehicles(); // sprawdzić skład + TableClear(); // resetowanie tabelki skanowania + PrepareEngine(); // uruchomienie + } } - if (mvOccupied->Vel >= 3.0) { - // jesli jedzie, można odblokować trąbienie, bo się wtedy nie włączy - iDrivigFlags &= ~moveStartHornDone; // zatrąbi dopiero jak następnym razem stanie - iDrivigFlags |= moveStartHorn; // i trąbić przed następnym ruszeniem + if (AIControllFlag) + { // odhamowywanie składu po zatrzymaniu i zabezpieczanie lokomotywy + if ((OrderList[OrderPos] & (Disconnect | Connect)) == + 0) // przy (p)odłączaniu nie zwalniamy tu hamulca + if ((mvOccupied->V == 0.0) && ((VelDesired == 0.0) || (AccDesired == 0.0))) + if (mvOccupied->BrakeCtrlPos == mvOccupied->Handle->GetPos(bh_RP)) + mvOccupied->IncLocalBrakeLevel(1); // dodatkowy na pozycję 1 + else + mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_RP)); } - return UpdateOK; - } - else // if (AIControllFlag) - return false; // AI nie obsługuje + break; // rzeczy robione przy jezdzie + } // switch (OrderList[OrderPos]) } void TController::JumpToNextOrder() @@ -5031,14 +5012,6 @@ std::string TController::StopReasonText() //- rozpoznają tylko zerową prędkość (jako koniec toru i brak podstaw do dalszego skanowania) //---------------------------------------------------------------------------------------------------------------------- -/* //nie używane -double TController::Distance(vector3 &p1,vector3 &n,vector3 &p2) -{//Ra:obliczenie odległości punktu (p1) od płaszczyzny o wektorze normalnym (n) przechodzącej przez -(p2) - return n.x*(p1.x-p2.x)+n.y*(p1.y-p2.y)+n.z*(p1.z-p2.z); //ax1+by1+cz1+d, gdzie d=-(ax2+by2+cz2) -}; -*/ - bool TController::BackwardTrackBusy(TTrack *Track) { // najpierw sprawdzamy, czy na danym torze są pojazdy z innego składu if( false == Track->Dynamics.empty() ) { @@ -5062,8 +5035,7 @@ TEvent * TController::CheckTrackEventBackward(double fDirection, TTrack *Track) return NULL; }; -TTrack * TController::BackwardTraceRoute(double &fDistance, double &fDirection, - TTrack *Track, TEvent *&Event) +TTrack * TController::BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, TEvent *&Event) { // szukanie sygnalizatora w kierunku przeciwnym jazdy (eventu odczytu komórki pamięci) TTrack *pTrackChVel = Track; // tor ze zmianą prędkości TTrack *pTrackFrom; // odcinek poprzedni, do znajdywania końca dróg @@ -5106,10 +5078,11 @@ TTrack * TController::BackwardTraceRoute(double &fDistance, double &fDirection, } if (Track == pTrackFrom) Track = NULL; // koniec, tak jak dla torów - if (Track ? - (Track->VelocityGet() == 0.0) || (Track->iDamageFlag & 128) || - BackwardTrackBusy(Track) : - true) + if( ( Track ? + ( ( Track->VelocityGet() == 0.0 ) + || ( Track->iDamageFlag & 128 ) + || ( true == BackwardTrackBusy( Track ) ) ) : + true ) ) { // gdy dalej toru nie ma albo zerowa prędkość, albo uszkadza pojazd fDistance = s; return NULL; // zwraca NULL, że skanowanie nie dało sensownych rezultatów diff --git a/Driver.h b/Driver.h index 69f636b0..ea68da69 100644 --- a/Driver.h +++ b/Driver.h @@ -217,7 +217,6 @@ class TController double fActionTime = 0.0; // czas używany przy regulacji prędkości i zamykaniu drzwi double m_radiocontroltime{ 0.0 }; // timer used to control speed of radio operations TAction eAction = actSleep; // aktualny stan - bool HelpMeFlag = false; // wystawiane True jesli cos niedobrego sie dzieje public: inline TAction GetAction() { @@ -320,7 +319,7 @@ class TController const TLocation &NewLocation, TStopReason reason = stopComm); bool PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const vector3 *NewLocation, TStopReason reason = stopComm); - bool UpdateSituation(double dt); // uruchamiac przynajmniej raz na sekundę + void UpdateSituation(double dt); // uruchamiac przynajmniej raz na sekundę // procedury dotyczace rozkazow dla maszynisty void SetVelocity(double NewVel, double NewVelNext, TStopReason r = stopNone); // uaktualnia informacje o prędkości diff --git a/DynObj.cpp b/DynObj.cpp index 67ce1097..3c570da5 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1945,14 +1945,14 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" compartmentindex < 10 ? "0" + std::to_string( compartmentindex ) : std::to_string( compartmentindex ) ); - submodel = mdLowPolyInt->GetFromName( compartmentname.c_str() ); + submodel = mdLowPolyInt->GetFromName( compartmentname ); if( submodel != nullptr ) { // if specified compartment was found we check also for potential matching section in the currently assigned load // NOTE: if the load gets changed this will invalidate stored pointers. TODO: rebuild the table on load change SectionLightLevels.emplace_back( submodel, ( mdLoad != nullptr ? - mdLoad->GetFromName( compartmentname.c_str() ): + mdLoad->GetFromName( compartmentname ): nullptr ), 0.0f ); } @@ -1965,11 +1965,11 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" for (int i = 0; i < 2; i++) { asAnimName = std::string("buffer_left0") + to_string(i + 1); - smBuforLewy[i] = mdModel->GetFromName(asAnimName.c_str()); + smBuforLewy[i] = mdModel->GetFromName(asAnimName); if (smBuforLewy[i]) smBuforLewy[i]->WillBeAnimated(); // ustawienie flagi animacji asAnimName = std::string("buffer_right0") + to_string(i + 1); - smBuforPrawy[i] = mdModel->GetFromName(asAnimName.c_str()); + smBuforPrawy[i] = mdModel->GetFromName(asAnimName); if (smBuforPrawy[i]) smBuforPrawy[i]->WillBeAnimated(); } @@ -4212,7 +4212,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, for (int i = 0; i < iAnimType[ANIM_PANTS]; i++) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* asAnimName = token + std::to_string(i + 1); - sm = mdModel->GetFromName(asAnimName.c_str()); + sm = mdModel->GetFromName(asAnimName); pants[i].smElement[0] = sm; // jak NULL, to nie będzie animowany if (sm) { // w EP09 wywalało się tu z powodu NULL @@ -4304,7 +4304,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* asAnimName = token + std::to_string( i + 1 ); - sm = mdModel->GetFromName( asAnimName.c_str() ); + sm = mdModel->GetFromName( asAnimName ); pants[ i ].smElement[ 1 ] = sm; // jak NULL, to nie będzie animowany if( sm ) { // w EP09 wywalało się tu z powodu NULL sm->WillBeAnimated(); @@ -4338,7 +4338,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* asAnimName = token + std::to_string( i + 1 ); - pants[ i ].smElement[ 2 ] = mdModel->GetFromName( asAnimName.c_str() ); + pants[ i ].smElement[ 2 ] = mdModel->GetFromName( asAnimName ); pants[ i ].smElement[ 2 ]->WillBeAnimated(); } } @@ -4351,7 +4351,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* asAnimName = token + std::to_string( i + 1 ); - pants[ i ].smElement[ 3 ] = mdModel->GetFromName( asAnimName.c_str() ); + pants[ i ].smElement[ 3 ] = mdModel->GetFromName( asAnimName ); pants[ i ].smElement[ 3 ]->WillBeAnimated(); } } @@ -4364,7 +4364,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* asAnimName = token + std::to_string( i + 1 ); - pants[ i ].smElement[ 4 ] = mdModel->GetFromName( asAnimName.c_str() ); + pants[ i ].smElement[ 4 ] = mdModel->GetFromName( asAnimName ); pants[ i ].smElement[ 4 ]->WillBeAnimated(); /* pants[ i ].yUpdate = UpdatePant; */ pants[ i ].yUpdate = std::bind( &TDynamicObject::UpdatePant, this, std::placeholders::_1 ); @@ -4498,7 +4498,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, for (int i = 1; i <= 4; i++) { // McZapkie-050402: wyszukiwanie max 4 wahaczy o nazwie str* asAnimName = token + std::to_string(i); - smWahacze[i - 1] = mdModel->GetFromName(asAnimName.c_str()); + smWahacze[i - 1] = mdModel->GetFromName(asAnimName); smWahacze[i - 1]->WillBeAnimated(); } parser.getTokens(); parser >> token; @@ -4535,7 +4535,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, { // NBMX wrzesien 2003: wyszukiwanie drzwi o nazwie str* asAnimName = token + std::to_string(i + 1); pAnimations[i + j].smAnimated = - mdModel->GetFromName(asAnimName.c_str()); // ustalenie submodelu + mdModel->GetFromName(asAnimName); // ustalenie submodelu if (pAnimations[i + j].smAnimated) { //++iAnimatedDoors; pAnimations[i + j].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu diff --git a/DynObj.h b/DynObj.h index 59efe6e2..88c9e0ea 100644 --- a/DynObj.h +++ b/DynObj.h @@ -178,6 +178,7 @@ public: // parametry położenia pojazdu dostępne publicznie int NextConnectedNo; // numer sprzęgu podłączonego z tyłu int PrevConnectedNo; // numer sprzęgu podłączonego z przodu double fScanDist; // odległość skanowania torów na obecność innych pojazdów + double fTrackBlock; // odległość do przeszkody do dalszego ruchu (wykrywanie kolizji z innym pojazdem) TPowerSource ConnectedEnginePowerSource( TDynamicObject const *Caller ) const; @@ -366,8 +367,6 @@ public: // modele składowe pojazdu public: int *iLights; // wskaźnik na bity zapalonych świateł (własne albo innego członu) bool DimHeadlights{ false }; // status of the headlight dimming toggle. NOTE: single toggle for all lights is a simplification. TODO: separate per-light switches - double fTrackBlock; // odległość do przeszkody do dalszego ruchu (wykrywanie kolizji z innym - // pojazdem) TDynamicObject * PrevAny(); TDynamicObject * Prev(); TDynamicObject * Next(); diff --git a/Event.cpp b/Event.cpp index ae9836c3..1038d1be 100644 --- a/Event.cpp +++ b/Event.cpp @@ -78,7 +78,7 @@ void TEvent::Conditions(cParser *parser, std::string s) if (!asNodeName.empty()) { // podczepienie łańcucha, jeśli nie jest pusty // BUG: source of a memory leak -- the array never gets deleted. fix the destructor - Params[9].asText = new char[asNodeName.length() + 1]; // usuwane i zamieniane na + Params[9].asText = new char[asNodeName.size() + 1]; // usuwane i zamieniane na // wskaźnik strcpy(Params[9].asText, asNodeName.c_str()); } @@ -103,7 +103,7 @@ void TEvent::Conditions(cParser *parser, std::string s) str = token; if (str != "*") //"*" - nie brac command pod uwage { // zapamiętanie łańcucha do porównania - Params[10].asText = new char[255]; + Params[10].asText = new char[str.size() + 1]; strcpy(Params[10].asText, str.c_str()); iFlags |= conditional_memstring; } @@ -144,7 +144,6 @@ void TEvent::Load(cParser *parser, vector3 *org) int ti; std::string token; //string str; - char *ptr; bEnabled = true; // zmieniane na false dla eventów używanych do skanowania sygnałów @@ -222,14 +221,12 @@ void TEvent::Load(cParser *parser, vector3 *org) // if (Type==tp_UpdateValues) iFlags=0; //co modyfikować parser->getTokens(1, false); // case sensitive *parser >> token; - // str = AnsiString(token.c_str()); - Params[0].asText = new char[token.length() + 1]; // BUG: source of memory leak + Params[0].asText = new char[token.size() + 1]; // BUG: source of memory leak strcpy(Params[0].asText, token.c_str()); if (token != "*") // czy ma zostać bez zmian? iFlags |= update_memstring; parser->getTokens(); *parser >> token; - // str = AnsiString(token.c_str()); if (token != "*") // czy ma zostać bez zmian? { Params[1].asdouble = atof(token.c_str()); @@ -239,7 +236,6 @@ void TEvent::Load(cParser *parser, vector3 *org) Params[1].asdouble = 0; parser->getTokens(); *parser >> token; - // str = AnsiString(token.c_str()); if (token != "*") // czy ma zostać bez zmian? { Params[2].asdouble = atof(token.c_str()); @@ -262,7 +258,7 @@ void TEvent::Load(cParser *parser, vector3 *org) switch (++i) { // znaczenie kolejnych parametrów case 1: // nazwa drugiej komórki (źródłowej) - Params[9].asText = new char[token.length() + 1]; // usuwane i zamieniane na wskaźnik + Params[9].asText = new char[token.size() + 1]; // usuwane i zamieniane na wskaźnik strcpy(Params[9].asText, token.c_str()); break; case 2: // maska wartości @@ -353,7 +349,7 @@ void TEvent::Load(cParser *parser, vector3 *org) } else Params[6].asCommand = cm_Unknown; - Params[0].asText = new char[token.length() + 1]; + Params[0].asText = new char[token.size() + 1]; strcpy(Params[0].asText, token.c_str()); parser->getTokens(); *parser >> token; @@ -561,7 +557,7 @@ void TEvent::Load(cParser *parser, vector3 *org) { // eventy rozpoczynające się od "none_" są ignorowane if (token != "else") { - Params[i].asText = new char[255]; + Params[i].asText = new char[token.size() + 1]; strcpy(Params[i].asText, token.c_str()); if (ti) iFlags |= conditional_else << i; // oflagowanie dla eventów "else" diff --git a/Event.h b/Event.h index 7d020046..4eaebfe1 100644 --- a/Event.h +++ b/Event.h @@ -15,8 +15,7 @@ http://mozilla.org/MPL/2.0/. using namespace Math3D; -typedef enum -{ +enum TEventType { tp_Unknown, tp_Sound, tp_SoundPos, @@ -41,7 +40,7 @@ typedef enum tp_Voltage, tp_Message, tp_Friction -} TEventType; +}; const int update_memstring = 0x0000001; // zmodyfikować tekst (UpdateValues) const int update_memval1 = 0x0000002; // zmodyfikować pierwszą wartosć diff --git a/Gauge.cpp b/Gauge.cpp index 2c262268..4def85c2 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -85,7 +85,7 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) { } scale *= mul; - TSubModel *submodel = md1->GetFromName( submodelname.c_str() ); + TSubModel *submodel = md1->GetFromName( submodelname ); if( scale == 0.0 ) { ErrorLog( "Scale of 0.0 defined for sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\". Forcing scale of 1.0 to prevent division by 0" ); scale = 1.0; @@ -93,7 +93,7 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) { if (submodel) // jeśli nie znaleziony md2 = nullptr; // informacja, że znaleziony else if (md2) // a jest podany drugi model (np. zewnętrzny) - submodel = md2->GetFromName(submodelname.c_str()); // to może tam będzie, co za różnica gdzie + submodel = md2->GetFromName(submodelname); // to może tam będzie, co za różnica gdzie if( submodel == nullptr ) { ErrorLog( "Failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\"" ); } diff --git a/Ground.cpp b/Ground.cpp index 6c5b29e1..8c2a349d 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1599,7 +1599,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) importedvertices.emplace_back( vertex0 ); } if( importedvertices.size() % 2 != 0 ) { - ErrorLog( "Lines node specified odd number of vertices, encountered in file \"" + parser->Name() + "\"" ); + ErrorLog( "Lines node specified odd number of vertices, encountered in file \"" + parser->Name() + "\" (line " + std::to_string( parser->Line() - 1 ) + ")" ); importedvertices.pop_back(); } tmp->iType = GL_LINES; @@ -1654,6 +1654,8 @@ TSubRect * TGround::GetSubRect(int iCol, int iRow) TEvent * TGround::FindEvent(const std::string &asEventName) { + if( asEventName.empty() ) { return nullptr; } + auto const lookup = m_eventmap.find( asEventName ); return ( lookup != m_eventmap.end() ? @@ -1868,7 +1870,7 @@ bool TGround::Init(std::string File) } else { - ErrorLog("Scene parsing error in file \"" + parser.Name() + "\", unexpected token \"" + token + "\""); + ErrorLog("Scene parsing error in file \"" + parser.Name() + "\" (line " + std::to_string( parser.Line() ) + "), unexpected token \"" + token + "\""); // break; } } @@ -2208,7 +2210,7 @@ bool TGround::Init(std::string File) bool TGround::InitEvents() { //łączenie eventów z pozostałymi obiektami TGroundNode *tmp, *trk; - char buff[ 255 ]; std::string cellastext; + std::string cellastext; int i; for (TEvent *Current = RootEvent; Current; Current = Current->evNext2) { @@ -2216,19 +2218,16 @@ bool TGround::InitEvents() { case tp_AddValues: // sumowanie wartości case tp_UpdateValues: // zmiana wartości - tmp = FindGroundNode(Current->asNodeName, - TP_MEMCELL); // nazwa komórki powiązanej z eventem + tmp = FindGroundNode(Current->asNodeName, TP_MEMCELL); // nazwa komórki powiązanej z eventem if (tmp) { // McZapkie-100302 if (Current->iFlags & (conditional_trackoccupied | conditional_trackfree)) { // jeśli chodzi o zajetosc toru (tor może być inny, niż wpisany w komórce) - trk = FindGroundNode(Current->asNodeName, - TP_TRACK); // nazwa toru ta sama, co nazwa komórki + trk = FindGroundNode(Current->asNodeName, TP_TRACK); // nazwa toru ta sama, co nazwa komórki if (trk) Current->Params[9].asTrack = trk->pTrack; if (!Current->Params[9].asTrack) - ErrorLog("Bad event: track \"" + Current->asNodeName + - "\" does not exists in \"" + Current->asName + "\""); + ErrorLog("Bad event: track \"" + Current->asNodeName + "\" referenced in event \"" + Current->asName + "\" doesn't exist"); } Current->Params[4].nGroundNode = tmp; Current->Params[5].asMemCell = tmp->MemCell; // komórka do aktualizacji @@ -2241,8 +2240,7 @@ bool TGround::InitEvents() if (trk) Current->Params[6].asTrack = trk->pTrack; else - ErrorLog("Bad memcell: track \"" + tmp->MemCell->asTrackName + - "\" not exists in memcell \"" + tmp->asName + "\""); + ErrorLog("Bad memcell: track \"" + tmp->MemCell->asTrackName + "\" referenced in memcell \"" + tmp->asName + "\" doesn't exist"); } else Current->Params[6].asTrack = NULL; @@ -2250,8 +2248,7 @@ bool TGround::InitEvents() else { // nie ma komórki, to nie będzie działał poprawnie Current->Type = tp_Ignored; // deaktywacja - ErrorLog("Bad event: \"" + Current->asName + "\" cannot find memcell \"" + - Current->asNodeName + "\""); + ErrorLog("Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\""); } break; case tp_LogValues: // skojarzenie z memcell @@ -2275,8 +2272,7 @@ bool TGround::InitEvents() else { // nie ma komórki, to nie będzie działał poprawnie Current->Type = tp_Ignored; // deaktywacja - ErrorLog("Bad event: \"" + Current->asName + "\" cannot find memcell \"" + - Current->asNodeName + "\""); + ErrorLog("Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\""); } break; case tp_CopyValues: // skopiowanie komórki do innej @@ -2292,15 +2288,13 @@ bool TGround::InitEvents() if (trk) Current->Params[6].asTrack = trk->pTrack; else - ErrorLog("Bad memcell: track \"" + tmp->MemCell->asTrackName + - "\" not exists in memcell \"" + tmp->asName + "\""); + ErrorLog("Bad memcell: track \"" + tmp->MemCell->asTrackName + "\" referenced in memcell \"" + tmp->asName + "\" doesn't exists"); } else Current->Params[6].asTrack = NULL; } else - ErrorLog("Bad copyvalues: event \"" + Current->asName + - "\" cannot find memcell \"" + Current->asNodeName + "\""); + ErrorLog("Bad event: copyvalues event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\""); cellastext = Current->Params[ 9 ].asText; SafeDeleteArray(Current->Params[9].asText); // usunięcie nazwy komórki tmp = FindGroundNode( cellastext, TP_MEMCELL); // komórka źódłowa @@ -2309,22 +2303,19 @@ bool TGround::InitEvents() Current->Params[9].asMemCell = tmp->MemCell; // komórka źródłowa } else - ErrorLog("Bad copyvalues: event \"" + Current->asName + - "\" cannot find memcell \"" + cellastext + "\""); + ErrorLog("Bad event: copyvalues event \"" + Current->asName + "\" cannot find memcell \"" + cellastext + "\""); break; case tp_Animation: // animacja modelu tmp = FindGroundNode(Current->asNodeName, TP_MODEL); // egzemplarza modelu do animowania if (tmp) { - strcpy( - buff, - Current->Params[9].asText); // skopiowanie nazwy submodelu do bufora roboczego + cellastext = Current->Params[9].asText; // skopiowanie nazwy submodelu do bufora roboczego SafeDeleteArray(Current->Params[9].asText); // usunięcie nazwy submodelu if (Current->Params[0].asInt == 4) Current->Params[9].asModel = tmp->Model; // model dla całomodelowych animacji else { // standardowo przypisanie submodelu - Current->Params[9].asAnimContainer = tmp->Model->GetContainer(buff); // submodel + Current->Params[9].asAnimContainer = tmp->Model->GetContainer(cellastext); // submodel if (Current->Params[9].asAnimContainer) { Current->Params[9].asAnimContainer->WillBeAnimated(); // oflagowanie @@ -2332,13 +2323,12 @@ bool TGround::InitEvents() if (!Current->Params[9] .asAnimContainer->Event()) // nie szukać, gdy znaleziony Current->Params[9].asAnimContainer->EventAssign( - FindEvent(Current->asNodeName + "." + buff + ":done")); + FindEvent(Current->asNodeName + "." + cellastext + ":done")); } } } else - ErrorLog("Bad animation: event \"" + Current->asName + "\" cannot find model \"" + - Current->asNodeName + "\""); + ErrorLog("Bad event: animation event \"" + Current->asName + "\" cannot find model \"" + Current->asNodeName + "\""); Current->asNodeName = ""; break; case tp_Lights: // zmiana świeteł modelu @@ -2346,8 +2336,7 @@ bool TGround::InitEvents() if (tmp) Current->Params[9].asModel = tmp->Model; else - ErrorLog("Bad lights: event \"" + Current->asName + "\" cannot find model \"" + - Current->asNodeName + "\""); + ErrorLog("Bad event: lights event \"" + Current->asName + "\" cannot find model \"" + Current->asNodeName + "\""); Current->asNodeName = ""; break; case tp_Visible: // ukrycie albo przywrócenie obiektu @@ -2359,8 +2348,7 @@ bool TGround::InitEvents() if (tmp) Current->Params[9].nGroundNode = tmp; else - ErrorLog("Bad visibility: event \"" + Current->asName + "\" cannot find model \"" + - Current->asNodeName + "\""); + ErrorLog("Bad event: visibility event \"" + Current->asName + "\" cannot find model \"" + Current->asNodeName + "\""); Current->asNodeName = ""; break; case tp_Switch: // przełożenie zwrotnicy albo zmiana stanu obrotnicy @@ -2378,8 +2366,7 @@ bool TGround::InitEvents() Current->Params[2].asdouble); // przesłanie parametrów } else - ErrorLog("Bad switch: event \"" + Current->asName + "\" cannot find track \"" + - Current->asNodeName + "\""); + ErrorLog("Bad event: switch event \"" + Current->asName + "\" cannot find track \"" + Current->asNodeName + "\""); Current->asNodeName = ""; break; case tp_Sound: // odtworzenie dźwięku @@ -2387,8 +2374,7 @@ bool TGround::InitEvents() if (tmp) Current->Params[9].tsTextSound = tmp->tsStaticSound; else - ErrorLog("Bad sound: event \"" + Current->asName + - "\" cannot find static sound \"" + Current->asNodeName + "\""); + ErrorLog("Bad event: sound event \"" + Current->asName + "\" cannot find static sound \"" + Current->asNodeName + "\""); Current->asNodeName = ""; break; case tp_TrackVel: // ustawienie prędkości na torze @@ -2402,8 +2388,7 @@ bool TGround::InitEvents() Current->Params[9].asTrack = tmp->pTrack; } else - ErrorLog("Bad velocity: event \"" + Current->asName + - "\" cannot find track \"" + Current->asNodeName + "\""); + ErrorLog("Bad event: track velocity event \"" + Current->asName + "\" cannot find track \"" + Current->asNodeName + "\""); } Current->asNodeName = ""; break; @@ -2416,54 +2401,53 @@ bool TGround::InitEvents() if (tmp) Current->Params[9].asDynamic = tmp->DynamicObject; else - Error("Event \"" + Current->asName + "\" cannot find dynamic \"" + - Current->asNodeName + "\""); + Error("Bad event: vehicle velocity event \"" + Current->asName + "\" cannot find vehicle \"" + Current->asNodeName + "\""); } Current->asNodeName = ""; break; case tp_Multiple: if (Current->Params[9].asText != NULL) { // przepisanie nazwy do bufora - strcpy(buff, Current->Params[9].asText); + cellastext = Current->Params[ 9 ].asText; SafeDeleteArray(Current->Params[9].asText); Current->Params[9].asPointer = NULL; // zerowanie wskaźnika, aby wykryć brak obeiktu } else - buff[0] = '\0'; + cellastext = ""; if (Current->iFlags & (conditional_trackoccupied | conditional_trackfree)) { // jeśli chodzi o zajetosc toru - tmp = FindGroundNode(buff, TP_TRACK); + tmp = FindGroundNode(cellastext, TP_TRACK); if (tmp) Current->Params[9].asTrack = tmp->pTrack; if (!Current->Params[9].asTrack) { - ErrorLog("Bad event: Track \"" + std::string(buff) + "\" does not exist in \"" + Current->asName + "\""); + ErrorLog("Bad event: Track \"" + cellastext + "\" does not exist in \"" + Current->asName + "\""); Current->iFlags &= ~(conditional_trackoccupied | conditional_trackfree); // zerowanie flag } } else if (Current->iFlags & (conditional_memstring | conditional_memval1 | conditional_memval2)) { // jeśli chodzi o komorke pamieciową - tmp = FindGroundNode(buff, TP_MEMCELL); + tmp = FindGroundNode(cellastext, TP_MEMCELL); if (tmp) Current->Params[9].asMemCell = tmp->MemCell; if (!Current->Params[9].asMemCell) { - ErrorLog("Bad event: MemCell \"" + std::string(buff) + "\" does not exist in \"" + Current->asName + "\""); + ErrorLog("Bad event: MemCell \"" + cellastext + "\" does not exist in \"" + Current->asName + "\""); Current->iFlags &= ~(conditional_memstring | conditional_memval1 | conditional_memval2); } } - for (i = 0; i < 8; i++) + for (i = 0; i < 8; ++i) { if (Current->Params[i].asText != NULL) { - strcpy(buff, Current->Params[i].asText); + cellastext = Current->Params[ i ].asText; SafeDeleteArray(Current->Params[i].asText); - Current->Params[i].asEvent = FindEvent(buff); + Current->Params[i].asEvent = FindEvent(cellastext); if( !Current->Params[ i ].asEvent ) { // Ra: tylko w logu informacja o braku if( ( Current->Params[ i ].asText == NULL ) || ( std::string( Current->Params[ i ].asText ).substr( 0, 5 ) != "none_" ) ) { - WriteLog( "Event \"" + std::string( buff ) + "\" does not exist" ); - ErrorLog( "Missed event: " + std::string( buff ) + " in multiple " + Current->asName ); + WriteLog( "Event \"" + cellastext + "\" does not exist" ); + ErrorLog( "Missed event: " + cellastext + " in multiple " + Current->asName ); } } } @@ -2472,13 +2456,11 @@ bool TGround::InitEvents() case tp_Voltage: // zmiana napięcia w zasilaczu (TractionPowerSource) if (!Current->asNodeName.empty()) { - tmp = FindGroundNode(Current->asNodeName, - TP_TRACTIONPOWERSOURCE); // podłączenie zasilacza + tmp = FindGroundNode(Current->asNodeName, TP_TRACTIONPOWERSOURCE); // podłączenie zasilacza if (tmp) Current->Params[9].psPower = tmp->psTractionPowerSource; else - ErrorLog("Bad voltage: event \"" + Current->asName + - "\" cannot find power source \"" + Current->asNodeName + "\""); + ErrorLog("Bad event: voltage event \"" + Current->asName + "\" cannot find power source \"" + Current->asNodeName + "\""); } Current->asNodeName = ""; break; @@ -2501,43 +2483,32 @@ void TGround::InitTracks() TTrack *tmp; // znaleziony tor TTrack *Track; int iConnection; - std::string name; - // tracks=tracksfar=0; - for (Current = nRootOfType[TP_TRACK]; Current; Current = Current->nNext) - { - Track = Current->pTrack; - if (Global::iHiddenEvents & 1) - if (!Current->asName.empty()) - { // jeśli podana jest nazwa torów, można szukać eventów skojarzonych przez nazwę - if (Track->asEvent0Name.empty()) - if (FindEvent(Current->asName + ":event0")) - Track->asEvent0Name = Current->asName + ":event0"; - if (Track->asEvent1Name.empty()) - if (FindEvent(Current->asName + ":event1")) - Track->asEvent1Name = Current->asName + ":event1"; - if (Track->asEvent2Name.empty()) - if (FindEvent(Current->asName + ":event2")) - Track->asEvent2Name = Current->asName + ":event2"; - if (Track->asEventall0Name.empty()) - if (FindEvent(Current->asName + ":eventall0")) - Track->asEventall0Name = Current->asName + ":eventall0"; - if (Track->asEventall1Name.empty()) - if (FindEvent(Current->asName + ":eventall1")) - Track->asEventall1Name = Current->asName + ":eventall1"; - if (Track->asEventall2Name.empty()) - if (FindEvent(Current->asName + ":eventall2")) - Track->asEventall2Name = Current->asName + ":eventall2"; - } + for (Current = nRootOfType[TP_TRACK]; Current; Current = Current->nNext) { + + Track = Current->pTrack; + // assign track events Track->AssignEvents( - Track->asEvent0Name.empty() ? NULL : FindEvent(Track->asEvent0Name), - Track->asEvent1Name.empty() ? NULL : FindEventScan(Track->asEvent1Name), - Track->asEvent2Name.empty() ? NULL : FindEventScan(Track->asEvent2Name)); + FindEvent( Track->asEvent0Name ), + FindEvent( Track->asEvent1Name ), + FindEvent( Track->asEvent2Name ) ); Track->AssignallEvents( - Track->asEventall0Name.empty() ? NULL : FindEvent(Track->asEventall0Name), - Track->asEventall1Name.empty() ? NULL : FindEvent(Track->asEventall1Name), - Track->asEventall2Name.empty() ? NULL : - FindEvent(Track->asEventall2Name)); // MC-280503 + FindEvent( Track->asEventall0Name ), + FindEvent( Track->asEventall1Name ), + FindEvent( Track->asEventall2Name ) ); + if( ( Global::iHiddenEvents & 1 ) + && ( false == Current->asName.empty() ) ) { + // jeśli podana jest nazwa torów, można szukać eventów skojarzonych przez nazwę + Track->AssignEvents( + FindEvent( Current->asName + ":event0" ), + FindEvent( Current->asName + ":event1" ), + FindEvent( Current->asName + ":event2" ) ); + Track->AssignallEvents( + FindEvent( Current->asName + ":eventall0" ), + FindEvent( Current->asName + ":eventall1" ), + FindEvent( Current->asName + ":eventall2" ) ); + } + switch (Track->eType) { case tt_Table: // obrotnicę też łączymy na starcie z innymi torami @@ -2635,7 +2606,7 @@ void TGround::InitTracks() FindEvent(Current->asName + ":forced-")); break; } - name = Track->IsolatedName(); // pobranie nazwy odcinka izolowanego + std::string const name = Track->IsolatedName(); // pobranie nazwy odcinka izolowanego if (!name.empty()) // jeśli została zwrócona nazwa Track->IsolatedEventsAssign(FindEvent(name + ":busy"), FindEvent(name + ":free")); if (Current->asName.substr(0, 1) == diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index ff855c95..68a331cb 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -867,7 +867,8 @@ public: /* int BrakeStatus = b_off; //0 - odham, 1 - ham., 2 - uszk., 4 - odluzniacz, 8 - antyposlizg, 16 - uzyte EP, 32 - pozycja R, 64 - powrot z R */ - bool EmergencyBrakeFlag = false; /*hamowanie nagle*/ + bool EmergencyBrakeFlag = false; // manual emergency brake + bool RadioStopFlag = false; /*hamowanie nagle*/ int BrakeDelayFlag = 0; /*nastawa opoznienia ham. osob/towar/posp/exp 0/1/2/4*/ int BrakeDelays = 0; /*nastawy mozliwe do uzyskania*/ int BrakeOpModeFlag = 0; /*nastawa trybu pracy PS/PN/EP/MED 1/2/4/8*/ @@ -1082,7 +1083,7 @@ public: bool IncManualBrakeLevel(int CtrlSpeed); bool DecManualBrakeLevel(int CtrlSpeed); bool DynamicBrakeSwitch(bool Switch); - bool EmergencyBrakeSwitch(bool Switch); + bool RadiostopSwitch(bool Switch); bool AntiSlippingBrake(void); bool BrakeReleaser(int state); bool SwitchEPBrake(int state); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 1a1a0cfa..e338b93d 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2188,7 +2188,7 @@ void TMoverParameters::SecuritySystemCheck(double dt) // obsady // poza tym jest zdefiniowany we wszystkich 3 członach EN57 if ((!Radio)) - EmergencyBrakeSwitch(false); + RadiostopSwitch(false); if ((SecuritySystem.SystemType > 0) && (SecuritySystem.Status > 0) && (Battery)) // Ra: EZT ma teraz czuwak w rozrządczym @@ -2259,7 +2259,7 @@ void TMoverParameters::SecuritySystemCheck(double dt) } else if (!Battery) { // wyłączenie baterii deaktywuje sprzęt - EmergencyBrakeSwitch(false); + RadiostopSwitch(false); // SecuritySystem.Status = 0; //deaktywacja czuwaka } } @@ -2777,14 +2777,14 @@ bool TMoverParameters::DynamicBrakeSwitch(bool Switch) // Q: 20160711 // włączenie / wyłączenie hamowania awaryjnego // ************************************************************************************************* -bool TMoverParameters::EmergencyBrakeSwitch(bool Switch) +bool TMoverParameters::RadiostopSwitch(bool Switch) { bool EBS; if ((BrakeSystem != Individual) && (BrakeCtrlPosNo > 0)) { - if ((!EmergencyBrakeFlag) && Switch) + if ((!RadioStopFlag) && Switch) { - EmergencyBrakeFlag = Switch; + RadioStopFlag = Switch; EBS = true; } else @@ -2792,7 +2792,7 @@ bool TMoverParameters::EmergencyBrakeSwitch(bool Switch) if ((abs(V) < 0.1) && (Switch == false)) // odblokowanie hamulca bezpieczenistwa tylko po zatrzymaniu { - EmergencyBrakeFlag = Switch; + RadioStopFlag = Switch; EBS = true; } else @@ -3283,7 +3283,7 @@ void TMoverParameters::UpdatePipePressure(double dt) } // if(EmergencyBrakeFlag)and(BrakeCtrlPosNo=0)then //ulepszony hamulec bezp. - if ((EmergencyBrakeFlag) || (TestFlag(SecuritySystem.Status, s_SHPebrake)) || + if ((RadioStopFlag) || (TestFlag(SecuritySystem.Status, s_SHPebrake)) || (TestFlag(SecuritySystem.Status, s_CAebrake)) || (s_CAtestebrake == true) || (TestFlag(EngDmgFlag, 32)) /* or (not Battery)*/) // ulepszony hamulec bezp. @@ -8266,7 +8266,7 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "Emergency_brake") { - if (EmergencyBrakeSwitch(floor(CValue1) == 1)) // YB: czy to jest potrzebne? + if (RadiostopSwitch(floor(CValue1) == 1)) // YB: czy to jest potrzebne? OK = true; else OK = false; diff --git a/Model3d.cpp b/Model3d.cpp index 802e918e..41834753 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -842,23 +842,18 @@ struct ToLower }; TSubModel *TSubModel::GetFromName(std::string const &search, bool i) -{ - return GetFromName(search.c_str(), i); -}; - -TSubModel *TSubModel::GetFromName(char const *search, bool i) { TSubModel *result; // std::transform(search.begin(),search.end(),search.begin(),ToLower()); // search=search.LowerCase(); // AnsiString name=AnsiString(); - std::string search_lc = std::string(search); + std::string search_lc = search; if (i) std::transform(search_lc.begin(), search_lc.end(), search_lc.begin(), ::tolower); std::string pName_lc = pName; if (i) std::transform(pName_lc.begin(), pName_lc.end(), pName_lc.begin(), ::tolower); - if (pName.size() && search) + if (pName.size() && search.size()) if (pName_lc == search_lc) return this; if (Next) @@ -1147,23 +1142,19 @@ TModel3d::TModel3d() Root = NULL; iFlags = 0; iSubModelsCount = 0; - iModel = NULL; // tylko jak wczytany model binarny iNumVerts = 0; // nie ma jeszcze wierzchołków }; -TModel3d::~TModel3d() -{ - // SafeDeleteArray(Materials); - if (iFlags & 0x0200) - { // wczytany z pliku tekstowego, submodele sprzątają same - SafeDelete(Root); // submodele się usuną rekurencyjnie +TModel3d::~TModel3d() { + + if (iFlags & 0x0200) { + // wczytany z pliku tekstowego, submodele sprzątają same + Root = nullptr; } - else - { // wczytano z pliku binarnego (jest właścicielem tablic) - Root = nullptr; - delete[] iModel; // usuwamy cały wczytany plik i to wystarczy - } - // później się jeszcze usuwa obiekt z którego dziedziczymy tabelę VBO + else { + // wczytano z pliku binarnego (jest właścicielem tablic) + SafeDeleteArray( Root ); // submodele się usuną rekurencyjnie + } }; TSubModel *TModel3d::AddToNamed(const char *Name, TSubModel *SubModel) @@ -1190,16 +1181,16 @@ void TModel3d::AddTo(TSubModel *tmp, TSubModel *SubModel) iFlags |= 0x0200; // submodele są oddzielne }; -TSubModel *TModel3d::GetFromName(const char *sName) +TSubModel *TModel3d::GetFromName(std::string const &Name) { // wyszukanie submodelu po nazwie - if (!sName) + if (Name.empty()) return Root; // potrzebne do terenu z E3D if (iFlags & 0x0200) // wczytany z pliku tekstowego, wyszukiwanie rekurencyjne - return Root ? Root->GetFromName(sName) : nullptr; + return Root ? Root->GetFromName(Name) : nullptr; else // wczytano z pliku binarnego, można wyszukać iteracyjnie { // for (int i=0;iGetFromName(sName) : nullptr; + return Root ? Root->GetFromName(Name) : nullptr; } }; @@ -1455,7 +1446,6 @@ void TSubModel::deserialize(std::istream &s) void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) { Root = nullptr; - float4x4 *tm = nullptr; if( m_geometrybank == null_handle ) { m_geometrybank = GfxRenderer.Create_Bank(); } @@ -1478,7 +1468,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) iSubModelsCount = (int)sm_cnt; Root = new TSubModel[sm_cnt]; size_t pos = s.tellg(); - for (size_t i = 0; i < sm_cnt; i++) + for (size_t i = 0; i < sm_cnt; ++i) { s.seekg(pos + sm_size * i); Root[i].deserialize(s); @@ -1493,18 +1483,13 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) size_t vt_cnt = size / 32; iNumVerts = (int)vt_cnt; m_nVertexCount = (int)vt_cnt; -#ifdef EU07_USE_OLD_VERTEXBUFFER - assert( m_pVNT == nullptr ); - m_pVNT = new basic_vertex[vt_cnt]; -#else m_pVNT.resize( vt_cnt ); -#endif for (size_t i = 0; i < vt_cnt; i++) m_pVNT[i].deserialize(s); */ - // we rely on the SUB chunk coming before the vertex data, and on the overall vertex count matching the size of data in the chunk + // we rely on the SUB chunk coming before the vertex data, and on the overall vertex count matching the size of data in the chunk. // geometry associated with chunks isn't stored in the same order as the chunks themselves, so we need to sort that out first - std::vector< std::pair > submodeloffsets; + std::vector< std::pair > submodeloffsets; // vertex data offset, submodel index submodeloffsets.reserve( iSubModelsCount ); for( int submodelindex = 0; submodelindex < iSubModelsCount; ++submodelindex ) { auto const &submodel = Root[ submodelindex ]; @@ -1551,23 +1536,23 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) } else if (type == MAKE_ID4('T', 'R', 'A', '0')) { - if (tm != nullptr) - throw std::runtime_error("e3d: duplicated TRA chunk"); + if( false == Matrices.empty() ) + throw std::runtime_error("e3d: duplicated TRA chunk"); size_t t_cnt = size / 64; - tm = new float4x4[t_cnt]; - for (size_t i = 0; i < t_cnt; i++) - tm[i].deserialize_float32(s); + Matrices.resize(t_cnt); + for (size_t i = 0; i < t_cnt; ++i) + Matrices[i].deserialize_float32(s); } else if (type == MAKE_ID4('T', 'R', 'A', '1')) { - if (tm != nullptr) - throw std::runtime_error("e3d: duplicated TRA chunk"); + if( false == Matrices.empty() ) + throw std::runtime_error("e3d: duplicated TRA chunk"); size_t t_cnt = size / 128; - tm = new float4x4[t_cnt]; - for (size_t i = 0; i < t_cnt; i++) - tm[i].deserialize_float64(s); + Matrices.resize( t_cnt ); + for (size_t i = 0; i < t_cnt; ++i) + Matrices[i].deserialize_float64(s); } else if (type == MAKE_ID4('T', 'E', 'X', '0')) { @@ -1589,17 +1574,10 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) if (!Root) throw std::runtime_error("e3d: no submodels"); -/* -#ifdef EU07_USE_OLD_VERTEXBUFFER - if (!m_pVNT) -#else - if(m_pVNT.empty() ) -#endif - throw std::runtime_error("e3d: no vertices"); -*/ - for (size_t i = 0; (int)i < iSubModelsCount; ++i) + + for (size_t i = 0; (int)i < iSubModelsCount; ++i) { - Root[i].BinInit( Root, tm, &Textures, &Names, dynamic ); + Root[i].BinInit( Root, Matrices.data(), &Textures, &Names, dynamic ); if (Root[i].ChildGet()) Root[i].ChildGet()->Parent = &Root[i]; diff --git a/Model3d.h b/Model3d.h index 395bf40a..181bd93a 100644 --- a/Model3d.h +++ b/Model3d.h @@ -172,8 +172,7 @@ public: void SetTranslate(vector3 vNewTransVector); void SetTranslate(float3 vNewTransVector); void SetRotateIK1(float3 vNewAngles); - TSubModel * GetFromName(std::string const &search, bool i = true); - TSubModel * GetFromName(char const *search, bool i = true); + TSubModel * GetFromName( std::string const &search, bool i = true ); inline float4x4 * GetMatrix() { return fMatrix; }; inline void Hide() { iVisible = 0; }; @@ -232,7 +231,7 @@ public: // Ra: tymczasowo private: std::vector Textures; // nazwy tekstur std::vector Names; // nazwy submodeli - int *iModel; // zawartość pliku binarnego + std::vector Matrices; // submodel matrices int iSubModelsCount; // Ra: używane do tworzenia binarnych std::string asBinary; // nazwa pod którą zapisać model binarny std::string m_filename; @@ -240,7 +239,7 @@ public: inline TSubModel * GetSMRoot() { return (Root); }; TModel3d(); ~TModel3d(); - TSubModel * GetFromName(const char *sName); + TSubModel * GetFromName(std::string const &Name); TSubModel * AddToNamed(const char *Name, TSubModel *SubModel); void AddTo(TSubModel *tmp, TSubModel *SubModel); void LoadFromTextFile(std::string const &FileName, bool dynamic); diff --git a/PyInt.cpp b/PyInt.cpp index 5203afbb..6d91a24b 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -446,7 +446,7 @@ void TPythonScreens::init(cParser &parser, TModel3d *model, std::string const &n >> asPyClassName; std::string subModelName = ToLower( asSubModelName ); std::string pyClassName = ToLower( asPyClassName ); - TSubModel *subModel = model->GetFromName(subModelName.c_str()); + TSubModel *subModel = model->GetFromName(subModelName); if (subModel == NULL) { WriteLog( "Python Screen: submodel " + subModelName + " not found - Ignoring screen" ); diff --git a/Track.cpp b/Track.cpp index dddd9e59..bee712aa 100644 --- a/Track.cpp +++ b/Track.cpp @@ -778,145 +778,127 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) } } +// TODO: refactor this mess bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2) { bool bError = false; - if (!evEvent0) - { - if (NewEvent0) - { + + if( NewEvent0 == nullptr ) { + if( false == asEvent0Name.empty() ) { + ErrorLog( "Bad event: event \"" + asEvent0Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + bError = true; + } + } + else { + if( evEvent0 == nullptr ) { evEvent0 = NewEvent0; asEvent0Name = ""; iEvents |= 1; // sumaryczna informacja o eventach } - else - { - if (!asEvent0Name.empty()) - { - ErrorLog("Bad track: Event0 \"" + asEvent0Name + - "\" does not exist"); - bError = true; - } + else { + ErrorLog( "Bad track: event \"" + NewEvent0->asName + "\" cannot be assigned to track, track already has one" ); + bError = true; } } - else - { - ErrorLog( "Bad track: Event0 cannot be assigned to track, track already has one"); - bError = true; + + if( NewEvent1 == nullptr ) { + if( false == asEvent1Name.empty() ) { + ErrorLog( "Bad event: event \"" + asEvent1Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + bError = true; + } } - if (!evEvent1) - { - if (NewEvent1) - { + else { + if( evEvent1 == nullptr ) { evEvent1 = NewEvent1; asEvent1Name = ""; iEvents |= 2; // sumaryczna informacja o eventach } - else if (!asEvent1Name.empty()) - { // Ra: tylko w logu informacja - ErrorLog("Bad track: Event1 \"" + asEvent1Name + "\" does not exist"); + else { + ErrorLog( "Bad track: event \"" + NewEvent1->asName + "\" cannot be assigned to track, track already has one" ); bError = true; } } - else - { - ErrorLog("Bad track: Event1 cannot be assigned to track, track already has one"); - bError = true; + + if( NewEvent2 == nullptr ) { + if( false == asEvent2Name.empty() ) { + ErrorLog( "Bad event: event \"" + asEvent2Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + bError = true; + } } - if (!evEvent2) - { - if (NewEvent2) - { + else { + if( evEvent2 == nullptr ) { evEvent2 = NewEvent2; asEvent2Name = ""; iEvents |= 4; // sumaryczna informacja o eventach } - else if (!asEvent2Name.empty()) - { // Ra: tylko w logu informacja - ErrorLog("Bad track: Event2 \"" + asEvent2Name + "\" does not exist"); + else { + ErrorLog( "Bad track: event \"" + NewEvent2->asName + "\" cannot be assigned to track, track already has one" ); bError = true; } } - else - { - ErrorLog("Bad track: Event2 cannot be assigned to track, track already has one"); - bError = true; - } - return !bError; + + return ( bError == false ); } bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2) { bool bError = false; - if (!evEventall0) - { - if (NewEvent0) - { + + if( NewEvent0 == nullptr ) { + if( false == asEventall0Name.empty() ) { + ErrorLog( "Bad event: event \"" + asEventall0Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + bError = true; + } + } + else { + if( evEventall0 == nullptr ) { evEventall0 = NewEvent0; asEventall0Name = ""; iEvents |= 8; // sumaryczna informacja o eventach } - else - { - if (!asEvent0Name.empty()) - { - Error("Eventall0 \"" + asEventall0Name + - "\" does not exist"); - bError = true; - } + else { + ErrorLog( "Bad track: event \"" + NewEvent0->asName + "\" cannot be assigned to track, track already has one" ); + bError = true; } } - else - { - Error("Eventall0 cannot be assigned to track, track already has one"); - bError = true; + + if( NewEvent1 == nullptr ) { + if( false == asEventall1Name.empty() ) { + ErrorLog( "Bad event: event \"" + asEventall1Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + bError = true; + } } - if (!evEventall1) - { - if (NewEvent1) - { - evEventall1 = NewEvent1; + else { + if( evEventall1 == nullptr ) { + evEventall1 = NewEvent0; asEventall1Name = ""; iEvents |= 16; // sumaryczna informacja o eventach } - else - { - if (!asEvent0Name.empty()) - { // Ra: tylko w logu informacja - WriteLog("Eventall1 \"" + asEventall1Name + "\" does not exist"); - bError = true; - } + else { + ErrorLog( "Bad track: event \"" + NewEvent1->asName + "\" cannot be assigned to track, track already has one" ); + bError = true; } } - else - { - Error("Eventall1 cannot be assigned to track, track already has one"); - bError = true; + + if( NewEvent2 == nullptr ) { + if( false == asEventall2Name.empty() ) { + ErrorLog( "Bad event: event \"" + asEventall2Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + bError = true; + } } - if (!evEventall2) - { - if (NewEvent2) - { - evEventall2 = NewEvent2; + else { + if( evEventall2 == nullptr ) { + evEventall2 = NewEvent0; asEventall2Name = ""; iEvents |= 32; // sumaryczna informacja o eventach } - else - { - if (!asEvent0Name.empty()) - { // Ra: tylko w logu informacja - WriteLog("Eventall2 \"" + asEventall2Name + - "\" does not exist"); - bError = true; - } + else { + ErrorLog( "Bad track: event \"" + NewEvent2->asName + "\" cannot be assigned to track, track already has one" ); + bError = true; } } - else - { - Error("Eventall2 cannot be assigned to track, track already has one"); - bError = true; - } - return !bError; + + return ( bError == false ); } bool TTrack::AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus) @@ -1079,8 +1061,10 @@ bool TTrack::InMovement() if (!SwitchExtension->CurrentIndex) return false; // 0=zablokowana się nie animuje // trzeba każdorazowo porównywać z kątem modelu - TAnimContainer *ac = - SwitchExtension->pModel ? SwitchExtension->pModel->GetContainer(NULL) : NULL; + TAnimContainer *ac = ( + SwitchExtension->pModel ? + SwitchExtension->pModel->GetContainer() : + nullptr ); return ac ? (ac->AngleGet() != SwitchExtension->fOffset) || !(ac->TransGet() == SwitchExtension->vTrans) : @@ -1090,10 +1074,7 @@ bool TTrack::InMovement() } return false; }; -void TTrack::RaAssign(TGroundNode *gn, TAnimContainer *ac){ - // Ra: wiązanie toru z modelem obrotnicy - // if (eType==tt_Table) SwitchExtension->pAnim=p; -}; + void TTrack::RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined) { // Ra: wiązanie toru z modelem obrotnicy if (eType == tt_Table) @@ -1104,8 +1085,8 @@ void TTrack::RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joi SwitchExtension->evPlus = joined; // event potwierdzenia połączenia (gdy nie znajdzie, to się nie połączy) if (am) - if (am->GetContainer(NULL)) // może nie być? - am->GetContainer(NULL)->EventAssign(done); // zdarzenie zakończenia animacji + if (am->GetContainer()) // może nie być? + am->GetContainer()->EventAssign(done); // zdarzenie zakończenia animacji } }; @@ -2172,9 +2153,10 @@ TTrack * TTrack::RaAnimate() SwitchExtension->CurrentIndex) // 0=zablokowana się nie animuje { // trzeba każdorazowo porównywać z kątem modelu // //pobranie kąta z modelu - TAnimContainer *ac = SwitchExtension->pModel ? - SwitchExtension->pModel->GetContainer(NULL) : - NULL; // pobranie głównego submodelu + TAnimContainer *ac = ( + SwitchExtension->pModel ? + SwitchExtension->pModel->GetContainer() : // pobranie głównego submodelu + nullptr ); if (ac) if ((ac->AngleGet() != SwitchExtension->fOffset) || !(ac->TransGet() == diff --git a/Track.h b/Track.h index 7b791a05..af635859 100644 --- a/Track.h +++ b/Track.h @@ -230,7 +230,6 @@ public: if (SwitchExtension) SwitchExtension->pOwner = o; }; bool InMovement(); // czy w trakcie animacji? - void RaAssign(TGroundNode *gn, TAnimContainer *ac); void RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined); void RaAnimListAdd(TTrack *t); TTrack * RaAnimate(); diff --git a/Train.cpp b/Train.cpp index 5a1e2671..61ca575a 100644 --- a/Train.cpp +++ b/Train.cpp @@ -264,6 +264,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::hornlowactivate, &TTrain::OnCommand_hornlowactivate }, { user_command::hornhighactivate, &TTrain::OnCommand_hornhighactivate }, { user_command::radiotoggle, &TTrain::OnCommand_radiotoggle }, + { user_command::radiostoptest, &TTrain::OnCommand_radiostoptest }, { user_command::generictoggle0, &TTrain::OnCommand_generictoggle }, { user_command::generictoggle1, &TTrain::OnCommand_generictoggle }, { user_command::generictoggle2, &TTrain::OnCommand_generictoggle }, @@ -905,7 +906,7 @@ void TTrain::OnCommand_trainbrakeemergency( TTrain *Train, command_data const &C Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->Handle->GetPos( bh_EB ) ); if( Train->mvOccupied->BrakeCtrlPosNo <= 0.1 ) { // hamulec bezpieczeństwa dla wagonów - Train->mvOccupied->EmergencyBrakeFlag = true; + Train->mvOccupied->RadioStopFlag = true; } } } @@ -2036,6 +2037,10 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; // visual feedback Train->ggLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + // if the light is controlled by 3-way switch, disable marker light + if( Train->ggLeftEndLightButton.SubModel == nullptr ) { + Train->DynamicObject->iLights[ lightsindex ] &= ~TMoverParameters::light::redmarker_left; + } } else { //turn off @@ -2065,6 +2070,10 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const & Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; // visual feedback Train->ggRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + // if the light is controlled by 3-way switch, disable marker light + if( Train->ggRightEndLightButton.SubModel == nullptr ) { + Train->DynamicObject->iLights[ lightsindex ] &= ~TMoverParameters::light::redmarker_right; + } } else { //turn off @@ -2122,13 +2131,29 @@ void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &C // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback - Train->ggLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Train->ggLeftEndLightButton.SubModel != nullptr ) { + Train->ggLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch + // this is crude, but for now will do + Train->ggLeftLightButton.UpdateValue( -1.0, Train->dsbSwitch ); + // if the light is controlled by 3-way switch, disable the headlight + Train->DynamicObject->iLights[ lightsindex ] &= ~TMoverParameters::light::headlight_left; + } } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; // visual feedback - Train->ggLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggLeftEndLightButton.SubModel != nullptr ) { + Train->ggLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + else { + // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch + // this is crude, but for now will do + Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + } } } } @@ -2151,13 +2176,29 @@ void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const & // turn on Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback - Train->ggRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Train->ggRightEndLightButton.SubModel != nullptr ) { + Train->ggRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch + // this is crude, but for now will do + Train->ggRightLightButton.UpdateValue( -1.0, Train->dsbSwitch ); + // if the light is controlled by 3-way switch, disable the headlight + Train->DynamicObject->iLights[ lightsindex ] &= ~TMoverParameters::light::headlight_right; + } } else { //turn off Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; // visual feedback - Train->ggRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggRightEndLightButton.SubModel != nullptr ) { + Train->ggRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + else { + // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch + // this is crude, but for now will do + Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + } } } } @@ -2731,14 +2772,21 @@ void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command ) } } +void TTrain::OnCommand_radiostoptest( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + Train->Dynamic()->RadioStop(); + } +} + void TTrain::OnKeyDown(int cKey) { // naciśnięcie klawisza - bool isEztOer; - isEztOer = ((mvControlled->TrainType == dt_EZT) && (mvControlled->Battery == true) && - (mvControlled->EpFuse == true) && (mvOccupied->BrakeSubsystem == ss_ESt) && - (mvControlled->ActiveDir != 0)); // od yB - // isEztOer=(mvControlled->TrainType==dt_EZT)&&(mvControlled->Mains)&&(mvOccupied->BrakeSubsystem==ss_ESt)&&(mvControlled->ActiveDir!=0); - // isEztOer=((mvControlled->TrainType==dt_EZT)&&(mvControlled->Battery==true)&&(mvControlled->EpFuse==true)&&(mvOccupied->BrakeSubsystem==Oerlikon)&&(mvControlled->ActiveDir!=0)); + bool const isEztOer = + ( ( mvControlled->TrainType == dt_EZT ) + && ( mvControlled->Battery == true ) + && ( mvControlled->EpFuse == true ) + && ( mvOccupied->BrakeSubsystem == ss_ESt ) + && ( mvControlled->ActiveDir != 0 ) ); // od yB if (Global::shiftState) { // wciśnięty [Shift] diff --git a/Train.h b/Train.h index 2b4b4595..e795650e 100644 --- a/Train.h +++ b/Train.h @@ -188,6 +188,7 @@ class TTrain static void OnCommand_hornlowactivate( TTrain *Train, command_data const &Command ); static void OnCommand_hornhighactivate( TTrain *Train, command_data const &Command ); static void OnCommand_radiotoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_radiostoptest( TTrain *Train, command_data const &Command ); static void OnCommand_generictoggle( TTrain *Train, command_data const &Command ); // members diff --git a/command.cpp b/command.cpp index f297c6be..d2bd0fca 100644 --- a/command.cpp +++ b/command.cpp @@ -62,6 +62,7 @@ commanddescription_sequence Commands_descriptions = { { "hornlowactivate", command_target::vehicle }, { "hornhighactivate", command_target::vehicle }, { "radiotoggle", command_target::vehicle }, + { "radiostoptest", command_target::vehicle }, /* const int k_FailedEngineCutOff = 35; */ @@ -118,10 +119,6 @@ const int k_ProgramHelp = 48; { "interiorlightdimtoggle", command_target::vehicle }, { "instrumentlighttoggle", command_target::vehicle }, /* -const int k_Univ1 = 66; -const int k_Univ2 = 67; -const int k_Univ3 = 68; -const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; */ diff --git a/command.h b/command.h index 239b145e..0b2c4ba4 100644 --- a/command.h +++ b/command.h @@ -57,6 +57,7 @@ enum class user_command { hornlowactivate, hornhighactivate, radiotoggle, + radiostoptest, /* const int k_FailedEngineCutOff = 35; */ diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 959d3648..7db76e4e 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -250,6 +250,8 @@ keyboard_input::default_bindings() { { GLFW_KEY_A | keymodifier::shift }, // radiotoggle { GLFW_KEY_R | keymodifier::control }, + // radiostoptest + { GLFW_KEY_R | keymodifier::shift | keymodifier::control }, // viewturn { -1 }, // movevector diff --git a/parser.cpp b/parser.cpp index c7bbebd5..465b1d7b 100644 --- a/parser.cpp +++ b/parser.cpp @@ -21,32 +21,32 @@ http://mozilla.org/MPL/2.0/. // cParser -- generic class for parsing text data. // constructors -cParser::cParser( std::string const &Stream, buffertype const Type, std::string Path, bool const Loadtraction ) -{ - LoadTraction = Loadtraction; +cParser::cParser( std::string const &Stream, buffertype const Type, std::string Path, bool const Loadtraction ) : + mPath(Path), + LoadTraction( Loadtraction ) { // build comments map mComments.insert(commentmap::value_type("/*", "*/")); mComments.insert(commentmap::value_type("//", "\n")); // mComments.insert(commentmap::value_type("--","\n")); //Ra: to chyba nie używane // store to calculate sub-sequent includes from relative path - mPath = Path; if( Type == buffertype::buffer_FILE ) { mFile = Stream; } // reset pointers and attach proper type of buffer - switch (Type) - { - case buffer_FILE: - Path.append(Stream); - mStream = new std::ifstream(Path.c_str()); - break; - case buffer_TEXT: - mStream = new std::istringstream(Stream); - break; - default: - mStream = NULL; + switch (Type) { + case buffer_FILE: { + Path.append( Stream ); + mStream = std::make_shared( Path ); + break; + } + case buffer_TEXT: { + mStream = std::make_shared( Stream ); + break; + } + default: { + break; + } } - mIncludeParser = NULL; // calculate stream size if (mStream) { @@ -56,19 +56,14 @@ cParser::cParser( std::string const &Stream, buffertype const Type, std::string else { mSize = mStream->rdbuf()->pubseekoff( 0, std::ios_base::end ); mStream->rdbuf()->pubseekoff( 0, std::ios_base::beg ); + mLine = 1; } } - else - mSize = 0; } // destructor -cParser::~cParser() -{ - if (mIncludeParser) - delete mIncludeParser; - if (mStream) - delete mStream; +cParser::~cParser() { + mComments.clear(); } @@ -157,7 +152,7 @@ std::string cParser::readToken(bool ToLower, const char *Break) // see if there's include parsing going on. clean up when it's done. if (mIncludeParser) { - token = (*mIncludeParser).readToken(ToLower, Break); + token = mIncludeParser->readToken(ToLower, Break); if (!token.empty()) { pos = token.find("(p"); @@ -182,13 +177,12 @@ std::string cParser::readToken(bool ToLower, const char *Break) } else { - delete mIncludeParser; mIncludeParser = NULL; parameters.clear(); } } // get the token yourself if there's no child to delegate it to. - char c; + char c { 0 }; do { while (mStream->peek() != EOF && strchr(Break, c = mStream->get()) == NULL) @@ -201,6 +195,10 @@ std::string cParser::readToken(bool ToLower, const char *Break) if (trimComments(token)) // don't glue together words separated with comment break; } + if( c == '\n' ) { + // update line counter + ++mLine; + } } while (token == "" && mStream->peek() != EOF); // double check to deal with trailing spaces // launch child parser if include directive found. // NOTE: parameter collecting uses default set of token separators. @@ -218,16 +216,18 @@ std::string cParser::readToken(bool ToLower, const char *Break) && (parameter.compare("end") != 0) ) { parameters.push_back(parameter); - parameter = readToken(ToLower); + parameter = readToken(false); } // if (trtest2.find("tr/")!=0) - mIncludeParser = new cParser(includefile, buffer_FILE, mPath, LoadTraction); + mIncludeParser = std::make_shared(includefile, buffer_FILE, mPath, LoadTraction); if (mIncludeParser->mSize <= 0) ErrorLog("Missed include: " + includefile); } - else - while (token.compare("end") != 0) - token = readToken(ToLower); + else { + while( token.compare( "end" ) != 0 ) { + token = readToken( true ); // minimize risk of case mismatch on comparison + } + } token = readToken(ToLower, Break); } return token; @@ -235,8 +235,12 @@ std::string cParser::readToken(bool ToLower, const char *Break) std::string cParser::readQuotes(char const Quote) { // read the stream until specified char or stream end std::string token = ""; - char c; + char c { 0 }; while( mStream->peek() != EOF && Quote != (c = mStream->get()) ) { // get all chars until the quote mark + if( c == '\n' ) { + // update line counter + ++mLine; + } token += c; } return token; @@ -244,9 +248,16 @@ std::string cParser::readQuotes(char const Quote) { // read the stream until spe void cParser::skipComment( std::string const &Endmark ) { // pobieranie znaków aż do znalezienia znacznika końca std::string input = ""; + char c { 0 }; auto const endmarksize = Endmark.size(); - while( mStream->peek() != EOF ) { // o ile nie koniec pliku - input += mStream->get(); // pobranie znaku + while( mStream->peek() != EOF ) { + // o ile nie koniec pliku + c = mStream->get(); // pobranie znaku + if( c == '\n' ) { + // update line counter + ++mLine; + } + input += c; if( input.find( Endmark ) != std::string::npos ) // szukanie znacznika końca break; if( input.size() >= endmarksize ) { @@ -302,7 +313,7 @@ std::size_t cParser::countTokens( std::string const &Stream, std::string Path ) std::size_t cParser::count() { std::string token; - size_t count{ 0 }; + size_t count { 0 }; do { token = ""; token = readToken( false ); @@ -319,8 +330,16 @@ void cParser::addCommentStyle( std::string const &Commentstart, std::string cons // returns name of currently open file, or empty string for text type stream std::string -cParser::Name() { +cParser::Name() const { if( mIncludeParser ) { return mIncludeParser->Name(); } else { return mPath + mFile; } } + +// returns number of currently processed line +std::size_t +cParser::Line() const { + + if( mIncludeParser ) { return mIncludeParser->Line(); } + else { return mLine; } +} diff --git a/parser.h b/parser.h index 982959ef..5709d16c 100644 --- a/parser.h +++ b/parser.h @@ -78,7 +78,9 @@ class cParser //: public std::stringstream // add custom definition of text which should be ignored when retrieving tokens void addCommentStyle( std::string const &Commentstart, std::string const &Commentend ); // returns name of currently open file, or empty string for text type stream - std::string Name(); + std::string Name() const; + // returns number of currently processed line + std::size_t Line() const; private: // methods: @@ -90,13 +92,14 @@ class cParser //: public std::stringstream std::size_t count(); // members: bool LoadTraction; // load traction? - std::istream *mStream; // relevant kind of buffer is attached on creation. + std::shared_ptr mStream; // relevant kind of buffer is attached on creation. std::string mFile; // name of the open file, if any std::string mPath; // path to open stream, for relative path lookups. - std::streamoff mSize; // size of open stream, for progress report. + std::streamoff mSize { 0 }; // size of open stream, for progress report. + std::size_t mLine { 0 }; // currently processed line typedef std::map commentmap; commentmap mComments; - cParser *mIncludeParser; // child class to handle include directives. + std::shared_ptr mIncludeParser; // child class to handle include directives. std::vector parameters; // parameter list for included file. std::deque tokens; }; diff --git a/version.h b/version.h index 7525fac4..1334935a 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 828 -#define VERSION_REVISION 0 +#define VERSION_MINOR 829 +#define VERSION_REVISION 1 From 61e8b8a906b19399e74ed2b9f7dbeacd4166a515 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 31 Aug 2017 19:43:55 +0200 Subject: [PATCH 179/426] build 170831. scan table fixes, emergency brake control, mouse support for manual brake --- Driver.cpp | 51 +++++++++++++++--------- McZapkie/MOVER.h | 3 +- McZapkie/Mover.cpp | 60 +++++++++++++++++++--------- Train.cpp | 97 ++++++++++++++++++++++++++++++++++++++-------- Train.h | 4 ++ command.cpp | 3 ++ command.h | 3 ++ keyboardinput.cpp | 6 +++ mouseinput.cpp | 5 ++- translation.h | 1 + version.h | 4 +- 11 files changed, 179 insertions(+), 58 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index d6ace476..e4bc70d2 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -376,9 +376,15 @@ void TSpeedPos::Set(TTrack *track, double dist, int flag) fVelNext = (trTrack->iCategoryFlag & 1) ? 0.0 : 20.0; // jeśli koniec, to pociąg stój, a samochód zwolnij +/* vPos = (((iFlags & spReverse) != 0) != ((iFlags & spEnd) != 0)) ? trTrack->CurrentSegment()->FastGetPoint_1() : trTrack->CurrentSegment()->FastGetPoint_0(); +*/ + vPos = + ( iFlags & spReverse ) ? + trTrack->CurrentSegment()->FastGetPoint_1() : + trTrack->CurrentSegment()->FastGetPoint_0(); } }; @@ -648,8 +654,9 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) else { // definitywny koniec skanowania, chyba że dalej puszczamy samochód po gruncie... if( ( iLast == -1 ) - || ( false == TestFlag( sSpeedTable[iLast].iFlags, spEnabled | spEnd ) ) ) { - // only if we haven't already marked end of the track + || ( ( false == TestFlag( sSpeedTable[iLast].iFlags, spEnabled | spEnd ) ) + && ( sSpeedTable[iLast].trTrack != tLast ) ) ) { + // only if we haven't already marked end of the track and if the new track doesn't duplicate last one if( TableAddNew() ) { // zapisanie ostatniego sprawdzonego toru sSpeedTable[iLast].Set( @@ -659,6 +666,11 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) spEnabled | spEnd )); } } + else if( sSpeedTable[ iLast ].trTrack == tLast ) { + // otherwise just mark the last added track as the final one + // TODO: investigate exactly how we can wind up not marking the last existing track as actual end + sSpeedTable[ iLast ].iFlags |= spEnd; + } // to ostatnia pozycja, bo NULL nic nie da, a może się podpiąć obrotnica, czy jakieś transportery return; } @@ -703,7 +715,7 @@ void TController::TableCheck(double fDistance) } if (sSpeedTable[i].iFlags & spTrack) // jeśli odcinek { - if (sSpeedTable[i].fDist < -fLength) // a skład wyjechał całą długością poza + if (sSpeedTable[i].fDist + sSpeedTable[i].trTrack->Length() < -fLength) // a skład wyjechał całą długością poza { // degradacja pozycji sSpeedTable[i].iFlags &= ~spEnabled; // nie liczy się } @@ -996,10 +1008,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } } // koniec obsługi W4 v = sSpeedTable[i].fVelNext; // odczyt prędkości do zmiennej pomocniczej - if (sSpeedTable[i].iFlags & - spSwitch) // zwrotnice są usuwane z tabelki dopiero po zjechaniu z nich - iDrivigFlags |= - moveSwitchFound; // rozjazd z przodu/pod ogranicza np. sens skanowania wstecz + if( sSpeedTable[ i ].iFlags & spSwitch ) { + // zwrotnice są usuwane z tabelki dopiero po zjechaniu z nich + iDrivigFlags |= moveSwitchFound; // rozjazd z przodu/pod ogranicza np. sens skanowania wstecz + } else if (sSpeedTable[i].iFlags & spEvent) // W4 może się deaktywować { // jeżeli event, może być potrzeba wysłania komendy, aby ruszył // sprawdzanie eventów pasywnych miniętych @@ -1270,12 +1282,13 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else if (sSpeedTable[i].iFlags & spTrack) // jeśli tor { // tor ogranicza prędkość, dopóki cały skład nie przejedzie, // d=fLength+d; //zamiana na długość liczoną do przodu - if (v >= 1.0) // EU06 się zawieszało po dojechaniu na koniec toru postojowego - if (d < -fLength) + if( v >= 1.0 ) // EU06 się zawieszało po dojechaniu na koniec toru postojowego + if( d + sSpeedTable[ i ].trTrack->Length() < -fLength ) continue; // zapętlenie, jeśli już wyjechał za ten odcinek - if (v < fVelDes) - fVelDes = - v; // ograniczenie aktualnej prędkości aż do wyjechania za ograniczenie + if( v < fVelDes ) { + // ograniczenie aktualnej prędkości aż do wyjechania za ograniczenie + fVelDes = v; + } // if (v==0.0) fAcc=-0.9; //hamowanie jeśli stop continue; // i tyle wystarczy } @@ -1298,8 +1311,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } // if (v>=0.0) if (fNext >= 0.0) { // jeśli ograniczenie - if ((sSpeedTable[i].iFlags & (spEnabled | spEvent)) == - (spEnabled | spEvent)) // tylko sygnał przypisujemy + if ((sSpeedTable[i].iFlags & (spEnabled | spEvent)) == (spEnabled | spEvent)) // tylko sygnał przypisujemy if (!eSignNext) // jeśli jeszcze nic nie zapisane tam eSignNext = sSpeedTable[i].evEvent; // dla informacji if (fNext == 0.0) @@ -3590,7 +3602,7 @@ TController::UpdateSituation(double dt) { // czy stan się nie zmienił. // 4. Ewentualnie uzupełnić tabelkę informacjami o sygnałach i ograniczeniach, jeśli się // "zużyła". - TableCheck(routescanrange); // wypełnianie tabelki i aktualizacja odległości + TableCheck( routescanrange ); // wypełnianie tabelki i aktualizacja odległości // 5. Sprawdzić stany sygnalizacji zapisanej w tabelce, wyznaczyć prędkości. // 6. Z tabelki wyznaczyć krytyczną odległość i prędkość (najmniejsze przyspieszenie). // 7. Jeśli jest inny pojazd z przodu, ewentualnie skorygować odległość i prędkość. @@ -4664,9 +4676,12 @@ TController::UpdateSituation(double dt) { // Ra 2F1H: jest konflikt histerezy pomiędzy nastawioną pozycją a uzyskiwanym // przyspieszeniem - utrzymanie pozycji powoduje przekroczenie przyspieszenia if( AbsAccS < AccDesired ) { - // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz - if( vel < VelDesired - fVelMinus ) { - // jeśli prędkość w kierunku czoła jest mniejsza od dozwolonej o margines + // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz... + if( vel < ( + VelDesired == 1.0 ? // work around for trains getting stuck on tracks with speed limit = 1 + VelDesired : + VelDesired - fVelMinus ) ) { + // ...jeśli prędkość w kierunku czoła jest mniejsza od dozwolonej o margines if( ( ActualProximityDist > ( mvOccupied->CategoryFlag & 2 ? fMinProximityDist : // cars are allowed to move within min proximity distance diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 68a331cb..bcb743c9 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -867,7 +867,7 @@ public: /* int BrakeStatus = b_off; //0 - odham, 1 - ham., 2 - uszk., 4 - odluzniacz, 8 - antyposlizg, 16 - uzyte EP, 32 - pozycja R, 64 - powrot z R */ - bool EmergencyBrakeFlag = false; // manual emergency brake + bool AlarmChainFlag = false; // manual emergency brake bool RadioStopFlag = false; /*hamowanie nagle*/ int BrakeDelayFlag = 0; /*nastawa opoznienia ham. osob/towar/posp/exp 0/1/2/4*/ int BrakeDelays = 0; /*nastawy mozliwe do uzyskania*/ @@ -1084,6 +1084,7 @@ public: bool DecManualBrakeLevel(int CtrlSpeed); bool DynamicBrakeSwitch(bool Switch); bool RadiostopSwitch(bool Switch); + bool AlarmChainSwitch( bool const State ); bool AntiSlippingBrake(void); bool BrakeReleaser(int state); bool SwitchEPBrake(int state); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index e338b93d..53453b95 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1082,7 +1082,7 @@ void TMoverParameters::CollisionDetect(int CouplerN, double dt) EventFlag = true; if ((coupler.CouplingFlag & ctrain_pneumatic) == ctrain_pneumatic) - EmergencyBrakeFlag = true; // hamowanie nagle - zerwanie przewodow hamulcowych + AlarmChainFlag = true; // hamowanie nagle - zerwanie przewodow hamulcowych coupler.CouplingFlag = 0; switch (CouplerN) // wyzerowanie flag podlaczenia ale ciagle sa wirtualnie polaczone @@ -2780,31 +2780,46 @@ bool TMoverParameters::DynamicBrakeSwitch(bool Switch) bool TMoverParameters::RadiostopSwitch(bool Switch) { bool EBS; - if ((BrakeSystem != Individual) && (BrakeCtrlPosNo > 0)) - { - if ((!RadioStopFlag) && Switch) - { + if( ( BrakeSystem != Individual ) + && ( BrakeCtrlPosNo > 0 ) ) { + + if( ( true == Switch ) + && ( false == RadioStopFlag ) ) { RadioStopFlag = Switch; EBS = true; } - else - { - if ((abs(V) < 0.1) && - (Switch == false)) // odblokowanie hamulca bezpieczenistwa tylko po zatrzymaniu - { + else { + if( ( Switch == false ) + && ( std::abs( V ) < 0.1 ) ) { + // odblokowanie hamulca bezpieczenistwa tylko po zatrzymaniu RadioStopFlag = Switch; EBS = true; } - else + else { EBS = false; + } } } - else - EBS = false; // nie ma hamulca bezpieczenstwa gdy nie ma hamulca zesp. + else { + // nie ma hamulca bezpieczenstwa gdy nie ma hamulca zesp. + EBS = false; + } return EBS; } +bool TMoverParameters::AlarmChainSwitch( bool const State ) { + + bool stateswitched { false }; + + if( AlarmChainFlag != State ) { + // simple routine for the time being + AlarmChainFlag = State; + stateswitched = true; + } + return stateswitched; +} + // ************************************************************************************************* // Q: 20160710 // hamowanie przeciwpoślizgowe @@ -3282,12 +3297,19 @@ void TMoverParameters::UpdatePipePressure(double dt) Pipe2->Flow(dpMainValve); } - // if(EmergencyBrakeFlag)and(BrakeCtrlPosNo=0)then //ulepszony hamulec bezp. - if ((RadioStopFlag) || (TestFlag(SecuritySystem.Status, s_SHPebrake)) || - (TestFlag(SecuritySystem.Status, s_CAebrake)) || - (s_CAtestebrake == true) || - (TestFlag(EngDmgFlag, 32)) /* or (not Battery)*/) // ulepszony hamulec bezp. - dpMainValve = dpMainValve + PF(0, PipePress, 0.15) * dt; + // ulepszony hamulec bezp. + if( ( true == RadioStopFlag ) + || ( true == AlarmChainFlag ) + || ( true == TestFlag( SecuritySystem.Status, s_SHPebrake ) ) + || ( true == TestFlag( SecuritySystem.Status, s_CAebrake ) ) +/* + // NOTE: disabled because 32 is 'load destroyed' flag, what does this have to do with emergency brake? + // (if it's supposed to be broken coupler, such event sets alarmchainflag instead when appropriate) + || ( true == TestFlag( EngDmgFlag, 32 ) ) +*/ + || ( true == s_CAtestebrake ) ) { + dpMainValve = dpMainValve + PF( 0, PipePress, 0.15 ) * dt; + } // 0.2*Spg Pipe->Flow(-dpMainValve); Pipe->Flow(-(PipePress)*0.001 * dt); diff --git a/Train.cpp b/Train.cpp index 61ca575a..c6f54547 100644 --- a/Train.cpp +++ b/Train.cpp @@ -217,6 +217,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::trainbrakeservice, &TTrain::OnCommand_trainbrakeservice }, { user_command::trainbrakefullservice, &TTrain::OnCommand_trainbrakefullservice }, { user_command::trainbrakeemergency, &TTrain::OnCommand_trainbrakeemergency }, + { user_command::manualbrakeincrease, &TTrain::OnCommand_manualbrakeincrease }, + { user_command::manualbrakedecrease, &TTrain::OnCommand_manualbrakedecrease }, + { user_command::alarmchaintoggle, &TTrain::OnCommand_alarmchaintoggle }, { user_command::wheelspinbrakeactivate, &TTrain::OnCommand_wheelspinbrakeactivate }, { user_command::sandboxactivate, &TTrain::OnCommand_sandboxactivate }, { user_command::epbrakecontroltoggle, &TTrain::OnCommand_epbrakecontroltoggle }, @@ -836,7 +839,7 @@ void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Co void TTrain::OnCommand_trainbrakerelease( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { // sound feedback if( ( Train->is_eztoer() ) @@ -851,7 +854,7 @@ void TTrain::OnCommand_trainbrakerelease( TTrain *Train, command_data const &Com void TTrain::OnCommand_trainbrakefirstservice( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { // sound feedback if( ( Train->is_eztoer() ) @@ -866,7 +869,7 @@ void TTrain::OnCommand_trainbrakefirstservice( TTrain *Train, command_data const void TTrain::OnCommand_trainbrakeservice( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { // sound feedback if( ( Train->is_eztoer() ) @@ -879,14 +882,14 @@ void TTrain::OnCommand_trainbrakeservice( TTrain *Train, command_data const &Com Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->BrakeCtrlPosNo / 2 + ( Train->mvOccupied->BrakeHandle == FV4a ? - 1 : - 0 ) ); + 1 : + 0 ) ); } } void TTrain::OnCommand_trainbrakefullservice( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { // sound feedback if( ( Train->is_eztoer() ) @@ -901,13 +904,58 @@ void TTrain::OnCommand_trainbrakefullservice( TTrain *Train, command_data const void TTrain::OnCommand_trainbrakeemergency( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->Handle->GetPos( bh_EB ) ); +/* if( Train->mvOccupied->BrakeCtrlPosNo <= 0.1 ) { // hamulec bezpieczeństwa dla wagonów Train->mvOccupied->RadioStopFlag = true; } +*/ + } +} + +void TTrain::OnCommand_manualbrakeincrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + if( ( Train->mvOccupied->LocalBrake == ManualBrake ) + || ( Train->mvOccupied->MBrake == true ) ) { + + Train->mvOccupied->IncManualBrakeLevel( 1 ); + } + } +} + +void TTrain::OnCommand_manualbrakedecrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + if( ( Train->mvOccupied->LocalBrake == ManualBrake ) + || ( Train->mvOccupied->MBrake == true ) ) { + + Train->mvOccupied->DecManualBrakeLevel( 1 ); + } + } +} + +void TTrain::OnCommand_alarmchaintoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + if( false == Train->mvOccupied->AlarmChainFlag ) { + // pull + Train->mvOccupied->AlarmChainSwitch( true ); + // visual feedback + Train->ggAlarmChain.UpdateValue( 1.0 ); + } + else { + // release + Train->mvOccupied->AlarmChainSwitch( false ); + // visual feedback + Train->ggAlarmChain.UpdateValue( 0.0 ); + } } } @@ -2871,6 +2919,7 @@ void TTrain::OnKeyDown(int cKey) } else // McZapkie-240302 - klawisze bez shifta { +#ifdef EU07_USE_OLD_COMMAND_SYSTEM if( cKey == Global::Keys[ k_IncLocalBrakeLevel ] ) { // Ra 2014-09: w // trybie latania @@ -2883,10 +2932,8 @@ void TTrain::OnKeyDown(int cKey) { mvOccupied->IncManualBrakeLevel(1); } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (mvOccupied->LocalBrake != ManualBrake) mvOccupied->IncLocalBrakeLevel(1); -#endif } } else if (cKey == Global::Keys[k_DecLocalBrakeLevel]) @@ -2899,16 +2946,15 @@ void TTrain::OnKeyDown(int cKey) if (Global::ctrlState) if ((mvOccupied->LocalBrake == ManualBrake) || (mvOccupied->MBrake == true)) mvOccupied->DecManualBrakeLevel(1); -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - // odhamować jakoś trzeba if ((mvOccupied->LocalBrake != ManualBrake) || mvOccupied->LocalBrakePos) mvOccupied->DecLocalBrakeLevel(1); -#endif } } - else if (cKey == Global::Keys[k_Brake2]) - { + else +#endif + if (cKey == Global::Keys[k_Brake2]) { if (Global::ctrlState) mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos(bh_NP)); // yB: czy ten stos funkcji nie powinien być jako oddzielna funkcja movera? @@ -6414,6 +6460,7 @@ void TTrain::clear_cab_controls() ggBrakeCtrl.Clear(); ggLocalBrake.Clear(); ggManualBrake.Clear(); + ggAlarmChain.Clear(); ggBrakeProfileCtrl.Clear(); ggBrakeProfileG.Clear(); ggBrakeProfileR.Clear(); @@ -6541,8 +6588,8 @@ void TTrain::clear_cab_controls() ggRearUpperLightButton.Clear(); ggRearLeftEndLightButton.Clear(); ggRearRightEndLightButton.Clear(); - btHaslerBrakes.Clear(12); // ciśnienie w cylindrach do odbijania na haslerze - btHaslerCurrent.Clear(13); // prąd na silnikach do odbijania na haslerze + btHaslerBrakes.Clear(12); // ciśnienie w cylindrach do odbijania na haslerze + btHaslerCurrent.Clear(13); // prąd na silnikach do odbijania na haslerze } // NOTE: we can get rid of this function once we have per-cab persistent state @@ -6642,10 +6689,20 @@ void TTrain::set_cab_controls() { ggUpperLightButton.PutValue( 1.0 ); } if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_left ) != 0 ) { - ggLeftEndLightButton.PutValue( 1.0 ); + if( ggLeftEndLightButton.SubModel != nullptr ) { + ggLeftEndLightButton.PutValue( 1.0 ); + } + else { + ggLeftLightButton.PutValue( -1.0 ); + } } if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_right ) != 0 ) { - ggRightEndLightButton.PutValue( 1.0 ); + if( ggRightEndLightButton.SubModel != nullptr ) { + ggRightEndLightButton.PutValue( 1.0 ); + } + else { + ggRightLightButton.PutValue( -1.0 ); + } } if( true == DynamicObject->DimHeadlights ) { ggDimHeadlightsButton.PutValue( 1.0 ); @@ -6691,6 +6748,11 @@ void TTrain::set_cab_controls() { 1.0 : 0.0 ); } + // alarm chain + ggAlarmChain.PutValue( + mvControlled->AlarmChainFlag ? + 1.0 : + 0.0 ); // brake signalling ggSignallingButton.PutValue( mvControlled->Signalling ? @@ -6959,6 +7021,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "brakectrl:", ggBrakeCtrl }, { "localbrake:", ggLocalBrake }, { "manualbrake:", ggManualBrake }, + { "alarmchain:", ggAlarmChain }, { "brakeprofile_sw:", ggBrakeProfileCtrl }, { "brakeprofileg_sw:", ggBrakeProfileG }, { "brakeprofiler_sw:", ggBrakeProfileR }, diff --git a/Train.h b/Train.h index e795650e..90a5ac6d 100644 --- a/Train.h +++ b/Train.h @@ -141,6 +141,9 @@ class TTrain static void OnCommand_trainbrakeservice( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakefullservice( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakeemergency( TTrain *Train, command_data const &Command ); + static void OnCommand_manualbrakeincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_manualbrakedecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_alarmchaintoggle( TTrain *Train, command_data const &Command ); static void OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const &Command ); static void OnCommand_sandboxactivate( TTrain *Train, command_data const &Command ); static void OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const &Command ); @@ -228,6 +231,7 @@ public: // reszta może by?publiczna TGauge ggBrakeCtrl; TGauge ggLocalBrake; TGauge ggManualBrake; + TGauge ggAlarmChain; TGauge ggBrakeProfileCtrl; // nastawiacz GPR - przelacznik obrotowy TGauge ggBrakeProfileG; // nastawiacz GP - hebelek towarowy TGauge ggBrakeProfileR; // nastawiacz PR - hamowanie dwustopniowe diff --git a/command.cpp b/command.cpp index d2bd0fca..3f4b6f56 100644 --- a/command.cpp +++ b/command.cpp @@ -41,6 +41,9 @@ commanddescription_sequence Commands_descriptions = { { "trainbrakeservice", command_target::vehicle }, { "trainbrakefullservice", command_target::vehicle }, { "trainbrakeemergency", command_target::vehicle }, + { "manualbrakeincrease", command_target::vehicle }, + { "manualbrakedecrease", command_target::vehicle }, + { "alarmchaintoggle", command_target::vehicle }, { "wheelspinbrakeactivate", command_target::vehicle }, { "sandboxactivate", command_target::vehicle }, { "reverserincrease", command_target::vehicle }, diff --git a/command.h b/command.h index 0b2c4ba4..a06509e5 100644 --- a/command.h +++ b/command.h @@ -36,6 +36,9 @@ enum class user_command { trainbrakeservice, trainbrakefullservice, trainbrakeemergency, + manualbrakeincrease, + manualbrakedecrease, + alarmchaintoggle, wheelspinbrakeactivate, sandboxactivate, reverserincrease, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 7db76e4e..cc7041c4 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -208,6 +208,12 @@ keyboard_input::default_bindings() { { GLFW_KEY_KP_2 }, // trainbrakeemergency { GLFW_KEY_KP_0 }, + // manualbrakeincrease + { GLFW_KEY_KP_1 | keymodifier::control }, + // manualbrakedecrease + { GLFW_KEY_KP_7 | keymodifier::control }, + // alarm chain toggle + { GLFW_KEY_B | keymodifier::shift | keymodifier::control }, // wheelspinbrakeactivate, { GLFW_KEY_KP_ENTER }, // sandboxactivate, diff --git a/mouseinput.cpp b/mouseinput.cpp index e5b8c1de..3709740c 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -211,7 +211,10 @@ mouse_input::default_bindings() { user_command::independentbrakeincrease, user_command::independentbrakedecrease } }, { "manualbrake:", { - user_command::none, + user_command::manualbrakeincrease, + user_command::manualbrakedecrease } }, + { "alarmchain:", { + user_command::alarmchaintoggle, user_command::none } }, { "brakeprofile_sw:", { user_command::brakeactingspeedincrease, diff --git a/translation.h b/translation.h index c18a865b..297f35cf 100644 --- a/translation.h +++ b/translation.h @@ -24,6 +24,7 @@ static std::unordered_map m_cabcontrols = { { "brakectrl:", "train brake" }, { "localbrake:", "independent brake" }, { "manualbrake:", "manual brake" }, + { "alarmchain:", "emergency brake" }, { "brakeprofile_sw:", "brake acting speed" }, { "brakeprofileg_sw:", "brake acting speed: cargo" }, { "brakeprofiler_sw:", "brake acting speed: rapid" }, diff --git a/version.h b/version.h index 1334935a..5b91b3dc 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 829 -#define VERSION_REVISION 1 +#define VERSION_MINOR 831 +#define VERSION_REVISION 0 From fa8881f52f45fe324cf6695f46680a76471332b4 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 1 Sep 2017 15:21:31 +0200 Subject: [PATCH 180/426] ai braking logic tweaks --- Driver.cpp | 56 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index e4bc70d2..25f89d9d 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2376,7 +2376,7 @@ bool TController::IncBrake() } else { if( mvOccupied->BrakeCtrlPos + 1 == mvOccupied->BrakeCtrlPosNo ) { - if (AccDesired < -1.5) // hamowanie nagle + if (AccDesired < -0.75) // hamowanie nagle OK = mvOccupied->BrakeLevelAdd(1.0); else OK = false; @@ -4396,9 +4396,12 @@ TController::UpdateSituation(double dt) { if (ActualProximityDist < fMaxProximityDist) { // jak minął już maksymalny dystans po prostu hamuj (niski stopień) // ma stanąć, a jest w drodze hamowania albo ma jechać +/* VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); - if( VelDesired == 0.0 ) { +*/ + if( VelNext == 0.0 ) { // hamowanie tak, aby stanąć + VelDesired = VelNext; AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); AccDesired = std::min( AccDesired, fAccThreshold ); } @@ -4423,10 +4426,17 @@ TController::UpdateSituation(double dt) { else { // jest bliżej niż fMinProximityDist // utrzymuj predkosc bo juz blisko +/* VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); - if( vel <= VelNext + fVelPlus ) { +*/ + if( VelNext == 0.0 ) { + VelDesired = VelNext; + } + else { + if( vel <= VelNext + fVelPlus ) { // jeśli niewielkie przekroczenie, ale ma jechać - AccDesired = std::max( 0.0, AccPreferred ); // to olej (zacznij luzować) + AccDesired = std::max( 0.0, AccPreferred ); // to olej (zacznij luzować) + } } ReactionTime = 0.1; // i orientuj się szybciej } @@ -4527,7 +4537,7 @@ TController::UpdateSituation(double dt) { } if( ( true == mvOccupied->RadioStopFlag ) // radio-stop - && ( mvOccupied->Vel > 0.0 ) ) { // and still moving + && ( mvOccupied->Vel > 0.0 ) ) { // and still moving // if the radio-stop was issued don't waste effort trying to fight it while( true == DecSpeed() ) { ; } // just throttle down... return; // ...and don't touch any other controls @@ -4576,15 +4586,15 @@ TController::UpdateSituation(double dt) { mvOccupied->BrakeLevelSet( 0 ); } if( ( mvOccupied->PipePress < 3.0 ) - && ( AccDesired > -0.03 ) ) { + && ( AccDesired > -0.03 ) ) { mvOccupied->BrakeReleaser( 1 ); } if( ( mvOccupied->BrakeCtrlPos == 0 ) - && ( AbsAccS < 0.0 ) - && ( AccDesired > -0.03 ) ) { + && ( AbsAccS < 0.0 ) + && ( AccDesired > -0.03 ) ) { if( ( mvOccupied->EqvtPipePress < 4.95 ) - && ( fReady > 0.35 ) ) { // a reszta składu jest na to gotowa + && ( fReady > 0.35 ) ) { // a reszta składu jest na to gotowa if( iDrivigFlags & moveOerlikons ) { // napełnianie w Oerlikonie @@ -4598,7 +4608,7 @@ TController::UpdateSituation(double dt) { } if( ( mvOccupied->BrakeCtrlPos < 0 ) - && ( mvOccupied->EqvtPipePress > ( + && ( mvOccupied->EqvtPipePress > ( fReady < 0.25 ? 5.1 : 5.2 ) ) ) { @@ -4613,7 +4623,7 @@ TController::UpdateSituation(double dt) { AnsiString(VelNext)); #endif if( ( vel < 10.0 ) - && ( AccDesired > 0.1 ) ) { + && ( AccDesired > 0.1 ) ) { // Ra 2F1H: jeśli prędkość jest mała, a można przyspieszać, // to nie ograniczać przyspieszenia do 0.5m/ss // przy małych prędkościach może być trudno utrzymać @@ -4621,7 +4631,7 @@ TController::UpdateSituation(double dt) { } // małe przyspieszenie // Ra 2F1I: wyłączyć kiedyś to uśrednianie i przeanalizować skanowanie, czemu migocze - if (AccDesired > -0.15) // hamowania lepeiej nie uśredniać + if (AccDesired > -0.05) // hamowania lepeiej nie uśredniać AccDesired = fAccDesiredAv = 0.2 * AccDesired + 0.8 * fAccDesiredAv; // uśrednione, żeby ograniczyć migotanie @@ -4644,7 +4654,7 @@ TController::UpdateSituation(double dt) { // on slopes disengage the brakes only if you actually intend to accelerate while( true == DecBrake() ) { ; } // jeśli przyspieszamy, to nie hamujemy if( ( mvOccupied->BrakePress > 0.4 ) - && ( mvOccupied->Hamulec->GetCRP() > 4.9 ) ) { + && ( mvOccupied->Hamulec->GetCRP() > 4.9 ) ) { // wyluzuj lokomotywę, to szybciej ruszymy mvOccupied->BrakeReleaser( 1 ); } @@ -4660,11 +4670,11 @@ TController::UpdateSituation(double dt) { // margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest większa od 5km/h if( false == TestFlag( iDrivigFlags, movePress ) ) { // jeśli nie dociskanie - if( AccDesired < -0.1 ) { + if( AccDesired < -0.05 ) { while( true == DecSpeed() ) { ; } // jeśli hamujemy, to nie przyspieszamy } else if( ( vel > VelDesired ) - || ( fAccGravity < -0.01 ? + || ( fAccGravity < -0.01 ? AccDesired < 0.0 : AbsAccS > AccDesired ) ) { // jak za bardzo przyspiesza albo prędkość przekroczona @@ -4699,8 +4709,8 @@ TController::UpdateSituation(double dt) { // właściwie, to warunek powinien być na działający EP // Ra: to dobrze hamuje EP w EZT if( ( AccDesired <= fAccThreshold ) // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold - && ( ( AbsAccS > AccDesired ) - || ( mvOccupied->BrakeCtrlPos < 0 ) ) ) { + && ( ( AbsAccS > AccDesired ) + || ( mvOccupied->BrakeCtrlPos < 0 ) ) ) { // hamować bardziej, gdy aktualne opóźnienie hamowania mniejsze niż (AccDesired) IncBrake(); } @@ -4727,11 +4737,11 @@ TController::UpdateSituation(double dt) { else { // a stara wersja w miarę dobrze działa na składy wagonowe if( ( ( fAccGravity < -0.05 ) && ( vel < 0.0 ) ) - || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { + || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { // u góry ustawia się hamowanie na fAccThreshold if( ( fBrakeTime < 0.0 ) - || ( AccDesired < fAccGravity - 0.5 ) - || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { + || ( AccDesired < fAccGravity - 0.75 ) + || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował if( true == IncBrake() ) { fBrakeTime = @@ -4764,9 +4774,9 @@ TController::UpdateSituation(double dt) { // instead of releasing the brakes and creeping into obstacle at 1-2 km/h if( mvControlling->CategoryFlag == 2 ) { if( ( VelDesired == 0.0 ) - && ( vel > VelDesired ) - && ( ActualProximityDist <= fMinProximityDist ) - && ( mvOccupied->LocalBrakePos == 0 ) ) { + && ( vel > VelDesired ) + && ( ActualProximityDist <= fMinProximityDist ) + && ( mvOccupied->LocalBrakePos == 0 ) ) { IncBrake(); } } From 5d7206b3693d39804517d425f0f0317f37b645b9 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 2 Sep 2017 17:18:26 +0200 Subject: [PATCH 181/426] scan table improvements from refs/remotes/firleju/mover_in_c++ --- Driver.cpp | 355 +++++++++++++++++++++++++++++------------------------ Driver.h | 28 ++++- DynObj.cpp | 2 + mtable.cpp | 27 ++++ mtable.h | 1 + version.h | 2 +- 6 files changed, 252 insertions(+), 163 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 25f89d9d..85c35407 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -106,10 +106,57 @@ std::string StopReasonTable[] = { "Error", // stopError //z powodu błędu w obliczeniu drogi hamowania }; +double GetDistanceToEvent(TTrack* track, TEvent* event, double scan_dir, double start_dist, int iter = 0, bool back = false) +{ + std::shared_ptr segment = track->CurrentSegment(); + vector3 pos_event = event->PositionGet(); + double len1, len2; + double sd = scan_dir; + double seg_len = scan_dir > 0 ? 0.0 : 1.0; + double dzielnik = 1.0 / segment->GetLength();// rozdzielczosc mniej wiecej 1m + int krok = 0; // krok obliczeniowy do sprawdzania czy odwracamy + len2 = (pos_event - segment->FastGetPoint(seg_len)).Length(); + do + { + len1 = len2; + seg_len += scan_dir > 0 ? dzielnik : -dzielnik; + len2 = (pos_event - segment->FastGetPoint(seg_len)).Length(); + krok++; + } while ((len1 > len2) && (seg_len >= dzielnik && (seg_len <= (1 - dzielnik)))); + //trzeba sprawdzić czy seg_len nie osiągnął skrajnych wartości, bo wtedy + // trzeba sprawdzić tor obok + if (1 == krok) + sd = -sd; // jeśli tylko jeden krok tzn, że event przy poprzednim sprawdzaym torze + if (((seg_len <= dzielnik) || (seg_len > (1 - dzielnik))) && (iter < 3)) + { // przejście na inny tor + track = track->Neightbour(int(sd), sd); + start_dist += (1 == krok) ? 0 : back ? -segment->GetLength() : segment->GetLength(); + return GetDistanceToEvent(track, event, sd, start_dist, ++iter, 1 == krok ? true : false); + } + else + { // obliczenie mojego toru + seg_len -= scan_dir > 0 ? dzielnik : -dzielnik; //trzeba wrócić do pozycji len1 + seg_len = scan_dir < 0 ? 1 - seg_len : seg_len; + seg_len = back ? 1 - seg_len : seg_len; // odwracamy jeśli idzie do tyłu + start_dist -= back ? segment->GetLength() : 0; + return start_dist + (segment->GetLength() * seg_len); + } +}; + //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- +TSpeedPos::TSpeedPos(TTrack *track, double dist, int flag) +{ + Set(track, dist, flag); +}; + +TSpeedPos::TSpeedPos(TEvent *event, double dist, TOrders order) +{ + Set(event, dist, order); +}; + void TSpeedPos::Clear() { iFlags = 0; // brak flag to brak reakcji @@ -187,64 +234,10 @@ void TSpeedPos::CommandCheck() } }; -bool TSpeedPos::Update(vector3 *p, vector3 *dir, double &len ) -{ // przeliczenie odległości od punktu (*p), w kierunku (*dir), zaczynając od pojazdu - // dla kolejnych pozycji podawane są współrzędne poprzedniego obiektu w (*p) - vector3 v = vPos - *p; // wektor od poprzedniego obiektu (albo pojazdu) do punktu zmiany - fDist = v.Length(); // długość wektora to odległość pomiędzy czołem a sygnałem albo początkiem toru - if (len == 0.0) - { // jeżeli liczymy względem pojazdu - double angle; - if( dir ) { - angle = - glm::dot( - glm::normalize( glm::make_vec3( &v.x ) ), // towards target - glm::normalize( glm::make_vec3( &dir->x ) ) ); // orientation at scan point - } - else { - angle = fDist; - } - if (angle < 0.0) // iloczyn skalarny jest ujemny, gdy punkt jest z tyłu - { // jeśli coś jest z tyłu, to dokładna odległość nie ma już większego znaczenia - fDist = -fDist; // potrzebne do badania wyjechania składem poza ograniczenie - if (iFlags & spElapsed) { - // jeśli minięty (musi być minięty również przez końcówkę składu) - // NOTE: empty branch, why? - } - else - { - // minięty - będziemy liczyć odległość względem przeciwnego końca - // toru (nadal może być z przodu i ograniczać) - iFlags ^= spElapsed; - if ((iFlags & (spEnd | spTrack | spEnabled)) == (spTrack | spEnabled)) { - // tylko jeśli (istotny) tor, bo eventy są punktowe - if (trTrack) { - // może być NULL, jeśli koniec toru (????) - vPos = - (iFlags & spReverse) ? - trTrack->CurrentSegment()->FastGetPoint_1() : // drugi koniec istotny - trTrack->CurrentSegment()->FastGetPoint_0(); - } - } - } - } - else { - if( fDist < 50.0 ) { - // old sceneries use trick of placing 'helper' semaphores underground, which can lead to vehicles running over them instead of stopping in front of them - // to account for it at short distances we redo distance calculation on 2d plane - fDist = glm::length( glm::vec3( v.x, 0.0, v.z ) ); - } - } - } - - if (fDist > 0.0) // nie może być 0.0, a przypadkiem mogło by się trafić i było by źle - if ((iFlags & spElapsed) == 0) // 32 ustawione, gdy obiekt już został minięty - { // jeśli obiekt nie został minięty, można od niego zliczać narastająco (inaczej może być - // problem z wektorem kierunku) - len = fDist = len + fDist; // zliczanie dlugości narastająco - *p = vPos; // nowy punkt odniesienia - *dir = Normalize(v); // nowy wektor kierunku od poprzedniego obiektu do aktualnego - } +bool TSpeedPos::Update() +{ + if( fDist < 0.0 ) + iFlags |= spElapsed; // trzeba zazanaczyć, że minięty if (iFlags & spTrack) // road/track { if (trTrack) { @@ -307,12 +300,6 @@ std::string TSpeedPos::TableText() { // o ile pozycja istotna return "Flags:" + to_hex_str(iFlags, 8) + ", Dist:" + to_string(fDist, 1, 6) + ", Vel:" + (fVelNext == -1.0 ? " - " : to_string(static_cast(fVelNext), 0, 3)) + ", Name:" + GetName(); - //if (iFlags & spTrack) // jeśli tor - // return "Flags=#" + IntToHex(iFlags, 8) + ", Dist=" + FloatToStrF(fDist, ffFixed, 7, 1) + - // ", Vel=" + AnsiString(fVelNext) + ", Track=" + trTrack->NameGet(); - //else if (iFlags & spEvent) // jeśli event - // return "Flags=#" + IntToHex(iFlags, 8) + ", Dist=" + FloatToStrF(fDist, ffFixed, 7, 1) + - // ", Vel=" + AnsiString(fVelNext) + ", Event=" + evEvent->asName; } return "Empty"; } @@ -376,11 +363,6 @@ void TSpeedPos::Set(TTrack *track, double dist, int flag) fVelNext = (trTrack->iCategoryFlag & 1) ? 0.0 : 20.0; // jeśli koniec, to pociąg stój, a samochód zwolnij -/* - vPos = (((iFlags & spReverse) != 0) != ((iFlags & spEnd) != 0)) ? - trTrack->CurrentSegment()->FastGetPoint_1() : - trTrack->CurrentSegment()->FastGetPoint_0(); -*/ vPos = ( iFlags & spReverse ) ? trTrack->CurrentSegment()->FastGetPoint_1() : @@ -455,16 +437,21 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) pTrack = pVehicle->RaTrackGet(); // odcinek, na którym stoi fTrackLength = pVehicle->RaTranslationGet(); // pozycja na tym torze (odległość od Point1) fLastDir = pVehicle->DirectionGet() * pVehicle->RaDirectionGet(); // ustalenie kierunku skanowania na torze - if( fLastDir > 0.0 ) { + double odl_czola_od_wozka = (pVehicle->AxlePositionGet() - pVehicle->RearPosition()).Length(); + if( fLastDir < 0.0 ) { // jeśli w kierunku Point2 toru fTrackLength = pTrack->Length() - fTrackLength; // przeskanowana zostanie odległość do Point2 } + fTrackLength -= odl_czola_od_wozka; + fCurrentDistance = -fLength - fTrackLength; // aktualna odległość ma być ujemna gdyż jesteśmy na końcu składu fLastVel = pTrack->VelocityGet(); // aktualna prędkość sSpeedTable.clear(); iLast = -1; tLast = nullptr; //żaden nie sprawdzony SemNextIndex = -1; SemNextStopIndex = -1; + fTrackLength = pTrack->Length(); //skasowanie zmian w zmiennej żeby poprawnie liczyło w dalszych krokach + MoveDistanceReset(); // AI startuje 1s po zaczęciu jazdy i mógł już coś przejechać } else { if( iTableDirection == 0 ) { return; } @@ -494,21 +481,14 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) } } } + auto const &lastspeedpoint = sSpeedTable[ iLast ]; pTrack = lastspeedpoint.trTrack; assert( pTrack != nullptr ); // flaga ustawiona, gdy Point2 toru jest blizej - fLastDir = ( - TestFlag( lastspeedpoint.iFlags, spReverse ) ? - -1.0 : - 1.0 ); - // aktualna odleglosc do jego Point1 - fCurrentDistance = lastspeedpoint.fDist; - // nie doliczac dlugosci gdy: miniety początek lub jazda do konca toru - fTrackLength = ( - ( ( lastspeedpoint.iFlags & ( spElapsed | spEnd ) ) != 0 ) ? - 0.0 : - pTrack->Length() ); + fLastDir = lastspeedpoint.iFlags & spReverse ? -1.0 : 1.0; + fCurrentDistance = lastspeedpoint.fDist; // aktualna odleglosc do jego Point1 + fTrackLength = pTrack->Length(); } if( iTableDirection == 0 ) { @@ -516,11 +496,6 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) return; } - if( fCurrentDistance >= fDistance ) { - // all done - return; - } - while (fCurrentDistance < fDistance) { if (pTrack != tLast) // ostatni zapisany w tabelce nie był jeszcze sprawdzony @@ -532,70 +507,69 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if( ( pEvent = CheckTrackEvent( fLastDir, pTrack ) ) != nullptr ) // jeśli jest semafor na tym torze { // trzeba sprawdzić tabelkę, bo dodawanie drugi raz tego samego przystanku nie jest korzystne if (TableNotFound(pEvent)) // jeśli nie ma - if( TableAddNew() ) - { - if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "Speed table for " + OwnerName() + " found new event, " + pEvent->asName ); - } - auto &newspeedpoint = sSpeedTable[ iLast ]; - if( newspeedpoint.Set( pEvent, fCurrentDistance, OrderCurrentGet() ) ) { + { + TableAddNew(); // zawsze jest true - fDistance = fCurrentDistance; // jeśli sygnał stop, to nie ma potrzeby dalej skanować - SemNextStopIndex = iLast; - if( SemNextIndex == -1 ) { - SemNextIndex = iLast; - } - if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "(stop signal from " - + ( SemNextStopIndex != -1 ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor" ) - + ")" ); - } + if (Global::iWriteLogEnabled & 8) { + WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->asName); + } + auto &newspeedpoint = sSpeedTable[iLast]; + if (newspeedpoint.Set(pEvent, GetDistanceToEvent(pTrack, pEvent, fLastDir, fCurrentDistance), OrderCurrentGet())) { + + fDistance = newspeedpoint.fDist; // jeśli sygnał stop, to nie ma potrzeby dalej skanować + SemNextStopIndex = iLast; + if (SemNextIndex == -1) { + SemNextIndex = iLast; } - else { - if( ( true == newspeedpoint.IsProperSemaphor( OrderCurrentGet() ) ) - && ( SemNextIndex == -1 ) ) { - SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze - } - if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "(forward signal for " - + ( SemNextIndex != -1 ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor" ) - + ")" ); - } + if (Global::iWriteLogEnabled & 8) { + WriteLog("(stop signal from " + + (SemNextStopIndex != -1 ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor") + + ")"); } } + else { + if ((true == newspeedpoint.IsProperSemaphor(OrderCurrentGet())) + && (SemNextIndex == -1)) { + SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze + } + if (Global::iWriteLogEnabled & 8) { + WriteLog("(forward signal for " + + (SemNextIndex != -1 ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor") + + ")"); + } + } + } } // event dodajemy najpierw, żeby móc sprawdzić, czy tor został dodany po odczytaniu prędkości następnego if( ( pTrack->VelocityGet() == 0.0 ) // zatrzymanie || ( pTrack->iAction ) // jeśli tor ma własności istotne dla skanowania - || ( pTrack->VelocityGet() != fLastVel ) ) { // następuje zmiana prędkości - // odcinek dodajemy do tabelki, gdy jest istotny dla ruchu - if (TableAddNew()) - { // teraz dodatkowo zapamiętanie wybranego segmentu dla skrzyżowania - sSpeedTable[ iLast ].Set( - pTrack, fCurrentDistance, - ( fLastDir < 0 ? - spEnabled | spReverse : - spEnabled ) ); // dodanie odcinka do tabelki z flagą kierunku wejścia - if (pTrack->eType == tt_Cross) { - // na skrzyżowaniach trzeba wybrać segment, po którym pojedzie pojazd - // dopiero tutaj jest ustalany kierunek segmentu na skrzyżowaniu - sSpeedTable[iLast].iFlags |= - ( ( pTrack->CrossSegment( - ( fLastDir < 0 ? - tLast->iPrevDirection : - tLast->iNextDirection ), - iRouteWanted ) & 0xf ) << 28 ); // ostatnie 4 bity pola flag - sSpeedTable[iLast].iFlags &= ~spReverse; // usunięcie flagi kierunku, bo może być błędna - if( sSpeedTable[ iLast ].iFlags < 0 ) { - sSpeedTable[ iLast ].iFlags |= spReverse; // ustawienie flagi kierunku na podstawie wybranego segmentu - } - if( int( fLastDir ) * sSpeedTable[ iLast ].iFlags < 0 ) { - fLastDir = -fLastDir; - } - if( AIControllFlag ) { - // dla AI na razie losujemy kierunek na kolejnym skrzyżowaniu - iRouteWanted = 1 + Random( 3 ); - } + || ( pTrack->VelocityGet() != fLastVel ) ) // następuje zmiana prędkości + { // odcinek dodajemy do tabelki, gdy jest istotny dla ruchu + TableAddNew(); + sSpeedTable[ iLast ].Set( + pTrack, fCurrentDistance, + ( fLastDir < 0 ? + spEnabled | spReverse : + spEnabled ) ); // dodanie odcinka do tabelki z flagą kierunku wejścia + if (pTrack->eType == tt_Cross) { + // na skrzyżowaniach trzeba wybrać segment, po którym pojedzie pojazd + // dopiero tutaj jest ustalany kierunek segmentu na skrzyżowaniu + sSpeedTable[iLast].iFlags |= + ((pTrack->CrossSegment( + (fLastDir < 0 ? + tLast->iPrevDirection : + tLast->iNextDirection), + iRouteWanted) & 0xf) << 28); // ostatnie 4 bity pola flag + sSpeedTable[iLast].iFlags &= ~spReverse; // usunięcie flagi kierunku, bo może być błędna + if (sSpeedTable[iLast].iFlags < 0) { + sSpeedTable[iLast].iFlags |= spReverse; // ustawienie flagi kierunku na podstawie wybranego segmentu + } + if (int(fLastDir) * sSpeedTable[iLast].iFlags < 0) { + fLastDir = -fLastDir; + } + if (AIControllFlag) { + // dla AI na razie losujemy kierunek na kolejnym skrzyżowaniu + iRouteWanted = 1 + Random(3); } } } @@ -626,14 +600,20 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if (pTrack != nullptr ) { // jeśli kolejny istnieje if( tLast != nullptr ) { + + if( ( tLast->VelocityGet() > 0 ) + && ( ( tLast->VelocityGet() < pTrack->VelocityGet() ) + || ( pTrack->VelocityGet() < 0 ) ) ) { +/* if( ( pTrack->VelocityGet() < 0 ? tLast->VelocityGet() > 0 : pTrack->VelocityGet() > tLast->VelocityGet() ) ) { // jeśli kolejny ma większą prędkość niż poprzedni, to zapamiętać poprzedni (do czasu wyjechania) + if( ( ( ( iLast != -1 ) && ( TestFlag( sSpeedTable[ iLast ].iFlags, spEnabled | spTrack ) ) ) ? - ( sSpeedTable[ iLast ].trTrack != tLast ) : - true ) ) { + ( sSpeedTable[ iLast ].trTrack != tLast ) : + true ) ) { // jeśli nie był dodany do tabelki if( TableAddNew() ) { // zapisanie toru z ograniczeniem prędkości @@ -646,6 +626,24 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) spEnabled | spReverse ); } } +*/ + if( ( iLast != -1 ) + && ( sSpeedTable[ iLast ].trTrack == tLast ) ) { + // if the track is already in the table we only need to mark it as relevant + sSpeedTable[ iLast ].iFlags |= spEnabled; + } + else { + // otherwise add it + TableAddNew(); + sSpeedTable[ iLast ].Set( + tLast, + fCurrentDistance - fTrackLength, // by now the current distance points to beginning of next track + ( fLastDir > 0 ? + pTrack->iPrevDirection : + pTrack->iNextDirection ) ? + spEnabled : + spEnabled | spReverse ); + } } } // zwiększenie skanowanej odległości tylko jeśli istnieje dalszy tor @@ -690,32 +688,39 @@ void TController::TableCheck(double fDistance) if( iTableDirection != iDirection ) { // jak zmiana kierunku, to skanujemy od końca składu TableTraceRoute( fDistance, pVehicles[ 1 ] ); + TableSort(); } else if (iTableDirection) { // trzeba sprawdzić, czy coś się zmieniło - vector3 dir = pVehicles[0]->VectorFront() * pVehicles[0]->DirectionGet(); // wektor kierunku jazdy - vector3 pos = pVehicles[0]->HeadPosition(); // zaczynamy od pozycji pojazdu - double len = 0.0; // odległość będziemy zliczać narastająco + for (auto &sp : sSpeedTable) + { + sp.UpdateDistance(MoveDistanceGet()); // aktualizacja odległości dla wszystkich pozycji tabeli + } + MoveDistanceReset(); // kasowanie odległości po aktualizacji tabelki for( int i = 0; i < iLast; ++i ) { // aktualizacja rekordów z wyjątkiem ostatniego if (sSpeedTable[i].iFlags & spEnabled) // jeśli pozycja istotna { - if(sSpeedTable[i].Update( &pos, &dir, len )) + if (sSpeedTable[i].Update()) { if( Global::iWriteLogEnabled & 8 ) { WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->NameGet() + " (generating fresh trace)" ); } - // NOTE: dirty trick to perform scan from the beginning - // a workaround for current routines not preserving properly scan distance if started from the middle - // and the scan extending far beyond specified limit as result - iTableDirection = -iDirection; + // usuwamy wszystko za tym torem + while (sSpeedTable.back().trTrack != sSpeedTable[i].trTrack) + { // usuwamy wszystko dopóki nie trafimy na tą zwrotnicę + sSpeedTable.pop_back(); + --iLast; + } + tLast = sSpeedTable[ i ].trTrack; TableTraceRoute( fDistance, pVehicles[ 1 ] ); + TableSort(); // nie kontynuujemy pętli, trzeba doskanować ciąg dalszy break; } if (sSpeedTable[i].iFlags & spTrack) // jeśli odcinek { - if (sSpeedTable[i].fDist + sSpeedTable[i].trTrack->Length() < -fLength) // a skład wyjechał całą długością poza + if( sSpeedTable[ i ].fDist + sSpeedTable[ i ].trTrack->Length() < -fLength ) // a skład wyjechał całą długością poza { // degradacja pozycji sSpeedTable[i].iFlags &= ~spEnabled; // nie liczy się } @@ -743,10 +748,11 @@ void TController::TableCheck(double fDistance) } } } - sSpeedTable[iLast].Update( &pos, &dir, len ); // aktualizacja ostatniego + sSpeedTable[iLast].Update(); // aktualizacja ostatniego // WriteLog("TableCheck: Upate last track. Dist=" + AnsiString(sSpeedTable[iLast].fDist)); if( sSpeedTable[ iLast ].fDist < fDistance ) { TableTraceRoute( fDistance, pVehicles[ 1 ] ); // doskanowanie dalszego odcinka + TableSort(); } // garbage collection TablePurger(); @@ -777,7 +783,14 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // first 19 chars of the command is expected to be "PassengerStopPoint:" so we skip them if ( ToLower(sSpeedTable[i].evEvent->CommandGet()).compare( 19, sizeof(asNextStop), ToLower(asNextStop)) != 0 ) { // jeśli nazwa nie jest zgodna - if( sSpeedTable[ i ].fDist < -fLength ) { + if (sSpeedTable[i].fDist < 300.0 && sSpeedTable[i].fDist > 0) // tylko jeśli W4 jest blisko, przy dwóch może zaczać szaleć + { + // porównuje do następnej stacji, więc trzeba przewinąć do poprzedniej + // nastepnie ustawić następną na aktualną tak żeby prawidłowo ją obsłużył w następnym kroku + TrainParams->RewindTimeTable(sSpeedTable[i].evEvent->CommandGet()); + asNextStop = TrainParams->NextStop(); + } + else if( sSpeedTable[ i ].fDist < -fLength ) { // jeśli został przejechany sSpeedTable[ i ].iFlags = 0; // to można usunąć (nie mogą być usuwane w skanowaniu) } @@ -1324,7 +1337,8 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN (OrderCurrentGet() & Obey_train)) VelSignalLast = -1.0; // jeśli mieliśmy ograniczenie z semafora i nie ma przed nami - if (VelSignalLast >= 0.0) //analiza spisanych z tabelki ograniczeń i nadpisanie aktualnego + //analiza spisanych z tabelki ograniczeń i nadpisanie aktualnego + if (VelSignalLast >= 0.0) fVelDes = Min0R(fVelDes, VelSignalLast); if (VelLimitLast >= 0.0) fVelDes = Min0R(fVelDes, VelLimitLast); @@ -1340,7 +1354,7 @@ float TController::braking_distance_multiplier( float const Targetvelocity ) { if( Targetvelocity > 65.f ) { return 1.f; } - if( Targetvelocity < 5.f ) { return 1.f; } + if( Targetvelocity < 5.f ) { return 1.f; } // stretch the braking distance up to 3 times; the lower the speed, the greater the stretch return interpolate( 3.f, 1.f, ( Targetvelocity - 5.f ) / 60.f ); } @@ -1404,6 +1418,29 @@ void TController::TablePurger() iLast = sSpeedTable.size() - 1; }; +void TController::TableSort() +{ + TSpeedPos sp_temp = TSpeedPos(); // uzywany do przenoszenia + for (std::size_t i = 0; i < (iLast - 1) && iLast > 0; ++i) + { // pętla tylko do dwóch pozycji od końca bo ostatniej nie modyfikujemy + if (sSpeedTable[i].fDist > sSpeedTable[i + 1].fDist) + { // jesli pozycja wcześniejsza jest dalej to źle + sp_temp = sSpeedTable[i + 1]; + sSpeedTable[i + 1] = sSpeedTable[i]; // zamiana + sSpeedTable[i] = sp_temp; + // jeszcze sprawdzenie czy pozycja nie była indeksowana dla eventów + if (SemNextIndex == i) + ++SemNextIndex; + else if (SemNextIndex == i + 1) + --SemNextIndex; + if (SemNextStopIndex == i) + ++SemNextStopIndex; + else if (SemNextStopIndex == i + 1) + --SemNextStopIndex; + } + } +} + //--------------------------------------------------------------------------- TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, bool primary) :// czy ma aktywnie prowadzić? @@ -2376,7 +2413,7 @@ bool TController::IncBrake() } else { if( mvOccupied->BrakeCtrlPos + 1 == mvOccupied->BrakeCtrlPosNo ) { - if (AccDesired < -0.75) // hamowanie nagle + if (AccDesired < -1.5) // hamowanie nagle OK = mvOccupied->BrakeLevelAdd(1.0); else OK = false; @@ -4740,7 +4777,7 @@ TController::UpdateSituation(double dt) { || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { // u góry ustawia się hamowanie na fAccThreshold if( ( fBrakeTime < 0.0 ) - || ( AccDesired < fAccGravity - 0.75 ) + || ( AccDesired < fAccGravity - 0.5 ) || ( mvOccupied->BrakeCtrlPos <= 0 ) ) { // jeśli upłynął czas reakcji hamulca, chyba że nagłe albo luzował if( true == IncBrake() ) { diff --git a/Driver.h b/Driver.h index ea68da69..dfb24ec8 100644 --- a/Driver.h +++ b/Driver.h @@ -143,8 +143,16 @@ class TSpeedPos void CommandCheck(); public: + TSpeedPos(TTrack *track, double dist, int flag); + TSpeedPos(TEvent *event, double dist, TOrders order); + TSpeedPos() = default; void Clear(); - bool Update(vector3 *p, vector3 *dir, double &len ); + bool Update(); + // aktualizuje odległość we wpisie + inline + void + UpdateDistance( double dist ) { + fDist -= dist; } bool Set(TEvent *e, double d, TOrders order = Wait_for_orders); void Set(TTrack *t, double d, int f); std::string TableText(); @@ -174,7 +182,8 @@ class TController TEvent *eSignSkip = nullptr; // można pominąć ten SBL po zatrzymaniu std::size_t SemNextIndex{ std::size_t(-1) }; std::size_t SemNextStopIndex{ std::size_t( -1 ) }; - private: // parametry aktualnego składu + double dMoveLen = 0.0; // odległość przejechana od ostatniego sprawdzenia tabelki +private: // parametry aktualnego składu double fLength = 0.0; // długość składu (do wyciągania z ograniczeń) double fMass = 0.0; // całkowita masa do liczenia stycznej składowej grawitacji double fAccGravity = 0.0; // przyspieszenie składowej stycznej grawitacji @@ -372,7 +381,20 @@ class TController float braking_distance_multiplier( float const Targetvelocity ); void TablePurger(); -public: + void TableSort(); + inline double MoveDistanceGet() + { + return dMoveLen; + } + inline void MoveDistanceReset() + { + dMoveLen = 0.0; + } + public: + inline void MoveDistanceAdd(double distance) + { + dMoveLen += distance * iDirection; //jak jedzie do tyłu to trzeba uwzględniać, że distance jest ujemna + } std::size_t TableSize() const { return sSpeedTable.size(); } void TableClear(); int TableDirection() { return iTableDirection; } diff --git a/DynObj.cpp b/DynObj.cpp index 3c570da5..f2926f88 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2939,6 +2939,8 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->AccN *= -ABuGetDirection(); */ // if (dDOMoveLen!=0.0) //Ra: nie może być, bo blokuje Event0 + if( Mechanik ) + Mechanik->MoveDistanceAdd( dDOMoveLen ); // dodanie aktualnego przemieszczenia Move(dDOMoveLen); if (!bEnabled) // usuwane pojazdy nie mają toru { // pojazd do usunięcia diff --git a/mtable.cpp b/mtable.cpp index ea9b2a6c..34faea9f 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -104,6 +104,33 @@ bool TTrainParameters::UpdateMTable(double hh, double mm, std::string const &New return OK; /*czy jest nastepna stacja*/ } +void Mtable::TTrainParameters::RewindTimeTable(std::string actualStationName) +{ + //actualStationName = ToLower(actualStationName); // na małe znaki + if (int s = actualStationName.find("PassengerStopPoint:") != std::string::npos) + { + actualStationName = ToLower(actualStationName.substr(s + 19)); + } + for (int i = 1; i <= StationCount; i++) + { // przechodzimy po całej tabelce i sprawdzamy nazwy stacji (bez pierwszej) + if (ToLower(TimeTable[i].StationName) == actualStationName) + { // nazwa stacji zgodna + // więc ustawiamy na poprzednią, żeby w następnym kroku poprawnie obsłużyć + StationIndex = i - 1; + if (StationIndex < + StationCount) // Ra: "<", bo dodaje 1 przy przejściu do następnej stacji + { // jeśli nie ostatnia stacja + NextStationName = TimeTable[StationIndex + 1].StationName; // zapamiętanie nazwy + TTVmax = TimeTable[StationIndex + 1] + .vmax; // Ra: nowa prędkość rozkładowa na kolejnym odcinku + } + else // gdy ostatnia stacja + NextStationName = ""; // nie ma następnej stacji + break; // znaleźliśmy więc kończymy + } + } +} + void TTrainParameters::StationIndexInc() { // przejście do następnej pozycji StationIndex<=StationCount ++StationIndex; diff --git a/mtable.h b/mtable.h index 958a4864..f5471f81 100644 --- a/mtable.h +++ b/mtable.h @@ -76,6 +76,7 @@ class TTrainParameters bool IsTimeToGo(double hh, double mm); bool UpdateMTable(double hh, double mm, std::string const &NewName); bool UpdateMTable( simulation_time const &Time, std::string const &NewName ); + void RewindTimeTable( std::string actualStationName ); TTrainParameters( std::string const &NewTrainName ); void NewName(std::string const &NewTrainName); void UpdateVelocity(int StationCount, double vActual); diff --git a/version.h b/version.h index 5b91b3dc..7043a400 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 831 +#define VERSION_MINOR 902 #define VERSION_REVISION 0 From 244646803812b334546f601bd4206d85b3aeecf1 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 4 Sep 2017 19:08:59 +0200 Subject: [PATCH 182/426] build 170903. scan table fixes, some const correctness improvements --- Driver.cpp | 95 ++++++++++----------------------- Driver.h | 2 +- DynObj.h | 36 ++++++------- Event.cpp | 2 +- Event.h | 2 +- Model3d.cpp | 2 + PyInt.cpp | 4 +- Segment.cpp | 108 ++++++++++++++++++++++++++------------ Segment.h | 148 ++++++++++++++++++++++++++++++---------------------- Track.cpp | 26 +++++---- Track.h | 10 ++-- TrkFoll.cpp | 14 ++--- TrkFoll.h | 4 +- usefull.h | 19 +++++++ version.h | 2 +- 15 files changed, 254 insertions(+), 220 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 85c35407..6c25c34a 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -32,6 +32,20 @@ http://mozilla.org/MPL/2.0/. #define LOGSTOPS 1 #define LOGBACKSCAN 0 #define LOGPRESS 0 + +// finds point of specified track nearest to specified event. returns: distance to that point from the specified end of the track +// TODO: move this to file with all generic routines, too easy to forget it's here and it may come useful +double +ProjectEventOnTrack( TEvent const *Event, TTrack const *Track, double const Direction ) { + + auto const segment = Track->CurrentSegment(); + auto const nearestpoint = segment->find_nearest_point( Event->PositionGet() ); + return ( + Direction > 0 ? + nearestpoint * segment->GetLength() : // measure from point1 + ( 1.0 - nearestpoint ) * segment->GetLength() ); // measure from point2 +}; + /* Moduł obsługujący sterowanie pojazdami (składami pociągów, samochodami). @@ -106,43 +120,6 @@ std::string StopReasonTable[] = { "Error", // stopError //z powodu błędu w obliczeniu drogi hamowania }; -double GetDistanceToEvent(TTrack* track, TEvent* event, double scan_dir, double start_dist, int iter = 0, bool back = false) -{ - std::shared_ptr segment = track->CurrentSegment(); - vector3 pos_event = event->PositionGet(); - double len1, len2; - double sd = scan_dir; - double seg_len = scan_dir > 0 ? 0.0 : 1.0; - double dzielnik = 1.0 / segment->GetLength();// rozdzielczosc mniej wiecej 1m - int krok = 0; // krok obliczeniowy do sprawdzania czy odwracamy - len2 = (pos_event - segment->FastGetPoint(seg_len)).Length(); - do - { - len1 = len2; - seg_len += scan_dir > 0 ? dzielnik : -dzielnik; - len2 = (pos_event - segment->FastGetPoint(seg_len)).Length(); - krok++; - } while ((len1 > len2) && (seg_len >= dzielnik && (seg_len <= (1 - dzielnik)))); - //trzeba sprawdzić czy seg_len nie osiągnął skrajnych wartości, bo wtedy - // trzeba sprawdzić tor obok - if (1 == krok) - sd = -sd; // jeśli tylko jeden krok tzn, że event przy poprzednim sprawdzaym torze - if (((seg_len <= dzielnik) || (seg_len > (1 - dzielnik))) && (iter < 3)) - { // przejście na inny tor - track = track->Neightbour(int(sd), sd); - start_dist += (1 == krok) ? 0 : back ? -segment->GetLength() : segment->GetLength(); - return GetDistanceToEvent(track, event, sd, start_dist, ++iter, 1 == krok ? true : false); - } - else - { // obliczenie mojego toru - seg_len -= scan_dir > 0 ? dzielnik : -dzielnik; //trzeba wrócić do pozycji len1 - seg_len = scan_dir < 0 ? 1 - seg_len : seg_len; - seg_len = back ? 1 - seg_len : seg_len; // odwracamy jeśli idzie do tyłu - start_dist -= back ? segment->GetLength() : 0; - return start_dist + (segment->GetLength() * seg_len); - } -}; - //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -384,7 +361,7 @@ void TController::TableClear() eSignSkip = nullptr; // nic nie pomijamy }; -TEvent * TController::CheckTrackEvent(double fDirection, TTrack *Track) +TEvent * TController::CheckTrackEvent( TTrack *Track, double const fDirection ) const { // sprawdzanie eventów na podanym torze do podstawowego skanowania TEvent *e = (fDirection > 0) ? Track->evEvent2 : Track->evEvent1; if (!e) @@ -444,7 +421,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) } fTrackLength -= odl_czola_od_wozka; fCurrentDistance = -fLength - fTrackLength; // aktualna odległość ma być ujemna gdyż jesteśmy na końcu składu - fLastVel = pTrack->VelocityGet(); // aktualna prędkość + fLastVel = -1.0; // pTrack->VelocityGet(); // aktualna prędkość // changed to -1 to recognize speed limit, if any sSpeedTable.clear(); iLast = -1; tLast = nullptr; //żaden nie sprawdzony @@ -504,7 +481,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) WriteLog( "Speed table for " + OwnerName() + " tracing through track " + pTrack->NameGet() ); } - if( ( pEvent = CheckTrackEvent( fLastDir, pTrack ) ) != nullptr ) // jeśli jest semafor na tym torze + if( ( pEvent = CheckTrackEvent( pTrack, fLastDir ) ) != nullptr ) // jeśli jest semafor na tym torze { // trzeba sprawdzić tabelkę, bo dodawanie drugi raz tego samego przystanku nie jest korzystne if (TableNotFound(pEvent)) // jeśli nie ma { @@ -514,7 +491,10 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->asName); } auto &newspeedpoint = sSpeedTable[iLast]; - if (newspeedpoint.Set(pEvent, GetDistanceToEvent(pTrack, pEvent, fLastDir, fCurrentDistance), OrderCurrentGet())) { + if( newspeedpoint.Set( + pEvent, + fCurrentDistance + ProjectEventOnTrack( pEvent, pTrack, fLastDir ), + OrderCurrentGet() ) ) { fDistance = newspeedpoint.fDist; // jeśli sygnał stop, to nie ma potrzeby dalej skanować SemNextStopIndex = iLast; @@ -604,29 +584,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if( ( tLast->VelocityGet() > 0 ) && ( ( tLast->VelocityGet() < pTrack->VelocityGet() ) || ( pTrack->VelocityGet() < 0 ) ) ) { -/* - if( ( pTrack->VelocityGet() < 0 ? - tLast->VelocityGet() > 0 : - pTrack->VelocityGet() > tLast->VelocityGet() ) ) { - // jeśli kolejny ma większą prędkość niż poprzedni, to zapamiętać poprzedni (do czasu wyjechania) - if( ( ( ( iLast != -1 ) - && ( TestFlag( sSpeedTable[ iLast ].iFlags, spEnabled | spTrack ) ) ) ? - ( sSpeedTable[ iLast ].trTrack != tLast ) : - true ) ) { - // jeśli nie był dodany do tabelki - if( TableAddNew() ) { - // zapisanie toru z ograniczeniem prędkości - sSpeedTable[ iLast ].Set( - tLast, fCurrentDistance, - ( fLastDir > 0 ? - pTrack->iPrevDirection : - pTrack->iNextDirection ) ? - spEnabled : - spEnabled | spReverse ); - } - } -*/ if( ( iLast != -1 ) && ( sSpeedTable[ iLast ].trTrack == tLast ) ) { // if the track is already in the table we only need to mark it as relevant @@ -658,7 +616,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if( TableAddNew() ) { // zapisanie ostatniego sprawdzonego toru sSpeedTable[iLast].Set( - tLast, fCurrentDistance, + tLast, fCurrentDistance - fTrackLength, // by now the current distance points to beginning of next track, ( fLastDir < 0 ? spEnabled | spEnd | spReverse : spEnabled | spEnd )); @@ -692,9 +650,10 @@ void TController::TableCheck(double fDistance) } else if (iTableDirection) { // trzeba sprawdzić, czy coś się zmieniło - for (auto &sp : sSpeedTable) - { - sp.UpdateDistance(MoveDistanceGet()); // aktualizacja odległości dla wszystkich pozycji tabeli + auto const distance = MoveDistanceGet(); + for (auto &sp : sSpeedTable) { + // aktualizacja odległości dla wszystkich pozycji tabeli + sp.UpdateDistance(distance); } MoveDistanceReset(); // kasowanie odległości po aktualizacji tabelki for( int i = 0; i < iLast; ++i ) @@ -4245,7 +4204,7 @@ TController::UpdateSituation(double dt) { 0 : 1 ); // sprzęg z przodu składu if( ( coupler->Connected ) - && ( coupler->CouplingFlag == 0 ) ) { + && ( coupler->CouplingFlag == 0 ) ) { // mamy coś z przodu podłączone sprzęgiem wirtualnym // wyliczanie optymalnego przyspieszenia do jazdy na widoczność ActualProximityDist = std::min( diff --git a/Driver.h b/Driver.h index dfb24ec8..1d6e410e 100644 --- a/Driver.h +++ b/Driver.h @@ -369,7 +369,7 @@ private: // parametry aktualnego składu // double Distance(vector3 &p1, vector3 &n, vector3 &p2); private: // Ra: metody obsługujące skanowanie toru - TEvent *CheckTrackEvent(double fDirection, TTrack *Track); + TEvent *CheckTrackEvent(TTrack *Track, double const fDirection ) const; // bool TableCheckEvent(TEvent *e); bool TableAddNew(); bool TableNotFound(TEvent const *Event) const; diff --git a/DynObj.h b/DynObj.h index 88c9e0ea..04f4bc97 100644 --- a/DynObj.h +++ b/DynObj.h @@ -78,7 +78,7 @@ class TAnimValveGear class TAnimPant { // współczynniki do animacji pantografu public: - vector3 vPos; // Ra: współrzędne punktu zerowego pantografu (X dodatnie dla przedniego) + Math3D::vector3 vPos; // Ra: współrzędne punktu zerowego pantografu (X dodatnie dla przedniego) double fLenL1; // długość dolnego ramienia 1, odczytana z modelu double fLenU1; // długość górnego ramienia 1, odczytana z modelu double fLenL2; // długość dolnego ramienia 2, odczytana z modelu @@ -152,9 +152,9 @@ class TDynamicObject { // klasa pojazdu friend class opengl_renderer; private: // położenie pojazdu w świecie oraz parametry ruchu - vector3 vPosition; // Ra: pozycja pojazdu liczona zaraz po przesunięciu - vector3 vCoulpler[ 2 ]; // współrzędne sprzęgów do liczenia zderzeń czołowych - vector3 vUp, vFront, vLeft; // wektory jednostkowe ustawienia pojazdu + Math3D::vector3 vPosition; // Ra: pozycja pojazdu liczona zaraz po przesunięciu + Math3D::vector3 vCoulpler[ 2 ]; // współrzędne sprzęgów do liczenia zderzeń czołowych + Math3D::vector3 vUp, vFront, vLeft; // wektory jednostkowe ustawienia pojazdu int iDirection; // kierunek pojazdu względem czoła składu (1=zgodny,0=przeciwny) TTrackShape ts; // parametry toru przekazywane do fizyki TTrackParam tp; // parametry toru przekazywane do fizyki @@ -163,14 +163,14 @@ private: // położenie pojazdu w świecie oraz parametry ruchu int iAxleFirst; // numer pierwszej osi w kierunku ruchu (oś wiążąca pojazd z torem i wyzwalająca // eventy) float fAxleDist; // rozstaw wózków albo osi do liczenia proporcji zacienienia - vector3 modelRot; // obrot pudła względem świata - do przeanalizowania, czy potrzebne!!! + Math3D::vector3 modelRot; // obrot pudła względem świata - do przeanalizowania, czy potrzebne!!! // bool bCameraNear; //blisko kamer są potrzebne dodatkowe obliczenia szczegółów TDynamicObject * ABuFindNearestObject( TTrack *Track, TDynamicObject *MyPointer, int &CouplNr ); public: // parametry położenia pojazdu dostępne publicznie std::string asTrack; // nazwa toru początkowego; wywalić? std::string asDestination; // dokąd pojazd ma być kierowany "(stacja):(tor)" - matrix4x4 mMatrix; // macierz przekształcenia do renderowania modeli + Math3D::matrix4x4 mMatrix; // macierz przekształcenia do renderowania modeli TMoverParameters *MoverParameters; // parametry fizyki ruchu oraz przeliczanie // TMoverParameters *pControlled; //wskaźnik do sterowanego członu silnikowego TDynamicObject *NextConnected; // pojazd podłączony od strony sprzęgu 1 (kabina -1) @@ -237,7 +237,7 @@ public: // modele składowe pojazdu void toggle_lights(); // switch light levels for registered interior sections private: // Ra: ciąg dalszy animacji, dopiero do ogarnięcia // ABuWozki 060504 - vector3 bogieRot[2]; // Obroty wozkow w/m korpusu + Math3D::vector3 bogieRot[2]; // Obroty wozkow w/m korpusu TSubModel *smBogie[2]; // Wyszukiwanie max 2 wozkow TSubModel *smWahacze[4]; // wahacze (np. nogi, dźwignia w drezynie) TSubModel *smBrakeMode; // Ra 15-01: nastawa hamulca też @@ -249,7 +249,7 @@ public: // modele składowe pojazdu TSubModel *smBuforLewy[2]; TSubModel *smBuforPrawy[2]; TAnimValveGear *pValveGear; - vector3 vFloor; // podłoga dla ładunku + Math3D::vector3 vFloor; // podłoga dla ładunku public: TAnim *pants; // indeks obiektu animującego dla pantografu 0 double NoVoltTime; // czas od utraty zasilania @@ -264,7 +264,7 @@ public: // modele składowe pojazdu void ABuLittleUpdate(double ObjSqrDist); bool btnOn; // ABu: czy byly uzywane buttony, jesli tak, to po renderingu wylacz // bo ten sam model moze byc jeszcze wykorzystany przez inny obiekt! - double ComputeRadius(vector3 p1, vector3 p2, vector3 p3, vector3 p4); + double ComputeRadius( Math3D::vector3 p1, Math3D::vector3 p2, Math3D::vector3 p3, Math3D::vector3 p4); TButton btCoupler1; // sprzegi TButton btCoupler2; @@ -337,7 +337,7 @@ public: // modele składowe pojazdu double eng_turbo; void ABuBogies(); void ABuModelRoll(); - vector3 modelShake; + Math3D::vector3 modelShake; bool renderme; // yB - czy renderowac // TRealSound sBrakeAcc; //dźwięk przyspieszacza @@ -406,7 +406,7 @@ public: // modele składowe pojazdu int &CouplNr); TDynamicObject * GetFirstDynamic(int cpl_type, int cf = 1); // TDynamicObject* GetFirstCabDynamic(int cpl_type); - void ABuSetModelShake(vector3 mShake); + void ABuSetModelShake( Math3D::vector3 mShake); // McZapkie-010302 TController *Mechanik; @@ -437,31 +437,31 @@ public: // modele składowe pojazdu void Move(double fDistance); void FastMove(double fDistance); void RenderSounds(); - inline vector3 GetPosition() const + inline Math3D::vector3 GetPosition() const { return vPosition; }; - inline vector3 HeadPosition() + inline Math3D::vector3 HeadPosition() { return vCoulpler[iDirection ^ 1]; }; // pobranie współrzędnych czoła - inline vector3 RearPosition() + inline Math3D::vector3 RearPosition() { return vCoulpler[iDirection]; }; // pobranie współrzędnych tyłu - inline vector3 AxlePositionGet() + inline Math3D::vector3 AxlePositionGet() { return iAxleFirst ? Axle1.pPosition : Axle0.pPosition; }; - inline vector3 VectorFront() const + inline Math3D::vector3 VectorFront() const { return vFront; }; - inline vector3 VectorUp() + inline Math3D::vector3 VectorUp() { return vUp; }; - inline vector3 VectorLeft() const + inline Math3D::vector3 VectorLeft() const { return vLeft; }; diff --git a/Event.cpp b/Event.cpp index 1038d1be..42ee01c3 100644 --- a/Event.cpp +++ b/Event.cpp @@ -673,7 +673,7 @@ double TEvent::ValueGet(int n) return 0.0; // inne eventy się nie liczą }; -vector3 TEvent::PositionGet() +vector3 TEvent::PositionGet() const { // pobranie współrzędnych eventu switch (Type) { // diff --git a/Event.h b/Event.h index 4eaebfe1..663efef3 100644 --- a/Event.h +++ b/Event.h @@ -108,7 +108,7 @@ class TEvent // zmienne: ev* std::string CommandGet(); TCommandType Command(); double ValueGet(int n); - vector3 PositionGet(); + vector3 PositionGet() const; bool StopCommand(); void StopCommandSent(); void Append(TEvent *e); diff --git a/Model3d.cpp b/Model3d.cpp index 41834753..2b74dd34 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1489,6 +1489,8 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) */ // we rely on the SUB chunk coming before the vertex data, and on the overall vertex count matching the size of data in the chunk. // geometry associated with chunks isn't stored in the same order as the chunks themselves, so we need to sort that out first + if( Root == nullptr ) + throw std::runtime_error( "e3d: VNT chunk encountered before SUB chunk" ); std::vector< std::pair > submodeloffsets; // vertex data offset, submodel index submodeloffsets.reserve( iSubModelsCount ); for( int submodelindex = 0; submodelindex < iSubModelsCount; ++submodelindex ) { diff --git a/PyInt.cpp b/PyInt.cpp index 6d91a24b..3bfbade0 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -64,10 +64,10 @@ bool TPythonInterpreter::loadClassFile( std::string const &lookupPath, std::stri if (sourceFile != nullptr) { fseek(sourceFile, 0, SEEK_END); - long fsize = ftell(sourceFile); + auto const fsize = ftell(sourceFile); char *buffer = (char *)calloc(fsize + 1, sizeof(char)); fseek(sourceFile, 0, SEEK_SET); - size_t freaded = fread(buffer, sizeof(char), fsize, sourceFile); + auto const freaded = fread(buffer, sizeof(char), fsize, sourceFile); buffer[freaded] = 0; // z jakiegos powodu czytamy troche mniej i trzczeba dodac konczace // zero do bufora (mimo ze calloc teoretycznie powiniene zwrocic // wyzerowana pamiec) diff --git a/Segment.cpp b/Segment.cpp index 19a0fa15..41527efd 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -21,20 +21,17 @@ http://mozilla.org/MPL/2.0/. // 110806 Ra: odwrócone mapowanie wzdłuż - Point1 == 1.0 TSegment::TSegment(TTrack *owner) : - pOwner( owner ) -{ - fAngle[ 0 ] = 0.0; - fAngle[ 1 ] = 0.0; -}; + pOwner( owner ) +{} TSegment::~TSegment() { SafeDeleteArray(fTsBuffer); -}; +} -bool TSegment::Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, double fNewRoll1, double fNewRoll2) +bool TSegment::Init(Math3D::vector3 NewPoint1, Math3D::vector3 NewPoint2, double fNewStep, double fNewRoll1, double fNewRoll2) { // wersja dla prostego - wyliczanie punktów kontrolnych - vector3 dir; + Math3D::vector3 dir; // NOTE: we're enforcing division also for straight track, to ensure dense enough mesh for per-vertex lighting /* @@ -55,9 +52,7 @@ bool TSegment::Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, doubl } }; -bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointIn, - vector3 &NewPoint2, double fNewStep, double fNewRoll1, double fNewRoll2, - bool bIsCurve) +bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, Math3D::vector3 NewCPointIn, Math3D::vector3 &NewPoint2, double fNewStep, double fNewRoll1, double fNewRoll2, bool bIsCurve) { // wersja uniwersalna (dla krzywej i prostego) Point1 = NewPoint1; CPointOut = NewCPointOut; @@ -77,7 +72,7 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI // mieć moment wypoziomowania, ale musi on być również podniesiony. if (fRoll1 != 0.0) { // tylko jeśli jest przechyłka - double w1 = fabs(sin(fRoll1) * 0.75); // 0.5*w2+0.0325; //0.75m dla 1.435 + double w1 = std::abs(std::sin(fRoll1) * 0.75); // 0.5*w2+0.0325; //0.75m dla 1.435 Point1.y += w1; // modyfikacja musi być przed policzeniem dalszych parametrów if (bCurve) CPointOut.y += w1; // prosty ma wektory jednostkowe @@ -85,7 +80,7 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI } if (fRoll2 != 0.0) { - double w2 = fabs(sin(fRoll2) * 0.75); // 0.5*w2+0.0325; //0.75m dla 1.435 + double w2 = std::abs(std::sin(fRoll2) * 0.75); // 0.5*w2+0.0325; //0.75m dla 1.435 Point2.y += w2; // modyfikacja musi być przed policzeniem dalszych parametrów if (bCurve) CPointIn.y += w2; // prosty ma wektory jednostkowe @@ -137,12 +132,12 @@ bool TSegment::Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointI return true; } -vector3 TSegment::GetFirstDerivative(double fTime) +Math3D::vector3 TSegment::GetFirstDerivative(double const fTime) const { double fOmTime = 1.0 - fTime; double fPowTime = fTime; - vector3 kResult = fOmTime * (CPointOut - Point1); + Math3D::vector3 kResult = fOmTime * (CPointOut - Point1); // int iDegreeM1 = 3 - 1; @@ -156,7 +151,7 @@ vector3 TSegment::GetFirstDerivative(double fTime) return kResult; } -double TSegment::RombergIntegral(double fA, double fB) +double TSegment::RombergIntegral(double const fA, double const fB) const { double fH = fB - fA; @@ -188,7 +183,7 @@ double TSegment::RombergIntegral(double fA, double fB) return ms_apfRom[0][ms_iOrder - 1]; } -double TSegment::GetTFromS(double s) +double TSegment::GetTFromS(double const s) const { // initial guess for Newton's method double fTolerance = 0.001; @@ -216,41 +211,83 @@ double TSegment::GetTFromS(double s) return fTime; }; -vector3 TSegment::RaInterpolate(double t) +Math3D::vector3 TSegment::RaInterpolate(double const t) const { // wyliczenie XYZ na krzywej Beziera z użyciem współczynników return t * (t * (t * vA + vB) + vC) + Point1; // 9 mnożeń, 9 dodawań }; -vector3 TSegment::RaInterpolate0(double t) +Math3D::vector3 TSegment::RaInterpolate0(double const t) const { // wyliczenie XYZ na krzywej Beziera, na użytek liczenia długości nie jest dodawane Point1 return t * (t * (t * vA + vB) + vC); // 9 mnożeń, 6 dodawań }; -double TSegment::ComputeLength() // McZapkie-150503: dlugosc miedzy punktami krzywej +double TSegment::ComputeLength() const // McZapkie-150503: dlugosc miedzy punktami krzywej { // obliczenie długości krzywej Beziera za pomocą interpolacji odcinkami // Ra: zamienić na liczenie rekurencyjne średniej z cięciwy i łamanej po kontrolnych // Ra: koniec rekurencji jeśli po podziale suma długości nie różni się więcej niż 0.5mm od // poprzedniej // Ra: ewentualnie rozpoznać łuk okręgu płaskiego i liczyć ze wzoru na długość łuku double t, l = 0; - vector3 last = vector3(0, 0, 0); // długość liczona po przesunięciu odcinka do początku układu - vector3 tmp = Point2 - Point1; + Math3D::vector3 last = Math3D::vector3(0, 0, 0); // długość liczona po przesunięciu odcinka do początku układu + Math3D::vector3 tmp = Point2 - Point1; int m = 20.0 * tmp.Length(); // było zawsze do 10000, teraz jest liczone odcinkami po około 5cm for (int i = 1; i <= m; i++) { t = double(i) / double(m); // wyznaczenie parametru na krzywej z przedziału (0,1> // tmp=Interpolate(t,p1,cp1,cp2,p2); tmp = RaInterpolate0(t); // obliczenie punktu dla tego parametru - t = vector3(tmp - last).Length(); // obliczenie długości wektora + t = Math3D::vector3(tmp - last).Length(); // obliczenie długości wektora l += t; // zwiększenie wyliczanej długości last = tmp; } return (l); } +// finds point on segment closest to specified point in 3d space. returns: point on segment as value in range 0-1 +double +TSegment::find_nearest_point( glm::dvec3 const &Point ) const { + + if( ( false == bCurve ) || ( iSegCount == 1 ) ) { + // for straight track just treat it as a single segment + return + nearest_segment_point( + glm::dvec3{ FastGetPoint_0() }, + glm::dvec3{ FastGetPoint_1() }, + Point ); + } + else { + // for curves iterate through segment chunks, and find the one which gives us the least distance to the specified point + double distance = std::numeric_limits::max(); + double nearest; + // NOTE: we're reusing already created segment chunks, which are created based on splinefidelity setting + // this means depending on splinefidelity the results can be potentially slightly different + for( int segmentidx = 0; segmentidx < iSegCount; ++segmentidx ) { + + auto const segmentpoint = + clamp( + nearest_segment_point( + glm::dvec3{ FastGetPoint( fTsBuffer[ segmentidx ] ) }, + glm::dvec3{ FastGetPoint( fTsBuffer[ segmentidx + 1 ] ) }, + Point ) // point in range 0-1 on current segment + * ( fTsBuffer[ segmentidx + 1 ] - fTsBuffer[ segmentidx ] ) // segment length + + fTsBuffer[ segmentidx ], // segment offset + 0.0, 1.0 ); // we clamp the range in case there's some floating point math inaccuracies + + auto const segmentdistance = glm::length2( Point - glm::dvec3{ FastGetPoint( segmentpoint ) } ); + if( segmentdistance < distance ) { + + nearest = segmentpoint; + distance = segmentdistance; + } + } + // + return nearest; + } +} + const double fDirectionOffset = 0.1; // długość wektora do wyliczenia kierunku -vector3 TSegment::GetDirection(double fDistance) +Math3D::vector3 TSegment::GetDirection(double const fDistance) const { // takie toporne liczenie pochodnej dla podanego dystansu od Point1 double t1 = GetTFromS(fDistance - fDirectionOffset); if (t1 <= 0.0) @@ -261,7 +298,7 @@ vector3 TSegment::GetDirection(double fDistance) return (FastGetPoint(t2) - FastGetPoint(t1)); } -vector3 TSegment::FastGetDirection(double fDistance, double fOffset) +Math3D::vector3 TSegment::FastGetDirection(double fDistance, double fOffset) { // takie toporne liczenie pochodnej dla parametru 0.0÷1.0 double t1 = fDistance - fOffset; if (t1 <= 0.0) @@ -272,7 +309,7 @@ vector3 TSegment::FastGetDirection(double fDistance, double fOffset) return (FastGetPoint(t2) - FastGetPoint(t1)); } -vector3 TSegment::GetPoint(double fDistance) +Math3D::vector3 TSegment::GetPoint(double const fDistance) const { // wyliczenie współrzędnych XYZ na torze w odległości (fDistance) od Point1 if (bCurve) { // można by wprowadzić uproszczony wzór dla okręgów płaskich @@ -287,7 +324,7 @@ vector3 TSegment::GetPoint(double fDistance) } }; -void TSegment::RaPositionGet(double fDistance, vector3 &p, vector3 &a) +void TSegment::RaPositionGet(double const fDistance, Math3D::vector3 &p, Math3D::vector3 &a) const { // ustalenie pozycji osi na torze, przechyłki, pochylenia i kierunku jazdy if (bCurve) { // można by wprowadzić uproszczony wzór dla okręgów płaskich @@ -309,13 +346,16 @@ void TSegment::RaPositionGet(double fDistance, vector3 &p, vector3 &a) } }; -vector3 TSegment::FastGetPoint(double t) +Math3D::vector3 TSegment::FastGetPoint(double const t) const { // return (bCurve?Interpolate(t,Point1,CPointOut,CPointIn,Point2):((1.0-t)*Point1+(t)*Point2)); - return (bCurve ? RaInterpolate(t) : ((1.0 - t) * Point1 + (t)*Point2)); + return ( + ( ( true == bCurve ) || ( iSegCount == 1 ) ) ? + RaInterpolate( t ) : + interpolate( Point1, Point2, t ) ); } -bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, vector3 **p, bool bRender) +bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, Math3D::vector3 **p, bool bRender) { // generowanie trójkątów dla odcinka trajektorii ruchu // standardowo tworzy triangle_strip dla prostego albo ich zestaw dla łuku // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli @@ -325,7 +365,7 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, if( !fTsBuffer ) return false; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę - vector3 pos1, pos2, dir, parallel1, parallel2, pt, norm; + Math3D::vector3 pos1, pos2, dir, parallel1, parallel2, pt, norm; double s, step, fOffset, tv1, tv2, t, fEnd; bool const trapez = iNumShapePoints < 0; // sygnalizacja trapezowatości iNumShapePoints = std::abs( iNumShapePoints ); @@ -341,7 +381,7 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, fOffset = 0.1 / fLength; // pierwsze 10cm pos1 = FastGetPoint( t ); // wektor początku segmentu dir = FastGetDirection( t, fOffset ); // wektor kierunku - parallel1 = Normalize( vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny + parallel1 = Normalize( Math3D::vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny if( iEnd == 0 ) iEnd = iSegCount; fEnd = fLength * double( iEnd ) / double( iSegCount ); @@ -371,7 +411,7 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, t = fTsBuffer[ i ]; // szybsze od GetTFromS(s); pos2 = FastGetPoint( t ); dir = FastGetDirection( t, fOffset ); // nowy wektor kierunku - parallel2 = Normalize( vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny + parallel2 = Normalize( Math3D::vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny if( trapez ) { for( int j = 0; j < iNumShapePoints; ++j ) { @@ -453,7 +493,7 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, void TSegment::Render() { - vector3 pt; + Math3D::vector3 pt; GfxRenderer.Bind_Material( null_handle ); if (bCurve) diff --git a/Segment.h b/Segment.h index 90d0a6a8..618132da 100644 --- a/Segment.h +++ b/Segment.h @@ -7,24 +7,19 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef SegmentH -#define SegmentH -/* -#include "VBO.h" -*/ +#pragma once + #include "openglgeometrybank.h" #include "dumb3d.h" #include "Classes.h" #include "usefull.h" -using namespace Math3D; - // 110405 Ra: klasa punktów przekroju z normalnymi -class vector6 : public vector3 +class vector6 : public Math3D::vector3 { // punkt przekroju wraz z wektorem normalnym public: - vector3 n; + Math3D::vector3 n; vector6() { x = y = z = n.x = n.z = 0.0; @@ -54,7 +49,7 @@ class vector6 : public vector3 class TSegment { // aproksymacja toru (zwrotnica ma dwa takie, jeden z nich jest aktywny) private: - vector3 Point1, CPointOut, CPointIn, Point2; + Math3D::vector3 Point1, CPointOut, CPointIn, Point2; double fRoll1 = 0.0, fRoll2 = 0.0; // przechyłka na końcach double fLength = 0.0; // długość policzona @@ -63,63 +58,92 @@ class TSegment int iSegCount = 0; // ilość odcinków do rysowania krzywej double fDirection = 0.0; // Ra: kąt prostego w planie; dla łuku kąt od Point1 double fStoop = 0.0; // Ra: kąt wzniesienia; dla łuku od Point1 - vector3 vA, vB, vC; // współczynniki wielomianów trzeciego stopnia vD==Point1 + Math3D::vector3 vA, vB, vC; // współczynniki wielomianów trzeciego stopnia vD==Point1 TTrack *pOwner = nullptr; // wskaźnik na właściciela - double fAngle[2]; // kąty zakończenia drogi na przejazdach + double fAngle[ 2 ] = { 0.0, 0.0 }; // kąty zakończenia drogi na przejazdach - vector3 GetFirstDerivative(double fTime); - double RombergIntegral(double fA, double fB); - double GetTFromS(double s); - vector3 RaInterpolate(double t); - vector3 RaInterpolate0(double t); - public: + Math3D::vector3 + GetFirstDerivative(double const fTime) const; + double + RombergIntegral(double const fA, double const fB) const; + double + GetTFromS(double const s) const; + Math3D::vector3 + RaInterpolate(double const t) const; + Math3D::vector3 + RaInterpolate0(double const t) const; + +public: bool bCurve = false; + TSegment(TTrack *owner); ~TSegment(); - bool Init(vector3 NewPoint1, vector3 NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0); - bool Init(vector3 &NewPoint1, vector3 NewCPointOut, vector3 NewCPointIn, vector3 &NewPoint2, - double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0, bool bIsCurve = true); - inline double ComputeLength(); // McZapkie-150503 - inline vector3 GetDirection1() { - return bCurve ? CPointOut - Point1 : CPointOut; }; - inline vector3 GetDirection2() { - return bCurve ? CPointIn - Point2 : CPointIn; }; - vector3 GetDirection(double fDistance); - vector3 GetDirection() { - return CPointOut; }; - vector3 FastGetDirection(double fDistance, double fOffset); - vector3 GetPoint(double fDistance); - void RaPositionGet(double fDistance, vector3 &p, vector3 &a); - vector3 FastGetPoint(double t); - inline vector3 FastGetPoint_0() { - return Point1; }; - inline vector3 FastGetPoint_1() { - return Point2; }; - inline double GetRoll(double const Distance) { - return interpolate( fRoll1, fRoll2, Distance / fLength ); } - void GetRolls(double &r1, double &r2) { - // pobranie przechyłek (do generowania trójkątów) - r1 = fRoll1; - r2 = fRoll2; } - bool RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, vector6 const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, vector3 **p = nullptr, bool bRender = true); - void Render(); - inline double GetLength() { - return fLength; }; - void MoveMe(vector3 pPosition) - { - Point1 += pPosition; - Point2 += pPosition; - if (bCurve) - { - CPointIn += pPosition; - CPointOut += pPosition; - } - } - int RaSegCount() { - return fTsBuffer ? iSegCount : 1; }; - void AngleSet(int i, double a) { - fAngle[i] = a; }; + bool + Init( Math3D::vector3 NewPoint1, Math3D::vector3 NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0); + bool + Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, Math3D::vector3 NewCPointIn, Math3D::vector3 &NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0, bool bIsCurve = true); + double + ComputeLength() const; // McZapkie-150503 + // finds point on segment closest to specified point in 3d space. returns: point on segment as value in range 0-1 + double + find_nearest_point( glm::dvec3 const &Point ) const; + inline + Math3D::vector3 + GetDirection1() const { + return bCurve ? CPointOut - Point1 : CPointOut; }; + inline + Math3D::vector3 + GetDirection2() const { + return bCurve ? CPointIn - Point2 : CPointIn; }; + Math3D::vector3 + GetDirection(double const fDistance) const; + inline + Math3D::vector3 + GetDirection() const { + return CPointOut; }; + Math3D::vector3 + FastGetDirection(double const fDistance, double const fOffset); + Math3D::vector3 + GetPoint(double const fDistance) const; + void + RaPositionGet(double const fDistance, Math3D::vector3 &p, Math3D::vector3 &a) const; + Math3D::vector3 + FastGetPoint(double const t) const; + inline + Math3D::vector3 + FastGetPoint_0() const { + return Point1; }; + inline + Math3D::vector3 + FastGetPoint_1() const { + return Point2; }; + inline + double + GetRoll(double const Distance) const { + return interpolate( fRoll1, fRoll2, Distance / fLength ); } + inline + void + GetRolls(double &r1, double &r2) const { + // pobranie przechyłek (do generowania trójkątów) + r1 = fRoll1; + r2 = fRoll2; } + + bool + RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, vector6 const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, Math3D::vector3 **p = nullptr, bool bRender = true); + void + Render(); + inline + double + GetLength() const { + return fLength; }; + inline + int + RaSegCount() const { + return fTsBuffer ? iSegCount : 1; }; + inline + void + AngleSet(int const i, double const a) { + fAngle[i] = a; }; }; //--------------------------------------------------------------------------- -#endif diff --git a/Track.cpp b/Track.cpp index bee712aa..6814d710 100644 --- a/Track.cpp +++ b/Track.cpp @@ -268,32 +268,30 @@ TTrack * TTrack::NullCreate(int dir) trk2->fRadius = 20.0; // promień, aby się dodawało do tabelki prędkości i liczyło // narastająco trk2->Init(); // utworzenie segmentu + trk->pMyNode->asName = pMyNode->asName + ":loopstart"; + trk2->pMyNode->asName = pMyNode->asName + ":loopfinish"; switch (dir) { //łączenie z nowym torem case 0: p1 = Segment->FastGetPoint_0(); cv1 = -20.0 * Normalize(Segment->GetDirection1()); // pierwszy wektor kontrolny p2 = p1 + cv1 + cv1; // 40m - trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, - -RadToDeg(r1), - 0.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, -RadToDeg(r1), 0.0); ConnectPrevPrev(trk, 0); - trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, - -RadToDeg(r1), - 0.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, -RadToDeg(r1), 0.0); trk2->iPrevDirection = 0; // zwrotnie do tego samego odcinka break; case 1: p1 = Segment->FastGetPoint_1(); cv1 = -20.0 * Normalize(Segment->GetDirection2()); // pierwszy wektor kontrolny p2 = p1 + cv1 + cv1; - trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, - RadToDeg(r2), - 0.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, RadToDeg(r2), 0.0); ConnectNextPrev(trk, 0); - trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, - RadToDeg(r2), - 0.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, RadToDeg(r2), 0.0); trk2->iPrevDirection = 1; // zwrotnie do tego samego odcinka break; } @@ -870,7 +868,7 @@ bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEv } else { if( evEventall1 == nullptr ) { - evEventall1 = NewEvent0; + evEventall1 = NewEvent1; asEventall1Name = ""; iEvents |= 16; // sumaryczna informacja o eventach } @@ -888,7 +886,7 @@ bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEv } else { if( evEventall2 == nullptr ) { - evEventall2 = NewEvent0; + evEventall2 = NewEvent2; asEventall2Name = ""; iEvents |= 32; // sumaryczna informacja o eventach } diff --git a/Track.h b/Track.h index af635859..6398b5d0 100644 --- a/Track.h +++ b/Track.h @@ -77,7 +77,7 @@ class TSwitchExtension struct { // zmienne dla skrzyżowania int iRoads; // ile dróg się spotyka? - vector3 *vPoints; // tablica wierzchołków nawierzchni, generowana przez pobocze + Math3D::vector3 *vPoints; // tablica wierzchołków nawierzchni, generowana przez pobocze // int iPoints; // liczba faktycznie użytych wierzchołków nawierzchni bool bPoints; // czy utworzone? }; @@ -90,7 +90,7 @@ class TSwitchExtension TEvent *evPlus = nullptr, *evMinus = nullptr; // zdarzenia sygnalizacji rozprucia float fVelocity = -1.0; // maksymalne ograniczenie prędkości (ustawianej eventem) - vector3 vTrans; // docelowa translacja przesuwnicy + Math3D::vector3 vTrans; // docelowa translacja przesuwnicy private: }; @@ -199,7 +199,7 @@ public: void ConnectNextNext(TTrack *pNewNext, int typ); inline double Length() { return Segment->GetLength(); }; - inline std::shared_ptr CurrentSegment() { + inline std::shared_ptr CurrentSegment() const { return Segment; }; inline TTrack * CurrentNext() { return (trNext); }; @@ -215,7 +215,7 @@ public: SwitchExtension ? SwitchExtension->CurrentIndex : -1); }; - void Load(cParser *parser, vector3 pOrigin, std::string name); + void Load(cParser *parser, Math3D::vector3 pOrigin, std::string name); bool AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); bool AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); bool AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus); @@ -247,7 +247,7 @@ public: m_material1 : m_material2 ); }; bool IsGroupable(); - int TestPoint(vector3 *Point); + int TestPoint( Math3D::vector3 *Point); void MovedUp1(float const dh); std::string NameGet(); void VelocitySet(float v); diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 7e9007d3..c48ecac6 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -71,19 +71,11 @@ TTrack * TTrackFollower::SetCurrentTrack(TTrack *pTrack, int end) } break; } - if (!pTrack) - { // gdy nie ma toru w kierunku jazdy - pTrack = pCurrentTrack->NullCreate( - end); // tworzenie toru wykolejącego na przedłużeniu pCurrentTrack + if (!pTrack) { + // gdy nie ma toru w kierunku jazdy tworzenie toru wykolejącego na przedłużeniu pCurrentTrack + pTrack = pCurrentTrack->NullCreate(end); if (!end) // jeśli dodana od strony zero, to zmiana kierunku fDirection = -fDirection; // wtórna zmiana - // if (pTrack->iCategoryFlag&2) - //{//jeśli samochód, zepsuć na miejscu - // Owner->MoverParameters->V=0; //zatrzymać - // Owner->MoverParameters->Power=0; //ukraść silnik - // Owner->MoverParameters->AccS=0; //wchłonąć moc - // Global::iPause|=1; //zapauzowanie symulacji - //} } else { // najpierw +1, później -1, aby odcinek izolowany wspólny dla tych torów nie wykrył zera diff --git a/TrkFoll.h b/TrkFoll.h index 5723ccb1..87bc8312 100644 --- a/TrkFoll.h +++ b/TrkFoll.h @@ -28,8 +28,8 @@ class TTrackFollower // zwrotnicy pod taborem) public: double fOffsetH = 0.0; // Ra: odległość środka osi od osi toru (dla samochodów) - użyć do wężykowania - vector3 pPosition; // współrzędne XYZ w układzie scenerii - vector3 vAngles; // x:przechyłka, y:pochylenie, z:kierunek w planie (w radianach) + Math3D::vector3 pPosition; // współrzędne XYZ w układzie scenerii + Math3D::vector3 vAngles; // x:przechyłka, y:pochylenie, z:kierunek w planie (w radianach) TTrackFollower() = default; ~TTrackFollower(); TTrack * SetCurrentTrack(TTrack *pTrack, int end); diff --git a/usefull.h b/usefull.h index 0c4c398d..8c5359ca 100644 --- a/usefull.h +++ b/usefull.h @@ -95,4 +95,23 @@ bounding_box( VecType_ &Mincorner, VecType_ &Maxcorner, Iterator_ First, Iterato Maxcorner = glm::max( Maxcorner, VecType_{ point } ); } ); } +// finds point on specified segment closest to specified point in 3d space. returns: point on segment as value in range 0-1 where 0 = start and 1 = end of the segment +template +typename VecType_::value_type +nearest_segment_point( VecType_ const &Segmentstart, VecType_ const &Segmentend, VecType_ const &Point ) { + + auto const v = Segmentend - Segmentstart; + auto const w = Point - Segmentstart; + + auto const c1 = glm::dot( w, v ); + if( c1 <= 0.0 ) { + return 0.0; + } + auto const c2 = glm::dot( v, v ); + if( c2 <= c1 ) { + return 1.0; + } + return c1 / c2; +} + //--------------------------------------------------------------------------- diff --git a/version.h b/version.h index 7043a400..dadb643a 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 902 +#define VERSION_MINOR 903 #define VERSION_REVISION 0 From a0f705292af03e2fca5e980a63feb65512116770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Tue, 5 Sep 2017 20:14:58 +0200 Subject: [PATCH 183/426] New formula for adhesion, fixed some bugs in calculation of wheels' rotation --- Driver.cpp | 2 +- McZapkie/Mover.cpp | 52 ++++++++++++++++++++++++++++++---------------- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 42d3c222..12af005a 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4821,7 +4821,7 @@ bool TController::UpdateSituation(double dt) else mvControlling->AntiSlippingButton(); ++iDriverFailCount; - mvControlling->SlippingWheels = false; // flaga już wykorzystana + //mvControlling->SlippingWheels = false; // flaga już wykorzystana } if (iDriverFailCount > maxdriverfails) { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 1a371675..ba9b03f1 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3648,6 +3648,7 @@ double TMoverParameters::ComputeMass(void) void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) { int b; + double Fwheels = 0.0; if (PhysicActivation) { @@ -3707,19 +3708,35 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) else FTrain = 0; Fb = BrakeForce(RunningTrack); + Fwheels = FTrain - Fb * Sign(V); if( ( Vel > 0.001 ) // crude trap, to prevent braked stationary vehicles from passing fb > mass * adhesive test - && ( std::max( std::abs( FTrain ), Fb ) > TotalMassxg * Adhesive( RunningTrack.friction ) ) ) // poslizg + && ( std::abs(Fwheels) > TotalMassxg * Adhesive( RunningTrack.friction ) ) ) // poslizg { SlippingWheels = true; } if( true == SlippingWheels ) { // TrainForce:=TrainForce-Fb; - nrot = ComputeRotatingWheel((FTrain - Fb * Sign(V) - FStand) / NAxles - + double temp_nrot = ComputeRotatingWheel(Fwheels - Sign(nrot * M_PI * WheelDiameter - V) * - Adhesive(RunningTrack.friction) * TotalMass, + Adhesive(RunningTrack.friction) * TotalMassxg, dt, nrot); - FTrain = Sign(FTrain) * TotalMassxg * Adhesive(RunningTrack.friction); - Fb = std::min(Fb, TotalMassxg * Adhesive(RunningTrack.friction)); + Fwheels = Sign(nrot * M_PI * WheelDiameter - V) * TotalMassxg * Adhesive(RunningTrack.friction); + if (Fwheels*Sign(V)>0) + { + FTrain = Fwheels - Fb; + } + else + { + Fb = FTrain - Fwheels; + } + if (Sign(nrot * M_PI * WheelDiameter - V)*Sign(temp_nrot * M_PI * WheelDiameter - V) < 0) + { + SlippingWheels = false; + temp_nrot = V / M_PI / WheelDiameter; + } + + + nrot = temp_nrot; } // else SlippingWheels:=false; // FStand:=0; @@ -3728,7 +3745,7 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) (Couplers[b].CouplerType<>Articulated)*/ { // doliczenie sił z innych pojazdów Couplers[b].CForce = CouplerForce(b, dt); - FTrain += Couplers[b].CForce; + FTrain += Couplers[b].CForce; } else Couplers[b].CForce = 0; @@ -3862,16 +3879,6 @@ double TMoverParameters::BrakeForce(const TTrackParam &Track) } else UnitBrakeForce = K * 1000.0; - if (((double)NBpA * UnitBrakeForce > TotalMassxg * Adhesive(RunningTrack.friction) / NAxles) && - (abs(V) > 0.001)) - // poslizg - { - // Fb = Adhesive(Track.friction) * Mass * g; - SlippingWheels = true; - } - //{ else - // begin - //{ SlippingWheels:=false;} // if (LocalBrake=ManualBrake)or(MBrake=true)) and (BrakePress<0.3) then // Fb:=UnitBrakeForce*NBpA {ham. reczny dziala na jedna os} // else //yB: to nie do konca ma sens, ponieważ ręczny w wagonie działa na jeden cylinder @@ -3907,7 +3914,10 @@ double TMoverParameters::FrictionForce(double R, int TDamage) // ************************************************************************************************* double TMoverParameters::Adhesive(double staticfriction) { - double adhesion; + double adhesion = 0.0; + const double adh_factor = 0.25; //współczynnik określający, jak bardzo spada tarcie przy poślizgu + const double slipfactor = 0.33; //współczynnik określający, jak szybko spada tarcie przy poślizgu + const double sandfactor = 1.25; //współczynnik określający, jak mocno pomaga piasek /* // ABu: male przerobki, tylko czy to da jakikolwiek skutek w FPS? // w kazdym razie zaciemni kod na pewno :) @@ -3930,6 +3940,7 @@ double TMoverParameters::Adhesive(double staticfriction) // WriteLog(FloatToStr(adhesive)); // tutaj jest na poziomie 0.2 - 0.3 return adhesion; */ + /* //wersja druga if( true == SlippingWheels ) { if( true == SandDose ) { adhesion = 0.48; } @@ -3940,7 +3951,12 @@ double TMoverParameters::Adhesive(double staticfriction) if( true == SandDose ) { adhesion = std::max( staticfriction * ( 100.0 + Vel ) / ( 50.0 + Vel ) * 1.1, 0.48 ); } else { adhesion = staticfriction * ( 100.0 + Vel ) / ( 50.0 + Vel ); } } - adhesion *= ( 11.0 - 2 * Random() ) / 10.0; + adhesion *= ( 11.0 - 2 * Random() ) / 10.0; */ + //wersja3 by youBy - uwzględnia naturalne mikropoślizgi i wpływ piasecznicy, usuwa losowość z pojazdu + double Vwheels = nrot * M_PI * WheelDiameter; // predkosc liniowa koła wynikająca z obrotowej + double deltaV = V - Vwheels; //poślizg - różnica prędkości w punkcie styku koła i szyny + deltaV = std::max(0.0, std::abs(deltaV) - 0.25); //mikropoślizgi do ok. 0,25 m/s nie zrywają przyczepności + adhesion = staticfriction * (28 + Vwheels) / (14 + Vwheels) * ((SandDose? sandfactor : 1) - (1 - adh_factor)*(deltaV / (deltaV + slipfactor))); return adhesion; } From 2324ae5eda2902ac111e39ab202f47da16c90851 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 5 Sep 2017 22:19:46 +0200 Subject: [PATCH 184/426] improved consistency of simulation updates, reduction of random factor in acceleration calculations --- Driver.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++--- DynObj.cpp | 41 +++++++++++++++++++++++++------- DynObj.h | 2 +- McZapkie/Mover.cpp | 20 +++++++++------- Segment.cpp | 2 +- Track.h | 10 ++++---- TrkFoll.h | 2 +- World.cpp | 12 ++++++---- version.h | 2 +- 9 files changed, 115 insertions(+), 34 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 6c25c34a..b4209bb7 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -46,6 +46,45 @@ ProjectEventOnTrack( TEvent const *Event, TTrack const *Track, double const Dire ( 1.0 - nearestpoint ) * segment->GetLength() ); // measure from point2 }; +double GetDistanceToEvent(TTrack* track, TEvent* event, double scan_dir, double start_dist, int iter = 0, bool back = false) +{ + if( track == nullptr ) { return start_dist; } + + auto const segment = track->CurrentSegment(); + vector3 const pos_event = event->PositionGet(); + double len1, len2; + double sd = scan_dir; + double seg_len = scan_dir > 0 ? 0.0 : 1.0; + double const dzielnik = 1.0 / segment->GetLength();// rozdzielczosc mniej wiecej 1m + int krok = 0; // krok obliczeniowy do sprawdzania czy odwracamy + len2 = (pos_event - segment->FastGetPoint(seg_len)).LengthSquared(); + do + { + len1 = len2; + seg_len += scan_dir > 0 ? dzielnik : -dzielnik; + len2 = (pos_event - segment->FastGetPoint(seg_len)).LengthSquared(); + krok++; + } while ((len1 > len2) && (seg_len >= dzielnik && (seg_len <= (1 - dzielnik)))); + //trzeba sprawdzić czy seg_len nie osiągnął skrajnych wartości, bo wtedy + // trzeba sprawdzić tor obok + if (1 == krok) + sd = -sd; // jeśli tylko jeden krok tzn, że event przy poprzednim sprawdzaym torze + if (((seg_len <= dzielnik) || (seg_len > (1 - dzielnik))) && (iter < 3)) + { // przejście na inny tor + track = track->Neightbour(int(sd), sd); + start_dist += (1 == krok) ? 0 : back ? -segment->GetLength() : segment->GetLength(); + return GetDistanceToEvent(track, event, sd, start_dist, ++iter, 1 == krok ? true : false); + } + else + { // obliczenie mojego toru + seg_len -= scan_dir > 0 ? dzielnik : -dzielnik; //trzeba wrócić do pozycji len1 + seg_len = scan_dir < 0 ? 1 - seg_len : seg_len; + seg_len = back ? 1 - seg_len : seg_len; // odwracamy jeśli idzie do tyłu + start_dist -= back ? segment->GetLength() : 0; + return start_dist + (segment->GetLength() * seg_len); + } +}; + /* Moduł obsługujący sterowanie pojazdami (składami pociągów, samochodami). @@ -491,10 +530,16 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->asName); } auto &newspeedpoint = sSpeedTable[iLast]; +/* if( newspeedpoint.Set( pEvent, fCurrentDistance + ProjectEventOnTrack( pEvent, pTrack, fLastDir ), OrderCurrentGet() ) ) { +*/ + if( newspeedpoint.Set( + pEvent, + GetDistanceToEvent( pTrack, pEvent, fLastDir, fCurrentDistance ), + OrderCurrentGet() ) ) { fDistance = newspeedpoint.fDist; // jeśli sygnał stop, to nie ma potrzeby dalej skanować SemNextStopIndex = iLast; @@ -3619,7 +3664,7 @@ TController::UpdateSituation(double dt) { // towards coupler 0 if( ( mvOccupied->V * iDirection < 0.0 ) || ( ( rearvehicle->NextConnected != nullptr ) - && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 1 : 0 ) ].CouplingFlag == ctrain_virtual ) ) ) { + && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 1 : 0 ) ].CouplingFlag == coupling::faux ) ) ) { // scan behind if we're moving backward, or if we had something connected there and are moving away rearvehicle->ABuScanObjects( ( pVehicle->DirectionGet() == rearvehicle->DirectionGet() ? @@ -3637,7 +3682,7 @@ TController::UpdateSituation(double dt) { // towards coupler 1 if( ( mvOccupied->V * iDirection < 0.0 ) || ( ( rearvehicle->PrevConnected != nullptr ) - && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 0 : 1 ) ].CouplingFlag == ctrain_virtual ) ) ) { + && ( rearvehicle->MoverParameters->Couplers[ ( rearvehicle->DirectionGet() > 0 ? 0 : 1 ) ].CouplingFlag == coupling::faux ) ) ) { // scan behind if we're moving backward, or if we had something connected there and are moving away rearvehicle->ABuScanObjects( ( pVehicle->DirectionGet() == rearvehicle->DirectionGet() ? @@ -3653,6 +3698,8 @@ TController::UpdateSituation(double dt) { } } + + // tu bedzie logika sterowania if (AIControllFlag) { @@ -3900,6 +3947,11 @@ TController::UpdateSituation(double dt) { // NOTE: this will affect also multi-unit vehicles TBD: is this what we want? fMinProximityDist *= 2.0; fMaxProximityDist *= 2.0; + if( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) { + // additional safety margin for cargo consists + fMinProximityDist *= 2.0; + fMaxProximityDist *= 2.0; + } } fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania // margines prędkości powodujący załączenie napędu @@ -4204,7 +4256,7 @@ TController::UpdateSituation(double dt) { 0 : 1 ); // sprzęg z przodu składu if( ( coupler->Connected ) - && ( coupler->CouplingFlag == 0 ) ) { + && ( coupler->CouplingFlag == coupling::faux ) ) { // mamy coś z przodu podłączone sprzęgiem wirtualnym // wyliczanie optymalnego przyspieszenia do jazdy na widoczność ActualProximityDist = std::min( diff --git a/DynObj.cpp b/DynObj.cpp index f2926f88..f3c24d7f 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1127,7 +1127,7 @@ void TDynamicObject::ABuCheckMyTrack() // Ra: w poniższej funkcji jest problem ze sprzęgami TDynamicObject * -TDynamicObject::ABuFindObject( int &Foundcoupler, double &Distance, TTrack *Track, int const Direction, int const Mycoupler ) +TDynamicObject::ABuFindObject( int &Foundcoupler, double &Distance, TTrack const *Track, int const Direction, int const Mycoupler ) { // Zwraca wskaźnik najbliższego obiektu znajdującego się // na torze w określonym kierunku, ale tylko wtedy, kiedy // obiekty mogą się zderzyć, tzn. nie mijają się. @@ -1169,7 +1169,15 @@ TDynamicObject::ABuFindObject( int &Foundcoupler, double &Distance, TTrack *Trac for( auto dynamic : Track->Dynamics ) { if( dynamic == this ) { continue; } // szukający się nie liczy - +/* + if( ( ( dynamic == PrevConnected ) && ( MoverParameters->Couplers[ TMoverParameters::side::front ].CouplingFlag != coupling::faux ) ) + || ( ( dynamic == NextConnected ) && ( MoverParameters->Couplers[ TMoverParameters::side::rear ].CouplingFlag != coupling::faux ) ) ){ + // stop-gap check to prevent 'detection' of attached vehicles + // which seems to be a side-effect of inaccurate location calculation in 'simple' mode? + // TODO: investigate actual cause + continue; + } +*/ if( Direction > 0 ) { // jeśli szukanie w kierunku Point2 objectposition = ( dynamic->RaTranslationGet() ) - myposition; // odległogłość tamtego od szukającego @@ -1328,16 +1336,23 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) // ScanDir - określa kierunek poszukiwania zależnie od zwrotu prędkości // pojazdu // ScanDir=1 - od strony Coupler0, ScanDir=-1 - od strony Coupler1 - int initialdirection = Direction; // zapamiętanie kierunku poszukiwań na torze początkowym, względem sprzęgów - TTrackFollower *firstaxle = (initialdirection > 0 ? &Axle0 : &Axle1); // można by to trzymać w trainset - TTrack *track = firstaxle->GetTrack(); // tor na którym "stoi" skrajny wózek + auto const initialdirection = Direction; // zapamiętanie kierunku poszukiwań na torze początkowym, względem sprzęgów +/* + TTrackFollower const *firstaxle = (initialdirection > 0 ? &Axle0 : &Axle1); // można by to trzymać w trainset + TTrack const *track = firstaxle->GetTrack(); // tor na którym "stoi" skrajny wózek // (może być inny niż tor pojazdu) if( firstaxle->GetDirection() < 0 ) { // czy oś jest ustawiona w stronę Point1? Direction = -Direction; // jeśli tak, to kierunek szukania będzie przeciwny } - // (teraz względem - // toru) +*/ + TTrack const *track = RaTrackGet(); + if( RaDirectionGet() < 0 ) { + // czy oś jest ustawiona w stronę Point1? + Direction = -Direction; + } + + // (teraz względem toru) int const mycoupler = ( initialdirection < 0 ? 1 : 0 ); // numer sprzęgu do podłączenia w obiekcie szukajacym int foundcoupler { -1 }; // numer sprzęgu w znalezionym obiekcie (znaleziony wypełni) double distance = 0; // przeskanowana odleglość; odległość do zawalidrogi @@ -1347,9 +1362,9 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) // jeśli nie ma na tym samym, szukamy po okolicy szukanie najblizszego toru z jakims obiektem // praktycznie przeklejone z TraceRoute()... if (Direction >= 0) // uwzględniamy kawalek przeanalizowanego wcześniej toru - distance = track->Length() - firstaxle->GetTranslation(); // odległość osi od Point2 toru + distance = track->Length() - RaTranslationGet(); // odległość osi od Point2 toru else - distance = firstaxle->GetTranslation(); // odległość osi od Point1 toru + distance = RaTranslationGet(); // odległość osi od Point1 toru while (distance < Distance) { if (Direction > 0) { @@ -1455,6 +1470,14 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) // nic nie znalezione, to nie ma przeszkód fTrackBlock = 10000.0; } + +#ifdef EU07_DEBUG_COLLISIONS + // debug collider scans + if( ( PrevConnected != nullptr ) + && ( PrevConnected == NextConnected ) ) { + ErrorLog( "Bad coupling: " + asName + " has the same vehicle detected attached to both couplers" ); + } +#endif } //----------ABu: koniec skanowania pojazdow diff --git a/DynObj.h b/DynObj.h index 04f4bc97..623b6ac4 100644 --- a/DynObj.h +++ b/DynObj.h @@ -361,7 +361,7 @@ public: // modele składowe pojazdu void ABuScanObjects(int ScanDir, double ScanDist); protected: - TDynamicObject *ABuFindObject( int &Foundcoupler, double &Distance, TTrack *Track, int const Direction, int const Mycoupler ); + TDynamicObject *ABuFindObject( int &Foundcoupler, double &Distance, TTrack const *Track, int const Direction, int const Mycoupler ); void ABuCheckMyTrack(); public: diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 53453b95..95011356 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1094,6 +1094,7 @@ void TMoverParameters::CollisionDetect(int CouplerN, double dt) coupler.Connected->Couplers[0].CouplingFlag = 0; break; } + WriteLog( "Bad driving: " + Name + " broke a coupler" ); } } } @@ -1268,11 +1269,13 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap AccN = g * Shape.dHrail / TrackW; // szarpanie - if (FuzzyLogic((10.0 + Track.DamageFlag) * Mass * Vel / Vmax, 500000.0, - p_accn)) // Ra: czemu tu masa bez ładunku? - AccV = sqrt((1.0 + Track.DamageFlag) * Random(floor(50.0 * Mass / 1000000.0)) * Vel / - (Vmax * (10.0 + (Track.QualityFlag & 31)))); +#ifdef EU07_USE_FUZZYLOGIC + if( FuzzyLogic( ( 10.0 + Track.DamageFlag ) * Mass * Vel / Vmax, 500000.0, p_accn ) ) { + // Ra: czemu tu masa bez ładunku? + AccV /= ( 2.0 * 0.95 + 2.0 * Random() * 0.1 ); // 95-105% of base modifier (2.0) + } else +#endif AccV = AccV / 2.0; if (AccV > 1.0) @@ -1438,12 +1441,13 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape // else AccN:=g*Shape.dHrail/TrackW; // szarpanie} - if (FuzzyLogic((10.0 + Track.DamageFlag) * Mass * Vel / Vmax, 500000.0, p_accn)) - { - AccV = sqrt((1.0 + Track.DamageFlag) * Random(floor(50.0 * Mass / 1000000.0)) * Vel / - (Vmax * (10.0 + (Track.QualityFlag & 31)))); // Trunc na floor, czy dobrze? +#ifdef EU07_USE_FUZZYLOGIC + if( FuzzyLogic( ( 10.0 + Track.DamageFlag ) * Mass * Vel / Vmax, 500000.0, p_accn ) ) { + // Ra: czemu tu masa bez ładunku? + AccV /= ( 2.0 * 0.95 + 2.0 * Random() * 0.1 ); // 95-105% of base modifier (2.0) } else +#endif AccV = AccV / 2.0; if (AccV > 1.0) diff --git a/Segment.cpp b/Segment.cpp index 41527efd..f002cc3c 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -350,7 +350,7 @@ Math3D::vector3 TSegment::FastGetPoint(double const t) const { // return (bCurve?Interpolate(t,Point1,CPointOut,CPointIn,Point2):((1.0-t)*Point1+(t)*Point2)); return ( - ( ( true == bCurve ) || ( iSegCount == 1 ) ) ? + ( ( true == bCurve ) || ( iSegCount != 1 ) ) ? RaInterpolate( t ) : interpolate( Point1, Point2, t ) ); } diff --git a/Track.h b/Track.h index 6398b5d0..323bfb69 100644 --- a/Track.h +++ b/Track.h @@ -197,14 +197,14 @@ public: void ConnectPrevNext(TTrack *pNewPrev, int typ); void ConnectNextPrev(TTrack *pNewNext, int typ); void ConnectNextNext(TTrack *pNewNext, int typ); - inline double Length() { + inline double Length() const { return Segment->GetLength(); }; inline std::shared_ptr CurrentSegment() const { return Segment; }; - inline TTrack * CurrentNext() { - return (trNext); }; - inline TTrack * CurrentPrev() { - return (trPrev); }; + inline TTrack *CurrentNext() const { + return trNext; }; + inline TTrack *CurrentPrev() const { + return trPrev; }; TTrack * Neightbour(int s, double &d); bool SetConnections(int i); bool Switch(int i, double t = -1.0, double d = -1.0); diff --git a/TrkFoll.h b/TrkFoll.h index 87bc8312..2545ba58 100644 --- a/TrkFoll.h +++ b/TrkFoll.h @@ -47,7 +47,7 @@ class TTrackFollower { return fDirection; }; // zwrot na torze - inline double GetTranslation() + inline double GetTranslation() const { return fCurrentDistance; }; // ABu-030403 diff --git a/World.cpp b/World.cpp index 6612b6b0..e573e275 100644 --- a/World.cpp +++ b/World.cpp @@ -1048,17 +1048,19 @@ bool TWorld::Update() // this means at count > 20 simulation and render are going to desync. is that right? // NOTE: experimentally changing this to prevent the desync. // TODO: test what happens if we hit more than 20 * 0.01 sec slices, i.e. less than 5 fps - Ground.Update(dt / updatecount, updatecount); // tu zrobić tylko coklatkową aktualizację przesunięć + for( int updateidx = 0; updateidx < updatecount; ++updateidx ) { + Ground.Update( dt / updatecount, 1 ); // tu zrobić tylko coklatkową aktualizację przesunięć + } // yB dodał przyspieszacz fizyki if( (true == DebugModeFlag) && (true == Global::bActive) // nie przyspieszać, gdy jedzie w tle :) && ( glfwGetKey( window, GLFW_KEY_PAUSE ) == GLFW_PRESS ) ) { - Ground.Update( dt, updatecount ); - Ground.Update( dt, updatecount ); - Ground.Update( dt, updatecount ); - Ground.Update( dt, updatecount ); // 5 razy + Ground.Update( dt, 1 ); + Ground.Update( dt, 1 ); + Ground.Update( dt, 1 ); + Ground.Update( dt, 1 ); // 5 razy } // secondary fixed step simulation time routines diff --git a/version.h b/version.h index dadb643a..998e22bf 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 903 +#define VERSION_MINOR 905 #define VERSION_REVISION 0 From 53ad41afa0a072b85d139ade69de0d08f6ca5baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Tue, 5 Sep 2017 20:14:58 +0200 Subject: [PATCH 185/426] cherry-pick from refs/remotes/youby/mover_in_c++ "new formula for adhesion, fixed some bugs in calculation of wheels' rotation" --- Driver.cpp | 22 +++++++------------- McZapkie/Mover.cpp | 52 ++++++++++++++++++++++++++++++---------------- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index b4209bb7..3c9b9780 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4561,24 +4561,16 @@ TController::UpdateSituation(double dt) { // zapobieganie poslizgowi u nas if (mvControlling->SlippingWheels) { - if (!mvControlling->DecScndCtrl(2)) // bocznik na zero - mvControlling->DecMainCtrl(1); -/* - if (mvOccupied->BrakeCtrlPos == - mvOccupied->BrakeCtrlPosNo) // jeśli ostatnia pozycja hamowania - //yB: ten warunek wyżej nie ma sensu - mvOccupied->DecBrakeLevel(); // to cofnij hamulec - DecBrake(); // to cofnij hamulec - else - mvControlling->AntiSlippingButton(); -*/ - DecBrake(); // to cofnij hamulec + if( false == mvControlling->DecScndCtrl( 2 ) ) { + // bocznik na zero + mvControlling->DecMainCtrl( 1 ); + } + DecBrake(); // cofnij hamulec mvControlling->AntiSlippingButton(); ++iDriverFailCount; - mvControlling->SlippingWheels = false; // flaga już wykorzystana } - if (iDriverFailCount > maxdriverfails) - { + if (iDriverFailCount > maxdriverfails) { + Psyche = Easyman; if (iDriverFailCount > maxdriverfails * 2) SetDriverPsyche(); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 95011356..088e0074 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3674,6 +3674,7 @@ double TMoverParameters::ComputeMass(void) void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) { int b; + double Fwheels = 0.0; if (PhysicActivation) { @@ -3733,19 +3734,35 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) else FTrain = 0; Fb = BrakeForce(RunningTrack); + Fwheels = FTrain - Fb * Sign(V); if( ( Vel > 0.001 ) // crude trap, to prevent braked stationary vehicles from passing fb > mass * adhesive test - && ( std::max( std::abs( FTrain ), Fb ) > TotalMassxg * Adhesive( RunningTrack.friction ) ) ) // poslizg + && ( std::abs(Fwheels) > TotalMassxg * Adhesive( RunningTrack.friction ) ) ) // poslizg { SlippingWheels = true; } if( true == SlippingWheels ) { // TrainForce:=TrainForce-Fb; - nrot = ComputeRotatingWheel((FTrain - Fb * Sign(V) - FStand) / NAxles - + double temp_nrot = ComputeRotatingWheel(Fwheels - Sign(nrot * M_PI * WheelDiameter - V) * - Adhesive(RunningTrack.friction) * TotalMass, + Adhesive(RunningTrack.friction) * TotalMassxg, dt, nrot); - FTrain = Sign(FTrain) * TotalMassxg * Adhesive(RunningTrack.friction); - Fb = std::min(Fb, TotalMassxg * Adhesive(RunningTrack.friction)); + Fwheels = Sign(nrot * M_PI * WheelDiameter - V) * TotalMassxg * Adhesive(RunningTrack.friction); + if (Fwheels*Sign(V)>0) + { + FTrain = Fwheels - Fb; + } + else + { + Fb = FTrain - Fwheels; + } + if (Sign(nrot * M_PI * WheelDiameter - V)*Sign(temp_nrot * M_PI * WheelDiameter - V) < 0) + { + SlippingWheels = false; + temp_nrot = V / M_PI / WheelDiameter; + } + + + nrot = temp_nrot; } // else SlippingWheels:=false; // FStand:=0; @@ -3754,7 +3771,7 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) (Couplers[b].CouplerType<>Articulated)*/ { // doliczenie sił z innych pojazdów Couplers[b].CForce = CouplerForce(b, dt); - FTrain += Couplers[b].CForce; + FTrain += Couplers[b].CForce; } else Couplers[b].CForce = 0; @@ -3888,16 +3905,6 @@ double TMoverParameters::BrakeForce(const TTrackParam &Track) } else UnitBrakeForce = K * 1000.0; - if (((double)NBpA * UnitBrakeForce > TotalMassxg * Adhesive(RunningTrack.friction) / NAxles) && - (abs(V) > 0.001)) - // poslizg - { - // Fb = Adhesive(Track.friction) * Mass * g; - SlippingWheels = true; - } - //{ else - // begin - //{ SlippingWheels:=false;} // if (LocalBrake=ManualBrake)or(MBrake=true)) and (BrakePress<0.3) then // Fb:=UnitBrakeForce*NBpA {ham. reczny dziala na jedna os} // else //yB: to nie do konca ma sens, ponieważ ręczny w wagonie działa na jeden cylinder @@ -3933,7 +3940,10 @@ double TMoverParameters::FrictionForce(double R, int TDamage) // ************************************************************************************************* double TMoverParameters::Adhesive(double staticfriction) { - double adhesion; + double adhesion = 0.0; + const double adh_factor = 0.25; //współczynnik określający, jak bardzo spada tarcie przy poślizgu + const double slipfactor = 0.33; //współczynnik określający, jak szybko spada tarcie przy poślizgu + const double sandfactor = 1.25; //współczynnik określający, jak mocno pomaga piasek /* // ABu: male przerobki, tylko czy to da jakikolwiek skutek w FPS? // w kazdym razie zaciemni kod na pewno :) @@ -3956,6 +3966,7 @@ double TMoverParameters::Adhesive(double staticfriction) // WriteLog(FloatToStr(adhesive)); // tutaj jest na poziomie 0.2 - 0.3 return adhesion; */ + /* //wersja druga if( true == SlippingWheels ) { if( true == SandDose ) { adhesion = 0.48; } @@ -3966,7 +3977,12 @@ double TMoverParameters::Adhesive(double staticfriction) if( true == SandDose ) { adhesion = std::max( staticfriction * ( 100.0 + Vel ) / ( 50.0 + Vel ) * 1.1, 0.48 ); } else { adhesion = staticfriction * ( 100.0 + Vel ) / ( 50.0 + Vel ); } } - adhesion *= ( 11.0 - 2 * Random() ) / 10.0; + adhesion *= ( 11.0 - 2 * Random() ) / 10.0; */ + //wersja3 by youBy - uwzględnia naturalne mikropoślizgi i wpływ piasecznicy, usuwa losowość z pojazdu + double Vwheels = nrot * M_PI * WheelDiameter; // predkosc liniowa koła wynikająca z obrotowej + double deltaV = V - Vwheels; //poślizg - różnica prędkości w punkcie styku koła i szyny + deltaV = std::max(0.0, std::abs(deltaV) - 0.25); //mikropoślizgi do ok. 0,25 m/s nie zrywają przyczepności + adhesion = staticfriction * (28 + Vwheels) / (14 + Vwheels) * ((SandDose? sandfactor : 1) - (1 - adh_factor)*(deltaV / (deltaV + slipfactor))); return adhesion; } From f3a55a1443d2d506306a93e037c62c384912be98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Fri, 8 Sep 2017 22:00:05 +0200 Subject: [PATCH 186/426] Fixed bug with negative adhesion --- McZapkie/Mover.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index ba9b03f1..b8d93467 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3956,6 +3956,7 @@ double TMoverParameters::Adhesive(double staticfriction) double Vwheels = nrot * M_PI * WheelDiameter; // predkosc liniowa koła wynikająca z obrotowej double deltaV = V - Vwheels; //poślizg - różnica prędkości w punkcie styku koła i szyny deltaV = std::max(0.0, std::abs(deltaV) - 0.25); //mikropoślizgi do ok. 0,25 m/s nie zrywają przyczepności + Vwheels = abs(Vwheels); adhesion = staticfriction * (28 + Vwheels) / (14 + Vwheels) * ((SandDose? sandfactor : 1) - (1 - adh_factor)*(deltaV / (deltaV + slipfactor))); return adhesion; } From 435dc24d3eeae95d2c268f3640906cc67278de13 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 9 Sep 2017 00:55:16 +0200 Subject: [PATCH 187/426] build 170908. minor refactoring and diagnostics enhancements, virtual coupling fix, support for pantograph compressor submodels --- Driver.cpp | 10 ++-- DynObj.cpp | 136 ++++++++++++++++++++++++--------------------- Event.cpp | 120 ++++++++++++++++++++------------------- Ground.cpp | 16 +++--- McZapkie/MOVER.h | 1 - McZapkie/Mover.cpp | 88 ++++++++++++++--------------- Timer.cpp | 17 +++--- Track.cpp | 2 +- Track.h | 2 +- Train.cpp | 70 +++++++++++++++-------- Train.h | 2 + TrkFoll.cpp | 8 +-- version.h | 2 +- 13 files changed, 257 insertions(+), 217 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 3c9b9780..a0e2a58f 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -46,12 +46,12 @@ ProjectEventOnTrack( TEvent const *Event, TTrack const *Track, double const Dire ( 1.0 - nearestpoint ) * segment->GetLength() ); // measure from point2 }; -double GetDistanceToEvent(TTrack* track, TEvent* event, double scan_dir, double start_dist, int iter = 0, bool back = false) +double GetDistanceToEvent(TTrack const *track, TEvent const *event, double scan_dir, double start_dist, int iter = 0, bool back = false) { if( track == nullptr ) { return start_dist; } auto const segment = track->CurrentSegment(); - vector3 const pos_event = event->PositionGet(); + auto const pos_event = event->PositionGet(); double len1, len2; double sd = scan_dir; double seg_len = scan_dir > 0 ? 0.0 : 1.0; @@ -63,7 +63,7 @@ double GetDistanceToEvent(TTrack* track, TEvent* event, double scan_dir, double len1 = len2; seg_len += scan_dir > 0 ? dzielnik : -dzielnik; len2 = (pos_event - segment->FastGetPoint(seg_len)).LengthSquared(); - krok++; + ++krok; } while ((len1 > len2) && (seg_len >= dzielnik && (seg_len <= (1 - dzielnik)))); //trzeba sprawdzić czy seg_len nie osiągnął skrajnych wartości, bo wtedy // trzeba sprawdzić tor obok @@ -71,7 +71,7 @@ double GetDistanceToEvent(TTrack* track, TEvent* event, double scan_dir, double sd = -sd; // jeśli tylko jeden krok tzn, że event przy poprzednim sprawdzaym torze if (((seg_len <= dzielnik) || (seg_len > (1 - dzielnik))) && (iter < 3)) { // przejście na inny tor - track = track->Neightbour(int(sd), sd); + track = track->Connected(int(sd), sd); start_dist += (1 == krok) ? 0 : back ? -segment->GetLength() : segment->GetLength(); return GetDistanceToEvent(track, event, sd, start_dist, ++iter, 1 == krok ? true : false); } @@ -616,7 +616,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) fCurrentDistance += fTrackLength; // doliczenie kolejnego odcinka do przeskanowanej długości tLast = pTrack; // odhaczenie, że sprawdzony fLastVel = pTrack->VelocityGet(); // prędkość na poprzednio sprawdzonym odcinku - pTrack = pTrack->Neightbour( + pTrack = pTrack->Connected( ( pTrack->eType == tt_Cross ? (sSpeedTable[iLast].iFlags >> 28) : static_cast(fLastDir) ), diff --git a/DynObj.cpp b/DynObj.cpp index f3c24d7f..68c8adb0 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1262,71 +1262,65 @@ int TDynamicObject::Dettach(int dir) .CouplingFlag; // sprzęg po rozłączaniu (czego się nie da odpiąć } -void TDynamicObject::CouplersDettach(double MinDist, int MyScanDir) -{ // funkcja rozłączajaca podłączone sprzęgi, - // jeśli odległość przekracza (MinDist) +void TDynamicObject::CouplersDettach(double MinDist, int MyScanDir) { + // funkcja rozłączajaca podłączone sprzęgi, jeśli odległość przekracza (MinDist) // MinDist - dystans minimalny, dla ktorego mozna rozłączać - if (MyScanDir > 0) - { - if (PrevConnected) // pojazd od strony sprzęgu 0 - { - if (MoverParameters->Couplers[0].CoupleDist > MinDist) { - // sprzęgi wirtualne zawsze przekraczają - - if ((PrevConnectedNo ? PrevConnected->NextConnected : - PrevConnected->PrevConnected) == this) - { // Ra: nie rozłączamy znalezionego, jeżeli nie do nas - // podłączony (może jechać w - // innym kierunku) - PrevConnected->MoverParameters->Couplers[PrevConnectedNo].Connected = NULL; - if (PrevConnectedNo == 0) - { - PrevConnected->PrevConnectedNo = 2; // sprzęg 0 nie podłączony - PrevConnected->PrevConnected = NULL; - } - else if (PrevConnectedNo == 1) - { - PrevConnected->NextConnectedNo = 2; // sprzęg 1 nie podłączony - PrevConnected->NextConnected = NULL; - } + if (MyScanDir > 0) { + // pojazd od strony sprzęgu 0 + if( ( PrevConnected != nullptr ) + && ( MoverParameters->Couplers[ TMoverParameters::side::front ].CoupleDist > MinDist ) ) { + // sprzęgi wirtualne zawsze przekraczają + if( ( PrevConnectedNo == TMoverParameters::side::front ? + PrevConnected->PrevConnected : + PrevConnected->NextConnected ) + == this ) { + // Ra: nie rozłączamy znalezionego, jeżeli nie do nas podłączony + // (może jechać w innym kierunku) + PrevConnected->MoverParameters->Couplers[PrevConnectedNo].Connected = nullptr; + if( PrevConnectedNo == TMoverParameters::side::front ) { + // sprzęg 0 nie podłączony + PrevConnected->PrevConnectedNo = 2; + PrevConnected->PrevConnected = nullptr; + } + else if( PrevConnectedNo == TMoverParameters::side::rear ) { + // sprzęg 1 nie podłączony + PrevConnected->NextConnectedNo = 2; + PrevConnected->NextConnected = nullptr; } - - // za to zawsze odłączamy siebie - PrevConnected = NULL; - PrevConnectedNo = 2; // sprzęg 0 nie podłączony - MoverParameters->Couplers[0].Connected = nullptr; } + // za to zawsze odłączamy siebie + PrevConnected = nullptr; + PrevConnectedNo = 2; // sprzęg 0 nie podłączony + MoverParameters->Couplers[ TMoverParameters::side::front ].Connected = nullptr; } } - else - { - if (NextConnected) // pojazd od strony sprzęgu 1 - { - if (MoverParameters->Couplers[1].CoupleDist > MinDist) { - // sprzęgi wirtualne zawsze przekraczają - - if ((NextConnectedNo ? NextConnected->NextConnected : - NextConnected->PrevConnected) == this) - { // Ra: nie rozłączamy znalezionego, jeżeli nie do nas - // podłączony (może jechać w - // innym kierunku) - NextConnected->MoverParameters->Couplers[NextConnectedNo].Connected = NULL; - if (NextConnectedNo == 0) - { - NextConnected->PrevConnectedNo = 2; // sprzęg 0 nie podłączony - NextConnected->PrevConnected = NULL; - } - else if (NextConnectedNo == 1) - { - NextConnected->NextConnectedNo = 2; // sprzęg 1 nie podłączony - NextConnected->NextConnected = NULL; - } + else { + // pojazd od strony sprzęgu 1 + if( ( NextConnected != nullptr ) + && ( MoverParameters->Couplers[ TMoverParameters::side::rear ].CoupleDist > MinDist ) ) { + // sprzęgi wirtualne zawsze przekraczają + if( ( NextConnectedNo == TMoverParameters::side::front ? + NextConnected->PrevConnected : + NextConnected->NextConnected ) + == this) { + // Ra: nie rozłączamy znalezionego, jeżeli nie do nas podłączony + // (może jechać w innym kierunku) + NextConnected->MoverParameters->Couplers[ NextConnectedNo ].Connected = nullptr; + if( NextConnectedNo == TMoverParameters::side::front ) { + // sprzęg 0 nie podłączony + NextConnected->PrevConnectedNo = 2; + NextConnected->PrevConnected = nullptr; + } + else if( NextConnectedNo == TMoverParameters::side::rear ) { + // sprzęg 1 nie podłączony + NextConnected->NextConnectedNo = 2; + NextConnected->NextConnected = nullptr; } - - NextConnected = NULL; - NextConnectedNo = 2; // sprzęg 1 nie podłączony - MoverParameters->Couplers[1].Connected = nullptr; } + // za to zawsze odłączamy siebie + NextConnected = nullptr; + NextConnectedNo = 2; // sprzęg 1 nie podłączony + MoverParameters->Couplers[1].Connected = nullptr; } } } @@ -1428,6 +1422,18 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) if( foundobject->MoverParameters->Couplers[ foundcoupler ].CouplingFlag == coupling::faux ) { // Ra: wpinamy się wirtualnym tylko jeśli znaleziony ma wirtualny sprzęg + if( ( foundcoupler == TMoverParameters::side::front ? + foundobject->PrevConnected : + foundobject->NextConnected ) + != this ) { + // but first break existing connection of the target, + // otherwise we risk leaving the target's connected vehicle with active one-side connection + foundobject->CouplersDettach( + 1.0, + ( foundcoupler == TMoverParameters::side::front ? + 1 : + -1 ) ); + } foundobject->MoverParameters->Attach( foundcoupler, mycoupler, this->MoverParameters, coupling::faux ); if( foundcoupler == TMoverParameters::side::front ) { @@ -2577,15 +2583,19 @@ bool TDynamicObject::Update(double dt, double dt1) tp.CategoryFlag = MyTrack->iCategoryFlag & 15; tp.DamageFlag = MyTrack->iDamageFlag; tp.QualityFlag = MyTrack->iQualityFlag; - if ((MoverParameters->Couplers[0].CouplingFlag > 0) && - (MoverParameters->Couplers[1].CouplingFlag > 0)) - { + + // couplers + if( ( MoverParameters->Couplers[ 0 ].CouplingFlag != coupling::faux ) + && ( MoverParameters->Couplers[ 1 ].CouplingFlag != coupling::faux ) ) { + MoverParameters->InsideConsist = true; } - else - { + else { + MoverParameters->InsideConsist = false; } + // + // napiecie sieci trakcyjnej // Ra 15-01: przeliczenie poboru prądu powinno być robione wcześniej, żeby na // tym etapie były diff --git a/Event.cpp b/Event.cpp index 42ee01c3..5461c74d 100644 --- a/Event.cpp +++ b/Event.cpp @@ -140,10 +140,7 @@ void TEvent::Conditions(cParser *parser, std::string s) void TEvent::Load(cParser *parser, vector3 *org) { - int i; - int ti; std::string token; - //string str; bEnabled = true; // zmieniane na false dla eventów używanych do skanowania sygnałów @@ -247,47 +244,47 @@ void TEvent::Load(cParser *parser, vector3 *org) *parser >> token; Conditions(parser, token); // sprawdzanie warunków break; - case tp_CopyValues: - Params[9].asText = NULL; + case tp_CopyValues: { + Params[9].asText = nullptr; iFlags = update_memstring | update_memval1 | update_memval2; // normalanie trzy - i = 0; + int paramidx { 0 }; parser->getTokens(); *parser >> token; // nazwa drugiej komórki (źródłowej) - while (token.compare("endevent") != 0) - { - switch (++i) + while (token.compare("endevent") != 0) { + + switch (++paramidx) { // znaczenie kolejnych parametrów case 1: // nazwa drugiej komórki (źródłowej) Params[9].asText = new char[token.size() + 1]; // usuwane i zamieniane na wskaźnik strcpy(Params[9].asText, token.c_str()); break; case 2: // maska wartości - iFlags = stol_def(token, - (update_memstring | update_memval1 | update_memval2)); + iFlags = stol_def(token, (update_memstring | update_memval1 | update_memval2)); break; } parser->getTokens(); *parser >> token; } break; - case tp_WhoIs: + } + case tp_WhoIs: { iFlags = update_memstring | update_memval1 | update_memval2; // normalanie trzy - i = 0; + int paramidx { 0 }; parser->getTokens(); *parser >> token; // nazwa drugiej komórki (źródłowej) - while (token.compare("endevent") != 0) - { - switch (++i) - { // znaczenie kolejnych parametrów - case 1: // maska wartości - iFlags = stol_def(token, - (update_memstring | update_memval1 | update_memval2)); - break; + while( token.compare( "endevent" ) != 0 ) { + switch( ++paramidx ) { // znaczenie kolejnych parametrów + case 1: // maska wartości + iFlags = stol_def( token, ( update_memstring | update_memval1 | update_memval2 ) ); + break; + default: + break; } parser->getTokens(); *parser >> token; } break; + } case tp_GetValues: case tp_LogValues: parser->getTokens(); //"endevent" @@ -384,25 +381,27 @@ void TEvent::Load(cParser *parser, vector3 *org) parser->getTokens(); *parser >> token; break; - case tp_Lights: - i = 0; - do - { + case tp_Lights: { + int paramidx { 0 }; + do { parser->getTokens(); *parser >> token; - if (token.compare("endevent") != 0) - { - // str = AnsiString(token.c_str()); - if (i < 8) - Params[i].asdouble = atof(token.c_str()); // teraz może mieć ułamek - i++; + if( token.compare( "endevent" ) != 0 ) { + + if( paramidx < 8 ) { + Params[ paramidx ].asdouble = atof( token.c_str() ); // teraz może mieć ułamek + ++paramidx; + } + else { + ErrorLog( "Bad event: lights event \"" + asName + "\" with more than 8 parameters" ); + } } - } while (token.compare("endevent") != 0); + } while( token.compare( "endevent" ) != 0 ); break; + } case tp_Visible: // zmiana wyświetlania obiektu parser->getTokens(); *parser >> token; - // str = AnsiString(token.c_str()); Params[0].asInt = atoi(token.c_str()); parser->getTokens(); *parser >> token; @@ -410,7 +409,6 @@ void TEvent::Load(cParser *parser, vector3 *org) case tp_Velocity: parser->getTokens(); *parser >> token; - // str = AnsiString(token.c_str()); Params[0].asdouble = atof(token.c_str()) * 0.28; parser->getTokens(); *parser >> token; @@ -544,38 +542,46 @@ void TEvent::Load(cParser *parser, vector3 *org) parser->getTokens(); *parser >> token; break; - case tp_Multiple: - i = 0; - ti = 0; // flaga dla else + case tp_Multiple: { + int paramidx { 0 }; + bool ti { false }; // flaga dla else parser->getTokens(); *parser >> token; - // str = AnsiString(token.c_str()); - while (token != "endevent" && token != "condition" && - token != "randomdelay") - { - if ((token.substr(0, 5) != "none_") ? (i < 8) : false) - { // eventy rozpoczynające się od "none_" są ignorowane - if (token != "else") - { - Params[i].asText = new char[token.size() + 1]; - strcpy(Params[i].asText, token.c_str()); - if (ti) - iFlags |= conditional_else << i; // oflagowanie dla eventów "else" - i++; + + while( ( token != "endevent" ) + && ( token != "condition" ) + && ( token != "randomdelay" ) ) { + + if( token != "else" ) { + if( token.substr( 0, 5 ) != "none_" ) { + // eventy rozpoczynające się od "none_" są ignorowane + if( paramidx < 8 ) { + Params[ paramidx ].asText = new char[ token.size() + 1 ]; + strcpy( Params[ paramidx ].asText, token.c_str() ); + if( ti ) { + // oflagowanie dla eventów "else" + iFlags |= conditional_else << paramidx; + } + ++paramidx; + } + else { + ErrorLog( "Bad event: multi-event \"" + asName + "\" with more than 8 events; discarding link to event \"" + token + "\"" ); + } + } + else { + WriteLog( "Multi-event \"" + asName + "\" ignored link to event \"" + token + "\"" ); } - else - ti = !ti; // zmiana flagi dla słowa "else" } - else if (i >= 8) - ErrorLog("Bad event: \"" + token + "\" ignored in multiple \"" + asName + "\"!"); - else - WriteLog("Event \"" + token + "\" ignored in multiple \"" + asName + "\"!"); + else { + // zmiana flagi dla słowa "else" + ti = !ti; + } parser->getTokens(); *parser >> token; - // str = AnsiString(token.c_str()); } Conditions(parser, token); // sprawdzanie warunków break; + } case tp_Voltage: // zmiana napięcia w zasilaczu (TractionPowerSource) case tp_Friction: // zmiana przyczepnosci na scenerii parser->getTokens(); diff --git a/Ground.cpp b/Ground.cpp index 8c2a349d..482ced09 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2175,11 +2175,11 @@ bool TGround::Init(std::string File) { // możliwość przedefiniowania parametrów w scenerii Global::ConfigParse(parser); // parsowanie dodatkowych ustawień } - else if (str != "") - { // pomijanie od nierozpoznanej komendy do jej zakończenia - if ((token.length() > 2) && (atof(token.c_str()) == 0.0)) - { // jeśli nie liczba, to spróbować pominąć komendę - WriteLog("Unrecognized command: " + str); + else if (str != "") { + // pomijanie od nierozpoznanej komendy do jej zakończenia + if ((token.length() > 2) && (atof(token.c_str()) == 0.0)) { + // jeśli nie liczba, to spróbować pominąć komendę + WriteLog( "Unrecognized command: \"" + str + "\" encountered in file \"" + parser.Name() + "\" (line " + std::to_string( parser.Line() - 1 ) + ")" ); str = "end" + str; do { @@ -2188,8 +2188,10 @@ bool TGround::Init(std::string File) parser >> token; } while ((token != "") && (token.compare(str.c_str()) != 0)); } - else // jak liczba to na pewno błąd - Error("Unrecognized command: " + str); + else { + // jak liczba to na pewno błąd + ErrorLog( "Unrecognized command: \"" + str + "\" encountered in file \"" + parser.Name() + "\" (line " + std::to_string( parser.Line() - 1 ) + ")" ); + } } token = ""; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index bcb743c9..642c7bfb 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -813,7 +813,6 @@ public: voltage }; #endif - int ScanCounter = 0; /*pomocnicze do skanowania sprzegow*/ bool EventFlag = false; /*!o true jesli cos nietypowego sie wydarzy*/ int SoundFlag = 0; /*!o patrz stale sound_ */ double DistCounter = 0.0; /*! licznik kilometrow */ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 088e0074..8f00004a 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -473,7 +473,7 @@ bool TMoverParameters::Attach(int ConnectNo, int ConnectToNr, TMoverParameters * coupler.Connected = ConnectTo; // tak podpiąć (do siebie) zawsze można, najwyżej będzie wirtualny CouplerDist( ConnectNo ); // przeliczenie odległości pomiędzy sprzęgami - if (CouplingType == ctrain_virtual) + if (CouplingType == coupling::faux) return false; // wirtualny więcej nic nie robi auto &othercoupler = ConnectTo->Couplers[ coupler.ConnectedNr ]; @@ -555,21 +555,29 @@ bool TMoverParameters::Dettach(int ConnectNo) return false; // jeszcze nie rozłączony }; -void TMoverParameters::SetCoupleDist() -{ // przeliczenie odległości sprzęgów - if (Couplers[0].Connected) - { - CouplerDist(0); - if (CategoryFlag & 2) - { // Ra: dla samochodów zderzanie kul to za mało +// przeliczenie odległości sprzęgów +void TMoverParameters::SetCoupleDist() { +/* + double const MaxDist = 100.0; // 2x average max proximity distance. TODO: rearrange ito something more elegant +*/ + for( int coupleridx = 0; coupleridx <= 1; ++coupleridx ) { + + if( Couplers[ coupleridx ].Connected == nullptr ) { continue; } + + CouplerDist( coupleridx ); + if( CategoryFlag & 2 ) { + // Ra: dla samochodów zderzanie kul to za mało + // NOTE: whatever calculation was supposed to be here, ain't } - } - if (Couplers[1].Connected) - { - CouplerDist(1); - if (CategoryFlag & 2) - { // Ra: dla samochodów zderzanie kul to za mało +/* + if( ( Couplers[ coupleridx ].CouplingFlag == coupling::faux ) + && ( Couplers[ coupleridx ].CoupleDist > MaxDist ) ) { + // zerwij kontrolnie wirtualny sprzeg + // Connected.Couplers[CNext].Connected:=nil; //Ra: ten podłączony niekoniecznie jest wirtualny + Couplers[ coupleridx ].Connected = nullptr; + Couplers[ coupleridx ].ConnectedNr = 2; } +*/ } }; @@ -3725,14 +3733,12 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) else { Voltage = 0; } - //if (Mains && /*(abs(CabNo) < 2) &&*/ ( - // EngineType == ElectricInductionMotor)) // potem ulepszyc! pantogtrafy! - // Voltage = RunningTraction.TractionVoltage; if (Power > 0) FTrain = TractionForce(dt); else FTrain = 0; + Fb = BrakeForce(RunningTrack); Fwheels = FTrain - Fb * Sign(V); if( ( Vel > 0.001 ) // crude trap, to prevent braked stationary vehicles from passing fb > mass * adhesive test @@ -3966,7 +3972,7 @@ double TMoverParameters::Adhesive(double staticfriction) // WriteLog(FloatToStr(adhesive)); // tutaj jest na poziomie 0.2 - 0.3 return adhesion; */ - /* //wersja druga + //wersja druga if( true == SlippingWheels ) { if( true == SandDose ) { adhesion = 0.48; } @@ -3977,12 +3983,15 @@ double TMoverParameters::Adhesive(double staticfriction) if( true == SandDose ) { adhesion = std::max( staticfriction * ( 100.0 + Vel ) / ( 50.0 + Vel ) * 1.1, 0.48 ); } else { adhesion = staticfriction * ( 100.0 + Vel ) / ( 50.0 + Vel ); } } - adhesion *= ( 11.0 - 2 * Random() ) / 10.0; */ +// adhesion *= ( 0.9 + 0.2 * Random() ); +/* //wersja3 by youBy - uwzględnia naturalne mikropoślizgi i wpływ piasecznicy, usuwa losowość z pojazdu double Vwheels = nrot * M_PI * WheelDiameter; // predkosc liniowa koła wynikająca z obrotowej double deltaV = V - Vwheels; //poślizg - różnica prędkości w punkcie styku koła i szyny deltaV = std::max(0.0, std::abs(deltaV) - 0.25); //mikropoślizgi do ok. 0,25 m/s nie zrywają przyczepności - adhesion = staticfriction * (28 + Vwheels) / (14 + Vwheels) * ((SandDose? sandfactor : 1) - (1 - adh_factor)*(deltaV / (deltaV + slipfactor))); + Vwheels = std::abs( Vwheels ); + adhesion = staticfriction * (28 + Vwheels) / (14 + Vwheels) * ((SandDose? sandfactor : 1) - (1 - adh_factor)*(deltaV / (deltaV + slipfactor))); +*/ return adhesion; } @@ -4052,24 +4061,11 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) // blablabla // ABu: proby znalezienia problemu ze zle odbijajacymi sie skladami //if (Couplers[CouplerN].CouplingFlag=ctrain_virtual) and (newdist>0) then - if ((Couplers[CouplerN].CouplingFlag == ctrain_virtual) && (Couplers[CouplerN].CoupleDist > 0)) - { - CF = 0; // kontrola zderzania sie - OK - ScanCounter++; - if ((newdist > MaxDist) || ((ScanCounter > MaxCount) && (newdist > MinDist))) - //if (tempdist>MaxDist) or ((ScanCounter>MaxCount)and(tempdist>MinDist)) then - { // zerwij kontrolnie wirtualny sprzeg - // Connected.Couplers[CNext].Connected:=nil; //Ra: ten podłączony niekoniecznie jest - // wirtualny -// Couplers[CouplerN].Connected = NULL; - ScanCounter = static_cast(Random(500.0)); // Q: TODO: cy dobrze przetlumaczone? - // WriteLog(FloatToStr(ScanCounter)); - } - } - else - { - if (Couplers[CouplerN].CouplingFlag == ctrain_virtual) - { + if( ( Couplers[ CouplerN ].CouplingFlag != coupling::faux ) + || ( Couplers[ CouplerN ].CoupleDist < 0 ) ) { + + if( Couplers[ CouplerN ].CouplingFlag == coupling::faux ) { + BetaAvg = Couplers[CouplerN].beta; Fmax = (Couplers[CouplerN].FmaxC + Couplers[CouplerN].FmaxB) * CouplerTune; } @@ -4145,18 +4141,20 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) //***if -tempdist>(DmaxB+Connected^.Couplers[CNext].DmaxB)/10 then {zderzenie} { Couplers[CouplerN].CheckCollision = true; - if ((Couplers[CouplerN].CouplerType == Automatic) && - (Couplers[CouplerN].CouplingFlag == - 0)) // sprzeganie wagonow z samoczynnymi sprzegami} + if( ( Couplers[ CouplerN ].CouplerType == Automatic ) + && ( Couplers[ CouplerN ].CouplingFlag == coupling::faux ) ) { + // sprzeganie wagonow z samoczynnymi sprzegami} // CouplingFlag:=ctrain_coupler+ctrain_pneumatic+ctrain_controll+ctrain_passenger+ctrain_scndpneumatic; - Couplers[CouplerN].CouplingFlag = - ctrain_coupler | ctrain_pneumatic | ctrain_controll; // EN57 + // EN57 + Couplers[ CouplerN ].CouplingFlag = coupling::coupler | coupling::brakehose | coupling::mainhose | coupling::control; + } } } } - if (Couplers[CouplerN].CouplingFlag != ctrain_virtual) + if( Couplers[ CouplerN ].CouplingFlag != coupling::faux ) { // uzgadnianie prawa Newtona - Couplers[CouplerN].Connected->Couplers[1 - CouplerN].CForce = -CF; + Couplers[ CouplerN ].Connected->Couplers[ 1 - CouplerN ].CForce = -CF; + } return CF; } diff --git a/Timer.cpp b/Timer.cpp index 1ddd600b..e78b50a7 100644 --- a/Timer.cpp +++ b/Timer.cpp @@ -66,9 +66,9 @@ void ResetTimers() }; LONGLONG fr, count, oldCount; -// LARGE_INTEGER fr,count; -void UpdateTimers(bool pause) -{ + +void UpdateTimers(bool pause) { + QueryPerformanceFrequency((LARGE_INTEGER *)&fr); QueryPerformanceCounter((LARGE_INTEGER *)&count); DeltaRenderTime = double(count - oldCount) / double(fr); @@ -78,18 +78,14 @@ void UpdateTimers(bool pause) fSoundTimer += DeltaTime; if (fSoundTimer > 0.1) fSoundTimer = 0.0; - /* - double CurrentTime= double(count)/double(fr);//GetTickCount(); - DeltaTime= (CurrentTime-OldTime); - OldTime= CurrentTime; - */ + if (DeltaTime > 1.0) DeltaTime = 1.0; } else DeltaTime = 0.0; // wszystko stoi, bo czas nie płynie - oldCount = count; + oldCount = count; // Keep track of the time lapse and frame count #if _WIN32_WINNT >= _WIN32_WINNT_VISTA double fTime = ::GetTickCount64() * 0.001f; // Get current time in seconds @@ -106,6 +102,7 @@ void UpdateTimers(bool pause) } fSimulationTime += DeltaTime; }; -}; + +}; // namespace timer //--------------------------------------------------------------------------- diff --git a/Track.cpp b/Track.cpp index 6814d710..ed464b22 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2340,7 +2340,7 @@ void TTrack::ConnectionsLog() } }; -TTrack * TTrack::Neightbour(int s, double &d) +TTrack * TTrack::Connected(int s, double &d) const { // zwraca wskaźnik na sąsiedni tor, w kierunku określonym znakiem (s), odwraca (d) w razie // niezgodności kierunku torów TTrack *t; // nie zmieniamy kierunku (d), jeśli nie ma toru dalej diff --git a/Track.h b/Track.h index 323bfb69..91ea6138 100644 --- a/Track.h +++ b/Track.h @@ -205,7 +205,7 @@ public: return trNext; }; inline TTrack *CurrentPrev() const { return trPrev; }; - TTrack * Neightbour(int s, double &d); + TTrack *Connected(int s, double &d) const; bool SetConnections(int i); bool Switch(int i, double t = -1.0, double d = -1.0); bool SwitchForced(int i, TDynamicObject *o); diff --git a/Train.cpp b/Train.cpp index c6f54547..5cd946e8 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1430,10 +1430,14 @@ void TTrain::OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_d if( Train->mvControlled->bPantKurek3 == false ) { // connect pantographs with primary tank Train->mvControlled->bPantKurek3 = true; + // visual feedback: + Train->ggPantCompressorValve.UpdateValue( 0.0 ); } else { // connect pantograps with pantograph compressor Train->mvControlled->bPantKurek3 = false; + // visual feedback: + Train->ggPantCompressorValve.UpdateValue( 1.0 ); } } } @@ -1456,10 +1460,14 @@ void TTrain::OnCommand_pantographcompressoractivate( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // press or hold to activate Train->mvControlled->PantCompFlag = true; + // visual feedback: + Train->ggPantCompressorButton.UpdateValue( 1.0 ); } else { // release to disable Train->mvControlled->PantCompFlag = false; + // visual feedback: + Train->ggPantCompressorButton.UpdateValue( 0.0 ); } } @@ -4627,35 +4635,38 @@ bool TTrain::Update( double const Deltatime ) ggBrakeCtrl.UpdateValue(mvOccupied->fBrakeCtrlPos); ggBrakeCtrl.Update(); } - if (ggLocalBrake.SubModel) - { - if (DynamicObject->Mechanik ? - (DynamicObject->Mechanik->AIControllFlag ? false : (Global::iFeedbackMode == 4 || (Global::bMWDmasterEnable && Global::bMWDBreakEnable))) : - false) // nie blokujemy AI - { // Ra: nie najlepsze miejsce, ale na początek gdzieś to dać trzeba - // Firleju: dlatego kasujemy i zastepujemy funkcją w Console - if ((mvOccupied->BrakeLocHandle == FD1)) - { - double b = Console::AnalogCalibrateGet(1); - b *= 10.0; - b = clamp( b, 0.0, LocalBrakePosNo); // przycięcie zmiennej do granic - ggLocalBrake.UpdateValue(b); // przesów bez zaokrąglenia - if (Global::bMWDdebugEnable && Global::iMWDDebugMode & 4) WriteLog("FD1 break position = " + to_string(b)); - mvOccupied->LocalBrakePos = - int(1.09 * b); // sposób zaokrąglania jest do ustalenia + + if( ggLocalBrake.SubModel ) { + + if( ( DynamicObject->Mechanik != nullptr ) + && ( false == DynamicObject->Mechanik->AIControllFlag ) // nie blokujemy AI + && ( mvOccupied->BrakeLocHandle == FD1 ) + && ( ( Global::iFeedbackMode == 4 ) + || ( Global::bMWDmasterEnable && Global::bMWDBreakEnable ) ) ) { + // Ra: nie najlepsze miejsce, ale na początek gdzieś to dać trzeba + // Firleju: dlatego kasujemy i zastepujemy funkcją w Console + auto const b = clamp( + Console::AnalogCalibrateGet( 1 ) * 10.0, + 0.0, + ManualBrakePosNo ); + ggLocalBrake.UpdateValue( b ); // przesów bez zaokrąglenia + mvOccupied->LocalBrakePos = int( 1.09 * b ); // sposób zaokrąglania jest do ustalenia + if( ( true == Global::bMWDdebugEnable ) + && ( ( Global::iMWDDebugMode & 4 ) != 0 ) ) { + WriteLog( "FD1 break position = " + to_string( b ) ); } - else // standardowa prodedura z kranem powiązanym z klawiaturą - ggLocalBrake.UpdateValue(double(mvOccupied->LocalBrakePos)); } - else // standardowa prodedura z kranem powiązanym z klawiaturą - ggLocalBrake.UpdateValue(double(mvOccupied->LocalBrakePos)); + else { + // standardowa prodedura z kranem powiązanym z klawiaturą + ggLocalBrake.UpdateValue( double( mvOccupied->LocalBrakePos ) ); + } ggLocalBrake.Update(); } - if (ggManualBrake.SubModel != NULL) - { + if (ggManualBrake.SubModel != nullptr) { ggManualBrake.UpdateValue(double(mvOccupied->ManualBrakePos)); ggManualBrake.Update(); } + ggAlarmChain.Update(); ggBrakeProfileCtrl.Update(); ggBrakeProfileG.Update(); ggBrakeProfileR.Update(); @@ -5629,6 +5640,8 @@ bool TTrain::Update( double const Deltatime ) ggPantRearButtonOff.Update(); ggPantSelectedDownButton.Update(); ggPantAllDownButton.Update(); + ggPantCompressorButton.Update(); + ggPantCompressorValve.Update(); ggUpperLightButton.Update(); ggLeftLightButton.Update(); @@ -6503,6 +6516,8 @@ void TTrain::clear_cab_controls() ggPantRearButtonOff.Clear(); ggPantSelectedDownButton.Clear(); ggPantAllDownButton.Clear(); + ggPantCompressorButton.Clear(); + ggPantCompressorValve.Clear(); ggZbS.Clear(); ggI1B.Clear(); ggI2B.Clear(); @@ -6649,6 +6664,15 @@ void TTrain::set_cab_controls() { 0.0 : 1.0 ) ); } + // auxiliary compressor + ggPantCompressorValve.PutValue( + mvControlled->bPantKurek3 ? + 0.0 : // default setting is pantographs connected with primary tank + 1.0 ); + ggPantCompressorButton.PutValue( + mvControlled->PantCompFlag ? + 1.0 : + 0.0 ); // converter if( mvOccupied->ConvSwitchType != "impulse" ) { ggConverterButton.PutValue( @@ -7067,6 +7091,8 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "pantalloff_sw:", ggPantAllDownButton }, { "pantselected_sw:", ggPantSelectedButton }, { "pantselectedoff_sw:", ggPantSelectedDownButton }, + { "pantcompressor_sw:", ggPantCompressorButton }, + { "pantcompressorvalve_sw:", ggPantCompressorValve }, { "trainheating_sw:", ggTrainHeatingButton }, { "signalling_sw:", ggSignallingButton }, { "door_signalling_sw:", ggDoorSignallingButton }, diff --git a/Train.h b/Train.h index 90a5ac6d..166f2cc1 100644 --- a/Train.h +++ b/Train.h @@ -299,6 +299,8 @@ public: // reszta może by?publiczna TGauge ggPantAllDownButton; TGauge ggPantSelectedButton; TGauge ggPantSelectedDownButton; + TGauge ggPantCompressorButton; + TGauge ggPantCompressorValve; // Winger 020304 - wlacznik ogrzewania TGauge ggTrainHeatingButton; TGauge ggSignallingButton; diff --git a/TrkFoll.cpp b/TrkFoll.cpp index c48ecac6..ceddcb1c 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -206,10 +206,10 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) dir = fDirection; if (pCurrentTrack->eType == tt_Cross) { - if (!SetCurrentTrack(pCurrentTrack->Neightbour(iSegment, fDirection), 0)) + if (!SetCurrentTrack(pCurrentTrack->Connected(iSegment, fDirection), 0)) return false; // wyjście z błędem } - else if (!SetCurrentTrack(pCurrentTrack->Neightbour(-1, fDirection), + else if (!SetCurrentTrack(pCurrentTrack->Connected(-1, fDirection), 0)) // ustawia fDirection return false; // wyjście z błędem if (dir == fDirection) //(pCurrentTrack->iPrevDirection) @@ -243,10 +243,10 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) dir = fDirection; if (pCurrentTrack->eType == tt_Cross) { - if (!SetCurrentTrack(pCurrentTrack->Neightbour(iSegment, fDirection), 1)) + if (!SetCurrentTrack(pCurrentTrack->Connected(iSegment, fDirection), 1)) return false; // wyjście z błędem } - else if (!SetCurrentTrack(pCurrentTrack->Neightbour(1, fDirection), + else if (!SetCurrentTrack(pCurrentTrack->Connected(1, fDirection), 1)) // ustawia fDirection return false; // wyjście z błędem if (dir != fDirection) //(pCurrentTrack->iNextDirection) diff --git a/version.h b/version.h index 998e22bf..49b29887 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 905 +#define VERSION_MINOR 908 #define VERSION_REVISION 0 From 24221163cc33c05c2c15a284aa0da2a2944cd8f3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 9 Sep 2017 17:33:21 +0200 Subject: [PATCH 188/426] maintenance: removed deprecated settings --- EU07.cpp | 61 +++++++++++++++++-------------------- Globals.cpp | 86 ----------------------------------------------------- Globals.h | 36 +--------------------- Ground.cpp | 3 ++ World.cpp | 85 ---------------------------------------------------- World.h | 1 - 6 files changed, 32 insertions(+), 240 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 78d26c69..5879c7e3 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -309,10 +309,7 @@ int main(int argc, char *argv[]) { std::string token(argv[i]); - if (token == "-modifytga") - Global::iModifyTGA = -1; - else if (token == "-e3d") - { + if (token == "-e3d") { if (Global::iConvertModels > 0) Global::iConvertModels = -Global::iConvertModels; else @@ -328,8 +325,12 @@ int main(int argc, char *argv[]) } else { - std::cout << "usage: " << std::string(argv[0]) << " [-s sceneryfilepath] " - << "[-v vehiclename] [-modifytga] [-e3d]" << std::endl; + std::cout + << "usage: " << std::string(argv[0]) + << " [-s sceneryfilepath]" + << " [-v vehiclename]" + << " [-e3d]" + << std::endl; return -1; } } @@ -438,37 +439,31 @@ int main(int argc, char *argv[]) if( !joyGetNumDevs() ) WriteLog( "No joystick" ); */ - if( Global::iModifyTGA < 0 ) { // tylko modyfikacja TGA, bez uruchamiania symulacji - Global::iMaxTextureSize = 64; //żeby nie zamulać pamięci - World.ModifyTGA(); // rekurencyjne przeglądanie katalogów - } - else { - if( Global::iConvertModels < 0 ) { - Global::iConvertModels = -Global::iConvertModels; - World.CreateE3D( "models\\" ); // rekurencyjne przeglądanie katalogów - World.CreateE3D( "dynamic\\", true ); - } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć + if( Global::iConvertModels < 0 ) { + Global::iConvertModels = -Global::iConvertModels; + World.CreateE3D( "models\\" ); // rekurencyjne przeglądanie katalogów + World.CreateE3D( "dynamic\\", true ); + } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć - Console::On(); // włączenie konsoli + Console::On(); // włączenie konsoli - try { - while( ( false == glfwWindowShouldClose( window ) ) - && ( true == World.Update() ) - && ( true == GfxRenderer.Render() ) ) { - glfwPollEvents(); - input::Keyboard.poll(); - if( true == Global::InputMouse ) { input::Mouse.poll(); } - if( true == Global::InputGamepad ) { input::Gamepad.poll(); } - } + try { + while( ( false == glfwWindowShouldClose( window ) ) + && ( true == World.Update() ) + && ( true == GfxRenderer.Render() ) ) { + glfwPollEvents(); + input::Keyboard.poll(); + if( true == Global::InputMouse ) { input::Mouse.poll(); } + if( true == Global::InputGamepad ) { input::Gamepad.poll(); } } - catch( std::bad_alloc const &Error ) { - - ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) ); - return -1; - } - - Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) } + catch( std::bad_alloc const &Error ) { + + ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) ); + return -1; + } + + Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) TPythonInterpreter::killInstance(); delete pConsole; diff --git a/Globals.cpp b/Globals.cpp index 780b5697..67a39d47 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -55,11 +55,8 @@ double Global::fTimeAngleDeg = 0.0; // godzina w postaci kąta float Global::fClockAngleDeg[6]; // kąty obrotu cylindrów dla zegara cyfrowego std::string Global::szTexturesTGA = ".tga"; // lista tekstur od TGA std::string Global::szTexturesDDS = ".dds"; // lista tekstur od DDS -int Global::iKeyLast = 0; // ostatnio naciśnięty klawisz w celu logowania int Global::iPause = 0; // 0x10; // globalna pauza ruchu bool Global::bActive = true; // czy jest aktywnym oknem -int Global::iErorrCounter = 0; // licznik sprawdzań do śledzenia błędów OpenGL -int Global::iTextures = 0; // licznik użytych tekstur TWorld *Global::pWorld = NULL; cParser *Global::pParser = NULL; TCamera *Global::pCamera = NULL; // parametry kamery @@ -74,8 +71,6 @@ double Global::pCameraRotation; double Global::pCameraRotationDeg; std::vector Global::FreeCameraInit; std::vector Global::FreeCameraInitAngle; -float Global::Background[3] = {0.2f, 0.4f, 0.33f}; -GLfloat Global::AtmoColor[] = {0.423f, 0.702f, 1.0f}; GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; double Global::fFogStart = 1700; double Global::fFogEnd = 2000; @@ -122,10 +117,6 @@ bool Global::bEnableTraction = true; bool Global::bLoadTraction = true; bool Global::bLiveTraction = true; float Global::AnisotropicFiltering = 8.0f; // requested level of anisotropic filtering. TODO: move it to renderer object -int Global::iDefaultFiltering = 9; // domyślne rozmywanie tekstur TGA bez alfa -int Global::iBallastFiltering = 9; // domyślne rozmywanie tekstur podsypki -int Global::iRailProFiltering = 5; // domyślne rozmywanie tekstur szyn -int Global::iDynamicFiltering = 5; // domyślne rozmywanie tekstur pojazdów bool Global::bUseVBO = true; // czy jest VBO w karcie graficznej (czy użyć) std::string Global::LastGLError; GLint Global::iMaxTextureSize = 4096; // maksymalny rozmiar tekstury @@ -138,7 +129,6 @@ bool Global::bGlutFont = false; // czy tekst generowany przez GLUT32.DLL //int Global::iConvertModels = 7; // tworzenie plików binarnych, +2-optymalizacja transformów int Global::iConvertModels{ 0 }; // temporary override, to prevent generation of .e3d not compatible with old exe int Global::iSlowMotionMask = -1; // maska wyłączanych właściwości dla zwiększenia FPS -int Global::iModifyTGA = 7; // czy korygować pliki TGA dla szybszego wczytywania // bool Global::bTerrainCompact=true; //czy zapisać teren w pliku TAnimModel *Global::pTerrainCompact = NULL; // do zapisania terenu w pliku std::string Global::asTerrainModel = ""; // nazwa obiektu terenu do zapisania w pliku @@ -146,17 +136,12 @@ double Global::fFpsAverage = 20.0; // oczekiwana wartosć FPS double Global::fFpsDeviation = 5.0; // odchylenie standardowe FPS double Global::fFpsMin = 30.0; // dolna granica FPS, przy której promień scenerii będzie zmniejszany double Global::fFpsMax = 65.0; // górna granica FPS, przy której promień scenerii będzie zwiększany -double Global::fFpsRadiusMax = 3000.0; // maksymalny promień renderowania -int Global::iFpsRadiusMax = 225; // maksymalny promień renderowania -double Global::fRadiusFactor = 1.1; // współczynnik jednorazowej zmiany promienia scenerii // parametry testowe (do testowania scenerii i obiektów) bool Global::bWireFrame = false; bool Global::bSoundEnabled = true; int Global::iWriteLogEnabled = 3; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów bool Global::MultipleLogs{ false }; -bool Global::bManageNodes = true; -bool Global::bDecompressDDS = false; // czy programowa dekompresja DDS // parametry do kalibracji // kolejno współczynniki dla potęg 0, 1, 2, 3 wartości odczytanej z urządzenia @@ -180,10 +165,8 @@ int Global::iPoKeysPWM[7] = {0, 1, 2, 3, 4, 5, 6}; // bool Global::bTimeChange=false; //Ra: ZiomalCl wyłączył starą wersję nocy // bool Global::bRenderAlpha=true; //Ra: wywaliłam tę flagę bool Global::bnewAirCouplers = true; -bool Global::bDoubleAmbient = false; // podwójna jasność ambient double Global::fTimeSpeed = 1.0; // przyspieszenie czasu, zmienna do testów bool Global::bHideConsole = false; // hunter-271211: ukrywanie konsoli -int Global::iBpp = 32; // chyba już nie używa się kart, na których 16bpp coś poprawi //randomizacja std::mt19937 Global::random_engine = std::mt19937(std::time(NULL)); // maciek001: konfiguracja wstępna portu COM @@ -276,13 +259,6 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(1, false); Parser >> Global::fDistanceFactor; } - else if (token == "bpp") - { - - Parser.getTokens(); - Parser >> token; - Global::iBpp = (token == "32" ? 32 : 16); - } else if (token == "fullscreen") { @@ -409,18 +385,6 @@ void Global::ConfigParse(cParser &Parser) Parser >> token; Global::asSky = (token == "yes" ? "1" : "0"); } - else if (token == "managenodes") - { - - Parser.getTokens(); - Parser >> Global::bManageNodes; - } - else if (token == "decompressdds") - { - - Parser.getTokens(); - Parser >> Global::bDecompressDDS; - } else if (token == "defaultext") { // ShaXbee - domyslne rozszerzenie tekstur @@ -444,30 +408,6 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::bnewAirCouplers; } - else if (token == "defaultfiltering") - { - - Parser.getTokens(1, false); - Parser >> Global::iDefaultFiltering; - } - else if (token == "ballastfiltering") - { - - Parser.getTokens(1, false); - Parser >> Global::iBallastFiltering; - } - else if (token == "railprofiltering") - { - - Parser.getTokens(1, false); - Parser >> Global::iRailProFiltering; - } - else if (token == "dynamicfiltering") - { - - Parser.getTokens(1, false); - Parser >> Global::iDynamicFiltering; - } else if( token == "anisotropicfiltering" ) { Parser.getTokens( 1, false ); @@ -513,12 +453,6 @@ void Global::ConfigParse(cParser &Parser) else if (size <= 8192) { Global::iMaxTextureSize = 8192; } else { Global::iMaxTextureSize = 16384; } } - else if (token == "doubleambient") - { - // podwójna jasność ambient - Parser.getTokens(); - Parser >> Global::bDoubleAmbient; - } else if (token == "movelight") { // numer dnia w roku albo -1 @@ -624,12 +558,6 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(1, false); Parser >> Global::iSlowMotionMask; } - else if (token == "modifytga") - { - // czy korygować pliki TGA dla szybszego wczytywania - Parser.getTokens(1, false); - Parser >> Global::iModifyTGA; - } else if (token == "hideconsole") { // hunter-271211: ukrywanie konsoli @@ -654,12 +582,6 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(1, false); Parser >> Global::fFpsDeviation; } - else if (token == "fpsradiusmax") - { - // maksymalny promień renderowania - Parser.getTokens(1, false); - Parser >> Global::fFpsRadiusMax; - } else if (token == "calibratein") { // parametry kalibracji wejść @@ -807,14 +729,6 @@ void Global::ConfigParse(cParser &Parser) Parser >> token; TPythonInterpreter::getInstance()->setScreenRendererPriority(token.c_str()); } - else if (token == "background") - { - - Parser.getTokens(3, false); - Parser >> Global::Background[0] // r - >> Global::Background[1] // g - >> Global::Background[2]; // b - } else if( token == "input.gamepad" ) { // czy grupować eventy o tych samych nazwach Parser.getTokens(); diff --git a/Globals.h b/Globals.h index 37fefd65..df62bc17 100644 --- a/Globals.h +++ b/Globals.h @@ -130,25 +130,13 @@ class TTranscript float fHide; // czas ukrycia/usunięcia std::string asText; // tekst gotowy do wyświetlenia (usunięte znaczniki czasu) bool bItalic; // czy kursywa (dźwięk nieistotny dla prowadzącego) -/* - int iNext; // następna używana linijka, żeby nie przestawiać fizycznie tabeli -*/ }; -/* -#define MAX_TRANSCRIPTS 30 -*/ class TTranscripts { // klasa obsługująca napisy do dźwięków -/* - TTranscript aLines[MAX_TRANSCRIPTS]; // pozycje na napisy do wyświetlenia -*/ public: std::deque aLines; -/* - int iCount; // liczba zajętych pozycji - int iStart; // pierwsza istotna pozycja w tabeli, żeby sortować przestawiając numerki -*/ + private: float fRefreshTime; @@ -166,7 +154,6 @@ class Global { private: public: - // double Global::tSinceStart; static int Keys[MaxKeys]; static bool RealisticControlMode; // controls ability to steer the vehicle from outside views static Math3D::vector3 pCameraPosition; // pozycja kamery w świecie @@ -179,23 +166,17 @@ class Global static int iWindowWidth; static int iWindowHeight; static float fDistanceFactor; - static int iBpp; static bool bFullScreen; static bool VSync; static bool bFreeFly; - // float RunningTime; static bool bWireFrame; static bool bSoundEnabled; // McZapkie-131202 - // static bool bRenderAlpha; static bool bAdjustScreenFreq; static bool bEnableTraction; static bool bLoadTraction; static float fFriction; static bool bLiveTraction; - static bool bManageNodes; - static bool bDecompressDDS; - // bool WFreeFly; static float Global::fMouseXScale; static float Global::fMouseYScale; static double fFogStart; @@ -217,11 +198,8 @@ class Global static int iWriteLogEnabled; // maska bitowa: 1-zapis do pliku, 2-okienko static bool MultipleLogs; // McZapkie-221002: definicja swiatla dziennego - static float Background[3]; - static GLfloat AtmoColor[]; static GLfloat FogColor[]; static float Overcast; - // static bool bTimeChange; // TODO: put these things in the renderer static float BaseDrawRange; @@ -244,10 +222,6 @@ class Global static bool bnewAirCouplers; // Ra: nowe zmienne globalne static float AnisotropicFiltering; // requested level of anisotropic filtering. TODO: move it to renderer object - static int iDefaultFiltering; // domyślne rozmywanie tekstur TGA - static int iBallastFiltering; // domyślne rozmywanie tekstury podsypki - static int iRailProFiltering; // domyślne rozmywanie tekstury szyn - static int iDynamicFiltering; // domyślne rozmywanie tekstur pojazdów static bool bUseVBO; // czy jest VBO w karcie graficznej static std::string LastGLError; static int iFeedbackMode; // tryb pracy informacji zwrotnej @@ -270,7 +244,6 @@ class Global static bool InputMouse; // whether control pick mode can be activated static int iTextMode; // tryb pracy wyświetlacza tekstowego static int iScreenMode[12]; // numer ekranu wyświetlacza tekstowego - static bool bDoubleAmbient; // podwójna jasność ambient static double fMoveLight; // numer dnia w roku albo -1 static bool FakeLight; // toggle between fixed and dynamic daylight static bool bSmoothTraction; // wygładzanie drutów @@ -284,15 +257,11 @@ class Global static int iMultisampling; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px static bool DLFont; // switch indicating presence of basic font static bool bGlutFont; // tekst generowany przez GLUT - static int iKeyLast; // ostatnio naciśnięty klawisz w celu logowania static int iPause; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie static bool bActive; // czy jest aktywnym oknem static int iConvertModels; // tworzenie plików binarnych - static int iErorrCounter; // licznik sprawdzań do śledzenia błędów OpenGL static bool bInactivePause; // automatyczna pauza, gdy okno nieaktywne - static int iTextures; // licznik użytych tekstur static int iSlowMotionMask; // maska wyłączanych właściwości - static int iModifyTGA; // czy korygować pliki TGA dla szybszego wczytywania static bool bHideConsole; // hunter-271211: ukrywanie konsoli static TWorld *pWorld; // wskaźnik na świat do usuwania pojazdów @@ -304,9 +273,6 @@ class Global static double fFpsDeviation; // odchylenie standardowe FPS static double fFpsMin; // dolna granica FPS, przy której promień scenerii będzie zmniejszany static double fFpsMax; // górna granica FPS, przy której promień scenerii będzie zwiększany - static double fFpsRadiusMax; // maksymalny promień renderowania - static int iFpsRadiusMax; // maksymalny promień renderowania w rozmiarze tabeli sektorów - static double fRadiusFactor; // współczynnik zmiany promienia static TCamera *pCamera; // parametry kamery static TDynamicObject *pUserDynamic; // pojazd użytkownika, renderowany bez trzęsienia static double fCalibrateIn[6][6]; // parametry kalibracyjne wejść z pulpitu diff --git a/Ground.cpp b/Ground.cpp index 482ced09..cf0d9dbb 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2022,10 +2022,13 @@ bool TGround::Init(std::string File) { // Ra: ustawienie parametrów OpenGL przeniesione do FirstInit WriteLog("Scenery atmo definition"); parser.getTokens(3); +/* + // disabled, no longer used parser >> Global::AtmoColor[0] >> Global::AtmoColor[1] >> Global::AtmoColor[2]; +*/ parser.getTokens(2); parser >> Global::fFogStart diff --git a/World.cpp b/World.cpp index e573e275..ca7e97be 100644 --- a/World.cpp +++ b/World.cpp @@ -183,14 +183,10 @@ simulation_time::julian_day() const { TWorld::TWorld() { - // randomize(); - // Randomize(); Train = NULL; - // Aspect=1; for (int i = 0; i < 10; ++i) KeyEvents[i] = NULL; // eventy wyzwalane klawiszami cyfrowymi Global::iSlowMotion = 0; - // Global::changeDynObj=NULL; pDynamicNearest = NULL; fTimeBuffer = 0.0; // bufor czasu aktualizacji dla stałego kroku fizyki fMaxDt = 0.01; //[s] początkowy krok czasowy fizyki @@ -199,7 +195,6 @@ TWorld::TWorld() TWorld::~TWorld() { - Global::bManageNodes = false; // Ra: wyłączenie wyrejestrowania, bo się sypie TrainDelete(); // Ground.Free(); //Ra: usunięcie obiektów przed usunięciem dźwięków - sypie się TSoundsManager::Free(); @@ -218,61 +213,6 @@ void TWorld::TrainDelete(TDynamicObject *d) Global::pUserDynamic = NULL; // tego też nie ma }; -/* Ra: do opracowania: wybor karty graficznej ~Intel gdy są dwie... -BOOL GetDisplayMonitorInfo(int nDeviceIndex, LPSTR lpszMonitorInfo) -{ - FARPROC EnumDisplayDevices; - HINSTANCE hInstUser32; - DISPLAY_DEVICE DispDev; - char szSaveDeviceName[33]; // 32 + 1 for the null-terminator - BOOL bRet = TRUE; - HRESULT hr; - - hInstUser32 = LoadLibrary("c:\\windows\User32.DLL"); - if (!hInstUser32) return FALSE; - - // Get the address of the EnumDisplayDevices function - EnumDisplayDevices = (FARPROC)GetProcAddress(hInstUser32,"EnumDisplayDevicesA"); - if (!EnumDisplayDevices) { - FreeLibrary(hInstUser32); - return FALSE; - } - - ZeroMemory(&DispDev, sizeof(DispDev)); - DispDev.cb = sizeof(DispDev); - - // After the first call to EnumDisplayDevices, - // DispDev.DeviceString is the adapter name - if (EnumDisplayDevices(NULL, nDeviceIndex, &DispDev, 0)) - { - hr = StringCchCopy(szSaveDeviceName, 33, DispDev.DeviceName); - if (FAILED(hr)) - { - // TODO: write error handler - } - - // After second call, DispDev.DeviceString is the - // monitor name for that device - EnumDisplayDevices(szSaveDeviceName, 0, &DispDev, 0); - - // In the following, lpszMonitorInfo must be 128 + 1 for - // the null-terminator. - hr = StringCchCopy(lpszMonitorInfo, 129, DispDev.DeviceString); - if (FAILED(hr)) - { - // TODO: write error handler - } - - } else { - bRet = FALSE; - } - - FreeLibrary(hInstUser32); - - return bRet; -} -*/ - bool TWorld::Init( GLFWwindow *Window ) { auto timestart = std::chrono::system_clock::now(); @@ -822,11 +762,6 @@ void TWorld::OnKeyDown(int cKey) } } } - // switch (cKey) - //{case 'a': //ignorowanie repetycji - // case 'A': Global::iKeyLast=cKey; break; - // default: Global::iKeyLast=0; - //} } void TWorld::OnMouseMove(double x, double y) @@ -2020,26 +1955,6 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) } }; -//--------------------------------------------------------------------------- -void TWorld::ModifyTGA(const std::string &dir) -{ // rekurencyjna modyfikacje plików TGA -/* TODO: implement version without Borland stuff - TSearchRec sr; - if (FindFirst(dir + "*.*", faDirectory | faArchive, sr) == 0) - { - do - { - if (sr.Name[1] != '.') - if ((sr.Attr & faDirectory)) // jeśli katalog, to rekurencja - ModifyTGA(dir + sr.Name + "/"); - else if (sr.Name.LowerCase().SubString(sr.Name.Length() - 3, 4) == ".tga") - TTexturesManager::GetTextureID(NULL, NULL, AnsiString(dir + sr.Name).c_str()); - } while (FindNext(sr) == 0); - FindClose(sr); - } -*/ -}; - //--------------------------------------------------------------------------- void TWorld::CreateE3D(std::string const &Path, bool Dynamic) diff --git a/World.h b/World.h index 54517e7c..ac97a1dd 100644 --- a/World.h +++ b/World.h @@ -140,7 +140,6 @@ private: bool m_init{ false }; // indicates whether initial update of the world was performed public: - void ModifyTGA(std::string const &dir = ""); void CreateE3D(std::string const &dir = "", bool dyn = false); void CabChange(TDynamicObject *old, TDynamicObject *now); // handles vehicle change flag From d75c9ff14d62ce5606cf996719312981d62528df Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 12 Sep 2017 04:30:51 +0200 Subject: [PATCH 189/426] build 170911. right mouse view panning during mouse picking in external view, signal distance calculation fix, AI car braking improvements, cab camera position retains position between view swaps, physics calculations mode switch, consist brake status report in whois event --- Camera.cpp | 4 -- Camera.h | 9 +-- Driver.cpp | 101 ++++++++++++++++---------- Driver.h | 18 ++--- DynObj.cpp | 34 ++++----- Globals.cpp | 5 +- Globals.h | 17 ++--- Ground.cpp | 60 ++++++++++++---- McZapkie/MOVER.h | 2 - McZapkie/Mover.cpp | 25 ++++--- McZapkie/mctools.cpp | 1 + McZapkie/mctools.h | 1 + Train.cpp | 7 +- Train.h | 1 - World.cpp | 23 ++++-- mouseinput.cpp | 164 +++++++++++++++++++++++-------------------- renderer.cpp | 42 ++++++++--- renderer.h | 2 +- version.h | 2 +- 19 files changed, 300 insertions(+), 218 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index 0c7c21ca..ef589bc5 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -25,17 +25,13 @@ void TCamera::Init(vector3 NPos, vector3 NAngle) { vUp = vector3(0, 1, 0); - // pOffset= vector3(-0.8,0,0); - CrossDist = 10; Velocity = vector3(0, 0, 0); Pitch = NAngle.x; Yaw = NAngle.y; Roll = NAngle.z; Pos = NPos; - // Type= tp_Follow; Type = (Global::bFreeFly ? tp_Free : tp_Follow); - // Type= tp_Free; }; void TCamera::OnCursorMove(double x, double y) diff --git a/Camera.h b/Camera.h index a6346f52..09135908 100644 --- a/Camera.h +++ b/Camera.h @@ -46,13 +46,10 @@ class TCamera vector3 LookAt; // współrzędne punktu, na który ma patrzeć vector3 vUp; vector3 Velocity; - vector3 CrossPos; - double CrossDist; void Init(vector3 NPos, vector3 NAngle); - void Reset() - { - Pitch = Yaw = Roll = 0; - }; + inline + void Reset() { + Pitch = Yaw = Roll = 0; }; void OnCursorMove(double const x, double const y); void OnCommand( command_data const &Command ); void Update(); diff --git a/Driver.cpp b/Driver.cpp index a0e2a58f..bf99e184 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -64,12 +64,12 @@ double GetDistanceToEvent(TTrack const *track, TEvent const *event, double scan_ seg_len += scan_dir > 0 ? dzielnik : -dzielnik; len2 = (pos_event - segment->FastGetPoint(seg_len)).LengthSquared(); ++krok; - } while ((len1 > len2) && (seg_len >= dzielnik && (seg_len <= (1 - dzielnik)))); + } while ((len1 > len2) && (seg_len >= dzielnik && (seg_len <= (1.0 - dzielnik)))); //trzeba sprawdzić czy seg_len nie osiągnął skrajnych wartości, bo wtedy // trzeba sprawdzić tor obok if (1 == krok) sd = -sd; // jeśli tylko jeden krok tzn, że event przy poprzednim sprawdzaym torze - if (((seg_len <= dzielnik) || (seg_len > (1 - dzielnik))) && (iter < 3)) + if (((1 == krok) || (seg_len <= dzielnik) || (seg_len > (1.0 - dzielnik))) && (iter < 3)) { // przejście na inny tor track = track->Connected(int(sd), sd); start_dist += (1 == krok) ? 0 : back ? -segment->GetLength() : segment->GetLength(); @@ -3919,6 +3919,13 @@ TController::UpdateSituation(double dt) { fStopTime = 0.0; // nie ma na co czekać z odczepianiem } } + else { + if( mvOccupied->Vel > 0.0 ) { + // 1st phase(?) + // bring it to stop if it's not already stopped + SetVelocity( 0, 0, stopJoin ); // wyłączyć przyspieszanie + } + } } // odczepiania else // to poniżej jeśli ilość wagonów ujemna if (iDrivigFlags & movePress) @@ -3985,8 +3992,8 @@ TController::UpdateSituation(double dt) { } else { // samochod (sokista też) - fMinProximityDist = std::max( 4.0, mvOccupied->Vel * 0.2 ); - fMaxProximityDist = std::max( 8.0, mvOccupied->Vel * 0.375 ); //[m] + fMinProximityDist = std::max( 3.0, mvOccupied->Vel * 0.2 ); + fMaxProximityDist = std::max( 9.0, mvOccupied->Vel * 0.375 ); //[m] // margines prędkości powodujący załączenie napędu fVelMinus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania @@ -4259,12 +4266,17 @@ TController::UpdateSituation(double dt) { && ( coupler->CouplingFlag == coupling::faux ) ) { // mamy coś z przodu podłączone sprzęgiem wirtualnym // wyliczanie optymalnego przyspieszenia do jazdy na widoczność +/* ActualProximityDist = std::min( ActualProximityDist, vehicle->fTrackBlock - ( mvOccupied->CategoryFlag & 2 ? fMinProximityDist : // cars can bunch up tighter fMaxProximityDist ) ); // other vehicle types less so +*/ + ActualProximityDist = std::min( + ActualProximityDist, + vehicle->fTrackBlock ); double k = coupler->Connected->Vel; // prędkość pojazdu z przodu (zakładając, // że jedzie w tę samą stronę!!!) if( k < vel + 10 ) { @@ -4323,36 +4335,47 @@ TController::UpdateSituation(double dt) { } // sprawdzamy możliwe ograniczenia prędkości - if (OrderCurrentGet() & (Shunt | Obey_train)) // w Connect nie, bo moveStopHere - // odnosi się do stanu po połączeniu - if (iDrivigFlags & moveStopHere) // jeśli ma czekać na wolną drogę - if (vel == 0.0) // a stoi - if (VelNext == 0.0) // a wyjazdu nie ma - VelDesired = 0.0; // to ma stać - if (fStopTime < 0) // czas postoju przed dalszą jazdą (np. na przystanku) + if( OrderCurrentGet() & ( Shunt | Obey_train ) ) { + // w Connect nie, bo moveStopHere odnosi się do stanu po połączeniu + if( ( iDrivigFlags & moveStopHere ) + && ( vel == 0.0 ) + && ( VelNext == 0.0 ) ) { + // jeśli ma czekać na wolną drogę, stoi a wyjazdu nie ma, to ma stać + VelDesired = 0.0; + } + } + if( fStopTime < 0 ) { + // czas postoju przed dalszą jazdą (np. na przystanku) VelDesired = 0.0; // jak ma czekać, to nie ma jazdy - // else if (VelSignal<0) - // VelDesired=fVelMax; //ile fabryka dala (Ra: uwzględione wagony) - else if (VelSignal >= 0) // jeśli skład był zatrzymany na początku i teraz już może jechać - VelDesired = Global::Min0RSpeed(VelDesired, VelSignal); - - if (mvOccupied->RunningTrack.Velmax >= - 0) // ograniczenie prędkości z trajektorii ruchu + } + else if( VelSignal >= 0 ) { + // jeśli skład był zatrzymany na początku i teraz już może jechać VelDesired = - Global::Min0RSpeed(VelDesired, - mvOccupied->RunningTrack.Velmax); // uwaga na ograniczenia szlakowej! - if (VelforDriver >= 0) // tu jest zero przy zmianie kierunku jazdy - VelDesired = Global::Min0RSpeed(VelDesired, VelforDriver); // Ra: tu może być 40, jeśli - // mechanik nie ma znajomości - // szlaaku, albo kierowca jeździ - // 70 - if (TrainParams) - if (TrainParams->CheckTrainLatency() < 5.0) - if (TrainParams->TTVmax > 0.0) - VelDesired = Global::Min0RSpeed( - VelDesired, - TrainParams - ->TTVmax); // jesli nie spozniony to nie przekraczać rozkladowej + Global::Min0RSpeed( + VelDesired, + VelSignal ); + } + if( mvOccupied->RunningTrack.Velmax >= 0 ) { + // ograniczenie prędkości z trajektorii ruchu + VelDesired = + Global::Min0RSpeed( + VelDesired, + mvOccupied->RunningTrack.Velmax ); // uwaga na ograniczenia szlakowej! + } + if( VelforDriver >= 0 ) { + // tu jest zero przy zmianie kierunku jazdy + // Ra: tu może być 40, jeśli mechanik nie ma znajomości szlaaku, albo kierowca jeździ 70 + VelDesired = Global::Min0RSpeed( VelDesired, VelforDriver ); + } + if( ( TrainParams != nullptr ) + && ( TrainParams->CheckTrainLatency() < 5.0 ) + && ( TrainParams->TTVmax > 0.0 ) ) { + // jesli nie spozniony to nie przekraczać rozkladowej + VelDesired = + Global::Min0RSpeed( + VelDesired, + TrainParams->TTVmax ); + } if (VelDesired > 0.0) if( ( ( iDrivigFlags & moveStopHere ) == 0 ) || ( ( SemNextIndex != -1 ) @@ -4448,10 +4471,16 @@ TController::UpdateSituation(double dt) { VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); */ if( VelNext == 0.0 ) { - // hamowanie tak, aby stanąć - VelDesired = VelNext; - AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); - AccDesired = std::min( AccDesired, fAccThreshold ); + if( mvOccupied->CategoryFlag & 1 ) { + // hamowanie tak, aby stanąć + VelDesired = VelNext; + AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); + AccDesired = std::min( AccDesired, fAccThreshold ); + } + else { + // for cars (and others) coast at low speed until we hit min proximity range + VelDesired = Global::Min0RSpeed( VelDesired, 5.0 ); + } } } else { diff --git a/Driver.h b/Driver.h index 1d6e410e..12c91d2a 100644 --- a/Driver.h +++ b/Driver.h @@ -212,13 +212,12 @@ private: // parametry aktualnego składu double AbsAccS_pub = 0.0; // próg opóźnienia dla zadziałania hamulca double fBrake_a0[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca double fBrake_a1[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca - public: double fLastStopExpDist = -1.0; // odległość wygasania ostateniego przystanku double ReactionTime = 0.0; // czas reakcji Ra: czego i na co? świadomości AI double fBrakeTime = 0.0; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca - private: double fReady = 0.0; // poziom odhamowania wagonów bool Ready = false; // ABu: stan gotowosci do odjazdu - sprawdzenie odhamowania wagonow +private: double LastUpdatedTime = 0.0; // czas od ostatniego logu double ElapsedTime = 0.0; // czas od poczatku logu double deltalog = 0.05; // przyrost czasu @@ -227,26 +226,21 @@ private: // parametry aktualnego składu double m_radiocontroltime{ 0.0 }; // timer used to control speed of radio operations TAction eAction = actSleep; // aktualny stan public: - inline TAction GetAction() - { - return eAction; - } + inline + TAction GetAction() { + return eAction; } bool AIControllFlag = false; // rzeczywisty/wirtualny maszynista int iRouteWanted = 3; // oczekiwany kierunek jazdy (0-stop,1-lewo,2-prawo,3-prosto) np. odpala // migacz lub czeka na stan zwrotnicy private: TDynamicObject *pVehicle = nullptr; // pojazd w którym siedzi sterujący - TDynamicObject - *pVehicles[2]; // skrajne pojazdy w składzie (niekoniecznie bezpośrednio sterowane) + TDynamicObject *pVehicles[2]; // skrajne pojazdy w składzie (niekoniecznie bezpośrednio sterowane) TMoverParameters *mvControlling = nullptr; // jakim pojazdem steruje (może silnikowym w EZT) TMoverParameters *mvOccupied = nullptr; // jakim pojazdem hamuje TTrainParameters *TrainParams = nullptr; // rozkład jazdy zawsze jest, nawet jeśli pusty - // int TrainNumber; //numer rozkladowy tego pociagu - // AnsiString OrderCommand; //komenda pobierana z pojazdu - // double OrderValue; //argument komendy int iRadioChannel = 1; // numer aktualnego kanału radiowego - TTextSound *tsGuardSignal = nullptr; // komunikat od kierownika int iGuardRadio = 0; // numer kanału radiowego kierownika (0, gdy nie używa radia) + TTextSound *tsGuardSignal = nullptr; // komunikat od kierownika public: double AccPreferred = 0.0; // preferowane przyspieszenie (wg psychiki kierującego, zmniejszana przy wykryciu kolizji) double AccDesired = AccPreferred; // przyspieszenie, jakie ma utrzymywać (<0:nie przyspieszaj,<-0.1:hamuj) diff --git a/DynObj.cpp b/DynObj.cpp index 68c8adb0..13c65909 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1331,15 +1331,7 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) // pojazdu // ScanDir=1 - od strony Coupler0, ScanDir=-1 - od strony Coupler1 auto const initialdirection = Direction; // zapamiętanie kierunku poszukiwań na torze początkowym, względem sprzęgów -/* - TTrackFollower const *firstaxle = (initialdirection > 0 ? &Axle0 : &Axle1); // można by to trzymać w trainset - TTrack const *track = firstaxle->GetTrack(); // tor na którym "stoi" skrajny wózek - // (może być inny niż tor pojazdu) - if( firstaxle->GetDirection() < 0 ) { - // czy oś jest ustawiona w stronę Point1? - Direction = -Direction; // jeśli tak, to kierunek szukania będzie przeciwny - } -*/ + TTrack const *track = RaTrackGet(); if( RaDirectionGet() < 0 ) { // czy oś jest ustawiona w stronę Point1? @@ -1458,18 +1450,18 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) } } - // odległość do najbliższego pojazdu w linii prostej - // Ra: jeśli dwa samochody się mijają na odcinku przed zawrotką, to odległość między nimi nie może być liczona w linii prostej! - fTrackBlock = MoverParameters->Couplers[mycoupler].CoupleDist; - if( track->iCategoryFlag & 254 ) { - // jeśli samochód - if( distance > MoverParameters->Dim.L + foundobject->MoverParameters->Dim.L ) { - // przeskanowana odległość większa od długości pojazdów - // else if (ActDistCouplers[ mycoupler ].CoupleDist ); + } + if( ( false == TestFlag( track->iCategoryFlag, 1 ) ) + && ( distance > 50.0 ) ) { + // Ra: jeśli dwa samochody się mijają na odcinku przed zawrotką, to odległość między nimi nie może być liczona w linii prostej! + // NOTE: the distance is approximated, and additionally less accurate for cars heading in opposite direction + fTrackBlock = distance - ( 0.5 * ( MoverParameters->Dim.L + foundobject->MoverParameters->Dim.L ) ); } } else { diff --git a/Globals.cpp b/Globals.cpp index 67a39d47..5702dc55 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -136,6 +136,7 @@ double Global::fFpsAverage = 20.0; // oczekiwana wartosć FPS double Global::fFpsDeviation = 5.0; // odchylenie standardowe FPS double Global::fFpsMin = 30.0; // dolna granica FPS, przy której promień scenerii będzie zmniejszany double Global::fFpsMax = 65.0; // górna granica FPS, przy której promień scenerii będzie zwiększany +bool Global::FullPhysics { true }; // full calculations performed for each simulation step // parametry testowe (do testowania scenerii i obiektów) bool Global::bWireFrame = false; @@ -308,11 +309,11 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> WriteLogFlag; } - else if (token == "physicsdeactivation") + else if (token == "fullphysics") { // McZapkie-291103 - usypianie fizyki Parser.getTokens(); - Parser >> PhysicActivationFlag; + Parser >> Global::FullPhysics; } else if (token == "debuglog") { diff --git a/Globals.h b/Globals.h index df62bc17..77abf302 100644 --- a/Globals.h +++ b/Globals.h @@ -214,15 +214,22 @@ class Global float depth; float distance; } shadowtune; + static bool bUseVBO; // czy jest VBO w karcie graficznej + static float AnisotropicFiltering; // requested level of anisotropic filtering. TODO: move it to renderer object + static int ScreenWidth; // current window dimensions. TODO: move it to renderer + static int ScreenHeight; + 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 GLint iMaxTextureSize; // maksymalny rozmiar tekstury + static int iMultisampling; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px + static bool FullPhysics; // full calculations performed for each simulation step static int iSlowMotion; static TDynamicObject *changeDynObj; static double ABuDebug; static std::string asSky; static bool bnewAirCouplers; // Ra: nowe zmienne globalne - static float AnisotropicFiltering; // requested level of anisotropic filtering. TODO: move it to renderer object - static bool bUseVBO; // czy jest VBO w karcie graficznej static std::string LastGLError; static int iFeedbackMode; // tryb pracy informacji zwrotnej static int iFeedbackPort; // dodatkowy adres dla informacji zwrotnych @@ -233,13 +240,8 @@ class Global static GLFWwindow *window; static bool shiftState; //m7todo: brzydko static bool ctrlState; - static int ScreenWidth; // current window dimensions. TODO: move it to renderer - static int ScreenHeight; - 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 std::string asVersion; // z opisem - static GLint iMaxTextureSize; // maksymalny rozmiar tekstury static bool ControlPicking; // indicates controls pick mode is active static bool InputMouse; // whether control pick mode can be activated static int iTextMode; // tryb pracy wyświetlacza tekstowego @@ -254,7 +256,6 @@ class Global static double fLatitudeDeg; // szerokość geograficzna static std::string szTexturesTGA; // lista tekstur od TGA static std::string szTexturesDDS; // lista tekstur od DDS - static int iMultisampling; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px static bool DLFont; // switch indicating presence of basic font static bool bGlutFont; // tekst generowany przez GLUT static int iPause; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie diff --git a/Ground.cpp b/Ground.cpp index cf0d9dbb..36173b84 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1870,7 +1870,7 @@ bool TGround::Init(std::string File) } else { - ErrorLog("Scene parsing error in file \"" + parser.Name() + "\" (line " + std::to_string( parser.Line() ) + "), unexpected token \"" + token + "\""); + ErrorLog("Bad node: node parsing error, encountered in file \"" + parser.Name() + "\" (line " + std::to_string( parser.Line() - 1 ) + ")"); // break; } } @@ -3386,46 +3386,76 @@ bool TGround::CheckQuery() } } break; - case tp_WhoIs: // pobranie nazwy pociągu do komórki pamięci - if (tmpEvent->iFlags & update_load) - { // jeśli pytanie o ładunek - if (tmpEvent->iFlags & update_memadd) // jeśli typ pojazdu + case tp_WhoIs: { + // pobranie nazwy pociągu do komórki pamięci + if (tmpEvent->iFlags & update_load) { + // jeśli pytanie o ładunek + if( tmpEvent->iFlags & update_memadd ) { + // jeśli typ pojazdu + // TODO: define and recognize individual request types + auto const owner = ( + ( ( tmpEvent->Activator->Mechanik != nullptr ) && ( tmpEvent->Activator->Mechanik->Primary() ) ) ? + tmpEvent->Activator->Mechanik : + tmpEvent->Activator->ctOwner ); + auto const consistbrakelevel = ( + owner != nullptr ? + owner->fReady : + -1.0 ); + tmpEvent->Params[ 9 ].asMemCell->UpdateValues( tmpEvent->Activator->MoverParameters->TypeName, // typ pojazdu + consistbrakelevel, 0, // na razie nic - 0, // na razie nic - tmpEvent->iFlags & - (update_memstring | update_memval1 | update_memval2)); - else // jeśli parametry ładunku + tmpEvent->iFlags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "whois request (" + to_string( tmpEvent->iFlags ) + ") " + + "[name: " + tmpEvent->Activator->MoverParameters->TypeName + "], " + + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " + + "[]" ); + } + else { + // jeśli parametry ładunku tmpEvent->Params[ 9 ].asMemCell->UpdateValues( tmpEvent->Activator->MoverParameters->LoadType, // nazwa ładunku tmpEvent->Activator->MoverParameters->Load, // aktualna ilość tmpEvent->Activator->MoverParameters->MaxLoad, // maksymalna ilość - tmpEvent->iFlags & - (update_memstring | update_memval1 | update_memval2)); + tmpEvent->iFlags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "whois request (" + to_string( tmpEvent->iFlags ) + ") " + + "[load type: " + tmpEvent->Activator->MoverParameters->LoadType + "], " + + "[current load: " + to_string( tmpEvent->Activator->MoverParameters->Load, 2 ) + "], " + + "[max load: " + to_string( tmpEvent->Activator->MoverParameters->MaxLoad, 2 ) + "]" ); + } } else if (tmpEvent->iFlags & update_memadd) { // jeśli miejsce docelowe pojazdu tmpEvent->Params[ 9 ].asMemCell->UpdateValues( tmpEvent->Activator->asDestination, // adres docelowy tmpEvent->Activator->DirectionGet(), // kierunek pojazdu względem czoła składu (1=zgodny,-1=przeciwny) - tmpEvent->Activator->MoverParameters ->Power, // moc pojazdu silnikowego: 0 dla wagonu + tmpEvent->Activator->MoverParameters->Power, // moc pojazdu silnikowego: 0 dla wagonu tmpEvent->iFlags & (update_memstring | update_memval1 | update_memval2)); + + WriteLog( + "whois request (" + to_string( tmpEvent->iFlags ) + ") " + + "[destination: " + tmpEvent->Activator->asDestination + "], " + + "[direction: " + to_string( tmpEvent->Activator->DirectionGet() ) + "], " + + "[engine power: " + to_string( tmpEvent->Activator->MoverParameters->Power, 2 ) + "]" ); } else if (tmpEvent->Activator->Mechanik) if (tmpEvent->Activator->Mechanik->Primary()) { // tylko jeśli ktoś tam siedzi - nie powinno dotyczyć pasażera! tmpEvent->Params[ 9 ].asMemCell->UpdateValues( tmpEvent->Activator->Mechanik->TrainName(), - tmpEvent->Activator->Mechanik->StationCount() - - tmpEvent->Activator->Mechanik - ->StationIndex(), // ile przystanków do końca + tmpEvent->Activator->Mechanik->StationCount() - tmpEvent->Activator->Mechanik->StationIndex(), // ile przystanków do końca tmpEvent->Activator->Mechanik->IsStop() ? 1 : 0, // 1, gdy ma tu zatrzymanie tmpEvent->iFlags); WriteLog("Train detected: " + tmpEvent->Activator->Mechanik->TrainName()); } break; + } case tp_LogValues: // zapisanie zawartości komórki pamięci do logu if (tmpEvent->Params[9].asMemCell) // jeśli była podana nazwa komórki WriteLog("Memcell \"" + tmpEvent->asNodeName + "\": " + diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 642c7bfb..c53b59f3 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -191,8 +191,6 @@ static int const sound_relay = 16; static int const sound_manyrelay = 32; static int const sound_brakeacc = 64; -static bool PhysicActivationFlag = false; - //szczególne typy pojazdów (inna obsługa) dla zmiennej TrainType //zamienione na flagi bitowe, aby szybko wybierać grupę (np. EZT+SZT) static int const dt_Default = 0; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 8f00004a..b1c7251c 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3791,9 +3791,6 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) // McZapkie-031103: sprawdzanie czy warto liczyc fizyke i inne updaty // ABu 300105: cos tu mieszalem , dziala teraz troche lepiej, wiec zostawiam - // zakomentowalem PhysicActivationFlag bo cos nie dzialalo i fizyka byla liczona zawsze. - // if (PhysicActivationFlag) - //{ if ((CabNo == 0) && (Vel < 0.0001) && (abs(AccS) < 0.0001) && (TrainType != dt_EZT)) { if (!PhysicActivation) @@ -3812,7 +3809,6 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) } else PhysicActivation = true; - //}; } double TMoverParameters::BrakeForceR(double ratio, double velocity) @@ -3971,7 +3967,7 @@ double TMoverParameters::Adhesive(double staticfriction) } // WriteLog(FloatToStr(adhesive)); // tutaj jest na poziomie 0.2 - 0.3 return adhesion; -*/ + //wersja druga if( true == SlippingWheels ) { @@ -3984,14 +3980,14 @@ double TMoverParameters::Adhesive(double staticfriction) else { adhesion = staticfriction * ( 100.0 + Vel ) / ( 50.0 + Vel ); } } // adhesion *= ( 0.9 + 0.2 * Random() ); -/* +*/ //wersja3 by youBy - uwzględnia naturalne mikropoślizgi i wpływ piasecznicy, usuwa losowość z pojazdu double Vwheels = nrot * M_PI * WheelDiameter; // predkosc liniowa koła wynikająca z obrotowej double deltaV = V - Vwheels; //poślizg - różnica prędkości w punkcie styku koła i szyny deltaV = std::max(0.0, std::abs(deltaV) - 0.25); //mikropoślizgi do ok. 0,25 m/s nie zrywają przyczepności Vwheels = std::abs( Vwheels ); adhesion = staticfriction * (28 + Vwheels) / (14 + Vwheels) * ((SandDose? sandfactor : 1) - (1 - adh_factor)*(deltaV / (deltaV + slipfactor))); -*/ + return adhesion; } @@ -6804,7 +6800,6 @@ void TMoverParameters::LoadFIZ_Wheels( std::string const &line ) { extract_value( TrackW, "Tw", line, "" ); extract_value( AxleInertialMoment, "AIM", line, "" ); - if( AxleInertialMoment <= 0.0 ) { AxleInertialMoment = 1.0; } extract_value( AxleArangement, "Axle", line, "" ); NPoweredAxles = s2NPW( AxleArangement ); @@ -6812,11 +6807,21 @@ void TMoverParameters::LoadFIZ_Wheels( std::string const &line ) { BearingType = ( extract_value( "BearingType", line ) == "Roll" ) ? - 1 : - 0; + 1 : + 0; extract_value( ADist, "Ad", line, "" ); extract_value( BDist, "Bd", line, "" ); + + if( AxleInertialMoment <= 0.0 ) { +/* + AxleInertialMoment = 1.0; +*/ + // approximation formula by youby + auto const k = 472.0; // arbitrary constant + AxleInertialMoment = k / 4.0 * std::pow( WheelDiameter, 4.0 ) * NAxles; + Mred = k * std::pow( WheelDiameter, 2.0 ) * NAxles; + } } void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index f249de8f..2b63e841 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -19,6 +19,7 @@ Copyright (C) 2007-2014 Maciej Cierniak bool DebugModeFlag = false; bool FreeFlyModeFlag = false; +bool EditorModeFlag = true; bool DebugCameraFlag = false; double Max0R(double x1, double x2) diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index 9c0c4f5d..6692710b 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. extern bool DebugModeFlag; extern bool FreeFlyModeFlag; +extern bool EditorModeFlag; extern bool DebugCameraFlag; /*funkcje matematyczne*/ diff --git a/Train.cpp b/Train.cpp index 5cd946e8..8610ebce 100644 --- a/Train.cpp +++ b/Train.cpp @@ -296,7 +296,6 @@ TTrain::TTrain() { fPPress = fNPress = 0; // asMessage=""; - fMechCroach = 0.25; pMechShake = vector3(0, 0, 0); vMechMovement = vector3(0, 0, 0); pMechOffset = vector3(0, 0, 0); @@ -389,8 +388,7 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) */ MechSpring.Init(0.015, 250); vMechVelocity = vector3(0, 0, 0); - pMechOffset = vector3(-0.4, 3.3, 5.5); - fMechCroach = 0.5; + pMechOffset = vector3( 0, 0, 0 ); fMechSpringX = 1; fMechSpringY = 0.5; fMechSpringZ = 0.5; @@ -6286,8 +6284,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) } void TTrain::MechStop() -{ // likwidacja ruchu kamery w kabinie (po powrocie - // przez [F4]) +{ // likwidacja ruchu kamery w kabinie (po powrocie przez [F4]) pMechPosition = vector3(0, 0, 0); pMechShake = vector3(0, 0, 0); vMechMovement = vector3(0, 0, 0); diff --git a/Train.h b/Train.h index 166f2cc1..80b67bc0 100644 --- a/Train.h +++ b/Train.h @@ -378,7 +378,6 @@ public: // reszta może by?publiczna vector3 pMechShake; vector3 vMechVelocity; // McZapkie: do poruszania sie po kabinie - double fMechCroach; // McZapkie: opis kabiny - obszar poruszania sie mechanika oraz zajetosc TCab Cabine[maxcab + 1]; // przedzial maszynowy, kabina 1 (A), kabina 2 (B) int iCabn; diff --git a/World.cpp b/World.cpp index ca7e97be..8aa6ee88 100644 --- a/World.cpp +++ b/World.cpp @@ -772,12 +772,14 @@ void TWorld::OnMouseMove(double x, double y) void TWorld::InOutKey( bool const Near ) { // przełączenie widoku z kabiny na zewnętrzny i odwrotnie FreeFlyModeFlag = !FreeFlyModeFlag; // zmiana widoku - if (FreeFlyModeFlag) - { // jeżeli poza kabiną, przestawiamy w jej okolicę - OK + if (FreeFlyModeFlag) { + // jeżeli poza kabiną, przestawiamy w jej okolicę - OK Global::pUserDynamic = NULL; // bez renderowania względem kamery - if (Train) - { // Train->Dynamic()->ABuSetModelShake(vector3(0,0,0)); - Train->Silence(); // wyłączenie dźwięków kabiny + if (Train) { + // cache current cab position so there's no need to set it all over again after each out-in switch + Train->pMechSittingPosition = Train->pMechOffset; + // wyłączenie dźwięków kabiny + Train->Silence(); Train->Dynamic()->bDisplayCab = false; DistantView( Near ); } @@ -983,8 +985,15 @@ bool TWorld::Update() // this means at count > 20 simulation and render are going to desync. is that right? // NOTE: experimentally changing this to prevent the desync. // TODO: test what happens if we hit more than 20 * 0.01 sec slices, i.e. less than 5 fps - for( int updateidx = 0; updateidx < updatecount; ++updateidx ) { - Ground.Update( dt / updatecount, 1 ); // tu zrobić tylko coklatkową aktualizację przesunięć + if( true == Global::FullPhysics ) { + // default calculation mode, each step calculated separately + for( int updateidx = 0; updateidx < updatecount; ++updateidx ) { + Ground.Update( dt / updatecount, 1 ); + } + } + else { + // slightly simplified calculation mode; can lead to errors + Ground.Update( dt / updatecount, updatecount ); } // yB dodał przyspieszacz fizyki diff --git a/mouseinput.cpp b/mouseinput.cpp index 3709740c..be72ce1d 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -68,93 +68,105 @@ void mouse_input::button( int const Button, int const Action ) { if( false == Global::ControlPicking ) { return; } + if( true == FreeFlyModeFlag ) { - // for now we're only interested in cab controls - return; - } - - user_command &mousecommand = ( - Button == GLFW_MOUSE_BUTTON_LEFT ? - m_mousecommandleft : - m_mousecommandright - ); - - if( Action == GLFW_RELEASE ) { - if( mousecommand != user_command::none ) { - // NOTE: basic keyboard controls don't have any parameters - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, 0 ); - mousecommand = user_command::none; - } - else { - // if it's the right mouse button that got released and we had no command active, we were potentially in view panning mode; stop it + // world editor controls + // currently we only handle view panning in this mode + if( Action == GLFW_RELEASE ) { + // if it's the right mouse button that got released we were potentially in view panning mode; stop it if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { m_pickmodepanning = false; } } - // if we were in varying command repeat rate, we can stop that now. done without any conditions, to catch some unforeseen edge cases - m_varyingpollrate = false; + else { + // button press + if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { + // the right button activates mouse panning mode + m_pickmodepanning = true; + } + } } else { - // if not release then it's press - auto train = World.train(); - if( train != nullptr ) { - auto lookup = m_mousecommands.find( train->GetLabel( GfxRenderer.Update_Pick_Control() ) ); - if( lookup != m_mousecommands.end() ) { - mousecommand = ( - Button == GLFW_MOUSE_BUTTON_LEFT ? - lookup->second.left : - lookup->second.right - ); - if( mousecommand != user_command::none ) { - // check manually for commands which have 'fast' variants launched with shift modifier - if( Global::shiftState ) { + // cab controls mode + user_command &mousecommand = ( + Button == GLFW_MOUSE_BUTTON_LEFT ? + m_mousecommandleft : + m_mousecommandright + ); + + if( Action == GLFW_RELEASE ) { + if( mousecommand != user_command::none ) { + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( mousecommand, 0, 0, Action, 0 ); + mousecommand = user_command::none; + } + else { + // if it's the right mouse button that got released and we had no command active, we were potentially in view panning mode; stop it + if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { + m_pickmodepanning = false; + } + } + // if we were in varying command repeat rate, we can stop that now. done without any conditions, to catch some unforeseen edge cases + m_varyingpollrate = false; + } + else { + // if not release then it's press + auto train = World.train(); + if( train != nullptr ) { + auto lookup = m_mousecommands.find( train->GetLabel( GfxRenderer.Update_Pick_Control() ) ); + if( lookup != m_mousecommands.end() ) { + mousecommand = ( + Button == GLFW_MOUSE_BUTTON_LEFT ? + lookup->second.left : + lookup->second.right + ); + if( mousecommand != user_command::none ) { + // check manually for commands which have 'fast' variants launched with shift modifier + if( Global::shiftState ) { + switch( mousecommand ) { + case user_command::mastercontrollerincrease: { mousecommand = user_command::mastercontrollerincreasefast; break; } + case user_command::mastercontrollerdecrease: { mousecommand = user_command::mastercontrollerdecreasefast; break; } + case user_command::secondcontrollerincrease: { mousecommand = user_command::secondcontrollerincreasefast; break; } + case user_command::secondcontrollerdecrease: { mousecommand = user_command::secondcontrollerdecreasefast; break; } + case user_command::independentbrakeincrease: { mousecommand = user_command::independentbrakeincreasefast; break; } + case user_command::independentbrakedecrease: { mousecommand = user_command::independentbrakedecreasefast; break; } + default: { break; } + } + } + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( mousecommand, 0, 0, Action, 0 ); + m_updateaccumulator = 0.0; // prevent potential command repeat right after issuing one + switch( mousecommand ) { - case user_command::mastercontrollerincrease: { mousecommand = user_command::mastercontrollerincreasefast; break; } - case user_command::mastercontrollerdecrease: { mousecommand = user_command::mastercontrollerdecreasefast; break; } - case user_command::secondcontrollerincrease: { mousecommand = user_command::secondcontrollerincreasefast; break; } - case user_command::secondcontrollerdecrease: { mousecommand = user_command::secondcontrollerdecreasefast; break; } - case user_command::independentbrakeincrease: { mousecommand = user_command::independentbrakeincreasefast; break; } - case user_command::independentbrakedecrease: { mousecommand = user_command::independentbrakedecreasefast; break; } - default: { break; } - } - } - // NOTE: basic keyboard controls don't have any parameters - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, 0 ); - m_updateaccumulator = 0.0; // prevent potential command repeat right after issuing one -/* - if( mousecommand == user_command::mastercontrollerincrease ) { - m_updateaccumulator -= 0.15; // extra pause on first increase of master controller - } -*/ - switch( mousecommand ) { - case user_command::mastercontrollerincrease: - case user_command::mastercontrollerdecrease: - case user_command::secondcontrollerincrease: - case user_command::secondcontrollerdecrease: - case user_command::trainbrakeincrease: - case user_command::trainbrakedecrease: - case user_command::independentbrakeincrease: - case user_command::independentbrakedecrease: { - // these commands trigger varying repeat rate mode, - // which scales the rate based on the distance of the cursor from its point when the command was first issued - m_commandstartcursor = m_cursorposition; - m_varyingpollrate = true; - break; - } - default: { - break; + case user_command::mastercontrollerincrease: + case user_command::mastercontrollerdecrease: + case user_command::secondcontrollerincrease: + case user_command::secondcontrollerdecrease: + case user_command::trainbrakeincrease: + case user_command::trainbrakedecrease: + case user_command::independentbrakeincrease: + case user_command::independentbrakedecrease: { + // these commands trigger varying repeat rate mode, + // which scales the rate based on the distance of the cursor from its point when the command was first issued + m_commandstartcursor = m_cursorposition; + m_varyingpollrate = true; + break; + } + default: { + break; + } } } } - } - else { - // if we don't have any recognized element under the cursor and the right button was pressed, enter view panning mode - if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { - m_pickmodepanning = true; + else { + // if we don't have any recognized element under the cursor and the right button was pressed, enter view panning mode + if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { + m_pickmodepanning = true; + } } } } diff --git a/renderer.cpp b/renderer.cpp index 530e4c25..46f896e9 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -423,14 +423,23 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glEnable( GL_TEXTURE_2D ); } #endif +#ifdef EU07_NEW_CAB_RENDERCODE + if( World.Train != nullptr ) { + // cab render is performed without shadows, due to low resolution and number of models without windows :| + switch_units( true, false, false ); + Render_cab( World.Train->Dynamic(), false ); + } +#endif + switch_units( true, true, true ); Render( &World.Ground ); // ...translucent parts setup_drawing( true ); Render_Alpha( &World.Ground ); - // cab render is performed without shadows, due to low resolution and number of models without windows :| - switch_units( true, false, false ); - // cab render is done in translucent phase to deal with badly configured vehicles - if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } + if( World.Train != nullptr ) { + // cab render is performed without shadows, due to low resolution and number of models without windows :| + switch_units( true, false, false ); + Render_cab( World.Train->Dynamic(), true ); + } if( m_environmentcubetexturesupport ) { // restore default texture matrix for reflections cube map @@ -1621,8 +1630,8 @@ opengl_renderer::Render( TGroundNode *Node ) { break; } } - if( ( distancesquared > Node->fSquareRadius ) - || ( distancesquared < Node->fSquareMinRadius ) ) { + if( ( distancesquared < Node->fSquareMinRadius ) + || ( distancesquared >= Node->fSquareRadius ) ) { return false; } @@ -1906,7 +1915,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { // rendering kabiny gdy jest oddzielnym modelem i ma byc wyswietlana bool -opengl_renderer::Render_cab( TDynamicObject *Dynamic ) { +opengl_renderer::Render_cab( TDynamicObject *Dynamic, bool const Alpha ) { if( Dynamic == nullptr ) { @@ -1943,8 +1952,19 @@ opengl_renderer::Render_cab( TDynamicObject *Dynamic ) { ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( Dynamic->InteriorLight * Dynamic->InteriorLightLevel ) ); } // render +#ifdef EU07_NEW_CAB_RENDERCODE + if( true == Alpha ) { + // translucent parts + Render_Alpha( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); + } + else { + // opaque parts + Render( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); + } +#else Render( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); Render_Alpha( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); +#endif // post-render restore if( Dynamic->fShade > 0.0f ) { // change light level based on light level of the occupied track @@ -2030,7 +2050,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( ( Submodel->iVisible ) && ( TSubModel::fSquareDist >= Submodel->fSquareMinDist ) - && ( TSubModel::fSquareDist <= Submodel->fSquareMaxDist ) ) { + && ( TSubModel::fSquareDist < Submodel->fSquareMaxDist ) ) { if( Submodel->iFlags & 0xC000 ) { ::glPushMatrix(); @@ -2412,8 +2432,8 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { break; } } - if( ( distancesquared > Node->fSquareRadius ) - || ( distancesquared < Node->fSquareMinRadius ) ) { + if( ( distancesquared < Node->fSquareMinRadius ) + || ( distancesquared >= Node->fSquareRadius ) ) { return false; } @@ -2675,7 +2695,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // renderowanie przezroczystych przez DL if( ( Submodel->iVisible ) && ( TSubModel::fSquareDist >= Submodel->fSquareMinDist ) - && ( TSubModel::fSquareDist <= Submodel->fSquareMaxDist ) ) { + && ( TSubModel::fSquareDist < Submodel->fSquareMaxDist ) ) { if( Submodel->iFlags & 0xC000 ) { ::glPushMatrix(); diff --git a/renderer.h b/renderer.h index 067f64c0..70141315 100644 --- a/renderer.h +++ b/renderer.h @@ -285,7 +285,7 @@ private: void Render( TTrack *Track ); bool - Render_cab( TDynamicObject *Dynamic ); + Render_cab( TDynamicObject *Dynamic, bool const Alpha = false ); void Render( TMemCell *Memcell ); bool diff --git a/version.h b/version.h index 49b29887..50d73e58 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 908 +#define VERSION_MINOR 911 #define VERSION_REVISION 0 From f6fa8ee09b597c38d036298cb0862ccd116e425d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 14 Sep 2017 00:29:55 +0200 Subject: [PATCH 190/426] build 170913. improved AI driving on slopes, consist collision distance in whois event, cab render fix --- Driver.cpp | 54 +++++++++++++++++++++++++++++++----------- Driver.h | 67 ++++++++++++++++++---------------------------------- Ground.cpp | 20 +++++++++------- Train.cpp | 2 +- World.cpp | 4 ++++ renderer.cpp | 2 ++ version.h | 2 +- 7 files changed, 83 insertions(+), 68 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index bf99e184..48f71618 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1355,7 +1355,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // modifies brake distance for low target speeds, to ease braking rate in such situations float -TController::braking_distance_multiplier( float const Targetvelocity ) { +TController::braking_distance_multiplier( float const Targetvelocity ) const { if( Targetvelocity > 65.f ) { return 1.f; } if( Targetvelocity < 5.f ) { return 1.f; } @@ -3989,6 +3989,11 @@ TController::UpdateSituation(double dt) { // bottom margin raised to 2 km/h to give the AI more leeway at low speed limits fVelPlus = clamp( std::ceil( 0.05 * VelDesired ), 2.0, 5.0 ); } + if( mvOccupied->BrakeDelayFlag == bdelay_G ) { + // increase distances for cargo trains to take into account slower reaction to brakes + fMinProximityDist += 10.0; + fMaxProximityDist += 10.0; + } } else { // samochod (sokista też) @@ -4299,6 +4304,12 @@ TController::UpdateSituation(double dt) { if( vehicle->fTrackBlock <= fMinProximityDist ) { VelDesired = 0.0; } + + if( ( mvOccupied->CategoryFlag & 1 ) + && ( OrderCurrentGet() & Obey_train ) ) { + // trains which move normally should try to stop at safe margin + ActualProximityDist -= fDriverDist; + } } } else { @@ -4449,8 +4460,8 @@ TController::UpdateSituation(double dt) { // przeciwnie do zadanego kierunku jazdy //(AccDesired) porównujemy z (fAccGravity) albo (AbsAccS) if( ( VelNext >= 0.0 ) - && ( ActualProximityDist <= routescanrange ) - && ( vel >= VelNext ) ) { + && ( ActualProximityDist <= routescanrange ) + && ( vel >= VelNext ) ) { // gdy zbliża się i jest za szybki do nowej prędkości, albo stoi na zatrzymaniu if (vel > 0.0) { // jeśli jedzie @@ -4561,13 +4572,14 @@ TController::UpdateSituation(double dt) { // jesli jedzie za szybko do AKTUALNEGO if( VelDesired == 0.0 ) { // jesli stoj, to hamuj, ale i tak juz za pozno :) - AccDesired = std::min( AccDesired, -0.9 ); // hamuj solidnie + AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie } else { - // slow down, not full stop - if( vel > ( VelDesired + fVelPlus ) ) { + // try to estimate increase of current velocity before engaged brakes start working + // if it looks like we'll exceed maximum allowed speed start thinking about slight slowing down + if( ( vel + vel * ( 1.0 - fBrake_a0[ 0 ] ) * AbsAccS ) > ( VelDesired + fVelPlus ) ) { // hamuj tak średnio - AccDesired = std::min( AccDesired, -fBrake_a0[ 0 ] * 0.5 ); + AccDesired = std::min( AccDesired, -0.25 ); } else { // o 5 km/h to olej (zacznij luzować) @@ -4581,6 +4593,8 @@ TController::UpdateSituation(double dt) { // last step sanity check, until the whole calculation is straightened out AccDesired = std::min( AccDesired, AccPreferred ); + // also take into account impact of gravity + AccDesired = clamp( AccDesired - fAccGravity, -0.9, 0.9 ); @@ -4637,15 +4651,20 @@ TController::UpdateSituation(double dt) { } // NOTE: as a stop-gap measure the routine is limited to trains only while car calculations seem off if( mvControlling->CategoryFlag == 1 ) { - if( -AccDesired * BrakeAccFactor() < ( - ( ( fReady > 0.4 ) || ( VelNext > vel - 40.0 ) ) ? - fBrake_a0[ 0 ] * 0.8 : - -fAccThreshold ) - / braking_distance_multiplier( VelNext ) ) { - AccDesired = std::max( -0.06, AccDesired ); + if( vel < VelDesired ) { + // don't adjust acceleration when going above current goal speed + if( -AccDesired * BrakeAccFactor() < ( + ( ( fReady > 0.4 ) + || ( VelNext > vel - 40.0 ) ) ? + fBrake_a0[ 0 ] * 0.8 : + -fAccThreshold ) + / braking_distance_multiplier( VelNext ) ) { + AccDesired = std::max( -0.06, AccDesired ); + } } else { - ReactionTime = 0.25; // i orientuj się szybciej, jeśli hamujesz + // i orientuj się szybciej, jeśli hamujesz + ReactionTime = 0.25; } } if (mvOccupied->BrakeSystem == Pneumatic) // napełnianie uderzeniowe @@ -5510,6 +5529,13 @@ bool TController::IsStop() return TrainParams->IsStop(); }; +// returns most recently calculated distance to potential obstacle ahead +double +TController::TrackBlock() const { + + return pVehicles[ TMoverParameters::side::front ]->fTrackBlock; +} + void TController::MoveTo(TDynamicObject *to) { // przesunięcie AI do innego pojazdu (przy zmianie kabiny) // mvOccupied->CabDeactivisation(); //wyłączenie kabiny w opuszczanym diff --git a/Driver.h b/Driver.h index 12c91d2a..c552dfa8 100644 --- a/Driver.h +++ b/Driver.h @@ -186,8 +186,8 @@ class TController private: // parametry aktualnego składu double fLength = 0.0; // długość składu (do wyciągania z ograniczeń) double fMass = 0.0; // całkowita masa do liczenia stycznej składowej grawitacji +public: double fAccGravity = 0.0; // przyspieszenie składowej stycznej grawitacji - public: TEvent *eSignNext = nullptr; // sygnał zmieniający prędkość, do pokazania na [F2] std::string asNextStop; // nazwa następnego punktu zatrzymania wg rozkładu int iStationStart = 0; // numer pierwszej stacji pokazywanej na podglądzie rozkładu @@ -245,25 +245,20 @@ private: double AccPreferred = 0.0; // preferowane przyspieszenie (wg psychiki kierującego, zmniejszana przy wykryciu kolizji) double AccDesired = AccPreferred; // przyspieszenie, jakie ma utrzymywać (<0:nie przyspieszaj,<-0.1:hamuj) double VelDesired = 0.0; // predkość, z jaką ma jechać, wynikająca z analizy tableki; <=VelSignal - double fAccDesiredAv = 0.0; // uśrednione przyspieszenie z kolejnych przebłysków świadomości, żeby - // ograniczyć migotanie - public: + double fAccDesiredAv = 0.0; // uśrednione przyspieszenie z kolejnych przebłysków świadomości, żeby ograniczyć migotanie double VelforDriver = -1.0; // prędkość, używana przy zmianie kierunku (ograniczenie przy nieznajmości szlaku?) double VelSignal = 0.0; // ograniczenie prędkości z kompilacji znaków i sygnałów // normalnie na początku ma stać, no chyba że jedzie double VelLimit = -1.0; // predkość zadawana przez event jednokierunkowego ograniczenia prędkości // -1: brak ograniczenia prędkości - public: double VelSignalLast = -1.0; // prędkość zadana na ostatnim semaforze // ostatni semafor też bez ograniczenia double VelSignalNext = 0.0; // prędkość zadana na następnym semaforze double VelLimitLast = -1.0; // prędkość zadana przez ograniczenie // ostatnie ograniczenie bez ograniczenia double VelRoad = -1.0; // aktualna prędkość drogowa (ze znaku W27) (PutValues albo komendą) // prędkość drogowa bez ograniczenia - public: double VelNext = 120.0; // prędkość, jaka ma być po przejechaniu długości ProximityDist private: double fProximityDist = 0.0; // odleglosc podawana w SetProximityVelocity(); >0:przeliczać do punktu, <0:podana wartość double FirstSemaphorDist = 10000.0; // odległość do pierwszego znalezionego semafora public: - double - ActualProximityDist = 1.0; // odległość brana pod uwagę przy wyliczaniu prędkości i przyspieszenia + double ActualProximityDist = 1.0; // odległość brana pod uwagę przy wyliczaniu prędkości i przyspieszenia private: vector3 vCommandLocation; // polozenie wskaznika, sygnalizatora lub innego obiektu do ktorego // odnosi sie komenda @@ -297,7 +292,7 @@ private: double fStopTime = 0.0; // czas postoju przed dalszą jazdą (np. na przystanku) double WaitingTime = 0.0; // zliczany czas oczekiwania do samoistnego ruszenia double WaitingExpireTime = 31.0; // tyle ma czekać, zanim się ruszy // maksymlany czas oczekiwania do samoistnego ruszenia - // TEvent* eSignLast; //ostatnio znaleziony sygnał, o ile nie minięty + private: //---//---//---//---// koniec zmiennych, poniżej metody //---//---//---//---// void SetDriverPsyche(); bool PrepareEngine(); @@ -314,23 +309,16 @@ private: void AutoRewident(); // ustawia hamulce w składzie double ESMVelocity(bool Main); public: - Mtable::TTrainParameters *Timetable() - { - return TrainParams; - }; + Mtable::TTrainParameters *Timetable() { + return TrainParams; }; void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation, TStopReason reason = stopComm); bool PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const vector3 *NewLocation, TStopReason reason = stopComm); void UpdateSituation(double dt); // uruchamiac przynajmniej raz na sekundę // procedury dotyczace rozkazow dla maszynisty - void SetVelocity(double NewVel, double NewVelNext, - TStopReason r = stopNone); // uaktualnia informacje o prędkości -/* - bool SetProximityVelocity( - double NewDist, - double NewVelNext); // uaktualnia informacje o prędkości przy nastepnym semaforze -*/ + // uaktualnia informacje o prędkości + void SetVelocity(double NewVel, double NewVelNext, TStopReason r = stopNone); public: void JumpToNextOrder(); void JumpToFirstOrder(); @@ -349,9 +337,7 @@ private: void OrdersInit(double fVel); void OrdersClear(); void OrdersDump(); - TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, - bool primary = true // czy ma aktywnie prowadzić? - ); + TController( bool AI, TDynamicObject *NewControll, bool InitPsyche, bool primary = true ); std::string OrderCurrent(); void WaitingSet(double Seconds); @@ -360,33 +346,24 @@ private: void DirectionForward(bool forward); int OrderDirectionChange(int newdir, TMoverParameters *Vehicle); void Lights(int head, int rear); -// double Distance(vector3 &p1, vector3 &n, vector3 &p2); - - private: // Ra: metody obsługujące skanowanie toru + // Ra: metody obsługujące skanowanie toru TEvent *CheckTrackEvent(TTrack *Track, double const fDirection ) const; -// bool TableCheckEvent(TEvent *e); bool TableAddNew(); bool TableNotFound(TEvent const *Event) const; -// TEvent *TableCheckTrackEvent(double fDirection, TTrack *Track); void TableTraceRoute(double fDistance, TDynamicObject *pVehicle = nullptr); void TableCheck(double fDistance); TCommandType TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc); // modifies brake distance for low target speeds, to ease braking rate in such situations float - braking_distance_multiplier( float const Targetvelocity ); + braking_distance_multiplier( float const Targetvelocity ) const; void TablePurger(); void TableSort(); - inline double MoveDistanceGet() - { - return dMoveLen; - } - inline void MoveDistanceReset() - { - dMoveLen = 0.0; - } + inline double MoveDistanceGet() const { + return dMoveLen; } + inline void MoveDistanceReset() { + dMoveLen = 0.0; } public: - inline void MoveDistanceAdd(double distance) - { + inline void MoveDistanceAdd(double distance) { dMoveLen += distance * iDirection; //jak jedzie do tyłu to trzeba uwzględniać, że distance jest ujemna } std::size_t TableSize() const { return sSpeedTable.size(); } @@ -396,8 +373,7 @@ private: private: // Ra: stare funkcje skanujące, używane do szukania sygnalizatora z tyłu bool BackwardTrackBusy(TTrack *Track); TEvent *CheckTrackEventBackward(double fDirection, TTrack *Track); - TTrack *BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, - TEvent *&Event); + TTrack *BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, TEvent *&Event); void SetProximityVelocity(double dist, double vel, const vector3 *pos); TCommandType BackwardScan(); @@ -417,13 +393,16 @@ private: return ( ( iDrivigFlags & movePrimary ) != 0 ); }; inline int DrivigFlags() const { - return iDrivigFlags; - }; + return iDrivigFlags; }; + // returns most recently calculated distance to potential obstacle ahead + double + TrackBlock() const; void MoveTo(TDynamicObject *to); void DirectionInitial(); std::string TableText(std::size_t const Index); int CrossRoute(TTrack *tr); void RouteSwitch(int d); std::string OwnerName() const; - TMoverParameters const *Controlling() const { return mvControlling; } + TMoverParameters const *Controlling() const { + return mvControlling; } }; diff --git a/Ground.cpp b/Ground.cpp index 36173b84..ca36f1fb 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2426,7 +2426,7 @@ bool TGround::InitEvents() Current->Params[9].asTrack = tmp->pTrack; if (!Current->Params[9].asTrack) { - ErrorLog("Bad event: Track \"" + cellastext + "\" does not exist in \"" + Current->asName + "\""); + ErrorLog( "Bad event: multi-event \"" + Current->asName + "\" cannot find track \"" + cellastext + "\"" ); Current->iFlags &= ~(conditional_trackoccupied | conditional_trackfree); // zerowanie flag } } @@ -2437,7 +2437,7 @@ bool TGround::InitEvents() Current->Params[9].asMemCell = tmp->MemCell; if (!Current->Params[9].asMemCell) { - ErrorLog("Bad event: MemCell \"" + cellastext + "\" does not exist in \"" + Current->asName + "\""); + ErrorLog( "Bad event: multi-event \"" + Current->asName + "\" cannot find memory cell \"" + cellastext + "\"" ); Current->iFlags &= ~(conditional_memstring | conditional_memval1 | conditional_memval2); } } @@ -2448,13 +2448,13 @@ bool TGround::InitEvents() cellastext = Current->Params[ i ].asText; SafeDeleteArray(Current->Params[i].asText); Current->Params[i].asEvent = FindEvent(cellastext); - if( !Current->Params[ i ].asEvent ) { // Ra: tylko w logu informacja o braku + if( !Current->Params[ i ].asEvent ) { + // Ra: tylko w logu informacja o braku if( ( Current->Params[ i ].asText == NULL ) || ( std::string( Current->Params[ i ].asText ).substr( 0, 5 ) != "none_" ) ) { - WriteLog( "Event \"" + cellastext + "\" does not exist" ); - ErrorLog( "Missed event: " + cellastext + " in multiple " + Current->asName ); + ErrorLog( "Bad event: multi-event \"" + Current->asName + "\" cannot find event \"" + cellastext + "\"" ); } - } + } } } break; @@ -3401,18 +3401,22 @@ bool TGround::CheckQuery() owner != nullptr ? owner->fReady : -1.0 ); + auto const collisiondistance = ( + owner != nullptr ? + owner->TrackBlock() : + -1.0 ); tmpEvent->Params[ 9 ].asMemCell->UpdateValues( tmpEvent->Activator->MoverParameters->TypeName, // typ pojazdu consistbrakelevel, - 0, // na razie nic + collisiondistance, tmpEvent->iFlags & ( update_memstring | update_memval1 | update_memval2 ) ); WriteLog( "whois request (" + to_string( tmpEvent->iFlags ) + ") " + "[name: " + tmpEvent->Activator->MoverParameters->TypeName + "], " + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " - + "[]" ); + + "[obstacle distance: " + to_string( collisiondistance, 2 ) + " m]" ); } else { // jeśli parametry ładunku diff --git a/Train.cpp b/Train.cpp index 8610ebce..89fd9182 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2497,7 +2497,7 @@ void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels if( Train->ggInstrumentLightButton.SubModel == nullptr ) { if( Command.action == GLFW_PRESS ) { - WriteLog( "Universal3 switch is missing, or wasn't defined" ); + WriteLog( "Instrument light switch is missing, or wasn't defined" ); } return; } diff --git a/World.cpp b/World.cpp index 8aa6ee88..658205e1 100644 --- a/World.cpp +++ b/World.cpp @@ -1433,6 +1433,10 @@ TWorld::Update_UI() { + ", Fr: " + to_string( tmp->MoverParameters->RunningTrack.friction, 2 ) + ( tmp->MoverParameters->SlippingWheels ? " (!)" : "" ); + if( tmp->Mechanik ) { + uitextline2 += "; Ag: " + to_string( tmp->Mechanik->fAccGravity, 2 ); + } + uitextline2 += "; TC:" + to_string( tmp->MoverParameters->TotalCurrent, 0 ); diff --git a/renderer.cpp b/renderer.cpp index 46f896e9..3ca7eadc 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -22,6 +22,8 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "usefull.h" +#define EU07_NEW_CAB_RENDERCODE + opengl_renderer GfxRenderer; extern TWorld World; diff --git a/version.h b/version.h index 50d73e58..b11e1ac6 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 911 +#define VERSION_MINOR 913 #define VERSION_REVISION 0 From 6c69a5b8f1b13cc516209abb5ce8d8624df1f5c8 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 15 Sep 2017 04:14:12 +0200 Subject: [PATCH 191/426] build 170914. fix for car braking, sound and event updates refactored out of gfx renderer --- Driver.cpp | 78 +++++++++++++++++++++++++++++++++++++--------------- Driver.h | 10 +++---- Ground.cpp | 39 ++++++++++++++++++++++++++ Ground.h | 3 +- World.cpp | 1 + renderer.cpp | 27 ------------------ version.h | 2 +- 7 files changed, 104 insertions(+), 56 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 48f71618..f6e6e728 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1422,11 +1422,15 @@ void TController::TablePurger() iLast = sSpeedTable.size() - 1; }; -void TController::TableSort() -{ +void TController::TableSort() { + + if( sSpeedTable.size() < 3 ) { + // we skip last slot and no point in checking if there's only one other entry + return; + } TSpeedPos sp_temp = TSpeedPos(); // uzywany do przenoszenia - for (std::size_t i = 0; i < (iLast - 1) && iLast > 0; ++i) - { // pętla tylko do dwóch pozycji od końca bo ostatniej nie modyfikujemy + for( std::size_t i = 0; i < ( iLast - 1 ); ++i ) { + // pętla tylko do dwóch pozycji od końca bo ostatniej nie modyfikujemy if (sSpeedTable[i].fDist > sSpeedTable[i + 1].fDist) { // jesli pozycja wcześniejsza jest dalej to źle sp_temp = sSpeedTable[i + 1]; @@ -4568,24 +4572,52 @@ TController::UpdateSituation(double dt) { } // koniec predkosci nastepnej - if( vel > VelDesired ) { - // jesli jedzie za szybko do AKTUALNEGO - if( VelDesired == 0.0 ) { - // jesli stoj, to hamuj, ale i tak juz za pozno :) - AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie - } - else { - // try to estimate increase of current velocity before engaged brakes start working - // if it looks like we'll exceed maximum allowed speed start thinking about slight slowing down - if( ( vel + vel * ( 1.0 - fBrake_a0[ 0 ] ) * AbsAccS ) > ( VelDesired + fVelPlus ) ) { - // hamuj tak średnio - AccDesired = std::min( AccDesired, -0.25 ); + // decisions based on current speed + if( mvOccupied->CategoryFlag == 1 ) { + // try to estimate increase of current velocity before engaged brakes start working + auto const speedestimate = vel + vel * ( 1.0 - fBrake_a0[ 0 ] ) * AbsAccS; + if( speedestimate > VelDesired ) { + // jesli jedzie za szybko do AKTUALNEGO + if( VelDesired == 0.0 ) { + // jesli stoj, to hamuj, ale i tak juz za pozno :) + AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie } else { - // o 5 km/h to olej (zacznij luzować) - AccDesired = std::min( - AccDesired, // but don't override decceleration for VelNext - std::max( 0.0, AccPreferred ) ); + if( speedestimate > ( VelDesired + fVelPlus ) ) { + // if it looks like we'll exceed maximum allowed speed start thinking about slight slowing down + AccDesired = std::min( AccDesired, -0.25 ); + } + else { + // close enough to target to stop accelerating + AccDesired = std::min( + AccDesired, // but don't override decceleration for VelNext + interpolate( // ease off as you close to the target velocity + -0.06, AccPreferred, + clamp( speedestimate - vel, 0.0, fVelPlus ) / fVelPlus ) ); + } + } + } + } + else { + // for cars the older version works better + if( vel > VelDesired ) { + // jesli jedzie za szybko do AKTUALNEGO + if( VelDesired == 0.0 ) { + // jesli stoj, to hamuj, ale i tak juz za pozno :) + AccDesired = std::min( AccDesired, -0.9 ); // hamuj solidnie + } + else { + // slow down, not full stop + if( vel > ( VelDesired + fVelPlus ) ) { + // hamuj tak średnio + AccDesired = std::min( AccDesired, -fBrake_a0[ 0 ] * 0.5 ); + } + else { + // o 5 km/h to olej (zacznij luzować) + AccDesired = std::min( + AccDesired, // but don't override decceleration for VelNext + std::max( 0.0, AccPreferred ) ); + } } } } @@ -4593,8 +4625,10 @@ TController::UpdateSituation(double dt) { // last step sanity check, until the whole calculation is straightened out AccDesired = std::min( AccDesired, AccPreferred ); - // also take into account impact of gravity - AccDesired = clamp( AccDesired - fAccGravity, -0.9, 0.9 ); + if( mvOccupied->CategoryFlag == 1 ) { + // also take into account impact of gravity + AccDesired = clamp( AccDesired - fAccGravity, -0.9, 0.9 ); + } diff --git a/Driver.h b/Driver.h index c552dfa8..17fc2f72 100644 --- a/Driver.h +++ b/Driver.h @@ -171,8 +171,8 @@ extern bool WriteLogFlag; // logowanie parametrów fizycznych static const int BrakeAccTableSize = 20; //---------------------------------------------------------------------------- -class TController -{ +class TController { + private: // obsługa tabelki prędkości (musi mieć możliwość odhaczania stacji w rozkładzie) int iLast{ 0 }; // ostatnia wypełniona pozycja w tabeli nNext3 ) { + node->RenderHidden(); + } + + // render events and sounds from sectors near enough to the viewer + auto const range = 2750.0; // audible range of 100 db sound + int const camerax = static_cast( std::floor( Global::pCameraPosition.x / 1000.0 ) + iNumRects / 2 ); + int const cameraz = static_cast( std::floor( Global::pCameraPosition.z / 1000.0 ) + iNumRects / 2 ); + int const segmentcount = 2 * static_cast( std::ceil( range / 1000.0 ) ); + int const originx = std::max( 0, camerax - segmentcount / 2 ); + int const originz = std::max( 0, cameraz - segmentcount / 2 ); + + for( int column = originx; column <= originx + segmentcount; ++column ) { + for( int row = originz; row <= originz + segmentcount; ++row ) { + + auto &cell = Rects[ column ][ row ]; + + for( int subcellcolumn = 0; subcellcolumn < iNumSubRects; ++subcellcolumn ) { + for( int subcellrow = 0; subcellrow < iNumSubRects; ++subcellrow ) { + auto subcell = cell.FastGetSubRect( subcellcolumn, subcellrow ); + if( subcell == nullptr ) { continue; } + // renderowanie obiektów aktywnych a niewidocznych + for( auto node = subcell->nRenderHidden; node; node = node->nNext3 ) { + node->RenderHidden(); + } + // jeszcze dźwięki pojazdów by się przydały, również niewidocznych + // TODO: move to sound renderer + subcell->RenderSounds(); + } + } + } + } + +} + // Winger 170204 - szukanie trakcji nad pantografami bool TGround::GetTraction(TDynamicObject *model) { // aktualizacja drutu zasilającego dla każdego pantografu, żeby odczytać napięcie diff --git a/Ground.h b/Ground.h index a35f69f5..b79ef633 100644 --- a/Ground.h +++ b/Ground.h @@ -227,7 +227,7 @@ public: return pSubRects + iRow * iNumSubRects + iCol; // zwrócenie właściwego }; // pobranie wskaźnika do małego kwadratu, bez tworzenia jeśli nie ma - TSubRect * FastGetSubRect(int iCol, int iRow) { + TSubRect *FastGetSubRect(int iCol, int iRow) const { return ( pSubRects ? pSubRects + iRow * iNumSubRects + iCol : @@ -287,6 +287,7 @@ class TGround void UpdatePhys(double dt, int iter); // aktualizacja fizyki stałym krokiem bool Update(double dt, int iter); // aktualizacja przesunięć zgodna z FPS void Update_Lights(); // updates scene lights array + void Update_Hidden(); // updates invisible elements of the scene bool AddToQuery(TEvent *Event, TDynamicObject *Node); bool GetTraction(TDynamicObject *model); bool CheckQuery(); diff --git a/World.cpp b/World.cpp index 658205e1..2559d914 100644 --- a/World.cpp +++ b/World.cpp @@ -1047,6 +1047,7 @@ bool TWorld::Update() Ground.CheckQuery(); + Ground.Update_Hidden(); Ground.Update_Lights(); // render time routines follow: diff --git a/renderer.cpp b/renderer.cpp index 3ca7eadc..bef13681 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1344,19 +1344,6 @@ opengl_renderer::Render( TGround *Ground ) { m_drawqueue.clear(); - switch( m_renderpass.draw_mode ) { - case rendermode::color: { - // rednerowanie globalnych (nie za często?) - for( TGroundNode *node = Ground->srGlobal.nRenderHidden; node; node = node->nNext3 ) { - node->RenderHidden(); - } - break; - } - default: { - break; - } - } - glm::vec3 const cameraposition { m_renderpass.camera.position() }; int const camerax = static_cast( std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2 ); int const cameraz = static_cast( std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2 ); @@ -1373,20 +1360,6 @@ opengl_renderer::Render( TGround *Ground ) { for( int row = originz; row <= originz + segmentcount; ++row ) { auto *cell = &Ground->Rects[ column ][ row ]; - - for( int subcellcolumn = 0; subcellcolumn < iNumSubRects; ++subcellcolumn ) { - for( int subcellrow = 0; subcellrow < iNumSubRects; ++subcellrow ) { - auto subcell = cell->FastGetSubRect( subcellcolumn, subcellrow ); - if( subcell == nullptr ) { continue; } - // renderowanie obiektów aktywnych a niewidocznych - for( auto node = subcell->nRenderHidden; node; node = node->nNext3 ) { - node->RenderHidden(); - } - // jeszcze dźwięki pojazdów by się przydały, również niewidocznych - subcell->RenderSounds(); - } - } - if( m_renderpass.camera.visible( cell->m_area ) ) { Render( cell ); } diff --git a/version.h b/version.h index b11e1ac6..c063cca4 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 913 +#define VERSION_MINOR 914 #define VERSION_REVISION 0 From 5c08631c7f9275ad456f933f694e5034a94f776f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 16 Sep 2017 16:59:20 +0200 Subject: [PATCH 192/426] fixed trackbed normal generation --- AnimModel.h | 41 +- Segment.cpp | 104 ++--- Segment.h | 18 +- Track.cpp | 1062 ++++++++++++++++++++++++++++++++++----------------- Track.h | 49 +-- 5 files changed, 802 insertions(+), 472 deletions(-) diff --git a/AnimModel.h b/AnimModel.h index e24ab335..cf7d9d98 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -77,16 +77,9 @@ class TAnimContainer TAnimContainer(); ~TAnimContainer(); bool Init(TSubModel *pNewSubModel); - // std::string inline GetName() { return - // std::string(pSubModel?pSubModel->asName.c_str():""); }; - // std::string inline GetName() { return std::string(pSubModel?pSubModel->pName:""); - // }; - std::string NameGet() - { - return (pSubModel ? pSubModel->pName : ""); - }; - // void SetRotateAnim(vector3 vNewRotateAxis, double fNewDesiredAngle, double - // fNewRotateSpeed, bool bResetAngle=false); + inline + std::string NameGet() { + return (pSubModel ? pSubModel->pName : ""); }; void SetRotateAnim(vector3 vNewRotateAngles, double fNewRotateSpeed); void SetTranslateAnim(vector3 vNewTranslate, double fNewSpeed); void AnimSetVMD(double fNewSpeed); @@ -94,24 +87,20 @@ class TAnimContainer void UpdateModel(); void UpdateModelIK(); bool InMovement(); // czy w trakcie animacji? - double _fastcall AngleGet() - { - return vRotateAngles.z; - }; // jednak ostatnia, T3D ma inny układ - vector3 _fastcall TransGet() - { - return vector3(-vTranslation.x, vTranslation.z, vTranslation.y); - }; // zmiana, bo T3D ma inny układ - void WillBeAnimated() - { + inline + double AngleGet() { + return vRotateAngles.z; }; // jednak ostatnia, T3D ma inny układ + inline + vector3 TransGet() { + return vector3(-vTranslation.x, vTranslation.z, vTranslation.y); }; // zmiana, bo T3D ma inny układ + inline + void WillBeAnimated() { if (pSubModel) - pSubModel->WillBeAnimated(); - }; + pSubModel->WillBeAnimated(); }; void EventAssign(TEvent *ev); - TEvent * Event() - { - return evDone; - }; + inline + TEvent * Event() { + return evDone; }; }; class TAnimAdvanced diff --git a/Segment.cpp b/Segment.cpp index f002cc3c..bfed769e 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -59,8 +59,8 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M CPointIn = NewCPointIn; Point2 = NewPoint2; // poprawienie przechyłki - fRoll1 = DegToRad(fNewRoll1); // Ra: przeliczone jest bardziej przydatne do obliczeń - fRoll2 = DegToRad(fNewRoll2); + fRoll1 = glm::radians(fNewRoll1); // Ra: przeliczone jest bardziej przydatne do obliczeń + fRoll2 = glm::radians(fNewRoll2); if (Global::bRollFix) { // Ra: poprawianie przechyłki // Przechyłka powinna być na środku wewnętrznej szyny, a standardowo jest w osi @@ -78,7 +78,7 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M CPointOut.y += w1; // prosty ma wektory jednostkowe pOwner->MovedUp1(w1); // zwrócić trzeba informację o podwyższeniu podsypki } - if (fRoll2 != 0.0) + if (fRoll2 != 0.f) { double w2 = std::abs(std::sin(fRoll2) * 0.75); // 0.5*w2+0.0325; //0.75m dla 1.435 Point2.y += w2; // modyfikacja musi być przed policzeniem dalszych parametrów @@ -87,9 +87,9 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M // zwrócić trzeba informację o podwyższeniu podsypki } } + // kąt w planie, żeby nie liczyć wielokrotnie // Ra: ten kąt jeszcze do przemyślenia jest - fDirection = -atan2(Point2.x - Point1.x, - Point2.z - Point1.z); // kąt w planie, żeby nie liczyć wielokrotnie + fDirection = -std::atan2(Point2.x - Point1.x, Point2.z - Point1.z); bCurve = bIsCurve; if (bCurve) { // przeliczenie współczynników wielomianu, będzie mniej mnożeń i można policzyć pochodne @@ -101,10 +101,9 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M else fLength = (Point1 - Point2).Length(); fStep = fNewStep; - if (fLength <= 0) - { + if (fLength <= 0) { + ErrorLog( "Bad geometry: zero length spline \"" + pOwner->NameGet() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); - // MessageBox(0,"Length<=0","TSegment::Init",MB_OK); fLength = 0.01; // crude workaround TODO: fix this properly /* return false; // zerowe nie mogą być @@ -355,7 +354,7 @@ Math3D::vector3 TSegment::FastGetPoint(double const t) const interpolate( Point1, Point2, t ) ); } -bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, const vector6 *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, double fOffsetX, Math3D::vector3 **p, bool bRender) +bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, const basic_vertex *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, float fOffsetX, glm::vec3 **p, bool bRender) { // generowanie trójkątów dla odcinka trajektorii ruchu // standardowo tworzy triangle_strip dla prostego albo ich zestaw dla łuku // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli @@ -365,13 +364,14 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, if( !fTsBuffer ) return false; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę - Math3D::vector3 pos1, pos2, dir, parallel1, parallel2, pt, norm; - double s, step, fOffset, tv1, tv2, t, fEnd; + glm::vec3 pos1, pos2, dir, parallel1, parallel2, pt, norm; + float s, step, fOffset, tv1, tv2, t, fEnd; bool const trapez = iNumShapePoints < 0; // sygnalizacja trapezowatości iNumShapePoints = std::abs( iNumShapePoints ); - fTextureLength *= Texturescale; + float const texturelength = fTextureLength * Texturescale; + float const texturescale = Texturescale; - double m1, jmm1, m2, jmm2; // pozycje względne na odcinku 0...1 (ale nie parametr Beziera) + float m1, jmm1, m2, jmm2; // pozycje względne na odcinku 0...1 (ale nie parametr Beziera) step = fStep; tv1 = 1.0; // Ra: to by można było wyliczać dla odcinka, wyglądało by lepiej s = fStep * iSkip; // iSkip - ile odcinków z początku pominąć @@ -379,9 +379,9 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, t = fTsBuffer[ i ]; // tabela wattości t dla segmentów // BUG: length of spline can be 0, we should skip geometry generation for such cases fOffset = 0.1 / fLength; // pierwsze 10cm - pos1 = FastGetPoint( t ); // wektor początku segmentu - dir = FastGetDirection( t, fOffset ); // wektor kierunku - parallel1 = Normalize( Math3D::vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny + pos1 = glm::dvec3{ FastGetPoint( t ) - Origin }; // wektor początku segmentu + dir = glm::dvec3{ FastGetDirection( t, fOffset ) }; // wektor kierunku + parallel1 = glm::normalize( glm::vec3{ -dir.z, 0.f, dir.x } ); // wektor poprzeczny if( iEnd == 0 ) iEnd = iSegCount; fEnd = fLength * double( iEnd ) / double( iSegCount ); @@ -406,26 +406,26 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, while( tv1 < 0.0 ) { tv1 += 1.0; } - tv2 = tv1 - step / fTextureLength; // mapowanie na końcu segmentu + tv2 = tv1 - step / texturelength; // mapowanie na końcu segmentu t = fTsBuffer[ i ]; // szybsze od GetTFromS(s); - pos2 = FastGetPoint( t ); - dir = FastGetDirection( t, fOffset ); // nowy wektor kierunku - parallel2 = Normalize( Math3D::vector3( -dir.z, 0.0, dir.x ) ); // wektor poprzeczny + pos2 = glm::dvec3{ FastGetPoint( t ) - Origin }; + dir = glm::dvec3{ FastGetDirection( t, fOffset ) }; // nowy wektor kierunku + parallel2 = glm::normalize( glm::vec3{ -dir.z, 0.f, dir.x } ); // wektor poprzeczny if( trapez ) { for( int j = 0; j < iNumShapePoints; ++j ) { - pt = parallel1 * ( jmm1 * ( ShapePoints[ j ].x - fOffsetX ) + m1 * ShapePoints[ j + iNumShapePoints ].x ) + pos1; - pt.y += jmm1 * ShapePoints[ j ].y + m1 * ShapePoints[ j + iNumShapePoints ].y; - pt -= Origin; - norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel1; - norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; + pt = parallel1 * ( jmm1 * ( ShapePoints[ j ].position.x - fOffsetX ) + m1 * ShapePoints[ j + iNumShapePoints ].position.x ) + pos1; + pt.y += jmm1 * ShapePoints[ j ].position.y + m1 * ShapePoints[ j + iNumShapePoints ].position.y; +// pt -= Origin; + norm = ( jmm1 * ShapePoints[ j ].normal.x + m1 * ShapePoints[ j + iNumShapePoints ].normal.x ) * parallel1; + norm.y += jmm1 * ShapePoints[ j ].normal.y + m1 * ShapePoints[ j + iNumShapePoints ].normal.y; if( bRender ) { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów Output.emplace_back( - glm::vec3 { pt.x, pt.y, pt.z }, - glm::vec3 { norm.x, norm.y, norm.z }, - glm::vec2 { ( jmm1 * ShapePoints[ j ].z + m1 * ShapePoints[ j + iNumShapePoints ].z ) / Texturescale, tv1 } ); + pt, + glm::normalize( norm ), + glm::vec2 { ( jmm1 * ShapePoints[ j ].texture.x + m1 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv1 } ); } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -435,17 +435,17 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, ( *p )++; } // zapamiętanie brzegu jezdni // dla trapezu drugi koniec ma inne współrzędne - pt = parallel2 * ( jmm2 * ( ShapePoints[ j ].x - fOffsetX ) + m2 * ShapePoints[ j + iNumShapePoints ].x ) + pos2; - pt.y += jmm2 * ShapePoints[ j ].y + m2 * ShapePoints[ j + iNumShapePoints ].y; - pt -= Origin; - norm = ( jmm1 * ShapePoints[ j ].n.x + m1 * ShapePoints[ j + iNumShapePoints ].n.x ) * parallel2; - norm.y += jmm1 * ShapePoints[ j ].n.y + m1 * ShapePoints[ j + iNumShapePoints ].n.y; + pt = parallel2 * ( jmm2 * ( ShapePoints[ j ].position.x - fOffsetX ) + m2 * ShapePoints[ j + iNumShapePoints ].position.x ) + pos2; + pt.y += jmm2 * ShapePoints[ j ].position.y + m2 * ShapePoints[ j + iNumShapePoints ].position.y; +// pt -= Origin; + norm = ( jmm1 * ShapePoints[ j ].normal.x + m1 * ShapePoints[ j + iNumShapePoints ].normal.x ) * parallel2; + norm.y += jmm1 * ShapePoints[ j ].normal.y + m1 * ShapePoints[ j + iNumShapePoints ].normal.y; if( bRender ) { // skrzyżowania podczas łączenia siatek mogą nie renderować poboczy, ale potrzebować punktów Output.emplace_back( - glm::vec3 { pt.x, pt.y, pt.z }, - glm::vec3 { norm.x, norm.y, norm.z }, - glm::vec2 { ( jmm2 * ShapePoints[ j ].z + m2 * ShapePoints[ j + iNumShapePoints ].z ) / Texturescale, tv2 } ); + pt, + glm::normalize( norm ), + glm::vec2 { ( jmm2 * ShapePoints[ j ].texture.x + m2 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv2 } ); } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -460,27 +460,27 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, if( bRender ) { for( int j = 0; j < iNumShapePoints; ++j ) { //łuk z jednym profilem - pt = parallel1 * ( ShapePoints[ j ].x - fOffsetX ) + pos1; - pt.y += ShapePoints[ j ].y; - pt -= Origin; - norm = ShapePoints[ j ].n.x * parallel1; - norm.y += ShapePoints[ j ].n.y; + pt = parallel1 * ( ShapePoints[ j ].position.x - fOffsetX ) + pos1; + pt.y += ShapePoints[ j ].position.y; +// pt -= Origin; + norm = ShapePoints[ j ].normal.x * parallel1; + norm.y += ShapePoints[ j ].normal.y; Output.emplace_back( - glm::vec3 { pt.x, pt.y, pt.z }, - glm::vec3 { norm.x, norm.y, norm.z }, - glm::vec2 { ShapePoints[ j ].z / Texturescale, tv1 } ); + pt, + glm::normalize( norm ), + glm::vec2 { ShapePoints[ j ].texture.x / texturescale, tv1 } ); - pt = parallel2 * ShapePoints[ j ].x + pos2; - pt.y += ShapePoints[ j ].y; - pt -= Origin; - norm = ShapePoints[ j ].n.x * parallel2; - norm.y += ShapePoints[ j ].n.y; + pt = parallel2 * ShapePoints[ j ].position.x + pos2; + pt.y += ShapePoints[ j ].position.y; +// pt -= Origin; + norm = ShapePoints[ j ].normal.x * parallel2; + norm.y += ShapePoints[ j ].normal.y; Output.emplace_back( - glm::vec3 { pt.x, pt.y, pt.z }, - glm::vec3 { norm.x, norm.y, norm.z }, - glm::vec2 { ShapePoints[ j ].z / Texturescale, tv2 } ); + pt, + glm::normalize( norm ), + glm::vec2 { ShapePoints[ j ].texture.x / texturescale, tv2 } ); } } } diff --git a/Segment.h b/Segment.h index 618132da..93209804 100644 --- a/Segment.h +++ b/Segment.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "usefull.h" // 110405 Ra: klasa punktów przekroju z normalnymi - +/* class vector6 : public Math3D::vector3 { // punkt przekroju wraz z wektorem normalnym public: @@ -26,7 +26,6 @@ class vector6 : public Math3D::vector3 n.y = 1.0; }; vector6(double a, double b, double c, double d, double e, double f) - //{x=a; y=b; z=c; n.x=d; n.y=e; n.z=f;}; { x = a; y = b; @@ -45,13 +44,14 @@ class vector6 : public Math3D::vector3 n.z = 0.0; }; }; - +*/ class TSegment { // aproksymacja toru (zwrotnica ma dwa takie, jeden z nich jest aktywny) private: Math3D::vector3 Point1, CPointOut, CPointIn, Point2; - double fRoll1 = 0.0, - fRoll2 = 0.0; // przechyłka na końcach + float + fRoll1{ 0.f }, + fRoll2{ 0.f }; // przechyłka na końcach double fLength = 0.0; // długość policzona double *fTsBuffer = nullptr; // wartości parametru krzywej dla równych odcinków double fStep = 0.0; @@ -118,18 +118,18 @@ public: FastGetPoint_1() const { return Point2; }; inline - double + float GetRoll(double const Distance) const { - return interpolate( fRoll1, fRoll2, Distance / fLength ); } + return interpolate( fRoll1, fRoll2, static_cast(Distance / fLength) ); } inline void - GetRolls(double &r1, double &r2) const { + GetRolls(float &r1, float &r2) const { // pobranie przechyłek (do generowania trójkątów) r1 = fRoll1; r2 = fRoll2; } bool - RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, vector6 const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, double fOffsetX = 0.0, Math3D::vector3 **p = nullptr, bool bRender = true); + RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, basic_vertex const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, float fOffsetX = 0.f, glm::vec3 **p = nullptr, bool bRender = true); void Render(); inline diff --git a/Track.cpp b/Track.cpp index ed464b22..ed94059a 100644 --- a/Track.cpp +++ b/Track.cpp @@ -30,7 +30,7 @@ http://mozilla.org/MPL/2.0/. // 101206 Ra: trapezoidalne drogi i tory // 110720 Ra: rozprucie zwrotnicy i odcinki izolowane -static const double fMaxOffset = 0.1; // double(0.1f)==0.100000001490116 +static float const fMaxOffset = 0.1f; // double(0.1f)==0.100000001490116 // const int NextMask[4]={0,1,0,1}; //tor następny dla stanów 0, 1, 2, 3 // const int PrevMask[4]={0,0,1,1}; //tor poprzedni dla stanów 0, 1, 2, 3 const int iLewo4[4] = {5, 3, 4, 6}; // segmenty (1..6) do skręcania w lewo @@ -52,7 +52,7 @@ TSwitchExtension::TSwitchExtension(TTrack *owner, int const what) pPrevs[0] = nullptr; pPrevs[1] = nullptr; fOffset1 = fOffset = fDesiredOffset = -fOffsetDelay; // położenie zasadnicze - fOffset2 = 0.0; // w zasadniczym wewnętrzna iglica dolega + fOffset2 = 0.f; // w zasadniczym wewnętrzna iglica dolega Segments[0] = std::make_shared(owner); // z punktu 1 do 2 Segments[1] = std::make_shared(owner); // z punktu 3 do 4 (1=3 dla zwrotnic; odwrócony dla skrzyżowań, ewentualnie 1=4) Segments[2] = (what >= 3) ? @@ -83,8 +83,7 @@ TIsolated::TIsolated(std::string const &n, TIsolated *i) : // utworznie obwodu izolowanego. nothing to do here. }; -TIsolated::~TIsolated(){ - // usuwanie +// TODO: put this in the cleanup routine on exit /* TIsolated *p=pRoot; while (pRoot) @@ -94,7 +93,6 @@ TIsolated::~TIsolated(){ delete p; } */ -}; TIsolated * TIsolated::Find(std::string const &n) { // znalezienie obiektu albo utworzenie nowego @@ -155,16 +153,6 @@ TTrack::~TTrack() if( eType == tt_Cross ) { delete SwitchExtension->vPoints; // skrzyżowanie może mieć punkty } - -/* if (eType == tt_Normal) - delete Segment; // dla zwrotnic nie usuwać tego (kopiowany) - else - { // usuwanie dodatkowych danych dla niezwykłych odcinków - if (eType == tt_Cross) - delete SwitchExtension->vPoints; // skrzyżowanie może mieć punkty - SafeDelete(SwitchExtension); - } -*/ } void TTrack::Init() @@ -215,7 +203,7 @@ TTrack * TTrack::NullCreate(int dir) trk->bVisible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur // trk->iTrapezoid=1; //są przechyłki do uwzględniania w rysowaniu trk->iCategoryFlag = (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy - double r1, r2; + float r1, r2; Segment->GetRolls(r1, r2); // pobranie przechyłek na początku toru vector3 p1, cv1, cv2, p2; // będziem tworzyć trajektorię lotu if (iCategoryFlag & 1) @@ -965,37 +953,39 @@ bool TTrack::AddDynamicObject(TDynamicObject *Dynamic) const int numPts = 4; const int nnumPts = 12; -const vector6 szyna[nnumPts] = // szyna - vextor6(x,y,mapowanie tekstury,xn,yn,zn) - { // tę wersję opracował Tolein (bez pochylenia) - vector6(0.111, -0.180, 0.00, 1.000, 0.000, 0.000), - vector6(0.046, -0.150, 0.15, 0.707, 0.707, 0.000), - vector6(0.044, -0.050, 0.25, 0.707, -0.707, 0.000), - vector6(0.073, -0.038, 0.35, 0.707, -0.707, 0.000), - vector6(0.072, -0.010, 0.40, 0.707, 0.707, 0.000), - vector6(0.052, -0.000, 0.45, 0.000, 1.000, 0.000), - vector6(0.020, -0.000, 0.55, 0.000, 1.000, 0.000), - vector6(0.000, -0.010, 0.60, -0.707, 0.707, 0.000), - vector6(-0.001, -0.038, 0.65, -0.707, -0.707, 0.000), - vector6(0.028, -0.050, 0.75, -0.707, -0.707, 0.000), - vector6(0.026, -0.150, 0.85, -0.707, 0.707, 0.000), - vector6(-0.039, -0.180, 1.00, -1.000, 0.000, 0.000)}; +// szyna - vextor6(x,y,mapowanie tekstury,xn,yn,zn) +// tę wersję opracował Tolein (bez pochylenia) +// TODO: profile definitions in external files +basic_vertex const szyna[ nnumPts ] = { + {{ 0.111f, -0.180f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.00f, 0.f}}, + {{ 0.046f, -0.150f, 0.f}, { 0.707f, 0.707f, 0.f}, {0.15f, 0.f}}, + {{ 0.044f, -0.050f, 0.f}, { 0.707f, -0.707f, 0.f}, {0.25f, 0.f}}, + {{ 0.073f, -0.038f, 0.f}, { 0.707f, -0.707f, 0.f}, {0.35f, 0.f}}, + {{ 0.072f, -0.010f, 0.f}, { 0.707f, 0.707f, 0.f}, {0.40f, 0.f}}, + {{ 0.052f, -0.000f, 0.f}, { 0.000f, 1.000f, 0.f}, {0.45f, 0.f}}, + {{ 0.020f, -0.000f, 0.f}, { 0.000f, 1.000f, 0.f}, {0.55f, 0.f}}, + {{ 0.000f, -0.010f, 0.f}, {-0.707f, 0.707f, 0.f}, {0.60f, 0.f}}, + {{-0.001f, -0.038f, 0.f}, {-0.707f, -0.707f, 0.f}, {0.65f, 0.f}}, + {{ 0.028f, -0.050f, 0.f}, {-0.707f, -0.707f, 0.f}, {0.75f, 0.f}}, + {{ 0.026f, -0.150f, 0.f}, {-0.707f, 0.707f, 0.f}, {0.85f, 0.f}}, + {{-0.039f, -0.180f, 0.f}, {-1.000f, 0.000f, 0.f}, {1.00f, 0.f}} }; -const vector6 iglica[nnumPts] = // iglica - vextor3(x,y,mapowanie tekstury) - { - vector6(0.010, -0.180, 0.00, 1.000, 0.000, 0.000), - vector6(0.010, -0.155, 0.15, 1.000, 0.000, 0.000), - vector6(0.010, -0.070, 0.25, 1.000, 0.000, 0.000), - vector6(0.010, -0.040, 0.35, 1.000, 0.000, 0.000), - vector6(0.010, -0.010, 0.40, 1.000, 0.000, 0.000), - vector6(0.010, -0.000, 0.45, 0.707, 0.707, 0.000), - vector6(0.000, -0.000, 0.55, 0.707, 0.707, 0.000), - vector6(0.000, -0.010, 0.60, -1.000, 0.000, 0.000), - vector6(0.000, -0.040, 0.65, -1.000, 0.000, 0.000), - vector6(0.000, -0.070, 0.75, -1.000, 0.000, 0.000), - vector6(0.000, -0.155, 0.85, -0.707, 0.707, 0.000), - vector6(-0.040, -0.180, 1.00, -1.000, 0.000, - 0.000) // 1mm więcej, żeby nie nachodziły tekstury? -}; +// iglica - vextor3(x,y,mapowanie tekstury) +// 1 mm więcej, żeby nie nachodziły tekstury? +// TODO: automatic generation from base profile TBD: reuse base profile? +basic_vertex const iglica[ nnumPts ] = { + {{ 0.010f, -0.180f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.00f, 0.f}}, + {{ 0.010f, -0.155f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.15f, 0.f}}, + {{ 0.010f, -0.070f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.25f, 0.f}}, + {{ 0.010f, -0.040f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.35f, 0.f}}, + {{ 0.010f, -0.010f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.40f, 0.f}}, + {{ 0.010f, -0.000f, 0.f}, { 0.707f, 0.707f, 0.f}, {0.45f, 0.f}}, + {{ 0.000f, -0.000f, 0.f}, { 0.707f, 0.707f, 0.f}, {0.55f, 0.f}}, + {{ 0.000f, -0.010f, 0.f}, {-1.000f, 0.000f, 0.f}, {0.60f, 0.f}}, + {{ 0.000f, -0.040f, 0.f}, {-1.000f, 0.000f, 0.f}, {0.65f, 0.f}}, + {{ 0.000f, -0.070f, 0.f}, {-1.000f, 0.000f, 0.f}, {0.75f, 0.f}}, + {{ 0.000f, -0.155f, 0.f}, {-0.707f, 0.707f, 0.f}, {0.85f, 0.f}}, + {{-0.040f, -0.180f, 0.f}, {-1.000f, 0.000f, 0.f}, {1.00f, 0.f}} }; bool TTrack::CheckDynamicObject(TDynamicObject *Dynamic) { // sprawdzenie, czy pojazd jest przypisany do toru @@ -1091,30 +1081,32 @@ void TTrack::RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joi // wypełnianie tablic VBO void TTrack::create_geometry( geometrybank_handle const &Bank ) { // Ra: trzeba rozdzielić szyny od podsypki, aby móc grupować wg tekstur - double const fHTW = 0.5 * std::fabs(fTrackWidth); - double const side = std::fabs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza - double const slop = std::fabs(fTexSlope); // brzeg zewnętrzny - double const rozp = fHTW + side + slop; // brzeg zewnętrzny - double hypot1 = std::hypot(slop, fTexHeight1); // rozmiar pochylenia do liczenia normalnych - if (hypot1 == 0.0) - hypot1 = 1.0; - vector3 normal1 { fTexSlope / hypot1, fTexHeight1 / hypot1, 0.0 }; // wektor normalny - double fHTW2, side2, slop2, rozp2, fTexHeight2, hypot2; - vector3 normal2; - if (iTrapezoid & 2) // ten bit oznacza, że istnieje odpowiednie pNext - { // Ra: jest OK - fHTW2 = 0.5 * std::fabs(trNext->fTrackWidth); // połowa rozstawu/nawierzchni + auto const fHTW = 0.5f * std::abs(fTrackWidth); + auto const side = std::abs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza + auto const slop = std::abs(fTexSlope); // brzeg zewnętrzny + auto const rozp = fHTW + side + slop; // brzeg zewnętrzny + auto hypot1 = std::hypot(slop, fTexHeight1); // rozmiar pochylenia do liczenia normalnych + if( hypot1 == 0.f ) + hypot1 = 1.f; + glm::vec3 const normalup{ 0.f, 1.f, 0.f }; + glm::vec3 normal1 { fTexHeight1 / hypot1, fTexSlope / hypot1, 0.f }; // wektor normalny + glm::vec3 normal2; + float fHTW2, side2, slop2, rozp2, fTexHeight2, hypot2; + if( iTrapezoid & 2 ) { + // ten bit oznacza, że istnieje odpowiednie pNext + // Ra: jest OK + fHTW2 = 0.5f * std::fabs(trNext->fTrackWidth); // połowa rozstawu/nawierzchni side2 = std::fabs(trNext->fTexWidth); slop2 = std::fabs(trNext->fTexSlope); // nie jest używane później rozp2 = fHTW2 + side2 + slop2; fTexHeight2 = trNext->fTexHeight1; hypot2 = std::hypot(slop2, fTexHeight2); - if (hypot2 == 0.0) - hypot2 = 1.0; - normal2 = vector3(trNext->fTexSlope / hypot2, fTexHeight2 / hypot2, 0.0); + if( hypot2 == 0.f ) + hypot2 = 1.f; + normal2 = { fTexHeight2 / hypot2, trNext->fTexSlope / hypot2, 0.f }; } - else // gdy nie ma następnego albo jest nieodpowiednim końcem podpięty - { + else { + // gdy nie ma następnego albo jest nieodpowiednim końcem podpięty fHTW2 = fHTW; side2 = side; slop2 = slop; @@ -1126,7 +1118,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { auto const origin { pMyNode->m_rootposition }; - double roll1, roll2; + float roll1, roll2; switch (iCategoryFlag & 15) { case 1: // tor @@ -1135,107 +1127,202 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { Segment->GetRolls(roll1, roll2); else roll1 = roll2 = 0.0; // dla zwrotnic - double sin1 = std::sin(roll1), cos1 = std::cos(roll1), sin2 = std::sin(roll2), cos2 = std::cos(roll2); + float const + sin1 = std::sin(roll1), + cos1 = std::cos(roll1), + sin2 = std::sin(roll2), + cos2 = std::cos(roll2); // zwykla szyna: //Ra: czemu główki są asymetryczne na wysokości 0.140? - vector6 rpts1[24], rpts2[24], rpts3[24], rpts4[24]; - int i; - for (i = 0; i < 12; ++i) - { - rpts1[i] = vector6( - (fHTW + szyna[i].x) * cos1 + szyna[i].y * sin1, - -(fHTW + szyna[i].x) * sin1 + szyna[i].y * cos1, - szyna[i].z, - szyna[i].n.x * cos1 + szyna[i].n.y * sin1, - -szyna[i].n.x * sin1 + szyna[i].n.y * cos1, - 0.0); - rpts2[11 - i] = vector6( - (-fHTW - szyna[i].x) * cos1 + szyna[i].y * sin1, - -(-fHTW - szyna[i].x) * sin1 + szyna[i].y * cos1, - szyna[i].z, - -szyna[i].n.x * cos1 + szyna[i].n.y * sin1, - szyna[i].n.x * sin1 + szyna[i].n.y * cos1, - 0.0); + basic_vertex rpts1[24], rpts2[24], rpts3[24], rpts4[24]; + for( int i = 0; i < 12; ++i ) { + + rpts1[ i ] = { + // position + {( fHTW + szyna[ i ].position.x ) * cos1 + szyna[ i ].position.y * sin1, + -( fHTW + szyna[ i ].position.x ) * sin1 + szyna[ i ].position.y * cos1, + szyna[ i ].position.z}, + // normal + { szyna[ i ].normal.x * cos1 + szyna[ i ].normal.y * sin1, + -szyna[ i ].normal.x * sin1 + szyna[ i ].normal.y * cos1, + szyna[ i ].normal.z }, + // texture + { szyna[ i ].texture.x, + szyna[ i ].texture.y } }; + + rpts2[ 11 - i ] = { + // position + {(-fHTW - szyna[ i ].position.x ) * cos1 + szyna[ i ].position.y * sin1, + -(-fHTW - szyna[ i ].position.x ) * sin1 + szyna[ i ].position.y * cos1, + szyna[ i ].position.z}, + // normal + {-szyna[ i ].normal.x * cos1 + szyna[ i ].normal.y * sin1, + szyna[ i ].normal.x * sin1 + szyna[ i ].normal.y * cos1, + szyna[ i ].normal.z }, + // texture + { szyna[ i ].texture.x, + szyna[ i ].texture.y } }; + + if( false == iTrapezoid ) { continue; } + // trapez albo przechyłki, to oddzielne punkty na końcu + + rpts1[ 12 + i ] = { + // position + {( fHTW + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -( fHTW + szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, + szyna[ i ].position.z}, + // normal + { szyna[ i ].normal.x * cos2 + szyna[ i ].normal.y * sin2, + -szyna[ i ].normal.x * sin2 + szyna[ i ].normal.y * cos2, + szyna[ i ].normal.z }, + // texture + { szyna[ i ].texture.x, + szyna[ i ].texture.y } }; + + rpts2[ 23 - i ] = { + // position + {(-fHTW - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -(-fHTW - szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, + szyna[ i ].position.z}, + // normal + {-szyna[ i ].normal.x * cos2 + szyna[ i ].normal.y * sin2, + szyna[ i ].normal.x * sin2 + szyna[ i ].normal.y * cos2, + szyna[ i ].normal.z }, + // texture + { szyna[ i ].texture.x, + szyna[ i ].texture.y } }; } - if (iTrapezoid) // trapez albo przechyłki, to oddzielne punkty na końcu - for (i = 0; i < 12; ++i) - { - rpts1[12 + i] = vector6( - (fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(fHTW2 + szyna[i].x) * sin2 + szyna[i].y * cos2, - szyna[i].z, - szyna[i].n.x * cos2 + szyna[i].n.y * sin2, - -szyna[i].n.x * sin2 + szyna[i].n.y * cos2, - 0.0); - rpts2[23 - i] = vector6( - (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + szyna[i].y * cos2, - szyna[i].z, - -szyna[i].n.x * cos2 + szyna[i].n.y * sin2, - szyna[i].n.x * sin2 + szyna[i].n.y * cos2, - 0.0); - } switch (eType) // dalej zależnie od typu { case tt_Table: // obrotnica jak zwykły tor, tylko animacja dochodzi case tt_Normal: if (m_material2) { // podsypka z podkładami jest tylko dla zwykłego toru - vector6 bpts1[8]; // punkty głównej płaszczyzny nie przydają się do robienia boków - if (fTexLength == 4.0) // jeśli stare mapowanie - { // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy profil - if (iTrapezoid) // trapez albo przechyłki - { // podsypka z podkladami trapezowata + basic_vertex bpts1[ 8 ]; // punkty głównej płaszczyzny nie przydają się do robienia boków + if( fTexLength == 4.f ) { + // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy profil + auto const normalx = std::cos( glm::radians( 75.f ) ); + auto const normaly = std::sin( glm::radians( 75.f ) ); + if( iTrapezoid ) { + // trapez albo przechyłki // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 ((0.3464,0.6536) // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.00, -0.707, 0.707, 0.0); // lewy brzeg - bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.33, -0.707, 0.707, 0.0); // krawędź załamania - bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.67, 0.707, 0.707, 0.0); // prawy brzeg początku symetrycznie - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.00, 0.707, 0.707, 0.0); // prawy skos + bpts1[ 0 ] = { + {rozp, -fTexHeight1 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.00f, 0.f} }; // lewy brzeg + bpts1[ 1 ] = { + {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.33f, 0.f} }; // krawędź załamania + bpts1[ 2 ] = { + {-bpts1[ 1 ].position.x, +( fHTW + side ) * sin1 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {0.67f, 0.f} }; // prawy brzeg początku symetrycznie + bpts1[ 3 ] = { + {-rozp, -fTexHeight1 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {1.f, 0.f} }; // prawy skos // końcowy przekrój - bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.00, -0.707, 0.707, 0.0); // lewy brzeg - bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, 0.33, -0.707, 0.707, 0.0); // krawędź załamania - bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.67, 0.707, 0.707, 0.0); // prawy brzeg początku symetrycznie - bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 1.00, 0.707, 0.707, 0.0); // prawy skos + bpts1[ 4 ] = { + {rozp2, -fTexHeight2 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.00f, 0.f} }; // lewy brzeg + bpts1[ 5 ] = { + {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.33f, 0.f} }; // krawędź załamania + bpts1[ 6 ] = { + {-bpts1[ 5 ].position.x, +( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {0.67f, 0.f} }; // prawy brzeg początku symetrycznie + bpts1[ 7 ] = { + {-rozp2, -fTexHeight2 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {1.00f, 0.f} }; // prawy skos } - else - { - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.0, -0.707, 0.707, 0.0); // lewy brzeg - bpts1[1] = vector6(fHTW + side, -0.18, 0.33, -0.707, 0.707, 0.0); // krawędź załamania - bpts1[2] = vector6(-fHTW - side, -0.18, 0.67, 0.707, 0.707, 0.0); // druga - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 1.0, 0.707, 0.707, 0.0); // prawy skos + else { + bpts1[ 0 ] = { + {rozp, -fTexHeight1 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.00f, 0.f} }; // lewy brzeg + bpts1[ 1 ] = { + {fHTW + side, -0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.33f, 0.f} }; // krawędź załamania + bpts1[ 2 ] = { + {-fHTW - side, -0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {0.67f, 0.f} }; // druga + bpts1[ 3 ] = { + {-rozp, -fTexHeight1 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {1.00f, 0.f} }; // prawy skos } } - else - { // mapowanie proporcjonalne do powierzchni, rozmiar w poprzek określa fTexLength - double max = fTexRatio2 * fTexLength; // szerokość proporcjonalna do długości - double map11 = max > 0.0 ? (fHTW + side) / max : 0.25; // załamanie od strony 1 - double map12 = - max > 0.0 ? (fHTW + side + hypot1) / max : 0.5; // brzeg od strony 1 - if (iTrapezoid) // trapez albo przechyłki - { // podsypka z podkladami trapezowata - double map21 = - max > 0.0 ? (fHTW2 + side2) / max : 0.25; // załamanie od strony 2 - double map22 = - max > 0.0 ? (fHTW2 + side2 + hypot2) / max : 0.5; // brzeg od strony 2 + else { + // mapowanie proporcjonalne do powierzchni, rozmiar w poprzek określa fTexLength + auto const max = fTexRatio2 * fTexLength; // szerokość proporcjonalna do długości + auto const map11 = max > 0.f ? (fHTW + side) / max : 0.25f; // załamanie od strony 1 + auto const map12 = max > 0.f ? (fHTW + side + hypot1) / max : 0.5f; // brzeg od strony 1 + if (iTrapezoid) { + // trapez albo przechyłki + auto const map21 = max > 0.f ? (fHTW2 + side2) / max : 0.25f; // załamanie od strony 2 + auto const map22 = max > 0.f ? (fHTW2 + side2 + hypot2) / max : 0.5f; // brzeg od strony 2 // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 // ((0.3464,0.6536) // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, normal1.x, -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6((fHTW + side) * cos1, -(fHTW + side) * sin1 - 0.18, 0.5 - map11, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[2] = vector6(-bpts1[1].x, +(fHTW + side) * sin1 - 0.18, 0.5 + map11, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos + bpts1[ 0 ] = { + {rozp, -fTexHeight1 - 0.18f, 0.f}, + {normal1.x, normal1.y, 0.f}, + {0.5f - map12, 0.f} }; // lewy brzeg + bpts1[ 1 ] = { + {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - 0.18f, 0.f}, + {normal1.x, normal1.y, 0.f}, + {0.5f - map11 , 0.f} }; // krawędź załamania + bpts1[ 2 ] = { + {-bpts1[ 1 ].position.x, +( fHTW + side ) * sin1 - 0.18f, 0.f}, + {-normal1.x, normal1.y, 0.f}, + {0.5 + map11, 0.f} }; // prawy brzeg początku symetrycznie + bpts1[ 3 ] = { + {-rozp, -fTexHeight1 - 0.18f, 0.f}, + {-normal1.x, normal1.y, 0.f}, + {0.5f + map12, 0.f} }; // prawy skos // przekrój końcowy - bpts1[4] = vector6(rozp2, -fTexHeight2 - 0.18, 0.5 - map22, normal2.x, -normal2.y, 0.0); // lewy brzeg - bpts1[5] = vector6((fHTW2 + side2) * cos2, -(fHTW2 + side2) * sin2 - 0.18, 0.5 - map21, 0.0, 1.0, 0.0); // krawędź załamania - bpts1[6] = vector6(-bpts1[5].x, +(fHTW2 + side2) * sin2 - 0.18, 0.5 + map21, 0.0, 1.0, 0.0); // prawy brzeg początku symetrycznie - bpts1[7] = vector6(-rozp2, -fTexHeight2 - 0.18, 0.5 + map22, -normal2.x, -normal2.y, 0.0); // prawy skos + bpts1[ 4 ] = { + {rozp2, -fTexHeight2 - 0.18f, 0.f}, + {normal2.x, normal2.y, 0.f}, + {0.5f - map22, 0.f} }; // lewy brzeg + bpts1[ 5 ] = { + {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + {normal2.x, normal2.y, 0.f}, + {0.5f - map21 , 0.f} }; // krawędź załamania + bpts1[ 6 ] = { + {-bpts1[ 5 ].position.x, +( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + {-normal2.x, normal2.y, 0.f}, + {0.5f + map21, 0.f} }; // prawy brzeg początku symetrycznie + bpts1[ 7 ] = { + {-rozp2, -fTexHeight2 - 0.18f, 0.f}, + {-normal2.x, normal2.y, 0.f}, + {0.5f + map22, 0.f} }; // prawy skos } else { - bpts1[0] = vector6(rozp, -fTexHeight1 - 0.18, 0.5 - map12, +normal1.x, -normal1.y, 0.0); // lewy brzeg - bpts1[1] = vector6(fHTW + side, -0.18, 0.5 - map11, +normal1.x, -normal1.y, 0.0); // krawędź załamania - bpts1[2] = vector6(-fHTW - side, -0.18, 0.5 + map11, -normal1.x, -normal1.y, 0.0); // druga - bpts1[3] = vector6(-rozp, -fTexHeight1 - 0.18, 0.5 + map12, -normal1.x, -normal1.y, 0.0); // prawy skos + bpts1[ 0 ] = { + {rozp, -fTexHeight1 - 0.18f, 0.f}, + {+normal1.x, normal1.y, 0.f}, + {0.5f - map12, 0.f} }; // lewy brzeg + bpts1[ 1 ] = { + {fHTW + side, - 0.18f, 0.f}, + {+normal1.x, normal1.y, 0.f}, + {0.5f - map11, 0.f} }; // krawędź załamania + bpts1[ 2 ] = { + {-fHTW - side, - 0.18f, 0.f}, + {-normal1.x, normal1.y, 0.f}, + {0.5f + map11, 0.f} }; // druga + bpts1[ 3 ] = { + {-rozp, -fTexHeight1 - 0.18f, 0.f}, + {-normal1.x, normal1.y, 0.f}, + {0.5f + map12, 0.f} }; // prawy skos } } vertex_array vertices; @@ -1269,31 +1356,35 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } break; case tt_Switch: // dla zwrotnicy dwa razy szyny - if( m_material1 || m_material2 ) - { // iglice liczone tylko dla zwrotnic - vector6 rpts3[24], rpts4[24]; - for (i = 0; i < 12; ++i) - { - rpts3[i] = - vector6( - +( fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, - -(+fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, - iglica[i].z); - rpts3[i + 12] = - vector6( - +( fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(+fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, - szyna[i].z); - rpts4[11 - i] = - vector6( - (-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, - -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, - iglica[i].z); - rpts4[23 - i] = - vector6( - (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, - szyna[i].z); + if( m_material1 || m_material2 ) { + // iglice liczone tylko dla zwrotnic + basic_vertex rpts3[24], rpts4[24]; + for( int i = 0; i < 12; ++i ) { + + rpts3[ i ] = { + {+( fHTW + iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, + -( fHTW + iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, + 0.f}, + {iglica[ i ].normal}, + {iglica[ i ].texture.x, 0.f} }; + rpts3[ i + 12 ] = { + {+( fHTW2 + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -( fHTW2 + szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, + 0.f}, + {szyna[ i ].normal}, + {szyna[ i ].texture.x, 0.f} }; + rpts4[ 11 - i ] = { + { ( -fHTW - iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, + -( -fHTW - iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, + 0.f}, + {iglica[ i ].normal}, + {iglica[ i ].texture.x, 0.f} }; + rpts4[ 23 - i ] = { + { ( -fHTW2 - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -( -fHTW2 - szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, + 0.f}, + {szyna[ i ].normal}, + {szyna[ i ].texture.x, 0.f} }; } // TODO, TBD: change all track geometry to triangles, to allow packing data in less, larger buffers if (SwitchExtension->RightSwitch) @@ -1366,24 +1457,45 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { case tt_Normal: // drogi proste, bo skrzyżowania osobno { - vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma - { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% - double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości - double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 - double map2 = max > 0.0 ? fHTW2 / max : 0.5; // obcięcie tekstury od strony 2 - if (iTrapezoid) // trapez albo przechyłki - { // nawierzchnia trapezowata + basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków + if (m_material1 || m_material2) { + // punkty się przydadzą, nawet jeśli nawierzchni nie ma +/* + double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% +*/ + auto const max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości + auto const map1 = max > 0.f ? fHTW / max : 0.5f; // obcięcie tekstury od strony 1 + auto const map2 = max > 0.f ? fHTW2 / max : 0.5f; // obcięcie tekstury od strony 2 + if (iTrapezoid) { + // trapez albo przechyłki Segment->GetRolls(roll1, roll2); - bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1); // lewy brzeg początku - bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1); // prawy brzeg początku symetrycznie - bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2); // lewy brzeg końca - bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2); // prawy brzeg początku symetrycznie + bpts1[ 0 ] = { + {fHTW * std::cos( roll1 ), -fHTW * std::sin( roll1 ), 0.f}, + normalup, + {0.5f - map1, 0.f} }; // lewy brzeg początku + bpts1[ 1 ] = { + {-bpts1[ 0 ].position.x, -bpts1[ 0 ].position.y, 0.f}, + normalup, + {0.5f + map1, 0.f} }; // prawy brzeg początku symetrycznie + bpts1[ 2 ] = { + {fHTW2 * std::cos( roll2 ), -fHTW2 * std::sin( roll2 ), 0.f}, + normalup, + {0.5f - map2, 0.f} }; // lewy brzeg końca + bpts1[ 3 ] = { + {-bpts1[ 2 ].position.x, -bpts1[ 2 ].position.y, 0.f}, + normalup, + {0.5f + map2, 0.f} }; // prawy brzeg początku symetrycznie } else { - bpts1[ 0 ] = vector6( fHTW, 0.0, 0.5 - map1, 0.0, 1.0, 0.0 ); - bpts1[ 1 ] = vector6( -fHTW, 0.0, 0.5 + map1, 0.0, 1.0, 0.0 ); + bpts1[ 0 ] = { + {fHTW, 0.f, 0.f}, + normalup, + {0.5f - map1, 0.f} }; + bpts1[ 1 ] = { + {-fHTW, 0.f, 0.f}, + normalup, + {0.5f + map1, 0.f} }; } } if (m_material1) // jeśli podana była tekstura, generujemy trójkąty @@ -1394,77 +1506,158 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) - vector6 + basic_vertex rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony - if (fTexHeight1 >= 0.0) + if (fTexHeight1 >= 0.f) { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo - rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy - rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5), // lewa krawędź załamania - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 1.0); // lewy brzeg pobocza (mapowanie może być inne - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 1.0); // prawy brzeg pobocza - rpts2[1] = vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania - rpts2[2] = vector6(-rozp, -fTexHeight1, 0.0); // prawy brzeg podstawy - if (iTrapezoid) // trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - rpts1[3] = vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza - rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 1.0); // brzeg pobocza - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); - rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); - rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza + rpts1[ 0 ] = { + {rozp, -fTexHeight1, 0.f}, + normalup, + {0.f, 0.f} }; // lewy brzeg podstawy + rpts1[ 1 ] = { + {bpts1[ 0 ].position.x + side, bpts1[ 0 ].position.y, 0.f}, + normalup, + {0.5, 0.f} }; // lewa krawędź załamania + rpts1[ 2 ] = { + {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; // lewy brzeg pobocza (mapowanie może być inne + rpts2[ 0 ] = { + {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; // prawy brzeg pobocza + rpts2[ 1 ] = { + {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; // prawa krawędź załamania + rpts2[ 2 ] = { + {-rozp, -fTexHeight1, 0.f}, + normalup, + {0.f, 0.f} }; // prawy brzeg podstawy + if (iTrapezoid) { + // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + rpts1[ 3 ] = { + {rozp2, -fTexHeight2, 0.f}, + normalup, + {0.f, 0.f} }; // lewy brzeg lewego pobocza + rpts1[ 4 ] = { + {bpts1[ 2 ].position.x + side2, bpts1[ 2 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; // krawędź załamania + rpts1[ 5 ] = { + {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; // brzeg pobocza + rpts2[ 3 ] = { + {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; + rpts2[ 4 ] = { + {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; + rpts2[ 5 ] = { + {-rozp2, -fTexHeight2, 0.f}, + normalup, + {0.f, 0.f} }; // prawy brzeg prawego pobocza } } else { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości // mapowanie propocjonalne do szerokości chodnika // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy - double d = -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm - double max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości - double map1l = ( - max > 0.0 ? + auto const d = -fTexHeight1 / 3.75f; // krawężnik o wysokości 150mm jest pochylony 40mm + auto const max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości + auto const map1l = ( + max > 0.f ? side / max : - 0.484375 ); // obcięcie tekstury od lewej strony punktu 1 - double map1r = ( - max > 0.0 ? + 0.484375f ); // obcięcie tekstury od lewej strony punktu 1 + auto const map1r = ( + max > 0.f ? slop / max : - 0.484375 ); // obcięcie tekstury od prawej strony punktu 1 - double h1r = ( + 0.484375f ); // obcięcie tekstury od prawej strony punktu 1 + auto const h1r = ( slop > d ? -fTexHeight1 : - 0 ); - double h1l = ( + 0.f ); + auto const h1l = ( side > d ? -fTexHeight1 : - 0 ); - rpts1[0] = vector6(bpts1[0].x + slop, bpts1[0].y + h1r, 0.515625 + map1r); // prawy brzeg prawego chodnika - rpts1[1] = vector6(bpts1[0].x + d, bpts1[0].y + h1r, 0.515625); // prawy krawężnik u góry - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[1] = vector6(bpts1[1].x - d, bpts1[1].y + h1l, 0.484375); // lewy krawężnik u góry - rpts2[2] = vector6(bpts1[1].x - side, bpts1[1].y + h1l, 0.484375 - map1l); // lewy brzeg lewego chodnika - if (iTrapezoid) // trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + 0.f ); + + rpts1[ 0 ] = { + {bpts1[ 0 ].position.x + slop, bpts1[ 0 ].position.y + h1r, 0.f}, + normalup, + {0.515625f + map1r, 0.f} }; // prawy brzeg prawego chodnika + rpts1[ 1 ] = { + {bpts1[ 0 ].position.x + d, bpts1[ 0 ].position.y + h1r, 0.f}, + normalup, + {0.515625f, 0.f} }; // prawy krawężnik u góry + rpts1[ 2 ] = { + {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, + normalup, + {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu + rpts2[ 0 ] = { + {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, + normalup, + {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu + rpts2[ 1 ] = { + {bpts1[ 1 ].position.x - d, bpts1[ 1 ].position.y + h1l, 0.f}, + normalup, + {0.484375f, 0.f} }; // lewy krawężnik u góry + rpts2[ 2 ] = { + {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y + h1l, 0.f}, + normalup, + {0.484375f - map1l, 0.f} }; // lewy brzeg lewego chodnika + + if (iTrapezoid) { + // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka slop2 = ( - fabs((iTrapezoid & 2) ? + std::fabs((iTrapezoid & 2) ? slop2 : slop) ); // szerokość chodnika po prawej - double map2l = ( - max > 0.0 ? + auto const map2l = ( + max > 0.f ? side2 / max : - 0.484375 ); // obcięcie tekstury od lewej strony punktu 2 - double map2r = ( - max > 0.0 ? + 0.484375f ); // obcięcie tekstury od lewej strony punktu 2 + auto const map2r = ( + max > 0.f ? slop2 / max : - 0.484375 ); // obcięcie tekstury od prawej strony punktu 2 - double h2r = (slop2 > d) ? -fTexHeight2 : 0; - double h2l = (side2 > d) ? -fTexHeight2 : 0; - rpts1[3] = vector6(bpts1[2].x + slop2, bpts1[2].y + h2r, 0.515625 + map2r); // prawy brzeg prawego chodnika - rpts1[4] = vector6(bpts1[2].x + d, bpts1[2].y + h2r, 0.515625); // prawy krawężnik u góry - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[4] = vector6(bpts1[3].x - d, bpts1[3].y + h2l, 0.484375); // lewy krawężnik u góry - rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y + h2l, 0.484375 - map2l); // lewy brzeg lewego chodnika + 0.484375f ); // obcięcie tekstury od prawej strony punktu 2 + auto const h2r = ( + slop2 > d ? + -fTexHeight2 : + 0.f ); + auto const h2l = ( + side2 > d ? + -fTexHeight2 : + 0.f ); + + rpts1[ 3 ] = { + {bpts1[ 2 ].position.x + slop2, bpts1[ 2 ].position.y + h2r, 0.f}, + normalup, + {0.515625f + map2r, 0.f} }; // prawy brzeg prawego chodnika + rpts1[ 4 ] = { + {bpts1[ 2 ].position.x + d, bpts1[ 2 ].position.y + h2r, 0.f}, + normalup, + {0.515625f, 0.f} }; // prawy krawężnik u góry + rpts1[ 5 ] = { + {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, + normalup, + {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu + rpts2[ 3 ] = { + {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, + normalup, + {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu + rpts2[ 4 ] = { + {bpts1[ 3 ].position.x - d, bpts1[ 3 ].position.y + h2l, 0.f}, + normalup, + {0.484375f, 0.f} }; // lewy krawężnik u góry + rpts2[ 5 ] = { + {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y + h2l, 0.f}, + normalup, + {0.484375f - map2l, 0.f} }; // lewy brzeg lewego chodnika } } vertex_array vertices; @@ -1540,25 +1733,37 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { if (!SwitchExtension->vPoints) { // jeśli tablica punktów nie jest jeszcze utworzona, zliczamy punkty i tworzymy ją // we'll need to add couple extra points for the complete fan we'll build - SwitchExtension->vPoints = new vector3[pointcount + SwitchExtension->iRoads]; + SwitchExtension->vPoints = new glm::vec3[pointcount + SwitchExtension->iRoads]; } - vector3 *b = + glm::vec3 *b = SwitchExtension->bPoints ? nullptr : SwitchExtension->vPoints; // zmienna robocza, NULL gdy tablica punktów już jest wypełniona - vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków + basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% - double max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości - double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 - double map2 = max > 0.0 ? fHTW2 / max : 0.5; // obcięcie tekstury od strony 2 + auto const max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości + auto const map1 = max > 0.f ? fHTW / max : 0.5f; // obcięcie tekstury od strony 1 + auto const map2 = max > 0.f ? fHTW2 / max : 0.5f; // obcięcie tekstury od strony 2 // if (iTrapezoid) //trapez albo przechyłki { // nawierzchnia trapezowata Segment->GetRolls(roll1, roll2); - bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), 0.5 - map1, sin(roll1), cos(roll1), 0.0); // lewy brzeg początku - bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, 0.5 + map1, -sin(roll1), cos(roll1), 0.0); // prawy brzeg początku symetrycznie - bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), 0.5 - map2, sin(roll2), cos(roll2), 0.0); // lewy brzeg końca - bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, 0.5 + map2, -sin(roll2), cos(roll2), 0.0); // prawy brzeg początku symetrycznie + bpts1[ 0 ] = { + {fHTW * std::cos( roll1 ), -fHTW * std::sin( roll1 ), 0.f}, + {std::sin( roll1 ), std::cos( roll1 ), 0.f}, + {0.5f - map1, 0.f} }; // lewy brzeg początku + bpts1[ 1 ] = { + {-bpts1[ 0 ].position.x, -bpts1[ 0 ].position.y, 0.f}, + {-std::sin( roll1 ), std::cos( roll1 ), 0.f}, + {0.5f + map1, 0.f} }; // prawy brzeg początku symetrycznie + bpts1[ 2 ] = { + {fHTW2 * std::cos( roll2 ), -fHTW2 * std::sin( roll2 ), 0.f}, + {std::sin( roll2 ), std::cos( roll2 ), 0.f}, + {0.5f - map2, 0.f} }; // lewy brzeg końca + bpts1[ 3 ] = { + {-bpts1[ 2 ].position.x, -bpts1[ 2 ].position.y, 0.f}, + {-std::sin( roll2 ), std::cos( roll2 ), 0.f}, + {0.5 + map2, 0.f} }; // prawy brzeg początku symetrycznie } } // najpierw renderowanie poboczy i zapamiętywanie punktów @@ -1567,61 +1772,142 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie w swoim czasie if( m_material2 ) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) - vector6 + basic_vertex rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony // Ra 2014-07: trzeba to przerobić na pętlę i pobierać profile (przynajmniej 2..4) z sąsiednich dróg if (fTexHeight1 >= 0.0) { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo - rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy - rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5); // lewa krawędź załamania - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 1.0); // lewy brzeg pobocza (mapowanie może być inne - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 1.0); // prawy brzeg pobocza - rpts2[1] = vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania - rpts2[2] = vector6(-rozp, -fTexHeight1, 0.0); // prawy brzeg podstawy + rpts1[ 0 ] = { + {rozp, -fTexHeight1, 0.f}, + normalup, + {0.f, 0.f} }; // lewy brzeg podstawy + rpts1[ 1 ] = { + {bpts1[ 0 ].position.x + side, bpts1[ 0 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} };// lewa krawędź załamania + rpts1[ 2 ] = { + {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; // lewy brzeg pobocza (mapowanie może być inne + rpts2[ 0 ] = { + {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; // prawy brzeg pobocza + rpts2[ 1 ] = { + {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; // prawa krawędź załamania + rpts2[ 2 ] = { + {-rozp, -fTexHeight1, 0.f}, + normalup, + {0.f, 0.f} }; // prawy brzeg podstawy // if (iTrapezoid) //trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - rpts1[3] = vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza - rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 1.0); // brzeg pobocza - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); - rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); - rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza + rpts1[ 3 ] = { + {rozp2, -fTexHeight2, 0.f}, + normalup, + {0.f, 0.f} }; // lewy brzeg lewego pobocza + rpts1[ 4 ] = { + {bpts1[ 2 ].position.x + side2, bpts1[ 2 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; // krawędź załamania + rpts1[ 5 ] = { + {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; // brzeg pobocza + rpts2[ 3 ] = { + {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; + rpts2[ 4 ] = { + {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; + rpts2[ 5 ] = { + {-rozp2, -fTexHeight2, 0.f}, + normalup, + {0.f, 0.f} }; // prawy brzeg prawego pobocza } } else { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości // mapowanie propocjonalne do szerokości chodnika // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy - double d = -fTexHeight1 / 3.75; // krawężnik o wysokości 150mm jest pochylony 40mm - double max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości - double map1l = max > 0.0 ? - side / max : - 0.484375; // obcięcie tekstury od lewej strony punktu 1 - double map1r = max > 0.0 ? - slop / max : - 0.484375; // obcięcie tekstury od prawej strony punktu 1 - rpts1[0] = vector6(bpts1[0].x + slop, bpts1[0].y - fTexHeight1, 0.515625 + map1r); // prawy brzeg prawego chodnika - rpts1[1] = vector6(bpts1[0].x + d, bpts1[0].y - fTexHeight1, 0.515625); // prawy krawężnik u góry - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[1] = vector6(bpts1[1].x - d, bpts1[1].y - fTexHeight1, 0.484375); // lewy krawężnik u góry - rpts2[2] = vector6(bpts1[1].x - side, bpts1[1].y - fTexHeight1, 0.484375 - map1l); // lewy brzeg lewego chodnika + auto const d = -fTexHeight1 / 3.75f; // krawężnik o wysokości 150mm jest pochylony 40mm + auto const max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości + auto const map1l = ( + max > 0.f ? + side / max : + 0.484375f ); // obcięcie tekstury od lewej strony punktu 1 + auto const map1r = ( + max > 0.f ? + slop / max : + 0.484375f ); // obcięcie tekstury od prawej strony punktu 1 + + rpts1[ 0 ] = { + {bpts1[ 0 ].position.x + slop, bpts1[ 0 ].position.y - fTexHeight1, 0.f}, + normalup, + { 0.515625f + map1r, 0.f} }; // prawy brzeg prawego chodnika + rpts1[ 1 ] = { + {bpts1[ 0 ].position.x + d, bpts1[ 0 ].position.y - fTexHeight1, 0.f}, + normalup, + {0.515625f, 0.f} }; // prawy krawężnik u góry + rpts1[ 2 ] = { + {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, + normalup, + {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu + rpts2[ 0 ] = { + {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, + normalup, + {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu + rpts2[ 1 ] = { + {bpts1[ 1 ].position.x - d, bpts1[ 1 ].position.y - fTexHeight1, 0.f}, + normalup, + {0.484375f, 0.f} }; // lewy krawężnik u góry + rpts2[ 2 ] = { + {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y - fTexHeight1, 0.f}, + normalup, + {0.484375f - map1l, 0.f} }; // lewy brzeg lewego chodnika // if (iTrapezoid) //trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - slop2 = std::fabs((iTrapezoid & 2) ? slop2 : slop); // szerokość chodnika po prawej - double map2l = max > 0.0 ? - side2 / max : - 0.484375; // obcięcie tekstury od lewej strony punktu 2 - double map2r = max > 0.0 ? - slop2 / max : - 0.484375; // obcięcie tekstury od prawej strony punktu 2 - rpts1[3] = vector6(bpts1[2].x + slop2, bpts1[2].y - fTexHeight2, 0.515625 + map2r); // prawy brzeg prawego chodnika - rpts1[4] = vector6(bpts1[2].x + d, bpts1[2].y - fTexHeight2, 0.515625); // prawy krawężnik u góry - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 0.515625 - d / 2.56); // prawy krawężnik u dołu - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 0.484375 + d / 2.56); // lewy krawężnik u dołu - rpts2[4] = vector6(bpts1[3].x - d, bpts1[3].y - fTexHeight2, 0.484375); // lewy krawężnik u góry - rpts2[5] = vector6(bpts1[3].x - side2, bpts1[3].y - fTexHeight2, 0.484375 - map2l); // lewy brzeg lewego chodnika + slop2 = std::abs( + ( (iTrapezoid & 2) ? + slop2 : + slop ) ); // szerokość chodnika po prawej + auto const map2l = ( + max > 0.f ? + side2 / max : + 0.484375f ); // obcięcie tekstury od lewej strony punktu 2 + auto const map2r = ( + max > 0.f ? + slop2 / max : + 0.484375f ); // obcięcie tekstury od prawej strony punktu 2 + + rpts1[ 3 ] = { + {bpts1[ 2 ].position.x + slop2, bpts1[ 2 ].position.y - fTexHeight2, 0.f}, + normalup, + { 0.515625f + map2r, 0.f} }; // prawy brzeg prawego chodnika + rpts1[ 4 ] = { + {bpts1[ 2 ].position.x + d, bpts1[ 2 ].position.y - fTexHeight2, 0.f}, + normalup, + {0.515625f, 0.f} }; // prawy krawężnik u góry + rpts1[ 5 ] = { + {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, + normalup, + {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu + rpts2[ 3 ] = { + {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, + normalup, + {0.484375f + d / 2.56, 0.f} }; // lewy krawężnik u dołu + rpts2[ 4 ] = { + {bpts1[ 3 ].position.x - d, bpts1[ 3 ].position.y - fTexHeight2, 0.f}, + normalup, + {0.484375f, 0.f} }; // lewy krawężnik u góry + rpts2[ 5 ] = { + {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y - fTexHeight2, 0.f}, + normalup, + {0.484375f - map2l, 0.f} }; // lewy brzeg lewego chodnika } } bool render = ( m_material2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni @@ -1731,30 +2017,52 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { case tt_Normal: // drogi proste, bo skrzyżowania osobno { - vector6 bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków + basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% - double max = (iCategoryFlag & 4) ? - 0.0 : - fTexLength; // test: szerokość dróg proporcjonalna do długości - double map1 = max > 0.0 ? fHTW / max : 0.5; // obcięcie tekstury od strony 1 - double map2 = max > 0.0 ? fHTW2 / max : 0.5; // obcięcie tekstury od strony 2 - if (iTrapezoid) // trapez albo przechyłki - { // nawierzchnia trapezowata + auto const max = ( + ( iCategoryFlag & 4 ) ? + 0.f : + fTexLength ); // test: szerokość dróg proporcjonalna do długości + auto const map1 = ( + max > 0.f ? + fHTW / max : + 0.5f ); // obcięcie tekstury od strony 1 + auto const map2 = ( + max > 0.f ? + fHTW2 / max : + 0.5f ); // obcięcie tekstury od strony 2 + + if (iTrapezoid) { + // nawierzchnia trapezowata Segment->GetRolls(roll1, roll2); - bpts1[0] = vector6(fHTW * cos(roll1), -fHTW * sin(roll1), - 0.5 - map1); // lewy brzeg początku - bpts1[1] = vector6(-bpts1[0].x, -bpts1[0].y, - 0.5 + map1); // prawy brzeg początku symetrycznie - bpts1[2] = vector6(fHTW2 * cos(roll2), -fHTW2 * sin(roll2), - 0.5 - map2); // lewy brzeg końca - bpts1[3] = vector6(-bpts1[2].x, -bpts1[2].y, - 0.5 + map2); // prawy brzeg początku symetrycznie + bpts1[ 0 ] = { + {fHTW * std::cos( roll1 ), -fHTW * std::sin( roll1 ), 0.f}, + normalup, + {0.5f - map1, 0.f} }; // lewy brzeg początku + bpts1[ 1 ] = { + {-bpts1[ 0 ].position.x, -bpts1[ 0 ].position.y, 0.f}, + normalup, + {0.5f + map1, 0.f} }; // prawy brzeg początku symetrycznie + bpts1[ 2 ] = { + {fHTW2 * std::cos( roll2 ), -fHTW2 * std::sin( roll2 ), 0.f}, + normalup, + {0.5f - map2, 0.f} }; // lewy brzeg końca + bpts1[ 3 ] = { + {-bpts1[ 2 ].position.x, -bpts1[ 2 ].position.y, 0.f}, + normalup, + {0.5f + map2, 0.f} }; // prawy brzeg początku symetrycznie } else { - bpts1[0] = vector6(fHTW, 0.0, 0.5 - map1); // zawsze standardowe mapowanie - bpts1[1] = vector6(-fHTW, 0.0, 0.5 + map1); + bpts1[ 0 ] = { + {fHTW, 0.f, 0.f}, + normalup, + {0.5 - map1, 0.f} }; // zawsze standardowe mapowanie + bpts1[ 1 ] = { + {-fHTW, 0.f, 0.f}, + normalup, + {0.5f + map1, 0.f} }; } } if (m_material1) // jeśli podana była tekstura, generujemy trójkąty @@ -1766,23 +2074,60 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) vertex_array vertices; - vector6 rpts1[6], + basic_vertex + rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony - rpts1[0] = vector6(rozp, -fTexHeight1, 0.0); // lewy brzeg podstawy - rpts1[1] = vector6(bpts1[0].x + side, bpts1[0].y, 0.5), // lewa krawędź załamania - rpts1[2] = vector6(bpts1[0].x, bpts1[0].y, - 1.0); // lewy brzeg pobocza (mapowanie może być inne - rpts2[0] = vector6(bpts1[1].x, bpts1[1].y, 1.0); // prawy brzeg pobocza - rpts2[1] = vector6(bpts1[1].x - side, bpts1[1].y, 0.5); // prawa krawędź załamania - rpts2[2] = vector6(-rozp, -fTexHeight1, 0.0); // prawy brzeg podstawy + + rpts1[ 0 ] = { + {rozp, -fTexHeight1, 0.f}, + normalup, + {0.0f, 0.f} }; // lewy brzeg podstawy + rpts1[ 1 ] = { + {bpts1[ 0 ].position.x + side, bpts1[ 0 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; // lewa krawędź załamania + rpts1[ 2 ] = { + {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, + normalup, + {1.0f, 0.f} }; // lewy brzeg pobocza (mapowanie może być inne + rpts2[ 0 ] = { + {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, + normalup, + {1.0f, 0.f} }; // prawy brzeg pobocza + rpts2[ 1 ] = { + {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; // prawa krawędź załamania + rpts2[ 2 ] = { + {-rozp, -fTexHeight1, 0.f}, + normalup, + {0.0f, 0.f} }; // prawy brzeg podstawy if (iTrapezoid) // trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - rpts1[3] = vector6(rozp2, -fTexHeight2, 0.0); // lewy brzeg lewego pobocza - rpts1[4] = vector6(bpts1[2].x + side2, bpts1[2].y, 0.5); // krawędź załamania - rpts1[5] = vector6(bpts1[2].x, bpts1[2].y, 1.0); // brzeg pobocza - rpts2[3] = vector6(bpts1[3].x, bpts1[3].y, 1.0); - rpts2[4] = vector6(bpts1[3].x - side2, bpts1[3].y, 0.5); - rpts2[5] = vector6(-rozp2, -fTexHeight2, 0.0); // prawy brzeg prawego pobocza + rpts1[ 3 ] = { + {rozp2, -fTexHeight2, 0.f}, + normalup, + {0.0f, 0.f} }; // lewy brzeg lewego pobocza + rpts1[ 4 ] = { + {bpts1[ 2 ].position.x + side2, bpts1[ 2 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; // krawędź załamania + rpts1[ 5 ] = { + {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, + normalup, + {1.0f, 0.f} }; // brzeg pobocza + rpts2[ 3 ] = { + {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, + normalup, + {1.0f, 0.f} }; + rpts2[ 4 ] = { + {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; + rpts2[ 5 ] = { + {-rozp2, -fTexHeight2, 0.f}, + normalup, + {0.0f, 0.f} }; // prawy brzeg prawego pobocza Segment->RenderLoft(vertices, origin, rpts1, -3, fTexLength); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); @@ -1871,14 +2216,14 @@ bool TTrack::SetConnections(int i) return false; } -bool TTrack::Switch(int i, double t, double d) +bool TTrack::Switch(int i, float const t, float const d) { // przełączenie torów z uruchomieniem animacji if (SwitchExtension) // tory przełączalne mają doklejkę if (eType == tt_Switch) { // przekładanie zwrotnicy jak zwykle - if (t > 0.0) // prędkość liniowa ruchu iglic + if (t > 0.f) // prędkość liniowa ruchu iglic SwitchExtension->fOffsetSpeed = t; // prędkość łatwiej zgrać z animacją modelu - if (d >= 0.0) // dodatkowy ruch drugiej iglicy (zamknięcie nastawnicze) + if (d >= 0.f) // dodatkowy ruch drugiej iglicy (zamknięcie nastawnicze) SwitchExtension->fOffsetDelay = d; i &= 1; // ograniczenie błędów !!!! SwitchExtension->fDesiredOffset = @@ -2052,16 +2397,16 @@ TTrack * TTrack::RaAnimate() bool m = true; // animacja trwa if (eType == tt_Switch) // dla zwrotnicy tylko szyny { - double v = SwitchExtension->fDesiredOffset - SwitchExtension->fOffset; // kierunek + auto const v = SwitchExtension->fDesiredOffset - SwitchExtension->fOffset; // kierunek SwitchExtension->fOffset += sign(v) * Timer::GetDeltaTime() * SwitchExtension->fOffsetSpeed; // Ra: trzeba dać to do klasy... SwitchExtension->fOffset1 = SwitchExtension->fOffset; SwitchExtension->fOffset2 = SwitchExtension->fOffset; - if (SwitchExtension->fOffset1 >= fMaxOffset) + if (SwitchExtension->fOffset1 > fMaxOffset) SwitchExtension->fOffset1 = fMaxOffset; // ograniczenie animacji zewnętrznej iglicy - if (SwitchExtension->fOffset2 <= 0.00) - SwitchExtension->fOffset2 = 0.0; // ograniczenie animacji wewnętrznej iglicy - if (v < 0) + if (SwitchExtension->fOffset2 < 0.f) + SwitchExtension->fOffset2 = 0.f; // ograniczenie animacji wewnętrznej iglicy + if (v < 0.f) { // jak na pierwszy z torów if (SwitchExtension->fOffset <= SwitchExtension->fDesiredOffset) { @@ -2083,32 +2428,39 @@ TTrack * TTrack::RaAnimate() && ( ( false == Geometry1.empty() ) || ( false == Geometry2.empty() ) ) ) { // iglice liczone tylko dla zwrotnic - double fHTW = 0.5 * fabs( fTrackWidth ); - double fHTW2 = fHTW; // Ra: na razie niech tak będzie - double cos1 = 1.0, sin1 = 0.0, cos2 = 1.0, sin2 = 0.0; // Ra: ... - vector6 rpts3[ 24 ], rpts4[ 24 ]; - for (int i = 0; i < 12; ++i) - { - rpts3[i] = - vector6( - +( fHTW + iglica[i].x) * cos1 + iglica[i].y * sin1, - -(+fHTW + iglica[i].x) * sin1 + iglica[i].y * cos1, - iglica[i].z); - rpts3[i + 12] = - vector6( - +( fHTW2 + szyna[i].x) * cos2 + szyna[i].y * sin2, - -(+fHTW2 + szyna[i].x) * sin2 + iglica[i].y * cos2, - szyna[i].z); - rpts4[11 - i] = - vector6( - (-fHTW - iglica[i].x) * cos1 + iglica[i].y * sin1, - -(-fHTW - iglica[i].x) * sin1 + iglica[i].y * cos1, - iglica[i].z); - rpts4[23 - i] = - vector6( - (-fHTW2 - szyna[i].x) * cos2 + szyna[i].y * sin2, - -(-fHTW2 - szyna[i].x) * sin2 + iglica[i].y * cos2, - szyna[i].z); + auto const fHTW = 0.5f * std::abs( fTrackWidth ); + auto const fHTW2 = fHTW; // Ra: na razie niech tak będzie + auto const cos1 = 1.0f, sin1 = 0.0f, cos2 = 1.0f, sin2 = 0.0f; // Ra: ... + + basic_vertex + rpts3[ 24 ], + rpts4[ 24 ]; + for (int i = 0; i < 12; ++i) { + + rpts3[ i ] = { + {+( fHTW + iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, + -( fHTW + iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, + 0.f}, + {iglica[ i ].normal}, + {iglica[ i ].texture.x, 0.f} }; + rpts3[ i + 12 ] = { + {+( fHTW2 + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -( fHTW2 + szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, + 0.f}, + {szyna[ i ].normal}, + {szyna[ i ].texture.x, 0.f} }; + rpts4[ 11 - i ] = { + {+( -fHTW - iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, + -( -fHTW - iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, + 0.f}, + {iglica[ i ].normal}, + {iglica[ i ].texture.x, 0.f} }; + rpts4[ 23 - i ] = { + { ( -fHTW2 - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -( -fHTW2 - szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, + 0.f}, + {szyna[ i ].normal}, + {szyna[ i ].texture.x, 0.f} }; } auto const origin { pMyNode->m_rootposition }; @@ -2163,8 +2515,8 @@ TTrack * TTrack::RaAnimate() double hlen = 0.5 * SwitchExtension->Segments[0]->GetLength(); // połowa // długości SwitchExtension->fOffset = ac->AngleGet(); // pobranie kąta z submodelu - double sina = -hlen * sin(DegToRad(SwitchExtension->fOffset)), - cosa = -hlen * cos(DegToRad(SwitchExtension->fOffset)); + double sina = -hlen * std::sin(glm::radians(SwitchExtension->fOffset)), + cosa = -hlen * std::cos(glm::radians(SwitchExtension->fOffset)); SwitchExtension->vTrans = ac->TransGet(); vector3 middle = SwitchExtension->pMyNode->pCenter + @@ -2317,9 +2669,9 @@ void TTrack::VelocitySet(float v) fVelocity = v; // nie ma ograniczenia }; -float TTrack::VelocityGet() +double TTrack::VelocityGet() { // pobranie dozwolonej prędkości podczas skanowania - return ((iDamageFlag & 128) ? 0.0f : fVelocity); // tor uszkodzony = prędkość zerowa + return ((iDamageFlag & 128) ? 0.0 : fVelocity); // tor uszkodzony = prędkość zerowa }; void TTrack::ConnectionsLog() diff --git a/Track.h b/Track.h index 91ea6138..a26e3d83 100644 --- a/Track.h +++ b/Track.h @@ -10,23 +10,23 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "GL/glew.h" -#include "ResourceManager.h" +#include +#include + #include "Segment.h" #include "material.h" -typedef enum -{ +enum TTrackType { tt_Unknown, tt_Normal, tt_Switch, tt_Table, tt_Cross, tt_Tributary -} TTrackType; +}; // McZapkie-100502 -typedef enum -{ + +enum TEnvironmentType { e_unknown = -1, e_flat = 0, e_mountains, @@ -34,7 +34,7 @@ typedef enum e_tunnel, e_bridge, e_bank -} TEnvironmentType; +}; // Ra: opracować alternatywny system cieni/świateł z definiowaniem koloru oświetlenia w halach class TEvent; @@ -49,23 +49,22 @@ class TSwitchExtension TSwitchExtension(TTrack *owner, int const what); ~TSwitchExtension(); std::shared_ptr Segments[6]; // dwa tory od punktu 1, pozosta³e dwa od 2? Ra 140101: 6 po³¹czeñ dla skrzy¿owañ - // TTrack *trNear[4]; //tory do³¹czone do punktów 1, 2, 3 i 4 - // dotychczasowe [2]+[2] wskaŸniki zamieniæ na nowe [4] TTrack *pNexts[2]; // tory do³¹czone do punktów 2 i 4 TTrack *pPrevs[2]; // tory do³¹czone do punktów 1 i 3 int iNextDirection[2]; // to te¿ z [2]+[2] przerobiæ na [4] int iPrevDirection[2]; int CurrentIndex = 0; // dla zwrotnicy - double fOffset = 0.0, - fDesiredOffset = 0.0; // aktualne i docelowe położenie napędu iglic - double fOffsetSpeed = 0.1; // prędkość liniowa ruchu iglic - double fOffsetDelay = 0.05; // opóźnienie ruchu drugiej iglicy względem pierwszej // dodatkowy ruch drugiej iglicy po zablokowaniu pierwszej na opornicy + float + fOffset{ 0.f }, + fDesiredOffset{ 0.f }; // aktualne i docelowe położenie napędu iglic + float fOffsetSpeed = 0.1f; // prędkość liniowa ruchu iglic + float fOffsetDelay = 0.05f; // opóźnienie ruchu drugiej iglicy względem pierwszej // dodatkowy ruch drugiej iglicy po zablokowaniu pierwszej na opornicy union { struct { // zmienne potrzebne tylko dla zwrotnicy - double fOffset1, - fOffset2; // przesunięcia iglic - 0=na wprost + float fOffset1, + fOffset2; // przesunięcia iglic - 0=na wprost bool RightSwitch; // czy zwrotnica w prawo }; struct @@ -77,21 +76,17 @@ class TSwitchExtension struct { // zmienne dla skrzyżowania int iRoads; // ile dróg się spotyka? - Math3D::vector3 *vPoints; // tablica wierzchołków nawierzchni, generowana przez pobocze -// int iPoints; // liczba faktycznie użytych wierzchołków nawierzchni + glm::vec3 *vPoints; // tablica wierzchołków nawierzchni, generowana przez pobocze bool bPoints; // czy utworzone? }; }; bool bMovement = false; // czy w trakcie animacji - int iLeftVBO = 0, - iRightVBO = 0; // indeksy iglic w VBO TSubRect *pOwner = nullptr; // sektor, któremu trzeba zgłosić animację TTrack *pNextAnim = nullptr; // następny tor do animowania TEvent *evPlus = nullptr, *evMinus = nullptr; // zdarzenia sygnalizacji rozprucia float fVelocity = -1.0; // maksymalne ograniczenie prędkości (ustawianej eventem) Math3D::vector3 vTrans; // docelowa translacja przesuwnicy - private: }; class TIsolated @@ -106,7 +101,6 @@ class TIsolated TMemCell *pMemCell = nullptr; // automatyczna komórka pamięci, która współpracuje z odcinkiem izolowanym TIsolated(); TIsolated(const std::string &n, TIsolated *i); - ~TIsolated(); static TIsolated * Find(const std::string &n); // znalezienie obiektu albo utworzenie nowego void Modify(int i, TDynamicObject *o); // dodanie lub odjęcie osi bool Busy() { @@ -118,7 +112,7 @@ class TIsolated }; // trajektoria ruchu - opakowanie -class TTrack /*: public Resource*/ { +class TTrack { friend class opengl_renderer; @@ -207,7 +201,7 @@ public: return trPrev; }; TTrack *Connected(int s, double &d) const; bool SetConnections(int i); - bool Switch(int i, double t = -1.0, double d = -1.0); + bool Switch(int i, float const t = -1.f, float const d = -1.f); bool SwitchForced(int i, TDynamicObject *o); int CrossSegment(int from, int into); inline int GetSwitchState() { @@ -241,17 +235,12 @@ public: std::string IsolatedName(); bool IsolatedEventsAssign(TEvent *busy, TEvent *free); double WidthTotal(); - GLuint TextureGet(int i) { - return ( - i ? - m_material1 : - m_material2 ); }; bool IsGroupable(); int TestPoint( Math3D::vector3 *Point); void MovedUp1(float const dh); std::string NameGet(); void VelocitySet(float v); - float VelocityGet(); + double VelocityGet(); void ConnectionsLog(); private: From c419d9fc8677c75930eba42f435ff366d71a4781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sat, 16 Sep 2017 22:43:33 +0200 Subject: [PATCH 193/426] Fixed slip calculations, some new parameters for python scripts --- McZapkie/Mover.cpp | 13 +++++++++---- Train.cpp | 47 ++++++++++++++++++++++++++++++++-------------- Train.h | 1 + 3 files changed, 43 insertions(+), 18 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b8d93467..d7799a8b 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3720,14 +3720,19 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) Sign(nrot * M_PI * WheelDiameter - V) * Adhesive(RunningTrack.friction) * TotalMassxg, dt, nrot); - Fwheels = Sign(nrot * M_PI * WheelDiameter - V) * TotalMassxg * Adhesive(RunningTrack.friction); + Fwheels = Sign(temp_nrot * M_PI * WheelDiameter - V) * TotalMassxg * Adhesive(RunningTrack.friction); if (Fwheels*Sign(V)>0) { - FTrain = Fwheels - Fb; + FTrain = Fwheels + Fb*Sign(V); + } + else if (FTrain*Sign(V)>0) + { + Fb = FTrain*Sign(V) - Fwheels*Sign(V); } else { - Fb = FTrain - Fwheels; + Fb = -Fwheels*Sign(V); + FTrain = 0; } if (Sign(nrot * M_PI * WheelDiameter - V)*Sign(temp_nrot * M_PI * WheelDiameter - V) < 0) { @@ -4630,7 +4635,7 @@ double TMoverParameters::TractionForce(double dt) { PosRatio = -Sign(V) * DirAbsolute * eimv[eimv_Fr] / (eimc[eimc_p_Fh] * - Max0R(dtrans / MaxBrakePress[0], AnPos) /*dizel_fill*/); + Max0R(Max0R(dtrans,0.01) / MaxBrakePress[0], AnPos) /*dizel_fill*/); } else PosRatio = 0; diff --git a/Train.cpp b/Train.cpp index 46dbb7b9..e6f4902b 100644 --- a/Train.cpp +++ b/Train.cpp @@ -478,11 +478,13 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "velocity", PyGetFloat( mover->Vel ) ); PyDict_SetItemString( dict, "tractionforce", PyGetFloat( mover->Ft ) ); PyDict_SetItemString( dict, "slipping_wheels", PyGetBool( mover->SlippingWheels ) ); + PyDict_SetItemString( dict, "sanding", PyGetBool( mover->SlippingWheels )); // electric current data PyDict_SetItemString( dict, "traction_voltage", PyGetFloat( mover->RunningTraction.TractionVoltage ) ); PyDict_SetItemString( dict, "voltage", PyGetFloat( mover->Voltage ) ); PyDict_SetItemString( dict, "im", PyGetFloat( mover->Im ) ); PyDict_SetItemString( dict, "fuse", PyGetBool( mover->FuseFlag ) ); + PyDict_SetItemString( dict, "epfuse", PyGetBool( mover->EpFuse )); // induction motor state data char* TXTT[ 10 ] = { "fd", "fdt", "fdb", "pd", "pdt", "pdb", "itothv", "1", "2", "3" }; char* TXTC[ 10 ] = { "fr", "frt", "frb", "pr", "prt", "prb", "im", "vm", "ihv", "uhv" }; @@ -522,6 +524,7 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, ( std::string( "code_" ) + std::to_string( i + 1 ) ).c_str(), PyGetString( std::string( std::to_string( iUnits[ i ] ) + cCode[ i ] ).c_str() ) ); PyDict_SetItemString( dict, ( std::string( "car_name" ) + std::to_string( i + 1 ) ).c_str(), PyGetString( asCarName[ i ].c_str() ) ); + PyDict_SetItemString( dict, ( std::string( "slip_" ) + std::to_string( i + 1 )).c_str(), PyGetBool( bSlip[i]) ); } // ai state data auto const &driver = DynamicObject->Mechanik; @@ -3879,19 +3882,33 @@ if d = d->Prev(); // w drugą stronę też } } - else if (cKey == GLFW_KEY_RIGHT_BRACKET) - { - while (d) - { - d->Move(-100.0 * d->DirectionGet()); - d = d->Next(); // pozostałe też - } - d = DynamicObject->Prev(); - while (d) - { - d->Move(-100.0 * d->DirectionGet()); - d = d->Prev(); // w drugą stronę też - } + else if (cKey == GLFW_KEY_RIGHT_BRACKET) + { + while (d) + { + d->Move(-100.0 * d->DirectionGet()); + d = d->Next(); // pozostałe też + } + d = DynamicObject->Prev(); + while (d) + { + d->Move(-100.0 * d->DirectionGet()); + d = d->Prev(); // w drugą stronę też + } + } + else if (cKey == GLFW_KEY_TAB) + { + while (d) + { + d->MoverParameters->V+= d->DirectionGet()*2.78; + d = d->Next(); // pozostałe też + } + d = DynamicObject->Prev(); + while (d) + { + d->MoverParameters->V += d->DirectionGet()*2.78; + d = d->Prev(); // w drugą stronę też + } } } if (cKey == GLFW_KEY_MINUS) @@ -4176,11 +4193,12 @@ bool TTrain::Update( double const Deltatime ) bDoors[i][2] = (p->dDoorMoveL > 0.001); iDoorNo[i] = p->iAnimType[ANIM_DOORS]; iUnits[i] = iUnitNo; - cCode[i] = p->MoverParameters->TypeName[p->MoverParameters->TypeName.length()]; + cCode[i] = p->MoverParameters->TypeName[p->MoverParameters->TypeName.length()-1]; asCarName[i] = p->GetName(); bPants[iUnitNo - 1][0] = (bPants[iUnitNo - 1][0] || p->MoverParameters->PantFrontUp); bPants[iUnitNo - 1][1] = (bPants[iUnitNo - 1][1] || p->MoverParameters->PantRearUp); bComp[iUnitNo - 1][0] = (bComp[iUnitNo - 1][0] || p->MoverParameters->CompressorAllow); + bSlip[i] = p->MoverParameters->SlippingWheels; if (p->MoverParameters->CompressorSpeed > 0.00001) { bComp[iUnitNo - 1][1] = (bComp[iUnitNo - 1][1] || p->MoverParameters->CompressorFlag); @@ -4222,6 +4240,7 @@ bool TTrain::Update( double const Deltatime ) bDoors[i][0] = false; bDoors[i][1] = false; bDoors[i][2] = false; + bSlip[i] = false; iUnits[i] = 0; cCode[i] = 0; //'0'; asCarName[i] = ""; diff --git a/Train.h b/Train.h index c9c9e6d2..de3b00b4 100644 --- a/Train.h +++ b/Train.h @@ -464,6 +464,7 @@ public: // reszta może by?publiczna int iUnits[20]; // numer jednostki int iDoorNo[20]; // liczba drzwi char cCode[20]; // kod pojazdu + bool bSlip[20]; // poślizg kół pojazdu std::string asCarName[20]; // nazwa czlonu bool bMains[8]; // WSy float fCntVol[8]; // napiecie NN From 6e8fbf73626185b109ccecc7dd2bb7283425ad9c Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 17 Sep 2017 03:18:34 +0200 Subject: [PATCH 194/426] build 170916. mouse support for pantograph valve and compressor, minor tweak in ai route selection for cars --- Driver.cpp | 69 ++++++++++++++++++++++++++++++-------------------- Driver.h | 7 +++-- Track.cpp | 8 +++--- Track.h | 9 +++++++ Train.cpp | 8 +++--- mouseinput.cpp | 6 +++++ translation.h | 2 ++ version.h | 2 +- 8 files changed, 74 insertions(+), 37 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index f6e6e728..2af71d90 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -73,7 +73,16 @@ double GetDistanceToEvent(TTrack const *track, TEvent const *event, double scan_ { // przejście na inny tor track = track->Connected(int(sd), sd); start_dist += (1 == krok) ? 0 : back ? -segment->GetLength() : segment->GetLength(); - return GetDistanceToEvent(track, event, sd, start_dist, ++iter, 1 == krok ? true : false); + if( track->eType == tt_Cross ) { + // NOTE: tracing through crossroads currently poses risk of tracing through wrong segment + // as it's possible to be performerd before setting a route through the crossroads + // as a stop-gap measure we don't trace through crossroads which should be reasonable in most cases + // TODO: establish route before the scan, or a way for the function to know which route to pick + return start_dist; + } + else { + return GetDistanceToEvent( track, event, sd, start_dist, ++iter, 1 == krok ? true : false ); + } } else { // obliczenie mojego toru @@ -580,11 +589,15 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) // na skrzyżowaniach trzeba wybrać segment, po którym pojedzie pojazd // dopiero tutaj jest ustalany kierunek segmentu na skrzyżowaniu sSpeedTable[iLast].iFlags |= - ((pTrack->CrossSegment( - (fLastDir < 0 ? - tLast->iPrevDirection : - tLast->iNextDirection), - iRouteWanted) & 0xf) << 28); // ostatnie 4 bity pola flag + ( ( pTrack->CrossSegment( + (fLastDir < 0 ? + tLast->iPrevDirection : + tLast->iNextDirection), +/* + iRouteWanted ) +*/ + 1 + std::floor( Random( static_cast(pTrack->RouteCount()) - 0.001 ) ) ) + & 0xf ) << 28 ); // ostatnie 4 bity pola flag sSpeedTable[iLast].iFlags &= ~spReverse; // usunięcie flagi kierunku, bo może być błędna if (sSpeedTable[iLast].iFlags < 0) { sSpeedTable[iLast].iFlags |= spReverse; // ustawienie flagi kierunku na podstawie wybranego segmentu @@ -592,10 +605,12 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if (int(fLastDir) * sSpeedTable[iLast].iFlags < 0) { fLastDir = -fLastDir; } +/* if (AIControllFlag) { // dla AI na razie losujemy kierunek na kolejnym skrzyżowaniu iRouteWanted = 1 + Random(3); } +*/ } } else if ( ( pTrack->fRadius != 0.0 ) // odległość na łuku lepiej aproksymować cięciwami @@ -5616,31 +5631,30 @@ int TController::CrossRoute(TTrack *tr) } return 0; // nic nie znaleziono? }; - +/* void TController::RouteSwitch(int d) { // ustawienie kierunku jazdy z kabiny d &= 3; - if( d ) { - if( iRouteWanted != d ) { // nowy kierunek - iRouteWanted = d; // zapamiętanie - if( mvOccupied->CategoryFlag & 2 ) { - // jeśli samochód - for( std::size_t i = 0; i < sSpeedTable.size(); ++i ) { - // szukanie pierwszego skrzyżowania i resetowanie kierunku na nim - if( true == TestFlag( sSpeedTable[ i ].iFlags, spEnabled | spTrack ) ) { - // jeśli pozycja istotna (1) oraz odcinek (2) - if( false == TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) ) { - // odcinek nie może być miniętym - if( sSpeedTable[ i ].trTrack->eType == tt_Cross ) // jeśli skrzyżowanie - { - while( sSpeedTable.size() >= i ) { - // NOTE: we're ignoring semaphor flags and not resetting them like we do for train route trimming - // but what if there's street lights? - // TODO: investigate - sSpeedTable.pop_back(); - } - iLast = sSpeedTable.size(); + if( ( d != 0 ) + && ( iRouteWanted != d ) ) { // nowy kierunek + iRouteWanted = d; // zapamiętanie + if( mvOccupied->CategoryFlag & 2 ) { + // jeśli samochód + for( std::size_t i = 0; i < sSpeedTable.size(); ++i ) { + // szukanie pierwszego skrzyżowania i resetowanie kierunku na nim + if( true == TestFlag( sSpeedTable[ i ].iFlags, spEnabled | spTrack ) ) { + // jeśli pozycja istotna (1) oraz odcinek (2) + if( false == TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) ) { + // odcinek nie może być miniętym + if( sSpeedTable[ i ].trTrack->eType == tt_Cross ) // jeśli skrzyżowanie + { + while( sSpeedTable.size() >= i ) { + // NOTE: we're ignoring semaphor flags and not resetting them like we do for train route trimming + // but what if there's street lights? + // TODO: investigate + sSpeedTable.pop_back(); } + iLast = sSpeedTable.size(); } } } @@ -5648,6 +5662,7 @@ void TController::RouteSwitch(int d) } } }; +*/ std::string TController::OwnerName() const { return ( pVehicle ? pVehicle->MoverParameters->Name : "none" ); diff --git a/Driver.h b/Driver.h index 17fc2f72..d1695179 100644 --- a/Driver.h +++ b/Driver.h @@ -230,8 +230,9 @@ private: TAction GetAction() { return eAction; } bool AIControllFlag = false; // rzeczywisty/wirtualny maszynista - int iRouteWanted = 3; // oczekiwany kierunek jazdy (0-stop,1-lewo,2-prawo,3-prosto) np. odpala - // migacz lub czeka na stan zwrotnicy +/* + int iRouteWanted = 3; // oczekiwany kierunek jazdy (0-stop,1-lewo,2-prawo,3-prosto) np. odpala migacz lub czeka na stan zwrotnicy +*/ private: TDynamicObject *pVehicle = nullptr; // pojazd w którym siedzi sterujący TDynamicObject *pVehicles[2]; // skrajne pojazdy w składzie (niekoniecznie bezpośrednio sterowane) @@ -401,7 +402,9 @@ private: void DirectionInitial(); std::string TableText(std::size_t const Index); int CrossRoute(TTrack *tr); +/* void RouteSwitch(int d); +*/ std::string OwnerName() const; TMoverParameters const *Controlling() const { return mvControlling; } diff --git a/Track.cpp b/Track.cpp index ed94059a..e84652e5 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2343,18 +2343,18 @@ int TTrack::CrossSegment(int from, int into) switch (into) { case 0: // stop - // WriteLog("Crossing from P"+AnsiString(from+1)+" into stop on "+pMyNode->asName); +// WriteLog( "Stopping in P" + to_string( from + 1 ) + " on " + pMyNode->asName ); break; case 1: // left - // WriteLog("Crossing from P"+AnsiString(from+1)+" to left on "+pMyNode->asName); +// WriteLog( "Turning left from P" + to_string( from + 1 ) + " on " + pMyNode->asName ); i = (SwitchExtension->iRoads == 4) ? iLewo4[from] : iLewo3[from]; break; case 2: // right - // WriteLog("Crossing from P"+AnsiString(from+1)+" to right on "+pMyNode->asName); +// WriteLog( "Turning right from P" + to_string( from + 1 ) + " on " + pMyNode->asName ); i = (SwitchExtension->iRoads == 4) ? iPrawo4[from] : iPrawo3[from]; break; case 3: // stright - // WriteLog("Crossing from P"+AnsiString(from+1)+" to straight on "+pMyNode->asName); +// WriteLog( "Going straight from P" + to_string( from + 1 ) + " on " + pMyNode->asName ); i = (SwitchExtension->iRoads == 4) ? iProsto4[from] : iProsto3[from]; break; } diff --git a/Track.h b/Track.h index a26e3d83..f396df26 100644 --- a/Track.h +++ b/Track.h @@ -209,6 +209,15 @@ public: SwitchExtension ? SwitchExtension->CurrentIndex : -1); }; + // returns number of different routes possible to take from given point + // TODO: specify entry point, number of routes for switches can vary + inline + int + RouteCount() const { + return ( + SwitchExtension != nullptr ? + SwitchExtension->iRoads - 1 : + 1 ); } void Load(cParser *parser, Math3D::vector3 pOrigin, std::string name); bool AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); bool AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); diff --git a/Train.cpp b/Train.cpp index 89fd9182..fde9fd70 100644 --- a/Train.cpp +++ b/Train.cpp @@ -6735,9 +6735,11 @@ void TTrain::set_cab_controls() { if( true == bCabLightDim ) { ggCabLightDimButton.PutValue( 1.0 ); } - if( true == InstrumentLightActive ) { - ggInstrumentLightButton.PutValue( 1.0 ); - } + + ggInstrumentLightButton.PutValue( ( + InstrumentLightActive ? + 1.0 : + 0.0 ) ); // doors // NOTE: we're relying on the cab models to have switches reversed for the rear cab(?) ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1.0 : 0.0 ); diff --git a/mouseinput.cpp b/mouseinput.cpp index be72ce1d..8fd53744 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -363,6 +363,12 @@ mouse_input::default_bindings() { { "pantselectedoff_sw:", { user_command::none, user_command::none } }, // TODO: lower selected pantograp(s) command + { "pantcompressor_sw:", { + user_command::pantographcompressoractivate, + user_command::none } }, + { "pantcompressorvalve_sw:", { + user_command::pantographcompressorvalvetoggle, + user_command::none } }, { "trainheating_sw:", { user_command::heatingtoggle, user_command::none } }, diff --git a/translation.h b/translation.h index 297f35cf..a9831f81 100644 --- a/translation.h +++ b/translation.h @@ -70,6 +70,8 @@ static std::unordered_map m_cabcontrols = { { "pantalloff_sw:", "all pantographs" }, { "pantselected_sw:", "selected pantograph" }, { "pantselectedoff_sw:", "selected pantograph" }, + { "pantcompressor_sw:", "pantograph compressor" }, + { "pantcompressorvalve_sw:", "pantograph 3 way valve" }, { "trainheating_sw:", "heating" }, { "signalling_sw:", "braking indicator" }, { "door_signalling_sw:", "door locking" }, diff --git a/version.h b/version.h index c063cca4..bbb0332c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 914 +#define VERSION_MINOR 916 #define VERSION_REVISION 0 From fd06e2306a1b6b855fcce272f3733ddb373cc9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 24 Sep 2017 20:20:18 +0200 Subject: [PATCH 195/426] Added wheel flats calculation and some small changes to induction motors --- Driver.cpp | 2 +- DynObj.cpp | 8 ++++---- McZapkie/MOVER.h | 2 ++ McZapkie/Mover.cpp | 35 ++++++++++++++++++++++++++--------- McZapkie/hamulce.cpp | 11 +++++++++-- Train.cpp | 6 +++--- World.cpp | 30 +++++++++++++++--------------- 7 files changed, 60 insertions(+), 34 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 12af005a..ee8d8e2d 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1707,7 +1707,7 @@ void TController::AutoRewident() } if (mvOccupied->TrainType == dt_EZT) { - fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 8 * fBrake_a1[BrakeAccTableSize]; + fAccThreshold = std::max(-fBrake_a0[BrakeAccTableSize] - 8 * fBrake_a1[BrakeAccTableSize], -0.75); fBrakeReaction = 0.25; } else if (ustaw > 16) diff --git a/DynObj.cpp b/DynObj.cpp index 2a5c9254..5a7f852c 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2784,9 +2784,9 @@ bool TDynamicObject::Update(double dt, double dt1) 1000; // chwilowy max ED -> do rozdzialu sil FfulED = Min0R(p->MoverParameters->eimv[eimv_Fful], 0) * 1000; // chwilowy max ED -> do rozdzialu sil - FrED -= Min0R(p->MoverParameters->eimv[eimv_Fr], 0) * + FrED -= Min0R(p->MoverParameters->eimv[eimv_Fmax], 0) * 1000; // chwilowo realizowane ED -> do pneumatyki - Frj += Max0R(p->MoverParameters->eimv[eimv_Fr], 0) * + Frj += Max0R(p->MoverParameters->eimv[eimv_Fmax], 0) * 1000;// chwilowo realizowany napęd -> do utrzymującego masa += p->MoverParameters->TotalMass; osie += p->MoverParameters->NAxles; @@ -2880,10 +2880,10 @@ bool TDynamicObject::Update(double dt, double dt1) if ((FzEP[i] > 0.01) && (FzEP[i] > p->MoverParameters->TotalMass * p->MoverParameters->eimc[eimc_p_eped] + - Min0R(p->MoverParameters->eimv[eimv_Fr], 0) * 1000) && + Min0R(p->MoverParameters->eimv[eimv_Fmax], 0) * 1000) && (!PrzekrF[i])) { - float przek1 = -Min0R(p->MoverParameters->eimv[eimv_Fr], 0) * 1000 + + float przek1 = -Min0R(p->MoverParameters->eimv[eimv_Fmax], 0) * 1000 + FzEP[i] - p->MoverParameters->TotalMass * p->MoverParameters->eimc[eimc_p_eped] * 0.999; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 19e14c7d..073ac37b 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -780,6 +780,7 @@ public: double Ftmax = 0.0; /*- dla lokomotyw z silnikami indukcyjnymi -*/ double eimc[26]; + bool EIMCLogForce; // static std::vector const eimc_labels; /*-dla wagonow*/ double MaxLoad = 0.0; /*masa w T lub ilosc w sztukach - ladownosc*/ @@ -823,6 +824,7 @@ public: double AccN = 0.0; //przyspieszenie normalne w [m/s^2] double AccV = 0.0; double nrot = 0.0; + double WheelFlat = 0.0; /*! rotacja kol [obr/s]*/ double EnginePower = 0.0; /*! chwilowa moc silnikow*/ double dL = 0.0; double Fb = 0.0; double Ff = 0.0; /*przesuniecie, sila hamowania i tarcia*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index d7799a8b..06bc5830 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3734,6 +3734,10 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) Fb = -Fwheels*Sign(V); FTrain = 0; } + if (nrot < 0.1) + { + WheelFlat = sqrt(sqr(WheelFlat) + abs(Fwheels) / NAxles*Vel*0.000002); + } if (Sign(nrot * M_PI * WheelDiameter - V)*Sign(temp_nrot * M_PI * WheelDiameter - V) < 0) { SlippingWheels = false; @@ -4684,23 +4688,23 @@ double TMoverParameters::TractionForce(double dt) if ((abs((PosRatio + 9.66 * dizel_fill) * dmoment * 100) > 0.95 * Adhesive(RunningTrack.friction) * TotalMassxg)) { - PosRatio = 0; - tmp = 4; - Sandbox( true, range::local ); + //PosRatio = 0; + //tmp = 4; + //Sandbox( true, range::local ); } // przeciwposlizg if ((abs((PosRatio + 9.80 * dizel_fill) * dmoment * 100) > 0.95 * Adhesive(RunningTrack.friction) * TotalMassxg)) { - PosRatio = 0; - tmp = 9; - Sandbox( true, range::local ); + //PosRatio = 0; + //tmp = 9; + //Sandbox( true, range::local ); } // przeciwposlizg if ((SlippingWheels)) { // PosRatio = -PosRatio * 0; // serio -0 ??? PosRatio = 0; tmp = 9; - Sandbox( true, range::local ); + Sandbox( true, range::unit ); } // przeciwposlizg dizel_fill += Max0R(Min0R(PosRatio - dizel_fill, 0.1), -0.1) * 2 * @@ -4737,6 +4741,13 @@ double TMoverParameters::TractionForce(double dt) -Sign(V) * (DirAbsolute)*std::min( eimc[eimc_p_Ph] * 3.6 / (Vel != 0.0 ? Vel : 0.001), std::min(-eimc[eimc_p_Fh] * dizel_fill, eimv[eimv_FMAXMAX])); + double pr = dizel_fill; + if (EIMCLogForce) + pr = -log(1 - 4 * pr) / log(5); + eimv[eimv_Fr] = + -Sign(V) * (DirAbsolute)*std::min( + eimc[eimc_p_Ph] * 3.6 / (Vel != 0.0 ? Vel : 0.001), + std::min(-eimc[eimc_p_Fh] * pr, eimv[eimv_FMAXMAX])); //*Min0R(1,(Vel-eimc[eimc_p_Vh0])/(eimc[eimc_p_Vh1]-eimc[eimc_p_Vh0])) } else @@ -4748,9 +4759,13 @@ double TMoverParameters::TractionForce(double dt) eimv[eimv_Fmax] = eimv[eimv_Fful] * dizel_fill; // else // eimv[eimv_Fmax]:=Min0R(eimc[eimc_p_F0]*dizel_fill,eimv[eimv_Fful]); + double pr = dizel_fill; + if (EIMCLogForce) + pr = log(1 + 4 * pr) / log(5); + eimv[eimv_Fr] = eimv[eimv_Fful] * pr; } - eimv[eimv_ks] = eimv[eimv_Fmax] / eimv[eimv_FMAXMAX]; + eimv[eimv_ks] = eimv[eimv_Fr] / eimv[eimv_FMAXMAX]; eimv[eimv_df] = eimv[eimv_ks] * eimc[eimc_s_dfmax]; eimv[eimv_fp] = DirAbsolute * enrot * eimc[eimc_s_p] + eimv[eimv_df]; // do przemyslenia dzialanie pp z tmpV @@ -4921,7 +4936,7 @@ double TMoverParameters::v2n(void) n = V / (M_PI * WheelDiameter); // predkosc obrotowa wynikajaca z liniowej [obr/s] deltan = n - nrot; //"pochodna" prędkości obrotowej if (SlippingWheels) - if (std::abs(deltan) < 0.01) + if (std::abs(deltan) < 0.001) SlippingWheels = false; // wygaszenie poslizgu if (SlippingWheels) // nie ma zwiazku z predkoscia liniowa V { // McZapkie-221103: uszkodzenia kol podczas poslizgu @@ -7136,6 +7151,7 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { if( asb == "Manual" ) { ASBType = 1; } else if( asb == "Automatic" ) { ASBType = 2; } + else if (asb == "Yes") { ASBType = 128; } } else { @@ -7384,6 +7400,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value( eimc[ eimc_p_Imax ], "Imax", Input, "" ); extract_value( eimc[ eimc_p_abed ], "abed", Input, "" ); extract_value( eimc[ eimc_p_eped ], "edep", Input, "" ); + EIMCLogForce = ( extract_value( "eimclf", Input ) == "Yes" ); Flat = ( extract_value( "Flat", Input ) == "1" ); diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 06e45445..a1156baf 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -1462,9 +1462,15 @@ double TEStED::GetPF( double const PP, double const dt, double const Vel ) // powtarzacz — podwojny zawor zwrotny temp = Max0R(LoadC * BCP / temp * Min0R(Max0R(1 - EDFlag, 0), 1), LBP); + double speed = 1; + if ((ASBP < 0.1) && ((BrakeStatus & b_asb) == b_asb)) + { + temp = 0; + speed = 3; + } if ((BrakeCyl->P() > temp)) - dv = -PFVd(BrakeCyl->P(), 0, 0.02 * SizeBC, temp) * dt; + dv = -PFVd(BrakeCyl->P(), 0, 0.02 * SizeBC * speed, temp) * dt; else if ((BrakeCyl->P() < temp)) dv = PFVa(BVP, BrakeCyl->P(), 0.02 * SizeBC, temp) * dt; else @@ -1995,7 +2001,8 @@ double TKE::GetPF( double const PP, double const dt, double const Vel ) // luzowanie CH // temp:=Max0R(BCP,LBP); IMP = Max0R(IMP / temp, Max0R(LBP, ASBP * int((BrakeStatus & b_asb) == b_asb))); - + if ((ASBP < 0.1) && ((BrakeStatus & b_asb) == b_asb)) + IMP = 0; // luzowanie CH if ((BCP > IMP + 0.005) || (Max0R(ImplsRes->P(), 8 * LBP) < 0.25)) dv = PFVd(BCP, 0, 0.05, IMP) * dt; diff --git a/Train.cpp b/Train.cpp index e6f4902b..a9aba82f 100644 --- a/Train.cpp +++ b/Train.cpp @@ -478,7 +478,7 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "velocity", PyGetFloat( mover->Vel ) ); PyDict_SetItemString( dict, "tractionforce", PyGetFloat( mover->Ft ) ); PyDict_SetItemString( dict, "slipping_wheels", PyGetBool( mover->SlippingWheels ) ); - PyDict_SetItemString( dict, "sanding", PyGetBool( mover->SlippingWheels )); + PyDict_SetItemString( dict, "sanding", PyGetBool( mover->SandDose )); // electric current data PyDict_SetItemString( dict, "traction_voltage", PyGetFloat( mover->RunningTraction.TractionVoltage ) ); PyDict_SetItemString( dict, "voltage", PyGetFloat( mover->Voltage ) ); @@ -4205,10 +4205,10 @@ bool TTrain::Update( double const Deltatime ) } if ((in < 8) && (p->MoverParameters->eimc[eimc_p_Pmax] > 1)) { - fEIMParams[1 + in][0] = p->MoverParameters->eimv[eimv_Fr]; + fEIMParams[1 + in][0] = p->MoverParameters->eimv[eimv_Fmax]; fEIMParams[1 + in][1] = Max0R(fEIMParams[1 + in][0], 0); fEIMParams[1 + in][2] = -Min0R(fEIMParams[1 + in][0], 0); - fEIMParams[1 + in][3] = p->MoverParameters->eimv[eimv_Fr] / + fEIMParams[1 + in][3] = p->MoverParameters->eimv[eimv_Fmax] / Max0R(p->MoverParameters->eimv[eimv_Fful], 1); fEIMParams[1 + in][4] = Max0R(fEIMParams[1 + in][3], 0); fEIMParams[1 + in][5] = -Min0R(fEIMParams[1 + in][3], 0); diff --git a/World.cpp b/World.cpp index 127a4aa6..f077fa2f 100644 --- a/World.cpp +++ b/World.cpp @@ -1061,12 +1061,12 @@ bool TWorld::Update() /* if (DebugModeFlag) if (Global::bActive) // nie przyspieszać, gdy jedzie w tle :) - if( Console::Pressed( GLFW_KEY_ESCAPE ) ) { + if (glfwGetKey(window, GLFW_KEY_PAUSE) == GLFW_PRESS) { // yB dodał przyspieszacz fizyki - Ground.Update(dt, n); - Ground.Update(dt, n); - Ground.Update(dt, n); - Ground.Update(dt, n); // 5 razy + Ground.Update(dt / updatecount, updatecount); + Ground.Update(dt / updatecount, updatecount); + Ground.Update(dt / updatecount, updatecount); + Ground.Update(dt / updatecount, updatecount); // 5 razy } */ // secondary fixed step simulation time routines @@ -1481,7 +1481,7 @@ TWorld::Update_UI() { uitextline2 += "; Ft: " + to_string( tmp->MoverParameters->Ft * 0.001f * tmp->MoverParameters->ActiveCab, 1 ) + ", Fb: " + to_string( tmp->MoverParameters->Fb * 0.001f, 1 ) - + ", Fr: " + to_string( tmp->MoverParameters->RunningTrack.friction, 2 ) + + ", Fr: " + to_string( tmp->MoverParameters->Adhesive(tmp->MoverParameters->RunningTrack.friction), 2 ) + ( tmp->MoverParameters->SlippingWheels ? " (!)" : "" ); uitextline2 += @@ -1680,15 +1680,15 @@ TWorld::Update_UI() { if( tmp == nullptr ) { break; } - - uitextline1 = - "vel: " + to_string( tmp->GetVelocity(), 2 ) + " km/h" + ( tmp->MoverParameters->SlippingWheels ? " (!)" : "" ) - + "; dist: " + to_string( tmp->MoverParameters->DistCounter, 2 ) + " km" - + "; pos: (" - + to_string( tmp->GetPosition().x, 2 ) + ", " - + to_string( tmp->GetPosition().y, 2 ) + ", " - + to_string( tmp->GetPosition().z, 2 ) - + ")"; + uitextline1 = + "vel: " + to_string(tmp->GetVelocity(), 2) + "/" + to_string(tmp->MoverParameters->nrot* M_PI * tmp->MoverParameters->WheelDiameter * 3.6, 2) + + " km/h" + (tmp->MoverParameters->SlippingWheels ? " (!)" : " ") + + "; dist: " + to_string(tmp->MoverParameters->DistCounter, 2) + " km" + + "; pos: (" + + to_string(tmp->GetPosition().x, 2) + ", " + + to_string(tmp->GetPosition().y, 2) + ", " + + to_string(tmp->GetPosition().z, 2) + "), PM=" + + to_string(tmp->MoverParameters->WheelFlat, 1) + " mm"; uitextline2 = "HamZ=" + to_string( tmp->MoverParameters->fBrakeCtrlPos, 1 ) From f6272d37f1e6933778d17d46ed7dfca170eecf9a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 7 Oct 2017 01:18:54 +0200 Subject: [PATCH 196/426] partial initial refactoring: events, memcells, tracks, models, traction; NOTE: debug mode broken, investigate --- AnimModel.cpp | 29 +- AnimModel.h | 87 ++-- DynObj.cpp | 6 - Event.cpp | 908 +++++++++++++++++++++++++++++++++++++++- Event.h | 58 ++- Globals.cpp | 6 +- Ground.cpp | 363 +++++++--------- Ground.h | 53 +-- MemCell.cpp | 29 +- MemCell.h | 77 ++-- Model3d.cpp | 20 +- Names.h | 44 ++ Track.cpp | 415 ++++++++++++------ Track.h | 45 +- Traction.cpp | 389 ++++++++++++++--- Traction.h | 38 +- Train.cpp | 2 +- Train.h | 2 + World.cpp | 65 ++- World.h | 1 + maszyna.vcxproj.filters | 24 ++ renderer.cpp | 644 ++++++++++++++++++++++++++-- renderer.h | 45 +- scene.cpp | 579 +++++++++++++++++++++++++ scene.h | 172 ++++++++ scenenode.cpp | 296 +++++++++++++ scenenode.h | 253 +++++++++++ simulation.cpp | 521 +++++++++++++++++++++++ simulation.h | 73 ++++ stdafx.h | 3 + vertex.cpp | 35 ++ vertex.h | 87 ++++ 32 files changed, 4767 insertions(+), 602 deletions(-) create mode 100644 scene.cpp create mode 100644 scene.h create mode 100644 scenenode.cpp create mode 100644 scenenode.h create mode 100644 simulation.cpp create mode 100644 simulation.h create mode 100644 vertex.cpp create mode 100644 vertex.h diff --git a/AnimModel.cpp b/AnimModel.cpp index b956331a..5646811d 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -406,23 +406,20 @@ void TAnimContainer::EventAssign(TEvent *ev) //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -TAnimModel::TAnimModel() -{ - pRoot = NULL; - pModel = NULL; - iNumLights = 0; - fBlinkTimer = 0; - - for (int i = 0; i < iMaxNumLights; ++i) - { - LightsOn[i] = LightsOff[i] = nullptr; // normalnie nie ma - lsLights[i] = ls_Off; // a jeśli są, to wyłączone +TAnimModel::TAnimModel( scene::node_data const &Nodedata ) : basic_node( Nodedata ) { + // TODO: wrap these in a tuple and move to underlying model + for( int index = 0; index < iMaxNumLights; ++index ) { + LightsOn[ index ] = LightsOff[ index ] = nullptr; // normalnie nie ma + lsLights[ index ] = ls_Off; // a jeśli są, to wyłączone + } +} + +TAnimModel::TAnimModel() { + // TODO: wrap these in a tuple and move to underlying model + for( int index = 0; index < iMaxNumLights; ++index ) { + LightsOn[index] = LightsOff[index] = nullptr; // normalnie nie ma + lsLights[index] = ls_Off; // a jeśli są, to wyłączone } - vAngle.x = vAngle.y = vAngle.z = 0.0; // zerowanie obrotów egzemplarza - pAdvanced = NULL; // nie ma zaawansowanej animacji - fDark = 0.25f; // standardowy próg zaplania - fOnTime = 0.66f; - fOffTime = fOnTime + 0.66f; } TAnimModel::~TAnimModel() diff --git a/AnimModel.h b/AnimModel.h index cf7d9d98..69bdc8bb 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -21,13 +21,13 @@ http://mozilla.org/MPL/2.0/. const int iMaxNumLights = 8; // typy stanu świateł -typedef enum +enum TLightState { ls_Off = 0, // zgaszone ls_On = 1, // zapalone ls_Blink = 2, // migające ls_Dark = 3 // Ra: zapalajce się automatycznie, gdy zrobi się ciemno -} TLightState; +}; class TAnimVocaloidFrame { // ramka animacji typu Vocaloid Motion Data z programu MikuMikuDance @@ -118,55 +118,66 @@ class TAnimAdvanced }; // opakowanie modelu, określające stan egzemplarza -class TAnimModel { +class TAnimModel : public editor::basic_node { friend class opengl_renderer; - private: - TAnimContainer *pRoot; // pojemniki sterujące, tylko dla aniomowanych submodeli - TModel3d *pModel; - double fBlinkTimer; - int iNumLights; - TSubModel *LightsOn[iMaxNumLights]; // Ra: te wskaźniki powinny być w ramach TModel3d - TSubModel *LightsOff[iMaxNumLights]; - vector3 vAngle; // bazowe obroty egzemplarza względem osi - material_data m_materialdata; - - std::string asText; // tekst dla wyświetlacza znakowego - TAnimAdvanced *pAdvanced { nullptr }; - void Advanced(); - TLightState lsLights[iMaxNumLights]; - float fDark; // poziom zapalanie światła (powinno być chyba powiązane z danym światłem?) - float fOnTime, fOffTime; // były stałymi, teraz mogą być zmienne dla każdego egzemplarza - unsigned int m_framestamp { 0 }; // id of last rendered gfx frame -private: - void RaAnimate( unsigned int const Framestamp ); // przeliczenie animacji egzemplarza - void RaPrepare(); // ustawienie animacji egzemplarza na wzorcu - public: - static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania - inline - material_data const *Material() const { return &m_materialdata; } - +public: +// constructors + TAnimModel( scene::node_data const &Nodedata ); TAnimModel(); +// destructor ~TAnimModel(); +// methods + static void AnimUpdate( double dt ); bool Init(TModel3d *pNewModel); bool Init(std::string const &asName, std::string const &asReplacableTexture); bool Load(cParser *parser, bool ter = false); TAnimContainer * AddContainer(std::string const &Name); TAnimContainer * GetContainer(std::string const &Name = ""); - int Flags(); - void RaAnglesSet(double a, double b, double c) - { - vAngle.x = a; - vAngle.y = b; - vAngle.z = c; - }; + void RaAnglesSet( glm::vec3 Angles ) { + vAngle.x = Angles.x; + vAngle.y = Angles.y; + vAngle.z = Angles.z; }; + void LightSet( int n, float v ); + void AnimationVND( void *pData, double a, double b, double c, double d ); bool TerrainLoaded(); int TerrainCount(); TSubModel * TerrainSquare(int n); - void AnimationVND(void *pData, double a, double b, double c, double d); - void LightSet(int n, float v); - static void AnimUpdate(double dt); + int Flags(); + inline + material_data const * + Material() const { + return &m_materialdata; } +// members + static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania + +private: +// methods + void RaPrepare(); // ustawienie animacji egzemplarza na wzorcu + void RaAnimate( unsigned int const Framestamp ); // przeliczenie animacji egzemplarza + void Advanced(); +// members + TAnimContainer *pRoot { nullptr }; // pojemniki sterujące, tylko dla aniomowanych submodeli + TModel3d *pModel { nullptr }; + double fBlinkTimer { 0.0 }; + int iNumLights { 0 }; + TSubModel *LightsOn[ iMaxNumLights ]; // Ra: te wskaźniki powinny być w ramach TModel3d + TSubModel *LightsOff[ iMaxNumLights ]; + vector3 vAngle; // bazowe obroty egzemplarza względem osi + material_data m_materialdata; + + std::string asText; // tekst dla wyświetlacza znakowego + TAnimAdvanced *pAdvanced { nullptr }; + TLightState lsLights[ iMaxNumLights ]; + float fDark { 0.25f }; // poziom zapalanie światła (powinno być chyba powiązane z danym światłem?) + float fOnTime { 0.66f }; + float fOffTime { 0.66f + 0.66f }; // były stałymi, teraz mogą być zmienne dla każdego egzemplarza + unsigned int m_framestamp { 0 }; // id of last rendered gfx frame +}; + +class instance_manager : public basic_table { + }; //--------------------------------------------------------------------------- diff --git a/DynObj.cpp b/DynObj.cpp index 13c65909..aaadd391 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2957,12 +2957,6 @@ bool TDynamicObject::Update(double dt, double dt1) // McZapkie-260202 - dMoveLen przyda sie przy stukocie kol dDOMoveLen = GetdMoveLen() + MoverParameters->ComputeMovement(dt, dt1, ts, tp, tmpTraction, l, r); - // yB: zeby zawsze wrzucalo w jedna strone zakretu -/* - // this seemed to have opposite effect, if anything -- the sway direction would be affected - // by the 'direction' of the track, making the sway go sometimes inward, sometimes outward - MoverParameters->AccN *= -ABuGetDirection(); -*/ // if (dDOMoveLen!=0.0) //Ra: nie może być, bo blokuje Event0 if( Mechanik ) Mechanik->MoveDistanceAdd( dDOMoveLen ); // dodanie aktualnego przemieszczenia diff --git a/Event.cpp b/Event.cpp index 5461c74d..15d75f90 100644 --- a/Event.cpp +++ b/Event.cpp @@ -14,7 +14,8 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "Event.h" +#include "event.h" + #include "Globals.h" #include "Logs.h" #include "Usefull.h" @@ -23,6 +24,10 @@ http://mozilla.org/MPL/2.0/. #include "MemCell.h" #include "Ground.h" #include "McZapkie\mctools.h" +#include "animmodel.h" +#include "dynobj.h" +#include "driver.h" +#include "tractionpower.h" TEvent::TEvent( std::string const &m ) : asNodeName( m ) @@ -36,8 +41,8 @@ TEvent::TEvent( std::string const &m ) : } }; -TEvent::~TEvent() -{ +TEvent::~TEvent() { + switch (Type) { // sprzątanie case tp_Multiple: @@ -56,14 +61,17 @@ TEvent::~TEvent() // SafeDeleteArray(Params[9].asText); //nie usuwać - nazwa jest zamieniana na wskaźnik do // submodelu if (Params[0].asInt == 4) // jeśli z pliku VMD - delete[] Params[8].asPointer; // zwolnić obszar + SafeDeleteArray( Params[8].asPointer ); // zwolnić obszar case tp_GetValues: // nic break; case tp_PutValues: // params[0].astext stores the token SafeDeleteArray( Params[ 0 ].asText ); break; + default: + break; } - evJoined = NULL; // nie usuwać podczepionych tutaj + evJoined = nullptr; // nie usuwać podczepionych tutaj + }; void TEvent::Init(){ @@ -138,7 +146,7 @@ void TEvent::Conditions(cParser *parser, std::string s) } }; -void TEvent::Load(cParser *parser, vector3 *org) +void TEvent::Load(cParser *parser, Math3D::vector3 const &org) { std::string token; @@ -294,12 +302,12 @@ void TEvent::Load(cParser *parser, vector3 *org) parser->getTokens(3); *parser >> Params[3].asdouble >> Params[4].asdouble >> Params[5].asdouble; // położenie // X,Y,Z - if (org) + if ( !(org == Math3D::vector3()) ) { // przesunięcie // tmp->pCenter.RotateY(aRotate.y/180.0*M_PI); //Ra 2014-11: uwzględnienie rotacji - Params[3].asdouble += org->x; // współrzędne w scenerii - Params[4].asdouble += org->y; - Params[5].asdouble += org->z; + Params[3].asdouble += org.x; // współrzędne w scenerii + Params[4].asdouble += org.y; + Params[5].asdouble += org.z; } // Params[12].asInt=0; parser->getTokens(1, false); // komendy 'case sensitive' @@ -679,16 +687,16 @@ double TEvent::ValueGet(int n) return 0.0; // inne eventy się nie liczą }; -vector3 TEvent::PositionGet() const +glm::dvec3 TEvent::PositionGet() const { // pobranie współrzędnych eventu switch (Type) { // case tp_GetValues: - return Params[9].asMemCell->Position(); // współrzędne podłączonej komórki pamięci + return Params[9].asMemCell->location(); // współrzędne podłączonej komórki pamięci case tp_PutValues: - return vector3(Params[3].asdouble, Params[4].asdouble, Params[5].asdouble); + return glm::dvec3(Params[3].asdouble, Params[4].asdouble, Params[5].asdouble); } - return vector3(0, 0, 0); // inne eventy się nie liczą + return glm::dvec3(0, 0, 0); // inne eventy się nie liczą }; bool TEvent::StopCommand() @@ -714,3 +722,875 @@ void TEvent::Append(TEvent *e) e->bEnabled = true; // ten doczepiony może być tylko kolejkowany } }; + + + +event_manager::~event_manager() { + + for( auto *event : m_events ) { + delete event; + } +} + +// adds provided event to the collection. returns: true on success +// TODO: return handle instead of pointer +bool +event_manager::insert( TEvent *Event ) { + + if( Event->Type == tp_Unknown ) { return false; } + + // najpierw sprawdzamy, czy nie ma, a potem dopisujemy + auto lookup = m_eventmap.find( Event->asName ); + if( lookup != m_eventmap.end() ) { + // duplicate of already existing event + auto const size = Event->asName.size(); + // zawsze jeden znak co najmniej jest + if( Event->asName[ 0 ] == '#' ) { + // utylizacja duplikatu z krzyżykiem + return false; + } + // tymczasowo wyjątki: + else if( ( size > 8 ) + && ( Event->asName.substr( 0, 9 ) == "lineinfo:" ) ) { + // tymczasowa utylizacja duplikatów W5 + return false; + } + else if( ( size > 8 ) + && ( Event->asName.substr( size - 8 ) == "_warning" ) ) { + // tymczasowa utylizacja duplikatu z trąbieniem + return false; + } + else if( ( size > 4 ) + && ( Event->asName.substr( size - 4 ) == "_shp" ) ) { + // nie podlegają logowaniu + // tymczasowa utylizacja duplikatu SHP + return false; + } + + auto *duplicate = m_events[ lookup->second ]; + if( Global::bJoinEvents ) { + // doczepka (taki wirtualny multiple bez warunków) + duplicate->Append( Event ); + } + else { + // NOTE: somewhat convoluted way to deal with 'replacing' events without leaving dangling pointers + // can be cleaned up if pointers to events were replaced with handles + ErrorLog( "Bad event: encountered duplicated event, \"" + Event->asName + "\"" ); + duplicate->Append( Event ); // doczepka (taki wirtualny multiple bez warunków) + // BUG: source of memory leak. + // erasing original type of event prevents it from proper resource de-allocation on exit + // TODO: mark ignored event with separate flag or ideally refactor the whole thing + duplicate->Type = tp_Ignored; // dezaktywacja pierwotnego - taka proteza na wsteczną zgodność + } + } + + m_events.emplace_back( Event ); + if( lookup == m_eventmap.end() ) { + // if it's first event with such name, it's potential candidate for the execution queue + m_eventmap.emplace( Event->asName, m_events.size() - 1 ); + if( ( Event->Type != tp_Ignored ) + && ( Event->asName.find( "onstart" ) != std::string::npos ) ) { + // event uruchamiany automatycznie po starcie + AddToQuery( Event, nullptr ); + } + } + + return true; +} + +// legacy method, returns pointer to specified event, or null +TEvent * +event_manager::FindEvent( std::string const &Name ) { + + if( Name.empty() ) { return nullptr; } + + auto const lookup = m_eventmap.find( Name ); + return ( + lookup != m_eventmap.end() ? + m_events[ lookup->second ] : + nullptr ); +} + +// legacy method, inserts specified event in the event query +bool +event_manager::AddToQuery( TEvent *Event, TDynamicObject *Owner ) { + + if( Event->bEnabled ) { + // jeśli może być dodany do kolejki (nie używany w skanowaniu) + if( !Event->iQueued ) // jeśli nie dodany jeszcze do kolejki + { // kolejka eventów jest posortowana względem (fStartTime) + Event->Activator = Owner; + if( ( Event->Type == tp_AddValues ) + && ( Event->fDelay == 0.0 ) ) { + // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie + // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję + // wykonującą eventy i ją wywołać + if( EventConditon( Event ) ) { // teraz mogą być warunki do tych eventów + Event->Params[ 5 ].asMemCell->UpdateValues( + Event->Params[ 0 ].asText, Event->Params[ 1 ].asdouble, + Event->Params[ 2 ].asdouble, Event->iFlags ); + if( Event->Params[ 6 ].asTrack ) { // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla + // wszystkich 'dynamic' na danym torze + for( auto dynamic : Event->Params[ 6 ].asTrack->Dynamics ) { + Event->Params[ 5 ].asMemCell->PutCommand( + dynamic->Mechanik, + &Event->Params[ 4 ].nGroundNode->pCenter ); + } + //if (DebugModeFlag) + WriteLog( + "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues & Track command ( " + + std::string( Event->Params[ 0 ].asText ) + " " + + std::to_string( Event->Params[ 1 ].asdouble ) + " " + + std::to_string( Event->Params[ 2 ].asdouble ) + " )" ); + } + //else if (DebugModeFlag) + WriteLog( + "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues ( " + + std::string( Event->Params[ 0 ].asText ) + " " + + std::to_string( Event->Params[ 1 ].asdouble ) + " " + + std::to_string( Event->Params[ 2 ].asdouble ) + " )" ); + } + // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) + do { + Event = Event->evJoined; + // NOTE: we could've received a new event from joint event above, so we need to check conditions just in case and discard the bad events + // TODO: refactor this arrangement, it's hardly optimal + } while( ( Event != nullptr ) + && ( ( false == Event->bEnabled ) + || ( Event->iQueued > 0 ) ) ); + } + if( Event != nullptr ) { + // standardowe dodanie do kolejki + ++Event->iQueued; // zabezpieczenie przed podwójnym dodaniem do kolejki + WriteLog( "EVENT ADDED TO QUEUE" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->asName ); + Event->fStartTime = std::abs( Event->fDelay ) + Timer::GetTime(); // czas od uruchomienia scenerii + if( Event->fRandomDelay > 0.0 ) { + // doliczenie losowego czasu opóźnienia + Event->fStartTime += Event->fRandomDelay * Random( 10000 ) * 0.0001; + } + if( QueryRootEvent != nullptr ) { + TEvent::AddToQuery( Event, QueryRootEvent ); + } + else { + QueryRootEvent = Event; + QueryRootEvent->evNext = nullptr; + } + } + } + } + return true; +} + +// legacy method, executes queued events +bool +event_manager::CheckQuery() { + + TLocation loc; + int i; + while( ( QueryRootEvent != nullptr ) + && ( QueryRootEvent->fStartTime < Timer::GetTime() ) ) + { // eventy są posortowana wg czasu wykonania + m_workevent = QueryRootEvent; // wyjęcie eventu z kolejki + if (QueryRootEvent->evJoined) // jeśli jest kolejny o takiej samej nazwie + { // to teraz on będzie następny do wykonania + QueryRootEvent = QueryRootEvent->evJoined; // następny będzie ten doczepiony + QueryRootEvent->evNext = m_workevent->evNext; // pamiętając o następnym z kolejki + QueryRootEvent->fStartTime = m_workevent->fStartTime; // czas musi być ten sam, bo nie jest aktualizowany + QueryRootEvent->Activator = m_workevent->Activator; // pojazd aktywujący + QueryRootEvent->iQueued = 1; + // w sumie można by go dodać normalnie do kolejki, ale trzeba te połączone posortować wg czasu wykonania + } + else // a jak nazwa jest unikalna, to kolejka idzie dalej + QueryRootEvent = QueryRootEvent->evNext; // NULL w skrajnym przypadku + if (m_workevent->bEnabled) + { // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć + --m_workevent->iQueued; // teraz moze być ponownie dodany do kolejki + WriteLog( "EVENT LAUNCHED" + ( m_workevent->Activator ? ( " by " + m_workevent->Activator->asName ) : "" ) + ": " + m_workevent->asName ); + switch (m_workevent->Type) + { + case tp_CopyValues: // skopiowanie wartości z innej komórki + m_workevent->Params[5].asMemCell->UpdateValues( + m_workevent->Params[9].asMemCell->Text(), + m_workevent->Params[9].asMemCell->Value1(), + m_workevent->Params[9].asMemCell->Value2(), + m_workevent->iFlags // flagi określają, co ma być skopiowane + ); + // break; //żeby się wysłało do torów i nie było potrzeby na AddValues * 0 0 + case tp_AddValues: // różni się jedną flagą od UpdateValues + case tp_UpdateValues: + if (EventConditon(m_workevent)) + { // teraz mogą być warunki do tych eventów + if (m_workevent->Type != tp_CopyValues) // dla CopyValues zrobiło się wcześniej + m_workevent->Params[5].asMemCell->UpdateValues( + m_workevent->Params[0].asText, + m_workevent->Params[1].asdouble, + m_workevent->Params[2].asdouble, + m_workevent->iFlags); + if (m_workevent->Params[6].asTrack) + { // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla + // wszystkich 'dynamic' na danym torze + for( auto dynamic : m_workevent->Params[ 6 ].asTrack->Dynamics ) { + m_workevent->Params[ 5 ].asMemCell->PutCommand( + dynamic->Mechanik, + &m_workevent->Params[ 4 ].nGroundNode->pCenter ); + } + //if (DebugModeFlag) + WriteLog("Type: UpdateValues & Track command - [" + + m_workevent->Params[5].asMemCell->Text() + "] [" + + to_string( m_workevent->Params[ 5 ].asMemCell->Value1(), 2 ) + "] [" + + to_string( m_workevent->Params[ 5 ].asMemCell->Value2(), 2 ) + "]" ); + } + else //if (DebugModeFlag) + WriteLog("Type: UpdateValues - [" + + m_workevent->Params[5].asMemCell->Text() + "] [" + + to_string( m_workevent->Params[ 5 ].asMemCell->Value1(), 2 ) + "] [" + + to_string( m_workevent->Params[ 5 ].asMemCell->Value2(), 2 ) + "]" ); + } + break; + case tp_GetValues: { + if( m_workevent->Activator ) { +/* + // TODO: re-enable when messaging module is in place + if( Global::iMultiplayer ) { + // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) + WyslijEvent( tmpEvent->asName, tmpEvent->Activator->GetName() ); + } +*/ + m_workevent->Params[ 9 ].asMemCell->PutCommand( + m_workevent->Activator->Mechanik, + &m_workevent->Params[ 8 ].nGroundNode->pCenter ); + } + WriteLog( "Type: GetValues" ); + break; + } + case tp_PutValues: { + if (m_workevent->Activator) { + // zamiana, bo fizyka ma inaczej niż sceneria + loc.X = -m_workevent->Params[3].asdouble; + loc.Y = m_workevent->Params[5].asdouble; + loc.Z = m_workevent->Params[4].asdouble; + if( m_workevent->Activator->Mechanik ) { + // przekazanie rozkazu do AI + m_workevent->Activator->Mechanik->PutCommand( + m_workevent->Params[0].asText, m_workevent->Params[1].asdouble, + m_workevent->Params[2].asdouble, loc); + } + else { + // przekazanie do pojazdu + m_workevent->Activator->MoverParameters->PutCommand( + m_workevent->Params[0].asText, m_workevent->Params[1].asdouble, + m_workevent->Params[2].asdouble, loc); + } + WriteLog("Type: PutValues - [" + + std::string(m_workevent->Params[0].asText) + "] [" + + to_string( m_workevent->Params[ 1 ].asdouble, 2 ) + "] [" + + to_string( m_workevent->Params[ 2 ].asdouble, 2 ) + "]" ); + } + break; + } + case tp_Lights: + if (m_workevent->Params[9].asModel) + for (i = 0; i < iMaxNumLights; i++) + if (m_workevent->Params[i].asdouble >= 0) //-1 zostawia bez zmiany + m_workevent->Params[9].asModel->LightSet( + i, m_workevent->Params[i].asdouble); // teraz też ułamek + break; + case tp_Visible: + if (m_workevent->Params[9].nGroundNode) + m_workevent->Params[9].nGroundNode->bVisible = (m_workevent->Params[i].asInt > 0); + break; + case tp_Velocity: + Error("Not implemented yet :("); + break; + case tp_Exit: + MessageBox(0, m_workevent->asNodeName.c_str(), " THE END ", MB_OK); + Global::iTextMode = -1; // wyłączenie takie samo jak sekwencja F10 -> Y + return false; + case tp_Sound: + switch (m_workevent->Params[0].asInt) + { // trzy możliwe przypadki: + case 0: + m_workevent->Params[9].tsTextSound->Stop(); + break; + case 1: + m_workevent->Params[9].tsTextSound->Play( + 1, 0, true, m_workevent->Params[9].tsTextSound->vSoundPosition); + break; + case -1: + m_workevent->Params[9].tsTextSound->Play( + 1, DSBPLAY_LOOPING, true, m_workevent->Params[9].tsTextSound->vSoundPosition); + break; + } + break; + case tp_Disable: + Error("Not implemented yet :("); + break; + case tp_Animation: // Marcin: dorobic translacje - Ra: dorobiłem ;-) + if (m_workevent->Params[0].asInt == 1) + m_workevent->Params[9].asAnimContainer->SetRotateAnim( + Math3D::vector3(m_workevent->Params[1].asdouble, m_workevent->Params[2].asdouble, + m_workevent->Params[3].asdouble), + m_workevent->Params[4].asdouble); + else if (m_workevent->Params[0].asInt == 2) + m_workevent->Params[9].asAnimContainer->SetTranslateAnim( + Math3D::vector3(m_workevent->Params[1].asdouble, m_workevent->Params[2].asdouble, + m_workevent->Params[3].asdouble), + m_workevent->Params[4].asdouble); + else if (m_workevent->Params[0].asInt == 4) + m_workevent->Params[9].asModel->AnimationVND( + m_workevent->Params[8].asPointer, + m_workevent->Params[1].asdouble, // tu mogą być dodatkowe parametry, np. od-do + m_workevent->Params[2].asdouble, m_workevent->Params[3].asdouble, + m_workevent->Params[4].asdouble); + break; + case tp_Switch: { + if( m_workevent->Params[ 9 ].asTrack ) { + m_workevent->Params[ 9 ].asTrack->Switch( + m_workevent->Params[ 0 ].asInt, + m_workevent->Params[ 1 ].asdouble, + m_workevent->Params[ 2 ].asdouble ); + } +/* + // TODO: re-enable when messaging module is in place + if( Global::iMultiplayer ) { + // dajemy znać do serwera o przełożeniu + WyslijEvent( m_workevent->asName, "" ); // wysłanie nazwy eventu przełączajacego + } +*/ + // Ra: bardziej by się przydała nazwa toru, ale nie ma do niej stąd dostępu + break; + } + case tp_TrackVel: + if (m_workevent->Params[9].asTrack) + { // prędkość na zwrotnicy może być ograniczona z góry we wpisie, większej się nie + // ustawi eventem + WriteLog("Type: TrackVel"); + m_workevent->Params[9].asTrack->VelocitySet(m_workevent->Params[0].asdouble); + if (DebugModeFlag) // wyświetlana jest ta faktycznie ustawiona + WriteLog(" - velocity: ", m_workevent->Params[9].asTrack->VelocityGet()); + } + break; + case tp_DynVel: + Error("Event \"DynVel\" is obsolete"); + break; + case tp_Multiple: { + auto const bCondition = EventConditon(m_workevent); + if( ( bCondition ) + || ( m_workevent->iFlags & conditional_anyelse ) ) { + // warunek spelniony albo było użyte else + WriteLog("Type: Multi-event"); + for (i = 0; i < 8; ++i) { + // dodawane do kolejki w kolejności zapisania + if( m_workevent->Params[ i ].asEvent ) { + if( bCondition != ( ( ( m_workevent->iFlags & ( conditional_else << i ) ) != 0 ) ) ) { + if( m_workevent->Params[ i ].asEvent != m_workevent ) + AddToQuery( m_workevent->Params[ i ].asEvent, m_workevent->Activator ); // normalnie dodać + else { + // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania + if( m_workevent->fDelay >= 5.0 ) { + AddToQuery( m_workevent, m_workevent->Activator ); + } + } + } + } + } +/* + // TODO: re-enable when messaging component is in place + if( Global::iMultiplayer ) { + // dajemy znać do serwera o wykonaniu + if( ( m_workevent->iFlags & conditional_anyelse ) == 0 ) { + // jednoznaczne tylko, gdy nie było else + if( m_workevent->Activator ) { + WyslijEvent( m_workevent->asName, m_workevent->Activator->GetName() ); + } + else { + WyslijEvent( m_workevent->asName, "" ); + } + } + } +*/ + } + break; + } + case tp_WhoIs: { + // pobranie nazwy pociągu do komórki pamięci + if (m_workevent->iFlags & update_load) { + // jeśli pytanie o ładunek + if( m_workevent->iFlags & update_memadd ) { + // jeśli typ pojazdu + // TODO: define and recognize individual request types + auto const owner = ( + ( ( m_workevent->Activator->Mechanik != nullptr ) && ( m_workevent->Activator->Mechanik->Primary() ) ) ? + m_workevent->Activator->Mechanik : + m_workevent->Activator->ctOwner ); + auto const consistbrakelevel = ( + owner != nullptr ? + owner->fReady : + -1.0 ); + auto const collisiondistance = ( + owner != nullptr ? + owner->TrackBlock() : + -1.0 ); + + m_workevent->Params[ 9 ].asMemCell->UpdateValues( + m_workevent->Activator->MoverParameters->TypeName, // typ pojazdu + consistbrakelevel, + collisiondistance, + m_workevent->iFlags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_workevent->iFlags ) + ") - " + + "[name: " + m_workevent->Activator->MoverParameters->TypeName + "], " + + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " + + "[obstacle distance: " + to_string( collisiondistance, 2 ) + " m]" ); + } + else { + // jeśli parametry ładunku + m_workevent->Params[ 9 ].asMemCell->UpdateValues( + m_workevent->Activator->MoverParameters->LoadType, // nazwa ładunku + m_workevent->Activator->MoverParameters->Load, // aktualna ilość + m_workevent->Activator->MoverParameters->MaxLoad, // maksymalna ilość + m_workevent->iFlags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_workevent->iFlags ) + ") - " + + "[load type: " + m_workevent->Activator->MoverParameters->LoadType + "], " + + "[current load: " + to_string( m_workevent->Activator->MoverParameters->Load, 2 ) + "], " + + "[max load: " + to_string( m_workevent->Activator->MoverParameters->MaxLoad, 2 ) + "]" ); + } + } + else if (m_workevent->iFlags & update_memadd) + { // jeśli miejsce docelowe pojazdu + m_workevent->Params[ 9 ].asMemCell->UpdateValues( + m_workevent->Activator->asDestination, // adres docelowy + m_workevent->Activator->DirectionGet(), // kierunek pojazdu względem czoła składu (1=zgodny,-1=przeciwny) + m_workevent->Activator->MoverParameters->Power, // moc pojazdu silnikowego: 0 dla wagonu + m_workevent->iFlags & (update_memstring | update_memval1 | update_memval2)); + + WriteLog( + "Type: WhoIs (" + to_string( m_workevent->iFlags ) + ") - " + + "[destination: " + m_workevent->Activator->asDestination + "], " + + "[direction: " + to_string( m_workevent->Activator->DirectionGet() ) + "], " + + "[engine power: " + to_string( m_workevent->Activator->MoverParameters->Power, 2 ) + "]" ); + } + else if (m_workevent->Activator->Mechanik) + if (m_workevent->Activator->Mechanik->Primary()) + { // tylko jeśli ktoś tam siedzi - nie powinno dotyczyć pasażera! + m_workevent->Params[ 9 ].asMemCell->UpdateValues( + m_workevent->Activator->Mechanik->TrainName(), + m_workevent->Activator->Mechanik->StationCount() - m_workevent->Activator->Mechanik->StationIndex(), // ile przystanków do końca + m_workevent->Activator->Mechanik->IsStop() ? 1 : + 0, // 1, gdy ma tu zatrzymanie + m_workevent->iFlags); + WriteLog("Train detected: " + m_workevent->Activator->Mechanik->TrainName()); + } + break; + } + case tp_LogValues: { + // zapisanie zawartości komórki pamięci do logu + if( m_workevent->Params[ 9 ].asMemCell ) { + // jeśli była podana nazwa komórki + WriteLog( "Memcell \"" + m_workevent->asNodeName + "\": " + + m_workevent->Params[ 9 ].asMemCell->Text() + " " + + std::to_string( m_workevent->Params[ 9 ].asMemCell->Value1() ) + " " + + std::to_string( m_workevent->Params[ 9 ].asMemCell->Value2() ) ); + } + else { + // TODO: re-enable when cell manager is in place +/* + // lista wszystkich + for( TGroundNode *Current = nRootOfType[ TP_MEMCELL ]; Current; Current = Current->nNext ) { + WriteLog( "Memcell \"" + Current->asName + "\": " + + Current->MemCell->Text() + " " + + std::to_string( Current->MemCell->Value1() ) + " " + + std::to_string( Current->MemCell->Value2() ) ); + } +*/ + } + break; + } + case tp_Voltage: // zmiana napięcia w zasilaczu (TractionPowerSource) + if (m_workevent->Params[9].psPower) + { // na razie takie chamskie ustawienie napięcia zasilania + WriteLog("Type: Voltage"); + m_workevent->Params[9].psPower->VoltageSet(m_workevent->Params[0].asdouble); + } + case tp_Friction: // zmiana tarcia na scenerii + { // na razie takie chamskie ustawienie napięcia zasilania + WriteLog("Type: Friction"); + Global::fFriction = (m_workevent->Params[0].asdouble); + } + break; + case tp_Message: // wyświetlenie komunikatu + break; + } // switch (tmpEvent->Type) + } // if (tmpEvent->bEnabled) + } // while + return true; +} + +// legacy method, initializes events after deserialization from scenario file +void +event_manager::InitEvents() { + + //łączenie eventów z pozostałymi obiektami + for( auto *Current : m_events ) { + + switch (Current->Type) { + + case tp_AddValues: // sumowanie wartości + case tp_UpdateValues: { // zmiana wartości + auto *cell = simulation::Memory.find( Current->asNodeName ); // nazwa komórki powiązanej z eventem + if( cell ) { // McZapkie-100302 + if( Current->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { + // jeśli chodzi o zajetosc toru (tor może być inny, niż wpisany w komórce) + // nazwa toru ta sama, co nazwa komórki + Current->Params[ 9 ].asTrack = simulation::Paths.find( Current->asNodeName ); + if( Current->Params[ 9 ].asTrack == nullptr ) { + ErrorLog( "Bad event: track \"" + Current->asNodeName + "\" referenced in event \"" + Current->asName + "\" doesn't exist" ); + } + } + Current->Params[ 4 ].asLocation = &( cell->location() ); + Current->Params[ 5 ].asMemCell = cell; // komórka do aktualizacji + if( Current->iFlags & ( conditional_memcompare ) ) { + // komórka do badania warunku + Current->Params[ 9 ].asMemCell = cell; + } + if( false == cell->asTrackName.empty() ) { + // tor powiązany z komórką powiązaną z eventem + // tu potrzebujemy wskaźnik do komórki w (tmp) + Current->Params[ 6 ].asTrack = simulation::Paths.find( cell->asTrackName ); + if( Current->Params[ 6 ].asTrack == nullptr ) { + ErrorLog( "Bad memcell: track \"" + cell->asTrackName + "\" referenced in memcell \"" + cell->name() + "\" doesn't exist" ); + } + } + else { + Current->Params[ 6 ].asTrack = nullptr; + } + } + else { + // nie ma komórki, to nie będzie działał poprawnie + Current->Type = tp_Ignored; // deaktywacja + ErrorLog( "Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\"" ); + } + break; + } + case tp_LogValues: { + // skojarzenie z memcell + if( Current->asNodeName.empty() ) { // brak skojarzenia daje logowanie wszystkich + Current->Params[ 9 ].asMemCell = nullptr; + break; + } + } + case tp_GetValues: + case tp_WhoIs: { + auto *cell = simulation::Memory.find( Current->asNodeName ); + if( cell ) { + Current->Params[ 8 ].asLocation = &( cell->location() ); + Current->Params[ 9 ].asMemCell = cell; + if( ( Current->Type == tp_GetValues ) + && ( cell->IsVelocity() ) ) { + // jeśli odczyt komórki a komórka zawiera komendę SetVelocity albo ShuntVelocity + // to event nie będzie dodawany do kolejki + Current->bEnabled = false; + } + } + else { + // nie ma komórki, to nie będzie działał poprawnie + Current->Type = tp_Ignored; // deaktywacja + ErrorLog( "Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\"" ); + } + break; + } + case tp_CopyValues: { + // skopiowanie komórki do innej + auto *cell = simulation::Memory.find( Current->asNodeName ); // komórka docelowa + if( cell ) { + Current->Params[ 4 ].asLocation = &( cell->location() ); + Current->Params[ 5 ].asMemCell = cell; // komórka docelowa + if( false == cell->asTrackName.empty() ) { + // tor powiązany z komórką powiązaną z eventem + // tu potrzebujemy wskaźnik do komórki w (tmp) + Current->Params[ 6 ].asTrack = simulation::Paths.find( cell->asTrackName ); + if( Current->Params[ 6 ].asTrack == nullptr ) { + ErrorLog( "Bad memcell: track \"" + cell->asTrackName + "\" referenced in memcell \"" + cell->name() + "\" doesn't exists" ); + } + } + else { + Current->Params[ 6 ].asTrack = nullptr; + } + } + else { + ErrorLog( "Bad event: copyvalues event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\"" ); + } + std::string const cellastext { Current->Params[ 9 ].asText }; + cell = simulation::Memory.find( Current->Params[ 9 ].asText ); // komórka źódłowa + SafeDeleteArray( Current->Params[ 9 ].asText ); // usunięcie nazwy komórki + if( cell != nullptr ) { + Current->Params[ 8 ].asLocation = &( cell->location() ); + Current->Params[ 9 ].asMemCell = cell; // komórka źródłowa + } + else { + ErrorLog( "Bad event: copyvalues event \"" + Current->asName + "\" cannot find memcell \"" + cellastext + "\"" ); + } + break; + } + case tp_Animation: { + // animacja modelu + // retrieve target name parameter + std::string const cellastext = Current->Params[ 9 ].asText; + SafeDeleteArray( Current->Params[ 9 ].asText ); + // egzemplarz modelu do animowania + auto *instance = simulation::Instances.find( Current->asNodeName ); + if( instance ) { + if( Current->Params[ 0 ].asInt == 4 ) { + // model dla całomodelowych animacji + Current->Params[ 9 ].asModel = instance; + } + else { + // standardowo przypisanie submodelu + Current->Params[ 9 ].asAnimContainer = instance->GetContainer( cellastext ); // submodel + if( Current->Params[ 9 ].asAnimContainer ) { + Current->Params[ 9 ].asAnimContainer->WillBeAnimated(); // oflagowanie animacji + if( Current->Params[ 9 ].asAnimContainer->Event() == nullptr ) { + // nie szukać, gdy znaleziony + Current->Params[ 9 ].asAnimContainer->EventAssign( + FindEvent( Current->asNodeName + "." + cellastext + ":done" ) ); + } + } + } + } + else { + ErrorLog( "Bad event: animation event \"" + Current->asName + "\" cannot find model instance \"" + Current->asNodeName + "\"" ); + } + Current->asNodeName = ""; + break; + } + case tp_Lights: { + // zmiana świeteł modelu + auto *instance = simulation::Instances.find( Current->asNodeName ); + if( instance ) + Current->Params[ 9 ].asModel = instance; + else + ErrorLog( "Bad event: lights event \"" + Current->asName + "\" cannot find model instance \"" + Current->asNodeName + "\"" ); + Current->asNodeName = ""; + break; + } +/* + case tp_Visible: { + // ukrycie albo przywrócenie obiektu + tmp = FindGroundNode( Current->asNodeName, TP_MODEL ); // najpierw model + if( !tmp ) + tmp = FindGroundNode( Current->asNodeName, TP_TRACK ); // albo tory? + if( !tmp ) + tmp = FindGroundNode( Current->asNodeName, TP_TRACTION ); // może druty? + if( tmp ) + Current->Params[ 9 ].nGroundNode = tmp; + else + ErrorLog( "Bad event: visibility event \"" + Current->asName + "\" cannot find item \"" + Current->asNodeName + "\"" ); + Current->asNodeName = ""; + break; + } +*/ + case tp_Switch: { + // przełożenie zwrotnicy albo zmiana stanu obrotnicy + auto *track = simulation::Paths.find( Current->asNodeName ); + if( track ) { + // dowiązanie toru + if( track->iAction == NULL ) { + // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia + track->iAction |= 0x100; + } + Current->Params[ 9 ].asTrack = track; + if( ( Current->Params[ 0 ].asInt == 0 ) + && ( Current->Params[ 2 ].asdouble >= 0.0 ) ) { + // jeśli przełącza do stanu 0 & jeśli jest zdefiniowany dodatkowy ruch iglic + // przesłanie parametrów + Current->Params[ 9 ].asTrack->Switch( + Current->Params[ 0 ].asInt, + Current->Params[ 1 ].asdouble, + Current->Params[ 2 ].asdouble ); + } + } + else { + ErrorLog( "Bad event: switch event \"" + Current->asName + "\" cannot find track \"" + Current->asNodeName + "\"" ); + } + Current->asNodeName = ""; + break; + } +/* + case tp_Sound: { + // odtworzenie dźwięku + tmp = FindGroundNode( Current->asNodeName, TP_SOUND ); + if( tmp ) + Current->Params[ 9 ].tsTextSound = tmp->tsStaticSound; + else + ErrorLog( "Bad event: sound event \"" + Current->asName + "\" cannot find static sound \"" + Current->asNodeName + "\"" ); + Current->asNodeName = ""; + break; + } +*/ + case tp_TrackVel: { + // ustawienie prędkości na torze + if( false == Current->asNodeName.empty() ) { + auto *track = simulation::Paths.find( Current->asNodeName ); + if( track ) { + // flaga zmiany prędkości toru jest istotna dla skanowania + track->iAction |= 0x200; + Current->Params[ 9 ].asTrack = track; + } + else { + ErrorLog( "Bad event: track velocity event \"" + Current->asName + "\" cannot find track \"" + Current->asNodeName + "\"" ); + } + } + Current->asNodeName = ""; + break; + } +/* + case tp_DynVel: { + // komunikacja z pojazdem o konkretnej nazwie + if( Current->asNodeName == "activator" ) + Current->Params[ 9 ].asDynamic = nullptr; + else { + tmp = FindGroundNode( Current->asNodeName, TP_DYNAMIC ); + if( tmp ) + Current->Params[ 9 ].asDynamic = tmp->DynamicObject; + else + Error( "Bad event: vehicle velocity event \"" + Current->asName + "\" cannot find vehicle \"" + Current->asNodeName + "\"" ); + } + Current->asNodeName = ""; + break; + } +*/ + case tp_Multiple: { + std::string cellastext; + if( Current->Params[ 9 ].asText != nullptr ) { // przepisanie nazwy do bufora + cellastext = Current->Params[ 9 ].asText; + SafeDeleteArray( Current->Params[ 9 ].asText ); + Current->Params[ 9 ].asPointer = nullptr; // zerowanie wskaźnika, aby wykryć brak obeiktu + } + if( Current->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { + // jeśli chodzi o zajetosc toru + Current->Params[ 9 ].asTrack = simulation::Paths.find( cellastext ); + if( Current->Params[ 9 ].asTrack == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + Current->asName + "\" cannot find track \"" + cellastext + "\"" ); + Current->iFlags &= ~( conditional_trackoccupied | conditional_trackfree ); // zerowanie flag + } + } + else if( Current->iFlags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) { + // jeśli chodzi o komorke pamieciową + Current->Params[ 9 ].asMemCell = simulation::Memory.find( cellastext ); + if( Current->Params[ 9 ].asMemCell == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + Current->asName + "\" cannot find memory cell \"" + cellastext + "\"" ); + Current->iFlags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); + } + } + for( int i = 0; i < 8; ++i ) { + if( Current->Params[ i ].asText != nullptr ) { + cellastext = Current->Params[ i ].asText; + SafeDeleteArray( Current->Params[ i ].asText ); + Current->Params[ i ].asEvent = FindEvent( cellastext ); + if( Current->Params[ i ].asEvent == nullptr ) { + // Ra: tylko w logu informacja o braku + ErrorLog( "Bad event: multi-event \"" + Current->asName + "\" cannot find event \"" + cellastext + "\"" ); + } + } + } + break; + } +/* + case tp_Voltage: { + // zmiana napięcia w zasilaczu (TractionPowerSource) + if( !Current->asNodeName.empty() ) { + tmp = FindGroundNode( Current->asNodeName, TP_TRACTIONPOWERSOURCE ); // podłączenie zasilacza + if( tmp ) + Current->Params[ 9 ].psPower = tmp->psTractionPowerSource; + else + ErrorLog( "Bad event: voltage event \"" + Current->asName + "\" cannot find power source \"" + Current->asNodeName + "\"" ); + } + Current->asNodeName = ""; + break; + } +*/ + case tp_Message: { + // wyświetlenie komunikatu + break; + } + + } // switch + if( Current->fDelay < 0 ) { + AddToQuery( Current, nullptr ); + } + } +/* + for (TGroundNode *Current = nRootOfType[TP_MEMCELL]; Current; Current = Current->nNext) + { // Ra: eventy komórek pamięci, wykonywane po wysłaniu komendy do zatrzymanego pojazdu + Current->MemCell->AssignEvents( FindEvent( Current->asName + ":sent" ) ); + } +*/ +} + +// legacy method, verifies condition for specified event +bool +event_manager::EventConditon( TEvent *Event ) { + + if (Event->iFlags <= update_only) + return true; // bezwarunkowo + + if (Event->iFlags & conditional_trackoccupied) + return (!Event->Params[9].asTrack->IsEmpty()); + else if (Event->iFlags & conditional_trackfree) + return (Event->Params[9].asTrack->IsEmpty()); + else if (Event->iFlags & conditional_propability) + { + double rprobability = Random(); + WriteLog( "Random integer: " + std::to_string( rprobability ) + " / " + std::to_string( Event->Params[ 10 ].asdouble ) ); + return (Event->Params[10].asdouble > rprobability); + } + else if( Event->iFlags & conditional_memcompare ) { + // porównanie wartości + if( nullptr == Event->Params[9].asMemCell ) { + + ErrorLog( "Event " + Event->asName + " trying conditional_memcompare with nonexistent memcell" ); + return true; // though this is technically error, we report success to maintain backward compatibility + } + auto const comparisonresult = + m_workevent->Params[ 9 ].asMemCell->Compare( + ( Event->Params[ 10 ].asText != nullptr ? + Event->Params[ 10 ].asText : + "" ), + Event->Params[ 11 ].asdouble, + Event->Params[ 12 ].asdouble, + Event->iFlags ); + + std::string comparisonlog = "Type: MemCompare - "; + + comparisonlog += + "[" + Event->Params[ 9 ].asMemCell->Text() + "]" + + " [" + to_string( Event->Params[ 9 ].asMemCell->Value1(), 2 ) + "]" + + " [" + to_string( m_workevent->Params[ 9 ].asMemCell->Value2(), 2 ) + "]"; + + comparisonlog += ( + true == comparisonresult ? + " == " : + " != " ); + + comparisonlog += ( + TestFlag( Event->iFlags, conditional_memstring ) ? + "[" + std::string( m_workevent->Params[ 10 ].asText ) + "]" : + "[*]" ); + comparisonlog += ( + TestFlag( m_workevent->iFlags, conditional_memval1 ) ? + " [" + to_string( m_workevent->Params[ 11 ].asdouble, 2 ) + "]" : + " [*]" ); + comparisonlog += ( + TestFlag( m_workevent->iFlags, conditional_memval2 ) ? + " [" + to_string( m_workevent->Params[ 12 ].asdouble, 2 ) + "]" : + " [*]" ); + + WriteLog( comparisonlog ); + return comparisonresult; + } + // unrecognized request + return false; +} diff --git a/Event.h b/Event.h index 663efef3..219441d2 100644 --- a/Event.h +++ b/Event.h @@ -11,9 +11,7 @@ http://mozilla.org/MPL/2.0/. #include #include "dumb3d.h" -#include "Classes.h" - -using namespace Math3D; +#include "classes.h" enum TEventType { tp_Unknown, @@ -63,6 +61,7 @@ union TParam void *asPointer; TMemCell *asMemCell; TGroundNode *nGroundNode; + glm::dvec3 const *asLocation; TTrack *asTrack; TAnimModel *asModel; TAnimContainer *asAnimContainer; @@ -87,9 +86,10 @@ class TEvent // zmienne: ev* std::string asName; bool bEnabled = false; // false gdy ma nie być dodawany do kolejki (skanowanie sygnałów) int iQueued = 0; // ile razy dodany do kolejki - // bool bIsHistory; TEvent *evNext = nullptr; // następny w kolejce +#ifdef EU07_USE_OLD_GROUNDCODE TEvent *evNext2 = nullptr; +#endif TEventType Type = tp_Unknown; double fStartTime = 0.0; double fDelay = 0.0; @@ -103,15 +103,61 @@ class TEvent // zmienne: ev* TEvent(std::string const &m = ""); ~TEvent(); void Init(); - void Load(cParser *parser, vector3 *org); + void Load(cParser *parser, Math3D::vector3 const &org); static void AddToQuery( TEvent *Event, TEvent *&Start ); std::string CommandGet(); TCommandType Command(); double ValueGet(int n); - vector3 PositionGet() const; + glm::dvec3 PositionGet() const; bool StopCommand(); void StopCommandSent(); void Append(TEvent *e); }; +class event_manager { + +public: +// destructor + ~event_manager(); +// methods + // adds provided event to the collection. returns: true on success + // TODO: return handle instead of pointer + bool + insert( TEvent *Event ); + // legacy method, returns pointer to specified event, or null + TEvent * + FindEvent( std::string const &Name ); + // legacy method, inserts specified event in the event query + bool + AddToQuery( TEvent *Event, TDynamicObject *Owner ); + // legacy method, executes queued events + bool + CheckQuery(); + // legacy method, initializes events after deserialization from scenario file + void + InitEvents(); + +private: +// types + using event_sequence = std::deque; + using event_map = std::unordered_map; + +// methods + // legacy method, verifies condition for specified event + bool + EventConditon( TEvent *Event ); + +// members + event_sequence m_events; +/* + // NOTE: disabled until event class refactoring + event_sequence m_eventqueue; +*/ + // legacy version of the above + TEvent *QueryRootEvent { nullptr }; + TEvent *m_workevent { nullptr }; + + event_map m_eventmap; +}; + //--------------------------------------------------------------------------- diff --git a/Globals.cpp b/Globals.cpp index 5702dc55..fea1cb39 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -120,7 +120,7 @@ float Global::AnisotropicFiltering = 8.0f; // requested level of anisotropic fil bool Global::bUseVBO = true; // czy jest VBO w karcie graficznej (czy użyć) std::string Global::LastGLError; GLint Global::iMaxTextureSize = 4096; // maksymalny rozmiar tekstury -bool Global::bSmoothTraction = false; // wygładzanie drutów starym sposobem +bool Global::bSmoothTraction { true }; // wygładzanie drutów starym sposobem float Global::SplineFidelity { 1.f }; // determines segment size during conversion of splines to geometry std::string Global::szDefaultExt = Global::szTexturesDDS; // domyślnie od DDS int Global::iMultisampling = 2; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px @@ -1008,7 +1008,11 @@ TDynamicObject *Global::CouplerNearest() bool Global::AddToQuery(TEvent *event, TDynamicObject *who) { +#ifdef EU07_USE_OLD_GROUNDCODE return pGround->AddToQuery(event, who); +#else + return simulation::Events.AddToQuery( event, who ); +#endif }; //--------------------------------------------------------------------------- diff --git a/Ground.cpp b/Ground.cpp index 2cbe7e31..f415dab9 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -20,7 +20,6 @@ http://mozilla.org/MPL/2.0/. #include "Logs.h" #include "usefull.h" #include "Timer.h" -#include "renderer.h" #include "Event.h" #include "EvLaunch.h" #include "TractionPower.h" @@ -34,9 +33,6 @@ http://mozilla.org/MPL/2.0/. #include "Data.h" #include "parser.h" //Tolaris-010603 #include "Driver.h" -#include "Console.h" -#include "Names.h" -#include "world.h" #include "uilayer.h" //--------------------------------------------------------------------------- @@ -47,7 +43,6 @@ extern "C" } bool bCondition; // McZapkie: do testowania warunku na event multiple -std::string LogComment; //--------------------------------------------------------------------------- // Obiekt renderujący siatkę jest sztucznie tworzonym obiektem pomocniczym, @@ -123,6 +118,8 @@ TGroundNode::~TGroundNode() case GL_TRIANGLES: SafeDelete( Piece ); break; + default: + break; } } /* @@ -144,7 +141,7 @@ TGroundNode::TGroundNode( TGroundNodeType t ) : break; } case TP_TRACK: { - pTrack = new TTrack( this ); + pTrack = new TTrack( asName ); break; } default: { @@ -314,9 +311,8 @@ void TSubRect::NodeAdd(TGroundNode *Node) // przygotowanie sektora do renderowania void TSubRect::Sort() { - if( tTracks != nullptr ) { - SafeDelete( tTracks ); - } + SafeDeleteArray( tTracks ); + if( iTracks > 0 ) { tTracks = new TTrack *[ iTracks ]; // tworzenie tabeli torów do renderowania pojazdów int i = 0; @@ -414,12 +410,20 @@ void TSubRect::LoadNodes() { break; } case TP_TRACK: - if( node->pTrack->bVisible ) { // bo tory zabezpieczające są niewidoczne + if( node->pTrack->visible() ) { // bo tory zabezpieczające są niewidoczne +#ifdef EU07_USE_OLD_GROUNDCODE + node->pTrack->create_geometry( m_geometrybank, node->m_rootposition ); +#else node->pTrack->create_geometry( m_geometrybank ); +#endif } break; case TP_TRACTION: +#ifdef EU07_USE_OLD_GROUNDCODE node->hvTraction->create_geometry( m_geometrybank, node->m_rootposition ); +#else + node->hvTraction->create_geometry( m_geometrybank ); +#endif break; default: { break; } } @@ -448,16 +452,16 @@ TGroundRect::Init() { } pSubRects = new TSubRect[ iNumSubRects * iNumSubRects ]; - float const subrectsize = 1000.0f / iNumSubRects; + auto const subrectsize = 1000.0 / iNumSubRects; for( int column = 0; column < iNumSubRects; ++column ) { for( int row = 0; row < iNumSubRects; ++row ) { auto subcell = FastGetSubRect( column, row ); auto &area = subcell->m_area; area.center = m_area.center - - glm::vec3( 500.0f, 0.0f, 500.0f ) // 'upper left' corner of rectangle - + glm::vec3( subrectsize * 0.5f, 0.0f, subrectsize * 0.5f ) // center of sub-rectangle - + glm::vec3( subrectsize * column, 0.0f, subrectsize * row ); + - glm::dvec3( 500.0, 0.0, 500.0 ) // 'upper left' corner of rectangle + + glm::dvec3( subrectsize * 0.5, 0.0, subrectsize * 0.5 ) // center of sub-rectangle + + glm::dvec3( subrectsize * column, 0.0, subrectsize * row ); area.radius = subrectsize * M_SQRT2; // all subcells share the same geometry bank with their parent, to reduce buffer switching during render subcell->m_geometrybank = m_geometrybank; @@ -507,7 +511,7 @@ TGroundRect::NodeAdd( TGroundNode *Node ) { // compares two provided nodes, returns true if their content can be merged bool -TGroundRect::mergeable( TGroundNode const &Left, TGroundNode const &Right ) { +TGroundRect::mergeable( TGroundNode const &Left, TGroundNode const &Right ) const { // since view ranges and transparency type for all nodes put through this method are guaranteed to be equal, // we can skip their tests and only do the material check. // TODO, TBD: material as dedicated type, and refactor this method into a simple equality test @@ -553,6 +557,7 @@ TGround::~TGround() void TGround::Free() { +#ifdef EU07_USE_OLD_GROUNDCODE TEvent *tmp; for (TEvent *Current = RootEvent; Current;) { @@ -560,6 +565,7 @@ void TGround::Free() Current = Current->evNext2; delete tmp; } +#endif TGroundNode *tmpn; for (int i = 0; i < TP_LAST; ++i) { @@ -598,7 +604,8 @@ TGroundNode * TGround::DynamicFind(std::string const &Name) return NULL; }; -void TGround::DynamicList(bool all) +void +TGround::DynamicList(bool all) { // odesłanie nazw pojazdów dostępnych na scenerii (nazwy, szczególnie wagonów, mogą się // powtarzać!) for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) @@ -607,45 +614,23 @@ void TGround::DynamicList(bool all) WyslijString("none", 6); // informacja o końcu listy }; -TGroundNode * TGround::FindGroundNode(std::string asNameToFind, TGroundNodeType iNodeType) -{ // wyszukiwanie obiektu o podanej nazwie i konkretnym typie - if ((iNodeType == TP_TRACK) || (iNodeType == TP_MEMCELL) || (iNodeType == TP_MODEL)) - { // wyszukiwanie w drzewie binarnym -/* - switch( iNodeType ) { +// wyszukiwanie obiektu o podanej nazwie i konkretnym typie +TGroundNode * +TGround::FindGroundNode(std::string const &asNameToFind, TGroundNodeType const iNodeType) { - case TP_TRACK: { - auto const lookup = m_trackmap.find( asNameToFind ); - return - lookup != m_trackmap.end() ? - lookup->second : - nullptr; - } - case TP_MODEL: { - auto const lookup = m_modelmap.find( asNameToFind ); - return - lookup != m_modelmap.end() ? - lookup->second : - nullptr; - } - case TP_MEMCELL: { - auto const lookup = m_memcellmap.find( asNameToFind ); - return - lookup != m_memcellmap.end() ? - lookup->second : - nullptr; - } - } - return nullptr; -*/ - return m_trackmap.Find( iNodeType, asNameToFind ); + if( ( iNodeType == TP_TRACK ) + || ( iNodeType == TP_MEMCELL ) + || ( iNodeType == TP_MODEL ) ) { + // wyszukiwanie w drzewie binarnym + return m_nodemap.Find( iNodeType, asNameToFind ); } // standardowe wyszukiwanie liniowe - TGroundNode *Current; - for (Current = nRootOfType[iNodeType]; Current; Current = Current->nNext) - if (Current->asName == asNameToFind) + for( TGroundNode *Current = nRootOfType[ iNodeType ]; Current != nullptr; Current = Current->nNext ) { + if( Current->asName == asNameToFind ) { return Current; - return NULL; + } + } + return nullptr; } TGroundRect * @@ -905,7 +890,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) switch (tmp->iType) { case TP_TRACTION: - tmp->hvTraction = new TTraction(); + tmp->hvTraction = new TTraction( tmp->asName ); parser->getTokens(); *parser >> token; tmp->hvTraction->asPowerSupplyName = token; // nazwa zasilacza @@ -989,8 +974,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) if (token.compare("endtraction") != 0) Error("ENDTRACTION delimiter missing! " + str2 + " found instead."); tmp->hvTraction->Init(); // przeliczenie parametrów - // if (Global::bLoadTraction) - // tmp->hvTraction->Optimize(); //generowanie DL dla wszystkiego przy wczytywaniu? tmp->pCenter = interpolate( tmp->hvTraction->pPoint2, tmp->hvTraction->pPoint1, 0.5 ); break; case TP_TRACTIONPOWERSOURCE: @@ -1015,7 +998,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->MemCell->Load(parser); if (!tmp->asName.empty()) // jest pusta gdy "none" { // dodanie do wyszukiwarki - if( false == m_trackmap.Add( TP_MEMCELL, tmp->asName, tmp ) ) { + if( false == m_nodemap.Add( TP_MEMCELL, tmp->asName, tmp ) ) { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) ErrorLog( "Duplicated memcell: " + tmp->asName ); // to zgłaszać duplikat } @@ -1033,14 +1016,14 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->EvLaunch->Load(parser); break; case TP_TRACK: - tmp->pTrack = new TTrack(tmp); + tmp->pTrack = new TTrack( tmp->asName ); if (Global::iWriteLogEnabled & 4) if (!tmp->asName.empty()) WriteLog(tmp->asName); - tmp->pTrack->Load(parser, pOrigin, tmp->asName); // w nazwie może być nazwa odcinka izolowanego + tmp->pTrack->Load(parser, pOrigin); // w nazwie może być nazwa odcinka izolowanego if (!tmp->asName.empty()) // jest pusta gdy "none" { // dodanie do wyszukiwarki - if( false == m_trackmap.Add( TP_TRACK, tmp->asName, tmp ) ) { + if( false == m_nodemap.Add( TP_TRACK, tmp->asName, tmp ) ) { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) ErrorLog( "Duplicated track: " + tmp->asName ); // to zgłaszać duplikat } @@ -1148,22 +1131,18 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) if (fTrainSetDist < 8.0) // i raczej nie sięga fTrainSetDist = 8.0; // przesuwamy około pół EU07 dla wstecznej zgodności - // WriteLog("Dynamic shift: "+AnsiString(fTrainSetDist)); - /* //Ra: to jednak robi duże problemy - przesunięcie w dynamic jest przesunięciem do - tyłu, odwrotnie niż w trainset - if (!iTrainSetWehicleNumber) //dla pierwszego jest to przesunięcie (ujemne = do - tyłu) - if (tf1!=-1.0) //-1 wyjątkowo oznacza odwrócenie - tf1=-tf1; //a dla kolejnych odległość między sprzęgami (ujemne = wbite) - */ - tf3 = tmp->DynamicObject->Init(asNodeName, str1, Skin, str3, Track, - (tf1 == -1.0 ? fTrainSetDist : fTrainSetDist - tf1), - DriverType, tf3, asTrainName, int2, str2, (tf1 == -1.0), - str4); - if (tf3 != 0.0) // zero oznacza błąd + + auto const length = + tmp->DynamicObject->Init( + asNodeName, str1, Skin, str3, Track, + ( tf1 == -1.0 ? + fTrainSetDist : + fTrainSetDist - tf1 ), + DriverType, tf3, asTrainName, int2, str2, (tf1 == -1.0), str4); + if (length != 0.0) // zero oznacza błąd { // przesunięcie dla kolejnego, minus bo idziemy w stronę punktu 1 - fTrainSetDist -= tf3; + fTrainSetDist -= length; tmp->pCenter = tmp->DynamicObject->GetPosition(); // automatically establish permanent connections for couplers which specify them in their definitions if( TempConnectionType[ iTrainSetWehicleNumber ] ) { @@ -1208,7 +1187,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) // we check for presence of security system or sand load, as a way to determine whether the vehicle is a controllable engine // NOTE: this isn't 100% precise, e.g. middle EZT module comes with security system, while it has no lights, and some engines // don't have security systems fitted - m_lights.insert( tmp->DynamicObject ); + simulation::Lights.insert( tmp->DynamicObject ); } break; @@ -1257,7 +1236,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } else if( !tmp->asName.empty() ) // jest pusta gdy "none" { // dodanie do wyszukiwarki - if( false == m_trackmap.Add( TP_MODEL, tmp->asName, tmp ) ) { + if( false == m_nodemap.Add( TP_MODEL, tmp->asName, tmp ) ) { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) ErrorLog( "Duplicated model: " + tmp->asName ); // to zgłaszać duplikat } @@ -1310,7 +1289,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->iFlags = 0x200; // flaga usuwania tmp->Model = new TAnimModel(); - tmp->Model->RaAnglesSet( aRotate.x, tf1 + aRotate.y, aRotate.z ); // dostosowanie do pochylania linii + tmp->Model->RaAnglesSet( glm::vec3{ aRotate.x, tf1 + aRotate.y, aRotate.z } ); // dostosowanie do pochylania linii if( false == tmp->Model->Load( parser, false ) ) { // model nie wczytał się - ignorowanie node delete tmp; @@ -1320,7 +1299,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->iFlags |= tmp->Model->Flags(); // ustalenie, czy przezroczysty if( false == tmp->asName.empty() ) { // jest pusta gdy "none" // dodanie do wyszukiwarki - if( false == m_trackmap.Add( TP_MODEL, tmp->asName, tmp ) ) { + if( false == m_nodemap.Add( TP_MODEL, tmp->asName, tmp ) ) { // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) ErrorLog( "Duplicated model: " + tmp->asName ); // to zgłaszać duplikat } @@ -1652,6 +1631,7 @@ TSubRect * TGround::GetSubRect(int iCol, int iRow) return (Rects[bc][br].SafeGetSubRect(sc, sr)); // pobranie małego kwadratu } +#ifdef EU07_USE_OLD_GROUNDCODE TEvent * TGround::FindEvent(const std::string &asEventName) { if( asEventName.empty() ) { return nullptr; } @@ -1662,24 +1642,7 @@ TEvent * TGround::FindEvent(const std::string &asEventName) lookup->second : nullptr ); } - -TEvent * TGround::FindEventScan( std::string const &asEventName ) -{ // wyszukanie eventu z opcją utworzenia niejawnego dla komórek skanowanych - auto const lookup = m_eventmap.find( asEventName ); - auto e = ( - lookup != m_eventmap.end() ? - lookup->second : - nullptr ); - if (e) - return e; // jak istnieje, to w porządku - if (asEventName.rfind(":scan") != std::string::npos) // jeszcze może być event niejawny - { // no to szukamy komórki pamięci o nazwie zawartej w evencie - std::string n = asEventName.substr(0, asEventName.length() - 5); // do dwukropka - if( m_trackmap.Find( TP_MEMCELL, n ) != nullptr ) // jeśli jest takowa komórka pamięci - e = new TEvent(n); // utworzenie niejawnego eventu jej odczytu - } - return e; // utworzony albo się nie udało -} +#endif void TGround::FirstInit() { // ustalanie zależności na scenerii przed wczytaniem pojazdów @@ -1747,14 +1710,14 @@ void TGround::FirstInit() WriteLog("InitNormals OK"); +#ifdef EU07_USE_OLD_GROUNDCODE InitTracks(); //łączenie odcinków ze sobą i przyklejanie eventów WriteLog("InitTracks OK"); - InitTraction(); //łączenie drutów ze sobą WriteLog("InitTraction OK"); - InitEvents(); - WriteLog("InitEvents OK"); + WriteLog( "InitEvents OK" ); +#endif InitLaunchers(); WriteLog("InitLaunchers OK"); @@ -1919,8 +1882,9 @@ bool TGround::Init(std::string File) } else if (str == "event") { +#ifdef EU07_USE_OLD_GROUNDCODE TEvent *tmp = new TEvent(); - tmp->Load(&parser, &pOrigin); + tmp->Load(&parser, pOrigin); if (tmp->Type == tp_Unknown) delete tmp; else @@ -1983,6 +1947,7 @@ bool TGround::Init(std::string File) } } } +#endif } else if (str == "rotate") { @@ -2211,7 +2176,7 @@ bool TGround::Init(std::string File) Global::iPause &= ~0x10; // koniec pauzy wczytywania return true; } - +#ifdef EU07_USE_OLD_GROUNDCODE bool TGround::InitEvents() { //łączenie eventów z pozostałymi obiektami TGroundNode *tmp, *trk; @@ -2346,14 +2311,14 @@ bool TGround::InitEvents() break; case tp_Visible: // ukrycie albo przywrócenie obiektu tmp = FindGroundNode(Current->asNodeName, TP_MODEL); // najpierw model - if (!tmp) - tmp = FindGroundNode(Current->asNodeName, TP_TRACTION); // może druty? if (!tmp) tmp = FindGroundNode(Current->asNodeName, TP_TRACK); // albo tory? + if (!tmp) + tmp = FindGroundNode(Current->asNodeName, TP_TRACTION); // może druty? if (tmp) Current->Params[9].nGroundNode = tmp; else - ErrorLog("Bad event: visibility event \"" + Current->asName + "\" cannot find model \"" + Current->asNodeName + "\""); + ErrorLog("Bad event: visibility event \"" + Current->asName + "\" cannot find item \"" + Current->asNodeName + "\""); Current->asNodeName = ""; break; case tp_Switch: // przełożenie zwrotnicy albo zmiana stanu obrotnicy @@ -2490,7 +2455,6 @@ void TGround::InitTracks() int iConnection; for (Current = nRootOfType[TP_TRACK]; Current; Current = Current->nNext) { - Track = Current->pTrack; // assign track events Track->AssignEvents( @@ -2513,7 +2477,6 @@ void TGround::InitTracks() FindEvent( Current->asName + ":eventall1" ), FindEvent( Current->asName + ":eventall2" ) ); } - switch (Track->eType) { case tt_Table: // obrotnicę też łączymy na starcie z innymi torami @@ -2523,8 +2486,8 @@ void TGround::InitTracks() // Track->ModelAssign(tmp->Model->GetContainer(NULL)); //wiązanie toru z modelem // obrotnicy Track->RaAssign( - Current, Model ? Model->Model : NULL, FindEvent(Current->asName + ":done"), - FindEvent(Current->asName + ":joined")); // wiązanie toru z modelem obrotnicy + Current, Model ? Model->Model : NULL, simulation::Events.FindEvent(Current->asName + ":done"), + simulation::Events.FindEvent(Current->asName + ":joined")); // wiązanie toru z modelem obrotnicy // break; //jednak połączę z sąsiednim, jak ma się wysypywać null track } if (!Model) // jak nie ma modelu @@ -2607,15 +2570,18 @@ void TGround::InitTracks() } break; case tt_Switch: // dla rozjazdów szukamy eventów sygnalizacji rozprucia - Track->AssignForcedEvents(FindEvent(Current->asName + ":forced+"), - FindEvent(Current->asName + ":forced-")); + Track->AssignForcedEvents( + FindEvent( Current->asName + ":forced+" ), + FindEvent( Current->asName + ":forced-" ) ); break; } std::string const name = Track->IsolatedName(); // pobranie nazwy odcinka izolowanego - if (!name.empty()) // jeśli została zwrócona nazwa - Track->IsolatedEventsAssign(FindEvent(name + ":busy"), FindEvent(name + ":free")); - if (Current->asName.substr(0, 1) == - "*") // możliwy portal, jeśli nie podłączony od striny 1 + if( !name.empty() ) // jeśli została zwrócona nazwa + Track->IsolatedEventsAssign( + FindEvent( name + ":busy" ), + FindEvent( name + ":free" ) ); + // możliwy portal, jeśli nie podłączony od striny 1 + if (Current->asName.substr(0, 1) == "*") if (!Track->CurrentPrev() && Track->CurrentNext()) Track->iCategoryFlag |= 0x100; // ustawienie flagi portalu } @@ -2631,7 +2597,7 @@ void TGround::InitTracks() Current = new TGroundNode(); // to nie musi mieć nazwy, nazwa w wyszukiwarce wystarczy // Current->asName=p->asName; //mazwa identyczna, jak nazwa odcinka izolowanego Current->MemCell = new TMemCell(NULL); // nowa komórka - m_trackmap.Add( TP_MEMCELL, p->asName, Current ); + m_nodemap.Add( TP_MEMCELL, p->asName, Current ); Current->nNext = nRootOfType[TP_MEMCELL]; // to nie powinno tutaj być, bo robi się śmietnik nRootOfType[TP_MEMCELL] = Current; @@ -2639,9 +2605,6 @@ void TGround::InitTracks() } p = p->Next(); } - // for (Current=nRootOfType[TP_TRACK];Current;Current=Current->nNext) - // if (Current->pTrack->eType==tt_Cross) - // Current->pTrack->ConnectionsLog(); //zalogowanie informacji o połączeniach } void TGround::InitTraction() @@ -2849,7 +2812,7 @@ void TGround::InitTraction() } delete[] nEnds; // nie potrzebne już }; - +#endif void TGround::TrackJoin(TGroundNode *Current) { // wyszukiwanie sąsiednich torów do podłączenia (wydzielone na użytek obrotnicy) TTrack *Track = Current->pTrack; @@ -2903,13 +2866,13 @@ bool TGround::InitLaunchers() MessageBox(0, "Cannot find Memory Cell for Event Launcher", "Error", MB_OK); } else - EventLauncher->MemCell = NULL; - EventLauncher->Event1 = (EventLauncher->asEvent1Name != "none") ? - FindEvent(EventLauncher->asEvent1Name) : - NULL; - EventLauncher->Event2 = (EventLauncher->asEvent2Name != "none") ? - FindEvent(EventLauncher->asEvent2Name) : - NULL; + EventLauncher->MemCell = nullptr; + EventLauncher->Event1 = ( EventLauncher->asEvent1Name != "none") ? + simulation::Events.FindEvent(EventLauncher->asEvent1Name) : + nullptr; + EventLauncher->Event2 = ( EventLauncher->asEvent2Name != "none") ? + simulation::Events.FindEvent(EventLauncher->asEvent2Name) : + nullptr; } return true; } @@ -3039,6 +3002,7 @@ TTraction * TGround::TractionNearestFind(glm::dvec3 &p, int dir, TGroundNode *n) return (nBest ? nBest->hvTraction : nullptr); }; +#ifdef EU07_USE_OLD_GROUNDCODE bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) { if( Event->bEnabled ) { @@ -3107,8 +3071,9 @@ bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) return true; } -bool TGround::EventConditon(TEvent *e) -{ // sprawdzenie spelnienia warunków dla eventu +// sprawdzenie spelnienia warunków dla eventu +bool TGround::EventConditon(TEvent *e){ + if (e->iFlags <= update_only) return true; // bezwarunkowo @@ -3122,56 +3087,51 @@ bool TGround::EventConditon(TEvent *e) WriteLog("Random integer: " + std::to_string(rprobability) + " / " + std::to_string(e->Params[10].asdouble)); return (e->Params[10].asdouble > rprobability); } - else if (e->iFlags & conditional_memcompare) - { // porównanie wartości + else if( e->iFlags & conditional_memcompare ) { + // porównanie wartości if( nullptr == e->Params[9].asMemCell ) { ErrorLog( "Event " + e->asName + " trying conditional_memcompare with nonexistent memcell" ); return true; // though this is technically error, we report success to maintain backward compatibility } - if (tmpEvent->Params[9].asMemCell->Compare( ( e->Params[ 10 ].asText != nullptr ? e->Params[10].asText : "" ), e->Params[11].asdouble, e->Params[12].asdouble, e->iFlags) ) { - //logowanie spełnionych warunków - LogComment = e->Params[9].asMemCell->Text() + " " + - to_string(e->Params[9].asMemCell->Value1(), 2, 8) + " " + - to_string(tmpEvent->Params[9].asMemCell->Value2(), 2, 8) + - " = "; - if (TestFlag(e->iFlags, conditional_memstring)) - LogComment += std::string(tmpEvent->Params[10].asText); - else - LogComment += "*"; - if (TestFlag(tmpEvent->iFlags, conditional_memval1)) - LogComment += " " + to_string(tmpEvent->Params[11].asdouble, 2, 8); - else - LogComment += " *"; - if (TestFlag(tmpEvent->iFlags, conditional_memval2)) - LogComment += " " + to_string(tmpEvent->Params[12].asdouble, 2, 8); - else - LogComment += " *"; - WriteLog(LogComment); - return true; - } - //else if (Global::iWriteLogEnabled && DebugModeFlag) //zawsze bo to bardzo istotne w debugowaniu scenariuszy - else - { // nie zgadza się, więc sprawdzmy, co - LogComment = e->Params[9].asMemCell->Text() + " " + - to_string(e->Params[9].asMemCell->Value1(), 2, 8) + " " + - to_string(tmpEvent->Params[9].asMemCell->Value2(), 2, 8) + - " != "; - if (TestFlag(e->iFlags, conditional_memstring)) - LogComment += (tmpEvent->Params[10].asText); - else - LogComment += "*"; - if (TestFlag(tmpEvent->iFlags, conditional_memval1)) - LogComment += " " + to_string(tmpEvent->Params[11].asdouble, 2, 8); - else - LogComment += " *"; - if (TestFlag(tmpEvent->iFlags, conditional_memval2)) - LogComment += " " + to_string(tmpEvent->Params[12].asdouble, 2, 8); - else - LogComment += " *"; - WriteLog(LogComment); - } + auto const comparisonresult = + tmpEvent->Params[ 9 ].asMemCell->Compare( + ( e->Params[ 10 ].asText != nullptr ? + e->Params[ 10 ].asText : + "" ), + e->Params[ 11 ].asdouble, + e->Params[ 12 ].asdouble, + e->iFlags ); + + std::string comparisonlog = "Type: MemCompare - "; + + comparisonlog += + "[" + e->Params[ 9 ].asMemCell->Text() + "]" + + " [" + to_string( e->Params[ 9 ].asMemCell->Value1(), 2 ) + "]" + + " [" + to_string( tmpEvent->Params[ 9 ].asMemCell->Value2(), 2 ) + "]"; + + comparisonlog += ( + true == comparisonresult ? + " == " : + " != " ); + + comparisonlog += ( + TestFlag( e->iFlags, conditional_memstring ) ? + "[" + std::string( tmpEvent->Params[ 10 ].asText ) + "]" : + "[*]" ); + comparisonlog += ( + TestFlag( tmpEvent->iFlags, conditional_memval1 ) ? + " [" + to_string( tmpEvent->Params[ 11 ].asdouble, 2 ) + "]" : + " [*]" ); + comparisonlog += ( + TestFlag( tmpEvent->iFlags, conditional_memval2 ) ? + " [" + to_string( tmpEvent->Params[ 12 ].asdouble, 2 ) + "]" : + " [*]" ); + + WriteLog( comparisonlog ); + return comparisonresult; } + // unrecognized request return false; }; @@ -3227,16 +3187,16 @@ bool TGround::CheckQuery() &tmpEvent->Params[ 4 ].nGroundNode->pCenter ); } //if (DebugModeFlag) - WriteLog("Type: UpdateValues & Track command - " + - tmpEvent->Params[5].asMemCell->Text() + " " + - std::to_string( tmpEvent->Params[ 5 ].asMemCell->Value1() ) + " " + - std::to_string( tmpEvent->Params[ 5 ].asMemCell->Value2() ) ); + WriteLog("Type: UpdateValues & Track command - [" + + tmpEvent->Params[5].asMemCell->Text() + "] [" + + to_string( tmpEvent->Params[ 5 ].asMemCell->Value1(), 2 ) + "] [" + + to_string( tmpEvent->Params[ 5 ].asMemCell->Value2(), 2 ) + "]" ); } else //if (DebugModeFlag) - WriteLog("Type: UpdateValues - " + - tmpEvent->Params[5].asMemCell->Text() + " " + - std::to_string( tmpEvent->Params[ 5 ].asMemCell->Value1() ) + " " + - std::to_string( tmpEvent->Params[ 5 ].asMemCell->Value2() ) ); + WriteLog("Type: UpdateValues - [" + + tmpEvent->Params[5].asMemCell->Text() + "] [" + + to_string( tmpEvent->Params[ 5 ].asMemCell->Value1(), 2 ) + "] [" + + to_string( tmpEvent->Params[ 5 ].asMemCell->Value2(), 2 ) + "]" ); } break; case tp_GetValues: @@ -3255,24 +3215,26 @@ bool TGround::CheckQuery() WriteLog("Type: GetValues"); break; case tp_PutValues: - if (tmpEvent->Activator) - { - loc.X = - -tmpEvent->Params[3].asdouble; // zamiana, bo fizyka ma inaczej niż sceneria - loc.Y = tmpEvent->Params[5].asdouble; - loc.Z = tmpEvent->Params[4].asdouble; + if (tmpEvent->Activator) { + // zamiana, bo fizyka ma inaczej niż sceneria + loc.X = -tmpEvent->Params[3].asdouble; + loc.Y = tmpEvent->Params[5].asdouble; + loc.Z = tmpEvent->Params[4].asdouble; if (tmpEvent->Activator->Mechanik) // przekazanie rozkazu do AI tmpEvent->Activator->Mechanik->PutCommand( tmpEvent->Params[0].asText, tmpEvent->Params[1].asdouble, tmpEvent->Params[2].asdouble, loc); - else - { // przekazanie do pojazdu + else { + // przekazanie do pojazdu tmpEvent->Activator->MoverParameters->PutCommand( tmpEvent->Params[0].asText, tmpEvent->Params[1].asdouble, tmpEvent->Params[2].asdouble, loc); } + WriteLog("Type: PutValues - [" + + std::string(tmpEvent->Params[0].asText) + "] [" + + to_string( tmpEvent->Params[ 1 ].asdouble, 2 ) + "] [" + + to_string( tmpEvent->Params[ 2 ].asdouble, 2 ) + "]" ); } - WriteLog("Type: PutValues"); break; case tp_Lights: if (tmpEvent->Params[9].asModel) @@ -3342,11 +3304,10 @@ bool TGround::CheckQuery() if (tmpEvent->Params[9].asTrack) { // prędkość na zwrotnicy może być ograniczona z góry we wpisie, większej się nie // ustawi eventem - WriteLog("type: TrackVel"); - // WriteLog("Vel: ",tmpEvent->Params[0].asdouble); + WriteLog("Type: TrackVel"); tmpEvent->Params[9].asTrack->VelocitySet(tmpEvent->Params[0].asdouble); if (DebugModeFlag) // wyświetlana jest ta faktycznie ustawiona - WriteLog("vel: ", tmpEvent->Params[9].asTrack->VelocityGet()); + WriteLog(" - velocity: ", tmpEvent->Params[9].asTrack->VelocityGet()); } break; case tp_DynVel: @@ -3358,7 +3319,7 @@ bool TGround::CheckQuery() if (bCondition || (tmpEvent->iFlags & conditional_anyelse)) // warunek spelniony albo było użyte else { - WriteLog("Multiple passed"); + WriteLog("Type: Multi-event"); for (i = 0; i < 8; ++i) { // dodawane do kolejki w kolejności zapisania if( tmpEvent->Params[ i ].asEvent ) { @@ -3413,7 +3374,7 @@ bool TGround::CheckQuery() tmpEvent->iFlags & ( update_memstring | update_memval1 | update_memval2 ) ); WriteLog( - "whois request (" + to_string( tmpEvent->iFlags ) + ") " + "Type: WhoIs (" + to_string( tmpEvent->iFlags ) + ") - " + "[name: " + tmpEvent->Activator->MoverParameters->TypeName + "], " + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " + "[obstacle distance: " + to_string( collisiondistance, 2 ) + " m]" ); @@ -3427,7 +3388,7 @@ bool TGround::CheckQuery() tmpEvent->iFlags & ( update_memstring | update_memval1 | update_memval2 ) ); WriteLog( - "whois request (" + to_string( tmpEvent->iFlags ) + ") " + "Type: WhoIs (" + to_string( tmpEvent->iFlags ) + ") - " + "[load type: " + tmpEvent->Activator->MoverParameters->LoadType + "], " + "[current load: " + to_string( tmpEvent->Activator->MoverParameters->Load, 2 ) + "], " + "[max load: " + to_string( tmpEvent->Activator->MoverParameters->MaxLoad, 2 ) + "]" ); @@ -3442,7 +3403,7 @@ bool TGround::CheckQuery() tmpEvent->iFlags & (update_memstring | update_memval1 | update_memval2)); WriteLog( - "whois request (" + to_string( tmpEvent->iFlags ) + ") " + "Type: WhoIs (" + to_string( tmpEvent->iFlags ) + ") - " + "[destination: " + tmpEvent->Activator->asDestination + "], " + "[direction: " + to_string( tmpEvent->Activator->DirectionGet() ) + "], " + "[engine power: " + to_string( tmpEvent->Activator->MoverParameters->Power, 2 ) + "]" ); @@ -3476,12 +3437,12 @@ bool TGround::CheckQuery() case tp_Voltage: // zmiana napięcia w zasilaczu (TractionPowerSource) if (tmpEvent->Params[9].psPower) { // na razie takie chamskie ustawienie napięcia zasilania - WriteLog("type: Voltage"); + WriteLog("Type: Voltage"); tmpEvent->Params[9].psPower->VoltageSet(tmpEvent->Params[0].asdouble); } case tp_Friction: // zmiana tarcia na scenerii { // na razie takie chamskie ustawienie napięcia zasilania - WriteLog("type: Friction"); + WriteLog("Type: Friction"); Global::fFriction = (tmpEvent->Params[0].asdouble); } break; @@ -3492,6 +3453,7 @@ bool TGround::CheckQuery() } // while return true; } +#endif void TGround::UpdatePhys(double dt, int iter) { // aktualizacja fizyki stałym krokiem: dt=krok czasu [s], dt*iter=czas od ostatnich przeliczeń @@ -3574,13 +3536,6 @@ bool TGround::Update(double dt, int iter) return true; }; -// updates scene lights array -void -TGround::Update_Lights() { - - m_lights.update(); -} - void TGround::Update_Hidden() { @@ -4179,7 +4134,7 @@ void TGround::DynamicRemove(TDynamicObject *dyn) (*n) = node->nNext; // pominięcie na liście Global::TrainDelete(d); // remove potential entries in the light array - m_lights.remove( d ); + simulation::Lights.remove( d ); d = d->Next(); // przejście do kolejnego pojazdu, póki jeszcze jest delete node; // usuwanie fizyczne z pamięci } diff --git a/Ground.h b/Ground.h index b79ef633..f045c23b 100644 --- a/Ground.h +++ b/Ground.h @@ -10,16 +10,13 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "GL/glew.h" -#include "openglgeometrybank.h" -#include "VBO.h" + #include "Classes.h" -#include "ResourceManager.h" #include "material.h" #include "dumb3d.h" -#include "Float3d.h" #include "Names.h" #include "lightarray.h" +#include "simulation.h" typedef int TGroundNodeType; // Ra: zmniejszone liczby, aby zrobić tabelkę i zoptymalizować wyszukiwanie @@ -97,7 +94,7 @@ struct TGroundVertex // ground node holding single, unique piece of 3d geometry. TBD, TODO: unify this with basic 3d model node struct piece_node { std::vector vertices; - geometry_handle geometry { 0,0 }; // geometry prepared for drawing + geometry_handle geometry { 0, 0 }; // geometry prepared for drawing }; // obiekt scenerii @@ -142,9 +139,9 @@ public: int iFlags; // tryb przezroczystości: 0x10-nieprz.,0x20-przezroczysty,0x30-mieszany material_handle m_material; // główna (jedna) tekstura obiektu glm::vec3 - Ambient{ 1.0f, 1.0f, 1.0f }, - Diffuse{ 1.0f, 1.0f, 1.0f }, - Specular{ 1.0f, 1.0f, 1.0f }; // oświetlenie + Ambient{ 0.2f }, + Diffuse{ 1.0f }, + Specular{ 0.0f }; // oświetlenie double fLineThickness; // McZapkie-120702: grubosc linii bool bVisible; @@ -155,17 +152,17 @@ public: void InitNormals(); void RenderHidden(); // obsługa dźwięków i wyzwalaczy zdarzeń }; - +/* struct bounding_area { glm::vec3 center; // mid point of the rectangle float radius { 0.0f }; // radius of the bounding sphere }; - +*/ class TSubRect : /*public Resource,*/ public CMesh { // sektor składowy kwadratu kilometrowego public: - bounding_area m_area; + scene::bounding_area m_area; unsigned int m_framestamp { 0 }; // id of last rendered gfx frame int iTracks = 0; // ilość torów w (tTracks) TTrack **tTracks = nullptr; // tory do renderowania pojazdów @@ -219,6 +216,7 @@ private: public: virtual ~TGroundRect(); // pobranie wskaźnika do małego kwadratu, utworzenie jeśli trzeba + inline TSubRect * SafeGetSubRect(int iCol, int iRow) { if( !pSubRects ) { // utworzenie małych kwadratów @@ -227,6 +225,7 @@ public: return pSubRects + iRow * iNumSubRects + iCol; // zwrócenie właściwego }; // pobranie wskaźnika do małego kwadratu, bez tworzenia jeśli nie ma + inline TSubRect *FastGetSubRect(int iCol, int iRow) const { return ( pSubRects ? @@ -234,8 +233,9 @@ public: nullptr); }; void NodeAdd( TGroundNode *Node ); // dodanie obiektu do sektora na etapie rozdzielania na sektory // compares two provided nodes, returns true if their content can be merged - bool mergeable( TGroundNode const &Left, TGroundNode const &Right ); + bool mergeable( TGroundNode const &Left, TGroundNode const &Right ) const; // optymalizacja obiektów w sektorach + inline void Optimize() { if( pSubRects ) { for( int i = iNumSubRects * iNumSubRects - 1; i >= 0; --i ) { @@ -253,20 +253,23 @@ class TGround TSubRect srGlobal; // zawiera obiekty globalne (na razie wyzwalacze czasowe) TGroundNode *nRootDynamic = nullptr; // lista pojazdów TGroundNode *nRootOfType[ TP_LAST ]; // tablica grupująca obiekty, przyspiesza szukanie +#ifdef EU07_USE_OLD_GROUNDCODE TEvent *RootEvent = nullptr; // lista zdarzeń TEvent *QueryRootEvent = nullptr, *tmpEvent = nullptr; typedef std::unordered_map event_map; event_map m_eventmap; - TNames m_trackmap; - light_array m_lights; // collection of dynamic light sources present in the scene +#endif + TNames m_nodemap; vector3 pOrigin; vector3 aRotate; bool bInitDone = false; private: // metody prywatne - bool EventConditon(TEvent *e); +#ifdef EU07_USE_OLD_GROUNDCODE + bool EventConditon(TEvent *e); +#endif public: bool bDynamicRemove = false; // czy uruchomić procedurę usuwania pojazdów @@ -276,9 +279,11 @@ class TGround void Free(); bool Init( std::string File ); void FirstInit(); +#ifdef EU07_USE_OLD_GROUNDCODE void InitTracks(); void InitTraction(); bool InitEvents(); +#endif bool InitLaunchers(); TTrack * FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclude); TTraction * FindTraction(glm::dvec3 const &Point, int &iConnection, TGroundNode *Exclude); @@ -286,15 +291,16 @@ class TGround TGroundNode * AddGroundNode(cParser *parser); void UpdatePhys(double dt, int iter); // aktualizacja fizyki stałym krokiem bool Update(double dt, int iter); // aktualizacja przesunięć zgodna z FPS - void Update_Lights(); // updates scene lights array void Update_Hidden(); // updates invisible elements of the scene - bool AddToQuery(TEvent *Event, TDynamicObject *Node); bool GetTraction(TDynamicObject *model); +#ifdef EU07_USE_OLD_GROUNDCODE + bool AddToQuery( TEvent *Event, TDynamicObject *Node ); bool CheckQuery(); +#endif TGroundNode * DynamicFindAny(std::string const &Name); TGroundNode * DynamicFind(std::string const &Name); void DynamicList(bool all = false); - TGroundNode * FindGroundNode(std::string asNameToFind, TGroundNodeType iNodeType); + TGroundNode * FindGroundNode(std::string const &asNameToFind, TGroundNodeType const iNodeType); TGroundRect * GetRect( double x, double z ); TSubRect * GetSubRect( int iCol, int iRow ); inline @@ -310,8 +316,9 @@ class TGround inline int GetColFromX(double x) { return (int)(x / fSubRectSize + fHalfTotalNumSubRects); }; +#ifdef EU07_USE_OLD_GROUNDCODE TEvent * FindEvent(const std::string &asEventName); - TEvent * FindEventScan(const std::string &asEventName); +#endif void TrackJoin(TGroundNode *Current); private: @@ -330,10 +337,8 @@ class TGround void WyslijUszkodzenia(const std::string &t, char fl); void WyslijObsadzone(); // -> skladanie wielu pojazdow void RadioStop(vector3 pPosition); - TDynamicObject * DynamicNearest(vector3 pPosition, double distance = 20.0, - bool mech = false); - TDynamicObject * CouplerNearest(vector3 pPosition, double distance = 20.0, - bool mech = false); + TDynamicObject * DynamicNearest(vector3 pPosition, double distance = 20.0, bool mech = false); + TDynamicObject * CouplerNearest(vector3 pPosition, double distance = 20.0, bool mech = false); void DynamicRemove(TDynamicObject *dyn); void TerrainRead(std::string const &f); void TerrainWrite(); diff --git a/MemCell.cpp b/MemCell.cpp index 9a9ad4fe..0bf32bf3 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -25,17 +25,18 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- +// legacy constructor TMemCell::TMemCell(vector3 *p) { fValue1 = fValue2 = 0; - vPosition = - p ? *p : vector3(0, 0, 0); // ustawienie współrzędnych, bo do TGroundNode nie ma dostępu + m_location = + p ? *p : glm::dvec3(); // ustawienie współrzędnych, bo do TGroundNode nie ma dostępu bCommand = false; // komenda wysłana OnSent = NULL; } -void TMemCell::Init() -{ -} + +TMemCell::TMemCell( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} + void TMemCell::UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ) { if (CheckMask & update_memadd) @@ -103,10 +104,17 @@ TCommandType TMemCell::CommandCheck() bool TMemCell::Load(cParser *parser) { std::string token; - parser->getTokens(1, false); // case sensitive - *parser >> szText; - parser->getTokens( 2, false ); +#ifdef EU07_USE_OLD_GROUNDCODE + parser->getTokens( 3, false ); *parser +#else + parser->getTokens( 6, false ); + *parser + >> m_location.x + >> m_location.y + >> m_location.z +#endif + >> szText >> fValue1 >> fValue2; parser->getTokens(); @@ -150,11 +158,6 @@ bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, && ( !TestFlag( CheckMask, conditional_memval2 ) || ( fValue2 == fTestValue2 ) ) ); }; -bool TMemCell::Render() -{ - return true; -} - bool TMemCell::IsVelocity() { // sprawdzenie, czy event odczytu tej komórki ma być do skanowania, czy do kolejkowania if (eCommand == cm_SetVelocity) diff --git a/MemCell.h b/MemCell.h index a4384b3f..35637431 100644 --- a/MemCell.h +++ b/MemCell.h @@ -10,52 +10,59 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "Classes.h" +#include "scenenode.h" #include "dumb3d.h" +#include "names.h" + +class TMemCell : public editor::basic_node { -class TMemCell -{ private: - Math3D::vector3 vPosition; + // content std::string szText; - double fValue1; - double fValue2; - TCommandType eCommand; - bool bCommand; // czy zawiera komendę dla zatrzymanego AI - TEvent *OnSent; // event dodawany do kolejki po wysłaniu komendy zatrzymującej skład + double fValue1 { 0.0 }; + double fValue2 { 0.0 }; + // other + TCommandType eCommand { cm_Unknown }; + bool bCommand { false }; // czy zawiera komendę dla zatrzymanego AI + TEvent *OnSent { nullptr }; // event dodawany do kolejki po wysłaniu komendy zatrzymującej skład public: std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac + + TMemCell( scene::node_data const &Nodedata ); + // legacy constructor TMemCell( Math3D::vector3 *p ); - void Init(); - void UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); - bool Load(cParser *parser); - void PutCommand( TController *Mech, Math3D::vector3 *Loc ); - bool Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ); - bool Render(); - inline std::string const &Text() { return szText; } - inline double Value1() - { - return fValue1; - }; - inline double Value2() - { - return fValue2; - }; - inline Math3D::vector3 Position() - { - return vPosition; - }; - inline TCommandType Command() - { - return eCommand; - }; - inline bool StopCommand() - { - return bCommand; - }; + + void + UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); + bool + Load(cParser *parser); + void + PutCommand( TController *Mech, Math3D::vector3 *Loc ); + bool + Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ); + std::string const & + Text() const { + return szText; } + double + Value1() const { + return fValue1; }; + double + Value2() const { + return fValue2; }; + TCommandType + Command() const { + return eCommand; }; + bool + StopCommand() const { + return bCommand; }; void StopCommandSent(); TCommandType CommandCheck(); bool IsVelocity(); void AssignEvents(TEvent *e); }; +class memory_manager : public basic_table { + +}; + //--------------------------------------------------------------------------- diff --git a/Model3d.cpp b/Model3d.cpp index 2b74dd34..081b0709 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1023,7 +1023,7 @@ TSubModel::convert( TGroundNode &Groundnode ) const { if( m_geometry == null_handle ) { return; } - std::size_t vertexcount { 0 }; + int vertexcount { 0 }; std::vector importedvertices; TGroundVertex vertex, vertex1, vertex2; for( auto const &sourcevertex : GfxRenderer.Vertices( m_geometry ) ) { @@ -1038,31 +1038,29 @@ TSubModel::convert( TGroundNode &Groundnode ) const { importedvertices.emplace_back( vertex2 ); importedvertices.emplace_back( vertex ); } + // start a new triangle + vertexcount = -1; } ++vertexcount; - if( vertexcount > 2 ) { vertexcount = 0; } // start new triangle if needed } if( Groundnode.Piece == nullptr ) { Groundnode.Piece = new piece_node(); } Groundnode.iNumVerts = importedvertices.size(); if( Groundnode.iNumVerts > 0 ) { - + // assign imported geometry to the node... Groundnode.Piece->vertices.swap( importedvertices ); - + // ...and calculate center... for( auto const &vertex : Groundnode.Piece->vertices ) { Groundnode.pCenter += vertex.position; } Groundnode.pCenter /= Groundnode.iNumVerts; - - double r { 0.0 }; - double tf; + // ...and bounding area + double squareradius { 0.0 }; for( auto const &vertex : Groundnode.Piece->vertices ) { - tf = glm::length2( vertex.position - glm::dvec3{ Groundnode.pCenter } ); - if( tf > r ) - r = tf; + squareradius = std::max( squareradius, glm::length2( vertex.position - glm::dvec3{ Groundnode.pCenter } ) ); } - Groundnode.fSquareRadius += r; + Groundnode.fSquareRadius += squareradius; } } diff --git a/Names.h b/Names.h index 2a3addb6..5f76306a 100644 --- a/Names.h +++ b/Names.h @@ -65,3 +65,47 @@ private: // members: typemap_map m_maps; // list of object maps of types specified so far }; + +template +class basic_table { + +public: +// destructor + ~basic_table() { + for( auto *item : m_items ) { + delete item; } } +// methods + // adds provided item to the collection. returns: true if there's no duplicate with the same name, false otherwise + bool + insert( Type_ *Item ) { + m_items.emplace_back( Item ); + auto const itemname = Item->name(); + if( ( true == itemname.empty() ) || ( itemname == "none" ) ) { + return true; + } + auto const itemhandle { m_items.size() - 1 }; + // add item name to the map + auto mapping = m_itemmap.emplace( itemname, itemhandle ); + if( true == mapping.second ) { + return true; + } + // cell with this name already exists; update mapping to point to the new one, for backward compatibility + mapping.first->second = itemhandle; + return false; } + // locates item with specified name. returns pointer to the item, or nullptr + Type_ * + find( std::string const &Name ) { + auto lookup = m_itemmap.find( Name ); + return ( + lookup != m_itemmap.end() ? + m_items[ lookup->second ] : + nullptr ); } + +protected: +// types + using type_sequence = std::deque; + using type_map = std::unordered_map; +// members + type_sequence m_items; + type_map m_itemmap; +}; diff --git a/Track.cpp b/Track.cpp index e84652e5..041842bf 100644 --- a/Track.cpp +++ b/Track.cpp @@ -139,13 +139,12 @@ void TIsolated::Modify(int i, TDynamicObject *o) }; // tworzenie nowego odcinka ruchu -TTrack::TTrack(TGroundNode *g) : - pMyNode( g ) // Ra: proteza, żeby tor znał swoją nazwę TODO: odziedziczyć TTrack z TGroundNode -{ - fRadiusTable[ 0 ] = 0.0; - fRadiusTable[ 1 ] = 0.0; - nFouling[ 0 ] = nullptr; - nFouling[ 1 ] = nullptr; +TTrack::TTrack( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} + +// legacy constructor +TTrack::TTrack( std::string Name ) { + + m_name = Name; } TTrack::~TTrack() @@ -182,7 +181,7 @@ TTrack * TTrack::Create400m(int what, double dx) { // tworzenie toru do wstawiania taboru podczas konwersji na E3D TGroundNode *tmp = new TGroundNode(TP_TRACK); // node TTrack *trk = tmp->pTrack; - trk->bVisible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur + trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur trk->iCategoryFlag = what; // taki sam typ plus informacja, że dodatkowy trk->Init(); // utworzenie segmentu trk->Segment->Init(vector3(-dx, 0, 0), vector3(-dx, 0, 400), 10.0, 0, 0); // prosty @@ -195,12 +194,10 @@ TTrack * TTrack::Create400m(int what, double dx) TTrack * TTrack::NullCreate(int dir) { // tworzenie toru wykolejającego od strony (dir), albo pętli dla samochodów - TGroundNode *tmp = new TGroundNode(TP_TRACK), *tmp2 = NULL; // node + TGroundNode *tmp = new TGroundNode( TP_TRACK ); + TGroundNode *tmp2 = nullptr; // node TTrack *trk = tmp->pTrack; // tor; UWAGA! obrotnica może generować duże ilości tego - // tmp->iType=TP_TRACK; - // TTrack* trk=new TTrack(tmp); //tor; UWAGA! obrotnica może generować duże ilości tego - // tmp->pTrack=trk; - trk->bVisible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur + trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur // trk->iTrapezoid=1; //są przechyłki do uwzględniania w rysowaniu trk->iCategoryFlag = (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy float r1, r2; @@ -216,25 +213,21 @@ TTrack * TTrack::NullCreate(int dir) case 0: p1 = Segment->FastGetPoint_0(); p2 = p1 - 450.0 * Normalize(Segment->GetDirection1()); - trk->Segment->Init(p1, p2, 5, -RadToDeg(r1), - 70.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk->Segment->Init(p1, p2, 5, -RadToDeg(r1), 70.0); ConnectPrevPrev(trk, 0); break; case 1: p1 = Segment->FastGetPoint_1(); p2 = p1 - 450.0 * Normalize(Segment->GetDirection2()); - trk->Segment->Init(p1, p2, 5, RadToDeg(r2), - 70.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk->Segment->Init(p1, p2, 5, RadToDeg(r2), 70.0); ConnectNextPrev(trk, 0); break; case 3: // na razie nie możliwe p1 = SwitchExtension->Segments[1]->FastGetPoint_1(); // koniec toru drugiego zwrotnicy - p2 = p1 - - 450.0 * - Normalize( - SwitchExtension->Segments[1]->GetDirection2()); // przedłużenie na wprost - trk->Segment->Init(p1, p2, 5, RadToDeg(r2), - 70.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + p2 = p1 - 450.0 * Normalize( SwitchExtension->Segments[1]->GetDirection2()); // przedłużenie na wprost + trk->Segment->Init(p1, p2, 5, RadToDeg(r2), 70.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce ConnectNextPrev(trk, 0); // trk->ConnectPrevNext(trk,dir); SetConnections(1); // skopiowanie połączeń @@ -251,13 +244,13 @@ TTrack * TTrack::NullCreate(int dir) TTrack *trk2 = tmp2->pTrack; trk2->iCategoryFlag = (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy - trk2->bVisible = false; + trk2->m_visible = false; trk2->fVelocity = 20.0; // zawracanie powoli trk2->fRadius = 20.0; // promień, aby się dodawało do tabelki prędkości i liczyło // narastająco trk2->Init(); // utworzenie segmentu - trk->pMyNode->asName = pMyNode->asName + ":loopstart"; - trk2->pMyNode->asName = pMyNode->asName + ":loopfinish"; + trk->m_name = m_name + ":loopstart"; + trk2->m_name = m_name + ":loopfinish"; switch (dir) { //łączenie z nowym torem case 0: @@ -320,8 +313,8 @@ void TTrack::ConnectPrevNext(TTrack *pTrack, int typ) iPrevDirection = typ | 1; // 1:zwykły lub pierwszy zwrotnicy, 3:drugi zwrotnicy pTrack->trNext = this; pTrack->iNextDirection = 0; - if (bVisible) - if (pTrack->bVisible) + if (m_visible) + if (pTrack->m_visible) if (eType == tt_Normal) // jeśli łączone są dwa normalne if (pTrack->eType == tt_Normal) if ((fTrackWidth != @@ -340,8 +333,8 @@ void TTrack::ConnectNextPrev(TTrack *pTrack, int typ) iNextDirection = ((pTrack->eType == tt_Switch) ? 0 : (typ & 2)); pTrack->trPrev = this; pTrack->iPrevDirection = 1; - if (bVisible) - if (pTrack->bVisible) + if (m_visible) + if (pTrack->m_visible) if (eType == tt_Normal) // jeśli łączone są dwa normalne if (pTrack->eType == tt_Normal) if ((fTrackWidth != @@ -363,25 +356,15 @@ void TTrack::ConnectNextNext(TTrack *pTrack, int typ) } } -vector3 MakeCPoint(vector3 p, double d, double a1, double a2) -{ - vector3 cp = vector3(0, 0, 1); - cp.RotateX(DegToRad(a2)); - cp.RotateY(DegToRad(a1)); - cp = cp * d + p; - return cp; -} - vector3 LoadPoint(cParser *parser) { // pobranie współrzędnych punktu vector3 p; - std::string token; parser->getTokens(3); *parser >> p.x >> p.y >> p.z; return p; } -void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) +void TTrack::Load(cParser *parser, vector3 pOrigin) { // pobranie obiektu trajektorii ruchu vector3 pt, vec, p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań double a1, a2, r1, r2, r3, r4; @@ -464,8 +447,8 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) } parser->getTokens(); *parser >> token; - bVisible = (token.compare("vis") == 0); // visible - if (bVisible) + m_visible = (token.compare("vis") == 0); // visible + if (m_visible) { parser->getTokens(); *parser >> str; // railtex @@ -718,24 +701,28 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) } else if (str == "angle1") { // kąt ścięcia końca od strony 1 + // NOTE: not used/implemented parser->getTokens(); *parser >> a1; - Segment->AngleSet(0, a1); + //Segment->AngleSet(0, a1); } else if (str == "angle2") { // kąt ścięcia końca od strony 2 + // NOTE: not used/implemented parser->getTokens(); *parser >> a2; - Segment->AngleSet(1, a2); + //Segment->AngleSet(1, a2); } else if (str == "fouling1") { // wskazanie modelu ukresu w kierunku 1 + // NOTE: not used/implemented parser->getTokens(); *parser >> token; // nFouling[0]= } else if (str == "fouling2") { // wskazanie modelu ukresu w kierunku 2 + // NOTE: not used/implemented parser->getTokens(); *parser >> token; // nFouling[1]= @@ -749,19 +736,26 @@ void TTrack::Load(cParser *parser, vector3 pOrigin, std::string name) // ograniczenie dla pantografujących) } else - ErrorLog("Unknown property: \"" + str + "\" in track \"" + name + "\""); + ErrorLog("Unknown property: \"" + str + "\" in track \"" + m_name + "\""); parser->getTokens(); *parser >> token; str = token; } // alternatywny zapis nazwy odcinka izolowanego - po znaku "@" w nazwie toru if (!pIsolated) - if ((i = name.find("@")) != std::string::npos) - if (i < name.length()) // nie może być puste + if ((i = m_name.find("@")) != std::string::npos) + if (i < m_name.length()) // nie może być puste { - pIsolated = TIsolated::Find(name.substr(i + 1, name.length())); - name = name.substr(0, i - 1); // usunięcie z nazwy + pIsolated = TIsolated::Find(m_name.substr(i + 1, m_name.length())); + m_name = m_name.substr(0, i - 1); // usunięcie z nazwy } + + // calculate path location + m_location = glm::dvec3{ ( + CurrentSegment()->FastGetPoint_0() + + CurrentSegment()->FastGetPoint( 0.5 ) + + CurrentSegment()->FastGetPoint_1() ) + / 3.0 }; } // TODO: refactor this mess @@ -771,7 +765,7 @@ bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent if( NewEvent0 == nullptr ) { if( false == asEvent0Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEvent0Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + ErrorLog( "Bad event: event \"" + asEvent0Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; } } @@ -789,7 +783,7 @@ bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent if( NewEvent1 == nullptr ) { if( false == asEvent1Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEvent1Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + ErrorLog( "Bad event: event \"" + asEvent1Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; } } @@ -807,7 +801,7 @@ bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent if( NewEvent2 == nullptr ) { if( false == asEvent2Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEvent2Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + ErrorLog( "Bad event: event \"" + asEvent2Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; } } @@ -832,7 +826,7 @@ bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEv if( NewEvent0 == nullptr ) { if( false == asEventall0Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEventall0Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + ErrorLog( "Bad event: event \"" + asEventall0Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; } } @@ -850,7 +844,7 @@ bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEv if( NewEvent1 == nullptr ) { if( false == asEventall1Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEventall1Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + ErrorLog( "Bad event: event \"" + asEventall1Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; } } @@ -868,7 +862,7 @@ bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEv if( NewEvent2 == nullptr ) { if( false == asEventall2Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEventall2Name + "\" assigned to track \"" + pMyNode->asName + "\" does not exist" ); + ErrorLog( "Bad event: event \"" + asEventall2Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; } } @@ -921,7 +915,7 @@ bool TTrack::IsolatedEventsAssign(TEvent *busy, TEvent *free) return false; }; -// ABu: przeniesione z Track.h i poprawione!!! +// ABu: przeniesione z Path.h i poprawione!!! bool TTrack::AddDynamicObject(TDynamicObject *Dynamic) { // dodanie pojazdu do trajektorii // Ra: tymczasowo wysyłanie informacji o zajętości konkretnego toru @@ -935,9 +929,9 @@ bool TTrack::AddDynamicObject(TDynamicObject *Dynamic) // jeśli multiplayer if( true == Dynamics.empty() ) { // pierwszy zajmujący - if( pMyNode->asName != "none" ) { + if( m_name != "none" ) { // przekazanie informacji o zajętości toru - Global::pGround->WyslijString( pMyNode->asName, 8 ); + Global::pGround->WyslijString( m_name, 8 ); } } } @@ -1027,9 +1021,9 @@ bool TTrack::RemoveDynamicObject(TDynamicObject *Dynamic) // jeśli multiplayer if( true == Dynamics.empty() ) { // jeśli już nie ma żadnego - if( pMyNode->asName != "none" ) { + if( m_name != "none" ) { // przekazanie informacji o zwolnieniu toru - Global::pGround->WyslijString( pMyNode->asName, 9 ); + Global::pGround->WyslijString( m_name, 9 ); } } } @@ -1079,7 +1073,12 @@ void TTrack::RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joi }; // wypełnianie tablic VBO + +#ifdef EU07_USE_OLD_GROUNDCODE +void TTrack::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ) { +#else void TTrack::create_geometry( geometrybank_handle const &Bank ) { +#endif // Ra: trzeba rozdzielić szyny od podsypki, aby móc grupować wg tekstur auto const fHTW = 0.5f * std::abs(fTrackWidth); auto const side = std::abs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza @@ -1116,7 +1115,11 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { normal2 = normal1; } - auto const origin { pMyNode->m_rootposition }; +#ifdef EU07_USE_OLD_GROUNDCODE + if( Bank != 0 ) { + m_origin = Origin; + } +#endif float roll1, roll2; switch (iCategoryFlag & 15) @@ -1326,7 +1329,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } } vertex_array vertices; - Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); + Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); if( ( Bank != 0 ) && ( true == Geometry2.empty() ) ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } @@ -1339,18 +1342,18 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { // szyny - generujemy dwie, najwyżej rysować się będzie jedną vertex_array vertices; if( ( Bank != 0 ) && ( true == Geometry1.empty() ) ) { - Segment->RenderLoft( vertices, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // reuse the scratchpad - Segment->RenderLoft( vertices, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } if( ( Bank == 0 ) && ( false == Geometry1.empty() ) ) { // special variant, replace existing data for a turntable track - Segment->RenderLoft( vertices, origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); GfxRenderer.Replace( vertices, Geometry1[ 0 ] ); vertices.clear(); // reuse the scratchpad - Segment->RenderLoft( vertices, origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); GfxRenderer.Replace( vertices, Geometry1[ 1 ] ); } } @@ -1392,27 +1395,27 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { vertex_array vertices; if( m_material1 ) { // fixed parts - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // left blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } if( m_material2 ) { // fixed parts - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // right blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -1422,27 +1425,27 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { vertex_array vertices; if( m_material1 ) { // fixed parts - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // right blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } if( m_material2 ) { // fixed parts - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // left blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -1501,7 +1504,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy vertex_array vertices; - Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } if (m_material2) @@ -1665,24 +1668,24 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony // odcinka if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - Segment->RenderLoft( vertices, origin, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej + Segment->RenderLoft( vertices, m_origin, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - Segment->RenderLoft( vertices, origin, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej + Segment->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } } else { // pobocza zwykłe, brak przechyłki if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - Segment->RenderLoft( vertices, origin, rpts1, 3, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts1, 3, fTexLength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - Segment->RenderLoft( vertices, origin, rpts2, 3, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts2, 3, fTexLength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -1915,22 +1918,22 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 3 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 3 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 4 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 4 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 5 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 5 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); @@ -1940,17 +1943,17 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { else { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P2 do P4 + SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P2 do P4 if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P4 do P3=P1 (odwrócony) + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P4 do P3=P1 (odwrócony) if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P1 do P2 + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P1 do P2 if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); @@ -1972,14 +1975,14 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { // we start with a vertex in the middle... vertices.emplace_back( glm::vec3{ - oxz.x - origin.x, - oxz.y - origin.y, - oxz.z - origin.z }, + oxz.x - m_origin.x, + oxz.y - m_origin.y, + oxz.z - m_origin.z }, glm::vec3{ 0.0f, 1.0f, 0.0f }, glm::vec2{ 0.5f, 0.5f } ); // ...and add one extra vertex to close the fan... - u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x + origin.x ) / fTexLength; - v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z + origin.z ) / ( fTexRatio1 * fTexLength ); + u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x + m_origin.x ) / fTexLength; + v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z + m_origin.z ) / ( fTexRatio1 * fTexLength ); vertices.emplace_back( glm::vec3 { SwitchExtension->vPoints[ 0 ].x, @@ -1993,8 +1996,8 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { // ...then draw the precalculated rest for (int i = pointcount + SwitchExtension->iRoads - 1; i >= 0; --i) { // mapowanie we współrzędnych scenerii - u = ( SwitchExtension->vPoints[ i ].x - oxz.x + origin.x ) / fTexLength; - v = ( SwitchExtension->vPoints[ i ].z - oxz.z + origin.z ) / ( fTexRatio1 * fTexLength ); + u = ( SwitchExtension->vPoints[ i ].x - oxz.x + m_origin.x ) / fTexLength; + v = ( SwitchExtension->vPoints[ i ].z - oxz.z + m_origin.z ) / ( fTexRatio1 * fTexLength ); vertices.emplace_back( glm::vec3 { SwitchExtension->vPoints[ i ].x, @@ -2068,7 +2071,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy vertex_array vertices; - Segment->RenderLoft(vertices, origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } if (m_material2) @@ -2128,19 +2131,19 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {-rozp2, -fTexHeight2, 0.f}, normalup, {0.0f, 0.f} }; // prawy brzeg prawego pobocza - Segment->RenderLoft(vertices, origin, rpts1, -3, fTexLength); + Segment->RenderLoft(vertices, m_origin, rpts1, -3, fTexLength); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - Segment->RenderLoft(vertices, origin, rpts2, -3, fTexLength); + Segment->RenderLoft(vertices, m_origin, rpts2, -3, fTexLength); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } else { // pobocza zwykłe, brak przechyłki - Segment->RenderLoft(vertices, origin, rpts1, 3, fTexLength); + Segment->RenderLoft(vertices, m_origin, rpts1, 3, fTexLength); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - Segment->RenderLoft(vertices, origin, rpts2, 3, fTexLength); + Segment->RenderLoft(vertices, m_origin, rpts2, 3, fTexLength); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -2463,20 +2466,19 @@ TTrack * TTrack::RaAnimate() {szyna[ i ].texture.x, 0.f} }; } - auto const origin { pMyNode->m_rootposition }; vertex_array vertices; if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa if( m_material1 ) { // left blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } if( m_material2 ) { // right blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); vertices.clear(); } @@ -2484,13 +2486,13 @@ TTrack * TTrack::RaAnimate() else { // lewa działa lepiej niż prawa if( m_material1 ) { // right blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } if( m_material2 ) { // left blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); vertices.clear(); } @@ -2528,7 +2530,11 @@ TTrack * TTrack::RaAnimate() dynamic->Move( 0.000001 ); } // NOTE: passing empty handle is a bit of a hack here. could be refactored into something more elegant +#ifdef EU07_USE_OLD_GROUNDCODE + create_geometry( geometrybank_handle(), glm::dvec3() ); +#else create_geometry( geometrybank_handle() ); +#endif } // animacja trwa nadal } else @@ -2650,14 +2656,6 @@ void TTrack::MovedUp1(float const dh) fTexHeight1 += dh; }; -std::string TTrack::NameGet() -{ // ustalenie nazwy toru - if (this) - if (pMyNode) - return pMyNode->asName; - return "none"; -}; - void TTrack::VelocitySet(float v) { // ustawienie prędkości z ograniczeniem do pierwotnej wartości (zapisanej w scenerii) if (SwitchExtension ? SwitchExtension->fVelocity >= 0.0 : false) @@ -2677,17 +2675,17 @@ double TTrack::VelocityGet() void TTrack::ConnectionsLog() { // wypisanie informacji o połączeniach int i; - WriteLog("--> tt_Cross named " + pMyNode->asName); + WriteLog("--> tt_Cross named " + m_name); if (eType == tt_Cross) for (i = 0; i < 2; ++i) { if (SwitchExtension->pPrevs[i]) WriteLog("Point " + std::to_string(i + i + 1) + " -> track " + - SwitchExtension->pPrevs[i]->pMyNode->asName + ":" + + SwitchExtension->pPrevs[i]->m_name + ":" + std::to_string(int(SwitchExtension->iPrevDirection[i]))); if (SwitchExtension->pNexts[i]) WriteLog("Point " + std::to_string(i + i + 2) + " -> track " + - SwitchExtension->pNexts[i]->pMyNode->asName + ":" + + SwitchExtension->pNexts[i]->m_name + ":" + std::to_string(int(SwitchExtension->iNextDirection[i]))); } }; @@ -2741,3 +2739,182 @@ TTrack * TTrack::Connected(int s, double &d) const } return NULL; }; + + + +// legacy method, initializes tracks after deserialization from scenario file +void +path_table::InitTracks() { +/* + TGroundNode *Model; + int iConnection; + + for( auto *track : m_paths ) { + + track->AssignEvents( + simulation::Events.FindEvent( track->asEvent0Name ), + simulation::Events.FindEvent( track->asEvent1Name ), + simulation::Events.FindEvent( track->asEvent2Name ) ); + track->AssignallEvents( + simulation::Events.FindEvent( track->asEventall0Name ), + simulation::Events.FindEvent( track->asEventall1Name ), + simulation::Events.FindEvent( track->asEventall2Name ) ); + + auto const trackname { track->name() }; + + if( ( Global::iHiddenEvents & 1 ) + && ( false == trackname.empty() ) ) { + // jeśli podana jest nazwa torów, można szukać eventów skojarzonych przez nazwę + track->AssignEvents( + simulation::Events.FindEvent( trackname + ":event0" ), + simulation::Events.FindEvent( trackname + ":event1" ), + simulation::Events.FindEvent( trackname + ":event2" ) ); + track->AssignallEvents( + simulation::Events.FindEvent( trackname + ":eventall0" ), + simulation::Events.FindEvent( trackname + ":eventall1" ), + simulation::Events.FindEvent( trackname + ":eventall2" ) ); + } + + switch (track->eType) { + case tt_Table: { + // obrotnicę też łączymy na starcie z innymi torami + // szukamy modelu o tej samej nazwie + Model = FindGroundNode(Current->asName, TP_MODEL); + // wiązanie toru z modelem obrotnicy + track->RaAssign( + Current, + ( Model ? + Model->Model : + nullptr ), + simulation::Events.FindEvent( trackname + ":done" ), + simulation::Events.FindEvent( trackname + ":joined" ) ); + if( Model == nullptr ) { + // jak nie ma modelu to pewnie jest wykolejnica, a ta jest domyślnie zamknięta i wykoleja + break; + } + // jak coś pójdzie źle, to robimy z tego normalny tor + } + case tt_Normal: { + // tylko proste są podłączane do rozjazdów, stąd dwa rozjazdy się nie połączą ze sobą + if( track->CurrentPrev() == nullptr ) { + // tylko jeśli jeszcze nie podłączony + auto *matchingtrack = simulation::Region.FindTrack( track->CurrentSegment()->FastGetPoint_0(), iConnection, track ); + switch( iConnection ) { + case -1: // Ra: pierwsza koncepcja zawijania samochodów i statków + // if ((Track->iCategoryFlag&1)==0) //jeśli nie jest torem szynowym + // Track->ConnectPrevPrev(Track,0); //łączenie końca odcinka do samego siebie + break; + case 0: + track->ConnectPrevPrev( matchingtrack, 0 ); + break; + case 1: + track->ConnectPrevNext( matchingtrack, 1 ); + break; + case 2: + track->ConnectPrevPrev( matchingtrack, 0 ); // do Point1 pierwszego + matchingtrack->SetConnections( 0 ); // zapamiętanie ustawień w Segmencie + break; + case 3: + track->ConnectPrevNext( matchingtrack, 1 ); // do Point2 pierwszego + matchingtrack->SetConnections( 0 ); // zapamiętanie ustawień w Segmencie + break; + case 4: + matchingtrack->Switch( 1 ); + track->ConnectPrevPrev( matchingtrack, 2 ); // do Point1 drugiego + matchingtrack->SetConnections( 1 ); // robi też Switch(0) + matchingtrack->Switch( 0 ); + break; + case 5: + matchingtrack->Switch( 1 ); + track->ConnectPrevNext( matchingtrack, 3 ); // do Point2 drugiego + matchingtrack->SetConnections( 1 ); // robi też Switch(0) + matchingtrack->Switch( 0 ); + break; + } + } + if( track->CurrentNext() == nullptr ) { + // tylko jeśli jeszcze nie podłączony + auto *matchingtrack = simulation::Region.FindTrack( track->CurrentSegment()->FastGetPoint_1(), iConnection, track ); + switch( iConnection ) { + case -1: // Ra: pierwsza koncepcja zawijania samochodów i statków + // if ((Track->iCategoryFlag&1)==0) //jeśli nie jest torem szynowym + // Track->ConnectNextNext(Track,1); //łączenie końca odcinka do samego siebie + break; + case 0: + track->ConnectNextPrev( matchingtrack, 0 ); + break; + case 1: + track->ConnectNextNext( matchingtrack, 1 ); + break; + case 2: + track->ConnectNextPrev( matchingtrack, 0 ); + matchingtrack->SetConnections( 0 ); // zapamiętanie ustawień w Segmencie + break; + case 3: + track->ConnectNextNext( matchingtrack, 1 ); + matchingtrack->SetConnections( 0 ); // zapamiętanie ustawień w Segmencie + break; + case 4: + matchingtrack->Switch( 1 ); + track->ConnectNextPrev( matchingtrack, 2 ); + matchingtrack->SetConnections( 1 ); // robi też Switch(0) + // tmp->Switch(0); + break; + case 5: + matchingtrack->Switch( 1 ); + track->ConnectNextNext( matchingtrack, 3 ); + matchingtrack->SetConnections( 1 ); // robi też Switch(0) + // tmp->Switch(0); + break; + } + } + break; + } + case tt_Switch: { + // dla rozjazdów szukamy eventów sygnalizacji rozprucia + track->AssignForcedEvents( + simulation::Events.FindEvent( trackname + ":forced+" ), + simulation::Events.FindEvent( trackname + ":forced-" ) ); + break; + } + default: { + break; + } + } // switch + + // pobranie nazwy odcinka izolowanego + auto const isolatedname { track->IsolatedName() }; + if( false == isolatedname.empty() ) { + // jeśli została zwrócona nazwa + track->IsolatedEventsAssign( + simulation::Events.FindEvent( isolatedname + ":busy" ), + simulation::Events.FindEvent( isolatedname + ":free" ) ); + } + + if( ( trackname[ 0 ] == '*' ) + && ( !track->CurrentPrev() && track->CurrentNext() ) ) { + // możliwy portal, jeśli nie podłączony od strony 1 + // ustawienie flagi portalu + track->iCategoryFlag |= 0x100; + } + } + + TIsolated *isolated = TIsolated::Root(); + while( isolated ) { + // jeśli się znajdzie, to podać wskaźnik + auto *memorycell = simulation::Memory.find( isolated->asName ); // czy jest komóka o odpowiedniej nazwie + if( memorycell != nullptr ) { + // przypisanie powiązanej komórki + isolated->pMemCell = memorycell; + } + else { + // utworzenie automatycznej komórki + // TODO: determine suitable location for this one, create and add world reference node + auto *memorycell = new TMemCell( isolated->asName ); // to nie musi mieć nazwy, nazwa w wyszukiwarce wystarczy + simulation::Memory.insert( memorycell ); + isolated->pMemCell = memorycell; // wskaźnik komóki przekazany do odcinka izolowanego + } + isolated = isolated->Next(); + } +*/ +} diff --git a/Track.h b/Track.h index f396df26..fe9d4e1c 100644 --- a/Track.h +++ b/Track.h @@ -13,8 +13,10 @@ http://mozilla.org/MPL/2.0/. #include #include +#include "scenenode.h" #include "Segment.h" #include "material.h" +#include "names.h" enum TTrackType { tt_Unknown, @@ -112,12 +114,12 @@ class TIsolated }; // trajektoria ruchu - opakowanie -class TTrack { +class TTrack : public editor::basic_node { friend class opengl_renderer; private: - TGroundNode * pMyNode = nullptr; // Ra: proteza, żeby tor znał swoją nazwę TODO: odziedziczyć TTrack z TGroundNode +// TGroundNode * pMyNode = nullptr; // Ra: proteza, żeby tor znał swoją nazwę TODO: odziedziczyć TTrack z TGroundNode TIsolated * pIsolated = nullptr; // obwód izolowany obsługujący zajęcia/zwolnienia grupy torów std::shared_ptr SwitchExtension; // dodatkowe dane do toru, który jest zwrotnicą std::shared_ptr Segment; @@ -126,7 +128,7 @@ private: // McZapkie-070402: dodalem zmienne opisujace rozmiary tekstur int iTrapezoid = 0; // 0-standard, 1-przechyłka, 2-trapez, 3-oba - double fRadiusTable[ 2 ]; // dwa promienie, drugi dla zwrotnicy + double fRadiusTable[ 2 ] = { 0.0, 0.0 }; // dwa promienie, drugi dla zwrotnicy float fTexLength = 4.0f; // długość powtarzania tekstury w metrach float fTexRatio1 = 1.0f; // proporcja boków tekstury nawierzchni (żeby zaoszczędzić na rozmiarach tekstur...) float fTexRatio2 = 1.0f; // proporcja boków tekstury chodnika (żeby zaoszczędzić na rozmiarach tekstur...) @@ -134,6 +136,7 @@ private: float fTexWidth = 0.9f; // szerokość boku float fTexSlope = 0.9f; + glm::dvec3 m_origin; material_handle m_material1 = 0; // tekstura szyn albo nawierzchni material_handle m_material2 = 0; // tekstura automatycznej podsypki albo pobocza typedef std::vector geometryhandle_sequence; @@ -167,7 +170,6 @@ public: int iQualityFlag = 20; int iDamageFlag = 0; TEnvironmentType eEnvironment = e_flat; // dźwięk i oświetlenie - bool bVisible = true; // czy rysowany int iAction = 0; // czy modyfikowany eventami (specjalna obsługa przy skanowaniu) float fOverhead = -1.0; // można normalnie pobierać prąd (0 dla jazdy bezprądowej po danym odcinku, >0-z opuszczonym i ograniczeniem prędkości) private: @@ -177,11 +179,13 @@ public: double fTrackLength = 100.0; // długość z wpisu, nigdzie nie używana double fRadius = 0.0; // promień, dla zwrotnicy kopiowany z tabeli bool ScannedFlag = false; // McZapkie: do zaznaczania kolorem torów skanowanych przez AI - TTraction *hvOverhead = nullptr; // drut zasilający do szybkiego znalezienia (nie używany) - TGroundNode *nFouling[ 2 ]; // współrzędne ukresu albo oporu kozła + TGroundNode *nFouling[ 2 ] = { nullptr, nullptr }; // współrzędne ukresu albo oporu kozła + + TTrack( scene::node_data const &Nodedata ); + // legacy constructor + TTrack( std::string Name ); + virtual ~TTrack(); - TTrack(TGroundNode *g); - ~TTrack(); void Init(); static TTrack * Create400m(int what, double dx); TTrack * NullCreate(int dir); @@ -218,7 +222,7 @@ public: SwitchExtension != nullptr ? SwitchExtension->iRoads - 1 : 1 ); } - void Load(cParser *parser, Math3D::vector3 pOrigin, std::string name); + void Load(cParser *parser, Math3D::vector3 pOrigin); bool AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); bool AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); bool AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus); @@ -226,7 +230,16 @@ public: bool AddDynamicObject(TDynamicObject *Dynamic); bool RemoveDynamicObject(TDynamicObject *Dynamic); - void create_geometry(geometrybank_handle const &Bank); // wypełnianie VBO + // set origin point + void + origin( glm::dvec3 Origin ) { + m_origin = Origin; } + +#ifdef EU07_USE_OLD_GROUNDCODE + void create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ); // wypełnianie VBO +#else + void create_geometry( geometrybank_handle const &Bank ); // wypełnianie VBO +#endif void RenderDynSounds(); // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania void RaOwnerSet(TSubRect *o) { @@ -247,7 +260,6 @@ public: bool IsGroupable(); int TestPoint( Math3D::vector3 *Point); void MovedUp1(float const dh); - std::string NameGet(); void VelocitySet(float v); double VelocityGet(); void ConnectionsLog(); @@ -257,4 +269,15 @@ public: void EnvironmentReset(); }; + + +// collection of virtual tracks and roads present in the scene +class path_table : public basic_table { + +public: + // legacy method, initializes tracks after deserialization from scenario file + void + InitTracks(); +}; + //--------------------------------------------------------------------------- diff --git a/Traction.cpp b/Traction.cpp index 4f1ab726..458dd7e7 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -90,8 +90,91 @@ jawnie nazwę sekcji, ewentualnie nazwę zasilacza (zostanie zastąpiona wskazan sekcji z sąsiedniego przęsła). */ +TTraction::TTraction( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} + +// legacy constructor +TTraction::TTraction( std::string Name ) { + + m_name = Name; +} + +glm::dvec3 LoadPoint( cParser &Input ) { + // pobranie współrzędnych punktu + glm::dvec3 point; + Input.getTokens( 3 ); + Input + >> point.x + >> point.y + >> point.z; + return point; +} + +void +TTraction::Load( cParser *parser, glm::dvec3 const &pOrigin ) { + + parser->getTokens( 4 ); + *parser + >> asPowerSupplyName + >> NominalVoltage + >> MaxCurrent + >> fResistivity; + if( fResistivity == 0.01f ) { + // tyle jest w sceneriach [om/km] + // taka sensowniejsza wartość za http://www.ikolej.pl/fileadmin/user_upload/Seminaria_IK/13_05_07_Prezentacja_Kruczek.pdf + fResistivity = 0.075f; + } + fResistivity *= 0.001f; // teraz [om/m] + // Ra 2014-02: a tutaj damy symbol sieci i jej budowę, np.: + // SKB70-C, CuCd70-2C, KB95-2C, C95-C, C95-2C, YC95-2C, YpC95-2C, YC120-2C + // YpC120-2C, YzC120-2C, YwsC120-2C, YC150-C150, YC150-2C150, C150-C150 + // C120-2C, 2C120-2C, 2C120-2C-1, 2C120-2C-2, 2C120-2C-3, 2C120-2C-4 + auto const material = parser->getToken(); + // 1=miedziana, rysuje się na zielono albo czerwono + // 2=aluminiowa, rysuje się na czarno + if( material == "none" ) { Material = 0; } + else if( material == "al" ) { Material = 2; } + else { Material = 1; } + parser->getTokens( 2 ); + *parser + >> WireThickness + >> DamageFlag; + pPoint1 = LoadPoint( *parser ) + pOrigin; + pPoint2 = LoadPoint( *parser ) + pOrigin; + pPoint3 = LoadPoint( *parser ) + pOrigin; + pPoint4 = LoadPoint( *parser ) + pOrigin; + auto const minheight { parser->getToken() }; + fHeightDifference = ( pPoint3.y - pPoint1.y + pPoint4.y - pPoint2.y ) * 0.5 - minheight; + auto const segmentlength { parser->getToken() }; + iNumSections = ( + segmentlength ? + glm::length( ( pPoint1 - pPoint2 ) ) / segmentlength : + 0 ); + parser->getTokens( 2 ); + *parser + >> Wires + >> WireOffset; + m_visible = ( parser->getToken() == "vis" ); + + std::string token { parser->getToken() }; + if( token == "parallel" ) { + // jawne wskazanie innego przęsła, na które może przestawić się pantograf + parser->getTokens(); + *parser >> asParallel; + } + while( ( false == token.empty() ) + && ( token != "endtraction" ) ) { + + token = parser->getToken(); + } + + Init(); // przeliczenie parametrów + + // calculate traction location + m_location = interpolate( pPoint2, pPoint1, 0.5 ); +} + std::size_t -TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ) { +TTraction::create_geometry( geometrybank_handle const &Bank ) { if( m_geometry != null_handle ) { return GfxRenderer.Vertices( m_geometry ).size() / 2; @@ -106,14 +189,14 @@ TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &O basic_vertex startvertex, endvertex; startvertex.position = glm::vec3( - pPoint1.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, - pPoint1.y - Origin.y, - pPoint1.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + pPoint1.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x, + pPoint1.y - m_origin.y, + pPoint1.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z ); endvertex.position = glm::vec3( - pPoint2.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, - pPoint2.y - Origin.y, - pPoint2.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + pPoint2.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x, + pPoint2.y - m_origin.y, + pPoint2.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); // Nie wiem co 'Marcin @@ -130,9 +213,9 @@ TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &O if( Wires > 1 ) { // lina nośna w kawałkach startvertex.position = glm::vec3( - pPoint3.x - Origin.x, - pPoint3.y - Origin.y, - pPoint3.z - Origin.z ); + pPoint3.x - m_origin.x, + pPoint3.y - m_origin.y, + pPoint3.z - m_origin.z ); for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; t = ( 1 - std::fabs( f - mid ) * 2 ); @@ -141,9 +224,9 @@ TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &O && ( i != iNumSections - 2 ) ) ) { endvertex.position = glm::vec3( - pt3.x - Origin.x, - pt3.y - std::sqrt( t ) * fHeightDifference - Origin.y, - pt3.z - Origin.z ); + pt3.x - m_origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - m_origin.y, + pt3.z - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); startvertex = endvertex; @@ -152,9 +235,9 @@ TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &O } endvertex.position = glm::vec3( - pPoint4.x - Origin.x, - pPoint4.y - Origin.y, - pPoint4.z - Origin.z ); + pPoint4.x - m_origin.x, + pPoint4.y - m_origin.y, + pPoint4.z - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); } @@ -162,14 +245,14 @@ TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &O if( Wires > 2 ) { startvertex.position = glm::vec3( - pPoint1.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, - pPoint1.y - Origin.y, - pPoint1.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + pPoint1.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x, + pPoint1.y - m_origin.y, + pPoint1.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z ); endvertex.position = glm::vec3( - pPoint2.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, - pPoint2.y - Origin.y, - pPoint2.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + pPoint2.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x, + pPoint2.y - m_origin.y, + pPoint2.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); } @@ -179,22 +262,22 @@ TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &O if( Wires == 4 ) { startvertex.position = glm::vec3( - pPoint3.x - Origin.x, - pPoint3.y - 0.65f * fHeightDifference - Origin.y, - pPoint3.z - Origin.z ); + pPoint3.x - m_origin.x, + pPoint3.y - 0.65f * fHeightDifference - m_origin.y, + pPoint3.z - m_origin.z ); for( int i = 0; i < iNumSections - 1; ++i ) { pt3 = pPoint3 + v1 * f; t = ( 1 - std::fabs( f - mid ) * 2 ); endvertex.position = glm::vec3( - pt3.x - Origin.x, + pt3.x - m_origin.x, pt3.y - std::sqrt( t ) * fHeightDifference - ( ( ( i == 0 ) || ( i == iNumSections - 2 ) ) ? 0.25f * fHeightDifference : 0.05 ) - - Origin.y, - pt3.z - Origin.z ); + - m_origin.y, + pt3.z - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); startvertex = endvertex; @@ -202,9 +285,9 @@ TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &O } endvertex.position = glm::vec3( - pPoint4.x - Origin.x, - pPoint4.y - 0.65f * fHeightDifference - Origin.y, - pPoint4.z - Origin.z ); + pPoint4.x - m_origin.x, + pPoint4.y - 0.65f * fHeightDifference - m_origin.y, + pPoint4.z - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); } @@ -223,28 +306,28 @@ TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &O if( ( i % 2 ) == 0 ) { startvertex.position = glm::vec3( - pt3.x - Origin.x, - pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - Origin.y, - pt3.z - Origin.z ); + pt3.x - m_origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - m_origin.y, + pt3.z - m_origin.z ); endvertex.position = glm::vec3( - pt4.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, - pt4.y - Origin.y, - pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + pt4.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x, + pt4.y - m_origin.y, + pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); } else { startvertex.position = glm::vec3( - pt3.x - Origin.x, - pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - Origin.y, - pt3.z - Origin.z ); + pt3.x - m_origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - ( ( i == 0 ) || ( i == iNumSections - 2 ) ? flo : flo1 ) - m_origin.y, + pt3.z - m_origin.z ); endvertex.position = glm::vec3( - pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - Origin.x, - pt4.y - Origin.y, - pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - Origin.z ); + pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x, + pt4.y - m_origin.y, + pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); } @@ -253,14 +336,14 @@ TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &O || ( i == iNumSections - 3 ) ) ) ) { startvertex.position = glm::vec3( - pt3.x - Origin.x, - pt3.y - std::sqrt( t ) * fHeightDifference - 0.05 - Origin.y, - pt3.z - Origin.z ); + pt3.x - m_origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - 0.05 - m_origin.y, + pt3.z - m_origin.z ); endvertex.position = glm::vec3( - pt3.x - Origin.x, - pt3.y - std::sqrt( t ) * fHeightDifference - Origin.y, - pt3.z - Origin.z ); + pt3.x - m_origin.x, + pt3.y - std::sqrt( t ) * fHeightDifference - m_origin.y, + pt3.z - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); } @@ -523,3 +606,211 @@ TTraction::wire_color() const { } return color; } + + + +// legacy method, initializes traction after deserialization from scenario file +void +traction_table::InitTraction() { +/* + //łączenie drutów ze sobą oraz z torami i eventami +// TGroundNode *nCurrent, *nTemp; +// TTraction *tmp; // znalezione przęsło + int iConnection; + std::string name; + for( auto *traction : m_items ) { + // podłączenie do zasilacza, żeby można było sumować prąd kilku pojazdów + // a jednocześnie z jednego miejsca zmieniać napięcie eventem + // wykonywane najpierw, żeby można było logować podłączenie 2 zasilaczy do jednego drutu + // izolator zawieszony na przęśle jest ma być osobnym odcinkiem drutu o długości ok. 1m, + // podłączonym do zasilacza o nazwie "*" (gwiazka); "none" nie będzie odpowiednie + nTemp = FindGroundNode(traction->asPowerSupplyName, TP_TRACTIONPOWERSOURCE); + if (nTemp) // jak zasilacz znaleziony + traction->PowerSet(nTemp->psTractionPowerSource); // to podłączyć do przęsła + else if (traction->asPowerSupplyName != "*") // gwiazdka dla przęsła z izolatorem + if (traction->asPowerSupplyName != "none") // dopuszczamy na razie brak podłączenia? + { // logowanie błędu i utworzenie zasilacza o domyślnej zawartości + ErrorLog("Missed TractionPowerSource: " + traction->asPowerSupplyName); + nTemp = new TGroundNode(); + nTemp->iType = TP_TRACTIONPOWERSOURCE; + nTemp->asName = traction->asPowerSupplyName; + nTemp->psTractionPowerSource = new TTractionPowerSource(nTemp); + nTemp->psTractionPowerSource->Init(traction->NominalVoltage, traction->MaxCurrent); + nTemp->nNext = nRootOfType[nTemp->iType]; // ostatni dodany dołączamy na końcu + // nowego + nRootOfType[nTemp->iType] = nTemp; // ustawienie nowego na początku listy + } + } + + for( auto *traction : m_items ) { + + if (!traction->hvNext[0]) // tylko jeśli jeszcze nie podłączony + { + tmp = FindTraction(traction->pPoint1, iConnection, nCurrent); + switch (iConnection) + { + case 0: + traction->Connect(0, tmp, 0); + break; + case 1: + traction->Connect(0, tmp, 1); + break; + } + if (traction->hvNext[0]) // jeśli został podłączony + if (traction->psSection && tmp->psSection) // tylko przęsło z izolatorem może nie + // mieć zasilania, bo ma 2, trzeba + // sprawdzać sąsiednie + if (traction->psSection != + tmp->psSection) // połączone odcinki mają różne zasilacze + { // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo + // błąd + if (traction->psSection->bSection && !tmp->psSection->bSection) + { //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji + tmp->PowerSet(traction->psSection); // zastąpienie wskazaniem sekcji + } + else if (!traction->psSection->bSection && tmp->psSection->bSection) + { //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji + traction->PowerSet(tmp->psSection); // zastąpienie wskazaniem sekcji + } + else // jeśli obie to sekcje albo obie podstacje, to będzie błąd + ErrorLog("Bad power: at " + + to_string(traction->pPoint1.x, 2, 6) + " " + + to_string(traction->pPoint1.y, 2, 6) + " " + + to_string(traction->pPoint1.z, 2, 6)); + } + } + if (!traction->hvNext[1]) // tylko jeśli jeszcze nie podłączony + { + tmp = FindTraction(traction->pPoint2, iConnection, nCurrent); + switch (iConnection) + { + case 0: + traction->Connect(1, tmp, 0); + break; + case 1: + traction->Connect(1, tmp, 1); + break; + } + if (traction->hvNext[1]) // jeśli został podłączony + if (traction->psSection && tmp->psSection) // tylko przęsło z izolatorem może nie + // mieć zasilania, bo ma 2, trzeba + // sprawdzać sąsiednie + if (traction->psSection != tmp->psSection) + { // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo + // błąd + if (traction->psSection->bSection && !tmp->psSection->bSection) + { //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji + tmp->PowerSet(traction->psSection); // zastąpienie wskazaniem sekcji + } + else if (!traction->psSection->bSection && tmp->psSection->bSection) + { //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji + traction->PowerSet(tmp->psSection); // zastąpienie wskazaniem sekcji + } + else // jeśli obie to sekcje albo obie podstacje, to będzie błąd + ErrorLog("Bad power: at " + + to_string(traction->pPoint2.x, 2, 6) + " " + + to_string(traction->pPoint2.y, 2, 6) + " " + + to_string(traction->pPoint2.z, 2, 6)); + } + } + } + + iConnection = 0; // teraz będzie licznikiem końców + for( auto *traction : m_items ) { + // operacje mające na celu wykrywanie bieżni wspólnych i łączenie przęseł naprążania + if (traction->WhereIs()) // oznakowanie przedostatnich przęseł + { // poszukiwanie bieżni wspólnej dla przedostatnich przęseł, również w celu połączenia + // zasilania + // to się nie sprawdza, bo połączyć się mogą dwa niezasilane odcinki jako najbliższe + // sobie + // nCurrent->hvTraction->hvParallel=TractionNearestFind(nCurrent->pCenter,0,nCurrent); + // //szukanie najbliższego przęsła + // trzeba by zliczać końce, a potem wpisać je do tablicy, aby sukcesywnie podłączać do + // zasilaczy + traction->iTries = 5; // oznaczanie końcowych + ++iConnection; + } + if (traction->fResistance[0] == 0.0) + { + traction->ResistanceCalc(); // obliczanie przęseł w segmencie z bezpośrednim zasilaniem + // ErrorLog("Section "+nCurrent->hvTraction->asPowerSupplyName+" connected"); //jako + // niby błąd będzie bardziej widoczne + traction->iTries = 0; // nie potrzeba mu szukać zasilania + } + // if (!Traction->hvParallel) //jeszcze utworzyć pętle z bieżni wspólnych + } + int zg = 0; // zgodność kierunku przęseł, tymczasowo iterator do tabeli końców + // końców jest ok. 10 razy mniej niż wszystkich przęseł (Quark: 216) + TGroundNode **nEnds = new TGroundNode *[iConnection]; + for( auto *traction : m_items ) { + //łączenie bieżni wspólnych, w tym oznaczanie niepodanych jawnie + if (!traction->asParallel.empty()) // będzie wskaźnik na inne przęsło + if( ( traction->asParallel == "none" ) + || ( traction->asParallel == "*" ) ) { + // jeśli nieokreślone + traction->iLast = 2; // jakby przedostatni - niech po prostu szuka (iLast już przeliczone) + } + else if (!traction->hvParallel) // jeśli jeszcze nie został włączony w kółko + { + auto *nTemp = find( traction->asParallel ); + if (nTemp) + { // o ile zostanie znalezione przęsło o takiej nazwie + if (!nTemp->hvParallel) // jeśli tamten jeszcze nie ma wskaźnika bieżni wspólnej + traction->hvParallel = nTemp; // wpisać siebie i dalej dać mu wskaźnik zwrotny + else // a jak ma, to albo dołączyć się do kółeczka + traction->hvParallel = nTemp->hvParallel; // przjąć dotychczasowy wskaźnik od niego + nTemp->hvParallel = traction; // i na koniec ustawienie wskaźnika zwrotnego + } + if (!traction->hvParallel) + ErrorLog("Missed overhead: " + traction->asParallel); // logowanie braku + } + if (traction->iTries > 0) // jeśli zaznaczony do podłączenia + // if (!nCurrent->hvTraction->psPower[0]||!nCurrent->hvTraction->psPower[1]) + if (zg < iConnection) // zabezpieczenie + nEnds[zg++] = nCurrent; // wypełnianie tabeli końców w celu szukania im połączeń + } + while( zg < iConnection ) { + // zapełnienie do końca tablicy, jeśli by jakieś końce wypadły + nEnds[ zg++ ] = nullptr; + } + zg = 1; // nieefektywny przebieg kończy łączenie + while (zg) + { // ustalenie zastępczej rezystancji dla każdego przęsła + zg = 0; // flaga podłączonych przęseł końcowych: -1=puste wskaźniki, 0=coś zostało, + // 1=wykonano łączenie + for (int i = 0; i < iConnection; ++i) + if (nEnds[i]) // załatwione będziemy zerować + { // każdy przebieg to próba podłączenia końca segmentu naprężania do innego zasilanego + // przęsła + if (nEnds[i]->hvTraction->hvNext[0]) + { // jeśli końcowy ma ciąg dalszy od strony 0 (Point1), szukamy odcinka najbliższego + // do Point2 + if (TractionNearestFind(nEnds[i]->hvTraction->pPoint2, 0, + nEnds[i])) // poszukiwanie przęsła + { + nEnds[i] = NULL; + zg = 1; // jak coś zostało podłączone, to może zasilanie gdzieś dodatkowo + // dotrze + } + } + else if (nEnds[i]->hvTraction->hvNext[1]) + { // jeśli końcowy ma ciąg dalszy od strony 1 (Point2), szukamy odcinka najbliższego + // do Point1 + if (TractionNearestFind(nEnds[i]->hvTraction->pPoint1, 1, + nEnds[i])) // poszukiwanie przęsła + { + nEnds[i] = NULL; + zg = 1; // jak coś zostało podłączone, to może zasilanie gdzieś dodatkowo + // dotrze + } + } + else + { // gdy koniec jest samotny, to na razie nie zostanie podłączony (nie powinno + // takich być) + nEnds[i] = NULL; + } + } + } + delete[] nEnds; // nie potrzebne już +*/ +} diff --git a/Traction.h b/Traction.h index 49304a30..b07fe017 100644 --- a/Traction.h +++ b/Traction.h @@ -10,14 +10,16 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "GL/glew.h" -#include "dumb3d.h" -#include "openglgeometrybank.h" + +#include "scenenode.h" +#include "Segment.h" +#include "material.h" +#include "names.h" class TTractionPowerSource; -class TTraction -{ // drut zasilający, dla wskaźników używać przedrostka "hv" +class TTraction : public editor::basic_node { + friend class opengl_renderer; public: // na razie @@ -29,7 +31,7 @@ class TTraction public: glm::dvec3 pPoint1, pPoint2, pPoint3, pPoint4; glm::dvec3 vParametric; // współczynniki równania parametrycznego odcinka - double fHeightDifference { 0.0 }; //,fMiddleHeight; + double fHeightDifference { 0.0 }; int iNumSections { 0 }; float NominalVoltage { 0.0f }; float MaxCurrent { 0.0f }; @@ -47,11 +49,22 @@ class TTraction int iTries { 0 }; int PowerState { 0 }; // type of incoming power, if any // visualization data + glm::dvec3 m_origin; geometry_handle m_geometry; + TTraction( scene::node_data const &Nodedata ); + // legacy constructor + TTraction( std::string Name ); + virtual ~TTraction() = default; + + void Load( cParser *parser, glm::dvec3 const &pOrigin ); + // set origin point + void + origin( glm::dvec3 Origin ) { + m_origin = Origin; } // creates geometry data in specified geometry bank. returns: number of created elements, or NULL // NOTE: deleting nodes doesn't currently release geometry data owned by the node. TODO: implement erasing individual geometry chunks and banks - std::size_t create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ); + std::size_t create_geometry( geometrybank_handle const &Bank ); int TestPoint(glm::dvec3 const &Point); void Connect(int my, TTraction *with, int to); void Init(); @@ -63,4 +76,15 @@ private: glm::vec3 wire_color() const; }; + + +// collection of virtual tracks and roads present in the scene +class traction_table : public basic_table { + +public: + // legacy method, initializes traction after deserialization from scenario file + void + InitTraction(); +}; + //--------------------------------------------------------------------------- diff --git a/Train.cpp b/Train.cpp index fde9fd70..4a33dd9d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1568,7 +1568,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // sound feedback, engine start for diesel vehicle Train->play_sound( Train->dsbDieselIgnition ); // side-effects - Train->mvControlled->ConverterSwitch( Train->ggConverterButton.GetValue() > 0.5 ); + Train->mvControlled->ConverterSwitch( ( Train->ggConverterButton.GetValue() > 0.5 ) || ( Train->mvControlled->ConverterStart == start::automatic ) ); Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); } } diff --git a/Train.h b/Train.h index 80b67bc0..9fe73f93 100644 --- a/Train.h +++ b/Train.h @@ -73,6 +73,8 @@ public: class TTrain { + friend class TWorld; // temporary due to use of play_sound TODO: refactor this + public: bool CabChange(int iDirection); bool ShowNextCurrent; // pokaz przd w podlaczonej lokomotywie (ET41) diff --git a/World.cpp b/World.cpp index 2559d914..53c0634a 100644 --- a/World.cpp +++ b/World.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "World.h" #include "Globals.h" +#include "simulation.h" #include "Logs.h" #include "MdlMngr.h" #include "renderer.h" @@ -242,6 +243,7 @@ bool TWorld::Init( GLFWwindow *Window ) { GfxRenderer.Render(); WriteLog( "World setup..." ); +#ifdef EU07_USE_OLD_GROUNDCODE if( true == Ground.Init( Global::SceneryFile ) ) { WriteLog( "...world setup done" ); } @@ -249,6 +251,9 @@ bool TWorld::Init( GLFWwindow *Window ) { ErrorLog( "...world setup failed" ); return false; } +#else + if( false == simulation::State.deserialize( Global::SceneryFile ) ) { return false; } +#endif simulation::Time.init(); @@ -299,6 +304,7 @@ bool TWorld::Init( GLFWwindow *Window ) { // if (!Global::bMultiplayer) //na razie włączone { // eventy aktywowane z klawiatury tylko dla jednego użytkownika +#ifdef EU07_USE_OLD_GROUNDCODE KeyEvents[0] = Ground.FindEvent("keyctrl00"); KeyEvents[1] = Ground.FindEvent("keyctrl01"); KeyEvents[2] = Ground.FindEvent("keyctrl02"); @@ -309,6 +315,18 @@ bool TWorld::Init( GLFWwindow *Window ) { KeyEvents[7] = Ground.FindEvent("keyctrl07"); KeyEvents[8] = Ground.FindEvent("keyctrl08"); KeyEvents[9] = Ground.FindEvent("keyctrl09"); +#else + KeyEvents[ 0 ] = simulation::Events.FindEvent( "keyctrl00" ); + KeyEvents[ 1 ] = simulation::Events.FindEvent( "keyctrl01" ); + KeyEvents[ 2 ] = simulation::Events.FindEvent( "keyctrl02" ); + KeyEvents[ 3 ] = simulation::Events.FindEvent( "keyctrl03" ); + KeyEvents[ 4 ] = simulation::Events.FindEvent( "keyctrl04" ); + KeyEvents[ 5 ] = simulation::Events.FindEvent( "keyctrl05" ); + KeyEvents[ 6 ] = simulation::Events.FindEvent( "keyctrl06" ); + KeyEvents[ 7 ] = simulation::Events.FindEvent( "keyctrl07" ); + KeyEvents[ 8 ] = simulation::Events.FindEvent( "keyctrl08" ); + KeyEvents[ 9 ] = simulation::Events.FindEvent( "keyctrl09" ); +#endif } WriteLog( "Load time: " + @@ -396,7 +414,11 @@ void TWorld::OnKeyDown(int cKey) { // z [Shift] uruchomienie eventu if (!Global::iPause) // podczas pauzy klawisze nie działają if (KeyEvents[i]) +#ifdef EU07_USE_OLD_GROUNDCODE Ground.AddToQuery(KeyEvents[i], NULL); +#else + simulation::Events.AddToQuery( KeyEvents[ i ], NULL ); +#endif } else // zapamiętywanie kamery może działać podczas pauzy if (FreeFlyModeFlag) // w trybie latania można przeskakiwać do ustawionych kamer @@ -685,8 +707,7 @@ void TWorld::OnKeyDown(int cKey) temp->MoverParameters->DecBrakeMult()) if (Train) { // dźwięk oczywiście jest w kabinie - Train->dsbSwitch->SetVolume(DSBVOLUME_MAX); - Train->dsbSwitch->Play(0, 0, 0); + Train->play_sound( Train->dsbSwitch ); } } } @@ -715,8 +736,7 @@ void TWorld::OnKeyDown(int cKey) tmp->iLights[CouplNr] = (tmp->iLights[CouplNr] & ~mask) | set; if (Train) { // Ra: ten dźwięk z kabiny to przegięcie, ale na razie zostawiam - Train->dsbSwitch->SetVolume(DSBVOLUME_MAX); - Train->dsbSwitch->Play(0, 0, 0); + Train->play_sound( Train->dsbSwitch ); } } } @@ -736,8 +756,7 @@ void TWorld::OnKeyDown(int cKey) if (temp->MoverParameters->IncLocalBrakeLevelFAST()) if (Train) { // dźwięk oczywiście jest w kabinie - Train->dsbPneumaticRelay->SetVolume(-80); - Train->dsbPneumaticRelay->Play(0, 0, 0); + Train->play_sound( Train->dsbPneumaticRelay ); } } } @@ -756,8 +775,7 @@ void TWorld::OnKeyDown(int cKey) if (temp->MoverParameters->DecLocalBrakeLevelFAST()) if (Train) { // dźwięk oczywiście jest w kabinie - Train->dsbPneumaticRelay->SetVolume(-80); - Train->dsbPneumaticRelay->Play(0, 0, 0); + Train->play_sound( Train->dsbPneumaticRelay ); } } } @@ -1045,10 +1063,14 @@ bool TWorld::Update() TSubModel::iInstance = 0; } +#ifdef EU07_USE_OLD_GROUNDCODE Ground.CheckQuery(); +#else + simulation::Events.CheckQuery(); +#endif Ground.Update_Hidden(); - Ground.Update_Lights(); + simulation::Lights.update(); // render time routines follow: @@ -1818,19 +1840,24 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) CommLog( Now() + " " + std::to_string(pRozkaz->iComm) + " scenery" + " rcvd"); Ground.WyslijString(Global::SceneryFile, 1); // nazwa scenerii break; - case 2: // event - CommLog( Now() + " " + std::to_string(pRozkaz->iComm) + " " + - std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); - if (Global::iMultiplayer) - { // WriteLog("Komunikat: "+AnsiString(pRozkaz->Name1)); + case 2: { + // event + CommLog( Now() + " " + std::to_string( pRozkaz->iComm ) + " " + + std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) + " rcvd" ); +/* + // TODO: re-enable when messaging module is in place + if( Global::iMultiplayer ) { + // WriteLog("Komunikat: "+AnsiString(pRozkaz->Name1)); TEvent *e = Ground.FindEvent( - std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0]))); - if (e) - if ((e->Type == tp_Multiple) || (e->Type == tp_Lights) || - (e->evJoined != 0)) // tylko jawne albo niejawne Multiple - Ground.AddToQuery(e, NULL); // drugi parametr to dynamic wywołujący - tu brak + std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); + if( e ) + if( ( e->Type == tp_Multiple ) || ( e->Type == tp_Lights ) || + ( e->evJoined != 0 ) ) // tylko jawne albo niejawne Multiple + Ground.AddToQuery( e, NULL ); // drugi parametr to dynamic wywołujący - tu brak } +*/ break; + } case 3: // rozkaz dla AI if (Global::iMultiplayer) { diff --git a/World.h b/World.h index ac97a1dd..471a6262 100644 --- a/World.h +++ b/World.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include #include "Camera.h" #include "Ground.h" +#include "scene.h" #include "sky.h" #include "sun.h" #include "moon.h" diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 00ac0856..a6d77415 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -228,6 +228,18 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -446,6 +458,18 @@ Header Files + + Header Files + + + Header Files + + + Header Files + + + Header Files + diff --git a/renderer.cpp b/renderer.cpp index bef13681..4943cafa 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "renderer.h" #include "globals.h" #include "timer.h" +#include "simulation.h" #include "world.h" #include "train.h" #include "data.h" @@ -53,9 +54,9 @@ opengl_camera::update_frustum( glm::mat4 const &Projection, glm::mat4 const &Mod // returns true if specified object is within camera frustum, false otherwise bool -opengl_camera::visible( bounding_area const &Area ) const { +opengl_camera::visible( scene::bounding_area const &Area ) const { - return ( m_frustum.sphere_inside( Area.center, Area.radius ) > 0.0f ); + return ( m_frustum.sphere_inside( Area.center, Area.radius ) > 0.f ); } bool @@ -325,10 +326,10 @@ opengl_renderer::Render() { ++m_framestamp; Render_pass( rendermode::color ); - m_drawcount = m_drawqueue.size(); + m_drawcount = m_cellqueue.size(); // accumulate last 20 frames worth of render time (cap at 1000 fps to prevent calculations going awry) m_drawtimecolorpass = std::max( 20.f, 0.95f * m_drawtimecolorpass + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - drawstartcolorpass ) ).count() / 1000.f ); - m_debuginfo += "frame total: " + to_string( m_drawtimecolorpass / 20.f, 2 ) + " msec (" + std::to_string( m_drawqueue.size() ) + " sectors) "; + m_debuginfo += "frame total: " + to_string( m_drawtimecolorpass / 20.f, 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) "; glfwSwapBuffers( m_window ); @@ -360,12 +361,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { m_worldcamera, rendermode::color, 0.f, - std::min( - 1.f, - Global::shadowtune.depth / ( Global::BaseDrawRange * Global::fDistanceFactor ) - * std::max( - 1.f, - Global::ZoomFactor * 0.5f ) ), + 1.0, true ); #endif // setup shadowmap matrix @@ -433,10 +429,18 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } #endif switch_units( true, true, true ); +#ifdef EU07_USE_OLD_GROUNDCODE Render( &World.Ground ); +#else + Render( simulation::Region ); +#endif // ...translucent parts setup_drawing( true ); +#ifdef EU07_USE_OLD_GROUNDCODE Render_Alpha( &World.Ground ); +#else + Render_Alpha( simulation::Region ); +#endif if( World.Train != nullptr ) { // cab render is performed without shadows, due to low resolution and number of models without windows :| switch_units( true, false, false ); @@ -486,7 +490,11 @@ opengl_renderer::Render_pass( rendermode const Mode ) { #else setup_units( false, false, false ); #endif +#ifdef EU07_USE_OLD_GROUNDCODE Render( &World.Ground ); +#else + Render( simulation::Region ); +#endif // post-render restore ::glDisable( GL_POLYGON_OFFSET_FILL ); ::glDisable( GL_SCISSOR_TEST ); @@ -494,7 +502,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target m_drawtimeshadowpass = 0.95f * m_drawtimeshadowpass + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - shadowdrawstart ) ).count() / 1000.f; - m_debuginfo += "shadows: " + to_string( m_drawtimeshadowpass / 20.f, 2 ) + " msec (" + std::to_string( m_drawqueue.size() ) + " sectors) "; + m_debuginfo += "shadows: " + to_string( m_drawtimeshadowpass / 20.f, 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) "; } break; } @@ -516,7 +524,11 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // opaque parts... setup_drawing( false ); setup_units( true, true, true ); +#ifdef EU07_USE_OLD_GROUNDCODE Render( &World.Ground ); +#else + Render( simulation::Region ); +#endif /* // reflections are limited to sky and ground only, the update rate is too low for anything else // ...translucent parts @@ -569,7 +581,11 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // opaque parts... setup_drawing( false ); setup_units( false, false, false ); +#ifdef EU07_USE_OLD_GROUNDCODE Render( &World.Ground ); +#else + Render( simulation::Region ); +#endif // post-render cleanup } break; @@ -1337,12 +1353,11 @@ opengl_renderer::Texture( texture_handle const Texture ) const { return m_textures.texture( Texture ); } - - +#ifdef EU07_USE_OLD_GROUNDCODE bool opengl_renderer::Render( TGround *Ground ) { - m_drawqueue.clear(); + m_cellqueue.clear(); glm::vec3 const cameraposition { m_renderpass.camera.position() }; int const camerax = static_cast( std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2 ); @@ -1354,25 +1369,29 @@ opengl_renderer::Render( TGround *Ground ) { switch( m_renderpass.draw_mode ) { case rendermode::color: { - Update_Lights( Ground->m_lights ); + Update_Lights( simulation::Lights ); for( int column = originx; column <= originx + segmentcount; ++column ) { for( int row = originz; row <= originz + segmentcount; ++row ) { auto *cell = &Ground->Rects[ column ][ row ]; +#ifdef EU07_USE_DEBUG_CULLING + if( m_worldcamera.camera.visible( cell->m_area ) ) { +#else if( m_renderpass.camera.visible( cell->m_area ) ) { +#endif Render( cell ); } } } // draw queue was filled while rendering content of ground cells. now sort the nodes based on their distance to viewer... std::sort( - std::begin( m_drawqueue ), - std::end( m_drawqueue ), + std::begin( m_cellqueue ), + std::end( m_cellqueue ), []( distancesubcell_pair const &Left, distancesubcell_pair const &Right ) { return ( Left.first ) < ( Right.first ); } ); // ...then render the opaque content of the visible subcells. - for( auto subcellpair : m_drawqueue ) { + for( auto subcellpair : m_cellqueue ) { Render( subcellpair.second ); } break; @@ -1404,7 +1423,7 @@ opengl_renderer::Render( TGround *Ground ) { } // they can also skip queue sorting, as they only deal with opaque geometry // NOTE: there's benefit from rendering front-to-back, but is it significant enough? TODO: investigate - for( auto subcellpair : m_drawqueue ) { + for( auto subcellpair : m_cellqueue ) { Render( subcellpair.second ); } break; @@ -1475,7 +1494,7 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { auto subcell = Groundcell->pSubRects + subcellindex; if( subcell->iNodeCount ) { // o ile są jakieś obiekty, bo po co puste sektory przelatywać - m_drawqueue.emplace_back( + m_cellqueue.emplace_back( glm::length2( m_renderpass.camera.position() - glm::dvec3( subcell->m_area.center ) ), subcell ); } @@ -1577,6 +1596,407 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { return true; } +#else +void +opengl_renderer::Render( scene::basic_region &Region ) { + + m_sectionqueue.clear(); + m_cellqueue.clear(); + + // build a list of region sections to render + glm::vec3 const cameraposition { m_renderpass.camera.position() }; + auto const camerax = static_cast( std::floor( cameraposition.x / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2 ) ); + auto const cameraz = static_cast( std::floor( cameraposition.z / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2 ) ); + int const segmentcount = 2 * static_cast( std::ceil( m_renderpass.draw_range * Global::fDistanceFactor / scene::EU07_SECTIONSIZE ) ); + int const originx = camerax - segmentcount / 2; + int const originz = cameraz - segmentcount / 2; + + for( int row = originz; row <= originz + segmentcount; ++row ) { + if( row < 0 ) { continue; } + if( row >= scene::EU07_REGIONSIDESECTIONCOUNT ) { break; } + for( int column = originx; column <= originx + segmentcount; ++column ) { + if( column < 0 ) { continue; } + if( column >= scene::EU07_REGIONSIDESECTIONCOUNT ) { break; } + auto §ion { Region.m_sections[ row * scene::EU07_REGIONSIDESECTIONCOUNT + column ] }; + if( ( true == section.m_active ) +#ifdef EU07_USE_DEBUG_CULLING + && ( m_worldcamera.camera.visible( section.m_area ) ) ) { +#else + && ( m_renderpass.camera.visible( section.m_area ) ) ) { +#endif + m_sectionqueue.emplace_back( §ion ); + } + } + } + + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + + Update_Lights( simulation::Lights ); + + Render( std::begin( m_sectionqueue ), std::end( m_sectionqueue ) ); +/* + // draw queue was filled while rendering content of ground cells. now sort the nodes based on their distance to viewer... + // TODO: move sorting for translucent phase, for opaque geometry render cells in initial order to reduce vbo switching + std::sort( + std::begin( m_cellqueue ), + std::end( m_cellqueue ), + []( distancecell_pair const &Left, distancecell_pair const &Right ) { + return ( Left.first < Right.first ); } ); +*/ + // ...then render the opaque content of the visible cells. + Render( std::begin( m_cellqueue ), std::end( m_cellqueue ) ); + break; + } + case rendermode::shadows: + case rendermode::pickscenery: { + // these render modes don't bother with lights + Render( std::begin( m_sectionqueue ), std::end( m_sectionqueue ) ); + // they can also skip queue sorting, as they only deal with opaque geometry + // NOTE: there's benefit from rendering front-to-back, but is it significant enough? TODO: investigate + Render( std::begin( m_cellqueue ), std::end( m_cellqueue ) ); + break; + } + case rendermode::reflections: { + // for the time being reflections render only terrain geometry + Render( std::begin( m_sectionqueue ), std::end( m_sectionqueue ) ); + break; + } + case rendermode::pickcontrols: + default: { + // no need to render anything ourside of the cab in control picking mode + break; + } + } +} + +void +opengl_renderer::Render( section_sequence::iterator First, section_sequence::iterator Last ) { + + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::reflections: { + + break; + } + case rendermode::shadows: { + // experimental, for shadows render both back and front faces, to supply back faces of the 'forest strips' + ::glDisable( GL_CULL_FACE ); + break; } + case rendermode::pickscenery: { + // non-interactive scenery elements get neutral colour + ::glColor3fv( glm::value_ptr( colors::none ) ); + break; + } + default: { + break; } + } + + while( First != Last ) { + + auto *section = *First; + section->create_geometry(); + + // render shapes held by the section + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::reflections: + case rendermode::shadows: + case rendermode::pickscenery: { + if( false == section->m_shapes.empty() ) { + // since all shapes of the section share center point we can optimize out a few calls here + ::glPushMatrix(); + auto const originoffset { section->m_area.center - m_renderpass.camera.position() }; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // render +#ifdef EU07_USE_DEBUG_CULLING + // debug + float const width = scene::EU07_SECTIONSIZE * 0.5f; + float const height = scene::EU07_SECTIONSIZE * 0.2f; + glDisable( GL_LIGHTING ); + glDisable( GL_TEXTURE_2D ); + glColor3ub( 255, 128, 128 ); + glBegin( GL_LINE_LOOP ); + glVertex3f( -width, height, width ); + glVertex3f( -width, height, -width ); + glVertex3f( width, height, -width ); + glVertex3f( width, height, width ); + glEnd(); + glBegin( GL_LINE_LOOP ); + glVertex3f( -width, 0, width ); + glVertex3f( -width, 0, -width ); + glVertex3f( width, 0, -width ); + glVertex3f( width, 0, width ); + glEnd(); + glBegin( GL_LINES ); + glVertex3f( -width, height, width ); glVertex3f( -width, 0, width ); + glVertex3f( -width, height, -width ); glVertex3f( -width, 0, -width ); + glVertex3f( width, height, -width ); glVertex3f( width, 0, -width ); + glVertex3f( width, height, width ); glVertex3f( width, 0, width ); + glEnd(); + glColor3ub( 255, 255, 255 ); + glEnable( GL_TEXTURE_2D ); + glEnable( GL_LIGHTING ); +#endif + // shapes + for( auto const &shape : section->m_shapes ) { Render( shape ); } + // post-render cleanup + ::glPopMatrix(); + } + break; + } + case rendermode::pickcontrols: + default: { + break; + } + } + + // add the section's cells to the cell queue + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::shadows: + case rendermode::pickscenery: { + for( auto &cell : section->m_cells ) { + if( ( true == cell.m_active ) +#ifdef EU07_USE_DEBUG_CULLING + && ( m_worldcamera.camera.visible( cell.m_area ) ) ) { +#else + && ( m_renderpass.camera.visible( cell.m_area ) ) ) { +#endif + // store visible cells with content as well as their current distance, for sorting later + m_cellqueue.emplace_back( + glm::length2( m_renderpass.camera.position() - cell.m_area.center ), + &cell ); + } + } + break; + } + case rendermode::reflections: + case rendermode::pickcontrols: + default: { + break; + } + } + // proceed to next section + ++First; + } + + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // restore standard face cull mode + ::glEnable( GL_CULL_FACE ); + break; } + default: { + break; } + } +} + +void +opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator Last ) { + + // cache initial iterator for the second sweep + auto first { First }; + // first pass draws elements which we know are located in section banks, to reduce vbo switching + while( First != Last ) { + + auto const *cell = First->second; +/* + // przeliczenia animacji torów w sektorze + Groundsubcell->RaAnimate( m_framestamp ); +*/ + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + // since all shapes of the section share center point we can optimize out a few calls here + ::glPushMatrix(); + auto const originoffset { cell->m_area.center - m_renderpass.camera.position() }; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + // render +#ifdef EU07_USE_DEBUG_CULLING + // debug + float const width = scene::EU07_CELLSIZE * 0.5f; + float const height = scene::EU07_CELLSIZE * 0.15f; + glDisable( GL_LIGHTING ); + glDisable( GL_TEXTURE_2D ); + glColor3ub( 255, 255, 0 ); + glBegin( GL_LINE_LOOP ); + glVertex3f( -width, height, width ); + glVertex3f( -width, height, -width ); + glVertex3f( width, height, -width ); + glVertex3f( width, height, width ); + glEnd(); + glBegin( GL_LINE_LOOP ); + glVertex3f( -width, 0, width ); + glVertex3f( -width, 0, -width ); + glVertex3f( width, 0, -width ); + glVertex3f( width, 0, width ); + glEnd(); + glBegin( GL_LINES ); + glVertex3f( -width, height, width ); glVertex3f( -width, 0, width ); + glVertex3f( -width, height, -width ); glVertex3f( -width, 0, -width ); + glVertex3f( width, height, -width ); glVertex3f( width, 0, -width ); + glVertex3f( width, height, width ); glVertex3f( width, 0, width ); + glEnd(); + glColor3ub( 255, 255, 255 ); + glEnable( GL_TEXTURE_2D ); + glEnable( GL_LIGHTING ); +#endif + // opaque non-instanced shapes + for( auto const &shape : cell->m_shapesopaque ) { Render( shape ); } + // tracks + // TODO: update after path node refactoring + for( auto *path : cell->m_paths ) { Render( path ); } + // TODO: add other content types + + // post-render cleanup + ::glPopMatrix(); + + break; + } + case rendermode::shadows: { + // since all shapes of the section share center point we can optimize out a few calls here + ::glPushMatrix(); + auto const originoffset { cell->m_area.center - m_renderpass.camera.position() }; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + // render + // opaque non-instanced shapes + for( auto const &shape : cell->m_shapesopaque ) { Render( shape ); } + // TODO: add other content types + + // post-render cleanup + ::glPopMatrix(); + + break; + } + case rendermode::pickscenery: { + // same procedure like with regular render, but editor-enabled nodes receive custom colour used for picking + // since all shapes of the section share center point we can optimize out a few calls here + ::glPushMatrix(); + auto const originoffset { cell->m_area.center - m_renderpass.camera.position() }; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // render + // opaque non-instanced shapes + for( auto const &shape : cell->m_shapesopaque ) { Render( shape ); } + // tracks + // TODO: add path to the node picking list + for( auto *path : cell->m_paths ) { Render( path ); } + // TODO: add other content types + // post-render cleanup + ::glPopMatrix(); + + break; + } + case rendermode::reflections: + case rendermode::pickcontrols: + default: { + break; + } + } + + ++First; + } + // second pass draws elements with their own vbos + while( first != Last ) { + + auto const *cell = first->second; + + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::shadows: + case rendermode::pickscenery: { + // render + // opaque parts of instanced models + for( auto *instance : cell->m_instancesopaque ) { Render( instance ); } + // TODO: add remaining content types + break; + } + case rendermode::reflections: + case rendermode::pickcontrols: + default: { + break; + } + } + + ++first; + } +} + +void +opengl_renderer::Render( scene::shape_node const &Shape ) { + + auto const &data { Shape.data() }; + // setup + Bind_Material( data.material ); + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::reflections: { + ::glColor3fv( glm::value_ptr( data.lighting.diffuse ) ); +/* + // NOTE: ambient component is set by diffuse component + // NOTE: for the time being non-instanced shapes are rendered without specular component due to wrong/arbitrary values set in legacy scenarios + // TBD, TODO: find a way to resolve this with the least amount of tears? + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( data.lighting.specular * Global::DayLight.specular.a * m_specularopaquescalefactor ) ); +*/ + break; + } + // pick modes are painted with custom colours, and shadow pass doesn't use any + case rendermode::shadows: + case rendermode::pickscenery: + case rendermode::pickcontrols: + default: { + break; + } + } + // render + m_geometry.draw( data.geometry ); +} + +void +opengl_renderer::Render( TAnimModel *Instance ) { + + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees + distancesquared = SquareMagnitude( ( Instance->m_location - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + default: { + distancesquared = SquareMagnitude( ( Instance->m_location - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + } + if( ( distancesquared < Instance->m_rangesquaredmin ) + || ( distancesquared >= Instance->m_rangesquaredmax ) ) { + return; + } +/* + // TODO: enable adding items to the picking list + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } +*/ + Instance->RaAnimate( m_framestamp ); // jednorazowe przeliczenie animacji + Instance->RaPrepare(); + if( Instance->pModel ) { + // renderowanie rekurencyjne submodeli + Render( + Instance->pModel, + Instance->Material(), + distancesquared, + Instance->m_location - m_renderpass.camera.position(), + Instance->vAngle ); + } +} +#endif bool opengl_renderer::Render( TGroundNode *Node ) { @@ -2272,6 +2692,9 @@ opengl_renderer::Render( TTrack *Track ) { && ( Track->m_material2 == 0 ) ) { return; } + if( false == Track->m_visible ) { + return; + } switch( m_renderpass.draw_mode ) { case rendermode::color: @@ -2311,7 +2734,7 @@ void opengl_renderer::Render( TMemCell *Memcell ) { ::glPushMatrix(); - auto const position = Memcell->Position() - m_renderpass.camera.position(); + auto const position = Memcell->location() - m_renderpass.camera.position(); ::glTranslated( position.x, position.y + 0.5, position.z ); switch( m_renderpass.draw_mode ) { @@ -2342,27 +2765,28 @@ opengl_renderer::Render( TMemCell *Memcell ) { ::glPopMatrix(); } +#ifdef EU07_USE_OLD_GROUNDCODE bool opengl_renderer::Render_Alpha( TGround *Ground ) { TGroundNode *node; TSubRect *tmp; // Ra: renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { + for( auto subcellpair = std::rbegin( m_cellqueue ); subcellpair != std::rend( m_cellqueue ); ++subcellpair ) { // przezroczyste trójkąty w oddzielnym cyklu przed modelami tmp = subcellpair->second; for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { Render_Alpha( node ); } } - for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) + for( auto subcellpair = std::rbegin( m_cellqueue ); subcellpair != std::rend( m_cellqueue ); ++subcellpair ) { // renderowanie przezroczystych modeli oraz pojazdów Render_Alpha( subcellpair->second ); } ::glDisable( GL_LIGHTING ); // linie nie powinny świecić - for( auto subcellpair = std::rbegin( m_drawqueue ); subcellpair != std::rend( m_drawqueue ); ++subcellpair ) { + for( auto subcellpair = std::rbegin( m_cellqueue ); subcellpair != std::rend( m_cellqueue ); ++subcellpair ) { // druty na końcu, żeby się nie robiły białe plamy na tle lasu tmp = subcellpair->second; for( node = tmp->nRenderWires; node; node = node->nNext3 ) { @@ -2391,7 +2815,177 @@ opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { return true; } +#else +void +opengl_renderer::Render_Alpha( scene::basic_region &Region ) { + // sort the nodes based on their distance to viewer + std::sort( + std::begin( m_cellqueue ), + std::end( m_cellqueue ), + []( distancecell_pair const &Left, distancecell_pair const &Right ) { + return ( Left.first ) < ( Right.first ); } ); + + Render_Alpha( std::rbegin( m_cellqueue ), std::rend( m_cellqueue ) ); +/* + ::glDisable( GL_LIGHTING ); // linie nie powinny świecić + for( auto subcellpair = std::rbegin( m_cellqueue ); subcellpair != std::rend( m_cellqueue ); ++subcellpair ) { + // druty na końcu, żeby się nie robiły białe plamy na tle lasu + tmp = subcellpair->second; + for( node = tmp->nRenderWires; node; node = node->nNext3 ) { + Render_Alpha( node ); + } + } + ::glEnable( GL_LIGHTING ); +*/ +} + +void +opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_sequence::reverse_iterator Last ) { + + // first pass draws elements which we know are located in section banks, to reduce vbo switching + { + auto first { First }; + while( first != Last ) { + + auto const *cell = first->second; + + if( false == cell->m_shapestranslucent.empty() ) { + // since all shapes of the cell share center point we can optimize out a few calls here + ::glPushMatrix(); + auto const originoffset{ cell->m_area.center - m_renderpass.camera.position() }; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // render + // NOTE: we can reuse the method used to draw opaque geometry + for( auto const &shape : cell->m_shapestranslucent ) { Render( shape ); } + // post-render cleanup + ::glPopMatrix(); + } + + ++first; + } + } + // second pass draws elements with their own vbos + { + auto first { First }; + while( first != Last ) { + + auto const *cell = first->second; + + // translucent parts of instanced models + for( auto *instance : cell->m_instancetranslucent ) { Render_Alpha( instance ); } + // TODO: add remaining content types + + ++first; + } + } + // third pass draws the wires; + // wires use section vbos, but for the time being we want to draw them at the very end + { + auto first{ First }; + while( first != Last ) { + + auto const *cell = first->second; + // TODO: include lines here + if( false == cell->m_traction.empty() ) { + // since all shapes of the cell share center point we can optimize out a few calls here + ::glPushMatrix(); + auto const originoffset { cell->m_area.center - m_renderpass.camera.position() }; + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + if( !Global::bSmoothTraction ) { + // na liniach kiepsko wygląda - robi gradient + ::glDisable( GL_LINE_SMOOTH ); + } + Bind_Material( null_handle ); + // render + for( auto *traction : cell->m_traction ) { Render_Alpha( traction ); } + // post-render cleanup + ::glLineWidth( 1.0 ); + if( !Global::bSmoothTraction ) { + ::glEnable( GL_LINE_SMOOTH ); + } + ::glPopMatrix(); + } + + ++first; + } + } +} + +void +opengl_renderer::Render_Alpha( TAnimModel *Instance ) { + + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees + distancesquared = SquareMagnitude( ( Instance->m_location - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + default: { + distancesquared = SquareMagnitude( ( Instance->m_location - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + } + if( ( distancesquared < Instance->m_rangesquaredmin ) + || ( distancesquared >= Instance->m_rangesquaredmax ) ) { + return; + } + + Instance->RaPrepare(); + if( Instance->pModel ) { + // renderowanie rekurencyjne submodeli + Render_Alpha( + Instance->pModel, + Instance->Material(), + distancesquared, + Instance->m_location - m_renderpass.camera.position(), + Instance->vAngle ); + } +} + +void +opengl_renderer::Render_Alpha( TTraction *Traction ) { + + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees + distancesquared = SquareMagnitude( ( Traction->m_location - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + default: { + distancesquared = SquareMagnitude( ( Traction->m_location - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + } + if( ( distancesquared < Traction->m_rangesquaredmin ) + || ( distancesquared >= Traction->m_rangesquaredmax ) ) { + return; + } + + if( false == Traction->m_visible ) { + return; + } + // rysuj jesli sa druty i nie zerwana + if( ( Traction->Wires == 0 ) + || ( true == TestFlag( Traction->DamageFlag, 128 ) ) ) { + return; + } + // setup + float const linealpha = static_cast( + std::min( + 1.25, + 5000 * Traction->WireThickness / ( distancesquared + 1.0 ) ) ); // zbyt grube nie są dobre + ::glLineWidth( linealpha ); + // McZapkie-261102: kolor zalezy od materialu i zasniedzenia + auto const color { Traction->wire_color() }; + ::glColor4f( color.r, color.g, color.b, linealpha ); + + // render + m_geometry.draw( Traction->m_geometry ); +} +#endif bool opengl_renderer::Render_Alpha( TGroundNode *Node ) { @@ -2857,6 +3451,8 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { Render_Alpha( Submodel->Next ); }; + + // utility methods TSubModel const * opengl_renderer::Update_Pick_Control() { diff --git a/renderer.h b/renderer.h index 70141315..1009e715 100644 --- a/renderer.h +++ b/renderer.h @@ -15,12 +15,14 @@ http://mozilla.org/MPL/2.0/. #include "lightarray.h" #include "dumb3d.h" #include "frustum.h" +#include "scene.h" #include "world.h" #include "memcell.h" #define EU07_USE_PICKING_FRAMEBUFFER //#define EU07_USE_DEBUG_SHADOWMAP //#define EU07_USE_DEBUG_CAMERA +//#define EU07_USE_DEBUG_CULLING struct opengl_light { @@ -84,7 +86,7 @@ public: void update_frustum( glm::mat4 const &Projection, glm::mat4 const &Modelview ); bool - visible( bounding_area const &Area ) const; + visible( scene::bounding_area const &Area ) const; bool visible( TDynamicObject const *Dynamic ) const; inline @@ -225,7 +227,13 @@ private: diffuse }; - typedef std::pair< double, TSubRect * > distancesubcell_pair; +#ifdef EU07_USE_OLD_GROUNDCODE + using distancesubcell_pair = std::pair< double, TSubRect * >; +#else + using section_sequence = std::vector; + using distancecell_pair = std::pair; + using cell_sequence = std::vector; +#endif struct renderpass_config { @@ -266,12 +274,25 @@ private: Render_reflections(); bool Render( world_environment *Environment ); +#ifdef EU07_USE_OLD_GROUNDCODE bool Render( TGround *Ground ); bool Render( TGroundRect *Groundcell ); bool Render( TSubRect *Groundsubcell ); +#else + void + Render( scene::basic_region &Region ); + void + Render( section_sequence::iterator First, section_sequence::iterator Last ); + void + Render( cell_sequence::iterator First, cell_sequence::iterator Last ); + void + Render( scene::shape_node const &Shape ); + void + Render( TAnimModel *Instance ); +#endif bool Render( TGroundNode *Node ); bool @@ -288,10 +309,21 @@ private: Render_cab( TDynamicObject *Dynamic, bool const Alpha = false ); void Render( TMemCell *Memcell ); +#ifdef EU07_USE_OLD_GROUNDCODE bool Render_Alpha( TGround *Ground ); bool Render_Alpha( TSubRect *Groundsubcell ); +#else + void + Render_Alpha( scene::basic_region &Region ); + void + Render_Alpha( cell_sequence::reverse_iterator First, cell_sequence::reverse_iterator Last ); + void + Render_Alpha( TAnimModel *Instance ); + void + Render_Alpha( TTraction *Traction ); +#endif bool Render_Alpha( TGroundNode *Node ); bool @@ -361,13 +393,18 @@ private: std::string m_pickdebuginfo; glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; - glm::vec4 m_shadowcolor { 0.5f, 0.5f, 0.5f, 1.f }; + glm::vec4 m_shadowcolor { 0.65f, 0.65f, 0.65f, 1.f }; float m_specularopaquescalefactor { 1.f }; float m_speculartranslucentscalefactor { 1.f }; bool m_renderspecular{ false }; // controls whether to include specular component in the calculations renderpass_config m_renderpass; - std::vector m_drawqueue; // list of subcells to be drawn in current render pass +#ifdef EU07_USE_OLD_GROUNDCODE + std::vector m_cellqueue; // list of subcells to be drawn in current render pass +#else + section_sequence m_sectionqueue; // list of sections in current render pass + cell_sequence m_cellqueue; +#endif std::vector m_picksceneryitems; std::vector m_pickcontrolsitems; diff --git a/scene.cpp b/scene.cpp new file mode 100644 index 00000000..a6d04d96 --- /dev/null +++ b/scene.cpp @@ -0,0 +1,579 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scene.h" + +#include "renderer.h" +#include "logs.h" + +namespace scene { + +// adds provided shape to the cell +void +basic_cell::insert( shape_node Shape ) { + + m_active = true; + + auto const &shapedata { Shape.data() }; + auto &shapes = ( + shapedata.translucent ? + m_shapestranslucent : + m_shapesopaque ); + for( auto &targetshape : shapes ) { + // try to merge shapes with matching view ranges... + auto const &targetshapedata { targetshape.data() }; + if( ( shapedata.rangesquared_min == targetshapedata.rangesquared_min ) + && ( shapedata.rangesquared_max == targetshapedata.rangesquared_max ) + // ...and located close to each other (within arbitrary limit of 25m) + && ( glm::length( shapedata.area.center - targetshapedata.area.center ) < 25.0 ) ) { + + if( true == targetshape.merge( Shape ) ) { + // if the shape was merged there's nothing left to do + return; + } + } + } + // otherwise add the shape to the relevant list + Shape.origin( m_area.center ); + shapes.emplace_back( Shape ); +} + +// adds provided path to the cell +void +basic_cell::insert( TTrack *Path ) { + + m_active = true; + + // TODO: add animation hook + Path->origin( m_area.center ); + m_paths.emplace_back( Path ); +} + +// adds provided traction piece to the cell +void +basic_cell::insert( TTraction *Traction ) { + + m_active = true; + + Traction->origin( m_area.center ); + m_traction.emplace_back( Traction ); +} + +// adds provided model instance to the cell +void +basic_cell::insert( TAnimModel *Instance ) { + + m_active = true; + + auto const flags = Instance->Flags(); + auto alpha = + ( Instance->Material() != nullptr ? + Instance->Material()->textures_alpha : + 0x30300030 ); + + // assign model to appropriate render phases + if( alpha & flags & 0x2F2F002F ) { + // translucent pieces + m_instancetranslucent.emplace_back( Instance ); + } + alpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste + if( alpha & flags & 0x1F1F001F ) { + // opaque pieces + m_instancesopaque.emplace_back( Instance ); + } +} + +// generates renderable version of held non-instanced geometry +void +basic_cell::create_geometry( geometrybank_handle const &Bank ) { + + if( false == m_active ) { return; } // nothing to do here + + for( auto &shape : m_shapesopaque ) { shape.create_geometry( Bank ); } + for( auto &shape : m_shapestranslucent ) { shape.create_geometry( Bank ); } +#ifndef EU07_USE_OLD_GROUNDCODE + for( auto *path : m_paths ) { path->create_geometry( Bank ); } + for( auto *traction : m_traction ) { traction->create_geometry( Bank ); } +#endif +} + +// sets center point of the section +void +basic_cell::center( glm::dvec3 Center ) { + + m_area.center = Center; + // NOTE: we should also update origin point for the contained nodes, but in practice we can skip this + // as all nodes will be added only after the proper center point was set, and won't change +} + + + +// adds provided shape to the section +void +basic_section::insert( shape_node Shape ) { + + m_active = true; + + auto const &shapedata = Shape.data(); + if( ( true == shapedata.translucent ) + || ( shapedata.rangesquared_max <= 90000.0 ) + || ( shapedata.rangesquared_min > 0.0 ) ) { + // small, translucent or not always visible shapes are placed in the sub-cells + cell( shapedata.area.center ).insert( Shape ); + } + else { + // large, opaque shapes are placed on section level + for( auto &shape : m_shapes ) { + // check first if the shape can't be merged with one of the shapes already present in the section + if( true == shape.merge( Shape ) ) { + // if the shape was merged there's nothing left to do + return; + } + } + // otherwise add the shape to the section's list + Shape.origin( m_area.center ); + m_shapes.emplace_back( Shape ); + } +} + +// adds provided path to the section +void +basic_section::insert( TTrack *Path ) { + + m_active = true; + // pass the node to the appropriate partitioning cell + // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done + cell( Path->location() ).insert( Path ); +} + +// adds provided path to the section +void +basic_section::insert( TTraction *Traction ) { + + m_active = true; + // pass the node to the appropriate partitioning cell + // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done + cell( Traction->location() ).insert( Traction ); +} + +// adds provided model instance to the section +void +basic_section::insert( TAnimModel *Instance ) { + + m_active = true; + // pass the node to the appropriate partitioning cell + // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done + cell( Instance->location() ).insert( Instance ); +} + +// sets center point of the section +void +basic_section::center( glm::dvec3 Center ) { + + m_area.center = Center; + // set accordingly center points of the section's partitioning cells + // NOTE: we should also update origin point for the contained nodes, but in practice we can skip this + // as all nodes will be added only after the proper center point was set, and won't change + auto const centeroffset = -( EU07_SECTIONSIZE / EU07_CELLSIZE / 2 * EU07_CELLSIZE ) + EU07_CELLSIZE / 2; + glm::dvec3 sectioncornercenter { m_area.center + glm::dvec3{ centeroffset, 0, centeroffset } }; + auto row { 0 }, column { 0 }; + for( auto &cell : m_cells ) { + cell.center( sectioncornercenter + glm::dvec3{ column * EU07_CELLSIZE, 0.0, row * EU07_CELLSIZE } ); + if( ++column >= EU07_SECTIONSIZE / EU07_CELLSIZE ) { + ++row; + column = 0; + } + } +} + +// generates renderable version of held non-instanced geometry +void +basic_section::create_geometry() { + + if( true == m_geometrycreated ) { return; } + else { + // mark it done for future checks + m_geometrycreated = true; + } + + if( false == m_active ) { return; } // nothing to do here + + // since sections can be empty, we're doing lazy initialization of the geometry bank, when something may actually use it + if( m_geometrybank == null_handle ) { + m_geometrybank = GfxRenderer.Create_Bank(); + } + + for( auto &shape : m_shapes ) { + shape.create_geometry( m_geometrybank ); + } + for( auto &cell : m_cells ) { + cell.create_geometry( m_geometrybank ); + } +} + +// provides access to section enclosing specified point +basic_cell & +basic_section::cell( glm::dvec3 const &Location ) { + + auto const column = static_cast( std::floor( ( Location.x - ( m_area.center.x - EU07_SECTIONSIZE / 2 ) ) / EU07_CELLSIZE ) ); + auto const row = static_cast( std::floor( ( Location.z - ( m_area.center.z - EU07_SECTIONSIZE / 2 ) ) / EU07_CELLSIZE ) ); + + return + m_cells[ + clamp( row, 0, ( EU07_SECTIONSIZE / EU07_CELLSIZE ) - 1 ) * ( EU07_SECTIONSIZE / EU07_CELLSIZE ) + + clamp( column, 0, ( EU07_SECTIONSIZE / EU07_CELLSIZE ) - 1 ) ] ; +} + + + +basic_region::basic_region() { + + // initialize centers of sections: + // calculate center of 'top left' region section... + auto const centeroffset = -( EU07_REGIONSIDESECTIONCOUNT / 2 * EU07_SECTIONSIZE ) + EU07_SECTIONSIZE / 2; + glm::dvec3 regioncornercenter { centeroffset, 0, centeroffset }; + auto row { 0 }, column { 0 }; + // ...move through section array assigning centers left to right, front/top to back/bottom + for( auto §ion : m_sections ) { + section.center( regioncornercenter + glm::dvec3{ column * EU07_SECTIONSIZE, 0.0, row * EU07_SECTIONSIZE } ); + if( ++column >= EU07_REGIONSIDESECTIONCOUNT ) { + ++row; + column = 0; + } + } +} + +void +basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad ) { + + // shape might need to be split into smaller pieces, so we create list of nodes instead of just single one + // using deque so we can do single pass iterating and addding generated pieces without invalidating anything + std::deque shapes { Shape }; + auto &shape = shapes.front(); + if( shape.m_data.vertices.empty() ) { return; } + + // adjust input if necessary: + if( Scratchpad.location_rotation != glm::vec3( 0, 0, 0 ) ) { + // rotate... + auto const rotation = glm::radians( Scratchpad.location_rotation ); + for( auto &vertex : shape.m_data.vertices ) { + vertex.position = glm::rotateZ( vertex.position, rotation.z ); + vertex.position = glm::rotateX( vertex.position, rotation.x ); + vertex.position = glm::rotateY( vertex.position, rotation.y ); + vertex.normal = glm::rotateZ( vertex.normal, rotation.z ); + vertex.normal = glm::rotateX( vertex.normal, rotation.x ); + vertex.normal = glm::rotateY( vertex.normal, rotation.y ); + } + } + if( ( false == Scratchpad.location_offset.empty() ) + && ( Scratchpad.location_offset.top() != glm::dvec3( 0, 0, 0 ) ) ) { + // ...and move + auto const offset = Scratchpad.location_offset.top(); + for( auto &vertex : shape.m_data.vertices ) { + vertex.position += offset; + } + } + // calculate bounding area + for( auto const &vertex : shape.m_data.vertices ) { + shape.m_data.area.center += vertex.position; + } + shape.m_data.area.center /= shape.m_data.vertices.size(); + // trim the shape if needed. trimmed parts will be added to list as separate nodes + for( std::size_t index = 0; index < shapes.size(); ++index ) { + while( true == RaTriangleDivider( shapes[ index ], shapes ) ) { + ; // all work is done during expression check + } + // with the trimming done we can calculate shape's bounding radius + shape.compute_radius(); + } + // move the data into appropriate section(s) + for( auto &shape : shapes ) { + + if( point_inside( shape.m_data.area.center ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + section( shape.m_data.area.center ).insert( shape ); + } + else { + ErrorLog( + "Bad scenario: shape node" + ( + shape.m_name.empty() ? + "" : + " \"" + shape.m_name + "\"" ) + + " placed in location outside region bounds (" + to_string( shape.m_data.area.center ) + ")" ); + } + } +} + +// inserts provided track in the region +void +basic_region::insert_path( TTrack *Path, scratch_data &Scratchpad ) { + + // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done + auto center = Path->location(); + + if( point_inside( center ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + section( center ).insert( Path ); + } + else { + // tracks are guaranteed to hava a name so we can skip the check + ErrorLog( "Bad scenario: track node \"" + Path->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); + } +} + +// inserts provided track in the region +void +basic_region::insert_traction( TTraction *Traction, scratch_data &Scratchpad ) { + + // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done + auto center = Traction->location(); + + if( point_inside( center ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + section( center ).insert( Traction ); + } + else { + // tracks are guaranteed to hava a name so we can skip the check + ErrorLog( "Bad scenario: traction node \"" + Traction->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); + } +} + +// inserts provided instance of 3d model in the region +void +basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) { + + // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done + auto center = Instance->location(); + + if( point_inside( center ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + section( center ).insert( Instance ); + } + else { + // tracks are guaranteed to hava a name so we can skip the check + ErrorLog( "Bad scenario: model node \"" + Instance->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); + } +} + +// checks whether specified point is within boundaries of the region +bool +basic_region::point_inside( glm::dvec3 const &Location ) { + + double const regionboundary = EU07_REGIONSIDESECTIONCOUNT / 2 * EU07_SECTIONSIZE; + return ( ( Location.x > -regionboundary ) && ( Location.x < regionboundary ) + && ( Location.z > -regionboundary ) && ( Location.z < regionboundary ) ); +} + +// trims provided shape to fit into a section, adds trimmed part at the end of provided list +// NOTE: legacy function. TBD, TODO: clean it up? +bool +basic_region::RaTriangleDivider( shape_node &Shape, std::deque &Shapes ) { + + if( Shape.m_data.vertices.size() != 3 ) { + // tylko gdy jeden trójkąt + return false; + } + + auto const margin { 200.0 }; + auto x0 = EU07_SECTIONSIZE * std::floor( 0.001 * Shape.m_data.area.center.x ) - margin; + auto x1 = x0 + EU07_SECTIONSIZE + margin * 2; + auto z0 = EU07_SECTIONSIZE * std::floor( 0.001 * Shape.m_data.area.center.z ) - margin; + auto z1 = z0 + EU07_SECTIONSIZE + margin * 2; + + if( ( Shape.m_data.vertices[ 0 ].position.x >= x0 ) && ( Shape.m_data.vertices[ 0 ].position.x <= x1 ) + && ( Shape.m_data.vertices[ 0 ].position.z >= z0 ) && ( Shape.m_data.vertices[ 0 ].position.z <= z1 ) + && ( Shape.m_data.vertices[ 1 ].position.x >= x0 ) && ( Shape.m_data.vertices[ 1 ].position.x <= x1 ) + && ( Shape.m_data.vertices[ 1 ].position.z >= z0 ) && ( Shape.m_data.vertices[ 1 ].position.z <= z1 ) + && ( Shape.m_data.vertices[ 2 ].position.x >= x0 ) && ( Shape.m_data.vertices[ 2 ].position.x <= x1 ) + && ( Shape.m_data.vertices[ 2 ].position.z >= z0 ) && ( Shape.m_data.vertices[ 2 ].position.z <= z1 ) ) { + // trójkąt wystający mniej niż 200m z kw. kilometrowego jest do przyjęcia + return false; + } + // Ra: przerobić na dzielenie na 2 trójkąty, podział w przecięciu z siatką kilometrową + // Ra: i z rekurencją będzie dzielić trzy trójkąty, jeśli będzie taka potrzeba + int divide { -1 }; // bok do podzielenia: 0=AB, 1=BC, 2=CA; +4=podział po OZ; +8 na x1/z1 + double + min { 0.0 }, + mul; // jeśli przechodzi przez oś, iloczyn będzie ujemny + x0 += margin; + x1 -= margin; // przestawienie na siatkę + z0 += margin; + z1 -= margin; + // AB na wschodzie + mul = ( Shape.m_data.vertices[ 0 ].position.x - x0 ) * ( Shape.m_data.vertices[ 1 ].position.x - x0 ); + if( mul < min ) { + min = mul; + divide = 0; + } + // BC na wschodzie + mul = ( Shape.m_data.vertices[ 1 ].position.x - x0 ) * ( Shape.m_data.vertices[ 2 ].position.x - x0 ); + if( mul < min ) { + min = mul; + divide = 1; + } + // CA na wschodzie + mul = ( Shape.m_data.vertices[ 2 ].position.x - x0 ) * ( Shape.m_data.vertices[ 0 ].position.x - x0 ); + if( mul < min ) { + min = mul; + divide = 2; + } + // AB na zachodzie + mul = ( Shape.m_data.vertices[ 0 ].position.x - x1 ) * ( Shape.m_data.vertices[ 1 ].position.x - x1 ); + if( mul < min ) { + min = mul; + divide = 8; + } + // BC na zachodzie + mul = ( Shape.m_data.vertices[ 1 ].position.x - x1 ) * ( Shape.m_data.vertices[ 2 ].position.x - x1 ); + if( mul < min ) { + min = mul; + divide = 9; + } + // CA na zachodzie + mul = ( Shape.m_data.vertices[ 2 ].position.x - x1 ) * ( Shape.m_data.vertices[ 0 ].position.x - x1 ); + if( mul < min ) { + min = mul; + divide = 10; + } + // AB na południu + mul = ( Shape.m_data.vertices[ 0 ].position.z - z0 ) * ( Shape.m_data.vertices[ 1 ].position.z - z0 ); + if( mul < min ) { + min = mul; + divide = 4; + } + // BC na południu + mul = ( Shape.m_data.vertices[ 1 ].position.z - z0 ) * ( Shape.m_data.vertices[ 2 ].position.z - z0 ); + if( mul < min ) { + min = mul; + divide = 5; + } + // CA na południu + mul = ( Shape.m_data.vertices[ 2 ].position.z - z0 ) * ( Shape.m_data.vertices[ 0 ].position.z - z0 ); + if( mul < min ) { + min = mul; + divide = 6; + } + // AB na północy + mul = ( Shape.m_data.vertices[ 0 ].position.z - z1 ) * ( Shape.m_data.vertices[ 1 ].position.z - z1 ); + if( mul < min ) { + min = mul; + divide = 12; + } + // BC na północy + mul = ( Shape.m_data.vertices[ 1 ].position.z - z1 ) * ( Shape.m_data.vertices[ 2 ].position.z - z1 ); + if( mul < min ) { + min = mul; + divide = 13; + } + // CA na północy + mul = (Shape.m_data.vertices[2].position.z - z1) * (Shape.m_data.vertices[0].position.z - z1); + if( mul < min ) { + divide = 14; + } + + // tworzymy jeden dodatkowy trójkąt, dzieląc jeden bok na przecięciu siatki kilometrowej + Shapes.emplace_back( Shape ); // copy current shape + auto &newshape = Shapes.back(); + + switch (divide & 3) { + // podzielenie jednego z boków, powstaje wierzchołek D + case 0: { + // podział AB (0-1) -> ADC i DBC + newshape.m_data.vertices[ 2 ] = Shape.m_data.vertices[ 2 ]; // wierzchołek C jest wspólny + newshape.m_data.vertices[ 1 ] = Shape.m_data.vertices[ 1 ]; // wierzchołek B przechodzi do nowego + if( divide & 4 ) { + Shape.m_data.vertices[ 1 ].set_from_z( + Shape.m_data.vertices[ 0 ], + Shape.m_data.vertices[ 1 ], + ( ( divide & 8 ) ? + z1 : + z0 ) ); + } + else { + Shape.m_data.vertices[ 1 ].set_from_x( + Shape.m_data.vertices[ 0 ], + Shape.m_data.vertices[ 1 ], + ( ( divide & 8 ) ? + x1 : + x0 ) ); + } + newshape.m_data.vertices[ 0 ] = Shape.m_data.vertices[ 1 ]; // wierzchołek D jest wspólny + break; + } + case 1: { + // podział BC (1-2) -> ABD i ADC + newshape.m_data.vertices[ 0 ] = Shape.m_data.vertices[ 0 ]; // wierzchołek A jest wspólny + newshape.m_data.vertices[ 2 ] = Shape.m_data.vertices[ 2 ]; // wierzchołek C przechodzi do nowego + if( divide & 4 ) { + Shape.m_data.vertices[ 2 ].set_from_z( + Shape.m_data.vertices[ 1 ], + Shape.m_data.vertices[ 2 ], + ( ( divide & 8 ) ? + z1 : + z0 ) ); + } + else { + Shape.m_data.vertices[ 2 ].set_from_x( + Shape.m_data.vertices[ 1 ], + Shape.m_data.vertices[ 2 ], + ( ( divide & 8 ) ? + x1 : + x0 ) ); + } + newshape.m_data.vertices[ 1 ] = Shape.m_data.vertices[ 2 ]; // wierzchołek D jest wspólny + break; + } + case 2: { + // podział CA (2-0) -> ABD i DBC + newshape.m_data.vertices[ 1 ] = Shape.m_data.vertices[ 1 ]; // wierzchołek B jest wspólny + newshape.m_data.vertices[ 2 ] = Shape.m_data.vertices[ 2 ]; // wierzchołek C przechodzi do nowego + if( divide & 4 ) { + Shape.m_data.vertices[ 2 ].set_from_z( + Shape.m_data.vertices[ 2 ], + Shape.m_data.vertices[ 0 ], + ( ( divide & 8 ) ? + z1 : + z0 ) ); + } + else { + Shape.m_data.vertices[ 2 ].set_from_x( + Shape.m_data.vertices[ 2 ], + Shape.m_data.vertices[ 0 ], + ( ( divide & 8 ) ? + x1 : + x0 ) ); + } + newshape.m_data.vertices[ 0 ] = Shape.m_data.vertices[ 2 ]; // wierzchołek D jest wspólny + break; + } + } + // przeliczenie środków ciężkości obu + Shape.m_data.area.center = ( Shape.m_data.vertices[ 0 ].position + Shape.m_data.vertices[ 1 ].position + Shape.m_data.vertices[ 2 ].position ) / 3.0; + newshape.m_data.area.center = ( newshape.m_data.vertices[ 0 ].position + newshape.m_data.vertices[ 1 ].position + newshape.m_data.vertices[ 2 ].position ) / 3.0; + + return true; +} + +// provides access to section enclosing specified point +basic_section & +basic_region::section( glm::dvec3 const &Location ) { + + auto const column = static_cast( std::floor( Location.x / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ); + auto const row = static_cast( std::floor( Location.z / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ); + + return + m_sections[ + clamp( row, 0, EU07_REGIONSIDESECTIONCOUNT - 1 ) * EU07_REGIONSIDESECTIONCOUNT + + clamp( column, 0, EU07_REGIONSIDESECTIONCOUNT - 1 ) ] ; +} + +} // scene + +//--------------------------------------------------------------------------- diff --git a/scene.h b/scene.h new file mode 100644 index 00000000..a03ec979 --- /dev/null +++ b/scene.h @@ -0,0 +1,172 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include +#include +#include + +#include "parser.h" +#include "openglgeometrybank.h" +#include "scenenode.h" +#include "track.h" +#include "traction.h" + +namespace scene { + +int const EU07_CELLSIZE = 250; +int const EU07_SECTIONSIZE = 1000; +int const EU07_REGIONSIDESECTIONCOUNT = 500; // number of 1km sections along a side of square region + +struct scratch_data { + + std::stack location_offset; + glm::vec3 location_rotation; +}; + +// basic element of rudimentary partitioning scheme for the section. fixed size, no further subdivision +// TBD, TODO: replace with quadtree scheme? +class basic_cell { + + friend class opengl_renderer; + +public: +// methods + // adds provided shape to the cell + void + insert( shape_node Shape ); + // adds provided path to the cell + void + insert( TTrack *Path ); + // adds provided path to the cell + void + insert( TTraction *Traction ); + // adds provided model instance to the cell + void + insert( TAnimModel *Instance ); + // generates renderable version of held non-instanced geometry in specified geometry bank + void + create_geometry( geometrybank_handle const &Bank ); + // sets center point of the cell + void + center( glm::dvec3 Center ); + +private: +// types + using shapenode_sequence = std::vector; + using path_sequence = std::vector; + using traction_sequence = std::vector; + using instance_sequence = std::vector; +// members + scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) }; + bool m_active { false }; // whether the cell holds any actual data + // content + shapenode_sequence m_shapesopaque; // opaque pieces of geometry + shapenode_sequence m_shapestranslucent; // translucent pieces of geometry + path_sequence m_paths; // path pieces + instance_sequence m_instancesopaque; + instance_sequence m_instancetranslucent; + traction_sequence m_traction; +}; + +// basic scene partitioning structure, holds terrain geometry and collection of cells +class basic_section { + + friend class opengl_renderer; + +public: +// methods + // adds provided shape to the section + void + insert( shape_node Shape ); + // adds provided path to the section + void + insert( TTrack *Path ); + // adds provided path to the section + void + insert( TTraction *Traction ); + // adds provided model instance to the section + void + insert( TAnimModel *Instance ); + // generates renderable version of held non-instanced geometry + void + create_geometry(); + // sets center point of the section + void + center( glm::dvec3 Center ); + +private: +// types + using cell_array = std::array; + using shapenode_sequence = std::vector; +// methods + // provides access to section enclosing specified point + basic_cell & + cell( glm::dvec3 const &Location ); +// members + // placement and visibility + scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_SECTIONSIZE + 0.25 * EU07_SECTIONSIZE ) }; + bool m_active { false }; // whether the section holds any actual data, itself or in the cells + // content + cell_array m_cells; // partitioning scheme + shapenode_sequence m_shapes; // large pieces of opaque geometry and (legacy) terrain + // TODO: implement dedicated, higher fidelity, fixed resolution terrain mesh item + // gfx renderer data + geometrybank_handle m_geometrybank; + bool m_geometrycreated { false }; +}; + +// top-level of scene spatial structure, holds collection of sections +class basic_region { + + friend class opengl_renderer; + +public: +// constructors + basic_region(); +// methods + // inserts provided shape in the region + void + insert_shape( shape_node Shape, scratch_data &Scratchpad ); + // inserts provided track in the region + void + insert_path( TTrack *Path, scratch_data &Scratchpad ); + // inserts provided track in the region + void + insert_traction( TTraction *Traction, scratch_data &Scratchpad ); + // inserts provided instance of 3d model in the region + void + insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ); + + +private: +// types + using section_array = std::array; + +// methods + // checks whether specified point is within boundaries of the region + bool + point_inside( glm::dvec3 const &Location ); + // trims provided shape to fit into a section, adds trimmed part at the end of provided list + bool + RaTriangleDivider( shape_node &Shape, std::deque &Shapes ); + // provides access to section enclosing specified point + basic_section & + section( glm::dvec3 const &Location ); + +// members + section_array m_sections; + +}; + +} // scene + +//--------------------------------------------------------------------------- diff --git a/scenenode.cpp b/scenenode.cpp new file mode 100644 index 00000000..015bdd92 --- /dev/null +++ b/scenenode.cpp @@ -0,0 +1,296 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scenenode.h" + +#include "renderer.h" +#include "logs.h" + +namespace scene { + +// restores content of the node from provded input stream +shape_node & +shape_node::deserialize( cParser &Input, node_data const &Nodedata ) { + + // import common data + m_name = Nodedata.name; + m_data.rangesquared_min = Nodedata.range_min * Nodedata.range_min; + m_data.rangesquared_max = ( + Nodedata.range_max >= 0.0 ? + Nodedata.range_max * Nodedata.range_max : + std::numeric_limits::max() ); + + std::string token = Input.getToken(); + if( token == "material" ) { + // lighting settings + token = Input.getToken(); + while( token != "endmaterial" ) { + + if( token == "ambient:" ) { + Input.getTokens( 3 ); + Input + >> m_data.lighting.ambient.r + >> m_data.lighting.ambient.g + >> m_data.lighting.ambient.b; + m_data.lighting.ambient /= 255.f; + m_data.lighting.ambient.a = 1.f; + } + else if( token == "diffuse:" ) { + Input.getTokens( 3 ); + Input + >> m_data.lighting.diffuse.r + >> m_data.lighting.diffuse.g + >> m_data.lighting.diffuse.b; + m_data.lighting.diffuse /= 255.f; + m_data.lighting.diffuse.a = 1.f; + } + else if( token == "specular:" ) { + Input.getTokens( 3 ); + Input + >> m_data.lighting.specular.r + >> m_data.lighting.specular.g + >> m_data.lighting.specular.b; + m_data.lighting.specular /= 255.f; + m_data.lighting.specular.a = 1.f; + } + token = Input.getToken(); + } + token = Input.getToken(); + } + + // assigned material + m_data.material = GfxRenderer.Fetch_Material( token ); + + // determine way to proceed from the assigned diffuse texture + // TBT, TODO: add methods to material manager to access these simpler + auto const texturehandle = ( + m_data.material != null_handle ? + GfxRenderer.Material( m_data.material ).texture1 : + null_handle ); + auto const &texture = ( + texturehandle ? + GfxRenderer.Texture( texturehandle ) : + opengl_texture() ); // dirty workaround for lack of better api + bool const clamps = ( + texturehandle ? + texture.traits.find( 's' ) != std::string::npos : + false ); + bool const clampt = ( + texturehandle ? + texture.traits.find( 't' ) != std::string::npos : + false ); + + // remainder of legacy 'problend' system -- geometry assigned a texture with '@' in its name is treated as translucent, opaque otherwise + if( texturehandle != null_handle ) { + m_data.translucent = ( + ( ( texture.name.find( '@' ) != std::string::npos ) + && ( true == texture.has_alpha ) ) ? + true : + false ); + } + else { + m_data.translucent = false; + } + + // geometry + enum subtype { + triangles, + triangle_strip, + triangle_fan + } const nodetype = ( + Nodedata.type == "triangles" ? triangles : + Nodedata.type == "triangle_strip" ? triangle_strip : + triangle_fan ); + std::size_t vertexcount{ 0 }; + world_vertex vertex, vertex1, vertex2; + do { + Input.getTokens( 8, false ); + Input + >> vertex.position.x + >> vertex.position.y + >> vertex.position.z + >> vertex.normal.x + >> vertex.normal.y + >> vertex.normal.z + >> vertex.texture.s + >> vertex.texture.t; + // clamp texture coordinates if texture wrapping is off + if( true == clamps ) { vertex.texture.s = clamp( vertex.texture.s, 0.001f, 0.999f ); } + if( true == clampt ) { vertex.texture.t = clamp( vertex.texture.t, 0.001f, 0.999f ); } + // convert all data to gl_triangles to allow data merge for matching nodes + switch( nodetype ) { + case triangles: { + + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + if( false == degenerate( vertex1.position, vertex2.position, vertex.position ) ) { + m_data.vertices.emplace_back( vertex1 ); + m_data.vertices.emplace_back( vertex2 ); + m_data.vertices.emplace_back( vertex ); + } + else { + ErrorLog( + "Bad geometry: degenerate triangle encountered" + + ( m_name != "" ? " in node \"" + m_name + "\"" : "" ) + + " (vertices: " + to_string( vertex1.position ) + " + " + to_string( vertex2.position ) + " + " + to_string( vertex.position ) + ")" ); + } + } + ++vertexcount; + if( vertexcount > 2 ) { vertexcount = 0; } // start new triangle if needed + break; + } + case triangle_fan: { + + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + if( false == degenerate( vertex1.position, vertex2.position, vertex.position ) ) { + m_data.vertices.emplace_back( vertex1 ); + m_data.vertices.emplace_back( vertex2 ); + m_data.vertices.emplace_back( vertex ); + vertex2 = vertex; + } + else { + ErrorLog( + "Bad geometry: degenerate triangle encountered" + + ( m_name != "" ? " in node \"" + m_name + "\"" : "" ) + + " (vertices: " + to_string( vertex1.position ) + " + " + to_string( vertex2.position ) + " + " + to_string( vertex.position ) + ")" ); + } + } + ++vertexcount; + break; + } + case triangle_strip: { + + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + if( false == degenerate( vertex1.position, vertex2.position, vertex.position ) ) { + // swap order every other triangle, to maintain consistent winding + if( vertexcount % 2 == 0 ) { + m_data.vertices.emplace_back( vertex1 ); + m_data.vertices.emplace_back( vertex2 ); + } + else { + m_data.vertices.emplace_back( vertex2 ); + m_data.vertices.emplace_back( vertex1 ); + } + m_data.vertices.emplace_back( vertex ); + + vertex1 = vertex2; + vertex2 = vertex; + } + else { + ErrorLog( + "Bad geometry: degenerate triangle encountered" + + ( m_name != "" ? " in node \"" + m_name + "\"" : "" ) + + " (vertices: " + to_string( vertex1.position ) + " + " + to_string( vertex2.position ) + " + " + to_string( vertex.position ) + ")" ); + } + } + ++vertexcount; + break; + } + default: { break; } + } + token = Input.getToken(); + + } while( token != "endtri" ); + + return *this; +} + +// adds content of provided node to already enclosed geometry. returns: true if merge could be performed +bool +shape_node::merge( shape_node &Shape ) { + + if( ( m_data.material != Shape.m_data.material ) + || ( m_data.lighting != Shape.m_data.lighting ) ) { + // can't merge nodes with different appearance + return false; + } + // add geometry from provided node + m_data.area.center = + interpolate( + m_data.area.center, Shape.m_data.area.center, + static_cast( Shape.m_data.vertices.size() ) / ( Shape.m_data.vertices.size() + m_data.vertices.size() ) ); + m_data.vertices.insert( + std::end( m_data.vertices ), + std::begin( Shape.m_data.vertices ), std::end( Shape.m_data.vertices ) ); + // NOTE: we could recalculate radius with something other than brute force, but it'll do + compute_radius(); + + return true; +} + +// generates renderable version of held non-instanced geometry in specified geometry bank +void +shape_node::create_geometry( geometrybank_handle const &Bank ) { + + vertex_array vertices; vertices.reserve( m_data.vertices.size() ); + + for( auto const &vertex : m_data.vertices ) { + vertices.emplace_back( + vertex.position - m_data.origin, + vertex.normal, + vertex.texture ); + } + m_data.geometry = GfxRenderer.Insert( vertices, Bank, GL_TRIANGLES ); + std::vector().swap( m_data.vertices ); // hipster shrink_to_fit +} + +// calculates shape's bounding radius +void +shape_node::compute_radius() { + + auto squaredradius { 0.0 }; + for( auto const &vertex : m_data.vertices ) { + squaredradius = std::max( + squaredradius, + glm::length2( vertex.position - m_data.area.center ) ); + } + m_data.area.radius = static_cast( std::sqrt( squaredradius ) ); +} + + +/* +memory_node & +memory_node::deserialize( cParser &Input, node_data const &Nodedata ) { + + // import common data + m_name = Nodedata.name; + + Input.getTokens( 3 ); + Input + >> m_data.area.center.x + >> m_data.area.center.y + >> m_data.area.center.z; + + TMemCell memorycell( Nodedata.name ); + memorycell.Load( &Input ); +} +*/ +} // scene + +namespace editor { + +basic_node::basic_node( scene::node_data const &Nodedata ) : + m_name( Nodedata.name ) +{ + m_rangesquaredmin = Nodedata.range_min * Nodedata.range_min; + m_rangesquaredmax = ( + Nodedata.range_max >= 0.0 ? + Nodedata.range_max * Nodedata.range_max : + std::numeric_limits::max() ); +} + + +} // editor +//--------------------------------------------------------------------------- diff --git a/scenenode.h b/scenenode.h new file mode 100644 index 00000000..fed77544 --- /dev/null +++ b/scenenode.h @@ -0,0 +1,253 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +#include "material.h" +#include "vertex.h" +#include "openglgeometrybank.h" +#include "parser.h" + +struct lighting_data { + + glm::vec4 diffuse { 0.8f, 0.8f, 0.8f, 1.0f }; + glm::vec4 ambient { 0.2f, 0.2f, 0.2f, 1.0f }; + glm::vec4 specular { 0.0f, 0.0f, 0.0f, 1.0f }; +}; + +inline +bool +operator==( lighting_data const &Left, lighting_data const &Right ) { + return ( ( Left.diffuse == Right.diffuse ) + && ( Left.ambient == Right.ambient ) + && ( Left.specular == Right.specular ) ); } + +inline +bool +operator!=( lighting_data const &Left, lighting_data const &Right ) { + return !( Left == Right ); } + +namespace scene { + +struct bounding_area { + + glm::dvec3 center; // mid point of the rectangle + float radius { -1.0f }; // radius of the bounding sphere + + bounding_area() = default; + bounding_area( glm::dvec3 Center, float Radius ) : + center( Center ), + radius( Radius ) + {} +}; +/* +enum nodetype { + + unknown, + model, + triangles, + lines, + dynamic, + track, + traction, + powersource, + sound, + memorycell, + eventlauncher +}; + +class node_manager { + +}; +*/ + +struct node_data { + + double range_min { 0.0 }; + double range_max { 0.0 }; + std::string name; + std::string type; +}; + +// holds unique piece of geometry, covered with single material +class shape_node { + + friend class basic_region; // region might want to modify node content when it's being inserted + +public: +// types + struct shapenode_data { + // placement and visibility + bounding_area area; // bounding area, in world coordinates + bool visible { true }; // visibility flag + double rangesquared_min { 0.0 }; // visibility range, min + double rangesquared_max { 0.0 }; // visibility range, max + // material data + material_handle material { 0 }; + lighting_data lighting; + bool translucent { false }; // whether opaque or translucent + // geometry data + std::vector vertices; // world space source data of the geometry + glm::dvec3 origin; // world position of the relative coordinate system origin + geometry_handle geometry { 0, 0 }; // relative origin-centered chunk of geometry held by gfx renderer + }; + +// methods + // restores content of the node from provded input stream + shape_node & + deserialize( cParser &Input, node_data const &Nodedata ); + // adds content of provided node to already enclosed geometry. returns: true if merge could be performed + bool + merge( shape_node &Shape ); + // generates renderable version of held non-instanced geometry in specified geometry bank + void + create_geometry( geometrybank_handle const &Bank ); + // calculates shape's bounding radius + void + compute_radius(); + // set visibility + void + visible( bool State ) { + m_data.visible = State; } + // set origin point + void + origin( glm::dvec3 Origin ) { + m_data.origin = Origin; } + // data access + shapenode_data const & + data() const { + return m_data; } + +private: +// members + std::string m_name; + shapenode_data m_data; +}; + + +/* +// holds geometry for specific piece of track/road/waterway +class path_node { + + friend class basic_region; // region might want to modify node content when it's being inserted + +public: +// types + // TODO: enable after track class refactoring + struct pathnode_data { + // placement and visibility + bounding_area area; // bounding area, in world coordinates + bool visible { true }; // visibility flag + // material data + material_handle material_1 { 0 }; + material_handle material_2 { 0 }; + lighting_data lighting; + TEnvironmentType environment { e_flat }; + // geometry data + std::vector vertices; // world space source data of the geometry + glm::dvec3 origin; // world position of the relative coordinate system origin + using geometryhandle_sequence = std::vector; + geometryhandle_sequence geometry_1; // geometry chunks textured with texture 1 + geometryhandle_sequence geometry_2; // geometry chunks textured with texture 2 + }; +// methods + // restores content of the node from provded input stream + // TODO: implement + path_node & + deserialize( cParser &Input, node_data const &Nodedata ); + // binds specified track to the node + // TODO: remove after track class refactoring + void + path( TTrack *Path ) { + m_path = Path; } + TTrack * + path() { + return m_path; } + +private: +// members + +// // TODO: enable after track class refactoring +// pathnode_data m_data; + + TTrack * m_path; +}; +*/ +/* +// holds reference to memory cell +class memorycell_node { + + friend class basic_region; // region might want to modify node content when it's being inserted + +public: +// types + struct memorynode_data { + // placement and visibility + bounding_area area; // bounding area, in world coordinates + bool visible { false }; // visibility flag + }; +// methods + // restores content of the node from provded input stream + // TODO: implement + memory_node & + deserialize( cParser &Input, node_data const &Nodedata ); + void + cell( TMemCell *Cell ) { + m_memorycell = Cell; } + TMemCell * + cell() { + return m_memorycell; } + +private: +// members + memorynode_data m_data; + TMemCell * m_memorycell; +}; +*/ +} // scene + +namespace editor { + +// base interface for nodes which can be actvated in scenario editor +struct basic_node { + +public: +// constructor + basic_node() = default; // TODO: remove after refactor + basic_node( scene::node_data const &Nodedata ); +// destructor + virtual ~basic_node() = default; +// methods + std::string const & + name() const { + return m_name; } + glm::dvec3 const & + location() { + return m_location; }; + void + location( glm::dvec3 const Location ) { + m_location = Location; } + bool + visible() const { + return m_visible; } + +protected: +// members + glm::dvec3 m_location; + bool m_visible { true }; + double m_rangesquaredmin { 0.0 }; // visibility range, min + double m_rangesquaredmax { 0.0 }; // visibility range, max + std::string m_name; +}; + +} // editor + +//--------------------------------------------------------------------------- diff --git a/simulation.cpp b/simulation.cpp new file mode 100644 index 00000000..a522a636 --- /dev/null +++ b/simulation.cpp @@ -0,0 +1,521 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "simulation.h" + +#include "globals.h" +#include "logs.h" + +namespace simulation { + +state_manager State; +event_manager Events; +memory_manager Memory; +path_table Paths; +traction_table Traction; +instance_manager Instances; +light_array Lights; +scene::basic_region Region; + +bool +state_manager::deserialize( std::string const &Scenariofile ) { + + // TODO: check first for presence of serialized binary files + // if this fails, fall back on the legacy text format + cParser scenarioparser( Scenariofile, cParser::buffer_FILE, Global::asCurrentSceneryPath, Global::bLoadTraction ); + + if( false == scenarioparser.ok() ) { return false; } + + deserialize( scenarioparser ); + // TODO: initialize links between loaded nodes + + return true; +} + +// restores class data from provided stream +void +state_manager::deserialize( cParser &Input ) { + + scene::scratch_data importscratchpad; + // prepare deserialization function table + // since all methods use the same objects, we can have simple, hard-coded binds or lambdas for the task + using deserializefunction = void(state_manager::*)(cParser &, scene::scratch_data &); + std::vector< + std::pair< + std::string, + deserializefunction> > functionlist = { + { "atmo", &state_manager::deserialize_atmo }, + { "camera", &state_manager::deserialize_camera }, + { "config", &state_manager::deserialize_config }, + { "description", &state_manager::deserialize_description }, + { "event", &state_manager::deserialize_event }, + { "firstinit", &state_manager::deserialize_firstinit }, + { "light", &state_manager::deserialize_light }, + { "node", &state_manager::deserialize_node }, + { "origin", &state_manager::deserialize_origin }, + { "endorigin", &state_manager::deserialize_endorigin }, + { "rotate", &state_manager::deserialize_rotate }, + { "sky", &state_manager::deserialize_sky }, + { "test", &state_manager::deserialize_test }, + { "time", &state_manager::deserialize_time }, + { "trainset", &state_manager::deserialize_trainset }, + { "endtrainset", &state_manager::deserialize_endtrainset } }; + using deserializefunctionbind = std::function; + std::unordered_map< + std::string, + deserializefunctionbind> functionmap; + for( auto &function : functionlist ) { + functionmap.emplace( function.first, std::bind( function.second, this, std::ref( Input ), std::ref( importscratchpad ) ) ); + } + // deserialize content from the provided input + std::string token { Input.getToken() }; + while( false == token.empty() ) { + + auto lookup = functionmap.find( token ); + if( lookup != functionmap.end() ) { + lookup->second(); + } + else { + ErrorLog( "Bad scenario: unexpected token \"" + token + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); + } + + token = Input.getToken(); + } +} + +void +state_manager::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ) { + + // NOTE: parameter system needs some decent replacement, but not worth the effort if we're moving to built-in editor + // atmosphere color; legacy parameter, no longer used + Input.getTokens( 3 ); + // fog range + Input.getTokens( 2 ); + Input + >> Global::fFogStart + >> Global::fFogEnd; + + if( Global::fFogEnd > 0.0 ) { + // fog colour; optional legacy parameter, no longer used + Input.getTokens( 3 ); + } + + std::string token { Input.getToken() }; + if( token != "endatmo" ) { + // optional overcast parameter + Global::Overcast = clamp( std::stof( token ), 0.f, 1.f ); + } + while( ( false == token.empty() ) + && ( token != "endatmo" ) ) { + // anything else left in the section has no defined meaning + token = Input.getToken(); + } +} + +void +state_manager::deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ) { + + glm::dvec3 xyz, abc; + int i = -1, into = -1; // do której definicji kamery wstawić + std::string token; + do { // opcjonalna siódma liczba określa numer kamery, a kiedyś były tylko 3 + Input.getTokens(); + Input >> token; + switch( ++i ) { // kiedyś camera miało tylko 3 współrzędne + case 0: { xyz.x = atof( token.c_str() ); break; } + case 1: { xyz.y = atof( token.c_str() ); break; } + case 2: { xyz.z = atof( token.c_str() ); break; } + case 3: { abc.x = atof( token.c_str() ); break; } + case 4: { abc.y = atof( token.c_str() ); break; } + case 5: { abc.z = atof( token.c_str() ); break; } + case 6: { into = atoi( token.c_str() ); break; } // takie sobie, bo można wpisać -1 + default: { break; } + } + } while( token.compare( "endcamera" ) != 0 ); + if( into < 0 ) + into = ++Global::iCameraLast; + if( into < 10 ) { // przepisanie do odpowiedniego miejsca w tabelce + Global::FreeCameraInit[ into ] = xyz; + Global::FreeCameraInitAngle[ into ] = + Math3D::vector3( + glm::radians( abc.x ), + glm::radians( abc.y ), + glm::radians( abc.z ) ); + Global::iCameraLast = into; // numer ostatniej + } +/* + // cleaned up version of the above. + // NOTE: no longer supports legacy mode where some parameters were optional + Input.getTokens( 7 ); + glm::vec3 + position, + rotation; + int index; + Input + >> position.x + >> position.y + >> position.z + >> rotation.x + >> rotation.y + >> rotation.z + >> index; + + skip_until( Input, "endcamera" ); + + // TODO: finish this +*/ +} + +void +state_manager::deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ) { + + // config parameters (re)definition + Global::ConfigParse( Input ); +} + +void +state_manager::deserialize_description( cParser &Input, scene::scratch_data &Scratchpad ) { + + // legacy section, never really used; + skip_until( Input, "enddescription" ); +} + +void +state_manager::deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ) { + + // TODO: refactor event class and its de/serialization. do offset and rotation after deserialization is done + auto *event = new TEvent(); + Math3D::vector3 offset = ( + Scratchpad.location_offset.empty() ? + Math3D::vector3() : + Math3D::vector3( + Scratchpad.location_offset.top().x, + Scratchpad.location_offset.top().y, + Scratchpad.location_offset.top().z ) ); + event->Load( &Input, offset ); + + if( false == simulation::Events.insert( event ) ) { + delete event; + } +} + +void +state_manager::deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ) { + + // TODO: implement + simulation::Paths.InitTracks(); + simulation::Traction.InitTraction(); + simulation::Events.InitEvents(); +} + +void +state_manager::deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ) { + + // legacy section, no longer used nor supported; + skip_until( Input, "endlight" ); +} + +void +state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ) { + + scene::node_data nodedata; + // common data and node type indicator + Input.getTokens( 4 ); + Input + >> nodedata.range_max + >> nodedata.range_min + >> nodedata.name + >> nodedata.type; + // type-based deserialization. not elegant but it'll do + if( nodedata.type == "dynamic" ) { + // TODO: implement + skip_until( Input, "enddynamic" ); + } + else if( nodedata.type == "track" ) { + + auto const inputline = Input.Line(); // cache in case we need to report error + + auto *path { deserialize_path( Input, Scratchpad, nodedata ) }; + // duplicates of named tracks are currently experimentally allowed + if( simulation::Paths.insert( path ) ) { + simulation::Region.insert_path( path, Scratchpad ); + } + else { + ErrorLog( "Bad scenario: track with duplicate name, \"" + path->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); +/* + delete path; + delete pathnode; +*/ + } + } + else if( nodedata.type == "traction" ) { + + auto const inputline = Input.Line(); // cache in case we need to report error + + auto *traction { deserialize_traction( Input, Scratchpad, nodedata ) }; + // duplicates of named tracks are currently discarded + if( simulation::Traction.insert( traction ) ) { + simulation::Region.insert_traction( traction, Scratchpad ); + } + else { + ErrorLog( "Bad scenario: traction piece with duplicate name, \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + } + else if( nodedata.type == "tractionpowersource" ) { + // TODO: implement + skip_until( Input, "end" ); + } + else if( nodedata.type == "model" ) { + + if( nodedata.range_min < 0.0 ) { + // convert and import 3d terrain + } + else { + // regular instance of 3d mesh + auto const inputline = Input.Line(); // cache in case we need to report error + + auto *instance { deserialize_model( Input, Scratchpad, nodedata ) }; + // model import can potentially fail + if( instance == nullptr ) { return; } + + if( simulation::Instances.insert( instance ) ) { + simulation::Region.insert_instance( instance, Scratchpad ); + } + else { + ErrorLog( "Bad scenario: 3d model instance with duplicate name, \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + } + } + else if( ( nodedata.type == "triangles" ) + || ( nodedata.type == "triangle_strip" ) + || ( nodedata.type == "triangle_fan" ) ) { + + simulation::Region.insert_shape( scene::shape_node().deserialize( Input, nodedata ), Scratchpad ); + } + else if( ( nodedata.type == "lines" ) + || ( nodedata.type == "line_strip" ) + || ( nodedata.type == "line_loop" ) ) { + + // TODO: implement + skip_until( Input, "endline" ); + } + else if( nodedata.type == "memcell" ) { + + auto const inputline = Input.Line(); // cache in case we need to report error + + auto *memorycell { deserialize_memorycell( Input, Scratchpad, nodedata ) }; + // duplicates of named tracks are currently discarded + if( simulation::Memory.insert( memorycell ) ) { +/* + // TODO: implement this + simulation::Region.insert_memorycell( memorycell, Scratchpad ); +*/ + } + else { + ErrorLog( "Bad scenario: memory cell with duplicate name, \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); +/* + delete memorycell; + delete memorycellnode; +*/ + } + } + else if( nodedata.type == "eventlauncher" ) { + // TODO: implement + skip_until( Input, "end" ); + } + else if( nodedata.type == "sound" ) { + // TODO: implement + skip_until( Input, "endsound" ); + } + +} + +void +state_manager::deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ) { + + glm::dvec3 offset; + Input.getTokens( 3 ); + Input + >> offset.x + >> offset.y + >> offset.z; + // sumowanie całkowitego przesunięcia + Scratchpad.location_offset.emplace( + offset + ( + Scratchpad.location_offset.empty() ? + glm::dvec3() : + Scratchpad.location_offset.top() ) ); +} + +void +state_manager::deserialize_endorigin( cParser &Input, scene::scratch_data &Scratchpad ) { + + if( false == Scratchpad.location_offset.empty() ) { + Scratchpad.location_offset.pop(); + } + else { + ErrorLog( "Bad origin: endorigin instruction with empty origin stack in file \"" + Input.Name() + "\" (line " + to_string( Input.Line() - 1 ) + ")" ); + } +} + +void +state_manager::deserialize_rotate( cParser &Input, scene::scratch_data &Scratchpad ) { + + Input.getTokens( 3 ); + Input + >> Scratchpad.location_rotation.x + >> Scratchpad.location_rotation.y + >> Scratchpad.location_rotation.z; +} + +void +state_manager::deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad ) { + + // sky model + Input.getTokens( 1 ); + Input + >> Global::asSky; + // anything else left in the section has no defined meaning + skip_until( Input, "endsky" ); +} + +void +state_manager::deserialize_test( cParser &Input, scene::scratch_data &Scratchpad ) { + + // legacy section, no longer supported; + skip_until( Input, "endtest" ); +} + +void +state_manager::deserialize_time( cParser &Input, scene::scratch_data &Scratchpad ) { + + // current scenario time + cParser timeparser( Input.getToken() ); + timeparser.getTokens( 2, false, ":" ); + auto &time = simulation::Time.data(); + timeparser + >> time.wHour + >> time.wMinute; + + // remaining sunrise and sunset parameters are no longer used, as they're now calculated dynamically + // anything else left in the section has no defined meaning + skip_until( Input, "endtime" ); +} + +void +state_manager::deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ) { + + // TODO: implement + skip_until( Input, "endtrainset" ); +} + +void +state_manager::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ) { + + // TODO: implement +} + +// creates path and its wrapper, restoring class data from provided stream +TTrack * +state_manager::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done + auto *track = new TTrack( Nodedata ); + Math3D::vector3 offset = ( + Scratchpad.location_offset.empty() ? + Math3D::vector3() : + Math3D::vector3( + Scratchpad.location_offset.top().x, + Scratchpad.location_offset.top().y, + Scratchpad.location_offset.top().z ) ); + track->Load( &Input, offset ); + + return track; +} + +TTraction * +state_manager::deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done + auto *traction = new TTraction( Nodedata ); + auto offset = ( + Scratchpad.location_offset.empty() ? + glm::dvec3() : + Scratchpad.location_offset.top() ); + traction->Load( &Input, offset ); + + return traction; +} + +TMemCell * +state_manager::deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + auto *memorycell = new TMemCell( Nodedata ); + memorycell->Load( &Input ); + // adjust location + memorycell->location( transform( memorycell->location(), Scratchpad ) ); + + return memorycell; +} + +TAnimModel * +state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + glm::dvec3 location; + glm::vec3 rotation; + Input.getTokens( 4 ); + Input + >> location.x + >> location.y + >> location.z + >> rotation.y; + // adjust location + + auto *instance = new TAnimModel( Nodedata ); + instance->RaAnglesSet( Scratchpad.location_rotation + rotation ); // dostosowanie do pochylania linii + + if( false == instance->Load( &Input, false ) ) { + // model nie wczytał się - ignorowanie node + SafeDelete( instance ); + } + instance->location( transform( location, Scratchpad ) ); + + return instance; +} + +// skips content of stream until specified token +void +state_manager::skip_until( cParser &Input, std::string const &Token ) { + + std::string token { Input.getToken() }; + while( ( false == token.empty() ) + && ( token != Token ) ) { + + token = Input.getToken(); + } +} + +// transforms provided location by specifed rotation and offset +glm::dvec3 +state_manager::transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ) { + + if( Scratchpad.location_rotation != glm::vec3( 0, 0, 0 ) ) { + auto const rotation = glm::radians( Scratchpad.location_rotation ); + Location = glm::rotateY( Location, rotation.y ); // Ra 2014-11: uwzględnienie rotacji + } + if( false == Scratchpad.location_offset.empty() ) { + Location += Scratchpad.location_offset.top(); + } + return Location; +} + +} // simulation + +//--------------------------------------------------------------------------- diff --git a/simulation.h b/simulation.h new file mode 100644 index 00000000..be7da4dc --- /dev/null +++ b/simulation.h @@ -0,0 +1,73 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "event.h" +#include "memcell.h" +#include "track.h" +#include "traction.h" +#include "animmodel.h" +#include "scene.h" +#include "lightarray.h" +#include "parser.h" + +namespace simulation { + +class state_manager { + +public: +// types + +// methods + bool + deserialize( std::string const &Scenariofile ); + +private: +// methods + // restores class data from provided stream + void deserialize( cParser &Input ); + void deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_description( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_endorigin( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_rotate( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_test( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_time( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ); + TTrack * deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TTraction * deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TMemCell * deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TAnimModel * deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + // skips content of stream until specified token + void skip_until( cParser &Input, std::string const &Token ); + // transforms provided location by specifed rotation and offset + glm::dvec3 transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ); +}; + +extern state_manager State; +extern event_manager Events; +extern memory_manager Memory; +extern path_table Paths; +extern traction_table Traction; +extern instance_manager Instances; +extern light_array Lights; +extern scene::basic_region Region; + +} // simulation + +//--------------------------------------------------------------------------- diff --git a/stdafx.h b/stdafx.h index c9a7f419..c08f2fed 100644 --- a/stdafx.h +++ b/stdafx.h @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -93,3 +94,5 @@ #include #include "openglmatrixstack.h" + +//#define EU07_USE_OLD_GROUNDCODE diff --git a/vertex.cpp b/vertex.cpp new file mode 100644 index 00000000..79093460 --- /dev/null +++ b/vertex.cpp @@ -0,0 +1,35 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "stdafx.h" +#include "vertex.h" + +template <> +world_vertex & +world_vertex::operator+=( world_vertex const &Right ) { + + position += Right.position; + normal += Right.normal; + texture += Right.texture; + return *this; +} + +template <> +world_vertex & +world_vertex::operator*=( world_vertex const &Right ) { + + position *= Right.position; + normal *= Right.normal; + texture *= Right.texture; + return *this; +} + +//--------------------------------------------------------------------------- diff --git a/vertex.h b/vertex.h new file mode 100644 index 00000000..ee983439 --- /dev/null +++ b/vertex.h @@ -0,0 +1,87 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include +#include "usefull.h" + +// geometry vertex with double precision position +struct world_vertex { + +// members + glm::dvec3 position; + glm::vec3 normal; + glm::vec2 texture; + +// overloads + // operator+ + template + world_vertex & + operator+=( Scalar_ const &Right ) { + position += Right; + normal += Right; + texture += Right; + return *this; } + template + friend + world_vertex + operator+( world_vertex Left, Scalar_ const &Right ) { + Left += Right; + return Left; } + // operator* + template + world_vertex & + operator*=( Scalar_ const &Right ) { + position *= Right; + normal *= Right; + texture *= Right; + return *this; } + template + friend + world_vertex + operator*( world_vertex Left, Type_ const &Right ) { + Left *= Right; + return Left; } +// methods + // wyliczenie współrzędnych i mapowania punktu na środku odcinka v1<->v2 + void + set_half( world_vertex const &Vertex1, world_vertex const &Vertex2 ) { + *this = + interpolate( + Vertex1, + Vertex2, + 0.5 ); } + // wyliczenie współrzędnych i mapowania punktu na odcinku v1<->v2 + void + set_from_x( world_vertex const &Vertex1, world_vertex const &Vertex2, double const X ) { + *this = + interpolate( + Vertex1, + Vertex2, + ( X - Vertex1.position.x ) / ( Vertex2.position.x - Vertex1.position.x ) ); } + // wyliczenie współrzędnych i mapowania punktu na odcinku v1<->v2 + void + set_from_z( world_vertex const &Vertex1, world_vertex const &Vertex2, double const Z ) { + *this = + interpolate( + Vertex1, + Vertex2, + ( Z - Vertex1.position.z ) / ( Vertex2.position.z - Vertex1.position.z ) ); } +}; + +template <> +world_vertex & +world_vertex::operator+=( world_vertex const &Right ); + +template <> +world_vertex & +world_vertex::operator*=( world_vertex const &Right ); + +//--------------------------------------------------------------------------- From 020c71533fc189c54a56cdc36097927ffc35ead6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 7 Oct 2017 17:20:53 +0200 Subject: [PATCH 197/426] reduced memory use, re-enabled debug mode, plugged some of remaining memory leaks --- EU07.cpp | 14 ++------------ Event.cpp | 24 ++++++++++-------------- Event.h | 6 ++++-- Ground.cpp | 17 ++++++++++++++++- Model3d.cpp | 3 ++- Traction.cpp | 11 ++++++++++- Traction.h | 4 ++++ frustum.h | 3 +++ maszyna.rc | Bin 6376 -> 6376 bytes renderer.cpp | 29 +++++++++++------------------ renderer.h | 4 ++-- resource.h | 2 +- scene.cpp | 28 ++++++++++++++++++++-------- scene.h | 5 +++-- simulation.cpp | 15 ++++++++++----- simulation.h | 3 ++- 16 files changed, 100 insertions(+), 68 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 5879c7e3..590890fa 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -31,7 +31,6 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "Mover.h" #include "usefull.h" #include "timer.h" -#include "resource.h" #include "uilayer.h" #ifdef EU07_BUILD_STATIC @@ -400,16 +399,6 @@ int main(int argc, char *argv[]) BaseWindowProc = (WNDPROC)::SetWindowLongPtr( Hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc ); // switch off the topmost flag ::SetWindowPos( Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); - - const HANDLE icon = ::LoadImage( - ::GetModuleHandle( 0 ), - MAKEINTRESOURCE( IDI_ICON1 ), - IMAGE_ICON, - ::GetSystemMetrics( SM_CXSMICON ), - ::GetSystemMetrics( SM_CYSMICON ), - 0 ); - if( icon ) - ::SendMessage( Hwnd, WM_SETICON, ICON_SMALL, reinterpret_cast( icon ) ); #endif if( ( false == GfxRenderer.Init( window ) ) @@ -466,7 +455,8 @@ int main(int argc, char *argv[]) Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) TPythonInterpreter::killInstance(); - delete pConsole; + SafeDelete( pConsole ); + SafeDelete( simulation::Region ); glfwDestroyWindow(window); glfwTerminate(); diff --git a/Event.cpp b/Event.cpp index 15d75f90..6d013b8a 100644 --- a/Event.cpp +++ b/Event.cpp @@ -210,13 +210,12 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) parser->getTokens(); *parser >> token; - // str = AnsiString(token.c_str()); if (token != "none") asNodeName = token; // nazwa obiektu powiązanego if (asName.substr(0, 5) == "none_") - Type = tp_Ignored; // Ra: takie są ignorowane + m_ignored = true; // Ra: takie są ignorowane switch (Type) { @@ -226,7 +225,7 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) // if (Type==tp_UpdateValues) iFlags=0; //co modyfikować parser->getTokens(1, false); // case sensitive *parser >> token; - Params[0].asText = new char[token.size() + 1]; // BUG: source of memory leak + Params[0].asText = new char[token.size() + 1]; strcpy(Params[0].asText, token.c_str()); if (token != "*") // czy ma zostać bez zmian? iFlags |= update_memstring; @@ -605,7 +604,7 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) // str = AnsiString(token.c_str()); } while (token != "endevent"); break; - case tp_Ignored: // ignorowany +// case tp_Ignored: // ignorowany case tp_Unknown: // nieznany do { @@ -777,10 +776,7 @@ event_manager::insert( TEvent *Event ) { // can be cleaned up if pointers to events were replaced with handles ErrorLog( "Bad event: encountered duplicated event, \"" + Event->asName + "\"" ); duplicate->Append( Event ); // doczepka (taki wirtualny multiple bez warunków) - // BUG: source of memory leak. - // erasing original type of event prevents it from proper resource de-allocation on exit - // TODO: mark ignored event with separate flag or ideally refactor the whole thing - duplicate->Type = tp_Ignored; // dezaktywacja pierwotnego - taka proteza na wsteczną zgodność + duplicate->m_ignored = true; // dezaktywacja pierwotnego - taka proteza na wsteczną zgodność } } @@ -788,7 +784,7 @@ event_manager::insert( TEvent *Event ) { if( lookup == m_eventmap.end() ) { // if it's first event with such name, it's potential candidate for the execution queue m_eventmap.emplace( Event->asName, m_events.size() - 1 ); - if( ( Event->Type != tp_Ignored ) + if( ( Event->m_ignored != true ) && ( Event->asName.find( "onstart" ) != std::string::npos ) ) { // event uruchamiany automatycznie po starcie AddToQuery( Event, nullptr ); @@ -815,7 +811,7 @@ event_manager::FindEvent( std::string const &Name ) { bool event_manager::AddToQuery( TEvent *Event, TDynamicObject *Owner ) { - if( Event->bEnabled ) { + if( ( false == Event->m_ignored ) && ( true == Event->bEnabled ) ) { // jeśli może być dodany do kolejki (nie używany w skanowaniu) if( !Event->iQueued ) // jeśli nie dodany jeszcze do kolejki { // kolejka eventów jest posortowana względem (fStartTime) @@ -902,8 +898,8 @@ event_manager::CheckQuery() { } else // a jak nazwa jest unikalna, to kolejka idzie dalej QueryRootEvent = QueryRootEvent->evNext; // NULL w skrajnym przypadku - if (m_workevent->bEnabled) - { // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć + if( ( false == m_workevent->m_ignored ) && ( true == m_workevent->bEnabled ) ) { + // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć --m_workevent->iQueued; // teraz moze być ponownie dodany do kolejki WriteLog( "EVENT LAUNCHED" + ( m_workevent->Activator ? ( " by " + m_workevent->Activator->asName ) : "" ) + ": " + m_workevent->asName ); switch (m_workevent->Type) @@ -1270,7 +1266,7 @@ event_manager::InitEvents() { } else { // nie ma komórki, to nie będzie działał poprawnie - Current->Type = tp_Ignored; // deaktywacja + Current->m_ignored = true; // deaktywacja ErrorLog( "Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\"" ); } break; @@ -1297,7 +1293,7 @@ event_manager::InitEvents() { } else { // nie ma komórki, to nie będzie działał poprawnie - Current->Type = tp_Ignored; // deaktywacja + Current->m_ignored = true; // deaktywacja ErrorLog( "Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\"" ); } break; diff --git a/Event.h b/Event.h index 219441d2..340aa245 100644 --- a/Event.h +++ b/Event.h @@ -30,7 +30,7 @@ enum TEventType { tp_TrackVel, tp_Multiple, tp_AddValues, - tp_Ignored, +// tp_Ignored, // NOTE: refactored to separate flag tp_CopyValues, tp_WhoIs, tp_LogValues, @@ -84,6 +84,7 @@ class TEvent // zmienne: ev* public: std::string asName; + bool m_ignored { false }; // replacement for tp_ignored bool bEnabled = false; // false gdy ma nie być dodawany do kolejki (skanowanie sygnałów) int iQueued = 0; // ile razy dodany do kolejki TEvent *evNext = nullptr; // następny w kolejce @@ -99,7 +100,8 @@ class TEvent // zmienne: ev* std::string asNodeName; // McZapkie-100302 - dodalem zeby zapamietac nazwe toru TEvent *evJoined = nullptr; // kolejny event z tą samą nazwą - od wersji 378 double fRandomDelay = 0.0; // zakres dodatkowego opóźnienia // standardowo nie będzie dodatkowego losowego opóźnienia - public: // metody +public: + // metody TEvent(std::string const &m = ""); ~TEvent(); void Init(); diff --git a/Ground.cpp b/Ground.cpp index f415dab9..8ffe1c38 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -2485,9 +2485,15 @@ void TGround::InitTracks() { // jak coś pójdzie źle, to robimy z tego normalny tor // Track->ModelAssign(tmp->Model->GetContainer(NULL)); //wiązanie toru z modelem // obrotnicy +#ifdef EU07_USE_OLD_GROUNDCODE + Track->RaAssign( + Current, Model ? Model->Model : NULL, FindEvent( Current->asName + ":done" ), + FindEvent( Current->asName + ":joined" ) ); // wiązanie toru z modelem obrotnicy +#else Track->RaAssign( Current, Model ? Model->Model : NULL, simulation::Events.FindEvent(Current->asName + ":done"), simulation::Events.FindEvent(Current->asName + ":joined")); // wiązanie toru z modelem obrotnicy +#endif // break; //jednak połączę z sąsiednim, jak ma się wysypywać null track } if (!Model) // jak nie ma modelu @@ -2867,12 +2873,21 @@ bool TGround::InitLaunchers() } else EventLauncher->MemCell = nullptr; +#ifdef EU07_USE_OLD_GROUNDCODE + EventLauncher->Event1 = ( EventLauncher->asEvent1Name != "none") ? + FindEvent(EventLauncher->asEvent1Name) : + nullptr; + EventLauncher->Event2 = ( EventLauncher->asEvent2Name != "none") ? + FindEvent(EventLauncher->asEvent2Name) : + nullptr; +#else EventLauncher->Event1 = ( EventLauncher->asEvent1Name != "none") ? simulation::Events.FindEvent(EventLauncher->asEvent1Name) : nullptr; EventLauncher->Event2 = ( EventLauncher->asEvent2Name != "none") ? simulation::Events.FindEvent(EventLauncher->asEvent2Name) : nullptr; +#endif } return true; } @@ -3526,7 +3541,7 @@ bool TGround::Update(double dt, int iter) if (bDynamicRemove) { // jeśli jest coś do usunięcia z listy, to trzeba na końcu for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) - if (!Current->DynamicObject->bEnabled) + if ( false == Current->DynamicObject->bEnabled) { DynamicRemove(Current->DynamicObject); // usunięcie tego i podłączonych Current = nRootDynamic; // sprawdzanie listy od początku diff --git a/Model3d.cpp b/Model3d.cpp index 081b0709..ea6dd7b9 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1147,7 +1147,8 @@ TModel3d::~TModel3d() { if (iFlags & 0x0200) { // wczytany z pliku tekstowego, submodele sprzątają same - Root = nullptr; + SafeDelete( Root ); +// Root = nullptr; } else { // wczytano z pliku binarnego (jest właścicielem tablic) diff --git a/Traction.cpp b/Traction.cpp index 458dd7e7..dccce473 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -174,12 +174,21 @@ TTraction::Load( cParser *parser, glm::dvec3 const &pOrigin ) { } std::size_t +#ifdef EU07_USE_OLD_GROUNDCODE +TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ) { +#else TTraction::create_geometry( geometrybank_handle const &Bank ) { - +#endif if( m_geometry != null_handle ) { return GfxRenderer.Vertices( m_geometry ).size() / 2; } +#ifdef EU07_USE_OLD_GROUNDCODE + if( Bank != 0 ) { + m_origin = Origin; + } +#endif + vertex_array vertices; double ddp = std::hypot( pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z ); diff --git a/Traction.h b/Traction.h index b07fe017..67f46d6a 100644 --- a/Traction.h +++ b/Traction.h @@ -64,7 +64,11 @@ class TTraction : public editor::basic_node { m_origin = Origin; } // creates geometry data in specified geometry bank. returns: number of created elements, or NULL // NOTE: deleting nodes doesn't currently release geometry data owned by the node. TODO: implement erasing individual geometry chunks and banks +#ifdef EU07_USE_OLD_GROUNDCODE + std::size_t create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ); // wypełnianie VBO +#else std::size_t create_geometry( geometrybank_handle const &Bank ); +#endif int TestPoint(glm::dvec3 const &Point); void Connect(int my, TTraction *with, int to); void Init(); diff --git a/frustum.h b/frustum.h index 2029a412..96b456ce 100644 --- a/frustum.h +++ b/frustum.h @@ -45,6 +45,9 @@ public: point_inside( float const X, float const Y, float const Z ) const; // tests if the sphere is in frustum, returns the distance between origin and sphere centre inline + float + sphere_inside( glm::dvec3 const &Center, float const Radius ) const { return sphere_inside( static_cast( Center.x ), static_cast( Center.y ), static_cast( Center.z ), Radius ); } + inline float sphere_inside( glm::vec3 const &Center, float const Radius ) const { return sphere_inside( Center.x, Center.y, Center.z, Radius ); } inline diff --git a/maszyna.rc b/maszyna.rc index 4736fb51865821fb456bc3acf5b565882f5eb1ab..ec21daa0ef2ca66621b1d14a43e5a9d9165995c0 100644 GIT binary patch delta 34 qcmaE1_`+~Qnz*1lgAaonLpVb`gC~PCgFl1cC@#Nwns^W+0IjeI9RL6T diff --git a/renderer.cpp b/renderer.cpp index 4943cafa..7c1ac70d 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1598,7 +1598,7 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { } #else void -opengl_renderer::Render( scene::basic_region &Region ) { +opengl_renderer::Render( scene::basic_region *Region ) { m_sectionqueue.clear(); m_cellqueue.clear(); @@ -1617,14 +1617,14 @@ opengl_renderer::Render( scene::basic_region &Region ) { for( int column = originx; column <= originx + segmentcount; ++column ) { if( column < 0 ) { continue; } if( column >= scene::EU07_REGIONSIDESECTIONCOUNT ) { break; } - auto §ion { Region.m_sections[ row * scene::EU07_REGIONSIDESECTIONCOUNT + column ] }; - if( ( true == section.m_active ) + auto *section { Region->m_sections[ row * scene::EU07_REGIONSIDESECTIONCOUNT + column ] }; + if( ( section != nullptr ) #ifdef EU07_USE_DEBUG_CULLING - && ( m_worldcamera.camera.visible( section.m_area ) ) ) { + && ( m_worldcamera.camera.visible( section->m_area ) ) ) { #else - && ( m_renderpass.camera.visible( section.m_area ) ) ) { + && ( m_renderpass.camera.visible( section->m_area ) ) ) { #endif - m_sectionqueue.emplace_back( §ion ); + m_sectionqueue.emplace_back( section ); } } } @@ -2817,7 +2817,7 @@ opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { } #else void -opengl_renderer::Render_Alpha( scene::basic_region &Region ) { +opengl_renderer::Render_Alpha( scene::basic_region *Region ) { // sort the nodes based on their distance to viewer std::sort( @@ -2827,17 +2827,6 @@ opengl_renderer::Render_Alpha( scene::basic_region &Region ) { return ( Left.first ) < ( Right.first ); } ); Render_Alpha( std::rbegin( m_cellqueue ), std::rend( m_cellqueue ) ); -/* - ::glDisable( GL_LIGHTING ); // linie nie powinny świecić - for( auto subcellpair = std::rbegin( m_cellqueue ); subcellpair != std::rend( m_cellqueue ); ++subcellpair ) { - // druty na końcu, żeby się nie robiły białe plamy na tle lasu - tmp = subcellpair->second; - for( node = tmp->nRenderWires; node; node = node->nNext3 ) { - Render_Alpha( node ); - } - } - ::glEnable( GL_LIGHTING ); -*/ } void @@ -2882,6 +2871,8 @@ opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_seque // third pass draws the wires; // wires use section vbos, but for the time being we want to draw them at the very end { + ::glDisable( GL_LIGHTING ); // linie nie powinny świecić + auto first{ First }; while( first != Last ) { @@ -2909,6 +2900,8 @@ opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_seque ++first; } + + ::glEnable( GL_LIGHTING ); } } diff --git a/renderer.h b/renderer.h index 1009e715..f5e888ad 100644 --- a/renderer.h +++ b/renderer.h @@ -283,7 +283,7 @@ private: Render( TSubRect *Groundsubcell ); #else void - Render( scene::basic_region &Region ); + Render( scene::basic_region *Region ); void Render( section_sequence::iterator First, section_sequence::iterator Last ); void @@ -316,7 +316,7 @@ private: Render_Alpha( TSubRect *Groundsubcell ); #else void - Render_Alpha( scene::basic_region &Region ); + Render_Alpha( scene::basic_region *Region ); void Render_Alpha( cell_sequence::reverse_iterator First, cell_sequence::reverse_iterator Last ); void diff --git a/resource.h b/resource.h index 52fca2ce..ead65dc1 100644 --- a/resource.h +++ b/resource.h @@ -2,7 +2,7 @@ // Microsoft Visual C++ generated include file. // Used by maszyna.rc // -#define IDI_ICON1 101 +//#define GLFW_ICON 101 // Next default values for new objects // diff --git a/scene.cpp b/scene.cpp index a6d04d96..43adb766 100644 --- a/scene.cpp +++ b/scene.cpp @@ -119,8 +119,6 @@ basic_cell::center( glm::dvec3 Center ) { void basic_section::insert( shape_node Shape ) { - m_active = true; - auto const &shapedata = Shape.data(); if( ( true == shapedata.translucent ) || ( shapedata.rangesquared_max <= 90000.0 ) @@ -147,7 +145,6 @@ basic_section::insert( shape_node Shape ) { void basic_section::insert( TTrack *Path ) { - m_active = true; // pass the node to the appropriate partitioning cell // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done cell( Path->location() ).insert( Path ); @@ -157,7 +154,6 @@ basic_section::insert( TTrack *Path ) { void basic_section::insert( TTraction *Traction ) { - m_active = true; // pass the node to the appropriate partitioning cell // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done cell( Traction->location() ).insert( Traction ); @@ -167,7 +163,6 @@ basic_section::insert( TTraction *Traction ) { void basic_section::insert( TAnimModel *Instance ) { - m_active = true; // pass the node to the appropriate partitioning cell // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done cell( Instance->location() ).insert( Instance ); @@ -203,8 +198,6 @@ basic_section::create_geometry() { m_geometrycreated = true; } - if( false == m_active ) { return; } // nothing to do here - // since sections can be empty, we're doing lazy initialization of the geometry bank, when something may actually use it if( m_geometrybank == null_handle ) { m_geometrybank = GfxRenderer.Create_Bank(); @@ -235,6 +228,8 @@ basic_section::cell( glm::dvec3 const &Location ) { basic_region::basic_region() { + m_sections.fill( nullptr ); +/* // initialize centers of sections: // calculate center of 'top left' region section... auto const centeroffset = -( EU07_REGIONSIDESECTIONCOUNT / 2 * EU07_SECTIONSIZE ) + EU07_SECTIONSIZE / 2; @@ -248,6 +243,12 @@ basic_region::basic_region() { column = 0; } } +*/ +} + +basic_region::~basic_region() { + + for( auto section : m_sections ) { if( section != nullptr ) { delete section; } } } void @@ -568,10 +569,21 @@ basic_region::section( glm::dvec3 const &Location ) { auto const column = static_cast( std::floor( Location.x / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ); auto const row = static_cast( std::floor( Location.z / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ); - return + auto §ion = m_sections[ clamp( row, 0, EU07_REGIONSIDESECTIONCOUNT - 1 ) * EU07_REGIONSIDESECTIONCOUNT + clamp( column, 0, EU07_REGIONSIDESECTIONCOUNT - 1 ) ] ; + + if( section == nullptr ) { + // there's no guarantee the section exists at this point, so check and if needed, create it + section = new basic_section(); + // assign center of the section + auto const centeroffset = -( EU07_REGIONSIDESECTIONCOUNT / 2 * EU07_SECTIONSIZE ) + EU07_SECTIONSIZE / 2; + glm::dvec3 regioncornercenter { centeroffset, 0, centeroffset }; + section->center( regioncornercenter + glm::dvec3{ column * EU07_SECTIONSIZE, 0.0, row * EU07_SECTIONSIZE } ); + } + + return *section; } } // scene diff --git a/scene.h b/scene.h index a03ec979..66314e13 100644 --- a/scene.h +++ b/scene.h @@ -114,7 +114,6 @@ private: // members // placement and visibility scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_SECTIONSIZE + 0.25 * EU07_SECTIONSIZE ) }; - bool m_active { false }; // whether the section holds any actual data, itself or in the cells // content cell_array m_cells; // partitioning scheme shapenode_sequence m_shapes; // large pieces of opaque geometry and (legacy) terrain @@ -132,6 +131,8 @@ class basic_region { public: // constructors basic_region(); +// destructor + ~basic_region(); // methods // inserts provided shape in the region void @@ -149,7 +150,7 @@ public: private: // types - using section_array = std::array; + using section_array = std::array; // methods // checks whether specified point is within boundaries of the region diff --git a/simulation.cpp b/simulation.cpp index a522a636..9fdc5174 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -22,11 +22,16 @@ path_table Paths; traction_table Traction; instance_manager Instances; light_array Lights; -scene::basic_region Region; + +scene::basic_region *Region { nullptr }; bool state_manager::deserialize( std::string const &Scenariofile ) { + // TODO: move initialization to separate routine so we can reuse it + SafeDelete( Region ); + Region = new scene::basic_region(); + // TODO: check first for presence of serialized binary files // if this fails, fall back on the legacy text format cParser scenarioparser( Scenariofile, cParser::buffer_FILE, Global::asCurrentSceneryPath, Global::bLoadTraction ); @@ -245,7 +250,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad auto *path { deserialize_path( Input, Scratchpad, nodedata ) }; // duplicates of named tracks are currently experimentally allowed if( simulation::Paths.insert( path ) ) { - simulation::Region.insert_path( path, Scratchpad ); + simulation::Region->insert_path( path, Scratchpad ); } else { ErrorLog( "Bad scenario: track with duplicate name, \"" + path->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); @@ -262,7 +267,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad auto *traction { deserialize_traction( Input, Scratchpad, nodedata ) }; // duplicates of named tracks are currently discarded if( simulation::Traction.insert( traction ) ) { - simulation::Region.insert_traction( traction, Scratchpad ); + simulation::Region->insert_traction( traction, Scratchpad ); } else { ErrorLog( "Bad scenario: traction piece with duplicate name, \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); @@ -286,7 +291,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( instance == nullptr ) { return; } if( simulation::Instances.insert( instance ) ) { - simulation::Region.insert_instance( instance, Scratchpad ); + simulation::Region->insert_instance( instance, Scratchpad ); } else { ErrorLog( "Bad scenario: 3d model instance with duplicate name, \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); @@ -297,7 +302,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad || ( nodedata.type == "triangle_strip" ) || ( nodedata.type == "triangle_fan" ) ) { - simulation::Region.insert_shape( scene::shape_node().deserialize( Input, nodedata ), Scratchpad ); + simulation::Region->insert_shape( scene::shape_node().deserialize( Input, nodedata ), Scratchpad ); } else if( ( nodedata.type == "lines" ) || ( nodedata.type == "line_strip" ) diff --git a/simulation.h b/simulation.h index be7da4dc..3aa6bbf0 100644 --- a/simulation.h +++ b/simulation.h @@ -66,7 +66,8 @@ extern path_table Paths; extern traction_table Traction; extern instance_manager Instances; extern light_array Lights; -extern scene::basic_region Region; + +extern scene::basic_region *Region; } // simulation From de4e10ab394ef20f5bd95d6c0a36727d773cde1c Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 11 Oct 2017 20:21:05 +0200 Subject: [PATCH 198/426] continued refacoring: vehicles, events, memcells, tracks, traction, traction power sources; minor readability enhancements and bug fixes --- AdvSound.cpp | 17 +- AdvSound.h | 19 +- AnimModel.cpp | 36 ++-- AnimModel.h | 4 +- Classes.h | 4 +- DynObj.cpp | 70 ++++++- DynObj.h | 187 ++++++++----------- Event.cpp | 248 ++++++++++++++----------- Event.h | 14 +- Gauge.h | 9 +- Globals.cpp | 2 + Globals.h | 2 + Ground.cpp | 189 +++++++------------ Ground.h | 8 +- MemCell.cpp | 12 ++ MemCell.h | 8 +- Model3d.cpp | 2 +- RealSound.cpp | 36 +--- RealSound.h | 75 ++++---- Segment.cpp | 39 ++-- Segment.h | 36 ---- Track.cpp | 63 +++++-- Track.h | 4 +- Traction.cpp | 322 ++++++++++++++++---------------- Traction.h | 5 +- TractionPower.cpp | 119 ++++++------ TractionPower.h | 45 +++-- Train.cpp | 12 +- Train.h | 1 - World.cpp | 201 +++++++++++++------- openglgeometrybank.h | 12 +- parser.cpp | 14 +- renderer.cpp | 36 +++- scene.cpp | 425 ++++++++++++++++++++++++++++++++++++++++++- scene.h | 115 +++++++++++- scenenode.cpp | 3 +- scenenode.h | 15 +- simulation.cpp | 326 ++++++++++++++++++++++++++++++--- simulation.h | 21 ++- 39 files changed, 1849 insertions(+), 907 deletions(-) diff --git a/AdvSound.cpp b/AdvSound.cpp index 7aefa52f..94870c95 100644 --- a/AdvSound.cpp +++ b/AdvSound.cpp @@ -19,12 +19,7 @@ TAdvancedSound::~TAdvancedSound() // SoundShut.Stop(); } -void TAdvancedSound::Free() -{ -} - -void TAdvancedSound::Init( std::string const &NameOn, std::string const &Name, std::string const &NameOff, double DistanceAttenuation, - vector3 const &pPosition) +void TAdvancedSound::Init( std::string const &NameOn, std::string const &Name, std::string const &NameOff, double DistanceAttenuation, Math3D::vector3 const &pPosition) { SoundStart.Init(NameOn, DistanceAttenuation, pPosition.x, pPosition.y, pPosition.z, true); SoundCommencing.Init(Name, DistanceAttenuation, pPosition.x, pPosition.y, pPosition.z, true); @@ -47,7 +42,7 @@ void TAdvancedSound::Init( std::string const &NameOn, std::string const &Name, s SoundShut.FA = 0.0; } -void TAdvancedSound::Load(cParser &Parser, vector3 const &pPosition) +void TAdvancedSound::Load(cParser &Parser, Math3D::vector3 const &pPosition) { std::string nameon, name, nameoff; double attenuation; @@ -62,7 +57,7 @@ void TAdvancedSound::Load(cParser &Parser, vector3 const &pPosition) Init( nameon, name, nameoff, attenuation, pPosition ); } -void TAdvancedSound::TurnOn(bool ListenerInside, vector3 NewPosition) +void TAdvancedSound::TurnOn(bool ListenerInside, Math3D::vector3 NewPosition) { // hunter-311211: nie trzeba czekac na ponowne odtworzenie dzwieku, az sie wylaczy if ((State == ss_Off || State == ss_ShuttingDown) && (SoundStart.AM > 0)) @@ -76,7 +71,7 @@ void TAdvancedSound::TurnOn(bool ListenerInside, vector3 NewPosition) } } -void TAdvancedSound::TurnOff(bool ListenerInside, vector3 NewPosition) +void TAdvancedSound::TurnOff(bool ListenerInside, Math3D::vector3 NewPosition) { if ((State == ss_Commencing || State == ss_Starting) && (SoundShut.AM > 0)) { @@ -90,7 +85,7 @@ void TAdvancedSound::TurnOff(bool ListenerInside, vector3 NewPosition) } } -void TAdvancedSound::Update(bool ListenerInside, vector3 NewPosition) +void TAdvancedSound::Update(bool ListenerInside, Math3D::vector3 NewPosition) { if ((State == ss_Commencing) && (SoundCommencing.AM > 0)) { @@ -126,7 +121,7 @@ void TAdvancedSound::Update(bool ListenerInside, vector3 NewPosition) } } -void TAdvancedSound::UpdateAF(double A, double F, bool ListenerInside, vector3 NewPosition) +void TAdvancedSound::UpdateAF(double A, double F, bool ListenerInside, Math3D::vector3 NewPosition) { // update, ale z amplituda i czestotliwoscia if( State == ss_Off ) { return; diff --git a/AdvSound.h b/AdvSound.h index 1049e750..f5c4de40 100644 --- a/AdvSound.h +++ b/AdvSound.h @@ -13,13 +13,13 @@ http://mozilla.org/MPL/2.0/. #include "RealSound.h" #include "parser.h" -typedef enum -{ +enum TSoundState { + ss_Off, ss_Starting, ss_Commencing, ss_ShuttingDown -} TSoundState; +}; class TAdvancedSound { // klasa dźwięków mających początek, dowolnie długi środek oraz zakończenie (np. Rp1) @@ -36,13 +36,12 @@ class TAdvancedSound public: TAdvancedSound() = default; ~TAdvancedSound(); - void Init( std::string const &NameOn, std::string const &Name, std::string const &NameOff, double DistanceAttenuation, vector3 const &pPosition); - void Load(cParser &Parser, vector3 const &pPosition); - void TurnOn(bool ListenerInside, vector3 NewPosition); - void TurnOff(bool ListenerInside, vector3 NewPosition); - void Free(); - void Update(bool ListenerInside, vector3 NewPosition); - void UpdateAF(double A, double F, bool ListenerInside, vector3 NewPosition); + void Init( std::string const &NameOn, std::string const &Name, std::string const &NameOff, double DistanceAttenuation, Math3D::vector3 const &pPosition); + void Load(cParser &Parser, Math3D::vector3 const &pPosition); + void TurnOn(bool ListenerInside, Math3D::vector3 NewPosition); + void TurnOff(bool ListenerInside, Math3D::vector3 NewPosition); + void Update(bool ListenerInside, Math3D::vector3 NewPosition); + void UpdateAF(double A, double F, bool ListenerInside, Math3D::vector3 NewPosition); void CopyIfEmpty(TAdvancedSound &s); }; diff --git a/AnimModel.cpp b/AnimModel.cpp index 5646811d..56eaa3b1 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -759,21 +759,27 @@ void TAnimModel::LightSet(int n, float v) { // ustawienie światła (n) na wartość (v) if (n >= iMaxNumLights) return; // przekroczony zakres - lsLights[n] = TLightState(int(v)); - switch (lsLights[n]) - { // interpretacja ułamka zależnie od typu - case 0: // ustalenie czasu migotania, t<1s (f>1Hz), np. 0.1 => t=0.1 (f=10Hz) - break; - case 1: // ustalenie wypełnienia ułamkiem, np. 1.25 => zapalony przez 1/4 okresu - break; - case 2: // ustalenie częstotliwości migotania, f<1Hz (t>1s), np. 2.2 => f=0.2Hz (t=5s) - break; - case 3: // zapalenie świateł zależne od oświetlenia scenerii - if (v > 3.0) - fDark = v - 3.0; // ustawienie indywidualnego progu zapalania - else - fDark = 0.25; // standardowy próg zaplania - break; + lsLights[ n ] = TLightState( static_cast( v ) ); + switch( lsLights[ n ] ) { + // interpretacja ułamka zależnie od typu + case ls_Off: { + // ustalenie czasu migotania, t<1s (f>1Hz), np. 0.1 => t=0.1 (f=10Hz) + break; + } + case ls_On: { + // ustalenie wypełnienia ułamkiem, np. 1.25 => zapalony przez 1/4 okresu + break; + } + case ls_Blink: { + // ustalenie częstotliwości migotania, f<1Hz (t>1s), np. 2.2 => f=0.2Hz (t=5s) + break; + } + case ls_Dark: { + // zapalenie świateł zależne od oświetlenia scenerii + if( v > 3.0 ) { fDark = v - 3.0; } // ustawienie indywidualnego progu zapalania + else { fDark = 0.25; } // standardowy próg zaplania + break; + } } }; //--------------------------------------------------------------------------- diff --git a/AnimModel.h b/AnimModel.h index 69bdc8bb..47d1c25a 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -176,7 +176,9 @@ private: unsigned int m_framestamp { 0 }; // id of last rendered gfx frame }; -class instance_manager : public basic_table { + + +class instance_table : public basic_table { }; diff --git a/Classes.h b/Classes.h index b8967103..74111f52 100644 --- a/Classes.h +++ b/Classes.h @@ -37,7 +37,7 @@ class TMtableTime; // czas dla danego posterunku class TController; // obiekt sterujący pociągiem (AI) -typedef enum +enum TCommandType { // binarne odpowiedniki komend w komórce pamięci cm_Unknown, // ciąg nierozpoznany (nie jest komendą) cm_Ready, // W4 zezwala na odjazd, ale semafor może zatrzymać @@ -51,6 +51,6 @@ typedef enum cm_OutsideStation, cm_Shunt, cm_Command // komenda pobierana z komórki -} TCommandType; +}; #endif diff --git a/DynObj.cpp b/DynObj.cpp index aaadd391..cbf34062 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4150,7 +4150,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // Ra 15-01: gałka nastawy hamulca parser.getTokens(); parser >> asAnimName; - smBrakeMode = mdModel->GetFromName(asAnimName.c_str()); + smBrakeMode = mdModel->GetFromName(asAnimName); // jeszcze wczytać kąty obrotu dla poszczególnych ustawień } @@ -4158,7 +4158,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // Ra 15-01: gałka nastawy hamulca parser.getTokens(); parser >> asAnimName; - smLoadMode = mdModel->GetFromName(asAnimName.c_str()); + smLoadMode = mdModel->GetFromName(asAnimName); // jeszcze wczytać kąty obrotu dla poszczególnych ustawień } @@ -4170,7 +4170,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, for (i = 0; i < iAnimType[ANIM_WHEELS]; ++i) // liczba osi { // McZapkie-050402: wyszukiwanie kol o nazwie str* asAnimName = token + std::to_string(i + 1); - pAnimations[i].smAnimated = mdModel->GetFromName(asAnimName.c_str()); // ustalenie submodelu + pAnimations[i].smAnimated = mdModel->GetFromName(asAnimName); // ustalenie submodelu if (pAnimations[i].smAnimated) { //++iAnimatedAxles; pAnimations[i].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu @@ -4311,8 +4311,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } } else - ErrorLog("Bad model: " + asFileName + " - missed submodel " + - asAnimName); // brak ramienia + ErrorLog("Bad model: " + asFileName + " - missed submodel " + asAnimName); // brak ramienia } } @@ -4346,10 +4345,9 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } } else - ErrorLog( "Bad model: " + asFileName + " - missed submodel " + - asAnimName ); // brak ramienia + ErrorLog( "Bad model: " + asFileName + " - missed submodel " + asAnimName ); // brak ramienia } - } + } } else if( token == "animpantrg1prefix:" ) { @@ -5393,3 +5391,59 @@ TDynamicObject::ConnectedEnginePowerSource( TDynamicObject const *Caller ) const // ...if we're still here, report lack of power source return MoverParameters->EnginePowerSource.SourceType; } + + + +// legacy method, calculates changes in simulation state over specified time +void +vehicle_table::update( double Deltatime, int Iterationcount ) { + // Ra: w zasadzie to trzeba by utworzyć oddzielną listę taboru do liczenia fizyki + // na którą by się zapisywały wszystkie pojazdy będące w ruchu + // pojazdy stojące nie potrzebują aktualizacji, chyba że np. ktoś im zmieni nastawę hamulca + // oddzielną listę można by zrobić na pojazdy z napędem, najlepiej posortowaną wg typu napędu + for( auto *vehicle : m_items ) { + // Ra: zmienić warunek na sprawdzanie pantografów w jednej zmiennej: czy pantografy i czy podniesione + if( vehicle->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) { +/* + // TODO: re-implement + GetTraction( vehicle ); +*/ + } + vehicle->MoverParameters->ComputeConstans(); + vehicle->CoupleDist(); + } + if( Iterationcount > 1 ) { + // ABu: ponizsze wykonujemy tylko jesli wiecej niz jedna iteracja + for( int iteration = 0; iteration < ( Iterationcount - 1 ); ++iteration ) { + for( auto *vehicle : m_items ) { + vehicle->UpdateForce( Deltatime, Deltatime, false ); + } + for( auto *vehicle : m_items ) { + vehicle->FastUpdate( Deltatime ); + } + } + } + + auto const totaltime { Deltatime * Iterationcount }; // całkowity czas + + for( auto *vehicle : m_items ) { + vehicle->UpdateForce( Deltatime, totaltime, true ); + } + for( auto *vehicle : m_items ) { + // Ra 2015-01: tylko tu przelicza sieć trakcyjną + vehicle->Update( Deltatime, totaltime ); + } +/* + // TODO: re-implement + if (bDynamicRemove) + { // jeśli jest coś do usunięcia z listy, to trzeba na końcu + for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) + if ( false == Current->DynamicObject->bEnabled) + { + DynamicRemove(Current->DynamicObject); // usunięcie tego i podłączonych + Current = nRootDynamic; // sprawdzanie listy od początku + } + bDynamicRemove = false; // na razie koniec + } +*/ +} diff --git a/DynObj.h b/DynObj.h index 623b6ac4..df0794e9 100644 --- a/DynObj.h +++ b/DynObj.h @@ -160,19 +160,17 @@ private: // położenie pojazdu w świecie oraz parametry ruchu TTrackParam tp; // parametry toru przekazywane do fizyki TTrackFollower Axle0; // oś z przodu (od sprzęgu 0) TTrackFollower Axle1; // oś z tyłu (od sprzęgu 1) - int iAxleFirst; // numer pierwszej osi w kierunku ruchu (oś wiążąca pojazd z torem i wyzwalająca - // eventy) + int iAxleFirst; // numer pierwszej osi w kierunku ruchu (oś wiążąca pojazd z torem i wyzwalająca eventy) float fAxleDist; // rozstaw wózków albo osi do liczenia proporcji zacienienia Math3D::vector3 modelRot; // obrot pudła względem świata - do przeanalizowania, czy potrzebne!!! - // bool bCameraNear; //blisko kamer są potrzebne dodatkowe obliczenia szczegółów TDynamicObject * ABuFindNearestObject( TTrack *Track, TDynamicObject *MyPointer, int &CouplNr ); -public: // parametry położenia pojazdu dostępne publicznie +public: + // parametry położenia pojazdu dostępne publicznie std::string asTrack; // nazwa toru początkowego; wywalić? std::string asDestination; // dokąd pojazd ma być kierowany "(stacja):(tor)" Math3D::matrix4x4 mMatrix; // macierz przekształcenia do renderowania modeli TMoverParameters *MoverParameters; // parametry fizyki ruchu oraz przeliczanie - // TMoverParameters *pControlled; //wskaźnik do sterowanego członu silnikowego TDynamicObject *NextConnected; // pojazd podłączony od strony sprzęgu 1 (kabina -1) TDynamicObject *PrevConnected; // pojazd podłączony od strony sprzęgu 0 (kabina 1) int NextConnectedNo; // numer sprzęgu podłączonego z tyłu @@ -182,7 +180,7 @@ public: // parametry położenia pojazdu dostępne publicznie TPowerSource ConnectedEnginePowerSource( TDynamicObject const *Caller ) const; -public: // modele składowe pojazdu + // modele składowe pojazdu TModel3d *mdModel; // model pudła TModel3d *mdLoad; // model zmiennego ładunku TModel3d *mdKabina; // model kabiny dla użytkownika; McZapkie-030303: to z train.h @@ -201,28 +199,26 @@ public: // modele składowe pojazdu bool SectionLightsActive { false }; // flag indicating whether section lights were set. float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) - private: // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe +private: + // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe material_data m_materialdata; - public: +public: inline material_data const *Material() const { return &m_materialdata; } // tymczasowo udostępnione do wyszukiwania drutu int iAnimType[ ANIM_TYPES ]; // 0-osie,1-drzwi,2-obracane,3-zderzaki,4-wózki,5-pantografy,6-tłoki - private: +private: int iAnimations; // liczba obiektów animujących /* TAnim *pAnimations; // obiekty animujące (zawierają wskaźnik do funkcji wykonującej animację) */ std::vector pAnimations; - TSubModel ** - pAnimated; // lista animowanych submodeli (może być ich więcej niż obiektów animujących) - double dWheelAngle[3]; // kąty obrotu kół: 0=przednie toczne, 1=napędzające i wiązary, 2=tylne - // toczne - void - UpdateNone(TAnim *pAnim){}; // animacja pusta (funkcje ustawiania submodeli, gdy blisko kamery) + TSubModel ** pAnimated; // lista animowanych submodeli (może być ich więcej niż obiektów animujących) + double dWheelAngle[3]; // kąty obrotu kół: 0=przednie toczne, 1=napędzające i wiązary, 2=tylne toczne + void UpdateNone(TAnim *pAnim){}; // animacja pusta (funkcje ustawiania submodeli, gdy blisko kamery) void UpdateAxle(TAnim *pAnim); // animacja osi void UpdateBoogie(TAnim *pAnim); // animacja wózka void UpdateDoorTranslate(TAnim *pAnim); // animacja drzwi - przesuw @@ -268,8 +264,7 @@ public: // modele składowe pojazdu TButton btCoupler1; // sprzegi TButton btCoupler2; - TAirCoupler - btCPneumatic1; // sprzegi powietrzne //yB - zmienione z Button na AirCoupler - krzyzyki + TAirCoupler btCPneumatic1; // sprzegi powietrzne //yB - zmienione z Button na AirCoupler - krzyzyki TAirCoupler btCPneumatic2; TAirCoupler btCPneumatic1r; // ABu: to zeby nie bylo problemow przy laczeniu wagonow, TAirCoupler btCPneumatic2r; // jesli beda polaczone sprzegami 1<->1 lub 0<->0 @@ -300,8 +295,6 @@ public: // modele składowe pojazdu TButton btHeadSignals23; TButton btMechanik1; TButton btMechanik2; - //TSubModel *smMechanik0; // Ra: mechanik wbudowany w model jako submodel? - //TSubModel *smMechanik1; // mechanik od strony sprzęgu 1 double enginevolume; // MC: pomocnicze zeby gladziej silnik buczal int iAxles; // McZapkie: to potem mozna skasowac i zastapic iNumAxles @@ -325,7 +318,6 @@ public: // modele składowe pojazdu TAdvancedSound sReleaser; // Winger 010304 - // TRealSound rsPanTup; //PSound sPantUp; TRealSound sPantUp; TRealSound sPantDown; TRealSound rsDoorOpen; // Ra: przeniesione z kabiny @@ -352,8 +344,6 @@ public: // modele składowe pojazdu int iHornWarning; // numer syreny do użycia po otrzymaniu sygnału do jazdy bool bEnabled; // Ra: wyjechał na portal i ma być usunięty protected: - // TTrackFollower Axle2; //dwie osie z czterech (te są protected) - // TTrackFollower Axle3; //Ra: wyłączyłem, bo kąty są liczone w Segment.cpp int iNumAxles; // ilość osi std::string asModel; @@ -373,26 +363,18 @@ public: // modele składowe pojazdu TDynamicObject * PrevC(int C); TDynamicObject * NextC(int C); double NextDistance(double d = -1.0); - void SetdMoveLen(double dMoveLen) - { - MoverParameters->dMoveLen = dMoveLen; - } - void ResetdMoveLen() - { - MoverParameters->dMoveLen = 0; - } - double GetdMoveLen() - { - return MoverParameters->dMoveLen; - } + void SetdMoveLen(double dMoveLen) { + MoverParameters->dMoveLen = dMoveLen; } + void ResetdMoveLen() { + MoverParameters->dMoveLen = 0; } + double GetdMoveLen() { + return MoverParameters->dMoveLen; } int GetPneumatic(bool front, bool red); void SetPneumatic(bool front, bool red); std::string asName; - std::string GetName() - { - return this ? asName : std::string(""); - }; + std::string name() const { + return this ? asName : std::string(); }; TRealSound rsDiesielInc; // youBy TRealSound rscurve; // youBy @@ -405,7 +387,6 @@ public: // modele składowe pojazdu TDynamicObject * ABuScanNearestObject(TTrack *Track, double ScanDir, double ScanDist, int &CouplNr); TDynamicObject * GetFirstDynamic(int cpl_type, int cf = 1); - // TDynamicObject* GetFirstCabDynamic(int cpl_type); void ABuSetModelShake( Math3D::vector3 mShake); // McZapkie-010302 @@ -437,99 +418,65 @@ public: // modele składowe pojazdu void Move(double fDistance); void FastMove(double fDistance); void RenderSounds(); - inline Math3D::vector3 GetPosition() const - { - return vPosition; - }; - inline Math3D::vector3 HeadPosition() - { - return vCoulpler[iDirection ^ 1]; - }; // pobranie współrzędnych czoła - inline Math3D::vector3 RearPosition() - { - return vCoulpler[iDirection]; - }; // pobranie współrzędnych tyłu - inline Math3D::vector3 AxlePositionGet() - { - return iAxleFirst ? Axle1.pPosition : Axle0.pPosition; - }; - inline Math3D::vector3 VectorFront() const - { - return vFront; - }; - inline Math3D::vector3 VectorUp() - { - return vUp; - }; - inline Math3D::vector3 VectorLeft() const - { - return vLeft; - }; - inline double * Matrix() - { - return mMatrix.getArray(); - }; - inline double GetVelocity() - { - return MoverParameters->Vel; - }; - inline double GetLength() const - { - return MoverParameters->Dim.L; - }; - inline double GetWidth() const - { - return MoverParameters->Dim.W; - }; - inline TTrack * GetTrack() - { - return (iAxleFirst ? Axle1.GetTrack() : Axle0.GetTrack()); - }; - // void UpdatePos(); + inline Math3D::vector3 GetPosition() const { + return vPosition; }; + // pobranie współrzędnych czoła + inline Math3D::vector3 HeadPosition() { + return vCoulpler[iDirection ^ 1]; }; + // pobranie współrzędnych tyłu + inline Math3D::vector3 RearPosition() { + return vCoulpler[iDirection]; }; + inline Math3D::vector3 AxlePositionGet() { + return iAxleFirst ? Axle1.pPosition : Axle0.pPosition; }; + inline Math3D::vector3 VectorFront() const { + return vFront; }; + inline Math3D::vector3 VectorUp() { + return vUp; }; + inline Math3D::vector3 VectorLeft() const { + return vLeft; }; + inline double * Matrix() { + return mMatrix.getArray(); }; + inline double GetVelocity() { + return MoverParameters->Vel; }; + inline double GetLength() const { + return MoverParameters->Dim.L; }; + inline double GetWidth() const { + return MoverParameters->Dim.W; }; + inline TTrack * GetTrack() { + return (iAxleFirst ? Axle1.GetTrack() : Axle0.GetTrack()); }; // McZapkie-260202 void LoadMMediaFile(std::string BaseDir, std::string TypeName, std::string ReplacableSkin); - inline double ABuGetDirection() const // ABu. - { - return (Axle1.GetTrack() == MyTrack ? Axle1.GetDirection() : Axle0.GetDirection()); - }; - // inline double ABuGetTranslation() //ABu. - // {//zwraca przesunięcie wózka względem Point1 toru - // return (Axle1.GetTrack()==MyTrack?Axle1.GetTranslation():Axle0.GetTranslation()); - // }; - inline double RaDirectionGet() - { // zwraca kierunek pojazdu na torze z aktywną osą - return iAxleFirst ? Axle1.GetDirection() : Axle0.GetDirection(); - }; - inline double RaTranslationGet() - { // zwraca przesunięcie wózka względem Point1 toru z aktywną osią - return iAxleFirst ? Axle1.GetTranslation() : Axle0.GetTranslation(); - }; - inline TTrack * RaTrackGet() - { // zwraca tor z aktywną osią - return iAxleFirst ? Axle1.GetTrack() : Axle0.GetTrack(); - }; + inline double ABuGetDirection() const { // ABu. + return (Axle1.GetTrack() == MyTrack ? Axle1.GetDirection() : Axle0.GetDirection()); }; + // zwraca kierunek pojazdu na torze z aktywną osą + inline double RaDirectionGet() { + return iAxleFirst ? Axle1.GetDirection() : Axle0.GetDirection(); }; + // zwraca przesunięcie wózka względem Point1 toru z aktywną osią + inline double RaTranslationGet() { + return iAxleFirst ? Axle1.GetTranslation() : Axle0.GetTranslation(); }; + // zwraca tor z aktywną osią + inline TTrack * RaTrackGet() { + return iAxleFirst ? Axle1.GetTrack() : Axle0.GetTrack(); }; void CouplersDettach(double MinDist, int MyScanDir); void RadioStop(); void Damage(char flag); void RaLightsSet(int head, int rear); - // void RaAxleEvent(TEvent *e); TDynamicObject * FirstFind(int &coupler_nr, int cf = 1); float GetEPP(); // wyliczanie sredniego cisnienia w PG int DirectionSet(int d); // ustawienie kierunku w składzie - int DirectionGet() - { - return iDirection + iDirection - 1; - }; // odczyt kierunku w składzie + // odczyt kierunku w składzie + int DirectionGet() { + return iDirection + iDirection - 1; }; int DettachStatus(int dir); int Dettach(int dir); TDynamicObject * Neightbour(int &dir); void CoupleDist(); TDynamicObject * ControlledFind(); void ParamSet(int what, int into); - int RouteWish(TTrack *tr); // zapytanie do AI, po którym segmencie skrzyżowania - // jechać + // zapytanie do AI, po którym segmencie skrzyżowania jechać + int RouteWish(TTrack *tr); void DestinationSet(std::string to, std::string numer); std::string TextureTest(std::string const &name); void OverheadTrack(float o); @@ -537,4 +484,14 @@ public: // modele składowe pojazdu static std::string const MED_labels[ 8 ]; }; + + +class vehicle_table : public basic_table { + +public: + // legacy method, calculates changes in simulation state over specified time + void + update( double dt, int iter ); +}; + //--------------------------------------------------------------------------- diff --git a/Event.cpp b/Event.cpp index 6d013b8a..389b92ca 100644 --- a/Event.cpp +++ b/Event.cpp @@ -74,10 +74,6 @@ TEvent::~TEvent() { }; -void TEvent::Init(){ - -}; - void TEvent::Conditions(cParser *parser, std::string s) { // przetwarzanie warunków, wspólne dla Multiple i UpdateValues if (s == "condition") @@ -949,7 +945,7 @@ event_manager::CheckQuery() { // TODO: re-enable when messaging module is in place if( Global::iMultiplayer ) { // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) - WyslijEvent( tmpEvent->asName, tmpEvent->Activator->GetName() ); + WyslijEvent( tmpEvent->asName, tmpEvent->Activator->name() ); } */ m_workevent->Params[ 9 ].asMemCell->PutCommand( @@ -984,61 +980,105 @@ event_manager::CheckQuery() { } break; } - case tp_Lights: - if (m_workevent->Params[9].asModel) - for (i = 0; i < iMaxNumLights; i++) - if (m_workevent->Params[i].asdouble >= 0) //-1 zostawia bez zmiany - m_workevent->Params[9].asModel->LightSet( - i, m_workevent->Params[i].asdouble); // teraz też ułamek - break; - case tp_Visible: - if (m_workevent->Params[9].nGroundNode) - m_workevent->Params[9].nGroundNode->bVisible = (m_workevent->Params[i].asInt > 0); - break; - case tp_Velocity: - Error("Not implemented yet :("); - break; - case tp_Exit: - MessageBox(0, m_workevent->asNodeName.c_str(), " THE END ", MB_OK); - Global::iTextMode = -1; // wyłączenie takie samo jak sekwencja F10 -> Y - return false; - case tp_Sound: - switch (m_workevent->Params[0].asInt) - { // trzy możliwe przypadki: - case 0: - m_workevent->Params[9].tsTextSound->Stop(); - break; - case 1: - m_workevent->Params[9].tsTextSound->Play( - 1, 0, true, m_workevent->Params[9].tsTextSound->vSoundPosition); - break; - case -1: - m_workevent->Params[9].tsTextSound->Play( - 1, DSBPLAY_LOOPING, true, m_workevent->Params[9].tsTextSound->vSoundPosition); - break; + case tp_Lights: { + if( m_workevent->Params[ 9 ].asModel ) { + for( i = 0; i < iMaxNumLights; ++i ) { + if( m_workevent->Params[ i ].asdouble >= 0 ) { + // -1 zostawia bez zmiany + m_workevent->Params[ 9 ].asModel->LightSet( + i, + m_workevent->Params[ i ].asdouble ); + } + } } break; + } + case tp_Visible: { +#ifdef EU07_USE_OLD_GROUNDCODE + if( m_workevent->Params[ 9 ].nGroundNode ) + m_workevent->Params[ 9 ].nGroundNode->bVisible = ( m_workevent->Params[ i ].asInt > 0 ); +#else + if( m_workevent->Params[ 9 ].asEditorNode ) + m_workevent->Params[ 9 ].asEditorNode->visible( m_workevent->Params[ i ].asInt > 0 ); +#endif + break; + } + case tp_Velocity: { + Error( "Not implemented yet :(" ); + break; + } + case tp_Exit: { + MessageBox( 0, m_workevent->asNodeName.c_str(), " THE END ", MB_OK ); + Global::iTextMode = -1; // wyłączenie takie samo jak sekwencja F10 -> Y + return false; + } + case tp_Sound: { + switch( m_workevent->Params[ 0 ].asInt ) { + // trzy możliwe przypadki: + case 0: { + m_workevent->Params[ 9 ].tsTextSound->Stop(); + break; + } + case 1: { + m_workevent->Params[ 9 ].tsTextSound->Play( + 1, + 0, + true, + m_workevent->Params[ 9 ].tsTextSound->vSoundPosition ); + break; + } + case -1: { + m_workevent->Params[ 9 ].tsTextSound->Play( + 1, + DSBPLAY_LOOPING, + true, + m_workevent->Params[ 9 ].tsTextSound->vSoundPosition ); + break; + } + default: { + break; + } + } + break; + } case tp_Disable: Error("Not implemented yet :("); break; - case tp_Animation: // Marcin: dorobic translacje - Ra: dorobiłem ;-) - if (m_workevent->Params[0].asInt == 1) - m_workevent->Params[9].asAnimContainer->SetRotateAnim( - Math3D::vector3(m_workevent->Params[1].asdouble, m_workevent->Params[2].asdouble, - m_workevent->Params[3].asdouble), - m_workevent->Params[4].asdouble); - else if (m_workevent->Params[0].asInt == 2) - m_workevent->Params[9].asAnimContainer->SetTranslateAnim( - Math3D::vector3(m_workevent->Params[1].asdouble, m_workevent->Params[2].asdouble, - m_workevent->Params[3].asdouble), - m_workevent->Params[4].asdouble); - else if (m_workevent->Params[0].asInt == 4) - m_workevent->Params[9].asModel->AnimationVND( - m_workevent->Params[8].asPointer, - m_workevent->Params[1].asdouble, // tu mogą być dodatkowe parametry, np. od-do - m_workevent->Params[2].asdouble, m_workevent->Params[3].asdouble, - m_workevent->Params[4].asdouble); + case tp_Animation: { + switch( m_workevent->Params[ 0 ].asInt ) { + case 1: { + m_workevent->Params[ 9 ].asAnimContainer->SetRotateAnim( + Math3D::vector3 { + m_workevent->Params[ 1 ].asdouble, + m_workevent->Params[ 2 ].asdouble, + m_workevent->Params[ 3 ].asdouble }, + m_workevent->Params[ 4 ].asdouble ); + break; + } + case 2: { + m_workevent->Params[ 9 ].asAnimContainer->SetTranslateAnim( + Math3D::vector3 { + m_workevent->Params[ 1 ].asdouble, + m_workevent->Params[ 2 ].asdouble, + m_workevent->Params[ 3 ].asdouble }, + m_workevent->Params[ 4 ].asdouble ); + break; + } + case 4: { + m_workevent->Params[ 9 ].asModel->AnimationVND( + m_workevent->Params[ 8 ].asPointer, + m_workevent->Params[ 1 ].asdouble, // tu mogą być dodatkowe parametry, np. od-do + m_workevent->Params[ 2 ].asdouble, + m_workevent->Params[ 3 ].asdouble, + m_workevent->Params[ 4 ].asdouble ); + break; + } + default: { + break; + } + } break; + } case tp_Switch: { if( m_workevent->Params[ 9 ].asTrack ) { m_workevent->Params[ 9 ].asTrack->Switch( @@ -1057,13 +1097,15 @@ event_manager::CheckQuery() { break; } case tp_TrackVel: - if (m_workevent->Params[9].asTrack) - { // prędkość na zwrotnicy może być ograniczona z góry we wpisie, większej się nie - // ustawi eventem - WriteLog("Type: TrackVel"); + if (m_workevent->Params[9].asTrack) { + // prędkość na zwrotnicy może być ograniczona z góry we wpisie, większej się nie ustawi eventem m_workevent->Params[9].asTrack->VelocitySet(m_workevent->Params[0].asdouble); - if (DebugModeFlag) // wyświetlana jest ta faktycznie ustawiona - WriteLog(" - velocity: ", m_workevent->Params[9].asTrack->VelocityGet()); + // wyświetlana jest ta faktycznie ustawiona + WriteLog( "Type: TrackVel - [" + + to_string( m_workevent->Params[ 0 ].asdouble, 2 ) + "]" + + ( DebugModeFlag ? + ", actual [ " + to_string( m_workevent->Params[ 9 ].asTrack->VelocityGet(), 2 ) + "]" : + "" ) ); } break; case tp_DynVel: @@ -1097,7 +1139,7 @@ event_manager::CheckQuery() { if( ( m_workevent->iFlags & conditional_anyelse ) == 0 ) { // jednoznaczne tylko, gdy nie było else if( m_workevent->Activator ) { - WyslijEvent( m_workevent->asName, m_workevent->Activator->GetName() ); + WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); } else { WyslijEvent( m_workevent->asName, "" ); @@ -1175,8 +1217,9 @@ event_manager::CheckQuery() { m_workevent->Params[ 9 ].asMemCell->UpdateValues( m_workevent->Activator->Mechanik->TrainName(), m_workevent->Activator->Mechanik->StationCount() - m_workevent->Activator->Mechanik->StationIndex(), // ile przystanków do końca - m_workevent->Activator->Mechanik->IsStop() ? 1 : - 0, // 1, gdy ma tu zatrzymanie + m_workevent->Activator->Mechanik->IsStop() ? + 1 : + 0, // 1, gdy ma tu zatrzymanie m_workevent->iFlags); WriteLog("Train detected: " + m_workevent->Activator->Mechanik->TrainName()); } @@ -1186,10 +1229,10 @@ event_manager::CheckQuery() { // zapisanie zawartości komórki pamięci do logu if( m_workevent->Params[ 9 ].asMemCell ) { // jeśli była podana nazwa komórki - WriteLog( "Memcell \"" + m_workevent->asNodeName + "\": " - + m_workevent->Params[ 9 ].asMemCell->Text() + " " - + std::to_string( m_workevent->Params[ 9 ].asMemCell->Value1() ) + " " - + std::to_string( m_workevent->Params[ 9 ].asMemCell->Value2() ) ); + WriteLog( "Memcell \"" + m_workevent->asNodeName + "\": [" + + m_workevent->Params[ 9 ].asMemCell->Text() + "] [" + + to_string( m_workevent->Params[ 9 ].asMemCell->Value1(), 2 ) + "] [" + + to_string( m_workevent->Params[ 9 ].asMemCell->Value2(), 2 ) + "]" ); } else { // TODO: re-enable when cell manager is in place @@ -1237,7 +1280,7 @@ event_manager::InitEvents() { case tp_AddValues: // sumowanie wartości case tp_UpdateValues: { // zmiana wartości auto *cell = simulation::Memory.find( Current->asNodeName ); // nazwa komórki powiązanej z eventem - if( cell ) { // McZapkie-100302 + if( cell != nullptr ) { // McZapkie-100302 if( Current->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { // jeśli chodzi o zajetosc toru (tor może być inny, niż wpisany w komórce) // nazwa toru ta sama, co nazwa komórki @@ -1281,7 +1324,7 @@ event_manager::InitEvents() { case tp_GetValues: case tp_WhoIs: { auto *cell = simulation::Memory.find( Current->asNodeName ); - if( cell ) { + if( cell != nullptr ) { Current->Params[ 8 ].asLocation = &( cell->location() ); Current->Params[ 9 ].asMemCell = cell; if( ( Current->Type == tp_GetValues ) @@ -1301,7 +1344,7 @@ event_manager::InitEvents() { case tp_CopyValues: { // skopiowanie komórki do innej auto *cell = simulation::Memory.find( Current->asNodeName ); // komórka docelowa - if( cell ) { + if( cell != nullptr ) { Current->Params[ 4 ].asLocation = &( cell->location() ); Current->Params[ 5 ].asMemCell = cell; // komórka docelowa if( false == cell->asTrackName.empty() ) { @@ -1338,7 +1381,7 @@ event_manager::InitEvents() { SafeDeleteArray( Current->Params[ 9 ].asText ); // egzemplarz modelu do animowania auto *instance = simulation::Instances.find( Current->asNodeName ); - if( instance ) { + if( instance != nullptr ) { if( Current->Params[ 0 ].asInt == 4 ) { // model dla całomodelowych animacji Current->Params[ 9 ].asModel = instance; @@ -1365,33 +1408,35 @@ event_manager::InitEvents() { case tp_Lights: { // zmiana świeteł modelu auto *instance = simulation::Instances.find( Current->asNodeName ); - if( instance ) + if( instance != nullptr ) Current->Params[ 9 ].asModel = instance; else ErrorLog( "Bad event: lights event \"" + Current->asName + "\" cannot find model instance \"" + Current->asNodeName + "\"" ); Current->asNodeName = ""; break; } -/* case tp_Visible: { // ukrycie albo przywrócenie obiektu - tmp = FindGroundNode( Current->asNodeName, TP_MODEL ); // najpierw model - if( !tmp ) - tmp = FindGroundNode( Current->asNodeName, TP_TRACK ); // albo tory? - if( !tmp ) - tmp = FindGroundNode( Current->asNodeName, TP_TRACTION ); // może druty? - if( tmp ) - Current->Params[ 9 ].nGroundNode = tmp; + editor::basic_node *node = simulation::Instances.find( Current->asNodeName ); // najpierw model + if( node == nullptr ) { + // albo tory? + node = simulation::Paths.find( Current->asNodeName ); + } + if( node == nullptr ) { + // może druty? + node = simulation::Traction.find( Current->asNodeName ); + } + if( node != nullptr ) + Current->Params[ 9 ].asEditorNode = node; else ErrorLog( "Bad event: visibility event \"" + Current->asName + "\" cannot find item \"" + Current->asNodeName + "\"" ); Current->asNodeName = ""; break; } -*/ case tp_Switch: { // przełożenie zwrotnicy albo zmiana stanu obrotnicy auto *track = simulation::Paths.find( Current->asNodeName ); - if( track ) { + if( track != nullptr ) { // dowiązanie toru if( track->iAction == NULL ) { // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia @@ -1414,23 +1459,21 @@ event_manager::InitEvents() { Current->asNodeName = ""; break; } -/* case tp_Sound: { // odtworzenie dźwięku - tmp = FindGroundNode( Current->asNodeName, TP_SOUND ); - if( tmp ) - Current->Params[ 9 ].tsTextSound = tmp->tsStaticSound; + auto *sound = simulation::Sounds.find( Current->asNodeName ); + if( sound != nullptr ) + Current->Params[ 9 ].tsTextSound = sound; else ErrorLog( "Bad event: sound event \"" + Current->asName + "\" cannot find static sound \"" + Current->asNodeName + "\"" ); Current->asNodeName = ""; break; } -*/ case tp_TrackVel: { // ustawienie prędkości na torze if( false == Current->asNodeName.empty() ) { auto *track = simulation::Paths.find( Current->asNodeName ); - if( track ) { + if( track != nullptr ) { // flaga zmiany prędkości toru jest istotna dla skanowania track->iAction |= 0x200; Current->Params[ 9 ].asTrack = track; @@ -1442,22 +1485,20 @@ event_manager::InitEvents() { Current->asNodeName = ""; break; } -/* case tp_DynVel: { // komunikacja z pojazdem o konkretnej nazwie if( Current->asNodeName == "activator" ) Current->Params[ 9 ].asDynamic = nullptr; else { - tmp = FindGroundNode( Current->asNodeName, TP_DYNAMIC ); - if( tmp ) - Current->Params[ 9 ].asDynamic = tmp->DynamicObject; + auto *vehicle = simulation::Vehicles.find( Current->asNodeName ); + if( vehicle != nullptr ) + Current->Params[ 9 ].asDynamic = vehicle; else Error( "Bad event: vehicle velocity event \"" + Current->asName + "\" cannot find vehicle \"" + Current->asNodeName + "\"" ); } Current->asNodeName = ""; break; } -*/ case tp_Multiple: { std::string cellastext; if( Current->Params[ 9 ].asText != nullptr ) { // przepisanie nazwy do bufora @@ -1494,36 +1535,27 @@ event_manager::InitEvents() { } break; } -/* case tp_Voltage: { // zmiana napięcia w zasilaczu (TractionPowerSource) - if( !Current->asNodeName.empty() ) { - tmp = FindGroundNode( Current->asNodeName, TP_TRACTIONPOWERSOURCE ); // podłączenie zasilacza - if( tmp ) - Current->Params[ 9 ].psPower = tmp->psTractionPowerSource; + if( false == Current->asNodeName.empty() ) { + auto *powersource = simulation::Powergrid.find( Current->asNodeName ); // podłączenie zasilacza + if( powersource != nullptr ) + Current->Params[ 9 ].psPower = powersource; else ErrorLog( "Bad event: voltage event \"" + Current->asName + "\" cannot find power source \"" + Current->asNodeName + "\"" ); } Current->asNodeName = ""; break; } -*/ case tp_Message: { // wyświetlenie komunikatu break; } } // switch - if( Current->fDelay < 0 ) { - AddToQuery( Current, nullptr ); - } + + if( Current->fDelay < 0 ) { AddToQuery( Current, nullptr ); } } -/* - for (TGroundNode *Current = nRootOfType[TP_MEMCELL]; Current; Current = Current->nNext) - { // Ra: eventy komórek pamięci, wykonywane po wysłaniu komendy do zatrzymanego pojazdu - Current->MemCell->AssignEvents( FindEvent( Current->asName + ":sent" ) ); - } -*/ } // legacy method, verifies condition for specified event diff --git a/Event.h b/Event.h index 340aa245..cd0f89cd 100644 --- a/Event.h +++ b/Event.h @@ -12,6 +12,9 @@ http://mozilla.org/MPL/2.0/. #include #include "dumb3d.h" #include "classes.h" +#include "names.h" +#include "scenenode.h" +#include "evlaunch.h" enum TEventType { tp_Unknown, @@ -61,6 +64,7 @@ union TParam void *asPointer; TMemCell *asMemCell; TGroundNode *nGroundNode; + editor::basic_node *asEditorNode; glm::dvec3 const *asLocation; TTrack *asTrack; TAnimModel *asModel; @@ -104,7 +108,6 @@ public: // metody TEvent(std::string const &m = ""); ~TEvent(); - void Init(); void Load(cParser *parser, Math3D::vector3 const &org); static void AddToQuery( TEvent *Event, TEvent *&Start ); std::string CommandGet(); @@ -123,9 +126,12 @@ public: ~event_manager(); // methods // adds provided event to the collection. returns: true on success - // TODO: return handle instead of pointer + // TBD, TODO: return handle to the event bool insert( TEvent *Event ); + bool + insert( TEventLauncher *Launcher ) { + return m_launchers.insert( Launcher ); } // legacy method, returns pointer to specified event, or null TEvent * FindEvent( std::string const &Name ); @@ -143,6 +149,7 @@ private: // types using event_sequence = std::deque; using event_map = std::unordered_map; + using eventlauncher_sequence = std::vector; // methods // legacy method, verifies condition for specified event @@ -158,8 +165,9 @@ private: // legacy version of the above TEvent *QueryRootEvent { nullptr }; TEvent *m_workevent { nullptr }; - event_map m_eventmap; + basic_table m_launchers; + eventlauncher_sequence m_launcherqueue; }; //--------------------------------------------------------------------------- diff --git a/Gauge.h b/Gauge.h index 516294a7..c437883c 100644 --- a/Gauge.h +++ b/Gauge.h @@ -12,15 +12,14 @@ http://mozilla.org/MPL/2.0/. #include "Classes.h" #include "sound.h" -typedef enum -{ // typ ruchu +enum TGaugeType { + // typ ruchu gt_Unknown, // na razie nie znany gt_Rotate, // obrót gt_Move, // przesunięcie równoległe - gt_Wiper, // obrót trzech kolejnych submodeli o ten sam kąt (np. wycieraczka, drzwi - // harmonijkowe) + gt_Wiper, // obrót trzech kolejnych submodeli o ten sam kąt (np. wycieraczka, drzwi harmonijkowe) gt_Digital // licznik cyfrowy, np. kilometrów -} TGaugeType; +}; // animowany wskaźnik, mogący przyjmować wiele stanów pośrednich class TGauge { diff --git a/Globals.cpp b/Globals.cpp index fea1cb39..f0e85b79 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -996,10 +996,12 @@ void Global::TrainDelete(TDynamicObject *d) pWorld->TrainDelete(d); }; +#ifdef EU07_USE_OLD_GROUNDCODE TDynamicObject *Global::DynamicNearest() { // ustalenie pojazdu najbliższego kamerze return pGround->DynamicNearest(pCamera->Pos); }; +#endif TDynamicObject *Global::CouplerNearest() { // ustalenie pojazdu najbliższego kamerze diff --git a/Globals.h b/Globals.h index 77abf302..e3e15a8d 100644 --- a/Globals.h +++ b/Globals.h @@ -297,7 +297,9 @@ class Global static void TrainDelete(TDynamicObject *d); static void ConfigParse(cParser &parser); static std::string GetNextSymbol(); +#ifdef EU07_USE_OLD_GROUNDCODE static TDynamicObject * DynamicNearest(); +#endif static TDynamicObject * CouplerNearest(); static bool AddToQuery(TEvent *event, TDynamicObject *who); static bool DoEvents(); diff --git a/Ground.cpp b/Ground.cpp index 8ffe1c38..ac467df8 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -586,7 +586,7 @@ void TGround::Free() // RootNode=NULL; nRootDynamic = NULL; } - +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode * TGround::DynamicFindAny(std::string const &Name) { // wyszukanie pojazdu o podanej nazwie, szukanie po wszystkich (użyć drzewa!) for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) @@ -603,7 +603,7 @@ TGroundNode * TGround::DynamicFind(std::string const &Name) return Current; return NULL; }; - +#endif void TGround::DynamicList(bool all) { // odesłanie nazw pojazdów dostępnych na scenerii (nazwy, szczególnie wagonów, mogą się @@ -694,6 +694,7 @@ int iTrainSetWehicleNumber = 0; TGroundNode *nTrainSetNode = NULL; // poprzedni pojazd do łączenia TGroundNode *nTrainSetDriver = NULL; // pojazd, któremu zostanie wysłany rozkład +#ifdef EU07_USE_OLD_GROUNDCODE void TGround::RaTriangleDivider(TGroundNode *node) { // tworzy dodatkowe trójkąty i zmiejsza podany // to jest wywoływane przy wczytywaniu trójkątów @@ -814,7 +815,7 @@ void TGround::RaTriangleDivider(TGroundNode *node) RaTriangleDivider(node); // rekurencja, bo nawet na TD raz nie wystarczy RaTriangleDivider(ntri); }; - +#endif TGroundNode * TGround::AddGroundNode(cParser *parser) { // wczytanie wpisu typu "node" std::string str, str1, str2, str3, str4, Skin, DriverType, asNodeName; @@ -889,7 +890,8 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) switch (tmp->iType) { - case TP_TRACTION: +#ifdef EU07_USE_OLD_GROUNDCODE + case TP_TRACTION: tmp->hvTraction = new TTraction( tmp->asName ); parser->getTokens(); *parser >> token; @@ -983,7 +985,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) >> tmp->pCenter.y >> tmp->pCenter.z; tmp->pCenter += pOrigin; - tmp->psTractionPowerSource = new TTractionPowerSource(tmp); + tmp->psTractionPowerSource = new TTractionPowerSource( tmp->asName ); tmp->psTractionPowerSource->Load(parser); break; case TP_MEMCELL: @@ -1004,6 +1006,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } } break; +#endif case TP_EVLAUNCH: parser->getTokens(3); *parser @@ -1015,6 +1018,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->EvLaunch = new TEventLauncher(); tmp->EvLaunch->Load(parser); break; +#ifdef EU07_USE_OLD_GROUNDCODE case TP_TRACK: tmp->pTrack = new TTrack( tmp->asName ); if (Global::iWriteLogEnabled & 4) @@ -1191,57 +1195,8 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } break; +#endif case TP_MODEL: { -#ifdef EU07_USE_OLD_TERRAINCODE - if( rmin < 0 ) { - tmp->iType = TP_TERRAIN; - tmp->fSquareMinRadius = 0; // to w ogóle potrzebne? - } - parser->getTokens( 3 ); - *parser >> tmp->pCenter.x >> tmp->pCenter.y >> tmp->pCenter.z; - parser->getTokens(); - *parser >> tf1; - // OlO_EU&KAKISH-030103: obracanie punktow zaczepien w modelu - tmp->pCenter.RotateY( aRotate.y / 180.0 * M_PI ); - // McZapkie-260402: model tez ma wspolrzedne wzgledne - tmp->pCenter += pOrigin; - - tmp->Model = new TAnimModel(); - tmp->Model->RaAnglesSet( aRotate.x, tf1 + aRotate.y, aRotate.z ); // dostosowanie do pochylania linii - if( tmp->Model->Load( parser, tmp->iType == TP_TERRAIN ) ) { - // wczytanie modelu, tekstury i stanu świateł... - tmp->iFlags = tmp->Model->Flags() | 0x200; // ustalenie, czy przezroczysty; flaga usuwania - } - else if( tmp->iType != TP_TERRAIN ) { // model nie wczytał się - ignorowanie node - delete tmp; - tmp = NULL; // nie może być tu return - break; // nie może być tu return? - } - if( tmp->iType == TP_TERRAIN ) { // jeśli model jest terenem, trzeba utworzyć dodatkowe obiekty - // po wczytaniu model ma już utworzone DL albo VBO - Global::pTerrainCompact = tmp->Model; // istnieje co najmniej jeden obiekt terenu - tmp->pCenter = Math3D::vector3( 0.0, 0.0, 0.0 ); // enforce placement in the world center - tmp->iCount = Global::pTerrainCompact->TerrainCount() + 1; // zliczenie submodeli - tmp->nNode = new TGroundNode[ tmp->iCount ]; // sztuczne node dla kwadratów - tmp->nNode[ 0 ].iType = TP_MODEL; // pierwszy zawiera model (dla delete) - tmp->nNode[ 0 ].Model = Global::pTerrainCompact; - tmp->nNode[ 0 ].iFlags = 0x200; // nie wyświetlany, ale usuwany - for( int i = 1; i < tmp->iCount; ++i ) { // a reszta to submodele - tmp->nNode[ i ].iType = TP_SUBMODEL; - tmp->nNode[ i ].smTerrain = Global::pTerrainCompact->TerrainSquare( i - 1 ); - tmp->nNode[ i ].iFlags = 0x10; // nieprzezroczyste; nie usuwany - tmp->nNode[ i ].bVisible = true; - tmp->nNode[ i ].pCenter = tmp->pCenter; // nie przesuwamy w inne miejsce - } - } - else if( !tmp->asName.empty() ) // jest pusta gdy "none" - { // dodanie do wyszukiwarki - if( false == m_nodemap.Add( TP_MODEL, tmp->asName, tmp ) ) { - // przy zdublowaniu wskaźnik zostanie podmieniony w drzewku na późniejszy (zgodność wsteczna) - ErrorLog( "Duplicated model: " + tmp->asName ); // to zgłaszać duplikat - } - } -#else if( rmin < 0 ) { // legacy leftover: special case, terrain provided as 3d model tmp->iType = TP_TERRAIN; @@ -1274,6 +1229,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } } else { +#ifdef EU07_USE_OLD_GROUNDCODE // regular 3d model parser->getTokens( 3 ); *parser @@ -1304,10 +1260,11 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) ErrorLog( "Duplicated model: " + tmp->asName ); // to zgłaszać duplikat } } - } #endif + } break; } +#ifdef EU07_USE_OLD_GROUNDCODE // case TP_GEOMETRY : case GL_TRIANGLES: case GL_TRIANGLE_STRIP: @@ -1510,6 +1467,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } // koniec wczytywania trójkątów break; } +#endif case GL_LINES: case GL_LINE_STRIP: case GL_LINE_LOOP: { @@ -1802,7 +1760,7 @@ bool TGround::Init(std::string File) else { // jeśli jest pojazdem if( ( LastNode->DynamicObject->Mechanik != nullptr ) && ( LastNode->DynamicObject->Mechanik->Primary() ) ) { - // jeśli jest głównym (pasażer nie jest) + // jeśli jest głównym (pasażer nie jest) nTrainSetDriver = LastNode; // pojazd, któremu zostanie wysłany rozkład } LastNode->nNext = nRootDynamic; @@ -1859,8 +1817,7 @@ bool TGround::Init(std::string File) if (nTrainSetDriver) // pojazd, któremu zostanie wysłany rozkład { // wysłanie komendy "Timetable" ustawia odpowiedni tryb jazdy nTrainSetDriver->DynamicObject->Mechanik->DirectionInitial(); - nTrainSetDriver->DynamicObject->Mechanik->PutCommand("Timetable:" + asTrainName, - fTrainSetVel, 0, NULL); + nTrainSetDriver->DynamicObject->Mechanik->PutCommand("Timetable:" + asTrainName, fTrainSetVel, 0, NULL); } } if( LastNode ) { @@ -1926,7 +1883,7 @@ bool TGround::Init(std::string File) { ErrorLog("Duplicated event: " + tmp->asName); found->Append(tmp); // doczepka (taki wirtualny multiple bez warunków) - found->Type = tp_Ignored; // dezaktywacja pierwotnego - taka proteza na + found->m_ignored = true; // dezaktywacja pierwotnego - taka proteza na // wsteczną zgodność // SafeDelete(tmp); //bezlitośnie usuwamy wszelkie duplikaty, żeby nie // zaśmiecać drzewka @@ -1938,7 +1895,7 @@ bool TGround::Init(std::string File) RootEvent = tmp; if (!found) { // jeśli nazwa wystąpiła, to do kolejki i wyszukiwarki dodawany jest tylko pierwszy - if( ( RootEvent->Type != tp_Ignored ) + if( ( RootEvent->m_ignored == false ) && ( RootEvent->asName.find( "onstart" ) != std::string::npos ) ) { // event uruchamiany automatycznie po starcie AddToQuery( RootEvent, NULL ); // dodanie do kolejki @@ -2217,7 +2174,7 @@ bool TGround::InitEvents() } else { // nie ma komórki, to nie będzie działał poprawnie - Current->Type = tp_Ignored; // deaktywacja + Current->m_ignored = true; // deaktywacja ErrorLog("Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\""); } break; @@ -2241,7 +2198,7 @@ bool TGround::InitEvents() } else { // nie ma komórki, to nie będzie działał poprawnie - Current->Type = tp_Ignored; // deaktywacja + Current->m_ignored = true; // deaktywacja ErrorLog("Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\""); } break; @@ -2637,7 +2594,7 @@ void TGround::InitTraction() nTemp = new TGroundNode(); nTemp->iType = TP_TRACTIONPOWERSOURCE; nTemp->asName = Traction->asPowerSupplyName; - nTemp->psTractionPowerSource = new TTractionPowerSource(nTemp); + nTemp->psTractionPowerSource = new TTractionPowerSource(nTemp->asName); nTemp->psTractionPowerSource->Init(Traction->NominalVoltage, Traction->MaxCurrent); nTemp->nNext = nRootOfType[nTemp->iType]; // ostatni dodany dołączamy na końcu // nowego @@ -2826,8 +2783,11 @@ void TGround::TrackJoin(TGroundNode *Current) int iConnection; if (!Track->CurrentPrev()) { - tmp = FindTrack(Track->CurrentSegment()->FastGetPoint_0(), iConnection, - Current); // Current do pominięcia +#ifdef EU07_USE_OLD_GROUNDCODE + tmp = FindTrack(Track->CurrentSegment()->FastGetPoint_0(), iConnection, Current); // Current do pominięcia +#else + std::tie( tmp, iConnection ) = simulation::Region->find_path( Track->CurrentSegment()->FastGetPoint_0(), Track ); +#endif switch (iConnection) { case 0: @@ -2840,7 +2800,11 @@ void TGround::TrackJoin(TGroundNode *Current) } if (!Track->CurrentNext()) { +#ifdef EU07_USE_OLD_GROUNDCODE tmp = FindTrack(Track->CurrentSegment()->FastGetPoint_1(), iConnection, Current); +#else + std::tie( tmp, iConnection ) = simulation::Region->find_path( Track->CurrentSegment()->FastGetPoint_1(), Track ); +#endif switch (iConnection) { case 0: @@ -2892,6 +2856,7 @@ bool TGround::InitLaunchers() return true; } +#ifdef EU07_USE_OLD_GROUNDCODE TTrack * TGround::FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclude) { // wyszukiwanie innego toru kończącego się w (Point) TTrack *tmp; @@ -2978,49 +2943,36 @@ TTraction * TGround::TractionNearestFind(glm::dvec3 &p, int dir, TGroundNode *n) if ((sr = FastGetSubRect(c + i, r + j)) != NULL) // o ile w ogóle sektor jest for (nCurrent = sr->nRenderWires; nCurrent; nCurrent = nCurrent->nNext3) if (nCurrent->iType == TP_TRACTION) - if (nCurrent->hvTraction->psSection == - n->hvTraction->psSection) // jeśli ta sama sekcja + if (nCurrent->hvTraction->psSection == n->hvTraction->psSection) // jeśli ta sama sekcja if (nCurrent != n) // ale nie jest tym samym - if (nCurrent->hvTraction != - n->hvTraction - ->hvNext[0]) // ale nie jest bezpośrednio podłączonym + if (nCurrent->hvTraction != n->hvTraction->hvNext[0]) // ale nie jest bezpośrednio podłączonym if (nCurrent->hvTraction != n->hvTraction->hvNext[1]) if (nCurrent->hvTraction->psPower [k = (glm::dot( n->hvTraction->vParametric, nCurrent->hvTraction->vParametric) >= 0 ? dir ^ 1 : - dir)]) // ma zasilanie z odpowiedniej - // strony - if (nCurrent->hvTraction->fResistance[k] >= - 0.0) //żeby się nie propagowały jakieś ujemne - { // znaleziony kandydat do połączenia + dir)]) // ma zasilanie z odpowiedniej strony + if (nCurrent->hvTraction->fResistance[k] >= 0.0) { // żeby się nie propagowały jakieś ujemne + // znaleziony kandydat do połączenia d = glm::length2( p - glm::dvec3{ nCurrent->pCenter } ); // kwadrat odległości środków - if (dist > d) - { // zapamiętanie nowego najbliższego + if (dist > d) { + // zapamiętanie nowego najbliższego dist = d; // nowy rekord odległości nBest = nCurrent; - zg = k; // z którego końca brać wskaźnik - // zasilacza + zg = k; // z którego końca brać wskaźnik zasilacza } } - if (nBest) // jak znalezione przęsło z zasilaniem, to podłączenie "równoległe" - { - n->hvTraction->ResistanceCalc(dir, nBest->hvTraction->fResistance[zg], - nBest->hvTraction->psPower[zg]); - // testowo skrzywienie przęsła tak, aby pokazać skąd ma zasilanie - // if (dir) //1 gdy ciąg dalszy jest od strony Point2 - // n->hvTraction->pPoint3=0.25*(nBest->pCenter+3*(zg?nBest->hvTraction->pPoint4:nBest->hvTraction->pPoint3)); - // else - // n->hvTraction->pPoint4=0.25*(nBest->pCenter+3*(zg?nBest->hvTraction->pPoint4:nBest->hvTraction->pPoint3)); + if (nBest) { + // jak znalezione przęsło z zasilaniem, to podłączenie "równoległe" + n->hvTraction->ResistanceCalc(dir, nBest->hvTraction->fResistance[zg], nBest->hvTraction->psPower[zg]); } return (nBest ? nBest->hvTraction : nullptr); }; -#ifdef EU07_USE_OLD_GROUNDCODE bool TGround::AddToQuery(TEvent *Event, TDynamicObject *Node) { - if( Event->bEnabled ) { + if( ( false == Event->m_ignored ) && ( true == Event->bEnabled ) ) { // jeśli może być dodany do kolejki (nie używany w skanowaniu) if( !Event->iQueued ) // jeśli nie dodany jeszcze do kolejki { // kolejka eventów jest posortowana względem (fStartTime) @@ -3169,8 +3121,8 @@ bool TGround::CheckQuery() } else // a jak nazwa jest unikalna, to kolejka idzie dalej QueryRootEvent = QueryRootEvent->evNext; // NULL w skrajnym przypadku - if (tmpEvent->bEnabled) - { // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć + if( ( false == tmpEvent->m_ignored ) && ( true == tmpEvent->bEnabled ) ) { + // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć --tmpEvent->iQueued; // teraz moze być ponownie dodany do kolejki WriteLog( "EVENT LAUNCHED" + ( tmpEvent->Activator ? ( " by " + tmpEvent->Activator->asName ) : "" ) + ": " + tmpEvent->asName ); switch (tmpEvent->Type) @@ -3222,7 +3174,7 @@ bool TGround::CheckQuery() // loc.Z= tmpEvent->Params[8].nGroundNode->pCenter.y; if (Global::iMultiplayer) // potwierdzenie wykonania dla serwera (odczyt // semafora już tak nie działa) - WyslijEvent(tmpEvent->asName, tmpEvent->Activator->GetName()); + WyslijEvent(tmpEvent->asName, tmpEvent->Activator->name()); // tmpEvent->Params[9].asMemCell->PutCommand(tmpEvent->Activator->Mechanik,loc); tmpEvent->Params[9].asMemCell->PutCommand( tmpEvent->Activator->Mechanik, &tmpEvent->Params[8].nGroundNode->pCenter); @@ -3355,7 +3307,7 @@ bool TGround::CheckQuery() 0) // jednoznaczne tylko, gdy nie było else { if (tmpEvent->Activator) - WyslijEvent(tmpEvent->asName, tmpEvent->Activator->GetName()); + WyslijEvent(tmpEvent->asName, tmpEvent->Activator->name()); else WyslijEvent(tmpEvent->asName, ""); } @@ -3468,7 +3420,6 @@ bool TGround::CheckQuery() } // while return true; } -#endif void TGround::UpdatePhys(double dt, int iter) { // aktualizacja fizyki stałym krokiem: dt=krok czasu [s], dt*iter=czas od ostatnich przeliczeń @@ -3587,9 +3538,8 @@ TGround::Update_Hidden() { } } } - } - +#endif // Winger 170204 - szukanie trakcji nad pantografami bool TGround::GetTraction(TDynamicObject *model) { // aktualizacja drutu zasilającego dla każdego pantografu, żeby odczytać napięcie @@ -3709,35 +3659,29 @@ bool TGround::GetTraction(TDynamicObject *model) { // dany sektor może nie mieć nic w środku for (node = tmp->nRenderWires; node; node = node->nNext3) // następny z grupy - if (node->iType == - TP_TRACTION) // w grupie tej są druty oraz inne linie + if (node->iType == TP_TRACTION) // w grupie tej są druty oraz inne linie { - vParam = - node->hvTraction - ->vParametric; // współczynniki równania parametrycznego + // współczynniki równania parametrycznego + vParam = node->hvTraction->vParametric; fRaParam = -glm::dot(pant0, vFront); auto const paramfrontdot = glm::dot( vParam, vFront ); fRaParam = -( glm::dot( node->hvTraction->pPoint1, vFront ) + fRaParam ) / ( paramfrontdot != 0.0 ? paramfrontdot : 0.001 ); // div0 trap if ((fRaParam >= -0.001) ? (fRaParam <= 1.001) : false) - { // jeśli tylko jest w przedziale, wyznaczyć odległość wzdłuż - // wektorów vUp i vLeft - vStyk = node->hvTraction->pPoint1 + - fRaParam * vParam; // punkt styku płaszczyzny z - // drutem (dla generatora łuku - // el.) - vGdzie = vStyk - pant0; // wektor - fVertical = glm::dot( - vGdzie, - vUp); // musi się mieścić w przedziale ruchu pantografu + { // jeśli tylko jest w przedziale, wyznaczyć odległość wzdłuż wektorów vUp i vLeft + // punkt styku płaszczyzny z drutem (dla generatora łuku el.) + vStyk = node->hvTraction->pPoint1 + fRaParam * vParam; + // wektor musi się mieścić w przedziale ruchu pantografu + vGdzie = vStyk - pant0; + fVertical = glm::dot( vGdzie, vUp); if (fVertical >= 0.0) // jeśli ponad pantografem (bo może // łapać druty spod wiaduktu) if (Global::bEnableTraction ? fVertical < p->PantWys - 0.15 : - false) // jeśli drut jest niżej niż 15cm pod - // ślizgiem - { // przełączamy w tryb połamania, o ile jedzie; + false) { + // jeśli drut jest niżej niż 15cm pod ślizgiem + // przełączamy w tryb połamania, o ile jedzie; // (bEnableTraction) aby dało się jeździć na // koślawych // sceneriach @@ -3827,18 +3771,7 @@ bool TGround::GetTraction(TDynamicObject *model) else p->hvPowerWire = NULL; // pantograf opuszczony } - // if (model->fWahaczeAmpMoverParameters->DistCounter) - //{//nieużywana normalnie zmienna ogranicza powtórzone logowania - // model->fWahaczeAmp=model->MoverParameters->DistCounter; - // ErrorLog(FloatToStrF(1000.0*model->MoverParameters->DistCounter,ffFixed,7,3)+","+FloatToStrF(p->PantTraction,ffFixed,7,3)+","+FloatToStrF(p->fHorizontal,ffFixed,7,3)+","+FloatToStrF(p->PantWys,ffFixed,7,3)+","+AnsiString(p->hvPowerWire?1:0)); - // // - // if (p->fHorizontal>1.0) - //{ - // //Global::iPause|=1; //zapauzowanie symulacji - // Global::fTimeSpeed=1; //spowolnienie czasu do obejrzenia pantografu - // return true; //łapacz - //} - //} + return true; }; diff --git a/Ground.h b/Ground.h index f045c23b..00bf072b 100644 --- a/Ground.h +++ b/Ground.h @@ -285,20 +285,24 @@ class TGround bool InitEvents(); #endif bool InitLaunchers(); +#ifdef EU07_USE_OLD_GROUNDCODE TTrack * FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclude); TTraction * FindTraction(glm::dvec3 const &Point, int &iConnection, TGroundNode *Exclude); TTraction * TractionNearestFind(glm::dvec3 &p, int dir, TGroundNode *n); +#endif TGroundNode * AddGroundNode(cParser *parser); +#ifdef EU07_USE_OLD_GROUNDCODE void UpdatePhys(double dt, int iter); // aktualizacja fizyki stałym krokiem bool Update(double dt, int iter); // aktualizacja przesunięć zgodna z FPS void Update_Hidden(); // updates invisible elements of the scene +#endif bool GetTraction(TDynamicObject *model); #ifdef EU07_USE_OLD_GROUNDCODE bool AddToQuery( TEvent *Event, TDynamicObject *Node ); bool CheckQuery(); -#endif TGroundNode * DynamicFindAny(std::string const &Name); TGroundNode * DynamicFind(std::string const &Name); +#endif void DynamicList(bool all = false); TGroundNode * FindGroundNode(std::string const &asNameToFind, TGroundNodeType const iNodeType); TGroundRect * GetRect( double x, double z ); @@ -325,7 +329,9 @@ class TGround // convert tp_terrain model to a series of triangle nodes void convert_terrain( TGroundNode const *Terrain ); void convert_terrain( TSubModel const *Submodel ); +#ifdef EU07_USE_OLD_GROUNDCODE void RaTriangleDivider(TGroundNode *node); +#endif void Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam); public: diff --git a/MemCell.cpp b/MemCell.cpp index 0bf32bf3..8143b2fa 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -180,3 +180,15 @@ void TMemCell::AssignEvents(TEvent *e) { // powiązanie eventu OnSent = e; }; + + + +// legacy method, initializes traction after deserialization from scenario file +void +memory_table::InitCells() { + + for( auto *cell : m_items ) { + // Ra: eventy komórek pamięci, wykonywane po wysłaniu komendy do zatrzymanego pojazdu + cell->AssignEvents( simulation::Events.FindEvent( cell->name() + ":sent" ) ); + } +} diff --git a/MemCell.h b/MemCell.h index 35637431..aa84d3b9 100644 --- a/MemCell.h +++ b/MemCell.h @@ -61,8 +61,14 @@ class TMemCell : public editor::basic_node { void AssignEvents(TEvent *e); }; -class memory_manager : public basic_table { + +class memory_table : public basic_table { + +public: + // legacy method, initializes traction after deserialization from scenario file + void + InitCells(); }; //--------------------------------------------------------------------------- diff --git a/Model3d.cpp b/Model3d.cpp index ea6dd7b9..f2ce05be 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1641,7 +1641,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, } } else { - ErrorLog( "Bad model: reference to non-existent texture index in sub-model" + ( pName.empty() ? "" : " \"" + pName + "\"" ) ); + ErrorLog( "Bad model: reference to nonexistent texture index in sub-model" + ( pName.empty() ? "" : " \"" + pName + "\"" ) ); m_material = null_handle; } } diff --git a/RealSound.cpp b/RealSound.cpp index ce9c6a3b..f16ffe05 100644 --- a/RealSound.cpp +++ b/RealSound.cpp @@ -21,8 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "mczapkie/mctools.h" #include "usefull.h" -TRealSound::TRealSound(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, - bool freqmod, double rmin) +TRealSound::TRealSound(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, bool freqmod, double rmin) { Init(SoundName, SoundAttenuation, X, Y, Z, Dynamic, freqmod, rmin); } @@ -32,12 +31,7 @@ TRealSound::~TRealSound() // if (this) if (pSound) pSound->Stop(); } -void TRealSound::Free() -{ -} - -void TRealSound::Init(std::string const &SoundName, double DistanceAttenuation, double X, double Y, double Z, - bool Dynamic, bool freqmod, double rmin) +void TRealSound::Init(std::string const &SoundName, double DistanceAttenuation, double X, double Y, double Z, bool Dynamic, bool freqmod, double rmin) { // Nazwa=SoundName; //to tak raczej nie zadziała, (SoundName) jest tymczasowe pSound = TSoundsManager::GetFromName(SoundName, Dynamic, &fFrequency); @@ -71,7 +65,7 @@ void TRealSound::Init(std::string const &SoundName, double DistanceAttenuation, dSoundAtt = -1; }; -double TRealSound::ListenerDistance(vector3 ListenerPosition) +double TRealSound::ListenerDistance( Math3D::vector3 ListenerPosition) { if (dSoundAtt == -1) { @@ -83,7 +77,7 @@ double TRealSound::ListenerDistance(vector3 ListenerPosition) } } -void TRealSound::Play(double Volume, int Looping, bool ListenerInside, vector3 NewPosition) +void TRealSound::Play(double Volume, int Looping, bool ListenerInside, Math3D::vector3 NewPosition) { if (!pSound) return; @@ -155,11 +149,6 @@ void TRealSound::Play(double Volume, int Looping, bool ListenerInside, vector3 N } }; -void TRealSound::Start(){ - // włączenie dźwięku - -}; - void TRealSound::Stop() { DWORD stat; @@ -231,17 +220,14 @@ void TRealSound::ResetPosition() pSound->SetCurrentPosition(0); } -TTextSound::TTextSound(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, - bool Dynamic, bool freqmod, double rmin) - : TRealSound(SoundName, SoundAttenuation, X, Y, Z, Dynamic, freqmod, rmin) +TTextSound::TTextSound(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, bool freqmod, double rmin) : + TRealSound(SoundName, SoundAttenuation, X, Y, Z, Dynamic, freqmod, rmin) { Init(SoundName, SoundAttenuation, X, Y, Z, Dynamic, freqmod, rmin); } -void TTextSound::Init(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, - bool Dynamic, bool freqmod, double rmin) +void TTextSound::Init(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, bool freqmod, double rmin) { // dodatkowo doczytuje plik tekstowy - //TRealSound::Init(SoundName, SoundAttenuation, X, Y, Z, Dynamic, freqmod, rmin); fTime = GetWaveTime(); std::string txt(SoundName); txt.erase( txt.rfind( '.' ) ); // obcięcie rozszerzenia @@ -253,15 +239,11 @@ void TTextSound::Init(std::string const &SoundName, double SoundAttenuation, dou txt = "sounds\\" + txt; //ścieżka może nie być podana if (FileExists(txt)) { // wczytanie -/* TFileStream *ts = new TFileStream(txt, fmOpenRead); - asText = AnsiString::StringOfChar(' ', ts->Size); - ts->Read(asText.c_str(), ts->Size); - delete ts; -*/ std::ifstream inputfile( txt ); + std::ifstream inputfile( txt ); asText.assign( std::istreambuf_iterator( inputfile ), std::istreambuf_iterator() ); } }; -void TTextSound::Play(double Volume, int Looping, bool ListenerInside, vector3 NewPosition) +void TTextSound::Play(double Volume, int Looping, bool ListenerInside, Math3D::vector3 NewPosition) { if (false == asText.empty()) { // jeśli ma powiązany tekst diff --git a/RealSound.h b/RealSound.h index 1eec3761..c72d76a0 100644 --- a/RealSound.h +++ b/RealSound.h @@ -7,24 +7,25 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef RealSoundH -#define RealSoundH +#pragma once #include -#include "Sound.h" -#include "Geometry.h" -class TRealSound -{ - protected: +#include "Sound.h" +#include "dumb3d.h" +#include "names.h" + +class TRealSound { + +protected: PSound pSound = nullptr; -// char *Nazwa; // dla celow odwszawiania NOTE: currently not used anywhere - double fDistance = 0.0, - fPreviousDistance = 0.0; // dla liczenia Dopplera + double fDistance = 0.0; + double fPreviousDistance = 0.0; // dla liczenia Dopplera float fFrequency = 22050.0; // częstotliwość samplowania pliku int iDoppler = 0; // Ra 2014-07: możliwość wyłączenia efektu Dopplera np. dla śpiewu ptaków - public: - vector3 vSoundPosition; // polozenie zrodla dzwieku +public: + std::string m_name; + Math3D::vector3 vSoundPosition; // polozenie zrodla dzwieku double dSoundAtt = -1.0; // odleglosc polowicznego zaniku dzwieku double AM = 0.0; // mnoznik amplitudy double AA = 0.0; // offset amplitudy @@ -32,37 +33,43 @@ class TRealSound double FA = 0.0; // offset czestotliwosci bool bLoopPlay = false; // czy zapętlony dźwięk jest odtwarzany TRealSound() = default; - TRealSound( std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, - bool freqmod = false, double rmin = 0.0); + TRealSound( std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, bool freqmod = false, double rmin = 0.0 ); ~TRealSound(); - void Free(); - void Init(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, - bool freqmod = false, double rmin = 0.0); - double ListenerDistance(vector3 ListenerPosition); - void Play(double Volume, int Looping, bool ListenerInside, vector3 NewPosition); - void Start(); + void Init( std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, bool freqmod = false, double rmin = 0.0 ); + double ListenerDistance( Math3D::vector3 ListenerPosition); + void Play(double Volume, int Looping, bool ListenerInside, Math3D::vector3 NewPosition); void Stop(); void AdjFreq(double Freq, double dt); void SetPan(int Pan); double GetWaveTime(); // McZapkie TODO: dorobic dla roznych bps int GetStatus(); void ResetPosition(); - // void FreqReset(float f=22050.0) {fFrequency=f;}; bool Empty() { return ( pSound == nullptr ); } + void + name( std::string Name ) { + m_name = Name; } + std::string const & + name() const { + return m_name; } + glm::dvec3 + location() const { + return vSoundPosition; }; }; -class TTextSound : public TRealSound -{ // dźwięk ze stenogramem + + +class TTextSound : public TRealSound { + // dźwięk ze stenogramem std::string asText; float fTime; // czas trwania - public: - TTextSound(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, - bool Dynamic, bool freqmod = false, double rmin = 0.0); - void Init(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, - bool Dynamic, bool freqmod = false, double rmin = 0.0); - void Play(double Volume, int Looping, bool ListenerInside, vector3 NewPosition); +public: + TTextSound(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, bool freqmod = false, double rmin = 0.0); + void Init(std::string const &SoundName, double SoundAttenuation, double X, double Y, double Z, bool Dynamic, bool freqmod = false, double rmin = 0.0); + void Play(double Volume, int Looping, bool ListenerInside, Math3D::vector3 NewPosition); }; + + class TSynthSound { // klasa generująca sygnał odjazdu (Rp12, Rp13), potem rozbudować o pracę manewrowego... int iIndex[44]; // indeksy początkowe, gdy mamy kilka wariantów dźwięków składowych @@ -74,10 +81,16 @@ class TSynthSound // 41 - "tysiące" // 42 - indeksy początkowe dla "odjazd" // 43 - indeksy początkowe dla "gotów" - PSound *sSound; // posortowana tablica dźwięków, rozmiar zależny od liczby znalezionych plików + PSound sSound; // posortowana tablica dźwięków, rozmiar zależny od liczby znalezionych plików // a może zamiast wielu plików/dźwięków zrobić jeden połączony plik i posługiwać się czasem // od..do? }; + + +// collection of generators for power grid present in the scene +class sound_table : public basic_table { + +}; + //--------------------------------------------------------------------------- -#endif diff --git a/Segment.cpp b/Segment.cpp index bfed769e..293daf57 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -103,7 +103,7 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M fStep = fNewStep; if (fLength <= 0) { - ErrorLog( "Bad geometry: zero length spline \"" + pOwner->NameGet() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); + ErrorLog( "Bad geometry: zero length spline \"" + pOwner->name() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); fLength = 0.01; // crude workaround TODO: fix this properly /* return false; // zerowe nie mogą być @@ -205,7 +205,7 @@ double TSegment::GetTFromS(double const s) const // Newton's method failed. If this happens, increase iterations or // tolerance or integration accuracy. // return -1; //Ra: tu nigdy nie dojdzie - ErrorLog( "Bad geometry: shape estimation failed for spline \"" + pOwner->NameGet() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); + ErrorLog( "Bad geometry: shape estimation failed for spline \"" + pOwner->name() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); // MessageBox(0,"Too many iterations","GetTFromS",MB_OK); return fTime; }; @@ -323,23 +323,28 @@ Math3D::vector3 TSegment::GetPoint(double const fDistance) const } }; -void TSegment::RaPositionGet(double const fDistance, Math3D::vector3 &p, Math3D::vector3 &a) const -{ // ustalenie pozycji osi na torze, przechyłki, pochylenia i kierunku jazdy - if (bCurve) - { // można by wprowadzić uproszczony wzór dla okręgów płaskich - double t = GetTFromS(fDistance); // aproksymacja dystansu na krzywej Beziera na parametr (t) - p = RaInterpolate(t); - a.x = (1.0 - t) * fRoll1 + (t)*fRoll2; // przechyłka w danym miejscu (zmienia się liniowo) +// ustalenie pozycji osi na torze, przechyłki, pochylenia i kierunku jazdy +void TSegment::RaPositionGet(double const fDistance, Math3D::vector3 &p, Math3D::vector3 &a) const { + + if (bCurve) { + // można by wprowadzić uproszczony wzór dla okręgów płaskich + auto const t = GetTFromS(fDistance); // aproksymacja dystansu na krzywej Beziera na parametr (t) + p = FastGetPoint( t ); + // przechyłka w danym miejscu (zmienia się liniowo) + a.x = interpolate( fRoll1, fRoll2, t ); // pochodna jest 3*A*t^2+2*B*t+C - a.y = atan(t * (t * 3.0 * vA.y + vB.y + vB.y) + vC.y); // pochylenie krzywej (w pionie) - a.z = -atan2(t * (t * 3.0 * vA.x + vB.x + vB.x) + vC.x, - t * (t * 3.0 * vA.z + vB.z + vB.z) + vC.z); // kierunek krzywej w planie + auto const tangent = t * ( t * 3.0 * vA + vB + vB ) + vC; + // pochylenie krzywej (w pionie) + a.y = std::atan( tangent.y ); + // kierunek krzywej w planie + a.z = -std::atan2( tangent.x, tangent.z ); } - else - { // wyliczenie dla odcinka prostego jest prostsze - double t = fDistance / fLength; // zerowych torów nie ma - p = ((1.0 - t) * Point1 + (t)*Point2); - a.x = (1.0 - t) * fRoll1 + (t)*fRoll2; // przechyłka w danym miejscu (zmienia się liniowo) + else { + // wyliczenie dla odcinka prostego jest prostsze + auto const t = fDistance / fLength; // zerowych torów nie ma + p = FastGetPoint( t ); + // przechyłka w danym miejscu (zmienia się liniowo) + a.x = interpolate( fRoll1, fRoll2, t ); a.y = fStoop; // pochylenie toru prostego a.z = fDirection; // kierunek toru w planie } diff --git a/Segment.h b/Segment.h index 93209804..dfcf09be 100644 --- a/Segment.h +++ b/Segment.h @@ -14,37 +14,6 @@ http://mozilla.org/MPL/2.0/. #include "Classes.h" #include "usefull.h" -// 110405 Ra: klasa punktów przekroju z normalnymi -/* -class vector6 : public Math3D::vector3 -{ // punkt przekroju wraz z wektorem normalnym - public: - Math3D::vector3 n; - vector6() - { - x = y = z = n.x = n.z = 0.0; - n.y = 1.0; - }; - vector6(double a, double b, double c, double d, double e, double f) - { - x = a; - y = b; - z = c; - n.x = 0.0; - n.y = 1.0; - n.z = 0.0; - }; // Ra: bo na razie są z tym problemy - vector6(double a, double b, double c) - { - x = a; - y = b; - z = c; - n.x = 0.0; - n.y = 1.0; - n.z = 0.0; - }; -}; -*/ class TSegment { // aproksymacja toru (zwrotnica ma dwa takie, jeden z nich jest aktywny) private: @@ -60,7 +29,6 @@ class TSegment double fStoop = 0.0; // Ra: kąt wzniesienia; dla łuku od Point1 Math3D::vector3 vA, vB, vC; // współczynniki wielomianów trzeciego stopnia vD==Point1 TTrack *pOwner = nullptr; // wskaźnik na właściciela - double fAngle[ 2 ] = { 0.0, 0.0 }; // kąty zakończenia drogi na przejazdach Math3D::vector3 GetFirstDerivative(double const fTime) const; @@ -140,10 +108,6 @@ public: int RaSegCount() const { return fTsBuffer ? iSegCount : 1; }; - inline - void - AngleSet(int const i, double const a) { - fAngle[i] = a; }; }; //--------------------------------------------------------------------------- diff --git a/Track.cpp b/Track.cpp index 041842bf..04884ce7 100644 --- a/Track.cpp +++ b/Track.cpp @@ -26,6 +26,7 @@ http://mozilla.org/MPL/2.0/. #include "AnimModel.h" #include "MemCell.h" #include "Event.h" +#include "simulation.h" // 101206 Ra: trapezoidalne drogi i tory // 110720 Ra: rozprucie zwrotnicy i odcinki izolowane @@ -2651,6 +2652,31 @@ int TTrack::TestPoint(vector3 *Point) return -1; }; +// retrieves list of the track's end points +std::vector +TTrack::endpoints() const { + + switch( eType ) { + case tt_Normal: + case tt_Table: { + return { + glm::dvec3{ Segment->FastGetPoint_0() }, + glm::dvec3{ Segment->FastGetPoint_1() } }; + } + case tt_Switch: + case tt_Cross: { + return { + glm::dvec3{ SwitchExtension->Segments[ 0 ]->FastGetPoint_0() }, + glm::dvec3{ SwitchExtension->Segments[ 0 ]->FastGetPoint_1() }, + glm::dvec3{ SwitchExtension->Segments[ 1 ]->FastGetPoint_0() }, + glm::dvec3{ SwitchExtension->Segments[ 1 ]->FastGetPoint_1() } }; + } + default: { + return{}; + } + } +} + void TTrack::MovedUp1(float const dh) { // poprawienie przechyłki wymaga wydłużenia podsypki fTexHeight1 += dh; @@ -2745,11 +2771,11 @@ TTrack * TTrack::Connected(int s, double &d) const // legacy method, initializes tracks after deserialization from scenario file void path_table::InitTracks() { -/* - TGroundNode *Model; - int iConnection; - for( auto *track : m_paths ) { + int connection { -1 }; + TTrack *matchingtrack { nullptr }; + + for( auto *track : m_items ) { track->AssignEvents( simulation::Events.FindEvent( track->asEvent0Name ), @@ -2776,30 +2802,32 @@ path_table::InitTracks() { } switch (track->eType) { +/* + // TODO: re-enable case tt_Table: { // obrotnicę też łączymy na starcie z innymi torami // szukamy modelu o tej samej nazwie - Model = FindGroundNode(Current->asName, TP_MODEL); + auto *instance = simulation::Instances.find( trackname ); // wiązanie toru z modelem obrotnicy track->RaAssign( Current, - ( Model ? - Model->Model : - nullptr ), + instance, simulation::Events.FindEvent( trackname + ":done" ), simulation::Events.FindEvent( trackname + ":joined" ) ); - if( Model == nullptr ) { + if( instance == nullptr ) { // jak nie ma modelu to pewnie jest wykolejnica, a ta jest domyślnie zamknięta i wykoleja break; } + // no break on purpose: // jak coś pójdzie źle, to robimy z tego normalny tor } +*/ case tt_Normal: { // tylko proste są podłączane do rozjazdów, stąd dwa rozjazdy się nie połączą ze sobą if( track->CurrentPrev() == nullptr ) { // tylko jeśli jeszcze nie podłączony - auto *matchingtrack = simulation::Region.FindTrack( track->CurrentSegment()->FastGetPoint_0(), iConnection, track ); - switch( iConnection ) { + std::tie( matchingtrack, connection ) = simulation::Region->find_path( track->CurrentSegment()->FastGetPoint_0(), track ); + switch( connection ) { case -1: // Ra: pierwsza koncepcja zawijania samochodów i statków // if ((Track->iCategoryFlag&1)==0) //jeśli nie jest torem szynowym // Track->ConnectPrevPrev(Track,0); //łączenie końca odcinka do samego siebie @@ -2830,12 +2858,14 @@ path_table::InitTracks() { matchingtrack->SetConnections( 1 ); // robi też Switch(0) matchingtrack->Switch( 0 ); break; + default: + break; } } if( track->CurrentNext() == nullptr ) { // tylko jeśli jeszcze nie podłączony - auto *matchingtrack = simulation::Region.FindTrack( track->CurrentSegment()->FastGetPoint_1(), iConnection, track ); - switch( iConnection ) { + std::tie( matchingtrack, connection ) = simulation::Region->find_path( track->CurrentSegment()->FastGetPoint_1(), track ); + switch( connection ) { case -1: // Ra: pierwsza koncepcja zawijania samochodów i statków // if ((Track->iCategoryFlag&1)==0) //jeśli nie jest torem szynowym // Track->ConnectNextNext(Track,1); //łączenie końca odcinka do samego siebie @@ -2866,6 +2896,8 @@ path_table::InitTracks() { matchingtrack->SetConnections( 1 ); // robi też Switch(0) // tmp->Switch(0); break; + default: + break; } } break; @@ -2910,11 +2942,12 @@ path_table::InitTracks() { else { // utworzenie automatycznej komórki // TODO: determine suitable location for this one, create and add world reference node - auto *memorycell = new TMemCell( isolated->asName ); // to nie musi mieć nazwy, nazwa w wyszukiwarce wystarczy + scene::node_data nodedata; + nodedata.name = isolated->asName; + auto *memorycell = new TMemCell( nodedata ); // to nie musi mieć nazwy, nazwa w wyszukiwarce wystarczy simulation::Memory.insert( memorycell ); isolated->pMemCell = memorycell; // wskaźnik komóki przekazany do odcinka izolowanego } isolated = isolated->Next(); } -*/ } diff --git a/Track.h b/Track.h index fe9d4e1c..0aaac064 100644 --- a/Track.h +++ b/Track.h @@ -119,7 +119,6 @@ class TTrack : public editor::basic_node { friend class opengl_renderer; private: -// TGroundNode * pMyNode = nullptr; // Ra: proteza, żeby tor znał swoją nazwę TODO: odziedziczyć TTrack z TGroundNode TIsolated * pIsolated = nullptr; // obwód izolowany obsługujący zajęcia/zwolnienia grupy torów std::shared_ptr SwitchExtension; // dodatkowe dane do toru, który jest zwrotnicą std::shared_ptr Segment; @@ -234,6 +233,9 @@ public: void origin( glm::dvec3 Origin ) { m_origin = Origin; } + // retrieves list of the track's end points + std::vector + endpoints() const; #ifdef EU07_USE_OLD_GROUNDCODE void create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ); // wypełnianie VBO diff --git a/Traction.cpp b/Traction.cpp index dccce473..75686a97 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -91,7 +91,6 @@ sekcji z sąsiedniego przęsła). */ TTraction::TTraction( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} - // legacy constructor TTraction::TTraction( std::string Name ) { @@ -173,6 +172,13 @@ TTraction::Load( cParser *parser, glm::dvec3 const &pOrigin ) { m_location = interpolate( pPoint2, pPoint1, 0.5 ); } +// retrieves list of the track's end points +std::vector +TTraction::endpoints() const { + + return { pPoint1, pPoint2 }; +} + std::size_t #ifdef EU07_USE_OLD_GROUNDCODE TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ) { @@ -621,205 +627,213 @@ TTraction::wire_color() const { // legacy method, initializes traction after deserialization from scenario file void traction_table::InitTraction() { -/* + //łączenie drutów ze sobą oraz z torami i eventami // TGroundNode *nCurrent, *nTemp; // TTraction *tmp; // znalezione przęsło - int iConnection; - std::string name; + + int connection { -1 }; + TTraction *matchingtraction { nullptr }; + for( auto *traction : m_items ) { // podłączenie do zasilacza, żeby można było sumować prąd kilku pojazdów // a jednocześnie z jednego miejsca zmieniać napięcie eventem // wykonywane najpierw, żeby można było logować podłączenie 2 zasilaczy do jednego drutu // izolator zawieszony na przęśle jest ma być osobnym odcinkiem drutu o długości ok. 1m, // podłączonym do zasilacza o nazwie "*" (gwiazka); "none" nie będzie odpowiednie - nTemp = FindGroundNode(traction->asPowerSupplyName, TP_TRACTIONPOWERSOURCE); - if (nTemp) // jak zasilacz znaleziony - traction->PowerSet(nTemp->psTractionPowerSource); // to podłączyć do przęsła - else if (traction->asPowerSupplyName != "*") // gwiazdka dla przęsła z izolatorem - if (traction->asPowerSupplyName != "none") // dopuszczamy na razie brak podłączenia? - { // logowanie błędu i utworzenie zasilacza o domyślnej zawartości - ErrorLog("Missed TractionPowerSource: " + traction->asPowerSupplyName); - nTemp = new TGroundNode(); - nTemp->iType = TP_TRACTIONPOWERSOURCE; - nTemp->asName = traction->asPowerSupplyName; - nTemp->psTractionPowerSource = new TTractionPowerSource(nTemp); - nTemp->psTractionPowerSource->Init(traction->NominalVoltage, traction->MaxCurrent); - nTemp->nNext = nRootOfType[nTemp->iType]; // ostatni dodany dołączamy na końcu - // nowego - nRootOfType[nTemp->iType] = nTemp; // ustawienie nowego na początku listy + auto *powersource = simulation::Powergrid.find( traction->asPowerSupplyName ); + if( powersource ) { + // jak zasilacz znaleziony to podłączyć do przęsła + traction->PowerSet( powersource ); + } + else { + if( ( traction->asPowerSupplyName != "*" ) // gwiazdka dla przęsła z izolatorem + && ( traction->asPowerSupplyName != "none" ) ) { // dopuszczamy na razie brak podłączenia? + // logowanie błędu i utworzenie zasilacza o domyślnej zawartości + ErrorLog( "Bad scenario: traction piece connected to nonexistent power source \"" + traction->asPowerSupplyName + "\"" ); + scene::node_data nodedata; + nodedata.name = traction->asPowerSupplyName; + powersource = new TTractionPowerSource( nodedata ); + powersource->Init( traction->NominalVoltage, traction->MaxCurrent ); + simulation::Powergrid.insert( powersource ); } + } } for( auto *traction : m_items ) { - if (!traction->hvNext[0]) // tylko jeśli jeszcze nie podłączony - { - tmp = FindTraction(traction->pPoint1, iConnection, nCurrent); - switch (iConnection) - { - case 0: - traction->Connect(0, tmp, 0); - break; - case 1: - traction->Connect(0, tmp, 1); - break; + if (!traction->hvNext[0]) { + // tylko jeśli jeszcze nie podłączony + std::tie( matchingtraction, connection ) = simulation::Region->find_traction( traction->pPoint1, traction ); + switch (connection) { + case 0: { + traction->Connect( 0, matchingtraction, 0 ); + break; + } + case 1: { + traction->Connect( 0, matchingtraction, 1 ); + break; + } + default: { + break; + } } - if (traction->hvNext[0]) // jeśli został podłączony - if (traction->psSection && tmp->psSection) // tylko przęsło z izolatorem może nie - // mieć zasilania, bo ma 2, trzeba - // sprawdzać sąsiednie - if (traction->psSection != - tmp->psSection) // połączone odcinki mają różne zasilacze - { // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo - // błąd - if (traction->psSection->bSection && !tmp->psSection->bSection) - { //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji - tmp->PowerSet(traction->psSection); // zastąpienie wskazaniem sekcji + if( traction->hvNext[ 0 ] ) { + // jeśli został podłączony + if( ( traction->psSection != nullptr ) + && ( matchingtraction->psSection != nullptr ) ) { + // tylko przęsło z izolatorem może nie mieć zasilania, bo ma 2, trzeba sprawdzać sąsiednie + if( traction->psSection != matchingtraction->psSection ) { + // połączone odcinki mają różne zasilacze + // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo błąd + if( ( true == traction->psSection->bSection ) + && ( false == matchingtraction->psSection->bSection ) ) { + //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji + matchingtraction->PowerSet( traction->psSection ); // zastąpienie wskazaniem sekcji } - else if (!traction->psSection->bSection && tmp->psSection->bSection) - { //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji - traction->PowerSet(tmp->psSection); // zastąpienie wskazaniem sekcji + else if( ( false == traction->psSection->bSection ) && + ( true == matchingtraction->psSection->bSection ) ) { + //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji + traction->PowerSet( matchingtraction->psSection ); // zastąpienie wskazaniem sekcji + } + else { + // jeśli obie to sekcje albo obie podstacje, to będzie błąd + ErrorLog( "Bad scenario: faulty traction power connection at location " + to_string( traction->pPoint1 ) ); } - else // jeśli obie to sekcje albo obie podstacje, to będzie błąd - ErrorLog("Bad power: at " + - to_string(traction->pPoint1.x, 2, 6) + " " + - to_string(traction->pPoint1.y, 2, 6) + " " + - to_string(traction->pPoint1.z, 2, 6)); } + } + } } - if (!traction->hvNext[1]) // tylko jeśli jeszcze nie podłączony - { - tmp = FindTraction(traction->pPoint2, iConnection, nCurrent); - switch (iConnection) - { - case 0: - traction->Connect(1, tmp, 0); - break; - case 1: - traction->Connect(1, tmp, 1); - break; + if (!traction->hvNext[1]) { + // tylko jeśli jeszcze nie podłączony + std::tie( matchingtraction, connection ) = simulation::Region->find_traction( traction->pPoint2, traction ); + switch (connection) { + case 0: { + traction->Connect( 1, matchingtraction, 0 ); + break; + } + case 1: { + traction->Connect( 1, matchingtraction, 1 ); + break; + } + default: { + break; + } } - if (traction->hvNext[1]) // jeśli został podłączony - if (traction->psSection && tmp->psSection) // tylko przęsło z izolatorem może nie - // mieć zasilania, bo ma 2, trzeba - // sprawdzać sąsiednie - if (traction->psSection != tmp->psSection) - { // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo - // błąd - if (traction->psSection->bSection && !tmp->psSection->bSection) - { //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji - tmp->PowerSet(traction->psSection); // zastąpienie wskazaniem sekcji + if( traction->hvNext[ 1 ] ) { + // jeśli został podłączony + if( ( traction->psSection != nullptr ) + && ( matchingtraction->psSection != nullptr ) ) { + // tylko przęsło z izolatorem może nie mieć zasilania, bo ma 2, trzeba sprawdzać sąsiednie + if( traction->psSection != matchingtraction->psSection ) { + // to może być albo podłączenie podstacji lub kabiny sekcyjnej do sekcji, albo błąd + if( ( true == traction->psSection->bSection ) + && ( false == matchingtraction->psSection->bSection ) ) { + //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji + matchingtraction->PowerSet( traction->psSection ); // zastąpienie wskazaniem sekcji } - else if (!traction->psSection->bSection && tmp->psSection->bSection) - { //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji - traction->PowerSet(tmp->psSection); // zastąpienie wskazaniem sekcji + else if( ( false == traction->psSection->bSection ) + && ( true == matchingtraction->psSection->bSection ) ) { + //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji + traction->PowerSet( matchingtraction->psSection ); // zastąpienie wskazaniem sekcji + } + else { + // jeśli obie to sekcje albo obie podstacje, to będzie błąd + ErrorLog( "Bad scenario: faulty traction power connection at location " + to_string( traction->pPoint2 ) ); } - else // jeśli obie to sekcje albo obie podstacje, to będzie błąd - ErrorLog("Bad power: at " + - to_string(traction->pPoint2.x, 2, 6) + " " + - to_string(traction->pPoint2.y, 2, 6) + " " + - to_string(traction->pPoint2.z, 2, 6)); } + } + } } } - iConnection = 0; // teraz będzie licznikiem końców + auto endcount { 0 }; for( auto *traction : m_items ) { // operacje mające na celu wykrywanie bieżni wspólnych i łączenie przęseł naprążania - if (traction->WhereIs()) // oznakowanie przedostatnich przęseł - { // poszukiwanie bieżni wspólnej dla przedostatnich przęseł, również w celu połączenia - // zasilania - // to się nie sprawdza, bo połączyć się mogą dwa niezasilane odcinki jako najbliższe - // sobie - // nCurrent->hvTraction->hvParallel=TractionNearestFind(nCurrent->pCenter,0,nCurrent); - // //szukanie najbliższego przęsła - // trzeba by zliczać końce, a potem wpisać je do tablicy, aby sukcesywnie podłączać do - // zasilaczy + if( traction->WhereIs() ) { + // true for outer pieces of the traction section traction->iTries = 5; // oznaczanie końcowych - ++iConnection; + ++endcount; } - if (traction->fResistance[0] == 0.0) - { - traction->ResistanceCalc(); // obliczanie przęseł w segmencie z bezpośrednim zasilaniem - // ErrorLog("Section "+nCurrent->hvTraction->asPowerSupplyName+" connected"); //jako - // niby błąd będzie bardziej widoczne + if (traction->fResistance[0] == 0.0) { + // obliczanie przęseł w segmencie z bezpośrednim zasilaniem + traction->ResistanceCalc(); traction->iTries = 0; // nie potrzeba mu szukać zasilania } - // if (!Traction->hvParallel) //jeszcze utworzyć pętle z bieżni wspólnych } - int zg = 0; // zgodność kierunku przęseł, tymczasowo iterator do tabeli końców - // końców jest ok. 10 razy mniej niż wszystkich przęseł (Quark: 216) - TGroundNode **nEnds = new TGroundNode *[iConnection]; + + std::vector ends; ends.reserve( endcount ); for( auto *traction : m_items ) { //łączenie bieżni wspólnych, w tym oznaczanie niepodanych jawnie - if (!traction->asParallel.empty()) // będzie wskaźnik na inne przęsło + if( false == traction->asParallel.empty() ) { + // będzie wskaźnik na inne przęsło if( ( traction->asParallel == "none" ) || ( traction->asParallel == "*" ) ) { // jeśli nieokreślone traction->iLast = 2; // jakby przedostatni - niech po prostu szuka (iLast już przeliczone) } - else if (!traction->hvParallel) // jeśli jeszcze nie został włączony w kółko - { + else if( traction->hvParallel == nullptr ) { + // jeśli jeszcze nie został włączony w kółko auto *nTemp = find( traction->asParallel ); - if (nTemp) - { // o ile zostanie znalezione przęsło o takiej nazwie - if (!nTemp->hvParallel) // jeśli tamten jeszcze nie ma wskaźnika bieżni wspólnej + if( nTemp != nullptr ) { + // o ile zostanie znalezione przęsło o takiej nazwie + if( nTemp->hvParallel == nullptr ) { + // jeśli tamten jeszcze nie ma wskaźnika bieżni wspólnej traction->hvParallel = nTemp; // wpisać siebie i dalej dać mu wskaźnik zwrotny - else // a jak ma, to albo dołączyć się do kółeczka + } + else { + // a jak ma, to albo dołączyć się do kółeczka traction->hvParallel = nTemp->hvParallel; // przjąć dotychczasowy wskaźnik od niego + } nTemp->hvParallel = traction; // i na koniec ustawienie wskaźnika zwrotnego } - if (!traction->hvParallel) - ErrorLog("Missed overhead: " + traction->asParallel); // logowanie braku - } - if (traction->iTries > 0) // jeśli zaznaczony do podłączenia - // if (!nCurrent->hvTraction->psPower[0]||!nCurrent->hvTraction->psPower[1]) - if (zg < iConnection) // zabezpieczenie - nEnds[zg++] = nCurrent; // wypełnianie tabeli końców w celu szukania im połączeń - } - while( zg < iConnection ) { - // zapełnienie do końca tablicy, jeśli by jakieś końce wypadły - nEnds[ zg++ ] = nullptr; - } - zg = 1; // nieefektywny przebieg kończy łączenie - while (zg) - { // ustalenie zastępczej rezystancji dla każdego przęsła - zg = 0; // flaga podłączonych przęseł końcowych: -1=puste wskaźniki, 0=coś zostało, - // 1=wykonano łączenie - for (int i = 0; i < iConnection; ++i) - if (nEnds[i]) // załatwione będziemy zerować - { // każdy przebieg to próba podłączenia końca segmentu naprężania do innego zasilanego - // przęsła - if (nEnds[i]->hvTraction->hvNext[0]) - { // jeśli końcowy ma ciąg dalszy od strony 0 (Point1), szukamy odcinka najbliższego - // do Point2 - if (TractionNearestFind(nEnds[i]->hvTraction->pPoint2, 0, - nEnds[i])) // poszukiwanie przęsła - { - nEnds[i] = NULL; - zg = 1; // jak coś zostało podłączone, to może zasilanie gdzieś dodatkowo - // dotrze - } - } - else if (nEnds[i]->hvTraction->hvNext[1]) - { // jeśli końcowy ma ciąg dalszy od strony 1 (Point2), szukamy odcinka najbliższego - // do Point1 - if (TractionNearestFind(nEnds[i]->hvTraction->pPoint1, 1, - nEnds[i])) // poszukiwanie przęsła - { - nEnds[i] = NULL; - zg = 1; // jak coś zostało podłączone, to może zasilanie gdzieś dodatkowo - // dotrze - } - } - else - { // gdy koniec jest samotny, to na razie nie zostanie podłączony (nie powinno - // takich być) - nEnds[i] = NULL; + if( traction->hvParallel == nullptr ) { + ErrorLog( "Missed overhead: " + traction->asParallel ); // logowanie braku } } + } + if( traction->iTries > 0 ) { + // jeśli zaznaczony do podłączenia + // wypełnianie tabeli końców w celu szukania im połączeń + ends.emplace_back( traction ); + } } - delete[] nEnds; // nie potrzebne już -*/ + + bool connected; // nieefektywny przebieg kończy łączenie + do { + // ustalenie zastępczej rezystancji dla każdego przęsła + // flaga podłączonych przęseł końcowych: -1=puste wskaźniki, 0=coś zostało, 1=wykonano łączenie + connected = false; + for( auto &end : ends ) { + // załatwione będziemy zerować + if( end == nullptr ) { continue; } + // każdy przebieg to próba podłączenia końca segmentu naprężania do innego zasilanego przęsła + if( end->hvNext[ 0 ] != nullptr ) { + // jeśli końcowy ma ciąg dalszy od strony 0 (Point1), szukamy odcinka najbliższego do Point2 + std::tie( matchingtraction, connection ) = simulation::Region->find_traction( end->pPoint2, end, 0 ); + if( matchingtraction != nullptr ) { + // jak znalezione przęsło z zasilaniem, to podłączenie "równoległe" + end->ResistanceCalc( 0, matchingtraction->fResistance[ connection ], matchingtraction->psPower[ connection ] ); + // jak coś zostało podłączone, to może zasilanie gdzieś dodatkowo dotrze + connected = true; + end = nullptr; + } + } + else if( end->hvNext[ 1 ] != nullptr ) { + // jeśli końcowy ma ciąg dalszy od strony 1 (Point2), szukamy odcinka najbliższego do Point1 + std::tie( matchingtraction, connection ) = simulation::Region->find_traction( end->pPoint1, end, 1 ); + if( matchingtraction != nullptr ) { + // jak znalezione przęsło z zasilaniem, to podłączenie "równoległe" + end->ResistanceCalc( 1, matchingtraction->fResistance[ connection ], matchingtraction->psPower[ connection ] ); + // jak coś zostało podłączone, to może zasilanie gdzieś dodatkowo dotrze + connected = true; + end = nullptr; + } + } + else { + // gdy koniec jest samotny, to na razie nie zostanie podłączony (nie powinno takich być) + end = nullptr; + } + } + } while( true == connected ); } diff --git a/Traction.h b/Traction.h index 67f46d6a..fab4909d 100644 --- a/Traction.h +++ b/Traction.h @@ -55,13 +55,16 @@ class TTraction : public editor::basic_node { TTraction( scene::node_data const &Nodedata ); // legacy constructor TTraction( std::string Name ); - virtual ~TTraction() = default; void Load( cParser *parser, glm::dvec3 const &pOrigin ); // set origin point void origin( glm::dvec3 Origin ) { m_origin = Origin; } + // retrieves list of the track's end points + std::vector + endpoints() const; + // creates geometry data in specified geometry bank. returns: number of created elements, or NULL // NOTE: deleting nodes doesn't currently release geometry data owned by the node. TODO: implement erasing individual geometry chunks and banks #ifdef EU07_USE_OLD_GROUNDCODE diff --git a/TractionPower.cpp b/TractionPower.cpp index ade5cc5b..0b6ee2c9 100644 --- a/TractionPower.cpp +++ b/TractionPower.cpp @@ -20,14 +20,12 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- -TTractionPowerSource::TTractionPowerSource(TGroundNode const *node) : - gMyNode( node ) -{ - psNode[0] = nullptr; // sekcje zostaną podłączone do zasilaczy - psNode[1] = nullptr; -}; +TTractionPowerSource::TTractionPowerSource( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} +// legacy constructor +TTractionPowerSource::TTractionPowerSource( std::string Name ) { -TTractionPowerSource::~TTractionPowerSource(){}; + m_name = Name; +} void TTractionPowerSource::Init(double const u, double const i) { // ustawianie zasilacza przy braku w scenerii @@ -36,61 +34,67 @@ void TTractionPowerSource::Init(double const u, double const i) MaxOutputCurrent = i; }; -bool TTractionPowerSource::Load(cParser *parser) -{ - std::string token; - // AnsiString str; - // str= Parser->GetNextSymbol()LowerCase(); - // asName= str; - parser->getTokens(5); - *parser >> NominalVoltage >> VoltageFrequency >> InternalRes >> MaxOutputCurrent >> - FastFuseTimeOut; - parser->getTokens(); - *parser >> FastFuseRepetition; - parser->getTokens(); - *parser >> SlowFuseTimeOut; - parser->getTokens(); - *parser >> token; - if (token.compare("recuperation") == 0) - Recuperation = true; - else if (token.compare("section") == 0) // odłącznik sekcyjny - bSection = true; // nie jest źródłem zasilania, a jedynie informuje o prądzie odłączenia - // sekcji z obwodu - parser->getTokens(); - *parser >> token; - if (token.compare("end") != 0) - Error("tractionpowersource end statement missing"); - // if (!bSection) //odłącznik sekcji zasadniczo nie ma impedancji (0.01 jest OK) - if (InternalRes < 0.1) // coś mała ta rezystancja była... - InternalRes = 0.2; // tak około 0.2, wg - // http://www.ikolej.pl/fileadmin/user_upload/Seminaria_IK/13_05_07_Prezentacja_Kruczek.pdf - return true; -}; +bool TTractionPowerSource::Load(cParser *parser) { -bool TTractionPowerSource::Render() -{ +#ifdef EU07_USE_OLD_GROUNDCODE + parser->getTokens( 7, false ); + *parser +#else + parser->getTokens( 10, false ); + *parser + >> m_location.x + >> m_location.y + >> m_location.z +#endif + >> NominalVoltage + >> VoltageFrequency + >> InternalRes + >> MaxOutputCurrent + >> FastFuseTimeOut + >> FastFuseRepetition + >> SlowFuseTimeOut; + + std::string token { parser->getToken() }; + if( token == "recuperation" ) { + Recuperation = true; + } + else if( token == "section" ) { + // odłącznik sekcyjny + // nie jest źródłem zasilania, a jedynie informuje o prądzie odłączenia sekcji z obwodu + bSection = true; + } + // skip rest of the section + while( ( false == token.empty() ) + && ( token != "end" ) ) { + + token = parser->getToken(); + } + + if( InternalRes < 0.1 ) { + // coś mała ta rezystancja była... + // tak około 0.2, wg + // http://www.ikolej.pl/fileadmin/user_upload/Seminaria_IK/13_05_07_Prezentacja_Kruczek.pdf + InternalRes = 0.2; + } return true; }; bool TTractionPowerSource::Update(double dt) { // powinno być wykonane raz na krok fizyki - // if (NominalVoltage * TotalPreviousAdmitance > - // MaxOutputCurrent * 0.00000005) // iloczyn napięcia i admitancji daje prąd - // ErrorLog("Power overload: \"" + gMyNode->asName + "\" with current " + AnsiString(NominalVoltage * TotalPreviousAdmitance) + "A"); - if (NominalVoltage * TotalPreviousAdmitance > - MaxOutputCurrent) // iloczyn napięcia i admitancji daje prąd - { + // iloczyn napięcia i admitancji daje prąd + if (NominalVoltage * TotalPreviousAdmitance > MaxOutputCurrent) { + FastFuse = true; FuseCounter += 1; - if (FuseCounter > FastFuseRepetition) - { + if (FuseCounter > FastFuseRepetition) { + SlowFuse = true; - ErrorLog("Power overload: \"" + gMyNode->asName + "\" disabled for " + - std::to_string(SlowFuseTimeOut) + "s"); + ErrorLog( "Power overload: \"" + m_name + "\" disabled for " + std::to_string( SlowFuseTimeOut ) + "s" ); } - else - ErrorLog("Power overload: \"" + gMyNode->asName + "\" disabled for " + - std::to_string(FastFuseTimeOut) + "s"); + else { + ErrorLog( "Power overload: \"" + m_name + "\" disabled for " + std::to_string( FastFuseTimeOut ) + "s" ); + } + FuseTimer = 0; } if (FastFuse || SlowFuse) @@ -145,4 +149,15 @@ void TTractionPowerSource::PowerSet(TTractionPowerSource *ps) // else ErrorLog("nie może być więcej punktów zasilania niż dwa"); }; + + +// legacy method, calculates changes in simulation state over specified time +void +powergridsource_table::update( double const Deltatime ) { + + for( auto *powersource : m_items ) { + powersource->Update( Deltatime ); + } +} + //--------------------------------------------------------------------------- diff --git a/TractionPower.h b/TractionPower.h index d85330f7..ae9bb18e 100644 --- a/TractionPower.h +++ b/TractionPower.h @@ -7,14 +7,14 @@ obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef TractionPowerH -#define TractionPowerH +#pragma once + +#include "scenenode.h" #include "parser.h" //Tolaris-010603 +#include "names.h" -class TGroundNode; +class TTractionPowerSource : public editor::basic_node { -class TTractionPowerSource -{ private: double NominalVoltage = 0.0; double VoltageFrequency = 0.0; @@ -33,27 +33,34 @@ class TTractionPowerSource bool SlowFuse = false; double FuseTimer = 0.0; int FuseCounter = 0; - TGroundNode const *gMyNode = nullptr; // wskaźnik na węzeł rodzica - protected: - public: // zmienne publiczne - TTractionPowerSource *psNode[2]; // zasilanie na końcach dla sekcji +public: + // zmienne publiczne + TTractionPowerSource *psNode[ 2 ] = { nullptr, nullptr }; // zasilanie na końcach dla sekcji bool bSection = false; // czy jest sekcją - public: - // AnsiString asName; - TTractionPowerSource(TGroundNode const *node); - ~TTractionPowerSource(); + + TTractionPowerSource( scene::node_data const &Nodedata ); + // legacy constructor + TTractionPowerSource( std::string Name ); + void Init(double const u, double const i); bool Load(cParser *parser); - bool Render(); bool Update(double dt); double CurrentGet(double res); - void VoltageSet(double const v) - { - NominalVoltage = v; - }; + void VoltageSet(double const v) { + NominalVoltage = v; }; void PowerSet(TTractionPowerSource *ps); }; + + +// collection of generators for power grid present in the scene +class powergridsource_table : public basic_table { + +public: + // legacy method, calculates changes in simulation state over specified time + void + update( double const Deltatime ); +}; + //--------------------------------------------------------------------------- -#endif diff --git a/Train.cpp b/Train.cpp index 4a33dd9d..3d1c34db 100644 --- a/Train.cpp +++ b/Train.cpp @@ -357,14 +357,6 @@ TTrain::TTrain() { fPress[ i ][ j ] = 0.0; } -TTrain::~TTrain() -{ - if (DynamicObject) - if (DynamicObject->Mechanik) - DynamicObject->Mechanik->TakeControl( - true); // likwidacja kabiny wymaga przejęcia przez AI -} - bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) { // powiązanie ręcznego sterowania kabiną z pojazdem // Global::pUserDynamic=NewDynamicObject; //pojazd renderowany bez trzęsienia @@ -3587,7 +3579,7 @@ bool TTrain::Update( double const Deltatime ) iDoorNo[i] = p->iAnimType[ANIM_DOORS]; iUnits[i] = iUnitNo; cCode[i] = p->MoverParameters->TypeName[p->MoverParameters->TypeName.length()]; - asCarName[i] = p->GetName(); + asCarName[i] = p->name(); bPants[iUnitNo - 1][0] = (bPants[iUnitNo - 1][0] || p->MoverParameters->PantFrontUp); bPants[iUnitNo - 1][1] = (bPants[iUnitNo - 1][1] || p->MoverParameters->PantRearUp); bComp[iUnitNo - 1][0] = (bComp[iUnitNo - 1][0] || p->MoverParameters->CompressorAllow); @@ -6259,7 +6251,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) } else if (token == "pyscreen:") { - pyScreens.init(*parser, DynamicObject->mdKabina, DynamicObject->GetName(), + pyScreens.init(*parser, DynamicObject->mdKabina, DynamicObject->name(), NewCabNo); } // btLampkaUnknown.Init("unknown",mdKabina,false); diff --git a/Train.h b/Train.h index 9fe73f93..6b077597 100644 --- a/Train.h +++ b/Train.h @@ -80,7 +80,6 @@ class TTrain bool ShowNextCurrent; // pokaz przd w podlaczonej lokomotywie (ET41) bool InitializeCab(int NewCabNo, std::string const &asFileName); TTrain(); - ~TTrain(); // McZapkie-010302 bool Init(TDynamicObject *NewDynamicObject, bool e3d = false); void OnKeyDown(int cKey); diff --git a/World.cpp b/World.cpp index 53c0634a..be3f6b32 100644 --- a/World.cpp +++ b/World.cpp @@ -207,6 +207,13 @@ void TWorld::TrainDelete(TDynamicObject *d) if (Train) if (Train->Dynamic() != d) return; // nie tego usuwać +#ifdef EU07_SCENERY_EDITOR + if( ( Train->DynamicObject ) + && ( Train->DynamicObject->Mechanik ) ) { + // likwidacja kabiny wymaga przejęcia przez AI + Train->DynamicObject->Mechanik->TakeControl( true ); + } +#endif delete Train; // i nie ma czym sterować Train = NULL; Controlled = NULL; // tego też już nie ma @@ -263,13 +270,25 @@ bool TWorld::Init( GLFWwindow *Window ) { UILayer.set_progress( "Preparing train / Przygotowanie kabiny" ); WriteLog( "Player train init: " + Global::asHumanCtrlVehicle ); +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode *nPlayerTrain = NULL; - if (Global::asHumanCtrlVehicle != "ghostview") - nPlayerTrain = Ground.DynamicFind(Global::asHumanCtrlVehicle); // szukanie w tych z obsadą +#else + TDynamicObject *nPlayerTrain; +#endif + if( Global::asHumanCtrlVehicle != "ghostview" ) +#ifdef EU07_USE_OLD_GROUNDCODE + nPlayerTrain = Ground.DynamicFind( Global::asHumanCtrlVehicle ); // szukanie w tych z obsadą +#else + nPlayerTrain = simulation::Vehicles.find( Global::asHumanCtrlVehicle ); +#endif if (nPlayerTrain) { Train = new TTrain(); +#ifdef EU07_USE_OLD_GROUNDCODE if (Train->Init(nPlayerTrain->DynamicObject)) +#else + if( Train->Init( nPlayerTrain ) ) +#endif { Controlled = Train->Dynamic(); mvControlled = Controlled->ControlledFind()->MoverParameters; @@ -522,7 +541,11 @@ void TWorld::OnKeyDown(int cKey) break; } +#ifdef EU07_USE_OLD_GROUNDCODE TDynamicObject *tmp = Ground.DynamicNearest( Camera.Pos, 50, true ); //łapiemy z obsadą +#else + TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 50, true ) ); +#endif if( ( tmp != nullptr ) && ( tmp != Controlled ) ) { @@ -700,7 +723,11 @@ void TWorld::OnKeyDown(int cKey) */ if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy { // zmiana próżny/ładowny; Ra: zabrane z kabiny - TDynamicObject *temp = Global::DynamicNearest(); +#ifdef EU07_USE_OLD_GROUNDCODE + TDynamicObject *temp = Global::DynamicNearest(); +#else + TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false ) ); +#endif if (temp) { if (Global::shiftState ? temp->MoverParameters->IncBrakeMult() : @@ -743,7 +770,11 @@ void TWorld::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_IncLocalBrakeLevel]) { // zahamowanie dowolnego pojazdu +#ifdef EU07_USE_OLD_GROUNDCODE TDynamicObject *temp = Global::DynamicNearest(); +#else + TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false ) ); +#endif if (temp) { if (Global::ctrlState) @@ -762,7 +793,11 @@ void TWorld::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_DecLocalBrakeLevel]) { // odhamowanie dowolnego pojazdu +#ifdef EU07_USE_OLD_GROUNDCODE TDynamicObject *temp = Global::DynamicNearest(); +#else + TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false ) ); +#endif if (temp) { if (Global::ctrlState) @@ -915,20 +950,7 @@ void TWorld::FollowView(bool wycisz) { DistantView(); }; -bool TWorld::Update() -{ -#ifdef USE_SCENERY_MOVING - vector3 tmpvector = Global::GetCameraPosition(); - tmpvector = vector3(-int(tmpvector.x) + int(tmpvector.x) % 10000, - -int(tmpvector.y) + int(tmpvector.y) % 10000, - -int(tmpvector.z) + int(tmpvector.z) % 10000); - if (tmpvector.x || tmpvector.y || tmpvector.z) - { - WriteLog("Moving scenery"); - Ground.MoveGroundNode(tmpvector); - WriteLog("Scenery moved"); - }; -#endif +bool TWorld::Update() { Timer::UpdateTimers(Global::iPause != 0); @@ -955,7 +977,7 @@ bool TWorld::Update() /* fTimeBuffer += dt; //[s] dodanie czasu od poprzedniej ramki */ - m_primaryupdateaccumulator += dt; +// m_primaryupdateaccumulator += dt; // unused for the time being m_secondaryupdateaccumulator += dt; /* if (fTimeBuffer >= fMaxDt) // jest co najmniej jeden krok; normalnie 0.01s @@ -999,21 +1021,26 @@ bool TWorld::Update() dt = dt / iterations; // Ra: fizykę lepiej by było przeliczać ze stałym krokiem */ } + auto const stepdeltatime { dt / updatecount }; // NOTE: updates are limited to 20, but dt is distributed over potentially many more iterations // this means at count > 20 simulation and render are going to desync. is that right? // NOTE: experimentally changing this to prevent the desync. // TODO: test what happens if we hit more than 20 * 0.01 sec slices, i.e. less than 5 fps +#ifdef EU07_USE_OLD_GROUNDCODE if( true == Global::FullPhysics ) { - // default calculation mode, each step calculated separately - for( int updateidx = 0; updateidx < updatecount; ++updateidx ) { - Ground.Update( dt / updatecount, 1 ); + // mixed calculation mode, steps calculated in ~0.05s chunks + while( updatecount >= 5 ) { + Ground.Update( stepdeltatime, 5 ); + updatecount -= 5; + } + if( updatecount ) { + Ground.Update( stepdeltatime, updatecount ); } } else { - // slightly simplified calculation mode; can lead to errors - Ground.Update( dt / updatecount, updatecount ); + // simplified calculation mode; faster but can lead to errors + Ground.Update( stepdeltatime, updatecount ); } - // yB dodał przyspieszacz fizyki if( (true == DebugModeFlag) && (true == Global::bActive) // nie przyspieszać, gdy jedzie w tle :) @@ -1024,8 +1051,24 @@ bool TWorld::Update() Ground.Update( dt, 1 ); Ground.Update( dt, 1 ); // 5 razy } - // secondary fixed step simulation time routines +#else + if( true == Global::FullPhysics ) { + // mixed calculation mode, steps calculated in ~0.05s chunks + while( updatecount >= 5 ) { + simulation::State.update( stepdeltatime, 5 ); + updatecount -= 5; + } + if( updatecount ) { + simulation::State.update( stepdeltatime, updatecount ); + } + } + else { + // simplified calculation mode; faster but can lead to errors + simulation::State.update( stepdeltatime, updatecount ); + } +#endif + // secondary fixed step simulation time routines while( m_secondaryupdateaccumulator >= m_secondaryupdaterate ) { Global::tranTexts.Update(); // obiekt obsługujący stenogramy dźwięków na ekranie @@ -1065,11 +1108,12 @@ bool TWorld::Update() #ifdef EU07_USE_OLD_GROUNDCODE Ground.CheckQuery(); + Ground.Update_Hidden(); #else simulation::Events.CheckQuery(); + simulation::Region->update(); #endif - Ground.Update_Hidden(); simulation::Lights.update(); // render time routines follow: @@ -1119,10 +1163,15 @@ TWorld::Update_Camera( double const Deltatime ) { Camera.LookAt = Controlled->GetPosition(); } else { - TDynamicObject *d = - Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m +#ifdef EU07_USE_OLD_GROUNDCODE + TDynamicObject *d = Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m if( !d ) d = Ground.DynamicNearest( Camera.Pos, 1000 ); // dalej szukanie, jesli bliżej nie ma +#else + TDynamicObject *d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 300, false ) ); + if( !d ) + d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 1000, false ) ); // dalej szukanie, jesli bliżej nie ma +#endif if( d && pDynamicNearest ) { // jeśli jakiś jest znaleziony wcześniej if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) { @@ -1305,7 +1354,11 @@ TWorld::Update_UI() { // timetable TDynamicObject *tmp = ( FreeFlyModeFlag ? +#ifdef EU07_USE_OLD_GROUNDCODE Ground.DynamicNearest( Camera.Pos ) : +#else + std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false ) ) : +#endif Controlled ); // w trybie latania lokalizujemy wg mapy if( tmp == nullptr ) { break; } @@ -1386,8 +1439,12 @@ TWorld::Update_UI() { TDynamicObject *tmp = ( FreeFlyModeFlag ? - Ground.DynamicNearest( Camera.Pos ) : - Controlled ); // w trybie latania lokalizujemy wg mapy +#ifdef EU07_USE_OLD_GROUNDCODE + Ground.DynamicNearest( Camera.Pos ) : +#else + std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false ) ) : +#endif + Controlled ); // w trybie latania lokalizujemy wg mapy if( tmp != nullptr ) { // @@ -1403,7 +1460,7 @@ TWorld::Update_UI() { uitextline1 += "; C0:" + ( tmp->PrevConnected ? - tmp->PrevConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) + ( + tmp->PrevConnected->name() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) + ( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag == 0 ? " (" + to_string( tmp->MoverParameters->Couplers[ 0 ].CoupleDist, 1 ) + " m)" : "" ) : @@ -1411,7 +1468,7 @@ TWorld::Update_UI() { uitextline1 += " C1:" + ( tmp->NextConnected ? - tmp->NextConnected->GetName() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) + ( + tmp->NextConnected->name() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) + ( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag == 0 ? " (" + to_string( tmp->MoverParameters->Couplers[ 1 ].CoupleDist, 1 ) + " m)" : "" ) : @@ -1653,7 +1710,11 @@ TWorld::Update_UI() { TDynamicObject *tmp = ( FreeFlyModeFlag ? +#ifdef EU07_USE_OLD_GROUNDCODE Ground.DynamicNearest( Camera.Pos ) : +#else + std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false ) ) : +#endif Controlled ); // w trybie latania lokalizujemy wg mapy if( tmp == nullptr ) { break; @@ -1867,6 +1928,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 11 + i, (unsigned)(pRozkaz->cString[10 + i])) + " rcvd"); +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode *t = Ground.DynamicFind( std::string(pRozkaz->cString + 11 + i, (unsigned)pRozkaz->cString[10 + i])); // nazwa pojazdu jest druga @@ -1878,6 +1940,19 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) NULL, stopExt); // floaty są z przodu WriteLog("AI command: " + std::string(pRozkaz->cString + 9, i)); } +#else + // nazwa pojazdu jest druga + auto *vehicle = simulation::Vehicles.find( { pRozkaz->cString + 11 + i, (unsigned)pRozkaz->cString[ 10 + i ] } ); + if( ( vehicle != nullptr ) + && ( vehicle->Mechanik != nullptr ) ) { + vehicle->Mechanik->PutCommand( + { pRozkaz->cString + 9, static_cast(i) }, + pRozkaz->fPar[0], pRozkaz->fPar[1], + nullptr, + stopExt ); // floaty są z przodu + WriteLog("AI command: " + std::string(pRozkaz->cString + 9, i)); + } +#endif } break; case 4: // badanie zajętości toru @@ -1920,6 +1995,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) " rcvd"); if (pRozkaz->cString[0]) // jeśli długość nazwy jest niezerowa { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #7 +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode *t; if (pRozkaz->cString[1] == '*') t = Ground.DynamicFind( @@ -1929,6 +2005,9 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) pRozkaz->cString + 1, (unsigned)pRozkaz->cString[0])); // nazwa pojazdu if (t) Ground.WyslijNamiary(t); // wysłanie informacji o pojeździe +#else + // TODO: implement +#endif } else { // dla pustego wysyłamy ramki 6 z nazwami pojazdów AI (jeśli potrzebne wszystkie, @@ -1964,34 +2043,34 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); - if (pRozkaz->cString[1]) // jeśli długość nazwy jest niezerowa - { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #13 - TGroundNode *t; - if (pRozkaz->cString[2] == '*') - t = Ground.DynamicFind( - Global::asHumanCtrlVehicle); // nazwa pojazdu użytkownika - else - t = Ground.DynamicFindAny( - std::string(pRozkaz->cString + 2, - (unsigned)pRozkaz->cString[1])); // nazwa pojazdu - if (t) - { - TDynamicObject *d = t->DynamicObject; - while (d) - { - d->Damage(pRozkaz->cString[0]); - d = d->Next(); // pozostałe też - } - d = t->DynamicObject->Prev(); - while (d) - { - d->Damage(pRozkaz->cString[0]); - d = d->Prev(); // w drugą stronę też - } - Ground.WyslijUszkodzenia(t->asName, t->DynamicObject->MoverParameters->EngDmgFlag); // zwrot informacji o pojeździe - } - } - // Ground.IsolatedBusy(AnsiString(pRozkaz->cString+1,(unsigned)(pRozkaz->cString[0]))); +#ifdef EU07_USE_OLD_GROUNDCODE + if( pRozkaz->cString[ 1 ] ) // jeśli długość nazwy jest niezerowa + { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #13 + TGroundNode *t; + if( pRozkaz->cString[ 2 ] == '*' ) + t = Ground.DynamicFind( + Global::asHumanCtrlVehicle ); // nazwa pojazdu użytkownika + else + t = Ground.DynamicFindAny( + std::string( pRozkaz->cString + 2, + (unsigned)pRozkaz->cString[ 1 ] ) ); // nazwa pojazdu + if( t ) { + TDynamicObject *d = t->DynamicObject; + while( d ) { + d->Damage( pRozkaz->cString[ 0 ] ); + d = d->Next(); // pozostałe też + } + d = t->DynamicObject->Prev(); + while( d ) { + d->Damage( pRozkaz->cString[ 0 ] ); + d = d->Prev(); // w drugą stronę też + } + Ground.WyslijUszkodzenia( t->asName, t->DynamicObject->MoverParameters->EngDmgFlag ); // zwrot informacji o pojeździe + } + } +#else + // TODO: implement +#endif break; } }; @@ -2143,7 +2222,7 @@ void TWorld::ChangeDynamic() { Train->DynamicSet( temp ); Controlled = temp; mvControlled = Controlled->ControlledFind()->MoverParameters; - Global::asHumanCtrlVehicle = Train->Dynamic()->GetName(); + Global::asHumanCtrlVehicle = Train->Dynamic()->name(); if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony { diff --git a/openglgeometrybank.h b/openglgeometrybank.h index ee0aa234..05a813c1 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -25,8 +25,8 @@ struct basic_vertex { glm::vec2 texture; // uv space basic_vertex() = default; - basic_vertex( glm::vec3 const &Position, glm::vec3 const &Normal, glm::vec2 const &Texture ) : - position( Position ), normal( Normal ), texture( Texture ) + basic_vertex( glm::vec3 Position, glm::vec3 Normal, glm::vec2 Texture ) : + position( Position ), normal( Normal ), texture( Texture ) {} void serialize( std::ostream& ) const; void deserialize( std::istream& ); @@ -58,8 +58,8 @@ struct geometry_handle { geometry_handle() : bank( 0 ), chunk( 0 ) {} - geometry_handle( std::uint32_t const Bank, std::uint32_t const Chunk ) : - bank( Bank ), chunk( Chunk ) + geometry_handle( std::uint32_t Bank, std::uint32_t Chunk ) : + bank( Bank ), chunk( Chunk ) {} // methods inline @@ -121,8 +121,8 @@ protected: unsigned int type; // kind of geometry used by the chunk vertex_array vertices; // geometry data // NOTE: constructor doesn't copy provided vertex data, but moves it - geometry_chunk( vertex_array &Vertices, unsigned int const Type ) : - type( Type ) + geometry_chunk( vertex_array &Vertices, unsigned int Type ) : + type( Type ) { vertices.swap( Vertices ); } diff --git a/parser.cpp b/parser.cpp index 465b1d7b..c220b0c2 100644 --- a/parser.cpp +++ b/parser.cpp @@ -205,23 +205,21 @@ std::string cParser::readToken(bool ToLower, const char *Break) if (token.compare("include") == 0) { // obsługa include std::string includefile = readToken(ToLower); // nazwa pliku - if (LoadTraction ? true : ((includefile.find("tr/") == std::string::npos) && - (includefile.find("tra/") == std::string::npos))) - { - // std::string trtest2="niemaproblema"; //nazwa odporna na znalezienie "tr/" - // if (trtest=="x") //jeśli nie wczytywać drutów - // trtest2=includefile; //kopiowanie ścieżki do pliku + if( ( true == LoadTraction ) + || ( ( includefile.find( "tr/" ) == std::string::npos ) + && ( includefile.find( "tra/" ) == std::string::npos ) ) ) { + std::string parameter = readToken(false); // w parametrach nie zmniejszamy while( (parameter.empty() == false) && (parameter.compare("end") != 0) ) { - parameters.push_back(parameter); + parameters.emplace_back(parameter); parameter = readToken(false); } // if (trtest2.find("tr/")!=0) mIncludeParser = std::make_shared(includefile, buffer_FILE, mPath, LoadTraction); if (mIncludeParser->mSize <= 0) - ErrorLog("Missed include: " + includefile); + ErrorLog("Bad include: can't open file \"" + includefile + "\"" ); } else { while( token.compare( "end" ) != 0 ) { diff --git a/renderer.cpp b/renderer.cpp index 7c1ac70d..3107a28e 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1602,7 +1602,17 @@ opengl_renderer::Render( scene::basic_region *Region ) { m_sectionqueue.clear(); m_cellqueue.clear(); - +/* + for( auto *section : Region->sections( m_renderpass.camera.position(), m_renderpass.draw_range * Global::fDistanceFactor ) ) { +#ifdef EU07_USE_DEBUG_CULLING + if( m_worldcamera.camera.visible( section->m_area ) ) { +#else + if( m_renderpass.camera.visible( section->m_area ) ) { +#endif + m_sectionqueue.emplace_back( section ); + } + } +*/ // build a list of region sections to render glm::vec3 const cameraposition { m_renderpass.camera.position() }; auto const camerax = static_cast( std::floor( cameraposition.x / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2 ) ); @@ -1903,11 +1913,22 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator switch( m_renderpass.draw_mode ) { case rendermode::color: - case rendermode::shadows: - case rendermode::pickscenery: { - // render + case rendermode::shadows: { // opaque parts of instanced models for( auto *instance : cell->m_instancesopaque ) { Render( instance ); } + // opaque parts of vehicles + for( auto *path : cell->m_paths ) { + for( auto *dynamic : path->Dynamics ) { + Render( dynamic ); + } + } + } + case rendermode::pickscenery: { + // opaque parts of instanced models + for( auto *instance : cell->m_instancesopaque ) { + ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); + Render( instance ); + } // TODO: add remaining content types break; } @@ -2863,7 +2884,12 @@ opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_seque // translucent parts of instanced models for( auto *instance : cell->m_instancetranslucent ) { Render_Alpha( instance ); } - // TODO: add remaining content types + // translucent parts of vehicles + for( auto *path : cell->m_paths ) { + for( auto *dynamic : path->Dynamics ) { + Render_Alpha( dynamic ); + } + } ++first; } diff --git a/scene.cpp b/scene.cpp index 43adb766..2dfb70da 100644 --- a/scene.cpp +++ b/scene.cpp @@ -10,11 +10,28 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "scene.h" +#include "globals.h" #include "renderer.h" #include "logs.h" namespace scene { +// legacy method, updates sounds and polls event launchers within radius around specified point +void +basic_cell::update() { +/* + // renderowanie obiektów aktywnych a niewidocznych + for( auto node = subcell->nRenderHidden; node; node = node->nNext3 ) { + node->RenderHidden(); + } +*/ + // TBD, TODO: move to sound renderer + for( auto *path : m_paths ) { + // dźwięki pojazdów, również niewidocznych + path->RenderDynSounds(); + } +} + // adds provided shape to the cell void basic_cell::insert( shape_node Shape ) { @@ -90,6 +107,131 @@ basic_cell::insert( TAnimModel *Instance ) { } } +// registers provided path in the lookup directory of the cell +void +basic_cell::register_end( TTrack *Path ) { + + m_directories.paths.emplace( Path ); +} + +// registers provided traction piece in the lookup directory of the cell +void +basic_cell::register_end( TTraction *Traction ) { + + m_directories.traction.emplace( Traction ); +} + +// find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance +std::tuple +basic_cell::find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ) { + + TDynamicObject *vehiclenearest { nullptr }; + float leastdistance { std::numeric_limits::max() }; + float distance; + float const distancecutoff { Radius * Radius }; // we'll ignore vehicles farther than this + + for( auto *path : m_paths ) { + for( auto *vehicle : path->Dynamics ) { + if( ( true == Onlycontrolled ) + && ( vehicle->Mechanik == nullptr ) ) { + continue; + } + distance = glm::length2( glm::dvec3{ vehicle->GetPosition() } - Point ); + if( ( distance > distancecutoff ) + || ( distance > leastdistance ) ){ + continue; + } + std::tie( vehiclenearest, leastdistance ) = std::tie( vehicle, distance ); + } + } + return std::tie( vehiclenearest, leastdistance ); +} + +// finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint +std::tuple +basic_cell::find( glm::dvec3 const &Point, TTrack const *Exclude ) { + + Math3D::vector3 point { Point.x, Point.y, Point.z }; // sad workaround until math classes unification + int endpointid; + + for( auto *path : m_directories.paths ) { + + if( path == Exclude ) { continue; } + + endpointid = path->TestPoint( &point ); + if( endpointid >= 0 ) { + + return std::tie( path, endpointid ); + } + } + return { nullptr, -1 }; +} + +// finds a traction piece with one of its ends located in specified point. returns: located traction piece and id of the matching endpoint +std::tuple +basic_cell::find( glm::dvec3 const &Point, TTraction const *Exclude ) { + + int endpointid; + + for( auto *traction : m_directories.traction ) { + + if( traction == Exclude ) { continue; } + + endpointid = traction->TestPoint( Point ); + if( endpointid >= 0 ) { + + return std::tie( traction, endpointid ); + } + } + return { nullptr, -1 }; +} + +// finds a traction piece located nearest to specified point, sharing section with specified other piece and powered in specified direction. returns: located traction piece +std::tuple +basic_cell::find( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ) { + + TTraction + *tractionnearest { nullptr }; + float + distance, + distancenearest { std::numeric_limits::max() }; + int endpoint, + endpointnearest { -1 }; + + for( auto *traction : m_directories.traction ) { + + if( ( traction == Other ) + || ( traction->psSection != Other->psSection ) + || ( traction == Other->hvNext[ 0 ] ) + || ( traction == Other->hvNext[ 1 ] ) ) { + // ignore pieces from different sections, and ones connected to the other piece + continue; + } + endpoint = ( + glm::dot( traction->vParametric, Other->vParametric ) >= 0.0 ? + Currentdirection ^ 1 : + Currentdirection ); + if( ( traction->psPower[ endpoint ] == nullptr ) + || ( traction->fResistance[ endpoint ] < 0.0 ) ) { + continue; + } + distance = glm::length2( traction->location() - Point ); + if( distance < distancenearest ) { + std::tie( tractionnearest, endpointnearest, distancenearest ) = std::tie( traction, endpoint, distance ); + } + } + return { tractionnearest, endpointnearest, distancenearest }; +} + +// sets center point of the section +void +basic_cell::center( glm::dvec3 Center ) { + + m_area.center = Center; + // NOTE: we should also update origin point for the contained nodes, but in practice we can skip this + // as all nodes will be added only after the proper center point was set, and won't change +} + // generates renderable version of held non-instanced geometry void basic_cell::create_geometry( geometrybank_handle const &Bank ) { @@ -104,17 +246,23 @@ basic_cell::create_geometry( geometrybank_handle const &Bank ) { #endif } -// sets center point of the section + + +// legacy method, updates sounds and polls event launchers within radius around specified point void -basic_cell::center( glm::dvec3 Center ) { +basic_section::update( glm::dvec3 const &Location, float const Radius ) { - m_area.center = Center; - // NOTE: we should also update origin point for the contained nodes, but in practice we can skip this - // as all nodes will be added only after the proper center point was set, and won't change + auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) + Radius, 2 ) }; + + for( auto &cell : m_cells ) { + + if( glm::length2( cell.area().center - Location ) < squaredradii ) { + // we reject cells which aren't within our area of interest + cell.update(); + } + } } - - // adds provided shape to the section void basic_section::insert( shape_node Shape ) { @@ -168,6 +316,96 @@ basic_section::insert( TAnimModel *Instance ) { cell( Instance->location() ).insert( Instance ); } +// registers specified end point of the provided path in the lookup directory of the region +void +basic_section::register_end( TTrack *Path, glm::dvec3 const &Point ) { + + cell( Point ).register_end( Path ); +} + +// registers specified end point of the provided traction piece in the lookup directory of the region +void +basic_section::register_end( TTraction *Traction, glm::dvec3 const &Point ) { + + cell( Point ).register_end( Traction ); +} + +// find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance +std::tuple +basic_section::find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ) { + + // go through sections within radius of interest, and pick the nearest candidate + TDynamicObject + *vehiclefound, + *vehiclenearest { nullptr }; + float + distancefound, + distancenearest { std::numeric_limits::max() }; + + auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) + Radius, 2 ) }; + + for( auto &cell : m_cells ) { + // we reject early cells which aren't within our area of interest + if( glm::length2( cell.area().center - Point ) > squaredradii ) { + continue; + } + std::tie( vehiclefound, distancefound ) = cell.find( Point, Radius, Onlycontrolled ); + if( ( vehiclefound != nullptr ) + && ( distancefound < distancenearest ) ) { + + std::tie( vehiclenearest, distancenearest ) = std::tie( vehiclefound, distancefound ); + } + } + return std::tie( vehiclenearest, distancenearest ); +} + +// finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint +std::tuple +basic_section::find( glm::dvec3 const &Point, TTrack const *Exclude ) { + + return cell( Point ).find( Point, Exclude ); +} + +// finds a traction piece with one of its ends located in specified point. returns: located traction piece and id of the matching endpoint +std::tuple +basic_section::find( glm::dvec3 const &Point, TTraction const *Exclude ) { + + return cell( Point ).find( Point, Exclude ); +} + +// finds a traction piece located nearest to specified point, sharing section with specified other piece and powered in specified direction. returns: located traction piece +std::tuple +basic_section::find( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ) { + + // go through sections within radius of interest, and pick the nearest candidate + TTraction + *tractionfound, + *tractionnearest { nullptr }; + float + distancefound, + distancenearest { std::numeric_limits::max() }; + int + endpointfound, + endpointnearest { -1 }; + + auto const radius { 0.0 }; // { EU07_CELLSIZE * 0.5 }; // experimentally limited, check if it has any negative effect + auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) + radius, 2 ) }; + + for( auto &cell : m_cells ) { + // we reject early cells which aren't within our area of interest + if( glm::length2( cell.area().center - Point ) > squaredradii ) { + continue; + } + std::tie( tractionfound, endpointfound, distancefound ) = cell.find( Point, Other, Currentdirection ); + if( ( tractionfound != nullptr ) + && ( distancefound < distancenearest ) ) { + + std::tie( tractionnearest, endpointnearest, distancenearest ) = std::tie( tractionfound, endpointfound, distancefound ); + } + } + return { tractionnearest, endpointnearest, distancenearest }; +} + // sets center point of the section void basic_section::center( glm::dvec3 Center ) { @@ -251,6 +489,17 @@ basic_region::~basic_region() { for( auto section : m_sections ) { if( section != nullptr ) { delete section; } } } +// legacy method, updates sounds and polls event launchers around camera +void +basic_region::update() { + // render events and sounds from sectors near enough to the viewer + auto const range = 2750.f; // audible range of 100 db sound + auto const §ionlist = sections( Global::pCameraPosition, range ); + for( auto *section : sectionlist ) { + section->update( Global::pCameraPosition, range ); + } +} + void basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad ) { @@ -327,6 +576,11 @@ basic_region::insert_path( TTrack *Path, scratch_data &Scratchpad ) { // tracks are guaranteed to hava a name so we can skip the check ErrorLog( "Bad scenario: track node \"" + Path->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); } + // also register path ends in appropriate sections, for path merging lookups + // TODO: clean this up during track refactoring + for( auto &point : Path->endpoints() ) { + register_path( Path, point ); + } } // inserts provided track in the region @@ -344,6 +598,11 @@ basic_region::insert_traction( TTraction *Traction, scratch_data &Scratchpad ) { // tracks are guaranteed to hava a name so we can skip the check ErrorLog( "Bad scenario: traction node \"" + Traction->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); } + // also register traction ends in appropriate sections, for path merging lookups + // TODO: clean this up during track refactoring + for( auto &point : Traction->endpoints() ) { + register_traction( Traction, point ); + } } // inserts provided instance of 3d model in the region @@ -363,6 +622,154 @@ basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) } } +// inserts provided sound in the region +void +basic_region::insert_sound( TTextSound *Sound, scratch_data &Scratchpad ) { + +/* + // TODO: implement + // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done + auto center = Sound->location(); + + if( point_inside( center ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + section( center ).insert( Instance ); + } + else { + // tracks are guaranteed to hava a name so we can skip the check + ErrorLog( "Bad scenario: model node \"" + Instance->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); + } +*/ +} + +// find a vehicle located neares to specified location, within specified radius, optionally discarding vehicles without drivers +std::tuple +basic_region::find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ) { + + auto const §ionlist = sections( Point, Radius ); + // go through sections within radius of interest, and pick the nearest candidate + TDynamicObject + *foundvehicle, + *nearestvehicle { nullptr }; + float + founddistance, + nearestdistance { std::numeric_limits::max() }; + + for( auto *section : sectionlist ) { + std::tie( foundvehicle, founddistance ) = section->find( Point, Radius, Onlycontrolled ); + if( ( foundvehicle != nullptr ) + && ( founddistance < nearestdistance ) ) { + + std::tie( nearestvehicle, nearestdistance ) = std::tie( foundvehicle, founddistance ); + } + } + return std::tie( nearestvehicle, nearestdistance ); +} + +// finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint +std::tuple +basic_region::find_path( glm::dvec3 const &Point, TTrack const *Exclude ) { + + // TBD: throw out of bounds exception instead of checks all over the place..? + if( point_inside( Point ) ) { + + return section( Point ).find( Point, Exclude ); + } + + return std::make_tuple( nullptr, -1 ); +} + +// finds a traction piece with one of its ends located in specified point. returns: located traction piece and id of the matching endpoint +std::tuple +basic_region::find_traction( glm::dvec3 const &Point, TTraction const *Exclude ) { + + // TBD: throw out of bounds exception instead of checks all over the place..? + if( point_inside( Point ) ) { + + return section( Point ).find( Point, Exclude ); + } + + return std::make_tuple( nullptr, -1 ); +} + +// finds a traction piece located nearest to specified point, sharing section with specified other piece and powered in specified direction. returns: located traction piece +std::tuple +basic_region::find_traction( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ) { + + auto const §ionlist = sections( Point, 0.f ); + // go through sections within radius of interest, and pick the nearest candidate + TTraction + *tractionfound, + *tractionnearest { nullptr }; + float + distancefound, + distancenearest { std::numeric_limits::max() }; + int + endpointfound, + endpointnearest { -1 }; + + for( auto *section : sectionlist ) { + std::tie( tractionfound, endpointfound, distancefound ) = section->find( Point, Other, Currentdirection ); + if( ( tractionfound != nullptr ) + && ( distancefound < distancenearest ) ) { + + std::tie( tractionnearest, endpointnearest, distancenearest ) = std::tie( tractionfound, endpointfound, distancefound ); + } + } + return { tractionnearest, endpointnearest }; +} + +// finds sections inside specified sphere. returns: list of sections +std::vector const & +basic_region::sections( glm::dvec3 const &Point, float const Radius ) { + + m_scratchpad.sections.clear(); + + auto const centerx { static_cast( std::floor( Point.x / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ) }; + auto const centerz { static_cast( std::floor( Point.z / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ) }; + auto const sectioncount { 2 * static_cast( std::ceil( Radius / EU07_SECTIONSIZE ) ) }; + + int const originx = centerx - sectioncount / 2; + int const originz = centerz - sectioncount / 2; + + auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_SECTIONSIZE + 0.25 * EU07_SECTIONSIZE ) + Radius, 2 ) }; + + for( int row = originz; row <= originz + sectioncount; ++row ) { + if( row < 0 ) { continue; } + if( row >= EU07_REGIONSIDESECTIONCOUNT ) { break; } + for( int column = originx; column <= originx + sectioncount; ++column ) { + if( column < 0 ) { continue; } + if( column >= EU07_REGIONSIDESECTIONCOUNT ) { break; } + + auto *section { m_sections[ row * EU07_REGIONSIDESECTIONCOUNT + column ] }; + if( ( section != nullptr ) + && ( glm::length2( section->area().center - Point ) < squaredradii ) ) { + + m_scratchpad.sections.emplace_back( section ); + } + } + } + return m_scratchpad.sections; +} + +// registers specified path in the lookup directory of a cell enclosing specified point +void +basic_region::register_path( TTrack *Path, glm::dvec3 const &Point ) { + + if( point_inside( Point ) ) { + section( Point ).register_end( Path, Point ); + } +} + +// registers specified end point of the provided traction piece in the lookup directory of the region +void +basic_region::register_traction( TTraction *Traction, glm::dvec3 const &Point ) { + + if( point_inside( Point ) ) { + section( Point ).register_end( Traction, Point ); + } +} + // checks whether specified point is within boundaries of the region bool basic_region::point_inside( glm::dvec3 const &Location ) { @@ -566,8 +973,8 @@ basic_region::RaTriangleDivider( shape_node &Shape, std::deque &Shap basic_section & basic_region::section( glm::dvec3 const &Location ) { - auto const column = static_cast( std::floor( Location.x / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ); - auto const row = static_cast( std::floor( Location.z / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ); + auto const column { static_cast( std::floor( Location.x / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ) }; + auto const row { static_cast( std::floor( Location.z / EU07_SECTIONSIZE + EU07_REGIONSIDESECTIONCOUNT / 2 ) ) }; auto §ion = m_sections[ diff --git a/scene.h b/scene.h index 66314e13..1ccd42ba 100644 --- a/scene.h +++ b/scene.h @@ -30,6 +30,18 @@ struct scratch_data { std::stack location_offset; glm::vec3 location_rotation; + + struct trainset_data { + + std::string name; + std::string track; + float offset { 0.f }; + float velocity { 0.f }; + std::vector vehicles; + std::vector couplings; + TDynamicObject * driver { nullptr }; + bool is_open { false }; + } trainset; }; // basic element of rudimentary partitioning scheme for the section. fixed size, no further subdivision @@ -40,6 +52,9 @@ class basic_cell { public: // methods + // legacy method, updates sounds and polls event launchers within radius around specified point + void + update(); // adds provided shape to the cell void insert( shape_node Shape ); @@ -52,18 +67,42 @@ public: // adds provided model instance to the cell void insert( TAnimModel *Instance ); + // registers provided path in the lookup directory of the cell + void + register_end( TTrack *Path ); + // registers provided traction piece in the lookup directory of the cell + void + register_end( TTraction *Traction ); + // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance + std::tuple + find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ); + // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint + std::tuple + find( glm::dvec3 const &Point, TTrack const *Exclude ); + // finds a traction piece with one of its ends located in specified point. returns: located traction piece and id of the matching endpoint + std::tuple + find( glm::dvec3 const &Point, TTraction const *Exclude ); + // finds a traction piece located nearest to specified point, sharing section with specified other piece and powered in specified direction. returns: located traction piece + std::tuple + find( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ); + // sets center point of the cell + void + center( glm::dvec3 Center ); // generates renderable version of held non-instanced geometry in specified geometry bank void create_geometry( geometrybank_handle const &Bank ); - // sets center point of the cell - void - center( glm::dvec3 Center ); + // provides access to bounding area data + bounding_area const & + area() const { + return m_area; } private: // types using shapenode_sequence = std::vector; using path_sequence = std::vector; + using path_set = std::set; using traction_sequence = std::vector; + using traction_set = std::set; using instance_sequence = std::vector; // members scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) }; @@ -75,6 +114,11 @@ private: instance_sequence m_instancesopaque; instance_sequence m_instancetranslucent; traction_sequence m_traction; + // search helpers + struct lookup_data { + path_set paths; + traction_set traction; + } m_directories; }; // basic scene partitioning structure, holds terrain geometry and collection of cells @@ -84,6 +128,9 @@ class basic_section { public: // methods + // legacy method, updates sounds and polls event launchers within radius around specified point + void + update( glm::dvec3 const &Location, float const Radius ); // adds provided shape to the section void insert( shape_node Shape ); @@ -96,12 +143,34 @@ public: // adds provided model instance to the section void insert( TAnimModel *Instance ); - // generates renderable version of held non-instanced geometry + // registers specified end point of the provided path in the lookup directory of the region void - create_geometry(); + register_end( TTrack *Path, glm::dvec3 const &Point ); + // registers specified end point of the provided traction piece in the lookup directory of the region + void + register_end( TTraction *Traction, glm::dvec3 const &Point ); + // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance + std::tuple + find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ); + // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint + std::tuple + find( glm::dvec3 const &Point, TTrack const *Exclude ); + // finds a traction piece with one of its ends located in specified point. returns: located traction piece and id of the matching endpoint + std::tuple + find( glm::dvec3 const &Point, TTraction const *Exclude ); + // finds a traction piece located nearest to specified point, sharing section with specified other piece and powered in specified direction. returns: located traction piece + std::tuple + find( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ); // sets center point of the section void center( glm::dvec3 Center ); + // generates renderable version of held non-instanced geometry + void + create_geometry(); + // provides access to bounding area data + bounding_area const & + area() const { + return m_area; } private: // types @@ -134,6 +203,9 @@ public: // destructor ~basic_region(); // methods + // legacy method, updates sounds and polls event launchers around camera + void + update(); // inserts provided shape in the region void insert_shape( shape_node Shape, scratch_data &Scratchpad ); @@ -146,17 +218,45 @@ public: // inserts provided instance of 3d model in the region void insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ); - + // inserts provided sound in the region + void + insert_sound( TTextSound *Sound, scratch_data &Scratchpad ); + // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance + std::tuple + find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ); + // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint + std::tuple + find_path( glm::dvec3 const &Point, TTrack const *Exclude ); + // finds a traction piece with one of its ends located in specified point. returns: located traction piece and id of the matching endpoint + std::tuple + find_traction( glm::dvec3 const &Point, TTraction const *Exclude ); + // finds a traction piece located nearest to specified point, sharing section with specified other piece and powered in specified direction. returns: located traction piece + std::tuple + find_traction( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ); + // finds sections inside specified sphere. returns: list of sections + std::vector const & + sections( glm::dvec3 const &Point, float const Radius ); private: // types using section_array = std::array; + struct region_scratchpad { + + std::vector sections; + }; + // methods + // registers specified end point of the provided path in the lookup directory of the region + void + register_path( TTrack *Path, glm::dvec3 const &Point ); + // registers specified end point of the provided traction piece in the lookup directory of the region + void + register_traction( TTraction *Traction, glm::dvec3 const &Point ); // checks whether specified point is within boundaries of the region bool point_inside( glm::dvec3 const &Location ); - // trims provided shape to fit into a section, adds trimmed part at the end of provided list + // legacy method, trims provided shape to fit into a section. adds trimmed part at the end of provided list, returns true if changes were made bool RaTriangleDivider( shape_node &Shape, std::deque &Shapes ); // provides access to section enclosing specified point @@ -165,6 +265,7 @@ private: // members section_array m_sections; + region_scratchpad m_scratchpad; }; diff --git a/scenenode.cpp b/scenenode.cpp index 015bdd92..1be3d643 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -17,7 +17,7 @@ namespace scene { // restores content of the node from provded input stream shape_node & -shape_node::deserialize( cParser &Input, node_data const &Nodedata ) { +shape_node::deserialize( cParser &Input, scene::node_data const &Nodedata ) { // import common data m_name = Nodedata.name; @@ -291,6 +291,5 @@ basic_node::basic_node( scene::node_data const &Nodedata ) : std::numeric_limits::max() ); } - } // editor //--------------------------------------------------------------------------- diff --git a/scenenode.h b/scenenode.h index fed77544..ea4e029f 100644 --- a/scenenode.h +++ b/scenenode.h @@ -72,7 +72,7 @@ class node_manager { struct node_data { double range_min { 0.0 }; - double range_max { 0.0 }; + double range_max { std::numeric_limits::max() }; std::string name; std::string type; }; @@ -86,7 +86,7 @@ public: // types struct shapenode_data { // placement and visibility - bounding_area area; // bounding area, in world coordinates + scene::bounding_area area; // bounding area, in world coordinates bool visible { true }; // visibility flag double rangesquared_min { 0.0 }; // visibility range, min double rangesquared_max { 0.0 }; // visibility range, max @@ -103,7 +103,7 @@ public: // methods // restores content of the node from provded input stream shape_node & - deserialize( cParser &Input, node_data const &Nodedata ); + deserialize( cParser &Input, scene::node_data const &Nodedata ); // adds content of provided node to already enclosed geometry. returns: true if merge could be performed bool merge( shape_node &Shape ); @@ -229,12 +229,15 @@ public: std::string const & name() const { return m_name; } - glm::dvec3 const & - location() { - return m_location; }; void location( glm::dvec3 const Location ) { m_location = Location; } + glm::dvec3 const & + location() const { + return m_location; }; + void + visible( bool const Visible ) { + m_visible = Visible; } bool visible() const { return m_visible; } diff --git a/simulation.cpp b/simulation.cpp index 9fdc5174..843d23b1 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -12,15 +12,19 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "logs.h" +#include "uilayer.h" namespace simulation { state_manager State; event_manager Events; -memory_manager Memory; +memory_table Memory; path_table Paths; traction_table Traction; -instance_manager Instances; +powergridsource_table Powergrid; +sound_table Sounds; +instance_table Instances; +vehicle_table Vehicles; light_array Lights; scene::basic_region *Region { nullptr }; @@ -44,6 +48,23 @@ state_manager::deserialize( std::string const &Scenariofile ) { return true; } +// legacy method, calculates changes in simulation state over specified time +void +state_manager::update( double const Deltatime, int Iterationcount ) { + // aktualizacja animacji krokiem FPS: dt=krok czasu [s], dt*iter=czas od ostatnich przeliczeń + if (Deltatime == 0.0) { + // jeśli załączona jest pauza, to tylko obsłużyć ruch w kabinie trzeba + return; + } + + auto const totaltime { Deltatime * Iterationcount }; + // NOTE: we perform animations first, as they can determine factors like contact with powergrid + TAnimModel::AnimUpdate( totaltime ); // wykonanie zakolejkowanych animacji + + simulation::Powergrid.update( totaltime ); + simulation::Vehicles.update( Deltatime, Iterationcount ); +} + // restores class data from provided stream void state_manager::deserialize( cParser &Input ) { @@ -79,7 +100,11 @@ state_manager::deserialize( cParser &Input ) { for( auto &function : functionlist ) { functionmap.emplace( function.first, std::bind( function.second, this, std::ref( Input ), std::ref( importscratchpad ) ) ); } + // deserialize content from the provided input + auto + timelast { std::chrono::steady_clock::now() }, + timenow { timelast }; std::string token { Input.getToken() }; while( false == token.empty() ) { @@ -91,6 +116,14 @@ state_manager::deserialize( cParser &Input ) { ErrorLog( "Bad scenario: unexpected token \"" + token + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); } + timenow = std::chrono::steady_clock::now(); + if( std::chrono::duration_cast( timenow - timelast ).count() >= 200 ) { + timelast = timenow; + glfwPollEvents(); + UILayer.set_progress( Input.getProgress(), Input.getFullProgress() ); + GfxRenderer.Render(); + } + token = Input.getToken(); } } @@ -218,6 +251,7 @@ state_manager::deserialize_firstinit( cParser &Input, scene::scratch_data &Scrat simulation::Paths.InitTracks(); simulation::Traction.InitTraction(); simulation::Events.InitEvents(); + simulation::Memory.InitCells(); } void @@ -230,6 +264,8 @@ state_manager::deserialize_light( cParser &Input, scene::scratch_data &Scratchpa void state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ) { + auto const inputline = Input.Line(); // cache in case we need to report error + scene::node_data nodedata; // common data and node type indicator Input.getTokens( 4 ); @@ -240,13 +276,27 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad >> nodedata.type; // type-based deserialization. not elegant but it'll do if( nodedata.type == "dynamic" ) { - // TODO: implement - skip_until( Input, "enddynamic" ); + + auto *vehicle { deserialize_dynamic( Input, Scratchpad, nodedata ) }; + // vehicle import can potentially fail + if( vehicle == nullptr ) { return; } + + if( false == simulation::Vehicles.insert( vehicle ) ) { + + ErrorLog( "Bad scenario: vehicle with duplicate name, \"" + vehicle->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + + if( ( vehicle->MoverParameters->CategoryFlag == 1 ) // trains only + && ( ( vehicle->MoverParameters->SecuritySystem.SystemType != 0 ) + || ( vehicle->MoverParameters->SandCapacity > 0.0 ) ) ) { + // we check for presence of security system or sand load, as a way to determine whether the vehicle is a controllable engine + // NOTE: this isn't 100% precise, e.g. middle EZT module comes with security system, while it has no lights, and some engines + // don't have security systems fitted + simulation::Lights.insert( vehicle ); + } } else if( nodedata.type == "track" ) { - auto const inputline = Input.Line(); // cache in case we need to report error - auto *path { deserialize_path( Input, Scratchpad, nodedata ) }; // duplicates of named tracks are currently experimentally allowed if( simulation::Paths.insert( path ) ) { @@ -262,10 +312,10 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad } else if( nodedata.type == "traction" ) { - auto const inputline = Input.Line(); // cache in case we need to report error - auto *traction { deserialize_traction( Input, Scratchpad, nodedata ) }; - // duplicates of named tracks are currently discarded + // traction loading is optional + if( traction == nullptr ) { return; } + if( simulation::Traction.insert( traction ) ) { simulation::Region->insert_traction( traction, Scratchpad ); } @@ -274,18 +324,29 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad } } else if( nodedata.type == "tractionpowersource" ) { - // TODO: implement - skip_until( Input, "end" ); + + auto *powersource { deserialize_tractionpowersource( Input, Scratchpad, nodedata ) }; + // traction loading is optional + if( powersource == nullptr ) { return; } + + if( simulation::Powergrid.insert( powersource ) ) { +/* + // TODO: implement this + simulation::Region.insert_powersource( powersource, Scratchpad ); +*/ + } + else { + ErrorLog( "Bad scenario: power grid source with duplicate name, \"" + powersource->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } } else if( nodedata.type == "model" ) { if( nodedata.range_min < 0.0 ) { // convert and import 3d terrain + // TODO: implement this } else { // regular instance of 3d mesh - auto const inputline = Input.Line(); // cache in case we need to report error - auto *instance { deserialize_model( Input, Scratchpad, nodedata ) }; // model import can potentially fail if( instance == nullptr ) { return; } @@ -313,10 +374,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad } else if( nodedata.type == "memcell" ) { - auto const inputline = Input.Line(); // cache in case we need to report error - auto *memorycell { deserialize_memorycell( Input, Scratchpad, nodedata ) }; - // duplicates of named tracks are currently discarded if( simulation::Memory.insert( memorycell ) ) { /* // TODO: implement this @@ -325,10 +383,6 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad } else { ErrorLog( "Bad scenario: memory cell with duplicate name, \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); -/* - delete memorycell; - delete memorycellnode; -*/ } } else if( nodedata.type == "eventlauncher" ) { @@ -336,8 +390,14 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad skip_until( Input, "end" ); } else if( nodedata.type == "sound" ) { - // TODO: implement - skip_until( Input, "endsound" ); + + auto *sound { deserialize_sound( Input, Scratchpad, nodedata ) }; + if( simulation::Sounds.insert( sound ) ) { + simulation::Region->insert_sound( sound, Scratchpad ); + } + else { + ErrorLog( "Bad scenario: sound node with duplicate name, \"" + sound->m_name + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } } } @@ -417,14 +477,68 @@ state_manager::deserialize_time( cParser &Input, scene::scratch_data &Scratchpad void state_manager::deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ) { - // TODO: implement - skip_until( Input, "endtrainset" ); + if( true == Scratchpad.trainset.is_open ) { + // shouldn't happen but if it does wrap up currently open trainset and report an error + deserialize_endtrainset( Input, Scratchpad ); + ErrorLog( "Bad scenario: encountered nested trainset definitions in file \"" + Input.Name() + "\" (line " + to_string( Input.Line() ) + ")" ); + } + + Scratchpad.trainset = scene::scratch_data::trainset_data(); + Scratchpad.trainset.is_open = true; + + Input.getTokens( 4 ); + Input + >> Scratchpad.trainset.name + >> Scratchpad.trainset.track + >> Scratchpad.trainset.offset + >> Scratchpad.trainset.velocity; } void state_manager::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ) { - // TODO: implement + if( ( false == Scratchpad.trainset.is_open ) + || ( true == Scratchpad.trainset.vehicles.empty() ) ) { + // not bloody likely but we better check for it just the same + ErrorLog( "Bad trainset: empty trainset defined in file \"" + Input.Name() + "\" (line " + to_string( Input.Line() - 1 ) + ")" ); + Scratchpad.trainset.is_open = false; + return; + } + + std::size_t vehicleindex { 0 }; + for( auto *vehicle : Scratchpad.trainset.vehicles ) { + // go through list of vehicles in the trainset, coupling them together and checking for potential driver + if( ( vehicle->Mechanik != nullptr ) + && ( vehicle->Mechanik->Primary() ) ) { + // primary driver will receive the timetable for this trainset + Scratchpad.trainset.driver = vehicle; + } + if( vehicleindex > 0 ) { + // from second vehicle on couple it with the previous one + Scratchpad.trainset.vehicles[ vehicleindex - 1 ]->AttachPrev( + vehicle, + Scratchpad.trainset.couplings[ vehicleindex - 1 ] ); + } + ++vehicleindex; + } + + if( Scratchpad.trainset.driver != nullptr ) { + // if present, send timetable to the driver + // wysłanie komendy "Timetable" ustawia odpowiedni tryb jazdy + auto *controller = Scratchpad.trainset.driver->Mechanik; + controller->DirectionInitial(); + controller->PutCommand( + "Timetable:" + Scratchpad.trainset.name, + Scratchpad.trainset.velocity, + 0, + nullptr ); + } + if( Scratchpad.trainset.couplings.back() == coupling::faux ) { + // jeśli ostatni pojazd ma sprzęg 0 to założymy mu końcówki blaszane (jak AI się odpali, to sobie poprawi) + Scratchpad.trainset.vehicles.back()->RaLightsSet( -1, TMoverParameters::light::rearendsignals ); + } + // all done + Scratchpad.trainset.is_open = false; } // creates path and its wrapper, restoring class data from provided stream @@ -448,6 +562,10 @@ state_manager::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad TTraction * state_manager::deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + if( false == Global::bLoadTraction ) { + skip_until( Input, "endtraction" ); + return nullptr; + } // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done auto *traction = new TTraction( Nodedata ); auto offset = ( @@ -459,6 +577,22 @@ state_manager::deserialize_traction( cParser &Input, scene::scratch_data &Scratc return traction; } +TTractionPowerSource * +state_manager::deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + if( false == Global::bLoadTraction ) { + skip_until( Input, "end" ); + return nullptr; + } + + auto *powersource = new TTractionPowerSource( Nodedata ); + powersource->Load( &Input ); + // adjust location + powersource->location( transform( powersource->location(), Scratchpad ) ); + + return powersource; +} + TMemCell * state_manager::deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { @@ -481,7 +615,6 @@ state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpa >> location.y >> location.z >> rotation.y; - // adjust location auto *instance = new TAnimModel( Nodedata ); instance->RaAnglesSet( Scratchpad.location_rotation + rotation ); // dostosowanie do pochylania linii @@ -495,6 +628,147 @@ state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpa return instance; } +TDynamicObject * +state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + if( false == Scratchpad.trainset.is_open ) { + // part of trainset data is used when loading standalone vehicles, so clear it just in case + Scratchpad.trainset = scene::scratch_data::trainset_data(); + } + auto const inputline { Input.Line() }; // cache in case of errors + // basic attributes + auto const datafolder { Input.getToken() }; + auto const skinfile { Input.getToken() }; + auto const mmdfile { Input.getToken() }; + auto const pathname = ( + Scratchpad.trainset.is_open ? + Scratchpad.trainset.track : + Input.getToken() ); + auto const offset { Input.getToken( false ) }; + auto const drivertype { Input.getToken() }; + auto const couplingparams = ( + Scratchpad.trainset.is_open ? + Input.getToken() : + "3" ); + auto const velocity = ( + Scratchpad.trainset.is_open ? + Scratchpad.trainset.velocity : + Input.getToken( false ) ); + // extract coupling type and optional parameters + auto const couplingparamsplit = couplingparams.find( '.' ); + auto coupling = ( + couplingparamsplit != std::string::npos ? + std::atoi( couplingparams.substr( 0, couplingparamsplit ).c_str() ) : + std::atoi( couplingparams.c_str() ) ); + if( coupling < 0 ) { + // sprzęg zablokowany (pojazdy nierozłączalne przy manewrach) + coupling = ( -coupling ) | coupling::permanent; + } + if( ( offset != -1.0 ) + && ( std::abs( offset ) > 0.5 ) ) { // maksymalna odległość między sprzęgami - do przemyślenia + // likwidacja sprzęgu, jeśli odległość zbyt duża - to powinno być uwzględniane w fizyce sprzęgów... + coupling = 0; + } + auto const params = ( + couplingparamsplit != std::string::npos ? + couplingparams.substr( couplingparamsplit + 1 ) : + "" ); + // load amount and type + auto loadcount { Input.getToken( false ) }; + auto loadtype = ( + loadcount ? + Input.getToken() : + "" ); + if( loadtype == "enddynamic" ) { + // idiotoodporność: ładunek bez podanego typu nie liczy się jako ładunek + loadcount = 0; + loadtype = ""; + } + + auto *path = simulation::Paths.find( pathname ); + if( path == nullptr ) { + + ErrorLog( "Bad scenario: vehicle \"" + Nodedata.name + "\" placed on nonexistent path \"" + pathname + "\" in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + skip_until( Input, "enddynamic" ); + return nullptr; + } + + if( ( true == Scratchpad.trainset.vehicles.empty() ) // jeśli pierwszy pojazd, + && ( false == path->asEvent0Name.empty() ) // tor ma Event0 + && ( std::abs( velocity ) <= 1.f ) // a skład stoi + && ( Scratchpad.trainset.offset >= 0.0 ) // ale może nie sięgać na owy tor + && ( Scratchpad.trainset.offset < 8.0 ) ) { // i raczej nie sięga + // przesuwamy około pół EU07 dla wstecznej zgodności + Scratchpad.trainset.offset = 8.0; + } + + auto *vehicle = new TDynamicObject(); + + auto const length = + vehicle->Init( + Nodedata.name, + datafolder, skinfile, mmdfile, + path, + ( offset == -1.0 ? + Scratchpad.trainset.offset : + Scratchpad.trainset.offset - offset ), + drivertype, + velocity, + Scratchpad.trainset.name, + loadcount, loadtype, + ( offset == -1.0 ), + params ); + + if( length != 0.0 ) { // zero oznacza błąd + // przesunięcie dla kolejnego, minus bo idziemy w stronę punktu 1 + Scratchpad.trainset.offset -= length; + // automatically establish permanent connections for couplers which specify them in their definitions + if( ( coupling != 0 ) + && ( vehicle->MoverParameters->Couplers[ ( offset == -1.0 ? 0 : 1 ) ].AllowedFlag & coupling::permanent ) ) { + coupling |= coupling::permanent; + } + if( true == Scratchpad.trainset.is_open ) { + Scratchpad.trainset.vehicles.emplace_back( vehicle ); + Scratchpad.trainset.couplings.emplace_back( coupling ); + } + } + else { + delete vehicle; + skip_until( Input, "enddynamic" ); + return nullptr; + } + + auto const destination { Input.getToken() }; + if( destination != "enddynamic" ) { + // optional vehicle destination parameter + vehicle->asDestination = Input.getToken(); + skip_until( Input, "enddynamic" ); + } + + return vehicle; +} + +TTextSound * +state_manager::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + glm::dvec3 location; + Input.getTokens( 3 ); + Input + >> location.x + >> location.y + >> location.z; + // adjust location + location = transform( location, Scratchpad ); + + auto const soundname { Input.getToken() }; + auto *sound = new TTextSound( soundname, Nodedata.range_max, location.x, location.y, location.z, false, false, Nodedata.range_min ); + sound->name( Nodedata.name ); + + skip_until( Input, "endsound" ); + + return sound; +} + // skips content of stream until specified token void state_manager::skip_until( cParser &Input, std::string const &Token ) { diff --git a/simulation.h b/simulation.h index 3aa6bbf0..781785d4 100644 --- a/simulation.h +++ b/simulation.h @@ -9,14 +9,18 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include "parser.h" +#include "scene.h" #include "event.h" #include "memcell.h" #include "track.h" #include "traction.h" +#include "tractionpower.h" +#include "realsound.h" #include "animmodel.h" -#include "scene.h" +#include "dynobj.h" +#include "driver.h" #include "lightarray.h" -#include "parser.h" namespace simulation { @@ -26,6 +30,9 @@ public: // types // methods + // legacy method, calculates changes in simulation state over specified time + void + update( double dt, int iter ); bool deserialize( std::string const &Scenariofile ); @@ -51,8 +58,11 @@ private: void deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ); TTrack * deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TTraction * deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TTractionPowerSource * deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TMemCell * deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TAnimModel * deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TDynamicObject * deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TTextSound * deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); // skips content of stream until specified token void skip_until( cParser &Input, std::string const &Token ); // transforms provided location by specifed rotation and offset @@ -61,10 +71,13 @@ private: extern state_manager State; extern event_manager Events; -extern memory_manager Memory; +extern memory_table Memory; extern path_table Paths; extern traction_table Traction; -extern instance_manager Instances; +extern powergridsource_table Powergrid; +extern sound_table Sounds; +extern instance_table Instances; +extern vehicle_table Vehicles; extern light_array Lights; extern scene::basic_region *Region; From a12b84f50fbea9c7b6bf6ce865dc322d5288ceec Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 11 Oct 2017 20:30:17 +0200 Subject: [PATCH 199/426] ai driving logic tweaks, minor bug fixes --- Driver.cpp | 91 +++++++++++++++++++++++++++++++++------------- Driver.h | 1 + McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 5 ++- 4 files changed, 71 insertions(+), 27 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 2af71d90..a85b2729 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -73,7 +73,8 @@ double GetDistanceToEvent(TTrack const *track, TEvent const *event, double scan_ { // przejście na inny tor track = track->Connected(int(sd), sd); start_dist += (1 == krok) ? 0 : back ? -segment->GetLength() : segment->GetLength(); - if( track->eType == tt_Cross ) { + if( ( track != nullptr ) + && ( track->eType == tt_Cross ) ) { // NOTE: tracing through crossroads currently poses risk of tracing through wrong segment // as it's possible to be performerd before setting a route through the crossroads // as a stop-gap measure we don't trace through crossroads which should be reasonable in most cases @@ -312,7 +313,7 @@ bool TSpeedPos::Update() std::string TSpeedPos::GetName() { if (iFlags & spTrack) // jeśli tor - return trTrack->NameGet(); + return trTrack->name(); else if( iFlags & spEvent ) // jeśli event return evEvent->asName; else @@ -526,7 +527,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if (pTrack != tLast) // ostatni zapisany w tabelce nie był jeszcze sprawdzony { // jeśli tor nie był jeszcze sprawdzany if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "Speed table for " + OwnerName() + " tracing through track " + pTrack->NameGet() ); + WriteLog( "Speed table for " + OwnerName() + " tracing through track " + pTrack->name() ); } if( ( pEvent = CheckTrackEvent( pTrack, fLastDir ) ) != nullptr ) // jeśli jest semafor na tym torze @@ -723,7 +724,7 @@ void TController::TableCheck(double fDistance) if (sSpeedTable[i].Update()) { if( Global::iWriteLogEnabled & 8 ) { - WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->NameGet() + " (generating fresh trace)" ); + WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->name() + " (generating fresh trace)" ); } // usuwamy wszystko za tym torem while (sSpeedTable.back().trTrack != sSpeedTable[i].trTrack) @@ -827,7 +828,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN WriteLog( pVehicle->asName + " as " + TrainParams->TrainName + ": at " + std::to_string(simulation::Time.data().wHour) + ":" + std::to_string(simulation::Time.data().wMinute) - + " skipped " + asNextStop); // informacja + + " passed " + asNextStop); // informacja #endif // przy jakim dystansie (stanie licznika) ma przesunąć na następny postój fLastStopExpDist = mvOccupied->DistCounter + 0.250 + 0.001 * fLength; @@ -3651,6 +3652,14 @@ TController::UpdateSituation(double dt) { // dla nastawienia G koniecznie należy wydłużyć drogę na czas reakcji fBrakeDist += 2 * mvOccupied->Vel; } +/* + // take into account effect of gravity (but to stay on safe side of calculations, only downhill) + if( fAccGravity > 0.025 ) { + fBrakeDist *= ( 1.0 + fAccGravity ); + // TBD: use version which shortens route going uphill, too + //fBrakeDist = std::max( fBrakeDist, fBrakeDist * ( 1.0 + fAccGravity ) ); + } +*/ // route scan double routescanrange = ( mvOccupied->Vel > 5.0 ? @@ -4461,6 +4470,7 @@ TController::UpdateSituation(double dt) { AbsAccS /= fMass; } AbsAccS_pub = AbsAccS; + AbsAccS_avg = interpolate( AbsAccS_avg, mvOccupied->AccS * iDirection, 0.25 ); #if LOGVELOCITY // WriteLog("VelDesired="+AnsiString(VelDesired)+", @@ -4589,26 +4599,53 @@ TController::UpdateSituation(double dt) { // decisions based on current speed if( mvOccupied->CategoryFlag == 1 ) { - // try to estimate increase of current velocity before engaged brakes start working - auto const speedestimate = vel + vel * ( 1.0 - fBrake_a0[ 0 ] ) * AbsAccS; - if( speedestimate > VelDesired ) { - // jesli jedzie za szybko do AKTUALNEGO - if( VelDesired == 0.0 ) { - // jesli stoj, to hamuj, ale i tak juz za pozno :) - AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie - } - else { - if( speedestimate > ( VelDesired + fVelPlus ) ) { - // if it looks like we'll exceed maximum allowed speed start thinking about slight slowing down - AccDesired = std::min( AccDesired, -0.25 ); + + if( fAccGravity < 0.025 ) { + // on flats on uphill we can be less careful + if( vel > VelDesired ) { + // jesli jedzie za szybko do AKTUALNEGO + if( VelDesired == 0.0 ) { + // jesli stoj, to hamuj, ale i tak juz za pozno :) + AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie } else { - // close enough to target to stop accelerating - AccDesired = std::min( - AccDesired, // but don't override decceleration for VelNext - interpolate( // ease off as you close to the target velocity - -0.06, AccPreferred, - clamp( speedestimate - vel, 0.0, fVelPlus ) / fVelPlus ) ); + // slow down, not full stop + if( vel > ( VelDesired + fVelPlus ) ) { + // hamuj tak średnio + AccDesired = std::min( AccDesired, -0.25 ); + } + else { + // o 5 km/h to olej (zacznij luzować) + AccDesired = std::min( + AccDesired, // but don't override decceleration for VelNext + std::max( 0.0, AccPreferred ) ); + } + } + } + } + else { + // going sharply downhill we may need to start braking sooner than usual + // try to estimate increase of current velocity before engaged brakes start working + auto const speedestimate = vel + ( 1.0 - fBrake_a0[ 0 ] ) * 30.0 * AbsAccS; + if( speedestimate > VelDesired ) { + // jesli jedzie za szybko do AKTUALNEGO + if( VelDesired == 0.0 ) { + // jesli stoj, to hamuj, ale i tak juz za pozno :) + AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie + } + else { + if( speedestimate > ( VelDesired + fVelPlus ) ) { + // if it looks like we'll exceed maximum allowed speed start thinking about slight slowing down + AccDesired = std::min( AccDesired, -0.25 ); + } + else { + // close enough to target to stop accelerating + AccDesired = std::min( + AccDesired, // but don't override decceleration for VelNext + interpolate( // ease off as you close to the target velocity + -0.06, AccPreferred, + clamp( speedestimate - vel, 0.0, fVelPlus ) / fVelPlus ) ); + } } } } @@ -4640,8 +4677,10 @@ TController::UpdateSituation(double dt) { // last step sanity check, until the whole calculation is straightened out AccDesired = std::min( AccDesired, AccPreferred ); - if( mvOccupied->CategoryFlag == 1 ) { - // also take into account impact of gravity + + if( ( mvOccupied->CategoryFlag == 1 ) + && ( fAccGravity > 0.025 ) ) { + // going downhill also take into account impact of gravity AccDesired = clamp( AccDesired - fAccGravity, -0.9, 0.9 ); } @@ -5164,7 +5203,7 @@ std::string TController::StopReasonText() if (eStopReason != 7) // zawalidroga będzie inaczej return StopReasonTable[eStopReason]; else - return "Blocked by " + (pVehicles[0]->PrevAny()->GetName()); + return "Blocked by " + (pVehicles[0]->PrevAny()->name()); }; //---------------------------------------------------------------------------------------------------------------------- diff --git a/Driver.h b/Driver.h index d1695179..09d7326a 100644 --- a/Driver.h +++ b/Driver.h @@ -209,6 +209,7 @@ public: double BrakeAccFactor(); double fBrakeReaction = 1.0; //opóźnienie zadziałania hamulca - czas w s / (km/h) double fAccThreshold = 0.0; // próg opóźnienia dla zadziałania hamulca + double AbsAccS_avg = 0.0; // averaged out directional acceleration double AbsAccS_pub = 0.0; // próg opóźnienia dla zadziałania hamulca double fBrake_a0[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca double fBrake_a1[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index c53b59f3..da94f8c5 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -706,6 +706,7 @@ public: headlight_upper = 0x04, headlight_right = 0x10, redmarker_right = 0x20, + rearendsignals = 0x40 }; int ScndInMain{ 0 }; /*zaleznosc bocznika od nastawnika*/ bool MBrake = false; /*Czy jest hamulec reczny*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b1c7251c..a1f76501 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6923,7 +6923,7 @@ void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { } if( true == extract_value( AirLeakRate, "AirLeakRate", line, "" ) ) { - // the parameter is provided in form of a multiplier, where 1.0 means the default rate of 0.001 + // the parameter is provided in form of a multiplier, where 1.0 means the default rate of 0.01 AirLeakRate *= 0.01; } } @@ -7826,10 +7826,13 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) BrakeCtrlPos = static_cast( Handle->GetPos( bh_NP ) ); else BrakeCtrlPos = static_cast( Handle->GetPos( bh_RP ) ); +/* + // NOTE: disabled and left up to the driver, if there's any MainSwitch( false ); PantFront( true ); PantRear( true ); MainSwitch( true ); +*/ ActiveDir = 0; // Dir; //nastawnik kierunkowy - musi być ustawiane osobno! DirAbsolute = ActiveDir * CabNo; // kierunek jazdy względem sprzęgów LimPipePress = CntrlPipePress; From 09dbb3c639b472f643e00842e84f9830b5232071 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 14 Oct 2017 03:53:13 +0200 Subject: [PATCH 200/426] continued refactoring: traction, events, event launchers, sounds; additional diagnostics timers, minor performance enhancements and bug fixes --- Driver.cpp | 26 +++-- Driver.h | 14 ++- DynObj.cpp | 214 ++++++++++++++++++++++------------- DynObj.h | 3 + EvLaunch.cpp | 40 ++----- EvLaunch.h | 55 +++++---- Event.cpp | 292 +++++++++++++++++++++++++++++------------------- Event.h | 11 ++ Ground.cpp | 32 +----- Ground.h | 6 +- MemCell.cpp | 4 + MemCell.h | 4 + Names.h | 7 ++ Timer.cpp | 5 +- Timer.h | 36 +++++- World.cpp | 20 ++-- renderer.cpp | 190 +++++++++++++++++++++---------- renderer.h | 25 +++-- scene.cpp | 298 +++++++++++++++++++++++++++++++++++-------------- scene.h | 56 +++++++--- scenenode.h | 4 +- simulation.cpp | 61 ++++++++-- simulation.h | 2 + 23 files changed, 921 insertions(+), 484 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index a85b2729..8746c591 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2985,20 +2985,27 @@ void TController::RecognizeCommand() c->Command = ""; // usunięcie obsłużonej komendy } -void TController::PutCommand(std::string NewCommand, double NewValue1, double NewValue2, - const TLocation &NewLocation, TStopReason reason) +void TController::PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation, TStopReason reason) { // wysłanie komendy przez event PutValues, jak pojazd ma obsadę, to wysyła tutaj, a nie do pojazdu // bezpośrednio +#ifdef EU07_USE_OLD_GROUNDCODE vector3 sl; sl.x = -NewLocation.X; // zamiana na współrzędne scenerii sl.z = NewLocation.Y; sl.y = NewLocation.Z; +#else + // zamiana na współrzędne scenerii + glm::dvec3 sl { -NewLocation.X, NewLocation.Y, NewLocation.Z }; +#endif if (!PutCommand(NewCommand, NewValue1, NewValue2, &sl, reason)) mvOccupied->PutCommand(NewCommand, NewValue1, NewValue2, NewLocation); } -bool TController::PutCommand(std::string NewCommand, double NewValue1, double NewValue2, - const vector3 *NewLocation, TStopReason reason) +#ifdef EU07_USE_OLD_GROUNDCODE +bool TController::PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const vector3 *NewLocation, TStopReason reason) +#else +bool TController::PutCommand( std::string NewCommand, double NewValue1, double NewValue2, glm::dvec3 const *NewLocation, TStopReason reason ) +#endif { // analiza komendy if (NewCommand == "CabSignal") { // SHP wyzwalane jest przez człon z obsadą, ale obsługiwane przez silnikowy @@ -4229,13 +4236,12 @@ TController::UpdateSituation(double dt) { ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders if (fabs(VelSignal) >= 1.0) // 0.1 nie wysyła się do samochodow, bo potem nie ruszą - PutCommand("SetVelocity", VelSignal, VelNext, - NULL); // komenda robi dodatkowe operacje + PutCommand("SetVelocity", VelSignal, VelNext, nullptr); // komenda robi dodatkowe operacje break; case cm_ShuntVelocity: // od wersji 357 Tm nie budzi wyłączonej lokomotywy if (!(OrderList[OrderPos] & ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders - PutCommand("ShuntVelocity", VelSignal, VelNext, NULL); + PutCommand("ShuntVelocity", VelSignal, VelNext, nullptr); else if (iCoupler) // jeśli jedzie w celu połączenia SetVelocity(VelSignal, VelNext); break; @@ -5306,7 +5312,11 @@ TTrack * TController::BackwardTraceRoute(double &fDistance, double &fDirection, } // sprawdzanie zdarzeń semaforów i ograniczeń szlakowych +#ifdef EU07_USE_OLD_GROUNDCODE void TController::SetProximityVelocity(double dist, double vel, const vector3 *pos) +#else +void TController::SetProximityVelocity( double dist, double vel, glm::dvec3 const *pos ) +#endif { // Ra:przeslanie do AI prędkości /* //!!!! zastąpić prawidłową reakcją AI na SetProximityVelocity !!!! @@ -5318,7 +5328,7 @@ void TController::SetProximityVelocity(double dist, double vel, const vector3 *p if ((vel<0)?true:dist>0.1*(MoverParameters->Vel*MoverParameters->Vel-vel*vel)+50) {//jeśli jest dalej od umownej drogi hamowania */ - PutCommand("SetProximityVelocity", dist, vel, pos); + PutCommand( "SetProximityVelocity", dist, vel, pos ); /* } else diff --git a/Driver.h b/Driver.h index 09d7326a..d669b498 100644 --- a/Driver.h +++ b/Driver.h @@ -313,10 +313,12 @@ private: public: Mtable::TTrainParameters *Timetable() { return TrainParams; }; - void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, - const TLocation &NewLocation, TStopReason reason = stopComm); - bool PutCommand(std::string NewCommand, double NewValue1, double NewValue2, - const vector3 *NewLocation, TStopReason reason = stopComm); + void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation, TStopReason reason = stopComm); +#ifdef EU07_USE_OLD_GROUNDCODE + bool PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const vector3 *NewLocation, TStopReason reason = stopComm); +#else + bool PutCommand( std::string NewCommand, double NewValue1, double NewValue2, glm::dvec3 const *NewLocation, TStopReason reason = stopComm ); +#endif void UpdateSituation(double dt); // uruchamiac przynajmniej raz na sekundę // procedury dotyczace rozkazow dla maszynisty // uaktualnia informacje o prędkości @@ -376,7 +378,11 @@ private: bool BackwardTrackBusy(TTrack *Track); TEvent *CheckTrackEventBackward(double fDirection, TTrack *Track); TTrack *BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, TEvent *&Event); +#ifdef EU07_USE_OLD_GROUNDCODE void SetProximityVelocity(double dist, double vel, const vector3 *pos); +#else + void SetProximityVelocity( double dist, double vel, glm::dvec3 const *pos ); +#endif TCommandType BackwardScan(); public: diff --git a/DynObj.cpp b/DynObj.cpp index cbf34062..beb068b2 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2613,77 +2613,36 @@ bool TDynamicObject::Update(double dt, double dt1) NoVoltTime = 0; tmpTraction.TractionVoltage = v; } - else - { - /* - if (MoverParameters->Vel>0.1f) //jeśli jedzie - if (NoVoltTime==0.0) //tylko przy pierwszym zaniku napięcia - if (MoverParameters->PantFrontUp||MoverParameters->PantRearUp) - //if - ((pants[0].fParamPants->PantTraction>1.0)||(pants[1].fParamPants->PantTraction>1.0)) - {//wspomagacz usuwania problemów z siecią - if (!Global::iPause) - {//Ra: tymczasowa teleportacja do miejsca, gdzie brakuje prądu - Global::SetCameraPosition(vPosition+vector3(0,0,5)); //nowa - pozycja dla - generowania obiektów - Global::pCamera->Init(vPosition+vector3(0,0,5),Global::pFreeCameraInitAngle[0]); - //przestawienie - } - Global:l::pGround->Silence(Global::pCamera->Pos); //wyciszenie - wszystkiego - z poprzedniej pozycji - Globa:iPause|=1; //tymczasowe zapauzowanie, gdy problem z - siecią - } - */ - NoVoltTime = NoVoltTime + dt; - if (NoVoltTime > 0.2) // jeśli brak zasilania dłużej niż 0.2 sekundy (25km/h pod - // izolatorem daje 0.15s) - { // Ra 2F1H: prowizorka, trzeba przechować napięcie, żeby nie wywalało - // WS pod - // izolatorem - if (MoverParameters->Vel > 0.5) // jeśli jedzie - if (MoverParameters->PantFrontUp || - MoverParameters->PantRearUp) // Ra 2014-07: doraźna blokada logowania - // zimnych lokomotyw - zrobić to trzeba - // inaczej + else { + NoVoltTime += dt; + if( NoVoltTime > 0.2 ) { + // jeśli brak zasilania dłużej niż 0.2 sekundy (25km/h pod izolatorem daje 0.15s) + // Ra 2F1H: prowizorka, trzeba przechować napięcie, żeby nie wywalało WS pod izolatorem + if( MoverParameters->Vel > 0.5 ) { + // jeśli jedzie + // Ra 2014-07: doraźna blokada logowania zimnych lokomotyw - zrobić to trzeba inaczej + if( MoverParameters->PantFrontUp || MoverParameters->PantRearUp ) // if (NoVoltTime>0.02) //tu można ograniczyć czas rozłączenia // if (DebugModeFlag) //logowanie nie zawsze - if ((MoverParameters->Mains) && - ((MoverParameters->EngineType != ElectricInductionMotor) - || (MoverParameters->GetTrainsetVoltage() < 0.1f))) - { // Ra 15-01: logować tylko, jeśli WS załączony - // yB 16-03: i nie jest to asynchron zasilany z daleka - // if (MoverParameters->PantFrontUp&&pants) + if( ( MoverParameters->Mains ) + && ( ( MoverParameters->EngineType != ElectricInductionMotor ) + || ( MoverParameters->GetTrainsetVoltage() < 0.1f ) ) ) { + // Ra 15-01: logować tylko, jeśli WS załączony + // yB 16-03: i nie jest to asynchron zasilany z daleka // Ra 15-01: bezwzględne współrzędne pantografu nie są dostępne, // więc lepiej się tego nie zaloguje - ErrorLog("Voltage loss: by " + MoverParameters->Name + " at " + - to_string(vPosition.x, 2, 7) + " " + - to_string(vPosition.y, 2, 7) + " " + - to_string(vPosition.z, 2, 7) + ", time " + - to_string(NoVoltTime, 2, 7)); - // if (MoverParameters->PantRearUp) - // if (iAnimType[ANIM_PANTS]>1) - // if (pants[1]) - // ErrorLog("Voltage loss: by "+MoverParameters->Name+" at - // "+FloatToStrF(vPosition.x,ffFixed,7,2)+" - // "+FloatToStrF(vPosition.y,ffFixed,7,2)+" - // "+FloatToStrF(vPosition.z,ffFixed,7,2)+", time - // "+FloatToStrF(NoVoltTime,ffFixed,7,2)); + ErrorLog( + "Bad traction: " + MoverParameters->Name + + " lost power for " + to_string( NoVoltTime, 2 ) + " sec. at " + + to_string( glm::dvec3{ vPosition } ) ); } - // Ra 2F1H: nie było sensu wpisywać tu zera po upływie czasu, bo - // zmienna była + } + // Ra 2F1H: nie było sensu wpisywać tu zera po upływie czasu, bo zmienna była // tymczasowa, a napięcie zerowane od razu tmpTraction.TractionVoltage = 0; // Ra 2013-12: po co tak? - // pControlled->MainSwitch(false); //może tak? } } } - // else //Ra: nie no, trzeba podnieść pantografy, jak nie będzie drutu, to - // będą miały prąd - // po osiągnięciu 1.4m - // tmpTraction.TractionVoltage=0.95*MoverParameters->EnginePowerSource.MaxVoltage; } else tmpTraction.TractionVoltage = 0.95 * MoverParameters->EnginePowerSource.MaxVoltage; @@ -3199,22 +3158,22 @@ bool TDynamicObject::Update(double dt, double dt1) else if ( ( true == MoverParameters->PantRearUp ) && ( PantDiff < 0.01 ) ) { - if ((MoverParameters->PantRearVolt == 0.0) && - (MoverParameters->PantFrontVolt == 0.0)) - sPantUp.Play(vol, 0, MechInside, vPosition); - if (p->hvPowerWire) // TODO: wyliczyć trzeba prąd przypadający na - // pantograf i - // wstawić do GetVoltage() - { - MoverParameters->PantRearVolt = - p->hvPowerWire->VoltageGet(MoverParameters->Voltage, fPantCurrent); + if( ( MoverParameters->PantRearVolt == 0.0 ) + && ( MoverParameters->PantFrontVolt == 0.0 ) ) { + sPantUp.Play( vol, 0, MechInside, vPosition ); + } + if (p->hvPowerWire) { + // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() + MoverParameters->PantRearVolt = p->hvPowerWire->VoltageGet( MoverParameters->Voltage, fPantCurrent ); fCurrent -= fPantCurrent; // taki prąd płynie przez powyższy pantograf } else MoverParameters->PantRearVolt = 0.0; } - else + else { +// Global::iPause ^= 2; MoverParameters->PantRearVolt = 0.0; + } break; } // pozostałe na razie nie obsługiwane if( MoverParameters->PantPress > ( @@ -3281,8 +3240,8 @@ bool TDynamicObject::Update(double dt, double dt1) p->fAngleU = acos((p->fLenL1 * cos(k) + p->fHoriz) / p->fLenU1); // górne ramię // wyliczyć aktualną wysokość z wzoru sinusowego // h=a*sin()+b*sin() - p->PantWys = p->fLenL1 * sin(k) + p->fLenU1 * sin(p->fAngleU) + - p->fHeight; // wysokość całości + // wysokość całości + p->PantWys = p->fLenL1 * sin(k) + p->fLenU1 * sin(p->fAngleU) + p->fHeight; } } } // koniec pętli po pantografach @@ -4438,10 +4397,8 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, // pants[i].fParamPants->vPos.z=0; //niezerowe dla pantografów // asymetrycznych pants[ i ].fParamPants->PantTraction = pants[ i ].fParamPants->PantWys; - pants[ i ].fParamPants->fWidth = - 0.5 * - MoverParameters->EnginePowerSource.CollectorParameters - .CSW; // połowa szerokości ślizgu; jest w "Power: CSW=" + // połowa szerokości ślizgu; jest w "Power: CSW=" + pants[ i ].fParamPants->fWidth = 0.5 * MoverParameters->EnginePowerSource.CollectorParameters.CSW; } } } @@ -4932,7 +4889,12 @@ void TDynamicObject::RadioStop() if( ( MoverParameters->SecuritySystem.RadioStop ) && ( MoverParameters->Radio ) ) { // jeśli pojazd ma RadioStop i jest on aktywny +#ifdef EU07_USE_OLD_GROUNDCODE Mechanik->PutCommand( "Emergency_brake", 1.0, 1.0, &vPosition, stopRadio ); +#else + // HAX cast until math types unification + Mechanik->PutCommand( "Emergency_brake", 1.0, 1.0, &static_cast(vPosition), stopRadio ); +#endif // add onscreen notification for human driver // TODO: do it selectively for the 'local' driver once the multiplayer is in if( false == Mechanik->AIControllFlag ) { @@ -5404,10 +5366,8 @@ vehicle_table::update( double Deltatime, int Iterationcount ) { for( auto *vehicle : m_items ) { // Ra: zmienić warunek na sprawdzanie pantografów w jednej zmiennej: czy pantografy i czy podniesione if( vehicle->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) { -/* // TODO: re-implement - GetTraction( vehicle ); -*/ + update_traction( vehicle ); } vehicle->MoverParameters->ComputeConstans(); vehicle->CoupleDist(); @@ -5447,3 +5407,97 @@ vehicle_table::update( double Deltatime, int Iterationcount ) { } */ } + +// legacy method, checks for presence and height of traction wire for specified vehicle +void +vehicle_table::update_traction( TDynamicObject *Vehicle ) { + + auto const vFront = glm::make_vec3( Vehicle->VectorFront().getArray() ); // wektor normalny dla płaszczyzny ruchu pantografu + auto const vUp = glm::make_vec3( Vehicle->VectorUp().getArray() ); // wektor pionu pudła (pochylony od pionu na przechyłce) + auto const vLeft = glm::make_vec3( Vehicle->VectorLeft().getArray() ); // wektor odległości w bok (odchylony od poziomu na przechyłce) + auto const position = glm::dvec3 { Vehicle->GetPosition() }; // współrzędne środka pojazdu + + for( int pantographindex = 0; pantographindex < Vehicle->iAnimType[ ANIM_PANTS ]; ++pantographindex ) { + // pętla po pantografach + auto pantograph { Vehicle->pants[ pantographindex ].fParamPants }; + if( true == ( + pantographindex == TMoverParameters::side::front ? + Vehicle->MoverParameters->PantFrontUp : + Vehicle->MoverParameters->PantRearUp ) ) { + // jeśli pantograf podniesiony + auto const pant0 { position + ( vLeft * pantograph->vPos.z ) + ( vUp * pantograph->vPos.y ) + ( vFront * pantograph->vPos.x ) }; + if( pantograph->hvPowerWire != nullptr ) { + // jeżeli znamy drut z poprzedniego przebiegu + for( int attempts = 0; attempts < 30; ++attempts ) { + // powtarzane aż do znalezienia odpowiedniego odcinka na liście dwukierunkowej + if( pantograph->hvPowerWire->iLast & 0x3 ) { + // dla ostatniego i przedostatniego przęsła wymuszamy szukanie innego + // nie to, że nie ma, ale trzeba sprawdzić inne + pantograph->hvPowerWire = nullptr; + break; + } + if( pantograph->hvPowerWire->hvParallel ) { + // jeśli przęsło tworzy bieżnię wspólną, to trzeba sprawdzić pozostałe + // nie to, że nie ma, ale trzeba sprawdzić inne + pantograph->hvPowerWire = nullptr; + break; + } + // obliczamy wyraz wolny równania płaszczyzny (to miejsce nie jest odpowienie) + // podstawiamy równanie parametryczne drutu do równania płaszczyzny pantografu + auto const fRaParam = + -( glm::dot( pantograph->hvPowerWire->pPoint1, vFront ) - glm::dot( pant0, vFront ) ) + / glm::dot( pantograph->hvPowerWire->vParametric, vFront ); + + if( fRaParam < -0.001 ) { + // histereza rzędu 7cm na 70m typowego przęsła daje 1 promil + pantograph->hvPowerWire = pantograph->hvPowerWire->hvNext[ 0 ]; + continue; + } + if( fRaParam > 1.001 ) { + pantograph->hvPowerWire = pantograph->hvPowerWire->hvNext[ 1 ]; + continue; + } + // jeśli t jest w przedziale, wyznaczyć odległość wzdłuż wektorów vUp i vLeft + // punkt styku płaszczyzny z drutem (dla generatora łuku el.) + auto const vStyk { pantograph->hvPowerWire->pPoint1 + fRaParam * pantograph->hvPowerWire->vParametric }; + auto const vGdzie { vStyk - pant0 }; // wektor + // odległość w pionie musi być w zasięgu ruchu "pionowego" pantografu + // musi się mieścić w przedziale ruchu pantografu + auto const fVertical { glm::dot( vGdzie, vUp ) }; + // odległość w bok powinna być mniejsza niż pół szerokości pantografu + // to się musi mieścić w przedziale zależnym od szerokości pantografu + auto const fHorizontal { std::abs( glm::dot( vGdzie, vLeft ) ) - pantograph->fWidth }; + // jeśli w pionie albo w bok jest za daleko, to dany drut jest nieużyteczny + if( fHorizontal <= 0.0 ) { + // koniec pętli, aktualny drut pasuje + pantograph->PantTraction = fVertical; + break; + } + else { + // the wire is outside contact area and as of now we don't have good detection of parallel sections + // as such there's no guaratee there isn't parallel section present. + // therefore we don't bother checking if the wire is still within range of guide horns + // but simply force area search for potential better option + pantograph->hvPowerWire = nullptr; + break; + } + } + } + + if( pantograph->hvPowerWire == nullptr ) { + // look in the region for a suitable traction piece if we don't already have any + simulation::Region->update_traction( Vehicle, pantographindex ); + } + + if( ( pantograph->hvPowerWire == nullptr ) + && ( false == Global::bLiveTraction ) ) { + // jeśli drut nie znaleziony ale można oszukiwać to dajemy coś tam dla picu + Vehicle->pants[ pantographindex ].fParamPants->PantTraction = 1.4; + } + } + else { + // pantograph is down + pantograph->hvPowerWire = nullptr; + } + } +} diff --git a/DynObj.h b/DynObj.h index df0794e9..8670ea20 100644 --- a/DynObj.h +++ b/DynObj.h @@ -492,6 +492,9 @@ public: // legacy method, calculates changes in simulation state over specified time void update( double dt, int iter ); + // legacy method, checks for presence and height of traction wire for specified vehicle + void + update_traction( TDynamicObject *Vehicle ); }; //--------------------------------------------------------------------------- diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 4fda3368..349a29db 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -17,36 +17,14 @@ http://mozilla.org/MPL/2.0/. #include "EvLaunch.h" #include "Globals.h" #include "Logs.h" -#include "Usefull.h" -#include "McZapkie/mctools.h" #include "Event.h" #include "MemCell.h" -#include "mtable.h" #include "Timer.h" #include "parser.h" #include "Console.h" -using namespace Mtable; - //--------------------------------------------------------------------------- -TEventLauncher::TEventLauncher() -{ // ustawienie początkowych wartości dla wszystkich zmiennych - iKey = 0; - DeltaTime = -1; - UpdatedTime = 0; - fVal1 = fVal2 = 0; - iHour = iMinute = -1; // takiego czasu nigdy nie będzie - dRadius = 0; - Event1 = Event2 = NULL; - MemCell = NULL; - iCheckMask = 0; -} - -void TEventLauncher::Init() -{ -} - // encodes expected key in a short, where low byte represents the actual key, // and the high byte holds modifiers: 0x1 = shift, 0x2 = ctrl, 0x4 = alt int vk_to_glfw_key( int const Keycode ) { @@ -145,7 +123,7 @@ bool TEventLauncher::Load(cParser *parser) return true; }; -bool TEventLauncher::Render() +bool TEventLauncher::check_conditions() { //"renderowanie" wyzwalacza bool bCond = false; if (iKey != 0) @@ -199,13 +177,13 @@ bool TEventLauncher::Render() return bCond; // sprawdzanie dRadius w Ground.cpp } -bool TEventLauncher::IsGlobal() -{ // sprawdzenie, czy jest globalnym wyzwalaczem czasu - if (DeltaTime == 0) - if (iHour >= 0) - if (iMinute >= 0) - if (dRadius < 0.0) // bez ograniczenia zasięgu - return true; - return false; +// sprawdzenie, czy jest globalnym wyzwalaczem czasu +bool TEventLauncher::IsGlobal() const { + + return ( ( DeltaTime == 0 ) + && ( iHour >= 0 ) + && ( iMinute >= 0 ) + && ( dRadius < 0.0 ) ); // bez ograniczenia zasięgu }; + //--------------------------------------------------------------------------- diff --git a/EvLaunch.h b/EvLaunch.h index 42ce2c73..1dbeae97 100644 --- a/EvLaunch.h +++ b/EvLaunch.h @@ -10,32 +10,43 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "Classes.h" -class TEventLauncher -{ - private: - int iKey; - double DeltaTime; - double UpdatedTime; - double fVal1; - double fVal2; - std::string szText; - int iHour, iMinute; // minuta uruchomienia - public: - double dRadius; +#include "Classes.h" +#include "scenenode.h" + +class TEventLauncher : public editor::basic_node { + +public: +// constructor + TEventLauncher( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} + // legacy constructor + TEventLauncher() = default; + +// methods + bool Load( cParser *parser ); + // checks conditions associated with the event. returns: true if the conditions are met + bool check_conditions(); + bool IsGlobal() const; +// members std::string asEvent1Name; std::string asEvent2Name; std::string asMemCellName; - TEvent *Event1; - TEvent *Event2; - TMemCell *MemCell; - int iCheckMask; - TEventLauncher(); - void Init(); - bool Load(cParser *parser); - bool Render(); - bool IsGlobal(); + TEvent *Event1 { nullptr }; + TEvent *Event2 { nullptr }; + TMemCell *MemCell { nullptr }; + int iCheckMask { 0 }; + double dRadius { 0.0 }; + +private: +// members + int iKey { 0 }; + double DeltaTime { -1.0 }; + double UpdatedTime { 0.0 }; + double fVal1 { 0.0 }; + double fVal2 { 0.0 }; + std::string szText; + int iHour { -1 }; + int iMinute { -1 }; // minuta uruchomienia }; //--------------------------------------------------------------------------- diff --git a/Event.cpp b/Event.cpp index 389b92ca..398b7699 100644 --- a/Event.cpp +++ b/Event.cpp @@ -727,6 +727,32 @@ event_manager::~event_manager() { } } +// adds specified event launcher to the list of global launchers +void +event_manager::queue( TEventLauncher *Launcher ) { + + m_launcherqueue.emplace_back( Launcher ); +} + +// legacy method, updates event queues +void +event_manager::update() { + + // process currently queued events + CheckQuery(); + // test list of global events for possible new additions to the queue + for( auto *launcher : m_launcherqueue ) { + + if( true == launcher->check_conditions() ) { + // NOTE: we're presuming global events aren't going to use event2 + WriteLog( "Eventlauncher " + launcher->name() ); + if( launcher->Event1 ) { + Global::AddToQuery( launcher->Event1, nullptr ); + } + } + } +} + // adds provided event to the collection. returns: true on success // TODO: return handle instead of pointer bool @@ -826,7 +852,11 @@ event_manager::AddToQuery( TEvent *Event, TDynamicObject *Owner ) { for( auto dynamic : Event->Params[ 6 ].asTrack->Dynamics ) { Event->Params[ 5 ].asMemCell->PutCommand( dynamic->Mechanik, +#ifdef EU07_USE_OLD_GROUNDCODE &Event->Params[ 4 ].nGroundNode->pCenter ); +#else + Event->Params[ 4 ].asLocation ); +#endif } //if (DebugModeFlag) WriteLog( @@ -924,7 +954,11 @@ event_manager::CheckQuery() { for( auto dynamic : m_workevent->Params[ 6 ].asTrack->Dynamics ) { m_workevent->Params[ 5 ].asMemCell->PutCommand( dynamic->Mechanik, +#ifdef EU07_USE_OLD_GROUNDCODE &m_workevent->Params[ 4 ].nGroundNode->pCenter ); +#else + m_workevent->Params[ 4 ].asLocation ); +#endif } //if (DebugModeFlag) WriteLog("Type: UpdateValues & Track command - [" + @@ -950,7 +984,11 @@ event_manager::CheckQuery() { */ m_workevent->Params[ 9 ].asMemCell->PutCommand( m_workevent->Activator->Mechanik, +#ifdef EU07_USE_OLD_GROUNDCODE &m_workevent->Params[ 8 ].nGroundNode->pCenter ); +#else + m_workevent->Params[ 8 ].asLocation ); +#endif } WriteLog( "Type: GetValues" ); break; @@ -1273,263 +1311,263 @@ void event_manager::InitEvents() { //łączenie eventów z pozostałymi obiektami - for( auto *Current : m_events ) { + for( auto *event : m_events ) { - switch (Current->Type) { + switch( event->Type ) { case tp_AddValues: // sumowanie wartości case tp_UpdateValues: { // zmiana wartości - auto *cell = simulation::Memory.find( Current->asNodeName ); // nazwa komórki powiązanej z eventem + auto *cell = simulation::Memory.find( event->asNodeName ); // nazwa komórki powiązanej z eventem if( cell != nullptr ) { // McZapkie-100302 - if( Current->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { + if( event->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { // jeśli chodzi o zajetosc toru (tor może być inny, niż wpisany w komórce) // nazwa toru ta sama, co nazwa komórki - Current->Params[ 9 ].asTrack = simulation::Paths.find( Current->asNodeName ); - if( Current->Params[ 9 ].asTrack == nullptr ) { - ErrorLog( "Bad event: track \"" + Current->asNodeName + "\" referenced in event \"" + Current->asName + "\" doesn't exist" ); + event->Params[ 9 ].asTrack = simulation::Paths.find( event->asNodeName ); + if( event->Params[ 9 ].asTrack == nullptr ) { + ErrorLog( "Bad event: track \"" + event->asNodeName + "\" referenced in event \"" + event->asName + "\" doesn't exist" ); } } - Current->Params[ 4 ].asLocation = &( cell->location() ); - Current->Params[ 5 ].asMemCell = cell; // komórka do aktualizacji - if( Current->iFlags & ( conditional_memcompare ) ) { + event->Params[ 4 ].asLocation = &( cell->location() ); + event->Params[ 5 ].asMemCell = cell; // komórka do aktualizacji + if( event->iFlags & ( conditional_memcompare ) ) { // komórka do badania warunku - Current->Params[ 9 ].asMemCell = cell; + event->Params[ 9 ].asMemCell = cell; } if( false == cell->asTrackName.empty() ) { // tor powiązany z komórką powiązaną z eventem // tu potrzebujemy wskaźnik do komórki w (tmp) - Current->Params[ 6 ].asTrack = simulation::Paths.find( cell->asTrackName ); - if( Current->Params[ 6 ].asTrack == nullptr ) { + event->Params[ 6 ].asTrack = simulation::Paths.find( cell->asTrackName ); + if( event->Params[ 6 ].asTrack == nullptr ) { ErrorLog( "Bad memcell: track \"" + cell->asTrackName + "\" referenced in memcell \"" + cell->name() + "\" doesn't exist" ); } } else { - Current->Params[ 6 ].asTrack = nullptr; + event->Params[ 6 ].asTrack = nullptr; } } else { // nie ma komórki, to nie będzie działał poprawnie - Current->m_ignored = true; // deaktywacja - ErrorLog( "Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\"" ); + event->m_ignored = true; // deaktywacja + ErrorLog( "Bad event: event \"" + event->asName + "\" cannot find memcell \"" + event->asNodeName + "\"" ); } break; } case tp_LogValues: { // skojarzenie z memcell - if( Current->asNodeName.empty() ) { // brak skojarzenia daje logowanie wszystkich - Current->Params[ 9 ].asMemCell = nullptr; + if( event->asNodeName.empty() ) { // brak skojarzenia daje logowanie wszystkich + event->Params[ 9 ].asMemCell = nullptr; break; } } case tp_GetValues: case tp_WhoIs: { - auto *cell = simulation::Memory.find( Current->asNodeName ); + auto *cell = simulation::Memory.find( event->asNodeName ); if( cell != nullptr ) { - Current->Params[ 8 ].asLocation = &( cell->location() ); - Current->Params[ 9 ].asMemCell = cell; - if( ( Current->Type == tp_GetValues ) + event->Params[ 8 ].asLocation = &( cell->location() ); + event->Params[ 9 ].asMemCell = cell; + if( ( event->Type == tp_GetValues ) && ( cell->IsVelocity() ) ) { // jeśli odczyt komórki a komórka zawiera komendę SetVelocity albo ShuntVelocity // to event nie będzie dodawany do kolejki - Current->bEnabled = false; + event->bEnabled = false; } } else { // nie ma komórki, to nie będzie działał poprawnie - Current->m_ignored = true; // deaktywacja - ErrorLog( "Bad event: event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\"" ); + event->m_ignored = true; // deaktywacja + ErrorLog( "Bad event: event \"" + event->asName + "\" cannot find memcell \"" + event->asNodeName + "\"" ); } break; } case tp_CopyValues: { // skopiowanie komórki do innej - auto *cell = simulation::Memory.find( Current->asNodeName ); // komórka docelowa + auto *cell = simulation::Memory.find( event->asNodeName ); // komórka docelowa if( cell != nullptr ) { - Current->Params[ 4 ].asLocation = &( cell->location() ); - Current->Params[ 5 ].asMemCell = cell; // komórka docelowa + event->Params[ 4 ].asLocation = &( cell->location() ); + event->Params[ 5 ].asMemCell = cell; // komórka docelowa if( false == cell->asTrackName.empty() ) { // tor powiązany z komórką powiązaną z eventem // tu potrzebujemy wskaźnik do komórki w (tmp) - Current->Params[ 6 ].asTrack = simulation::Paths.find( cell->asTrackName ); - if( Current->Params[ 6 ].asTrack == nullptr ) { + event->Params[ 6 ].asTrack = simulation::Paths.find( cell->asTrackName ); + if( event->Params[ 6 ].asTrack == nullptr ) { ErrorLog( "Bad memcell: track \"" + cell->asTrackName + "\" referenced in memcell \"" + cell->name() + "\" doesn't exists" ); } } else { - Current->Params[ 6 ].asTrack = nullptr; + event->Params[ 6 ].asTrack = nullptr; } } else { - ErrorLog( "Bad event: copyvalues event \"" + Current->asName + "\" cannot find memcell \"" + Current->asNodeName + "\"" ); + ErrorLog( "Bad event: copyvalues event \"" + event->asName + "\" cannot find memcell \"" + event->asNodeName + "\"" ); } - std::string const cellastext { Current->Params[ 9 ].asText }; - cell = simulation::Memory.find( Current->Params[ 9 ].asText ); // komórka źódłowa - SafeDeleteArray( Current->Params[ 9 ].asText ); // usunięcie nazwy komórki + std::string const cellastext { event->Params[ 9 ].asText }; + cell = simulation::Memory.find( event->Params[ 9 ].asText ); // komórka źódłowa + SafeDeleteArray( event->Params[ 9 ].asText ); // usunięcie nazwy komórki if( cell != nullptr ) { - Current->Params[ 8 ].asLocation = &( cell->location() ); - Current->Params[ 9 ].asMemCell = cell; // komórka źródłowa + event->Params[ 8 ].asLocation = &( cell->location() ); + event->Params[ 9 ].asMemCell = cell; // komórka źródłowa } else { - ErrorLog( "Bad event: copyvalues event \"" + Current->asName + "\" cannot find memcell \"" + cellastext + "\"" ); + ErrorLog( "Bad event: copyvalues event \"" + event->asName + "\" cannot find memcell \"" + cellastext + "\"" ); } break; } case tp_Animation: { // animacja modelu // retrieve target name parameter - std::string const cellastext = Current->Params[ 9 ].asText; - SafeDeleteArray( Current->Params[ 9 ].asText ); + std::string const cellastext = event->Params[ 9 ].asText; + SafeDeleteArray( event->Params[ 9 ].asText ); // egzemplarz modelu do animowania - auto *instance = simulation::Instances.find( Current->asNodeName ); + auto *instance = simulation::Instances.find( event->asNodeName ); if( instance != nullptr ) { - if( Current->Params[ 0 ].asInt == 4 ) { + if( event->Params[ 0 ].asInt == 4 ) { // model dla całomodelowych animacji - Current->Params[ 9 ].asModel = instance; + event->Params[ 9 ].asModel = instance; } else { // standardowo przypisanie submodelu - Current->Params[ 9 ].asAnimContainer = instance->GetContainer( cellastext ); // submodel - if( Current->Params[ 9 ].asAnimContainer ) { - Current->Params[ 9 ].asAnimContainer->WillBeAnimated(); // oflagowanie animacji - if( Current->Params[ 9 ].asAnimContainer->Event() == nullptr ) { + event->Params[ 9 ].asAnimContainer = instance->GetContainer( cellastext ); // submodel + if( event->Params[ 9 ].asAnimContainer ) { + event->Params[ 9 ].asAnimContainer->WillBeAnimated(); // oflagowanie animacji + if( event->Params[ 9 ].asAnimContainer->Event() == nullptr ) { // nie szukać, gdy znaleziony - Current->Params[ 9 ].asAnimContainer->EventAssign( - FindEvent( Current->asNodeName + "." + cellastext + ":done" ) ); + event->Params[ 9 ].asAnimContainer->EventAssign( + FindEvent( event->asNodeName + "." + cellastext + ":done" ) ); } } } } else { - ErrorLog( "Bad event: animation event \"" + Current->asName + "\" cannot find model instance \"" + Current->asNodeName + "\"" ); + ErrorLog( "Bad event: animation event \"" + event->asName + "\" cannot find model instance \"" + event->asNodeName + "\"" ); } - Current->asNodeName = ""; + event->asNodeName = ""; break; } case tp_Lights: { // zmiana świeteł modelu - auto *instance = simulation::Instances.find( Current->asNodeName ); + auto *instance = simulation::Instances.find( event->asNodeName ); if( instance != nullptr ) - Current->Params[ 9 ].asModel = instance; + event->Params[ 9 ].asModel = instance; else - ErrorLog( "Bad event: lights event \"" + Current->asName + "\" cannot find model instance \"" + Current->asNodeName + "\"" ); - Current->asNodeName = ""; + ErrorLog( "Bad event: lights event \"" + event->asName + "\" cannot find model instance \"" + event->asNodeName + "\"" ); + event->asNodeName = ""; break; } case tp_Visible: { // ukrycie albo przywrócenie obiektu - editor::basic_node *node = simulation::Instances.find( Current->asNodeName ); // najpierw model + editor::basic_node *node = simulation::Instances.find( event->asNodeName ); // najpierw model if( node == nullptr ) { // albo tory? - node = simulation::Paths.find( Current->asNodeName ); + node = simulation::Paths.find( event->asNodeName ); } if( node == nullptr ) { // może druty? - node = simulation::Traction.find( Current->asNodeName ); + node = simulation::Traction.find( event->asNodeName ); } if( node != nullptr ) - Current->Params[ 9 ].asEditorNode = node; + event->Params[ 9 ].asEditorNode = node; else - ErrorLog( "Bad event: visibility event \"" + Current->asName + "\" cannot find item \"" + Current->asNodeName + "\"" ); - Current->asNodeName = ""; + ErrorLog( "Bad event: visibility event \"" + event->asName + "\" cannot find item \"" + event->asNodeName + "\"" ); + event->asNodeName = ""; break; } case tp_Switch: { // przełożenie zwrotnicy albo zmiana stanu obrotnicy - auto *track = simulation::Paths.find( Current->asNodeName ); + auto *track = simulation::Paths.find( event->asNodeName ); if( track != nullptr ) { // dowiązanie toru if( track->iAction == NULL ) { // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia track->iAction |= 0x100; } - Current->Params[ 9 ].asTrack = track; - if( ( Current->Params[ 0 ].asInt == 0 ) - && ( Current->Params[ 2 ].asdouble >= 0.0 ) ) { + event->Params[ 9 ].asTrack = track; + if( ( event->Params[ 0 ].asInt == 0 ) + && ( event->Params[ 2 ].asdouble >= 0.0 ) ) { // jeśli przełącza do stanu 0 & jeśli jest zdefiniowany dodatkowy ruch iglic // przesłanie parametrów - Current->Params[ 9 ].asTrack->Switch( - Current->Params[ 0 ].asInt, - Current->Params[ 1 ].asdouble, - Current->Params[ 2 ].asdouble ); + event->Params[ 9 ].asTrack->Switch( + event->Params[ 0 ].asInt, + event->Params[ 1 ].asdouble, + event->Params[ 2 ].asdouble ); } } else { - ErrorLog( "Bad event: switch event \"" + Current->asName + "\" cannot find track \"" + Current->asNodeName + "\"" ); + ErrorLog( "Bad event: switch event \"" + event->asName + "\" cannot find track \"" + event->asNodeName + "\"" ); } - Current->asNodeName = ""; + event->asNodeName = ""; break; } case tp_Sound: { // odtworzenie dźwięku - auto *sound = simulation::Sounds.find( Current->asNodeName ); + auto *sound = simulation::Sounds.find( event->asNodeName ); if( sound != nullptr ) - Current->Params[ 9 ].tsTextSound = sound; + event->Params[ 9 ].tsTextSound = sound; else - ErrorLog( "Bad event: sound event \"" + Current->asName + "\" cannot find static sound \"" + Current->asNodeName + "\"" ); - Current->asNodeName = ""; + ErrorLog( "Bad event: sound event \"" + event->asName + "\" cannot find static sound \"" + event->asNodeName + "\"" ); + event->asNodeName = ""; break; } case tp_TrackVel: { // ustawienie prędkości na torze - if( false == Current->asNodeName.empty() ) { - auto *track = simulation::Paths.find( Current->asNodeName ); + if( false == event->asNodeName.empty() ) { + auto *track = simulation::Paths.find( event->asNodeName ); if( track != nullptr ) { // flaga zmiany prędkości toru jest istotna dla skanowania track->iAction |= 0x200; - Current->Params[ 9 ].asTrack = track; + event->Params[ 9 ].asTrack = track; } else { - ErrorLog( "Bad event: track velocity event \"" + Current->asName + "\" cannot find track \"" + Current->asNodeName + "\"" ); + ErrorLog( "Bad event: track velocity event \"" + event->asName + "\" cannot find track \"" + event->asNodeName + "\"" ); } } - Current->asNodeName = ""; + event->asNodeName = ""; break; } case tp_DynVel: { // komunikacja z pojazdem o konkretnej nazwie - if( Current->asNodeName == "activator" ) - Current->Params[ 9 ].asDynamic = nullptr; + if( event->asNodeName == "activator" ) + event->Params[ 9 ].asDynamic = nullptr; else { - auto *vehicle = simulation::Vehicles.find( Current->asNodeName ); + auto *vehicle = simulation::Vehicles.find( event->asNodeName ); if( vehicle != nullptr ) - Current->Params[ 9 ].asDynamic = vehicle; + event->Params[ 9 ].asDynamic = vehicle; else - Error( "Bad event: vehicle velocity event \"" + Current->asName + "\" cannot find vehicle \"" + Current->asNodeName + "\"" ); + ErrorLog( "Bad event: vehicle velocity event \"" + event->asName + "\" cannot find vehicle \"" + event->asNodeName + "\"" ); } - Current->asNodeName = ""; + event->asNodeName = ""; break; } case tp_Multiple: { std::string cellastext; - if( Current->Params[ 9 ].asText != nullptr ) { // przepisanie nazwy do bufora - cellastext = Current->Params[ 9 ].asText; - SafeDeleteArray( Current->Params[ 9 ].asText ); - Current->Params[ 9 ].asPointer = nullptr; // zerowanie wskaźnika, aby wykryć brak obeiktu + if( event->Params[ 9 ].asText != nullptr ) { // przepisanie nazwy do bufora + cellastext = event->Params[ 9 ].asText; + SafeDeleteArray( event->Params[ 9 ].asText ); + event->Params[ 9 ].asPointer = nullptr; // zerowanie wskaźnika, aby wykryć brak obeiktu } - if( Current->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { + if( event->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { // jeśli chodzi o zajetosc toru - Current->Params[ 9 ].asTrack = simulation::Paths.find( cellastext ); - if( Current->Params[ 9 ].asTrack == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + Current->asName + "\" cannot find track \"" + cellastext + "\"" ); - Current->iFlags &= ~( conditional_trackoccupied | conditional_trackfree ); // zerowanie flag + event->Params[ 9 ].asTrack = simulation::Paths.find( cellastext ); + if( event->Params[ 9 ].asTrack == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find track \"" + cellastext + "\"" ); + event->iFlags &= ~( conditional_trackoccupied | conditional_trackfree ); // zerowanie flag } } - else if( Current->iFlags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) { + else if( event->iFlags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) { // jeśli chodzi o komorke pamieciową - Current->Params[ 9 ].asMemCell = simulation::Memory.find( cellastext ); - if( Current->Params[ 9 ].asMemCell == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + Current->asName + "\" cannot find memory cell \"" + cellastext + "\"" ); - Current->iFlags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); + event->Params[ 9 ].asMemCell = simulation::Memory.find( cellastext ); + if( event->Params[ 9 ].asMemCell == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find memory cell \"" + cellastext + "\"" ); + event->iFlags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); } } for( int i = 0; i < 8; ++i ) { - if( Current->Params[ i ].asText != nullptr ) { - cellastext = Current->Params[ i ].asText; - SafeDeleteArray( Current->Params[ i ].asText ); - Current->Params[ i ].asEvent = FindEvent( cellastext ); - if( Current->Params[ i ].asEvent == nullptr ) { + if( event->Params[ i ].asText != nullptr ) { + cellastext = event->Params[ i ].asText; + SafeDeleteArray( event->Params[ i ].asText ); + event->Params[ i ].asEvent = FindEvent( cellastext ); + if( event->Params[ i ].asEvent == nullptr ) { // Ra: tylko w logu informacja o braku - ErrorLog( "Bad event: multi-event \"" + Current->asName + "\" cannot find event \"" + cellastext + "\"" ); + ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find event \"" + cellastext + "\"" ); } } } @@ -1537,14 +1575,14 @@ event_manager::InitEvents() { } case tp_Voltage: { // zmiana napięcia w zasilaczu (TractionPowerSource) - if( false == Current->asNodeName.empty() ) { - auto *powersource = simulation::Powergrid.find( Current->asNodeName ); // podłączenie zasilacza + if( false == event->asNodeName.empty() ) { + auto *powersource = simulation::Powergrid.find( event->asNodeName ); // podłączenie zasilacza if( powersource != nullptr ) - Current->Params[ 9 ].psPower = powersource; + event->Params[ 9 ].psPower = powersource; else - ErrorLog( "Bad event: voltage event \"" + Current->asName + "\" cannot find power source \"" + Current->asNodeName + "\"" ); + ErrorLog( "Bad event: voltage event \"" + event->asName + "\" cannot find power source \"" + event->asNodeName + "\"" ); } - Current->asNodeName = ""; + event->asNodeName = ""; break; } case tp_Message: { @@ -1554,7 +1592,37 @@ event_manager::InitEvents() { } // switch - if( Current->fDelay < 0 ) { AddToQuery( Current, nullptr ); } + if( event->fDelay < 0 ) { AddToQuery( event, nullptr ); } + } +} + +// legacy method, initializes event launchers after deserialization from scenario file +void +event_manager::InitLaunchers() { + + for( auto *launcher : m_launchers.sequence() ) { + + if( launcher->iCheckMask != 0 ) { + if( launcher->asMemCellName != "none" ) { + // jeśli jest powiązana komórka pamięci + launcher->MemCell = simulation::Memory.find( launcher->asMemCellName ); + if( launcher->MemCell == nullptr ) { + ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find memcell \"" + launcher->asMemCellName + "\"" ); + } + } + else { + launcher->MemCell = nullptr; + } + } + + launcher->Event1 = ( + launcher->asEvent1Name != "none" ? + simulation::Events.FindEvent( launcher->asEvent1Name ) : + nullptr ); + launcher->Event2 = ( + launcher->asEvent2Name != "none" ? + simulation::Events.FindEvent( launcher->asEvent2Name ) : + nullptr ); } } diff --git a/Event.h b/Event.h index cd0f89cd..ad32a5b0 100644 --- a/Event.h +++ b/Event.h @@ -63,7 +63,9 @@ union TParam { void *asPointer; TMemCell *asMemCell; +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode *nGroundNode; +#endif editor::basic_node *asEditorNode; glm::dvec3 const *asLocation; TTrack *asTrack; @@ -125,6 +127,12 @@ public: // destructor ~event_manager(); // methods + // adds specified event launcher to the list of global launchers + void + queue( TEventLauncher *Launcher ); + // legacy method, updates event queues + void + update(); // adds provided event to the collection. returns: true on success // TBD, TODO: return handle to the event bool @@ -144,6 +152,9 @@ public: // legacy method, initializes events after deserialization from scenario file void InitEvents(); + // legacy method, initializes event launchers after deserialization from scenario file + void + InitLaunchers(); private: // types diff --git a/Ground.cpp b/Ground.cpp index ac467df8..4ccef2ef 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -190,7 +190,7 @@ void TGroundNode::RenderHidden() } return; case TP_EVLAUNCH: - if (EvLaunch->Render()) + if (EvLaunch->check_conditions()) if ((EvLaunch->dRadius < 0) || (mgn < EvLaunch->dRadius)) { WriteLog("Eventlauncher " + asName); @@ -1006,7 +1006,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } } break; -#endif case TP_EVLAUNCH: parser->getTokens(3); *parser @@ -1018,7 +1017,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) tmp->EvLaunch = new TEventLauncher(); tmp->EvLaunch->Load(parser); break; -#ifdef EU07_USE_OLD_GROUNDCODE case TP_TRACK: tmp->pTrack = new TTrack( tmp->asName ); if (Global::iWriteLogEnabled & 4) @@ -1600,7 +1598,6 @@ TEvent * TGround::FindEvent(const std::string &asEventName) lookup->second : nullptr ); } -#endif void TGround::FirstInit() { // ustalanie zależności na scenerii przed wczytaniem pojazdów @@ -1668,18 +1665,14 @@ void TGround::FirstInit() WriteLog("InitNormals OK"); -#ifdef EU07_USE_OLD_GROUNDCODE InitTracks(); //łączenie odcinków ze sobą i przyklejanie eventów WriteLog("InitTracks OK"); InitTraction(); //łączenie drutów ze sobą WriteLog("InitTraction OK"); InitEvents(); WriteLog( "InitEvents OK" ); -#endif - InitLaunchers(); WriteLog("InitLaunchers OK"); - WriteLog("FirstInit is done"); }; @@ -1839,7 +1832,6 @@ bool TGround::Init(std::string File) } else if (str == "event") { -#ifdef EU07_USE_OLD_GROUNDCODE TEvent *tmp = new TEvent(); tmp->Load(&parser, pOrigin); if (tmp->Type == tp_Unknown) @@ -1904,7 +1896,6 @@ bool TGround::Init(std::string File) } } } -#endif } else if (str == "rotate") { @@ -2126,14 +2117,13 @@ bool TGround::Init(std::string File) if (!bInitDone) FirstInit(); // jeśli nie było w scenerii -#ifdef EU07_USE_OLD_TERRAINCODE + if (Global::pTerrainCompact) TerrainWrite(); // Ra: teraz można zapisać teren w jednym pliku -#endif Global::iPause &= ~0x10; // koniec pauzy wczytywania return true; } -#ifdef EU07_USE_OLD_GROUNDCODE + bool TGround::InitEvents() { //łączenie eventów z pozostałymi obiektami TGroundNode *tmp, *trk; @@ -2816,7 +2806,7 @@ void TGround::TrackJoin(TGroundNode *Current) } } } - +#ifdef EU07_USE_OLD_GROUNDCODE // McZapkie-070602: wyzwalacze zdarzen bool TGround::InitLaunchers() { @@ -2837,26 +2827,16 @@ bool TGround::InitLaunchers() } else EventLauncher->MemCell = nullptr; -#ifdef EU07_USE_OLD_GROUNDCODE EventLauncher->Event1 = ( EventLauncher->asEvent1Name != "none") ? FindEvent(EventLauncher->asEvent1Name) : nullptr; EventLauncher->Event2 = ( EventLauncher->asEvent2Name != "none") ? FindEvent(EventLauncher->asEvent2Name) : nullptr; -#else - EventLauncher->Event1 = ( EventLauncher->asEvent1Name != "none") ? - simulation::Events.FindEvent(EventLauncher->asEvent1Name) : - nullptr; - EventLauncher->Event2 = ( EventLauncher->asEvent2Name != "none") ? - simulation::Events.FindEvent(EventLauncher->asEvent2Name) : - nullptr; -#endif } return true; } -#ifdef EU07_USE_OLD_GROUNDCODE TTrack * TGround::FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclude) { // wyszukiwanie innego toru kończącego się w (Point) TTrack *tmp; @@ -3539,7 +3519,7 @@ TGround::Update_Hidden() { } } } -#endif + // Winger 170204 - szukanie trakcji nad pantografami bool TGround::GetTraction(TDynamicObject *model) { // aktualizacja drutu zasilającego dla każdego pantografu, żeby odczytać napięcie @@ -3774,7 +3754,7 @@ bool TGround::GetTraction(TDynamicObject *model) return true; }; - +#endif #ifdef _WINDOWS //--------------------------------------------------------------------------- void TGround::Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) diff --git a/Ground.h b/Ground.h index 00bf072b..a6ef54c7 100644 --- a/Ground.h +++ b/Ground.h @@ -277,15 +277,13 @@ class TGround TGround(); ~TGround(); void Free(); +#ifdef EU07_USE_OLD_GROUNDCODE bool Init( std::string File ); void FirstInit(); -#ifdef EU07_USE_OLD_GROUNDCODE void InitTracks(); void InitTraction(); bool InitEvents(); -#endif bool InitLaunchers(); -#ifdef EU07_USE_OLD_GROUNDCODE TTrack * FindTrack(vector3 Point, int &iConnection, TGroundNode *Exclude); TTraction * FindTraction(glm::dvec3 const &Point, int &iConnection, TGroundNode *Exclude); TTraction * TractionNearestFind(glm::dvec3 &p, int dir, TGroundNode *n); @@ -295,9 +293,7 @@ class TGround void UpdatePhys(double dt, int iter); // aktualizacja fizyki stałym krokiem bool Update(double dt, int iter); // aktualizacja przesunięć zgodna z FPS void Update_Hidden(); // updates invisible elements of the scene -#endif bool GetTraction(TDynamicObject *model); -#ifdef EU07_USE_OLD_GROUNDCODE bool AddToQuery( TEvent *Event, TDynamicObject *Node ); bool CheckQuery(); TGroundNode * DynamicFindAny(std::string const &Name); diff --git a/MemCell.cpp b/MemCell.cpp index 8143b2fa..dcbba49c 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -129,7 +129,11 @@ bool TMemCell::Load(cParser *parser) return true; } +#ifdef EU07_USE_OLD_GROUNDCODE void TMemCell::PutCommand(TController *Mech, vector3 *Loc) +#else +void TMemCell::PutCommand( TController *Mech, glm::dvec3 const *Loc ) +#endif { // wysłanie zawartości komórki do AI if (Mech) Mech->PutCommand(szText, fValue1, fValue2, Loc); diff --git a/MemCell.h b/MemCell.h index aa84d3b9..0364eb89 100644 --- a/MemCell.h +++ b/MemCell.h @@ -37,7 +37,11 @@ class TMemCell : public editor::basic_node { bool Load(cParser *parser); void +#ifdef EU07_USE_OLD_GROUNDCODE PutCommand( TController *Mech, Math3D::vector3 *Loc ); +#else + PutCommand( TController *Mech, glm::dvec3 const *Loc ); +#endif bool Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ); std::string const & diff --git a/Names.h b/Names.h index 5f76306a..1b338531 100644 --- a/Names.h +++ b/Names.h @@ -108,4 +108,11 @@ protected: // members type_sequence m_items; type_map m_itemmap; + +public: + // data access + typename type_sequence & + sequence() { + return m_items; } + }; diff --git a/Timer.cpp b/Timer.cpp index e78b50a7..dcfb6780 100644 --- a/Timer.cpp +++ b/Timer.cpp @@ -11,8 +11,9 @@ http://mozilla.org/MPL/2.0/. #include "Timer.h" #include "Globals.h" -namespace Timer -{ +namespace Timer { + +subsystem_stopwatches subsystem; double DeltaTime, DeltaRenderTime; double fFPS{ 0.0f }; diff --git a/Timer.h b/Timer.h index b6b58371..d0d9e5c9 100644 --- a/Timer.h +++ b/Timer.h @@ -9,8 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -namespace Timer -{ +namespace Timer { double GetTime(); @@ -28,6 +27,39 @@ double GetFPS(); void ResetTimers(); void UpdateTimers(bool pause); + +class stopwatch { + +public: + void + start() { + m_start = std::chrono::steady_clock::now(); } + void + stop() { + m_accumulator = 0.95f * m_accumulator + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - m_start ) ).count() / 1000.f; } + float + average() const { + return m_accumulator / 20.f;} + +private: + std::chrono::time_point m_start { std::chrono::steady_clock::now() }; + float m_accumulator { 1000.f / 30.f * 20.f }; // 20 last samples, initial 'neutral' rate of 30 fps +}; + +struct subsystem_stopwatches { + stopwatch gfx_total; + stopwatch gfx_color; + stopwatch gfx_shadows; + stopwatch gfx_reflections; + stopwatch gfx_swap; + stopwatch sim_total; + stopwatch sim_dynamics; + stopwatch sim_events; + stopwatch sim_ai; +}; + +extern subsystem_stopwatches subsystem; + }; //--------------------------------------------------------------------------- diff --git a/World.cpp b/World.cpp index be3f6b32..c02db34d 100644 --- a/World.cpp +++ b/World.cpp @@ -953,6 +953,7 @@ void TWorld::FollowView(bool wycisz) { bool TWorld::Update() { Timer::UpdateTimers(Global::iPause != 0); + Timer::subsystem.sim_total.start(); if( (Global::iPause == false) || (m_init == false) ) { @@ -1026,6 +1027,7 @@ bool TWorld::Update() { // this means at count > 20 simulation and render are going to desync. is that right? // NOTE: experimentally changing this to prevent the desync. // TODO: test what happens if we hit more than 20 * 0.01 sec slices, i.e. less than 5 fps + Timer::subsystem.sim_dynamics.start(); #ifdef EU07_USE_OLD_GROUNDCODE if( true == Global::FullPhysics ) { // mixed calculation mode, steps calculated in ~0.05s chunks @@ -1067,6 +1069,7 @@ bool TWorld::Update() { simulation::State.update( stepdeltatime, updatecount ); } #endif + Timer::subsystem.sim_dynamics.stop(); // secondary fixed step simulation time routines while( m_secondaryupdateaccumulator >= m_secondaryupdaterate ) { @@ -1110,7 +1113,7 @@ bool TWorld::Update() { Ground.CheckQuery(); Ground.Update_Hidden(); #else - simulation::Events.CheckQuery(); + simulation::Events.update(); simulation::Region->update(); #endif @@ -1144,6 +1147,8 @@ bool TWorld::Update() { Update_Camera( dt ); + Timer::subsystem.sim_total.stop(); + GfxRenderer.Update( dt ); ResourceSweep(); @@ -1659,20 +1664,14 @@ TWorld::Update_UI() { "VBO" : "Display Lists" ) + " "; - // dump last opengl error, if any - GLenum glerror = ::glGetError(); - if( glerror != GL_NO_ERROR ) { - std::string glerrorstring( (char *)::gluErrorString( glerror ) ); - win1250_to_ascii( glerrorstring ); - Global::LastGLError = std::to_string( glerror ) + " (" + glerrorstring + ")"; - } if( false == Global::LastGLError.empty() ) { uitextline2 += "Last openGL error: " + Global::LastGLError; } // renderer stats - uitextline3 = GfxRenderer.Info(); + uitextline3 = GfxRenderer.info_times(); + uitextline4 = GfxRenderer.info_stats(); break; } @@ -1683,6 +1682,9 @@ TWorld::Update_UI() { if( Global::iMultiplayer ) { uitextline1 += " (multiplayer mode is active)"; } + uitextline3 = + "vehicles: " + to_string( Timer::subsystem.sim_dynamics.average(), 2 ) + " msec" + + " update total: " + to_string( Timer::subsystem.sim_total.average(), 2 ) + " msec"; break; } diff --git a/renderer.cpp b/renderer.cpp index 3107a28e..e875f081 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -315,23 +315,32 @@ opengl_renderer::Init( GLFWwindow *Window ) { bool opengl_renderer::Render() { - if( m_drawstart != std::chrono::steady_clock::time_point() ) { - m_drawtime = std::max( 20.f, 0.95f * m_drawtime + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - m_drawstart ) ).count() / 1000.f ); - } - m_drawstart = std::chrono::steady_clock::now(); - auto const drawstartcolorpass = m_drawstart; + Timer::subsystem.gfx_total.stop(); + Timer::subsystem.gfx_total.start(); // note: gfx_total is actually frame total, clean this up + Timer::subsystem.gfx_color.start(); m_renderpass.draw_mode = rendermode::none; // force setup anew - m_debuginfo.clear(); - ++m_framestamp; + m_debugtimestext.clear(); + m_debugstats = debug_stats(); Render_pass( rendermode::color ); + Timer::subsystem.gfx_color.stop(); + + Timer::subsystem.gfx_swap.start(); + glfwSwapBuffers( m_window ); + Timer::subsystem.gfx_swap.stop(); m_drawcount = m_cellqueue.size(); - // accumulate last 20 frames worth of render time (cap at 1000 fps to prevent calculations going awry) - m_drawtimecolorpass = std::max( 20.f, 0.95f * m_drawtimecolorpass + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - drawstartcolorpass ) ).count() / 1000.f ); - m_debuginfo += "frame total: " + to_string( m_drawtimecolorpass / 20.f, 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) "; + m_debugtimestext + += "frame: " + to_string( Timer::subsystem.gfx_color.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) " + += "gpu side: " + to_string( Timer::subsystem.gfx_swap.average(), 2 ) + " msec " + += "(" + to_string( Timer::subsystem.gfx_color.average() + Timer::subsystem.gfx_swap.average(), 2 ) + " msec total)"; + m_debugstatstext = + "drawcalls: " + to_string( m_debugstats.drawcalls ) + + "; dyn: " + to_string( m_debugstats.dynamics ) + " mod: " + to_string( m_debugstats.models ) + " sub: " + to_string( m_debugstats.submodels ) + + "; trk: " + to_string( m_debugstats.paths ) + " shp: " + to_string( m_debugstats.shapes ) + + " trc: " + to_string( m_debugstats.traction ) + " lin: " + to_string( m_debugstats.lines ); - glfwSwapBuffers( m_window ); + ++m_framestamp; return true; // for now always succeed } @@ -464,7 +473,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( World.InitPerformed() ) { // setup - auto const shadowdrawstart = std::chrono::steady_clock::now(); + Timer::subsystem.gfx_shadows.start(); ::glBindFramebufferEXT( GL_FRAMEBUFFER, m_shadowframebuffer ); @@ -500,9 +509,8 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glDisable( GL_SCISSOR_TEST ); ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target - - m_drawtimeshadowpass = 0.95f * m_drawtimeshadowpass + std::chrono::duration_cast( ( std::chrono::steady_clock::now() - shadowdrawstart ) ).count() / 1000.f; - m_debuginfo += "shadows: " + to_string( m_drawtimeshadowpass / 20.f, 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) "; + Timer::subsystem.gfx_shadows.stop(); + m_debugtimestext += "shadows: " + to_string( Timer::subsystem.gfx_shadows.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) "; } break; } @@ -602,7 +610,7 @@ bool opengl_renderer::Render_reflections() { auto const &time = simulation::Time.data(); - auto const timestamp = time.wDay * 60 * 24 + time.wHour * 60 + time.wMinute; + auto const timestamp = time.wDay * 24 * 60 + time.wHour * 60 + time.wMinute; if( ( timestamp - m_environmentupdatetime < 5 ) && ( glm::length( m_renderpass.camera.position() - m_environmentupdatelocation ) < 1000.0 ) ) { // run update every 5+ mins of simulation time, or at least 1km from the last location @@ -1477,12 +1485,6 @@ opengl_renderer::Render( TGroundRect *Groundcell ) { break; } } -#ifdef EU07_USE_OLD_TERRAINCODE - if( Groundcell->nTerrain ) { - - Render( Groundcell->nTerrain ); - } -#endif // add the subcells of the cell to the draw queue switch( m_renderpass.draw_mode ) { @@ -1645,16 +1647,7 @@ opengl_renderer::Render( scene::basic_region *Region ) { Update_Lights( simulation::Lights ); Render( std::begin( m_sectionqueue ), std::end( m_sectionqueue ) ); -/* - // draw queue was filled while rendering content of ground cells. now sort the nodes based on their distance to viewer... - // TODO: move sorting for translucent phase, for opaque geometry render cells in initial order to reduce vbo switching - std::sort( - std::begin( m_cellqueue ), - std::end( m_cellqueue ), - []( distancecell_pair const &Left, distancecell_pair const &Right ) { - return ( Left.first < Right.first ); } ); -*/ - // ...then render the opaque content of the visible cells. + // draw queue is filled while rendering sections Render( std::begin( m_cellqueue ), std::end( m_cellqueue ) ); break; } @@ -1749,7 +1742,7 @@ opengl_renderer::Render( section_sequence::iterator First, section_sequence::ite glEnable( GL_LIGHTING ); #endif // shapes - for( auto const &shape : section->m_shapes ) { Render( shape ); } + for( auto const &shape : section->m_shapes ) { Render( shape, true ); } // post-render cleanup ::glPopMatrix(); } @@ -1852,7 +1845,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator glEnable( GL_LIGHTING ); #endif // opaque non-instanced shapes - for( auto const &shape : cell->m_shapesopaque ) { Render( shape ); } + for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } // tracks // TODO: update after path node refactoring for( auto *path : cell->m_paths ) { Render( path ); } @@ -1871,7 +1864,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // render // opaque non-instanced shapes - for( auto const &shape : cell->m_shapesopaque ) { Render( shape ); } + for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } // TODO: add other content types // post-render cleanup @@ -1887,7 +1880,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render // opaque non-instanced shapes - for( auto const &shape : cell->m_shapesopaque ) { Render( shape ); } + for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } // tracks // TODO: add path to the node picking list for( auto *path : cell->m_paths ) { Render( path ); } @@ -1922,6 +1915,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator Render( dynamic ); } } + break; } case rendermode::pickscenery: { // opaque parts of instanced models @@ -1944,9 +1938,46 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator } void -opengl_renderer::Render( scene::shape_node const &Shape ) { +opengl_renderer::Render( scene::shape_node const &Shape, bool const Ignorerange ) { +/* + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees + distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + default: { + distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + } + if( ( distancesquared < Node->fSquareMinRadius ) + || ( distancesquared >= Node->fSquareRadius ) ) { + return false; + } +*/ + auto const &data{ Shape.data() }; + + if( false == Ignorerange ) { + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees + distancesquared = SquareMagnitude( ( data.area.center - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + default: { + distancesquared = SquareMagnitude( ( data.area.center - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + } + if( ( distancesquared < data.rangesquared_min ) + || ( distancesquared >= data.rangesquared_max ) ) { + return; + } + } - auto const &data { Shape.data() }; // setup Bind_Material( data.material ); switch( m_renderpass.draw_mode ) { @@ -1971,6 +2002,9 @@ opengl_renderer::Render( scene::shape_node const &Shape ) { } // render m_geometry.draw( data.geometry ); + // debug data + ++m_debugstats.shapes; + ++m_debugstats.drawcalls; } void @@ -2021,19 +2055,7 @@ opengl_renderer::Render( TAnimModel *Instance ) { bool opengl_renderer::Render( TGroundNode *Node ) { -#ifdef EU07_USE_OLD_TERRAINCODE - switch (Node->iType) - { // obiekty renderowane niezależnie od odległości - case TP_SUBMODEL: - ::glPushMatrix(); - auto const originoffset = Node->pCenter - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - TSubModel::fSquareDist = 0; - Render( Node->smTerrain ); - ::glPopMatrix(); - return true; - } -#endif + double distancesquared; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { @@ -2073,6 +2095,9 @@ opengl_renderer::Render( TGroundNode *Node ) { ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render Render( Node->pTrack ); + // debug + ++m_debugstats.paths; + ++m_debugstats.drawcalls; // post-render cleanup ::glPopMatrix(); return true; @@ -2155,7 +2180,9 @@ opengl_renderer::Render( TGroundNode *Node ) { } // render m_geometry.draw( Node->Piece->geometry ); - + // debug +// ++m_debugstats.lines; +// ++m_debugstats.drawcalls; // post-render cleanup ::glPopMatrix(); @@ -2201,6 +2228,9 @@ opengl_renderer::Render( TGroundNode *Node ) { } // render m_geometry.draw( Node->Piece->geometry ); + // debug + ++m_debugstats.shapes; + ++m_debugstats.drawcalls; // post-render cleanup ::glPopMatrix(); @@ -2236,6 +2266,9 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { if( false == Dynamic->renderme ) { return false; } + // debug data + ++m_debugstats.dynamics; + // setup TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji glm::dvec3 const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); @@ -2437,6 +2470,9 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, float c // render Render( Model->Root ); + // debug data + ++m_debugstats.models; + // post-render cleanup return true; @@ -2468,6 +2504,10 @@ opengl_renderer::Render( TSubModel *Submodel ) { && ( TSubModel::fSquareDist >= Submodel->fSquareMinDist ) && ( TSubModel::fSquareDist < Submodel->fSquareMaxDist ) ) { + // debug data + ++m_debugstats.submodels; + ++m_debugstats.drawcalls; + if( Submodel->iFlags & 0xC000 ) { ::glPushMatrix(); if( Submodel->fMatrix ) @@ -2717,6 +2757,9 @@ opengl_renderer::Render( TTrack *Track ) { return; } + ++m_debugstats.paths; + ++m_debugstats.drawcalls; + switch( m_renderpass.draw_mode ) { case rendermode::color: case rendermode::reflections: { @@ -2867,7 +2910,7 @@ opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_seque ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render // NOTE: we can reuse the method used to draw opaque geometry - for( auto const &shape : cell->m_shapestranslucent ) { Render( shape ); } + for( auto const &shape : cell->m_shapestranslucent ) { Render( shape, false ); } // post-render cleanup ::glPopMatrix(); } @@ -3003,6 +3046,9 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { // render m_geometry.draw( Traction->m_geometry ); + // debug data + ++m_debugstats.traction; + ++m_debugstats.drawcalls; } #endif bool @@ -3056,6 +3102,9 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // render m_geometry.draw( Node->hvTraction->m_geometry ); + // debug data + ++m_debugstats.traction; + ++m_debugstats.drawcalls; // post-render cleanup ::glPopMatrix(); @@ -3116,6 +3165,8 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // render m_geometry.draw( Node->Piece->geometry ); +// ++m_debugstats.lines; +// ++m_debugstats.drawcalls; // post-render cleanup ::glPopMatrix(); @@ -3141,7 +3192,9 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // render m_geometry.draw( Node->Piece->geometry ); - + // debug data + ++m_debugstats.shapes; + ++m_debugstats.drawcalls; // post-render cleanup ::glPopMatrix(); @@ -3285,6 +3338,10 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { && ( TSubModel::fSquareDist >= Submodel->fSquareMinDist ) && ( TSubModel::fSquareDist < Submodel->fSquareMaxDist ) ) { + // debug data + ++m_debugstats.submodels; + ++m_debugstats.drawcalls; + if( Submodel->iFlags & 0xC000 ) { ::glPushMatrix(); if( Submodel->fMatrix ) @@ -3580,10 +3637,10 @@ opengl_renderer::Update( double const Deltatime ) { } m_updateaccumulator = 0.0; - m_framerate = 1000.f / ( m_drawtime / 20.f ); + m_framerate = 1000.f / ( Timer::subsystem.gfx_total.average() ); // adjust draw ranges etc, based on recent performance - auto const framerate = 1000.f / (m_drawtimecolorpass / 20.f); + auto const framerate = 1000.f / Timer::subsystem.gfx_color.average(); float targetfactor; if( framerate > 90.0 ) { targetfactor = 3.0f; } @@ -3620,7 +3677,7 @@ opengl_renderer::Update( double const Deltatime ) { } if( true == DebugModeFlag ) { - m_debuginfo += m_textures.info(); + m_debugtimestext += m_textures.info(); } if( ( true == Global::ControlPicking ) @@ -3639,13 +3696,26 @@ opengl_renderer::Update( double const Deltatime ) { else { m_picksceneryitem = nullptr; } -}; + // dump last opengl error, if any + auto const glerror = ::glGetError(); + if( glerror != GL_NO_ERROR ) { + std::string glerrorstring( ( char * )::gluErrorString( glerror ) ); + win1250_to_ascii( glerrorstring ); + Global::LastGLError = std::to_string( glerror ) + " (" + glerrorstring + ")"; + } +} // debug performance string std::string const & -opengl_renderer::Info() const { +opengl_renderer::info_times() const { - return m_debuginfo; + return m_debugtimestext; +} + +std::string const & +opengl_renderer::info_stats() const { + + return m_debugstatstext; } void diff --git a/renderer.h b/renderer.h index f5e888ad..9879fb93 100644 --- a/renderer.h +++ b/renderer.h @@ -203,7 +203,9 @@ public: Update_Pick_Node(); // debug performance string std::string const & - Info() const; + info_times() const; + std::string const & + info_stats() const; // members GLenum static const sunlight{ GL_LIGHT0 }; @@ -227,6 +229,17 @@ private: diffuse }; + struct debug_stats { + int dynamics { 0 }; + int models { 0 }; + int submodels { 0 }; + int paths { 0 }; + int traction { 0 }; + int shapes { 0 }; + int lines { 0 }; + int drawcalls { 0 }; + }; + #ifdef EU07_USE_OLD_GROUNDCODE using distancesubcell_pair = std::pair< double, TSubRect * >; #else @@ -289,7 +302,7 @@ private: void Render( cell_sequence::iterator First, cell_sequence::iterator Last ); void - Render( scene::shape_node const &Shape ); + Render( scene::shape_node const &Shape, bool const Ignorerange ); void Render( TAnimModel *Instance ); #endif @@ -383,14 +396,12 @@ private: units_state m_unitstate; unsigned int m_framestamp; // id of currently rendered gfx frame - float m_drawtime { 1000.f / 30.f * 20.f }; // start with presumed 'neutral' average of 30 fps - std::chrono::steady_clock::time_point m_drawstart; // cached start time of previous frame float m_framerate; - float m_drawtimecolorpass { 1000.f / 30.f * 20.f }; - float m_drawtimeshadowpass { 0.f }; double m_updateaccumulator { 0.0 }; - std::string m_debuginfo; + std::string m_debugtimestext; std::string m_pickdebuginfo; + debug_stats m_debugstats; + std::string m_debugstatstext; glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; glm::vec4 m_shadowcolor { 0.65f, 0.65f, 0.65f, 1.f }; diff --git a/scene.cpp b/scene.cpp index 2dfb70da..2fa1783d 100644 --- a/scene.cpp +++ b/scene.cpp @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "scene.h" #include "globals.h" +#include "timer.h" #include "renderer.h" #include "logs.h" @@ -19,12 +20,32 @@ namespace scene { // legacy method, updates sounds and polls event launchers within radius around specified point void basic_cell::update() { -/* - // renderowanie obiektów aktywnych a niewidocznych - for( auto node = subcell->nRenderHidden; node; node = node->nNext3 ) { - node->RenderHidden(); + + // sounds + auto const deltatime = Timer::GetDeltaTime(); + for( auto *sound : m_sounds ) { + + if( ( sound->GetStatus() & DSBSTATUS_PLAYING ) == DSBPLAY_LOOPING ) { + sound->Play( 1, DSBPLAY_LOOPING, true, sound->vSoundPosition ); + sound->AdjFreq( 1.0, deltatime ); + } } -*/ + // event launchers + for( auto *launcher : m_eventlaunchers ) { + if( ( true == launcher->check_conditions() ) + && ( SquareMagnitude( launcher->location() - Global::pCameraPosition ) < launcher->dRadius ) ) { + + WriteLog( "Eventlauncher " + launcher->name() ); + if( ( true == Global::shiftState ) + && ( launcher->Event2 != nullptr ) ) { + simulation::Events.AddToQuery( launcher->Event2, nullptr ); + } + else if( launcher->Event1 ) { + simulation::Events.AddToQuery( launcher->Event1, nullptr ); + } + } + } + // TBD, TODO: move to sound renderer for( auto *path : m_paths ) { // dźwięki pojazdów, również niewidocznych @@ -32,6 +53,83 @@ basic_cell::update() { } } +// legacy method, finds and assigns traction piece to specified pantograph of provided vehicle +void +basic_cell::update_traction( TDynamicObject *Vehicle, int const Pantographindex ) { + // Winger 170204 - szukanie trakcji nad pantografami + auto const vFront = glm::make_vec3( Vehicle->VectorFront().getArray() ); // wektor normalny dla płaszczyzny ruchu pantografu + auto const vUp = glm::make_vec3( Vehicle->VectorUp().getArray() ); // wektor pionu pudła (pochylony od pionu na przechyłce) + auto const vLeft = glm::make_vec3( Vehicle->VectorLeft().getArray() ); // wektor odległości w bok (odchylony od poziomu na przechyłce) + auto const position = glm::dvec3 { Vehicle->GetPosition() }; // współrzędne środka pojazdu + + auto pantograph = Vehicle->pants[ Pantographindex ].fParamPants; + auto const pantographposition = position + ( vLeft * pantograph->vPos.z ) + ( vUp * pantograph->vPos.y ) + ( vFront * pantograph->vPos.x ); + + for( auto *traction : m_traction ) { + + // współczynniki równania parametrycznego + auto const paramfrontdot = glm::dot( traction->vParametric, vFront ); + auto const fRaParam = + -( glm::dot( traction->pPoint1, vFront ) - glm::dot( pantographposition, vFront ) ) + / ( paramfrontdot != 0.0 ? + paramfrontdot : + 0.001 ); // div0 trap + + if( ( fRaParam < -0.001 ) + || ( fRaParam > 1.001 ) ) { continue; } + // jeśli tylko jest w przedziale, wyznaczyć odległość wzdłuż wektorów vUp i vLeft + // punkt styku płaszczyzny z drutem (dla generatora łuku el.) + auto const vStyk = traction->pPoint1 + fRaParam * traction->vParametric; + // wektor musi się mieścić w przedziale ruchu pantografu + auto const vGdzie = vStyk - pantographposition; + auto fVertical = glm::dot( vGdzie, vUp ); + if( fVertical >= 0.0 ) { + // jeśli ponad pantografem (bo może łapać druty spod wiaduktu) + auto const fHorizontal = std::abs( glm::dot( vGdzie, vLeft ) ) - pantograph->fWidth; + + if( ( Global::bEnableTraction ) + && ( fVertical < pantograph->PantWys - 0.15 ) ) { + // jeśli drut jest niżej niż 15cm pod ślizgiem przełączamy w tryb połamania, o ile jedzie; + // (bEnableTraction) aby dało się jeździć na koślawych sceneriach + // i do tego jeszcze wejdzie pod ślizg + if( fHorizontal <= 0.0 ) { + // 0.635 dla AKP-1 AKP-4E + pantograph->PantWys = -1.0; // ujemna liczba oznacza połamanie + pantograph->hvPowerWire = nullptr; // bo inaczej się zasila w nieskończoność z połamanego + if( Vehicle->MoverParameters->EnginePowerSource.CollectorParameters.CollectorsNo > 0 ) { + // liczba pantografów teraz będzie mniejsza + --Vehicle->MoverParameters->EnginePowerSource.CollectorParameters.CollectorsNo; + } + if( DebugModeFlag ) { + ErrorLog( "Bad traction: " + Vehicle->name() + " broke pantograph at " + to_string( pantographposition ) ); + } + } + } + else if( fVertical < pantograph->PantTraction ) { + // ale niżej, niż poprzednio znaleziony + if( fHorizontal <= 0.0 ) { + // 0.635 dla AKP-1 AKP-4E + // to się musi mieścić w przedziale zaleznym od szerokości pantografu + pantograph->hvPowerWire = traction; // jakiś znaleziony + pantograph->PantTraction = fVertical; // zapamiętanie nowej wysokości + } + else if( fHorizontal < pantograph->fWidthExtra ) { + // czy zmieścił się w zakresie nabieżnika? problem jest, gdy nowy drut jest wyżej, + // wtedy pantograf odłącza się od starego, a na podniesienie do nowego potrzebuje czasu + // korekta wysokości o nabieżnik - drut nad nabieżnikiem jest geometrycznie jakby nieco wyżej + fVertical += 0.15 * fHorizontal / pantograph->fWidthExtra; + if( fVertical < pantograph->PantTraction ) { + // gdy po korekcie jest niżej, niż poprzednio znaleziony + // gdyby to wystarczyło, to możemy go uznać + pantograph->hvPowerWire = traction; // może być + pantograph->PantTraction = fVertical; // na razie liniowo na nabieżniku, dokładność poprawi się później + } + } + } + } + } +} + // adds provided shape to the cell void basic_cell::insert( shape_node Shape ) { @@ -107,18 +205,48 @@ basic_cell::insert( TAnimModel *Instance ) { } } +// adds provided sound instance to the cell +void +basic_cell::insert( TTextSound *Sound ) { + + m_active = true; + + m_sounds.emplace_back( Sound ); +} + +// adds provided sound instance to the cell +void +basic_cell::insert( TEventLauncher *Launcher ) { + + m_active = true; + + m_eventlaunchers.emplace_back( Launcher ); +} + // registers provided path in the lookup directory of the cell void basic_cell::register_end( TTrack *Path ) { - m_directories.paths.emplace( Path ); + m_directories.paths.emplace_back( Path ); + // eliminate potential duplicates + m_directories.paths.erase( + std::unique( + std::begin( m_directories.paths ), + std::end( m_directories.paths ) ), + std::end( m_directories.paths ) ); } // registers provided traction piece in the lookup directory of the cell void basic_cell::register_end( TTraction *Traction ) { - m_directories.traction.emplace( Traction ); + m_directories.traction.emplace_back( Traction ); + // eliminate potential duplicates + m_directories.traction.erase( + std::unique( + std::begin( m_directories.traction ), + std::end( m_directories.traction ) ), + std::end( m_directories.traction ) ); } // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance @@ -263,6 +391,29 @@ basic_section::update( glm::dvec3 const &Location, float const Radius ) { } } +// legacy method, finds and assigns traction piece(s) to pantographs of provided vehicle +void +basic_section::update_traction( TDynamicObject *Vehicle, int const Pantographindex ) { + + auto const vFront = glm::make_vec3( Vehicle->VectorFront().getArray() ); // wektor normalny dla płaszczyzny ruchu pantografu + auto const vUp = glm::make_vec3( Vehicle->VectorUp().getArray() ); // wektor pionu pudła (pochylony od pionu na przechyłce) + auto const vLeft = glm::make_vec3( Vehicle->VectorLeft().getArray() ); // wektor odległości w bok (odchylony od poziomu na przechyłce) + auto const position = glm::dvec3{ Vehicle->GetPosition() }; // współrzędne środka pojazdu + + auto pantograph = Vehicle->pants[ Pantographindex ].fParamPants; + auto const pantographposition = position + ( vLeft * pantograph->vPos.z ) + ( vUp * pantograph->vPos.y ) + ( vFront * pantograph->vPos.x ); + + auto const radius { 0.0 }; // { EU07_CELLSIZE * 0.5 }; // experimentally limited, check if it has any negative effect + auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) + radius, 2 ) }; + + for( auto &cell : m_cells ) { + // we reject early cells which aren't within our area of interest + if( glm::length2( cell.area().center - pantographposition ) < squaredradii ) { + cell.update_traction( Vehicle, Pantographindex ); + } + } +} + // adds provided shape to the section void basic_section::insert( shape_node Shape ) { @@ -289,47 +440,6 @@ basic_section::insert( shape_node Shape ) { } } -// adds provided path to the section -void -basic_section::insert( TTrack *Path ) { - - // pass the node to the appropriate partitioning cell - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - cell( Path->location() ).insert( Path ); -} - -// adds provided path to the section -void -basic_section::insert( TTraction *Traction ) { - - // pass the node to the appropriate partitioning cell - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - cell( Traction->location() ).insert( Traction ); -} - -// adds provided model instance to the section -void -basic_section::insert( TAnimModel *Instance ) { - - // pass the node to the appropriate partitioning cell - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - cell( Instance->location() ).insert( Instance ); -} - -// registers specified end point of the provided path in the lookup directory of the region -void -basic_section::register_end( TTrack *Path, glm::dvec3 const &Point ) { - - cell( Point ).register_end( Path ); -} - -// registers specified end point of the provided traction piece in the lookup directory of the region -void -basic_section::register_end( TTraction *Traction, glm::dvec3 const &Point ) { - - cell( Point ).register_end( Traction ); -} - // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance std::tuple basic_section::find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ) { @@ -467,26 +577,11 @@ basic_section::cell( glm::dvec3 const &Location ) { basic_region::basic_region() { m_sections.fill( nullptr ); -/* - // initialize centers of sections: - // calculate center of 'top left' region section... - auto const centeroffset = -( EU07_REGIONSIDESECTIONCOUNT / 2 * EU07_SECTIONSIZE ) + EU07_SECTIONSIZE / 2; - glm::dvec3 regioncornercenter { centeroffset, 0, centeroffset }; - auto row { 0 }, column { 0 }; - // ...move through section array assigning centers left to right, front/top to back/bottom - for( auto §ion : m_sections ) { - section.center( regioncornercenter + glm::dvec3{ column * EU07_SECTIONSIZE, 0.0, row * EU07_SECTIONSIZE } ); - if( ++column >= EU07_REGIONSIDESECTIONCOUNT ) { - ++row; - column = 0; - } - } -*/ } basic_region::~basic_region() { - for( auto section : m_sections ) { if( section != nullptr ) { delete section; } } + for( auto *section : m_sections ) { if( section != nullptr ) { delete section; } } } // legacy method, updates sounds and polls event launchers around camera @@ -500,6 +595,25 @@ basic_region::update() { } } +// legacy method, finds and assigns traction piece(s) to pantographs of provided vehicle +void +basic_region::update_traction( TDynamicObject *Vehicle, int const Pantographindex ) { + // TODO: convert vectors to transformation matrix and pass them down the chain along with calculated position + auto const vFront = glm::make_vec3( Vehicle->VectorFront().getArray() ); // wektor normalny dla płaszczyzny ruchu pantografu + auto const vUp = glm::make_vec3( Vehicle->VectorUp().getArray() ); // wektor pionu pudła (pochylony od pionu na przechyłce) + auto const vLeft = glm::make_vec3( Vehicle->VectorLeft().getArray() ); // wektor odległości w bok (odchylony od poziomu na przechyłce) + auto const position = glm::dvec3 { Vehicle->GetPosition() }; // współrzędne środka pojazdu + + auto p = Vehicle->pants[ Pantographindex ].fParamPants; + auto const pant0 = position + ( vLeft * p->vPos.z ) + ( vUp * p->vPos.y ) + ( vFront * p->vPos.x ); + p->PantTraction = std::numeric_limits::max(); // taka za duża wartość + + auto const §ionlist = sections( pant0, 0.0 ); + for( auto *section : sectionlist ) { + section->update_traction( Vehicle, Pantographindex ); + } +} + void basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad ) { @@ -566,15 +680,15 @@ void basic_region::insert_path( TTrack *Path, scratch_data &Scratchpad ) { // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto center = Path->location(); + auto location = Path->location(); - if( point_inside( center ) ) { + if( point_inside( location ) ) { // NOTE: nodes placed outside of region boundaries are discarded - section( center ).insert( Path ); + section( location ).insert( Path ); } else { // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: track node \"" + Path->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); + ErrorLog( "Bad scenario: track node \"" + Path->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); } // also register path ends in appropriate sections, for path merging lookups // TODO: clean this up during track refactoring @@ -588,15 +702,15 @@ void basic_region::insert_traction( TTraction *Traction, scratch_data &Scratchpad ) { // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto center = Traction->location(); + auto location = Traction->location(); - if( point_inside( center ) ) { + if( point_inside( location ) ) { // NOTE: nodes placed outside of region boundaries are discarded - section( center ).insert( Traction ); + section( location ).insert( Traction ); } else { // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: traction node \"" + Traction->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); + ErrorLog( "Bad scenario: traction node \"" + Traction->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); } // also register traction ends in appropriate sections, for path merging lookups // TODO: clean this up during track refactoring @@ -610,15 +724,15 @@ void basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) { // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto center = Instance->location(); + auto location = Instance->location(); - if( point_inside( center ) ) { + if( point_inside( location ) ) { // NOTE: nodes placed outside of region boundaries are discarded - section( center ).insert( Instance ); + section( location ).insert( Instance ); } else { // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: model node \"" + Instance->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); + ErrorLog( "Bad scenario: model node \"" + Instance->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); } } @@ -626,20 +740,34 @@ basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) void basic_region::insert_sound( TTextSound *Sound, scratch_data &Scratchpad ) { -/* - // TODO: implement // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto center = Sound->location(); + auto location = Sound->location(); - if( point_inside( center ) ) { + if( point_inside( location ) ) { // NOTE: nodes placed outside of region boundaries are discarded - section( center ).insert( Instance ); + section( location ).insert( Sound ); } else { // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: model node \"" + Instance->name() + "\" placed in location outside region bounds (" + to_string( center ) + ")" ); + ErrorLog( "Bad scenario: sound node \"" + Sound->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); + } +} + +// inserts provided event launcher in the region +void +basic_region::insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpad ) { + + // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done + auto location = Launcher->location(); + + if( point_inside( location ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + section( location ).insert( Launcher ); + } + else { + // tracks are guaranteed to hava a name so we can skip the check + ErrorLog( "Bad scenario: event launcher \"" + Launcher->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); } -*/ } // find a vehicle located neares to specified location, within specified radius, optionally discarding vehicles without drivers @@ -757,7 +885,7 @@ void basic_region::register_path( TTrack *Path, glm::dvec3 const &Point ) { if( point_inside( Point ) ) { - section( Point ).register_end( Path, Point ); + section( Point ).register_node( Path, Point ); } } @@ -766,7 +894,7 @@ void basic_region::register_traction( TTraction *Traction, glm::dvec3 const &Point ) { if( point_inside( Point ) ) { - section( Point ).register_end( Traction, Point ); + section( Point ).register_node( Traction, Point ); } } diff --git a/scene.h b/scene.h index 1ccd42ba..05cfa1d3 100644 --- a/scene.h +++ b/scene.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include +#include #include "parser.h" #include "openglgeometrybank.h" @@ -24,7 +25,7 @@ namespace scene { int const EU07_CELLSIZE = 250; int const EU07_SECTIONSIZE = 1000; -int const EU07_REGIONSIDESECTIONCOUNT = 500; // number of 1km sections along a side of square region +int const EU07_REGIONSIDESECTIONCOUNT = 500; // number of sections along a side of square region struct scratch_data { @@ -42,6 +43,8 @@ struct scratch_data { TDynamicObject * driver { nullptr }; bool is_open { false }; } trainset; + + bool initialized { false }; }; // basic element of rudimentary partitioning scheme for the section. fixed size, no further subdivision @@ -55,6 +58,9 @@ public: // legacy method, updates sounds and polls event launchers within radius around specified point void update(); + // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle + void + update_traction( TDynamicObject *Vehicle, int const Pantographindex ); // adds provided shape to the cell void insert( shape_node Shape ); @@ -67,6 +73,12 @@ public: // adds provided model instance to the cell void insert( TAnimModel *Instance ); + // adds provided sound instance to the cell + void + insert( TTextSound *Sound ); + // adds provided event launcher to the cell + void + insert( TEventLauncher *Launcher ); // registers provided path in the lookup directory of the cell void register_end( TTrack *Path ); @@ -100,10 +112,12 @@ private: // types using shapenode_sequence = std::vector; using path_sequence = std::vector; - using path_set = std::set; +// using path_set = std::unordered_set; using traction_sequence = std::vector; - using traction_set = std::set; +// using traction_set = std::unordered_set; using instance_sequence = std::vector; + using sound_sequence = std::vector; + using eventlauncher_sequence = std::vector; // members scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) }; bool m_active { false }; // whether the cell holds any actual data @@ -114,10 +128,12 @@ private: instance_sequence m_instancesopaque; instance_sequence m_instancetranslucent; traction_sequence m_traction; + sound_sequence m_sounds; + eventlauncher_sequence m_eventlaunchers; // search helpers struct lookup_data { - path_set paths; - traction_set traction; + path_sequence paths; + traction_sequence traction; } m_directories; }; @@ -131,24 +147,22 @@ public: // legacy method, updates sounds and polls event launchers within radius around specified point void update( glm::dvec3 const &Location, float const Radius ); + // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle + void + update_traction( TDynamicObject *Vehicle, int const Pantographindex ); // adds provided shape to the section void insert( shape_node Shape ); - // adds provided path to the section + // adds provided node to the section + template void - insert( TTrack *Path ); - // adds provided path to the section + insert( Type_ *Node ) { + cell( Node->location() ).insert( Node ); } + // registers provided node in the lookup directory of the section enclosing specified point + template void - insert( TTraction *Traction ); - // adds provided model instance to the section - void - insert( TAnimModel *Instance ); - // registers specified end point of the provided path in the lookup directory of the region - void - register_end( TTrack *Path, glm::dvec3 const &Point ); - // registers specified end point of the provided traction piece in the lookup directory of the region - void - register_end( TTraction *Traction, glm::dvec3 const &Point ); + register_node( Type_ *Node, glm::dvec3 const &Point ) { + cell( Point ).register_end( Node ); } // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance std::tuple find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ); @@ -206,6 +220,9 @@ public: // legacy method, updates sounds and polls event launchers around camera void update(); + // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle + void + update_traction( TDynamicObject *Vehicle, int const Pantographindex ); // inserts provided shape in the region void insert_shape( shape_node Shape, scratch_data &Scratchpad ); @@ -221,6 +238,9 @@ public: // inserts provided sound in the region void insert_sound( TTextSound *Sound, scratch_data &Scratchpad ); + // inserts provided event launcher in the region + void + insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpad ); // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance std::tuple find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ); diff --git a/scenenode.h b/scenenode.h index ea4e029f..99e44f23 100644 --- a/scenenode.h +++ b/scenenode.h @@ -26,8 +26,8 @@ struct lighting_data { inline bool operator==( lighting_data const &Left, lighting_data const &Right ) { - return ( ( Left.diffuse == Right.diffuse ) - && ( Left.ambient == Right.ambient ) + return ( ( Left.diffuse == Right.diffuse ) + && ( Left.ambient == Right.ambient ) && ( Left.specular == Right.specular ) ); } inline diff --git a/simulation.cpp b/simulation.cpp index 843d23b1..0d0415d6 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -43,8 +43,8 @@ state_manager::deserialize( std::string const &Scenariofile ) { if( false == scenarioparser.ok() ) { return false; } deserialize( scenarioparser ); - // TODO: initialize links between loaded nodes + Global::iPause &= ~0x10; // koniec pauzy wczytywania return true; } @@ -126,6 +126,11 @@ state_manager::deserialize( cParser &Input ) { token = Input.getToken(); } + + if( false == importscratchpad.initialized ) { + // manually perform scenario initialization + deserialize_firstinit( Input, importscratchpad ); + } } void @@ -247,11 +252,15 @@ state_manager::deserialize_event( cParser &Input, scene::scratch_data &Scratchpa void state_manager::deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ) { - // TODO: implement + if( true == Scratchpad.initialized ) { return; } + simulation::Paths.InitTracks(); simulation::Traction.InitTraction(); simulation::Events.InitEvents(); + simulation::Events.InitLaunchers(); simulation::Memory.InitCells(); + + Scratchpad.initialized = true; } void @@ -283,7 +292,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == simulation::Vehicles.insert( vehicle ) ) { - ErrorLog( "Bad scenario: vehicle with duplicate name, \"" + vehicle->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: vehicle with duplicate name \"" + vehicle->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } if( ( vehicle->MoverParameters->CategoryFlag == 1 ) // trains only @@ -303,7 +312,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad simulation::Region->insert_path( path, Scratchpad ); } else { - ErrorLog( "Bad scenario: track with duplicate name, \"" + path->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: track with duplicate name \"" + path->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); /* delete path; delete pathnode; @@ -320,7 +329,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad simulation::Region->insert_traction( traction, Scratchpad ); } else { - ErrorLog( "Bad scenario: traction piece with duplicate name, \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: traction piece with duplicate name \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } } else if( nodedata.type == "tractionpowersource" ) { @@ -336,7 +345,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad */ } else { - ErrorLog( "Bad scenario: power grid source with duplicate name, \"" + powersource->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: power grid source with duplicate name \"" + powersource->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } } else if( nodedata.type == "model" ) { @@ -355,7 +364,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad simulation::Region->insert_instance( instance, Scratchpad ); } else { - ErrorLog( "Bad scenario: 3d model instance with duplicate name, \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: 3d model instance with duplicate name \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } } } @@ -382,12 +391,25 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad */ } else { - ErrorLog( "Bad scenario: memory cell with duplicate name, \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: memory cell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } } else if( nodedata.type == "eventlauncher" ) { - // TODO: implement - skip_until( Input, "end" ); + + auto *eventlauncher{ deserialize_eventlauncher( Input, Scratchpad, nodedata ) }; + if( simulation::Events.insert( eventlauncher ) ) { + // event launchers can be either global, or local with limited range of activation + // each gets assigned different caretaker + if( true == eventlauncher->IsGlobal() ) { + simulation::Events.queue( eventlauncher ); + } + else { + simulation::Region->insert_launcher( eventlauncher, Scratchpad ); + } + } + else { + ErrorLog( "Bad scenario: event launcher with duplicate name \"" + eventlauncher->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } } else if( nodedata.type == "sound" ) { @@ -396,7 +418,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad simulation::Region->insert_sound( sound, Scratchpad ); } else { - ErrorLog( "Bad scenario: sound node with duplicate name, \"" + sound->m_name + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->m_name + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } } @@ -604,6 +626,23 @@ state_manager::deserialize_memorycell( cParser &Input, scene::scratch_data &Scra return memorycell; } +TEventLauncher * +state_manager::deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + glm::dvec3 location; + Input.getTokens( 3 ); + Input + >> location.x + >> location.y + >> location.z; + + auto *eventlauncher = new TEventLauncher( Nodedata ); + eventlauncher->Load( &Input ); + eventlauncher->location( transform( location, Scratchpad ) ); + + return eventlauncher; +} + TAnimModel * state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { diff --git a/simulation.h b/simulation.h index 781785d4..14740ecd 100644 --- a/simulation.h +++ b/simulation.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "scene.h" #include "event.h" #include "memcell.h" +#include "evlaunch.h" #include "track.h" #include "traction.h" #include "tractionpower.h" @@ -60,6 +61,7 @@ private: TTraction * deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TTractionPowerSource * deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TMemCell * deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TEventLauncher * deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TAnimModel * deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TDynamicObject * deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TTextSound * deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); From 630b9ecf1bac0efb25f86a79ac6346b35f3d7eac Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 15 Oct 2017 01:06:40 +0200 Subject: [PATCH 201/426] track rendering optimization, application messaging routines moved to separate namespace --- Ground.cpp | 237 +----------- Ground.h | 48 +-- Names.h | 2 + Track.cpp | 16 +- Track.h | 1 + World.cpp | 83 +++-- World.h | 4 +- maszyna.vcxproj.filters | 6 + messaging.cpp | 245 ++++++++++++ messaging.h | 50 +++ renderer.cpp | 809 ++++++++++++++++++++++------------------ renderer.h | 10 +- scene.cpp | 4 + simulation.cpp | 16 +- windows.cpp | 2 +- 15 files changed, 860 insertions(+), 673 deletions(-) create mode 100644 messaging.cpp create mode 100644 messaging.h diff --git a/Ground.cpp b/Ground.cpp index 4ccef2ef..b5f14519 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "Ground.h" #include "Globals.h" +#include "messaging.h" #include "Logs.h" #include "usefull.h" #include "Timer.h" @@ -610,10 +611,10 @@ TGround::DynamicList(bool all) // powtarzać!) for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) if (all || Current->DynamicObject->Mechanik) - WyslijString(Current->asName, 6); // same nazwy pojazdów - WyslijString("none", 6); // informacja o końcu listy + multiplayer::WyslijString(Current->asName, 6); // same nazwy pojazdów + multiplayer::WyslijString("none", 6); // informacja o końcu listy }; - +#ifdef EU07_USE_OLD_GROUNDCODE // wyszukiwanie obiektu o podanej nazwie i konkretnym typie TGroundNode * TGround::FindGroundNode(std::string const &asNameToFind, TGroundNodeType const iNodeType) { @@ -632,7 +633,7 @@ TGround::FindGroundNode(std::string const &asNameToFind, TGroundNodeType const i } return nullptr; } - +#endif TGroundRect * TGround::GetRect( double x, double z ) { @@ -3154,7 +3155,7 @@ bool TGround::CheckQuery() // loc.Z= tmpEvent->Params[8].nGroundNode->pCenter.y; if (Global::iMultiplayer) // potwierdzenie wykonania dla serwera (odczyt // semafora już tak nie działa) - WyslijEvent(tmpEvent->asName, tmpEvent->Activator->name()); + multiplayer::WyslijEvent(tmpEvent->asName, tmpEvent->Activator->name()); // tmpEvent->Params[9].asMemCell->PutCommand(tmpEvent->Activator->Mechanik,loc); tmpEvent->Params[9].asMemCell->PutCommand( tmpEvent->Activator->Mechanik, &tmpEvent->Params[8].nGroundNode->pCenter); @@ -3244,7 +3245,7 @@ bool TGround::CheckQuery() tmpEvent->Params[1].asdouble, tmpEvent->Params[2].asdouble); if (Global::iMultiplayer) // dajemy znać do serwera o przełożeniu - WyslijEvent(tmpEvent->asName, ""); // wysłanie nazwy eventu przełączajacego + multiplayer::WyslijEvent(tmpEvent->asName, ""); // wysłanie nazwy eventu przełączajacego // Ra: bardziej by się przydała nazwa toru, ale nie ma do niej stąd dostępu break; case tp_TrackVel: @@ -3287,9 +3288,9 @@ bool TGround::CheckQuery() 0) // jednoznaczne tylko, gdy nie było else { if (tmpEvent->Activator) - WyslijEvent(tmpEvent->asName, tmpEvent->Activator->name()); + multiplayer::WyslijEvent(tmpEvent->asName, tmpEvent->Activator->name()); else - WyslijEvent(tmpEvent->asName, ""); + multiplayer::WyslijEvent(tmpEvent->asName, ""); } } } @@ -3755,214 +3756,6 @@ bool TGround::GetTraction(TDynamicObject *model) return true; }; #endif -#ifdef _WINDOWS -//--------------------------------------------------------------------------- -void TGround::Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) -{ // wysłanie komunikatu do sterującego - HWND h = FindWindow(ClassName.c_str(), 0); // można by to zapamiętać - if (h == 0) - h = FindWindow(0, ClassName.c_str()); // można by to zapamiętać - SendMessage(h, Msg, wParam, lParam); -}; -//-------------------------------- -void TGround::WyslijEvent(const std::string &e, const std::string &d) -{ // Ra: jeszcze do wyczyszczenia - DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); - r.iComm = 2; // 2 - event - size_t i = e.length(), j = d.length(); - r.cString[0] = char(i); - strcpy(r.cString + 1, e.c_str()); // zakończony zerem - r.cString[i + 2] = char(j); // licznik po zerze kończącym - strcpy(r.cString + 3 + i, d.c_str()); // zakończony zerem - COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura - cData.cbData = (DWORD)(12 + i + j); // 8+dwa liczniki i dwa zera kończące - cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); - CommLog( Now() + " " + std::to_string(r.iComm) + " " + e + " sent" ); -}; -//--------------------------------------------------------------------------- -void TGround::WyslijUszkodzenia(const std::string &t, char fl) -{ // wysłanie informacji w postaci pojedynczego tekstu - DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); - r.iComm = 13; // numer komunikatu - size_t i = t.length(); - r.cString[0] = char(fl); - r.cString[1] = char(i); - strcpy(r.cString + 2, t.c_str()); // z zerem kończącym - COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura - cData.cbData = (DWORD)(11 + i); // 8+licznik i zero kończące - cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); - CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); -}; -//--------------------------------------------------------------------------- -void TGround::WyslijString(const std::string &t, int n) -{ // wysłanie informacji w postaci pojedynczego tekstu - DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); - r.iComm = n; // numer komunikatu - size_t i = t.length(); - r.cString[0] = char(i); - strcpy(r.cString + 1, t.c_str()); // z zerem kończącym - COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura - cData.cbData = (DWORD)(10 + i); // 8+licznik i zero kończące - cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); - CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); -}; -//--------------------------------------------------------------------------- -void TGround::WyslijWolny(const std::string &t) -{ // Ra: jeszcze do wyczyszczenia - WyslijString(t, 4); // tor wolny -}; -//-------------------------------- -void TGround::WyslijNamiary(TGroundNode *t) -{ // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby - // WriteLog("Wysylam pojazd"); - DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); - r.iComm = 7; // 7 - dane pojazdu - int i = 32; - size_t j = t->asName.length(); - r.iPar[0] = i; // ilość danych liczbowych - r.fPar[1] = Global::fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) - r.fPar[2] = t->DynamicObject->MoverParameters->Loc.X; // pozycja X - r.fPar[3] = t->DynamicObject->MoverParameters->Loc.Y; // pozycja Y - r.fPar[4] = t->DynamicObject->MoverParameters->Loc.Z; // pozycja Z - r.fPar[5] = t->DynamicObject->MoverParameters->V; // prędkość ruchu X - r.fPar[6] = t->DynamicObject->MoverParameters->nrot * M_PI * - t->DynamicObject->MoverParameters->WheelDiameter; // prędkość obrotowa kóŁ - r.fPar[7] = 0; // prędkość ruchu Z - r.fPar[8] = t->DynamicObject->MoverParameters->AccS; // przyspieszenie X - r.fPar[9] = t->DynamicObject->MoverParameters->AccN; // przyspieszenie Y //na razie nie - r.fPar[10] = t->DynamicObject->MoverParameters->AccV; // przyspieszenie Z - r.fPar[11] = t->DynamicObject->MoverParameters->DistCounter; // przejechana odległość w km - r.fPar[12] = t->DynamicObject->MoverParameters->PipePress; // ciśnienie w PG - r.fPar[13] = t->DynamicObject->MoverParameters->ScndPipePress; // ciśnienie w PZ - r.fPar[14] = t->DynamicObject->MoverParameters->BrakePress; // ciśnienie w CH - r.fPar[15] = t->DynamicObject->MoverParameters->Compressor; // ciśnienie w ZG - r.fPar[16] = t->DynamicObject->MoverParameters->Itot; // Prąd całkowity - r.iPar[17] = t->DynamicObject->MoverParameters->MainCtrlPos; // Pozycja NJ - r.iPar[18] = t->DynamicObject->MoverParameters->ScndCtrlPos; // Pozycja NB - r.iPar[19] = t->DynamicObject->MoverParameters->MainCtrlActualPos; // Pozycja jezdna - r.iPar[20] = t->DynamicObject->MoverParameters->ScndCtrlActualPos; // Pozycja bocznikowania - r.iPar[21] = t->DynamicObject->MoverParameters->ScndCtrlActualPos; // Pozycja bocznikowania - r.iPar[22] = t->DynamicObject->MoverParameters->ResistorsFlag * 1 + - t->DynamicObject->MoverParameters->ConverterFlag * 2 + - +t->DynamicObject->MoverParameters->CompressorFlag * 4 + - t->DynamicObject->MoverParameters->Mains * 8 + - +t->DynamicObject->MoverParameters->DoorLeftOpened * 16 + - t->DynamicObject->MoverParameters->DoorRightOpened * 32 + - +t->DynamicObject->MoverParameters->FuseFlag * 64 + - t->DynamicObject->MoverParameters->DepartureSignal * 128; - // WriteLog("Zapisalem stare"); - // WriteLog("Mam patykow "+IntToStr(t->DynamicObject->iAnimType[ANIM_PANTS])); - for (int p = 0; p < 4; p++) - { - // WriteLog("Probuje pant "+IntToStr(p)); - if (p < t->DynamicObject->iAnimType[ANIM_PANTS]) - { - r.fPar[23 + p] = t->DynamicObject->pants[p].fParamPants->PantWys; // stan pantografów 4 - // WriteLog("Zapisalem pant "+IntToStr(p)); - } - else - { - r.fPar[23 + p] = -2; - // WriteLog("Nie mam pant "+IntToStr(p)); - } - } - // WriteLog("Zapisalem pantografy"); - for (int p = 0; p < 3; p++) - r.fPar[27 + p] = - t->DynamicObject->MoverParameters->ShowCurrent(p + 1); // amperomierze kolejnych grup - // WriteLog("zapisalem prady"); - r.iPar[30] = t->DynamicObject->MoverParameters->WarningSignal; // trabienie - r.fPar[31] = t->DynamicObject->MoverParameters->RunningTraction.TractionVoltage; // napiecie WN - // WriteLog("Parametry gotowe"); - i <<= 2; // ilość bajtów - r.cString[i] = char(j); // na końcu nazwa, żeby jakoś zidentyfikować - strcpy(r.cString + i + 1, t->asName.c_str()); // zakończony zerem - COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura - cData.cbData = (DWORD)(10 + i + j); // 8+licznik i zero kończące - cData.lpData = &r; - // WriteLog("Ramka gotowa"); - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); - // WriteLog("Ramka poszla!"); - CommLog( Now() + " " + std::to_string(r.iComm) + " " + t->asName + " sent"); -}; -// -void TGround::WyslijObsadzone() -{ // wysłanie informacji o pojeździe - DaneRozkaz2 r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); - r.iComm = 12; // kod 12 - for (int i=0; i<1984; ++i) r.cString[i] = 0; - - int i = 0; - for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) - if (Current->DynamicObject->Mechanik) - { - strcpy(r.cString + 64 * i, Current->DynamicObject->asName.c_str()); - r.fPar[16 * i + 4] = Current->DynamicObject->GetPosition().x; - r.fPar[16 * i + 5] = Current->DynamicObject->GetPosition().y; - r.fPar[16 * i + 6] = Current->DynamicObject->GetPosition().z; - r.iPar[16 * i + 7] = Current->DynamicObject->Mechanik->GetAction(); - strcpy(r.cString + 64 * i + 32, Current->DynamicObject->GetTrack()->IsolatedName().c_str()); - strcpy(r.cString + 64 * i + 48, Current->DynamicObject->Mechanik->Timetable()->TrainName.c_str()); - i++; - if (i>30) break; - } - while (i <= 30) - { - strcpy(r.cString + 64 * i, "none"); - r.fPar[16 * i + 4] = 1; - r.fPar[16 * i + 5] = 2; - r.fPar[16 * i + 6] = 3; - r.iPar[16 * i + 7] = 0; - strcpy(r.cString + 64 * i + 32, "none"); - strcpy(r.cString + 64 * i + 48, "none"); - i++; - } - - COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura - cData.cbData = 8 + 1984; // 8+licznik i zero kończące - cData.lpData = &r; - // WriteLog("Ramka gotowa"); - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); - CommLog( Now() + " " + std::to_string(r.iComm) + " obsadzone" + " sent"); -} - -//-------------------------------- -void TGround::WyslijParam(int nr, int fl) -{ // wysłanie parametrów symulacji w ramce (nr) z flagami (fl) - DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); - r.iComm = nr; // zwykle 5 - r.iPar[0] = fl; // flagi istotności kolejnych parametrów - int i = 0; // domyślnie brak danych - switch (nr) - { // można tym przesyłać różne zestawy parametrów - case 5: // czas i pauza - r.fPar[1] = Global::fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) - r.iPar[2] = Global::iPause; // stan zapauzowania - i = 8; // dwa parametry po 4 bajty każdy - break; - } - COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura - cData.cbData = 12 + i; // 12+rozmiar danych - cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); -}; -#endif - //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -4165,7 +3958,7 @@ void TGround::TrackBusyList() for (Current = nRootOfType[TP_TRACK]; Current; Current = Current->nNext) if (!Current->asName.empty()) // musi być nazwa if( false == Current->pTrack->Dynamics.empty() ) - WyslijString(Current->asName, 8); // zajęty + multiplayer::WyslijString(Current->asName, 8); // zajęty }; //--------------------------------------------------------------------------- @@ -4174,10 +3967,10 @@ void TGround::IsolatedBusyList() TIsolated *Current; for (Current = TIsolated::Root(); Current; Current = Current->Next()) if (Current->Busy()) // sprawdź zajętość - WyslijString(Current->asName, 11); // zajęty + multiplayer::WyslijString(Current->asName, 11); // zajęty else - WyslijString(Current->asName, 10); // wolny - WyslijString("none", 10); // informacja o końcu listy + multiplayer::WyslijString(Current->asName, 10); // wolny + multiplayer::WyslijString("none", 10); // informacja o końcu listy }; //--------------------------------------------------------------------------- @@ -4189,10 +3982,10 @@ void TGround::IsolatedBusy(const std::string t) if (Current->asName == t) // wyszukiwanie odcinka o nazwie (t) if (Current->Busy()) // sprawdź zajetość { - WyslijString(Current->asName, 11); // zajęty + multiplayer::WyslijString(Current->asName, 11); // zajęty return; // nie sprawdzaj dalszych } - WyslijString(t, 10); // wolny + multiplayer::WyslijString(t, 10); // wolny }; //--------------------------------------------------------------------------- diff --git a/Ground.h b/Ground.h index a6ef54c7..3452cdbd 100644 --- a/Ground.h +++ b/Ground.h @@ -42,30 +42,6 @@ const int TP_ISOLATED=22; //Ra const int TP_SUBMODEL = 22; // Ra: submodele terenu const int TP_LAST = 25; // rozmiar tablicy -struct DaneRozkaz -{ // struktura komunikacji z EU07.EXE - int iSygn; // sygnatura 'EU07' - int iComm; // rozkaz/status (kod ramki) - union - { - float fPar[62]; - int iPar[62]; - char cString[248]; // upakowane stringi - }; -}; - -struct DaneRozkaz2 -{ // struktura komunikacji z EU07.EXE - int iSygn; // sygnatura 'EU07' - int iComm; // rozkaz/status (kod ramki) - union - { - float fPar[496]; - int iPar[496]; - char cString[1984]; // upakowane stringi - }; -}; - struct TGroundVertex { glm::dvec3 position; @@ -259,9 +235,8 @@ class TGround *tmpEvent = nullptr; typedef std::unordered_map event_map; event_map m_eventmap; -#endif TNames m_nodemap; - +#endif vector3 pOrigin; vector3 aRotate; bool bInitDone = false; @@ -300,7 +275,9 @@ class TGround TGroundNode * DynamicFind(std::string const &Name); #endif void DynamicList(bool all = false); +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode * FindGroundNode(std::string const &asNameToFind, TGroundNodeType const iNodeType); +#endif TGroundRect * GetRect( double x, double z ); TSubRect * GetSubRect( int iCol, int iRow ); inline @@ -321,32 +298,25 @@ class TGround #endif void TrackJoin(TGroundNode *Current); - private: +private: // convert tp_terrain model to a series of triangle nodes void convert_terrain( TGroundNode const *Terrain ); void convert_terrain( TSubModel const *Submodel ); #ifdef EU07_USE_OLD_GROUNDCODE void RaTriangleDivider(TGroundNode *node); -#endif void Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam); +#endif +public: + void TrackBusyList(); + void IsolatedBusyList(); + void IsolatedBusy( const std::string t ); - public: - void WyslijEvent(const std::string &e, const std::string &d); - void WyslijString(const std::string &t, int n); - void WyslijWolny(const std::string &t); - void WyslijNamiary(TGroundNode *t); - void WyslijParam(int nr, int fl); - void WyslijUszkodzenia(const std::string &t, char fl); - void WyslijObsadzone(); // -> skladanie wielu pojazdow void RadioStop(vector3 pPosition); TDynamicObject * DynamicNearest(vector3 pPosition, double distance = 20.0, bool mech = false); TDynamicObject * CouplerNearest(vector3 pPosition, double distance = 20.0, bool mech = false); void DynamicRemove(TDynamicObject *dyn); void TerrainRead(std::string const &f); void TerrainWrite(); - void TrackBusyList(); - void IsolatedBusyList(); - void IsolatedBusy(const std::string t); void Silence(vector3 gdzie); }; diff --git a/Names.h b/Names.h index 1b338531..e28028fd 100644 --- a/Names.h +++ b/Names.h @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include #include +#ifdef EU07_USE_OLD_GROUNDCODE template class TNames { @@ -65,6 +66,7 @@ private: // members: typemap_map m_maps; // list of object maps of types specified so far }; +#endif template class basic_table { diff --git a/Track.cpp b/Track.cpp index 04884ce7..dccdb40b 100644 --- a/Track.cpp +++ b/Track.cpp @@ -118,7 +118,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) if (evFree) Global::AddToQuery(evFree, o); // dodanie zwolnienia do kolejki if (Global::iMultiplayer) // jeśli multiplayer - Global::pGround->WyslijString(asName, 10); // wysłanie pakietu o zwolnieniu + multiplayer::WyslijString(asName, 10); // wysłanie pakietu o zwolnieniu if (pMemCell) // w powiązanej komórce pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) & ~0xFF, update_memval2 ); //"zerujemy" ostatnią wartość @@ -132,7 +132,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) if (evBusy) Global::AddToQuery(evBusy, o); // dodanie zajętości do kolejki if (Global::iMultiplayer) // jeśli multiplayer - Global::pGround->WyslijString(asName, 11); // wysłanie pakietu o zajęciu + multiplayer::WyslijString(asName, 11); // wysłanie pakietu o zajęciu if (pMemCell) // w powiązanej komórce pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) | 1, update_memval2 ); // zmieniamy ostatnią wartość na nieparzystą } @@ -178,6 +178,13 @@ void TTrack::Init() } } +bool +TTrack::sort_by_material( TTrack const *Left, TTrack const *Right ) { + + return ( ( Left->m_material1 < Right->m_material1 ) + && ( Left->m_material2 < Right->m_material2 ) ); +} + TTrack * TTrack::Create400m(int what, double dx) { // tworzenie toru do wstawiania taboru podczas konwersji na E3D TGroundNode *tmp = new TGroundNode(TP_TRACK); // node @@ -932,7 +939,7 @@ bool TTrack::AddDynamicObject(TDynamicObject *Dynamic) // pierwszy zajmujący if( m_name != "none" ) { // przekazanie informacji o zajętości toru - Global::pGround->WyslijString( m_name, 8 ); + multiplayer::WyslijString( m_name, 8 ); } } } @@ -1024,7 +1031,7 @@ bool TTrack::RemoveDynamicObject(TDynamicObject *Dynamic) // jeśli już nie ma żadnego if( m_name != "none" ) { // przekazanie informacji o zwolnieniu toru - Global::pGround->WyslijString( m_name, 9 ); + multiplayer::WyslijString( m_name, 9 ); } } } @@ -2158,7 +2165,6 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { void TTrack::EnvironmentSet() { // ustawienie zmienionego światła - glColor3f(1.0f, 1.0f, 1.0f); // Ra: potrzebne to? switch( eEnvironment ) { case e_canyon: { Global::DayLight.apply_intensity( 0.4f ); diff --git a/Track.h b/Track.h index 0aaac064..7ff04d3f 100644 --- a/Track.h +++ b/Track.h @@ -186,6 +186,7 @@ public: virtual ~TTrack(); void Init(); + static bool sort_by_material( TTrack const *Left, TTrack const *Right ); static TTrack * Create400m(int what, double dx); TTrack * NullCreate(int dir); inline bool IsEmpty() { diff --git a/World.cpp b/World.cpp index c02db34d..3f127841 100644 --- a/World.cpp +++ b/World.cpp @@ -23,7 +23,6 @@ http://mozilla.org/MPL/2.0/. #include "Timer.h" #include "mtable.h" #include "Sound.h" -#include "Camera.h" #include "ResourceManager.h" #include "Event.h" #include "Train.h" @@ -1079,7 +1078,7 @@ bool TWorld::Update() { // awaria PoKeys mogła włączyć pauzę - przekazać informację if( Global::iMultiplayer ) // dajemy znać do serwera o wykonaniu if( iPause != Global::iPause ) { // przesłanie informacji o pauzie do programu nadzorującego - Ground.WyslijParam( 5, 3 ); // ramka 5 z czasem i stanem zapauzowania + multiplayer::WyslijParam( 5, 3 ); // ramka 5 z czasem i stanem zapauzowania iPause = Global::iPause; } @@ -1890,25 +1889,24 @@ TWorld::Update_UI() { } //--------------------------------------------------------------------------- -void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) +void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) { // odebranie komunikatu z serwera if (pRozkaz->iSygn == MAKE_ID4('E','U','0','7') ) switch (pRozkaz->iComm) { case 0: // odesłanie identyfikatora wersji CommLog( Now() + " " + std::to_string(pRozkaz->iComm) + " version" + " rcvd"); - Ground.WyslijString(Global::asVersion, 0); // przedsatwienie się + multiplayer::WyslijString(Global::asVersion, 0); // przedsatwienie się break; case 1: // odesłanie identyfikatora wersji CommLog( Now() + " " + std::to_string(pRozkaz->iComm) + " scenery" + " rcvd"); - Ground.WyslijString(Global::SceneryFile, 1); // nazwa scenerii + multiplayer::WyslijString(Global::SceneryFile, 1); // nazwa scenerii break; case 2: { // event CommLog( Now() + " " + std::to_string( pRozkaz->iComm ) + " " + std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) + " rcvd" ); -/* - // TODO: re-enable when messaging module is in place +#ifdef EU07_USE_OLD_GROUNDCODE if( Global::iMultiplayer ) { // WriteLog("Komunikat: "+AnsiString(pRozkaz->Name1)); TEvent *e = Ground.FindEvent( @@ -1918,7 +1916,20 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) ( e->evJoined != 0 ) ) // tylko jawne albo niejawne Multiple Ground.AddToQuery( e, NULL ); // drugi parametr to dynamic wywołujący - tu brak } -*/ +#else + if( Global::iMultiplayer ) { + // WriteLog("Komunikat: "+AnsiString(pRozkaz->Name1)); + auto *event = simulation::Events.FindEvent( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); + if( event != nullptr ) { + if( ( event->Type == tp_Multiple ) + || ( event->Type == tp_Lights ) + || ( event->evJoined != 0 ) ) { + // tylko jawne albo niejawne Multiple + simulation::Events.AddToQuery( event, nullptr ); // drugi parametr to dynamic wywołujący - tu brak + } + } + } +#endif break; } case 3: // rozkaz dla AI @@ -1961,17 +1972,23 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) { CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); - TGroundNode *t = Ground.FindGroundNode( - std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])), TP_TRACK); +#ifdef EU07_USE_OLD_GROUNDCODE + TGroundNode *t = Ground.FindGroundNode( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ), TP_TRACK ); if (t) if (t->pTrack->IsEmpty()) - Ground.WyslijWolny(t->asName); + multiplayer::WyslijWolny(t->asName); +#else + auto *track = simulation::Paths.find( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); + if( ( track != nullptr ) + && ( track->IsEmpty() ) ) { + multiplayer::WyslijWolny( track->name() ); + } +#endif } break; case 5: // ustawienie parametrów { - CommLog(Now() + " " + to_string(pRozkaz->iComm) + " params " + - to_string(*pRozkaz->iPar) + " rcvd"); + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " params " + to_string(*pRozkaz->iPar) + " rcvd"); if (*pRozkaz->iPar == 0) // sprawdzenie czasu if (*pRozkaz->iPar & 1) // ustawienie czasu { @@ -1990,13 +2007,15 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) } break; case 6: // pobranie parametrów ruchu pojazdu - if (Global::iMultiplayer) - { // Ra 2014-12: to ma działać również dla pojazdów bez obsady - CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + - std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + - " rcvd"); - if (pRozkaz->cString[0]) // jeśli długość nazwy jest niezerowa - { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #7 + if (Global::iMultiplayer) { + // Ra 2014-12: to ma działać również dla pojazdów bez obsady + CommLog( + Now() + " " + + to_string( pRozkaz->iComm ) + " " + + std::string{ pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) } + + " rcvd" ); + if (pRozkaz->cString[0]) { + // jeśli długość nazwy jest niezerowa szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #7 #ifdef EU07_USE_OLD_GROUNDCODE TGroundNode *t; if (pRozkaz->cString[1] == '*') @@ -2006,14 +2025,22 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) t = Ground.DynamicFindAny(std::string( pRozkaz->cString + 1, (unsigned)pRozkaz->cString[0])); // nazwa pojazdu if (t) - Ground.WyslijNamiary(t); // wysłanie informacji o pojeździe + multiplayer::WyslijNamiary(t); // wysłanie informacji o pojeździe #else - // TODO: implement +/* + // TODO: re-enable when messaging component is in place + auto *vehicle = ( + pRozkaz->cString[ 1 ] == '*' ? + simulation::Vehicles.find( Global::asHumanCtrlVehicle ) : + simulation::Vehicles.find( std::string{ pRozkaz->cString + 1, (unsigned)pRozkaz->cString[ 0 ] } ) ); + if( vehicle != nullptr ) { + multiplayer::WyslijNamiary( vehicle ); // wysłanie informacji o pojeździe + } +*/ #endif } - else - { // dla pustego wysyłamy ramki 6 z nazwami pojazdów AI (jeśli potrzebne wszystkie, - // to rozpoznać np. "*") + else { + // dla pustego wysyłamy ramki 6 z nazwami pojazdów AI (jeśli potrzebne wszystkie, to rozpoznać np. "*") Ground.DynamicList(); } } @@ -2036,12 +2063,10 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) break; case 12: // skrocona ramka parametrow pojazdow AI (wszystkich!!) CommLog(Now() + " " + to_string(pRozkaz->iComm) + " obsadzone" + " rcvd"); - Ground.WyslijObsadzone(); + multiplayer::WyslijObsadzone(); // Ground.IsolatedBusy(AnsiString(pRozkaz->cString+1,(unsigned)(pRozkaz->cString[0]))); break; case 13: // ramka uszkodzenia i innych stanow pojazdu, np. wylaczenie CA, wlaczenie recznego itd. - // WriteLog("Przyszlo 13!"); - // WriteLog(pRozkaz->cString); CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); @@ -2067,7 +2092,7 @@ void TWorld::OnCommandGet(DaneRozkaz *pRozkaz) d->Damage( pRozkaz->cString[ 0 ] ); d = d->Prev(); // w drugą stronę też } - Ground.WyslijUszkodzenia( t->asName, t->DynamicObject->MoverParameters->EngDmgFlag ); // zwrot informacji o pojeździe + multiplayer::WyslijUszkodzenia( t->asName, t->DynamicObject->MoverParameters->EngDmgFlag ); // zwrot informacji o pojeździe } } #else diff --git a/World.h b/World.h index 471a6262..68d75ce6 100644 --- a/World.h +++ b/World.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include #include + #include "Camera.h" #include "Ground.h" #include "scene.h" @@ -20,6 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "stars.h" #include "skydome.h" #include "mczapkie/mover.h" +#include "messaging.h" // wrapper for simulation time class simulation_time { @@ -104,7 +106,7 @@ TWorld(); void OnKeyDown(int cKey); // void UpdateWindow(); void OnMouseMove(double x, double y); - void OnCommandGet(DaneRozkaz *pRozkaz); + void OnCommandGet(multiplayer::DaneRozkaz *pRozkaz); bool Update(); void TrainDelete(TDynamicObject *d = NULL); TTrain const * diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index a6d77415..ab330c49 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -240,6 +240,9 @@ Source Files + + Source Files + @@ -470,6 +473,9 @@ Header Files + + Header Files + diff --git a/messaging.cpp b/messaging.cpp new file mode 100644 index 00000000..5024f6ee --- /dev/null +++ b/messaging.cpp @@ -0,0 +1,245 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "messaging.h" + +#include "globals.h" +#include "simulation.h" +#include "ground.h" +#include "mtable.h" +#include "logs.h" + +extern "C" +{ + GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); //m7todo: potrzebne do directsound +} + +namespace multiplayer { + +#ifdef _WINDOWS +void +Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) { + // wysłanie komunikatu do sterującego + HWND h = FindWindow(ClassName.c_str(), 0); // można by to zapamiętać + if (h == 0) + h = FindWindow(0, ClassName.c_str()); // można by to zapamiętać + SendMessage(h, Msg, wParam, lParam); +} + +void +WyslijEvent(const std::string &e, const std::string &d) +{ // Ra: jeszcze do wyczyszczenia + DaneRozkaz r; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iComm = 2; // 2 - event + size_t i = e.length(), j = d.length(); + r.cString[0] = char(i); + strcpy(r.cString + 1, e.c_str()); // zakończony zerem + r.cString[i + 2] = char(j); // licznik po zerze kończącym + strcpy(r.cString + 3 + i, d.c_str()); // zakończony zerem + COPYDATASTRUCT cData; + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.cbData = (DWORD)(12 + i + j); // 8+dwa liczniki i dwa zera kończące + cData.lpData = &r; + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + CommLog( Now() + " " + std::to_string(r.iComm) + " " + e + " sent" ); +} + +void +WyslijUszkodzenia(const std::string &t, char fl) +{ // wysłanie informacji w postaci pojedynczego tekstu + DaneRozkaz r; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iComm = 13; // numer komunikatu + size_t i = t.length(); + r.cString[0] = char(fl); + r.cString[1] = char(i); + strcpy(r.cString + 2, t.c_str()); // z zerem kończącym + COPYDATASTRUCT cData; + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.cbData = (DWORD)(11 + i); // 8+licznik i zero kończące + cData.lpData = &r; + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); +} + +void +WyslijString(const std::string &t, int n) +{ // wysłanie informacji w postaci pojedynczego tekstu + DaneRozkaz r; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iComm = n; // numer komunikatu + size_t i = t.length(); + r.cString[0] = char(i); + strcpy(r.cString + 1, t.c_str()); // z zerem kończącym + COPYDATASTRUCT cData; + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.cbData = (DWORD)(10 + i); // 8+licznik i zero kończące + cData.lpData = &r; + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); +} + +void +WyslijWolny(const std::string &t) +{ // Ra: jeszcze do wyczyszczenia + WyslijString(t, 4); // tor wolny +} + +void +WyslijNamiary(TGroundNode *t) +{ // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby + // WriteLog("Wysylam pojazd"); + DaneRozkaz r; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iComm = 7; // 7 - dane pojazdu + int i = 32; + size_t j = t->asName.length(); + r.iPar[0] = i; // ilość danych liczbowych + r.fPar[1] = Global::fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) + r.fPar[2] = t->DynamicObject->MoverParameters->Loc.X; // pozycja X + r.fPar[3] = t->DynamicObject->MoverParameters->Loc.Y; // pozycja Y + r.fPar[4] = t->DynamicObject->MoverParameters->Loc.Z; // pozycja Z + r.fPar[5] = t->DynamicObject->MoverParameters->V; // prędkość ruchu X + r.fPar[6] = t->DynamicObject->MoverParameters->nrot * M_PI * + t->DynamicObject->MoverParameters->WheelDiameter; // prędkość obrotowa kóŁ + r.fPar[7] = 0; // prędkość ruchu Z + r.fPar[8] = t->DynamicObject->MoverParameters->AccS; // przyspieszenie X + r.fPar[9] = t->DynamicObject->MoverParameters->AccN; // przyspieszenie Y //na razie nie + r.fPar[10] = t->DynamicObject->MoverParameters->AccV; // przyspieszenie Z + r.fPar[11] = t->DynamicObject->MoverParameters->DistCounter; // przejechana odległość w km + r.fPar[12] = t->DynamicObject->MoverParameters->PipePress; // ciśnienie w PG + r.fPar[13] = t->DynamicObject->MoverParameters->ScndPipePress; // ciśnienie w PZ + r.fPar[14] = t->DynamicObject->MoverParameters->BrakePress; // ciśnienie w CH + r.fPar[15] = t->DynamicObject->MoverParameters->Compressor; // ciśnienie w ZG + r.fPar[16] = t->DynamicObject->MoverParameters->Itot; // Prąd całkowity + r.iPar[17] = t->DynamicObject->MoverParameters->MainCtrlPos; // Pozycja NJ + r.iPar[18] = t->DynamicObject->MoverParameters->ScndCtrlPos; // Pozycja NB + r.iPar[19] = t->DynamicObject->MoverParameters->MainCtrlActualPos; // Pozycja jezdna + r.iPar[20] = t->DynamicObject->MoverParameters->ScndCtrlActualPos; // Pozycja bocznikowania + r.iPar[21] = t->DynamicObject->MoverParameters->ScndCtrlActualPos; // Pozycja bocznikowania + r.iPar[22] = t->DynamicObject->MoverParameters->ResistorsFlag * 1 + + t->DynamicObject->MoverParameters->ConverterFlag * 2 + + +t->DynamicObject->MoverParameters->CompressorFlag * 4 + + t->DynamicObject->MoverParameters->Mains * 8 + + +t->DynamicObject->MoverParameters->DoorLeftOpened * 16 + + t->DynamicObject->MoverParameters->DoorRightOpened * 32 + + +t->DynamicObject->MoverParameters->FuseFlag * 64 + + t->DynamicObject->MoverParameters->DepartureSignal * 128; + // WriteLog("Zapisalem stare"); + // WriteLog("Mam patykow "+IntToStr(t->DynamicObject->iAnimType[ANIM_PANTS])); + for (int p = 0; p < 4; p++) + { + // WriteLog("Probuje pant "+IntToStr(p)); + if (p < t->DynamicObject->iAnimType[ANIM_PANTS]) + { + r.fPar[23 + p] = t->DynamicObject->pants[p].fParamPants->PantWys; // stan pantografów 4 + // WriteLog("Zapisalem pant "+IntToStr(p)); + } + else + { + r.fPar[23 + p] = -2; + // WriteLog("Nie mam pant "+IntToStr(p)); + } + } + // WriteLog("Zapisalem pantografy"); + for (int p = 0; p < 3; p++) + r.fPar[27 + p] = + t->DynamicObject->MoverParameters->ShowCurrent(p + 1); // amperomierze kolejnych grup + // WriteLog("zapisalem prady"); + r.iPar[30] = t->DynamicObject->MoverParameters->WarningSignal; // trabienie + r.fPar[31] = t->DynamicObject->MoverParameters->RunningTraction.TractionVoltage; // napiecie WN + // WriteLog("Parametry gotowe"); + i <<= 2; // ilość bajtów + r.cString[i] = char(j); // na końcu nazwa, żeby jakoś zidentyfikować + strcpy(r.cString + i + 1, t->asName.c_str()); // zakończony zerem + COPYDATASTRUCT cData; + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.cbData = (DWORD)(10 + i + j); // 8+licznik i zero kończące + cData.lpData = &r; + // WriteLog("Ramka gotowa"); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + // WriteLog("Ramka poszla!"); + CommLog( Now() + " " + std::to_string(r.iComm) + " " + t->asName + " sent"); +} + +void +WyslijObsadzone() +{ // wysłanie informacji o pojeździe + DaneRozkaz2 r; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iComm = 12; // kod 12 + for (int i=0; i<1984; ++i) r.cString[i] = 0; + + // TODO: clean this up, we shouldn't be relying on direct list access + auto &vehiclelist = simulation::Vehicles.sequence(); + + int i = 0; + for( auto *vehicle : vehiclelist ) { + if( vehicle->Mechanik ) { + strcpy( r.cString + 64 * i, vehicle->asName.c_str() ); + r.fPar[ 16 * i + 4 ] = vehicle->GetPosition().x; + r.fPar[ 16 * i + 5 ] = vehicle->GetPosition().y; + r.fPar[ 16 * i + 6 ] = vehicle->GetPosition().z; + r.iPar[ 16 * i + 7 ] = vehicle->Mechanik->GetAction(); + strcpy( r.cString + 64 * i + 32, vehicle->GetTrack()->IsolatedName().c_str() ); + strcpy( r.cString + 64 * i + 48, vehicle->Mechanik->Timetable()->TrainName.c_str() ); + i++; + if( i > 30 ) break; + } + } + while (i <= 30) + { + strcpy(r.cString + 64 * i, "none"); + r.fPar[16 * i + 4] = 1; + r.fPar[16 * i + 5] = 2; + r.fPar[16 * i + 6] = 3; + r.iPar[16 * i + 7] = 0; + strcpy(r.cString + 64 * i + 32, "none"); + strcpy(r.cString + 64 * i + 48, "none"); + i++; + } + + COPYDATASTRUCT cData; + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.cbData = 8 + 1984; // 8+licznik i zero kończące + cData.lpData = &r; + // WriteLog("Ramka gotowa"); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + CommLog( Now() + " " + std::to_string(r.iComm) + " obsadzone" + " sent"); +} + +void +WyslijParam(int nr, int fl) +{ // wysłanie parametrów symulacji w ramce (nr) z flagami (fl) + DaneRozkaz r; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iComm = nr; // zwykle 5 + r.iPar[0] = fl; // flagi istotności kolejnych parametrów + int i = 0; // domyślnie brak danych + switch (nr) + { // można tym przesyłać różne zestawy parametrów + case 5: // czas i pauza + r.fPar[1] = Global::fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) + r.iPar[2] = Global::iPause; // stan zapauzowania + i = 8; // dwa parametry po 4 bajty każdy + break; + } + COPYDATASTRUCT cData; + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.cbData = 12 + i; // 12+rozmiar danych + cData.lpData = &r; + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); +} +#endif + +} // multiplayer + +//--------------------------------------------------------------------------- diff --git a/messaging.h b/messaging.h new file mode 100644 index 00000000..fd2826ac --- /dev/null +++ b/messaging.h @@ -0,0 +1,50 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include + +class TGroundNode; + +namespace multiplayer { + +struct DaneRozkaz { // struktura komunikacji z EU07.EXE + int iSygn; // sygnatura 'EU07' + int iComm; // rozkaz/status (kod ramki) + union { + float fPar[ 62 ]; + int iPar[ 62 ]; + char cString[ 248 ]; // upakowane stringi + }; +}; + +struct DaneRozkaz2 { // struktura komunikacji z EU07.EXE + int iSygn; // sygnatura 'EU07' + int iComm; // rozkaz/status (kod ramki) + union { + float fPar[ 496 ]; + int iPar[ 496 ]; + char cString[ 1984 ]; // upakowane stringi + }; +}; + +void Navigate( std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam ); + +void WyslijEvent( const std::string &e, const std::string &d ); +void WyslijString( const std::string &t, int n ); +void WyslijWolny( const std::string &t ); +void WyslijNamiary( TGroundNode *t ); +void WyslijParam( int nr, int fl ); +void WyslijUszkodzenia( const std::string &t, char fl ); +void WyslijObsadzone(); // -> skladanie wielu pojazdow + +} // multiplayer + +//--------------------------------------------------------------------------- diff --git a/renderer.cpp b/renderer.cpp index e875f081..d4a6b65e 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1598,6 +1598,212 @@ opengl_renderer::Render( TSubRect *Groundsubcell ) { return true; } + +bool +opengl_renderer::Render( TGroundNode *Node ) { + + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees + distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + default: { + distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + } + if( ( distancesquared < Node->fSquareMinRadius ) + || ( distancesquared >= Node->fSquareRadius ) ) { + return false; + } + + switch (Node->iType) { + + case TP_TRACK: { + // setup + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + return false; + } + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + // render + Render( Node->pTrack ); + // debug + ++m_debugstats.paths; + ++m_debugstats.drawcalls; + // post-render cleanup + ::glPopMatrix(); + return true; + } + + case TP_MODEL: { + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } + Node->Model->RaAnimate( m_framestamp ); // jednorazowe przeliczenie animacji + Node->Model->RaPrepare(); + if( Node->Model->pModel ) { + // renderowanie rekurencyjne submodeli + Render( + Node->Model->pModel, + Node->Model->Material(), + distancesquared, + Node->pCenter - m_renderpass.camera.position(), + Node->Model->vAngle ); + } + return true; + } + + case GL_LINES: { + if( ( Node->Piece->geometry == null_handle ) + || ( Node->fLineThickness > 0.0 ) ) { + return false; + } + // setup + auto const distance = std::sqrt( distancesquared ); + auto const linealpha = + 10.0 * Node->fLineThickness + / std::max( + 0.5 * Node->m_radius + 1.0, + distance - ( 0.5 * Node->m_radius ) ); + switch( m_renderpass.draw_mode ) { + // wire colouring is disabled for modes other than colour + case rendermode::color: { + ::glColor4fv( + glm::value_ptr( + glm::vec4( + Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla + 1.0 ) ) ); // if the thickness is defined negative, lines are always drawn opaque + break; + } + case rendermode::shadows: + case rendermode::pickcontrols: + case rendermode::pickscenery: + default: { + break; + } + } + auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 8.0 ); + if( linewidth > 1.0 ) { + ::glLineWidth( static_cast( linewidth ) ); + } + + GfxRenderer.Bind_Material( null_handle ); + + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } + // render + m_geometry.draw( Node->Piece->geometry ); + // debug +// ++m_debugstats.lines; +// ++m_debugstats.drawcalls; + // post-render cleanup + ::glPopMatrix(); + + if( linewidth > 1.0 ) { ::glLineWidth( 1.0f ); } + + return true; + } + + case GL_TRIANGLES: { + if( ( Node->Piece->geometry == null_handle ) + || ( ( Node->iFlags & 0x10 ) == 0 ) ) { + return false; + } + // setup + Bind_Material( Node->m_material ); + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); + break; + } + // pick modes get custom colours, and shadow pass doesn't use any + case rendermode::shadows: + case rendermode::pickcontrols: + case rendermode::pickscenery: + default: { + break; + } + } + + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } + // render + m_geometry.draw( Node->Piece->geometry ); + // debug + ++m_debugstats.shapes; + ++m_debugstats.drawcalls; + + // post-render cleanup + ::glPopMatrix(); + + return true; + } + + case TP_MEMCELL: { + switch( m_renderpass.draw_mode ) { + case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Node ); + break; + } + default: { + break; + } + } + Render( Node->MemCell ); + return true; + } + + default: { break; } + } + // in theory we shouldn't ever get here but, eh + return false; +} #else void opengl_renderer::Render( scene::basic_region *Region ) { @@ -1848,7 +2054,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } // tracks // TODO: update after path node refactoring - for( auto *path : cell->m_paths ) { Render( path ); } + Render( std::begin( cell->m_paths ), std::end( cell->m_paths ) ); // TODO: add other content types // post-render cleanup @@ -1880,10 +2086,14 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render // opaque non-instanced shapes + ::glColor3fv( glm::value_ptr( colors::none ) ); for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } // tracks // TODO: add path to the node picking list - for( auto *path : cell->m_paths ) { Render( path ); } + for( auto *path : cell->m_paths ) { + ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); + Render( path ); + } // TODO: add other content types // post-render cleanup ::glPopMatrix(); @@ -2053,212 +2263,6 @@ opengl_renderer::Render( TAnimModel *Instance ) { } #endif -bool -opengl_renderer::Render( TGroundNode *Node ) { - - double distancesquared; - switch( m_renderpass.draw_mode ) { - case rendermode::shadows: { - // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - default: { - distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - } - if( ( distancesquared < Node->fSquareMinRadius ) - || ( distancesquared >= Node->fSquareRadius ) ) { - return false; - } - - switch (Node->iType) { - - case TP_TRACK: { - // setup - switch( m_renderpass.draw_mode ) { - case rendermode::shadows: { - return false; - } - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - // render - Render( Node->pTrack ); - // debug - ++m_debugstats.paths; - ++m_debugstats.drawcalls; - // post-render cleanup - ::glPopMatrix(); - return true; - } - - case TP_MODEL: { - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - Node->Model->RaAnimate( m_framestamp ); // jednorazowe przeliczenie animacji - Node->Model->RaPrepare(); - if( Node->Model->pModel ) { - // renderowanie rekurencyjne submodeli - Render( - Node->Model->pModel, - Node->Model->Material(), - distancesquared, - Node->pCenter - m_renderpass.camera.position(), - Node->Model->vAngle ); - } - return true; - } - - case GL_LINES: { - if( ( Node->Piece->geometry == null_handle ) - || ( Node->fLineThickness > 0.0 ) ) { - return false; - } - // setup - auto const distance = std::sqrt( distancesquared ); - auto const linealpha = - 10.0 * Node->fLineThickness - / std::max( - 0.5 * Node->m_radius + 1.0, - distance - ( 0.5 * Node->m_radius ) ); - switch( m_renderpass.draw_mode ) { - // wire colouring is disabled for modes other than colour - case rendermode::color: { - ::glColor4fv( - glm::value_ptr( - glm::vec4( - Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla - 1.0 ) ) ); // if the thickness is defined negative, lines are always drawn opaque - break; - } - case rendermode::shadows: - case rendermode::pickcontrols: - case rendermode::pickscenery: - default: { - break; - } - } - auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 8.0 ); - if( linewidth > 1.0 ) { - ::glLineWidth( static_cast( linewidth ) ); - } - - GfxRenderer.Bind_Material( null_handle ); - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - // render - m_geometry.draw( Node->Piece->geometry ); - // debug -// ++m_debugstats.lines; -// ++m_debugstats.drawcalls; - // post-render cleanup - ::glPopMatrix(); - - if( linewidth > 1.0 ) { ::glLineWidth( 1.0f ); } - - return true; - } - - case GL_TRIANGLES: { - if( ( Node->Piece->geometry == null_handle ) - || ( ( Node->iFlags & 0x10 ) == 0 ) ) { - return false; - } - // setup - Bind_Material( Node->m_material ); - switch( m_renderpass.draw_mode ) { - case rendermode::color: { - ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); - break; - } - // pick modes get custom colours, and shadow pass doesn't use any - case rendermode::shadows: - case rendermode::pickcontrols: - case rendermode::pickscenery: - default: { - break; - } - } - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - // render - m_geometry.draw( Node->Piece->geometry ); - // debug - ++m_debugstats.shapes; - ++m_debugstats.drawcalls; - - // post-render cleanup - ::glPopMatrix(); - - return true; - } - - case TP_MEMCELL: { - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - Render( Node->MemCell ); - return true; - } - - default: { break; } - } - // in theory we shouldn't ever get here but, eh - return false; -} - bool opengl_renderer::Render( TDynamicObject *Dynamic ) { @@ -2794,6 +2798,83 @@ opengl_renderer::Render( TTrack *Track ) { } } +// experimental, does track rendering in two passes, to take advantage of reduced texture switching +void +opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, scene::basic_cell::path_sequence::const_iterator Last ) { + + ::glColor3fv( glm::value_ptr( colors::white ) ); + + // first pass, material 1 + for( auto first { First }; first != Last; ++first ) { + + auto const track { *first }; + + if( track->m_material1 == 0 ) { + continue; + } + if( false == track->m_visible ) { + continue; + } + + ++m_debugstats.paths; + ++m_debugstats.drawcalls; + + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::reflections: { + track->EnvironmentSet(); + Bind_Material( track->m_material1 ); + m_geometry.draw( std::begin( track->Geometry1 ), std::end( track->Geometry1 ) ); + track->EnvironmentReset(); + break; + } + case rendermode::shadows: { + Bind_Material( track->m_material1 ); + m_geometry.draw( std::begin( track->Geometry1 ), std::end( track->Geometry1 ) ); + break; + } + case rendermode::pickscenery: // pick scenery should use track-by-track approach + case rendermode::pickcontrols: + default: { + break; + } + } + } + // second pass, material 2 + for( auto first { First }; first != Last; ++first ) { + + auto const track { *first }; + + if( track->m_material2 == 0 ) { + continue; + } + if( false == track->m_visible ) { + continue; + } + + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::reflections: { + track->EnvironmentSet(); + Bind_Material( track->m_material2 ); + m_geometry.draw( std::begin( track->Geometry2 ), std::end( track->Geometry2 ) ); + track->EnvironmentReset(); + break; + } + case rendermode::shadows: { + Bind_Material( track->m_material2 ); + m_geometry.draw( std::begin( track->Geometry2 ), std::end( track->Geometry2 ) ); + break; + } + case rendermode::pickscenery: // pick scenery should use track-by-track approach + case rendermode::pickcontrols: + default: { + break; + } + } + } +} + void opengl_renderer::Render( TMemCell *Memcell ) { @@ -2879,6 +2960,162 @@ opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { return true; } + +bool +opengl_renderer::Render_Alpha( TGroundNode *Node ) { + + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees + distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + default: { + distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + } + if( ( distancesquared < Node->fSquareMinRadius ) + || ( distancesquared >= Node->fSquareRadius ) ) { + return false; + } + + switch (Node->iType) + { + case TP_TRACTION: { + if( Node->bVisible ) { + // rysuj jesli sa druty i nie zerwana + if( ( Node->hvTraction->Wires == 0 ) + || ( true == TestFlag( Node->hvTraction->DamageFlag, 128 ) ) ) { + return false; + } + // setup + if( !Global::bSmoothTraction ) { + // na liniach kiepsko wygląda - robi gradient + ::glDisable( GL_LINE_SMOOTH ); + } + float const linealpha = static_cast( + std::min( + 1.25, + 5000 * Node->hvTraction->WireThickness / ( distancesquared + 1.0 ) ) ); // zbyt grube nie są dobre + ::glLineWidth( linealpha ); + // McZapkie-261102: kolor zalezy od materialu i zasniedzenia + auto const color { Node->hvTraction->wire_color() }; + ::glColor4f( color.r, color.g, color.b, linealpha ); + + Bind_Material( null_handle ); + + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + // render + m_geometry.draw( Node->hvTraction->m_geometry ); + // debug data + ++m_debugstats.traction; + ++m_debugstats.drawcalls; + + // post-render cleanup + ::glPopMatrix(); + + ::glLineWidth( 1.0 ); + if( !Global::bSmoothTraction ) { + ::glEnable( GL_LINE_SMOOTH ); + } + + return true; + } + else { + return false; + } + } + case TP_MODEL: { + + Node->Model->RaPrepare(); + if( Node->Model->pModel ) { + // renderowanie rekurencyjne submodeli + Render_Alpha( + Node->Model->pModel, + Node->Model->Material(), + distancesquared, + Node->pCenter - m_renderpass.camera.position(), + Node->Model->vAngle ); + } + return true; + } + + case GL_LINES: { + if( ( Node->Piece->geometry == null_handle ) + || ( Node->fLineThickness < 0.0 ) ) { + return false; + } + // setup + auto const distance = std::sqrt( distancesquared ); + auto const linealpha = + 10.0 * Node->fLineThickness + / std::max( + 0.5 * Node->m_radius + 1.0, + distance - ( 0.5 * Node->m_radius ) ); + ::glColor4fv( + glm::value_ptr( + glm::vec4( + Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla + std::min( 1.0, linealpha ) ) ) ); + auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 8.0 ); + if( linewidth > 1.0 ) { + ::glLineWidth( static_cast(linewidth) ); + } + + GfxRenderer.Bind_Material( null_handle ); + + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + // render + m_geometry.draw( Node->Piece->geometry ); +// ++m_debugstats.lines; +// ++m_debugstats.drawcalls; + + // post-render cleanup + ::glPopMatrix(); + + if( linewidth > 1.0 ) { ::glLineWidth( 1.0f ); } + + return true; + } + + case GL_TRIANGLES: { + if( ( Node->Piece->geometry == null_handle ) + || ( ( Node->iFlags & 0x20 ) == 0 ) ) { + return false; + } + // setup + ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); + + Bind_Material( Node->m_material ); + + ::glPushMatrix(); + auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); + ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); + + // render + m_geometry.draw( Node->Piece->geometry ); + // debug data + ++m_debugstats.shapes; + ++m_debugstats.drawcalls; + // post-render cleanup + ::glPopMatrix(); + + return true; + } + + default: { break; } + } + // in theory we shouldn't ever get here but, eh + return false; +} #else void opengl_renderer::Render_Alpha( scene::basic_region *Region ) { @@ -3051,162 +3288,6 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { ++m_debugstats.drawcalls; } #endif -bool -opengl_renderer::Render_Alpha( TGroundNode *Node ) { - - double distancesquared; - switch( m_renderpass.draw_mode ) { - case rendermode::shadows: { - // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - default: { - distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - } - if( ( distancesquared < Node->fSquareMinRadius ) - || ( distancesquared >= Node->fSquareRadius ) ) { - return false; - } - - switch (Node->iType) - { - case TP_TRACTION: { - if( Node->bVisible ) { - // rysuj jesli sa druty i nie zerwana - if( ( Node->hvTraction->Wires == 0 ) - || ( true == TestFlag( Node->hvTraction->DamageFlag, 128 ) ) ) { - return false; - } - // setup - if( !Global::bSmoothTraction ) { - // na liniach kiepsko wygląda - robi gradient - ::glDisable( GL_LINE_SMOOTH ); - } - float const linealpha = static_cast( - std::min( - 1.25, - 5000 * Node->hvTraction->WireThickness / ( distancesquared + 1.0 ) ) ); // zbyt grube nie są dobre - ::glLineWidth( linealpha ); - // McZapkie-261102: kolor zalezy od materialu i zasniedzenia - auto const color { Node->hvTraction->wire_color() }; - ::glColor4f( color.r, color.g, color.b, linealpha ); - - Bind_Material( null_handle ); - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - // render - m_geometry.draw( Node->hvTraction->m_geometry ); - // debug data - ++m_debugstats.traction; - ++m_debugstats.drawcalls; - - // post-render cleanup - ::glPopMatrix(); - - ::glLineWidth( 1.0 ); - if( !Global::bSmoothTraction ) { - ::glEnable( GL_LINE_SMOOTH ); - } - - return true; - } - else { - return false; - } - } - case TP_MODEL: { - - Node->Model->RaPrepare(); - if( Node->Model->pModel ) { - // renderowanie rekurencyjne submodeli - Render_Alpha( - Node->Model->pModel, - Node->Model->Material(), - distancesquared, - Node->pCenter - m_renderpass.camera.position(), - Node->Model->vAngle ); - } - return true; - } - - case GL_LINES: { - if( ( Node->Piece->geometry == null_handle ) - || ( Node->fLineThickness < 0.0 ) ) { - return false; - } - // setup - auto const distance = std::sqrt( distancesquared ); - auto const linealpha = - 10.0 * Node->fLineThickness - / std::max( - 0.5 * Node->m_radius + 1.0, - distance - ( 0.5 * Node->m_radius ) ); - ::glColor4fv( - glm::value_ptr( - glm::vec4( - Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla - std::min( 1.0, linealpha ) ) ) ); - auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 8.0 ); - if( linewidth > 1.0 ) { - ::glLineWidth( static_cast(linewidth) ); - } - - GfxRenderer.Bind_Material( null_handle ); - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - // render - m_geometry.draw( Node->Piece->geometry ); -// ++m_debugstats.lines; -// ++m_debugstats.drawcalls; - - // post-render cleanup - ::glPopMatrix(); - - if( linewidth > 1.0 ) { ::glLineWidth( 1.0f ); } - - return true; - } - - case GL_TRIANGLES: { - if( ( Node->Piece->geometry == null_handle ) - || ( ( Node->iFlags & 0x20 ) == 0 ) ) { - return false; - } - // setup - ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); - - Bind_Material( Node->m_material ); - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - // render - m_geometry.draw( Node->Piece->geometry ); - // debug data - ++m_debugstats.shapes; - ++m_debugstats.drawcalls; - // post-render cleanup - ::glPopMatrix(); - - return true; - } - - default: { break; } - } - // in theory we shouldn't ever get here but, eh - return false; -} - bool opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { diff --git a/renderer.h b/renderer.h index 9879fb93..75027568 100644 --- a/renderer.h +++ b/renderer.h @@ -294,6 +294,8 @@ private: Render( TGroundRect *Groundcell ); bool Render( TSubRect *Groundsubcell ); + bool + Render( TGroundNode *Node ); #else void Render( scene::basic_region *Region ); @@ -306,8 +308,6 @@ private: void Render( TAnimModel *Instance ); #endif - bool - Render( TGroundNode *Node ); bool Render( TDynamicObject *Dynamic ); bool @@ -318,6 +318,8 @@ private: Render( TSubModel *Submodel ); void Render( TTrack *Track ); + void + Render( scene::basic_cell::path_sequence::const_iterator First, scene::basic_cell::path_sequence::const_iterator Last ); bool Render_cab( TDynamicObject *Dynamic, bool const Alpha = false ); void @@ -327,6 +329,8 @@ private: Render_Alpha( TGround *Ground ); bool Render_Alpha( TSubRect *Groundsubcell ); + bool + Render_Alpha( TGroundNode *Node ); #else void Render_Alpha( scene::basic_region *Region ); @@ -337,8 +341,6 @@ private: void Render_Alpha( TTraction *Traction ); #endif - bool - Render_Alpha( TGroundNode *Node ); bool Render_Alpha( TDynamicObject *Dynamic ); bool diff --git a/scene.cpp b/scene.cpp index 2fa1783d..e2587e7d 100644 --- a/scene.cpp +++ b/scene.cpp @@ -372,6 +372,10 @@ basic_cell::create_geometry( geometrybank_handle const &Bank ) { for( auto *path : m_paths ) { path->create_geometry( Bank ); } for( auto *traction : m_traction ) { traction->create_geometry( Bank ); } #endif + // arrange content by assigned materials to minimize state switching + std::sort( + std::begin( m_paths ), std::end( m_paths ), + TTrack::sort_by_material ); } diff --git a/simulation.cpp b/simulation.cpp index 0d0415d6..b45c5532 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -685,7 +685,7 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch Input.getToken() ); auto const offset { Input.getToken( false ) }; auto const drivertype { Input.getToken() }; - auto const couplingparams = ( + auto const couplingdata = ( Scratchpad.trainset.is_open ? Input.getToken() : "3" ); @@ -694,11 +694,11 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch Scratchpad.trainset.velocity : Input.getToken( false ) ); // extract coupling type and optional parameters - auto const couplingparamsplit = couplingparams.find( '.' ); + auto const couplingdatawithparams = couplingdata.find( '.' ); auto coupling = ( - couplingparamsplit != std::string::npos ? - std::atoi( couplingparams.substr( 0, couplingparamsplit ).c_str() ) : - std::atoi( couplingparams.c_str() ) ); + couplingdatawithparams != std::string::npos ? + std::atoi( couplingdata.substr( 0, couplingdatawithparams ).c_str() ) : + std::atoi( couplingdata.c_str() ) ); if( coupling < 0 ) { // sprzęg zablokowany (pojazdy nierozłączalne przy manewrach) coupling = ( -coupling ) | coupling::permanent; @@ -706,11 +706,11 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch if( ( offset != -1.0 ) && ( std::abs( offset ) > 0.5 ) ) { // maksymalna odległość między sprzęgami - do przemyślenia // likwidacja sprzęgu, jeśli odległość zbyt duża - to powinno być uwzględniane w fizyce sprzęgów... - coupling = 0; + coupling = coupling::faux; } auto const params = ( - couplingparamsplit != std::string::npos ? - couplingparams.substr( couplingparamsplit + 1 ) : + couplingdatawithparams != std::string::npos ? + couplingdata.substr( couplingdatawithparams + 1 ) : "" ); // load amount and type auto loadcount { Input.getToken( false ) }; diff --git a/windows.cpp b/windows.cpp index dd23a74d..28b46abc 100644 --- a/windows.cpp +++ b/windows.cpp @@ -63,7 +63,7 @@ LRESULT APIENTRY WndProc( HWND hWnd, // handle for this window // obsługa danych przesłanych przez program sterujący pDane = (PCOPYDATASTRUCT)lParam; if( pDane->dwData == MAKE_ID4('E', 'U', '0', '7')) // sygnatura danych - World.OnCommandGet( (DaneRozkaz *)( pDane->lpData ) ); + World.OnCommandGet( ( multiplayer::DaneRozkaz *)( pDane->lpData ) ); break; } } From 87348a2ab8cd8ab439ba45a445ec3046e8e3ce93 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 17 Oct 2017 19:49:14 +0200 Subject: [PATCH 202/426] continued refactoring: lines, terrain models; render culling optimizations and fixes --- AnimModel.cpp | 26 ++++- AnimModel.h | 4 + Camera.cpp | 9 +- DynObj.cpp | 15 +++ DynObj.h | 3 + Event.cpp | 40 +++---- Globals.cpp | 4 +- Globals.h | 2 +- Ground.cpp | 31 +++-- Ground.h | 21 +--- MemCell.cpp | 10 +- Model3d.cpp | 49 ++++---- Model3d.h | 22 ++-- Track.cpp | 105 +++++++++++++---- Track.h | 34 +++++- World.cpp | 78 ++++++++++--- messaging.cpp | 79 +++++++++++++ messaging.h | 8 ++ renderer.cpp | 109 +++++++++++------- renderer.h | 2 + scene.cpp | 298 +++++++++++++++++++++++++++++++++++++++++-------- scene.h | 58 ++++++++-- scenenode.cpp | 206 ++++++++++++++++++++++++++++++++++ scenenode.h | 57 ++++++++++ simulation.cpp | 36 +++++- 25 files changed, 1062 insertions(+), 244 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 56eaa3b1..ae83516b 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -232,9 +232,14 @@ void TAnimContainer::UpdateModel() { fTranslateSpeed = 0.0; // wyłączenie przeliczania wektora if (LengthSquared3(vTranslation) <= 0.0001) // jeśli jest w punkcie początkowym iAnim &= ~2; // wyłączyć zmianę pozycji submodelu - if (evDone) - Global::AddToQuery(evDone, NULL); // wykonanie eventu informującego o - // zakończeniu + if( evDone ) { + // wykonanie eventu informującego o zakończeniu +#ifdef EU07_USE_OLD_GROUNDCODE + Global::AddToQuery( evDone, NULL ); +#else + simulation::Events.AddToQuery( evDone, nullptr ); +#endif + } } } if (fRotateSpeed != 0.0) @@ -299,9 +304,14 @@ void TAnimContainer::UpdateModel() { if (!anim) { // nie potrzeba przeliczać już fRotateSpeed = 0.0; - if (evDone) - Global::AddToQuery(evDone, NULL); // wykonanie eventu informującego o - // zakończeniu + if( evDone ) { + // wykonanie eventu informującego o zakończeniu +#ifdef EU07_USE_OLD_GROUNDCODE + Global::AddToQuery( evDone, NULL ); +#else + simulation::Events.AddToQuery( evDone, nullptr ); +#endif + } } } if( fAngleSpeed != 0.f ) { @@ -330,7 +340,11 @@ void TAnimContainer::PrepareModel() fAngleSpeed = 0.0; // wyłączenie przeliczania wektora if( evDone ) { // wykonanie eventu informującego o zakończeniu +#ifdef EU07_USE_OLD_GROUNDCODE Global::AddToQuery( evDone, NULL ); +#else + simulation::Events.AddToQuery( evDone, nullptr ); +#endif } } else diff --git a/AnimModel.h b/AnimModel.h index 47d1c25a..a1528cdd 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -149,6 +149,10 @@ public: material_data const * Material() const { return &m_materialdata; } + inline + TModel3d * + Model() { + return pModel; } // members static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania diff --git a/Camera.cpp b/Camera.cpp index ef589bc5..175a8773 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -18,9 +18,6 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- -// TViewPyramid TCamera::OrgViewPyramid; -//={vector3(-1,1,1),vector3(1,1,1),vector3(-1,-1,1),vector3(1,-1,1),vector3(0,0,0)}; - void TCamera::Init(vector3 NPos, vector3 NAngle) { @@ -37,8 +34,8 @@ void TCamera::Init(vector3 NPos, vector3 NAngle) void TCamera::OnCursorMove(double x, double y) { // McZapkie-170402: zeby mysz dzialala zawsze if (Type==tp_Follow) - Pitch += y; - Yaw += -x; + Yaw -= x; + Pitch -= y; if (Yaw > M_PI) Yaw -= 2 * M_PI; else if (Yaw < -M_PI) @@ -62,7 +59,7 @@ TCamera::OnCommand( command_data const &Command ) { OnCursorMove( reinterpret_cast( Command.param1 ) * 0.005 * Global::fMouseXScale / Global::ZoomFactor, - reinterpret_cast( Command.param2 ) * -0.01 * Global::fMouseYScale / Global::ZoomFactor ); + reinterpret_cast( Command.param2 ) * 0.01 * Global::fMouseYScale / Global::ZoomFactor ); break; } diff --git a/DynObj.cpp b/DynObj.cpp index beb068b2..b4ec1427 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -5501,3 +5501,18 @@ vehicle_table::update_traction( TDynamicObject *Vehicle ) { } } } + +// legacy method, sends list of vehicles over network +void +vehicle_table::DynamicList( bool const Onlycontrolled ) const { + // odesłanie nazw pojazdów dostępnych na scenerii (nazwy, szczególnie wagonów, mogą się powtarzać!) + for( auto const *vehicle : m_items ) { + if( ( false == Onlycontrolled ) + || ( vehicle->Mechanik != nullptr ) ) { + // same nazwy pojazdów + multiplayer::WyslijString( vehicle->asName, 6 ); + } + } + // informacja o końcu listy + multiplayer::WyslijString( "none", 6 ); +} diff --git a/DynObj.h b/DynObj.h index 8670ea20..931ba255 100644 --- a/DynObj.h +++ b/DynObj.h @@ -495,6 +495,9 @@ public: // legacy method, checks for presence and height of traction wire for specified vehicle void update_traction( TDynamicObject *Vehicle ); + // legacy method, sends list of vehicles over network + void + DynamicList( bool const Onlycontrolled = false ) const; }; //--------------------------------------------------------------------------- diff --git a/Event.cpp b/Event.cpp index 398b7699..daf24862 100644 --- a/Event.cpp +++ b/Event.cpp @@ -46,8 +46,7 @@ TEvent::~TEvent() { switch (Type) { // sprzątanie case tp_Multiple: - // SafeDeleteArray(Params[9].asText); //nie usuwać - nazwa obiektu powiązanego zamieniana na - // wskaźnik + // SafeDeleteArray(Params[9].asText); //nie usuwać - nazwa obiektu powiązanego zamieniana na wskaźnik if (iFlags & conditional_memstring) // o ile jest łańcuch do porównania w memcompare SafeDeleteArray(Params[10].asText); break; @@ -82,8 +81,7 @@ void TEvent::Conditions(cParser *parser, std::string s) if (!asNodeName.empty()) { // podczepienie łańcucha, jeśli nie jest pusty // BUG: source of a memory leak -- the array never gets deleted. fix the destructor - Params[9].asText = new char[asNodeName.size() + 1]; // usuwane i zamieniane na - // wskaźnik + Params[9].asText = new char[asNodeName.size() + 1]; // usuwane i zamieniane na wskaźnik strcpy(Params[9].asText, asNodeName.c_str()); } parser->getTokens(); @@ -860,17 +858,17 @@ event_manager::AddToQuery( TEvent *Event, TDynamicObject *Owner ) { } //if (DebugModeFlag) WriteLog( - "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues & Track command ( " - + std::string( Event->Params[ 0 ].asText ) + " " - + std::to_string( Event->Params[ 1 ].asdouble ) + " " - + std::to_string( Event->Params[ 2 ].asdouble ) + " )" ); + "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues & Track command - [" + + std::string{ Event->Params[ 0 ].asText } + "] [" + + to_string( Event->Params[ 1 ].asdouble, 2 ) + "] [" + + to_string( Event->Params[ 2 ].asdouble, 2 ) + " ]" ); } //else if (DebugModeFlag) WriteLog( - "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues ( " - + std::string( Event->Params[ 0 ].asText ) + " " - + std::to_string( Event->Params[ 1 ].asdouble ) + " " - + std::to_string( Event->Params[ 2 ].asdouble ) + " )" ); + "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues - [" + + std::string( Event->Params[ 0 ].asText ) + "] [" + + to_string( Event->Params[ 1 ].asdouble, 2 ) + "] [" + + to_string( Event->Params[ 2 ].asdouble, 2 ) + "]" ); } // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) do { @@ -975,13 +973,11 @@ event_manager::CheckQuery() { break; case tp_GetValues: { if( m_workevent->Activator ) { -/* // TODO: re-enable when messaging module is in place if( Global::iMultiplayer ) { // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) - WyslijEvent( tmpEvent->asName, tmpEvent->Activator->name() ); + multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); } -*/ m_workevent->Params[ 9 ].asMemCell->PutCommand( m_workevent->Activator->Mechanik, #ifdef EU07_USE_OLD_GROUNDCODE @@ -1124,13 +1120,10 @@ event_manager::CheckQuery() { m_workevent->Params[ 1 ].asdouble, m_workevent->Params[ 2 ].asdouble ); } -/* - // TODO: re-enable when messaging module is in place if( Global::iMultiplayer ) { // dajemy znać do serwera o przełożeniu - WyslijEvent( m_workevent->asName, "" ); // wysłanie nazwy eventu przełączajacego + multiplayer::WyslijEvent( m_workevent->asName, "" ); // wysłanie nazwy eventu przełączajacego } -*/ // Ra: bardziej by się przydała nazwa toru, ale nie ma do niej stąd dostępu break; } @@ -1170,21 +1163,18 @@ event_manager::CheckQuery() { } } } -/* - // TODO: re-enable when messaging component is in place if( Global::iMultiplayer ) { // dajemy znać do serwera o wykonaniu if( ( m_workevent->iFlags & conditional_anyelse ) == 0 ) { // jednoznaczne tylko, gdy nie było else if( m_workevent->Activator ) { - WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); + multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); } else { - WyslijEvent( m_workevent->asName, "" ); + multiplayer::WyslijEvent( m_workevent->asName, "" ); } } } -*/ } break; } @@ -1273,8 +1263,8 @@ event_manager::CheckQuery() { + to_string( m_workevent->Params[ 9 ].asMemCell->Value2(), 2 ) + "]" ); } else { - // TODO: re-enable when cell manager is in place /* + // TODO: re-enable when cell manager is in place // lista wszystkich for( TGroundNode *Current = nRootOfType[ TP_MEMCELL ]; Current; Current = Current->nNext ) { WriteLog( "Memcell \"" + Current->asName + "\": " diff --git a/Globals.cpp b/Globals.cpp index f0e85b79..9544503e 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -1001,13 +1001,12 @@ TDynamicObject *Global::DynamicNearest() { // ustalenie pojazdu najbliższego kamerze return pGround->DynamicNearest(pCamera->Pos); }; -#endif TDynamicObject *Global::CouplerNearest() { // ustalenie pojazdu najbliższego kamerze return pGround->CouplerNearest(pCamera->Pos); }; - +#endif bool Global::AddToQuery(TEvent *event, TDynamicObject *who) { #ifdef EU07_USE_OLD_GROUNDCODE @@ -1016,6 +1015,7 @@ bool Global::AddToQuery(TEvent *event, TDynamicObject *who) return simulation::Events.AddToQuery( event, who ); #endif }; + //--------------------------------------------------------------------------- bool Global::DoEvents() diff --git a/Globals.h b/Globals.h index e3e15a8d..46ce880c 100644 --- a/Globals.h +++ b/Globals.h @@ -299,8 +299,8 @@ class Global static std::string GetNextSymbol(); #ifdef EU07_USE_OLD_GROUNDCODE static TDynamicObject * DynamicNearest(); -#endif static TDynamicObject * CouplerNearest(); +#endif static bool AddToQuery(TEvent *event, TDynamicObject *who); static bool DoEvents(); static std::string Bezogonkow(std::string str, bool _ = false); diff --git a/Ground.cpp b/Ground.cpp index b5f14519..c628faa3 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -243,7 +243,9 @@ void TSubRect::NodeAdd(TGroundNode *Node) break; case TP_TRACK: // TODO: tory z cieniem (tunel, canyon) też dać bez łączenia? ++iTracks; // jeden tor więcej +#ifdef EU07_USE_OLD_GROUNDCODE Node->pTrack->RaOwnerSet(this); // do którego sektora ma zgłaszać animację +#endif // NOTE: track merge/sort temporarily disabled to simplify unification of render code // TODO: refactor sorting as universal part of drawing process in the renderer Node->nNext3 = nRenderRect; @@ -340,6 +342,7 @@ TTrack * TSubRect::FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude) return NULL; }; +#ifdef EU07_USE_OLD_GROUNDCODE bool TSubRect::RaTrackAnimAdd(TTrack *t) { // aktywacja animacji torów w VBO (zwrotnica, obrotnica) if( false == m_geometrycreated ) { @@ -365,6 +368,7 @@ void TSubRect::RaAnimate( unsigned int const Framestamp ) { m_framestamp = Framestamp; }; +#endif TTraction * TSubRect::FindTraction(glm::dvec3 const &Point, int &iConnection, TTraction *Exclude) { // szukanie przęsła w sektorze, którego koniec jest najbliższy (*Point) @@ -604,7 +608,7 @@ TGroundNode * TGround::DynamicFind(std::string const &Name) return Current; return NULL; }; -#endif + void TGround::DynamicList(bool all) { // odesłanie nazw pojazdów dostępnych na scenerii (nazwy, szczególnie wagonów, mogą się @@ -614,7 +618,7 @@ TGround::DynamicList(bool all) multiplayer::WyslijString(Current->asName, 6); // same nazwy pojazdów multiplayer::WyslijString("none", 6); // informacja o końcu listy }; -#ifdef EU07_USE_OLD_GROUNDCODE + // wyszukiwanie obiektu o podanej nazwie i konkretnym typie TGroundNode * TGround::FindGroundNode(std::string const &asNameToFind, TGroundNodeType const iNodeType) { @@ -648,7 +652,7 @@ TGround::GetRect( double x, double z ) { return nullptr; } }; - +#ifdef EU07_USE_OLD_GROUNDCODE // convert tp_terrain model to a series of triangle nodes void TGround::convert_terrain( TGroundNode const *Terrain ) { @@ -683,7 +687,7 @@ TGround::convert_terrain( TSubModel const *Submodel ) { delete groundnode; } } - +#endif double fTrainSetVel = 0; double fTrainSetDir = 0; double fTrainSetDist = 0; // odległość składu od punktu 1 w stronę punktu 2 @@ -2766,7 +2770,7 @@ void TGround::InitTraction() } delete[] nEnds; // nie potrzebne już }; -#endif + void TGround::TrackJoin(TGroundNode *Current) { // wyszukiwanie sąsiednich torów do podłączenia (wydzielone na użytek obrotnicy) TTrack *Track = Current->pTrack; @@ -2774,11 +2778,7 @@ void TGround::TrackJoin(TGroundNode *Current) int iConnection; if (!Track->CurrentPrev()) { -#ifdef EU07_USE_OLD_GROUNDCODE tmp = FindTrack(Track->CurrentSegment()->FastGetPoint_0(), iConnection, Current); // Current do pominięcia -#else - std::tie( tmp, iConnection ) = simulation::Region->find_path( Track->CurrentSegment()->FastGetPoint_0(), Track ); -#endif switch (iConnection) { case 0: @@ -2791,11 +2791,7 @@ void TGround::TrackJoin(TGroundNode *Current) } if (!Track->CurrentNext()) { -#ifdef EU07_USE_OLD_GROUNDCODE tmp = FindTrack(Track->CurrentSegment()->FastGetPoint_1(), iConnection, Current); -#else - std::tie( tmp, iConnection ) = simulation::Region->find_path( Track->CurrentSegment()->FastGetPoint_1(), Track ); -#endif switch (iConnection) { case 0: @@ -2807,7 +2803,7 @@ void TGround::TrackJoin(TGroundNode *Current) } } } -#ifdef EU07_USE_OLD_GROUNDCODE + // McZapkie-070602: wyzwalacze zdarzen bool TGround::InitLaunchers() { @@ -3755,7 +3751,7 @@ bool TGround::GetTraction(TDynamicObject *model) return true; }; -#endif + //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -3800,6 +3796,7 @@ TDynamicObject * TGround::DynamicNearest(vector3 pPosition, double distance, boo } return dyn; }; + TDynamicObject * TGround::CouplerNearest(vector3 pPosition, double distance, bool mech) { // wyszukanie pojazdu, którego sprzęg jest najbliżej względem (pPosition) TGroundNode *node; @@ -3829,6 +3826,7 @@ TDynamicObject * TGround::CouplerNearest(vector3 pPosition, double distance, boo } return dyn; }; +#endif //--------------------------------------------------------------------------- void TGround::DynamicRemove(TDynamicObject *dyn) { // Ra: usunięcie pojazdów ze scenerii (gdy dojadą na koniec i nie sa potrzebne) @@ -3951,7 +3949,7 @@ void TGround::TerrainWrite() }; //--------------------------------------------------------------------------- - +#ifdef EU07_USE_OLD_GROUNDCODE void TGround::TrackBusyList() { // wysłanie informacji o wszystkich zajętych odcinkach TGroundNode *Current; @@ -3987,6 +3985,7 @@ void TGround::IsolatedBusy(const std::string t) } multiplayer::WyslijString(t, 10); // wolny }; +#endif //--------------------------------------------------------------------------- void TGround::Silence(vector3 gdzie) diff --git a/Ground.h b/Ground.h index 3452cdbd..8844752d 100644 --- a/Ground.h +++ b/Ground.h @@ -128,14 +128,8 @@ public: void InitNormals(); void RenderHidden(); // obsługa dźwięków i wyzwalaczy zdarzeń }; -/* -struct bounding_area { - glm::vec3 center; // mid point of the rectangle - float radius { 0.0f }; // radius of the bounding sphere -}; -*/ -class TSubRect : /*public Resource,*/ public CMesh +class TSubRect : public CMesh { // sektor składowy kwadratu kilometrowego public: scene::bounding_area m_area; @@ -165,8 +159,10 @@ class TSubRect : /*public Resource,*/ public CMesh void Sort(); // optymalizacja obiektów w sektorze (sortowanie wg tekstur) TTrack * FindTrack(vector3 *Point, int &iConnection, TTrack *Exclude); TTraction * FindTraction(glm::dvec3 const &Point, int &iConnection, TTraction *Exclude); +#ifdef EU07_USE_OLD_GROUNDCODE bool RaTrackAnimAdd(TTrack *t); // zgłoszenie toru do animacji void RaAnimate( unsigned int const Framestamp ); // przeliczenie animacji torów +#endif void RenderSounds(); // dźwięki pojazdów z niewidocznych sektorów }; @@ -273,9 +269,6 @@ class TGround bool CheckQuery(); TGroundNode * DynamicFindAny(std::string const &Name); TGroundNode * DynamicFind(std::string const &Name); -#endif - void DynamicList(bool all = false); -#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode * FindGroundNode(std::string const &asNameToFind, TGroundNodeType const iNodeType); #endif TGroundRect * GetRect( double x, double z ); @@ -295,25 +288,23 @@ class TGround return (int)(x / fSubRectSize + fHalfTotalNumSubRects); }; #ifdef EU07_USE_OLD_GROUNDCODE TEvent * FindEvent(const std::string &asEventName); -#endif void TrackJoin(TGroundNode *Current); - private: // convert tp_terrain model to a series of triangle nodes void convert_terrain( TGroundNode const *Terrain ); void convert_terrain( TSubModel const *Submodel ); -#ifdef EU07_USE_OLD_GROUNDCODE void RaTriangleDivider(TGroundNode *node); - void Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam); #endif public: +#ifdef EU07_USE_OLD_GROUNDCODE + void DynamicList( bool all = false ); void TrackBusyList(); void IsolatedBusyList(); void IsolatedBusy( const std::string t ); - void RadioStop(vector3 pPosition); TDynamicObject * DynamicNearest(vector3 pPosition, double distance = 20.0, bool mech = false); TDynamicObject * CouplerNearest(vector3 pPosition, double distance = 20.0, bool mech = false); +#endif void DynamicRemove(TDynamicObject *dyn); void TerrainRead(std::string const &f); void TerrainWrite(); diff --git a/MemCell.cpp b/MemCell.cpp index dcbba49c..63c27b40 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -176,8 +176,14 @@ void TMemCell::StopCommandSent() if (!bCommand) return; bCommand = false; - if (OnSent) // jeśli jest event - Global::AddToQuery(OnSent, NULL); + if( OnSent ) { + // jeśli jest event +#ifdef EU07_USE_OLD_GROUNDCODE + Global::AddToQuery( OnSent, NULL ); +#else + simulation::Events.AddToQuery( OnSent, nullptr ); +#endif + } }; void TMemCell::AssignEvents(TEvent *e) diff --git a/Model3d.cpp b/Model3d.cpp index f2ce05be..0cbdfb17 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -19,7 +19,9 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others #include "logs.h" #include "mczapkie/mctools.h" #include "Usefull.h" +#ifdef EU07_USE_OLD_GROUNDCODE #include "ground.h" +#endif #include "renderer.h" #include "Timer.h" #include "mtable.h" @@ -988,11 +990,11 @@ TSubModel::create_geometry( std::size_t &Dataoffset, geometrybank_handle const & // data offset is used to determine data offset of each submodel into single shared geometry bank // (the offsets are part of legacy system which we now need to work around for backward compatibility) - if( Child ) Child->create_geometry( Dataoffset, Bank ); if( false == Vertices.empty() ) { + tVboPtr = static_cast( Dataoffset ); Dataoffset += Vertices.size(); // conveniently all relevant custom node types use GL_POINTS, or we'd have to determine the type on individual basis @@ -1003,10 +1005,29 @@ TSubModel::create_geometry( std::size_t &Dataoffset, geometrybank_handle const & m_geometry = GfxRenderer.Insert( Vertices, Bank, type ); } + if( m_geometry != NULL ) { + // calculate bounding radius while we're at it + // NOTE: doesn't take into account transformation hierarchy TODO: implement it + float squaredradius{ 0.f }; + for( auto const &vertex : GfxRenderer.Vertices( m_geometry ) ) { + squaredradius = static_cast( glm::length2( vertex.position ) ); + if( squaredradius > m_boundingradius ) { + m_boundingradius = squaredradius; + } + } + if( m_boundingradius > 0.f ) { m_boundingradius = std::sqrt( m_boundingradius ); } + if( Parent ) { + // propagate radius up the chain + Parent->m_boundingradius = std::max( + Parent->m_boundingradius, + m_boundingradius ); + } + } + if( Next ) Next->create_geometry( Dataoffset, Bank ); } - +#ifdef EU07_USE_OLD_GROUNDCODE // places contained geometry in provided ground node void TSubModel::convert( TGroundNode &Groundnode ) const { @@ -1063,7 +1084,7 @@ TSubModel::convert( TGroundNode &Groundnode ) const { Groundnode.fSquareRadius += squareradius; } } - +#endif void TSubModel::ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ) { // ustawienie kolorów dla modelu terenu f4Ambient = glm::vec4( Ambient, 1.0f ); @@ -1759,18 +1780,11 @@ void TModel3d::Init() return; // operacje zostały już wykonane if (Root) { - if (iFlags & 0x0200) // jeśli wczytano z pliku tekstowego - { // jest jakiś dziwny błąd, że obkręcany ma być tylko ostatni submodel - // głównego łańcucha - // TSubModel *p=Root; - // do - //{p->InitialRotate(true); //ostatniemu należy się konwersja układu - // współrzędnych - // p=p->NextGet(); - //} - // while (p->NextGet()) - // Root->InitialRotate(false); //a poprzednim tylko optymalizacja - Root->InitialRotate(true); // argumet określa, czy wykonać pierwotny obrót + if (iFlags & 0x0200) { + // jeśli wczytano z pliku tekstowego jest jakiś dziwny błąd, + // że obkręcany ma być tylko ostatni submodel głównego łańcucha + // argumet określa, czy wykonać pierwotny obrót + Root->InitialRotate(true); } iFlags |= Root->FlagsCheck() | 0x8000; // flagi całego modelu if (iNumVerts) { @@ -1788,11 +1802,6 @@ void TModel3d::Init() } }; -void TModel3d::BreakHierarhy() -{ - Error("Not implemented yet :("); -}; - //----------------------------------------------------------------------------- // 2012-02 funkcje do tworzenia terenu z E3D //----------------------------------------------------------------------------- diff --git a/Model3d.h b/Model3d.h index 181bd93a..863c962d 100644 --- a/Model3d.h +++ b/Model3d.h @@ -50,7 +50,12 @@ enum TAnimType // rodzaj animacji at_Undefined = 0x800000FF // animacja chwilowo nieokreślona }; +#ifdef EU07_USE_OLD_GROUNDCODE class TGroundNode; +#endif +namespace scene { +class shape_node; +} class TSubModel { // klasa submodelu - pojedyncza siatka, punkt świetlny albo grupa punktów @@ -59,6 +64,7 @@ class TSubModel friend class opengl_renderer; friend class TModel3d; // temporary workaround. TODO: clean up class content/hierarchy friend class TDynamicObject; // temporary etc + friend class scene::shape_node; // temporary etc public: enum normalization { @@ -131,10 +137,8 @@ private: public: // chwilowo float3 v_TransVector { 0.0f, 0.0f, 0.0f }; -/* - basic_vertex *Vertices; // roboczy wskaźnik - wczytanie T3D do VBO -*/ vertex_array Vertices; + float m_boundingradius { 0 }; size_t iAnimOwner{ 0 }; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim{ at_None }; // kody animacji oddzielnie, bo zerowane public: @@ -163,9 +167,6 @@ public: TSubModel * NextGet() { return Next; }; TSubModel * ChildGet() { return Child; }; int TriangleAdd(TModel3d *m, material_handle tex, int tri); -/* - basic_vertex * TrianglePtr(int tex, int pos, glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ); -*/ void SetRotate(float3 vNewRotateAxis, float fNewAngle); void SetRotateXYZ(vector3 vNewAngles); void SetRotateXYZ(float3 vNewAngles); @@ -215,8 +216,9 @@ public: std::vector&); void serialize_geometry( std::ostream &Output ) const; // places contained geometry in provided ground node +#ifdef EU07_USE_OLD_GROUNDCODE void convert( TGroundNode &Groundnode ) const; - +#endif }; class TModel3d : public CMesh @@ -236,6 +238,11 @@ private: std::string asBinary; // nazwa pod którą zapisać model binarny std::string m_filename; public: + float bounding_radius() const { + return ( + Root ? + Root->m_boundingradius : + 0.f ); } inline TSubModel * GetSMRoot() { return (Root); }; TModel3d(); ~TModel3d(); @@ -246,7 +253,6 @@ public: void LoadFromBinFile(std::string const &FileName, bool dynamic); bool LoadFromFile(std::string const &FileName, bool dynamic); void SaveToBinFile(std::string const &FileName); - void BreakHierarhy(); int Flags() const { return iFlags; }; void Init(); std::string NameGet() { return m_filename; }; diff --git a/Track.cpp b/Track.cpp index dccdb40b..3266e5c0 100644 --- a/Track.cpp +++ b/Track.cpp @@ -84,16 +84,14 @@ TIsolated::TIsolated(std::string const &n, TIsolated *i) : // utworznie obwodu izolowanego. nothing to do here. }; -// TODO: put this in the cleanup routine on exit - /* - TIsolated *p=pRoot; - while (pRoot) - { - p=pRoot; - p->pNext=NULL; - delete p; - } - */ +void TIsolated::DeleteAll() { + + while( pRoot ) { + auto *next = pRoot->Next(); + delete pRoot; + pRoot = next; + } +} TIsolated * TIsolated::Find(std::string const &n) { // znalezienie obiektu albo utworzenie nowego @@ -1065,7 +1063,11 @@ bool TTrack::InMovement() return false; }; +#ifdef EU07_USE_OLD_GROUNDCODE void TTrack::RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined) +#else +void TTrack::RaAssign( scene::basic_cell *gn, TAnimModel *am, TEvent *done, TEvent *joined ) +#endif { // Ra: wiązanie toru z modelem obrotnicy if (eType == tt_Table) { @@ -2259,7 +2261,7 @@ bool TTrack::Switch(int i, float const t, float const d) } else if (eType == tt_Table) { // blokowanie (0, szukanie torów) lub odblokowanie (1, rozłączenie) obrotnicy - if (i) + if (i) // NOTE: this condition seems opposite to intention/comment? TODO: investigate this { // 0: rozłączenie sąsiednich torów od obrotnicy if (trPrev) // jeśli jest tor od Point1 obrotnicy if (iPrevDirection) // 0:dołączony Point1, 1:dołączony Point2 @@ -2276,25 +2278,34 @@ bool TTrack::Switch(int i, float const t, float const d) fVelocity = 0.0; // AI, nie ruszaj się! if (SwitchExtension->pOwner) SwitchExtension->pOwner->RaTrackAnimAdd(this); // dodanie do listy animacyjnej + // TODO: unregister path ends in the owner cell } else { // 1: ustalenie finalnego położenia (gdy nie było animacji) RaAnimate(); // ostatni etap animowania // zablokowanie pozycji i połączenie do sąsiednich torów + // TODO: register new position of the path endpoints with the region +#ifdef EU07_USE_OLD_GROUNDCODE Global::pGround->TrackJoin(SwitchExtension->pMyNode); +#else + simulation::Region->TrackJoin( this ); +#endif if (trNext || trPrev) { fVelocity = 6.0; // jazda dozwolona - if (trPrev) - if (trPrev->fVelocity == - 0.0) // ustawienie 0 da możliwość zatrzymania AI na obrotnicy - trPrev->VelocitySet(6.0); // odblokowanie dołączonego toru do jazdy - if (trNext) - if (trNext->fVelocity == 0.0) - trNext->VelocitySet(6.0); - if (SwitchExtension->evPlus) // w starych sceneriach może nie być - Global::AddToQuery(SwitchExtension->evPlus, - NULL); // potwierdzenie wykonania (np. odpala WZ) + if( ( trPrev ) + && ( trPrev->fVelocity == 0.0 ) ) { + // ustawienie 0 da możliwość zatrzymania AI na obrotnicy + trPrev->VelocitySet( 6.0 ); // odblokowanie dołączonego toru do jazdy + } + if( ( trNext ) + && ( trNext->fVelocity == 0.0 ) ) { + trNext->VelocitySet( 6.0 ); + } + if( SwitchExtension->evPlus ) { // w starych sceneriach może nie być + // potwierdzenie wykonania (np. odpala WZ) + Global::AddToQuery( SwitchExtension->evPlus, nullptr ); + } } } SwitchExtension->CurrentIndex = i; // zapamiętanie stanu zablokowania @@ -2528,7 +2539,11 @@ TTrack * TTrack::RaAnimate() cosa = -hlen * std::cos(glm::radians(SwitchExtension->fOffset)); SwitchExtension->vTrans = ac->TransGet(); vector3 middle = +#ifdef EU07_USE_OLD_GROUNDCODE SwitchExtension->pMyNode->pCenter + +#else + SwitchExtension->pMyNode->area().center + +#endif SwitchExtension->vTrans; // SwitchExtension->Segments[0]->FastGetPoint(0.5); Segment->Init(middle + vector3(sina, 0.0, cosa), middle - vector3(sina, 0.0, cosa), 5.0); // nowy odcinek @@ -2774,6 +2789,11 @@ TTrack * TTrack::Connected(int s, double &d) const +path_table::~path_table() { + + TIsolated::DeleteAll(); +} + // legacy method, initializes tracks after deserialization from scenario file void path_table::InitTracks() { @@ -2957,3 +2977,46 @@ path_table::InitTracks() { isolated = isolated->Next(); } } + +// legacy method, sends list of occupied paths over network +void +path_table::TrackBusyList() const { + // wysłanie informacji o wszystkich zajętych odcinkach + for( auto const *path : m_items ) { + if( ( false == path->name().empty() ) // musi być nazwa + && ( false == path->Dynamics.empty() ) ) { + // zajęty + multiplayer::WyslijString( path->name(), 8 ); + } + } +} + +// legacy method, sends list of occupied path sections over network +void +path_table::IsolatedBusyList() const { + // wysłanie informacji o wszystkich odcinkach izolowanych + TIsolated *Current; + for( Current = TIsolated::Root(); Current; Current = Current->Next() ) { + + if( Current->Busy() ) { multiplayer::WyslijString( Current->asName, 11 ); } + else { multiplayer::WyslijString( Current->asName, 10 ); } + } + multiplayer::WyslijString( "none", 10 ); // informacja o końcu listy +} + +// legacy method, sends state of specified path section over network +void +path_table::IsolatedBusy( std::string const &Name ) const { + // wysłanie informacji o odcinku izolowanym (t) + // Ra 2014-06: do wyszukania użyć drzewka nazw + TIsolated *Current; + for( Current = TIsolated::Root(); Current; Current = Current->Next() ) { + if( Current->asName == Name ) { + if( Current->Busy() ) { multiplayer::WyslijString( Current->asName, 11 ); } + else { multiplayer::WyslijString( Current->asName, 10 ); } + // nie sprawdzaj dalszych + return; + } + } + multiplayer::WyslijString( Name, 10 ); // wolny (technically not found but, eh) +} diff --git a/Track.h b/Track.h index 7ff04d3f..59102064 100644 --- a/Track.h +++ b/Track.h @@ -13,11 +13,15 @@ http://mozilla.org/MPL/2.0/. #include #include -#include "scenenode.h" #include "Segment.h" #include "material.h" +#include "scenenode.h" #include "names.h" +namespace scene { +class basic_cell; +} + enum TTrackType { tt_Unknown, tt_Normal, @@ -71,7 +75,11 @@ class TSwitchExtension }; struct { // zmienne potrzebne tylko dla obrotnicy/przesuwnicy +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode *pMyNode; // dla obrotnicy do wtórnego podłączania torów +#else + scene::basic_cell *pMyNode; // TODO: convert this to observer pattern +#endif // TAnimContainer *pAnim; //animator modelu dla obrotnicy TAnimModel *pModel; // na razie model }; @@ -83,7 +91,11 @@ class TSwitchExtension }; }; bool bMovement = false; // czy w trakcie animacji +#ifdef EU07_USE_OLD_GROUNDCODE TSubRect *pOwner = nullptr; // sektor, któremu trzeba zgłosić animację +#else + scene::basic_cell *pOwner = nullptr; // TODO: convert this to observer pattern +#endif TTrack *pNextAnim = nullptr; // następny tor do animowania TEvent *evPlus = nullptr, *evMinus = nullptr; // zdarzenia sygnalizacji rozprucia @@ -103,6 +115,7 @@ class TIsolated TMemCell *pMemCell = nullptr; // automatyczna komórka pamięci, która współpracuje z odcinkiem izolowanym TIsolated(); TIsolated(const std::string &n, TIsolated *i); + static void DeleteAll(); static TIsolated * Find(const std::string &n); // znalezienie obiektu albo utworzenie nowego void Modify(int i, TDynamicObject *o); // dodanie lub odjęcie osi bool Busy() { @@ -245,11 +258,20 @@ public: #endif void RenderDynSounds(); // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania +#ifdef EU07_USE_OLD_GROUNDCODE void RaOwnerSet(TSubRect *o) { if (SwitchExtension) SwitchExtension->pOwner = o; }; +#else + void RaOwnerSet( scene::basic_cell *o ) { + if( SwitchExtension ) { SwitchExtension->pOwner = o; } }; +#endif bool InMovement(); // czy w trakcie animacji? +#ifdef EU07_USE_OLD_GROUNDCODE void RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined); +#else + void RaAssign( scene::basic_cell *gn, TAnimModel *am, TEvent *done, TEvent *joined ); +#endif void RaAnimListAdd(TTrack *t); TTrack * RaAnimate(); @@ -278,9 +300,19 @@ public: class path_table : public basic_table { public: + ~path_table(); // legacy method, initializes tracks after deserialization from scenario file void InitTracks(); + // legacy method, sends list of occupied paths over network + void + TrackBusyList() const; + // legacy method, sends list of occupied path sections over network + void + IsolatedBusyList() const; + // legacy method, sends state of specified path section over network + void + IsolatedBusy( std::string const &Name ) const; }; //--------------------------------------------------------------------------- diff --git a/World.cpp b/World.cpp index 3f127841..ab2bafe9 100644 --- a/World.cpp +++ b/World.cpp @@ -318,6 +318,8 @@ bool TWorld::Init( GLFWwindow *Window ) { Controlled = NULL; mvControlled = NULL; Camera.Type = tp_Free; + DebugCamera = Camera; + Global::DebugCameraPosition = DebugCamera.Pos; } // if (!Global::bMultiplayer) //na razie włączone @@ -543,7 +545,7 @@ void TWorld::OnKeyDown(int cKey) #ifdef EU07_USE_OLD_GROUNDCODE TDynamicObject *tmp = Ground.DynamicNearest( Camera.Pos, 50, true ); //łapiemy z obsadą #else - TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 50, true ) ); + TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 50, true, false ) ); #endif if( ( tmp != nullptr ) && ( tmp != Controlled ) ) { @@ -688,8 +690,12 @@ void TWorld::OnKeyDown(int cKey) } else if( ( cKey == GLFW_KEY_PAUSE ) && ( Global::ctrlState ) && ( Global::shiftState ) ) { //[Ctrl]+[Break] hamowanie wszystkich pojazdów w okolicy // added shift to prevent odd issue with glfw producing pause presses on its own - if (Controlled->MoverParameters->Radio) - Ground.RadioStop(Camera.Pos); + if( Controlled->MoverParameters->Radio ) +#ifdef EU07_USE_OLD_GROUNDCODE + Ground.RadioStop( Camera.Pos ); +#else + simulation::Region->RadioStop( Camera.Pos ); +#endif } else if (!Global::iPause) //||(cKey==VK_F4)) //podczas pauzy sterownaie nie działa, F4 tak if (Train) @@ -725,7 +731,7 @@ void TWorld::OnKeyDown(int cKey) #ifdef EU07_USE_OLD_GROUNDCODE TDynamicObject *temp = Global::DynamicNearest(); #else - TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false ) ); + TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ); #endif if (temp) { @@ -739,7 +745,11 @@ void TWorld::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_EndSign]) { // Ra 2014-07: zabrane z kabiny +#ifdef EU07_USE_OLD_GROUNDCODE TDynamicObject *tmp = Global::CouplerNearest(); // domyślnie wyszukuje do 20m +#else + TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, true ) ); +#endif if (tmp) { int CouplNr = (LengthSquared3(tmp->HeadPosition() - Camera.Pos) > @@ -772,7 +782,7 @@ void TWorld::OnKeyDown(int cKey) #ifdef EU07_USE_OLD_GROUNDCODE TDynamicObject *temp = Global::DynamicNearest(); #else - TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false ) ); + TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ); #endif if (temp) { @@ -795,7 +805,7 @@ void TWorld::OnKeyDown(int cKey) #ifdef EU07_USE_OLD_GROUNDCODE TDynamicObject *temp = Global::DynamicNearest(); #else - TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false ) ); + TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ); #endif if (temp) { @@ -835,6 +845,8 @@ void TWorld::InOutKey( bool const Near ) Train->Dynamic()->bDisplayCab = false; DistantView( Near ); } + DebugCamera = Camera; + Global::DebugCameraPosition = DebugCamera.Pos; } else { // jazda w kabinie @@ -1172,9 +1184,9 @@ TWorld::Update_Camera( double const Deltatime ) { if( !d ) d = Ground.DynamicNearest( Camera.Pos, 1000 ); // dalej szukanie, jesli bliżej nie ma #else - TDynamicObject *d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 300, false ) ); + TDynamicObject *d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 300, false, false ) ); if( !d ) - d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 1000, false ) ); // dalej szukanie, jesli bliżej nie ma + d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 1000, false, false ) ); // dalej szukanie, jesli bliżej nie ma #endif if( d && pDynamicNearest ) { // jeśli jakiś jest znaleziony wcześniej @@ -1361,7 +1373,7 @@ TWorld::Update_UI() { #ifdef EU07_USE_OLD_GROUNDCODE Ground.DynamicNearest( Camera.Pos ) : #else - std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false ) ) : + std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : #endif Controlled ); // w trybie latania lokalizujemy wg mapy @@ -1446,7 +1458,7 @@ TWorld::Update_UI() { #ifdef EU07_USE_OLD_GROUNDCODE Ground.DynamicNearest( Camera.Pos ) : #else - std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false ) ) : + std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : #endif Controlled ); // w trybie latania lokalizujemy wg mapy @@ -1714,7 +1726,7 @@ TWorld::Update_UI() { #ifdef EU07_USE_OLD_GROUNDCODE Ground.DynamicNearest( Camera.Pos ) : #else - std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false ) ) : + std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : #endif Controlled ); // w trybie latania lokalizujemy wg mapy if( tmp == nullptr ) { @@ -1908,7 +1920,6 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) + " rcvd" ); #ifdef EU07_USE_OLD_GROUNDCODE if( Global::iMultiplayer ) { - // WriteLog("Komunikat: "+AnsiString(pRozkaz->Name1)); TEvent *e = Ground.FindEvent( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); if( e ) @@ -1918,7 +1929,6 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) } #else if( Global::iMultiplayer ) { - // WriteLog("Komunikat: "+AnsiString(pRozkaz->Name1)); auto *event = simulation::Events.FindEvent( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); if( event != nullptr ) { if( ( event->Type == tp_Multiple ) @@ -2027,7 +2037,6 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) if (t) multiplayer::WyslijNamiary(t); // wysłanie informacji o pojeździe #else -/* // TODO: re-enable when messaging component is in place auto *vehicle = ( pRozkaz->cString[ 1 ] == '*' ? @@ -2036,27 +2045,42 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) if( vehicle != nullptr ) { multiplayer::WyslijNamiary( vehicle ); // wysłanie informacji o pojeździe } -*/ #endif } else { // dla pustego wysyłamy ramki 6 z nazwami pojazdów AI (jeśli potrzebne wszystkie, to rozpoznać np. "*") +#ifdef EU07_USE_OLD_GROUNDCODE Ground.DynamicList(); +#else + simulation::Vehicles.DynamicList(); +#endif } } break; case 8: // ponowne wysłanie informacji o zajętych odcinkach toru CommLog(Now() + " " + to_string(pRozkaz->iComm) + " all busy track" + " rcvd"); - Ground.TrackBusyList(); +#ifdef EU07_USE_OLD_GROUNDCODE + Ground.TrackBusyList(); +#else + simulation::Paths.TrackBusyList(); +#endif break; case 9: // ponowne wysłanie informacji o zajętych odcinkach izolowanych CommLog(Now() + " " + to_string(pRozkaz->iComm) + " all busy isolated" + " rcvd"); - Ground.IsolatedBusyList(); +#ifdef EU07_USE_OLD_GROUNDCODE + Ground.IsolatedBusyList(); +#else + simulation::Paths.IsolatedBusyList(); +#endif break; case 10: // badanie zajętości jednego odcinka izolowanego CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); +#ifdef EU07_USE_OLD_GROUNDCODE Ground.IsolatedBusy(std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0]))); +#else + simulation::Paths.IsolatedBusy( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); +#endif break; case 11: // ustawienie parametrów ruchu pojazdu // Ground.IsolatedBusy(AnsiString(pRozkaz->cString+1,(unsigned)(pRozkaz->cString[0]))); @@ -2096,7 +2120,25 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) } } #else - // TODO: implement + if( pRozkaz->cString[ 1 ] ) // jeśli długość nazwy jest niezerowa + { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #13 + auto *lookup = ( + pRozkaz->cString[ 2 ] == '*' ? + simulation::Vehicles.find( Global::asHumanCtrlVehicle ) : // nazwa pojazdu użytkownika + simulation::Vehicles.find( std::string( pRozkaz->cString + 2, (unsigned)pRozkaz->cString[ 1 ] ) ) ); // nazwa pojazdu + if( lookup == nullptr ) { break; } // nothing found, nothing to do + auto *d { lookup }; + while( d != nullptr ) { + d->Damage( pRozkaz->cString[ 0 ] ); + d = d->Next(); // pozostałe też + } + d = lookup->Prev(); + while( d != nullptr ) { + d->Damage( pRozkaz->cString[ 0 ] ); + d = d->Prev(); // w drugą stronę też + } + multiplayer::WyslijUszkodzenia( lookup->asName, lookup->MoverParameters->EngDmgFlag ); // zwrot informacji o pojeździe + } #endif break; } diff --git a/messaging.cpp b/messaging.cpp index 5024f6ee..94781707 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -93,6 +93,7 @@ WyslijWolny(const std::string &t) WyslijString(t, 4); // tor wolny } +#ifdef EU07_USE_OLD_GROUNDCODE void WyslijNamiary(TGroundNode *t) { // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby @@ -169,6 +170,84 @@ WyslijNamiary(TGroundNode *t) // WriteLog("Ramka poszla!"); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t->asName + " sent"); } +#else +void +WyslijNamiary(TDynamicObject const *Vehicle) +{ // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby + // WriteLog("Wysylam pojazd"); + DaneRozkaz r; + r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iComm = 7; // 7 - dane pojazdu + int i = 32; + size_t j = Vehicle->asName.length(); + r.iPar[0] = i; // ilość danych liczbowych + r.fPar[1] = Global::fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) + r.fPar[2] = Vehicle->MoverParameters->Loc.X; // pozycja X + r.fPar[3] = Vehicle->MoverParameters->Loc.Y; // pozycja Y + r.fPar[4] = Vehicle->MoverParameters->Loc.Z; // pozycja Z + r.fPar[5] = Vehicle->MoverParameters->V; // prędkość ruchu X + r.fPar[6] = Vehicle->MoverParameters->nrot * M_PI * + Vehicle->MoverParameters->WheelDiameter; // prędkość obrotowa kóŁ + r.fPar[7] = 0; // prędkość ruchu Z + r.fPar[8] = Vehicle->MoverParameters->AccS; // przyspieszenie X + r.fPar[9] = Vehicle->MoverParameters->AccN; // przyspieszenie Y //na razie nie + r.fPar[10] = Vehicle->MoverParameters->AccV; // przyspieszenie Z + r.fPar[11] = Vehicle->MoverParameters->DistCounter; // przejechana odległość w km + r.fPar[12] = Vehicle->MoverParameters->PipePress; // ciśnienie w PG + r.fPar[13] = Vehicle->MoverParameters->ScndPipePress; // ciśnienie w PZ + r.fPar[14] = Vehicle->MoverParameters->BrakePress; // ciśnienie w CH + r.fPar[15] = Vehicle->MoverParameters->Compressor; // ciśnienie w ZG + r.fPar[16] = Vehicle->MoverParameters->Itot; // Prąd całkowity + r.iPar[17] = Vehicle->MoverParameters->MainCtrlPos; // Pozycja NJ + r.iPar[18] = Vehicle->MoverParameters->ScndCtrlPos; // Pozycja NB + r.iPar[19] = Vehicle->MoverParameters->MainCtrlActualPos; // Pozycja jezdna + r.iPar[20] = Vehicle->MoverParameters->ScndCtrlActualPos; // Pozycja bocznikowania + r.iPar[21] = Vehicle->MoverParameters->ScndCtrlActualPos; // Pozycja bocznikowania + r.iPar[22] = Vehicle->MoverParameters->ResistorsFlag * 1 + + Vehicle->MoverParameters->ConverterFlag * 2 + + +Vehicle->MoverParameters->CompressorFlag * 4 + + Vehicle->MoverParameters->Mains * 8 + + +Vehicle->MoverParameters->DoorLeftOpened * 16 + + Vehicle->MoverParameters->DoorRightOpened * 32 + + +Vehicle->MoverParameters->FuseFlag * 64 + + Vehicle->MoverParameters->DepartureSignal * 128; + // WriteLog("Zapisalem stare"); + // WriteLog("Mam patykow "+IntToStr(t->DynamicObject->iAnimType[ANIM_PANTS])); + for (int p = 0; p < 4; p++) + { + // WriteLog("Probuje pant "+IntToStr(p)); + if (p < Vehicle->iAnimType[ANIM_PANTS]) + { + r.fPar[23 + p] = Vehicle->pants[p].fParamPants->PantWys; // stan pantografów 4 + // WriteLog("Zapisalem pant "+IntToStr(p)); + } + else + { + r.fPar[23 + p] = -2; + // WriteLog("Nie mam pant "+IntToStr(p)); + } + } + // WriteLog("Zapisalem pantografy"); + for (int p = 0; p < 3; p++) + r.fPar[27 + p] = + Vehicle->MoverParameters->ShowCurrent(p + 1); // amperomierze kolejnych grup + // WriteLog("zapisalem prady"); + r.iPar[30] = Vehicle->MoverParameters->WarningSignal; // trabienie + r.fPar[31] = Vehicle->MoverParameters->RunningTraction.TractionVoltage; // napiecie WN + // WriteLog("Parametry gotowe"); + i <<= 2; // ilość bajtów + r.cString[i] = char(j); // na końcu nazwa, żeby jakoś zidentyfikować + strcpy(r.cString + i + 1, Vehicle->asName.c_str()); // zakończony zerem + COPYDATASTRUCT cData; + cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.cbData = (DWORD)(10 + i + j); // 8+licznik i zero kończące + cData.lpData = &r; + // WriteLog("Ramka gotowa"); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + // WriteLog("Ramka poszla!"); + CommLog( Now() + " " + std::to_string(r.iComm) + " " + Vehicle->asName + " sent"); +} +#endif void WyslijObsadzone() diff --git a/messaging.h b/messaging.h index fd2826ac..c41dab05 100644 --- a/messaging.h +++ b/messaging.h @@ -11,7 +11,11 @@ http://mozilla.org/MPL/2.0/. #include +#ifdef EU07_USE_OLD_GROUNDCODE class TGroundNode; +#else +class TDynamicObject; +#endif namespace multiplayer { @@ -40,7 +44,11 @@ void Navigate( std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lPa void WyslijEvent( const std::string &e, const std::string &d ); void WyslijString( const std::string &t, int n ); void WyslijWolny( const std::string &t ); +#ifdef EU07_USE_OLD_GROUNDCODE void WyslijNamiary( TGroundNode *t ); +#else +void WyslijNamiary( TDynamicObject const *Vehicle ); +#endif void WyslijParam( int nr, int fl ); void WyslijUszkodzenia( const std::string &t, char fl ); void WyslijObsadzone(); // -> skladanie wielu pojazdow diff --git a/renderer.cpp b/renderer.cpp index d4a6b65e..143489df 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -349,6 +349,15 @@ opengl_renderer::Render() { void opengl_renderer::Render_pass( rendermode const Mode ) { +#ifdef EU07_USE_DEBUG_CAMERA + // setup world camera for potential visualization + setup_pass( + m_worldcamera, + rendermode::color, + 0.f, + 1.0, + true ); +#endif setup_pass( m_renderpass, Mode ); switch( m_renderpass.draw_mode ) { @@ -365,14 +374,6 @@ opengl_renderer::Render_pass( rendermode const Mode ) { #endif shadowcamera = m_renderpass.camera; // cache shadow camera placement for visualization setup_pass( m_renderpass, Mode ); // restore draw mode. TBD, TODO: render mode stack -#ifdef EU07_USE_DEBUG_CAMERA - setup_pass( - m_worldcamera, - rendermode::color, - 0.f, - 1.0, - true ); -#endif // setup shadowmap matrix m_shadowtexturematrix = //bias from [-1, 1] to [0, 1] }; @@ -383,7 +384,6 @@ opengl_renderer::Render_pass( rendermode const Mode ) { glm::mat4{ glm::mat3{ shadowcamera.modelview() } }, glm::vec3{ m_renderpass.camera.position() - shadowcamera.position() } ); } - if( ( true == m_environmentcubetexturesupport ) && ( true == World.InitPerformed() ) ) { // potentially update environmental cube map @@ -391,7 +391,6 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_pass( m_renderpass, Mode ); // restore draw mode. TBD, TODO: render mode stack } } - ::glViewport( 0, 0, Global::iWindowWidth, Global::iWindowHeight ); if( World.InitPerformed() ) { @@ -420,7 +419,9 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glColor4f( 1.f, 0.9f, 0.8f, 1.f ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_TEXTURE_2D ); - shadowcamera.draw( m_renderpass.camera.position() - shadowcamera.position() ); + if( true == Global::RenderShadows ) { + shadowcamera.draw( m_renderpass.camera.position() - shadowcamera.position() ); + } if( DebugCameraFlag ) { ::glColor4f( 0.8f, 1.f, 0.9f, 1.f ); m_worldcamera.camera.draw( m_renderpass.camera.position() - m_worldcamera.camera.position() ); @@ -1920,7 +1921,7 @@ opengl_renderer::Render( section_sequence::iterator First, section_sequence::ite // render #ifdef EU07_USE_DEBUG_CULLING // debug - float const width = scene::EU07_SECTIONSIZE * 0.5f; + float const width = section->m_area.radius; float const height = scene::EU07_SECTIONSIZE * 0.2f; glDisable( GL_LIGHTING ); glDisable( GL_TEXTURE_2D ); @@ -2008,11 +2009,10 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // first pass draws elements which we know are located in section banks, to reduce vbo switching while( First != Last ) { - auto const *cell = First->second; -/* - // przeliczenia animacji torów w sektorze - Groundsubcell->RaAnimate( m_framestamp ); -*/ + auto *cell = First->second; + // przeliczenia animacji torów w sektorze + cell->RaAnimate( m_framestamp ); + switch( m_renderpass.draw_mode ) { case rendermode::color: { // since all shapes of the section share center point we can optimize out a few calls here @@ -2023,7 +2023,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // render #ifdef EU07_USE_DEBUG_CULLING // debug - float const width = scene::EU07_CELLSIZE * 0.5f; + float const width = cell->m_area.radius; float const height = scene::EU07_CELLSIZE * 0.15f; glDisable( GL_LIGHTING ); glDisable( GL_TEXTURE_2D ); @@ -2149,25 +2149,8 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator void opengl_renderer::Render( scene::shape_node const &Shape, bool const Ignorerange ) { -/* - double distancesquared; - switch( m_renderpass.draw_mode ) { - case rendermode::shadows: { - // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - default: { - distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - } - if( ( distancesquared < Node->fSquareMinRadius ) - || ( distancesquared >= Node->fSquareRadius ) ) { - return false; - } -*/ - auto const &data{ Shape.data() }; + + auto const &data { Shape.data() }; if( false == Ignorerange ) { double distancesquared; @@ -3075,8 +3058,8 @@ opengl_renderer::Render_Alpha( TGroundNode *Node ) { // render m_geometry.draw( Node->Piece->geometry ); -// ++m_debugstats.lines; -// ++m_debugstats.drawcalls; + ++m_debugstats.lines; + ++m_debugstats.drawcalls; // post-render cleanup ::glPopMatrix(); @@ -3183,8 +3166,9 @@ opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_seque while( first != Last ) { auto const *cell = first->second; - // TODO: include lines here - if( false == cell->m_traction.empty() ) { + + if( ( false == cell->m_traction.empty() + || ( false == cell->m_lines.empty() ) ) ) { // since all shapes of the cell share center point we can optimize out a few calls here ::glPushMatrix(); auto const originoffset { cell->m_area.center - m_renderpass.camera.position() }; @@ -3196,6 +3180,7 @@ opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_seque Bind_Material( null_handle ); // render for( auto *traction : cell->m_traction ) { Render_Alpha( traction ); } + for( auto &lines : cell->m_lines ) { Render_Alpha( lines ); } // post-render cleanup ::glLineWidth( 1.0 ); if( !Global::bSmoothTraction ) { @@ -3287,6 +3272,48 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { ++m_debugstats.traction; ++m_debugstats.drawcalls; } + +void +opengl_renderer::Render_Alpha( scene::lines_node const &Lines ) { + + auto const &data { Lines.data() }; + + double distancesquared; + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees + distancesquared = SquareMagnitude( ( data.area.center - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + default: { + distancesquared = SquareMagnitude( ( data.area.center - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + break; + } + } + if( ( distancesquared < data.rangesquared_min ) + || ( distancesquared >= data.rangesquared_max ) ) { + return; + } + // setup + auto const distance { static_cast( std::sqrt( distancesquared ) ) }; + auto const linealpha = ( + data.line_width > 0.f ? + 10.f * data.line_width + / std::max( + 0.5f * data.area.radius + 1.f, + distance - ( 0.5f * data.area.radius ) ) : + 1.f ); // negative width means the lines are always opague + ::glColor4fv( + glm::value_ptr( + glm::vec4{ + glm::vec3{ data.lighting.diffuse * Global::DayLight.ambient }, // w zaleznosci od koloru swiatla + std::min( 1.f, linealpha ) } ) ); + ::glLineWidth( clamp( 0.5f * linealpha + data.line_width * data.area.radius / 1000.f, 1.f, 8.f ) ); + // render + m_geometry.draw( data.geometry ); + ++m_debugstats.lines; + ++m_debugstats.drawcalls; +} #endif bool opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { diff --git a/renderer.h b/renderer.h index 75027568..14efad82 100644 --- a/renderer.h +++ b/renderer.h @@ -340,6 +340,8 @@ private: Render_Alpha( TAnimModel *Instance ); void Render_Alpha( TTraction *Traction ); + void + Render_Alpha( scene::lines_node const &Lines ); #endif bool Render_Alpha( TDynamicObject *Dynamic ); diff --git a/scene.cpp b/scene.cpp index e2587e7d..ec94da08 100644 --- a/scene.cpp +++ b/scene.cpp @@ -130,6 +130,44 @@ basic_cell::update_traction( TDynamicObject *Vehicle, int const Pantographindex } } +// legacy method, triggers radio-stop procedure for all vehicles located on paths in the cell +void +basic_cell::radio_stop() { + + for( auto *path : m_paths ) { + path->RadioStop(); + } +} + +// legacy method, adds specified path to the list of pieces undergoing state change +bool +basic_cell::RaTrackAnimAdd( TTrack *Track ) { + + if( false == m_geometrycreated ) { + // nie ma animacji, gdy nie widać + return true; + } + if (tTrackAnim) + tTrackAnim->RaAnimListAdd(Track); + else + tTrackAnim = Track; + return false; // będzie animowane... +} + +// legacy method, updates geometry for pieces in the animation list +void +basic_cell::RaAnimate( unsigned int const Framestamp ) { + + if( ( tTrackAnim == nullptr ) + || ( Framestamp == m_framestamp ) ) { + // nie ma nic do animowania + return; + } + tTrackAnim = tTrackAnim->RaAnimate(); // przeliczenie animacji kolejnego + + m_framestamp = Framestamp; +} + // adds provided shape to the cell void basic_cell::insert( shape_node Shape ) { @@ -160,15 +198,51 @@ basic_cell::insert( shape_node Shape ) { shapes.emplace_back( Shape ); } +// adds provided lines to the cell +void +basic_cell::insert( lines_node Lines ) { + + m_active = true; + + auto const &linesdata { Lines.data() }; + for( auto &targetlines : m_lines ) { + // try to merge shapes with matching view ranges... + auto const &targetlinesdata { targetlines.data() }; + if( ( linesdata.rangesquared_min == targetlinesdata.rangesquared_min ) + && ( linesdata.rangesquared_max == targetlinesdata.rangesquared_max ) + // ...and located close to each other (within arbitrary limit of 10m) + && ( glm::length( linesdata.area.center - targetlinesdata.area.center ) < 10.0 ) ) { + + if( true == targetlines.merge( Lines ) ) { + // if the shape was merged there's nothing left to do + return; + } + } + } + // otherwise add the shape to the relevant list + Lines.origin( m_area.center ); + m_lines.emplace_back( Lines ); +} + // adds provided path to the cell void basic_cell::insert( TTrack *Path ) { m_active = true; - // TODO: add animation hook Path->origin( m_area.center ); m_paths.emplace_back( Path ); + // animation hook +#ifndef EU07_USE_OLD_GROUNDCODE + Path->RaOwnerSet( this ); +#endif + // re-calculate cell radius, in case track extends outside the cell's boundaries + auto endpoints = Path->endpoints(); + for( auto &endpoint : endpoints ) { + m_area.radius = std::max( + m_area.radius, + glm::length( m_area.center - endpoint ) + 25.f ); // extra margin to prevent driven vehicle from flicking + } } // adds provided traction piece to the cell @@ -179,6 +253,13 @@ basic_cell::insert( TTraction *Traction ) { Traction->origin( m_area.center ); m_traction.emplace_back( Traction ); + // re-calculate cell radius, in case traction piece extends outside the cell's boundaries + auto endpoints = Traction->endpoints(); + for( auto &endpoint : endpoints ) { + m_area.radius = std::max( + m_area.radius, + glm::length( m_area.center - endpoint ) ); // adding arbitrary safety margin + } } // adds provided model instance to the cell @@ -203,6 +284,15 @@ basic_cell::insert( TAnimModel *Instance ) { // opaque pieces m_instancesopaque.emplace_back( Instance ); } + // re-calculate cell radius, in case model extends outside the cell's boundaries + if( Instance->Model() ) { + auto const modelradius{ Instance->Model()->bounding_radius() }; + if( modelradius > 0.f ) { + m_area.radius = std::max( + m_area.radius, + glm::length( m_area.center - Instance->location() ) + modelradius ); // adding arbitrary safety margin + } + } } // adds provided sound instance to the cell @@ -251,7 +341,7 @@ basic_cell::register_end( TTraction *Traction ) { // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance std::tuple -basic_cell::find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ) { +basic_cell::find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) { TDynamicObject *vehiclenearest { nullptr }; float leastdistance { std::numeric_limits::max() }; @@ -264,7 +354,16 @@ basic_cell::find( glm::dvec3 const &Point, float const Radius, bool const Onlyco && ( vehicle->Mechanik == nullptr ) ) { continue; } - distance = glm::length2( glm::dvec3{ vehicle->GetPosition() } - Point ); + if( false == Findbycoupler ) { + // basic search, checks vehicles' center points + distance = glm::length2( glm::dvec3{ vehicle->GetPosition() } - Point ); + } + else { + // alternative search, checks positions of vehicles' couplers + distance = std::min( + glm::length2( glm::dvec3{ vehicle->HeadPosition() } - Point ), + glm::length2( glm::dvec3{ vehicle->RearPosition() } - Point ) ); + } if( ( distance > distancecutoff ) || ( distance > leastdistance ) ){ continue; @@ -372,10 +471,13 @@ basic_cell::create_geometry( geometrybank_handle const &Bank ) { for( auto *path : m_paths ) { path->create_geometry( Bank ); } for( auto *traction : m_traction ) { traction->create_geometry( Bank ); } #endif + for( auto &lines : m_lines ) { lines.create_geometry( Bank ); } // arrange content by assigned materials to minimize state switching std::sort( std::begin( m_paths ), std::end( m_paths ), TTrack::sort_by_material ); + + m_geometrycreated = true; // helper for legacy animation code, get rid of it after refactoring } @@ -384,11 +486,9 @@ basic_cell::create_geometry( geometrybank_handle const &Bank ) { void basic_section::update( glm::dvec3 const &Location, float const Radius ) { - auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) + Radius, 2 ) }; - for( auto &cell : m_cells ) { - if( glm::length2( cell.area().center - Location ) < squaredradii ) { + if( glm::length2( cell.area().center - Location ) < ( ( cell.area().radius + Radius ) * ( cell.area().radius + Radius ) ) ) { // we reject cells which aren't within our area of interest cell.update(); } @@ -408,16 +508,28 @@ basic_section::update_traction( TDynamicObject *Vehicle, int const Pantographind auto const pantographposition = position + ( vLeft * pantograph->vPos.z ) + ( vUp * pantograph->vPos.y ) + ( vFront * pantograph->vPos.x ); auto const radius { 0.0 }; // { EU07_CELLSIZE * 0.5 }; // experimentally limited, check if it has any negative effect - auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) + radius, 2 ) }; for( auto &cell : m_cells ) { // we reject early cells which aren't within our area of interest - if( glm::length2( cell.area().center - pantographposition ) < squaredradii ) { + if( glm::length2( cell.area().center - pantographposition ) < ( ( cell.area().radius + radius ) * ( cell.area().radius + radius ) ) ) { cell.update_traction( Vehicle, Pantographindex ); } } } +// legacy method, triggers radio-stop procedure for all vehicles in 2km radius around specified location +void +basic_section::radio_stop( glm::dvec3 const &Location, float const Radius ) { + + for( auto &cell : m_cells ) { + + if( glm::length2( cell.area().center - Location ) < ( ( cell.area().radius + Radius ) * ( cell.area().radius + Radius ) ) ) { + // we reject cells which aren't within our area of interest + cell.radio_stop(); + } + } +} + // adds provided shape to the section void basic_section::insert( shape_node Shape ) { @@ -444,9 +556,16 @@ basic_section::insert( shape_node Shape ) { } } +// adds provided lines to the section +void +basic_section::insert( lines_node Lines ) { + + cell( Lines.data().area.center ).insert( Lines ); +} + // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance std::tuple -basic_section::find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ) { +basic_section::find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) { // go through sections within radius of interest, and pick the nearest candidate TDynamicObject @@ -456,14 +575,12 @@ basic_section::find( glm::dvec3 const &Point, float const Radius, bool const Onl distancefound, distancenearest { std::numeric_limits::max() }; - auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) + Radius, 2 ) }; - for( auto &cell : m_cells ) { // we reject early cells which aren't within our area of interest - if( glm::length2( cell.area().center - Point ) > squaredradii ) { + if( glm::length2( cell.area().center - Point ) > ( ( cell.area().radius + Radius ) * ( cell.area().radius + Radius ) ) ) { continue; } - std::tie( vehiclefound, distancefound ) = cell.find( Point, Radius, Onlycontrolled ); + std::tie( vehiclefound, distancefound ) = cell.find( Point, Radius, Onlycontrolled, Findbycoupler ); if( ( vehiclefound != nullptr ) && ( distancefound < distancenearest ) ) { @@ -503,11 +620,10 @@ basic_section::find( glm::dvec3 const &Point, TTraction const *Other, int const endpointnearest { -1 }; auto const radius { 0.0 }; // { EU07_CELLSIZE * 0.5 }; // experimentally limited, check if it has any negative effect - auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) + radius, 2 ) }; for( auto &cell : m_cells ) { // we reject early cells which aren't within our area of interest - if( glm::length2( cell.area().center - Point ) > squaredradii ) { + if( glm::length2( cell.area().center - Point ) > ( ( cell.area().radius + radius ) * ( cell.area().radius + radius ) ) ) { continue; } std::tie( tractionfound, endpointfound, distancefound ) = cell.find( Point, Other, Currentdirection ); @@ -618,8 +734,49 @@ basic_region::update_traction( TDynamicObject *Vehicle, int const Pantographinde } } +// legacy method, links specified path piece with potential neighbours void -basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad ) { +basic_region::TrackJoin( TTrack *Track ) { + // wyszukiwanie sąsiednich torów do podłączenia (wydzielone na użytek obrotnicy) + TTrack *matchingtrack; + int endpointid; + if( Track->CurrentPrev() == nullptr ) { + std::tie( matchingtrack, endpointid ) = find_path( Track->CurrentSegment()->FastGetPoint_0(), Track ); + switch( endpointid ) { + case 0: + Track->ConnectPrevPrev( matchingtrack, 0 ); + break; + case 1: + Track->ConnectPrevNext( matchingtrack, 1 ); + break; + } + } + if( Track->CurrentNext() == nullptr ) { + std::tie( matchingtrack, endpointid ) = find_path( Track->CurrentSegment()->FastGetPoint_1(), Track ); + switch( endpointid ) { + case 0: + Track->ConnectNextPrev( matchingtrack, 0 ); + break; + case 1: + Track->ConnectNextNext( matchingtrack, 1 ); + break; + } + } +} + +// legacy method, triggers radio-stop procedure for all vehicles in 2km radius around specified location +void +basic_region::RadioStop( glm::dvec3 const &Location ) { + + auto const range = 2000.f; + auto const §ionlist = sections( Location, range ); + for( auto *section : sectionlist ) { + section->radio_stop( Location, range ); + } +} + +void +basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad, bool const Transform ) { // shape might need to be split into smaller pieces, so we create list of nodes instead of just single one // using deque so we can do single pass iterating and addding generated pieces without invalidating anything @@ -628,38 +785,41 @@ basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad ) { if( shape.m_data.vertices.empty() ) { return; } // adjust input if necessary: - if( Scratchpad.location_rotation != glm::vec3( 0, 0, 0 ) ) { - // rotate... - auto const rotation = glm::radians( Scratchpad.location_rotation ); - for( auto &vertex : shape.m_data.vertices ) { - vertex.position = glm::rotateZ( vertex.position, rotation.z ); - vertex.position = glm::rotateX( vertex.position, rotation.x ); - vertex.position = glm::rotateY( vertex.position, rotation.y ); - vertex.normal = glm::rotateZ( vertex.normal, rotation.z ); - vertex.normal = glm::rotateX( vertex.normal, rotation.x ); - vertex.normal = glm::rotateY( vertex.normal, rotation.y ); + if( true == Transform ) { + // shapes generated from legacy terrain come with world space coordinates and don't need processing + if( Scratchpad.location_rotation != glm::vec3( 0, 0, 0 ) ) { + // rotate... + auto const rotation = glm::radians( Scratchpad.location_rotation ); + for( auto &vertex : shape.m_data.vertices ) { + vertex.position = glm::rotateZ( vertex.position, rotation.z ); + vertex.position = glm::rotateX( vertex.position, rotation.x ); + vertex.position = glm::rotateY( vertex.position, rotation.y ); + vertex.normal = glm::rotateZ( vertex.normal, rotation.z ); + vertex.normal = glm::rotateX( vertex.normal, rotation.x ); + vertex.normal = glm::rotateY( vertex.normal, rotation.y ); + } } - } - if( ( false == Scratchpad.location_offset.empty() ) - && ( Scratchpad.location_offset.top() != glm::dvec3( 0, 0, 0 ) ) ) { - // ...and move - auto const offset = Scratchpad.location_offset.top(); - for( auto &vertex : shape.m_data.vertices ) { - vertex.position += offset; + if( ( false == Scratchpad.location_offset.empty() ) + && ( Scratchpad.location_offset.top() != glm::dvec3( 0, 0, 0 ) ) ) { + // ...and move + auto const offset = Scratchpad.location_offset.top(); + for( auto &vertex : shape.m_data.vertices ) { + vertex.position += offset; + } } - } - // calculate bounding area - for( auto const &vertex : shape.m_data.vertices ) { - shape.m_data.area.center += vertex.position; - } - shape.m_data.area.center /= shape.m_data.vertices.size(); - // trim the shape if needed. trimmed parts will be added to list as separate nodes - for( std::size_t index = 0; index < shapes.size(); ++index ) { - while( true == RaTriangleDivider( shapes[ index ], shapes ) ) { - ; // all work is done during expression check + // calculate bounding area + for( auto const &vertex : shape.m_data.vertices ) { + shape.m_data.area.center += vertex.position; + } + shape.m_data.area.center /= shape.m_data.vertices.size(); + // trim the shape if needed. trimmed parts will be added to list as separate nodes + for( std::size_t index = 0; index < shapes.size(); ++index ) { + while( true == RaTriangleDivider( shapes[ index ], shapes ) ) { + ; // all work is done during expression check + } + // with the trimming done we can calculate shape's bounding radius + shape.compute_radius(); } - // with the trimming done we can calculate shape's bounding radius - shape.compute_radius(); } // move the data into appropriate section(s) for( auto &shape : shapes ) { @@ -679,6 +839,50 @@ basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad ) { } } +// inserts provided lines in the region +void +basic_region::insert_lines( lines_node Lines, scratch_data &Scratchpad ) { + + if( Lines.m_data.vertices.empty() ) { return; } + // transform point coordinates if needed + if( Scratchpad.location_rotation != glm::vec3( 0, 0, 0 ) ) { + // rotate... + auto const rotation = glm::radians( Scratchpad.location_rotation ); + for( auto &vertex : Lines.m_data.vertices ) { + vertex.position = glm::rotateZ( vertex.position, rotation.z ); + vertex.position = glm::rotateX( vertex.position, rotation.x ); + vertex.position = glm::rotateY( vertex.position, rotation.y ); + } + } + if( ( false == Scratchpad.location_offset.empty() ) + && ( Scratchpad.location_offset.top() != glm::dvec3( 0, 0, 0 ) ) ) { + // ...and move + auto const offset = Scratchpad.location_offset.top(); + for( auto &vertex : Lines.m_data.vertices ) { + vertex.position += offset; + } + } + // calculate bounding area + for( auto const &vertex : Lines.m_data.vertices ) { + Lines.m_data.area.center += vertex.position; + } + Lines.m_data.area.center /= Lines.m_data.vertices.size(); + Lines.compute_radius(); + // move the data into appropriate section + if( point_inside( Lines.m_data.area.center ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + section( Lines.m_data.area.center ).insert( Lines ); + } + else { + ErrorLog( + "Bad scenario: lines node" + ( + Lines.m_name.empty() ? + "" : + " \"" + Lines.m_name + "\"" ) + + " placed in location outside region bounds (" + to_string( Lines.m_data.area.center ) + ")" ); + } +} + // inserts provided track in the region void basic_region::insert_path( TTrack *Path, scratch_data &Scratchpad ) { @@ -776,7 +980,7 @@ basic_region::insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpa // find a vehicle located neares to specified location, within specified radius, optionally discarding vehicles without drivers std::tuple -basic_region::find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ) { +basic_region::find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) { auto const §ionlist = sections( Point, Radius ); // go through sections within radius of interest, and pick the nearest candidate @@ -788,7 +992,7 @@ basic_region::find_vehicle( glm::dvec3 const &Point, float const Radius, bool co nearestdistance { std::numeric_limits::max() }; for( auto *section : sectionlist ) { - std::tie( foundvehicle, founddistance ) = section->find( Point, Radius, Onlycontrolled ); + std::tie( foundvehicle, founddistance ) = section->find( Point, Radius, Onlycontrolled, Findbycoupler ); if( ( foundvehicle != nullptr ) && ( founddistance < nearestdistance ) ) { diff --git a/scene.h b/scene.h index 05cfa1d3..999d0514 100644 --- a/scene.h +++ b/scene.h @@ -61,9 +61,21 @@ public: // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); + // legacy method, triggers radio-stop procedure for all vehicles located on paths in the cell + void + radio_stop(); + // legacy method, adds specified path to the list of pieces undergoing state change + bool + RaTrackAnimAdd( TTrack *Track ); + // legacy method, updates geometry for pieces in the animation list + void + RaAnimate( unsigned int const Framestamp ); // adds provided shape to the cell void insert( shape_node Shape ); + // adds provided lines to the cell + void + insert( lines_node Lines ); // adds provided path to the cell void insert( TTrack *Path ); @@ -85,9 +97,9 @@ public: // registers provided traction piece in the lookup directory of the cell void register_end( TTraction *Traction ); - // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance + // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple - find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ); + find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint std::tuple find( glm::dvec3 const &Point, TTrack const *Exclude ); @@ -111,19 +123,19 @@ public: private: // types using shapenode_sequence = std::vector; + using linesnode_sequence = std::vector; using path_sequence = std::vector; -// using path_set = std::unordered_set; using traction_sequence = std::vector; -// using traction_set = std::unordered_set; using instance_sequence = std::vector; using sound_sequence = std::vector; using eventlauncher_sequence = std::vector; // members - scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_CELLSIZE + 0.25 * EU07_CELLSIZE ) }; + scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_CELLSIZE ) }; bool m_active { false }; // whether the cell holds any actual data // content shapenode_sequence m_shapesopaque; // opaque pieces of geometry shapenode_sequence m_shapestranslucent; // translucent pieces of geometry + linesnode_sequence m_lines; path_sequence m_paths; // path pieces instance_sequence m_instancesopaque; instance_sequence m_instancetranslucent; @@ -135,6 +147,10 @@ private: path_sequence paths; traction_sequence traction; } m_directories; + // animation of owned items (legacy code, clean up along with track refactoring) + bool m_geometrycreated { false }; + unsigned int m_framestamp { 0 }; // id of last rendered gfx frame + TTrack *tTrackAnim = nullptr; // obiekty do przeliczenia animacji }; // basic scene partitioning structure, holds terrain geometry and collection of cells @@ -150,22 +166,33 @@ public: // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); + // legacy method, triggers radio-stop procedure for all vehicles in 2km radius around specified location + void + radio_stop( glm::dvec3 const &Location, float const Radius ); // adds provided shape to the section void insert( shape_node Shape ); + // adds provided lines to the section + void + insert( lines_node Lines ); // adds provided node to the section template void insert( Type_ *Node ) { - cell( Node->location() ).insert( Node ); } + auto &targetcell { cell( Node->location() ) }; + targetcell.insert( Node ); + // some node types can extend bounding area of the target cell + m_area.radius = std::max( + m_area.radius, + glm::length( m_area.center - targetcell.area().center ) + targetcell.area().radius ); } // registers provided node in the lookup directory of the section enclosing specified point template void register_node( Type_ *Node, glm::dvec3 const &Point ) { cell( Point ).register_end( Node ); } - // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance + // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple - find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ); + find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint std::tuple find( glm::dvec3 const &Point, TTrack const *Exclude ); @@ -223,9 +250,18 @@ public: // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); + // legacy method, links specified path piece with potential neighbours + void + TrackJoin( TTrack *Track ); + // legacy method, triggers radio-stop procedure for all vehicles in 2km radius around specified location + void + RadioStop( glm::dvec3 const &Location ); // inserts provided shape in the region void - insert_shape( shape_node Shape, scratch_data &Scratchpad ); + insert_shape( shape_node Shape, scratch_data &Scratchpad, bool const Transform ); + // inserts provided lines in the region + void + insert_lines( lines_node Lines, scratch_data &Scratchpad ); // inserts provided track in the region void insert_path( TTrack *Path, scratch_data &Scratchpad ); @@ -241,9 +277,9 @@ public: // inserts provided event launcher in the region void insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpad ); - // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance + // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple - find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled ); + find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint std::tuple find_path( glm::dvec3 const &Point, TTrack const *Exclude ); diff --git a/scenenode.cpp b/scenenode.cpp index 1be3d643..f72b1cb2 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -207,6 +207,65 @@ shape_node::deserialize( cParser &Input, scene::node_data const &Nodedata ) { return *this; } +// imports data from provided submodel +shape_node & +shape_node::convert( TSubModel const *Submodel ) { + + m_name = Submodel->pName; + m_data.lighting.ambient = Submodel->f4Ambient; + m_data.lighting.diffuse = Submodel->f4Diffuse; + m_data.lighting.specular = Submodel->f4Specular; + m_data.material = Submodel->m_material; + m_data.translucent = ( true == GfxRenderer.Material( m_data.material ).has_alpha ); + // NOTE: we set unlimited view range typical for terrain, because we don't expect to convert any other 3d models + m_data.rangesquared_max = std::numeric_limits::max(); + + if( Submodel->m_geometry == null_handle ) { return *this; } + + int vertexcount { 0 }; + std::vector importedvertices; + world_vertex vertex, vertex1, vertex2; + for( auto const &sourcevertex : GfxRenderer.Vertices( Submodel->m_geometry ) ) { + vertex.position = sourcevertex.position; + vertex.normal = sourcevertex.normal; + vertex.texture = sourcevertex.texture; + if( vertexcount == 0 ) { vertex1 = vertex; } + else if( vertexcount == 1 ) { vertex2 = vertex; } + else if( vertexcount >= 2 ) { + if( false == degenerate( vertex1.position, vertex2.position, vertex.position ) ) { + importedvertices.emplace_back( vertex1 ); + importedvertices.emplace_back( vertex2 ); + importedvertices.emplace_back( vertex ); + } + // start a new triangle + vertexcount = -1; + } + ++vertexcount; + } + + if( true == importedvertices.empty() ) { return *this; } + + // assign imported geometry to the node... + m_data.vertices.swap( importedvertices ); + // ...and calculate center... + for( auto const &vertex : m_data.vertices ) { + m_data.area.center += vertex.position; + } + m_data.area.center /= m_data.vertices.size(); + // ...and bounding area + double squareradius { 0.0 }; + for( auto const &vertex : m_data.vertices ) { + squareradius = std::max( + squareradius, + glm::length2( vertex.position - m_data.area.center ) ); + } + m_data.area.radius = std::max( + m_data.area.radius, + std::sqrt( squareradius ) ); + + return *this; +} + // adds content of provided node to already enclosed geometry. returns: true if merge could be performed bool shape_node::merge( shape_node &Shape ) { @@ -260,6 +319,151 @@ shape_node::compute_radius() { } + +// restores content of the node from provded input stream +lines_node & +lines_node::deserialize( cParser &Input, scene::node_data const &Nodedata ) { + + // import common data + m_name = Nodedata.name; + m_data.rangesquared_min = Nodedata.range_min * Nodedata.range_min; + m_data.rangesquared_max = ( + Nodedata.range_max >= 0.0 ? + Nodedata.range_max * Nodedata.range_max : + std::numeric_limits::max() ); + + // material + Input.getTokens( 3, false ); + Input + >> m_data.lighting.diffuse.r + >> m_data.lighting.diffuse.g + >> m_data.lighting.diffuse.b; + m_data.lighting.diffuse /= 255.f; + m_data.lighting.diffuse.a = 1.f; + Input.getTokens( 1, false ); + Input + >> m_data.line_width; + m_data.line_width = std::min( 30.f, m_data.line_width ); // 30 pix equals rougly width of a signal pole viewed from ~1m away + + // geometry + enum subtype { + lines, + line_strip, + line_loop + } const nodetype = ( + Nodedata.type == "lines" ? lines : + Nodedata.type == "line_strip" ? line_strip : + line_loop ); + std::size_t vertexcount { 0 }; + world_vertex vertex, vertex0, vertex1; + std::string token = Input.getToken(); + do { + vertex.position.x = std::atof( token.c_str() ); + Input.getTokens( 2, false ); + Input + >> vertex.position.y + >> vertex.position.z; + // convert all data to gl_lines to allow data merge for matching nodes + switch( nodetype ) { + case lines: { + m_data.vertices.emplace_back( vertex ); + break; + } + case line_strip: { + if( vertexcount > 0 ) { + m_data.vertices.emplace_back( vertex1 ); + m_data.vertices.emplace_back( vertex ); + } + vertex1 = vertex; + ++vertexcount; + break; + } + case line_loop: { + if( vertexcount == 0 ) { + vertex0 = vertex; + vertex1 = vertex; + } + else { + m_data.vertices.emplace_back( vertex1 ); + m_data.vertices.emplace_back( vertex ); + } + vertex1 = vertex; + ++vertexcount; + break; + } + default: { break; } + } + token = Input.getToken(); + + } while( token != "endline" ); + // add closing line for the loop + if( ( nodetype == line_loop ) + && ( vertexcount > 2 ) ) { + m_data.vertices.emplace_back( vertex1 ); + m_data.vertices.emplace_back( vertex0 ); + } + if( m_data.vertices.size() % 2 != 0 ) { + ErrorLog( "Lines node specified odd number of vertices, encountered in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); + m_data.vertices.pop_back(); + } + + return *this; +} + +// adds content of provided node to already enclosed geometry. returns: true if merge could be performed +bool +lines_node::merge( lines_node &Lines ) { + + if( ( m_data.line_width != Lines.m_data.line_width ) + || ( m_data.lighting != Lines.m_data.lighting ) ) { + // can't merge nodes with different appearance + return false; + } + // add geometry from provided node + m_data.area.center = + interpolate( + m_data.area.center, Lines.m_data.area.center, + static_cast( Lines.m_data.vertices.size() ) / ( Lines.m_data.vertices.size() + m_data.vertices.size() ) ); + m_data.vertices.insert( + std::end( m_data.vertices ), + std::begin( Lines.m_data.vertices ), std::end( Lines.m_data.vertices ) ); + // NOTE: we could recalculate radius with something other than brute force, but it'll do + compute_radius(); + + return true; +} + +// generates renderable version of held non-instanced geometry in specified geometry bank +void +lines_node::create_geometry( geometrybank_handle const &Bank ) { + + vertex_array vertices; vertices.reserve( m_data.vertices.size() ); + + for( auto const &vertex : m_data.vertices ) { + vertices.emplace_back( + vertex.position - m_data.origin, + vertex.normal, + vertex.texture ); + } + m_data.geometry = GfxRenderer.Insert( vertices, Bank, GL_LINES ); + std::vector().swap( m_data.vertices ); // hipster shrink_to_fit +} + +// calculates node's bounding radius +void +lines_node::compute_radius() { + + auto squaredradius { 0.0 }; + for( auto const &vertex : m_data.vertices ) { + squaredradius = std::max( + squaredradius, + glm::length2( vertex.position - m_data.area.center ) ); + } + m_data.area.radius = static_cast( std::sqrt( squaredradius ) ); +} + + + /* memory_node & memory_node::deserialize( cParser &Input, node_data const &Nodedata ) { @@ -279,6 +483,8 @@ memory_node::deserialize( cParser &Input, node_data const &Nodedata ) { */ } // scene + + namespace editor { basic_node::basic_node( scene::node_data const &Nodedata ) : diff --git a/scenenode.h b/scenenode.h index 99e44f23..4b23d1ce 100644 --- a/scenenode.h +++ b/scenenode.h @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "vertex.h" #include "openglgeometrybank.h" #include "parser.h" +#include "model3d.h" struct lighting_data { @@ -104,6 +105,9 @@ public: // restores content of the node from provded input stream shape_node & deserialize( cParser &Input, scene::node_data const &Nodedata ); + // imports data from provided submodel + shape_node & + convert( TSubModel const *Submodel ); // adds content of provided node to already enclosed geometry. returns: true if merge could be performed bool merge( shape_node &Shape ); @@ -132,6 +136,59 @@ private: shapenode_data m_data; }; +// holds a group of untextured lines +class lines_node { + + friend class basic_region; // region might want to modify node content when it's being inserted + +public: +// types + struct linesnode_data { + // placement and visibility + scene::bounding_area area; // bounding area, in world coordinates + bool visible { true }; // visibility flag + double rangesquared_min { 0.0 }; // visibility range, min + double rangesquared_max { 0.0 }; // visibility range, max + // material data + lighting_data lighting; + float line_width; // thickness of stored lines + // geometry data + std::vector vertices; // world space source data of the geometry + glm::dvec3 origin; // world position of the relative coordinate system origin + geometry_handle geometry { 0, 0 }; // relative origin-centered chunk of geometry held by gfx renderer + }; + +// methods + // restores content of the node from provded input stream + lines_node & + deserialize( cParser &Input, scene::node_data const &Nodedata ); + // adds content of provided node to already enclosed geometry. returns: true if merge could be performed + bool + merge( lines_node &Lines ); + // generates renderable version of held non-instanced geometry in specified geometry bank + void + create_geometry( geometrybank_handle const &Bank ); + // calculates shape's bounding radius + void + compute_radius(); + // set visibility + void + visible( bool State ) { + m_data.visible = State; } + // set origin point + void + origin( glm::dvec3 Origin ) { + m_data.origin = Origin; } + // data access + linesnode_data const & + data() const { + return m_data; } + +private: +// members + std::string m_name; + linesnode_data m_data; +}; /* // holds geometry for specific piece of track/road/waterway diff --git a/simulation.cpp b/simulation.cpp index b45c5532..4d286e06 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -352,7 +352,29 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( nodedata.range_min < 0.0 ) { // convert and import 3d terrain - // TODO: implement this + auto *instance { deserialize_model( Input, Scratchpad, nodedata ) }; + // model import can potentially fail + if( instance == nullptr ) { return; } + // go through submodels, and import them as shapes + auto const cellcount = instance->TerrainCount() + 1; // zliczenie submodeli + for( auto i = 1; i < cellcount; ++i ) { + auto *submodel = instance->TerrainSquare( i - 1 ); + simulation::Region->insert_shape( + scene::shape_node().convert( submodel ), + Scratchpad, + false ); + // if there's more than one group of triangles in the cell they're held as children of the primary submodel + submodel = submodel->ChildGet(); + while( submodel != nullptr ) { + simulation::Region->insert_shape( + scene::shape_node().convert( submodel ), + Scratchpad, + false ); + submodel = submodel->NextGet(); + } + } + // with the import done we can get rid of the source model + delete instance; } else { // regular instance of 3d mesh @@ -372,14 +394,20 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad || ( nodedata.type == "triangle_strip" ) || ( nodedata.type == "triangle_fan" ) ) { - simulation::Region->insert_shape( scene::shape_node().deserialize( Input, nodedata ), Scratchpad ); + simulation::Region->insert_shape( + scene::shape_node().deserialize( + Input, nodedata ), + Scratchpad, + true ); } else if( ( nodedata.type == "lines" ) || ( nodedata.type == "line_strip" ) || ( nodedata.type == "line_loop" ) ) { - // TODO: implement - skip_until( Input, "endline" ); + simulation::Region->insert_lines( + scene::lines_node().deserialize( + Input, nodedata ), + Scratchpad ); } else if( nodedata.type == "memcell" ) { From 7ad760821ffb2c3f9ecde6ded49e61f30ecd5dca Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 22 Oct 2017 19:19:16 +0200 Subject: [PATCH 203/426] build 1020: error fixes and backward compatibility improvements --- AnimModel.cpp | 2 +- AnimModel.h | 3 +- Driver.cpp | 41 ++++++++-- DynObj.cpp | 9 ++- DynObj.h | 3 + Ground.cpp | 11 +-- Ground.h | 5 +- Segment.cpp | 4 +- Track.cpp | 131 ++++++++++++++++++++++++++++++- Traction.cpp | 203 +++++++++++++++++++++++++++++++------------------ Traction.h | 4 +- World.cpp | 9 ++- World.h | 2 + renderer.cpp | 8 +- scene.cpp | 11 ++- simulation.cpp | 70 +++++++---------- version.h | 2 +- 17 files changed, 369 insertions(+), 149 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index ae83516b..07f4aa94 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -791,7 +791,7 @@ void TAnimModel::LightSet(int n, float v) case ls_Dark: { // zapalenie świateł zależne od oświetlenia scenerii if( v > 3.0 ) { fDark = v - 3.0; } // ustawienie indywidualnego progu zapalania - else { fDark = 0.25; } // standardowy próg zaplania + else { fDark = DefaultDarkThresholdLevel; } // standardowy próg zaplania break; } } diff --git a/AnimModel.h b/AnimModel.h index a1528cdd..3ced5617 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "DynObj.h" const int iMaxNumLights = 8; +float const DefaultDarkThresholdLevel { 0.325f }; // typy stanu świateł enum TLightState @@ -174,7 +175,7 @@ private: std::string asText; // tekst dla wyświetlacza znakowego TAnimAdvanced *pAdvanced { nullptr }; TLightState lsLights[ iMaxNumLights ]; - float fDark { 0.25f }; // poziom zapalanie światła (powinno być chyba powiązane z danym światłem?) + float fDark { DefaultDarkThresholdLevel }; // poziom zapalanie światła (powinno być chyba powiązane z danym światłem?) float fOnTime { 0.66f }; float fOffTime { 0.66f + 0.66f }; // były stałymi, teraz mogą być zmienne dla każdego egzemplarza unsigned int m_framestamp { 0 }; // id of last rendered gfx frame diff --git a/Driver.cpp b/Driver.cpp index 8746c591..0fb10aa5 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1268,7 +1268,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // jeśli ma stać, dostaje komendę od razu go = cm_Command; // komenda z komórki, do wykonania po zatrzymaniu } - else if( sSpeedTable[ i ].fDist <= 20.0 ) { + else if( sSpeedTable[ i ].fDist <= fMaxProximityDist ) { // jeśli ma dociągnąć, to niech dociąga // (moveStopCloser dotyczy dociągania do W4, nie semafora) go = cm_Command; // komenda z komórki, do wykonania po zatrzymaniu @@ -2412,7 +2412,7 @@ bool TController::IncBrake() } case Pneumatic: { // NOTE: can't perform just test whether connected vehicle == nullptr, due to virtual couplers formed with nearby vehicles - bool standalone{ true }; + bool standalone { true }; if( ( mvOccupied->TrainType == dt_ET41 ) || ( mvOccupied->TrainType == dt_ET42 ) ) { // NOTE: we're doing simplified checks full of presuptions here. @@ -2427,9 +2427,24 @@ bool TController::IncBrake() } } else { +/* standalone = ( ( mvOccupied->Couplers[ 0 ].CouplingFlag == 0 ) && ( mvOccupied->Couplers[ 1 ].CouplingFlag == 0 ) ); +*/ + if( pVehicles[ 0 ] != pVehicles[ 1 ] ) { + // more detailed version, will use manual braking also for coupled sets of controlled vehicles + auto *vehicle = pVehicles[ 0 ]; // start from first + while( ( true == standalone ) + && ( vehicle != nullptr ) ) { + // NOTE: we could simplify this by doing only check of the rear coupler, but this can be quite tricky in itself + // TODO: add easier ways to access front/rear coupler taking into account vehicle's direction + standalone = + ( ( ( vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag == 0 ) || ( vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag & coupling::control ) ) + && ( ( vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag == 0 ) || ( vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag & coupling::control ) ) ); + vehicle = vehicle->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) + } + } } if( true == standalone ) { OK = mvOccupied->IncLocalBrakeLevel( @@ -2986,8 +3001,7 @@ void TController::RecognizeCommand() } void TController::PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation, TStopReason reason) -{ // wysłanie komendy przez event PutValues, jak pojazd ma obsadę, to wysyła tutaj, a nie do pojazdu - // bezpośrednio +{ // wysłanie komendy przez event PutValues, jak pojazd ma obsadę, to wysyła tutaj, a nie do pojazdu bezpośrednio #ifdef EU07_USE_OLD_GROUNDCODE vector3 sl; sl.x = -NewLocation.X; // zamiana na współrzędne scenerii @@ -2995,7 +3009,7 @@ void TController::PutCommand(std::string NewCommand, double NewValue1, double Ne sl.y = NewLocation.Z; #else // zamiana na współrzędne scenerii - glm::dvec3 sl { -NewLocation.X, NewLocation.Y, NewLocation.Z }; + glm::dvec3 sl { -NewLocation.X, NewLocation.Z, NewLocation.Y }; #endif if (!PutCommand(NewCommand, NewValue1, NewValue2, &sl, reason)) mvOccupied->PutCommand(NewCommand, NewValue1, NewValue2, NewLocation); @@ -3840,8 +3854,11 @@ TController::UpdateSituation(double dt) { CheckVehicles(); // sprawdzić światła nowego składu JumpToNextOrder(); // wykonanie następnej komendy } +/* + // NOTE: disabled as speed limit is decided in another place based on distance to potential target else SetVelocity(2.0, 0.0); // jazda w ustawionym kierunku z prędkością 2 (18s) +*/ } // if (AIControllFlag) //koniec zblokowania, bo była zmienna lokalna } else { @@ -4329,7 +4346,12 @@ TController::UpdateSituation(double dt) { if( OrderCurrentGet() & Connect ) { // jeśli spinanie, to jechać dalej AccPreferred = std::min( 0.25, AccPreferred ); // nie hamuj - VelDesired = Global::Min0RSpeed( 20.0, VelDesired ); + VelDesired = + Global::Min0RSpeed( + VelDesired, + ( vehicle->fTrackBlock > 150.0 ? + 20.0: + 4.0 ) ); VelNext = 2.0; // i pakuj się na tamtego } else { @@ -4372,7 +4394,12 @@ TController::UpdateSituation(double dt) { else { if( OrderCurrentGet() & Connect ) { // if there's something nearby in the connect mode don't speed up too much - VelDesired = Global::Min0RSpeed( 20.0, VelDesired ); + VelDesired = + Global::Min0RSpeed( + VelDesired, + ( vehicle->fTrackBlock > 150.0 ? + 20.0 : + 4.0 ) ); } } } diff --git a/DynObj.cpp b/DynObj.cpp index b4ec1427..72479e77 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -25,7 +25,6 @@ http://mozilla.org/MPL/2.0/. #include "AirCoupler.h" #include "TractionPower.h" -#include "Ground.h" //bo Global::pGround->bDynamicRemove #include "Event.h" #include "Driver.h" #include "Camera.h" //bo likwidujemy trzęsienie @@ -49,6 +48,7 @@ std::string const TDynamicObject::MED_labels[] = { "masa: ", "amax: ", "Fzad: ", "FmPN: ", "FmED: ", "FrED: ", "FzPN: ", "nPrF: " }; +bool TDynamicObject::bDynamicRemove { false }; //--------------------------------------------------------------------------- void TAnimPant::AKP_4E() @@ -2922,7 +2922,7 @@ bool TDynamicObject::Update(double dt, double dt1) Move(dDOMoveLen); if (!bEnabled) // usuwane pojazdy nie mają toru { // pojazd do usunięcia - Global::pGround->bDynamicRemove = true; // sprawdzić + bDynamicRemove = true; // sprawdzić return false; } Global::ABuDebug = dDOMoveLen / dt1; @@ -5364,6 +5364,7 @@ vehicle_table::update( double Deltatime, int Iterationcount ) { // pojazdy stojące nie potrzebują aktualizacji, chyba że np. ktoś im zmieni nastawę hamulca // oddzielną listę można by zrobić na pojazdy z napędem, najlepiej posortowaną wg typu napędu for( auto *vehicle : m_items ) { + if( false == vehicle->bEnabled ) { continue; } // Ra: zmienić warunek na sprawdzanie pantografów w jednej zmiennej: czy pantografy i czy podniesione if( vehicle->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) { // TODO: re-implement @@ -5395,7 +5396,7 @@ vehicle_table::update( double Deltatime, int Iterationcount ) { } /* // TODO: re-implement - if (bDynamicRemove) + if (TDynamicObject::bDynamicRemove) { // jeśli jest coś do usunięcia z listy, to trzeba na końcu for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) if ( false == Current->DynamicObject->bEnabled) @@ -5403,7 +5404,7 @@ vehicle_table::update( double Deltatime, int Iterationcount ) { DynamicRemove(Current->DynamicObject); // usunięcie tego i podłączonych Current = nRootDynamic; // sprawdzanie listy od początku } - bDynamicRemove = false; // na razie koniec + TDynamicObject::bDynamicRemove = false; // na razie koniec } */ } diff --git a/DynObj.h b/DynObj.h index 931ba255..fbdbd0da 100644 --- a/DynObj.h +++ b/DynObj.h @@ -151,6 +151,9 @@ class TDynamicObject { // klasa pojazdu friend class opengl_renderer; +public: + static bool bDynamicRemove; // moved from ground + private: // położenie pojazdu w świecie oraz parametry ruchu Math3D::vector3 vPosition; // Ra: pozycja pojazdu liczona zaraz po przesunięciu Math3D::vector3 vCoulpler[ 2 ]; // współrzędne sprzęgów do liczenia zderzeń czołowych diff --git a/Ground.cpp b/Ground.cpp index c628faa3..74f76aa1 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -435,12 +435,13 @@ void TSubRect::LoadNodes() { node = node->nNext2; // następny z sektora } } - +#ifdef EU07_USE_OLD_GROUNDCODE void TSubRect::RenderSounds() { // aktualizacja dźwięków w pojazdach sektora (sektor może nie być wyświetlany) for (int j = 0; j < iTracks; ++j) tTracks[j]->RenderDynSounds(); // dźwięki pojazdów idą niezależnie od wyświetlania }; +#endif //--------------------------------------------------------------------------- //------------------ Kwadrat kilometrowy ------------------------------------ //--------------------------------------------------------------------------- @@ -2723,7 +2724,7 @@ void TGround::InitTraction() if (!Traction->hvParallel) ErrorLog("Missed overhead: " + Traction->asParallel); // logowanie braku } - if (Traction->iTries > 0) // jeśli zaznaczony do podłączenia + if (Traction->iTries == 5) // jeśli zaznaczony do podłączenia // if (!nCurrent->hvTraction->psPower[0]||!nCurrent->hvTraction->psPower[1]) if (zg < iConnection) // zabezpieczenie nEnds[zg++] = nCurrent; // wypełnianie tabeli końców w celu szukania im połączeń @@ -3466,7 +3467,7 @@ bool TGround::Update(double dt, int iter) for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) Current->DynamicObject->Update(dt, dt); // Ra 2015-01: tylko tu przelicza sieć trakcyjną } - if (bDynamicRemove) + if (TDynamicObject::bDynamicRemove) { // jeśli jest coś do usunięcia z listy, to trzeba na końcu for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) if ( false == Current->DynamicObject->bEnabled) @@ -3474,7 +3475,7 @@ bool TGround::Update(double dt, int iter) DynamicRemove(Current->DynamicObject); // usunięcie tego i podłączonych Current = nRootDynamic; // sprawdzanie listy od początku } - bDynamicRemove = false; // na razie koniec + TDynamicObject::bDynamicRemove = false; // na razie koniec } return true; }; @@ -3985,7 +3986,6 @@ void TGround::IsolatedBusy(const std::string t) } multiplayer::WyslijString(t, 10); // wolny }; -#endif //--------------------------------------------------------------------------- void TGround::Silence(vector3 gdzie) @@ -4006,4 +4006,5 @@ void TGround::Silence(vector3 gdzie) tmp->RenderSounds(); // dźwięki pojazdów by się przydało wyłączyć } }; +#endif //--------------------------------------------------------------------------- diff --git a/Ground.h b/Ground.h index 8844752d..8eba653b 100644 --- a/Ground.h +++ b/Ground.h @@ -162,8 +162,8 @@ class TSubRect : public CMesh #ifdef EU07_USE_OLD_GROUNDCODE bool RaTrackAnimAdd(TTrack *t); // zgłoszenie toru do animacji void RaAnimate( unsigned int const Framestamp ); // przeliczenie animacji torów -#endif void RenderSounds(); // dźwięki pojazdów z niewidocznych sektorów +#endif }; // Ra: trzeba sprawdzić wydajność siatki @@ -243,7 +243,6 @@ class TGround #endif public: - bool bDynamicRemove = false; // czy uruchomić procedurę usuwania pojazdów TGround(); ~TGround(); @@ -308,7 +307,9 @@ public: void DynamicRemove(TDynamicObject *dyn); void TerrainRead(std::string const &f); void TerrainWrite(); +#ifdef EU07_USE_OLD_GROUNDCODE void Silence(vector3 gdzie); +#endif }; //--------------------------------------------------------------------------- diff --git a/Segment.cpp b/Segment.cpp index 293daf57..b8509c0d 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -103,7 +103,7 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M fStep = fNewStep; if (fLength <= 0) { - ErrorLog( "Bad geometry: zero length spline \"" + pOwner->name() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); + ErrorLog( "Bad track: zero length spline \"" + pOwner->name() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); fLength = 0.01; // crude workaround TODO: fix this properly /* return false; // zerowe nie mogą być @@ -205,7 +205,7 @@ double TSegment::GetTFromS(double const s) const // Newton's method failed. If this happens, increase iterations or // tolerance or integration accuracy. // return -1; //Ra: tu nigdy nie dojdzie - ErrorLog( "Bad geometry: shape estimation failed for spline \"" + pOwner->name() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); + ErrorLog( "Bad track: shape estimation failed for spline \"" + pOwner->name() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); // MessageBox(0,"Too many iterations","GetTFromS",MB_OK); return fTime; }; diff --git a/Track.cpp b/Track.cpp index 3266e5c0..6d5cc64e 100644 --- a/Track.cpp +++ b/Track.cpp @@ -185,6 +185,7 @@ TTrack::sort_by_material( TTrack const *Left, TTrack const *Right ) { TTrack * TTrack::Create400m(int what, double dx) { // tworzenie toru do wstawiania taboru podczas konwersji na E3D +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode *tmp = new TGroundNode(TP_TRACK); // node TTrack *trk = tmp->pTrack; trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur @@ -195,11 +196,22 @@ TTrack * TTrack::Create400m(int what, double dx) TSubRect *r = Global::pGround->GetSubRect(tmp->pCenter.x, tmp->pCenter.z); r->NodeAdd(tmp); // dodanie toru do segmentu r->Sort(); //żeby wyświetlał tabor z dodanego toru +#else + auto *trk = new TTrack( "auto_400m" ); + trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur + trk->iCategoryFlag = what; // taki sam typ plus informacja, że dodatkowy + trk->Init(); // utworzenie segmentu + trk->Segment->Init( vector3( -dx, 0, 0 ), vector3( -dx, 0, 400 ), 10.0, 0, 0 ); // prosty + trk->location( glm::dvec3{ -dx, 0, 200 } ); //środek, aby się mogło wyświetlić + simulation::Paths.insert( trk ); + simulation::Region->insert_path( trk, scene::scratch_data() ); +#endif return trk; }; TTrack * TTrack::NullCreate(int dir) { // tworzenie toru wykolejającego od strony (dir), albo pętli dla samochodów +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode *tmp = new TGroundNode( TP_TRACK ); TGroundNode *tmp2 = nullptr; // node TTrack *trk = tmp->pTrack; // tor; UWAGA! obrotnica może generować duże ilości tego @@ -298,6 +310,100 @@ TTrack * TTrack::NullCreate(int dir) r->NodeAdd( tmp2 ); // drugiego też r->Sort(); //żeby wyświetlał tabor z dodanego toru } +#else + TTrack + *trk { nullptr }, + *trk2 { nullptr }; + trk = new TTrack( "auto_null" ); + trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur + trk->iCategoryFlag = (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy + float r1, r2; + Segment->GetRolls(r1, r2); // pobranie przechyłek na początku toru + vector3 p1, cv1, cv2, p2; // będziem tworzyć trajektorię lotu + if (iCategoryFlag & 1) + { // tylko dla kolei + trk->iDamageFlag = 128; // wykolejenie + trk->fVelocity = 0.0; // koniec jazdy + trk->Init(); // utworzenie segmentu + switch (dir) + { //łączenie z nowym torem + case 0: + p1 = Segment->FastGetPoint_0(); + p2 = p1 - 450.0 * Normalize(Segment->GetDirection1()); + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk->Segment->Init(p1, p2, 5, -RadToDeg(r1), 70.0); + ConnectPrevPrev(trk, 0); + break; + case 1: + p1 = Segment->FastGetPoint_1(); + p2 = p1 - 450.0 * Normalize(Segment->GetDirection2()); + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk->Segment->Init(p1, p2, 5, RadToDeg(r2), 70.0); + ConnectNextPrev(trk, 0); + break; + case 3: // na razie nie możliwe + p1 = SwitchExtension->Segments[1]->FastGetPoint_1(); // koniec toru drugiego zwrotnicy + p2 = p1 - 450.0 * Normalize( SwitchExtension->Segments[1]->GetDirection2()); // przedłużenie na wprost + trk->Segment->Init(p1, p2, 5, RadToDeg(r2), 70.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + ConnectNextPrev(trk, 0); + // trk->ConnectPrevNext(trk,dir); + SetConnections(1); // skopiowanie połączeń + Switch(1); // bo się przełączy na 0, a to coś chce się przecież wykoleić na bok + break; // do drugiego zwrotnicy... nie zadziała? + } + } + else + { // tworznie pętelki dla samochodów + trk->fVelocity = 20.0; // zawracanie powoli + trk->fRadius = 20.0; // promień, aby się dodawało do tabelki prędkości i liczyło narastająco + trk->Init(); // utworzenie segmentu + trk2 = new TTrack( "auto_null" ); + trk2->iCategoryFlag = + (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy + trk2->m_visible = false; + trk2->fVelocity = 20.0; // zawracanie powoli + trk2->fRadius = 20.0; // promień, aby się dodawało do tabelki prędkości i liczyło narastająco + trk2->Init(); // utworzenie segmentu + trk->m_name = m_name + ":loopstart"; + trk2->m_name = m_name + ":loopfinish"; + switch (dir) + { //łączenie z nowym torem + case 0: + p1 = Segment->FastGetPoint_0(); + cv1 = -20.0 * Normalize(Segment->GetDirection1()); // pierwszy wektor kontrolny + p2 = p1 + cv1 + cv1; // 40m + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, -RadToDeg(r1), 0.0); + ConnectPrevPrev(trk, 0); + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, -RadToDeg(r1), 0.0); + trk2->iPrevDirection = 0; // zwrotnie do tego samego odcinka + break; + case 1: + p1 = Segment->FastGetPoint_1(); + cv1 = -20.0 * Normalize(Segment->GetDirection2()); // pierwszy wektor kontrolny + p2 = p1 + cv1 + cv1; + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, RadToDeg(r2), 0.0); + ConnectNextPrev(trk, 0); + // bo prosty, kontrolne wyliczane przy zmiennej przechyłce + trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, RadToDeg(r2), 0.0); + trk2->iPrevDirection = 1; // zwrotnie do tego samego odcinka + break; + } + trk2->trPrev = this; + trk->ConnectNextNext(trk2, 1); // połączenie dwóch dodatkowych odcinków punktami 2 + } + // trzeba jeszcze dodać do odpowiedniego segmentu, aby się renderowały z niego pojazdy + trk->location( glm::dvec3{ 0.5 * ( p1 + p2 ) } ); //środek, aby się mogło wyświetlić + simulation::Paths.insert( trk ); + simulation::Region->insert_path( trk, scene::scratch_data() ); + if( trk2 ) { + trk2->location( trk->location() ); // ten sam środek jest + simulation::Paths.insert( trk2 ); + simulation::Region->insert_path( trk2, scene::scratch_data() ); + } +#endif return trk; }; @@ -473,7 +579,20 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) null_handle : GfxRenderer.Fetch_Material( str ) ); parser->getTokens(3); - *parser >> fTexHeight1 >> fTexWidth >> fTexSlope; + *parser + >> fTexHeight1 + >> fTexWidth + >> fTexSlope; + if( fTexLength != 4.f ) { + // force defaults for malformed track definitions + bool paramsvalid { true }; + if( fTexHeight1 == 0.f ) { fTexHeight1 = 0.6f; paramsvalid = false; } + if( fTexWidth == 0.f ) { fTexWidth = 0.9f; paramsvalid = false; } + if( fTexSlope == 0.f ) { fTexSlope = 0.9f; paramsvalid = false; } + if( false == paramsvalid ) { + ErrorLog( "Bad track: one or more of texture dimensions set to 0 for track \"" + name() + "\" in file \"" + parser->Name() + "\" (line " + std::to_string( parser->Line() - 1 ) + ")" ); + } + } if (iCategoryFlag & 4) fTexHeight1 = -fTexHeight1; // rzeki mają wysokość odwrotnie niż drogi } @@ -2167,6 +2286,9 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { void TTrack::EnvironmentSet() { // ustawienie zmienionego światła +#ifdef EU07_USE_OLD_GROUNDCODE + ::glColor4f( 1.f, 1.f, 1.f, 1.f ); +#endif switch( eEnvironment ) { case e_canyon: { Global::DayLight.apply_intensity( 0.4f ); @@ -2801,7 +2923,14 @@ path_table::InitTracks() { int connection { -1 }; TTrack *matchingtrack { nullptr }; +#ifdef EU07_IGNORE_LEGACYPROCESSINGORDER for( auto *track : m_items ) { +#else + // NOTE: legacy code peformed item operations last-to-first due to way the items were added to the list + // this had impact in situations like two possible connection candidates, where only the first one would be used + for( auto first = std::rbegin(m_items); first != std::rend(m_items); ++first ) { + auto *track = *first; +#endif track->AssignEvents( simulation::Events.FindEvent( track->asEvent0Name ), diff --git a/Traction.cpp b/Traction.cpp index 75686a97..8bab89bb 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -374,55 +374,59 @@ TTraction::create_geometry( geometrybank_handle const &Bank ) { int TTraction::TestPoint(glm::dvec3 const &Point) { // sprawdzanie, czy przęsła można połączyć - if (!hvNext[0]) - if( glm::all( glm::epsilonEqual( Point, pPoint1, 0.025 ) ) ) - return 0; - if (!hvNext[1]) - if( glm::all( glm::epsilonEqual( Point, pPoint2, 0.025 ) ) ) - return 1; + if( ( hvNext[ 0 ] == nullptr ) + && ( glm::all( glm::epsilonEqual( Point, pPoint1, 0.025 ) ) ) ) { + return 0; + } + if( ( hvNext[ 1 ] == nullptr ) + && ( glm::all( glm::epsilonEqual( Point, pPoint2, 0.025 ) ) ) ) { + return 1; + } return -1; }; -void TTraction::Connect(int my, TTraction *with, int to) -{ //łączenie segmentu (with) od strony (my) do jego (to) - if (my) - { // do mojego Point2 - hvNext[1] = with; - iNext[1] = to; - } - else - { // do mojego Point1 - hvNext[0] = with; - iNext[0] = to; - } - if (to) - { // do jego Point2 - with->hvNext[1] = this; - with->iNext[1] = my; - } - else - { // do jego Point1 - with->hvNext[0] = this; - with->iNext[0] = my; - } - if (hvNext[0]) // jeśli z obu stron podłączony - if (hvNext[1]) - iLast = 0; // to nie jest ostatnim - if (with->hvNext[0]) // temu też, bo drugi raz łączenie się nie nie wykona - if (with->hvNext[1]) - with->iLast = 0; // to nie jest ostatnim -}; +//łączenie segmentu (with) od strony (my) do jego (to) +void +TTraction::Connect(int my, TTraction *with, int to) { -bool TTraction::WhereIs() -{ // ustalenie przedostatnich przęseł - if (iLast) - return (iLast == 1); // ma już ustaloną informację o położeniu - if (hvNext[0] ? hvNext[0]->iLast == 1 : false) // jeśli poprzedni jest ostatnim - iLast = 2; // jest przedostatnim - else if (hvNext[1] ? hvNext[1]->iLast == 1 : false) // jeśli następny jest ostatnim - iLast = 2; // jest przedostatnim - return (iLast == 1); // ostatnie będą dostawać zasilanie -}; + hvNext[ my ] = with; + iNext[ my ] = to; + + if( ( hvNext[ 0 ] != nullptr ) + && ( hvNext[ 1 ] != nullptr ) ) { + // jeśli z obu stron podłączony to nie jest ostatnim + iLast = 0; + } + + with->hvNext[ to ] = this; + with->iNext[ to ] = my; + + if( ( with->hvNext[ 0 ] != nullptr ) + && ( with->hvNext[ 1 ] != nullptr ) ) { + // temu też, bo drugi raz łączenie się nie nie wykona + with->iLast = 0; + } +} + +// ustalenie przedostatnich przęseł +bool TTraction::WhereIs() { + + if( iLast ) { + // ma już ustaloną informację o położeniu + return ( iLast & 1 ); + } + for( int endindex = 0; endindex < 2; ++endindex ) { + if( hvNext[ endindex ] == nullptr ) { + // no neighbour piece means this one is last + iLast |= 1; + } + else if( hvNext[ endindex ]->hvNext[ 1 - iNext[ endindex ] ] == nullptr ) { + // otherwise if that neighbour has no further connection on the opposite end then this piece is second-last + iLast |= 2; + } + } + return (iLast & 1); // ostatnie będą dostawać zasilanie +} void TTraction::Init() { // przeliczenie parametrów @@ -585,30 +589,41 @@ TTraction::wire_color() const { case 1: { // czerwone z podłączonym zasilaniem 1 - color.r = 1.0f; - color.g = 0.0f; - color.b = 0.0f; +// color.r = 1.0f; +// color.g = 0.0f; +// color.b = 0.0f; + // cyan + color = glm::vec3 { 0.f, 174.f / 255.f, 239.f / 255.f }; break; } case 2: { // zielone z podłączonym zasilaniem 2 - color.r = 0.0f; - color.g = 1.0f; - color.b = 0.0f; +// color.r = 0.0f; +// color.g = 1.0f; +// color.b = 0.0f; + // yellow + color = glm::vec3 { 240.f / 255.f, 228.f / 255.f, 0.f }; break; } case 3: { //żółte z podłączonym zasilaniem z obu stron - color.r = 1.0f; - color.g = 1.0f; - color.b = 0.0f; +// color.r = 1.0f; +// color.g = 1.0f; +// color.b = 0.0f; + // green + color = glm::vec3 { 0.f, 239.f / 255.f, 118.f / 255.f }; break; } case 4: { // niebieskie z podłączonym zasilaniem - color.r = 0.5f; - color.g = 0.5f; - color.b = 1.0f; +// color.r = 0.5f; +// color.g = 0.5f; +// color.b = 1.0f; + // white for powered, red for ends + color = ( + psPowered != nullptr ? + glm::vec3{ 239.f / 255.f, 239.f / 255.f, 239.f / 255.f } : + glm::vec3{ 239.f / 255.f, 128.f / 255.f, 128.f / 255.f } ); break; } default: { break; } @@ -618,6 +633,46 @@ TTraction::wire_color() const { color.g *= 0.6f; color.b *= 0.6f; } +/* + switch( iTries ) { + case 0: { + color = glm::vec3{ 239.f / 255.f, 128.f / 255.f, 128.f / 255.f }; // red + break; + } + case 1: { + color = glm::vec3{ 240.f / 255.f, 228.f / 255.f, 0.f }; // yellow + break; + } + case 5: { + color = glm::vec3{ 0.f / 255.f, 239.f / 255.f, 118.f / 255.f }; // green + break; + } + default: { + color = glm::vec3{ 239.f / 255.f, 239.f / 255.f, 239.f / 255.f }; + break; + } + } +*/ +/* + switch( iLast ) { + case 0: { + color = glm::vec3{ 240.f / 255.f, 228.f / 255.f, 0.f }; // yellow + break; + } + case 1: { + color = glm::vec3{ 239.f / 255.f, 128.f / 255.f, 128.f / 255.f }; // red + break; + } + case 2: { + color = glm::vec3{ 0.f / 255.f, 239.f / 255.f, 118.f / 255.f }; // green + break; + } + default: { + color = glm::vec3{ 239.f / 255.f, 239.f / 255.f, 239.f / 255.f }; + break; + } + } +*/ } return color; } @@ -660,18 +715,21 @@ traction_table::InitTraction() { } } +#ifdef EU07_IGNORE_LEGACYPROCESSINGORDER for( auto *traction : m_items ) { - - if (!traction->hvNext[0]) { +#else + // NOTE: legacy code peformed item operations last-to-first due to way the items were added to the list + // this had impact in situations like two possible connection candidates, where only the first one would be used + for( auto first = std::rbegin(m_items); first != std::rend(m_items); ++first ) { + auto *traction = *first; +#endif + if( traction->hvNext[ 0 ] == nullptr ) { // tylko jeśli jeszcze nie podłączony std::tie( matchingtraction, connection ) = simulation::Region->find_traction( traction->pPoint1, traction ); switch (connection) { - case 0: { - traction->Connect( 0, matchingtraction, 0 ); - break; - } + case 0: case 1: { - traction->Connect( 0, matchingtraction, 1 ); + traction->Connect( 0, matchingtraction, connection ); break; } default: { @@ -691,8 +749,8 @@ traction_table::InitTraction() { //(tmp->psSection) jest podstacją, a (Traction->psSection) nazwą sekcji matchingtraction->PowerSet( traction->psSection ); // zastąpienie wskazaniem sekcji } - else if( ( false == traction->psSection->bSection ) && - ( true == matchingtraction->psSection->bSection ) ) { + else if( ( false == traction->psSection->bSection ) + && ( true == matchingtraction->psSection->bSection ) ) { //(Traction->psSection) jest podstacją, a (tmp->psSection) nazwą sekcji traction->PowerSet( matchingtraction->psSection ); // zastąpienie wskazaniem sekcji } @@ -704,16 +762,13 @@ traction_table::InitTraction() { } } } - if (!traction->hvNext[1]) { + if( traction->hvNext[ 1 ] == nullptr ) { // tylko jeśli jeszcze nie podłączony std::tie( matchingtraction, connection ) = simulation::Region->find_traction( traction->pPoint2, traction ); switch (connection) { - case 0: { - traction->Connect( 1, matchingtraction, 0 ); - break; - } + case 0: case 1: { - traction->Connect( 1, matchingtraction, 1 ); + traction->Connect( 1, matchingtraction, connection ); break; } default: { @@ -770,7 +825,7 @@ traction_table::InitTraction() { if( ( traction->asParallel == "none" ) || ( traction->asParallel == "*" ) ) { // jeśli nieokreślone - traction->iLast = 2; // jakby przedostatni - niech po prostu szuka (iLast już przeliczone) + traction->iLast |= 2; // jakby przedostatni - niech po prostu szuka (iLast już przeliczone) } else if( traction->hvParallel == nullptr ) { // jeśli jeszcze nie został włączony w kółko @@ -792,7 +847,7 @@ traction_table::InitTraction() { } } } - if( traction->iTries > 0 ) { + if( traction->iTries == 5 ) { // jeśli zaznaczony do podłączenia // wypełnianie tabeli końców w celu szukania im połączeń ends.emplace_back( traction ); diff --git a/Traction.h b/Traction.h index fab4909d..d1202768 100644 --- a/Traction.h +++ b/Traction.h @@ -27,7 +27,7 @@ class TTraction : public editor::basic_node { TTractionPowerSource *psPowered { nullptr }; // ustawione tylko dla bezpośrednio zasilanego przęsła TTraction *hvNext[ 2 ] { nullptr, nullptr }; //łączenie drutów w sieć int iNext[ 2 ] { 0, 0 }; // do którego końca się łączy - int iLast { 1 }; //że niby ostatni drut // ustawiony bit 0, jeśli jest ostatnim drutem w sekcji; bit1 - przedostatni + int iLast { 0 }; //że niby ostatni drut // ustawiony bit 0, jeśli jest ostatnim drutem w sekcji; bit1 - przedostatni public: glm::dvec3 pPoint1, pPoint2, pPoint3, pPoint4; glm::dvec3 vParametric; // współczynniki równania parametrycznego odcinka @@ -46,7 +46,7 @@ class TTraction : public editor::basic_node { std::string asParallel; // nazwa przęsła, z którym może być bieżnia wspólna TTraction *hvParallel { nullptr }; // jednokierunkowa i zapętlona lista przęseł ewentualnej bieżni wspólnej float fResistance[ 2 ] { -1.0f, -1.0f }; // rezystancja zastępcza do punktu zasilania (0: przęsło zasilane, <0: do policzenia) - int iTries { 0 }; + int iTries { 1 }; // 0 is used later down the road to mark directly powered pieces int PowerState { 0 }; // type of incoming power, if any // visualization data glm::dvec3 m_origin; diff --git a/World.cpp b/World.cpp index ab2bafe9..80757136 100644 --- a/World.cpp +++ b/World.cpp @@ -465,7 +465,11 @@ void TWorld::OnKeyDown(int cKey) } else // również przeskakiwanie { // Ra: to z tą kamerą (Camera.Pos i Global::pCameraPosition) jest trochę bez sensu +#ifdef EU07_USE_OLD_GROUNDCODE + // NOTE: does it even work? it seems to render the sounds before the camera is actually moved + // so the listener is still in range... Ground.Silence( Global::pCameraPosition ); // wyciszenie wszystkiego z poprzedniej pozycji +#endif Global::SetCameraPosition( Global::FreeCameraInit[i] ); // nowa pozycja dla generowania obiektów Camera.Init(Global::FreeCameraInit[i], Global::FreeCameraInitAngle[i]); // przestawienie @@ -918,8 +922,9 @@ void TWorld::FollowView(bool wycisz) { if (Controlled) // jest pojazd do prowadzenia? { +#ifdef EU07_USE_OLD_GROUNDCODE Ground.Silence( Camera.Pos ); // wyciszenie dźwięków z poprzedniej pozycji - +#endif if (FreeFlyModeFlag) { // jeżeli poza kabiną, przestawiamy w jej okolicę - OK if( Train ) { @@ -937,7 +942,9 @@ void TWorld::FollowView(bool wycisz) { if( wycisz ) { // wyciszenie dźwięków z poprzedniej pozycji // trzymanie prawego w kabinie daje marny efekt +#ifdef EU07_USE_OLD_GROUNDCODE Ground.Silence( Camera.Pos ); +#endif } Camera.Pos = Train->pMechPosition; Camera.Roll = std::atan(Train->pMechShake.x * Train->fMechRoll); // hustanie kamery na boki diff --git a/World.h b/World.h index 68d75ce6..a646e9ad 100644 --- a/World.h +++ b/World.h @@ -122,7 +122,9 @@ private: TCamera Camera; TCamera DebugCamera; +#ifdef EU07_USE_OLD_GROUNDCODE TGround Ground; +#endif world_environment Environment; TTrain *Train; TDynamicObject *pDynamicNearest; diff --git a/renderer.cpp b/renderer.cpp index 143489df..d4e8929b 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1921,8 +1921,9 @@ opengl_renderer::Render( section_sequence::iterator First, section_sequence::ite // render #ifdef EU07_USE_DEBUG_CULLING // debug + ::glLineWidth( 2.f ); float const width = section->m_area.radius; - float const height = scene::EU07_SECTIONSIZE * 0.2f; + float const height = section->m_area.radius * 0.2f; glDisable( GL_LIGHTING ); glDisable( GL_TEXTURE_2D ); glColor3ub( 255, 128, 128 ); @@ -1947,6 +1948,7 @@ opengl_renderer::Render( section_sequence::iterator First, section_sequence::ite glColor3ub( 255, 255, 255 ); glEnable( GL_TEXTURE_2D ); glEnable( GL_LIGHTING ); + glLineWidth( 1.f ); #endif // shapes for( auto const &shape : section->m_shapes ) { Render( shape, true ); } @@ -2024,7 +2026,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator #ifdef EU07_USE_DEBUG_CULLING // debug float const width = cell->m_area.radius; - float const height = scene::EU07_CELLSIZE * 0.15f; + float const height = cell->m_area.radius * 0.15f; glDisable( GL_LIGHTING ); glDisable( GL_TEXTURE_2D ); glColor3ub( 255, 255, 0 ); @@ -3253,7 +3255,7 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { } // rysuj jesli sa druty i nie zerwana if( ( Traction->Wires == 0 ) - || ( true == TestFlag( Traction->DamageFlag, 128 ) ) ) { + || ( true == TestFlag( Traction->DamageFlag, 128 ) ) ) { return; } // setup diff --git a/scene.cpp b/scene.cpp index ec94da08..4cc80791 100644 --- a/scene.cpp +++ b/scene.cpp @@ -65,7 +65,7 @@ basic_cell::update_traction( TDynamicObject *Vehicle, int const Pantographindex auto pantograph = Vehicle->pants[ Pantographindex ].fParamPants; auto const pantographposition = position + ( vLeft * pantograph->vPos.z ) + ( vUp * pantograph->vPos.y ) + ( vFront * pantograph->vPos.x ); - for( auto *traction : m_traction ) { + for( auto *traction : m_directories.traction ) { // współczynniki równania parametrycznego auto const paramfrontdot = glm::dot( traction->vParametric, vFront ); @@ -174,6 +174,11 @@ basic_cell::insert( shape_node Shape ) { m_active = true; + // re-calculate cell radius, in case shape geometry extends outside the cell's boundaries + m_area.radius = std::max( + m_area.radius, + glm::length( m_area.center - Shape.data().area.center ) + Shape.data().area.radius ); + auto const &shapedata { Shape.data() }; auto &shapes = ( shapedata.translucent ? @@ -507,7 +512,7 @@ basic_section::update_traction( TDynamicObject *Vehicle, int const Pantographind auto pantograph = Vehicle->pants[ Pantographindex ].fParamPants; auto const pantographposition = position + ( vLeft * pantograph->vPos.z ) + ( vUp * pantograph->vPos.y ) + ( vFront * pantograph->vPos.x ); - auto const radius { 0.0 }; // { EU07_CELLSIZE * 0.5 }; // experimentally limited, check if it has any negative effect + auto const radius { EU07_CELLSIZE * 0.5 }; for( auto &cell : m_cells ) { // we reject early cells which aren't within our area of interest @@ -728,7 +733,7 @@ basic_region::update_traction( TDynamicObject *Vehicle, int const Pantographinde auto const pant0 = position + ( vLeft * p->vPos.z ) + ( vUp * p->vPos.y ) + ( vFront * p->vPos.x ); p->PantTraction = std::numeric_limits::max(); // taka za duża wartość - auto const §ionlist = sections( pant0, 0.0 ); + auto const §ionlist = sections( pant0, EU07_CELLSIZE * 0.5 ); for( auto *section : sectionlist ) { section->update_traction( Vehicle, Pantographindex ); } diff --git a/simulation.cpp b/simulation.cpp index 4d286e06..9bd163e5 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -308,16 +308,14 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad auto *path { deserialize_path( Input, Scratchpad, nodedata ) }; // duplicates of named tracks are currently experimentally allowed - if( simulation::Paths.insert( path ) ) { - simulation::Region->insert_path( path, Scratchpad ); - } - else { + if( false == simulation::Paths.insert( path ) ) { ErrorLog( "Bad scenario: track with duplicate name \"" + path->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); /* delete path; delete pathnode; */ } + simulation::Region->insert_path( path, Scratchpad ); } else if( nodedata.type == "traction" ) { @@ -325,12 +323,10 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad // traction loading is optional if( traction == nullptr ) { return; } - if( simulation::Traction.insert( traction ) ) { - simulation::Region->insert_traction( traction, Scratchpad ); - } - else { + if( false == simulation::Traction.insert( traction ) ) { ErrorLog( "Bad scenario: traction piece with duplicate name \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } + simulation::Region->insert_traction( traction, Scratchpad ); } else if( nodedata.type == "tractionpowersource" ) { @@ -338,15 +334,13 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad // traction loading is optional if( powersource == nullptr ) { return; } - if( simulation::Powergrid.insert( powersource ) ) { -/* - // TODO: implement this - simulation::Region.insert_powersource( powersource, Scratchpad ); -*/ - } - else { + if( false == simulation::Powergrid.insert( powersource ) ) { ErrorLog( "Bad scenario: power grid source with duplicate name \"" + powersource->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } +/* + // TODO: implement this + simulation::Region.insert_powersource( powersource, Scratchpad ); +*/ } else if( nodedata.type == "model" ) { @@ -382,12 +376,10 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad // model import can potentially fail if( instance == nullptr ) { return; } - if( simulation::Instances.insert( instance ) ) { - simulation::Region->insert_instance( instance, Scratchpad ); - } - else { + if( false == simulation::Instances.insert( instance ) ) { ErrorLog( "Bad scenario: 3d model instance with duplicate name \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } + simulation::Region->insert_instance( instance, Scratchpad ); } } else if( ( nodedata.type == "triangles" ) @@ -412,42 +404,36 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad else if( nodedata.type == "memcell" ) { auto *memorycell { deserialize_memorycell( Input, Scratchpad, nodedata ) }; - if( simulation::Memory.insert( memorycell ) ) { -/* - // TODO: implement this - simulation::Region.insert_memorycell( memorycell, Scratchpad ); -*/ - } - else { + if( false == simulation::Memory.insert( memorycell ) ) { ErrorLog( "Bad scenario: memory cell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } +/* + // TODO: implement this + simulation::Region.insert_memorycell( memorycell, Scratchpad ); +*/ } else if( nodedata.type == "eventlauncher" ) { - auto *eventlauncher{ deserialize_eventlauncher( Input, Scratchpad, nodedata ) }; - if( simulation::Events.insert( eventlauncher ) ) { + auto *eventlauncher { deserialize_eventlauncher( Input, Scratchpad, nodedata ) }; + if( false == simulation::Events.insert( eventlauncher ) ) { + ErrorLog( "Bad scenario: event launcher with duplicate name \"" + eventlauncher->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } // event launchers can be either global, or local with limited range of activation // each gets assigned different caretaker - if( true == eventlauncher->IsGlobal() ) { - simulation::Events.queue( eventlauncher ); - } - else { - simulation::Region->insert_launcher( eventlauncher, Scratchpad ); - } + if( true == eventlauncher->IsGlobal() ) { + simulation::Events.queue( eventlauncher ); } else { - ErrorLog( "Bad scenario: event launcher with duplicate name \"" + eventlauncher->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + simulation::Region->insert_launcher( eventlauncher, Scratchpad ); } } else if( nodedata.type == "sound" ) { auto *sound { deserialize_sound( Input, Scratchpad, nodedata ) }; - if( simulation::Sounds.insert( sound ) ) { - simulation::Region->insert_sound( sound, Scratchpad ); - } - else { + if( false == simulation::Sounds.insert( sound ) ) { ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->m_name + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } + simulation::Region->insert_sound( sound, Scratchpad ); } } @@ -476,7 +462,7 @@ state_manager::deserialize_endorigin( cParser &Input, scene::scratch_data &Scrat Scratchpad.location_offset.pop(); } else { - ErrorLog( "Bad origin: endorigin instruction with empty origin stack in file \"" + Input.Name() + "\" (line " + to_string( Input.Line() - 1 ) + ")" ); + ErrorLog( "Bad origin: endorigin instruction with empty origin stack in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); } } @@ -530,7 +516,7 @@ state_manager::deserialize_trainset( cParser &Input, scene::scratch_data &Scratc if( true == Scratchpad.trainset.is_open ) { // shouldn't happen but if it does wrap up currently open trainset and report an error deserialize_endtrainset( Input, Scratchpad ); - ErrorLog( "Bad scenario: encountered nested trainset definitions in file \"" + Input.Name() + "\" (line " + to_string( Input.Line() ) + ")" ); + ErrorLog( "Bad scenario: encountered nested trainset definitions in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() ) + ")" ); } Scratchpad.trainset = scene::scratch_data::trainset_data(); @@ -550,7 +536,7 @@ state_manager::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scr if( ( false == Scratchpad.trainset.is_open ) || ( true == Scratchpad.trainset.vehicles.empty() ) ) { // not bloody likely but we better check for it just the same - ErrorLog( "Bad trainset: empty trainset defined in file \"" + Input.Name() + "\" (line " + to_string( Input.Line() - 1 ) + ")" ); + ErrorLog( "Bad trainset: empty trainset defined in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); Scratchpad.trainset.is_open = false; return; } diff --git a/version.h b/version.h index bbb0332c..e1dbbd5c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 916 +#define VERSION_MINOR 1020 #define VERSION_REVISION 0 From 35e526a4548823b4f1dc8fca10344925737a55b6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 22 Oct 2017 19:25:10 +0200 Subject: [PATCH 204/426] added support for using multiple and/or nested include parameters in one token --- parser.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/parser.cpp b/parser.cpp index c220b0c2..994250e6 100644 --- a/parser.cpp +++ b/parser.cpp @@ -153,21 +153,18 @@ std::string cParser::readToken(bool ToLower, const char *Break) if (mIncludeParser) { token = mIncludeParser->readToken(ToLower, Break); - if (!token.empty()) - { - pos = token.find("(p"); - // check if the token is a parameter which should be replaced with stored true value - if (pos != std::string::npos) //!=npos to znalezione - { - std::string parameter = - token.substr(pos + 2, token.find(")", pos) - pos + 2); // numer parametru + if (!token.empty()) { + + while( ( pos = token.find( "(p" ) ) != std::string::npos ) { + // check if the token is a parameter which should be replaced with stored true value + auto const parameter { token.substr( pos + 2, token.find( ")", pos ) - ( pos + 2 ) ) }; // numer parametru token.erase(pos, token.find(")", pos) - pos + 1); // najpierw usunięcie "(pN)" size_t nr = atoi(parameter.c_str()) - 1; if (nr < parameters.size()) { token.insert(pos, parameters.at(nr)); // wklejenie wartości parametru if (ToLower) - for (; pos < token.length(); ++pos) + for (; pos < parameters.at( nr ).size(); ++pos) token[pos] = tolower(token[pos]); } else From d92004a8180fe6ae685dc5e4d2ce98595eb3b1ba Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 23 Oct 2017 15:57:37 +0200 Subject: [PATCH 205/426] support for seasonal texture sets, wireframe mode render speed fix --- Globals.cpp | 19 ++++----------- Globals.h | 65 ++++++++++++++++++++++++++-------------------------- Ground.cpp | 3 ++- Texture.cpp | 7 ++++-- World.cpp | 25 +++++++++++++++++++- World.h | 3 +++ material.cpp | 33 ++++++++++++++++++++++---- material.h | 4 ++-- renderer.cpp | 9 +++++--- 9 files changed, 108 insertions(+), 60 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index 9544503e..914f3b74 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -26,8 +26,9 @@ http://mozilla.org/MPL/2.0/. // namespace Global { // parametry do użytku wewnętrznego -// double Global::tSinceStart=0; +#ifdef EU07_USE_OLD_GROUNDCODE TGround *Global::pGround = NULL; +#endif std::string Global::AppName{ "EU07" }; std::string Global::asCurrentSceneryPath = "scenery/"; std::string Global::asCurrentTexturePath = std::string(szTexturePath); @@ -75,6 +76,8 @@ GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; double Global::fFogStart = 1700; double Global::fFogEnd = 2000; float Global::Overcast { 0.1f }; // NOTE: all this weather stuff should be moved elsewhere +std::string Global::Season; // season of the year, based on simulation date + float Global::BaseDrawRange { 2500.f }; opengl_light Global::DayLight; int Global::DynamicLightCount { 3 }; @@ -191,19 +194,6 @@ int Global::iMWDdivider = 5; //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -std::string Global::GetNextSymbol() -{ // pobranie tokenu z aktualnego parsera - - std::string token; - if (pParser != nullptr) - { - - pParser->getTokens(); - *pParser >> token; - }; - return token; -}; - void Global::LoadIniFile(std::string asFileName) { FreeCameraInit.resize( 10 ); @@ -465,6 +455,7 @@ void Global::ConfigParse(cParser &Parser) std::tm *localtime = std::localtime(&timenow); Global::fMoveLight = localtime->tm_yday + 1; // numer bieżącego dnia w roku } + Global::pWorld->compute_season( Global::fMoveLight ); } else if( token == "dynamiclights" ) { // number of dynamic lights in the scene diff --git a/Globals.h b/Globals.h index 46ce880c..fac2576d 100644 --- a/Globals.h +++ b/Globals.h @@ -150,16 +150,32 @@ private: void Update(); }; -class Global -{ - private: - public: +class Global { + +public: +// methods + static void LoadIniFile(std::string asFileName); + static void ConfigParse( cParser &parser ); + static void InitKeys(); + inline static Math3D::vector3 GetCameraPosition() { return pCameraPosition; }; + static void SetCameraPosition(Math3D::vector3 pNewCameraPosition); + static void SetCameraRotation(double Yaw); + static void TrainDelete(TDynamicObject *d); +#ifdef EU07_USE_OLD_GROUNDCODE + static TDynamicObject * DynamicNearest(); + static TDynamicObject * CouplerNearest(); +#endif + static bool AddToQuery(TEvent *event, TDynamicObject *who); + static bool DoEvents(); + static std::string Bezogonkow(std::string str, bool _ = false); + static double Min0RSpeed(double vel1, double vel2); + +// members static int Keys[MaxKeys]; static bool RealisticControlMode; // controls ability to steer the vehicle from outside views static Math3D::vector3 pCameraPosition; // pozycja kamery w świecie static Math3D::vector3 DebugCameraPosition; // pozycja kamery w świecie - static double - pCameraRotation; // kierunek bezwzględny kamery w świecie: 0=północ, 90°=zachód (-azymut) + static double pCameraRotation; // kierunek bezwzględny kamery w świecie: 0=północ, 90°=zachód (-azymut) static double pCameraRotationDeg; // w stopniach, dla animacji billboard static std::vector FreeCameraInit; // pozycje kamery static std::vector FreeCameraInitAngle; @@ -179,27 +195,24 @@ class Global static bool bLiveTraction; static float Global::fMouseXScale; static float Global::fMouseYScale; - static double fFogStart; - static double fFogEnd; +#ifdef EU07_USE_OLD_GROUNDCODE static TGround *pGround; +#endif static std::string szDefaultExt; static std::string SceneryFile; static std::string AppName; static std::string asCurrentSceneryPath; static std::string asCurrentTexturePath; static std::string asCurrentDynamicPath; - // McZapkie-170602: zewnetrzna definicja pojazdu uzytkownika - static std::string asHumanCtrlVehicle; - static void LoadIniFile(std::string asFileName); - static void InitKeys(); - inline static Math3D::vector3 GetCameraPosition() { return pCameraPosition; }; - static void SetCameraPosition(Math3D::vector3 pNewCameraPosition); - static void SetCameraRotation(double Yaw); static int iWriteLogEnabled; // maska bitowa: 1-zapis do pliku, 2-okienko static bool MultipleLogs; - // McZapkie-221002: definicja swiatla dziennego - static GLfloat FogColor[]; + // McZapkie-170602: zewnetrzna definicja pojazdu uzytkownika + static std::string asHumanCtrlVehicle; + // world environment static float Overcast; + static double fFogStart; + static double fFogEnd; + static std::string Season; // season of the year, based on simulation date // TODO: put these things in the renderer static float BaseDrawRange; @@ -222,6 +235,9 @@ class Global static float FieldOfView; // vertical field of view for the camera. TODO: move it to the renderer static GLint iMaxTextureSize; // maksymalny rozmiar tekstury static int iMultisampling; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px + static bool bSmoothTraction; // wygładzanie drutów + static float SplineFidelity; // determines segment size during conversion of splines to geometry + static GLfloat FogColor[]; static bool FullPhysics; // full calculations performed for each simulation step static int iSlowMotion; @@ -248,8 +264,6 @@ class Global static int iScreenMode[12]; // numer ekranu wyświetlacza tekstowego static double fMoveLight; // numer dnia w roku albo -1 static bool FakeLight; // toggle between fixed and dynamic daylight - static bool bSmoothTraction; // wygładzanie drutów - static float SplineFidelity; // determines segment size during conversion of splines to geometry static double fTimeSpeed; // przyspieszenie czasu, zmienna do testów static double fTimeAngleDeg; // godzina w postaci kąta static float fClockAngleDeg[6]; // kąty obrotu cylindrów dla zegara cyfrowego @@ -293,19 +307,6 @@ class Global //randomizacja static std::mt19937 random_engine; - // metody - static void TrainDelete(TDynamicObject *d); - static void ConfigParse(cParser &parser); - static std::string GetNextSymbol(); -#ifdef EU07_USE_OLD_GROUNDCODE - static TDynamicObject * DynamicNearest(); - static TDynamicObject * CouplerNearest(); -#endif - static bool AddToQuery(TEvent *event, TDynamicObject *who); - static bool DoEvents(); - static std::string Bezogonkow(std::string str, bool _ = false); - static double Min0RSpeed(double vel1, double vel2); - // maciek001: zmienne dla MWD static bool bMWDmasterEnable; // główne włączenie portu COM static bool bMWDdebugEnable; // logowanie pracy diff --git a/Ground.cpp b/Ground.cpp index 74f76aa1..eca03bc1 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -533,8 +533,9 @@ BYTE TempConnectionType[ 200 ]; // Ra: sprzêgi w sk³adzie; ujemne, gdy odwrotn TGround::TGround() { +#ifdef EU07_USE_OLD_GROUNDCODE Global::pGround = this; - +#endif for( int i = 0; i < TP_LAST; ++i ) { nRootOfType[ i ] = nullptr; // zerowanie tablic wyszukiwania } diff --git a/Texture.cpp b/Texture.cpp index f2a294f4..b4c2716c 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -716,8 +716,11 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { Filename.erase( traitpos ); } - if( Filename.rfind( '.' ) != std::string::npos ) - Filename.erase( Filename.rfind( '.' ) ); // trim extension if there's one + if( ( Filename.rfind( '.' ) != std::string::npos ) + && ( Filename.rfind( '.' ) != Filename.rfind( ".." ) + 1 ) ) { + // trim extension if there's one, but don't mistake folder traverse for extension + Filename.erase( Filename.rfind( '.' ) ); + } for( char &c : Filename ) { // change forward slashes to windows ones. NOTE: probably not strictly necessary, but eh diff --git a/World.cpp b/World.cpp index 80757136..98a87c8a 100644 --- a/World.cpp +++ b/World.cpp @@ -2322,7 +2322,6 @@ void TWorld::ChangeDynamic() { } Global::changeDynObj = NULL; } -//--------------------------------------------------------------------------- void TWorld::ToggleDaylight() { @@ -2339,6 +2338,30 @@ TWorld::ToggleDaylight() { } } +// calculates current season of the year based on set simulation date +void +TWorld::compute_season( int const Yearday ) const { + + using dayseasonpair = std::pair; + + std::vector seasonsequence { + { 65, "winter" }, + { 158, "spring" }, + { 252, "summer" }, + { 341, "autumn" }, + { 366, "winter" } }; + auto const lookup = + std::lower_bound( + std::begin( seasonsequence ), std::end( seasonsequence ), + clamp( Yearday, 1, seasonsequence.back().first ), + []( dayseasonpair const &Left, const int Right ) { + return Left.first < Right; } ); + + Global::Season = lookup->second + ":"; +} + + + void world_environment::init() { diff --git a/World.h b/World.h index a646e9ad..bd366f8c 100644 --- a/World.h +++ b/World.h @@ -113,6 +113,9 @@ TWorld(); train() const { return Train; } // switches between static and dynamic daylight calculation void ToggleDaylight(); + // calculates current season of the year based on set simulation date + void compute_season( int const Yearday ) const; + private: void Update_Environment(); diff --git a/material.cpp b/material.cpp index c93ca908..b3870201 100644 --- a/material.cpp +++ b/material.cpp @@ -18,7 +18,7 @@ bool opengl_material::deserialize( cParser &Input, bool const Loadnow ) { bool result { false }; - while( true == deserialize_mapping( Input, Loadnow ) ) { + while( true == deserialize_mapping( Input, 0, Loadnow ) ) { result = true; // once would suffice but, eh } @@ -32,7 +32,7 @@ opengl_material::deserialize( cParser &Input, bool const Loadnow ) { // imports member data pair from the config file bool -opengl_material::deserialize_mapping( cParser &Input, bool const Loadnow ) { +opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow ) { if( false == Input.getTokens( 2, true, "\n\r\t;, " ) ) { return false; @@ -48,8 +48,30 @@ opengl_material::deserialize_mapping( cParser &Input, bool const Loadnow ) { >> key >> value; - if( key == "texture1:" ) { texture1 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); } - else if( key == "texture2:" ) { texture2 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); } + if( value == "{" ) { + // detect and optionally process config blocks + cParser blockparser( Input.getToken( false, "}" ) ); + if( key == Global::Season ) { + // seasonal textures override generic textures + while( true == deserialize_mapping( blockparser, 1, Loadnow ) ) { + ; // all work is done in the header + } + } + } + else if( key == "texture1:" ) { + // TODO: full-fledged priority system + if( ( texture1 == null_handle ) + || ( Priority > 0 ) ) { + texture1 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); + } + } + else if( key == "texture2:" ) { + // TODO: full-fledged priority system + if( ( texture2 == null_handle ) + || ( Priority > 0 ) ) { + texture2 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); + } + } return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized } @@ -65,7 +87,8 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { if( filename.find( '|' ) != std::string::npos ) filename.erase( filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury - if( filename.rfind( '.' ) != std::string::npos ) { + if( ( filename.rfind( '.' ) != std::string::npos ) + && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { // we can get extension for .mat or, in legacy files, some image format. just trim it and set it to material file extension filename.erase( filename.rfind( '.' ) ); } diff --git a/material.h b/material.h index 841d1861..6f305cb0 100644 --- a/material.h +++ b/material.h @@ -28,9 +28,9 @@ struct opengl_material { bool deserialize( cParser &Input, bool const Loadnow ); private: - // imports member data pair from the config file + // imports member data pair from the config file, overriding existing parameter values of lower priority bool - deserialize_mapping( cParser &Input, bool const Loadnow ); + deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow ); }; class material_manager { diff --git a/renderer.cpp b/renderer.cpp index d4e8929b..1ef746c6 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -365,6 +365,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { opengl_camera shadowcamera; // temporary helper, remove once ortho shadowmap code is done if( ( true == Global::RenderShadows ) + && ( false == Global::bWireFrame ) && ( true == World.InitPerformed() ) && ( m_shadowcolor != colors::white ) ) { // run shadowmap pass before color @@ -857,7 +858,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const Active_Texture( m_helpertextureunit ); if( ( true == Reflections ) - || ( ( true == Global::RenderShadows ) && ( true == Shadows ) ) ) { + || ( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( false == Global::bWireFrame ) ) ) { // we need to have texture on the helper for either the reflection and shadow generation (or both) if( true == m_environmentcubetexturesupport ) { // bind dynamic environment cube if it's enabled... @@ -880,7 +881,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const } } - if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + if( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( false == Global::bWireFrame ) ) { ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( m_shadowcolor ) ); // TODO: dynamically calculated shadow colour, based on sun height @@ -938,6 +939,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const if( m_shadowtextureunit >= 0 ) { if( ( true == Global::RenderShadows ) && ( true == Shadows ) + && ( false == Global::bWireFrame ) && ( m_shadowcolor != colors::white ) ) { Active_Texture( m_shadowtextureunit ); @@ -1049,6 +1051,7 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons if( ( true == Reflections ) || ( ( true == Global::RenderShadows ) && ( true == Shadows ) + && ( false == Global::bWireFrame ) && ( m_shadowcolor != colors::white ) ) ) { if( true == m_environmentcubetexturesupport ) { ::glEnable( GL_TEXTURE_CUBE_MAP ); @@ -1068,7 +1071,7 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons } // shadow texture unit. if( m_shadowtextureunit >= 0 ) { - if( ( true == Global::RenderShadows ) && ( true == Shadows ) ) { + if( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( false == Global::bWireFrame ) ) { Active_Texture( m_shadowtextureunit ); ::glEnable( GL_TEXTURE_2D ); From e3915e3c52620bd593d7f653535c437c8685f75c Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 25 Oct 2017 15:44:41 +0200 Subject: [PATCH 206/426] fix for emptying brake reservoirs --- McZapkie/Mover.cpp | 2 +- McZapkie/Oerlikon_ESt.cpp | 2 -- McZapkie/hamulce.cpp | 38 ++++++++++++++++++++++++++++++++++++++ McZapkie/hamulce.h | 3 +++ 4 files changed, 42 insertions(+), 3 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index a1f76501..4bee3a02 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3456,7 +3456,7 @@ void TMoverParameters::UpdatePipePressure(double dt) temp = 0.0; // odetnij else temp = 1.0; // połącz - Pipe->Flow(temp * Hamulec->GetPF(temp * PipePress, dt, Vel) + GetDVc(dt)); + Pipe->Flow( temp * Hamulec->GetPF( temp * PipePress, dt, Vel ) + GetDVc( dt ) ); if (ASBType == 128) Hamulec->ASB(int(SlippingWheels)); diff --git a/McZapkie/Oerlikon_ESt.cpp b/McZapkie/Oerlikon_ESt.cpp index ef433d64..8ae37298 100644 --- a/McZapkie/Oerlikon_ESt.cpp +++ b/McZapkie/Oerlikon_ESt.cpp @@ -435,8 +435,6 @@ void TNESt3::ForceEmptiness() Miedzypoj->CreatePress(0); CntrlRes->CreatePress(0); - BrakeStatus = 0; - ValveRes->Act(); BrakeRes->Act(); Miedzypoj->Act(); diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 06e45445..8c76e06a 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -413,6 +413,7 @@ void TBrake::ForceEmptiness() { ValveRes->CreatePress(0); BrakeRes->CreatePress(0); + ValveRes->Act(); BrakeRes->Act(); } @@ -757,6 +758,17 @@ double TESt::GetCRP() return CntrlRes->P(); } +void TESt::ForceEmptiness() { + + ValveRes->CreatePress( 0 ); + BrakeRes->CreatePress( 0 ); + CntrlRes->CreatePress( 0 ); + + ValveRes->Act(); + BrakeRes->Act(); + CntrlRes->Act(); +} + //---EP2--- void TEStEP2::Init( double const PP, double const HPP, double const LPP, double const BP, int const BDF ) @@ -1721,6 +1733,17 @@ double TCV1::GetCRP() return CntrlRes->P(); } +void TCV1::ForceEmptiness() { + + ValveRes->CreatePress( 0 ); + BrakeRes->CreatePress( 0 ); + CntrlRes->CreatePress( 0 ); + + ValveRes->Act(); + BrakeRes->Act(); + CntrlRes->Act(); +} + //---CV1-L-TR--- void TCV1L_TR::SetLBP( double const P ) @@ -2090,6 +2113,21 @@ void TKE::SetLBP( double const P ) LBP = P; } +void TKE::ForceEmptiness() { + + ValveRes->CreatePress( 0 ); + BrakeRes->CreatePress( 0 ); + CntrlRes->CreatePress( 0 ); + ImplsRes->CreatePress( 0 ); + Brak2Res->CreatePress( 0 ); + + ValveRes->Act(); + BrakeRes->Act(); + CntrlRes->Act(); + ImplsRes->Act(); + Brak2Res->Act(); +} + //---KRANY--- double TDriverHandle::GetPF(double const i_bcp, double PP, double HP, double dt, double ep) diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index b23c6c06..805d53d3 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -260,6 +260,7 @@ class TESt : public TBrake { void CheckReleaser(double dt); //odluzniacz double CVs(double BP); //napelniacz sterujacego double BVs(double BCP); //napelniacz pomocniczego + void ForceEmptiness() /*override*/; // wymuszenie bycia pustym inline TESt(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake( i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -410,6 +411,7 @@ public: void CheckState( double const BCP, double &dV1 ); double CVs( double const BP ); double BVs( double const BCP ); + void ForceEmptiness() /*override*/; // wymuszenie bycia pustym inline TCV1(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake( i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) @@ -482,6 +484,7 @@ class TKE : public TBrake { //Knorr Einheitsbauart — jeden do wszystkiego void PLC( double const mass ); //wspolczynnik cisnienia przystawki wazacej void SetLP( double const TM, double const LM, double const TBP ); //parametry przystawki wazacej void SetLBP( double const P ); //cisnienie z hamulca pomocniczego + void ForceEmptiness() /*override*/; // wymuszenie bycia pustym inline TKE(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TBrake( i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) From d8c3b5caf4a9982b6b2676ddb4c567a25ac7de14 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 26 Oct 2017 04:54:07 +0200 Subject: [PATCH 207/426] build 171025: finished initial refactoring of ground class, fixes for text parser to prevent some cases of eternal parameter loops --- Driver.cpp | 181 +++++++++++++++++++++++++++------------------------ DynObj.cpp | 59 +++++++++++------ Event.cpp | 10 +-- Ground.cpp | 13 ++-- MemCell.cpp | 13 ++++ MemCell.h | 3 + Segment.cpp | 14 +++- Track.cpp | 65 +++++++++--------- Track.h | 8 +-- World.cpp | 9 ++- parser.cpp | 132 +++++++++++++++++++------------------ parser.h | 2 +- renderer.cpp | 50 +++++++++----- renderer.h | 16 ++++- version.h | 2 +- 15 files changed, 332 insertions(+), 245 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 0fb10aa5..772f78af 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -5367,43 +5367,47 @@ void TController::SetProximityVelocity( double dist, double vel, glm::dvec3 cons TCommandType TController::BackwardScan() { // sprawdzanie zdarzeń semaforów z tyłu pojazdu, zwraca komendę - // dzięki temu będzie można stawać za wskazanym sygnalizatorem, a zwłaszcza jeśli będzie jazda - // na kozioł - // ograniczenia prędkości nie są wtedy istotne, również koniec toru jest do niczego nie - // przydatny + // dzięki temu będzie można stawać za wskazanym sygnalizatorem, a zwłaszcza jeśli będzie jazda na kozioł + // ograniczenia prędkości nie są wtedy istotne, również koniec toru jest do niczego nie przydatny // zwraca true, jeśli należy odwrócić kierunek jazdy pojazdu - if ((OrderList[OrderPos] & ~(Shunt | Connect))) - return cm_Unknown; // skanowanie sygnałów tylko gdy jedzie w trybie manewrowym albo czeka na - // rozkazy + if( ( OrderList[ OrderPos ] & ~( Shunt | Connect ) ) ) { + // skanowanie sygnałów tylko gdy jedzie w trybie manewrowym albo czeka na rozkazy + return cm_Unknown; + } vector3 sl; - int startdir = - -pVehicles[0]->DirectionGet(); // kierunek jazdy względem sprzęgów pojazdu na czele - if (startdir == 0) // jeśli kabina i kierunek nie jest określony - return cm_Unknown; // nie robimy nic - double scandir = - startdir * pVehicles[0]->RaDirectionGet(); // szukamy od pierwszej osi w wybranym kierunku - if (scandir != - 0.0) // skanowanie toru w poszukiwaniu eventów GetValues (PutValues nie są przydatne) - { // Ra: przy wstecznym skanowaniu prędkość nie ma znaczenia - // scanback=pVehicles[1]->NextDistance(fLength+1000.0); //odległość do następnego pojazdu, - // 1000 gdy nic nie ma + // kierunek jazdy względem sprzęgów pojazdu na czele + int const startdir = -pVehicles[0]->DirectionGet(); + if( startdir == 0 ) { + // jeśli kabina i kierunek nie jest określony nie robimy nic + return cm_Unknown; + } + // szukamy od pierwszej osi w wybranym kierunku + double scandir = startdir * pVehicles[0]->RaDirectionGet(); + if (scandir != 0.0) { + // skanowanie toru w poszukiwaniu eventów GetValues (PutValues nie są przydatne) + // Ra: przy wstecznym skanowaniu prędkość nie ma znaczenia double scanmax = 1000; // 1000m do tyłu, żeby widział przeciwny koniec stacji double scandist = scanmax; // zmodyfikuje na rzeczywiście przeskanowane TEvent *e = NULL; // event potencjalnie od semafora - // opcjonalnie może być skanowanie od "wskaźnika" z przodu, np. W5, Tm=Ms1, koniec toru - TTrack *scantrack = BackwardTraceRoute(scandist, scandir, pVehicles[0]->RaTrackGet(), - e); // wg drugiej osi w kierunku ruchu - vector3 dir = startdir * pVehicles[0]->VectorFront(); // wektor w kierunku jazdy/szukania - if (!scantrack) // jeśli wstecz wykryto koniec toru - return cm_Unknown; // to raczej nic się nie da w takiej sytuacji zrobić - else - { // a jeśli są dalej tory + // opcjonalnie może być skanowanie od "wskaźnika" z przodu, np. W5, Tm=Ms1, koniec toru wg drugiej osi w kierunku ruchu + TTrack *scantrack = BackwardTraceRoute(scandist, scandir, pVehicles[0]->RaTrackGet(), e); + vector3 const dir = startdir * pVehicles[0]->VectorFront(); // wektor w kierunku jazdy/szukania + if( !scantrack ) { + // jeśli wstecz wykryto koniec toru to raczej nic się nie da w takiej sytuacji zrobić + return cm_Unknown; + } + else { + // a jeśli są dalej tory double vmechmax; // prędkość ustawiona semaforem - if (e) - { // jeśli jest jakiś sygnał na widoku + if( e != nullptr ) { + // jeśli jest jakiś sygnał na widoku #if LOGBACKSCAN - AnsiString edir = - pVehicle->asName + " - " + AnsiString((scandir > 0) ? "Event2 " : "Event1 "); + std::string edir { + "Backward scan by " + + pVehicle->asName + " - " + + ( ( scandir > 0 ) ? + "Event2 " : + "Event1 " ) }; #endif // najpierw sprawdzamy, czy semafor czy inny znak został przejechany vector3 pos = pVehicles[1]->RearPosition(); // pozycja tyłu @@ -5411,66 +5415,67 @@ TCommandType TController::BackwardScan() if (e->Type == tp_GetValues) { // przesłać info o zbliżającym się semaforze #if LOGBACKSCAN - edir += "(" + (e->Params[8].asGroundNode->asName) + "): "; + edir += "(" + ( e->asNodeName ) + ")"; #endif sl = e->PositionGet(); // położenie komórki pamięci sem = sl - pos; // wektor do komórki pamięci od końca składu - // sem=e->Params[8].asGroundNode->pCenter-pos; //wektor do komórki pamięci - if (dir.x * sem.x + dir.z * sem.z < 0) // jeśli został minięty - // if ((mvOccupied->CategoryFlag&1)?(VelNext!=0.0):true) //dla pociągu wymagany - // sygnał zezwalający - { // iloczyn skalarny jest ujemny, gdy sygnał stoi z tyłu + if (dir.x * sem.x + dir.z * sem.z < 0) { + // jeśli został minięty + // iloczyn skalarny jest ujemny, gdy sygnał stoi z tyłu #if LOGBACKSCAN - WriteLog(edir + "- ignored as not passed yet"); + WriteLog(edir + " - ignored as not passed yet"); #endif return cm_Unknown; // nic } vmechmax = e->ValueGet(1); // prędkość przy tym semaforze - // przeliczamy odległość od semafora - potrzebne by były współrzędne początku - // składu - // scandist=(pos-e->Params[8].asGroundNode->pCenter).Length()-0.5*mvOccupied->Dim.L-10; - // //10m luzu + // przeliczamy odległość od semafora - potrzebne by były współrzędne początku składu scandist = sem.Length() - 2; // 2m luzu przy manewrach wystarczy - if (scandist < 0) - scandist = 0; // ujemnych nie ma po co wysyłać + if( scandist < 0 ) { + // ujemnych nie ma po co wysyłać + scandist = 0; + } bool move = false; // czy AI w trybie manewerowym ma dociągnąć pod S1 - if (e->Command() == cm_SetVelocity) - if ((vmechmax == 0.0) ? (OrderCurrentGet() & (Shunt | Connect)) : - (OrderCurrentGet() & - Connect)) // przy podczepianiu ignorować wyjazd? + if( e->Command() == cm_SetVelocity ) { + if( ( vmechmax == 0.0 ) ? + ( OrderCurrentGet() & ( Shunt | Connect ) ) : + ( OrderCurrentGet() & Connect ) ) { // przy podczepianiu ignorować wyjazd? move = true; // AI w trybie manewerowym ma dociągnąć pod S1 - else - { // - if ((scandist > fMinProximityDist) ? - (mvOccupied->Vel > 0.0) && (OrderCurrentGet() != Shunt) : - false) - { // jeśli semafor jest daleko, a pojazd jedzie, to informujemy o -// zmianie prędkości -// jeśli jedzie manewrowo, musi dostać SetVelocity, żeby sie na pociągowy przełączył -// Mechanik->PutCommand("SetProximityVelocity",scandist,vmechmax,sl); + } + else { + if( ( scandist > fMinProximityDist ) + && ( ( mvOccupied->Vel > 0.0 ) + && ( OrderCurrentGet() != Shunt ) ) ) { + // jeśli semafor jest daleko, a pojazd jedzie, to informujemy o zmianie prędkości + // jeśli jedzie manewrowo, musi dostać SetVelocity, żeby sie na pociągowy przełączył #if LOGBACKSCAN - // WriteLog(edir+"SetProximityVelocity "+AnsiString(scandist)+" - // "+AnsiString(vmechmax)); + // WriteLog(edir+"SetProximityVelocity "+AnsiString(scandist) + AnsiString(vmechmax)); WriteLog(edir); #endif // SetProximityVelocity(scandist,vmechmax,&sl); - return (vmechmax > 0) ? cm_SetVelocity : cm_Unknown; + return ( + vmechmax > 0 ? + cm_SetVelocity : + cm_Unknown ); } - else // ustawiamy prędkość tylko wtedy, gdy ma ruszyć, stanąć albo ma - // stać - // if ((MoverParameters->Vel==0.0)||(vmechmax==0.0)) //jeśli stoi lub ma - // stanąć/stać - { // semafor na tym torze albo lokomtywa stoi, a ma ruszyć, albo ma -// stanąć, albo nie ruszać -// stop trzeba powtarzać, bo inaczej zatrąbi i pojedzie sam -// PutCommand("SetVelocity",vmechmax,e->Params[9].asMemCell->Value2(),&sl,stopSem); + else { + // ustawiamy prędkość tylko wtedy, gdy ma ruszyć, stanąć albo ma stać + // if ((MoverParameters->Vel==0.0)||(vmechmax==0.0)) //jeśli stoi lub ma stanąć/stać + // semafor na tym torze albo lokomtywa stoi, a ma ruszyć, albo ma stanąć, albo nie ruszać + // stop trzeba powtarzać, bo inaczej zatrąbi i pojedzie sam + // PutCommand("SetVelocity",vmechmax,e->Params[9].asMemCell->Value2(),&sl,stopSem); #if LOGBACKSCAN - WriteLog(edir + "SetVelocity " + AnsiString(vmechmax) + " " + - AnsiString(e->Params[9].asMemCell->Value2())); + WriteLog( + edir + " - [SetVelocity] [" + + to_string( vmechmax, 2 ) + "] [" + + to_string( e->Params[ 9 ].asMemCell->Value2(), 2 ) + "]" ); #endif - return (vmechmax > 0) ? cm_SetVelocity : cm_Unknown; + return ( + vmechmax > 0 ? + cm_SetVelocity : + cm_Unknown ); } } + } if (OrderCurrentGet() ? OrderCurrentGet() & (Shunt | Connect) : true) // w Wait_for_orders też widzi tarcze { // reakcja AI w trybie manewrowym dodatkowo na sygnały manewrowe @@ -5497,28 +5502,34 @@ TCommandType TController::BackwardScan() // to można zmienić kierunek } } - else // ustawiamy prędkość tylko wtedy, gdy ma ruszyć, albo stanąć albo - // ma stać pod tarczą - { // stop trzeba powtarzać, bo inaczej zatrąbi i pojedzie sam - // if ((MoverParameters->Vel==0.0)||(vmechmax==0.0)) //jeśli jedzie - // lub ma stanąć/stać + else { + // ustawiamy prędkość tylko wtedy, gdy ma ruszyć, albo stanąć albo ma stać pod tarczą + // stop trzeba powtarzać, bo inaczej zatrąbi i pojedzie sam + // if ((MoverParameters->Vel==0.0)||(vmechmax==0.0)) //jeśli jedzie lub ma stanąć/stać { // nie dostanie komendy jeśli jedzie i ma jechać -// PutCommand("ShuntVelocity",vmechmax,e->Params[9].asMemCell->Value2(),&sl,stopSem); + // PutCommand("ShuntVelocity",vmechmax,e->Params[9].asMemCell->Value2(),&sl,stopSem); #if LOGBACKSCAN - WriteLog(edir + "ShuntVelocity " + AnsiString(vmechmax) + " " + - AnsiString(e->ValueGet(2))); + WriteLog( + edir + " - [ShuntVelocity] [" + + to_string( vmechmax, 2 ) + "] [" + + to_string( e->ValueGet( 2 ), 2 ) + "]" ); #endif - return (vmechmax > 0) ? cm_ShuntVelocity : cm_Unknown; + return ( + vmechmax > 0 ? + cm_ShuntVelocity : + cm_Unknown ); } } - if ((vmechmax != 0.0) && (scandist < 100.0)) - { // jeśli Tm w odległości do 100m podaje zezwolenie na jazdę, to od -// razu ją ignorujemy, aby móc szukać kolejnej -// eSignSkip=e; //wtedy uznajemy ignorowaną przy poszukiwaniu nowej + if ((vmechmax != 0.0) && (scandist < 100.0)) { + // jeśli Tm w odległości do 100m podaje zezwolenie na jazdę, to od razu ją ignorujemy, aby móc szukać kolejnej + // eSignSkip=e; //wtedy uznajemy ignorowaną przy poszukiwaniu nowej #if LOGBACKSCAN - WriteLog(edir + "- will be ignored due to Ms2"); + WriteLog(edir + " - will be ignored due to Ms2"); #endif - return (vmechmax > 0) ? cm_ShuntVelocity : cm_Unknown; + return ( + vmechmax > 0 ? + cm_ShuntVelocity : + cm_Unknown ); } } // if (move?... } // if (OrderCurrentGet()==Shunt) diff --git a/DynObj.cpp b/DynObj.cpp index 72479e77..e04807f0 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -415,14 +415,22 @@ void TDynamicObject::UpdateDoorTranslate(TAnim *pAnim) // Ra: te współczynniki są bez sensu, bo modyfikują wektor przesunięcia // w efekcie drzwi otwierane na zewnątrz będą odlatywac dowolnie daleko :) // ograniczyłem zakres ruchu funkcją max - if (pAnim->smAnimated) - { - if (pAnim->iNumber & 1) + if (pAnim->smAnimated) { + + if( pAnim->iNumber & 1 ) { pAnim->smAnimated->SetTranslate( - vector3(0, 0, Min0R(dDoorMoveR * pAnim->fSpeed, dDoorMoveR))); - else + vector3{ + 0.0, + 0.0, + dDoorMoveR } ); + } + else { pAnim->smAnimated->SetTranslate( - vector3(0, 0, Min0R(dDoorMoveL * pAnim->fSpeed, dDoorMoveL))); + vector3{ + 0.0, + 0.0, + dDoorMoveL } ); + } } }; @@ -493,18 +501,30 @@ void TDynamicObject::UpdatePant(TAnim *pAnim) void TDynamicObject::UpdateDoorPlug(TAnim *pAnim) { // animacja drzwi - odskokprzesuw - if (pAnim->smAnimated) - { - if (pAnim->iNumber & 1) + if (pAnim->smAnimated) { + + if( pAnim->iNumber & 1 ) { pAnim->smAnimated->SetTranslate( - vector3(Min0R(dDoorMoveR * 2, MoverParameters->DoorMaxPlugShift), 0, - Max0R(0, Min0R(dDoorMoveR * pAnim->fSpeed, dDoorMoveR) - - MoverParameters->DoorMaxPlugShift * 0.5f))); - else + vector3 { + std::min( + dDoorMoveR * 2, + MoverParameters->DoorMaxPlugShift ), + 0.0, + std::max( + 0.0, + dDoorMoveR - MoverParameters->DoorMaxPlugShift * 0.5 ) } ); + } + else { pAnim->smAnimated->SetTranslate( - vector3(Min0R(dDoorMoveL * 2, MoverParameters->DoorMaxPlugShift), 0, - Max0R(0, Min0R(dDoorMoveL * pAnim->fSpeed, dDoorMoveL) - - MoverParameters->DoorMaxPlugShift * 0.5f))); + vector3 { + std::min( + dDoorMoveL * 2, + MoverParameters->DoorMaxPlugShift ), + 0.0, + std::max( + 0.0, + dDoorMoveL - MoverParameters->DoorMaxPlugShift * 0.5f ) } ); + } } }; @@ -1745,8 +1765,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" } if (ActPar.find('0') != std::string::npos) // wylaczanie na sztywno { - MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz MoverParameters->Hamulec->ForceEmptiness(); + MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz } if (ActPar.find('E') != std::string::npos) // oprozniony { @@ -1770,16 +1790,16 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" { if (Random(10) < 1) // losowanie 1/10 { - MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz MoverParameters->Hamulec->ForceEmptiness(); + MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz } } if (ActPar.find('X') != std::string::npos) // agonalny wylaczanie 20%, usrednienie przekladni { if (Random(100) < 20) // losowanie 20/100 { - MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz MoverParameters->Hamulec->ForceEmptiness(); + MoverParameters->Hamulec->SetBrakeStatus( MoverParameters->Hamulec->GetBrakeStatus() | b_dmg ); // wylacz } if (MoverParameters->BrakeCylMult[2] * MoverParameters->BrakeCylMult[1] > 0.01) // jesli jest nastawiacz mechaniczny PL @@ -5367,7 +5387,6 @@ vehicle_table::update( double Deltatime, int Iterationcount ) { if( false == vehicle->bEnabled ) { continue; } // Ra: zmienić warunek na sprawdzanie pantografów w jednej zmiennej: czy pantografy i czy podniesione if( vehicle->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) { - // TODO: re-implement update_traction( vehicle ); } vehicle->MoverParameters->ComputeConstans(); diff --git a/Event.cpp b/Event.cpp index daf24862..8755912d 100644 --- a/Event.cpp +++ b/Event.cpp @@ -1263,16 +1263,8 @@ event_manager::CheckQuery() { + to_string( m_workevent->Params[ 9 ].asMemCell->Value2(), 2 ) + "]" ); } else { -/* - // TODO: re-enable when cell manager is in place // lista wszystkich - for( TGroundNode *Current = nRootOfType[ TP_MEMCELL ]; Current; Current = Current->nNext ) { - WriteLog( "Memcell \"" + Current->asName + "\": " - + Current->MemCell->Text() + " " - + std::to_string( Current->MemCell->Value1() ) + " " - + std::to_string( Current->MemCell->Value2() ) ); - } -*/ + simulation::Memory.log_all(); } break; } diff --git a/Ground.cpp b/Ground.cpp index eca03bc1..174b050d 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1200,7 +1200,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } break; -#endif case TP_MODEL: { if( rmin < 0 ) { // legacy leftover: special case, terrain provided as 3d model @@ -1234,7 +1233,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } } else { -#ifdef EU07_USE_OLD_GROUNDCODE // regular 3d model parser->getTokens( 3 ); *parser @@ -1265,11 +1263,9 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) ErrorLog( "Duplicated model: " + tmp->asName ); // to zgłaszać duplikat } } -#endif } break; } -#ifdef EU07_USE_OLD_GROUNDCODE // case TP_GEOMETRY : case GL_TRIANGLES: case GL_TRIANGLE_STRIP: @@ -1472,7 +1468,6 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } // koniec wczytywania trójkątów break; } -#endif case GL_LINES: case GL_LINE_STRIP: case GL_LINE_LOOP: { @@ -1566,6 +1561,7 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) } break; } +#endif } return tmp; } @@ -1933,7 +1929,12 @@ bool TGround::Init(std::string File) } else if (str == "endorigin") { - OriginStack.pop(); + if( true == OriginStack.empty() ) { + // report error here + } + else { + OriginStack.pop(); + } pOrigin = ( OriginStack.empty() ? Math3D::vector3() : OriginStack.top() ); diff --git a/MemCell.cpp b/MemCell.cpp index 63c27b40..e55546e1 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -202,3 +202,16 @@ memory_table::InitCells() { cell->AssignEvents( simulation::Events.FindEvent( cell->name() + ":sent" ) ); } } + +// legacy method, sends content of all cells to the log +void +memory_table::log_all() { + + for( auto *cell : m_items ) { + + WriteLog( "Memcell \"" + cell->name() + "\": [" + + cell->Text() + "] [" + + to_string( cell->Value1(), 2 ) + "] [" + + to_string( cell->Value2(), 2 ) + "]" ); + } +} diff --git a/MemCell.h b/MemCell.h index 0364eb89..432be51f 100644 --- a/MemCell.h +++ b/MemCell.h @@ -73,6 +73,9 @@ public: // legacy method, initializes traction after deserialization from scenario file void InitCells(); + // legacy method, sends content of all cells to the log + void + log_all(); }; //--------------------------------------------------------------------------- diff --git a/Segment.cpp b/Segment.cpp index b8509c0d..afc6df24 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -386,7 +386,12 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, fOffset = 0.1 / fLength; // pierwsze 10cm pos1 = glm::dvec3{ FastGetPoint( t ) - Origin }; // wektor początku segmentu dir = glm::dvec3{ FastGetDirection( t, fOffset ) }; // wektor kierunku - parallel1 = glm::normalize( glm::vec3{ -dir.z, 0.f, dir.x } ); // wektor poprzeczny + parallel1 = glm::vec3{ -dir.z, 0.f, dir.x }; // wektor poprzeczny + if( glm::length2( parallel1 ) == 0.f ) { + // temporary workaround for malformed situations with control points placed above endpoints + parallel1 = glm::vec3{ glm::dvec3{ FastGetPoint_1() - FastGetPoint_0() } }; + } + parallel1 = glm::normalize( parallel1 ); if( iEnd == 0 ) iEnd = iSegCount; fEnd = fLength * double( iEnd ) / double( iSegCount ); @@ -416,7 +421,12 @@ bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, t = fTsBuffer[ i ]; // szybsze od GetTFromS(s); pos2 = glm::dvec3{ FastGetPoint( t ) - Origin }; dir = glm::dvec3{ FastGetDirection( t, fOffset ) }; // nowy wektor kierunku - parallel2 = glm::normalize( glm::vec3{ -dir.z, 0.f, dir.x } ); // wektor poprzeczny + parallel2 = glm::vec3{ -dir.z, 0.f, dir.x }; // wektor poprzeczny + if( glm::length2( parallel2 ) == 0.f ) { + // temporary workaround for malformed situations with control points placed above endpoints + parallel2 = glm::vec3{ glm::dvec3{ FastGetPoint_1() - FastGetPoint_0() } }; + } + parallel2 = glm::normalize( parallel2 ); if( trapez ) { for( int j = 0; j < iNumShapePoints; ++j ) { diff --git a/Track.cpp b/Track.cpp index 6d5cc64e..0c2b54ce 100644 --- a/Track.cpp +++ b/Track.cpp @@ -583,16 +583,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) >> fTexHeight1 >> fTexWidth >> fTexSlope; - if( fTexLength != 4.f ) { - // force defaults for malformed track definitions - bool paramsvalid { true }; - if( fTexHeight1 == 0.f ) { fTexHeight1 = 0.6f; paramsvalid = false; } - if( fTexWidth == 0.f ) { fTexWidth = 0.9f; paramsvalid = false; } - if( fTexSlope == 0.f ) { fTexSlope = 0.9f; paramsvalid = false; } - if( false == paramsvalid ) { - ErrorLog( "Bad track: one or more of texture dimensions set to 0 for track \"" + name() + "\" in file \"" + parser->Name() + "\" (line " + std::to_string( parser->Line() - 1 ) + ")" ); - } - } + if (iCategoryFlag & 4) fTexHeight1 = -fTexHeight1; // rzeki mają wysokość odwrotnie niż drogi } @@ -1185,13 +1176,15 @@ bool TTrack::InMovement() #ifdef EU07_USE_OLD_GROUNDCODE void TTrack::RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined) #else -void TTrack::RaAssign( scene::basic_cell *gn, TAnimModel *am, TEvent *done, TEvent *joined ) +void TTrack::RaAssign( TAnimModel *am, TEvent *done, TEvent *joined ) #endif { // Ra: wiązanie toru z modelem obrotnicy if (eType == tt_Table) { SwitchExtension->pModel = am; +#ifdef EU07_USE_OLD_GROUNDCODE SwitchExtension->pMyNode = gn; +#endif SwitchExtension->evMinus = done; // event zakończenia animacji (zadanie nowej przedłuża) SwitchExtension->evPlus = joined; // event potwierdzenia połączenia (gdy nie znajdzie, to się nie połączy) @@ -1218,6 +1211,10 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { hypot1 = 1.f; glm::vec3 const normalup{ 0.f, 1.f, 0.f }; glm::vec3 normal1 { fTexHeight1 / hypot1, fTexSlope / hypot1, 0.f }; // wektor normalny + if( glm::length( normal1 ) == 0.f ) { + // fix normal for vertical surfaces + normal1 = glm::vec3 { 1.f, 0.f, 0.f }; + } glm::vec3 normal2; float fHTW2, side2, slop2, rozp2, fTexHeight2, hypot2; if( iTrapezoid & 2 ) { @@ -1232,6 +1229,10 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { if( hypot2 == 0.f ) hypot2 = 1.f; normal2 = { fTexHeight2 / hypot2, trNext->fTexSlope / hypot2, 0.f }; + if( glm::length( normal2 ) == 0.f ) { + // fix normal for vertical surfaces + normal2 = glm::vec3 { 1.f, 0.f, 0.f }; + } } else { // gdy nie ma następnego albo jest nieodpowiednim końcem podpięty @@ -1645,7 +1646,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo rpts1[ 0 ] = { {rozp, -fTexHeight1, 0.f}, - normalup, + { 1.f, 0.f, 0.f }, {0.f, 0.f} }; // lewy brzeg podstawy rpts1[ 1 ] = { {bpts1[ 0 ].position.x + side, bpts1[ 0 ].position.y, 0.f}, @@ -1665,13 +1666,13 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.5f, 0.f} }; // prawa krawędź załamania rpts2[ 2 ] = { {-rozp, -fTexHeight1, 0.f}, - normalup, + { -1.f, 0.f, 0.f }, {0.f, 0.f} }; // prawy brzeg podstawy if (iTrapezoid) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka rpts1[ 3 ] = { {rozp2, -fTexHeight2, 0.f}, - normalup, + { 1.f, 0.f, 0.f }, {0.f, 0.f} }; // lewy brzeg lewego pobocza rpts1[ 4 ] = { {bpts1[ 2 ].position.x + side2, bpts1[ 2 ].position.y, 0.f}, @@ -1691,7 +1692,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.5f, 0.f} }; rpts2[ 5 ] = { {-rozp2, -fTexHeight2, 0.f}, - normalup, + { -1.f, 0.f, 0.f }, {0.f, 0.f} }; // prawy brzeg prawego pobocza } } @@ -1728,11 +1729,11 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.515625f, 0.f} }; // prawy krawężnik u góry rpts1[ 2 ] = { {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, - normalup, + { -1.f, 0.f, 0.f }, {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu rpts2[ 0 ] = { {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, - normalup, + { 1.f, 0.f, 0.f }, {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu rpts2[ 1 ] = { {bpts1[ 1 ].position.x - d, bpts1[ 1 ].position.y + h1l, 0.f}, @@ -1776,11 +1777,11 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.515625f, 0.f} }; // prawy krawężnik u góry rpts1[ 5 ] = { {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, - normalup, + { -1.f, 0.f, 0.f }, {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu rpts2[ 3 ] = { {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, - normalup, + { 1.f, 0.f, 0.f }, {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu rpts2[ 4 ] = { {bpts1[ 3 ].position.x - d, bpts1[ 3 ].position.y + h2l, 0.f}, @@ -1912,7 +1913,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo rpts1[ 0 ] = { {rozp, -fTexHeight1, 0.f}, - normalup, + { 1.f, 0.f, 0.f }, {0.f, 0.f} }; // lewy brzeg podstawy rpts1[ 1 ] = { {bpts1[ 0 ].position.x + side, bpts1[ 0 ].position.y, 0.f}, @@ -1932,13 +1933,13 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.5f, 0.f} }; // prawa krawędź załamania rpts2[ 2 ] = { {-rozp, -fTexHeight1, 0.f}, - normalup, + { -1.f, 0.f, 0.f }, {0.f, 0.f} }; // prawy brzeg podstawy // if (iTrapezoid) //trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka rpts1[ 3 ] = { {rozp2, -fTexHeight2, 0.f}, - normalup, + { 1.f, 0.f, 0.f }, {0.f, 0.f} }; // lewy brzeg lewego pobocza rpts1[ 4 ] = { {bpts1[ 2 ].position.x + side2, bpts1[ 2 ].position.y, 0.f}, @@ -1958,7 +1959,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.5f, 0.f} }; rpts2[ 5 ] = { {-rozp2, -fTexHeight2, 0.f}, - normalup, + { -1.f, 0.f, 0.f }, {0.f, 0.f} }; // prawy brzeg prawego pobocza } } @@ -1987,11 +1988,11 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.515625f, 0.f} }; // prawy krawężnik u góry rpts1[ 2 ] = { {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, - normalup, + { -1.f, 0.f, 0.f }, {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu rpts2[ 0 ] = { {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, - normalup, + { 1.f, 0.f, 0.f }, {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu rpts2[ 1 ] = { {bpts1[ 1 ].position.x - d, bpts1[ 1 ].position.y - fTexHeight1, 0.f}, @@ -2026,11 +2027,11 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.515625f, 0.f} }; // prawy krawężnik u góry rpts1[ 5 ] = { {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, - normalup, + { -1.f, 0.f, 0.f }, {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu rpts2[ 3 ] = { {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, - normalup, + { 1.f, 0.f, 0.f }, {0.484375f + d / 2.56, 0.f} }; // lewy krawężnik u dołu rpts2[ 4 ] = { {bpts1[ 3 ].position.x - d, bpts1[ 3 ].position.y - fTexHeight2, 0.f}, @@ -2664,11 +2665,11 @@ TTrack * TTrack::RaAnimate() #ifdef EU07_USE_OLD_GROUNDCODE SwitchExtension->pMyNode->pCenter + #else - SwitchExtension->pMyNode->area().center + + location() + #endif SwitchExtension->vTrans; // SwitchExtension->Segments[0]->FastGetPoint(0.5); Segment->Init(middle + vector3(sina, 0.0, cosa), - middle - vector3(sina, 0.0, cosa), 5.0); // nowy odcinek + middle - vector3(sina, 0.0, cosa), 10.0); // nowy odcinek for( auto dynamic : Dynamics ) { // minimalny ruch, aby przeliczyć pozycję dynamic->Move( 0.000001 ); @@ -2957,18 +2958,19 @@ path_table::InitTracks() { } switch (track->eType) { -/* // TODO: re-enable case tt_Table: { // obrotnicę też łączymy na starcie z innymi torami // szukamy modelu o tej samej nazwie auto *instance = simulation::Instances.find( trackname ); // wiązanie toru z modelem obrotnicy +#ifdef EU07_USE_OLD_GROUNDCODE +#else track->RaAssign( - Current, instance, simulation::Events.FindEvent( trackname + ":done" ), simulation::Events.FindEvent( trackname + ":joined" ) ); +#endif if( instance == nullptr ) { // jak nie ma modelu to pewnie jest wykolejnica, a ta jest domyślnie zamknięta i wykoleja break; @@ -2976,7 +2978,6 @@ path_table::InitTracks() { // no break on purpose: // jak coś pójdzie źle, to robimy z tego normalny tor } -*/ case tt_Normal: { // tylko proste są podłączane do rozjazdów, stąd dwa rozjazdy się nie połączą ze sobą if( track->CurrentPrev() == nullptr ) { diff --git a/Track.h b/Track.h index 59102064..8d23c127 100644 --- a/Track.h +++ b/Track.h @@ -75,13 +75,11 @@ class TSwitchExtension }; struct { // zmienne potrzebne tylko dla obrotnicy/przesuwnicy + // TAnimContainer *pAnim; //animator modelu dla obrotnicy + TAnimModel *pModel; // na razie model #ifdef EU07_USE_OLD_GROUNDCODE TGroundNode *pMyNode; // dla obrotnicy do wtórnego podłączania torów -#else - scene::basic_cell *pMyNode; // TODO: convert this to observer pattern #endif - // TAnimContainer *pAnim; //animator modelu dla obrotnicy - TAnimModel *pModel; // na razie model }; struct { // zmienne dla skrzyżowania @@ -270,7 +268,7 @@ public: #ifdef EU07_USE_OLD_GROUNDCODE void RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined); #else - void RaAssign( scene::basic_cell *gn, TAnimModel *am, TEvent *done, TEvent *joined ); + void RaAssign( TAnimModel *am, TEvent *done, TEvent *joined ); #endif void RaAnimListAdd(TTrack *t); TTrack * RaAnimate(); diff --git a/World.cpp b/World.cpp index 98a87c8a..9d427367 100644 --- a/World.cpp +++ b/World.cpp @@ -1312,7 +1312,7 @@ void TWorld::Update_UI() { UITable->text_lines.clear(); - std::string uitextline1, uitextline2, uitextline3, uitextline4; + std::string uitextline1, uitextline2, uitextline3, uitextline4; UILayer.set_tooltip( "" ); if( ( Train != nullptr ) && ( false == FreeFlyModeFlag ) ) { @@ -1328,7 +1328,14 @@ TWorld::Update_UI() { } if( ( true == Global::ControlPicking ) && ( true == FreeFlyModeFlag ) && ( true == DebugModeFlag ) ) { auto const scenerynode = GfxRenderer.Pick_Node(); +#ifdef EU07_USE_OLD_GROUNDCODE UILayer.set_tooltip( ( scenerynode ? scenerynode->asName : "" ) ); +#else + UILayer.set_tooltip( + ( scenerynode ? + scenerynode->name() : + "" ) ); +#endif } switch( Global::iTextMode ) { diff --git a/parser.cpp b/parser.cpp index 994250e6..52cde35b 100644 --- a/parser.cpp +++ b/parser.cpp @@ -21,13 +21,14 @@ http://mozilla.org/MPL/2.0/. // cParser -- generic class for parsing text data. // constructors -cParser::cParser( std::string const &Stream, buffertype const Type, std::string Path, bool const Loadtraction ) : +cParser::cParser( std::string const &Stream, buffertype const Type, std::string Path, bool const Loadtraction, std::vector Parameters ) : mPath(Path), LoadTraction( Loadtraction ) { // build comments map mComments.insert(commentmap::value_type("/*", "*/")); mComments.insert(commentmap::value_type("//", "\n")); // mComments.insert(commentmap::value_type("--","\n")); //Ra: to chyba nie używane + // store to calculate sub-sequent includes from relative path if( Type == buffertype::buffer_FILE ) { mFile = Stream; @@ -59,6 +60,10 @@ cParser::cParser( std::string const &Stream, buffertype const Type, std::string mLine = 1; } } + // set parameter set if one was provided + if( false == Parameters.empty() ) { + parameters.swap( Parameters ); + } } // destructor @@ -145,86 +150,83 @@ bool cParser::getTokens(unsigned int Count, bool ToLower, const char *Break) return true; } -std::string cParser::readToken(bool ToLower, const char *Break) -{ - std::string token = ""; - size_t pos; // początek podmienianego ciągu - // see if there's include parsing going on. clean up when it's done. - if (mIncludeParser) - { - token = mIncludeParser->readToken(ToLower, Break); - if (!token.empty()) { +std::string cParser::readToken( bool ToLower, const char *Break ) { - while( ( pos = token.find( "(p" ) ) != std::string::npos ) { - // check if the token is a parameter which should be replaced with stored true value - auto const parameter { token.substr( pos + 2, token.find( ")", pos ) - ( pos + 2 ) ) }; // numer parametru - token.erase(pos, token.find(")", pos) - pos + 1); // najpierw usunięcie "(pN)" - size_t nr = atoi(parameter.c_str()) - 1; - if (nr < parameters.size()) - { - token.insert(pos, parameters.at(nr)); // wklejenie wartości parametru - if (ToLower) - for (; pos < parameters.at( nr ).size(); ++pos) - token[pos] = tolower(token[pos]); - } - else - token.insert(pos, "none"); // zabezpieczenie przed brakiem parametru - } - return token; - } - else - { - mIncludeParser = NULL; - parameters.clear(); + std::string token; + if( mIncludeParser ) { + // see if there's include parsing going on. clean up when it's done. + token = mIncludeParser->readToken( ToLower, Break ); + if( true == token.empty() ) { + mIncludeParser = nullptr; } } - // get the token yourself if there's no child to delegate it to. - char c { 0 }; - do - { - while (mStream->peek() != EOF && strchr(Break, c = mStream->get()) == NULL) - { - if (ToLower) - c = tolower(c); - token += c; - if (findQuotes(token)) // do glue together words enclosed in quotes - break; - if (trimComments(token)) // don't glue together words separated with comment - break; + if( true == token.empty() ) { + // get the token yourself if the delegation attempt failed + char c { 0 }; + do { + while( mStream->peek() != EOF && strchr( Break, c = mStream->get() ) == NULL ) { + if( ToLower ) + c = tolower( c ); + token += c; + if( findQuotes( token ) ) // do glue together words enclosed in quotes + break; + if( trimComments( token ) ) // don't glue together words separated with comment + break; + } + if( c == '\n' ) { + // update line counter + ++mLine; + } + } while( token == "" && mStream->peek() != EOF ); // double check to deal with trailing spaces + } + + if( false == parameters.empty() ) { + // if there's parameter list, check the token for potential parameters to replace + size_t pos; // początek podmienianego ciągu + while( ( pos = token.find( "(p" ) ) != std::string::npos ) { + // check if the token is a parameter which should be replaced with stored true value + auto const parameter{ token.substr( pos + 2, token.find( ")", pos ) - ( pos + 2 ) ) }; // numer parametru + token.erase( pos, token.find( ")", pos ) - pos + 1 ); // najpierw usunięcie "(pN)" + size_t nr = atoi( parameter.c_str() ) - 1; + if( nr < parameters.size() ) { + token.insert( pos, parameters.at( nr ) ); // wklejenie wartości parametru + if( ToLower ) + for( ; pos < parameters.at( nr ).size(); ++pos ) + token[ pos ] = tolower( token[ pos ] ); + } + else + token.insert( pos, "none" ); // zabezpieczenie przed brakiem parametru } - if( c == '\n' ) { - // update line counter - ++mLine; - } - } while (token == "" && mStream->peek() != EOF); // double check to deal with trailing spaces - // launch child parser if include directive found. - // NOTE: parameter collecting uses default set of token separators. - if (token.compare("include") == 0) - { // obsługa include + } + + if( token == "include" ) { + // launch child parser if include directive found. + // NOTE: parameter collecting uses default set of token separators. std::string includefile = readToken(ToLower); // nazwa pliku if( ( true == LoadTraction ) || ( ( includefile.find( "tr/" ) == std::string::npos ) && ( includefile.find( "tra/" ) == std::string::npos ) ) ) { - - std::string parameter = readToken(false); // w parametrach nie zmniejszamy - while( (parameter.empty() == false) - && (parameter.compare("end") != 0) ) - { - parameters.emplace_back(parameter); - parameter = readToken(false); + // get parameter list for the child parser + std::vector includeparameters; + std::string parameter = readToken( false ); // w parametrach nie zmniejszamy + while( ( parameter.empty() == false ) + && ( parameter != "end" ) ) { + includeparameters.emplace_back( parameter ); + parameter = readToken( false ); + } + mIncludeParser = std::make_shared( includefile, buffer_FILE, mPath, LoadTraction, includeparameters ); + if( mIncludeParser->mSize <= 0 ) { + ErrorLog( "Bad include: can't open file \"" + includefile + "\"" ); } - // if (trtest2.find("tr/")!=0) - mIncludeParser = std::make_shared(includefile, buffer_FILE, mPath, LoadTraction); - if (mIncludeParser->mSize <= 0) - ErrorLog("Bad include: can't open file \"" + includefile + "\"" ); } else { - while( token.compare( "end" ) != 0 ) { + while( token != "end" ) { token = readToken( true ); // minimize risk of case mismatch on comparison } } token = readToken(ToLower, Break); } + // all done return token; } diff --git a/parser.h b/parser.h index 5709d16c..4799a7d2 100644 --- a/parser.h +++ b/parser.h @@ -28,7 +28,7 @@ class cParser //: public std::stringstream buffer_TEXT }; // constructors: - cParser(std::string const &Stream, buffertype const Type = buffer_TEXT, std::string Path = "", bool const Loadtraction = true ); + cParser(std::string const &Stream, buffertype const Type = buffer_TEXT, std::string Path = "", bool const Loadtraction = true, std::vector Parameters = std::vector() ); // destructor: virtual ~cParser(); // methods: diff --git a/renderer.cpp b/renderer.cpp index 1ef746c6..f2436148 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -2060,7 +2060,6 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // tracks // TODO: update after path node refactoring Render( std::begin( cell->m_paths ), std::end( cell->m_paths ) ); - // TODO: add other content types // post-render cleanup ::glPopMatrix(); @@ -2076,7 +2075,8 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // render // opaque non-instanced shapes for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } - // TODO: add other content types + // tracks + Render( std::begin( cell->m_paths ), std::end( cell->m_paths ) ); // post-render cleanup ::glPopMatrix(); @@ -2091,6 +2091,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render // opaque non-instanced shapes + // non-interactive scenery elements get neutral colour ::glColor3fv( glm::value_ptr( colors::none ) ); for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } // tracks @@ -2099,7 +2100,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); Render( path ); } - // TODO: add other content types + // post-render cleanup ::glPopMatrix(); @@ -2134,11 +2135,12 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator } case rendermode::pickscenery: { // opaque parts of instanced models + // same procedure like with regular render, but each node receives custom colour used for picking for( auto *instance : cell->m_instancesopaque ) { ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); Render( instance ); } - // TODO: add remaining content types + // vehicles aren't included in scenery picking for the time being break; } case rendermode::reflections: @@ -2224,19 +2226,18 @@ opengl_renderer::Render( TAnimModel *Instance ) { || ( distancesquared >= Instance->m_rangesquaredmax ) ) { return; } -/* - // TODO: enable adding items to the picking list + switch( m_renderpass.draw_mode ) { case rendermode::pickscenery: { // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); + m_picksceneryitems.emplace_back( Instance ); break; } default: { break; } } -*/ + Instance->RaAnimate( m_framestamp ); // jednorazowe przeliczenie animacji Instance->RaPrepare(); if( Instance->pModel ) { @@ -2767,8 +2768,15 @@ opengl_renderer::Render( TTrack *Track ) { Track->EnvironmentReset(); break; } - case rendermode::shadows: + case rendermode::shadows: { + // shadow pass includes trackbeds but not tracks themselves due to low resolution of the map + // TODO: implement + break; + } case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Track ); + if( Track->m_material1 != 0 ) { Bind_Material( Track->m_material1 ); m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); @@ -2816,12 +2824,8 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, track->EnvironmentReset(); break; } - case rendermode::shadows: { - Bind_Material( track->m_material1 ); - m_geometry.draw( std::begin( track->Geometry1 ), std::end( track->Geometry1 ) ); - break; - } - case rendermode::pickscenery: // pick scenery should use track-by-track approach + case rendermode::shadows: // shadows are calculated only for trackbeds + case rendermode::pickscenery: // pick scenery mode uses piece-by-piece approach case rendermode::pickcontrols: default: { break; @@ -2850,11 +2854,16 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, break; } case rendermode::shadows: { + if( ( track->iCategoryFlag != 1 ) + || ( track->eType != tt_Normal ) ) { + // shadows are only calculated for trackbeds + continue; + } Bind_Material( track->m_material2 ); m_geometry.draw( std::begin( track->Geometry2 ), std::end( track->Geometry2 ) ); break; } - case rendermode::pickscenery: // pick scenery should use track-by-track approach + case rendermode::pickscenery: // pick scenery mode uses piece-by-piece approach case rendermode::pickcontrols: default: { break; @@ -3121,6 +3130,7 @@ opengl_renderer::Render_Alpha( scene::basic_region *Region ) { void opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_sequence::reverse_iterator Last ) { + // NOTE: this method is launched only during color pass therefore we don't bother with mode test here // first pass draws elements which we know are located in section banks, to reduce vbo switching { auto first { First }; @@ -3690,7 +3700,11 @@ opengl_renderer::Update_Pick_Control() { return control; } +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode const * +#else +editor::basic_node const * +#endif opengl_renderer::Update_Pick_Node() { #ifdef EU07_USE_PICKING_FRAMEBUFFER @@ -3725,7 +3739,11 @@ opengl_renderer::Update_Pick_Node() { unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); auto const nodeindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode const *node { nullptr }; +#else + editor::basic_node const *node { nullptr }; +#endif if( ( nodeindex > 0 ) && ( nodeindex <= m_picksceneryitems.size() ) ) { node = m_picksceneryitems[ nodeindex - 1 ]; diff --git a/renderer.h b/renderer.h index 14efad82..d0c7970c 100644 --- a/renderer.h +++ b/renderer.h @@ -192,14 +192,22 @@ public: // utility methods TSubModel const * Pick_Control() const { return m_pickcontrolitem; } +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode const * +#else + editor::basic_node const * +#endif Pick_Node() const { return m_picksceneryitem; } // maintenance jobs void Update( double const Deltatime ); TSubModel const * Update_Pick_Control(); +#ifdef EU07_USE_OLD_GROUNDCODE TGroundNode const * +#else + editor::basic_node const * +#endif Update_Pick_Node(); // debug performance string std::string const & @@ -420,11 +428,15 @@ private: section_sequence m_sectionqueue; // list of sections in current render pass cell_sequence m_cellqueue; #endif - - std::vector m_picksceneryitems; std::vector m_pickcontrolsitems; TSubModel const *m_pickcontrolitem { nullptr }; +#ifdef EU07_USE_OLD_GROUNDCODE + std::vector m_picksceneryitems; TGroundNode const *m_picksceneryitem { nullptr }; +#else + std::vector m_picksceneryitems; + editor::basic_node const *m_picksceneryitem { nullptr }; +#endif #ifdef EU07_USE_DEBUG_CAMERA renderpass_config m_worldcamera; // debug item #endif diff --git a/version.h b/version.h index e1dbbd5c..e45b45fa 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1020 +#define VERSION_MINOR 1025 #define VERSION_REVISION 0 From 4ce975a656aa633209cd59e518777a20dbe3b7fc Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 28 Oct 2017 00:56:10 +0200 Subject: [PATCH 208/426] build 171027: bounding area calculation fixes, novice ui obstacle indicator, minor traction render enhancement, shadow calculations for tall enough platforms --- AnimModel.cpp | 9 +++++ AnimModel.h | 5 +++ EvLaunch.cpp | 11 +++++- EvLaunch.h | 5 +++ Ground.cpp | 3 ++ MemCell.cpp | 10 ++--- MemCell.h | 21 ++++++----- Model3d.cpp | 18 ++++++--- Track.cpp | 16 +++++++- Track.h | 11 ++++-- Traction.cpp | 14 ++++++- Traction.h | 7 +++- TractionPower.cpp | 6 +-- Train.cpp | 2 +- World.cpp | 8 +++- renderer.cpp | 82 ++++++++++++++++++++++++++++++++--------- scene.cpp | 86 +++++++++++++++++++++++++------------------ scene.h | 27 +++++++++++--- scenenode.cpp | 22 ++++++++++- scenenode.h | 11 ++++-- simulation.cpp | 94 ++++++++++++++++++++++++++++------------------- simulation.h | 2 +- version.h | 2 +- 23 files changed, 334 insertions(+), 138 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 07f4aa94..fd994fe4 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -583,6 +583,15 @@ void TAnimModel::RaAnimate( unsigned int const Framestamp ) { m_framestamp = Framestamp; }; +// calculates piece's bounding radius +void +TAnimModel::radius_() { + + if( pModel != nullptr ) { + m_area.radius = pModel->bounding_radius(); + } +} + void TAnimModel::RaPrepare() { // ustawia światła i animacje we wzorcu modelu przed renderowaniem egzemplarza bool state; // stan światła diff --git a/AnimModel.h b/AnimModel.h index 3ced5617..acc9545f 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -157,6 +157,11 @@ public: // members static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania +protected: + // calculates piece's bounding radius + void + radius_(); + private: // methods void RaPrepare(); // ustawienie animacji egzemplarza na wzorcu diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 349a29db..6abe7350 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -121,7 +121,7 @@ bool TEventLauncher::Load(cParser *parser) *parser >> token; } return true; -}; +} bool TEventLauncher::check_conditions() { //"renderowanie" wyzwalacza @@ -184,6 +184,13 @@ bool TEventLauncher::IsGlobal() const { && ( iHour >= 0 ) && ( iMinute >= 0 ) && ( dRadius < 0.0 ) ); // bez ograniczenia zasięgu -}; +} + +// calculates node's bounding radius +void +TEventLauncher::radius_() { + + m_area.radius = std::sqrt( dRadius ); +} //--------------------------------------------------------------------------- diff --git a/EvLaunch.h b/EvLaunch.h index 1dbeae97..d6fe9324 100644 --- a/EvLaunch.h +++ b/EvLaunch.h @@ -37,6 +37,11 @@ public: int iCheckMask { 0 }; double dRadius { 0.0 }; +protected: + // calculates node's bounding radius + void + radius_(); + private: // members int iKey { 0 }; diff --git a/Ground.cpp b/Ground.cpp index 174b050d..b457259f 100644 --- a/Ground.cpp +++ b/Ground.cpp @@ -1562,6 +1562,9 @@ TGroundNode * TGround::AddGroundNode(cParser *parser) break; } #endif + default: { + break; + } } return tmp; } diff --git a/MemCell.cpp b/MemCell.cpp index e55546e1..972f89df 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -29,8 +29,8 @@ http://mozilla.org/MPL/2.0/. TMemCell::TMemCell(vector3 *p) { fValue1 = fValue2 = 0; - m_location = - p ? *p : glm::dvec3(); // ustawienie współrzędnych, bo do TGroundNode nie ma dostępu + location( + p ? *p : glm::dvec3() ); // ustawienie współrzędnych, bo do TGroundNode nie ma dostępu bCommand = false; // komenda wysłana OnSent = NULL; } @@ -110,9 +110,9 @@ bool TMemCell::Load(cParser *parser) #else parser->getTokens( 6, false ); *parser - >> m_location.x - >> m_location.y - >> m_location.z + >> m_area.center.x + >> m_area.center.y + >> m_area.center.z #endif >> szText >> fValue1 diff --git a/MemCell.h b/MemCell.h index 432be51f..a89d7580 100644 --- a/MemCell.h +++ b/MemCell.h @@ -16,16 +16,7 @@ http://mozilla.org/MPL/2.0/. class TMemCell : public editor::basic_node { - private: - // content - std::string szText; - double fValue1 { 0.0 }; - double fValue2 { 0.0 }; - // other - TCommandType eCommand { cm_Unknown }; - bool bCommand { false }; // czy zawiera komendę dla zatrzymanego AI - TEvent *OnSent { nullptr }; // event dodawany do kolejki po wysłaniu komendy zatrzymującej skład - public: +public: std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac TMemCell( scene::node_data const &Nodedata ); @@ -63,6 +54,16 @@ class TMemCell : public editor::basic_node { TCommandType CommandCheck(); bool IsVelocity(); void AssignEvents(TEvent *e); + +private: + // content + std::string szText; + double fValue1 { 0.0 }; + double fValue2 { 0.0 }; + // other + TCommandType eCommand { cm_Unknown }; + bool bCommand { false }; // czy zawiera komendę dla zatrzymanego AI + TEvent *OnSent { nullptr }; // event dodawany do kolejki po wysłaniu komendy zatrzymującej skład }; diff --git a/Model3d.cpp b/Model3d.cpp index 0cbdfb17..a24ebc2e 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1008,7 +1008,10 @@ TSubModel::create_geometry( std::size_t &Dataoffset, geometrybank_handle const & if( m_geometry != NULL ) { // calculate bounding radius while we're at it // NOTE: doesn't take into account transformation hierarchy TODO: implement it - float squaredradius{ 0.f }; + float squaredradius { 0.f }; + // if this happens to be root node it may already have non-squared radius of the largest child + // since we're comparing squared radii, we need to square it back for correct results + m_boundingradius *= m_boundingradius; for( auto const &vertex : GfxRenderer.Vertices( m_geometry ) ) { squaredradius = static_cast( glm::length2( vertex.position ) ); if( squaredradius > m_boundingradius ) { @@ -1016,12 +1019,15 @@ TSubModel::create_geometry( std::size_t &Dataoffset, geometrybank_handle const & } } if( m_boundingradius > 0.f ) { m_boundingradius = std::sqrt( m_boundingradius ); } - if( Parent ) { - // propagate radius up the chain - Parent->m_boundingradius = std::max( - Parent->m_boundingradius, - m_boundingradius ); + // adjust overall radius if needed + // NOTE: the method to access root submodel is... less than ideal + auto *root { this }; + while( root->Parent != nullptr ) { + root = root->Parent; } + root->m_boundingradius = std::max( + root->m_boundingradius, + m_boundingradius ); } if( Next ) diff --git a/Track.cpp b/Track.cpp index 0c2b54ce..a560e0b9 100644 --- a/Track.cpp +++ b/Track.cpp @@ -867,11 +867,11 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) } // calculate path location - m_location = glm::dvec3{ ( + m_area.center = ( glm::dvec3{ ( CurrentSegment()->FastGetPoint_0() + CurrentSegment()->FastGetPoint( 0.5 ) + CurrentSegment()->FastGetPoint_1() ) - / 3.0 }; + / 3.0 } ); } // TODO: refactor this mess @@ -2821,6 +2821,18 @@ TTrack::endpoints() const { } } +// calculates path's bounding radius +void +TTrack::radius_() { + + auto const points = endpoints(); + for( auto &point : points ) { + m_area.radius = std::max( + m_area.radius, + static_cast( glm::length( m_area.center - point ) ) ); // extra margin to prevent driven vehicle from flicking + } +} + void TTrack::MovedUp1(float const dh) { // poprawienie przechyłki wymaga wydłużenia podsypki fTexHeight1 += dh; diff --git a/Track.h b/Track.h index 8d23c127..8deb6aea 100644 --- a/Track.h +++ b/Track.h @@ -182,9 +182,9 @@ public: TEnvironmentType eEnvironment = e_flat; // dźwięk i oświetlenie int iAction = 0; // czy modyfikowany eventami (specjalna obsługa przy skanowaniu) float fOverhead = -1.0; // można normalnie pobierać prąd (0 dla jazdy bezprądowej po danym odcinku, >0-z opuszczonym i ograniczeniem prędkości) - private: +private: double fVelocity = -1.0; // ograniczenie prędkości // prędkość dla AI (powyżej rośnie prawdopowobieństwo wykolejenia) - public: +public: // McZapkie-100502: double fTrackLength = 100.0; // długość z wpisu, nigdzie nie używana double fRadius = 0.0; // promień, dla zwrotnicy kopiowany z tabeli @@ -287,7 +287,12 @@ public: double VelocityGet(); void ConnectionsLog(); - private: +protected: + // calculates path's bounding radius + void + radius_(); + +private: void EnvironmentSet(); void EnvironmentReset(); }; diff --git a/Traction.cpp b/Traction.cpp index 8bab89bb..a0739107 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -169,7 +169,7 @@ TTraction::Load( cParser *parser, glm::dvec3 const &pOrigin ) { Init(); // przeliczenie parametrów // calculate traction location - m_location = interpolate( pPoint2, pPoint1, 0.5 ); + location( interpolate( pPoint2, pPoint1, 0.5 ) ); } // retrieves list of the track's end points @@ -543,6 +543,18 @@ double TTraction::VoltageGet(double u, double i) return 0.0; // gdy nie podłączony wcale? }; +// calculates path's bounding radius +void +TTraction::radius_() { + + auto const points = endpoints(); + for( auto &point : points ) { + m_area.radius = std::max( + m_area.radius, + static_cast( glm::length( m_area.center - point ) ) ); + } +} + glm::vec3 TTraction::wire_color() const { diff --git a/Traction.h b/Traction.h index d1202768..8ec2131a 100644 --- a/Traction.h +++ b/Traction.h @@ -64,7 +64,6 @@ class TTraction : public editor::basic_node { // retrieves list of the track's end points std::vector endpoints() const; - // creates geometry data in specified geometry bank. returns: number of created elements, or NULL // NOTE: deleting nodes doesn't currently release geometry data owned by the node. TODO: implement erasing individual geometry chunks and banks #ifdef EU07_USE_OLD_GROUNDCODE @@ -79,6 +78,12 @@ class TTraction : public editor::basic_node { void ResistanceCalc(int d = -1, double r = 0, TTractionPowerSource *ps = nullptr); void PowerSet(TTractionPowerSource *ps); double VoltageGet(double u, double i); + +protected: + // calculates piece's bounding radius + void + radius_(); + private: glm::vec3 wire_color() const; }; diff --git a/TractionPower.cpp b/TractionPower.cpp index 0b6ee2c9..e4d60783 100644 --- a/TractionPower.cpp +++ b/TractionPower.cpp @@ -42,9 +42,9 @@ bool TTractionPowerSource::Load(cParser *parser) { #else parser->getTokens( 10, false ); *parser - >> m_location.x - >> m_location.y - >> m_location.z + >> m_area.center.x + >> m_area.center.y + >> m_area.center.z #endif >> NominalVoltage >> VoltageFrequency diff --git a/Train.cpp b/Train.cpp index 3d1c34db..67a641e6 100644 --- a/Train.cpp +++ b/Train.cpp @@ -7029,7 +7029,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con /* TGauge *gg { nullptr }; // roboczy wskaźnik na obiekt animujący gałkę */ - std::unordered_map gauges = { + std::unordered_map const gauges = { { "mainctrl:", ggMainCtrl }, { "scndctrl:", ggScndCtrl }, { "dirkey:" , ggDirKey }, diff --git a/World.cpp b/World.cpp index 9d427367..06be5fff 100644 --- a/World.cpp +++ b/World.cpp @@ -1352,7 +1352,8 @@ TWorld::Update_UI() { uitextline1 += " (paused)"; } - if( Controlled && ( Controlled->Mechanik != nullptr ) ) { + if( ( Controlled != nullptr ) + && ( Controlled->Mechanik != nullptr ) ) { auto const &mover = Controlled->MoverParameters; auto const &driver = Controlled->Mechanik; @@ -1374,6 +1375,11 @@ TWorld::Update_UI() { uitextline3 += " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; + + auto const trackblockdistance{ std::abs( Controlled->Mechanik->TrackBlock() ) }; + if( trackblockdistance <= 75.0 ) { + uitextline4 = " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; + } } } diff --git a/renderer.cpp b/renderer.cpp index f2436148..e00f83a2 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -420,7 +420,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glColor4f( 1.f, 0.9f, 0.8f, 1.f ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_TEXTURE_2D ); - if( true == Global::RenderShadows ) { + if( ( true == Global::RenderShadows ) && ( false == Global::bWireFrame ) ) { shadowcamera.draw( m_renderpass.camera.position() - shadowcamera.position() ); } if( DebugCameraFlag ) { @@ -2214,11 +2214,11 @@ opengl_renderer::Render( TAnimModel *Instance ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Instance->m_location - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = SquareMagnitude( ( Instance->location() - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( Instance->m_location - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = SquareMagnitude( ( Instance->location() - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } } @@ -2246,7 +2246,7 @@ opengl_renderer::Render( TAnimModel *Instance ) { Instance->pModel, Instance->Material(), distancesquared, - Instance->m_location - m_renderpass.camera.position(), + Instance->location() - m_renderpass.camera.position(), Instance->vAngle ); } } @@ -2799,6 +2799,17 @@ void opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, scene::basic_cell::path_sequence::const_iterator Last ) { ::glColor3fv( glm::value_ptr( colors::white ) ); + // setup + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + // NOTE: roads-based platforms tend to miss parts of shadows if rendered with either back or front culling + ::glDisable( GL_CULL_FACE ); + break; + } + default: { + break; + } + } // first pass, material 1 for( auto first { First }; first != Last; ++first ) { @@ -2824,7 +2835,16 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, track->EnvironmentReset(); break; } - case rendermode::shadows: // shadows are calculated only for trackbeds + case rendermode::shadows: { + if( ( std::abs( track->fTexHeight1 ) < 0.35f ) + || ( track->iCategoryFlag != 2 ) ) { + // shadows are only calculated for high enough roads, typically meaning track platforms + continue; + } + Bind_Material( track->m_material1 ); + m_geometry.draw( std::begin( track->Geometry1 ), std::end( track->Geometry1 ) ); + break; + } case rendermode::pickscenery: // pick scenery mode uses piece-by-piece approach case rendermode::pickcontrols: default: { @@ -2854,9 +2874,10 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, break; } case rendermode::shadows: { - if( ( track->iCategoryFlag != 1 ) - || ( track->eType != tt_Normal ) ) { - // shadows are only calculated for trackbeds + if( ( std::abs( track->fTexHeight1 ) < 0.35f ) + || ( ( track->iCategoryFlag == 1 ) + && ( track->eType != tt_Normal ) ) ) { + // shadows are only calculated for high enough trackbeds continue; } Bind_Material( track->m_material2 ); @@ -2870,6 +2891,16 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, } } } + // post-render reset + switch( m_renderpass.draw_mode ) { + case rendermode::shadows: { + ::glEnable( GL_CULL_FACE ); + break; + } + default: { + break; + } + } } void @@ -3218,11 +3249,11 @@ opengl_renderer::Render_Alpha( TAnimModel *Instance ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Instance->m_location - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = SquareMagnitude( ( Instance->location() - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( Instance->m_location - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = SquareMagnitude( ( Instance->location() - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } } @@ -3238,7 +3269,7 @@ opengl_renderer::Render_Alpha( TAnimModel *Instance ) { Instance->pModel, Instance->Material(), distancesquared, - Instance->m_location - m_renderpass.camera.position(), + Instance->location() - m_renderpass.camera.position(), Instance->vAngle ); } } @@ -3250,11 +3281,11 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Traction->m_location - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = SquareMagnitude( ( Traction->location() - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( Traction->m_location - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = SquareMagnitude( ( Traction->location() - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; break; } } @@ -3272,15 +3303,29 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { return; } // setup +/* float const linealpha = static_cast( std::min( 1.25, 5000 * Traction->WireThickness / ( distancesquared + 1.0 ) ) ); // zbyt grube nie są dobre ::glLineWidth( linealpha ); +*/ + auto const distance { static_cast( std::sqrt( distancesquared ) ) }; + auto const linealpha { + 20.f * Traction->WireThickness + / std::max( + 0.5f * Traction->radius() + 1.f, + distance - ( 0.5f * Traction->radius() ) ) }; + ::glLineWidth( + clamp( + 0.5f * linealpha + Traction->WireThickness * Traction->radius() / 1000.f, + 1.f, 1.5f ) ); // McZapkie-261102: kolor zalezy od materialu i zasniedzenia - auto const color { Traction->wire_color() }; - ::glColor4f( color.r, color.g, color.b, linealpha ); - + ::glColor4fv( + glm::value_ptr( + glm::vec4{ + Traction->wire_color(), + linealpha } ) ); // render m_geometry.draw( Traction->m_geometry ); // debug data @@ -3318,12 +3363,15 @@ opengl_renderer::Render_Alpha( scene::lines_node const &Lines ) { 0.5f * data.area.radius + 1.f, distance - ( 0.5f * data.area.radius ) ) : 1.f ); // negative width means the lines are always opague + ::glLineWidth( + clamp( + 0.5f * linealpha + data.line_width * data.area.radius / 1000.f, + 1.f, 8.f ) ); ::glColor4fv( glm::value_ptr( glm::vec4{ glm::vec3{ data.lighting.diffuse * Global::DayLight.ambient }, // w zaleznosci od koloru swiatla std::min( 1.f, linealpha ) } ) ); - ::glLineWidth( clamp( 0.5f * linealpha + data.line_width * data.area.radius / 1000.f, 1.f, 8.f ) ); // render m_geometry.draw( data.geometry ); ++m_debugstats.lines; diff --git a/scene.cpp b/scene.cpp index 4cc80791..e9834f2b 100644 --- a/scene.cpp +++ b/scene.cpp @@ -242,12 +242,9 @@ basic_cell::insert( TTrack *Path ) { Path->RaOwnerSet( this ); #endif // re-calculate cell radius, in case track extends outside the cell's boundaries - auto endpoints = Path->endpoints(); - for( auto &endpoint : endpoints ) { - m_area.radius = std::max( - m_area.radius, - glm::length( m_area.center - endpoint ) + 25.f ); // extra margin to prevent driven vehicle from flicking - } + m_area.radius = std::max( + m_area.radius, + static_cast( glm::length( m_area.center - Path->location() ) + Path->radius() + 25.f ) ); // extra margin to prevent driven vehicle from flicking } // adds provided traction piece to the cell @@ -258,13 +255,8 @@ basic_cell::insert( TTraction *Traction ) { Traction->origin( m_area.center ); m_traction.emplace_back( Traction ); - // re-calculate cell radius, in case traction piece extends outside the cell's boundaries - auto endpoints = Traction->endpoints(); - for( auto &endpoint : endpoints ) { - m_area.radius = std::max( - m_area.radius, - glm::length( m_area.center - endpoint ) ); // adding arbitrary safety margin - } + // re-calculate cell bounding area, in case traction piece extends outside the cell's boundaries + enclose_area( Traction ); } // adds provided model instance to the cell @@ -289,15 +281,8 @@ basic_cell::insert( TAnimModel *Instance ) { // opaque pieces m_instancesopaque.emplace_back( Instance ); } - // re-calculate cell radius, in case model extends outside the cell's boundaries - if( Instance->Model() ) { - auto const modelradius{ Instance->Model()->bounding_radius() }; - if( modelradius > 0.f ) { - m_area.radius = std::max( - m_area.radius, - glm::length( m_area.center - Instance->location() ) + modelradius ); // adding arbitrary safety margin - } - } + // re-calculate cell bounding area, in case model extends outside the cell's boundaries + enclose_area( Instance ); } // adds provided sound instance to the cell @@ -316,6 +301,8 @@ basic_cell::insert( TEventLauncher *Launcher ) { m_active = true; m_eventlaunchers.emplace_back( Launcher ); + // re-calculate cell bounding area, in case launcher range extends outside the cell's boundaries + enclose_area( Launcher ); } // registers provided path in the lookup directory of the cell @@ -485,6 +472,15 @@ basic_cell::create_geometry( geometrybank_handle const &Bank ) { m_geometrycreated = true; // helper for legacy animation code, get rid of it after refactoring } +// adjusts cell bounding area to enclose specified node +void +basic_cell::enclose_area( editor::basic_node *Node ) { + + m_area.radius = std::max( + m_area.radius, + static_cast( glm::length( m_area.center - Node->location() ) + Node->radius() ) ); +} + // legacy method, updates sounds and polls event launchers within radius around specified point @@ -512,7 +508,7 @@ basic_section::update_traction( TDynamicObject *Vehicle, int const Pantographind auto pantograph = Vehicle->pants[ Pantographindex ].fParamPants; auto const pantographposition = position + ( vLeft * pantograph->vPos.z ) + ( vUp * pantograph->vPos.y ) + ( vFront * pantograph->vPos.x ); - auto const radius { EU07_CELLSIZE * 0.5 }; + auto const radius { EU07_CELLSIZE * 0.5 }; // redius around point of interest for( auto &cell : m_cells ) { // we reject early cells which aren't within our area of interest @@ -548,6 +544,11 @@ basic_section::insert( shape_node Shape ) { } else { // large, opaque shapes are placed on section level + // re-calculate section radius, in case shape geometry extends outside the section's boundaries + m_area.radius = std::max( + m_area.radius, + static_cast( glm::length( m_area.center - Shape.data().area.center ) + Shape.data().area.radius ) ); + for( auto &shape : m_shapes ) { // check first if the shape can't be merged with one of the shapes already present in the section if( true == shape.merge( Shape ) ) { @@ -739,6 +740,19 @@ basic_region::update_traction( TDynamicObject *Vehicle, int const Pantographinde } } +// stores content of the class in file with specified name +void +basic_region::serialize( std::string const &Scenariofile ) { + // TODO: implement +} + +// restores content of the class from file with specified name. returns: true on success, false otherwise +bool +basic_region::deserialize( std::string const &Scenariofile ) { + // TODO: implement + return false; +} + // legacy method, links specified path piece with potential neighbours void basic_region::TrackJoin( TTrack *Track ) { @@ -792,9 +806,9 @@ basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad, bool con // adjust input if necessary: if( true == Transform ) { // shapes generated from legacy terrain come with world space coordinates and don't need processing - if( Scratchpad.location_rotation != glm::vec3( 0, 0, 0 ) ) { + if( Scratchpad.location.rotation != glm::vec3( 0, 0, 0 ) ) { // rotate... - auto const rotation = glm::radians( Scratchpad.location_rotation ); + auto const rotation = glm::radians( Scratchpad.location.rotation ); for( auto &vertex : shape.m_data.vertices ) { vertex.position = glm::rotateZ( vertex.position, rotation.z ); vertex.position = glm::rotateX( vertex.position, rotation.x ); @@ -804,10 +818,10 @@ basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad, bool con vertex.normal = glm::rotateY( vertex.normal, rotation.y ); } } - if( ( false == Scratchpad.location_offset.empty() ) - && ( Scratchpad.location_offset.top() != glm::dvec3( 0, 0, 0 ) ) ) { - // ...and move - auto const offset = Scratchpad.location_offset.top(); + if( ( false == Scratchpad.location.offset.empty() ) + && ( Scratchpad.location.offset.top() != glm::dvec3( 0, 0, 0 ) ) ) { + // ...and move + auto const offset = Scratchpad.location.offset.top(); for( auto &vertex : shape.m_data.vertices ) { vertex.position += offset; } @@ -850,19 +864,19 @@ basic_region::insert_lines( lines_node Lines, scratch_data &Scratchpad ) { if( Lines.m_data.vertices.empty() ) { return; } // transform point coordinates if needed - if( Scratchpad.location_rotation != glm::vec3( 0, 0, 0 ) ) { + if( Scratchpad.location.rotation != glm::vec3( 0, 0, 0 ) ) { // rotate... - auto const rotation = glm::radians( Scratchpad.location_rotation ); + auto const rotation = glm::radians( Scratchpad.location.rotation ); for( auto &vertex : Lines.m_data.vertices ) { vertex.position = glm::rotateZ( vertex.position, rotation.z ); vertex.position = glm::rotateX( vertex.position, rotation.x ); vertex.position = glm::rotateY( vertex.position, rotation.y ); } } - if( ( false == Scratchpad.location_offset.empty() ) - && ( Scratchpad.location_offset.top() != glm::dvec3( 0, 0, 0 ) ) ) { + if( ( false == Scratchpad.location.offset.empty() ) + && ( Scratchpad.location.offset.top() != glm::dvec3( 0, 0, 0 ) ) ) { // ...and move - auto const offset = Scratchpad.location_offset.top(); + auto const offset = Scratchpad.location.offset.top(); for( auto &vertex : Lines.m_data.vertices ) { vertex.position += offset; } @@ -1073,7 +1087,7 @@ basic_region::sections( glm::dvec3 const &Point, float const Radius ) { int const originx = centerx - sectioncount / 2; int const originz = centerz - sectioncount / 2; - auto const squaredradii { std::pow( ( 0.5 * M_SQRT2 * EU07_SECTIONSIZE + 0.25 * EU07_SECTIONSIZE ) + Radius, 2 ) }; + auto const padding { 0.0 }; // { EU07_SECTIONSIZE * 0.25 }; // TODO: check if we can get away with padding of 0 for( int row = originz; row <= originz + sectioncount; ++row ) { if( row < 0 ) { continue; } @@ -1084,7 +1098,7 @@ basic_region::sections( glm::dvec3 const &Point, float const Radius ) { auto *section { m_sections[ row * EU07_REGIONSIDESECTIONCOUNT + column ] }; if( ( section != nullptr ) - && ( glm::length2( section->area().center - Point ) < squaredradii ) ) { + && ( glm::length2( section->area().center - Point ) <= ( ( section->area().radius + padding + Radius ) * ( section->area().radius + padding + Radius ) ) ) ) { m_scratchpad.sections.emplace_back( section ); } diff --git a/scene.h b/scene.h index 999d0514..8de91971 100644 --- a/scene.h +++ b/scene.h @@ -29,8 +29,16 @@ int const EU07_REGIONSIDESECTIONCOUNT = 500; // number of sections along a side struct scratch_data { - std::stack location_offset; - glm::vec3 location_rotation; + struct binary_data { + + bool terrain{ false }; + } binary; + + struct location_data { + + std::stack offset; + glm::vec3 rotation; + } location; struct trainset_data { @@ -129,6 +137,9 @@ private: using instance_sequence = std::vector; using sound_sequence = std::vector; using eventlauncher_sequence = std::vector; +// methods + void + enclose_area( editor::basic_node *Node ); // members scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_CELLSIZE ) }; bool m_active { false }; // whether the cell holds any actual data @@ -182,9 +193,9 @@ public: auto &targetcell { cell( Node->location() ) }; targetcell.insert( Node ); // some node types can extend bounding area of the target cell - m_area.radius = std::max( + m_area.radius = std::max( m_area.radius, - glm::length( m_area.center - targetcell.area().center ) + targetcell.area().radius ); } + static_cast( glm::length( m_area.center - targetcell.area().center ) + targetcell.area().radius ) ); } // registers provided node in the lookup directory of the section enclosing specified point template void @@ -223,7 +234,7 @@ private: cell( glm::dvec3 const &Location ); // members // placement and visibility - scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_SECTIONSIZE + 0.25 * EU07_SECTIONSIZE ) }; + scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_SECTIONSIZE ) }; // content cell_array m_cells; // partitioning scheme shapenode_sequence m_shapes; // large pieces of opaque geometry and (legacy) terrain @@ -250,6 +261,12 @@ public: // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); + // stores content of the class in file with specified name + void + serialize( std::string const &Scenariofile ); + // restores content of the class from file with specified name. returns: true on success, false otherwise + bool + deserialize( std::string const &Scenariofile ); // legacy method, links specified path piece with potential neighbours void TrackJoin( TTrack *Track ); diff --git a/scenenode.cpp b/scenenode.cpp index f72b1cb2..fc20188f 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -259,9 +259,9 @@ shape_node::convert( TSubModel const *Submodel ) { squareradius, glm::length2( vertex.position - m_data.area.center ) ); } - m_data.area.radius = std::max( + m_data.area.radius = std::max( m_data.area.radius, - std::sqrt( squareradius ) ); + static_cast( std::sqrt( squareradius ) ) ); return *this; } @@ -497,5 +497,23 @@ basic_node::basic_node( scene::node_data const &Nodedata ) : std::numeric_limits::max() ); } +float const & +basic_node::radius() { + + if( m_area.radius == -1.0 ) { + // calculate if needed + radius_(); + } + return m_area.radius; +} + +// radius() subclass details, calculates node's bounding radius +// by default nodes are 'virtual don't extend from their center point +void +basic_node::radius_() { + + m_area.radius = 0.f; +} + } // editor //--------------------------------------------------------------------------- diff --git a/scenenode.h b/scenenode.h index 4b23d1ce..d30b420b 100644 --- a/scenenode.h +++ b/scenenode.h @@ -288,10 +288,12 @@ public: return m_name; } void location( glm::dvec3 const Location ) { - m_location = Location; } + m_area.center = Location; } glm::dvec3 const & location() const { - return m_location; }; + return m_area.center; }; + float const & + radius(); void visible( bool const Visible ) { m_visible = Visible; } @@ -300,8 +302,11 @@ public: return m_visible; } protected: +// methods + // radius() subclass details, calculates node's bounding radius + virtual void radius_(); // members - glm::dvec3 m_location; + scene::bounding_area m_area; bool m_visible { true }; double m_rangesquaredmin { 0.0 }; // visibility range, min double m_rangesquaredmax { 0.0 }; // visibility range, max diff --git a/simulation.cpp b/simulation.cpp index 9bd163e5..1a99189c 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -38,11 +38,16 @@ state_manager::deserialize( std::string const &Scenariofile ) { // TODO: check first for presence of serialized binary files // if this fails, fall back on the legacy text format + scene::scratch_data importscratchpad; + importscratchpad.binary.terrain = Region->deserialize( Scenariofile ); + // NOTE: for the time being import from text format is a given, since we don't have full binary serialization cParser scenarioparser( Scenariofile, cParser::buffer_FILE, Global::asCurrentSceneryPath, Global::bLoadTraction ); if( false == scenarioparser.ok() ) { return false; } - deserialize( scenarioparser ); + deserialize( scenarioparser, importscratchpad ); + // if we didn't find usable binary version of the scenario files, create them now for future use + if( false == importscratchpad.binary.terrain ) { Region->serialize( Scenariofile ); } Global::iPause &= ~0x10; // koniec pauzy wczytywania return true; @@ -67,9 +72,8 @@ state_manager::update( double const Deltatime, int Iterationcount ) { // restores class data from provided stream void -state_manager::deserialize( cParser &Input ) { +state_manager::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) { - scene::scratch_data importscratchpad; // prepare deserialization function table // since all methods use the same objects, we can have simple, hard-coded binds or lambdas for the task using deserializefunction = void(state_manager::*)(cParser &, scene::scratch_data &); @@ -98,7 +102,7 @@ state_manager::deserialize( cParser &Input ) { std::string, deserializefunctionbind> functionmap; for( auto &function : functionlist ) { - functionmap.emplace( function.first, std::bind( function.second, this, std::ref( Input ), std::ref( importscratchpad ) ) ); + functionmap.emplace( function.first, std::bind( function.second, this, std::ref( Input ), std::ref( Scratchpad ) ) ); } // deserialize content from the provided input @@ -127,9 +131,9 @@ state_manager::deserialize( cParser &Input ) { token = Input.getToken(); } - if( false == importscratchpad.initialized ) { + if( false == Scratchpad.initialized ) { // manually perform scenario initialization - deserialize_firstinit( Input, importscratchpad ); + deserialize_firstinit( Input, Scratchpad ); } } @@ -236,12 +240,12 @@ state_manager::deserialize_event( cParser &Input, scene::scratch_data &Scratchpa // TODO: refactor event class and its de/serialization. do offset and rotation after deserialization is done auto *event = new TEvent(); Math3D::vector3 offset = ( - Scratchpad.location_offset.empty() ? + Scratchpad.location.offset.empty() ? Math3D::vector3() : Math3D::vector3( - Scratchpad.location_offset.top().x, - Scratchpad.location_offset.top().y, - Scratchpad.location_offset.top().z ) ); + Scratchpad.location.offset.top().x, + Scratchpad.location.offset.top().y, + Scratchpad.location.offset.top().z ) ); event->Load( &Input, offset ); if( false == simulation::Events.insert( event ) ) { @@ -386,20 +390,34 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad || ( nodedata.type == "triangle_strip" ) || ( nodedata.type == "triangle_fan" ) ) { - simulation::Region->insert_shape( - scene::shape_node().deserialize( - Input, nodedata ), - Scratchpad, - true ); + if( false == Scratchpad.binary.terrain ) { + + simulation::Region->insert_shape( + scene::shape_node().deserialize( + Input, nodedata ), + Scratchpad, + true ); + } + else { + // all shapes were already loaded from the binary version of the file + skip_until( Input, "endtri" ); + } } else if( ( nodedata.type == "lines" ) || ( nodedata.type == "line_strip" ) || ( nodedata.type == "line_loop" ) ) { - simulation::Region->insert_lines( - scene::lines_node().deserialize( - Input, nodedata ), - Scratchpad ); + if( false == Scratchpad.binary.terrain ) { + + simulation::Region->insert_lines( + scene::lines_node().deserialize( + Input, nodedata ), + Scratchpad ); + } + else { + // all lines were already loaded from the binary version of the file + skip_until( Input, "endline" ); + } } else if( nodedata.type == "memcell" ) { @@ -448,18 +466,18 @@ state_manager::deserialize_origin( cParser &Input, scene::scratch_data &Scratchp >> offset.y >> offset.z; // sumowanie całkowitego przesunięcia - Scratchpad.location_offset.emplace( + Scratchpad.location.offset.emplace( offset + ( - Scratchpad.location_offset.empty() ? + Scratchpad.location.offset.empty() ? glm::dvec3() : - Scratchpad.location_offset.top() ) ); + Scratchpad.location.offset.top() ) ); } void state_manager::deserialize_endorigin( cParser &Input, scene::scratch_data &Scratchpad ) { - if( false == Scratchpad.location_offset.empty() ) { - Scratchpad.location_offset.pop(); + if( false == Scratchpad.location.offset.empty() ) { + Scratchpad.location.offset.pop(); } else { ErrorLog( "Bad origin: endorigin instruction with empty origin stack in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); @@ -471,9 +489,9 @@ state_manager::deserialize_rotate( cParser &Input, scene::scratch_data &Scratchp Input.getTokens( 3 ); Input - >> Scratchpad.location_rotation.x - >> Scratchpad.location_rotation.y - >> Scratchpad.location_rotation.z; + >> Scratchpad.location.rotation.x + >> Scratchpad.location.rotation.y + >> Scratchpad.location.rotation.z; } void @@ -584,12 +602,12 @@ state_manager::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done auto *track = new TTrack( Nodedata ); Math3D::vector3 offset = ( - Scratchpad.location_offset.empty() ? + Scratchpad.location.offset.empty() ? Math3D::vector3() : Math3D::vector3( - Scratchpad.location_offset.top().x, - Scratchpad.location_offset.top().y, - Scratchpad.location_offset.top().z ) ); + Scratchpad.location.offset.top().x, + Scratchpad.location.offset.top().y, + Scratchpad.location.offset.top().z ) ); track->Load( &Input, offset ); return track; @@ -605,9 +623,9 @@ state_manager::deserialize_traction( cParser &Input, scene::scratch_data &Scratc // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done auto *traction = new TTraction( Nodedata ); auto offset = ( - Scratchpad.location_offset.empty() ? + Scratchpad.location.offset.empty() ? glm::dvec3() : - Scratchpad.location_offset.top() ); + Scratchpad.location.offset.top() ); traction->Load( &Input, offset ); return traction; @@ -670,7 +688,7 @@ state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpa >> rotation.y; auto *instance = new TAnimModel( Nodedata ); - instance->RaAnglesSet( Scratchpad.location_rotation + rotation ); // dostosowanie do pochylania linii + instance->RaAnglesSet( Scratchpad.location.rotation + rotation ); // dostosowanie do pochylania linii if( false == instance->Load( &Input, false ) ) { // model nie wczytał się - ignorowanie node @@ -838,12 +856,12 @@ state_manager::skip_until( cParser &Input, std::string const &Token ) { glm::dvec3 state_manager::transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ) { - if( Scratchpad.location_rotation != glm::vec3( 0, 0, 0 ) ) { - auto const rotation = glm::radians( Scratchpad.location_rotation ); + if( Scratchpad.location.rotation != glm::vec3( 0, 0, 0 ) ) { + auto const rotation = glm::radians( Scratchpad.location.rotation ); Location = glm::rotateY( Location, rotation.y ); // Ra 2014-11: uwzględnienie rotacji } - if( false == Scratchpad.location_offset.empty() ) { - Location += Scratchpad.location_offset.top(); + if( false == Scratchpad.location.offset.empty() ) { + Location += Scratchpad.location.offset.top(); } return Location; } diff --git a/simulation.h b/simulation.h index 14740ecd..4addbe49 100644 --- a/simulation.h +++ b/simulation.h @@ -40,7 +40,7 @@ public: private: // methods // restores class data from provided stream - void deserialize( cParser &Input ); + void deserialize( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ); diff --git a/version.h b/version.h index e45b45fa..6fe44f69 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1025 +#define VERSION_MINOR 1027 #define VERSION_REVISION 0 From da396836e0081e9ee72d755b2a0b7b26575bff76 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 28 Oct 2017 16:18:53 +0200 Subject: [PATCH 209/426] maintenance: removed deprecated ground code --- AnimModel.cpp | 25 +- Driver.cpp | 16 - Driver.h | 8 - DynObj.cpp | 26 +- EU07.cpp | 7 +- Event.cpp | 35 +- Event.h | 6 - Globals.cpp | 34 +- Globals.h | 8 - MemCell.cpp | 23 +- MemCell.h | 4 - Model3d.cpp | 60 --- Model3d.h | 6 - Names.h | 56 --- Track.cpp | 186 +-------- Track.h | 21 -- Traction.cpp | 14 +- Traction.h | 4 - TractionPower.cpp | 7 +- TrkFoll.cpp | 25 +- World.cpp | 643 +++++++++++--------------------- World.h | 4 - maszyna.vcxproj.filters | 6 - messaging.cpp | 80 ---- messaging.h | 8 - Ground.cpp => old/Ground.cpp | 0 Ground.h => old/Ground.h | 0 renderer.cpp | 704 +---------------------------------- renderer.h | 41 -- scene.cpp | 6 +- stdafx.h | 2 - 31 files changed, 288 insertions(+), 1777 deletions(-) rename Ground.cpp => old/Ground.cpp (100%) rename Ground.h => old/Ground.h (100%) diff --git a/AnimModel.cpp b/AnimModel.cpp index fd994fe4..b26d91a0 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -15,15 +15,12 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "AnimModel.h" -#include "Globals.h" -#include "Logs.h" -#include "usefull.h" -#include "McZapkie/mctools.h" -#include "Timer.h" #include "MdlMngr.h" -// McZapkie: -#include "renderer.h" -//--------------------------------------------------------------------------- +#include "simulation.h" +#include "Globals.h" +#include "Timer.h" +#include "Logs.h" + TAnimContainer *TAnimModel::acAnimList = NULL; TAnimAdvanced::TAnimAdvanced(){}; @@ -234,11 +231,7 @@ void TAnimContainer::UpdateModel() { iAnim &= ~2; // wyłączyć zmianę pozycji submodelu if( evDone ) { // wykonanie eventu informującego o zakończeniu -#ifdef EU07_USE_OLD_GROUNDCODE - Global::AddToQuery( evDone, NULL ); -#else simulation::Events.AddToQuery( evDone, nullptr ); -#endif } } } @@ -306,11 +299,7 @@ void TAnimContainer::UpdateModel() { fRotateSpeed = 0.0; if( evDone ) { // wykonanie eventu informującego o zakończeniu -#ifdef EU07_USE_OLD_GROUNDCODE - Global::AddToQuery( evDone, NULL ); -#else simulation::Events.AddToQuery( evDone, nullptr ); -#endif } } } @@ -340,11 +329,7 @@ void TAnimContainer::PrepareModel() fAngleSpeed = 0.0; // wyłączenie przeliczania wektora if( evDone ) { // wykonanie eventu informującego o zakończeniu -#ifdef EU07_USE_OLD_GROUNDCODE - Global::AddToQuery( evDone, NULL ); -#else simulation::Events.AddToQuery( evDone, nullptr ); -#endif } } else diff --git a/Driver.cpp b/Driver.cpp index 772f78af..585423ae 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -21,7 +21,6 @@ http://mozilla.org/MPL/2.0/. #include "mtable.h" #include "DynObj.h" #include "Event.h" -#include "Ground.h" #include "MemCell.h" #include "World.h" #include "McZapkie/mctools.h" @@ -3002,24 +3001,13 @@ void TController::RecognizeCommand() void TController::PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation, TStopReason reason) { // wysłanie komendy przez event PutValues, jak pojazd ma obsadę, to wysyła tutaj, a nie do pojazdu bezpośrednio -#ifdef EU07_USE_OLD_GROUNDCODE - vector3 sl; - sl.x = -NewLocation.X; // zamiana na współrzędne scenerii - sl.z = NewLocation.Y; - sl.y = NewLocation.Z; -#else // zamiana na współrzędne scenerii glm::dvec3 sl { -NewLocation.X, NewLocation.Z, NewLocation.Y }; -#endif if (!PutCommand(NewCommand, NewValue1, NewValue2, &sl, reason)) mvOccupied->PutCommand(NewCommand, NewValue1, NewValue2, NewLocation); } -#ifdef EU07_USE_OLD_GROUNDCODE -bool TController::PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const vector3 *NewLocation, TStopReason reason) -#else bool TController::PutCommand( std::string NewCommand, double NewValue1, double NewValue2, glm::dvec3 const *NewLocation, TStopReason reason ) -#endif { // analiza komendy if (NewCommand == "CabSignal") { // SHP wyzwalane jest przez człon z obsadą, ale obsługiwane przez silnikowy @@ -5339,11 +5327,7 @@ TTrack * TController::BackwardTraceRoute(double &fDistance, double &fDirection, } // sprawdzanie zdarzeń semaforów i ograniczeń szlakowych -#ifdef EU07_USE_OLD_GROUNDCODE -void TController::SetProximityVelocity(double dist, double vel, const vector3 *pos) -#else void TController::SetProximityVelocity( double dist, double vel, glm::dvec3 const *pos ) -#endif { // Ra:przeslanie do AI prędkości /* //!!!! zastąpić prawidłową reakcją AI na SetProximityVelocity !!!! diff --git a/Driver.h b/Driver.h index d669b498..e4ee16e6 100644 --- a/Driver.h +++ b/Driver.h @@ -314,11 +314,7 @@ private: Mtable::TTrainParameters *Timetable() { return TrainParams; }; void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation, TStopReason reason = stopComm); -#ifdef EU07_USE_OLD_GROUNDCODE - bool PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const vector3 *NewLocation, TStopReason reason = stopComm); -#else bool PutCommand( std::string NewCommand, double NewValue1, double NewValue2, glm::dvec3 const *NewLocation, TStopReason reason = stopComm ); -#endif void UpdateSituation(double dt); // uruchamiac przynajmniej raz na sekundę // procedury dotyczace rozkazow dla maszynisty // uaktualnia informacje o prędkości @@ -378,11 +374,7 @@ private: bool BackwardTrackBusy(TTrack *Track); TEvent *CheckTrackEventBackward(double fDirection, TTrack *Track); TTrack *BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, TEvent *&Event); -#ifdef EU07_USE_OLD_GROUNDCODE - void SetProximityVelocity(double dist, double vel, const vector3 *pos); -#else void SetProximityVelocity( double dist, double vel, glm::dvec3 const *pos ); -#endif TCommandType BackwardScan(); public: diff --git a/DynObj.cpp b/DynObj.cpp index e04807f0..92a8a6ef 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -15,32 +15,18 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "DynObj.h" -#include "logs.h" -#include "MdlMngr.h" -#include "Timer.h" -#include "Usefull.h" -// McZapkie-260202 +#include "simulation.h" #include "Globals.h" -#include "renderer.h" -#include "AirCoupler.h" - -#include "TractionPower.h" -#include "Event.h" -#include "Driver.h" -#include "Camera.h" //bo likwidujemy trzęsienie +#include "Timer.h" +#include "logs.h" #include "Console.h" -#include "Traction.h" +#include "MdlMngr.h" // Ra: taki zapis funkcjonuje lepiej, ale może nie jest optymalny #define vWorldFront Math3D::vector3(0, 0, 1) #define vWorldUp Math3D::vector3(0, 1, 0) #define vWorldLeft CrossProduct(vWorldUp, vWorldFront) -// Ra: bo te poniżej to się powielały w każdym module odobno -// vector3 vWorldFront=vector3(0,0,1); -// vector3 vWorldUp=vector3(0,1,0); -// vector3 vWorldLeft=CrossProduct(vWorldUp,vWorldFront); - #define M_2PI 6.283185307179586476925286766559; const float maxrot = (float)(M_PI / 3.0); // 60° @@ -4909,12 +4895,8 @@ void TDynamicObject::RadioStop() if( ( MoverParameters->SecuritySystem.RadioStop ) && ( MoverParameters->Radio ) ) { // jeśli pojazd ma RadioStop i jest on aktywny -#ifdef EU07_USE_OLD_GROUNDCODE - Mechanik->PutCommand( "Emergency_brake", 1.0, 1.0, &vPosition, stopRadio ); -#else // HAX cast until math types unification Mechanik->PutCommand( "Emergency_brake", 1.0, 1.0, &static_cast(vPosition), stopRadio ); -#endif // add onscreen notification for human driver // TODO: do it selectively for the 'local' driver once the multiplayer is in if( false == Mechanik->AIControllFlag ) { diff --git a/EU07.cpp b/EU07.cpp index 590890fa..eba5e362 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -20,17 +20,16 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include #endif +#include "World.h" +#include "simulation.h" #include "Globals.h" +#include "timer.h" #include "Logs.h" #include "keyboardinput.h" #include "mouseinput.h" #include "gamepadinput.h" #include "Console.h" #include "PyInt.h" -#include "World.h" -#include "Mover.h" -#include "usefull.h" -#include "timer.h" #include "uilayer.h" #ifdef EU07_BUILD_STATIC diff --git a/Event.cpp b/Event.cpp index 8755912d..15acc047 100644 --- a/Event.cpp +++ b/Event.cpp @@ -16,18 +16,10 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "event.h" -#include "Globals.h" -#include "Logs.h" -#include "Usefull.h" -#include "parser.h" -#include "Timer.h" -#include "MemCell.h" -#include "Ground.h" -#include "McZapkie\mctools.h" -#include "animmodel.h" -#include "dynobj.h" -#include "driver.h" -#include "tractionpower.h" +#include "simulation.h" +#include "globals.h" +#include "timer.h" +#include "logs.h" TEvent::TEvent( std::string const &m ) : asNodeName( m ) @@ -745,7 +737,7 @@ event_manager::update() { // NOTE: we're presuming global events aren't going to use event2 WriteLog( "Eventlauncher " + launcher->name() ); if( launcher->Event1 ) { - Global::AddToQuery( launcher->Event1, nullptr ); + AddToQuery( launcher->Event1, nullptr ); } } } @@ -850,11 +842,7 @@ event_manager::AddToQuery( TEvent *Event, TDynamicObject *Owner ) { for( auto dynamic : Event->Params[ 6 ].asTrack->Dynamics ) { Event->Params[ 5 ].asMemCell->PutCommand( dynamic->Mechanik, -#ifdef EU07_USE_OLD_GROUNDCODE - &Event->Params[ 4 ].nGroundNode->pCenter ); -#else Event->Params[ 4 ].asLocation ); -#endif } //if (DebugModeFlag) WriteLog( @@ -952,11 +940,7 @@ event_manager::CheckQuery() { for( auto dynamic : m_workevent->Params[ 6 ].asTrack->Dynamics ) { m_workevent->Params[ 5 ].asMemCell->PutCommand( dynamic->Mechanik, -#ifdef EU07_USE_OLD_GROUNDCODE - &m_workevent->Params[ 4 ].nGroundNode->pCenter ); -#else m_workevent->Params[ 4 ].asLocation ); -#endif } //if (DebugModeFlag) WriteLog("Type: UpdateValues & Track command - [" + @@ -980,11 +964,7 @@ event_manager::CheckQuery() { } m_workevent->Params[ 9 ].asMemCell->PutCommand( m_workevent->Activator->Mechanik, -#ifdef EU07_USE_OLD_GROUNDCODE - &m_workevent->Params[ 8 ].nGroundNode->pCenter ); -#else m_workevent->Params[ 8 ].asLocation ); -#endif } WriteLog( "Type: GetValues" ); break; @@ -1028,13 +1008,8 @@ event_manager::CheckQuery() { break; } case tp_Visible: { -#ifdef EU07_USE_OLD_GROUNDCODE - if( m_workevent->Params[ 9 ].nGroundNode ) - m_workevent->Params[ 9 ].nGroundNode->bVisible = ( m_workevent->Params[ i ].asInt > 0 ); -#else if( m_workevent->Params[ 9 ].asEditorNode ) m_workevent->Params[ 9 ].asEditorNode->visible( m_workevent->Params[ i ].asInt > 0 ); -#endif break; } case tp_Velocity: { diff --git a/Event.h b/Event.h index ad32a5b0..d8c90562 100644 --- a/Event.h +++ b/Event.h @@ -63,9 +63,6 @@ union TParam { void *asPointer; TMemCell *asMemCell; -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode *nGroundNode; -#endif editor::basic_node *asEditorNode; glm::dvec3 const *asLocation; TTrack *asTrack; @@ -94,9 +91,6 @@ class TEvent // zmienne: ev* bool bEnabled = false; // false gdy ma nie być dodawany do kolejki (skanowanie sygnałów) int iQueued = 0; // ile razy dodany do kolejki TEvent *evNext = nullptr; // następny w kolejce -#ifdef EU07_USE_OLD_GROUNDCODE - TEvent *evNext2 = nullptr; -#endif TEventType Type = tp_Unknown; double fStartTime = 0.0; double fDelay = 0.0; diff --git a/Globals.cpp b/Globals.cpp index 914f3b74..43c66c17 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -12,23 +12,17 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" +#include "globals.h" -#include "Globals.h" -#include "usefull.h" -//#include "Mover.h" +#include "world.h" +#include "simulation.h" +#include "logs.h" #include "Console.h" -#include "Driver.h" -#include "Logs.h" #include "PyInt.h" -#include "World.h" -#include "parser.h" // namespace Global { // parametry do użytku wewnętrznego -#ifdef EU07_USE_OLD_GROUNDCODE -TGround *Global::pGround = NULL; -#endif std::string Global::AppName{ "EU07" }; std::string Global::asCurrentSceneryPath = "scenery/"; std::string Global::asCurrentTexturePath = std::string(szTexturePath); @@ -987,26 +981,6 @@ void Global::TrainDelete(TDynamicObject *d) pWorld->TrainDelete(d); }; -#ifdef EU07_USE_OLD_GROUNDCODE -TDynamicObject *Global::DynamicNearest() -{ // ustalenie pojazdu najbliższego kamerze - return pGround->DynamicNearest(pCamera->Pos); -}; - -TDynamicObject *Global::CouplerNearest() -{ // ustalenie pojazdu najbliższego kamerze - return pGround->CouplerNearest(pCamera->Pos); -}; -#endif -bool Global::AddToQuery(TEvent *event, TDynamicObject *who) -{ -#ifdef EU07_USE_OLD_GROUNDCODE - return pGround->AddToQuery(event, who); -#else - return simulation::Events.AddToQuery( event, who ); -#endif -}; - //--------------------------------------------------------------------------- bool Global::DoEvents() diff --git a/Globals.h b/Globals.h index fac2576d..478ec2a3 100644 --- a/Globals.h +++ b/Globals.h @@ -161,11 +161,6 @@ public: static void SetCameraPosition(Math3D::vector3 pNewCameraPosition); static void SetCameraRotation(double Yaw); static void TrainDelete(TDynamicObject *d); -#ifdef EU07_USE_OLD_GROUNDCODE - static TDynamicObject * DynamicNearest(); - static TDynamicObject * CouplerNearest(); -#endif - static bool AddToQuery(TEvent *event, TDynamicObject *who); static bool DoEvents(); static std::string Bezogonkow(std::string str, bool _ = false); static double Min0RSpeed(double vel1, double vel2); @@ -195,9 +190,6 @@ public: static bool bLiveTraction; static float Global::fMouseXScale; static float Global::fMouseYScale; -#ifdef EU07_USE_OLD_GROUNDCODE - static TGround *pGround; -#endif static std::string szDefaultExt; static std::string SceneryFile; static std::string AppName; diff --git a/MemCell.cpp b/MemCell.cpp index 972f89df..8850c4fa 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -14,14 +14,10 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "MemCell.h" +#include "memcell.h" -#include "Globals.h" -#include "Logs.h" -#include "Usefull.h" -#include "Driver.h" -#include "Event.h" -#include "parser.h" +#include "simulation.h" +#include "logs.h" //--------------------------------------------------------------------------- @@ -104,16 +100,11 @@ TCommandType TMemCell::CommandCheck() bool TMemCell::Load(cParser *parser) { std::string token; -#ifdef EU07_USE_OLD_GROUNDCODE - parser->getTokens( 3, false ); - *parser -#else parser->getTokens( 6, false ); *parser >> m_area.center.x >> m_area.center.y >> m_area.center.z -#endif >> szText >> fValue1 >> fValue2; @@ -129,11 +120,7 @@ bool TMemCell::Load(cParser *parser) return true; } -#ifdef EU07_USE_OLD_GROUNDCODE -void TMemCell::PutCommand(TController *Mech, vector3 *Loc) -#else void TMemCell::PutCommand( TController *Mech, glm::dvec3 const *Loc ) -#endif { // wysłanie zawartości komórki do AI if (Mech) Mech->PutCommand(szText, fValue1, fValue2, Loc); @@ -178,11 +165,7 @@ void TMemCell::StopCommandSent() bCommand = false; if( OnSent ) { // jeśli jest event -#ifdef EU07_USE_OLD_GROUNDCODE - Global::AddToQuery( OnSent, NULL ); -#else simulation::Events.AddToQuery( OnSent, nullptr ); -#endif } }; diff --git a/MemCell.h b/MemCell.h index a89d7580..27e4cf17 100644 --- a/MemCell.h +++ b/MemCell.h @@ -28,11 +28,7 @@ public: bool Load(cParser *parser); void -#ifdef EU07_USE_OLD_GROUNDCODE - PutCommand( TController *Mech, Math3D::vector3 *Loc ); -#else PutCommand( TController *Mech, glm::dvec3 const *Loc ); -#endif bool Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ); std::string const & diff --git a/Model3d.cpp b/Model3d.cpp index a24ebc2e..9e9200b5 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -19,9 +19,6 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others #include "logs.h" #include "mczapkie/mctools.h" #include "Usefull.h" -#ifdef EU07_USE_OLD_GROUNDCODE -#include "ground.h" -#endif #include "renderer.h" #include "Timer.h" #include "mtable.h" @@ -1033,64 +1030,7 @@ TSubModel::create_geometry( std::size_t &Dataoffset, geometrybank_handle const & if( Next ) Next->create_geometry( Dataoffset, Bank ); } -#ifdef EU07_USE_OLD_GROUNDCODE -// places contained geometry in provided ground node -void -TSubModel::convert( TGroundNode &Groundnode ) const { - Groundnode.asName = pName; - Groundnode.Ambient = f4Ambient; - Groundnode.Diffuse = f4Diffuse; - Groundnode.Specular = f4Specular; - Groundnode.m_material = m_material; - Groundnode.iFlags = ( - ( true == GfxRenderer.Material( m_material ).has_alpha ) ? - 0x20 : - 0x10 ); - - if( m_geometry == null_handle ) { return; } - - int vertexcount { 0 }; - std::vector importedvertices; - TGroundVertex vertex, vertex1, vertex2; - for( auto const &sourcevertex : GfxRenderer.Vertices( m_geometry ) ) { - vertex.position = sourcevertex.position; - vertex.normal = sourcevertex.normal; - vertex.texture = sourcevertex.texture; - if( vertexcount == 0 ) { vertex1 = vertex; } - else if( vertexcount == 1 ) { vertex2 = vertex; } - else if( vertexcount >= 2 ) { - if( false == degenerate( vertex1.position, vertex2.position, vertex.position ) ) { - importedvertices.emplace_back( vertex1 ); - importedvertices.emplace_back( vertex2 ); - importedvertices.emplace_back( vertex ); - } - // start a new triangle - vertexcount = -1; - } - ++vertexcount; - } - if( Groundnode.Piece == nullptr ) { - Groundnode.Piece = new piece_node(); - } - Groundnode.iNumVerts = importedvertices.size(); - if( Groundnode.iNumVerts > 0 ) { - // assign imported geometry to the node... - Groundnode.Piece->vertices.swap( importedvertices ); - // ...and calculate center... - for( auto const &vertex : Groundnode.Piece->vertices ) { - Groundnode.pCenter += vertex.position; - } - Groundnode.pCenter /= Groundnode.iNumVerts; - // ...and bounding area - double squareradius { 0.0 }; - for( auto const &vertex : Groundnode.Piece->vertices ) { - squareradius = std::max( squareradius, glm::length2( vertex.position - glm::dvec3{ Groundnode.pCenter } ) ); - } - Groundnode.fSquareRadius += squareradius; - } -} -#endif void TSubModel::ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ) { // ustawienie kolorów dla modelu terenu f4Ambient = glm::vec4( Ambient, 1.0f ); diff --git a/Model3d.h b/Model3d.h index 863c962d..8a0cb8b5 100644 --- a/Model3d.h +++ b/Model3d.h @@ -50,9 +50,6 @@ enum TAnimType // rodzaj animacji at_Undefined = 0x800000FF // animacja chwilowo nieokreślona }; -#ifdef EU07_USE_OLD_GROUNDCODE -class TGroundNode; -#endif namespace scene { class shape_node; } @@ -216,9 +213,6 @@ public: std::vector&); void serialize_geometry( std::ostream &Output ) const; // places contained geometry in provided ground node -#ifdef EU07_USE_OLD_GROUNDCODE - void convert( TGroundNode &Groundnode ) const; -#endif }; class TModel3d : public CMesh diff --git a/Names.h b/Names.h index e28028fd..209ed9c3 100644 --- a/Names.h +++ b/Names.h @@ -12,62 +12,6 @@ http://mozilla.org/MPL/2.0/. #include #include -#ifdef EU07_USE_OLD_GROUNDCODE -template -class TNames { - -public: -// types: - -// constructors: - TNames() = default; - -// destructor: - -// methods: - // dodanie obiektu z wskaźnikiem. updates data field if the object already exists. returns true for insertion, false for update - bool - Add( int const Type, std::string const &Name, Type_ Data ) { - - auto lookup = find_map( Type ).emplace( Name, Data ); - if( lookup.second == false ) { - // record already exists, update it - lookup.first->second = Data; - return false; - } - else { - // new record inserted, bail out - return true; - } - } - // returns pointer associated with provided label, or nullptr if there's no match - Type_ - Find( int const Type, std::string const &Name ) { - - auto const &map = find_map( Type ); - auto const lookup = map.find( Name ); - if( lookup != map.end() ) { return lookup->second; } - else { return nullptr; } - } - -private: -// types: - typedef std::unordered_map type_map; - typedef std::unordered_map typemap_map; - -// methods: - // returns database stored with specified type key; creates new database if needed. - type_map & - find_map( int const Type ) { - - return m_maps.emplace( Type, type_map() ).first->second; - } - -// members: - typemap_map m_maps; // list of object maps of types specified so far -}; -#endif - template class basic_table { diff --git a/Track.cpp b/Track.cpp index a560e0b9..fcc415ca 100644 --- a/Track.cpp +++ b/Track.cpp @@ -13,20 +13,12 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "Track.h" -#include "Globals.h" -#include "Logs.h" -#include "Usefull.h" -#include "renderer.h" -#include "Timer.h" -#include "Ground.h" -#include "parser.h" -#include "Mover.h" -#include "DynObj.h" -#include "AnimModel.h" -#include "MemCell.h" -#include "Event.h" +#include "track.h" + #include "simulation.h" +#include "globals.h" +#include "timer.h" +#include "logs.h" // 101206 Ra: trapezoidalne drogi i tory // 110720 Ra: rozprucie zwrotnicy i odcinki izolowane @@ -37,13 +29,11 @@ static float const fMaxOffset = 0.1f; // double(0.1f)==0.100000001490116 const int iLewo4[4] = {5, 3, 4, 6}; // segmenty (1..6) do skręcania w lewo const int iPrawo4[4] = {-4, -6, -3, -5}; // segmenty (1..6) do skręcania w prawo const int iProsto4[4] = {1, -1, 2, -2}; // segmenty (1..6) do jazdy prosto -const int iEnds4[13] = {3, 0, 2, 1, 2, 0, -1, - 1, 3, 2, 0, 3, 1}; // numer sąsiedniego toru na końcu segmentu "-1" +const int iEnds4[13] = {3, 0, 2, 1, 2, 0, -1, 1, 3, 2, 0, 3, 1}; // numer sąsiedniego toru na końcu segmentu "-1" const int iLewo3[4] = {1, 3, 2, 1}; // segmenty do skręcania w lewo const int iPrawo3[4] = {-2, -1, -3, -2}; // segmenty do skręcania w prawo const int iProsto3[4] = {1, -1, 2, 1}; // segmenty do jazdy prosto -const int iEnds3[13] = {3, 0, 2, 1, 2, 0, -1, - 1, 0, 2, 0, 3, 1}; // numer sąsiedniego toru na końcu segmentu "-1" +const int iEnds3[13] = {3, 0, 2, 1, 2, 0, -1, 1, 0, 2, 0, 3, 1}; // numer sąsiedniego toru na końcu segmentu "-1" TIsolated *TIsolated::pRoot = NULL; TSwitchExtension::TSwitchExtension(TTrack *owner, int const what) @@ -114,7 +104,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) if (!iAxles) { // jeśli po zmianie nie ma żadnej osi na odcinku izolowanym if (evFree) - Global::AddToQuery(evFree, o); // dodanie zwolnienia do kolejki + simulation::Events.AddToQuery(evFree, o); // dodanie zwolnienia do kolejki if (Global::iMultiplayer) // jeśli multiplayer multiplayer::WyslijString(asName, 10); // wysłanie pakietu o zwolnieniu if (pMemCell) // w powiązanej komórce @@ -128,7 +118,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) if (iAxles) { if (evBusy) - Global::AddToQuery(evBusy, o); // dodanie zajętości do kolejki + simulation::Events.AddToQuery(evBusy, o); // dodanie zajętości do kolejki if (Global::iMultiplayer) // jeśli multiplayer multiplayer::WyslijString(asName, 11); // wysłanie pakietu o zajęciu if (pMemCell) // w powiązanej komórce @@ -185,18 +175,6 @@ TTrack::sort_by_material( TTrack const *Left, TTrack const *Right ) { TTrack * TTrack::Create400m(int what, double dx) { // tworzenie toru do wstawiania taboru podczas konwersji na E3D -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode *tmp = new TGroundNode(TP_TRACK); // node - TTrack *trk = tmp->pTrack; - trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur - trk->iCategoryFlag = what; // taki sam typ plus informacja, że dodatkowy - trk->Init(); // utworzenie segmentu - trk->Segment->Init(vector3(-dx, 0, 0), vector3(-dx, 0, 400), 10.0, 0, 0); // prosty - tmp->pCenter = vector3(-dx, 0, 200); //środek, aby się mogło wyświetlić - TSubRect *r = Global::pGround->GetSubRect(tmp->pCenter.x, tmp->pCenter.z); - r->NodeAdd(tmp); // dodanie toru do segmentu - r->Sort(); //żeby wyświetlał tabor z dodanego toru -#else auto *trk = new TTrack( "auto_400m" ); trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur trk->iCategoryFlag = what; // taki sam typ plus informacja, że dodatkowy @@ -205,112 +183,11 @@ TTrack * TTrack::Create400m(int what, double dx) trk->location( glm::dvec3{ -dx, 0, 200 } ); //środek, aby się mogło wyświetlić simulation::Paths.insert( trk ); simulation::Region->insert_path( trk, scene::scratch_data() ); -#endif return trk; }; TTrack * TTrack::NullCreate(int dir) { // tworzenie toru wykolejającego od strony (dir), albo pętli dla samochodów -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode *tmp = new TGroundNode( TP_TRACK ); - TGroundNode *tmp2 = nullptr; // node - TTrack *trk = tmp->pTrack; // tor; UWAGA! obrotnica może generować duże ilości tego - trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur - // trk->iTrapezoid=1; //są przechyłki do uwzględniania w rysowaniu - trk->iCategoryFlag = (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy - float r1, r2; - Segment->GetRolls(r1, r2); // pobranie przechyłek na początku toru - vector3 p1, cv1, cv2, p2; // będziem tworzyć trajektorię lotu - if (iCategoryFlag & 1) - { // tylko dla kolei - trk->iDamageFlag = 128; // wykolejenie - trk->fVelocity = 0.0; // koniec jazdy - trk->Init(); // utworzenie segmentu - switch (dir) - { //łączenie z nowym torem - case 0: - p1 = Segment->FastGetPoint_0(); - p2 = p1 - 450.0 * Normalize(Segment->GetDirection1()); - // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk->Segment->Init(p1, p2, 5, -RadToDeg(r1), 70.0); - ConnectPrevPrev(trk, 0); - break; - case 1: - p1 = Segment->FastGetPoint_1(); - p2 = p1 - 450.0 * Normalize(Segment->GetDirection2()); - // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk->Segment->Init(p1, p2, 5, RadToDeg(r2), 70.0); - ConnectNextPrev(trk, 0); - break; - case 3: // na razie nie możliwe - p1 = SwitchExtension->Segments[1]->FastGetPoint_1(); // koniec toru drugiego zwrotnicy - p2 = p1 - 450.0 * Normalize( SwitchExtension->Segments[1]->GetDirection2()); // przedłużenie na wprost - trk->Segment->Init(p1, p2, 5, RadToDeg(r2), 70.0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - ConnectNextPrev(trk, 0); - // trk->ConnectPrevNext(trk,dir); - SetConnections(1); // skopiowanie połączeń - Switch(1); // bo się przełączy na 0, a to coś chce się przecież wykoleić na bok - break; // do drugiego zwrotnicy... nie zadziała? - } - } - else - { // tworznie pętelki dla samochodów - trk->fVelocity = 20.0; // zawracanie powoli - trk->fRadius = 20.0; // promień, aby się dodawało do tabelki prędkości i liczyło narastająco - trk->Init(); // utworzenie segmentu - tmp2 = new TGroundNode(TP_TRACK); // drugi odcinek do zapętlenia - TTrack *trk2 = tmp2->pTrack; - trk2->iCategoryFlag = - (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy - trk2->m_visible = false; - trk2->fVelocity = 20.0; // zawracanie powoli - trk2->fRadius = 20.0; // promień, aby się dodawało do tabelki prędkości i liczyło - // narastająco - trk2->Init(); // utworzenie segmentu - trk->m_name = m_name + ":loopstart"; - trk2->m_name = m_name + ":loopfinish"; - switch (dir) - { //łączenie z nowym torem - case 0: - p1 = Segment->FastGetPoint_0(); - cv1 = -20.0 * Normalize(Segment->GetDirection1()); // pierwszy wektor kontrolny - p2 = p1 + cv1 + cv1; // 40m - // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, -RadToDeg(r1), 0.0); - ConnectPrevPrev(trk, 0); - // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, -RadToDeg(r1), 0.0); - trk2->iPrevDirection = 0; // zwrotnie do tego samego odcinka - break; - case 1: - p1 = Segment->FastGetPoint_1(); - cv1 = -20.0 * Normalize(Segment->GetDirection2()); // pierwszy wektor kontrolny - p2 = p1 + cv1 + cv1; - // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, RadToDeg(r2), 0.0); - ConnectNextPrev(trk, 0); - // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, RadToDeg(r2), 0.0); - trk2->iPrevDirection = 1; // zwrotnie do tego samego odcinka - break; - } - trk2->trPrev = this; - trk->ConnectNextNext(trk2, 1); // połączenie dwóch dodatkowych odcinków punktami 2 - tmp2->pCenter = (0.5 * (p1 + p2)); //środek, aby się mogło wyświetlić - } - // trzeba jeszcze dodać do odpowiedniego segmentu, aby się renderowały z niego pojazdy - tmp->pCenter = (0.5 * (p1 + p2)); //środek, aby się mogło wyświetlić - if (tmp2) - tmp2->pCenter = tmp->pCenter; // ten sam środek jest - // Ra: to poniżej to porażka, ale na razie się nie da inaczej - TSubRect *r = Global::pGround->GetSubRect(tmp->pCenter.x, tmp->pCenter.z); - if( r != nullptr ) { - r->NodeAdd( tmp ); // dodanie toru do segmentu - if( tmp2 ) - r->NodeAdd( tmp2 ); // drugiego też - r->Sort(); //żeby wyświetlał tabor z dodanego toru - } -#else TTrack *trk { nullptr }, *trk2 { nullptr }; @@ -403,7 +280,6 @@ TTrack * TTrack::NullCreate(int dir) simulation::Paths.insert( trk2 ); simulation::Region->insert_path( trk2, scene::scratch_data() ); } -#endif return trk; }; @@ -1173,18 +1049,11 @@ bool TTrack::InMovement() return false; }; -#ifdef EU07_USE_OLD_GROUNDCODE -void TTrack::RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined) -#else void TTrack::RaAssign( TAnimModel *am, TEvent *done, TEvent *joined ) -#endif { // Ra: wiązanie toru z modelem obrotnicy if (eType == tt_Table) { SwitchExtension->pModel = am; -#ifdef EU07_USE_OLD_GROUNDCODE - SwitchExtension->pMyNode = gn; -#endif SwitchExtension->evMinus = done; // event zakończenia animacji (zadanie nowej przedłuża) SwitchExtension->evPlus = joined; // event potwierdzenia połączenia (gdy nie znajdzie, to się nie połączy) @@ -1195,12 +1064,7 @@ void TTrack::RaAssign( TAnimModel *am, TEvent *done, TEvent *joined ) }; // wypełnianie tablic VBO - -#ifdef EU07_USE_OLD_GROUNDCODE -void TTrack::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ) { -#else void TTrack::create_geometry( geometrybank_handle const &Bank ) { -#endif // Ra: trzeba rozdzielić szyny od podsypki, aby móc grupować wg tekstur auto const fHTW = 0.5f * std::abs(fTrackWidth); auto const side = std::abs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza @@ -1245,12 +1109,6 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { normal2 = normal1; } -#ifdef EU07_USE_OLD_GROUNDCODE - if( Bank != 0 ) { - m_origin = Origin; - } -#endif - float roll1, roll2; switch (iCategoryFlag & 15) { @@ -2287,9 +2145,6 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { void TTrack::EnvironmentSet() { // ustawienie zmienionego światła -#ifdef EU07_USE_OLD_GROUNDCODE - ::glColor4f( 1.f, 1.f, 1.f, 1.f ); -#endif switch( eEnvironment ) { case e_canyon: { Global::DayLight.apply_intensity( 0.4f ); @@ -2408,11 +2263,7 @@ bool TTrack::Switch(int i, float const t, float const d) RaAnimate(); // ostatni etap animowania // zablokowanie pozycji i połączenie do sąsiednich torów // TODO: register new position of the path endpoints with the region -#ifdef EU07_USE_OLD_GROUNDCODE - Global::pGround->TrackJoin(SwitchExtension->pMyNode); -#else simulation::Region->TrackJoin( this ); -#endif if (trNext || trPrev) { fVelocity = 6.0; // jazda dozwolona @@ -2427,7 +2278,7 @@ bool TTrack::Switch(int i, float const t, float const d) } if( SwitchExtension->evPlus ) { // w starych sceneriach może nie być // potwierdzenie wykonania (np. odpala WZ) - Global::AddToQuery( SwitchExtension->evPlus, nullptr ); + simulation::Events.AddToQuery( SwitchExtension->evPlus, nullptr ); } } } @@ -2463,11 +2314,11 @@ bool TTrack::SwitchForced(int i, TDynamicObject *o) { case 0: if (SwitchExtension->evPlus) - Global::AddToQuery(SwitchExtension->evPlus, o); // dodanie do kolejki + simulation::Events.AddToQuery(SwitchExtension->evPlus, o); // dodanie do kolejki break; case 1: if (SwitchExtension->evMinus) - Global::AddToQuery(SwitchExtension->evMinus, o); // dodanie do kolejki + simulation::Events.AddToQuery(SwitchExtension->evMinus, o); // dodanie do kolejki break; } Switch(i); // jeśli się tu nie przełączy, to każdy pojazd powtórzy event rozrprucia @@ -2662,11 +2513,7 @@ TTrack * TTrack::RaAnimate() cosa = -hlen * std::cos(glm::radians(SwitchExtension->fOffset)); SwitchExtension->vTrans = ac->TransGet(); vector3 middle = -#ifdef EU07_USE_OLD_GROUNDCODE - SwitchExtension->pMyNode->pCenter + -#else location() + -#endif SwitchExtension->vTrans; // SwitchExtension->Segments[0]->FastGetPoint(0.5); Segment->Init(middle + vector3(sina, 0.0, cosa), middle - vector3(sina, 0.0, cosa), 10.0); // nowy odcinek @@ -2675,11 +2522,7 @@ TTrack * TTrack::RaAnimate() dynamic->Move( 0.000001 ); } // NOTE: passing empty handle is a bit of a hack here. could be refactored into something more elegant -#ifdef EU07_USE_OLD_GROUNDCODE - create_geometry( geometrybank_handle(), glm::dvec3() ); -#else create_geometry( geometrybank_handle() ); -#endif } // animacja trwa nadal } else @@ -2976,19 +2819,16 @@ path_table::InitTracks() { // szukamy modelu o tej samej nazwie auto *instance = simulation::Instances.find( trackname ); // wiązanie toru z modelem obrotnicy -#ifdef EU07_USE_OLD_GROUNDCODE -#else track->RaAssign( instance, simulation::Events.FindEvent( trackname + ":done" ), simulation::Events.FindEvent( trackname + ":joined" ) ); -#endif if( instance == nullptr ) { // jak nie ma modelu to pewnie jest wykolejnica, a ta jest domyślnie zamknięta i wykoleja break; } // no break on purpose: - // jak coś pójdzie źle, to robimy z tego normalny tor + // "jak coś pójdzie źle, to robimy z tego normalny tor" } case tt_Normal: { // tylko proste są podłączane do rozjazdów, stąd dwa rozjazdy się nie połączą ze sobą diff --git a/Track.h b/Track.h index 8deb6aea..23ac5c10 100644 --- a/Track.h +++ b/Track.h @@ -77,9 +77,6 @@ class TSwitchExtension { // zmienne potrzebne tylko dla obrotnicy/przesuwnicy // TAnimContainer *pAnim; //animator modelu dla obrotnicy TAnimModel *pModel; // na razie model -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode *pMyNode; // dla obrotnicy do wtórnego podłączania torów -#endif }; struct { // zmienne dla skrzyżowania @@ -89,11 +86,7 @@ class TSwitchExtension }; }; bool bMovement = false; // czy w trakcie animacji -#ifdef EU07_USE_OLD_GROUNDCODE - TSubRect *pOwner = nullptr; // sektor, któremu trzeba zgłosić animację -#else scene::basic_cell *pOwner = nullptr; // TODO: convert this to observer pattern -#endif TTrack *pNextAnim = nullptr; // następny tor do animowania TEvent *evPlus = nullptr, *evMinus = nullptr; // zdarzenia sygnalizacji rozprucia @@ -249,27 +242,13 @@ public: std::vector endpoints() const; -#ifdef EU07_USE_OLD_GROUNDCODE - void create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ); // wypełnianie VBO -#else void create_geometry( geometrybank_handle const &Bank ); // wypełnianie VBO -#endif void RenderDynSounds(); // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania -#ifdef EU07_USE_OLD_GROUNDCODE - void RaOwnerSet(TSubRect *o) { - if (SwitchExtension) - SwitchExtension->pOwner = o; }; -#else void RaOwnerSet( scene::basic_cell *o ) { if( SwitchExtension ) { SwitchExtension->pOwner = o; } }; -#endif bool InMovement(); // czy w trakcie animacji? -#ifdef EU07_USE_OLD_GROUNDCODE - void RaAssign(TGroundNode *gn, TAnimModel *am, TEvent *done, TEvent *joined); -#else void RaAssign( TAnimModel *am, TEvent *done, TEvent *joined ); -#endif void RaAnimListAdd(TTrack *t); TTrack * RaAnimate(); diff --git a/Traction.cpp b/Traction.cpp index a0739107..4cfa5053 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -14,10 +14,10 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Traction.h" + +#include "simulation.h" #include "Globals.h" #include "logs.h" -#include "mctools.h" -#include "TractionPower.h" //--------------------------------------------------------------------------- /* @@ -180,21 +180,11 @@ TTraction::endpoints() const { } std::size_t -#ifdef EU07_USE_OLD_GROUNDCODE -TTraction::create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ) { -#else TTraction::create_geometry( geometrybank_handle const &Bank ) { -#endif if( m_geometry != null_handle ) { return GfxRenderer.Vertices( m_geometry ).size() / 2; } -#ifdef EU07_USE_OLD_GROUNDCODE - if( Bank != 0 ) { - m_origin = Origin; - } -#endif - vertex_array vertices; double ddp = std::hypot( pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z ); diff --git a/Traction.h b/Traction.h index 8ec2131a..9ccbf078 100644 --- a/Traction.h +++ b/Traction.h @@ -66,11 +66,7 @@ class TTraction : public editor::basic_node { endpoints() const; // creates geometry data in specified geometry bank. returns: number of created elements, or NULL // NOTE: deleting nodes doesn't currently release geometry data owned by the node. TODO: implement erasing individual geometry chunks and banks -#ifdef EU07_USE_OLD_GROUNDCODE - std::size_t create_geometry( geometrybank_handle const &Bank, glm::dvec3 const &Origin ); // wypełnianie VBO -#else std::size_t create_geometry( geometrybank_handle const &Bank ); -#endif int TestPoint(glm::dvec3 const &Point); void Connect(int my, TTraction *with, int to); void Init(); diff --git a/TractionPower.cpp b/TractionPower.cpp index e4d60783..8513ce47 100644 --- a/TractionPower.cpp +++ b/TractionPower.cpp @@ -15,8 +15,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "TractionPower.h" + #include "Logs.h" -#include "Ground.h" //--------------------------------------------------------------------------- @@ -36,16 +36,11 @@ void TTractionPowerSource::Init(double const u, double const i) bool TTractionPowerSource::Load(cParser *parser) { -#ifdef EU07_USE_OLD_GROUNDCODE - parser->getTokens( 7, false ); - *parser -#else parser->getTokens( 10, false ); *parser >> m_area.center.x >> m_area.center.y >> m_area.center.z -#endif >> NominalVoltage >> VoltageFrequency >> InternalRes diff --git a/TrkFoll.cpp b/TrkFoll.cpp index ceddcb1c..ddfa4fee 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -15,11 +15,10 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "TrkFoll.h" + +#include "simulation.h" #include "Globals.h" #include "Logs.h" -#include "Driver.h" -#include "DynObj.h" -#include "Event.h" TTrackFollower::~TTrackFollower() { @@ -116,7 +115,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) && ( pCurrentTrack->evEvent1 ) && ( !pCurrentTrack->evEvent1->iQueued ) ) { // dodanie do kolejki - Global::AddToQuery( pCurrentTrack->evEvent1, Owner ); + simulation::Events.AddToQuery( pCurrentTrack->evEvent1, Owner ); } } } @@ -127,7 +126,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) -1)) // McZapkie-280503: wyzwalanie eventall dla wszystkich pojazdow if (bPrimary && pCurrentTrack->evEventall1 && (!pCurrentTrack->evEventall1->iQueued)) - Global::AddToQuery(pCurrentTrack->evEventall1, Owner); // dodanie do kolejki + simulation::Events.AddToQuery(pCurrentTrack->evEventall1, Owner); // dodanie do kolejki // Owner->RaAxleEvent(pCurrentTrack->Eventall1); //Ra: dynamic zdecyduje, czy dodać // do kolejki } @@ -142,7 +141,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) if( ( bPrimary ) && ( pCurrentTrack->evEvent2 ) && ( !pCurrentTrack->evEvent2->iQueued ) ) { - Global::AddToQuery( pCurrentTrack->evEvent2, Owner ); + simulation::Events.AddToQuery( pCurrentTrack->evEvent2, Owner ); } } } @@ -154,7 +153,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) if( ( bPrimary ) && ( pCurrentTrack->evEventall2 ) && ( !pCurrentTrack->evEventall2->iQueued ) ) { - Global::AddToQuery( pCurrentTrack->evEventall2, Owner ); + simulation::Events.AddToQuery( pCurrentTrack->evEventall2, Owner ); } } // Owner->RaAxleEvent(pCurrentTrack->Eventall2); //Ra: dynamic zdecyduje, czy dodać @@ -167,13 +166,13 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) // tylko dla jednego członu if( pCurrentTrack->evEvent0 ) if( !pCurrentTrack->evEvent0->iQueued ) - Global::AddToQuery( pCurrentTrack->evEvent0, Owner ); + simulation::Events.AddToQuery( pCurrentTrack->evEvent0, Owner ); } // Owner->RaAxleEvent(pCurrentTrack->Event0); //Ra: dynamic zdecyduje, czy dodać do // kolejki if (pCurrentTrack->evEventall0) if (!pCurrentTrack->evEventall0->iQueued) - Global::AddToQuery(pCurrentTrack->evEventall0, Owner); + simulation::Events.AddToQuery(pCurrentTrack->evEventall0, Owner); // Owner->RaAxleEvent(pCurrentTrack->Eventall0); //Ra: dynamic zdecyduje, czy dodać // do kolejki } @@ -275,14 +274,14 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) // if (Owner->MoverParameters->CabNo!=0) { if (pCurrentTrack->evEvent1 && pCurrentTrack->evEvent1->fDelay <= -1.0f) - Global::AddToQuery(pCurrentTrack->evEvent1, Owner); + simulation::Events.AddToQuery(pCurrentTrack->evEvent1, Owner); if (pCurrentTrack->evEvent2 && pCurrentTrack->evEvent2->fDelay <= -1.0f) - Global::AddToQuery(pCurrentTrack->evEvent2, Owner); + simulation::Events.AddToQuery(pCurrentTrack->evEvent2, Owner); } if (pCurrentTrack->evEventall1 && pCurrentTrack->evEventall1->fDelay <= -1.0f) - Global::AddToQuery(pCurrentTrack->evEventall1, Owner); + simulation::Events.AddToQuery(pCurrentTrack->evEventall1, Owner); if (pCurrentTrack->evEventall2 && pCurrentTrack->evEventall2->fDelay <= -1.0f) - Global::AddToQuery(pCurrentTrack->evEventall2, Owner); + simulation::Events.AddToQuery(pCurrentTrack->evEventall2, Owner); } fCurrentDistance = s; // fDistance=0; diff --git a/World.cpp b/World.cpp index 06be5fff..b282fb90 100644 --- a/World.cpp +++ b/World.cpp @@ -249,17 +249,7 @@ bool TWorld::Init( GLFWwindow *Window ) { GfxRenderer.Render(); WriteLog( "World setup..." ); -#ifdef EU07_USE_OLD_GROUNDCODE - if( true == Ground.Init( Global::SceneryFile ) ) { - WriteLog( "...world setup done" ); - } - else { - ErrorLog( "...world setup failed" ); - return false; - } -#else if( false == simulation::State.deserialize( Global::SceneryFile ) ) { return false; } -#endif simulation::Time.init(); @@ -269,25 +259,13 @@ bool TWorld::Init( GLFWwindow *Window ) { UILayer.set_progress( "Preparing train / Przygotowanie kabiny" ); WriteLog( "Player train init: " + Global::asHumanCtrlVehicle ); -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode *nPlayerTrain = NULL; -#else TDynamicObject *nPlayerTrain; -#endif if( Global::asHumanCtrlVehicle != "ghostview" ) -#ifdef EU07_USE_OLD_GROUNDCODE - nPlayerTrain = Ground.DynamicFind( Global::asHumanCtrlVehicle ); // szukanie w tych z obsadą -#else nPlayerTrain = simulation::Vehicles.find( Global::asHumanCtrlVehicle ); -#endif if (nPlayerTrain) { Train = new TTrain(); -#ifdef EU07_USE_OLD_GROUNDCODE - if (Train->Init(nPlayerTrain->DynamicObject)) -#else if( Train->Init( nPlayerTrain ) ) -#endif { Controlled = Train->Dynamic(); mvControlled = Controlled->ControlledFind()->MoverParameters; @@ -324,18 +302,6 @@ bool TWorld::Init( GLFWwindow *Window ) { // if (!Global::bMultiplayer) //na razie włączone { // eventy aktywowane z klawiatury tylko dla jednego użytkownika -#ifdef EU07_USE_OLD_GROUNDCODE - KeyEvents[0] = Ground.FindEvent("keyctrl00"); - KeyEvents[1] = Ground.FindEvent("keyctrl01"); - KeyEvents[2] = Ground.FindEvent("keyctrl02"); - KeyEvents[3] = Ground.FindEvent("keyctrl03"); - KeyEvents[4] = Ground.FindEvent("keyctrl04"); - KeyEvents[5] = Ground.FindEvent("keyctrl05"); - KeyEvents[6] = Ground.FindEvent("keyctrl06"); - KeyEvents[7] = Ground.FindEvent("keyctrl07"); - KeyEvents[8] = Ground.FindEvent("keyctrl08"); - KeyEvents[9] = Ground.FindEvent("keyctrl09"); -#else KeyEvents[ 0 ] = simulation::Events.FindEvent( "keyctrl00" ); KeyEvents[ 1 ] = simulation::Events.FindEvent( "keyctrl01" ); KeyEvents[ 2 ] = simulation::Events.FindEvent( "keyctrl02" ); @@ -346,7 +312,6 @@ bool TWorld::Init( GLFWwindow *Window ) { KeyEvents[ 7 ] = simulation::Events.FindEvent( "keyctrl07" ); KeyEvents[ 8 ] = simulation::Events.FindEvent( "keyctrl08" ); KeyEvents[ 9 ] = simulation::Events.FindEvent( "keyctrl09" ); -#endif } WriteLog( "Load time: " + @@ -430,15 +395,12 @@ void TWorld::OnKeyDown(int cKey) if( ( cKey >= GLFW_KEY_0 ) && ( cKey <= GLFW_KEY_9 ) ) // klawisze cyfrowe { int i = cKey - GLFW_KEY_0; // numer klawisza - if (Global::shiftState) - { // z [Shift] uruchomienie eventu - if (!Global::iPause) // podczas pauzy klawisze nie działają - if (KeyEvents[i]) -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.AddToQuery(KeyEvents[i], NULL); -#else - simulation::Events.AddToQuery( KeyEvents[ i ], NULL ); -#endif + if (Global::shiftState) { + // z [Shift] uruchomienie eventu + if( ( false == Global::iPause ) // podczas pauzy klawisze nie działają + && ( KeyEvents[ i ] != nullptr ) ) { + simulation::Events.AddToQuery( KeyEvents[ i ], NULL ); + } } else // zapamiętywanie kamery może działać podczas pauzy if (FreeFlyModeFlag) // w trybie latania można przeskakiwać do ustawionych kamer @@ -465,11 +427,6 @@ void TWorld::OnKeyDown(int cKey) } else // również przeskakiwanie { // Ra: to z tą kamerą (Camera.Pos i Global::pCameraPosition) jest trochę bez sensu -#ifdef EU07_USE_OLD_GROUNDCODE - // NOTE: does it even work? it seems to render the sounds before the camera is actually moved - // so the listener is still in range... - Ground.Silence( Global::pCameraPosition ); // wyciszenie wszystkiego z poprzedniej pozycji -#endif Global::SetCameraPosition( Global::FreeCameraInit[i] ); // nowa pozycja dla generowania obiektów Camera.Init(Global::FreeCameraInit[i], Global::FreeCameraInitAngle[i]); // przestawienie @@ -546,11 +503,8 @@ void TWorld::OnKeyDown(int cKey) break; } -#ifdef EU07_USE_OLD_GROUNDCODE - TDynamicObject *tmp = Ground.DynamicNearest( Camera.Pos, 50, true ); //łapiemy z obsadą -#else TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 50, true, false ) ); -#endif + if( ( tmp != nullptr ) && ( tmp != Controlled ) ) { @@ -695,11 +649,7 @@ void TWorld::OnKeyDown(int cKey) else if( ( cKey == GLFW_KEY_PAUSE ) && ( Global::ctrlState ) && ( Global::shiftState ) ) { //[Ctrl]+[Break] hamowanie wszystkich pojazdów w okolicy // added shift to prevent odd issue with glfw producing pause presses on its own if( Controlled->MoverParameters->Radio ) -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.RadioStop( Camera.Pos ); -#else simulation::Region->RadioStop( Camera.Pos ); -#endif } else if (!Global::iPause) //||(cKey==VK_F4)) //podczas pauzy sterownaie nie działa, F4 tak if (Train) @@ -732,15 +682,11 @@ void TWorld::OnKeyDown(int cKey) */ if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy { // zmiana próżny/ładowny; Ra: zabrane z kabiny -#ifdef EU07_USE_OLD_GROUNDCODE - TDynamicObject *temp = Global::DynamicNearest(); -#else - TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ); -#endif - if (temp) + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ) }; + if (vehicle) { - if (Global::shiftState ? temp->MoverParameters->IncBrakeMult() : - temp->MoverParameters->DecBrakeMult()) + if (Global::shiftState ? vehicle->MoverParameters->IncBrakeMult() : + vehicle->MoverParameters->DecBrakeMult()) if (Train) { // dźwięk oczywiście jest w kabinie Train->play_sound( Train->dsbSwitch ); @@ -749,31 +695,26 @@ void TWorld::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_EndSign]) { // Ra 2014-07: zabrane z kabiny -#ifdef EU07_USE_OLD_GROUNDCODE - TDynamicObject *tmp = Global::CouplerNearest(); // domyślnie wyszukuje do 20m -#else - TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, true ) ); -#endif - if (tmp) + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, true ) ) }; + if (vehicle) { - int CouplNr = (LengthSquared3(tmp->HeadPosition() - Camera.Pos) > - LengthSquared3(tmp->RearPosition() - Camera.Pos) ? + int CouplNr = (LengthSquared3(vehicle->HeadPosition() - Camera.Pos) > + LengthSquared3(vehicle->RearPosition() - Camera.Pos) ? 1 : -1) * - tmp->DirectionGet(); + vehicle->DirectionGet(); if (CouplNr < 0) CouplNr = 0; // z [-1,1] zrobić [0,1] - int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę - // tapety pulpitu :/ + int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę tapety pulpitu :/ if (Global::shiftState) // z [Shift] zapalanie - set = mask = 64; // bez [Ctrl] założyć tabliczki + set = mask = TMoverParameters::light::rearendsignals; // bez [Ctrl] założyć tabliczki else if (Global::ctrlState) - set = mask = 2 + 32; // z [Ctrl] zapalić światła czerwone + set = mask = ( TMoverParameters::light::redmarker_left | TMoverParameters::light::redmarker_right ); // z [Ctrl] zapalić światła czerwone else mask = 2 + 32 + 64; // wyłączanie ściąga wszystko - if (((tmp->iLights[CouplNr]) & mask) != set) + if (((vehicle->iLights[CouplNr]) & mask) != set) { - tmp->iLights[CouplNr] = (tmp->iLights[CouplNr] & ~mask) | set; + vehicle->iLights[CouplNr] = (vehicle->iLights[CouplNr] & ~mask) | set; if (Train) { // Ra: ten dźwięk z kabiny to przegięcie, ale na razie zostawiam Train->play_sound( Train->dsbSwitch ); @@ -783,21 +724,17 @@ void TWorld::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_IncLocalBrakeLevel]) { // zahamowanie dowolnego pojazdu -#ifdef EU07_USE_OLD_GROUNDCODE - TDynamicObject *temp = Global::DynamicNearest(); -#else - TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ); -#endif - if (temp) + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ) }; + if (vehicle) { if (Global::ctrlState) - if ((temp->MoverParameters->LocalBrake == ManualBrake) || - (temp->MoverParameters->MBrake == true)) - temp->MoverParameters->IncManualBrakeLevel(1); + if ((vehicle->MoverParameters->LocalBrake == ManualBrake) || + (vehicle->MoverParameters->MBrake == true)) + vehicle->MoverParameters->IncManualBrakeLevel(1); else ; - else if (temp->MoverParameters->LocalBrake != ManualBrake) - if (temp->MoverParameters->IncLocalBrakeLevelFAST()) + else if (vehicle->MoverParameters->LocalBrake != ManualBrake) + if (vehicle->MoverParameters->IncLocalBrakeLevelFAST()) if (Train) { // dźwięk oczywiście jest w kabinie Train->play_sound( Train->dsbPneumaticRelay ); @@ -806,21 +743,17 @@ void TWorld::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_DecLocalBrakeLevel]) { // odhamowanie dowolnego pojazdu -#ifdef EU07_USE_OLD_GROUNDCODE - TDynamicObject *temp = Global::DynamicNearest(); -#else - TDynamicObject *temp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ); -#endif - if (temp) + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ) }; + if (vehicle) { if (Global::ctrlState) - if ((temp->MoverParameters->LocalBrake == ManualBrake) || - (temp->MoverParameters->MBrake == true)) - temp->MoverParameters->DecManualBrakeLevel(1); + if ((vehicle->MoverParameters->LocalBrake == ManualBrake) || + (vehicle->MoverParameters->MBrake == true)) + vehicle->MoverParameters->DecManualBrakeLevel(1); else ; - else if (temp->MoverParameters->LocalBrake != ManualBrake) - if (temp->MoverParameters->DecLocalBrakeLevelFAST()) + else if (vehicle->MoverParameters->LocalBrake != ManualBrake) + if (vehicle->MoverParameters->DecLocalBrakeLevelFAST()) if (Train) { // dźwięk oczywiście jest w kabinie Train->play_sound( Train->dsbPneumaticRelay ); @@ -922,9 +855,6 @@ void TWorld::FollowView(bool wycisz) { if (Controlled) // jest pojazd do prowadzenia? { -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.Silence( Camera.Pos ); // wyciszenie dźwięków z poprzedniej pozycji -#endif if (FreeFlyModeFlag) { // jeżeli poza kabiną, przestawiamy w jej okolicę - OK if( Train ) { @@ -942,9 +872,7 @@ void TWorld::FollowView(bool wycisz) { if( wycisz ) { // wyciszenie dźwięków z poprzedniej pozycji // trzymanie prawego w kabinie daje marny efekt -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.Silence( Camera.Pos ); -#endif + // TODO: re-implement, old one kinda didn't really work } Camera.Pos = Train->pMechPosition; Camera.Roll = std::atan(Train->pMechShake.x * Train->fMechRoll); // hustanie kamery na boki @@ -1046,32 +974,6 @@ bool TWorld::Update() { // NOTE: experimentally changing this to prevent the desync. // TODO: test what happens if we hit more than 20 * 0.01 sec slices, i.e. less than 5 fps Timer::subsystem.sim_dynamics.start(); -#ifdef EU07_USE_OLD_GROUNDCODE - if( true == Global::FullPhysics ) { - // mixed calculation mode, steps calculated in ~0.05s chunks - while( updatecount >= 5 ) { - Ground.Update( stepdeltatime, 5 ); - updatecount -= 5; - } - if( updatecount ) { - Ground.Update( stepdeltatime, updatecount ); - } - } - else { - // simplified calculation mode; faster but can lead to errors - Ground.Update( stepdeltatime, updatecount ); - } - // yB dodał przyspieszacz fizyki - if( (true == DebugModeFlag) - && (true == Global::bActive) // nie przyspieszać, gdy jedzie w tle :) - && ( glfwGetKey( window, GLFW_KEY_PAUSE ) == GLFW_PRESS ) ) { - - Ground.Update( dt, 1 ); - Ground.Update( dt, 1 ); - Ground.Update( dt, 1 ); - Ground.Update( dt, 1 ); // 5 razy - } -#else if( true == Global::FullPhysics ) { // mixed calculation mode, steps calculated in ~0.05s chunks while( updatecount >= 5 ) { @@ -1086,7 +988,6 @@ bool TWorld::Update() { // simplified calculation mode; faster but can lead to errors simulation::State.update( stepdeltatime, updatecount ); } -#endif Timer::subsystem.sim_dynamics.stop(); // secondary fixed step simulation time routines @@ -1127,14 +1028,8 @@ bool TWorld::Update() { TSubModel::iInstance = 0; } -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.CheckQuery(); - Ground.Update_Hidden(); -#else simulation::Events.update(); simulation::Region->update(); -#endif - simulation::Lights.update(); // render time routines follow: @@ -1186,15 +1081,10 @@ TWorld::Update_Camera( double const Deltatime ) { Camera.LookAt = Controlled->GetPosition(); } else { -#ifdef EU07_USE_OLD_GROUNDCODE - TDynamicObject *d = Ground.DynamicNearest( Camera.Pos, 300 ); // szukaj w promieniu 300m - if( !d ) - d = Ground.DynamicNearest( Camera.Pos, 1000 ); // dalej szukanie, jesli bliżej nie ma -#else TDynamicObject *d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 300, false, false ) ); if( !d ) d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 1000, false, false ) ); // dalej szukanie, jesli bliżej nie ma -#endif + if( d && pDynamicNearest ) { // jeśli jakiś jest znaleziony wcześniej if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) { @@ -1328,14 +1218,10 @@ TWorld::Update_UI() { } if( ( true == Global::ControlPicking ) && ( true == FreeFlyModeFlag ) && ( true == DebugModeFlag ) ) { auto const scenerynode = GfxRenderer.Pick_Node(); -#ifdef EU07_USE_OLD_GROUNDCODE - UILayer.set_tooltip( ( scenerynode ? scenerynode->asName : "" ) ); -#else UILayer.set_tooltip( ( scenerynode ? scenerynode->name() : "" ) ); -#endif } switch( Global::iTextMode ) { @@ -1388,21 +1274,17 @@ TWorld::Update_UI() { case( GLFW_KEY_F2 ) : { // timetable - TDynamicObject *tmp = + auto *vehicle { ( FreeFlyModeFlag ? -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.DynamicNearest( Camera.Pos ) : -#else - std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : -#endif - Controlled ); // w trybie latania lokalizujemy wg mapy + std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : + Controlled ) }; // w trybie latania lokalizujemy wg mapy - if( tmp == nullptr ) { break; } + if( vehicle == nullptr ) { break; } // if the nearest located vehicle doesn't have a direct driver, try to query its owner auto const owner = ( - ( ( tmp->Mechanik != nullptr ) && ( tmp->Mechanik->Primary() ) ) ? - tmp->Mechanik : - tmp->ctOwner ); + ( ( vehicle->Mechanik != nullptr ) && ( vehicle->Mechanik->Primary() ) ) ? + vehicle->Mechanik : + vehicle->ctOwner ); if( owner == nullptr ){ break; } auto const table = owner->Timetable(); @@ -1473,53 +1355,48 @@ TWorld::Update_UI() { case( GLFW_KEY_F3 ) : { - TDynamicObject *tmp = + auto *vehicle{ ( FreeFlyModeFlag ? -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.DynamicNearest( Camera.Pos ) : -#else std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : -#endif - Controlled ); // w trybie latania lokalizujemy wg mapy + Controlled ) }; // w trybie latania lokalizujemy wg mapy - if( tmp != nullptr ) { - // + if( vehicle != nullptr ) { // jeśli domyślny ekran po pierwszym naciśnięciu - uitextline1 = "Vehicle name: " + tmp->MoverParameters->Name; + uitextline1 = "Vehicle name: " + vehicle->MoverParameters->Name; - if( ( tmp->Mechanik == nullptr ) && ( tmp->ctOwner ) ) { + if( ( vehicle->Mechanik == nullptr ) && ( vehicle->ctOwner ) ) { // for cars other than leading unit indicate the leader - uitextline1 += ", owned by " + tmp->ctOwner->OwnerName(); + uitextline1 += ", owned by " + vehicle->ctOwner->OwnerName(); } - uitextline1 += "; Status: " + tmp->MoverParameters->EngineDescription( 0 ); + uitextline1 += "; Status: " + vehicle->MoverParameters->EngineDescription( 0 ); // informacja o sprzęgach uitextline1 += "; C0:" + - ( tmp->PrevConnected ? - tmp->PrevConnected->name() + ":" + to_string( tmp->MoverParameters->Couplers[ 0 ].CouplingFlag ) + ( - tmp->MoverParameters->Couplers[ 0 ].CouplingFlag == 0 ? - " (" + to_string( tmp->MoverParameters->Couplers[ 0 ].CoupleDist, 1 ) + " m)" : + ( vehicle->PrevConnected ? + vehicle->PrevConnected->name() + ":" + to_string( vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag ) + ( + vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag == 0 ? + " (" + to_string( vehicle->MoverParameters->Couplers[ 0 ].CoupleDist, 1 ) + " m)" : "" ) : "none" ); uitextline1 += " C1:" + - ( tmp->NextConnected ? - tmp->NextConnected->name() + ":" + to_string( tmp->MoverParameters->Couplers[ 1 ].CouplingFlag ) + ( - tmp->MoverParameters->Couplers[ 1 ].CouplingFlag == 0 ? - " (" + to_string( tmp->MoverParameters->Couplers[ 1 ].CoupleDist, 1 ) + " m)" : + ( vehicle->NextConnected ? + vehicle->NextConnected->name() + ":" + to_string( vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag ) + ( + vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag == 0 ? + " (" + to_string( vehicle->MoverParameters->Couplers[ 1 ].CoupleDist, 1 ) + " m)" : "" ) : "none" ); // equipment flags - uitextline2 = ( tmp->MoverParameters->Battery ? "B" : "." ); - uitextline2 += ( tmp->MoverParameters->Mains ? "M" : "." ); - uitextline2 += ( tmp->MoverParameters->PantRearUp ? ( tmp->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; - uitextline2 += ( tmp->MoverParameters->PantFrontUp ? ( tmp->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; - uitextline2 += ( tmp->MoverParameters->PantPressLockActive ? "!" : ( tmp->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); - uitextline2 += ( false == tmp->MoverParameters->ConverterAllowLocal ? "-" : ( tmp->MoverParameters->ConverterAllow ? ( tmp->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); - uitextline2 += ( tmp->MoverParameters->ConvOvldFlag ? "!" : "." ); - uitextline2 += ( false == tmp->MoverParameters->CompressorAllowLocal ? "-" : ( tmp->MoverParameters->CompressorAllow ? ( tmp->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); - uitextline2 += ( tmp->MoverParameters->CompressorGovernorLock ? "!" : "." ); + uitextline2 = ( vehicle->MoverParameters->Battery ? "B" : "." ); + uitextline2 += ( vehicle->MoverParameters->Mains ? "M" : "." ); + uitextline2 += ( vehicle->MoverParameters->PantRearUp ? ( vehicle->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; + uitextline2 += ( vehicle->MoverParameters->PantFrontUp ? ( vehicle->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; + uitextline2 += ( vehicle->MoverParameters->PantPressLockActive ? "!" : ( vehicle->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); + uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); + uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); + uitextline2 += ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( vehicle->MoverParameters->CompressorAllow ? ( vehicle->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); + uitextline2 += ( vehicle->MoverParameters->CompressorGovernorLock ? "!" : "." ); /* uitextline2 += " AnlgB: " + to_string( tmp->MoverParameters->AnPos, 1 ) @@ -1527,72 +1404,72 @@ TWorld::Update_UI() { + to_string( tmp->MoverParameters->LocalBrakePosA, 1 ) */ uitextline2 += " Bdelay: "; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) + if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) uitextline2 += "G"; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) + if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) uitextline2 += "P"; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) + if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) uitextline2 += "R"; - if( ( tmp->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) + if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) uitextline2 += "+Mg"; - uitextline2 += ", Load: " + to_string( tmp->MoverParameters->LoadFlag, 0 ); + uitextline2 += ", Load: " + to_string( vehicle->MoverParameters->LoadFlag, 0 ); uitextline2 += "; Pant: " - + to_string( tmp->MoverParameters->PantPress, 2 ) - + ( tmp->MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" ); + + to_string( vehicle->MoverParameters->PantPress, 2 ) + + ( vehicle->MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" ); uitextline2 += - "; Ft: " + to_string( tmp->MoverParameters->Ft * 0.001f * tmp->MoverParameters->ActiveCab, 1 ) - + ", Fb: " + to_string( tmp->MoverParameters->Fb * 0.001f, 1 ) - + ", Fr: " + to_string( tmp->MoverParameters->RunningTrack.friction, 2 ) - + ( tmp->MoverParameters->SlippingWheels ? " (!)" : "" ); + "; Ft: " + to_string( vehicle->MoverParameters->Ft * 0.001f * vehicle->MoverParameters->ActiveCab, 1 ) + + ", Fb: " + to_string( vehicle->MoverParameters->Fb * 0.001f, 1 ) + + ", Fr: " + to_string( vehicle->MoverParameters->RunningTrack.friction, 2 ) + + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : "" ); - if( tmp->Mechanik ) { - uitextline2 += "; Ag: " + to_string( tmp->Mechanik->fAccGravity, 2 ); + if( vehicle->Mechanik ) { + uitextline2 += "; Ag: " + to_string( vehicle->Mechanik->fAccGravity, 2 ); } uitextline2 += "; TC:" - + to_string( tmp->MoverParameters->TotalCurrent, 0 ); + + to_string( vehicle->MoverParameters->TotalCurrent, 0 ); auto const frontcouplerhighvoltage = - to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.voltage, 0 ) + to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.voltage, 0 ) + "@" - + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.current, 0 ); + + to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.current, 0 ); auto const rearcouplerhighvoltage = - to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.voltage, 0 ) + to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.voltage, 0 ) + "@" - + to_string( tmp->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.current, 0 ); + + to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.current, 0 ); uitextline2 += ", HV: "; - if( tmp->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.local == false ) { + if( vehicle->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.local == false ) { uitextline2 += "(" + frontcouplerhighvoltage + ")-" - + ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:" + + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" + "-(" + rearcouplerhighvoltage + ")"; } else { uitextline2 += frontcouplerhighvoltage - + ":F" + ( tmp->DirectionGet() ? "<<" : ">>" ) + "R:" + + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" + rearcouplerhighvoltage; } uitextline3 += - "TrB: " + to_string( tmp->MoverParameters->BrakePress, 2 ) - + ", " + to_hex_str( tmp->MoverParameters->Hamulec->GetBrakeStatus(), 2 ); + "TrB: " + to_string( vehicle->MoverParameters->BrakePress, 2 ) + + ", " + to_hex_str( vehicle->MoverParameters->Hamulec->GetBrakeStatus(), 2 ); uitextline3 += - "; LcB: " + to_string( tmp->MoverParameters->LocBrakePress, 2 ) - + "; pipes: " + to_string( tmp->MoverParameters->PipePress, 2 ) - + "/" + to_string( tmp->MoverParameters->ScndPipePress, 2 ) - + "/" + to_string( tmp->MoverParameters->EqvtPipePress, 2 ) - + ", MT: " + to_string( tmp->MoverParameters->CompressedVolume, 3 ) - + ", BT: " + to_string( tmp->MoverParameters->Volume, 3 ) - + ", CtlP: " + to_string( tmp->MoverParameters->CntrlPipePress, 3 ) - + ", CtlT: " + to_string( tmp->MoverParameters->Hamulec->GetCRP(), 3 ); + "; LcB: " + to_string( vehicle->MoverParameters->LocBrakePress, 2 ) + + "; pipes: " + to_string( vehicle->MoverParameters->PipePress, 2 ) + + "/" + to_string( vehicle->MoverParameters->ScndPipePress, 2 ) + + "/" + to_string( vehicle->MoverParameters->EqvtPipePress, 2 ) + + ", MT: " + to_string( vehicle->MoverParameters->CompressedVolume, 3 ) + + ", BT: " + to_string( vehicle->MoverParameters->Volume, 3 ) + + ", CtlP: " + to_string( vehicle->MoverParameters->CntrlPipePress, 3 ) + + ", CtlT: " + to_string( vehicle->MoverParameters->Hamulec->GetCRP(), 3 ); - if( tmp->MoverParameters->ManualBrakePos > 0 ) { + if( vehicle->MoverParameters->ManualBrakePos > 0 ) { uitextline3 += "; manual brake on"; } @@ -1606,51 +1483,51 @@ TWorld::Update_UI() { uitextline3 += ", local brake off"; } */ - if( tmp->Mechanik ) { + if( vehicle->Mechanik ) { // o ile jest ktoś w środku std::string flags = "cpapcplhhndoiefgvdpseil "; // flagi AI (definicja w Driver.h) for( int i = 0, j = 1; i < 23; ++i, j <<= 1 ) - if( false == ( tmp->Mechanik->DrivigFlags() & j ) ) // jak bit ustawiony + if( false == ( vehicle->Mechanik->DrivigFlags() & j ) ) // jak bit ustawiony flags[ i ] = '.';// std::toupper( flags[ i ] ); // ^= 0x20; // to zmiana na wielką literę uitextline4 = flags; uitextline4 += - "Driver: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) - + " Ad=" + to_string( tmp->Mechanik->AccDesired, 2 ) - + " Ah=" + to_string( tmp->Mechanik->fAccThreshold, 2 ) - + "@" + to_string( tmp->Mechanik->fBrake_a0[0], 2 ) - + "+" + to_string( tmp->Mechanik->fBrake_a1[0], 2 ) - + " Bd=" + to_string( tmp->Mechanik->fBrakeDist, 0 ) - + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ) - + " VSl=" + to_string( tmp->Mechanik->VelSignalLast, 0 ) - + " VLl=" + to_string( tmp->Mechanik->VelLimitLast, 0 ) - + " VRd=" + to_string( tmp->Mechanik->VelRoad, 0 ); + "Driver: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) + + " Ad=" + to_string( vehicle->Mechanik->AccDesired, 2 ) + + " Ah=" + to_string( vehicle->Mechanik->fAccThreshold, 2 ) + + "@" + to_string( vehicle->Mechanik->fBrake_a0[0], 2 ) + + "+" + to_string( vehicle->Mechanik->fBrake_a1[0], 2 ) + + " Bd=" + to_string( vehicle->Mechanik->fBrakeDist, 0 ) + + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ) + + " VSl=" + to_string( vehicle->Mechanik->VelSignalLast, 0 ) + + " VLl=" + to_string( vehicle->Mechanik->VelLimitLast, 0 ) + + " VRd=" + to_string( vehicle->Mechanik->VelRoad, 0 ); - if( ( tmp->Mechanik->VelNext == 0.0 ) - && ( tmp->Mechanik->eSignNext ) ) { + if( ( vehicle->Mechanik->VelNext == 0.0 ) + && ( vehicle->Mechanik->eSignNext ) ) { // jeśli ma zapamiętany event semafora, nazwa eventu semafora uitextline4 += " (" - + Global::Bezogonkow( tmp->Mechanik->eSignNext->asName ) + + Global::Bezogonkow( vehicle->Mechanik->eSignNext->asName ) + ")"; } // biezaca komenda dla AI - uitextline4 += ", command: " + tmp->Mechanik->OrderCurrent(); + uitextline4 += ", command: " + vehicle->Mechanik->OrderCurrent(); } if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { // f2 screen, track scan mode - if( tmp->Mechanik == nullptr ) { + if( vehicle->Mechanik == nullptr ) { //żeby była tabelka, musi być AI break; } - std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( tmp->Mechanik->TableSize() ) - 1, 0, 30 ); + std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( vehicle->Mechanik->TableSize() ) - 1, 0, 30 ); do { - std::string scanline = tmp->Mechanik->TableText( i ); + std::string scanline = vehicle->Mechanik->TableText( i ); if( scanline.empty() ) { break; } UITable->text_lines.emplace_back( Global::Bezogonkow( scanline ), Global::UITextColor ); ++i; @@ -1741,68 +1618,64 @@ TWorld::Update_UI() { // ... unless we're in debug mode if( DebugModeFlag ) { - TDynamicObject *tmp = + auto *vehicle { ( FreeFlyModeFlag ? -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.DynamicNearest( Camera.Pos ) : -#else std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : -#endif - Controlled ); // w trybie latania lokalizujemy wg mapy - if( tmp == nullptr ) { + Controlled ) }; // w trybie latania lokalizujemy wg mapy + if( vehicle == nullptr ) { break; } uitextline1 = - "vel: " + to_string( tmp->GetVelocity(), 2 ) + " km/h" + ( tmp->MoverParameters->SlippingWheels ? " (!)" : "" ) - + "; dist: " + to_string( tmp->MoverParameters->DistCounter, 2 ) + " km" + "vel: " + to_string( vehicle->GetVelocity(), 2 ) + " km/h" + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : "" ) + + "; dist: " + to_string( vehicle->MoverParameters->DistCounter, 2 ) + " km" + "; pos: (" - + to_string( tmp->GetPosition().x, 2 ) + ", " - + to_string( tmp->GetPosition().y, 2 ) + ", " - + to_string( tmp->GetPosition().z, 2 ) + + to_string( vehicle->GetPosition().x, 2 ) + ", " + + to_string( vehicle->GetPosition().y, 2 ) + ", " + + to_string( vehicle->GetPosition().z, 2 ) + ")"; uitextline2 = - "HamZ=" + to_string( tmp->MoverParameters->fBrakeCtrlPos, 2 ) - + "; HamP=" + std::to_string( tmp->MoverParameters->LocalBrakePos ) + "/" + to_string( tmp->MoverParameters->LocalBrakePosA, 2 ) - + "; NasJ=" + std::to_string( tmp->MoverParameters->MainCtrlPos ) + "(" + std::to_string( tmp->MoverParameters->MainCtrlActualPos ) + ")" - + "; NasB=" + std::to_string( tmp->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( tmp->MoverParameters->ScndCtrlActualPos ) + ")" + "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) + + "; HamP=" + std::to_string( vehicle->MoverParameters->LocalBrakePos ) + "/" + to_string( vehicle->MoverParameters->LocalBrakePosA, 2 ) + + "; NasJ=" + std::to_string( vehicle->MoverParameters->MainCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->MainCtrlActualPos ) + ")" + + "; NasB=" + std::to_string( vehicle->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->ScndCtrlActualPos ) + ")" + "; I=" + - ( tmp->MoverParameters->TrainType == dt_EZT ? - std::to_string( int( tmp->MoverParameters->ShowCurrent( 0 ) ) ) : - std::to_string( int( tmp->MoverParameters->Im ) ) ) - + "; U=" + to_string( int( tmp->MoverParameters->RunningTraction.TractionVoltage + 0.5 ) ) + ( vehicle->MoverParameters->TrainType == dt_EZT ? + std::to_string( int( vehicle->MoverParameters->ShowCurrent( 0 ) ) ) : + std::to_string( int( vehicle->MoverParameters->Im ) ) ) + + "; U=" + to_string( int( vehicle->MoverParameters->RunningTraction.TractionVoltage + 0.5 ) ) + "; R=" + - ( std::abs( tmp->MoverParameters->RunningShape.R ) > 10000.0 ? + ( std::abs( vehicle->MoverParameters->RunningShape.R ) > 10000.0 ? "~0.0" : - to_string( tmp->MoverParameters->RunningShape.R, 1 ) ) - + " An=" + to_string( tmp->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne + to_string( vehicle->MoverParameters->RunningShape.R, 1 ) ) + + " An=" + to_string( vehicle->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne if( tprev != simulation::Time.data().wSecond ) { tprev = simulation::Time.data().wSecond; - Acc = ( tmp->MoverParameters->Vel - VelPrev ) / 3.6; - VelPrev = tmp->MoverParameters->Vel; + Acc = ( vehicle->MoverParameters->Vel - VelPrev ) / 3.6; + VelPrev = vehicle->MoverParameters->Vel; } uitextline2 += ( "; As=" ) + to_string( Acc, 2 ); // przyspieszenie wzdłużne uitextline3 = - "cyl.ham. " + to_string( tmp->MoverParameters->BrakePress, 2 ) - + "; prz.gl. " + to_string( tmp->MoverParameters->PipePress, 2 ) - + "; zb.gl. " + to_string( tmp->MoverParameters->CompressedVolume, 2 ) + "cyl.ham. " + to_string( vehicle->MoverParameters->BrakePress, 2 ) + + "; prz.gl. " + to_string( vehicle->MoverParameters->PipePress, 2 ) + + "; zb.gl. " + to_string( vehicle->MoverParameters->CompressedVolume, 2 ) // youBy - drugi wezyk - + "; p.zas. " + to_string( tmp->MoverParameters->ScndPipePress, 2 ); + + "; p.zas. " + to_string( vehicle->MoverParameters->ScndPipePress, 2 ); // McZapkie: warto wiedziec w jakim stanie sa przelaczniki - if( tmp->MoverParameters->ConvOvldFlag ) + if( vehicle->MoverParameters->ConvOvldFlag ) uitextline3 += " C! "; - else if( tmp->MoverParameters->FuseFlag ) + else if( vehicle->MoverParameters->FuseFlag ) uitextline3 += " F! "; - else if( !tmp->MoverParameters->Mains ) + else if( !vehicle->MoverParameters->Mains ) uitextline3 += " () "; else { switch( - tmp->MoverParameters->ActiveDir * - ( tmp->MoverParameters->Imin == tmp->MoverParameters->IminLo ? + vehicle->MoverParameters->ActiveDir * + ( vehicle->MoverParameters->Imin == vehicle->MoverParameters->IminLo ? 1 : 2 ) ) { case 2: { uitextline3 += " >> "; break; } @@ -1813,50 +1686,50 @@ TWorld::Update_UI() { } } // McZapkie: predkosc szlakowa - if( tmp->MoverParameters->RunningTrack.Velmax == -1 ) { + if( vehicle->MoverParameters->RunningTrack.Velmax == -1 ) { uitextline3 += " Vtrack=Vmax"; } else { - uitextline3 += " Vtrack " + to_string( tmp->MoverParameters->RunningTrack.Velmax, 2 ); + uitextline3 += " Vtrack " + to_string( vehicle->MoverParameters->RunningTrack.Velmax, 2 ); } - if( ( tmp->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) - || ( tmp->MoverParameters->TrainType == dt_EZT ) ) { + if( ( vehicle->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) + || ( vehicle->MoverParameters->TrainType == dt_EZT ) ) { uitextline3 += - "; pant. " + to_string( tmp->MoverParameters->PantPress, 2 ) - + ( tmp->MoverParameters->bPantKurek3 ? "=" : "^" ) + "ZG"; + "; pant. " + to_string( vehicle->MoverParameters->PantPress, 2 ) + + ( vehicle->MoverParameters->bPantKurek3 ? "=" : "^" ) + "ZG"; } // McZapkie: komenda i jej parametry - if( tmp->MoverParameters->CommandIn.Command != ( "" ) ) { + if( vehicle->MoverParameters->CommandIn.Command != ( "" ) ) { uitextline4 = - "C:" + tmp->MoverParameters->CommandIn.Command - + " V1=" + to_string( tmp->MoverParameters->CommandIn.Value1, 0 ) - + " V2=" + to_string( tmp->MoverParameters->CommandIn.Value2, 0 ); + "C:" + vehicle->MoverParameters->CommandIn.Command + + " V1=" + to_string( vehicle->MoverParameters->CommandIn.Value1, 0 ) + + " V2=" + to_string( vehicle->MoverParameters->CommandIn.Value2, 0 ); } - if( ( tmp->Mechanik ) - && ( tmp->Mechanik->AIControllFlag == AIdriver ) ) { + if( ( vehicle->Mechanik ) + && ( vehicle->Mechanik->AIControllFlag == AIdriver ) ) { uitextline4 += - "AI: Vd=" + to_string( tmp->Mechanik->VelDesired, 0 ) - + " ad=" + to_string(tmp->Mechanik->AccDesired, 2) - + "/" + to_string(tmp->Mechanik->AccDesired*tmp->Mechanik->BrakeAccFactor(), 2) - + " atrain=" + to_string(tmp->Mechanik->fBrake_a0[0], 2) - + "+" + to_string(tmp->Mechanik->fBrake_a1[0], 2) - + " aS=" + to_string(tmp->Mechanik->AbsAccS_pub, 2) - + " Pd=" + to_string( tmp->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( tmp->Mechanik->VelNext, 0 ); + "AI: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) + + " ad=" + to_string(vehicle->Mechanik->AccDesired, 2) + + "/" + to_string(vehicle->Mechanik->AccDesired*vehicle->Mechanik->BrakeAccFactor(), 2) + + " atrain=" + to_string(vehicle->Mechanik->fBrake_a0[0], 2) + + "+" + to_string(vehicle->Mechanik->fBrake_a1[0], 2) + + " aS=" + to_string(vehicle->Mechanik->AbsAccS_pub, 2) + + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ); } // induction motor data - if( tmp->MoverParameters->EngineType == ElectricInductionMotor ) { + if( vehicle->MoverParameters->EngineType == ElectricInductionMotor ) { UITable->text_lines.emplace_back( " eimc: eimv: press:", Global::UITextColor ); for( int i = 0; i <= 20; ++i ) { std::string parameters = - tmp->MoverParameters->eimc_labels[ i ] + to_string( tmp->MoverParameters->eimc[ i ], 2, 9 ) + vehicle->MoverParameters->eimc_labels[ i ] + to_string( vehicle->MoverParameters->eimc[ i ], 2, 9 ) + " | " - + tmp->MoverParameters->eimv_labels[ i ] + to_string( tmp->MoverParameters->eimv[ i ], 2, 9 ); + + vehicle->MoverParameters->eimv_labels[ i ] + to_string( vehicle->MoverParameters->eimv[ i ], 2, 9 ); if( i < 10 ) { parameters += " | " + Train->fPress_labels[i] + to_string( Train->fPress[ i ][ 0 ], 2, 9 ); @@ -1865,7 +1738,7 @@ TWorld::Update_UI() { parameters += " med:"; } else if( i >= 13 ) { - parameters += " | " + tmp->MED_labels[ i - 13 ] + to_string( tmp->MED[ 0 ][ i - 13 ], 2, 9 ); + parameters += " | " + vehicle->MED_labels[ i - 13 ] + to_string( vehicle->MED[ 0 ][ i - 13 ], 2, 9 ); } UITable->text_lines.emplace_back( parameters, Global::UITextColor ); @@ -1938,16 +1811,7 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) // event CommLog( Now() + " " + std::to_string( pRozkaz->iComm ) + " " + std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) + " rcvd" ); -#ifdef EU07_USE_OLD_GROUNDCODE - if( Global::iMultiplayer ) { - TEvent *e = Ground.FindEvent( - std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); - if( e ) - if( ( e->Type == tp_Multiple ) || ( e->Type == tp_Lights ) || - ( e->evJoined != 0 ) ) // tylko jawne albo niejawne Multiple - Ground.AddToQuery( e, NULL ); // drugi parametr to dynamic wywołujący - tu brak - } -#else + if( Global::iMultiplayer ) { auto *event = simulation::Events.FindEvent( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); if( event != nullptr ) { @@ -1959,31 +1823,16 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) } } } -#endif break; } case 3: // rozkaz dla AI if (Global::iMultiplayer) { - int i = - int(pRozkaz->cString[8]); // długość pierwszego łańcucha (z przodu dwa floaty) + int i = int(pRozkaz->cString[8]); // długość pierwszego łańcucha (z przodu dwa floaty) CommLog( Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 11 + i, (unsigned)(pRozkaz->cString[10 + i])) + " rcvd"); -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode *t = Ground.DynamicFind( - std::string(pRozkaz->cString + 11 + i, - (unsigned)pRozkaz->cString[10 + i])); // nazwa pojazdu jest druga - if (t) - if (t->DynamicObject->Mechanik) - { - t->DynamicObject->Mechanik->PutCommand(std::string(pRozkaz->cString + 9, i), - pRozkaz->fPar[0], pRozkaz->fPar[1], - NULL, stopExt); // floaty są z przodu - WriteLog("AI command: " + std::string(pRozkaz->cString + 9, i)); - } -#else // nazwa pojazdu jest druga auto *vehicle = simulation::Vehicles.find( { pRozkaz->cString + 11 + i, (unsigned)pRozkaz->cString[ 10 + i ] } ); if( ( vehicle != nullptr ) @@ -1995,25 +1844,18 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) stopExt ); // floaty są z przodu WriteLog("AI command: " + std::string(pRozkaz->cString + 9, i)); } -#endif } break; case 4: // badanie zajętości toru { CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode *t = Ground.FindGroundNode( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ), TP_TRACK ); - if (t) - if (t->pTrack->IsEmpty()) - multiplayer::WyslijWolny(t->asName); -#else + auto *track = simulation::Paths.find( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); if( ( track != nullptr ) && ( track->IsEmpty() ) ) { multiplayer::WyslijWolny( track->name() ); } -#endif } break; case 5: // ustawienie parametrów @@ -2046,18 +1888,6 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) + " rcvd" ); if (pRozkaz->cString[0]) { // jeśli długość nazwy jest niezerowa szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #7 -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode *t; - if (pRozkaz->cString[1] == '*') - t = Ground.DynamicFind( - Global::asHumanCtrlVehicle); // nazwa pojazdu użytkownika - else - t = Ground.DynamicFindAny(std::string( - pRozkaz->cString + 1, (unsigned)pRozkaz->cString[0])); // nazwa pojazdu - if (t) - multiplayer::WyslijNamiary(t); // wysłanie informacji o pojeździe -#else - // TODO: re-enable when messaging component is in place auto *vehicle = ( pRozkaz->cString[ 1 ] == '*' ? simulation::Vehicles.find( Global::asHumanCtrlVehicle ) : @@ -2065,42 +1895,25 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) if( vehicle != nullptr ) { multiplayer::WyslijNamiary( vehicle ); // wysłanie informacji o pojeździe } -#endif } else { // dla pustego wysyłamy ramki 6 z nazwami pojazdów AI (jeśli potrzebne wszystkie, to rozpoznać np. "*") -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.DynamicList(); -#else simulation::Vehicles.DynamicList(); -#endif } } break; case 8: // ponowne wysłanie informacji o zajętych odcinkach toru CommLog(Now() + " " + to_string(pRozkaz->iComm) + " all busy track" + " rcvd"); -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.TrackBusyList(); -#else simulation::Paths.TrackBusyList(); -#endif break; case 9: // ponowne wysłanie informacji o zajętych odcinkach izolowanych CommLog(Now() + " " + to_string(pRozkaz->iComm) + " all busy isolated" + " rcvd"); -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.IsolatedBusyList(); -#else simulation::Paths.IsolatedBusyList(); -#endif break; case 10: // badanie zajętości jednego odcinka izolowanego CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); -#ifdef EU07_USE_OLD_GROUNDCODE - Ground.IsolatedBusy(std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0]))); -#else simulation::Paths.IsolatedBusy( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); -#endif break; case 11: // ustawienie parametrów ruchu pojazdu // Ground.IsolatedBusy(AnsiString(pRozkaz->cString+1,(unsigned)(pRozkaz->cString[0]))); @@ -2111,56 +1924,31 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) // Ground.IsolatedBusy(AnsiString(pRozkaz->cString+1,(unsigned)(pRozkaz->cString[0]))); break; case 13: // ramka uszkodzenia i innych stanow pojazdu, np. wylaczenie CA, wlaczenie recznego itd. - CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + - std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + - " rcvd"); -#ifdef EU07_USE_OLD_GROUNDCODE - if( pRozkaz->cString[ 1 ] ) // jeśli długość nazwy jest niezerowa - { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #13 - TGroundNode *t; - if( pRozkaz->cString[ 2 ] == '*' ) - t = Ground.DynamicFind( - Global::asHumanCtrlVehicle ); // nazwa pojazdu użytkownika - else - t = Ground.DynamicFindAny( - std::string( pRozkaz->cString + 2, - (unsigned)pRozkaz->cString[ 1 ] ) ); // nazwa pojazdu - if( t ) { - TDynamicObject *d = t->DynamicObject; - while( d ) { - d->Damage( pRozkaz->cString[ 0 ] ); - d = d->Next(); // pozostałe też - } - d = t->DynamicObject->Prev(); - while( d ) { - d->Damage( pRozkaz->cString[ 0 ] ); - d = d->Prev(); // w drugą stronę też - } - multiplayer::WyslijUszkodzenia( t->asName, t->DynamicObject->MoverParameters->EngDmgFlag ); // zwrot informacji o pojeździe - } - } -#else - if( pRozkaz->cString[ 1 ] ) // jeśli długość nazwy jest niezerowa - { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #13 - auto *lookup = ( - pRozkaz->cString[ 2 ] == '*' ? - simulation::Vehicles.find( Global::asHumanCtrlVehicle ) : // nazwa pojazdu użytkownika - simulation::Vehicles.find( std::string( pRozkaz->cString + 2, (unsigned)pRozkaz->cString[ 1 ] ) ) ); // nazwa pojazdu - if( lookup == nullptr ) { break; } // nothing found, nothing to do - auto *d { lookup }; - while( d != nullptr ) { - d->Damage( pRozkaz->cString[ 0 ] ); - d = d->Next(); // pozostałe też - } - d = lookup->Prev(); - while( d != nullptr ) { - d->Damage( pRozkaz->cString[ 0 ] ); - d = d->Prev(); // w drugą stronę też - } - multiplayer::WyslijUszkodzenia( lookup->asName, lookup->MoverParameters->EngDmgFlag ); // zwrot informacji o pojeździe - } -#endif + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + + " rcvd"); + if( pRozkaz->cString[ 1 ] ) // jeśli długość nazwy jest niezerowa + { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #13 + auto *lookup = ( + pRozkaz->cString[ 2 ] == '*' ? + simulation::Vehicles.find( Global::asHumanCtrlVehicle ) : // nazwa pojazdu użytkownika + simulation::Vehicles.find( std::string( pRozkaz->cString + 2, (unsigned)pRozkaz->cString[ 1 ] ) ) ); // nazwa pojazdu + if( lookup == nullptr ) { break; } // nothing found, nothing to do + auto *d { lookup }; + while( d != nullptr ) { + d->Damage( pRozkaz->cString[ 0 ] ); + d = d->Next(); // pozostałe też + } + d = lookup->Prev(); + while( d != nullptr ) { + d->Damage( pRozkaz->cString[ 0 ] ); + d = d->Prev(); // w drugą stronę też + } + multiplayer::WyslijUszkodzenia( lookup->asName, lookup->MoverParameters->EngDmgFlag ); // zwrot informacji o pojeździe + } break; + default: + break; } }; @@ -2207,10 +1995,9 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic) shift += 10.0; // następny tor będzie deczko dalej, aby nie zabić FPS at = 400.0; } - TGroundNode *tmp = new TGroundNode(); - tmp->DynamicObject = new TDynamicObject(); + auto *dynamic = new TDynamicObject(); - at -= tmp->DynamicObject->Init( + at -= dynamic->Init( "", Path.substr( 8, Path.size() - 9 ), // skip leading "dynamic/" and trailing slash "none", @@ -2220,7 +2007,7 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic) "nobody", 0.0, "none", 0.0, "", false, "" ); // po wczytaniu CHK zrobić pętlę po ładunkach, aby każdy z nich skonwertować - cParser loadparser( tmp->DynamicObject->MoverParameters->LoadAccepted ); // typy ładunków + cParser loadparser( dynamic->MoverParameters->LoadAccepted ); // typy ładunków std::string loadname; loadparser.getTokens( 1, true, "," ); loadparser >> loadname; while( loadname != "" ) { @@ -2228,7 +2015,7 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic) if( ( true == FileExists( Path + loadname + ".t3d" ) ) && ( false == FileExists( Path + loadname + ".e3d" ) ) ) { // a nie ma jeszcze odpowiednika binarnego - at -= tmp->DynamicObject->Init( + at -= dynamic->Init( "", Path.substr( 8, Path.size() - 9 ), // skip leading "dynamic/" and trailing slash "none", @@ -2242,20 +2029,20 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic) loadparser.getTokens( 1, true, "," ); loadparser >> loadname; } - if( tmp->DynamicObject->iCabs ) { // jeśli ma jakąkolwiek kabinę + if( dynamic->iCabs ) { // jeśli ma jakąkolwiek kabinę delete Train; Train = new TTrain(); - if( tmp->DynamicObject->iCabs & 1 ) { - tmp->DynamicObject->MoverParameters->ActiveCab = 1; - Train->Init( tmp->DynamicObject, true ); + if( dynamic->iCabs & 1 ) { + dynamic->MoverParameters->ActiveCab = 1; + Train->Init( dynamic, true ); } - if( tmp->DynamicObject->iCabs & 4 ) { - tmp->DynamicObject->MoverParameters->ActiveCab = -1; - Train->Init( tmp->DynamicObject, true ); + if( dynamic->iCabs & 4 ) { + dynamic->MoverParameters->ActiveCab = -1; + Train->Init( dynamic, true ); } - if( tmp->DynamicObject->iCabs & 2 ) { - tmp->DynamicObject->MoverParameters->ActiveCab = 0; - Train->Init( tmp->DynamicObject, true ); + if( dynamic->iCabs & 2 ) { + dynamic->MoverParameters->ActiveCab = 0; + Train->Init( dynamic, true ); } } // z powrotem defaultowa sciezka do tekstur diff --git a/World.h b/World.h index bd366f8c..9acc2581 100644 --- a/World.h +++ b/World.h @@ -13,7 +13,6 @@ http://mozilla.org/MPL/2.0/. #include #include "Camera.h" -#include "Ground.h" #include "scene.h" #include "sky.h" #include "sun.h" @@ -125,9 +124,6 @@ private: TCamera Camera; TCamera DebugCamera; -#ifdef EU07_USE_OLD_GROUNDCODE - TGround Ground; -#endif world_environment Environment; TTrain *Train; TDynamicObject *pDynamicNearest; diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index ab330c49..5deecf08 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -72,9 +72,6 @@ Source Files - - Source Files - Source Files @@ -278,9 +275,6 @@ Header Files - - Header Files - Header Files diff --git a/messaging.cpp b/messaging.cpp index 94781707..2cab175e 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -12,7 +12,6 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "simulation.h" -#include "ground.h" #include "mtable.h" #include "logs.h" @@ -93,84 +92,6 @@ WyslijWolny(const std::string &t) WyslijString(t, 4); // tor wolny } -#ifdef EU07_USE_OLD_GROUNDCODE -void -WyslijNamiary(TGroundNode *t) -{ // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby - // WriteLog("Wysylam pojazd"); - DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); - r.iComm = 7; // 7 - dane pojazdu - int i = 32; - size_t j = t->asName.length(); - r.iPar[0] = i; // ilość danych liczbowych - r.fPar[1] = Global::fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) - r.fPar[2] = t->DynamicObject->MoverParameters->Loc.X; // pozycja X - r.fPar[3] = t->DynamicObject->MoverParameters->Loc.Y; // pozycja Y - r.fPar[4] = t->DynamicObject->MoverParameters->Loc.Z; // pozycja Z - r.fPar[5] = t->DynamicObject->MoverParameters->V; // prędkość ruchu X - r.fPar[6] = t->DynamicObject->MoverParameters->nrot * M_PI * - t->DynamicObject->MoverParameters->WheelDiameter; // prędkość obrotowa kóŁ - r.fPar[7] = 0; // prędkość ruchu Z - r.fPar[8] = t->DynamicObject->MoverParameters->AccS; // przyspieszenie X - r.fPar[9] = t->DynamicObject->MoverParameters->AccN; // przyspieszenie Y //na razie nie - r.fPar[10] = t->DynamicObject->MoverParameters->AccV; // przyspieszenie Z - r.fPar[11] = t->DynamicObject->MoverParameters->DistCounter; // przejechana odległość w km - r.fPar[12] = t->DynamicObject->MoverParameters->PipePress; // ciśnienie w PG - r.fPar[13] = t->DynamicObject->MoverParameters->ScndPipePress; // ciśnienie w PZ - r.fPar[14] = t->DynamicObject->MoverParameters->BrakePress; // ciśnienie w CH - r.fPar[15] = t->DynamicObject->MoverParameters->Compressor; // ciśnienie w ZG - r.fPar[16] = t->DynamicObject->MoverParameters->Itot; // Prąd całkowity - r.iPar[17] = t->DynamicObject->MoverParameters->MainCtrlPos; // Pozycja NJ - r.iPar[18] = t->DynamicObject->MoverParameters->ScndCtrlPos; // Pozycja NB - r.iPar[19] = t->DynamicObject->MoverParameters->MainCtrlActualPos; // Pozycja jezdna - r.iPar[20] = t->DynamicObject->MoverParameters->ScndCtrlActualPos; // Pozycja bocznikowania - r.iPar[21] = t->DynamicObject->MoverParameters->ScndCtrlActualPos; // Pozycja bocznikowania - r.iPar[22] = t->DynamicObject->MoverParameters->ResistorsFlag * 1 + - t->DynamicObject->MoverParameters->ConverterFlag * 2 + - +t->DynamicObject->MoverParameters->CompressorFlag * 4 + - t->DynamicObject->MoverParameters->Mains * 8 + - +t->DynamicObject->MoverParameters->DoorLeftOpened * 16 + - t->DynamicObject->MoverParameters->DoorRightOpened * 32 + - +t->DynamicObject->MoverParameters->FuseFlag * 64 + - t->DynamicObject->MoverParameters->DepartureSignal * 128; - // WriteLog("Zapisalem stare"); - // WriteLog("Mam patykow "+IntToStr(t->DynamicObject->iAnimType[ANIM_PANTS])); - for (int p = 0; p < 4; p++) - { - // WriteLog("Probuje pant "+IntToStr(p)); - if (p < t->DynamicObject->iAnimType[ANIM_PANTS]) - { - r.fPar[23 + p] = t->DynamicObject->pants[p].fParamPants->PantWys; // stan pantografów 4 - // WriteLog("Zapisalem pant "+IntToStr(p)); - } - else - { - r.fPar[23 + p] = -2; - // WriteLog("Nie mam pant "+IntToStr(p)); - } - } - // WriteLog("Zapisalem pantografy"); - for (int p = 0; p < 3; p++) - r.fPar[27 + p] = - t->DynamicObject->MoverParameters->ShowCurrent(p + 1); // amperomierze kolejnych grup - // WriteLog("zapisalem prady"); - r.iPar[30] = t->DynamicObject->MoverParameters->WarningSignal; // trabienie - r.fPar[31] = t->DynamicObject->MoverParameters->RunningTraction.TractionVoltage; // napiecie WN - // WriteLog("Parametry gotowe"); - i <<= 2; // ilość bajtów - r.cString[i] = char(j); // na końcu nazwa, żeby jakoś zidentyfikować - strcpy(r.cString + i + 1, t->asName.c_str()); // zakończony zerem - COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura - cData.cbData = (DWORD)(10 + i + j); // 8+licznik i zero kończące - cData.lpData = &r; - // WriteLog("Ramka gotowa"); - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); - // WriteLog("Ramka poszla!"); - CommLog( Now() + " " + std::to_string(r.iComm) + " " + t->asName + " sent"); -} -#else void WyslijNamiary(TDynamicObject const *Vehicle) { // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby @@ -247,7 +168,6 @@ WyslijNamiary(TDynamicObject const *Vehicle) // WriteLog("Ramka poszla!"); CommLog( Now() + " " + std::to_string(r.iComm) + " " + Vehicle->asName + " sent"); } -#endif void WyslijObsadzone() diff --git a/messaging.h b/messaging.h index c41dab05..6bd7a0e3 100644 --- a/messaging.h +++ b/messaging.h @@ -11,11 +11,7 @@ http://mozilla.org/MPL/2.0/. #include -#ifdef EU07_USE_OLD_GROUNDCODE -class TGroundNode; -#else class TDynamicObject; -#endif namespace multiplayer { @@ -44,11 +40,7 @@ void Navigate( std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lPa void WyslijEvent( const std::string &e, const std::string &d ); void WyslijString( const std::string &t, int n ); void WyslijWolny( const std::string &t ); -#ifdef EU07_USE_OLD_GROUNDCODE -void WyslijNamiary( TGroundNode *t ); -#else void WyslijNamiary( TDynamicObject const *Vehicle ); -#endif void WyslijParam( int nr, int fl ); void WyslijUszkodzenia( const std::string &t, char fl ); void WyslijObsadzone(); // -> skladanie wielu pojazdow diff --git a/Ground.cpp b/old/Ground.cpp similarity index 100% rename from Ground.cpp rename to old/Ground.cpp diff --git a/Ground.h b/old/Ground.h similarity index 100% rename from Ground.h rename to old/Ground.h diff --git a/renderer.cpp b/renderer.cpp index e00f83a2..e66f60b5 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -440,18 +440,10 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } #endif switch_units( true, true, true ); -#ifdef EU07_USE_OLD_GROUNDCODE - Render( &World.Ground ); -#else Render( simulation::Region ); -#endif // ...translucent parts setup_drawing( true ); -#ifdef EU07_USE_OLD_GROUNDCODE - Render_Alpha( &World.Ground ); -#else Render_Alpha( simulation::Region ); -#endif if( World.Train != nullptr ) { // cab render is performed without shadows, due to low resolution and number of models without windows :| switch_units( true, false, false ); @@ -501,11 +493,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { #else setup_units( false, false, false ); #endif -#ifdef EU07_USE_OLD_GROUNDCODE - Render( &World.Ground ); -#else Render( simulation::Region ); -#endif // post-render restore ::glDisable( GL_POLYGON_OFFSET_FILL ); ::glDisable( GL_SCISSOR_TEST ); @@ -534,11 +522,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // opaque parts... setup_drawing( false ); setup_units( true, true, true ); -#ifdef EU07_USE_OLD_GROUNDCODE - Render( &World.Ground ); -#else Render( simulation::Region ); -#endif /* // reflections are limited to sky and ground only, the update rate is too low for anything else // ...translucent parts @@ -591,11 +575,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // opaque parts... setup_drawing( false ); setup_units( false, false, false ); -#ifdef EU07_USE_OLD_GROUNDCODE - Render( &World.Ground ); -#else Render( simulation::Region ); -#endif // post-render cleanup } break; @@ -1365,450 +1345,6 @@ opengl_renderer::Texture( texture_handle const Texture ) const { return m_textures.texture( Texture ); } -#ifdef EU07_USE_OLD_GROUNDCODE -bool -opengl_renderer::Render( TGround *Ground ) { - - m_cellqueue.clear(); - - glm::vec3 const cameraposition { m_renderpass.camera.position() }; - int const camerax = static_cast( std::floor( cameraposition.x / 1000.0f ) + iNumRects / 2 ); - int const cameraz = static_cast( std::floor( cameraposition.z / 1000.0f ) + iNumRects / 2 ); - int const segmentcount = 2 * static_cast(std::ceil( m_renderpass.draw_range * Global::fDistanceFactor / 1000.0f )); - int const originx = std::max( 0, camerax - segmentcount / 2 ); - int const originz = std::max( 0, cameraz - segmentcount / 2 ); - - switch( m_renderpass.draw_mode ) { - case rendermode::color: { - - Update_Lights( simulation::Lights ); - - for( int column = originx; column <= originx + segmentcount; ++column ) { - for( int row = originz; row <= originz + segmentcount; ++row ) { - - auto *cell = &Ground->Rects[ column ][ row ]; -#ifdef EU07_USE_DEBUG_CULLING - if( m_worldcamera.camera.visible( cell->m_area ) ) { -#else - if( m_renderpass.camera.visible( cell->m_area ) ) { -#endif - Render( cell ); - } - } - } - // draw queue was filled while rendering content of ground cells. now sort the nodes based on their distance to viewer... - std::sort( - std::begin( m_cellqueue ), - std::end( m_cellqueue ), - []( distancesubcell_pair const &Left, distancesubcell_pair const &Right ) { - return ( Left.first ) < ( Right.first ); } ); - // ...then render the opaque content of the visible subcells. - for( auto subcellpair : m_cellqueue ) { - Render( subcellpair.second ); - } - break; - } - case rendermode::reflections: { - // reflections render only terrain geometry - for( int column = originx; column <= originx + segmentcount; ++column ) { - for( int row = originz; row <= originz + segmentcount; ++row ) { - - auto *cell = &Ground->Rects[ column ][ row ]; - if( m_renderpass.camera.visible( cell->m_area ) ) { - Render( cell ); - } - } - } - break; - } - case rendermode::shadows: - case rendermode::pickscenery: { - // these render modes don't bother with anything non-visual, or lights - for( int column = originx; column <= originx + segmentcount; ++column ) { - for( int row = originz; row <= originz + segmentcount; ++row ) { - - auto *cell = &Ground->Rects[ column ][ row ]; - if( m_renderpass.camera.visible( cell->m_area ) ) { - Render( cell ); - } - } - } - // they can also skip queue sorting, as they only deal with opaque geometry - // NOTE: there's benefit from rendering front-to-back, but is it significant enough? TODO: investigate - for( auto subcellpair : m_cellqueue ) { - Render( subcellpair.second ); - } - break; - } - case rendermode::pickcontrols: - default: { - break; - } - } - - return true; -} - -bool -opengl_renderer::Render( TGroundRect *Groundcell ) { - - bool result { false }; // will be true if we do any rendering - - Groundcell->LoadNodes(); // ewentualne tworzenie siatek - - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // non-interactive scenery elements get neutral colour - ::glColor3fv( glm::value_ptr( colors::none ) ); - } - case rendermode::color: - case rendermode::reflections: { - if( Groundcell->nRenderRect != nullptr ) { - // nieprzezroczyste trójkąty kwadratu kilometrowego - for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - result = true; - } - break; - } - case rendermode::shadows: { - if( Groundcell->nRenderRect != nullptr ) { - // experimental, for shadows render both back and front faces, to supply back faces of the 'forest strips' - ::glDisable( GL_CULL_FACE ); - // nieprzezroczyste trójkąty kwadratu kilometrowego - for( TGroundNode *node = Groundcell->nRenderRect; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - result = true; - ::glEnable( GL_CULL_FACE ); - } - } - case rendermode::pickcontrols: - default: { - break; - } - } - - // add the subcells of the cell to the draw queue - switch( m_renderpass.draw_mode ) { - case rendermode::color: - case rendermode::shadows: - case rendermode::pickscenery: { - if( Groundcell->pSubRects != nullptr ) { - for( std::size_t subcellindex = 0; subcellindex < iNumSubRects * iNumSubRects; ++subcellindex ) { - auto subcell = Groundcell->pSubRects + subcellindex; - if( subcell->iNodeCount ) { - // o ile są jakieś obiekty, bo po co puste sektory przelatywać - m_cellqueue.emplace_back( - glm::length2( m_renderpass.camera.position() - glm::dvec3( subcell->m_area.center ) ), - subcell ); - } - } - } - break; - } - case rendermode::reflections: - case rendermode::pickcontrols: - default: { - break; - } - } - return result; -} - -bool -opengl_renderer::Render( TSubRect *Groundsubcell ) { - - // oznaczanie aktywnych sektorów - Groundsubcell->LoadNodes(); - - // przeliczenia animacji torów w sektorze - Groundsubcell->RaAnimate( m_framestamp ); - - TGroundNode *node; - - switch( m_renderpass.draw_mode ) { - case rendermode::color: - case rendermode::shadows: { - // nieprzezroczyste obiekty terenu - for( node = Groundsubcell->nRenderRect; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - // nieprzezroczyste obiekty (oprócz pojazdów) - for( node = Groundsubcell->nRender; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - // nieprzezroczyste z mieszanych modeli - for( node = Groundsubcell->nRenderMixed; node != nullptr; node = node->nNext3 ) { - Render( node ); - } - // nieprzezroczyste fragmenty pojazdów na torach - for( int trackidx = 0; trackidx < Groundsubcell->iTracks; ++trackidx ) { - for( auto dynamic : Groundsubcell->tTracks[ trackidx ]->Dynamics ) { - Render( dynamic ); - } - } -#ifdef EU07_SCENERY_EDITOR - // memcells - if( EditorModeFlag ) { - for( auto const memcell : Groundsubcell->m_memcells ) { - Render( memcell ); - } - } -#endif - break; - } - case rendermode::pickscenery: { - // same procedure like with regular render, but each node receives custom colour used for picking - // nieprzezroczyste obiekty terenu - for( node = Groundsubcell->nRenderRect; node != nullptr; node = node->nNext3 ) { - ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); - Render( node ); - } - // nieprzezroczyste obiekty (oprócz pojazdów) - for( node = Groundsubcell->nRender; node != nullptr; node = node->nNext3 ) { - ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); - Render( node ); - } - // nieprzezroczyste z mieszanych modeli - for( node = Groundsubcell->nRenderMixed; node != nullptr; node = node->nNext3 ) { - ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); - Render( node ); - } - // nieprzezroczyste fragmenty pojazdów na torach - for( int trackidx = 0; trackidx < Groundsubcell->iTracks; ++trackidx ) { - for( auto dynamic : Groundsubcell->tTracks[ trackidx ]->Dynamics ) { - ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); - Render( dynamic ); - } - } -#ifdef EU07_SCENERY_EDITOR - // memcells - if( EditorModeFlag ) { - for( auto const memcell : Groundsubcell->m_memcells ) { - ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); - Render( memcell ); - } - } -#endif - break; - } - case rendermode::pickcontrols: - default: { - break; - } - } - - return true; -} - -bool -opengl_renderer::Render( TGroundNode *Node ) { - - double distancesquared; - switch( m_renderpass.draw_mode ) { - case rendermode::shadows: { - // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - default: { - distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - } - if( ( distancesquared < Node->fSquareMinRadius ) - || ( distancesquared >= Node->fSquareRadius ) ) { - return false; - } - - switch (Node->iType) { - - case TP_TRACK: { - // setup - switch( m_renderpass.draw_mode ) { - case rendermode::shadows: { - return false; - } - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - // render - Render( Node->pTrack ); - // debug - ++m_debugstats.paths; - ++m_debugstats.drawcalls; - // post-render cleanup - ::glPopMatrix(); - return true; - } - - case TP_MODEL: { - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - Node->Model->RaAnimate( m_framestamp ); // jednorazowe przeliczenie animacji - Node->Model->RaPrepare(); - if( Node->Model->pModel ) { - // renderowanie rekurencyjne submodeli - Render( - Node->Model->pModel, - Node->Model->Material(), - distancesquared, - Node->pCenter - m_renderpass.camera.position(), - Node->Model->vAngle ); - } - return true; - } - - case GL_LINES: { - if( ( Node->Piece->geometry == null_handle ) - || ( Node->fLineThickness > 0.0 ) ) { - return false; - } - // setup - auto const distance = std::sqrt( distancesquared ); - auto const linealpha = - 10.0 * Node->fLineThickness - / std::max( - 0.5 * Node->m_radius + 1.0, - distance - ( 0.5 * Node->m_radius ) ); - switch( m_renderpass.draw_mode ) { - // wire colouring is disabled for modes other than colour - case rendermode::color: { - ::glColor4fv( - glm::value_ptr( - glm::vec4( - Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla - 1.0 ) ) ); // if the thickness is defined negative, lines are always drawn opaque - break; - } - case rendermode::shadows: - case rendermode::pickcontrols: - case rendermode::pickscenery: - default: { - break; - } - } - auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 8.0 ); - if( linewidth > 1.0 ) { - ::glLineWidth( static_cast( linewidth ) ); - } - - GfxRenderer.Bind_Material( null_handle ); - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - // render - m_geometry.draw( Node->Piece->geometry ); - // debug -// ++m_debugstats.lines; -// ++m_debugstats.drawcalls; - // post-render cleanup - ::glPopMatrix(); - - if( linewidth > 1.0 ) { ::glLineWidth( 1.0f ); } - - return true; - } - - case GL_TRIANGLES: { - if( ( Node->Piece->geometry == null_handle ) - || ( ( Node->iFlags & 0x10 ) == 0 ) ) { - return false; - } - // setup - Bind_Material( Node->m_material ); - switch( m_renderpass.draw_mode ) { - case rendermode::color: { - ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); - break; - } - // pick modes get custom colours, and shadow pass doesn't use any - case rendermode::shadows: - case rendermode::pickcontrols: - case rendermode::pickscenery: - default: { - break; - } - } - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - // render - m_geometry.draw( Node->Piece->geometry ); - // debug - ++m_debugstats.shapes; - ++m_debugstats.drawcalls; - - // post-render cleanup - ::glPopMatrix(); - - return true; - } - - case TP_MEMCELL: { - switch( m_renderpass.draw_mode ) { - case rendermode::pickscenery: { - // add the node to the pick list - m_picksceneryitems.emplace_back( Node ); - break; - } - default: { - break; - } - } - Render( Node->MemCell ); - return true; - } - - default: { break; } - } - // in theory we shouldn't ever get here but, eh - return false; -} -#else void opengl_renderer::Render( scene::basic_region *Region ) { @@ -2060,7 +1596,15 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // tracks // TODO: update after path node refactoring Render( std::begin( cell->m_paths ), std::end( cell->m_paths ) ); - +#ifdef EU07_SCENERY_EDITOR + // TODO: re-implement + // memcells + if( EditorModeFlag ) { + for( auto const memcell : Groundsubcell->m_memcells ) { + Render( memcell ); + } + } +#endif // post-render cleanup ::glPopMatrix(); @@ -2095,12 +1639,20 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ::glColor3fv( glm::value_ptr( colors::none ) ); for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } // tracks - // TODO: add path to the node picking list for( auto *path : cell->m_paths ) { ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); Render( path ); } - +#ifdef EU07_SCENERY_EDITOR + // memcells + // TODO: re-implement + if( EditorModeFlag ) { + for( auto const memcell : Groundsubcell->m_memcells ) { + ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); + Render( memcell ); + } + } +#endif // post-render cleanup ::glPopMatrix(); @@ -2250,7 +1802,6 @@ opengl_renderer::Render( TAnimModel *Instance ) { Instance->vAngle ); } } -#endif bool opengl_renderer::Render( TDynamicObject *Dynamic ) { @@ -2938,213 +2489,6 @@ opengl_renderer::Render( TMemCell *Memcell ) { ::glPopMatrix(); } -#ifdef EU07_USE_OLD_GROUNDCODE -bool -opengl_renderer::Render_Alpha( TGround *Ground ) { - - TGroundNode *node; - TSubRect *tmp; - // Ra: renderowanie progresywne - zależne od FPS oraz kierunku patrzenia - for( auto subcellpair = std::rbegin( m_cellqueue ); subcellpair != std::rend( m_cellqueue ); ++subcellpair ) { - // przezroczyste trójkąty w oddzielnym cyklu przed modelami - tmp = subcellpair->second; - for( node = tmp->nRenderRectAlpha; node; node = node->nNext3 ) { - Render_Alpha( node ); - } - } - for( auto subcellpair = std::rbegin( m_cellqueue ); subcellpair != std::rend( m_cellqueue ); ++subcellpair ) - { // renderowanie przezroczystych modeli oraz pojazdów - Render_Alpha( subcellpair->second ); - } - - ::glDisable( GL_LIGHTING ); // linie nie powinny świecić - - for( auto subcellpair = std::rbegin( m_cellqueue ); subcellpair != std::rend( m_cellqueue ); ++subcellpair ) { - // druty na końcu, żeby się nie robiły białe plamy na tle lasu - tmp = subcellpair->second; - for( node = tmp->nRenderWires; node; node = node->nNext3 ) { - Render_Alpha( node ); - } - } - - ::glEnable( GL_LIGHTING ); - - return true; -} - -bool -opengl_renderer::Render_Alpha( TSubRect *Groundsubcell ) { - - TGroundNode *node; - for( node = Groundsubcell->nRenderMixed; node; node = node->nNext3 ) - Render_Alpha( node ); // przezroczyste z mieszanych modeli - for( node = Groundsubcell->nRenderAlpha; node; node = node->nNext3 ) - Render_Alpha( node ); // przezroczyste modele - for( int trackidx = 0; trackidx < Groundsubcell->iTracks; ++trackidx ) { - for( auto dynamic : Groundsubcell->tTracks[ trackidx ]->Dynamics ) { - Render_Alpha( dynamic ); // przezroczyste fragmenty pojazdów na torach - } - } - - return true; -} - -bool -opengl_renderer::Render_Alpha( TGroundNode *Node ) { - - double distancesquared; - switch( m_renderpass.draw_mode ) { - case rendermode::shadows: { - // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Node->pCenter - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - default: { - distancesquared = SquareMagnitude( ( Node->pCenter - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; - break; - } - } - if( ( distancesquared < Node->fSquareMinRadius ) - || ( distancesquared >= Node->fSquareRadius ) ) { - return false; - } - - switch (Node->iType) - { - case TP_TRACTION: { - if( Node->bVisible ) { - // rysuj jesli sa druty i nie zerwana - if( ( Node->hvTraction->Wires == 0 ) - || ( true == TestFlag( Node->hvTraction->DamageFlag, 128 ) ) ) { - return false; - } - // setup - if( !Global::bSmoothTraction ) { - // na liniach kiepsko wygląda - robi gradient - ::glDisable( GL_LINE_SMOOTH ); - } - float const linealpha = static_cast( - std::min( - 1.25, - 5000 * Node->hvTraction->WireThickness / ( distancesquared + 1.0 ) ) ); // zbyt grube nie są dobre - ::glLineWidth( linealpha ); - // McZapkie-261102: kolor zalezy od materialu i zasniedzenia - auto const color { Node->hvTraction->wire_color() }; - ::glColor4f( color.r, color.g, color.b, linealpha ); - - Bind_Material( null_handle ); - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - // render - m_geometry.draw( Node->hvTraction->m_geometry ); - // debug data - ++m_debugstats.traction; - ++m_debugstats.drawcalls; - - // post-render cleanup - ::glPopMatrix(); - - ::glLineWidth( 1.0 ); - if( !Global::bSmoothTraction ) { - ::glEnable( GL_LINE_SMOOTH ); - } - - return true; - } - else { - return false; - } - } - case TP_MODEL: { - - Node->Model->RaPrepare(); - if( Node->Model->pModel ) { - // renderowanie rekurencyjne submodeli - Render_Alpha( - Node->Model->pModel, - Node->Model->Material(), - distancesquared, - Node->pCenter - m_renderpass.camera.position(), - Node->Model->vAngle ); - } - return true; - } - - case GL_LINES: { - if( ( Node->Piece->geometry == null_handle ) - || ( Node->fLineThickness < 0.0 ) ) { - return false; - } - // setup - auto const distance = std::sqrt( distancesquared ); - auto const linealpha = - 10.0 * Node->fLineThickness - / std::max( - 0.5 * Node->m_radius + 1.0, - distance - ( 0.5 * Node->m_radius ) ); - ::glColor4fv( - glm::value_ptr( - glm::vec4( - Node->Diffuse * glm::vec3( Global::DayLight.ambient ), // w zaleznosci od koloru swiatla - std::min( 1.0, linealpha ) ) ) ); - auto const linewidth = clamp( 0.5 * linealpha + Node->fLineThickness * Node->m_radius / 1000.0, 1.0, 8.0 ); - if( linewidth > 1.0 ) { - ::glLineWidth( static_cast(linewidth) ); - } - - GfxRenderer.Bind_Material( null_handle ); - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - // render - m_geometry.draw( Node->Piece->geometry ); - ++m_debugstats.lines; - ++m_debugstats.drawcalls; - - // post-render cleanup - ::glPopMatrix(); - - if( linewidth > 1.0 ) { ::glLineWidth( 1.0f ); } - - return true; - } - - case GL_TRIANGLES: { - if( ( Node->Piece->geometry == null_handle ) - || ( ( Node->iFlags & 0x20 ) == 0 ) ) { - return false; - } - // setup - ::glColor3fv( glm::value_ptr( Node->Diffuse ) ); - - Bind_Material( Node->m_material ); - - ::glPushMatrix(); - auto const originoffset = Node->m_rootposition - m_renderpass.camera.position(); - ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - - // render - m_geometry.draw( Node->Piece->geometry ); - // debug data - ++m_debugstats.shapes; - ++m_debugstats.drawcalls; - // post-render cleanup - ::glPopMatrix(); - - return true; - } - - default: { break; } - } - // in theory we shouldn't ever get here but, eh - return false; -} -#else void opengl_renderer::Render_Alpha( scene::basic_region *Region ) { @@ -3377,7 +2721,7 @@ opengl_renderer::Render_Alpha( scene::lines_node const &Lines ) { ++m_debugstats.lines; ++m_debugstats.drawcalls; } -#endif + bool opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { @@ -3748,11 +3092,7 @@ opengl_renderer::Update_Pick_Control() { return control; } -#ifdef EU07_USE_OLD_GROUNDCODE -TGroundNode const * -#else editor::basic_node const * -#endif opengl_renderer::Update_Pick_Node() { #ifdef EU07_USE_PICKING_FRAMEBUFFER @@ -3787,11 +3127,7 @@ opengl_renderer::Update_Pick_Node() { unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); auto const nodeindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode const *node { nullptr }; -#else editor::basic_node const *node { nullptr }; -#endif if( ( nodeindex > 0 ) && ( nodeindex <= m_picksceneryitems.size() ) ) { node = m_picksceneryitems[ nodeindex - 1 ]; diff --git a/renderer.h b/renderer.h index d0c7970c..15f41e85 100644 --- a/renderer.h +++ b/renderer.h @@ -192,22 +192,14 @@ public: // utility methods TSubModel const * Pick_Control() const { return m_pickcontrolitem; } -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode const * -#else editor::basic_node const * -#endif Pick_Node() const { return m_picksceneryitem; } // maintenance jobs void Update( double const Deltatime ); TSubModel const * Update_Pick_Control(); -#ifdef EU07_USE_OLD_GROUNDCODE - TGroundNode const * -#else editor::basic_node const * -#endif Update_Pick_Node(); // debug performance string std::string const & @@ -248,13 +240,9 @@ private: int drawcalls { 0 }; }; -#ifdef EU07_USE_OLD_GROUNDCODE - using distancesubcell_pair = std::pair< double, TSubRect * >; -#else using section_sequence = std::vector; using distancecell_pair = std::pair; using cell_sequence = std::vector; -#endif struct renderpass_config { @@ -295,16 +283,6 @@ private: Render_reflections(); bool Render( world_environment *Environment ); -#ifdef EU07_USE_OLD_GROUNDCODE - bool - Render( TGround *Ground ); - bool - Render( TGroundRect *Groundcell ); - bool - Render( TSubRect *Groundsubcell ); - bool - Render( TGroundNode *Node ); -#else void Render( scene::basic_region *Region ); void @@ -315,7 +293,6 @@ private: Render( scene::shape_node const &Shape, bool const Ignorerange ); void Render( TAnimModel *Instance ); -#endif bool Render( TDynamicObject *Dynamic ); bool @@ -332,14 +309,6 @@ private: Render_cab( TDynamicObject *Dynamic, bool const Alpha = false ); void Render( TMemCell *Memcell ); -#ifdef EU07_USE_OLD_GROUNDCODE - bool - Render_Alpha( TGround *Ground ); - bool - Render_Alpha( TSubRect *Groundsubcell ); - bool - Render_Alpha( TGroundNode *Node ); -#else void Render_Alpha( scene::basic_region *Region ); void @@ -350,7 +319,6 @@ private: Render_Alpha( TTraction *Traction ); void Render_Alpha( scene::lines_node const &Lines ); -#endif bool Render_Alpha( TDynamicObject *Dynamic ); bool @@ -422,21 +390,12 @@ private: bool m_renderspecular{ false }; // controls whether to include specular component in the calculations renderpass_config m_renderpass; -#ifdef EU07_USE_OLD_GROUNDCODE - std::vector m_cellqueue; // list of subcells to be drawn in current render pass -#else section_sequence m_sectionqueue; // list of sections in current render pass cell_sequence m_cellqueue; -#endif std::vector m_pickcontrolsitems; TSubModel const *m_pickcontrolitem { nullptr }; -#ifdef EU07_USE_OLD_GROUNDCODE - std::vector m_picksceneryitems; - TGroundNode const *m_picksceneryitem { nullptr }; -#else std::vector m_picksceneryitems; editor::basic_node const *m_picksceneryitem { nullptr }; -#endif #ifdef EU07_USE_DEBUG_CAMERA renderpass_config m_worldcamera; // debug item #endif diff --git a/scene.cpp b/scene.cpp index e9834f2b..1919dbe4 100644 --- a/scene.cpp +++ b/scene.cpp @@ -10,9 +10,9 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "scene.h" +#include "simulation.h" #include "globals.h" #include "timer.h" -#include "renderer.h" #include "logs.h" namespace scene { @@ -238,9 +238,7 @@ basic_cell::insert( TTrack *Path ) { Path->origin( m_area.center ); m_paths.emplace_back( Path ); // animation hook -#ifndef EU07_USE_OLD_GROUNDCODE Path->RaOwnerSet( this ); -#endif // re-calculate cell radius, in case track extends outside the cell's boundaries m_area.radius = std::max( m_area.radius, @@ -459,10 +457,8 @@ basic_cell::create_geometry( geometrybank_handle const &Bank ) { for( auto &shape : m_shapesopaque ) { shape.create_geometry( Bank ); } for( auto &shape : m_shapestranslucent ) { shape.create_geometry( Bank ); } -#ifndef EU07_USE_OLD_GROUNDCODE for( auto *path : m_paths ) { path->create_geometry( Bank ); } for( auto *traction : m_traction ) { traction->create_geometry( Bank ); } -#endif for( auto &lines : m_lines ) { lines.create_geometry( Bank ); } // arrange content by assigned materials to minimize state switching std::sort( diff --git a/stdafx.h b/stdafx.h index c08f2fed..9a043076 100644 --- a/stdafx.h +++ b/stdafx.h @@ -94,5 +94,3 @@ #include #include "openglmatrixstack.h" - -//#define EU07_USE_OLD_GROUNDCODE From 2fece17ca0ad84368ab08d9d66c7f6b606767cc8 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 29 Oct 2017 14:56:41 +0100 Subject: [PATCH 210/426] build 171028: post-merge fixes, ai shunt mode driving tweaks --- Driver.cpp | 21 +++++++++++++++------ DynObj.cpp | 34 +++++++++++++++++----------------- McZapkie/Mover.cpp | 8 -------- Names.h | 2 +- scene.h | 2 +- version.h | 2 +- 6 files changed, 35 insertions(+), 34 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 2a481489..01478ac6 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4323,11 +4323,11 @@ TController::UpdateSituation(double dt) { vehicle->fTrackBlock ); double k = coupler->Connected->Vel; // prędkość pojazdu z przodu (zakładając, // że jedzie w tę samą stronę!!!) - if( k < vel + 10 ) { + if( k - vel < 10 ) { // porównanie modułów prędkości [km/h] // zatroszczyć się trzeba, jeśli tamten nie jedzie znacząco szybciej double const distance = vehicle->fTrackBlock - fMaxProximityDist - ( fBrakeDist * 1.15 ); // odległość bezpieczna zależy od prędkości - if( distance < 0 ) { + if( distance < 0.0 ) { // jeśli odległość jest zbyt mała if( k < 10.0 ) // k - prędkość tego z przodu { // jeśli tamten porusza się z niewielką prędkością albo stoi @@ -4533,10 +4533,19 @@ TController::UpdateSituation(double dt) { */ if( VelNext == 0.0 ) { if( mvOccupied->CategoryFlag & 1 ) { - // hamowanie tak, aby stanąć - VelDesired = VelNext; - AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); - AccDesired = std::min( AccDesired, fAccThreshold ); + // trains + if( ( OrderCurrentGet() & Shunt ) + && ( pVehicles[0]->fTrackBlock < 50.0 ) ) { + // crude detection of edge case, if approaching another vehicle coast slowly until min distance + // this should allow to bunch up trainsets more on sidings + VelDesired = Global::Min0RSpeed( VelDesired, 5.0 ); + } + else { + // hamowanie tak, aby stanąć + VelDesired = VelNext; + AccDesired = ( VelNext * VelNext - vel * vel ) / ( 25.92 * ( ActualProximityDist + 0.1 - 0.5*fMinProximityDist ) ); + AccDesired = std::min( AccDesired, fAccThreshold ); + } } else { // for cars (and others) coast at low speed until we hit min proximity range diff --git a/DynObj.cpp b/DynObj.cpp index 492ca704..678915bc 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1461,7 +1461,7 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) if( distance < 100.0 ) { // at short distances start to calculate range between couplers directly // odległość do najbliższego pojazdu w linii prostej - fTrackBlock = std::min( fTrackBlock, MoverParameters->Couplers[ mycoupler ].CoupleDist ); + fTrackBlock = MoverParameters->Couplers[ mycoupler ].CoupleDist; } if( ( false == TestFlag( track->iCategoryFlag, 1 ) ) && ( distance > 50.0 ) ) { @@ -2605,14 +2605,14 @@ bool TDynamicObject::Update(double dt, double dt1) // if (Global::bLiveTraction) { // Ra 2013-12: to niżej jest chyba trochę bez sensu double v = MoverParameters->PantRearVolt; - if (v == 0.0) - { + if (v == 0.0) { v = MoverParameters->PantFrontVolt; - if (v == 0.0) - if ((MoverParameters->TrainType & (dt_EZT | dt_ET40 | dt_ET41 | dt_ET42)) && - MoverParameters->EngineType != - ElectricInductionMotor) // dwuczłony mogą mieć sprzęg WN + if( v == 0.0 ) { + if( MoverParameters->TrainType & ( dt_EZT | dt_ET40 | dt_ET41 | dt_ET42 ) ) { + // dwuczłony mogą mieć sprzęg WN v = MoverParameters->GetTrainsetVoltage(); // ostatnia szansa + } + } } if (v != 0.0) { // jeśli jest zasilanie @@ -2627,21 +2627,21 @@ bool TDynamicObject::Update(double dt, double dt1) if( MoverParameters->Vel > 0.5 ) { // jeśli jedzie // Ra 2014-07: doraźna blokada logowania zimnych lokomotyw - zrobić to trzeba inaczej - if( MoverParameters->PantFrontUp || MoverParameters->PantRearUp ) - // if (NoVoltTime>0.02) //tu można ograniczyć czas rozłączenia - // if (DebugModeFlag) //logowanie nie zawsze + if( MoverParameters->PantFrontUp + || MoverParameters->PantRearUp ) { + if( ( MoverParameters->Mains ) - && ( ( MoverParameters->EngineType != ElectricInductionMotor ) - || ( MoverParameters->GetTrainsetVoltage() < 0.1f ) ) ) { - // Ra 15-01: logować tylko, jeśli WS załączony - // yB 16-03: i nie jest to asynchron zasilany z daleka - // Ra 15-01: bezwzględne współrzędne pantografu nie są dostępne, - // więc lepiej się tego nie zaloguje + && ( MoverParameters->GetTrainsetVoltage() < 0.1f ) ) { + // Ra 15-01: logować tylko, jeśli WS załączony + // yB 16-03: i nie jest to asynchron zasilany z daleka + // Ra 15-01: bezwzględne współrzędne pantografu nie są dostępne, + // więc lepiej się tego nie zaloguje ErrorLog( - "Bad traction: " + MoverParameters->Name + "Bad traction: " + MoverParameters->Name + " lost power for " + to_string( NoVoltTime, 2 ) + " sec. at " + to_string( glm::dvec3{ vPosition } ) ); } + } } // Ra 2F1H: nie było sensu wpisywać tu zera po upływie czasu, bo zmienna była // tymczasowa, a napięcie zerowane od razu diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 4e899f3a..16ec52c6 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4698,14 +4698,6 @@ double TMoverParameters::TractionForce(double dt) dmoment = eimv[eimv_Fful]; // NOTE: the commands to operate the sandbox are likely to conflict with other similar ai decisions // TODO: gather these in single place so they can be resolved together - if( ( std::abs( ( PosRatio + 9.66 * dizel_fill ) * dmoment * 100 ) > 0.95 * Adhesive( RunningTrack.friction ) * TotalMassxg ) ) { - PosRatio = 0; - tmp = 4; - } // przeciwposlizg - if( ( std::abs( ( PosRatio + 9.80 * dizel_fill ) * dmoment * 100 ) > 0.95 * Adhesive( RunningTrack.friction ) * TotalMassxg ) ) { - PosRatio = 0; - tmp = 9; - } // przeciwposlizg if( ( SlippingWheels ) ) { PosRatio = 0; tmp = 9; diff --git a/Names.h b/Names.h index 209ed9c3..1af3e4ca 100644 --- a/Names.h +++ b/Names.h @@ -57,7 +57,7 @@ protected: public: // data access - typename type_sequence & + type_sequence & sequence() { return m_items; } diff --git a/scene.h b/scene.h index 8de91971..e09e8a3a 100644 --- a/scene.h +++ b/scene.h @@ -47,7 +47,7 @@ struct scratch_data { float offset { 0.f }; float velocity { 0.f }; std::vector vehicles; - std::vector couplings; + std::vector couplings; TDynamicObject * driver { nullptr }; bool is_open { false }; } trainset; diff --git a/version.h b/version.h index 6fe44f69..2fced4fe 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1027 +#define VERSION_MINOR 1028 #define VERSION_REVISION 0 From ffcd3b40c98dbbe6a10d50e484463882491ce78f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 29 Oct 2017 20:56:40 +0100 Subject: [PATCH 211/426] audio synchronization fix --- DynObj.cpp | 2 +- World.cpp | 3 +- scene.cpp | 131 ++++++++++++++++++++++++++++++++--------------------- scene.h | 31 ++++++++----- 4 files changed, 103 insertions(+), 64 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 678915bc..4156d8be 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3511,7 +3511,7 @@ void TDynamicObject::RenderSounds() // McZapkie-010302: ulepszony dzwiek silnika double freq; double vol = 0; - double dt = Timer::GetDeltaTime(); + double dt = Timer::GetDeltaRenderTime(); // double sounddist; // sounddist=SquareMagnitude(Global::pCameraPosition-vPosition); diff --git a/World.cpp b/World.cpp index d1c38aae..7949b346 100644 --- a/World.cpp +++ b/World.cpp @@ -1029,7 +1029,7 @@ bool TWorld::Update() { } simulation::Events.update(); - simulation::Region->update(); + simulation::Region->update_events(); simulation::Lights.update(); // render time routines follow: @@ -1062,6 +1062,7 @@ bool TWorld::Update() { Timer::subsystem.sim_total.stop(); + simulation::Region->update_sounds(); GfxRenderer.Update( dt ); ResourceSweep(); diff --git a/scene.cpp b/scene.cpp index 1919dbe4..df72f81d 100644 --- a/scene.cpp +++ b/scene.cpp @@ -17,42 +17,6 @@ http://mozilla.org/MPL/2.0/. namespace scene { -// legacy method, updates sounds and polls event launchers within radius around specified point -void -basic_cell::update() { - - // sounds - auto const deltatime = Timer::GetDeltaTime(); - for( auto *sound : m_sounds ) { - - if( ( sound->GetStatus() & DSBSTATUS_PLAYING ) == DSBPLAY_LOOPING ) { - sound->Play( 1, DSBPLAY_LOOPING, true, sound->vSoundPosition ); - sound->AdjFreq( 1.0, deltatime ); - } - } - // event launchers - for( auto *launcher : m_eventlaunchers ) { - if( ( true == launcher->check_conditions() ) - && ( SquareMagnitude( launcher->location() - Global::pCameraPosition ) < launcher->dRadius ) ) { - - WriteLog( "Eventlauncher " + launcher->name() ); - if( ( true == Global::shiftState ) - && ( launcher->Event2 != nullptr ) ) { - simulation::Events.AddToQuery( launcher->Event2, nullptr ); - } - else if( launcher->Event1 ) { - simulation::Events.AddToQuery( launcher->Event1, nullptr ); - } - } - } - - // TBD, TODO: move to sound renderer - for( auto *path : m_paths ) { - // dźwięki pojazdów, również niewidocznych - path->RenderDynSounds(); - } -} - // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void basic_cell::update_traction( TDynamicObject *Vehicle, int const Pantographindex ) { @@ -130,6 +94,47 @@ basic_cell::update_traction( TDynamicObject *Vehicle, int const Pantographindex } } +// legacy method, updates sounds and polls event launchers within radius around specified point +void +basic_cell::update_events() { + + // event launchers + for( auto *launcher : m_eventlaunchers ) { + if( ( true == launcher->check_conditions() ) + && ( SquareMagnitude( launcher->location() - Global::pCameraPosition ) < launcher->dRadius ) ) { + + WriteLog( "Eventlauncher " + launcher->name() ); + if( ( true == Global::shiftState ) + && ( launcher->Event2 != nullptr ) ) { + simulation::Events.AddToQuery( launcher->Event2, nullptr ); + } + else if( launcher->Event1 ) { + simulation::Events.AddToQuery( launcher->Event1, nullptr ); + } + } + } +} + +// legacy method, updates sounds and polls event launchers within radius around specified point +void +basic_cell::update_sounds() { + + // sounds + auto const deltatime = Timer::GetDeltaRenderTime(); + for( auto *sound : m_sounds ) { + + if( ( sound->GetStatus() & DSBSTATUS_PLAYING ) == DSBPLAY_LOOPING ) { + sound->Play( 1, DSBPLAY_LOOPING, true, sound->vSoundPosition ); + sound->AdjFreq( 1.0, deltatime ); + } + } + // TBD, TODO: move to sound renderer + for( auto *path : m_paths ) { + // dźwięki pojazdów, również niewidocznych + path->RenderDynSounds(); + } +} + // legacy method, triggers radio-stop procedure for all vehicles located on paths in the cell void basic_cell::radio_stop() { @@ -479,19 +484,6 @@ basic_cell::enclose_area( editor::basic_node *Node ) { -// legacy method, updates sounds and polls event launchers within radius around specified point -void -basic_section::update( glm::dvec3 const &Location, float const Radius ) { - - for( auto &cell : m_cells ) { - - if( glm::length2( cell.area().center - Location ) < ( ( cell.area().radius + Radius ) * ( cell.area().radius + Radius ) ) ) { - // we reject cells which aren't within our area of interest - cell.update(); - } - } -} - // legacy method, finds and assigns traction piece(s) to pantographs of provided vehicle void basic_section::update_traction( TDynamicObject *Vehicle, int const Pantographindex ) { @@ -514,6 +506,32 @@ basic_section::update_traction( TDynamicObject *Vehicle, int const Pantographind } } +// legacy method, polls event launchers within radius around specified point +void +basic_section::update_events( glm::dvec3 const &Location, float const Radius ) { + + for( auto &cell : m_cells ) { + + if( glm::length2( cell.area().center - Location ) < ( ( cell.area().radius + Radius ) * ( cell.area().radius + Radius ) ) ) { + // we reject cells which aren't within our area of interest + cell.update_events(); + } + } +} + +// legacy method, updates sounds within radius around specified point +void +basic_section::update_sounds( glm::dvec3 const &Location, float const Radius ) { + + for( auto &cell : m_cells ) { + + if( glm::length2( cell.area().center - Location ) < ( ( cell.area().radius + Radius ) * ( cell.area().radius + Radius ) ) ) { + // we reject cells which aren't within our area of interest + cell.update_sounds(); + } + } +} + // legacy method, triggers radio-stop procedure for all vehicles in 2km radius around specified location void basic_section::radio_stop( glm::dvec3 const &Location, float const Radius ) { @@ -706,14 +724,25 @@ basic_region::~basic_region() { for( auto *section : m_sections ) { if( section != nullptr ) { delete section; } } } +// legacy method, polls event launchers around camera +void +basic_region::update_events() { + // render events and sounds from sectors near enough to the viewer + auto const range = EU07_SECTIONSIZE; // arbitrary range + auto const §ionlist = sections( Global::pCameraPosition, range ); + for( auto *section : sectionlist ) { + section->update_events( Global::pCameraPosition, range ); + } +} + // legacy method, updates sounds and polls event launchers around camera void -basic_region::update() { +basic_region::update_sounds() { // render events and sounds from sectors near enough to the viewer auto const range = 2750.f; // audible range of 100 db sound auto const §ionlist = sections( Global::pCameraPosition, range ); for( auto *section : sectionlist ) { - section->update( Global::pCameraPosition, range ); + section->update_sounds( Global::pCameraPosition, range ); } } diff --git a/scene.h b/scene.h index e09e8a3a..05cd4838 100644 --- a/scene.h +++ b/scene.h @@ -63,12 +63,15 @@ class basic_cell { public: // methods - // legacy method, updates sounds and polls event launchers within radius around specified point - void - update(); // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); + // legacy method, polls event launchers within radius around specified point + void + update_events(); + // legacy method, updates sounds within radius around specified point + void + update_sounds(); // legacy method, triggers radio-stop procedure for all vehicles located on paths in the cell void radio_stop(); @@ -171,12 +174,15 @@ class basic_section { public: // methods - // legacy method, updates sounds and polls event launchers within radius around specified point - void - update( glm::dvec3 const &Location, float const Radius ); - // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle +// legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); + // legacy method, updates sounds and polls event launchers within radius around specified point + void + update_events( glm::dvec3 const &Location, float const Radius ); + // legacy method, updates sounds and polls event launchers within radius around specified point + void + update_sounds( glm::dvec3 const &Location, float const Radius ); // legacy method, triggers radio-stop procedure for all vehicles in 2km radius around specified location void radio_stop( glm::dvec3 const &Location, float const Radius ); @@ -255,12 +261,15 @@ public: // destructor ~basic_region(); // methods - // legacy method, updates sounds and polls event launchers around camera - void - update(); - // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle +// legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); + // legacy method, polls event launchers around camera + void + update_events(); + // legacy method, updates sounds around camera + void + update_sounds(); // stores content of the class in file with specified name void serialize( std::string const &Scenariofile ); From 9edf9124058b552d8ac179d807d5124dd9e17fa0 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 30 Oct 2017 02:34:54 +0100 Subject: [PATCH 212/426] maintenance: minor code cleanup --- AnimModel.cpp | 8 --- AnimModel.h | 1 - MemCell.cpp | 10 --- MemCell.h | 2 - Track.cpp | 16 ++--- Track.h | 2 - Traction.cpp | 5 -- Traction.h | 2 - TractionPower.cpp | 4 -- TractionPower.h | 2 - scenenode.h | 164 +++++++++++++++++++++++++--------------------- 11 files changed, 95 insertions(+), 121 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index b26d91a0..77429ef0 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -413,14 +413,6 @@ TAnimModel::TAnimModel( scene::node_data const &Nodedata ) : basic_node( Nodedat } } -TAnimModel::TAnimModel() { - // TODO: wrap these in a tuple and move to underlying model - for( int index = 0; index < iMaxNumLights; ++index ) { - LightsOn[index] = LightsOff[index] = nullptr; // normalnie nie ma - lsLights[index] = ls_Off; // a jeśli są, to wyłączone - } -} - TAnimModel::~TAnimModel() { delete pAdvanced; // nie ma zaawansowanej animacji diff --git a/AnimModel.h b/AnimModel.h index acc9545f..adcd8d9d 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -126,7 +126,6 @@ class TAnimModel : public editor::basic_node { public: // constructors TAnimModel( scene::node_data const &Nodedata ); - TAnimModel(); // destructor ~TAnimModel(); // methods diff --git a/MemCell.cpp b/MemCell.cpp index 8850c4fa..51bc2194 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -21,16 +21,6 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- -// legacy constructor -TMemCell::TMemCell(vector3 *p) -{ - fValue1 = fValue2 = 0; - location( - p ? *p : glm::dvec3() ); // ustawienie współrzędnych, bo do TGroundNode nie ma dostępu - bCommand = false; // komenda wysłana - OnSent = NULL; -} - TMemCell::TMemCell( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} void TMemCell::UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ) diff --git a/MemCell.h b/MemCell.h index 27e4cf17..97e1eb01 100644 --- a/MemCell.h +++ b/MemCell.h @@ -20,8 +20,6 @@ public: std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac TMemCell( scene::node_data const &Nodedata ); - // legacy constructor - TMemCell( Math3D::vector3 *p ); void UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); diff --git a/Track.cpp b/Track.cpp index fcc415ca..0ea4b3c8 100644 --- a/Track.cpp +++ b/Track.cpp @@ -130,12 +130,6 @@ void TIsolated::Modify(int i, TDynamicObject *o) // tworzenie nowego odcinka ruchu TTrack::TTrack( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} -// legacy constructor -TTrack::TTrack( std::string Name ) { - - m_name = Name; -} - TTrack::~TTrack() { // likwidacja odcinka if( eType == tt_Cross ) { @@ -175,7 +169,9 @@ TTrack::sort_by_material( TTrack const *Left, TTrack const *Right ) { TTrack * TTrack::Create400m(int what, double dx) { // tworzenie toru do wstawiania taboru podczas konwersji na E3D - auto *trk = new TTrack( "auto_400m" ); + scene::node_data nodedata; + nodedata.name = "auto_400m"; // track isn't visible so only name is needed + auto *trk = new TTrack( nodedata ); trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur trk->iCategoryFlag = what; // taki sam typ plus informacja, że dodatkowy trk->Init(); // utworzenie segmentu @@ -191,7 +187,9 @@ TTrack * TTrack::NullCreate(int dir) TTrack *trk { nullptr }, *trk2 { nullptr }; - trk = new TTrack( "auto_null" ); + scene::node_data nodedata; + nodedata.name = "auto_null"; // track isn't visible so only name is needed + trk = new TTrack( nodedata ); trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur trk->iCategoryFlag = (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy float r1, r2; @@ -234,7 +232,7 @@ TTrack * TTrack::NullCreate(int dir) trk->fVelocity = 20.0; // zawracanie powoli trk->fRadius = 20.0; // promień, aby się dodawało do tabelki prędkości i liczyło narastająco trk->Init(); // utworzenie segmentu - trk2 = new TTrack( "auto_null" ); + trk2 = new TTrack( nodedata ); trk2->iCategoryFlag = (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy trk2->m_visible = false; diff --git a/Track.h b/Track.h index 23ac5c10..250ebd96 100644 --- a/Track.h +++ b/Track.h @@ -185,8 +185,6 @@ public: TGroundNode *nFouling[ 2 ] = { nullptr, nullptr }; // współrzędne ukresu albo oporu kozła TTrack( scene::node_data const &Nodedata ); - // legacy constructor - TTrack( std::string Name ); virtual ~TTrack(); void Init(); diff --git a/Traction.cpp b/Traction.cpp index 4cfa5053..348e9e22 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -91,11 +91,6 @@ sekcji z sąsiedniego przęsła). */ TTraction::TTraction( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} -// legacy constructor -TTraction::TTraction( std::string Name ) { - - m_name = Name; -} glm::dvec3 LoadPoint( cParser &Input ) { // pobranie współrzędnych punktu diff --git a/Traction.h b/Traction.h index 9ccbf078..20ac20d2 100644 --- a/Traction.h +++ b/Traction.h @@ -53,8 +53,6 @@ class TTraction : public editor::basic_node { geometry_handle m_geometry; TTraction( scene::node_data const &Nodedata ); - // legacy constructor - TTraction( std::string Name ); void Load( cParser *parser, glm::dvec3 const &pOrigin ); // set origin point diff --git a/TractionPower.cpp b/TractionPower.cpp index 8513ce47..c83eb49a 100644 --- a/TractionPower.cpp +++ b/TractionPower.cpp @@ -22,10 +22,6 @@ http://mozilla.org/MPL/2.0/. TTractionPowerSource::TTractionPowerSource( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} // legacy constructor -TTractionPowerSource::TTractionPowerSource( std::string Name ) { - - m_name = Name; -} void TTractionPowerSource::Init(double const u, double const i) { // ustawianie zasilacza przy braku w scenerii diff --git a/TractionPower.h b/TractionPower.h index ae9bb18e..f170e738 100644 --- a/TractionPower.h +++ b/TractionPower.h @@ -40,8 +40,6 @@ public: bool bSection = false; // czy jest sekcją TTractionPowerSource( scene::node_data const &Nodedata ); - // legacy constructor - TTractionPowerSource( std::string Name ); void Init(double const u, double const i); bool Load(cParser *parser); diff --git a/scenenode.h b/scenenode.h index d30b420b..2978c1a9 100644 --- a/scenenode.h +++ b/scenenode.h @@ -29,12 +29,14 @@ bool operator==( lighting_data const &Left, lighting_data const &Right ) { return ( ( Left.diffuse == Right.diffuse ) && ( Left.ambient == Right.ambient ) - && ( Left.specular == Right.specular ) ); } + && ( Left.specular == Right.specular ) ); +} inline bool operator!=( lighting_data const &Left, lighting_data const &Right ) { - return !( Left == Right ); } + return !( Left == Right ); +} namespace scene { @@ -49,26 +51,6 @@ struct bounding_area { radius( Radius ) {} }; -/* -enum nodetype { - - unknown, - model, - triangles, - lines, - dynamic, - track, - traction, - powersource, - sound, - memorycell, - eventlauncher -}; - -class node_manager { - -}; -*/ struct node_data { @@ -119,16 +101,13 @@ public: compute_radius(); // set visibility void - visible( bool State ) { - m_data.visible = State; } + visible( bool State ); // set origin point void - origin( glm::dvec3 Origin ) { - m_data.origin = Origin; } + origin( glm::dvec3 Origin ); // data access shapenode_data const & - data() const { - return m_data; } + data() const; private: // members @@ -136,6 +115,27 @@ private: shapenode_data m_data; }; +// set visibility +inline +void +shape_node::visible( bool State ) { + m_data.visible = State; +} +// set origin point +inline +void +shape_node::origin( glm::dvec3 Origin ) { + m_data.origin = Origin; +} +// data access +inline +shape_node::shapenode_data const & +shape_node::data() const { + return m_data; +} + + + // holds a group of untextured lines class lines_node { @@ -173,16 +173,13 @@ public: compute_radius(); // set visibility void - visible( bool State ) { - m_data.visible = State; } + visible( bool State ); // set origin point void - origin( glm::dvec3 Origin ) { - m_data.origin = Origin; } + origin( glm::dvec3 Origin ); // data access linesnode_data const & - data() const { - return m_data; } + data() const; private: // members @@ -190,6 +187,26 @@ private: linesnode_data m_data; }; +// set visibility +inline +void +lines_node::visible( bool State ) { + m_data.visible = State; +} +// set origin point +inline +void +lines_node::origin( glm::dvec3 Origin ) { + m_data.origin = Origin; +} +// data access +inline +lines_node::linesnode_data const & +lines_node::data() const { + return m_data; +} + + /* // holds geometry for specific piece of track/road/waterway class path_node { @@ -238,39 +255,10 @@ private: TTrack * m_path; }; */ -/* -// holds reference to memory cell -class memorycell_node { - - friend class basic_region; // region might want to modify node content when it's being inserted - -public: -// types - struct memorynode_data { - // placement and visibility - bounding_area area; // bounding area, in world coordinates - bool visible { false }; // visibility flag - }; -// methods - // restores content of the node from provded input stream - // TODO: implement - memory_node & - deserialize( cParser &Input, node_data const &Nodedata ); - void - cell( TMemCell *Cell ) { - m_memorycell = Cell; } - TMemCell * - cell() { - return m_memorycell; } - -private: -// members - memorynode_data m_data; - TMemCell * m_memorycell; -}; -*/ } // scene + + namespace editor { // base interface for nodes which can be actvated in scenario editor @@ -278,28 +266,22 @@ struct basic_node { public: // constructor - basic_node() = default; // TODO: remove after refactor basic_node( scene::node_data const &Nodedata ); // destructor virtual ~basic_node() = default; // methods std::string const & - name() const { - return m_name; } + name() const; void - location( glm::dvec3 const Location ) { - m_area.center = Location; } + location( glm::dvec3 const Location ); glm::dvec3 const & - location() const { - return m_area.center; }; + location() const; float const & radius(); void - visible( bool const Visible ) { - m_visible = Visible; } + visible( bool const Visible ); bool - visible() const { - return m_visible; } + visible() const; protected: // methods @@ -313,6 +295,36 @@ protected: std::string m_name; }; +inline +std::string const & +basic_node::name() const { + return m_name; +} + +inline +void +basic_node::location( glm::dvec3 const Location ) { + m_area.center = Location; +} + +inline +glm::dvec3 const & +basic_node::location() const { + return m_area.center; +} + +inline +void +basic_node::visible( bool const Visible ) { + m_visible = Visible; +} + +inline +bool +basic_node::visible() const { + return m_visible; +} + } // editor //--------------------------------------------------------------------------- From 071a15652784d36e59c0d15b6ce209d9ca2c1f7e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 30 Oct 2017 23:41:22 +0100 Subject: [PATCH 213/426] build 171030: binary serialization for region terrain --- Gauge.cpp | 6 +- material.cpp | 8 +-- scene.cpp | 164 ++++++++++++++++++++++++++++++++++++++++-- scene.h | 14 +++- scenenode.cpp | 192 ++++++++++++++++++++++++++++++++++++++++++++++++- scenenode.h | 59 ++++++++++++--- simulation.cpp | 43 ++++++----- sn_utils.cpp | 48 ++++++++++++- sn_utils.h | 6 ++ version.h | 2 +- vertex.cpp | 31 ++++++++ vertex.h | 2 + 12 files changed, 531 insertions(+), 44 deletions(-) diff --git a/Gauge.cpp b/Gauge.cpp index 4def85c2..01232954 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -137,10 +137,10 @@ TGauge::Load_mapping( cParser &Input ) { TSoundsManager::GetFromName( value, true ) : nullptr ); } - else if( key.find( "sound" ) == 0 ) { + else if( key.compare( 0, std::min( key.size(), 5 ), "sound" ) == 0 ) { // sounds assigned to specific gauge values, defined by key soundFoo: where Foo = value - auto const indexstart = key.find_first_of( "-1234567890" ); - auto const indexend = key.find_first_not_of( "-1234567890", indexstart ); + auto const indexstart { key.find_first_of( "-1234567890" ) }; + auto const indexend { key.find_first_not_of( "-1234567890", indexstart ) }; if( indexstart != std::string::npos ) { m_soundfxvalues.emplace( std::stoi( key.substr( indexstart, indexend - indexstart ) ), diff --git a/material.cpp b/material.cpp index b3870201..96100286 100644 --- a/material.cpp +++ b/material.cpp @@ -94,10 +94,10 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { } filename += ".mat"; - for( char &c : filename ) { - // change forward slashes to windows ones. NOTE: probably not strictly necessary, but eh - c = ( c == '/' ? '\\' : c ); - } + // change forward slashes to windows ones. NOTE: probably not strictly necessary, but eh + std::replace( + std::begin( filename ), std::end( filename ), + '/', '\\' ); if( filename.find( '\\' ) == std::string::npos ) { // jeśli bieżaca ścieżka do tekstur nie została dodana to dodajemy domyślną filename = szTexturePath + filename; diff --git a/scene.cpp b/scene.cpp index df72f81d..00a9cddf 100644 --- a/scene.cpp +++ b/scene.cpp @@ -14,9 +14,12 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "timer.h" #include "logs.h" +#include "sn_utils.h" namespace scene { +std::string const EU07_FILEEXTENSION_REGION { ".sbt" }; + // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void basic_cell::update_traction( TDynamicObject *Vehicle, int const Pantographindex ) { @@ -173,6 +176,56 @@ basic_cell::RaAnimate( unsigned int const Framestamp ) { m_framestamp = Framestamp; } +// sends content of the class to provided stream +void +basic_cell::serialize( std::ostream &Output ) const { + + // region file version 0, cell data + // bounding area + m_area.serialize( Output ); + // NOTE: cell activation flag is set dynamically on load + // cell shapes + // shape count followed by opaque shape data + sn_utils::ls_uint32( Output, m_shapesopaque.size() ); + for( auto const &shape : m_shapesopaque ) { + shape.serialize( Output ); + } + // shape count followed by translucent shape data + sn_utils::ls_uint32( Output, m_shapestranslucent.size() ); + for( auto const &shape : m_shapestranslucent ) { + shape.serialize( Output ); + } + // cell lines + // line count followed by lines data + sn_utils::ls_uint32( Output, m_lines.size() ); + for( auto const &lines : m_lines ) { + lines.serialize( Output ); + } +} + +// restores content of the class from provided stream +void +basic_cell::deserialize( std::istream &Input ) { + + // region file version 0, cell data + // bounding area + m_area.deserialize( Input ); + // cell shapes + // shape count followed by opaque shape data + auto itemcount { sn_utils::ld_uint32( Input ) }; + while( itemcount-- ) { + m_shapesopaque.emplace_back( shape_node().deserialize( Input ) ); + } + itemcount = sn_utils::ld_uint32( Input ); + while( itemcount-- ) { + m_shapestranslucent.emplace_back( shape_node().deserialize( Input ) ); + } + itemcount = sn_utils::ld_uint32( Input ); + while( itemcount-- ) { + m_lines.emplace_back( lines_node().deserialize( Input ) ); + } +} + // adds provided shape to the cell void basic_cell::insert( shape_node Shape ) { @@ -545,6 +598,51 @@ basic_section::radio_stop( glm::dvec3 const &Location, float const Radius ) { } } +// sends content of the class to provided stream +void +basic_section::serialize( std::ostream &Output ) const { + + auto const sectionstartpos { Output.tellp() }; + + // region file version 0, section data + // section size + sn_utils::ls_uint32( Output, 0 ); + // bounding area + m_area.serialize( Output ); + // section shapes: shape count followed by shape data + sn_utils::ls_uint32( Output, m_shapes.size() ); + for( auto const &shape : m_shapes ) { + shape.serialize( Output ); + } + // partitioned data + for( auto const &cell : m_cells ) { + cell.serialize( Output ); + } + // all done; calculate and record section size + auto const sectionendpos { Output.tellp() }; + Output.seekp( sectionstartpos ); + sn_utils::ls_uint32( Output, static_cast( ( sizeof( uint32_t ) + ( sectionendpos - sectionstartpos ) ) ) ); + Output.seekp( sectionendpos ); +} + +// restores content of the class from provided stream +void +basic_section::deserialize( std::istream &Input ) { + + // region file version 0, section data + // bounding area + m_area.deserialize( Input ); + // section shapes: shape count followed by shape data + auto shapecount { sn_utils::ld_uint32( Input ) }; + while( shapecount-- ) { + m_shapes.emplace_back( shape_node().deserialize( Input ) ); + } + // partitioned data + for( auto &cell : m_cells ) { + cell.deserialize( Input ); + } +} + // adds provided shape to the section void basic_section::insert( shape_node Shape ) { @@ -767,15 +865,73 @@ basic_region::update_traction( TDynamicObject *Vehicle, int const Pantographinde // stores content of the class in file with specified name void -basic_region::serialize( std::string const &Scenariofile ) { - // TODO: implement +basic_region::serialize( std::string const &Scenariofile ) const { + + auto filename { Global::asCurrentSceneryPath + Scenariofile }; + if( ( filename.rfind( '.' ) != std::string::npos ) + && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { + // trim extension, it's typically going to be for different file type + filename.erase( filename.rfind( '.' ) ); + } + filename += EU07_FILEEXTENSION_REGION; + + std::ofstream output { filename, std::ios::binary }; + + // region file version 0 + // header: EU07SBT + version (0-255) + sn_utils::ls_uint32( output, MAKE_ID4( 'E', 'U', '0', '7' ) ); + sn_utils::ls_uint32( output, MAKE_ID4( 'S', 'B', 'T', 0 ) ); + // sections + // TBD, TODO: build table of sections and file offsets, if we postpone section loading until they're within range + for( auto section : m_sections ) { + // length of section data, followed by section data (if any) + if( section != nullptr ) { + section->serialize( output ); } + else { + sn_utils::ls_uint32( output, 0 ); } + } } // restores content of the class from file with specified name. returns: true on success, false otherwise bool basic_region::deserialize( std::string const &Scenariofile ) { - // TODO: implement - return false; + + auto filename { Global::asCurrentSceneryPath + Scenariofile }; + if( ( filename.rfind( '.' ) != std::string::npos ) + && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { + // trim extension, it's typically going to be for different file type + filename.erase( filename.rfind( '.' ) ); + } + filename += EU07_FILEEXTENSION_REGION; + + if( false == FileExists( filename ) ) { + return false; + } + // region file version 0 + // file type and version check + std::ifstream input( filename, std::ios::binary ); + + uint32_t headermain { sn_utils::ld_uint32( input ) }; + uint32_t headertype { sn_utils::ld_uint32( input ) }; + + if( ( headermain != MAKE_ID4( 'E', 'U', '0', '7' ) + || ( headertype != MAKE_ID4( 'S', 'B', 'T', 0 ) ) ) ) { + // wrong file type + ErrorLog( "Bad file: \"" + filename + "\" is of either unrecognized type or version" ); + return false; + } + // sections + // TBD, TODO: build table of sections and file offsets, if we postpone section loading until they're within range + for( auto §ion : m_sections ) { + // length of section data, followed by section data (if any) + auto const sectionsize { sn_utils::ld_uint32( input ) }; + if( sectionsize != 0 ) { + section = new basic_section(); + section->deserialize( input ); + } + } + + return true; } // legacy method, links specified path piece with potential neighbours diff --git a/scene.h b/scene.h index 05cd4838..06bcd6d6 100644 --- a/scene.h +++ b/scene.h @@ -81,6 +81,12 @@ public: // legacy method, updates geometry for pieces in the animation list void RaAnimate( unsigned int const Framestamp ); + // sends content of the class to provided stream + void + serialize( std::ostream &Output ) const; + // restores content of the class from provided stream + void + deserialize( std::istream &Input ); // adds provided shape to the cell void insert( shape_node Shape ); @@ -186,6 +192,12 @@ public: // legacy method, triggers radio-stop procedure for all vehicles in 2km radius around specified location void radio_stop( glm::dvec3 const &Location, float const Radius ); + // sends content of the class to provided stream + void + serialize( std::ostream &Output ) const; + // restores content of the class from provided stream + void + deserialize( std::istream &Input ); // adds provided shape to the section void insert( shape_node Shape ); @@ -272,7 +284,7 @@ public: update_sounds(); // stores content of the class in file with specified name void - serialize( std::string const &Scenariofile ); + serialize( std::string const &Scenariofile ) const; // restores content of the class from file with specified name. returns: true on success, false otherwise bool deserialize( std::string const &Scenariofile ); diff --git a/scenenode.cpp b/scenenode.cpp index fc20188f..5feef77e 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -12,10 +12,126 @@ http://mozilla.org/MPL/2.0/. #include "renderer.h" #include "logs.h" +#include "sn_utils.h" + + +// stores content of the struct in provided output stream +void +lighting_data::serialize( std::ostream &Output ) const { + + sn_utils::s_vec4( Output, diffuse ); + sn_utils::s_vec4( Output, ambient ); + sn_utils::s_vec4( Output, specular ); +} + +// restores content of the struct from provided input stream +void +lighting_data::deserialize( std::istream &Input ) { + + diffuse = sn_utils::d_vec4( Input ); + ambient = sn_utils::d_vec4( Input ); + specular = sn_utils::d_vec4( Input ); +} + + namespace scene { -// restores content of the node from provded input stream +// stores content of the struct in provided output stream +void +bounding_area::serialize( std::ostream &Output ) const { + // center + sn_utils::s_dvec3( Output, center ); + // radius + sn_utils::ls_float32( Output, radius ); +} + +// restores content of the struct from provided input stream +void +bounding_area::deserialize( std::istream &Input ) { + + center = sn_utils::d_dvec3( Input ); + radius = sn_utils::ld_float32( Input ); +} + + + +// sends content of the struct to provided stream +void +shape_node::shapenode_data::serialize( std::ostream &Output ) const { + // bounding area + area.serialize( Output ); + // visibility + sn_utils::ls_float64( Output, rangesquared_min ); + sn_utils::ls_float64( Output, rangesquared_max ); + sn_utils::s_bool( Output, visible ); + // material + sn_utils::s_bool( Output, translucent ); + // NOTE: material handle is created dynamically on load + sn_utils::s_str( + Output, + ( material != null_handle ? + GfxRenderer.Material( material ).name : + "" ) ); + lighting.serialize( Output ); + // geometry + sn_utils::s_dvec3( Output, origin ); + // NOTE: geometry handle is created dynamically on load + // vertex count, followed by vertex data + sn_utils::ls_uint32( Output, vertices.size() ); + for( auto const &vertex : vertices ) { + vertex.serialize( Output ); + } +} + +// restores content of the struct from provided input stream +void +shape_node::shapenode_data::deserialize( std::istream &Input ) { + // bounding area + area.deserialize( Input ); + // visibility + rangesquared_min = sn_utils::ld_float64( Input ); + rangesquared_max = sn_utils::ld_float64( Input ); + visible = sn_utils::d_bool( Input ); + // material + translucent = sn_utils::d_bool( Input ); + auto const materialname { sn_utils::d_str( Input ) }; + if( false == materialname.empty() ) { + material = GfxRenderer.Fetch_Material( materialname ); + } + lighting.deserialize( Input ); + // geometry + origin = sn_utils::d_dvec3( Input ); + // NOTE: geometry handle is acquired during geometry creation + // vertex data + vertices.resize( sn_utils::ld_uint32( Input ) ); + for( auto &vertex : vertices ) { + vertex.deserialize( Input ); + } +} + + +// sends content of the class to provided stream +void +shape_node::serialize( std::ostream &Output ) const { + // name + sn_utils::s_str( Output, m_name ); + // node data + m_data.serialize( Output ); +} + +// restores content of the node from provided input stream +shape_node & +shape_node::deserialize( std::istream &Input ) { + // name + m_name = sn_utils::d_str( Input ); + // node data + m_data.deserialize( Input ); + + return *this; +} + +// restores content of the node from provided input stream shape_node & shape_node::deserialize( cParser &Input, scene::node_data const &Nodedata ) { @@ -104,7 +220,9 @@ shape_node::deserialize( cParser &Input, scene::node_data const &Nodedata ) { triangles, triangle_strip, triangle_fan - } const nodetype = ( + }; + + subtype const nodetype = ( Nodedata.type == "triangles" ? triangles : Nodedata.type == "triangle_strip" ? triangle_strip : triangle_fan ); @@ -320,6 +438,72 @@ shape_node::compute_radius() { +// sends content of the struct to provided stream +void +lines_node::linesnode_data::serialize( std::ostream &Output ) const { + // bounding area + area.serialize( Output ); + // visibility + sn_utils::ls_float64( Output, rangesquared_min ); + sn_utils::ls_float64( Output, rangesquared_max ); + sn_utils::s_bool( Output, visible ); + // material + sn_utils::ls_float32( Output, line_width ); + lighting.serialize( Output ); + // geometry + sn_utils::s_dvec3( Output, origin ); + // NOTE: geometry handle is created dynamically on load + // vertex count, followed by vertex data + sn_utils::ls_uint32( Output, vertices.size() ); + for( auto const &vertex : vertices ) { + vertex.serialize( Output ); + } +} + +// restores content of the struct from provided input stream +void +lines_node::linesnode_data::deserialize( std::istream &Input ) { + // bounding area + area.deserialize( Input ); + // visibility + rangesquared_min = sn_utils::ld_float64( Input ); + rangesquared_max = sn_utils::ld_float64( Input ); + visible = sn_utils::d_bool( Input ); + // material + line_width = sn_utils::ld_float32( Input ); + lighting.deserialize( Input ); + // geometry + origin = sn_utils::d_dvec3( Input ); + // NOTE: geometry handle is acquired during geometry creation + // vertex data + vertices.resize( sn_utils::ld_uint32( Input ) ); + for( auto &vertex : vertices ) { + vertex.deserialize( Input ); + } +} + + + +// sends content of the class to provided stream +void +lines_node::serialize( std::ostream &Output ) const { + // name + sn_utils::s_str( Output, m_name ); + // node data + m_data.serialize( Output ); +} + +// restores content of the node from provided input stream +lines_node & +lines_node::deserialize( std::istream &Input ) { + // name + m_name = sn_utils::d_str( Input ); + // node data + m_data.deserialize( Input ); + + return *this; +} + // restores content of the node from provded input stream lines_node & lines_node::deserialize( cParser &Input, scene::node_data const &Nodedata ) { @@ -350,7 +534,9 @@ lines_node::deserialize( cParser &Input, scene::node_data const &Nodedata ) { lines, line_strip, line_loop - } const nodetype = ( + }; + + subtype const nodetype = ( Nodedata.type == "lines" ? lines : Nodedata.type == "line_strip" ? line_strip : line_loop ); diff --git a/scenenode.h b/scenenode.h index 2978c1a9..449575b3 100644 --- a/scenenode.h +++ b/scenenode.h @@ -22,6 +22,13 @@ struct lighting_data { glm::vec4 diffuse { 0.8f, 0.8f, 0.8f, 1.0f }; glm::vec4 ambient { 0.2f, 0.2f, 0.2f, 1.0f }; glm::vec4 specular { 0.0f, 0.0f, 0.0f, 1.0f }; + + // stores content of the struct in provided output stream + void + serialize( std::ostream &Output ) const; + // restores content of the struct from provided input stream + void + deserialize( std::istream &Input ); }; inline @@ -50,6 +57,12 @@ struct bounding_area { center( Center ), radius( Radius ) {} + // stores content of the struct in provided output stream + void + serialize( std::ostream &Output ) const; + // restores content of the struct from provided input stream + void + deserialize( std::istream &Input ); }; struct node_data { @@ -68,23 +81,37 @@ class shape_node { public: // types struct shapenode_data { + // members: // placement and visibility scene::bounding_area area; // bounding area, in world coordinates - bool visible { true }; // visibility flag double rangesquared_min { 0.0 }; // visibility range, min double rangesquared_max { 0.0 }; // visibility range, max + bool visible { true }; // visibility flag // material data - material_handle material { 0 }; - lighting_data lighting; bool translucent { false }; // whether opaque or translucent + material_handle material { null_handle }; + lighting_data lighting; // geometry data - std::vector vertices; // world space source data of the geometry glm::dvec3 origin; // world position of the relative coordinate system origin geometry_handle geometry { 0, 0 }; // relative origin-centered chunk of geometry held by gfx renderer + std::vector vertices; // world space source data of the geometry + // methods: + // sends content of the struct to provided stream + void + serialize( std::ostream &Output ) const; + // restores content of the struct from provided input stream + void + deserialize( std::istream &Input ); }; // methods - // restores content of the node from provded input stream + // sends content of the class to provided stream + void + serialize( std::ostream &Output ) const; + // restores content of the node from provided input stream + shape_node & + deserialize( std::istream &Input ); + // restores content of the node from provided input stream shape_node & deserialize( cParser &Input, scene::node_data const &Nodedata ); // imports data from provided submodel @@ -144,22 +171,36 @@ class lines_node { public: // types struct linesnode_data { + // members: // placement and visibility scene::bounding_area area; // bounding area, in world coordinates - bool visible { true }; // visibility flag double rangesquared_min { 0.0 }; // visibility range, min double rangesquared_max { 0.0 }; // visibility range, max + bool visible { true }; // visibility flag // material data + float line_width { 1.f }; // thickness of stored lines lighting_data lighting; - float line_width; // thickness of stored lines // geometry data - std::vector vertices; // world space source data of the geometry glm::dvec3 origin; // world position of the relative coordinate system origin geometry_handle geometry { 0, 0 }; // relative origin-centered chunk of geometry held by gfx renderer + std::vector vertices; // world space source data of the geometry + // methods: + // sends content of the struct to provided stream + void + serialize( std::ostream &Output ) const; + // restores content of the struct from provided input stream + void + deserialize( std::istream &Input ); }; // methods - // restores content of the node from provded input stream + // sends content of the class to provided stream + void + serialize( std::ostream &Output ) const; + // restores content of the node from provided input stream + lines_node & + deserialize( std::istream &Input ); + // restores content of the node from provided input stream lines_node & deserialize( cParser &Input, scene::node_data const &Nodedata ); // adds content of provided node to already enclosed geometry. returns: true if merge could be performed diff --git a/simulation.cpp b/simulation.cpp index 1a99189c..1c469dd0 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -349,30 +349,37 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad else if( nodedata.type == "model" ) { if( nodedata.range_min < 0.0 ) { - // convert and import 3d terrain - auto *instance { deserialize_model( Input, Scratchpad, nodedata ) }; - // model import can potentially fail - if( instance == nullptr ) { return; } - // go through submodels, and import them as shapes - auto const cellcount = instance->TerrainCount() + 1; // zliczenie submodeli - for( auto i = 1; i < cellcount; ++i ) { - auto *submodel = instance->TerrainSquare( i - 1 ); - simulation::Region->insert_shape( - scene::shape_node().convert( submodel ), - Scratchpad, - false ); - // if there's more than one group of triangles in the cell they're held as children of the primary submodel - submodel = submodel->ChildGet(); - while( submodel != nullptr ) { + // 3d terrain + if( false == Scratchpad.binary.terrain ) { + // if we're loading data from text .scn file convert and import + auto *instance { deserialize_model( Input, Scratchpad, nodedata ) }; + // model import can potentially fail + if( instance == nullptr ) { return; } + // go through submodels, and import them as shapes + auto const cellcount = instance->TerrainCount() + 1; // zliczenie submodeli + for( auto i = 1; i < cellcount; ++i ) { + auto *submodel = instance->TerrainSquare( i - 1 ); simulation::Region->insert_shape( scene::shape_node().convert( submodel ), Scratchpad, false ); - submodel = submodel->NextGet(); + // if there's more than one group of triangles in the cell they're held as children of the primary submodel + submodel = submodel->ChildGet(); + while( submodel != nullptr ) { + simulation::Region->insert_shape( + scene::shape_node().convert( submodel ), + Scratchpad, + false ); + submodel = submodel->NextGet(); + } } + // with the import done we can get rid of the source model + delete instance; + } + else { + // if binary terrain file was present, we already have this data + skip_until( Input, "endmodel" ); } - // with the import done we can get rid of the source model - delete instance; } else { // regular instance of 3d mesh diff --git a/sn_utils.cpp b/sn_utils.cpp index f454fc3c..9906d9c1 100644 --- a/sn_utils.cpp +++ b/sn_utils.cpp @@ -75,6 +75,28 @@ std::string sn_utils::d_str(std::istream &s) return r; } +bool sn_utils::d_bool(std::istream& s) +{ + return ( ld_uint16( s ) == 1 ); +} + +glm::dvec3 sn_utils::d_dvec3(std::istream& s) +{ + return { + ld_float64(s), + ld_float64(s), + ld_float64(s) }; +} + +glm::vec4 sn_utils::d_vec4( std::istream& s) +{ + return { + ld_float32(s), + ld_float32(s), + ld_float32(s), + ld_float32(s) }; +} + void sn_utils::ls_uint16(std::ostream &s, uint16_t v) { uint8_t buf[2]; @@ -133,4 +155,28 @@ void sn_utils::s_str(std::ostream &s, std::string v) { const char* buf = v.c_str(); s.write(buf, v.size() + 1); -} \ No newline at end of file +} + +void sn_utils::s_bool(std::ostream &s, bool v) +{ + ls_uint16( + s, + ( true == v ? + 1 : + 0 ) ); +} + +void sn_utils::s_dvec3(std::ostream &s, glm::dvec3 const &v) +{ + ls_float64(s, v.x); + ls_float64(s, v.y); + ls_float64(s, v.z); +} + +void sn_utils::s_vec4(std::ostream &s, glm::vec4 const &v) +{ + ls_float32(s, v.x); + ls_float32(s, v.y); + ls_float32(s, v.z); + ls_float32(s, v.w); +} diff --git a/sn_utils.h b/sn_utils.h index dd269121..e11d1b31 100644 --- a/sn_utils.h +++ b/sn_utils.h @@ -13,6 +13,9 @@ public: static float ld_float32(std::istream&); static double ld_float64(std::istream&); static std::string d_str(std::istream&); + static bool d_bool(std::istream&); + static glm::dvec3 d_dvec3(std::istream&); + static glm::vec4 d_vec4(std::istream&); static void ls_uint16(std::ostream&, uint16_t); static void ls_uint32(std::ostream&, uint32_t); @@ -20,4 +23,7 @@ public: static void ls_float32(std::ostream&, float); static void ls_float64(std::ostream&, double); static void s_str(std::ostream&, std::string); + static void s_bool(std::ostream&, bool); + static void s_dvec3(std::ostream&, glm::dvec3 const &); + static void s_vec4(std::ostream&, glm::vec4 const &); }; \ No newline at end of file diff --git a/version.h b/version.h index 2fced4fe..405dacc3 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1028 +#define VERSION_MINOR 1030 #define VERSION_REVISION 0 diff --git a/vertex.cpp b/vertex.cpp index 79093460..e1d60fd2 100644 --- a/vertex.cpp +++ b/vertex.cpp @@ -11,6 +11,37 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "vertex.h" +#include "sn_utils.h" + +void +world_vertex::serialize( std::ostream &s ) const { + + sn_utils::ls_float64( s, position.x ); + sn_utils::ls_float64( s, position.y ); + sn_utils::ls_float64( s, position.z ); + + sn_utils::ls_float32( s, normal.x ); + sn_utils::ls_float32( s, normal.y ); + sn_utils::ls_float32( s, normal.z ); + + sn_utils::ls_float32( s, texture.x ); + sn_utils::ls_float32( s, texture.y ); +} + +void +world_vertex::deserialize( std::istream &s ) { + + position.x = sn_utils::ld_float64( s ); + position.y = sn_utils::ld_float64( s ); + position.z = sn_utils::ld_float64( s ); + + normal.x = sn_utils::ld_float32( s ); + normal.y = sn_utils::ld_float32( s ); + normal.z = sn_utils::ld_float32( s ); + + texture.x = sn_utils::ld_float32( s ); + texture.y = sn_utils::ld_float32( s ); +} template <> world_vertex & diff --git a/vertex.h b/vertex.h index ee983439..0dcfbbb9 100644 --- a/vertex.h +++ b/vertex.h @@ -50,6 +50,8 @@ struct world_vertex { Left *= Right; return Left; } // methods + void serialize( std::ostream& ) const; + void deserialize( std::istream& ); // wyliczenie współrzędnych i mapowania punktu na środku odcinka v1<->v2 void set_half( world_vertex const &Vertex1, world_vertex const &Vertex2 ) { From ffbaacdb0e368a130e851fbae1635c8ea0cc2b32 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 31 Oct 2017 21:43:31 +0100 Subject: [PATCH 214/426] build 171031: reduced footprint for binary region terrain file --- McZapkie/mctools.cpp | 23 +++++++++++++++++++++- McZapkie/mctools.h | 3 +++ scene.cpp | 45 +++++++++++++++++++++++++++++--------------- scenenode.cpp | 24 +++++++++++++++++++---- simulation.cpp | 13 ++++++++++--- version.h | 2 +- 6 files changed, 86 insertions(+), 24 deletions(-) diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index 2b63e841..7cb32c88 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -13,6 +13,17 @@ Copyright (C) 2007-2014 Maciej Cierniak */ #include "stdafx.h" #include "mctools.h" + +#include +#include +#ifndef WIN32 +#include +#endif + +#ifdef WIN32 +#define stat _stat +#endif + #include "Globals.h" /*================================================*/ @@ -275,8 +286,18 @@ extract_value( bool &Variable, std::string const &Key, std::string const &Input, } } -bool FileExists( std::string const &Filename ) { +bool +FileExists( std::string const &Filename ) { std::ifstream file( Filename ); return( true == file.is_open() ); } + +// returns time of last modification for specified file +__time64_t +last_modified( std::string const &Filename ) { + + struct stat filestat; + if( ::stat( Filename.c_str(), &filestat ) == 0 ) { return filestat.st_mtime; } + else { return 0; } +} diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index 6692710b..518cd77d 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -158,3 +158,6 @@ bool extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ); bool FileExists( std::string const &Filename ); + +// returns time of last modification for specified file +__time64_t last_modified( std::string const &Filename ); \ No newline at end of file diff --git a/scene.cpp b/scene.cpp index 00a9cddf..cdf7e511 100644 --- a/scene.cpp +++ b/scene.cpp @@ -224,6 +224,11 @@ basic_cell::deserialize( std::istream &Input ) { while( itemcount-- ) { m_lines.emplace_back( lines_node().deserialize( Input ) ); } + // cell activation flag + m_active = ( + ( false == m_shapesopaque.empty() ) + || ( false == m_shapestranslucent.empty() ) + || ( false == m_lines.empty() ) ); } // adds provided shape to the cell @@ -877,18 +882,27 @@ basic_region::serialize( std::string const &Scenariofile ) const { std::ofstream output { filename, std::ios::binary }; - // region file version 0 + // region file version 1 // header: EU07SBT + version (0-255) sn_utils::ls_uint32( output, MAKE_ID4( 'E', 'U', '0', '7' ) ); - sn_utils::ls_uint32( output, MAKE_ID4( 'S', 'B', 'T', 0 ) ); + sn_utils::ls_uint32( output, MAKE_ID4( 'S', 'B', 'T', 1 ) ); // sections // TBD, TODO: build table of sections and file offsets, if we postpone section loading until they're within range - for( auto section : m_sections ) { - // length of section data, followed by section data (if any) + std::uint32_t sectioncount { 0 }; + for( auto *section : m_sections ) { if( section != nullptr ) { + ++sectioncount; + } + } + // section count, followed by section data + sn_utils::ls_uint32( output, sectioncount ); + std::uint32_t sectionindex { 0 }; + for( auto *section : m_sections ) { + // section data: section index, followed by length of section data, followed by section data + if( section != nullptr ) { + sn_utils::ls_uint32( output, sectionindex ); section->serialize( output ); } - else { - sn_utils::ls_uint32( output, 0 ); } + ++sectionindex; } } @@ -907,7 +921,7 @@ basic_region::deserialize( std::string const &Scenariofile ) { if( false == FileExists( filename ) ) { return false; } - // region file version 0 + // region file version 1 // file type and version check std::ifstream input( filename, std::ios::binary ); @@ -915,20 +929,21 @@ basic_region::deserialize( std::string const &Scenariofile ) { uint32_t headertype { sn_utils::ld_uint32( input ) }; if( ( headermain != MAKE_ID4( 'E', 'U', '0', '7' ) - || ( headertype != MAKE_ID4( 'S', 'B', 'T', 0 ) ) ) ) { + || ( headertype != MAKE_ID4( 'S', 'B', 'T', 1 ) ) ) ) { // wrong file type - ErrorLog( "Bad file: \"" + filename + "\" is of either unrecognized type or version" ); + WriteLog( "Bad file: \"" + filename + "\" is of either unrecognized type or version" ); return false; } // sections // TBD, TODO: build table of sections and file offsets, if we postpone section loading until they're within range - for( auto §ion : m_sections ) { - // length of section data, followed by section data (if any) + // section count + auto sectioncount { sn_utils::ld_uint32( input ) }; + while( sectioncount-- ) { + // section index, followed by section data size, followed by section data + auto *§ion { m_sections[ sn_utils::ld_uint32( input ) ] }; auto const sectionsize { sn_utils::ld_uint32( input ) }; - if( sectionsize != 0 ) { - section = new basic_section(); - section->deserialize( input ); - } + section = new basic_section(); + section->deserialize( input ); } return true; diff --git a/scenenode.cpp b/scenenode.cpp index 5feef77e..f223986c 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -80,7 +80,11 @@ shape_node::shapenode_data::serialize( std::ostream &Output ) const { // vertex count, followed by vertex data sn_utils::ls_uint32( Output, vertices.size() ); for( auto const &vertex : vertices ) { - vertex.serialize( Output ); + basic_vertex( + glm::vec3{ vertex.position - origin }, + vertex.normal, + vertex.texture ) + .serialize( Output ); } } @@ -105,8 +109,12 @@ shape_node::shapenode_data::deserialize( std::istream &Input ) { // NOTE: geometry handle is acquired during geometry creation // vertex data vertices.resize( sn_utils::ld_uint32( Input ) ); + basic_vertex localvertex; for( auto &vertex : vertices ) { - vertex.deserialize( Input ); + localvertex.deserialize( Input ); + vertex.position = origin + glm::dvec3{ localvertex.position }; + vertex.normal = localvertex.normal; + vertex.texture = localvertex.texture; } } @@ -456,7 +464,11 @@ lines_node::linesnode_data::serialize( std::ostream &Output ) const { // vertex count, followed by vertex data sn_utils::ls_uint32( Output, vertices.size() ); for( auto const &vertex : vertices ) { - vertex.serialize( Output ); + basic_vertex( + glm::vec3{ vertex.position - origin }, + vertex.normal, + vertex.texture ) + .serialize( Output ); } } @@ -477,8 +489,12 @@ lines_node::linesnode_data::deserialize( std::istream &Input ) { // NOTE: geometry handle is acquired during geometry creation // vertex data vertices.resize( sn_utils::ld_uint32( Input ) ); + basic_vertex localvertex; for( auto &vertex : vertices ) { - vertex.deserialize( Input ); + localvertex.deserialize( Input ); + vertex.position = origin + glm::dvec3{ localvertex.position }; + vertex.normal = localvertex.normal; + vertex.texture = localvertex.texture; } } diff --git a/simulation.cpp b/simulation.cpp index 1c469dd0..181e22b3 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -39,15 +39,22 @@ state_manager::deserialize( std::string const &Scenariofile ) { // TODO: check first for presence of serialized binary files // if this fails, fall back on the legacy text format scene::scratch_data importscratchpad; - importscratchpad.binary.terrain = Region->deserialize( Scenariofile ); + if( Scenariofile != "$.scn" ) { + // compilation to binary file isn't supported for rainsted-created overrides + importscratchpad.binary.terrain = Region->deserialize( Scenariofile ); + } // NOTE: for the time being import from text format is a given, since we don't have full binary serialization cParser scenarioparser( Scenariofile, cParser::buffer_FILE, Global::asCurrentSceneryPath, Global::bLoadTraction ); if( false == scenarioparser.ok() ) { return false; } deserialize( scenarioparser, importscratchpad ); - // if we didn't find usable binary version of the scenario files, create them now for future use - if( false == importscratchpad.binary.terrain ) { Region->serialize( Scenariofile ); } + if( ( false == importscratchpad.binary.terrain ) + && ( Scenariofile != "$.scn" ) ) { + // if we didn't find usable binary version of the scenario files, create them now for future use + // as long as the scenario file wasn't rainsted-created base file override + Region->serialize( Scenariofile ); + } Global::iPause &= ~0x10; // koniec pauzy wczytywania return true; diff --git a/version.h b/version.h index 405dacc3..e7a0964f 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1030 +#define VERSION_MINOR 1031 #define VERSION_REVISION 0 From a4183abea716eb7d17c1958b9a51450aba25240f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Tue, 31 Oct 2017 22:14:10 +0100 Subject: [PATCH 215/426] Speed control is changed to a command; AI Driver use speed control in EIM vehicles now --- Driver.cpp | 23 +++++++++++++++++++++-- McZapkie/Mover.cpp | 29 +++++++++++++++++------------ 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index ee8d8e2d..097af2e7 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2607,7 +2607,15 @@ bool TController::IncSpeed() if (!mvControlling->FuseFlag) if (Ready || (iDrivigFlags & movePress) || (mvOccupied->ShuntMode)) //{(BrakePress<=0.01*MaxBrakePress)} { - OK = mvControlling->IncMainCtrl(1); + OK = mvControlling->IncMainCtrl(std::max(1,mvOccupied->MainCtrlPosNo/10)); + //tutaj jeszcze powinien być tempomat + mvControlling->IncScndCtrl(1); + double SpeedCntrl = VelDesired; + if (fProximityDist < 50) + { + SpeedCntrl = std::min(SpeedCntrl, VelNext); + } + mvControlling->RunCommand("SpeedCntrl", VelDesired, mvControlling->CabNo); } break; case WheelsDriven: @@ -2660,11 +2668,22 @@ bool TController::DecSpeed(bool force) break; case Dumb: case DieselElectric: - case ElectricInductionMotor: OK = mvControlling->DecScndCtrl(2); if (!OK) OK = mvControlling->DecMainCtrl(2 + (mvControlling->MainCtrlPos / 2)); break; + case ElectricInductionMotor: + OK = mvControlling->DecMainCtrl(1); + if ((mvControlling->ScndCtrlPosNo > 0)&&(mvControlling->Mains)) //jeżeli tempomat + { + mvControlling->IncScndCtrl(1); + mvControlling->RunCommand("SpeedCntrl", VelDesired, mvControlling->CabNo); + } + else + { + mvControlling->DecScndCtrl(2); + } + break; case WheelsDriven: if (!mvControlling->CabNo) mvControlling->CabActivisation(); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 06bc5830..96012866 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1942,6 +1942,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) { /*OK:=*/SendCtrlToNext("MainCtrl", MainCtrlPos, CabNo); //??? /*OK:=*/SendCtrlToNext("ScndCtrl", ScndCtrlPos, CabNo); + } } else // nie ma sterowania @@ -1953,11 +1954,14 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) LastRelayTime = 0; if ((OK) && (EngineType == ElectricInductionMotor)) - // NOTE: round() already adds 0.5, are the ones added here as well correct? + { + // NOTE: round() already adds 0.5, are the ones added here as well correct? if ((Vmax < 250)) - ScndCtrlActualPos = Round(Vel + 0.5); + ScndCtrlActualPos = Round(Vel); else - ScndCtrlActualPos = Round(Vel * 1.0 / 2 + 0.5); + ScndCtrlActualPos = Round(Vel * 0.5); + SendCtrlToNext("SpeedCntrl", ScndCtrlActualPos, CabNo); + } return OK; } @@ -2008,7 +2012,10 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed) LastRelayTime = 0; if ((OK) && (EngineType == ElectricInductionMotor)) + { ScndCtrlActualPos = 0; + SendCtrlToNext("SpeedCntrl", ScndCtrlActualPos, CabNo); + } return OK; } @@ -2359,7 +2366,7 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) if ((Mains != State) && (MainCtrlPosNo > 0)) { if ((State == false) || - ((ScndCtrlPos == 0) && ((ConvOvldFlag == false) || (TrainType == dt_EZT)) && + (((ScndCtrlPos == 0)||(EngineType == ElectricInductionMotor)) && ((ConvOvldFlag == false) || (TrainType == dt_EZT)) && (LastSwitchingTime > CtrlDelay) && !TestFlag(DamageFlag, dtrain_out) && !TestFlag(EngDmgFlag, 1))) { @@ -8046,14 +8053,6 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "ScndCtrl") { - if ((EngineType == ElectricInductionMotor)) - if ((ScndCtrlPos == 0) && (floor(CValue1) > 0)) - if ((Vmax < 250)) - ScndCtrlActualPos = Round(Vel + 0.5); - else - ScndCtrlActualPos = Round(Vel / 2 + 0.5); - else if ((floor(CValue1) == 0)) - ScndCtrlActualPos = 0; if (ScndCtrlPosNo >= floor(CValue1)) ScndCtrlPos = static_cast(floor(CValue1)); OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); @@ -8376,6 +8375,12 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } // if OK then LoadStatus:=0; } + else if (Command == "SpeedCntrl") + { + if ((EngineType == ElectricInductionMotor)) + ScndCtrlActualPos = static_cast(round(CValue1)); + OK = SendCtrlToNext(Command, CValue1, CValue2, Couplertype); + } return OK; // dla true komenda będzie usunięta, dla false wykonana ponownie } From a700d36ea7d8a747aab2ee1a05e11c4a1a76baef Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 1 Nov 2017 02:54:31 +0100 Subject: [PATCH 216/426] maintenance: minor code touch ups --- AnimModel.h | 2 +- Button.h | 1 + EvLaunch.cpp | 4 ++-- EvLaunch.h | 2 +- McZapkie/mctools.cpp | 2 +- McZapkie/mctools.h | 2 +- MemCell.cpp | 2 +- MemCell.h | 4 ++-- Model3d.cpp | 2 +- Model3d.h | 14 ++++++-------- ResourceManager.h | 10 +++++----- Texture.cpp | 2 +- Texture.h | 2 +- Track.h | 23 ++++++++++++++--------- Traction.h | 2 +- openglgeometrybank.h | 4 +++- scene.cpp | 8 ++++---- scene.h | 9 +++++---- scenenode.h | 2 +- simulation.h | 2 +- 20 files changed, 53 insertions(+), 46 deletions(-) diff --git a/AnimModel.h b/AnimModel.h index adcd8d9d..fdcec615 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -125,7 +125,7 @@ class TAnimModel : public editor::basic_node { public: // constructors - TAnimModel( scene::node_data const &Nodedata ); + explicit TAnimModel( scene::node_data const &Nodedata ); // destructor ~TAnimModel(); // methods diff --git a/Button.h b/Button.h index 67061a47..addc43c0 100644 --- a/Button.h +++ b/Button.h @@ -32,6 +32,7 @@ class TButton void play(); // plays specified sound + static void play( PSound Sound ); diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 6abe7350..38c23da1 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -134,8 +134,8 @@ bool TEventLauncher::check_conditions() // key and modifier auto const modifier = ( iKey & 0xff00 ) >> 8; bCond = ( Console::Pressed( iKey & 0xff ) ) - && ( modifier & 1 ? Global::shiftState : true ) - && ( modifier & 2 ? Global::ctrlState : true ); + && ( ( modifier & 1 ) ? Global::shiftState : true ) + && ( ( modifier & 2 ) ? Global::ctrlState : true ); } else { // just key diff --git a/EvLaunch.h b/EvLaunch.h index d6fe9324..b10bed2d 100644 --- a/EvLaunch.h +++ b/EvLaunch.h @@ -18,7 +18,7 @@ class TEventLauncher : public editor::basic_node { public: // constructor - TEventLauncher( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} + explicit TEventLauncher( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} // legacy constructor TEventLauncher() = default; diff --git a/McZapkie/mctools.cpp b/McZapkie/mctools.cpp index 7cb32c88..4fff8667 100644 --- a/McZapkie/mctools.cpp +++ b/McZapkie/mctools.cpp @@ -294,7 +294,7 @@ FileExists( std::string const &Filename ) { } // returns time of last modification for specified file -__time64_t +std::time_t last_modified( std::string const &Filename ) { struct stat filestat; diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index 518cd77d..c86f0731 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -160,4 +160,4 @@ extract_value( bool &Variable, std::string const &Key, std::string const &Input, bool FileExists( std::string const &Filename ); // returns time of last modification for specified file -__time64_t last_modified( std::string const &Filename ); \ No newline at end of file +std::time_t last_modified( std::string const &Filename ); \ No newline at end of file diff --git a/MemCell.cpp b/MemCell.cpp index 51bc2194..7e8b379f 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -139,7 +139,7 @@ bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, && ( !TestFlag( CheckMask, conditional_memval2 ) || ( fValue2 == fTestValue2 ) ) ); }; -bool TMemCell::IsVelocity() +bool TMemCell::IsVelocity() const { // sprawdzenie, czy event odczytu tej komórki ma być do skanowania, czy do kolejkowania if (eCommand == cm_SetVelocity) return true; diff --git a/MemCell.h b/MemCell.h index 97e1eb01..061b75d9 100644 --- a/MemCell.h +++ b/MemCell.h @@ -19,7 +19,7 @@ class TMemCell : public editor::basic_node { public: std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac - TMemCell( scene::node_data const &Nodedata ); + explicit TMemCell( scene::node_data const &Nodedata ); void UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); @@ -46,7 +46,7 @@ public: return bCommand; }; void StopCommandSent(); TCommandType CommandCheck(); - bool IsVelocity(); + bool IsVelocity() const; void AssignEvents(TEvent *e); private: diff --git a/Model3d.cpp b/Model3d.cpp index 9e9200b5..799c136a 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1752,7 +1752,7 @@ void TModel3d::Init() // 2012-02 funkcje do tworzenia terenu z E3D //----------------------------------------------------------------------------- -int TModel3d::TerrainCount() +int TModel3d::TerrainCount() const { // zliczanie kwadratów kilometrowych (główna // linia po Next) do tworznia tablicy int i = 0; diff --git a/Model3d.h b/Model3d.h index 8a0cb8b5..70c7c895 100644 --- a/Model3d.h +++ b/Model3d.h @@ -183,15 +183,13 @@ public: }; void InitialRotate(bool doit); void BinInit(TSubModel *s, float4x4 *m, std::vector *t, std::vector *n, bool dynamic); - void ReplacableSet(material_handle const *r, int a) - { + static void ReplacableSet(material_handle const *r, int a) { ReplacableSkinId = r; - iAlpha = a; - }; + iAlpha = a; }; void Name_Material( std::string const &Name ); void Name( std::string const &Name ); // Ra: funkcje do budowania terenu z E3D - int Flags() { return iFlags; }; + int Flags() const { return iFlags; }; void UnFlagNext() { iFlags &= 0x00FFFFFF; }; void ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ); // sets light level (alpha component of illumination color) to specified value @@ -200,7 +198,7 @@ public: return fMatrix ? *(fMatrix->TranslationGet()) + v_TransVector : v_TransVector; } inline float3 Translation2Get() { return *(fMatrix->TranslationGet()) + Child->Translation1Get(); } - material_handle GetMaterial() { + material_handle GetMaterial() const { return m_material; } void ParentMatrix(float4x4 *m); float MaxY( float4x4 const &m ); @@ -249,8 +247,8 @@ public: void SaveToBinFile(std::string const &FileName); int Flags() const { return iFlags; }; void Init(); - std::string NameGet() { return m_filename; }; - int TerrainCount(); + std::string NameGet() const { return m_filename; }; + int TerrainCount() const; TSubModel * TerrainSquare(int n); void deserialize(std::istream &s, size_t size, bool dynamic); }; diff --git a/ResourceManager.h b/ResourceManager.h index ae890b57..0d28f747 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -61,11 +61,11 @@ class garbage_collector { public: // constructor: - garbage_collector( Container_ &Container, int const Secondstolive, int const Sweepsize, std::string const Resourcename = "resource" ) : - m_container( Container ), - m_unusedresourcetimetolive { std::chrono::seconds( Secondstolive ) }, - m_unusedresourcesweepsize( Sweepsize ), - m_resourcename( Resourcename ) + garbage_collector( Container_ &Container, unsigned int const Secondstolive, std::size_t const Sweepsize, std::string const Resourcename = "resource" ) : + m_unusedresourcetimetolive{ std::chrono::seconds{ Secondstolive } }, + m_unusedresourcesweepsize{ Sweepsize }, + m_resourcename{ Resourcename }, + m_container{ Container } {} // methods: diff --git a/Texture.cpp b/Texture.cpp index b4c2716c..6c6d5448 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -625,7 +625,7 @@ opengl_texture::release( bool const Backup ) { } void -opengl_texture::set_filtering() { +opengl_texture::set_filtering() const { // default texture mode ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); diff --git a/Texture.h b/Texture.h index 62235f4a..64c0e11b 100644 --- a/Texture.h +++ b/Texture.h @@ -60,7 +60,7 @@ private: void load_DDS(); void load_TEX(); void load_TGA(); - void set_filtering(); + void set_filtering() const; void downsize( GLuint const Format ); // members diff --git a/Track.h b/Track.h index 250ebd96..2979525d 100644 --- a/Track.h +++ b/Track.h @@ -96,16 +96,11 @@ class TSwitchExtension class TIsolated { // obiekt zbierający zajętości z kilku odcinków - int iAxles = 0; // ilość osi na odcinkach obsługiwanych przez obiekt - TIsolated *pNext = nullptr; // odcinki izolowane są trzymane w postaci listy jednikierunkowej - static TIsolated *pRoot; // początek listy - public: - std::string asName; // nazwa obiektu, baza do nazw eventów - TEvent *evBusy = nullptr; // zdarzenie wyzwalane po zajęciu grupy - TEvent *evFree = nullptr; // zdarzenie wyzwalane po całkowitym zwolnieniu zajętości grupy - TMemCell *pMemCell = nullptr; // automatyczna komórka pamięci, która współpracuje z odcinkiem izolowanym +public: + // constructors TIsolated(); TIsolated(const std::string &n, TIsolated *i); + // methods static void DeleteAll(); static TIsolated * Find(const std::string &n); // znalezienie obiektu albo utworzenie nowego void Modify(int i, TDynamicObject *o); // dodanie lub odjęcie osi @@ -115,6 +110,16 @@ class TIsolated return (pRoot); }; TIsolated * Next() { return (pNext); }; + // members + std::string asName; // nazwa obiektu, baza do nazw eventów + TEvent *evBusy { nullptr }; // zdarzenie wyzwalane po zajęciu grupy + TEvent *evFree { nullptr }; // zdarzenie wyzwalane po całkowitym zwolnieniu zajętości grupy + TMemCell *pMemCell { nullptr }; // automatyczna komórka pamięci, która współpracuje z odcinkiem izolowanym +private: + // members + int iAxles { 0 }; // ilość osi na odcinkach obsługiwanych przez obiekt + TIsolated *pNext { nullptr }; // odcinki izolowane są trzymane w postaci listy jednikierunkowej + static TIsolated *pRoot; // początek listy }; // trajektoria ruchu - opakowanie @@ -184,7 +189,7 @@ public: bool ScannedFlag = false; // McZapkie: do zaznaczania kolorem torów skanowanych przez AI TGroundNode *nFouling[ 2 ] = { nullptr, nullptr }; // współrzędne ukresu albo oporu kozła - TTrack( scene::node_data const &Nodedata ); + explicit TTrack( scene::node_data const &Nodedata ); virtual ~TTrack(); void Init(); diff --git a/Traction.h b/Traction.h index 20ac20d2..3f75d60e 100644 --- a/Traction.h +++ b/Traction.h @@ -52,7 +52,7 @@ class TTraction : public editor::basic_node { glm::dvec3 m_origin; geometry_handle m_geometry; - TTraction( scene::node_data const &Nodedata ); + explicit TTraction( scene::node_data const &Nodedata ); void Load( cParser *parser, glm::dvec3 const &pOrigin ); // set origin point diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 05a813c1..a13f803e 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -199,8 +199,10 @@ private: bind_buffer(); void delete_buffer(); + static void bind_streams( stream_units const &Units, unsigned int const Streams ); + static void release_streams(); @@ -310,7 +312,7 @@ private: // methods inline bool - valid( geometry_handle const &Geometry ) { + valid( geometry_handle const &Geometry ) const { return ( ( Geometry.bank != 0 ) && ( Geometry.bank <= m_geometrybanks.size() ) ); } inline diff --git a/scene.cpp b/scene.cpp index cdf7e511..16373e93 100644 --- a/scene.cpp +++ b/scene.cpp @@ -394,7 +394,7 @@ basic_cell::register_end( TTraction *Traction ) { // find a vehicle located nearest to specified point, within specified radius, optionally ignoring vehicles without drivers. reurns: located vehicle and distance std::tuple -basic_cell::find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) { +basic_cell::find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) const { TDynamicObject *vehiclenearest { nullptr }; float leastdistance { std::numeric_limits::max() }; @@ -429,7 +429,7 @@ basic_cell::find( glm::dvec3 const &Point, float const Radius, bool const Onlyco // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint std::tuple -basic_cell::find( glm::dvec3 const &Point, TTrack const *Exclude ) { +basic_cell::find( glm::dvec3 const &Point, TTrack const *Exclude ) const { Math3D::vector3 point { Point.x, Point.y, Point.z }; // sad workaround until math classes unification int endpointid; @@ -449,7 +449,7 @@ basic_cell::find( glm::dvec3 const &Point, TTrack const *Exclude ) { // finds a traction piece with one of its ends located in specified point. returns: located traction piece and id of the matching endpoint std::tuple -basic_cell::find( glm::dvec3 const &Point, TTraction const *Exclude ) { +basic_cell::find( glm::dvec3 const &Point, TTraction const *Exclude ) const { int endpointid; @@ -468,7 +468,7 @@ basic_cell::find( glm::dvec3 const &Point, TTraction const *Exclude ) { // finds a traction piece located nearest to specified point, sharing section with specified other piece and powered in specified direction. returns: located traction piece std::tuple -basic_cell::find( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ) { +basic_cell::find( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ) const { TTraction *tractionnearest { nullptr }; diff --git a/scene.h b/scene.h index 06bcd6d6..d4b1853d 100644 --- a/scene.h +++ b/scene.h @@ -116,16 +116,16 @@ public: register_end( TTraction *Traction ); // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple - find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); + find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) const; // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint std::tuple - find( glm::dvec3 const &Point, TTrack const *Exclude ); + find( glm::dvec3 const &Point, TTrack const *Exclude ) const; // finds a traction piece with one of its ends located in specified point. returns: located traction piece and id of the matching endpoint std::tuple - find( glm::dvec3 const &Point, TTraction const *Exclude ); + find( glm::dvec3 const &Point, TTraction const *Exclude ) const; // finds a traction piece located nearest to specified point, sharing section with specified other piece and powered in specified direction. returns: located traction piece std::tuple - find( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ); + find( glm::dvec3 const &Point, TTraction const *Other, int const Currentdirection ) const; // sets center point of the cell void center( glm::dvec3 Center ); @@ -351,6 +351,7 @@ private: bool point_inside( glm::dvec3 const &Location ); // legacy method, trims provided shape to fit into a section. adds trimmed part at the end of provided list, returns true if changes were made + static bool RaTriangleDivider( shape_node &Shape, std::deque &Shapes ); // provides access to section enclosing specified point diff --git a/scenenode.h b/scenenode.h index 449575b3..7c2c7988 100644 --- a/scenenode.h +++ b/scenenode.h @@ -307,7 +307,7 @@ struct basic_node { public: // constructor - basic_node( scene::node_data const &Nodedata ); + explicit basic_node( scene::node_data const &Nodedata ); // destructor virtual ~basic_node() = default; // methods diff --git a/simulation.h b/simulation.h index 4addbe49..862f8445 100644 --- a/simulation.h +++ b/simulation.h @@ -33,7 +33,7 @@ public: // methods // legacy method, calculates changes in simulation state over specified time void - update( double dt, int iter ); + update( double Deltatime, int Iterationcount ); bool deserialize( std::string const &Scenariofile ); From 3456fbd651b13ef741b877e6447e5fe8e5731995 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 1 Nov 2017 03:25:54 +0100 Subject: [PATCH 217/426] improved recognition and handling of light emitting vehicles --- Driver.cpp | 4 +- DynObj.cpp | 75 +++++++++++++----------- DynObj.h | 3 +- McZapkie/MOVER.h | 28 ++++----- Train.cpp | 144 +++++++++++++++++++++++------------------------ World.cpp | 14 ++--- lightarray.cpp | 33 ++++------- simulation.cpp | 9 +-- 8 files changed, 155 insertions(+), 155 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 01478ac6..adce34d5 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1793,7 +1793,7 @@ void TController::AutoRewident() } if (mvOccupied->TrainType == dt_EZT) { - fAccThreshold = std::max(-fBrake_a0[BrakeAccTableSize] - 8 * fBrake_a1[BrakeAccTableSize], -0.75); + fAccThreshold = std::max(-fBrake_a0[BrakeAccTableSize] - 8 * fBrake_a1[BrakeAccTableSize], -0.6); fBrakeReaction = 0.25; } else if (ustaw > 16) @@ -5662,7 +5662,7 @@ bool TController::IsStop() double TController::TrackBlock() const { - return pVehicles[ TMoverParameters::side::front ]->fTrackBlock; + return pVehicles[ side::front ]->fTrackBlock; } void TController::MoveTo(TDynamicObject *to) diff --git a/DynObj.cpp b/DynObj.cpp index 4156d8be..b30cbabb 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1274,21 +1274,21 @@ void TDynamicObject::CouplersDettach(double MinDist, int MyScanDir) { if (MyScanDir > 0) { // pojazd od strony sprzęgu 0 if( ( PrevConnected != nullptr ) - && ( MoverParameters->Couplers[ TMoverParameters::side::front ].CoupleDist > MinDist ) ) { + && ( MoverParameters->Couplers[ side::front ].CoupleDist > MinDist ) ) { // sprzęgi wirtualne zawsze przekraczają - if( ( PrevConnectedNo == TMoverParameters::side::front ? + if( ( PrevConnectedNo == side::front ? PrevConnected->PrevConnected : PrevConnected->NextConnected ) == this ) { // Ra: nie rozłączamy znalezionego, jeżeli nie do nas podłączony // (może jechać w innym kierunku) PrevConnected->MoverParameters->Couplers[PrevConnectedNo].Connected = nullptr; - if( PrevConnectedNo == TMoverParameters::side::front ) { + if( PrevConnectedNo == side::front ) { // sprzęg 0 nie podłączony PrevConnected->PrevConnectedNo = 2; PrevConnected->PrevConnected = nullptr; } - else if( PrevConnectedNo == TMoverParameters::side::rear ) { + else if( PrevConnectedNo == side::rear ) { // sprzęg 1 nie podłączony PrevConnected->NextConnectedNo = 2; PrevConnected->NextConnected = nullptr; @@ -1297,27 +1297,27 @@ void TDynamicObject::CouplersDettach(double MinDist, int MyScanDir) { // za to zawsze odłączamy siebie PrevConnected = nullptr; PrevConnectedNo = 2; // sprzęg 0 nie podłączony - MoverParameters->Couplers[ TMoverParameters::side::front ].Connected = nullptr; + MoverParameters->Couplers[ side::front ].Connected = nullptr; } } else { // pojazd od strony sprzęgu 1 if( ( NextConnected != nullptr ) - && ( MoverParameters->Couplers[ TMoverParameters::side::rear ].CoupleDist > MinDist ) ) { + && ( MoverParameters->Couplers[ side::rear ].CoupleDist > MinDist ) ) { // sprzęgi wirtualne zawsze przekraczają - if( ( NextConnectedNo == TMoverParameters::side::front ? + if( ( NextConnectedNo == side::front ? NextConnected->PrevConnected : NextConnected->NextConnected ) == this) { // Ra: nie rozłączamy znalezionego, jeżeli nie do nas podłączony // (może jechać w innym kierunku) NextConnected->MoverParameters->Couplers[ NextConnectedNo ].Connected = nullptr; - if( NextConnectedNo == TMoverParameters::side::front ) { + if( NextConnectedNo == side::front ) { // sprzęg 0 nie podłączony NextConnected->PrevConnectedNo = 2; NextConnected->PrevConnected = nullptr; } - else if( NextConnectedNo == TMoverParameters::side::rear ) { + else if( NextConnectedNo == side::rear ) { // sprzęg 1 nie podłączony NextConnected->NextConnectedNo = 2; NextConnected->NextConnected = nullptr; @@ -1409,7 +1409,7 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) // siebie można bezpiecznie podłączyć jednostronnie do znalezionego MoverParameters->Attach( mycoupler, foundcoupler, foundobject->MoverParameters, coupling::faux ); // MoverParameters->Couplers[MyCouplFound].Render=false; //wirtualnego nie renderujemy - if( mycoupler == TMoverParameters::side::front ) { + if( mycoupler == side::front ) { PrevConnected = foundobject; // pojazd od strony sprzęgu 0 PrevConnectedNo = foundcoupler; } @@ -1420,7 +1420,7 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) if( foundobject->MoverParameters->Couplers[ foundcoupler ].CouplingFlag == coupling::faux ) { // Ra: wpinamy się wirtualnym tylko jeśli znaleziony ma wirtualny sprzęg - if( ( foundcoupler == TMoverParameters::side::front ? + if( ( foundcoupler == side::front ? foundobject->PrevConnected : foundobject->NextConnected ) != this ) { @@ -1428,13 +1428,13 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) // otherwise we risk leaving the target's connected vehicle with active one-side connection foundobject->CouplersDettach( 1.0, - ( foundcoupler == TMoverParameters::side::front ? + ( foundcoupler == side::front ? 1 : -1 ) ); } foundobject->MoverParameters->Attach( foundcoupler, mycoupler, this->MoverParameters, coupling::faux ); - if( foundcoupler == TMoverParameters::side::front ) { + if( foundcoupler == side::front ) { // jeśli widoczny sprzęg 0 znalezionego if( ( DebugModeFlag ) && ( foundobject->PrevConnected ) @@ -1551,8 +1551,6 @@ TDynamicObject::TDynamicObject() iAxleFirst = 0; // numer pierwszej osi w kierunku ruchu (przełączenie // następuje, gdy osie sa na // tym samym torze) - iInventory = 0; // flagi bitowe posiadanych submodeli (zaktualizuje się po - // wczytaniu MMD) RaLightsSet(0, 0); // początkowe zerowanie stanu świateł // Ra: domyślne ilości animacji dla zgodności wstecz (gdy brak ilości podanych // w MMD) @@ -1929,19 +1927,19 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" btEndSignals21.Init("endsignal23", mdModel, false); btEndSignals13.Init("endsignal12", mdModel, false); btEndSignals23.Init("endsignal22", mdModel, false); - iInventory |= btEndSignals11.Active() ? 0x01 : 0; // informacja, czy ma poszczególne światła - iInventory |= btEndSignals21.Active() ? 0x02 : 0; - iInventory |= btEndSignals13.Active() ? 0x04 : 0; - iInventory |= btEndSignals23.Active() ? 0x08 : 0; + iInventory[ side::front ] |= btEndSignals11.Active() ? light::redmarker_left : 0; // informacja, czy ma poszczególne światła + iInventory[ side::front ] |= btEndSignals13.Active() ? light::redmarker_right : 0; + iInventory[ side::rear ] |= btEndSignals21.Active() ? light::redmarker_left : 0; + iInventory[ side::rear ] |= btEndSignals23.Active() ? light::redmarker_right : 0; // ABu: to niestety zostawione dla kompatybilnosci modeli: btEndSignals1.Init("endsignals1", mdModel, false); btEndSignals2.Init("endsignals2", mdModel, false); btEndSignalsTab1.Init("endtab1", mdModel, false); btEndSignalsTab2.Init("endtab2", mdModel, false); - iInventory |= btEndSignals1.Active() ? 0x10 : 0; - iInventory |= btEndSignals2.Active() ? 0x20 : 0; - iInventory |= btEndSignalsTab1.Active() ? 0x40 : 0; // tabliczki blaszane - iInventory |= btEndSignalsTab2.Active() ? 0x80 : 0; + iInventory[ side::front ] |= btEndSignals1.Active() ? ( light::redmarker_left | light::redmarker_right ) : 0; + iInventory[ side::front ] |= btEndSignalsTab1.Active() ? light::rearendsignals : 0; // tabliczki blaszane + iInventory[ side::rear ] |= btEndSignals2.Active() ? ( light::redmarker_left | light::redmarker_right ) : 0; + iInventory[ side::rear ] |= btEndSignalsTab2.Active() ? light::rearendsignals : 0; // ABu Uwaga! tu zmienic w modelu! btHeadSignals11.Init("headlamp13", mdModel, false); // lewe btHeadSignals12.Init("headlamp11", mdModel, false); // górne @@ -1949,7 +1947,13 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" btHeadSignals21.Init("headlamp23", mdModel, false); btHeadSignals22.Init("headlamp21", mdModel, false); btHeadSignals23.Init("headlamp22", mdModel, false); - btMechanik1.Init("mechanik1", mdLowPolyInt, false); + iInventory[ side::front ] |= btHeadSignals11.Active() ? light::headlight_left : 0; + iInventory[ side::front ] |= btHeadSignals12.Active() ? light::headlight_upper : 0; + iInventory[ side::front ] |= btHeadSignals13.Active() ? light::headlight_right : 0; + iInventory[ side::rear ] |= btHeadSignals21.Active() ? light::headlight_left : 0; + iInventory[ side::rear ] |= btHeadSignals22.Active() ? light::headlight_upper : 0; + iInventory[ side::rear ] |= btHeadSignals23.Active() ? light::headlight_right : 0; + btMechanik1.Init("mechanik1", mdLowPolyInt, false); btMechanik2.Init("mechanik2", mdLowPolyInt, false); TurnOff(); // resetowanie zmiennych submodeli @@ -4984,7 +4988,7 @@ void TDynamicObject::RaLightsSet(int head, int rear) // pojazdu if (!MoverParameters) return; // może tego nie być na początku - if (rear == 2 + 32 + 64) + if (rear == ( light::redmarker_left | light::redmarker_right | light::rearendsignals ) ) { // jeśli koniec pociągu, to trzeba ustalić, czy // jest tam czynna lokomotywa // EN57 może nie mieć końcówek od środka członu @@ -4993,15 +4997,20 @@ void TDynamicObject::RaLightsSet(int head, int rear) { // jeśli ma zarówno światła jak i końcówki, ustalić, czy jest w stanie // aktywnym // np. lokomotywa na zimno będzie mieć końcówki a nie światła - rear = 64; // tablice blaszane + rear = light::rearendsignals; // tablice blaszane // trzeba to uzależnić od "załączenia baterii" w pojeździe } - if (rear == 2 + 32 + 64) // jeśli nadal obydwie możliwości - if (iInventory & - (iDirection ? 0x2A : 0x15)) // czy ma jakieś światła czerowone od danej strony - rear = 2 + 32; // dwa światła czerwone - else - rear = 64; // tablice blaszane + if( rear == ( light::redmarker_left | light::redmarker_right | light::rearendsignals ) ) // jeśli nadal obydwie możliwości + if( iInventory[ + ( iDirection ? + side::rear : + side::front ) ] & ( light::redmarker_left | light::redmarker_right ) ) { + // czy ma jakieś światła czerowone od danej strony + rear = ( light::redmarker_left | light::redmarker_right ); // dwa światła czerwone + } + else { + rear = light::rearendsignals; // tablice blaszane + } } if (iDirection) // w zależności od kierunku pojazdu w składzie { // jesli pojazd stoi sprzęgiem 0 w stronę czoła @@ -5423,7 +5432,7 @@ vehicle_table::update_traction( TDynamicObject *Vehicle ) { // pętla po pantografach auto pantograph { Vehicle->pants[ pantographindex ].fParamPants }; if( true == ( - pantographindex == TMoverParameters::side::front ? + pantographindex == side::front ? Vehicle->MoverParameters->PantFrontUp : Vehicle->MoverParameters->PantRearUp ) ) { // jeśli pantograf podniesiony diff --git a/DynObj.h b/DynObj.h index fbdbd0da..7f8aeb2f 100644 --- a/DynObj.h +++ b/DynObj.h @@ -340,7 +340,7 @@ private: bool bBrakeAcc; TRealSound rsUnbrake; // yB - odglos luzowania float ModCamRot; - int iInventory; // flagi bitowe posiadanych submodeli (np. świateł) + int iInventory[ 2 ] { 0, 0 }; // flagi bitowe posiadanych submodeli (np. świateł) void TurnOff(); public: @@ -466,6 +466,7 @@ private: void RadioStop(); void Damage(char flag); void RaLightsSet(int head, int rear); + int LightList( side const Side ) const { return iInventory[ Side ]; } TDynamicObject * FirstFind(int &coupler_nr, int cf = 1); float GetEPP(); // wyliczanie sredniego cisnienia w PG int DirectionSet(int d); // ustawienie kierunku w składzie diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 2d84007d..ce949609 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -140,6 +140,11 @@ static int const ctrain_passenger = 16; //mostek przejściowy static int const ctrain_scndpneumatic = 32; //przewody 8 atm (żółte; zasilanie powietrzem) static int const ctrain_heating = 64; //przewody ogrzewania WN static int const ctrain_depot = 128; //nie rozłączalny podczas zwykłych manewrów (międzyczłonowy), we wpisie wartość ujemna +// vehicle sides; exclusive +enum side { + front = 0, + rear +}; // possible coupling types; can be combined enum coupling { faux = 0x0, @@ -162,6 +167,16 @@ enum range { enum start { manual, automatic +}; +// recognized vehicle light locations and types; can be combined +enum light { + + headlight_left = 0x01, + redmarker_left = 0x02, + headlight_upper = 0x04, + headlight_right = 0x10, + redmarker_right = 0x20, + rearendsignals = 0x40 }; /*typ hamulca elektrodynamicznego*/ static int const dbrake_none = 0; @@ -699,15 +714,6 @@ public: int LightsDefPos = 1; bool LightsWrap = false; int Lights[2][17]; // pozycje świateł, przód - tył, 1 .. 16 - enum light { - - headlight_left = 0x01, - redmarker_left = 0x02, - headlight_upper = 0x04, - headlight_right = 0x10, - redmarker_right = 0x20, - rearendsignals = 0x40 - }; int ScndInMain{ 0 }; /*zaleznosc bocznika od nastawnika*/ bool MBrake = false; /*Czy jest hamulec reczny*/ double StopBrakeDecc = 0.0; @@ -802,10 +808,6 @@ public: TRotation Rot; std::string Name; /*nazwa wlasna*/ TCoupling Couplers[2]; //urzadzenia zderzno-sprzegowe, polaczenia miedzy wagonami - enum side { - front = 0, - rear - }; #ifdef EU07_USE_OLD_HVCOUPLERS double HVCouplers[ 2 ][ 2 ]; //przewod WN enum hvcoupler { diff --git a/Train.cpp b/Train.cpp index c76f97ec..9ab64c0f 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2074,26 +2074,26 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 0 : - 1 ); + side::front : + side::rear ); if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_left ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_left ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; // visual feedback Train->ggLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); // if the light is controlled by 3-way switch, disable marker light if( Train->ggLeftEndLightButton.SubModel == nullptr ) { - Train->DynamicObject->iLights[ lightsindex ] &= ~TMoverParameters::light::redmarker_left; + Train->DynamicObject->iLights[ vehicleside ] &= ~light::redmarker_left; } } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; // visual feedback Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2107,26 +2107,26 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const & return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 0 : - 1 ); + side::front : + side::rear ); if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_right ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_right ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; // visual feedback Train->ggRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); // if the light is controlled by 3-way switch, disable marker light if( Train->ggRightEndLightButton.SubModel == nullptr ) { - Train->DynamicObject->iLights[ lightsindex ] &= ~TMoverParameters::light::redmarker_right; + Train->DynamicObject->iLights[ vehicleside ] &= ~light::redmarker_right; } } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; // visual feedback Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2140,22 +2140,22 @@ void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const & return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 0 : - 1 ); + side::front : + side::rear ); if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_upper ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_upper ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; // visual feedback Train->ggUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; // visual feedback Train->ggUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2169,16 +2169,16 @@ void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &C return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 0 : - 1 ); + side::front : + side::rear ); if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_left ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_left ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_left; // visual feedback if( Train->ggLeftEndLightButton.SubModel != nullptr ) { Train->ggLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); @@ -2188,12 +2188,12 @@ void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &C // this is crude, but for now will do Train->ggLeftLightButton.UpdateValue( -1.0, Train->dsbSwitch ); // if the light is controlled by 3-way switch, disable the headlight - Train->DynamicObject->iLights[ lightsindex ] &= ~TMoverParameters::light::headlight_left; + Train->DynamicObject->iLights[ vehicleside ] &= ~light::headlight_left; } } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_left; // visual feedback if( Train->ggLeftEndLightButton.SubModel != nullptr ) { Train->ggLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -2214,16 +2214,16 @@ void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const & return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 0 : - 1 ); + side::front : + side::rear ); if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_right ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_right ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_right; // visual feedback if( Train->ggRightEndLightButton.SubModel != nullptr ) { Train->ggRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); @@ -2233,12 +2233,12 @@ void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const & // this is crude, but for now will do Train->ggRightLightButton.UpdateValue( -1.0, Train->dsbSwitch ); // if the light is controlled by 3-way switch, disable the headlight - Train->DynamicObject->iLights[ lightsindex ] &= ~TMoverParameters::light::headlight_right; + Train->DynamicObject->iLights[ vehicleside ] &= ~light::headlight_right; } } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_right; // visual feedback if( Train->ggRightEndLightButton.SubModel != nullptr ) { Train->ggRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -2259,23 +2259,23 @@ void TTrain::OnCommand_headlighttogglerearleft( TTrain *Train, command_data cons return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 1 : - 0 ); + side::rear : + side::front ); if( Command.action == GLFW_PRESS ) { // NOTE: we toggle the light on opposite side, as 'rear right' is 'front left' on the rear end etc // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_right ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_right ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; // visual feedback Train->ggRearLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_right; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; // visual feedback Train->ggRearLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2289,23 +2289,23 @@ void TTrain::OnCommand_headlighttogglerearright( TTrain *Train, command_data con return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 1 : - 0 ); + side::rear : + side::front ); if( Command.action == GLFW_PRESS ) { // NOTE: we toggle the light on opposite side, as 'rear right' is 'front left' on the rear end etc // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_left ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_left ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; // visual feedback Train->ggRearRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_left; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; // visual feedback Train->ggRearRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2319,22 +2319,22 @@ void TTrain::OnCommand_headlighttogglerearupper( TTrain *Train, command_data con return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 1 : - 0 ); + side::rear : + side::front ); if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_upper ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_upper ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; // visual feedback Train->ggRearUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::headlight_upper; + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; // visual feedback Train->ggRearUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2348,23 +2348,23 @@ void TTrain::OnCommand_redmarkertogglerearleft( TTrain *Train, command_data cons return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 1 : - 0 ); + side::rear : + side::front ); if( Command.action == GLFW_PRESS ) { // NOTE: we toggle the light on opposite side, as 'rear right' is 'front left' on the rear end etc // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_right ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_right ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_right; // visual feedback Train->ggRearLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_right; + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_right; // visual feedback Train->ggRearLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2378,23 +2378,23 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con return; } - int const lightsindex = + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? - 1 : - 0 ); + side::rear : + side::front ); if( Command.action == GLFW_PRESS ) { // NOTE: we toggle the light on opposite side, as 'rear right' is 'front left' on the rear end etc // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_left ) == 0 ) { + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_left ) == 0 ) { // turn on - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_left; // visual feedback Train->ggRearRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off - Train->DynamicObject->iLights[ lightsindex ] ^= TMoverParameters::light::redmarker_left; + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_left; // visual feedback Train->ggRearRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -6706,21 +6706,21 @@ void TTrain::set_cab_controls() { ggMaxCurrentCtrl.PutValue( 1.0 ); } // lights - int const lightsindex = + int const vehicleside = ( mvOccupied->ActiveCab == 1 ? - 0 : - 1 ); + side::front : + side::rear ); - if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_left ) != 0 ) { + if( ( DynamicObject->iLights[ vehicleside ] & light::headlight_left ) != 0 ) { ggLeftLightButton.PutValue( 1.0 ); } - if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_right ) != 0 ) { + if( ( DynamicObject->iLights[ vehicleside ] & light::headlight_right ) != 0 ) { ggRightLightButton.PutValue( 1.0 ); } - if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::headlight_upper ) != 0 ) { + if( ( DynamicObject->iLights[ vehicleside ] & light::headlight_upper ) != 0 ) { ggUpperLightButton.PutValue( 1.0 ); } - if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_left ) != 0 ) { + if( ( DynamicObject->iLights[ vehicleside ] & light::redmarker_left ) != 0 ) { if( ggLeftEndLightButton.SubModel != nullptr ) { ggLeftEndLightButton.PutValue( 1.0 ); } @@ -6728,7 +6728,7 @@ void TTrain::set_cab_controls() { ggLeftLightButton.PutValue( -1.0 ); } } - if( ( DynamicObject->iLights[ lightsindex ] & TMoverParameters::light::redmarker_right ) != 0 ) { + if( ( DynamicObject->iLights[ vehicleside ] & light::redmarker_right ) != 0 ) { if( ggRightEndLightButton.SubModel != nullptr ) { ggRightEndLightButton.PutValue( 1.0 ); } diff --git a/World.cpp b/World.cpp index 7949b346..65b364f5 100644 --- a/World.cpp +++ b/World.cpp @@ -707,9 +707,9 @@ void TWorld::OnKeyDown(int cKey) CouplNr = 0; // z [-1,1] zrobić [0,1] int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę tapety pulpitu :/ if (Global::shiftState) // z [Shift] zapalanie - set = mask = TMoverParameters::light::rearendsignals; // bez [Ctrl] założyć tabliczki + set = mask = light::rearendsignals; // bez [Ctrl] założyć tabliczki else if (Global::ctrlState) - set = mask = ( TMoverParameters::light::redmarker_left | TMoverParameters::light::redmarker_right ); // z [Ctrl] zapalić światła czerwone + set = mask = ( light::redmarker_left | light::redmarker_right ); // z [Ctrl] zapalić światła czerwone else mask = 2 + 32 + 64; // wyłączanie ściąga wszystko if (((vehicle->iLights[CouplNr]) & mask) != set) @@ -1435,15 +1435,15 @@ TWorld::Update_UI() { "; TC:" + to_string( vehicle->MoverParameters->TotalCurrent, 0 ); auto const frontcouplerhighvoltage = - to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.voltage, 0 ) + to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.voltage, 0 ) + "@" - + to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.current, 0 ); + + to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.current, 0 ); auto const rearcouplerhighvoltage = - to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.voltage, 0 ) + to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.voltage, 0 ) + "@" - + to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.current, 0 ); + + to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.current, 0 ); uitextline2 += ", HV: "; - if( vehicle->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.local == false ) { + if( vehicle->MoverParameters->Couplers[ side::front ].power_high.local == false ) { uitextline2 += "(" + frontcouplerhighvoltage + ")-" + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" diff --git a/lightarray.cpp b/lightarray.cpp index f0486b7f..9655da56 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -23,8 +23,8 @@ light_array::insert( TDynamicObject const *Owner ) { // we're only storing lights for locos, which have two sets of lights, front and rear // for a more generic role this function would have to be tweaked to add vehicle type-specific light combinations - data.emplace_back( Owner, 0 ); - data.emplace_back( Owner, 1 ); + data.emplace_back( Owner, side::front ); + data.emplace_back( Owner, side::rear ); } void @@ -44,7 +44,7 @@ light_array::update() { for( auto &light : data ) { // update light parameters to match current data of the owner - if( light.index == 0 ) { + if( light.index == side::front ) { // front light set light.position = light.owner->GetPosition() + ( light.owner->VectorFront() * light.owner->GetLength() * 0.4 ); light.direction = glm::make_vec3( light.owner->VectorFront().getArray() ); @@ -57,34 +57,25 @@ light_array::update() { light.direction.z = -light.direction.z; } // determine intensity of this light set - if( ( true == light.owner->MoverParameters->Battery ) || ( true == light.owner->MoverParameters->ConverterFlag ) ) { + if( ( true == light.owner->MoverParameters->Battery ) + || ( true == light.owner->MoverParameters->ConverterFlag ) ) { // with power on, the intensity depends on the state of activated switches - auto const &lightbits = light.owner->iLights[ light.index ]; + // first we cross-check the list of enabled lights with the lights installed in the vehicle... + auto const lights { light.owner->iLights[ light.index ] & light.owner->LightList( static_cast( light.index ) ) }; + // ...then check their individual state light.count = 0 - + ( ( lightbits & TMoverParameters::light::headlight_left ) ? 1 : 0 ) - + ( ( lightbits & TMoverParameters::light::headlight_right ) ? 1 : 0 ) - + ( ( lightbits & TMoverParameters::light::headlight_upper ) ? 1 : 0 ); + + ( ( lights & light::headlight_left ) ? 1 : 0 ) + + ( ( lights & light::headlight_right ) ? 1 : 0 ) + + ( ( lights & light::headlight_upper ) ? 1 : 0 ); if( light.count > 0 ) { - // TODO: intensity can be affected further by dim switch or other factors light.intensity = std::max( 0.0f, std::log( (float)light.count + 1.0f ) ); light.intensity *= ( light.owner->DimHeadlights ? 0.6f : 1.0f ); + // TBD, TODO: intensity can be affected further by other factors } else { light.intensity = 0.0f; } -/* - // crude catch for unmanned modules which share the light state with the controlled unit. - // why don't they get their own light bits btw ._. - // TODO, TBD: have separate light bits for each vehicle, so this override isn't necessary - // NOTE: should be no longer needed, test and delete if there's no ill effects - if( ( light.owner->Controller == AIdriver ) - && ( light.owner->Mechanik == nullptr ) ) { - - light.intensity = 0.0f; - light.count = 0; - } -*/ } else { // with battery off the lights are off diff --git a/simulation.cpp b/simulation.cpp index 181e22b3..450c35d2 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -307,11 +307,8 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad } if( ( vehicle->MoverParameters->CategoryFlag == 1 ) // trains only - && ( ( vehicle->MoverParameters->SecuritySystem.SystemType != 0 ) - || ( vehicle->MoverParameters->SandCapacity > 0.0 ) ) ) { - // we check for presence of security system or sand load, as a way to determine whether the vehicle is a controllable engine - // NOTE: this isn't 100% precise, e.g. middle EZT module comes with security system, while it has no lights, and some engines - // don't have security systems fitted + && ( ( vehicle->LightList( side::front ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) != 0 ) + || ( vehicle->LightList( side::rear ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) != 0 ) ) ) { simulation::Lights.insert( vehicle ); } } @@ -603,7 +600,7 @@ state_manager::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scr } if( Scratchpad.trainset.couplings.back() == coupling::faux ) { // jeśli ostatni pojazd ma sprzęg 0 to założymy mu końcówki blaszane (jak AI się odpali, to sobie poprawi) - Scratchpad.trainset.vehicles.back()->RaLightsSet( -1, TMoverParameters::light::rearendsignals ); + Scratchpad.trainset.vehicles.back()->RaLightsSet( -1, light::rearendsignals ); } // all done Scratchpad.trainset.is_open = false; From da11e689ce0472a9479f48651a28ca9ed28274e8 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 2 Nov 2017 21:51:44 +0100 Subject: [PATCH 218/426] build 171102: mouse support for light preset switch, vehicle lights cab indicators --- Train.cpp | 432 ++++++++++++++++++++-------------------------- Train.h | 13 ++ World.cpp | 8 +- command.cpp | 2 + command.h | 6 +- keyboardinput.cpp | 4 + mouseinput.cpp | 4 +- scene.cpp | 14 +- usefull.h | 2 +- version.h | 2 +- 10 files changed, 226 insertions(+), 261 deletions(-) diff --git a/Train.cpp b/Train.cpp index 9ab64c0f..bb169cea 100644 --- a/Train.cpp +++ b/Train.cpp @@ -246,6 +246,8 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::motoroverloadrelaythresholdtoggle, &TTrain::OnCommand_motoroverloadrelaythresholdtoggle }, { user_command::motoroverloadrelayreset, &TTrain::OnCommand_motoroverloadrelayreset }, { user_command::heatingtoggle, &TTrain::OnCommand_heatingtoggle }, + { user_command::lightspresetactivatenext, &TTrain::OnCommand_lightspresetactivatenext }, + { user_command::lightspresetactivateprevious, &TTrain::OnCommand_lightspresetactivateprevious }, { user_command::headlighttoggleleft, &TTrain::OnCommand_headlighttoggleleft }, { user_command::headlighttoggleright, &TTrain::OnCommand_headlighttoggleright }, { user_command::headlighttoggleupper, &TTrain::OnCommand_headlighttoggleupper }, @@ -2067,6 +2069,60 @@ void TTrain::OnCommand_motoroverloadrelayreset( TTrain *Train, command_data cons } } +void TTrain::OnCommand_lightspresetactivatenext( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo == 0 ) { + // lights are controlled by preset selector + return; + } + if( Command.action != GLFW_PRESS ) { + // one change per key press + return; + } + + if( ( Train->mvOccupied->LightsPos < Train->mvOccupied->LightsPosNo ) + || ( true == Train->mvOccupied->LightsWrap ) ) { + // active light preset is stored as value in range 1-LigthPosNo + Train->mvOccupied->LightsPos = ( + Train->mvOccupied->LightsPos < Train->mvOccupied->LightsPosNo ? + Train->mvOccupied->LightsPos + 1 : + 1 ); // wrap mode + + Train->SetLights(); + // visual feedback + if( Train->ggLightsButton.SubModel != nullptr ) { + Train->ggLightsButton.UpdateValue( Train->mvOccupied->LightsPos - 1, Train->dsbSwitch ); + } + } +} + +void TTrain::OnCommand_lightspresetactivateprevious( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo == 0 ) { + // lights are controlled by preset selector + return; + } + if( Command.action != GLFW_PRESS ) { + // one change per key press + return; + } + + if( ( Train->mvOccupied->LightsPos > 1 ) + || ( true == Train->mvOccupied->LightsWrap ) ) { + // active light preset is stored as value in range 1-LigthPosNo + Train->mvOccupied->LightsPos = ( + Train->mvOccupied->LightsPos > 1 ? + Train->mvOccupied->LightsPos - 1 : + Train->mvOccupied->LightsPosNo ); // wrap mode + + Train->SetLights(); + // visual feedback + if( Train->ggLightsButton.SubModel != nullptr ) { + Train->ggLightsButton.UpdateValue( Train->mvOccupied->LightsPos - 1, Train->dsbSwitch ); + } + } +} + void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ) { if( Train->mvOccupied->LightsPosNo > 0 ) { @@ -2900,7 +2956,8 @@ void TTrain::OnKeyDown(int cKey) DynamicObject->Mechanik->TakeControl(true); } } - else if (cKey == Global::Keys[k_UpperSign]) // ABu 060205: światło górne - +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + else if (cKey == Global::Keys[k_UpperSign]) // ABu 060205: światło górne - // włączenie { if (mvOccupied->LightsPosNo > 0) //kręciolek od swiatel @@ -2917,6 +2974,7 @@ void TTrain::OnKeyDown(int cKey) } } } +#endif } else // McZapkie-240302 - klawisze bez shifta { @@ -3013,8 +3071,7 @@ void TTrain::OnKeyDown(int cKey) } } } - // McZapkie-240302 - wylaczanie automatycznego pilota (w trybie ~debugmode - // mozna tylko raz) + // McZapkie-240302 - wylaczanie automatycznego pilota (w trybie ~debugmode mozna tylko raz) else if (cKey == GLFW_KEY_Q) // bez Shift { if (DynamicObject->Mechanik) @@ -3249,6 +3306,7 @@ if } } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM else if (cKey == Global::Keys[k_UpperSign]) // ABu 060205: światło górne - // wyłączenie { @@ -3266,6 +3324,7 @@ if } } } +#endif // else if (DebugModeFlag) { // przesuwanie składu o 100m @@ -4317,9 +4376,6 @@ bool TTrain::Update( double const Deltatime ) true : false ) ); - // hunter-261211: jakis stary kod (i niezgodny z prawda), - // zahaszowalem i poprawilem - // youBy-220913: ale przyda sie do lampki samej przetwornicy btLampkaPrzetw.Turn( !mvControlled->ConverterFlag ); btLampkaNadmPrzetw.Turn( mvControlled->ConvOvldFlag ); @@ -4330,10 +4386,12 @@ bool TTrain::Update( double const Deltatime ) btLampkaBezoporowa.Turn(mvControlled->ResistorsFlagCheck() || (mvControlled->MainCtrlActualPos == 0)); // do EU04 - if ((mvControlled->Itot != 0) || (mvOccupied->BrakePress > 2) || - (mvOccupied->PipePress < 3.6)) - btLampkaStyczn.TurnOff(); // Ra: czy to jest udawanie działania - // styczników liniowych? + if( ( mvControlled->Itot != 0 ) + || ( mvOccupied->BrakePress > 2 ) + || ( mvOccupied->PipePress < 3.6 ) ) { + // Ra: czy to jest udawanie działania styczników liniowych? + btLampkaStyczn.TurnOff(); + } else if (mvOccupied->BrakePress < 1) btLampkaStyczn.TurnOn(); // mozna prowadzic rozruch if (((TestFlag(mvControlled->Couplers[1].CouplingFlag, ctrain_controll)) && @@ -4513,15 +4571,8 @@ bool TTrain::Update( double const Deltatime ) btLampkaNadmPrzetwB.TurnOn(); btLampkaPrzetwB.TurnOff(); } + } - // hunter-261211: jakis stary kod (i niezgodny z prawda), zahaszowalem - // if (tmp) - // if (tmp->MoverParameters->ConverterFlag==true) - // btLampkaNadmPrzetwB.TurnOff(); - // else - // btLampkaNadmPrzetwB.TurnOn(); - - } //**************************************************** */ if( mvControlled->Battery || mvControlled->ConverterFlag ) { switch (mvControlled->TrainType) @@ -4551,6 +4602,18 @@ bool TTrain::Update( double const Deltatime ) btLampkaForward.Turn(mvControlled->ActiveDir > 0); // jazda do przodu btLampkaBackward.Turn(mvControlled->ActiveDir < 0); // jazda do tyłu btLampkaED.Turn(mvControlled->DynamicBrakeFlag); // hamulec ED + // light indicators + // NOTE: sides are hardcoded to deal with setups where single cab is equipped with all indicators + btLampkaUpperLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_upper ) != 0 ); + btLampkaLeftLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_left ) != 0 ); + btLampkaRightLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_right ) != 0 ); + btLampkaLeftEndLight.Turn( ( mvOccupied->iLights[ side::front ] & light::redmarker_left ) != 0 ); + btLampkaRightEndLight.Turn( ( mvOccupied->iLights[ side::front ] & light::redmarker_right ) != 0 ); + btLampkaRearUpperLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_upper ) != 0 ); + btLampkaRearLeftLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_left ) != 0 ); + btLampkaRearRightLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_right ) != 0 ); + btLampkaRearLeftEndLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::redmarker_left ) != 0 ); + btLampkaRearRightEndLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::redmarker_right ) != 0 ); } else { // gdy bateria wyłączona @@ -4566,7 +4629,19 @@ bool TTrain::Update( double const Deltatime ) btLampkaForward.TurnOff(); btLampkaBackward.TurnOff(); btLampkaED.TurnOff(); + // light indicators + btLampkaUpperLight.TurnOff(); + btLampkaLeftLight.TurnOff(); + btLampkaRightLight.TurnOff(); + btLampkaLeftEndLight.TurnOff(); + btLampkaRightEndLight.TurnOff(); + btLampkaRearUpperLight.TurnOff(); + btLampkaRearLeftLight.TurnOff(); + btLampkaRearRightLight.TurnOff(); + btLampkaRearLeftEndLight.TurnOff(); + btLampkaRearRightEndLight.TurnOff(); } + // McZapkie-080602: obroty (albo translacje) regulatorow if (ggMainCtrl.SubModel) { @@ -4830,12 +4905,6 @@ bool TTrain::Update( double const Deltatime ) ggRearRightLightButton.PutValue(-1); } #endif - if (ggLightsButton.SubModel) - { - ggLightsButton.PutValue(mvOccupied->LightsPos - 1); - ggLightsButton.Update(); - } - ggDimHeadlightsButton.Update(); //--------- // hunter-080812: poprawka na ogrzewanie w elektrykach - usuniete uzaleznienie od przetwornicy if ((((mvControlled->EngineType == ElectricSeriesMotor) && (mvControlled->Mains == true) && @@ -4909,9 +4978,7 @@ bool TTrain::Update( double const Deltatime ) } } - //****************************************** // przelaczniki - #ifdef EU07_USE_OLD_COMMAND_SYSTEM if( Console::Pressed( Global::Keys[ k_Horn ] ) ) { @@ -5652,6 +5719,7 @@ bool TTrain::Update( double const Deltatime ) ggPantCompressorButton.Update(); ggPantCompressorValve.Update(); + ggLightsButton.Update(); ggUpperLightButton.Update(); ggLeftLightButton.Update(); ggRightLightButton.Update(); @@ -5663,6 +5731,7 @@ bool TTrain::Update( double const Deltatime ) ggRearRightLightButton.Update(); ggRearLeftEndLightButton.Update(); ggRearRightEndLightButton.Update(); + ggDimHeadlightsButton.Update(); //------------ ggConverterButton.Update(); ggConverterLocalButton.Update(); @@ -5673,14 +5742,14 @@ bool TTrain::Update( double const Deltatime ) ggHornButton.Update(); ggHornLowButton.Update(); ggHornHighButton.Update(); -/* +#ifdef EU07_USE_OLD_COMMAND_SYSTEM ggUniversal1Button.Update(); ggUniversal2Button.Update(); if( Universal4Active ) { ggUniversal4Button.PermIncValue( dt ); } ggUniversal4Button.Update(); -*/ +#endif for( auto &universal : ggUniversals ) { universal.Update(); } @@ -6597,6 +6666,17 @@ void TTrain::clear_cab_controls() btLampkaWylSzybkiB.Clear(); btLampkaForward.Clear(); btLampkaBackward.Clear(); + // light indicators + btLampkaUpperLight.Clear(); + btLampkaLeftLight.Clear(); + btLampkaRightLight.Clear(); + btLampkaLeftEndLight.Clear(); + btLampkaRightEndLight.Clear(); + btLampkaRearUpperLight.Clear(); + btLampkaRearLeftLight.Clear(); + btLampkaRearRightLight.Clear(); + btLampkaRearLeftEndLight.Clear(); + btLampkaRearRightEndLight.Clear(); btCabLight.Clear(); // hunter-171012 ggLeftLightButton.Clear(); ggRightLightButton.Clear(); @@ -6706,6 +6786,8 @@ void TTrain::set_cab_controls() { ggMaxCurrentCtrl.PutValue( 1.0 ); } // lights + ggLightsButton.PutValue( mvOccupied->LightsPos - 1 ); + int const vehicleside = ( mvOccupied->ActiveCab == 1 ? side::front : @@ -6802,227 +6884,88 @@ void TTrain::set_cab_controls() { // TODO: when cleaning up break setting indicator state into a separate function, so we can reuse it } -// initializes a button matching provided label. returns: true if the label was found, false -// otherwise -// NOTE: this is temporary work-around for compiler else-if limit +// initializes a button matching provided label. returns: true if the label was found, false otherwise // TODO: refactor the cabin controls into some sensible structure -bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int const Cabindex) -{ -/* - TButton *bt; // roboczy wskaźnik na obiekt animujący lampkę -*/ - // SEKCJA LAMPEK - if (Label == "i-maxft:") - { - btLampkaMaxSila.Load(Parser, DynamicObject->mdKabina); +bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int const Cabindex) { + + std::unordered_map const lights = { + { "i-maxft:", btLampkaMaxSila }, + { "i-maxftt:", btLampkaPrzekrMaxSila }, + { "i-radio:", btLampkaRadio }, + { "i-manual_brake:", btLampkaHamulecReczny }, + { "i-door_blocked:", btLampkaBlokadaDrzwi }, + { "i-slippery:", btLampkaPoslizg }, + { "i-contactors:", btLampkaStyczn }, + { "i-conv_ovld:", btLampkaNadmPrzetw }, + { "i-converter:", btLampkaPrzetw }, + { "i-diff_relay:", btLampkaPrzekRozn }, + { "i-diff_relay2:", btLampkaPrzekRoznPom }, + { "i-motor_ovld:", btLampkaNadmSil }, + { "i-train_controll:", btLampkaUkrotnienie }, + { "i-brake_delay_r:", btLampkaHamPosp }, + { "i-mainbreaker:", btLampkaWylSzybki }, + { "i-vent_ovld:", btLampkaNadmWent }, + { "i-comp_ovld:", btLampkaNadmSpr }, + { "i-resistors:", btLampkaOpory }, + { "i-no_resistors:", btLampkaBezoporowa }, + { "i-no_resistors_b:", btLampkaBezoporowaB }, + { "i-highcurrent:", btLampkaWysRozr }, + { "i-vent_trim:", btLampkaWentZaluzje }, + { "i-trainheating:", btLampkaOgrzewanieSkladu }, + { "i-security_aware:", btLampkaCzuwaka }, + { "i-security_cabsignal:", btLampkaSHP }, + { "i-door_left:", btLampkaDoorLeft }, + { "i-door_right:", btLampkaDoorRight }, + { "i-departure_signal:", btLampkaDepartureSignal }, + { "i-reserve:", btLampkaRezerwa }, + { "i-scnd:", btLampkaBoczniki }, + { "i-scnd1:", btLampkaBocznik1 }, + { "i-scnd2:", btLampkaBocznik2 }, + { "i-scnd3:", btLampkaBocznik3 }, + { "i-scnd4:", btLampkaBocznik4 }, + { "i-braking:", btLampkaHamienie }, + { "i-dynamicbrake:", btLampkaED }, + { "i-braking-ezt:", btLampkaHamowanie1zes }, + { "i-braking-ezt2:", btLampkaHamowanie2zes }, + { "i-compressor:", btLampkaSprezarka }, + { "i-compressorb:", btLampkaSprezarkaB }, + { "i-voltbrake:", btLampkaNapNastHam }, + { "i-mainbreakerb:", btLampkaWylSzybkiB }, + { "i-resistorsb:", btLampkaOporyB }, + { "i-contactorsb:", btLampkaStycznB }, + { "i-conv_ovldb:", btLampkaNadmPrzetwB }, + { "i-converterb:", btLampkaPrzetwB }, + { "i-forward:", btLampkaForward }, + { "i-backward:", btLampkaBackward }, + { "i-upperlight:", btLampkaUpperLight }, + { "i-leftlight:", btLampkaLeftLight }, + { "i-rightlight:", btLampkaRightLight }, + { "i-leftend:", btLampkaLeftEndLight }, + { "i-rightend:", btLampkaRightEndLight }, + { "i-rearupperlight:", btLampkaRearUpperLight }, + { "i-rearleftlight:", btLampkaRearLeftLight }, + { "i-rearrightlight:", btLampkaRearRightLight }, + { "i-rearleftend:", btLampkaRearLeftEndLight }, + { "i-rearrightend:", btLampkaRearRightEndLight }, + { "i-cablight:", btCabLight } + }; + auto lookup = lights.find( Label ); + if( lookup != lights.end() ) { + lookup->second.Load( Parser, DynamicObject->mdKabina ); } - else if (Label == "i-maxftt:") - { - btLampkaPrzekrMaxSila.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-radio:") - { - btLampkaRadio.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-manual_brake:") - { - btLampkaHamulecReczny.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-door_blocked:") - { - btLampkaBlokadaDrzwi.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-slippery:") - { - btLampkaPoslizg.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-contactors:") - { - btLampkaStyczn.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-conv_ovld:") - { - btLampkaNadmPrzetw.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-converter:") - { - btLampkaPrzetw.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-diff_relay:") - { - btLampkaPrzekRozn.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-diff_relay2:") - { - btLampkaPrzekRoznPom.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-motor_ovld:") - { - btLampkaNadmSil.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-train_controll:") - { - btLampkaUkrotnienie.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-brake_delay_r:") - { - btLampkaHamPosp.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-mainbreaker:") - { - btLampkaWylSzybki.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-vent_ovld:") - { - btLampkaNadmWent.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-comp_ovld:") - { - btLampkaNadmSpr.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-resistors:") - { - btLampkaOpory.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-no_resistors:") - { - btLampkaBezoporowa.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-no_resistors_b:") - { - btLampkaBezoporowaB.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-highcurrent:") - { - btLampkaWysRozr.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-instrumentlight:") - { - btInstrumentLight.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); + + else if( Label == "i-instrumentlight:" ) { + btInstrumentLight.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); InstrumentLightType = 0; } - else if (Label == "i-instrumentlight_M:") - { - btInstrumentLight.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); + else if( Label == "i-instrumentlight_M:" ) { + btInstrumentLight.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); InstrumentLightType = 1; } - else if (Label == "i-instrumentlight_C:") - { - btInstrumentLight.Load(Parser, DynamicObject->mdKabina, DynamicObject->mdModel); + else if( Label == "i-instrumentlight_C:" ) { + btInstrumentLight.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); InstrumentLightType = 2; } - else if (Label == "i-vent_trim:") - { - btLampkaWentZaluzje.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-trainheating:") - { - btLampkaOgrzewanieSkladu.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-security_aware:") - { - btLampkaCzuwaka.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-security_cabsignal:") - { - btLampkaSHP.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-door_left:") - { - btLampkaDoorLeft.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-door_right:") - { - btLampkaDoorRight.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-departure_signal:") - { - btLampkaDepartureSignal.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-reserve:") - { - btLampkaRezerwa.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-scnd:") - { - btLampkaBoczniki.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-scnd1:") - { - btLampkaBocznik1.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-scnd2:") - { - btLampkaBocznik2.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-scnd3:") - { - btLampkaBocznik3.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-scnd4:") - { - btLampkaBocznik4.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-braking:") - { - btLampkaHamienie.Load(Parser, DynamicObject->mdKabina); - } - else if( Label == "i-dynamicbrake:" ) { - - btLampkaED.Load( Parser, DynamicObject->mdKabina ); - } - else if (Label == "i-braking-ezt:") - { - btLampkaHamowanie1zes.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-braking-ezt2:") - { - btLampkaHamowanie2zes.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-compressor:") - { - btLampkaSprezarka.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-compressorb:") - { - btLampkaSprezarkaB.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-voltbrake:") - { - btLampkaNapNastHam.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-mainbreakerb:") - { - btLampkaWylSzybkiB.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-resistorsb:") - { - btLampkaOporyB.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-contactorsb:") - { - btLampkaStycznB.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-conv_ovldb:") - { - btLampkaNadmPrzetwB.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-converterb:") - { - btLampkaPrzetwB.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-forward:") - { - btLampkaForward.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-backward:") - { - btLampkaBackward.Load(Parser, DynamicObject->mdKabina); - } - else if (Label == "i-cablight:") - { // hunter-171012 - btCabLight.Load(Parser, DynamicObject->mdKabina); - } else if (Label == "i-doors:") { int i = Parser.getToken() - 1; @@ -7039,15 +6982,10 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co return true; } -// initializes a gauge matching provided label. returns: true if the label was found, false -// otherwise -// NOTE: this is temporary work-around for compiler else-if limit +// initializes a gauge matching provided label. returns: true if the label was found, false otherwise // TODO: refactor the cabin controls into some sensible structure bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int const Cabindex) { -/* - TGauge *gg { nullptr }; // roboczy wskaźnik na obiekt animujący gałkę -*/ std::unordered_map const gauges = { { "mainctrl:", ggMainCtrl }, { "scndctrl:", ggScndCtrl }, diff --git a/Train.h b/Train.h index 61ed0e00..7beeadd4 100644 --- a/Train.h +++ b/Train.h @@ -171,6 +171,8 @@ class TTrain static void OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_motoroverloadrelayreset( TTrain *Train, command_data const &Command ); static void OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_lightspresetactivatenext( TTrain *Train, command_data const &Command ); + static void OnCommand_lightspresetactivateprevious( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleright( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleupper( TTrain *Train, command_data const &Command ); @@ -366,6 +368,17 @@ public: // reszta może by?publiczna TButton btLampkaHamulecReczny; TButton btLampkaForward; // Ra: lampki w przód i w ty?dla komputerowych kabin TButton btLampkaBackward; + // light indicators + TButton btLampkaUpperLight; + TButton btLampkaLeftLight; + TButton btLampkaRightLight; + TButton btLampkaLeftEndLight; + TButton btLampkaRightEndLight; + TButton btLampkaRearUpperLight; + TButton btLampkaRearLeftLight; + TButton btLampkaRearRightLight; + TButton btLampkaRearLeftEndLight; + TButton btLampkaRearRightEndLight; TButton btCabLight; // hunter-171012: lampa oswietlajaca kabine // Ra 2013-12: wirtualne "lampki" do odbijania na haslerze w PoKeys diff --git a/World.cpp b/World.cpp index 65b364f5..ee4720a2 100644 --- a/World.cpp +++ b/World.cpp @@ -682,7 +682,7 @@ void TWorld::OnKeyDown(int cKey) */ if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy { // zmiana próżny/ładowny; Ra: zabrane z kabiny - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ) }; + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; if (vehicle) { if (Global::shiftState ? vehicle->MoverParameters->IncBrakeMult() : @@ -695,7 +695,7 @@ void TWorld::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_EndSign]) { // Ra 2014-07: zabrane z kabiny - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, true ) ) }; + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, true ) ) }; if (vehicle) { int CouplNr = (LengthSquared3(vehicle->HeadPosition() - Camera.Pos) > @@ -724,7 +724,7 @@ void TWorld::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_IncLocalBrakeLevel]) { // zahamowanie dowolnego pojazdu - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ) }; + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; if (vehicle) { if (Global::ctrlState) @@ -743,7 +743,7 @@ void TWorld::OnKeyDown(int cKey) } else if (cKey == Global::Keys[k_DecLocalBrakeLevel]) { // odhamowanie dowolnego pojazdu - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 20, false, false ) ) }; + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; if (vehicle) { if (Global::ctrlState) diff --git a/command.cpp b/command.cpp index 3f4b6f56..c3d70d27 100644 --- a/command.cpp +++ b/command.cpp @@ -105,6 +105,8 @@ const int k_ProgramHelp = 48; /* // const int k_FreeFlyMode= 59; */ + { "lightspresetactivatenext", command_target::vehicle }, + { "lightspresetactivateprevious", command_target::vehicle }, { "headlighttoggleleft", command_target::vehicle }, { "headlighttoggleright", command_target::vehicle }, { "headlighttoggleupper", command_target::vehicle }, diff --git a/command.h b/command.h index a06509e5..0f9ef699 100644 --- a/command.h +++ b/command.h @@ -100,6 +100,8 @@ const int k_ProgramHelp = 48; /* // const int k_FreeFlyMode= 59; */ + lightspresetactivatenext, + lightspresetactivateprevious, headlighttoggleleft, headlighttoggleright, headlighttoggleupper, @@ -117,10 +119,6 @@ const int k_ProgramHelp = 48; interiorlightdimtoggle, instrumentlighttoggle, /* -const int k_Univ1 = 66; -const int k_Univ2 = 67; -const int k_Univ3 = 68; -const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; */ diff --git a/keyboardinput.cpp b/keyboardinput.cpp index cc7041c4..c0ff5ebf 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -318,6 +318,10 @@ const int k_ProgramHelp = 48; /* // const int k_FreeFlyMode= 59; */ + // lightspresetactivatenext + { GLFW_KEY_T | keymodifier::shift }, + // lightspresetactivateprevious + { GLFW_KEY_T }, // headlighttoggleleft { GLFW_KEY_Y }, // headlighttoggleright diff --git a/mouseinput.cpp b/mouseinput.cpp index 8fd53744..ddf8bee6 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -304,8 +304,8 @@ mouse_input::default_bindings() { user_command::redmarkertoggleright, user_command::none } }, { "lights_sw:", { - user_command::none, - user_command::none } }, // TODO: implement commands for lights controller + user_command::lightspresetactivatenext, + user_command::lightspresetactivateprevious } }, { "rearupperlight_sw:", { user_command::headlighttogglerearupper, user_command::none } }, diff --git a/scene.cpp b/scene.cpp index 16373e93..4d65328b 100644 --- a/scene.cpp +++ b/scene.cpp @@ -872,7 +872,12 @@ basic_region::update_traction( TDynamicObject *Vehicle, int const Pantographinde void basic_region::serialize( std::string const &Scenariofile ) const { - auto filename { Global::asCurrentSceneryPath + Scenariofile }; + auto filename { Scenariofile }; + if( filename[ 0 ] == '$' ) { + // trim leading $ char rainsted utility may add to the base name for modified .scn files + filename.erase( 0, 1 ); + } + filename = Global::asCurrentSceneryPath + filename; if( ( filename.rfind( '.' ) != std::string::npos ) && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { // trim extension, it's typically going to be for different file type @@ -910,7 +915,12 @@ basic_region::serialize( std::string const &Scenariofile ) const { bool basic_region::deserialize( std::string const &Scenariofile ) { - auto filename { Global::asCurrentSceneryPath + Scenariofile }; + auto filename { Scenariofile }; + if( filename[ 0 ] == '$' ) { + // trim leading $ char rainsted utility may add to the base name for modified .scn files + filename.erase( 0, 1 ); + } + filename = Global::asCurrentSceneryPath + filename; if( ( filename.rfind( '.' ) != std::string::npos ) && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { // trim extension, it's typically going to be for different file type diff --git a/usefull.h b/usefull.h index 8c5359ca..4f2594b3 100644 --- a/usefull.h +++ b/usefull.h @@ -52,7 +52,7 @@ Type_ clamp_circular( Type_ Value, Type_ const Range = static_cast(360) ) { Value -= Range * (int)( Value / Range ); // clamp the range to 0-360 - if( Value < 0.0 ) Value += Range; + if( Value < Type_(0) ) Value += Range; return Value; } diff --git a/version.h b/version.h index e7a0964f..9aaf2c1a 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1031 +#define VERSION_MINOR 1102 #define VERSION_REVISION 0 From 714671492b60d30d36c155940f450268faf6670d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 5 Nov 2017 01:58:54 +0100 Subject: [PATCH 219/426] minor refactoring and compilation fixes --- DynObj.cpp | 123 ++++++++++++++++++++++--------------------------- DynObj.h | 11 +++-- scenenode.cpp | 4 +- simulation.cpp | 2 +- 4 files changed, 65 insertions(+), 75 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index b30cbabb..58ae59fa 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1622,8 +1622,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" double fDist, // dystans względem punktu 1 std::string DriverType, // typ obsady double fVel, // prędkość początkowa - std::string TrainName, // nazwa składu, np. "PE2307" albo Vmax, jeśli pliku - // nie ma a są cyfry + std::string TrainName, // nazwa składu, np. "PE2307" albo Vmax, jeśli pliku nie ma a są cyfry float Load, // ilość ładunku std::string LoadType, // nazwa ładunku bool Reversed, // true, jeśli ma stać odwrotnie w składzie @@ -1639,18 +1638,18 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" DriverType = "1"; // sterujący kabiną +1 else if (DriverType == "reardriver") DriverType = "2"; // sterujący kabiną -1 - // else if (DriverType=="connected") DriverType="c"; //tego trzeba się pozbyć - // na rzecz - // ukrotnienia else if (DriverType == "passenger") DriverType = "p"; // to do przemyślenia else if (DriverType == "nobody") DriverType = ""; // nikt nie siedzi + int Cab = 0; // numer kabiny z obsadą (nie można zająć obu) if (DriverType == "1") // od przodu składu Cab = 1; // iDirection?1:-1; //iDirection=1 gdy normalnie, =0 odwrotnie else if (DriverType == "2") // od tyłu składu Cab = -1; // iDirection?-1:1; +/* + // NOTE: leave passenger in the middle section, this is most likely to be 'passenger' section in MU trains else if (DriverType == "p") { if (Random(6) < 3) @@ -1658,20 +1657,10 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" else Cab = -1; // losowy przydział kabiny } - /* to nie ma uzasadnienia - else - {//obsada nie rozpoznana - Cab=0; //McZapkie-010303: w przyszlosci dac tez pomocnika, palacza, - konduktora itp. - Error("Unknown DriverType description: "+DriverType); - DriverType="nobody"; - } - */ +*/ // utworzenie parametrów fizyki - MoverParameters = - new TMoverParameters(iDirection ? fVel : -fVel, Type_Name, asName, Load, LoadType, Cab); + MoverParameters = new TMoverParameters(iDirection ? fVel : -fVel, Type_Name, asName, Load, LoadType, Cab); iLights = MoverParameters->iLights; // wskaźnik na stan własnych świateł - // (zmienimy dla rozrządczych EZT) // McZapkie: TypeName musi byc nazwą CHK/MMD pojazdu if (!MoverParameters->LoadFIZ(asBaseDir)) { // jak wczytanie CHK się nie uda, to błąd @@ -1865,43 +1854,9 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // wygenerować fDist = -fDist; // to traktujemy, jakby przesunięcie było w drugą stronę } - // w wagonie tez niech jedzie - // if (MoverParameters->MainCtrlPosNo>0 && - // if (MoverParameters->CabNo!=0) - if (DriverType != "") - { // McZapkie-040602: jeśli coś siedzi w pojeździe - if (Name == Global::asHumanCtrlVehicle) // jeśli pojazd wybrany do prowadzenia - { - if ( MoverParameters->EngineType != Dumb) - Controller = Humandriver; // wsadzamy tam sterującego - else // w przeciwnym razie trzeba włączyć pokazywanie kabiny - bDisplayCab = true; - } - // McZapkie-151102: rozkład jazdy czytany z pliku *.txt z katalogu w którym - // jest sceneria - if (DriverType == "1" || DriverType == "2") - { // McZapkie-110303: mechanik i rozklad tylko gdy jest obsada - // MoverParameters->ActiveCab=MoverParameters->CabNo; //ustalenie aktywnej - // kabiny - // (rozrząd) - Mechanik = new TController(Controller, this, Aggressive); - if (TrainName.empty()) // jeśli nie w składzie - { - Mechanik->DirectionInitial(); // załączenie rozrządu (wirtualne kabiny) itd. - Mechanik->PutCommand( - "Timetable:", iDirection ? -fVel : fVel, 0, - NULL); // tryb pociągowy z ustaloną prędkością (względem sprzęgów) - } - // if (TrainName!="none") - // Mechanik->PutCommand("Timetable:"+TrainName,fVel,0,NULL); - } - else if (DriverType == "p") - { // obserwator w charakterze pasażera - // Ra: to jest niebezpieczne, bo w razie co będzie pomagał hamulcem - // bezpieczeństwa - Mechanik = new TController(Controller, this, Easyman, false); - } - } + + create_controller( DriverType, !TrainName.empty() ); + // McZapkie-250202 iAxles = (MaxAxles < MoverParameters->NAxles) ? MaxAxles : MoverParameters->NAxles; // ilość osi // wczytywanie z pliku nazwatypu.mmd, w tym model @@ -2073,9 +2028,6 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" loc.Y = vPosition.z; loc.Z = vPosition.y; MoverParameters->Loc = loc; // normalnie przesuwa ComputeMovement() w Update() - // pOldPos4=Axle1.pPosition; //Ra: nie używane - // pOldPos1=Axle0.pPosition; - // ActualTrack= GetTrack(); //McZapkie-030303 // ABuWozki 060504 if (mdModel) // jeśli ma w czym szukać { @@ -2090,17 +2042,54 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" if (smBogie[1]) smBogie[1]->WillBeAnimated(); } - // ABu: zainicjowanie zmiennej, zeby nic sie nie ruszylo - // w pierwszej klatce, potem juz liczona prawidlowa wartosc masy + // ABu: zainicjowanie zmiennej, zeby nic sie nie ruszylo w pierwszej klatce, + // potem juz liczona prawidlowa wartosc masy MoverParameters->ComputeConstans(); - /*Ra: to nie działa - Event0 musi być wykonywany ciągle - if (fVel==0.0) //jeśli stoi - if (MoverParameters->CabNo!=0) //i ma kogoś w kabinie - if (Track->Event0) //a jest w tym torze event od stania - RaAxleEvent(Track->Event0); //dodanie eventu stania do kolejki - */ - vFloor = vector3(0, 0, MoverParameters->Floor); // wektor podłogi dla wagonów, przesuwa ładunek - return MoverParameters->Dim.L; // długość większa od zera oznacza OK; 2mm docisku? + // wektor podłogi dla wagonów, przesuwa ładunek + vFloor = vector3(0, 0, MoverParameters->Floor); + // długość większa od zera oznacza OK; 2mm docisku? + return MoverParameters->Dim.L; +} + +void +TDynamicObject::create_controller( std::string const Type, bool const Trainset ) { + + if( Type == "" ) { return; } + + if( asName == Global::asHumanCtrlVehicle ) { + // jeśli pojazd wybrany do prowadzenia + if( MoverParameters->EngineType != Dumb ) { + // wsadzamy tam sterującego + Controller = Humandriver; + } + else { + // w przeciwnym razie trzeba włączyć pokazywanie kabiny + bDisplayCab = true; + } + } + // McZapkie-151102: rozkład jazdy czytany z pliku *.txt z katalogu w którym jest sceneria + if( ( Type == "1" ) + || ( Type == "2" ) ) { + // McZapkie-110303: mechanik i rozklad tylko gdy jest obsada + Mechanik = new TController( Controller, this, Aggressive ); + + if( false == Trainset ) { + // jeśli nie w składzie + // załączenie rozrządu (wirtualne kabiny) itd. + Mechanik->DirectionInitial(); + // tryb pociągowy z ustaloną prędkością (względem sprzęgów) + Mechanik->PutCommand( + "Timetable:", + MoverParameters->V * 3.6 * ( iDirection ? -1.0 : 1.0 ), + 0, + nullptr ); + } + } + else if( Type == "p" ) { + // obserwator w charakterze pasażera + // Ra: to jest niebezpieczne, bo w razie co będzie pomagał hamulcem bezpieczeństwa + Mechanik = new TController( Controller, this, Easyman, false ); + } } void TDynamicObject::FastMove(double fDistance) diff --git a/DynObj.h b/DynObj.h index 7f8aeb2f..c3cb5adb 100644 --- a/DynObj.h +++ b/DynObj.h @@ -402,17 +402,18 @@ private: int iCabs; // maski bitowe modeli kabin TTrack *MyTrack; // McZapkie-030303: tor na ktorym stoi, ABu std::string asBaseDir; - int iOverheadMask; // maska przydzielana przez AI pojazdom posiadającym pantograf, aby wymuszały - // jazdę bezprądową + int iOverheadMask; // maska przydzielana przez AI pojazdom posiadającym pantograf, aby wymuszały jazdę bezprądową TTractionParam tmpTraction; - double fAdjustment; // korekcja - docelowo przenieść do TrkFoll.cpp wraz z odległością od - // poprzedniego + double fAdjustment; // korekcja - docelowo przenieść do TrkFoll.cpp wraz z odległością od poprzedniego + TDynamicObject(); ~TDynamicObject(); - double TDynamicObject::Init( // zwraca długość pojazdu albo 0, jeśli błąd + // zwraca długość pojazdu albo 0, jeśli błąd + double TDynamicObject::Init( std::string Name, std::string BaseDir, std::string asReplacableSkin, std::string Type_Name, TTrack *Track, double fDist, std::string DriverType, double fVel, std::string TrainName, float Load, std::string LoadType, bool Reversed, std::string); + void create_controller( std::string const Type, bool const Trainset ); void AttachPrev(TDynamicObject *Object, int iType = 1); bool UpdateForce(double dt, double dt1, bool FullVer); void LoadUpdate(); diff --git a/scenenode.cpp b/scenenode.cpp index f223986c..97c00424 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -405,7 +405,7 @@ shape_node::merge( shape_node &Shape ) { m_data.area.center = interpolate( m_data.area.center, Shape.m_data.area.center, - static_cast( Shape.m_data.vertices.size() ) / ( Shape.m_data.vertices.size() + m_data.vertices.size() ) ); + static_cast( Shape.m_data.vertices.size() ) / ( Shape.m_data.vertices.size() + m_data.vertices.size() ) ); m_data.vertices.insert( std::end( m_data.vertices ), std::begin( Shape.m_data.vertices ), std::end( Shape.m_data.vertices ) ); @@ -625,7 +625,7 @@ lines_node::merge( lines_node &Lines ) { m_data.area.center = interpolate( m_data.area.center, Lines.m_data.area.center, - static_cast( Lines.m_data.vertices.size() ) / ( Lines.m_data.vertices.size() + m_data.vertices.size() ) ); + static_cast( Lines.m_data.vertices.size() ) / ( Lines.m_data.vertices.size() + m_data.vertices.size() ) ); m_data.vertices.insert( std::end( m_data.vertices ), std::begin( Lines.m_data.vertices ), std::end( Lines.m_data.vertices ) ); diff --git a/simulation.cpp b/simulation.cpp index 450c35d2..9a100dd4 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -806,7 +806,7 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch Scratchpad.trainset.offset -= length; // automatically establish permanent connections for couplers which specify them in their definitions if( ( coupling != 0 ) - && ( vehicle->MoverParameters->Couplers[ ( offset == -1.0 ? 0 : 1 ) ].AllowedFlag & coupling::permanent ) ) { + && ( vehicle->MoverParameters->Couplers[ ( offset == -1.0 ? side::front : side::rear ) ].AllowedFlag & coupling::permanent ) ) { coupling |= coupling::permanent; } if( true == Scratchpad.trainset.is_open ) { From 492c1342b16904f5c469782a0036a11ec0f35eea Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 10 Nov 2017 16:57:08 +0100 Subject: [PATCH 220/426] audio subsystem replacement: openal audio renderer and buffer class, removed deprecated files --- EU07.cpp | 8 +- McZapkie/Mover.cpp | 46 +++++--- Model3d.h | 13 ++- Names.h | 4 +- ResourceManager.h | 8 ++ Texture.h | 12 +- Train.cpp | 16 +-- World.cpp | 10 +- audio.cpp | 181 +++++++++++++++++++++++++++++ audio.h | 72 ++++++++++++ audiorenderer.cpp | 83 +++++++++++++ audiorenderer.h | 47 ++++++++ maszyna.vcxproj.filters | 42 ++----- material.cpp | 4 +- material.h | 1 - AdvSound.cpp => old/AdvSound.cpp | 0 AdvSound.h => old/AdvSound.h | 0 RealSound.cpp => old/RealSound.cpp | 0 RealSound.h => old/RealSound.h | 0 Sound.cpp => old/Sound.cpp | 0 Sound.h => old/Sound.h | 0 VBO.cpp => old/VBO.cpp | 0 VBO.h => old/VBO.h | 0 wavread.cpp => old/wavread.cpp | 0 wavread.h => old/wavread.h | 0 renderer.cpp | 42 +++---- renderer.h | 9 +- scene.cpp | 4 +- 28 files changed, 498 insertions(+), 104 deletions(-) create mode 100644 audio.cpp create mode 100644 audio.h create mode 100644 audiorenderer.cpp create mode 100644 audiorenderer.h rename AdvSound.cpp => old/AdvSound.cpp (100%) rename AdvSound.h => old/AdvSound.h (100%) rename RealSound.cpp => old/RealSound.cpp (100%) rename RealSound.h => old/RealSound.h (100%) rename Sound.cpp => old/Sound.cpp (100%) rename Sound.h => old/Sound.h (100%) rename VBO.cpp => old/VBO.cpp (100%) rename VBO.h => old/VBO.h (100%) rename wavread.cpp => old/wavread.cpp (100%) rename wavread.h => old/wavread.h (100%) diff --git a/EU07.cpp b/EU07.cpp index eba5e362..361927cf 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -25,12 +25,14 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "Globals.h" #include "timer.h" #include "Logs.h" +#include "renderer.h" +#include "uilayer.h" +#include "audiorenderer.h" #include "keyboardinput.h" #include "mouseinput.h" #include "gamepadinput.h" #include "Console.h" #include "PyInt.h" -#include "uilayer.h" #ifdef EU07_BUILD_STATIC #pragma comment( lib, "glfw3.lib" ) @@ -46,6 +48,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #pragma comment( lib, "opengl32.lib" ) #pragma comment( lib, "glu32.lib" ) #pragma comment( lib, "dsound.lib" ) +#pragma comment( lib, "openal32.lib") #pragma comment( lib, "winmm.lib" ) #pragma comment( lib, "setupapi.lib" ) #pragma comment( lib, "python27.lib" ) @@ -405,6 +408,9 @@ int main(int argc, char *argv[]) return -1; } + + audio::renderer.init(); + input::Keyboard.init(); input::Mouse.init(); input::Gamepad.init(); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index cac6b709..5a1a95bf 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2375,44 +2375,52 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) { bool MS = false; // Ra: przeniesione z końca - if ((Mains != State) && (MainCtrlPosNo > 0)) - { - if ((State == false) || - (((ScndCtrlPos == 0)||(EngineType == ElectricInductionMotor)) && ((ConvOvldFlag == false) || (TrainType == dt_EZT)) && - (LastSwitchingTime > CtrlDelay) && !TestFlag(DamageFlag, dtrain_out) && - !TestFlag(EngDmgFlag, 1))) - { - if( Mains ) { + if( ( Mains != State ) + && ( MainCtrlPosNo > 0 ) ) { + + if( ( false == State ) + || ( ( ( ScndCtrlPos == 0 ) || ( EngineType == ElectricInductionMotor ) ) + && ( ( ConvOvldFlag == false ) || ( TrainType == dt_EZT ) ) + && ( LastSwitchingTime > CtrlDelay ) + && ( false == TestFlag( DamageFlag, dtrain_out ) ) + && ( false == TestFlag( EngDmgFlag, 1 ) ) ) ) { + + if( true == Mains ) { // jeśli był załączony if( Notify != range::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "MainSwitch", int( State ), CabNo, ( Notify == range::unit ? - ctrain_controll | ctrain_depot : - ctrain_controll ) ); + coupling::control | coupling::permanent : + coupling::control ) ); } } Mains = State; - if( Mains ) { + MS = true; // wartość zwrotna + LastSwitchingTime = 0; + + if( true == Mains ) { // jeśli został załączony if( Notify != range::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "MainSwitch", int( State ), CabNo, ( Notify == range::unit ? - ctrain_controll | ctrain_depot : - ctrain_controll ) ); + coupling::control | coupling::permanent : + coupling::control ) ); } } - MS = true; // wartość zwrotna - LastSwitchingTime = 0; - if ((EngineType == DieselEngine) && Mains) - { + if( ( EngineType == DieselEngine ) + && ( true == Mains ) ) { + dizel_enginestart = State; } - if (((TrainType == dt_EZT) && (!State))) - ConvOvldFlag = true; + if( ( TrainType == dt_EZT ) + && ( false == State ) ) { + + ConvOvldFlag = true; + } } } // else MainSwitch:=false; diff --git a/Model3d.h b/Model3d.h index 70c7c895..1a3ff290 100644 --- a/Model3d.h +++ b/Model3d.h @@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "Parser.h" #include "dumb3d.h" #include "Float3d.h" -#include "VBO.h" +#include "openglgeometrybank.h" #include "material.h" using namespace Math3D; @@ -213,7 +213,7 @@ public: // places contained geometry in provided ground node }; -class TModel3d : public CMesh +class TModel3d { friend class opengl_renderer; @@ -221,7 +221,9 @@ private: TSubModel *Root; // drzewo submodeli int iFlags; // Ra: czy submodele mają przezroczyste tekstury public: // Ra: tymczasowo - int iNumVerts; // ilość wierzchołków (gdy nie ma VBO, to m_nVertexCount=0) + int iNumVerts; // ilość wierzchołków (gdy nie ma VBO, to m_nVertexCount=0) + geometrybank_handle m_geometrybank; + bool m_geometrycreated { false }; private: std::vector Textures; // nazwy tekstur std::vector Names; // nazwy submodeli @@ -229,15 +231,16 @@ private: int iSubModelsCount; // Ra: używane do tworzenia binarnych std::string asBinary; // nazwa pod którą zapisać model binarny std::string m_filename; + public: + TModel3d(); + ~TModel3d(); float bounding_radius() const { return ( Root ? Root->m_boundingradius : 0.f ); } inline TSubModel * GetSMRoot() { return (Root); }; - TModel3d(); - ~TModel3d(); TSubModel * GetFromName(std::string const &Name); TSubModel * AddToNamed(const char *Name, TSubModel *SubModel); void AddTo(TSubModel *tmp, TSubModel *SubModel); diff --git a/Names.h b/Names.h index 1af3e4ca..0a7c534d 100644 --- a/Names.h +++ b/Names.h @@ -50,10 +50,10 @@ public: protected: // types using type_sequence = std::deque; - using type_map = std::unordered_map; + using index_map = std::unordered_map; // members type_sequence m_items; - type_map m_itemmap; + index_map m_itemmap; public: // data access diff --git a/ResourceManager.h b/ResourceManager.h index 0d28f747..2d467e19 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -8,6 +8,14 @@ http://mozilla.org/MPL/2.0/. */ #pragma once + +enum class resource_state { + none, + loading, + good, + failed +}; + /* #include #include diff --git a/Texture.h b/Texture.h index 64c0e11b..c9bd5c7b 100644 --- a/Texture.h +++ b/Texture.h @@ -15,13 +15,6 @@ http://mozilla.org/MPL/2.0/. #include "GL/glew.h" #include "ResourceManager.h" -enum class resource_state { - none, - loading, - good, - failed -}; - struct opengl_texture { static DDSURFACEDESC2 deserialize_ddsd(std::istream&); static DDCOLORKEY deserialize_ddck(std::istream&); @@ -88,13 +81,16 @@ public: void assign_units( GLint const Helper, GLint const Shadows, GLint const Normals, GLint const Diffuse ); + // activates specified texture unit void unit( GLint const Textureunit ); + // creates texture object out of data stored in specified file texture_handle create( std::string Filename, bool const Loadnow = true ); // binds specified texture to specified texture unit void bind( std::size_t const Unit, texture_handle const Texture ); + // provides direct access to specified texture object opengl_texture & texture( texture_handle const Texture ) const { return *(m_textures[ Texture ].first); } // performs a resource sweep @@ -186,7 +182,7 @@ downsample( std::size_t const Width, std::size_t const Height, char *Imagedata ) (*sampler)[idx] + ( *( sampler + 1 ) )[idx] + ( *( sampler + Width ) )[idx] - + (*( sampler + Width + 1 ))[idx] ); + + ( *( sampler + Width + 1 ))[idx] ); color[ idx ] = component /= 4; } *destination++ = color; diff --git a/Train.cpp b/Train.cpp index bb169cea..ee354945 100644 --- a/Train.cpp +++ b/Train.cpp @@ -589,9 +589,9 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold if( Train->mvControlled->ShuntMode ) { - Train->mvControlled->AnPos += ( Command.time_delta * 0.75f ); - if( Train->mvControlled->AnPos > 1 ) - Train->mvControlled->AnPos = 1; + Train->mvControlled->AnPos = clamp( + Train->mvControlled->AnPos + ( Command.time_delta * 1.0f ), + 0.0, 1.0 ); } else { Train->mvControlled->IncScndCtrl( 1 ); @@ -650,9 +650,9 @@ void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold if( Train->mvControlled->ShuntMode ) { - Train->mvControlled->AnPos -= ( Command.time_delta * 0.75f ); - if( Train->mvControlled->AnPos > 1 ) - Train->mvControlled->AnPos = 1; + Train->mvControlled->AnPos = clamp( + Train->mvControlled->AnPos - ( Command.time_delta * 1.0f ), + 0.0, 1.0 ); } Train->mvControlled->DecScndCtrl( 1 ); } @@ -2030,7 +2030,9 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( Train->mvControlled->Imax < Train->mvControlled->ImaxHi ) { + if( ( true == Train->mvControlled->ShuntModeAllow ? + ( false == Train->mvControlled->ShuntMode ) : + ( Train->mvControlled->Imax < Train->mvControlled->ImaxHi ) ) ) { // turn on if( true == Train->mvControlled->CurrentSwitch( true ) ) { // visual feedback diff --git a/World.cpp b/World.cpp index ee4720a2..eafab396 100644 --- a/World.cpp +++ b/World.cpp @@ -1422,7 +1422,11 @@ TWorld::Update_UI() { + ( vehicle->MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" ); uitextline2 += - "; Ft: " + to_string( vehicle->MoverParameters->Ft * 0.001f * vehicle->MoverParameters->ActiveCab, 1 ) + "; Ft: " + to_string( + vehicle->MoverParameters->Ft * 0.001f * ( + vehicle->MoverParameters->ActiveCab ? vehicle->MoverParameters->ActiveCab : + vehicle->ctOwner ? vehicle->ctOwner->Controlling()->ActiveCab : + 1 ), 1 ) + ", Fb: " + to_string( vehicle->MoverParameters->Fb * 0.001f, 1 ) + ", Fr: " + to_string( vehicle->MoverParameters->Adhesive( vehicle->MoverParameters->RunningTrack.friction ), 2 ) + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : "" ); @@ -1640,7 +1644,9 @@ TWorld::Update_UI() { "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) + "; HamP=" + std::to_string( vehicle->MoverParameters->LocalBrakePos ) + "/" + to_string( vehicle->MoverParameters->LocalBrakePosA, 2 ) + "; NasJ=" + std::to_string( vehicle->MoverParameters->MainCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->MainCtrlActualPos ) + ")" - + "; NasB=" + std::to_string( vehicle->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->ScndCtrlActualPos ) + ")" + + ( vehicle->MoverParameters->ShuntMode ? + "; NasB=" + to_string( vehicle->MoverParameters->AnPos, 2 ) : + "; NasB=" + std::to_string( vehicle->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->ScndCtrlActualPos ) + ")" ) + "; I=" + ( vehicle->MoverParameters->TrainType == dt_EZT ? std::to_string( int( vehicle->MoverParameters->ShowCurrent( 0 ) ) ) : diff --git a/audio.cpp b/audio.cpp new file mode 100644 index 00000000..ecb69a1f --- /dev/null +++ b/audio.cpp @@ -0,0 +1,181 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" + +#include "audio.h" +#include "globals.h" +#include "mczapkie/mctools.h" + +#define DR_WAV_IMPLEMENTATION +#include "dr_wav.h" +#define DR_FLAC_IMPLEMENTATION +#include "dr_flac.h" + +namespace audio { + +openal_buffer::openal_buffer( std::string const &Filename ) : + name( Filename ) { + + ::alGenBuffers( 1, &id ); + // fetch audio data + if( Filename.substr( Filename.rfind( '.' ) ) == ".wav" ) { + // .wav file + auto *file { drwav_open_file( Filename.c_str() ) }; + rate = file->sampleRate; + auto const samplecount { static_cast( file->totalSampleCount ) }; + data.resize( samplecount ); + drwav_read_s16( + file, + samplecount, + &data[ 0 ] ); + if( file->channels > 1 ) { + narrow_to_mono( file->channels ); + data.resize( samplecount / file->channels ); + } + // we're done with the disk data + drwav_close( file ); + } + else { + // .flac or .ogg file + auto *file { drflac_open_file( Filename.c_str() ) }; + rate = file->sampleRate; + auto const samplecount{ static_cast( file->totalSampleCount ) }; + data.resize( samplecount ); + drflac_read_s16( + file, + samplecount, + &data[ 0 ] ); + if( file->channels > 1 ) { + narrow_to_mono( file->channels ); + data.resize( samplecount / file->channels ); + } + // we're done with the disk data + drflac_close( file ); + } + // send the data to openal side + ::alBufferData( id, AL_FORMAT_MONO16, data.data(), data.size() * sizeof( std::int16_t ), rate ); + // and get rid of the source, we shouldn't need it anymore + // TBD, TODO: delay data fetching and transfers until the buffer is actually used? + std::vector().swap( data ); +} + +// mix specified number of interleaved multi-channel data, down to mono +void +openal_buffer::narrow_to_mono( std::uint16_t const Channelcount ) { + + std::size_t monodataindex { 0 }; + std::int32_t accumulator { 0 }; + auto channelcount { Channelcount }; + + for( auto const channeldata : data ) { + + accumulator += channeldata; + if( --channelcount == 0 ) { + + data[ monodataindex++ ] = accumulator / Channelcount; + accumulator = 0; + channelcount = Channelcount; + } + } +} + + + +buffer_manager::~buffer_manager() { + + for( auto &buffer : m_buffers ) { + if( buffer.id != null_resource ) { + ::alDeleteBuffers( 1, &( buffer.id ) ); + } + } +} + +// creates buffer object out of data stored in specified file. returns: handle to the buffer or null_handle if creation failed +buffer_handle +buffer_manager::create( std::string const &Filename ) { + + auto filename { ToLower( Filename ) }; + + auto const dotpos { filename.rfind( '.' ) }; + if( ( dotpos != std::string::npos ) + && ( dotpos != filename.rfind( ".." ) + 1 ) ) { + // trim extension if there's one, but don't mistake folder traverse for extension + filename.erase( dotpos ); + } + // convert slashes + std::replace( + std::begin( filename ), std::end( filename ), + '\\', '/' ); + + // try dynamic-specific sounds first + auto lookup { find_buffer( Global::asCurrentDynamicPath + filename ) }; + if( lookup != null_handle ) { + return lookup; + } + std::string filelookup { find_file( Global::asCurrentDynamicPath + filename ) }; + if( false == filelookup.empty() ) { + return emplace( filelookup ); + } + // if dynamic-specific lookup finds nothing, try the default sound folder + lookup = find_buffer( szSoundPath + filename ); + if( lookup != null_handle ) { + return lookup; + } + filelookup = find_file( szSoundPath + filename ); + if( false == filelookup.empty() ) { + return emplace( filelookup ); + } + // if we still didn't find anything, give up + return null_handle; +} + +// places in the bank a buffer containing data stored in specified file. returns: handle to the buffer +buffer_handle +buffer_manager::emplace( std::string Filename ) { + + buffer_handle const handle { m_buffers.size() }; + m_buffers.emplace_back( Filename ); + + // NOTE: we store mapping without file type extension, to simplify lookups + m_buffermappings.emplace( + Filename.erase( Filename.rfind( '.' ) ), + handle ); + + return handle; +} + +buffer_handle +buffer_manager::find_buffer( std::string const &Buffername ) const { + + auto lookup = m_buffermappings.find( Buffername ); + if( lookup != m_buffermappings.end() ) + return lookup->second; + else + return null_handle; +} + + +std::string +buffer_manager::find_file( std::string const &Filename ) const { + + std::vector const extensions { ".wav", ".flac", ".ogg" }; + + for( auto const &extension : extensions ) { + if( FileExists( Filename + extension ) ) { + // valid name on success + return Filename + extension; + } + } + return {}; // empty string on failure +} + +} // audio + +//--------------------------------------------------------------------------- diff --git a/audio.h b/audio.h new file mode 100644 index 00000000..fd944367 --- /dev/null +++ b/audio.h @@ -0,0 +1,72 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "al.h" +#include "alc.h" + +namespace audio { + +ALuint const null_resource { ~ALuint{ 0 } }; + +struct openal_buffer { +// members + ALuint id { null_resource }; // associated AL resource + unsigned int rate { 0 }; // sample rate of the data + std::string name; +// constructors + openal_buffer() = default; + explicit openal_buffer( std::string const &Filename ); + +private: +// methods + // mix specified number of interleaved multi-channel data, down to mono + void + narrow_to_mono( std::uint16_t const Channelcount ); +// members + std::vector data; // audio data +}; + +using buffer_handle = std::size_t; + +class buffer_manager { + +public: +// constructors + buffer_manager() { m_buffers.emplace_back( openal_buffer() ); } // empty bindings for null buffer +// destructor + ~buffer_manager(); +// methods + // creates buffer object out of data stored in specified file. returns: handle to the buffer or null_handle if creation failed + buffer_handle + create( std::string const &Filename ); + +private: +// types + using buffer_sequence = std::vector; + using index_map = std::unordered_map; +// methods + // places in the bank a buffer containing data stored in specified file. returns: handle to the buffer + buffer_handle + emplace( std::string Filename ); + // checks whether specified buffer is in the buffer bank. returns: buffer handle, or null_handle. + buffer_handle + find_buffer( std::string const &Buffername ) const; + // checks whether specified file exists. returns: name of the located file, or empty string. + std::string + find_file( std::string const &Filename ) const; +// members + buffer_sequence m_buffers; + index_map m_buffermappings; +}; + +} // audio + +//--------------------------------------------------------------------------- diff --git a/audiorenderer.cpp b/audiorenderer.cpp new file mode 100644 index 00000000..aa06766b --- /dev/null +++ b/audiorenderer.cpp @@ -0,0 +1,83 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" + +#include "audiorenderer.h" +#include "logs.h" + +namespace audio { + +openal_renderer renderer; + +openal_renderer::~openal_renderer() { + + ::alcMakeContextCurrent( nullptr ); + + if( m_context != nullptr ) { ::alcDestroyContext( m_context ); } + if( m_device != nullptr ) { ::alcCloseDevice( m_device ); } +} + +buffer_handle +openal_renderer::fetch_buffer( std::string const &Filename ) { + + return m_buffers.create( Filename ); +} + +// initializes the service +bool +openal_renderer::init() { + + if( true == m_ready ) { + // already initialized and enabled + return true; + } + if( false == init_caps() ) { + // basic initialization failed + return false; + } + + m_ready = true; + return true; +} + +bool +openal_renderer::init_caps() { + + // select the "preferred device" + // TODO: support for opening config-specified device + m_device = ::alcOpenDevice( nullptr ); + if( m_device == nullptr ) { + ErrorLog( "Failed to obtain audio device" ); + return false; + } + + ALCint versionmajor, versionminor; + ::alcGetIntegerv( m_device, ALC_MAJOR_VERSION, 1, &versionmajor ); + ::alcGetIntegerv( m_device, ALC_MINOR_VERSION, 1, &versionminor ); + auto const oalversion { std::to_string( versionmajor ) + "." + std::to_string( versionminor ) }; + + WriteLog( + "Audio Renderer: " + std::string { (char *)::alcGetString( m_device, ALC_DEVICE_SPECIFIER ) } + + " OpenAL Version: " + oalversion ); + + WriteLog( "Supported extensions: " + std::string{ (char *)::alcGetString( m_device, ALC_EXTENSIONS ) } ); + + m_context = ::alcCreateContext( m_device, nullptr ); + if( m_context == nullptr ) { + ErrorLog( "Failed to create audio context" ); + return false; + } + + return ( ::alcMakeContextCurrent( m_context ) == AL_TRUE ); +} + +} // audio + +//--------------------------------------------------------------------------- diff --git a/audiorenderer.h b/audiorenderer.h new file mode 100644 index 00000000..8e52e016 --- /dev/null +++ b/audiorenderer.h @@ -0,0 +1,47 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "audio.h" + +namespace audio { + +class openal_renderer { + +public: +// destructor + ~openal_renderer(); +// methods + // buffer methods + // returns handle to a buffer containing audio data from specified file + buffer_handle + fetch_buffer( std::string const &Filename ); + // core methods + // initializes the service + bool + init(); + +private: +// methods + bool + init_caps(); +// members + ALCdevice * m_device { nullptr }; + ALCcontext * m_context { nullptr }; + bool m_ready { false }; // renderer is initialized and functional + + buffer_manager m_buffers; +}; + +extern openal_renderer renderer; + +} // audio + +//--------------------------------------------------------------------------- diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 5deecf08..251ff4a9 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -27,9 +27,6 @@ - - Source Files - Source Files @@ -93,9 +90,6 @@ Source Files - - Source Files - Source Files @@ -105,9 +99,6 @@ Source Files - - Source Files - Source Files @@ -132,12 +123,6 @@ Source Files - - Source Files - - - Source Files - Source Files @@ -240,6 +225,12 @@ Source Files + + Source Files + + + Source Files + @@ -287,9 +278,6 @@ Header Files - - Header Files - Header Files @@ -320,9 +308,6 @@ Header Files\input - - Header Files - Header Files @@ -347,12 +332,6 @@ Header Files - - Header Files - - - Header Files - Header Files @@ -362,9 +341,6 @@ Header Files - - Header Files - Header Files @@ -470,6 +446,12 @@ Header Files + + Header Files + + + Header Files + diff --git a/material.cpp b/material.cpp index 96100286..ed224744 100644 --- a/material.cpp +++ b/material.cpp @@ -105,7 +105,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { // try to locate requested material in the databank auto const databanklookup = find_in_databank( filename ); - if( databanklookup != npos ) { + if( databanklookup != null_handle ) { return databanklookup; } // if this fails, try to look for it on disk @@ -149,7 +149,7 @@ material_manager::find_in_databank( std::string const &Materialname ) const { return ( lookup != m_materialmappings.end() ? lookup->second : - npos ); + null_handle ); } // checks whether specified file exists. diff --git a/material.h b/material.h index 6f305cb0..72093fc3 100644 --- a/material.h +++ b/material.h @@ -55,7 +55,6 @@ private: std::string find_on_disk( std::string const &Materialname ) const; // members: - material_handle const npos { -1 }; material_sequence m_materials; index_map m_materialmappings; diff --git a/AdvSound.cpp b/old/AdvSound.cpp similarity index 100% rename from AdvSound.cpp rename to old/AdvSound.cpp diff --git a/AdvSound.h b/old/AdvSound.h similarity index 100% rename from AdvSound.h rename to old/AdvSound.h diff --git a/RealSound.cpp b/old/RealSound.cpp similarity index 100% rename from RealSound.cpp rename to old/RealSound.cpp diff --git a/RealSound.h b/old/RealSound.h similarity index 100% rename from RealSound.h rename to old/RealSound.h diff --git a/Sound.cpp b/old/Sound.cpp similarity index 100% rename from Sound.cpp rename to old/Sound.cpp diff --git a/Sound.h b/old/Sound.h similarity index 100% rename from Sound.h rename to old/Sound.h diff --git a/VBO.cpp b/old/VBO.cpp similarity index 100% rename from VBO.cpp rename to old/VBO.cpp diff --git a/VBO.h b/old/VBO.h similarity index 100% rename from VBO.h rename to old/VBO.h diff --git a/wavread.cpp b/old/wavread.cpp similarity index 100% rename from wavread.cpp rename to old/wavread.cpp diff --git a/wavread.h b/old/wavread.h similarity index 100% rename from wavread.h rename to old/wavread.h diff --git a/renderer.cpp b/renderer.cpp index e66f60b5..7d33fc32 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -108,7 +108,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { std::vector{ m_normaltextureunit, m_diffusetextureunit } ); m_textures.assign_units( m_helpertextureunit, m_shadowtextureunit, m_normaltextureunit, m_diffusetextureunit ); // TODO: add reflections unit UILayer.set_unit( m_diffusetextureunit ); - Active_Texture( m_diffusetextureunit ); + select_unit( m_diffusetextureunit ); ::glDepthFunc( GL_LEQUAL ); glEnable( GL_DEPTH_TEST ); @@ -452,10 +452,10 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( m_environmentcubetexturesupport ) { // restore default texture matrix for reflections cube map - Active_Texture( m_helpertextureunit ); + select_unit( m_helpertextureunit ); ::glMatrixMode( GL_TEXTURE ); ::glPopMatrix(); - Active_Texture( m_diffusetextureunit ); + select_unit( m_diffusetextureunit ); ::glMatrixMode( GL_MODELVIEW ); } } @@ -765,11 +765,11 @@ opengl_renderer::setup_matrices() { if( ( m_renderpass.draw_mode == rendermode::color ) && ( m_environmentcubetexturesupport ) ) { // special case, for colour render pass setup texture matrix for reflections cube map - Active_Texture( m_helpertextureunit ); + select_unit( m_helpertextureunit ); ::glMatrixMode( GL_TEXTURE ); ::glPushMatrix(); ::glMultMatrixf( glm::value_ptr( glm::inverse( glm::mat4{ glm::mat3{ m_renderpass.camera.modelview() } } ) ) ); - Active_Texture( m_diffusetextureunit ); + select_unit( m_diffusetextureunit ); } // trim modelview matrix just to rotation, since rendering is done in camera-centric world space @@ -835,7 +835,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const // darkens previous stage, preparing data for the shadow texture unit to select from if( m_helpertextureunit >= 0 ) { - Active_Texture( m_helpertextureunit ); + select_unit( m_helpertextureunit ); if( ( true == Reflections ) || ( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( false == Global::bWireFrame ) ) ) { @@ -922,7 +922,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const && ( false == Global::bWireFrame ) && ( m_shadowcolor != colors::white ) ) { - Active_Texture( m_shadowtextureunit ); + select_unit( m_shadowtextureunit ); // NOTE: shadowmap isn't part of regular texture system, so we use direct bind call here ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); ::glEnable( GL_TEXTURE_2D ); @@ -953,7 +953,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const } else { // turn off shadow map tests - Active_Texture( m_shadowtextureunit ); + select_unit( m_shadowtextureunit ); ::glDisable( GL_TEXTURE_2D ); ::glDisable( GL_TEXTURE_GEN_S ); @@ -966,7 +966,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const // NOTE: comes after diffuse stage in the operation chain if( m_normaltextureunit >= 0 ) { - Active_Texture( m_normaltextureunit ); + select_unit( m_normaltextureunit ); if( true == Reflections ) { ::glEnable( GL_TEXTURE_2D ); @@ -989,7 +989,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const } // diffuse texture unit. // NOTE: diffuse texture mapping is never fully disabled, alpha channel information is always included - Active_Texture( m_diffusetextureunit ); + select_unit( m_diffusetextureunit ); ::glEnable( GL_TEXTURE_2D ); if( true == Diffuse ) { // default behaviour, modulate with previous stage @@ -1027,7 +1027,7 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons // helper texture unit. if( m_helpertextureunit >= 0 ) { - Active_Texture( m_helpertextureunit ); + select_unit( m_helpertextureunit ); if( ( true == Reflections ) || ( ( true == Global::RenderShadows ) && ( true == Shadows ) @@ -1053,12 +1053,12 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons if( m_shadowtextureunit >= 0 ) { if( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( false == Global::bWireFrame ) ) { - Active_Texture( m_shadowtextureunit ); + select_unit( m_shadowtextureunit ); ::glEnable( GL_TEXTURE_2D ); } else { - Active_Texture( m_shadowtextureunit ); + select_unit( m_shadowtextureunit ); ::glDisable( GL_TEXTURE_2D ); } } @@ -1066,11 +1066,11 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons if( m_normaltextureunit >= 0 ) { if( true == Reflections ) { - Active_Texture( m_normaltextureunit ); + select_unit( m_normaltextureunit ); ::glEnable( GL_TEXTURE_2D ); } else { - Active_Texture( m_normaltextureunit ); + select_unit( m_normaltextureunit ); ::glDisable( GL_TEXTURE_2D ); } } @@ -1078,12 +1078,12 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons // NOTE: toggle actually disables diffuse texture mapping, unlike setup counterpart if( true == Diffuse ) { - Active_Texture( m_diffusetextureunit ); + select_unit( m_diffusetextureunit ); ::glEnable( GL_TEXTURE_2D ); } else { - Active_Texture( m_diffusetextureunit ); + select_unit( m_diffusetextureunit ); ::glDisable( GL_TEXTURE_2D ); } // update unit state @@ -1095,9 +1095,9 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons void opengl_renderer::setup_shadow_color( glm::vec4 const &Shadowcolor ) { - Active_Texture( m_helpertextureunit ); + select_unit( m_helpertextureunit ); ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( Shadowcolor ) ); // in-shadow colour multiplier - Active_Texture( m_diffusetextureunit ); + select_unit( m_diffusetextureunit ); } bool @@ -1322,7 +1322,7 @@ opengl_renderer::Material( material_handle const Material ) const { // texture methods void -opengl_renderer::Active_Texture( GLint const Textureunit ) { +opengl_renderer::select_unit( GLint const Textureunit ) { return m_textures.unit( Textureunit ); } @@ -3327,7 +3327,7 @@ opengl_renderer::Init_caps() { return false; } - WriteLog( "Supported extensions:" + std::string((char *)glGetString( GL_EXTENSIONS )) ); + WriteLog( "Supported extensions: " + std::string((char *)glGetString( GL_EXTENSIONS )) ); WriteLog( std::string("Render path: ") + ( Global::bUseVBO ? "VBO" : "Display lists" ) ); if( GLEW_EXT_framebuffer_object ) { diff --git a/renderer.h b/renderer.h index 15f41e85..cdf91132 100644 --- a/renderer.h +++ b/renderer.h @@ -178,8 +178,6 @@ public: opengl_material const & Material( material_handle const Material ) const; // texture methods - void - Active_Texture( GLint const Textureunit ); texture_handle Fetch_Texture( std::string const &Filename, bool const Loadnow = true ); void @@ -194,14 +192,14 @@ public: Pick_Control() const { return m_pickcontrolitem; } editor::basic_node const * Pick_Node() const { return m_picksceneryitem; } - // maintenance jobs + // maintenance methods void Update( double const Deltatime ); TSubModel const * Update_Pick_Control(); editor::basic_node const * Update_Pick_Node(); - // debug performance string + // debug methods std::string const & info_times() const; std::string const & @@ -275,6 +273,9 @@ private: setup_shadow_color( glm::vec4 const &Shadowcolor ); void switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ); + // helper, texture manager method; activates specified texture unit + void + select_unit( GLint const Textureunit ); // runs jobs needed to generate graphics for specified render pass void Render_pass( rendermode const Mode ); diff --git a/scene.cpp b/scene.cpp index 4d65328b..33e6cd43 100644 --- a/scene.cpp +++ b/scene.cpp @@ -873,7 +873,7 @@ void basic_region::serialize( std::string const &Scenariofile ) const { auto filename { Scenariofile }; - if( filename[ 0 ] == '$' ) { + while( filename[ 0 ] == '$' ) { // trim leading $ char rainsted utility may add to the base name for modified .scn files filename.erase( 0, 1 ); } @@ -916,7 +916,7 @@ bool basic_region::deserialize( std::string const &Scenariofile ) { auto filename { Scenariofile }; - if( filename[ 0 ] == '$' ) { + while( filename[ 0 ] == '$' ) { // trim leading $ char rainsted utility may add to the base name for modified .scn files filename.erase( 0, 1 ); } From 5226fca281656394a9c0a57e2935db63b60b4afa Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 12 Nov 2017 00:23:21 +0100 Subject: [PATCH 221/426] unified simulation sound sources, gfx namespace for gfx code and structures --- Button.cpp | 48 +- Button.h | 20 +- Classes.h | 4 + Driver.cpp | 37 +- Driver.h | 3 + DynObj.cpp | 407 ++++++---- DynObj.h | 49 +- Event.cpp | 2 + Event.h | 4 + Gauge.cpp | 79 +- Gauge.h | 28 +- Globals.h | 6 +- Model3d.cpp | 6 +- Model3d.h | 10 +- Segment.cpp | 2 +- Segment.h | 2 +- Track.cpp | 50 +- Track.h | 4 +- Traction.cpp | 6 +- Traction.h | 4 +- Train.cpp | 1609 +++++++++++++++++---------------------- Train.h | 81 +- World.cpp | 14 +- maszyna.vcxproj.filters | 6 + openglgeometrybank.cpp | 108 +-- openglgeometrybank.h | 82 +- renderer.cpp | 20 +- renderer.h | 18 +- scene.cpp | 17 +- scene.h | 17 +- scenenode.cpp | 16 +- scenenode.h | 8 +- simulation.cpp | 12 + simulation.h | 6 +- sound.cpp | 66 ++ sound.h | 69 ++ 36 files changed, 1487 insertions(+), 1433 deletions(-) create mode 100644 sound.cpp create mode 100644 sound.h diff --git a/Button.cpp b/Button.cpp index 8629da2b..22cfe6c4 100644 --- a/Button.cpp +++ b/Button.cpp @@ -46,10 +46,7 @@ void TButton::Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2) { else { // new, block type config // TODO: rework the base part into yaml-compatible flow style mapping - cParser mappingparser( Parser.getToken( false, "}" ) ); - submodelname = mappingparser.getToken( false ); - // new, variable length section - while( true == Load_mapping( mappingparser ) ) { + while( true == Load_mapping( Parser ) ) { ; // all work done by while() } } @@ -77,27 +74,13 @@ void TButton::Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2) { bool TButton::Load_mapping( cParser &Input ) { - if( false == Input.getTokens( 2, true, " ,\n\r\t" ) ) { - return false; - } + // token can be a key or block end + std::string const key { Input.getToken( true, "\n\r\t ,;" ) }; + if( key == "}" ) { return false; } + // if not block end then the key is followed by assigned value or sub-block + if( key == "soundinc:" ) { m_soundfxincrease.deserialize( Input, sound_type::single ); } + else if( key == "sounddec:" ) { m_soundfxdecrease.deserialize( Input, sound_type::single ); } - std::string key, value; - Input - >> key - >> value; - - if( key == "soundinc:" ) { - m_soundfxincrease = ( - value != "none" ? - TSoundsManager::GetFromName( value, true ) : - nullptr ); - } - else if( key == "sounddec:" ) { - m_soundfxdecrease = ( - value != "none" ? - TSoundsManager::GetFromName( value, true ) : - nullptr ); - } return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized } @@ -141,19 +124,6 @@ void TButton::AssignBool(bool const *bValue) { void TButton::play() { - play( - m_state == true ? - m_soundfxincrease : - m_soundfxdecrease ); -} - -void -TButton::play( PSound Sound ) { - - if( Sound == nullptr ) { return; } - - Sound->SetCurrentPosition( 0 ); - Sound->SetVolume( DSBVOLUME_MAX ); - Sound->Play( 0, 0, 0 ); - return; + if( m_state == true ) { m_soundfxincrease.play(); } + else { m_soundfxdecrease.play(); } } diff --git a/Button.h b/Button.h index addc43c0..534bcd6d 100644 --- a/Button.h +++ b/Button.h @@ -22,8 +22,8 @@ class TButton bool m_state { false }; bool const *bData { nullptr }; int iFeedbackBit { 0 }; // Ra: bit informacji zwrotnej, do wyprowadzenia na pulpit - PSound m_soundfxincrease { nullptr }; // sound associated with increasing control's value - PSound m_soundfxdecrease { nullptr }; // sound associated with decreasing control's value + sound_source m_soundfxincrease; // sound associated with increasing control's value + sound_source m_soundfxdecrease; // sound associated with decreasing control's value // methods // imports member data pair from the config file bool @@ -31,10 +31,6 @@ class TButton // plays the sound associated with current state void play(); - // plays specified sound - static - void - play( PSound Sound ); public: TButton() = default; @@ -42,14 +38,10 @@ class TButton inline void FeedbackBitSet(int const i) { iFeedbackBit = 1 << i; }; void Turn( bool const State ); - inline void TurnOn() { - Turn( true ); }; - inline void TurnOff() { - Turn( false ); }; - inline void Switch() { - Turn( !m_state ); }; - inline bool Active() { - return (pModelOn) || (pModelOff); }; + inline + bool Active() { + return ( ( pModelOn != nullptr ) + || ( pModelOff != nullptr ) ); } void Update(); void Init(std::string const &asName, TModel3d *pModel, bool bNewOn = false); void Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2 = NULL); diff --git a/Classes.h b/Classes.h index 74111f52..6f2b74d1 100644 --- a/Classes.h +++ b/Classes.h @@ -23,8 +23,12 @@ class TModel3d; //siatka modelu wspólna dla egzemplarzy class TSubModel; // fragment modelu (tu do wyświetlania terenu) class TMemCell; // komórka pamięci class cParser; +#ifdef EU07_USE_OLD_SOUNDCODE class TRealSound; // dźwięk ze współrzędnymi XYZ class TTextSound; // dźwięk ze stenogramem +#else +class sound_source; +#endif class TEventLauncher; class TTraction; // drut class TTractionPowerSource; // zasilanie drutów diff --git a/Driver.cpp b/Driver.cpp index f53ad097..75c1b2ba 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -998,7 +998,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if (go == cm_Unknown) // jeśli nie było komendy wcześniej go = cm_Ready; // gotów do odjazdu z W4 (semafor może // zatrzymać) - if (tsGuardSignal) // jeśli mamy głos kierownika, to odegrać + if (false == tsGuardSignal->empty()) // jeśli mamy głos kierownika, to odegrać iDrivigFlags |= moveGuardSignal; continue; // nie analizować prędkości } // koniec startu z zatrzymania @@ -2572,9 +2572,12 @@ bool TController::DecBrake() bool TController::IncSpeed() { // zwiększenie prędkości; zwraca false, jeśli dalej się nie da zwiększać +#ifdef EU07_USE_OLD_SOUNDCODE if (tsGuardSignal) // jeśli jest dźwięk kierownika if (tsGuardSignal->GetStatus() & DSBSTATUS_PLAYING) // jeśli gada, to nie jedziemy return false; +#else +#endif bool OK = true; if( ( iDrivigFlags & moveDoorOpened ) && ( VelDesired > 0.0 ) ) { // to prevent door shuffle on stop @@ -3084,10 +3087,14 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N NewCommand = Global::asCurrentSceneryPath + NewCommand + ".wav"; // na razie jeden if (FileExists(NewCommand)) { // wczytanie dźwięku odjazdu podawanego bezpośrenido - tsGuardSignal = new TTextSound(NewCommand, 30, pVehicle->GetPosition().x, - pVehicle->GetPosition().y, pVehicle->GetPosition().z, - false); - // rsGuardSignal->Stop(); +#ifdef EU07_USE_OLD_SOUNDCODE + tsGuardSignal = + new TTextSound( + NewCommand, 30, + pVehicle->GetPosition().x, pVehicle->GetPosition().y, pVehicle->GetPosition().z, + false); +#else +#endif iGuardRadio = 0; // nie przez radio } else @@ -3095,9 +3102,14 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N NewCommand = NewCommand.insert(NewCommand.find_last_of("."),"radio"); // wstawienie przed kropkč if (FileExists(NewCommand)) { // wczytanie dźwięku odjazdu w wersji radiowej (słychać tylko w kabinie) - tsGuardSignal = new TTextSound(NewCommand, -1, pVehicle->GetPosition().x, - pVehicle->GetPosition().y, pVehicle->GetPosition().z, - false); +#ifdef EU07_USE_OLD_SOUNDCODE + tsGuardSignal = + new TTextSound( + NewCommand, -1, + pVehicle->GetPosition().x, pVehicle->GetPosition().y, pVehicle->GetPosition().z, + false); +#else +#endif iGuardRadio = iRadioChannel; } } @@ -4472,7 +4484,10 @@ TController::UpdateSituation(double dt) { ->DoorOpenCtrl ) // jeśli drzwi niesterowane przez maszynistę Doors( false ); // a EZT zamknie dopiero po odegraniu komunikatu kierownika +#ifdef EU07_USE_OLD_SOUNDCODE tsGuardSignal->Stop(); +#else +#endif // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy // bezpośrednim // albo trzeba zrobić dwa dźwięki, jeden bezpośredni, słyszalny w @@ -4481,7 +4496,10 @@ TController::UpdateSituation(double dt) { // obsługę kanałów radiowych itd. if( !iGuardRadio ) { // jeśli nie przez radio +#ifdef EU07_USE_OLD_SOUNDCODE tsGuardSignal->Play( 1.0, 0, !FreeFlyModeFlag, pVehicle->GetPosition() ); // dla true jest głośniej +#else +#endif } else { // if (iGuardRadio==iRadioChannel) //zgodność kanału @@ -4490,7 +4508,10 @@ TController::UpdateSituation(double dt) { // przy braku reakcji if( SquareMagnitude( pVehicle->GetPosition() - Global::pCameraPosition ) < 2000 * 2000 ) { // w odległości mniejszej niż 2km +#ifdef EU07_USE_OLD_SOUNDCODE tsGuardSignal->Play( 1.0, 0, true, pVehicle->GetPosition() ); // dźwięk niby przez radio +#else +#endif } } } diff --git a/Driver.h b/Driver.h index e4ee16e6..44dd11ed 100644 --- a/Driver.h +++ b/Driver.h @@ -242,7 +242,10 @@ private: TTrainParameters *TrainParams = nullptr; // rozkład jazdy zawsze jest, nawet jeśli pusty int iRadioChannel = 1; // numer aktualnego kanału radiowego int iGuardRadio = 0; // numer kanału radiowego kierownika (0, gdy nie używa radia) +/* TTextSound *tsGuardSignal = nullptr; // komunikat od kierownika +*/ + sound_source *tsGuardSignal { nullptr }; public: double AccPreferred = 0.0; // preferowane przyspieszenie (wg psychiki kierującego, zmniejszana przy wykryciu kolizji) double AccDesired = AccPreferred; // przyspieszenie, jakie ma utrzymywać (<0:nie przyspieszaj,<-0.1:hamuj) diff --git a/DynObj.cpp b/DynObj.cpp index 58ae59fa..574db0c0 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -612,14 +612,14 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) if ((TestFlag(MoverParameters->Couplers[0].CouplingFlag, ctrain_coupler)) && (MoverParameters->Couplers[0].Render)) { - btCoupler1.TurnOn(); + btCoupler1.Turn( true ); btnOn = true; } // else btCoupler1.TurnOff(); if ((TestFlag(MoverParameters->Couplers[1].CouplingFlag, ctrain_coupler)) && (MoverParameters->Couplers[1].Render)) { - btCoupler2.TurnOn(); + btCoupler2.Turn( true ); btnOn = true; } // else btCoupler2.TurnOff(); @@ -820,26 +820,26 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) // przewody sterowania ukrotnionego if (TestFlag(MoverParameters->Couplers[0].CouplingFlag, ctrain_controll)) { - btCCtrl1.TurnOn(); + btCCtrl1.Turn( true ); btnOn = true; } // else btCCtrl1.TurnOff(); if (TestFlag(MoverParameters->Couplers[1].CouplingFlag, ctrain_controll)) { - btCCtrl2.TurnOn(); + btCCtrl2.Turn( true ); btnOn = true; } // else btCCtrl2.TurnOff(); // McZapkie-181103: mostki przejsciowe if (TestFlag(MoverParameters->Couplers[0].CouplingFlag, ctrain_passenger)) { - btCPass1.TurnOn(); + btCPass1.Turn( true ); btnOn = true; } // else btCPass1.TurnOff(); if (TestFlag(MoverParameters->Couplers[1].CouplingFlag, ctrain_passenger)) { - btCPass2.TurnOn(); + btCPass2.Turn( true ); btnOn = true; } // else btCPass2.TurnOff(); @@ -849,7 +849,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) { if (TestFlag(iLights[0], 2) || TestFlag(iLights[0], 32)) { - btEndSignals1.TurnOn(); + btEndSignals1.Turn( true ); btnOn = true; } // else btEndSignals1.TurnOff(); @@ -858,13 +858,13 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) { if (TestFlag(iLights[0], 2)) { - btEndSignals11.TurnOn(); + btEndSignals11.Turn( true ); btnOn = true; } // else btEndSignals11.TurnOff(); if (TestFlag(iLights[0], 32)) { - btEndSignals13.TurnOn(); + btEndSignals13.Turn( true ); btnOn = true; } // else btEndSignals13.TurnOff(); @@ -873,7 +873,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) { if (TestFlag(iLights[1], 2) || TestFlag(iLights[1], 32)) { - btEndSignals2.TurnOn(); + btEndSignals2.Turn( true ); btnOn = true; } // else btEndSignals2.TurnOff(); @@ -882,28 +882,28 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) { if (TestFlag(iLights[1], 2)) { - btEndSignals21.TurnOn(); + btEndSignals21.Turn( true ); btnOn = true; } // else btEndSignals21.TurnOff(); if (TestFlag(iLights[1], 32)) { - btEndSignals23.TurnOn(); + btEndSignals23.Turn( true ); btnOn = true; } // else btEndSignals23.TurnOff(); } } // tablice blaszane: - if (TestFlag(iLights[0], 64)) + if (TestFlag(iLights[side::front], light::rearendsignals)) { - btEndSignalsTab1.TurnOn(); + btEndSignalsTab1.Turn( true ); btnOn = true; } // else btEndSignalsTab1.TurnOff(); - if (TestFlag(iLights[1], 64)) + if (TestFlag(iLights[side::rear], light::rearendsignals)) { - btEndSignalsTab2.TurnOn(); + btEndSignalsTab2.Turn( true ); btnOn = true; } // else btEndSignalsTab2.TurnOff(); @@ -914,36 +914,17 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) smWahacze[i]->SetRotate(float3(1, 0, 0), fWahaczeAmp * cos(MoverParameters->eAngle)); - if (Mechanik) - { // rysowanie figurki mechanika - /* - if (smMechanik0) // mechanik od strony sprzęgu 0 - if (smMechanik1) // jak jest drugi, to pierwszego jedynie pokazujemy - smMechanik0->iVisible = MoverParameters->ActiveCab > 0; - else - { // jak jest tylko jeden, to do drugiej kabiny go obracamy - smMechanik0->iVisible = (MoverParameters->ActiveCab != 0); - smMechanik0->SetRotate( - float3(0, 0, 1), - MoverParameters->ActiveCab >= 0 ? 0 : 180); // obrót względem osi Z - } - if (smMechanik1) // mechanik od strony sprzęgu 1 - smMechanik1->iVisible = MoverParameters->ActiveCab < 0; - */ - if (MoverParameters->ActiveCab > 0) - { - btMechanik1.TurnOn(); - btnOn = true; - } - if (MoverParameters->ActiveCab < 0) - { - btMechanik2.TurnOn(); - btnOn = true; - } + if (Mechanik) { + // rysowanie figurki mechanika + if( MoverParameters->ActiveCab > 0 ) { + btMechanik1.Turn( true ); + btnOn = true; + } + if( MoverParameters->ActiveCab < 0 ) { + btMechanik2.Turn( true ); + btnOn = true; + } } - // ABu: Przechyly na zakretach - // Ra: przechyłkę załatwiamy na etapie przesuwania modelu - // if (ObjSqrDist<80000) ABuModelRoll(); //przechyłki od 400m } if( MoverParameters->Battery || MoverParameters->ConverterFlag ) { // sygnały czoła pociagu //Ra: wyświetlamy bez @@ -951,37 +932,37 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) // daleka if (TestFlag(iLights[0], 1)) { - btHeadSignals11.TurnOn(); + btHeadSignals11.Turn( true ); btnOn = true; } // else btHeadSignals11.TurnOff(); if (TestFlag(iLights[0], 4)) { - btHeadSignals12.TurnOn(); + btHeadSignals12.Turn( true ); btnOn = true; } // else btHeadSignals12.TurnOff(); if (TestFlag(iLights[0], 16)) { - btHeadSignals13.TurnOn(); + btHeadSignals13.Turn( true ); btnOn = true; } // else btHeadSignals13.TurnOff(); if (TestFlag(iLights[1], 1)) { - btHeadSignals21.TurnOn(); + btHeadSignals21.Turn( true ); btnOn = true; } // else btHeadSignals21.TurnOff(); if (TestFlag(iLights[1], 4)) { - btHeadSignals22.TurnOn(); + btHeadSignals22.Turn( true ); btnOn = true; } // else btHeadSignals22.TurnOff(); if (TestFlag(iLights[1], 16)) { - btHeadSignals23.TurnOn(); + btHeadSignals23.Turn( true ); btnOn = true; } // else btHeadSignals23.TurnOff(); @@ -2926,12 +2907,13 @@ bool TDynamicObject::Update(double dt, double dt1) } Global::ABuDebug = dDOMoveLen / dt1; ResetdMoveLen(); + +#ifdef EU07_USE_OLD_SOUNDCODE // McZapkie-260202 // tupot mew, tfu, stukot kol: // taka prowizorka zeby sciszyc stukot dalekiej lokomotywy double ObjectDist; double vol = 0; - // double freq; //Ra: nie używane ObjectDist = SquareMagnitude(Global::pCameraPosition - vPosition); // McZapkie-270202 if (MyTrack->fSoundDistance != -1) @@ -2979,8 +2961,7 @@ bool TDynamicObject::Update(double dt, double dt1) { rsStukot[i + 1].Stop(); } - rsStukot[i].Play(vol, 0, MechInside, - vPosition); // poprawic pozycje o uklad osi + rsStukot[i].Play(vol, 0, MechInside, vPosition); // poprawic pozycje o uklad osi if (i == 1) MoverParameters->AccV -= 0.5 * GetVelocity() / (1 + MoverParameters->Vmax); @@ -3018,7 +2999,7 @@ bool TDynamicObject::Update(double dt, double dt1) else rsUnbrake.Stop(); } - +#endif // fragment z EXE Kursa /* if (MoverParameters->TrainType==dt_ET42) { @@ -3128,13 +3109,16 @@ bool TDynamicObject::Update(double dt, double dt1) else if( ( true == MoverParameters->PantFrontUp ) && ( PantDiff < 0.01 ) ) // tolerancja niedolegania { - if ((MoverParameters->PantFrontVolt == 0.0) && - (MoverParameters->PantRearVolt == 0.0)) - sPantUp.Play(vol, 0, MechInside, vPosition); - if (p->hvPowerWire) // TODO: wyliczyć trzeba prąd przypadający na - // pantograf i - // wstawić do GetVoltage() - { + if( ( MoverParameters->PantFrontVolt == 0.0 ) + && ( MoverParameters->PantRearVolt == 0.0 ) ) { +#ifdef EU07_USE_OLD_SOUNDCODE + sPantUp.Play( vol, 0, MechInside, vPosition ); +#else + sPantUp.play(); +#endif + } + if (p->hvPowerWire) { + // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() MoverParameters->PantFrontVolt = p->hvPowerWire->VoltageGet(MoverParameters->Voltage, fPantCurrent); fCurrent -= fPantCurrent; // taki prąd płynie przez powyższy pantograf @@ -3159,7 +3143,11 @@ bool TDynamicObject::Update(double dt, double dt1) { if( ( MoverParameters->PantRearVolt == 0.0 ) && ( MoverParameters->PantFrontVolt == 0.0 ) ) { +#ifdef EU07_USE_OLD_SOUNDCODE sPantUp.Play( vol, 0, MechInside, vPosition ); +#else + sPantUp.play(); +#endif } if (p->hvPowerWire) { // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() @@ -3246,12 +3234,20 @@ bool TDynamicObject::Update(double dt, double dt1) } // koniec pętli po pantografach if ((MoverParameters->PantFrontSP == false) && (MoverParameters->PantFrontUp == false)) { +#ifdef EU07_USE_OLD_SOUNDCODE sPantDown.Play(vol, 0, MechInside, vPosition); +#else + sPantDown.play(); +#endif MoverParameters->PantFrontSP = true; } if ((MoverParameters->PantRearSP == false) && (MoverParameters->PantRearUp == false)) { +#ifdef EU07_USE_OLD_SOUNDCODE sPantDown.Play(vol, 0, MechInside, vPosition); +#else + sPantDown.play(); +#endif MoverParameters->PantRearSP = true; } /* @@ -3354,24 +3350,40 @@ bool TDynamicObject::Update(double dt, double dt1) // NBMX Obsluga drzwi, MC: zuniwersalnione if ((dDoorMoveL < MoverParameters->DoorMaxShiftL) && (MoverParameters->DoorLeftOpened)) { - rsDoorOpen.Play(1, 0, MechInside, vPosition); +#ifdef EU07_USE_OLD_SOUNDCODE + rsDoorOpen.Play(1, 0, MechInside, vPosition); +#else + rsDoorOpen.play(); +#endif dDoorMoveL += dt1 * 0.5 * MoverParameters->DoorOpenSpeed; } if ((dDoorMoveL > 0) && (!MoverParameters->DoorLeftOpened)) { - rsDoorClose.Play(1, 0, MechInside, vPosition); +#ifdef EU07_USE_OLD_SOUNDCODE + rsDoorClose.Play(1, 0, MechInside, vPosition); +#else + rsDoorClose.play(); +#endif dDoorMoveL -= dt1 * MoverParameters->DoorCloseSpeed; if (dDoorMoveL < 0) dDoorMoveL = 0; } if ((dDoorMoveR < MoverParameters->DoorMaxShiftR) && (MoverParameters->DoorRightOpened)) { - rsDoorOpen.Play(1, 0, MechInside, vPosition); +#ifdef EU07_USE_OLD_SOUNDCODE + rsDoorOpen.Play(1, 0, MechInside, vPosition); +#else + rsDoorOpen.play(); +#endif dDoorMoveR += dt1 * 0.5 * MoverParameters->DoorOpenSpeed; } if ((dDoorMoveR > 0) && (!MoverParameters->DoorRightOpened)) { - rsDoorClose.Play(1, 0, MechInside, vPosition); +#ifdef EU07_USE_OLD_SOUNDCODE + rsDoorClose.Play(1, 0, MechInside, vPosition); +#else + rsDoorClose.play(); +#endif dDoorMoveR -= dt1 * MoverParameters->DoorCloseSpeed; if (dDoorMoveR < 0) dDoorMoveR = 0; @@ -3465,8 +3477,8 @@ void TDynamicObject::TurnOff() { // wyłączenie rysowania submodeli zmiennych dla // egemplarza pojazdu btnOn = false; - btCoupler1.TurnOff(); - btCoupler2.TurnOff(); + btCoupler1.Turn( false ); + btCoupler2.Turn( false ); btCPneumatic1.TurnOff(); btCPneumatic1r.TurnOff(); btCPneumatic2.TurnOff(); @@ -3475,45 +3487,41 @@ void TDynamicObject::TurnOff() btPneumatic1r.TurnOff(); btPneumatic2.TurnOff(); btPneumatic2r.TurnOff(); - btCCtrl1.TurnOff(); - btCCtrl2.TurnOff(); - btCPass1.TurnOff(); - btCPass2.TurnOff(); - btEndSignals11.TurnOff(); - btEndSignals13.TurnOff(); - btEndSignals21.TurnOff(); - btEndSignals23.TurnOff(); - btEndSignals1.TurnOff(); - btEndSignals2.TurnOff(); - btEndSignalsTab1.TurnOff(); - btEndSignalsTab2.TurnOff(); - btHeadSignals11.TurnOff(); - btHeadSignals12.TurnOff(); - btHeadSignals13.TurnOff(); - btHeadSignals21.TurnOff(); - btHeadSignals22.TurnOff(); - btHeadSignals23.TurnOff(); - btMechanik1.TurnOff(); - btMechanik2.TurnOff(); + btCCtrl1.Turn( false ); + btCCtrl2.Turn( false ); + btCPass1.Turn( false ); + btCPass2.Turn( false ); + btEndSignals11.Turn( false ); + btEndSignals13.Turn( false ); + btEndSignals21.Turn( false ); + btEndSignals23.Turn( false ); + btEndSignals1.Turn( false ); + btEndSignals2.Turn( false ); + btEndSignalsTab1.Turn( false ); + btEndSignalsTab2.Turn( false ); + btHeadSignals11.Turn( false ); + btHeadSignals12.Turn( false ); + btHeadSignals13.Turn( false ); + btHeadSignals21.Turn( false ); + btHeadSignals22.Turn( false ); + btHeadSignals23.Turn( false ); + btMechanik1.Turn( false ); + btMechanik2.Turn( false ); }; -void TDynamicObject::RenderSounds() -{ // przeliczanie dźwięków, bo będzie słychać bez wyświetlania sektora z pojazdem -// if( Global::iPause > 0 ) { return; } - +// przeliczanie dźwięków, bo będzie słychać bez wyświetlania sektora z pojazdem +void TDynamicObject::RenderSounds() { +#ifdef EU07_USE_OLD_SOUNDCODE // McZapkie-010302: ulepszony dzwiek silnika double freq; double vol = 0; double dt = Timer::GetDeltaRenderTime(); - // double sounddist; - // sounddist=SquareMagnitude(Global::pCameraPosition-vPosition); - if (MoverParameters->Power > 0) { if ((rsSilnik.AM != 0) && ((MoverParameters->Mains) - // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach + // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach || (MoverParameters->EngineType == DieselEngine))) { if ((fabs(MoverParameters->enrot) > 0.01) || @@ -3521,8 +3529,7 @@ void TDynamicObject::RenderSounds() { freq = rsSilnik.FM * fabs(MoverParameters->enrot) + rsSilnik.FA; if (MoverParameters->EngineType == Dumb) - freq = freq - - 0.2 * MoverParameters->EnginePower / (1 + MoverParameters->Power * 1000); + freq = freq - 0.2 * MoverParameters->EnginePower / (1 + MoverParameters->Power * 1000); rsSilnik.AdjFreq(freq, dt); if (MoverParameters->EngineType == DieselEngine) { @@ -3561,24 +3568,23 @@ void TDynamicObject::RenderSounds() if (volrnd < 2) vol = vol + volrnd / 200.0; } - switch (MyTrack->eEnvironment) - { - case e_tunnel: - { - vol += 0.1; + switch( MyTrack->eEnvironment ) { + case e_tunnel: { + vol += 0.1; + break; + } + case e_canyon: { + vol += 0.05; + break; + } + default: { + break; + } } - break; - case e_canyon: - { - vol += 0.05; - } - break; - } - if ((MoverParameters->DynamicBrakeFlag) && (MoverParameters->EnginePower > 0.1) && - (MoverParameters->EngineType == - ElectricSeriesMotor)) // Szociu - 29012012 - jeżeli uruchomiony - // jest hamulec - // elektrodynamiczny, odtwarzany jest dźwięk silnika + if( ( MoverParameters->DynamicBrakeFlag ) + && ( MoverParameters->EnginePower > 0.1 ) + && ( MoverParameters->EngineType == ElectricSeriesMotor ) ) + // Szociu - 29012012 - jeżeli uruchomiony jest hamulec elektrodynamiczny, odtwarzany jest dźwięk silnika vol += 0.8; if (enginevolume > 0.0001) @@ -3693,15 +3699,6 @@ void TDynamicObject::RenderSounds() if (MoverParameters->BrakePress < 0.1) releaser_vol = MoverParameters->BrakePress * 10; sReleaser.UpdateAF(releaser_vol, 1, MechInside, GetPosition()); - // if ((MoverParameters->ConverterFlag==false) && - // (MoverParameters->TrainType!=dt_ET22)) - // if - // ((MoverParameters->ConverterFlag==false)&&(MoverParameters->CompressorPower!=0)) - // MoverParameters->CompressorFlag=false; //Ra: wywalić to stąd, tu tylko dla - // wyświetlanych! - // Ra: no to już wiemy, dlaczego pociągi jeżdżą lepiej, gdy się na nie patrzy! - // if (MoverParameters->CompressorPower==2) - // MoverParameters->CompressorAllow=MoverParameters->ConverterFlag; // McZapkie! - dzwiek compressor.wav tylko gdy dziala sprezarka if (MoverParameters->VeselVolume != 0) @@ -3851,15 +3848,7 @@ void TDynamicObject::RenderSounds() if (GetVelocity() == 0) rsDerailment.Stop(); } - /* //Ra: dwa razy? - if (MoverParameters->EventFlag) - { - if (TestFlag(MoverParameters->DamageFlag,dtrain_out) && GetVelocity()>0) - rsDerailment.Play(1,0,true,GetPosition()); - if (GetVelocity()==0) - rsDerailment.Stop(); - } - */ +#endif }; // McZapkie-250202 @@ -4560,10 +4549,16 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, parser.getTokens(); parser >> token; if( token != "end" ) { - rsStukot[ i ].Init( token, dSDist, GetPosition().x, - GetPosition().y + dWheelsPosition[ i ], GetPosition().z, +#ifdef EU07_USE_OLD_SOUNDCODE + rsStukot[ i ].Init( + token, dSDist, + GetPosition().x, GetPosition().y + dWheelsPosition[ i ], GetPosition().z, true ); - } +#else + rsStukot[ i ].deserialize( token + " " + std::to_string( dSDist ), sound_type::single, sound_parameters::range ); + // TODO: set per-wheel offset +#endif + } } if( token != "end" ) { // TODO: double-check if this if() and/or retrieval makes sense here @@ -4574,6 +4569,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, else if( ( token == "engine:" ) && ( MoverParameters->Power > 0 ) ) { // plik z dzwiekiem silnika, mnozniki i ofsety amp. i czest. +#ifdef EU07_USE_OLD_SOUNDCODE double attenuation; parser.getTokens( 2, false ); parser @@ -4585,7 +4581,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, true, true ); if( rsSilnik.GetWaveTime() == 0 ) { ErrorLog( "Missed sound: \"" + token + "\" for " + asFileName ); - } + } parser.getTokens( 1, false ); parser >> rsSilnik.AM; if( MoverParameters->EngineType == DieselEngine ) { @@ -4605,13 +4601,17 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, >> rsSilnik.AA >> rsSilnik.FM // MoverParameters->nmax; >> rsSilnik.FA; +#else + rsSilnik.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); +#endif } else if( ( token == "ventilator:" ) && ( ( MoverParameters->EngineType == ElectricSeriesMotor ) || ( MoverParameters->EngineType == ElectricInductionMotor ) ) ) { // plik z dzwiekiem wentylatora, mnozniki i ofsety amp. i czest. - double attenuation; +#ifdef EU07_USE_OLD_SOUNDCODE + double attenuation; parser.getTokens( 2, false ); parser >> token @@ -4628,12 +4628,16 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, >> rsWentylator.FA; rsWentylator.AM /= MoverParameters->RVentnmax; rsWentylator.FM /= MoverParameters->RVentnmax; +#else + rsWentylator.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); +#endif } else if( ( token == "transmission:" ) && ( MoverParameters->EngineType == ElectricSeriesMotor ) ) { // plik z dzwiekiem, mnozniki i ofsety amp. i czest. - double attenuation; +#ifdef EU07_USE_OLD_SOUNDCODE + double attenuation; parser.getTokens( 2, false ); parser >> token @@ -4646,11 +4650,15 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, rsPrzekladnia.AA = 0.1; rsPrzekladnia.FM = 0.005; rsPrzekladnia.FA = 1.0; +#else + rsPrzekladnia.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); +#endif } else if( token == "brake:" ){ // plik z piskiem hamulca, mnozniki i ofsety amplitudy. - double attenuation; +#ifdef EU07_USE_OLD_SOUNDCODE + double attenuation; parser.getTokens( 2, false ); parser >> token @@ -4663,23 +4671,26 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, rsPisk.AA = parser.getToken() * ( 105 - Random( 10 ) ) / 100; rsPisk.FM = 1.0; rsPisk.FA = 0.0; +#else + rsPisk.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude ); +#endif } else if( token == "brakeacc:" ) { // plik z przyspieszaczem (upust po zlapaniu hamowania) - // sBrakeAcc.Init(str.c_str(),Parser->GetNextSymbol().ToDouble(),GetPosition().x,GetPosition().y,GetPosition().z,true); - parser.getTokens( 1, false ); parser >> token; +#ifdef EU07_USE_OLD_SOUNDCODE + parser.getTokens( 1, false ); parser >> token; sBrakeAcc = TSoundsManager::GetFromName( token, true ); +#else + sBrakeAcc.deserialize( parser, sound_type::single ); +#endif bBrakeAcc = true; - // sBrakeAcc.AM=1.0; - // sBrakeAcc.AA=0.0; - // sBrakeAcc.FM=1.0; - // sBrakeAcc.FA=0.0; } else if( token == "unbrake:" ) { // plik z piskiem hamulca, mnozniki i ofsety amplitudy. - double attenuation; +#ifdef EU07_USE_OLD_SOUNDCODE + double attenuation; parser.getTokens( 2, false ); parser >> token @@ -4692,11 +4703,15 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, rsUnbrake.AA = 0.0; rsUnbrake.FM = 1.0; rsUnbrake.FA = 0.0; +#else + rsUnbrake.deserialize( parser, sound_type::single, sound_parameters::range ); +#endif } else if( token == "derail:" ) { // dzwiek przy wykolejeniu - double attenuation; +#ifdef EU07_USE_OLD_SOUNDCODE + double attenuation; parser.getTokens( 2, false ); parser >> token @@ -4709,11 +4724,15 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, rsDerailment.AA = 0.0; rsDerailment.FM = 1.0; rsDerailment.FA = 0.0; +#else + rsDerailment.deserialize( parser, sound_type::single, sound_parameters::range ); +#endif } else if( token == "dieselinc:" ) { // dzwiek przy wlazeniu na obroty woodwarda - double attenuation; +#ifdef EU07_USE_OLD_SOUNDCODE + double attenuation; parser.getTokens( 2, false ); parser >> token @@ -4726,12 +4745,16 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, rsDiesielInc.AA = 0.0; rsDiesielInc.FM = 1.0; rsDiesielInc.FA = 0.0; +#else + rsDiesielInc.deserialize( parser, sound_type::single, sound_parameters::range ); +#endif } else if( token == "curve:" ) { double attenuation; - parser.getTokens( 2, false ); +#ifdef EU07_USE_OLD_SOUNDCODE + parser.getTokens( 2, false ); parser >> token >> attenuation; @@ -4743,91 +4766,143 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, rscurve.AA = 0.0; rscurve.FM = 1.0; rscurve.FA = 0.0; +#else + rscurve.deserialize( parser, sound_type::single, sound_parameters::range ); +#endif } else if( token == "horn1:" ) { // pliki z trabieniem - sHorn1.Load( parser, GetPosition() ); +#ifdef EU07_USE_OLD_SOUNDCODE + sHorn1.Load( parser, GetPosition() ); +#else + sHorn1.deserialize( parser, sound_type::multipart, sound_parameters::range ); +#endif } else if( token == "horn2:" ) { // pliki z trabieniem wysokoton. - sHorn2.Load( parser, GetPosition() ); - if( iHornWarning ) { +#ifdef EU07_USE_OLD_SOUNDCODE + sHorn2.Load( parser, GetPosition() ); +#else + sHorn2.deserialize( parser, sound_type::multipart, sound_parameters::range ); +#endif + if( iHornWarning ) { iHornWarning = 2; // numer syreny do użycia po otrzymaniu sygnału do jazdy - } + } } else if( token == "departuresignal:" ) { // pliki z sygnalem odjazdu - sDepartureSignal.Load( parser, GetPosition() ); +#ifdef EU07_USE_OLD_SOUNDCODE + sDepartureSignal.Load( parser, GetPosition() ); +#else + sDepartureSignal.deserialize( parser, sound_type::multipart, sound_parameters::range ); +#endif } else if( token == "pantographup:" ) { // pliki dzwiekow pantografow - parser.getTokens( 1, false ); parser >> token; +#ifdef EU07_USE_OLD_SOUNDCODE + parser.getTokens( 1, false ); parser >> token; sPantUp.Init( token, 50, GetPosition().x, GetPosition().y, GetPosition().z, true ); +#else + sPantUp.deserialize( parser, sound_type::single ); +#endif } else if( token == "pantographdown:" ) { // pliki dzwiekow pantografow - parser.getTokens( 1, false ); parser >> token; +#ifdef EU07_USE_OLD_SOUNDCODE + parser.getTokens( 1, false ); parser >> token; sPantDown.Init( token, 50, GetPosition().x, GetPosition().y, GetPosition().z, true ); +#else + sPantDown.deserialize( parser, sound_type::single ); +#endif } else if( token == "compressor:" ) { // pliki ze sprezarka +#ifdef EU07_USE_OLD_SOUNDCODE sCompressor.Load( parser, GetPosition() ); +#else + sCompressor.deserialize( parser, sound_type::multipart, sound_parameters::range ); +#endif } else if( token == "converter:" ) { // pliki z przetwornica - // if (MoverParameters->EngineType==DieselElectric) //będzie modulowany? - sConverter.Load( parser, GetPosition() ); +#ifdef EU07_USE_OLD_SOUNDCODE + sConverter.Load( parser, GetPosition() ); +#else + sConverter.deserialize( parser, sound_type::multipart, sound_parameters::range ); +#endif } else if( token == "turbo:" ) { // pliki z turbogeneratorem - sTurbo.Load( parser, GetPosition() ); +#ifdef EU07_USE_OLD_SOUNDCODE + sTurbo.Load( parser, GetPosition() ); +#else + sTurbo.deserialize( parser, sound_type::multipart, sound_parameters::range ); +#endif } else if( token == "small-compressor:" ) { // pliki z przetwornica - sSmallCompressor.Load( parser, GetPosition() ); +#ifdef EU07_USE_OLD_SOUNDCODE + sSmallCompressor.Load( parser, GetPosition() ); +#else + sSmallCompressor.deserialize( parser, sound_type::multipart, sound_parameters::range ); +#endif } else if( token == "dooropen:" ) { - - parser.getTokens( 1, false ); parser >> token; +#ifdef EU07_USE_OLD_SOUNDCODE + parser.getTokens( 1, false ); parser >> token; rsDoorOpen.Init( token, 50, GetPosition().x, GetPosition().y, GetPosition().z, true ); +#else + rsDoorOpen.deserialize( parser, sound_type::single ); +#endif } else if( token == "doorclose:" ) { - +#ifdef EU07_USE_OLD_SOUNDCODE parser.getTokens( 1, false ); parser >> token; rsDoorClose.Init( token, 50, GetPosition().x, GetPosition().y, GetPosition().z, true ); +#else + rsDoorClose.deserialize( parser, sound_type::single ); +#endif } else if( token == "sand:" ) { - // pliki z piasecznica +#ifdef EU07_USE_OLD_SOUNDCODE + // pliki z piasecznica sSand.Load( parser, GetPosition() ); +#else + sSand.deserialize( parser, sound_type::multipart, sound_parameters::range ); +#endif } else if( token == "releaser:" ) { // pliki z odluzniaczem - sReleaser.Load( parser, GetPosition() ); +#ifdef EU07_USE_OLD_SOUNDCODE + sReleaser.Load( parser, GetPosition() ); +#else + sReleaser.deserialize( parser, sound_type::multipart, sound_parameters::range ); +#endif } } while( ( token != "" ) diff --git a/DynObj.h b/DynObj.h index c3cb5adb..96cba4bf 100644 --- a/DynObj.h +++ b/DynObj.h @@ -14,10 +14,9 @@ http://mozilla.org/MPL/2.0/. #include "TrkFoll.h" // McZapkie: -#include "RealSound.h" -#include "AdvSound.h" #include "Button.h" #include "AirCoupler.h" +#include "sound.h" #include "texture.h" //--------------------------------------------------------------------------- @@ -304,27 +303,27 @@ private: double dRailLength; double dRailPosition[MaxAxles]; // licznik pozycji osi w/m szyny double dWheelsPosition[MaxAxles]; // pozycja osi w/m srodka pojazdu - TRealSound rsStukot[MaxAxles]; // dzwieki poszczegolnych osi //McZapkie-270202 - TRealSound rsSilnik; // McZapkie-010302 - silnik - TRealSound rsWentylator; // McZapkie-030302 - TRealSound rsPisk; // McZapkie-260302 - TRealSound rsDerailment; // McZapkie-051202 - TRealSound rsPrzekladnia; - TAdvancedSound sHorn1; - TAdvancedSound sHorn2; - TAdvancedSound sCompressor; // NBMX wrzesien 2003 - TAdvancedSound sConverter; - TAdvancedSound sSmallCompressor; - TAdvancedSound sDepartureSignal; - TAdvancedSound sTurbo; - TAdvancedSound sSand; - TAdvancedSound sReleaser; + sound_source rsStukot[MaxAxles]; // dzwieki poszczegolnych osi //McZapkie-270202 + sound_source rsSilnik; // McZapkie-010302 - silnik + sound_source rsWentylator; // McZapkie-030302 + sound_source rsPisk; // McZapkie-260302 + sound_source rsDerailment; // McZapkie-051202 + sound_source rsPrzekladnia; + sound_source sHorn1; + sound_source sHorn2; + sound_source sCompressor; // NBMX wrzesien 2003 + sound_source sConverter; + sound_source sSmallCompressor; + sound_source sDepartureSignal; + sound_source sTurbo; + sound_source sSand; + sound_source sReleaser; // Winger 010304 - TRealSound sPantUp; - TRealSound sPantDown; - TRealSound rsDoorOpen; // Ra: przeniesione z kabiny - TRealSound rsDoorClose; + sound_source sPantUp; + sound_source sPantDown; + sound_source rsDoorOpen; // Ra: przeniesione z kabiny + sound_source rsDoorClose; double eng_vol_act; double eng_frq_act; @@ -336,9 +335,9 @@ private: bool renderme; // yB - czy renderowac // TRealSound sBrakeAcc; //dźwięk przyspieszacza - PSound sBrakeAcc; + sound_source sBrakeAcc; bool bBrakeAcc; - TRealSound rsUnbrake; // yB - odglos luzowania + sound_source rsUnbrake; // yB - odglos luzowania float ModCamRot; int iInventory[ 2 ] { 0, 0 }; // flagi bitowe posiadanych submodeli (np. świateł) void TurnOff(); @@ -379,8 +378,8 @@ private: std::string name() const { return this ? asName : std::string(); }; - TRealSound rsDiesielInc; // youBy - TRealSound rscurve; // youBy + sound_source rsDiesielInc; // youBy + sound_source rscurve; // youBy // std::ofstream PneuLogFile; //zapis parametrow pneumatycznych // youBy - dym // TSmoke Smog; diff --git a/Event.cpp b/Event.cpp index 15acc047..9db96750 100644 --- a/Event.cpp +++ b/Event.cpp @@ -1022,6 +1022,7 @@ event_manager::CheckQuery() { return false; } case tp_Sound: { +#ifdef EU07_USE_OLD_SOUNDCODE switch( m_workevent->Params[ 0 ].asInt ) { // trzy możliwe przypadki: case 0: { @@ -1048,6 +1049,7 @@ event_manager::CheckQuery() { break; } } +#endif break; } case tp_Disable: diff --git a/Event.h b/Event.h index d8c90562..642e4cbf 100644 --- a/Event.h +++ b/Event.h @@ -74,7 +74,11 @@ union TParam bool asBool; double asdouble; int asInt; +#ifdef EU07_USE_OLD_SOUNDCODE TTextSound *tsTextSound; +#else + sound_source *tsTextSound; +#endif char *asText; TCommandType asCommand; TTractionPowerSource *psPower; diff --git a/Gauge.cpp b/Gauge.cpp index 01232954..d785599e 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -70,16 +70,15 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) { else { // new, block type config // TODO: rework the base part into yaml-compatible flow style mapping - cParser mappingparser( Parser.getToken( false, "}" ) ); - submodelname = mappingparser.getToken( false ); - gaugetypename = mappingparser.getToken( true ); - mappingparser.getTokens( 3, false ); - mappingparser + submodelname = Parser.getToken( false ); + gaugetypename = Parser.getToken( true ); + Parser.getTokens( 3, false ); + Parser >> scale >> offset >> friction; // new, variable length section - while( true == Load_mapping( mappingparser ) ) { + while( true == Load_mapping( Parser ) ) { ; // all work done by while() } } @@ -116,26 +115,15 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) { bool TGauge::Load_mapping( cParser &Input ) { - if( false == Input.getTokens( 2, true, ", \n\r\t" ) ) { - return false; - } - - std::string key, value; - Input - >> key - >> value; - + // token can be a key or block end + std::string const key { Input.getToken( true, "\n\r\t ,;" ) }; + if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } + // if not block end then the key is followed by assigned value or sub-block if( key == "soundinc:" ) { - m_soundfxincrease = ( - value != "none" ? - TSoundsManager::GetFromName( value, true ) : - nullptr ); + m_soundfxincrease.deserialize( Input, sound_type::single ); } else if( key == "sounddec:" ) { - m_soundfxdecrease = ( - value != "none" ? - TSoundsManager::GetFromName( value, true ) : - nullptr ); + m_soundfxdecrease.deserialize( Input, sound_type::single ); } else if( key.compare( 0, std::min( key.size(), 5 ), "sound" ) == 0 ) { // sounds assigned to specific gauge values, defined by key soundFoo: where Foo = value @@ -144,9 +132,7 @@ TGauge::Load_mapping( cParser &Input ) { if( indexstart != std::string::npos ) { m_soundfxvalues.emplace( std::stoi( key.substr( indexstart, indexend - indexstart ) ), - ( value != "none" ? - TSoundsManager::GetFromName( value, true ) : - nullptr ) ); + sound_source().deserialize( Input, sound_type::single ) ); } } return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized @@ -176,9 +162,21 @@ void TGauge::DecValue(double fNewDesired) fDesiredValue = 0; }; +void +TGauge::UpdateValue( double fNewDesired ) { + + return UpdateValue( fNewDesired, nullptr ); +} + +void +TGauge::UpdateValue( double fNewDesired, sound_source &Fallbacksound ) { + + return UpdateValue( fNewDesired, &Fallbacksound ); +} + // ustawienie wartości docelowej. plays provided fallback sound, if no sound was defined in the control itself void -TGauge::UpdateValue( double fNewDesired, PSound Fallbacksound ) { +TGauge::UpdateValue( double fNewDesired, sound_source *Fallbacksound ) { auto const desiredtimes100 = static_cast( std::round( 100.0 * fNewDesired ) ); if( static_cast( std::round( 100.0 * ( fDesiredValue - fOffset ) / fScale ) ) == desiredtimes100 ) { @@ -191,21 +189,25 @@ TGauge::UpdateValue( double fNewDesired, PSound Fallbacksound ) { // filter out values other than full integers auto const lookup = m_soundfxvalues.find( desiredtimes100 / 100 ); if( lookup != m_soundfxvalues.end() ) { - play( lookup->second ); + lookup->second.play(); return; } } // ...and if there isn't any, fall back on the basic set... auto const currentvalue = GetValue(); - if( ( currentvalue < fNewDesired ) && ( m_soundfxincrease != nullptr ) ) { - play( m_soundfxincrease ); + if( ( currentvalue < fNewDesired ) + && ( false == m_soundfxincrease.empty() ) ) { + // shift up + m_soundfxincrease.play(); } - else if( ( currentvalue > fNewDesired ) && ( m_soundfxdecrease != nullptr ) ) { - play( m_soundfxdecrease ); + else if( ( currentvalue > fNewDesired ) + && ( false == m_soundfxdecrease.empty() ) ) { + // shift down + m_soundfxdecrease.play(); } else if( Fallbacksound != nullptr ) { // ...and if that fails too, try the provided fallback sound from legacy system - play( Fallbacksound ); + Fallbacksound->play(); } }; @@ -315,15 +317,4 @@ void TGauge::UpdateValue() } }; -void -TGauge::play( PSound Sound ) { - - if( Sound == nullptr ) { return; } - - Sound->SetCurrentPosition( 0 ); - Sound->SetVolume( DSBVOLUME_MAX ); - Sound->Play( 0, 0, 0 ); - return; -} - //--------------------------------------------------------------------------- diff --git a/Gauge.h b/Gauge.h index c437883c..081ffade 100644 --- a/Gauge.h +++ b/Gauge.h @@ -24,7 +24,13 @@ enum TGaugeType { // animowany wskaźnik, mogący przyjmować wiele stanów pośrednich class TGauge { - private: +private: +// methods +// imports member data pair from the config file + bool + Load_mapping( cParser &Input ); + void UpdateValue( double fNewDesired, sound_source *Fallbacksound ); +// members TGaugeType eType { gt_Unknown }; // typ ruchu double fFriction { 0.0 }; // hamowanie przy zliżaniu się do zadanej wartości double fDesiredValue { 0.0 }; // wartość docelowa @@ -38,18 +44,12 @@ class TGauge { double *dData { nullptr }; int *iData; }; - PSound m_soundfxincrease { nullptr }; // sound associated with increasing control's value - PSound m_soundfxdecrease { nullptr }; // sound associated with decreasing control's value - std::map m_soundfxvalues; // sounds associated with specific values -// methods - // imports member data pair from the config file - bool - Load_mapping( cParser &Input ); - // plays specified sound - void - play( PSound Sound ); + sound_source m_soundfxincrease; // sound associated with increasing control's value + sound_source m_soundfxdecrease; // sound associated with decreasing control's value + std::map m_soundfxvalues; // sounds associated with specific values - public: +public: +// methods TGauge() = default; inline void Clear() { *this = TGauge(); } @@ -58,7 +58,8 @@ class TGauge { void PermIncValue(double fNewDesired); void IncValue(double fNewDesired); void DecValue(double fNewDesired); - void UpdateValue(double fNewDesired, PSound Fallbacksound = nullptr ); + void UpdateValue( double fNewDesired ); + void UpdateValue( double fNewDesired, sound_source &Fallbacksound ); void PutValue(double fNewDesired); double GetValue() const; void Update(); @@ -67,6 +68,7 @@ class TGauge { void AssignDouble(double *dValue); void AssignInt(int *iValue); void UpdateValue(); +// members TSubModel *SubModel; // McZapkie-310302: zeby mozna bylo sprawdzac czy zainicjowany poprawnie }; diff --git a/Globals.h b/Globals.h index 478ec2a3..1dba16ae 100644 --- a/Globals.h +++ b/Globals.h @@ -114,6 +114,7 @@ int const k_DimHeadlights = 74; const int MaxKeys = 75; // klasy dla wskaźników globalnych +/* class TGround; class TWorld; class TCamera; @@ -121,8 +122,7 @@ class TDynamicObject; class TAnimModel; // obiekt terenu class cParser; // nowy (powolny!) parser class TEvent; -class TTextSound; - +*/ class TTranscript { // klasa obsługująca linijkę napisu do dźwięku public: @@ -293,7 +293,9 @@ public: static float4 UITextColor; // base color of UI text static std::string asLang; // domyślny język - http://tools.ietf.org/html/bcp47 static int iHiddenEvents; // czy łączyć eventy z torami poprzez nazwę toru +/* static TTextSound *tsRadioBusy[10]; // zajętość kanałów radiowych (wskaźnik na odgrywany dźwięk) +*/ static int iPoKeysPWM[7]; // numery wejść dla PWM //randomizacja diff --git a/Model3d.cpp b/Model3d.cpp index 799c136a..50c9c0d3 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -95,7 +95,7 @@ TSubModel::SetLightLevel( float const Level, bool const Includechildren, bool co } } -int TSubModel::SeekFaceNormal(std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, vertex_array const &Vertices) +int TSubModel::SeekFaceNormal(std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, gfx::vertex_array const &Vertices) { // szukanie punktu stycznego do (pt), zwraca numer wierzchołka, a nie trójkąta int facecount = iNumVerts / 3; // bo maska powierzchni jest jedna na trójkąt for( int faceidx = Startface; faceidx < facecount; ++faceidx ) { @@ -983,7 +983,7 @@ void TSubModel::serialize_geometry( std::ostream &Output ) const { }; void -TSubModel::create_geometry( std::size_t &Dataoffset, geometrybank_handle const &Bank ) { +TSubModel::create_geometry( std::size_t &Dataoffset, gfx::geometrybank_handle const &Bank ) { // data offset is used to determine data offset of each submodel into single shared geometry bank // (the offsets are part of legacy system which we now need to work around for backward compatibility) @@ -1472,7 +1472,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) // once sorted we can grab geometry as it comes, and assign it to the chunks it belongs to for( auto const &submodeloffset : submodeloffsets ) { auto &submodel = Root[ submodeloffset.second ]; - vertex_array vertices; vertices.resize( submodel.iNumVerts ); + gfx::vertex_array vertices; vertices.resize( submodel.iNumVerts ); iNumVerts += submodel.iNumVerts; for( auto &vertex : vertices ) { vertex.deserialize( s ); diff --git a/Model3d.h b/Model3d.h index 1a3ff290..57a01408 100644 --- a/Model3d.h +++ b/Model3d.h @@ -124,7 +124,7 @@ private: TSubModel *Next { nullptr }; TSubModel *Child { nullptr }; - geometry_handle m_geometry { 0, 0 }; // geometry of the submodel + gfx::geometry_handle m_geometry { 0, 0 }; // geometry of the submodel material_handle m_material { null_handle }; // numer tekstury, -1 wymienna, 0 brak bool bWire { false }; // nie używane, ale wczytywane float Opacity { 1.0f }; @@ -134,7 +134,7 @@ private: public: // chwilowo float3 v_TransVector { 0.0f, 0.0f, 0.0f }; - vertex_array Vertices; + gfx::vertex_array Vertices; float m_boundingradius { 0 }; size_t iAnimOwner{ 0 }; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim{ at_None }; // kody animacji oddzielnie, bo zerowane @@ -147,7 +147,7 @@ public: std::string m_materialname; // robocza nazwa tekstury do zapisania w pliku binarnym std::string pName; // robocza nazwa private: - int SeekFaceNormal( std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, vertex_array const &Vertices ); + int SeekFaceNormal( std::vector const &Masks, int const Startface, unsigned int const Mask, glm::vec3 const &Position, gfx::vertex_array const &Vertices ); void RaAnimation(TAnimType a); public: @@ -174,7 +174,7 @@ public: inline float4x4 * GetMatrix() { return fMatrix; }; inline void Hide() { iVisible = 0; }; - void create_geometry( std::size_t &Dataoffset, geometrybank_handle const &Bank ); + void create_geometry( std::size_t &Dataoffset, gfx::geometrybank_handle const &Bank ); int FlagsCheck(); void WillBeAnimated() { @@ -222,7 +222,7 @@ private: int iFlags; // Ra: czy submodele mają przezroczyste tekstury public: // Ra: tymczasowo int iNumVerts; // ilość wierzchołków (gdy nie ma VBO, to m_nVertexCount=0) - geometrybank_handle m_geometrybank; + gfx::geometrybank_handle m_geometrybank; bool m_geometrycreated { false }; private: std::vector Textures; // nazwy tekstur diff --git a/Segment.cpp b/Segment.cpp index afc6df24..ed478390 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -359,7 +359,7 @@ Math3D::vector3 TSegment::FastGetPoint(double const t) const interpolate( Point1, Point2, t ) ); } -bool TSegment::RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, const basic_vertex *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, float fOffsetX, glm::vec3 **p, bool bRender) +bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Origin, const gfx::basic_vertex *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, float fOffsetX, glm::vec3 **p, bool bRender) { // generowanie trójkątów dla odcinka trajektorii ruchu // standardowo tworzy triangle_strip dla prostego albo ich zestaw dla łuku // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli diff --git a/Segment.h b/Segment.h index dfcf09be..319186c9 100644 --- a/Segment.h +++ b/Segment.h @@ -97,7 +97,7 @@ public: r2 = fRoll2; } bool - RenderLoft( vertex_array &Output, Math3D::vector3 const &Origin, basic_vertex const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, float fOffsetX = 0.f, glm::vec3 **p = nullptr, bool bRender = true); + RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Origin, gfx::basic_vertex const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, float fOffsetX = 0.f, glm::vec3 **p = nullptr, bool bRender = true); void Render(); inline diff --git a/Track.cpp b/Track.cpp index 0ea4b3c8..a6fbd837 100644 --- a/Track.cpp +++ b/Track.cpp @@ -940,7 +940,7 @@ const int nnumPts = 12; // szyna - vextor6(x,y,mapowanie tekstury,xn,yn,zn) // tę wersję opracował Tolein (bez pochylenia) // TODO: profile definitions in external files -basic_vertex const szyna[ nnumPts ] = { +gfx::basic_vertex const szyna[ nnumPts ] = { {{ 0.111f, -0.180f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.00f, 0.f}}, {{ 0.046f, -0.150f, 0.f}, { 0.707f, 0.707f, 0.f}, {0.15f, 0.f}}, {{ 0.044f, -0.050f, 0.f}, { 0.707f, -0.707f, 0.f}, {0.25f, 0.f}}, @@ -957,7 +957,7 @@ basic_vertex const szyna[ nnumPts ] = { // iglica - vextor3(x,y,mapowanie tekstury) // 1 mm więcej, żeby nie nachodziły tekstury? // TODO: automatic generation from base profile TBD: reuse base profile? -basic_vertex const iglica[ nnumPts ] = { +gfx::basic_vertex const iglica[ nnumPts ] = { {{ 0.010f, -0.180f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.00f, 0.f}}, {{ 0.010f, -0.155f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.15f, 0.f}}, {{ 0.010f, -0.070f, 0.f}, { 1.000f, 0.000f, 0.f}, {0.25f, 0.f}}, @@ -1062,7 +1062,7 @@ void TTrack::RaAssign( TAnimModel *am, TEvent *done, TEvent *joined ) }; // wypełnianie tablic VBO -void TTrack::create_geometry( geometrybank_handle const &Bank ) { +void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { // Ra: trzeba rozdzielić szyny od podsypki, aby móc grupować wg tekstur auto const fHTW = 0.5f * std::abs(fTrackWidth); auto const side = std::abs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza @@ -1122,7 +1122,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { sin2 = std::sin(roll2), cos2 = std::cos(roll2); // zwykla szyna: //Ra: czemu główki są asymetryczne na wysokości 0.140? - basic_vertex rpts1[24], rpts2[24], rpts3[24], rpts4[24]; + gfx::basic_vertex rpts1[24], rpts2[24], rpts3[24], rpts4[24]; for( int i = 0; i < 12; ++i ) { rpts1[ i ] = { @@ -1186,7 +1186,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { case tt_Normal: if (m_material2) { // podsypka z podkładami jest tylko dla zwykłego toru - basic_vertex bpts1[ 8 ]; // punkty głównej płaszczyzny nie przydają się do robienia boków + gfx::basic_vertex bpts1[ 8 ]; // punkty głównej płaszczyzny nie przydają się do robienia boków if( fTexLength == 4.f ) { // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy profil auto const normalx = std::cos( glm::radians( 75.f ) ); @@ -1314,7 +1314,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.5f + map12, 0.f} }; // prawy skos } } - vertex_array vertices; + gfx::vertex_array vertices; Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); if( ( Bank != 0 ) && ( true == Geometry2.empty() ) ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1326,7 +1326,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } if (m_material1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną - vertex_array vertices; + gfx::vertex_array vertices; if( ( Bank != 0 ) && ( true == Geometry1.empty() ) ) { Segment->RenderLoft( vertices, m_origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); @@ -1347,7 +1347,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { case tt_Switch: // dla zwrotnicy dwa razy szyny if( m_material1 || m_material2 ) { // iglice liczone tylko dla zwrotnic - basic_vertex rpts3[24], rpts4[24]; + gfx::basic_vertex rpts3[24], rpts4[24]; for( int i = 0; i < 12; ++i ) { rpts3[ i ] = { @@ -1378,7 +1378,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { // TODO, TBD: change all track geometry to triangles, to allow packing data in less, larger buffers if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa - vertex_array vertices; + gfx::vertex_array vertices; if( m_material1 ) { // fixed parts SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength ); @@ -1408,7 +1408,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } else { // lewa działa lepiej niż prawa - vertex_array vertices; + gfx::vertex_array vertices; if( m_material1 ) { // fixed parts SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała @@ -1446,7 +1446,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { case tt_Normal: // drogi proste, bo skrzyżowania osobno { - basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków + gfx::basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków if (m_material1 || m_material2) { // punkty się przydadzą, nawet jeśli nawierzchni nie ma /* @@ -1489,13 +1489,13 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - vertex_array vertices; + gfx::vertex_array vertices; Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) - basic_vertex + gfx::basic_vertex rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony if (fTexHeight1 >= 0.f) @@ -1649,7 +1649,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { {0.484375f - map2l, 0.f} }; // lewy brzeg lewego chodnika } } - vertex_array vertices; + gfx::vertex_array vertices; if( iTrapezoid ) // trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony // odcinka @@ -1728,7 +1728,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { SwitchExtension->bPoints ? nullptr : SwitchExtension->vPoints; // zmienna robocza, NULL gdy tablica punktów już jest wypełniona - basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków + gfx::basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% auto const max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości @@ -1761,7 +1761,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie w swoim czasie if( m_material2 ) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) - basic_vertex + gfx::basic_vertex rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony // Ra 2014-07: trzeba to przerobić na pętlę i pobierać profile (przynajmniej 2..4) z sąsiednich dróg @@ -1900,7 +1900,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } } bool render = ( m_material2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni - vertex_array vertices; + gfx::vertex_array vertices; if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { @@ -1956,7 +1956,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } if( m_material1 ) { - vertex_array vertices; + gfx::vertex_array vertices; // jeśli podana tekstura nawierzchni // we start with a vertex in the middle... vertices.emplace_back( @@ -2006,7 +2006,7 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { { case tt_Normal: // drogi proste, bo skrzyżowania osobno { - basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków + gfx::basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% auto const max = ( @@ -2056,14 +2056,14 @@ void TTrack::create_geometry( geometrybank_handle const &Bank ) { } if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy - vertex_array vertices; + gfx::vertex_array vertices; Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) - vertex_array vertices; - basic_vertex + gfx::vertex_array vertices; + gfx::basic_vertex rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony @@ -2425,7 +2425,7 @@ TTrack * TTrack::RaAnimate() auto const fHTW2 = fHTW; // Ra: na razie niech tak będzie auto const cos1 = 1.0f, sin1 = 0.0f, cos2 = 1.0f, sin2 = 0.0f; // Ra: ... - basic_vertex + gfx::basic_vertex rpts3[ 24 ], rpts4[ 24 ]; for (int i = 0; i < 12; ++i) { @@ -2456,7 +2456,7 @@ TTrack * TTrack::RaAnimate() {szyna[ i ].texture.x, 0.f} }; } - vertex_array vertices; + gfx::vertex_array vertices; if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa @@ -2520,7 +2520,7 @@ TTrack * TTrack::RaAnimate() dynamic->Move( 0.000001 ); } // NOTE: passing empty handle is a bit of a hack here. could be refactored into something more elegant - create_geometry( geometrybank_handle() ); + create_geometry( {} ); } // animacja trwa nadal } else diff --git a/Track.h b/Track.h index 2979525d..3af0fbcd 100644 --- a/Track.h +++ b/Track.h @@ -147,7 +147,7 @@ private: glm::dvec3 m_origin; material_handle m_material1 = 0; // tekstura szyn albo nawierzchni material_handle m_material2 = 0; // tekstura automatycznej podsypki albo pobocza - typedef std::vector geometryhandle_sequence; + typedef std::vector geometryhandle_sequence; geometryhandle_sequence Geometry1; // geometry chunks textured with texture 1 geometryhandle_sequence Geometry2; // geometry chunks textured with texture 2 @@ -245,7 +245,7 @@ public: std::vector endpoints() const; - void create_geometry( geometrybank_handle const &Bank ); // wypełnianie VBO + void create_geometry( gfx::geometrybank_handle const &Bank ); // wypełnianie VBO void RenderDynSounds(); // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania void RaOwnerSet( scene::basic_cell *o ) { diff --git a/Traction.cpp b/Traction.cpp index 348e9e22..6ff114b3 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -175,18 +175,18 @@ TTraction::endpoints() const { } std::size_t -TTraction::create_geometry( geometrybank_handle const &Bank ) { +TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { if( m_geometry != null_handle ) { return GfxRenderer.Vertices( m_geometry ).size() / 2; } - vertex_array vertices; + gfx::vertex_array vertices; double ddp = std::hypot( pPoint2.x - pPoint1.x, pPoint2.z - pPoint1.z ); if( Wires == 2 ) WireOffset = 0; // jezdny - basic_vertex startvertex, endvertex; + gfx::basic_vertex startvertex, endvertex; startvertex.position = glm::vec3( pPoint1.x - ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x, diff --git a/Traction.h b/Traction.h index 3f75d60e..c8ccb432 100644 --- a/Traction.h +++ b/Traction.h @@ -50,7 +50,7 @@ class TTraction : public editor::basic_node { int PowerState { 0 }; // type of incoming power, if any // visualization data glm::dvec3 m_origin; - geometry_handle m_geometry; + gfx::geometry_handle m_geometry; explicit TTraction( scene::node_data const &Nodedata ); @@ -64,7 +64,7 @@ class TTraction : public editor::basic_node { endpoints() const; // creates geometry data in specified geometry bank. returns: number of created elements, or NULL // NOTE: deleting nodes doesn't currently release geometry data owned by the node. TODO: implement erasing individual geometry chunks and banks - std::size_t create_geometry( geometrybank_handle const &Bank ); + std::size_t create_geometry( gfx::geometrybank_handle const &Bank ); int TestPoint(glm::dvec3 const &Point); void Connect(int my, TTraction *with, int to); void Init(); diff --git a/Train.cpp b/Train.cpp index ee354945..02d9c241 100644 --- a/Train.cpp +++ b/Train.cpp @@ -312,28 +312,6 @@ TTrain::TTrain() { //----- pMechSittingPosition = vector3(0, 0, 0); // ABu: 180404 InstrumentLightActive = false; // ABu: 030405 - dsbNastawnikJazdy = NULL; - dsbNastawnikBocz = NULL; - dsbRelay = NULL; - dsbPneumaticRelay = NULL; - dsbSwitch = NULL; - dsbPneumaticSwitch = NULL; - dsbReverserKey = NULL; // hunter-121211 - dsbCouplerAttach = NULL; - dsbCouplerDetach = NULL; - dsbDieselIgnition = NULL; - dsbDoorClose = NULL; - dsbDoorOpen = NULL; - dsbPantUp = NULL; - dsbPantDown = NULL; - dsbWejscie_na_bezoporow = NULL; - dsbWejscie_na_drugi_uklad = NULL; // hunter-081211: poprawka literowki - dsbHasler = NULL; - dsbBuzzer = NULL; - dsbSlipAlarm = NULL; // Bombardier 011010: alarm przy poslizgu dla 181/182 - dsbCouplerStretch = NULL; - dsbEN57_CouplerStretch = NULL; - dsbBufferClamp = NULL; iRadioChannel = 0; fTachoTimer = 0.0; // włączenie skoków wskazań prędkościomierza @@ -749,7 +727,7 @@ void TTrain::OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Co Train->keybrakecount = 0; if( ( Train->is_eztoer() ) && ( Train->mvOccupied->BrakeCtrlPos < 3 ) ) { // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); } } } @@ -772,7 +750,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co && ( Train->mvControlled->Mains ) && ( Train->mvOccupied->BrakeCtrlPos != -1 ) ) { // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); } Train->mvOccupied->BrakeLevelAdd( -Global::fBrakeStep ); } @@ -794,7 +772,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co if( ( Train->mvOccupied->TrainType == dt_EZT ) && ( Train->mvControlled->Mains ) && ( Train->mvControlled->ActiveDir != 0 ) ) { - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); } } } @@ -808,7 +786,7 @@ void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Co if( ( Train->is_eztoer() ) && ( Train->mvControlled->Mains ) && ( Train->mvOccupied->BrakeCtrlPos != -1 ) ) { - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); } Train->mvOccupied->BrakeLevelSet( -1 ); @@ -826,7 +804,7 @@ void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Co if( ( Train->mvOccupied->TrainType == dt_EZT ) && ( Train->mvControlled->Mains ) && ( Train->mvControlled->ActiveDir != 0 ) ) { - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); } } } @@ -840,7 +818,7 @@ void TTrain::OnCommand_trainbrakerelease( TTrain *Train, command_data const &Com if( ( Train->is_eztoer() ) && ( ( Train->mvOccupied->BrakeCtrlPos == 1 ) || ( Train->mvOccupied->BrakeCtrlPos == -1 ) ) ) { - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); } Train->mvOccupied->BrakeLevelSet( 0 ); @@ -855,7 +833,7 @@ void TTrain::OnCommand_trainbrakefirstservice( TTrain *Train, command_data const if( ( Train->is_eztoer() ) && ( Train->mvControlled->Mains ) && ( Train->mvOccupied->BrakeCtrlPos != 1 ) ) { - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); } Train->mvOccupied->BrakeLevelSet( 1 ); @@ -871,7 +849,7 @@ void TTrain::OnCommand_trainbrakeservice( TTrain *Train, command_data const &Com && ( Train->mvControlled->Mains ) && ( ( Train->mvOccupied->BrakeCtrlPos == 1 ) || ( Train->mvOccupied->BrakeCtrlPos == -1 ) ) ) { - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); } Train->mvOccupied->BrakeLevelSet( @@ -891,7 +869,7 @@ void TTrain::OnCommand_trainbrakefullservice( TTrain *Train, command_data const && ( Train->mvControlled->Mains ) && ( ( Train->mvOccupied->BrakeCtrlPos == 1 ) || ( Train->mvOccupied->BrakeCtrlPos == -1 ) ) ) { - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); } Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->BrakeCtrlPosNo - 1 ); } @@ -1024,7 +1002,7 @@ void TTrain::OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const & // turn on if( Train->mvOccupied->EpFuseSwitch( true ) ) { // audio feedback - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); // visual feedback // NOTE: there's no button for ep brake control switch // TBD, TODO: add ep brake control switch? @@ -1034,7 +1012,7 @@ void TTrain::OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const & //turn off if( Train->mvOccupied->EpFuseSwitch( false ) ) { // audio feedback - Train->play_sound( Train->dsbPneumaticSwitch ); + Train->dsbPneumaticSwitch.play(); // visual feedback // NOTE: there's no button for ep brake control switch // TBD, TODO: add ep brake control switch? @@ -1563,7 +1541,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com if( Train->mvControlled->EngineType == DieselEngine ) { if( Train->mvControlled->MainSwitch( true ) ) { // sound feedback, engine start for diesel vehicle - Train->play_sound( Train->dsbDieselIgnition ); + Train->dsbDieselIgnition.play(); // side-effects Train->mvControlled->ConverterSwitch( ( Train->ggConverterButton.GetValue() > 0.5 ) || ( Train->mvControlled->ConverterStart == start::automatic ) ); Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); @@ -1606,7 +1584,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } // play sound immediately when the switch is hit, not after release if( Train->fMainRelayTimer > 0.0f ) { - Train->play_sound( Train->dsbRelay ); + Train->dsbRelay.play(); Train->fMainRelayTimer = 0.0f; } } @@ -1617,7 +1595,7 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // ...after opening circuit, or holding for too short time to close it // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, if( Train->fMainRelayTimer > 0.0f ) { - Train->play_sound( Train->dsbRelay ); + Train->dsbRelay.play(); Train->fMainRelayTimer = 0.0f; } // we don't exactly know which of the two buttons was used, so reset both @@ -1942,7 +1920,7 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C Train->ggStLinOffButton.UpdateValue( 1.0, Train->dsbSwitch ); // effect if( true == Train->mvControlled->StLinFlag ) { - Train->play_sound( Train->dsbRelay ); + Train->dsbRelay.play(); } // yBARC - zmienione na przeciwne, bo true to zalaczone Train->mvControlled->StLinFlag = false; @@ -2503,14 +2481,14 @@ void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &C if( false == Train->bCabLight ) { // turn on Train->bCabLight = true; - Train->btCabLight.TurnOn(); + Train->btCabLight.Turn( true ); // visual feedback Train->ggCabLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off Train->bCabLight = false; - Train->btCabLight.TurnOff(); + Train->btCabLight.Turn( false ); // visual feedback Train->ggCabLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2671,14 +2649,12 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorLeft( true ) ) { Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); - Train->play_sound( Train->dsbDoorOpen ); } } else { // in the rear cab sides are reversed if( Train->mvOccupied->DoorRight( true ) ) { Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); - Train->play_sound( Train->dsbDoorOpen ); } } } @@ -2687,14 +2663,12 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorLeft( false ) ) { Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); - Train->play_sound( Train->dsbDoorClose ); } } else { // in the rear cab sides are reversed if( Train->mvOccupied->DoorRight( false ) ) { Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); - Train->play_sound( Train->dsbDoorClose ); } } } @@ -2716,14 +2690,12 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorRight( true ) ) { Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); - Train->play_sound( Train->dsbDoorOpen ); } } else { // in the rear cab sides are reversed if( Train->mvOccupied->DoorLeft( true ) ) { Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); - Train->play_sound( Train->dsbDoorOpen ); } } } @@ -2732,14 +2704,12 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma if( Train->mvOccupied->ActiveCab == 1 ) { if( Train->mvOccupied->DoorRight( false ) ) { Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); - Train->play_sound( Train->dsbDoorClose ); } } else { // in the rear cab sides are reversed if( Train->mvOccupied->DoorLeft( false ) ) { Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); - Train->play_sound( Train->dsbDoorClose ); } } } @@ -2934,13 +2904,13 @@ void TTrain::OnKeyDown(int cKey) if (Global::ctrlState) if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R + bdelay_M)) { - play_sound( dsbPneumaticRelay ); + dsbPneumaticRelay.play(); } else ; else if (temp->MoverParameters->BrakeDelaySwitch(bdelay_P)) { - play_sound( dsbPneumaticRelay ); + dsbPneumaticRelay.play(); } } } @@ -3062,13 +3032,13 @@ void TTrain::OnKeyDown(int cKey) if (Global::ctrlState) if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R)) { - play_sound( dsbPneumaticRelay ); + dsbPneumaticRelay.play(); } else ; else if (temp->MoverParameters->BrakeDelaySwitch(bdelay_G)) { - play_sound( dsbPneumaticRelay ); + dsbPneumaticRelay.play(); } } } @@ -3171,7 +3141,7 @@ if // //podłączony sprzęg będzie widoczny if (DynamicObject->Mechanik) // na wszelki wypadek DynamicObject->Mechanik->CheckVehicles(Connect); // aktualizacja flag kierunku w składzie - play_sound( dsbCouplerAttach ); + dsbCouplerAttach.play(); // one coupling type per key press return; } @@ -3189,7 +3159,7 @@ if (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_pneumatic))) { // TODO: dedicated 'click' sound for connecting cable-type connections - play_sound( dsbCouplerDetach ); + dsbCouplerDetach.play(); // rsHiss.Play( 1, DSBPLAY_LOOPING, true, tmp->GetPosition() ); DynamicObject->SetPneumatic(CouplNr != 0, true); // Ra: to mi się nie podoba !!!! tmp->SetPneumatic(CouplNr != 0, true); @@ -3208,7 +3178,7 @@ if (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_scndpneumatic))) { // TODO: dedicated 'click' sound for connecting cable-type connections - play_sound( dsbCouplerDetach ); + dsbCouplerDetach.play(); // rsHiss.Play( 1, DSBPLAY_LOOPING, true, tmp->GetPosition() ); DynamicObject->SetPneumatic( CouplNr != 0, false ); // Ra: to mi się nie podoba !!!! tmp->SetPneumatic(CouplNr != 0, false); @@ -3227,7 +3197,7 @@ if (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_controll))) { // TODO: dedicated 'click' sound for connecting cable-type connections - play_sound( dsbCouplerAttach ); + dsbCouplerAttach.play(); // one coupling type per key press return; } @@ -3242,7 +3212,7 @@ if tmp->MoverParameters->Couplers[CouplNr].Connected, (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_passenger))) { - play_sound( dsbCouplerAttach ); + dsbCouplerAttach.play(); /* DynamicObject->SetPneumatic(CouplNr != 0, false); tmp->SetPneumatic(CouplNr != 0, false); @@ -3262,7 +3232,7 @@ if ( tmp->MoverParameters->Couplers[ CouplNr ].CouplingFlag | ctrain_heating ) ) ) { // TODO: dedicated 'click' sound for connecting cable-type connections - play_sound( dsbCouplerAttach ); + dsbCouplerAttach.play(); // one coupling type per key press return; } @@ -3282,7 +3252,7 @@ if if (DynamicObject->DettachStatus(iCabn - 1) < 0) // jeśli jest co odczepić if (DynamicObject->Dettach(iCabn - 1)) // iCab==1:przód,iCab==2:tył { - play_sound( dsbCouplerDetach ); // w kabinie ten dźwięk? + dsbCouplerDetach.play(); // w kabinie ten dźwięk? } } else @@ -3298,7 +3268,7 @@ if if (tmp->DettachStatus(CouplNr) < 0) // jeśli jest co odczepić i się da if (!tmp->Dettach(CouplNr)) { // dźwięk odczepiania - play_sound( dsbCouplerDetach ); + dsbCouplerDetach.play(); } } } @@ -3572,29 +3542,6 @@ bool TTrain::Update( double const Deltatime ) fTachoCount -= dt * 0.66; // schodz powoli - niektore haslery to ze 4 // sekundy potrafia stukac - /* Ra: to by trzeba było przemyśleć, zmienione na szybko problemy robi - //McZapkie: predkosc wyswietlana na tachometrze brana jest z obrotow kol - double vel=fabs(11.31*mvControlled->WheelDiameter*mvControlled->nrot); - if (iSekunda!=floor(GlobalTime->mr)||(vel<1.0)) - {fTachoVelocity=vel; - if (fTachoVelocity>1.0) //McZapkie-270503: podkrecanie tachometru - { - if (fTachoCount0) - fTachoCount-=dt; - if (mvControlled->TrainType==dt_EZT) - //dla EZT wskazówka porusza się niestabilnie - if (fTachoVelocity>7.0) - {fTachoVelocity=floor(0.5+fTachoVelocity+random(5)-random(5)); - //*floor(0.2*fTachoVelocity); - if (fTachoVelocity<0.0) fTachoVelocity=0.0; - } - iSekunda=floor(GlobalTime->mr); - } - */ // Ra 2014-09: napięcia i prądy muszą być ustalone najpierw, bo wysyłane są ewentualnie na PoKeys if ((mvControlled->EngineType != DieselElectric) && (mvControlled->EngineType != ElectricInductionMotor)) // Ra 2014-09: czy taki rozdzia? ma sens? @@ -3823,344 +3770,6 @@ bool TTrain::Update( double const Deltatime ) fConverterTimer = 0; //------------------ - double vol = 0; - // int freq=1; - double dfreq; - - // McZapkie-280302 - syczenie - if ((mvOccupied->BrakeHandle == FV4a) || (mvOccupied->BrakeHandle == FVel6)) - { - if (rsHiss.AM != 0) // upuszczanie z PG - { - fPPress = (1 * fPPress + mvOccupied->Handle->GetSound(s_fv4a_b)) / (2); - if (fPPress > 0) - { - vol = 2.0 * rsHiss.AM * fPPress; - } - if (vol > 0.001) - { - rsHiss.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - { - rsHiss.Stop(); - } - } - if (rsHissU.AM != 0) // upuszczanie z PG - { - fNPress = (1 * fNPress + mvOccupied->Handle->GetSound(s_fv4a_u)) / (2); - if (fNPress > 0) - { - vol = rsHissU.AM * fNPress; - } - if (vol > 0.001) - { - rsHissU.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - { - rsHissU.Stop(); - } - } - if (rsHissE.AM != 0) // upuszczanie przy naglym - { - vol = mvOccupied->Handle->GetSound(s_fv4a_e) * rsHissE.AM; - if (vol > 0.001) - { - rsHissE.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - { - rsHissE.Stop(); - } - } - if (rsHissX.AM != 0) // upuszczanie sterujacego fala - { - vol = mvOccupied->Handle->GetSound(s_fv4a_x) * rsHissX.AM; - if (vol > 0.001) - { - rsHissX.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - { - rsHissX.Stop(); - } - } - if (rsHissT.AM != 0) // upuszczanie z czasowego - { - vol = mvOccupied->Handle->GetSound(s_fv4a_t) * rsHissT.AM; - if (vol > 0.001) - { - rsHissT.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - { - rsHissT.Stop(); - } - } - - } // koniec FV4a - else // jesli nie FV4a - { - if (rsHiss.AM != 0.0) // upuszczanie z PG - { - fPPress = (4.0f * fPPress + std::max(mvOccupied->dpLocalValve, mvOccupied->dpMainValve)) / (4.0f + 1.0f); - if (fPPress > 0.0f) - { - vol = 2.0 * rsHiss.AM * fPPress; - } - if (vol > 0.01) - { - rsHiss.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - { - rsHiss.Stop(); - } - } - if (rsHissU.AM != 0.0) // napelnianie PG - { - fNPress = (4.0f * fNPress + Min0R(mvOccupied->dpLocalValve, mvOccupied->dpMainValve)) / (4.0f + 1.0f); - if (fNPress < 0.0f) - { - vol = -1.0 * rsHissU.AM * fNPress; - } - if (vol > 0.01) - { - rsHissU.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - { - rsHissU.Stop(); - } - } - } // koniec nie FV4a - - // Winger-160404 - syczenie pomocniczego (luzowanie) - /* if (rsSBHiss.AM!=0) - { - fSPPress=(mvOccupied->LocalBrakeRatio())-(mvOccupied->LocalBrakePos); - if (fSPPress>0) - { - vol=2*rsSBHiss.AM*fSPPress; - } - if (vol>0.1) - { - rsSBHiss.Play(vol,DSBPLAY_LOOPING,true,DynamicObject->GetPosition()); - } - else - { - rsSBHiss.Stop(); - } - } - */ - // szum w czasie jazdy - vol = 0.0; - dfreq = 1.0; - if (rsRunningNoise.AM != 0) - { - if (DynamicObject->GetVelocity() != 0) - { - if (!TestFlag(mvOccupied->DamageFlag, - dtrain_wheelwear)) // McZpakie-221103: halas zalezny od kola - { - dfreq = rsRunningNoise.FM * mvOccupied->Vel + rsRunningNoise.FA; - vol = rsRunningNoise.AM * mvOccupied->Vel + rsRunningNoise.AA; - switch (tor->eEnvironment) - { - case e_tunnel: - { - vol *= 3; - dfreq *= 0.95; - } - break; - case e_canyon: - { - vol *= 1.1; - } - break; - case e_bridge: - { - vol *= 2; - dfreq *= 0.98; - } - break; - } - } - else // uszkodzone kolo (podkucie) - if (fabs(mvOccupied->nrot) > 0.01) - { - dfreq = rsRunningNoise.FM * mvOccupied->Vel + rsRunningNoise.FA; - vol = rsRunningNoise.AM * mvOccupied->Vel + rsRunningNoise.AA; - switch (tor->eEnvironment) - { - case e_tunnel: - { - vol *= 2; - } - break; - case e_canyon: - { - vol *= 1.1; - } - break; - case e_bridge: - { - vol *= 1.5; - } - break; - } - } - if (fabs(mvOccupied->nrot) > 0.01) - vol *= 1 + - mvOccupied->UnitBrakeForce / - (1 + mvOccupied->MaxBrakeForce); // hamulce wzmagaja halas - vol = vol * (20.0 + tor->iDamageFlag) / 21; - rsRunningNoise.AdjFreq(dfreq, 0); - rsRunningNoise.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - rsRunningNoise.Stop(); - } - - if (rsBrake.AM != 0) - { - if ((!mvOccupied->SlippingWheels) && (mvOccupied->UnitBrakeForce > 10.0) && - (DynamicObject->GetVelocity() > 0.01)) - { - // vol=rsBrake.AA+rsBrake.AM*(DynamicObject->GetVelocity()*100+mvOccupied->UnitBrakeForce); - vol = - rsBrake.AM * sqrt((DynamicObject->GetVelocity() * mvOccupied->UnitBrakeForce)); - dfreq = rsBrake.FA + rsBrake.FM * DynamicObject->GetVelocity(); - rsBrake.AdjFreq(dfreq, 0); - rsBrake.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - { - rsBrake.Stop(); - } - } - - if (rsEngageSlippery.AM != 0) - { - if /*((fabs(mvControlled->dizel_engagedeltaomega)>0.2) && */ ( - mvControlled->dizel_engage > 0.1) - { - if (fabs(mvControlled->dizel_engagedeltaomega) > 0.2) - { - dfreq = rsEngageSlippery.FA + - rsEngageSlippery.FM * fabs(mvControlled->dizel_engagedeltaomega); - vol = rsEngageSlippery.AA + rsEngageSlippery.AM * (mvControlled->dizel_engage); - } - else - { - dfreq = - 1; // rsEngageSlippery.FA+0.7*rsEngageSlippery.FM*(fabs(mvControlled->enrot)+mvControlled->nmax); - if (mvControlled->dizel_engage > 0.2) - vol = - rsEngageSlippery.AA + - 0.2 * rsEngageSlippery.AM * (mvControlled->enrot / mvControlled->nmax); - else - vol = 0; - } - rsEngageSlippery.AdjFreq(dfreq, 0); - rsEngageSlippery.Play(vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - } - else - { - rsEngageSlippery.Stop(); - } - } - - if (FreeFlyModeFlag) - rsFadeSound.Stop(); // wyłącz to cholerne cykanie! - else - rsFadeSound.Play(1, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - - // McZapkie! - to wazne - SoundFlag wystawiane jest przez moje moduly - // gdy zachodza pewne wydarzenia komentowane dzwiekiem. - // Mysle ze wystarczy sprawdzac a potem zerowac SoundFlag tutaj - // a nie w DynObject - gdyby cos poszlo zle to po co szarpac dzwiekiem co - // 10ms. - - if (TestFlag(mvOccupied->SoundFlag, sound_relay)) // przekaznik - gdy - // bezpiecznik, - // automatyczny rozruch - // itp - { - if (mvOccupied->EventFlag || TestFlag(mvOccupied->SoundFlag, sound_loud)) - { - mvOccupied->EventFlag = false; // Ra: w kabinie? - if( dsbRelay != nullptr ) { dsbRelay->SetVolume( DSBVOLUME_MAX ); } - } - else - { - if( dsbRelay != nullptr ) { dsbRelay->SetVolume( -40 ); } - } - if (!TestFlag(mvOccupied->SoundFlag, sound_manyrelay)) - play_sound( dsbRelay ); - else - { - if (TestFlag(mvOccupied->SoundFlag, sound_loud)) - play_sound( dsbWejscie_na_bezoporow ); - else - play_sound( dsbWejscie_na_drugi_uklad ); - } - } - - if( dsbBufferClamp != nullptr ) { - if( TestFlag( mvOccupied->SoundFlag, sound_bufferclamp ) ) // zderzaki uderzaja o siebie - { - if( TestFlag( mvOccupied->SoundFlag, sound_loud ) ) - dsbBufferClamp->SetVolume( DSBVOLUME_MAX ); - else - dsbBufferClamp->SetVolume( -20 ); - play_sound( dsbBufferClamp ); - } - } - if (dsbCouplerStretch) - if (TestFlag(mvOccupied->SoundFlag, sound_couplerstretch)) // sprzegi sie rozciagaja - { - if (TestFlag(mvOccupied->SoundFlag, sound_loud)) - dsbCouplerStretch->SetVolume(DSBVOLUME_MAX); - else - dsbCouplerStretch->SetVolume(-20); - play_sound( dsbCouplerStretch ); - } - - if (mvOccupied->SoundFlag == 0) - if (mvOccupied->EventFlag) - if (TestFlag(mvOccupied->DamageFlag, dtrain_wheelwear)) - { // Ra: przenieść do DynObj! - if (rsRunningNoise.AM != 0) - { - rsRunningNoise.Stop(); - // float aa=rsRunningNoise.AA; - float am = rsRunningNoise.AM; - float fa = rsRunningNoise.FA; - float fm = rsRunningNoise.FM; - rsRunningNoise.Init("lomotpodkucia.wav", -1, 0, 0, 0, - true); // MC: zmiana szumu na lomot - if (rsRunningNoise.AM == 1) - rsRunningNoise.AM = am; - rsRunningNoise.AA = 0.7; - rsRunningNoise.FA = fa; - rsRunningNoise.FM = fm; - } - mvOccupied->EventFlag = false; - } - - mvOccupied->SoundFlag = 0; - /* - for (int b=0; b<2; b++) //MC: aby zerowac stukanie przekaznikow w - czlonie silnikowym - if (TestFlag(mvControlled->Couplers[b].CouplingFlag,ctrain_controll)) - if (mvControlled->Couplers[b].Connected.Power>0.01) - mvControlled->Couplers[b]->Connected->SoundFlag=0; - */ - - // McZapkie! - koniec obslugi dzwiekow z mover.pas - // youBy - prad w drugim czlonie: galaz lub calosc { TDynamicObject *tmp; @@ -4198,42 +3807,6 @@ bool TTrain::Update( double const Deltatime ) } } } - /* - //McZapkie-240302 ggVelocity.UpdateValue(DynamicObject->GetVelocity()); - //fHaslerTimer+=dt; - //if (fHaslerTimer>fHaslerTime) - {//Ra: ryzykowne jest to, gdyż może się nie uaktualniać prędkość - //Ra: prędkość się powinna zaokrąglać tam gdzie się liczy - fTachoVelocity - if (ggVelocity.SubModel) - {//ZiomalCl: wskazanie Haslera w kabinie A ze zwloka czasowa oraz odpowiednia - tolerancja - //Nalezy sie zastanowic na przyszlosc nad rozroznieniem predkosciomierzy - (dokladnosc wskazan, zwloka czasowa wskazania, inne funkcje) - //ZiomalCl: W ezt typu stare EN57 wskazania haslera sa mniej dokladne - (linka) - //ggVelocity.UpdateValue(fTachoVelocity>2?fTachoVelocity+0.5-random(mvControlled->TrainType==dt_EZT?5:2)/2:0); - ggVelocity.UpdateValue(Min0R(fTachoVelocity,mvControlled->Vmax*1.05)); - //ograniczenie maksymalnego wskazania na analogowym - ggVelocity.Update(); - } - if (ggVelocityDgt.SubModel) - {//Ra 2014-07: prędkościomierz cyfrowy - ggVelocityDgt.UpdateValue(fTachoVelocity); - ggVelocityDgt.Update(); - } - if (ggVelocity_B.SubModel) - {//ZiomalCl: wskazanie Haslera w kabinie B ze zwloka czasowa oraz odpowiednia - tolerancja - //Nalezy sie zastanowic na przyszlosc nad rozroznieniem predkosciomierzy - (dokladnosc wskazan, zwloka czasowa wskazania, inne funkcje) - //Velocity_B.UpdateValue(fTachoVelocity>2?fTachoVelocity+0.5-random(mvControlled->TrainType==dt_EZT?5:2)/2:0); - ggVelocity_B.UpdateValue(fTachoVelocity); - ggVelocity_B.Update(); - } - //fHaslerTimer-=fHaslerTime; //1.2s (???) - } - */ // McZapkie-300302: zegarek if (ggClockMInd.SubModel) { @@ -4326,39 +3899,18 @@ bool TTrain::Update( double const Deltatime ) } } - if (mvControlled->SlippingWheels) - { // Ra 2014-12: lokomotywy 181/182 - // dostają SlippingWheels po zahamowaniu - // powyżej 2.85 bara i buczały + if (mvControlled->SlippingWheels) { + // Ra 2014-12: lokomotywy 181/182 dostają SlippingWheels po zahamowaniu powyżej 2.85 bara i buczały double veldiff = (DynamicObject->GetVelocity() - fTachoVelocity) / mvControlled->Vmax; - if (veldiff < -0.01) // 1% Vmax rezerwy, żeby 181/182 nie buczały po - // zahamowaniu, ale to proteza - { - if (fabs(mvControlled->Im) > 10.0) - btLampkaPoslizg.TurnOn(); - rsSlippery.Play(-rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - if (mvControlled->TrainType == dt_181) // alarm przy poslizgu dla 181/182 - BOMBARDIER - if (dsbSlipAlarm) - play_sound( dsbSlipAlarm, DSBPLAY_LOOPING ); - } - else - { - if ((mvOccupied->UnitBrakeForce > 100.0) && (DynamicObject->GetVelocity() > 1.0)) - { - rsSlippery.Play(rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, DynamicObject->GetPosition()); - if (mvControlled->TrainType == dt_181) - if (dsbSlipAlarm) - dsbSlipAlarm->Stop(); + if( veldiff < -0.01 ) { + // 1% Vmax rezerwy, żeby 181/182 nie buczały po zahamowaniu, ale to proteza + if( std::abs( mvControlled->Im ) > 10.0 ) { + btLampkaPoslizg.Turn( true ); } } } - else - { - btLampkaPoslizg.TurnOff(); - rsSlippery.Stop(); - if (mvControlled->TrainType == dt_181) - if (dsbSlipAlarm) - dsbSlipAlarm->Stop(); + else { + btLampkaPoslizg.Turn( false ); } if ((mvControlled->Mains) || (mvControlled->TrainType == dt_EZT)) @@ -4367,7 +3919,7 @@ bool TTrain::Update( double const Deltatime ) } else { - btLampkaNadmSil.TurnOff(); + btLampkaNadmSil.Turn( false ); } if (mvControlled->Battery || mvControlled->ConverterFlag) @@ -4386,23 +3938,20 @@ bool TTrain::Update( double const Deltatime ) mvControlled->ResistorsFlagCheck() : false ); - btLampkaBezoporowa.Turn(mvControlled->ResistorsFlagCheck() || - (mvControlled->MainCtrlActualPos == 0)); // do EU04 + btLampkaBezoporowa.Turn( mvControlled->ResistorsFlagCheck() || ( mvControlled->MainCtrlActualPos == 0 ) ); // do EU04 if( ( mvControlled->Itot != 0 ) || ( mvOccupied->BrakePress > 2 ) || ( mvOccupied->PipePress < 3.6 ) ) { // Ra: czy to jest udawanie działania styczników liniowych? - btLampkaStyczn.TurnOff(); + btLampkaStyczn.Turn( false ); } - else if (mvOccupied->BrakePress < 1) - btLampkaStyczn.TurnOn(); // mozna prowadzic rozruch - if (((TestFlag(mvControlled->Couplers[1].CouplingFlag, ctrain_controll)) && - (mvControlled->CabNo == 1)) || - ((TestFlag(mvControlled->Couplers[0].CouplingFlag, ctrain_controll)) && - (mvControlled->CabNo == -1))) - btLampkaUkrotnienie.TurnOn(); + else if( mvOccupied->BrakePress < 1 ) + btLampkaStyczn.Turn( true ); // mozna prowadzic rozruch + if( ( ( TestFlag( mvControlled->Couplers[ 1 ].CouplingFlag, ctrain_controll ) ) && ( mvControlled->CabNo == 1 ) ) || + ( ( TestFlag( mvControlled->Couplers[ 0 ].CouplingFlag, ctrain_controll ) ) && ( mvControlled->CabNo == -1 ) ) ) + btLampkaUkrotnienie.Turn( true ); else - btLampkaUkrotnienie.TurnOff(); + btLampkaUkrotnienie.Turn( false ); // if // ((TestFlag(mvControlled->BrakeStatus,+b_Rused+b_Ractive)))//Lampka drugiego stopnia hamowania @@ -4415,13 +3964,15 @@ bool TTrain::Update( double const Deltatime ) btLampkaWysRozr.Turn(!(mvControlled->Imax < mvControlled->ImaxHi)); - if (((mvControlled->ScndCtrlActualPos > 0) || - ((mvControlled->RList[mvControlled->MainCtrlActualPos].ScndAct != 0) && - (mvControlled->RList[mvControlled->MainCtrlActualPos].ScndAct != 255))) && - (!mvControlled->DelayCtrlFlag)) - btLampkaBoczniki.TurnOn(); - else - btLampkaBoczniki.TurnOff(); + if( ( false == mvControlled->DelayCtrlFlag ) + && ( ( mvControlled->ScndCtrlActualPos > 0 ) + || ( ( mvControlled->RList[ mvControlled->MainCtrlActualPos ].ScndAct != 0 ) + && ( mvControlled->RList[ mvControlled->MainCtrlActualPos ].ScndAct != 255 ) ) ) ) { + btLampkaBoczniki.Turn( true ); + } + else { + btLampkaBoczniki.Turn( false ); + } btLampkaNapNastHam.Turn(mvControlled->ActiveDir != 0); // napiecie na nastawniku hamulcowym btLampkaSprezarka.Turn(mvControlled->CompressorFlag); // mutopsitka dziala @@ -4433,17 +3984,17 @@ bool TTrain::Update( double const Deltatime ) scp = (scp == 255 ? 0 : scp); // Ra: whatta hella is this? if ((mvControlled->ScndCtrlPos > 0) || (mvControlled->ScndInMain != 0) && (scp > 0)) { // boczniki pojedynczo - btLampkaBocznik1.TurnOn(); + btLampkaBocznik1.Turn( true ); btLampkaBocznik2.Turn(mvControlled->ScndCtrlPos > 1); btLampkaBocznik3.Turn(mvControlled->ScndCtrlPos > 2); btLampkaBocznik4.Turn(mvControlled->ScndCtrlPos > 3); } else { // wyłączone wszystkie cztery - btLampkaBocznik1.TurnOff(); - btLampkaBocznik2.TurnOff(); - btLampkaBocznik3.TurnOff(); - btLampkaBocznik4.TurnOff(); + btLampkaBocznik1.Turn( false ); + btLampkaBocznik2.Turn( false ); + btLampkaBocznik3.Turn( false ); + btLampkaBocznik4.Turn( false ); } /* { //sprezarka w drugim wozie @@ -4459,36 +4010,37 @@ bool TTrain::Update( double const Deltatime ) btLampkaSprezarkaB.Turn(comptemp); */ } - else // wylaczone - { - btLampkaWylSzybki.TurnOff(); - btLampkaWysRozr.TurnOff(); - btLampkaOpory.TurnOff(); - btLampkaStyczn.TurnOff(); - btLampkaUkrotnienie.TurnOff(); - btLampkaHamPosp.TurnOff(); - btLampkaBoczniki.TurnOff(); - btLampkaNapNastHam.TurnOff(); - btLampkaPrzetw.TurnOff(); - btLampkaSprezarka.TurnOff(); - btLampkaBezoporowa.TurnOff(); + else { + // wylaczone + btLampkaWylSzybki.Turn( false ); + btLampkaWysRozr.Turn( false ); + btLampkaOpory.Turn( false ); + btLampkaStyczn.Turn( false ); + btLampkaUkrotnienie.Turn( false ); + btLampkaHamPosp.Turn( false ); + btLampkaBoczniki.Turn( false ); + btLampkaNapNastHam.Turn( false ); + btLampkaPrzetw.Turn( false ); + btLampkaNadmPrzetw.Turn( false ); + btLampkaSprezarka.Turn( false ); + btLampkaBezoporowa.Turn( false ); } - if (mvControlled->Signalling == true) - { + if (mvControlled->Signalling == true) { - if ((mvOccupied->BrakePress >= 0.145f) && (mvControlled->Battery == true) && - (mvControlled->Signalling == true)) - { - btLampkaHamowanie1zes.TurnOn(); + if( ( mvOccupied->BrakePress >= 0.145f ) + && ( mvControlled->Battery == true ) + && ( mvControlled->Signalling == true ) ) { + + btLampkaHamowanie1zes.Turn( true ); } - if (mvControlled->BrakePress < 0.075f) - { - btLampkaHamowanie1zes.TurnOff(); + if (mvControlled->BrakePress < 0.075f) { + + btLampkaHamowanie1zes.Turn( false ); } } - else - { - btLampkaHamowanie1zes.TurnOff(); + else { + + btLampkaHamowanie1zes.Turn( false ); } btLampkaBlokadaDrzwi.Turn(mvControlled->DoorSignalling ? mvOccupied->DoorBlockedFlag() && mvControlled->Battery : @@ -4507,20 +4059,23 @@ bool TTrain::Update( double const Deltatime ) tmp = DynamicObject->PrevConnected; if (tmp) - if ( mvControlled->Battery || mvControlled->ConverterFlag ) - { + if ( mvControlled->Battery || mvControlled->ConverterFlag ) { + btLampkaWylSzybkiB.Turn( tmp->MoverParameters->Mains ); btLampkaOporyB.Turn(tmp->MoverParameters->ResistorsFlagCheck()); btLampkaBezoporowaB.Turn( - tmp->MoverParameters->ResistorsFlagCheck() || - (tmp->MoverParameters->MainCtrlActualPos == 0)); // do EU04 - if ((tmp->MoverParameters->Itot != 0) || - (tmp->MoverParameters->BrakePress > 0.2) || - (tmp->MoverParameters->PipePress < 0.36)) - btLampkaStycznB.TurnOff(); // - else if (tmp->MoverParameters->BrakePress < 0.1) - btLampkaStycznB.TurnOn(); // mozna prowadzic rozruch + ( true == tmp->MoverParameters->ResistorsFlagCheck() ) + || ( tmp->MoverParameters->MainCtrlActualPos == 0 ) ); // do EU04 + + if( ( tmp->MoverParameters->Itot != 0 ) + || ( tmp->MoverParameters->BrakePress > 0.2 ) + || ( tmp->MoverParameters->PipePress < 0.36 ) ) { + btLampkaStycznB.Turn( false ); + } + else if( tmp->MoverParameters->BrakePress < 0.1 ) { + btLampkaStycznB.Turn( true ); // mozna prowadzic rozruch + } //----------------- // //hunter-271211: brak jazdy w drugim czlonie, gdy w @@ -4550,12 +4105,12 @@ bool TTrain::Update( double const Deltatime ) if ((tmp->MoverParameters->BrakePress >= 0.145f * 10) && (mvControlled->Battery == true) && (mvControlled->Signalling == true)) { - btLampkaHamowanie2zes.TurnOn(); + btLampkaHamowanie2zes.Turn( true ); } if ((tmp->MoverParameters->BrakePress < 0.075f * 10) || (mvControlled->Battery == false) || (mvControlled->Signalling == false)) { - btLampkaHamowanie2zes.TurnOff(); + btLampkaHamowanie2zes.Turn( false ); } btLampkaNadmPrzetwB.Turn( tmp->MoverParameters->ConvOvldFlag); // nadmiarowy przetwornicy? @@ -4564,14 +4119,14 @@ bool TTrain::Update( double const Deltatime ) } else // wylaczone { - btLampkaWylSzybkiB.TurnOff(); - btLampkaOporyB.TurnOff(); - btLampkaStycznB.TurnOff(); - btLampkaSprezarkaB.TurnOff(); - btLampkaBezoporowaB.TurnOff(); - btLampkaHamowanie2zes.TurnOff(); - btLampkaNadmPrzetwB.TurnOn(); - btLampkaPrzetwB.TurnOff(); + btLampkaWylSzybkiB.Turn( false ); + btLampkaOporyB.Turn( false ); + btLampkaStycznB.Turn( false ); + btLampkaSprezarkaB.Turn( false ); + btLampkaBezoporowaB.Turn( false ); + btLampkaHamowanie2zes.Turn( false ); + btLampkaNadmPrzetwB.Turn( false ); + btLampkaPrzetwB.Turn( false ); } } @@ -4619,29 +4174,29 @@ bool TTrain::Update( double const Deltatime ) } else { // gdy bateria wyłączona - btLampkaHamienie.TurnOff(); - btLampkaMaxSila.TurnOff(); - btLampkaPrzekrMaxSila.TurnOff(); - btLampkaRadio.TurnOff(); - btLampkaHamulecReczny.TurnOff(); - btLampkaDoorLeft.TurnOff(); - btLampkaDoorRight.TurnOff(); - btLampkaDepartureSignal.TurnOff(); - btLampkaNapNastHam.TurnOff(); - btLampkaForward.TurnOff(); - btLampkaBackward.TurnOff(); - btLampkaED.TurnOff(); + btLampkaHamienie.Turn( false ); + btLampkaMaxSila.Turn( false ); + btLampkaPrzekrMaxSila.Turn( false ); + btLampkaRadio.Turn( false ); + btLampkaHamulecReczny.Turn( false ); + btLampkaDoorLeft.Turn( false ); + btLampkaDoorRight.Turn( false ); + btLampkaDepartureSignal.Turn( false ); + btLampkaNapNastHam.Turn( false ); + btLampkaForward.Turn( false ); + btLampkaBackward.Turn( false ); + btLampkaED.Turn( false ); // light indicators - btLampkaUpperLight.TurnOff(); - btLampkaLeftLight.TurnOff(); - btLampkaRightLight.TurnOff(); - btLampkaLeftEndLight.TurnOff(); - btLampkaRightEndLight.TurnOff(); - btLampkaRearUpperLight.TurnOff(); - btLampkaRearLeftLight.TurnOff(); - btLampkaRearRightLight.TurnOff(); - btLampkaRearLeftEndLight.TurnOff(); - btLampkaRearRightEndLight.TurnOff(); + btLampkaUpperLight.Turn( false ); + btLampkaLeftLight.Turn( false ); + btLampkaRightLight.Turn( false ); + btLampkaLeftEndLight.Turn( false ); + btLampkaRightEndLight.Turn( false ); + btLampkaRearUpperLight.Turn( false ); + btLampkaRearLeftLight.Turn( false ); + btLampkaRearRightLight.Turn( false ); + btLampkaRearLeftEndLight.Turn( false ); + btLampkaRearRightEndLight.Turn( false ); } // McZapkie-080602: obroty (albo translacje) regulatorow @@ -4909,75 +4464,38 @@ bool TTrain::Update( double const Deltatime ) #endif //--------- // hunter-080812: poprawka na ogrzewanie w elektrykach - usuniete uzaleznienie od przetwornicy - if ((((mvControlled->EngineType == ElectricSeriesMotor) && (mvControlled->Mains == true) && - (mvControlled->ConvOvldFlag == false)) || - (mvControlled->ConverterFlag)) && - (mvControlled->Heating == true)) - btLampkaOgrzewanieSkladu.TurnOn(); + if( ( mvControlled->Heating == true ) + && ( ( mvControlled->ConverterFlag ) + || ( ( mvControlled->EngineType == ElectricSeriesMotor ) + && ( mvControlled->Mains == true ) + && ( mvControlled->ConvOvldFlag == false ) ) ) ) + btLampkaOgrzewanieSkladu.Turn( true ); else - btLampkaOgrzewanieSkladu.TurnOff(); + btLampkaOgrzewanieSkladu.Turn( false ); //---------- // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa if (mvOccupied->SecuritySystem.Status > 0) { - if (fBlinkTimer > fCzuwakBlink) + if (fBlinkTimer > fCzuwakBlink) fBlinkTimer = -fCzuwakBlink; else fBlinkTimer += dt; // hunter-091012: dodanie testu czuwaka - if ((TestFlag(mvOccupied->SecuritySystem.Status, s_aware)) || - (TestFlag(mvOccupied->SecuritySystem.Status, s_CAtest))) - { - btLampkaCzuwaka.Turn(fBlinkTimer > 0); + if( ( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) + || ( TestFlag( mvOccupied->SecuritySystem.Status, s_CAtest ) ) ) { + btLampkaCzuwaka.Turn( fBlinkTimer > 0 ); } else - btLampkaCzuwaka.TurnOff(); + btLampkaCzuwaka.Turn( false ); btLampkaSHP.Turn(TestFlag(mvOccupied->SecuritySystem.Status, s_active)); - - // hunter-091012: rozdzielenie alarmow - // if (TestFlag(mvOccupied->SecuritySystem.Status,s_alarm)) - if (TestFlag(mvOccupied->SecuritySystem.Status, s_CAalarm) || - TestFlag(mvOccupied->SecuritySystem.Status, s_SHPalarm)) - { - if (dsbBuzzer) - { - dsbBuzzer->GetStatus(&stat); - if (!(stat & DSBSTATUS_PLAYING)) - { - play_sound( dsbBuzzer, DSBVOLUME_MAX, DSBPLAY_LOOPING ); - Console::BitsSet(1 << 14); // ustawienie bitu 16 na PoKeys - } - } - } - else - { - if (dsbBuzzer) - { - dsbBuzzer->GetStatus(&stat); - if (stat & DSBSTATUS_PLAYING) - { - dsbBuzzer->Stop(); - Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys - } - } - } } else // wylaczone { - btLampkaCzuwaka.TurnOff(); - btLampkaSHP.TurnOff(); - if (dsbBuzzer) - { - dsbBuzzer->GetStatus(&stat); - if (stat & DSBSTATUS_PLAYING) - { - dsbBuzzer->Stop(); - Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys - } - } + btLampkaCzuwaka.Turn( false ); + btLampkaSHP.Turn( true ); } // przelaczniki @@ -5371,24 +4889,23 @@ bool TTrain::Update( double const Deltatime ) } #endif // ABu030405 obsluga lampki uniwersalnej: - if (btInstrumentLight.Active()) // w ogóle jest - if (InstrumentLightActive) // załączona - switch (InstrumentLightType) - { - case 0: - btInstrumentLight.Turn( mvControlled->Battery || mvControlled->ConverterFlag ); - break; - case 1: - btInstrumentLight.Turn(mvControlled->Mains); - break; - case 2: - btInstrumentLight.Turn(mvControlled->ConverterFlag); - break; - default: - btInstrumentLight.TurnOff(); + if( btInstrumentLight.Active() ) // w ogóle jest + if( InstrumentLightActive ) // załączona + switch( InstrumentLightType ) { + case 0: + btInstrumentLight.Turn( mvControlled->Battery || mvControlled->ConverterFlag ); + break; + case 1: + btInstrumentLight.Turn( mvControlled->Mains ); + break; + case 2: + btInstrumentLight.Turn( mvControlled->ConverterFlag ); + break; + default: + btInstrumentLight.Turn( false ); } else - btInstrumentLight.TurnOff(); + btInstrumentLight.Turn( false ); #ifdef EU07_USE_OLD_COMMAND_SYSTEM // hunter-091012: przepisanie univ4 i zrobione z uwzglednieniem przelacznika @@ -5447,43 +4964,6 @@ bool TTrain::Update( double const Deltatime ) } } #endif -/* - // NOTE: disabled, as it doesn't seem to be used. - // TODO: get rid of it altogether when we're cleaninng - // Ra: przeklejka z SPKS - płynne poruszanie hamulcem - // if - // ((mvOccupied->BrakeHandle==FV4a)&&(Console::Pressed(Global::Keys[k_IncBrakeLevel]))) - if ((Console::Pressed(Global::Keys[k_IncBrakeLevel]))) - { - if (Global::ctrlState) - { - // mvOccupied->BrakeCtrlPos2-=dt/20.0; - // if (mvOccupied->BrakeCtrlPos2<-1.5) mvOccupied->BrakeCtrlPos2=-1.5; - } - else - { - // mvOccupied->BrakeCtrlPosR+=(mvOccupied->BrakeCtrlPosR>mvOccupied->BrakeCtrlPosNo?0:dt*2); - // mvOccupied->BrakeCtrlPos= floor(mvOccupied->BrakeCtrlPosR+0.499); - } - } - // if - // ((mvOccupied->BrakeHandle==FV4a)&&(Console::Pressed(Global::Keys[k_DecBrakeLevel]))) - if ((Console::Pressed(Global::Keys[k_DecBrakeLevel]))) - { - if (Global::ctrlState) - { - // mvOccupied->BrakeCtrlPos2+=(mvOccupied->BrakeCtrlPos2>2?0:dt/20.0); - // if (mvOccupied->BrakeCtrlPos2<-3) mvOccupied->BrakeCtrlPos2=-3; - // mvOccupied->BrakeLevelAdd(mvOccupied->fBrakeCtrlPos<-1?0:dt*2); - } - else - { - // mvOccupied->BrakeCtrlPosR-=(mvOccupied->BrakeCtrlPosR<-1?0:dt*2); - // mvOccupied->BrakeCtrlPos= floor(mvOccupied->BrakeCtrlPosR+0.499); - // mvOccupied->BrakeLevelAdd(mvOccupied->fBrakeCtrlPos<-1?0:-dt*2); - } - } -*/ if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_IncBrakeLevel]))) { if (Global::ctrlState) @@ -5522,23 +5002,22 @@ bool TTrain::Update( double const Deltatime ) #endif } - // bool kEP; - // kEP=(mvOccupied->BrakeSubsystem==Knorr)||(mvOccupied->BrakeSubsystem==Hik)||(mvOccupied->BrakeSubsystem==Kk); - if ((mvOccupied->BrakeSystem == ElectroPneumatic) && ((mvOccupied->BrakeHandle == St113)) && - (mvControlled->EpFuse == true)) + if( ( mvOccupied->BrakeSystem == ElectroPneumatic ) + && ( mvOccupied->BrakeHandle == St113 ) + && ( mvControlled->EpFuse == true ) ) if (Console::Pressed(Global::Keys[k_AntiSlipping])) // kEP { ggAntiSlipButton.UpdateValue(1); if (mvOccupied->SwitchEPBrake(1)) { - play_sound( dsbPneumaticSwitch ); + dsbPneumaticSwitch.play(); } } else { if (mvOccupied->SwitchEPBrake(0)) { - play_sound( dsbPneumaticSwitch ); + dsbPneumaticSwitch.play(); } } @@ -5644,59 +5123,6 @@ bool TTrain::Update( double const Deltatime ) ggPantFrontButtonOff.PutValue(0); } #endif - /* if ((mvControlled->Mains) && - (mvControlled->EngineType==ElectricSeriesMotor)) - { - //tu dac w przyszlosci zaleznosc od wlaczenia przetwornicy - if (mvControlled->ConverterFlag) //NBMX -obsluga przetwornicy - { - //glosnosc zalezna od nap. sieci - //-2000 do 0 - long tmpVol; - int trackVol; - trackVol=3550-2000; - if (mvControlled->RunningTraction.TractionVoltage<2000) - { - tmpVol=0; - } - else - { - tmpVol=mvControlled->RunningTraction.TractionVoltage-2000; - } - sConverter.Volume(-2000*(trackVol-tmpVol)/trackVol); - - if (!sConverter.Playing()) - sConverter.TurnOn(); - } - else //wyl przetwornicy - sConverter.TurnOff(); - } - else - { - if (sConverter.Playing()) - sConverter.TurnOff(); - } - sConverter.Update(); - */ - - // if (fabs(DynamicObject->GetVelocity())>0.5) - if( dsbHasler != nullptr ) { - if( ( false == FreeFlyModeFlag ) && ( fTachoCount > maxtacho ) ) { - dsbHasler->GetStatus( &stat ); - if( !( stat & DSBSTATUS_PLAYING ) ) - play_sound( dsbHasler, DSBVOLUME_MAX, DSBPLAY_LOOPING ); - } - else { - if( ( true == FreeFlyModeFlag ) || ( fTachoCount < 1 ) ) { - dsbHasler->GetStatus( &stat ); - if( stat & DSBSTATUS_PLAYING ) - dsbHasler->Stop(); - } - } - } - - // koniec mieszania z dzwiekami - // guziki: ggMainOffButton.Update(); ggMainOnButton.Update(); @@ -5854,10 +5280,427 @@ bool TTrain::Update( double const Deltatime ) } */ + // sounds + update_sounds( Deltatime ); + m_updated = true; return true; //(DynamicObject->Update(dt)); } // koniec update +void +TTrain::update_sounds( double const Deltatime ) { +#ifdef EU07_USE_OLD_SOUNDCODE + double vol = 0; + // int freq=1; + double dfreq; + + // McZapkie-280302 - syczenie + if( ( mvOccupied->BrakeHandle == FV4a ) || ( mvOccupied->BrakeHandle == FVel6 ) ) { + if( rsHiss.AM != 0 ) // upuszczanie z PG + { + fPPress = ( 1 * fPPress + mvOccupied->Handle->GetSound( s_fv4a_b ) ) / ( 2 ); + if( fPPress > 0 ) { + vol = 2.0 * rsHiss.AM * fPPress; + } + if( vol > 0.001 ) { + rsHiss.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else { + rsHiss.Stop(); + } + } + if( rsHissU.AM != 0 ) // upuszczanie z PG + { + fNPress = ( 1 * fNPress + mvOccupied->Handle->GetSound( s_fv4a_u ) ) / ( 2 ); + if( fNPress > 0 ) { + vol = rsHissU.AM * fNPress; + } + if( vol > 0.001 ) { + rsHissU.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else { + rsHissU.Stop(); + } + } + if( rsHissE.AM != 0 ) // upuszczanie przy naglym + { + vol = mvOccupied->Handle->GetSound( s_fv4a_e ) * rsHissE.AM; + if( vol > 0.001 ) { + rsHissE.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else { + rsHissE.Stop(); + } + } + if( rsHissX.AM != 0 ) // upuszczanie sterujacego fala + { + vol = mvOccupied->Handle->GetSound( s_fv4a_x ) * rsHissX.AM; + if( vol > 0.001 ) { + rsHissX.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else { + rsHissX.Stop(); + } + } + if( rsHissT.AM != 0 ) // upuszczanie z czasowego + { + vol = mvOccupied->Handle->GetSound( s_fv4a_t ) * rsHissT.AM; + if( vol > 0.001 ) { + rsHissT.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else { + rsHissT.Stop(); + } + } + + } // koniec FV4a + else // jesli nie FV4a + { + if( rsHiss.AM != 0.0 ) // upuszczanie z PG + { + fPPress = ( 4.0f * fPPress + std::max( mvOccupied->dpLocalValve, mvOccupied->dpMainValve ) ) / ( 4.0f + 1.0f ); + if( fPPress > 0.0f ) { + vol = 2.0 * rsHiss.AM * fPPress; + } + if( vol > 0.01 ) { + rsHiss.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else { + rsHiss.Stop(); + } + } + if( rsHissU.AM != 0.0 ) // napelnianie PG + { + fNPress = ( 4.0f * fNPress + Min0R( mvOccupied->dpLocalValve, mvOccupied->dpMainValve ) ) / ( 4.0f + 1.0f ); + if( fNPress < 0.0f ) { + vol = -1.0 * rsHissU.AM * fNPress; + } + if( vol > 0.01 ) { + rsHissU.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else { + rsHissU.Stop(); + } + } + } // koniec nie FV4a + + // Winger-160404 - syczenie pomocniczego (luzowanie) + /* if (rsSBHiss.AM!=0) + { + fSPPress=(mvOccupied->LocalBrakeRatio())-(mvOccupied->LocalBrakePos); + if (fSPPress>0) + { + vol=2*rsSBHiss.AM*fSPPress; + } + if (vol>0.1) + { + rsSBHiss.Play(vol,DSBPLAY_LOOPING,true,DynamicObject->GetPosition()); + } + else + { + rsSBHiss.Stop(); + } + } + */ + // szum w czasie jazdy + vol = 0.0; + dfreq = 1.0; + if( rsRunningNoise.AM != 0 ) { + if( DynamicObject->GetVelocity() != 0 ) { + if( !TestFlag( mvOccupied->DamageFlag, + dtrain_wheelwear ) ) // McZpakie-221103: halas zalezny od kola + { + dfreq = rsRunningNoise.FM * mvOccupied->Vel + rsRunningNoise.FA; + vol = rsRunningNoise.AM * mvOccupied->Vel + rsRunningNoise.AA; + switch( tor->eEnvironment ) { + case e_tunnel: + { + vol *= 3; + dfreq *= 0.95; + } + break; + case e_canyon: + { + vol *= 1.1; + } + break; + case e_bridge: + { + vol *= 2; + dfreq *= 0.98; + } + break; + } + } + else // uszkodzone kolo (podkucie) + if( fabs( mvOccupied->nrot ) > 0.01 ) { + dfreq = rsRunningNoise.FM * mvOccupied->Vel + rsRunningNoise.FA; + vol = rsRunningNoise.AM * mvOccupied->Vel + rsRunningNoise.AA; + switch( tor->eEnvironment ) { + case e_tunnel: + { + vol *= 2; + } + break; + case e_canyon: + { + vol *= 1.1; + } + break; + case e_bridge: + { + vol *= 1.5; + } + break; + } + } + if( fabs( mvOccupied->nrot ) > 0.01 ) + vol *= 1 + + mvOccupied->UnitBrakeForce / + ( 1 + mvOccupied->MaxBrakeForce ); // hamulce wzmagaja halas + vol = vol * ( 20.0 + tor->iDamageFlag ) / 21; + rsRunningNoise.AdjFreq( dfreq, 0 ); + rsRunningNoise.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else + rsRunningNoise.Stop(); + } + + if( rsBrake.AM != 0 ) { + if( ( !mvOccupied->SlippingWheels ) && ( mvOccupied->UnitBrakeForce > 10.0 ) && + ( DynamicObject->GetVelocity() > 0.01 ) ) { + // vol=rsBrake.AA+rsBrake.AM*(DynamicObject->GetVelocity()*100+mvOccupied->UnitBrakeForce); + vol = + rsBrake.AM * sqrt( ( DynamicObject->GetVelocity() * mvOccupied->UnitBrakeForce ) ); + dfreq = rsBrake.FA + rsBrake.FM * DynamicObject->GetVelocity(); + rsBrake.AdjFreq( dfreq, 0 ); + rsBrake.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else { + rsBrake.Stop(); + } + } + + if( rsEngageSlippery.AM != 0 ) { + if /*((fabs(mvControlled->dizel_engagedeltaomega)>0.2) && */( + mvControlled->dizel_engage > 0.1 ) { + if( fabs( mvControlled->dizel_engagedeltaomega ) > 0.2 ) { + dfreq = rsEngageSlippery.FA + + rsEngageSlippery.FM * fabs( mvControlled->dizel_engagedeltaomega ); + vol = rsEngageSlippery.AA + rsEngageSlippery.AM * ( mvControlled->dizel_engage ); + } + else { + dfreq = + 1; // rsEngageSlippery.FA+0.7*rsEngageSlippery.FM*(fabs(mvControlled->enrot)+mvControlled->nmax); + if( mvControlled->dizel_engage > 0.2 ) + vol = + rsEngageSlippery.AA + + 0.2 * rsEngageSlippery.AM * ( mvControlled->enrot / mvControlled->nmax ); + else + vol = 0; + } + rsEngageSlippery.AdjFreq( dfreq, 0 ); + rsEngageSlippery.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + } + else { + rsEngageSlippery.Stop(); + } + } + + if( FreeFlyModeFlag ) + rsFadeSound.Stop(); // wyłącz to cholerne cykanie! + else + rsFadeSound.Play( 1, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + + // McZapkie! - to wazne - SoundFlag wystawiane jest przez moje moduly + // gdy zachodza pewne wydarzenia komentowane dzwiekiem. + // Mysle ze wystarczy sprawdzac a potem zerowac SoundFlag tutaj + // a nie w DynObject - gdyby cos poszlo zle to po co szarpac dzwiekiem co + // 10ms. + + if( TestFlag( mvOccupied->SoundFlag, sound_relay ) ) { + // przekaznik - gdy bezpiecznik, automatyczny rozruch itp + if( mvOccupied->EventFlag || TestFlag( mvOccupied->SoundFlag, sound_loud ) ) { + mvOccupied->EventFlag = false; // Ra: w kabinie? + if( dsbRelay != nullptr ) { dsbRelay->SetVolume( DSBVOLUME_MAX ); } + } + else { + if( dsbRelay != nullptr ) { dsbRelay->SetVolume( -40 ); } + } + if( !TestFlag( mvOccupied->SoundFlag, sound_manyrelay ) ) + dsbRelay.play(); + else { + if( TestFlag( mvOccupied->SoundFlag, sound_loud ) ) + dsbWejscie_na_bezoporow.play(); + else + dsbWejscie_na_drugi_uklad.play(); + } + } + + if( dsbBufferClamp != nullptr ) { + if( TestFlag( mvOccupied->SoundFlag, sound_bufferclamp ) ) // zderzaki uderzaja o siebie + { + if( TestFlag( mvOccupied->SoundFlag, sound_loud ) ) + dsbBufferClamp->SetVolume( DSBVOLUME_MAX ); + else + dsbBufferClamp->SetVolume( -20 ); + dsbBufferClamp.play(); + } + } + if( dsbCouplerStretch ) + if( TestFlag( mvOccupied->SoundFlag, sound_couplerstretch ) ) // sprzegi sie rozciagaja + { + if( TestFlag( mvOccupied->SoundFlag, sound_loud ) ) + dsbCouplerStretch->SetVolume( DSBVOLUME_MAX ); + else + dsbCouplerStretch->SetVolume( -20 ); + dsbCouplerStretch.play(); + } + + if( mvOccupied->SoundFlag == 0 ) + if( mvOccupied->EventFlag ) + if( TestFlag( mvOccupied->DamageFlag, dtrain_wheelwear ) ) { // Ra: przenieść do DynObj! + if( rsRunningNoise.AM != 0 ) { + rsRunningNoise.Stop(); + float am = rsRunningNoise.AM; + float fa = rsRunningNoise.FA; + float fm = rsRunningNoise.FM; + rsRunningNoise.Init( "lomotpodkucia.wav", -1, 0, 0, 0, true ); // MC: zmiana szumu na lomot + if( rsRunningNoise.AM == 1 ) + rsRunningNoise.AM = am; + rsRunningNoise.AA = 0.7; + rsRunningNoise.FA = fa; + rsRunningNoise.FM = fm; + } + mvOccupied->EventFlag = false; + } + + mvOccupied->SoundFlag = 0; + // McZapkie! - koniec obslugi dzwiekow z mover.pas + + + if( mvControlled->SlippingWheels ) { + // Ra 2014-12: lokomotywy 181/182 dostają SlippingWheels po zahamowaniu powyżej 2.85 bara i buczały + double veldiff = ( DynamicObject->GetVelocity() - fTachoVelocity ) / mvControlled->Vmax; + if( veldiff < -0.01 ) { + // 1% Vmax rezerwy, żeby 181/182 nie buczały po zahamowaniu, ale to proteza + rsSlippery.Play( -rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + if( mvControlled->TrainType == dt_181 ) // alarm przy poslizgu dla 181/182 - BOMBARDIER + if( dsbSlipAlarm ) + play_sound( dsbSlipAlarm, DSBPLAY_LOOPING ); + } + else { + if( ( mvOccupied->UnitBrakeForce > 100.0 ) && ( DynamicObject->GetVelocity() > 1.0 ) ) { + rsSlippery.Play( rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); + if( mvControlled->TrainType == dt_181 ) + if( dsbSlipAlarm ) + dsbSlipAlarm->Stop(); + } + } + } + else { + rsSlippery.Stop(); + if( mvControlled->TrainType == dt_181 ) + if( dsbSlipAlarm ) + dsbSlipAlarm->Stop(); + } + + // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa + if (mvOccupied->SecuritySystem.Status > 0) + { + // hunter-091012: rozdzielenie alarmow + if (TestFlag(mvOccupied->SecuritySystem.Status, s_CAalarm) || + TestFlag(mvOccupied->SecuritySystem.Status, s_SHPalarm)) + { + if (dsbBuzzer) + { + dsbBuzzer->GetStatus(&stat); + if (!(stat & DSBSTATUS_PLAYING)) + { + play_sound( dsbBuzzer, DSBVOLUME_MAX, DSBPLAY_LOOPING ); + Console::BitsSet(1 << 14); // ustawienie bitu 16 na PoKeys + } + } + } + else + { + if (dsbBuzzer) + { + dsbBuzzer->GetStatus(&stat); + if (stat & DSBSTATUS_PLAYING) + { + dsbBuzzer->Stop(); + Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys + } + } + } + } + else // wylaczone + { + if (dsbBuzzer) + { + dsbBuzzer->GetStatus(&stat); + if (stat & DSBSTATUS_PLAYING) + { + dsbBuzzer->Stop(); + Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys + } + } + } + + /* if ((mvControlled->Mains) && + (mvControlled->EngineType==ElectricSeriesMotor)) + { + //tu dac w przyszlosci zaleznosc od wlaczenia przetwornicy + if (mvControlled->ConverterFlag) //NBMX -obsluga przetwornicy + { + //glosnosc zalezna od nap. sieci + //-2000 do 0 + long tmpVol; + int trackVol; + trackVol=3550-2000; + if (mvControlled->RunningTraction.TractionVoltage<2000) + { + tmpVol=0; + } + else + { + tmpVol=mvControlled->RunningTraction.TractionVoltage-2000; + } + sConverter.Volume(-2000*(trackVol-tmpVol)/trackVol); + + if (!sConverter.Playing()) + sConverter.TurnOn(); + } + else //wyl przetwornicy + sConverter.TurnOff(); + } + else + { + if (sConverter.Playing()) + sConverter.TurnOff(); + } + sConverter.Update(); + */ + + // if (fabs(DynamicObject->GetVelocity())>0.5) + if( dsbHasler != nullptr ) { + if( ( false == FreeFlyModeFlag ) && ( fTachoCount > maxtacho ) ) { + dsbHasler->GetStatus( &stat ); + if( !( stat & DSBSTATUS_PLAYING ) ) + play_sound( dsbHasler, DSBVOLUME_MAX, DSBPLAY_LOOPING ); + } + else { + if( ( true == FreeFlyModeFlag ) || ( fTachoCount < 1 ) ) { + dsbHasler->GetStatus( &stat ); + if( stat & DSBSTATUS_PLAYING ) + dsbHasler->Stop(); + } + } + } +#endif +} + bool TTrain::CabChange(int iDirection) { // McZapkie-090902: zmiana kabiny 1->0->2 i z powrotem if (DynamicObject->Mechanik ? DynamicObject->Mechanik->AIControllFlag : @@ -5896,11 +5739,11 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) //Wartości domyślne by nie wysypywało przy wybrakowanych mmd @240816 Stele // NOTE: should be no longer needed as safety checks were added, // but leaving the defaults for the sake of incomplete mmd files - dsbPneumaticSwitch = TSoundsManager::GetFromName("silence1.wav", true); - dsbBufferClamp = TSoundsManager::GetFromName("en57_bufferclamp.wav", true); - dsbCouplerDetach = TSoundsManager::GetFromName("couplerdetach.wav", true); - dsbCouplerStretch = TSoundsManager::GetFromName("en57_couplerstretch.wav", true); - dsbCouplerAttach = TSoundsManager::GetFromName("couplerattach.wav", true); + dsbPneumaticSwitch.deserialize( "silence1.wav", sound_type::single ); + dsbBufferClamp.deserialize( "en57_bufferclamp.wav", sound_type::single ); + dsbCouplerDetach.deserialize( "couplerdetach.wav", sound_type::single ); + dsbCouplerStretch.deserialize( "en57_couplerstretch.wav", sound_type::single ); + dsbCouplerAttach.deserialize( "couplerattach.wav", sound_type::single ); std::string token; do @@ -5922,250 +5765,269 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) if (token == "ctrl:") { // nastawnik: - dsbNastawnikJazdy = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbNastawnikJazdy.deserialize( parser, sound_type::single ); } else if (token == "ctrlscnd:") { // hunter-081211: nastawnik bocznikowania - dsbNastawnikBocz = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbNastawnikBocz.deserialize( parser, sound_type::single ); } else if (token == "reverserkey:") { // hunter-131211: dzwiek kierunkowego - dsbReverserKey = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbReverserKey.deserialize( parser, sound_type::single ); } else if (token == "buzzer:") { // bzyczek shp: - dsbBuzzer = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbBuzzer.deserialize( parser, sound_type::single ); } else if (token == "slipalarm:") { // Bombardier 011010: alarm przy poslizgu: - dsbSlipAlarm = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbSlipAlarm.deserialize( parser, sound_type::single ); } else if (token == "tachoclock:") { // cykanie rejestratora: - dsbHasler = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbHasler.deserialize( parser, sound_type::single ); } else if (token == "switch:") { // przelaczniki: - dsbSwitch = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbSwitch.deserialize( parser, sound_type::single ); } else if (token == "pneumaticswitch:") { // stycznik EP: - dsbPneumaticSwitch = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbPneumaticSwitch.deserialize( parser, sound_type::single ); } else if (token == "wejscie_na_bezoporow:") { // hunter-111211: wydzielenie wejscia na bezoporowa i na drugi uklad do pliku - dsbWejscie_na_bezoporow = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbWejscie_na_bezoporow.deserialize( parser, sound_type::single ); } else if (token == "wejscie_na_drugi_uklad:") { - - dsbWejscie_na_drugi_uklad = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbWejscie_na_drugi_uklad.deserialize( parser, sound_type::single ); } else if (token == "relay:") { // styczniki itp: - dsbRelay = - TSoundsManager::GetFromName(parser.getToken(), true); - if (!dsbWejscie_na_bezoporow) - { // hunter-111211: domyslne, gdy brak - dsbWejscie_na_bezoporow = - TSoundsManager::GetFromName("wejscie_na_bezoporow.wav", true); + dsbRelay.deserialize( parser, sound_type::single ); + if( true == dsbWejscie_na_bezoporow.empty() ) { + // hunter-111211: domyslne, gdy brak + dsbWejscie_na_bezoporow.deserialize( "wejscie_na_bezoporow.wav", sound_type::single ); } - if (!dsbWejscie_na_drugi_uklad) - { - dsbWejscie_na_drugi_uklad = - TSoundsManager::GetFromName("wescie_na_drugi_uklad.wav", true); + if (true == dsbWejscie_na_drugi_uklad.empty()) { + dsbWejscie_na_drugi_uklad.deserialize( "wescie_na_drugi_uklad.wav", sound_type::single ); } } else if (token == "pneumaticrelay:") { // wylaczniki pneumatyczne: - dsbPneumaticRelay = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbPneumaticRelay.deserialize( parser, sound_type::single ); } else if (token == "couplerattach:") { // laczenie: - dsbCouplerAttach = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbCouplerAttach.deserialize( parser, sound_type::single ); } else if (token == "couplerstretch:") { // laczenie: - dsbCouplerStretch = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbCouplerStretch.deserialize( parser, sound_type::single ); } else if (token == "couplerdetach:") { // rozlaczanie: - dsbCouplerDetach = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbCouplerDetach.deserialize( parser, sound_type::single ); } else if (token == "bufferclamp:") { // laczenie: - dsbBufferClamp = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbBufferClamp.deserialize( parser, sound_type::single ); } else if (token == "ignition:") { // odpalanie silnika - dsbDieselIgnition = - TSoundsManager::GetFromName(parser.getToken(), true); + dsbDieselIgnition.deserialize( parser, sound_type::single ); } else if (token == "brakesound:") { // hamowanie zwykle: +/* rsBrake.Init(parser.getToken(), -1, 0, 0, 0, true, true); parser.getTokens(4, false); - parser >> rsBrake.AM >> rsBrake.AA >> rsBrake.FM >> rsBrake.FA; + parser + >> rsBrake.AM + >> rsBrake.AA + >> rsBrake.FM + >> rsBrake.FA; rsBrake.AM /= (1 + mvOccupied->MaxBrakeForce * 1000); rsBrake.FM /= (1 + mvOccupied->Vmax); +*/ + rsBrake.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); } else if (token == "slipperysound:") { // sanie: +/* rsSlippery.Init(parser.getToken(), -1, 0, 0, 0, true); parser.getTokens(2, false); - parser >> rsSlippery.AM >> rsSlippery.AA; + parser + >> rsSlippery.AM + >> rsSlippery.AA; rsSlippery.FM = 0.0; rsSlippery.FA = 1.0; rsSlippery.AM /= (1 + mvOccupied->Vmax); +*/ + rsSlippery.deserialize( parser, sound_type::single, sound_parameters::amplitude ); } else if (token == "airsound:") { // syk: +/* rsHiss.Init(parser.getToken(), -1, 0, 0, 0, true); parser.getTokens(2, false); - parser >> rsHiss.AM >> rsHiss.AA; + parser + >> rsHiss.AM + >> rsHiss.AA; rsHiss.FM = 0.0; rsHiss.FA = 1.0; +*/ + rsHiss.deserialize( parser, sound_type::single, sound_parameters::amplitude ); } else if (token == "airsound2:") { // syk: +/* rsHissU.Init(parser.getToken(), -1, 0, 0, 0, true); parser.getTokens(2, false); - parser >> rsHissU.AM >> rsHissU.AA; + parser + >> rsHissU.AM + >> rsHissU.AA; rsHissU.FM = 0.0; rsHissU.FA = 1.0; +*/ + rsHissU.deserialize( parser, sound_type::single, sound_parameters::amplitude ); } else if (token == "airsound3:") { // syk: +/* rsHissE.Init(parser.getToken(), -1, 0, 0, 0, true); parser.getTokens(2, false); - parser >> rsHissE.AM >> rsHissE.AA; + parser + >> rsHissE.AM + >> rsHissE.AA; rsHissE.FM = 0.0; rsHissE.FA = 1.0; +*/ + rsHissE.deserialize( parser, sound_type::single, sound_parameters::amplitude ); } else if (token == "airsound4:") { // syk: +/* rsHissX.Init(parser.getToken(), -1, 0, 0, 0, true); parser.getTokens(2, false); - parser >> rsHissX.AM >> rsHissX.AA; + parser + >> rsHissX.AM + >> rsHissX.AA; rsHissX.FM = 0.0; rsHissX.FA = 1.0; +*/ + rsHissX.deserialize( parser, sound_type::single, sound_parameters::amplitude ); } else if (token == "airsound5:") { // syk: +/* rsHissT.Init(parser.getToken(), -1, 0, 0, 0, true); parser.getTokens(2, false); - parser >> rsHissT.AM >> rsHissT.AA; + parser + >> rsHissT.AM + >> rsHissT.AA; rsHissT.FM = 0.0; rsHissT.FA = 1.0; +*/ + rsHissT.deserialize( parser, sound_type::single, sound_parameters::amplitude ); } else if (token == "fadesound:") { // syk: +/* rsFadeSound.Init(parser.getToken(), -1, 0, 0, 0, true); rsFadeSound.AM = 1.0; rsFadeSound.AA = 1.0; rsFadeSound.FM = 1.0; rsFadeSound.FA = 1.0; +*/ + rsFadeSound.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); } else if (token == "localbrakesound:") { // syk: +/* rsSBHiss.Init(parser.getToken(), -1, 0, 0, 0, true); parser.getTokens(2, false); - parser >> rsSBHiss.AM >> rsSBHiss.AA; + parser + >> rsSBHiss.AM + >> rsSBHiss.AA; rsSBHiss.FM = 0.0; rsSBHiss.FA = 1.0; +*/ + rsSBHiss.deserialize( parser, sound_type::single, sound_parameters::amplitude ); } else if (token == "runningnoise:") { // szum podczas jazdy: +/* rsRunningNoise.Init(parser.getToken(), -1, 0, 0, 0, true, true); parser.getTokens(4, false); - parser >> rsRunningNoise.AM >> rsRunningNoise.AA >> rsRunningNoise.FM >> - rsRunningNoise.FA; + parser + >> rsRunningNoise.AM + >> rsRunningNoise.AA + >> rsRunningNoise.FM + >> rsRunningNoise.FA; rsRunningNoise.AM /= (1 + mvOccupied->Vmax); rsRunningNoise.FM /= (1 + mvOccupied->Vmax); +*/ + rsRunningNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); } else if (token == "engageslippery:") { // tarcie tarcz sprzegla: +/* rsEngageSlippery.Init(parser.getToken(), -1, 0, 0, 0, true, true); parser.getTokens(4, false); - parser >> rsEngageSlippery.AM >> rsEngageSlippery.AA >> rsEngageSlippery.FM >> - rsEngageSlippery.FA; + parser + >> rsEngageSlippery.AM + >> rsEngageSlippery.AA + >> rsEngageSlippery.FM + >> rsEngageSlippery.FA; rsEngageSlippery.FM /= (1 + mvOccupied->nmax); +*/ + rsEngageSlippery.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); } else if (token == "mechspring:") { // parametry bujania kamery: double ks, kd; parser.getTokens(2, false); - parser >> ks >> kd; + parser + >> ks + >> kd; MechSpring.Init(MechSpring.restLen, ks, kd); parser.getTokens(6, false); - parser >> fMechSpringX >> fMechSpringY >> fMechSpringZ >> fMechMaxSpring >> - fMechRoll >> fMechPitch; - } - else if (token == "pantographup:") - { - // podniesienie patyka: - dsbPantUp = - TSoundsManager::GetFromName(parser.getToken(), true); - } - else if (token == "pantographdown:") - { - // podniesienie patyka: - dsbPantDown = - TSoundsManager::GetFromName(parser.getToken(), true); - } - else if (token == "doorclose:") - { - // zamkniecie drzwi: - dsbDoorClose = - TSoundsManager::GetFromName(parser.getToken(), true); - } - else if (token == "dooropen:") - { - // otwarcie drzwi: - dsbDoorOpen = - TSoundsManager::GetFromName(parser.getToken(), true); + parser + >> fMechSpringX + >> fMechSpringY + >> fMechSpringZ + >> fMechMaxSpring + >> fMechRoll + >> fMechPitch; } } while (token != ""); @@ -6356,10 +6218,12 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { DynamicObject->mdKabina->Init(); // obrócenie modelu oraz optymalizacja, również zapisanie binarnego set_cab_controls(); +/* // HACK: for some reason simulation at the start is slow until a sound is played // until we do a proper fix, try to play a 'silent' sound when cab is entered // TBD: it could be instead a legit sound of door closing play_sound( dsbSwitch, DSBVOLUME_MIN ); +*/ return true; } return (token == "none"); @@ -6452,38 +6316,19 @@ void TTrain::DynamicSet(TDynamicObject *d) void TTrain::Silence() { // wyciszenie dźwięków przy wychodzeniu - if (dsbNastawnikJazdy) - dsbNastawnikJazdy->Stop(); - if (dsbNastawnikBocz) - dsbNastawnikBocz->Stop(); - if (dsbRelay) - dsbRelay->Stop(); - if (dsbPneumaticRelay) - dsbPneumaticRelay->Stop(); - if (dsbSwitch) - dsbSwitch->Stop(); - if (dsbPneumaticSwitch) - dsbPneumaticSwitch->Stop(); - if (dsbReverserKey) - dsbReverserKey->Stop(); - if (dsbCouplerAttach) - dsbCouplerAttach->Stop(); - if (dsbCouplerDetach) - dsbCouplerDetach->Stop(); - if (dsbDieselIgnition) - dsbDieselIgnition->Stop(); - if (dsbDoorClose) - dsbDoorClose->Stop(); - if (dsbDoorOpen) - dsbDoorOpen->Stop(); - if (dsbPantUp) - dsbPantUp->Stop(); - if (dsbPantDown) - dsbPantDown->Stop(); - if (dsbWejscie_na_bezoporow) - dsbWejscie_na_bezoporow->Stop(); - if (dsbWejscie_na_drugi_uklad) - dsbWejscie_na_drugi_uklad->Stop(); +#ifdef EU07_USE_OLD_SOUNDCODE + dsbNastawnikJazdy.Stop(); + dsbNastawnikBocz.Stop(); + dsbRelay.Stop(); + dsbPneumaticRelay.Stop(); + dsbSwitch.Stop(); + dsbPneumaticSwitch.Stop(); + dsbReverserKey.Stop(); + dsbCouplerAttach.Stop(); + dsbCouplerDetach.Stop(); + dsbDieselIgnition.Stop(); + dsbWejscie_na_bezoporow.Stop(); + dsbWejscie_na_drugi_uklad.Stop(); rsBrake.Stop(); rsSlippery.Stop(); rsHiss.Stop(); @@ -6495,20 +6340,15 @@ void TTrain::Silence() rsRunningNoise.Stop(); rsEngageSlippery.Stop(); rsFadeSound.Stop(); - if (dsbHasler) - dsbHasler->Stop(); // wyłączenie dźwięków opuszczanej kabiny - if (dsbBuzzer) - dsbBuzzer->Stop(); - if (dsbSlipAlarm) - dsbSlipAlarm->Stop(); // dźwięk alarmu przy poślizgu + dsbHasler.Stop(); // wyłączenie dźwięków opuszczanej kabiny + dsbBuzzer.Stop(); + dsbSlipAlarm.Stop(); // dźwięk alarmu przy poślizgu // sConverter.Stop(); // sSmallCompressor->Stop(); - if (dsbCouplerStretch) - dsbCouplerStretch->Stop(); - if (dsbEN57_CouplerStretch) - dsbEN57_CouplerStretch->Stop(); - if (dsbBufferClamp) - dsbBufferClamp->Stop(); + dsbCouplerStretch.Stop(); + dsbEN57_CouplerStretch.Stop(); + dsbBufferClamp.Stop(); +#endif }; void TTrain::SetLights() @@ -6659,7 +6499,6 @@ void TTrain::clear_cab_controls() btLampkaSprezarka.Clear(); btLampkaSprezarkaB.Clear(); btLampkaNapNastHam.Clear(); - btLampkaJazda.Clear(); btLampkaStycznB.Clear(); btLampkaHamowanie1zes.Clear(); btLampkaHamowanie2zes.Clear(); @@ -7276,31 +7115,3 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con return true; } - -void -TTrain::play_sound( PSound Sound, int const Volume, DWORD const Flags ) { - - if( Sound ) { - - Sound->SetCurrentPosition( 0 ); - Sound->SetVolume( Volume ); - Sound->Play( 0, 0, Flags ); - return; - } -} - -void -TTrain::play_sound( PSound Sound, PSound Fallbacksound, int const Volume, DWORD const Flags ) { - - if( Sound ) { - - play_sound( Sound, Volume, Flags ); - return; - } - if( Fallbacksound ) { - - play_sound( Fallbacksound, Volume, Flags ); - return; - } -} - diff --git a/Train.h b/Train.h index 7beeadd4..693ad396 100644 --- a/Train.h +++ b/Train.h @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "Button.h" #include "Gauge.h" #include "Spring.h" -#include "AdvSound.h" +#include "sound.h" #include "PyInt.h" #include "command.h" @@ -90,6 +90,7 @@ class TTrain void UpdateMechPosition(double dt); vector3 GetWorldMechPosition(); bool Update( double const Deltatime ); + void update_sounds( double const Deltatime ); bool m_updated = false; void MechStop(); void SetLights(); @@ -110,10 +111,6 @@ class TTrain bool initialize_gauge(cParser &Parser, std::string const &Label, int const Cabindex); // initializes a button matching provided label. returns: true if the label was found, false otherwise bool initialize_button(cParser &Parser, std::string const &Label, int const Cabindex); - // plays specified sound, or fallback sound if the primary sound isn't presend - // NOTE: temporary routine until sound system is sorted out and paired with switches - void play_sound( PSound Sound, int const Volume = DSBVOLUME_MAX, DWORD const Flags = 0 ); - void play_sound( PSound Sound, PSound Fallbacksound, int const Volume, DWORD const Flags ); // helper, returns true for EMU with oerlikon brake bool is_eztoer() const; // command handlers @@ -308,8 +305,6 @@ public: // reszta może by?publiczna TGauge ggTrainHeatingButton; TGauge ggSignallingButton; TGauge ggDoorSignallingButton; - // TGauge ggDistCounter; //Ra 2014-07: licznik kilometrów - // TGauge ggVelocityDgt; //i od razu prędkościomierz TButton btLampkaPoslizg; TButton btLampkaStyczn; @@ -356,7 +351,6 @@ public: // reszta może by?publiczna TButton btLampkaRadiotelefon; TButton btLampkaHamienie; TButton btLampkaED; // Stele 161228 hamowanie elektrodynamiczne - TButton btLampkaJazda; // Ra: nie używane // KURS90 TButton btLampkaBoczniki; TButton btLampkaMaxSila; @@ -384,8 +378,9 @@ public: // reszta może by?publiczna // Ra 2013-12: wirtualne "lampki" do odbijania na haslerze w PoKeys TButton btHaslerBrakes; // ciśnienie w cylindrach TButton btHaslerCurrent; // prąd na silnikach - +/* vector3 pPosition; +*/ vector3 pMechOffset; // driverNpos vector3 vMechMovement; vector3 pMechPosition; @@ -403,48 +398,42 @@ public: // reszta może by?publiczna double fMechRoll; double fMechPitch; - PSound dsbNastawnikJazdy; - PSound dsbNastawnikBocz; // hunter-081211 - PSound dsbRelay; - PSound dsbPneumaticRelay; - PSound dsbSwitch; - PSound dsbPneumaticSwitch; - PSound dsbReverserKey; // hunter-121211 + sound_source dsbNastawnikJazdy; + sound_source dsbNastawnikBocz; // hunter-081211 + sound_source dsbRelay; + sound_source dsbPneumaticRelay; + sound_source dsbSwitch; + sound_source dsbPneumaticSwitch; + sound_source dsbReverserKey; // hunter-121211 - PSound dsbCouplerAttach; // Ra: w kabinie???? - PSound dsbCouplerDetach; // Ra: w kabinie??? + sound_source dsbCouplerAttach; // Ra: w kabinie???? + sound_source dsbCouplerDetach; // Ra: w kabinie??? - PSound dsbDieselIgnition; // Ra: w kabinie??? - - PSound dsbDoorClose; // Ra: w kabinie??? - PSound dsbDoorOpen; // Ra: w kabinie??? + sound_source dsbDieselIgnition; // Ra: w kabinie??? // Winger 010304 - PSound dsbPantUp; - PSound dsbPantDown; - - PSound dsbWejscie_na_bezoporow; - PSound dsbWejscie_na_drugi_uklad; // hunter-081211: poprawka literowki + sound_source dsbWejscie_na_bezoporow; + sound_source dsbWejscie_na_drugi_uklad; // hunter-081211: poprawka literowki // PSound dsbHiss1; // PSound dsbHiss2; // McZapkie-280302 - TRealSound rsBrake; - TRealSound rsSlippery; - TRealSound rsHiss; // upuszczanie - TRealSound rsHissU; // napelnianie - TRealSound rsHissE; // nagle - TRealSound rsHissX; // fala - TRealSound rsHissT; // czasowy - TRealSound rsSBHiss; - TRealSound rsRunningNoise; - TRealSound rsEngageSlippery; - TRealSound rsFadeSound; + sound_source rsBrake; + sound_source rsSlippery; + sound_source rsHiss; // upuszczanie + sound_source rsHissU; // napelnianie + sound_source rsHissE; // nagle + sound_source rsHissX; // fala + sound_source rsHissT; // czasowy + sound_source rsSBHiss; + sound_source rsRunningNoise; + sound_source rsEngageSlippery; + sound_source rsFadeSound; - PSound dsbHasler; - PSound dsbBuzzer; - PSound dsbSlipAlarm; // Bombardier 011010: alarm przy poslizgu dla 181/182 + sound_source dsbHasler; + sound_source dsbBuzzer; + sound_source dsbSlipAlarm; // Bombardier 011010: alarm przy poslizgu dla 181/182 int iCabLightFlag; // McZapkie:120503: oswietlenie kabiny (0: wyl, 1: przyciemnione, 2: pelne) bool bCabLight; // hunter-091012: czy swiatlo jest zapalone? @@ -453,11 +442,10 @@ public: // reszta może by?publiczna vector3 pMechSittingPosition; // ABu 180404 vector3 MirrorPosition(bool lewe); - private: - // PSound dsbBuzzer; - PSound dsbCouplerStretch; - PSound dsbEN57_CouplerStretch; - PSound dsbBufferClamp; +private: + sound_source dsbCouplerStretch; + sound_source dsbEN57_CouplerStretch; + sound_source dsbBufferClamp; double fBlinkTimer; float fHaslerTimer; float fConverterTimer; // hunter-261211: dla przekaznika @@ -509,5 +497,6 @@ public: // reszta może by?publiczna inline TMoverParameters *Controlled() { return mvControlled; }; void DynamicSet(TDynamicObject *d); void Silence(); + }; //--------------------------------------------------------------------------- diff --git a/World.cpp b/World.cpp index eafab396..45470e8c 100644 --- a/World.cpp +++ b/World.cpp @@ -196,8 +196,6 @@ TWorld::TWorld() TWorld::~TWorld() { TrainDelete(); - // Ground.Free(); //Ra: usunięcie obiektów przed usunięciem dźwięków - sypie się - TSoundsManager::Free(); } void TWorld::TrainDelete(TDynamicObject *d) @@ -234,7 +232,7 @@ bool TWorld::Init( GLFWwindow *Window ) { "ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others\n" ); UILayer.set_background( "logo" ); - +#ifdef EU07_USE_OLD_SOUNDCODE if( true == TSoundsManager::Init( glfwGetWin32Window( window ) ) ) { WriteLog( "Sound subsystem setup complete" ); } @@ -242,7 +240,7 @@ bool TWorld::Init( GLFWwindow *Window ) { ErrorLog( "Sound subsystem setup failed" ); return false; } - +#endif glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii UILayer.set_progress(0.01); UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" ); @@ -689,7 +687,7 @@ void TWorld::OnKeyDown(int cKey) vehicle->MoverParameters->DecBrakeMult()) if (Train) { // dźwięk oczywiście jest w kabinie - Train->play_sound( Train->dsbSwitch ); + Train->dsbSwitch.play(); } } } @@ -717,7 +715,7 @@ void TWorld::OnKeyDown(int cKey) vehicle->iLights[CouplNr] = (vehicle->iLights[CouplNr] & ~mask) | set; if (Train) { // Ra: ten dźwięk z kabiny to przegięcie, ale na razie zostawiam - Train->play_sound( Train->dsbSwitch ); + Train->dsbSwitch.play(); } } } @@ -737,7 +735,7 @@ void TWorld::OnKeyDown(int cKey) if (vehicle->MoverParameters->IncLocalBrakeLevelFAST()) if (Train) { // dźwięk oczywiście jest w kabinie - Train->play_sound( Train->dsbPneumaticRelay ); + Train->dsbPneumaticRelay.play(); } } } @@ -756,7 +754,7 @@ void TWorld::OnKeyDown(int cKey) if (vehicle->MoverParameters->DecLocalBrakeLevelFAST()) if (Train) { // dźwięk oczywiście jest w kabinie - Train->play_sound( Train->dsbPneumaticRelay ); + Train->dsbPneumaticRelay.play(); } } } diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 251ff4a9..79bade59 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -231,6 +231,9 @@ Source Files + + Source Files + @@ -452,6 +455,9 @@ Header Files + + Header Files + diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index d1e47062..2e106500 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -14,6 +14,8 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "globals.h" +namespace gfx { + void basic_vertex::serialize( std::ostream &s ) const { @@ -47,14 +49,14 @@ basic_vertex::deserialize( std::istream &s ) { // generic geometry bank class, allows storage, update and drawing of geometry chunks // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk -geometry_handle -geometry_bank::create( vertex_array &Vertices, unsigned int const Type ) { +gfx::geometry_handle +geometry_bank::create( gfx::vertex_array &Vertices, unsigned int const Type ) { - if( true == Vertices.empty() ) { return geometry_handle( 0, 0 ); } + if( true == Vertices.empty() ) { return { 0, 0 }; } m_chunks.emplace_back( Vertices, Type ); // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication - geometry_handle chunkhandle { 0, static_cast(m_chunks.size()) }; + gfx::geometry_handle chunkhandle { 0, static_cast(m_chunks.size()) }; // template method implementation create_( chunkhandle ); // all done @@ -63,11 +65,11 @@ geometry_bank::create( vertex_array &Vertices, unsigned int const Type ) { // replaces data of specified chunk with the supplied vertex data, starting from specified offset bool -geometry_bank::replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset ) { +geometry_bank::replace( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry, std::size_t const Offset ) { if( ( Geometry.chunk == 0 ) || ( Geometry.chunk > m_chunks.size() ) ) { return false; } - auto &chunk = geometry_bank::chunk( Geometry ); + auto &chunk = gfx::geometry_bank::chunk( Geometry ); if( ( Offset == 0 ) && ( Vertices.size() == chunk.vertices.size() ) ) { @@ -78,7 +80,7 @@ geometry_bank::replace( vertex_array &Vertices, geometry_handle const &Geometry, // ...otherwise we need to do some legwork // NOTE: if the offset is larger than existing size of the chunk, it'll bridge the gap with 'blank' vertices // TBD: we could bail out with an error instead if such request occurs - chunk.vertices.resize( Offset + Vertices.size(), basic_vertex() ); + chunk.vertices.resize( Offset + Vertices.size(), gfx::basic_vertex() ); chunk.vertices.insert( std::end( chunk.vertices ), std::begin( Vertices ), std::end( Vertices ) ); } // template method implementation @@ -89,16 +91,16 @@ geometry_bank::replace( vertex_array &Vertices, geometry_handle const &Geometry, // adds supplied vertex data at the end of specified chunk bool -geometry_bank::append( vertex_array &Vertices, geometry_handle const &Geometry ) { +geometry_bank::append( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry ) { if( ( Geometry.chunk == 0 ) || ( Geometry.chunk > m_chunks.size() ) ) { return false; } - return replace( Vertices, Geometry, geometry_bank::chunk( Geometry ).vertices.size() ); + return replace( Vertices, Geometry, gfx::geometry_bank::chunk( Geometry ).vertices.size() ); } // draws geometry stored in specified chunk void -geometry_bank::draw( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ) { +geometry_bank::draw( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ) { // template method implementation draw_( Geometry, Units, Streams ); } @@ -111,7 +113,7 @@ geometry_bank::release() { } vertex_array const & -geometry_bank::vertices( geometry_handle const &Geometry ) const { +geometry_bank::vertices( gfx::geometry_handle const &Geometry ) const { return geometry_bank::chunk( Geometry ).vertices; } @@ -119,12 +121,12 @@ geometry_bank::vertices( geometry_handle const &Geometry ) const { // opengl vbo-based variant of the geometry bank GLuint opengl_vbogeometrybank::m_activebuffer { 0 }; // buffer bound currently on the opengl end, if any -unsigned int opengl_vbogeometrybank::m_activestreams { stream::none }; // currently enabled data type pointers +unsigned int opengl_vbogeometrybank::m_activestreams { gfx::stream::none }; // currently enabled data type pointers std::vector opengl_vbogeometrybank::m_activetexturearrays; // currently enabled texture coord arrays // create() subclass details void -opengl_vbogeometrybank::create_( geometry_handle const &Geometry ) { +opengl_vbogeometrybank::create_( gfx::geometry_handle const &Geometry ) { // adding a chunk means we'll be (re)building the buffer, which will fill the chunk records, amongst other things. // thus we don't need to initialize the values here m_chunkrecords.emplace_back( chunk_record() ); @@ -134,7 +136,7 @@ opengl_vbogeometrybank::create_( geometry_handle const &Geometry ) { // replace() subclass details void -opengl_vbogeometrybank::replace_( geometry_handle const &Geometry ) { +opengl_vbogeometrybank::replace_( gfx::geometry_handle const &Geometry ) { auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; chunkrecord.is_good = false; @@ -149,7 +151,7 @@ opengl_vbogeometrybank::replace_( geometry_handle const &Geometry ) { // draw() subclass details void -opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ) { +opengl_vbogeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ) { if( m_buffer == 0 ) { // if there's no buffer, we'll have to make one @@ -176,7 +178,7 @@ opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, stream_units con // TODO: allow to specify usage hint at the object creation, and pass it here ::glBufferData( GL_ARRAY_BUFFER, - datasize * sizeof( basic_vertex ), + datasize * sizeof( gfx::basic_vertex ), nullptr, GL_STATIC_DRAW ); if( ::glGetError() == GL_OUT_OF_MEMORY ) { @@ -193,13 +195,13 @@ opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, stream_units con bind_buffer(); } auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; - auto const &chunk = geometry_bank::chunk( Geometry ); + auto const &chunk = gfx::geometry_bank::chunk( Geometry ); if( false == chunkrecord.is_good ) { // we may potentially need to upload new buffer data before we can draw it ::glBufferSubData( GL_ARRAY_BUFFER, - chunkrecord.offset * sizeof( basic_vertex ), - chunkrecord.size * sizeof( basic_vertex ), + chunkrecord.offset * sizeof( gfx::basic_vertex ), + chunkrecord.size * sizeof( gfx::basic_vertex ), chunk.vertices.data() ); chunkrecord.is_good = true; } @@ -229,7 +231,7 @@ opengl_vbogeometrybank::bind_buffer() { ::glBindBuffer( GL_ARRAY_BUFFER, m_buffer ); m_activebuffer = m_buffer; - m_activestreams = stream::none; + m_activestreams = gfx::stream::none; } void @@ -250,34 +252,34 @@ opengl_vbogeometrybank::delete_buffer() { } void -opengl_vbogeometrybank::bind_streams( stream_units const &Units, unsigned int const Streams ) { +opengl_vbogeometrybank::bind_streams( gfx::stream_units const &Units, unsigned int const Streams ) { - if( Streams & stream::position ) { - ::glVertexPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) ); + if( Streams & gfx::stream::position ) { + ::glVertexPointer( 3, GL_FLOAT, sizeof( gfx::basic_vertex ), static_cast( nullptr ) ); ::glEnableClientState( GL_VERTEX_ARRAY ); } else { ::glDisableClientState( GL_VERTEX_ARRAY ); } // NOTE: normal and color streams share the data, making them effectively mutually exclusive - if( Streams & stream::normal ) { - ::glNormalPointer( GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + sizeof( float ) * 3 ); + if( Streams & gfx::stream::normal ) { + ::glNormalPointer( GL_FLOAT, sizeof( gfx::basic_vertex ), static_cast( nullptr ) + sizeof( float ) * 3 ); ::glEnableClientState( GL_NORMAL_ARRAY ); } else { ::glDisableClientState( GL_NORMAL_ARRAY ); } - if( Streams & stream::color ) { - ::glColorPointer( 3, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + sizeof( float ) * 3 ); + if( Streams & gfx::stream::color ) { + ::glColorPointer( 3, GL_FLOAT, sizeof( gfx::basic_vertex ), static_cast( nullptr ) + sizeof( float ) * 3 ); ::glEnableClientState( GL_COLOR_ARRAY ); } else { ::glDisableClientState( GL_COLOR_ARRAY ); } - if( Streams & stream::texture ) { + if( Streams & gfx::stream::texture ) { for( auto unit : Units.texture ) { ::glClientActiveTexture( unit ); - ::glTexCoordPointer( 2, GL_FLOAT, sizeof( basic_vertex ), static_cast( nullptr ) + 24 ); + ::glTexCoordPointer( 2, GL_FLOAT, sizeof( gfx::basic_vertex ), static_cast( nullptr ) + 24 ); ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); } m_activetexturearrays = Units.texture; @@ -304,7 +306,7 @@ opengl_vbogeometrybank::release_streams() { ::glDisableClientState( GL_TEXTURE_COORD_ARRAY ); } - m_activestreams = stream::none; + m_activestreams = gfx::stream::none; m_activetexturearrays.clear(); } @@ -312,21 +314,21 @@ opengl_vbogeometrybank::release_streams() { // create() subclass details void -opengl_dlgeometrybank::create_( geometry_handle const &Geometry ) { +opengl_dlgeometrybank::create_( gfx::geometry_handle const &Geometry ) { m_chunkrecords.emplace_back( chunk_record() ); } // replace() subclass details void -opengl_dlgeometrybank::replace_( geometry_handle const &Geometry ) { +opengl_dlgeometrybank::replace_( gfx::geometry_handle const &Geometry ) { delete_list( Geometry ); } // draw() subclass details void -opengl_dlgeometrybank::draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ) { +opengl_dlgeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ) { auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; if( chunkrecord.streams != Streams ) { @@ -336,15 +338,15 @@ opengl_dlgeometrybank::draw_( geometry_handle const &Geometry, stream_units cons // we don't have a list ready, so compile one chunkrecord.streams = Streams; chunkrecord.list = ::glGenLists( 1 ); - auto const &chunk = geometry_bank::chunk( Geometry ); + auto const &chunk = gfx::geometry_bank::chunk( Geometry ); ::glNewList( chunkrecord.list, GL_COMPILE ); ::glBegin( chunk.type ); for( auto const &vertex : chunk.vertices ) { - if( Streams & stream::normal ) { ::glNormal3fv( glm::value_ptr( vertex.normal ) ); } - else if( Streams & stream::color ) { ::glColor3fv( glm::value_ptr( vertex.normal ) ); } - if( Streams & stream::texture ) { for( auto unit : Units.texture ) { ::glMultiTexCoord2fv( unit, glm::value_ptr( vertex.texture ) ); } } - if( Streams & stream::position ) { ::glVertex3fv( glm::value_ptr( vertex.position ) ); } + if( Streams & gfx::stream::normal ) { ::glNormal3fv( glm::value_ptr( vertex.normal ) ); } + else if( Streams & gfx::stream::color ) { ::glColor3fv( glm::value_ptr( vertex.normal ) ); } + if( Streams & gfx::stream::texture ) { for( auto unit : Units.texture ) { ::glMultiTexCoord2fv( unit, glm::value_ptr( vertex.texture ) ); } } + if( Streams & gfx::stream::position ) { ::glVertex3fv( glm::value_ptr( vertex.position ) ); } } ::glEnd(); ::glEndList(); @@ -362,19 +364,19 @@ opengl_dlgeometrybank::release_() { ::glDeleteLists( chunkrecord.list, 1 ); chunkrecord.list = 0; } - chunkrecord.streams = stream::none; + chunkrecord.streams = gfx::stream::none; } } void -opengl_dlgeometrybank::delete_list( geometry_handle const &Geometry ) { +opengl_dlgeometrybank::delete_list( gfx::geometry_handle const &Geometry ) { // NOTE: given it's our own internal method we trust it to be called with valid parameters auto &chunkrecord = m_chunkrecords[ Geometry.chunk - 1 ]; if( chunkrecord.list != 0 ) { ::glDeleteLists( chunkrecord.list, 1 ); chunkrecord.list = 0; } - chunkrecord.streams = stream::none; + chunkrecord.streams = gfx::stream::none; } // geometry bank manager, holds collection of geometry banks @@ -387,41 +389,41 @@ geometrybank_manager::update() { } // creates a new geometry bank. returns: handle to the bank or NULL -geometrybank_handle +gfx::geometrybank_handle geometrybank_manager::create_bank() { if( true == Global::bUseVBO ) { m_geometrybanks.emplace_back( std::make_shared(), std::chrono::steady_clock::time_point() ); } else { m_geometrybanks.emplace_back( std::make_shared(), std::chrono::steady_clock::time_point() ); } // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication - return geometrybank_handle( m_geometrybanks.size(), 0 ); + return { m_geometrybanks.size(), 0 }; } // creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL -geometry_handle -geometrybank_manager::create_chunk( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type ) { +gfx::geometry_handle +geometrybank_manager::create_chunk( gfx::vertex_array &Vertices, gfx::geometrybank_handle const &Geometry, int const Type ) { auto const newchunkhandle = bank( Geometry ).first->create( Vertices, Type ); - if( newchunkhandle.chunk != 0 ) { return geometry_handle( Geometry.bank, newchunkhandle.chunk ); } - else { return geometry_handle( 0, 0 ); } + if( newchunkhandle.chunk != 0 ) { return { Geometry.bank, newchunkhandle.chunk }; } + else { return { 0, 0 }; } } // replaces data of specified chunk with the supplied vertex data, starting from specified offset bool -geometrybank_manager::replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset ) { +geometrybank_manager::replace( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry, std::size_t const Offset ) { return bank( Geometry ).first->replace( Vertices, Geometry, Offset ); } // adds supplied vertex data at the end of specified chunk bool -geometrybank_manager::append( vertex_array &Vertices, geometry_handle const &Geometry ) { +geometrybank_manager::append( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry ) { return bank( Geometry ).first->append( Vertices, Geometry ); } // draws geometry stored in specified chunk void -geometrybank_manager::draw( geometry_handle const &Geometry, unsigned int const Streams ) { +geometrybank_manager::draw( gfx::geometry_handle const &Geometry, unsigned int const Streams ) { if( Geometry == null_handle ) { return; } @@ -432,8 +434,10 @@ geometrybank_manager::draw( geometry_handle const &Geometry, unsigned int const } // provides direct access to vertex data of specfied chunk -vertex_array const & -geometrybank_manager::vertices( geometry_handle const &Geometry ) const { +gfx::vertex_array const & +geometrybank_manager::vertices( gfx::geometry_handle const &Geometry ) const { return bank( Geometry ).first->vertices( Geometry ); } + +} // namespace gfx diff --git a/openglgeometrybank.h b/openglgeometrybank.h index a13f803e..00b9cd8a 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -18,6 +18,8 @@ http://mozilla.org/MPL/2.0/. #endif #include "ResourceManager.h" +namespace gfx { + struct basic_vertex { glm::vec3 position; // 3d space @@ -93,36 +95,36 @@ public: // methods: // creates a new geometry chunk of specified type from supplied vertex data. returns: handle to the chunk or NULL - geometry_handle - create( vertex_array &Vertices, unsigned int const Type ); + gfx::geometry_handle + create( gfx::vertex_array &Vertices, unsigned int const Type ); // replaces data of specified chunk with the supplied vertex data, starting from specified offset bool - replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset = 0 ); + replace( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry, std::size_t const Offset = 0 ); // adds supplied vertex data at the end of specified chunk bool - append( vertex_array &Vertices, geometry_handle const &Geometry ); + append( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry ); // draws geometry stored in specified chunk void - draw( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams = basic_streams ); + draw( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams = basic_streams ); // draws geometry stored in supplied list of chunks template void - draw( Iterator_ First, Iterator_ Last, stream_units const &Units, unsigned int const Streams = basic_streams ) { while( First != Last ) { draw( *First, Units, Streams ); ++First; } } + draw( Iterator_ First, Iterator_ Last, gfx::stream_units const &Units, unsigned int const Streams = basic_streams ) { while( First != Last ) { draw( *First, Units, Streams ); ++First; } } // frees subclass-specific resources associated with the bank, typically called when the bank wasn't in use for a period of time void release(); // provides direct access to vertex data of specfied chunk - vertex_array const & - vertices( geometry_handle const &Geometry ) const; + gfx::vertex_array const & + vertices( gfx::geometry_handle const &Geometry ) const; protected: // types: struct geometry_chunk { unsigned int type; // kind of geometry used by the chunk - vertex_array vertices; // geometry data + gfx::vertex_array vertices; // geometry data // NOTE: constructor doesn't copy provided vertex data, but moves it - geometry_chunk( vertex_array &Vertices, unsigned int Type ) : - type( Type ) + geometry_chunk( gfx::vertex_array &Vertices, unsigned int Type ) : + type( Type ) { vertices.swap( Vertices ); } @@ -133,11 +135,11 @@ protected: // methods inline geometry_chunk & - chunk( geometry_handle const Geometry ) { + chunk( gfx::geometry_handle const Geometry ) { return m_chunks[ Geometry.chunk - 1 ]; } inline geometry_chunk const & - chunk( geometry_handle const Geometry ) const { + chunk( gfx::geometry_handle const Geometry ) const { return m_chunks[ Geometry.chunk - 1 ]; } // members: @@ -146,11 +148,11 @@ protected: private: // methods: // create() subclass details - virtual void create_( geometry_handle const &Geometry ) = 0; + virtual void create_( gfx::geometry_handle const &Geometry ) = 0; // replace() subclass details - virtual void replace_( geometry_handle const &Geometry ) = 0; + virtual void replace_( gfx::geometry_handle const &Geometry ) = 0; // draw() subclass details - virtual void draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ) = 0; + virtual void draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ) = 0; // resource release subclass details virtual void release_() = 0; }; @@ -170,7 +172,7 @@ public: void reset() { m_activebuffer = 0; - m_activestreams = stream::none; } + m_activestreams = gfx::stream::none; } private: // types: @@ -185,13 +187,13 @@ private: // methods: // create() subclass details void - create_( geometry_handle const &Geometry ); + create_( gfx::geometry_handle const &Geometry ); // replace() subclass details void - replace_( geometry_handle const &Geometry ); + replace_( gfx::geometry_handle const &Geometry ); // draw() subclass details void - draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ); + draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ); // release() subclass details void release_(); @@ -201,7 +203,7 @@ private: delete_buffer(); static void - bind_streams( stream_units const &Units, unsigned int const Streams ); + bind_streams( gfx::stream_units const &Units, unsigned int const Streams ); static void release_streams(); @@ -240,18 +242,18 @@ private: // methods: // create() subclass details void - create_( geometry_handle const &Geometry ); + create_( gfx::geometry_handle const &Geometry ); // replace() subclass details void - replace_( geometry_handle const &Geometry ); + replace_( gfx::geometry_handle const &Geometry ); // draw() subclass details void - draw_( geometry_handle const &Geometry, stream_units const &Units, unsigned int const Streams ); + draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ); // release () subclass details void release_(); void - delete_list( geometry_handle const &Geometry ); + delete_list( gfx::geometry_handle const &Geometry ); // members: chunkrecord_sequence m_chunkrecords; // helper data for all stored geometry chunks, in matching order @@ -269,20 +271,20 @@ public: // performs a resource sweep void update(); // creates a new geometry bank. returns: handle to the bank or NULL - geometrybank_handle + gfx::geometrybank_handle create_bank(); // creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL - geometry_handle - create_chunk( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type ); + gfx::geometry_handle + create_chunk( gfx::vertex_array &Vertices, gfx::geometrybank_handle const &Geometry, int const Type ); // replaces data of specified chunk with the supplied vertex data, starting from specified offset bool - replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset = 0 ); + replace( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry, std::size_t const Offset = 0 ); // adds supplied vertex data at the end of specified chunk bool - append( vertex_array &Vertices, geometry_handle const &Geometry ); + append( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry ); // draws geometry stored in specified chunk void - draw( geometry_handle const &Geometry, unsigned int const Streams = basic_streams ); + draw( gfx::geometry_handle const &Geometry, unsigned int const Streams = basic_streams ); template void draw( Iterator_ First, Iterator_ Last, unsigned int const Streams = basic_streams ) { @@ -290,10 +292,10 @@ public: draw( *First, Streams ); ++First; } } // provides direct access to vertex data of specfied chunk - vertex_array const & - vertices( geometry_handle const &Geometry ) const; + gfx::vertex_array const & + vertices( gfx::geometry_handle const &Geometry ) const; // sets target texture unit for the texture data stream - stream_units & + gfx::stream_units & units() { return m_units; } private: @@ -307,21 +309,23 @@ private: // members: geometrybanktimepointpair_sequence m_geometrybanks; garbage_collector m_garbagecollector { m_geometrybanks, 60, 120, "geometry buffer" }; - stream_units m_units; + gfx::stream_units m_units; // methods inline bool - valid( geometry_handle const &Geometry ) const { + valid( gfx::geometry_handle const &Geometry ) const { return ( ( Geometry.bank != 0 ) && ( Geometry.bank <= m_geometrybanks.size() ) ); } inline geometrybanktimepointpair_sequence::value_type & - bank( geometry_handle const Geometry ) { + bank( gfx::geometry_handle const Geometry ) { return m_geometrybanks[ Geometry.bank - 1 ]; } inline geometrybanktimepointpair_sequence::value_type const & - bank( geometry_handle const Geometry ) const { + bank( gfx::geometry_handle const Geometry ) const { return m_geometrybanks[ Geometry.bank - 1 ]; } -}; \ No newline at end of file +}; + +} // namespace gfx \ No newline at end of file diff --git a/renderer.cpp b/renderer.cpp index 7d33fc32..8aae4da8 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -298,7 +298,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { auto const geometrybank = m_geometry.create_bank(); float const size = 2.5f; m_billboardgeometry = m_geometry.create_chunk( - vertex_array{ + gfx::vertex_array{ { { -size, size, 0.f }, glm::vec3(), { 1.f, 1.f } }, { { size, size, 0.f }, glm::vec3(), { 0.f, 1.f } }, { { -size, -size, 0.f }, glm::vec3(), { 1.f, 0.f } }, @@ -1129,7 +1129,7 @@ opengl_renderer::Render( world_environment *Environment ) { Environment->m_skydome.Render(); if( true == Global::bUseVBO ) { // skydome uses a custom vbo which could potentially confuse the main geometry system. hardly elegant but, eh - opengl_vbogeometrybank::reset(); + gfx::opengl_vbogeometrybank::reset(); } // stars if( Environment->m_stars.m_stars != nullptr ) { @@ -1263,36 +1263,36 @@ opengl_renderer::Render( world_environment *Environment ) { // geometry methods // creates a new geometry bank. returns: handle to the bank or NULL -geometrybank_handle +gfx::geometrybank_handle opengl_renderer::Create_Bank() { return m_geometry.create_bank(); } // creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL -geometry_handle -opengl_renderer::Insert( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type ) { +gfx::geometry_handle +opengl_renderer::Insert( gfx::vertex_array &Vertices, gfx::geometrybank_handle const &Geometry, int const Type ) { return m_geometry.create_chunk( Vertices, Geometry, Type ); } // replaces data of specified chunk with the supplied vertex data, starting from specified offset bool -opengl_renderer::Replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset ) { +opengl_renderer::Replace( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry, std::size_t const Offset ) { return m_geometry.replace( Vertices, Geometry, Offset ); } // adds supplied vertex data at the end of specified chunk bool -opengl_renderer::Append( vertex_array &Vertices, geometry_handle const &Geometry ) { +opengl_renderer::Append( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry ) { return m_geometry.append( Vertices, Geometry ); } // provides direct access to vertex data of specfied chunk -vertex_array const & -opengl_renderer::Vertices( geometry_handle const &Geometry ) const { +gfx::vertex_array const & +opengl_renderer::Vertices( gfx::geometry_handle const &Geometry ) const { return m_geometry.vertices( Geometry ); } @@ -2262,7 +2262,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glDisable( GL_LIGHTING ); // main draw call - m_geometry.draw( Submodel->m_geometry, color_streams ); + m_geometry.draw( Submodel->m_geometry, gfx::color_streams ); // post-draw reset ::glPopAttrib(); diff --git a/renderer.h b/renderer.h index cdf91132..e8582afc 100644 --- a/renderer.h +++ b/renderer.h @@ -156,20 +156,20 @@ public: // geometry methods // NOTE: hands-on geometry management is exposed as a temporary measure; ultimately all visualization data should be generated/handled automatically by the renderer itself // creates a new geometry bank. returns: handle to the bank or NULL - geometrybank_handle + gfx::geometrybank_handle Create_Bank(); // creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL - geometry_handle - Insert( vertex_array &Vertices, geometrybank_handle const &Geometry, int const Type ); + gfx::geometry_handle + Insert( gfx::vertex_array &Vertices, gfx::geometrybank_handle const &Geometry, int const Type ); // replaces data of specified chunk with the supplied vertex data, starting from specified offset bool - Replace( vertex_array &Vertices, geometry_handle const &Geometry, std::size_t const Offset = 0 ); + Replace( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry, std::size_t const Offset = 0 ); // adds supplied vertex data at the end of specified chunk bool - Append( vertex_array &Vertices, geometry_handle const &Geometry ); + Append( gfx::vertex_array &Vertices, gfx::geometry_handle const &Geometry ); // provides direct access to vertex data of specfied chunk - vertex_array const & - Vertices( geometry_handle const &Geometry ) const; + gfx::vertex_array const & + Vertices( gfx::geometry_handle const &Geometry ) const; // material methods material_handle Fetch_Material( std::string const &Filename, bool const Loadnow = true ); @@ -337,12 +337,12 @@ private: // members GLFWwindow *m_window { nullptr }; - geometrybank_manager m_geometry; + gfx::geometrybank_manager m_geometry; material_manager m_materials; texture_manager m_textures; opengllight_array m_lights; - geometry_handle m_billboardgeometry { 0, 0 }; + gfx::geometry_handle m_billboardgeometry { 0, 0 }; texture_handle m_glaretexture { -1 }; texture_handle m_suntexture { -1 }; texture_handle m_moontexture { -1 }; diff --git a/scene.cpp b/scene.cpp index 33e6cd43..22bda992 100644 --- a/scene.cpp +++ b/scene.cpp @@ -125,11 +125,13 @@ basic_cell::update_sounds() { // sounds auto const deltatime = Timer::GetDeltaRenderTime(); for( auto *sound : m_sounds ) { - +#ifdef EU07_USE_OLD_SOUNDCODE if( ( sound->GetStatus() & DSBSTATUS_PLAYING ) == DSBPLAY_LOOPING ) { sound->Play( 1, DSBPLAY_LOOPING, true, sound->vSoundPosition ); sound->AdjFreq( 1.0, deltatime ); } +#else +#endif } // TBD, TODO: move to sound renderer for( auto *path : m_paths ) { @@ -348,7 +350,11 @@ basic_cell::insert( TAnimModel *Instance ) { // adds provided sound instance to the cell void +#ifdef EU07_USE_OLD_SOUNDCODE basic_cell::insert( TTextSound *Sound ) { +#else +basic_cell::insert( sound_source *Sound ) { +#endif m_active = true; @@ -514,7 +520,7 @@ basic_cell::center( glm::dvec3 Center ) { // generates renderable version of held non-instanced geometry void -basic_cell::create_geometry( geometrybank_handle const &Bank ) { +basic_cell::create_geometry( gfx::geometrybank_handle const &Bank ) { if( false == m_active ) { return; } // nothing to do here @@ -1171,8 +1177,13 @@ basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) // inserts provided sound in the region void +#ifdef EU07_USE_OLD_SOUNDCODE basic_region::insert_sound( TTextSound *Sound, scratch_data &Scratchpad ) { +#else +basic_region::insert_sound( sound_source *Sound, scratch_data &Scratchpad ) { +#endif +#ifdef EU07_USE_OLD_SOUNDCODE // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done auto location = Sound->location(); @@ -1184,6 +1195,8 @@ basic_region::insert_sound( TTextSound *Sound, scratch_data &Scratchpad ) { // tracks are guaranteed to hava a name so we can skip the check ErrorLog( "Bad scenario: sound node \"" + Sound->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); } +#else +#endif } // inserts provided event launcher in the region diff --git a/scene.h b/scene.h index d4b1853d..ce1db91f 100644 --- a/scene.h +++ b/scene.h @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. #include "scenenode.h" #include "track.h" #include "traction.h" +#include "sound.h" namespace scene { @@ -104,7 +105,11 @@ public: insert( TAnimModel *Instance ); // adds provided sound instance to the cell void +#ifdef EU07_USE_OLD_SOUNDCODE insert( TTextSound *Sound ); +#else + insert( sound_source *Sound ); +#endif // adds provided event launcher to the cell void insert( TEventLauncher *Launcher ); @@ -131,7 +136,7 @@ public: center( glm::dvec3 Center ); // generates renderable version of held non-instanced geometry in specified geometry bank void - create_geometry( geometrybank_handle const &Bank ); + create_geometry( gfx::geometrybank_handle const &Bank ); // provides access to bounding area data bounding_area const & area() const { @@ -144,7 +149,11 @@ private: using path_sequence = std::vector; using traction_sequence = std::vector; using instance_sequence = std::vector; +#ifdef EU07_USE_OLD_SOUNDCODE using sound_sequence = std::vector; +#else + using sound_sequence = std::vector; +#endif using eventlauncher_sequence = std::vector; // methods void @@ -258,7 +267,7 @@ private: shapenode_sequence m_shapes; // large pieces of opaque geometry and (legacy) terrain // TODO: implement dedicated, higher fidelity, fixed resolution terrain mesh item // gfx renderer data - geometrybank_handle m_geometrybank; + gfx::geometrybank_handle m_geometrybank; bool m_geometrycreated { false }; }; @@ -311,7 +320,11 @@ public: insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ); // inserts provided sound in the region void +#ifdef EU07_USE_OLD_SOUNDCODE insert_sound( TTextSound *Sound, scratch_data &Scratchpad ); +#else + insert_sound( sound_source *Sound, scratch_data &Scratchpad ); +#endif // inserts provided event launcher in the region void insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpad ); diff --git a/scenenode.cpp b/scenenode.cpp index 97c00424..4ebd51fe 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -80,7 +80,7 @@ shape_node::shapenode_data::serialize( std::ostream &Output ) const { // vertex count, followed by vertex data sn_utils::ls_uint32( Output, vertices.size() ); for( auto const &vertex : vertices ) { - basic_vertex( + gfx::basic_vertex( glm::vec3{ vertex.position - origin }, vertex.normal, vertex.texture ) @@ -109,7 +109,7 @@ shape_node::shapenode_data::deserialize( std::istream &Input ) { // NOTE: geometry handle is acquired during geometry creation // vertex data vertices.resize( sn_utils::ld_uint32( Input ) ); - basic_vertex localvertex; + gfx::basic_vertex localvertex; for( auto &vertex : vertices ) { localvertex.deserialize( Input ); vertex.position = origin + glm::dvec3{ localvertex.position }; @@ -417,9 +417,9 @@ shape_node::merge( shape_node &Shape ) { // generates renderable version of held non-instanced geometry in specified geometry bank void -shape_node::create_geometry( geometrybank_handle const &Bank ) { +shape_node::create_geometry( gfx::geometrybank_handle const &Bank ) { - vertex_array vertices; vertices.reserve( m_data.vertices.size() ); + gfx::vertex_array vertices; vertices.reserve( m_data.vertices.size() ); for( auto const &vertex : m_data.vertices ) { vertices.emplace_back( @@ -464,7 +464,7 @@ lines_node::linesnode_data::serialize( std::ostream &Output ) const { // vertex count, followed by vertex data sn_utils::ls_uint32( Output, vertices.size() ); for( auto const &vertex : vertices ) { - basic_vertex( + gfx::basic_vertex( glm::vec3{ vertex.position - origin }, vertex.normal, vertex.texture ) @@ -489,7 +489,7 @@ lines_node::linesnode_data::deserialize( std::istream &Input ) { // NOTE: geometry handle is acquired during geometry creation // vertex data vertices.resize( sn_utils::ld_uint32( Input ) ); - basic_vertex localvertex; + gfx::basic_vertex localvertex; for( auto &vertex : vertices ) { localvertex.deserialize( Input ); vertex.position = origin + glm::dvec3{ localvertex.position }; @@ -637,9 +637,9 @@ lines_node::merge( lines_node &Lines ) { // generates renderable version of held non-instanced geometry in specified geometry bank void -lines_node::create_geometry( geometrybank_handle const &Bank ) { +lines_node::create_geometry( gfx::geometrybank_handle const &Bank ) { - vertex_array vertices; vertices.reserve( m_data.vertices.size() ); + gfx::vertex_array vertices; vertices.reserve( m_data.vertices.size() ); for( auto const &vertex : m_data.vertices ) { vertices.emplace_back( diff --git a/scenenode.h b/scenenode.h index 7c2c7988..df7c6f64 100644 --- a/scenenode.h +++ b/scenenode.h @@ -93,7 +93,7 @@ public: lighting_data lighting; // geometry data glm::dvec3 origin; // world position of the relative coordinate system origin - geometry_handle geometry { 0, 0 }; // relative origin-centered chunk of geometry held by gfx renderer + gfx::geometry_handle geometry { 0, 0 }; // relative origin-centered chunk of geometry held by gfx renderer std::vector vertices; // world space source data of the geometry // methods: // sends content of the struct to provided stream @@ -122,7 +122,7 @@ public: merge( shape_node &Shape ); // generates renderable version of held non-instanced geometry in specified geometry bank void - create_geometry( geometrybank_handle const &Bank ); + create_geometry( gfx::geometrybank_handle const &Bank ); // calculates shape's bounding radius void compute_radius(); @@ -182,7 +182,7 @@ public: lighting_data lighting; // geometry data glm::dvec3 origin; // world position of the relative coordinate system origin - geometry_handle geometry { 0, 0 }; // relative origin-centered chunk of geometry held by gfx renderer + gfx::geometry_handle geometry { 0, 0 }; // relative origin-centered chunk of geometry held by gfx renderer std::vector vertices; // world space source data of the geometry // methods: // sends content of the struct to provided stream @@ -208,7 +208,7 @@ public: merge( lines_node &Lines ); // generates renderable version of held non-instanced geometry in specified geometry bank void - create_geometry( geometrybank_handle const &Bank ); + create_geometry( gfx::geometrybank_handle const &Bank ); // calculates shape's bounding radius void compute_radius(); diff --git a/simulation.cpp b/simulation.cpp index 9a100dd4..cd176f5f 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -460,7 +460,10 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad auto *sound { deserialize_sound( Input, Scratchpad, nodedata ) }; if( false == simulation::Sounds.insert( sound ) ) { +#ifdef EU07_USE_OLD_SOUNDCODE ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->m_name + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); +#else +#endif } simulation::Region->insert_sound( sound, Scratchpad ); } @@ -830,7 +833,11 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch return vehicle; } +#ifdef EU07_USE_OLD_SOUNDCODE TTextSound * +#else +sound_source * +#endif state_manager::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { glm::dvec3 location; @@ -842,9 +849,14 @@ state_manager::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpa // adjust location location = transform( location, Scratchpad ); +#ifdef EU07_USE_OLD_SOUNDCODE auto const soundname { Input.getToken() }; auto *sound = new TTextSound( soundname, Nodedata.range_max, location.x, location.y, location.z, false, false, Nodedata.range_min ); sound->name( Nodedata.name ); +#else + auto *sound = new sound_source(); + sound->deserialize( Input.getToken(), sound_type::single ); +#endif skip_until( Input, "endsound" ); diff --git a/simulation.h b/simulation.h index 862f8445..ceceb2ac 100644 --- a/simulation.h +++ b/simulation.h @@ -17,7 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "track.h" #include "traction.h" #include "tractionpower.h" -#include "realsound.h" +#include "sound.h" #include "animmodel.h" #include "dynobj.h" #include "driver.h" @@ -64,7 +64,11 @@ private: TEventLauncher * deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TAnimModel * deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TDynamicObject * deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); +#ifdef EU07_USE_OLD_SOUNDCODE TTextSound * deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); +#else + sound_source * deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); +#endif // skips content of stream until specified token void skip_until( cParser &Input, std::string const &Token ); // transforms provided location by specifed rotation and offset diff --git a/sound.cpp b/sound.cpp new file mode 100644 index 00000000..519b51e1 --- /dev/null +++ b/sound.cpp @@ -0,0 +1,66 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" + +#include "sound.h" + +// restores state of the class from provided data stream +sound_source & +sound_source::deserialize( std::string const &Input, sound_type const Legacytype, int const Legacyparameters ) { + + return deserialize( cParser{ Input }, Legacytype, Legacyparameters ); +} + +sound_source & +sound_source::deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters ) { + + // TODO: implement block type config parsing + switch( Legacytype ) { + case sound_type::single: { + // single sample only + Input.getTokens( 1, true, "\n\r\t ,;" ); + break; + } + case sound_type::multipart: { + // three samples: start, middle, stop + Input.getTokens( 3, true, "\n\r\t ,;" ); + break; + } + default: { + break; + } + } + + if( Legacyparameters & sound_parameters::range ) { + Input.getTokens( 1, false ); + } + if( Legacyparameters & sound_parameters::amplitude ) { + Input.getTokens( 2, false ); + } + if( Legacyparameters & sound_parameters::frequency ) { + Input.getTokens( 2, false ); + } + + return *this; +} + +// issues contextual play commands for the audio renderer +void +sound_source::play() { + +} + +bool +sound_source::empty() const { + + return true; +} + +//--------------------------------------------------------------------------- diff --git a/sound.h b/sound.h new file mode 100644 index 00000000..877c5491 --- /dev/null +++ b/sound.h @@ -0,0 +1,69 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "audiorenderer.h" +#include "parser.h" +#include "names.h" + +enum sound_type { + single, + multipart +}; + +enum sound_parameters { + none, + range = 0x1, + amplitude = 0x2, + frequency = 0x4 +}; + +// mini controller and audio dispatcher; issues play commands for the audio renderer, +// updates parameters of assigned audio sources for the playback duration +// TODO: move to simulation namespace after clean up of owner classes +class sound_source { + +public: +// methods + // restores state of the class from provided data stream + sound_source & + deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters = sound_parameters::none ); + sound_source & + deserialize( std::string const &Input, sound_type const Legacytype, int const Legacyparameters = sound_parameters::none ); + // issues contextual play commands for the audio renderer + void + play(); + // sets volume of audio streams associated with this source + sound_source & + volume( float const Volume ); + // sound source name setter/getter + void + name( std::string Name ); + std::string const & + name() const; + // returns true if there isn't any sound buffer associated with the object, false otherwise + bool + empty() const; + +private: +// members + std::string m_name; +}; + +// sound source name setter/getter +inline void sound_source::name( std::string Name ) { m_name = Name; } +inline std::string const & sound_source::name() const { return m_name; } + +// collection of generators for power grid present in the scene +class sound_table : public basic_table { + +}; + +//--------------------------------------------------------------------------- From 7fc1256b467a8b8595b6a9828d0e6943348ff75b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 12 Nov 2017 20:02:36 +0100 Subject: [PATCH 222/426] partial shadow stabilization, support for vehicle type-specific load models --- DynObj.cpp | 10 ++++++++-- renderer.cpp | 40 +++++++++++++++++++++++++++++++++------- renderer.h | 2 +- version.h | 2 +- 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 574db0c0..ad105306 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1924,7 +1924,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" 0.0f ); } ++compartmentindex; - } while( submodel != nullptr ); + } while( ( submodel != nullptr ) + || ( compartmentindex < 2 ) ); // chain can start from prefix00 or prefix01 } } // wyszukiwanie zderzakow @@ -4004,7 +4005,12 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, else { // Ra: tu wczytywanie modelu ładunku jest w porządku if( false == asLoadName.empty() ) { - mdLoad = TModelsManager::GetModel( asLoadName, true ); // ladunek + // try first specialized version of the load model, vehiclename_loadname + mdLoad = TModelsManager::GetModel( BaseDir + TypeName + "_" + MoverParameters->LoadType + ".t3d", true ); + if( mdLoad == nullptr ) { + // if this fails, try generic load model + mdLoad = TModelsManager::GetModel( asLoadName, true ); + } } } } diff --git a/renderer.cpp b/renderer.cpp index 8aae4da8..e3254003 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -484,7 +484,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glEnable( GL_SCISSOR_TEST ); setup_matrices(); ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting - ::glPolygonOffset( 2.f, 2.f ); + ::glPolygonOffset( 1.f, 1.f ); // render // opaque parts... setup_drawing( false ); @@ -663,6 +663,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f } case rendermode::shadows: { + // calculate lightview boundaries based on relevant area of the world camera frustum: // ...setup chunk of frustum we're interested in... auto const znear = 0.f; @@ -695,18 +696,43 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f point = lightviewmatrix * point; } bounding_box( frustumchunkmin, frustumchunkmax, std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); - // ...use the dimensions to set up light projection boundaries + // quantize the frustum points with 50 m resolution, to reduce shadow shimmer on scale/orientation changes + frustumchunkmin = 50.f * glm::floor( frustumchunkmin * ( 1.f / 50.f ) ); + frustumchunkmax = 50.f * glm::ceil( frustumchunkmax * ( 1.f / 50.f ) ); + // ...use the dimensions to set up light projection boundaries... // NOTE: since we only have one cascade map stage, we extend the chunk forward/back to catch areas normally covered by other stages - auto const quantizationstep = ( Global::shadowtune.depth + 1000.f ) / m_shadowbuffersize; - frustumchunkmin.x -= std::remainder( frustumchunkmin.x, quantizationstep ); - frustumchunkmin.y -= std::remainder( frustumchunkmin.y, quantizationstep ); - frustumchunkmax.x -= std::remainder( frustumchunkmax.x, quantizationstep ); - frustumchunkmax.y -= std::remainder( frustumchunkmax.y, quantizationstep ); camera.projection() *= glm::ortho( frustumchunkmin.x, frustumchunkmax.x, frustumchunkmin.y, frustumchunkmax.y, frustumchunkmin.z - 500.f, frustumchunkmax.z + 500.f ); +/* + // fixed ortho projection from old build, for quick quality comparisons + camera.projection() *= + glm::ortho( + -Global::shadowtune.width, Global::shadowtune.width, + -Global::shadowtune.width, Global::shadowtune.width, + -Global::shadowtune.depth, Global::shadowtune.depth ); + camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction }; + if( camera.position().y - Global::pCameraPosition.y < 0.1 ) { + camera.position().y = Global::pCameraPosition.y + 0.1; + } + viewmatrix *= glm::lookAt( + camera.position(), + glm::dvec3{ Global::pCameraPosition }, + glm::dvec3{ 0.f, 1.f, 0.f } ); +*/ + // ... and adjust the projection to sample complete shadow map texels: + // get coordinates for a sample texel... + auto shadowmaptexel = glm::vec2 { camera.projection() * glm::mat4{ viewmatrix } * glm::vec4{ 0.f, 0.f, 0.f, 1.f } }; + // ...convert result from clip space to texture coordinates, and calculate adjustment... + shadowmaptexel *= m_shadowbuffersize * 0.5f; + auto shadowmapadjustment = glm::round( shadowmaptexel ) - shadowmaptexel; + // ...transform coordinate change back to homogenous light space... + shadowmapadjustment /= m_shadowbuffersize * 0.5f; + // ... and bake the adjustment into the projection matrix + camera.projection() = glm::translate( glm::mat4{ 1.f }, glm::vec3{ shadowmapadjustment, 0.f } ) * camera.projection(); + break; } case rendermode::reflections: { diff --git a/renderer.h b/renderer.h index e8582afc..e8613eb6 100644 --- a/renderer.h +++ b/renderer.h @@ -21,7 +21,7 @@ http://mozilla.org/MPL/2.0/. #define EU07_USE_PICKING_FRAMEBUFFER //#define EU07_USE_DEBUG_SHADOWMAP -//#define EU07_USE_DEBUG_CAMERA +#define EU07_USE_DEBUG_CAMERA //#define EU07_USE_DEBUG_CULLING struct opengl_light { diff --git a/version.h b/version.h index 9aaf2c1a..740b7596 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1102 +#define VERSION_MINOR 1112 #define VERSION_REVISION 0 From 672b34ef54c64f0799c937783f01c1ce38bccf13 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 12 Nov 2017 20:39:28 +0100 Subject: [PATCH 223/426] build 171112: partial shadow stabilization, support for vehicle type-specific load models --- DynObj.cpp | 12 +++++++++--- renderer.cpp | 40 +++++++++++++++++++++++++++++++++------- version.h | 2 +- 3 files changed, 43 insertions(+), 11 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 58ae59fa..b2c9de30 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1943,7 +1943,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" 0.0f ); } ++compartmentindex; - } while( submodel != nullptr ); + } while( ( submodel != nullptr ) + || ( compartmentindex < 2 ) ); // chain can start from prefix00 or prefix01 } } // wyszukiwanie zderzakow @@ -4014,8 +4015,13 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } else { // Ra: tu wczytywanie modelu ładunku jest w porządku - if( false == asLoadName.empty() ) { - mdLoad = TModelsManager::GetModel( asLoadName, true ); // ladunek + if( false == asLoadName.empty() ) { + // try first specialized version of the load model, vehiclename_loadname + mdLoad = TModelsManager::GetModel( BaseDir + TypeName + "_" + MoverParameters->LoadType + ".t3d", true ); + if( mdLoad == nullptr ) { + // if this fails, try generic load model + mdLoad = TModelsManager::GetModel( asLoadName, true ); + } } } } diff --git a/renderer.cpp b/renderer.cpp index e66f60b5..6f531b8b 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -484,7 +484,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glEnable( GL_SCISSOR_TEST ); setup_matrices(); ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting - ::glPolygonOffset( 2.f, 2.f ); + ::glPolygonOffset( 1.f, 1.f ); // render // opaque parts... setup_drawing( false ); @@ -663,6 +663,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f } case rendermode::shadows: { + // calculate lightview boundaries based on relevant area of the world camera frustum: // ...setup chunk of frustum we're interested in... auto const znear = 0.f; @@ -695,18 +696,43 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f point = lightviewmatrix * point; } bounding_box( frustumchunkmin, frustumchunkmax, std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); - // ...use the dimensions to set up light projection boundaries + // quantize the frustum points with 50 m resolution, to reduce shadow shimmer on scale/orientation changes + frustumchunkmin = 50.f * glm::floor( frustumchunkmin * ( 1.f / 50.f ) ); + frustumchunkmax = 50.f * glm::ceil( frustumchunkmax * ( 1.f / 50.f ) ); + // ...use the dimensions to set up light projection boundaries... // NOTE: since we only have one cascade map stage, we extend the chunk forward/back to catch areas normally covered by other stages - auto const quantizationstep = ( Global::shadowtune.depth + 1000.f ) / m_shadowbuffersize; - frustumchunkmin.x -= std::remainder( frustumchunkmin.x, quantizationstep ); - frustumchunkmin.y -= std::remainder( frustumchunkmin.y, quantizationstep ); - frustumchunkmax.x -= std::remainder( frustumchunkmax.x, quantizationstep ); - frustumchunkmax.y -= std::remainder( frustumchunkmax.y, quantizationstep ); camera.projection() *= glm::ortho( frustumchunkmin.x, frustumchunkmax.x, frustumchunkmin.y, frustumchunkmax.y, frustumchunkmin.z - 500.f, frustumchunkmax.z + 500.f ); +/* + // fixed ortho projection from old build, for quick quality comparisons + camera.projection() *= + glm::ortho( + -Global::shadowtune.width, Global::shadowtune.width, + -Global::shadowtune.width, Global::shadowtune.width, + -Global::shadowtune.depth, Global::shadowtune.depth ); + camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction }; + if( camera.position().y - Global::pCameraPosition.y < 0.1 ) { + camera.position().y = Global::pCameraPosition.y + 0.1; + } + viewmatrix *= glm::lookAt( + camera.position(), + glm::dvec3{ Global::pCameraPosition }, + glm::dvec3{ 0.f, 1.f, 0.f } ); +*/ + // ... and adjust the projection to sample complete shadow map texels: + // get coordinates for a sample texel... + auto shadowmaptexel = glm::vec2 { camera.projection() * glm::mat4{ viewmatrix } * glm::vec4{ 0.f, 0.f, 0.f, 1.f } }; + // ...convert result from clip space to texture coordinates, and calculate adjustment... + shadowmaptexel *= m_shadowbuffersize * 0.5f; + auto shadowmapadjustment = glm::round( shadowmaptexel ) - shadowmaptexel; + // ...transform coordinate change back to homogenous light space... + shadowmapadjustment /= m_shadowbuffersize * 0.5f; + // ... and bake the adjustment into the projection matrix + camera.projection() = glm::translate( glm::mat4{ 1.f }, glm::vec3{ shadowmapadjustment, 0.f } ) * camera.projection(); + break; } case rendermode::reflections: { diff --git a/version.h b/version.h index 9aaf2c1a..740b7596 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1102 +#define VERSION_MINOR 1112 #define VERSION_REVISION 0 From bc43c21174406883b07324a2ced50b8b344c96db Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 19 Nov 2017 16:02:12 +0100 Subject: [PATCH 224/426] audio subsystem: openal emitter, minor audio fixes --- Button.cpp | 1 + DynObj.cpp | 73 ++++++++++++++++++--- Globals.cpp | 32 +-------- Globals.h | 22 +------ McZapkie/MOVER.h | 22 +++---- ResourceManager.h | 7 ++ Texture.h | 3 +- Train.cpp | 66 +++++++------------ Train.h | 2 +- World.cpp | 25 +++---- World.h | 7 +- audio.cpp | 33 ++++++---- audio.h | 6 ++ audiorenderer.cpp | 132 ++++++++++++++++++++++++++++++++++++- audiorenderer.h | 76 +++++++++++++++++++++- maszyna.vcxproj.filters | 10 +-- openglgeometrybank.cpp | 2 +- openglgeometrybank.h | 2 +- renderer.cpp | 7 +- renderer.h | 2 +- simulation.cpp | 5 +- sound.cpp | 140 ++++++++++++++++++++++++++++++++++++++-- sound.h | 48 +++++++++++--- sun.cpp | 25 +++++-- 24 files changed, 566 insertions(+), 182 deletions(-) diff --git a/Button.cpp b/Button.cpp index 22cfe6c4..c7b501a4 100644 --- a/Button.cpp +++ b/Button.cpp @@ -46,6 +46,7 @@ void TButton::Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2) { else { // new, block type config // TODO: rework the base part into yaml-compatible flow style mapping + submodelname = Parser.getToken( false ); while( true == Load_mapping( Parser ) ) { ; // all work done by while() } diff --git a/DynObj.cpp b/DynObj.cpp index ad105306..c1846335 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3354,6 +3354,7 @@ bool TDynamicObject::Update(double dt, double dt1) #ifdef EU07_USE_OLD_SOUNDCODE rsDoorOpen.Play(1, 0, MechInside, vPosition); #else + rsDoorClose.stop(); rsDoorOpen.play(); #endif dDoorMoveL += dt1 * 0.5 * MoverParameters->DoorOpenSpeed; @@ -3363,6 +3364,7 @@ bool TDynamicObject::Update(double dt, double dt1) #ifdef EU07_USE_OLD_SOUNDCODE rsDoorClose.Play(1, 0, MechInside, vPosition); #else + rsDoorOpen.stop(); rsDoorClose.play(); #endif dDoorMoveL -= dt1 * MoverParameters->DoorCloseSpeed; @@ -3374,6 +3376,7 @@ bool TDynamicObject::Update(double dt, double dt1) #ifdef EU07_USE_OLD_SOUNDCODE rsDoorOpen.Play(1, 0, MechInside, vPosition); #else + rsDoorClose.stop(); rsDoorOpen.play(); #endif dDoorMoveR += dt1 * 0.5 * MoverParameters->DoorOpenSpeed; @@ -3383,6 +3386,7 @@ bool TDynamicObject::Update(double dt, double dt1) #ifdef EU07_USE_OLD_SOUNDCODE rsDoorClose.Play(1, 0, MechInside, vPosition); #else + rsDoorOpen.stop(); rsDoorClose.play(); #endif dDoorMoveR -= dt1 * MoverParameters->DoorCloseSpeed; @@ -3849,16 +3853,70 @@ void TDynamicObject::RenderSounds() { if (GetVelocity() == 0) rsDerailment.Stop(); } +#else +// McZapkie! - dzwiek compressor.wav tylko gdy dziala sprezarka +if( MoverParameters->VeselVolume != 0 ) { + + if( MoverParameters->TrainType != dt_PseudoDiesel ) { + // NBMX dzwiek przetwornicy + if( MoverParameters->ConverterFlag ) { + sConverter.play(); + } + else { + sConverter.stop(); + } + } + else { + } + + if( MoverParameters->CompressorFlag ) { + sCompressor.play(); + } + else { + sCompressor.stop(); + } + if( MoverParameters->PantCompFlag ) { + // Winger 160404 - dzwiek malej sprezarki + sSmallCompressor.play(); + } + else { + sSmallCompressor.stop(); + } + + + if( TestFlag( MoverParameters->WarningSignal, 1 ) ) { + sHorn1.play(); + } + else { + sHorn1.stop(); + } + if( TestFlag( MoverParameters->WarningSignal, 2 ) ) { + sHorn2.play(); + } + else { + sHorn2.stop(); + } + + if( MoverParameters->DoorClosureWarning ) { + if( MoverParameters->DepartureSignal ) { + // NBMX sygnal odjazdu + // MC: pod warunkiem ze jest zdefiniowane w chk + sDepartureSignal.play(); + } + else { + sDepartureSignal.stop(); + } + } + +} #endif }; // McZapkie-250202 // wczytywanie pliku z danymi multimedialnymi (dzwieki) -void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, - std::string ReplacableSkin) -{ +void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, std::string ReplacableSkin ) { + double dSDist; - // asBaseDir=BaseDir; Global::asCurrentDynamicPath = BaseDir; std::string asFileName = BaseDir + TypeName + ".mmd"; std::string asLoadName; @@ -3898,8 +3956,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } m_materialdata.multi_textures = clamp( m_materialdata.multi_textures, 0, 1 ); // na razie ustawiamy na 1 } - asModel = BaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje - // modele w dynamics/basedir + asModel = BaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje modele w dynamics/basedir Global::asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... mdModel = TModelsManager::GetModel(asModel, true); assert( mdModel != nullptr ); // TODO: handle this more gracefully than all going to shit @@ -4757,9 +4814,8 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, } else if( token == "curve:" ) { - - double attenuation; #ifdef EU07_USE_OLD_SOUNDCODE + double attenuation; parser.getTokens( 2, false ); parser >> token @@ -4959,6 +5015,7 @@ void TDynamicObject::LoadMMediaFile(std::string BaseDir, std::string TypeName, mdLowPolyInt->Init(); Global::asCurrentTexturePath = szTexturePath; // kiedyś uproszczone wnętrze mieszało tekstury nieba + Global::asCurrentDynamicPath = ""; } //--------------------------------------------------------------------------- diff --git a/Globals.cpp b/Globals.cpp index 43c66c17..8bf348b4 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -53,19 +53,15 @@ std::string Global::szTexturesDDS = ".dds"; // lista tekstur od DDS int Global::iPause = 0; // 0x10; // globalna pauza ruchu bool Global::bActive = true; // czy jest aktywnym oknem TWorld *Global::pWorld = NULL; -cParser *Global::pParser = NULL; TCamera *Global::pCamera = NULL; // parametry kamery -TDynamicObject *Global::pUserDynamic = NULL; // pojazd użytkownika, renderowany bez trzęsienia TTranscripts Global::tranTexts; // obiekt obsługujący stenogramy dźwięków na ekranie float4 Global::UITextColor = float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); -// parametry scenerii vector3 Global::pCameraPosition; vector3 Global::DebugCameraPosition; -double Global::pCameraRotation; -double Global::pCameraRotationDeg; std::vector Global::FreeCameraInit; std::vector Global::FreeCameraInitAngle; +// parametry scenerii GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; double Global::fFogStart = 1700; double Global::fFogEnd = 2000; @@ -127,8 +123,6 @@ bool Global::bGlutFont = false; // czy tekst generowany przez GLUT32.DLL int Global::iConvertModels{ 0 }; // temporary override, to prevent generation of .e3d not compatible with old exe int Global::iSlowMotionMask = -1; // maska wyłączanych właściwości dla zwiększenia FPS // bool Global::bTerrainCompact=true; //czy zapisać teren w pliku -TAnimModel *Global::pTerrainCompact = NULL; // do zapisania terenu w pliku -std::string Global::asTerrainModel = ""; // nazwa obiektu terenu do zapisania w pliku double Global::fFpsAverage = 20.0; // oczekiwana wartosć FPS double Global::fFpsDeviation = 5.0; // odchylenie standardowe FPS double Global::fFpsMin = 30.0; // dolna granica FPS, przy której promień scenerii będzie zmniejszany @@ -965,16 +959,6 @@ void Global::SetCameraPosition(vector3 pNewCameraPosition) pCameraPosition = pNewCameraPosition; } -void Global::SetCameraRotation(double Yaw) -{ // ustawienie bezwzględnego kierunku kamery z korekcją do przedziału <-M_PI,M_PI> - pCameraRotation = Yaw; - while (pCameraRotation < -M_PI) - pCameraRotation += 2 * M_PI; - while (pCameraRotation > M_PI) - pCameraRotation -= 2 * M_PI; - pCameraRotationDeg = pCameraRotation * 180.0 / M_PI; -} - void Global::TrainDelete(TDynamicObject *d) { // usunięcie pojazdu prowadzonego przez użytkownika if (pWorld) @@ -983,20 +967,6 @@ void Global::TrainDelete(TDynamicObject *d) //--------------------------------------------------------------------------- -bool Global::DoEvents() -{ // wywoływać czasem, żeby nie robił wrażenia zawieszonego - MSG msg; - while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) - { - if (msg.message == WM_QUIT) - return FALSE; - TranslateMessage(&msg); - DispatchMessage(&msg); - } - return TRUE; -} -//--------------------------------------------------------------------------- - TTranscripts::TTranscripts() { /* diff --git a/Globals.h b/Globals.h index 1dba16ae..9c7fe26a 100644 --- a/Globals.h +++ b/Globals.h @@ -10,10 +10,8 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include + #include "renderer.h" -#include "glfw/glfw3.h" -#include "gl/glew.h" #include "dumb3d.h" // definicje klawiszy @@ -113,16 +111,6 @@ const int k_WalkMode = 73; int const k_DimHeadlights = 74; const int MaxKeys = 75; -// klasy dla wskaźników globalnych -/* -class TGround; -class TWorld; -class TCamera; -class TDynamicObject; -class TAnimModel; // obiekt terenu -class cParser; // nowy (powolny!) parser -class TEvent; -*/ class TTranscript { // klasa obsługująca linijkę napisu do dźwięku public: @@ -159,9 +147,7 @@ public: static void InitKeys(); inline static Math3D::vector3 GetCameraPosition() { return pCameraPosition; }; static void SetCameraPosition(Math3D::vector3 pNewCameraPosition); - static void SetCameraRotation(double Yaw); static void TrainDelete(TDynamicObject *d); - static bool DoEvents(); static std::string Bezogonkow(std::string str, bool _ = false); static double Min0RSpeed(double vel1, double vel2); @@ -170,8 +156,6 @@ public: static bool RealisticControlMode; // controls ability to steer the vehicle from outside views static Math3D::vector3 pCameraPosition; // pozycja kamery w świecie static Math3D::vector3 DebugCameraPosition; // pozycja kamery w świecie - static double pCameraRotation; // kierunek bezwzględny kamery w świecie: 0=północ, 90°=zachód (-azymut) - static double pCameraRotationDeg; // w stopniach, dla animacji billboard static std::vector FreeCameraInit; // pozycje kamery static std::vector FreeCameraInitAngle; static int iWindowWidth; @@ -272,16 +256,12 @@ public: static bool bHideConsole; // hunter-271211: ukrywanie konsoli static TWorld *pWorld; // wskaźnik na świat do usuwania pojazdów - static TAnimModel *pTerrainCompact; // obiekt terenu do ewentualnego zapisania w pliku - static std::string asTerrainModel; // nazwa obiektu terenu do zapisania w pliku static bool bRollFix; // czy wykonać przeliczanie przechyłki - static cParser *pParser; static double fFpsAverage; // oczekiwana wartosć FPS static double fFpsDeviation; // odchylenie standardowe FPS static double fFpsMin; // dolna granica FPS, przy której promień scenerii będzie zmniejszany static double fFpsMax; // górna granica FPS, przy której promień scenerii będzie zwiększany static TCamera *pCamera; // parametry kamery - static TDynamicObject *pUserDynamic; // pojazd użytkownika, renderowany bez trzęsienia static double fCalibrateIn[6][6]; // parametry kalibracyjne wejść z pulpitu static double fCalibrateOut[7][6]; // parametry kalibracyjne wyjść dla pulpitu static double fCalibrateOutMax[7]; // wartości maksymalne wyjść dla pulpitu diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index ce949609..e63e297d 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -547,18 +547,18 @@ struct TMotorParameters struct TSecuritySystem { - int SystemType; /*0: brak, 1: czuwak aktywny, 2: SHP/sygnalizacja kabinowa*/ - double AwareDelay; // czas powtarzania czuwaka + int SystemType { 0 }; /*0: brak, 1: czuwak aktywny, 2: SHP/sygnalizacja kabinowa*/ + double AwareDelay { -1.0 }; // czas powtarzania czuwaka double AwareMinSpeed; // minimalna prędkość załączenia czuwaka, normalnie 10% Vmax - double SoundSignalDelay; - double EmergencyBrakeDelay; - int Status; /*0: wylaczony, 1: wlaczony, 2: czuwak, 4: shp, 8: alarm, 16: hamowanie awaryjne*/ - double SystemTimer; - double SystemSoundCATimer; - double SystemSoundSHPTimer; - double SystemBrakeCATimer; - double SystemBrakeSHPTimer; - double SystemBrakeCATestTimer; // hunter-091012 + double SoundSignalDelay { -1.0 }; + double EmergencyBrakeDelay { -1.0 }; + int Status { 0 }; /*0: wylaczony, 1: wlaczony, 2: czuwak, 4: shp, 8: alarm, 16: hamowanie awaryjne*/ + double SystemTimer { 0.0 }; + double SystemSoundCATimer { 0.0 }; + double SystemSoundSHPTimer { 0.0 }; + double SystemBrakeCATimer { 0.0 }; + double SystemBrakeSHPTimer { 0.0 }; + double SystemBrakeCATestTimer { 0.0 }; // hunter-091012 int VelocityAllowed; int NextVelocityAllowed; /*predkosc pokazywana przez sygnalizacje kabinowa*/ bool RadioStop; // czy jest RadioStop diff --git a/ResourceManager.h b/ResourceManager.h index 2d467e19..92fec3ca 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -9,6 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once +int const null_handle = 0; + enum class resource_state { none, loading, @@ -64,6 +66,11 @@ class ResourceManager }; */ +using resource_timestamp = std::chrono::steady_clock::time_point; + +// takes containers providing access to specific element through operator[] +// with elements of std::pair +// the element should provide method release() freeing resources owned by the element template class garbage_collector { diff --git a/Texture.h b/Texture.h index c9bd5c7b..da69e063 100644 --- a/Texture.h +++ b/Texture.h @@ -71,7 +71,6 @@ private: }; typedef int texture_handle; -int const null_handle = 0; class texture_manager { @@ -104,7 +103,7 @@ private: // types: typedef std::pair< opengl_texture *, - std::chrono::steady_clock::time_point > texturetimepoint_pair; + resource_timestamp > texturetimepoint_pair; typedef std::vector< texturetimepoint_pair > texturetimepointpair_sequence; diff --git a/Train.cpp b/Train.cpp index 02d9c241..81ceec1d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4490,6 +4490,7 @@ bool TTrain::Update( double const Deltatime ) } else btLampkaCzuwaka.Turn( false ); + btLampkaSHP.Turn(TestFlag(mvOccupied->SecuritySystem.Status, s_active)); } else // wylaczone @@ -5604,50 +5605,34 @@ TTrain::update_sounds( double const Deltatime ) { if( dsbSlipAlarm ) dsbSlipAlarm->Stop(); } - +#endif // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa if (mvOccupied->SecuritySystem.Status > 0) { // hunter-091012: rozdzielenie alarmow - if (TestFlag(mvOccupied->SecuritySystem.Status, s_CAalarm) || - TestFlag(mvOccupied->SecuritySystem.Status, s_SHPalarm)) - { - if (dsbBuzzer) - { - dsbBuzzer->GetStatus(&stat); - if (!(stat & DSBSTATUS_PLAYING)) - { - play_sound( dsbBuzzer, DSBVOLUME_MAX, DSBPLAY_LOOPING ); - Console::BitsSet(1 << 14); // ustawienie bitu 16 na PoKeys - } - } - } - else - { - if (dsbBuzzer) - { - dsbBuzzer->GetStatus(&stat); - if (stat & DSBSTATUS_PLAYING) - { - dsbBuzzer->Stop(); - Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys - } - } - } - } - else // wylaczone - { - if (dsbBuzzer) - { - dsbBuzzer->GetStatus(&stat); - if (stat & DSBSTATUS_PLAYING) - { - dsbBuzzer->Stop(); - Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys - } - } - } + if( TestFlag( mvOccupied->SecuritySystem.Status, s_CAalarm ) + || TestFlag( mvOccupied->SecuritySystem.Status, s_SHPalarm ) ) { + if( false == dsbBuzzer.is_playing() ) { + dsbBuzzer.play( sound_flags::looping ); + Console::BitsSet( 1 << 14 ); // ustawienie bitu 16 na PoKeys + } + } + else { + if( true == dsbBuzzer.is_playing() ) { + dsbBuzzer.stop(); + Console::BitsClear( 1 << 14 ); // ustawienie bitu 16 na PoKeys + } + } + } + else { + // wylaczone + if( true == dsbBuzzer.is_playing() ) { + dsbBuzzer.stop(); + Console::BitsClear( 1 << 14 ); // ustawienie bitu 16 na PoKeys + } + } +#ifdef EU07_USE_OLD_SOUNDCODE /* if ((mvControlled->Mains) && (mvControlled->EngineType==ElectricSeriesMotor)) { @@ -5755,7 +5740,6 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) if (token == "internaldata:") { - do { token = ""; @@ -5964,7 +5948,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) rsFadeSound.FM = 1.0; rsFadeSound.FA = 1.0; */ - rsFadeSound.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + rsFadeSound.deserialize( parser, sound_type::single ); } else if (token == "localbrakesound:") { diff --git a/Train.h b/Train.h index 693ad396..fd1bd4fb 100644 --- a/Train.h +++ b/Train.h @@ -453,7 +453,7 @@ private: float fCzuwakTestTimer; // hunter-091012: do testu czuwaka float fLightsTimer; // yB 150617: timer do swiatel - int CAflag; // hunter-131211: dla osobnego zbijania CA i SHP + bool CAflag { false }; // hunter-131211: dla osobnego zbijania CA i SHP double fPoslizgTimer; TTrack *tor; diff --git a/World.cpp b/World.cpp index 45470e8c..4c003b34 100644 --- a/World.cpp +++ b/World.cpp @@ -77,7 +77,7 @@ simulation_time::init() { m_time.wSecond = 0; } - m_yearday = yearday( m_time.wDay, m_time.wMonth, m_time.wYear ); + m_yearday = year_day( m_time.wDay, m_time.wMonth, m_time.wYear ); } void @@ -125,16 +125,15 @@ simulation_time::update( double const Deltatime ) { } int -simulation_time::yearday( int Day, const int Month, const int Year ) { +simulation_time::year_day( int Day, const int Month, const int Year ) const { - char daytab[ 2 ][ 13 ] = { + char const daytab[ 2 ][ 13 ] = { { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; - int i, leap; - leap = ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ); - for( i = 1; i < Month; ++i ) + int leap { ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ) }; + for( int i = 1; i < Month; ++i ) Day += daytab[ leap ][ i ]; return Day; @@ -215,7 +214,6 @@ void TWorld::TrainDelete(TDynamicObject *d) Train = NULL; Controlled = NULL; // tego też już nie ma mvControlled = NULL; - Global::pUserDynamic = NULL; // tego też nie ma }; bool TWorld::Init( GLFWwindow *Window ) { @@ -267,7 +265,6 @@ bool TWorld::Init( GLFWwindow *Window ) { { Controlled = Train->Dynamic(); mvControlled = Controlled->ControlledFind()->MoverParameters; - Global::pUserDynamic = Controlled; // renerowanie pojazdu względem kabiny WriteLog("Player train init OK"); glfwSetWindowTitle( window, ( Global::AppName + " (" + Controlled->MoverParameters->Name + " @ " + Global::SceneryFile + ")" ).c_str() ); @@ -771,7 +768,6 @@ void TWorld::InOutKey( bool const Near ) FreeFlyModeFlag = !FreeFlyModeFlag; // zmiana widoku if (FreeFlyModeFlag) { // jeżeli poza kabiną, przestawiamy w jej okolicę - OK - Global::pUserDynamic = NULL; // bez renderowania względem kamery if (Train) { // cache current cab position so there's no need to set it all over again after each out-in switch Train->pMechSittingPosition = Train->pMechOffset; @@ -787,7 +783,6 @@ void TWorld::InOutKey( bool const Near ) { // jazda w kabinie if (Train) { - Global::pUserDynamic = Controlled; // renerowanie względem kamery Train->Dynamic()->bDisplayCab = true; Train->Dynamic()->ABuSetModelShake( vector3(0, 0, 0)); // zerowanie przesunięcia przed powrotem? @@ -1061,6 +1056,8 @@ bool TWorld::Update() { Timer::subsystem.sim_total.stop(); simulation::Region->update_sounds(); + audio::renderer.update( dt ); + GfxRenderer.Update( dt ); ResourceSweep(); @@ -1136,12 +1133,10 @@ TWorld::Update_Camera( double const Deltatime ) { else if( Global::shiftState ) { // patrzenie w bok przez szybę Camera.LookAt = Camera.Pos - ( lr ? -1 : 1 ) * Train->Dynamic()->VectorLeft() * Train->Dynamic()->MoverParameters->ActiveCab; - Global::SetCameraRotation( -modelrotate ); } else { // patrzenie w kierunku osi pojazdu, z uwzględnieniem kabiny - jakby z lusterka, // ale bez odbicia Camera.LookAt = Camera.Pos - Train->GetDirection() * Train->Dynamic()->MoverParameters->ActiveCab; //-1 albo 1 - Global::SetCameraRotation( M_PI - modelrotate ); // tu już trzeba uwzględnić lusterka } Camera.Roll = std::atan( Train->pMechShake.x * Train->fMechRoll ); // hustanie kamery na boki Camera.Pitch = 0.5 * std::atan( Train->vMechVelocity.z * Train->fMechPitch ); // hustanie kamery przod tyl @@ -1174,11 +1169,10 @@ TWorld::Update_Camera( double const Deltatime ) { else // patrzenie w kierunku osi pojazdu, z uwzględnieniem kabiny Camera.LookAt = Train->GetWorldMechPosition() + Train->GetDirection() * 5.0 * Train->Dynamic()->MoverParameters->ActiveCab; //-1 albo 1 Camera.vUp = Train->GetUp(); - Global::SetCameraRotation( Camera.Yaw - modelrotate ); // tu już trzeba uwzględnić lusterka } } - else { // kamera nieruchoma - Global::SetCameraRotation( Camera.Yaw - M_PI ); + else { + // kamera nieruchoma } // all done, update camera position to the new value Global::pCameraPosition = Camera.Pos; @@ -2118,7 +2112,6 @@ void TWorld::ChangeDynamic() { Train->Dynamic()->asBaseDir + Train->Dynamic()->MoverParameters->TypeName + ".mmd" ); if( !FreeFlyModeFlag ) { - Global::pUserDynamic = Controlled; // renerowanie względem kamery Train->Dynamic()->bDisplayCab = true; Train->Dynamic()->ABuSetModelShake( vector3( 0, 0, 0 ) ); // zerowanie przesunięcia przed powrotem? diff --git a/World.h b/World.h index 9acc2581..09c9dae9 100644 --- a/World.h +++ b/World.h @@ -39,13 +39,13 @@ public: second() const { return ( m_time.wMilliseconds * 0.001 + m_time.wSecond ); } int year_day() const { return m_yearday; } + // helper, calculates day of year from given date + int + year_day( int Day, int const Month, int const Year ) const; int julian_day() const; private: - // calculates day of year from given date - int - yearday( int Day, int const Month, int const Year ); // calculates day and month from given day of year void daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ); @@ -115,7 +115,6 @@ TWorld(); // calculates current season of the year based on set simulation date void compute_season( int const Yearday ) const; - private: void Update_Environment(); void Update_Camera( const double Deltatime ); diff --git a/audio.cpp b/audio.cpp index ecb69a1f..673b64f1 100644 --- a/audio.cpp +++ b/audio.cpp @@ -98,7 +98,7 @@ buffer_manager::~buffer_manager() { } // creates buffer object out of data stored in specified file. returns: handle to the buffer or null_handle if creation failed -buffer_handle +audio::buffer_handle buffer_manager::create( std::string const &Filename ) { auto filename { ToLower( Filename ) }; @@ -114,14 +114,18 @@ buffer_manager::create( std::string const &Filename ) { std::begin( filename ), std::end( filename ), '\\', '/' ); - // try dynamic-specific sounds first - auto lookup { find_buffer( Global::asCurrentDynamicPath + filename ) }; - if( lookup != null_handle ) { - return lookup; - } - std::string filelookup { find_file( Global::asCurrentDynamicPath + filename ) }; - if( false == filelookup.empty() ) { - return emplace( filelookup ); + audio::buffer_handle lookup { null_handle }; + std::string filelookup; + if( false == Global::asCurrentDynamicPath.empty() ) { + // try dynamic-specific sounds first + lookup = find_buffer( Global::asCurrentDynamicPath + filename ); + if( lookup != null_handle ) { + return lookup; + } + filelookup = find_file( Global::asCurrentDynamicPath + filename ); + if( false == filelookup.empty() ) { + return emplace( filelookup ); + } } // if dynamic-specific lookup finds nothing, try the default sound folder lookup = find_buffer( szSoundPath + filename ); @@ -136,8 +140,15 @@ buffer_manager::create( std::string const &Filename ) { return null_handle; } +// provides direct access to a specified buffer +audio::openal_buffer const & +buffer_manager::buffer( audio::buffer_handle const Buffer ) const { + + return m_buffers[ Buffer ]; +} + // places in the bank a buffer containing data stored in specified file. returns: handle to the buffer -buffer_handle +audio::buffer_handle buffer_manager::emplace( std::string Filename ) { buffer_handle const handle { m_buffers.size() }; @@ -151,7 +162,7 @@ buffer_manager::emplace( std::string Filename ) { return handle; } -buffer_handle +audio::buffer_handle buffer_manager::find_buffer( std::string const &Buffername ) const { auto lookup = m_buffermappings.find( Buffername ); diff --git a/audio.h b/audio.h index fd944367..a907a41d 100644 --- a/audio.h +++ b/audio.h @@ -16,6 +16,7 @@ namespace audio { ALuint const null_resource { ~ALuint{ 0 } }; +// wrapper for audio sample struct openal_buffer { // members ALuint id { null_resource }; // associated AL resource @@ -36,6 +37,8 @@ private: using buffer_handle = std::size_t; + +// class buffer_manager { public: @@ -47,6 +50,9 @@ public: // creates buffer object out of data stored in specified file. returns: handle to the buffer or null_handle if creation failed buffer_handle create( std::string const &Filename ); + // provides direct access to a specified buffer + audio::openal_buffer const & + buffer( audio::buffer_handle const Buffer ) const; private: // types diff --git a/audiorenderer.cpp b/audiorenderer.cpp index aa06766b..2a1df7a7 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -10,12 +10,88 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "audiorenderer.h" +#include "sound.h" #include "logs.h" namespace audio { openal_renderer renderer; +// starts playback of queued buffers +void +openal_source::play() { + + ::alSourcePlay( id ); + is_playing = true; +} + +// stops the playback +void +openal_source::stop() { + + ::alSourcei( id, AL_LOOPING, AL_FALSE ); + ::alSourceStop( id ); + // NOTE: we don't update the is_playing flag + // this way the state will change only on next update loop, + // giving the controller a chance to properly change state from cease to none + // even with multiple active sounds under control +} + +// updates state of the source +void +openal_source::update( int const Deltatime ) { + + // TODO: test whether the emitter was within range during the last tick, potentially update the counter and flag it for timeout + ::alGetSourcei( id, AL_BUFFERS_PROCESSED, &buffer_index ); + // for multipart sounds trim away processed sources until only one remains, the last one may be set to looping by the controller + ALuint bufferid; + while( ( buffer_index > 0 ) + && ( buffers.size() > 1 ) ) { + ::alSourceUnqueueBuffers( id, 1, &bufferid ); + buffers.erase( std::begin( buffers ) ); + --buffer_index; + } + int state; + ::alGetSourcei( id, AL_SOURCE_STATE, &state ); + is_playing = ( state == AL_PLAYING ); + // request instructions from the controller + controller->update( *this ); +} + +// toggles looping of the sound emitted by the source +void +openal_source::loop( bool const State ) { + + ::alSourcei( + id, + AL_LOOPING, + ( State ? + AL_TRUE : + AL_FALSE ) ); +} + +// releases bound buffers and resets state of the class variables +// NOTE: doesn't release allocated implementation-side source +void +openal_source::clear() { + + controller = nullptr; + // unqueue bound buffers: + // ensure no buffer is in use... + ::alSourcei( id, AL_LOOPING, AL_FALSE ); + ::alSourceStop( id ); + is_playing = false; + // ...prepare space for returned ids of unqueued buffers (not that we need that info)... + std::vector bufferids; + bufferids.resize( buffers.size() ); + // ...release the buffers and update source data to match + ::alSourceUnqueueBuffers( id, bufferids.size(), bufferids.data() ); + buffers.clear(); + buffer_index = 0; +} + + + openal_renderer::~openal_renderer() { ::alcMakeContextCurrent( nullptr ); @@ -24,12 +100,19 @@ openal_renderer::~openal_renderer() { if( m_device != nullptr ) { ::alcCloseDevice( m_device ); } } -buffer_handle +audio::buffer_handle openal_renderer::fetch_buffer( std::string const &Filename ) { return m_buffers.create( Filename ); } +// provides direct access to a specified buffer +audio::openal_buffer const & +openal_renderer::buffer( audio::buffer_handle const Buffer ) const { + + return m_buffers.buffer( Buffer ); +} + // initializes the service bool openal_renderer::init() { @@ -42,11 +125,56 @@ openal_renderer::init() { // basic initialization failed return false; } - + // all done m_ready = true; return true; } +// schedules playback of specified sample, under control of the specified emitter +void +openal_renderer::insert( sound_source *Controller, audio::buffer_handle const Sound ) { + + audio::openal_source::buffer_sequence buffers { Sound }; + return + insert( + Controller, + std::begin( buffers ), std::end( buffers ) ); +} + +// updates state of all active emitters +void +openal_renderer::update( int const Deltatime ) { + + auto source { std::begin( m_sources ) }; + while( source != std::end( m_sources ) ) { + // update each source + source->update( Deltatime ); + // if after the update the source isn't playing, put it away on the spare stack, it's done + if( false == source->is_playing ) { + source->clear(); + m_sourcespares.push( *source ); + source = m_sources.erase( source ); + } + else { + // otherwise proceed through the list normally + ++source; + } + } +} + +// returns an instance of implementation-side part of the sound emitter +audio::openal_source +openal_renderer::fetch_source() { + + audio::openal_source soundsource; + if( false == m_sourcespares.empty() ) { + // reuse (a copy of) already allocated source + soundsource = m_sourcespares.top(); + m_sourcespares.pop(); + } + return soundsource; +} + bool openal_renderer::init_caps() { diff --git a/audiorenderer.h b/audiorenderer.h index 8e52e016..ddc8ed57 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -10,9 +10,60 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "audio.h" +#include "resourcemanager.h" + +class sound_source; namespace audio { +// implementation part of the sound emitter +// TODO: generic interface base, for implementations other than openAL +struct openal_source { + +// types + using buffer_sequence = std::vector; + +// members + ALuint id { audio::null_resource }; // associated AL resource + sound_source *controller { nullptr }; // source controller + buffer_sequence buffers; // sequence of samples the source will emit + int buffer_index; // currently queued sample from the buffer sequence + bool is_playing { false }; + +// methods + template + openal_source & + bind( sound_source *Controller, Iterator_ First, Iterator_ Last ) { + controller = Controller; + buffers.insert( std::end( buffers ), First, Last ); + if( id == audio::null_resource ) { + ::alGenSources( 1, &id ); } + // look up and queue assigned buffers + std::vector bufferids; + for( auto const buffer : buffers ) { + bufferids.emplace_back( audio::renderer.buffer( buffer ).id ); } + ::alSourceQueueBuffers( id, bufferids.size(), bufferids.data() ); + return *this; } + // starts playback of queued buffers + void + play(); + // stops the playback + void + stop(); + // updates state of the source + void + update( int const Deltatime ); + // toggles looping of the sound emitted by the source + void + loop( bool const State ); + // releases bound buffers and resets state of the class variables + // NOTE: doesn't release allocated implementation-side source + void + clear(); +}; + + + class openal_renderer { public: @@ -21,23 +72,46 @@ public: // methods // buffer methods // returns handle to a buffer containing audio data from specified file - buffer_handle + audio::buffer_handle fetch_buffer( std::string const &Filename ); + // provides direct access to a specified buffer + audio::openal_buffer const & + buffer( audio::buffer_handle const Buffer ) const; // core methods // initializes the service bool init(); + // schedules playback of provided range of samples, under control of the specified sound emitter + template + void + insert( sound_source *Controller, Iterator_ First, Iterator_ Last ) { + m_sources.emplace_back( fetch_source().bind( Controller, First, Last ) ); } + // schedules playback of specified sample, under control of the specified sound emitter + void + insert( sound_source *Controller, audio::buffer_handle const Sound ); + // updates state of all active emitters + void + update( int const Deltatime ); private: +// types + using source_list = std::list; + using source_sequence = std::stack; // methods bool init_caps(); + // returns an instance of implementation-side part of the sound emitter + audio::openal_source + fetch_source(); // members ALCdevice * m_device { nullptr }; ALCcontext * m_context { nullptr }; bool m_ready { false }; // renderer is initialized and functional buffer_manager m_buffers; + // TBD: list of sources as vector, sorted by distance, for openal implementations with limited number of active sources? + source_list m_sources; + source_sequence m_sourcespares; // already created and currently unused sound sources }; extern openal_renderer renderer; diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 79bade59..7652f761 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -225,15 +225,15 @@ Source Files + + Source Files + Source Files Source Files - - Source Files - @@ -449,13 +449,13 @@ Header Files - + Header Files Header Files - + Header Files diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index 2e106500..dc8989a3 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -395,7 +395,7 @@ geometrybank_manager::create_bank() { if( true == Global::bUseVBO ) { m_geometrybanks.emplace_back( std::make_shared(), std::chrono::steady_clock::time_point() ); } else { m_geometrybanks.emplace_back( std::make_shared(), std::chrono::steady_clock::time_point() ); } // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication - return { m_geometrybanks.size(), 0 }; + return { static_cast( m_geometrybanks.size() ), 0 }; } // creates a new geometry chunk of specified type from supplied vertex data, in specified bank. returns: handle to the chunk or NULL diff --git a/openglgeometrybank.h b/openglgeometrybank.h index 00b9cd8a..c2bf6ac2 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -302,7 +302,7 @@ private: // types: typedef std::pair< std::shared_ptr, - std::chrono::steady_clock::time_point > geometrybanktimepoint_pair; + resource_timestamp > geometrybanktimepoint_pair; typedef std::deque< geometrybanktimepoint_pair > geometrybanktimepointpair_sequence; diff --git a/renderer.cpp b/renderer.cpp index e3254003..80cf167a 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -696,9 +696,10 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f point = lightviewmatrix * point; } bounding_box( frustumchunkmin, frustumchunkmax, std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); - // quantize the frustum points with 50 m resolution, to reduce shadow shimmer on scale/orientation changes - frustumchunkmin = 50.f * glm::floor( frustumchunkmin * ( 1.f / 50.f ) ); - frustumchunkmax = 50.f * glm::ceil( frustumchunkmax * ( 1.f / 50.f ) ); + // quantize the frustum points and add some padding, to reduce shadow shimmer on scale changes + auto const quantizationstep{ std::min( Global::shadowtune.depth, 50.f ) }; + frustumchunkmin = quantizationstep * glm::floor( frustumchunkmin * ( 1.f / quantizationstep ) ); + frustumchunkmax = quantizationstep * glm::ceil( frustumchunkmax * ( 1.f / quantizationstep ) ); // ...use the dimensions to set up light projection boundaries... // NOTE: since we only have one cascade map stage, we extend the chunk forward/back to catch areas normally covered by other stages camera.projection() *= diff --git a/renderer.h b/renderer.h index e8613eb6..e8582afc 100644 --- a/renderer.h +++ b/renderer.h @@ -21,7 +21,7 @@ http://mozilla.org/MPL/2.0/. #define EU07_USE_PICKING_FRAMEBUFFER //#define EU07_USE_DEBUG_SHADOWMAP -#define EU07_USE_DEBUG_CAMERA +//#define EU07_USE_DEBUG_CAMERA //#define EU07_USE_DEBUG_CULLING struct opengl_light { diff --git a/simulation.cpp b/simulation.cpp index cd176f5f..6ef2c32b 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -460,10 +460,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad auto *sound { deserialize_sound( Input, Scratchpad, nodedata ) }; if( false == simulation::Sounds.insert( sound ) ) { -#ifdef EU07_USE_OLD_SOUNDCODE - ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->m_name + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); -#else -#endif + ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } simulation::Region->insert_sound( sound, Scratchpad ); } diff --git a/sound.cpp b/sound.cpp index 519b51e1..d17912f5 100644 --- a/sound.cpp +++ b/sound.cpp @@ -10,6 +10,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "sound.h" +#include "parser.h" +#include "globals.h" // restores state of the class from provided data stream sound_source & @@ -25,12 +27,14 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons switch( Legacytype ) { case sound_type::single: { // single sample only - Input.getTokens( 1, true, "\n\r\t ,;" ); + m_soundmain = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); break; } case sound_type::multipart: { // three samples: start, middle, stop - Input.getTokens( 3, true, "\n\r\t ,;" ); + m_soundbegin = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); + m_soundmain = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); + m_soundend = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); break; } default: { @@ -53,14 +57,142 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons // issues contextual play commands for the audio renderer void -sound_source::play() { +sound_source::play( int const Flags ) { + if( ( false == Global::bSoundEnabled ) + || ( true == empty() ) ) { + // if the sound is disabled altogether or nothing can be emitted from this source, no point wasting time + return; + } + + m_flags = Flags; + + switch( m_stage ) { + case stage::none: + case stage::restart: { + if( m_soundbegin != null_handle ) { + std::vector bufferlist{ m_soundbegin, m_soundmain }; + audio::renderer.insert( this, std::begin( bufferlist ), std::end( bufferlist ) ); + } + else { + audio::renderer.insert( this, m_soundmain ); + } + break; + } + case stage::main: { + // TODO: schedule another main sample playback, or a suitable sample from the table for combined sources + break; + } + case stage::end: { + // schedule stop of current sequence end sample... + m_stage = stage::restart; + // ... and queue startup or main sound again + return play( Flags ); + break; + } + default: { + break; + } + } +} + +// stops currently active play commands controlled by this emitter +void +sound_source::stop() { + + if( ( m_stage == stage::none ) + || ( m_stage == stage::end ) ) { + return; + } + + switch( m_stage ) { + case stage::begin: + case stage::main: { + // set the source to kill any currently active sounds + m_stage = stage::cease; + if( m_soundend != null_handle ) { + // and if there's defined sample for the sound end, play it instead + audio::renderer.insert( this, m_soundend ); + } + break; + } + case stage::end: { + // set the source to kill any currently active sounds + m_stage = stage::cease; + break; + } + default: { + break; + } + } +} + +// adjusts parameters of provided implementation-side sound source +void +sound_source::update( audio::openal_source &Source ) { + + if( true == Source.is_playing ) { + + // kill the sound if requested + if( m_stage == stage::cease ) { + Source.stop(); + return; + } + // TODO: positional update + if( m_soundbegin != null_handle ) { + // multipart sound + // detect the moment when the sound moves from startup sample to the main + if( ( m_stage == stage::begin ) + && ( Source.buffers[ Source.buffer_index ] == m_soundmain ) ) { + // when it happens update active sample flags, and activate the looping + Source.loop( true ); + m_stage = stage::main; + } + } + } + else { + // if the emitter isn't playing it's either done or wasn't yet started + // we can determine this from number of processed buffers + if( Source.buffer_index != Source.buffers.size() ) { + auto const buffer { Source.buffers[ Source.buffer_index ] }; + if( buffer == m_soundbegin ) { m_stage = stage::begin; } + // TODO: take ito accound sample table for combined sounds + else if( buffer == m_soundmain ) { m_stage = stage::main; } + else if( buffer == m_soundend ) { m_stage = stage::end; } + // TODO: emitter initialization + if( ( buffer == m_soundmain ) + && ( true == TestFlag( m_flags, sound_flags::looping ) ) ) { + // main sample can be optionally set to loop + Source.loop( true ); + } + // all set, start playback + Source.play(); + } + else { + // + auto const buffer { Source.buffers[ Source.buffer_index - 1 ] }; + if( ( buffer == m_soundend ) + || ( ( m_soundend == null_handle ) + && ( buffer == m_soundmain ) ) ) { + m_stage = stage::none; + } + } + } } bool sound_source::empty() const { - return true; + // NOTE: we test only the main sound, won't bother playing potential bookends if this is missing + // TODO: take into account presence of sample table, for combined sounds + return ( m_soundmain == null_handle ); +} + +// returns true if the source is emitting any sound +bool +sound_source::is_playing() const { + + return ( m_stage != stage::none ); } //--------------------------------------------------------------------------- diff --git a/sound.h b/sound.h index 877c5491..7f9ffb29 100644 --- a/sound.h +++ b/sound.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "audiorenderer.h" -#include "parser.h" +#include "classes.h" #include "names.h" enum sound_type { @@ -19,14 +19,18 @@ enum sound_type { }; enum sound_parameters { - none, - range = 0x1, + range = 0x1, amplitude = 0x2, frequency = 0x4 }; +enum sound_flags { + looping = 0x1, // the main sample will be looping; implied for multi-sounds + exclusive = 0x2 // the source won't dispatch more than one active instance of the sound; implied for multi-sounds +}; + // mini controller and audio dispatcher; issues play commands for the audio renderer, -// updates parameters of assigned audio sources for the playback duration +// updates parameters of created audio emitters for the playback duration // TODO: move to simulation namespace after clean up of owner classes class sound_source { @@ -34,15 +38,18 @@ public: // methods // restores state of the class from provided data stream sound_source & - deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters = sound_parameters::none ); + deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters = NULL ); sound_source & - deserialize( std::string const &Input, sound_type const Legacytype, int const Legacyparameters = sound_parameters::none ); + deserialize( std::string const &Input, sound_type const Legacytype, int const Legacyparameters = NULL ); // issues contextual play commands for the audio renderer void - play(); - // sets volume of audio streams associated with this source - sound_source & - volume( float const Volume ); + play( int const Flags = NULL ); + // stops currently active play commands controlled by this emitter + void + stop(); + // adjusts parameters of provided implementation-side sound source + void + update( audio::openal_source &Source ); // sound source name setter/getter void name( std::string Name ); @@ -51,10 +58,31 @@ public: // returns true if there isn't any sound buffer associated with the object, false otherwise bool empty() const; + // returns true if the source is emitting any sound + bool + is_playing() const; private: +// types + enum stage { + none, + begin, + main, + end, + cease, + restart + }; + // members + TDynamicObject * m_owner { nullptr }; // optional, the vehicle carrying this sound source + glm::vec3 m_offset; // relative position of the source, either from the owner or the region centre std::string m_name; + stage m_stage{ stage::none }; + int m_flags{ NULL }; + audio::buffer_handle m_soundmain { null_handle }; // main sound emitted by the source + audio::buffer_handle m_soundbegin { null_handle }; // optional, sound emitted before the main sound + audio::buffer_handle m_soundend { null_handle }; // optional, sound emitted after the main sound + // TODO: table of samples with associated values, activated when controlling variable matches the value }; // sound source name setter/getter diff --git a/sun.cpp b/sun.cpp index 9f4ac2b5..9e744635 100644 --- a/sun.cpp +++ b/sun.cpp @@ -14,10 +14,6 @@ cSun::cSun() { setLocation( 19.00f, 52.00f ); // default location roughly in centre of Poland m_observer.press = 1013.0; // surface pressure, millibars m_observer.temp = 15.0; // ambient dry-bulb temperature, degrees C - - TIME_ZONE_INFORMATION timezoneinfo; // TODO: timezone dependant on geographic location - ::GetTimeZoneInformation( &timezoneinfo ); - m_observer.timezone = -timezoneinfo.Bias / 60.0f; } cSun::~cSun() { gluDeleteQuadric( sunsphere ); } @@ -27,6 +23,27 @@ cSun::init() { sunsphere = gluNewQuadric(); gluQuadricNormals( sunsphere, GLU_SMOOTH ); + + // calculate and set timezone for the current date of the simulation + // TODO: timezone dependant on geographic location + TIME_ZONE_INFORMATION timezoneinfo; + ::GetTimeZoneInformation( &timezoneinfo ); + // account for potential daylight/normal time bias + // NOTE: we're using xp-compatible time zone information and current year, instead of 'historically proper' values + auto zonebias { timezoneinfo.Bias }; + auto const year { simulation::Time.data().wYear }; + auto const yearday { simulation::Time.year_day() }; + if( yearday < simulation::Time.year_day( timezoneinfo.DaylightDate.wDay, timezoneinfo.DaylightDate.wMonth, year ) ) { + zonebias += timezoneinfo.StandardBias; + } + else if( yearday < simulation::Time.year_day( timezoneinfo.StandardDate.wDay, timezoneinfo.StandardDate.wMonth, year ) ) { + zonebias += timezoneinfo.DaylightBias; + } + else { + zonebias += timezoneinfo.StandardBias; + } + + m_observer.timezone = -zonebias / 60.0f; } void From 3afff7c3ab40037ae09072961ca7f1eb2bfc4128 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 29 Nov 2017 01:50:57 +0100 Subject: [PATCH 225/426] audio subsystem: completed base functionality of the renderer, external and engine sounds moved from cab to vehicle, minor fixes to various sound-related methods --- Button.cpp | 54 +- Button.h | 57 +- Driver.cpp | 91 +- DynObj.cpp | 1966 +++++++++++++++++++++++++----------------- DynObj.h | 131 ++- Event.cpp | 40 +- Gauge.cpp | 51 +- Gauge.h | 50 +- Globals.cpp | 2 + Globals.h | 1 + McZapkie/MOVER.h | 20 +- McZapkie/Mover.cpp | 109 ++- McZapkie/hamulce.cpp | 183 ++-- Model3d.cpp | 50 +- Model3d.h | 11 +- Train.cpp | 930 +++++--------------- Train.h | 58 +- World.cpp | 10 +- audio.cpp | 2 + audio.h | 2 +- audiorenderer.cpp | 129 ++- audiorenderer.h | 54 +- dumb3d.h | 2 +- renderer.cpp | 22 +- simulation.cpp | 4 +- sound.cpp | 288 +++++-- sound.h | 100 ++- 27 files changed, 2488 insertions(+), 1929 deletions(-) diff --git a/Button.cpp b/Button.cpp index c7b501a4..0636888b 100644 --- a/Button.cpp +++ b/Button.cpp @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "Model3d.h" #include "Console.h" #include "logs.h" +#include "renderer.h" void TButton::Clear(int i) { @@ -24,8 +25,8 @@ void TButton::Clear(int i) Update(); // kasowanie bitu Feedback, o ile jakiś ustawiony }; -void TButton::Init(std::string const &asName, TModel3d *pModel, bool bNewOn) -{ +void TButton::Init( std::string const &asName, TModel3d *pModel, bool bNewOn ) { + if( pModel == nullptr ) { return; } pModelOn = pModel->GetFromName( asName + "_on" ); @@ -34,7 +35,7 @@ void TButton::Init(std::string const &asName, TModel3d *pModel, bool bNewOn) Update(); }; -void TButton::Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2) { +void TButton::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *pModel1, TModel3d *pModel2 ) { std::string submodelname; @@ -52,25 +53,32 @@ void TButton::Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2) { } } + // bind defined sounds with the button owner + m_soundfxincrease.owner( Owner ); + m_soundfxdecrease.owner( Owner ); + if( pModel1 ) { // poszukiwanie submodeli w modelu Init( submodelname, pModel1, false ); - if( ( pModelOn != nullptr ) || ( pModelOff != nullptr ) ) { - // we got our models, bail out - return; - } } - if( pModel2 ) { + if( ( pModelOn == nullptr ) + && ( pModelOff == nullptr ) + && ( pModel2 != nullptr ) ) { // poszukiwanie submodeli w modelu Init( submodelname, pModel2, false ); - if( ( pModelOn != nullptr ) || ( pModelOff != nullptr ) ) { - // we got our models, bail out - return; - } } - // if we failed to locate even one state submodel, cry - ErrorLog( "Failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + pModel1->NameGet() + "\"" ); -}; + + if( ( pModelOn == nullptr ) + && ( pModelOff == nullptr ) ) { + // if we failed to locate even one state submodel, cry + ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + pModel1->NameGet() + "\"" ); + } + + // pass submodel location to defined sounds + auto const offset { model_offset() }; + m_soundfxincrease.offset( offset ); + m_soundfxdecrease.offset( offset ); +} bool TButton::Load_mapping( cParser &Input ) { @@ -85,6 +93,22 @@ TButton::Load_mapping( cParser &Input ) { return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized } +// returns offset of submodel associated with the button from the model centre +glm::vec3 +TButton::model_offset() const { + + auto const + submodel { ( + pModelOn ? pModelOn : + pModelOff ? pModelOff : + nullptr ) }; + + return ( + submodel != nullptr ? + submodel->offset( 1.f ) : + glm::vec3() ); +} + void TButton::Turn( bool const State ) { diff --git a/Button.h b/Button.h index 534bcd6d..5ac94579 100644 --- a/Button.h +++ b/Button.h @@ -12,18 +12,28 @@ http://mozilla.org/MPL/2.0/. #include "Classes.h" #include "sound.h" -class TButton -{ // animacja dwustanowa, włącza jeden z dwóch submodeli (jednego - // z nich może nie być) - private: - TSubModel - *pModelOn { nullptr }, - *pModelOff { nullptr }; // submodel dla stanu załączonego i wyłączonego - bool m_state { false }; - bool const *bData { nullptr }; - int iFeedbackBit { 0 }; // Ra: bit informacji zwrotnej, do wyprowadzenia na pulpit - sound_source m_soundfxincrease; // sound associated with increasing control's value - sound_source m_soundfxdecrease; // sound associated with decreasing control's value +// animacja dwustanowa, włącza jeden z dwóch submodeli (jednego z nich może nie być) +class TButton { + +public: +// methods + TButton() = default; + void Clear(int const i = -1); + inline void FeedbackBitSet( int const i ) { + iFeedbackBit = 1 << i; }; + void Turn( bool const State ); + inline + bool Active() { + return ( ( pModelOn != nullptr ) + || ( pModelOff != nullptr ) ); } + void Update(); + void Init( std::string const &asName, TModel3d *pModel, bool bNewOn = false ); + void Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *pModel1, TModel3d *pModel2 = nullptr ); + void AssignBool(bool const *bValue); + // returns offset of submodel associated with the button from the model centre + glm::vec3 model_offset() const; + +private: // methods // imports member data pair from the config file bool @@ -32,20 +42,15 @@ class TButton void play(); - public: - TButton() = default; - void Clear(int const i = -1); - inline void FeedbackBitSet(int const i) { - iFeedbackBit = 1 << i; }; - void Turn( bool const State ); - inline - bool Active() { - return ( ( pModelOn != nullptr ) - || ( pModelOff != nullptr ) ); } - void Update(); - void Init(std::string const &asName, TModel3d *pModel, bool bNewOn = false); - void Load(cParser &Parser, TModel3d *pModel1, TModel3d *pModel2 = NULL); - void AssignBool(bool const *bValue); +// members + TSubModel + *pModelOn { nullptr }, + *pModelOff { nullptr }; // submodel dla stanu załączonego i wyłączonego + bool m_state { false }; + bool const *bData { nullptr }; + int iFeedbackBit { 0 }; // Ra: bit informacji zwrotnej, do wyprowadzenia na pulpit + sound_source m_soundfxincrease { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // sound associated with increasing control's value + sound_source m_soundfxdecrease { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // sound associated with decreasing control's value }; //--------------------------------------------------------------------------- diff --git a/Driver.cpp b/Driver.cpp index 75c1b2ba..24c9e81e 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -998,8 +998,11 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if (go == cm_Unknown) // jeśli nie było komendy wcześniej go = cm_Ready; // gotów do odjazdu z W4 (semafor może // zatrzymać) - if (false == tsGuardSignal->empty()) // jeśli mamy głos kierownika, to odegrać + if( ( tsGuardSignal != nullptr ) + && ( false == tsGuardSignal->empty() ) ); { + // jeśli mamy głos kierownika, to odegrać iDrivigFlags |= moveGuardSignal; + } continue; // nie analizować prędkości } // koniec startu z zatrzymania } // koniec obsługi początkowych stacji @@ -2577,6 +2580,10 @@ bool TController::IncSpeed() if (tsGuardSignal->GetStatus() & DSBSTATUS_PLAYING) // jeśli gada, to nie jedziemy return false; #else + if( ( tsGuardSignal != nullptr ) + && ( true == tsGuardSignal->is_playing() ) ) { + return false; + } #endif bool OK = true; if( ( iDrivigFlags & moveDoorOpened ) @@ -2590,7 +2597,7 @@ bool TController::IncSpeed() } if( true == mvOccupied->DepartureSignal ) { // shut off departure warning - mvOccupied->DepartureSignal = false; + mvOccupied->signal_departure( false ); } if (mvControlling->SlippingWheels) return false; // jak poślizg, to nie przyspieszamy @@ -2984,7 +2991,7 @@ void TController::Doors(bool what) if( ( true == mvOccupied->DoorClosureWarning ) && ( false == mvOccupied->DepartureSignal ) && ( true == TestFlag( iDrivigFlags, moveDoorOpened ) ) ) { - mvOccupied->DepartureSignal = true; // załącenie bzyczka + mvOccupied->signal_departure( true ); // załącenie bzyczka fActionTime = -3.0 - 0.1 * Random( 10 ); // 3-4 second wait } if( fActionTime > -0.5 ) { @@ -3094,6 +3101,11 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N pVehicle->GetPosition().x, pVehicle->GetPosition().y, pVehicle->GetPosition().z, false); #else + tsGuardSignal = new sound_source( sound_placement::external ); + tsGuardSignal->deserialize( NewCommand, sound_type::single ); + tsGuardSignal->owner( pVehicle ); + // place virtual conductor some distance away + tsGuardSignal->offset( { pVehicle->MoverParameters->Dim.W * -0.75f, 1.7f, fLength * -0.25f } ); #endif iGuardRadio = 0; // nie przez radio } @@ -3109,6 +3121,12 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N pVehicle->GetPosition().x, pVehicle->GetPosition().y, pVehicle->GetPosition().z, false); #else + tsGuardSignal = new sound_source( sound_placement::external ); + tsGuardSignal->deserialize( NewCommand, sound_type::single ); + tsGuardSignal->owner( pVehicle ); + // command will be transmitted by radio + // TODO: put the exact location in the proper cab + tsGuardSignal->offset( { 0.f, 1.f, pVehicle->MoverParameters->Dim.L * 0.75f } ); #endif iGuardRadio = iRadioChannel; } @@ -4475,43 +4493,48 @@ TController::UpdateSituation(double dt) { // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w // składzie, jeśli nie mamy czekać na sygnał też trzeba odpalić if (iDrivigFlags & moveGuardSignal) - { // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas - // stania + { // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas stania iDrivigFlags &= ~moveGuardSignal; // tylko raz nadać - if( iDrivigFlags & moveDoorOpened ) // jeśli drzwi otwarte - if( !mvOccupied - ->DoorOpenCtrl ) // jeśli drzwi niesterowane przez maszynistę - Doors( false ); // a EZT zamknie dopiero po odegraniu komunikatu kierownika - -#ifdef EU07_USE_OLD_SOUNDCODE - tsGuardSignal->Stop(); -#else -#endif - // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy - // bezpośrednim - // albo trzeba zrobić dwa dźwięki, jeden bezpośredni, słyszalny w - // pobliżu, a drugi radiowy, słyszalny w innych lokomotywach - // na razie zakładam, że to nie jest dźwięk radiowy, bo trzeba by zrobić - // obsługę kanałów radiowych itd. - if( !iGuardRadio ) { - // jeśli nie przez radio -#ifdef EU07_USE_OLD_SOUNDCODE - tsGuardSignal->Play( 1.0, 0, !FreeFlyModeFlag, pVehicle->GetPosition() ); // dla true jest głośniej -#else -#endif + if( ( iDrivigFlags & moveDoorOpened ) + && ( false == mvOccupied->DoorOpenCtrl ) ) { + // jeśli drzwi otwarte, niesterowane przez maszynistę + Doors( false ); // a EZT zamknie dopiero po odegraniu komunikatu kierownika } - else { - // if (iGuardRadio==iRadioChannel) //zgodność kanału - // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu - // (albo może mieć radio przenośne) - kierownik mógłby powtarzać - // przy braku reakcji - if( SquareMagnitude( pVehicle->GetPosition() - Global::pCameraPosition ) < 2000 * 2000 ) { - // w odległości mniejszej niż 2km + if( tsGuardSignal != nullptr ) { #ifdef EU07_USE_OLD_SOUNDCODE - tsGuardSignal->Play( 1.0, 0, true, pVehicle->GetPosition() ); // dźwięk niby przez radio + tsGuardSignal->Stop(); #else + tsGuardSignal->stop(); #endif + // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy + // bezpośrednim + // albo trzeba zrobić dwa dźwięki, jeden bezpośredni, słyszalny w + // pobliżu, a drugi radiowy, słyszalny w innych lokomotywach + // na razie zakładam, że to nie jest dźwięk radiowy, bo trzeba by zrobić + // obsługę kanałów radiowych itd. + if( !iGuardRadio ) { + // jeśli nie przez radio +#ifdef EU07_USE_OLD_SOUNDCODE + tsGuardSignal->Play( 1.0, 0, !FreeFlyModeFlag, pVehicle->GetPosition() ); // dla true jest głośniej +#else + tsGuardSignal->play( sound_flags::exclusive ); +#endif + } + else { + // if (iGuardRadio==iRadioChannel) //zgodność kanału + // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu + // (albo może mieć radio przenośne) - kierownik mógłby powtarzać + // przy braku reakcji + if( SquareMagnitude( pVehicle->GetPosition() - Global::pCameraPosition ) < 2000 * 2000 ) { + // w odległości mniejszej niż 2km +#ifdef EU07_USE_OLD_SOUNDCODE + tsGuardSignal->Play( 1.0, 0, true, pVehicle->GetPosition() ); // dźwięk niby przez radio +#else + // TODO: proper system for sending/receiving radio messages + tsGuardSignal->play( sound_flags::exclusive ); +#endif + } } } } diff --git a/DynObj.cpp b/DynObj.cpp index c1846335..59941932 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1218,8 +1218,9 @@ int TDynamicObject::DettachStatus(int dir) // rzeczywistych od strony (dir): // 0=przód,1=tył // Ra: dziwne, że ta funkcja nie jest używana - if (!MoverParameters->Couplers[dir].CouplingFlag) + if( MoverParameters->Couplers[ dir ].CouplingFlag == coupling::faux ) { return 0; // jeśli nic nie podłączone, to jest OK + } return (MoverParameters->DettachStatus(dir)); // czy jest w odpowiedniej odległości? } @@ -1243,10 +1244,154 @@ int TDynamicObject::Dettach(int dir) d = d->Next(); // i w drugą stronę } } - if (MoverParameters->Couplers[dir].CouplingFlag) // odczepianie, o ile coś podłączone - MoverParameters->Dettach(dir); - return MoverParameters->Couplers[dir] - .CouplingFlag; // sprzęg po rozłączaniu (czego się nie da odpiąć + if( MoverParameters->Couplers[ dir ].CouplingFlag ) { + // odczepianie, o ile coś podłączone + MoverParameters->Dettach( dir ); + } + // sprzęg po rozłączaniu (czego się nie da odpiąć + return MoverParameters->Couplers[dir].CouplingFlag; +} + +void +TDynamicObject::couple( int const Side ) { + + if( MoverParameters->Couplers[ Side ].Connected == nullptr ) { return; } + + if( MoverParameters->Couplers[ Side ].CouplingFlag == coupling::faux ) { + // najpierw hak + if( ( MoverParameters->Couplers[ Side ].Connected->Couplers[ Side ].AllowedFlag + & MoverParameters->Couplers[ Side ].AllowedFlag + & coupling::coupler ) == coupling::coupler ) { + if( MoverParameters->Attach( + Side, 2, + MoverParameters->Couplers[ Side ].Connected, + coupling::coupler ) ) { + // tmp->MoverParameters->Couplers[CouplNr].Render=true; //podłączony sprzęg będzie widoczny + m_couplersounds[ Side ].dsbCouplerAttach.play(); + // one coupling type per key press + return; + } + else { + WriteLog( "Mechanical coupling failed." ); + } + } + } + if( false == TestFlag( MoverParameters->Couplers[ Side ].CouplingFlag, coupling::brakehose ) ) { + // pneumatyka + if( ( MoverParameters->Couplers[ Side ].Connected->Couplers[ Side ].AllowedFlag + & MoverParameters->Couplers[ Side ].AllowedFlag + & coupling::brakehose ) == coupling::brakehose ) { + if( MoverParameters->Attach( + Side, 2, + MoverParameters->Couplers[ Side ].Connected, + ( MoverParameters->Couplers[ Side ].CouplingFlag | coupling::brakehose ) ) ) { + // TODO: dedicated sound for connecting cable-type connections + m_couplersounds[ Side ].dsbCouplerDetach.play(); + + SetPneumatic( Side != 0, true ); + if( Side == side::front ) { + PrevConnected->SetPneumatic( Side != 0, true ); + } + else { + NextConnected->SetPneumatic( Side != 0, true ); + } + // one coupling type per key press + return; + } + } + } + if( false == TestFlag( MoverParameters->Couplers[ Side ].CouplingFlag, coupling::mainhose ) ) { + // zasilajacy + if( ( MoverParameters->Couplers[ Side ].Connected->Couplers[ Side ].AllowedFlag + & MoverParameters->Couplers[ Side ].AllowedFlag + & coupling::mainhose ) == coupling::mainhose ) { + if( MoverParameters->Attach( + Side, 2, + MoverParameters->Couplers[ Side ].Connected, + ( MoverParameters->Couplers[ Side ].CouplingFlag | coupling::mainhose ) ) ) { + // TODO: dedicated sound for connecting cable-type connections + m_couplersounds[ Side ].dsbCouplerDetach.play(); + + SetPneumatic( Side != 0, false ); + if( Side == side::front ) { + PrevConnected->SetPneumatic( Side != 0, false ); + } + else { + NextConnected->SetPneumatic( Side != 0, false ); + } + // one coupling type per key press + return; + } + } + } + if( false == TestFlag( MoverParameters->Couplers[ Side ].CouplingFlag, coupling::control ) ) { + // ukrotnionko + if( ( MoverParameters->Couplers[ Side ].Connected->Couplers[ Side ].AllowedFlag + & MoverParameters->Couplers[ Side ].AllowedFlag + & coupling::control ) == coupling::control ) { + if( MoverParameters->Attach( + Side, 2, + MoverParameters->Couplers[ Side ].Connected, + ( MoverParameters->Couplers[ Side ].CouplingFlag | coupling::control ) ) ) { + // TODO: dedicated sound for connecting cable-type connections + m_couplersounds[ Side ].dsbCouplerAttach.play(); + // one coupling type per key press + return; + } + } + } + if( false == TestFlag( MoverParameters->Couplers[ Side ].CouplingFlag, coupling::gangway ) ) { + // mostek + if( ( MoverParameters->Couplers[ Side ].Connected->Couplers[ Side ].AllowedFlag + & MoverParameters->Couplers[ Side ].AllowedFlag + & coupling::gangway ) == coupling::gangway ) { + if( MoverParameters->Attach( + Side, 2, + MoverParameters->Couplers[ Side ].Connected, + ( MoverParameters->Couplers[ Side ].CouplingFlag | coupling::gangway ) ) ) { + // TODO: dedicated gangway sound + m_couplersounds[ Side ].dsbCouplerAttach.play(); + // one coupling type per key press + return; + } + } + } + if( false == TestFlag( MoverParameters->Couplers[ Side ].CouplingFlag, coupling::heating ) ) { + // heating + if( ( MoverParameters->Couplers[ Side ].Connected->Couplers[ Side ].AllowedFlag + & MoverParameters->Couplers[ Side ].AllowedFlag + & coupling::heating ) == coupling::heating ) { + if( MoverParameters->Attach( + Side, 2, + MoverParameters->Couplers[ Side ].Connected, + ( MoverParameters->Couplers[ Side ].CouplingFlag | coupling::heating ) ) ) { + + // TODO: dedicated 'click' sound for connecting cable-type connections + m_couplersounds[ Side ].dsbCouplerDetach.play(); + // one coupling type per key press + return; + } + } + } + +} + +int +TDynamicObject::uncouple( int const Side ) { + + if( ( DettachStatus( Side ) >= 0 ) + || ( true == TestFlag( MoverParameters->Couplers[ Side ].CouplingFlag, coupling::permanent ) ) ) { + // can't uncouple, return existing coupling state + return MoverParameters->Couplers[ Side ].CouplingFlag; + } + // jeżeli sprzęg niezablokowany, jest co odczepić i się da + auto const couplingflag { Dettach( Side ) }; + if( couplingflag == coupling::faux ) { + // dźwięk odczepiania + m_couplersounds[ Side ].dsbCouplerAttach.play(); + m_couplersounds[ Side ].dsbCouplerDetach.play(); + } + return couplingflag; } void TDynamicObject::CouplersDettach(double MinDist, int MyScanDir) { @@ -1466,7 +1611,8 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) } //----------ABu: koniec skanowania pojazdow -TDynamicObject::TDynamicObject() +TDynamicObject::TDynamicObject() : + rsStukot( MaxAxles, sound_source( sound_placement::external ) ) { modelShake = vector3(0, 0, 0); fTrackBlock = 10000.0; // brak przeszkody na drodze @@ -1839,58 +1985,63 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" create_controller( DriverType, !TrainName.empty() ); // McZapkie-250202 - iAxles = (MaxAxles < MoverParameters->NAxles) ? MaxAxles : MoverParameters->NAxles; // ilość osi + iAxles = std::min( MoverParameters->NAxles, MaxAxles ); // ilość osi + rsStukot.resize( iAxles, sound_source( sound_placement::external ) ); // wczytywanie z pliku nazwatypu.mmd, w tym model LoadMMediaFile(asBaseDir, Type_Name, asReplacableSkin); // McZapkie-100402: wyszukiwanie submodeli sprzegów - btCoupler1.Init("coupler1", mdModel, false); // false - ma być wyłączony - btCoupler2.Init("coupler2", mdModel, false); + btCoupler1.Init( "coupler1", mdModel, false ); // false - ma być wyłączony + btCoupler2.Init( "coupler2", mdModel, false); + // brake hoses btCPneumatic1.Init("cpneumatic1", mdModel); btCPneumatic2.Init("cpneumatic2", mdModel); btCPneumatic1r.Init("cpneumatic1r", mdModel); btCPneumatic2r.Init("cpneumatic2r", mdModel); + // main hoses btPneumatic1.Init("pneumatic1", mdModel); btPneumatic2.Init("pneumatic2", mdModel); btPneumatic1r.Init("pneumatic1r", mdModel); btPneumatic2r.Init("pneumatic2r", mdModel); - btCCtrl1.Init("cctrl1", mdModel, false); - btCCtrl2.Init("cctrl2", mdModel, false); - btCPass1.Init("cpass1", mdModel, false); - btCPass2.Init("cpass2", mdModel, false); + // control cables + btCCtrl1.Init( "cctrl1", mdModel, false); + btCCtrl2.Init( "cctrl2", mdModel, false); + // gangways + btCPass1.Init( "cpass1", mdModel, false); + btCPass2.Init( "cpass2", mdModel, false); // sygnaly // ABu 060205: Zmiany dla koncowek swiecacych: - btEndSignals11.Init("endsignal13", mdModel, false); - btEndSignals21.Init("endsignal23", mdModel, false); - btEndSignals13.Init("endsignal12", mdModel, false); - btEndSignals23.Init("endsignal22", mdModel, false); + btEndSignals11.Init( "endsignal13", mdModel, false); + btEndSignals21.Init( "endsignal23", mdModel, false); + btEndSignals13.Init( "endsignal12", mdModel, false); + btEndSignals23.Init( "endsignal22", mdModel, false); iInventory[ side::front ] |= btEndSignals11.Active() ? light::redmarker_left : 0; // informacja, czy ma poszczególne światła iInventory[ side::front ] |= btEndSignals13.Active() ? light::redmarker_right : 0; iInventory[ side::rear ] |= btEndSignals21.Active() ? light::redmarker_left : 0; iInventory[ side::rear ] |= btEndSignals23.Active() ? light::redmarker_right : 0; // ABu: to niestety zostawione dla kompatybilnosci modeli: - btEndSignals1.Init("endsignals1", mdModel, false); - btEndSignals2.Init("endsignals2", mdModel, false); - btEndSignalsTab1.Init("endtab1", mdModel, false); - btEndSignalsTab2.Init("endtab2", mdModel, false); + btEndSignals1.Init( "endsignals1", mdModel, false); + btEndSignals2.Init( "endsignals2", mdModel, false); + btEndSignalsTab1.Init( "endtab1", mdModel, false); + btEndSignalsTab2.Init( "endtab2", mdModel, false); iInventory[ side::front ] |= btEndSignals1.Active() ? ( light::redmarker_left | light::redmarker_right ) : 0; iInventory[ side::front ] |= btEndSignalsTab1.Active() ? light::rearendsignals : 0; // tabliczki blaszane iInventory[ side::rear ] |= btEndSignals2.Active() ? ( light::redmarker_left | light::redmarker_right ) : 0; iInventory[ side::rear ] |= btEndSignalsTab2.Active() ? light::rearendsignals : 0; // ABu Uwaga! tu zmienic w modelu! - btHeadSignals11.Init("headlamp13", mdModel, false); // lewe - btHeadSignals12.Init("headlamp11", mdModel, false); // górne - btHeadSignals13.Init("headlamp12", mdModel, false); // prawe - btHeadSignals21.Init("headlamp23", mdModel, false); - btHeadSignals22.Init("headlamp21", mdModel, false); - btHeadSignals23.Init("headlamp22", mdModel, false); + btHeadSignals11.Init( "headlamp13", mdModel, false); // lewe + btHeadSignals12.Init( "headlamp11", mdModel, false); // górne + btHeadSignals13.Init( "headlamp12", mdModel, false); // prawe + btHeadSignals21.Init( "headlamp23", mdModel, false); + btHeadSignals22.Init( "headlamp21", mdModel, false); + btHeadSignals23.Init( "headlamp22", mdModel, false); iInventory[ side::front ] |= btHeadSignals11.Active() ? light::headlight_left : 0; iInventory[ side::front ] |= btHeadSignals12.Active() ? light::headlight_upper : 0; iInventory[ side::front ] |= btHeadSignals13.Active() ? light::headlight_right : 0; iInventory[ side::rear ] |= btHeadSignals21.Active() ? light::headlight_left : 0; iInventory[ side::rear ] |= btHeadSignals22.Active() ? light::headlight_upper : 0; iInventory[ side::rear ] |= btHeadSignals23.Active() ? light::headlight_right : 0; - btMechanik1.Init("mechanik1", mdLowPolyInt, false); - btMechanik2.Init("mechanik2", mdLowPolyInt, false); + btMechanik1.Init( "mechanik1", mdLowPolyInt, false); + btMechanik2.Init( "mechanik2", mdLowPolyInt, false); TurnOff(); // resetowanie zmiennych submodeli if( mdLowPolyInt != nullptr ) { @@ -1929,23 +2080,26 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" } } // wyszukiwanie zderzakow - if (mdModel) // jeśli ma w czym szukać - for (int i = 0; i < 2; i++) - { - asAnimName = std::string("buffer_left0") + to_string(i + 1); - smBuforLewy[i] = mdModel->GetFromName(asAnimName); - if (smBuforLewy[i]) - smBuforLewy[i]->WillBeAnimated(); // ustawienie flagi animacji - asAnimName = std::string("buffer_right0") + to_string(i + 1); - smBuforPrawy[i] = mdModel->GetFromName(asAnimName); - if (smBuforPrawy[i]) - smBuforPrawy[i]->WillBeAnimated(); + if( mdModel ) { + // jeśli ma w czym szukać + for( int i = 0; i < 2; i++ ) { + asAnimName = std::string( "buffer_left0" ) + to_string( i + 1 ); + smBuforLewy[ i ] = mdModel->GetFromName( asAnimName ); + if( smBuforLewy[ i ] ) + smBuforLewy[ i ]->WillBeAnimated(); // ustawienie flagi animacji + asAnimName = std::string( "buffer_right0" ) + to_string( i + 1 ); + smBuforPrawy[ i ] = mdModel->GetFromName( asAnimName ); + if( smBuforPrawy[ i ] ) + smBuforPrawy[ i ]->WillBeAnimated(); } - for (int i = 0; i < iAxles; i++) // wyszukiwanie osi (0 jest na końcu, dlatego dodajemy - // długość?) - dRailPosition[i] = - (Reversed ? -dWheelsPosition[i] : (dWheelsPosition[i] + MoverParameters->Dim.L)) + - fDist; + } + for( int i = 0; i < iAxles; i++ ) { + // wyszukiwanie osi (0 jest na końcu, dlatego dodajemy długość?) + dRailPosition[ i ] = ( + Reversed ? + -dWheelsPosition[ i ] : + ( dWheelsPosition[ i ] + MoverParameters->Dim.L ) ) + fDist; + } // McZapkie-250202 end. Track->AddDynamicObject(this); // wstawiamy do toru na pozycję 0, a potem przesuniemy // McZapkie: zmieniono na ilosc osi brane z chk @@ -1971,9 +2125,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" fDist -= 0.5 * MoverParameters->Dim.L; // dodajemy pół długości pojazdu, bo // ustawiamy jego środek (zliczanie na // minus) - switch (iNumAxles) - { // Ra: pojazdy wstawiane są na tor początkowy, a potem - // przesuwane + switch (iNumAxles) { + // Ra: pojazdy wstawiane są na tor początkowy, a potem przesuwane case 2: // ustawianie osi na torze Axle0.Init(Track, this, iDirection ? 1 : -1); Axle0.Move((iDirection ? fDist : -fDist) + fAxleDistHalf, false); @@ -1998,12 +2151,10 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // Axle3.Move((iDirection?fDist:-fDist)+(fAxleDistHalf-MoverParameters->ADist*0.5),false); break; } - Move(0.0001); // potrzebne do wyliczenia aktualnej pozycji; nie może być zero, - // bo nie przeliczy - // pozycji - // teraz jeszcze trzeba przypisać pojazdy do nowego toru, bo przesuwanie - // początkowe osi nie + // potrzebne do wyliczenia aktualnej pozycji; nie może być zero, bo nie przeliczy pozycji + // teraz jeszcze trzeba przypisać pojazdy do nowego toru, bo przesuwanie początkowe osi nie // zrobiło tego + Move( 0.0001 ); ABuCheckMyTrack(); // zmiana toru na ten, co oś Axle0 (oś z przodu) TLocation loc; // Ra: ustawienie pozycji do obliczania sprzęgów loc.X = -vPosition.x; @@ -2029,6 +2180,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" MoverParameters->ComputeConstans(); // wektor podłogi dla wagonów, przesuwa ładunek vFloor = vector3(0, 0, MoverParameters->Floor); + // długość większa od zera oznacza OK; 2mm docisku? return MoverParameters->Dim.L; } @@ -2260,13 +2412,10 @@ void TDynamicObject::AttachPrev(TDynamicObject *Object, int iType) loc.Z=Object->vPosition.y; Object->MoverParameters->Loc=loc; //ustawienie dodawanego pojazdu */ - MoverParameters->Attach(iDirection, Object->iDirection ^ 1, Object->MoverParameters, iType, - true); + MoverParameters->Attach(iDirection, Object->iDirection ^ 1, Object->MoverParameters, iType, true); MoverParameters->Couplers[iDirection].Render = false; - Object->MoverParameters->Attach(Object->iDirection ^ 1, iDirection, MoverParameters, iType, - true); - Object->MoverParameters->Couplers[Object->iDirection ^ 1].Render = - true; // rysowanie sprzęgu w dołączanym + Object->MoverParameters->Attach(Object->iDirection ^ 1, iDirection, MoverParameters, iType, true); + Object->MoverParameters->Couplers[Object->iDirection ^ 1].Render = true; // rysowanie sprzęgu w dołączanym if (iDirection) { //łączenie standardowe NextConnected = Object; // normalnie doczepiamy go sobie do sprzęgu 1 @@ -2310,9 +2459,10 @@ bool TDynamicObject::UpdateForce(double dt, double dt1, bool FullVer) { if (!bEnabled) return false; - if (dt > 0) - MoverParameters->ComputeTotalForce(dt, dt1, - FullVer); // wywalenie WS zależy od ustawienia kierunku + if( dt > 0 ) { + // wywalenie WS zależy od ustawienia kierunku + MoverParameters->ComputeTotalForce( dt, dt1, FullVer ); + } return true; } @@ -2895,9 +3045,7 @@ bool TDynamicObject::Update(double dt, double dt1) } // McZapkie-260202 - dMoveLen przyda sie przy stukocie kol - dDOMoveLen = - GetdMoveLen() + MoverParameters->ComputeMovement(dt, dt1, ts, tp, tmpTraction, l, r); - // if (dDOMoveLen!=0.0) //Ra: nie może być, bo blokuje Event0 + dDOMoveLen = GetdMoveLen() + MoverParameters->ComputeMovement(dt, dt1, ts, tp, tmpTraction, l, r); if( Mechanik ) Mechanik->MoveDistanceAdd( dDOMoveLen ); // dodanie aktualnego przemieszczenia Move(dDOMoveLen); @@ -2909,65 +3057,52 @@ bool TDynamicObject::Update(double dt, double dt1) Global::ABuDebug = dDOMoveLen / dt1; ResetdMoveLen(); -#ifdef EU07_USE_OLD_SOUNDCODE // McZapkie-260202 // tupot mew, tfu, stukot kol: - // taka prowizorka zeby sciszyc stukot dalekiej lokomotywy - double ObjectDist; - double vol = 0; - ObjectDist = SquareMagnitude(Global::pCameraPosition - vPosition); - // McZapkie-270202 - if (MyTrack->fSoundDistance != -1) - { - if (ObjectDist < rsStukot[0].dSoundAtt * rsStukot[0].dSoundAtt * 15.0) - { - vol = (20.0 + MyTrack->iDamageFlag) / 21; - if (MyTrack->eEnvironment == e_tunnel) - { - vol *= 1.1; - // freq=1.02; + if( MyTrack->fSoundDistance != -1 ) { + + if( MyTrack->fSoundDistance != dRailLength ) { + dRailLength = MyTrack->fSoundDistance; + for( int i = 0; i < iAxles; ++i ) { + dRailPosition[ i ] = dWheelsPosition[ i ] + MoverParameters->Dim.L; } - else if (MyTrack->eEnvironment == e_bridge) - { - vol *= 1.2; - // freq=0.99; //MC: stukot w zaleznosci od - // tego gdzie - // jest tor - } - if (MyTrack->fSoundDistance != dRailLength) - { - dRailLength = MyTrack->fSoundDistance; - for (int i = 0; i < iAxles; i++) - { - dRailPosition[i] = dWheelsPosition[i] + MoverParameters->Dim.L; + } + if( dRailLength != -1 ) { + if( std::abs( MoverParameters->V ) > 0 ) { + + double volume = ( 20.0 + MyTrack->iDamageFlag ) / 21; + switch( MyTrack->eEnvironment ) { + case e_tunnel: { + volume *= 1.1; + break; + } + case e_bridge: { + volume *= 1.2; + break; + } + default: { + break; + } } - } - if (dRailLength != -1) - { - if (abs(MoverParameters->V) > 0) - { - for (int i = 0; i < iAxles; i++) - { - dRailPosition[i] -= dDOMoveLen * Sign(dDOMoveLen); - if (dRailPosition[i] < 0) - { - // McZapkie-040302 - if (i == iAxles - 1) - { - rsStukot[0].Stop(); - MoverParameters->AccV += - 0.5 * GetVelocity() / (1 + MoverParameters->Vmax); - } - else - { - rsStukot[i + 1].Stop(); - } - rsStukot[i].Play(vol, 0, MechInside, vPosition); // poprawic pozycje o uklad osi - if (i == 1) - MoverParameters->AccV -= - 0.5 * GetVelocity() / (1 + MoverParameters->Vmax); - dRailPosition[i] += dRailLength; + + for( int i = 0; i < iAxles; ++i ) { + dRailPosition[ i ] -= dDOMoveLen * Sign( dDOMoveLen ); + if( dRailPosition[ i ] < 0 ) { +/* + // McZapkie-040302 + if( i == iAxles - 1 ) { + rsStukot[ 0 ].stop(); + MoverParameters->AccV += 0.5 * GetVelocity() / ( 1 + MoverParameters->Vmax ); } + else { + rsStukot[ i + 1 ].stop(); + } + if( i == 1 ) { + MoverParameters->AccV -= 0.5 * GetVelocity() / ( 1 + MoverParameters->Vmax ); + } +*/ + rsStukot[ i ].gain( volume ).play(); + dRailPosition[ i ] += dRailLength; } } } @@ -2975,32 +3110,6 @@ bool TDynamicObject::Update(double dt, double dt1) } // McZapkie-260202 end - // yB: przyspieszacz (moze zadziala, ale dzwiek juz jest) - int flag = MoverParameters->Hamulec->GetSoundFlag(); - if ((bBrakeAcc) && (TestFlag(flag, sf_Acc)) && (ObjectDist < 2500)) - { - sBrakeAcc->SetVolume(-ObjectDist * 3 - (FreeFlyModeFlag ? 0 : 2000)); - sBrakeAcc->Play(0, 0, 0); - sBrakeAcc->SetPan(10000 * sin(ModCamRot)); - } - if ((rsUnbrake.AM != 0) && (ObjectDist < 5000)) - { - if ((TestFlag(flag, sf_CylU)) && - ((MoverParameters->BrakePress * MoverParameters->MaxBrakePress[3]) > 0.05)) - { - vol = Min0R( - 0.2 + - 1.6 * sqrt((MoverParameters->BrakePress > 0 ? MoverParameters->BrakePress : 0) / - MoverParameters->MaxBrakePress[3]), - 1); - vol = vol + (FreeFlyModeFlag ? 0 : -0.5) - ObjectDist / 5000; - rsUnbrake.SetPan(10000 * sin(ModCamRot)); - rsUnbrake.Play(vol, DSBPLAY_LOOPING, MechInside, GetPosition()); - } - else - rsUnbrake.Stop(); - } -#endif // fragment z EXE Kursa /* if (MoverParameters->TrainType==dt_ET42) { @@ -3112,11 +3221,12 @@ bool TDynamicObject::Update(double dt, double dt1) { if( ( MoverParameters->PantFrontVolt == 0.0 ) && ( MoverParameters->PantRearVolt == 0.0 ) ) { -#ifdef EU07_USE_OLD_SOUNDCODE - sPantUp.Play( vol, 0, MechInside, vPosition ); -#else - sPantUp.play(); -#endif + for( auto &pantograph : m_pantographsounds ) { + if( pantograph.sPantUp.offset().z > 0 ) { + // limit to pantographs located in the front half of the vehicle + pantograph.sPantUp.play( sound_flags::exclusive ); + } + } } if (p->hvPowerWire) { // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() @@ -3144,11 +3254,12 @@ bool TDynamicObject::Update(double dt, double dt1) { if( ( MoverParameters->PantRearVolt == 0.0 ) && ( MoverParameters->PantFrontVolt == 0.0 ) ) { -#ifdef EU07_USE_OLD_SOUNDCODE - sPantUp.Play( vol, 0, MechInside, vPosition ); -#else - sPantUp.play(); -#endif + for( auto &pantograph : m_pantographsounds ) { + if( pantograph.sPantUp.offset().z < 0 ) { + // limit to pantographs located in the rear half of the vehicle + pantograph.sPantUp.play( sound_flags::exclusive ); + } + } } if (p->hvPowerWire) { // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() @@ -3235,20 +3346,22 @@ bool TDynamicObject::Update(double dt, double dt1) } // koniec pętli po pantografach if ((MoverParameters->PantFrontSP == false) && (MoverParameters->PantFrontUp == false)) { -#ifdef EU07_USE_OLD_SOUNDCODE - sPantDown.Play(vol, 0, MechInside, vPosition); -#else - sPantDown.play(); -#endif + for( auto &pantograph : m_pantographsounds ) { + if( pantograph.sPantDown.offset().z > 0 ) { + // limit to pantographs located in the front half of the vehicle + pantograph.sPantDown.play( sound_flags::exclusive ); + } + } MoverParameters->PantFrontSP = true; } if ((MoverParameters->PantRearSP == false) && (MoverParameters->PantRearUp == false)) { -#ifdef EU07_USE_OLD_SOUNDCODE - sPantDown.Play(vol, 0, MechInside, vPosition); -#else - sPantDown.play(); -#endif + for( auto &pantograph : m_pantographsounds ) { + if( pantograph.sPantDown.offset().z < 0 ) { + // limit to pantographs located in the rear half of the vehicle + pantograph.sPantDown.play( sound_flags::exclusive ); + } + } MoverParameters->PantRearSP = true; } /* @@ -3349,59 +3462,29 @@ bool TDynamicObject::Update(double dt, double dt1) } // NBMX Obsluga drzwi, MC: zuniwersalnione - if ((dDoorMoveL < MoverParameters->DoorMaxShiftL) && (MoverParameters->DoorLeftOpened)) - { -#ifdef EU07_USE_OLD_SOUNDCODE - rsDoorOpen.Play(1, 0, MechInside, vPosition); -#else - rsDoorClose.stop(); - rsDoorOpen.play(); -#endif - dDoorMoveL += dt1 * 0.5 * MoverParameters->DoorOpenSpeed; - } - if ((dDoorMoveL > 0) && (!MoverParameters->DoorLeftOpened)) - { -#ifdef EU07_USE_OLD_SOUNDCODE - rsDoorClose.Play(1, 0, MechInside, vPosition); -#else - rsDoorOpen.stop(); - rsDoorClose.play(); -#endif - dDoorMoveL -= dt1 * MoverParameters->DoorCloseSpeed; - if (dDoorMoveL < 0) - dDoorMoveL = 0; + if( ( dDoorMoveL < MoverParameters->DoorMaxShiftL ) + && ( true == MoverParameters->DoorLeftOpened ) ) { + dDoorMoveL += dt1 * MoverParameters->DoorOpenSpeed; + dDoorMoveL = std::min( dDoorMoveL, MoverParameters->DoorMaxShiftL ); } - if ((dDoorMoveR < MoverParameters->DoorMaxShiftR) && (MoverParameters->DoorRightOpened)) - { -#ifdef EU07_USE_OLD_SOUNDCODE - rsDoorOpen.Play(1, 0, MechInside, vPosition); -#else - rsDoorClose.stop(); - rsDoorOpen.play(); -#endif - dDoorMoveR += dt1 * 0.5 * MoverParameters->DoorOpenSpeed; + if( ( dDoorMoveL > 0 ) + && ( false == MoverParameters->DoorLeftOpened ) ) { + dDoorMoveL -= dt1 * MoverParameters->DoorCloseSpeed; + dDoorMoveL = std::max( dDoorMoveL, 0.0 ); + } + if( ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) + && ( true == MoverParameters->DoorRightOpened ) ) { + dDoorMoveR += dt1 * MoverParameters->DoorOpenSpeed; + dDoorMoveR = std::min( dDoorMoveR, MoverParameters->DoorMaxShiftR ); } - if ((dDoorMoveR > 0) && (!MoverParameters->DoorRightOpened)) - { -#ifdef EU07_USE_OLD_SOUNDCODE - rsDoorClose.Play(1, 0, MechInside, vPosition); -#else - rsDoorOpen.stop(); - rsDoorClose.play(); -#endif + if( ( dDoorMoveR > 0 ) + && ( false == MoverParameters->DoorRightOpened ) ) { dDoorMoveR -= dt1 * MoverParameters->DoorCloseSpeed; - if (dDoorMoveR < 0) - dDoorMoveR = 0; + dDoorMoveR = std::max( dDoorMoveR, 0.0 ); } // compartment lights -/* - if( ( ctOwner != nullptr ? - ctOwner->Controlling()->Battery != SectionLightsActive : - MoverParameters->Battery != SectionLightsActive ) ) { - // if the vehicle has a controller, we base the light state on state of the controller otherwise we check the vehicle itself -*/ - // the version above won't work as the vehicles don't turn batteries off :| + // if the vehicle has a controller, we base the light state on state of the controller otherwise we check the vehicle itself if( ( ctOwner != nullptr ? ctOwner->Controlling()->Battery != SectionLightsActive : SectionLightsActive == true ) ) { // without controller lights are off. NOTE: this likely mess up the EMU @@ -3516,241 +3599,147 @@ void TDynamicObject::TurnOff() // przeliczanie dźwięków, bo będzie słychać bez wyświetlania sektora z pojazdem void TDynamicObject::RenderSounds() { -#ifdef EU07_USE_OLD_SOUNDCODE - // McZapkie-010302: ulepszony dzwiek silnika - double freq; - double vol = 0; - double dt = Timer::GetDeltaRenderTime(); - if (MoverParameters->Power > 0) - { - if ((rsSilnik.AM != 0) - && ((MoverParameters->Mains) - // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach - || (MoverParameters->EngineType == DieselEngine))) - { - if ((fabs(MoverParameters->enrot) > 0.01) || - (MoverParameters->EngineType == Dumb)) //&& (MoverParameters->EnginePower>0.1)) - { - freq = rsSilnik.FM * fabs(MoverParameters->enrot) + rsSilnik.FA; - if (MoverParameters->EngineType == Dumb) - freq = freq - 0.2 * MoverParameters->EnginePower / (1 + MoverParameters->Power * 1000); - rsSilnik.AdjFreq(freq, dt); - if (MoverParameters->EngineType == DieselEngine) - { - if (MoverParameters->enrot > 0) - { - if (MoverParameters->EnginePower > 0) - vol = rsSilnik.AM * MoverParameters->dizel_fill + rsSilnik.AA; - else - vol = - rsSilnik.AM * fabs(MoverParameters->enrot / MoverParameters->dizel_nmax) + - rsSilnik.AA * 0.9; + // McZapkie-010302: ulepszony dzwiek silnika + double frequency { 1.0 }; + double volume { 1.0 }; + double const dt { Timer::GetDeltaRenderTime() }; + + // engine sounds + if( MoverParameters->Power > 0 ) { + + if( ( true == MoverParameters->Mains ) + || ( MoverParameters->EngineType == DieselEngine ) ) { + + if( ( std::fabs( MoverParameters->enrot ) > 0.01 ) + // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach + || ( MoverParameters->EngineType == Dumb ) ) { + + // frequency calculation + frequency = rsSilnik.m_frequencyfactor * std::fabs( MoverParameters->enrot ) + rsSilnik.m_frequencyoffset; + if( MoverParameters->EngineType == Dumb ) { + frequency -= 0.2 * MoverParameters->EnginePower / ( 1 + MoverParameters->Power * 1000 ); + } + + // base volume calculation + switch( MoverParameters->EngineType ) { + case DieselEngine: { + if( MoverParameters->enrot > 0.0 ) { + if( MoverParameters->EnginePower > 0 ) { + volume = rsSilnik.m_amplitudefactor * MoverParameters->dizel_fill + rsSilnik.m_amplitudeoffset; + } + else { + volume = rsSilnik.m_amplitudefactor * std::fabs( MoverParameters->enrot / MoverParameters->dizel_nmax ) + rsSilnik.m_amplitudeoffset * 0.9f; + } + } + else { + volume = 0.f; + } + break; + } + case DieselElectric: { + volume = + rsSilnik.m_amplitudefactor * ( MoverParameters->EnginePower / 1000 / MoverParameters->Power ) + + 0.2 * ( MoverParameters->enrot * 60 ) / ( MoverParameters->DElist[ MoverParameters->MainCtrlPosNo ].RPM ) + + rsSilnik.m_amplitudeoffset; + break; + } + case ElectricInductionMotor: { + volume = + rsSilnik.m_amplitudefactor * ( MoverParameters->EnginePower + std::fabs( MoverParameters->enrot * 2 ) ) + + rsSilnik.m_amplitudeoffset; + break; + } + default: { + volume = + rsSilnik.m_amplitudefactor * ( MoverParameters->EnginePower / 1000 + std::fabs( MoverParameters->enrot ) * 60.0 ) + + rsSilnik.m_amplitudeoffset; + break; } - else - vol = 0; } - else if (MoverParameters->EngineType == DieselElectric) - vol = rsSilnik.AM * - (MoverParameters->EnginePower / 1000 / MoverParameters->Power) + - 0.2 * (MoverParameters->enrot * 60) / - (MoverParameters->DElist[MoverParameters->MainCtrlPosNo].RPM) + - rsSilnik.AA; - else if (MoverParameters->EngineType == ElectricInductionMotor) - vol = rsSilnik.AM * - (MoverParameters->EnginePower + fabs(MoverParameters->enrot * 2)) + - rsSilnik.AA; - else - vol = rsSilnik.AM * (MoverParameters->EnginePower / 1000 + - fabs(MoverParameters->enrot) * 60.0) + - rsSilnik.AA; - // McZapkie-250302 - natezenie zalezne od obrotow i mocy - if ((vol < 1) && (MoverParameters->EngineType == ElectricSeriesMotor) && - (MoverParameters->EnginePower < 100)) - { - float volrnd = - Random(100) * MoverParameters->enrot / (1 + MoverParameters->nmax); - if (volrnd < 2) - vol = vol + volrnd / 200.0; + + if( MoverParameters->EngineType == ElectricSeriesMotor ) { + + // volume variation + if( ( volume < 1.0 ) + && ( MoverParameters->EnginePower < 100 ) ) { + + auto const volumevariation{ Random( 100 ) * MoverParameters->enrot / ( 1 + MoverParameters->nmax ) }; + if( volumevariation < 2 ) { + volume += volumevariation / 200; + } + } + + if( ( MoverParameters->DynamicBrakeFlag ) + && ( MoverParameters->EnginePower > 0.1 ) ) { + // Szociu - 29012012 - jeżeli uruchomiony jest hamulec elektrodynamiczny, odtwarzany jest dźwięk silnika + volume += 0.8; + } } + + // volume environmental factor switch( MyTrack->eEnvironment ) { case e_tunnel: { - vol += 0.1; + volume += 0.1; break; } case e_canyon: { - vol += 0.05; + volume += 0.05; break; } default: { break; } } - if( ( MoverParameters->DynamicBrakeFlag ) - && ( MoverParameters->EnginePower > 0.1 ) - && ( MoverParameters->EngineType == ElectricSeriesMotor ) ) - // Szociu - 29012012 - jeżeli uruchomiony jest hamulec elektrodynamiczny, odtwarzany jest dźwięk silnika - vol += 0.8; - if (enginevolume > 0.0001) - if (MoverParameters->EngineType != DieselElectric) - { - rsSilnik.Play(enginevolume, DSBPLAY_LOOPING, MechInside, GetPosition()); + if( enginevolume >= 0.05 ) { + + if( MoverParameters->EngineType != DieselElectric ) { + + rsSilnik + .pitch( frequency ) + .gain( enginevolume ) + .play( sound_flags::exclusive | sound_flags::looping ); } - else - { - sConverter.UpdateAF(vol, freq, MechInside, GetPosition()); + else { - float fincvol; - fincvol = 0; - if ((MoverParameters->ConverterFlag) && - (MoverParameters->enrot * 60 > MoverParameters->DElist[0].RPM)) - { - fincvol = (MoverParameters->DElist[MoverParameters->MainCtrlPos].RPM - - (MoverParameters->enrot * 60)); - fincvol /= (0.05 * MoverParameters->DElist[0].RPM); + sConverter + .pitch( frequency ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + + float fincvol { 0 }; + if( ( MoverParameters->ConverterFlag ) + && ( MoverParameters->enrot * 60 > MoverParameters->DElist[ 0 ].RPM ) ) { + + fincvol = ( MoverParameters->DElist[ MoverParameters->MainCtrlPos ].RPM - ( MoverParameters->enrot * 60 ) ); + fincvol /= ( 0.05 * MoverParameters->DElist[ 0 ].RPM ); }; - if (fincvol > 0.02) - rsDiesielInc.Play(fincvol, DSBPLAY_LOOPING, MechInside, GetPosition()); - else - rsDiesielInc.Stop(); + if( fincvol > 0.02 ) { + rsDieselInc + .gain( fincvol ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsDieselInc.stop(); + } } - } - else - rsSilnik.Stop(); - } - enginevolume = (enginevolume + vol) * 0.5; - if( enginevolume < 0.01 ) { - rsSilnik.Stop(); - } - if ( ( MoverParameters->EngineType == ElectricSeriesMotor ) - || ( MoverParameters->EngineType == ElectricInductionMotor ) - && ( rsWentylator.AM != 0 ) ) - { - if (MoverParameters->RventRot > 0.1) { - // play ventilator sound if the ventilators are rotating fast enough... - freq = rsWentylator.FM * MoverParameters->RventRot + rsWentylator.FA; - rsWentylator.AdjFreq(freq, dt); - if( MoverParameters->EngineType == ElectricInductionMotor ) { - - vol = rsWentylator.AM * std::sqrt( std::fabs( MoverParameters->dizel_fill ) ) + rsWentylator.AA; } - else { - - vol = rsWentylator.AM * MoverParameters->RventRot + rsWentylator.AA; - } - rsWentylator.Play(vol, DSBPLAY_LOOPING, MechInside, GetPosition()); } else { - // ...otherwise shut down the sound - rsWentylator.Stop(); + rsSilnik.stop(); } } - if (MoverParameters->TrainType == dt_ET40) - { - if (MoverParameters->Vel > 0.1) - { - freq = rsPrzekladnia.FM * (MoverParameters->Vel) + rsPrzekladnia.FA; - rsPrzekladnia.AdjFreq(freq, dt); - vol = rsPrzekladnia.AM * (MoverParameters->Vel) + rsPrzekladnia.AA; - rsPrzekladnia.Play(vol, DSBPLAY_LOOPING, MechInside, GetPosition()); - } - else - rsPrzekladnia.Stop(); + enginevolume = ( enginevolume + volume ) * 0.5; + if( enginevolume < 0.05 ) { + rsSilnik.stop(); } - } - - // youBy: dzwiek ostrych lukow i ciasnych zwrotek - - if ((ts.R * ts.R > 1) && (MoverParameters->Vel > 0)) - vol = MoverParameters->AccN * MoverParameters->AccN; - else - vol = 0; - // vol+=(50000/ts.R*ts.R); - - if (vol > 0.001) - { - rscurve.Play(2 * vol, DSBPLAY_LOOPING, MechInside, GetPosition()); - } - else - rscurve.Stop(); - - // McZapkie-280302 - pisk mocno zacisnietych hamulcow - trzeba jeszcze - // zabezpieczyc przed - // brakiem deklaracji w mmedia.dta - if (rsPisk.AM != 0) - { - if ((MoverParameters->Vel > (rsPisk.GetStatus() != 0 ? 0.01 : 0.5)) && - (!MoverParameters->SlippingWheels) && (MoverParameters->UnitBrakeForce > rsPisk.AM)) - { - vol = MoverParameters->UnitBrakeForce / (rsPisk.AM + 1) + rsPisk.AA; - rsPisk.Play(vol, DSBPLAY_LOOPING, MechInside, GetPosition()); - } - else - rsPisk.Stop(); - } - - if (MoverParameters->SandDose) // Dzwiek piasecznicy - sSand.TurnOn(MechInside, GetPosition()); - else - sSand.TurnOff(MechInside, GetPosition()); - sSand.Update(MechInside, GetPosition()); - if (MoverParameters->Hamulec->GetStatus() & b_rls) // Dzwiek odluzniacza - sReleaser.TurnOn(MechInside, GetPosition()); - else - sReleaser.TurnOff(MechInside, GetPosition()); - //sReleaser.Update(MechInside, GetPosition()); - double releaser_vol = 1; - if (MoverParameters->BrakePress < 0.1) - releaser_vol = MoverParameters->BrakePress * 10; - sReleaser.UpdateAF(releaser_vol, 1, MechInside, GetPosition()); - - // McZapkie! - dzwiek compressor.wav tylko gdy dziala sprezarka - if (MoverParameters->VeselVolume != 0) - { - if (MoverParameters->CompressorFlag) - sCompressor.TurnOn(MechInside, GetPosition()); - else - sCompressor.TurnOff(MechInside, GetPosition()); - sCompressor.Update(MechInside, GetPosition()); - } - if (MoverParameters->PantCompFlag) // Winger 160404 - dzwiek malej sprezarki - sSmallCompressor.TurnOn(MechInside, GetPosition()); - else - sSmallCompressor.TurnOff(MechInside, GetPosition()); - sSmallCompressor.Update(MechInside, GetPosition()); - - // youBy - przenioslem, bo diesel tez moze miec turbo - if( (MoverParameters->TurboTest > 0) - && (MoverParameters->MainCtrlPos >= MoverParameters->TurboTest)) - { - // udawanie turbo: (6.66*(eng_vol-0.85)) - if (eng_turbo > 6.66 * (enginevolume - 0.8) + 0.2 * dt) - eng_turbo = eng_turbo - 0.2 * dt; // 0.125 - else if (eng_turbo < 6.66 * (enginevolume - 0.8) - 0.4 * dt) - eng_turbo = eng_turbo + 0.4 * dt; // 0.333 - else - eng_turbo = 6.66 * (enginevolume - 0.8); - - sTurbo.TurnOn(MechInside, GetPosition()); - // sTurbo.UpdateAF(eng_turbo,0.7+(eng_turbo*0.6),MechInside,GetPosition()); - sTurbo.UpdateAF(3 * eng_turbo - 1, 0.4 + eng_turbo * 0.4, MechInside, GetPosition()); - // eng_vol_act=enginevolume; - // eng_frq_act=eng_frq; - } - else - sTurbo.TurnOff(MechInside, GetPosition()); - +/* +// NOTE: experimentally disabled to see if it's still used anywhere if (MoverParameters->TrainType == dt_PseudoDiesel) { // ABu: udawanie woodwarda dla lok. spalinowych // jesli silnik jest podpiety pod dzwiek przetwornicy - if (MoverParameters->ConverterFlag) // NBMX dzwiek przetwornicy - { - sConverter.TurnOn(MechInside, GetPosition()); - } - else - sConverter.TurnOff(MechInside, GetPosition()); // glosnosc zalezy od stosunku mocy silnika el. do mocy max double eng_vol; @@ -3812,105 +3801,505 @@ void TDynamicObject::RenderSounds() { eng_vol_act = eng_vol; // eng_frq_act=eng_frq; } - else - { - if (MoverParameters->ConverterFlag) // NBMX dzwiek przetwornicy - sConverter.TurnOn(MechInside, GetPosition()); - else - sConverter.TurnOff(MechInside, GetPosition()); - sConverter.Update(MechInside, GetPosition()); - } +*/ - if( TestFlag( MoverParameters->WarningSignal, 1 ) ) { - sHorn1.TurnOn( MechInside, GetPosition() ); - } - else { - sHorn1.TurnOff( MechInside, GetPosition() ); - } - if( TestFlag( MoverParameters->WarningSignal, 2 ) ) { - sHorn2.TurnOn( MechInside, GetPosition() ); - } - else { - sHorn2.TurnOff( MechInside, GetPosition() ); - } + if( ( MoverParameters->EngineType == ElectricSeriesMotor ) + || ( MoverParameters->EngineType == ElectricInductionMotor ) ) { - if (MoverParameters->DoorClosureWarning) - { - if (MoverParameters->DepartureSignal) // NBMX sygnal odjazdu, MC: pod warunkiem ze jest - // zdefiniowane w chk - sDepartureSignal.TurnOn(MechInside, GetPosition()); - else - sDepartureSignal.TurnOff(MechInside, GetPosition()); - sDepartureSignal.Update(MechInside, GetPosition()); - } - sHorn1.Update(MechInside, GetPosition()); - sHorn2.Update(MechInside, GetPosition()); - // McZapkie: w razie wykolejenia - if (MoverParameters->EventFlag) - { - if (TestFlag(MoverParameters->DamageFlag, dtrain_out) && GetVelocity() > 0) - rsDerailment.Play(1, 0, true, GetPosition()); - if (GetVelocity() == 0) - rsDerailment.Stop(); - } -#else -// McZapkie! - dzwiek compressor.wav tylko gdy dziala sprezarka -if( MoverParameters->VeselVolume != 0 ) { + if( MoverParameters->RventRot > 0.1 ) { + // play ventilator sound if the ventilators are rotating fast enough... + volume = ( + MoverParameters->EngineType == ElectricInductionMotor ? + rsWentylator.m_amplitudefactor * std::sqrt( std::fabs( MoverParameters->dizel_fill ) ) + rsWentylator.m_amplitudeoffset : + rsWentylator.m_amplitudefactor * MoverParameters->RventRot + rsWentylator.m_amplitudeoffset ); - if( MoverParameters->TrainType != dt_PseudoDiesel ) { - // NBMX dzwiek przetwornicy - if( MoverParameters->ConverterFlag ) { - sConverter.play(); + rsWentylator + .pitch( rsWentylator.m_frequencyfactor * MoverParameters->RventRot + rsWentylator.m_frequencyoffset ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + // ...otherwise shut down the sound + rsWentylator.stop(); + } + } + + + if( MoverParameters->TrainType == dt_ET40 ) { + if( MoverParameters->Vel > 0.1 ) { + rsPrzekladnia + .pitch( rsPrzekladnia.m_frequencyfactor * ( MoverParameters->Vel ) + rsPrzekladnia.m_frequencyoffset ) + .gain( rsPrzekladnia.m_amplitudefactor * ( MoverParameters->Vel ) + rsPrzekladnia.m_amplitudeoffset ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsPrzekladnia.stop(); + } + } + + + if( MoverParameters->dizel_engage > 0.1 ) { + if( std::abs( MoverParameters->dizel_engagedeltaomega ) > 0.2 ) { + + frequency = rsEngageSlippery.m_frequencyfactor * std::fabs( MoverParameters->dizel_engagedeltaomega ) + rsEngageSlippery.m_frequencyoffset; + volume = rsEngageSlippery.m_amplitudefactor * ( MoverParameters->dizel_engage ) + rsEngageSlippery.m_amplitudeoffset; + } + else { + frequency = 1.f; // rsEngageSlippery.FA+0.7*rsEngageSlippery.FM*(fabs(mvControlled->enrot)+mvControlled->nmax); + volume = ( + MoverParameters->dizel_engage > 0.2 ? + 0.2 * rsEngageSlippery.m_amplitudefactor * ( MoverParameters->enrot / MoverParameters->nmax ) + rsEngageSlippery.m_amplitudeoffset : + 0.f ); + } + rsEngageSlippery + .pitch( frequency ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); } else { - sConverter.stop(); + rsEngageSlippery.stop(); } + + + // youBy - przenioslem, bo diesel tez moze miec turbo + if( MoverParameters->TurboTest > 0 ) { + // udawanie turbo: + auto const goalpitch { 6.66 * ( enginevolume - 0.8 ) }; + auto const goalvolume{ 3 * eng_turbo - 1 }; + auto const currentvolume { sTurbo.gain() }; + auto const changerate{ 0.4 * dt }; + + if( ( MoverParameters->MainCtrlPos >= MoverParameters->TurboTest ) + && ( MoverParameters->enrot > 0.1 ) ) { + + eng_turbo = ( + eng_turbo > goalpitch ? + std::max( goalpitch, eng_turbo - changerate * 0.5 ) : + std::min( goalpitch, eng_turbo + changerate ) ); + + volume = ( + currentvolume > goalvolume ? + std::max( goalvolume, currentvolume - changerate ) : + std::min( goalvolume, currentvolume + changerate ) ); + + sTurbo + .pitch( eng_turbo * 0.4 + 0.4 ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + eng_turbo = std::max( goalpitch, eng_turbo - changerate * 0.5 ); + volume = std::max( 0.0, sTurbo.gain() - 10.0 * dt ); + if( volume > 0.05 ) { + sTurbo + .pitch( 0.4 + eng_turbo * 0.4 ) + .gain( volume ); + } + else { + sTurbo.stop(); + } + } + } + + + // diesel startup + if( MoverParameters->EngineType == DieselEngine ) { + if( true == MoverParameters->dizel_enginestart ) { + dsbDieselIgnition.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + dsbDieselIgnition.stop(); + } + } + + } // if enginepower + + // NBMX dzwiek przetwornicy + if( MoverParameters->ConverterFlag ) { + sConverter.play( sound_flags::exclusive | sound_flags::looping ); } else { + sConverter.stop(); } - if( MoverParameters->CompressorFlag ) { - sCompressor.play(); - } - else { - sCompressor.stop(); + if( MoverParameters->VeselVolume != 0 ) { + // McZapkie! - dzwiek compressor.wav tylko gdy dziala sprezarka + if( MoverParameters->CompressorFlag ) { + sCompressor.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + sCompressor.stop(); + } } + + // Winger 160404 - dzwiek malej sprezarki if( MoverParameters->PantCompFlag ) { - // Winger 160404 - dzwiek malej sprezarki - sSmallCompressor.play(); + sSmallCompressor.play( sound_flags::exclusive | sound_flags::looping ); } else { sSmallCompressor.stop(); } - - if( TestFlag( MoverParameters->WarningSignal, 1 ) ) { - sHorn1.play(); + + // brake system and braking sounds: + if( m_lastbrakepressure != -1.f ) { + // calculate rate of pressure change in brake cylinder, once it's been initialized + auto const brakepressuredifference { m_lastbrakepressure - MoverParameters->BrakePress }; + m_brakepressurechange = interpolate( m_brakepressurechange, 10 * ( brakepressuredifference / dt ), 0.1f ); + } + m_lastbrakepressure = MoverParameters->BrakePress; + if( m_brakepressurechange > 0.05f ) { + // NOTE: can't use the leak rate directly due to irregular results produced by some brake type implementations + rsUnbrake + .gain( static_cast( std::max( MoverParameters->BrakePress, 0.0 ) / MoverParameters->MaxBrakePress[ 3 ] ) ) + .play( sound_flags::exclusive | sound_flags::looping ); } else { - sHorn1.stop(); - } - if( TestFlag( MoverParameters->WarningSignal, 2 ) ) { - sHorn2.play(); - } - else { - sHorn2.stop(); + // don't stop the sound too abruptly + volume = std::max( 0.0, rsUnbrake.gain() - 0.2 * dt ); + rsUnbrake.gain( volume ); + if( volume < 0.05 ) { + rsUnbrake.stop(); + } } + // Dzwiek odluzniacza + if( MoverParameters->Hamulec->GetStatus() & b_rls ) { + sReleaser + .gain( + clamp( + MoverParameters->BrakePress * 1.25f, // arbitrary multiplier + 0.f, 1.f ) ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + sReleaser.stop(); + } + + if( MoverParameters->SlippingWheels ) { + + if( ( MoverParameters->UnitBrakeForce > 100.0 ) + && ( GetVelocity() > 1.0 ) ) { + + auto const velocitydifference { GetVelocity() / MoverParameters->Vmax }; + rsSlippery + .gain( rsSlippery.m_amplitudefactor * velocitydifference + rsSlippery.m_amplitudeoffset ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + } + else { + rsSlippery.stop(); + } + + // Dzwiek piasecznicy + if( MoverParameters->SandDose ) { + sSand.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + sSand.stop(); + } + + if( /*( false == mvOccupied->SlippingWheels ) + &&*/ ( MoverParameters->UnitBrakeForce > 10.0 ) + && ( GetVelocity() > 0.05 ) ) { + + rsBrake + .pitch( clamp( rsBrake.m_frequencyfactor * GetVelocity() + rsBrake.m_frequencyoffset, 0.5, 1.15 ) ) // arbitrary limits + .gain( rsBrake.m_amplitudefactor * std::sqrt( ( GetVelocity() * MoverParameters->UnitBrakeForce ) ) + rsBrake.m_amplitudeoffset ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsBrake.stop(); + } + + // yB: przyspieszacz (moze zadziala, ale dzwiek juz jest) + if( true == bBrakeAcc ) { + if( true == TestFlag( MoverParameters->Hamulec->GetSoundFlag(), sf_Acc ) ) { + sBrakeAcc.play( sound_flags::exclusive ); + } + } + + // McZapkie-280302 - pisk mocno zacisnietych hamulcow + if( /*( false == MoverParameters->SlippingWheels ) + &&*/ ( MoverParameters->UnitBrakeForce > rsPisk.m_amplitudefactor ) + && ( MoverParameters->Vel > ( + true == rsPisk.is_playing() ? + 0.05 : + 0.5 ) ) ) { + + rsPisk + .gain( MoverParameters->UnitBrakeForce / ( rsPisk.m_amplitudefactor + 1 ) + rsPisk.m_amplitudeoffset ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + // don't stop the sound too abruptly + volume = std::max( 0.0, rsPisk.gain() - ( rsPisk.gain() * 1.5 * dt ) ); + rsPisk.gain( volume ); + if( volume < 0.05 ) { + rsPisk.stop(); + } + } + + // other sounds + // NBMX sygnal odjazdu if( MoverParameters->DoorClosureWarning ) { if( MoverParameters->DepartureSignal ) { - // NBMX sygnal odjazdu // MC: pod warunkiem ze jest zdefiniowane w chk - sDepartureSignal.play(); + sDepartureSignal.play( sound_flags::exclusive | sound_flags::looping ); } else { sDepartureSignal.stop(); } } + // NBMX Obsluga drzwi, MC: zuniwersalnione + if( ( true == MoverParameters->DoorLeftOpened ) + && ( dDoorMoveL < MoverParameters->DoorMaxShiftL ) ) { -} + for( auto &door : m_doorsounds ) { + if( door.rsDoorClose.offset().x > 0.f ) { + // determine left side doors from their offset + door.rsDoorOpen.play( sound_flags::exclusive ); + door.rsDoorClose.stop(); + } + } + } + if( ( false == MoverParameters->DoorLeftOpened ) + && ( dDoorMoveL > 0.01 ) ) { + + for( auto &door : m_doorsounds ) { + if( door.rsDoorClose.offset().x > 0.f ) { + // determine left side doors from their offset + door.rsDoorClose.play( sound_flags::exclusive ); + door.rsDoorOpen.stop(); + } + } + } + if( ( true == MoverParameters->DoorRightOpened ) + && ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) ) { + + for( auto &door : m_doorsounds ) { + if( door.rsDoorClose.offset().x < 0.f ) { + // determine left side doors from their offset + door.rsDoorOpen.play( sound_flags::exclusive ); + door.rsDoorClose.stop(); + } + } + } + if( ( false == MoverParameters->DoorRightOpened ) + && ( dDoorMoveR > 0.01 ) ) { + + for( auto &door : m_doorsounds ) { + if( door.rsDoorClose.offset().x < 0.f ) { + // determine left side doors from their offset + door.rsDoorClose.play( sound_flags::exclusive ); + door.rsDoorOpen.stop(); + } + } + } + // horns + if( TestFlag( MoverParameters->WarningSignal, 1 ) ) { + sHorn1.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + sHorn1.stop(); + } + if( TestFlag( MoverParameters->WarningSignal, 2 ) ) { + sHorn2.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + sHorn2.stop(); + } + + // szum w czasie jazdy + if( GetVelocity() > 0.5 ) { + + volume = rsRunningNoise.m_amplitudefactor * MoverParameters->Vel + rsRunningNoise.m_amplitudeoffset; + frequency = rsRunningNoise.m_frequencyfactor * MoverParameters->Vel + rsRunningNoise.m_frequencyoffset; + + if( false == TestFlag( MoverParameters->DamageFlag, dtrain_wheelwear ) ) { + // McZpakie-221103: halas zalezny od kola + switch( MyTrack->eEnvironment ) { + case e_tunnel: { + volume *= 3; + frequency *= 0.95; + break; + } + case e_canyon: { + volume *= 1.1; + break; + } + case e_bridge: { + volume *= 2; + frequency *= 0.98; + break; + } + default: { + break; + } + } + } + else { + // uszkodzone kolo (podkucie) + switch( MyTrack->eEnvironment ) { + case e_tunnel: { + volume *= 2; + break; + } + case e_canyon: { + volume *= 1.1; + break; + } + case e_bridge: { + volume *= 1.5; + break; + } + default: { + break; + } + } + } + if( std::abs( MoverParameters->nrot ) > 0.01 ) { + // hamulce wzmagaja halas + volume *= 1 + MoverParameters->UnitBrakeForce / ( 1 + MoverParameters->MaxBrakeForce ); + } + // scale volume by track quality + volume *= ( 20.0 + MyTrack->iDamageFlag ) / 21; + // scale volume with curve radius and vehicle speed + // TBD, TODO: disable the scaling for sounds combined from speed-based samples? + volume *= + interpolate( + 0.0, 1.0, + clamp( + MoverParameters->Vel / 80.0, + 0.0, 1.0 ) ); + rsRunningNoise + .pitch( clamp( frequency, 0.5, 1.15 ) ) // arbitrary limits to prevent the pitch going out of whack + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsRunningNoise.stop(); + } + + // youBy: dzwiek ostrych lukow i ciasnych zwrotek + if( ( ts.R * ts.R > 1 ) + && ( MoverParameters->Vel > 0 ) ) { + // scale volume with curve radius and vehicle speed + volume = + MoverParameters->AccN * MoverParameters->AccN + * interpolate( + 0.0, 1.0, + clamp( + MoverParameters->Vel / 40.0, + 0.0, 1.0 ) ); + } + else { + volume = 0; + } + if( volume > 0.05 ) { + rscurve + .gain( 2.0 * volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rscurve.stop(); + } + + // McZapkie! - to wazne - SoundFlag wystawiane jest przez moje moduly + // gdy zachodza pewne wydarzenia komentowane dzwiekiem. + if( TestFlag( MoverParameters->SoundFlag, sound::relay ) ) { + // przekaznik - gdy bezpiecznik, automatyczny rozruch itp + if( true == TestFlag( MoverParameters->SoundFlag, sound::parallel ) ) { + if( TestFlag( MoverParameters->SoundFlag, sound::loud ) ) + dsbWejscie_na_bezoporow.play(); + else + dsbWejscie_na_drugi_uklad.play(); + } + else { + dsbRelay + .gain( + true == TestFlag( MoverParameters->SoundFlag, sound::loud ) ? + 1.0f : + 0.8f ) + .play(); + } + } + + if( TestFlag( MoverParameters->SoundFlag, sound::pneumatic ) ) { + // pneumatic relay + dsbPneumaticRelay + .gain( + true == TestFlag( MoverParameters->SoundFlag, sound::loud ) ? + 1.0f : + 0.8f ) + .play(); + } + + // couplers + int couplerindex { 0 }; + for( auto &couplersounds : m_couplersounds ) { + + auto &coupler { MoverParameters->Couplers[ couplerindex ] }; + + if( true == TestFlag( coupler.sounds, sound::bufferclash ) ) { + // zderzaki uderzaja o siebie + couplersounds.dsbBufferClamp + .gain( + true == TestFlag( coupler.sounds, sound::loud ) ? + 1.f : + 0.65f ) + .play( sound_flags::exclusive ); + } + if( true == TestFlag( coupler.sounds, sound::couplerstretch ) ) { + // sprzegi sie rozciagaja + couplersounds.dsbCouplerStretch + .gain( + true == TestFlag( coupler.sounds, sound::loud ) ? + 1.f : + 0.65f ) + .play( sound_flags::exclusive ); + } + + coupler.sounds = 0; + ++couplerindex; + } + + MoverParameters->SoundFlag = 0; + // McZapkie! - koniec obslugi dzwiekow z mover.pas + +// special events + if( MoverParameters->EventFlag ) { + // TODO: dedicated sound, played alongside regular noise + if( true == TestFlag( MoverParameters->DamageFlag, dtrain_wheelwear ) ) { +#ifdef EU07_USE_OLD_SOUNDCODE + if( rsRunningNoise.AM != 0 ) { + rsRunningNoise.Stop(); + float am = rsRunningNoise.AM; + float fa = rsRunningNoise.FA; + float fm = rsRunningNoise.FM; + rsRunningNoise.Init( "lomotpodkucia.wav", -1, 0, 0, 0, true ); // MC: zmiana szumu na lomot + if( rsRunningNoise.AM == 1 ) + rsRunningNoise.AM = am; + rsRunningNoise.AA = 0.7; + rsRunningNoise.FA = fa; + rsRunningNoise.FM = fm; + } +#else #endif -}; + } + // McZapkie: w razie wykolejenia + if( true == TestFlag( MoverParameters->DamageFlag, dtrain_out ) ) { + if( GetVelocity() > 0 ) { + rsDerailment.play(); + } + else { + rsDerailment.stop(); + } + } + + MoverParameters->EventFlag = false; + } +} // McZapkie-250202 // wczytywanie pliku z danymi multimedialnymi (dzwieki) @@ -4421,37 +4810,42 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, pant1x = -pant1x; pant2x = -pant2x; } - if( pants ) { - for( int i = 0; i < iAnimType[ ANIM_PANTS ]; ++i ) { // przepisanie współczynników do pantografów (na razie - // nie będzie lepiej) - pants[ i ].fParamPants->fAngleL = - pants[i].fParamPants->fAngleL0; // początkowy kąt dolnego ramienia - pants[ i ].fParamPants->fAngleU = - pants[i].fParamPants->fAngleU0; // początkowy kąt + if( pants ) { + for( int i = 0; i < iAnimType[ ANIM_PANTS ]; ++i ) { + // przepisanie współczynników do pantografów (na razie nie będzie lepiej) + pants[ i ].fParamPants->fAngleL = pants[ i ].fParamPants->fAngleL0; // początkowy kąt dolnego ramienia + pants[ i ].fParamPants->fAngleU = pants[ i ].fParamPants->fAngleU0; // początkowy kąt // pants[i].fParamPants->PantWys=1.22*sin(pants[i].fParamPants->fAngleL)+1.755*sin(pants[i].fParamPants->fAngleU); // //wysokość początkowa // pants[i].fParamPants->PantWys=1.176289*sin(pants[i].fParamPants->fAngleL)+1.724482197*sin(pants[i].fParamPants->fAngleU); // //wysokość początkowa - if( pants[ i ].fParamPants->fHeight == 0.0 ) // gdy jest nieprawdopodobna wartość (np. nie znaleziony ślizg) + if( pants[ i ].fParamPants->fHeight == 0.0 ) // gdy jest nieprawdopodobna wartość (np. nie znaleziony ślizg) { // gdy pomiary modelu nie udały się, odczyt podanych parametrów z MMD - pants[ i ].fParamPants->vPos.x = ( i & 1 ) ? pant2x : pant1x; - pants[ i ].fParamPants->fHeight = - ( i & 1 ) ? pant2h : - pant1h; // wysokość ślizgu jest zapisana w MMD + pants[ i ].fParamPants->vPos.x = + ( i & 1 ) ? + pant2x : + pant1x; + pants[ i ].fParamPants->fHeight = + ( i & 1 ) ? + pant2h : + pant1h; // wysokość ślizgu jest zapisana w MMD } - pants[ i ].fParamPants->PantWys = - pants[ i ].fParamPants->fLenL1 * sin( pants[ i ].fParamPants->fAngleL ) + - pants[ i ].fParamPants->fLenU1 * sin( pants[ i ].fParamPants->fAngleU ) + - pants[i].fParamPants->fHeight; // wysokość początkowa + pants[ i ].fParamPants->PantWys = + pants[ i ].fParamPants->fLenL1 * sin( pants[ i ].fParamPants->fAngleL ) + + pants[ i ].fParamPants->fLenU1 * sin( pants[ i ].fParamPants->fAngleU ) + + pants[ i ].fParamPants->fHeight; // wysokość początkowa // pants[i].fParamPants->vPos.y=panty-panth-pants[i].fParamPants->PantWys; // //np. 4.429-0.097=4.332=~4.335 // pants[i].fParamPants->vPos.z=0; //niezerowe dla pantografów // asymetrycznych - pants[ i ].fParamPants->PantTraction = pants[ i ].fParamPants->PantWys; + pants[ i ].fParamPants->PantTraction = pants[ i ].fParamPants->PantWys; // połowa szerokości ślizgu; jest w "Power: CSW=" - pants[ i ].fParamPants->fWidth = 0.5 * MoverParameters->EnginePowerSource.CollectorParameters.CSW; + pants[ i ].fParamPants->fWidth = 0.5 * MoverParameters->EnginePowerSource.CollectorParameters.CSW; + + // create sound emitters for the pantograph + m_pantographsounds.emplace_back(); } - } + } } else if (token == "animpistonprefix:") { @@ -4553,16 +4947,16 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, */ else if( token == "animdoorprefix:" ) { - // nazwa animowanych drzwi + // nazwa animowanych drzwi int i, j; parser.getTokens(1, false); parser >> token; for (i = 0, j = 0; i < ANIM_DOORS; ++i) j += iAnimType[i]; // zliczanie wcześniejszych animacji for (i = 0; i < iAnimType[ANIM_DOORS]; ++i) // liczba drzwi { // NBMX wrzesien 2003: wyszukiwanie drzwi o nazwie str* + // ustalenie submodelu asAnimName = token + std::to_string(i + 1); - pAnimations[i + j].smAnimated = - mdModel->GetFromName(asAnimName); // ustalenie submodelu + pAnimations[i + j].smAnimated = mdModel->GetFromName(asAnimName); if (pAnimations[i + j].smAnimated) { //++iAnimatedDoors; pAnimations[i + j].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu @@ -4589,13 +4983,15 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, pAnimations[i + j].fSpeed = (pAnimations[i + j].fSpeed + 100) / 100; // Ra: te współczynniki są bez sensu, bo modyfikują wektor przesunięcia } + // create sound emitters for the door + m_doorsounds.emplace_back(); } } } while( ( token != "" ) && ( token != "endmodels" ) ); - } + } // models else if( token == "sounds:" ) { // dzwieki @@ -4606,25 +5002,19 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // polozenia osi w/m srodka pojazdu parser.getTokens( 1, false ); parser >> dSDist; - for( int i = 0; i < iAxles; i++ ) { + for( int i = 0; i < iAxles; ++i ) { parser.getTokens( 1, false ); parser >> dWheelsPosition[ i ]; parser.getTokens(); parser >> token; if( token != "end" ) { -#ifdef EU07_USE_OLD_SOUNDCODE - rsStukot[ i ].Init( - token, dSDist, - GetPosition().x, GetPosition().y + dWheelsPosition[ i ], GetPosition().z, - true ); -#else rsStukot[ i ].deserialize( token + " " + std::to_string( dSDist ), sound_type::single, sound_parameters::range ); - // TODO: set per-wheel offset -#endif + rsStukot[ i ].owner( this ); + rsStukot[ i ].offset( { 0, 0, -dWheelsPosition[ i ] } ); } } if( token != "end" ) { - // TODO: double-check if this if() and/or retrieval makes sense here + // TODO: check if this if() and/or retrieval makes sense here parser.getTokens( 1, false ); parser >> token; } } @@ -4632,223 +5022,91 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( ( token == "engine:" ) && ( MoverParameters->Power > 0 ) ) { // plik z dzwiekiem silnika, mnozniki i ofsety amp. i czest. -#ifdef EU07_USE_OLD_SOUNDCODE - double attenuation; - parser.getTokens( 2, false ); - parser - >> token - >> attenuation; - rsSilnik.Init( - token, attenuation, - GetPosition().x, GetPosition().y, GetPosition().z, - true, true ); - if( rsSilnik.GetWaveTime() == 0 ) { - ErrorLog( "Missed sound: \"" + token + "\" for " + asFileName ); - } - parser.getTokens( 1, false ); - parser >> rsSilnik.AM; - if( MoverParameters->EngineType == DieselEngine ) { - - rsSilnik.AM /= ( MoverParameters->Power + MoverParameters->nmax * 60 ); - } - else if( MoverParameters->EngineType == DieselElectric ) { - - rsSilnik.AM /= ( MoverParameters->Power * 3 ); - } - else { - - rsSilnik.AM /= ( MoverParameters->Power + MoverParameters->nmax * 60 + MoverParameters->Power + MoverParameters->Power ); - } - parser.getTokens( 3, false ); - parser - >> rsSilnik.AA - >> rsSilnik.FM // MoverParameters->nmax; - >> rsSilnik.FA; -#else rsSilnik.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); -#endif + rsSilnik.owner( this ); + + auto const amplitudedivisor = static_cast( ( + MoverParameters->EngineType == DieselEngine ? MoverParameters->Power + MoverParameters->nmax * 60 : + MoverParameters->EngineType == DieselElectric ? MoverParameters->Power * 3 : + MoverParameters->Power + MoverParameters->nmax * 60 + MoverParameters->Power + MoverParameters->Power ) ); + rsSilnik.m_amplitudefactor /= amplitudedivisor; } else if( ( token == "ventilator:" ) && ( ( MoverParameters->EngineType == ElectricSeriesMotor ) || ( MoverParameters->EngineType == ElectricInductionMotor ) ) ) { // plik z dzwiekiem wentylatora, mnozniki i ofsety amp. i czest. -#ifdef EU07_USE_OLD_SOUNDCODE - double attenuation; - parser.getTokens( 2, false ); - parser - >> token - >> attenuation; - rsWentylator.Init( - token, attenuation, - GetPosition().x, GetPosition().y, GetPosition().z, - true, true ); - parser.getTokens( 4, false ); - parser - >> rsWentylator.AM - >> rsWentylator.AA - >> rsWentylator.FM - >> rsWentylator.FA; - rsWentylator.AM /= MoverParameters->RVentnmax; - rsWentylator.FM /= MoverParameters->RVentnmax; -#else rsWentylator.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); -#endif + rsWentylator.owner( this ); + + rsWentylator.m_amplitudefactor /= MoverParameters->RVentnmax; + rsWentylator.m_frequencyfactor /= MoverParameters->RVentnmax; } else if( ( token == "transmission:" ) && ( MoverParameters->EngineType == ElectricSeriesMotor ) ) { // plik z dzwiekiem, mnozniki i ofsety amp. i czest. -#ifdef EU07_USE_OLD_SOUNDCODE - double attenuation; - parser.getTokens( 2, false ); - parser - >> token - >> attenuation; - rsPrzekladnia.Init( - token, attenuation, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); - rsPrzekladnia.AM = 0.029; - rsPrzekladnia.AA = 0.1; - rsPrzekladnia.FM = 0.005; - rsPrzekladnia.FA = 1.0; -#else - rsPrzekladnia.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); -#endif + rsPrzekladnia.deserialize( parser, sound_type::single, sound_parameters::range ); + + // NOTE, TODO: fixed parameters, put them into simulation-side calculations + rsPrzekladnia.m_amplitudefactor = 0.029; + rsPrzekladnia.m_amplitudeoffset = 0.1; + rsPrzekladnia.m_frequencyfactor = 0.005; + rsPrzekladnia.m_frequencyoffset = 1.0; + + rsPrzekladnia.owner( this ); } - else if( token == "brake:" ){ + else if( token == "brake:" ) { // plik z piskiem hamulca, mnozniki i ofsety amplitudy. -#ifdef EU07_USE_OLD_SOUNDCODE - double attenuation; - parser.getTokens( 2, false ); - parser - >> token - >> attenuation; - rsPisk.Init( - token, attenuation, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); - rsPisk.AM = parser.getToken(); - rsPisk.AA = parser.getToken() * ( 105 - Random( 10 ) ) / 100; - rsPisk.FM = 1.0; - rsPisk.FA = 0.0; -#else rsPisk.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude ); -#endif + rsPisk.owner( this ); + + rsPisk.m_amplitudeoffset *= ( 105.f - Random( 10.f ) ) / 100.f; } else if( token == "brakeacc:" ) { // plik z przyspieszaczem (upust po zlapaniu hamowania) -#ifdef EU07_USE_OLD_SOUNDCODE - parser.getTokens( 1, false ); parser >> token; - sBrakeAcc = TSoundsManager::GetFromName( token, true ); -#else sBrakeAcc.deserialize( parser, sound_type::single ); -#endif + sBrakeAcc.owner( this ); + bBrakeAcc = true; } else if( token == "unbrake:" ) { // plik z piskiem hamulca, mnozniki i ofsety amplitudy. -#ifdef EU07_USE_OLD_SOUNDCODE - double attenuation; - parser.getTokens( 2, false ); - parser - >> token - >> attenuation; - rsUnbrake.Init( - token, attenuation, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); - rsUnbrake.AM = 1.0; - rsUnbrake.AA = 0.0; - rsUnbrake.FM = 1.0; - rsUnbrake.FA = 0.0; -#else rsUnbrake.deserialize( parser, sound_type::single, sound_parameters::range ); -#endif + rsUnbrake.owner( this ); } else if( token == "derail:" ) { // dzwiek przy wykolejeniu -#ifdef EU07_USE_OLD_SOUNDCODE - double attenuation; - parser.getTokens( 2, false ); - parser - >> token - >> attenuation; - rsDerailment.Init( - token, attenuation, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); - rsDerailment.AM = 1.0; - rsDerailment.AA = 0.0; - rsDerailment.FM = 1.0; - rsDerailment.FA = 0.0; -#else rsDerailment.deserialize( parser, sound_type::single, sound_parameters::range ); -#endif + rsDerailment.owner( this ); } else if( token == "dieselinc:" ) { // dzwiek przy wlazeniu na obroty woodwarda -#ifdef EU07_USE_OLD_SOUNDCODE - double attenuation; - parser.getTokens( 2, false ); - parser - >> token - >> attenuation; - rsDiesielInc.Init( - token, attenuation, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); - rsDiesielInc.AM = 1.0; - rsDiesielInc.AA = 0.0; - rsDiesielInc.FM = 1.0; - rsDiesielInc.FA = 0.0; -#else - rsDiesielInc.deserialize( parser, sound_type::single, sound_parameters::range ); -#endif + rsDieselInc.deserialize( parser, sound_type::single, sound_parameters::range ); + rsDieselInc.owner( this ); } else if( token == "curve:" ) { -#ifdef EU07_USE_OLD_SOUNDCODE - double attenuation; - parser.getTokens( 2, false ); - parser - >> token - >> attenuation; - rscurve.Init( - token, attenuation, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); - rscurve.AM = 1.0; - rscurve.AA = 0.0; - rscurve.FM = 1.0; - rscurve.FA = 0.0; -#else rscurve.deserialize( parser, sound_type::single, sound_parameters::range ); -#endif + rscurve.owner( this ); } else if( token == "horn1:" ) { // pliki z trabieniem -#ifdef EU07_USE_OLD_SOUNDCODE - sHorn1.Load( parser, GetPosition() ); -#else sHorn1.deserialize( parser, sound_type::multipart, sound_parameters::range ); -#endif + sHorn1.owner( this ); } else if( token == "horn2:" ) { // pliki z trabieniem wysokoton. -#ifdef EU07_USE_OLD_SOUNDCODE - sHorn2.Load( parser, GetPosition() ); -#else sHorn2.deserialize( parser, sound_type::multipart, sound_parameters::range ); -#endif + sHorn2.owner( this ); + if( iHornWarning ) { iHornWarning = 2; // numer syreny do użycia po otrzymaniu sygnału do jazdy } @@ -4856,157 +5114,256 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( token == "departuresignal:" ) { // pliki z sygnalem odjazdu -#ifdef EU07_USE_OLD_SOUNDCODE - sDepartureSignal.Load( parser, GetPosition() ); -#else sDepartureSignal.deserialize( parser, sound_type::multipart, sound_parameters::range ); -#endif + sDepartureSignal.owner( this ); } else if( token == "pantographup:" ) { // pliki dzwiekow pantografow -#ifdef EU07_USE_OLD_SOUNDCODE - parser.getTokens( 1, false ); parser >> token; - sPantUp.Init( - token, 50, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); -#else - sPantUp.deserialize( parser, sound_type::single ); -#endif + sound_source pantographup { sound_placement::external }; + pantographup.deserialize( parser, sound_type::single ); + pantographup.owner( this ); + for( auto &pantograph : m_pantographsounds ) { + pantograph.sPantUp = pantographup; + } } else if( token == "pantographdown:" ) { // pliki dzwiekow pantografow -#ifdef EU07_USE_OLD_SOUNDCODE - parser.getTokens( 1, false ); parser >> token; - sPantDown.Init( - token, 50, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); -#else - sPantDown.deserialize( parser, sound_type::single ); -#endif + sound_source pantographdown { sound_placement::external }; + pantographdown.deserialize( parser, sound_type::single ); + pantographdown.owner( this ); + for( auto &pantograph : m_pantographsounds ) { + pantograph.sPantDown = pantographdown; + } } else if( token == "compressor:" ) { // pliki ze sprezarka -#ifdef EU07_USE_OLD_SOUNDCODE - sCompressor.Load( parser, GetPosition() ); -#else sCompressor.deserialize( parser, sound_type::multipart, sound_parameters::range ); -#endif + sCompressor.owner( this ); } else if( token == "converter:" ) { // pliki z przetwornica -#ifdef EU07_USE_OLD_SOUNDCODE - sConverter.Load( parser, GetPosition() ); -#else sConverter.deserialize( parser, sound_type::multipart, sound_parameters::range ); -#endif + sConverter.owner( this ); } else if( token == "turbo:" ) { // pliki z turbogeneratorem -#ifdef EU07_USE_OLD_SOUNDCODE - sTurbo.Load( parser, GetPosition() ); -#else sTurbo.deserialize( parser, sound_type::multipart, sound_parameters::range ); -#endif + sTurbo.owner( this ); } else if( token == "small-compressor:" ) { // pliki z przetwornica -#ifdef EU07_USE_OLD_SOUNDCODE - sSmallCompressor.Load( parser, GetPosition() ); -#else sSmallCompressor.deserialize( parser, sound_type::multipart, sound_parameters::range ); -#endif + sSmallCompressor.owner( this ); } else if( token == "dooropen:" ) { -#ifdef EU07_USE_OLD_SOUNDCODE - parser.getTokens( 1, false ); parser >> token; - rsDoorOpen.Init( - token, 50, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); -#else - rsDoorOpen.deserialize( parser, sound_type::single ); -#endif + sound_source dooropen { sound_placement::general }; + dooropen.deserialize( parser, sound_type::single ); + dooropen.owner( this ); + for( auto &door : m_doorsounds ) { + door.rsDoorOpen = dooropen; + } } else if( token == "doorclose:" ) { -#ifdef EU07_USE_OLD_SOUNDCODE - parser.getTokens( 1, false ); parser >> token; - rsDoorClose.Init( - token, 50, - GetPosition().x, GetPosition().y, GetPosition().z, - true ); -#else - rsDoorClose.deserialize( parser, sound_type::single ); -#endif + sound_source doorclose { sound_placement::general }; + doorclose.deserialize( parser, sound_type::single ); + doorclose.owner( this ); + for( auto &door : m_doorsounds ) { + door.rsDoorClose = doorclose; + } } else if( token == "sand:" ) { -#ifdef EU07_USE_OLD_SOUNDCODE - // pliki z piasecznica - sSand.Load( parser, GetPosition() ); -#else sSand.deserialize( parser, sound_type::multipart, sound_parameters::range ); -#endif + sSand.owner( this ); } else if( token == "releaser:" ) { // pliki z odluzniaczem -#ifdef EU07_USE_OLD_SOUNDCODE - sReleaser.Load( parser, GetPosition() ); -#else sReleaser.deserialize( parser, sound_type::multipart, sound_parameters::range ); -#endif + sReleaser.owner( this ); } } while( ( token != "" ) && ( token != "endsounds" ) ); - } + } // sounds: - else if (token == "internaldata:") { - // dalej nie czytaj - do { - // zbieranie informacji o kabinach - token = ""; - parser.getTokens(); parser >> token; - if(token == "cab0model:") - { - parser.getTokens(); parser >> token; - if( token != "none" ) { iCabs = 2; } + else if( token == "internaldata:" ) { + // dalej nie czytaj + do { + // zbieranie informacji o kabinach + token = ""; + parser.getTokens(); parser >> token; + if( token == "cab0model:" ) { + parser.getTokens(); parser >> token; + if( token != "none" ) { iCabs |= 0x2; } } - else if (token == "cab1model:") - { - parser.getTokens(); parser >> token; - if( token != "none" ) { iCabs = 1; } + else if( token == "cab1model:" ) { + parser.getTokens(); parser >> token; + if( token != "none" ) { iCabs |= 0x1; } } - else if (token == "cab2model:") - { - parser.getTokens(); parser >> token; - if( token != "none" ) { iCabs = 4; } - } + else if( token == "cab2model:" ) { + parser.getTokens(); parser >> token; + if( token != "none" ) { iCabs |= 0x4; } + } + // engine sounds + else if( token == "ignition:" ) { + // odpalanie silnika + dsbDieselIgnition.deserialize( parser, sound_type::single ); + dsbDieselIgnition.owner( this ); + } + else if( token == "engageslippery:" ) { + // tarcie tarcz sprzegla: + rsEngageSlippery.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + rsEngageSlippery.owner( this ); - } while( token != "" ); + rsEngageSlippery.m_frequencyfactor /= ( 1 + MoverParameters->nmax ); + } + else if( token == "relay:" ) { + // styczniki itp: + dsbRelay.deserialize( parser, sound_type::single ); + dsbRelay.owner( this ); + } + else if( token == "pneumaticrelay:" ) { + // wylaczniki pneumatyczne: + dsbPneumaticRelay.deserialize( parser, sound_type::single ); + dsbPneumaticRelay.owner( this ); + } + else if( token == "wejscie_na_bezoporow:" ) { + // hunter-111211: wydzielenie wejscia na bezoporowa i na drugi uklad do pliku + dsbWejscie_na_bezoporow.deserialize( parser, sound_type::single ); + dsbWejscie_na_bezoporow.owner( this ); + } + else if( token == "wejscie_na_drugi_uklad:" ) { + dsbWejscie_na_drugi_uklad.deserialize( parser, sound_type::single ); + dsbWejscie_na_drugi_uklad.owner( this ); + } + // braking sounds + else if( token == "brakesound:" ) { + // hamowanie zwykle: + rsBrake.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + rsBrake.owner( this ); - Stop_InternalData = true; - } + rsBrake.m_amplitudefactor /= ( 1 + MoverParameters->MaxBrakeForce * 1000 ); + rsBrake.m_frequencyfactor /= ( 1 + MoverParameters->Vmax ); + } + else if( token == "slipperysound:" ) { + // sanie: + rsSlippery.deserialize( parser, sound_type::single, sound_parameters::amplitude ); + rsSlippery.owner( this ); - } while( ( token != "" ) - && ( false == Stop_InternalData ) ); + rsSlippery.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); + } + // coupler sounds + else if( token == "couplerattach:" ) { + // laczenie: + sound_source couplerattach { sound_placement::external }; + couplerattach.deserialize( parser, sound_type::single ); + couplerattach.owner( this ); + for( auto &couplersounds : m_couplersounds ) { + couplersounds.dsbCouplerAttach = couplerattach; + } + } + else if( token == "couplerdetach:" ) { + // rozlaczanie: + sound_source couplerdetach { sound_placement::external }; + couplerdetach.deserialize( parser, sound_type::single ); + couplerdetach.owner( this ); + for( auto &couplersounds : m_couplersounds ) { + couplersounds.dsbCouplerDetach = couplerdetach; + } + } + else if( token == "couplerstretch:" ) { + // coupler stretching + sound_source couplerstretch { sound_placement::external }; + couplerstretch.deserialize( parser, sound_type::single ); + couplerstretch.owner( this ); + for( auto &couplersounds : m_couplersounds ) { + couplersounds.dsbCouplerStretch = couplerstretch; + } + } + else if( token == "bufferclamp:" ) { + // buffers hitting one another + sound_source bufferclash { sound_placement::external }; + bufferclash.deserialize( parser, sound_type::single ); + bufferclash.owner( this ); + for( auto &couplersounds : m_couplersounds ) { + couplersounds.dsbBufferClamp = bufferclash; + } + } + else if( token == "runningnoise:" ) { + // szum podczas jazdy: + rsRunningNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + rsRunningNoise.owner( this ); + + rsRunningNoise.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); + rsRunningNoise.m_frequencyfactor /= ( 1 + MoverParameters->Vmax ); + } + + } while( token != "" ); + + } // internaldata: + + } while( token != "" ); if( !iAnimations ) { // if the animations weren't defined the model is likely to be non-functional. warrants a warning. ErrorLog( "Animations tag is missing from the .mmd file \"" + asFileName + "\"" ); } + // assign default samples to sound emitters which weren't included in the config file + // engine + if( MoverParameters->Power > 0 ) { + if( true == dsbWejscie_na_bezoporow.empty() ) { + // hunter-111211: domyslne, gdy brak + dsbWejscie_na_bezoporow.deserialize( "wejscie_na_bezoporow.wav", sound_type::single ); + dsbWejscie_na_bezoporow.owner( this ); + } + if( true == dsbWejscie_na_drugi_uklad.empty() ) { + dsbWejscie_na_drugi_uklad.deserialize( "wescie_na_drugi_uklad.wav", sound_type::single ); + dsbWejscie_na_drugi_uklad.owner( this ); + } + } + // braking sounds + if( true == rsUnbrake.empty() ) { + rsUnbrake.deserialize( "[1007]estluz.wav", sound_type::single ); + rsUnbrake.owner( this ); + } + // couplers + for( auto &couplersounds : m_couplersounds ) { + if( true == couplersounds.dsbCouplerAttach.empty() ) { + couplersounds.dsbCouplerAttach.deserialize( "couplerattach.wav", sound_type::single ); + couplersounds.dsbCouplerAttach.owner( this ); + } + if( true == couplersounds.dsbCouplerDetach.empty() ) { + couplersounds.dsbCouplerDetach.deserialize( "couplerdetach.wav", sound_type::single ); + couplersounds.dsbCouplerDetach.owner( this ); + } + if( true == couplersounds.dsbCouplerStretch.empty() ) { + couplersounds.dsbCouplerStretch.deserialize( "en57_couplerstretch.wav", sound_type::single ); + couplersounds.dsbCouplerStretch.owner( this ); + } + if( true == couplersounds.dsbBufferClamp.empty() ) { + couplersounds.dsbBufferClamp.deserialize( "en57_bufferclamp.wav", sound_type::single ); + couplersounds.dsbBufferClamp.owner( this ); + } + } + // other sounds + if( true == rscurve.empty() ) { + // hunter-111211: domyslne, gdy brak + rscurve.deserialize( "curve.wav", sound_type::single ); + rscurve.owner( this ); + } + + if (mdModel) mdModel->Init(); // obrócenie modelu oraz optymalizacja, również zapisanie binarnego if (mdLoad) @@ -5016,6 +5373,67 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, Global::asCurrentTexturePath = szTexturePath; // kiedyś uproszczone wnętrze mieszało tekstury nieba Global::asCurrentDynamicPath = ""; + + // position sound emitters which weren't defined in the config file + auto const nullvector { glm::vec3() }; + // engine sounds , centre of the vehicle + auto const enginelocation { glm::vec3 {0.f, MoverParameters->Dim.H * 0.5f, 0.f } }; + std::vector enginesounds = { + &dsbDieselIgnition, + &rsSilnik, + &dsbRelay, &dsbWejscie_na_bezoporow, &dsbWejscie_na_drugi_uklad, + &rsPrzekladnia, &rsEngageSlippery, &rsDieselInc, &sTurbo, + &rsWentylator, &sConverter, &sCompressor, &sSmallCompressor + }; + for( auto sound : enginesounds ) { + if( sound->offset() == nullvector ) { + sound->offset( enginelocation ); + } + } + // TODO: other sound types + // pantographs + if( pants != nullptr ) { + std::size_t pantographindex { 0 }; + for( auto &pantographsounds : m_pantographsounds ) { + auto const pantographoffset { + glm::vec3( + 0.f, + pants[ pantographindex ].fParamPants->vPos.y, + -pants[ pantographindex ].fParamPants->vPos.x ) }; + pantographsounds.sPantUp.offset( pantographoffset ); + pantographsounds.sPantDown.offset( pantographoffset ); + ++pantographindex; + } + } + // doors + std::size_t dooranimationfirstindex { 0 }; + for( std::size_t i = 0; i < ANIM_DOORS; ++i ) { + // zliczanie wcześniejszych animacji + dooranimationfirstindex += iAnimType[ i ]; + } + std::size_t doorindex { 0 }; + for( auto &doorsounds : m_doorsounds ) { + + auto submodel { pAnimations[ dooranimationfirstindex + doorindex ].smAnimated }; + if( submodel == nullptr ) { continue; } + + auto const dooroffset { pAnimations[ dooranimationfirstindex + doorindex ].smAnimated->offset( std::numeric_limits::max() ) }; + + doorsounds.rsDoorClose.offset( dooroffset ); + doorsounds.rsDoorOpen.offset( dooroffset ); + ++doorindex; + } + // couplers + auto const frontcoupleroffset { glm::vec3{ 0.f, 1.f, MoverParameters->Dim.L * 0.5f } }; + m_couplersounds[ side::front ].dsbCouplerAttach.offset( frontcoupleroffset ); + m_couplersounds[ side::front ].dsbCouplerDetach.offset( frontcoupleroffset ); + m_couplersounds[ side::front ].dsbCouplerStretch.offset( frontcoupleroffset ); + m_couplersounds[ side::front ].dsbBufferClamp.offset( frontcoupleroffset ); + auto const rearcoupleroffset{ glm::vec3{ 0.f, 1.f, MoverParameters->Dim.L * -0.5f } }; + m_couplersounds[ side::rear ].dsbCouplerAttach.offset( rearcoupleroffset ); + m_couplersounds[ side::rear ].dsbCouplerDetach.offset( rearcoupleroffset ); + m_couplersounds[ side::rear ].dsbCouplerStretch.offset( rearcoupleroffset ); + m_couplersounds[ side::rear ].dsbBufferClamp.offset( rearcoupleroffset ); } //--------------------------------------------------------------------------- diff --git a/DynObj.h b/DynObj.h index 96cba4bf..1288ab8a 100644 --- a/DynObj.h +++ b/DynObj.h @@ -258,12 +258,33 @@ private: TSubModel *smWiper; // wycieraczka (poniekąd też wajcha) // Ra: koneic animacji do ogarnięcia - private: - void ABuLittleUpdate(double ObjSqrDist); - bool btnOn; // ABu: czy byly uzywane buttony, jesli tak, to po renderingu wylacz - // bo ten sam model moze byc jeszcze wykorzystany przez inny obiekt! - double ComputeRadius( Math3D::vector3 p1, Math3D::vector3 p2, Math3D::vector3 p3, Math3D::vector3 p4); +private: +// types + struct coupler_sounds { + sound_source dsbCouplerAttach { sound_placement::external }; // moved from cab + sound_source dsbCouplerDetach { sound_placement::external }; // moved from cab + sound_source dsbCouplerStretch { sound_placement::external }; // moved from cab + sound_source dsbBufferClamp { sound_placement::external }; // moved from cab + }; + struct pantograph_sounds { + sound_source sPantUp { sound_placement::external }; + sound_source sPantDown { sound_placement::external }; + }; + + struct door_sounds { + sound_source rsDoorOpen{ sound_placement::general }; // Ra: przeniesione z kabiny + sound_source rsDoorClose{ sound_placement::general }; + }; + +// methods + void ABuLittleUpdate(double ObjSqrDist); + double ComputeRadius( Math3D::vector3 p1, Math3D::vector3 p2, Math3D::vector3 p3, Math3D::vector3 p4); + void ABuBogies(); + void ABuModelRoll(); + void TurnOff(); + +// members TButton btCoupler1; // sprzegi TButton btCoupler2; TAirCoupler btCPneumatic1; // sprzegi powietrzne //yB - zmienione z Button na AirCoupler - krzyzyki @@ -303,44 +324,55 @@ private: double dRailLength; double dRailPosition[MaxAxles]; // licznik pozycji osi w/m szyny double dWheelsPosition[MaxAxles]; // pozycja osi w/m srodka pojazdu - sound_source rsStukot[MaxAxles]; // dzwieki poszczegolnych osi //McZapkie-270202 - sound_source rsSilnik; // McZapkie-010302 - silnik - sound_source rsWentylator; // McZapkie-030302 - sound_source rsPisk; // McZapkie-260302 - sound_source rsDerailment; // McZapkie-051202 - sound_source rsPrzekladnia; - sound_source sHorn1; - sound_source sHorn2; - sound_source sCompressor; // NBMX wrzesien 2003 - sound_source sConverter; - sound_source sSmallCompressor; - sound_source sDepartureSignal; - sound_source sTurbo; - sound_source sSand; - sound_source sReleaser; - - // Winger 010304 - sound_source sPantUp; - sound_source sPantDown; - sound_source rsDoorOpen; // Ra: przeniesione z kabiny - sound_source rsDoorClose; + std::vector rsStukot; // dzwieki poszczegolnych osi //McZapkie-270202 + // engine sounds + sound_source dsbDieselIgnition { sound_placement::engine }; // moved from cab + sound_source rsSilnik { sound_placement::engine }; + sound_source dsbRelay { sound_placement::engine }; + sound_source dsbWejscie_na_bezoporow { sound_placement::engine }; // moved from cab + sound_source dsbWejscie_na_drugi_uklad { sound_placement::engine }; // moved from cab + sound_source rsPrzekladnia { sound_placement::engine }; + sound_source rsEngageSlippery { sound_placement::engine }; // moved from cab + sound_source rsDieselInc { sound_placement::engine }; // youBy + sound_source sTurbo { sound_placement::engine }; + sound_source rsWentylator { sound_placement::engine }; // McZapkie-030302 + sound_source sConverter { sound_placement::engine }; + sound_source sCompressor { sound_placement::engine }; // NBMX wrzesien 2003 + sound_source sSmallCompressor { sound_placement::engine }; + // braking sounds + sound_source dsbPneumaticRelay { sound_placement::external }; + sound_source rsUnbrake { sound_placement::external }; // yB - odglos luzowania + sound_source sReleaser { sound_placement::external }; + sound_source rsSlippery { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // moved from cab + sound_source sSand { sound_placement::external }; + sound_source rsBrake { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // moved from cab + sound_source sBrakeAcc { sound_placement::external }; + bool bBrakeAcc; + sound_source rsPisk { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // McZapkie-260302 + sound_source rsDerailment { sound_placement::external, 250.f }; // McZapkie-051202 + // moving part and other external sounds + std::array m_couplersounds; // always front and rear + std::vector m_pantographsounds; // typically 2 but can be less (or more?) + std::vector m_doorsounds; // can expect symmetrical arrangement, but don't count on it + sound_source sDepartureSignal { sound_placement::general }; + sound_source sHorn1 { sound_placement::external }; + sound_source sHorn2 { sound_placement::external }; + sound_source rsRunningNoise { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; + sound_source rscurve { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; // youBy double eng_vol_act; double eng_frq_act; double eng_dfrq; double eng_turbo; - void ABuBogies(); - void ABuModelRoll(); Math3D::vector3 modelShake; bool renderme; // yB - czy renderowac - // TRealSound sBrakeAcc; //dźwięk przyspieszacza - sound_source sBrakeAcc; - bool bBrakeAcc; - sound_source rsUnbrake; // yB - odglos luzowania float ModCamRot; int iInventory[ 2 ] { 0, 0 }; // flagi bitowe posiadanych submodeli (np. świateł) - void TurnOff(); + bool btnOn; // ABu: czy byly uzywane buttony, jesli tak, to po renderingu wylacz + // bo ten sam model moze byc jeszcze wykorzystany przez inny obiekt! + float m_lastbrakepressure { -1.f }; // helper, cached level of pressure in brake cylinder + float m_brakepressurechange { 0.f }; // recent change of pressure in brake cylinder public: int iHornWarning; // numer syreny do użycia po otrzymaniu sygnału do jazdy @@ -376,10 +408,10 @@ private: void SetPneumatic(bool front, bool red); std::string asName; std::string name() const { - return this ? asName : std::string(); }; + return this ? + asName : + std::string(); }; - sound_source rsDiesielInc; // youBy - sound_source rscurve; // youBy // std::ofstream PneuLogFile; //zapis parametrow pneumatycznych // youBy - dym // TSmoke Smog; @@ -430,13 +462,17 @@ private: inline Math3D::vector3 RearPosition() { return vCoulpler[iDirection]; }; inline Math3D::vector3 AxlePositionGet() { - return iAxleFirst ? Axle1.pPosition : Axle0.pPosition; }; + return iAxleFirst ? + Axle1.pPosition : + Axle0.pPosition; }; inline Math3D::vector3 VectorFront() const { return vFront; }; - inline Math3D::vector3 VectorUp() { + inline Math3D::vector3 VectorUp() const { return vUp; }; inline Math3D::vector3 VectorLeft() const { return vLeft; }; + inline double const * Matrix() const { + return mMatrix.readArray(); }; inline double * Matrix() { return mMatrix.getArray(); }; inline double GetVelocity() { @@ -446,7 +482,9 @@ private: inline double GetWidth() const { return MoverParameters->Dim.W; }; inline TTrack * GetTrack() { - return (iAxleFirst ? Axle1.GetTrack() : Axle0.GetTrack()); }; + return (iAxleFirst ? + Axle1.GetTrack() : + Axle0.GetTrack()); }; // McZapkie-260202 void LoadMMediaFile(std::string BaseDir, std::string TypeName, std::string ReplacableSkin); @@ -455,13 +493,22 @@ private: return (Axle1.GetTrack() == MyTrack ? Axle1.GetDirection() : Axle0.GetDirection()); }; // zwraca kierunek pojazdu na torze z aktywną osą inline double RaDirectionGet() { - return iAxleFirst ? Axle1.GetDirection() : Axle0.GetDirection(); }; + return iAxleFirst ? + Axle1.GetDirection() : + Axle0.GetDirection(); }; // zwraca przesunięcie wózka względem Point1 toru z aktywną osią inline double RaTranslationGet() { - return iAxleFirst ? Axle1.GetTranslation() : Axle0.GetTranslation(); }; + return iAxleFirst ? + Axle1.GetTranslation() : + Axle0.GetTranslation(); }; // zwraca tor z aktywną osią inline TTrack * RaTrackGet() { - return iAxleFirst ? Axle1.GetTrack() : Axle0.GetTrack(); }; + return iAxleFirst ? + Axle1.GetTrack() : + Axle0.GetTrack(); }; + + void couple( int const Side ); + int uncouple( int const Side ); void CouplersDettach(double MinDist, int MyScanDir); void RadioStop(); void Damage(char flag); diff --git a/Event.cpp b/Event.cpp index 9db96750..534f618b 100644 --- a/Event.cpp +++ b/Event.cpp @@ -1022,34 +1022,27 @@ event_manager::CheckQuery() { return false; } case tp_Sound: { -#ifdef EU07_USE_OLD_SOUNDCODE + if( m_workevent->Params[ 9 ].tsTextSound == nullptr ) { + break; + } switch( m_workevent->Params[ 0 ].asInt ) { // trzy możliwe przypadki: case 0: { - m_workevent->Params[ 9 ].tsTextSound->Stop(); + m_workevent->Params[ 9 ].tsTextSound->stop(); break; } case 1: { - m_workevent->Params[ 9 ].tsTextSound->Play( - 1, - 0, - true, - m_workevent->Params[ 9 ].tsTextSound->vSoundPosition ); + m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive ); break; } case -1: { - m_workevent->Params[ 9 ].tsTextSound->Play( - 1, - DSBPLAY_LOOPING, - true, - m_workevent->Params[ 9 ].tsTextSound->vSoundPosition ); + m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive | sound_flags::looping ); break; } default: { break; } } -#endif break; } case tp_Disable: @@ -1574,14 +1567,19 @@ event_manager::InitLaunchers() { } } - launcher->Event1 = ( - launcher->asEvent1Name != "none" ? - simulation::Events.FindEvent( launcher->asEvent1Name ) : - nullptr ); - launcher->Event2 = ( - launcher->asEvent2Name != "none" ? - simulation::Events.FindEvent( launcher->asEvent2Name ) : - nullptr ); + if( launcher->asEvent1Name != "none" ) { + launcher->Event1 = simulation::Events.FindEvent( launcher->asEvent1Name ); + if( launcher->Event1 == nullptr ) { + ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent1Name + "\"" ); + } + } + + if( launcher->asEvent2Name != "none" ) { + launcher->Event2 = simulation::Events.FindEvent( launcher->asEvent2Name ); + if( launcher->Event2 == nullptr ) { + ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent2Name + "\"" ); + } + } } } diff --git a/Gauge.cpp b/Gauge.cpp index d785599e..c22d156d 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -19,24 +19,23 @@ http://mozilla.org/MPL/2.0/. #include "Model3d.h" #include "Timer.h" #include "logs.h" +#include "renderer.h" void TGauge::Init(TSubModel *NewSubModel, TGaugeType eNewType, double fNewScale, double fNewOffset, double fNewFriction, double fNewValue) { // ustawienie parametrów animacji submodelu - if (NewSubModel) - { // warunek na wszelki wypadek, gdyby się submodel nie - // podłączył + if (NewSubModel) { + // warunek na wszelki wypadek, gdyby się submodel nie podłączył fFriction = fNewFriction; fValue = fNewValue; fOffset = fNewOffset; fScale = fNewScale; SubModel = NewSubModel; eType = eNewType; - if (eType == gt_Digital) - { + if (eType == gt_Digital) { + TSubModel *sm = SubModel->ChildGet(); - do - { // pętla po submodelach potomnych i obracanie ich o kąt zależy od - // cyfry w (fValue) + do { + // pętla po submodelach potomnych i obracanie ich o kąt zależy od cyfry w (fValue) if (sm->pName.size()) { // musi mieć niepustą nazwę if (sm->pName[0] >= '0') @@ -48,10 +47,17 @@ void TGauge::Init(TSubModel *NewSubModel, TGaugeType eNewType, double fNewScale, } else // a banan może być z optymalizacją? NewSubModel->WillBeAnimated(); // wyłączenie ignowania jedynkowego transformu + // pass submodel location to defined sounds + auto const offset { model_offset() }; + m_soundfxincrease.offset( offset ); + m_soundfxdecrease.offset( offset ); + for( auto &soundfxrecord : m_soundfxvalues ) { + soundfxrecord.second.offset( offset ); + } } }; -bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) { +bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, TModel3d *md2, double mul ) { std::string submodelname, gaugetypename; double scale, offset, friction; @@ -83,10 +89,17 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) { } } + // bind defined sounds with the button owner + m_soundfxincrease.owner( Owner ); + m_soundfxdecrease.owner( Owner ); + for( auto &soundfxrecord : m_soundfxvalues ) { + soundfxrecord.second.owner( Owner ); + } + scale *= mul; - TSubModel *submodel = md1->GetFromName( submodelname ); + TSubModel *submodel = md1->GetFromName( submodelname ); if( scale == 0.0 ) { - ErrorLog( "Scale of 0.0 defined for sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\". Forcing scale of 1.0 to prevent division by 0" ); + ErrorLog( "Bad model: scale of 0.0 defined for sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\". Forcing scale of 1.0 to prevent division by 0" ); scale = 1.0; } if (submodel) // jeśli nie znaleziony @@ -94,7 +107,7 @@ bool TGauge::Load(cParser &Parser, TModel3d *md1, TModel3d *md2, double mul) { else if (md2) // a jest podany drugi model (np. zewnętrzny) submodel = md2->GetFromName(submodelname); // to może tam będzie, co za różnica gdzie if( submodel == nullptr ) { - ErrorLog( "Failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\"" ); + ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\"" ); } std::map gaugetypes { @@ -132,7 +145,7 @@ TGauge::Load_mapping( cParser &Input ) { if( indexstart != std::string::npos ) { m_soundfxvalues.emplace( std::stoi( key.substr( indexstart, indexend - indexstart ) ), - sound_source().deserialize( Input, sound_type::single ) ); + sound_source( sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE ).deserialize( Input, sound_type::single ) ); } } return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized @@ -284,8 +297,6 @@ void TGauge::Update() { } }; -void TGauge::Render(){}; - void TGauge::AssignFloat(float *fValue) { cDataType = 'f'; @@ -317,4 +328,14 @@ void TGauge::UpdateValue() } }; +// returns offset of submodel associated with the button from the model centre +glm::vec3 +TGauge::model_offset() const { + + return ( + SubModel != nullptr ? + SubModel->offset( 1.f ) : + glm::vec3() ); +} + //--------------------------------------------------------------------------- diff --git a/Gauge.h b/Gauge.h index 081ffade..9f76b335 100644 --- a/Gauge.h +++ b/Gauge.h @@ -24,6 +24,30 @@ enum TGaugeType { // animowany wskaźnik, mogący przyjmować wiele stanów pośrednich class TGauge { +public: +// methods + TGauge() = default; + inline + void Clear() { *this = TGauge(); } + void Init(TSubModel *NewSubModel, TGaugeType eNewTyp, double fNewScale = 1, double fNewOffset = 0, double fNewFriction = 0, double fNewValue = 0); + bool Load(cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, TModel3d *md2 = nullptr, double mul = 1.0); + void PermIncValue(double fNewDesired); + void IncValue(double fNewDesired); + void DecValue(double fNewDesired); + void UpdateValue( double fNewDesired ); + void UpdateValue( double fNewDesired, sound_source &Fallbacksound ); + void PutValue(double fNewDesired); + double GetValue() const; + void Update(); + void AssignFloat(float *fValue); + void AssignDouble(double *dValue); + void AssignInt(int *iValue); + void UpdateValue(); + // returns offset of submodel associated with the button from the model centre + glm::vec3 model_offset() const; +// members + TSubModel *SubModel; // McZapkie-310302: zeby mozna bylo sprawdzac czy zainicjowany poprawnie + private: // methods // imports member data pair from the config file @@ -44,32 +68,10 @@ private: double *dData { nullptr }; int *iData; }; - sound_source m_soundfxincrease; // sound associated with increasing control's value - sound_source m_soundfxdecrease; // sound associated with decreasing control's value + sound_source m_soundfxincrease { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // sound associated with increasing control's value + sound_source m_soundfxdecrease { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // sound associated with decreasing control's value std::map m_soundfxvalues; // sounds associated with specific values -public: -// methods - TGauge() = default; - inline - void Clear() { *this = TGauge(); } - void Init(TSubModel *NewSubModel, TGaugeType eNewTyp, double fNewScale = 1, double fNewOffset = 0, double fNewFriction = 0, double fNewValue = 0); - bool Load(cParser &Parser, TModel3d *md1, TModel3d *md2 = nullptr, double mul = 1.0); - void PermIncValue(double fNewDesired); - void IncValue(double fNewDesired); - void DecValue(double fNewDesired); - void UpdateValue( double fNewDesired ); - void UpdateValue( double fNewDesired, sound_source &Fallbacksound ); - void PutValue(double fNewDesired); - double GetValue() const; - void Update(); - void Render(); - void AssignFloat(float *fValue); - void AssignDouble(double *dValue); - void AssignInt(int *iValue); - void UpdateValue(); -// members - TSubModel *SubModel; // McZapkie-310302: zeby mozna bylo sprawdzac czy zainicjowany poprawnie }; //--------------------------------------------------------------------------- diff --git a/Globals.cpp b/Globals.cpp index 8bf348b4..adaa1160 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -132,6 +132,8 @@ bool Global::FullPhysics { true }; // full calculations performed for each simul // parametry testowe (do testowania scenerii i obiektów) bool Global::bWireFrame = false; bool Global::bSoundEnabled = true; +float Global::AudioVolume = 1.0f; + int Global::iWriteLogEnabled = 3; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów bool Global::MultipleLogs{ false }; diff --git a/Globals.h b/Globals.h index 9c7fe26a..3d88a3f1 100644 --- a/Globals.h +++ b/Globals.h @@ -166,6 +166,7 @@ public: static bool bFreeFly; static bool bWireFrame; static bool bSoundEnabled; + static float AudioVolume; // McZapkie-131202 static bool bAdjustScreenFreq; static bool bEnableTraction; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index e63e297d..241295c0 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -197,14 +197,15 @@ static int const s_SHPebrake = 64; //hamuje static int const s_CAtest = 128; /*dzwieki*/ -static int const sound_none = 0; -static int const sound_loud = 1; -static int const sound_couplerstretch = 2; -static int const sound_bufferclamp = 4; -static int const sound_bufferbump = 8; -static int const sound_relay = 16; -static int const sound_manyrelay = 32; -static int const sound_brakeacc = 64; +enum sound { + none, + loud = 0x1, + couplerstretch = 0x2, + bufferclash = 0x4, + relay = 0x10, + parallel = 0x20, + pneumatic = 0x40 +}; //szczególne typy pojazdów (inna obsługa) dla zmiennej TrainType //zamienione na flagi bitowe, aby szybko wybierać grupę (np. EZT+SZT) @@ -602,6 +603,8 @@ struct TCoupling { power_coupling power_high; power_coupling power_low; // TODO: implement this + + int sounds { 0 }; // sounds emitted by the coupling devices }; class TMoverParameters @@ -1167,6 +1170,7 @@ public: bool DoorLeft(bool State); //obsluga drzwi lewych bool DoorRight(bool State); //obsluga drzwi prawych bool DoorBlockedFlag(void); //sprawdzenie blokady drzwi + bool signal_departure( bool const State, int const Notify = range::consist ); // toggles departure warning /* funkcje dla samochodow*/ bool ChangeOffsetH(double DeltaOffset); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 5a1a95bf..e339284f 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1369,11 +1369,11 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap if (EngineType == ElectricSeriesMotor) if (AutoRelayCheck()) - SetFlag(SoundFlag, sound_relay); + SetFlag(SoundFlag, sound::relay); if (EngineType == DieselEngine) if (dizel_Update(dt)) - SetFlag(SoundFlag, sound_relay); + SetFlag(SoundFlag, sound::relay); // uklady hamulcowe: if (VeselVolume > 0) Compressor = CompressedVolume / VeselVolume; @@ -1530,7 +1530,7 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape if (EngineType == DieselEngine) if (dizel_Update(dt)) - SetFlag(SoundFlag, sound_relay); + SetFlag(SoundFlag, sound::relay); // uklady hamulcowe: if (VeselVolume > 0) Compressor = CompressedVolume / VeselVolume; @@ -1703,7 +1703,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) if( RList[ MainCtrlPos ].Bn > 1 ) { if( true == MaxCurrentSwitch( false )) { // wylaczanie wysokiego rozruchu - SetFlag( SoundFlag, sound_relay ); + SetFlag( SoundFlag, sound::relay ); } // Q TODO: // if (EngineType=ElectricSeriesMotor) and (MainCtrlPos=1) // then @@ -2988,6 +2988,10 @@ bool TMoverParameters::BrakeDelaySwitch(int BDS) } else rBDS = false; + if( true == rBDS ) { + // if setting was changed emit the sound of pneumatic relay + SetFlag( SoundFlag, sound::pneumatic ); + } return rBDS; } @@ -3086,8 +3090,8 @@ void TMoverParameters::CompressorCheck(double dt) else { CompressedVolume = CompressedVolume * 0.8; - SetFlag(SoundFlag, sound_relay | sound_loud); - // SetFlag(SoundFlag, sound_loud); + SetFlag(SoundFlag, sound::relay | sound::loud); + // SetFlag(SoundFlag, sound::loud); } } } @@ -4078,6 +4082,31 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) // tempdist:=tempdist+CoupleDist; //ABu: proby szybkiego naprawienia bledu } + dV = V - (double)DirPatch( CouplerN, CNext ) * Couplers[ CouplerN ].Connected->V; + absdV = abs( dV ); + // potentially generate sounds on clash or stretch + if( ( newdist < 0.0 ) + && ( Couplers[ CouplerN ].Dist > newdist ) + && ( dV < -0.5 ) ) { + // 090503: dzwieki pracy zderzakow + SetFlag( + Couplers[ CouplerN ].sounds, + ( absdV > 5.0 ? + ( sound::bufferclash | sound::loud ) : + sound::bufferclash ) ); + } + else if( ( Couplers[ CouplerN ].CouplingFlag != coupling::faux ) + && ( newdist > 0.001 ) + && ( Couplers[ CouplerN ].Dist <= 0.001 ) + && ( absdV > 0.005 ) ) { + // 090503: dzwieki pracy sprzegu + SetFlag( + Couplers[ CouplerN ].sounds, + ( absdV > 0.1 ? + ( sound::couplerstretch | sound::loud ) : + sound::couplerstretch ) ); + } + // blablabla // ABu: proby znalezienia problemu ze zle odbijajacymi sie skladami //if (Couplers[CouplerN].CouplingFlag=ctrain_virtual) and (newdist>0) then @@ -4099,23 +4128,6 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) Couplers[CouplerN].Connected->Couplers[CNext].FmaxB) * CouplerTune / 2.0; } - dV = V - (double)DirPatch(CouplerN, CNext) * Couplers[CouplerN].Connected->V; - absdV = abs(dV); - if ((newdist < -0.001) && (Couplers[CouplerN].Dist >= -0.001) && - (absdV > 0.010)) // 090503: dzwieki pracy zderzakow - { - if (SetFlag(SoundFlag, sound_bufferclamp)) - if (absdV > 0.5) - SetFlag(SoundFlag, sound_loud); - } - else if ((newdist > 0.002) && (Couplers[CouplerN].Dist <= 0.002) && - (absdV > 0.005)) // 090503: dzwieki pracy sprzegu - { - if (Couplers[CouplerN].CouplingFlag > 0) - if (SetFlag(SoundFlag, sound_couplerstretch)) - if (absdV > 0.1) - SetFlag(SoundFlag, sound_loud); - } distDelta = abs(newdist) - abs(Couplers[CouplerN].Dist); // McZapkie-191103: poprawka na histereze Couplers[CouplerN].Dist = newdist; @@ -4919,7 +4931,7 @@ bool TMoverParameters::FuseOn(void) { FuseFlag = false; // wlaczenie ponowne obwodu FO = true; - SetFlag(SoundFlag, sound_relay | sound_loud); + SetFlag(SoundFlag, sound::relay | sound::loud); } } return FO; @@ -4935,7 +4947,7 @@ void TMoverParameters::FuseOff(void) { FuseFlag = true; EventFlag = true; - SetFlag(SoundFlag, sound_relay | sound_loud); + SetFlag(SoundFlag, sound::relay | sound::loud); } } @@ -5206,7 +5218,7 @@ bool TMoverParameters::AutoRelayCheck(void) // MainCtrlActualPos:=MainCtrlPos; //hunter-111012: // szybkie wchodzenie na bezoporowa (303E) OK = true; - SetFlag(SoundFlag, sound_manyrelay | sound_loud); + SetFlag(SoundFlag, sound::parallel | sound::loud); } else if ((LastRelayTime > CtrlDelay) && (ARFASI)) { @@ -5240,13 +5252,13 @@ bool TMoverParameters::AutoRelayCheck(void) if ((RList[MainCtrlActualPos].R == 0) && (!(MainCtrlActualPos == MainCtrlPosNo))) // wejscie na bezoporowa { - SetFlag(SoundFlag, sound_manyrelay | sound_loud); + SetFlag(SoundFlag, sound::parallel | sound::loud); } else if ((RList[MainCtrlActualPos].R > 0) && (RList[MainCtrlActualPos - 1].R == 0)) // wejscie na drugi uklad { - SetFlag(SoundFlag, sound_manyrelay); + SetFlag(SoundFlag, sound::parallel); } } } @@ -5259,7 +5271,7 @@ bool TMoverParameters::AutoRelayCheck(void) // MainCtrlActualPos:=MainCtrlPos; //hunter-111012: // szybkie wchodzenie na bezoporowa (303E) OK = true; - SetFlag(SoundFlag, sound_manyrelay); + SetFlag(SoundFlag, sound::parallel); } else if (LastRelayTime > CtrlDownDelay) { @@ -5272,7 +5284,7 @@ bool TMoverParameters::AutoRelayCheck(void) if (RList[MainCtrlActualPos].R == 0) // dzwieki schodzenia z bezoporowej} { - SetFlag(SoundFlag, sound_manyrelay); + SetFlag(SoundFlag, sound::parallel); } } } @@ -5304,7 +5316,7 @@ bool TMoverParameters::AutoRelayCheck(void) StLinFlag = true; // ybARC - zalaczenie stycznikow liniowych MainCtrlActualPos = 1; DelayCtrlFlag = false; - SetFlag(SoundFlag, sound_relay | sound_loud); + SetFlag(SoundFlag, sound::relay | sound::loud); OK = true; } } @@ -5858,6 +5870,32 @@ bool TMoverParameters::DoorRight(bool State) return DR; } +// toggles departure warning +bool +TMoverParameters::signal_departure( bool const State, int const Notify ) { + + if( DepartureSignal == State ) { + // TBD: should the command be passed to other vehicles regardless of whether it affected the primary target? + return false; + } + + DepartureSignal = State; + if( Notify != range::local ) { + // wysłanie wyłączenia do pozostałych? + SendCtrlToNext( + "DepartureSignal", + ( State == true ? + 1 : + 0 ), + CabNo, + ( Notify == range::unit ? + ctrain_controll | ctrain_depot : + ctrain_controll ) ); + } + + return true; +} + // ************************************************************************************************* // Q: 20160713 // Przesuwa pojazd o podaną wartość w bok względem toru (dla samochodów) @@ -8227,6 +8265,13 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } + else if( Command == "DepartureSignal" ) { + DepartureSignal = ( + CValue1 == 1 ? + true : + false ); + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } else if (Command == "PantFront") /*Winger 160204*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów // Czemu EZT ma być traktowane inaczej? Ukrotnienie ma, a człon może być odwrócony @@ -8346,6 +8391,8 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C if( true == Hamulec->SetBDF( brakesetting ) ) { BrakeDelayFlag = brakesetting; OK = true; + // if setting was changed emit the sound of pneumatic relay + SetFlag( SoundFlag, sound::pneumatic ); } else { OK = false; diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 7951791b..fdfa2bbc 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -578,47 +578,58 @@ void TESt::CheckReleaser( double const dt ) } } -void TESt::CheckState( double const BCP, double &dV1 ) -{ - double VVP; - double BVP; - double CVP; +void TESt::CheckState( double const BCP, double &dV1 ) { - BVP = BrakeRes->P(); - VVP = ValveRes->P(); - // if (BVPP() - 0.0; + double const VVP { ValveRes->P() }; + double const BVP { BrakeRes->P() }; + double const CVP { CntrlRes->P() }; // sprawdzanie stanu - if (((BrakeStatus & b_hld) == b_hld) && (BCP > 0.25)) - if ((VVP + 0.003 + BCP / BVM < CVP)) - BrakeStatus |= b_on; // hamowanie stopniowe - else if ((VVP - 0.003 + (BCP - 0.1) / BVM > CVP)) - BrakeStatus &= ~( b_on | b_hld ); // luzowanie - else if ((VVP + BCP / BVM > CVP)) - BrakeStatus &= ~b_on; // zatrzymanie napelaniania - else - ; - else if ((VVP + 0.10 < CVP) && (BCP < 0.25)) // poczatek hamowania - { - if ((BrakeStatus & b_hld) == b_off) - { - ValveRes->CreatePress(0.02 * VVP); - SoundFlag |= sf_Acc; - ValveRes->Act(); + if( BCP > 0.25 ) { + + if( ( BrakeStatus & b_hld ) == b_hld ) { + + if( ( VVP + 0.003 + BCP / BVM ) < CVP ) { + // hamowanie stopniowe + BrakeStatus |= b_on; + } + else { + if( ( VVP + BCP / BVM ) > CVP ) { + // zatrzymanie napelaniania + BrakeStatus &= ~b_on; + } + if( ( VVP - 0.003 + ( BCP - 0.1 ) / BVM ) > CVP ) { + // luzowanie + BrakeStatus &= ~( b_on | b_hld ); + } + } } - BrakeStatus |= (b_on | b_hld); + else { - // ValveRes.CreatePress(0); - // dV1:=1; + if( ( VVP + BCP / BVM < CVP ) + && ( ( CVP - VVP ) * BVM > 0.25 ) ) { + // zatrzymanie luzowanie + BrakeStatus |= b_hld; + } + } } - else if ((VVP + (BCP - 0.1) / BVM < CVP) && ((CVP - VVP) * BVM > 0.25) && - (BCP > 0.25)) // zatrzymanie luzowanie - BrakeStatus |= b_hld; + else { - if ((BrakeStatus & b_hld) == b_off) + if( VVP + 0.1 < CVP ) { + // poczatek hamowania + if( ( BrakeStatus & b_hld ) == 0 ) { + // przyspieszacz + ValveRes->CreatePress( 0.02 * VVP ); + SoundFlag |= sf_Acc; + ValveRes->Act(); + } + BrakeStatus |= ( b_on | b_hld ); + } + } + + if( ( BrakeStatus & b_hld ) == 0 ) { SoundFlag |= sf_CylU; + } } double TESt::CVs( double const BP ) @@ -828,6 +839,10 @@ double TEStEP2::GetPF( double const PP, double const dt, double const Vel ) else if ((VVP + BCP / BVM < CVP - 0.12) && (BCP > 0.25)) // zatrzymanie luzowanie BrakeStatus |= b_hld; + if( ( BrakeStatus & b_hld ) == 0 ) { + SoundFlag |= sf_CylU; + } + // przeplyw ZS <-> PG if ((BVP < CVP - 0.2) || (BrakeStatus != b_off) || (BCP > 0.25)) temp = 0; @@ -1211,6 +1226,40 @@ double TLSt::GetPF( double const PP, double const dt, double const Vel ) double dV1{ 0.0 }; // sprawdzanie stanu + // NOTE: partial copypaste from checkstate() of base class + // TODO: clean inheritance for checkstate() and checkreleaser() and reuse these instead of manual copypaste + if( ( ( BrakeStatus & b_hld ) == b_hld ) && ( BCP > 0.25 ) ) { + if( ( VVP + 0.003 + BCP / BVM < CVP ) ) { + // hamowanie stopniowe + BrakeStatus |= b_on; + } + else if( ( VVP - 0.003 + ( BCP - 0.1 ) / BVM > CVP ) ) { + // luzowanie + BrakeStatus &= ~( b_on | b_hld ); + } + else if( ( VVP + BCP / BVM > CVP ) ) { + // zatrzymanie napelaniania + BrakeStatus &= ~b_on; + } + } + else if ((VVP + 0.10 < CVP) && (BCP < 0.25)) { + // poczatek hamowania + if ((BrakeStatus & b_hld) == b_off) + { + SoundFlag |= sf_Acc; + } + BrakeStatus |= (b_on | b_hld); + } + else if( ( VVP + ( BCP - 0.1 ) / BVM < CVP ) + && ( ( CVP - VVP ) * BVM > 0.25 ) + && ( BCP > 0.25 ) ) { + // zatrzymanie luzowanie + BrakeStatus |= b_hld; + } + if( ( BrakeStatus & b_hld ) == 0 ) { + SoundFlag |= sf_CylU; + } + // equivalent of checkreleaser() in the base class? if( ( BrakeStatus & b_rls ) == b_rls ) { if( CVP < 0.0 ) { BrakeStatus &= ~b_rls; @@ -1219,18 +1268,11 @@ double TLSt::GetPF( double const PP, double const dt, double const Vel ) { // 008 dV = PF1( CVP, BCP, 0.024 ) * dt; CntrlRes->Flow( dV ); -/* - // NOTE: attempted fix, disabled because it breaks when releaser is used while releasing breakes - dV = PF1(CVP, VVP, 0.024) * dt; - CntrlRes->Flow( dV ); - dV1 = dV; //minus potem jest - ImplsRes->Flow( -dV1 ); -*/ } } - double temp; // przeplyw ZS <-> PG + double temp; if (((CVP - BCP) * BVM > 0.5)) temp = 0.0; else if ((VVP > CVP + 0.4)) @@ -1888,22 +1930,51 @@ void TKE::CheckState( double const BCP, double &dV1 ) CVP = CntrlRes->P(); // sprawdzanie stanu - if ((BrakeStatus & b_hld) == b_hld) - if ((VVP + 0.003 + BCP / BVM < CVP)) - BrakeStatus |= b_on; // hamowanie stopniowe; - else if ((VVP - 0.003 + BCP / BVM > CVP)) - BrakeStatus &= ~( b_on | b_hld ); // luzowanie; - else if ((VVP + BCP / BVM > CVP)) - BrakeStatus &= ~b_on; // zatrzymanie napelaniania; - else - ; - else if ((VVP + 0.10 < CVP) && (BCP < 0.1)) // poczatek hamowania - { - BrakeStatus |= (b_on | b_hld); - ValveRes->CreatePress(0.8 * VVP); // przyspieszacz + if( BCP > 0.1 ) { + + if( ( BrakeStatus & b_hld ) == b_hld ) { + + if( ( VVP + 0.003 + BCP / BVM ) < CVP ) { + // hamowanie stopniowe; + BrakeStatus |= b_on; + } + else { + if( ( VVP + BCP / BVM ) > CVP ) { + // zatrzymanie napelaniania; + BrakeStatus &= ~b_on; + } + if( ( VVP - 0.003 + BCP / BVM ) > CVP ) { + // luzowanie; + BrakeStatus &= ~( b_on | b_hld ); + } + } + } + else { + + if( ( VVP + BCP / BVM < CVP ) + && ( ( CVP - VVP ) * BVM > 0.25 ) ) { + // zatrzymanie luzowanie + BrakeStatus |= b_hld; + } + } + } + else { + + if( VVP + 0.1 < CVP ) { + // poczatek hamowania + if( ( BrakeStatus & b_hld ) == 0 ) { + // przyspieszacz + ValveRes->CreatePress( 0.8 * VVP ); + SoundFlag |= sf_Acc; + ValveRes->Act(); + } + BrakeStatus |= ( b_on | b_hld ); + } + } + + if( ( BrakeStatus & b_hld ) == 0 ) { + SoundFlag |= sf_CylU; } - else if ((VVP + BCP / BVM < CVP) && ((CVP - VVP) * BVM > 0.25)) // zatrzymanie luzowanie - BrakeStatus |= b_hld; } double TKE::CVs( double const BP ) diff --git a/Model3d.cpp b/Model3d.cpp index 50c9c0d3..d2e5e6c8 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1050,14 +1050,17 @@ void TSubModel::ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, g */ }; -void TSubModel::ParentMatrix(float4x4 *m) -{ // pobranie transformacji względem wstawienia modelu - // jeśli nie zostało wykonane Init() (tzn. zaraz po wczytaniu T3D), to - // dodatkowy obrót - // obrót T3D jest wymagany np. do policzenia wysokości pantografów - *m = float4x4(*fMatrix); // skopiowanie, bo będziemy mnożyć - // m(3)[1]=m[3][1]+0.054; //w górę o wysokość ślizgu (na razie tak) - TSubModel *sm = this; +void TSubModel::ParentMatrix( float4x4 *m ) const { // pobranie transformacji względem wstawienia modelu + // jeśli nie zostało wykonane Init() (tzn. zaraz po wczytaniu T3D), + // to dodatkowy obrót obrót T3D jest wymagany np. do policzenia wysokości pantografów + if( fMatrix != nullptr ) { + // skopiowanie, bo będziemy mnożyć + *m = float4x4( *fMatrix ); + } + else { + m->Identity(); + } + auto *sm = this; while (sm->Parent) { // przenieść tę funkcję do modelu if (sm->Parent->GetMatrix()) @@ -1160,6 +1163,37 @@ TSubModel *TModel3d::GetFromName(std::string const &Name) } }; +// returns offset vector from root +glm::vec3 +TSubModel::offset( float const Geometrytestoffsetthreshold ) const { + + float4x4 parentmatrix; + ParentMatrix( &parentmatrix ); + + auto offset { glm::vec3 { glm::make_mat4( parentmatrix.readArray() ) * glm::vec4 { 0, 0, 0, 1 } } }; + + if( glm::length2( offset ) < Geometrytestoffsetthreshold ) { + // offset of zero generally means the submodel has optimized identity matrix + // for such cases we resort to an estimate from submodel geometry + // TODO: do proper bounding area calculation for submodel when loading mesh and grab the centre point from it here + if( m_geometry != null_handle ) { + auto const &vertices{ GfxRenderer.Vertices( m_geometry ) }; + if( false == vertices.empty() ) { + // transformation matrix for the submodel can still contain rotation and/or scaling, + // so we pass the vertex positions through it rather than just grab them directly + offset = glm::vec3(); + auto const vertexfactor { 1.f / vertices.size() }; + auto const transformationmatrix { glm::make_mat4( parentmatrix.readArray() ) }; + for( auto const &vertex : vertices ) { + offset += glm::vec3 { transformationmatrix * glm::vec4 { vertex.position, 1 } } * vertexfactor; + } + } + } + } + + return offset; +} + bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) { // wczytanie modelu z pliku diff --git a/Model3d.h b/Model3d.h index 57a01408..8244835d 100644 --- a/Model3d.h +++ b/Model3d.h @@ -124,7 +124,9 @@ private: TSubModel *Next { nullptr }; TSubModel *Child { nullptr }; +public: // temporary access, clean this up during refactoring gfx::geometry_handle m_geometry { 0, 0 }; // geometry of the submodel +private: material_handle m_material { null_handle }; // numer tekstury, -1 wymienna, 0 brak bool bWire { false }; // nie używane, ale wczytywane float Opacity { 1.0f }; @@ -138,9 +140,7 @@ public: // chwilowo float m_boundingradius { 0 }; size_t iAnimOwner{ 0 }; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim{ at_None }; // kody animacji oddzielnie, bo zerowane -public: float4x4 *mAnimMatrix{ nullptr }; // macierz do animacji kwaternionowych (należy do AnimContainer) -public: TSubModel **smLetter{ nullptr }; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) TSubModel *Parent{ nullptr }; // nadrzędny, np. do wymnażania macierzy int iVisible{ 1 }; // roboczy stan widoczności @@ -172,7 +172,10 @@ public: void SetRotateIK1(float3 vNewAngles); TSubModel * GetFromName( std::string const &search, bool i = true ); inline float4x4 * GetMatrix() { return fMatrix; }; - inline void Hide() { iVisible = 0; }; + inline float4x4 const * GetMatrix() const { return fMatrix; }; + // returns offset vector from root + glm::vec3 offset( float const Geometrytestoffsetthreshold = 0.f ) const; + inline void Hide() { iVisible = 0; }; void create_geometry( std::size_t &Dataoffset, gfx::geometrybank_handle const &Bank ); int FlagsCheck(); @@ -200,7 +203,7 @@ public: return *(fMatrix->TranslationGet()) + Child->Translation1Get(); } material_handle GetMaterial() const { return m_material; } - void ParentMatrix(float4x4 *m); + void ParentMatrix(float4x4 *m) const; float MaxY( float4x4 const &m ); void deserialize(std::istream&); diff --git a/Train.cpp b/Train.cpp index 81ceec1d..db9f5a56 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1540,8 +1540,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // TODO: consider arranging a better way to start the diesel engines if( Train->mvControlled->EngineType == DieselEngine ) { if( Train->mvControlled->MainSwitch( true ) ) { - // sound feedback, engine start for diesel vehicle - Train->dsbDieselIgnition.play(); // side-effects Train->mvControlled->ConverterSwitch( ( Train->ggConverterButton.GetValue() > 0.5 ) || ( Train->mvControlled->ConverterStart == start::automatic ) ); Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); @@ -1584,7 +1582,9 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } // play sound immediately when the switch is hit, not after release if( Train->fMainRelayTimer > 0.0f ) { +#ifdef EU07_USE_OLD_SOUNDCODE Train->dsbRelay.play(); +#endif Train->fMainRelayTimer = 0.0f; } } @@ -1595,7 +1595,9 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // ...after opening circuit, or holding for too short time to close it // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, if( Train->fMainRelayTimer > 0.0f ) { +#ifdef EU07_USE_OLD_SOUNDCODE Train->dsbRelay.play(); +#endif Train->fMainRelayTimer = 0.0f; } // we don't exactly know which of the two buttons was used, so reset both @@ -1920,7 +1922,9 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C Train->ggStLinOffButton.UpdateValue( 1.0, Train->dsbSwitch ); // effect if( true == Train->mvControlled->StLinFlag ) { +#ifdef EU07_USE_OLD_SOUNDCODE Train->dsbRelay.play(); +#endif } // yBARC - zmienione na przeciwne, bo true to zalaczone Train->mvControlled->StLinFlag = false; @@ -2729,14 +2733,14 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com // only reacting to press, so the sound can loop uninterrupted if( false == Train->mvControlled->DepartureSignal ) { // turn on - Train->mvControlled->DepartureSignal = true; + Train->mvControlled->signal_departure( true ); // visual feedback Train->ggDepartureSignalButton.UpdateValue( 1.0, Train->dsbSwitch ); } } else if( Command.action == GLFW_RELEASE ) { // turn off - Train->mvControlled->DepartureSignal = false; + Train->mvControlled->signal_departure( false ); // visual feedback Train->ggDepartureSignalButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2899,18 +2903,23 @@ void TTrain::OnKeyDown(int cKey) CouplNr = -2; temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr)); } - if (temp) + if( (temp) + && (temp != DynamicObject ) ) + // NOTE: the command to occupied vehicle will be passed through new command system, so we skip it here + // TODO: clean this up when whole control system is unified { - if (Global::ctrlState) - if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R + bdelay_M)) - { - dsbPneumaticRelay.play(); - } - else - ; - else if (temp->MoverParameters->BrakeDelaySwitch(bdelay_P)) - { + if( ( temp->MoverParameters->BrakeDelayFlag & bdelay_M ) != 0 ) { + // can't speed it up any more than this + return; + } + auto const fasterbrakesetting = ( + temp->MoverParameters->BrakeDelayFlag < bdelay_R ? + temp->MoverParameters->BrakeDelayFlag << 1 : + temp->MoverParameters->BrakeDelayFlag | bdelay_M ); + if( true == temp->MoverParameters->BrakeDelaySwitch( fasterbrakesetting ) ) { +#ifdef EU07_USE_OLD_SOUNDCODE dsbPneumaticRelay.play(); +#endif } } } @@ -3002,8 +3011,7 @@ void TTrain::OnKeyDown(int cKey) // bylo mozna ustawic dowolny // wagon int CouplNr = -2; - if( !FreeFlyModeFlag ) - { + if( false == FreeFlyModeFlag ) { #ifdef EU07_USE_OLD_COMMAND_SYSTEM if( Global::ctrlState ) if (mvOccupied->BrakeDelaySwitch(bdelay_R)) @@ -3018,8 +3026,7 @@ void TTrain::OnKeyDown(int cKey) } #endif } - else - { + else { TDynamicObject *temp; temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr)); if (temp == NULL) @@ -3027,18 +3034,24 @@ void TTrain::OnKeyDown(int cKey) CouplNr = -2; temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr)); } - if (temp) + if( (temp) + && (temp != DynamicObject ) ) + // NOTE: the command to occupied vehicle will be passed through new command system, so we skip it here + // TODO: clean this up when whole control system is unified { - if (Global::ctrlState) - if (temp->MoverParameters->BrakeDelaySwitch(bdelay_R)) - { - dsbPneumaticRelay.play(); - } - else - ; - else if (temp->MoverParameters->BrakeDelaySwitch(bdelay_G)) - { + if( temp->MoverParameters->BrakeDelayFlag == bdelay_G ) { + // can't slow it down any more than this + return; + } + auto const slowerbrakesetting = ( + temp->MoverParameters->BrakeDelayFlag < bdelay_M ? + temp->MoverParameters->BrakeDelayFlag >> 1 : + temp->MoverParameters->BrakeDelayFlag ^ bdelay_M ); + + if( true == temp->MoverParameters->BrakeDelaySwitch( slowerbrakesetting ) ) { +#ifdef EU07_USE_OLD_SOUNDCODE dsbPneumaticRelay.play(); +#endif } } } @@ -3082,221 +3095,52 @@ void TTrain::OnKeyDown(int cKey) false; // wyjście z maszynowego wyłącza sprężarkę pomocniczą */ } - else if (cKey == Global::Keys[k_Couple]) - { // ABu051104: male zmiany, zeby mozna bylo laczyc odlegle wagony - // da sie zoptymalizowac, ale nie ma na to czasu :( - if (iCabn > 0) - { - if (!FreeFlyModeFlag) // tryb 'kabinowy' - { /* - if (mvControlled->Couplers[iCabn-1].CouplingFlag==0) - { -if - (mvControlled->Attach(iCabn-1,mvControlled->Couplers[iCabn-1].Connected,ctrain_coupler)) - { - dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); - dsbCouplerAttach->Play(0,0,0); - //ABu: aha, a guzik, nie dziala i nie bedzie, a przydalo by sie - cos takiego: - //DynamicObject->NextConnected=mvControlled->Couplers[iCabn-1].Connected; - //DynamicObject->PrevConnected=mvControlled->Couplers[iCabn-1].Connected; - } - } - else - if - (!TestFlag(mvControlled->Couplers[iCabn-1].CouplingFlag,ctrain_pneumatic)) - { - //ABu021104: zeby caly czas bylo widac sprzegi: -if - (mvControlled->Attach(iCabn-1,mvControlled->Couplers[iCabn-1].Connected,mvControlled->Couplers[iCabn-1].CouplingFlag+ctrain_pneumatic)) -//if - (mvControlled->Attach(iCabn-1,mvControlled->Couplers[iCabn-1].Connected,ctrain_pneumatic)) - { - rsHiss.Play(1,DSBPLAY_LOOPING,true,DynamicObject->GetPosition()); - } - }*/ - } - else - { // tryb freefly - int CouplNr = -1; // normalnie żaden ze sprzęgów - TDynamicObject *tmp; - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr); - if (tmp == nullptr) - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr); - if( ( CouplNr != -1 ) - && ( tmp != nullptr ) - && ( tmp->MoverParameters->Couplers[ CouplNr ].Connected != nullptr ) ) - { - if (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag == 0) // najpierw hak - { - if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag - & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag - & ctrain_coupler) == ctrain_coupler) - if (tmp->MoverParameters->Attach( - CouplNr, 2, - tmp->MoverParameters->Couplers[CouplNr].Connected, - ctrain_coupler)) - { - // tmp->MoverParameters->Couplers[CouplNr].Render=true; - // //podłączony sprzęg będzie widoczny - if (DynamicObject->Mechanik) // na wszelki wypadek - DynamicObject->Mechanik->CheckVehicles(Connect); // aktualizacja flag kierunku w składzie - dsbCouplerAttach.play(); - // one coupling type per key press - return; - } - else - WriteLog("Mechanical coupling failed."); - } - if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_pneumatic)) // pneumatyka - { - if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag - & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag - & ctrain_pneumatic) == ctrain_pneumatic) - if (tmp->MoverParameters->Attach( - CouplNr, 2, - tmp->MoverParameters->Couplers[CouplNr].Connected, - (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_pneumatic))) - { - // TODO: dedicated 'click' sound for connecting cable-type connections - dsbCouplerDetach.play(); -// rsHiss.Play( 1, DSBPLAY_LOOPING, true, tmp->GetPosition() ); - DynamicObject->SetPneumatic(CouplNr != 0, true); // Ra: to mi się nie podoba !!!! - tmp->SetPneumatic(CouplNr != 0, true); - // one coupling type per key press - return; - } - } - if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_scndpneumatic)) // zasilajacy - { - if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag - & tmp->MoverParameters->Couplers[CouplNr].AllowedFlag - & ctrain_scndpneumatic) == ctrain_scndpneumatic) - if (tmp->MoverParameters->Attach( - CouplNr, 2, - tmp->MoverParameters->Couplers[CouplNr].Connected, - (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_scndpneumatic))) - { - // TODO: dedicated 'click' sound for connecting cable-type connections - dsbCouplerDetach.play(); -// rsHiss.Play( 1, DSBPLAY_LOOPING, true, tmp->GetPosition() ); - DynamicObject->SetPneumatic( CouplNr != 0, false ); // Ra: to mi się nie podoba !!!! - tmp->SetPneumatic(CouplNr != 0, false); - // one coupling type per key press - return; - } - } - if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_controll)) // ukrotnionko - { - if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag & - tmp->MoverParameters->Couplers[CouplNr].AllowedFlag & - ctrain_controll) == ctrain_controll) - if (tmp->MoverParameters->Attach( - CouplNr, 2, - tmp->MoverParameters->Couplers[CouplNr].Connected, - (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_controll))) - { - // TODO: dedicated 'click' sound for connecting cable-type connections - dsbCouplerAttach.play(); - // one coupling type per key press - return; - } - } - if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag, ctrain_passenger)) // mostek - { - if ((tmp->MoverParameters->Couplers[CouplNr].Connected->Couplers[CouplNr].AllowedFlag & - tmp->MoverParameters->Couplers[CouplNr].AllowedFlag & - ctrain_passenger) == ctrain_passenger) - if (tmp->MoverParameters->Attach( - CouplNr, 2, - tmp->MoverParameters->Couplers[CouplNr].Connected, - (tmp->MoverParameters->Couplers[CouplNr].CouplingFlag | ctrain_passenger))) - { - dsbCouplerAttach.play(); -/* - DynamicObject->SetPneumatic(CouplNr != 0, false); - tmp->SetPneumatic(CouplNr != 0, false); -*/ - // one coupling type per key press - return; - } - } - if( false == TestFlag( tmp->MoverParameters->Couplers[ CouplNr ].CouplingFlag, ctrain_heating ) ) { - // heating - if( ( tmp->MoverParameters->Couplers[ CouplNr ].Connected->Couplers[ CouplNr ].AllowedFlag - & tmp->MoverParameters->Couplers[ CouplNr ].AllowedFlag - & ctrain_heating ) == ctrain_heating ) - if( tmp->MoverParameters->Attach( - CouplNr, 2, - tmp->MoverParameters->Couplers[ CouplNr ].Connected, - ( tmp->MoverParameters->Couplers[ CouplNr ].CouplingFlag | ctrain_heating ) ) ) { + else if (cKey == Global::Keys[k_Couple]) { - // TODO: dedicated 'click' sound for connecting cable-type connections - dsbCouplerAttach.play(); - // one coupling type per key press - return; - } - } - } + if( true == FreeFlyModeFlag ) { + // tryb freefly + int CouplNr = -1; // normalnie żaden ze sprzęgów + TDynamicObject *tmp; + tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr); + if (tmp == nullptr) + tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr); + + if( ( CouplNr != -1 ) + && ( tmp != nullptr ) ) { + + tmp->couple( CouplNr ); } + if( DynamicObject->Mechanik ) { + // aktualizacja flag kierunku w składzie + DynamicObject->Mechanik->CheckVehicles( Connect ); + } + } + } - else if (cKey == Global::Keys[k_DeCouple]) - { // ABu051104: male zmiany, - // zeby mozna bylo rozlaczac - // odlegle wagony - if (iCabn > 0) - { - if (!FreeFlyModeFlag) // tryb 'kabinowy' (pozwala również rozłączyć sprzęgi zablokowane) - { - if (DynamicObject->DettachStatus(iCabn - 1) < 0) // jeśli jest co odczepić - if (DynamicObject->Dettach(iCabn - 1)) // iCab==1:przód,iCab==2:tył - { - dsbCouplerDetach.play(); // w kabinie ten dźwięk? - } + else if (cKey == Global::Keys[k_DeCouple]) { + + if( true == FreeFlyModeFlag ) { + // tryb freefly + int CouplNr = -1; + auto *tmp { DynamicObject->ABuScanNearestObject( DynamicObject->GetTrack(), 1, 1500, CouplNr ) }; + if( tmp == nullptr ) { + tmp = DynamicObject->ABuScanNearestObject( DynamicObject->GetTrack(), -1, 1500, CouplNr ); } - else - { // tryb freefly - int CouplNr = -1; - TDynamicObject *tmp; - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr); - if (tmp == NULL) - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr); - if (tmp && (CouplNr != -1)) - { - if ((tmp->MoverParameters->Couplers[CouplNr].CouplingFlag & ctrain_depot) == 0) // jeżeli sprzęg niezablokowany - if (tmp->DettachStatus(CouplNr) < 0) // jeśli jest co odczepić i się da - if (!tmp->Dettach(CouplNr)) - { // dźwięk odczepiania - dsbCouplerDetach.play(); - } - } + + if( ( CouplNr != -1 ) + && ( tmp != nullptr ) ) { + + tmp->uncouple( CouplNr ); } if( DynamicObject->Mechanik ) { // aktualizacja skrajnych pojazdów w składzie DynamicObject->Mechanik->CheckVehicles( Disconnect ); } } + } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if (cKey == Global::Keys[k_UpperSign]) // ABu 060205: światło górne - - // wyłączenie - { - if (mvOccupied->LightsPosNo > 0) //kręciolek od swiatel - { - if ((mvOccupied->LightsPos > 1) || (mvOccupied->LightsWrap)) - { - mvOccupied->LightsPos--; - if (mvOccupied->LightsPos < 1) - { - mvOccupied->LightsPos = mvOccupied->LightsPosNo; - } - play_sound( dsbSwitch ); - SetLights(); - } - } - } -#endif + // else if (DebugModeFlag) { // przesuwanie składu o 100m @@ -3510,9 +3354,6 @@ bool TTrain::Update( double const Deltatime ) vMechMovement = Vec; } - DWORD stat; - double dt = Deltatime; // Timer::GetDeltaTime(); - if (DynamicObject->mdKabina) { // Ra: TODO: odczyty klawiatury/pulpitu nie // powinny być uzależnione od istnienia modelu @@ -3536,10 +3377,10 @@ bool TTrain::Update( double const Deltatime ) if (fTachoVelocity > 1) // McZapkie-270503: podkrecanie tachometru { if (fTachoCount < maxtacho) - fTachoCount += dt * 3; // szybciej zacznij stukac + fTachoCount += Deltatime * 3; // szybciej zacznij stukac } else if (fTachoCount > 0) - fTachoCount -= dt * 0.66; // schodz powoli - niektore haslery to ze 4 + fTachoCount -= Deltatime * 0.66; // schodz powoli - niektore haslery to ze 4 // sekundy potrafia stukac // Ra 2014-09: napięcia i prądy muszą być ustalone najpierw, bo wysyłane są ewentualnie na PoKeys @@ -3747,7 +3588,7 @@ bool TTrain::Update( double const Deltatime ) // Ra 15-01: to musi stąd wylecieć - zależności nie mogą być w kabinie if (mvControlled->ConverterFlag == true) { - fConverterTimer += dt; + fConverterTimer += Deltatime; if ((mvControlled->CompressorFlag == true) && (mvControlled->CompressorPower == 1) && ((mvControlled->EngineType == ElectricSeriesMotor) || (mvControlled->TrainType == dt_EZT)) && @@ -4481,7 +4322,7 @@ bool TTrain::Update( double const Deltatime ) if (fBlinkTimer > fCzuwakBlink) fBlinkTimer = -fCzuwakBlink; else - fBlinkTimer += dt; + fBlinkTimer += Deltatime; // hunter-091012: dodanie testu czuwaka if( ( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) @@ -4969,7 +4810,7 @@ bool TTrain::Update( double const Deltatime ) { if (Global::ctrlState) { - mvOccupied->BrakeCtrlPos2 -= dt / 20.0; + mvOccupied->BrakeCtrlPos2 -= Deltatime / 20.0; if (mvOccupied->BrakeCtrlPos2 < -1.5) mvOccupied->BrakeCtrlPos2 = -1.5; } @@ -4988,7 +4829,7 @@ bool TTrain::Update( double const Deltatime ) { if (Global::ctrlState) { - mvOccupied->BrakeCtrlPos2 += (mvOccupied->BrakeCtrlPos2 > 2 ? 0 : dt / 20.0); + mvOccupied->BrakeCtrlPos2 += (mvOccupied->BrakeCtrlPos2 > 2 ? 0 : Deltatime / 20.0); if (mvOccupied->BrakeCtrlPos2 < -3) mvOccupied->BrakeCtrlPos2 = -3; } @@ -5284,7 +5125,6 @@ bool TTrain::Update( double const Deltatime ) // sounds update_sounds( Deltatime ); - m_updated = true; return true; //(DynamicObject->Update(dt)); } // koniec update @@ -5403,212 +5243,25 @@ TTrain::update_sounds( double const Deltatime ) { } } */ - // szum w czasie jazdy - vol = 0.0; - dfreq = 1.0; - if( rsRunningNoise.AM != 0 ) { - if( DynamicObject->GetVelocity() != 0 ) { - if( !TestFlag( mvOccupied->DamageFlag, - dtrain_wheelwear ) ) // McZpakie-221103: halas zalezny od kola - { - dfreq = rsRunningNoise.FM * mvOccupied->Vel + rsRunningNoise.FA; - vol = rsRunningNoise.AM * mvOccupied->Vel + rsRunningNoise.AA; - switch( tor->eEnvironment ) { - case e_tunnel: - { - vol *= 3; - dfreq *= 0.95; - } - break; - case e_canyon: - { - vol *= 1.1; - } - break; - case e_bridge: - { - vol *= 2; - dfreq *= 0.98; - } - break; - } - } - else // uszkodzone kolo (podkucie) - if( fabs( mvOccupied->nrot ) > 0.01 ) { - dfreq = rsRunningNoise.FM * mvOccupied->Vel + rsRunningNoise.FA; - vol = rsRunningNoise.AM * mvOccupied->Vel + rsRunningNoise.AA; - switch( tor->eEnvironment ) { - case e_tunnel: - { - vol *= 2; - } - break; - case e_canyon: - { - vol *= 1.1; - } - break; - case e_bridge: - { - vol *= 1.5; - } - break; - } - } - if( fabs( mvOccupied->nrot ) > 0.01 ) - vol *= 1 + - mvOccupied->UnitBrakeForce / - ( 1 + mvOccupied->MaxBrakeForce ); // hamulce wzmagaja halas - vol = vol * ( 20.0 + tor->iDamageFlag ) / 21; - rsRunningNoise.AdjFreq( dfreq, 0 ); - rsRunningNoise.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else - rsRunningNoise.Stop(); - } - - if( rsBrake.AM != 0 ) { - if( ( !mvOccupied->SlippingWheels ) && ( mvOccupied->UnitBrakeForce > 10.0 ) && - ( DynamicObject->GetVelocity() > 0.01 ) ) { - // vol=rsBrake.AA+rsBrake.AM*(DynamicObject->GetVelocity()*100+mvOccupied->UnitBrakeForce); - vol = - rsBrake.AM * sqrt( ( DynamicObject->GetVelocity() * mvOccupied->UnitBrakeForce ) ); - dfreq = rsBrake.FA + rsBrake.FM * DynamicObject->GetVelocity(); - rsBrake.AdjFreq( dfreq, 0 ); - rsBrake.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else { - rsBrake.Stop(); - } - } - - if( rsEngageSlippery.AM != 0 ) { - if /*((fabs(mvControlled->dizel_engagedeltaomega)>0.2) && */( - mvControlled->dizel_engage > 0.1 ) { - if( fabs( mvControlled->dizel_engagedeltaomega ) > 0.2 ) { - dfreq = rsEngageSlippery.FA + - rsEngageSlippery.FM * fabs( mvControlled->dizel_engagedeltaomega ); - vol = rsEngageSlippery.AA + rsEngageSlippery.AM * ( mvControlled->dizel_engage ); - } - else { - dfreq = - 1; // rsEngageSlippery.FA+0.7*rsEngageSlippery.FM*(fabs(mvControlled->enrot)+mvControlled->nmax); - if( mvControlled->dizel_engage > 0.2 ) - vol = - rsEngageSlippery.AA + - 0.2 * rsEngageSlippery.AM * ( mvControlled->enrot / mvControlled->nmax ); - else - vol = 0; - } - rsEngageSlippery.AdjFreq( dfreq, 0 ); - rsEngageSlippery.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else { - rsEngageSlippery.Stop(); - } - } - - if( FreeFlyModeFlag ) - rsFadeSound.Stop(); // wyłącz to cholerne cykanie! - else - rsFadeSound.Play( 1, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - - // McZapkie! - to wazne - SoundFlag wystawiane jest przez moje moduly - // gdy zachodza pewne wydarzenia komentowane dzwiekiem. - // Mysle ze wystarczy sprawdzac a potem zerowac SoundFlag tutaj - // a nie w DynObject - gdyby cos poszlo zle to po co szarpac dzwiekiem co - // 10ms. - - if( TestFlag( mvOccupied->SoundFlag, sound_relay ) ) { - // przekaznik - gdy bezpiecznik, automatyczny rozruch itp - if( mvOccupied->EventFlag || TestFlag( mvOccupied->SoundFlag, sound_loud ) ) { - mvOccupied->EventFlag = false; // Ra: w kabinie? - if( dsbRelay != nullptr ) { dsbRelay->SetVolume( DSBVOLUME_MAX ); } - } - else { - if( dsbRelay != nullptr ) { dsbRelay->SetVolume( -40 ); } - } - if( !TestFlag( mvOccupied->SoundFlag, sound_manyrelay ) ) - dsbRelay.play(); - else { - if( TestFlag( mvOccupied->SoundFlag, sound_loud ) ) - dsbWejscie_na_bezoporow.play(); - else - dsbWejscie_na_drugi_uklad.play(); - } - } - - if( dsbBufferClamp != nullptr ) { - if( TestFlag( mvOccupied->SoundFlag, sound_bufferclamp ) ) // zderzaki uderzaja o siebie - { - if( TestFlag( mvOccupied->SoundFlag, sound_loud ) ) - dsbBufferClamp->SetVolume( DSBVOLUME_MAX ); - else - dsbBufferClamp->SetVolume( -20 ); - dsbBufferClamp.play(); - } - } - if( dsbCouplerStretch ) - if( TestFlag( mvOccupied->SoundFlag, sound_couplerstretch ) ) // sprzegi sie rozciagaja - { - if( TestFlag( mvOccupied->SoundFlag, sound_loud ) ) - dsbCouplerStretch->SetVolume( DSBVOLUME_MAX ); - else - dsbCouplerStretch->SetVolume( -20 ); - dsbCouplerStretch.play(); - } - - if( mvOccupied->SoundFlag == 0 ) - if( mvOccupied->EventFlag ) - if( TestFlag( mvOccupied->DamageFlag, dtrain_wheelwear ) ) { // Ra: przenieść do DynObj! - if( rsRunningNoise.AM != 0 ) { - rsRunningNoise.Stop(); - float am = rsRunningNoise.AM; - float fa = rsRunningNoise.FA; - float fm = rsRunningNoise.FM; - rsRunningNoise.Init( "lomotpodkucia.wav", -1, 0, 0, 0, true ); // MC: zmiana szumu na lomot - if( rsRunningNoise.AM == 1 ) - rsRunningNoise.AM = am; - rsRunningNoise.AA = 0.7; - rsRunningNoise.FA = fa; - rsRunningNoise.FM = fm; - } - mvOccupied->EventFlag = false; - } - - mvOccupied->SoundFlag = 0; - // McZapkie! - koniec obslugi dzwiekow z mover.pas - - - if( mvControlled->SlippingWheels ) { - // Ra 2014-12: lokomotywy 181/182 dostają SlippingWheels po zahamowaniu powyżej 2.85 bara i buczały - double veldiff = ( DynamicObject->GetVelocity() - fTachoVelocity ) / mvControlled->Vmax; - if( veldiff < -0.01 ) { - // 1% Vmax rezerwy, żeby 181/182 nie buczały po zahamowaniu, ale to proteza - rsSlippery.Play( -rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - if( mvControlled->TrainType == dt_181 ) // alarm przy poslizgu dla 181/182 - BOMBARDIER - if( dsbSlipAlarm ) - play_sound( dsbSlipAlarm, DSBPLAY_LOOPING ); - } - else { - if( ( mvOccupied->UnitBrakeForce > 100.0 ) && ( DynamicObject->GetVelocity() > 1.0 ) ) { - rsSlippery.Play( rsSlippery.AM * veldiff + rsSlippery.AA, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - if( mvControlled->TrainType == dt_181 ) - if( dsbSlipAlarm ) - dsbSlipAlarm->Stop(); - } - } - } - else { - rsSlippery.Stop(); - if( mvControlled->TrainType == dt_181 ) - if( dsbSlipAlarm ) - dsbSlipAlarm->Stop(); - } #endif + + // ambient sound + // since it's typically ticking of the clock we can center it on tachometer or on middle of compartment bounding area + rsFadeSound.play( sound_flags::exclusive | sound_flags::looping ); + + if( mvControlled->TrainType == dt_181 ) { + // alarm przy poslizgu dla 181/182 - BOMBARDIER + if( ( mvControlled->SlippingWheels ) + && ( DynamicObject->GetVelocity() > 1.0 ) ) { + dsbSlipAlarm.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + dsbSlipAlarm.stop(); + } + } + // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa - if (mvOccupied->SecuritySystem.Status > 0) - { + if (mvOccupied->SecuritySystem.Status > 0) { // hunter-091012: rozdzielenie alarmow if( TestFlag( mvOccupied->SecuritySystem.Status, s_CAalarm ) || TestFlag( mvOccupied->SecuritySystem.Status, s_SHPalarm ) ) { @@ -5632,65 +5285,21 @@ TTrain::update_sounds( double const Deltatime ) { Console::BitsClear( 1 << 14 ); // ustawienie bitu 16 na PoKeys } } -#ifdef EU07_USE_OLD_SOUNDCODE - /* if ((mvControlled->Mains) && - (mvControlled->EngineType==ElectricSeriesMotor)) - { - //tu dac w przyszlosci zaleznosc od wlaczenia przetwornicy - if (mvControlled->ConverterFlag) //NBMX -obsluga przetwornicy - { - //glosnosc zalezna od nap. sieci - //-2000 do 0 - long tmpVol; - int trackVol; - trackVol=3550-2000; - if (mvControlled->RunningTraction.TractionVoltage<2000) - { - tmpVol=0; - } - else - { - tmpVol=mvControlled->RunningTraction.TractionVoltage-2000; - } - sConverter.Volume(-2000*(trackVol-tmpVol)/trackVol); - if (!sConverter.Playing()) - sConverter.TurnOn(); - } - else //wyl przetwornicy - sConverter.TurnOff(); - } - else - { - if (sConverter.Playing()) - sConverter.TurnOff(); - } - sConverter.Update(); - */ - - // if (fabs(DynamicObject->GetVelocity())>0.5) - if( dsbHasler != nullptr ) { - if( ( false == FreeFlyModeFlag ) && ( fTachoCount > maxtacho ) ) { - dsbHasler->GetStatus( &stat ); - if( !( stat & DSBSTATUS_PLAYING ) ) - play_sound( dsbHasler, DSBVOLUME_MAX, DSBPLAY_LOOPING ); - } - else { - if( ( true == FreeFlyModeFlag ) || ( fTachoCount < 1 ) ) { - dsbHasler->GetStatus( &stat ); - if( stat & DSBSTATUS_PLAYING ) - dsbHasler->Stop(); - } - } + if( fTachoCount > 3.f ) { + dsbHasler.play( sound_flags::exclusive | sound_flags::looping ); + } + else if( fTachoCount < 1.f ) { + dsbHasler.stop(); } -#endif } bool TTrain::CabChange(int iDirection) { // McZapkie-090902: zmiana kabiny 1->0->2 i z powrotem - if (DynamicObject->Mechanik ? DynamicObject->Mechanik->AIControllFlag : - true) // jeśli prowadzi AI albo jest w innym członie - { // jak AI prowadzi, to nie można mu mieszać + if( ( DynamicObject->Mechanik == nullptr ) + || ( true == DynamicObject->Mechanik->AIControllFlag ) ) { + // jeśli prowadzi AI albo jest w innym członie + // jak AI prowadzi, to nie można mu mieszać if (abs(DynamicObject->MoverParameters->ActiveCab + iDirection) > 1) return false; // ewentualna zmiana pojazdu DynamicObject->MoverParameters->ActiveCab = @@ -5721,14 +5330,6 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) cParser parser(asFileName, cParser::buffer_FILE); // NOTE: yaml-style comments are disabled until conflict in use of # is resolved // parser.addCommentStyle( "#", "\n" ); - //Wartości domyślne by nie wysypywało przy wybrakowanych mmd @240816 Stele - // NOTE: should be no longer needed as safety checks were added, - // but leaving the defaults for the sake of incomplete mmd files - dsbPneumaticSwitch.deserialize( "silence1.wav", sound_type::single ); - dsbBufferClamp.deserialize( "en57_bufferclamp.wav", sound_type::single ); - dsbCouplerDetach.deserialize( "couplerdetach.wav", sound_type::single ); - dsbCouplerStretch.deserialize( "en57_couplerstretch.wav", sound_type::single ); - dsbCouplerAttach.deserialize( "couplerattach.wav", sound_type::single ); std::string token; do @@ -5750,250 +5351,91 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) { // nastawnik: dsbNastawnikJazdy.deserialize( parser, sound_type::single ); + dsbNastawnikJazdy.owner( DynamicObject ); } else if (token == "ctrlscnd:") { // hunter-081211: nastawnik bocznikowania dsbNastawnikBocz.deserialize( parser, sound_type::single ); + dsbNastawnikBocz.owner( DynamicObject ); } else if (token == "reverserkey:") { // hunter-131211: dzwiek kierunkowego dsbReverserKey.deserialize( parser, sound_type::single ); + dsbReverserKey.owner( DynamicObject ); } else if (token == "buzzer:") { // bzyczek shp: dsbBuzzer.deserialize( parser, sound_type::single ); + dsbBuzzer.owner( DynamicObject ); } else if (token == "slipalarm:") { // Bombardier 011010: alarm przy poslizgu: dsbSlipAlarm.deserialize( parser, sound_type::single ); + dsbSlipAlarm.owner( DynamicObject ); } else if (token == "tachoclock:") { // cykanie rejestratora: dsbHasler.deserialize( parser, sound_type::single ); + dsbHasler.owner( DynamicObject ); } else if (token == "switch:") { // przelaczniki: dsbSwitch.deserialize( parser, sound_type::single ); + dsbSwitch.owner( DynamicObject ); } else if (token == "pneumaticswitch:") { // stycznik EP: dsbPneumaticSwitch.deserialize( parser, sound_type::single ); - } - else if (token == "wejscie_na_bezoporow:") - { - // hunter-111211: wydzielenie wejscia na bezoporowa i na drugi uklad do pliku - dsbWejscie_na_bezoporow.deserialize( parser, sound_type::single ); - } - else if (token == "wejscie_na_drugi_uklad:") - { - dsbWejscie_na_drugi_uklad.deserialize( parser, sound_type::single ); - } - else if (token == "relay:") - { - // styczniki itp: - dsbRelay.deserialize( parser, sound_type::single ); - if( true == dsbWejscie_na_bezoporow.empty() ) { - // hunter-111211: domyslne, gdy brak - dsbWejscie_na_bezoporow.deserialize( "wejscie_na_bezoporow.wav", sound_type::single ); - } - if (true == dsbWejscie_na_drugi_uklad.empty()) { - dsbWejscie_na_drugi_uklad.deserialize( "wescie_na_drugi_uklad.wav", sound_type::single ); - } - } - else if (token == "pneumaticrelay:") - { - // wylaczniki pneumatyczne: - dsbPneumaticRelay.deserialize( parser, sound_type::single ); - } - else if (token == "couplerattach:") - { - // laczenie: - dsbCouplerAttach.deserialize( parser, sound_type::single ); - } - else if (token == "couplerstretch:") - { - // laczenie: - dsbCouplerStretch.deserialize( parser, sound_type::single ); - } - else if (token == "couplerdetach:") - { - // rozlaczanie: - dsbCouplerDetach.deserialize( parser, sound_type::single ); - } - else if (token == "bufferclamp:") - { - // laczenie: - dsbBufferClamp.deserialize( parser, sound_type::single ); - } - else if (token == "ignition:") - { - // odpalanie silnika - dsbDieselIgnition.deserialize( parser, sound_type::single ); - } - else if (token == "brakesound:") - { - // hamowanie zwykle: -/* - rsBrake.Init(parser.getToken(), -1, 0, 0, 0, true, true); - parser.getTokens(4, false); - parser - >> rsBrake.AM - >> rsBrake.AA - >> rsBrake.FM - >> rsBrake.FA; - rsBrake.AM /= (1 + mvOccupied->MaxBrakeForce * 1000); - rsBrake.FM /= (1 + mvOccupied->Vmax); -*/ - rsBrake.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); - } - else if (token == "slipperysound:") - { - // sanie: -/* - rsSlippery.Init(parser.getToken(), -1, 0, 0, 0, true); - parser.getTokens(2, false); - parser - >> rsSlippery.AM - >> rsSlippery.AA; - rsSlippery.FM = 0.0; - rsSlippery.FA = 1.0; - rsSlippery.AM /= (1 + mvOccupied->Vmax); -*/ - rsSlippery.deserialize( parser, sound_type::single, sound_parameters::amplitude ); + dsbPneumaticSwitch.owner( DynamicObject ); } else if (token == "airsound:") { // syk: -/* - rsHiss.Init(parser.getToken(), -1, 0, 0, 0, true); - parser.getTokens(2, false); - parser - >> rsHiss.AM - >> rsHiss.AA; - rsHiss.FM = 0.0; - rsHiss.FA = 1.0; -*/ rsHiss.deserialize( parser, sound_type::single, sound_parameters::amplitude ); + rsHiss.owner( DynamicObject ); } else if (token == "airsound2:") { // syk: -/* - rsHissU.Init(parser.getToken(), -1, 0, 0, 0, true); - parser.getTokens(2, false); - parser - >> rsHissU.AM - >> rsHissU.AA; - rsHissU.FM = 0.0; - rsHissU.FA = 1.0; -*/ rsHissU.deserialize( parser, sound_type::single, sound_parameters::amplitude ); + rsHissU.owner( DynamicObject ); } else if (token == "airsound3:") { // syk: -/* - rsHissE.Init(parser.getToken(), -1, 0, 0, 0, true); - parser.getTokens(2, false); - parser - >> rsHissE.AM - >> rsHissE.AA; - rsHissE.FM = 0.0; - rsHissE.FA = 1.0; -*/ rsHissE.deserialize( parser, sound_type::single, sound_parameters::amplitude ); + rsHissE.owner( DynamicObject ); } else if (token == "airsound4:") { // syk: -/* - rsHissX.Init(parser.getToken(), -1, 0, 0, 0, true); - parser.getTokens(2, false); - parser - >> rsHissX.AM - >> rsHissX.AA; - rsHissX.FM = 0.0; - rsHissX.FA = 1.0; -*/ rsHissX.deserialize( parser, sound_type::single, sound_parameters::amplitude ); + rsHissX.owner( DynamicObject ); } else if (token == "airsound5:") { // syk: -/* - rsHissT.Init(parser.getToken(), -1, 0, 0, 0, true); - parser.getTokens(2, false); - parser - >> rsHissT.AM - >> rsHissT.AA; - rsHissT.FM = 0.0; - rsHissT.FA = 1.0; -*/ rsHissT.deserialize( parser, sound_type::single, sound_parameters::amplitude ); - } - else if (token == "fadesound:") - { - // syk: -/* - rsFadeSound.Init(parser.getToken(), -1, 0, 0, 0, true); - rsFadeSound.AM = 1.0; - rsFadeSound.AA = 1.0; - rsFadeSound.FM = 1.0; - rsFadeSound.FA = 1.0; -*/ - rsFadeSound.deserialize( parser, sound_type::single ); + rsHissT.owner( DynamicObject ); } else if (token == "localbrakesound:") { // syk: -/* - rsSBHiss.Init(parser.getToken(), -1, 0, 0, 0, true); - parser.getTokens(2, false); - parser - >> rsSBHiss.AM - >> rsSBHiss.AA; - rsSBHiss.FM = 0.0; - rsSBHiss.FA = 1.0; -*/ rsSBHiss.deserialize( parser, sound_type::single, sound_parameters::amplitude ); + rsSBHiss.owner( DynamicObject ); } - else if (token == "runningnoise:") + else if (token == "fadesound:") { - // szum podczas jazdy: -/* - rsRunningNoise.Init(parser.getToken(), -1, 0, 0, 0, true, true); - parser.getTokens(4, false); - parser - >> rsRunningNoise.AM - >> rsRunningNoise.AA - >> rsRunningNoise.FM - >> rsRunningNoise.FA; - rsRunningNoise.AM /= (1 + mvOccupied->Vmax); - rsRunningNoise.FM /= (1 + mvOccupied->Vmax); -*/ - rsRunningNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); - } - else if (token == "engageslippery:") - { - // tarcie tarcz sprzegla: -/* - rsEngageSlippery.Init(parser.getToken(), -1, 0, 0, 0, true, true); - parser.getTokens(4, false); - parser - >> rsEngageSlippery.AM - >> rsEngageSlippery.AA - >> rsEngageSlippery.FM - >> rsEngageSlippery.FA; - rsEngageSlippery.FM /= (1 + mvOccupied->nmax); -*/ - rsEngageSlippery.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + // ambient sound: + rsFadeSound.deserialize( parser, sound_type::single ); + rsFadeSound.owner( DynamicObject ); } else if (token == "mechspring:") { @@ -6202,6 +5644,45 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { DynamicObject->mdKabina->Init(); // obrócenie modelu oraz optymalizacja, również zapisanie binarnego set_cab_controls(); + + // configure placement of sound emitters which aren't bound with any device model, and weren't placed manually + auto const nullvector { glm::vec3() }; + // try first to bind sounds to location of possible devices + if( dsbReverserKey.offset() == nullvector ) { + dsbReverserKey.offset( ggDirKey.model_offset() ); + } + if( dsbNastawnikJazdy.offset() == nullvector ) { + dsbNastawnikJazdy.offset( ggMainCtrl.model_offset() ); + } + if( dsbNastawnikBocz.offset() == nullvector ) { + dsbNastawnikBocz.offset( ggScndCtrl.model_offset() ); + } + if( dsbBuzzer.offset() == nullvector ) { + dsbBuzzer.offset( btLampkaCzuwaka.model_offset() ); + } + auto const brakeoffset { ggBrakeCtrl.model_offset() }; + std::vector brakesounds = { + &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, + }; + for( auto sound : brakesounds ) { + if( sound->offset() == nullvector ) { + sound->offset( brakeoffset ); + } + } + // for whatever is left fallback on generic location, centre of the cab + auto const caboffset { glm::dvec3 { ( Cabine[ NewCabNo ].CabPos1 + Cabine[ NewCabNo ].CabPos2 ) * 0.5 } + glm::dvec3 { 0, 1, 0 } }; + std::vector sounds = { + &dsbReverserKey, &dsbNastawnikJazdy, &dsbNastawnikBocz, + &dsbSwitch, &dsbPneumaticSwitch, + &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, + &rsFadeSound, + &dsbHasler, &dsbBuzzer, &dsbSlipAlarm + }; + for( auto sound : sounds ) { + if( sound->offset() == nullvector ) { + sound->offset( caboffset ); + } + } /* // HACK: for some reason simulation at the start is slow until a sound is played // until we do a proper fix, try to play a 'silent' sound when cab is entered @@ -6330,7 +5811,6 @@ void TTrain::Silence() // sConverter.Stop(); // sSmallCompressor->Stop(); dsbCouplerStretch.Stop(); - dsbEN57_CouplerStretch.Stop(); dsbBufferClamp.Stop(); #endif }; @@ -6776,26 +6256,26 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co }; auto lookup = lights.find( Label ); if( lookup != lights.end() ) { - lookup->second.Load( Parser, DynamicObject->mdKabina ); + lookup->second.Load( Parser, DynamicObject, DynamicObject->mdKabina ); } else if( Label == "i-instrumentlight:" ) { - btInstrumentLight.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); + btInstrumentLight.Load( Parser, DynamicObject, DynamicObject->mdKabina, DynamicObject->mdModel ); InstrumentLightType = 0; } else if( Label == "i-instrumentlight_M:" ) { - btInstrumentLight.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); + btInstrumentLight.Load( Parser, DynamicObject, DynamicObject->mdKabina, DynamicObject->mdModel ); InstrumentLightType = 1; } else if( Label == "i-instrumentlight_C:" ) { - btInstrumentLight.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); + btInstrumentLight.Load( Parser, DynamicObject, DynamicObject->mdKabina, DynamicObject->mdModel ); InstrumentLightType = 2; } else if (Label == "i-doors:") { int i = Parser.getToken() - 1; auto &button = Cabine[Cabindex].Button(-1); // pierwsza wolna lampka - button.Load(Parser, DynamicObject->mdKabina); + button.Load(Parser, DynamicObject, DynamicObject->mdKabina); button.AssignBool(bDoors[0] + 3 * i); } else @@ -6887,61 +6367,73 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con }; auto lookup = gauges.find( Label ); if( lookup != gauges.end() ) { - lookup->second.Load( Parser, DynamicObject->mdKabina ); + lookup->second.Load( Parser, DynamicObject, DynamicObject->mdKabina ); m_controlmapper.insert( lookup->second, lookup->first ); } // ABu 090305: uniwersalne przyciski lub inne rzeczy else if( Label == "mainctrlact:" ) { - ggMainCtrlAct.Load( Parser, DynamicObject->mdKabina, DynamicObject->mdModel ); + ggMainCtrlAct.Load( Parser, DynamicObject, DynamicObject->mdKabina, DynamicObject->mdModel ); } // SEKCJA WSKAZNIKOW else if ((Label == "tachometer:") || (Label == "tachometerb:")) { // predkosciomierz wskaźnikowy z szarpaniem auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(&fTachoVelocityJump); + // bind tachometer sound location to the meter + if( dsbHasler.offset() == glm::vec3() ) { + dsbHasler.offset( gauge.model_offset() ); + } } else if (Label == "tachometern:") { // predkosciomierz wskaźnikowy bez szarpania auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(&fTachoVelocity); + // bind tachometer sound location to the meter + if( dsbHasler.offset() == glm::vec3() ) { + dsbHasler.offset( gauge.model_offset() ); + } } else if (Label == "tachometerd:") { // predkosciomierz cyfrowy auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(&fTachoVelocity); + // bind tachometer sound location to the meter + if( dsbHasler.offset() == glm::vec3() ) { + dsbHasler.offset( gauge.model_offset() ); + } } else if ((Label == "hvcurrent1:") || (Label == "hvcurrent1b:")) { // 1szy amperomierz auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(fHCurrent + 1); } else if ((Label == "hvcurrent2:") || (Label == "hvcurrent2b:")) { // 2gi amperomierz auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(fHCurrent + 2); } else if ((Label == "hvcurrent3:") || (Label == "hvcurrent3b:")) { // 3ci amperomierz auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałska - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(fHCurrent + 3); } else if ((Label == "hvcurrent:") || (Label == "hvcurrentb:")) { // amperomierz calkowitego pradu auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(fHCurrent); } else if (Label == "eimscreen:") @@ -6951,7 +6443,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con Parser.getTokens(2, false); Parser >> i >> j; auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(&fEIMParams[i][j]); } else if (Label == "brakes:") @@ -6961,7 +6453,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con Parser.getTokens(2, false); Parser >> i >> j; auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(&fPress[i - 1][j]); } else if ((Label == "brakepress:") || (Label == "brakepressb:")) @@ -6969,55 +6461,55 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con // manometr cylindrow hamulcowych // Ra 2014-08: przeniesione do TCab auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina, nullptr, 0.1); gauge.AssignDouble(&mvOccupied->BrakePress); } else if ((Label == "pipepress:") || (Label == "pipepressb:")) { // manometr przewodu hamulcowego auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina, nullptr, 0.1); gauge.AssignDouble(&mvOccupied->PipePress); } else if (Label == "limpipepress:") { // manometr zbiornika sterujacego zaworu maszynisty - ggZbS.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); + ggZbS.Load(Parser, DynamicObject, DynamicObject->mdKabina, nullptr, 0.1); } else if (Label == "cntrlpress:") { // manometr zbiornika kontrolnego/rorzďż˝du auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina, nullptr, 0.1); gauge.AssignDouble(&mvControlled->PantPress); } else if ((Label == "compressor:") || (Label == "compressorb:")) { // manometr sprezarki/zbiornika glownego auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina, nullptr, 0.1); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina, nullptr, 0.1); gauge.AssignDouble(&mvOccupied->Compressor); } // yB - dla drugiej sekcji else if (Label == "hvbcurrent1:") { // 1szy amperomierz - ggI1B.Load(Parser, DynamicObject->mdKabina); + ggI1B.Load(Parser, DynamicObject, DynamicObject->mdKabina); } else if (Label == "hvbcurrent2:") { // 2gi amperomierz - ggI2B.Load(Parser, DynamicObject->mdKabina); + ggI2B.Load(Parser, DynamicObject, DynamicObject->mdKabina); } else if (Label == "hvbcurrent3:") { // 3ci amperomierz - ggI3B.Load(Parser, DynamicObject->mdKabina); + ggI3B.Load(Parser, DynamicObject, DynamicObject->mdKabina); } else if (Label == "hvbcurrent:") { // amperomierz calkowitego pradu - ggItotalB.Load(Parser, DynamicObject->mdKabina); + ggItotalB.Load(Parser, DynamicObject, DynamicObject->mdKabina); } //************************************************************* else if (Label == "clock:") @@ -7034,61 +6526,61 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con else if (Label == "evoltage:") { // woltomierz napiecia silnikow - ggEngineVoltage.Load(Parser, DynamicObject->mdKabina); + ggEngineVoltage.Load(Parser, DynamicObject, DynamicObject->mdKabina); } else if (Label == "hvoltage:") { // woltomierz wysokiego napiecia auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(&fHVoltage); } else if (Label == "lvoltage:") { // woltomierz niskiego napiecia - ggLVoltage.Load(Parser, DynamicObject->mdKabina); + ggLVoltage.Load(Parser, DynamicObject, DynamicObject->mdKabina); } else if (Label == "enrot1m:") { // obrotomierz auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(fEngine + 1); } // ggEnrot1m.Load(Parser,DynamicObject->mdKabina); else if (Label == "enrot2m:") { // obrotomierz auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(fEngine + 2); } // ggEnrot2m.Load(Parser,DynamicObject->mdKabina); else if (Label == "enrot3m:") { // obrotomierz auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignFloat(fEngine + 3); } // ggEnrot3m.Load(Parser,DynamicObject->mdKabina); else if (Label == "engageratio:") { // np. ciśnienie sterownika sprzęgła auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignDouble(&mvControlled->dizel_engage); } // ggEngageRatio.Load(Parser,DynamicObject->mdKabina); else if (Label == "maingearstatus:") { // np. ciśnienie sterownika skrzyni biegów - ggMainGearStatus.Load(Parser, DynamicObject->mdKabina); + ggMainGearStatus.Load(Parser, DynamicObject, DynamicObject->mdKabina); } else if (Label == "ignitionkey:") { - ggIgnitionKey.Load(Parser, DynamicObject->mdKabina); + ggIgnitionKey.Load(Parser, DynamicObject, DynamicObject->mdKabina); } else if (Label == "distcounter:") { // Ra 2014-07: licznik kilometrów auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka - gauge.Load(Parser, DynamicObject->mdKabina); + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignDouble(&mvControlled->DistCounter); } else diff --git a/Train.h b/Train.h index fd1bd4fb..e60f3667 100644 --- a/Train.h +++ b/Train.h @@ -91,7 +91,6 @@ class TTrain vector3 GetWorldMechPosition(); bool Update( double const Deltatime ); void update_sounds( double const Deltatime ); - bool m_updated = false; void MechStop(); void SetLights(); // McZapkie-310302: ladowanie parametrow z pliku @@ -102,6 +101,7 @@ class TTrain // types typedef void( *command_handler )( TTrain *Train, command_data const &Command ); typedef std::unordered_map commandhandler_map; +// methods // clears state of all cabin controls void clear_cab_controls(); // sets cabin controls based on current state of the vehicle @@ -226,7 +226,7 @@ public: // reszta może by?publiczna TGauge ggMainCtrl; TGauge ggMainCtrlAct; TGauge ggScndCtrl; - TGauge ggScndCtrlButton; + TGauge ggScndCtrlButton; // NOTE: not used? TGauge ggDirKey; TGauge ggBrakeCtrl; TGauge ggLocalBrake; @@ -398,42 +398,23 @@ public: // reszta może by?publiczna double fMechRoll; double fMechPitch; - sound_source dsbNastawnikJazdy; - sound_source dsbNastawnikBocz; // hunter-081211 - sound_source dsbRelay; - sound_source dsbPneumaticRelay; - sound_source dsbSwitch; - sound_source dsbPneumaticSwitch; - sound_source dsbReverserKey; // hunter-121211 + sound_source dsbReverserKey { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // hunter-121211 + sound_source dsbNastawnikJazdy { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; + sound_source dsbNastawnikBocz { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // hunter-081211 + sound_source dsbSwitch { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; + sound_source dsbPneumaticSwitch { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; - sound_source dsbCouplerAttach; // Ra: w kabinie???? - sound_source dsbCouplerDetach; // Ra: w kabinie??? + sound_source rsHiss { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // upuszczanie + sound_source rsHissU { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // napelnianie + sound_source rsHissE { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // nagle + sound_source rsHissX { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // fala + sound_source rsHissT { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // czasowy + sound_source rsSBHiss { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // local - sound_source dsbDieselIgnition; // Ra: w kabinie??? - - // Winger 010304 - sound_source dsbWejscie_na_bezoporow; - sound_source dsbWejscie_na_drugi_uklad; // hunter-081211: poprawka literowki - - // PSound dsbHiss1; - // PSound dsbHiss2; - - // McZapkie-280302 - sound_source rsBrake; - sound_source rsSlippery; - sound_source rsHiss; // upuszczanie - sound_source rsHissU; // napelnianie - sound_source rsHissE; // nagle - sound_source rsHissX; // fala - sound_source rsHissT; // czasowy - sound_source rsSBHiss; - sound_source rsRunningNoise; - sound_source rsEngageSlippery; - sound_source rsFadeSound; - - sound_source dsbHasler; - sound_source dsbBuzzer; - sound_source dsbSlipAlarm; // Bombardier 011010: alarm przy poslizgu dla 181/182 + sound_source rsFadeSound { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; + sound_source dsbHasler { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; + sound_source dsbBuzzer { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; + sound_source dsbSlipAlarm { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // Bombardier 011010: alarm przy poslizgu dla 181/182 int iCabLightFlag; // McZapkie:120503: oswietlenie kabiny (0: wyl, 1: przyciemnione, 2: pelne) bool bCabLight; // hunter-091012: czy swiatlo jest zapalone? @@ -443,9 +424,6 @@ public: // reszta może by?publiczna vector3 MirrorPosition(bool lewe); private: - sound_source dsbCouplerStretch; - sound_source dsbEN57_CouplerStretch; - sound_source dsbBufferClamp; double fBlinkTimer; float fHaslerTimer; float fConverterTimer; // hunter-261211: dla przekaznika @@ -494,7 +472,9 @@ private: float fEIMParams[9][10]; // parametry dla silnikow asynchronicznych int RadioChannel() { return iRadioChannel; }; inline TDynamicObject *Dynamic() { return DynamicObject; }; + inline TDynamicObject const *Dynamic() const { return DynamicObject; }; inline TMoverParameters *Controlled() { return mvControlled; }; + inline TMoverParameters const *Controlled() const { return mvControlled; }; void DynamicSet(TDynamicObject *d); void Silence(); diff --git a/World.cpp b/World.cpp index 4c003b34..8bd79a40 100644 --- a/World.cpp +++ b/World.cpp @@ -732,7 +732,9 @@ void TWorld::OnKeyDown(int cKey) if (vehicle->MoverParameters->IncLocalBrakeLevelFAST()) if (Train) { // dźwięk oczywiście jest w kabinie +#ifdef EU07_USE_OLD_SOUNDCODE Train->dsbPneumaticRelay.play(); +#endif } } } @@ -751,7 +753,9 @@ void TWorld::OnKeyDown(int cKey) if (vehicle->MoverParameters->DecLocalBrakeLevelFAST()) if (Train) { // dźwięk oczywiście jest w kabinie +#ifdef EU07_USE_OLD_SOUNDCODE Train->dsbPneumaticRelay.play(); +#endif } } } @@ -2031,15 +2035,15 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic) if( dynamic->iCabs ) { // jeśli ma jakąkolwiek kabinę delete Train; Train = new TTrain(); - if( dynamic->iCabs & 1 ) { + if( dynamic->iCabs & 0x1 ) { dynamic->MoverParameters->ActiveCab = 1; Train->Init( dynamic, true ); } - if( dynamic->iCabs & 4 ) { + if( dynamic->iCabs & 0x4 ) { dynamic->MoverParameters->ActiveCab = -1; Train->Init( dynamic, true ); } - if( dynamic->iCabs & 2 ) { + if( dynamic->iCabs & 0x2 ) { dynamic->MoverParameters->ActiveCab = 0; Train->Init( dynamic, true ); } diff --git a/audio.cpp b/audio.cpp index 673b64f1..3e0c8f70 100644 --- a/audio.cpp +++ b/audio.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "audio.h" #include "globals.h" #include "mczapkie/mctools.h" +#include "logs.h" #define DR_WAV_IMPLEMENTATION #include "dr_wav.h" @@ -137,6 +138,7 @@ buffer_manager::create( std::string const &Filename ) { return emplace( filelookup ); } // if we still didn't find anything, give up + ErrorLog( "Bad file: failed do locate audio file \"" + Filename + "\"" ); return null_handle; } diff --git a/audio.h b/audio.h index a907a41d..8bec3f11 100644 --- a/audio.h +++ b/audio.h @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. namespace audio { -ALuint const null_resource { ~ALuint{ 0 } }; +ALuint const null_resource{ ~( ALuint { 0 } ) }; // wrapper for audio sample struct openal_buffer { diff --git a/audiorenderer.cpp b/audiorenderer.cpp index 2a1df7a7..55b97197 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -11,12 +11,15 @@ http://mozilla.org/MPL/2.0/. #include "audiorenderer.h" #include "sound.h" +#include "globals.h" #include "logs.h" namespace audio { openal_renderer renderer; +float const EU07_SOUND_CUTOFFRANGE { 3000.f }; // 2750 m = max expected emitter spawn range, plus safety margin + // starts playback of queued buffers void openal_source::play() { @@ -29,17 +32,16 @@ openal_source::play() { void openal_source::stop() { - ::alSourcei( id, AL_LOOPING, AL_FALSE ); + loop( false ); ::alSourceStop( id ); - // NOTE: we don't update the is_playing flag - // this way the state will change only on next update loop, - // giving the controller a chance to properly change state from cease to none - // even with multiple active sounds under control + is_playing = false; } // updates state of the source void -openal_source::update( int const Deltatime ) { +openal_source::update( double const Deltatime ) { + + update_deltatime = Deltatime; // cached for time-based processing of data from the controller // TODO: test whether the emitter was within range during the last tick, potentially update the counter and flag it for timeout ::alGetSourcei( id, AL_BUFFERS_PROCESSED, &buffer_index ); @@ -58,10 +60,79 @@ openal_source::update( int const Deltatime ) { controller->update( *this ); } +// configures state of the source to match the provided set of properties +void +openal_source::sync_with( sound_properties const &State ) { + +/* + // velocity + // not used yet + glm::vec3 const velocity { ( State.location - properties.location ) / update_deltatime }; +*/ + // location + properties.location = State.location; + auto sourceoffset { glm::vec3 { properties.location - glm::dvec3 { Global::pCameraPosition } } }; + if( glm::length2( sourceoffset ) > std::max( ( sound_range * sound_range ), ( EU07_SOUND_CUTOFFRANGE * EU07_SOUND_CUTOFFRANGE ) ) ) { + // range cutoff check + stop(); + return; + } + if( sound_range >= 0 ) { + ::alSourcefv( id, AL_POSITION, glm::value_ptr( sourceoffset ) ); + } + else { + // sounds with 'unlimited' range are positioned on top of the listener + ::alSourcefv( id, AL_POSITION, glm::value_ptr( glm::vec3() ) ); + } + // gain + if( ( State.placement_stamp != properties.placement_stamp ) + || ( State.base_gain != properties.base_gain ) ) { + // gain value has changed + properties.base_gain = State.base_gain; + properties.placement_gain = State.placement_gain; + properties.placement_stamp = State.placement_stamp; + + ::alSourcef( id, AL_GAIN, properties.base_gain * properties.placement_gain * Global::AudioVolume ); + } + // pitch + if( State.base_pitch != properties.base_pitch ) { + // pitch value has changed + properties.base_pitch = State.base_pitch; + + ::alSourcef( id, AL_PITCH, properties.base_pitch * pitch_variation ); + } +} + +// sets max audible distance for sounds emitted by the source +void +openal_source::range( float const Range ) { + + auto const range( + Range >= 0 ? + Range : + 5 ); // range of -1 means sound of unlimited range, positioned at the listener + ::alSourcef( id, AL_REFERENCE_DISTANCE, range * ( 1.f / 16.f ) ); + ::alSourcef( id, AL_ROLLOFF_FACTOR, 1.5f ); + // NOTE: we cache actual specified range, as we'll be giving 'unlimited' range special treatment + sound_range = Range; +} + +// sets modifier applied to the pitch of sounds emitted by the source +void +openal_source::pitch( float const Pitch ) { + + pitch_variation = Pitch; + // invalidate current pitch value to enforce change of next syns + properties.base_pitch = -1.f; +} + // toggles looping of the sound emitted by the source void openal_source::loop( bool const State ) { + if( is_looping == State ) { return; } + + is_looping = State; ::alSourcei( id, AL_LOOPING, @@ -78,9 +149,7 @@ openal_source::clear() { controller = nullptr; // unqueue bound buffers: // ensure no buffer is in use... - ::alSourcei( id, AL_LOOPING, AL_FALSE ); - ::alSourceStop( id ); - is_playing = false; + stop(); // ...prepare space for returned ids of unqueued buffers (not that we need that info)... std::vector bufferids; bufferids.resize( buffers.size() ); @@ -88,6 +157,8 @@ openal_source::clear() { ::alSourceUnqueueBuffers( id, bufferids.size(), bufferids.data() ); buffers.clear(); buffer_index = 0; + // reset properties + properties = sound_properties(); } @@ -125,6 +196,9 @@ openal_renderer::init() { // basic initialization failed return false; } + // +// ::alDistanceModel( AL_LINEAR_DISTANCE ); + ::alDistanceModel( AL_INVERSE_DISTANCE_CLAMPED ); // all done m_ready = true; return true; @@ -141,10 +215,45 @@ openal_renderer::insert( sound_source *Controller, audio::buffer_handle const So std::begin( buffers ), std::end( buffers ) ); } +// removes from the queue all sounds controlled by the specified sound emitter +void +openal_renderer::erase( sound_source const *Controller ) { + + auto source { std::begin( m_sources ) }; + while( source != std::end( m_sources ) ) { + if( source->controller == Controller ) { + // if the controller is the one specified, kill it + source->clear(); + m_sourcespares.push( *source ); + source = m_sources.erase( source ); + } + else { + // otherwise proceed through the list normally + ++source; + } + } +} + // updates state of all active emitters void -openal_renderer::update( int const Deltatime ) { +openal_renderer::update( double const Deltatime ) { + // update listener + glm::dmat4 cameramatrix; + Global::pCamera->SetMatrix( cameramatrix ); + auto rotationmatrix { glm::mat3{ cameramatrix } }; + glm::vec3 const orientation[] = { + glm::vec3{ 0, 0,-1 } * rotationmatrix , + glm::vec3{ 0, 1, 0 } * rotationmatrix }; + ::alListenerfv( AL_ORIENTATION, reinterpret_cast( orientation ) ); +/* + glm::dvec3 const listenerposition { Global::pCameraPosition }; + // not used yet + glm::vec3 const velocity { ( listenerposition - m_listenerposition ) / Deltatime }; + m_listenerposition = listenerposition; +*/ + + // update active emitters auto source { std::begin( m_sources ) }; while( source != std::end( m_sources ) ) { // update each source diff --git a/audiorenderer.h b/audiorenderer.h index ddc8ed57..220be99f 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -14,6 +14,15 @@ http://mozilla.org/MPL/2.0/. class sound_source; +// sound emitter state sync item +struct sound_properties { + glm::dvec3 location; + float base_gain { 1.f }; + float placement_gain { 1.f }; + std::uintptr_t placement_stamp { ~( std::uintptr_t{ 0 } ) }; + float base_pitch { 1.f }; +}; + namespace audio { // implementation part of the sound emitter @@ -29,6 +38,8 @@ struct openal_source { buffer_sequence buffers; // sequence of samples the source will emit int buffer_index; // currently queued sample from the buffer sequence bool is_playing { false }; + bool is_looping { false }; + sound_properties properties; // methods template @@ -47,25 +58,42 @@ struct openal_source { // starts playback of queued buffers void play(); + // updates state of the source + void + update( double const Deltatime ); + // configures state of the source to match the provided set of properties + void + sync_with( sound_properties const &State ); // stops the playback void stop(); - // updates state of the source - void - update( int const Deltatime ); // toggles looping of the sound emitted by the source void loop( bool const State ); + // sets max audible distance for sounds emitted by the source + void + range( float const Range ); + // sets modifier applied to the pitch of sounds emitted by the source + void + pitch( float const Pitch ); // releases bound buffers and resets state of the class variables // NOTE: doesn't release allocated implementation-side source void clear(); + +private: +// members + double update_deltatime; // time delta of most current update + float pitch_variation { 1.f }; // emitter-specific variation of the base pitch + float sound_range { 50.f }; // cached audible range of the emitted samples }; class openal_renderer { + friend class opengl_renderer; + public: // destructor ~openal_renderer(); @@ -89,9 +117,12 @@ public: // schedules playback of specified sample, under control of the specified sound emitter void insert( sound_source *Controller, audio::buffer_handle const Sound ); + // removes from the queue all sounds controlled by the specified sound emitter + void + erase( sound_source const *Controller ); // updates state of all active emitters void - update( int const Deltatime ); + update( double const Deltatime ); private: // types @@ -107,6 +138,7 @@ private: ALCdevice * m_device { nullptr }; ALCcontext * m_context { nullptr }; bool m_ready { false }; // renderer is initialized and functional + glm::dvec3 m_listenerposition; buffer_manager m_buffers; // TBD: list of sources as vector, sorted by distance, for openal implementations with limited number of active sources? @@ -116,6 +148,20 @@ private: extern openal_renderer renderer; +inline +float +amplitude_to_db( float const Amplitude ) { + + return 20.f * std::log10( Amplitude ); +} + +inline +float +db_to_amplitude( float const Decibels ) { + + return std::pow( 10.f, Decibels / 20.f ); +} + } // audio //--------------------------------------------------------------------------- diff --git a/dumb3d.h b/dumb3d.h index 74c4c312..2c59083b 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -162,7 +162,7 @@ class matrix4x4 } // Low-level access to the array. - const scalar_t *readArray(void) + const scalar_t *readArray(void) const { return e; } diff --git a/renderer.cpp b/renderer.cpp index 80cf167a..92c9e79d 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -441,6 +441,25 @@ opengl_renderer::Render_pass( rendermode const Mode ) { #endif switch_units( true, true, true ); Render( simulation::Region ); +/* + // debug: audio nodes + for( auto const &audiosource : audio::renderer.m_sources ) { + + ::glPushMatrix(); + auto const position = audiosource.properties.location - m_renderpass.camera.position(); + ::glTranslated( position.x, position.y, position.z ); + + ::glPushAttrib( GL_ENABLE_BIT ); + ::glDisable( GL_TEXTURE_2D ); + ::glColor3f( 0.36f, 0.75f, 0.35f ); + + ::gluSphere( m_quadric, 0.125, 4, 2 ); + + ::glPopAttrib(); + + ::glPopMatrix(); + } +*/ // ...translucent parts setup_drawing( true ); Render_Alpha( simulation::Region ); @@ -2990,11 +3009,12 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { if( glarelevel > 0.0f ) { // setup - ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); + ::glPushAttrib( GL_CURRENT_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT ); Bind_Texture( m_glaretexture ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], glarelevel ); ::glDisable( GL_LIGHTING ); + ::glDepthMask( GL_FALSE ); ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); ::glPushMatrix(); diff --git a/simulation.cpp b/simulation.cpp index 6ef2c32b..0a4a02cd 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -851,7 +851,9 @@ state_manager::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpa auto *sound = new TTextSound( soundname, Nodedata.range_max, location.x, location.y, location.z, false, false, Nodedata.range_min ); sound->name( Nodedata.name ); #else - auto *sound = new sound_source(); + auto *sound = new sound_source( sound_placement::external, Nodedata.range_max ); + sound->offset( location ); + sound->name( Nodedata.name ); sound->deserialize( Input.getToken(), sound_type::single ); #endif diff --git a/sound.cpp b/sound.cpp index d17912f5..e0cdff2d 100644 --- a/sound.cpp +++ b/sound.cpp @@ -12,6 +12,20 @@ http://mozilla.org/MPL/2.0/. #include "sound.h" #include "parser.h" #include "globals.h" +#include "world.h" +#include "train.h" + +// constructors +sound_source::sound_source( sound_placement const Placement, float const Range ) : + m_placement( Placement ), + m_range( Range ) +{} + +// destructor +sound_source::~sound_source() { + + audio::renderer.erase( this ); +} // restores state of the class from provided data stream sound_source & @@ -27,14 +41,14 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons switch( Legacytype ) { case sound_type::single: { // single sample only - m_soundmain = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); + m_soundmain.buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); break; } case sound_type::multipart: { // three samples: start, middle, stop - m_soundbegin = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); - m_soundmain = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); - m_soundend = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); + m_soundbegin.buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); + m_soundmain.buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); + m_soundend.buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); break; } default: { @@ -44,12 +58,19 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons if( Legacyparameters & sound_parameters::range ) { Input.getTokens( 1, false ); + Input >> m_range; } if( Legacyparameters & sound_parameters::amplitude ) { Input.getTokens( 2, false ); + Input + >> m_amplitudefactor + >> m_amplitudeoffset; } if( Legacyparameters & sound_parameters::frequency ) { Input.getTokens( 2, false ); + Input + >> m_frequencyfactor + >> m_frequencyoffset; } return *this; @@ -64,34 +85,41 @@ sound_source::play( int const Flags ) { // if the sound is disabled altogether or nothing can be emitted from this source, no point wasting time return; } + if( m_range > 0 ) { + auto const cutoffrange{ ( + ( m_soundbegin.buffer != null_handle ) && ( Flags & sound_flags::looping ) ? + m_range * 10 : // larger margin to let the startup sample finish playing at safe distance + m_range * 5 ) }; + if( glm::length2( location() - glm::dvec3{ Global::pCameraPosition } ) > std::min( 2750.f * 2750.f, cutoffrange * cutoffrange ) ) { + // drop sounds from beyond sensible and/or audible range + return; + } + } + + // initialize emitter-specific pitch variation if it wasn't yet set + if( m_pitchvariation == 0.f ) { + m_pitchvariation = 0.01f * static_cast( Random( 95, 105 ) ); + } m_flags = Flags; - switch( m_stage ) { - case stage::none: - case stage::restart: { - if( m_soundbegin != null_handle ) { - std::vector bufferlist{ m_soundbegin, m_soundmain }; - audio::renderer.insert( this, std::begin( bufferlist ), std::end( bufferlist ) ); - } - else { - audio::renderer.insert( this, m_soundmain ); - } - break; + if( false == is_playing() ) { + // dispatch appropriate sound + // TODO: support for parameter-driven sound table + if( m_soundbegin.buffer != null_handle ) { + std::vector bufferlist { m_soundbegin.buffer, m_soundmain.buffer }; + audio::renderer.insert( this, std::begin( bufferlist ), std::end( bufferlist ) ); } - case stage::main: { - // TODO: schedule another main sample playback, or a suitable sample from the table for combined sources - break; + else { + audio::renderer.insert( this, m_soundmain.buffer ); } - case stage::end: { - // schedule stop of current sequence end sample... - m_stage = stage::restart; - // ... and queue startup or main sound again - return play( Flags ); - break; - } - default: { - break; + } + else { + + if( ( m_soundbegin.buffer == null_handle ) + && ( ( m_flags & ( sound_flags::exclusive | sound_flags::looping ) ) == 0 ) ) { + // for single part non-looping samples we allow spawning multiple instances, if not prevented by set flags + audio::renderer.insert( this, m_soundmain.buffer ); } } } @@ -100,30 +128,14 @@ sound_source::play( int const Flags ) { void sound_source::stop() { - if( ( m_stage == stage::none ) - || ( m_stage == stage::end ) ) { - return; - } + if( false == is_playing() ) { return; } - switch( m_stage ) { - case stage::begin: - case stage::main: { - // set the source to kill any currently active sounds - m_stage = stage::cease; - if( m_soundend != null_handle ) { - // and if there's defined sample for the sound end, play it instead - audio::renderer.insert( this, m_soundend ); - } - break; - } - case stage::end: { - // set the source to kill any currently active sounds - m_stage = stage::cease; - break; - } - default: { - break; - } + m_stop = true; + + if( ( m_soundend.buffer != null_handle ) + && ( m_soundend.buffer != m_soundmain.buffer ) ) { // end == main can happen in malformed legacy cases + // spawn potentially defined sound end sample, if the emitter is currently active + audio::renderer.insert( this, m_soundend.buffer ); } } @@ -134,19 +146,28 @@ sound_source::update( audio::openal_source &Source ) { if( true == Source.is_playing ) { // kill the sound if requested - if( m_stage == stage::cease ) { + if( true == m_stop ) { Source.stop(); + update_counter( Source.buffers[ Source.buffer_index ], -1 ); + if( false == is_playing() ) { + m_stop = false; + } return; } - // TODO: positional update - if( m_soundbegin != null_handle ) { - // multipart sound + // check and update if needed current sound properties + update_location(); + update_placement_gain(); + Source.sync_with( m_properties ); + + if( m_soundbegin.buffer != null_handle ) { + // potentially a multipart sound // detect the moment when the sound moves from startup sample to the main - if( ( m_stage == stage::begin ) - && ( Source.buffers[ Source.buffer_index ] == m_soundmain ) ) { + if( ( false == Source.is_looping ) + && ( Source.buffers[ Source.buffer_index ] == m_soundmain.buffer ) ) { // when it happens update active sample flags, and activate the looping Source.loop( true ); - m_stage = stage::main; + --( m_soundbegin.playing ); + ++( m_soundmain.playing ); } } } @@ -155,12 +176,14 @@ sound_source::update( audio::openal_source &Source ) { // we can determine this from number of processed buffers if( Source.buffer_index != Source.buffers.size() ) { auto const buffer { Source.buffers[ Source.buffer_index ] }; - if( buffer == m_soundbegin ) { m_stage = stage::begin; } - // TODO: take ito accound sample table for combined sounds - else if( buffer == m_soundmain ) { m_stage = stage::main; } - else if( buffer == m_soundend ) { m_stage = stage::end; } - // TODO: emitter initialization - if( ( buffer == m_soundmain ) + update_counter( buffer, 1 ); + // emitter initialization + Source.range( m_range ); + Source.pitch( m_pitchvariation ); + update_location(); + update_placement_gain(); + Source.sync_with( m_properties ); + if( ( buffer == m_soundmain.buffer ) && ( true == TestFlag( m_flags, sound_flags::looping ) ) ) { // main sample can be optionally set to loop Source.loop( true ); @@ -169,30 +192,151 @@ sound_source::update( audio::openal_source &Source ) { Source.play(); } else { - // auto const buffer { Source.buffers[ Source.buffer_index - 1 ] }; - if( ( buffer == m_soundend ) - || ( ( m_soundend == null_handle ) - && ( buffer == m_soundmain ) ) ) { - m_stage = stage::none; - } + update_counter( buffer, -1 ); } } } +// sets base volume of the emiter to specified value +sound_source & +sound_source::gain( float const Gain ) { + + m_properties.base_gain = clamp( Gain, 0.f, 2.f ); + return *this; +} + +// returns current base volume of the emitter +float +sound_source::gain() const { + + return m_properties.base_gain; +} + +// sets base pitch of the emitter to specified value +sound_source & +sound_source::pitch( float const Pitch ) { + + m_properties.base_pitch = clamp( Pitch, 0.1f, 10.f ); + return *this; +} + bool sound_source::empty() const { // NOTE: we test only the main sound, won't bother playing potential bookends if this is missing // TODO: take into account presence of sample table, for combined sounds - return ( m_soundmain == null_handle ); + return ( m_soundmain.buffer == null_handle ); } // returns true if the source is emitting any sound bool -sound_source::is_playing() const { +sound_source::is_playing( bool const Includesoundends ) const { - return ( m_stage != stage::none ); + return ( ( m_soundbegin.playing + m_soundmain.playing ) > 0 ); +} + +// returns location of the sound source in simulation region space +glm::dvec3 const +sound_source::location() const { + + if( m_owner == nullptr ) { + // if emitter isn't attached to any vehicle the offset variable defines location in region space + return { m_offset }; + } + // otherwise combine offset with the location of the carrier + return { + m_owner->GetPosition() + + m_owner->VectorLeft() * m_offset.x + + m_owner->VectorUp() * m_offset.y + + m_owner->VectorFront() * m_offset.z }; +} + +void +sound_source::update_counter( audio::buffer_handle const Buffer, int const Value ) { + + if( Buffer == m_soundbegin.buffer ) { m_soundbegin.playing += Value; } + // TODO: take ito accound sample table for combined sounds + else if( Buffer == m_soundmain.buffer ) { m_soundmain.playing += Value; } + else if( Buffer == m_soundend.buffer ) { m_soundend.playing += Value; } +} + +float const EU07_SOUNDGAIN_LOW { 0.2f }; +float const EU07_SOUNDGAIN_MEDIUM { 0.65f }; +float const EU07_SOUNDGAIN_FULL { 1.f }; + +void +sound_source::update_location() { + + m_properties.location = location(); +} + +bool +sound_source::update_placement_gain() { + + // NOTE, HACK: current cab id can vary from -1 to +1 + // we use this as modifier to force re-calculations when moving between compartments + int const activecab = ( + FreeFlyModeFlag ? + 0 : + ( Global::pWorld->train() ? + Global::pWorld->train()->Dynamic()->MoverParameters->ActiveCab : + 0 ) ); + // location-based gain factor: + std::uintptr_t placementstamp = reinterpret_cast( ( + FreeFlyModeFlag ? + nullptr : + ( Global::pWorld->train() ? + Global::pWorld->train()->Dynamic() : + nullptr ) ) ) + + activecab; + + if( placementstamp == m_properties.placement_stamp ) { return false; } + + // listener location has changed, calculate new location-based gain factor + switch( m_placement ) { + case sound_placement::general: { + m_properties.placement_gain = EU07_SOUNDGAIN_FULL; + break; + } + case sound_placement::external: { + m_properties.placement_gain = ( + placementstamp == 0 ? + EU07_SOUNDGAIN_FULL : // listener outside + EU07_SOUNDGAIN_LOW ); // listener in a vehicle + break; + } + case sound_placement::internal: { + m_properties.placement_gain = ( + placementstamp == 0 ? + EU07_SOUNDGAIN_LOW : // listener outside + ( Global::pWorld->train()->Dynamic() != m_owner ? + EU07_SOUNDGAIN_LOW : // in another vehicle + ( activecab == 0 ? + EU07_SOUNDGAIN_LOW : // listener in the engine compartment + EU07_SOUNDGAIN_FULL ) ) ); // listener in the cab of the same vehicle + break; + } + case sound_placement::engine: { + m_properties.placement_gain = ( + placementstamp == 0 ? + EU07_SOUNDGAIN_MEDIUM : // listener outside + ( Global::pWorld->train()->Dynamic() != m_owner ? + EU07_SOUNDGAIN_LOW : // in another vehicle + ( activecab == 0 ? + EU07_SOUNDGAIN_FULL : // listener in the engine compartment + EU07_SOUNDGAIN_LOW ) ) ); // listener in another compartment of the same vehicle + break; + } + default: { + // shouldn't ever land here, but, eh + m_properties.placement_gain = EU07_SOUNDGAIN_FULL; + break; + } + } + + m_properties.placement_stamp = placementstamp; + return true; } //--------------------------------------------------------------------------- diff --git a/sound.h b/sound.h index 7f9ffb29..8a636b20 100644 --- a/sound.h +++ b/sound.h @@ -13,7 +13,11 @@ http://mozilla.org/MPL/2.0/. #include "classes.h" #include "names.h" -enum sound_type { +float const EU07_SOUND_CABCONTROLSCUTOFFRANGE { 7.5f }; +float const EU07_SOUND_BRAKINGCUTOFFRANGE { 100.f }; +float const EU07_SOUND_RUNNINGNOISECUTOFFRANGE { 100.f }; + +enum class sound_type { single, multipart }; @@ -29,27 +33,59 @@ enum sound_flags { exclusive = 0x2 // the source won't dispatch more than one active instance of the sound; implied for multi-sounds }; +enum class sound_placement { + general, // source is equally audible in potential carrier and outside of it + internal, // source is located inside of the carrier, and less audible when the listener is outside + engine, // source is located in the engine compartment, less audible when the listener is outside and even less in the cabs + external // source is located on the outside of the carrier, and less audible when the listener is inside +}; + // mini controller and audio dispatcher; issues play commands for the audio renderer, // updates parameters of created audio emitters for the playback duration // TODO: move to simulation namespace after clean up of owner classes class sound_source { public: +// constructors + sound_source( sound_placement const Placement, float const Range = 50.f ); + +// destructor + ~sound_source(); + // methods // restores state of the class from provided data stream sound_source & - deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters = NULL ); + deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters = 0 ); sound_source & - deserialize( std::string const &Input, sound_type const Legacytype, int const Legacyparameters = NULL ); + deserialize( std::string const &Input, sound_type const Legacytype, int const Legacyparameters = 0 ); // issues contextual play commands for the audio renderer void - play( int const Flags = NULL ); + play( int const Flags = 0 ); // stops currently active play commands controlled by this emitter void stop(); // adjusts parameters of provided implementation-side sound source void update( audio::openal_source &Source ); + // sets base volume of the emiter to specified value + sound_source & + gain( float const Gain ); + // returns current base volume of the emitter + float + gain() const; + // sets base pitch of the emitter to specified value + sound_source & + pitch( float const Pitch ); + // owner setter/getter + void + owner( TDynamicObject const *Owner ); + TDynamicObject const * + owner() const; + // sound source offset setter/getter + void + offset( glm::vec3 const Offset ); + glm::vec3 const & + offset() const; // sound source name setter/getter void name( std::string Name ); @@ -58,38 +94,62 @@ public: // returns true if there isn't any sound buffer associated with the object, false otherwise bool empty() const; - // returns true if the source is emitting any sound + // returns true if the source is emitting any sound; by default doesn't take into account optional ending soudnds bool - is_playing() const; + is_playing( bool const Includesoundends = false ) const; + // returns location of the sound source in simulation region space + glm::dvec3 const + location() const; + +// members + float m_amplitudefactor { 1.f }; // helper, value potentially used by gain calculation + float m_amplitudeoffset { 0.f }; // helper, value potentially used by gain calculation + float m_frequencyfactor { 1.f }; // helper, value potentially used by pitch calculation + float m_frequencyoffset { 0.f }; // helper, value potentially used by pitch calculation private: // types - enum stage { - none, - begin, - main, - end, - cease, - restart + struct sound_data { + audio::buffer_handle buffer { null_handle }; + int playing { 0 }; // number of currently active sample instances }; +// methods + void + update_counter( audio::buffer_handle const Buffer, int const Value ); + void + update_location(); + // potentially updates area-based gain factor of the source. returns: true if location has changed + bool + update_placement_gain(); + // members - TDynamicObject * m_owner { nullptr }; // optional, the vehicle carrying this sound source + TDynamicObject const * m_owner { nullptr }; // optional, the vehicle carrying this sound source glm::vec3 m_offset; // relative position of the source, either from the owner or the region centre + sound_placement m_placement; + float m_range { 50.f }; // audible range of the emitted sounds std::string m_name; - stage m_stage{ stage::none }; - int m_flags{ NULL }; - audio::buffer_handle m_soundmain { null_handle }; // main sound emitted by the source - audio::buffer_handle m_soundbegin { null_handle }; // optional, sound emitted before the main sound - audio::buffer_handle m_soundend { null_handle }; // optional, sound emitted after the main sound + int m_flags { 0 }; // requested playback parameters + sound_properties m_properties; // current properties of the emitted sounds + float m_pitchvariation { 0.f }; // emitter-specific shift in base pitch + bool m_stop { false }; // indicates active sample instances should be terminated + sound_data m_soundmain; // main sound emitted by the source + sound_data m_soundbegin; // optional, sound emitted before the main sound + sound_data m_soundend; // optional, sound emitted after the main sound // TODO: table of samples with associated values, activated when controlling variable matches the value }; +// owner setter/getter +inline void sound_source::owner( TDynamicObject const *Owner ) { m_owner = Owner; } +inline TDynamicObject const * sound_source::owner() const { return m_owner; } +// sound source offset setter/getter +inline void sound_source::offset( glm::vec3 const Offset ) { m_offset = Offset; } +inline glm::vec3 const & sound_source::offset() const { return m_offset; } // sound source name setter/getter inline void sound_source::name( std::string Name ) { m_name = Name; } inline std::string const & sound_source::name() const { return m_name; } -// collection of generators for power grid present in the scene +// collection of sound sources present in the scene class sound_table : public basic_table { }; From 59e8c705641cefc73e90d38e4c7626c071bd6986 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 30 Nov 2017 16:30:29 +0100 Subject: [PATCH 226/426] less strict trigger conditions for track event0 and event0all --- TrkFoll.cpp | 92 ++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 51 deletions(-) diff --git a/TrkFoll.cpp b/TrkFoll.cpp index ddfa4fee..38b61d1a 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -99,82 +99,72 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) bool bCanSkip; // czy przemieścić pojazd na inny tor while (true) // pętla wychodzi, gdy przesunięcie wyjdzie zerowe { // pętla przesuwająca wózek przez kolejne tory, aż do trafienia w jakiś - if (!pCurrentTrack) - return false; // nie ma toru, to nie ma przesuwania - if (pCurrentTrack->iEvents) // sumaryczna informacja o eventach - { // omijamy cały ten blok, gdy tor nie ma on żadnych eventów (większość nie ma) - if (fDistance < 0) - { + if( pCurrentTrack == nullptr ) { return false; } // nie ma toru, to nie ma przesuwania + // TODO: refactor following block as track method + if( pCurrentTrack->iEvents ) { // sumaryczna informacja o eventach + // omijamy cały ten blok, gdy tor nie ma on żadnych eventów (większość nie ma) + if( std::abs( fDistance ) < 0.01 ) { + //McZapkie-140602: wyzwalanie zdarzenia gdy pojazd stoi + if( ( Owner->Mechanik != nullptr ) + && ( Owner->Mechanik->Primary() ) ) { + // tylko dla jednego członu + if( ( pCurrentTrack->evEvent0 ) + && ( pCurrentTrack->evEvent0->iQueued == 0 ) ) { + simulation::Events.AddToQuery( pCurrentTrack->evEvent0, Owner ); + } + } + if( ( pCurrentTrack->evEventall0 ) + && ( pCurrentTrack->evEventall0->iQueued == 0 ) ) { + simulation::Events.AddToQuery( pCurrentTrack->evEventall0, Owner ); + } + } + else if (fDistance < 0) { + // event1, eventall1 if( SetFlag( iEventFlag, -1 ) ) { // zawsze zeruje flagę sprawdzenia, jak mechanik dosiądzie, to się nie wykona if( ( Owner->Mechanik != nullptr ) && ( Owner->Mechanik->Primary() ) ) { // tylko dla jednego członu // McZapkie-280503: wyzwalanie event tylko dla pojazdow z obsada - if( ( bPrimary ) - && ( pCurrentTrack->evEvent1 ) - && ( !pCurrentTrack->evEvent1->iQueued ) ) { + if( ( true == bPrimary ) + && ( pCurrentTrack->evEvent1 != nullptr ) + && ( pCurrentTrack->evEvent1->iQueued == 0 ) ) { // dodanie do kolejki simulation::Events.AddToQuery( pCurrentTrack->evEvent1, Owner ); } } } - // Owner->RaAxleEvent(pCurrentTrack->Event1); //Ra: dynamic zdecyduje, czy dodać do - // kolejki - // if (TestFlag(iEventallFlag,1)) - if (SetFlag(iEventallFlag, - -1)) // McZapkie-280503: wyzwalanie eventall dla wszystkich pojazdow - if (bPrimary && pCurrentTrack->evEventall1 && - (!pCurrentTrack->evEventall1->iQueued)) - simulation::Events.AddToQuery(pCurrentTrack->evEventall1, Owner); // dodanie do kolejki - // Owner->RaAxleEvent(pCurrentTrack->Eventall1); //Ra: dynamic zdecyduje, czy dodać - // do kolejki + if( SetFlag( iEventallFlag, -1 ) ) { + // McZapkie-280503: wyzwalanie eventall dla wszystkich pojazdow + if( ( true == bPrimary ) + && ( pCurrentTrack->evEventall1 != nullptr ) + && ( pCurrentTrack->evEventall1->iQueued == 0 ) ) { + simulation::Events.AddToQuery( pCurrentTrack->evEventall1, Owner ); // dodanie do kolejki + } + } } - else if (fDistance > 0) - { + else if (fDistance > 0) { + // event2, eventall2 if( SetFlag( iEventFlag, -2 ) ) { - // zawsze ustawia flagę sprawdzenia, jak mechanik - // dosiądzie, to się nie wykona + // zawsze ustawia flagę sprawdzenia, jak mechanik dosiądzie, to się nie wykona if( ( Owner->Mechanik != nullptr ) && ( Owner->Mechanik->Primary() ) ) { // tylko dla jednego członu - if( ( bPrimary ) - && ( pCurrentTrack->evEvent2 ) - && ( !pCurrentTrack->evEvent2->iQueued ) ) { + if( ( true == bPrimary ) + && ( pCurrentTrack->evEvent2 != nullptr ) + && ( pCurrentTrack->evEvent2->iQueued == 0 ) ) { simulation::Events.AddToQuery( pCurrentTrack->evEvent2, Owner ); } } } - // Owner->RaAxleEvent(pCurrentTrack->Event2); //Ra: dynamic zdecyduje, czy dodać do - // kolejki - // if (TestFlag(iEventallFlag,2)) if( SetFlag( iEventallFlag, -2 ) ) { // sprawdza i zeruje na przyszłość, true jeśli zmieni z 2 na 0 - if( ( bPrimary ) - && ( pCurrentTrack->evEventall2 ) - && ( !pCurrentTrack->evEventall2->iQueued ) ) { + if( ( true == bPrimary ) + && ( pCurrentTrack->evEventall2 != nullptr ) + && ( pCurrentTrack->evEventall2->iQueued == 0 ) ) { simulation::Events.AddToQuery( pCurrentTrack->evEventall2, Owner ); } } - // Owner->RaAxleEvent(pCurrentTrack->Eventall2); //Ra: dynamic zdecyduje, czy dodać - // do kolejki - } - else // if (fDistance==0) //McZapkie-140602: wyzwalanie zdarzenia gdy pojazd stoi - { - if( ( Owner->Mechanik != nullptr ) - && ( Owner->Mechanik->Primary() ) ) { - // tylko dla jednego członu - if( pCurrentTrack->evEvent0 ) - if( !pCurrentTrack->evEvent0->iQueued ) - simulation::Events.AddToQuery( pCurrentTrack->evEvent0, Owner ); - } - // Owner->RaAxleEvent(pCurrentTrack->Event0); //Ra: dynamic zdecyduje, czy dodać do - // kolejki - if (pCurrentTrack->evEventall0) - if (!pCurrentTrack->evEventall0->iQueued) - simulation::Events.AddToQuery(pCurrentTrack->evEventall0, Owner); - // Owner->RaAxleEvent(pCurrentTrack->Eventall0); //Ra: dynamic zdecyduje, czy dodać - // do kolejki } } if (!pCurrentSegment) // jeżeli nie ma powiązanego segmentu toru? From ef2195fbccf33db9bdd9057de968d728768940d3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 30 Nov 2017 16:32:59 +0100 Subject: [PATCH 227/426] maintenance: minor code cleanup --- McZapkie/Mover.cpp | 2 +- Model3d.cpp | 14 +++----------- Timer.cpp | 5 ----- Timer.h | 2 -- 4 files changed, 4 insertions(+), 19 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index e339284f..5971367f 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3384,7 +3384,7 @@ void TMoverParameters::UpdatePipePressure(double dt) // dodać jakiś wpis do fizyki na to if( ( ( Couplers[ b ].Connected->TrainType & ( dt_ET41 | dt_ET42 ) ) != 0 ) && ( ( Couplers[ b ].CouplingFlag & 36 ) == 36 ) ) - LocBrakePress = Max0R( Couplers[ b ].Connected->LocHandle->GetCP(), LocBrakePress ); + LocBrakePress = std::max( Couplers[ b ].Connected->LocHandle->GetCP(), LocBrakePress ); //if ((DynamicBrakeFlag) && (EngineType == ElectricInductionMotor)) //{ diff --git a/Model3d.cpp b/Model3d.cpp index d2e5e6c8..737ef26e 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -42,21 +42,13 @@ std::string *TSubModel::pasText; // 0x3F3F003F - wszystkie wymienne tekstury używane w danym cyklu // Ale w TModel3d okerśla przezroczystość tekstur wymiennych! -TSubModel::~TSubModel() -{ -/* - if (uiDisplayList) - glDeleteLists(uiDisplayList, 1); -*/ - if (iFlags & 0x0200) +TSubModel::~TSubModel() { + + if (iFlags & 0x0200) { // wczytany z pliku tekstowego musi sam posprzątać - // SafeDeleteArray(Indices); SafeDelete(Next); SafeDelete(Child); delete fMatrix; // własny transform trzeba usunąć (zawsze jeden) -/* - delete[] Vertices; -*/ } delete[] smLetter; // używany tylko roboczo dla TP_TEXT, do przyspieszenia // wyświetlania diff --git a/Timer.cpp b/Timer.cpp index dcfb6780..6220655a 100644 --- a/Timer.cpp +++ b/Timer.cpp @@ -38,11 +38,6 @@ double GetDeltaRenderTime() return DeltaRenderTime; } -double GetfSinceStart() -{ - return fSinceStart; -} - void SetDeltaTime(double t) { DeltaTime = t; diff --git a/Timer.h b/Timer.h index d0d9e5c9..ffcb45e0 100644 --- a/Timer.h +++ b/Timer.h @@ -16,8 +16,6 @@ double GetTime(); double GetDeltaTime(); double GetDeltaRenderTime(); -double GetfSinceStart(); - void SetDeltaTime(double v); bool GetSoundTimer(); From 34f96595fdceb1df76b62d653b2847911beb4540 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 30 Nov 2017 16:37:25 +0100 Subject: [PATCH 228/426] audio source reinitialization fix, sound volume level tweaks --- Driver.cpp | 52 +++++------ DynObj.cpp | 12 +-- Train.cpp | 214 ++++++++++++++++++++++++---------------------- Train.h | 4 +- audio.cpp | 13 ++- audiorenderer.cpp | 23 +++-- audiorenderer.h | 3 +- sound.cpp | 50 +++++++---- sound.h | 11 ++- 9 files changed, 222 insertions(+), 160 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 24c9e81e..cb11fa8f 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2987,7 +2987,8 @@ void TController::Doors(bool what) if (mvOccupied->DoorOpenCtrl == 1) { // jeśli drzwi sterowane z kabiny if( AIControllFlag ) { - if( mvOccupied->DoorLeftOpened || mvOccupied->DoorRightOpened ) { // AI zamyka drzwi przed odjazdem + if( mvOccupied->DoorLeftOpened || mvOccupied->DoorRightOpened ) { + // AI zamyka drzwi przed odjazdem if( ( true == mvOccupied->DoorClosureWarning ) && ( false == mvOccupied->DepartureSignal ) && ( true == TestFlag( iDrivigFlags, moveDoorOpened ) ) ) { @@ -3092,8 +3093,8 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N asNextStop = TrainParams->NextStop(); iDrivigFlags |= movePrimary; // skoro dostał rozkład, to jest teraz głównym NewCommand = Global::asCurrentSceneryPath + NewCommand + ".wav"; // na razie jeden - if (FileExists(NewCommand)) - { // wczytanie dźwięku odjazdu podawanego bezpośrenido + if (FileExists(NewCommand)) { + // wczytanie dźwięku odjazdu podawanego bezpośrenido #ifdef EU07_USE_OLD_SOUNDCODE tsGuardSignal = new TTextSound( @@ -3101,19 +3102,15 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N pVehicle->GetPosition().x, pVehicle->GetPosition().y, pVehicle->GetPosition().z, false); #else - tsGuardSignal = new sound_source( sound_placement::external ); + tsGuardSignal = new sound_source( sound_placement::external, 75.f ); tsGuardSignal->deserialize( NewCommand, sound_type::single ); - tsGuardSignal->owner( pVehicle ); - // place virtual conductor some distance away - tsGuardSignal->offset( { pVehicle->MoverParameters->Dim.W * -0.75f, 1.7f, fLength * -0.25f } ); #endif iGuardRadio = 0; // nie przez radio } - else - { + else { NewCommand = NewCommand.insert(NewCommand.find_last_of("."),"radio"); // wstawienie przed kropkč - if (FileExists(NewCommand)) - { // wczytanie dźwięku odjazdu w wersji radiowej (słychać tylko w kabinie) + if (FileExists(NewCommand)) { + // wczytanie dźwięku odjazdu w wersji radiowej (słychać tylko w kabinie) #ifdef EU07_USE_OLD_SOUNDCODE tsGuardSignal = new TTextSound( @@ -3121,12 +3118,8 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N pVehicle->GetPosition().x, pVehicle->GetPosition().y, pVehicle->GetPosition().z, false); #else - tsGuardSignal = new sound_source( sound_placement::external ); + tsGuardSignal = new sound_source( sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE ); tsGuardSignal->deserialize( NewCommand, sound_type::single ); - tsGuardSignal->owner( pVehicle ); - // command will be transmitted by radio - // TODO: put the exact location in the proper cab - tsGuardSignal->offset( { 0.f, 1.f, pVehicle->MoverParameters->Dim.L * 0.75f } ); #endif iGuardRadio = iRadioChannel; } @@ -4487,20 +4480,21 @@ TController::UpdateSituation(double dt) { } if (VelDesired > 0.0) if( ( ( iDrivigFlags & moveStopHere ) == 0 ) - || ( ( SemNextIndex != -1 ) - && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) - && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) ) { + || ( ( SemNextIndex != -1 ) + && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) + && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) ) { // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w // składzie, jeśli nie mamy czekać na sygnał też trzeba odpalić if (iDrivigFlags & moveGuardSignal) { // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas stania iDrivigFlags &= ~moveGuardSignal; // tylko raz nadać - +/* if( ( iDrivigFlags & moveDoorOpened ) && ( false == mvOccupied->DoorOpenCtrl ) ) { // jeśli drzwi otwarte, niesterowane przez maszynistę Doors( false ); // a EZT zamknie dopiero po odegraniu komunikatu kierownika } +*/ if( tsGuardSignal != nullptr ) { #ifdef EU07_USE_OLD_SOUNDCODE tsGuardSignal->Stop(); @@ -4513,11 +4507,14 @@ TController::UpdateSituation(double dt) { // pobliżu, a drugi radiowy, słyszalny w innych lokomotywach // na razie zakładam, że to nie jest dźwięk radiowy, bo trzeba by zrobić // obsługę kanałów radiowych itd. - if( !iGuardRadio ) { + if( iGuardRadio == 0 ) { // jeśli nie przez radio #ifdef EU07_USE_OLD_SOUNDCODE tsGuardSignal->Play( 1.0, 0, !FreeFlyModeFlag, pVehicle->GetPosition() ); // dla true jest głośniej #else + tsGuardSignal->owner( pVehicle ); + // place virtual conductor some distance away + tsGuardSignal->offset( { pVehicle->MoverParameters->Dim.W * -0.75f, 1.7f, std::min( -20.0, -0.2 * fLength ) } ); tsGuardSignal->play( sound_flags::exclusive ); #endif } @@ -4526,15 +4523,18 @@ TController::UpdateSituation(double dt) { // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu // (albo może mieć radio przenośne) - kierownik mógłby powtarzać // przy braku reakcji +#ifdef EU07_USE_OLD_SOUNDCODE if( SquareMagnitude( pVehicle->GetPosition() - Global::pCameraPosition ) < 2000 * 2000 ) { // w odległości mniejszej niż 2km -#ifdef EU07_USE_OLD_SOUNDCODE tsGuardSignal->Play( 1.0, 0, true, pVehicle->GetPosition() ); // dźwięk niby przez radio -#else - // TODO: proper system for sending/receiving radio messages - tsGuardSignal->play( sound_flags::exclusive ); -#endif } +#else + // TODO: proper system for sending/receiving radio messages + // place the sound in appropriate cab of the manned vehicle + tsGuardSignal->owner( pVehicle ); + tsGuardSignal->offset( { 0.f, 2.f, pVehicle->MoverParameters->Dim.L * 0.4f * ( pVehicle->MoverParameters->ActiveCab < 0 ? -1 : 1 ) } ); + tsGuardSignal->play( sound_flags::exclusive ); +#endif } } } diff --git a/DynObj.cpp b/DynObj.cpp index 59941932..f2ff0bc0 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3605,6 +3605,8 @@ void TDynamicObject::RenderSounds() { double volume { 1.0 }; double const dt { Timer::GetDeltaRenderTime() }; + if( dt == 0.0 ) { return; } + // engine sounds if( MoverParameters->Power > 0 ) { @@ -3889,7 +3891,7 @@ void TDynamicObject::RenderSounds() { } else { eng_turbo = std::max( goalpitch, eng_turbo - changerate * 0.5 ); - volume = std::max( 0.0, sTurbo.gain() - 10.0 * dt ); + volume = std::max( 0.0, sTurbo.gain() - 2.0 * dt ); if( volume > 0.05 ) { sTurbo .pitch( 0.4 + eng_turbo * 0.4 ) @@ -3943,7 +3945,7 @@ void TDynamicObject::RenderSounds() { // brake system and braking sounds: if( m_lastbrakepressure != -1.f ) { - // calculate rate of pressure change in brake cylinder, once it's been initialized + // calculate rate of pressure drop in brake cylinder, once it's been initialized auto const brakepressuredifference { m_lastbrakepressure - MoverParameters->BrakePress }; m_brakepressurechange = interpolate( m_brakepressurechange, 10 * ( brakepressuredifference / dt ), 0.1f ); } @@ -3951,7 +3953,7 @@ void TDynamicObject::RenderSounds() { if( m_brakepressurechange > 0.05f ) { // NOTE: can't use the leak rate directly due to irregular results produced by some brake type implementations rsUnbrake - .gain( static_cast( std::max( MoverParameters->BrakePress, 0.0 ) / MoverParameters->MaxBrakePress[ 3 ] ) ) + .gain( static_cast( 1.25 * std::max( MoverParameters->BrakePress, 0.0 ) / MoverParameters->MaxBrakePress[ 3 ] ) ) .play( sound_flags::exclusive | sound_flags::looping ); } else { @@ -4164,13 +4166,13 @@ void TDynamicObject::RenderSounds() { } // scale volume by track quality volume *= ( 20.0 + MyTrack->iDamageFlag ) / 21; - // scale volume with curve radius and vehicle speed + // scale volume with vehicle speed // TBD, TODO: disable the scaling for sounds combined from speed-based samples? volume *= interpolate( 0.0, 1.0, clamp( - MoverParameters->Vel / 80.0, + MoverParameters->Vel / 60.0, 0.0, 1.0 ) ); rsRunningNoise .pitch( clamp( frequency, 0.5, 1.15 ) ) // arbitrary limits to prevent the pitch going out of whack diff --git a/Train.cpp b/Train.cpp index db9f5a56..213c9683 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5130,120 +5130,128 @@ bool TTrain::Update( double const Deltatime ) void TTrain::update_sounds( double const Deltatime ) { -#ifdef EU07_USE_OLD_SOUNDCODE - double vol = 0; - // int freq=1; - double dfreq; + + if( Deltatime == 0.0 ) { return; } + + double volume { 0.0 }; + double const brakevolumescale { 0.5 }; // McZapkie-280302 - syczenie - if( ( mvOccupied->BrakeHandle == FV4a ) || ( mvOccupied->BrakeHandle == FVel6 ) ) { - if( rsHiss.AM != 0 ) // upuszczanie z PG - { - fPPress = ( 1 * fPPress + mvOccupied->Handle->GetSound( s_fv4a_b ) ) / ( 2 ); - if( fPPress > 0 ) { - vol = 2.0 * rsHiss.AM * fPPress; - } - if( vol > 0.001 ) { - rsHiss.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else { - rsHiss.Stop(); - } + // TODO: softer volume reduction than plain abrupt stop, perhaps as reusable wrapper? + if( ( mvOccupied->BrakeHandle == FV4a ) + || ( mvOccupied->BrakeHandle == FVel6 ) ) { + // upuszczanie z PG + fPPress = interpolate( fPPress, mvOccupied->Handle->GetSound( s_fv4a_b ), 0.05 ); + volume = ( + fPPress > 0 ? + rsHiss.m_amplitudefactor * fPPress * 0.25 : + 0 ); + if( volume * brakevolumescale > 0.05 ) { + rsHiss + .gain( volume * brakevolumescale ) + .play( sound_flags::exclusive | sound_flags::looping ); } - if( rsHissU.AM != 0 ) // upuszczanie z PG - { - fNPress = ( 1 * fNPress + mvOccupied->Handle->GetSound( s_fv4a_u ) ) / ( 2 ); - if( fNPress > 0 ) { - vol = rsHissU.AM * fNPress; - } - if( vol > 0.001 ) { - rsHissU.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else { - rsHissU.Stop(); - } + else { + rsHiss.stop(); } - if( rsHissE.AM != 0 ) // upuszczanie przy naglym - { - vol = mvOccupied->Handle->GetSound( s_fv4a_e ) * rsHissE.AM; - if( vol > 0.001 ) { - rsHissE.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else { - rsHissE.Stop(); - } + // napelnianie PG + fNPress = interpolate( fNPress, mvOccupied->Handle->GetSound( s_fv4a_u ), 0.25 ); + volume = ( + fNPress > 0 ? + rsHissU.m_amplitudefactor * fNPress : + 0 ); + if( volume * brakevolumescale > 0.05 ) { + rsHissU + .gain( volume * brakevolumescale ) + .play( sound_flags::exclusive | sound_flags::looping ); } - if( rsHissX.AM != 0 ) // upuszczanie sterujacego fala - { - vol = mvOccupied->Handle->GetSound( s_fv4a_x ) * rsHissX.AM; - if( vol > 0.001 ) { - rsHissX.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else { - rsHissX.Stop(); - } + else { + rsHissU.stop(); } - if( rsHissT.AM != 0 ) // upuszczanie z czasowego - { - vol = mvOccupied->Handle->GetSound( s_fv4a_t ) * rsHissT.AM; - if( vol > 0.001 ) { - rsHissT.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else { - rsHissT.Stop(); - } + // upuszczanie przy naglym + volume = mvOccupied->Handle->GetSound( s_fv4a_e ) * rsHissE.m_amplitudefactor; + if( volume * brakevolumescale > 0.05 ) { + rsHissE + .gain( volume * brakevolumescale ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsHissE.stop(); + } + // upuszczanie sterujacego fala + volume = mvOccupied->Handle->GetSound( s_fv4a_x ) * rsHissX.m_amplitudefactor; + if( volume * brakevolumescale > 0.05 ) { + rsHissX + .gain( volume * brakevolumescale ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsHissX.stop(); + } + // upuszczanie z czasowego + volume = mvOccupied->Handle->GetSound( s_fv4a_t ) * rsHissT.m_amplitudefactor; + if( volume * brakevolumescale > 0.05 ) { + rsHissT + .gain( volume * brakevolumescale ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsHissT.stop(); } - } // koniec FV4a - else // jesli nie FV4a - { - if( rsHiss.AM != 0.0 ) // upuszczanie z PG - { - fPPress = ( 4.0f * fPPress + std::max( mvOccupied->dpLocalValve, mvOccupied->dpMainValve ) ) / ( 4.0f + 1.0f ); - if( fPPress > 0.0f ) { - vol = 2.0 * rsHiss.AM * fPPress; - } - if( vol > 0.01 ) { - rsHiss.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else { - rsHiss.Stop(); - } + } else { + // jesli nie FV4a + // upuszczanie z PG + fPPress = ( 4.0f * fPPress + std::max( mvOccupied->dpLocalValve, mvOccupied->dpMainValve ) ) / ( 4.0f + 1.0f ); + volume = ( + fPPress > 0.0f ? + 2.0 * rsHiss.m_amplitudefactor * fPPress : + 0.0 ); + if( volume > 0.05 ) { + rsHiss + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); } - if( rsHissU.AM != 0.0 ) // napelnianie PG - { - fNPress = ( 4.0f * fNPress + Min0R( mvOccupied->dpLocalValve, mvOccupied->dpMainValve ) ) / ( 4.0f + 1.0f ); - if( fNPress < 0.0f ) { - vol = -1.0 * rsHissU.AM * fNPress; - } - if( vol > 0.01 ) { - rsHissU.Play( vol, DSBPLAY_LOOPING, true, DynamicObject->GetPosition() ); - } - else { - rsHissU.Stop(); - } + else { + rsHiss.stop(); + } + // napelnianie PG + fNPress = ( 4.0f * fNPress + Min0R( mvOccupied->dpLocalValve, mvOccupied->dpMainValve ) ) / ( 4.0f + 1.0f ); + volume = ( + fNPress < 0.0f ? + -1.0 * rsHissU.m_amplitudefactor * fNPress : + 0.0 ); + if( volume > 0.01 ) { + rsHissU + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsHissU.stop(); } } // koniec nie FV4a // Winger-160404 - syczenie pomocniczego (luzowanie) - /* if (rsSBHiss.AM!=0) - { - fSPPress=(mvOccupied->LocalBrakeRatio())-(mvOccupied->LocalBrakePos); - if (fSPPress>0) - { - vol=2*rsSBHiss.AM*fSPPress; - } - if (vol>0.1) - { - rsSBHiss.Play(vol,DSBPLAY_LOOPING,true,DynamicObject->GetPosition()); - } - else - { - rsSBHiss.Stop(); - } - } - */ -#endif + if( m_lastlocalbrakepressure != -1.f ) { + // calculate rate of pressure drop in local brake cylinder, once it's been initialized + auto const brakepressuredifference { m_lastlocalbrakepressure - mvOccupied->LocBrakePress }; + m_localbrakepressurechange = interpolate( m_localbrakepressurechange, 10 * ( brakepressuredifference / Deltatime ), 0.1f ); + } + m_lastlocalbrakepressure = mvOccupied->LocBrakePress; + if( ( m_localbrakepressurechange > 0.05f ) + && ( mvOccupied->LocBrakePress > mvOccupied->BrakePress - 0.05 ) ) { + rsSBHiss + .gain( clamp( 0.05 * m_localbrakepressurechange, 0.0, 1.5 ) ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + // don't stop the sound too abruptly + volume = std::max( 0.0, rsSBHiss.gain() - 0.1 * Deltatime ); + rsSBHiss.gain( volume ); + if( volume < 0.05 ) { + rsSBHiss.stop(); + } + } // ambient sound // since it's typically ticking of the clock we can center it on tachometer or on middle of compartment bounding area @@ -5400,6 +5408,10 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) // syk: rsHiss.deserialize( parser, sound_type::single, sound_parameters::amplitude ); rsHiss.owner( DynamicObject ); + if( true == rsSBHiss.empty() ) { + // fallback for vehicles without defined local brake hiss sound + rsSBHiss = rsHiss; + } } else if (token == "airsound2:") { diff --git a/Train.h b/Train.h index e60f3667..968917cd 100644 --- a/Train.h +++ b/Train.h @@ -410,6 +410,8 @@ public: // reszta może by?publiczna sound_source rsHissX { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // fala sound_source rsHissT { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // czasowy sound_source rsSBHiss { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // local + float m_lastlocalbrakepressure { -1.f }; // helper, cached level of pressure in local brake cylinder + float m_localbrakepressurechange { 0.f }; // recent change of pressure in local brake cylinder sound_source rsFadeSound { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbHasler { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; @@ -461,7 +463,7 @@ private: bool bHeat[8]; // grzanie // McZapkie: do syczenia float fPPress, fNPress; - float fSPPress, fSNPress; +// float fSPPress, fSNPress; int iSekunda; // Ra: sekunda aktualizacji pr?dko?ci int iRadioChannel; // numer aktualnego kana?u radiowego TPythonScreens pyScreens; diff --git a/audio.cpp b/audio.cpp index 3e0c8f70..e3b4f6e1 100644 --- a/audio.cpp +++ b/audio.cpp @@ -128,7 +128,18 @@ buffer_manager::create( std::string const &Filename ) { return emplace( filelookup ); } } - // if dynamic-specific lookup finds nothing, try the default sound folder + if( filename.find( '/' ) != std::string::npos ) { + // if the filename includes path, try to use it directly + lookup = find_buffer( filename ); + if( lookup != null_handle ) { + return lookup; + } + filelookup = find_file( filename ); + if( false == filelookup.empty() ) { + return emplace( filelookup ); + } + } + // if dynamic-specific and/or direct lookups find nothing, try the default sound folder lookup = find_buffer( szSoundPath + filename ); if( lookup != null_handle ) { return lookup; diff --git a/audiorenderer.cpp b/audiorenderer.cpp index 55b97197..5bb4985d 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -33,6 +33,12 @@ void openal_source::stop() { loop( false ); + // NOTE: workaround for potential edge cases where ::alSourceStop() doesn't set source which wasn't yet started to AL_STOPPED + int state; + ::alGetSourcei( id, AL_SOURCE_STATE, &state ); + if( state == AL_INITIAL ) { + play(); + } ::alSourceStop( id ); is_playing = false; } @@ -43,7 +49,6 @@ openal_source::update( double const Deltatime ) { update_deltatime = Deltatime; // cached for time-based processing of data from the controller - // TODO: test whether the emitter was within range during the last tick, potentially update the counter and flag it for timeout ::alGetSourcei( id, AL_BUFFERS_PROCESSED, &buffer_index ); // for multipart sounds trim away processed sources until only one remains, the last one may be set to looping by the controller ALuint bufferid; @@ -53,9 +58,11 @@ openal_source::update( double const Deltatime ) { buffers.erase( std::begin( buffers ) ); --buffer_index; } + int state; ::alGetSourcei( id, AL_SOURCE_STATE, &state ); is_playing = ( state == AL_PLAYING ); + // request instructions from the controller controller->update( *this ); } @@ -75,6 +82,7 @@ openal_source::sync_with( sound_properties const &State ) { if( glm::length2( sourceoffset ) > std::max( ( sound_range * sound_range ), ( EU07_SOUND_CUTOFFRANGE * EU07_SOUND_CUTOFFRANGE ) ) ) { // range cutoff check stop(); + is_synced = false; // flag sync failure for the controller return; } if( sound_range >= 0 ) { @@ -101,6 +109,7 @@ openal_source::sync_with( sound_properties const &State ) { ::alSourcef( id, AL_PITCH, properties.base_pitch * pitch_variation ); } + is_synced = true; } // sets max audible distance for sounds emitted by the source @@ -145,20 +154,18 @@ openal_source::loop( bool const State ) { // NOTE: doesn't release allocated implementation-side source void openal_source::clear() { - - controller = nullptr; // unqueue bound buffers: // ensure no buffer is in use... stop(); // ...prepare space for returned ids of unqueued buffers (not that we need that info)... std::vector bufferids; bufferids.resize( buffers.size() ); - // ...release the buffers and update source data to match + // ...release the buffers... ::alSourceUnqueueBuffers( id, bufferids.size(), bufferids.data() ); - buffers.clear(); - buffer_index = 0; - // reset properties - properties = sound_properties(); + // ...and reset reset the properties, except for the id of the allocated source + auto const sourceid { id }; + *this = openal_source(); + id = sourceid; } diff --git a/audiorenderer.h b/audiorenderer.h index 220be99f..79f7facb 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -36,9 +36,10 @@ struct openal_source { ALuint id { audio::null_resource }; // associated AL resource sound_source *controller { nullptr }; // source controller buffer_sequence buffers; // sequence of samples the source will emit - int buffer_index; // currently queued sample from the buffer sequence + int buffer_index { 0 }; // currently queued sample from the buffer sequence bool is_playing { false }; bool is_looping { false }; + bool is_synced { true }; // set to false only if a sync attempt fails sound_properties properties; // methods diff --git a/sound.cpp b/sound.cpp index e0cdff2d..69da3b1a 100644 --- a/sound.cpp +++ b/sound.cpp @@ -108,10 +108,10 @@ sound_source::play( int const Flags ) { // TODO: support for parameter-driven sound table if( m_soundbegin.buffer != null_handle ) { std::vector bufferlist { m_soundbegin.buffer, m_soundmain.buffer }; - audio::renderer.insert( this, std::begin( bufferlist ), std::end( bufferlist ) ); + insert( std::begin( bufferlist ), std::end( bufferlist ) ); } else { - audio::renderer.insert( this, m_soundmain.buffer ); + insert( m_soundmain.buffer ); } } else { @@ -119,7 +119,7 @@ sound_source::play( int const Flags ) { if( ( m_soundbegin.buffer == null_handle ) && ( ( m_flags & ( sound_flags::exclusive | sound_flags::looping ) ) == 0 ) ) { // for single part non-looping samples we allow spawning multiple instances, if not prevented by set flags - audio::renderer.insert( this, m_soundmain.buffer ); + insert( m_soundmain.buffer ); } } } @@ -135,7 +135,7 @@ sound_source::stop() { if( ( m_soundend.buffer != null_handle ) && ( m_soundend.buffer != m_soundmain.buffer ) ) { // end == main can happen in malformed legacy cases // spawn potentially defined sound end sample, if the emitter is currently active - audio::renderer.insert( this, m_soundend.buffer ); + insert( m_soundend.buffer ); } } @@ -154,10 +154,6 @@ sound_source::update( audio::openal_source &Source ) { } return; } - // check and update if needed current sound properties - update_location(); - update_placement_gain(); - Source.sync_with( m_properties ); if( m_soundbegin.buffer != null_handle ) { // potentially a multipart sound @@ -170,26 +166,41 @@ sound_source::update( audio::openal_source &Source ) { ++( m_soundmain.playing ); } } + + // check and update if needed current sound properties + update_location(); + update_placement_gain(); + Source.sync_with( m_properties ); + if( false == Source.is_synced ) { + // if the sync went wrong we let the renderer kill its part of the emitter, and update our playcounter(s) to match + update_counter( Source.buffers[ Source.buffer_index ], -1 ); + } + } else { // if the emitter isn't playing it's either done or wasn't yet started // we can determine this from number of processed buffers if( Source.buffer_index != Source.buffers.size() ) { auto const buffer { Source.buffers[ Source.buffer_index ] }; - update_counter( buffer, 1 ); // emitter initialization - Source.range( m_range ); - Source.pitch( m_pitchvariation ); - update_location(); - update_placement_gain(); - Source.sync_with( m_properties ); if( ( buffer == m_soundmain.buffer ) && ( true == TestFlag( m_flags, sound_flags::looping ) ) ) { // main sample can be optionally set to loop Source.loop( true ); } - // all set, start playback - Source.play(); + Source.range( m_range ); + Source.pitch( m_pitchvariation ); + update_location(); + update_placement_gain(); + Source.sync_with( m_properties ); + if( true == Source.is_synced ) { + // all set, start playback + Source.play(); + } + else { + // if the initial sync went wrong we skip the activation so the renderer can clean the emitter on its end + update_counter( buffer, -1 ); + } } else { auto const buffer { Source.buffers[ Source.buffer_index - 1 ] }; @@ -339,4 +350,11 @@ sound_source::update_placement_gain() { return true; } +void +sound_source::insert( audio::buffer_handle Buffer ) { + + std::vector buffers { Buffer }; + return insert( std::begin( buffers ), std::end( buffers ) ); +} + //--------------------------------------------------------------------------- diff --git a/sound.h b/sound.h index 8a636b20..ee916c9a 100644 --- a/sound.h +++ b/sound.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. float const EU07_SOUND_CABCONTROLSCUTOFFRANGE { 7.5f }; float const EU07_SOUND_BRAKINGCUTOFFRANGE { 100.f }; -float const EU07_SOUND_RUNNINGNOISECUTOFFRANGE { 100.f }; +float const EU07_SOUND_RUNNINGNOISECUTOFFRANGE { 200.f }; enum class sound_type { single, @@ -122,6 +122,15 @@ private: // potentially updates area-based gain factor of the source. returns: true if location has changed bool update_placement_gain(); + void + insert( audio::buffer_handle Buffer ); + template + void + insert( Iterator_ First, Iterator_ Last ) { + + audio::renderer.insert( this, First, Last ); + update_counter( *First, 1 ); + } // members TDynamicObject const * m_owner { nullptr }; // optional, the vehicle carrying this sound source From 0f0cb4209b91a4c8849fd93cc6cbd8566595305d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 1 Dec 2017 04:12:26 +0100 Subject: [PATCH 229/426] openalsoft compatibility fixes, basic measures for exceeding audio source limit --- DynObj.cpp | 2 +- Globals.cpp | 7 +++ Globals.h | 6 ++- audiorenderer.cpp | 106 ++++++++++++++++++++++++++++++---------------- audiorenderer.h | 3 +- sound.cpp | 9 ++-- 6 files changed, 88 insertions(+), 45 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index d7a4fc59..b1a0b757 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4162,7 +4162,7 @@ void TDynamicObject::RenderSounds() { } if( std::abs( MoverParameters->nrot ) > 0.01 ) { // hamulce wzmagaja halas - volume *= 1 + MoverParameters->UnitBrakeForce / ( 1 + MoverParameters->MaxBrakeForce ); + volume *= 1 + 0.25 * ( MoverParameters->UnitBrakeForce / ( 1 + MoverParameters->MaxBrakeForce ) ); } // scale volume by track quality volume *= ( 20.0 + MyTrack->iDamageFlag ) / 21; diff --git a/Globals.cpp b/Globals.cpp index adaa1160..f2bc3ba3 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -131,8 +131,11 @@ bool Global::FullPhysics { true }; // full calculations performed for each simul // parametry testowe (do testowania scenerii i obiektów) bool Global::bWireFrame = false; + +// sound renderer bool Global::bSoundEnabled = true; float Global::AudioVolume = 1.0f; +std::string Global::AudioRenderer; int Global::iWriteLogEnabled = 3; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów bool Global::MultipleLogs{ false }; @@ -281,6 +284,10 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::bSoundEnabled; } + else if( token == "sound.openal.renderer" ) { + // selected device for audio renderer + Global::AudioRenderer = Parser.getToken( false ); // case-sensitive + } // else if (str==AnsiString("renderalpha")) //McZapkie-1312302 - dwuprzebiegowe renderowanie // bRenderAlpha=(GetNextSymbol().LowerCase()==AnsiString("yes")); else if (token == "physicslog") diff --git a/Globals.h b/Globals.h index 3d88a3f1..3e78723b 100644 --- a/Globals.h +++ b/Globals.h @@ -165,8 +165,6 @@ public: static bool VSync; static bool bFreeFly; static bool bWireFrame; - static bool bSoundEnabled; - static float AudioVolume; // McZapkie-131202 static bool bAdjustScreenFreq; static bool bEnableTraction; @@ -215,6 +213,10 @@ public: static bool bSmoothTraction; // wygładzanie drutów static float SplineFidelity; // determines segment size during conversion of splines to geometry static GLfloat FogColor[]; + // sound renderer variables + static bool bSoundEnabled; + static float AudioVolume; + static std::string AudioRenderer; static bool FullPhysics; // full calculations performed for each simulation step static int iSlowMotion; diff --git a/audiorenderer.cpp b/audiorenderer.cpp index 5bb4985d..2cf98df4 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -24,14 +24,22 @@ float const EU07_SOUND_CUTOFFRANGE { 3000.f }; // 2750 m = max expected emitter void openal_source::play() { + if( id == audio::null_resource ) { return; } // no implementation-side source to match, no point + + ::alGetError(); // pop the error stack ::alSourcePlay( id ); - is_playing = true; + is_playing = ( + ::alGetError() == AL_NO_ERROR ? + true : + false ); } // stops the playback void openal_source::stop() { + if( id == audio::null_resource ) { return; } // no implementation-side source to match, no point + loop( false ); // NOTE: workaround for potential edge cases where ::alSourceStop() doesn't set source which wasn't yet started to AL_STOPPED int state; @@ -49,19 +57,22 @@ openal_source::update( double const Deltatime ) { update_deltatime = Deltatime; // cached for time-based processing of data from the controller - ::alGetSourcei( id, AL_BUFFERS_PROCESSED, &buffer_index ); - // for multipart sounds trim away processed sources until only one remains, the last one may be set to looping by the controller - ALuint bufferid; - while( ( buffer_index > 0 ) - && ( buffers.size() > 1 ) ) { - ::alSourceUnqueueBuffers( id, 1, &bufferid ); - buffers.erase( std::begin( buffers ) ); - --buffer_index; - } + if( id != audio::null_resource ) { - int state; - ::alGetSourcei( id, AL_SOURCE_STATE, &state ); - is_playing = ( state == AL_PLAYING ); + ::alGetSourcei( id, AL_BUFFERS_PROCESSED, &buffer_index ); + // for multipart sounds trim away processed sources until only one remains, the last one may be set to looping by the controller + ALuint bufferid; + while( ( buffer_index > 0 ) + && ( buffers.size() > 1 ) ) { + ::alSourceUnqueueBuffers( id, 1, &bufferid ); + buffers.erase( std::begin( buffers ) ); + --buffer_index; + } + + int state; + ::alGetSourcei( id, AL_SOURCE_STATE, &state ); + is_playing = ( state == AL_PLAYING ); + } // request instructions from the controller controller->update( *this ); @@ -71,6 +82,11 @@ openal_source::update( double const Deltatime ) { void openal_source::sync_with( sound_properties const &State ) { + if( id == audio::null_resource ) { + // no implementation-side source to match, return sync error so the controller can clean up on its end + is_synced = false; + return; + } /* // velocity // not used yet @@ -79,11 +95,14 @@ openal_source::sync_with( sound_properties const &State ) { // location properties.location = State.location; auto sourceoffset { glm::vec3 { properties.location - glm::dvec3 { Global::pCameraPosition } } }; - if( glm::length2( sourceoffset ) > std::max( ( sound_range * sound_range ), ( EU07_SOUND_CUTOFFRANGE * EU07_SOUND_CUTOFFRANGE ) ) ) { + if( sound_range > 0 ) { // range cutoff check - stop(); - is_synced = false; // flag sync failure for the controller - return; + auto const cutoffrange { sound_range * 7.5f }; + if( glm::length2( sourceoffset ) > std::min( ( cutoffrange * cutoffrange ), ( EU07_SOUND_CUTOFFRANGE * EU07_SOUND_CUTOFFRANGE ) ) ) { + stop(); + is_synced = false; // flag sync failure for the controller + return; + } } if( sound_range >= 0 ) { ::alSourcefv( id, AL_POSITION, glm::value_ptr( sourceoffset ) ); @@ -116,14 +135,17 @@ openal_source::sync_with( sound_properties const &State ) { void openal_source::range( float const Range ) { - auto const range( - Range >= 0 ? - Range : - 5 ); // range of -1 means sound of unlimited range, positioned at the listener - ::alSourcef( id, AL_REFERENCE_DISTANCE, range * ( 1.f / 16.f ) ); - ::alSourcef( id, AL_ROLLOFF_FACTOR, 1.5f ); // NOTE: we cache actual specified range, as we'll be giving 'unlimited' range special treatment sound_range = Range; + + if( id == audio::null_resource ) { return; } // no implementation-side source to match, no point + + auto const range { ( + Range >= 0 ? + Range : + 5 ) }; // range of -1 means sound of unlimited range, positioned at the listener + ::alSourcef( id, AL_REFERENCE_DISTANCE, range * ( 1.f / 16.f ) ); + ::alSourcef( id, AL_ROLLOFF_FACTOR, 1.5f ); } // sets modifier applied to the pitch of sounds emitted by the source @@ -139,6 +161,7 @@ openal_source::pitch( float const Pitch ) { void openal_source::loop( bool const State ) { + if( id == audio::null_resource ) { return; } // no implementation-side source to match, no point if( is_looping == State ) { return; } is_looping = State; @@ -154,15 +177,19 @@ openal_source::loop( bool const State ) { // NOTE: doesn't release allocated implementation-side source void openal_source::clear() { - // unqueue bound buffers: - // ensure no buffer is in use... - stop(); - // ...prepare space for returned ids of unqueued buffers (not that we need that info)... - std::vector bufferids; - bufferids.resize( buffers.size() ); - // ...release the buffers... - ::alSourceUnqueueBuffers( id, bufferids.size(), bufferids.data() ); + + if( id != audio::null_resource ) { + // unqueue bound buffers: + // ensure no buffer is in use... + stop(); + // ...prepare space for returned ids of unqueued buffers (not that we need that info)... + std::vector bufferids; + bufferids.resize( buffers.size() ); + // ...release the buffers... + ::alSourceUnqueueBuffers( id, bufferids.size(), bufferids.data() ); + } // ...and reset reset the properties, except for the id of the allocated source + // NOTE: not strictly necessary since except for the id the source data typically get discarded in next step auto const sourceid { id }; *this = openal_source(); id = sourceid; @@ -231,7 +258,10 @@ openal_renderer::erase( sound_source const *Controller ) { if( source->controller == Controller ) { // if the controller is the one specified, kill it source->clear(); - m_sourcespares.push( *source ); + if( source->id != audio::null_resource ) { + // keep around functional sources, but no point in doing it with the above-the-limit ones + m_sourcespares.push( source->id ); + } source = m_sources.erase( source ); } else { @@ -268,7 +298,10 @@ openal_renderer::update( double const Deltatime ) { // if after the update the source isn't playing, put it away on the spare stack, it's done if( false == source->is_playing ) { source->clear(); - m_sourcespares.push( *source ); + if( source->id != audio::null_resource ) { + // keep around functional sources, but no point in doing it with the above-the-limit ones + m_sourcespares.push( source->id ); + } source = m_sources.erase( source ); } else { @@ -285,7 +318,7 @@ openal_renderer::fetch_source() { audio::openal_source soundsource; if( false == m_sourcespares.empty() ) { // reuse (a copy of) already allocated source - soundsource = m_sourcespares.top(); + soundsource.id = m_sourcespares.top(); m_sourcespares.pop(); } return soundsource; @@ -294,9 +327,8 @@ openal_renderer::fetch_source() { bool openal_renderer::init_caps() { - // select the "preferred device" - // TODO: support for opening config-specified device - m_device = ::alcOpenDevice( nullptr ); + // NOTE: default value of audio renderer variable is empty string, meaning argument of NULL i.e. 'preferred' device + m_device = ::alcOpenDevice( Global::AudioRenderer.c_str() ); if( m_device == nullptr ) { ErrorLog( "Failed to obtain audio device" ); return false; diff --git a/audiorenderer.h b/audiorenderer.h index 79f7facb..f2196a8e 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -55,6 +55,7 @@ struct openal_source { for( auto const buffer : buffers ) { bufferids.emplace_back( audio::renderer.buffer( buffer ).id ); } ::alSourceQueueBuffers( id, bufferids.size(), bufferids.data() ); + ::alSourceRewind( id ); return *this; } // starts playback of queued buffers void @@ -128,7 +129,7 @@ public: private: // types using source_list = std::list; - using source_sequence = std::stack; + using source_sequence = std::stack; // methods bool init_caps(); diff --git a/sound.cpp b/sound.cpp index 69da3b1a..23f6d187 100644 --- a/sound.cpp +++ b/sound.cpp @@ -86,10 +86,7 @@ sound_source::play( int const Flags ) { return; } if( m_range > 0 ) { - auto const cutoffrange{ ( - ( m_soundbegin.buffer != null_handle ) && ( Flags & sound_flags::looping ) ? - m_range * 10 : // larger margin to let the startup sample finish playing at safe distance - m_range * 5 ) }; + auto const cutoffrange{ m_range * 5 }; if( glm::length2( location() - glm::dvec3{ Global::pCameraPosition } ) > std::min( 2750.f * 2750.f, cutoffrange * cutoffrange ) ) { // drop sounds from beyond sensible and/or audible range return; @@ -196,6 +193,10 @@ sound_source::update( audio::openal_source &Source ) { if( true == Source.is_synced ) { // all set, start playback Source.play(); + if( false == Source.is_playing ) { + // if the playback didn't start update the state counter + update_counter( buffer, -1 ); + } } else { // if the initial sync went wrong we skip the activation so the renderer can clean the emitter on its end From 5645c133623ce4a4cc22c9818f274eefd9a78508 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 3 Dec 2017 02:35:49 +0100 Subject: [PATCH 230/426] build 171202. audio subsystem: volume support, source reassignment, bug fixes --- Driver.cpp | 4 ++-- DynObj.cpp | 44 +++++++++++++++++------------------ DynObj.h | 4 ++-- Globals.cpp | 8 ++++++- Train.cpp | 30 ++++++++++++++---------- TrkFoll.cpp | 3 ++- audiorenderer.cpp | 59 +++++++++++++++++++++++++++++++++++++++++------ audiorenderer.h | 12 ++++++---- simulation.cpp | 4 ++-- sound.cpp | 10 ++++---- version.h | 2 +- 11 files changed, 122 insertions(+), 58 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index cb11fa8f..d66073a7 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -999,7 +999,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN go = cm_Ready; // gotów do odjazdu z W4 (semafor może // zatrzymać) if( ( tsGuardSignal != nullptr ) - && ( false == tsGuardSignal->empty() ) ); { + && ( false == tsGuardSignal->empty() ) ) { // jeśli mamy głos kierownika, to odegrać iDrivigFlags |= moveGuardSignal; } @@ -1447,7 +1447,7 @@ void TController::TableSort() { return; } TSpeedPos sp_temp = TSpeedPos(); // uzywany do przenoszenia - for( std::size_t i = 0; i < ( iLast - 1 ); ++i ) { + for( int i = 0; i < ( iLast - 1 ); ++i ) { // pętla tylko do dwóch pozycji od końca bo ostatniej nie modyfikujemy if (sSpeedTable[i].fDist > sSpeedTable[i + 1].fDist) { // jesli pozycja wcześniejsza jest dalej to źle diff --git a/DynObj.cpp b/DynObj.cpp index b1a0b757..d5be9fe8 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3705,25 +3705,28 @@ void TDynamicObject::RenderSounds() { } else { - sConverter - .pitch( frequency ) - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); + if( MoverParameters->ConverterFlag ) { - float fincvol { 0 }; - if( ( MoverParameters->ConverterFlag ) - && ( MoverParameters->enrot * 60 > MoverParameters->DElist[ 0 ].RPM ) ) { - - fincvol = ( MoverParameters->DElist[ MoverParameters->MainCtrlPos ].RPM - ( MoverParameters->enrot * 60 ) ); - fincvol /= ( 0.05 * MoverParameters->DElist[ 0 ].RPM ); - }; - if( fincvol > 0.02 ) { - rsDieselInc - .gain( fincvol ) + sConverter + .pitch( frequency ) + .gain( volume ) .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - rsDieselInc.stop(); + + float fincvol { 0 }; + if( MoverParameters->enrot * 60 > MoverParameters->DElist[ 0 ].RPM ) { + + fincvol = ( MoverParameters->DElist[ MoverParameters->MainCtrlPos ].RPM - ( MoverParameters->enrot * 60 ) ); + fincvol /= ( 0.05 * MoverParameters->DElist[ 0 ].RPM ); + } + + if( fincvol > 0.02 ) { + rsDieselInc + .gain( fincvol ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsDieselInc.stop(); + } } } } @@ -4024,10 +4027,7 @@ void TDynamicObject::RenderSounds() { // McZapkie-280302 - pisk mocno zacisnietych hamulcow if( /*( false == MoverParameters->SlippingWheels ) &&*/ ( MoverParameters->UnitBrakeForce > rsPisk.m_amplitudefactor ) - && ( MoverParameters->Vel > ( - true == rsPisk.is_playing() ? - 0.05 : - 0.5 ) ) ) { + && ( MoverParameters->Vel > 2.5 ) ) { rsPisk .gain( MoverParameters->UnitBrakeForce / ( rsPisk.m_amplitudefactor + 1 ) + rsPisk.m_amplitudeoffset ) @@ -4035,7 +4035,7 @@ void TDynamicObject::RenderSounds() { } else { // don't stop the sound too abruptly - volume = std::max( 0.0, rsPisk.gain() - ( rsPisk.gain() * 1.5 * dt ) ); + volume = std::max( 0.0, rsPisk.gain() - ( rsPisk.gain() * 2.5 * dt ) ); rsPisk.gain( volume ); if( volume < 0.05 ) { rsPisk.stop(); diff --git a/DynObj.h b/DynObj.h index 1288ab8a..7dec6ee6 100644 --- a/DynObj.h +++ b/DynObj.h @@ -355,8 +355,8 @@ private: std::vector m_pantographsounds; // typically 2 but can be less (or more?) std::vector m_doorsounds; // can expect symmetrical arrangement, but don't count on it sound_source sDepartureSignal { sound_placement::general }; - sound_source sHorn1 { sound_placement::external }; - sound_source sHorn2 { sound_placement::external }; + sound_source sHorn1 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; + sound_source sHorn2 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source rsRunningNoise { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source rscurve { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; // youBy diff --git a/Globals.cpp b/Globals.cpp index f2bc3ba3..9293298c 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -134,7 +134,7 @@ bool Global::bWireFrame = false; // sound renderer bool Global::bSoundEnabled = true; -float Global::AudioVolume = 1.0f; +float Global::AudioVolume = 2.0f; std::string Global::AudioRenderer; int Global::iWriteLogEnabled = 3; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów @@ -288,6 +288,12 @@ void Global::ConfigParse(cParser &Parser) // selected device for audio renderer Global::AudioRenderer = Parser.getToken( false ); // case-sensitive } + else if( token == "sound.volume" ) { + // selected device for audio renderer + Parser.getTokens(); + Parser >> Global::AudioVolume; + Global::AudioVolume = clamp( Global::AudioVolume, 1.f, 4.f ); + } // else if (str==AnsiString("renderalpha")) //McZapkie-1312302 - dwuprzebiegowe renderowanie // bRenderAlpha=(GetNextSymbol().LowerCase()==AnsiString("yes")); else if (token == "physicslog") diff --git a/Train.cpp b/Train.cpp index 213c9683..2d2ef7b0 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2731,16 +2731,16 @@ void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Com if( Command.action == GLFW_PRESS ) { // only reacting to press, so the sound can loop uninterrupted - if( false == Train->mvControlled->DepartureSignal ) { + if( false == Train->mvOccupied->DepartureSignal ) { // turn on - Train->mvControlled->signal_departure( true ); + Train->mvOccupied->signal_departure( true ); // visual feedback Train->ggDepartureSignalButton.UpdateValue( 1.0, Train->dsbSwitch ); } } else if( Command.action == GLFW_RELEASE ) { // turn off - Train->mvControlled->signal_departure( false ); + Train->mvOccupied->signal_departure( false ); // visual feedback Train->ggDepartureSignalButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -5494,6 +5494,20 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { m_controlmapper.clear(); + // reset sound positions and owner + auto const nullvector { glm::vec3() }; + std::vector sounds = { + &dsbReverserKey, &dsbNastawnikJazdy, &dsbNastawnikBocz, + &dsbSwitch, &dsbPneumaticSwitch, + &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, + &rsFadeSound, + &dsbHasler, &dsbBuzzer, &dsbSlipAlarm + }; + for( auto sound : sounds ) { + sound->offset( nullvector ); + sound->owner( DynamicObject ); + } + pyScreens.reset(this); pyScreens.setLookupPath(DynamicObject->asBaseDir); bool parse = false; @@ -5658,7 +5672,6 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) set_cab_controls(); // configure placement of sound emitters which aren't bound with any device model, and weren't placed manually - auto const nullvector { glm::vec3() }; // try first to bind sounds to location of possible devices if( dsbReverserKey.offset() == nullvector ) { dsbReverserKey.offset( ggDirKey.model_offset() ); @@ -5682,14 +5695,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) } } // for whatever is left fallback on generic location, centre of the cab - auto const caboffset { glm::dvec3 { ( Cabine[ NewCabNo ].CabPos1 + Cabine[ NewCabNo ].CabPos2 ) * 0.5 } + glm::dvec3 { 0, 1, 0 } }; - std::vector sounds = { - &dsbReverserKey, &dsbNastawnikJazdy, &dsbNastawnikBocz, - &dsbSwitch, &dsbPneumaticSwitch, - &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, - &rsFadeSound, - &dsbHasler, &dsbBuzzer, &dsbSlipAlarm - }; + auto const caboffset { glm::dvec3 { ( Cabine[ cabindex ].CabPos1 + Cabine[ cabindex ].CabPos2 ) * 0.5 } + glm::dvec3 { 0, 1, 0 } }; for( auto sound : sounds ) { if( sound->offset() == nullvector ) { sound->offset( caboffset ); diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 38b61d1a..9c9f9db9 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -103,7 +103,8 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) // TODO: refactor following block as track method if( pCurrentTrack->iEvents ) { // sumaryczna informacja o eventach // omijamy cały ten blok, gdy tor nie ma on żadnych eventów (większość nie ma) - if( std::abs( fDistance ) < 0.01 ) { + if( ( std::abs( fDistance ) < 0.01 ) + && ( Owner->GetVelocity() < 0.01 ) ) { //McZapkie-140602: wyzwalanie zdarzenia gdy pojazd stoi if( ( Owner->Mechanik != nullptr ) && ( Owner->Mechanik->Primary() ) ) { diff --git a/audiorenderer.cpp b/audiorenderer.cpp index 2cf98df4..104c8203 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -94,18 +94,21 @@ openal_source::sync_with( sound_properties const &State ) { */ // location properties.location = State.location; - auto sourceoffset { glm::vec3 { properties.location - glm::dvec3 { Global::pCameraPosition } } }; + sound_distance = properties.location - glm::dvec3 { Global::pCameraPosition }; if( sound_range > 0 ) { // range cutoff check - auto const cutoffrange { sound_range * 7.5f }; - if( glm::length2( sourceoffset ) > std::min( ( cutoffrange * cutoffrange ), ( EU07_SOUND_CUTOFFRANGE * EU07_SOUND_CUTOFFRANGE ) ) ) { + auto const cutoffrange = ( + is_multipart ? + EU07_SOUND_CUTOFFRANGE : // we keep multi-part sounds around longer, to minimize restarts as the sounds get out and back in range + sound_range * 7.5f ); + if( glm::length2( sound_distance ) > std::min( ( cutoffrange * cutoffrange ), ( EU07_SOUND_CUTOFFRANGE * EU07_SOUND_CUTOFFRANGE ) ) ) { stop(); is_synced = false; // flag sync failure for the controller return; } } if( sound_range >= 0 ) { - ::alSourcefv( id, AL_POSITION, glm::value_ptr( sourceoffset ) ); + ::alSourcefv( id, AL_POSITION, glm::value_ptr( sound_distance ) ); } else { // sounds with 'unlimited' range are positioned on top of the listener @@ -233,6 +236,7 @@ openal_renderer::init() { // // ::alDistanceModel( AL_LINEAR_DISTANCE ); ::alDistanceModel( AL_INVERSE_DISTANCE_CLAMPED ); + ::alListenerf( AL_GAIN, clamp( Global::AudioVolume, 1.f, 4.f ) ); // all done m_ready = true; return true; @@ -315,13 +319,54 @@ openal_renderer::update( double const Deltatime ) { audio::openal_source openal_renderer::fetch_source() { - audio::openal_source soundsource; + audio::openal_source newsource; if( false == m_sourcespares.empty() ) { // reuse (a copy of) already allocated source - soundsource.id = m_sourcespares.top(); + newsource.id = m_sourcespares.top(); m_sourcespares.pop(); } - return soundsource; + if( newsource.id == audio::null_resource ) { + // if there's no source to reuse, try to generate a new one + ::alGenSources( 1, &( newsource.id ) ); + } + if( newsource.id == audio::null_resource ) { + // if we still don't have a working source, see if we can sacrifice an already active one + // under presumption it's more important to play new sounds than keep the old ones going + // TBD, TODO: for better results we could use range and/or position for the new sound + // to better weight whether the new sound is really more important + auto leastimportantsource { std::end( m_sources ) }; + auto leastimportantweight { std::numeric_limits::max() }; + + for( auto source { std::begin( m_sources ) }; source != std::cend( m_sources ); ++source ) { + + if( ( source->id == audio::null_resource ) + || ( true == source->is_multipart ) + || ( false == source->is_playing ) ) { + + continue; + } + auto const sourceweight { ( + source->sound_range > 0 ? + ( source->sound_range * source->sound_range ) / ( glm::length2( source->sound_distance ) + 1 ) : + std::numeric_limits::max() ) }; + if( sourceweight < leastimportantweight ) { + leastimportantsource = source; + leastimportantweight = sourceweight; + } + } + if( ( leastimportantsource != std::end( m_sources ) ) + && ( leastimportantweight < 1.f ) ) { + // only accept the candidate if it's outside of its nominal hearing range + leastimportantsource->stop(); + leastimportantsource->update( 0 ); // HACK: a roundabout way to notify the controller its emitter has stopped + leastimportantsource->clear(); + // we should be now free to grab the id and get rid of the remains + newsource.id = leastimportantsource->id; + m_sources.erase( leastimportantsource ); + } + } + + return newsource; } bool diff --git a/audiorenderer.h b/audiorenderer.h index f2196a8e..629ca969 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -29,6 +29,8 @@ namespace audio { // TODO: generic interface base, for implementations other than openAL struct openal_source { + friend class openal_renderer; + // types using buffer_sequence = std::vector; @@ -48,14 +50,14 @@ struct openal_source { bind( sound_source *Controller, Iterator_ First, Iterator_ Last ) { controller = Controller; buffers.insert( std::end( buffers ), First, Last ); - if( id == audio::null_resource ) { - ::alGenSources( 1, &id ); } + is_multipart = ( buffers.size() > 1 ); // look up and queue assigned buffers std::vector bufferids; for( auto const buffer : buffers ) { bufferids.emplace_back( audio::renderer.buffer( buffer ).id ); } - ::alSourceQueueBuffers( id, bufferids.size(), bufferids.data() ); - ::alSourceRewind( id ); + if( id != audio::null_resource ) { + ::alSourceQueueBuffers( id, bufferids.size(), bufferids.data() ); + ::alSourceRewind( id ); } return *this; } // starts playback of queued buffers void @@ -88,6 +90,8 @@ private: double update_deltatime; // time delta of most current update float pitch_variation { 1.f }; // emitter-specific variation of the base pitch float sound_range { 50.f }; // cached audible range of the emitted samples + glm::vec3 sound_distance; // cached distance between sound and the listener + bool is_multipart { false }; // multi-part sounds are kept alive at longer ranges }; diff --git a/simulation.cpp b/simulation.cpp index 0a4a02cd..abef9f31 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -307,8 +307,8 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad } if( ( vehicle->MoverParameters->CategoryFlag == 1 ) // trains only - && ( ( vehicle->LightList( side::front ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) != 0 ) - || ( vehicle->LightList( side::rear ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) != 0 ) ) ) { + && ( ( ( vehicle->LightList( side::front ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) ) != 0 ) + || ( ( vehicle->LightList( side::rear ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) ) != 0 ) ) ) { simulation::Lights.insert( vehicle ); } } diff --git a/sound.cpp b/sound.cpp index 23f6d187..af001856 100644 --- a/sound.cpp +++ b/sound.cpp @@ -95,7 +95,7 @@ sound_source::play( int const Flags ) { // initialize emitter-specific pitch variation if it wasn't yet set if( m_pitchvariation == 0.f ) { - m_pitchvariation = 0.01f * static_cast( Random( 95, 105 ) ); + m_pitchvariation = 0.01f * static_cast( Random( 97.5, 102.5 ) ); } m_flags = Flags; @@ -130,7 +130,8 @@ sound_source::stop() { m_stop = true; if( ( m_soundend.buffer != null_handle ) - && ( m_soundend.buffer != m_soundmain.buffer ) ) { // end == main can happen in malformed legacy cases + && ( m_soundend.buffer != m_soundmain.buffer ) // end == main can happen in malformed legacy cases + && ( m_soundend.playing == 0 ) ) { // spawn potentially defined sound end sample, if the emitter is currently active insert( m_soundend.buffer ); } @@ -142,8 +143,9 @@ sound_source::update( audio::openal_source &Source ) { if( true == Source.is_playing ) { - // kill the sound if requested - if( true == m_stop ) { + if( ( true == m_stop ) + && ( Source.buffers[ Source.buffer_index ] != m_soundend.buffer ) ) { + // kill the sound if stop was requested, unless it's sound bookend sample Source.stop(); update_counter( Source.buffers[ Source.buffer_index ], -1 ); if( false == is_playing() ) { diff --git a/version.h b/version.h index 75135ee3..592d1424 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1130 +#define VERSION_MINOR 1202 #define VERSION_REVISION 0 From 4f9464499c629649bd49c0b186f6efaa7f971006 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 4 Dec 2017 15:39:15 +0100 Subject: [PATCH 231/426] build 171204. separate vehicle movement noise for external and internal view, flexible parsing of wheel_clatter parameter, minor tweaks to air leak and wheel clatter playback --- DynObj.cpp | 132 ++++++++++++++++++++++++---------------------- DynObj.h | 21 +++++--- Train.cpp | 83 +++++++++++++++++++++-------- Train.h | 2 + World.cpp | 2 +- audiorenderer.cpp | 20 +++---- audiorenderer.h | 8 +-- simulation.cpp | 2 +- sound.cpp | 62 +++++++++++----------- sound.h | 2 +- version.h | 2 +- 11 files changed, 196 insertions(+), 140 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index d5be9fe8..7f629cb3 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -559,7 +559,7 @@ TDynamicObject::toggle_lights() { ( compartmentname.find( "compartment" ) != std::string::npos ) || ( compartmentname.find( "przedzial" ) != std::string::npos ) ) { // compartments are lit with 75% probability - sectionlight.level = ( Random() < 0.75 ? 0.75f : 0.05f ); + sectionlight.level = ( Random() < 0.75 ? 0.75f : 0.15f ); } } SectionLightsActive = true; @@ -1611,9 +1611,7 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) } //----------ABu: koniec skanowania pojazdow -TDynamicObject::TDynamicObject() : - rsStukot( MaxAxles, sound_source( sound_placement::external ) ) -{ +TDynamicObject::TDynamicObject() { modelShake = vector3(0, 0, 0); fTrackBlock = 10000.0; // brak przeszkody na drodze btnOn = false; @@ -1634,12 +1632,14 @@ TDynamicObject::TDynamicObject() : bEnabled = true; MyTrack = NULL; // McZapkie-260202 +/* dRailLength = 25.0; for (int i = 0; i < MaxAxles; i++) dRailPosition[i] = 0.0; for (int i = 0; i < MaxAxles; i++) dWheelsPosition[i] = 0.0; // będzie wczytane z MMD iAxles = 0; +*/ dWheelAngle[0] = 0.0; dWheelAngle[1] = 0.0; dWheelAngle[2] = 0.0; @@ -1985,8 +1985,9 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" create_controller( DriverType, !TrainName.empty() ); // McZapkie-250202 +/* iAxles = std::min( MoverParameters->NAxles, MaxAxles ); // ilość osi - rsStukot.resize( iAxles, sound_source( sound_placement::external ) ); +*/ // wczytywanie z pliku nazwatypu.mmd, w tym model LoadMMediaFile(asBaseDir, Type_Name, asReplacableSkin); // McZapkie-100402: wyszukiwanie submodeli sprzegów @@ -2093,12 +2094,12 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" smBuforPrawy[ i ]->WillBeAnimated(); } } - for( int i = 0; i < iAxles; i++ ) { + for( auto &axle : m_axlesounds ) { // wyszukiwanie osi (0 jest na końcu, dlatego dodajemy długość?) - dRailPosition[ i ] = ( + axle.distance = ( Reversed ? - -dWheelsPosition[ i ] : - ( dWheelsPosition[ i ] + MoverParameters->Dim.L ) ) + fDist; + -axle.offset : + ( axle.offset + MoverParameters->Dim.L ) ) + fDist; } // McZapkie-250202 end. Track->AddDynamicObject(this); // wstawiamy do toru na pozycję 0, a potem przesuniemy @@ -3063,12 +3064,12 @@ bool TDynamicObject::Update(double dt, double dt1) if( MyTrack->fSoundDistance != dRailLength ) { dRailLength = MyTrack->fSoundDistance; - for( int i = 0; i < iAxles; ++i ) { - dRailPosition[ i ] = dWheelsPosition[ i ] + MoverParameters->Dim.L; + for( auto &axle : m_axlesounds ) { + axle.distance = axle.offset + MoverParameters->Dim.L; } } if( dRailLength != -1 ) { - if( std::abs( MoverParameters->V ) > 0 ) { + if( MoverParameters->Vel > 0 ) { double volume = ( 20.0 + MyTrack->iDamageFlag ) / 21; switch( MyTrack->eEnvironment ) { @@ -3085,9 +3086,10 @@ bool TDynamicObject::Update(double dt, double dt1) } } - for( int i = 0; i < iAxles; ++i ) { - dRailPosition[ i ] -= dDOMoveLen * Sign( dDOMoveLen ); - if( dRailPosition[ i ] < 0 ) { + for( auto &axle : m_axlesounds ) { + axle.distance -= dDOMoveLen * Sign( dDOMoveLen ); + if( axle.distance < 0 ) { + axle.distance += dRailLength; /* // McZapkie-040302 if( i == iAxles - 1 ) { @@ -3101,8 +3103,9 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->AccV -= 0.5 * GetVelocity() / ( 1 + MoverParameters->Vmax ); } */ - rsStukot[ i ].gain( volume ).play(); - dRailPosition[ i ] += dRailLength; + if( MoverParameters->Vel > 2.5 ) { + axle.clatter.gain( volume ).play(); + } } } } @@ -3602,10 +3605,10 @@ void TDynamicObject::RenderSounds() { // McZapkie-010302: ulepszony dzwiek silnika double frequency { 1.0 }; - double volume { 1.0 }; + double volume { 0.0 }; double const dt { Timer::GetDeltaRenderTime() }; - if( dt == 0.0 ) { return; } + if( Global::iPause != 0 ) { return; } // engine sounds if( MoverParameters->Power > 0 ) { @@ -3652,6 +3655,7 @@ void TDynamicObject::RenderSounds() { + rsSilnik.m_amplitudeoffset; break; } + // NOTE: default case also covers electric motors default: { volume = rsSilnik.m_amplitudefactor * ( MoverParameters->EnginePower / 1000 + std::fabs( MoverParameters->enrot ) * 60.0 ) @@ -3950,13 +3954,14 @@ void TDynamicObject::RenderSounds() { if( m_lastbrakepressure != -1.f ) { // calculate rate of pressure drop in brake cylinder, once it's been initialized auto const brakepressuredifference { m_lastbrakepressure - MoverParameters->BrakePress }; - m_brakepressurechange = interpolate( m_brakepressurechange, 10 * ( brakepressuredifference / dt ), 0.1f ); + m_brakepressurechange = interpolate( m_brakepressurechange, brakepressuredifference / dt, 0.005f ); } m_lastbrakepressure = MoverParameters->BrakePress; - if( m_brakepressurechange > 0.05f ) { - // NOTE: can't use the leak rate directly due to irregular results produced by some brake type implementations + // ensure some basic level of volume and scale it up depending on pressure in the cylinder; scale this by the leak rate + volume = 20 * m_brakepressurechange * ( 0.25 + 0.75 * ( std::max( MoverParameters->BrakePress, 0.0 ) / MoverParameters->MaxBrakePress[ 3 ] ) ); + if( volume > 0.075f ) { rsUnbrake - .gain( static_cast( 1.25 * std::max( MoverParameters->BrakePress, 0.0 ) / MoverParameters->MaxBrakePress[ 3 ] ) ) + .gain( volume ) .play( sound_flags::exclusive | sound_flags::looping ); } else { @@ -4009,7 +4014,7 @@ void TDynamicObject::RenderSounds() { && ( GetVelocity() > 0.05 ) ) { rsBrake - .pitch( clamp( rsBrake.m_frequencyfactor * GetVelocity() + rsBrake.m_frequencyoffset, 0.5, 1.15 ) ) // arbitrary limits + .pitch( rsBrake.m_frequencyfactor * GetVelocity() + rsBrake.m_frequencyoffset ) .gain( rsBrake.m_amplitudefactor * std::sqrt( ( GetVelocity() * MoverParameters->UnitBrakeForce ) ) + rsBrake.m_amplitudeoffset ) .play( sound_flags::exclusive | sound_flags::looping ); } @@ -4115,8 +4120,8 @@ void TDynamicObject::RenderSounds() { // szum w czasie jazdy if( GetVelocity() > 0.5 ) { - volume = rsRunningNoise.m_amplitudefactor * MoverParameters->Vel + rsRunningNoise.m_amplitudeoffset; - frequency = rsRunningNoise.m_frequencyfactor * MoverParameters->Vel + rsRunningNoise.m_frequencyoffset; + volume = rsOuterNoise.m_amplitudefactor * MoverParameters->Vel + rsOuterNoise.m_amplitudeoffset; + frequency = rsOuterNoise.m_frequencyfactor * MoverParameters->Vel + rsOuterNoise.m_frequencyoffset; if( false == TestFlag( MoverParameters->DamageFlag, dtrain_wheelwear ) ) { // McZpakie-221103: halas zalezny od kola @@ -4174,13 +4179,13 @@ void TDynamicObject::RenderSounds() { clamp( MoverParameters->Vel / 60.0, 0.0, 1.0 ) ); - rsRunningNoise + rsOuterNoise .pitch( clamp( frequency, 0.5, 1.15 ) ) // arbitrary limits to prevent the pitch going out of whack .gain( volume ) .play( sound_flags::exclusive | sound_flags::looping ); } else { - rsRunningNoise.stop(); + rsOuterNoise.stop(); } // youBy: dzwiek ostrych lukow i ciasnych zwrotek @@ -4200,7 +4205,7 @@ void TDynamicObject::RenderSounds() { } if( volume > 0.05 ) { rscurve - .gain( 2.0 * volume ) + .gain( 2.5 * volume ) .play( sound_flags::exclusive | sound_flags::looping ); } else { @@ -4274,17 +4279,17 @@ void TDynamicObject::RenderSounds() { // TODO: dedicated sound, played alongside regular noise if( true == TestFlag( MoverParameters->DamageFlag, dtrain_wheelwear ) ) { #ifdef EU07_USE_OLD_SOUNDCODE - if( rsRunningNoise.AM != 0 ) { - rsRunningNoise.Stop(); - float am = rsRunningNoise.AM; - float fa = rsRunningNoise.FA; - float fm = rsRunningNoise.FM; - rsRunningNoise.Init( "lomotpodkucia.wav", -1, 0, 0, 0, true ); // MC: zmiana szumu na lomot - if( rsRunningNoise.AM == 1 ) - rsRunningNoise.AM = am; - rsRunningNoise.AA = 0.7; - rsRunningNoise.FA = fa; - rsRunningNoise.FM = fm; + if( rsOuterNoise.AM != 0 ) { + rsOuterNoise.Stop(); + float am = rsOuterNoise.AM; + float fa = rsOuterNoise.FA; + float fm = rsOuterNoise.FM; + rsOuterNoise.Init( "lomotpodkucia.wav", -1, 0, 0, 0, true ); // MC: zmiana szumu na lomot + if( rsOuterNoise.AM == 1 ) + rsOuterNoise.AM = am; + rsOuterNoise.AA = 0.7; + rsOuterNoise.FA = fa; + rsOuterNoise.FM = fm; } #else #endif @@ -5004,21 +5009,23 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // polozenia osi w/m srodka pojazdu parser.getTokens( 1, false ); parser >> dSDist; - for( int i = 0; i < iAxles; ++i ) { - parser.getTokens( 1, false ); - parser >> dWheelsPosition[ i ]; - parser.getTokens(); - parser >> token; - if( token != "end" ) { - rsStukot[ i ].deserialize( token + " " + std::to_string( dSDist ), sound_type::single, sound_parameters::range ); - rsStukot[ i ].owner( this ); - rsStukot[ i ].offset( { 0, 0, -dWheelsPosition[ i ] } ); - } + while( ( ( token = parser.getToken() ) != "" ) + && ( token != "end" ) ) { + // add another axle entry to the list + axle_sounds axle { + 0, + std::atof( token.c_str() ), + { sound_placement::external, static_cast( dSDist ) } }; + axle.clatter.deserialize( parser, sound_type::single ); + axle.clatter.owner( this ); + axle.clatter.offset( { 0, 0, -axle.offset } ); + m_axlesounds.emplace_back( axle ); } - if( token != "end" ) { - // TODO: check if this if() and/or retrieval makes sense here - parser.getTokens( 1, false ); parser >> token; - } + // arrange the axles in case they're listed out of order + std::sort( + std::begin( m_axlesounds ), std::end( m_axlesounds ), + []( axle_sounds const &Left, axle_sounds const &Right ) { + return ( Left.offset < Right.offset ); } ); } else if( ( token == "engine:" ) @@ -5193,6 +5200,15 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, sReleaser.owner( this ); } + else if( token == "outernoise:" ) { + // szum podczas jazdy: + rsOuterNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + rsOuterNoise.owner( this ); + + rsOuterNoise.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); + rsOuterNoise.m_frequencyfactor /= ( 1 + MoverParameters->Vmax ); + } + } while( ( token != "" ) && ( token != "endsounds" ) ); @@ -5301,14 +5317,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, couplersounds.dsbBufferClamp = bufferclash; } } - else if( token == "runningnoise:" ) { - // szum podczas jazdy: - rsRunningNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); - rsRunningNoise.owner( this ); - - rsRunningNoise.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); - rsRunningNoise.m_frequencyfactor /= ( 1 + MoverParameters->Vmax ); - } } while( token != "" ); diff --git a/DynObj.h b/DynObj.h index 7dec6ee6..9c0ed484 100644 --- a/DynObj.h +++ b/DynObj.h @@ -273,8 +273,14 @@ private: }; struct door_sounds { - sound_source rsDoorOpen{ sound_placement::general }; // Ra: przeniesione z kabiny - sound_source rsDoorClose{ sound_placement::general }; + sound_source rsDoorOpen{ sound_placement::general, 25.f }; // Ra: przeniesione z kabiny + sound_source rsDoorClose{ sound_placement::general, 25.f }; + }; + + struct axle_sounds { + double distance; // distance to rail joint + double offset; // axle offset from centre of the vehicle + sound_source clatter; // clatter emitter }; // methods @@ -318,16 +324,19 @@ private: TButton btHeadSignals23; TButton btMechanik1; TButton btMechanik2; - double enginevolume; // MC: pomocnicze zeby gladziej silnik buczal - int iAxles; // McZapkie: to potem mozna skasowac i zastapic iNumAxles - double dRailLength; +// int iAxles; // McZapkie: to potem mozna skasowac i zastapic iNumAxles + double dRailLength { 0.0 }; + std::vector m_axlesounds; +/* double dRailPosition[MaxAxles]; // licznik pozycji osi w/m szyny double dWheelsPosition[MaxAxles]; // pozycja osi w/m srodka pojazdu std::vector rsStukot; // dzwieki poszczegolnych osi //McZapkie-270202 +*/ // engine sounds sound_source dsbDieselIgnition { sound_placement::engine }; // moved from cab sound_source rsSilnik { sound_placement::engine }; + double enginevolume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal sound_source dsbRelay { sound_placement::engine }; sound_source dsbWejscie_na_bezoporow { sound_placement::engine }; // moved from cab sound_source dsbWejscie_na_drugi_uklad { sound_placement::engine }; // moved from cab @@ -357,7 +366,7 @@ private: sound_source sDepartureSignal { sound_placement::general }; sound_source sHorn1 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source sHorn2 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; - sound_source rsRunningNoise { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; + sound_source rsOuterNoise { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source rscurve { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; // youBy double eng_vol_act; diff --git a/Train.cpp b/Train.cpp index 2d2ef7b0..fa9ccee0 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5136,6 +5136,28 @@ TTrain::update_sounds( double const Deltatime ) { double volume { 0.0 }; double const brakevolumescale { 0.5 }; + // Winger-160404 - syczenie pomocniczego (luzowanie) + if( m_lastlocalbrakepressure != -1.f ) { + // calculate rate of pressure drop in local brake cylinder, once it's been initialized + auto const brakepressuredifference{ m_lastlocalbrakepressure - mvOccupied->LocBrakePress }; + m_localbrakepressurechange = interpolate( m_localbrakepressurechange, 10 * ( brakepressuredifference / Deltatime ), 0.1f ); + } + m_lastlocalbrakepressure = mvOccupied->LocBrakePress; + if( ( m_localbrakepressurechange > 0.05f ) + && ( mvOccupied->LocBrakePress > mvOccupied->BrakePress - 0.05 ) ) { + rsSBHiss + .gain( clamp( 0.05 * m_localbrakepressurechange, 0.0, 1.5 ) ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + // don't stop the sound too abruptly + volume = std::max( 0.0, rsSBHiss.gain() - 0.1 * Deltatime ); + rsSBHiss.gain( volume ); + if( volume < 0.05 ) { + rsSBHiss.stop(); + } + } + // McZapkie-280302 - syczenie // TODO: softer volume reduction than plain abrupt stop, perhaps as reusable wrapper? if( ( mvOccupied->BrakeHandle == FV4a ) @@ -5231,28 +5253,6 @@ TTrain::update_sounds( double const Deltatime ) { } } // koniec nie FV4a - // Winger-160404 - syczenie pomocniczego (luzowanie) - if( m_lastlocalbrakepressure != -1.f ) { - // calculate rate of pressure drop in local brake cylinder, once it's been initialized - auto const brakepressuredifference { m_lastlocalbrakepressure - mvOccupied->LocBrakePress }; - m_localbrakepressurechange = interpolate( m_localbrakepressurechange, 10 * ( brakepressuredifference / Deltatime ), 0.1f ); - } - m_lastlocalbrakepressure = mvOccupied->LocBrakePress; - if( ( m_localbrakepressurechange > 0.05f ) - && ( mvOccupied->LocBrakePress > mvOccupied->BrakePress - 0.05 ) ) { - rsSBHiss - .gain( clamp( 0.05 * m_localbrakepressurechange, 0.0, 1.5 ) ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - // don't stop the sound too abruptly - volume = std::max( 0.0, rsSBHiss.gain() - 0.1 * Deltatime ); - rsSBHiss.gain( volume ); - if( volume < 0.05 ) { - rsSBHiss.stop(); - } - } - // ambient sound // since it's typically ticking of the clock we can center it on tachometer or on middle of compartment bounding area rsFadeSound.play( sound_flags::exclusive | sound_flags::looping ); @@ -5268,6 +5268,35 @@ TTrain::update_sounds( double const Deltatime ) { } } + // szum w czasie jazdy + if( DynamicObject->GetVelocity() > 0.5 ) { + + volume = rsRunningNoise.m_amplitudefactor * mvOccupied->Vel + rsRunningNoise.m_amplitudeoffset; + auto frequency { rsRunningNoise.m_frequencyfactor * mvOccupied->Vel + rsRunningNoise.m_frequencyoffset }; + + if( std::abs( mvOccupied->nrot ) > 0.01 ) { + // hamulce wzmagaja halas + volume *= 1 + 0.25 * ( mvOccupied->UnitBrakeForce / ( 1 + mvOccupied->MaxBrakeForce ) ); + } + // scale volume by track quality + volume *= ( 20.0 + DynamicObject->MyTrack->iDamageFlag ) / 21; + // scale volume with vehicle speed + // TBD, TODO: disable the scaling for sounds combined from speed-based samples? + volume *= + interpolate( + 0.0, 1.0, + clamp( + mvOccupied->Vel / 40.0, + 0.0, 1.0 ) ); + rsRunningNoise + .pitch( clamp( frequency, 0.5, 1.15 ) ) // arbitrary limits to prevent the pitch going out of whack + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsRunningNoise.stop(); + } + // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa if (mvOccupied->SecuritySystem.Status > 0) { // hunter-091012: rozdzielenie alarmow @@ -5449,6 +5478,14 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) rsFadeSound.deserialize( parser, sound_type::single ); rsFadeSound.owner( DynamicObject ); } + else if( token == "runningnoise:" ) { + // szum podczas jazdy: + rsRunningNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + rsRunningNoise.owner( DynamicObject ); + + rsRunningNoise.m_amplitudefactor /= ( 1 + mvOccupied->Vmax ); + rsRunningNoise.m_frequencyfactor /= ( 1 + mvOccupied->Vmax ); + } else if (token == "mechspring:") { // parametry bujania kamery: @@ -5500,7 +5537,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) &dsbReverserKey, &dsbNastawnikJazdy, &dsbNastawnikBocz, &dsbSwitch, &dsbPneumaticSwitch, &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, - &rsFadeSound, + &rsFadeSound, &rsRunningNoise, &dsbHasler, &dsbBuzzer, &dsbSlipAlarm }; for( auto sound : sounds ) { diff --git a/Train.h b/Train.h index 968917cd..80a950b3 100644 --- a/Train.h +++ b/Train.h @@ -414,6 +414,8 @@ public: // reszta może by?publiczna float m_localbrakepressurechange { 0.f }; // recent change of pressure in local brake cylinder sound_source rsFadeSound { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; + sound_source rsRunningNoise{ sound_placement::internal, 2.0 * EU07_SOUND_CABCONTROLSCUTOFFRANGE }; + sound_source dsbHasler { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbBuzzer { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbSlipAlarm { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // Bombardier 011010: alarm przy poslizgu dla 181/182 diff --git a/World.cpp b/World.cpp index 8bd79a40..f850bda1 100644 --- a/World.cpp +++ b/World.cpp @@ -898,7 +898,7 @@ bool TWorld::Update() { Timer::UpdateTimers(Global::iPause != 0); Timer::subsystem.sim_total.start(); - if( (Global::iPause == false) + if( (Global::iPause == 0) || (m_init == false) ) { // jak pauza, to nie ma po co tego przeliczać simulation::Time.update( Timer::GetDeltaTime() ); diff --git a/audiorenderer.cpp b/audiorenderer.cpp index 104c8203..f7df7d40 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -115,21 +115,21 @@ openal_source::sync_with( sound_properties const &State ) { ::alSourcefv( id, AL_POSITION, glm::value_ptr( glm::vec3() ) ); } // gain - if( ( State.placement_stamp != properties.placement_stamp ) - || ( State.base_gain != properties.base_gain ) ) { + if( ( State.soundproofing_stamp != properties.soundproofing_stamp ) + || ( State.gain != properties.gain ) ) { // gain value has changed - properties.base_gain = State.base_gain; - properties.placement_gain = State.placement_gain; - properties.placement_stamp = State.placement_stamp; + properties.gain = State.gain; + properties.soundproofing = State.soundproofing; + properties.soundproofing_stamp = State.soundproofing_stamp; - ::alSourcef( id, AL_GAIN, properties.base_gain * properties.placement_gain * Global::AudioVolume ); + ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * Global::AudioVolume ); } // pitch - if( State.base_pitch != properties.base_pitch ) { + if( State.pitch != properties.pitch ) { // pitch value has changed - properties.base_pitch = State.base_pitch; + properties.pitch = State.pitch; - ::alSourcef( id, AL_PITCH, properties.base_pitch * pitch_variation ); + ::alSourcef( id, AL_PITCH, properties.pitch * pitch_variation ); } is_synced = true; } @@ -157,7 +157,7 @@ openal_source::pitch( float const Pitch ) { pitch_variation = Pitch; // invalidate current pitch value to enforce change of next syns - properties.base_pitch = -1.f; + properties.pitch = -1.f; } // toggles looping of the sound emitted by the source diff --git a/audiorenderer.h b/audiorenderer.h index 629ca969..7426014c 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -17,10 +17,10 @@ class sound_source; // sound emitter state sync item struct sound_properties { glm::dvec3 location; - float base_gain { 1.f }; - float placement_gain { 1.f }; - std::uintptr_t placement_stamp { ~( std::uintptr_t{ 0 } ) }; - float base_pitch { 1.f }; + float gain { 1.f }; + float soundproofing { 1.f }; + std::uintptr_t soundproofing_stamp { ~( std::uintptr_t{ 0 } ) }; + float pitch { 1.f }; }; namespace audio { diff --git a/simulation.cpp b/simulation.cpp index abef9f31..2b006a55 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -854,7 +854,7 @@ state_manager::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpa auto *sound = new sound_source( sound_placement::external, Nodedata.range_max ); sound->offset( location ); sound->name( Nodedata.name ); - sound->deserialize( Input.getToken(), sound_type::single ); + sound->deserialize( Input, sound_type::single ); #endif skip_until( Input, "endsound" ); diff --git a/sound.cpp b/sound.cpp index af001856..5eeab001 100644 --- a/sound.cpp +++ b/sound.cpp @@ -168,7 +168,7 @@ sound_source::update( audio::openal_source &Source ) { // check and update if needed current sound properties update_location(); - update_placement_gain(); + update_soundproofing(); Source.sync_with( m_properties ); if( false == Source.is_synced ) { // if the sync went wrong we let the renderer kill its part of the emitter, and update our playcounter(s) to match @@ -190,7 +190,7 @@ sound_source::update( audio::openal_source &Source ) { Source.range( m_range ); Source.pitch( m_pitchvariation ); update_location(); - update_placement_gain(); + update_soundproofing(); Source.sync_with( m_properties ); if( true == Source.is_synced ) { // all set, start playback @@ -216,7 +216,7 @@ sound_source::update( audio::openal_source &Source ) { sound_source & sound_source::gain( float const Gain ) { - m_properties.base_gain = clamp( Gain, 0.f, 2.f ); + m_properties.gain = clamp( Gain, 0.f, 2.f ); return *this; } @@ -224,14 +224,14 @@ sound_source::gain( float const Gain ) { float sound_source::gain() const { - return m_properties.base_gain; + return m_properties.gain; } // sets base pitch of the emitter to specified value sound_source & sound_source::pitch( float const Pitch ) { - m_properties.base_pitch = clamp( Pitch, 0.1f, 10.f ); + m_properties.pitch = clamp( Pitch, 0.1f, 10.f ); return *this; } @@ -275,18 +275,18 @@ sound_source::update_counter( audio::buffer_handle const Buffer, int const Value else if( Buffer == m_soundend.buffer ) { m_soundend.playing += Value; } } -float const EU07_SOUNDGAIN_LOW { 0.2f }; -float const EU07_SOUNDGAIN_MEDIUM { 0.65f }; -float const EU07_SOUNDGAIN_FULL { 1.f }; - void sound_source::update_location() { m_properties.location = location(); } +float const EU07_SOUNDPROOFING_STRONG { 0.25f }; +float const EU07_SOUNDPROOFING_SOME { 0.65f }; +float const EU07_SOUNDPROOFING_NONE { 1.f }; + bool -sound_source::update_placement_gain() { +sound_source::update_soundproofing() { // NOTE, HACK: current cab id can vary from -1 to +1 // we use this as modifier to force re-calculations when moving between compartments @@ -297,7 +297,7 @@ sound_source::update_placement_gain() { Global::pWorld->train()->Dynamic()->MoverParameters->ActiveCab : 0 ) ); // location-based gain factor: - std::uintptr_t placementstamp = reinterpret_cast( ( + std::uintptr_t soundproofingstamp = reinterpret_cast( ( FreeFlyModeFlag ? nullptr : ( Global::pWorld->train() ? @@ -305,51 +305,51 @@ sound_source::update_placement_gain() { nullptr ) ) ) + activecab; - if( placementstamp == m_properties.placement_stamp ) { return false; } + if( soundproofingstamp == m_properties.soundproofing_stamp ) { return false; } // listener location has changed, calculate new location-based gain factor switch( m_placement ) { case sound_placement::general: { - m_properties.placement_gain = EU07_SOUNDGAIN_FULL; + m_properties.soundproofing = EU07_SOUNDPROOFING_NONE; break; } case sound_placement::external: { - m_properties.placement_gain = ( - placementstamp == 0 ? - EU07_SOUNDGAIN_FULL : // listener outside - EU07_SOUNDGAIN_LOW ); // listener in a vehicle + m_properties.soundproofing = ( + soundproofingstamp == 0 ? + EU07_SOUNDPROOFING_NONE : // listener outside + EU07_SOUNDPROOFING_STRONG ); // listener in a vehicle break; } case sound_placement::internal: { - m_properties.placement_gain = ( - placementstamp == 0 ? - EU07_SOUNDGAIN_LOW : // listener outside + m_properties.soundproofing = ( + soundproofingstamp == 0 ? + EU07_SOUNDPROOFING_STRONG : // listener outside ( Global::pWorld->train()->Dynamic() != m_owner ? - EU07_SOUNDGAIN_LOW : // in another vehicle + EU07_SOUNDPROOFING_STRONG : // in another vehicle ( activecab == 0 ? - EU07_SOUNDGAIN_LOW : // listener in the engine compartment - EU07_SOUNDGAIN_FULL ) ) ); // listener in the cab of the same vehicle + EU07_SOUNDPROOFING_STRONG : // listener in the engine compartment + EU07_SOUNDPROOFING_NONE ) ) ); // listener in the cab of the same vehicle break; } case sound_placement::engine: { - m_properties.placement_gain = ( - placementstamp == 0 ? - EU07_SOUNDGAIN_MEDIUM : // listener outside + m_properties.soundproofing = ( + soundproofingstamp == 0 ? + EU07_SOUNDPROOFING_SOME : // listener outside ( Global::pWorld->train()->Dynamic() != m_owner ? - EU07_SOUNDGAIN_LOW : // in another vehicle + EU07_SOUNDPROOFING_STRONG : // in another vehicle ( activecab == 0 ? - EU07_SOUNDGAIN_FULL : // listener in the engine compartment - EU07_SOUNDGAIN_LOW ) ) ); // listener in another compartment of the same vehicle + EU07_SOUNDPROOFING_NONE : // listener in the engine compartment + EU07_SOUNDPROOFING_STRONG ) ) ); // listener in another compartment of the same vehicle break; } default: { // shouldn't ever land here, but, eh - m_properties.placement_gain = EU07_SOUNDGAIN_FULL; + m_properties.soundproofing = EU07_SOUNDPROOFING_NONE; break; } } - m_properties.placement_stamp = placementstamp; + m_properties.soundproofing_stamp = soundproofingstamp; return true; } diff --git a/sound.h b/sound.h index ee916c9a..f79eef83 100644 --- a/sound.h +++ b/sound.h @@ -121,7 +121,7 @@ private: update_location(); // potentially updates area-based gain factor of the source. returns: true if location has changed bool - update_placement_gain(); + update_soundproofing(); void insert( audio::buffer_handle Buffer ); template diff --git a/version.h b/version.h index 592d1424..9e45ba55 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1202 +#define VERSION_MINOR 1204 #define VERSION_REVISION 0 From 807eecd4822cf340e02d1701135d14f94cf91127 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 5 Dec 2017 19:51:36 +0100 Subject: [PATCH 232/426] build 171205. support for random sound sets, explicit range-driven sound attenuation --- DynObj.cpp | 143 ++++++++++++++++++++++++---------------------- Train.cpp | 7 ++- audiorenderer.cpp | 22 ++++++- audiorenderer.h | 3 +- sound.cpp | 34 +++++++++-- sound.h | 3 + version.h | 2 +- 7 files changed, 135 insertions(+), 79 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 7f629cb3..076dd4c2 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "DynObj.h" #include "simulation.h" +#include "train.h" #include "Globals.h" #include "Timer.h" #include "logs.h" @@ -3745,73 +3746,72 @@ void TDynamicObject::RenderSounds() { } /* // NOTE: experimentally disabled to see if it's still used anywhere - if (MoverParameters->TrainType == dt_PseudoDiesel) - { - // ABu: udawanie woodwarda dla lok. spalinowych - // jesli silnik jest podpiety pod dzwiek przetwornicy + if (MoverParameters->TrainType == dt_PseudoDiesel) + { + // ABu: udawanie woodwarda dla lok. spalinowych + // jesli silnik jest podpiety pod dzwiek przetwornicy - // glosnosc zalezy od stosunku mocy silnika el. do mocy max - double eng_vol; - if (MoverParameters->Power > 1) - // 0.85+0.000015*(...) - eng_vol = 0.8 + 0.00002 * (MoverParameters->EnginePower / MoverParameters->Power); - else - eng_vol = 1; + // glosnosc zalezy od stosunku mocy silnika el. do mocy max + double eng_vol; + if (MoverParameters->Power > 1) + // 0.85+0.000015*(...) + eng_vol = 0.8 + 0.00002 * (MoverParameters->EnginePower / MoverParameters->Power); + else + eng_vol = 1; - eng_dfrq = eng_dfrq + (eng_vol_act - eng_vol); - if (eng_dfrq > 0) - { - eng_dfrq = eng_dfrq - 0.025 * dt; - if (eng_dfrq < 0.025 * dt) - eng_dfrq = 0; - } - else if (eng_dfrq < 0) - { - eng_dfrq = eng_dfrq + 0.025 * dt; - if (eng_dfrq > -0.025 * dt) - eng_dfrq = 0; - } - double defrot; - if (MoverParameters->MainCtrlPos != 0) - { - double CtrlPos = MoverParameters->MainCtrlPos; - double CtrlPosNo = MoverParameters->MainCtrlPosNo; - // defrot=1+0.4*(CtrlPos/CtrlPosNo); - defrot = 1 + 0.5 * (CtrlPos / CtrlPosNo); - } - else - defrot = 1; + eng_dfrq = eng_dfrq + (eng_vol_act - eng_vol); + if (eng_dfrq > 0) + { + eng_dfrq = eng_dfrq - 0.025 * dt; + if (eng_dfrq < 0.025 * dt) + eng_dfrq = 0; + } + else if (eng_dfrq < 0) + { + eng_dfrq = eng_dfrq + 0.025 * dt; + if (eng_dfrq > -0.025 * dt) + eng_dfrq = 0; + } + double defrot; + if (MoverParameters->MainCtrlPos != 0) + { + double CtrlPos = MoverParameters->MainCtrlPos; + double CtrlPosNo = MoverParameters->MainCtrlPosNo; + // defrot=1+0.4*(CtrlPos/CtrlPosNo); + defrot = 1 + 0.5 * (CtrlPos / CtrlPosNo); + } + else + defrot = 1; - if (eng_frq_act < defrot) - { - // if (MoverParameters->MainCtrlPos==1) eng_frq_act=eng_frq_act+0.1*dt; - eng_frq_act = eng_frq_act + 0.4 * dt; // 0.05 - if (eng_frq_act > defrot - 0.4 * dt) - eng_frq_act = defrot; - } - else if (eng_frq_act > defrot) - { - eng_frq_act = eng_frq_act - 0.1 * dt; // 0.05 - if (eng_frq_act < defrot + 0.1 * dt) - eng_frq_act = defrot; - } - sConverter.UpdateAF(eng_vol_act, eng_frq_act + eng_dfrq, MechInside, GetPosition()); - // udawanie turbo: (6.66*(eng_vol-0.85)) - if (eng_turbo > 6.66 * (eng_vol - 0.8) + 0.2 * dt) - eng_turbo = eng_turbo - 0.2 * dt; // 0.125 - else if (eng_turbo < 6.66 * (eng_vol - 0.8) - 0.4 * dt) - eng_turbo = eng_turbo + 0.4 * dt; // 0.333 - else - eng_turbo = 6.66 * (eng_vol - 0.8); + if (eng_frq_act < defrot) + { + // if (MoverParameters->MainCtrlPos==1) eng_frq_act=eng_frq_act+0.1*dt; + eng_frq_act = eng_frq_act + 0.4 * dt; // 0.05 + if (eng_frq_act > defrot - 0.4 * dt) + eng_frq_act = defrot; + } + else if (eng_frq_act > defrot) + { + eng_frq_act = eng_frq_act - 0.1 * dt; // 0.05 + if (eng_frq_act < defrot + 0.1 * dt) + eng_frq_act = defrot; + } + sConverter.UpdateAF(eng_vol_act, eng_frq_act + eng_dfrq, MechInside, GetPosition()); + // udawanie turbo: (6.66*(eng_vol-0.85)) + if (eng_turbo > 6.66 * (eng_vol - 0.8) + 0.2 * dt) + eng_turbo = eng_turbo - 0.2 * dt; // 0.125 + else if (eng_turbo < 6.66 * (eng_vol - 0.8) - 0.4 * dt) + eng_turbo = eng_turbo + 0.4 * dt; // 0.333 + else + eng_turbo = 6.66 * (eng_vol - 0.8); - sTurbo.TurnOn(MechInside, GetPosition()); - // sTurbo.UpdateAF(eng_turbo,0.7+(eng_turbo*0.6),MechInside,GetPosition()); - sTurbo.UpdateAF(3 * eng_turbo - 1, 0.4 + eng_turbo * 0.4, MechInside, GetPosition()); - eng_vol_act = eng_vol; - // eng_frq_act=eng_frq; - } + sTurbo.TurnOn(MechInside, GetPosition()); + // sTurbo.UpdateAF(eng_turbo,0.7+(eng_turbo*0.6),MechInside,GetPosition()); + sTurbo.UpdateAF(3 * eng_turbo - 1, 0.4 + eng_turbo * 0.4, MechInside, GetPosition()); + eng_vol_act = eng_vol; + // eng_frq_act=eng_frq; + } */ - if( ( MoverParameters->EngineType == ElectricSeriesMotor ) || ( MoverParameters->EngineType == ElectricInductionMotor ) ) { @@ -4009,8 +4009,8 @@ void TDynamicObject::RenderSounds() { sSand.stop(); } - if( /*( false == mvOccupied->SlippingWheels ) - &&*/ ( MoverParameters->UnitBrakeForce > 10.0 ) + if( //( false == mvOccupied->SlippingWheels ) && + ( MoverParameters->UnitBrakeForce > 10.0 ) && ( GetVelocity() > 0.05 ) ) { rsBrake @@ -4030,8 +4030,8 @@ void TDynamicObject::RenderSounds() { } // McZapkie-280302 - pisk mocno zacisnietych hamulcow - if( /*( false == MoverParameters->SlippingWheels ) - &&*/ ( MoverParameters->UnitBrakeForce > rsPisk.m_amplitudefactor ) + if( //( false == MoverParameters->SlippingWheels ) && + ( MoverParameters->UnitBrakeForce > rsPisk.m_amplitudefactor ) && ( MoverParameters->Vel > 2.5 ) ) { rsPisk @@ -4118,7 +4118,13 @@ void TDynamicObject::RenderSounds() { } // szum w czasie jazdy - if( GetVelocity() > 0.5 ) { + if( ( GetVelocity() > 0.5 ) + && ( // compound test whether the vehicle belongs to user-driven consist (as these don't emit outer noise in cab view) + true == FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise + // Global::pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) + ctOwner == nullptr ? true : // standalone vehicle, can't be part of user-driven train + ctOwner != Global::pWorld->train()->Dynamic()->ctOwner ? true : // confirmed isn't a part of the user-driven train + false ) ) { volume = rsOuterNoise.m_amplitudefactor * MoverParameters->Vel + rsOuterNoise.m_amplitudeoffset; frequency = rsOuterNoise.m_frequencyfactor * MoverParameters->Vel + rsOuterNoise.m_frequencyoffset; @@ -4306,6 +4312,7 @@ void TDynamicObject::RenderSounds() { MoverParameters->EventFlag = false; } + } // McZapkie-250202 @@ -5018,7 +5025,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, { sound_placement::external, static_cast( dSDist ) } }; axle.clatter.deserialize( parser, sound_type::single ); axle.clatter.owner( this ); - axle.clatter.offset( { 0, 0, -axle.offset } ); + axle.clatter.offset( { 0, 0, -axle.offset } ); // vehicle faces +Z in 'its' space, for axle locations negative value means ahead of centre m_axlesounds.emplace_back( axle ); } // arrange the axles in case they're listed out of order diff --git a/Train.cpp b/Train.cpp index fa9ccee0..dd43dbf1 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5163,7 +5163,7 @@ TTrain::update_sounds( double const Deltatime ) { if( ( mvOccupied->BrakeHandle == FV4a ) || ( mvOccupied->BrakeHandle == FVel6 ) ) { // upuszczanie z PG - fPPress = interpolate( fPPress, mvOccupied->Handle->GetSound( s_fv4a_b ), 0.05 ); + fPPress = interpolate( fPPress, static_cast( mvOccupied->Handle->GetSound( s_fv4a_b ) ), 0.05f ); volume = ( fPPress > 0 ? rsHiss.m_amplitudefactor * fPPress * 0.25 : @@ -5177,7 +5177,7 @@ TTrain::update_sounds( double const Deltatime ) { rsHiss.stop(); } // napelnianie PG - fNPress = interpolate( fNPress, mvOccupied->Handle->GetSound( s_fv4a_u ), 0.25 ); + fNPress = interpolate( fNPress, static_cast( mvOccupied->Handle->GetSound( s_fv4a_u ) ), 0.25f ); volume = ( fNPress > 0 ? rsHissU.m_amplitudefactor * fNPress : @@ -5269,7 +5269,8 @@ TTrain::update_sounds( double const Deltatime ) { } // szum w czasie jazdy - if( DynamicObject->GetVelocity() > 0.5 ) { + if( ( false == FreeFlyModeFlag ) + && ( DynamicObject->GetVelocity() > 0.5 ) ) { volume = rsRunningNoise.m_amplitudefactor * mvOccupied->Vel + rsRunningNoise.m_amplitudeoffset; auto frequency { rsRunningNoise.m_frequencyfactor * mvOccupied->Vel + rsRunningNoise.m_frequencyoffset }; diff --git a/audiorenderer.cpp b/audiorenderer.cpp index f7df7d40..c25390cb 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -100,7 +100,7 @@ openal_source::sync_with( sound_properties const &State ) { auto const cutoffrange = ( is_multipart ? EU07_SOUND_CUTOFFRANGE : // we keep multi-part sounds around longer, to minimize restarts as the sounds get out and back in range - sound_range * 7.5f ); + sound_range * 5.0f ); if( glm::length2( sound_distance ) > std::min( ( cutoffrange * cutoffrange ), ( EU07_SOUND_CUTOFFRANGE * EU07_SOUND_CUTOFFRANGE ) ) ) { stop(); is_synced = false; // flag sync failure for the controller @@ -124,6 +124,24 @@ openal_source::sync_with( sound_properties const &State ) { ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * Global::AudioVolume ); } + if( sound_range > 0 ) { + auto const rangesquared { sound_range * sound_range }; + auto const distancesquared { glm::length2( sound_distance ) }; + if( ( distancesquared > rangesquared ) + || ( false == is_in_range ) ) { + // if the emitter is outside of its nominal hearing range or was outside of it during last check + // adjust the volume to a suitable fraction of nominal value + auto const fadedistance { sound_range * 0.75 }; + auto const rangefactor { + interpolate( + 1.f, 0.f, + clamp( + ( distancesquared - rangesquared ) / ( fadedistance * fadedistance ), + 0.f, 1.f ) ) }; + ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * rangefactor * Global::AudioVolume ); + } + is_in_range = ( distancesquared <= rangesquared ); + } // pitch if( State.pitch != properties.pitch ) { // pitch value has changed @@ -148,7 +166,7 @@ openal_source::range( float const Range ) { Range : 5 ) }; // range of -1 means sound of unlimited range, positioned at the listener ::alSourcef( id, AL_REFERENCE_DISTANCE, range * ( 1.f / 16.f ) ); - ::alSourcef( id, AL_ROLLOFF_FACTOR, 1.5f ); + ::alSourcef( id, AL_ROLLOFF_FACTOR, 1.75f ); } // sets modifier applied to the pitch of sounds emitted by the source diff --git a/audiorenderer.h b/audiorenderer.h index 7426014c..efed232f 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -56,7 +56,7 @@ struct openal_source { for( auto const buffer : buffers ) { bufferids.emplace_back( audio::renderer.buffer( buffer ).id ); } if( id != audio::null_resource ) { - ::alSourceQueueBuffers( id, bufferids.size(), bufferids.data() ); + ::alSourceQueueBuffers( id, static_cast( bufferids.size() ), bufferids.data() ); ::alSourceRewind( id ); } return *this; } // starts playback of queued buffers @@ -91,6 +91,7 @@ private: float pitch_variation { 1.f }; // emitter-specific variation of the base pitch float sound_range { 50.f }; // cached audible range of the emitted samples glm::vec3 sound_distance; // cached distance between sound and the listener + bool is_in_range { false }; // helper, indicates the source was recently within audible range bool is_multipart { false }; // multi-part sounds are kept alive at longer ranges }; diff --git a/sound.cpp b/sound.cpp index 5eeab001..fb8cfcfb 100644 --- a/sound.cpp +++ b/sound.cpp @@ -41,14 +41,14 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons switch( Legacytype ) { case sound_type::single: { // single sample only - m_soundmain.buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); + m_soundmain.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); break; } case sound_type::multipart: { // three samples: start, middle, stop - m_soundbegin.buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); - m_soundmain.buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); - m_soundend.buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;" ) ); + m_soundbegin.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + m_soundmain.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + m_soundend.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); break; } default: { @@ -76,6 +76,32 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons return *this; } +// extracts name of the sound file from provided data stream +std::string +sound_source::deserialize_filename( cParser &Input ) { + + auto token { Input.getToken( true, "\n\r\t ,;" ) }; + if( token != "[" ) { + // simple case, single file + return token; + } + // if instead of filename we've encountered '[' this marks beginning of random sound set + // we retrieve all filenames from the set, then return a random one + std::vector filenames; + while( ( ( token = Input.getToken( true, "\n\r\t ,;" ) ) != "" ) + && ( token != "]" ) ) { + filenames.emplace_back( token ); + } + if( false == filenames.empty() ) { + std::shuffle( std::begin( filenames ), std::end( filenames ), Global::random_engine ); + return filenames.front(); + } + else { + // shouldn't ever get here but, eh + return ""; + } +} + // issues contextual play commands for the audio renderer void sound_source::play( int const Flags ) { diff --git a/sound.h b/sound.h index f79eef83..b19c3e7d 100644 --- a/sound.h +++ b/sound.h @@ -115,6 +115,9 @@ private: }; // methods + // extracts name of the sound file from provided data stream + std::string + deserialize_filename( cParser &Input ); void update_counter( audio::buffer_handle const Buffer, int const Value ); void diff --git a/version.h b/version.h index 9e45ba55..fa045cb1 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1204 +#define VERSION_MINOR 1205 #define VERSION_REVISION 0 From 428710b8e7ed183fc9e5585f5d226f5375570ffb Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 14 Dec 2017 14:26:20 +0100 Subject: [PATCH 233/426] maintenance: removed deprecated code --- maszyna.vcxproj.filters | 3 --- Data.h => old/Data.h | 0 renderer.cpp | 1 - 3 files changed, 4 deletions(-) rename Data.h => old/Data.h (100%) diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 7652f761..5ac1908c 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -392,9 +392,6 @@ Header Files - - Header Files - Header Files diff --git a/Data.h b/old/Data.h similarity index 100% rename from Data.h rename to old/Data.h diff --git a/renderer.cpp b/renderer.cpp index 92c9e79d..aa703f86 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -15,7 +15,6 @@ http://mozilla.org/MPL/2.0/. #include "simulation.h" #include "world.h" #include "train.h" -#include "data.h" #include "dynobj.h" #include "animmodel.h" #include "traction.h" From 4e6e428cea933aca508323de93e90c17106fc88e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 14 Dec 2017 14:31:34 +0100 Subject: [PATCH 234/426] additional sound type for local brake, support for combined sounds --- Button.cpp | 2 +- Driver.cpp | 26 +- DynObj.cpp | 15 +- Globals.cpp | 2 +- Train.cpp | 49 +++- Train.h | 3 +- audiorenderer.cpp | 33 +-- audiorenderer.h | 38 +-- parser.cpp | 17 +- parser.h | 6 + sound.cpp | 625 ++++++++++++++++++++++++++++++++++++++++------ sound.h | 71 +++++- 12 files changed, 725 insertions(+), 162 deletions(-) diff --git a/Button.cpp b/Button.cpp index 0636888b..f87ebd90 100644 --- a/Button.cpp +++ b/Button.cpp @@ -85,7 +85,7 @@ TButton::Load_mapping( cParser &Input ) { // token can be a key or block end std::string const key { Input.getToken( true, "\n\r\t ,;" ) }; - if( key == "}" ) { return false; } + if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } // if not block end then the key is followed by assigned value or sub-block if( key == "soundinc:" ) { m_soundfxincrease.deserialize( Input, sound_type::single ); } else if( key == "sounddec:" ) { m_soundfxdecrease.deserialize( Input, sound_type::single ); } diff --git a/Driver.cpp b/Driver.cpp index d66073a7..07342b5a 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2368,19 +2368,25 @@ bool TController::ReleaseEngine() else OK = true; } - else if (mvOccupied->ActiveDir == 0) - OK = mvControlling->Mains; // tylko to testujemy dla pojazdu człowieka - if (AIControllFlag) - if (!mvOccupied->DecBrakeLevel()) // tu moze zmieniać na -2, ale to bez znaczenia - if (!mvOccupied->IncLocalBrakeLevel(1)) - { - while (DecSpeed(true)) + else if( mvOccupied->ActiveDir == 0 ) { + // tylko to testujemy dla pojazdu człowieka + OK = mvControlling->Mains; + } + + if( AIControllFlag ) { + mvOccupied->BrakeReleaser( 0 ); + if( !mvOccupied->DecBrakeLevel() ) { + // tu moze zmieniać na -2, ale to bez znaczenia + if( !mvOccupied->IncLocalBrakeLevel( 1 ) ) { + while( DecSpeed( true ) ) ; // zerowanie nastawników - while (mvOccupied->ActiveDir > 0) + while( mvOccupied->ActiveDir > 0 ) mvOccupied->DirectionBackward(); - while (mvOccupied->ActiveDir < 0) + while( mvOccupied->ActiveDir < 0 ) mvOccupied->DirectionForward(); } + } + } OK = OK && (mvOccupied->Vel < 0.01); if (OK) { // jeśli się zatrzymał @@ -3108,7 +3114,7 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N iGuardRadio = 0; // nie przez radio } else { - NewCommand = NewCommand.insert(NewCommand.find_last_of("."),"radio"); // wstawienie przed kropkč + NewCommand = NewCommand.insert(NewCommand.rfind('.'),"radio"); // wstawienie przed kropkč if (FileExists(NewCommand)) { // wczytanie dźwięku odjazdu w wersji radiowej (słychać tylko w kabinie) #ifdef EU07_USE_OLD_SOUNDCODE diff --git a/DynObj.cpp b/DynObj.cpp index 076dd4c2..5a0d5017 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4116,7 +4116,6 @@ void TDynamicObject::RenderSounds() { else { sHorn2.stop(); } - // szum w czasie jazdy if( ( GetVelocity() > 0.5 ) && ( // compound test whether the vehicle belongs to user-driven consist (as these don't emit outer noise in cab view) @@ -4183,15 +4182,17 @@ void TDynamicObject::RenderSounds() { interpolate( 0.0, 1.0, clamp( - MoverParameters->Vel / 60.0, + MoverParameters->Vel / 40.0, 0.0, 1.0 ) ); + rsOuterNoise - .pitch( clamp( frequency, 0.5, 1.15 ) ) // arbitrary limits to prevent the pitch going out of whack + .pitch( frequency ) // arbitrary limits to prevent the pitch going out of whack .gain( volume ) .play( sound_flags::exclusive | sound_flags::looping ); } else { - rsOuterNoise.stop(); + // don't play the optional ending sound if the listener switches views + rsOuterNoise.stop( false == FreeFlyModeFlag ); } // youBy: dzwiek ostrych lukow i ciasnych zwrotek @@ -4312,7 +4313,6 @@ void TDynamicObject::RenderSounds() { MoverParameters->EventFlag = false; } - } // McZapkie-250202 @@ -5062,14 +5062,13 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( ( token == "transmission:" ) && ( MoverParameters->EngineType == ElectricSeriesMotor ) ) { // plik z dzwiekiem, mnozniki i ofsety amp. i czest. - rsPrzekladnia.deserialize( parser, sound_type::single, sound_parameters::range ); - - // NOTE, TODO: fixed parameters, put them into simulation-side calculations + // NOTE, fixed default parameters, legacy system leftover rsPrzekladnia.m_amplitudefactor = 0.029; rsPrzekladnia.m_amplitudeoffset = 0.1; rsPrzekladnia.m_frequencyfactor = 0.005; rsPrzekladnia.m_frequencyoffset = 1.0; + rsPrzekladnia.deserialize( parser, sound_type::single, sound_parameters::range ); rsPrzekladnia.owner( this ); } diff --git a/Globals.cpp b/Globals.cpp index 9293298c..c011d925 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -134,7 +134,7 @@ bool Global::bWireFrame = false; // sound renderer bool Global::bSoundEnabled = true; -float Global::AudioVolume = 2.0f; +float Global::AudioVolume = 1.5f; std::string Global::AudioRenderer; int Global::iWriteLogEnabled = 3; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów diff --git a/Train.cpp b/Train.cpp index dd43dbf1..cbcb6666 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5139,14 +5139,15 @@ TTrain::update_sounds( double const Deltatime ) { // Winger-160404 - syczenie pomocniczego (luzowanie) if( m_lastlocalbrakepressure != -1.f ) { // calculate rate of pressure drop in local brake cylinder, once it's been initialized - auto const brakepressuredifference{ m_lastlocalbrakepressure - mvOccupied->LocBrakePress }; + auto const brakepressuredifference { mvOccupied->LocBrakePress - m_lastlocalbrakepressure }; m_localbrakepressurechange = interpolate( m_localbrakepressurechange, 10 * ( brakepressuredifference / Deltatime ), 0.1f ); } m_lastlocalbrakepressure = mvOccupied->LocBrakePress; - if( ( m_localbrakepressurechange > 0.05f ) + // local brake, release + if( ( m_localbrakepressurechange < -0.05f ) && ( mvOccupied->LocBrakePress > mvOccupied->BrakePress - 0.05 ) ) { rsSBHiss - .gain( clamp( 0.05 * m_localbrakepressurechange, 0.0, 1.5 ) ) + .gain( clamp( rsSBHiss.m_amplitudeoffset + rsSBHiss.m_amplitudefactor * -m_localbrakepressurechange * 0.05, 0.0, 1.5 ) ) .play( sound_flags::exclusive | sound_flags::looping ); } else { @@ -5157,6 +5158,20 @@ TTrain::update_sounds( double const Deltatime ) { rsSBHiss.stop(); } } + // local brake, engage + if( m_localbrakepressurechange > 0.05f ) { + rsSBHissU + .gain( clamp( rsSBHissU.m_amplitudeoffset + rsSBHissU.m_amplitudefactor * m_localbrakepressurechange * 0.05, 0.0, 1.5 ) ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + // don't stop the sound too abruptly + volume = std::max( 0.0, rsSBHissU.gain() - 0.1 * Deltatime ); + rsSBHissU.gain( volume ); + if( volume < 0.05 ) { + rsSBHissU.stop(); + } + } // McZapkie-280302 - syczenie // TODO: softer volume reduction than plain abrupt stop, perhaps as reusable wrapper? @@ -5290,12 +5305,13 @@ TTrain::update_sounds( double const Deltatime ) { mvOccupied->Vel / 40.0, 0.0, 1.0 ) ); rsRunningNoise - .pitch( clamp( frequency, 0.5, 1.15 ) ) // arbitrary limits to prevent the pitch going out of whack + .pitch( frequency ) .gain( volume ) .play( sound_flags::exclusive | sound_flags::looping ); } else { - rsRunningNoise.stop(); + // don't play the optional ending sound if the listener switches views + rsRunningNoise.stop( true == FreeFlyModeFlag ); } // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa @@ -5448,6 +5464,10 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) // syk: rsHissU.deserialize( parser, sound_type::single, sound_parameters::amplitude ); rsHissU.owner( DynamicObject ); + if( true == rsSBHissU.empty() ) { + // fallback for vehicles without defined local brake hiss sound + rsSBHissU = rsHissU; + } } else if (token == "airsound3:") { @@ -5473,6 +5493,11 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) rsSBHiss.deserialize( parser, sound_type::single, sound_parameters::amplitude ); rsSBHiss.owner( DynamicObject ); } + else if( token == "localbrakesound2:" ) { + // syk: + rsSBHissU.deserialize( parser, sound_type::single, sound_parameters::amplitude ); + rsSBHissU.owner( DynamicObject ); + } else if (token == "fadesound:") { // ambient sound: @@ -5537,7 +5562,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) std::vector sounds = { &dsbReverserKey, &dsbNastawnikJazdy, &dsbNastawnikBocz, &dsbSwitch, &dsbPneumaticSwitch, - &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, + &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, &rsSBHissU, &rsFadeSound, &rsRunningNoise, &dsbHasler, &dsbBuzzer, &dsbSlipAlarm }; @@ -5723,9 +5748,19 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) if( dsbBuzzer.offset() == nullvector ) { dsbBuzzer.offset( btLampkaCzuwaka.model_offset() ); } + auto const localbrakeoffset { ggLocalBrake.model_offset() }; + std::vector localbrakesounds = { + &rsSBHiss, &rsSBHissU + }; + for( auto sound : localbrakesounds ) { + if( sound->offset() == nullvector ) { + sound->offset( localbrakeoffset ); + } + } + // NOTE: if the local brake model can't be located the emitter will also be assigned location of main brake auto const brakeoffset { ggBrakeCtrl.model_offset() }; std::vector brakesounds = { - &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, + &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, &rsSBHissU, }; for( auto sound : brakesounds ) { if( sound->offset() == nullvector ) { diff --git a/Train.h b/Train.h index 80a950b3..57a33920 100644 --- a/Train.h +++ b/Train.h @@ -410,11 +410,12 @@ public: // reszta może by?publiczna sound_source rsHissX { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // fala sound_source rsHissT { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // czasowy sound_source rsSBHiss { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // local + sound_source rsSBHissU { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // local, engage brakes float m_lastlocalbrakepressure { -1.f }; // helper, cached level of pressure in local brake cylinder float m_localbrakepressurechange { 0.f }; // recent change of pressure in local brake cylinder sound_source rsFadeSound { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; - sound_source rsRunningNoise{ sound_placement::internal, 2.0 * EU07_SOUND_CABCONTROLSCUTOFFRANGE }; + sound_source rsRunningNoise{ sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbHasler { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbBuzzer { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; diff --git a/audiorenderer.cpp b/audiorenderer.cpp index c25390cb..2a7dcbdb 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -59,14 +59,14 @@ openal_source::update( double const Deltatime ) { if( id != audio::null_resource ) { - ::alGetSourcei( id, AL_BUFFERS_PROCESSED, &buffer_index ); + ::alGetSourcei( id, AL_BUFFERS_PROCESSED, &sound_index ); // for multipart sounds trim away processed sources until only one remains, the last one may be set to looping by the controller ALuint bufferid; - while( ( buffer_index > 0 ) - && ( buffers.size() > 1 ) ) { + while( ( sound_index > 0 ) + && ( sounds.size() > 1 ) ) { ::alSourceUnqueueBuffers( id, 1, &bufferid ); - buffers.erase( std::begin( buffers ) ); - --buffer_index; + sounds.erase( std::begin( sounds ) ); + --sound_index; } int state; @@ -84,7 +84,7 @@ openal_source::sync_with( sound_properties const &State ) { if( id == audio::null_resource ) { // no implementation-side source to match, return sync error so the controller can clean up on its end - is_synced = false; + sync = sync_state::bad_resource; return; } /* @@ -100,10 +100,10 @@ openal_source::sync_with( sound_properties const &State ) { auto const cutoffrange = ( is_multipart ? EU07_SOUND_CUTOFFRANGE : // we keep multi-part sounds around longer, to minimize restarts as the sounds get out and back in range - sound_range * 5.0f ); + sound_range * 7.5f ); if( glm::length2( sound_distance ) > std::min( ( cutoffrange * cutoffrange ), ( EU07_SOUND_CUTOFFRANGE * EU07_SOUND_CUTOFFRANGE ) ) ) { stop(); - is_synced = false; // flag sync failure for the controller + sync = sync_state::bad_distance; // flag sync failure for the controller return; } } @@ -147,9 +147,9 @@ openal_source::sync_with( sound_properties const &State ) { // pitch value has changed properties.pitch = State.pitch; - ::alSourcef( id, AL_PITCH, properties.pitch * pitch_variation ); + ::alSourcef( id, AL_PITCH, clamp( properties.pitch * pitch_variation, 0.1f, 10.f ) ); } - is_synced = true; + sync = sync_state::good; } // sets max audible distance for sounds emitted by the source @@ -205,7 +205,7 @@ openal_source::clear() { stop(); // ...prepare space for returned ids of unqueued buffers (not that we need that info)... std::vector bufferids; - bufferids.resize( buffers.size() ); + bufferids.resize( sounds.size() ); // ...release the buffers... ::alSourceUnqueueBuffers( id, bufferids.size(), bufferids.data() ); } @@ -260,17 +260,6 @@ openal_renderer::init() { return true; } -// schedules playback of specified sample, under control of the specified emitter -void -openal_renderer::insert( sound_source *Controller, audio::buffer_handle const Sound ) { - - audio::openal_source::buffer_sequence buffers { Sound }; - return - insert( - Controller, - std::begin( buffers ), std::end( buffers ) ); -} - // removes from the queue all sounds controlled by the specified sound emitter void openal_renderer::erase( sound_source const *Controller ) { diff --git a/audiorenderer.h b/audiorenderer.h index efed232f..a6864987 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -14,6 +14,8 @@ http://mozilla.org/MPL/2.0/. class sound_source; +using uint32_sequence = std::vector; + // sound emitter state sync item struct sound_properties { glm::dvec3 location; @@ -23,6 +25,12 @@ struct sound_properties { float pitch { 1.f }; }; +enum class sync_state { + good, + bad_distance, + bad_resource +}; + namespace audio { // implementation part of the sound emitter @@ -37,27 +45,30 @@ struct openal_source { // members ALuint id { audio::null_resource }; // associated AL resource sound_source *controller { nullptr }; // source controller - buffer_sequence buffers; // sequence of samples the source will emit - int buffer_index { 0 }; // currently queued sample from the buffer sequence + uint32_sequence sounds; // +// buffer_sequence buffers; // sequence of samples the source will emit + int sound_index { 0 }; // currently queued sample from the buffer sequence bool is_playing { false }; bool is_looping { false }; - bool is_synced { true }; // set to false only if a sync attempt fails sound_properties properties; + sync_state sync { sync_state::good }; // methods template openal_source & - bind( sound_source *Controller, Iterator_ First, Iterator_ Last ) { + bind( sound_source *Controller, uint32_sequence Sounds, Iterator_ First, Iterator_ Last ) { controller = Controller; - buffers.insert( std::end( buffers ), First, Last ); - is_multipart = ( buffers.size() > 1 ); + sounds = Sounds; // look up and queue assigned buffers - std::vector bufferids; - for( auto const buffer : buffers ) { - bufferids.emplace_back( audio::renderer.buffer( buffer ).id ); } + std::vector buffers; + std::for_each( + First, Last, + [&]( audio::buffer_handle const &buffer ) { + buffers.emplace_back( audio::renderer.buffer( buffer ).id ); } ); if( id != audio::null_resource ) { - ::alSourceQueueBuffers( id, static_cast( bufferids.size() ), bufferids.data() ); + ::alSourceQueueBuffers( id, static_cast( buffers.size() ), buffers.data() ); ::alSourceRewind( id ); } + is_multipart = ( buffers.size() > 1 ); return *this; } // starts playback of queued buffers void @@ -119,11 +130,8 @@ public: // schedules playback of provided range of samples, under control of the specified sound emitter template void - insert( sound_source *Controller, Iterator_ First, Iterator_ Last ) { - m_sources.emplace_back( fetch_source().bind( Controller, First, Last ) ); } - // schedules playback of specified sample, under control of the specified sound emitter - void - insert( sound_source *Controller, audio::buffer_handle const Sound ); + insert( Iterator_ First, Iterator_ Last, sound_source *Controller, uint32_sequence Sounds ) { + m_sources.emplace_back( fetch_source().bind( Controller, Sounds, First, Last ) ); } // removes from the queue all sounds controlled by the specified sound emitter void erase( sound_source const *Controller ); diff --git a/parser.cpp b/parser.cpp index 52cde35b..d8ccec70 100644 --- a/parser.cpp +++ b/parser.cpp @@ -109,9 +109,21 @@ cParser::getToken( bool const ToLower, const char *Break ) { } // methods +cParser & +cParser::autoclear( bool const Autoclear ) { + + m_autoclear = Autoclear; + if( mIncludeParser ) { mIncludeParser->autoclear( Autoclear ); } + + return *this; +} + bool cParser::getTokens(unsigned int Count, bool ToLower, const char *Break) { - tokens.clear(); // emulates old parser behaviour. TODO, TBD: allow manual reset? + if( true == m_autoclear ) { + // legacy parser behaviour + tokens.clear(); + } /* if (LoadTraction==true) trtest="niemaproblema"; //wczytywać @@ -123,7 +135,7 @@ bool cParser::getTokens(unsigned int Count, bool ToLower, const char *Break) this->str(""); this->clear(); */ - for (unsigned int i = 0; i < Count; ++i) + for (unsigned int i = tokens.size(); i < Count; ++i) { std::string token = readToken(ToLower, Break); if( true == token.empty() ) { @@ -215,6 +227,7 @@ std::string cParser::readToken( bool ToLower, const char *Break ) { parameter = readToken( false ); } mIncludeParser = std::make_shared( includefile, buffer_FILE, mPath, LoadTraction, includeparameters ); + mIncludeParser->autoclear( m_autoclear ); if( mIncludeParser->mSize <= 0 ) { ErrorLog( "Bad include: can't open file \"" + includefile + "\"" ); } diff --git a/parser.h b/parser.h index 4799a7d2..3c3ee511 100644 --- a/parser.h +++ b/parser.h @@ -61,6 +61,11 @@ class cParser //: public std::stringstream bool ok() { return !mStream->fail(); }; + cParser & + autoclear( bool const Autoclear ); + bool + autoclear() const { + return m_autoclear; } bool getTokens( unsigned int Count = 1, bool ToLower = true, char const *Break = "\n\r\t ;" ); // returns next incoming token, if any, without removing it from the set @@ -91,6 +96,7 @@ class cParser //: public std::stringstream bool trimComments( std::string &String ); std::size_t count(); // members: + bool m_autoclear { true }; // not retrieved tokens are discarded when another read command is issued (legacy behaviour) bool LoadTraction; // load traction? std::shared_ptr mStream; // relevant kind of buffer is attached on creation. std::string mFile; // name of the open file, if any diff --git a/sound.cpp b/sound.cpp index fb8cfcfb..58cbdad3 100644 --- a/sound.cpp +++ b/sound.cpp @@ -37,41 +37,85 @@ sound_source::deserialize( std::string const &Input, sound_type const Legacytype sound_source & sound_source::deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters ) { - // TODO: implement block type config parsing - switch( Legacytype ) { - case sound_type::single: { - // single sample only - m_soundmain.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); - break; - } - case sound_type::multipart: { - // three samples: start, middle, stop - m_soundbegin.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); - m_soundmain.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); - m_soundend.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); - break; - } - default: { - break; - } - } + // cache parser config, as it may change during deserialization + auto const inputautoclear { Input.autoclear() }; - if( Legacyparameters & sound_parameters::range ) { - Input.getTokens( 1, false ); - Input >> m_range; + Input.getTokens( 1, true, "\n\r\t ,;" ); + if( Input.peek() == "{" ) { + // block type config + while( true == deserialize_mapping( Input ) ) { + ; // all work done by while() + } + + if( false == m_soundchunks.empty() ) { + // arrange loaded sound chunks in requested order + std::sort( + std::begin( m_soundchunks ), std::end( m_soundchunks ), + []( soundchunk_pair const &Left, soundchunk_pair const &Right ) { + return ( Left.second.threshold < Right.second.threshold ); } ); + // calculate and cache full range points for each chunk, including crossfade sections: + // on the far end the crossfade section extends to the threshold point of the next chunk... + for( std::size_t idx = 0; idx < m_soundchunks.size() - 1; ++idx ) { + m_soundchunks[ idx ].second.fadeout = m_soundchunks[ idx + 1 ].second.threshold; + } + // ...and on the other end from the threshold point back into the range of previous chunk + for( std::size_t idx = 1; idx < m_soundchunks.size(); ++idx ) { + auto const previouschunkwidth { m_soundchunks[ idx ].second.threshold - m_soundchunks[ idx - 1 ].second.threshold }; + m_soundchunks[ idx ].second.fadein = m_soundchunks[ idx ].second.threshold - 0.01f * m_crossfaderange * previouschunkwidth; + } + m_soundchunks.back().second.fadeout = std::max( m_soundchunks.back().second.threshold, 100 ); + // test if the chunk table contains any actual samples while at it + for( auto &soundchunk : m_soundchunks ) { + if( soundchunk.first.buffer != null_handle ) { + m_soundchunksempty = false; + break; + } + } + } } - if( Legacyparameters & sound_parameters::amplitude ) { - Input.getTokens( 2, false ); - Input - >> m_amplitudefactor - >> m_amplitudeoffset; - } - if( Legacyparameters & sound_parameters::frequency ) { - Input.getTokens( 2, false ); - Input - >> m_frequencyfactor - >> m_frequencyoffset; + else { + // legacy type config + + // set the parser to preserve retrieved tokens, so we don't need to mess with separately passing the initial read + Input.autoclear( false ); + + switch( Legacytype ) { + case sound_type::single: { + // single sample only + m_sounds[ main ].buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + break; + } + case sound_type::multipart: { + // three samples: start, middle, stop + for( auto &sound : m_sounds ) { + sound.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + } + break; + } + default: { + break; + } + } + + if( Legacyparameters & sound_parameters::range ) { + Input.getTokens( 1, false ); + Input >> m_range; + } + if( Legacyparameters & sound_parameters::amplitude ) { + Input.getTokens( 2, false ); + Input + >> m_amplitudefactor + >> m_amplitudeoffset; + } + if( Legacyparameters & sound_parameters::frequency ) { + Input.getTokens( 2, false ); + Input + >> m_frequencyfactor + >> m_frequencyoffset; + } } + // restore parser behaviour + Input.autoclear( inputautoclear ); return *this; } @@ -85,11 +129,11 @@ sound_source::deserialize_filename( cParser &Input ) { // simple case, single file return token; } - // if instead of filename we've encountered '[' this marks beginning of random sound set - // we retrieve all filenames from the set, then return a random one + // if instead of filename we've encountered '[' this marks a beginning of random sounds + // we retrieve all entries, then return a random one std::vector filenames; while( ( ( token = Input.getToken( true, "\n\r\t ,;" ) ) != "" ) - && ( token != "]" ) ) { + && ( token != "]" ) ) { filenames.emplace_back( token ); } if( false == filenames.empty() ) { @@ -102,6 +146,127 @@ sound_source::deserialize_filename( cParser &Input ) { } } +// imports member data pair from the config file +bool +sound_source::deserialize_mapping( cParser &Input ) { + // token can be a key or block end + std::string const key { Input.getToken( true, "\n\r\t ,;[]" ) }; + + if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } + + // if not block end then the key is followed by assigned value or sub-block + if( key == "soundmain:" ) { + sound( sound_id::main ).buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + } + else if( key == "soundset:" ) { + deserialize_soundset( Input ); + } + else if( key == "soundbegin:" ) { + sound( sound_id::begin ).buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + } + else if( key == "soundend:" ) { + sound( sound_id::end ).buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + } + else if( key.compare( 0, std::min( key.size(), 5 ), "sound" ) == 0 ) { + // sound chunks, defined with key soundX where X = activation threshold + auto const indexstart { key.find_first_of( "1234567890" ) }; + auto const indexend { key.find_first_not_of( "1234567890", indexstart ) }; + if( indexstart != std::string::npos ) { + // NOTE: we'll sort the chunks at the end of deserialization + m_soundchunks.emplace_back( + soundchunk_pair { + // sound data + { audio::renderer.fetch_buffer( deserialize_filename( Input ) ), 0 }, + // chunk data + { std::stoi( key.substr( indexstart, indexend - indexstart ) ), 0, 0, 1.f } } ); + } + } + else if( key.compare( 0, std::min( key.size(), 5 ), "pitch" ) == 0 ) { + // sound chunk pitch, defined with key pitchX where X = activation threshold + auto const indexstart { key.find_first_of( "1234567890" ) }; + auto const indexend { key.find_first_not_of( "1234567890", indexstart ) }; + if( indexstart != std::string::npos ) { + auto const index { std::stoi( key.substr( indexstart, indexend - indexstart ) ) }; + auto const pitch { Input.getToken( false, "\n\r\t ,;" ) }; + for( auto &chunk : m_soundchunks ) { + if( chunk.second.threshold == index ) { + chunk.second.pitch = pitch; + break; + } + } + } + } + else if( key == "crossfade:" ) { + // for combined sounds, percentage of assigned range allocated to crossfade sections + Input.getTokens( 1, "\n\r\t ,;" ); + Input >> m_crossfaderange; + m_crossfaderange = clamp( m_crossfaderange, 0, 100 ); + } + else if( key == "placement:" ) { + auto const value { Input.getToken( true, "\n\r\t ,;" ) }; + std::map const placements { + { "internal", sound_placement::internal }, + { "engine", sound_placement::engine }, + { "external", sound_placement::external }, + { "general", sound_placement::general } }; + auto lookup{ placements.find( value ) }; + if( lookup != placements.end() ) { + m_placement = lookup->second; + } + } + else if( key == "offset:" ) { + // point in 3d space, in format [ x, y, z ] + Input.getTokens( 3, false, "\n\r\t ,;[]" ); + Input + >> m_offset.x + >> m_offset.y + >> m_offset.z; + } + else { + // floating point properties + std::map const properties { + { "frequencyfactor:", m_frequencyfactor }, + { "frequencyoffset:", m_frequencyoffset }, + { "amplitudefactor:", m_amplitudefactor }, + { "amplitudeoffset:", m_amplitudeoffset }, + { "range:", m_range } }; + + auto lookup { properties.find( key ) }; + if( lookup != properties.end() ) { + Input.getTokens( 1, false, "\n\r\t ,;" ); + Input >> lookup->second; + } + } + + return true; // return value marks a [ key: value ] pair was extracted, nothing about whether it's recognized +} + +// imports values for initial, main and ending sounds from provided data stream +void +sound_source::deserialize_soundset( cParser &Input ) { + + auto token { Input.getToken( true, "\n\r\t ,;|" ) }; + if( token != "[" ) { + // simple case, basic set of three filenames separated with | + // three samples: start, middle, stop + sound( sound_id::begin ).buffer = audio::renderer.fetch_buffer( token ); + sound( sound_id::main ).buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;|" ) ); + sound( sound_id::end ).buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;|" ) ); + return; + } + // if instead of filename we've encountered '[' this marks a beginning of random sets + // we retrieve all entries, then process a random one + std::vector soundsets; + while( ( ( token = Input.getToken( true, "\n\r\t ,;" ) ) != "" ) + && ( token != "]" ) ) { + soundsets.emplace_back( token ); + } + if( false == soundsets.empty() ) { + std::shuffle( std::begin( soundsets ), std::end( soundsets ), Global::random_engine ); + return deserialize_soundset( cParser( soundsets.front() ) ); + } +} + // issues contextual play commands for the audio renderer void sound_source::play( int const Flags ) { @@ -112,9 +277,11 @@ sound_source::play( int const Flags ) { return; } if( m_range > 0 ) { - auto const cutoffrange{ m_range * 5 }; - if( glm::length2( location() - glm::dvec3{ Global::pCameraPosition } ) > std::min( 2750.f * 2750.f, cutoffrange * cutoffrange ) ) { - // drop sounds from beyond sensible and/or audible range + auto const cutoffrange { m_range * 5 }; + if( glm::length2( location() - glm::dvec3 { Global::pCameraPosition } ) > std::min( 2750.f * 2750.f, cutoffrange * cutoffrange ) ) { + // while we drop sounds from beyond sensible and/or audible range + // we act as if it was activated normally, meaning no need to include the opening bookend in subsequent calls + m_playbeginning = false; return; } } @@ -126,40 +293,106 @@ sound_source::play( int const Flags ) { m_flags = Flags; + if( sound( sound_id::main ).buffer != null_handle ) { + // basic variant: single main sound, with optional bookends + play_basic(); + } + else { + // combined variant, main sound consists of multiple chunks, with optional bookends + play_combined(); + } +} + +void +sound_source::play_basic() { + if( false == is_playing() ) { // dispatch appropriate sound - // TODO: support for parameter-driven sound table - if( m_soundbegin.buffer != null_handle ) { - std::vector bufferlist { m_soundbegin.buffer, m_soundmain.buffer }; - insert( std::begin( bufferlist ), std::end( bufferlist ) ); + if( ( true == m_playbeginning ) + && ( sound( sound_id::begin ).buffer != null_handle ) ) { + std::vector sounds { sound_id::begin, sound_id::main }; + insert( std::begin( sounds ), std::end( sounds ) ); + m_playbeginning = false; } else { - insert( m_soundmain.buffer ); + insert( sound_id::main ); } } else { - - if( ( m_soundbegin.buffer == null_handle ) + // for single part non-looping samples we allow spawning multiple instances, if not prevented by set flags + if( ( sound( sound_id::begin ).buffer == null_handle ) && ( ( m_flags & ( sound_flags::exclusive | sound_flags::looping ) ) == 0 ) ) { - // for single part non-looping samples we allow spawning multiple instances, if not prevented by set flags - insert( m_soundmain.buffer ); + insert( sound_id::main ); + } + } +} + +void +sound_source::play_combined() { + // combined sound consists of table od samples, each sample associated with certain range of values of controlling variable + // current value of the controlling variable is passed to the source with pitch() call + auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 100.f ) }; + for( std::uint32_t idx = 0; idx < m_soundchunks.size(); ++idx ) { + + auto const &soundchunk { m_soundchunks[ idx ] }; + // a chunk covers range from fade in point, where it starts rising in volume over crossfade distance, + // lasts until fadeout - crossfade distance point, past which it grows quiet until fade out point where it ends + if( soundpoint < soundchunk.second.fadein ) { break; } + if( soundpoint > soundchunk.second.fadeout ) { continue; } + + if( ( soundchunk.first.playing > 0 ) + || ( soundchunk.first.buffer == null_handle ) ) { + // combined sounds only play looped, single copy of each activated chunk + continue; + } + + if( idx > 0 ) { + insert( sound_id::chunk | idx ); + } + else { + // initial chunk requires some safety checks if the optional bookend is present, + // so we don't queue another instance while the bookend is still playing + if( sound( sound_id::begin ).buffer == null_handle ) { + // no bookend, safe to play the chunk + insert( sound_id::chunk | idx ); + } + else { + // branches: + // beginning requested, not playing; queue beginning and chunk + // beginning not requested, not playing; queue chunk + // otherwise skip, one instance is already in the audio queue + if( sound( sound_id::begin ).playing == 0 ) { + if( true == m_playbeginning ) { + std::vector sounds{ sound_id::begin, sound_id::chunk | idx }; + insert( std::begin( sounds ), std::end( sounds ) ); + m_playbeginning = false; + } + else { + insert( sound_id::chunk | idx ); + } + } + } } } } // stops currently active play commands controlled by this emitter void -sound_source::stop() { +sound_source::stop( bool const Skipend ) { + + // if the source was stopped on simulation side, we should play the opening bookend next time it's activated + m_playbeginning = true; if( false == is_playing() ) { return; } m_stop = true; - if( ( m_soundend.buffer != null_handle ) - && ( m_soundend.buffer != m_soundmain.buffer ) // end == main can happen in malformed legacy cases - && ( m_soundend.playing == 0 ) ) { + if( ( false == Skipend ) + && ( sound( sound_id::end ).buffer != null_handle ) + && ( sound( sound_id::end ).buffer != sound( sound_id::main ).buffer ) // end == main can happen in malformed legacy cases + && ( sound( sound_id::end ).playing == 0 ) ) { // spawn potentially defined sound end sample, if the emitter is currently active - insert( m_soundend.buffer ); + insert( sound_id::end ); } } @@ -167,48 +400,64 @@ sound_source::stop() { void sound_source::update( audio::openal_source &Source ) { + if( sound( sound_id::main ).buffer != null_handle ) { + // basic variant: single main sound, with optional bookends + update_basic( Source ); + return; + } + if( false == m_soundchunksempty ) { + // combined variant, main sound consists of multiple chunks, with optional bookends + update_combined( Source ); + return; + } +} + +void +sound_source::update_basic( audio::openal_source &Source ) { + if( true == Source.is_playing ) { if( ( true == m_stop ) - && ( Source.buffers[ Source.buffer_index ] != m_soundend.buffer ) ) { + && ( Source.sounds[ Source.sound_index ] != sound_id::end ) ) { // kill the sound if stop was requested, unless it's sound bookend sample Source.stop(); - update_counter( Source.buffers[ Source.buffer_index ], -1 ); + update_counter( Source.sounds[ Source.sound_index ], -1 ); if( false == is_playing() ) { m_stop = false; } return; } - if( m_soundbegin.buffer != null_handle ) { + if( sound( sound_id::begin ).buffer != null_handle ) { // potentially a multipart sound // detect the moment when the sound moves from startup sample to the main + auto const soundhandle { Source.sounds[ Source.sound_index ] }; if( ( false == Source.is_looping ) - && ( Source.buffers[ Source.buffer_index ] == m_soundmain.buffer ) ) { - // when it happens update active sample flags, and activate the looping + && ( soundhandle == sound_id::main ) ) { + // when it happens update active sample counters, and activate the looping + update_counter( sound_id::begin, -1 ); + update_counter( soundhandle, 1 ); Source.loop( true ); - --( m_soundbegin.playing ); - ++( m_soundmain.playing ); } } - // check and update if needed current sound properties update_location(); update_soundproofing(); Source.sync_with( m_properties ); - if( false == Source.is_synced ) { + if( Source.sync != sync_state::good ) { // if the sync went wrong we let the renderer kill its part of the emitter, and update our playcounter(s) to match - update_counter( Source.buffers[ Source.buffer_index ], -1 ); + update_counter( Source.sounds[ Source.sound_index ], -1 ); } } else { // if the emitter isn't playing it's either done or wasn't yet started // we can determine this from number of processed buffers - if( Source.buffer_index != Source.buffers.size() ) { - auto const buffer { Source.buffers[ Source.buffer_index ] }; + if( Source.sound_index != Source.sounds.size() ) { + // the emitter wasn't yet started + auto const soundhandle { Source.sounds[ Source.sound_index ] }; // emitter initialization - if( ( buffer == m_soundmain.buffer ) + if( ( soundhandle == sound_id::main ) && ( true == TestFlag( m_flags, sound_flags::looping ) ) ) { // main sample can be optionally set to loop Source.loop( true ); @@ -218,22 +467,208 @@ sound_source::update( audio::openal_source &Source ) { update_location(); update_soundproofing(); Source.sync_with( m_properties ); - if( true == Source.is_synced ) { + if( Source.sync == sync_state::good ) { // all set, start playback Source.play(); if( false == Source.is_playing ) { // if the playback didn't start update the state counter - update_counter( buffer, -1 ); + update_counter( soundhandle, -1 ); } } else { // if the initial sync went wrong we skip the activation so the renderer can clean the emitter on its end - update_counter( buffer, -1 ); + update_counter( soundhandle, -1 ); } } else { - auto const buffer { Source.buffers[ Source.buffer_index - 1 ] }; - update_counter( buffer, -1 ); + // the emitter is either all done or was terminated early + update_counter( Source.sounds[ Source.sound_index - 1 ], -1 ); + } + } +} + +void +sound_source::update_combined( audio::openal_source &Source ) { + + if( true == Source.is_playing ) { + + auto const soundhandle { Source.sounds[ Source.sound_index ] }; + + if( ( true == m_stop ) + && ( soundhandle != sound_id::end ) ) { + // kill the sound if stop was requested, unless it's sound bookend sample + Source.stop(); + update_counter( soundhandle, -1 ); + if( false == is_playing() ) { + m_stop = false; + } + return; + } + + if( sound( sound_id::begin ).buffer != null_handle ) { + // potentially a multipart sound + // detect the moment when the sound moves from startup sample to the main + auto const soundhandle { Source.sounds[ Source.sound_index ] }; + if( ( false == Source.is_looping ) + && ( soundhandle == ( sound_id::chunk | 0 ) ) ) { + // when it happens update active sample counters, and activate the looping + update_counter( sound_id::begin, -1 ); + update_counter( soundhandle, 1 ); + Source.loop( true ); + } + } + + if( ( soundhandle & sound_id::chunk ) != 0 ) { + // for sound chunks, test whether the chunk should still be active given current value of the controlling variable + auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 100.f ) }; + auto const &soundchunk { m_soundchunks[ soundhandle ^ sound_id::chunk ] }; + if( ( soundpoint < soundchunk.second.fadein ) + || ( soundpoint > soundchunk.second.fadeout ) ) { + Source.stop(); + update_counter( soundhandle, -1 ); + return; + } + } + + // check and update if needed current sound properties + update_location(); + update_soundproofing(); + // pitch and volume are adjusted on per-chunk basis + // since they're relative to base values, backup these... + auto const baseproperties = m_properties; + // ...adjust per-chunk parameters... + update_crossfade( soundhandle ); + // ... pass the parameters to the audio renderer... + Source.sync_with( m_properties ); + if( Source.sync != sync_state::good ) { + // if the sync went wrong we let the renderer kill its part of the emitter, and update our playcounter(s) to match + update_counter( Source.sounds[ Source.sound_index ], -1 ); + } + // ...and restore base properties + m_properties = baseproperties; + } + else { + // if the emitter isn't playing it's either done or wasn't yet started + // we can determine this from number of processed buffers + if( Source.sound_index != Source.sounds.size() ) { + // the emitter wasn't yet started + auto const soundhandle { Source.sounds[ Source.sound_index ] }; + // emitter initialization + if( ( soundhandle != sound_id::begin ) + && ( soundhandle != sound_id::end ) + && ( true == TestFlag( m_flags, sound_flags::looping ) ) ) { + // main sample can be optionally set to loop + Source.loop( true ); + } + Source.range( m_range ); + Source.pitch( m_pitchvariation ); + update_location(); + update_soundproofing(); + // pitch and volume are adjusted on per-chunk basis + auto const baseproperties = m_properties; + update_crossfade( soundhandle ); + Source.sync_with( m_properties ); + if( Source.sync == sync_state::good ) { + // all set, start playback + Source.play(); + if( false == Source.is_playing ) { + // if the playback didn't start update the state counter + update_counter( soundhandle, -1 ); + } + } + else { + // if the initial sync went wrong we skip the activation so the renderer can clean the emitter on its end + update_counter( soundhandle, -1 ); + } + m_properties = baseproperties; + } + else { + // the emitter is either all done or was terminated early + update_counter( Source.sounds[ Source.sound_index - 1 ], -1 ); + } + } +} + +void +sound_source::update_crossfade( sound_handle const Chunk ) { + + if( ( Chunk & sound_id::chunk ) == 0 ) { + // bookend sounds are played at their base pitch + m_properties.pitch = 1.f; + return; + } + + auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 100.f ) }; + + // NOTE: direct access to implementation details ahead, kinda fugly + auto const chunkindex { Chunk ^ sound_id::chunk }; + auto const &chunkdata { m_soundchunks[ chunkindex ].second }; + + // relative pitch adjustment + // pitch of each chunk is modified based on ratio of the chunk's pitch to that of its neighbour + if( soundpoint < chunkdata.threshold ) { + // interpolate between the pitch of previous chunk and this chunk's base pitch, + // based on how far the current soundpoint is in the range of previous chunk + auto const &previouschunkdata{ m_soundchunks[ chunkindex - 1 ].second }; + m_properties.pitch = + interpolate( + previouschunkdata.pitch / chunkdata.pitch, + 1.f, + clamp( + ( soundpoint - previouschunkdata.threshold ) / ( chunkdata.threshold - previouschunkdata.threshold ), + 0.f, 1.f ) ); + } + else { + + if( chunkindex < ( m_soundchunks.size() - 1 ) ) { + // interpolate between this chunk's base pitch and the pitch of next chunk + // based on how far the current soundpoint is in the range of this chunk + auto const &nextchunkdata { m_soundchunks[ chunkindex + 1 ].second }; + m_properties.pitch = + interpolate( + 1.f, + nextchunkdata.pitch / chunkdata.pitch, + clamp( + ( soundpoint - chunkdata.threshold ) / ( nextchunkdata.threshold - chunkdata.threshold ), + 0.f, 1.f ) ); + } + else { + // pitch of the last (or the only) chunk remains fixed throughout + m_properties.pitch = 1.f; + } + } + + // if there's no crossfade sections, our work is done + if( m_crossfaderange == 0 ) { return; } + + if( chunkindex > 0 ) { + // chunks other than the first can have fadein + auto const fadeinwidth { chunkdata.threshold - chunkdata.fadein }; + if( soundpoint < chunkdata.threshold ) { + m_properties.gain *= + interpolate( + 0.f, 1.f, + clamp( + ( soundpoint - chunkdata.fadein ) / fadeinwidth, + 0.f, 1.f ) ); + return; + } + } + if( chunkindex < ( m_soundchunks.size() - 1 ) ) { + // chunks other than the last can have fadeout + // TODO: cache widths in the chunk data struct? + // fadeout point of this chunk and activation threshold of the next are the same + // fadein range of the next chunk and the fadeout of the processed one are the same + auto const fadeoutwidth { chunkdata.fadeout - m_soundchunks[ chunkindex + 1 ].second.fadein }; + auto const fadeoutstart { chunkdata.fadeout - fadeoutwidth }; + if( soundpoint > fadeoutstart ) { + m_properties.gain *= + interpolate( + 1.f, 0.f, + clamp( + ( soundpoint - fadeoutstart ) / fadeoutwidth, + 0.f, 1.f ) ); + return; } } } @@ -257,7 +692,7 @@ sound_source::gain() const { sound_source & sound_source::pitch( float const Pitch ) { - m_properties.pitch = clamp( Pitch, 0.1f, 10.f ); + m_properties.pitch = Pitch; return *this; } @@ -265,15 +700,25 @@ bool sound_source::empty() const { // NOTE: we test only the main sound, won't bother playing potential bookends if this is missing - // TODO: take into account presence of sample table, for combined sounds - return ( m_soundmain.buffer == null_handle ); + return ( ( sound( sound_id::main ).buffer == null_handle ) && ( m_soundchunksempty ) ); } // returns true if the source is emitting any sound bool sound_source::is_playing( bool const Includesoundends ) const { - return ( ( m_soundbegin.playing + m_soundmain.playing ) > 0 ); + auto isplaying { ( sound( sound_id::begin ).playing + sound( sound_id::main ).playing ) > 0 }; + if( ( false == isplaying ) + && ( false == m_soundchunks.empty() ) ) { + // for emitters with sample tables check also if any of the chunks is active + for( auto const &soundchunk : m_soundchunks ) { + if( soundchunk.first.playing > 0 ) { + isplaying = true; + break; // one will do + } + } + } + return isplaying; } // returns location of the sound source in simulation region space @@ -293,12 +738,10 @@ sound_source::location() const { } void -sound_source::update_counter( audio::buffer_handle const Buffer, int const Value ) { +sound_source::update_counter( sound_handle const Sound, int const Value ) { - if( Buffer == m_soundbegin.buffer ) { m_soundbegin.playing += Value; } - // TODO: take ito accound sample table for combined sounds - else if( Buffer == m_soundmain.buffer ) { m_soundmain.playing += Value; } - else if( Buffer == m_soundend.buffer ) { m_soundend.playing += Value; } + sound( Sound ).playing += Value; + assert( sound( Sound ).playing >= 0 ); } void @@ -380,10 +823,28 @@ sound_source::update_soundproofing() { } void -sound_source::insert( audio::buffer_handle Buffer ) { +sound_source::insert( sound_handle const Sound ) { - std::vector buffers { Buffer }; - return insert( std::begin( buffers ), std::end( buffers ) ); + std::vector sounds { Sound }; + return insert( std::begin( sounds ), std::end( sounds ) ); +} + +sound_source::sound_data & +sound_source::sound( sound_handle const Sound ) { + + return ( + ( Sound & sound_id::chunk ) == sound_id::chunk ? + m_soundchunks[ Sound ^ sound_id::chunk ].first : + m_sounds[ Sound ] ); +} + +sound_source::sound_data const & +sound_source::sound( sound_handle const Sound ) const { + + return ( + ( Sound & sound_id::chunk ) == sound_id::chunk ? + m_soundchunks[ Sound ^ sound_id::chunk ].first : + m_sounds[ Sound ] ); } //--------------------------------------------------------------------------- diff --git a/sound.h b/sound.h index b19c3e7d..cc870889 100644 --- a/sound.h +++ b/sound.h @@ -63,7 +63,7 @@ public: play( int const Flags = 0 ); // stops currently active play commands controlled by this emitter void - stop(); + stop( bool const Skipend = false ); // adjusts parameters of provided implementation-side sound source void update( audio::openal_source &Source ); @@ -110,30 +110,74 @@ public: private: // types struct sound_data { - audio::buffer_handle buffer { null_handle }; - int playing { 0 }; // number of currently active sample instances + audio::buffer_handle buffer; + int playing; // number of currently active sample instances + }; + + struct chunk_data { + int threshold; // nominal point of activation for the given chunk + float fadein; // actual activation point for the given chunk + float fadeout; // actual end point of activation range for the given chunk + float pitch; // base pitch of the chunk + }; + + using soundchunk_pair = std::pair; + + using sound_handle = std::uint32_t; + enum sound_id : std::uint32_t { + begin, + main, + end, + // 31 bits for index into relevant array, msb selects between the sample table and the basic array + chunk = ( 1u << 31 ) }; // methods // extracts name of the sound file from provided data stream std::string deserialize_filename( cParser &Input ); + // imports member data pair from the provided data stream + bool + deserialize_mapping( cParser &Input ); + // imports values for initial, main and ending sounds from provided data stream void - update_counter( audio::buffer_handle const Buffer, int const Value ); + deserialize_soundset( cParser &Input ); + // issues contextual play commands for the audio renderer + void + play_basic(); + void + play_combined(); + void + update_basic( audio::openal_source &Source ); + void + update_combined( audio::openal_source &Source ); + void + update_crossfade( sound_handle const Chunk ); + void + update_counter( sound_handle const Sound, int const Value ); void update_location(); // potentially updates area-based gain factor of the source. returns: true if location has changed bool update_soundproofing(); void - insert( audio::buffer_handle Buffer ); + insert( sound_handle const Sound ); template void insert( Iterator_ First, Iterator_ Last ) { - - audio::renderer.insert( this, First, Last ); - update_counter( *First, 1 ); - } + uint32_sequence sounds; + std::vector buffers; + std::for_each( + First, Last, + [&]( sound_handle const &soundhandle ) { + sounds.emplace_back( soundhandle ); + buffers.emplace_back( sound( soundhandle ).buffer ); } ); + audio::renderer.insert( std::begin( buffers ), std::end( buffers ), this, sounds ); + update_counter( *First, 1 ); } + sound_data & + sound( sound_handle const Sound ); + sound_data const & + sound( sound_handle const Sound ) const; // members TDynamicObject const * m_owner { nullptr }; // optional, the vehicle carrying this sound source @@ -145,10 +189,11 @@ private: sound_properties m_properties; // current properties of the emitted sounds float m_pitchvariation { 0.f }; // emitter-specific shift in base pitch bool m_stop { false }; // indicates active sample instances should be terminated - sound_data m_soundmain; // main sound emitted by the source - sound_data m_soundbegin; // optional, sound emitted before the main sound - sound_data m_soundend; // optional, sound emitted after the main sound - // TODO: table of samples with associated values, activated when controlling variable matches the value + bool m_playbeginning { true }; // indicates started sounds should be preceeded by opening bookend if there's one + std::array m_sounds { {} }; // basic sounds emitted by the source, main and optional bookends + std::vector m_soundchunks; // table of samples activated when associated variable is within certain range + bool m_soundchunksempty { true }; // helper, cached check whether sample table is linked with any actual samples + int m_crossfaderange {}; // range of transition from one chunk to another }; // owner setter/getter From b70c265a1ea10f03d33793b29f79826f653d9a3a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 14 Dec 2017 22:05:18 +0100 Subject: [PATCH 235/426] fixes for .fiz file parsing and diesel engine momentum calculation --- McZapkie/Mover.cpp | 38 ++++++++++++++++++-------------------- McZapkie/mctools.h | 7 ++++--- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 5971367f..1941e25c 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -47,7 +47,7 @@ inline long ROUND(float f) return Trunc(f + 0.5f); } -inline double sqr(double val) // SQR() zle liczylo w current() ... +inline double square(double val) // SQR() zle liczylo w current() ... { return val * val; } @@ -225,7 +225,7 @@ double TMoverParameters::Current(double n, double U) // writepaslog("fi ", FloatToStr(MotorParam[SP].fi)); Isf = Sign(U1) * MotorParam[SP].Isat; // writepaslog("Isf ", FloatToStr(Isf)); - Delta = sqr(Isf * Rz + Mn * MotorParam[SP].fi * n - U1) + + Delta = square(Isf * Rz + Mn * MotorParam[SP].fi * n - U1) + 4.0 * U1 * Isf * Rz; // 105 * 1.67 + Mn * 140.9 * 20.532 - U1 // DeltaQ = Isf * Rz + Mn * MotorParam[SP].fi * n - U1 + 4 * U1 * Isf * Rz; // writepaslog("Delta ", FloatToStr(Delta)); @@ -1272,7 +1272,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap // przyspieszenie normalne if (abs(Shape.R) > 0.01) - AccN = sqr(V) / Shape.R + g * Shape.dHrail / TrackW; // Q: zamieniam SQR() na sqr() + AccN = square(V) / Shape.R + g * Shape.dHrail / TrackW; // Q: zamieniam SQR() na sqr() else AccN = g * Shape.dHrail / TrackW; @@ -3787,7 +3787,7 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) } if (nrot < 0.1) { - WheelFlat = sqrt(sqr(WheelFlat) + abs(Fwheels) / NAxles*Vel*0.000002); + WheelFlat = sqrt(square(WheelFlat) + abs(Fwheels) / NAxles*Vel*0.000002); } if (Sign(nrot * M_PI * WheelDiameter - V)*Sign(temp_nrot * M_PI * WheelDiameter - V) < 0) { @@ -4388,7 +4388,7 @@ double TMoverParameters::TractionForce(double dt) dizel_Mstand * (0.2 * enrot / dizel_nmax); // dodatkowe opory z powodu sprezarki} Mm = dizel_engage * dmoment; Mw = Mm * dtrans; // dmoment i dtrans policzone przy okazji enginerotation - Fw = Mw * 2.0 / WheelDiameter; + Fw = Mw * 2.0 / WheelDiameter / NPoweredAxles; Ft = Fw * NPoweredAxles; // sila trakcyjna Ft = Ft * DirAbsolute; // ActiveDir*CabNo; break; @@ -4477,8 +4477,8 @@ double TMoverParameters::TractionForce(double dt) else // charakterystyka pradnicy obcowzbudnej (elipsa) - twierdzenie Pitagorasa { - Voltage = sqrt(abs(sqr(DElist[MainCtrlPos].Umax) - - sqr(DElist[MainCtrlPos].Umax * Im / + Voltage = sqrt(abs(square(DElist[MainCtrlPos].Umax) - + square(DElist[MainCtrlPos].Umax * Im / DElist[MainCtrlPos].Imax))) * (MainCtrlPos - 1) + (1.0 - Im / DElist[MainCtrlPos].Imax) * DElist[MainCtrlPos].Umax * @@ -4754,7 +4754,7 @@ double TMoverParameters::TractionForce(double dt) 0.001 * Voltage * (eimc[eimc_p_Imax] - eimc[eimc_f_I0]) * Pirazy2 * eimc[eimc_s_cim] / eimc[eimc_s_p] / eimc[eimc_s_cfu]); eimv[eimv_FMAXMAX] = - 0.001 * sqr(Min0R(eimv[eimv_fkr] / Max0R(abs(enrot) * eimc[eimc_s_p] + + 0.001 * square(Min0R(eimv[eimv_fkr] / Max0R(abs(enrot) * eimc[eimc_s_p] + eimc[eimc_s_dfmax] * eimv[eimv_ks], eimc[eimc_s_dfmax]), 1) * @@ -5683,21 +5683,19 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) { // liczy moment sily wytwarzany przez silnik spalinowy} double Moment = 0, enMoment = 0, eps = 0, newn = 0, friction = 0; - // friction =dizel_engagefriction*(11-2*random)/10; friction = dizel_engagefriction; - if (enrot > 0) - { // sqr TODO: sqr c++ - Moment = dizel_Mmax * dizel_fill - - (dizel_Mmax - dizel_Mnmax * dizel_fill) * - sqr(enrot / (dizel_nmax - dizel_nMmax * dizel_fill)) - - dizel_Mstand; // Q: zamieniam SQR() na sqr() - // Moment:=Moment*(1+sin(eAngle*4))-dizel_Mstand*(1+cos(eAngle*4));} + if( enrot > 0 ) { +// Moment = dizel_Mmax * dizel_fill - ( dizel_Mmax - dizel_Mnmax * dizel_fill ) * sqr( enrot / ( dizel_nmax - dizel_nMmax * dizel_fill ) ) - dizel_Mstand; // Q: zamieniam SQR() na sqr() + Moment = ( dizel_Mmax - ( dizel_Mmax - dizel_Mnmax ) * square( ( enrot - dizel_nMmax ) / ( dizel_nMmax - dizel_nmax ) ) ) * dizel_fill - dizel_Mstand; } - else + else { Moment = -dizel_Mstand; - if (enrot < dizel_nmin / 10.0) - if (eAngle < PI / 2.0) - Moment -= dizel_Mstand; // wstrzymywanie przy malych obrotach + } + if( ( enrot < dizel_nmin / 10.0 ) + && ( eAngle < PI / 2.0 ) ) { + // wstrzymywanie przy malych obrotach + Moment -= dizel_Mstand; + } //!! abs if (abs(abs(n) - enrot) < 0.1) { diff --git a/McZapkie/mctools.h b/McZapkie/mctools.h index c86f0731..88bdc80f 100644 --- a/McZapkie/mctools.h +++ b/McZapkie/mctools.h @@ -116,11 +116,12 @@ void win1250_to_ascii( std::string &Input ); inline std::string extract_value( std::string const &Key, std::string const &Input ) { - + // NOTE, HACK: the leading space allows to uniformly look for " variable=" substring + std::string const input { " " + Input }; std::string value; - auto lookup = Input.find( Key + "=" ); + auto lookup = input.find( " " + Key + "=" ); if( lookup != std::string::npos ) { - value = Input.substr( Input.find_first_not_of( ' ', lookup + Key.size() + 1 ) ); + value = input.substr( input.find_first_not_of( ' ', lookup + Key.size() + 2 ) ); lookup = value.find( ' ' ); if( lookup != std::string::npos ) { // trim everything past the value From c22390b4ff0b17875362c63411cc5b64be862982 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 15 Dec 2017 02:15:44 +0100 Subject: [PATCH 236/426] build 171214. partial control variable normalization for combined engine sounds, conditional cab soundproofing --- DynObj.cpp | 30 ++++++++++++++++++- Globals.cpp | 1 + Globals.h | 1 + McZapkie/Mover.cpp | 49 ++++++++++++++++++------------- World.cpp | 4 +++ sound.cpp | 73 ++++++++++++++++++++++++++-------------------- sound.h | 3 ++ version.h | 2 +- 8 files changed, 108 insertions(+), 55 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 5a0d5017..268d2291 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3622,7 +3622,35 @@ void TDynamicObject::RenderSounds() { || ( MoverParameters->EngineType == Dumb ) ) { // frequency calculation - frequency = rsSilnik.m_frequencyfactor * std::fabs( MoverParameters->enrot ) + rsSilnik.m_frequencyoffset; + auto normalizer { 1.f }; + // for combined sounds normalize frequency to 0-1 range + switch( MoverParameters->EngineType ) { + case DieselElectric: { + if( true == sConverter.is_combined() ) { + normalizer = MoverParameters->DElist[ MoverParameters->MainCtrlPosNo ].RPM / 60; + } + break; + } + case DieselEngine: { + if( true == rsSilnik.is_combined() ) { + normalizer = MoverParameters->dizel_nmax; + } + break; + } + case ElectricInductionMotor: { + if( true == rsSilnik.is_combined() ) { + // TODO: implement normalization/a way to calculate max expected engine rpm + } + break; + } + default: { + if( true == rsSilnik.is_combined() ) { + normalizer = MoverParameters->nmax; + } + break; + } + } + frequency = rsSilnik.m_frequencyfactor * std::abs( MoverParameters->enrot ) / std::max( 1.f, normalizer ) + rsSilnik.m_frequencyoffset; if( MoverParameters->EngineType == Dumb ) { frequency -= 0.2 * MoverParameters->EnginePower / ( 1 + MoverParameters->Power * 1000 ); } diff --git a/Globals.cpp b/Globals.cpp index c011d925..7ed2f2e2 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -40,6 +40,7 @@ float Global::FieldOfView = 45.0f; GLFWwindow *Global::window; bool Global::shiftState; bool Global::ctrlState; +bool Global::CabWindowOpen { false }; int Global::iCameraLast = -1; std::string Global::asVersion = "couldn't retrieve version string"; bool Global::ControlPicking = false; // indicates controls pick mode is enabled diff --git a/Globals.h b/Globals.h index 3e78723b..145ca3f7 100644 --- a/Globals.h +++ b/Globals.h @@ -235,6 +235,7 @@ public: static GLFWwindow *window; static bool shiftState; //m7todo: brzydko static bool ctrlState; + static bool CabWindowOpen; // controls sound attenuation between cab and outside static int iCameraLast; static std::string asVersion; // z opisem static bool ControlPicking; // indicates controls pick mode is active diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 1941e25c..2d6e084e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3737,8 +3737,8 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) Voltage = RunningTraction.TractionVoltage * DirAbsolute; // ActiveDir*CabNo; } // bo nie dzialalo else if( ( EngineType == ElectricInductionMotor ) - || ( ( ( Couplers[ side::front ].CouplingFlag & ctrain_power ) == ctrain_power ) - || ( ( Couplers[ side::rear ].CouplingFlag & ctrain_power ) == ctrain_power ) ) ) { + || ( ( ( Couplers[ side::front ].CouplingFlag & ctrain_power ) == ctrain_power ) + || ( ( Couplers[ side::rear ].CouplingFlag & ctrain_power ) == ctrain_power ) ) ) { // potem ulepszyc! pantogtrafy! Voltage = std::max( @@ -4746,21 +4746,27 @@ double TMoverParameters::TractionForce(double dt) eimv[eimv_Uzsmax] = Min0R(Voltage - eimc[eimc_f_DU], tmp); eimv[eimv_fkr] = eimv[eimv_Uzsmax] / eimc[eimc_f_cfu]; - if ((dizel_fill < 0)) - eimv[eimv_Pmax] = eimc[eimc_p_Ph]; - else - eimv[eimv_Pmax] = - Min0R(eimc[eimc_p_Pmax], - 0.001 * Voltage * (eimc[eimc_p_Imax] - eimc[eimc_f_I0]) * Pirazy2 * - eimc[eimc_s_cim] / eimc[eimc_s_p] / eimc[eimc_s_cfu]); - eimv[eimv_FMAXMAX] = - 0.001 * square(Min0R(eimv[eimv_fkr] / Max0R(abs(enrot) * eimc[eimc_s_p] + - eimc[eimc_s_dfmax] * eimv[eimv_ks], - eimc[eimc_s_dfmax]), - 1) * - eimc[eimc_f_cfu] / eimc[eimc_s_cfu]) * - (eimc[eimc_s_dfmax] * eimc[eimc_s_dfic] * eimc[eimc_s_cim]) * - Transmision.Ratio * NPoweredAxles * 2.0 / WheelDiameter; + if( ( dizel_fill < 0 ) ) { + eimv[ eimv_Pmax ] = eimc[ eimc_p_Ph ]; + } + else { + eimv[ eimv_Pmax ] = + std::min( + eimc[ eimc_p_Pmax ], + 0.001 * Voltage * ( eimc[ eimc_p_Imax ] - eimc[ eimc_f_I0 ] ) * Pirazy2 * eimc[ eimc_s_cim ] / eimc[ eimc_s_p ] / eimc[ eimc_s_cfu ] ); + } + eimv[ eimv_FMAXMAX ] = + 0.001 + * square( + std::min( + 1.0, + eimv[ eimv_fkr ] / std::max( + abs( enrot ) * eimc[ eimc_s_p ] + eimc[ eimc_s_dfmax ] * eimv[ eimv_ks ], + eimc[ eimc_s_dfmax ] ) ) + * eimc[ eimc_f_cfu ] + / eimc[ eimc_s_cfu ] ) + * ( eimc[ eimc_s_dfmax ] * eimc[ eimc_s_dfic ] * eimc[ eimc_s_cim ] ) + * Transmision.Ratio * NPoweredAxles * 2.0 / WheelDiameter; if ((dizel_fill < 0)) { eimv[eimv_Fful] = std::min(eimc[eimc_p_Ph] * 3.6 / (Vel != 0.0 ? Vel : 0.001), @@ -4835,10 +4841,11 @@ double TMoverParameters::TractionForce(double dt) i = 0; while ((i < RlistSize - 1) && (DElist[i + 1].RPM < abs(tmpV))) i++; - RventRot = (abs(tmpV) - DElist[i].RPM) / - (DElist[i + 1].RPM - DElist[i].RPM) * - (DElist[i + 1].GenPower - DElist[i].GenPower) + - DElist[i].GenPower; + RventRot = + ( std::abs( tmpV ) - DElist[ i ].RPM ) + / std::max( 1.0, ( DElist[ i + 1 ].RPM - DElist[ i ].RPM ) ) + * ( DElist[ i + 1 ].GenPower - DElist[ i ].GenPower ) + + DElist[ i ].GenPower; } else RventRot = 0; diff --git a/World.cpp b/World.cpp index f850bda1..71593315 100644 --- a/World.cpp +++ b/World.cpp @@ -1116,6 +1116,8 @@ TWorld::Update_Camera( double const Deltatime ) { if( DebugCameraFlag ) { DebugCamera.Update(); } else { Camera.Update(); } // uwzględnienie ruchu wywołanego klawiszami + // reset window state, it'll be set again if applicable in a check below + Global::CabWindowOpen = false; if( ( Train != nullptr ) && ( Camera.Type == tp_Follow ) @@ -1128,6 +1130,8 @@ TWorld::Update_Camera( double const Deltatime ) { && ( (Console::Pressed( Global::Keys[ k_MechLeft ]) || (Console::Pressed( Global::Keys[ k_MechRight ]))))) { // jeśli lusterko lewe albo prawe (bez rzucania na razie) + Global::CabWindowOpen = true; + bool lr = Console::Pressed( Global::Keys[ k_MechLeft ] ); // Camera.Yaw powinno być wyzerowane, aby po powrocie patrzeć do przodu Camera.Pos = Controlled->GetPosition() + Train->MirrorPosition( lr ); // pozycja lusterka diff --git a/sound.cpp b/sound.cpp index 58cbdad3..3eda5d0b 100644 --- a/sound.cpp +++ b/sound.cpp @@ -331,7 +331,7 @@ void sound_source::play_combined() { // combined sound consists of table od samples, each sample associated with certain range of values of controlling variable // current value of the controlling variable is passed to the source with pitch() call - auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 100.f ) }; + auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 99.f ) }; for( std::uint32_t idx = 0; idx < m_soundchunks.size(); ++idx ) { auto const &soundchunk { m_soundchunks[ idx ] }; @@ -520,7 +520,7 @@ sound_source::update_combined( audio::openal_source &Source ) { if( ( soundhandle & sound_id::chunk ) != 0 ) { // for sound chunks, test whether the chunk should still be active given current value of the controlling variable - auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 100.f ) }; + auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 99.f ) }; auto const &soundchunk { m_soundchunks[ soundhandle ^ sound_id::chunk ] }; if( ( soundpoint < soundchunk.second.fadein ) || ( soundpoint > soundchunk.second.fadeout ) ) { @@ -598,7 +598,7 @@ sound_source::update_crossfade( sound_handle const Chunk ) { return; } - auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 100.f ) }; + auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 99.f ) }; // NOTE: direct access to implementation details ahead, kinda fugly auto const chunkindex { Chunk ^ sound_id::chunk }; @@ -607,16 +607,19 @@ sound_source::update_crossfade( sound_handle const Chunk ) { // relative pitch adjustment // pitch of each chunk is modified based on ratio of the chunk's pitch to that of its neighbour if( soundpoint < chunkdata.threshold ) { - // interpolate between the pitch of previous chunk and this chunk's base pitch, - // based on how far the current soundpoint is in the range of previous chunk - auto const &previouschunkdata{ m_soundchunks[ chunkindex - 1 ].second }; - m_properties.pitch = - interpolate( - previouschunkdata.pitch / chunkdata.pitch, - 1.f, - clamp( - ( soundpoint - previouschunkdata.threshold ) / ( chunkdata.threshold - previouschunkdata.threshold ), - 0.f, 1.f ) ); + + if( chunkindex > 0 ) { + // interpolate between the pitch of previous chunk and this chunk's base pitch, + // based on how far the current soundpoint is in the range of previous chunk + auto const &previouschunkdata{ m_soundchunks[ chunkindex - 1 ].second }; + m_properties.pitch = + interpolate( + previouschunkdata.pitch / chunkdata.pitch, + 1.f, + clamp( + ( soundpoint - previouschunkdata.threshold ) / ( chunkdata.threshold - previouschunkdata.threshold ), + 0.f, 1.f ) ); + } } else { @@ -721,6 +724,13 @@ sound_source::is_playing( bool const Includesoundends ) const { return isplaying; } +// returns true if the source uses sample table +bool +sound_source::is_combined() const { + + return ( ( !m_soundchunks.empty() ) && ( sound( sound_id::main ).buffer == null_handle ) ); +} + // returns location of the sound source in simulation region space glm::dvec3 const sound_source::location() const { @@ -756,15 +766,14 @@ float const EU07_SOUNDPROOFING_NONE { 1.f }; bool sound_source::update_soundproofing() { - - // NOTE, HACK: current cab id can vary from -1 to +1 - // we use this as modifier to force re-calculations when moving between compartments + // NOTE, HACK: current cab id can vary from -1 to +1, and we use another higher priority value for open cab window + // we use this as modifier to force re-calculations when moving between compartments or changing window state int const activecab = ( - FreeFlyModeFlag ? - 0 : - ( Global::pWorld->train() ? - Global::pWorld->train()->Dynamic()->MoverParameters->ActiveCab : - 0 ) ); + Global::CabWindowOpen ? 2 : + FreeFlyModeFlag ? 0 : + ( Global::pWorld->train() ? + Global::pWorld->train()->Dynamic()->MoverParameters->ActiveCab : + 0 ) ); // location-based gain factor: std::uintptr_t soundproofingstamp = reinterpret_cast( ( FreeFlyModeFlag ? @@ -784,15 +793,15 @@ sound_source::update_soundproofing() { } case sound_placement::external: { m_properties.soundproofing = ( - soundproofingstamp == 0 ? - EU07_SOUNDPROOFING_NONE : // listener outside - EU07_SOUNDPROOFING_STRONG ); // listener in a vehicle + ( ( soundproofingstamp == 0 ) || ( true == Global::CabWindowOpen ) ) ? + EU07_SOUNDPROOFING_NONE : // listener outside or has a window open + EU07_SOUNDPROOFING_STRONG ); // listener in a vehicle with windows shut break; } case sound_placement::internal: { m_properties.soundproofing = ( soundproofingstamp == 0 ? - EU07_SOUNDPROOFING_STRONG : // listener outside + EU07_SOUNDPROOFING_STRONG : // listener outside HACK: won't be true if active vehicle has open window ( Global::pWorld->train()->Dynamic() != m_owner ? EU07_SOUNDPROOFING_STRONG : // in another vehicle ( activecab == 0 ? @@ -802,13 +811,13 @@ sound_source::update_soundproofing() { } case sound_placement::engine: { m_properties.soundproofing = ( - soundproofingstamp == 0 ? - EU07_SOUNDPROOFING_SOME : // listener outside - ( Global::pWorld->train()->Dynamic() != m_owner ? - EU07_SOUNDPROOFING_STRONG : // in another vehicle - ( activecab == 0 ? - EU07_SOUNDPROOFING_NONE : // listener in the engine compartment - EU07_SOUNDPROOFING_STRONG ) ) ); // listener in another compartment of the same vehicle + ( ( soundproofingstamp == 0 ) || ( true == Global::CabWindowOpen ) ) ? + EU07_SOUNDPROOFING_SOME : // listener outside or has a window open + ( Global::pWorld->train()->Dynamic() != m_owner ? + EU07_SOUNDPROOFING_STRONG : // in another vehicle + ( activecab == 0 ? + EU07_SOUNDPROOFING_NONE : // listener in the engine compartment + EU07_SOUNDPROOFING_STRONG ) ) ); // listener in another compartment of the same vehicle break; } default: { diff --git a/sound.h b/sound.h index cc870889..08bed00a 100644 --- a/sound.h +++ b/sound.h @@ -97,6 +97,9 @@ public: // returns true if the source is emitting any sound; by default doesn't take into account optional ending soudnds bool is_playing( bool const Includesoundends = false ) const; + // returns true if the source uses sample table + bool + is_combined() const; // returns location of the sound source in simulation region space glm::dvec3 const location() const; diff --git a/version.h b/version.h index fa045cb1..0b6c16aa 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1205 +#define VERSION_MINOR 1214 #define VERSION_REVISION 0 From bc13e5b0b54e4997569a88e035248c7ddf50c810 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 19 Dec 2017 00:26:46 +0100 Subject: [PATCH 237/426] minor sound refactoring --- DynObj.cpp | 34 +++++-------- McZapkie/Mover.cpp | 123 ++++++++++++++++++++++++++++----------------- Train.cpp | 1 + sound.cpp | 18 +++++-- sound.h | 3 ++ 5 files changed, 107 insertions(+), 72 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 268d2291..61d69e0b 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3623,34 +3623,22 @@ void TDynamicObject::RenderSounds() { // frequency calculation auto normalizer { 1.f }; - // for combined sounds normalize frequency to 0-1 range + // for combined sound engine we calculate sound point in rpm, to make .mmd files setup easier switch( MoverParameters->EngineType ) { case DieselElectric: { if( true == sConverter.is_combined() ) { - normalizer = MoverParameters->DElist[ MoverParameters->MainCtrlPosNo ].RPM / 60; - } - break; - } - case DieselEngine: { - if( true == rsSilnik.is_combined() ) { - normalizer = MoverParameters->dizel_nmax; - } - break; - } - case ElectricInductionMotor: { - if( true == rsSilnik.is_combined() ) { - // TODO: implement normalization/a way to calculate max expected engine rpm + normalizer = 60.f * 0.01f; } break; } default: { if( true == rsSilnik.is_combined() ) { - normalizer = MoverParameters->nmax; + normalizer = 60.f * 0.01f; } break; } } - frequency = rsSilnik.m_frequencyfactor * std::abs( MoverParameters->enrot ) / std::max( 1.f, normalizer ) + rsSilnik.m_frequencyoffset; + frequency = rsSilnik.m_frequencyfactor * std::abs( MoverParameters->enrot ) * normalizer + rsSilnik.m_frequencyoffset; if( MoverParameters->EngineType == Dumb ) { frequency -= 0.2 * MoverParameters->EnginePower / ( 1 + MoverParameters->Power * 1000 ); } @@ -4147,10 +4135,11 @@ void TDynamicObject::RenderSounds() { // szum w czasie jazdy if( ( GetVelocity() > 0.5 ) && ( // compound test whether the vehicle belongs to user-driven consist (as these don't emit outer noise in cab view) - true == FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise + FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise // Global::pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) ctOwner == nullptr ? true : // standalone vehicle, can't be part of user-driven train ctOwner != Global::pWorld->train()->Dynamic()->ctOwner ? true : // confirmed isn't a part of the user-driven train + Global::CabWindowOpen ? true : // sticking head out we get to hear outer noise false ) ) { volume = rsOuterNoise.m_amplitudefactor * MoverParameters->Vel + rsOuterNoise.m_amplitudeoffset; @@ -5076,15 +5065,16 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, rsSilnik.m_amplitudefactor /= amplitudedivisor; } - else if( ( token == "ventilator:" ) - && ( ( MoverParameters->EngineType == ElectricSeriesMotor ) - || ( MoverParameters->EngineType == ElectricInductionMotor ) ) ) { + else if( token == "ventilator:" ) { // plik z dzwiekiem wentylatora, mnozniki i ofsety amp. i czest. rsWentylator.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); rsWentylator.owner( this ); - rsWentylator.m_amplitudefactor /= MoverParameters->RVentnmax; - rsWentylator.m_frequencyfactor /= MoverParameters->RVentnmax; + if( ( MoverParameters->EngineType == ElectricSeriesMotor ) + || ( MoverParameters->EngineType == ElectricInductionMotor ) ) { + rsWentylator.m_amplitudefactor /= MoverParameters->RVentnmax; + rsWentylator.m_frequencyfactor /= MoverParameters->RVentnmax; + } } else if( ( token == "transmission:" ) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 2d6e084e..72532ec2 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4197,7 +4197,7 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) // ************************************************************************************************* double TMoverParameters::TractionForce(double dt) { - double PosRatio, dmoment, dtrans, tmp, tmpV; + double PosRatio, dmoment, dtrans, tmp;// , tmpV; int i; Ft = 0; @@ -4244,38 +4244,82 @@ double TMoverParameters::TractionForce(double dt) // eAngle = Pirazy2 - eAngle; <- ABu: a nie czasem tak, jak nizej? eAngle -= M_PI * 2.0; */ - // hunter-091012: przeniesione z if ActiveDir<>0 (zeby po zejsciu z kierunku dalej spadala - // predkosc wentylatorow) - if (EngineType == ElectricSeriesMotor) - { - switch (RVentType) // wentylatory rozruchowe} - { - case 1: - { - if ((ActiveDir != 0) && (RList[MainCtrlActualPos].R > RVentCutOff)) - RventRot += (RVentnmax - RventRot) * RVentSpeed * dt; - else - RventRot *= (1.0 - RVentSpeed * dt); - break; - } - case 2: - { - if ((abs(Itot) > RVentMinI) && (RList[MainCtrlActualPos].R > RVentCutOff)) - RventRot += - (RVentnmax * abs(Itot) / (ImaxLo * RList[MainCtrlActualPos].Bn) - RventRot) * - RVentSpeed * dt; - else if ((DynamicBrakeType == dbrake_automatic) && (DynamicBrakeFlag)) - RventRot += (RVentnmax * Im / ImaxLo - RventRot) * RVentSpeed * dt; - else - { - RventRot *= (1.0 - RVentSpeed * dt); - if (RventRot < 0.1) - RventRot = 0; + // hunter-091012: przeniesione z if ActiveDir<>0 (zeby po zejsciu z kierunku dalej spadala predkosc wentylatorow) + // wentylatory rozruchowe + // TODO: move this to update, it doesn't exactly have much to do with traction + if( true == Mains ) { + + switch( EngineType ) { + case ElectricInductionMotor: { + // TBD, TODO: currently ignores RVentType, fix this? + auto const tmpV { std::abs( eimv[ eimv_fp ] ) }; + + if( ( RlistSize > 0 ) + && ( ( std::abs( eimv[ eimv_If ] ) > 1.0 ) + || ( tmpV > 0.1 ) ) ) { + + i = 0; + while( ( i < RlistSize - 1 ) + && ( DElist[ i + 1 ].RPM < tmpV ) ) { + ++i; + } + RventRot = + ( tmpV - DElist[ i ].RPM ) + / std::max( 1.0, ( DElist[ i + 1 ].RPM - DElist[ i ].RPM ) ) + * ( DElist[ i + 1 ].GenPower - DElist[ i ].GenPower ) + + DElist[ i ].GenPower; + } + else { + RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); + } + break; } - break; - } - } + case ElectricSeriesMotor: { + switch( RVentType ) { + case 1: { // manual + if( ( ActiveDir != 0 ) + && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { + RventRot += ( RVentnmax - RventRot ) * RVentSpeed * dt; + } + else { + RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); + } + break; + } + case 2: { // automatic + if( ( std::abs( Itot ) > RVentMinI ) + && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { + RventRot += ( RVentnmax * abs( Itot ) / ( ImaxLo * RList[ MainCtrlActualPos ].Bn ) - RventRot ) * RVentSpeed * dt; + } + else if( ( DynamicBrakeType == dbrake_automatic ) + && ( true == DynamicBrakeFlag ) ) { + RventRot += ( RVentnmax * Im / ImaxLo - RventRot ) * RVentSpeed * dt; + } + else { + RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); + } + break; + } + default: { + break; + } + } // rventtype + } + case DieselElectric: { + // TBD, TODO: currently ignores RVentType, fix this? + RventRot += clamp( DElist[ MainCtrlPos ].RPM - RventRot, -100.0, 50.0 ) * dt; + break; + } + case DieselEngine: + default: { + break; + } + } // enginetype } + else { + RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); + } + RventRot = std::max( 0.0, RventRot ); if (ActiveDir != 0) switch (EngineType) @@ -4397,7 +4441,7 @@ double TMoverParameters::TractionForce(double dt) case DieselElectric: // youBy { // tmpV:=V*CabNo*ActiveDir; - tmpV = nrot * Pirazy2 * 0.5 * WheelDiameter * DirAbsolute; //*CabNo*ActiveDir; + auto const tmpV { nrot * Pirazy2 * 0.5 * WheelDiameter * DirAbsolute }; //*CabNo*ActiveDir; // jazda manewrowa if (ShuntMode) { @@ -4665,7 +4709,6 @@ double TMoverParameters::TractionForce(double dt) MainSwitch( false, ( TrainType == dt_EZT ? range::unit : range::local ) ); // TODO: check whether we need to send this EMU-wide } } - tmpV = abs(nrot) * (PI * WheelDiameter) * 3.6; //*DirAbsolute*eimc[eimc_s_p]; - do przemyslenia dzialanie pp if ((Mains)) { @@ -4835,20 +4878,6 @@ double TMoverParameters::TractionForce(double dt) Itot = eimv[eimv_Ipoj] * (0.01 + Min0R(0.99, 0.99 - Vadd)); EnginePower = abs(eimv[eimv_Ic] * eimv[eimv_U] * NPoweredAxles) / 1000; - tmpV = eimv[eimv_fp]; - if (((abs(eimv[eimv_If]) > 1) || (abs(tmpV) > 0.1)) && (RlistSize > 0)) - { - i = 0; - while ((i < RlistSize - 1) && (DElist[i + 1].RPM < abs(tmpV))) - i++; - RventRot = - ( std::abs( tmpV ) - DElist[ i ].RPM ) - / std::max( 1.0, ( DElist[ i + 1 ].RPM - DElist[ i ].RPM ) ) - * ( DElist[ i + 1 ].GenPower - DElist[ i ].GenPower ) - + DElist[ i ].GenPower; - } - else - RventRot = 0; Mm = eimv[eimv_M] * DirAbsolute; Mw = Mm * Transmision.Ratio; diff --git a/Train.cpp b/Train.cpp index cbcb6666..953f0d82 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5285,6 +5285,7 @@ TTrain::update_sounds( double const Deltatime ) { // szum w czasie jazdy if( ( false == FreeFlyModeFlag ) + && ( false == Global::CabWindowOpen ) && ( DynamicObject->GetVelocity() > 0.5 ) ) { volume = rsRunningNoise.m_amplitudefactor * mvOccupied->Vel + rsRunningNoise.m_amplitudeoffset; diff --git a/sound.cpp b/sound.cpp index 3eda5d0b..a9aa7a09 100644 --- a/sound.cpp +++ b/sound.cpp @@ -331,7 +331,7 @@ void sound_source::play_combined() { // combined sound consists of table od samples, each sample associated with certain range of values of controlling variable // current value of the controlling variable is passed to the source with pitch() call - auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 99.f ) }; + auto const soundpoint { compute_combined_point() }; for( std::uint32_t idx = 0; idx < m_soundchunks.size(); ++idx ) { auto const &soundchunk { m_soundchunks[ idx ] }; @@ -376,6 +376,18 @@ sound_source::play_combined() { } } +// calculates requested sound point, used to select specific sample from the sample table +float +sound_source::compute_combined_point() const { + + return ( + m_properties.pitch < 1.1f ? + // most sounds use 0-1 value range, we clamp these to 0-99 to allow more intuitive sound definition in .mmd files + clamp( m_properties.pitch, 0.f, 0.99f ) : + std::max( 0.f, m_properties.pitch ) + ) * 100.f; +} + // stops currently active play commands controlled by this emitter void sound_source::stop( bool const Skipend ) { @@ -520,7 +532,7 @@ sound_source::update_combined( audio::openal_source &Source ) { if( ( soundhandle & sound_id::chunk ) != 0 ) { // for sound chunks, test whether the chunk should still be active given current value of the controlling variable - auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 99.f ) }; + auto const soundpoint { compute_combined_point() }; auto const &soundchunk { m_soundchunks[ soundhandle ^ sound_id::chunk ] }; if( ( soundpoint < soundchunk.second.fadein ) || ( soundpoint > soundchunk.second.fadeout ) ) { @@ -598,7 +610,7 @@ sound_source::update_crossfade( sound_handle const Chunk ) { return; } - auto const soundpoint { clamp( m_properties.pitch * 100.f, 0.f, 99.f ) }; + auto const soundpoint { compute_combined_point() }; // NOTE: direct access to implementation details ahead, kinda fugly auto const chunkindex { Chunk ^ sound_id::chunk }; diff --git a/sound.h b/sound.h index 08bed00a..96fc8935 100644 --- a/sound.h +++ b/sound.h @@ -150,6 +150,9 @@ private: play_basic(); void play_combined(); + // calculates requested sound point, used to select specific sample from the sample table + float + compute_combined_point() const; void update_basic( audio::openal_source &Source ); void From 61a2511e1f4cca5335583fbfd6dc7f2bdde809d8 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 23 Dec 2017 16:58:12 +0100 Subject: [PATCH 238/426] partial unification of sound definition and handling for different vehicle types --- DynObj.cpp | 766 ++++++++++++++++++++++----------------------- DynObj.h | 46 ++- McZapkie/Mover.cpp | 41 ++- Train.cpp | 6 +- World.cpp | 20 +- sound.cpp | 3 +- 6 files changed, 462 insertions(+), 420 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 61d69e0b..1fd73538 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1666,14 +1666,12 @@ TDynamicObject::TDynamicObject() { //smMechanik0 = smMechanik1 = NULL; smBuforLewy[0] = smBuforLewy[1] = NULL; smBuforPrawy[0] = smBuforPrawy[1] = NULL; - enginevolume = 0; smBogie[0] = smBogie[1] = NULL; bogieRot[0] = bogieRot[1] = vector3(0, 0, 0); modelRot = vector3(0, 0, 0); eng_vol_act = 0.8; eng_dfrq = 0; eng_frq_act = 1; - eng_turbo = 0; cp1 = cp2 = sp1 = sp2 = 0; iDirection = 1; // stoi w kierunku tradycyjnym (0, gdy jest odwrócony) iAxleFirst = 0; // numer pierwszej osi w kierunku ruchu (przełączenie @@ -3604,350 +3602,30 @@ void TDynamicObject::TurnOff() // przeliczanie dźwięków, bo będzie słychać bez wyświetlania sektora z pojazdem void TDynamicObject::RenderSounds() { - // McZapkie-010302: ulepszony dzwiek silnika - double frequency { 1.0 }; - double volume { 0.0 }; - double const dt { Timer::GetDeltaRenderTime() }; - if( Global::iPause != 0 ) { return; } - // engine sounds - if( MoverParameters->Power > 0 ) { + double const dt { Timer::GetDeltaRenderTime() }; + double volume { 0.0 }; + double frequency { 1.0 }; - if( ( true == MoverParameters->Mains ) - || ( MoverParameters->EngineType == DieselEngine ) ) { - - if( ( std::fabs( MoverParameters->enrot ) > 0.01 ) - // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach - || ( MoverParameters->EngineType == Dumb ) ) { - - // frequency calculation - auto normalizer { 1.f }; - // for combined sound engine we calculate sound point in rpm, to make .mmd files setup easier - switch( MoverParameters->EngineType ) { - case DieselElectric: { - if( true == sConverter.is_combined() ) { - normalizer = 60.f * 0.01f; - } - break; - } - default: { - if( true == rsSilnik.is_combined() ) { - normalizer = 60.f * 0.01f; - } - break; - } - } - frequency = rsSilnik.m_frequencyfactor * std::abs( MoverParameters->enrot ) * normalizer + rsSilnik.m_frequencyoffset; - if( MoverParameters->EngineType == Dumb ) { - frequency -= 0.2 * MoverParameters->EnginePower / ( 1 + MoverParameters->Power * 1000 ); - } - - // base volume calculation - switch( MoverParameters->EngineType ) { - case DieselEngine: { - if( MoverParameters->enrot > 0.0 ) { - if( MoverParameters->EnginePower > 0 ) { - volume = rsSilnik.m_amplitudefactor * MoverParameters->dizel_fill + rsSilnik.m_amplitudeoffset; - } - else { - volume = rsSilnik.m_amplitudefactor * std::fabs( MoverParameters->enrot / MoverParameters->dizel_nmax ) + rsSilnik.m_amplitudeoffset * 0.9f; - } - } - else { - volume = 0.f; - } - break; - } - case DieselElectric: { - volume = - rsSilnik.m_amplitudefactor * ( MoverParameters->EnginePower / 1000 / MoverParameters->Power ) - + 0.2 * ( MoverParameters->enrot * 60 ) / ( MoverParameters->DElist[ MoverParameters->MainCtrlPosNo ].RPM ) - + rsSilnik.m_amplitudeoffset; - break; - } - case ElectricInductionMotor: { - volume = - rsSilnik.m_amplitudefactor * ( MoverParameters->EnginePower + std::fabs( MoverParameters->enrot * 2 ) ) - + rsSilnik.m_amplitudeoffset; - break; - } - // NOTE: default case also covers electric motors - default: { - volume = - rsSilnik.m_amplitudefactor * ( MoverParameters->EnginePower / 1000 + std::fabs( MoverParameters->enrot ) * 60.0 ) - + rsSilnik.m_amplitudeoffset; - break; - } - } - - if( MoverParameters->EngineType == ElectricSeriesMotor ) { - - // volume variation - if( ( volume < 1.0 ) - && ( MoverParameters->EnginePower < 100 ) ) { - - auto const volumevariation{ Random( 100 ) * MoverParameters->enrot / ( 1 + MoverParameters->nmax ) }; - if( volumevariation < 2 ) { - volume += volumevariation / 200; - } - } - - if( ( MoverParameters->DynamicBrakeFlag ) - && ( MoverParameters->EnginePower > 0.1 ) ) { - // Szociu - 29012012 - jeżeli uruchomiony jest hamulec elektrodynamiczny, odtwarzany jest dźwięk silnika - volume += 0.8; - } - } - - // volume environmental factor - switch( MyTrack->eEnvironment ) { - case e_tunnel: { - volume += 0.1; - break; - } - case e_canyon: { - volume += 0.05; - break; - } - default: { - break; - } - } - - if( enginevolume >= 0.05 ) { - - if( MoverParameters->EngineType != DieselElectric ) { - - rsSilnik - .pitch( frequency ) - .gain( enginevolume ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - - if( MoverParameters->ConverterFlag ) { - - sConverter - .pitch( frequency ) - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); - - float fincvol { 0 }; - if( MoverParameters->enrot * 60 > MoverParameters->DElist[ 0 ].RPM ) { - - fincvol = ( MoverParameters->DElist[ MoverParameters->MainCtrlPos ].RPM - ( MoverParameters->enrot * 60 ) ); - fincvol /= ( 0.05 * MoverParameters->DElist[ 0 ].RPM ); - } - - if( fincvol > 0.02 ) { - rsDieselInc - .gain( fincvol ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - rsDieselInc.stop(); - } - } - } - } - } - else { - rsSilnik.stop(); - } - } - enginevolume = ( enginevolume + volume ) * 0.5; - if( enginevolume < 0.05 ) { - rsSilnik.stop(); - } -/* -// NOTE: experimentally disabled to see if it's still used anywhere - if (MoverParameters->TrainType == dt_PseudoDiesel) - { - // ABu: udawanie woodwarda dla lok. spalinowych - // jesli silnik jest podpiety pod dzwiek przetwornicy - - // glosnosc zalezy od stosunku mocy silnika el. do mocy max - double eng_vol; - if (MoverParameters->Power > 1) - // 0.85+0.000015*(...) - eng_vol = 0.8 + 0.00002 * (MoverParameters->EnginePower / MoverParameters->Power); - else - eng_vol = 1; - - eng_dfrq = eng_dfrq + (eng_vol_act - eng_vol); - if (eng_dfrq > 0) - { - eng_dfrq = eng_dfrq - 0.025 * dt; - if (eng_dfrq < 0.025 * dt) - eng_dfrq = 0; - } - else if (eng_dfrq < 0) - { - eng_dfrq = eng_dfrq + 0.025 * dt; - if (eng_dfrq > -0.025 * dt) - eng_dfrq = 0; - } - double defrot; - if (MoverParameters->MainCtrlPos != 0) - { - double CtrlPos = MoverParameters->MainCtrlPos; - double CtrlPosNo = MoverParameters->MainCtrlPosNo; - // defrot=1+0.4*(CtrlPos/CtrlPosNo); - defrot = 1 + 0.5 * (CtrlPos / CtrlPosNo); - } - else - defrot = 1; - - if (eng_frq_act < defrot) - { - // if (MoverParameters->MainCtrlPos==1) eng_frq_act=eng_frq_act+0.1*dt; - eng_frq_act = eng_frq_act + 0.4 * dt; // 0.05 - if (eng_frq_act > defrot - 0.4 * dt) - eng_frq_act = defrot; - } - else if (eng_frq_act > defrot) - { - eng_frq_act = eng_frq_act - 0.1 * dt; // 0.05 - if (eng_frq_act < defrot + 0.1 * dt) - eng_frq_act = defrot; - } - sConverter.UpdateAF(eng_vol_act, eng_frq_act + eng_dfrq, MechInside, GetPosition()); - // udawanie turbo: (6.66*(eng_vol-0.85)) - if (eng_turbo > 6.66 * (eng_vol - 0.8) + 0.2 * dt) - eng_turbo = eng_turbo - 0.2 * dt; // 0.125 - else if (eng_turbo < 6.66 * (eng_vol - 0.8) - 0.4 * dt) - eng_turbo = eng_turbo + 0.4 * dt; // 0.333 - else - eng_turbo = 6.66 * (eng_vol - 0.8); - - sTurbo.TurnOn(MechInside, GetPosition()); - // sTurbo.UpdateAF(eng_turbo,0.7+(eng_turbo*0.6),MechInside,GetPosition()); - sTurbo.UpdateAF(3 * eng_turbo - 1, 0.4 + eng_turbo * 0.4, MechInside, GetPosition()); - eng_vol_act = eng_vol; - // eng_frq_act=eng_frq; - } -*/ - if( ( MoverParameters->EngineType == ElectricSeriesMotor ) - || ( MoverParameters->EngineType == ElectricInductionMotor ) ) { - - if( MoverParameters->RventRot > 0.1 ) { - // play ventilator sound if the ventilators are rotating fast enough... - volume = ( - MoverParameters->EngineType == ElectricInductionMotor ? - rsWentylator.m_amplitudefactor * std::sqrt( std::fabs( MoverParameters->dizel_fill ) ) + rsWentylator.m_amplitudeoffset : - rsWentylator.m_amplitudefactor * MoverParameters->RventRot + rsWentylator.m_amplitudeoffset ); - - rsWentylator - .pitch( rsWentylator.m_frequencyfactor * MoverParameters->RventRot + rsWentylator.m_frequencyoffset ) - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - // ...otherwise shut down the sound - rsWentylator.stop(); - } - } - - - if( MoverParameters->TrainType == dt_ET40 ) { - if( MoverParameters->Vel > 0.1 ) { - rsPrzekladnia - .pitch( rsPrzekladnia.m_frequencyfactor * ( MoverParameters->Vel ) + rsPrzekladnia.m_frequencyoffset ) - .gain( rsPrzekladnia.m_amplitudefactor * ( MoverParameters->Vel ) + rsPrzekladnia.m_amplitudeoffset ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - rsPrzekladnia.stop(); - } - } - - - if( MoverParameters->dizel_engage > 0.1 ) { - if( std::abs( MoverParameters->dizel_engagedeltaomega ) > 0.2 ) { - - frequency = rsEngageSlippery.m_frequencyfactor * std::fabs( MoverParameters->dizel_engagedeltaomega ) + rsEngageSlippery.m_frequencyoffset; - volume = rsEngageSlippery.m_amplitudefactor * ( MoverParameters->dizel_engage ) + rsEngageSlippery.m_amplitudeoffset; - } - else { - frequency = 1.f; // rsEngageSlippery.FA+0.7*rsEngageSlippery.FM*(fabs(mvControlled->enrot)+mvControlled->nmax); - volume = ( - MoverParameters->dizel_engage > 0.2 ? - 0.2 * rsEngageSlippery.m_amplitudefactor * ( MoverParameters->enrot / MoverParameters->nmax ) + rsEngageSlippery.m_amplitudeoffset : - 0.f ); - } - rsEngageSlippery - .pitch( frequency ) - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - rsEngageSlippery.stop(); - } - - - // youBy - przenioslem, bo diesel tez moze miec turbo - if( MoverParameters->TurboTest > 0 ) { - // udawanie turbo: - auto const goalpitch { 6.66 * ( enginevolume - 0.8 ) }; - auto const goalvolume{ 3 * eng_turbo - 1 }; - auto const currentvolume { sTurbo.gain() }; - auto const changerate{ 0.4 * dt }; - - if( ( MoverParameters->MainCtrlPos >= MoverParameters->TurboTest ) - && ( MoverParameters->enrot > 0.1 ) ) { - - eng_turbo = ( - eng_turbo > goalpitch ? - std::max( goalpitch, eng_turbo - changerate * 0.5 ) : - std::min( goalpitch, eng_turbo + changerate ) ); - - volume = ( - currentvolume > goalvolume ? - std::max( goalvolume, currentvolume - changerate ) : - std::min( goalvolume, currentvolume + changerate ) ); - - sTurbo - .pitch( eng_turbo * 0.4 + 0.4 ) - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - eng_turbo = std::max( goalpitch, eng_turbo - changerate * 0.5 ); - volume = std::max( 0.0, sTurbo.gain() - 2.0 * dt ); - if( volume > 0.05 ) { - sTurbo - .pitch( 0.4 + eng_turbo * 0.4 ) - .gain( volume ); - } - else { - sTurbo.stop(); - } - } - } - - - // diesel startup - if( MoverParameters->EngineType == DieselEngine ) { - if( true == MoverParameters->dizel_enginestart ) { - dsbDieselIgnition.play( sound_flags::exclusive | sound_flags::looping ); - } - else { - dsbDieselIgnition.stop(); - } - } - - } // if enginepower + m_powertrainsounds.render( *MoverParameters, dt ); // NBMX dzwiek przetwornicy if( MoverParameters->ConverterFlag ) { - sConverter.play( sound_flags::exclusive | sound_flags::looping ); + frequency = ( + MoverParameters->EngineType == ElectricSeriesMotor ? + MoverParameters->Voltage / ( MoverParameters->NominalVoltage * MoverParameters->RList[ MoverParameters->RlistSize ].Mn ) : + 1.0 ); + frequency = sConverter.m_frequencyoffset + sConverter.m_frequencyfactor * frequency; + sConverter + .pitch( clamp( frequency, 0.5, 1.25 ) ) // arbitrary limits ) + .play( sound_flags::exclusive | sound_flags::looping ); } else { sConverter.stop(); } - if( MoverParameters->VeselVolume != 0 ) { + if( MoverParameters->VeselVolume > 0 ) { // McZapkie! - dzwiek compressor.wav tylko gdy dziala sprezarka if( MoverParameters->CompressorFlag ) { sCompressor.play( sound_flags::exclusive | sound_flags::looping ); @@ -4009,7 +3687,7 @@ void TDynamicObject::RenderSounds() { auto const velocitydifference { GetVelocity() / MoverParameters->Vmax }; rsSlippery - .gain( rsSlippery.m_amplitudefactor * velocitydifference + rsSlippery.m_amplitudeoffset ) + .gain( rsSlippery.m_amplitudeoffset + rsSlippery.m_amplitudefactor * velocitydifference ) .play( sound_flags::exclusive | sound_flags::looping ); } } @@ -4242,12 +3920,12 @@ void TDynamicObject::RenderSounds() { // przekaznik - gdy bezpiecznik, automatyczny rozruch itp if( true == TestFlag( MoverParameters->SoundFlag, sound::parallel ) ) { if( TestFlag( MoverParameters->SoundFlag, sound::loud ) ) - dsbWejscie_na_bezoporow.play(); + m_powertrainsounds.dsbWejscie_na_bezoporow.play(); else - dsbWejscie_na_drugi_uklad.play(); + m_powertrainsounds.motor_parallel.play(); } else { - dsbRelay + m_powertrainsounds.motor_relay .gain( true == TestFlag( MoverParameters->SoundFlag, sound::loud ) ? 1.0f : @@ -5055,25 +4733,35 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( ( token == "engine:" ) && ( MoverParameters->Power > 0 ) ) { // plik z dzwiekiem silnika, mnozniki i ofsety amp. i czest. - rsSilnik.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); - rsSilnik.owner( this ); + m_powertrainsounds.engine.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); + m_powertrainsounds.engine.owner( this ); auto const amplitudedivisor = static_cast( ( - MoverParameters->EngineType == DieselEngine ? MoverParameters->Power + MoverParameters->nmax * 60 : + MoverParameters->EngineType == DieselEngine ? MoverParameters->nmax * 60 + MoverParameters->Power : MoverParameters->EngineType == DieselElectric ? MoverParameters->Power * 3 : - MoverParameters->Power + MoverParameters->nmax * 60 + MoverParameters->Power + MoverParameters->Power ) ); - rsSilnik.m_amplitudefactor /= amplitudedivisor; + MoverParameters->nmax * 60 + MoverParameters->Power * 3 ) ); + m_powertrainsounds.engine.m_amplitudefactor /= amplitudedivisor; } + else if( ( token == "tractionmotor:" ) + && ( MoverParameters->Power > 0 ) ) { + // plik z dzwiekiem silnika, mnozniki i ofsety amp. i czest. + m_powertrainsounds.motor.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); + m_powertrainsounds.motor.owner( this ); + + auto const amplitudedivisor = static_cast( MoverParameters->nmax * 60 + MoverParameters->Power * 3 ); + m_powertrainsounds.motor.m_amplitudefactor /= amplitudedivisor; + } + else if( token == "ventilator:" ) { // plik z dzwiekiem wentylatora, mnozniki i ofsety amp. i czest. - rsWentylator.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); - rsWentylator.owner( this ); + m_powertrainsounds.rsWentylator.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); + m_powertrainsounds.rsWentylator.owner( this ); if( ( MoverParameters->EngineType == ElectricSeriesMotor ) || ( MoverParameters->EngineType == ElectricInductionMotor ) ) { - rsWentylator.m_amplitudefactor /= MoverParameters->RVentnmax; - rsWentylator.m_frequencyfactor /= MoverParameters->RVentnmax; + m_powertrainsounds.rsWentylator.m_amplitudefactor /= MoverParameters->RVentnmax; + m_powertrainsounds.rsWentylator.m_frequencyfactor /= MoverParameters->RVentnmax; } } @@ -5081,13 +4769,13 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, && ( MoverParameters->EngineType == ElectricSeriesMotor ) ) { // plik z dzwiekiem, mnozniki i ofsety amp. i czest. // NOTE, fixed default parameters, legacy system leftover - rsPrzekladnia.m_amplitudefactor = 0.029; - rsPrzekladnia.m_amplitudeoffset = 0.1; - rsPrzekladnia.m_frequencyfactor = 0.005; - rsPrzekladnia.m_frequencyoffset = 1.0; + m_powertrainsounds.transmission.m_amplitudefactor = 0.029; + m_powertrainsounds.transmission.m_amplitudeoffset = 0.1; + m_powertrainsounds.transmission.m_frequencyfactor = 0.005; + m_powertrainsounds.transmission.m_frequencyoffset = 1.0; - rsPrzekladnia.deserialize( parser, sound_type::single, sound_parameters::range ); - rsPrzekladnia.owner( this ); + m_powertrainsounds.transmission.deserialize( parser, sound_type::single, sound_parameters::range ); + m_powertrainsounds.transmission.owner( this ); } else if( token == "brake:" ) { @@ -5120,8 +4808,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( token == "dieselinc:" ) { // dzwiek przy wlazeniu na obroty woodwarda - rsDieselInc.deserialize( parser, sound_type::single, sound_parameters::range ); - rsDieselInc.owner( this ); + m_powertrainsounds.engine_revving.deserialize( parser, sound_type::single, sound_parameters::range ); + m_powertrainsounds.engine_revving.owner( this ); } else if( token == "curve:" ) { @@ -5185,8 +4873,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( token == "turbo:" ) { // pliki z turbogeneratorem - sTurbo.deserialize( parser, sound_type::multipart, sound_parameters::range ); - sTurbo.owner( this ); + m_powertrainsounds.engine_turbo.deserialize( parser, sound_type::multipart, sound_parameters::range ); + m_powertrainsounds.engine_turbo.owner( this ); } else if( token == "small-compressor:" ) { @@ -5259,20 +4947,20 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // engine sounds else if( token == "ignition:" ) { // odpalanie silnika - dsbDieselIgnition.deserialize( parser, sound_type::single ); - dsbDieselIgnition.owner( this ); + m_powertrainsounds.engine_ignition.deserialize( parser, sound_type::single ); + m_powertrainsounds.engine_ignition.owner( this ); } else if( token == "engageslippery:" ) { // tarcie tarcz sprzegla: - rsEngageSlippery.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); - rsEngageSlippery.owner( this ); + m_powertrainsounds.rsEngageSlippery.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + m_powertrainsounds.rsEngageSlippery.owner( this ); - rsEngageSlippery.m_frequencyfactor /= ( 1 + MoverParameters->nmax ); + m_powertrainsounds.rsEngageSlippery.m_frequencyfactor /= ( 1 + MoverParameters->nmax ); } else if( token == "relay:" ) { // styczniki itp: - dsbRelay.deserialize( parser, sound_type::single ); - dsbRelay.owner( this ); + m_powertrainsounds.motor_relay.deserialize( parser, sound_type::single ); + m_powertrainsounds.motor_relay.owner( this ); } else if( token == "pneumaticrelay:" ) { // wylaczniki pneumatyczne: @@ -5281,12 +4969,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else if( token == "wejscie_na_bezoporow:" ) { // hunter-111211: wydzielenie wejscia na bezoporowa i na drugi uklad do pliku - dsbWejscie_na_bezoporow.deserialize( parser, sound_type::single ); - dsbWejscie_na_bezoporow.owner( this ); + m_powertrainsounds.dsbWejscie_na_bezoporow.deserialize( parser, sound_type::single ); + m_powertrainsounds.dsbWejscie_na_bezoporow.owner( this ); } else if( token == "wejscie_na_drugi_uklad:" ) { - dsbWejscie_na_drugi_uklad.deserialize( parser, sound_type::single ); - dsbWejscie_na_drugi_uklad.owner( this ); + m_powertrainsounds.motor_parallel.deserialize( parser, sound_type::single ); + m_powertrainsounds.motor_parallel.owner( this ); } // braking sounds else if( token == "brakesound:" ) { @@ -5356,14 +5044,14 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // assign default samples to sound emitters which weren't included in the config file // engine if( MoverParameters->Power > 0 ) { - if( true == dsbWejscie_na_bezoporow.empty() ) { + if( true == m_powertrainsounds.dsbWejscie_na_bezoporow.empty() ) { // hunter-111211: domyslne, gdy brak - dsbWejscie_na_bezoporow.deserialize( "wejscie_na_bezoporow.wav", sound_type::single ); - dsbWejscie_na_bezoporow.owner( this ); + m_powertrainsounds.dsbWejscie_na_bezoporow.deserialize( "wejscie_na_bezoporow.wav", sound_type::single ); + m_powertrainsounds.dsbWejscie_na_bezoporow.owner( this ); } - if( true == dsbWejscie_na_drugi_uklad.empty() ) { - dsbWejscie_na_drugi_uklad.deserialize( "wescie_na_drugi_uklad.wav", sound_type::single ); - dsbWejscie_na_drugi_uklad.owner( this ); + if( true == m_powertrainsounds.motor_parallel.empty() ) { + m_powertrainsounds.motor_parallel.deserialize( "wescie_na_drugi_uklad.wav", sound_type::single ); + m_powertrainsounds.motor_parallel.owner( this ); } } // braking sounds @@ -5409,22 +5097,20 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, Global::asCurrentDynamicPath = ""; // position sound emitters which weren't defined in the config file - auto const nullvector { glm::vec3() }; - // engine sounds , centre of the vehicle + // engine sounds, centre of the vehicle auto const enginelocation { glm::vec3 {0.f, MoverParameters->Dim.H * 0.5f, 0.f } }; + m_powertrainsounds.position( enginelocation ); + // other engine compartment sounds + auto const nullvector { glm::vec3() }; std::vector enginesounds = { - &dsbDieselIgnition, - &rsSilnik, - &dsbRelay, &dsbWejscie_na_bezoporow, &dsbWejscie_na_drugi_uklad, - &rsPrzekladnia, &rsEngageSlippery, &rsDieselInc, &sTurbo, - &rsWentylator, &sConverter, &sCompressor, &sSmallCompressor + &sConverter, &sCompressor, &sSmallCompressor }; for( auto sound : enginesounds ) { if( sound->offset() == nullvector ) { sound->offset( enginelocation ); } } - // TODO: other sound types + // pantographs if( pants != nullptr ) { std::size_t pantographindex { 0 }; @@ -5945,6 +5631,320 @@ TDynamicObject::ConnectedEnginePowerSource( TDynamicObject const *Caller ) const } +void +TDynamicObject::powertrain_sounds::position( glm::vec3 const Location ) { + + auto const nullvector { glm::vec3() }; + std::vector enginesounds = { + &motor_relay, &dsbWejscie_na_bezoporow, &motor_parallel, &rsWentylator, + &engine, &engine_ignition, &engine_revving, &engine_turbo, + &transmission, &rsEngageSlippery + }; + for( auto sound : enginesounds ) { + if( sound->offset() == nullvector ) { + sound->offset( Location ); + } + } +} + +void +TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, double const Deltatime ) { + + if( Vehicle.Power == 0 ) { return; } + + double frequency { 1.0 }; + double volume { 0.0 }; + + // engine sounds + if( ( true == Vehicle.Mains ) + && ( false == Vehicle.dizel_enginestart ) ) { + + if( ( std::fabs( Vehicle.enrot ) > 0.01 ) + // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach + || ( Vehicle.EngineType == Dumb ) ) { + + // frequency calculation + auto normalizer { 1.f }; + if( true == engine.is_combined() ) { + // for combined engine sound we calculate sound point in rpm, to make .mmd files setup easier + // NOTE: we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range + normalizer = 60.f * 0.01f; + } + frequency = + engine.m_frequencyoffset + + engine.m_frequencyfactor * std::abs( Vehicle.enrot ) * normalizer; + + if( Vehicle.EngineType == Dumb ) { + frequency -= 0.2 * Vehicle.EnginePower / ( 1 + Vehicle.Power * 1000 ); + } + + // base volume calculation + switch( Vehicle.EngineType ) { + // TODO: check calculated values + case DieselElectric: { + volume = + engine.m_amplitudeoffset + + engine.m_amplitudefactor * ( Vehicle.EnginePower / 1000 / Vehicle.Power ) + + 0.2 * ( Vehicle.enrot * 60 ) / ( Vehicle.DElist[ Vehicle.MainCtrlPosNo ].RPM ); + break; + } + case DieselEngine: { + if( Vehicle.enrot > 0.0 ) { + volume = ( + Vehicle.EnginePower > 0 ? + engine.m_amplitudeoffset + engine.m_amplitudefactor * Vehicle.dizel_fill : + engine.m_amplitudeoffset * 0.9f + engine.m_amplitudefactor * std::fabs( Vehicle.enrot / Vehicle.dizel_nmax ) ); + } + break; + } + default: { + volume = + engine.m_amplitudeoffset + + engine.m_amplitudefactor * ( Vehicle.EnginePower / 1000 + std::fabs( Vehicle.enrot ) * 60.0 ); + break; + } + } + + if( engine_volume >= 0.05 ) { + engine + .pitch( frequency ) + .gain( engine_volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + + if( ( Vehicle.EngineType == DieselElectric ) + || ( Vehicle.EngineType == DieselEngine ) ) { + // diesel engine revolutions increase + float enginerevvolume { 0 }; + if( engine_revs_last != -1.f ) { + // calculate potential recent increase of engine revolutions + auto const revolutionsperminute { Vehicle.enrot * 60 }; + auto const revolutionsdifference { revolutionsperminute - engine_revs_last }; + auto const idlerevolutionsthreshold { 1.01 * ( + Vehicle.EngineType == DieselElectric ? + Vehicle.DElist[ 0 ].RPM : + Vehicle.dizel_nmin * 60 ) }; + + engine_revs_change = std::max( 0.0, engine_revs_change - 2.5 * Deltatime ); + if( ( revolutionsperminute > idlerevolutionsthreshold ) + && ( revolutionsdifference > 1.0 * Deltatime ) ) { + engine_revs_change = clamp( engine_revs_change + 5.0 * Deltatime, 0.0, 1.25 ); + } + enginerevvolume = engine_revs_change; + } + engine_revs_last = Vehicle.enrot * 60; + + if( enginerevvolume > 0.02 ) { + engine_revving + .gain( enginerevvolume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + engine_revving.stop(); + } + } + } // enginevolume > 0.05 + } + else { + engine.stop(); + } + } + engine_volume = interpolate( engine_volume, volume, 0.25 ); + if( engine_volume < 0.05 ) { + engine.stop(); + } + + + // youBy - przenioslem, bo diesel tez moze miec turbo + if( Vehicle.TurboTest > 0 ) { + // udawanie turbo: + auto const goalpitch { std::max( 0.025, ( engine_volume + engine_turbo.m_frequencyoffset ) * engine_turbo.m_frequencyfactor ) }; + auto const goalvolume { std::max( 0.0, ( engine_turbo_pitch + engine_turbo.m_amplitudeoffset ) * engine_turbo.m_amplitudefactor ) }; + auto const currentvolume { engine_turbo.gain() }; + auto const changerate { 0.4 * Deltatime }; + + if( ( Vehicle.MainCtrlPos >= Vehicle.TurboTest ) + && ( Vehicle.enrot > 0.1 ) ) { + + engine_turbo_pitch = ( + engine_turbo_pitch > goalpitch ? + std::max( goalpitch, engine_turbo_pitch - changerate * 0.5 ) : + std::min( goalpitch, engine_turbo_pitch + changerate ) ); + + volume = ( + currentvolume > goalvolume ? + std::max( goalvolume, currentvolume - changerate ) : + std::min( goalvolume, currentvolume + changerate ) ); + + engine_turbo + .pitch( 0.4 + engine_turbo_pitch * 0.4 ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + engine_turbo_pitch = std::max( goalpitch, engine_turbo_pitch - changerate * 0.5 ); + volume = std::max( 0.0, engine_turbo.gain() - 2.0 * Deltatime ); + if( volume > 0.05 ) { + engine_turbo + .pitch( 0.4 + engine_turbo_pitch * 0.4 ) + .gain( volume ); + } + else { + engine_turbo.stop(); + engine_turbo_pitch = goalpitch; + } + } + } + + // diesel startup + if( ( Vehicle.EngineType == DieselEngine ) + || ( Vehicle.EngineType == DieselElectric ) ) { + + if( true == Vehicle.dizel_enginestart ) { + engine_ignition.play( sound_flags::exclusive ); + } + } + + + if( Vehicle.dizel_engage > 0.1 ) { + if( std::abs( Vehicle.dizel_engagedeltaomega ) > 0.2 ) { + frequency = rsEngageSlippery.m_frequencyoffset + rsEngageSlippery.m_frequencyfactor * std::fabs( Vehicle.dizel_engagedeltaomega ); + volume = rsEngageSlippery.m_amplitudeoffset + rsEngageSlippery.m_amplitudefactor * ( Vehicle.dizel_engage ); + } + else { + frequency = 1.f; // rsEngageSlippery.FA+0.7*rsEngageSlippery.FM*(fabs(mvControlled->enrot)+mvControlled->nmax); + volume = ( + Vehicle.dizel_engage > 0.2 ? + rsEngageSlippery.m_amplitudeoffset + 0.2 * rsEngageSlippery.m_amplitudefactor * ( Vehicle.enrot / Vehicle.nmax ) : + 0.f ); + } + + rsEngageSlippery + .pitch( frequency ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsEngageSlippery.stop(); + } + + // motor sounds + volume = 0.0; + if( ( true == Vehicle.Mains ) + && ( false == Vehicle.dizel_enginestart ) ) { + + if( std::fabs( Vehicle.enrot ) > 0.01 ) { + + // frequency calculation + auto normalizer { 1.f }; + if( true == motor.is_combined() ) { + // for combined motor sound we calculate sound point in rpm, to make .mmd files setup easier + // NOTE: we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range + normalizer = 60.f * 0.01f; + } + auto const motorrevolutions { std::abs( Vehicle.nrot ) * Vehicle.Transmision.Ratio }; + frequency = + motor.m_frequencyoffset + + motor.m_frequencyfactor * motorrevolutions * normalizer; + + // base volume calculation + switch( Vehicle.EngineType ) { + case ElectricInductionMotor: { + volume = + motor.m_amplitudeoffset + + motor.m_amplitudefactor * ( Vehicle.EnginePower + motorrevolutions * 2 ); + break; + } + case ElectricSeriesMotor: { + volume = + motor.m_amplitudeoffset + + motor.m_amplitudefactor * ( Vehicle.EnginePower / 1000 + motorrevolutions * 60.0 ); + break; + } + default: { + volume = + motor.m_amplitudeoffset + + motor.m_amplitudefactor * motorrevolutions * 60.0; + break; + } + } + + if( Vehicle.EngineType == ElectricSeriesMotor ) { + // volume variation + if( ( volume < 1.0 ) + && ( Vehicle.EnginePower < 100 ) ) { + + auto const volumevariation { Random( 100 ) * Vehicle.enrot / ( 1 + Vehicle.nmax ) }; + if( volumevariation < 2 ) { + volume += volumevariation / 200; + } + } + + if( ( Vehicle.DynamicBrakeFlag ) + && ( Vehicle.EnginePower > 0.1 ) ) { + // Szociu - 29012012 - jeżeli uruchomiony jest hamulec elektrodynamiczny, odtwarzany jest dźwięk silnika + volume += 0.8; + } + } + // scale motor volume based on whether they're active + motor_momentum = + clamp( + motor_momentum + - 1.0 * Deltatime // smooth out decay + + std::abs( Vehicle.Mm ) / 60.0 * Deltatime, + 0.0, 1.25 ); + volume *= std::max( 0.25f, motor_momentum ); + + if( motor_volume >= 0.05 ) { + motor + .pitch( frequency ) + .gain( motor_volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + } + else { + motor.stop(); + } + } + motor_volume = interpolate( motor_volume, volume, 0.25 ); + if( motor_volume < 0.05 ) { + motor.stop(); + } + + if( ( Vehicle.EngineType == ElectricSeriesMotor ) + || ( Vehicle.EngineType == ElectricInductionMotor ) ) { + + if( Vehicle.RventRot > 0.1 ) { + // play ventilator sound if the ventilators are rotating fast enough... + volume = ( + Vehicle.EngineType == ElectricInductionMotor ? + rsWentylator.m_amplitudefactor * std::sqrt( std::fabs( Vehicle.dizel_fill ) ) + rsWentylator.m_amplitudeoffset : + rsWentylator.m_amplitudefactor * Vehicle.RventRot + rsWentylator.m_amplitudeoffset ); + + rsWentylator + .pitch( rsWentylator.m_frequencyfactor * Vehicle.RventRot + rsWentylator.m_frequencyoffset ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + // ...otherwise shut down the sound + rsWentylator.stop(); + } + } + + + if( Vehicle.TrainType == dt_ET40 ) { + if( Vehicle.Vel > 0.1 ) { + transmission + .pitch( transmission.m_frequencyfactor * ( Vehicle.Vel ) + transmission.m_frequencyoffset ) + .gain( transmission.m_amplitudefactor * ( Vehicle.Vel ) + transmission.m_amplitudeoffset ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + transmission.stop(); + } + } +} + // legacy method, calculates changes in simulation state over specified time void diff --git a/DynObj.h b/DynObj.h index 9c0ed484..d245e63e 100644 --- a/DynObj.h +++ b/DynObj.h @@ -273,8 +273,8 @@ private: }; struct door_sounds { - sound_source rsDoorOpen{ sound_placement::general, 25.f }; // Ra: przeniesione z kabiny - sound_source rsDoorClose{ sound_placement::general, 25.f }; + sound_source rsDoorOpen { sound_placement::general, 25.f }; // Ra: przeniesione z kabiny + sound_source rsDoorClose { sound_placement::general, 25.f }; }; struct axle_sounds { @@ -283,6 +283,29 @@ private: sound_source clatter; // clatter emitter }; + struct powertrain_sounds { + sound_source motor { sound_placement::external }; // generally traction motor + double motor_volume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal + float motor_momentum { 0.f }; // recent change in motor revolutions + sound_source motor_relay { sound_placement::engine }; + sound_source dsbWejscie_na_bezoporow { sound_placement::engine }; // moved from cab + sound_source motor_parallel { sound_placement::engine }; // moved from cab + sound_source rsWentylator { sound_placement::engine }; // McZapkie-030302 + sound_source engine { sound_placement::engine }; // generally diesel engine + sound_source engine_ignition { sound_placement::engine }; // moved from cab + double engine_volume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal + sound_source engine_revving { sound_placement::engine }; // youBy + float engine_revs_last { -1.f }; // helper, cached rpm of the engine + float engine_revs_change { 0.f }; // recent change in engine revolutions + sound_source engine_turbo { sound_placement::engine }; + double engine_turbo_pitch { 1.0 }; + sound_source transmission { sound_placement::engine }; + sound_source rsEngageSlippery { sound_placement::engine }; // moved from cab + + void position( glm::vec3 const Location ); + void render( TMoverParameters const &Vehicle, double const Deltatime ); + }; + // methods void ABuLittleUpdate(double ObjSqrDist); double ComputeRadius( Math3D::vector3 p1, Math3D::vector3 p2, Math3D::vector3 p3, Math3D::vector3 p4); @@ -328,29 +351,35 @@ private: // int iAxles; // McZapkie: to potem mozna skasowac i zastapic iNumAxles double dRailLength { 0.0 }; std::vector m_axlesounds; -/* - double dRailPosition[MaxAxles]; // licznik pozycji osi w/m szyny - double dWheelsPosition[MaxAxles]; // pozycja osi w/m srodka pojazdu - std::vector rsStukot; // dzwieki poszczegolnych osi //McZapkie-270202 -*/ + powertrain_sounds m_powertrainsounds; // engine sounds +/* sound_source dsbDieselIgnition { sound_placement::engine }; // moved from cab sound_source rsSilnik { sound_placement::engine }; double enginevolume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal + sound_source m_tractionmotor { sound_placement::external }; sound_source dsbRelay { sound_placement::engine }; sound_source dsbWejscie_na_bezoporow { sound_placement::engine }; // moved from cab sound_source dsbWejscie_na_drugi_uklad { sound_placement::engine }; // moved from cab sound_source rsPrzekladnia { sound_placement::engine }; sound_source rsEngageSlippery { sound_placement::engine }; // moved from cab sound_source rsDieselInc { sound_placement::engine }; // youBy + float m_lastenginerevolutions { -1.f }; // helper, cached rpm of the engine + float m_enginerevolutionschange { 0.f }; // recent change of engine revolutions sound_source sTurbo { sound_placement::engine }; sound_source rsWentylator { sound_placement::engine }; // McZapkie-030302 sound_source sConverter { sound_placement::engine }; sound_source sCompressor { sound_placement::engine }; // NBMX wrzesien 2003 sound_source sSmallCompressor { sound_placement::engine }; +*/ + sound_source sConverter { sound_placement::engine }; + sound_source sCompressor { sound_placement::engine }; // NBMX wrzesien 2003 + sound_source sSmallCompressor { sound_placement::engine }; // braking sounds sound_source dsbPneumaticRelay { sound_placement::external }; sound_source rsUnbrake { sound_placement::external }; // yB - odglos luzowania + float m_lastbrakepressure { -1.f }; // helper, cached level of pressure in brake cylinder + float m_brakepressurechange { 0.f }; // recent change of pressure in brake cylinder sound_source sReleaser { sound_placement::external }; sound_source rsSlippery { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // moved from cab sound_source sSand { sound_placement::external }; @@ -372,7 +401,6 @@ private: double eng_vol_act; double eng_frq_act; double eng_dfrq; - double eng_turbo; Math3D::vector3 modelShake; bool renderme; // yB - czy renderowac @@ -380,8 +408,6 @@ private: int iInventory[ 2 ] { 0, 0 }; // flagi bitowe posiadanych submodeli (np. świateł) bool btnOn; // ABu: czy byly uzywane buttony, jesli tak, to po renderingu wylacz // bo ten sam model moze byc jeszcze wykorzystany przez inny obiekt! - float m_lastbrakepressure { -1.f }; // helper, cached level of pressure in brake cylinder - float m_brakepressurechange { 0.f }; // recent change of pressure in brake cylinder public: int iHornWarning; // numer syreny do użycia po otrzymaniu sygnału do jazdy diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 72532ec2..b7570740 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1371,9 +1371,12 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap if (AutoRelayCheck()) SetFlag(SoundFlag, sound::relay); - if (EngineType == DieselEngine) - if (dizel_Update(dt)) - SetFlag(SoundFlag, sound::relay); + if( ( EngineType == DieselEngine ) + || ( EngineType == DieselElectric ) ) { + if( dizel_Update( dt ) ) { + SetFlag( SoundFlag, sound::relay ); + } + } // uklady hamulcowe: if (VeselVolume > 0) Compressor = CompressedVolume / VeselVolume; @@ -2412,7 +2415,7 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) } } if( ( EngineType == DieselEngine ) - && ( true == Mains ) ) { + || ( EngineType == DieselElectric ) ) { dizel_enginestart = State; } @@ -5642,22 +5645,28 @@ bool TMoverParameters::dizel_AutoGearCheck(void) // ************************************************************************************************* bool TMoverParameters::dizel_Update(double dt) { - const double fillspeed = 2; - bool DU; + double const fillspeed { 2 }; + bool DU { false }; // dizel_Update:=false; - if (dizel_enginestart && (LastSwitchingTime >= InitialCtrlDelay)) - { + if( ( true == dizel_enginestart ) + && ( LastSwitchingTime >= InitialCtrlDelay ) ) { dizel_enginestart = false; LastSwitchingTime = 0; - enrot = dizel_nmin / 2.0; // TODO: dac zaleznie od temperatury i baterii + + enrot = std::max( + enrot, + 0.1 * ( // TODO: dac zaleznie od temperatury i baterii + EngineType == DieselEngine ? + dizel_nmin : + DElist[ 0 ].RPM / 60.0 ) ); + } + + if( EngineType == DieselEngine ) { + dizel_EngageChange( dt ); + DU = dizel_AutoGearCheck(); + dizel_fill = dizel_fill + fillspeed * dt * ( dizel_fillcheck( MainCtrlPos ) - dizel_fill ); } - /*OK=*/dizel_EngageChange(dt); - // if AutoRelayFlag then Poprawka na SM03 - DU = dizel_AutoGearCheck(); - // dizel_fill:=(dizel_fill+dizel_fillcheck(MainCtrlPos))/2; - dizel_fill = dizel_fill + fillspeed * dt * (dizel_fillcheck(MainCtrlPos) - dizel_fill); - // dizel_Update:=OK; return DU; } @@ -7551,6 +7560,8 @@ void TMoverParameters::LoadFIZ_Circuit( std::string const &Input ) { void TMoverParameters::LoadFIZ_RList( std::string const &Input ) { + extract_value( RlistSize, "Size", Input, "" ); + auto const venttype = extract_value( "RVent", Input ); if( venttype == "Automatic" ) { diff --git a/Train.cpp b/Train.cpp index 953f0d82..cf44f4c9 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1538,7 +1538,8 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com Train->m_linebreakerstate = 2; // for diesels, we complete the engine start here // TODO: consider arranging a better way to start the diesel engines - if( Train->mvControlled->EngineType == DieselEngine ) { + if( ( Train->mvControlled->EngineType == DieselEngine ) + || ( Train->mvControlled->EngineType == DieselElectric ) ) { if( Train->mvControlled->MainSwitch( true ) ) { // side-effects Train->mvControlled->ConverterSwitch( ( Train->ggConverterButton.GetValue() > 0.5 ) || ( Train->mvControlled->ConverterStart == start::automatic ) ); @@ -1619,7 +1620,8 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com else { // ...after closing the circuit // we don't need to start the diesel twice, but the other types still need to be launched - if( Train->mvControlled->EngineType != DieselEngine ) { + if( ( Train->mvControlled->EngineType != DieselEngine ) + && ( Train->mvControlled->EngineType != DieselElectric ) ) { if( Train->mvControlled->MainSwitch( true ) ) { // side-effects Train->mvControlled->ConverterSwitch( ( Train->ggConverterButton.GetValue() > 0.5 ) || ( Train->mvControlled->ConverterStart == start::automatic ) ); diff --git a/World.cpp b/World.cpp index 71593315..d7901166 100644 --- a/World.cpp +++ b/World.cpp @@ -1630,15 +1630,17 @@ TWorld::Update_UI() { if( vehicle == nullptr ) { break; } - uitextline1 = - "vel: " + to_string(vehicle->GetVelocity(), 2) + "/" + to_string(vehicle->MoverParameters->nrot* M_PI * vehicle->MoverParameters->WheelDiameter * 3.6, 2) - + " km/h" + (vehicle->MoverParameters->SlippingWheels ? " (!)" : " ") - + "; dist: " + to_string(vehicle->MoverParameters->DistCounter, 2) + " km" - + "; pos: (" - + to_string(vehicle->GetPosition().x, 2) + ", " - + to_string(vehicle->GetPosition().y, 2) + ", " - + to_string(vehicle->GetPosition().z, 2) + "), PM=" - + to_string(vehicle->MoverParameters->WheelFlat, 1) + " mm"; + uitextline1 = + "vel: " + to_string( vehicle->GetVelocity(), 2 ) + "/" + to_string( vehicle->MoverParameters->nrot* M_PI * vehicle->MoverParameters->WheelDiameter * 3.6, 2 ) + + " km/h;" + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : " " ) + + " dist: " + to_string( vehicle->MoverParameters->DistCounter, 2 ) + " km" + + "; pos: (" + + to_string( vehicle->GetPosition().x, 2 ) + ", " + + to_string( vehicle->GetPosition().y, 2 ) + ", " + + to_string( vehicle->GetPosition().z, 2 ) + "), PM=" + + to_string( vehicle->MoverParameters->WheelFlat, 1 ) + " mm; enrot=" + + to_string( vehicle->MoverParameters->enrot * 60, 0 ) + " tmrot=" + + to_string( std::abs( vehicle->MoverParameters->nrot ) * vehicle->MoverParameters->Transmision.Ratio * 60, 0 ); uitextline2 = "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) diff --git a/sound.cpp b/sound.cpp index a9aa7a09..bd3f4ae7 100644 --- a/sound.cpp +++ b/sound.cpp @@ -59,11 +59,12 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons m_soundchunks[ idx ].second.fadeout = m_soundchunks[ idx + 1 ].second.threshold; } // ...and on the other end from the threshold point back into the range of previous chunk + m_soundchunks.front().second.fadein = std::max( 0, m_soundchunks.front().second.threshold ); for( std::size_t idx = 1; idx < m_soundchunks.size(); ++idx ) { auto const previouschunkwidth { m_soundchunks[ idx ].second.threshold - m_soundchunks[ idx - 1 ].second.threshold }; m_soundchunks[ idx ].second.fadein = m_soundchunks[ idx ].second.threshold - 0.01f * m_crossfaderange * previouschunkwidth; } - m_soundchunks.back().second.fadeout = std::max( m_soundchunks.back().second.threshold, 100 ); + m_soundchunks.back().second.fadeout = std::max( 100, m_soundchunks.back().second.threshold ); // test if the chunk table contains any actual samples while at it for( auto &soundchunk : m_soundchunks ) { if( soundchunk.first.buffer != null_handle ) { From 1b5e6aafd1220d7e86f5b2cb502fa40735b090be Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 23 Dec 2017 17:46:35 +0100 Subject: [PATCH 239/426] build 171222. support for separate submodel activation thresholds --- AnimModel.cpp | 19 +++++++++++-------- AnimModel.h | 6 +++--- version.h | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 77429ef0..cf87fb43 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -574,16 +574,17 @@ void TAnimModel::RaPrepare() bool state; // stan światła for (int i = 0; i < iNumLights; ++i) { - switch (lsLights[i]) + auto const lightmode { static_cast( lsLights[ i ] ) }; + switch (lightmode) { case ls_Blink: // migotanie state = fBlinkTimer < fOnTime; break; case ls_Dark: // zapalone, gdy ciemno - state = Global::fLuminance <= fDark; + state = Global::fLuminance <= ( lsLights[i] - 3.0 ); break; default: // zapalony albo zgaszony - state = (lsLights[i] == ls_On); + state = (lightmode == ls_On); } if (LightsOn[i]) LightsOn[i]->iVisible = state; @@ -755,12 +756,12 @@ void TAnimModel::AnimationVND(void *pData, double a, double b, double c, double }; //--------------------------------------------------------------------------- -void TAnimModel::LightSet(int n, float v) +void TAnimModel::LightSet(int const n, float const v) { // ustawienie światła (n) na wartość (v) if (n >= iMaxNumLights) return; // przekroczony zakres - lsLights[ n ] = TLightState( static_cast( v ) ); - switch( lsLights[ n ] ) { + lsLights[ n ] = v; + switch( static_cast( lsLights[ n ] ) ) { // interpretacja ułamka zależnie od typu case ls_Off: { // ustalenie czasu migotania, t<1s (f>1Hz), np. 0.1 => t=0.1 (f=10Hz) @@ -776,8 +777,10 @@ void TAnimModel::LightSet(int n, float v) } case ls_Dark: { // zapalenie świateł zależne od oświetlenia scenerii - if( v > 3.0 ) { fDark = v - 3.0; } // ustawienie indywidualnego progu zapalania - else { fDark = DefaultDarkThresholdLevel; } // standardowy próg zaplania + if( v == 3.0 ) { + // standardowy próg zaplania + lsLights[ n ] = 3.0 + DefaultDarkThresholdLevel; + } break; } } diff --git a/AnimModel.h b/AnimModel.h index fdcec615..f581a96f 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -139,7 +139,7 @@ public: vAngle.x = Angles.x; vAngle.y = Angles.y; vAngle.z = Angles.z; }; - void LightSet( int n, float v ); + void LightSet( int const n, float const v ); void AnimationVND( void *pData, double a, double b, double c, double d ); bool TerrainLoaded(); int TerrainCount(); @@ -178,8 +178,8 @@ private: std::string asText; // tekst dla wyświetlacza znakowego TAnimAdvanced *pAdvanced { nullptr }; - TLightState lsLights[ iMaxNumLights ]; - float fDark { DefaultDarkThresholdLevel }; // poziom zapalanie światła (powinno być chyba powiązane z danym światłem?) + float lsLights[ iMaxNumLights ]; +// float fDark { DefaultDarkThresholdLevel }; // poziom zapalanie światła (powinno być chyba powiązane z danym światłem?) float fOnTime { 0.66f }; float fOffTime { 0.66f + 0.66f }; // były stałymi, teraz mogą być zmienne dla każdego egzemplarza unsigned int m_framestamp { 0 }; // id of last rendered gfx frame diff --git a/version.h b/version.h index 0b6c16aa..3a50be50 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1214 +#define VERSION_MINOR 1222 #define VERSION_REVISION 0 From c780f3efbfdaed616af7c7887df2f39bf7f2585c Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 25 Dec 2017 16:01:32 +0100 Subject: [PATCH 240/426] build 171224. support for radio-transmitted sound events, configurable wheel flat sound --- DynObj.cpp | 214 +++++++++------------------------------------ DynObj.h | 37 ++------ Event.cpp | 20 +++-- McZapkie/Mover.cpp | 46 +++++----- Train.cpp | 42 ++++++++- Train.h | 6 +- World.cpp | 9 ++ World.h | 32 +++---- sound.cpp | 12 +++ sound.h | 3 + version.h | 2 +- 11 files changed, 166 insertions(+), 257 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 1fd73538..1402faef 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1626,21 +1626,11 @@ TDynamicObject::TDynamicObject() { // McZapkie-270202 Controller = AIdriver; bDisplayCab = false; // 030303 - bBrakeAcc = false; NextConnected = PrevConnected = NULL; NextConnectedNo = PrevConnectedNo = 2; // ABu: Numery sprzegow. 2=nie podłączony - asName = ""; bEnabled = true; MyTrack = NULL; // McZapkie-260202 -/* - dRailLength = 25.0; - for (int i = 0; i < MaxAxles; i++) - dRailPosition[i] = 0.0; - for (int i = 0; i < MaxAxles; i++) - dWheelsPosition[i] = 0.0; // będzie wczytane z MMD - iAxles = 0; -*/ dWheelAngle[0] = 0.0; dWheelAngle[1] = 0.0; dWheelAngle[2] = 0.0; @@ -1649,11 +1639,6 @@ TDynamicObject::TDynamicObject() { NoVoltTime = 0; dDoorMoveL = 0.0; dDoorMoveR = 0.0; - // for (int i=0;i<8;i++) - //{ - // DoorSpeedFactor[i]=random(150); - // DoorSpeedFactor[i]=(DoorSpeedFactor[i]+100)/100; - //} mdModel = NULL; mdKabina = NULL; // smWiazary[0]=smWiazary[1]=NULL; @@ -1669,9 +1654,6 @@ TDynamicObject::TDynamicObject() { smBogie[0] = smBogie[1] = NULL; bogieRot[0] = bogieRot[1] = vector3(0, 0, 0); modelRot = vector3(0, 0, 0); - eng_vol_act = 0.8; - eng_dfrq = 0; - eng_frq_act = 1; cp1 = cp2 = sp1 = sp2 = 0; iDirection = 1; // stoi w kierunku tradycyjnym (0, gdy jest odwrócony) iAxleFirst = 0; // numer pierwszej osi w kierunku ruchu (przełączenie @@ -1690,9 +1672,6 @@ TDynamicObject::TDynamicObject() { iAnimType[ANIM_PANTS] = 0; // 5-pantografy (2) iAnimType[ANIM_STEAMS] = 0; // 6-tłoki (napęd parowozu) iAnimations = 0; // na razie nie ma żadnego -/* - pAnimations = NULL; -*/ pAnimated = NULL; fShade = 0.0; // standardowe oświetlenie na starcie iHornWarning = 1; // numer syreny do użycia po otrzymaniu sygnału do jazdy @@ -1713,30 +1692,10 @@ TDynamicObject::TDynamicObject() { fAdjustment = 0.0; // korekcja odległości pomiędzy wózkami (np. na łukach) } -TDynamicObject::~TDynamicObject() -{ // McZapkie-250302 - zamykanie logowania - // parametrow fizycznych - SafeDelete(Mechanik); - SafeDelete(MoverParameters); - // Ra: wyłączanie dźwięków powinno być dodane w ich destruktorach, ale się - // sypie - /* to też się sypie - for (int i=0;iLoadStatus &= 3; // po zakończeniu będzie równe zero }; -/* -double ComputeRadius(double p1x, double p1z, double p2x, double p2z, - double p3x, double p3z, double p4x, double p4z) -{ - - double v1z= p1x-p2x; - double v1x= p1z-p2z; - double v4z= p3x-p4x; - double v4x= p3z-p4z; - double A1= p2z-p1z; - double B1= p1x-p2x; - double C1= -p1z*B1-p1x*A1; - double A2= p4z-p3z; - double B2= p3x-p4x; - double C2= -p3z*B1-p3x*A1; - double y= (A1*C2/A2-C1)/(B1-A1*B2/A2); - double x= (-B2*y-C2)/A2; -} -*/ -double TDynamicObject::ComputeRadius(vector3 p1, vector3 p2, vector3 p3, vector3 p4) -{ - // vector3 v1 - - // TLine l1= TLine(p1,p1-p2); - // TLine l4= TLine(p4,p4-p3); - // TPlane p1= l1.GetPlane(); - // vector3 pt; - // CrossPoint(pt,l4,p1); - double R = 0.0; - vector3 p12 = p1 - p2; - vector3 p34 = p3 - p4; - p12 = CrossProduct(p12, vector3(0.0, 0.1, 0.0)); - p12 = Normalize(p12); - p34 = CrossProduct(p34, vector3(0.0, 0.1, 0.0)); - p34 = Normalize(p34); - if (fabs(p1.x - p2.x) > 0.01) - { - if (fabs(p12.x - p34.x) > 0.001) - R = (p1.x - p4.x) / (p34.x - p12.x); - } - else - { - if (fabs(p12.z - p34.z) > 0.001) - R = (p1.z - p4.z) / (p34.z - p12.z); - } - return (R); -} - -/* -double TDynamicObject::ComputeRadius() -{ - double L=0; - double d=0; - d=sqrt(SquareMagnitude(Axle0.pPosition-Axle1.pPosition)); - L=Axle1.GetLength(Axle1.pPosition,Axle1.pPosition-Axle2.pPosition,Axle0.pPosition-Axle3.pPosition,Axle0.pPosition); - - double eps=0.01; - double R= 0; - double L_d; - if ((L>0) || (d>0)) - { - L_d= L-d; - if (L_d>eps) - { - R=L*sqrt(L/(24*(L_d))); - } - } - return R; -} -*/ - -/* Ra: na razie nie potrzebne -void TDynamicObject::UpdatePos() -{ - MoverParameters->Loc.X= -vPosition.x; - MoverParameters->Loc.Y= vPosition.z; - MoverParameters->Loc.Z= vPosition.y; -} -*/ - /* Ra: Powinny być dwie funkcje wykonujące aktualizację fizyki. Jedna wykonująca @@ -3703,13 +3582,18 @@ void TDynamicObject::RenderSounds() { sSand.stop(); } + auto brakeforceratio { 0.0 }; if( //( false == mvOccupied->SlippingWheels ) && ( MoverParameters->UnitBrakeForce > 10.0 ) - && ( GetVelocity() > 0.05 ) ) { + && ( MoverParameters->Vel > 0.05 ) ) { + brakeforceratio = + clamp( + MoverParameters->UnitBrakeForce / ( MoverParameters->BrakeForceR( 1.0, MoverParameters->Vel ) / ( MoverParameters->NAxles * std::max( 1, MoverParameters->NBpA ) ) ), + 0.0, 1.0 ); rsBrake - .pitch( rsBrake.m_frequencyfactor * GetVelocity() + rsBrake.m_frequencyoffset ) - .gain( rsBrake.m_amplitudefactor * std::sqrt( ( GetVelocity() * MoverParameters->UnitBrakeForce ) ) + rsBrake.m_amplitudeoffset ) + .pitch( rsBrake.m_frequencyoffset + MoverParameters->Vel * rsBrake.m_frequencyfactor ) + .gain( rsBrake.m_amplitudeoffset + std::sqrt( brakeforceratio * interpolate( 0.4, 1.0, ( MoverParameters->Vel / ( 1 + MoverParameters->Vmax ) ) ) ) ) .play( sound_flags::exclusive | sound_flags::looping ); } else { @@ -3823,51 +3707,9 @@ void TDynamicObject::RenderSounds() { volume = rsOuterNoise.m_amplitudefactor * MoverParameters->Vel + rsOuterNoise.m_amplitudeoffset; frequency = rsOuterNoise.m_frequencyfactor * MoverParameters->Vel + rsOuterNoise.m_frequencyoffset; - if( false == TestFlag( MoverParameters->DamageFlag, dtrain_wheelwear ) ) { - // McZpakie-221103: halas zalezny od kola - switch( MyTrack->eEnvironment ) { - case e_tunnel: { - volume *= 3; - frequency *= 0.95; - break; - } - case e_canyon: { - volume *= 1.1; - break; - } - case e_bridge: { - volume *= 2; - frequency *= 0.98; - break; - } - default: { - break; - } - } - } - else { - // uszkodzone kolo (podkucie) - switch( MyTrack->eEnvironment ) { - case e_tunnel: { - volume *= 2; - break; - } - case e_canyon: { - volume *= 1.1; - break; - } - case e_bridge: { - volume *= 1.5; - break; - } - default: { - break; - } - } - } - if( std::abs( MoverParameters->nrot ) > 0.01 ) { + if( brakeforceratio > 0.0 ) { // hamulce wzmagaja halas - volume *= 1 + 0.25 * ( MoverParameters->UnitBrakeForce / ( 1 + MoverParameters->MaxBrakeForce ) ); + volume *= 1 + 0.25 * brakeforceratio; } // scale volume by track quality volume *= ( 20.0 + MyTrack->iDamageFlag ) / 21; @@ -3889,6 +3731,17 @@ void TDynamicObject::RenderSounds() { // don't play the optional ending sound if the listener switches views rsOuterNoise.stop( false == FreeFlyModeFlag ); } + // flat spot sound + if( ( GetVelocity() > 1.0 ) + && ( true == TestFlag( MoverParameters->DamageFlag, dtrain_wheelwear ) ) ) { + m_wheelflat + .pitch( m_wheelflat.m_frequencyoffset + std::abs( MoverParameters->nrot ) * m_wheelflat.m_frequencyfactor ) + .gain( m_wheelflat.m_amplitudeoffset + 0.4 + 0.6 * ( MoverParameters->Vel * m_wheelflat.m_amplitudefactor ) ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + m_wheelflat.stop(); + } // youBy: dzwiek ostrych lukow i ciasnych zwrotek if( ( ts.R * ts.R > 1 ) @@ -4921,6 +4774,14 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, rsOuterNoise.m_frequencyfactor /= ( 1 + MoverParameters->Vmax ); } + else if( token == "wheelflat:" ) { + // szum podczas jazdy: + m_wheelflat.deserialize( parser, sound_type::single, sound_parameters::frequency ); + m_wheelflat.owner( this ); + + m_wheelflat.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); + } + } while( ( token != "" ) && ( token != "endsounds" ) ); @@ -4981,8 +4842,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // hamowanie zwykle: rsBrake.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); rsBrake.owner( this ); - - rsBrake.m_amplitudefactor /= ( 1 + MoverParameters->MaxBrakeForce * 1000 ); + // NOTE: can't pre-calculate amplitude normalization based on max brake force, as this varies depending on vehicle speed rsBrake.m_frequencyfactor /= ( 1 + MoverParameters->Vmax ); } else if( token == "slipperysound:" ) { @@ -5079,6 +4939,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } } // other sounds + if( true == m_wheelflat.empty() ) { + m_wheelflat.deserialize( "lomotpodkucia.wav 0.23 0.0", sound_type::single, sound_parameters::frequency ); + m_wheelflat.owner( this ); + + m_wheelflat.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); + } if( true == rscurve.empty() ) { // hunter-111211: domyslne, gdy brak rscurve.deserialize( "curve.wav", sound_type::single ); diff --git a/DynObj.h b/DynObj.h index d245e63e..c0cf4367 100644 --- a/DynObj.h +++ b/DynObj.h @@ -308,7 +308,6 @@ private: // methods void ABuLittleUpdate(double ObjSqrDist); - double ComputeRadius( Math3D::vector3 p1, Math3D::vector3 p2, Math3D::vector3 p3, Math3D::vector3 p4); void ABuBogies(); void ABuModelRoll(); void TurnOff(); @@ -348,46 +347,25 @@ private: TButton btMechanik1; TButton btMechanik2; -// int iAxles; // McZapkie: to potem mozna skasowac i zastapic iNumAxles double dRailLength { 0.0 }; std::vector m_axlesounds; - powertrain_sounds m_powertrainsounds; // engine sounds -/* - sound_source dsbDieselIgnition { sound_placement::engine }; // moved from cab - sound_source rsSilnik { sound_placement::engine }; - double enginevolume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal - sound_source m_tractionmotor { sound_placement::external }; - sound_source dsbRelay { sound_placement::engine }; - sound_source dsbWejscie_na_bezoporow { sound_placement::engine }; // moved from cab - sound_source dsbWejscie_na_drugi_uklad { sound_placement::engine }; // moved from cab - sound_source rsPrzekladnia { sound_placement::engine }; - sound_source rsEngageSlippery { sound_placement::engine }; // moved from cab - sound_source rsDieselInc { sound_placement::engine }; // youBy - float m_lastenginerevolutions { -1.f }; // helper, cached rpm of the engine - float m_enginerevolutionschange { 0.f }; // recent change of engine revolutions - sound_source sTurbo { sound_placement::engine }; - sound_source rsWentylator { sound_placement::engine }; // McZapkie-030302 - sound_source sConverter { sound_placement::engine }; - sound_source sCompressor { sound_placement::engine }; // NBMX wrzesien 2003 - sound_source sSmallCompressor { sound_placement::engine }; -*/ + powertrain_sounds m_powertrainsounds; sound_source sConverter { sound_placement::engine }; sound_source sCompressor { sound_placement::engine }; // NBMX wrzesien 2003 sound_source sSmallCompressor { sound_placement::engine }; // braking sounds sound_source dsbPneumaticRelay { sound_placement::external }; + sound_source rsBrake { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // moved from cab + sound_source sBrakeAcc { sound_placement::external }; + bool bBrakeAcc { false }; + sound_source rsPisk { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // McZapkie-260302 sound_source rsUnbrake { sound_placement::external }; // yB - odglos luzowania float m_lastbrakepressure { -1.f }; // helper, cached level of pressure in brake cylinder float m_brakepressurechange { 0.f }; // recent change of pressure in brake cylinder sound_source sReleaser { sound_placement::external }; sound_source rsSlippery { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // moved from cab sound_source sSand { sound_placement::external }; - sound_source rsBrake { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // moved from cab - sound_source sBrakeAcc { sound_placement::external }; - bool bBrakeAcc; - sound_source rsPisk { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // McZapkie-260302 - sound_source rsDerailment { sound_placement::external, 250.f }; // McZapkie-051202 // moving part and other external sounds std::array m_couplersounds; // always front and rear std::vector m_pantographsounds; // typically 2 but can be less (or more?) @@ -396,11 +374,10 @@ private: sound_source sHorn1 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source sHorn2 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source rsOuterNoise { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; + sound_source m_wheelflat { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source rscurve { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; // youBy + sound_source rsDerailment { sound_placement::external, 250.f }; // McZapkie-051202 - double eng_vol_act; - double eng_frq_act; - double eng_dfrq; Math3D::vector3 modelShake; bool renderme; // yB - czy renderowac diff --git a/Event.cpp b/Event.cpp index 534f618b..85489d22 100644 --- a/Event.cpp +++ b/Event.cpp @@ -407,14 +407,15 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) *parser >> token; break; case tp_Sound: - // Params[0].asRealSound->Init(asNodeName.c_str(),Parser->GetNextSymbol().ToDouble(),Parser->GetNextSymbol().ToDouble(),Parser->GetNextSymbol().ToDouble(),Parser->GetNextSymbol().ToDouble()); - // McZapkie-070502: dzwiek przestrzenny (ale do poprawy) - // Params[1].asdouble=Parser->GetNextSymbol().ToDouble(); - // Params[2].asdouble=Parser->GetNextSymbol().ToDouble(); - // Params[3].asdouble=Parser->GetNextSymbol().ToDouble(); //polozenie X,Y,Z - do poprawy! parser->getTokens(); *parser >> Params[0].asInt; // 0: wylaczyc, 1: wlaczyc; -1: wlaczyc zapetlone + Params[1].asdouble = 0.0; parser->getTokens(); + if( parser->peek() != "endevent" ) { + // optional parameter, radio channel to receive/broadcast the sound + *parser >> Params[1].asdouble; + parser->getTokens(); + } *parser >> token; break; case tp_Exit: @@ -1032,7 +1033,14 @@ event_manager::CheckQuery() { break; } case 1: { - m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive ); + if( m_workevent->Params[ 1 ].asdouble > 0.0 ) { + Global::pWorld->radio_message( + m_workevent->Params[ 9 ].tsTextSound, + static_cast( m_workevent->Params[ 1 ].asdouble ) ); + } + else { + m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive ); + } break; } case -1: { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b7570740..2977f8e6 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3881,31 +3881,22 @@ double TMoverParameters::BrakeForceP(double press, double velocity) // Q: 20160713 // oblicza siłę na styku koła i szyny // ************************************************************************************************* -double TMoverParameters::BrakeForce(const TTrackParam &Track) -{ - double K, Fb, NBrakeAxles, sm = 0; - // const OerlikonForceFactor=1.5; +double TMoverParameters::BrakeForce( TTrackParam const &Track ) { - if (NPoweredAxles > 0) - NBrakeAxles = NPoweredAxles; - else - NBrakeAxles = NAxles; - switch (LocalBrake) - { - case NoBrake: - K = 0; - break; - case ManualBrake: - K = MaxBrakeForce * ManualBrakeRatio(); - break; - case HydraulicBrake: - K = MaxBrakeForce * LocalBrakeRatio(); - break; - case PneumaticBrake: - if (Compressor < MaxBrakePress[3]) - K = MaxBrakeForce * LocalBrakeRatio() / 2.0; - else - K = 0; + double K{ 0 }, Fb{ 0 }, sm{ 0 }; + + switch( LocalBrake ) { + case ManualBrake: { + K = MaxBrakeForce * ManualBrakeRatio(); + break; + } + case HydraulicBrake: { + K = MaxBrakeForce * LocalBrakeRatio(); + break; + } + default: { + break; + } } if (MBrake == true) @@ -3913,8 +3904,6 @@ double TMoverParameters::BrakeForce(const TTrackParam &Track) K = MaxBrakeForce * ManualBrakeRatio(); } - // 0.03 - u = ((BrakePress * P2FTrans) - BrakeCylSpring) * BrakeCylMult[0] - BrakeSlckAdj; if (u * BrakeRigEff > Ntotal) // histereza na nacisku klockow Ntotal = u * BrakeRigEff; @@ -3925,6 +3914,11 @@ double TMoverParameters::BrakeForce(const TTrackParam &Track) Ntotal = u * (2.0 - BrakeRigEff); } + auto const NBrakeAxles { ( + NPoweredAxles > 0 ? + NPoweredAxles : + NAxles ) }; + if (NBrakeAxles * NBpA > 0) { if (Ntotal > 0) // nie luz diff --git a/Train.cpp b/Train.cpp index cf44f4c9..bf2fc36a 100644 --- a/Train.cpp +++ b/Train.cpp @@ -312,7 +312,6 @@ TTrain::TTrain() { //----- pMechSittingPosition = vector3(0, 0, 0); // ABu: 180404 InstrumentLightActive = false; // ABu: 030405 - iRadioChannel = 0; fTachoTimer = 0.0; // włączenie skoków wskazań prędkościomierza // @@ -3317,7 +3316,7 @@ void TTrain::UpdateMechPosition(double dt) vector3 TTrain::GetWorldMechPosition() { - vector3 position = DynamicObject->mMatrix *pMechPosition; // położenie względem środka pojazdu w układzie scenerii + vector3 position = DynamicObject->mMatrix * pMechPosition; // położenie względem środka pojazdu w układzie scenerii position += DynamicObject->GetPosition(); return position; } @@ -5127,6 +5126,16 @@ bool TTrain::Update( double const Deltatime ) // sounds update_sounds( Deltatime ); + if( false == m_radiomessages.empty() ) { + // erase completed radio messages from the list + m_radiomessages.erase( + std::remove_if( + std::begin( m_radiomessages ), std::end( m_radiomessages ), + []( sound_source &source ) { + return ( false == source.is_playing() ); } ), + std::end( m_radiomessages ) ); + } + return true; //(DynamicObject->Update(dt)); } // koniec update @@ -5567,7 +5576,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) &dsbSwitch, &dsbPneumaticSwitch, &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, &rsSBHissU, &rsFadeSound, &rsRunningNoise, - &dsbHasler, &dsbBuzzer, &dsbSlipAlarm + &dsbHasler, &dsbBuzzer, &dsbSlipAlarm, &m_radiosound }; for( auto sound : sounds ) { sound->offset( nullvector ); @@ -5751,6 +5760,13 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) if( dsbBuzzer.offset() == nullvector ) { dsbBuzzer.offset( btLampkaCzuwaka.model_offset() ); } + // radio has two potential items which can provide the position + if( m_radiosound.offset() == nullvector ) { + m_radiosound.offset( ggRadioButton.model_offset() ); + } + if( m_radiosound.offset() == nullvector ) { + m_radiosound.offset( btLampkaRadio.model_offset() ); + } auto const localbrakeoffset { ggLocalBrake.model_offset() }; std::vector localbrakesounds = { &rsSBHiss, &rsSBHissU @@ -5873,6 +5889,26 @@ void TTrain::DynamicSet(TDynamicObject *d) } }; +void +TTrain::radio_message( sound_source *Message, int const Channel ) { + + if( ( false == mvOccupied->Radio ) + || ( iRadioChannel != Channel ) ) { + // skip message playback if the radio isn't able to receive it + return; + } + auto const radiorange { 7500 * 7500 }; + if( glm::length2( Message->location() - glm::dvec3 { DynamicObject->GetPosition() } ) > radiorange ) { + return; + } + + m_radiomessages.emplace_back( m_radiosound ); + // assign sound to the template and play it + m_radiomessages.back() + .copy_sounds( *Message ) + .play( sound_flags::exclusive ); +} + void TTrain::Silence() { // wyciszenie dźwięków przy wychodzeniu #ifdef EU07_USE_OLD_SOUNDCODE diff --git a/Train.h b/Train.h index 57a33920..b91fa1b8 100644 --- a/Train.h +++ b/Train.h @@ -420,6 +420,8 @@ public: // reszta może by?publiczna sound_source dsbHasler { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbBuzzer { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbSlipAlarm { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // Bombardier 011010: alarm przy poslizgu dla 181/182 + sound_source m_radiosound { sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // cached template for radio messages + std::vector m_radiomessages; // list of currently played radio messages int iCabLightFlag; // McZapkie:120503: oswietlenie kabiny (0: wyl, 1: przyciemnione, 2: pelne) bool bCabLight; // hunter-091012: czy swiatlo jest zapalone? @@ -468,7 +470,7 @@ private: float fPPress, fNPress; // float fSPPress, fSNPress; int iSekunda; // Ra: sekunda aktualizacji pr?dko?ci - int iRadioChannel; // numer aktualnego kana?u radiowego + int iRadioChannel { 1 }; // numer aktualnego kana?u radiowego TPythonScreens pyScreens; public: @@ -476,6 +478,8 @@ private: static std::vector const fPress_labels; float fEIMParams[9][10]; // parametry dla silnikow asynchronicznych int RadioChannel() { return iRadioChannel; }; + // plays provided sound from position of the radio + void radio_message( sound_source *Message, int const Channel ); inline TDynamicObject *Dynamic() { return DynamicObject; }; inline TDynamicObject const *Dynamic() const { return DynamicObject; }; inline TMoverParameters *Controlled() { return mvControlled; }; diff --git a/World.cpp b/World.cpp index d7901166..6721f7a6 100644 --- a/World.cpp +++ b/World.cpp @@ -2073,6 +2073,15 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic) }; //--------------------------------------------------------------------------- +// passes specified sound to all vehicles within range as a radio message broadcasted on specified channel +void +TWorld::radio_message( sound_source *Message, int const Channel ) { + + if( Train != nullptr ) { + Train->radio_message( Message, Channel ); + } +} + void TWorld::CabChange(TDynamicObject *old, TDynamicObject *now) { // ewentualna zmiana kabiny użytkownikowi if (Train) diff --git a/World.h b/World.h index 09c9dae9..ccfe2d3f 100644 --- a/World.h +++ b/World.h @@ -85,10 +85,6 @@ class TWorld // NOTE: direct access is a shortcut, but world etc needs some restructuring regardless friend opengl_renderer; - void InOutKey( bool const Near = true ); - void FollowView(bool wycisz = true); - void DistantView( bool const Near = false ); - public: // types @@ -99,14 +95,16 @@ TWorld(); ~TWorld(); // methods + void CreateE3D( std::string const &dir = "", bool dyn = false ); bool Init( GLFWwindow *w ); bool InitPerformed() { return m_init; } - GLFWwindow *window; - void OnKeyDown(int cKey); - // void UpdateWindow(); - void OnMouseMove(double x, double y); - void OnCommandGet(multiplayer::DaneRozkaz *pRozkaz); bool Update(); + void OnKeyDown( int cKey ); + void OnMouseMove( double x, double y ); + void OnCommandGet( multiplayer::DaneRozkaz *pRozkaz ); + // passes specified sound to all vehicles within range as a radio message broadcasted on specified channel + void radio_message( sound_source *Message, int const Channel ); + void CabChange( TDynamicObject *old, TDynamicObject *now ); void TrainDelete(TDynamicObject *d = NULL); TTrain const * train() const { return Train; } @@ -115,11 +113,18 @@ TWorld(); // calculates current season of the year based on set simulation date void compute_season( int const Yearday ) const; +// members + private: void Update_Environment(); void Update_Camera( const double Deltatime ); void Update_UI(); void ResourceSweep(); + // handles vehicle change flag + void ChangeDynamic(); + void InOutKey( bool const Near = true ); + void FollowView( bool wycisz = true ); + void DistantView( bool const Near = false ); TCamera Camera; TCamera DebugCamera; @@ -140,13 +145,8 @@ private: double VelPrev; // poprzednia prędkość int tprev; // poprzedni czas double Acc; // przyspieszenie styczne - bool m_init{ false }; // indicates whether initial update of the world was performed - - public: - void CreateE3D(std::string const &dir = "", bool dyn = false); - void CabChange(TDynamicObject *old, TDynamicObject *now); - // handles vehicle change flag - void ChangeDynamic(); + bool m_init { false }; // indicates whether initial update of the world was performed + GLFWwindow *window; }; //--------------------------------------------------------------------------- diff --git a/sound.cpp b/sound.cpp index bd3f4ae7..be90f6e2 100644 --- a/sound.cpp +++ b/sound.cpp @@ -268,6 +268,18 @@ sound_source::deserialize_soundset( cParser &Input ) { } } +// copies list of sounds from provided source +sound_source & +sound_source::copy_sounds( sound_source const &Source ) { + + m_sounds = Source.m_sounds; + m_soundchunks = Source.m_soundchunks; + m_soundchunksempty = Source.m_soundchunksempty; + // NOTE: should probably zero the .playing fields here as precaution + // TODO: add this if we ever start copying sounds from active sources + return *this; +} + // issues contextual play commands for the audio renderer void sound_source::play( int const Flags ) { diff --git a/sound.h b/sound.h index 96fc8935..b1590c4b 100644 --- a/sound.h +++ b/sound.h @@ -58,6 +58,9 @@ public: deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters = 0 ); sound_source & deserialize( std::string const &Input, sound_type const Legacytype, int const Legacyparameters = 0 ); + // copies list of sounds from provided source + sound_source & + copy_sounds( sound_source const &Source ); // issues contextual play commands for the audio renderer void play( int const Flags = 0 ); diff --git a/version.h b/version.h index 3a50be50..fc5a435c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1222 +#define VERSION_MINOR 1224 #define VERSION_REVISION 0 From 10c5907c4d262b2e3503e17040d14b5ebac762d7 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 26 Dec 2017 17:17:06 +0100 Subject: [PATCH 241/426] diesel-powered vehicle startup ai tweaks, gfx renderer tweaks, crash fixes --- Driver.cpp | 241 ++++++++++++++++++++++--------------------- DynObj.cpp | 4 +- Gauge.h | 2 +- McZapkie/Mover.cpp | 7 +- McZapkie/hamulce.cpp | 6 -- World.cpp | 2 +- audiorenderer.h | 41 +++++--- renderer.cpp | 14 ++- 8 files changed, 167 insertions(+), 150 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 07342b5a..d541adbf 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1886,21 +1886,10 @@ bool TController::CheckVehicles(TOrders user) fMass += p->MoverParameters->TotalMass; // dodanie masy łącznie z ładunkiem if (fVelMax < 0 ? true : p->MoverParameters->Vmax < fVelMax) fVelMax = p->MoverParameters->Vmax; // ustalenie maksymalnej prędkości dla składu - /* //youBy: bez przesady, to jest proteza, napelniac mozna, a nawet trzeba, ale z umiarem! - //uwzględnić jeszcze wyłączenie hamulca - if - ((p->MoverParameters->BrakeSystem!=Pneumatic)&&(p->MoverParameters->BrakeSystem!=ElectroPneumatic)) - iDrivigFlags&=~moveOerlikons; //no jednak nie - else if (p->MoverParameters->BrakeSubsystem!=Oerlikon) - iDrivigFlags&=~moveOerlikons; //wtedy też nie */ p = p->Neightbour(dir); // pojazd podłączony od wskazanej strony } if (main) iDrivigFlags |= movePrimary; // nie znaleziono innego, można się porządzić - /* //tabelka z listą pojazdów jest na razie nie potrzebna - delete[] pVehicles; - pVehicles=new TDynamicObject*[iVehicles]; - */ ControllingSet(); // ustalenie członu do sterowania (może być inny niż zasiedziany) int pantmask = 1; if (iDrivigFlags & movePrimary) @@ -2187,42 +2176,19 @@ bool TController::PrepareEngine() LastReactionTime = 0.0; ReactionTime = PrepareTime; iDrivigFlags |= moveActive; // może skanować sygnały i reagować na komendy - // with Controlling do - if ( mvControlling->EnginePowerSource.SourceType == CurrentCollector ) -/* - || ( (mvOccupied->TrainType==dt_EZT) - && (mvControlling->GetTrainsetVoltage() > 0.0 ) ) ) // sprawdzanie, czy zasilanie jest może w innym członie -*/ - { + + if ( mvControlling->EnginePowerSource.SourceType == CurrentCollector ) { voltfront = true; voltrear = true; } - // begin - // if Couplers[0].Connected<>nil) - // begin - // if Couplers[0].Connected^.PantFrontVolt or Couplers[0].Connected^.PantRearVolt) - // voltfront:=true - // else - // voltfront:=false; - // end - // else - // voltfront:=false; - // if Couplers[1].Connected<>nil) - // begin - // if Couplers[1].Connected^.PantFrontVolt or Couplers[1].Connected^.PantRearVolt) - // voltrear:=true - // else - // voltrear:=false; - // end - // else - // voltrear:=false; - // end - else - // if EnginePowerSource.SourceType<>CurrentCollector) - if (mvOccupied->TrainType != dt_EZT) - voltfront = true; // Ra 2014-06: to jest wirtualny prąd dla spalinowych??? - if (AIControllFlag) // jeśli prowadzi komputer - { // część wykonawcza dla sterowania przez komputer + else { + if( mvOccupied->TrainType != dt_EZT ) { + // Ra 2014-06: to jest wirtualny prąd dla spalinowych??? + voltfront = true; + } + } + if (AIControllFlag) { + // część wykonawcza dla sterowania przez komputer mvOccupied->BatterySwitch(true); if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { // jeśli silnikowy jest pantografującym @@ -2244,39 +2210,42 @@ bool TController::PrepareEngine() mvControlling->PantCompFlag = false; // sprężarkę pantografów można już wyłączyć } } - // if (mvOccupied->TrainType==dt_EZT) - //{//Ra 2014-12: po co to tutaj? - // mvControlling->PantFront(true); - // mvControlling->PantRear(true); - //} - // if (mvControlling->EngineType==DieselElectric) - // mvControlling->Battery=true; //Ra: to musi być tak? } + if (mvControlling->PantFrontVolt || mvControlling->PantRearVolt || voltfront || voltrear) { // najpierw ustalamy kierunek, jeśli nie został ustalony - if (!iDirection) // jeśli nie ma ustalonego kierunku - if (mvOccupied->V == 0) - { // ustalenie kierunku, gdy stoi + if( !iDirection ) { + // jeśli nie ma ustalonego kierunku + if( mvOccupied->V == 0 ) { // ustalenie kierunku, gdy stoi iDirection = mvOccupied->CabNo; // wg wybranej kabiny - if (!iDirection) // jeśli nie ma ustalonego kierunku - if ((mvControlling->PantFrontVolt != 0.0) || - (mvControlling->PantRearVolt != 0.0) || voltfront || voltrear) - { - if (mvOccupied->Couplers[1].CouplingFlag == - ctrain_virtual) // jeśli z tyłu nie ma nic + if( !iDirection ) { + // jeśli nie ma ustalonego kierunku + if( ( mvControlling->PantFrontVolt != 0.0 ) || ( mvControlling->PantRearVolt != 0.0 ) || voltfront || voltrear ) { + if( mvOccupied->Couplers[ 1 ].CouplingFlag == ctrain_virtual ) { + // jeśli z tyłu nie ma nic iDirection = -1; // jazda w kierunku sprzęgu 1 - if (mvOccupied->Couplers[0].CouplingFlag == - ctrain_virtual) // jeśli z przodu nie ma nic + } + if( mvOccupied->Couplers[ 0 ].CouplingFlag == ctrain_virtual ) { + // jeśli z przodu nie ma nic iDirection = 1; // jazda w kierunku sprzęgu 0 + } } + } } - else // ustalenie kierunku, gdy jedzie - if ((mvControlling->PantFrontVolt != 0.0) || (mvControlling->PantRearVolt != 0.0) || - voltfront || voltrear) - if (mvOccupied->V < 0) // jedzie do tyłu - iDirection = -1; // jazda w kierunku sprzęgu 1 - else // jak nie do tyłu, to do przodu - iDirection = 1; // jazda w kierunku sprzęgu 0 + else { + // ustalenie kierunku, gdy jedzie + if( ( mvControlling->PantFrontVolt != 0.0 ) || ( mvControlling->PantRearVolt != 0.0 ) || voltfront || voltrear ) { + if( mvOccupied->V < 0 ) { + // jedzie do tyłu + iDirection = -1; // jazda w kierunku sprzęgu 1 + } + else { + // jak nie do tyłu, to do przodu + iDirection = 1; // jazda w kierunku sprzęgu 0 + } + } + } + } if (AIControllFlag) // jeśli prowadzi komputer { // część wykonawcza dla sterowania przez komputer if (mvControlling->ConvOvldFlag) @@ -2285,38 +2254,48 @@ bool TController::PrepareEngine() ; // zerowanie napędu mvControlling->ConvOvldFlag = false; // reset nadmiarowego } - else if (!mvControlling->Mains) - { - // if TrainType=dt_SN61) - // begin - // OK:=(OrderDirectionChange(ChangeDir,Controlling)=-1); - // OK:=IncMainCtrl(1); - // end; + else if (false == mvControlling->Mains) { while (DecSpeed(true)) ; // zerowanie napędu - OK = mvControlling->MainSwitch(true); - if (mvControlling->EngineType == DieselEngine) - { // Ra 2014-06: dla SN61 trzeba wrzucić pierwszą pozycję - nie wiem, czy tutaj... - // kiedyś działało... - if (!mvControlling->MainCtrlPos) - { - if (mvControlling->RList[0].R == - 0.0) // gdy na pozycji 0 dawka paliwa jest zerowa, to zgaśnie - mvControlling->IncMainCtrl(1); // dlatego trzeba zwiększyć pozycję - if (!mvControlling->ScndCtrlPos) // jeśli bieg nie został ustawiony - if (!mvControlling->MotorParam[0].AutoSwitch) // gdy biegi ręczne - if (mvControlling->MotorParam[0].mIsat == 0.0) // bl,mIsat,fi,mfi - mvControlling->IncScndCtrl(1); // pierwszy bieg + + if( ( mvOccupied->EngineType == DieselEngine ) + || ( mvOccupied->EngineType == DieselElectric ) ) { + // start helper devices before spinning up the engine + // TODO: replace with dedicated diesel engine subsystems + mvOccupied->ConverterSwitch( true ); + mvOccupied->CompressorSwitch( true ); + } + if( mvOccupied->TrainType == dt_SN61 ) { + // specjalnie dla SN61 żeby nie zgasł + if( mvControlling->RList[ mvControlling->MainCtrlPos ].Mn == 0 ) { + mvControlling->IncMainCtrl( 1 ); } } + OK = mvControlling->MainSwitch(true); +/* + if (mvControlling->EngineType == DieselEngine) { + // Ra 2014-06: dla SN61 trzeba wrzucić pierwszą pozycję - nie wiem, czy tutaj... + // kiedyś działało... + if (!mvControlling->MainCtrlPos) { + if( mvControlling->RList[ 0 ].R == 0.0 ) { + // gdy na pozycji 0 dawka paliwa jest zerowa, to zgaśnie dlatego trzeba zwiększyć pozycję + mvControlling->IncMainCtrl( 1 ); + } + if( ( !mvControlling->ScndCtrlPos ) // jeśli bieg nie został ustawiony + && ( !mvControlling->MotorParam[ 0 ].AutoSwitch ) // gdy biegi ręczne + && ( mvControlling->MotorParam[ 0 ].mIsat == 0.0 ) ) { // bl,mIsat,fi,mfi + // pierwszy bieg + mvControlling->IncScndCtrl( 1 ); + } + } + } +*/ } - else - { // Ra: iDirection określa, w którą stronę jedzie skład względem sprzęgów pojazdu z AI - OK = (OrderDirectionChange(iDirection, mvOccupied) == -1); + else { + OK = ( OrderDirectionChange( iDirection, mvOccupied ) == -1 ); + mvOccupied->ConverterSwitch( true ); // w EN57 sprężarka w ra jest zasilana z silnikowego - mvControlling->CompressorSwitch(true); - mvControlling->ConverterSwitch(true); - mvControlling->CompressorSwitch(true); + mvControlling->CompressorSwitch( true ); } } else @@ -2721,20 +2700,22 @@ bool TController::IncSpeed() break; case DieselEngine: if (mvControlling->ShuntModeAllow) - { // dla 2Ls150 można zmienić tryb pracy, jeśli jest w liniowym i nie daje rady (wymaga - // zerowania kierunku) + { // dla 2Ls150 można zmienić tryb pracy, jeśli jest w liniowym i nie daje rady (wymaga zerowania kierunku) // mvControlling->ShuntMode=(OrderList[OrderPos]&Shunt)||(fMass>224000.0); } - if ((mvControlling->Vel > mvControlling->dizel_minVelfullengage) && - (mvControlling->RList[mvControlling->MainCtrlPos].Mn > 0)) - OK = mvControlling->IncMainCtrl(1); - if (mvControlling->RList[mvControlling->MainCtrlPos].Mn == 0) - OK = mvControlling->IncMainCtrl(1); - if (!mvControlling->Mains) - { - mvControlling->MainSwitch(true); - mvControlling->ConverterSwitch(true); - mvControlling->CompressorSwitch(true); + if( true == Ready ) { + if( ( mvControlling->Vel > mvControlling->dizel_minVelfullengage ) + && ( mvControlling->RList[ mvControlling->MainCtrlPos ].Mn > 0 ) ) { + OK = mvControlling->IncMainCtrl( 1 ); + } + if( mvControlling->RList[ mvControlling->MainCtrlPos ].Mn == 0 ) { + OK = mvControlling->IncMainCtrl( 1 ); + } + } + if( false == mvControlling->Mains ) { + mvControlling->MainSwitch( true ); + mvControlling->ConverterSwitch( true ); + mvControlling->CompressorSwitch( true ); } break; } @@ -3194,12 +3175,11 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N vCommandLocation = *NewLocation; if ((NewValue1 != 0.0) && (OrderList[OrderPos] != Obey_train)) { // o ile jazda - if (!iEngineActive) - OrderNext(Prepare_engine); // trzeba odpalić silnik najpierw, światła ustawi - // JumpToNextOrder() - // if (OrderList[OrderPos]!=Obey_train) //jeśli nie pociągowa - OrderNext(Obey_train); // to uruchomić jazdę pociągową (od razu albo po odpaleniu - // silnika + if( iEngineActive == 0 ) { + // trzeba odpalić silnik najpierw, światła ustawi + OrderNext( Prepare_engine ); + } + OrderNext(Obey_train); // to uruchomić jazdę pociągową (od razu albo po odpaleniu silnika OrderCheck(); // jeśli jazda pociągowa teraz, to wykonać niezbędne operacje } if (NewValue1 != 0.0) // jeśli jechać @@ -3502,6 +3482,7 @@ TController::UpdateSituation(double dt) { index = std::min(BrakeAccTableSize, std::max(1, index)); fBrake_a0[0] = fBrake_a0[index]; fBrake_a1[0] = fBrake_a1[index]; + Ready = true; // wstępnie gotowy fReady = 0.0; // założenie, że odhamowany fAccGravity = 0.0; // przyspieszenie wynikające z pochylenia @@ -3510,8 +3491,8 @@ TController::UpdateSituation(double dt) { TDynamicObject *p = pVehicles[0]; // pojazd na czole składu while (p) { // sprawdzenie odhamowania wszystkich połączonych pojazdów - if (Ready) // bo jak coś nie odhamowane, to dalej nie ma co sprawdzać - // if (p->MoverParameters->BrakePress>=0.03*p->MoverParameters->MaxBrakePress) + if (Ready) { + // bo jak coś nie odhamowane, to dalej nie ma co sprawdzać if (p->MoverParameters->BrakePress >= 0.4) // wg UIC określone sztywno na 0.04 { Ready = false; // nie gotowy @@ -3529,6 +3510,7 @@ TController::UpdateSituation(double dt) { Need_TryAgain = true; // reset jak przy wywaleniu nadmiarowego } } + } if (fReady < p->MoverParameters->BrakePress) fReady = p->MoverParameters->BrakePress; // szukanie najbardziej zahamowanego if( ( dy = p->VectorFront().y ) != 0.0 ) { @@ -3547,6 +3529,25 @@ TController::UpdateSituation(double dt) { // if (mvOccupied->BrakePress<0.08) //to wystarczy, że zadziałają liniowe (nie ma ich jeszcze!!!) if (fReady < 0.8) // delikatniejszy warunek, obejmuje wszystkie wagony Ready = true; //żeby uznać za odhamowany + // second pass, for diesel engines verify the engines are fully started + // TODO: cache presence of diesel engines in the consist, to skip this test if there isn't any + p = pVehicles[ 0 ]; // pojazd na czole składu + while( ( true == Ready ) + && ( p != nullptr ) ) { + + auto const *vehicle { p->MoverParameters }; + + if( ( vehicle->EngineType == DieselEngine ) + || ( vehicle->EngineType == DieselElectric ) ) { + + Ready = ( + vehicle->enrot > 0.9 * ( + vehicle->EngineType == DieselEngine ? + vehicle->dizel_nmin : + vehicle->DElist[ 0 ].RPM / 60.0 ) ); + } + p = p->Next(); // pojazd podłączony z tyłu (patrząc od czoła) + } // crude way to deal with automatic door opening on W4 preventing further ride // for human-controlled vehicles with no door control and dynamic brake auto-activating with door open @@ -5696,10 +5697,12 @@ void TController::DirectionForward(bool forward) else while (mvOccupied->ActiveDir >= 0) mvOccupied->DirectionBackward(); // do tyłu w obecnej kabinie - if (mvOccupied->EngineType == DieselEngine) // specjalnie dla SN61 - if (iDrivigFlags & moveActive) // jeśli był już odpalony - if (mvControlling->RList[mvControlling->MainCtrlPos].Mn == 0) - mvControlling->IncMainCtrl(1); //żeby nie zgasł + if( mvOccupied->TrainType == dt_SN61 ) { + // specjalnie dla SN61 żeby nie zgasł + if( mvControlling->RList[ mvControlling->MainCtrlPos ].Mn == 0 ) { + mvControlling->IncMainCtrl( 1 ); + } + } }; std::string TController::Relation() diff --git a/DynObj.cpp b/DynObj.cpp index 1402faef..abbc3344 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3531,7 +3531,7 @@ void TDynamicObject::RenderSounds() { } m_lastbrakepressure = MoverParameters->BrakePress; // ensure some basic level of volume and scale it up depending on pressure in the cylinder; scale this by the leak rate - volume = 20 * m_brakepressurechange * ( 0.25 + 0.75 * ( std::max( MoverParameters->BrakePress, 0.0 ) / MoverParameters->MaxBrakePress[ 3 ] ) ); + volume = 20 * m_brakepressurechange * ( 0.25 + 0.75 * ( std::max( 0.0, MoverParameters->BrakePress ) / std::max( 1.0, MoverParameters->MaxBrakePress[ 3 ] ) ) ); if( volume > 0.075f ) { rsUnbrake .gain( volume ) @@ -3589,7 +3589,7 @@ void TDynamicObject::RenderSounds() { brakeforceratio = clamp( - MoverParameters->UnitBrakeForce / ( MoverParameters->BrakeForceR( 1.0, MoverParameters->Vel ) / ( MoverParameters->NAxles * std::max( 1, MoverParameters->NBpA ) ) ), + MoverParameters->UnitBrakeForce / std::max( 1.0, MoverParameters->BrakeForceR( 1.0, MoverParameters->Vel ) / ( MoverParameters->NAxles * std::max( 1, MoverParameters->NBpA ) ) ), 0.0, 1.0 ); rsBrake .pitch( rsBrake.m_frequencyoffset + MoverParameters->Vel * rsBrake.m_frequencyfactor ) diff --git a/Gauge.h b/Gauge.h index 9f76b335..8f454c3f 100644 --- a/Gauge.h +++ b/Gauge.h @@ -46,7 +46,7 @@ public: // returns offset of submodel associated with the button from the model centre glm::vec3 model_offset() const; // members - TSubModel *SubModel; // McZapkie-310302: zeby mozna bylo sprawdzac czy zainicjowany poprawnie + TSubModel *SubModel { nullptr }; // McZapkie-310302: zeby mozna bylo sprawdzac czy zainicjowany poprawnie private: // methods diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 2977f8e6..146685a9 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8262,10 +8262,9 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C // end else if (Command == "CompressorSwitch") /*NBMX*/ { - if ((CValue1 == 1)) - CompressorAllow = true; - else if ((CValue1 == 0)) - CompressorAllow = false; + if( CompressorPower < 2 ) { + CompressorAllow = ( CValue1 == 1 ); + } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "DoorOpen") /*NBMX*/ diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index fdfa2bbc..be9e1a01 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -247,10 +247,6 @@ TBrake::TBrake(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn NBpA = i_nbpa; BrakeDelays = i_BD; BrakeDelayFlag = bdelay_P; - DCV = false; - ASBP = 0.0; - BrakeStatus = b_hld; - SoundFlag = 0; // 210.88 // SizeBR:=i_bcn*i_bcr*i_bcr*i_bcd*40.17*MaxBP/(5-MaxBP); //objetosc ZP w stosunku do cylindra // 14" i cisnienia 4.2 atm @@ -258,7 +254,6 @@ TBrake::TBrake(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn SizeBC = i_bcn * i_bcr * i_bcr * i_bcd * 210.88 * MaxBP / 4.2; // objetosc CH w stosunku do cylindra 14" i cisnienia 4.2 atm - // BrakeCyl:=TReservoir.Create; BrakeCyl = std::make_shared(); BrakeRes = std::make_shared(); ValveRes = std::make_shared(); @@ -268,7 +263,6 @@ TBrake::TBrake(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn BrakeRes->CreateCap(i_brc); ValveRes->CreateCap(0.25); - // FM.Free; // materialy cierne i_mat = i_mat & (255 - bp_MHS); switch (i_mat) diff --git a/World.cpp b/World.cpp index 6721f7a6..e81860b5 100644 --- a/World.cpp +++ b/World.cpp @@ -1396,7 +1396,7 @@ TWorld::Update_UI() { uitextline2 += ( vehicle->MoverParameters->PantPressLockActive ? "!" : ( vehicle->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); - uitextline2 += ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( vehicle->MoverParameters->CompressorAllow ? ( vehicle->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); + uitextline2 += ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorPower > 1 ) ? ( vehicle->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); uitextline2 += ( vehicle->MoverParameters->CompressorGovernorLock ? "!" : "." ); /* uitextline2 += diff --git a/audiorenderer.h b/audiorenderer.h index a6864987..4ab63ec4 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -56,20 +56,7 @@ struct openal_source { // methods template openal_source & - bind( sound_source *Controller, uint32_sequence Sounds, Iterator_ First, Iterator_ Last ) { - controller = Controller; - sounds = Sounds; - // look up and queue assigned buffers - std::vector buffers; - std::for_each( - First, Last, - [&]( audio::buffer_handle const &buffer ) { - buffers.emplace_back( audio::renderer.buffer( buffer ).id ); } ); - if( id != audio::null_resource ) { - ::alSourceQueueBuffers( id, static_cast( buffers.size() ), buffers.data() ); - ::alSourceRewind( id ); } - is_multipart = ( buffers.size() > 1 ); - return *this; } + bind( sound_source *Controller, uint32_sequence Sounds, Iterator_ First, Iterator_ Last ); // starts playback of queued buffers void play(); @@ -163,6 +150,32 @@ private: extern openal_renderer renderer; + + +template +openal_source & +openal_source::bind( sound_source *Controller, uint32_sequence Sounds, Iterator_ First, Iterator_ Last ) { + + controller = Controller; + sounds = Sounds; + // look up and queue assigned buffers + std::vector buffers; + std::for_each( + First, Last, + [&]( audio::buffer_handle const &buffer ) { + buffers.emplace_back( audio::renderer.buffer( buffer ).id ); } ); + + if( id != audio::null_resource ) { + ::alSourceQueueBuffers( id, static_cast( buffers.size() ), buffers.data() ); + ::alSourceRewind( id ); + } + is_multipart = ( buffers.size() > 1 ); + + return *this; +} + + + inline float amplitude_to_db( float const Amplitude ) { diff --git a/renderer.cpp b/renderer.cpp index aa703f86..66d30c05 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -111,7 +111,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glDepthFunc( GL_LEQUAL ); glEnable( GL_DEPTH_TEST ); - glAlphaFunc( GL_GREATER, 0.04f ); + glAlphaFunc( GL_GREATER, 0.f ); glEnable( GL_ALPHA_TEST ); glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); glEnable( GL_BLEND ); @@ -828,11 +828,11 @@ opengl_renderer::setup_drawing( bool const Alpha ) { if( true == Alpha ) { ::glEnable( GL_BLEND ); - ::glAlphaFunc( GL_GREATER, 0.04f ); + ::glAlphaFunc( GL_GREATER, 0.f ); } else { ::glDisable( GL_BLEND ); - ::glAlphaFunc( GL_GREATER, 0.50f ); + ::glAlphaFunc( GL_GREATER, 0.5f ); } switch( m_renderpass.draw_mode ) { @@ -1807,6 +1807,10 @@ opengl_renderer::Render( scene::shape_node const &Shape, bool const Ignorerange void opengl_renderer::Render( TAnimModel *Instance ) { + if( false == Instance->m_visible ) { + return; + } + double distancesquared; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { @@ -2634,6 +2638,10 @@ opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_seque void opengl_renderer::Render_Alpha( TAnimModel *Instance ) { + if( false == Instance->m_visible ) { + return; + } + double distancesquared; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { From fcc490f1b8aa57a1c92bea2042d2646057842d91 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 26 Dec 2017 17:55:24 +0100 Subject: [PATCH 242/426] maintenance: deprecated render code cleanup --- renderer.cpp | 91 +--------------------------------------------------- renderer.h | 1 - 2 files changed, 1 insertion(+), 91 deletions(-) diff --git a/renderer.cpp b/renderer.cpp index 66d30c05..003afbfe 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -22,8 +22,6 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "usefull.h" -#define EU07_NEW_CAB_RENDERCODE - opengl_renderer GfxRenderer; extern TWorld World; @@ -431,13 +429,11 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glEnable( GL_TEXTURE_2D ); } #endif -#ifdef EU07_NEW_CAB_RENDERCODE if( World.Train != nullptr ) { // cab render is performed without shadows, due to low resolution and number of models without windows :| switch_units( true, false, false ); Render_cab( World.Train->Dynamic(), false ); } -#endif switch_units( true, true, true ); Render( simulation::Region ); /* @@ -909,7 +905,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const if( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( false == Global::bWireFrame ) ) { ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); - ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( m_shadowcolor ) ); // TODO: dynamically calculated shadow colour, based on sun height + ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( m_shadowcolor ) ); ::glTexEnvi( GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE ); // darken the previous stage ::glTexEnvi( GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PREVIOUS ); @@ -1395,17 +1391,6 @@ opengl_renderer::Render( scene::basic_region *Region ) { m_sectionqueue.clear(); m_cellqueue.clear(); -/* - for( auto *section : Region->sections( m_renderpass.camera.position(), m_renderpass.draw_range * Global::fDistanceFactor ) ) { -#ifdef EU07_USE_DEBUG_CULLING - if( m_worldcamera.camera.visible( section->m_area ) ) { -#else - if( m_renderpass.camera.visible( section->m_area ) ) { -#endif - m_sectionqueue.emplace_back( section ); - } - } -*/ // build a list of region sections to render glm::vec3 const cameraposition { m_renderpass.camera.position() }; auto const camerax = static_cast( std::floor( cameraposition.x / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2 ) ); @@ -1422,11 +1407,7 @@ opengl_renderer::Render( scene::basic_region *Region ) { if( column >= scene::EU07_REGIONSIDESECTIONCOUNT ) { break; } auto *section { Region->m_sections[ row * scene::EU07_REGIONSIDESECTIONCOUNT + column ] }; if( ( section != nullptr ) -#ifdef EU07_USE_DEBUG_CULLING - && ( m_worldcamera.camera.visible( section->m_area ) ) ) { -#else && ( m_renderpass.camera.visible( section->m_area ) ) ) { -#endif m_sectionqueue.emplace_back( section ); } } @@ -1503,38 +1484,6 @@ opengl_renderer::Render( section_sequence::iterator First, section_sequence::ite auto const originoffset { section->m_area.center - m_renderpass.camera.position() }; ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render -#ifdef EU07_USE_DEBUG_CULLING - // debug - ::glLineWidth( 2.f ); - float const width = section->m_area.radius; - float const height = section->m_area.radius * 0.2f; - glDisable( GL_LIGHTING ); - glDisable( GL_TEXTURE_2D ); - glColor3ub( 255, 128, 128 ); - glBegin( GL_LINE_LOOP ); - glVertex3f( -width, height, width ); - glVertex3f( -width, height, -width ); - glVertex3f( width, height, -width ); - glVertex3f( width, height, width ); - glEnd(); - glBegin( GL_LINE_LOOP ); - glVertex3f( -width, 0, width ); - glVertex3f( -width, 0, -width ); - glVertex3f( width, 0, -width ); - glVertex3f( width, 0, width ); - glEnd(); - glBegin( GL_LINES ); - glVertex3f( -width, height, width ); glVertex3f( -width, 0, width ); - glVertex3f( -width, height, -width ); glVertex3f( -width, 0, -width ); - glVertex3f( width, height, -width ); glVertex3f( width, 0, -width ); - glVertex3f( width, height, width ); glVertex3f( width, 0, width ); - glEnd(); - glColor3ub( 255, 255, 255 ); - glEnable( GL_TEXTURE_2D ); - glEnable( GL_LIGHTING ); - glLineWidth( 1.f ); -#endif - // shapes for( auto const &shape : section->m_shapes ) { Render( shape, true ); } // post-render cleanup ::glPopMatrix(); @@ -1554,11 +1503,7 @@ opengl_renderer::Render( section_sequence::iterator First, section_sequence::ite case rendermode::pickscenery: { for( auto &cell : section->m_cells ) { if( ( true == cell.m_active ) -#ifdef EU07_USE_DEBUG_CULLING - && ( m_worldcamera.camera.visible( cell.m_area ) ) ) { -#else && ( m_renderpass.camera.visible( cell.m_area ) ) ) { -#endif // store visible cells with content as well as their current distance, for sorting later m_cellqueue.emplace_back( glm::length2( m_renderpass.camera.position() - cell.m_area.center ), @@ -1607,35 +1552,6 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); // render -#ifdef EU07_USE_DEBUG_CULLING - // debug - float const width = cell->m_area.radius; - float const height = cell->m_area.radius * 0.15f; - glDisable( GL_LIGHTING ); - glDisable( GL_TEXTURE_2D ); - glColor3ub( 255, 255, 0 ); - glBegin( GL_LINE_LOOP ); - glVertex3f( -width, height, width ); - glVertex3f( -width, height, -width ); - glVertex3f( width, height, -width ); - glVertex3f( width, height, width ); - glEnd(); - glBegin( GL_LINE_LOOP ); - glVertex3f( -width, 0, width ); - glVertex3f( -width, 0, -width ); - glVertex3f( width, 0, -width ); - glVertex3f( width, 0, width ); - glEnd(); - glBegin( GL_LINES ); - glVertex3f( -width, height, width ); glVertex3f( -width, 0, width ); - glVertex3f( -width, height, -width ); glVertex3f( -width, 0, -width ); - glVertex3f( width, height, -width ); glVertex3f( width, 0, -width ); - glVertex3f( width, height, width ); glVertex3f( width, 0, width ); - glEnd(); - glColor3ub( 255, 255, 255 ); - glEnable( GL_TEXTURE_2D ); - glEnable( GL_LIGHTING ); -#endif // opaque non-instanced shapes for( auto const &shape : cell->m_shapesopaque ) { Render( shape, false ); } // tracks @@ -1994,7 +1910,6 @@ opengl_renderer::Render_cab( TDynamicObject *Dynamic, bool const Alpha ) { ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( Dynamic->InteriorLight * Dynamic->InteriorLightLevel ) ); } // render -#ifdef EU07_NEW_CAB_RENDERCODE if( true == Alpha ) { // translucent parts Render_Alpha( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); @@ -2003,10 +1918,6 @@ opengl_renderer::Render_cab( TDynamicObject *Dynamic, bool const Alpha ) { // opaque parts Render( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); } -#else - Render( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); - Render_Alpha( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); -#endif // post-render restore if( Dynamic->fShade > 0.0f ) { // change light level based on light level of the occupied track diff --git a/renderer.h b/renderer.h index e8582afc..dccee693 100644 --- a/renderer.h +++ b/renderer.h @@ -22,7 +22,6 @@ http://mozilla.org/MPL/2.0/. #define EU07_USE_PICKING_FRAMEBUFFER //#define EU07_USE_DEBUG_SHADOWMAP //#define EU07_USE_DEBUG_CAMERA -//#define EU07_USE_DEBUG_CULLING struct opengl_light { From e55f7ed02a10050bf2d2a4aa0c8ef43a1995b1d6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 27 Dec 2017 21:10:52 +0100 Subject: [PATCH 243/426] build 171227. cab shadows, wheel flat size as trigger for associated sound, ai diesel acceleration fix --- Driver.cpp | 5 +- DynObj.cpp | 4 +- McZapkie/Mover.cpp | 5 +- renderer.cpp | 422 ++++++++++++++++++++++++++++++++------------- renderer.h | 21 ++- version.h | 4 +- 6 files changed, 329 insertions(+), 132 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index d541adbf..b0294a2b 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -3541,10 +3541,11 @@ TController::UpdateSituation(double dt) { || ( vehicle->EngineType == DieselElectric ) ) { Ready = ( - vehicle->enrot > 0.9 * ( + ( vehicle->Vel > 0.5 ) + || ( vehicle->enrot > 0.8 * ( vehicle->EngineType == DieselEngine ? vehicle->dizel_nmin : - vehicle->DElist[ 0 ].RPM / 60.0 ) ); + vehicle->DElist[ 0 ].RPM / 60.0 ) ) ); } p = p->Next(); // pojazd podłączony z tyłu (patrząc od czoła) } diff --git a/DynObj.cpp b/DynObj.cpp index abbc3344..e4f21474 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3733,10 +3733,10 @@ void TDynamicObject::RenderSounds() { } // flat spot sound if( ( GetVelocity() > 1.0 ) - && ( true == TestFlag( MoverParameters->DamageFlag, dtrain_wheelwear ) ) ) { + && ( MoverParameters->WheelFlat > 5.0 ) ) { m_wheelflat .pitch( m_wheelflat.m_frequencyoffset + std::abs( MoverParameters->nrot ) * m_wheelflat.m_frequencyfactor ) - .gain( m_wheelflat.m_amplitudeoffset + 0.4 + 0.6 * ( MoverParameters->Vel * m_wheelflat.m_amplitudefactor ) ) + .gain( m_wheelflat.m_amplitudeoffset + m_wheelflat.m_amplitudefactor * ( ( 1.0 + ( MoverParameters->Vel / MoverParameters->Vmax ) + clamp( MoverParameters->WheelFlat / 60.0, 0.0, 1.0 ) ) / 3.0 ) ) .play( sound_flags::exclusive | sound_flags::looping ); } else { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 146685a9..cfb814e9 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3914,10 +3914,7 @@ double TMoverParameters::BrakeForce( TTrackParam const &Track ) { Ntotal = u * (2.0 - BrakeRigEff); } - auto const NBrakeAxles { ( - NPoweredAxles > 0 ? - NPoweredAxles : - NAxles ) }; + auto const NBrakeAxles { NAxles }; if (NBrakeAxles * NBpA > 0) { diff --git a/renderer.cpp b/renderer.cpp index 003afbfe..286accde 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -206,53 +206,110 @@ opengl_renderer::Init( GLFWwindow *Window ) { // shadowmap resources if( ( true == Global::RenderShadows ) && ( true == m_framebuffersupport ) ) { - // texture: - ::glGenTextures( 1, &m_shadowtexture ); - ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); - // allocate memory - ::glTexImage2D( GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, m_shadowbuffersize, m_shadowbuffersize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL ); - // setup parameters - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - // enable shadow comparison: true (ie not in shadow) if r<=texture... - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL ); - ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE ); - ::glBindTexture( GL_TEXTURE_2D, 0 ); + // primary shadow map + { + // texture: + ::glGenTextures( 1, &m_shadowtexture ); + ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); + // allocate memory + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, m_shadowbuffersize, m_shadowbuffersize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL ); + // setup parameters + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + // enable shadow comparison: true (ie not in shadow) if r<=texture... + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL ); + ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE ); + ::glBindTexture( GL_TEXTURE_2D, 0 ); #ifdef EU07_USE_DEBUG_SHADOWMAP - ::glGenTextures( 1, &m_shadowdebugtexture ); - ::glBindTexture( GL_TEXTURE_2D, m_shadowdebugtexture ); - // allocate memory - ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, m_shadowbuffersize, m_shadowbuffersize, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); - // setup parameters - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - ::glBindTexture( GL_TEXTURE_2D, 0 ); + ::glGenTextures( 1, &m_shadowdebugtexture ); + ::glBindTexture( GL_TEXTURE_2D, m_shadowdebugtexture ); + // allocate memory + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, m_shadowbuffersize, m_shadowbuffersize, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); + // setup parameters + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + ::glBindTexture( GL_TEXTURE_2D, 0 ); #endif - // create and assemble the framebuffer - ::glGenFramebuffersEXT( 1, &m_shadowframebuffer ); - ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); + // create and assemble the framebuffer + ::glGenFramebuffersEXT( 1, &m_shadowframebuffer ); + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_shadowframebuffer ); #ifdef EU07_USE_DEBUG_SHADOWMAP - ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_shadowdebugtexture, 0 ); + ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_shadowdebugtexture, 0 ); #else - ::glDrawBuffer( GL_NONE ); // we won't be rendering colour data, so can skip the colour attachment - ::glReadBuffer( GL_NONE ); + ::glDrawBuffer( GL_NONE ); // we won't be rendering colour data, so can skip the colour attachment + ::glReadBuffer( GL_NONE ); #endif - ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_shadowtexture, 0 ); - // check if we got it working - GLenum status = ::glCheckFramebufferStatusEXT( GL_FRAMEBUFFER_EXT ); - if( status == GL_FRAMEBUFFER_COMPLETE_EXT ) { - WriteLog( "Shadows framebuffer setup complete" ); + ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_shadowtexture, 0 ); + // check if we got it working + GLenum const status{ ::glCheckFramebufferStatusEXT( GL_FRAMEBUFFER_EXT ) }; + if( status == GL_FRAMEBUFFER_COMPLETE_EXT ) { + WriteLog( "Shadows framebuffer setup complete" ); + } + else { + ErrorLog( "Shadows framebuffer setup failed" ); + Global::RenderShadows = false; + } + // switch back to primary render target for now + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); + } + // cab shadow map + { + // NOTE: using separate framebuffer as more efficient arrangement than swapping attachments on a single one + // TODO: for shader-based implementation use instead a quarter of the CSM + // texture: + ::glGenTextures( 1, &m_cabshadowtexture ); + ::glBindTexture( GL_TEXTURE_2D, m_cabshadowtexture ); + // allocate memory + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24, m_shadowbuffersize / 2, m_shadowbuffersize / 2, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL ); + // setup parameters + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + // enable shadow comparison: true (ie not in shadow) if r<=texture... + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL ); + ::glTexParameteri( GL_TEXTURE_2D, GL_DEPTH_TEXTURE_MODE, GL_LUMINANCE ); + ::glBindTexture( GL_TEXTURE_2D, 0 ); +#ifdef EU07_USE_DEBUG_CABSHADOWMAP + ::glGenTextures( 1, &m_cabshadowdebugtexture ); + ::glBindTexture( GL_TEXTURE_2D, m_cabshadowdebugtexture ); + // allocate memory + ::glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, m_shadowbuffersize / 2, m_shadowbuffersize / 2, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL ); + // setup parameters + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + ::glBindTexture( GL_TEXTURE_2D, 0 ); +#endif + // create and assemble the framebuffer + ::glGenFramebuffersEXT( 1, &m_cabshadowframebuffer ); + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, m_cabshadowframebuffer ); +#ifdef EU07_USE_DEBUG_CABSHADOWMAP + ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, m_cabshadowdebugtexture, 0 ); +#else + ::glDrawBuffer( GL_NONE ); // we won't be rendering colour data, so can skip the colour attachment + ::glReadBuffer( GL_NONE ); +#endif + ::glFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, m_cabshadowtexture, 0 ); + // check if we got it working + GLenum const status{ ::glCheckFramebufferStatusEXT( GL_FRAMEBUFFER_EXT ) }; + if( status == GL_FRAMEBUFFER_COMPLETE_EXT ) { + WriteLog( "Cab shadows framebuffer setup complete" ); + } + else { + ErrorLog( "Cab shadows framebuffer setup failed" ); + Global::RenderShadows = false; + } } - else { - ErrorLog( "Shadows framebuffer setup failed" ); - Global::RenderShadows = false; - } - ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target for now + // switch back to primary render target for now + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); } // environment cube map resources if( ( false == Global::BasicRenderer ) @@ -360,28 +417,44 @@ opengl_renderer::Render_pass( rendermode const Mode ) { case rendermode::color: { - opengl_camera shadowcamera; // temporary helper, remove once ortho shadowmap code is done if( ( true == Global::RenderShadows ) && ( false == Global::bWireFrame ) && ( true == World.InitPerformed() ) && ( m_shadowcolor != colors::white ) ) { - // run shadowmap pass before color + + // run shadowmaps pass before color + Timer::subsystem.gfx_shadows.start(); Render_pass( rendermode::shadows ); + Render_pass( rendermode::cabshadows ); + Timer::subsystem.gfx_shadows.stop(); + m_debugtimestext += "shadows: " + to_string( Timer::subsystem.gfx_shadows.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) "; #ifdef EU07_USE_DEBUG_SHADOWMAP UILayer.set_texture( m_shadowdebugtexture ); #endif - shadowcamera = m_renderpass.camera; // cache shadow camera placement for visualization +#ifdef EU07_USE_DEBUG_CABSHADOWMAP + UILayer.set_texture( m_cabshadowdebugtexture ); +#endif setup_pass( m_renderpass, Mode ); // restore draw mode. TBD, TODO: render mode stack - // setup shadowmap matrix + // setup shadowmap matrices m_shadowtexturematrix = - //bias from [-1, 1] to [0, 1] }; - glm::mat4{ 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.5f, 0.5f, 0.5f, 1.0f } - * shadowcamera.projection() + glm::mat4 { 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.5f, 0.5f, 0.5f, 1.0f } // bias from [-1, 1] to [0, 1] + * m_shadowpass.camera.projection() // during colour pass coordinates are moved from camera-centric to light-centric, essentially the difference between these two origins * glm::translate( - glm::mat4{ glm::mat3{ shadowcamera.modelview() } }, - glm::vec3{ m_renderpass.camera.position() - shadowcamera.position() } ); + glm::mat4{ glm::mat3{ m_shadowpass.camera.modelview() } }, + glm::vec3{ m_renderpass.camera.position() - m_shadowpass.camera.position() } ); + + if( false == FreeFlyModeFlag ) { + m_cabshadowtexturematrix = + glm::mat4{ 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f, 0.5f, 0.5f, 0.5f, 1.0f } // bias from [-1, 1] to [0, 1] + * m_cabshadowpass.camera.projection() + // during colour pass coordinates are moved from camera-centric to light-centric, essentially the difference between these two origins + * glm::translate( + glm::mat4{ glm::mat3{ m_cabshadowpass.camera.modelview() } }, + glm::vec3{ m_renderpass.camera.position() - m_cabshadowpass.camera.position() } ); + } } + if( ( true == m_environmentcubetexturesupport ) && ( true == World.InitPerformed() ) ) { // potentially update environmental cube map @@ -389,6 +462,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_pass( m_renderpass, Mode ); // restore draw mode. TBD, TODO: render mode stack } } + ::glViewport( 0, 0, Global::iWindowWidth, Global::iWindowHeight ); if( World.InitPerformed() ) { @@ -418,7 +492,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glDisable( GL_LIGHTING ); ::glDisable( GL_TEXTURE_2D ); if( ( true == Global::RenderShadows ) && ( false == Global::bWireFrame ) ) { - shadowcamera.draw( m_renderpass.camera.position() - shadowcamera.position() ); + m_shadowpass.camera.draw( m_renderpass.camera.position() - m_shadowpass.camera.position() ); } if( DebugCameraFlag ) { ::glColor4f( 0.8f, 1.f, 0.9f, 1.f ); @@ -429,39 +503,40 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glEnable( GL_TEXTURE_2D ); } #endif - if( World.Train != nullptr ) { - // cab render is performed without shadows, due to low resolution and number of models without windows :| - switch_units( true, false, false ); - Render_cab( World.Train->Dynamic(), false ); + if( false == FreeFlyModeFlag ) { + switch_units( true, true, false ); + setup_shadow_map( m_cabshadowtexture, m_cabshadowtexturematrix ); + // cache shadow colour in case we need to account for cab light + auto const shadowcolor { m_shadowcolor }; + auto const *vehicle{ World.Train->Dynamic() }; + if( vehicle->InteriorLightLevel > 0.f ) { + setup_shadow_color( glm::min( colors::white, shadowcolor + glm::vec4( vehicle->InteriorLight * vehicle->InteriorLightLevel, 1.f ) ) ); + } + Render_cab( vehicle, false ); + if( vehicle->InteriorLightLevel > 0.f ) { + setup_shadow_color( shadowcolor ); + } } switch_units( true, true, true ); + setup_shadow_map( m_shadowtexture, m_shadowtexturematrix ); Render( simulation::Region ); -/* - // debug: audio nodes - for( auto const &audiosource : audio::renderer.m_sources ) { - - ::glPushMatrix(); - auto const position = audiosource.properties.location - m_renderpass.camera.position(); - ::glTranslated( position.x, position.y, position.z ); - - ::glPushAttrib( GL_ENABLE_BIT ); - ::glDisable( GL_TEXTURE_2D ); - ::glColor3f( 0.36f, 0.75f, 0.35f ); - - ::gluSphere( m_quadric, 0.125, 4, 2 ); - - ::glPopAttrib(); - - ::glPopMatrix(); - } -*/ // ...translucent parts setup_drawing( true ); Render_Alpha( simulation::Region ); - if( World.Train != nullptr ) { + if( false == FreeFlyModeFlag ) { // cab render is performed without shadows, due to low resolution and number of models without windows :| - switch_units( true, false, false ); - Render_cab( World.Train->Dynamic(), true ); + switch_units( true, true, false ); + setup_shadow_map( m_cabshadowtexture, m_cabshadowtexturematrix ); + // cache shadow colour in case we need to account for cab light + auto const shadowcolor{ m_shadowcolor }; + auto const *vehicle{ World.Train->Dynamic() }; + if( vehicle->InteriorLightLevel > 0.f ) { + setup_shadow_color( glm::min( colors::white, shadowcolor + glm::vec4( vehicle->InteriorLight * vehicle->InteriorLightLevel, 1.f ) ) ); + } + Render_cab( vehicle, true ); + if( vehicle->InteriorLightLevel > 0.f ) { + setup_shadow_color( shadowcolor ); + } } if( m_environmentcubetexturesupport ) { @@ -481,24 +556,23 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( World.InitPerformed() ) { // setup - Timer::subsystem.gfx_shadows.start(); + ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting + ::glPolygonOffset( 1.f, 1.f ); + // main shadowmap ::glBindFramebufferEXT( GL_FRAMEBUFFER, m_shadowframebuffer ); - ::glViewport( 0, 0, m_shadowbuffersize, m_shadowbuffersize ); #ifdef EU07_USE_DEBUG_SHADOWMAP ::glClearColor( 0.f / 255.f, 0.f / 255.f, 0.f / 255.f, 1.f ); // initial background Color ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - opengl_camera worldcamera{ m_renderpass.camera }; // cache shadow camera placement for visualization #else ::glClear( GL_DEPTH_BUFFER_BIT ); #endif ::glScissor( 1, 1, m_shadowbuffersize - 2, m_shadowbuffersize - 2 ); ::glEnable( GL_SCISSOR_TEST ); + setup_matrices(); - ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting - ::glPolygonOffset( 1.f, 1.f ); // render // opaque parts... setup_drawing( false ); @@ -508,13 +582,57 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_units( false, false, false ); #endif Render( simulation::Region ); + m_shadowpass = m_renderpass; + // post-render restore - ::glDisable( GL_POLYGON_OFFSET_FILL ); ::glDisable( GL_SCISSOR_TEST ); + ::glDisable( GL_POLYGON_OFFSET_FILL ); + + ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target + } + break; + } + + case rendermode::cabshadows: { + + if( ( World.InitPerformed() ) + && ( false == FreeFlyModeFlag ) ) { + // setup + ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting + ::glPolygonOffset( 1.f, 1.f ); + ::glDisable( GL_CULL_FACE ); + + ::glBindFramebufferEXT( GL_FRAMEBUFFER, m_cabshadowframebuffer ); + ::glViewport( 0, 0, m_shadowbuffersize / 2, m_shadowbuffersize / 2 ); + +#ifdef EU07_USE_DEBUG_CABSHADOWMAP + ::glClearColor( 0.f / 255.f, 0.f / 255.f, 0.f / 255.f, 1.f ); // initial background Color + ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); +#else + ::glClear( GL_DEPTH_BUFFER_BIT ); +#endif + ::glScissor( 1, 1, m_shadowbuffersize / 2 - 2, m_shadowbuffersize / 2 - 2 ); + ::glEnable( GL_SCISSOR_TEST ); + + setup_matrices(); + // render + // opaque parts... + setup_drawing( false ); +#ifdef EU07_USE_DEBUG_CABSHADOWMAP + setup_units( true, false, false ); +#else + setup_units( true, false, false ); +#endif + Render_cab( World.Train->Dynamic(), false ); + Render_cab( World.Train->Dynamic(), true ); + m_cabshadowpass = m_renderpass; + + // post-render restore + ::glDisable( GL_SCISSOR_TEST ); + ::glEnable( GL_CULL_FACE ); + ::glDisable( GL_POLYGON_OFFSET_FILL ); ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); // switch back to primary render target - Timer::subsystem.gfx_shadows.stop(); - m_debugtimestext += "shadows: " + to_string( Timer::subsystem.gfx_shadows.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) "; } break; } @@ -536,6 +654,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // opaque parts... setup_drawing( false ); setup_units( true, true, true ); + setup_shadow_map( m_shadowtexture, m_shadowtexturematrix ); Render( simulation::Region ); /* // reflections are limited to sky and ground only, the update rate is too low for anything else @@ -639,6 +758,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f switch( Mode ) { case rendermode::color: { Config.draw_range = Global::BaseDrawRange; break; } case rendermode::shadows: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } + case rendermode::cabshadows: { Config.draw_range = 10.f; break; } case rendermode::reflections: { Config.draw_range = Global::BaseDrawRange; break; } case rendermode::pickcontrols: { Config.draw_range = 50.f; break; } case rendermode::pickscenery: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } @@ -652,18 +772,6 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f switch( Mode ) { case rendermode::color: { - // projection - auto const zfar = Config.draw_range * Global::fDistanceFactor * Zfar; - auto const znear = ( - Znear > 0.f ? - Znear * zfar : - 0.1f * Global::ZoomFactor ); - camera.projection() *= - glm::perspective( - glm::radians( Global::FieldOfView / Global::ZoomFactor ), - std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), - znear, - zfar ); // modelview if( ( false == DebugCameraFlag ) || ( true == Ignoredebug ) ) { camera.position() = Global::pCameraPosition; @@ -673,17 +781,26 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f camera.position() = Global::DebugCameraPosition; World.DebugCamera.SetMatrix( viewmatrix ); } + // projection + auto const zfar = Config.draw_range * Global::fDistanceFactor * Zfar; + auto const znear = ( + Znear > 0.f ? + Znear * zfar : + 0.1f * Global::ZoomFactor ); + camera.projection() *= + glm::perspective( + glm::radians( Global::FieldOfView / Global::ZoomFactor ), + std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), + znear, + zfar ); break; } - case rendermode::shadows: { - // calculate lightview boundaries based on relevant area of the world camera frustum: // ...setup chunk of frustum we're interested in... - auto const znear = 0.f; auto const zfar = std::min( 1.f, Global::shadowtune.depth / ( Global::BaseDrawRange * Global::fDistanceFactor ) * std::max( 1.f, Global::ZoomFactor * 0.5f ) ); renderpass_config worldview; - setup_pass( worldview, rendermode::color, znear, zfar, true ); + setup_pass( worldview, rendermode::color, 0.f, zfar, true ); auto &frustumchunkshapepoints = worldview.camera.frustum_points(); // ...modelview matrix: determine the centre of frustum chunk in world space... glm::vec3 frustumchunkmin, frustumchunkmax; @@ -750,14 +867,36 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f break; } - case rendermode::reflections: { + case rendermode::cabshadows: { + // fixed size cube large enough to enclose a vehicle compartment + // modelview + auto const lightvector = + glm::normalize( glm::vec3{ + Global::DayLight.direction.x, + std::min( Global::DayLight.direction.y, -0.2f ), + Global::DayLight.direction.z } ); + camera.position() = Global::pCameraPosition - glm::dvec3 { lightvector }; + viewmatrix *= glm::lookAt( + camera.position(), + glm::dvec3 { Global::pCameraPosition }, + glm::dvec3 { 0.f, 1.f, 0.f } ); // projection + auto const maphalfsize { Config.draw_range * 0.5f }; camera.projection() *= - glm::perspective( - glm::radians( 90.f ), - 1.f, - 0.1f * Global::ZoomFactor, - Config.draw_range * Global::fDistanceFactor ); + glm::ortho( + -maphalfsize, maphalfsize, + -maphalfsize, maphalfsize, + -Config.draw_range, Config.draw_range ); + // adjust the projection to sample complete shadow map texels + auto shadowmaptexel = glm::vec2 { camera.projection() * glm::mat4{ viewmatrix } * glm::vec4{ 0.f, 0.f, 0.f, 1.f } }; + shadowmaptexel *= ( m_shadowbuffersize / 2 ) * 0.5f; + auto shadowmapadjustment = glm::round( shadowmaptexel ) - shadowmaptexel; + shadowmapadjustment /= ( m_shadowbuffersize / 2 ) * 0.5f; + camera.projection() = glm::translate( glm::mat4{ 1.f }, glm::vec3{ shadowmapadjustment, 0.f } ) * camera.projection(); + + break; + } + case rendermode::reflections: { // modelview camera.position() = ( ( ( true == DebugCameraFlag ) && ( false == Ignoredebug ) ) ? @@ -771,12 +910,22 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f camera.position(), camera.position() + cubefacetargetvectors[ cubefaceindex ], cubefaceupvectors[ cubefaceindex ] ); + // projection + camera.projection() *= + glm::perspective( + glm::radians( 90.f ), + 1.f, + 0.1f * Global::ZoomFactor, + Config.draw_range * Global::fDistanceFactor ); break; } case rendermode::pickcontrols: case rendermode::pickscenery: { // TODO: scissor test for pick modes + // modelview + camera.position() = Global::pCameraPosition; + World.Camera.SetMatrix( viewmatrix ); // projection camera.projection() *= glm::perspective( @@ -784,9 +933,6 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), 0.1f * Global::ZoomFactor, Config.draw_range * Global::fDistanceFactor ); - // modelview - camera.position() = Global::pCameraPosition; - World.Camera.SetMatrix( viewmatrix ); break; } default: { @@ -851,6 +997,7 @@ opengl_renderer::setup_drawing( bool const Alpha ) { break; } case rendermode::shadows: + case rendermode::cabshadows: case rendermode::pickcontrols: case rendermode::pickscenery: { ::glColor4fv( glm::value_ptr( colors::white ) ); @@ -964,20 +1111,15 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const && ( m_shadowcolor != colors::white ) ) { select_unit( m_shadowtextureunit ); - // NOTE: shadowmap isn't part of regular texture system, so we use direct bind call here - ::glBindTexture( GL_TEXTURE_2D, m_shadowtexture ); + // NOTE: texture and transformation matrix setup are done through separate call ::glEnable( GL_TEXTURE_2D ); // s - ::glTexGenfv( GL_S, GL_EYE_PLANE, glm::value_ptr( glm::row( m_shadowtexturematrix, 0 ) ) ); ::glEnable( GL_TEXTURE_GEN_S ); // t - ::glTexGenfv( GL_T, GL_EYE_PLANE, glm::value_ptr( glm::row( m_shadowtexturematrix, 1 ) ) ); ::glEnable( GL_TEXTURE_GEN_T ); // r - ::glTexGenfv( GL_R, GL_EYE_PLANE, glm::value_ptr( glm::row( m_shadowtexturematrix, 2 ) ) ); ::glEnable( GL_TEXTURE_GEN_R ); // q - ::glTexGenfv( GL_Q, GL_EYE_PLANE, glm::value_ptr( glm::row( m_shadowtexturematrix, 3 ) ) ); ::glEnable( GL_TEXTURE_GEN_Q ); ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); @@ -1062,6 +1204,33 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const m_unitstate.reflections = Reflections; } +// configures shadow texture unit for specified shadow map and conersion matrix +void +opengl_renderer::setup_shadow_map( GLuint const Texture, glm::mat4 const &Transformation ) { + + if( ( m_shadowtextureunit == -1 ) + || ( false == Global::RenderShadows ) + || ( true == Global::bWireFrame ) + || ( m_shadowcolor == colors::white ) ) { + // shadows are off + return; + } + + select_unit( m_shadowtextureunit ); + // NOTE: shadowmap isn't part of regular texture system, so we use direct bind call here + ::glBindTexture( GL_TEXTURE_2D, Texture ); + // s + ::glTexGenfv( GL_S, GL_EYE_PLANE, glm::value_ptr( glm::row( Transformation, 0 ) ) ); + // t + ::glTexGenfv( GL_T, GL_EYE_PLANE, glm::value_ptr( glm::row( Transformation, 1 ) ) ); + // r + ::glTexGenfv( GL_R, GL_EYE_PLANE, glm::value_ptr( glm::row( Transformation, 2 ) ) ); + // q + ::glTexGenfv( GL_Q, GL_EYE_PLANE, glm::value_ptr( glm::row( Transformation, 3 ) ) ); + + select_unit( m_diffusetextureunit ); +} + // enables and disables specified texture units void opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ) { @@ -1873,7 +2042,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { // rendering kabiny gdy jest oddzielnym modelem i ma byc wyswietlana bool -opengl_renderer::Render_cab( TDynamicObject *Dynamic, bool const Alpha ) { +opengl_renderer::Render_cab( TDynamicObject const *Dynamic, bool const Alpha ) { if( Dynamic == nullptr ) { @@ -1896,7 +2065,7 @@ opengl_renderer::Render_cab( TDynamicObject *Dynamic, bool const Alpha ) { auto const originoffset = Dynamic->GetPosition() - m_renderpass.camera.position(); ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - ::glMultMatrixd( Dynamic->mMatrix.getArray() ); + ::glMultMatrixd( Dynamic->mMatrix.readArray() ); switch( m_renderpass.draw_mode ) { case rendermode::color: { @@ -1905,7 +2074,7 @@ opengl_renderer::Render_cab( TDynamicObject *Dynamic, bool const Alpha ) { // change light level based on light level of the occupied track Global::DayLight.apply_intensity( Dynamic->fShade ); } - if( Dynamic->InteriorLightLevel > 0.0f ) { + if( Dynamic->InteriorLightLevel > 0.f ) { // crude way to light the cabin, until we have something more complete in place ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( Dynamic->InteriorLight * Dynamic->InteriorLightLevel ) ); } @@ -1929,6 +2098,20 @@ opengl_renderer::Render_cab( TDynamicObject *Dynamic, bool const Alpha ) { } break; } + case rendermode::cabshadows: { + // cab shadowmap mode skips lighting setup and translucent parts + // render + if( true == Alpha ) { + // translucent parts + Render_Alpha( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); + } + else { + // opaque parts + Render( Dynamic->mdKabina, Dynamic->Material(), 0.0 ); + } + // since the setup is simpler, there's nothing to reset afterwards + break; + } case rendermode::pickcontrols: { // control picking mode skips lighting setup and translucent parts // render @@ -2103,6 +2286,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { break; } case rendermode::shadows: + case rendermode::cabshadows: case rendermode::pickscenery: { // scenery picking and shadow both use enforced colour and no frills // material configuration: diff --git a/renderer.h b/renderer.h index dccee693..50f35e99 100644 --- a/renderer.h +++ b/renderer.h @@ -21,6 +21,7 @@ http://mozilla.org/MPL/2.0/. #define EU07_USE_PICKING_FRAMEBUFFER //#define EU07_USE_DEBUG_SHADOWMAP +//#define EU07_USE_DEBUG_CABSHADOWMAP //#define EU07_USE_DEBUG_CAMERA struct opengl_light { @@ -205,7 +206,7 @@ public: info_stats() const; // members - GLenum static const sunlight{ GL_LIGHT0 }; + GLenum static const sunlight { GL_LIGHT0 }; std::size_t m_drawcount { 0 }; private: @@ -214,6 +215,7 @@ private: none, color, shadows, + cabshadows, reflections, pickcontrols, pickscenery @@ -268,6 +270,8 @@ private: setup_drawing( bool const Alpha = false ); void setup_units( bool const Diffuse, bool const Shadows, bool const Reflections ); + void + setup_shadow_map( GLuint const Texture, glm::mat4 const &Transformation ); void setup_shadow_color( glm::vec4 const &Shadowcolor ); void @@ -306,7 +310,7 @@ private: void Render( scene::basic_cell::path_sequence::const_iterator First, scene::basic_cell::path_sequence::const_iterator Last ); bool - Render_cab( TDynamicObject *Dynamic, bool const Alpha = false ); + Render_cab( TDynamicObject const *Dynamic, bool const Alpha = false ); void Render( TMemCell *Memcell ); void @@ -354,13 +358,22 @@ private: GLuint m_picktexture { 0 }; GLuint m_pickdepthbuffer { 0 }; #endif + // main shadowmap resources int m_shadowbuffersize { 2048 }; GLuint m_shadowframebuffer { 0 }; GLuint m_shadowtexture { 0 }; #ifdef EU07_USE_DEBUG_SHADOWMAP GLuint m_shadowdebugtexture{ 0 }; +#endif +#ifdef EU07_USE_DEBUG_CABSHADOWMAP + GLuint m_cabshadowdebugtexture{ 0 }; #endif glm::mat4 m_shadowtexturematrix; // conversion from camera-centric world space to light-centric clip space + // cab shadowmap resources + GLuint m_cabshadowframebuffer { 0 }; + GLuint m_cabshadowtexture { 0 }; + glm::mat4 m_cabshadowtexturematrix; // conversion from cab-centric world space to light-centric clip space + // environment map resources GLuint m_environmentframebuffer { 0 }; GLuint m_environmentcubetexture { 0 }; GLuint m_environmentdepthbuffer { 0 }; @@ -389,9 +402,11 @@ private: float m_speculartranslucentscalefactor { 1.f }; bool m_renderspecular{ false }; // controls whether to include specular component in the calculations - renderpass_config m_renderpass; + renderpass_config m_renderpass; // parameters for current render pass section_sequence m_sectionqueue; // list of sections in current render pass cell_sequence m_cellqueue; + renderpass_config m_shadowpass; // parametrs of most recent shadowmap pass + renderpass_config m_cabshadowpass; // parameters of most recent cab shadowmap pass std::vector m_pickcontrolsitems; TSubModel const *m_pickcontrolitem { nullptr }; std::vector m_picksceneryitems; diff --git a/version.h b/version.h index fc5a435c..33eb12ee 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1224 -#define VERSION_REVISION 0 +#define VERSION_MINOR 1227 +#define VERSION_REVISION 1 From d0c67eef3b21ddef41bb2762437b3cbea456bcfa Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 28 Dec 2017 23:14:37 +0100 Subject: [PATCH 244/426] translucent submodels animation fix, minor rendering optimizations --- renderer.cpp | 166 +++++++++++++++++++++++++++++---------------------- 1 file changed, 96 insertions(+), 70 deletions(-) diff --git a/renderer.cpp b/renderer.cpp index 286accde..506bd4ef 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -621,7 +621,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { #ifdef EU07_USE_DEBUG_CABSHADOWMAP setup_units( true, false, false ); #else - setup_units( true, false, false ); + setup_units( false, false, false ); #endif Render_cab( World.Train->Dynamic(), false ); Render_cab( World.Train->Dynamic(), true ); @@ -1948,7 +1948,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { ++m_debugstats.dynamics; // setup - TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji + TSubModel::iInstance = ( size_t )Dynamic; //żeby nie robić cudzych animacji glm::dvec3 const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); // lod visibility ranges are defined for base (x 1.0) viewing distance. for render we adjust them for actual range multiplier and zoom float squaredistance; @@ -2251,7 +2251,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { /* setup_shadow_color( colors::white ); */ - switch_units( m_unitstate.diffuse, false, false ); + switch_units( unitstate.diffuse, false, false ); } // main draw call @@ -2267,7 +2267,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { /* setup_shadow_color( m_shadowcolor ); */ - switch_units( m_unitstate.diffuse, unitstate.shadows, unitstate.reflections ); + switch_units( unitstate.diffuse, unitstate.shadows, unitstate.reflections ); } #ifdef EU07_USE_OPTIMIZED_NORMALIZATION switch( Submodel->m_normalizenormals ) { @@ -2378,7 +2378,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { /* setup_shadow_color( m_shadowcolor ); */ - switch_units( m_unitstate.diffuse, unitstate.shadows, unitstate.reflections ); + switch_units( unitstate.diffuse, unitstate.shadows, unitstate.reflections ); ::glPopMatrix(); ::glPopAttrib(); @@ -2876,7 +2876,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { if( false == Dynamic->renderme ) { return false; } // setup - TSubModel::iInstance = ( size_t )this; //żeby nie robić cudzych animacji + TSubModel::iInstance = ( size_t )Dynamic; //żeby nie robić cudzych animacji glm::dvec3 const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); // lod visibility ranges are defined for base (x 1.0) viewing distance. for render we adjust them for actual range multiplier and zoom float squaredistance; @@ -3015,78 +3015,104 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { if( Submodel->eType < TP_ROTATOR ) { // renderowanie obiektów OpenGL - if( Submodel->iAlpha & Submodel->iFlags & 0x2F ) // rysuj gdy element przezroczysty - { + if( Submodel->iAlpha & Submodel->iFlags & 0x2F ) { + // rysuj gdy element przezroczysty + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + // NOTE: code disabled as normalization marking doesn't take into account scaling propagation down hierarchy chains // for the time being we'll do with enforced worst-case scaling method, when speculars are enabled #ifdef EU07_USE_OPTIMIZED_NORMALIZATION - switch( Submodel->m_normalizenormals ) { - case TSubModel::normalize: { - ::glEnable( GL_NORMALIZE ); break; } - case TSubModel::rescale: { - ::glEnable( GL_RESCALE_NORMAL ); break; } - default: { - break; } - } + switch( Submodel->m_normalizenormals ) { + case TSubModel::normalize: { + ::glEnable( GL_NORMALIZE ); break; } + case TSubModel::rescale: { + ::glEnable( GL_RESCALE_NORMAL ); break; } + default: { + break; } + } #else - if( true == m_renderspecular ) { - ::glEnable( GL_NORMALIZE ); - } + if( true == m_renderspecular ) { + ::glEnable( GL_NORMALIZE ); + } #endif - // textures... - if( Submodel->m_material < 0 ) { // zmienialne skóry - Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); - } - else { - // również 0 - Bind_Material( Submodel->m_material ); - } - // ...colors... - ::glColor3fv( glm::value_ptr(Submodel->f4Diffuse) ); // McZapkie-240702: zamiast ub - if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_speculartranslucentscalefactor ) ); - } - // ...luminance - auto const unitstate = m_unitstate; - if( Global::fLuminance < Submodel->fLight ) { - // zeby swiecilo na kolorowo - ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); - // disable shadows so they don't obstruct self-lit items + // material configuration: + // textures... + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); + } + else { + // również 0 + Bind_Material( Submodel->m_material ); + } + // ...colors... + ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub + if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_speculartranslucentscalefactor ) ); + } + // ...luminance + auto const unitstate = m_unitstate; + if( Global::fLuminance < Submodel->fLight ) { + // zeby swiecilo na kolorowo + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); + // disable shadows so they don't obstruct self-lit items /* - setup_shadow_color( colors::white ); + setup_shadow_color( colors::white ); */ - switch_units( m_unitstate.diffuse, false, false ); - } + switch_units( unitstate.diffuse, false, false ); + } - // main draw call - m_geometry.draw( Submodel->m_geometry ); + // main draw call + m_geometry.draw( Submodel->m_geometry ); - // post-draw reset - if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); - } - if( Global::fLuminance < Submodel->fLight ) { - // restore default (lack of) brightness - ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); + // post-draw reset + if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); + } + if( Global::fLuminance < Submodel->fLight ) { + // restore default (lack of) brightness + ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); /* - setup_shadow_color( m_shadowcolor ); + setup_shadow_color( m_shadowcolor ); */ - switch_units( m_unitstate.diffuse, unitstate.shadows, unitstate.reflections ); - } + switch_units( unitstate.diffuse, unitstate.shadows, unitstate.reflections ); + } #ifdef EU07_USE_OPTIMIZED_NORMALIZATION - switch( Submodel->m_normalizenormals ) { - case TSubModel::normalize: { - ::glDisable( GL_NORMALIZE ); break; } - case TSubModel::rescale: { - ::glDisable( GL_RESCALE_NORMAL ); break; } - default: { - break; } - } + switch( Submodel->m_normalizenormals ) { + case TSubModel::normalize: { + ::glDisable( GL_NORMALIZE ); break; } + case TSubModel::rescale: { + ::glDisable( GL_RESCALE_NORMAL ); break; } + default: { + break; } + } #else - if( true == m_renderspecular ) { - ::glDisable( GL_NORMALIZE ); - } + if( true == m_renderspecular ) { + ::glDisable( GL_NORMALIZE ); + } #endif + break; + } + case rendermode::cabshadows: { + // scenery picking and shadow both use enforced colour and no frills + // material configuration: + // textures... + if( Submodel->m_material < 0 ) { // zmienialne skóry + Bind_Material( Submodel->ReplacableSkinId[ -Submodel->m_material ] ); + } + else { + // również 0 + Bind_Material( Submodel->m_material ); + } + // main draw call + m_geometry.draw( Submodel->m_geometry ); + // post-draw reset + break; + } + default: { + break; + } + } } } else if( Submodel->eType == TP_FREESPOTLIGHT ) { @@ -3128,7 +3154,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { setup_shadow_color( colors::white ); */ auto const unitstate = m_unitstate; - switch_units( m_unitstate.diffuse, false, false ); + switch_units( unitstate.diffuse, false, false ); // main draw call m_geometry.draw( m_billboardgeometry ); @@ -3144,7 +3170,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { /* setup_shadow_color( m_shadowcolor ); */ - switch_units( m_unitstate.diffuse, unitstate.shadows, unitstate.reflections ); + switch_units( unitstate.diffuse, unitstate.shadows, unitstate.reflections ); ::glPopMatrix(); ::glPopAttrib(); @@ -3182,10 +3208,10 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { if( Submodel->iFlags & 0xC000 ) ::glPopMatrix(); } - +/* if( Submodel->b_aAnim < at_SecondsJump ) Submodel->b_aAnim = at_None; // wyłączenie animacji dla kolejnego użycia submodelu - +*/ if( Submodel->Next != nullptr ) if( Submodel->iAlpha & Submodel->iFlags & 0x2F000000 ) Render_Alpha( Submodel->Next ); @@ -3309,8 +3335,8 @@ opengl_renderer::Update( double const Deltatime ) { float targetfactor; if( framerate > 90.0 ) { targetfactor = 3.0f; } else if( framerate > 60.0 ) { targetfactor = 1.5f; } - else if( framerate > 30.0 ) { targetfactor = Global::iWindowHeight / 768.0f; } - else { targetfactor = Global::iWindowHeight / 768.0f * 0.75f; } + else if( framerate > 30.0 ) { targetfactor = 1.25; } + else { targetfactor = std::max( Global::iWindowHeight / 768.f, 1.f ); } if( targetfactor > Global::fDistanceFactor ) { From 04398e9fcf04e8ba65e1fcb7b8c5d284e6824819 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 31 Dec 2017 20:47:38 +0100 Subject: [PATCH 245/426] build 171231. cab indicators for released brakes, inactive converter, compressor and main breaker; minor bug fixes --- Driver.cpp | 5 ++- DynObj.cpp | 4 -- Train.cpp | 107 ++++++++++++++++++++++++++++++--------------------- Train.h | 7 ++++ renderer.cpp | 6 ++- version.h | 4 +- 6 files changed, 79 insertions(+), 54 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index b0294a2b..d1799d1f 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -3529,7 +3529,7 @@ TController::UpdateSituation(double dt) { // if (mvOccupied->BrakePress<0.08) //to wystarczy, że zadziałają liniowe (nie ma ich jeszcze!!!) if (fReady < 0.8) // delikatniejszy warunek, obejmuje wszystkie wagony Ready = true; //żeby uznać za odhamowany - // second pass, for diesel engines verify the engines are fully started + // second pass, for diesel engines verify the (live) engines are fully started // TODO: cache presence of diesel engines in the consist, to skip this test if there isn't any p = pVehicles[ 0 ]; // pojazd na czole składu while( ( true == Ready ) @@ -3541,7 +3541,8 @@ TController::UpdateSituation(double dt) { || ( vehicle->EngineType == DieselElectric ) ) { Ready = ( - ( vehicle->Vel > 0.5 ) + ( vehicle->Vel > 0.5 ) // already moving + || ( false == vehicle->Mains ) // deadweight vehicle || ( vehicle->enrot > 0.8 * ( vehicle->EngineType == DieselEngine ? vehicle->dizel_nmin : diff --git a/DynObj.cpp b/DynObj.cpp index e4f21474..8a927106 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4778,8 +4778,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // szum podczas jazdy: m_wheelflat.deserialize( parser, sound_type::single, sound_parameters::frequency ); m_wheelflat.owner( this ); - - m_wheelflat.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); } } while( ( token != "" ) @@ -4942,8 +4940,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, if( true == m_wheelflat.empty() ) { m_wheelflat.deserialize( "lomotpodkucia.wav 0.23 0.0", sound_type::single, sound_parameters::frequency ); m_wheelflat.owner( this ); - - m_wheelflat.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); } if( true == rscurve.empty() ) { // hunter-111211: domyslne, gdy brak diff --git a/Train.cpp b/Train.cpp index bf2fc36a..32739395 100644 --- a/Train.cpp +++ b/Train.cpp @@ -3771,8 +3771,15 @@ bool TTrain::Update( double const Deltatime ) || (true == mvControlled->Mains) ) ? true : false ) ); + // NOTE: 'off' variant uses the same test, but opposite resulting states + btLampkaWylSzybkiOff.Turn( + ( ( ( m_linebreakerstate > 0 ) + || ( true == mvControlled->Mains ) ) ? + false : + true ) ); - btLampkaPrzetw.Turn( !mvControlled->ConverterFlag ); + btLampkaPrzetw.Turn( mvControlled->ConverterFlag ); + btLampkaPrzetwOff.Turn( false == mvControlled->ConverterFlag ); btLampkaNadmPrzetw.Turn( mvControlled->ConvOvldFlag ); btLampkaOpory.Turn( @@ -3818,6 +3825,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaNapNastHam.Turn(mvControlled->ActiveDir != 0); // napiecie na nastawniku hamulcowym btLampkaSprezarka.Turn(mvControlled->CompressorFlag); // mutopsitka dziala + btLampkaSprezarkaOff.Turn( false == mvControlled->CompressorFlag ); // boczniki unsigned char scp; // Ra: dopisałem "unsigned" // Ra: w SU45 boczniki wchodzą na MainCtrlPos, a nie na MainCtrlActualPos @@ -3838,23 +3846,11 @@ bool TTrain::Update( double const Deltatime ) btLampkaBocznik3.Turn( false ); btLampkaBocznik4.Turn( false ); } - /* - { //sprezarka w drugim wozie - bool comptemp=false; - if (DynamicObject->NextConnected) - if - (TestFlag(mvControlled->Couplers[1].CouplingFlag,ctrain_controll)) - comptemp=DynamicObject->NextConnected->MoverParameters->CompressorFlag; - if ((DynamicObject->PrevConnected) && (!comptemp)) - if - (TestFlag(mvControlled->Couplers[0].CouplingFlag,ctrain_controll)) - comptemp=DynamicObject->PrevConnected->MoverParameters->CompressorFlag; - btLampkaSprezarkaB.Turn(comptemp); - */ } else { // wylaczone btLampkaWylSzybki.Turn( false ); + btLampkaWylSzybkiOff.Turn( false ); btLampkaWysRozr.Turn( false ); btLampkaOpory.Turn( false ); btLampkaStyczn.Turn( false ); @@ -3863,8 +3859,10 @@ bool TTrain::Update( double const Deltatime ) btLampkaBoczniki.Turn( false ); btLampkaNapNastHam.Turn( false ); btLampkaPrzetw.Turn( false ); + btLampkaPrzetwOff.Turn( false ); btLampkaNadmPrzetw.Turn( false ); btLampkaSprezarka.Turn( false ); + btLampkaSprezarkaOff.Turn( false ); btLampkaBezoporowa.Turn( false ); } if (mvControlled->Signalling == true) { @@ -3904,6 +3902,7 @@ bool TTrain::Update( double const Deltatime ) if ( mvControlled->Battery || mvControlled->ConverterFlag ) { btLampkaWylSzybkiB.Turn( tmp->MoverParameters->Mains ); + btLampkaWylSzybkiBOff.Turn( false == tmp->MoverParameters->Mains ); btLampkaOporyB.Turn(tmp->MoverParameters->ResistorsFlagCheck()); btLampkaBezoporowaB.Turn( @@ -3942,8 +3941,8 @@ bool TTrain::Update( double const Deltatime ) btLampkaPoslizg.Turn(tmp->MoverParameters->SlippingWheels); //----------------- - btLampkaSprezarkaB.Turn( - tmp->MoverParameters->CompressorFlag); // mutopsitka dziala + btLampkaSprezarkaB.Turn( tmp->MoverParameters->CompressorFlag ); // mutopsitka dziala + btLampkaSprezarkaBOff.Turn( false == tmp->MoverParameters->CompressorFlag ); if ((tmp->MoverParameters->BrakePress >= 0.145f * 10) && (mvControlled->Battery == true) && (mvControlled->Signalling == true)) { @@ -3954,39 +3953,46 @@ bool TTrain::Update( double const Deltatime ) { btLampkaHamowanie2zes.Turn( false ); } - btLampkaNadmPrzetwB.Turn( - tmp->MoverParameters->ConvOvldFlag); // nadmiarowy przetwornicy? - btLampkaPrzetwB.Turn( - !tmp->MoverParameters->ConverterFlag); // zalaczenie przetwornicy + btLampkaNadmPrzetwB.Turn( tmp->MoverParameters->ConvOvldFlag ); // nadmiarowy przetwornicy? + btLampkaPrzetwB.Turn( tmp->MoverParameters->ConverterFlag ); // zalaczenie przetwornicy + btLampkaPrzetwBOff.Turn( false == tmp->MoverParameters->ConverterFlag ); } else // wylaczone { btLampkaWylSzybkiB.Turn( false ); + btLampkaWylSzybkiBOff.Turn( false ); btLampkaOporyB.Turn( false ); btLampkaStycznB.Turn( false ); btLampkaSprezarkaB.Turn( false ); + btLampkaSprezarkaBOff.Turn( false ); btLampkaBezoporowaB.Turn( false ); btLampkaHamowanie2zes.Turn( false ); btLampkaNadmPrzetwB.Turn( false ); btLampkaPrzetwB.Turn( false ); + btLampkaPrzetwBOff.Turn( false ); } } - if( mvControlled->Battery || mvControlled->ConverterFlag ) - { - switch (mvControlled->TrainType) - { // zależnie od typu lokomotywy - case dt_EZT: - btLampkaHamienie.Turn((mvControlled->BrakePress >= 0.2) && - mvControlled->Signalling); - break; - case dt_ET41: // odhamowanie drugiego członu - if (mvSecond) // bo może komuś przyjść do głowy jeżdżenie jednym członem - btLampkaHamienie.Turn(mvSecond->BrakePress < 0.4); - break; - default: - btLampkaHamienie.Turn((mvOccupied->BrakePress >= 0.1) || - mvControlled->DynamicBrakeFlag); + if( mvControlled->Battery || mvControlled->ConverterFlag ) { + switch (mvControlled->TrainType) { + // zależnie od typu lokomotywy + case dt_EZT: { + btLampkaHamienie.Turn( ( mvControlled->BrakePress >= 0.2 ) && mvControlled->Signalling ); + break; + } + case dt_ET41: { + // odhamowanie drugiego członu + if( mvSecond ) { + // bo może komuś przyjść do głowy jeżdżenie jednym członem + btLampkaHamienie.Turn( mvSecond->BrakePress < 0.4 ); + } + break; + } + default: { + btLampkaHamienie.Turn( ( mvOccupied->BrakePress >= 0.1 ) || mvControlled->DynamicBrakeFlag ); + btLampkaBrakingOff.Turn( ( mvOccupied->BrakePress < 0.1 ) && ( false == mvControlled->DynamicBrakeFlag ) ); + break; + } } // KURS90 btLampkaMaxSila.Turn(abs(mvControlled->Im) >= 350); @@ -4017,6 +4023,7 @@ bool TTrain::Update( double const Deltatime ) else { // gdy bateria wyłączona btLampkaHamienie.Turn( false ); + btLampkaBrakingOff.Turn( false ); btLampkaMaxSila.Turn( false ); btLampkaPrzekrMaxSila.Turn( false ); btLampkaRadio.Turn( false ); @@ -6053,20 +6060,24 @@ void TTrain::clear_cab_controls() // Numer 14 jest używany dla buczka SHP w innym miejscu btLampkaPoslizg.Clear(6); btLampkaStyczn.Clear(5); - btLampkaNadmPrzetw.Clear((mvControlled->TrainType & (dt_EZT)) ? -1 : - 7); // EN57 nie ma tej lampki - btLampkaPrzetw.Clear((mvControlled->TrainType & (dt_EZT)) ? 7 : -1); // za to ma tę + btLampkaNadmPrzetw.Clear(((mvControlled->TrainType & dt_EZT) != 0) ? -1 : 7); // EN57 nie ma tej lampki + btLampkaPrzetw.Clear(); + btLampkaPrzetwOff.Clear(((mvControlled->TrainType & dt_EZT) != 0) ? 7 : -1 ); // za to ma tę + btLampkaPrzetwB.Clear(); + btLampkaPrzetwBOff.Clear(); btLampkaPrzekRozn.Clear(); btLampkaPrzekRoznPom.Clear(); btLampkaNadmSil.Clear(4); btLampkaUkrotnienie.Clear(); btLampkaHamPosp.Clear(); btLampkaWylSzybki.Clear(3); + btLampkaWylSzybkiOff.Clear(); + btLampkaWylSzybkiB.Clear(); + btLampkaWylSzybkiBOff.Clear(); btLampkaNadmWent.Clear(9); btLampkaNadmSpr.Clear(8); btLampkaOpory.Clear(2); - btLampkaWysRozr.Clear((mvControlled->TrainType & (dt_ET22)) ? -1 : - 10); // ET22 nie ma tej lampki + btLampkaWysRozr.Clear(((mvControlled->TrainType & dt_ET22) != 0) ? -1 : 10); // ET22 nie ma tej lampki btLampkaBezoporowa.Clear(); btLampkaBezoporowaB.Clear(); btLampkaMaxSila.Clear(); @@ -6090,15 +6101,16 @@ void TTrain::clear_cab_controls() btLampkaBocznik4.Clear(); btLampkaRadiotelefon.Clear(); btLampkaHamienie.Clear(); + btLampkaBrakingOff.Clear(); btLampkaSprezarka.Clear(); btLampkaSprezarkaB.Clear(); + btLampkaSprezarkaOff.Clear(); + btLampkaSprezarkaBOff.Clear(); btLampkaNapNastHam.Clear(); btLampkaStycznB.Clear(); btLampkaHamowanie1zes.Clear(); btLampkaHamowanie2zes.Clear(); btLampkaNadmPrzetwB.Clear(); - btLampkaPrzetwB.Clear(); - btLampkaWylSzybkiB.Clear(); btLampkaForward.Clear(); btLampkaBackward.Clear(); // light indicators @@ -6333,12 +6345,18 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-contactors:", btLampkaStyczn }, { "i-conv_ovld:", btLampkaNadmPrzetw }, { "i-converter:", btLampkaPrzetw }, + { "i-converteroff:", btLampkaPrzetwOff }, + { "i-converterb:", btLampkaPrzetwB }, + { "i-converterboff:", btLampkaPrzetwBOff }, { "i-diff_relay:", btLampkaPrzekRozn }, { "i-diff_relay2:", btLampkaPrzekRoznPom }, { "i-motor_ovld:", btLampkaNadmSil }, { "i-train_controll:", btLampkaUkrotnienie }, { "i-brake_delay_r:", btLampkaHamPosp }, { "i-mainbreaker:", btLampkaWylSzybki }, + { "i-mainbreakerb:", btLampkaWylSzybkiB }, + { "i-mainbreakeroff:", btLampkaWylSzybkiOff }, + { "i-mainbreakerboff:", btLampkaWylSzybkiBOff }, { "i-vent_ovld:", btLampkaNadmWent }, { "i-comp_ovld:", btLampkaNadmSpr }, { "i-resistors:", btLampkaOpory }, @@ -6359,17 +6377,18 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-scnd3:", btLampkaBocznik3 }, { "i-scnd4:", btLampkaBocznik4 }, { "i-braking:", btLampkaHamienie }, + { "i-brakingoff:", btLampkaBrakingOff }, { "i-dynamicbrake:", btLampkaED }, { "i-braking-ezt:", btLampkaHamowanie1zes }, { "i-braking-ezt2:", btLampkaHamowanie2zes }, { "i-compressor:", btLampkaSprezarka }, { "i-compressorb:", btLampkaSprezarkaB }, + { "i-compressoroff:", btLampkaSprezarkaOff }, + { "i-compressorboff:", btLampkaSprezarkaBOff }, { "i-voltbrake:", btLampkaNapNastHam }, - { "i-mainbreakerb:", btLampkaWylSzybkiB }, { "i-resistorsb:", btLampkaOporyB }, { "i-contactorsb:", btLampkaStycznB }, { "i-conv_ovldb:", btLampkaNadmPrzetwB }, - { "i-converterb:", btLampkaPrzetwB }, { "i-forward:", btLampkaForward }, { "i-backward:", btLampkaBackward }, { "i-upperlight:", btLampkaUpperLight }, diff --git a/Train.h b/Train.h index b91fa1b8..783758e1 100644 --- a/Train.h +++ b/Train.h @@ -310,18 +310,22 @@ public: // reszta może by?publiczna TButton btLampkaStyczn; TButton btLampkaNadmPrzetw; TButton btLampkaPrzetw; + TButton btLampkaPrzetwOff; TButton btLampkaPrzekRozn; TButton btLampkaPrzekRoznPom; TButton btLampkaNadmSil; TButton btLampkaWylSzybki; + TButton btLampkaWylSzybkiOff; TButton btLampkaNadmWent; TButton btLampkaNadmSpr; // yB: drugie lampki dla EP05 i ET42 TButton btLampkaOporyB; TButton btLampkaStycznB; TButton btLampkaWylSzybkiB; + TButton btLampkaWylSzybkiBOff; TButton btLampkaNadmPrzetwB; TButton btLampkaPrzetwB; + TButton btLampkaPrzetwBOff; // KURS90 lampki jazdy bezoporowej dla EU04 TButton btLampkaBezoporowaB; TButton btLampkaBezoporowa; @@ -344,12 +348,15 @@ public: // reszta może by?publiczna TButton btLampkaNapNastHam; TButton btLampkaSprezarka; TButton btLampkaSprezarkaB; + TButton btLampkaSprezarkaOff; + TButton btLampkaSprezarkaBOff; TButton btLampkaBocznik1; TButton btLampkaBocznik2; TButton btLampkaBocznik3; TButton btLampkaBocznik4; TButton btLampkaRadiotelefon; TButton btLampkaHamienie; + TButton btLampkaBrakingOff; TButton btLampkaED; // Stele 161228 hamowanie elektrodynamiczne // KURS90 TButton btLampkaBoczniki; diff --git a/renderer.cpp b/renderer.cpp index 506bd4ef..7a7303d2 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -425,7 +425,9 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // run shadowmaps pass before color Timer::subsystem.gfx_shadows.start(); Render_pass( rendermode::shadows ); - Render_pass( rendermode::cabshadows ); + if( false == FreeFlyModeFlag ) { + Render_pass( rendermode::cabshadows ); + } Timer::subsystem.gfx_shadows.stop(); m_debugtimestext += "shadows: " + to_string( Timer::subsystem.gfx_shadows.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) "; #ifdef EU07_USE_DEBUG_SHADOWMAP @@ -758,7 +760,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f switch( Mode ) { case rendermode::color: { Config.draw_range = Global::BaseDrawRange; break; } case rendermode::shadows: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } - case rendermode::cabshadows: { Config.draw_range = 10.f; break; } + case rendermode::cabshadows: { Config.draw_range = ( Global::pWorld->train()->Dynamic()->MoverParameters->ActiveCab != 0 ? 10.f : 20.f ); break; } case rendermode::reflections: { Config.draw_range = Global::BaseDrawRange; break; } case rendermode::pickcontrols: { Config.draw_range = 50.f; break; } case rendermode::pickscenery: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } diff --git a/version.h b/version.h index 33eb12ee..e1eaf929 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 17 -#define VERSION_MINOR 1227 -#define VERSION_REVISION 1 +#define VERSION_MINOR 1231 +#define VERSION_REVISION 0 From fdb99eedc646bc7ef6e83883239a9a9eac6434db Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 2 Jan 2018 20:30:38 +0100 Subject: [PATCH 246/426] sound transcripts, event-started sound persistence --- Event.cpp | 4 ++-- Globals.cpp | 23 +++-------------------- Globals.h | 2 +- audio.cpp | 16 ++++++++++++++++ audio.h | 7 ++++++- audiorenderer.h | 7 +++++-- scene.cpp | 21 +-------------------- scene.h | 8 -------- sound.cpp | 20 ++++++++++++++++++-- sound.h | 12 ++++++++---- 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/Event.cpp b/Event.cpp index 85489d22..58d67788 100644 --- a/Event.cpp +++ b/Event.cpp @@ -1039,12 +1039,12 @@ event_manager::CheckQuery() { static_cast( m_workevent->Params[ 1 ].asdouble ) ); } else { - m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive ); + m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive | sound_flags::event ); } break; } case -1: { - m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive | sound_flags::looping ); + m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive | sound_flags::looping | sound_flags::event ); break; } default: { diff --git a/Globals.cpp b/Globals.cpp index 7ed2f2e2..098a9ba6 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -1050,28 +1050,11 @@ void TTranscripts::AddLine(std::string const &txt, float show, float hide, bool } */ }; -void TTranscripts::Add(std::string const &txt, float len, bool backgorund) +void TTranscripts::Add(std::string const &txt, bool backgorund) { // dodanie tekstów, długość dźwięku, czy istotne if (true == txt.empty()) return; // pusty tekst -/* - int i = 0, j = int(0.5 + 10.0 * len); //[0.1s] - if (*txt == '[') - { // powinny być dwa nawiasy - while (*++txt ? *txt != ']' : false) - if ((*txt >= '0') && (*txt <= '9')) - i = 10 * i + int(*txt - '0'); // pierwsza liczba aż do ] - if (*txt ? *++txt == '[' : false) - { - j = 0; // drugi nawias określa czas zakończenia wyświetlania - while (*++txt ? *txt != ']' : false) - if ((*txt >= '0') && (*txt <= '9')) - j = 10 * j + int(*txt - '0'); // druga liczba aż do ] - if (*txt) - ++txt; // pominięcie drugiego ] - } - } -*/ + std::string asciitext{ txt }; win1250_to_ascii( asciitext ); // TODO: launch relevant conversion table based on language cParser parser( asciitext ); while( true == parser.getTokens( 3, false, "[]\n" ) ) { @@ -1088,7 +1071,7 @@ void TTranscripts::Add(std::string const &txt, float len, bool backgorund) std::string transcript; parser >> transcript; while( false == transcript.empty() ) { - WriteLog( "Transcript text with no display/hide times: \"" + transcript + "\"" ); +// WriteLog( "Transcript text with no display/hide times: \"" + transcript + "\"" ); AddLine( transcript, 0.0, 0.12 * transcript.size(), false ); transcript = ""; parser >> transcript; } diff --git a/Globals.h b/Globals.h index 145ca3f7..6bdc090e 100644 --- a/Globals.h +++ b/Globals.h @@ -133,7 +133,7 @@ private: ~TTranscripts(); void AddLine(std::string const &txt, float show, float hide, bool it); // dodanie tekstów, długość dźwięku, czy istotne - void Add(std::string const &txt, float len, bool background = false); + void Add(std::string const &txt, bool background = false); // usuwanie niepotrzebnych (ok. 10 razy na sekundę) void Update(); }; diff --git a/audio.cpp b/audio.cpp index e3b4f6e1..63c36a5d 100644 --- a/audio.cpp +++ b/audio.cpp @@ -65,6 +65,8 @@ openal_buffer::openal_buffer( std::string const &Filename ) : // and get rid of the source, we shouldn't need it anymore // TBD, TODO: delay data fetching and transfers until the buffer is actually used? std::vector().swap( data ); + + fetch_caption(); } // mix specified number of interleaved multi-channel data, down to mono @@ -87,6 +89,20 @@ openal_buffer::narrow_to_mono( std::uint16_t const Channelcount ) { } } +// retrieves sound caption in currently set language +void +openal_buffer::fetch_caption() { + + std::string captionfilename { name }; + captionfilename.erase( captionfilename.rfind( '.' ) ); // obcięcie rozszerzenia + captionfilename += "-" + Global::asLang + ".txt"; // już może być w różnych językach + if( true == FileExists( captionfilename ) ) { + // wczytanie + std::ifstream inputfile( captionfilename ); + caption.assign( std::istreambuf_iterator( inputfile ), std::istreambuf_iterator() ); + } +} + buffer_manager::~buffer_manager() { diff --git a/audio.h b/audio.h index 8bec3f11..f9642600 100644 --- a/audio.h +++ b/audio.h @@ -20,11 +20,16 @@ ALuint const null_resource{ ~( ALuint { 0 } ) }; struct openal_buffer { // members ALuint id { null_resource }; // associated AL resource - unsigned int rate { 0 }; // sample rate of the data + unsigned int rate {}; // sample rate of the data std::string name; + std::string caption; // constructors openal_buffer() = default; explicit openal_buffer( std::string const &Filename ); +// methods + // retrieves sound caption in currently set language + void + fetch_caption(); private: // methods diff --git a/audiorenderer.h b/audiorenderer.h index 4ab63ec4..e20608f2 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -162,8 +162,11 @@ openal_source::bind( sound_source *Controller, uint32_sequence Sounds, Iterator_ std::vector buffers; std::for_each( First, Last, - [&]( audio::buffer_handle const &buffer ) { - buffers.emplace_back( audio::renderer.buffer( buffer ).id ); } ); + [&]( audio::buffer_handle const &bufferhandle ) { + auto const &buffer { audio::renderer.buffer( bufferhandle ) }; + buffers.emplace_back( buffer.id ); + if( false == buffer.caption.empty() ) { + Global::tranTexts.Add( buffer.caption ); } } ); if( id != audio::null_resource ) { ::alSourceQueueBuffers( id, static_cast( buffers.size() ), buffers.data() ); diff --git a/scene.cpp b/scene.cpp index 22bda992..9487a7b6 100644 --- a/scene.cpp +++ b/scene.cpp @@ -122,16 +122,9 @@ basic_cell::update_events() { void basic_cell::update_sounds() { - // sounds auto const deltatime = Timer::GetDeltaRenderTime(); for( auto *sound : m_sounds ) { -#ifdef EU07_USE_OLD_SOUNDCODE - if( ( sound->GetStatus() & DSBSTATUS_PLAYING ) == DSBPLAY_LOOPING ) { - sound->Play( 1, DSBPLAY_LOOPING, true, sound->vSoundPosition ); - sound->AdjFreq( 1.0, deltatime ); - } -#else -#endif + sound->play_event(); } // TBD, TODO: move to sound renderer for( auto *path : m_paths ) { @@ -350,11 +343,7 @@ basic_cell::insert( TAnimModel *Instance ) { // adds provided sound instance to the cell void -#ifdef EU07_USE_OLD_SOUNDCODE -basic_cell::insert( TTextSound *Sound ) { -#else basic_cell::insert( sound_source *Sound ) { -#endif m_active = true; @@ -1177,13 +1166,7 @@ basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) // inserts provided sound in the region void -#ifdef EU07_USE_OLD_SOUNDCODE -basic_region::insert_sound( TTextSound *Sound, scratch_data &Scratchpad ) { -#else basic_region::insert_sound( sound_source *Sound, scratch_data &Scratchpad ) { -#endif - -#ifdef EU07_USE_OLD_SOUNDCODE // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done auto location = Sound->location(); @@ -1195,8 +1178,6 @@ basic_region::insert_sound( sound_source *Sound, scratch_data &Scratchpad ) { // tracks are guaranteed to hava a name so we can skip the check ErrorLog( "Bad scenario: sound node \"" + Sound->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); } -#else -#endif } // inserts provided event launcher in the region diff --git a/scene.h b/scene.h index ce1db91f..c5e7e620 100644 --- a/scene.h +++ b/scene.h @@ -149,11 +149,7 @@ private: using path_sequence = std::vector; using traction_sequence = std::vector; using instance_sequence = std::vector; -#ifdef EU07_USE_OLD_SOUNDCODE - using sound_sequence = std::vector; -#else using sound_sequence = std::vector; -#endif using eventlauncher_sequence = std::vector; // methods void @@ -320,11 +316,7 @@ public: insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ); // inserts provided sound in the region void -#ifdef EU07_USE_OLD_SOUNDCODE - insert_sound( TTextSound *Sound, scratch_data &Scratchpad ); -#else insert_sound( sound_source *Sound, scratch_data &Scratchpad ); -#endif // inserts provided event launcher in the region void insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpad ); diff --git a/sound.cpp b/sound.cpp index be90f6e2..9f768644 100644 --- a/sound.cpp +++ b/sound.cpp @@ -289,6 +289,10 @@ sound_source::play( int const Flags ) { // if the sound is disabled altogether or nothing can be emitted from this source, no point wasting time return; } + + // NOTE: we cache the flags early, even if the sound is out of range, to mark activated event sounds + m_flags = Flags; + if( m_range > 0 ) { auto const cutoffrange { m_range * 5 }; if( glm::length2( location() - glm::dvec3 { Global::pCameraPosition } ) > std::min( 2750.f * 2750.f, cutoffrange * cutoffrange ) ) { @@ -304,8 +308,6 @@ sound_source::play( int const Flags ) { m_pitchvariation = 0.01f * static_cast( Random( 97.5, 102.5 ) ); } - m_flags = Flags; - if( sound( sound_id::main ).buffer != null_handle ) { // basic variant: single main sound, with optional bookends play_basic(); @@ -401,12 +403,26 @@ sound_source::compute_combined_point() const { ) * 100.f; } +// maintains playback of sounds started by event +void +sound_source::play_event() { + + if( true == TestFlag( m_flags, ( sound_flags::event | sound_flags::looping ) ) ) { + // events can potentially start scenery sounds out of the sound's audible range + // such sounds are stopped on renderer side, but unless stopped by the simulation keep their activation flags + // we use this to discern event-started sounds which should be re-activated if the listener gets close enough + play( m_flags ); + } +} + // stops currently active play commands controlled by this emitter void sound_source::stop( bool const Skipend ) { // if the source was stopped on simulation side, we should play the opening bookend next time it's activated m_playbeginning = true; + // clear the event flags to discern between manual stop and out-of-range/sound-end stop + m_flags = 0; if( false == is_playing() ) { return; } diff --git a/sound.h b/sound.h index b1590c4b..816cfdcc 100644 --- a/sound.h +++ b/sound.h @@ -30,7 +30,8 @@ enum sound_parameters { enum sound_flags { looping = 0x1, // the main sample will be looping; implied for multi-sounds - exclusive = 0x2 // the source won't dispatch more than one active instance of the sound; implied for multi-sounds + exclusive = 0x2, // the source won't dispatch more than one active instance of the sound; implied for multi-sounds + event = 0x80 // sound was activated by an event; we should keep note of the activation state for the update() calls it may receive }; enum class sound_placement { @@ -64,6 +65,9 @@ public: // issues contextual play commands for the audio renderer void play( int const Flags = 0 ); + // maintains playback of sounds started by event + void + play_event(); // stops currently active play commands controlled by this emitter void stop( bool const Skipend = false ); @@ -194,15 +198,15 @@ private: sound_placement m_placement; float m_range { 50.f }; // audible range of the emitted sounds std::string m_name; - int m_flags { 0 }; // requested playback parameters + int m_flags {}; // requested playback parameters sound_properties m_properties; // current properties of the emitted sounds - float m_pitchvariation { 0.f }; // emitter-specific shift in base pitch + float m_pitchvariation {}; // emitter-specific shift in base pitch bool m_stop { false }; // indicates active sample instances should be terminated bool m_playbeginning { true }; // indicates started sounds should be preceeded by opening bookend if there's one std::array m_sounds { {} }; // basic sounds emitted by the source, main and optional bookends std::vector m_soundchunks; // table of samples activated when associated variable is within certain range bool m_soundchunksempty { true }; // helper, cached check whether sample table is linked with any actual samples - int m_crossfaderange {}; // range of transition from one chunk to another + int m_crossfaderange {}; // range of transition from one chunk to another }; // owner setter/getter From ba26ad1918b1da3e6c22674a3de162740009259b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 2 Jan 2018 20:35:02 +0100 Subject: [PATCH 247/426] submodel location calculation fix for t3d files --- Model3d.cpp | 32 ++++++++++++++++++++++---------- Train.cpp | 41 ++++++++++++++--------------------------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/Model3d.cpp b/Model3d.cpp index 737ef26e..4ae944fb 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -653,13 +653,14 @@ void TSubModel::InitialRotate(bool doit) if (fMatrix->IdentityIs()) iFlags &= ~0x8000; // jednak jednostkowa po obróceniu } - if (Child) - Child->InitialRotate(false); // potomnych nie obracamy już, tylko - // ewentualnie optymalizujemy - else if (Global::iConvertModels & 2) // optymalizacja jest opcjonalna + if( Child ) { + // potomnych nie obracamy już, tylko ewentualnie optymalizujemy + Child->InitialRotate( false ); + } + else if (Global::iConvertModels & 2) { + // optymalizacja jest opcjonalna if ((iFlags & 0xC000) == 0x8000) // o ile nie ma animacji - { // jak nie ma potomnych, można wymnożyć przez transform i wyjedynkować - // go + { // jak nie ma potomnych, można wymnożyć przez transform i wyjedynkować go float4x4 *mat = GetMatrix(); // transform submodelu if( false == Vertices.empty() ) { for( auto &vertex : Vertices ) { @@ -680,6 +681,7 @@ void TSubModel::InitialRotate(bool doit) mat->Identity(); // jedynkowanie transformu po przeliczeniu wierzchołków iFlags &= ~0x8000; // transform jedynkowy } + } } else // jak jest jednostkowy i nie ma animacji if (doit) @@ -1165,11 +1167,11 @@ TSubModel::offset( float const Geometrytestoffsetthreshold ) const { auto offset { glm::vec3 { glm::make_mat4( parentmatrix.readArray() ) * glm::vec4 { 0, 0, 0, 1 } } }; if( glm::length2( offset ) < Geometrytestoffsetthreshold ) { - // offset of zero generally means the submodel has optimized identity matrix - // for such cases we resort to an estimate from submodel geometry - // TODO: do proper bounding area calculation for submodel when loading mesh and grab the centre point from it here + // offset of zero generally means the submodel has optimized identity matrix + // for such cases we resort to an estimate from submodel geometry + // TODO: do proper bounding area calculation for submodel when loading mesh and grab the centre point from it here if( m_geometry != null_handle ) { - auto const &vertices{ GfxRenderer.Vertices( m_geometry ) }; + auto const &vertices { GfxRenderer.Vertices( m_geometry ) }; if( false == vertices.empty() ) { // transformation matrix for the submodel can still contain rotation and/or scaling, // so we pass the vertex positions through it rather than just grab them directly @@ -1183,6 +1185,16 @@ TSubModel::offset( float const Geometrytestoffsetthreshold ) const { } } + if( true == TestFlag( iFlags, 0x0200 ) ) { + // flip coordinates for t3d file which wasn't yet initialized + if( std::abs( offset.y ) > offset.z ) { + // NOTE, HACK: results require flipping if the model wasn't yet initialized, so we're using crude method to detect possible cases + // TODO: sort out this mess, either unify offset lookups to take place before (or after) initialization, + // or provide way to determine on submodel level whether the initialization took place + offset = { -offset.x, offset.z, offset.y }; + } + } + return offset; } diff --git a/Train.cpp b/Train.cpp index 32739395..fd0dbe04 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5690,14 +5690,12 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) *parser >> token; if (token != "none") { - - Global::asCurrentTexturePath = - DynamicObject->asBaseDir; // bieżąca sciezka do tekstur to dynamic/... - TModel3d *kabina = - TModelsManager::GetModel(DynamicObject->asBaseDir + token, - true); // szukaj kabinę jako oddzielny model - Global::asCurrentTexturePath = - szTexturePath; // z powrotem defaultowa sciezka do tekstur + // bieżąca sciezka do tekstur to dynamic/... + Global::asCurrentTexturePath = DynamicObject->asBaseDir; + // szukaj kabinę jako oddzielny model + TModel3d *kabina = TModelsManager::GetModel(DynamicObject->asBaseDir + token, true); + // z powrotem defaultowa sciezka do tekstur + Global::asCurrentTexturePath = szTexturePath; // if (DynamicObject->mdKabina!=k) if (kabina != nullptr) { @@ -5708,16 +5706,11 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) // else // break; //wyjście z pętli, bo model zostaje bez zmian } - else if (cabindex == 1) - { + else if (cabindex == 1) { // model tylko, gdy nie ma kabiny 1 - DynamicObject->mdKabina = - DynamicObject - ->mdModel; // McZapkie-170103: szukaj elementy kabiny w glownym modelu + // McZapkie-170103: szukaj elementy kabiny w glownym modelu + DynamicObject->mdKabina = DynamicObject->mdModel; } -/* - Universal4Active = false; -*/ clear_cab_controls(); } if (nullptr == DynamicObject->mdKabina) @@ -5737,8 +5730,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) } else if (token == "pyscreen:") { - pyScreens.init(*parser, DynamicObject->mdKabina, DynamicObject->name(), - NewCabNo); + pyScreens.init(*parser, DynamicObject->mdKabina, DynamicObject->name(), NewCabNo); } // btLampkaUnknown.Init("unknown",mdKabina,false); } while (token != ""); @@ -5750,9 +5742,6 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) pyScreens.start(); if (DynamicObject->mdKabina) { - DynamicObject->mdKabina->Init(); // obrócenie modelu oraz optymalizacja, również zapisanie binarnego - set_cab_controls(); - // configure placement of sound emitters which aren't bound with any device model, and weren't placed manually // try first to bind sounds to location of possible devices if( dsbReverserKey.offset() == nullvector ) { @@ -5800,12 +5789,10 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) sound->offset( caboffset ); } } -/* - // HACK: for some reason simulation at the start is slow until a sound is played - // until we do a proper fix, try to play a 'silent' sound when cab is entered - // TBD: it could be instead a legit sound of door closing - play_sound( dsbSwitch, DSBVOLUME_MIN ); -*/ + + DynamicObject->mdKabina->Init(); // obrócenie modelu oraz optymalizacja, również zapisanie binarnego + set_cab_controls(); + return true; } return (token == "none"); From 8d3d50d218c90feb776e1d2b59c0029233e5bdba Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 5 Jan 2018 17:14:34 +0100 Subject: [PATCH 248/426] engine revolutions change rate tweak for diesel-electric vehicles, support for combined engine revving sound, alerter ui indicator --- DynObj.cpp | 18 ++++++---- McZapkie/Mover.cpp | 82 +++++++++++++++++++++++++++------------------- Train.cpp | 4 +-- World.cpp | 59 +++++++++++++++++++-------------- 4 files changed, 97 insertions(+), 66 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 8a927106..c966e544 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4596,6 +4596,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.engine.m_amplitudefactor /= amplitudedivisor; } + else if( token == "dieselinc:" ) { + // dzwiek przy wlazeniu na obroty woodwarda + m_powertrainsounds.engine_revving.deserialize( parser, sound_type::single, sound_parameters::range ); + m_powertrainsounds.engine_revving.owner( this ); + } + else if( ( token == "tractionmotor:" ) && ( MoverParameters->Power > 0 ) ) { // plik z dzwiekiem silnika, mnozniki i ofsety amp. i czest. @@ -4659,12 +4665,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, rsDerailment.owner( this ); } - else if( token == "dieselinc:" ) { - // dzwiek przy wlazeniu na obroty woodwarda - m_powertrainsounds.engine_revving.deserialize( parser, sound_type::single, sound_parameters::range ); - m_powertrainsounds.engine_revving.owner( this ); - } - else if( token == "curve:" ) { rscurve.deserialize( parser, sound_type::single, sound_parameters::range ); rscurve.owner( this ); @@ -5595,8 +5595,14 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub } engine_revs_last = Vehicle.enrot * 60; + if( false == engine_revving.is_combined() ) { + // if the sound comes with multiple samples we reuse rpm-based calculation from the engine + frequency = engine_revving.m_frequencyoffset + engine_revving.m_frequencyfactor * 1.0; + } + if( enginerevvolume > 0.02 ) { engine_revving + .pitch( frequency ) .gain( enginerevvolume ) .play( sound_flags::exclusive | sound_flags::looping ); } diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index cfb814e9..490ad956 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4191,43 +4191,59 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) // ************************************************************************************************* double TMoverParameters::TractionForce(double dt) { - double PosRatio, dmoment, dtrans, tmp;// , tmpV; - int i; + double PosRatio, dmoment, dtrans, tmp; Ft = 0; dtrans = 0; dmoment = 0; - // tmpV =Abs(nrot * WheelDiameter / 2); // youBy - if (EngineType == DieselElectric) - { - tmp = DElist[MainCtrlPos].RPM / 60.0; - if ((Heating) && (HeatingPower > 0) && (MainCtrlPosNo > MainCtrlPos)) - { - i = MainCtrlPosNo; - while (DElist[i - 2].RPM / 60.0 > tmp) - i--; - tmp = DElist[i].RPM / 60.0; - } + switch( EngineType ) { + case DieselElectric: { + if( true == ConverterFlag ) { + // NOTE: converter is currently a stand-in for a fuel pump + tmp = DElist[ MainCtrlPos ].RPM / 60.0; - if (enrot != tmp * int(ConverterFlag)) - if (abs(tmp * int(ConverterFlag) - enrot) < 0.001) - enrot = tmp * int(ConverterFlag); - else if ((enrot < DElist[0].RPM * 0.01) && (ConverterFlag)) - enrot += (tmp * int(ConverterFlag) - enrot) * dt / 5.0; + if( ( true == Heating ) + && ( HeatingPower > 0 ) + && ( MainCtrlPosNo > MainCtrlPos ) ) { + + int i = MainCtrlPosNo; + while( DElist[ i - 2 ].RPM / 60.0 > tmp ) { + --i; + } + tmp = DElist[ i ].RPM / 60.0; + } + } + else { + tmp = 0.0; + } + + if( enrot != tmp ) { + enrot = clamp( + enrot + ( dt / 1.25 ) * ( // TODO: equivalent of dizel_aim instead of fixed inertia + enrot < tmp ? + 1.0 : + -2.0 ), // NOTE: revolutions drop faster than they rise, maybe? TBD: maybe not + 0.0, std::max( tmp, enrot ) ); + if( std::abs( tmp - enrot ) < 0.001 ) { + enrot = tmp; + } + } + break; + } + case DieselEngine: { + if( ShuntMode ) // dodatkowa przekładnia np. dla 2Ls150 + dtrans = AnPos * Transmision.Ratio * MotorParam[ ScndCtrlActualPos ].mIsat; else - enrot += (tmp * int(ConverterFlag) - enrot) * 1.5 * dt; - } - else if (EngineType != DieselEngine) - enrot = Transmision.Ratio * nrot; - else // dla DieselEngine - { - if (ShuntMode) // dodatkowa przekładnia np. dla 2Ls150 - dtrans = AnPos * Transmision.Ratio * MotorParam[ScndCtrlActualPos].mIsat; - else - dtrans = Transmision.Ratio * MotorParam[ScndCtrlActualPos].mIsat; - dmoment = dizel_Momentum(dizel_fill, dtrans * nrot * ActiveDir, dt); // oblicza tez - // enrot + dtrans = Transmision.Ratio * MotorParam[ ScndCtrlActualPos ].mIsat; + + dmoment = dizel_Momentum( dizel_fill, dtrans * nrot * ActiveDir, dt ); // oblicza tez enrot + break; + } + default: { + enrot = Transmision.Ratio * nrot; + break; + } } eAngle += enrot * dt; @@ -4252,7 +4268,7 @@ double TMoverParameters::TractionForce(double dt) && ( ( std::abs( eimv[ eimv_If ] ) > 1.0 ) || ( tmpV > 0.1 ) ) ) { - i = 0; + int i = 0; while( ( i < RlistSize - 1 ) && ( DElist[ i + 1 ].RPM < tmpV ) ) { ++i; @@ -4891,7 +4907,7 @@ double TMoverParameters::TractionForce(double dt) dizel_fill = 0; EnginePower = 0; { - for (i = 0; i < 21; i++) + for (int i = 0; i < 21; ++i) eimv[i] = 0; } Hamulec->SetED(0); @@ -5647,7 +5663,7 @@ bool TMoverParameters::dizel_Update(double dt) enrot = std::max( enrot, - 0.1 * ( // TODO: dac zaleznie od temperatury i baterii + 0.35 * ( // TODO: dac zaleznie od temperatury i baterii EngineType == DieselEngine ? dizel_nmin : DElist[ 0 ].RPM / 60.0 ) ); diff --git a/Train.cpp b/Train.cpp index fd0dbe04..a0172819 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5306,8 +5306,8 @@ TTrain::update_sounds( double const Deltatime ) { && ( false == Global::CabWindowOpen ) && ( DynamicObject->GetVelocity() > 0.5 ) ) { - volume = rsRunningNoise.m_amplitudefactor * mvOccupied->Vel + rsRunningNoise.m_amplitudeoffset; - auto frequency { rsRunningNoise.m_frequencyfactor * mvOccupied->Vel + rsRunningNoise.m_frequencyoffset }; + volume = rsRunningNoise.m_amplitudeoffset + rsRunningNoise.m_amplitudefactor * mvOccupied->Vel; + auto frequency { rsRunningNoise.m_frequencyoffset + rsRunningNoise.m_frequencyfactor * mvOccupied->Vel }; if( std::abs( mvOccupied->nrot ) > 0.01 ) { // hamulce wzmagaja halas diff --git a/World.cpp b/World.cpp index e81860b5..c70690b6 100644 --- a/World.cpp +++ b/World.cpp @@ -688,32 +688,32 @@ void TWorld::OnKeyDown(int cKey) } } } - else if (cKey == Global::Keys[k_EndSign]) - { // Ra 2014-07: zabrane z kabiny + else if (cKey == Global::Keys[k_EndSign]) { + // Ra 2014-07: zabrane z kabiny auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, true ) ) }; - if (vehicle) + + if( vehicle == nullptr ) { return; } + + int const CouplNr { + clamp( + vehicle->DirectionGet() + * ( LengthSquared3( vehicle->HeadPosition() - Camera.Pos ) > LengthSquared3( vehicle->RearPosition() - Camera.Pos ) ? + 1 : + -1 ), + 0, 1 ) }; // z [-1,1] zrobić [0,1] + int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę tapety pulpitu :/ + if (Global::shiftState) // z [Shift] zapalanie + set = mask = light::rearendsignals; // bez [Ctrl] założyć tabliczki + else if (Global::ctrlState) + set = mask = ( light::redmarker_left | light::redmarker_right ); // z [Ctrl] zapalić światła czerwone + else + mask = ( light::rearendsignals | light::redmarker_left | light::redmarker_right ); // wyłączanie ściąga wszystko + if (((vehicle->iLights[CouplNr]) & mask) != set) { - int CouplNr = (LengthSquared3(vehicle->HeadPosition() - Camera.Pos) > - LengthSquared3(vehicle->RearPosition() - Camera.Pos) ? - 1 : - -1) * - vehicle->DirectionGet(); - if (CouplNr < 0) - CouplNr = 0; // z [-1,1] zrobić [0,1] - int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę tapety pulpitu :/ - if (Global::shiftState) // z [Shift] zapalanie - set = mask = light::rearendsignals; // bez [Ctrl] założyć tabliczki - else if (Global::ctrlState) - set = mask = ( light::redmarker_left | light::redmarker_right ); // z [Ctrl] zapalić światła czerwone - else - mask = 2 + 32 + 64; // wyłączanie ściąga wszystko - if (((vehicle->iLights[CouplNr]) & mask) != set) - { - vehicle->iLights[CouplNr] = (vehicle->iLights[CouplNr] & ~mask) | set; - if (Train) - { // Ra: ten dźwięk z kabiny to przegięcie, ale na razie zostawiam - Train->dsbSwitch.play(); - } + vehicle->iLights[CouplNr] = (vehicle->iLights[CouplNr] & ~mask) | set; + if (Train) + { // Ra: ten dźwięk z kabiny to przegięcie, ale na razie zostawiam + Train->dsbSwitch.play(); } } } @@ -1252,6 +1252,15 @@ TWorld::Update_UI() { uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + std::to_string( mover->LocalBrakePos ) + ( mover->SlippingWheels ? " !" : " " ); + uitextline4 = ( + true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? + "!ALERTER! " : + " " ); + uitextline4 += ( + true == TestFlag( mover->SecuritySystem.Status, s_active ) ? + "!SHP! " : + " " ); + if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { // detail mode on second key press uitextline2 += @@ -1265,7 +1274,7 @@ TWorld::Update_UI() { auto const trackblockdistance{ std::abs( Controlled->Mechanik->TrackBlock() ) }; if( trackblockdistance <= 75.0 ) { - uitextline4 = " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; + uitextline4 += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; } } } From 724ed1693e18043f05bfad899ea91118baf6ea8a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 7 Jan 2018 23:09:05 +0100 Subject: [PATCH 249/426] restored support for second movement speed control key, converter sound frequency calculation fix --- Camera.cpp | 322 ++++++++------------------------------------- Camera.h | 9 -- DynObj.cpp | 2 +- McZapkie/Mover.cpp | 8 +- command.cpp | 11 +- command.h | 11 +- gamepadinput.cpp | 38 +----- gamepadinput.h | 2 - keyboardinput.cpp | 172 ++++++++++-------------- keyboardinput.h | 4 +- 10 files changed, 138 insertions(+), 441 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index 175a8773..d13cd236 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -49,9 +49,8 @@ void TCamera::OnCursorMove(double x, double y) void TCamera::OnCommand( command_data const &Command ) { - double const walkspeed = 1.0; - double const runspeed = ( DebugModeFlag ? 50.0 : 7.5 ); - double const speedmultiplier = ( DebugModeFlag ? 7.5 : 1.0 ); + auto const walkspeed { 1.0 }; + auto const runspeed { 7.5 }; switch( Command.command ) { @@ -63,232 +62,67 @@ TCamera::OnCommand( command_data const &Command ) { break; } - case user_command::movevector: { + case user_command::movehorizontal: + case user_command::movehorizontalfast: { - auto const movespeed = - ( Type == tp_Free ? - runspeed * speedmultiplier : - walkspeed ); + auto const movespeed = ( + Type == tp_Free ? runspeed : + Type == tp_Follow ? walkspeed : + 0.0 ); + + auto const speedmultiplier = ( + ( ( Type == tp_Free ) && ( Command.command == user_command::movehorizontalfast ) ) ? + 30.0 : + 1.0 ); // left-right - double const movex = reinterpret_cast( Command.param1 ); - if( movex > 0.0 ) { - m_keys.right = true; - m_keys.left = false; - } - else if( movex < 0.0 ) { - m_keys.right = false; - m_keys.left = true; - } - else { - m_keys.right = false; - m_keys.left = false; - } + auto const movexparam { reinterpret_cast( Command.param1 ) }; // 2/3rd of the stick range enables walk speed, past that we lerp between walk and run speed - m_moverate.x = - walkspeed - + ( std::max( 0.0, std::abs( movex ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ); + auto const movex { walkspeed + ( std::max( 0.0, std::abs( movexparam ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ) }; + + m_moverate.x = ( + movexparam > 0.0 ? movex * speedmultiplier : + movexparam < 0.0 ? -movex * speedmultiplier : + 0.0 ); // forward-back - double const movez = reinterpret_cast( Command.param2 ); - if( movez > 0.0 ) { - m_keys.forward = true; - m_keys.back = false; - } - else if( movez < 0.0 ) { - m_keys.forward = false; - m_keys.back = true; - } - else { - m_keys.forward = false; - m_keys.back = false; - } - m_moverate.z = - walkspeed - + ( std::max( 0.0, std::abs( movez ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ); + double const movezparam { reinterpret_cast( Command.param2 ) }; + auto const movez { walkspeed + ( std::max( 0.0, std::abs( movezparam ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ) }; + // NOTE: z-axis is flipped given world coordinate system + m_moverate.z = ( + movezparam > 0.0 ? -movez * speedmultiplier : + movezparam < 0.0 ? movez * speedmultiplier : + 0.0 ); + break; } - case user_command::moveforward: { + case user_command::movevertical: + case user_command::moveverticalfast: { + + auto const movespeed = ( + Type == tp_Free ? runspeed * 0.5 : + Type == tp_Follow ? walkspeed : + 0.0 ); + + auto const speedmultiplier = ( + ( ( Type == tp_Free ) && ( Command.command == user_command::moveverticalfast ) ) ? + 10.0 : + 1.0 ); + + // up-down + auto const moveyparam { reinterpret_cast( Command.param1 ) }; + // 2/3rd of the stick range enables walk speed, past that we lerp between walk and run speed + auto const movey { walkspeed + ( std::max( 0.0, std::abs( moveyparam ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ) }; + + m_moverate.y = ( + moveyparam > 0.0 ? movey * speedmultiplier : + moveyparam < 0.0 ? -movey * speedmultiplier : + 0.0 ); - if( Command.action != GLFW_RELEASE ) { - m_keys.forward = true; - m_moverate.z = - ( Type == tp_Free ? - walkspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.forward = false; - } break; } - - case user_command::moveback: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.back = true; - m_moverate.z = - ( Type == tp_Free ? - walkspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.back = false; - } - break; - } - - case user_command::moveleft: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.left = true; - m_moverate.x = - ( Type == tp_Free ? - walkspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.left = false; - } - break; - } - - case user_command::moveright: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.right = true; - m_moverate.x = - ( Type == tp_Free ? - walkspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.right = false; - } - break; - } - - case user_command::moveup: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.up = true; - m_moverate.y = - ( Type == tp_Free ? - walkspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.up = false; - } - break; - } - - case user_command::movedown: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.down = true; - m_moverate.y = - ( Type == tp_Free ? - walkspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.down = false; - } - break; - } - - case user_command::moveforwardfast: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.forward = true; - m_moverate.z = - ( Type == tp_Free ? - runspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.forward = false; - } - break; - } - - case user_command::movebackfast: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.back = true; - m_moverate.z = - ( Type == tp_Free ? - runspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.back = false; - } - break; - } - - case user_command::moveleftfast: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.left = true; - m_moverate.x = - ( Type == tp_Free ? - runspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.left = false; - } - break; - } - - case user_command::moverightfast: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.right = true; - m_moverate.x = - ( Type == tp_Free ? - runspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.right = false; - } - break; - } - - case user_command::moveupfast: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.up = true; - m_moverate.y = - ( Type == tp_Free ? - runspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.up = false; - } - break; - } - - case user_command::movedownfast: { - - if( Command.action != GLFW_RELEASE ) { - m_keys.down = true; - m_moverate.y = - ( Type == tp_Free ? - runspeed * speedmultiplier : - walkspeed ); - } - else { - m_keys.down = false; - } - break; - } - } + } // switch } void TCamera::Update() @@ -309,61 +143,15 @@ void TCamera::Update() auto const deltatime = Timer::GetDeltaRenderTime(); // czas bez pauzy -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - double a = 0.8; // default (walk) movement speed - if( Type == tp_Free ) { - // when not in the cab the speed modifiers are active - if( Global::shiftState ) { a = 2.5; } - if( Global::ctrlState ) { a *= 10.0; } - } - - if( ( Type == tp_Free ) - || ( false == Global::ctrlState ) ) { - // ctrl is used for mirror view, so we ignore the controls when in vehicle if ctrl is pressed - if( Console::Pressed( Global::Keys[ k_MechUp ] ) ) - Velocity.y = clamp( Velocity.y + a * 10.0 * deltatime, -a, a ); - if( Console::Pressed( Global::Keys[ k_MechDown ] ) ) - Velocity.y = clamp( Velocity.y - a * 10.0 * deltatime, -a, a ); - - // McZapkie-170402: poruszanie i rozgladanie we free takie samo jak w follow - if( Console::Pressed( Global::Keys[ k_MechRight ] ) ) - Velocity.x = clamp( Velocity.x + a * 10.0 * deltatime, -a, a ); - if( Console::Pressed( Global::Keys[ k_MechLeft ] ) ) - Velocity.x = clamp( Velocity.x - a * 10.0 * deltatime, -a, a ); - if( Console::Pressed( Global::Keys[ k_MechForward ] ) ) - Velocity.z = clamp( Velocity.z - a * 10.0 * deltatime, -a, a ); - if( Console::Pressed( Global::Keys[ k_MechBackward ] ) ) - Velocity.z = clamp( Velocity.z + a * 10.0 * deltatime, -a, a ); - } -#else -/* - m_moverate = 0.8; // default (walk) movement speed - if( Type == tp_Free ) { - // when not in the cab the speed modifiers are active - if( Global::shiftState ) { m_moverate = 2.5; } - if( Global::ctrlState ) { m_moverate *= 10.0; } - } -*/ if( ( Type == tp_Free ) || ( false == Global::ctrlState ) - || ( true == DebugCameraFlag) ) { + || ( true == DebugCameraFlag ) ) { // ctrl is used for mirror view, so we ignore the controls when in vehicle if ctrl is pressed - if( m_keys.up ) - Velocity.y = clamp( Velocity.y + m_moverate.y * 10.0 * deltatime, -m_moverate.y, m_moverate.y ); - if( m_keys.down ) - Velocity.y = clamp( Velocity.y - m_moverate.y * 10.0 * deltatime, -m_moverate.y, m_moverate.y ); - // McZapkie-170402: poruszanie i rozgladanie we free takie samo jak w follow - if( m_keys.right ) - Velocity.x = clamp( Velocity.x + m_moverate.x * 10.0 * deltatime, -m_moverate.x, m_moverate.x ); - if( m_keys.left ) - Velocity.x = clamp( Velocity.x - m_moverate.x * 10.0 * deltatime, -m_moverate.x, m_moverate.x ); - if( m_keys.forward ) - Velocity.z = clamp( Velocity.z - m_moverate.z * 10.0 * deltatime, -m_moverate.z, m_moverate.z ); - if( m_keys.back ) - Velocity.z = clamp( Velocity.z + m_moverate.z * 10.0 * deltatime, -m_moverate.z, m_moverate.z ); + Velocity.x = clamp( Velocity.x + m_moverate.x * 10.0 * deltatime, -m_moverate.x, m_moverate.x ); + Velocity.z = clamp( Velocity.z + m_moverate.z * 10.0 * deltatime, -m_moverate.z, m_moverate.z ); + Velocity.y = clamp( Velocity.y + m_moverate.y * 10.0 * deltatime, -m_moverate.y, m_moverate.y ); } -#endif if( ( Type == tp_Free ) || ( true == DebugCameraFlag ) ) { diff --git a/Camera.h b/Camera.h index 09135908..ef68e69c 100644 --- a/Camera.h +++ b/Camera.h @@ -26,15 +26,6 @@ enum TCameraType class TCamera { private: - struct keys { - bool forward{ false }; - bool back{ false }; - bool left{ false }; - bool right{ false }; - bool up{ false }; - bool down{ false }; - bool run{ false }; - } m_keys; glm::dvec3 m_moverate; public: // McZapkie: potrzebuje do kiwania na boki diff --git a/DynObj.cpp b/DynObj.cpp index c966e544..4847bacc 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3493,7 +3493,7 @@ void TDynamicObject::RenderSounds() { if( MoverParameters->ConverterFlag ) { frequency = ( MoverParameters->EngineType == ElectricSeriesMotor ? - MoverParameters->Voltage / ( MoverParameters->NominalVoltage * MoverParameters->RList[ MoverParameters->RlistSize ].Mn ) : + ( MoverParameters->RunningTraction.TractionVoltage / MoverParameters->NominalVoltage ) * MoverParameters->RList[ MoverParameters->RlistSize ].Mn : 1.0 ); frequency = sConverter.m_frequencyoffset + sConverter.m_frequencyfactor * frequency; sConverter diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 490ad956..48f173bb 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3744,12 +3744,12 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) || ( ( Couplers[ side::rear ].CouplingFlag & ctrain_power ) == ctrain_power ) ) ) { // potem ulepszyc! pantogtrafy! Voltage = - std::max( - RunningTraction.TractionVoltage, + std::max( + RunningTraction.TractionVoltage, #ifdef EU07_USE_OLD_HVCOUPLERS - std::max( HVCouplers[side::front][hvcoupler::voltage], HVCouplers[side::rear][hvcoupler::voltage] ) ); + std::max( HVCouplers[side::front][hvcoupler::voltage], HVCouplers[side::rear][hvcoupler::voltage] ) ); #else - std::max( Couplers[ side::front ].power_high.voltage, Couplers[ side::rear ].power_high.voltage ) ); + std::max( Couplers[ side::front ].power_high.voltage, Couplers[ side::rear ].power_high.voltage ) ); #endif } else { diff --git a/command.cpp b/command.cpp index c3d70d27..0c1ae522 100644 --- a/command.cpp +++ b/command.cpp @@ -70,19 +70,16 @@ commanddescription_sequence Commands_descriptions = { const int k_FailedEngineCutOff = 35; */ { "viewturn", command_target::entity }, - { "movevector", command_target::entity }, + { "movehorizontal", command_target::entity }, + { "movehorizontalfast", command_target::entity }, + { "movevertical", command_target::entity }, + { "moveverticalfast", command_target::entity }, { "moveleft", command_target::entity }, { "moveright", command_target::entity }, { "moveforward", command_target::entity }, { "moveback", command_target::entity }, { "moveup", command_target::entity }, { "movedown", command_target::entity }, - { "moveleftfast", command_target::entity }, - { "moverightfast", command_target::entity }, - { "moveforwardfast", command_target::entity }, - { "movebackfast", command_target::entity }, - { "moveupfast", command_target::entity }, - { "movedownfast", command_target::entity }, /* const int k_CabForward = 42; const int k_CabBackward = 43; diff --git a/command.h b/command.h index 0f9ef699..dfa9ace5 100644 --- a/command.h +++ b/command.h @@ -65,19 +65,16 @@ enum class user_command { const int k_FailedEngineCutOff = 35; */ viewturn, - movevector, + movehorizontal, + movehorizontalfast, + movevertical, + moveverticalfast, moveleft, moveright, moveforward, moveback, moveup, movedown, - moveleftfast, - moverightfast, - moveforwardfast, - movebackfast, - moveupfast, - movedownfast, /* const int k_CabForward = 42; const int k_CabBackward = 43; diff --git a/gamepadinput.cpp b/gamepadinput.cpp index 7b756e14..91f0cacf 100644 --- a/gamepadinput.cpp +++ b/gamepadinput.cpp @@ -214,7 +214,7 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g double const movex = static_cast( Leftstick.x ); double const movez = static_cast( Leftstick.y ); m_relay.post( - user_command::movevector, + user_command::movehorizontal, reinterpret_cast( movex ), reinterpret_cast( movez ), GLFW_PRESS, @@ -231,42 +231,6 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g m_triggers = Triggers; } -void -gamepad_input::process_axis( float const Value, float const Previousvalue, float const Multiplier, user_command Command, std::uint16_t const Recipient ) { - - process_axis( Value, Previousvalue, Multiplier, Command, Command, Recipient ); -} - -void -gamepad_input::process_axis( float const Value, float const Previousvalue, float const Multiplier, user_command Command1, user_command Command2, std::uint16_t const Recipient ) { - - user_command command{ Command1 }; - if( Value * Multiplier > 0.9 ) { - command = Command2; - } - - if( Value * Multiplier > 0.0f ) { - - m_relay.post( - command, - 0, 0, - GLFW_PRESS, - Recipient - ); - } - else { - // if we had movement before but not now, report this as 'button' release - if( Previousvalue != 0.0f ) { - m_relay.post( - command, // doesn't matter which movement 'mode' we report - 0, 0, - GLFW_RELEASE, - 0 - ); - } - } -} - void gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) { diff --git a/gamepadinput.h b/gamepadinput.h index ea7db03e..80cfce8b 100644 --- a/gamepadinput.h +++ b/gamepadinput.h @@ -65,8 +65,6 @@ private: // methods void on_button( gamepad_button const Button, int const Action ); void process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, glm::vec2 const &Triggers ); - void process_axis( float const Value, float const Previousvalue, float const Multiplier, user_command Command, std::uint16_t const Recipient ); - void process_axis( float const Value, float const Previousvalue, float const Multiplier, user_command Command1, user_command Command2, /*user_command Command3,*/ std::uint16_t const Recipient ); void process_mode( float const Value, std::uint16_t const Recipient ); // members diff --git a/keyboardinput.cpp b/keyboardinput.cpp index c0ff5ebf..37c1a251 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "keyboardinput.h" +#include "globals.h" #include "logs.h" #include "parser.h" #include "world.h" @@ -131,16 +132,16 @@ keyboard_input::key( int const Key, int const Action ) { return false; } - if( true == update_movement( Key, Action ) ) { - // if the received key was one of movement keys, it's been handled and we don't need to bother further - return true; - } - // store key state if( Key != -1 ) { m_keys[ Key ] = Action; } + if( true == update_movement( Key, Action ) ) { + // if the received key was one of movement keys, it's been handled and we don't need to bother further + return true; + } + // include active modifiers for currently pressed key, except if the key is a modifier itself auto const key = Key @@ -260,7 +261,13 @@ keyboard_input::default_bindings() { { GLFW_KEY_R | keymodifier::shift | keymodifier::control }, // viewturn { -1 }, - // movevector + // movehorizontal + { -1 }, + // movehorizontalfast + { -1 }, + // movevertical + { -1 }, + // moveverticalfast { -1 }, // moveleft { GLFW_KEY_LEFT }, @@ -274,18 +281,6 @@ keyboard_input::default_bindings() { { GLFW_KEY_PAGE_UP }, // movedown { GLFW_KEY_PAGE_DOWN }, - // moveleftfast - { -1 }, - // moverightfast - { -1 }, - // moveforwardfast - { -1 }, - // movebackfast - { -1 }, - // moveupfast - { -1 }, - // movedownfast - { -1 }, /* const int k_CabForward = 42; const int k_CabBackward = 43; @@ -422,10 +417,7 @@ keyboard_input::bind() { bool keyboard_input::update_movement( int const Key, int const Action ) { - bool shift = - ( ( Key == GLFW_KEY_LEFT_SHIFT ) - || ( Key == GLFW_KEY_RIGHT_SHIFT ) ); - bool movementkey = + bool const movementkey = ( ( Key == m_bindingscache.forward ) || ( Key == m_bindingscache.back ) || ( Key == m_bindingscache.left ) @@ -433,93 +425,61 @@ keyboard_input::update_movement( int const Key, int const Action ) { || ( Key == m_bindingscache.up ) || ( Key == m_bindingscache.down ) ); - if( false == ( shift || movementkey ) ) { return false; } + return ( true == movementkey ); +} - if( false == shift ) { - // TODO: pass correct entity id once the missing systems are in place - if( Key == m_bindingscache.forward ) { - m_keys[ Key ] = Action; - m_relay.post( - ( m_shift ? - user_command::moveforwardfast : - user_command::moveforward ), - 0, 0, - m_keys[ m_bindingscache.forward ], - 0 ); - return true; - } - else if( Key == m_bindingscache.back ) { - m_keys[ Key ] = Action; - m_relay.post( - ( m_shift ? - user_command::movebackfast : - user_command::moveback ), - 0, 0, - m_keys[ m_bindingscache.back ], - 0 ); - return true; - } - else if( Key == m_bindingscache.left ) { - m_keys[ Key ] = Action; - m_relay.post( - ( m_shift ? - user_command::moveleftfast : - user_command::moveleft ), - 0, 0, - m_keys[ m_bindingscache.left ], - 0 ); - return true; - } - else if( Key == m_bindingscache.right ) { - m_keys[ Key ] = Action; - m_relay.post( - ( m_shift ? - user_command::moverightfast : - user_command::moveright ), - 0, 0, - m_keys[ m_bindingscache.right ], - 0 ); - return true; - } - else if( Key == m_bindingscache.up ) { - m_keys[ Key ] = Action; - m_relay.post( - ( m_shift ? - user_command::moveupfast : - user_command::moveup ), - 0, 0, - m_keys[ m_bindingscache.up ], - 0 ); - return true; - } - else if( Key == m_bindingscache.down ) { - m_keys[ Key ] = Action; - m_relay.post( - ( m_shift ? - user_command::movedownfast : - user_command::movedown ), - 0, 0, - m_keys[ m_bindingscache.down ], - 0 ); - return true; - } - } - else { - // if it's not the movement keys but one of shift keys, we might potentially need to update movement state - if( m_keys[ Key ] == Action ) { - // but not if it's just repeat - return false; - } - // bit of recursion voodoo here, we fake relevant key presses so we don't have to duplicate the code from above - if( m_keys[ m_bindingscache.forward ] != GLFW_RELEASE ) { update_movement( m_bindingscache.forward, m_keys[ m_bindingscache.forward ] ); } - if( m_keys[ m_bindingscache.back ] != GLFW_RELEASE ) { update_movement( m_bindingscache.back, m_keys[ m_bindingscache.back ] ); } - if( m_keys[ m_bindingscache.left ] != GLFW_RELEASE ) { update_movement( m_bindingscache.left, m_keys[ m_bindingscache.left ] ); } - if( m_keys[ m_bindingscache.right ] != GLFW_RELEASE ) { update_movement( m_bindingscache.right, m_keys[ m_bindingscache.right ] ); } - if( m_keys[ m_bindingscache.up ] != GLFW_RELEASE ) { update_movement( m_bindingscache.up, m_keys[ m_bindingscache.up ] ); } - if( m_keys[ m_bindingscache.down ] != GLFW_RELEASE ) { update_movement( m_bindingscache.down, m_keys[ m_bindingscache.down ] ); } +void +keyboard_input::poll() { + + glm::vec2 const movementhorizontal { + // x-axis + ( Global::shiftState ? 1.f : 0.5f ) * + ( m_keys[ m_bindingscache.left ] != GLFW_RELEASE ? -1.f : + m_keys[ m_bindingscache.right ] != GLFW_RELEASE ? 1.f : + 0.f ), + // z-axis + ( Global::shiftState ? 1.f : 0.5f ) * + ( m_keys[ m_bindingscache.forward ] != GLFW_RELEASE ? 1.f : + m_keys[ m_bindingscache.back ] != GLFW_RELEASE ? -1.f : + 0.f ) }; + + if( ( movementhorizontal.x != 0.f || movementhorizontal.y != 0.f ) + || ( m_movementhorizontal.x != 0.f || m_movementhorizontal.y != 0.f ) ) { + double const movexparam = static_cast( movementhorizontal.x ); + double const movezparam = static_cast( movementhorizontal.y ); + m_relay.post( + ( true == Global::ctrlState ? + user_command::movehorizontalfast : + user_command::movehorizontal ), + reinterpret_cast( movexparam ), + reinterpret_cast( movezparam ), + GLFW_PRESS, + 0 ); } - return false; + m_movementhorizontal = movementhorizontal; + + float const movementvertical { + // y-axis + ( Global::shiftState ? 1.f : 0.5f ) * + ( m_keys[ m_bindingscache.up ] != GLFW_RELEASE ? 1.f : + m_keys[ m_bindingscache.down ] != GLFW_RELEASE ? -1.f : + 0.f ) }; + + if( ( movementvertical != 0.f ) + || ( m_movementvertical != 0.f ) ) { + double const moveyparam = static_cast( movementvertical ); + m_relay.post( + ( true == Global::ctrlState ? + user_command::moveverticalfast : + user_command::movevertical ), + reinterpret_cast( moveyparam ), + 0, + GLFW_PRESS, + 0 ); + } + + m_movementvertical = movementvertical; } //--------------------------------------------------------------------------- diff --git a/keyboardinput.h b/keyboardinput.h index d31a81f8..0ff0f3a2 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -27,7 +27,7 @@ public: bool key( int const Key, int const Action ); void - poll() {} + poll(); private: // types @@ -70,6 +70,8 @@ private: bool m_shift{ false }; bool m_ctrl{ false }; bindings_cache m_bindingscache; + glm::vec2 m_movementhorizontal; + float m_movementvertical; std::array m_keys; }; From 377740dfadd8ad171db779496bad423b6ca7886f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 9 Jan 2018 11:59:37 +0100 Subject: [PATCH 250/426] maintenance: minor code cleanup --- Camera.cpp | 30 ++++++++---- Camera.h | 2 +- McZapkie/Mover.cpp | 5 ++ Train.cpp | 36 -------------- Train.h | 1 - World.cpp | 117 ++++++++++++++++++--------------------------- World.h | 1 - command.cpp | 4 +- command.h | 4 +- keyboardinput.cpp | 16 ++----- keyboardinput.h | 2 +- 11 files changed, 81 insertions(+), 137 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index d13cd236..6b62ed67 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -31,27 +31,29 @@ void TCamera::Init(vector3 NPos, vector3 NAngle) Type = (Global::bFreeFly ? tp_Free : tp_Follow); }; -void TCamera::OnCursorMove(double x, double y) -{ - // McZapkie-170402: zeby mysz dzialala zawsze if (Type==tp_Follow) +void TCamera::OnCursorMove(double x, double y) { + Yaw -= x; - Pitch -= y; - if (Yaw > M_PI) + while( Yaw > M_PI ) { Yaw -= 2 * M_PI; - else if (Yaw < -M_PI) + } + while( Yaw < -M_PI ) { Yaw += 2 * M_PI; - if (Type == tp_Follow) // jeżeli jazda z pojazdem - { - clamp(Pitch, -M_PI_4, M_PI_4); // ograniczenie kąta spoglądania w dół i w górę + } + Pitch -= y; + if (Type == tp_Follow) { + // jeżeli jazda z pojazdem ograniczenie kąta spoglądania w dół i w górę + Pitch = clamp( Pitch, -M_PI_4, M_PI_4 ); } } -void +bool TCamera::OnCommand( command_data const &Command ) { auto const walkspeed { 1.0 }; auto const runspeed { 7.5 }; + bool iscameracommand { true }; switch( Command.command ) { case user_command::viewturn: { @@ -122,7 +124,15 @@ TCamera::OnCommand( command_data const &Command ) { break; } + + default: { + + iscameracommand = false; + break; + } } // switch + + return iscameracommand; } void TCamera::Update() diff --git a/Camera.h b/Camera.h index ef68e69c..ffb2e817 100644 --- a/Camera.h +++ b/Camera.h @@ -42,7 +42,7 @@ class TCamera void Reset() { Pitch = Yaw = Roll = 0; }; void OnCursorMove(double const x, double const y); - void OnCommand( command_data const &Command ); + bool OnCommand( command_data const &Command ); void Update(); vector3 GetDirection(); bool SetMatrix(glm::dmat4 &Matrix); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 48f173bb..c78e45ea 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7598,6 +7598,11 @@ void TMoverParameters::LoadFIZ_DList( std::string const &Input ) { extract_value( dizel_nmax, "nmax", Input, "" ); extract_value( dizel_nominalfill, "nominalfill", Input, "" ); extract_value( dizel_Mstand, "Mstand", Input, "" ); + + if( dizel_nMmax == dizel_nmax ) { + // HACK: guard against cases where nMmax == nmax, leading to division by 0 in momentum calculation + dizel_nMmax = dizel_nmax - 1.0 / 60.0; + } } void TMoverParameters::LoadFIZ_FFList( std::string const &Input ) { diff --git a/Train.cpp b/Train.cpp index a0172819..ff2deb40 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5903,42 +5903,6 @@ TTrain::radio_message( sound_source *Message, int const Channel ) { .play( sound_flags::exclusive ); } -void TTrain::Silence() -{ // wyciszenie dźwięków przy wychodzeniu -#ifdef EU07_USE_OLD_SOUNDCODE - dsbNastawnikJazdy.Stop(); - dsbNastawnikBocz.Stop(); - dsbRelay.Stop(); - dsbPneumaticRelay.Stop(); - dsbSwitch.Stop(); - dsbPneumaticSwitch.Stop(); - dsbReverserKey.Stop(); - dsbCouplerAttach.Stop(); - dsbCouplerDetach.Stop(); - dsbDieselIgnition.Stop(); - dsbWejscie_na_bezoporow.Stop(); - dsbWejscie_na_drugi_uklad.Stop(); - rsBrake.Stop(); - rsSlippery.Stop(); - rsHiss.Stop(); - rsHissU.Stop(); - rsHissE.Stop(); - rsHissX.Stop(); - rsHissT.Stop(); - rsSBHiss.Stop(); - rsRunningNoise.Stop(); - rsEngageSlippery.Stop(); - rsFadeSound.Stop(); - dsbHasler.Stop(); // wyłączenie dźwięków opuszczanej kabiny - dsbBuzzer.Stop(); - dsbSlipAlarm.Stop(); // dźwięk alarmu przy poślizgu - // sConverter.Stop(); - // sSmallCompressor->Stop(); - dsbCouplerStretch.Stop(); - dsbBufferClamp.Stop(); -#endif -}; - void TTrain::SetLights() { TDynamicObject *p = DynamicObject->GetFirstDynamic(mvOccupied->ActiveCab < 0 ? 1 : 0, 4); diff --git a/Train.h b/Train.h index 783758e1..b2ad720b 100644 --- a/Train.h +++ b/Train.h @@ -492,7 +492,6 @@ private: inline TMoverParameters *Controlled() { return mvControlled; }; inline TMoverParameters const *Controlled() const { return mvControlled; }; void DynamicSet(TDynamicObject *d); - void Silence(); }; //--------------------------------------------------------------------------- diff --git a/World.cpp b/World.cpp index c70690b6..6f91d04b 100644 --- a/World.cpp +++ b/World.cpp @@ -512,9 +512,7 @@ void TWorld::OnKeyDown(int cKey) // works always in debug mode, or for stopped/slow moving vehicles otherwise Controlled = tmp; // przejmujemy nowy mvControlled = Controlled->ControlledFind()->MoverParameters; - if( Train ) - Train->Silence(); // wyciszenie dźwięków opuszczanego pojazdu - else + if( Train == nullptr ) Train = new TTrain(); // jeśli niczym jeszcze nie jeździlismy if( Train->Init( Controlled ) ) { // przejmujemy sterowanie if( !DebugModeFlag ) // w DebugMode nadal prowadzi AI @@ -646,11 +644,15 @@ void TWorld::OnKeyDown(int cKey) if( Controlled->MoverParameters->Radio ) simulation::Region->RadioStop( Camera.Pos ); } - else if (!Global::iPause) //||(cKey==VK_F4)) //podczas pauzy sterownaie nie działa, F4 tak + else if (!Global::iPause) //podczas pauzy sterownaie nie działa if (Train) if (Controlled) - if ((Controlled->Controller == Humandriver) ? true : DebugModeFlag || (cKey == GLFW_KEY_Q)) - Train->OnKeyDown(cKey); // przekazanie klawisza do kabiny + if( ( cKey == GLFW_KEY_Q ) + || ( ( Controlled->Controller == Humandriver ) + || ( true == DebugModeFlag ) ) ) { + Train->OnKeyDown( cKey ); // przekazanie klawisza do kabiny + } + if (FreeFlyModeFlag) // aby nie odluźniało wagonu za lokomotywą { // operacje wykonywane na dowolnym pojeździe, przeniesione tu z kabiny /* @@ -659,17 +661,12 @@ void TWorld::OnKeyDown(int cKey) if (cKey == Global::Keys[k_Releaser]) // odluźniacz { // działa globalnie, sprawdzić zasięg TDynamicObject *temp = Global::DynamicNearest(); - if (temp) - { - if (Global::ctrlState) // z ctrl odcinanie - { + if (temp) { + if (Global::ctrlState) // z ctrl odcinanie { temp->MoverParameters->Hamulec->SetBrakeStatus( temp->MoverParameters->Hamulec->GetBrakeStatus() ^ 128 ); } - else if (temp->MoverParameters->BrakeReleaser(1)) - { - // temp->sBrakeAcc-> - // dsbPneumaticRelay->SetVolume(DSBVOLUME_MAX); - // dsbPneumaticRelay->Play(0,0,0); //temp->Position()-Camera.Pos //??? + else { + temp->MoverParameters->BrakeReleaser(1); } } } @@ -722,20 +719,14 @@ void TWorld::OnKeyDown(int cKey) auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; if (vehicle) { - if (Global::ctrlState) - if ((vehicle->MoverParameters->LocalBrake == ManualBrake) || - (vehicle->MoverParameters->MBrake == true)) - vehicle->MoverParameters->IncManualBrakeLevel(1); - else - ; - else if (vehicle->MoverParameters->LocalBrake != ManualBrake) - if (vehicle->MoverParameters->IncLocalBrakeLevelFAST()) - if (Train) - { // dźwięk oczywiście jest w kabinie -#ifdef EU07_USE_OLD_SOUNDCODE - Train->dsbPneumaticRelay.play(); -#endif - } + if( Global::ctrlState ) { + if( ( vehicle->MoverParameters->LocalBrake == ManualBrake ) + || ( vehicle->MoverParameters->MBrake == true ) ) + vehicle->MoverParameters->IncManualBrakeLevel( 1 ); + } + else if( vehicle->MoverParameters->LocalBrake != ManualBrake ) { + vehicle->MoverParameters->IncLocalBrakeLevelFAST(); + } } } else if (cKey == Global::Keys[k_DecLocalBrakeLevel]) @@ -743,30 +734,19 @@ void TWorld::OnKeyDown(int cKey) auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; if (vehicle) { - if (Global::ctrlState) - if ((vehicle->MoverParameters->LocalBrake == ManualBrake) || - (vehicle->MoverParameters->MBrake == true)) - vehicle->MoverParameters->DecManualBrakeLevel(1); - else - ; - else if (vehicle->MoverParameters->LocalBrake != ManualBrake) - if (vehicle->MoverParameters->DecLocalBrakeLevelFAST()) - if (Train) - { // dźwięk oczywiście jest w kabinie -#ifdef EU07_USE_OLD_SOUNDCODE - Train->dsbPneumaticRelay.play(); -#endif - } + if( Global::ctrlState ) { + if( ( vehicle->MoverParameters->LocalBrake == ManualBrake ) + || ( vehicle->MoverParameters->MBrake == true ) ) + vehicle->MoverParameters->DecManualBrakeLevel( 1 ); + } + else if( vehicle->MoverParameters->LocalBrake != ManualBrake ) { + vehicle->MoverParameters->DecLocalBrakeLevelFAST(); + } } } } } -void TWorld::OnMouseMove(double x, double y) -{ // McZapkie:060503-definicja obracania myszy - Camera.OnCursorMove(x * Global::fMouseXScale / Global::ZoomFactor, -y * Global::fMouseYScale / Global::ZoomFactor); -} - void TWorld::InOutKey( bool const Near ) { // przełączenie widoku z kabiny na zewnętrzny i odwrotnie FreeFlyModeFlag = !FreeFlyModeFlag; // zmiana widoku @@ -775,8 +755,6 @@ void TWorld::InOutKey( bool const Near ) if (Train) { // cache current cab position so there's no need to set it all over again after each out-in switch Train->pMechSittingPosition = Train->pMechOffset; - // wyłączenie dźwięków kabiny - Train->Silence(); Train->Dynamic()->bDisplayCab = false; DistantView( Near ); } @@ -2101,26 +2079,28 @@ void TWorld::CabChange(TDynamicObject *old, TDynamicObject *now) void TWorld::ChangeDynamic() { // Ra: to nie może być tak robione, to zbytnia proteza jest - Train->Silence(); // wyłączenie dźwięków opuszczanej kabiny - if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść - if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony - { // jeśli prowadzi AI, to mu nie robimy dywersji! + if( Train->Dynamic()->Mechanik ) { + // AI może sobie samo pójść + if( false == Train->Dynamic()->Mechanik->AIControllFlag ) { + // tylko jeśli ręcznie prowadzony + // jeśli prowadzi AI, to mu nie robimy dywersji! Train->Dynamic()->MoverParameters->CabDeactivisation(); Train->Dynamic()->Controller = AIdriver; - // Train->Dynamic()->MoverParameters->SecuritySystem.Status=0; //rozwala CA w EZT Train->Dynamic()->MoverParameters->ActiveCab = 0; - Train->Dynamic()->MoverParameters->BrakeLevelSet( - Train->Dynamic()->MoverParameters->Handle->GetPos( - bh_NP ) ); //rozwala sterowanie hamulcem GF 04-2016 + Train->Dynamic()->MoverParameters->BrakeLevelSet( Train->Dynamic()->MoverParameters->Handle->GetPos( bh_NP ) ); //rozwala sterowanie hamulcem GF 04-2016 Train->Dynamic()->MechInside = false; } + } TDynamicObject *temp = Global::changeDynObj; Train->Dynamic()->bDisplayCab = false; - Train->Dynamic()->ABuSetModelShake( vector3( 0, 0, 0 ) ); + Train->Dynamic()->ABuSetModelShake( {} ); if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść - if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony - Train->Dynamic()->Mechanik->MoveTo( temp ); // przsunięcie obiektu zarządzającego + if( false == Train->Dynamic()->Mechanik->AIControllFlag ) { + // tylko jeśli ręcznie prowadzony + // przsunięcie obiektu zarządzającego + Train->Dynamic()->Mechanik->MoveTo( temp ); + } Train->DynamicSet( temp ); Controlled = temp; @@ -2129,20 +2109,17 @@ void TWorld::ChangeDynamic() { if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony { - Train->Dynamic()->MoverParameters->LimPipePress = - Controlled->MoverParameters->PipePress; - Train->Dynamic() - ->MoverParameters->CabActivisation(); // załączenie rozrządu (wirtualne kabiny) + Train->Dynamic()->MoverParameters->LimPipePress = Controlled->MoverParameters->PipePress; + Train->Dynamic()->MoverParameters->CabActivisation(); // załączenie rozrządu (wirtualne kabiny) Train->Dynamic()->Controller = Humandriver; Train->Dynamic()->MechInside = true; } - Train->InitializeCab( Train->Dynamic()->MoverParameters->CabNo, - Train->Dynamic()->asBaseDir + - Train->Dynamic()->MoverParameters->TypeName + ".mmd" ); + Train->InitializeCab( + Train->Dynamic()->MoverParameters->CabNo, + Train->Dynamic()->asBaseDir + Train->Dynamic()->MoverParameters->TypeName + ".mmd" ); if( !FreeFlyModeFlag ) { Train->Dynamic()->bDisplayCab = true; - Train->Dynamic()->ABuSetModelShake( - vector3( 0, 0, 0 ) ); // zerowanie przesunięcia przed powrotem? + Train->Dynamic()->ABuSetModelShake( {} ); // zerowanie przesunięcia przed powrotem? Train->MechStop(); FollowView(); // na pozycję mecha } diff --git a/World.h b/World.h index ccfe2d3f..57bfa8ba 100644 --- a/World.h +++ b/World.h @@ -100,7 +100,6 @@ TWorld(); bool InitPerformed() { return m_init; } bool Update(); void OnKeyDown( int cKey ); - void OnMouseMove( double x, double y ); void OnCommandGet( multiplayer::DaneRozkaz *pRozkaz ); // passes specified sound to all vehicles within range as a radio message broadcasted on specified channel void radio_message( sound_source *Message, int const Channel ); diff --git a/command.cpp b/command.cpp index 0c1ae522..3ac2b537 100644 --- a/command.cpp +++ b/command.cpp @@ -66,9 +66,7 @@ commanddescription_sequence Commands_descriptions = { { "hornhighactivate", command_target::vehicle }, { "radiotoggle", command_target::vehicle }, { "radiostoptest", command_target::vehicle }, -/* -const int k_FailedEngineCutOff = 35; -*/ + { "viewturn", command_target::entity }, { "movehorizontal", command_target::entity }, { "movehorizontalfast", command_target::entity }, diff --git a/command.h b/command.h index dfa9ace5..10c7c460 100644 --- a/command.h +++ b/command.h @@ -61,9 +61,7 @@ enum class user_command { hornhighactivate, radiotoggle, radiostoptest, -/* -const int k_FailedEngineCutOff = 35; -*/ + viewturn, movehorizontal, movehorizontalfast, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 37c1a251..0729469f 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -137,7 +137,7 @@ keyboard_input::key( int const Key, int const Action ) { m_keys[ Key ] = Action; } - if( true == update_movement( Key, Action ) ) { + if( true == is_movement_key( Key ) ) { // if the received key was one of movement keys, it's been handled and we don't need to bother further return true; } @@ -350,10 +350,6 @@ const int k_ProgramHelp = 48; // instrumentlighttoggle { GLFW_KEY_SEMICOLON }, /* -const int k_Univ1 = 66; -const int k_Univ2 = 67; -const int k_Univ3 = 68; -const int k_Univ4 = 69; const int k_EndSign = 70; const int k_Active = 71; */ @@ -403,8 +399,7 @@ keyboard_input::bind() { } ++commandcode; } - - // cache movement key bindings, so we can test them faster in the input loop + // cache movement key bindings m_bindingscache.forward = m_commands[ static_cast( user_command::moveforward ) ].binding; m_bindingscache.back = m_commands[ static_cast( user_command::moveback ) ].binding; m_bindingscache.left = m_commands[ static_cast( user_command::moveleft ) ].binding; @@ -413,11 +408,10 @@ keyboard_input::bind() { m_bindingscache.down = m_commands[ static_cast( user_command::movedown ) ].binding; } -// NOTE: ugliest code ever, gg bool -keyboard_input::update_movement( int const Key, int const Action ) { +keyboard_input::is_movement_key( int const Key ) const { - bool const movementkey = + bool const ismovementkey = ( ( Key == m_bindingscache.forward ) || ( Key == m_bindingscache.back ) || ( Key == m_bindingscache.left ) @@ -425,7 +419,7 @@ keyboard_input::update_movement( int const Key, int const Action ) { || ( Key == m_bindingscache.up ) || ( Key == m_bindingscache.down ) ); - return ( true == movementkey ); + return ismovementkey; } void diff --git a/keyboardinput.h b/keyboardinput.h index 0ff0f3a2..ab5bb0bc 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -61,7 +61,7 @@ private: void bind(); bool - update_movement( int const Key, int const Action ); + is_movement_key( int const Key ) const; // members commandsetup_sequence m_commands; From c166c5429e501e3e6828d1ac54153a65b6b1ec3e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 10 Jan 2018 20:46:58 +0100 Subject: [PATCH 251/426] conversion of remaining train controls to the new control system, fix for potentially incorrect rendering of flex track pieces --- Track.cpp | 14 +- Train.cpp | 623 +++++++++++++++++++++++++++++++++------------- Train.h | 20 ++ World.cpp | 31 ++- command.cpp | 38 +-- command.h | 38 +-- keyboardinput.cpp | 47 +++- 7 files changed, 578 insertions(+), 233 deletions(-) diff --git a/Track.cpp b/Track.cpp index a6fbd837..db3e1ebd 100644 --- a/Track.cpp +++ b/Track.cpp @@ -487,8 +487,18 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) } if( fRadius != 0 ) // gdy podany promień segsize = clamp( std::fabs( fRadius ) * ( 0.02 / Global::SplineFidelity ), 2.0 / Global::SplineFidelity, 10.0 ); - else - segsize = 10.0; // for straights, 10m per segment works good enough + else { + // HACK: crude check whether claimed straight is an actual straight piece + // NOTE: won't detect cases where control points are placed on the straight line formed by the ends, but, eh + if( ( cp1 == Math3D::vector3() ) + && ( cp1 == Math3D::vector3() ) ) { + segsize = 10.0; // for straights, 10m per segment works good enough + } + else { + // HACK: divide roughly in 10 segments. + segsize = clamp( fTrackLength * ( 0.1 / Global::SplineFidelity ), 2.0 / Global::SplineFidelity, 10.0 ); + } + } if ((((p1 + p1 + p2) / 3.0 - p1 - cp1).Length() < 0.02) || (((p1 + p2 + p2) / 3.0 - p2 + cp1).Length() < 0.02)) diff --git a/Train.cpp b/Train.cpp index ff2deb40..91a76901 100644 --- a/Train.cpp +++ b/Train.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "Train.h" #include "Globals.h" +#include "simulation.h" #include "Logs.h" #include "MdlMngr.h" #include "Timer.h" @@ -194,6 +195,8 @@ void TCab::Update() // TBD, TODO: consider this approach if we ever want to have customized consist behaviour to received commands, based on the consist/vehicle type or whatever TTrain::commandhandler_map const TTrain::m_commandhandlers = { + { user_command::aidriverenable, &TTrain::OnCommand_aidriverenable }, + { user_command::aidriverdisable, &TTrain::OnCommand_aidriverdisable }, { user_command::mastercontrollerincrease, &TTrain::OnCommand_mastercontrollerincrease }, { user_command::mastercontrollerincreasefast, &TTrain::OnCommand_mastercontrollerincreasefast }, { user_command::mastercontrollerdecrease, &TTrain::OnCommand_mastercontrollerdecrease }, @@ -216,7 +219,12 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::trainbrakefirstservice, &TTrain::OnCommand_trainbrakefirstservice }, { user_command::trainbrakeservice, &TTrain::OnCommand_trainbrakeservice }, { user_command::trainbrakefullservice, &TTrain::OnCommand_trainbrakefullservice }, + { user_command::trainbrakehandleoff, &TTrain::OnCommand_trainbrakehandleoff }, { user_command::trainbrakeemergency, &TTrain::OnCommand_trainbrakeemergency }, + { user_command::trainbrakebasepressureincrease, &TTrain::OnCommand_trainbrakebasepressureincrease }, + { user_command::trainbrakebasepressuredecrease, &TTrain::OnCommand_trainbrakebasepressuredecrease }, + { user_command::trainbrakebasepressurereset, &TTrain::OnCommand_trainbrakebasepressurereset }, + { user_command::trainbrakeoperationtoggle, &TTrain::OnCommand_trainbrakeoperationtoggle }, { user_command::manualbrakeincrease, &TTrain::OnCommand_manualbrakeincrease }, { user_command::manualbrakedecrease, &TTrain::OnCommand_manualbrakedecrease }, { user_command::alarmchaintoggle, &TTrain::OnCommand_alarmchaintoggle }, @@ -225,6 +233,8 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::epbrakecontroltoggle, &TTrain::OnCommand_epbrakecontroltoggle }, { user_command::brakeactingspeedincrease, &TTrain::OnCommand_brakeactingspeedincrease }, { user_command::brakeactingspeeddecrease, &TTrain::OnCommand_brakeactingspeeddecrease }, + { user_command::brakeloadcompensationincrease, &TTrain::OnCommand_brakeloadcompensationincrease }, + { user_command::brakeloadcompensationdecrease, &TTrain::OnCommand_brakeloadcompensationdecrease }, { user_command::mubrakingindicatortoggle, &TTrain::OnCommand_mubrakingindicatortoggle }, { user_command::reverserincrease, &TTrain::OnCommand_reverserincrease }, { user_command::reverserdecrease, &TTrain::OnCommand_reverserdecrease }, @@ -258,6 +268,8 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::headlighttogglerearupper, &TTrain::OnCommand_headlighttogglerearupper }, { user_command::redmarkertogglerearleft, &TTrain::OnCommand_redmarkertogglerearleft }, { user_command::redmarkertogglerearright, &TTrain::OnCommand_redmarkertogglerearright }, + { user_command::redmarkerstoggle, &TTrain::OnCommand_redmarkerstoggle }, + { user_command::endsignalstoggle, &TTrain::OnCommand_endsignalstoggle }, { user_command::headlightsdimtoggle, &TTrain::OnCommand_headlightsdimtoggle }, { user_command::interiorlighttoggle, &TTrain::OnCommand_interiorlighttoggle }, { user_command::interiorlightdimtoggle, &TTrain::OnCommand_interiorlightdimtoggle }, @@ -265,11 +277,17 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::doorlocktoggle, &TTrain::OnCommand_doorlocktoggle }, { user_command::doortoggleleft, &TTrain::OnCommand_doortoggleleft }, { user_command::doortoggleright, &TTrain::OnCommand_doortoggleright }, + { user_command::carcouplingincrease, &TTrain::OnCommand_carcouplingincrease }, + { user_command::carcouplingdisconnect, &TTrain::OnCommand_carcouplingdisconnect }, { user_command::departureannounce, &TTrain::OnCommand_departureannounce }, { user_command::hornlowactivate, &TTrain::OnCommand_hornlowactivate }, { user_command::hornhighactivate, &TTrain::OnCommand_hornhighactivate }, { user_command::radiotoggle, &TTrain::OnCommand_radiotoggle }, + { user_command::radiochannelincrease, &TTrain::OnCommand_radiochannelincrease }, + { user_command::radiochanneldecrease, &TTrain::OnCommand_radiochanneldecrease }, { user_command::radiostoptest, &TTrain::OnCommand_radiostoptest }, + { user_command::cabchangeforward, &TTrain::OnCommand_cabchangeforward }, + { user_command::cabchangebackward, &TTrain::OnCommand_cabchangebackward }, { user_command::generictoggle0, &TTrain::OnCommand_generictoggle }, { user_command::generictoggle1, &TTrain::OnCommand_generictoggle }, { user_command::generictoggle2, &TTrain::OnCommand_generictoggle }, @@ -528,7 +546,46 @@ bool TTrain::is_eztoer() const { && ( mvControlled->ActiveDir != 0 ) ); // od yB } +// locates nearest vehicle belonging to the consist +TDynamicObject * +TTrain::find_nearest_consist_vehicle() const { + + if( false == FreeFlyModeFlag ) { + return DynamicObject; + } + auto coupler { -2 }; // scan for vehicle, not any specific coupler + auto *vehicle{ DynamicObject->ABuScanNearestObject( DynamicObject->GetTrack(), 1, 1500, coupler ) }; + if( vehicle == nullptr ) + vehicle = DynamicObject->ABuScanNearestObject( DynamicObject->GetTrack(), -1, 1500, coupler ); + // TBD, TODO: perform owner test for the located vehicle + return vehicle; +} + + // command handlers +void TTrain::OnCommand_aidriverenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // on press + if( Train->DynamicObject->Mechanik == nullptr ) { return; } + + if( true == Train->DynamicObject->Mechanik->AIControllFlag ) { + //żeby nie trzeba było rozłączać dla zresetowania + Train->DynamicObject->Mechanik->TakeControl( false ); + } + Train->DynamicObject->Mechanik->TakeControl( true ); + } +} + +void TTrain::OnCommand_aidriverdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // on press + if( Train->DynamicObject->Mechanik ) + Train->DynamicObject->Mechanik->TakeControl( false ); + } +} + void TTrain::OnCommand_mastercontrollerincrease( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { @@ -690,25 +747,42 @@ void TTrain::OnCommand_independentbrakedecreasefast( TTrain *Train, command_data } void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data const &Command ) { - // TODO: check if this set of conditions can be simplified. - // it'd be more flexible to have an attribute indicating whether bail off position is supported - if( ( Train->mvControlled->TrainType != dt_EZT ) - && ( ( Train->mvControlled->EngineType == ElectricSeriesMotor ) - || ( Train->mvControlled->EngineType == DieselElectric ) - || ( Train->mvControlled->EngineType == ElectricInductionMotor ) ) - && ( Train->mvOccupied->BrakeCtrlPosNo > 0 ) ) { - if( Command.action != GLFW_RELEASE ) { - // press or hold - Train->mvOccupied->BrakeReleaser( 1 ); - // visual feedback - Train->ggReleaserButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( false == FreeFlyModeFlag ) { + // TODO: check if this set of conditions can be simplified. + // it'd be more flexible to have an attribute indicating whether bail off position is supported + if( ( Train->mvControlled->TrainType != dt_EZT ) + && ( ( Train->mvControlled->EngineType == ElectricSeriesMotor ) + || ( Train->mvControlled->EngineType == DieselElectric ) + || ( Train->mvControlled->EngineType == ElectricInductionMotor ) ) + && ( Train->mvOccupied->BrakeCtrlPosNo > 0 ) ) { + + if( Command.action != GLFW_RELEASE ) { + // press or hold + Train->mvOccupied->BrakeReleaser( 1 ); + // visual feedback + Train->ggReleaserButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // release + Train->mvOccupied->BrakeReleaser( 0 ); + // visual feedback + Train->ggReleaserButton.UpdateValue( 0.0, Train->dsbSwitch ); + } } - else { - // release - Train->mvOccupied->BrakeReleaser( 0 ); - // visual feedback - Train->ggReleaserButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + else { + // car brake handling, while in walk mode + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle != nullptr ) { + if( Command.action != GLFW_RELEASE ) { + // press or hold + vehicle->MoverParameters->BrakeReleaser( 1 ); + } + else { + // release + vehicle->MoverParameters->BrakeReleaser( 0 ); + } } } } @@ -874,6 +948,14 @@ void TTrain::OnCommand_trainbrakefullservice( TTrain *Train, command_data const } } +void TTrain::OnCommand_trainbrakehandleoff( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->Handle->GetPos( bh_NP ) ); + } +} + void TTrain::OnCommand_trainbrakeemergency( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { @@ -888,14 +970,70 @@ void TTrain::OnCommand_trainbrakeemergency( TTrain *Train, command_data const &C } } +void TTrain::OnCommand_trainbrakebasepressureincrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + switch( Train->mvOccupied->BrakeHandle ) { + case FV4a: { + Train->mvOccupied->BrakeCtrlPos2 = clamp( Train->mvOccupied->BrakeCtrlPos2 - 0.01, -1.5, 2.0 ); + break; + } + default: { + Train->mvOccupied->BrakeLevelAdd( 0.01 ); + break; + } + } + } +} + +void TTrain::OnCommand_trainbrakebasepressuredecrease( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + + switch( Train->mvOccupied->BrakeHandle ) { + case FV4a: { + Train->mvOccupied->BrakeCtrlPos2 = clamp( Train->mvOccupied->BrakeCtrlPos2 + 0.01, -1.5, 2.0 ); + break; + } + default: { + Train->mvOccupied->BrakeLevelAdd( -0.01 ); + break; + } + } + } +} + +void TTrain::OnCommand_trainbrakebasepressurereset( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + Train->mvOccupied->BrakeCtrlPos2 = 0; + } +} + +void TTrain::OnCommand_trainbrakeoperationtoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle == nullptr ) { return; } + + vehicle->MoverParameters->Hamulec->SetBrakeStatus( vehicle->MoverParameters->Hamulec->GetBrakeStatus() ^ b_dmg ); + } +} + void TTrain::OnCommand_manualbrakeincrease( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { - if( ( Train->mvOccupied->LocalBrake == ManualBrake ) - || ( Train->mvOccupied->MBrake == true ) ) { + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle == nullptr ) { return; } - Train->mvOccupied->IncManualBrakeLevel( 1 ); + if( ( vehicle->MoverParameters->LocalBrake == ManualBrake ) + || ( vehicle->MoverParameters->MBrake == true ) ) { + + vehicle->MoverParameters->IncManualBrakeLevel( 1 ); } } } @@ -904,10 +1042,13 @@ void TTrain::OnCommand_manualbrakedecrease( TTrain *Train, command_data const &C if( Command.action != GLFW_RELEASE ) { - if( ( Train->mvOccupied->LocalBrake == ManualBrake ) - || ( Train->mvOccupied->MBrake == true ) ) { + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle == nullptr ) { return; } - Train->mvOccupied->DecManualBrakeLevel( 1 ); + if( ( vehicle->MoverParameters->LocalBrake == ManualBrake ) + || ( vehicle->MoverParameters->MBrake == true ) ) { + + vehicle->MoverParameters->DecManualBrakeLevel( 1 ); } } } @@ -940,26 +1081,38 @@ void TTrain::OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const } return; } - if( Train->mvOccupied->BrakeSystem == ElectroPneumatic ) { - return; - } - if( Command.action != GLFW_RELEASE ) { - // press or hold - Train->mvControlled->AntiSlippingBrake(); - // visual feedback - Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Train->mvOccupied->BrakeSystem != ElectroPneumatic ) { + // standard behaviour + if( Command.action != GLFW_RELEASE ) { + // press or hold + Train->mvControlled->AntiSlippingBrake(); + // visual feedback + Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // release + // visual feedback + Train->ggAntiSlipButton.UpdateValue( 0.0 ); + } } else { - // release -/* - // audio feedback - if( Train->ggAntiSlipButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); + // electro-pneumatic, custom case + if( Command.action != GLFW_RELEASE ) { + // press or hold + if( ( Train->mvOccupied->BrakeHandle == St113 ) + && ( Train->mvControlled->EpFuse == true ) ) { + Train->mvOccupied->SwitchEPBrake( 1 ); + } + // visual feedback + Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbPneumaticSwitch ); + } + else { + // release + Train->mvOccupied->SwitchEPBrake( 0 ); + // visual feedback + Train->ggAntiSlipButton.UpdateValue( 0.0 ); } -*/ - // visual feedback - Train->ggAntiSlipButton.UpdateValue( 0.0 ); } } @@ -1023,36 +1176,45 @@ void TTrain::OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const & void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { - if( ( Train->mvOccupied->BrakeDelayFlag & bdelay_M ) != 0 ) { + + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle == nullptr ) { return; } + + if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_M ) != 0 ) { // can't speed it up any more than this return; } auto const fasterbrakesetting = ( - Train->mvOccupied->BrakeDelayFlag < bdelay_R ? - Train->mvOccupied->BrakeDelayFlag << 1 : - Train->mvOccupied->BrakeDelayFlag | bdelay_M ); - if( true == Train->mvOccupied->BrakeDelaySwitch( fasterbrakesetting ) ) { - // visual feedback - if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { - Train->ggBrakeProfileCtrl.UpdateValue( - ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? - 2.0 : - Train->mvOccupied->BrakeDelayFlag - 1 ), - Train->dsbSwitch ); - } - if( Train->ggBrakeProfileG.SubModel != nullptr ) { - Train->ggBrakeProfileG.UpdateValue( - ( Train->mvOccupied->BrakeDelayFlag == bdelay_G ? - 1.0 : - 0.0 ), - Train->dsbSwitch ); - } - if( Train->ggBrakeProfileR.SubModel != nullptr ) { - Train->ggBrakeProfileR.UpdateValue( - ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? - 1.0 : - 0.0 ), - Train->dsbSwitch ); + vehicle->MoverParameters->BrakeDelayFlag < bdelay_R ? + vehicle->MoverParameters->BrakeDelayFlag << 1 : + vehicle->MoverParameters->BrakeDelayFlag | bdelay_M ); + + if( true == vehicle->MoverParameters->BrakeDelaySwitch( fasterbrakesetting ) ) { + + if( vehicle == Train->DynamicObject ) { + // visual feedback + // TODO: add setting indicator to vehicle + if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { + Train->ggBrakeProfileCtrl.UpdateValue( + ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 2.0 : + Train->mvOccupied->BrakeDelayFlag - 1 ), + Train->dsbSwitch ); + } + if( Train->ggBrakeProfileG.SubModel != nullptr ) { + Train->ggBrakeProfileG.UpdateValue( + ( Train->mvOccupied->BrakeDelayFlag == bdelay_G ? + 1.0 : + 0.0 ), + Train->dsbSwitch ); + } + if( Train->ggBrakeProfileR.SubModel != nullptr ) { + Train->ggBrakeProfileR.UpdateValue( + ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 1.0 : + 0.0 ), + Train->dsbSwitch ); + } } } } @@ -1061,41 +1223,72 @@ void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data con void TTrain::OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { - if( Train->mvOccupied->BrakeDelayFlag == bdelay_G ) { + + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle == nullptr ) { return; } + + if( vehicle->MoverParameters->BrakeDelayFlag == bdelay_G ) { // can't slow it down any more than this return; } auto const slowerbrakesetting = ( - Train->mvOccupied->BrakeDelayFlag < bdelay_M ? - Train->mvOccupied->BrakeDelayFlag >> 1 : - Train->mvOccupied->BrakeDelayFlag ^ bdelay_M ); - if( true == Train->mvOccupied->BrakeDelaySwitch( slowerbrakesetting ) ) { - // visual feedback - if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { - Train->ggBrakeProfileCtrl.UpdateValue( - ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? - 2.0 : - Train->mvOccupied->BrakeDelayFlag - 1 ), - Train->dsbSwitch ); - } - if( Train->ggBrakeProfileG.SubModel != nullptr ) { - Train->ggBrakeProfileG.UpdateValue( - ( Train->mvOccupied->BrakeDelayFlag == bdelay_G ? - 1.0 : - 0.0 ), - Train->dsbSwitch ); - } - if( Train->ggBrakeProfileR.SubModel != nullptr ) { - Train->ggBrakeProfileR.UpdateValue( - ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? - 1.0 : - 0.0 ), - Train->dsbSwitch ); + vehicle->MoverParameters->BrakeDelayFlag < bdelay_M ? + vehicle->MoverParameters->BrakeDelayFlag >> 1 : + vehicle->MoverParameters->BrakeDelayFlag ^ bdelay_M ); + + if( true == vehicle->MoverParameters->BrakeDelaySwitch( slowerbrakesetting ) ) { + + if( vehicle == Train->DynamicObject ) { + // visual feedback + // TODO: add setting indicator to vehicle + if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { + Train->ggBrakeProfileCtrl.UpdateValue( + ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 2.0 : + Train->mvOccupied->BrakeDelayFlag - 1 ), + Train->dsbSwitch ); + } + if( Train->ggBrakeProfileG.SubModel != nullptr ) { + Train->ggBrakeProfileG.UpdateValue( + ( Train->mvOccupied->BrakeDelayFlag == bdelay_G ? + 1.0 : + 0.0 ), + Train->dsbSwitch ); + } + if( Train->ggBrakeProfileR.SubModel != nullptr ) { + Train->ggBrakeProfileR.UpdateValue( + ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 1.0 : + 0.0 ), + Train->dsbSwitch ); + } } } } } +void TTrain::OnCommand_brakeloadcompensationincrease( TTrain *Train, command_data const &Command ) { + + if( ( true == FreeFlyModeFlag ) + && ( Command.action == GLFW_PRESS ) ) { + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle != nullptr ) { + vehicle->MoverParameters->IncBrakeMult(); + } + } +} + +void TTrain::OnCommand_brakeloadcompensationdecrease( TTrain *Train, command_data const &Command ) { + + if( ( true == FreeFlyModeFlag ) + && ( Command.action == GLFW_PRESS ) ) { + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle != nullptr ) { + vehicle->MoverParameters->DecBrakeMult(); + } + } +} + void TTrain::OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data const &Command ) { if( Train->ggSignallingButton.SubModel == nullptr ) { @@ -2442,6 +2635,58 @@ void TTrain::OnCommand_redmarkertogglerearright( TTrain *Train, command_data con } } +void TTrain::OnCommand_redmarkerstoggle( TTrain *Train, command_data const &Command ) { + + if( ( true == FreeFlyModeFlag ) + && ( Command.action == GLFW_PRESS ) ) { + + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, true ) ) }; + + if( vehicle == nullptr ) { return; } + + int const CouplNr { + clamp( + vehicle->DirectionGet() + * ( LengthSquared3( vehicle->HeadPosition() - Global::pCameraPosition ) > LengthSquared3( vehicle->RearPosition() - Global::pCameraPosition ) ? + 1 : + -1 ), + 0, 1 ) }; // z [-1,1] zrobić [0,1] + + auto const lightset { light::redmarker_left | light::redmarker_right }; + + vehicle->iLights[ CouplNr ] = ( + false == TestFlag( vehicle->iLights[ CouplNr ], lightset ) ? + vehicle->iLights[ CouplNr ] |= lightset : // turn signals on + vehicle->iLights[ CouplNr ] ^= lightset ); // turn signals off + } +} + +void TTrain::OnCommand_endsignalstoggle( TTrain *Train, command_data const &Command ) { + + if( ( true == FreeFlyModeFlag ) + && ( Command.action == GLFW_PRESS ) ) { + + auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, true ) ) }; + + if( vehicle == nullptr ) { return; } + + int const CouplNr { + clamp( + vehicle->DirectionGet() + * ( LengthSquared3( vehicle->HeadPosition() - Global::pCameraPosition ) > LengthSquared3( vehicle->RearPosition() - Global::pCameraPosition ) ? + 1 : + -1 ), + 0, 1 ) }; // z [-1,1] zrobić [0,1] + + auto const lightset { light::rearendsignals }; + + vehicle->iLights[ CouplNr ] = ( + false == TestFlag( vehicle->iLights[ CouplNr ], lightset ) ? + vehicle->iLights[ CouplNr ] |= lightset : // turn signals on + vehicle->iLights[ CouplNr ] ^= lightset ); // turn signals off + } +} + void TTrain::OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &Command ) { // NOTE: the check is disabled, as we're presuming light control is present in every vehicle @@ -2721,6 +2966,48 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma } } +void TTrain::OnCommand_carcouplingincrease( TTrain *Train, command_data const &Command ) { + + if( true == FreeFlyModeFlag ) { + // tryb freefly + auto coupler { -1 }; + auto *vehicle { Train->DynamicObject->ABuScanNearestObject( Train->DynamicObject->GetTrack(), 1, 1500, coupler ) }; + if( vehicle == nullptr ) + vehicle = Train->DynamicObject->ABuScanNearestObject( Train->DynamicObject->GetTrack(), -1, 1500, coupler ); + + if( ( coupler != -1 ) + && ( vehicle != nullptr ) ) { + + vehicle->couple( coupler ); + } + if( Train->DynamicObject->Mechanik ) { + // aktualizacja flag kierunku w składzie + Train->DynamicObject->Mechanik->CheckVehicles( Connect ); + } + } +} + +void TTrain::OnCommand_carcouplingdisconnect( TTrain *Train, command_data const &Command ) { + + if( true == FreeFlyModeFlag ) { + // tryb freefly + auto coupler { -1 }; + auto *vehicle { Train->DynamicObject->ABuScanNearestObject( Train->DynamicObject->GetTrack(), 1, 1500, coupler ) }; + if( vehicle == nullptr ) + vehicle = Train->DynamicObject->ABuScanNearestObject( Train->DynamicObject->GetTrack(), -1, 1500, coupler ); + + if( ( coupler != -1 ) + && ( vehicle != nullptr ) ) { + + vehicle->uncouple( coupler ); + } + if( Train->DynamicObject->Mechanik ) { + // aktualizacja flag kierunku w składzie + Train->DynamicObject->Mechanik->CheckVehicles( Disconnect ); + } + } +} + void TTrain::OnCommand_departureannounce( TTrain *Train, command_data const &Command ) { if( Train->ggDepartureSignalButton.SubModel == nullptr ) { @@ -2854,6 +3141,21 @@ void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command ) } } +void TTrain::OnCommand_radiochannelincrease( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + Train->iRadioChannel = clamp( Train->iRadioChannel + 1, 1, 10 ); + } +} + +void TTrain::OnCommand_radiochanneldecrease( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + Train->iRadioChannel = clamp( Train->iRadioChannel - 1, 1, 10 ); + } +} + + void TTrain::OnCommand_radiostoptest( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { @@ -2861,6 +3163,38 @@ void TTrain::OnCommand_radiostoptest( TTrain *Train, command_data const &Command } } +void TTrain::OnCommand_cabchangeforward( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + if( false == Train->CabChange( 1 ) ) { + if( TestFlag( Train->DynamicObject->MoverParameters->Couplers[ side::front ].CouplingFlag, coupling::gangway ) ) { + // przejscie do nastepnego pojazdu + Global::changeDynObj = Train->DynamicObject->PrevConnected; + Global::changeDynObj->MoverParameters->ActiveCab = ( + Train->DynamicObject->PrevConnectedNo ? + -1 : + 1 ); + } + } + } +} + +void TTrain::OnCommand_cabchangebackward( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + if( false == Train->CabChange( -1 ) ) { + if( TestFlag( Train->DynamicObject->MoverParameters->Couplers[ side::rear ].CouplingFlag, coupling::gangway ) ) { + // przejscie do nastepnego pojazdu + Global::changeDynObj = Train->DynamicObject->NextConnected; + Global::changeDynObj->MoverParameters->ActiveCab = ( + Train->DynamicObject->NextConnectedNo ? + -1 : + 1 ); + } + } + } +} + void TTrain::OnKeyDown(int cKey) { // naciśnięcie klawisza bool const isEztOer = @@ -2870,32 +3204,15 @@ void TTrain::OnKeyDown(int cKey) && ( mvOccupied->BrakeSubsystem == ss_ESt ) && ( mvControlled->ActiveDir != 0 ) ); // od yB - if (Global::shiftState) + if ( false == Global::shiftState) { // wciśnięty [Shift] - if( cKey == Global::Keys[ k_BrakeProfile ] ) // McZapkie-240302-B: +#ifdef EU07_USE_OLD_COMMAND_SYSTEM + if( cKey == Global::Keys[ k_BrakeProfile ] ) // McZapkie-240302-B: //----------- - - // przelacznik opoznienia - // hamowania + // przelacznik opoznienia hamowania { // yB://ABu: male poprawki, zeby bylo mozna ustawic dowolny wagon int CouplNr = -2; - if( !FreeFlyModeFlag ) - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if( Global::ctrlState ) - if (mvOccupied->BrakeDelaySwitch(bdelay_R + bdelay_M)) - { - play_sound( dsbPneumaticRelay ); - } - else - ; - else if (mvOccupied->BrakeDelaySwitch(bdelay_P)) - { - play_sound( dsbPneumaticRelay ); - } -#endif - } - else + if( true == FreeFlyModeFlag ) { TDynamicObject *temp; temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr)); @@ -2917,43 +3234,20 @@ void TTrain::OnKeyDown(int cKey) temp->MoverParameters->BrakeDelayFlag < bdelay_R ? temp->MoverParameters->BrakeDelayFlag << 1 : temp->MoverParameters->BrakeDelayFlag | bdelay_M ); - if( true == temp->MoverParameters->BrakeDelaySwitch( fasterbrakesetting ) ) { -#ifdef EU07_USE_OLD_SOUNDCODE - dsbPneumaticRelay.play(); -#endif - } + temp->MoverParameters->BrakeDelaySwitch( fasterbrakesetting ); } } } else if( cKey == GLFW_KEY_Q ) // ze Shiftem - włączenie AI - { // McZapkie-240302 - wlaczanie automatycznego pilota (zadziala tylko w - // trybie debugmode) + { // McZapkie-240302 - wlaczanie automatycznego pilota (zadziala tylko w trybie debugmode) if (DynamicObject->Mechanik) { if (DebugModeFlag) - if (DynamicObject->Mechanik->AIControllFlag) //żeby nie trzeba było - // rozłączać dla - // zresetowania - DynamicObject->Mechanik->TakeControl(false); - DynamicObject->Mechanik->TakeControl(true); - } - } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - else if (cKey == Global::Keys[k_UpperSign]) // ABu 060205: światło górne - - // włączenie - { - if (mvOccupied->LightsPosNo > 0) //kręciolek od swiatel - { - if ((mvOccupied->LightsPos < mvOccupied->LightsPosNo) || (mvOccupied->LightsWrap)) - { - mvOccupied->LightsPos++; - if (mvOccupied->LightsPos > mvOccupied->LightsPosNo) - { - mvOccupied->LightsPos = 1; + if( DynamicObject->Mechanik->AIControllFlag ) { + //żeby nie trzeba było rozłączać dla zresetowania + DynamicObject->Mechanik->TakeControl( false ); } - play_sound( dsbSwitch ); - SetLights(); - } + DynamicObject->Mechanik->TakeControl(true); } } #endif @@ -2963,7 +3257,7 @@ void TTrain::OnKeyDown(int cKey) #ifdef EU07_USE_OLD_COMMAND_SYSTEM if( cKey == Global::Keys[ k_IncLocalBrakeLevel ] ) { // Ra 2014-09: w - // trybie latania + // trybie latania // obsługa jest w // World.cpp if (!FreeFlyModeFlag) @@ -2993,9 +3287,7 @@ void TTrain::OnKeyDown(int cKey) mvOccupied->DecLocalBrakeLevel(1); } } - else -#endif - if (cKey == Global::Keys[k_Brake2]) { + else if (cKey == Global::Keys[k_Brake2]) { if (Global::ctrlState) mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos(bh_NP)); // yB: czy ten stos funkcji nie powinien być jako oddzielna funkcja movera? @@ -3007,13 +3299,12 @@ void TTrain::OnKeyDown(int cKey) mvOccupied->BrakeCtrlPos2 = 0; // wyrownaj kapturek } } - if (cKey == Global::Keys[k_BrakeProfile]) + else if (cKey == Global::Keys[k_BrakeProfile]) { // yB://ABu: male poprawki, zeby // bylo mozna ustawic dowolny // wagon int CouplNr = -2; if( false == FreeFlyModeFlag ) { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM if( Global::ctrlState ) if (mvOccupied->BrakeDelaySwitch(bdelay_R)) { @@ -3025,7 +3316,6 @@ void TTrain::OnKeyDown(int cKey) { play_sound( dsbPneumaticRelay ); } -#endif } else { TDynamicObject *temp; @@ -3066,11 +3356,13 @@ void TTrain::OnKeyDown(int cKey) else if (cKey == Global::Keys[k_CabForward]) { if( !CabChange( 1 ) ) { - if( TestFlag( DynamicObject->MoverParameters->Couplers[ 0 ].CouplingFlag, - ctrain_passenger ) ) { // przejscie do nastepnego pojazdu + if( TestFlag( DynamicObject->MoverParameters->Couplers[ 0 ].CouplingFlag, ctrain_passenger ) ) { + // przejscie do nastepnego pojazdu Global::changeDynObj = DynamicObject->PrevConnected; - Global::changeDynObj->MoverParameters->ActiveCab = - DynamicObject->PrevConnectedNo ? -1 : 1; + Global::changeDynObj->MoverParameters->ActiveCab = ( + DynamicObject->PrevConnectedNo ? + -1 : + 1 ); } } /* @@ -3082,12 +3374,13 @@ void TTrain::OnKeyDown(int cKey) else if (cKey == Global::Keys[k_CabBackward]) { if (!CabChange(-1)) - if (TestFlag(DynamicObject->MoverParameters->Couplers[1].CouplingFlag, - ctrain_passenger)) - { // przejscie do poprzedniego + if (TestFlag(DynamicObject->MoverParameters->Couplers[1].CouplingFlag, ctrain_passenger)) { + // przejscie do poprzedniego Global::changeDynObj = DynamicObject->NextConnected; - Global::changeDynObj->MoverParameters->ActiveCab = - DynamicObject->NextConnectedNo ? -1 : 1; + Global::changeDynObj->MoverParameters->ActiveCab = ( + DynamicObject->NextConnectedNo ? + -1 : + 1 ); } /* NOTE: disabled to allow 'prototypical' 'tricking' pantograph compressor to run unattended @@ -3117,7 +3410,6 @@ void TTrain::OnKeyDown(int cKey) } } - } else if (cKey == Global::Keys[k_DeCouple]) { @@ -3141,7 +3433,7 @@ void TTrain::OnKeyDown(int cKey) } } - +#endif // else if (DebugModeFlag) { // przesuwanie składu o 100m @@ -3189,6 +3481,7 @@ void TTrain::OnKeyDown(int cKey) } } } +#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (cKey == GLFW_KEY_MINUS) { // zmniejszenie numeru kanału radiowego if (iRadioChannel > 0) @@ -3199,6 +3492,7 @@ void TTrain::OnKeyDown(int cKey) if (iRadioChannel < 8) ++iRadioChannel; // 0=wyłączony } +#endif } } @@ -4758,8 +5052,7 @@ bool TTrain::Update( double const Deltatime ) btInstrumentLight.Turn( false ); #ifdef EU07_USE_OLD_COMMAND_SYSTEM - // hunter-091012: przepisanie univ4 i zrobione z uwzglednieniem przelacznika - // swiatla + // hunter-091012: przepisanie univ4 i zrobione z uwzglednieniem przelacznika swiatla if (Console::Pressed(Global::Keys[k_Univ4])) { if( Global::shiftState ) @@ -4813,7 +5106,6 @@ bool TTrain::Update( double const Deltatime ) play_sound( dsbPneumaticSwitch ); } } -#endif if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_IncBrakeLevel]))) { if (Global::ctrlState) @@ -4822,7 +5114,6 @@ bool TTrain::Update( double const Deltatime ) if (mvOccupied->BrakeCtrlPos2 < -1.5) mvOccupied->BrakeCtrlPos2 = -1.5; } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else { // mvOccupied->BrakeCtrlPosR+=(mvOccupied->BrakeCtrlPosR>mvOccupied->BrakeCtrlPosNo?0:dt*2); @@ -4830,7 +5121,6 @@ bool TTrain::Update( double const Deltatime ) // mvOccupied->BrakeCtrlPos= // floor(mvOccupied->BrakeCtrlPosR+0.499); } -#endif } if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_DecBrakeLevel]))) @@ -4841,7 +5131,6 @@ bool TTrain::Update( double const Deltatime ) if (mvOccupied->BrakeCtrlPos2 < -3) mvOccupied->BrakeCtrlPos2 = -3; } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM else { // mvOccupied->BrakeCtrlPosR-=(mvOccupied->BrakeCtrlPosR<-1?0:dt*2); @@ -4849,7 +5138,6 @@ bool TTrain::Update( double const Deltatime ) // floor(mvOccupied->BrakeCtrlPosR+0.499); mvOccupied->BrakeLevelAdd(-dt * 2); } -#endif } if( ( mvOccupied->BrakeSystem == ElectroPneumatic ) @@ -4871,7 +5159,6 @@ bool TTrain::Update( double const Deltatime ) } } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (Console::Pressed(Global::Keys[k_DepartureSignal])) { ggDepartureSignalButton.PutValue(1); diff --git a/Train.h b/Train.h index b2ad720b..b3d79190 100644 --- a/Train.h +++ b/Train.h @@ -113,9 +113,14 @@ class TTrain bool initialize_button(cParser &Parser, std::string const &Label, int const Cabindex); // helper, returns true for EMU with oerlikon brake bool is_eztoer() const; + // locates nearest vehicle belonging to the consist + TDynamicObject *find_nearest_consist_vehicle() const; + // command handlers // NOTE: we're currently using universal handlers and static handler map but it may be beneficial to have these implemented on individual class instance basis // TBD, TODO: consider this approach if we ever want to have customized consist behaviour to received commands, based on the consist/vehicle type or whatever + static void OnCommand_aidriverenable( TTrain *Train, command_data const &Command ); + static void OnCommand_aidriverdisable( TTrain *Train, command_data const &Command ); static void OnCommand_mastercontrollerincrease( TTrain *Train, command_data const &Command ); static void OnCommand_mastercontrollerincreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_mastercontrollerdecrease( TTrain *Train, command_data const &Command ); @@ -138,7 +143,12 @@ class TTrain static void OnCommand_trainbrakefirstservice( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakeservice( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakefullservice( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakehandleoff( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakeemergency( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakebasepressureincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakebasepressuredecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakebasepressurereset( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakeoperationtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_manualbrakeincrease( TTrain *Train, command_data const &Command ); static void OnCommand_manualbrakedecrease( TTrain *Train, command_data const &Command ); static void OnCommand_alarmchaintoggle( TTrain *Train, command_data const &Command ); @@ -147,6 +157,8 @@ class TTrain static void OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_brakeloadcompensationincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_brakeloadcompensationdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data const &Command ); static void OnCommand_reverserincrease( TTrain *Train, command_data const &Command ); static void OnCommand_reverserdecrease( TTrain *Train, command_data const &Command ); @@ -180,6 +192,8 @@ class TTrain static void OnCommand_headlighttogglerearupper( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertogglerearleft( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertogglerearright( TTrain *Train, command_data const &Command ); + static void OnCommand_redmarkerstoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_endsignalstoggle( TTrain *Train, command_data const &Command ); static void OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &Command ); static void OnCommand_interiorlighttoggle( TTrain *Train, command_data const &Command ); static void OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const &Command ); @@ -187,11 +201,17 @@ class TTrain static void OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleright( TTrain *Train, command_data const &Command ); + static void OnCommand_carcouplingincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_carcouplingdisconnect( TTrain *Train, command_data const &Command ); static void OnCommand_departureannounce( TTrain *Train, command_data const &Command ); static void OnCommand_hornlowactivate( TTrain *Train, command_data const &Command ); static void OnCommand_hornhighactivate( TTrain *Train, command_data const &Command ); static void OnCommand_radiotoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_radiochannelincrease( TTrain *Train, command_data const &Command ); + static void OnCommand_radiochanneldecrease( TTrain *Train, command_data const &Command ); static void OnCommand_radiostoptest( TTrain *Train, command_data const &Command ); + static void OnCommand_cabchangeforward( TTrain *Train, command_data const &Command ); + static void OnCommand_cabchangebackward( TTrain *Train, command_data const &Command ); static void OnCommand_generictoggle( TTrain *Train, command_data const &Command ); // members diff --git a/World.cpp b/World.cpp index 6f91d04b..9de820a4 100644 --- a/World.cpp +++ b/World.cpp @@ -338,8 +338,7 @@ bool TWorld::Init( GLFWwindow *Window ) { return true; }; -void TWorld::OnKeyDown(int cKey) -{ +void TWorld::OnKeyDown(int cKey) { // dump keypress info in the log if( !Global::iPause ) { // podczas pauzy klawisze nie działają @@ -647,32 +646,28 @@ void TWorld::OnKeyDown(int cKey) else if (!Global::iPause) //podczas pauzy sterownaie nie działa if (Train) if (Controlled) - if( ( cKey == GLFW_KEY_Q ) - || ( ( Controlled->Controller == Humandriver ) - || ( true == DebugModeFlag ) ) ) { + if( ( Controlled->Controller == Humandriver ) + || ( true == DebugModeFlag ) ) { Train->OnKeyDown( cKey ); // przekazanie klawisza do kabiny } if (FreeFlyModeFlag) // aby nie odluźniało wagonu za lokomotywą { // operacje wykonywane na dowolnym pojeździe, przeniesione tu z kabiny -/* // NOTE: disabled so it doesn't interfere with new system controls in outside view // TODO: implement as part of the new system +#ifdef EU07_USE_OLD_COMMAND_SYSTEM if (cKey == Global::Keys[k_Releaser]) // odluźniacz { // działa globalnie, sprawdzić zasięg - TDynamicObject *temp = Global::DynamicNearest(); - if (temp) { - if (Global::ctrlState) // z ctrl odcinanie { - temp->MoverParameters->Hamulec->SetBrakeStatus( temp->MoverParameters->Hamulec->GetBrakeStatus() ^ 128 ); - } - else { - temp->MoverParameters->BrakeReleaser(1); - } + TDynamicObject *temp{ std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; + if( temp ) { + if( Global::ctrlState ) // z ctrl odcinanie { + temp->MoverParameters->Hamulec->SetBrakeStatus( temp->MoverParameters->Hamulec->GetBrakeStatus() ^ b_dmg ); + } + else { + temp->MoverParameters->BrakeReleaser( 1 ); } } - else -*/ - if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy + else if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy { // zmiana próżny/ładowny; Ra: zabrane z kabiny auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; if (vehicle) @@ -744,6 +739,7 @@ void TWorld::OnKeyDown(int cKey) } } } +#endif } } @@ -1453,6 +1449,7 @@ TWorld::Update_UI() { uitextline3 += "; LcB: " + to_string( vehicle->MoverParameters->LocBrakePress, 2 ) + + "; hat: " + to_string( vehicle->MoverParameters->BrakeCtrlPos2, 2 ) + "; pipes: " + to_string( vehicle->MoverParameters->PipePress, 2 ) + "/" + to_string( vehicle->MoverParameters->ScndPipePress, 2 ) + "/" + to_string( vehicle->MoverParameters->EqvtPipePress, 2 ) diff --git a/command.cpp b/command.cpp index 3ac2b537..e9d31988 100644 --- a/command.cpp +++ b/command.cpp @@ -19,6 +19,8 @@ namespace simulation { command_queue Commands; commanddescription_sequence Commands_descriptions = { + { "aidriverenable", command_target::vehicle }, + { "aidriverdisable", command_target::vehicle }, { "mastercontrollerincrease", command_target::vehicle }, { "mastercontrollerincreasefast", command_target::vehicle }, { "mastercontrollerdecrease", command_target::vehicle }, @@ -40,7 +42,12 @@ commanddescription_sequence Commands_descriptions = { { "trainbrakefirstservice", command_target::vehicle }, { "trainbrakeservice", command_target::vehicle }, { "trainbrakefullservice", command_target::vehicle }, + { "trainbrakehandleoff", command_target::vehicle }, { "trainbrakeemergency", command_target::vehicle }, + { "trainbrakebasepressureincrease", command_target::vehicle }, + { "trainbrakebasepressuredecrease", command_target::vehicle }, + { "trainbrakebasepressurereset", command_target::vehicle }, + { "trainbrakeoperationtoggle", command_target::vehicle }, { "manualbrakeincrease", command_target::vehicle }, { "manualbrakedecrease", command_target::vehicle }, { "alarmchaintoggle", command_target::vehicle }, @@ -60,12 +67,19 @@ commanddescription_sequence Commands_descriptions = { { "epbrakecontroltoggle", command_target::vehicle }, { "brakeactingspeedincrease", command_target::vehicle }, { "brakeactingspeeddecrease", command_target::vehicle }, + { "brakeloadcompensationincrease", command_target::vehicle }, + { "brakeloadcompensationdecrease", command_target::vehicle }, { "mubrakingindicatortoggle", command_target::vehicle }, { "alerteracknowledge", command_target::vehicle }, { "hornlowactivate", command_target::vehicle }, { "hornhighactivate", command_target::vehicle }, { "radiotoggle", command_target::vehicle }, + { "radiochannelincrease", command_target::vehicle }, + { "radiochanneldecrease", command_target::vehicle }, { "radiostoptest", command_target::vehicle }, + // TBD, TODO: make cab change controls entity-centric + { "cabchangeforward", command_target::vehicle }, + { "cabchangebackward", command_target::vehicle }, { "viewturn", command_target::entity }, { "movehorizontal", command_target::entity }, @@ -78,15 +92,9 @@ commanddescription_sequence Commands_descriptions = { { "moveback", command_target::entity }, { "moveup", command_target::entity }, { "movedown", command_target::entity }, -/* -const int k_CabForward = 42; -const int k_CabBackward = 43; -const int k_Couple = 44; -const int k_DeCouple = 45; -const int k_ProgramQuit = 46; -// const int k_ProgramPause= 47; -const int k_ProgramHelp = 48; -*/ + // TBD, TODO: make coupling controls entity-centric + { "carcouplingincrease", command_target::vehicle }, + { "carcouplingdisconnect", command_target::vehicle }, { "doortoggleleft", command_target::vehicle }, { "doortoggleright", command_target::vehicle }, { "departureannounce", command_target::vehicle }, @@ -97,9 +105,6 @@ const int k_ProgramHelp = 48; { "pantographtogglerear", command_target::vehicle }, { "pantographlowerall", command_target::vehicle }, { "heatingtoggle", command_target::vehicle }, -/* -// const int k_FreeFlyMode= 59; -*/ { "lightspresetactivatenext", command_target::vehicle }, { "lightspresetactivateprevious", command_target::vehicle }, { "headlighttoggleleft", command_target::vehicle }, @@ -112,16 +117,14 @@ const int k_ProgramHelp = 48; { "headlighttogglerearupper", command_target::vehicle }, { "redmarkertogglerearleft", command_target::vehicle }, { "redmarkertogglerearright", command_target::vehicle }, + { "redmarkerstoggle", command_target::vehicle }, + { "endsignalstoggle", command_target::vehicle }, { "headlightsdimtoggle", command_target::vehicle }, { "motorconnectorsopen", command_target::vehicle }, { "motordisconnect", command_target::vehicle }, { "interiorlighttoggle", command_target::vehicle }, { "interiorlightdimtoggle", command_target::vehicle }, { "instrumentlighttoggle", command_target::vehicle }, -/* -const int k_EndSign = 70; -const int k_Active = 71; -*/ { "generictoggle0", command_target::vehicle }, { "generictoggle1", command_target::vehicle }, { "generictoggle2", command_target::vehicle }, @@ -133,9 +136,6 @@ const int k_Active = 71; { "generictoggle8", command_target::vehicle }, { "generictoggle9", command_target::vehicle }, { "batterytoggle", command_target::vehicle } -/* -const int k_WalkMode = 73; -*/ }; } diff --git a/command.h b/command.h index 10c7c460..be604dd1 100644 --- a/command.h +++ b/command.h @@ -14,6 +14,8 @@ http://mozilla.org/MPL/2.0/. enum class user_command { + aidriverenable, + aidriverdisable, mastercontrollerincrease, mastercontrollerincreasefast, mastercontrollerdecrease, @@ -35,7 +37,12 @@ enum class user_command { trainbrakefirstservice, trainbrakeservice, trainbrakefullservice, + trainbrakehandleoff, trainbrakeemergency, + trainbrakebasepressureincrease, + trainbrakebasepressuredecrease, + trainbrakebasepressurereset, + trainbrakeoperationtoggle, manualbrakeincrease, manualbrakedecrease, alarmchaintoggle, @@ -55,12 +62,18 @@ enum class user_command { epbrakecontroltoggle, brakeactingspeedincrease, brakeactingspeeddecrease, + brakeloadcompensationincrease, + brakeloadcompensationdecrease, mubrakingindicatortoggle, alerteracknowledge, hornlowactivate, hornhighactivate, radiotoggle, + radiochannelincrease, + radiochanneldecrease, radiostoptest, + cabchangeforward, + cabchangebackward, viewturn, movehorizontal, @@ -73,15 +86,9 @@ enum class user_command { moveback, moveup, movedown, -/* -const int k_CabForward = 42; -const int k_CabBackward = 43; -const int k_Couple = 44; -const int k_DeCouple = 45; -const int k_ProgramQuit = 46; -// const int k_ProgramPause= 47; -const int k_ProgramHelp = 48; -*/ + + carcouplingincrease, + carcouplingdisconnect, doortoggleleft, doortoggleright, departureannounce, @@ -92,9 +99,6 @@ const int k_ProgramHelp = 48; pantographtogglerear, pantographlowerall, heatingtoggle, -/* -// const int k_FreeFlyMode= 59; -*/ lightspresetactivatenext, lightspresetactivateprevious, headlighttoggleleft, @@ -107,16 +111,14 @@ const int k_ProgramHelp = 48; headlighttogglerearupper, redmarkertogglerearleft, redmarkertogglerearright, + redmarkerstoggle, + endsignalstoggle, headlightsdimtoggle, motorconnectorsopen, motordisconnect, interiorlighttoggle, interiorlightdimtoggle, instrumentlighttoggle, -/* -const int k_EndSign = 70; -const int k_Active = 71; -*/ generictoggle0, generictoggle1, generictoggle2, @@ -128,9 +130,7 @@ const int k_Active = 71; generictoggle8, generictoggle9, batterytoggle, -/* -const int k_WalkMode = 73; -*/ + none = -1 }; diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 0729469f..8071e9f3 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -31,6 +31,7 @@ keyboard_input::recall_bindings() { std::unordered_map nametokeymap = { { "0", GLFW_KEY_0 }, { "1", GLFW_KEY_1 }, { "2", GLFW_KEY_2 }, { "3", GLFW_KEY_3 }, { "4", GLFW_KEY_4 }, { "5", GLFW_KEY_5 }, { "6", GLFW_KEY_6 }, { "7", GLFW_KEY_7 }, { "8", GLFW_KEY_8 }, { "9", GLFW_KEY_9 }, + { "-", GLFW_KEY_MINUS }, { "=", GLFW_KEY_EQUAL }, { "a", GLFW_KEY_A }, { "b", GLFW_KEY_B }, { "c", GLFW_KEY_C }, { "d", GLFW_KEY_D }, { "e", GLFW_KEY_E }, { "f", GLFW_KEY_F }, { "g", GLFW_KEY_G }, { "h", GLFW_KEY_H }, { "i", GLFW_KEY_I }, { "j", GLFW_KEY_J }, { "k", GLFW_KEY_K }, { "l", GLFW_KEY_L }, { "m", GLFW_KEY_M }, { "n", GLFW_KEY_N }, { "o", GLFW_KEY_O }, @@ -41,6 +42,7 @@ keyboard_input::recall_bindings() { { ";", GLFW_KEY_SEMICOLON }, { "'", GLFW_KEY_APOSTROPHE }, { "enter", GLFW_KEY_ENTER }, { ",", GLFW_KEY_COMMA }, { ".", GLFW_KEY_PERIOD }, { "/", GLFW_KEY_SLASH }, { "space", GLFW_KEY_SPACE }, + { "insert", GLFW_KEY_INSERT },{ "delete", GLFW_KEY_DELETE }, { "home", GLFW_KEY_HOME }, { "end", GLFW_KEY_END }, // numpad block { "num_/", GLFW_KEY_KP_DIVIDE }, { "num_*", GLFW_KEY_KP_MULTIPLY }, { "num_-", GLFW_KEY_KP_SUBTRACT }, { "num_7", GLFW_KEY_KP_7 }, { "num_8", GLFW_KEY_KP_8 }, { "num_9", GLFW_KEY_KP_9 }, { "num_+", GLFW_KEY_KP_ADD }, @@ -165,6 +167,10 @@ void keyboard_input::default_bindings() { m_commands = { + // aidriverenable + { GLFW_KEY_Q | keymodifier::shift }, + // aidriverdisable + { GLFW_KEY_Q }, // mastercontrollerincrease { GLFW_KEY_KP_ADD }, // mastercontrollerincreasefast @@ -207,17 +213,27 @@ keyboard_input::default_bindings() { { GLFW_KEY_KP_5 }, // trainbrakefullservice { GLFW_KEY_KP_2 }, + // trainbrakehandleoff + { GLFW_KEY_KP_5 | keymodifier::control }, // trainbrakeemergency { GLFW_KEY_KP_0 }, + // trainbrakebasepressureincrease + { GLFW_KEY_KP_3 | keymodifier::control }, + // trainbrakebasepressuredecrease + { GLFW_KEY_KP_9 | keymodifier::control }, + // trainbrakebasepressurereset + { GLFW_KEY_KP_6 | keymodifier::control }, + // trainbrakeoperationtoggle + { GLFW_KEY_KP_4 | keymodifier::control }, // manualbrakeincrease { GLFW_KEY_KP_1 | keymodifier::control }, // manualbrakedecrease { GLFW_KEY_KP_7 | keymodifier::control }, // alarm chain toggle { GLFW_KEY_B | keymodifier::shift | keymodifier::control }, - // wheelspinbrakeactivate, + // wheelspinbrakeactivate { GLFW_KEY_KP_ENTER }, - // sandboxactivate, + // sandboxactivate { GLFW_KEY_S }, // reverserincrease { GLFW_KEY_D }, @@ -247,6 +263,10 @@ keyboard_input::default_bindings() { { GLFW_KEY_B | keymodifier::shift }, // brakeactingspeeddecrease { GLFW_KEY_B }, + // brakeloadcompensationincrease + { GLFW_KEY_H | keymodifier::shift | keymodifier::control }, + // brakeloadcompensationdecrease + { GLFW_KEY_H | keymodifier::control }, // mubrakingindicatortoggle { GLFW_KEY_L | keymodifier::shift }, // alerteracknowledge @@ -257,8 +277,16 @@ keyboard_input::default_bindings() { { GLFW_KEY_A | keymodifier::shift }, // radiotoggle { GLFW_KEY_R | keymodifier::control }, + // radiochannelincrease + { GLFW_KEY_R | keymodifier::shift }, + // radiochanneldecrease + { GLFW_KEY_R }, // radiostoptest { GLFW_KEY_R | keymodifier::shift | keymodifier::control }, + // cabchangeforward + { GLFW_KEY_HOME }, + // cabchangebackward + { GLFW_KEY_END }, // viewturn { -1 }, // movehorizontal @@ -281,11 +309,11 @@ keyboard_input::default_bindings() { { GLFW_KEY_PAGE_UP }, // movedown { GLFW_KEY_PAGE_DOWN }, + // carcouplingincrease + { GLFW_KEY_INSERT }, + // carcouplingdisconnect + { GLFW_KEY_DELETE }, /* -const int k_CabForward = 42; -const int k_CabBackward = 43; -const int k_Couple = 44; -const int k_DeCouple = 45; const int k_ProgramQuit = 46; // const int k_ProgramPause= 47; const int k_ProgramHelp = 48; @@ -337,12 +365,16 @@ const int k_ProgramHelp = 48; { GLFW_KEY_Y | keymodifier::control | keymodifier::shift }, // redmarkertogglerearright { GLFW_KEY_I | keymodifier::control | keymodifier::shift }, + // redmarkerstoggle + { GLFW_KEY_E | keymodifier::shift }, + // endsignalstoggle + { GLFW_KEY_E }, // headlightsdimtoggle { GLFW_KEY_L | keymodifier::control }, // motorconnectorsopen { GLFW_KEY_L }, // motordisconnect - { GLFW_KEY_E | keymodifier::shift }, + { GLFW_KEY_E | keymodifier::control }, // interiorlighttoggle { GLFW_KEY_APOSTROPHE }, // interiorlightdimtoggle @@ -350,7 +382,6 @@ const int k_ProgramHelp = 48; // instrumentlighttoggle { GLFW_KEY_SEMICOLON }, /* -const int k_EndSign = 70; const int k_Active = 71; */ // "generictoggle0" From b34f86afb3ed26d33ddb566b04e29d4ab37112a9 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 10 Jan 2018 21:32:06 +0100 Subject: [PATCH 252/426] maintenance: removed deprecated vehicle control code --- Train.cpp | 1073 ----------------------------------------------------- Train.h | 1 - World.cpp | 142 ++----- 3 files changed, 41 insertions(+), 1175 deletions(-) diff --git a/Train.cpp b/Train.cpp index 91a76901..d5c0a90b 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1775,9 +1775,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } // play sound immediately when the switch is hit, not after release if( Train->fMainRelayTimer > 0.0f ) { -#ifdef EU07_USE_OLD_SOUNDCODE - Train->dsbRelay.play(); -#endif Train->fMainRelayTimer = 0.0f; } } @@ -1788,9 +1785,6 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // ...after opening circuit, or holding for too short time to close it // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, if( Train->fMainRelayTimer > 0.0f ) { -#ifdef EU07_USE_OLD_SOUNDCODE - Train->dsbRelay.play(); -#endif Train->fMainRelayTimer = 0.0f; } // we don't exactly know which of the two buttons was used, so reset both @@ -2114,12 +2108,6 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C } // visual feedback Train->ggStLinOffButton.UpdateValue( 1.0, Train->dsbSwitch ); - // effect - if( true == Train->mvControlled->StLinFlag ) { -#ifdef EU07_USE_OLD_SOUNDCODE - Train->dsbRelay.play(); -#endif - } // yBARC - zmienione na przeciwne, bo true to zalaczone Train->mvControlled->StLinFlag = false; if( ( Train->mvControlled->TrainType == dt_ET41 ) @@ -3195,307 +3183,6 @@ void TTrain::OnCommand_cabchangebackward( TTrain *Train, command_data const &Com } } -void TTrain::OnKeyDown(int cKey) -{ // naciśnięcie klawisza - bool const isEztOer = - ( ( mvControlled->TrainType == dt_EZT ) - && ( mvControlled->Battery == true ) - && ( mvControlled->EpFuse == true ) - && ( mvOccupied->BrakeSubsystem == ss_ESt ) - && ( mvControlled->ActiveDir != 0 ) ); // od yB - - if ( false == Global::shiftState) - { // wciśnięty [Shift] -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if( cKey == Global::Keys[ k_BrakeProfile ] ) // McZapkie-240302-B: - //----------- - // przelacznik opoznienia hamowania - { // yB://ABu: male poprawki, zeby bylo mozna ustawic dowolny wagon - int CouplNr = -2; - if( true == FreeFlyModeFlag ) - { - TDynamicObject *temp; - temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr)); - if (temp == NULL) - { - CouplNr = -2; - temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr)); - } - if( (temp) - && (temp != DynamicObject ) ) - // NOTE: the command to occupied vehicle will be passed through new command system, so we skip it here - // TODO: clean this up when whole control system is unified - { - if( ( temp->MoverParameters->BrakeDelayFlag & bdelay_M ) != 0 ) { - // can't speed it up any more than this - return; - } - auto const fasterbrakesetting = ( - temp->MoverParameters->BrakeDelayFlag < bdelay_R ? - temp->MoverParameters->BrakeDelayFlag << 1 : - temp->MoverParameters->BrakeDelayFlag | bdelay_M ); - temp->MoverParameters->BrakeDelaySwitch( fasterbrakesetting ); - } - } - } - else if( cKey == GLFW_KEY_Q ) // ze Shiftem - włączenie AI - { // McZapkie-240302 - wlaczanie automatycznego pilota (zadziala tylko w trybie debugmode) - if (DynamicObject->Mechanik) - { - if (DebugModeFlag) - if( DynamicObject->Mechanik->AIControllFlag ) { - //żeby nie trzeba było rozłączać dla zresetowania - DynamicObject->Mechanik->TakeControl( false ); - } - DynamicObject->Mechanik->TakeControl(true); - } - } -#endif - } - else // McZapkie-240302 - klawisze bez shifta - { -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if( cKey == Global::Keys[ k_IncLocalBrakeLevel ] ) - { // Ra 2014-09: w - // trybie latania - // obsługa jest w - // World.cpp - if (!FreeFlyModeFlag) - { - if (Global::ctrlState) - if ((mvOccupied->LocalBrake == ManualBrake) || (mvOccupied->MBrake == true)) - { - mvOccupied->IncManualBrakeLevel(1); - } - else if (mvOccupied->LocalBrake != ManualBrake) - mvOccupied->IncLocalBrakeLevel(1); - } - } - else if (cKey == Global::Keys[k_DecLocalBrakeLevel]) - { // Ra 2014-06: wersja dla - // swobodnego latania - // przeniesiona do - // World.cpp - if (!FreeFlyModeFlag) - { - if (Global::ctrlState) - if ((mvOccupied->LocalBrake == ManualBrake) || (mvOccupied->MBrake == true)) - mvOccupied->DecManualBrakeLevel(1); - else // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - - // odhamować jakoś trzeba - if ((mvOccupied->LocalBrake != ManualBrake) || mvOccupied->LocalBrakePos) - mvOccupied->DecLocalBrakeLevel(1); - } - } - else if (cKey == Global::Keys[k_Brake2]) { - if (Global::ctrlState) - mvOccupied->BrakeLevelSet( - mvOccupied->Handle->GetPos(bh_NP)); // yB: czy ten stos funkcji nie powinien być jako oddzielna funkcja movera? - } - else if (cKey == Global::Keys[k_Brake0]) - { - if (Global::ctrlState) - { - mvOccupied->BrakeCtrlPos2 = 0; // wyrownaj kapturek - } - } - else if (cKey == Global::Keys[k_BrakeProfile]) - { // yB://ABu: male poprawki, zeby - // bylo mozna ustawic dowolny - // wagon - int CouplNr = -2; - if( false == FreeFlyModeFlag ) { - if( Global::ctrlState ) - if (mvOccupied->BrakeDelaySwitch(bdelay_R)) - { - play_sound( dsbPneumaticRelay ); - } - else - ; - else if (mvOccupied->BrakeDelaySwitch(bdelay_G)) - { - play_sound( dsbPneumaticRelay ); - } - } - else { - TDynamicObject *temp; - temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr)); - if (temp == NULL) - { - CouplNr = -2; - temp = (DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr)); - } - if( (temp) - && (temp != DynamicObject ) ) - // NOTE: the command to occupied vehicle will be passed through new command system, so we skip it here - // TODO: clean this up when whole control system is unified - { - if( temp->MoverParameters->BrakeDelayFlag == bdelay_G ) { - // can't slow it down any more than this - return; - } - auto const slowerbrakesetting = ( - temp->MoverParameters->BrakeDelayFlag < bdelay_M ? - temp->MoverParameters->BrakeDelayFlag >> 1 : - temp->MoverParameters->BrakeDelayFlag ^ bdelay_M ); - - if( true == temp->MoverParameters->BrakeDelaySwitch( slowerbrakesetting ) ) { -#ifdef EU07_USE_OLD_SOUNDCODE - dsbPneumaticRelay.play(); -#endif - } - } - } - } - // McZapkie-240302 - wylaczanie automatycznego pilota (w trybie ~debugmode mozna tylko raz) - else if (cKey == GLFW_KEY_Q) // bez Shift - { - if (DynamicObject->Mechanik) - DynamicObject->Mechanik->TakeControl(false); - } - else if (cKey == Global::Keys[k_CabForward]) - { - if( !CabChange( 1 ) ) { - if( TestFlag( DynamicObject->MoverParameters->Couplers[ 0 ].CouplingFlag, ctrain_passenger ) ) { - // przejscie do nastepnego pojazdu - Global::changeDynObj = DynamicObject->PrevConnected; - Global::changeDynObj->MoverParameters->ActiveCab = ( - DynamicObject->PrevConnectedNo ? - -1 : - 1 ); - } - } -/* - NOTE: disabled to allow 'prototypical' 'tricking' pantograph compressor to run unattended - if (DynamicObject->MoverParameters->ActiveCab) - mvControlled->PantCompFlag = false; // wyjście z maszynowego wyłącza sprężarkę -*/ - } - else if (cKey == Global::Keys[k_CabBackward]) - { - if (!CabChange(-1)) - if (TestFlag(DynamicObject->MoverParameters->Couplers[1].CouplingFlag, ctrain_passenger)) { - // przejscie do poprzedniego - Global::changeDynObj = DynamicObject->NextConnected; - Global::changeDynObj->MoverParameters->ActiveCab = ( - DynamicObject->NextConnectedNo ? - -1 : - 1 ); - } -/* - NOTE: disabled to allow 'prototypical' 'tricking' pantograph compressor to run unattended - if (DynamicObject->MoverParameters->ActiveCab) - mvControlled->PantCompFlag = - false; // wyjście z maszynowego wyłącza sprężarkę pomocniczą -*/ - } - else if (cKey == Global::Keys[k_Couple]) { - - if( true == FreeFlyModeFlag ) { - // tryb freefly - int CouplNr = -1; // normalnie żaden ze sprzęgów - TDynamicObject *tmp; - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), 1, 1500, CouplNr); - if (tmp == nullptr) - tmp = DynamicObject->ABuScanNearestObject(DynamicObject->GetTrack(), -1, 1500, CouplNr); - - if( ( CouplNr != -1 ) - && ( tmp != nullptr ) ) { - - tmp->couple( CouplNr ); - } - if( DynamicObject->Mechanik ) { - // aktualizacja flag kierunku w składzie - DynamicObject->Mechanik->CheckVehicles( Connect ); - } - - } - } - else if (cKey == Global::Keys[k_DeCouple]) { - - if( true == FreeFlyModeFlag ) { - // tryb freefly - int CouplNr = -1; - auto *tmp { DynamicObject->ABuScanNearestObject( DynamicObject->GetTrack(), 1, 1500, CouplNr ) }; - if( tmp == nullptr ) { - tmp = DynamicObject->ABuScanNearestObject( DynamicObject->GetTrack(), -1, 1500, CouplNr ); - } - - if( ( CouplNr != -1 ) - && ( tmp != nullptr ) ) { - - tmp->uncouple( CouplNr ); - } - if( DynamicObject->Mechanik ) { - // aktualizacja skrajnych pojazdów w składzie - DynamicObject->Mechanik->CheckVehicles( Disconnect ); - } - } - - } -#endif - // else - if (DebugModeFlag) - { // przesuwanie składu o 100m - TDynamicObject *d = DynamicObject; - if (cKey == GLFW_KEY_LEFT_BRACKET) - { - while (d) - { - d->Move(100.0 * d->DirectionGet()); - d = d->Next(); // pozostałe też - } - d = DynamicObject->Prev(); - while (d) - { - d->Move(100.0 * d->DirectionGet()); - d = d->Prev(); // w drugą stronę też - } - } - else if (cKey == GLFW_KEY_RIGHT_BRACKET) - { - while (d) - { - d->Move(-100.0 * d->DirectionGet()); - d = d->Next(); // pozostałe też - } - d = DynamicObject->Prev(); - while (d) - { - d->Move(-100.0 * d->DirectionGet()); - d = d->Prev(); // w drugą stronę też - } - } - else if (cKey == GLFW_KEY_TAB) - { - while (d) - { - d->MoverParameters->V+= d->DirectionGet()*2.78; - d = d->Next(); // pozostałe też - } - d = DynamicObject->Prev(); - while (d) - { - d->MoverParameters->V += d->DirectionGet()*2.78; - d = d->Prev(); // w drugą stronę też - } - } - } -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if (cKey == GLFW_KEY_MINUS) - { // zmniejszenie numeru kanału radiowego - if (iRadioChannel > 0) - --iRadioChannel; // 0=wyłączony - } - else if (cKey == GLFW_KEY_EQUAL) - { // zmniejszenie numeru kanału radiowego - if (iRadioChannel < 8) - ++iRadioChannel; // 0=wyłączony - } -#endif - } -} - // cab movement update, fixed step part void TTrain::UpdateMechPosition(double dt) { // Ra: mechanik powinien być @@ -4463,148 +4150,6 @@ bool TTrain::Update( double const Deltatime ) ggCompressorButton.Update(); ggCompressorLocalButton.Update(); -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if( ( ( DynamicObject->iLights[ 0 ] ) == 0 ) && ( ( DynamicObject->iLights[ 1 ] ) == 0 ) ) - { - ggRightLightButton.PutValue(0); - ggLeftLightButton.PutValue(0); - ggUpperLightButton.PutValue(0); - ggRightEndLightButton.PutValue(0); - ggLeftEndLightButton.PutValue(0); - } - - // hunter-230112 - // REFLEKTOR LEWY - // glowne oswietlenie - if ((DynamicObject->iLights[0] & 1) == 1) - if ((mvOccupied->ActiveCab) == 1) - ggLeftLightButton.PutValue(1); - else if ((mvOccupied->ActiveCab) == -1) - ggRearLeftLightButton.PutValue(1); - - if ((DynamicObject->iLights[1] & 1) == 1) - if ((mvOccupied->ActiveCab) == -1) - ggLeftLightButton.PutValue(1); - else if ((mvOccupied->ActiveCab) == 1) - ggRearLeftLightButton.PutValue(1); - - // końcówki - if ((DynamicObject->iLights[0] & 2) == 2) - if ((mvOccupied->ActiveCab) == 1) - { - if (ggLeftEndLightButton.SubModel) - { - ggLeftEndLightButton.PutValue(1); - ggLeftLightButton.PutValue(0); - } - else - ggLeftLightButton.PutValue(-1); - } - else if ((mvOccupied->ActiveCab) == -1) - { - if (ggRearLeftEndLightButton.SubModel) - { - ggRearLeftEndLightButton.PutValue(1); - ggRearLeftLightButton.PutValue(0); - } - else - ggRearLeftLightButton.PutValue(-1); - } - - if ((DynamicObject->iLights[1] & 2) == 2) - if ((mvOccupied->ActiveCab) == -1) - { - if (ggLeftEndLightButton.SubModel) - { - ggLeftEndLightButton.PutValue(1); - ggLeftLightButton.PutValue(0); - } - else - ggLeftLightButton.PutValue(-1); - } - else if ((mvOccupied->ActiveCab) == 1) - { - if (ggRearLeftEndLightButton.SubModel) - { - ggRearLeftEndLightButton.PutValue(1); - ggRearLeftLightButton.PutValue(0); - } - else - ggRearLeftLightButton.PutValue(-1); - } - //-------------- - // REFLEKTOR GORNY - if ((DynamicObject->iLights[0] & 4) == 4) - if ((mvOccupied->ActiveCab) == 1) - ggUpperLightButton.PutValue(1); - else if ((mvOccupied->ActiveCab) == -1) - ggRearUpperLightButton.PutValue(1); - - if ((DynamicObject->iLights[1] & 4) == 4) - if ((mvOccupied->ActiveCab) == -1) - ggUpperLightButton.PutValue(1); - else if ((mvOccupied->ActiveCab) == 1) - ggRearUpperLightButton.PutValue(1); - //-------------- - // REFLEKTOR PRAWY - // główne oświetlenie - if ((DynamicObject->iLights[0] & 16) == 16) - if ((mvOccupied->ActiveCab) == 1) - ggRightLightButton.PutValue(1); - else if ((mvOccupied->ActiveCab) == -1) - ggRearRightLightButton.PutValue(1); - - if ((DynamicObject->iLights[1] & 16) == 16) - if ((mvOccupied->ActiveCab) == -1) - ggRightLightButton.PutValue(1); - else if ((mvOccupied->ActiveCab) == 1) - ggRearRightLightButton.PutValue(1); - - // końcówki - if ((DynamicObject->iLights[0] & 32) == 32) - if ((mvOccupied->ActiveCab) == 1) - { - if (ggRightEndLightButton.SubModel) - { - ggRightEndLightButton.PutValue(1); - ggRightLightButton.PutValue(0); - } - else - ggRightLightButton.PutValue(-1); - } - else if ((mvOccupied->ActiveCab) == -1) - { - if (ggRearRightEndLightButton.SubModel) - { - ggRearRightEndLightButton.PutValue(1); - ggRearRightLightButton.PutValue(0); - } - else - ggRearRightLightButton.PutValue(-1); - } - - if ((DynamicObject->iLights[1] & 32) == 32) - if ((mvOccupied->ActiveCab) == -1) - { - if (ggRightEndLightButton.SubModel) - { - ggRightEndLightButton.PutValue(1); - ggRightLightButton.PutValue(0); - } - else - ggRightLightButton.PutValue(-1); - } - else if ((mvOccupied->ActiveCab) == 1) - { - if (ggRearRightEndLightButton.SubModel) - { - ggRearRightEndLightButton.PutValue(1); - ggRearRightLightButton.PutValue(0); - } - else - ggRearRightLightButton.PutValue(-1); - } -#endif //--------- // hunter-080812: poprawka na ogrzewanie w elektrykach - usuniete uzaleznienie od przetwornicy if( ( mvControlled->Heating == true ) @@ -4641,397 +4186,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaCzuwaka.Turn( false ); btLampkaSHP.Turn( true ); } - // przelaczniki -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if( Console::Pressed( Global::Keys[ k_Horn ] ) ) - { - if (Global::shiftState) - { - SetFlag(mvOccupied->WarningSignal, 2); - mvOccupied->WarningSignal &= (255 - 1); - if (ggHornButton.SubModel) - ggHornButton.UpdateValue(1); - } - else - { - SetFlag(mvOccupied->WarningSignal, 1); - mvOccupied->WarningSignal &= (255 - 2); - if (ggHornButton.SubModel) - ggHornButton.UpdateValue(-1); - } - } - else - { - mvOccupied->WarningSignal = 0; - if (ggHornButton.SubModel) - ggHornButton.UpdateValue(0); - } - - if (Console::Pressed(Global::Keys[k_Horn2])) - if (Global::Keys[k_Horn2] != Global::Keys[k_Horn]) - { - SetFlag(mvOccupied->WarningSignal, 2); - } - //---------------- - // hunter-141211: wyl. szybki zalaczony i wylaczony przeniesiony z - // OnKeyPress() - if (Global::shiftState && Console::Pressed(Global::Keys[k_Main])) - { - fMainRelayTimer += dt; - ggMainOnButton.PutValue(1); - if (mvControlled->Mains != true) // hunter-080812: poprawka - mvControlled->ConverterSwitch(false); - if (fMainRelayTimer > mvControlled->InitialCtrlDelay) // wlaczanie WSa z opoznieniem - if (mvControlled->MainSwitch(true)) - { - // if (mvControlled->MainCtrlPos!=0) //zabezpieczenie, by po - // wrzuceniu pozycji przed wlaczonym - // mvControlled->StLinFlag=true; //WSem nie wrzucilo na ta - // pozycje po jego zalaczeniu //yBARC - co to tutaj robi?! - if (mvControlled->EngineType == DieselEngine) - dsbDieselIgnition->Play(0, 0, 0); - } - } - else - { - if (ggConverterButton.GetValue() != - 0) // po puszczeniu przycisku od WSa odpalanie potwora - mvControlled->ConverterSwitch(true); - // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, - // drugi warunek zeby nie odtwarzalo w nieskonczonosc i przeniesienie - // zerowania timera - if ((mvControlled->Mains != true) && (fMainRelayTimer > 0)) - { - dsbRelay->Play(0, 0, 0); - fMainRelayTimer = 0; - } - ggMainOnButton.UpdateValue(0); - } - //--- - if (!Global::shiftState && Console::Pressed(Global::Keys[k_Main])) - { - ggMainOffButton.PutValue(1); - if (mvControlled->MainSwitch(false)) - dsbRelay->Play(0, 0, 0); - } - else - ggMainOffButton.UpdateValue(0); - /* if (cKey==Global::Keys[k_Main]) //z shiftem - { - ggMainOnButton.PutValue(1); - if (mvControlled->MainSwitch(true)) - { - if (mvControlled->MainCtrlPos!=0) //hunter-131211: takie - zabezpieczenie - mvControlled->StLinFlag=true; - - if (mvControlled->EngineType==DieselEngine) - dsbDieselIgnition->Play(0,0,0); - else - dsbNastawnikJazdy->Play(0,0,0); - } - } - else */ - - /* if (cKey==Global::Keys[k_Main]) //bez shifta - { - ggMainOffButton.PutValue(1); - if (mvControlled->MainSwitch(false)) - { - dsbNastawnikJazdy->Play(0,0,0); - } - } - else */ - //---------------- - // hunter-131211: czuwak przeniesiony z OnKeyPress - // hunter-091012: zrobiony test czuwaka - if (Console::Pressed(Global::Keys[k_Czuwak])) - { // czuwak testuje kierunek, ale podobno w - // EZT nie, więc może być w rozrządczym - fCzuwakTestTimer += dt; - ggSecurityResetButton.PutValue(1); - if (CAflag == false) - { - CAflag = true; - mvOccupied->SecuritySystemReset(); - } - else if (fCzuwakTestTimer > 1.0) - SetFlag(mvOccupied->SecuritySystem.Status, s_CAtest); - } - else - { - fCzuwakTestTimer = 0; - ggSecurityResetButton.UpdateValue(0); - if (TestFlag(mvOccupied->SecuritySystem.Status, - s_CAtest)) //&&(!TestFlag(mvControlled->SecuritySystem.Status,s_CAebrake))) - { - SetFlag(mvOccupied->SecuritySystem.Status, -s_CAtest); - mvOccupied->s_CAtestebrake = false; - mvOccupied->SecuritySystem.SystemBrakeCATestTimer = 0; - // if ((!TestFlag(mvOccupied->SecuritySystem.Status,s_SHPebrake)) - // ||(!TestFlag(mvOccupied->SecuritySystem.Status,s_CAebrake))) - // mvControlled->EmergencyBrakeFlag=false; //YB-HN - } - CAflag = false; - } - /* - if ( Console::Pressed(Global::Keys[k_Czuwak]) ) - { - ggSecurityResetButton.PutValue(1); - if ((mvOccupied->SecuritySystem.Status&s_aware)&& - (mvOccupied->SecuritySystem.Status&s_active)) - { - mvOccupied->SecuritySystem.SystemTimer=0; - mvOccupied->SecuritySystem.Status-=s_aware; - mvOccupied->SecuritySystem.VelocityAllowed=-1; - CAflag=1; - } - else if (CAflag!=1) - mvOccupied->SecuritySystemReset(); - } - else - { - ggSecurityResetButton.UpdateValue(0); - CAflag=0; - } - */ - - //----------------- - // hunter-201211: piasecznica przeniesiona z OnKeyPress, wlacza sie tylko, - // gdy trzymamy przycisk, a nie tak jak wczesniej (raz nacisnelo sie 's' - // i sypala caly czas) - /* - if (cKey==Global::Keys[k_Sand]) - { - if (mvControlled->SandDoseOn()) - if (mvControlled->SandDose) - { - dsbPneumaticRelay->SetVolume(-30); - dsbPneumaticRelay->Play(0,0,0); - } - } - */ - - if( Console::Pressed( Global::Keys[ k_Sand ] ) ) - { - if (mvControlled->TrainType != dt_EZT && ggSandButton.SubModel != NULL) - { - // dsbPneumaticRelay->SetVolume(-30); - // dsbPneumaticRelay->Play(0,0,0); - ggSandButton.PutValue(1); - mvControlled->SandDose = true; - // mvControlled->SandDoseOn(true); - } - } - else - { - mvControlled->SandDose = false; - // mvControlled->SandDoseOn(false); - // dsbPneumaticRelay->SetVolume(-30); - // dsbPneumaticRelay->Play(0,0,0); - } - - //----------------- - // hunter-221211: hamowanie przy poslizgu - if (Console::Pressed(Global::Keys[k_AntiSlipping])) - { - if (mvControlled->BrakeSystem != ElectroPneumatic) - { - ggAntiSlipButton.PutValue(1); - mvControlled->AntiSlippingBrake(); - } - } - else - ggAntiSlipButton.UpdateValue(0); - //----------------- - // hunter-261211: przetwornica i sprezarka - if (Global::shiftState && - Console::Pressed(Global::Keys[k_Converter])) // NBMX 14-09-2003: przetwornica wl - { //(mvControlled->CompressorPower<2) - ggConverterButton.PutValue(1); - if ((mvControlled->PantFrontVolt != 0.0) || (mvControlled->PantRearVolt != 0.0) || - (mvControlled->EnginePowerSource.SourceType != - CurrentCollector) /*||(!Global::bLiveTraction)*/) - mvControlled->ConverterSwitch(true); - // if - // ((mvControlled->EngineType!=ElectricSeriesMotor)&&(mvControlled->TrainType!=dt_EZT)) - // //hunter-110212: poprawka dla EZT - if (mvControlled->CompressorPower == 2) // hunter-091012: tak jest poprawnie - mvControlled->CompressorSwitch(true); - } - else - { - if (mvControlled->ConvSwitchType == "impulse") - { - ggConverterButton.PutValue(0); - ggConverterOffButton.PutValue(0); - } - } - // if ( - // Global::shiftState&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) - // ) //NBMX 14-09-2003: sprezarka wl - if (Global::shiftState && Console::Pressed(Global::Keys[k_Compressor]) && - (mvControlled->CompressorPower < 2)) // hunter-091012: tak jest poprawnie - { // hunter-110212: poprawka dla EZT - ggCompressorButton.PutValue(1); - mvControlled->CompressorSwitch(true); - } - if (!Global::shiftState && - Console::Pressed(Global::Keys[k_Converter])) // NBMX 14-09-2003: przetwornica wl - { - ggConverterButton.PutValue(0); - ggConverterOffButton.PutValue(1); - mvControlled->ConverterSwitch(false); - if ((mvControlled->TrainType == dt_EZT) && (!TestFlag(mvControlled->EngDmgFlag, 4))) - mvControlled->ConvOvldFlag = false; - } - // if ( - // !Global::shiftState&&Console::Pressed(Global::Keys[k_Compressor])&&((mvControlled->EngineType==ElectricSeriesMotor)||(mvControlled->TrainType==dt_EZT)) - // ) //NBMX 14-09-2003: sprezarka wl - if (!Global::shiftState && Console::Pressed(Global::Keys[k_Compressor]) && - (mvControlled->CompressorPower < 2)) // hunter-091012: tak jest poprawnie - { // hunter-110212: poprawka dla EZT - ggCompressorButton.PutValue(0); - mvControlled->CompressorSwitch(false); - } - /* - bez szifta - if (cKey==Global::Keys[k_Converter]) //NBMX wyl przetwornicy - { - if (mvControlled->ConverterSwitch(false)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0,0,0);; - } - } - else - if (cKey==Global::Keys[k_Compressor]) //NBMX wyl sprezarka - { - if (mvControlled->CompressorSwitch(false)) - { - dsbSwitch->SetVolume(DSBVOLUME_MAX); - dsbSwitch->Play(0,0,0);; - } - } - else - */ - //----------------- - if ((!FreeFlyModeFlag) && - (!(DynamicObject->Mechanik ? DynamicObject->Mechanik->AIControllFlag : false))) - { - if (Console::Pressed(Global::Keys[k_Releaser])) // yB: odluzniacz caly - // czas trzymany, warunki - // powinny byc takie same, - // jak przy naciskaniu. - // Wlasciwie stamtad mozna - // wyrzucic sprawdzanie - // nacisniecia. - { - if ((mvControlled->EngineType == ElectricSeriesMotor) || - (mvControlled->EngineType == DieselElectric)) - if (mvControlled->TrainType != dt_EZT) - if ((mvOccupied->BrakeCtrlPosNo > 0) && (mvControlled->ActiveDir != 0)) - { - ggReleaserButton.PutValue(1); - mvOccupied->BrakeReleaser(1); - } - } // releaser - else - mvOccupied->BrakeReleaser(0); - } // FFMF - - if (Console::Pressed(Global::Keys[k_Univ1])) - { - if (!DebugModeFlag) - { - if (ggUniversal1Button.SubModel) - if (Global::shiftState) - ggUniversal1Button.IncValue(dt / 2); - else - ggUniversal1Button.DecValue(dt / 2); - } - } - if (!Console::Pressed(Global::Keys[k_SmallCompressor])) - // Ra: przecieść to na zwolnienie klawisza - if (DynamicObject->Mechanik ? !DynamicObject->Mechanik->AIControllFlag : - false) // nie wyłączać, gdy AI - mvControlled->PantCompFlag = false; // wyłączona, gdy nie trzymamy klawisza -/* - // NOTE: disabled to allow 'prototypical' 'tricking' pantograph compressor into running unattended - if( ( ( DynamicObject->Mechanik != nullptr ) - && ( false == DynamicObject->Mechanik->AIControllFlag ) ) - && ( mvControlled->TrainType == dt_EZT ? - ( mvControlled != mvOccupied ) : - ( mvOccupied->ActiveCab != 0 ) ) ) { - // HACK: if we're in one of the cabs we can't be activating pantograph compressor - // NOTE: this will break in multiplayer setups, do a proper tracking of pantograph user then - mvControlled->PantCompFlag = false; - } -*/ - if (Console::Pressed(Global::Keys[k_Univ2])) - { - if (!DebugModeFlag) - { - if (ggUniversal2Button.SubModel) - if (Global::shiftState) - ggUniversal2Button.IncValue(dt / 2); - else - ggUniversal2Button.DecValue(dt / 2); - } - } - - // hunter-091012: zrobione z uwzglednieniem przelacznika swiatla - if (Console::Pressed(Global::Keys[k_Univ3])) - { - if (Global::shiftState) - { - if (Global::ctrlState) - { - bCabLight = true; - if (ggCabLightButton.SubModel) - { - ggCabLightButton.PutValue(1); - btCabLight.TurnOn(); - } - } - else - { - if (ggInstrumentLightButton.SubModel) - { - ggInstrumentLightButton.PutValue(1); // hunter-131211: z UpdateValue na - // PutValue - by zachowywal sie jak - // pozostale przelaczniki - if (btInstrumentLight.Active()) - InstrumentLightActive = true; - } - } - } - else - { - if (Global::ctrlState) - { - bCabLight = false; - if (ggCabLightButton.SubModel) - { - ggCabLightButton.PutValue(0); - btCabLight.TurnOff(); - } - } - else - { - if (ggInstrumentLightButton.SubModel) - { - ggInstrumentLightButton.PutValue(0); // hunter-131211: z UpdateValue na - // PutValue - by zachowywal sie jak - // pozostale przelaczniki - if (btInstrumentLight.Active()) - InstrumentLightActive = false; - } - } - } - } -#endif // ABu030405 obsluga lampki uniwersalnej: if( btInstrumentLight.Active() ) // w ogóle jest if( InstrumentLightActive ) // załączona @@ -5051,215 +4206,6 @@ bool TTrain::Update( double const Deltatime ) else btInstrumentLight.Turn( false ); -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - // hunter-091012: przepisanie univ4 i zrobione z uwzglednieniem przelacznika swiatla - if (Console::Pressed(Global::Keys[k_Univ4])) - { - if( Global::shiftState ) - { - if (Global::ctrlState) - { - bCabLightDim = true; - if (ggCabLightDimButton.SubModel) - { - ggCabLightDimButton.PutValue(1); - } - } - else - { - Universal4Active = true; - // ggUniversal4Button.UpdateValue(1); - } - } - else - { - if (Global::ctrlState) - { - bCabLightDim = false; - if (ggCabLightDimButton.SubModel) - { - ggCabLightDimButton.PutValue(0); // hunter-131211: z UpdateValue na - // PutValue - by zachowywal sie jak - // pozostale przelaczniki - } - } - else - { - Universal4Active = false; - // ggUniversal4Button.UpdateValue(0); - } - } - } - // Odskakiwanie hamulce EP - if ((!Console::Pressed(Global::Keys[k_DecBrakeLevel])) && - (!Console::Pressed(Global::Keys[k_WaveBrake])) && (mvOccupied->BrakeCtrlPos == -1) && - (mvOccupied->BrakeHandle == FVel6) && (DynamicObject->Controller != AIdriver) && - (Global::iFeedbackMode != 4) && (!(Global::bMWDmasterEnable && Global::bMWDBreakEnable))) - { - // mvOccupied->BrakeCtrlPos=(mvOccupied->BrakeCtrlPos)+1; - // mvOccupied->IncBrakeLevel(); - mvOccupied->BrakeLevelSet(mvOccupied->BrakeCtrlPos + 1); - keybrakecount = 0; - if ((mvOccupied->TrainType == dt_EZT) && (mvControlled->Mains) && - (mvControlled->ActiveDir != 0)) - { - play_sound( dsbPneumaticSwitch ); - } - } - if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_IncBrakeLevel]))) - { - if (Global::ctrlState) - { - mvOccupied->BrakeCtrlPos2 -= Deltatime / 20.0; - if (mvOccupied->BrakeCtrlPos2 < -1.5) - mvOccupied->BrakeCtrlPos2 = -1.5; - } - else - { - // mvOccupied->BrakeCtrlPosR+=(mvOccupied->BrakeCtrlPosR>mvOccupied->BrakeCtrlPosNo?0:dt*2); - mvOccupied->BrakeLevelAdd(dt * 2); - // mvOccupied->BrakeCtrlPos= - // floor(mvOccupied->BrakeCtrlPosR+0.499); - } - } - - if ((mvOccupied->BrakeHandle == FV4a) && (Console::Pressed(Global::Keys[k_DecBrakeLevel]))) - { - if (Global::ctrlState) - { - mvOccupied->BrakeCtrlPos2 += (mvOccupied->BrakeCtrlPos2 > 2 ? 0 : Deltatime / 20.0); - if (mvOccupied->BrakeCtrlPos2 < -3) - mvOccupied->BrakeCtrlPos2 = -3; - } - else - { - // mvOccupied->BrakeCtrlPosR-=(mvOccupied->BrakeCtrlPosR<-1?0:dt*2); - // mvOccupied->BrakeCtrlPos= - // floor(mvOccupied->BrakeCtrlPosR+0.499); - mvOccupied->BrakeLevelAdd(-dt * 2); - } - } - - if( ( mvOccupied->BrakeSystem == ElectroPneumatic ) - && ( mvOccupied->BrakeHandle == St113 ) - && ( mvControlled->EpFuse == true ) ) - if (Console::Pressed(Global::Keys[k_AntiSlipping])) // kEP - { - ggAntiSlipButton.UpdateValue(1); - if (mvOccupied->SwitchEPBrake(1)) - { - dsbPneumaticSwitch.play(); - } - } - else - { - if (mvOccupied->SwitchEPBrake(0)) - { - dsbPneumaticSwitch.play(); - } - } - - if (Console::Pressed(Global::Keys[k_DepartureSignal])) - { - ggDepartureSignalButton.PutValue(1); - btLampkaDepartureSignal.TurnOn(); - mvControlled->DepartureSignal = true; - } - else - { - btLampkaDepartureSignal.TurnOff(); - if (DynamicObject->Mechanik) // może nie być? - if (!DynamicObject->Mechanik->AIControllFlag) // tylko jeśli nie prowadzi AI - mvControlled->DepartureSignal = false; - } - if (Console::Pressed(Global::Keys[k_Main])) //[] - { - if (Global::shiftState) - ggMainButton.PutValue(1); - else - ggMainButton.PutValue(0); - } - else - ggMainButton.PutValue(0); - if (Console::Pressed(Global::Keys[k_CurrentNext])) - { - if (mvControlled->TrainType != dt_EZT) - { - if (ShowNextCurrent == false) - { - if (ggNextCurrentButton.SubModel) - { - ggNextCurrentButton.UpdateValue(1); - play_sound( dsbSwitch ); - ShowNextCurrent = true; - } - } - } - else - { - if (Global::shiftState) - { - // if (Console::Pressed(k_CurrentNext)) - { // Ra: było pod GLFW_KEY_F3 - if ((mvOccupied->EpFuseSwitch(true))) - { - play_sound( dsbPneumaticSwitch ); - } - } - } - else - { - // if (Console::Pressed(k_CurrentNext)) - { // Ra: było pod GLFW_KEY_F3 - if (Global::ctrlState) - { - if ((mvOccupied->EpFuseSwitch(false))) - { - play_sound( dsbPneumaticSwitch ); - } - } - } - } - } - } - else - { - if (ShowNextCurrent == true) - { - if (ggNextCurrentButton.SubModel) - { - ggNextCurrentButton.UpdateValue(0); - play_sound( dsbSwitch ); - ShowNextCurrent = false; - } - } - } - // Winger 010304 PantAllDownButton - if (Console::Pressed(Global::Keys[k_PantFrontUp])) - { - if (Global::shiftState) - ggPantFrontButton.PutValue(1); - else - ggPantAllDownButton.PutValue(1); - } - else if (mvControlled->PantSwitchType == "impulse") - { - ggPantFrontButton.PutValue(0); - ggPantAllDownButton.PutValue(0); - } - if (Console::Pressed(Global::Keys[k_PantRearUp])) - { - if (Global::shiftState) - ggPantRearButton.PutValue(1); - else - ggPantFrontButtonOff.PutValue(1); - } - else if (mvControlled->PantSwitchType == "impulse") - { - ggPantRearButton.PutValue(0); - ggPantFrontButtonOff.PutValue(0); - } -#endif // guziki: ggMainOffButton.Update(); ggMainOnButton.Update(); @@ -5307,14 +4253,6 @@ bool TTrain::Update( double const Deltatime ) ggHornButton.Update(); ggHornLowButton.Update(); ggHornHighButton.Update(); -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggUniversal1Button.Update(); - ggUniversal2Button.Update(); - if( Universal4Active ) { - ggUniversal4Button.PermIncValue( dt ); - } - ggUniversal4Button.Update(); -#endif for( auto &universal : ggUniversals ) { universal.Update(); } @@ -5324,17 +4262,6 @@ bool TTrain::Update( double const Deltatime ) ggCabLightDimButton.Update(); ggBatteryButton.Update(); //------ -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - ggMainOffButton.UpdateValue(0); - ggMainOnButton.UpdateValue(0); - ggSecurityResetButton.UpdateValue(0); - ggReleaserButton.UpdateValue(0); - ggSandButton.UpdateValue(0); - ggAntiSlipButton.UpdateValue(0); - ggDepartureSignalButton.UpdateValue( 0 ); - ggFuseButton.UpdateValue( 0 ); - ggConverterFuseButton.UpdateValue(0); -#endif pyScreens.update(); } // wyprowadzenie sygnałów dla haslera na PoKeys (zaznaczanie na taśmie) diff --git a/Train.h b/Train.h index b3d79190..c04f7f23 100644 --- a/Train.h +++ b/Train.h @@ -82,7 +82,6 @@ class TTrain TTrain(); // McZapkie-010302 bool Init(TDynamicObject *NewDynamicObject, bool e3d = false); - void OnKeyDown(int cKey); inline vector3 GetDirection() { return DynamicObject->VectorFront(); }; inline vector3 GetUp() { return DynamicObject->VectorUp(); }; diff --git a/World.cpp b/World.cpp index 9de820a4..b1d685ed 100644 --- a/World.cpp +++ b/World.cpp @@ -230,15 +230,6 @@ bool TWorld::Init( GLFWwindow *Window ) { "ShaXbee, Oli_EU, youBy, KURS90, Ra, hunter, szociu, Stele, Q, firleju and others\n" ); UILayer.set_background( "logo" ); -#ifdef EU07_USE_OLD_SOUNDCODE - if( true == TSoundsManager::Init( glfwGetWin32Window( window ) ) ) { - WriteLog( "Sound subsystem setup complete" ); - } - else { - ErrorLog( "Sound subsystem setup failed" ); - return false; - } -#endif glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii UILayer.set_progress(0.01); UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" ); @@ -643,103 +634,52 @@ void TWorld::OnKeyDown(int cKey) { if( Controlled->MoverParameters->Radio ) simulation::Region->RadioStop( Camera.Pos ); } - else if (!Global::iPause) //podczas pauzy sterownaie nie działa - if (Train) - if (Controlled) - if( ( Controlled->Controller == Humandriver ) - || ( true == DebugModeFlag ) ) { - Train->OnKeyDown( cKey ); // przekazanie klawisza do kabiny - } + else { - if (FreeFlyModeFlag) // aby nie odluźniało wagonu za lokomotywą - { // operacje wykonywane na dowolnym pojeździe, przeniesione tu z kabiny - // NOTE: disabled so it doesn't interfere with new system controls in outside view - // TODO: implement as part of the new system -#ifdef EU07_USE_OLD_COMMAND_SYSTEM - if (cKey == Global::Keys[k_Releaser]) // odluźniacz - { // działa globalnie, sprawdzić zasięg - TDynamicObject *temp{ std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; - if( temp ) { - if( Global::ctrlState ) // z ctrl odcinanie { - temp->MoverParameters->Hamulec->SetBrakeStatus( temp->MoverParameters->Hamulec->GetBrakeStatus() ^ b_dmg ); - } - else { - temp->MoverParameters->BrakeReleaser( 1 ); - } - } - else if (cKey == Global::Keys[k_Heating]) // Ra: klawisz nie jest najszczęśliwszy - { // zmiana próżny/ładowny; Ra: zabrane z kabiny - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; - if (vehicle) - { - if (Global::shiftState ? vehicle->MoverParameters->IncBrakeMult() : - vehicle->MoverParameters->DecBrakeMult()) - if (Train) - { // dźwięk oczywiście jest w kabinie - Train->dsbSwitch.play(); + if( ( true == DebugModeFlag ) + && ( false == Global::shiftState ) + && ( true == Global::ctrlState ) + && ( Controlled != nullptr ) + && ( Controlled->Controller == Humandriver ) ) { + + if( DebugModeFlag ) { + // przesuwanie składu o 100m + TDynamicObject *d = Controlled; + if( cKey == GLFW_KEY_LEFT_BRACKET ) { + while( d ) { + d->Move( 100.0 * d->DirectionGet() ); + d = d->Next(); // pozostałe też + } + d = Controlled->Prev(); + while( d ) { + d->Move( 100.0 * d->DirectionGet() ); + d = d->Prev(); // w drugą stronę też + } + } + else if( cKey == GLFW_KEY_RIGHT_BRACKET ) { + while( d ) { + d->Move( -100.0 * d->DirectionGet() ); + d = d->Next(); // pozostałe też + } + d = Controlled->Prev(); + while( d ) { + d->Move( -100.0 * d->DirectionGet() ); + d = d->Prev(); // w drugą stronę też + } + } + else if( cKey == GLFW_KEY_TAB ) { + while( d ) { + d->MoverParameters->V += d->DirectionGet()*2.78; + d = d->Next(); // pozostałe też + } + d = Controlled->Prev(); + while( d ) { + d->MoverParameters->V += d->DirectionGet()*2.78; + d = d->Prev(); // w drugą stronę też } - } - } - else if (cKey == Global::Keys[k_EndSign]) { - // Ra 2014-07: zabrane z kabiny - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, true ) ) }; - - if( vehicle == nullptr ) { return; } - - int const CouplNr { - clamp( - vehicle->DirectionGet() - * ( LengthSquared3( vehicle->HeadPosition() - Camera.Pos ) > LengthSquared3( vehicle->RearPosition() - Camera.Pos ) ? - 1 : - -1 ), - 0, 1 ) }; // z [-1,1] zrobić [0,1] - int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę tapety pulpitu :/ - if (Global::shiftState) // z [Shift] zapalanie - set = mask = light::rearendsignals; // bez [Ctrl] założyć tabliczki - else if (Global::ctrlState) - set = mask = ( light::redmarker_left | light::redmarker_right ); // z [Ctrl] zapalić światła czerwone - else - mask = ( light::rearendsignals | light::redmarker_left | light::redmarker_right ); // wyłączanie ściąga wszystko - if (((vehicle->iLights[CouplNr]) & mask) != set) - { - vehicle->iLights[CouplNr] = (vehicle->iLights[CouplNr] & ~mask) | set; - if (Train) - { // Ra: ten dźwięk z kabiny to przegięcie, ale na razie zostawiam - Train->dsbSwitch.play(); } } } - else if (cKey == Global::Keys[k_IncLocalBrakeLevel]) - { // zahamowanie dowolnego pojazdu - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; - if (vehicle) - { - if( Global::ctrlState ) { - if( ( vehicle->MoverParameters->LocalBrake == ManualBrake ) - || ( vehicle->MoverParameters->MBrake == true ) ) - vehicle->MoverParameters->IncManualBrakeLevel( 1 ); - } - else if( vehicle->MoverParameters->LocalBrake != ManualBrake ) { - vehicle->MoverParameters->IncLocalBrakeLevelFAST(); - } - } - } - else if (cKey == Global::Keys[k_DecLocalBrakeLevel]) - { // odhamowanie dowolnego pojazdu - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, false ) ) }; - if (vehicle) - { - if( Global::ctrlState ) { - if( ( vehicle->MoverParameters->LocalBrake == ManualBrake ) - || ( vehicle->MoverParameters->MBrake == true ) ) - vehicle->MoverParameters->DecManualBrakeLevel( 1 ); - } - else if( vehicle->MoverParameters->LocalBrake != ManualBrake ) { - vehicle->MoverParameters->DecLocalBrakeLevelFAST(); - } - } - } -#endif } } From 79002a90170493dfb3ced16f80b8b2827a1b66a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Wed, 10 Jan 2018 21:16:09 +0100 Subject: [PATCH 253/426] Physics for hydraulic torque converter, reworked clutches and small changes for diesel engine controller --- McZapkie/MOVER.h | 43 +++++++++ McZapkie/Mover.cpp | 226 +++++++++++++++++++++++++++++++++++---------- World.cpp | 34 +++++++ 3 files changed, 253 insertions(+), 50 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 241295c0..5d1f2048 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -769,6 +769,31 @@ public: double dizel_minVelfullengage = 0.0; /*najmniejsza predkosc przy jezdzie ze sprzeglem bez poslizgu*/ double dizel_AIM = 1.0; /*moment bezwladnosci walu itp*/ double dizel_engageDia = 0.5; double dizel_engageMaxForce = 6000.0; double dizel_engagefriction = 0.5; /*parametry sprzegla*/ + double engagedownspeed = 0.9; + double engageupspeed = 0.5; + /*parametry przetwornika momentu*/ + bool hydro_TC = false; /*obecnosc hydraulicznego przetwornika momentu*/ + double hydro_TC_TMMax = 2.0; /*maksymalne wzmocnienie momentu*/ + double hydro_TC_CouplingPoint = 0.85; /*wzgledna predkosc zasprzeglenia*/ + double hydro_TC_LockupTorque = 3000.0; /*moment graniczny sprzegla blokujacego*/ + double hydro_TC_LockupRate = 1.0; /*szybkosc zalaczania sprzegla blokujacego*/ + double hydro_TC_UnlockRate = 1.0; /*szybkosc rozlaczania sprzegla blokujacego*/ + double hydro_TC_FillRateInc = 1.0; /*szybkosc napelniania sprzegla*/ + double hydro_TC_FillRateDec = 1.0; /*szybkosc oprozniania sprzegla*/ + double hydro_TC_TorqueInIn = 4.5; /*stala momentu proporcjonalnego do kwadratu obrotow wejsciowych*/ + double hydro_TC_TorqueInOut = 0.0; /*stala momentu proporcjonalnego do roznica obrotow wejsciowych i wyjsciowych*/ + double hydro_TC_TorqueOutOut = 0.0; /*stala momentu proporcjonalnego do kwadratu obrotow wyjsciowych*/ + double hydro_TC_LockupSpeed = 1.0; /*prog predkosci zalaczania sprzegla blokujacego*/ + double hydro_TC_UnlockSpeed = 1.0; /*prog predkosci rozlaczania sprzegla blokujacego*/ + /*parametry retardera*/ + bool hydro_R = false; /*obecnosc retardera*/ + int hydro_R_Placement = 0; /*umiejscowienie retardera: 0 - za skrzynia biegow, 1 - miedzy przetwornikiem a biegami, 2 - przed skrzynia biegow */ + double hydro_R_TorqueInIn = 1.0; /*stala momentu proporcjonalnego do kwadratu obrotow wejsciowych*/ + double hydro_R_MaxTorque = 1.0; /*maksymalny moment retardera*/ + double hydro_R_MaxPower = 1.0; /*maksymalna moc retardera - ogranicza moment*/ + double hydro_R_FillRateInc = 1.0; /*szybkosc napelniania sprzegla*/ + double hydro_R_FillRateDec = 1.0; /*szybkosc oprozniania sprzegla*/ + double hydro_R_MinVel = 1.0; /*minimalna predkosc, przy ktorej retarder dziala*/ /*- dla lokomotyw spalinowo-elektrycznych -*/ double AnPos = 0.0; // pozycja sterowania dokladnego (analogowego) bool AnalogCtrl = false; // @@ -957,6 +982,24 @@ public: double dizel_automaticgearstatus = 0.0; /*0 - bez zmiany, -1 zmiana na nizszy +1 zmiana na wyzszy*/ bool dizel_enginestart = false; /*czy trwa rozruch silnika*/ double dizel_engagedeltaomega = 0.0; /*roznica predkosci katowych tarcz sprzegla*/ + double dizel_n_old = 0.0; /*poredkosc na potrzeby obliczen sprzegiel*/ + double dizel_Torque = 0.0; /*poredkosc na potrzeby obliczen sprzegiel*/ + + /* - zmienne dla przetowrnika momentu */ + double hydro_TC_Fill = 0.0; /*napelnienie*/ + bool hydro_TC_Lockup = false; /*zapiecie sprzegla*/ + double hydro_TC_TorqueIn = 0.0; /*moment*/ + double hydro_TC_TorqueOut = 0.0; /*moment*/ + double hydro_TC_TMRatio = 1.0; /*aktualne przelozenie momentu*/ + double hydro_TC_Request = 0.0; /*zadanie sily*/ + double hydro_TC_nIn = 0.0; /*predkosc obrotowa walu wejsciowego*/ + double hydro_TC_nOut = 0.0; /*predkosc obrotowa walu wyjsciowego*/ + + /* - zmienne dla przetowrnika momentu */ + double hydro_R_Fill = 0.0; /*napelnienie*/ + double hydro_R_Torque = 0.0; /*moment*/ + double hydro_R_Request = 0.0; /*zadanie sily hamowania*/ + double hydro_R_n = 0.0; /*predkosc obrotowa retardera*/ /*- zmienne dla lokomotyw z silnikami indukcyjnymi -*/ double eimv[21]; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index c78e45ea..ded32795 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4440,7 +4440,7 @@ double TMoverParameters::TractionForce(double dt) if (MainCtrlPos > 1) dmoment -= dizel_Mstand * (0.2 * enrot / dizel_nmax); // dodatkowe opory z powodu sprezarki} - Mm = dizel_engage * dmoment; + Mm = dmoment; //bylo * dizel_engage Mw = Mm * dtrans; // dmoment i dtrans policzone przy okazji enginerotation Fw = Mw * 2.0 / WheelDiameter / NPoweredAxles; Ft = Fw * NPoweredAxles; // sila trakcyjna @@ -5544,8 +5544,6 @@ bool TMoverParameters::dizel_EngageSwitch(double state) // ************************************************************************************************* bool TMoverParameters::dizel_EngageChange(double dt) { - const double engagedownspeed = 0.9; - const double engageupspeed = 0.5; double engagespeed = 0; // OK:boolean; bool DEC; @@ -5585,7 +5583,7 @@ bool TMoverParameters::dizel_AutoGearCheck(void) OK = false; if (MotorParam[ScndCtrlActualPos].AutoSwitch && Mains) { - if (RList[MainCtrlPos].Mn == 0) + if ((RList[MainCtrlPos].Mn == 0)&&(!hydro_TC)) { if (dizel_engagestate > 0) dizel_EngageSwitch(0); @@ -5634,7 +5632,10 @@ bool TMoverParameters::dizel_AutoGearCheck(void) dizel_EngageSwitch(1.0); break; default: - dizel_EngageSwitch(0.0); + if (hydro_TC && hydro_TC_Fill>0.01) + dizel_EngageSwitch(1.0); + else + dizel_EngageSwitch(0.0); } else dizel_EngageSwitch(0.0); @@ -5690,9 +5691,9 @@ double TMoverParameters::dizel_fillcheck(int mcp) nreg = 0; if (Mains && (MainCtrlPosNo > 0)) { - if (dizel_enginestart && - (LastSwitchingTime >= 0.9 * InitialCtrlDelay)) // wzbogacenie przy rozruchu - realfill = 1; + if (dizel_enginestart && + (LastSwitchingTime >= 0.9 * InitialCtrlDelay)) // wzbogacenie przy rozruchu + realfill = 1; else realfill = RList[mcp].R; // napelnienie zalezne od MainCtrlPos if (dizel_nmax_cutoff > 0) @@ -5704,7 +5705,7 @@ double TMoverParameters::dizel_fillcheck(int mcp) nreg = dizel_nmin; break; case 2: - if (dizel_automaticgearstatus == 0) + if ((dizel_automaticgearstatus == 0)&&(true/*(!hydro_TC) || (dizel_engage>dizel_fill)*/)) nreg = dizel_nmax; else nreg = dizel_nmin; @@ -5712,12 +5713,18 @@ double TMoverParameters::dizel_fillcheck(int mcp) default: realfill = 0; // sluczaj } - if (enrot > nreg) + /*if (enrot > nreg) realfill = realfill * (3.9 - 3.0 * abs(enrot) / nreg); if (enrot > dizel_nmax_cutoff) realfill = realfill * (9.8 - 9.0 * abs(enrot) / dizel_nmax_cutoff); if (enrot < dizel_nmin) - realfill = realfill * (1.0 + (dizel_nmin - abs(enrot)) / dizel_nmin); + realfill = realfill * (1.0 + (dizel_nmin - abs(enrot)) / dizel_nmin);*/ + if (enrot > nreg) //nad predkoscia regulatora zeruj dawke + realfill = 0; + if (enrot < nreg) //pod predkoscia regulatora dawka zadana + realfill = realfill; + if ((enrot < dizel_nmin * 0.98)&&(RList[mcp].R>0.001)) //jesli ponizej biegu jalowego i niezerowa dawka, to dawaj pelna + realfill = 1; } } if (realfill < 0) @@ -5733,11 +5740,17 @@ double TMoverParameters::dizel_fillcheck(int mcp) // ************************************************************************************************* double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) { // liczy moment sily wytwarzany przez silnik spalinowy} - double Moment = 0, enMoment = 0, eps = 0, newn = 0, friction = 0; - + double Moment = 0, enMoment = 0, gearMoment = 0, eps = 0, newn = 0, friction = 0, neps = 0; + double TorqueH = 0, TorqueL = 0, TorqueC = 0; + n = n * CabNo; + if (MotorParam[ScndCtrlActualPos].mIsat < 0.001) + n = enrot; friction = dizel_engagefriction; + hydro_TC_nIn = enrot; //wal wejsciowy przetwornika momentu + hydro_TC_nOut = dizel_n_old; //wal wyjsciowy przetwornika momentu + neps = (n - dizel_n_old) / dt; //przyspieszenie katowe walu wejsciowego skrzyni biegow + if( enrot > 0 ) { -// Moment = dizel_Mmax * dizel_fill - ( dizel_Mmax - dizel_Mnmax * dizel_fill ) * sqr( enrot / ( dizel_nmax - dizel_nMmax * dizel_fill ) ) - dizel_Mstand; // Q: zamieniam SQR() na sqr() Moment = ( dizel_Mmax - ( dizel_Mmax - dizel_Mnmax ) * square( ( enrot - dizel_nMmax ) / ( dizel_nMmax - dizel_nmax ) ) ) * dizel_fill - dizel_Mstand; } else { @@ -5748,43 +5761,126 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) // wstrzymywanie przy malych obrotach Moment -= dizel_Mstand; } - //!! abs - if (abs(abs(n) - enrot) < 0.1) - { - if ((Moment) > (dizel_engageMaxForce * dizel_engage * dizel_engageDia * friction * - 2)) // zerwanie przyczepnosci sprzegla - enrot += dt * Moment / dizel_AIM; - else - { - dizel_engagedeltaomega = 0; - enrot = abs(n); // jest przyczepnosc tarcz - } - } - else - { - if ((enrot == 0) && (Moment < 0)) - newn = 0; - else - { - //!! abs - dizel_engagedeltaomega = enrot - n; // sliganie tarcz - enMoment = Moment - - Sign(dizel_engagedeltaomega) * dizel_engageMaxForce * dizel_engage * - dizel_engageDia * friction; - Moment = Sign(dizel_engagedeltaomega) * dizel_engageMaxForce * dizel_engage * - dizel_engageDia * friction; - dizel_engagedeltaomega = abs(enrot - abs(n)); - eps = enMoment / dizel_AIM; - newn = enrot + eps * dt; - if ((newn * enrot <= 0) && (eps * enrot < 0)) - newn = 0; - } - enrot = newn; - } - if ((enrot == 0) && (!dizel_enginestart)) - Mains = false; + if (true == dizel_enginestart) + Moment += dizel_Mstand / (0.3 + std::max(0.0, enrot/dizel_nmin)); //rozrusznik - return Moment; + dizel_Torque = Moment; + + if (hydro_TC) //jesli przetwornik momentu + { + //napelnianie przetwornika + if ((MainCtrlPos > 0) && (Mains) && (enrot>dizel_nmin*0.9)) + hydro_TC_Fill += hydro_TC_FillRateInc * dt; + //oproznianie przetwornika + if (((MainCtrlPos == 0) && (Vel<3)) + || (!Mains) + || (enrot hydro_TC_LockupSpeed) && (Mains) && (enrot > 0.9 * dizel_nmin) && (MainCtrlPos>0)) + hydro_TC_LockupRate += hydro_TC_FillRateInc*dt; + //luzowanie sprzegla blokujacego + if ((Vel < (MainCtrlPos>0 ? hydro_TC_LockupSpeed : hydro_TC_UnlockSpeed)) || (!Mains) || (enrot < 0.8 * dizel_nmin)) + hydro_TC_LockupRate -= hydro_TC_FillRateDec*dt; + //obcinanie zakresu + hydro_TC_LockupRate = clamp(hydro_TC_LockupRate, 0.0, 1.0); + } + else + { + hydro_TC_Fill = 0.0; + hydro_TC_LockupRate = 0.0; + } + + //obliczanie momentow poszczegolnych sprzegiel + //sprzeglo glowne (skrzynia biegow) + TorqueC = dizel_engageMaxForce * dizel_engage * dizel_engageDia * friction; + + if (hydro_TC) //jesli hydro + { + double HydroTorque = 0; + HydroTorque += hydro_TC_nIn * hydro_TC_nIn * hydro_TC_TorqueInIn; + HydroTorque += (hydro_TC_nIn - hydro_TC_nOut) * hydro_TC_TorqueInOut; + HydroTorque += hydro_TC_nOut * hydro_TC_nOut * hydro_TC_TorqueOutOut; + double nOut2In = hydro_TC_nOut / std::max(0.01, hydro_TC_nIn); + if (nOut2In < hydro_TC_CouplingPoint) + { + hydro_TC_TMRatio = 1 + (hydro_TC_TMMax - 1) * square(1 - nOut2In / hydro_TC_CouplingPoint); + hydro_TC_TorqueIn = HydroTorque * hydro_TC_Fill; + hydro_TC_TorqueOut = HydroTorque * hydro_TC_Fill * hydro_TC_TMRatio; + } + else + { + hydro_TC_TMRatio = (1 - nOut2In) / (1 - hydro_TC_CouplingPoint); + hydro_TC_TorqueIn = HydroTorque * hydro_TC_Fill * hydro_TC_TMRatio; + hydro_TC_TorqueOut = HydroTorque * hydro_TC_Fill * hydro_TC_TMRatio; + } + TorqueH = hydro_TC_TorqueOut; + TorqueL = hydro_TC_LockupTorque * hydro_TC_LockupRate; + } + else + { + TorqueH = 0; //brak przetwornika oznacza brak momentu + TorqueL = 1 + TorqueC * 2; //zabezpieczenie, polaczenie trwale + } + + //sprawdzanie dociskow poszczegolnych sprzegiel + if (abs(Moment) > Min0R(TorqueC, TorqueL + abs(hydro_TC_TorqueIn)) || (abs(dizel_n_old - enrot) > 0.1)) //slizga sie z powodu roznic predkosci albo przekroczenia momentu + { + dizel_engagedeltaomega = enrot - dizel_n_old; + + if (TorqueC > TorqueL) + { + if (TorqueC > TorqueL + abs(TorqueH)) + { + hydro_TC_nOut = n; + gearMoment = TorqueL + abs(TorqueH) * sign(dizel_engagedeltaomega); + enMoment = Moment - (TorqueL + abs(hydro_TC_TorqueIn))* sign(dizel_engagedeltaomega); + } + else + { + hydro_TC_nOut = enrot - (n - enrot)*(TorqueC - TorqueL) / TorqueH; //slizganie proporcjonalne, zeby przetwornik nadrabial + gearMoment = TorqueC * sign(dizel_engagedeltaomega); + enMoment = Moment - gearMoment; + } + + } + else + { + hydro_TC_nOut = enrot; + gearMoment = (TorqueC) * sign(dizel_engagedeltaomega); + enMoment = Moment - gearMoment; + } + eps = enMoment / dizel_AIM; + newn = enrot + eps * dt; + if ((newn - n)*(enrot - dizel_n_old) < 0) //przejscie przez zero - slizgalo sie i przestało + newn = n; + if ((newn * enrot <= 0) && (eps * enrot < 0)) //przejscie przez zero obrotow + newn = 0; + enrot = newn; + } + else //nie slizga sie (jeszcze) + { + dizel_engagedeltaomega = 0; + gearMoment = Moment; + enMoment = 0; + double enrot_min = enrot - (Min0R(TorqueC, TorqueL + abs(hydro_TC_TorqueIn)) - Moment) / dizel_AIM * dt; + double enrot_max = enrot + (Min0R(TorqueC, TorqueL + abs(hydro_TC_TorqueIn)) + Moment) / dizel_AIM * dt; + enrot = clamp(n,enrot_min,enrot_max); + } + + + if ((enrot <= 0) && (!dizel_enginestart)) + { + Mains = false; + enrot = 0; + } + + dizel_n_old = n; //obecna predkosc katowa na potrzeby kolejnej klatki + + return gearMoment; } // ************************************************************************************************* @@ -7455,6 +7551,9 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value( dizel_nmax_cutoff, "nmax_cutoff", Input, "0.0" ); dizel_nmax_cutoff /= 60.0; extract_value( dizel_AIM, "AIM", Input, "1.0" ); + + extract_value(engageupspeed, "EUS", Input, "0.5"); + extract_value(engagedownspeed, "EDS", Input, "0.9"); if( true == extract_value( AnPos, "ShuntMode", Input, "" ) ) { //dodatkowa przekładnia dla SM03 (2Ls150) @@ -7464,7 +7563,34 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { //"rozruch wysoki" ma dawać większą siłę AnPos = 1.0 / AnPos; //im większa liczba, tym wolniej jedzie } + } + hydro_TC = (extract_value("IsTC", Input) == "Yes"); + if (true == hydro_TC) { + extract_value(hydro_TC_TMMax, "TC_TMMax", Input, ""); + extract_value(hydro_TC_CouplingPoint, "TC_CP", Input, ""); + extract_value(hydro_TC_LockupTorque, "TC_LT", Input, ""); + extract_value(hydro_TC_LockupRate, "TC_LR", Input, ""); + extract_value(hydro_TC_UnlockRate, "TC_ULR", Input, ""); + extract_value(hydro_TC_FillRateInc, "TC_FRI", Input, ""); + extract_value(hydro_TC_FillRateDec, "TC_FRD", Input, ""); + extract_value(hydro_TC_TorqueInIn, "TC_TII", Input, ""); + extract_value(hydro_TC_TorqueInOut, "TC_TIO", Input, ""); + extract_value(hydro_TC_TorqueOutOut, "TC_TOO", Input, ""); + extract_value(hydro_TC_LockupSpeed, "TC_LS", Input, ""); + extract_value(hydro_TC_UnlockSpeed, "TC_ULS", Input, ""); + + hydro_R = (extract_value("IsRetarder", Input) == "Yes"); + if (true == hydro_R) { + extract_value(hydro_R_Placement, "R_Place", Input, ""); + extract_value(hydro_R_TorqueInIn, "R_TII", Input, ""); + extract_value(hydro_R_MaxTorque, "R_MT", Input, ""); + extract_value(hydro_R_MaxPower, "R_MP", Input, ""); + extract_value(hydro_R_FillRateInc, "R_FRI", Input, ""); + extract_value(hydro_R_FillRateDec, "R_FRD", Input, ""); + extract_value(hydro_R_MinVel, "R_MinVel", Input, ""); + } + } break; } case DieselElectric: { //youBy diff --git a/World.cpp b/World.cpp index b1d685ed..4215142a 100644 --- a/World.cpp +++ b/World.cpp @@ -1677,6 +1677,40 @@ TWorld::Update_UI() { UITable->text_lines.emplace_back( parameters, Global::UITextColor ); } } + if (vehicle->MoverParameters->EngineType == DieselEngine) { + std::string parameters = "param value"; + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "efill: " + to_string(vehicle->MoverParameters->dizel_fill, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "etorq: " + to_string(vehicle->MoverParameters->dizel_Torque, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "creal: " + to_string(vehicle->MoverParameters->dizel_engage, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "cdesi: " + to_string(vehicle->MoverParameters->dizel_engagestate, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "cdelt: " + to_string(vehicle->MoverParameters->dizel_engagedeltaomega, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "gears: " + to_string(vehicle->MoverParameters->dizel_automaticgearstatus, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "hydro value"; + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "hTCnI: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "hTCnO: " + to_string(vehicle->MoverParameters->hydro_TC_nOut, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "hTCTM: " + to_string(vehicle->MoverParameters->hydro_TC_TMRatio, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "hTCTI: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueIn, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "hTCTO: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueOut, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "hTCfl: " + to_string(vehicle->MoverParameters->hydro_TC_Fill, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + parameters = "hTCLR: " + to_string(vehicle->MoverParameters->hydro_TC_LockupRate, 2, 9); + UITable->text_lines.emplace_back(parameters, Global::UITextColor); + //parameters = "hTCXX: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); + //UITable->text_lines.emplace_back(parameters, Global::UITextColor); + } } // if( DebugModeFlag && Controlled ) From 8e5841d0ec02e0417f493e00cd5fbf44f0ecd517 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 13 Jan 2018 15:43:20 +0100 Subject: [PATCH 254/426] build 180113. combined sound support for motor relays, dedicated motor shunt field sound, camera movement speed calculation fix --- Camera.cpp | 8 +-- DynObj.cpp | 95 ++++++++++++++++++++++----------- DynObj.h | 1 + McZapkie/MOVER.h | 3 +- McZapkie/Mover.cpp | 130 ++++++++++++++++++++++++++------------------- sound.cpp | 21 ++++++-- version.h | 4 +- 7 files changed, 167 insertions(+), 95 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index 6b62ed67..4fc6d388 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -51,7 +51,7 @@ bool TCamera::OnCommand( command_data const &Command ) { auto const walkspeed { 1.0 }; - auto const runspeed { 7.5 }; + auto const runspeed { 10.0 }; bool iscameracommand { true }; switch( Command.command ) { @@ -158,9 +158,9 @@ void TCamera::Update() || ( true == DebugCameraFlag ) ) { // ctrl is used for mirror view, so we ignore the controls when in vehicle if ctrl is pressed // McZapkie-170402: poruszanie i rozgladanie we free takie samo jak w follow - Velocity.x = clamp( Velocity.x + m_moverate.x * 10.0 * deltatime, -m_moverate.x, m_moverate.x ); - Velocity.z = clamp( Velocity.z + m_moverate.z * 10.0 * deltatime, -m_moverate.z, m_moverate.z ); - Velocity.y = clamp( Velocity.y + m_moverate.y * 10.0 * deltatime, -m_moverate.y, m_moverate.y ); + Velocity.x = clamp( Velocity.x + m_moverate.x * 10.0 * deltatime, -std::abs( m_moverate.x ), std::abs( m_moverate.x ) ); + Velocity.z = clamp( Velocity.z + m_moverate.z * 10.0 * deltatime, -std::abs( m_moverate.z ), std::abs( m_moverate.z ) ); + Velocity.y = clamp( Velocity.y + m_moverate.y * 10.0 * deltatime, -std::abs( m_moverate.y ), std::abs( m_moverate.y ) ); } if( ( Type == tp_Free ) diff --git a/DynObj.cpp b/DynObj.cpp index 4847bacc..ef07170b 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3608,13 +3608,14 @@ void TDynamicObject::RenderSounds() { } // McZapkie-280302 - pisk mocno zacisnietych hamulcow - if( //( false == MoverParameters->SlippingWheels ) && - ( MoverParameters->UnitBrakeForce > rsPisk.m_amplitudefactor ) - && ( MoverParameters->Vel > 2.5 ) ) { + if( MoverParameters->Vel > 2.5 ) { - rsPisk - .gain( MoverParameters->UnitBrakeForce / ( rsPisk.m_amplitudefactor + 1 ) + rsPisk.m_amplitudeoffset ) - .play( sound_flags::exclusive | sound_flags::looping ); + volume = rsPisk.m_amplitudeoffset + interpolate( -1.0, 1.0, brakeforceratio ) * rsPisk.m_amplitudefactor; + if( volume > 0.075 ) { + rsPisk + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } } else { // don't stop the sound too abruptly @@ -3769,24 +3770,6 @@ void TDynamicObject::RenderSounds() { // McZapkie! - to wazne - SoundFlag wystawiane jest przez moje moduly // gdy zachodza pewne wydarzenia komentowane dzwiekiem. - if( TestFlag( MoverParameters->SoundFlag, sound::relay ) ) { - // przekaznik - gdy bezpiecznik, automatyczny rozruch itp - if( true == TestFlag( MoverParameters->SoundFlag, sound::parallel ) ) { - if( TestFlag( MoverParameters->SoundFlag, sound::loud ) ) - m_powertrainsounds.dsbWejscie_na_bezoporow.play(); - else - m_powertrainsounds.motor_parallel.play(); - } - else { - m_powertrainsounds.motor_relay - .gain( - true == TestFlag( MoverParameters->SoundFlag, sound::loud ) ? - 1.0f : - 0.8f ) - .play(); - } - } - if( TestFlag( MoverParameters->SoundFlag, sound::pneumatic ) ) { // pneumatic relay dsbPneumaticRelay @@ -3796,7 +3779,6 @@ void TDynamicObject::RenderSounds() { 0.8f ) .play(); } - // couplers int couplerindex { 0 }; for( auto &couplersounds : m_couplersounds ) { @@ -4642,6 +4624,11 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, rsPisk.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude ); rsPisk.owner( this ); + if( rsPisk.m_amplitudefactor > 10.f ) { + // HACK: convert old style activation point threshold to the new, regular amplitude adjustment system + rsPisk.m_amplitudefactor = 1.f; + rsPisk.m_amplitudeoffset = 0.f; + } rsPisk.m_amplitudeoffset *= ( 105.f - Random( 10.f ) ) / 100.f; } @@ -4821,10 +4808,10 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.motor_relay.deserialize( parser, sound_type::single ); m_powertrainsounds.motor_relay.owner( this ); } - else if( token == "pneumaticrelay:" ) { - // wylaczniki pneumatyczne: - dsbPneumaticRelay.deserialize( parser, sound_type::single ); - dsbPneumaticRelay.owner( this ); + else if( token == "shuntfield:" ) { + // styczniki itp: + m_powertrainsounds.motor_shuntfield.deserialize( parser, sound_type::single ); + m_powertrainsounds.motor_shuntfield.owner( this ); } else if( token == "wejscie_na_bezoporow:" ) { // hunter-111211: wydzielenie wejscia na bezoporowa i na drugi uklad do pliku @@ -4835,6 +4822,11 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.motor_parallel.deserialize( parser, sound_type::single ); m_powertrainsounds.motor_parallel.owner( this ); } + else if( token == "pneumaticrelay:" ) { + // wylaczniki pneumatyczne: + dsbPneumaticRelay.deserialize( parser, sound_type::single ); + dsbPneumaticRelay.owner( this ); + } // braking sounds else if( token == "brakesound:" ) { // hamowanie zwykle: @@ -5778,6 +5770,50 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub motor.stop(); } + auto const soundflags { Vehicle.SoundFlag }; + if( TestFlag( soundflags, sound::relay ) ) { + // przekaznik - gdy bezpiecznik, automatyczny rozruch itp + if( true == TestFlag( soundflags, sound::shuntfield ) ) { + // shunt field + motor_shuntfield + .pitch( + true == motor_shuntfield.is_combined() ? + Vehicle.ScndCtrlActualPos * 0.01f : + motor_shuntfield.m_frequencyoffset + 1.f * motor_shuntfield.m_frequencyfactor ) + .gain( + motor_shuntfield.m_amplitudeoffset + ( + true == TestFlag( soundflags, sound::loud ) ? + 1.0f : + 0.8f ) + * motor_shuntfield.m_amplitudefactor ) + .play(); + } + else if( true == TestFlag( soundflags, sound::parallel ) ) { + // parallel mode + if( TestFlag( soundflags, sound::loud ) ) { + dsbWejscie_na_bezoporow.play(); + } + else { + motor_parallel.play(); + } + } + else { + // series mode + motor_relay + .pitch( + true == motor_relay.is_combined() ? + Vehicle.MainCtrlActualPos * 0.01f : + motor_relay.m_frequencyoffset + 1.f * motor_relay.m_frequencyfactor ) + .gain( + motor_relay.m_amplitudeoffset + ( + true == TestFlag( soundflags, sound::loud ) ? + 1.0f : + 0.8f ) + * motor_relay.m_amplitudefactor ) + .play(); + } + } + if( ( Vehicle.EngineType == ElectricSeriesMotor ) || ( Vehicle.EngineType == ElectricInductionMotor ) ) { @@ -5799,7 +5835,6 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub } } - if( Vehicle.TrainType == dt_ET40 ) { if( Vehicle.Vel > 0.1 ) { transmission diff --git a/DynObj.h b/DynObj.h index c0cf4367..16c644c2 100644 --- a/DynObj.h +++ b/DynObj.h @@ -290,6 +290,7 @@ private: sound_source motor_relay { sound_placement::engine }; sound_source dsbWejscie_na_bezoporow { sound_placement::engine }; // moved from cab sound_source motor_parallel { sound_placement::engine }; // moved from cab + sound_source motor_shuntfield { sound_placement::engine }; sound_source rsWentylator { sound_placement::engine }; // McZapkie-030302 sound_source engine { sound_placement::engine }; // generally diesel engine sound_source engine_ignition { sound_placement::engine }; // moved from cab diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 5d1f2048..8dd8e9ff 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -204,7 +204,8 @@ enum sound { bufferclash = 0x4, relay = 0x10, parallel = 0x20, - pneumatic = 0x40 + shuntfield = 0x40, + pneumatic = 0x80 }; //szczególne typy pojazdów (inna obsługa) dla zmiennej TrainType diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index ded32795..76cbd3c6 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4622,24 +4622,19 @@ double TMoverParameters::TractionForce(double dt) { if( ( ScndCtrlPos < ScndCtrlPosNo ) && ( MainCtrlPos >= 10 ) ) { - if( ScndCtrlPos == 0 ) { - if( Im < MPTRelay[ ScndCtrlPos ].Iup ) { - ++ScndCtrlPos; - } + + if( Im < MPTRelay[ ScndCtrlPos ].Iup ) { + ++ScndCtrlPos; } - else { - if( Vel > MPTRelay[ ScndCtrlPos ].Iup ) { - ++ScndCtrlPos; - } - // check for cases where the speed drops below threshold for level 2 or 3 - if( ( ScndCtrlPos > 1 ) - && ( Vel < MPTRelay[ ScndCtrlPos - 1 ].Idown ) ) { - --ScndCtrlPos; - } + // check for cases where the speed drops below threshold for level 2 or 3 + if( ( ScndCtrlPos > 1 ) + && ( Vel < MPTRelay[ ScndCtrlPos - 1 ].Idown ) ) { + --ScndCtrlPos; } } // malenie if( ( ScndCtrlPos > 0 ) && ( MainCtrlPos < 10 ) ) { + if( ScndCtrlPos == 1 ) { if( Im > MPTRelay[ ScndCtrlPos - 1 ].Idown ) { --ScndCtrlPos; @@ -4659,6 +4654,13 @@ double TMoverParameters::TractionForce(double dt) if( MainCtrlPos < 7 ) { ScndCtrlPos = 0; } +/* + // crude woodward approximation; difference between rpm for consecutive positions is ~5% + // so we get full throttle until ~half way between desired and previous position, or zero on rpm reduction + auto const woodward { clamp( + ( DElist[ MainCtrlPos ].RPM / ( enrot * 60.0 ) - 1.0 ) * 50.0, + 0.0, 1.0 ) }; +*/ break; } case 46: @@ -5224,7 +5226,8 @@ bool TMoverParameters::AutoRelayCheck(void) { if ((LastRelayTime > CtrlDelay) && (ARFASI2)) { - ScndCtrlActualPos++; + ++ScndCtrlActualPos; + SetFlag( SoundFlag, sound::shuntfield ); OK = true; } } @@ -5232,7 +5235,8 @@ bool TMoverParameters::AutoRelayCheck(void) { if ((LastRelayTime > CtrlDownDelay) && (TrainType != dt_EZT)) { - ScndCtrlActualPos--; + --ScndCtrlActualPos; + SetFlag( SoundFlag, sound::shuntfield ); OK = true; } } @@ -5260,7 +5264,7 @@ bool TMoverParameters::AutoRelayCheck(void) && ( MainCtrlPos != MainCtrlPosNo ) && ( FastSerialCircuit == 1 ) ) { - MainCtrlActualPos++; + ++MainCtrlActualPos; // MainCtrlActualPos:=MainCtrlPos; //hunter-111012: // szybkie wchodzenie na bezoporowa (303E) OK = true; @@ -5275,7 +5279,7 @@ bool TMoverParameters::AutoRelayCheck(void) (DelayCtrlFlag))) // et22 z walem grupowym if (!DelayCtrlFlag) // najpierw przejscie { - MainCtrlActualPos++; + ++MainCtrlActualPos; DelayCtrlFlag = true; // tryb przejscia OK = true; } @@ -5289,7 +5293,7 @@ bool TMoverParameters::AutoRelayCheck(void) ; else // nie ET22 z wałem grupowym { - MainCtrlActualPos++; + ++MainCtrlActualPos; OK = true; } //--------- @@ -5313,7 +5317,7 @@ bool TMoverParameters::AutoRelayCheck(void) if ((RList[MainCtrlPos].R == 0) && (MainCtrlPos > 0) && (!(MainCtrlPos == MainCtrlPosNo)) && (FastSerialCircuit == 1)) { - MainCtrlActualPos--; + --MainCtrlActualPos; // MainCtrlActualPos:=MainCtrlPos; //hunter-111012: // szybkie wchodzenie na bezoporowa (303E) OK = true; @@ -5323,13 +5327,12 @@ bool TMoverParameters::AutoRelayCheck(void) { if (TrainType != dt_EZT) // tutaj powinien być tryb sterowania wałem { - MainCtrlActualPos--; + --MainCtrlActualPos; OK = true; } if (MainCtrlActualPos > 0) // hunter-111211: poprawki - if (RList[MainCtrlActualPos].R == - 0) // dzwieki schodzenia z bezoporowej} - { + if (RList[MainCtrlActualPos].R == 0) { + // dzwieki schodzenia z bezoporowej} SetFlag(SoundFlag, sound::parallel); } } @@ -5338,7 +5341,8 @@ bool TMoverParameters::AutoRelayCheck(void) { if (LastRelayTime > CtrlDownDelay) { - ScndCtrlActualPos--; // boczniki nie dzialaja na poz. oporowych + --ScndCtrlActualPos; // boczniki nie dzialaja na poz. oporowych + SetFlag( SoundFlag, sound::shuntfield ); OK = true; } } @@ -5369,45 +5373,61 @@ bool TMoverParameters::AutoRelayCheck(void) else DelayCtrlFlag = false; - if ((!StLinFlag) && ((MainCtrlActualPos > 0) || (ScndCtrlActualPos > 0))) - if ((TrainType == dt_EZT) && (CoupledCtrl)) // EN57 wal jednokierunkowy calosciowy - { - if (MainCtrlActualPos == 1) - { - MainCtrlActualPos = 0; - OK = true; - } - else if (LastRelayTime > CtrlDownDelay) - { - if (MainCtrlActualPos < RlistSize) - MainCtrlActualPos++; // dojdz do konca - else if (ScndCtrlActualPos < ScndCtrlPosNo) - ScndCtrlActualPos++; // potem boki - else - { // i sie przewroc na koniec + if( ( false == StLinFlag ) + && ( ( MainCtrlActualPos > 0 ) + || ( ScndCtrlActualPos > 0 ) ) ) { + + if( true == CoupledCtrl ) { + + if( TrainType == dt_EZT ) { + // EN57 wal jednokierunkowy calosciowy + if( MainCtrlActualPos == 1 ) { + MainCtrlActualPos = 0; - ScndCtrlActualPos = 0; + OK = true; + } + else { + + if( LastRelayTime > CtrlDownDelay ) { + + if( MainCtrlActualPos < RlistSize ) { + // dojdz do konca + ++MainCtrlActualPos; + } + else if( ScndCtrlActualPos < ScndCtrlPosNo ) { + // potem boki + ++ScndCtrlActualPos; + SetFlag( SoundFlag, sound::shuntfield ); + } + else { + // i sie przewroc na koniec + MainCtrlActualPos = 0; + ScndCtrlActualPos = 0; + } + OK = true; + } + } + } + else { + // wal kulakowy dwukierunkowy + if( LastRelayTime > CtrlDownDelay ) { + if( ScndCtrlActualPos > 0 ) { + --ScndCtrlActualPos; + SetFlag( SoundFlag, sound::shuntfield ); + } + else { + --MainCtrlActualPos; + } + OK = true; } - OK = true; } } - else if (CoupledCtrl) // wal kulakowy dwukierunkowy - { - if (LastRelayTime > CtrlDownDelay) - { - if (ScndCtrlActualPos > 0) - ScndCtrlActualPos--; - else - MainCtrlActualPos--; - OK = true; - } - } - else - { + else { MainCtrlActualPos = 0; ScndCtrlActualPos = 0; OK = true; } + } } if (OK) LastRelayTime = 0; diff --git a/sound.cpp b/sound.cpp index 9f768644..c101e1d9 100644 --- a/sound.cpp +++ b/sound.cpp @@ -57,14 +57,30 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons // on the far end the crossfade section extends to the threshold point of the next chunk... for( std::size_t idx = 0; idx < m_soundchunks.size() - 1; ++idx ) { m_soundchunks[ idx ].second.fadeout = m_soundchunks[ idx + 1 ].second.threshold; +/* + m_soundchunks[ idx ].second.fadeout = + interpolate( + m_soundchunks[ idx ].second.threshold, + m_soundchunks[ idx + 1 ].second.threshold, + m_crossfaderange * 0.01f ); +*/ } // ...and on the other end from the threshold point back into the range of previous chunk m_soundchunks.front().second.fadein = std::max( 0, m_soundchunks.front().second.threshold ); +// m_soundchunks.front().second.fadein = m_soundchunks.front().second.threshold; for( std::size_t idx = 1; idx < m_soundchunks.size(); ++idx ) { auto const previouschunkwidth { m_soundchunks[ idx ].second.threshold - m_soundchunks[ idx - 1 ].second.threshold }; m_soundchunks[ idx ].second.fadein = m_soundchunks[ idx ].second.threshold - 0.01f * m_crossfaderange * previouschunkwidth; +/* + m_soundchunks[ idx ].second.fadein = + interpolate( + m_soundchunks[ idx ].second.threshold, + m_soundchunks[ idx - 1 ].second.threshold, + m_crossfaderange * 0.01f ); +*/ } m_soundchunks.back().second.fadeout = std::max( 100, m_soundchunks.back().second.threshold ); +// m_soundchunks.back().second.fadeout = m_soundchunks.back().second.threshold; // test if the chunk table contains any actual samples while at it for( auto &soundchunk : m_soundchunks ) { if( soundchunk.first.buffer != null_handle ) { @@ -353,7 +369,7 @@ sound_source::play_combined() { // a chunk covers range from fade in point, where it starts rising in volume over crossfade distance, // lasts until fadeout - crossfade distance point, past which it grows quiet until fade out point where it ends if( soundpoint < soundchunk.second.fadein ) { break; } - if( soundpoint > soundchunk.second.fadeout ) { continue; } + if( soundpoint >= soundchunk.second.fadeout ) { continue; } if( ( soundchunk.first.playing > 0 ) || ( soundchunk.first.buffer == null_handle ) ) { @@ -564,7 +580,7 @@ sound_source::update_combined( audio::openal_source &Source ) { auto const soundpoint { compute_combined_point() }; auto const &soundchunk { m_soundchunks[ soundhandle ^ sound_id::chunk ] }; if( ( soundpoint < soundchunk.second.fadein ) - || ( soundpoint > soundchunk.second.fadeout ) ) { + || ( soundpoint >= soundchunk.second.fadeout ) ) { Source.stop(); update_counter( soundhandle, -1 ); return; @@ -681,7 +697,6 @@ sound_source::update_crossfade( sound_handle const Chunk ) { m_properties.pitch = 1.f; } } - // if there's no crossfade sections, our work is done if( m_crossfaderange == 0 ) { return; } diff --git a/version.h b/version.h index e1eaf929..2a1f3bf1 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once -#define VERSION_MAJOR 17 -#define VERSION_MINOR 1231 +#define VERSION_MAJOR 18 +#define VERSION_MINOR 113 #define VERSION_REVISION 0 From 8d8a5335153a5e655fa383609bf730293ebfe193 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 14 Jan 2018 19:09:46 +0100 Subject: [PATCH 255/426] velocity based tangential acceleration calculation, tweaks for relay type 45, 46 --- Driver.cpp | 1 - Driver.h | 1 - DynObj.cpp | 40 ++++----- McZapkie/MOVER.h | 5 +- McZapkie/Mover.cpp | 201 +++++++++++++++++++++------------------------ Train.cpp | 4 +- messaging.cpp | 2 +- version.h | 2 +- 8 files changed, 120 insertions(+), 136 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index d1799d1f..9135c524 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4563,7 +4563,6 @@ TController::UpdateSituation(double dt) { AbsAccS /= fMass; } AbsAccS_pub = AbsAccS; - AbsAccS_avg = interpolate( AbsAccS_avg, mvOccupied->AccS * iDirection, 0.25 ); #if LOGVELOCITY // WriteLog("VelDesired="+AnsiString(VelDesired)+", diff --git a/Driver.h b/Driver.h index 44dd11ed..628f69dd 100644 --- a/Driver.h +++ b/Driver.h @@ -209,7 +209,6 @@ public: double BrakeAccFactor(); double fBrakeReaction = 1.0; //opóźnienie zadziałania hamulca - czas w s / (km/h) double fAccThreshold = 0.0; // próg opóźnienia dla zadziałania hamulca - double AbsAccS_avg = 0.0; // averaged out directional acceleration double AbsAccS_pub = 0.0; // próg opóźnienia dla zadziałania hamulca double fBrake_a0[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca double fBrake_a1[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca diff --git a/DynObj.cpp b/DynObj.cpp index ef07170b..9c49d2c7 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1749,10 +1749,11 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // McZapkie: TypeName musi byc nazwą CHK/MMD pojazdu if (!MoverParameters->LoadFIZ(asBaseDir)) { // jak wczytanie CHK się nie uda, to błąd - if (ConversionError == -8) - ErrorLog("Missed file: " + BaseDir + "\\" + Type_Name + ".fiz"); - Error("Cannot load dynamic object " + asName + " from:\r\n" + BaseDir + "\\" + Type_Name + - ".fiz\r\nError " + to_string(ConversionError)); + if (ConversionError == 666) + ErrorLog( "Bad vehicle: failed do locate definition file \"" + BaseDir + "\\" + Type_Name + ".fiz" + "\"" ); + else { + ErrorLog( "Bad vehicle: failed to load definition from file \"" + BaseDir + "\\" + Type_Name + ".fiz\" (error " + to_string( ConversionError ) + ")" ); + } return 0.0; // zerowa długość to brak pojazdu } bool driveractive = (fVel != 0.0); // jeśli prędkość niezerowa, to aktywujemy ruch @@ -2964,27 +2965,26 @@ bool TDynamicObject::Update(double dt, double dt1) } } + auto axleindex { 0 }; for( auto &axle : m_axlesounds ) { axle.distance -= dDOMoveLen * Sign( dDOMoveLen ); if( axle.distance < 0 ) { axle.distance += dRailLength; -/* - // McZapkie-040302 - if( i == iAxles - 1 ) { - rsStukot[ 0 ].stop(); - MoverParameters->AccV += 0.5 * GetVelocity() / ( 1 + MoverParameters->Vmax ); - } - else { - rsStukot[ i + 1 ].stop(); - } - if( i == 1 ) { - MoverParameters->AccV -= 0.5 * GetVelocity() / ( 1 + MoverParameters->Vmax ); - } -*/ if( MoverParameters->Vel > 2.5 ) { axle.clatter.gain( volume ).play(); + // crude bump simulation, drop down on even axles, move back up on the odd ones + MoverParameters->AccVert += + interpolate( + 0.25, 0.50, + clamp( + GetVelocity() / ( 1 + MoverParameters->Vmax ), + 0.0, 1.0 ) ) + * ( ( axleindex % 2 ) != 0 ? + 1 : + -1 ); } } + ++axleindex; } } } @@ -3621,9 +3621,9 @@ void TDynamicObject::RenderSounds() { // don't stop the sound too abruptly volume = std::max( 0.0, rsPisk.gain() - ( rsPisk.gain() * 2.5 * dt ) ); rsPisk.gain( volume ); - if( volume < 0.05 ) { - rsPisk.stop(); - } + } + if( volume < 0.05 ) { + rsPisk.stop(); } // other sounds diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 8dd8e9ff..7a29e8bf 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -850,8 +850,9 @@ public: double V = 0.0; //predkosc w [m/s] względem sprzęgów (dodania gdy jedzie w stronę 0) double Vel = 0.0; //moduł prędkości w [km/h], używany przez AI double AccS = 0.0; //efektywne przyspieszenie styczne w [m/s^2] (wszystkie siły) - double AccN = 0.0; //przyspieszenie normalne w [m/s^2] - double AccV = 0.0; + double AccSVBased {}; // tangential acceleration calculated from velocity change + double AccN = 0.0; // przyspieszenie normalne w [m/s^2] + double AccVert = 0.0; // vertical acceleration double nrot = 0.0; double WheelFlat = 0.0; /*! rotacja kol [obr/s]*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 76cbd3c6..3831dc09 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1116,7 +1116,6 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap { const double Vepsilon = 1e-5; const double Aepsilon = 1e-3; // ASBSpeed=0.8; - double Vprev, AccSprev, d; // T_MoverParameters::ComputeMovement(dt, dt1, Shape, Track, ElectricTraction, NewLoc, NewRot); // // najpierw kawalek z funkcji w pliku mover.pas @@ -1260,12 +1259,13 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap if (dL == 0) // oblicz przesuniecie} { - Vprev = V; - AccSprev = AccS; - // dt:=ActualTime-LastUpdatedTime; //przyrost czasu + auto const AccSprev { AccS }; // przyspieszenie styczne - AccS = (FTotal / TotalMass + AccSprev) / - 2.0; // prawo Newtona ale z wygladzaniem (średnia z poprzednim) + AccS = interpolate( + AccSprev, + FTotal / TotalMass, + 0.5 ); + // clamp( dt * 3.0, 0.0, 1.0 ) ); // prawo Newtona ale z wygladzaniem (średnia z poprzednim) if (TestFlag(DamageFlag, dtrain_out)) AccS = -Sign(V) * g * 1; // random(0.0, 0.1) @@ -1276,7 +1276,29 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap else AccN = g * Shape.dHrail / TrackW; + // velocity change + auto const Vprev { V }; + V += ( 3.0 * AccS - AccSprev ) * dt / 2.0; // przyrost predkosci + if( ( V * Vprev <= 0 ) + && ( std::abs( FStand ) > std::abs( FTrain ) ) ) { + // tlumienie predkosci przy hamowaniu + // zahamowany + V = 0; + } + + // tangential acceleration, from velocity change + AccSVBased = interpolate( + AccSVBased, + ( V - Vprev ) / dt, + clamp( dt * 3.0, 0.0, 1.0 ) ); + + // vertical acceleration + AccVert = ( + std::abs( AccVert ) < 0.01 ? + 0.0 : + AccVert * 0.5 ); // szarpanie +/* #ifdef EU07_USE_FUZZYLOGIC if( FuzzyLogic( ( 10.0 + Track.DamageFlag ) * Mass * Vel / Vmax, 500000.0, p_accn ) ) { // Ra: czemu tu masa bez ładunku? @@ -1288,7 +1310,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap if (AccV > 1.0) AccN += (7.0 - Random(5)) * (100.0 + Track.DamageFlag / 2.0) * AccV / 2000.0; - +*/ // wykolejanie na luku oraz z braku szyn if (TestFlag(CategoryFlag, 1)) { @@ -1323,22 +1345,14 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap Mains = false; DerailReason = 4; // Ra: powód wykolejenia: nieodpowiednia trajektoria } - V += (3.0 * AccS - AccSprev) * dt / 2.0; // przyrost predkosci - if (TestFlag(DamageFlag, dtrain_out)) - if (Vel < 1) - { - V = 0; - AccS = 0; - } - - if ((V * Vprev <= 0) && (abs(FStand) > abs(FTrain))) // tlumienie predkosci przy hamowaniu - { // zahamowany - V = 0; - // AccS:=0; //Ra 2014-03: ale siła grawitacji działa, więc nie może być zerowe + if( ( true == TestFlag( DamageFlag, dtrain_out ) ) + && ( Vel < 1.0 ) ) { + V = 0.0; + AccS = 0.0; } - // { dL:=(V+AccS*dt/2)*dt; //przyrost dlugosci czyli - // przesuniecie + // dL:=(V+AccS*dt/2)*dt; + // przyrost dlugosci czyli przesuniecie dL = (3.0 * V - Vprev) * dt / 2.0; // metoda Adamsa-Bashfortha} // ale jesli jest kolizja (zas. zach. pedu) to...} for (int b = 0; b < 2; b++) @@ -1350,10 +1364,11 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap if (Power > 1.0) // w rozrządczym nie (jest błąd w FIZ!) - Ra 2014-07: teraz we wszystkich UpdatePantVolume(dt); // Ra 2014-07: obsługa zbiornika rozrządu oraz pantografów - if (EngineType == WheelsDriven) - d = (double)CabNo * dL; // na chwile dla testu - else - d = dL; + auto const d { ( + EngineType == WheelsDriven ? + dL * CabNo : // na chwile dla testu + dL ) }; + DistCounter += fabs(dL) / 1000.0; dL = 0; @@ -1414,6 +1429,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap // if (Vel>10) and (not DebugmodeFlag) then if (!DebugModeFlag) SecuritySystemCheck(dt1); + return d; }; @@ -1425,7 +1441,6 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape TTrackParam &Track, const TLocation &NewLoc, TRotation &NewRot) { - double Vprev, AccSprev, d; int b; // T_MoverParameters::FastComputeMovement(dt, Shape, Track, NewLoc, NewRot); @@ -1437,76 +1452,40 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape if (dL == 0) // oblicz przesuniecie { - Vprev = V; - AccSprev = AccS; - // dt =ActualTime-LastUpdatedTime; //przyrost czasu + auto const AccSprev { AccS }; // przyspieszenie styczne - AccS = (FTotal / TotalMass + AccSprev) / - 2.0; // prawo Newtona ale z wygladzaniem (średnia z poprzednim) + AccS = interpolate( + AccSprev, + FTotal / TotalMass, + 0.5 ); + // clamp( dt * 3.0, 0.0, 1.0 ) ); // prawo Newtona ale z wygladzaniem (średnia z poprzednim) if (TestFlag(DamageFlag, dtrain_out)) AccS = -Sign(V) * g * 1; // * random(0.0, 0.1) - // przyspieszenie normalne} - // if Abs(Shape.R)>0.01 then - // AccN:=SQR(V)/Shape.R+g*Shape.dHrail/TrackW - // else AccN:=g*Shape.dHrail/TrackW; - // szarpanie} -#ifdef EU07_USE_FUZZYLOGIC - if( FuzzyLogic( ( 10.0 + Track.DamageFlag ) * Mass * Vel / Vmax, 500000.0, p_accn ) ) { - // Ra: czemu tu masa bez ładunku? - AccV /= ( 2.0 * 0.95 + 2.0 * Random() * 0.1 ); // 95-105% of base modifier (2.0) - } - else -#endif - AccV = AccV / 2.0; + // simple mode skips calculation of normal acceleration - if (AccV > 1.0) - AccN += (7.0 - Random(5)) * (100.0 + Track.DamageFlag / 2.0) * AccV / 2000.0; - - // {wykolejanie na luku oraz z braku szyn} - // if TestFlag(CategoryFlag,1) then - // begin - // if FuzzyLogic((AccN/g)*(1+0.1*(Track.DamageFlag and - // dtrack_freerail)),TrackW/Dim.H,1) - // or TestFlag(Track.DamageFlag,dtrack_norail) then - // if SetFlag(DamageFlag,dtrain_out) then - // begin - // EventFlag:=true; - // MainS:=false; - // RunningShape.R:=0; - // end; - // {wykolejanie na poszerzeniu toru} - // if FuzzyLogic(Abs(Track.Width-TrackW),TrackW/10,1) then - // if SetFlag(DamageFlag,dtrain_out) then - // begin - // EventFlag:=true; - // MainS:=false; - // RunningShape.R:=0; - // end; - // end; - // {wykolejanie wkutek niezgodnosci kategorii toru i pojazdu} - // if not TestFlag(RunningTrack.CategoryFlag,CategoryFlag) then - // if SetFlag(DamageFlag,dtrain_out) then - // begin - // EventFlag:=true; - // MainS:=false; - // end; - - V += (3.0 * AccS - AccSprev) * dt / 2.0; // przyrost predkosci - - if (TestFlag(DamageFlag, dtrain_out)) - if (Vel < 1) - { - V = 0; - AccS = 0; // Ra 2014-03: ale siła grawitacji działa, więc nie może być zerowe - } - - if ((V * Vprev <= 0) && (abs(FStand) > abs(FTrain))) // tlumienie predkosci przy hamowaniu - { // zahamowany} + // velocity change + auto const Vprev { V }; + V += ( 3.0 * AccS - AccSprev ) * dt / 2.0; // przyrost predkosci + if( ( V * Vprev <= 0 ) + && ( std::abs( FStand ) > std::abs( FTrain ) ) ) { + // tlumienie predkosci przy hamowaniu + // zahamowany V = 0; - AccS = 0; } + + // simple mode skips calculation of tangential acceleration + + // simple mode skips calculation of vertical acceleration + AccVert = 0.0; + + if( ( true == TestFlag( DamageFlag, dtrain_out ) ) + && ( Vel < 1.0 ) ) { + V = 0.0; + AccS = 0.0; + } + dL = (3.0 * V - Vprev) * dt / 2.0; // metoda Adamsa-Bashfortha // ale jesli jest kolizja (zas. zach. pedu) to... for (b = 0; b < 2; b++) @@ -1516,10 +1495,12 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape // QQQ if (Power > 1.0) // w rozrządczym nie (jest błąd w FIZ!) UpdatePantVolume(dt); // Ra 2014-07: obsługa zbiornika rozrządu oraz pantografów - if (EngineType == WheelsDriven) - d = (double)CabNo * dL; // na chwile dla testu - else - d = dL; + + auto const d { ( + EngineType == WheelsDriven ? + dL * CabNo : // na chwile dla testu + dL ) }; + DistCounter += fabs(dL) / 1000.0; dL = 0; @@ -1553,6 +1534,7 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape if ((BrakeSlippingTimer > 0.8) && (ASBType != 128)) // ASBSpeed=0.8 Hamulec->ASB(0); BrakeSlippingTimer += dt; + return d; }; @@ -4621,7 +4603,7 @@ double TMoverParameters::TractionForce(double dt) case 45: { if( ( ScndCtrlPos < ScndCtrlPosNo ) - && ( MainCtrlPos >= 10 ) ) { + && ( MainCtrlPos >= 11 ) ) { if( Im < MPTRelay[ ScndCtrlPos ].Iup ) { ++ScndCtrlPos; @@ -4633,7 +4615,7 @@ double TMoverParameters::TractionForce(double dt) } } // malenie - if( ( ScndCtrlPos > 0 ) && ( MainCtrlPos < 10 ) ) { + if( ( ScndCtrlPos > 0 ) && ( MainCtrlPos < 11 ) ) { if( ScndCtrlPos == 1 ) { if( Im > MPTRelay[ ScndCtrlPos - 1 ].Idown ) { @@ -4647,11 +4629,11 @@ double TMoverParameters::TractionForce(double dt) } } // 3rd level drops with master controller at position lower than 10... - if( MainCtrlPos < 10 ) { + if( MainCtrlPos < 11 ) { ScndCtrlPos = std::min( 2, ScndCtrlPos ); } // ...and below position 7 field shunt drops altogether - if( MainCtrlPos < 7 ) { + if( MainCtrlPos < 8 ) { ScndCtrlPos = 0; } /* @@ -4666,7 +4648,7 @@ double TMoverParameters::TractionForce(double dt) case 46: { // wzrastanie - if( ( MainCtrlPos >= 10 ) + if( ( MainCtrlPos >= 12 ) && ( ScndCtrlPos < ScndCtrlPosNo ) ) { if( ( ScndCtrlPos ) % 2 == 0 ) { if( ( MPTRelay[ ScndCtrlPos ].Iup > Im ) ) { @@ -4681,24 +4663,27 @@ double TMoverParameters::TractionForce(double dt) } } // malenie - if( ( MainCtrlPos < 10 ) + if( ( MainCtrlPos < 12 ) && ( ScndCtrlPos > 0 ) ) { - if( ( ScndCtrlPos ) % 2 == 0 ) { - if( ( MPTRelay[ ScndCtrlPos ].Idown < Im ) ) { - --ScndCtrlPos; + if( Vel < 50.0 ) { + // above 50 km/h already active shunt field can be maintained until lower controller setting + if( ( ScndCtrlPos ) % 2 == 0 ) { + if( ( MPTRelay[ ScndCtrlPos ].Idown < Im ) ) { + --ScndCtrlPos; + } } - } - else { - if( ( MPTRelay[ ScndCtrlPos + 1 ].Idown < Im ) - && ( MPTRelay[ ScndCtrlPos ].Idown > Vel ) ) { - --ScndCtrlPos; + else { + if( ( MPTRelay[ ScndCtrlPos + 1 ].Idown < Im ) + && ( MPTRelay[ ScndCtrlPos ].Idown > Vel ) ) { + --ScndCtrlPos; + } } } } - if( MainCtrlPos < 10 ) { + if( MainCtrlPos < 11 ) { ScndCtrlPos = std::min( 2, ScndCtrlPos ); } - if( MainCtrlPos < 7 ) { + if( MainCtrlPos < 8 ) { ScndCtrlPos = 0; } break; diff --git a/Train.cpp b/Train.cpp index d5c0a90b..604a2dbc 100644 --- a/Train.cpp +++ b/Train.cpp @@ -3213,8 +3213,8 @@ void TTrain::UpdateMechPosition(double dt) shake += 1.25 * MechSpring.ComputateForces( vector3( -mvControlled->AccN * dt * 5.0, // highlight side sway - mvControlled->AccV * dt, - -mvControlled->AccS * dt * 1.25 ), // accent acceleration/deceleration + -mvControlled->AccVert * dt, + -mvControlled->AccSVBased * dt * 1.25 ), // accent acceleration/deceleration pMechShake ); if( Random( iVel ) > 25.0 ) { diff --git a/messaging.cpp b/messaging.cpp index 2cab175e..feb674dc 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -112,7 +112,7 @@ WyslijNamiary(TDynamicObject const *Vehicle) r.fPar[7] = 0; // prędkość ruchu Z r.fPar[8] = Vehicle->MoverParameters->AccS; // przyspieszenie X r.fPar[9] = Vehicle->MoverParameters->AccN; // przyspieszenie Y //na razie nie - r.fPar[10] = Vehicle->MoverParameters->AccV; // przyspieszenie Z + r.fPar[10] = Vehicle->MoverParameters->AccVert; // przyspieszenie Z r.fPar[11] = Vehicle->MoverParameters->DistCounter; // przejechana odległość w km r.fPar[12] = Vehicle->MoverParameters->PipePress; // ciśnienie w PG r.fPar[13] = Vehicle->MoverParameters->ScndPipePress; // ciśnienie w PZ diff --git a/version.h b/version.h index 2a1f3bf1..a3cd5520 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 113 +#define VERSION_MINOR 114 #define VERSION_REVISION 0 From 88c19b2817d9e6f07d0dafffe6817bd089247230 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 15 Jan 2018 23:05:17 +0100 Subject: [PATCH 256/426] build 180115. cab indicators for selected brake acting speed, support for multi-part revving sound, minor emu brake sound fixes --- DynObj.cpp | 35 ++++++++------ Train.cpp | 132 ++++++++++++++++++----------------------------------- Train.h | 8 +++- version.h | 2 +- 4 files changed, 74 insertions(+), 103 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 9c49d2c7..bb10ed2d 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -5560,15 +5560,11 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub } if( engine_volume >= 0.05 ) { - engine - .pitch( frequency ) - .gain( engine_volume ) - .play( sound_flags::exclusive | sound_flags::looping ); + auto enginerevvolume { 0.f }; if( ( Vehicle.EngineType == DieselElectric ) || ( Vehicle.EngineType == DieselEngine ) ) { - // diesel engine revolutions increase - float enginerevvolume { 0 }; + // diesel engine revolutions increase; it can potentially decrease volume of base engine sound if( engine_revs_last != -1.f ) { // calculate potential recent increase of engine revolutions auto const revolutionsperminute { Vehicle.enrot * 60 }; @@ -5583,25 +5579,36 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub && ( revolutionsdifference > 1.0 * Deltatime ) ) { engine_revs_change = clamp( engine_revs_change + 5.0 * Deltatime, 0.0, 1.25 ); } - enginerevvolume = engine_revs_change; + enginerevvolume = 0.8 * engine_revs_change; } engine_revs_last = Vehicle.enrot * 60; - if( false == engine_revving.is_combined() ) { - // if the sound comes with multiple samples we reuse rpm-based calculation from the engine - frequency = engine_revving.m_frequencyoffset + engine_revving.m_frequencyfactor * 1.0; - } + auto const enginerevfrequency { ( + false == engine_revving.is_combined() ? + // if the sound contains multiple samples we reuse rpm-based calculation from the engine + frequency : + engine_revving.m_frequencyoffset + 1.f * engine_revving.m_frequencyfactor ) }; if( enginerevvolume > 0.02 ) { engine_revving - .pitch( frequency ) + .pitch( enginerevfrequency ) .gain( enginerevvolume ) - .play( sound_flags::exclusive | sound_flags::looping ); + .play( sound_flags::exclusive ); } else { engine_revving.stop(); } - } + } // diesel engines + + // multi-part revving sound pieces replace base engine sound, single revving simply gets mixed with the base + auto const enginevolume { ( + ( ( enginerevvolume > 0.02 ) && ( true == engine_revving.is_combined() ) ) ? + std::max( 0.0, engine_volume - enginerevvolume ) : + engine_volume ) }; + engine + .pitch( frequency ) + .gain( enginevolume ) + .play( sound_flags::exclusive | sound_flags::looping ); } // enginevolume > 0.05 } else { diff --git a/Train.cpp b/Train.cpp index 604a2dbc..c192f001 100644 --- a/Train.cpp +++ b/Train.cpp @@ -321,7 +321,6 @@ TTrain::TTrain() { pMechOffset = vector3(0, 0, 0); fBlinkTimer = 0; fHaslerTimer = 0; - keybrakecount = 0; DynamicSet(NULL); // ustawia wszystkie mv* iCabLightFlag = 0; // hunter-091012 @@ -546,6 +545,24 @@ bool TTrain::is_eztoer() const { && ( mvControlled->ActiveDir != 0 ) ); // od yB } +// moves train brake lever to specified position, potentially emits switch sound if conditions are met +void TTrain::set_train_brake( int const Position ) { + + auto const originalbrakeposition { mvOccupied->BrakeCtrlPos }; + + mvOccupied->BrakeLevelSet( Position ); + + if( mvOccupied->BrakeCtrlPos == originalbrakeposition ) { return; } + + if( ( true == is_eztoer() ) + && ( false == ( + ( ( originalbrakeposition == 0 ) || ( originalbrakeposition >= 5 ) ) + && ( ( mvOccupied->BrakeCtrlPos == 0 ) || ( mvOccupied->BrakeCtrlPos >= 5 ) ) ) ) ) { + // sound feedback if the lever movement activates one of the switches + dsbPneumaticSwitch.play(); + } +} + // locates nearest vehicle belonging to the consist TDynamicObject * TTrain::find_nearest_consist_vehicle() const { @@ -795,14 +812,7 @@ void TTrain::OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Co Train->mvOccupied->BrakeLevelAdd( 0.1 /*15.0 * Command.time_delta*/ ); } else { - if( Train->mvOccupied->BrakeLevelAdd( Global::fBrakeStep ) ) { - // nieodpowiedni warunek; true, jeśli można dalej kręcić - Train->keybrakecount = 0; - if( ( Train->is_eztoer() ) && ( Train->mvOccupied->BrakeCtrlPos < 3 ) ) { - // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza - Train->dsbPneumaticSwitch.play(); - } - } + Train->set_train_brake( Train->mvOccupied->BrakeCtrlPos + Global::fBrakeStep ); } } } @@ -815,21 +825,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co Train->mvOccupied->BrakeLevelAdd( -0.1 /*-15.0 * Command.time_delta*/ ); } else { - // nową wersję dostarczył ZiomalCl ("fixed looped sound in ezt when using NUM_9 key") - if( ( Train->mvOccupied->BrakeCtrlPos > -1 ) - || ( Train->keybrakecount > 1 ) ) { - - if( ( Train->is_eztoer() ) - && ( Train->mvControlled->Mains ) - && ( Train->mvOccupied->BrakeCtrlPos != -1 ) ) { - // Ra: uzależnić dźwięk od zmiany stanu EP, nie od klawisza - Train->dsbPneumaticSwitch.play(); - } - Train->mvOccupied->BrakeLevelAdd( -Global::fBrakeStep ); - } - else - Train->keybrakecount += 1; - // koniec wersji dostarczonej przez ZiomalCl + Train->set_train_brake( Train->mvOccupied->BrakeCtrlPos - Global::fBrakeStep ); } } else { @@ -837,16 +833,9 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co if( ( Train->mvOccupied->BrakeCtrlPos == -1 ) && ( Train->mvOccupied->BrakeHandle == FVel6 ) && ( Train->DynamicObject->Controller != AIdriver ) - && ( Global::iFeedbackMode != 4 ) - && ( !( Global::bMWDmasterEnable && Global::bMWDBreakEnable ) ) ) { + && ( Global::iFeedbackMode < 3 ) ) { // Odskakiwanie hamulce EP - Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->BrakeCtrlPos + 1 ); - Train->keybrakecount = 0; - if( ( Train->mvOccupied->TrainType == dt_EZT ) - && ( Train->mvControlled->Mains ) - && ( Train->mvControlled->ActiveDir != 0 ) ) { - Train->dsbPneumaticSwitch.play(); - } + Train->set_train_brake( 0 ); } } } @@ -855,30 +844,16 @@ void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Co if( Command.action != GLFW_RELEASE ) { // press or hold - // sound feedback - if( ( Train->is_eztoer() ) - && ( Train->mvControlled->Mains ) - && ( Train->mvOccupied->BrakeCtrlPos != -1 ) ) { - Train->dsbPneumaticSwitch.play(); - } - - Train->mvOccupied->BrakeLevelSet( -1 ); + Train->set_train_brake( -1 ); } else { // release if( ( Train->mvOccupied->BrakeCtrlPos == -1 ) && ( Train->mvOccupied->BrakeHandle == FVel6 ) && ( Train->DynamicObject->Controller != AIdriver ) - && ( Global::iFeedbackMode != 4 ) - && ( !( Global::bMWDmasterEnable && Global::bMWDBreakEnable ) ) ) { + && ( Global::iFeedbackMode < 3 ) ) { // Odskakiwanie hamulce EP - Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->BrakeCtrlPos + 1 ); - Train->keybrakecount = 0; - if( ( Train->mvOccupied->TrainType == dt_EZT ) - && ( Train->mvControlled->Mains ) - && ( Train->mvControlled->ActiveDir != 0 ) ) { - Train->dsbPneumaticSwitch.play(); - } + Train->set_train_brake( 0 ); } } } @@ -887,14 +862,7 @@ void TTrain::OnCommand_trainbrakerelease( TTrain *Train, command_data const &Com if( Command.action == GLFW_PRESS ) { - // sound feedback - if( ( Train->is_eztoer() ) - && ( ( Train->mvOccupied->BrakeCtrlPos == 1 ) - || ( Train->mvOccupied->BrakeCtrlPos == -1 ) ) ) { - Train->dsbPneumaticSwitch.play(); - } - - Train->mvOccupied->BrakeLevelSet( 0 ); + Train->set_train_brake( 0 ); } } @@ -902,14 +870,7 @@ void TTrain::OnCommand_trainbrakefirstservice( TTrain *Train, command_data const if( Command.action == GLFW_PRESS ) { - // sound feedback - if( ( Train->is_eztoer() ) - && ( Train->mvControlled->Mains ) - && ( Train->mvOccupied->BrakeCtrlPos != 1 ) ) { - Train->dsbPneumaticSwitch.play(); - } - - Train->mvOccupied->BrakeLevelSet( 1 ); + Train->set_train_brake( 1 ); } } @@ -917,19 +878,11 @@ void TTrain::OnCommand_trainbrakeservice( TTrain *Train, command_data const &Com if( Command.action == GLFW_PRESS ) { - // sound feedback - if( ( Train->is_eztoer() ) - && ( Train->mvControlled->Mains ) - && ( ( Train->mvOccupied->BrakeCtrlPos == 1 ) - || ( Train->mvOccupied->BrakeCtrlPos == -1 ) ) ) { - Train->dsbPneumaticSwitch.play(); - } - - Train->mvOccupied->BrakeLevelSet( + Train->set_train_brake( ( Train->mvOccupied->BrakeCtrlPosNo / 2 + ( Train->mvOccupied->BrakeHandle == FV4a ? - 1 : - 0 ) ); + 1 : + 0 ) ) ); } } @@ -937,14 +890,7 @@ void TTrain::OnCommand_trainbrakefullservice( TTrain *Train, command_data const if( Command.action == GLFW_PRESS ) { - // sound feedback - if( ( Train->is_eztoer() ) - && ( Train->mvControlled->Mains ) - && ( ( Train->mvOccupied->BrakeCtrlPos == 1 ) - || ( Train->mvOccupied->BrakeCtrlPos == -1 ) ) ) { - Train->dsbPneumaticSwitch.play(); - } - Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->BrakeCtrlPosNo - 1 ); + Train->set_train_brake( Train->mvOccupied->BrakeCtrlPosNo - 1 ); } } @@ -952,7 +898,7 @@ void TTrain::OnCommand_trainbrakehandleoff( TTrain *Train, command_data const &C if( Command.action == GLFW_PRESS ) { - Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->Handle->GetPos( bh_NP ) ); + Train->set_train_brake( Train->mvOccupied->Handle->GetPos( bh_NP ) ); } } @@ -960,7 +906,7 @@ void TTrain::OnCommand_trainbrakeemergency( TTrain *Train, command_data const &C if( Command.action == GLFW_PRESS ) { - Train->mvOccupied->BrakeLevelSet( Train->mvOccupied->Handle->GetPos( bh_EB ) ); + Train->set_train_brake( Train->mvOccupied->Handle->GetPos( bh_EB ) ); /* if( Train->mvOccupied->BrakeCtrlPosNo <= 0.1 ) { // hamulec bezpieczeństwa dla wagonów @@ -3988,6 +3934,9 @@ bool TTrain::Update( double const Deltatime ) btLampkaForward.Turn(mvControlled->ActiveDir > 0); // jazda do przodu btLampkaBackward.Turn(mvControlled->ActiveDir < 0); // jazda do tyłu btLampkaED.Turn(mvControlled->DynamicBrakeFlag); // hamulec ED + btLampkaBrakeProfileG.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_G ) ); + btLampkaBrakeProfileP.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_P ) ); + btLampkaBrakeProfileR.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_R ) ); // light indicators // NOTE: sides are hardcoded to deal with setups where single cab is equipped with all indicators btLampkaUpperLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_upper ) != 0 ); @@ -4005,6 +3954,9 @@ bool TTrain::Update( double const Deltatime ) { // gdy bateria wyłączona btLampkaHamienie.Turn( false ); btLampkaBrakingOff.Turn( false ); + btLampkaBrakeProfileG.Turn( false ); + btLampkaBrakeProfileP.Turn( false ); + btLampkaBrakeProfileR.Turn( false ); btLampkaMaxSila.Turn( false ); btLampkaPrzekrMaxSila.Turn( false ); btLampkaRadio.Turn( false ); @@ -5267,6 +5219,9 @@ void TTrain::clear_cab_controls() btLampkaRadiotelefon.Clear(); btLampkaHamienie.Clear(); btLampkaBrakingOff.Clear(); + btLampkaBrakeProfileG.Clear(); + btLampkaBrakeProfileP.Clear(); + btLampkaBrakeProfileR.Clear(); btLampkaSprezarka.Clear(); btLampkaSprezarkaB.Clear(); btLampkaSprezarkaOff.Clear(); @@ -5544,6 +5499,9 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-braking:", btLampkaHamienie }, { "i-brakingoff:", btLampkaBrakingOff }, { "i-dynamicbrake:", btLampkaED }, + { "i-brakeprofileg:", btLampkaBrakeProfileG }, + { "i-brakeprofilep:", btLampkaBrakeProfileP }, + { "i-brakeprofiler:", btLampkaBrakeProfileR }, { "i-braking-ezt:", btLampkaHamowanie1zes }, { "i-braking-ezt2:", btLampkaHamowanie2zes }, { "i-compressor:", btLampkaSprezarka }, diff --git a/Train.h b/Train.h index c04f7f23..54f8ec85 100644 --- a/Train.h +++ b/Train.h @@ -114,6 +114,9 @@ class TTrain bool is_eztoer() const; // locates nearest vehicle belonging to the consist TDynamicObject *find_nearest_consist_vehicle() const; + // moves train brake lever to specified position, potentially emits switch sound if conditions are met + void set_train_brake( int const Position ); + // command handlers // NOTE: we're currently using universal handlers and static handler map but it may be beneficial to have these implemented on individual class instance basis @@ -377,6 +380,10 @@ public: // reszta może by?publiczna TButton btLampkaHamienie; TButton btLampkaBrakingOff; TButton btLampkaED; // Stele 161228 hamowanie elektrodynamiczne + TButton btLampkaBrakeProfileG; // cargo train brake acting speed + TButton btLampkaBrakeProfileP; // passenger train brake acting speed + TButton btLampkaBrakeProfileR; // rapid brake acting speed + // KURS90 TButton btLampkaBoczniki; TButton btLampkaMaxSila; @@ -468,7 +475,6 @@ private: double fPoslizgTimer; TTrack *tor; - int keybrakecount; // McZapkie-240302 - przyda sie do tachometru float fTachoVelocity{ 0.0f }; float fTachoVelocityJump{ 0.0f }; // ze skakaniem diff --git a/version.h b/version.h index a3cd5520..36e55658 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 114 +#define VERSION_MINOR 115 #define VERSION_REVISION 0 From 4dfe32f34b865b20a38f3151ce92550285f0db6e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 17 Jan 2018 01:48:20 +0100 Subject: [PATCH 257/426] 3d model-related log message filtering, diesel electric engine force calculation tweak, minor bug fixes --- Button.cpp | 2 +- Console.cpp | 6 +-- DynObj.cpp | 23 +++++++----- Gauge.cpp | 4 +- Globals.cpp | 7 +++- Globals.h | 1 + Logs.cpp | 93 +++++++++++++++++----------------------------- Logs.h | 24 +++++++----- McZapkie/Mover.cpp | 53 +++++++++++++++----------- Model3d.cpp | 16 ++++---- Texture.cpp | 27 ++++++++++---- Texture.h | 2 +- Train.cpp | 8 ++-- Train.h | 2 +- 14 files changed, 139 insertions(+), 129 deletions(-) diff --git a/Button.cpp b/Button.cpp index f87ebd90..37f9ae87 100644 --- a/Button.cpp +++ b/Button.cpp @@ -71,7 +71,7 @@ void TButton::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *pMod if( ( pModelOn == nullptr ) && ( pModelOff == nullptr ) ) { // if we failed to locate even one state submodel, cry - ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + pModel1->NameGet() + "\"" ); + ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + pModel1->NameGet() + "\"", logtype::model ); } // pass submodel location to defined sounds diff --git a/Console.cpp b/Console.cpp index 5f67d082..7221435e 100644 --- a/Console.cpp +++ b/Console.cpp @@ -356,16 +356,16 @@ void Console::ValueSet(int x, double y) { x = Global::iPoKeysPWM[x]; if (Global::iCalibrateOutDebugInfo == x) - WriteLog("CalibrateOutDebugInfo: oryginal=" + std::to_string(y), false); + WriteLog("CalibrateOutDebugInfo: oryginal=" + std::to_string(y)); if (Global::fCalibrateOutMax[x] > 0) { y = clamp( y, 0.0, Global::fCalibrateOutMax[x]); if (Global::iCalibrateOutDebugInfo == x) - WriteLog(" cutted=" + std::to_string(y), false); + WriteLog(" cutted=" + std::to_string(y)); y = y / Global::fCalibrateOutMax[x]; // sprowadzenie do <0,1> jeśli podana // maksymalna wartość if (Global::iCalibrateOutDebugInfo == x) - WriteLog(" fraction=" + std::to_string(y), false); + WriteLog(" fraction=" + std::to_string(y)); } double temp = (((((Global::fCalibrateOut[x][5] * y) + Global::fCalibrateOut[x][4]) * y + Global::fCalibrateOut[x][3]) * diff --git a/DynObj.cpp b/DynObj.cpp index bb10ed2d..4dc5c35e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3710,7 +3710,7 @@ void TDynamicObject::RenderSounds() { if( brakeforceratio > 0.0 ) { // hamulce wzmagaja halas - volume *= 1 + 0.25 * brakeforceratio; + volume *= 1 + 0.125 * brakeforceratio; } // scale volume by track quality volume *= ( 20.0 + MyTrack->iDamageFlag ) / 21; @@ -3994,9 +3994,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else { // Ra: tu wczytywanie modelu ładunku jest w porządku - if( false == asLoadName.empty() ) { - // try first specialized version of the load model, vehiclename_loadname - mdLoad = TModelsManager::GetModel( BaseDir + TypeName + "_" + MoverParameters->LoadType + ".t3d", true ); + if( false == asLoadName.empty() ) { + // try first specialized version of the load model, vehiclename_loadname + auto const specializedloadfilename { BaseDir + TypeName + "_" + MoverParameters->LoadType + ".t3d" }; + if( true == FileExists( specializedloadfilename ) ) { + mdLoad = TModelsManager::GetModel( specializedloadfilename, true ); + } if( mdLoad == nullptr ) { // if this fails, try generic load model mdLoad = TModelsManager::GetModel( asLoadName, true ); @@ -4246,15 +4249,15 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, { // gdy ktoś przesadził ze skalowaniem pants[i].fParamPants->fHeight = 0.0; // niech będzie odczyt z pantfactors: - ErrorLog("Bad model: " + asModel + ", scale of " + - (sm->pName) + " is " + - std::to_string(100.0 * det) + "%"); + ErrorLog( + "Bad model: " + asModel + ", scale of " + (sm->pName) + " is " + std::to_string(100.0 * det) + "%", + logtype::model ); } } } } else - ErrorLog("Bad model: " + asFileName + " - missed submodel " + asAnimName); // brak ramienia + ErrorLog("Bad model: " + asFileName + " - missed submodel " + asAnimName, logtype::model); // brak ramienia } } @@ -4288,7 +4291,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } } else - ErrorLog( "Bad model: " + asFileName + " - missed submodel " + asAnimName ); // brak ramienia + ErrorLog( "Bad model: " + asFileName + " - missed submodel " + asAnimName, logtype::model ); // brak ramienia } } } @@ -5584,7 +5587,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub engine_revs_last = Vehicle.enrot * 60; auto const enginerevfrequency { ( - false == engine_revving.is_combined() ? + true == engine_revving.is_combined() ? // if the sound contains multiple samples we reuse rpm-based calculation from the engine frequency : engine_revving.m_frequencyoffset + 1.f * engine_revving.m_frequencyfactor ) }; diff --git a/Gauge.cpp b/Gauge.cpp index c22d156d..0f7a0c4f 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -99,7 +99,7 @@ bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, scale *= mul; TSubModel *submodel = md1->GetFromName( submodelname ); if( scale == 0.0 ) { - ErrorLog( "Bad model: scale of 0.0 defined for sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\". Forcing scale of 1.0 to prevent division by 0" ); + ErrorLog( "Bad model: scale of 0.0 defined for sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\". Forcing scale of 1.0 to prevent division by 0", logtype::model ); scale = 1.0; } if (submodel) // jeśli nie znaleziony @@ -107,7 +107,7 @@ bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, else if (md2) // a jest podany drugi model (np. zewnętrzny) submodel = md2->GetFromName(submodelname); // to może tam będzie, co za różnica gdzie if( submodel == nullptr ) { - ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\"" ); + ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\"", logtype::model ); } std::map gaugetypes { diff --git a/Globals.cpp b/Globals.cpp index 098a9ba6..ed7b8764 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -139,7 +139,8 @@ float Global::AudioVolume = 1.5f; std::string Global::AudioRenderer; int Global::iWriteLogEnabled = 3; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów -bool Global::MultipleLogs{ false }; +bool Global::MultipleLogs { false }; +unsigned int Global::DisabledLogTypes { 0 }; // parametry do kalibracji // kolejno współczynniki dla potęg 0, 1, 2, 3 wartości odczytanej z urządzenia @@ -331,6 +332,10 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(); Parser >> Global::MultipleLogs; } + else if( token == "logs.filter" ) { + Parser.getTokens(); + Parser >> Global::DisabledLogTypes; + } else if( token == "adjustscreenfreq" ) { // McZapkie-240403 - czestotliwosc odswiezania ekranu diff --git a/Globals.h b/Globals.h index 6bdc090e..79f5e176 100644 --- a/Globals.h +++ b/Globals.h @@ -181,6 +181,7 @@ public: static std::string asCurrentDynamicPath; static int iWriteLogEnabled; // maska bitowa: 1-zapis do pliku, 2-okienko static bool MultipleLogs; + static unsigned int DisabledLogTypes; // McZapkie-170602: zewnetrzna definicja pojazdu uzytkownika static std::string asHumanCtrlVehicle; // world environment diff --git a/Logs.cpp b/Logs.cpp index 13ae31bd..5453a510 100644 --- a/Logs.cpp +++ b/Logs.cpp @@ -47,75 +47,50 @@ std::string filename_scenery() { } } -void WriteConsoleOnly(const char *str, double value) { +void WriteLog( const char *str, logtype const Type ) { - std::snprintf(logbuffer , sizeof(logbuffer), "%s %f \n", str, value); - // stdout= GetStdHandle(STD_OUTPUT_HANDLE); - DWORD wr = 0; - WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), logbuffer, (DWORD)strlen(logbuffer), &wr, NULL); - // WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE),endstring,strlen(endstring),&wr,NULL); -} + if( str == nullptr ) { return; } + if( true == TestFlag( Global::DisabledLogTypes, Type ) ) { return; } -void WriteConsoleOnly(const char *str, bool newline) -{ - // printf("%n ffafaf /n",str); - SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), - FOREGROUND_GREEN | FOREGROUND_INTENSITY); - DWORD wr = 0; - WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), str, (DWORD)strlen(str), &wr, NULL); - if (newline) - WriteConsole(GetStdHandle(STD_OUTPUT_HANDLE), endstring, (DWORD)strlen(endstring), &wr, NULL); -} + if (Global::iWriteLogEnabled & 1) { + if( !output.is_open() ) { -void WriteLog(const char *str, double value) { - - if (Global::iWriteLogEnabled) { - if (str) { - std::snprintf(logbuffer, sizeof(logbuffer), "%s %f", str, value); - WriteLog(logbuffer); - } - } -}; - -void WriteLog(const char *str, bool newline) -{ - if (str) - { - if (Global::iWriteLogEnabled & 1) - { - if( !output.is_open() ) { - - std::string const filename = - ( Global::MultipleLogs ? + std::string const filename = + ( Global::MultipleLogs ? "logs/log (" + filename_scenery() + ") " + filename_date() + ".txt" : "log.txt" ); - output.open( filename, std::ios::trunc ); - } - output << str; - if (newline) - output << "\n"; - output.flush(); + output.open( filename, std::ios::trunc ); } - // hunter-271211: pisanie do konsoli tylko, gdy nie jest ukrywana - if (Global::iWriteLogEnabled & 2) - WriteConsoleOnly(str, newline); + output << str << "\n"; + output.flush(); } -}; -void ErrorLog(const char *str) -{ // Ra: bezwarunkowa rejestracja poważnych błędów + if( Global::iWriteLogEnabled & 2 ) { + // hunter-271211: pisanie do konsoli tylko, gdy nie jest ukrywana + SetConsoleTextAttribute( GetStdHandle( STD_OUTPUT_HANDLE ), FOREGROUND_GREEN | FOREGROUND_INTENSITY ); + DWORD wr = 0; + WriteConsole( GetStdHandle( STD_OUTPUT_HANDLE ), str, (DWORD)strlen( str ), &wr, NULL ); + WriteConsole( GetStdHandle( STD_OUTPUT_HANDLE ), endstring, (DWORD)strlen( endstring ), &wr, NULL ); + } +} + +// Ra: bezwarunkowa rejestracja poważnych błędów +void ErrorLog( const char *str, logtype const Type ) { + + if( str == nullptr ) { return; } + if( true == TestFlag( Global::DisabledLogTypes, Type ) ) { return; } + if (!errors.is_open()) { std::string const filename = ( Global::MultipleLogs ? - "logs/errors (" + filename_scenery() + ") " + filename_date() + ".txt" : - "errors.txt" ); + "logs/errors (" + filename_scenery() + ") " + filename_date() + ".txt" : + "errors.txt" ); errors.open( filename, std::ios::trunc ); errors << "EU07.EXE " + Global::asVersion << "\n"; } - if (str) - errors << str; - errors << "\n"; + + errors << str << "\n"; errors.flush(); }; @@ -134,15 +109,15 @@ void Error(const char *&asMessage, bool box) WriteLog(asMessage); } -void ErrorLog(const std::string &str, bool newline) +void ErrorLog(const std::string &str, logtype const Type ) { - ErrorLog(str.c_str()); - WriteLog(str.c_str(), newline); + ErrorLog( str.c_str(), Type ); + WriteLog( str.c_str(), Type ); } -void WriteLog(const std::string &str, bool newline) +void WriteLog(const std::string &str, logtype const Type ) { // Ra: wersja z AnsiString jest zamienna z Error() - WriteLog(str.c_str(), newline); + WriteLog( str.c_str(), Type ); }; void CommLog(const char *str) diff --git a/Logs.h b/Logs.h index 88bade05..4e085efd 100644 --- a/Logs.h +++ b/Logs.h @@ -10,13 +10,17 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -void WriteConsoleOnly(const char *str, double value); -void WriteConsoleOnly(const char *str, bool newline = true); -void WriteLog(const char *str, double value); -void WriteLog(const char *str, bool newline = true); -void Error(const std::string &asMessage, bool box = false); -void Error(const char* &asMessage, bool box = false); -void ErrorLog(const std::string &str, bool newline = true); -void WriteLog(const std::string &str, bool newline = true); -void CommLog(const char *str); -void CommLog(const std::string &str); +enum logtype : unsigned int { + + generic = 0x1, + file = 0x2, + model = 0x4 +}; + +void WriteLog( const char *str, logtype const Type = logtype::generic ); +void Error( const std::string &asMessage, bool box = false ); +void Error( const char* &asMessage, bool box = false ); +void ErrorLog( const std::string &str, logtype const Type = logtype::generic ); +void WriteLog( const std::string &str, logtype const Type = logtype::generic ); +void CommLog( const char *str ); +void CommLog( const std::string &str ); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 3831dc09..21a44af8 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -606,11 +606,12 @@ void TMoverParameters::BrakeLevelSet(double b) if (fBrakeCtrlPos == b) return; // nie przeliczać, jak nie ma zmiany fBrakeCtrlPos = b; - BrakeCtrlPosR = b; if (fBrakeCtrlPos < Handle->GetPos(bh_MIN)) fBrakeCtrlPos = Handle->GetPos(bh_MIN); // odcięcie else if (fBrakeCtrlPos > Handle->GetPos(bh_MAX)) fBrakeCtrlPos = Handle->GetPos(bh_MAX); + // TODO: verify whether BrakeCtrlPosR and fBrakeCtrlPos can be rolled into single variable + BrakeCtrlPosR = fBrakeCtrlPos; int x = static_cast(std::floor(fBrakeCtrlPos)); // jeśli odwołujemy się do BrakeCtrlPos w pośrednich, to musi być // obcięte a nie zaokrągone while ((x > BrakeCtrlPos) && (BrakeCtrlPos < BrakeCtrlPosNo)) // jeśli zwiększyło się o 1 @@ -4507,32 +4508,40 @@ double TMoverParameters::TractionForce(double dt) Im = DElist[MainCtrlPos].Imax; } - if (Im > 0) // jak pod obciazeniem - if (Flat) // ograniczenie napiecia w pradnicy - plaszczak u gory - Voltage = 1000.0 * tmp / abs(Im); - else // charakterystyka pradnicy obcowzbudnej (elipsa) - twierdzenie Pitagorasa - - { - Voltage = sqrt(abs(square(DElist[MainCtrlPos].Umax) - - square(DElist[MainCtrlPos].Umax * Im / - DElist[MainCtrlPos].Imax))) * - (MainCtrlPos - 1) + - (1.0 - Im / DElist[MainCtrlPos].Imax) * DElist[MainCtrlPos].Umax * - (MainCtrlPosNo - MainCtrlPos); - Voltage = Voltage / (MainCtrlPosNo - 1); - Voltage = Min0R(Voltage, (1000.0 * tmp / abs(Im))); - if (Voltage < (Im * 0.05)) - Voltage = Im * 0.05; + if( Im > 0 ) { + // jak pod obciazeniem + if( true == Flat ) { + // ograniczenie napiecia w pradnicy - plaszczak u gory + Voltage = 1000.0 * tmp / std::abs( Im ); } - if ((Voltage > DElist[MainCtrlPos].Umax) || - (Im == 0)) // gdy wychodzi za duze napiecie - Voltage = DElist[MainCtrlPos].Umax * - int(ConverterFlag); // albo przy biegu jalowym (jest cos takiego?) + else { + // charakterystyka pradnicy obcowzbudnej (elipsa) - twierdzenie Pitagorasa + Voltage = + std::sqrt( + std::abs( + square( DElist[ MainCtrlPos ].Umax ) + - square( DElist[ MainCtrlPos ].Umax * Im / DElist[ MainCtrlPos ].Imax ) ) ) + * ( MainCtrlPos - 1 ) + + ( 1.0 - Im / DElist[ MainCtrlPos ].Imax ) * DElist[ MainCtrlPos ].Umax * ( MainCtrlPosNo - MainCtrlPos ); + Voltage /= ( MainCtrlPosNo - 1 ); + Voltage = clamp( + Voltage, + Im * 0.05, ( 1000.0 * tmp / std::abs( Im ) ) ); + } + } + + if( ( Voltage > DElist[ MainCtrlPos ].Umax ) + || ( Im == 0 ) ) { + // gdy wychodzi za duze napiecie albo przy biegu jalowym (jest cos takiego?) + Voltage = DElist[ MainCtrlPos ].Umax * ( ConverterFlag ? 1 : 0 ); + } EnginePower = Voltage * Im / 1000.0; - +/* + // NOTE: this part is experimentally disabled, as it generated early traction force drop for undetermined purpose if ((tmpV > 2) && (EnginePower < tmp)) Ft = Ft * EnginePower / tmp; +*/ } if ((Imax > 1) && (Im > Imax)) diff --git a/Model3d.cpp b/Model3d.cpp index 4ae944fb..3ac3f3bc 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -374,7 +374,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic if( ( std::abs( scale.x - 1.0f ) > 0.01 ) || ( std::abs( scale.y - 1.0f ) > 0.01 ) || ( std::abs( scale.z - 1.0f ) > 0.01 ) ) { - ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " + to_string( scale ) + ")" ); + ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " + to_string( scale ) + ")", logtype::model ); m_normalizenormals = ( ( ( std::abs( scale.x - scale.y ) < 0.01f ) && ( std::abs( scale.y - scale.z ) < 0.01f ) ) ? rescale : @@ -460,7 +460,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce - WriteLog("Bad model: degenerated triangle ignored in: \"" + pName + "\", vertices " + std::to_string(rawvertexcount-2) + "-" + std::to_string(rawvertexcount)); + WriteLog("Bad model: degenerated triangle ignored in: \"" + pName + "\", vertices " + std::to_string(rawvertexcount-2) + "-" + std::to_string(rawvertexcount), logtype::model ); } if (i > 0) { // jeśli pierwszy trójkąt będzie zdegenerowany, to zostanie usunięty i nie ma co sprawdzać @@ -472,7 +472,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic --facecount; // o jeden trójkąt mniej iNumVerts -= 3; // czyli o 3 wierzchołki i -= 3; // wczytanie kolejnego w to miejsce - WriteLog( "Bad model: too large triangle ignored in: \"" + pName + "\"" ); + WriteLog( "Bad model: too large triangle ignored in: \"" + pName + "\"", logtype::model ); } } } @@ -511,14 +511,14 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic vertexnormal += facenormals[ adjacenvertextidx / 3 ]; } else { - ErrorLog( "Bad model: opposite normals in the same smoothing group, check sub-model \"" + pName + "\" for two-sided faces and/or scaling" ); + ErrorLog( "Bad model: opposite normals in the same smoothing group, check sub-model \"" + pName + "\" for two-sided faces and/or scaling", logtype::model ); } // i szukanie od kolejnego trójkąta adjacenvertextidx = SeekFaceNormal(sg, adjacenvertextidx / 3 + 1, sg[faceidx], Vertices[vertexidx].position, Vertices); } // Ra 15-01: należało by jeszcze uwzględnić skalowanie wprowadzane przez transformy, aby normalne po przeskalowaniu były jednostkowe if( glm::length2( vertexnormal ) == 0.0f ) { - WriteLog( "Bad model: zero lenght normal vector generated for sub-model \"" + pName + "\"" ); + WriteLog( "Bad model: zero lenght normal vector generated for sub-model \"" + pName + "\"", logtype::model ); } Vertices[ vertexidx ].normal = ( glm::length2( vertexnormal ) > 0.0f ? @@ -1520,7 +1520,7 @@ void TModel3d::deserialize(std::istream &s, size_t size, bool dynamic) if( ( false == submodel.m_normalizenormals ) && ( std::abs( normallength - 1.0f ) > 0.01f ) ) { submodel.m_normalizenormals = TSubModel::normalize; // we don't know if uniform scaling would suffice - WriteLog( "Bad model: non-unit normal vector(s) encountered during sub-model geometry deserialization" ); + WriteLog( "Bad model: non-unit normal vector(s) encountered during sub-model geometry deserialization", logtype::model ); } } } @@ -1646,7 +1646,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, } } else { - ErrorLog( "Bad model: reference to nonexistent texture index in sub-model" + ( pName.empty() ? "" : " \"" + pName + "\"" ) ); + ErrorLog( "Bad model: reference to nonexistent texture index in sub-model" + ( pName.empty() ? "" : " \"" + pName + "\"" ), logtype::model ); m_material = null_handle; } } @@ -1686,7 +1686,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, if( ( std::abs( scale.x - 1.0f ) > 0.01 ) || ( std::abs( scale.y - 1.0f ) > 0.01 ) || ( std::abs( scale.z - 1.0f ) > 0.01 ) ) { - ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " + to_string( scale ) + ")" ); + ErrorLog( "Bad model: transformation matrix for sub-model \"" + pName + "\" imposes geometry scaling (factors: " + to_string( scale ) + ")", logtype::model ); m_normalizenormals = ( ( ( std::abs( scale.x - scale.y ) < 0.01f ) && ( std::abs( scale.y - scale.z ) < 0.01f ) ) ? rescale : diff --git a/Texture.cpp b/Texture.cpp index 6c6d5448..d0718054 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -604,14 +604,27 @@ opengl_texture::release( bool const Backup ) { if( id == -1 ) { return; } if( true == Backup ) { - // query texture details needed to perform the backup... ::glBindTexture( GL_TEXTURE_2D, id ); - ::glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, (GLint *)&data_format ); - GLint datasize; - ::glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, (GLint *)&datasize ); - data.resize( datasize ); - // ...fetch the data... - ::glGetCompressedTexImage( GL_TEXTURE_2D, 0, &data[ 0 ] ); + GLint datasize {}; + GLint iscompressed {}; + ::glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_COMPRESSED, &iscompressed ); + if( iscompressed == GL_TRUE ) { + // texture is compressed on the gpu side + // query texture details needed to perform the backup... + ::glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &data_format ); + ::glGetTexLevelParameteriv( GL_TEXTURE_2D, 0, GL_TEXTURE_COMPRESSED_IMAGE_SIZE, &datasize ); + data.resize( datasize ); + // ...fetch the data... + ::glGetCompressedTexImage( GL_TEXTURE_2D, 0, &data[ 0 ] ); + } + else { + // for whatever reason texture didn't get compressed during upload + // fallback on plain rgba storage... + data_format = GL_RGBA; + data.resize( data_width * data_height * 4 ); + // ...fetch the data... + ::glGetTexImage( GL_TEXTURE_2D, 0, data_format, GL_UNSIGNED_BYTE, &data[ 0 ] ); + } // ...and update texture object state data_mapcount = 1; // we keep copy of only top mipmap level data_state = resource_state::good; diff --git a/Texture.h b/Texture.h index da69e063..1d5b2500 100644 --- a/Texture.h +++ b/Texture.h @@ -62,7 +62,7 @@ private: int data_width{ 0 }, data_height{ 0 }, data_mapcount{ 0 }; - GLuint data_format{ 0 }, + GLint data_format{ 0 }, data_components{ 0 }; /* std::atomic is_loaded{ false }; // indicates the texture data was loaded and can be processed diff --git a/Train.cpp b/Train.cpp index c192f001..4b9fb212 100644 --- a/Train.cpp +++ b/Train.cpp @@ -546,17 +546,17 @@ bool TTrain::is_eztoer() const { } // moves train brake lever to specified position, potentially emits switch sound if conditions are met -void TTrain::set_train_brake( int const Position ) { +void TTrain::set_train_brake( double const Position ) { - auto const originalbrakeposition { mvOccupied->BrakeCtrlPos }; + auto const originalbrakeposition { static_cast( 100.0 * mvOccupied->fBrakeCtrlPos ) }; mvOccupied->BrakeLevelSet( Position ); - if( mvOccupied->BrakeCtrlPos == originalbrakeposition ) { return; } + if( static_cast( 100.0 * mvOccupied->fBrakeCtrlPos ) == originalbrakeposition ) { return; } if( ( true == is_eztoer() ) && ( false == ( - ( ( originalbrakeposition == 0 ) || ( originalbrakeposition >= 5 ) ) + ( ( originalbrakeposition / 100 == 0 ) || ( originalbrakeposition / 100 >= 5 ) ) && ( ( mvOccupied->BrakeCtrlPos == 0 ) || ( mvOccupied->BrakeCtrlPos >= 5 ) ) ) ) ) { // sound feedback if the lever movement activates one of the switches dsbPneumaticSwitch.play(); diff --git a/Train.h b/Train.h index 54f8ec85..2b5bc038 100644 --- a/Train.h +++ b/Train.h @@ -115,7 +115,7 @@ class TTrain // locates nearest vehicle belonging to the consist TDynamicObject *find_nearest_consist_vehicle() const; // moves train brake lever to specified position, potentially emits switch sound if conditions are met - void set_train_brake( int const Position ); + void set_train_brake( double const Position ); // command handlers From b96f2546795b3520a6eb1beac00d5d0a6fc1efe7 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 17 Jan 2018 16:29:48 +0100 Subject: [PATCH 258/426] dedicated power inverter sound --- DynObj.cpp | 71 +++++++++++++++------------- DynObj.h | 1 + McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 112 +++++++++++++++++++++++---------------------- Train.cpp | 2 +- 5 files changed, 101 insertions(+), 86 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 4dc5c35e..8ce3b99e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4597,16 +4597,19 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.motor.m_amplitudefactor /= amplitudedivisor; } - else if( token == "ventilator:" ) { + else if( token == "inverter:" ) { + // plik z dzwiekiem wentylatora, mnozniki i ofsety amp. i czest. + m_powertrainsounds.inverter.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); + m_powertrainsounds.inverter.owner( this ); + } + + else if( token == "ventilator:" ) { // plik z dzwiekiem wentylatora, mnozniki i ofsety amp. i czest. m_powertrainsounds.rsWentylator.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); m_powertrainsounds.rsWentylator.owner( this ); - if( ( MoverParameters->EngineType == ElectricSeriesMotor ) - || ( MoverParameters->EngineType == ElectricInductionMotor ) ) { - m_powertrainsounds.rsWentylator.m_amplitudefactor /= MoverParameters->RVentnmax; - m_powertrainsounds.rsWentylator.m_frequencyfactor /= MoverParameters->RVentnmax; - } + m_powertrainsounds.rsWentylator.m_amplitudefactor /= MoverParameters->RVentnmax; + m_powertrainsounds.rsWentylator.m_frequencyfactor /= MoverParameters->RVentnmax; } else if( ( token == "transmission:" ) @@ -5779,7 +5782,34 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( motor_volume < 0.05 ) { motor.stop(); } + // inverter sounds + if( Vehicle.EngineType == ElectricInductionMotor ) { + if( Vehicle.InverterFrequency > 0.1 ) { + volume = inverter.m_amplitudeoffset + inverter.m_amplitudefactor * std::sqrt( std::fabs( Vehicle.dizel_fill ) ); + + inverter + .pitch( inverter.m_frequencyoffset + inverter.m_frequencyfactor * Vehicle.InverterFrequency ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + inverter.stop(); + } + } + // ventillator sounds + if( Vehicle.RventRot > 0.1 ) { + + rsWentylator + .pitch( rsWentylator.m_frequencyoffset + rsWentylator.m_frequencyfactor * Vehicle.RventRot ) + .gain( rsWentylator.m_amplitudeoffset + rsWentylator.m_amplitudefactor * Vehicle.RventRot ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + // ...otherwise shut down the sound + rsWentylator.stop(); + } + // relay sounds auto const soundflags { Vehicle.SoundFlag }; if( TestFlag( soundflags, sound::relay ) ) { // przekaznik - gdy bezpiecznik, automatyczny rozruch itp @@ -5789,7 +5819,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub .pitch( true == motor_shuntfield.is_combined() ? Vehicle.ScndCtrlActualPos * 0.01f : - motor_shuntfield.m_frequencyoffset + 1.f * motor_shuntfield.m_frequencyfactor ) + motor_shuntfield.m_frequencyoffset + motor_shuntfield.m_frequencyfactor * 1.f ) .gain( motor_shuntfield.m_amplitudeoffset + ( true == TestFlag( soundflags, sound::loud ) ? @@ -5813,7 +5843,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub .pitch( true == motor_relay.is_combined() ? Vehicle.MainCtrlActualPos * 0.01f : - motor_relay.m_frequencyoffset + 1.f * motor_relay.m_frequencyfactor ) + motor_relay.m_frequencyoffset + motor_relay.m_frequencyfactor * 1.f ) .gain( motor_relay.m_amplitudeoffset + ( true == TestFlag( soundflags, sound::loud ) ? @@ -5824,32 +5854,11 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub } } - if( ( Vehicle.EngineType == ElectricSeriesMotor ) - || ( Vehicle.EngineType == ElectricInductionMotor ) ) { - - if( Vehicle.RventRot > 0.1 ) { - // play ventilator sound if the ventilators are rotating fast enough... - volume = ( - Vehicle.EngineType == ElectricInductionMotor ? - rsWentylator.m_amplitudefactor * std::sqrt( std::fabs( Vehicle.dizel_fill ) ) + rsWentylator.m_amplitudeoffset : - rsWentylator.m_amplitudefactor * Vehicle.RventRot + rsWentylator.m_amplitudeoffset ); - - rsWentylator - .pitch( rsWentylator.m_frequencyfactor * Vehicle.RventRot + rsWentylator.m_frequencyoffset ) - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - // ...otherwise shut down the sound - rsWentylator.stop(); - } - } - if( Vehicle.TrainType == dt_ET40 ) { if( Vehicle.Vel > 0.1 ) { transmission - .pitch( transmission.m_frequencyfactor * ( Vehicle.Vel ) + transmission.m_frequencyoffset ) - .gain( transmission.m_amplitudefactor * ( Vehicle.Vel ) + transmission.m_amplitudeoffset ) + .pitch( transmission.m_frequencyoffset + transmission.m_frequencyfactor * Vehicle.Vel ) + .gain( transmission.m_amplitudeoffset + transmission.m_amplitudefactor * Vehicle.Vel ) .play( sound_flags::exclusive | sound_flags::looping ); } else { diff --git a/DynObj.h b/DynObj.h index 16c644c2..9a3305bd 100644 --- a/DynObj.h +++ b/DynObj.h @@ -284,6 +284,7 @@ private: }; struct powertrain_sounds { + sound_source inverter { sound_placement::engine }; sound_source motor { sound_placement::external }; // generally traction motor double motor_volume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal float motor_momentum { 0.f }; // recent change in motor revolutions diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 7a29e8bf..00cbef41 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -816,6 +816,7 @@ public: double eimc[26]; bool EIMCLogForce; // static std::vector const eimc_labels; + double InverterFrequency { 0.0 }; // current frequency of power inverters /*-dla wagonow*/ double MaxLoad = 0.0; /*masa w T lub ilosc w sztukach - ladownosc*/ std::string LoadAccepted; std::string LoadQuantity; /*co moze byc zaladowane, jednostki miary*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 21a44af8..9869a246 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4239,36 +4239,13 @@ double TMoverParameters::TractionForce(double dt) */ // hunter-091012: przeniesione z if ActiveDir<>0 (zeby po zejsciu z kierunku dalej spadala predkosc wentylatorow) // wentylatory rozruchowe - // TODO: move this to update, it doesn't exactly have much to do with traction - if( true == Mains ) { + // TBD, TODO: move this to update, it doesn't exactly have much to do with traction + switch( EngineType ) { - switch( EngineType ) { - case ElectricInductionMotor: { - // TBD, TODO: currently ignores RVentType, fix this? - auto const tmpV { std::abs( eimv[ eimv_fp ] ) }; - - if( ( RlistSize > 0 ) - && ( ( std::abs( eimv[ eimv_If ] ) > 1.0 ) - || ( tmpV > 0.1 ) ) ) { - - int i = 0; - while( ( i < RlistSize - 1 ) - && ( DElist[ i + 1 ].RPM < tmpV ) ) { - ++i; - } - RventRot = - ( tmpV - DElist[ i ].RPM ) - / std::max( 1.0, ( DElist[ i + 1 ].RPM - DElist[ i ].RPM ) ) - * ( DElist[ i + 1 ].GenPower - DElist[ i ].GenPower ) - + DElist[ i ].GenPower; - } - else { - RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); - } - break; - } - case ElectricSeriesMotor: { + case ElectricSeriesMotor: { + if( true == Mains ) { switch( RVentType ) { + case 1: { // manual if( ( ActiveDir != 0 ) && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { @@ -4279,6 +4256,7 @@ double TMoverParameters::TractionForce(double dt) } break; } + case 2: { // automatic if( ( std::abs( Itot ) > RVentMinI ) && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { @@ -4293,26 +4271,32 @@ double TMoverParameters::TractionForce(double dt) } break; } + default: { break; } } // rventtype + } // mains + else { + RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); } - case DieselElectric: { + } + + case DieselElectric: { + if( true == Mains ) { // TBD, TODO: currently ignores RVentType, fix this? RventRot += clamp( DElist[ MainCtrlPos ].RPM - RventRot, -100.0, 50.0 ) * dt; - break; } - case DieselEngine: - default: { - break; + else { + RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); } - } // enginetype + break; + } + + default: { + break; + } } - else { - RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); - } - RventRot = std::max( 0.0, RventRot ); if (ActiveDir != 0) switch (EngineType) @@ -4715,8 +4699,7 @@ double TMoverParameters::TractionForce(double dt) MainSwitch( false, ( TrainType == dt_EZT ? range::unit : range::local ) ); // TODO: check whether we need to send this EMU-wide } } - if ((Mains)) - { + if( true == Mains ) { dtrans = Hamulec->GetEDBCP(); if (((DoorLeftOpened) || (DoorRightOpened))) @@ -4884,35 +4867,56 @@ double TMoverParameters::TractionForce(double dt) Itot = eimv[eimv_Ipoj] * (0.01 + Min0R(0.99, 0.99 - Vadd)); EnginePower = abs(eimv[eimv_Ic] * eimv[eimv_U] * NPoweredAxles) / 1000; + // power inverters + auto const tmpV { std::abs( eimv[ eimv_fp ] ) }; + + if( ( RlistSize > 0 ) + && ( ( std::abs( eimv[ eimv_If ] ) > 1.0 ) + || ( tmpV > 0.1 ) ) ) { + + int i = 0; + while( ( i < RlistSize - 1 ) + && ( DElist[ i + 1 ].RPM < tmpV ) ) { + ++i; + } + InverterFrequency = + ( tmpV - DElist[ i ].RPM ) + / std::max( 1.0, ( DElist[ i + 1 ].RPM - DElist[ i ].RPM ) ) + * ( DElist[ i + 1 ].GenPower - DElist[ i ].GenPower ) + + DElist[ i ].GenPower; + } + else { + InverterFrequency = 0.0; + } Mm = eimv[eimv_M] * DirAbsolute; Mw = Mm * Transmision.Ratio; Fw = Mw * 2.0 / WheelDiameter; Ft = Fw * NPoweredAxles; eimv[eimv_Fr] = DirAbsolute * Ft / 1000; - // RventRot; - } + } // mains else { - Im = 0; - Mm = 0; - Mw = 0; - Fw = 0; - Ft = 0; - Itot = 0; - dizel_fill = 0; - EnginePower = 0; + Im = 0.0; + Mm = 0.0; + Mw = 0.0; + Fw = 0.0; + Ft = 0.0; + Itot = 0.0; + dizel_fill = 0.0; + EnginePower = 0.0; { for (int i = 0; i < 21; ++i) - eimv[i] = 0; + eimv[i] = 0.0; } - Hamulec->SetED(0); - RventRot = 0.0; //(Hamulec as TLSt).SetLBP(LocBrakePress); + Hamulec->SetED(0.0); + InverterFrequency = 0.0; //(Hamulec as TLSt).SetLBP(LocBrakePress); } break; } // ElectricInductionMotor + case None: - { + default: { break; } } // case EngineType diff --git a/Train.cpp b/Train.cpp index 4b9fb212..3a164ca9 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4136,7 +4136,7 @@ bool TTrain::Update( double const Deltatime ) else // wylaczone { btLampkaCzuwaka.Turn( false ); - btLampkaSHP.Turn( true ); + btLampkaSHP.Turn( false ); } // przelaczniki // ABu030405 obsluga lampki uniwersalnej: From 872abc2c00e0b093e0ae272ed5616f3f3b273ad6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 17 Jan 2018 18:00:13 +0100 Subject: [PATCH 259/426] texture-related log message filtering --- Logs.h | 3 ++- Model3d.cpp | 8 ++++---- Texture.cpp | 16 ++++++++-------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/Logs.h b/Logs.h index 4e085efd..449e2c76 100644 --- a/Logs.h +++ b/Logs.h @@ -14,7 +14,8 @@ enum logtype : unsigned int { generic = 0x1, file = 0x2, - model = 0x4 + model = 0x4, + texture = 0x8 }; void WriteLog( const char *str, logtype const Type = logtype::generic ); diff --git a/Model3d.cpp b/Model3d.cpp index 3ac3f3bc..94fc4c24 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1234,7 +1234,7 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem if (false == result) { - ErrorLog("Failed to load 3d model \"" + FileName + "\""); + ErrorLog("Bad model: failed to load 3d model \"" + FileName + "\""); } return result; }; @@ -1697,7 +1697,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) { // wczytanie modelu z pliku binarnego - WriteLog("Loading binary format 3d model data from \"" + FileName + "\"..."); + WriteLog( "Loading binary format 3d model data from \"" + FileName + "\"...", logtype::model ); std::ifstream file(FileName, std::ios::binary); @@ -1710,12 +1710,12 @@ void TModel3d::LoadFromBinFile(std::string const &FileName, bool dynamic) deserialize(file, size, dynamic); file.close(); - WriteLog("Finished loading 3d model data from \"" + FileName + "\""); + WriteLog( "Finished loading 3d model data from \"" + FileName + "\"", logtype::model ); }; void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic) { // wczytanie submodelu z pliku tekstowego - WriteLog("Loading text format 3d model data from \"" + FileName + "\"..."); + WriteLog( "Loading text format 3d model data from \"" + FileName + "\"...", logtype::model ); iFlags |= 0x0200; // wczytano z pliku tekstowego (właścicielami tablic są submodle) cParser parser(FileName, cParser::buffer_FILE); // Ra: tu powinno być "models\\"... TSubModel *SubModel; diff --git a/Texture.cpp b/Texture.cpp index d0718054..0aedf1e3 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -39,7 +39,7 @@ opengl_texture::load() { if( name.size() < 3 ) { goto fail; } - WriteLog( "Loading texture data from \"" + name + "\"" ); + WriteLog( "Loading texture data from \"" + name + "\"", logtype::texture ); data_state = resource_state::loading; { @@ -67,7 +67,7 @@ opengl_texture::load() { fail: data_state = resource_state::failed; - ErrorLog( "Failed to load texture \"" + name + "\"" ); + ErrorLog( "Bad texture: failed to load texture \"" + name + "\"" ); // NOTE: temporary workaround for texture assignment errors id = 0; return; @@ -91,7 +91,7 @@ opengl_texture::load_BMP() { BITMAPINFO info; unsigned int infosize = header.bfOffBits - sizeof( BITMAPFILEHEADER ); if( infosize > sizeof( info ) ) { - WriteLog( "Warning - BMP header is larger than expected, possible format difference." ); + WriteLog( "Warning - BMP header is larger than expected, possible format difference.", logtype::texture ); } file.read( (char *)&info, std::min( (size_t)infosize, sizeof( info ) ) ); @@ -100,7 +100,7 @@ opengl_texture::load_BMP() { if( info.bmiHeader.biCompression != BI_RGB ) { - ErrorLog( "Compressed BMP textures aren't supported." ); + ErrorLog( "Bad texture: compressed BMP textures aren't supported.", logtype::texture ); data_state = resource_state::failed; return; } @@ -289,7 +289,7 @@ opengl_texture::load_DDS() { */ if( datasize == 0 ) { // catch malformed .dds files - WriteLog( "File \"" + name + "\" is malformed and holds no texture data." ); + WriteLog( "Bad texture: file \"" + name + "\" is malformed and holds no texture data.", logtype::texture ); data_state = resource_state::failed; return; } @@ -330,7 +330,7 @@ opengl_texture::load_TEX() { hasalpha = true; } else { - ErrorLog( "Unrecognized TEX texture sub-format: " + std::string(head) ); + ErrorLog( "Bad texture: unrecognized TEX texture sub-format: " + std::string(head), logtype::texture ); data_state = resource_state::failed; return; }; @@ -793,7 +793,7 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { if( true == filename.empty() ) { // there's nothing matching in the databank nor on the disk, report failure - ErrorLog( "Texture file missing: \"" + Filename + "\"" ); + ErrorLog( "Bad file: failed do locate texture file \"" + Filename + "\"", logtype::file ); return npos; } @@ -808,7 +808,7 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { m_textures.emplace_back( texture, std::chrono::steady_clock::time_point() ); m_texturemappings.emplace( filename, textureindex ); - WriteLog( "Created texture object for \"" + filename + "\"" ); + WriteLog( "Created texture object for \"" + filename + "\"", logtype::texture ); if( true == Loadnow ) { From 9abaf7414f25c738f7620e0c90ebadc40e86994e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 20 Jan 2018 00:37:42 +0100 Subject: [PATCH 260/426] gfx resource sweep configuration switches, diesel electric vehicle engine power output scaling with engine revolutions, velocity-based activation points for combined running noise sounds, shadow colour take into account overcast value --- AnimModel.cpp | 7 +++---- DynObj.cpp | 41 +++++++++++++++++++++++++++++------------ Globals.cpp | 12 ++++++++++++ Globals.h | 2 ++ McZapkie/Mover.cpp | 41 ++++++++++++++++++++++++----------------- Texture.cpp | 15 +++++++++++---- Texture.h | 2 +- Train.cpp | 35 ++++++++++++++++++++++++++++------- renderer.cpp | 7 ++++++- version.h | 2 +- 10 files changed, 117 insertions(+), 47 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index cf87fb43..ac8bc679 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -422,9 +422,8 @@ TAnimModel::~TAnimModel() bool TAnimModel::Init(TModel3d *pNewModel) { fBlinkTimer = double(Random(1000 * fOffTime)) / (1000 * fOffTime); - ; pModel = pNewModel; - return (pModel != NULL); + return (pModel != nullptr); } bool TAnimModel::Init(std::string const &asName, std::string const &asReplacableTexture) @@ -578,10 +577,10 @@ void TAnimModel::RaPrepare() switch (lightmode) { case ls_Blink: // migotanie - state = fBlinkTimer < fOnTime; + state = ( fBlinkTimer < fOnTime ); break; case ls_Dark: // zapalone, gdy ciemno - state = Global::fLuminance <= ( lsLights[i] - 3.0 ); + state = ( Global::fLuminance <= ( lsLights[i] - 3.0 ) ); break; default: // zapalony albo zgaszony state = (lightmode == ls_On); diff --git a/DynObj.cpp b/DynObj.cpp index 8ce3b99e..f4c1dc77 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3697,6 +3697,7 @@ void TDynamicObject::RenderSounds() { } // szum w czasie jazdy if( ( GetVelocity() > 0.5 ) + && ( false == rsOuterNoise.empty() ) && ( // compound test whether the vehicle belongs to user-driven consist (as these don't emit outer noise in cab view) FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise // Global::pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) @@ -3705,9 +3706,19 @@ void TDynamicObject::RenderSounds() { Global::CabWindowOpen ? true : // sticking head out we get to hear outer noise false ) ) { - volume = rsOuterNoise.m_amplitudefactor * MoverParameters->Vel + rsOuterNoise.m_amplitudeoffset; - frequency = rsOuterNoise.m_frequencyfactor * MoverParameters->Vel + rsOuterNoise.m_frequencyoffset; + // frequency calculation + auto const normalizer { ( + true == rsOuterNoise.is_combined() ? + MoverParameters->Vmax * 0.01f : + 1.f ) }; + frequency = + rsOuterNoise.m_frequencyoffset + + rsOuterNoise.m_frequencyfactor * MoverParameters->Vel * normalizer; + // volume calculation + volume = + rsOuterNoise.m_amplitudeoffset + + rsOuterNoise.m_amplitudefactor * MoverParameters->Vel; if( brakeforceratio > 0.0 ) { // hamulce wzmagaja halas volume *= 1 + 0.125 * brakeforceratio; @@ -3723,10 +3734,15 @@ void TDynamicObject::RenderSounds() { MoverParameters->Vel / 40.0, 0.0, 1.0 ) ); - rsOuterNoise - .pitch( frequency ) // arbitrary limits to prevent the pitch going out of whack - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); + if( volume > 0.05 ) { + rsOuterNoise + .pitch( frequency ) // arbitrary limits to prevent the pitch going out of whack + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsOuterNoise.stop(); + } } else { // don't play the optional ending sound if the listener switches views @@ -5524,12 +5540,13 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub || ( Vehicle.EngineType == Dumb ) ) { // frequency calculation - auto normalizer { 1.f }; - if( true == engine.is_combined() ) { - // for combined engine sound we calculate sound point in rpm, to make .mmd files setup easier - // NOTE: we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range - normalizer = 60.f * 0.01f; - } + auto const normalizer { ( + true == engine.is_combined() ? + // for combined engine sound we calculate sound point in rpm, to make .mmd files setup easier + // NOTE: we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range + 60.f * 0.01f : + // for legacy single-piece sounds the standard frequency calculation is left untouched + 1.f ) }; frequency = engine.m_frequencyoffset + engine.m_frequencyfactor * std::abs( Vehicle.enrot ) * normalizer; diff --git a/Globals.cpp b/Globals.cpp index ed7b8764..4dd3d0ff 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -116,6 +116,8 @@ std::string Global::LastGLError; GLint Global::iMaxTextureSize = 4096; // maksymalny rozmiar tekstury bool Global::bSmoothTraction { true }; // wygładzanie drutów starym sposobem float Global::SplineFidelity { 1.f }; // determines segment size during conversion of splines to geometry +bool Global::ResourceSweep { true }; // gfx resource garbage collection +bool Global::ResourceMove { false }; // gfx resources are moved between cpu and gpu side instead of sending a copy std::string Global::szDefaultExt = Global::szTexturesDDS; // domyślnie od DDS int Global::iMultisampling = 2; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px bool Global::DLFont{ false }; // switch indicating presence of basic font @@ -512,6 +514,16 @@ void Global::ConfigParse(cParser &Parser) Parser >> splinefidelity; Global::SplineFidelity = clamp( splinefidelity, 1.f, 4.f ); } + else if( token == "gfx.resource.sweep" ) { + + Parser.getTokens(); + Parser >> Global::ResourceSweep; + } + else if( token == "gfx.resource.move" ) { + + Parser.getTokens(); + Parser >> Global::ResourceMove; + } else if (token == "timespeed") { // przyspieszenie czasu, zmienna do testów diff --git a/Globals.h b/Globals.h index 79f5e176..8213e37a 100644 --- a/Globals.h +++ b/Globals.h @@ -214,6 +214,8 @@ public: static bool bSmoothTraction; // wygładzanie drutów static float SplineFidelity; // determines segment size during conversion of splines to geometry static GLfloat FogColor[]; + static bool ResourceSweep; // gfx resource garbage collection + static bool ResourceMove; // gfx resources are moved between cpu and gpu side instead of sending a copy // sound renderer variables static bool bSoundEnabled; static float AudioVolume; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 9869a246..12be0ceb 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4429,29 +4429,36 @@ double TMoverParameters::TractionForce(double dt) } else // jazda ciapongowa { - auto power = Power; if( true == Heating ) { power -= HeatingPower; } if( power < 0.0 ) { power = 0.0; } - tmp = std::min( DElist[ MainCtrlPos ].GenPower, power );// Power - HeatingPower * double( Heating )); + // NOTE: very crude way to approximate power generated at current rpm instead of instant top output + auto const currentgenpower { ( + DElist[ MainCtrlPos ].RPM > 0 ? + DElist[ MainCtrlPos ].GenPower * ( 60.0 * enrot / DElist[ MainCtrlPos ].RPM ) : + 0.0 ) }; + + tmp = std::min( power, currentgenpower ); - PosRatio = DElist[MainCtrlPos].GenPower / DElist[MainCtrlPosNo].GenPower; + PosRatio = currentgenpower / DElist[MainCtrlPosNo].GenPower; // stosunek mocy teraz do mocy max - if ((MainCtrlPos > 0) && (ConverterFlag)) - if (tmpV < - (Vhyp * power / - DElist[MainCtrlPosNo].GenPower)) // czy na czesci prostej, czy na hiperboli - Ft = (Ftmax - - ((Ftmax - 1000.0 * DElist[MainCtrlPosNo].GenPower / (Vhyp + Vadd)) * - (tmpV / Vhyp) / PowerCorRatio)) * - PosRatio; // posratio - bo sila jakos tam sie rozklada + if( ( MainCtrlPos > 0 ) && ( ConverterFlag ) ) { - // Ft:=(Ftmax - (Ftmax - (1000.0 * DEList[MainCtrlPosNo].genpower / - //(Vhyp+Vadd) / PowerCorRatio)) * (tmpV/Vhyp)) * PosRatio //wersja z Megapacka - else // na hiperboli //1.107 - - // wspolczynnik sredniej nadwyzki Ft w symku nad charakterystyka - Ft = 1000.0 * tmp / (tmpV + Vadd) / - PowerCorRatio; // tu jest zawarty stosunek mocy + if( tmpV < ( Vhyp * power / DElist[ MainCtrlPosNo ].GenPower ) ) { + // czy na czesci prostej, czy na hiperboli + Ft = ( Ftmax + - ( ( Ftmax - 1000.0 * DElist[ MainCtrlPosNo ].GenPower / ( Vhyp + Vadd ) ) + * ( tmpV / Vhyp ) + / PowerCorRatio ) ) + * PosRatio; // posratio - bo sila jakos tam sie rozklada + } + else { + // na hiperboli + // 1.107 - wspolczynnik sredniej nadwyzki Ft w symku nad charakterystyka + Ft = 1000.0 * tmp / ( tmpV + Vadd ) / + PowerCorRatio; // tu jest zawarty stosunek mocy + } + } else Ft = 0; // jak nastawnik na zero, to sila tez zero diff --git a/Texture.cpp b/Texture.cpp index 0aedf1e3..bd4bce23 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -589,8 +589,12 @@ opengl_texture::create() { } } - data = std::vector(); - data_state = resource_state::none; + if( ( true == Global::ResourceMove ) + || ( false == Global::ResourceSweep ) ) { + // if garbage collection is disabled we don't expect having to upload the texture more than once + data = std::vector(); + data_state = resource_state::none; + } is_ready = true; } @@ -599,11 +603,14 @@ opengl_texture::create() { // releases resources allocated on the opengl end, storing local copy if requested void -opengl_texture::release( bool const Backup ) { +opengl_texture::release() { if( id == -1 ) { return; } - if( true == Backup ) { + if( true == Global::ResourceMove ) { + // if resource move is enabled we don't keep a cpu side copy after upload + // so need to re-acquire the data before release + // TBD, TODO: instead of vram-ram transfer fetch the data 'normally' from the disk using worker thread ::glBindTexture( GL_TEXTURE_2D, id ); GLint datasize {}; GLint iscompressed {}; diff --git a/Texture.h b/Texture.h index 1d5b2500..b6040169 100644 --- a/Texture.h +++ b/Texture.h @@ -30,7 +30,7 @@ struct opengl_texture { create(); // releases resources allocated on the opengl end, storing local copy if requested void - release( bool const Backup = true ); + release(); inline int width() const { diff --git a/Train.cpp b/Train.cpp index 3a164ca9..31a67212 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4472,12 +4472,27 @@ TTrain::update_sounds( double const Deltatime ) { && ( false == Global::CabWindowOpen ) && ( DynamicObject->GetVelocity() > 0.5 ) ) { - volume = rsRunningNoise.m_amplitudeoffset + rsRunningNoise.m_amplitudefactor * mvOccupied->Vel; - auto frequency { rsRunningNoise.m_frequencyoffset + rsRunningNoise.m_frequencyfactor * mvOccupied->Vel }; + // frequency calculation + auto const normalizer { ( + true == rsRunningNoise.is_combined() ? + mvOccupied->Vmax * 0.01f : + 1.f ) }; + auto const frequency { + rsRunningNoise.m_frequencyoffset + + rsRunningNoise.m_frequencyfactor * mvOccupied->Vel * normalizer }; + // volume calculation + volume = + rsRunningNoise.m_amplitudeoffset + + rsRunningNoise.m_amplitudefactor * mvOccupied->Vel; if( std::abs( mvOccupied->nrot ) > 0.01 ) { // hamulce wzmagaja halas - volume *= 1 + 0.25 * ( mvOccupied->UnitBrakeForce / ( 1 + mvOccupied->MaxBrakeForce ) ); + auto const brakeforceratio { ( + clamp( + mvOccupied->UnitBrakeForce / std::max( 1.0, mvOccupied->BrakeForceR( 1.0, mvOccupied->Vel ) / ( mvOccupied->NAxles * std::max( 1, mvOccupied->NBpA ) ) ), + 0.0, 1.0 ) ) }; + + volume *= 1 + 0.125 * brakeforceratio; } // scale volume by track quality volume *= ( 20.0 + DynamicObject->MyTrack->iDamageFlag ) / 21; @@ -4489,10 +4504,16 @@ TTrain::update_sounds( double const Deltatime ) { clamp( mvOccupied->Vel / 40.0, 0.0, 1.0 ) ); - rsRunningNoise - .pitch( frequency ) - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); + + if( volume > 0.05 ) { + rsRunningNoise + .pitch( frequency ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + rsRunningNoise.stop(); + } } else { // don't play the optional ending sound if the listener switches views diff --git a/renderer.cpp b/renderer.cpp index 7a7303d2..7335c7b3 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1325,6 +1325,10 @@ opengl_renderer::Render( world_environment *Environment ) { // turn on moon shadows after nautical twilight, if the moon is actually up m_shadowcolor = glm::vec4{ 0.5f, 0.5f, 0.5f, 1.f }; } + // soften shadows depending on sky overcast factor + m_shadowcolor = glm::min( + colors::white, + m_shadowcolor + glm::vec4{ glm::vec3{ 0.5f * Global::Overcast }, 1.f } ); if( Global::bWireFrame ) { // bez nieba w trybie rysowania linii @@ -3362,7 +3366,8 @@ opengl_renderer::Update( double const Deltatime ) { ::glEnable( GL_MULTISAMPLE ); } - if( true == World.InitPerformed() ) { + if( ( true == Global::ResourceSweep ) + && ( true == World.InitPerformed() ) ) { // garbage collection m_geometry.update(); m_textures.update(); diff --git a/version.h b/version.h index 36e55658..2ca029a2 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 115 +#define VERSION_MINOR 119 #define VERSION_REVISION 0 From 0dc1394d594d4c1c4ae8ec8bb496774c4244363f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 22 Jan 2018 18:07:31 +0100 Subject: [PATCH 261/426] build 180122. radio channel cab controls, sky brightness calculation fix, motor ventilator spin rate tweaks --- Button.cpp | 2 +- DynObj.cpp | 2 +- McZapkie/MOVER.h | 14 +++++++++----- McZapkie/Mover.cpp | 6 +++--- Model3d.cpp | 2 +- Train.cpp | 37 +++++++++++++++++++++++++++++++------ Train.h | 7 +++++-- World.cpp | 16 +++++++--------- mouseinput.cpp | 9 +++++++++ mouseinput.h | 4 ---- renderer.cpp | 14 ++++++++++---- simulation.cpp | 2 +- skydome.cpp | 4 ++-- translation.h | 3 +++ version.h | 2 +- 15 files changed, 84 insertions(+), 40 deletions(-) diff --git a/Button.cpp b/Button.cpp index 37f9ae87..bbff6cce 100644 --- a/Button.cpp +++ b/Button.cpp @@ -105,7 +105,7 @@ TButton::model_offset() const { return ( submodel != nullptr ? - submodel->offset( 1.f ) : + submodel->offset( 2.5f ) : glm::vec3() ); } diff --git a/DynObj.cpp b/DynObj.cpp index f4c1dc77..de857e76 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2975,7 +2975,7 @@ bool TDynamicObject::Update(double dt, double dt1) // crude bump simulation, drop down on even axles, move back up on the odd ones MoverParameters->AccVert += interpolate( - 0.25, 0.50, + 0.01, 0.05, clamp( GetVelocity() / ( 1 + MoverParameters->Vmax ), 0.0, 1.0 ) ) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 00cbef41..1f4c934f 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -84,7 +84,7 @@ extern int ConversionError; const double Steel2Steel_friction = 0.15; //tarcie statyczne const double g = 9.81; //przyspieszenie ziemskie const double SandSpeed = 0.1; //ile kg/s} -const double RVentSpeed = 0.4; //rozpedzanie sie wentylatora obr/s^2} +const double RVentSpeed = 3.5; //rozpedzanie sie wentylatora obr/s^2} const double RVentMinI = 50.0; //przy jakim pradzie sie wylaczaja} const double Pirazy2 = 6.2831853071794f; #define PI 3.1415926535897f @@ -945,17 +945,21 @@ public: bool InsideConsist = false; /*-zmienne dla lokomotywy elektrycznej*/ TTractionParam RunningTraction;/*parametry sieci trakcyjnej najblizej lokomotywy*/ - double enrot = 0.0; - double Im = 0.0; - double Itot = 0.0; + double enrot = 0.0; // ilosc obrotow silnika + double Im = 0.0; // prad silnika +/* + // currently not used double IHeating = 0.0; double ITraction = 0.0; +*/ + double Itot = 0.0; // prad calkowity double TotalCurrent = 0.0; + // momenty double Mm = 0.0; double Mw = 0.0; + // sily napedne double Fw = 0.0; double Ft = 0.0; - /*ilosc obrotow, prad silnika i calkowity, momenty, sily napedne*/ //Ra: Im jest ujemny, jeśli lok jedzie w stronę sprzęgu 1 //a ujemne powinien być przy odwróconej polaryzacji sieci... //w wielu miejscach jest używane abs(Im) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 12be0ceb..54f5cfff 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4252,7 +4252,7 @@ double TMoverParameters::TractionForce(double dt) RventRot += ( RVentnmax - RventRot ) * RVentSpeed * dt; } else { - RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); + RventRot = std::max( 0.0, RventRot - RVentSpeed * dt ); } break; } @@ -4267,7 +4267,7 @@ double TMoverParameters::TractionForce(double dt) RventRot += ( RVentnmax * Im / ImaxLo - RventRot ) * RVentSpeed * dt; } else { - RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); + RventRot = std::max( 0.0, RventRot - RVentSpeed * dt ); } break; } @@ -4278,7 +4278,7 @@ double TMoverParameters::TractionForce(double dt) } // rventtype } // mains else { - RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); + RventRot = std::max( 0.0, RventRot - RVentSpeed * dt ); } } diff --git a/Model3d.cpp b/Model3d.cpp index 94fc4c24..80de2402 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1166,7 +1166,7 @@ TSubModel::offset( float const Geometrytestoffsetthreshold ) const { auto offset { glm::vec3 { glm::make_mat4( parentmatrix.readArray() ) * glm::vec4 { 0, 0, 0, 1 } } }; - if( glm::length2( offset ) < Geometrytestoffsetthreshold ) { + if( glm::length( offset ) < Geometrytestoffsetthreshold ) { // offset of zero generally means the submodel has optimized identity matrix // for such cases we resort to an estimate from submodel geometry // TODO: do proper bounding area calculation for submodel when loading mesh and grab the centre point from it here diff --git a/Train.cpp b/Train.cpp index 31a67212..529d8ba1 100644 --- a/Train.cpp +++ b/Train.cpp @@ -464,6 +464,7 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "shp", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_active ) ) ); PyDict_SetItemString( dict, "pantpress", PyGetFloat( mvControlled->PantPress ) ); PyDict_SetItemString( dict, "universal3", PyGetBool( InstrumentLightActive ) ); + PyDict_SetItemString( dict, "radio_channel", PyGetInt( iRadioChannel ) ); // movement data PyDict_SetItemString( dict, "velocity", PyGetFloat( mover->Vel ) ); PyDict_SetItemString( dict, "tractionforce", PyGetFloat( mover->Ft ) ); @@ -3079,6 +3080,13 @@ void TTrain::OnCommand_radiochannelincrease( TTrain *Train, command_data const & if( Command.action == GLFW_PRESS ) { Train->iRadioChannel = clamp( Train->iRadioChannel + 1, 1, 10 ); + // visual feedback + Train->ggRadioChannelSelector.UpdateValue( Train->iRadioChannel - 1 ); + Train->ggRadioChannelNext.UpdateValue( 1.0 ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggRadioChannelNext.UpdateValue( 0.0 ); } } @@ -3086,6 +3094,13 @@ void TTrain::OnCommand_radiochanneldecrease( TTrain *Train, command_data const & if( Command.action == GLFW_PRESS ) { Train->iRadioChannel = clamp( Train->iRadioChannel - 1, 1, 10 ); + // visual feedback + Train->ggRadioChannelSelector.UpdateValue( Train->iRadioChannel - 1 ); + Train->ggRadioChannelPrevious.UpdateValue( 1.0 ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggRadioChannelPrevious.UpdateValue( 0.0 ); } } @@ -3283,9 +3298,7 @@ bool TTrain::Update( double const Deltatime ) } if (DynamicObject->mdKabina) - { // Ra: TODO: odczyty klawiatury/pulpitu nie - // powinny być uzależnione od istnienia modelu - // kabiny + { // Ra: TODO: odczyty klawiatury/pulpitu nie powinny być uzależnione od istnienia modelu kabiny tor = DynamicObject->GetTrack(); // McZapkie-180203 // McZapkie: predkosc wyswietlana na tachometrze brana jest z obrotow kol float maxtacho = 3; @@ -3307,9 +3320,10 @@ bool TTrain::Update( double const Deltatime ) if (fTachoCount < maxtacho) fTachoCount += Deltatime * 3; // szybciej zacznij stukac } - else if (fTachoCount > 0) - fTachoCount -= Deltatime * 0.66; // schodz powoli - niektore haslery to ze 4 - // sekundy potrafia stukac + else if( fTachoCount > 0 ) { + // schodz powoli - niektore haslery to ze 4 sekundy potrafia stukac + fTachoCount -= Deltatime * 0.66; + } // Ra 2014-09: napięcia i prądy muszą być ustalone najpierw, bo wysyłane są ewentualnie na PoKeys if ((mvControlled->EngineType != DieselElectric) @@ -4170,6 +4184,9 @@ bool TTrain::Update( double const Deltatime ) ggConverterFuseButton.Update(); ggStLinOffButton.Update(); ggRadioButton.Update(); + ggRadioChannelSelector.Update(); + ggRadioChannelPrevious.Update(); + ggRadioChannelNext.Update(); ggDepartureSignalButton.Update(); ggPantFrontButton.Update(); @@ -5162,6 +5179,10 @@ void TTrain::clear_cab_controls() ggFuseButton.Clear(); ggConverterFuseButton.Clear(); ggStLinOffButton.Clear(); + ggRadioButton.Clear(); + ggRadioChannelSelector.Clear(); + ggRadioChannelPrevious.Clear(); + ggRadioChannelNext.Clear(); ggDoorLeftButton.Clear(); ggDoorRightButton.Clear(); ggDepartureSignalButton.Clear(); @@ -5299,6 +5320,7 @@ void TTrain::set_cab_controls() { if( true == mvOccupied->Radio ) { ggRadioButton.PutValue( 1.0 ); } + ggRadioChannelSelector.PutValue( iRadioChannel - 1 ); // pantographs if( mvOccupied->PantSwitchType != "impulse" ) { ggPantFrontButton.PutValue( @@ -5630,6 +5652,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "converteroff_sw:", ggConverterOffButton }, { "main_sw:", ggMainButton }, { "radio_sw:", ggRadioButton }, + { "radiochannel_sw:", ggRadioChannelSelector }, + { "radiochannelprev_sw:", ggRadioChannelPrevious }, + { "radiochannelnext_sw:", ggRadioChannelNext }, { "pantfront_sw:", ggPantFrontButton }, { "pantrear_sw:", ggPantRearButton }, { "pantfrontoff_sw:", ggPantFrontButtonOff }, diff --git a/Train.h b/Train.h index 2b5bc038..48892cbe 100644 --- a/Train.h +++ b/Train.h @@ -89,7 +89,6 @@ class TTrain void UpdateMechPosition(double dt); vector3 GetWorldMechPosition(); bool Update( double const Deltatime ); - void update_sounds( double const Deltatime ); void MechStop(); void SetLights(); // McZapkie-310302: ladowanie parametrow z pliku @@ -116,7 +115,8 @@ class TTrain TDynamicObject *find_nearest_consist_vehicle() const; // moves train brake lever to specified position, potentially emits switch sound if conditions are met void set_train_brake( double const Position ); - + // update function subroutines + void update_sounds( double const Deltatime ); // command handlers // NOTE: we're currently using universal handlers and static handler map but it may be beneficial to have these implemented on individual class instance basis @@ -271,6 +271,9 @@ public: // reszta może by?publiczna TGauge ggConverterFuseButton; // hunter-261211: przycisk odblokowania nadmiarowego przetwornic i ogrzewania TGauge ggStLinOffButton; TGauge ggRadioButton; + TGauge ggRadioChannelSelector; + TGauge ggRadioChannelPrevious; + TGauge ggRadioChannelNext; TGauge ggUpperLightButton; TGauge ggLeftLightButton; TGauge ggRightLightButton; diff --git a/World.cpp b/World.cpp index 4215142a..4e580d6d 100644 --- a/World.cpp +++ b/World.cpp @@ -1558,13 +1558,11 @@ TWorld::Update_UI() { "vel: " + to_string( vehicle->GetVelocity(), 2 ) + "/" + to_string( vehicle->MoverParameters->nrot* M_PI * vehicle->MoverParameters->WheelDiameter * 3.6, 2 ) + " km/h;" + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : " " ) + " dist: " + to_string( vehicle->MoverParameters->DistCounter, 2 ) + " km" - + "; pos: (" - + to_string( vehicle->GetPosition().x, 2 ) + ", " - + to_string( vehicle->GetPosition().y, 2 ) + ", " - + to_string( vehicle->GetPosition().z, 2 ) + "), PM=" - + to_string( vehicle->MoverParameters->WheelFlat, 1 ) + " mm; enrot=" - + to_string( vehicle->MoverParameters->enrot * 60, 0 ) + " tmrot=" - + to_string( std::abs( vehicle->MoverParameters->nrot ) * vehicle->MoverParameters->Transmision.Ratio * 60, 0 ); + + "; pos: [" + to_string( vehicle->GetPosition().x, 2 ) + ", " + to_string( vehicle->GetPosition().y, 2 ) + ", " + to_string( vehicle->GetPosition().z, 2 ) + "]" + + ", PM=" + to_string( vehicle->MoverParameters->WheelFlat, 1 ) + + " mm; enrot=" + to_string( vehicle->MoverParameters->enrot * 60, 0 ) + + " tmrot=" + to_string( std::abs( vehicle->MoverParameters->nrot ) * vehicle->MoverParameters->Transmision.Ratio * 60, 0 ) + + "; ventrot=" + to_string( vehicle->MoverParameters->RventRot, 1 ); uitextline2 = "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) @@ -2188,14 +2186,14 @@ world_environment::update() { auto const skydomecolour = m_skydome.GetAverageColor(); auto const skydomehsv = RGBtoHSV( skydomecolour ); // sun strength is reduced by overcast level - keylightintensity *= ( 1.0f - Global::Overcast * 0.65f ); + keylightintensity *= ( 1.0f - std::min( 1.f, Global::Overcast ) * 0.65f ); // intensity combines intensity of the sun and the light reflected by the sky dome // it'd be more technically correct to have just the intensity of the sun here, // but whether it'd _look_ better is something to be tested auto const intensity = std::min( 1.15f * ( 0.05f + keylightintensity + skydomehsv.z ), 1.25f ); // the impact of sun component is reduced proportionally to overcast level, as overcast increases role of ambient light - auto const diffuselevel = interpolate( keylightintensity, intensity * ( 1.0f - twilightfactor ), 1.0f - Global::Overcast * 0.75f ); + auto const diffuselevel = interpolate( keylightintensity, intensity * ( 1.0f - twilightfactor ), 1.0f - std::min( 1.f, Global::Overcast ) * 0.75f ); // ...update light colours and intensity. keylightcolor = keylightcolor * diffuselevel; Global::DayLight.diffuse = glm::vec4( keylightcolor, Global::DayLight.diffuse.a ); diff --git a/mouseinput.cpp b/mouseinput.cpp index ddf8bee6..370d6b85 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -342,6 +342,15 @@ mouse_input::default_bindings() { { "radio_sw:", { user_command::radiotoggle, user_command::none } }, + { "radiochannel_sw:", { + user_command::radiochannelincrease, + user_command::radiochanneldecrease } }, + { "radiochannelprev_sw:", { + user_command::radiochanneldecrease, + user_command::none } }, + { "radiochannelnext_sw:", { + user_command::radiochannelincrease, + user_command::none } }, { "pantfront_sw:", { user_command::pantographtogglefront, user_command::none } }, diff --git a/mouseinput.h b/mouseinput.h index 346ab4e9..9c7a853e 100644 --- a/mouseinput.h +++ b/mouseinput.h @@ -34,10 +34,6 @@ private: user_command left; user_command right; - - mouse_commands( user_command const Left, user_command const Right ): - left(Left), right(Right) - {} }; typedef std::unordered_map controlcommands_map; diff --git a/renderer.cpp b/renderer.cpp index 7335c7b3..9eb9f84d 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1453,7 +1453,7 @@ opengl_renderer::Render( world_environment *Environment ) { GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( interpolate( Environment->m_skydome.GetAverageColor(), suncolor, duskfactor * 0.25f ) - * ( 1.0f - Global::Overcast * 0.5f ) // overcast darkens the clouds + * interpolate( 1.f, 0.35f, Global::Overcast / 2.f ) // overcast darkens the clouds * 2.5f // arbitrary adjustment factor ) ); // render @@ -3135,11 +3135,17 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { static_cast( TSubModel::fSquareDist / Submodel->fSquareMaxDist ) ); // pozycja punktu świecącego względem kamery Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.f, 0.f, -1.f, 1.f ) - lightcenter ), glm::normalize( -lightcenter ) ); - float glarelevel = 0.6f; // luminosity at night is at level of ~0.1, so the overall resulting transparency is ~0.5 at full 'brightness' + float glarelevel = 0.6f; // luminosity at night is at level of ~0.1, so the overall resulting transparency in clear conditions is ~0.5 at full 'brightness' if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) { - + // only bother if the viewer is inside the visibility cone + if( Global::Overcast > 1.0 ) { + // increase the glare in rainy/foggy conditions + glarelevel += std::max( 0.f, 0.5f * ( Global::Overcast - 1.f ) ); + } + // scale it down based on view angle glarelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); - glarelevel = std::max( 0.0f, glarelevel - static_cast(Global::fLuminance) ); + // reduce the glare in bright daylight + glarelevel = clamp( glarelevel - static_cast(Global::fLuminance), 0.f, 1.f ); if( glarelevel > 0.0f ) { // setup diff --git a/simulation.cpp b/simulation.cpp index 2b006a55..7fa73290 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -164,7 +164,7 @@ state_manager::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad std::string token { Input.getToken() }; if( token != "endatmo" ) { // optional overcast parameter - Global::Overcast = clamp( std::stof( token ), 0.f, 1.f ); + Global::Overcast = clamp( std::stof( token ), 0.f, 2.f ); } while( ( false == token.empty() ) && ( token != "endatmo" ) ) { diff --git a/skydome.cpp b/skydome.cpp index 342a8e00..984e1e19 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -275,8 +275,8 @@ void CSkyDome::RebuildColors() { float const y = PerezFunctionO2( perezy, icostheta, gamma, cosgamma2, zenithy ); // luminance(Y) for clear & overcast sky - float const yclear = PerezFunctionO2( perezluminance, icostheta, gamma, cosgamma2, zenithluminance ); - float const yover = zenithluminance * ( 1.0f + 2.0f * vertex.y ) / 3.0f; + float const yclear = std::max( 0.01f, PerezFunctionO2( perezluminance, icostheta, gamma, cosgamma2, zenithluminance ) ); + float const yover = std::max( 0.01f, zenithluminance * ( 1.0f + 2.0f * vertex.y ) / 3.0f ); float const Y = interpolate( yclear, yover, m_overcast ); float const X = (x / y) * Y; diff --git a/translation.h b/translation.h index a9831f81..3abc7bb5 100644 --- a/translation.h +++ b/translation.h @@ -63,6 +63,9 @@ static std::unordered_map m_cabcontrols = { { "converteroff_sw:", "converter" }, { "main_sw:", "line breaker" }, { "radio_sw:", "radio" }, + { "radiochannel_sw:", "radio channel" }, + { "radiochannelprev_sw:", "radio channel" }, + { "radiochannelnext_sw:", "radio channel" }, { "pantfront_sw:", "pantograph A" }, { "pantrear_sw:", "pantograph B" }, { "pantfrontoff_sw:", "pantograph A" }, diff --git a/version.h b/version.h index 2ca029a2..7ed4a66e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 119 +#define VERSION_MINOR 122 #define VERSION_REVISION 0 From 9d008d2a3e0089fc92993f2fdb17fb14619f6d08 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 24 Jan 2018 22:27:58 +0100 Subject: [PATCH 262/426] additional motor ventilator parameters exposed in .fiz file, motor ventilator spin rate tweaks, mouse support for radiostop commands, restricted speed mode for driver ai, passed signals scanning fix, mouse and keyboard command input rate unification, basic material textures priority system --- Driver.cpp | 143 +++++++++++++++++++++++++-------------------- Driver.h | 5 +- DynObj.cpp | 79 ++++++++++++------------- Globals.cpp | 1 + Globals.h | 1 + McZapkie/MOVER.h | 7 ++- McZapkie/Mover.cpp | 25 +++++++- Segment.h | 6 +- Track.cpp | 43 +++++++++----- Track.h | 2 +- Train.cpp | 54 ++++++++++++++++- Train.h | 5 ++ World.cpp | 14 ++--- command.cpp | 1 + command.h | 1 + keyboardinput.cpp | 4 +- material.cpp | 12 +++- material.h | 9 ++- mouseinput.cpp | 42 +++++++------ mouseinput.h | 1 + renderer.cpp | 3 +- translation.h | 2 + version.h | 2 +- 23 files changed, 299 insertions(+), 163 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 9135c524..1dcb3123 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -253,18 +253,21 @@ void TSpeedPos::CommandCheck() break; default: // inna komenda w evencie skanowanym powoduje zatrzymanie i wysłanie tej komendy - iFlags &= ~(spShuntSemaphor | spPassengerStopPoint | - spStopOnSBL); // nie manewrowa, nie przystanek, nie zatrzymać na SBL - fVelNext = 0.0; // jak nieznana komenda w komórce sygnałowej, to zatrzymujemy + // nie manewrowa, nie przystanek, nie zatrzymać na SBL + iFlags &= ~(spShuntSemaphor | spPassengerStopPoint | spStopOnSBL); + // jak nieznana komenda w komórce sygnałowej, to zatrzymujemy + fVelNext = 0.0; } }; bool TSpeedPos::Update() { - if( fDist < 0.0 ) - iFlags |= spElapsed; // trzeba zazanaczyć, że minięty - if (iFlags & spTrack) // road/track - { + if( fDist < 0.0 ) { + // trzeba zazanaczyć, że minięty + iFlags |= spElapsed; + } + if (iFlags & spTrack) { + // road/track if (trTrack) { // może być NULL, jeśli koniec toru (???) fVelNext = trTrack->VelocityGet(); // aktualizacja prędkości (może być zmieniana eventem) @@ -301,10 +304,15 @@ bool TSpeedPos::Update() } } } - else if (iFlags & spEvent) // jeśli event - { // odczyt komórki pamięci najlepiej by było zrobić jako notyfikację, czyli zmiana komórki - // wywoła jakąś podaną funkcję - CommandCheck(); // sprawdzenie typu komendy w evencie i określenie prędkości + else if (iFlags & spEvent) { + // jeśli event + if( ( ( iFlags & spElapsed ) == 0 ) + || ( fVelNext == 0.0 ) ) { + // ignore already passed signals, but keep an eye on overrun stops + // odczyt komórki pamięci najlepiej by było zrobić jako notyfikację, + // czyli zmiana komórki wywoła jakąś podaną funkcję + CommandCheck(); // sprawdzenie typu komendy w evencie i określenie prędkości + } } return false; }; @@ -1107,23 +1115,28 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // koniec toru) } } - else if (sSpeedTable[i].iFlags & spStopOnSBL) - { // jeśli S1 na SBL - if (mvOccupied->Vel < 2.0) // stanąć nie musi, ale zwolnić przynajmniej - if (sSpeedTable[i].fDist < fMaxProximityDist) // jest w maksymalnym zasięgu - { - eSignSkip = sSpeedTable[i] - .evEvent; // to można go pominąć (wziąć drugą prędkosć) - iDrivigFlags |= moveVisibility; // jazda na widoczność - skanować - // możliwość kolizji i nie podjeżdżać - // zbyt blisko + else if (sSpeedTable[i].iFlags & spStopOnSBL) { + // jeśli S1 na SBL + if( mvOccupied->Vel < 2.0 ) { + // stanąć nie musi, ale zwolnić przynajmniej + if( ( sSpeedTable[ i ].fDist < fMaxProximityDist ) + && ( TrackBlock() > 1000.0 ) ) { + // jest w maksymalnym zasięgu to można go pominąć (wziąć drugą prędkosć) + // as long as there isn't any obstacle in arbitrary view range + eSignSkip = sSpeedTable[ i ].evEvent; + // jazda na widoczność - skanować możliwość kolizji i nie podjeżdżać zbyt blisko // usunąć flagę po podjechaniu blisko semafora zezwalającego na jazdę - // ostrożnie interpretować sygnały - semafor może zezwalać na jazdę - // pociągu z przodu! + // ostrożnie interpretować sygnały - semafor może zezwalać na jazdę pociągu z przodu! + iDrivigFlags |= moveVisibility; + // store the ordered restricted speed and don't exceed it until the flag is cleared + VelRestricted = sSpeedTable[ i ].evEvent->ValueGet( 2 ); } - if (eSignSkip != sSpeedTable[i].evEvent) // jeśli ten SBL nie jest do pominięcia - // TODO sprawdzić do której zmiennej jest przypisywane v i zmienić to tutaj - v = sSpeedTable[i].evEvent->ValueGet(1); // to ma 0 odczytywać + } + if( eSignSkip != sSpeedTable[ i ].evEvent ) { + // jeśli ten SBL nie jest do pominięcia to ma 0 odczytywać + v = sSpeedTable[ i ].evEvent->ValueGet( 1 ); + // TODO sprawdzić do której zmiennej jest przypisywane v i zmienić to tutaj + } } else if (sSpeedTable[i].IsProperSemaphor(OrderCurrentGet())) { // to semaphor @@ -1230,41 +1243,42 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } } } - else if (!(sSpeedTable[i].iFlags & spSectionVel)) //jeśli jakiś event pasywny ale nie ograniczenie - if (go == cm_Unknown) // jeśli nie było komendy wcześniej - pierwsza się liczy - // - ustawianie VelSignal - if (v < 0.0 ? true : v >= 1.0) // bo wartość 0.1 służy do hamowania tylko - { - go = cm_SetVelocity; // może odjechać - // Ra 2014-06: (VelSignal) nie może być tu ustawiane, bo semafor może - // być daleko - // VelSignal=v; //nie do końca tak, to jest druga prędkość; -1 nie - // wpisywać... - if (VelSignal == 0.0) - VelSignal = -1.0; // aby stojący ruszył - if (sSpeedTable[i].fDist < 0.0) // jeśli przejechany - { - VelSignal = (v != 0 ? -1.0 : 0.0); - // ustawienie, gdy przejechany jest lepsze niż - // wcale, ale to jeszcze nie to - if (sSpeedTable[i].iFlags & spEvent) // jeśli event - if ((sSpeedTable[i].evEvent != eSignSkip) ? - true : - (sSpeedTable[i].fVelNext != 0.0)) // ale inny niż ten, - // na którym minięto - // S1, chyba że się - // już zmieniło - iDrivigFlags &= ~moveVisibility; // sygnał zezwalający na - // jazdę wyłącza jazdę na - // widoczność (S1 na SBL) - - // usunąć jeśli nie jest ograniczeniem prędkości - sSpeedTable[i].iFlags = - 0; // to można usunąć (nie mogą być usuwane w skanowaniu) + else if( !( sSpeedTable[ i ].iFlags & spSectionVel ) ) { + //jeśli jakiś event pasywny ale nie ograniczenie + if( go == cm_Unknown ) { + // jeśli nie było komendy wcześniej - pierwsza się liczy - ustawianie VelSignal + if( ( v < 0.0 ) + || ( v >= 1.0 ) ) { + // bo wartość 0.1 służy do hamowania tylko + go = cm_SetVelocity; // może odjechać + // Ra 2014-06: (VelSignal) nie może być tu ustawiane, bo semafor może być daleko + // VelSignal=v; //nie do końca tak, to jest druga prędkość; -1 nie wpisywać... + if( VelSignal == 0.0 ) { + // aby stojący ruszył + VelSignal = -1.0; + } + if( sSpeedTable[ i ].fDist < 0.0 ) { + // jeśli przejechany + VelSignal = ( v == 0.0 ? 0.0 : -1.0 ); + // ustawienie, gdy przejechany jest lepsze niż wcale, ale to jeszcze nie to + if( sSpeedTable[ i ].iFlags & spEvent ) { + // jeśli event + if( ( sSpeedTable[ i ].evEvent != eSignSkip ) + || ( sSpeedTable[ i ].fVelNext != VelRestricted ) ) { + // ale inny niż ten, na którym minięto S1, chyba że się już zmieniło + // sygnał zezwalający na jazdę wyłącza jazdę na widoczność (po S1 na SBL) + iDrivigFlags &= ~moveVisibility; + // remove restricted speed + VelRestricted = -1.0; + } + } + // jeśli nie jest ograniczeniem prędkości to można usunąć + // (nie mogą być usuwane w skanowaniu) + sSpeedTable[ i ].iFlags = 0; } } - else if (sSpeedTable[i].evEvent->StopCommand()) - { // jeśli prędkość jest zerowa, a komórka zawiera komendę + else if( sSpeedTable[ i ].evEvent->StopCommand() ) { + // jeśli prędkość jest zerowa, a komórka zawiera komendę eSignNext = sSpeedTable[ i ].evEvent; // dla informacji if( true == TestFlag( iDrivigFlags, moveStopHere ) ) { // jeśli ma stać, dostaje komendę od razu @@ -1276,6 +1290,8 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN go = cm_Command; // komenda z komórki, do wykonania po zatrzymaniu } } + } + } } // jeśli nie ma zawalidrogi } // jeśli event if (v >= 0.0) @@ -1366,7 +1382,9 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN fVelDes = Min0R(fVelDes, VelLimitLast); if (VelRoad >= 0.0) fVelDes = Min0R(fVelDes, VelRoad); - // nastepnego semafora albo zwrotnicy to uznajemy, że mijamy W5 + if( VelRestricted >= 0.0 ) + fVelDes = Min0R( fVelDes, VelRestricted ); + // nastepnego semafora albo zwrotnicy to uznajemy, że mijamy W5 FirstSemaphorDist = d_to_next_sem; // przepisanie znalezionej wartosci do zmiennej return go; }; @@ -3740,7 +3758,6 @@ TController::UpdateSituation(double dt) { // check for potential colliders { - auto const collisionscanrange = 300.0 + fBrakeDist; auto rearvehicle = ( pVehicles[ 0 ] == pVehicles[ 1 ] ? pVehicles[ 0 ] : @@ -3764,7 +3781,7 @@ TController::UpdateSituation(double dt) { pVehicle->DirectionGet() == pVehicles[ 0 ]->DirectionGet() ? 1 : -1 ), - collisionscanrange ); + routescanrange ); } else { // towards coupler 1 @@ -3782,7 +3799,7 @@ TController::UpdateSituation(double dt) { pVehicle->DirectionGet() == pVehicles[ 0 ]->DirectionGet() ? -1 : 1 ), - collisionscanrange ); + routescanrange ); } } diff --git a/Driver.h b/Driver.h index 628f69dd..966c0887 100644 --- a/Driver.h +++ b/Driver.h @@ -152,7 +152,7 @@ class TSpeedPos inline void UpdateDistance( double dist ) { - fDist -= dist; } + fDist -= dist; } bool Set(TEvent *e, double d, TOrders order = Wait_for_orders); void Set(TTrack *t, double d, int f); std::string TableText(); @@ -224,7 +224,7 @@ private: double LastReactionTime = 0.0; double fActionTime = 0.0; // czas używany przy regulacji prędkości i zamykaniu drzwi double m_radiocontroltime{ 0.0 }; // timer used to control speed of radio operations - TAction eAction = actSleep; // aktualny stan + TAction eAction { actUnknown }; // aktualny stan public: inline TAction GetAction() { @@ -258,6 +258,7 @@ private: double VelLimitLast = -1.0; // prędkość zadana przez ograniczenie // ostatnie ograniczenie bez ograniczenia double VelRoad = -1.0; // aktualna prędkość drogowa (ze znaku W27) (PutValues albo komendą) // prędkość drogowa bez ograniczenia double VelNext = 120.0; // prędkość, jaka ma być po przejechaniu długości ProximityDist + double VelRestricted = -1.0; // speed of travel after passing a permissive signal at stop private: double fProximityDist = 0.0; // odleglosc podawana w SetProximityVelocity(); >0:przeliczać do punktu, <0:podana wartość double FirstSemaphorDist = 10000.0; // odległość do pierwszego znalezionego semafora diff --git a/DynObj.cpp b/DynObj.cpp index de857e76..21f91194 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -915,14 +915,12 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) smWahacze[i]->SetRotate(float3(1, 0, 0), fWahaczeAmp * cos(MoverParameters->eAngle)); - if (Mechanik) { + if( ( Mechanik != nullptr ) + && ( Mechanik->GetAction() != actSleep ) ) { // rysowanie figurki mechanika - if( MoverParameters->ActiveCab > 0 ) { - btMechanik1.Turn( true ); - btnOn = true; - } - if( MoverParameters->ActiveCab < 0 ) { - btMechanik2.Turn( true ); + btMechanik1.Turn( MoverParameters->ActiveCab > 0 ); + btMechanik2.Turn( MoverParameters->ActiveCab < 0 ); + if( MoverParameters->ActiveCab != 0 ) { btnOn = true; } } @@ -2309,7 +2307,7 @@ void TDynamicObject::Move(double fDistance) { // liczymy proporcję double d = Axle0.GetTranslation(); // aktualne położenie na torze if (Axle0.GetDirection() < 0) - d = t0->fTrackLength - d; // od drugiej strony liczona długość + d = t0->Length() - d; // od drugiej strony liczona długość d /= fAxleDist; // rozsataw osi procentowe znajdowanie się na torze float shadefrom = 1.0f, shadeto = 1.0f; @@ -3483,9 +3481,9 @@ void TDynamicObject::RenderSounds() { if( Global::iPause != 0 ) { return; } - double const dt { Timer::GetDeltaRenderTime() }; - double volume { 0.0 }; - double frequency { 1.0 }; + double const dt{ Timer::GetDeltaRenderTime() }; + double volume{ 0.0 }; + double frequency{ 1.0 }; m_powertrainsounds.render( *MoverParameters, dt ); @@ -3493,8 +3491,8 @@ void TDynamicObject::RenderSounds() { if( MoverParameters->ConverterFlag ) { frequency = ( MoverParameters->EngineType == ElectricSeriesMotor ? - ( MoverParameters->RunningTraction.TractionVoltage / MoverParameters->NominalVoltage ) * MoverParameters->RList[ MoverParameters->RlistSize ].Mn : - 1.0 ); + ( MoverParameters->RunningTraction.TractionVoltage / MoverParameters->NominalVoltage ) * MoverParameters->RList[ MoverParameters->RlistSize ].Mn : + 1.0 ); frequency = sConverter.m_frequencyoffset + sConverter.m_frequencyfactor * frequency; sConverter .pitch( clamp( frequency, 0.5, 1.25 ) ) // arbitrary limits ) @@ -3526,7 +3524,7 @@ void TDynamicObject::RenderSounds() { // brake system and braking sounds: if( m_lastbrakepressure != -1.f ) { // calculate rate of pressure drop in brake cylinder, once it's been initialized - auto const brakepressuredifference { m_lastbrakepressure - MoverParameters->BrakePress }; + auto const brakepressuredifference{ m_lastbrakepressure - MoverParameters->BrakePress }; m_brakepressurechange = interpolate( m_brakepressurechange, brakepressuredifference / dt, 0.005f ); } m_lastbrakepressure = MoverParameters->BrakePress; @@ -3562,9 +3560,9 @@ void TDynamicObject::RenderSounds() { if( MoverParameters->SlippingWheels ) { if( ( MoverParameters->UnitBrakeForce > 100.0 ) - && ( GetVelocity() > 1.0 ) ) { + && ( GetVelocity() > 1.0 ) ) { - auto const velocitydifference { GetVelocity() / MoverParameters->Vmax }; + auto const velocitydifference{ GetVelocity() / MoverParameters->Vmax }; rsSlippery .gain( rsSlippery.m_amplitudeoffset + rsSlippery.m_amplitudefactor * velocitydifference ) .play( sound_flags::exclusive | sound_flags::looping ); @@ -3582,10 +3580,10 @@ void TDynamicObject::RenderSounds() { sSand.stop(); } - auto brakeforceratio { 0.0 }; + auto brakeforceratio{ 0.0 }; if( //( false == mvOccupied->SlippingWheels ) && ( MoverParameters->UnitBrakeForce > 10.0 ) - && ( MoverParameters->Vel > 0.05 ) ) { + && ( MoverParameters->Vel > 0.05 ) ) { brakeforceratio = clamp( @@ -3639,7 +3637,7 @@ void TDynamicObject::RenderSounds() { } // NBMX Obsluga drzwi, MC: zuniwersalnione if( ( true == MoverParameters->DoorLeftOpened ) - && ( dDoorMoveL < MoverParameters->DoorMaxShiftL ) ) { + && ( dDoorMoveL < MoverParameters->DoorMaxShiftL ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x > 0.f ) { @@ -3650,7 +3648,7 @@ void TDynamicObject::RenderSounds() { } } if( ( false == MoverParameters->DoorLeftOpened ) - && ( dDoorMoveL > 0.01 ) ) { + && ( dDoorMoveL > 0.01 ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x > 0.f ) { @@ -3661,7 +3659,7 @@ void TDynamicObject::RenderSounds() { } } if( ( true == MoverParameters->DoorRightOpened ) - && ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) ) { + && ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x < 0.f ) { @@ -3672,7 +3670,7 @@ void TDynamicObject::RenderSounds() { } } if( ( false == MoverParameters->DoorRightOpened ) - && ( dDoorMoveR > 0.01 ) ) { + && ( dDoorMoveR > 0.01 ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x < 0.f ) { @@ -3699,15 +3697,15 @@ void TDynamicObject::RenderSounds() { if( ( GetVelocity() > 0.5 ) && ( false == rsOuterNoise.empty() ) && ( // compound test whether the vehicle belongs to user-driven consist (as these don't emit outer noise in cab view) - FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise - // Global::pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) - ctOwner == nullptr ? true : // standalone vehicle, can't be part of user-driven train - ctOwner != Global::pWorld->train()->Dynamic()->ctOwner ? true : // confirmed isn't a part of the user-driven train - Global::CabWindowOpen ? true : // sticking head out we get to hear outer noise - false ) ) { + FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise + // Global::pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) + ctOwner == nullptr ? true : // standalone vehicle, can't be part of user-driven train + ctOwner != Global::pWorld->train()->Dynamic()->ctOwner ? true : // confirmed isn't a part of the user-driven train + Global::CabWindowOpen ? true : // sticking head out we get to hear outer noise + false ) ) { - // frequency calculation - auto const normalizer { ( + // frequency calculation + auto const normalizer{ ( true == rsOuterNoise.is_combined() ? MoverParameters->Vmax * 0.01f : 1.f ) }; @@ -3749,15 +3747,18 @@ void TDynamicObject::RenderSounds() { rsOuterNoise.stop( false == FreeFlyModeFlag ); } // flat spot sound - if( ( GetVelocity() > 1.0 ) - && ( MoverParameters->WheelFlat > 5.0 ) ) { - m_wheelflat - .pitch( m_wheelflat.m_frequencyoffset + std::abs( MoverParameters->nrot ) * m_wheelflat.m_frequencyfactor ) - .gain( m_wheelflat.m_amplitudeoffset + m_wheelflat.m_amplitudefactor * ( ( 1.0 + ( MoverParameters->Vel / MoverParameters->Vmax ) + clamp( MoverParameters->WheelFlat / 60.0, 0.0, 1.0 ) ) / 3.0 ) ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - m_wheelflat.stop(); + if( MoverParameters->CategoryFlag == 1 ) { + // trains only + if( ( GetVelocity() > 1.0 ) + && ( MoverParameters->WheelFlat > 5.0 ) ) { + m_wheelflat + .pitch( m_wheelflat.m_frequencyoffset + std::abs( MoverParameters->nrot ) * m_wheelflat.m_frequencyfactor ) + .gain( m_wheelflat.m_amplitudeoffset + m_wheelflat.m_amplitudefactor * ( ( 1.0 + ( MoverParameters->Vel / MoverParameters->Vmax ) + clamp( MoverParameters->WheelFlat / 60.0, 0.0, 1.0 ) ) / 3.0 ) ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + m_wheelflat.stop(); + } } // youBy: dzwiek ostrych lukow i ciasnych zwrotek diff --git a/Globals.cpp b/Globals.cpp index 4dd3d0ff..080bc445 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -68,6 +68,7 @@ double Global::fFogStart = 1700; double Global::fFogEnd = 2000; float Global::Overcast { 0.1f }; // NOTE: all this weather stuff should be moved elsewhere std::string Global::Season; // season of the year, based on simulation date +std::string Global::Weather { "clear" }; // current weather float Global::BaseDrawRange { 2500.f }; opengl_light Global::DayLight; diff --git a/Globals.h b/Globals.h index 8213e37a..806e2585 100644 --- a/Globals.h +++ b/Globals.h @@ -189,6 +189,7 @@ public: static double fFogStart; static double fFogEnd; static std::string Season; // season of the year, based on simulation date + static std::string Weather; // current weather // TODO: put these things in the renderer static float BaseDrawRange; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 1f4c934f..24094d74 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -84,8 +84,6 @@ extern int ConversionError; const double Steel2Steel_friction = 0.15; //tarcie statyczne const double g = 9.81; //przyspieszenie ziemskie const double SandSpeed = 0.1; //ile kg/s} -const double RVentSpeed = 3.5; //rozpedzanie sie wentylatora obr/s^2} -const double RVentMinI = 50.0; //przy jakim pradzie sie wylaczaja} const double Pirazy2 = 6.2831853071794f; #define PI 3.1415926535897f @@ -739,7 +737,8 @@ public: double u = 0.0; //wspolczynnik tarcia yB wywalic!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! double CircuitRes = 0.0; /*rezystancje silnika i obwodu*/ int IminLo = 0; int IminHi = 0; /*prady przelacznika automatycznego rozruchu, uzywane tez przez ai_driver*/ - int ImaxLo = 0; int ImaxHi = 0; /*maksymalny prad niskiego i wysokiego rozruchu*/ + int ImaxLo = 0; // maksymalny prad niskiego rozruchu + int ImaxHi = 0; // maksymalny prad wysokiego rozruchu double nmax = 0.0; /*maksymalna dop. ilosc obrotow /s*/ double InitialCtrlDelay = 0.0; double CtrlDelay = 0.0; /* -//- -//- miedzy kolejnymi poz.*/ double CtrlDownDelay = 0.0; /* -//- -//- przy schodzeniu z poz.*/ /*hunter-101012*/ @@ -752,6 +751,8 @@ public: int RVentType = 0; /*0 - brak, 1 - jest, 2 - automatycznie wlaczany*/ double RVentnmax = 1.0; /*maks. obroty wentylatorow oporow rozruchowych*/ double RVentCutOff = 0.0; /*rezystancja wylaczania wentylatorow dla RVentType=2*/ + double RVentSpeed { 0.5 }; //rozpedzanie sie wentylatora obr/s^2} + double RVentMinI { 50.0 }; //przy jakim pradzie sie wylaczaja} int CompressorPower = 1; /*0: bezp. z obwodow silnika, 1: z przetwornicy, reczne, 2: w przetwornicy, stale, 5: z silnikowego*/ int SmallCompressorPower = 0; /*Winger ZROBIC*/ bool Trafo = false; /*pojazd wyposażony w transformator*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 54f5cfff..1f865215 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4252,7 +4252,7 @@ double TMoverParameters::TractionForce(double dt) RventRot += ( RVentnmax - RventRot ) * RVentSpeed * dt; } else { - RventRot = std::max( 0.0, RventRot - RVentSpeed * dt ); + RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); } break; } @@ -4260,14 +4260,30 @@ double TMoverParameters::TractionForce(double dt) case 2: { // automatic if( ( std::abs( Itot ) > RVentMinI ) && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { +/* RventRot += ( RVentnmax * abs( Itot ) / ( ImaxLo * RList[ MainCtrlActualPos ].Bn ) - RventRot ) * RVentSpeed * dt; +*/ + RventRot = std::min( + RVentnmax, + RventRot + + ( RVentnmax + * std::abs( Itot ) + * std::min( 1.25, ( ( std::abs( Itot ) / NPoweredAxles ) / RVentMinI ) ) + / ImaxLo + - RventRot ) + * RVentSpeed * dt ); +/* +RventRot = std::min( +RVentnmax, +RventRot + ( ( std::abs( Itot ) / ( RList[ MainCtrlActualPos ].Bn * RList[ MainCtrlActualPos ].Mn ) ) / RVentMinI ) * RVentSpeed * dt ); +*/ } else if( ( DynamicBrakeType == dbrake_automatic ) && ( true == DynamicBrakeFlag ) ) { RventRot += ( RVentnmax * Im / ImaxLo - RventRot ) * RVentSpeed * dt; } else { - RventRot = std::max( 0.0, RventRot - RVentSpeed * dt ); + RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); } break; } @@ -4278,8 +4294,9 @@ double TMoverParameters::TractionForce(double dt) } // rventtype } // mains else { - RventRot = std::max( 0.0, RventRot - RVentSpeed * dt ); + RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); } + break; } case DieselElectric: { @@ -7739,6 +7756,8 @@ void TMoverParameters::LoadFIZ_RList( std::string const &Input ) { RVentnmax /= 60.0; extract_value( RVentCutOff, "RVentCutOff", Input, "" ); } + extract_value( RVentMinI, "RVentMinI", Input, "" ); + extract_value( RVentSpeed, "RVentSpeed", Input, "" ); } void TMoverParameters::LoadFIZ_DList( std::string const &Input ) { diff --git a/Segment.h b/Segment.h index 319186c9..0cc000a8 100644 --- a/Segment.h +++ b/Segment.h @@ -19,9 +19,9 @@ class TSegment private: Math3D::vector3 Point1, CPointOut, CPointIn, Point2; float - fRoll1{ 0.f }, - fRoll2{ 0.f }; // przechyłka na końcach - double fLength = 0.0; // długość policzona + fRoll1 { 0.f }, + fRoll2 { 0.f }; // przechyłka na końcach + double fLength { -1.0 }; // długość policzona double *fTsBuffer = nullptr; // wartości parametru krzywej dla równych odcinków double fStep = 0.0; int iSegCount = 0; // ilość odcinków do rysowania krzywej diff --git a/Track.cpp b/Track.cpp index db3e1ebd..c40349f0 100644 --- a/Track.cpp +++ b/Track.cpp @@ -406,7 +406,12 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) if (Global::iWriteLogEnabled & 4) WriteLog(str); parser->getTokens(4); - *parser >> fTrackLength >> fTrackWidth >> fFriction >> fSoundDistance; + float discard {}; + *parser + >> discard + >> fTrackWidth + >> fFriction + >> fSoundDistance; fTrackWidth2 = fTrackWidth; // rozstaw/szerokość w punkcie 2, na razie taka sama parser->getTokens(2); *parser >> iQualityFlag >> iDamageFlag; @@ -485,30 +490,40 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) p2.y += 0.18; // na przechyłce doliczyć jeszcze pół przechyłki } - if( fRadius != 0 ) // gdy podany promień - segsize = clamp( std::fabs( fRadius ) * ( 0.02 / Global::SplineFidelity ), 2.0 / Global::SplineFidelity, 10.0 ); + + if( ( ( ( p1 + p1 + p2 ) / 3.0 - p1 - cp1 ).Length() < 0.02 ) + || ( ( ( p1 + p2 + p2 ) / 3.0 - p2 + cp1 ).Length() < 0.02 ) ) { + // "prostowanie" prostych z kontrolnymi, dokładność 2cm + cp1 = cp2 = Math3D::vector3( 0, 0, 0 ); + } + + if( fRadius != 0 ) { + // gdy podany promień + segsize = clamp( std::abs( fRadius ) * ( 0.02 / Global::SplineFidelity ), 2.0 / Global::SplineFidelity, 10.0 ); + } else { // HACK: crude check whether claimed straight is an actual straight piece - // NOTE: won't detect cases where control points are placed on the straight line formed by the ends, but, eh if( ( cp1 == Math3D::vector3() ) - && ( cp1 == Math3D::vector3() ) ) { + && ( cp2 == Math3D::vector3() ) ) { segsize = 10.0; // for straights, 10m per segment works good enough } else { // HACK: divide roughly in 10 segments. - segsize = clamp( fTrackLength * ( 0.1 / Global::SplineFidelity ), 2.0 / Global::SplineFidelity, 10.0 ); + segsize = clamp( ( p1 - p2 ).Length() * ( 0.1 / Global::SplineFidelity ), 2.0 / Global::SplineFidelity, 10.0 ); } } - if ((((p1 + p1 + p2) / 3.0 - p1 - cp1).Length() < 0.02) || - (((p1 + p2 + p2) / 3.0 - p2 + cp1).Length() < 0.02)) - cp1 = cp2 = vector3(0, 0, 0); //"prostowanie" prostych z kontrolnymi, dokładność 2cm + if( ( cp1 == vector3( 0, 0, 0 ) ) + && ( cp2 == vector3( 0, 0, 0 ) ) ) { + // Ra: hm, czasem dla prostego są podane... + // gdy prosty, kontrolne wyliczane przy zmiennej przechyłce + Segment->Init( p1, p2, segsize, r1, r2 ); + } + else { + // gdy łuk (ustawia bCurve=true) + Segment->Init( p1, cp1 + p1, cp2 + p2, p2, segsize, r1, r2 ); + } - if ((cp1 == vector3(0, 0, 0)) && - (cp2 == vector3(0, 0, 0))) // Ra: hm, czasem dla prostego są podane... - Segment->Init(p1, p2, segsize, r1, r2); // gdy prosty, kontrolne wyliczane przy zmiennej przechyłce - else - Segment->Init(p1, cp1 + p1, cp2 + p2, p2, segsize, r1, r2); // gdy łuk (ustawia bCurve=true) if ((r1 != 0) || (r2 != 0)) iTrapezoid = 1; // są przechyłki do uwzględniania w rysowaniu if (eType == tt_Table) // obrotnica ma doklejkę diff --git a/Track.h b/Track.h index 3af0fbcd..ee569462 100644 --- a/Track.h +++ b/Track.h @@ -184,7 +184,7 @@ private: double fVelocity = -1.0; // ograniczenie prędkości // prędkość dla AI (powyżej rośnie prawdopowobieństwo wykolejenia) public: // McZapkie-100502: - double fTrackLength = 100.0; // długość z wpisu, nigdzie nie używana +// double fTrackLength = 100.0; // długość z wpisu, nigdzie nie używana double fRadius = 0.0; // promień, dla zwrotnicy kopiowany z tabeli bool ScannedFlag = false; // McZapkie: do zaznaczania kolorem torów skanowanych przez AI TGroundNode *nFouling[ 2 ] = { nullptr, nullptr }; // współrzędne ukresu albo oporu kozła diff --git a/Train.cpp b/Train.cpp index 529d8ba1..0b81c1ea 100644 --- a/Train.cpp +++ b/Train.cpp @@ -285,6 +285,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::radiotoggle, &TTrain::OnCommand_radiotoggle }, { user_command::radiochannelincrease, &TTrain::OnCommand_radiochannelincrease }, { user_command::radiochanneldecrease, &TTrain::OnCommand_radiochanneldecrease }, + { user_command::radiostopsend, &TTrain::OnCommand_radiostopsend }, { user_command::radiostoptest, &TTrain::OnCommand_radiostoptest }, { user_command::cabchangeforward, &TTrain::OnCommand_cabchangeforward }, { user_command::cabchangebackward, &TTrain::OnCommand_cabchangebackward }, @@ -3104,11 +3105,33 @@ void TTrain::OnCommand_radiochanneldecrease( TTrain *Train, command_data const & } } +void TTrain::OnCommand_radiostopsend( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + if( true == Train->mvOccupied->Radio ) { + simulation::Region->RadioStop( Train->Dynamic()->GetPosition() ); + } + // visual feedback + Train->ggRadioStop.UpdateValue( 1.0 ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggRadioStop.UpdateValue( 0.0 ); + } +} void TTrain::OnCommand_radiostoptest( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { - Train->Dynamic()->RadioStop(); + if( Train->RadioChannel() == 10 ) { + Train->Dynamic()->RadioStop(); + } + // visual feedback + Train->ggRadioTest.UpdateValue( 1.0 ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggRadioTest.UpdateValue( 0.0 ); } } @@ -3939,6 +3962,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaMaxSila.Turn(abs(mvControlled->Im) >= 350); btLampkaPrzekrMaxSila.Turn(abs(mvControlled->Im) >= 450); btLampkaRadio.Turn(mvOccupied->Radio); + btLampkaRadioStop.Turn( mvOccupied->Radio && mvOccupied->RadioStopFlag ); btLampkaHamulecReczny.Turn(mvOccupied->ManualBrakePos > 0); // NBMX wrzesien 2003 - drzwi oraz sygnał odjazdu btLampkaDoorLeft.Turn(mvOccupied->DoorLeftOpened); @@ -3974,6 +3998,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaMaxSila.Turn( false ); btLampkaPrzekrMaxSila.Turn( false ); btLampkaRadio.Turn( false ); + btLampkaRadioStop.Turn( false ); btLampkaHamulecReczny.Turn( false ); btLampkaDoorLeft.Turn( false ); btLampkaDoorRight.Turn( false ); @@ -4187,6 +4212,8 @@ bool TTrain::Update( double const Deltatime ) ggRadioChannelSelector.Update(); ggRadioChannelPrevious.Update(); ggRadioChannelNext.Update(); + ggRadioStop.Update(); + ggRadioTest.Update(); ggDepartureSignalButton.Update(); ggPantFrontButton.Update(); @@ -4563,6 +4590,15 @@ TTrain::update_sounds( double const Deltatime ) { } } + // radiostop + if( ( true == mvOccupied->Radio ) + && ( true == mvOccupied->RadioStopFlag ) ) { + m_radiostop.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + m_radiostop.stop(); + } + if( fTachoCount > 3.f ) { dsbHasler.play( sound_flags::exclusive | sound_flags::looping ); } @@ -4648,6 +4684,11 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) dsbBuzzer.deserialize( parser, sound_type::single ); dsbBuzzer.owner( DynamicObject ); } + else if( token == "radiostop:" ) { + // radiostop + m_radiostop.deserialize( parser, sound_type::single ); + m_radiostop.owner( DynamicObject ); + } else if (token == "slipalarm:") { // Bombardier 011010: alarm przy poslizgu: @@ -4787,7 +4828,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) &dsbSwitch, &dsbPneumaticSwitch, &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, &rsSBHissU, &rsFadeSound, &rsRunningNoise, - &dsbHasler, &dsbBuzzer, &dsbSlipAlarm, &m_radiosound + &dsbHasler, &dsbBuzzer, &dsbSlipAlarm, &m_radiosound, &m_radiostop }; for( auto sound : sounds ) { sound->offset( nullvector ); @@ -4967,6 +5008,9 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) if( m_radiosound.offset() == nullvector ) { m_radiosound.offset( btLampkaRadio.model_offset() ); } + if( m_radiostop.offset() == nullvector ) { + m_radiostop.offset( m_radiosound.offset() ); + } auto const localbrakeoffset { ggLocalBrake.model_offset() }; std::vector localbrakesounds = { &rsSBHiss, &rsSBHissU @@ -5183,6 +5227,8 @@ void TTrain::clear_cab_controls() ggRadioChannelSelector.Clear(); ggRadioChannelPrevious.Clear(); ggRadioChannelNext.Clear(); + ggRadioStop.Clear(); + ggRadioTest.Clear(); ggDoorLeftButton.Clear(); ggDoorRightButton.Clear(); ggDepartureSignalButton.Clear(); @@ -5242,6 +5288,7 @@ void TTrain::clear_cab_controls() btLampkaMaxSila.Clear(); btLampkaPrzekrMaxSila.Clear(); btLampkaRadio.Clear(); + btLampkaRadioStop.Clear(); btLampkaHamulecReczny.Clear(); btLampkaBlokadaDrzwi.Clear(); btInstrumentLight.Clear(); @@ -5502,6 +5549,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-maxft:", btLampkaMaxSila }, { "i-maxftt:", btLampkaPrzekrMaxSila }, { "i-radio:", btLampkaRadio }, + { "i-radiostop:", btLampkaRadioStop }, { "i-manual_brake:", btLampkaHamulecReczny }, { "i-door_blocked:", btLampkaBlokadaDrzwi }, { "i-slippery:", btLampkaPoslizg }, @@ -5655,6 +5703,8 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "radiochannel_sw:", ggRadioChannelSelector }, { "radiochannelprev_sw:", ggRadioChannelPrevious }, { "radiochannelnext_sw:", ggRadioChannelNext }, + { "radiostop_sw:", ggRadioStop }, + { "radiotest_sw:", ggRadioTest }, { "pantfront_sw:", ggPantFrontButton }, { "pantrear_sw:", ggPantRearButton }, { "pantfrontoff_sw:", ggPantFrontButtonOff }, diff --git a/Train.h b/Train.h index 48892cbe..99d4bbe7 100644 --- a/Train.h +++ b/Train.h @@ -211,6 +211,7 @@ class TTrain static void OnCommand_radiotoggle( TTrain *Train, command_data const &Command ); static void OnCommand_radiochannelincrease( TTrain *Train, command_data const &Command ); static void OnCommand_radiochanneldecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_radiostopsend( TTrain *Train, command_data const &Command ); static void OnCommand_radiostoptest( TTrain *Train, command_data const &Command ); static void OnCommand_cabchangeforward( TTrain *Train, command_data const &Command ); static void OnCommand_cabchangebackward( TTrain *Train, command_data const &Command ); @@ -274,6 +275,8 @@ public: // reszta może by?publiczna TGauge ggRadioChannelSelector; TGauge ggRadioChannelPrevious; TGauge ggRadioChannelNext; + TGauge ggRadioTest; + TGauge ggRadioStop; TGauge ggUpperLightButton; TGauge ggLeftLightButton; TGauge ggRightLightButton; @@ -357,6 +360,7 @@ public: // reszta może by?publiczna TButton btLampkaUkrotnienie; TButton btLampkaHamPosp; TButton btLampkaRadio; + TButton btLampkaRadioStop; TButton btLampkaHamowanie1zes; TButton btLampkaHamowanie2zes; TButton btLampkaOpory; @@ -458,6 +462,7 @@ public: // reszta może by?publiczna sound_source dsbSlipAlarm { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // Bombardier 011010: alarm przy poslizgu dla 181/182 sound_source m_radiosound { sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // cached template for radio messages std::vector m_radiomessages; // list of currently played radio messages + sound_source m_radiostop { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; int iCabLightFlag; // McZapkie:120503: oswietlenie kabiny (0: wyl, 1: przyciemnione, 2: pelne) bool bCabLight; // hunter-091012: czy swiatlo jest zapalone? diff --git a/World.cpp b/World.cpp index 4e580d6d..77404f11 100644 --- a/World.cpp +++ b/World.cpp @@ -629,11 +629,6 @@ void TWorld::OnKeyDown(int cKey) { Global::iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację } } - else if( ( cKey == GLFW_KEY_PAUSE ) && ( Global::ctrlState ) && ( Global::shiftState ) ) { - //[Ctrl]+[Break] hamowanie wszystkich pojazdów w okolicy // added shift to prevent odd issue with glfw producing pause presses on its own - if( Controlled->MoverParameters->Radio ) - simulation::Region->RadioStop( Camera.Pos ); - } else { if( ( true == DebugModeFlag ) @@ -1424,15 +1419,16 @@ TWorld::Update_UI() { uitextline4 += "Driver: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) + " Ad=" + to_string( vehicle->Mechanik->AccDesired, 2 ) - + " Ah=" + to_string( vehicle->Mechanik->fAccThreshold, 2 ) - + "@" + to_string( vehicle->Mechanik->fBrake_a0[0], 2 ) - + "+" + to_string( vehicle->Mechanik->fBrake_a1[0], 2 ) + + " Ah=" + to_string( vehicle->Mechanik->fAccThreshold, 2 ) + + "@" + to_string( vehicle->Mechanik->fBrake_a0[ 0 ], 2 ) + + "+" + to_string( vehicle->Mechanik->fBrake_a1[ 0 ], 2 ) + " Bd=" + to_string( vehicle->Mechanik->fBrakeDist, 0 ) + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ) + " VSl=" + to_string( vehicle->Mechanik->VelSignalLast, 0 ) + " VLl=" + to_string( vehicle->Mechanik->VelLimitLast, 0 ) - + " VRd=" + to_string( vehicle->Mechanik->VelRoad, 0 ); + + " VRd=" + to_string( vehicle->Mechanik->VelRoad, 0 ) + + " VRst=" + to_string( vehicle->Mechanik->VelRestricted, 0 ); if( ( vehicle->Mechanik->VelNext == 0.0 ) && ( vehicle->Mechanik->eSignNext ) ) { diff --git a/command.cpp b/command.cpp index e9d31988..6a2f72ff 100644 --- a/command.cpp +++ b/command.cpp @@ -76,6 +76,7 @@ commanddescription_sequence Commands_descriptions = { { "radiotoggle", command_target::vehicle }, { "radiochannelincrease", command_target::vehicle }, { "radiochanneldecrease", command_target::vehicle }, + { "radiostopsend", command_target::vehicle }, { "radiostoptest", command_target::vehicle }, // TBD, TODO: make cab change controls entity-centric { "cabchangeforward", command_target::vehicle }, diff --git a/command.h b/command.h index be604dd1..98a69caa 100644 --- a/command.h +++ b/command.h @@ -71,6 +71,7 @@ enum class user_command { radiotoggle, radiochannelincrease, radiochanneldecrease, + radiostopsend, radiostoptest, cabchangeforward, cabchangebackward, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 8071e9f3..2fde9b6d 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -42,7 +42,7 @@ keyboard_input::recall_bindings() { { ";", GLFW_KEY_SEMICOLON }, { "'", GLFW_KEY_APOSTROPHE }, { "enter", GLFW_KEY_ENTER }, { ",", GLFW_KEY_COMMA }, { ".", GLFW_KEY_PERIOD }, { "/", GLFW_KEY_SLASH }, { "space", GLFW_KEY_SPACE }, - { "insert", GLFW_KEY_INSERT },{ "delete", GLFW_KEY_DELETE }, { "home", GLFW_KEY_HOME }, { "end", GLFW_KEY_END }, + { "pause", GLFW_KEY_PAUSE }, { "insert", GLFW_KEY_INSERT }, { "delete", GLFW_KEY_DELETE }, { "home", GLFW_KEY_HOME }, { "end", GLFW_KEY_END }, // numpad block { "num_/", GLFW_KEY_KP_DIVIDE }, { "num_*", GLFW_KEY_KP_MULTIPLY }, { "num_-", GLFW_KEY_KP_SUBTRACT }, { "num_7", GLFW_KEY_KP_7 }, { "num_8", GLFW_KEY_KP_8 }, { "num_9", GLFW_KEY_KP_9 }, { "num_+", GLFW_KEY_KP_ADD }, @@ -281,6 +281,8 @@ keyboard_input::default_bindings() { { GLFW_KEY_R | keymodifier::shift }, // radiochanneldecrease { GLFW_KEY_R }, + // radiostopsend + { GLFW_KEY_PAUSE | keymodifier::shift | keymodifier::control }, // radiostoptest { GLFW_KEY_R | keymodifier::shift | keymodifier::control }, // cabchangeforward diff --git a/material.cpp b/material.cpp index ed224744..7e49e030 100644 --- a/material.cpp +++ b/material.cpp @@ -57,19 +57,27 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c ; // all work is done in the header } } + else if( key == Global::Weather ) { + // weather textures override generic and seasonal textures + while( true == deserialize_mapping( blockparser, 2, Loadnow ) ) { + ; // all work is done in the header + } + } } else if( key == "texture1:" ) { // TODO: full-fledged priority system if( ( texture1 == null_handle ) - || ( Priority > 0 ) ) { + || ( Priority > priority1 ) ) { texture1 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); + priority1 = Priority; } } else if( key == "texture2:" ) { // TODO: full-fledged priority system if( ( texture2 == null_handle ) - || ( Priority > 0 ) ) { + || ( Priority > priority2 ) ) { texture2 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); + priority2 = Priority; } } diff --git a/material.h b/material.h index 72093fc3..881c14b9 100644 --- a/material.h +++ b/material.h @@ -24,13 +24,20 @@ struct opengl_material { bool has_alpha { false }; // alpha state, calculated from presence of alpha in texture1 std::string name; -// methods: + +// methods bool deserialize( cParser &Input, bool const Loadnow ); + private: +// methods // imports member data pair from the config file, overriding existing parameter values of lower priority bool deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow ); + +// members + int priority1 { -1 }; // priority of last loaded primary texture + int priority2 { -1 }; // priority of last loaded secondary texture }; class material_manager { diff --git a/mouseinput.cpp b/mouseinput.cpp index 370d6b85..f885e090 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -25,6 +25,10 @@ mouse_input::init() { DWORD systemkeyboardspeed; ::SystemParametersInfo( SPI_GETKEYBOARDSPEED, 0, &systemkeyboardspeed, 0 ); m_updaterate = interpolate( 0.5, 0.04, systemkeyboardspeed / 31.0 ); + DWORD systemkeyboarddelay; + ::SystemParametersInfo( SPI_GETKEYBOARDDELAY, 0, &systemkeyboarddelay, 0 ); + m_updatedelay = interpolate( 0.25, 1.0, systemkeyboarddelay / 3.0 ); + #endif return true; } @@ -139,7 +143,7 @@ mouse_input::button( int const Button, int const Action ) { // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place m_relay.post( mousecommand, 0, 0, Action, 0 ); - m_updateaccumulator = 0.0; // prevent potential command repeat right after issuing one + m_updateaccumulator = -0.25; // prevent potential command repeat right after issuing one switch( mousecommand ) { case user_command::mastercontrollerincrease: @@ -183,23 +187,21 @@ mouse_input::poll() { updaterate /= std::max( 0.15, 2.0 * glm::length( m_cursorposition - m_commandstartcursor ) / std::max( 1, Global::iWindowHeight ) ); } - if( m_updateaccumulator < updaterate ) { - // too early for any work - return; - } - m_updateaccumulator -= updaterate; + while( m_updateaccumulator > updaterate ) { - if( m_mousecommandleft != user_command::none ) { - // NOTE: basic keyboard controls don't have any parameters - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( m_mousecommandleft, 0, 0, GLFW_REPEAT, 0 ); - } - if( m_mousecommandright != user_command::none ) { - // NOTE: basic keyboard controls don't have any parameters - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( m_mousecommandright, 0, 0, GLFW_REPEAT, 0 ); + if( m_mousecommandleft != user_command::none ) { + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( m_mousecommandleft, 0, 0, GLFW_REPEAT, 0 ); + } + if( m_mousecommandright != user_command::none ) { + // NOTE: basic keyboard controls don't have any parameters + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( m_mousecommandright, 0, 0, GLFW_REPEAT, 0 ); + } + m_updateaccumulator -= updaterate; } } @@ -351,6 +353,12 @@ mouse_input::default_bindings() { { "radiochannelnext_sw:", { user_command::radiochannelincrease, user_command::none } }, + { "radiostop_sw:", { + user_command::radiostopsend, + user_command::none } }, + { "radiotest_sw:", { + user_command::radiostoptest, + user_command::none } }, { "pantfront_sw:", { user_command::pantographtogglefront, user_command::none } }, diff --git a/mouseinput.h b/mouseinput.h index 9c7a853e..ff9c77eb 100644 --- a/mouseinput.h +++ b/mouseinput.h @@ -48,6 +48,7 @@ private: user_command m_mousecommandleft { user_command::none }; // last if any command issued with left mouse button user_command m_mousecommandright { user_command::none }; // last if any command issued with right mouse button double m_updaterate { 0.075 }; + double m_updatedelay { 0.25 }; double m_updateaccumulator { 0.0 }; bool m_pickmodepanning { false }; // indicates mouse is in view panning mode glm::dvec2 m_cursorposition; // stored last cursor position, used for panning diff --git a/renderer.cpp b/renderer.cpp index 9eb9f84d..2177046d 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1460,8 +1460,7 @@ opengl_renderer::Render( world_environment *Environment ) { Render( Environment->m_clouds.mdCloud, nullptr, 100.0 ); Render_Alpha( Environment->m_clouds.mdCloud, nullptr, 100.0 ); // post-render cleanup - GLfloat noambient[] = { 0.0f, 0.0f, 0.0f, 1.0f }; - ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, noambient ); + ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( colors::none ) ); ::glEnable( GL_LIGHT0 ); // other lights will be enabled during lights update ::glDisable( GL_LIGHTING ); } diff --git a/translation.h b/translation.h index 3abc7bb5..6233b87f 100644 --- a/translation.h +++ b/translation.h @@ -66,6 +66,8 @@ static std::unordered_map m_cabcontrols = { { "radiochannel_sw:", "radio channel" }, { "radiochannelprev_sw:", "radio channel" }, { "radiochannelnext_sw:", "radio channel" }, + { "radiotest_sw:", "radiostop test" }, + { "radiostop_sw:", "radiostop" }, { "pantfront_sw:", "pantograph A" }, { "pantrear_sw:", "pantograph B" }, { "pantfrontoff_sw:", "pantograph A" }, diff --git a/version.h b/version.h index 7ed4a66e..8560b6c9 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 122 +#define VERSION_MINOR 124 #define VERSION_REVISION 0 From 0124032d3b8ab930c3bbfc1f224e358e52ce7fee Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 26 Jan 2018 16:44:47 +0100 Subject: [PATCH 263/426] maintenance: settings item refactoring, include dependencies fixes --- AirCoupler.cpp | 3 + AirCoupler.h | 3 +- AnimModel.cpp | 30 +- AnimModel.h | 27 +- Camera.cpp | 26 +- Camera.h | 32 +- Classes.h | 15 +- Console.cpp | 98 ++--- Console/MWD.cpp | 28 +- Console/PoKeys55.cpp | 3 +- Driver.cpp | 161 +++----- Driver.h | 20 +- DynObj.cpp | 114 +++--- DynObj.h | 5 +- EU07.cpp | 87 ++-- EvLaunch.cpp | 9 +- Event.cpp | 15 +- Event.h | 4 +- Globals.cpp | 721 ++++++---------------------------- Globals.h | 467 +++++++++------------- Logs.cpp | 29 +- Logs.h | 1 + McZapkie/Mover.cpp | 27 +- McZapkie/Oerlikon_ESt.h | 1 - McZapkie/hamulce.cpp | 2 +- McZapkie/hamulce.h | 1 - MdlMngr.cpp | 23 +- MdlMngr.h | 2 +- MemCell.h | 1 - Model3d.cpp | 33 +- Model3d.h | 9 +- PyInt.cpp | 6 +- PyInt.h | 3 +- ResourceManager.h | 48 --- Segment.cpp | 5 +- Segment.h | 6 +- Spring.cpp | 8 +- Spring.h | 9 +- Texture.cpp | 24 +- Timer.cpp | 4 +- Track.cpp | 94 ++--- Track.h | 5 +- Traction.cpp | 7 +- TractionPower.cpp | 1 + TractionPower.h | 2 +- Train.cpp | 96 ++--- Train.h | 24 +- TrkFoll.h | 4 +- World.cpp | 468 +++++++++++----------- World.h | 3 +- audio.cpp | 11 +- audiorenderer.cpp | 18 +- audiorenderer.h | 3 +- color.h | 7 +- command.cpp | 3 +- gamepadinput.cpp | 2 +- keyboardinput.cpp | 10 +- light.cpp | 11 + light.h | 23 ++ lightarray.cpp | 2 +- lightarray.h | 5 +- maszyna.vcxproj.filters | 24 +- material.cpp | 6 +- material.h | 2 +- messaging.cpp | 18 +- moon.cpp | 6 +- mouseinput.cpp | 10 +- mtable.cpp | 4 +- mtable.h | 3 +- {McZapkie => old}/mctools.cpp | 21 +- {McZapkie => old}/mctools.h | 2 + openglgeometrybank.cpp | 2 +- renderer.cpp | 384 ++++++++++-------- renderer.h | 54 +-- scene.cpp | 19 +- scenenode.cpp | 1 + scenenode.h | 3 +- simulation.cpp | 30 +- sky.cpp | 6 +- sky.h | 2 +- skydome.cpp | 10 +- sound.cpp | 27 +- stars.h | 2 +- sun.cpp | 4 +- uilayer.cpp | 64 +-- uitranscripts.cpp | 79 ++++ uitranscripts.h | 40 ++ usefull.h | 117 ------ utilities.cpp | 320 +++++++++++++++ utilities.h | 286 ++++++++++++++ vertex.h | 2 +- windows.cpp | 2 +- 92 files changed, 2226 insertions(+), 2233 deletions(-) create mode 100644 light.cpp create mode 100644 light.h rename {McZapkie => old}/mctools.cpp (89%) rename {McZapkie => old}/mctools.h (98%) create mode 100644 uitranscripts.cpp create mode 100644 uitranscripts.h delete mode 100644 usefull.h create mode 100644 utilities.cpp create mode 100644 utilities.h diff --git a/AirCoupler.cpp b/AirCoupler.cpp index 5c6c0b09..cbf67e24 100644 --- a/AirCoupler.cpp +++ b/AirCoupler.cpp @@ -10,6 +10,9 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "AirCoupler.h" +#include "model3d.h" +#include "parser.h" + TAirCoupler::TAirCoupler() { Clear(); diff --git a/AirCoupler.h b/AirCoupler.h index 8cdebaea..bb9cae27 100644 --- a/AirCoupler.h +++ b/AirCoupler.h @@ -9,8 +9,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Model3d.h" -#include "parser.h" +#include "classes.h" class TAirCoupler { diff --git a/AnimModel.cpp b/AnimModel.cpp index ac8bc679..1f34f67a 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "AnimModel.h" +#include "renderer.h" #include "MdlMngr.h" #include "simulation.h" #include "Globals.h" @@ -71,11 +72,11 @@ int TAnimAdvanced::SortByBone() TAnimContainer::TAnimContainer() { pNext = NULL; - vRotateAngles = vector3(0.0f, 0.0f, 0.0f); // aktualne kąty obrotu - vDesiredAngles = vector3(0.0f, 0.0f, 0.0f); // docelowe kąty obrotu + vRotateAngles = Math3D::vector3(0.0f, 0.0f, 0.0f); // aktualne kąty obrotu + vDesiredAngles = Math3D::vector3(0.0f, 0.0f, 0.0f); // docelowe kąty obrotu fRotateSpeed = 0.0; - vTranslation = vector3(0.0f, 0.0f, 0.0f); // aktualne przesunięcie - vTranslateTo = vector3(0.0f, 0.0f, 0.0f); // docelowe przesunięcie + vTranslation = Math3D::vector3(0.0f, 0.0f, 0.0f); // aktualne przesunięcie + vTranslateTo = Math3D::vector3(0.0f, 0.0f, 0.0f); // docelowe przesunięcie fTranslateSpeed = 0.0; fAngleSpeed = 0.0; pSubModel = NULL; @@ -99,7 +100,7 @@ bool TAnimContainer::Init(TSubModel *pNewSubModel) return (pSubModel != NULL); } -void TAnimContainer::SetRotateAnim(vector3 vNewRotateAngles, double fNewRotateSpeed) +void TAnimContainer::SetRotateAnim( Math3D::vector3 vNewRotateAngles, double fNewRotateSpeed) { if (!this) return; // wywoływane z eventu, gdy brak modelu @@ -122,7 +123,7 @@ void TAnimContainer::SetRotateAnim(vector3 vNewRotateAngles, double fNewRotateSp } } -void TAnimContainer::SetTranslateAnim(vector3 vNewTranslate, double fNewSpeed) +void TAnimContainer::SetTranslateAnim( Math3D::vector3 vNewTranslate, double fNewSpeed) { if (!this) return; // wywoływane z eventu, gdy brak modelu @@ -153,8 +154,11 @@ void TAnimContainer::AnimSetVMD(double fNewSpeed) // X-w lewo, Y-w górę, Z-do tyłu // minimalna wysokość to -7.66, a nadal musi być ponad podłogą // if (pMovementData->iFrame>0) return; //tylko pierwsza ramka - vTranslateTo = vector3(0.1 * pMovementData->f3Vector.x, 0.1 * pMovementData->f3Vector.z, - 0.1 * pMovementData->f3Vector.y); + vTranslateTo = + Math3D::vector3( + 0.1 * pMovementData->f3Vector.x, + 0.1 * pMovementData->f3Vector.z, + 0.1 * pMovementData->f3Vector.y); if (LengthSquared3(vTranslateTo) > 0.0 ? true : LengthSquared3(vTranslation) > 0.0) { // jeśli ma być przesunięte albo jest przesunięcie iAnim |= 2; // wyłączy się samo @@ -209,11 +213,11 @@ void TAnimContainer::UpdateModel() { { if (fTranslateSpeed != 0.0) { - vector3 dif = vTranslateTo - vTranslation; // wektor w kierunku docelowym + auto dif = vTranslateTo - vTranslation; // wektor w kierunku docelowym double l = LengthSquared3(dif); // długość wektora potrzebnego przemieszczenia if (l >= 0.0001) { // jeśli do przemieszczenia jest ponad 1cm - vector3 s = SafeNormalize(dif); // jednostkowy wektor kierunku + auto s = Math3D::SafeNormalize(dif); // jednostkowy wektor kierunku s = s * (fTranslateSpeed * Timer::GetDeltaTime()); // przemieszczenie w podanym czasie z daną prędkością @@ -252,7 +256,7 @@ void TAnimContainer::UpdateModel() { */ bool anim = false; - vector3 dif = vDesiredAngles - vRotateAngles; + auto dif = vDesiredAngles - vRotateAngles; double s; s = fRotateSpeed * sign(dif.x) * Timer::GetDeltaTime(); if (fabs(s) >= fabs(dif.x)) @@ -462,7 +466,7 @@ bool TAnimModel::Load(cParser *parser, bool ter) name[ name.length() - 3 ] = 'e'; } #ifdef EU07_USE_OLD_TERRAINCODE - Global::asTerrainModel = name; + Global.asTerrainModel = name; WriteLog("Terrain model \"" + name + "\" will be created."); #endif } @@ -580,7 +584,7 @@ void TAnimModel::RaPrepare() state = ( fBlinkTimer < fOnTime ); break; case ls_Dark: // zapalone, gdy ciemno - state = ( Global::fLuminance <= ( lsLights[i] - 3.0 ) ); + state = ( Global.fLuminance <= ( lsLights[i] - 3.0 ) ); break; default: // zapalony albo zgaszony state = (lightmode == ls_On); diff --git a/AnimModel.h b/AnimModel.h index f581a96f..7cdb5248 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -14,9 +14,12 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Model3d.h" -#include "material.h" -#include "DynObj.h" +#include "classes.h" +#include "dumb3d.h" +#include "float3d.h" +#include "model3d.h" +#include "dynobj.h" +#include "scenenode.h" const int iMaxNumLights = 8; float const DefaultDarkThresholdLevel { 0.325f }; @@ -47,11 +50,11 @@ class TAnimContainer friend class TAnimModel; private: - vector3 vRotateAngles; // dla obrotów Eulera - vector3 vDesiredAngles; + Math3D::vector3 vRotateAngles; // dla obrotów Eulera + Math3D::vector3 vDesiredAngles; double fRotateSpeed; - vector3 vTranslation; - vector3 vTranslateTo; + Math3D::vector3 vTranslation; + Math3D::vector3 vTranslateTo; double fTranslateSpeed; // może tu dać wektor? float4 qCurrent; // aktualny interpolowany float4 qStart; // pozycja początkowa (0 dla interpolacji) @@ -81,8 +84,8 @@ class TAnimContainer inline std::string NameGet() { return (pSubModel ? pSubModel->pName : ""); }; - void SetRotateAnim(vector3 vNewRotateAngles, double fNewRotateSpeed); - void SetTranslateAnim(vector3 vNewTranslate, double fNewSpeed); + void SetRotateAnim( Math3D::vector3 vNewRotateAngles, double fNewRotateSpeed); + void SetTranslateAnim( Math3D::vector3 vNewTranslate, double fNewSpeed); void AnimSetVMD(double fNewSpeed); void PrepareModel(); void UpdateModel(); @@ -92,8 +95,8 @@ class TAnimContainer double AngleGet() { return vRotateAngles.z; }; // jednak ostatnia, T3D ma inny układ inline - vector3 TransGet() { - return vector3(-vTranslation.x, vTranslation.z, vTranslation.y); }; // zmiana, bo T3D ma inny układ + Math3D::vector3 TransGet() { + return Math3D::vector3(-vTranslation.x, vTranslation.z, vTranslation.y); }; // zmiana, bo T3D ma inny układ inline void WillBeAnimated() { if (pSubModel) @@ -173,7 +176,7 @@ private: int iNumLights { 0 }; TSubModel *LightsOn[ iMaxNumLights ]; // Ra: te wskaźniki powinny być w ramach TModel3d TSubModel *LightsOff[ iMaxNumLights ]; - vector3 vAngle; // bazowe obroty egzemplarza względem osi + Math3D::vector3 vAngle; // bazowe obroty egzemplarza względem osi material_data m_materialdata; std::string asText; // tekst dla wyświetlacza znakowego diff --git a/Camera.cpp b/Camera.cpp index 4fc6d388..1be5d772 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -11,24 +11,24 @@ http://mozilla.org/MPL/2.0/. #include "Camera.h" #include "Globals.h" -#include "Usefull.h" +#include "utilities.h" #include "Console.h" #include "Timer.h" #include "mover.h" //--------------------------------------------------------------------------- -void TCamera::Init(vector3 NPos, vector3 NAngle) +void TCamera::Init( Math3D::vector3 NPos, Math3D::vector3 NAngle) { - vUp = vector3(0, 1, 0); - Velocity = vector3(0, 0, 0); + vUp = Math3D::vector3(0, 1, 0); + Velocity = Math3D::vector3(0, 0, 0); Pitch = NAngle.x; Yaw = NAngle.y; Roll = NAngle.z; Pos = NPos; - Type = (Global::bFreeFly ? tp_Free : tp_Follow); + Type = (Global.bFreeFly ? tp_Free : tp_Follow); }; void TCamera::OnCursorMove(double x, double y) { @@ -59,8 +59,8 @@ TCamera::OnCommand( command_data const &Command ) { case user_command::viewturn: { OnCursorMove( - reinterpret_cast( Command.param1 ) * 0.005 * Global::fMouseXScale / Global::ZoomFactor, - reinterpret_cast( Command.param2 ) * 0.01 * Global::fMouseYScale / Global::ZoomFactor ); + reinterpret_cast( Command.param1 ) * 0.005 * Global.fMouseXScale / Global.ZoomFactor, + reinterpret_cast( Command.param2 ) * 0.01 * Global.fMouseYScale / Global.ZoomFactor ); break; } @@ -154,7 +154,7 @@ void TCamera::Update() auto const deltatime = Timer::GetDeltaRenderTime(); // czas bez pauzy if( ( Type == tp_Free ) - || ( false == Global::ctrlState ) + || ( false == Global.ctrlState ) || ( true == DebugCameraFlag ) ) { // ctrl is used for mirror view, so we ignore the controls when in vehicle if ctrl is pressed // McZapkie-170402: poruszanie i rozgladanie we free takie samo jak w follow @@ -166,13 +166,13 @@ void TCamera::Update() if( ( Type == tp_Free ) || ( true == DebugCameraFlag ) ) { // free movement position update is handled here, movement while in vehicle is handled by train update - vector3 Vec = Velocity; + Math3D::vector3 Vec = Velocity; Vec.RotateY( Yaw ); Pos += Vec * 5.0 * deltatime; } } -vector3 TCamera::GetDirection() { +Math3D::vector3 TCamera::GetDirection() { return glm::normalize( glm::rotateY( glm::vec3{ 0.f, 0.f, 1.f }, Yaw ) ); } @@ -199,10 +199,10 @@ bool TCamera::SetMatrix( glm::dmat4 &Matrix ) { void TCamera::RaLook() { // zmiana kierunku patrzenia - przelicza Yaw - vector3 where = LookAt - Pos + vector3(0, 3, 0); // trochę w górę od szyn + Math3D::vector3 where = LookAt - Pos + Math3D::vector3(0, 3, 0); // trochę w górę od szyn if ((where.x != 0.0) || (where.z != 0.0)) Yaw = atan2(-where.x, -where.z); // kąt horyzontalny - double l = Length3(where); + double l = Math3D::Length3(where); if (l > 0.0) Pitch = asin(where.y / l); // kąt w pionie }; @@ -210,5 +210,5 @@ void TCamera::RaLook() void TCamera::Stop() { // wyłącznie bezwładnego ruchu po powrocie do kabiny Type = tp_Follow; - Velocity = vector3(0, 0, 0); + Velocity = Math3D::vector3(0, 0, 0); }; diff --git a/Camera.h b/Camera.h index ffb2e817..ba9bb0f6 100644 --- a/Camera.h +++ b/Camera.h @@ -10,11 +10,8 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "dumb3d.h" -#include "dynobj.h" #include "command.h" -using namespace Math3D; - //--------------------------------------------------------------------------- enum TCameraType { // tryby pracy kamery @@ -23,31 +20,30 @@ enum TCameraType tp_Satelite // widok z góry (nie używany) }; -class TCamera -{ +class TCamera { + private: - glm::dvec3 m_moverate; + glm::dvec3 m_moverate; public: // McZapkie: potrzebuje do kiwania na boki - double Pitch; - double Yaw; // w środku: 0=do przodu; na zewnątrz: 0=na południe - double Roll; - TCameraType Type; - vector3 Pos; // współrzędne obserwatora - vector3 LookAt; // współrzędne punktu, na który ma patrzeć - vector3 vUp; - vector3 Velocity; - void Init(vector3 NPos, vector3 NAngle); + void Init( Math3D::vector3 NPos, Math3D::vector3 NAngle); inline void Reset() { Pitch = Yaw = Roll = 0; }; void OnCursorMove(double const x, double const y); bool OnCommand( command_data const &Command ); void Update(); - vector3 GetDirection(); + Math3D::vector3 GetDirection(); bool SetMatrix(glm::dmat4 &Matrix); void RaLook(); void Stop(); - // bool GetMatrix(matrix4x4 &Matrix); - vector3 PtNext, PtPrev; + + TCameraType Type; + double Pitch; + double Yaw; // w środku: 0=do przodu; na zewnątrz: 0=na południe + double Roll; + Math3D::vector3 Pos; // współrzędne obserwatora + Math3D::vector3 LookAt; // współrzędne punktu, na który ma patrzeć + Math3D::vector3 vUp; + Math3D::vector3 Velocity; }; diff --git a/Classes.h b/Classes.h index 6f2b74d1..51ceaa35 100644 --- a/Classes.h +++ b/Classes.h @@ -16,22 +16,25 @@ class TTrack; // odcinek trajektorii class TEvent; class TTrain; // pojazd sterowany class TDynamicObject; // pojazd w scenerii -class TGroundNode; // statyczny obiekt scenerii +struct material_data; class TAnimModel; // opakowanie egzemplarz modelu class TAnimContainer; // fragment opakowania egzemplarza modelu class TModel3d; //siatka modelu wspólna dla egzemplarzy class TSubModel; // fragment modelu (tu do wyświetlania terenu) class TMemCell; // komórka pamięci class cParser; -#ifdef EU07_USE_OLD_SOUNDCODE -class TRealSound; // dźwięk ze współrzędnymi XYZ -class TTextSound; // dźwięk ze stenogramem -#else class sound_source; -#endif class TEventLauncher; class TTraction; // drut class TTractionPowerSource; // zasilanie drutów +class TCamera; +class TWorld; +class simulation_time; +class TMoverParameters; + +namespace scene { +struct node_data; +} namespace Mtable { diff --git a/Console.cpp b/Console.cpp index 7221435e..db6f2d1a 100644 --- a/Console.cpp +++ b/Console.cpp @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "Logs.h" #include "MWD.h" // maciek001: obsluga portu COM #include "PoKeys55.h" -#include "mczapkie/mctools.h" +#include "utilities.h" //--------------------------------------------------------------------------- // Ra: klasa statyczna gromadząca sygnały sterujące oraz informacje zwrotne @@ -166,7 +166,7 @@ int Console::On() break; } - if (Global::bMWDmasterEnable) + if (Global.bMWDmasterEnable) { WriteLog("Opening ComPort"); MWDComm = new TMWDComm(); @@ -289,7 +289,7 @@ void Console::BitsUpdate(int mask) } break; } - if (Global::bMWDmasterEnable) + if (Global.bMWDmasterEnable) { // maciek001: MWDComm lampki i kontrolki // out3: ogrzewanie sk?adu, opory rozruchowe, poslizg, zaluzjewent, -, -, czuwak, shp @@ -343,7 +343,7 @@ void Console::BitsUpdate(int mask) bool Console::Pressed(int x) { // na razie tak - czyta się tylko klawiatura - if (glfwGetKey(Global::window, x) == GLFW_TRUE) + if (glfwGetKey(Global.window, x) == GLFW_TRUE) return true; else return false; @@ -354,79 +354,79 @@ void Console::ValueSet(int x, double y) if (iMode == 4) if (PoKeys55[0]) { - x = Global::iPoKeysPWM[x]; - if (Global::iCalibrateOutDebugInfo == x) + x = Global.iPoKeysPWM[x]; + if (Global.iCalibrateOutDebugInfo == x) WriteLog("CalibrateOutDebugInfo: oryginal=" + std::to_string(y)); - if (Global::fCalibrateOutMax[x] > 0) + if (Global.fCalibrateOutMax[x] > 0) { - y = clamp( y, 0.0, Global::fCalibrateOutMax[x]); - if (Global::iCalibrateOutDebugInfo == x) + y = clamp( y, 0.0, Global.fCalibrateOutMax[x]); + if (Global.iCalibrateOutDebugInfo == x) WriteLog(" cutted=" + std::to_string(y)); - y = y / Global::fCalibrateOutMax[x]; // sprowadzenie do <0,1> jeśli podana + y = y / Global.fCalibrateOutMax[x]; // sprowadzenie do <0,1> jeśli podana // maksymalna wartość - if (Global::iCalibrateOutDebugInfo == x) + if (Global.iCalibrateOutDebugInfo == x) WriteLog(" fraction=" + std::to_string(y)); } - double temp = (((((Global::fCalibrateOut[x][5] * y) + Global::fCalibrateOut[x][4]) * y + - Global::fCalibrateOut[x][3]) * + double temp = (((((Global.fCalibrateOut[x][5] * y) + Global.fCalibrateOut[x][4]) * y + + Global.fCalibrateOut[x][3]) * y + - Global::fCalibrateOut[x][2]) * + Global.fCalibrateOut[x][2]) * y + - Global::fCalibrateOut[x][1]) * + Global.fCalibrateOut[x][1]) * y + - Global::fCalibrateOut[x][0]; // zakres <0;1> - if (Global::iCalibrateOutDebugInfo == x) + Global.fCalibrateOut[x][0]; // zakres <0;1> + if (Global.iCalibrateOutDebugInfo == x) WriteLog(" calibrated=" + std::to_string(temp)); PoKeys55[0]->PWM(x, temp); } - if (Global::bMWDmasterEnable) + if (Global.bMWDmasterEnable) { unsigned int iliczba; switch (x) { - case 0: iliczba = (unsigned int)floor((y / (Global::fMWDzg[0] * 10) * Global::fMWDzg[1]) + 0.5); // zbiornik główny + case 0: iliczba = (unsigned int)floor((y / (Global.fMWDzg[0] * 10) * Global.fMWDzg[1]) + 0.5); // zbiornik główny MWDComm->WriteDataBuff[12] = (unsigned char)(iliczba >> 8); MWDComm->WriteDataBuff[11] = (unsigned char)iliczba; - if (Global::bMWDmasterEnable && Global::iMWDDebugMode & 8) WriteLog("Main tank press " + to_string(MWDComm->WriteDataBuff[12]) + " " + to_string(MWDComm->WriteDataBuff[11])); + if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Main tank press " + to_string(MWDComm->WriteDataBuff[12]) + " " + to_string(MWDComm->WriteDataBuff[11])); break; - case 1: iliczba = (unsigned int)floor((y / (Global::fMWDpg[0] * 10) * Global::fMWDpg[1]) + 0.5); // przewód główny + case 1: iliczba = (unsigned int)floor((y / (Global.fMWDpg[0] * 10) * Global.fMWDpg[1]) + 0.5); // przewód główny MWDComm->WriteDataBuff[10] = (unsigned char)(iliczba >> 8); MWDComm->WriteDataBuff[9] = (unsigned char)iliczba; - if (Global::bMWDmasterEnable && Global::iMWDDebugMode & 8) WriteLog("Main pipe press " + to_string(MWDComm->WriteDataBuff[10]) + " " + to_string(MWDComm->WriteDataBuff[9])); + if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Main pipe press " + to_string(MWDComm->WriteDataBuff[10]) + " " + to_string(MWDComm->WriteDataBuff[9])); break; - case 2: iliczba = (unsigned int)floor((y / (Global::fMWDph[0] * 10) * Global::fMWDph[1]) + 0.5); // cylinder hamulcowy + case 2: iliczba = (unsigned int)floor((y / (Global.fMWDph[0] * 10) * Global.fMWDph[1]) + 0.5); // cylinder hamulcowy MWDComm->WriteDataBuff[8] = (unsigned char)(iliczba >> 8); MWDComm->WriteDataBuff[7] = (unsigned char)iliczba; - if (Global::bMWDmasterEnable && Global::iMWDDebugMode & 8) WriteLog("Break press " + to_string(MWDComm->WriteDataBuff[8]) + " " + to_string(MWDComm->WriteDataBuff[7])); + if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Break press " + to_string(MWDComm->WriteDataBuff[8]) + " " + to_string(MWDComm->WriteDataBuff[7])); break; - case 3: iliczba = (unsigned int)floor((y / Global::fMWDvolt[0] * Global::fMWDvolt[1]) + 0.5); // woltomierz WN + case 3: iliczba = (unsigned int)floor((y / Global.fMWDvolt[0] * Global.fMWDvolt[1]) + 0.5); // woltomierz WN MWDComm->WriteDataBuff[14] = (unsigned char)(iliczba >> 8); MWDComm->WriteDataBuff[13] = (unsigned char)iliczba; - if (Global::bMWDmasterEnable && Global::iMWDDebugMode & 8) WriteLog("Hi Volt meter " + to_string(MWDComm->WriteDataBuff[14]) + " " + to_string(MWDComm->WriteDataBuff[13])); + if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Hi Volt meter " + to_string(MWDComm->WriteDataBuff[14]) + " " + to_string(MWDComm->WriteDataBuff[13])); break; - case 4: iliczba = (unsigned int)floor((y / Global::fMWDamp[0] * Global::fMWDamp[1]) + 0.5); // amp WN 1 + case 4: iliczba = (unsigned int)floor((y / Global.fMWDamp[0] * Global.fMWDamp[1]) + 0.5); // amp WN 1 MWDComm->WriteDataBuff[16] = (unsigned char)(iliczba >> 8); MWDComm->WriteDataBuff[15] = (unsigned char)iliczba; - if (Global::bMWDmasterEnable && Global::iMWDDebugMode & 8) WriteLog("Apm meter1 " + to_string(MWDComm->WriteDataBuff[16]) + " " + to_string(MWDComm->WriteDataBuff[15])); + if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Apm meter1 " + to_string(MWDComm->WriteDataBuff[16]) + " " + to_string(MWDComm->WriteDataBuff[15])); break; - case 5: iliczba = (unsigned int)floor((y / Global::fMWDamp[0] * Global::fMWDamp[1]) + 0.5); // amp WN 2 + case 5: iliczba = (unsigned int)floor((y / Global.fMWDamp[0] * Global.fMWDamp[1]) + 0.5); // amp WN 2 MWDComm->WriteDataBuff[18] = (unsigned char)(iliczba >> 8); MWDComm->WriteDataBuff[17] = (unsigned char)iliczba; - if (Global::bMWDmasterEnable && Global::iMWDDebugMode & 8) WriteLog("Apm meter2 " + to_string(MWDComm->WriteDataBuff[18]) + " " + to_string(MWDComm->WriteDataBuff[17])); + if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Apm meter2 " + to_string(MWDComm->WriteDataBuff[18]) + " " + to_string(MWDComm->WriteDataBuff[17])); break; - case 6: iliczba = (unsigned int)floor((y / Global::fMWDamp[0] * Global::fMWDamp[1]) + 0.5); // amp WN 3 + case 6: iliczba = (unsigned int)floor((y / Global.fMWDamp[0] * Global.fMWDamp[1]) + 0.5); // amp WN 3 MWDComm->WriteDataBuff[20] = (unsigned int)(iliczba >> 8); MWDComm->WriteDataBuff[19] = (unsigned char)iliczba; - if (Global::bMWDmasterEnable && Global::iMWDDebugMode & 8) WriteLog("Apm meter3 " + to_string(MWDComm->WriteDataBuff[20]) + " " + to_string(MWDComm->WriteDataBuff[19])); + if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Apm meter3 " + to_string(MWDComm->WriteDataBuff[20]) + " " + to_string(MWDComm->WriteDataBuff[19])); break; - case 7: if (Global::iPause) MWDComm->WriteDataBuff[0] = 0; //skoro pauza to hasler stoi i nie nabija kilometrów CHYBA NIE DZIAŁA! + case 7: if (Global.iPause) MWDComm->WriteDataBuff[0] = 0; //skoro pauza to hasler stoi i nie nabija kilometrów CHYBA NIE DZIAŁA! else MWDComm->WriteDataBuff[0] = (unsigned char)floor(y); // prędkość dla np haslera - if (Global::bMWDmasterEnable && Global::iMWDDebugMode & 8) WriteLog("Speed: " + to_string(MWDComm->WriteDataBuff[0])); + if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Speed: " + to_string(MWDComm->WriteDataBuff[0])); break; - case 8: iliczba = (unsigned int)floor((y / Global::fMWDlowVolt[0] * Global::fMWDlowVolt[1]) + 0.5); // volt NN + case 8: iliczba = (unsigned int)floor((y / Global.fMWDlowVolt[0] * Global.fMWDlowVolt[1]) + 0.5); // volt NN MWDComm->WriteDataBuff[22] = (unsigned int)(iliczba >> 8); MWDComm->WriteDataBuff[21] = (unsigned char)iliczba; - if (Global::bMWDmasterEnable && Global::iMWDDebugMode & 8) WriteLog("Low Volt meter " + to_string(MWDComm->WriteDataBuff[22]) + " " + to_string(MWDComm->WriteDataBuff[21])); + if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Low Volt meter " + to_string(MWDComm->WriteDataBuff[22]) + " " + to_string(MWDComm->WriteDataBuff[21])); break; // przygotowane do wdrożenia, jeszcze nie wywoływane } } @@ -436,18 +436,18 @@ void Console::Update() { // funkcja powinna być wywoływana regularnie, np. raz w każdej ramce ekranowej if (iMode == 4) if (PoKeys55[0]) - if (PoKeys55[0]->Update((Global::iPause & 8) > 0)) + if (PoKeys55[0]->Update((Global.iPause & 8) > 0)) { // wykrycie przestawionych przełączników? - Global::iPause &= ~8; + Global.iPause &= ~8; } else { // błąd komunikacji - zapauzować symulację? - if (!(Global::iPause & 8)) // jeśli jeszcze nie oflagowana - Global::iTextMode = GLFW_KEY_F1; // pokazanie czasu/pauzy - Global::iPause |= 8; // tak??? + if (!(Global.iPause & 8)) // jeśli jeszcze nie oflagowana + Global.iTextMode = GLFW_KEY_F1; // pokazanie czasu/pauzy + Global.iPause |= 8; // tak??? PoKeys55[0]->Connect(); // próba ponownego podłączenia } - if (Global::bMWDmasterEnable) + if (Global.bMWDmasterEnable) { if (MWDComm->GetMWDState()) MWDComm->Run(); else MWDComm->Close(); @@ -467,19 +467,19 @@ float Console::AnalogCalibrateGet(int x) if (iMode == 4 && PoKeys55[0]) { float b = PoKeys55[0]->fAnalog[x]; - b = (((((Global::fCalibrateIn[x][5] * b) + Global::fCalibrateIn[x][4]) * b + - Global::fCalibrateIn[x][3]) * b + - Global::fCalibrateIn[x][2]) * b + - Global::fCalibrateIn[x][1]) * b + - Global::fCalibrateIn[x][0]; + b = (((((Global.fCalibrateIn[x][5] * b) + Global.fCalibrateIn[x][4]) * b + + Global.fCalibrateIn[x][3]) * b + + Global.fCalibrateIn[x][2]) * b + + Global.fCalibrateIn[x][1]) * b + + Global.fCalibrateIn[x][0]; if (x == 0) return (b + 2) / 8; if (x == 1) return b/10; else return b; } - if (Global::bMWDmasterEnable && Global::bMWDBreakEnable) + if (Global.bMWDmasterEnable && Global.bMWDBreakEnable) { float b = (float)MWDComm->uiAnalog[x]; - return (b - Global::fMWDAnalogInCalib[x][0]) / (Global::fMWDAnalogInCalib[x][1] - Global::fMWDAnalogInCalib[x][0]); + return (b - Global.fMWDAnalogInCalib[x][0]) / (Global.fMWDAnalogInCalib[x][1] - Global.fMWDAnalogInCalib[x][0]); } return -1.0; // odcięcie }; diff --git a/Console/MWD.cpp b/Console/MWD.cpp index 67b63bdd..9ea5adcb 100644 --- a/Console/MWD.cpp +++ b/Console/MWD.cpp @@ -79,7 +79,7 @@ TMWDComm::~TMWDComm() // destruktor bool TMWDComm::Open() // otwieranie portu COM { - LPCSTR portId = Global::sMWDPortId.c_str(); + LPCSTR portId = Global.sMWDPortId.c_str(); hComm = CreateFile(portId, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -99,7 +99,7 @@ bool TMWDComm::Open() // otwieranie portu COM CommDCB.DCBlength = sizeof(DCB); GetCommState(hComm, &CommDCB); - CommDCB.BaudRate = Global::iMWDBaudrate; + CommDCB.BaudRate = Global.iMWDBaudrate; CommDCB.fBinary = TRUE; CommDCB.fParity = FALSE; CommDCB.fOutxCtsFlow = FALSE; // No CTS output flow control @@ -133,9 +133,9 @@ bool TMWDComm::Open() // otwieranie portu COM bool TMWDComm::Close() // zamykanie portu COM { - Global::bMWDmasterEnable = false; // główne włączenie portu! - Global::bMWDInputEnable = false; // włącz wejścia - Global::bMWDBreakEnable = false; // włącz wejścia analogowe + Global.bMWDmasterEnable = false; // główne włączenie portu! + Global.bMWDInputEnable = false; // włącz wejścia + Global.bMWDBreakEnable = false; // włącz wejścia analogowe WriteLog("COM Port is closing..."); int i = 0; @@ -164,25 +164,25 @@ bool TMWDComm::ReadData() // odbieranie danych + odczyta danych analogowych i za { DWORD bytes_read; ReadFile(hComm, &ReadDataBuff[0], BYTETOREAD, &bytes_read, NULL); - if (Global::bMWDdebugEnable && Global::iMWDDebugMode == 128) WriteLog("Data receive. Checking data..."); - if (Global::bMWDBreakEnable) + if (Global.bMWDdebugEnable && Global.iMWDDebugMode == 128) WriteLog("Data receive. Checking data..."); + if (Global.bMWDBreakEnable) { uiAnalog[0] = (ReadDataBuff[9] << 8) + ReadDataBuff[8]; uiAnalog[1] = (ReadDataBuff[11] << 8) + ReadDataBuff[10]; uiAnalog[2] = (ReadDataBuff[13] << 8) + ReadDataBuff[12]; uiAnalog[3] = (ReadDataBuff[15] << 8) + ReadDataBuff[14]; - if (Global::bMWDdebugEnable && (Global::iMWDDebugMode & 1)) + if (Global.bMWDdebugEnable && (Global.iMWDDebugMode & 1)) { WriteLog("Main Break = " + to_string(uiAnalog[0])); WriteLog("Locomotiv Break = " + to_string(uiAnalog[1])); } - if (Global::bMWDdebugEnable && (Global::iMWDDebugMode & 2)) + if (Global.bMWDdebugEnable && (Global.iMWDDebugMode & 2)) { WriteLog("Analog input 1 = " + to_string(uiAnalog[2])); WriteLog("Analog imput 2 = " + to_string(uiAnalog[3])); } } - if (Global::bMWDInputEnable) CheckData(); + if (Global.bMWDInputEnable) CheckData(); return TRUE; } @@ -200,14 +200,14 @@ bool TMWDComm::Run() // wywoływanie obsługi MWD + generacja większego opóźn if (GetMWDState()) { MWDTime++; - if (!(MWDTime % Global::iMWDdivider)) + if (!(MWDTime % Global.iMWDdivider)) { MWDTime = 0; - if (Global::bMWDdebugEnable && Global::iMWDDebugMode == 128) WriteLog("Sending data..."); + if (Global.bMWDdebugEnable && Global.iMWDDebugMode == 128) WriteLog("Sending data..."); SendData(); - if (Global::bMWDdebugEnable && Global::iMWDDebugMode == 128) WriteLog(" complet!\nReceiving data..."); + if (Global.bMWDdebugEnable && Global.iMWDDebugMode == 128) WriteLog(" complet!\nReceiving data..."); ReadData(); - if (Global::bMWDdebugEnable && Global::iMWDDebugMode == 128) WriteLog(" complet!"); + if (Global.bMWDdebugEnable && Global.iMWDDebugMode == 128) WriteLog(" complet!"); return 1; } } diff --git a/Console/PoKeys55.cpp b/Console/PoKeys55.cpp index c27efaaf..abe24616 100644 --- a/Console/PoKeys55.cpp +++ b/Console/PoKeys55.cpp @@ -10,7 +10,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "PoKeys55.h" #include -#include "mczapkie/mctools.h" +#include "utilities.h" + //--------------------------------------------------------------------------- // HIDscaner: http://forum.simflight.com/topic/68257-latest-lua-package-for-fsuipc-and-wideclient/ //#define MY_DEVICE_ID "Vid_04d8&Pid_003F" diff --git a/Driver.cpp b/Driver.cpp index 1dcb3123..b611b30d 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -23,8 +23,9 @@ http://mozilla.org/MPL/2.0/. #include "Event.h" #include "MemCell.h" #include "World.h" -#include "McZapkie/mctools.h" +#include "utilities.h" #include "McZapkie/MOVER.h" +#include "track.h" #define LOGVELOCITY 0 #define LOGORDERS 1 @@ -188,7 +189,7 @@ void TSpeedPos::Clear() fVelNext = -1.0; // prędkość bez ograniczeń fSectionVelocityDist = 0.0; //brak długości fDist = 0.0; - vPos = vector3(0, 0, 0); + vPos = Math3D::vector3(0, 0, 0); trTrack = NULL; // brak wskaźnika }; @@ -445,7 +446,7 @@ bool TController::TableNotFound(TEvent const *Event) const return ( ( true == TestFlag( speedpoint.iFlags, spEnabled | spEvent ) ) && ( speedpoint.evEvent == Event ) ); } ); - if( ( Global::iWriteLogEnabled & 8 ) + if( ( Global.iWriteLogEnabled & 8 ) && ( lookup != sSpeedTable.end() ) ) { WriteLog( "Speed table for " + OwnerName() + " already contains event " + lookup->evEvent->asName ); } @@ -533,7 +534,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) { if (pTrack != tLast) // ostatni zapisany w tabelce nie był jeszcze sprawdzony { // jeśli tor nie był jeszcze sprawdzany - if( Global::iWriteLogEnabled & 8 ) { + if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table for " + OwnerName() + " tracing through track " + pTrack->name() ); } @@ -543,7 +544,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) { TableAddNew(); // zawsze jest true - if (Global::iWriteLogEnabled & 8) { + if (Global.iWriteLogEnabled & 8) { WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->asName); } auto &newspeedpoint = sSpeedTable[iLast]; @@ -563,7 +564,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if (SemNextIndex == -1) { SemNextIndex = iLast; } - if (Global::iWriteLogEnabled & 8) { + if (Global.iWriteLogEnabled & 8) { WriteLog("(stop signal from " + (SemNextStopIndex != -1 ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor") + ")"); @@ -574,7 +575,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) && (SemNextIndex == -1)) { SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze } - if (Global::iWriteLogEnabled & 8) { + if (Global.iWriteLogEnabled & 8) { WriteLog("(forward signal for " + (SemNextIndex != -1 ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor") + ")"); @@ -730,7 +731,7 @@ void TController::TableCheck(double fDistance) { if (sSpeedTable[i].Update()) { - if( Global::iWriteLogEnabled & 8 ) { + if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table for " + OwnerName() + " detected switch change at " + sSpeedTable[ i ].trTrack->name() + " (generating fresh trace)" ); } // usuwamy wszystko za tym torem @@ -1006,8 +1007,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if (go == cm_Unknown) // jeśli nie było komendy wcześniej go = cm_Ready; // gotów do odjazdu z W4 (semafor może // zatrzymać) - if( ( tsGuardSignal != nullptr ) - && ( false == tsGuardSignal->empty() ) ) { + if( false == tsGuardSignal.empty() ) { // jeśli mamy głos kierownika, to odegrać iDrivigFlags |= moveGuardSignal; } @@ -1060,14 +1060,14 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // sprawdzanie eventów pasywnych miniętych if( (sSpeedTable[ i ].fDist < 0.0) && (SemNextIndex == i) ) { - if( Global::iWriteLogEnabled & 8 ) { + if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextIndex ].GetName() ); } SemNextIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód } if( (sSpeedTable[ i ].fDist < 0.0) && (SemNextStopIndex == i) ) { - if( Global::iWriteLogEnabled & 8 ) { + if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextStopIndex ].GetName() ); } SemNextStopIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód @@ -1079,7 +1079,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // jeśli jest mienięty poprzedni semafor a wcześniej // byl nowy to go dorzucamy do zmiennej, żeby cały czas widział najbliższy SemNextIndex = i; - if( Global::iWriteLogEnabled & 8 ) { + if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table update for " + OwnerName() + ", next semaphor is " + sSpeedTable[ SemNextIndex ].GetName() ); } } @@ -1163,13 +1163,13 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN { if (sSpeedTable[i].fSectionVelocityDist == 0.0) { - if (Global::iWriteLogEnabled & 8) + if (Global.iWriteLogEnabled & 8) WriteLog("TableUpdate: Event is behind. SVD = 0: " + sSpeedTable[i].evEvent->asName); sSpeedTable[i].iFlags = 0; // jeśli punktowy to kasujemy i nie dajemy ograniczenia na stałe } else if (sSpeedTable[i].fSectionVelocityDist < 0.0) { // ograniczenie obowiązujące do następnego - if (sSpeedTable[i].fVelNext == Global::Min0RSpeed(sSpeedTable[i].fVelNext, VelLimitLast) && + if (sSpeedTable[i].fVelNext == min_speed(sSpeedTable[i].fVelNext, VelLimitLast) && sSpeedTable[i].fVelNext != VelLimitLast) { // jeśli ograniczenie jest mniejsze niż obecne to obowiązuje od zaraz VelLimitLast = sSpeedTable[i].fVelNext; @@ -1177,14 +1177,14 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else if (sSpeedTable[i].fDist < -fLength) { // jeśli większe to musi wyjechać za poprzednie VelLimitLast = sSpeedTable[i].fVelNext; - if (Global::iWriteLogEnabled & 8) + if (Global.iWriteLogEnabled & 8) WriteLog("TableUpdate: Event is behind. SVD < 0: " + sSpeedTable[i].evEvent->asName); sSpeedTable[i].iFlags = 0; // wyjechaliśmy poza poprzednie, można skasować } } else { // jeśli większe to ograniczenie ma swoją długość - if (sSpeedTable[i].fVelNext == Global::Min0RSpeed(sSpeedTable[i].fVelNext, VelLimitLast) && + if (sSpeedTable[i].fVelNext == min_speed(sSpeedTable[i].fVelNext, VelLimitLast) && sSpeedTable[i].fVelNext != VelLimitLast) { // jeśli ograniczenie jest mniejsze niż obecne to obowiązuje od zaraz VelLimitLast = sSpeedTable[i].fVelNext; @@ -1196,7 +1196,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else if (sSpeedTable[i].fDist < -fLength - sSpeedTable[i].fSectionVelocityDist) { // VelLimitLast = -1.0; - if (Global::iWriteLogEnabled & 8) + if (Global.iWriteLogEnabled & 8) WriteLog("TableUpdate: Event is behind. SVD > 0: " + sSpeedTable[i].evEvent->asName); sSpeedTable[i].iFlags = 0; // wyjechaliśmy poza poprzednie, można skasować } @@ -1450,7 +1450,7 @@ void TController::TablePurger() // always copy the last entry trimmedtable.emplace_back( sSpeedTable.back() ); - if( Global::iWriteLogEnabled & 8 ) { + if( Global.iWriteLogEnabled & 8 ) { WriteLog( "Speed table garbage collection for " + OwnerName() + " cut away " + std::to_string( trimcount ) + ( trimcount == 1 ? " record" : " records" ) ); } // update the data @@ -1571,7 +1571,6 @@ void TController::CloseLog() TController::~TController() { // wykopanie mechanika z roboty - delete tsGuardSignal; delete TrainParams; CloseLog(); }; @@ -1682,7 +1681,7 @@ void TController::Activation() } if (pVehicle != old) { // jeśli zmieniony został pojazd prowadzony - Global::pWorld->CabChange(old, pVehicle); // ewentualna zmiana kabiny użytkownikowi + Global.pWorld->CabChange(old, pVehicle); // ewentualna zmiana kabiny użytkownikowi ControllingSet(); // utworzenie połączenia do sterowanego pojazdu (może się zmienić) - // silnikowy dla EZT } @@ -2583,8 +2582,7 @@ bool TController::IncSpeed() if (tsGuardSignal->GetStatus() & DSBSTATUS_PLAYING) // jeśli gada, to nie jedziemy return false; #else - if( ( tsGuardSignal != nullptr ) - && ( true == tsGuardSignal->is_playing() ) ) { + if( true == tsGuardSignal.is_playing() ) { return false; } #endif @@ -3076,12 +3074,11 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N TrainParams = new TTrainParameters(NewCommand); // rozkład jazdy else TrainParams->NewName(NewCommand); // czyści tabelkę przystanków - delete tsGuardSignal; - tsGuardSignal = nullptr; // wywalenie kierownika + tsGuardSignal = sound_source { sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // wywalenie kierownika if (NewCommand != "none") { if (!TrainParams->LoadTTfile( - std::string(Global::asCurrentSceneryPath.c_str()), floor(NewValue2 + 0.5), + std::string(Global.asCurrentSceneryPath.c_str()), floor(NewValue2 + 0.5), NewValue1)) // pierwszy parametr to przesunięcie rozkładu w czasie { if (ConversionError == -8) @@ -3097,35 +3094,17 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N iStationStart = TrainParams->StationIndex; asNextStop = TrainParams->NextStop(); iDrivigFlags |= movePrimary; // skoro dostał rozkład, to jest teraz głównym - NewCommand = Global::asCurrentSceneryPath + NewCommand + ".wav"; // na razie jeden + NewCommand = Global.asCurrentSceneryPath + NewCommand + ".wav"; // na razie jeden if (FileExists(NewCommand)) { // wczytanie dźwięku odjazdu podawanego bezpośrenido -#ifdef EU07_USE_OLD_SOUNDCODE - tsGuardSignal = - new TTextSound( - NewCommand, 30, - pVehicle->GetPosition().x, pVehicle->GetPosition().y, pVehicle->GetPosition().z, - false); -#else - tsGuardSignal = new sound_source( sound_placement::external, 75.f ); - tsGuardSignal->deserialize( NewCommand, sound_type::single ); -#endif + tsGuardSignal = sound_source( sound_placement::external, 75.f ).deserialize( NewCommand, sound_type::single ); iGuardRadio = 0; // nie przez radio } else { NewCommand = NewCommand.insert(NewCommand.rfind('.'),"radio"); // wstawienie przed kropkč if (FileExists(NewCommand)) { // wczytanie dźwięku odjazdu w wersji radiowej (słychać tylko w kabinie) -#ifdef EU07_USE_OLD_SOUNDCODE - tsGuardSignal = - new TTextSound( - NewCommand, -1, - pVehicle->GetPosition().x, pVehicle->GetPosition().y, pVehicle->GetPosition().z, - false); -#else - tsGuardSignal = new sound_source( sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE ); - tsGuardSignal->deserialize( NewCommand, sound_type::single ); -#endif + tsGuardSignal = sound_source( sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE ).deserialize( NewCommand, sound_type::single ); iGuardRadio = iRadioChannel; } } @@ -3142,8 +3121,8 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N if (NewLocation) // jeśli podane współrzędne eventu/komórki ustawiającej rozkład (trainset // nie podaje) { - vector3 v = *NewLocation - pVehicle->GetPosition(); // wektor do punktu sterującego - vector3 d = pVehicle->VectorFront(); // wektor wskazujący przód + auto v = *NewLocation - pVehicle->GetPosition(); // wektor do punktu sterującego + auto d = pVehicle->VectorFront(); // wektor wskazujący przód iDirectionOrder = ((v.x * d.x + v.z * d.z) * NewValue1 > 0) ? 1 : -1; // do przodu, gdy iloczyn skalarny i prędkość dodatnie @@ -3266,8 +3245,8 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N else if (NewLocation) // jeśli podane współrzędne eventu/komórki ustawiającej rozkład // (trainset nie podaje) { - vector3 v = *NewLocation - pVehicle->GetPosition(); // wektor do punktu sterującego - vector3 d = pVehicle->VectorFront(); // wektor wskazujący przód + auto v = *NewLocation - pVehicle->GetPosition(); // wektor do punktu sterującego + auto d = pVehicle->VectorFront(); // wektor wskazujący przód iDirectionOrder = ((v.x * d.x + v.z * d.z) * NewValue1 > 0) ? 1 : -1; // do przodu, gdy iloczyn skalarny i prędkość dodatnie @@ -3763,9 +3742,9 @@ TController::UpdateSituation(double dt) { pVehicles[ 0 ] : pVehicles[ 1 ] ); // for moving vehicle determine heading from velocity; for standing fall back on the set direction - if( ( mvOccupied->V != 0.0 ? - mvOccupied->V > 0.0 : - iDirection > 0 ) ) { + if( ( std::abs( mvOccupied->V ) < 0.1 ? // ignore potential micro-stutters in oposite direction during "almost stop" + iDirection > 0 : + mvOccupied->V > 0.0 ) ) { // towards coupler 0 if( ( mvOccupied->V * iDirection < 0.0 ) || ( ( rearvehicle->NextConnected != nullptr ) @@ -4164,7 +4143,7 @@ TController::UpdateSituation(double dt) { case Change_direction | Connect: // zmiana kierunku podczas podłączania if (OrderList[OrderPos] != Obey_train) // spokojne manewry { - VelSignal = Global::Min0RSpeed(VelSignal, 40); // jeśli manewry, to ograniczamy prędkość + VelSignal = min_speed( VelSignal, 40.0 ); // jeśli manewry, to ograniczamy prędkość // NOTE: this section should be moved to disconnect or plain removed, but it seems to be (mis)used by some scenarios // to keep vehicle idling without moving :| @@ -4282,7 +4261,7 @@ TController::UpdateSituation(double dt) { if( ( TrainParams ) && ( TrainParams->TTVmax > 0.0 ) ) { // jeśli ma rozkład i ograniczenie w rozkładzie to nie przekraczać rozkladowej - VelDesired = Global::Min0RSpeed( VelDesired, TrainParams->TTVmax ); + VelDesired = min_speed( VelDesired, TrainParams->TTVmax ); } SetDriverPsyche(); // ustawia AccPreferred (potrzebne tu?) @@ -4403,7 +4382,7 @@ TController::UpdateSituation(double dt) { // jeśli spinanie, to jechać dalej AccPreferred = std::min( 0.25, AccPreferred ); // nie hamuj VelDesired = - Global::Min0RSpeed( + min_speed( VelDesired, ( vehicle->fTrackBlock > 150.0 ? 20.0: @@ -4432,7 +4411,7 @@ TController::UpdateSituation(double dt) { 2.0 * fMaxProximityDist + 2.0 * vel ) ) { //others // jak tamten jedzie wolniej a jest w drodze hamowania AccPreferred = std::min( -0.9, AccPreferred ); - VelNext = Global::Min0RSpeed( std::round( k ) - 5.0, VelDesired ); + VelNext = min_speed( std::round( k ) - 5.0, VelDesired ); if( vehicle->fTrackBlock <= ( mvOccupied->CategoryFlag & 2 ? fMaxProximityDist : // cars @@ -4451,7 +4430,7 @@ TController::UpdateSituation(double dt) { if( OrderCurrentGet() & Connect ) { // if there's something nearby in the connect mode don't speed up too much VelDesired = - Global::Min0RSpeed( + min_speed( VelDesired, ( vehicle->fTrackBlock > 150.0 ? 20.0 : @@ -4479,28 +4458,28 @@ TController::UpdateSituation(double dt) { else if( VelSignal >= 0 ) { // jeśli skład był zatrzymany na początku i teraz już może jechać VelDesired = - Global::Min0RSpeed( + min_speed( VelDesired, VelSignal ); } if( mvOccupied->RunningTrack.Velmax >= 0 ) { // ograniczenie prędkości z trajektorii ruchu VelDesired = - Global::Min0RSpeed( + min_speed( VelDesired, mvOccupied->RunningTrack.Velmax ); // uwaga na ograniczenia szlakowej! } if( VelforDriver >= 0 ) { // tu jest zero przy zmianie kierunku jazdy // Ra: tu może być 40, jeśli mechanik nie ma znajomości szlaaku, albo kierowca jeździ 70 - VelDesired = Global::Min0RSpeed( VelDesired, VelforDriver ); + VelDesired = min_speed( VelDesired, VelforDriver ); } if( ( TrainParams != nullptr ) && ( TrainParams->CheckTrainLatency() < 5.0 ) && ( TrainParams->TTVmax > 0.0 ) ) { // jesli nie spozniony to nie przekraczać rozkladowej VelDesired = - Global::Min0RSpeed( + min_speed( VelDesired, TrainParams->TTVmax ); } @@ -4514,19 +4493,8 @@ TController::UpdateSituation(double dt) { if (iDrivigFlags & moveGuardSignal) { // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas stania iDrivigFlags &= ~moveGuardSignal; // tylko raz nadać -/* - if( ( iDrivigFlags & moveDoorOpened ) - && ( false == mvOccupied->DoorOpenCtrl ) ) { - // jeśli drzwi otwarte, niesterowane przez maszynistę - Doors( false ); // a EZT zamknie dopiero po odegraniu komunikatu kierownika - } -*/ - if( tsGuardSignal != nullptr ) { -#ifdef EU07_USE_OLD_SOUNDCODE - tsGuardSignal->Stop(); -#else - tsGuardSignal->stop(); -#endif + if( false == tsGuardSignal.empty() ) { + tsGuardSignal.stop(); // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy // bezpośrednim // albo trzeba zrobić dwa dźwięki, jeden bezpośredni, słyszalny w @@ -4535,32 +4503,21 @@ TController::UpdateSituation(double dt) { // obsługę kanałów radiowych itd. if( iGuardRadio == 0 ) { // jeśli nie przez radio -#ifdef EU07_USE_OLD_SOUNDCODE - tsGuardSignal->Play( 1.0, 0, !FreeFlyModeFlag, pVehicle->GetPosition() ); // dla true jest głośniej -#else - tsGuardSignal->owner( pVehicle ); + tsGuardSignal.owner( pVehicle ); // place virtual conductor some distance away - tsGuardSignal->offset( { pVehicle->MoverParameters->Dim.W * -0.75f, 1.7f, std::min( -20.0, -0.2 * fLength ) } ); - tsGuardSignal->play( sound_flags::exclusive ); -#endif + tsGuardSignal.offset( { pVehicle->MoverParameters->Dim.W * -0.75f, 1.7f, std::min( -20.0, -0.2 * fLength ) } ); + tsGuardSignal.play( sound_flags::exclusive ); } else { // if (iGuardRadio==iRadioChannel) //zgodność kanału // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu // (albo może mieć radio przenośne) - kierownik mógłby powtarzać // przy braku reakcji -#ifdef EU07_USE_OLD_SOUNDCODE - if( SquareMagnitude( pVehicle->GetPosition() - Global::pCameraPosition ) < 2000 * 2000 ) { - // w odległości mniejszej niż 2km - tsGuardSignal->Play( 1.0, 0, true, pVehicle->GetPosition() ); // dźwięk niby przez radio - } -#else // TODO: proper system for sending/receiving radio messages // place the sound in appropriate cab of the manned vehicle - tsGuardSignal->owner( pVehicle ); - tsGuardSignal->offset( { 0.f, 2.f, pVehicle->MoverParameters->Dim.L * 0.4f * ( pVehicle->MoverParameters->ActiveCab < 0 ? -1 : 1 ) } ); - tsGuardSignal->play( sound_flags::exclusive ); -#endif + tsGuardSignal.owner( pVehicle ); + tsGuardSignal.offset( { 0.f, 2.f, pVehicle->MoverParameters->Dim.L * 0.4f * ( pVehicle->MoverParameters->ActiveCab < 0 ? -1 : 1 ) } ); + tsGuardSignal.play( sound_flags::exclusive ); } } } @@ -4617,7 +4574,7 @@ TController::UpdateSituation(double dt) { // jak minął już maksymalny dystans po prostu hamuj (niski stopień) // ma stanąć, a jest w drodze hamowania albo ma jechać /* - VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); + VelDesired = min_speed( VelDesired, VelNext ); */ if( VelNext == 0.0 ) { if( mvOccupied->CategoryFlag & 1 ) { @@ -4626,7 +4583,7 @@ TController::UpdateSituation(double dt) { && ( pVehicles[0]->fTrackBlock < 50.0 ) ) { // crude detection of edge case, if approaching another vehicle coast slowly until min distance // this should allow to bunch up trainsets more on sidings - VelDesired = Global::Min0RSpeed( VelDesired, 5.0 ); + VelDesired = min_speed( VelDesired, 5.0 ); } else { // hamowanie tak, aby stanąć @@ -4637,7 +4594,7 @@ TController::UpdateSituation(double dt) { } else { // for cars (and others) coast at low speed until we hit min proximity range - VelDesired = Global::Min0RSpeed( VelDesired, 5.0 ); + VelDesired = min_speed( VelDesired, 5.0 ); } } } @@ -4662,7 +4619,7 @@ TController::UpdateSituation(double dt) { // jest bliżej niż fMinProximityDist // utrzymuj predkosc bo juz blisko /* - VelDesired = Global::Min0RSpeed( VelDesired, VelNext ); + VelDesired = min_speed( VelDesired, VelNext ); */ if( VelNext == 0.0 ) { VelDesired = VelNext; @@ -5455,7 +5412,6 @@ TCommandType TController::BackwardScan() // skanowanie sygnałów tylko gdy jedzie w trybie manewrowym albo czeka na rozkazy return cm_Unknown; } - vector3 sl; // kierunek jazdy względem sprzęgów pojazdu na czele int const startdir = -pVehicles[0]->DirectionGet(); if( startdir == 0 ) { @@ -5472,7 +5428,7 @@ TCommandType TController::BackwardScan() TEvent *e = NULL; // event potencjalnie od semafora // opcjonalnie może być skanowanie od "wskaźnika" z przodu, np. W5, Tm=Ms1, koniec toru wg drugiej osi w kierunku ruchu TTrack *scantrack = BackwardTraceRoute(scandist, scandir, pVehicles[0]->RaTrackGet(), e); - vector3 const dir = startdir * pVehicles[0]->VectorFront(); // wektor w kierunku jazdy/szukania + auto const dir = startdir * pVehicles[0]->VectorFront(); // wektor w kierunku jazdy/szukania if( !scantrack ) { // jeśli wstecz wykryto koniec toru to raczej nic się nie da w takiej sytuacji zrobić return cm_Unknown; @@ -5491,15 +5447,14 @@ TCommandType TController::BackwardScan() "Event1 " ) }; #endif // najpierw sprawdzamy, czy semafor czy inny znak został przejechany - vector3 pos = pVehicles[1]->RearPosition(); // pozycja tyłu - vector3 sem; // wektor do sygnału + auto pos = pVehicles[1]->RearPosition(); // pozycja tyłu if (e->Type == tp_GetValues) { // przesłać info o zbliżającym się semaforze #if LOGBACKSCAN edir += "(" + ( e->asNodeName ) + ")"; #endif - sl = e->PositionGet(); // położenie komórki pamięci - sem = sl - pos; // wektor do komórki pamięci od końca składu + auto sl = e->PositionGet(); // położenie komórki pamięci + auto sem = sl - pos; // wektor do komórki pamięci od końca składu if (dir.x * sem.x + dir.z * sem.z < 0) { // jeśli został minięty // iloczyn skalarny jest ujemny, gdy sygnał stoi z tyłu diff --git a/Driver.h b/Driver.h index 966c0887..4161b7e8 100644 --- a/Driver.h +++ b/Driver.h @@ -9,13 +9,10 @@ http://mozilla.org/MPL/2.0/. #pragma once -//#include -#include "Classes.h" -#include "dumb3d.h" -#include "mczapkie/mover.h" #include -using namespace Math3D; -using namespace Mtable; +#include "Classes.h" +#include "mczapkie/mover.h" +#include "sound.h" enum TOrders { // rozkazy dla AI @@ -134,7 +131,7 @@ class TSpeedPos // zwrotnicy,32-minięty,64=koniec,128=łuk // 0x100=event,0x200=manewrowa,0x400=przystanek,0x800=SBL,0x1000=wysłana komenda,0x2000=W5 // 0x4000=semafor,0x10000=zatkanie - vector3 vPos; // współrzędne XYZ do liczenia odległości + Math3D::vector3 vPos; // współrzędne XYZ do liczenia odległości struct { TTrack *trTrack{ nullptr }; // wskaźnik na tor o zmiennej prędkości (zwrotnica, obrotnica) @@ -238,13 +235,10 @@ private: TDynamicObject *pVehicles[2]; // skrajne pojazdy w składzie (niekoniecznie bezpośrednio sterowane) TMoverParameters *mvControlling = nullptr; // jakim pojazdem steruje (może silnikowym w EZT) TMoverParameters *mvOccupied = nullptr; // jakim pojazdem hamuje - TTrainParameters *TrainParams = nullptr; // rozkład jazdy zawsze jest, nawet jeśli pusty + Mtable::TTrainParameters *TrainParams = nullptr; // rozkład jazdy zawsze jest, nawet jeśli pusty int iRadioChannel = 1; // numer aktualnego kanału radiowego int iGuardRadio = 0; // numer kanału radiowego kierownika (0, gdy nie używa radia) -/* - TTextSound *tsGuardSignal = nullptr; // komunikat od kierownika -*/ - sound_source *tsGuardSignal { nullptr }; + sound_source tsGuardSignal { sound_placement::internal }; public: double AccPreferred = 0.0; // preferowane przyspieszenie (wg psychiki kierującego, zmniejszana przy wykryciu kolizji) double AccDesired = AccPreferred; // przyspieszenie, jakie ma utrzymywać (<0:nie przyspieszaj,<-0.1:hamuj) @@ -265,7 +259,7 @@ private: public: double ActualProximityDist = 1.0; // odległość brana pod uwagę przy wyliczaniu prędkości i przyspieszenia private: - vector3 vCommandLocation; // polozenie wskaznika, sygnalizatora lub innego obiektu do ktorego + Math3D::vector3 vCommandLocation; // polozenie wskaznika, sygnalizatora lub innego obiektu do ktorego // odnosi sie komenda TOrders OrderList[maxorders]; // lista rozkazów int OrderPos = 0, diff --git a/DynObj.cpp b/DynObj.cpp index 21f91194..bf418a16 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -16,12 +16,15 @@ http://mozilla.org/MPL/2.0/. #include "DynObj.h" #include "simulation.h" +#include "world.h" #include "train.h" #include "Globals.h" #include "Timer.h" #include "logs.h" #include "Console.h" #include "MdlMngr.h" +#include "renderer.h" +#include "uitranscripts.h" // Ra: taki zapis funkcjonuje lepiej, ale może nie jest optymalny #define vWorldFront Math3D::vector3(0, 0, 1) @@ -40,7 +43,7 @@ bool TDynamicObject::bDynamicRemove { false }; //--------------------------------------------------------------------------- void TAnimPant::AKP_4E() { // ustawienie wymiarów dla pantografu AKP-4E - vPos = vector3(0, 0, 0); // przypisanie domyśnych współczynników do pantografów + vPos = Math3D::vector3(0, 0, 0); // przypisanie domyśnych współczynników do pantografów fLenL1 = 1.22; // 1.176289 w modelach fLenU1 = 1.755; // 1.724482197 w modelach fHoriz = 0.535; // 0.54555075 przesunięcie ślizgu w długości pojazdu względem @@ -287,7 +290,7 @@ odwrócony }; */ -void TDynamicObject::ABuSetModelShake(vector3 mShake) +void TDynamicObject::ABuSetModelShake( Math3D::vector3 mShake ) { modelShake = mShake; }; @@ -406,14 +409,14 @@ void TDynamicObject::UpdateDoorTranslate(TAnim *pAnim) if( pAnim->iNumber & 1 ) { pAnim->smAnimated->SetTranslate( - vector3{ + Math3D::vector3{ 0.0, 0.0, dDoorMoveR } ); } else { pAnim->smAnimated->SetTranslate( - vector3{ + Math3D::vector3{ 0.0, 0.0, dDoorMoveL } ); @@ -492,7 +495,7 @@ void TDynamicObject::UpdateDoorPlug(TAnim *pAnim) if( pAnim->iNumber & 1 ) { pAnim->smAnimated->SetTranslate( - vector3 { + Math3D::vector3 { std::min( dDoorMoveR * 2, MoverParameters->DoorMaxPlugShift ), @@ -503,7 +506,7 @@ void TDynamicObject::UpdateDoorPlug(TAnim *pAnim) } else { pAnim->smAnimated->SetTranslate( - vector3 { + Math3D::vector3 { std::min( dDoorMoveL * 2, MoverParameters->DoorMaxPlugShift ), @@ -629,7 +632,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) // 'render' - juz // nie // przewody powietrzne, yB: decyzja na podstawie polaczen w t3d - if (Global::bnewAirCouplers) + if (Global.bnewAirCouplers) { SetPneumatic(false, false); // wczytywanie z t3d ulozenia wezykow SetPneumatic(true, false); // i zapisywanie do zmiennej @@ -809,10 +812,10 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) double dist = MoverParameters->Couplers[i].Dist / 2.0; if (smBuforLewy[i]) if (dist < 0) - smBuforLewy[i]->SetTranslate(vector3(dist, 0, 0)); + smBuforLewy[i]->SetTranslate( Math3D::vector3(dist, 0, 0)); if (smBuforPrawy[i]) if (dist < 0) - smBuforPrawy[i]->SetTranslate(vector3(dist, 0, 0)); + smBuforPrawy[i]->SetTranslate( Math3D::vector3(dist, 0, 0)); } } @@ -989,19 +992,19 @@ TDynamicObject * TDynamicObject::ABuFindNearestObject(TTrack *Track, TDynamicObj if( CouplNr == -2 ) { // wektor [kamera-obiekt] - poszukiwanie obiektu - if( LengthSquared3( Global::GetCameraPosition() - dynamic->vPosition ) < 100.0 ) { + if( LengthSquared3( Global.pCameraPosition - dynamic->vPosition ) < 100.0 ) { // 10 metrów return dynamic; } } else { // jeśli (CouplNr) inne niz -2, szukamy sprzęgu - if( LengthSquared3( Global::GetCameraPosition() - dynamic->vCoulpler[ 0 ] ) < 25.0 ) { + if( LengthSquared3( Global.pCameraPosition - dynamic->vCoulpler[ 0 ] ) < 25.0 ) { // 5 metrów CouplNr = 0; return dynamic; } - if( LengthSquared3( Global::GetCameraPosition() - dynamic->vCoulpler[ 1 ] ) < 25.0 ) { + if( LengthSquared3( Global.pCameraPosition - dynamic->vCoulpler[ 1 ] ) < 25.0 ) { // 5 metrów CouplNr = 1; return dynamic; @@ -1611,7 +1614,7 @@ void TDynamicObject::ABuScanObjects( int Direction, double Distance ) //----------ABu: koniec skanowania pojazdow TDynamicObject::TDynamicObject() { - modelShake = vector3(0, 0, 0); + modelShake = Math3D::vector3(0, 0, 0); fTrackBlock = 10000.0; // brak przeszkody na drodze btnOn = false; vUp = vWorldUp; @@ -1650,8 +1653,8 @@ TDynamicObject::TDynamicObject() { smBuforLewy[0] = smBuforLewy[1] = NULL; smBuforPrawy[0] = smBuforPrawy[1] = NULL; smBogie[0] = smBogie[1] = NULL; - bogieRot[0] = bogieRot[1] = vector3(0, 0, 0); - modelRot = vector3(0, 0, 0); + bogieRot[0] = bogieRot[1] = Math3D::vector3(0, 0, 0); + modelRot = Math3D::vector3(0, 0, 0); cp1 = cp2 = sp1 = sp2 = 0; iDirection = 1; // stoi w kierunku tradycyjnym (0, gdy jest odwrócony) iAxleFirst = 0; // numer pierwszej osi w kierunku ruchu (przełączenie @@ -2137,7 +2140,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // potem juz liczona prawidlowa wartosc masy MoverParameters->ComputeConstans(); // wektor podłogi dla wagonów, przesuwa ładunek - vFloor = vector3(0, 0, MoverParameters->Floor); + vFloor = Math3D::vector3(0, 0, MoverParameters->Floor); // długość większa od zera oznacza OK; 2mm docisku? return MoverParameters->Dim.L; @@ -2148,7 +2151,7 @@ TDynamicObject::create_controller( std::string const Type, bool const Trainset ) if( Type == "" ) { return; } - if( asName == Global::asHumanCtrlVehicle ) { + if( asName == Global.asHumanCtrlVehicle ) { // jeśli pojazd wybrany do prowadzenia if( MoverParameters->EngineType != Dumb ) { // wsadzamy tam sterującego @@ -2276,7 +2279,7 @@ void TDynamicObject::Move(double fDistance) // MoverParameters->Loc.Y= vPosition.z; // MoverParameters->Loc.Z= vPosition.y; // obliczanie pozycji sprzęgów do liczenia zderzeń - vector3 dir = (0.5 * MoverParameters->Dim.L) * vFront; // wektor sprzęgu + auto dir = (0.5 * MoverParameters->Dim.L) * vFront; // wektor sprzęgu vCoulpler[0] = vPosition + dir; // współrzędne sprzęgu na początku vCoulpler[1] = vPosition - dir; // współrzędne sprzęgu na końcu MoverParameters->vCoulpler[0] = vCoulpler[0]; // tymczasowo kopiowane na inny poziom @@ -2433,9 +2436,9 @@ void TDynamicObject::LoadUpdate() asBaseDir + MoverParameters->LoadType + ".t3d"; // zapamiętany katalog pojazdu // asLoadName=MoverParameters->LoadType; // if (MoverParameters->LoadType!=AnsiString("passengers")) - Global::asCurrentTexturePath = asBaseDir; // bieżąca ścieżka do tekstur to dynamic/... + Global.asCurrentTexturePath = asBaseDir; // bieżąca ścieżka do tekstur to dynamic/... mdLoad = TModelsManager::GetModel(asLoadName.c_str()); // nowy ładunek - Global::asCurrentTexturePath = + Global.asCurrentTexturePath = std::string(szTexturePath); // z powrotem defaultowa sciezka do tekstur // Ra: w MMD można by zapisać położenie modelu ładunku (np. węgiel) w // zależności od @@ -2580,7 +2583,7 @@ bool TDynamicObject::Update(double dt, double dt1) // TTrackParam tp; tp.Width = MyTrack->fTrackWidth; // McZapkie-250202 - tp.friction = MyTrack->fFriction * Global::fFriction; + tp.friction = MyTrack->fFriction * Global.fFriction; tp.CategoryFlag = MyTrack->iCategoryFlag & 15; tp.DamageFlag = MyTrack->iDamageFlag; tp.QualityFlag = MyTrack->iQualityFlag; @@ -2605,7 +2608,7 @@ bool TDynamicObject::Update(double dt, double dt1) // tmpTraction.TractionVoltage=0; if (MoverParameters->EnginePowerSource.SourceType == CurrentCollector) { // dla EZT tylko silnikowy - // if (Global::bLiveTraction) + // if (Global.bLiveTraction) { // Ra 2013-12: to niżej jest chyba trochę bez sensu double v = MoverParameters->PantRearVolt; if (v == 0.0) { @@ -2932,7 +2935,6 @@ bool TDynamicObject::Update(double dt, double dt1) bDynamicRemove = true; // sprawdzić return false; } - Global::ABuDebug = dDOMoveLen / dt1; ResetdMoveLen(); // McZapkie-260202 @@ -3015,15 +3017,13 @@ bool TDynamicObject::Update(double dt, double dt1) { MoverParameters->DecMainCtrl(1); } */ - if ((!Console::Pressed(Global::Keys[k_IncMainCtrl])) && - (MoverParameters->MainCtrlPos > MoverParameters->MainCtrlActualPos)) - { - MoverParameters->DecMainCtrl(1); + if( ( glfwGetKey( Global.window, GLFW_KEY_KP_ADD ) != GLFW_TRUE ) + && ( MoverParameters->MainCtrlPos > MoverParameters->MainCtrlActualPos ) ) { + MoverParameters->DecMainCtrl( 1 ); } - if ((!Console::Pressed(Global::Keys[k_DecMainCtrl])) && - (MoverParameters->MainCtrlPos < MoverParameters->MainCtrlActualPos)) - { - MoverParameters->IncMainCtrl(1); // Ra 15-01: a to nie miało być tylko cofanie? + if( ( glfwGetKey( Global.window, GLFW_KEY_KP_SUBTRACT ) != GLFW_TRUE ) + && ( MoverParameters->MainCtrlPos < MoverParameters->MainCtrlActualPos ) ) { + MoverParameters->IncMainCtrl( 1 ); // Ra 15-01: a to nie miało być tylko cofanie? } } @@ -3087,7 +3087,7 @@ bool TDynamicObject::Update(double dt, double dt1) switch (i) // numer pantografu { // trzeba usunąć to rozróżnienie case 0: - if( ( Global::bLiveTraction == false ) + if( ( Global.bLiveTraction == false ) && ( p->hvPowerWire == nullptr ) ) { // jeśli nie ma drutu, może pooszukiwać MoverParameters->PantFrontVolt = @@ -3120,7 +3120,7 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->PantFrontVolt = 0.0; break; case 1: - if( ( false == Global::bLiveTraction ) + if( ( false == Global.bLiveTraction ) && ( nullptr == p->hvPowerWire ) ) { // jeśli nie ma drutu, może pooszukiwać MoverParameters->PantRearVolt = @@ -3149,7 +3149,7 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->PantRearVolt = 0.0; } else { -// Global::iPause ^= 2; +// Global.iPause ^= 2; MoverParameters->PantRearVolt = 0.0; } break; @@ -3479,7 +3479,7 @@ void TDynamicObject::TurnOff() // przeliczanie dźwięków, bo będzie słychać bez wyświetlania sektora z pojazdem void TDynamicObject::RenderSounds() { - if( Global::iPause != 0 ) { return; } + if( Global.iPause != 0 ) { return; } double const dt{ Timer::GetDeltaRenderTime() }; double volume{ 0.0 }; @@ -3698,10 +3698,10 @@ void TDynamicObject::RenderSounds() { && ( false == rsOuterNoise.empty() ) && ( // compound test whether the vehicle belongs to user-driven consist (as these don't emit outer noise in cab view) FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise - // Global::pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) + // Global.pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) ctOwner == nullptr ? true : // standalone vehicle, can't be part of user-driven train - ctOwner != Global::pWorld->train()->Dynamic()->ctOwner ? true : // confirmed isn't a part of the user-driven train - Global::CabWindowOpen ? true : // sticking head out we get to hear outer noise + ctOwner != Global.pWorld->train()->Dynamic()->ctOwner ? true : // confirmed isn't a part of the user-driven train + Global.CabWindowOpen ? true : // sticking head out we get to hear outer noise false ) ) { // frequency calculation @@ -3867,7 +3867,7 @@ void TDynamicObject::RenderSounds() { void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, std::string ReplacableSkin ) { double dSDist; - Global::asCurrentDynamicPath = BaseDir; + Global.asCurrentDynamicPath = BaseDir; std::string asFileName = BaseDir + TypeName + ".mmd"; std::string asLoadName; if( false == MoverParameters->LoadType.empty() ) { @@ -3907,12 +3907,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_materialdata.multi_textures = clamp( m_materialdata.multi_textures, 0, 1 ); // na razie ustawiamy na 1 } asModel = BaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje modele w dynamics/basedir - Global::asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... + Global.asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... mdModel = TModelsManager::GetModel(asModel, true); assert( mdModel != nullptr ); // TODO: handle this more gracefully than all going to shit if (ReplacableSkin != "none") { - std::string nowheretexture = TextureTest(Global::asCurrentTexturePath + "nowhere"); // na razie prymitywnie + std::string nowheretexture = TextureTest(Global.asCurrentTexturePath + "nowhere"); // na razie prymitywnie if( false == nowheretexture.empty() ) { m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Material( nowheretexture ); } @@ -3926,7 +3926,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, int skinindex = 0; std::string texturename; nameparser >> texturename; while( ( texturename != "" ) && ( skinindex < 4 ) ) { - m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + texturename ); + m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + texturename ); ++skinindex; texturename = ""; nameparser >> texturename; } @@ -3936,7 +3936,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // otherwise try the basic approach int skinindex = 0; do { - material_handle material = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), true ); + material_handle material = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), true ); if( material == null_handle ) { break; } @@ -3946,12 +3946,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_materialdata.multi_textures = skinindex; if( m_materialdata.multi_textures == 0 ) { // zestaw nie zadziałał, próbujemy normanie - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + ReplacableSkin ); } } } else { - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global::asCurrentTexturePath + ReplacableSkin ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + ReplacableSkin ); } if( GfxRenderer.Material( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) { // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych @@ -4024,7 +4024,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } } } - Global::asCurrentTexturePath = szTexturePath; // z powrotem defaultowa sciezka do tekstur + Global.asCurrentTexturePath = szTexturePath; // z powrotem defaultowa sciezka do tekstur do { token = ""; parser.getTokens(); parser >> token; @@ -4043,7 +4043,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, parser.getTokens( 1, false ); parser >> ile; // ilość danego typu animacji // if (co==ANIM_PANTS) - // if (!Global::bLoadTraction) + // if (!Global.bLoadTraction) // if (!DebugModeFlag) //w debugmode pantografy mają "niby działać" // ile=0; //wyłączenie animacji pantografów if (co < ANIM_TYPES) @@ -4104,9 +4104,9 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, parser.getTokens(); parser >> asModel; asModel = BaseDir + asModel; // McZapkie-200702 - dynamics maja swoje modele w dynamic/basedir - Global::asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... + Global.asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... mdLowPolyInt = TModelsManager::GetModel(asModel, true); - // Global::asCurrentTexturePath=AnsiString(szTexturePath); //kiedyś uproszczone wnętrze mieszało tekstury nieba + // Global.asCurrentTexturePath=AnsiString(szTexturePath); //kiedyś uproszczone wnętrze mieszało tekstury nieba } if( token == "brakemode:" ) { @@ -4140,7 +4140,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, pAnimations[i].yUpdate = std::bind( &TDynamicObject::UpdateAxle, this, std::placeholders::_1 ); pAnimations[i].fMaxDist = 50 * MoverParameters->WheelDiameter; // nie kręcić w większej odległości pAnimations[i].fMaxDist *= pAnimations[i].fMaxDist * MoverParameters->WheelDiameter; // 50m do kwadratu, a średnica do trzeciej - pAnimations[i].fMaxDist *= Global::fDistanceFactor; // współczynnik przeliczeniowy jakości ekranu + pAnimations[i].fMaxDist *= Global.fDistanceFactor; // współczynnik przeliczeniowy jakości ekranu } } // Ra: ustawianie indeksów osi @@ -4970,8 +4970,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, if (mdLowPolyInt) mdLowPolyInt->Init(); - Global::asCurrentTexturePath = szTexturePath; // kiedyś uproszczone wnętrze mieszało tekstury nieba - Global::asCurrentDynamicPath = ""; + Global.asCurrentTexturePath = szTexturePath; // kiedyś uproszczone wnętrze mieszało tekstury nieba + Global.asCurrentDynamicPath = ""; // position sound emitters which weren't defined in the config file // engine sounds, centre of the vehicle @@ -5046,7 +5046,7 @@ void TDynamicObject::RadioStop() // add onscreen notification for human driver // TODO: do it selectively for the 'local' driver once the multiplayer is in if( false == Mechanik->AIControllFlag ) { - Global::tranTexts.AddLine( "!! RADIO-STOP !!", 0.0, 10.0, false ); + ui::Transcripts.AddLine( "!! RADIO-STOP !!", 0.0, 10.0, false ); } } } @@ -5255,7 +5255,7 @@ void TDynamicObject::CoupleDist() // double d1=MoverParameters->Couplers[1].CoupleDist; //sprzęg z tyłu // samochodu można olać, // dopóki nie jeździ na wstecznym - vector3 p1, p2; + Math3D::vector3 p1, p2; double d, w; // dopuszczalny dystans w poprzek MoverParameters->SetCoupleDist(); // liczenie standardowe if (MoverParameters->Couplers[0].Connected) // jeśli cokolwiek podłączone @@ -5425,9 +5425,9 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) // jak są 4 tekstury wymienne, to nie zmieniać rozkładem return; } - numer = Global::Bezogonkow(numer); + numer = Bezogonkow(numer); asDestination = to; - to = Global::Bezogonkow(to); // do szukania pliku obcinamy ogonki + to = Bezogonkow(to); // do szukania pliku obcinamy ogonki std::vector destinations = { asBaseDir + numer + "@" + MoverParameters->TypeName, @@ -6020,7 +6020,7 @@ vehicle_table::update_traction( TDynamicObject *Vehicle ) { } if( ( pantograph->hvPowerWire == nullptr ) - && ( false == Global::bLiveTraction ) ) { + && ( false == Global.bLiveTraction ) ) { // jeśli drut nie znaleziony ale można oszukiwać to dajemy coś tam dla picu Vehicle->pants[ pantographindex ].fParamPants->PantTraction = 1.4; } diff --git a/DynObj.h b/DynObj.h index 9a3305bd..0f7f941f 100644 --- a/DynObj.h +++ b/DynObj.h @@ -12,12 +12,13 @@ http://mozilla.org/MPL/2.0/. #include #include +#include "classes.h" +#include "material.h" +#include "mczapkie/mover.h" #include "TrkFoll.h" -// McZapkie: #include "Button.h" #include "AirCoupler.h" #include "sound.h" -#include "texture.h" //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- diff --git a/EU07.cpp b/EU07.cpp index 361927cf..c39eb8b8 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -79,8 +79,8 @@ void screenshot_save_thread( char *img ) png_image png; memset(&png, 0, sizeof(png_image)); png.version = PNG_IMAGE_VERSION; - png.width = Global::iWindowWidth; - png.height = Global::iWindowHeight; + png.width = Global.iWindowWidth; + png.height = Global.iWindowHeight; png.format = PNG_FORMAT_RGB; char datetime[64]; @@ -96,7 +96,7 @@ void screenshot_save_thread( char *img ) std::string filename = "screenshots/" + std::string(datetime) + "_" + std::to_string(perf) + ".png"; - if (png_image_write_to_file(&png, filename.c_str(), 0, img, -Global::iWindowWidth * 3, nullptr) == 1) + if (png_image_write_to_file(&png, filename.c_str(), 0, img, -Global.iWindowWidth * 3, nullptr) == 1) WriteLog("saved " + filename + "."); else WriteLog("failed to save screenshot."); @@ -106,8 +106,8 @@ void screenshot_save_thread( char *img ) void make_screenshot() { - char *img = new char[Global::iWindowWidth * Global::iWindowHeight * 3]; - glReadPixels(0, 0, Global::iWindowWidth, Global::iWindowHeight, GL_RGB, GL_UNSIGNED_BYTE, (GLvoid*)img); + char *img = new char[Global.iWindowWidth * Global.iWindowHeight * 3]; + glReadPixels(0, 0, Global.iWindowWidth, Global.iWindowHeight, GL_RGB, GL_UNSIGNED_BYTE, (GLvoid*)img); std::thread t(screenshot_save_thread, img); t.detach(); @@ -118,9 +118,9 @@ void window_resize_callback(GLFWwindow *window, int w, int h) { // NOTE: we have two variables which basically do the same thing as we don't have dynamic fullscreen toggle // TBD, TODO: merge them? - Global::iWindowWidth = w; - Global::iWindowHeight = h; - Global::fDistanceFactor = std::max( 0.5f, h / 768.0f ); // not sure if this is really something we want to use + Global.iWindowWidth = w; + Global.iWindowHeight = h; + Global.fDistanceFactor = std::max( 0.5f, h / 768.0f ); // not sure if this is really something we want to use glViewport(0, 0, w, h); } @@ -128,7 +128,7 @@ void cursor_pos_callback(GLFWwindow *window, double x, double y) { input::Mouse.move( x, y ); - if( true == Global::ControlPicking ) { + if( true == Global.ControlPicking ) { glfwSetCursorPos( window, x, y ); } else { @@ -149,16 +149,16 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo input::Keyboard.key( key, action ); - Global::shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; - Global::ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; + Global.shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; + Global.ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; - if( ( true == Global::InputMouse ) + if( ( true == Global.InputMouse ) && ( ( key == GLFW_KEY_LEFT_ALT ) || ( key == GLFW_KEY_RIGHT_ALT ) ) ) { // if the alt key was pressed toggle control picking mode and set matching cursor behaviour if( action == GLFW_RELEASE ) { - if( Global::ControlPicking ) { + if( Global.ControlPicking ) { // switch off glfwGetCursorPos( window, &input::mouse_pickmodepos.x, &input::mouse_pickmodepos.y ); glfwSetInputMode( window, GLFW_CURSOR, GLFW_CURSOR_DISABLED ); @@ -170,7 +170,7 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo glfwSetCursorPos( window, input::mouse_pickmodepos.x, input::mouse_pickmodepos.y ); } // actually toggle the mode - Global::ControlPicking = !Global::ControlPicking; + Global.ControlPicking = !Global.ControlPicking; } } @@ -203,18 +203,18 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo void focus_callback( GLFWwindow *window, int focus ) { - if( Global::bInactivePause ) // jeśli ma być pauzowanie okna w tle + if( Global.bInactivePause ) // jeśli ma być pauzowanie okna w tle if( focus ) - Global::iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie + Global.iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie else - Global::iPause |= 4; // włączenie pauzy, gdy nieaktywy + Global.iPause |= 4; // włączenie pauzy, gdy nieaktywy } void scroll_callback( GLFWwindow* window, double xoffset, double yoffset ) { - if( Global::ctrlState ) { + if( Global.ctrlState ) { // ctrl + scroll wheel adjusts fov in debug mode - Global::FieldOfView = clamp( static_cast(Global::FieldOfView - yoffset * 20.0 / Global::fFpsAverage), 15.0f, 75.0f ); + Global.FieldOfView = clamp( static_cast(Global.FieldOfView - yoffset * 20.0 / Global.fFpsAverage), 15.0f, 75.0f ); } } @@ -253,18 +253,17 @@ int main(int argc, char *argv[]) DeleteFile( "errors.txt" ); _mkdir("logs"); #endif - Global::LoadIniFile("eu07.ini"); - Global::InitKeys(); + Global.LoadIniFile("eu07.ini"); // hunter-271211: ukrywanie konsoli - if( Global::iWriteLogEnabled & 2 ) + if( Global.iWriteLogEnabled & 2 ) { AllocConsole(); SetConsoleTextAttribute( GetStdHandle( STD_OUTPUT_HANDLE ), FOREGROUND_GREEN ); } /* std::string executable( argv[ 0 ] ); auto const pathend = executable.rfind( '\\' ); - Global::ExecutableName = + Global.ExecutableName = ( pathend != std::string::npos ? executable.substr( executable.rfind( '\\' ) + 1 ) : executable ); @@ -301,7 +300,7 @@ int main(int argc, char *argv[]) &stringdata, &datasize ) ) { - Global::asVersion = std::string( reinterpret_cast(stringdata) ); + Global.asVersion = std::string( reinterpret_cast(stringdata) ); } } } @@ -311,18 +310,18 @@ int main(int argc, char *argv[]) std::string token(argv[i]); if (token == "-e3d") { - if (Global::iConvertModels > 0) - Global::iConvertModels = -Global::iConvertModels; + if (Global.iConvertModels > 0) + Global.iConvertModels = -Global.iConvertModels; else - Global::iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity + Global.iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity } else if (i + 1 < argc && token == "-s") - Global::SceneryFile = std::string(argv[++i]); + Global.SceneryFile = std::string(argv[++i]); else if (i + 1 < argc && token == "-v") { std::string v(argv[++i]); std::transform(v.begin(), v.end(), v.begin(), ::tolower); - Global::asHumanCtrlVehicle = v; + Global.asHumanCtrlVehicle = v; } else { @@ -347,23 +346,23 @@ int main(int argc, char *argv[]) glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); glfwWindowHint(GLFW_AUTO_ICONIFY, GLFW_FALSE); - if( Global::iMultisampling > 0 ) { - glfwWindowHint( GLFW_SAMPLES, 1 << Global::iMultisampling ); + if( Global.iMultisampling > 0 ) { + glfwWindowHint( GLFW_SAMPLES, 1 << Global.iMultisampling ); } - if (Global::bFullScreen) + if (Global.bFullScreen) { // match screen dimensions with selected monitor, for 'borderless window' in fullscreen mode - Global::iWindowWidth = vmode->width; - Global::iWindowHeight = vmode->height; + Global.iWindowWidth = vmode->width; + Global.iWindowHeight = vmode->height; } GLFWwindow *window = glfwCreateWindow( - Global::iWindowWidth, - Global::iWindowHeight, - Global::AppName.c_str(), - ( Global::bFullScreen ? + Global.iWindowWidth, + Global.iWindowHeight, + Global.AppName.c_str(), + ( Global.bFullScreen ? monitor : nullptr), nullptr ); @@ -374,7 +373,7 @@ int main(int argc, char *argv[]) return -1; } glfwMakeContextCurrent(window); - glfwSwapInterval(Global::VSync ? 1 : 0); //vsync + 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); @@ -415,7 +414,7 @@ int main(int argc, char *argv[]) input::Mouse.init(); input::Gamepad.init(); - Global::pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów + Global.pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów try { if( false == World.Init( window ) ) { ErrorLog( "Simulation setup failed" ); @@ -433,8 +432,8 @@ int main(int argc, char *argv[]) if( !joyGetNumDevs() ) WriteLog( "No joystick" ); */ - if( Global::iConvertModels < 0 ) { - Global::iConvertModels = -Global::iConvertModels; + if( Global.iConvertModels < 0 ) { + Global.iConvertModels = -Global.iConvertModels; World.CreateE3D( "models\\" ); // rekurencyjne przeglądanie katalogów World.CreateE3D( "dynamic\\", true ); } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć @@ -447,8 +446,8 @@ int main(int argc, char *argv[]) && ( true == GfxRenderer.Render() ) ) { glfwPollEvents(); input::Keyboard.poll(); - if( true == Global::InputMouse ) { input::Mouse.poll(); } - if( true == Global::InputGamepad ) { input::Gamepad.poll(); } + if( true == Global.InputMouse ) { input::Mouse.poll(); } + if( true == Global.InputGamepad ) { input::Gamepad.poll(); } } } catch( std::bad_alloc const &Error ) { diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 38c23da1..72da61a1 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "EvLaunch.h" + #include "Globals.h" #include "Logs.h" #include "Event.h" @@ -22,6 +23,8 @@ http://mozilla.org/MPL/2.0/. #include "Timer.h" #include "parser.h" #include "Console.h" +#include "world.h" +#include "utilities.h" //--------------------------------------------------------------------------- @@ -128,14 +131,14 @@ bool TEventLauncher::check_conditions() bool bCond = false; if (iKey != 0) { - if( Global::bActive ) { + if( Global.bActive ) { // tylko jeśli okno jest aktywne if( iKey > 255 ) { // key and modifier auto const modifier = ( iKey & 0xff00 ) >> 8; bCond = ( Console::Pressed( iKey & 0xff ) ) - && ( ( modifier & 1 ) ? Global::shiftState : true ) - && ( ( modifier & 2 ) ? Global::ctrlState : true ); + && ( ( modifier & 1 ) ? Global.shiftState : true ) + && ( ( modifier & 2 ) ? Global.ctrlState : true ); } else { // just key diff --git a/Event.cpp b/Event.cpp index 58d67788..1d0967dd 100644 --- a/Event.cpp +++ b/Event.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "event.h" #include "simulation.h" +#include "world.h" #include "globals.h" #include "timer.h" #include "logs.h" @@ -780,7 +781,7 @@ event_manager::insert( TEvent *Event ) { } auto *duplicate = m_events[ lookup->second ]; - if( Global::bJoinEvents ) { + if( Global.bJoinEvents ) { // doczepka (taki wirtualny multiple bez warunków) duplicate->Append( Event ); } @@ -959,7 +960,7 @@ event_manager::CheckQuery() { case tp_GetValues: { if( m_workevent->Activator ) { // TODO: re-enable when messaging module is in place - if( Global::iMultiplayer ) { + if( Global.iMultiplayer ) { // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); } @@ -1019,7 +1020,7 @@ event_manager::CheckQuery() { } case tp_Exit: { MessageBox( 0, m_workevent->asNodeName.c_str(), " THE END ", MB_OK ); - Global::iTextMode = -1; // wyłączenie takie samo jak sekwencja F10 -> Y + Global.iTextMode = -1; // wyłączenie takie samo jak sekwencja F10 -> Y return false; } case tp_Sound: { @@ -1034,7 +1035,7 @@ event_manager::CheckQuery() { } case 1: { if( m_workevent->Params[ 1 ].asdouble > 0.0 ) { - Global::pWorld->radio_message( + Global.pWorld->radio_message( m_workevent->Params[ 9 ].tsTextSound, static_cast( m_workevent->Params[ 1 ].asdouble ) ); } @@ -1098,7 +1099,7 @@ event_manager::CheckQuery() { m_workevent->Params[ 1 ].asdouble, m_workevent->Params[ 2 ].asdouble ); } - if( Global::iMultiplayer ) { + if( Global.iMultiplayer ) { // dajemy znać do serwera o przełożeniu multiplayer::WyslijEvent( m_workevent->asName, "" ); // wysłanie nazwy eventu przełączajacego } @@ -1141,7 +1142,7 @@ event_manager::CheckQuery() { } } } - if( Global::iMultiplayer ) { + if( Global.iMultiplayer ) { // dajemy znać do serwera o wykonaniu if( ( m_workevent->iFlags & conditional_anyelse ) == 0 ) { // jednoznaczne tylko, gdy nie było else @@ -1255,7 +1256,7 @@ event_manager::CheckQuery() { case tp_Friction: // zmiana tarcia na scenerii { // na razie takie chamskie ustawienie napięcia zasilania WriteLog("Type: Friction"); - Global::fFriction = (m_workevent->Params[0].asdouble); + Global.fFriction = (m_workevent->Params[0].asdouble); } break; case tp_Message: // wyświetlenie komunikatu diff --git a/Event.h b/Event.h index 642e4cbf..d6492795 100644 --- a/Event.h +++ b/Event.h @@ -9,11 +9,9 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include -#include "dumb3d.h" #include "classes.h" +#include "dumb3d.h" #include "names.h" -#include "scenenode.h" #include "evlaunch.h" enum TEventType { diff --git a/Globals.cpp b/Globals.cpp index 080bc445..275d70da 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -20,188 +20,19 @@ http://mozilla.org/MPL/2.0/. #include "Console.h" #include "PyInt.h" -// namespace Global { +global_settings Global; -// parametry do użytku wewnętrznego -std::string Global::AppName{ "EU07" }; -std::string Global::asCurrentSceneryPath = "scenery/"; -std::string Global::asCurrentTexturePath = std::string(szTexturePath); -std::string Global::asCurrentDynamicPath = ""; -int Global::iSlowMotion = 0; // info o malym FPS: 0-OK, 1-wyłączyć multisampling, 3-promień 1.5km, 7-1km -TDynamicObject *Global::changeDynObj = NULL; // info o zmianie pojazdu -double Global::ABuDebug = 0; -std::string Global::asSky = "1"; -double Global::fLuminance = 1.0; // jasność światła do automatycznego zapalania -float Global::SunAngle = 0.0f; -int Global::ScreenWidth = 1; -int Global::ScreenHeight = 1; -float Global::ZoomFactor = 1.0f; -float Global::FieldOfView = 45.0f; -GLFWwindow *Global::window; -bool Global::shiftState; -bool Global::ctrlState; -bool Global::CabWindowOpen { false }; -int Global::iCameraLast = -1; -std::string Global::asVersion = "couldn't retrieve version string"; -bool Global::ControlPicking = false; // indicates controls pick mode is enabled -bool Global::InputMouse = true; // whether control pick mode can be activated -int Global::iTextMode = 0; // tryb pracy wyświetlacza tekstowego -int Global::iScreenMode[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; // numer ekranu wyświetlacza tekstowego -double Global::fTimeAngleDeg = 0.0; // godzina w postaci kąta -float Global::fClockAngleDeg[6]; // kąty obrotu cylindrów dla zegara cyfrowego -std::string Global::szTexturesTGA = ".tga"; // lista tekstur od TGA -std::string Global::szTexturesDDS = ".dds"; // lista tekstur od DDS -int Global::iPause = 0; // 0x10; // globalna pauza ruchu -bool Global::bActive = true; // czy jest aktywnym oknem -TWorld *Global::pWorld = NULL; -TCamera *Global::pCamera = NULL; // parametry kamery -TTranscripts Global::tranTexts; // obiekt obsługujący stenogramy dźwięków na ekranie -float4 Global::UITextColor = float4( 225.0 / 255.0f, 225.0f / 255.0f, 225.0f / 255.0f, 1.0f ); +void +global_settings::LoadIniFile(std::string asFileName) { -vector3 Global::pCameraPosition; -vector3 Global::DebugCameraPosition; -std::vector Global::FreeCameraInit; -std::vector Global::FreeCameraInitAngle; -// parametry scenerii -GLfloat Global::FogColor[] = {0.6f, 0.7f, 0.8f}; -double Global::fFogStart = 1700; -double Global::fFogEnd = 2000; -float Global::Overcast { 0.1f }; // NOTE: all this weather stuff should be moved elsewhere -std::string Global::Season; // season of the year, based on simulation date -std::string Global::Weather { "clear" }; // current weather - -float Global::BaseDrawRange { 2500.f }; -opengl_light Global::DayLight; -int Global::DynamicLightCount { 3 }; -bool Global::ScaleSpecularValues { true }; -bool Global::BasicRenderer { false }; -bool Global::RenderShadows { true }; -Global::shadowtune_t Global::shadowtune = { 2048, 250.f, 250.f, 500.f }; -bool Global::bRollFix = true; // czy wykonać przeliczanie przechyłki -bool Global::bJoinEvents = false; // czy grupować eventy o tych samych nazwach -int Global::iHiddenEvents = 1; // czy łączyć eventy z torami poprzez nazwę toru - -// parametry użytkowe (jak komu pasuje) -int Global::Keys[MaxKeys]; -bool Global::RealisticControlMode{ false }; -int Global::iWindowWidth = 800; -int Global::iWindowHeight = 600; -float Global::fDistanceFactor = Global::iWindowHeight / 768.0; // baza do przeliczania odległości dla LoD -int Global::iFeedbackMode = 1; // tryb pracy informacji zwrotnej -int Global::iFeedbackPort = 0; // dodatkowy adres dla informacji zwrotnych -bool Global::InputGamepad{ true }; -bool Global::bFreeFly = false; -bool Global::bFullScreen = false; -bool Global::VSync{ false }; -bool Global::bInactivePause = true; // automatyczna pauza, gdy okno nieaktywne -float Global::fMouseXScale = 1.5f; -float Global::fMouseYScale = 0.2f; -std::string Global::SceneryFile = "td.scn"; -std::string Global::asHumanCtrlVehicle = "EU07-424"; -int Global::iMultiplayer = 0; // blokada działania niektórych funkcji na rzecz komunikacji -double Global::fMoveLight = -1; // ruchome światło -bool Global::FakeLight{ false }; // toggle between fixed and dynamic daylight -double Global::fLatitudeDeg = 52.0; // szerokość geograficzna -float Global::fFriction = 1.0; // mnożnik tarcia - KURS90 -double Global::fBrakeStep = 1.0; // krok zmiany hamulca dla klawiszy [Num3] i [Num9] -std::string Global::asLang = "pl"; // domyślny język - http://tools.ietf.org/html/bcp47 - -// parametry wydajnościowe (np. regulacja FPS, szybkość wczytywania) -bool Global::bAdjustScreenFreq = true; -bool Global::bEnableTraction = true; -bool Global::bLoadTraction = true; -bool Global::bLiveTraction = true; -float Global::AnisotropicFiltering = 8.0f; // requested level of anisotropic filtering. TODO: move it to renderer object -bool Global::bUseVBO = true; // czy jest VBO w karcie graficznej (czy użyć) -std::string Global::LastGLError; -GLint Global::iMaxTextureSize = 4096; // maksymalny rozmiar tekstury -bool Global::bSmoothTraction { true }; // wygładzanie drutów starym sposobem -float Global::SplineFidelity { 1.f }; // determines segment size during conversion of splines to geometry -bool Global::ResourceSweep { true }; // gfx resource garbage collection -bool Global::ResourceMove { false }; // gfx resources are moved between cpu and gpu side instead of sending a copy -std::string Global::szDefaultExt = Global::szTexturesDDS; // domyślnie od DDS -int Global::iMultisampling = 2; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px -bool Global::DLFont{ false }; // switch indicating presence of basic font -bool Global::bGlutFont = false; // czy tekst generowany przez GLUT32.DLL -//int Global::iConvertModels = 7; // tworzenie plików binarnych, +2-optymalizacja transformów -int Global::iConvertModels{ 0 }; // temporary override, to prevent generation of .e3d not compatible with old exe -int Global::iSlowMotionMask = -1; // maska wyłączanych właściwości dla zwiększenia FPS -// bool Global::bTerrainCompact=true; //czy zapisać teren w pliku -double Global::fFpsAverage = 20.0; // oczekiwana wartosć FPS -double Global::fFpsDeviation = 5.0; // odchylenie standardowe FPS -double Global::fFpsMin = 30.0; // dolna granica FPS, przy której promień scenerii będzie zmniejszany -double Global::fFpsMax = 65.0; // górna granica FPS, przy której promień scenerii będzie zwiększany -bool Global::FullPhysics { true }; // full calculations performed for each simulation step - -// parametry testowe (do testowania scenerii i obiektów) -bool Global::bWireFrame = false; - -// sound renderer -bool Global::bSoundEnabled = true; -float Global::AudioVolume = 1.5f; -std::string Global::AudioRenderer; - -int Global::iWriteLogEnabled = 3; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów -bool Global::MultipleLogs { false }; -unsigned int Global::DisabledLogTypes { 0 }; - -// parametry do kalibracji -// kolejno współczynniki dla potęg 0, 1, 2, 3 wartości odczytanej z urządzenia -double Global::fCalibrateIn[6][6] = {{0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}}; -double Global::fCalibrateOut[7][6] = {{0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}, - {0, 1, 0, 0, 0, 0}}; -double Global::fCalibrateOutMax[7] = {0, 0, 0, 0, 0, 0, 0}; -int Global::iCalibrateOutDebugInfo = -1; -int Global::iPoKeysPWM[7] = {0, 1, 2, 3, 4, 5, 6}; -// parametry przejściowe (do usunięcia) -// bool Global::bTimeChange=false; //Ra: ZiomalCl wyłączył starą wersję nocy -// bool Global::bRenderAlpha=true; //Ra: wywaliłam tę flagę -bool Global::bnewAirCouplers = true; -double Global::fTimeSpeed = 1.0; // przyspieszenie czasu, zmienna do testów -bool Global::bHideConsole = false; // hunter-271211: ukrywanie konsoli -//randomizacja -std::mt19937 Global::random_engine = std::mt19937(std::time(NULL)); -// maciek001: konfiguracja wstępna portu COM -bool Global::bMWDmasterEnable = false; // główne włączenie portu! -bool Global::bMWDdebugEnable = false; // włącz dodawanie do logu -int Global::iMWDDebugMode = 0; // co ma wyświetlać w logu -std::string Global::sMWDPortId = "COM1"; // nazwa portu z którego korzystamy -unsigned long int Global::iMWDBaudrate = 9600; // prędkość transmisji danych -bool Global::bMWDInputEnable = false; // włącz wejścia -bool Global::bMWDBreakEnable = false; // włącz wejścia analogowe -double Global::fMWDAnalogInCalib[4][2] = { { 0, 1023 },{ 0, 1023 },{ 0, 1023 },{ 0, 1023 } }; // wartość max potencjometru, wartość min potencjometru, rozdzielczość (max. wartość jaka może być) -double Global::fMWDzg[2] = { 0.9, 1023 }; -double Global::fMWDpg[2] = { 0.8, 1023 }; -double Global::fMWDph[2] = { 0.6, 1023 }; -double Global::fMWDvolt[2] = { 4000, 1023 }; -double Global::fMWDamp[2] = { 800, 1023 }; -double Global::fMWDlowVolt[2] = { 150, 1023 }; -int Global::iMWDdivider = 5; - -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- -//--------------------------------------------------------------------------- - -void Global::LoadIniFile(std::string asFileName) -{ FreeCameraInit.resize( 10 ); FreeCameraInitAngle.resize( 10 ); cParser parser(asFileName, cParser::buffer_FILE); ConfigParse(parser); }; -void Global::ConfigParse(cParser &Parser) -{ +void +global_settings::ConfigParse(cParser &Parser) { std::string token; do @@ -215,66 +46,66 @@ void Global::ConfigParse(cParser &Parser) { Parser.getTokens(); - Parser >> Global::SceneryFile; + Parser >> SceneryFile; } else if (token == "humanctrlvehicle") { Parser.getTokens(); - Parser >> Global::asHumanCtrlVehicle; + Parser >> asHumanCtrlVehicle; } else if( token == "fieldofview" ) { Parser.getTokens( 1, false ); - Parser >> Global::FieldOfView; + Parser >> FieldOfView; // guard against incorrect values - Global::FieldOfView = clamp( Global::FieldOfView, 15.0f, 75.0f ); + FieldOfView = clamp( FieldOfView, 15.0f, 75.0f ); } else if (token == "width") { Parser.getTokens(1, false); - Parser >> Global::iWindowWidth; + Parser >> iWindowWidth; } else if (token == "height") { Parser.getTokens(1, false); - Parser >> Global::iWindowHeight; + Parser >> iWindowHeight; } else if (token == "heightbase") { Parser.getTokens(1, false); - Parser >> Global::fDistanceFactor; + Parser >> fDistanceFactor; } else if (token == "fullscreen") { Parser.getTokens(); - Parser >> Global::bFullScreen; + Parser >> bFullScreen; } else if( token == "vsync" ) { Parser.getTokens(); - Parser >> Global::VSync; + Parser >> VSync; } else if (token == "freefly") { // Mczapkie-130302 Parser.getTokens(); - Parser >> Global::bFreeFly; + Parser >> bFreeFly; Parser.getTokens(3, false); Parser >> - Global::FreeCameraInit[0].x, - Global::FreeCameraInit[0].y, - Global::FreeCameraInit[0].z; + FreeCameraInit[0].x, + FreeCameraInit[0].y, + FreeCameraInit[0].z; } else if (token == "wireframe") { Parser.getTokens(); - Parser >> Global::bWireFrame; + Parser >> bWireFrame; } else if (token == "debugmode") { // McZapkie! - DebugModeFlag uzywana w mover.pas, @@ -287,17 +118,17 @@ void Global::ConfigParse(cParser &Parser) // sie do debugowania oraz na komp. bez karty // dzw. Parser.getTokens(); - Parser >> Global::bSoundEnabled; + Parser >> bSoundEnabled; } else if( token == "sound.openal.renderer" ) { // selected device for audio renderer - Global::AudioRenderer = Parser.getToken( false ); // case-sensitive + AudioRenderer = Parser.getToken( false ); // case-sensitive } else if( token == "sound.volume" ) { // selected device for audio renderer Parser.getTokens(); - Parser >> Global::AudioVolume; - Global::AudioVolume = clamp( Global::AudioVolume, 1.f, 4.f ); + Parser >> AudioVolume; + AudioVolume = clamp( AudioVolume, 1.f, 4.f ); } // else if (str==AnsiString("renderalpha")) //McZapkie-1312302 - dwuprzebiegowe renderowanie // bRenderAlpha=(GetNextSymbol().LowerCase()==AnsiString("yes")); @@ -311,7 +142,7 @@ void Global::ConfigParse(cParser &Parser) { // McZapkie-291103 - usypianie fizyki Parser.getTokens(); - Parser >> Global::FullPhysics; + Parser >> FullPhysics; } else if (token == "debuglog") { @@ -320,73 +151,73 @@ void Global::ConfigParse(cParser &Parser) Parser >> token; if (token == "yes") { - Global::iWriteLogEnabled = 3; + iWriteLogEnabled = 3; } else if (token == "no") { - Global::iWriteLogEnabled = 0; + iWriteLogEnabled = 0; } else { - Global::iWriteLogEnabled = stol_def(token,3); + iWriteLogEnabled = stol_def(token,3); } } else if( token == "multiplelogs" ) { Parser.getTokens(); - Parser >> Global::MultipleLogs; + Parser >> MultipleLogs; } else if( token == "logs.filter" ) { Parser.getTokens(); - Parser >> Global::DisabledLogTypes; + Parser >> DisabledLogTypes; } else if( token == "adjustscreenfreq" ) { // McZapkie-240403 - czestotliwosc odswiezania ekranu Parser.getTokens(); - Parser >> Global::bAdjustScreenFreq; + Parser >> bAdjustScreenFreq; } else if (token == "mousescale") { // McZapkie-060503 - czulosc ruchu myszy (krecenia glowa) Parser.getTokens(2, false); - Parser >> Global::fMouseXScale >> Global::fMouseYScale; + Parser >> fMouseXScale >> fMouseYScale; } else if( token == "mousecontrol" ) { // whether control pick mode can be activated Parser.getTokens(); - Parser >> Global::InputMouse; + Parser >> InputMouse; } else if (token == "enabletraction") { // Winger 040204 - 'zywe' patyki dostosowujace sie do trakcji; Ra 2014-03: teraz łamanie Parser.getTokens(); - Parser >> Global::bEnableTraction; + Parser >> bEnableTraction; } else if (token == "loadtraction") { // Winger 140404 - ladowanie sie trakcji Parser.getTokens(); - Parser >> Global::bLoadTraction; + Parser >> bLoadTraction; } else if (token == "friction") { // mnożnik tarcia - KURS90 Parser.getTokens(1, false); - Parser >> Global::fFriction; + Parser >> fFriction; } else if (token == "livetraction") { // Winger 160404 - zaleznosc napiecia loka od trakcji; // Ra 2014-03: teraz prąd przy braku sieci Parser.getTokens(); - Parser >> Global::bLiveTraction; + Parser >> bLiveTraction; } else if (token == "skyenabled") { // youBy - niebo Parser.getTokens(); Parser >> token; - Global::asSky = (token == "yes" ? "1" : "0"); + asSky = (token == "yes" ? "1" : "0"); } else if (token == "defaultext") { @@ -396,10 +227,10 @@ void Global::ConfigParse(cParser &Parser) if (token == "tga") { // domyślnie od TGA - Global::szDefaultExt = Global::szTexturesTGA; + szDefaultExt = szTexturesTGA; } else { - Global::szDefaultExt = + szDefaultExt = ( token[ 0 ] == '.' ? token : "." + token ); @@ -409,36 +240,36 @@ void Global::ConfigParse(cParser &Parser) { Parser.getTokens(); - Parser >> Global::bnewAirCouplers; + Parser >> bnewAirCouplers; } else if( token == "anisotropicfiltering" ) { Parser.getTokens( 1, false ); - Parser >> Global::AnisotropicFiltering; + Parser >> AnisotropicFiltering; } else if( token == "usevbo" ) { Parser.getTokens(); - Parser >> Global::bUseVBO; + Parser >> bUseVBO; } else if (token == "feedbackmode") { Parser.getTokens(1, false); - Parser >> Global::iFeedbackMode; + Parser >> iFeedbackMode; } else if (token == "feedbackport") { Parser.getTokens(1, false); - Parser >> Global::iFeedbackPort; + Parser >> iFeedbackPort; } else if (token == "multiplayer") { Parser.getTokens(1, false); - Parser >> Global::iMultiplayer; + Parser >> iMultiplayer; } else if (token == "maxtexturesize") { @@ -446,155 +277,155 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(1, false); int size; Parser >> size; - if (size <= 64) { Global::iMaxTextureSize = 64; } - else if (size <= 128) { Global::iMaxTextureSize = 128; } - else if (size <= 256) { Global::iMaxTextureSize = 256; } - else if (size <= 512) { Global::iMaxTextureSize = 512; } - else if (size <= 1024) { Global::iMaxTextureSize = 1024; } - else if (size <= 2048) { Global::iMaxTextureSize = 2048; } - else if (size <= 4096) { Global::iMaxTextureSize = 4096; } - else if (size <= 8192) { Global::iMaxTextureSize = 8192; } - else { Global::iMaxTextureSize = 16384; } + if (size <= 64) { iMaxTextureSize = 64; } + else if (size <= 128) { iMaxTextureSize = 128; } + else if (size <= 256) { iMaxTextureSize = 256; } + else if (size <= 512) { iMaxTextureSize = 512; } + else if (size <= 1024) { iMaxTextureSize = 1024; } + else if (size <= 2048) { iMaxTextureSize = 2048; } + else if (size <= 4096) { iMaxTextureSize = 4096; } + else if (size <= 8192) { iMaxTextureSize = 8192; } + else { iMaxTextureSize = 16384; } } else if (token == "movelight") { // numer dnia w roku albo -1 Parser.getTokens(1, false); - Parser >> Global::fMoveLight; - if (Global::fMoveLight == 0.f) + Parser >> fMoveLight; + if (fMoveLight == 0.f) { // pobranie daty z systemu std::time_t timenow = std::time(0); std::tm *localtime = std::localtime(&timenow); - Global::fMoveLight = localtime->tm_yday + 1; // numer bieżącego dnia w roku + fMoveLight = localtime->tm_yday + 1; // numer bieżącego dnia w roku } - Global::pWorld->compute_season( Global::fMoveLight ); + pWorld->compute_season( fMoveLight ); } else if( token == "dynamiclights" ) { // number of dynamic lights in the scene Parser.getTokens( 1, false ); - Parser >> Global::DynamicLightCount; + Parser >> DynamicLightCount; // clamp the light number // max 8 lights per opengl specs, minus one used for sun. at least one light for controlled vehicle - Global::DynamicLightCount = clamp( Global::DynamicLightCount, 1, 7 ); + DynamicLightCount = clamp( DynamicLightCount, 1, 7 ); } else if( token == "scalespeculars" ) { // whether strength of specular highlights should be adjusted (generally needed for legacy 3d models) Parser.getTokens(); - Parser >> Global::ScaleSpecularValues; + Parser >> ScaleSpecularValues; } else if( token == "gfxrenderer" ) { // shadow render toggle std::string gfxrenderer; Parser.getTokens(); Parser >> gfxrenderer; - Global::BasicRenderer = ( gfxrenderer == "simple" ); + BasicRenderer = ( gfxrenderer == "simple" ); } else if( token == "shadows" ) { // shadow render toggle Parser.getTokens(); - Parser >> Global::RenderShadows; + Parser >> RenderShadows; } else if( token == "shadowtune" ) { Parser.getTokens( 4, false ); Parser - >> Global::shadowtune.map_size - >> Global::shadowtune.width - >> Global::shadowtune.depth - >> Global::shadowtune.distance; + >> shadowtune.map_size + >> shadowtune.width + >> shadowtune.depth + >> shadowtune.distance; } else if (token == "smoothtraction") { // podwójna jasność ambient Parser.getTokens(); - Parser >> Global::bSmoothTraction; + Parser >> bSmoothTraction; } else if( token == "splinefidelity" ) { // segment size during spline->geometry conversion float splinefidelity; Parser.getTokens(); Parser >> splinefidelity; - Global::SplineFidelity = clamp( splinefidelity, 1.f, 4.f ); + SplineFidelity = clamp( splinefidelity, 1.f, 4.f ); } else if( token == "gfx.resource.sweep" ) { Parser.getTokens(); - Parser >> Global::ResourceSweep; + Parser >> ResourceSweep; } else if( token == "gfx.resource.move" ) { Parser.getTokens(); - Parser >> Global::ResourceMove; + Parser >> ResourceMove; } else if (token == "timespeed") { // przyspieszenie czasu, zmienna do testów Parser.getTokens(1, false); - Parser >> Global::fTimeSpeed; + Parser >> fTimeSpeed; } else if (token == "multisampling") { // tryb antyaliasingu: 0=brak,1=2px,2=4px Parser.getTokens(1, false); - Parser >> Global::iMultisampling; + Parser >> iMultisampling; } else if (token == "glutfont") { // tekst generowany przez GLUT Parser.getTokens(); - Parser >> Global::bGlutFont; + Parser >> bGlutFont; } else if (token == "latitude") { // szerokość geograficzna Parser.getTokens(1, false); - Parser >> Global::fLatitudeDeg; + Parser >> fLatitudeDeg; } else if (token == "convertmodels") { // tworzenie plików binarnych Parser.getTokens(1, false); - Parser >> Global::iConvertModels; + Parser >> iConvertModels; // temporary override, to prevent generation of .e3d not compatible with old exe - Global::iConvertModels = - ( Global::iConvertModels > 128 ? - Global::iConvertModels - 128 : + iConvertModels = + ( iConvertModels > 128 ? + iConvertModels - 128 : 0 ); } else if (token == "inactivepause") { // automatyczna pauza, gdy okno nieaktywne Parser.getTokens(); - Parser >> Global::bInactivePause; + Parser >> bInactivePause; } else if (token == "slowmotion") { // tworzenie plików binarnych Parser.getTokens(1, false); - Parser >> Global::iSlowMotionMask; + Parser >> iSlowMotionMask; } else if (token == "hideconsole") { // hunter-271211: ukrywanie konsoli Parser.getTokens(); - Parser >> Global::bHideConsole; + Parser >> bHideConsole; } else if (token == "rollfix") { // Ra: poprawianie przechyłki, aby wewnętrzna szyna była "pozioma" Parser.getTokens(); - Parser >> Global::bRollFix; + Parser >> bRollFix; } else if (token == "fpsaverage") { // oczekiwana wartość FPS Parser.getTokens(1, false); - Parser >> Global::fFpsAverage; + Parser >> fFpsAverage; } else if (token == "fpsdeviation") { // odchylenie standardowe FPS Parser.getTokens(1, false); - Parser >> Global::fFpsDeviation; + Parser >> fFpsDeviation; } else if (token == "calibratein") { @@ -608,12 +439,12 @@ void Global::ConfigParse(cParser &Parser) } Parser.getTokens(4, false); Parser - >> Global::fCalibrateIn[in][0] // wyraz wolny - >> Global::fCalibrateIn[in][1] // mnożnik - >> Global::fCalibrateIn[in][2] // mnożnik dla kwadratu - >> Global::fCalibrateIn[in][3]; // mnożnik dla sześcianu - Global::fCalibrateIn[in][4] = 0.0; // mnożnik 4 potęgi - Global::fCalibrateIn[in][5] = 0.0; // mnożnik 5 potęgi + >> fCalibrateIn[in][0] // wyraz wolny + >> fCalibrateIn[in][1] // mnożnik + >> fCalibrateIn[in][2] // mnożnik dla kwadratu + >> fCalibrateIn[in][3]; // mnożnik dla sześcianu + fCalibrateIn[in][4] = 0.0; // mnożnik 4 potęgi + fCalibrateIn[in][5] = 0.0; // mnożnik 5 potęgi } else if (token == "calibrate5din") { @@ -626,12 +457,12 @@ void Global::ConfigParse(cParser &Parser) in = 5; // na ostatni, bo i tak trzeba pominąć wartości } Parser.getTokens(6, false); - Parser >> Global::fCalibrateIn[in][0] // wyraz wolny - >> Global::fCalibrateIn[in][1] // mnożnik - >> Global::fCalibrateIn[in][2] // mnożnik dla kwadratu - >> Global::fCalibrateIn[in][3] // mnożnik dla sześcianu - >> Global::fCalibrateIn[in][4] // mnożnik 4 potęgi - >> Global::fCalibrateIn[in][5]; // mnożnik 5 potęgi + Parser >> fCalibrateIn[in][0] // wyraz wolny + >> fCalibrateIn[in][1] // mnożnik + >> fCalibrateIn[in][2] // mnożnik dla kwadratu + >> fCalibrateIn[in][3] // mnożnik dla sześcianu + >> fCalibrateIn[in][4] // mnożnik 4 potęgi + >> fCalibrateIn[in][5]; // mnożnik 5 potęgi } else if (token == "calibrateout") { @@ -644,12 +475,12 @@ void Global::ConfigParse(cParser &Parser) out = 6; // na ostatni, bo i tak trzeba pominąć wartości } Parser.getTokens(4, false); - Parser >> Global::fCalibrateOut[out][0] // wyraz wolny - >> Global::fCalibrateOut[out][1] // mnożnik liniowy - >> Global::fCalibrateOut[out][2] // mnożnik dla kwadratu - >> Global::fCalibrateOut[out][3]; // mnożnik dla sześcianu - Global::fCalibrateOut[out][4] = 0.0; // mnożnik dla 4 potęgi - Global::fCalibrateOut[out][5] = 0.0; // mnożnik dla 5 potęgi + Parser >> fCalibrateOut[out][0] // wyraz wolny + >> fCalibrateOut[out][1] // mnożnik liniowy + >> fCalibrateOut[out][2] // mnożnik dla kwadratu + >> fCalibrateOut[out][3]; // mnożnik dla sześcianu + fCalibrateOut[out][4] = 0.0; // mnożnik dla 4 potęgi + fCalibrateOut[out][5] = 0.0; // mnożnik dla 5 potęgi } else if (token == "calibrate5dout") { @@ -662,27 +493,27 @@ void Global::ConfigParse(cParser &Parser) out = 6; // na ostatni, bo i tak trzeba pominąć wartości } Parser.getTokens(6, false); - Parser >> Global::fCalibrateOut[out][0] // wyraz wolny - >> Global::fCalibrateOut[out][1] // mnożnik liniowy - >> Global::fCalibrateOut[out][2] // mnożnik dla kwadratu - >> Global::fCalibrateOut[out][3] // mnożnik dla sześcianu - >> Global::fCalibrateOut[out][4] // mnożnik dla 4 potęgi - >> Global::fCalibrateOut[out][5]; // mnożnik dla 5 potęgi + Parser >> fCalibrateOut[out][0] // wyraz wolny + >> fCalibrateOut[out][1] // mnożnik liniowy + >> fCalibrateOut[out][2] // mnożnik dla kwadratu + >> fCalibrateOut[out][3] // mnożnik dla sześcianu + >> fCalibrateOut[out][4] // mnożnik dla 4 potęgi + >> fCalibrateOut[out][5]; // mnożnik dla 5 potęgi } else if (token == "calibrateoutmaxvalues") { // maksymalne wartości jakie można wyświetlić na mierniku Parser.getTokens(7, false); - Parser >> Global::fCalibrateOutMax[0] >> Global::fCalibrateOutMax[1] >> - Global::fCalibrateOutMax[2] >> Global::fCalibrateOutMax[3] >> - Global::fCalibrateOutMax[4] >> Global::fCalibrateOutMax[5] >> - Global::fCalibrateOutMax[6]; + Parser >> fCalibrateOutMax[0] >> fCalibrateOutMax[1] >> + fCalibrateOutMax[2] >> fCalibrateOutMax[3] >> + fCalibrateOutMax[4] >> fCalibrateOutMax[5] >> + fCalibrateOutMax[6]; } else if (token == "calibrateoutdebuginfo") { // wyjście z info o przebiegu kalibracji Parser.getTokens(1, false); - Parser >> Global::iCalibrateOutDebugInfo; + Parser >> iCalibrateOutDebugInfo; } else if (token == "pwm") { @@ -690,25 +521,25 @@ void Global::ConfigParse(cParser &Parser) Parser.getTokens(2, false); int pwm_out, pwm_no; Parser >> pwm_out >> pwm_no; - Global::iPoKeysPWM[pwm_out] = pwm_no; + iPoKeysPWM[pwm_out] = pwm_no; } else if (token == "brakestep") { // krok zmiany hamulca dla klawiszy [Num3] i [Num9] Parser.getTokens(1, false); - Parser >> Global::fBrakeStep; + Parser >> fBrakeStep; } else if (token == "joinduplicatedevents") { // czy grupować eventy o tych samych nazwach Parser.getTokens(); - Parser >> Global::bJoinEvents; + Parser >> bJoinEvents; } else if (token == "hiddenevents") { // czy łączyć eventy z torami poprzez nazwę toru Parser.getTokens(1, false); - Parser >> Global::iHiddenEvents; + Parser >> iHiddenEvents; } else if (token == "pause") { @@ -721,20 +552,20 @@ void Global::ConfigParse(cParser &Parser) { // domyślny język - http://tools.ietf.org/html/bcp47 Parser.getTokens(1, false); - Parser >> Global::asLang; + Parser >> asLang; } else if( token == "uitextcolor" ) { // color of the ui text. NOTE: will be obsolete once the real ui is in place Parser.getTokens( 3, false ); Parser - >> Global::UITextColor.x - >> Global::UITextColor.y - >> Global::UITextColor.z; - Global::UITextColor.x = clamp( Global::UITextColor.x, 0.0f, 255.0f ); - Global::UITextColor.y = clamp( Global::UITextColor.y, 0.0f, 255.0f ); - Global::UITextColor.z = clamp( Global::UITextColor.z, 0.0f, 255.0f ); - Global::UITextColor = Global::UITextColor / 255.0f; - Global::UITextColor.w = 1.0f; + >> UITextColor.x + >> UITextColor.y + >> UITextColor.z; + UITextColor.x = clamp( UITextColor.x, 0.0f, 255.0f ); + UITextColor.y = clamp( UITextColor.y, 0.0f, 255.0f ); + UITextColor.z = clamp( UITextColor.z, 0.0f, 255.0f ); + UITextColor = UITextColor / 255.0f; + UITextColor.w = 1.0f; } else if (token == "pyscreenrendererpriority") { @@ -746,7 +577,7 @@ void Global::ConfigParse(cParser &Parser) else if( token == "input.gamepad" ) { // czy grupować eventy o tych samych nazwach Parser.getTokens(); - Parser >> Global::InputGamepad; + Parser >> InputGamepad; } // maciek001: ustawienia MWD else if (token == "mwdmasterenable") { // główne włączenie maszyny! @@ -890,299 +721,3 @@ void Global::ConfigParse(cParser &Parser) } */ } - -void Global::InitKeys() -{ - Keys[k_IncMainCtrl] = GLFW_KEY_KP_ADD; - Keys[k_IncMainCtrlFAST] = GLFW_KEY_KP_ADD; - Keys[k_DecMainCtrl] = GLFW_KEY_KP_SUBTRACT; - Keys[k_DecMainCtrlFAST] = GLFW_KEY_KP_SUBTRACT; - Keys[k_IncScndCtrl] = GLFW_KEY_KP_DIVIDE; - Keys[k_IncScndCtrlFAST] = GLFW_KEY_KP_DIVIDE; - Keys[k_DecScndCtrl] = GLFW_KEY_KP_MULTIPLY; - Keys[k_DecScndCtrlFAST] = GLFW_KEY_KP_MULTIPLY; - - Keys[k_IncLocalBrakeLevel] = GLFW_KEY_KP_1; - Keys[k_DecLocalBrakeLevel] = GLFW_KEY_KP_7; - Keys[k_IncBrakeLevel] = GLFW_KEY_KP_3; - Keys[k_DecBrakeLevel] = GLFW_KEY_KP_9; - Keys[k_Releaser] = GLFW_KEY_KP_6; - Keys[k_EmergencyBrake] = GLFW_KEY_KP_0; - Keys[k_Brake3] = GLFW_KEY_KP_8; - Keys[k_Brake2] = GLFW_KEY_KP_5; - Keys[k_Brake1] = GLFW_KEY_KP_2; - Keys[k_Brake0] = GLFW_KEY_KP_4; - Keys[k_WaveBrake] = GLFW_KEY_KP_DECIMAL; - - Keys[k_AntiSlipping] = GLFW_KEY_KP_ENTER; - Keys[k_Sand] = 'S'; - Keys[k_Main] = 'M'; - Keys[k_Active] = 'W'; - Keys[k_Battery] = 'J'; - Keys[k_DirectionForward] = 'D'; - Keys[k_DirectionBackward] = 'R'; - Keys[k_Fuse] = 'N'; - Keys[k_Compressor] = 'C'; - Keys[k_Converter] = 'X'; - Keys[k_MaxCurrent] = 'F'; - Keys[k_CurrentAutoRelay] = 'G'; - Keys[k_BrakeProfile] = 'B'; - Keys[k_CurrentNext] = 'Z'; - - Keys[k_Czuwak] = ' '; - Keys[k_Horn] = 'A'; - Keys[k_Horn2] = 'A'; - - Keys[k_FailedEngineCutOff] = 'E'; - - Keys[k_MechUp] = GLFW_KEY_PAGE_UP; - Keys[k_MechDown] = GLFW_KEY_PAGE_DOWN; - Keys[k_MechLeft] = GLFW_KEY_LEFT; - Keys[k_MechRight] = GLFW_KEY_RIGHT; - Keys[k_MechForward] = GLFW_KEY_UP; - Keys[k_MechBackward] = GLFW_KEY_DOWN; - - Keys[k_CabForward] = GLFW_KEY_HOME; - Keys[k_CabBackward] = GLFW_KEY_END; - - Keys[k_Couple] = GLFW_KEY_INSERT; - Keys[k_DeCouple] = GLFW_KEY_DELETE; - - Keys[k_ProgramQuit] = GLFW_KEY_F10; - Keys[k_ProgramHelp] = GLFW_KEY_F1; - Keys[k_WalkMode] = GLFW_KEY_F5; - - Keys[k_OpenLeft] = ','; - Keys[k_OpenRight] = '.'; - Keys[k_CloseLeft] = ','; - Keys[k_CloseRight] = '.'; - Keys[k_DepartureSignal] = '/'; - - // Winger 160204 - obsluga pantografow - Keys[k_PantFrontUp] = 'P'; // Ra: zamieniony przedni z tylnym - Keys[k_PantFrontDown] = 'P'; - Keys[k_PantRearUp] = 'O'; - Keys[k_PantRearDown] = 'O'; - // Winger 020304 - ogrzewanie - Keys[k_Heating] = 'H'; - // headlights - Keys[k_LeftSign] = 'Y'; - Keys[k_UpperSign] = 'U'; - Keys[k_RightSign] = 'I'; - Keys[k_DimHeadlights] = 'L'; - // tail lights - Keys[k_EndSign] = 'T'; - - Keys[k_SmallCompressor] = 'V'; - Keys[k_StLinOff] = 'L'; - // ABu 090305 - przyciski uniwersalne, do roznych bajerow :) - Keys[k_Univ1] = '['; - Keys[k_Univ2] = ']'; - Keys[k_Univ3] = ';'; - Keys[k_Univ4] = '\''; -} - -/* -vector3 Global::GetCameraPosition() -{ - return pCameraPosition; -} -*/ -void Global::SetCameraPosition(vector3 pNewCameraPosition) -{ - pCameraPosition = pNewCameraPosition; -} - -void Global::TrainDelete(TDynamicObject *d) -{ // usunięcie pojazdu prowadzonego przez użytkownika - if (pWorld) - pWorld->TrainDelete(d); -}; - -//--------------------------------------------------------------------------- - -TTranscripts::TTranscripts() -{ -/* - iCount = 0; // brak linijek do wyświetlenia - iStart = 0; // wypełniać od linijki 0 - for (int i = 0; i < MAX_TRANSCRIPTS; ++i) - { // to do konstruktora można by dać - aLines[i].fHide = -1.0; // wolna pozycja (czas symulacji, 360.0 to doba) - aLines[i].iNext = -1; // nie ma kolejnej - } -*/ - fRefreshTime = 360.0; // wartośc zaporowa -}; -TTranscripts::~TTranscripts(){}; - -void TTranscripts::AddLine(std::string const &txt, float show, float hide, bool it) -{ // dodanie linii do tabeli, (show) i (hide) w [s] od aktualnego czasu - if (show == hide) - return; // komentarz jest ignorowany - show = Global::fTimeAngleDeg + show / 240.0; // jeśli doba to 360, to 1s będzie równe 1/240 - hide = Global::fTimeAngleDeg + hide / 240.0; - - TTranscript transcript; - transcript.asText = txt; - transcript.fShow = show; - transcript.fHide = hide; - transcript.bItalic = it; - aLines.emplace_back( transcript ); - // set the next refresh time while at it - // TODO, TBD: sort the transcript lines? in theory, they should be coming arranged in the right order anyway - // short of cases with multiple sounds overleaping - fRefreshTime = aLines.front().fHide; -/* - int i = iStart, j, k; // od czegoś trzeba zacząć - while ((aLines[i].iNext >= 0) ? (aLines[aLines[i].iNext].fShow <= show) : - false) // póki nie koniec i wcześniej puszczane - i = aLines[i].iNext; // przejście do kolejnej linijki -*/ -/* - //(i) wskazuje na linię, po której należy wstawić dany tekst, chyba że - while (txt ? *txt : false) - for (j = 0; j < MAX_TRANSCRIPTS; ++j) - if (aLines[j].fHide < 0.0) - { // znaleziony pierwszy wolny - aLines[j].iNext = aLines[i].iNext; // dotychczasowy następny będzie za nowym - if (aLines[iStart].fHide < 0.0) // jeśli tablica jest pusta - iStart = j; // fHide trzeba sprawdzić przed ewentualnym nadpisaniem, gdy i=j=0 - else - aLines[i].iNext = j; // a nowy będzie za tamtym wcześniejszym - aLines[j].fShow = show; // wyświetlać od - aLines[j].fHide = hide; // wyświetlać do - aLines[j].bItalic = it; - aLines[j].asText = std::string(txt); // bez sensu, wystarczyłby wskaźnik - if ((k = aLines[j].asText.find("|")) != std::string::npos) - { // jak jest podział linijki na wiersze - aLines[j].asText = aLines[j].asText.substr(0, k - 1); - txt += k; - i = j; // kolejna linijka dopisywana będzie na koniec właśnie dodanej - } - else - txt = NULL; // koniec dodawania - if (fRefreshTime > show) // jeśli odświeżacz ustawiony jest na później - fRefreshTime = show; // to odświeżyć wcześniej - break; // więcej już nic - } -*/ -}; -void TTranscripts::Add(std::string const &txt, bool backgorund) -{ // dodanie tekstów, długość dźwięku, czy istotne - if (true == txt.empty()) - return; // pusty tekst - - std::string asciitext{ txt }; win1250_to_ascii( asciitext ); // TODO: launch relevant conversion table based on language - cParser parser( asciitext ); - while( true == parser.getTokens( 3, false, "[]\n" ) ) { - - float begin, end; - std::string transcript; - parser - >> begin - >> end - >> transcript; - AddLine( transcript, 0.10 * begin, 0.12 * end, false ); - } - // try to handle malformed(?) cases with no show/hide times - std::string transcript; parser >> transcript; - while( false == transcript.empty() ) { - -// WriteLog( "Transcript text with no display/hide times: \"" + transcript + "\"" ); - AddLine( transcript, 0.0, 0.12 * transcript.size(), false ); - transcript = ""; parser >> transcript; - } -}; -void TTranscripts::Update() -{ // usuwanie niepotrzebnych (nie częściej niż 10 razy na sekundę) - if( Global::fTimeAngleDeg < fRefreshTime ) - return; // nie czas jeszcze na zmiany - // czas odświeżenia można ustalić wg tabelki, kiedy coś się w niej zmienia - // fRefreshTime = Global::fTimeAngleDeg + 360.0; // wartość zaporowa - - while( ( false == aLines.empty() ) - && ( Global::fTimeAngleDeg >= aLines.front().fHide ) ) { - // remove expired lines - aLines.pop_front(); - } - // update next refresh time - if( false == aLines.empty() ) { fRefreshTime = aLines.front().fHide; } - else { fRefreshTime = 360.0f; } -/* - int i = iStart, j = -1; // od czegoś trzeba zacząć - bool change = false; // czy zmieniać napisy? - do - { - if (aLines[i].fHide >= 0.0) // o ile aktywne - if (aLines[i].fHide < Global::fTimeAngleDeg) - { // gdy czas wyświetlania upłynął - aLines[i].fHide = -1.0; // teraz będzie wolną pozycją - if (i == iStart) - iStart = aLines[i].iNext >= 0 ? aLines[i].iNext : 0; // przestawienie pierwszego - else if (j >= 0) - aLines[j].iNext = aLines[i].iNext; // usunięcie ze środka - change = true; - } - else - { // gdy ma być pokazane - if (aLines[i].fShow > Global::fTimeAngleDeg) // będzie pokazane w przyszłości - if (fRefreshTime > aLines[i].fShow) // a nie ma nic wcześniej - fRefreshTime = aLines[i].fShow; - if (fRefreshTime > aLines[i].fHide) - fRefreshTime = aLines[i].fHide; - } - // można by jeszcze wykrywać, które nowe mają być pokazane - j = i; - i = aLines[i].iNext; // kolejna linijka - } while (i >= 0); // póki po tablicy - change = true; // bo na razie nie ma warunku, że coś się dodało - if (change) - { // aktualizacja linijek ekranowych - i = iStart; - j = -1; - do - { - if (aLines[i].fHide > 0.0) // jeśli nie ukryte - if (aLines[i].fShow < Global::fTimeAngleDeg) // to dodanie linijki do wyświetlania - if (j < 5 - 1) // ograniczona liczba linijek - Global::asTranscript[++j] = aLines[i].asText; // skopiowanie tekstu - i = aLines[i].iNext; // kolejna linijka - } while (i >= 0); // póki po tablicy - for (++j; j < 5; ++j) - Global::asTranscript[j] = ""; // i czyszczenie nieużywanych linijek - } -*/ -}; - -// Ra: tymczasowe rozwiązanie kwestii zagranicznych (czeskich) napisów -char bezogonkowo[] = "E?,?\"_++?%Sstzz" - " ^^L$A|S^CS<--RZo±,l'uP.,as>L\"lz" - "RAAAALCCCEEEEIIDDNNOOOOxRUUUUYTB" - "raaaalccceeeeiiddnnoooo-ruuuuyt?"; - -std::string Global::Bezogonkow(std::string str, bool _) -{ // wycięcie liter z ogonkami, bo OpenGL nie umie wyświetlić - for (unsigned int i = 1; i < str.length(); ++i) - if (str[i] & 0x80) - str[i] = bezogonkowo[str[i] & 0x7F]; - else if (str[i] < ' ') // znaki sterujące nie są obsługiwane - str[i] = ' '; - else if (_) - if (str[i] == '_') // nazwy stacji nie mogą zawierać spacji - str[i] = ' '; // więc trzeba wyświetlać inaczej - return str; -}; - -double Global::Min0RSpeed(double vel1, double vel2) -{ // rozszerzenie funkcji Min0R o wartości -1.0 - if (vel1 == -1.0) - { - vel1 = std::numeric_limits::max(); - } - if (vel2 == -1.0) - { - vel2 = std::numeric_limits::max(); - } - return std::min(vel1, vel2); -}; diff --git a/Globals.h b/Globals.h index 806e2585..27575025 100644 --- a/Globals.h +++ b/Globals.h @@ -9,301 +9,186 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include - -#include "renderer.h" +#include "classes.h" #include "dumb3d.h" +#include "float3d.h" +#include "light.h" +#include "utilities.h" -// definicje klawiszy -const int k_IncMainCtrl = 0; //[Num+] -const int k_IncMainCtrlFAST = 1; //[Num+] [Shift] -const int k_DecMainCtrl = 2; //[Num-] -const int k_DecMainCtrlFAST = 3; //[Num-] [Shift] -const int k_IncScndCtrl = 4; //[Num/] -const int k_IncScndCtrlFAST = 5; -const int k_DecScndCtrl = 6; -const int k_DecScndCtrlFAST = 7; -const int k_IncLocalBrakeLevel = 8; -const int k_IncLocalBrakeLevelFAST = 9; -const int k_DecLocalBrakeLevel = 10; -const int k_DecLocalBrakeLevelFAST = 11; -const int k_IncBrakeLevel = 12; -const int k_DecBrakeLevel = 13; -const int k_Releaser = 14; -const int k_EmergencyBrake = 15; -const int k_Brake3 = 16; -const int k_Brake2 = 17; -const int k_Brake1 = 18; -const int k_Brake0 = 19; -const int k_WaveBrake = 20; -const int k_AntiSlipping = 21; -const int k_Sand = 22; - -const int k_Main = 23; -const int k_DirectionForward = 24; -const int k_DirectionBackward = 25; - -const int k_Fuse = 26; -const int k_Compressor = 27; -const int k_Converter = 28; -const int k_MaxCurrent = 29; -const int k_CurrentAutoRelay = 30; -const int k_BrakeProfile = 31; - -const int k_Czuwak = 32; -const int k_Horn = 33; -const int k_Horn2 = 34; - -const int k_FailedEngineCutOff = 35; - -const int k_MechUp = 36; -const int k_MechDown = 37; -const int k_MechLeft = 38; -const int k_MechRight = 39; -const int k_MechForward = 40; -const int k_MechBackward = 41; - -const int k_CabForward = 42; -const int k_CabBackward = 43; - -const int k_Couple = 44; -const int k_DeCouple = 45; - -const int k_ProgramQuit = 46; -// const int k_ProgramPause= 47; -const int k_ProgramHelp = 48; -// NBMX -const int k_OpenLeft = 49; -const int k_OpenRight = 50; -const int k_CloseLeft = 51; -const int k_CloseRight = 52; -const int k_DepartureSignal = 53; -// NBMX -const int k_PantFrontUp = 54; -const int k_PantRearUp = 55; -const int k_PantFrontDown = 56; -const int k_PantRearDown = 57; - -const int k_Heating = 58; - -// const int k_FreeFlyMode= 59; - -const int k_LeftSign = 60; -const int k_UpperSign = 61; -const int k_RightSign = 62; - -const int k_SmallCompressor = 63; - -const int k_StLinOff = 64; - -const int k_CurrentNext = 65; - -const int k_Univ1 = 66; -const int k_Univ2 = 67; -const int k_Univ3 = 68; -const int k_Univ4 = 69; -const int k_EndSign = 70; - -const int k_Active = 71; -// Winger 020304 -const int k_Battery = 72; -const int k_WalkMode = 73; -int const k_DimHeadlights = 74; -const int MaxKeys = 75; - -class TTranscript -{ // klasa obsługująca linijkę napisu do dźwięku - public: - float fShow; // czas pokazania - float fHide; // czas ukrycia/usunięcia - std::string asText; // tekst gotowy do wyświetlenia (usunięte znaczniki czasu) - bool bItalic; // czy kursywa (dźwięk nieistotny dla prowadzącego) -}; - -class TTranscripts -{ // klasa obsługująca napisy do dźwięków -public: - std::deque aLines; - -private: - float fRefreshTime; - - public: - TTranscripts(); - ~TTranscripts(); - void AddLine(std::string const &txt, float show, float hide, bool it); - // dodanie tekstów, długość dźwięku, czy istotne - void Add(std::string const &txt, bool background = false); - // usuwanie niepotrzebnych (ok. 10 razy na sekundę) - void Update(); -}; - -class Global { - -public: -// methods - static void LoadIniFile(std::string asFileName); - static void ConfigParse( cParser &parser ); - static void InitKeys(); - inline static Math3D::vector3 GetCameraPosition() { return pCameraPosition; }; - static void SetCameraPosition(Math3D::vector3 pNewCameraPosition); - static void TrainDelete(TDynamicObject *d); - static std::string Bezogonkow(std::string str, bool _ = false); - static double Min0RSpeed(double vel1, double vel2); - +struct global_settings { // members - static int Keys[MaxKeys]; - static bool RealisticControlMode; // controls ability to steer the vehicle from outside views - static Math3D::vector3 pCameraPosition; // pozycja kamery w świecie - static Math3D::vector3 DebugCameraPosition; // pozycja kamery w świecie - static std::vector FreeCameraInit; // pozycje kamery - static std::vector FreeCameraInitAngle; - static int iWindowWidth; - static int iWindowHeight; - static float fDistanceFactor; - static bool bFullScreen; - static bool VSync; - static bool bFreeFly; - static bool bWireFrame; - // McZapkie-131202 - static bool bAdjustScreenFreq; - static bool bEnableTraction; - static bool bLoadTraction; - static float fFriction; - static bool bLiveTraction; - static float Global::fMouseXScale; - static float Global::fMouseYScale; - static std::string szDefaultExt; - static std::string SceneryFile; - static std::string AppName; - static std::string asCurrentSceneryPath; - static std::string asCurrentTexturePath; - static std::string asCurrentDynamicPath; - static int iWriteLogEnabled; // maska bitowa: 1-zapis do pliku, 2-okienko - static bool MultipleLogs; - static unsigned int DisabledLogTypes; - // McZapkie-170602: zewnetrzna definicja pojazdu uzytkownika - static std::string asHumanCtrlVehicle; - // world environment - static float Overcast; - static double fFogStart; - static double fFogEnd; - static std::string Season; // season of the year, based on simulation date - static std::string Weather; // current weather - - // TODO: put these things in the renderer - static float BaseDrawRange; - static opengl_light DayLight; - static int DynamicLightCount; - static bool ScaleSpecularValues; - static bool BasicRenderer; - static bool RenderShadows; - static struct shadowtune_t { - unsigned int map_size; - float width; - float depth; - float distance; + // data items + // TODO: take these out of the settings + GLFWwindow *window{ nullptr }; + bool shiftState{ false }; //m7todo: brzydko + bool ctrlState{ false }; + std::mt19937 random_engine{ std::mt19937( static_cast( std::time( NULL ) ) ) }; + TDynamicObject *changeDynObj{ nullptr };// info o zmianie pojazdu + TWorld *pWorld{ nullptr }; // wskaźnik na świat do usuwania pojazdów + TCamera *pCamera{ nullptr }; // parametry kamery + Math3D::vector3 pCameraPosition; // pozycja kamery w świecie + Math3D::vector3 DebugCameraPosition; // pozycja kamery w świecie + std::vector FreeCameraInit; // pozycje kamery + std::vector FreeCameraInitAngle; + int iCameraLast{ -1 }; + int iSlowMotion{ 0 }; // info o malym FPS: 0-OK, 1-wyłączyć multisampling, 3-promień 1.5km, 7-1km + basic_light DayLight; + float SunAngle{ 0.f }; // angle of the sun relative to horizon + double fLuminance{ 1.0 }; // jasność światła do automatycznego zapalania + double fTimeAngleDeg{ 0.0 }; // godzina w postaci kąta + float fClockAngleDeg[ 6 ]; // kąty obrotu cylindrów dla zegara cyfrowego + std::string LastGLError; + float ZoomFactor{ 1.f }; // determines current camera zoom level. TODO: move it to the renderer + bool CabWindowOpen{ false }; // controls sound attenuation between cab and outside + bool ControlPicking{ false }; // indicates controls pick mode is active + bool DLFont{ false }; // switch indicating presence of basic font + bool bActive{ true }; // czy jest aktywnym oknem + int iPause{ 0 }; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie + // settings + // filesystem + bool bLoadTraction{ true }; + std::string szTexturesTGA{ ".tga" }; // lista tekstur od TGA + std::string szTexturesDDS{ ".dds" }; // lista tekstur od DDS + std::string szDefaultExt{ szTexturesDDS }; + std::string asCurrentSceneryPath{ "scenery/" }; + std::string asCurrentTexturePath{ szTexturePath }; + std::string asCurrentDynamicPath; + std::string SceneryFile{ "td.scn" }; + std::string asHumanCtrlVehicle{ "EU07-424" }; + int iConvertModels{ 0 }; // tworzenie plików binarnych + // logs + int iWriteLogEnabled{ 3 }; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów + bool MultipleLogs{ false }; + unsigned int DisabledLogTypes{ 0 }; + bool bMWDdebugEnable{ false }; // włącz dodawanie do logu + int iMWDDebugMode{ 0 }; // co ma wyświetlać w logu + // simulation + bool RealisticControlMode{ false }; // controls ability to steer the vehicle from outside views + bool bFreeFly{ false }; + bool bEnableTraction{ true }; + float fFriction{ 1.f }; // mnożnik tarcia - KURS90 + bool bLiveTraction{ true }; + float Overcast{ 0.1f }; // NOTE: all this weather stuff should be moved elsewhere + GLfloat FogColor[ 3 ] = { 0.6f, 0.7f, 0.8f }; + double fFogStart{ 1700 }; + double fFogEnd{ 2000 }; + std::string Season; // season of the year, based on simulation date + std::string Weather{ "clear" }; // current weather + bool FullPhysics{ true }; // full calculations performed for each simulation step + bool bnewAirCouplers{ true }; + double fMoveLight{ -1 }; // numer dnia w roku albo -1 + bool FakeLight{ false }; // toggle between fixed and dynamic daylight + double fTimeSpeed{ 1.0 }; // przyspieszenie czasu, zmienna do testów + double fLatitudeDeg{ 52.0 }; // szerokość geograficzna + bool bInactivePause{ true }; // automatyczna pauza, gdy okno nieaktywne + int iSlowMotionMask{ -1 }; // maska wyłączanych właściwości + bool bHideConsole{ false }; // hunter-271211: ukrywanie konsoli + bool bRollFix{ true }; // czy wykonać przeliczanie przechyłki + bool bJoinEvents{ false }; // czy grupować eventy o tych samych nazwach + int iHiddenEvents{ 1 }; // czy łączyć eventy z torami poprzez nazwę toru + // ui + int iTextMode{ 0 }; // tryb pracy wyświetlacza tekstowego + int iScreenMode[ 12 ] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // numer ekranu wyświetlacza tekstowego + float4 UITextColor{ float4( 225.f / 255.f, 225.f / 255.f, 225.f / 255.f, 1.f ) }; // base color of UI text + std::string asLang{ "pl" }; // domyślny język - http://tools.ietf.org/html/bcp47 + // gfx + int iWindowWidth{ 800 }; + int iWindowHeight{ 600 }; + float fDistanceFactor{ iWindowHeight / 768.f }; // baza do przeliczania odległości dla LoD + bool bFullScreen{ false }; + bool VSync{ false }; + bool bWireFrame{ false }; + bool bAdjustScreenFreq{ true }; + float BaseDrawRange{ 2500.f }; + int DynamicLightCount{ 3 }; + bool ScaleSpecularValues{ true }; + bool BasicRenderer{ false }; + bool RenderShadows{ true }; + struct shadowtune_t { + unsigned int map_size{ 2048 }; + float width{ 250.f }; // no longer used + float depth{ 250.f }; + float distance{ 500.f }; // no longer used } shadowtune; - static bool bUseVBO; // czy jest VBO w karcie graficznej - static float AnisotropicFiltering; // requested level of anisotropic filtering. TODO: move it to renderer object - static int ScreenWidth; // current window dimensions. TODO: move it to renderer - static int ScreenHeight; - 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 GLint iMaxTextureSize; // maksymalny rozmiar tekstury - static int iMultisampling; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px - static bool bSmoothTraction; // wygładzanie drutów - static float SplineFidelity; // determines segment size during conversion of splines to geometry - static GLfloat FogColor[]; - static bool ResourceSweep; // gfx resource garbage collection - static bool ResourceMove; // gfx resources are moved between cpu and gpu side instead of sending a copy - // sound renderer variables - static bool bSoundEnabled; - static float AudioVolume; - static std::string AudioRenderer; + bool bUseVBO{ true }; // czy jest VBO w karcie graficznej (czy użyć) + float AnisotropicFiltering{ 8.f }; // requested level of anisotropic filtering. TODO: move it to renderer object + float FieldOfView{ 45.f }; // vertical field of view for the camera. TODO: move it to the renderer + GLint iMaxTextureSize{ 4096 }; // maksymalny rozmiar tekstury + int iMultisampling{ 2 }; // tryb antyaliasingu: 0=brak,1=2px,2=4px,3=8px,4=16px + bool bSmoothTraction{ true }; // wygładzanie drutów starym sposobem + float SplineFidelity{ 1.f }; // determines segment size during conversion of splines to geometry + bool ResourceSweep{ true }; // gfx resource garbage collection + bool ResourceMove{ false }; // gfx resources are moved between cpu and gpu side instead of sending a copy + std::string asSky{ "1" }; + bool bGlutFont{ false }; // czy tekst generowany przez GLUT32.DLL + double fFpsAverage{ 20.0 }; // oczekiwana wartosć FPS + double fFpsDeviation{ 5.0 }; // odchylenie standardowe FPS + double fFpsMin{ 30.0 }; // dolna granica FPS, przy której promień scenerii będzie zmniejszany + double fFpsMax{ 65.0 }; // górna granica FPS, przy której promień scenerii będzie zwiększany + // audio + bool bSoundEnabled{ true }; + float AudioVolume{ 1.25f }; + std::string AudioRenderer; + // input + float fMouseXScale{ 1.5f }; + float fMouseYScale{ 0.2f }; + int iFeedbackMode{ 1 }; // tryb pracy informacji zwrotnej + int iFeedbackPort{ 0 }; // dodatkowy adres dla informacji zwrotnych + bool InputGamepad{ true }; // whether gamepad support is enabled + bool InputMouse{ true }; // whether control pick mode can be activated + double fBrakeStep{ 1.0 }; // krok zmiany hamulca dla klawiszy [Num3] i [Num9] + // parametry kalibracyjne wejść z pulpitu + double fCalibrateIn[ 6 ][ 6 ] = { + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 } }; + // parametry kalibracyjne wyjść dla pulpitu + double fCalibrateOut[ 7 ][ 6 ] = { + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 }, + { 0, 1, 0, 0, 0, 0 } }; + // wartości maksymalne wyjść dla pulpitu + double fCalibrateOutMax[ 7 ] = { + 0, 0, 0, 0, 0, 0, 0 }; + int iCalibrateOutDebugInfo { -1 }; // numer wyjścia kalibrowanego dla którego wyświetlać informacje podczas kalibracji + int iPoKeysPWM[ 7 ] = { 0, 1, 2, 3, 4, 5, 6 }; // numery wejść dla PWM + // maciek001: konfiguracja wstępna portu COM + bool bMWDmasterEnable { false };// główne włączenie portu! + std::string sMWDPortId { "COM1" }; // nazwa portu z którego korzystamy + unsigned long int iMWDBaudrate{ 9600 }; // prędkość transmisji danych + bool bMWDInputEnable { false }; // włącz wejścia + bool bMWDBreakEnable { false }; // włącz wejścia analogowe + // wartość max potencjometru, wartość min potencjometru, rozdzielczość (max. wartość jaka może być) + double fMWDAnalogInCalib[ 4 ][ 2 ] = { + { 0, 1023 }, + { 0, 1023 }, + { 0, 1023 }, + { 0, 1023 } }; + double fMWDzg[ 2 ] = { 0.9, 1023 }; + double fMWDpg[ 2 ] = { 0.8, 1023 }; + double fMWDph[ 2 ] = { 0.6, 1023 }; + double fMWDvolt[ 2 ] = { 4000, 1023 }; + double fMWDamp[ 2 ] = { 800, 1023 }; + double fMWDlowVolt[ 2 ] = { 150, 1023 }; + int iMWDdivider { 5 }; + // multiplayer + int iMultiplayer{ 0 }; // blokada działania niektórych eventów na rzecz kominikacji + // other + std::string AppName{ "EU07" }; + std::string asVersion{ "couldn't retrieve version string" }; // z opisem - static bool FullPhysics; // full calculations performed for each simulation step - static int iSlowMotion; - static TDynamicObject *changeDynObj; - static double ABuDebug; - static std::string asSky; - static bool bnewAirCouplers; - // Ra: nowe zmienne globalne - static std::string LastGLError; - static int iFeedbackMode; // tryb pracy informacji zwrotnej - static int iFeedbackPort; // dodatkowy adres dla informacji zwrotnych - static bool InputGamepad; // whether gamepad support is enabled - static double fLuminance; // jasność światła do automatycznego zapalania - static float SunAngle; // angle of the sun relative to horizon - static int iMultiplayer; // blokada działania niektórych eventów na rzecz kominikacji - static GLFWwindow *window; - static bool shiftState; //m7todo: brzydko - static bool ctrlState; - static bool CabWindowOpen; // controls sound attenuation between cab and outside - static int iCameraLast; - static std::string asVersion; // z opisem - static bool ControlPicking; // indicates controls pick mode is active - static bool InputMouse; // whether control pick mode can be activated - static int iTextMode; // tryb pracy wyświetlacza tekstowego - static int iScreenMode[12]; // numer ekranu wyświetlacza tekstowego - static double fMoveLight; // numer dnia w roku albo -1 - static bool FakeLight; // toggle between fixed and dynamic daylight - static double fTimeSpeed; // przyspieszenie czasu, zmienna do testów - static double fTimeAngleDeg; // godzina w postaci kąta - static float fClockAngleDeg[6]; // kąty obrotu cylindrów dla zegara cyfrowego - static double fLatitudeDeg; // szerokość geograficzna - static std::string szTexturesTGA; // lista tekstur od TGA - static std::string szTexturesDDS; // lista tekstur od DDS - static bool DLFont; // switch indicating presence of basic font - static bool bGlutFont; // tekst generowany przez GLUT - static int iPause; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie - static bool bActive; // czy jest aktywnym oknem - static int iConvertModels; // tworzenie plików binarnych - static bool bInactivePause; // automatyczna pauza, gdy okno nieaktywne - static int iSlowMotionMask; // maska wyłączanych właściwości - static bool bHideConsole; // hunter-271211: ukrywanie konsoli - - static TWorld *pWorld; // wskaźnik na świat do usuwania pojazdów - static bool bRollFix; // czy wykonać przeliczanie przechyłki - static double fFpsAverage; // oczekiwana wartosć FPS - static double fFpsDeviation; // odchylenie standardowe FPS - static double fFpsMin; // dolna granica FPS, przy której promień scenerii będzie zmniejszany - static double fFpsMax; // górna granica FPS, przy której promień scenerii będzie zwiększany - static TCamera *pCamera; // parametry kamery - static double fCalibrateIn[6][6]; // parametry kalibracyjne wejść z pulpitu - static double fCalibrateOut[7][6]; // parametry kalibracyjne wyjść dla pulpitu - static double fCalibrateOutMax[7]; // wartości maksymalne wyjść dla pulpitu - static int iCalibrateOutDebugInfo; // numer wyjścia kalibrowanego dla którego wyświetlać - // informacje podczas kalibracji - static double fBrakeStep; // krok zmiany hamulca dla klawiszy [Num3] i [Num9] - static bool bJoinEvents; // czy grupować eventy o tych samych nazwach - static TTranscripts tranTexts; // obiekt obsługujący stenogramy dźwięków na ekranie - static float4 UITextColor; // base color of UI text - static std::string asLang; // domyślny język - http://tools.ietf.org/html/bcp47 - static int iHiddenEvents; // czy łączyć eventy z torami poprzez nazwę toru -/* - static TTextSound *tsRadioBusy[10]; // zajętość kanałów radiowych (wskaźnik na odgrywany dźwięk) -*/ - static int iPoKeysPWM[7]; // numery wejść dla PWM - - //randomizacja - static std::mt19937 random_engine; - - // maciek001: zmienne dla MWD - static bool bMWDmasterEnable; // główne włączenie portu COM - static bool bMWDdebugEnable; // logowanie pracy - static int iMWDDebugMode; - static std::string sMWDPortId; // nazwa portu COM - static unsigned long int iMWDBaudrate; // prędkość transmisji - static bool bMWDInputEnable; // włącz wejścia - static bool bMWDBreakEnable; // włącz wejścia analogowe (hamulce) - static double fMWDAnalogInCalib[4][2]; // ustawienia kranów hamulca zespolonego i dodatkowego - min i max - static double fMWDzg[2]; // max wartość wskazywana i max wartość generowana (rozdzielczość) - static double fMWDpg[2]; - static double fMWDph[2]; - static double fMWDvolt[2]; - static double fMWDamp[2]; - static double fMWDlowVolt[2]; - static int iMWDdivider; +// methods + void LoadIniFile( std::string asFileName ); + void ConfigParse( cParser &parser ); }; + +extern global_settings Global; + //--------------------------------------------------------------------------- diff --git a/Logs.cpp b/Logs.cpp index 5453a510..612d489f 100644 --- a/Logs.cpp +++ b/Logs.cpp @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "Logs.h" #include "Globals.h" +#include "utilities.h" std::ofstream output; // standardowy "log.txt", można go wyłączyć std::ofstream errors; // lista błędów "errors.txt", zawsze działa @@ -38,25 +39,25 @@ std::string filename_date() { std::string filename_scenery() { - auto extension = Global::SceneryFile.rfind( '.' ); + auto extension = Global.SceneryFile.rfind( '.' ); if( extension != std::string::npos ) { - return Global::SceneryFile.substr( 0, extension ); + return Global.SceneryFile.substr( 0, extension ); } else { - return Global::SceneryFile; + return Global.SceneryFile; } } void WriteLog( const char *str, logtype const Type ) { if( str == nullptr ) { return; } - if( true == TestFlag( Global::DisabledLogTypes, Type ) ) { return; } + if( true == TestFlag( Global.DisabledLogTypes, Type ) ) { return; } - if (Global::iWriteLogEnabled & 1) { + if (Global.iWriteLogEnabled & 1) { if( !output.is_open() ) { std::string const filename = - ( Global::MultipleLogs ? + ( Global.MultipleLogs ? "logs/log (" + filename_scenery() + ") " + filename_date() + ".txt" : "log.txt" ); output.open( filename, std::ios::trunc ); @@ -65,7 +66,7 @@ void WriteLog( const char *str, logtype const Type ) { output.flush(); } - if( Global::iWriteLogEnabled & 2 ) { + if( Global.iWriteLogEnabled & 2 ) { // hunter-271211: pisanie do konsoli tylko, gdy nie jest ukrywana SetConsoleTextAttribute( GetStdHandle( STD_OUTPUT_HANDLE ), FOREGROUND_GREEN | FOREGROUND_INTENSITY ); DWORD wr = 0; @@ -78,16 +79,16 @@ void WriteLog( const char *str, logtype const Type ) { void ErrorLog( const char *str, logtype const Type ) { if( str == nullptr ) { return; } - if( true == TestFlag( Global::DisabledLogTypes, Type ) ) { return; } + if( true == TestFlag( Global.DisabledLogTypes, Type ) ) { return; } if (!errors.is_open()) { std::string const filename = - ( Global::MultipleLogs ? + ( Global.MultipleLogs ? "logs/errors (" + filename_scenery() + ") " + filename_date() + ".txt" : "errors.txt" ); errors.open( filename, std::ios::trunc ); - errors << "EU07.EXE " + Global::asVersion << "\n"; + errors << "EU07.EXE " + Global.asVersion << "\n"; } errors << str << "\n"; @@ -97,14 +98,14 @@ void ErrorLog( const char *str, logtype const Type ) { void Error(const std::string &asMessage, bool box) { // if (box) - // MessageBox(NULL, asMessage.c_str(), string("EU07 " + Global::asRelease).c_str(), MB_OK); + // MessageBox(NULL, asMessage.c_str(), string("EU07 " + Global.asRelease).c_str(), MB_OK); ErrorLog(asMessage.c_str()); } void Error(const char *&asMessage, bool box) { // if (box) - // MessageBox(NULL, asMessage, string("EU07 " + Global::asRelease).c_str(), MB_OK); + // MessageBox(NULL, asMessage, string("EU07 " + Global.asRelease).c_str(), MB_OK); ErrorLog(asMessage); WriteLog(asMessage); } @@ -123,12 +124,12 @@ void WriteLog(const std::string &str, logtype const Type ) void CommLog(const char *str) { // Ra: warunkowa rejestracja komunikatów WriteLog(str); - /* if (Global::iWriteLogEnabled & 4) + /* if (Global.iWriteLogEnabled & 4) { if (!comms.is_open()) { comms.open("comms.txt", std::ios::trunc); - comms << AnsiString("EU07.EXE " + Global::asRelease).c_str() << "\n"; + comms << AnsiString("EU07.EXE " + Global.asRelease).c_str() << "\n"; } if (str) comms << str; diff --git a/Logs.h b/Logs.h index 449e2c76..515baaa4 100644 --- a/Logs.h +++ b/Logs.h @@ -8,6 +8,7 @@ http://mozilla.org/MPL/2.0/. */ #pragma once + #include enum logtype : unsigned int { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 1f865215..051798d9 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -9,11 +9,12 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Mover.h" + +#include "Oerlikon_ESt.h" +#include "../utilities.h" #include "../globals.h" #include "../logs.h" -#include "Oerlikon_ESt.h" #include "../parser.h" -#include "mctools.h" //--------------------------------------------------------------------------- // Ra: tu należy przenosić funcje z mover.pas, które nie są z niego wywoływane. @@ -4260,23 +4261,13 @@ double TMoverParameters::TractionForce(double dt) case 2: { // automatic if( ( std::abs( Itot ) > RVentMinI ) && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { -/* - RventRot += ( RVentnmax * abs( Itot ) / ( ImaxLo * RList[ MainCtrlActualPos ].Bn ) - RventRot ) * RVentSpeed * dt; -*/ - RventRot = std::min( - RVentnmax, - RventRot - + ( RVentnmax - * std::abs( Itot ) - * std::min( 1.25, ( ( std::abs( Itot ) / NPoweredAxles ) / RVentMinI ) ) - / ImaxLo + + RventRot += + ( RVentnmax + * std::min( 1.0, ( ( Im / NPoweredAxles ) / RVentMinI ) ) + * Im / ImaxLo - RventRot ) - * RVentSpeed * dt ); -/* -RventRot = std::min( -RVentnmax, -RventRot + ( ( std::abs( Itot ) / ( RList[ MainCtrlActualPos ].Bn * RList[ MainCtrlActualPos ].Mn ) ) / RVentMinI ) * RVentSpeed * dt ); -*/ + * RVentSpeed * dt; } else if( ( DynamicBrakeType == dbrake_automatic ) && ( true == DynamicBrakeFlag ) ) { diff --git a/McZapkie/Oerlikon_ESt.h b/McZapkie/Oerlikon_ESt.h index 62a64cee..a6b6f3d0 100644 --- a/McZapkie/Oerlikon_ESt.h +++ b/McZapkie/Oerlikon_ESt.h @@ -20,7 +20,6 @@ http://mozilla.org/MPL/2.0/. #include #include "hamulce.h" // Pascal unit #include "friction.h" // Pascal unit -#include "mctools.h" // Pascal unit /* (C) youBy diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index be9e1a01..e5f64025 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -16,7 +16,7 @@ Copyright (C) 2007-2014 Maciej Cierniak #include "hamulce.h" #include #include "Mover.h" -#include "usefull.h" +#include "utilities.h" //---FUNKCJE OGOLNE--- diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index 805d53d3..c93cb184 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -35,7 +35,6 @@ Knorr/West EP - żeby był #pragma once #include "friction.h" // Pascal unit -#include "mctools.h" // Pascal unit static int const LocalBrakePosNo = 10; /*ilosc nastaw hamulca recznego lub pomocniczego*/ static int const MainBrakeMaxPos = 10; /*max. ilosc nastaw hamulca zasadniczego*/ diff --git a/MdlMngr.cpp b/MdlMngr.cpp index fa1f6236..41d95897 100644 --- a/MdlMngr.cpp +++ b/MdlMngr.cpp @@ -16,8 +16,9 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "MdlMngr.h" +#include "model3d.h" #include "Globals.h" -#include "McZapkie/mctools.h" +#include "utilities.h" // wczytanie modelu do kontenerka TModel3d * @@ -78,15 +79,15 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic) // - niebo animowane, ścieżka brana ze wpisu, tekstury nieokreślone // - wczytanie modelu animowanego - Init() - sprawdzić std::string buf; - std::string const buftp = Global::asCurrentTexturePath; // zapamiętanie aktualnej ścieżki do tekstur, + std::string const buftp = Global.asCurrentTexturePath; // zapamiętanie aktualnej ścieżki do tekstur, if( Name.find('\\') == std::string::npos ) { buf = "models\\" + Name; // Ra: było by lepiej katalog dodać w parserze if( Name.find( '/') != std::string::npos) { - Global::asCurrentTexturePath = Global::asCurrentTexturePath + Name; - Global::asCurrentTexturePath.erase(Global::asCurrentTexturePath.find("/") + 1, - Global::asCurrentTexturePath.length()); + Global.asCurrentTexturePath = Global.asCurrentTexturePath + Name; + Global.asCurrentTexturePath.erase(Global.asCurrentTexturePath.find("/") + 1, + Global.asCurrentTexturePath.length()); } } else @@ -95,10 +96,10 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic) if( Dynamic ) { // na razie tak, bo nie wiadomo, jaki może mieć wpływ na pozostałe modele if( Name.find( '/' ) != std::string::npos ) { // pobieranie tekstur z katalogu, w którym jest model - Global::asCurrentTexturePath = Global::asCurrentTexturePath + Name; - Global::asCurrentTexturePath.erase( - Global::asCurrentTexturePath.find( "/" ) + 1, - Global::asCurrentTexturePath.length() - 1 ); + Global.asCurrentTexturePath = Global.asCurrentTexturePath + Name; + Global.asCurrentTexturePath.erase( + Global.asCurrentTexturePath.find( "/" ) + 1, + Global.asCurrentTexturePath.length() - 1 ); } } } @@ -106,12 +107,12 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic) auto const lookup = m_modelsmap.find( buf ); if( lookup != m_modelsmap.end() ) { - Global::asCurrentTexturePath = buftp; + Global.asCurrentTexturePath = buftp; return ( m_models[ lookup->second ].Model.get() ); } auto model = LoadModel(buf, Dynamic); // model nie znaleziony, to wczytać - Global::asCurrentTexturePath = buftp; // odtworzenie ścieżki do tekstur + Global.asCurrentTexturePath = buftp; // odtworzenie ścieżki do tekstur return model; // NULL jeśli błąd }; diff --git a/MdlMngr.h b/MdlMngr.h index b8f53687..a70d60b5 100644 --- a/MdlMngr.h +++ b/MdlMngr.h @@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/. */ #pragma once -#include "Model3d.h" +#include "classes.h" class TMdlContainer { friend class TModelsManager; diff --git a/MemCell.h b/MemCell.h index 061b75d9..adbbcbfd 100644 --- a/MemCell.h +++ b/MemCell.h @@ -11,7 +11,6 @@ http://mozilla.org/MPL/2.0/. #include "Classes.h" #include "scenenode.h" -#include "dumb3d.h" #include "names.h" class TMemCell : public editor::basic_node { diff --git a/Model3d.cpp b/Model3d.cpp index 80de2402..e988ba40 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -17,8 +17,7 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others #include "Globals.h" #include "logs.h" -#include "mczapkie/mctools.h" -#include "Usefull.h" +#include "utilities.h" #include "renderer.h" #include "Timer.h" #include "mtable.h" @@ -291,7 +290,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic if (Opacity > 1.0f) Opacity *= 0.01f; // w 2013 był błąd i aby go obejść, trzeba było wpisać 10000.0 /* - if ((Global::iConvertModels & 1) == 0) // dla zgodności wstecz + if ((Global.iConvertModels & 1) == 0) // dla zgodności wstecz Opacity = 0.0; // wszystko idzie w przezroczyste albo zależnie od tekstury */ if (!parser.expectToken("map:")) @@ -331,7 +330,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic { // jeśli tylko nazwa pliku, to dawać bieżącą ścieżkę do tekstur Name_Material(material); if( material.find_first_of( "/\\" ) == material.npos ) { - material.insert( 0, Global::asCurrentTexturePath ); + material.insert( 0, Global.asCurrentTexturePath ); } m_material = GfxRenderer.Fetch_Material( material ); // renderowanie w cyklu przezroczystych tylko jeśli: @@ -657,7 +656,7 @@ void TSubModel::InitialRotate(bool doit) // potomnych nie obracamy już, tylko ewentualnie optymalizujemy Child->InitialRotate( false ); } - else if (Global::iConvertModels & 2) { + else if (Global.iConvertModels & 2) { // optymalizacja jest opcjonalna if ((iFlags & 0xC000) == 0x8000) // o ile nie ma animacji { // jak nie ma potomnych, można wymnożyć przez transform i wyjedynkować go @@ -788,7 +787,7 @@ void TSubModel::SetRotateXYZ(float3 vNewAngles) iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } -void TSubModel::SetRotateXYZ(vector3 vNewAngles) +void TSubModel::SetRotateXYZ( Math3D::vector3 vNewAngles) { // obrócenie submodelu o // podane kąty wokół osi // lokalnego układu @@ -808,7 +807,7 @@ void TSubModel::SetTranslate(float3 vNewTransVector) iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } -void TSubModel::SetTranslate(vector3 vNewTransVector) +void TSubModel::SetTranslate( Math3D::vector3 vNewTransVector) { // przesunięcie submodelu (np. w kabinie) v_TransVector.x = vNewTransVector.x; v_TransVector.y = vNewTransVector.y; @@ -907,14 +906,14 @@ void TSubModel::RaAnimation(TAnimType a) glRotatef(simulation::Time.data().wMinute * 6.0 + simulation::Time.second() * 0.1, 0.0, 1.0, 0.0); break; case at_Hours: // godziny płynnie 12h/360° - glRotatef(2.0 * Global::fTimeAngleDeg, 0.0, 1.0, 0.0); + glRotatef(2.0 * Global.fTimeAngleDeg, 0.0, 1.0, 0.0); break; case at_Hours24: // godziny płynnie 24h/360° - glRotatef(Global::fTimeAngleDeg, 0.0, 1.0, 0.0); + glRotatef(Global.fTimeAngleDeg, 0.0, 1.0, 0.0); break; case at_Billboard: // obrót w pionie do kamery { - matrix4x4 mat; mat.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); + Math3D::matrix4x4 mat; mat.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); float3 gdzie = float3(mat[3][0], mat[3][1], mat[3][2]); // początek układu współrzędnych submodelu względem kamery glLoadIdentity(); // macierz jedynkowa glTranslatef(gdzie.x, gdzie.y, gdzie.z); // początek układu zostaje bez @@ -927,9 +926,9 @@ void TSubModel::RaAnimation(TAnimType a) glRotated(1.5 * std::sin(M_PI * simulation::Time.second() / 6.0), 0.0, 1.0, 0.0); break; case at_Sky: // animacja nieba - glRotated(Global::fLatitudeDeg, 1.0, 0.0, 0.0); // ustawienie osi OY na północ - // glRotatef(Global::fTimeAngleDeg,0.0,1.0,0.0); //obrót dobowy osi OX - glRotated(-fmod(Global::fTimeAngleDeg, 360.0), 0.0, 1.0, 0.0); // obrót dobowy osi OX + glRotated(Global.fLatitudeDeg, 1.0, 0.0, 0.0); // ustawienie osi OY na północ + // glRotatef(Global.fTimeAngleDeg,0.0,1.0,0.0); //obrót dobowy osi OX + glRotated(-fmod(Global.fTimeAngleDeg, 360.0), 0.0, 1.0, 0.0); // obrót dobowy osi OX break; case at_IK11: // ostatni element animacji szkieletowej (podudzie, stopa) glRotatef(v_Angles.z, 0.0f, 1.0f, 0.0f); // obrót względem osi pionowej (azymut) @@ -945,7 +944,7 @@ void TSubModel::RaAnimation(TAnimType a) if ((sm->pName[0]) >= '0') if ((sm->pName[0]) <= '5') // zegarek ma 6 cyfr maksymalnie sm->SetRotate(float3(0, 1, 0), - -Global::fClockAngleDeg[(sm->pName[0]) - '0']); + -Global.fClockAngleDeg[(sm->pName[0]) - '0']); } sm = sm->NextGet(); } while (sm); @@ -1633,7 +1632,7 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, if( materialindex < t->size() ) { m_materialname = t->at( materialindex ); if( m_materialname.find_last_of( "/\\" ) == std::string::npos ) { - m_materialname = Global::asCurrentTexturePath + m_materialname; + m_materialname = Global.asCurrentTexturePath + m_materialname; } m_material = GfxRenderer.Fetch_Material( m_materialname ); if( ( iFlags & 0x30 ) == 0 ) { @@ -1741,7 +1740,7 @@ void TModel3d::LoadFromTextFile(std::string const &FileName, bool dynamic) } // Ra: od wersji 334 przechylany jest cały model, a nie tylko pierwszy submodel // ale bujanie kabiny nadal używa bananów :( od 393 przywrócone, ale z dodatkowym warunkiem - if (Global::iConvertModels & 4) + if (Global.iConvertModels & 4) { // automatyczne banany czasem psuły przechylanie kabin... if (dynamic && Root) { @@ -1778,7 +1777,7 @@ void TModel3d::Init() std::size_t dataoffset = 0; Root->create_geometry( dataoffset, m_geometrybank ); } - if( ( Global::iConvertModels > 0 ) + if( ( Global.iConvertModels > 0 ) && ( false == asBinary.empty() ) ) { SaveToBinFile( asBinary ); asBinary = ""; // zablokowanie powtórnego zapisu diff --git a/Model3d.h b/Model3d.h index 8244835d..b7ee145f 100644 --- a/Model3d.h +++ b/Model3d.h @@ -9,15 +9,12 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "GL/glew.h" -#include "Parser.h" +#include "classes.h" #include "dumb3d.h" #include "Float3d.h" #include "openglgeometrybank.h" #include "material.h" -using namespace Math3D; - // Ra: specjalne typy submodeli, poza tym GL_TRIANGLES itp. const int TP_ROTATOR = 256; const int TP_FREESPOTLIGHT = 257; @@ -165,9 +162,9 @@ public: TSubModel * ChildGet() { return Child; }; int TriangleAdd(TModel3d *m, material_handle tex, int tri); void SetRotate(float3 vNewRotateAxis, float fNewAngle); - void SetRotateXYZ(vector3 vNewAngles); + void SetRotateXYZ( Math3D::vector3 vNewAngles); void SetRotateXYZ(float3 vNewAngles); - void SetTranslate(vector3 vNewTransVector); + void SetTranslate( Math3D::vector3 vNewTransVector); void SetTranslate(float3 vNewTransVector); void SetRotateIK1(float3 vNewAngles); TSubModel * GetFromName( std::string const &search, bool i = true ); diff --git a/PyInt.cpp b/PyInt.cpp index 3bfbade0..c59917af 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -1,11 +1,11 @@ #include "stdafx.h" #include "PyInt.h" + +#include "parser.h" #include "renderer.h" +#include "model3d.h" #include "Train.h" #include "Logs.h" -//#include -//#include -//#include TPythonInterpreter *TPythonInterpreter::_instance = NULL; diff --git a/PyInt.h b/PyInt.h index 93720d7c..fa76e7a0 100644 --- a/PyInt.h +++ b/PyInt.h @@ -12,8 +12,7 @@ #else #include "Python.h" #endif -#include "parser.h" -#include "Model3d.h" +#include "classes.h" #define PyGetFloat(param) PyFloat_FromDouble(param >= 0 ? param : -param) #define PyGetFloatS(param) PyFloat_FromDouble(param) diff --git a/ResourceManager.h b/ResourceManager.h index 92fec3ca..81e631a8 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -18,54 +18,6 @@ enum class resource_state { failed }; -/* -#include -#include - -class Resource -{ - - public: - virtual void Release() = 0; - double GetLastUsage() const - { - return _lastUsage; - } - - protected: - void SetLastUsage(double const lastUsage) - { - _lastUsage = lastUsage; - } - - private: - double _lastUsage = 0.0; -}; - -class ResourceManager -{ - - public: - static void Register(Resource *resource); - static void Unregister(Resource *resource); - - static void Sweep(double currentTime); - static void SetExpiry(double expiry) - { - _expiry = expiry; - } - - private: - typedef std::vector Resources; - - static double _expiry; - static double _lastUpdate; - static double _lastReport; - - static Resources _resources; -}; -*/ - using resource_timestamp = std::chrono::steady_clock::time_point; // takes containers providing access to specific element through operator[] diff --git a/Segment.cpp b/Segment.cpp index ed478390..fdd82ece 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -12,8 +12,9 @@ http://mozilla.org/MPL/2.0/. #include "Globals.h" #include "Logs.h" -#include "Usefull.h" +#include "utilities.h" #include "Track.h" +#include "renderer.h" //--------------------------------------------------------------------------- @@ -61,7 +62,7 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M // poprawienie przechyłki fRoll1 = glm::radians(fNewRoll1); // Ra: przeliczone jest bardziej przydatne do obliczeń fRoll2 = glm::radians(fNewRoll2); - if (Global::bRollFix) + if (Global.bRollFix) { // Ra: poprawianie przechyłki // Przechyłka powinna być na środku wewnętrznej szyny, a standardowo jest w osi // toru. Dlatego trzeba podnieść tor oraz odpowiednio podwyższyć podsypkę. diff --git a/Segment.h b/Segment.h index 0cc000a8..4b138fe4 100644 --- a/Segment.h +++ b/Segment.h @@ -9,10 +9,10 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "openglgeometrybank.h" +#include "classes.h" #include "dumb3d.h" -#include "Classes.h" -#include "usefull.h" +#include "openglgeometrybank.h" +#include "utilities.h" class TSegment { // aproksymacja toru (zwrotnica ma dwa takie, jeden z nich jest aktywny) diff --git a/Spring.cpp b/Spring.cpp index 38104815..8a665677 100644 --- a/Spring.cpp +++ b/Spring.cpp @@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/. TSpring::TSpring() { - vForce1 = vForce2 = vector3(0, 0, 0); + vForce1 = vForce2 = Math3D::vector3(0, 0, 0); Ks = 0; Kd = 0; restLen = 0; @@ -29,15 +29,15 @@ void TSpring::Init(double nrestLen, double nKs, double nKd) restLen = nrestLen; } -Math3D::vector3 TSpring::ComputateForces(vector3 const &pPosition1, vector3 const &pPosition2) +Math3D::vector3 TSpring::ComputateForces( Math3D::vector3 const &pPosition1, Math3D::vector3 const &pPosition2) { double dist, Hterm, Dterm; - vector3 springForce, deltaV, deltaP; + Math3D::vector3 springForce, deltaV; // p1 = &system[spring->p1]; // p2 = &system[spring->p2]; // VectorDifference(&p1->pos,&p2->pos,&deltaP); // Vector distance - deltaP = pPosition1 - pPosition2; + auto deltaP = pPosition1 - pPosition2; // dist = VectorLength(&deltaP); // Magnitude of // deltaP dist = deltaP.Length(); diff --git a/Spring.h b/Spring.h index e716b8b9..46c78d72 100644 --- a/Spring.h +++ b/Spring.h @@ -10,6 +10,8 @@ http://mozilla.org/MPL/2.0/. #ifndef ParticlesH #define ParticlesH +#include "dumb3d.h" + #define STATIC_THRESHOLD 0.17f // efine STATIC_THRESHOLD 0.03f const double m_Kd = 0.02f; // DAMPING FACTOR @@ -20,9 +22,6 @@ const double m_Ksd = 0.1f; // SPRING DAMPING CONSTANT const double m_Csf = 0.9f; // Default Static Friction const double m_Ckf = 0.7f; // Default Kinetic Friction -#include "dumb3d.h" -using namespace Math3D; - class TSpring { public: @@ -31,9 +30,9 @@ class TSpring // void Init(TParticnp1, TParticle *np2, double nKs= 0.5f, double nKd= 0.002f, // double nrestLen= -1.0f); void Init(double nrestLen, double nKs = 0.5f, double nKd = 0.002f); - Math3D::vector3 ComputateForces(vector3 const &pPosition1, vector3 const &pPosition2); + Math3D::vector3 ComputateForces( Math3D::vector3 const &pPosition1, Math3D::vector3 const &pPosition2); void Render(); - vector3 vForce1, vForce2; + Math3D::vector3 vForce1, vForce2; double restLen; // LENGTH OF SPRING AT REST double Ks; // SPRING CONSTANT double Kd; // SPRING DAMPING diff --git a/Texture.cpp b/Texture.cpp index bd4bce23..7cb3654e 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -19,7 +19,7 @@ http://mozilla.org/MPL/2.0/. #include #include "GL/glew.h" -#include "usefull.h" +#include "utilities.h" #include "globals.h" #include "logs.h" #include "sn_utils.h" @@ -250,7 +250,7 @@ opengl_texture::load_DDS() { int blockSize = ( data_format == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT ? 8 : 16 ); int offset = 0; - while( ( data_width > Global::iMaxTextureSize ) || ( data_height > Global::iMaxTextureSize ) ) { + while( ( data_width > Global.iMaxTextureSize ) || ( data_height > Global.iMaxTextureSize ) ) { // pomijanie zbyt dużych mipmap, jeśli wymagane jest ograniczenie rozmiaru offset += ( ( data_width + 3 ) / 4 ) * ( ( data_height + 3 ) / 4 ) * blockSize; data_width /= 2; @@ -485,7 +485,7 @@ opengl_texture::load_TGA() { } downsize( GL_BGRA ); - if( ( data_width > Global::iMaxTextureSize ) || ( data_height > Global::iMaxTextureSize ) ) { + if( ( data_width > Global.iMaxTextureSize ) || ( data_height > Global.iMaxTextureSize ) ) { // for non-square textures there's currently possibility the scaling routine will have to abort // before it gets all work done data_state = resource_state::failed; @@ -589,8 +589,8 @@ opengl_texture::create() { } } - if( ( true == Global::ResourceMove ) - || ( false == Global::ResourceSweep ) ) { + if( ( true == Global.ResourceMove ) + || ( false == Global.ResourceSweep ) ) { // if garbage collection is disabled we don't expect having to upload the texture more than once data = std::vector(); data_state = resource_state::none; @@ -607,7 +607,7 @@ opengl_texture::release() { if( id == -1 ) { return; } - if( true == Global::ResourceMove ) { + if( true == Global.ResourceMove ) { // if resource move is enabled we don't keep a cpu side copy after upload // so need to re-acquire the data before release // TBD, TODO: instead of vram-ram transfer fetch the data 'normally' from the disk using worker thread @@ -653,7 +653,7 @@ opengl_texture::set_filtering() const { if( GLEW_EXT_texture_filter_anisotropic ) { // anisotropic filtering - ::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, Global::AnisotropicFiltering ); + ::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, Global.AnisotropicFiltering ); } bool sharpen{ false }; @@ -679,7 +679,7 @@ opengl_texture::set_filtering() const { void opengl_texture::downsize( GLuint const Format ) { - while( ( data_width > Global::iMaxTextureSize ) || ( data_height > Global::iMaxTextureSize ) ) { + while( ( data_width > Global.iMaxTextureSize ) || ( data_height > Global.iMaxTextureSize ) ) { // scale down the base texture, if it's larger than allowed maximum // NOTE: scaling is uniform along both axes, meaning non-square textures can drop below the maximum // TODO: replace with proper scaling function once we have image middleware in place @@ -760,7 +760,7 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { std::vector extensions{ { ".dds" }, { ".tga" }, { ".bmp" }, { ".ext" } }; // try to locate requested texture in the databank - auto lookup = find_in_databank( Filename + Global::szDefaultExt ); + auto lookup = find_in_databank( Filename + Global.szDefaultExt ); if( lookup != npos ) { // start with the default extension... return lookup; @@ -769,7 +769,7 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { // ...then try recognized file extensions other than default for( auto const &extension : extensions ) { - if( extension == Global::szDefaultExt ) { + if( extension == Global.szDefaultExt ) { // we already tried this one continue; } @@ -781,12 +781,12 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { } } // if we don't have the texture in the databank, check if it's on disk - std::string filename = find_on_disk( Filename + Global::szDefaultExt ); + std::string filename = find_on_disk( Filename + Global.szDefaultExt ); if( true == filename.empty() ) { // if the default lookup fails, try other known extensions for( auto const &extension : extensions ) { - if( extension == Global::szDefaultExt ) { + if( extension == Global.szDefaultExt ) { // we already tried this one continue; } diff --git a/Timer.cpp b/Timer.cpp index 6220655a..bfbdc456 100644 --- a/Timer.cpp +++ b/Timer.cpp @@ -55,7 +55,7 @@ double GetFPS() void ResetTimers() { - UpdateTimers( Global::iPause != 0 ); + UpdateTimers( Global.iPause != 0 ); DeltaTime = 0.1; DeltaRenderTime = 0.0; fSoundTimer = 0.0; @@ -70,7 +70,7 @@ void UpdateTimers(bool pause) { DeltaRenderTime = double(count - oldCount) / double(fr); if (!pause) { - DeltaTime = Global::fTimeSpeed * DeltaRenderTime; + DeltaTime = Global.fTimeSpeed * DeltaRenderTime; fSoundTimer += DeltaTime; if (fSoundTimer > 0.1) fSoundTimer = 0.0; diff --git a/Track.cpp b/Track.cpp index c40349f0..c7082bb4 100644 --- a/Track.cpp +++ b/Track.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "timer.h" #include "logs.h" +#include "renderer.h" // 101206 Ra: trapezoidalne drogi i tory // 110720 Ra: rozprucie zwrotnicy i odcinki izolowane @@ -105,7 +106,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) { // jeśli po zmianie nie ma żadnej osi na odcinku izolowanym if (evFree) simulation::Events.AddToQuery(evFree, o); // dodanie zwolnienia do kolejki - if (Global::iMultiplayer) // jeśli multiplayer + if (Global.iMultiplayer) // jeśli multiplayer multiplayer::WyslijString(asName, 10); // wysłanie pakietu o zwolnieniu if (pMemCell) // w powiązanej komórce pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) & ~0xFF, @@ -119,7 +120,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) { if (evBusy) simulation::Events.AddToQuery(evBusy, o); // dodanie zajętości do kolejki - if (Global::iMultiplayer) // jeśli multiplayer + if (Global.iMultiplayer) // jeśli multiplayer multiplayer::WyslijString(asName, 11); // wysłanie pakietu o zajęciu if (pMemCell) // w powiązanej komórce pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) | 1, update_memval2 ); // zmieniamy ostatnią wartość na nieparzystą @@ -175,7 +176,7 @@ TTrack * TTrack::Create400m(int what, double dx) trk->m_visible = false; // nie potrzeba pokazywać, zresztą i tak nie ma tekstur trk->iCategoryFlag = what; // taki sam typ plus informacja, że dodatkowy trk->Init(); // utworzenie segmentu - trk->Segment->Init( vector3( -dx, 0, 0 ), vector3( -dx, 0, 400 ), 10.0, 0, 0 ); // prosty + trk->Segment->Init( Math3D::vector3( -dx, 0, 0 ), Math3D::vector3( -dx, 0, 400 ), 10.0, 0, 0 ); // prosty trk->location( glm::dvec3{ -dx, 0, 200 } ); //środek, aby się mogło wyświetlić simulation::Paths.insert( trk ); simulation::Region->insert_path( trk, scene::scratch_data() ); @@ -194,7 +195,7 @@ TTrack * TTrack::NullCreate(int dir) trk->iCategoryFlag = (iCategoryFlag & 15) | 0x80; // taki sam typ plus informacja, że dodatkowy float r1, r2; Segment->GetRolls(r1, r2); // pobranie przechyłek na początku toru - vector3 p1, cv1, cv2, p2; // będziem tworzyć trajektorię lotu + Math3D::vector3 p1, cv1, cv2, p2; // będziem tworzyć trajektorię lotu if (iCategoryFlag & 1) { // tylko dla kolei trk->iDamageFlag = 128; // wykolejenie @@ -248,10 +249,10 @@ TTrack * TTrack::NullCreate(int dir) cv1 = -20.0 * Normalize(Segment->GetDirection1()); // pierwszy wektor kontrolny p2 = p1 + cv1 + cv1; // 40m // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, -RadToDeg(r1), 0.0); + trk->Segment->Init(p1, p1 + cv1, p2 + Math3D::vector3(-cv1.z, cv1.y, cv1.x), p2, 2, -RadToDeg(r1), 0.0); ConnectPrevPrev(trk, 0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, -RadToDeg(r1), 0.0); + trk2->Segment->Init(p1, p1 + cv1, p2 + Math3D::vector3(cv1.z, cv1.y, -cv1.x), p2, 2, -RadToDeg(r1), 0.0); trk2->iPrevDirection = 0; // zwrotnie do tego samego odcinka break; case 1: @@ -259,10 +260,10 @@ TTrack * TTrack::NullCreate(int dir) cv1 = -20.0 * Normalize(Segment->GetDirection2()); // pierwszy wektor kontrolny p2 = p1 + cv1 + cv1; // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk->Segment->Init(p1, p1 + cv1, p2 + vector3(-cv1.z, cv1.y, cv1.x), p2, 2, RadToDeg(r2), 0.0); + trk->Segment->Init(p1, p1 + cv1, p2 + Math3D::vector3(-cv1.z, cv1.y, cv1.x), p2, 2, RadToDeg(r2), 0.0); ConnectNextPrev(trk, 0); // bo prosty, kontrolne wyliczane przy zmiennej przechyłce - trk2->Segment->Init(p1, p1 + cv1, p2 + vector3(cv1.z, cv1.y, -cv1.x), p2, 2, RadToDeg(r2), 0.0); + trk2->Segment->Init(p1, p1 + cv1, p2 + Math3D::vector3(cv1.z, cv1.y, -cv1.x), p2, 2, RadToDeg(r2), 0.0); trk2->iPrevDirection = 1; // zwrotnie do tego samego odcinka break; } @@ -342,17 +343,17 @@ void TTrack::ConnectNextNext(TTrack *pTrack, int typ) } } -vector3 LoadPoint(cParser *parser) +Math3D::vector3 LoadPoint(cParser *parser) { // pobranie współrzędnych punktu - vector3 p; + Math3D::vector3 p; parser->getTokens(3); *parser >> p.x >> p.y >> p.z; return p; } -void TTrack::Load(cParser *parser, vector3 pOrigin) +void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) { // pobranie obiektu trajektorii ruchu - vector3 pt, vec, p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań + Math3D::vector3 pt, vec, p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań double a1, a2, r1, r2, r3, r4; std::string str; size_t i; //,state; //Ra: teraz już nie ma początkowego stanu zwrotnicy we wpisie @@ -403,7 +404,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) } else eType = tt_Unknown; - if (Global::iWriteLogEnabled & 4) + if (Global.iWriteLogEnabled & 4) WriteLog(str); parser->getTokens(4); float discard {}; @@ -466,7 +467,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) if (iCategoryFlag & 4) fTexHeight1 = -fTexHeight1; // rzeki mają wysokość odwrotnie niż drogi } - else if (Global::iWriteLogEnabled & 4) + else if (Global.iWriteLogEnabled & 4) WriteLog("unvis"); Init(); // ustawia SwitchExtension double segsize = 5.0; // długość odcinka segmentowania @@ -499,7 +500,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) if( fRadius != 0 ) { // gdy podany promień - segsize = clamp( std::abs( fRadius ) * ( 0.02 / Global::SplineFidelity ), 2.0 / Global::SplineFidelity, 10.0 ); + segsize = clamp( std::abs( fRadius ) * ( 0.02 / Global.SplineFidelity ), 2.0 / Global.SplineFidelity, 10.0 ); } else { // HACK: crude check whether claimed straight is an actual straight piece @@ -509,12 +510,12 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) } else { // HACK: divide roughly in 10 segments. - segsize = clamp( ( p1 - p2 ).Length() * ( 0.1 / Global::SplineFidelity ), 2.0 / Global::SplineFidelity, 10.0 ); + segsize = clamp( ( p1 - p2 ).Length() * ( 0.1 / Global.SplineFidelity ), 2.0 / Global.SplineFidelity, 10.0 ); } } - if( ( cp1 == vector3( 0, 0, 0 ) ) - && ( cp2 == vector3( 0, 0, 0 ) ) ) { + if( ( cp1 == Math3D::vector3( 0, 0, 0 ) ) + && ( cp2 == Math3D::vector3( 0, 0, 0 ) ) ) { // Ra: hm, czasem dla prostego są podane... // gdy prosty, kontrolne wyliczane przy zmiennej przechyłce Segment->Init( p1, p2, segsize, r1, r2 ); @@ -582,7 +583,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) segsize = 5.0; } // ułomny prosty - if (!(cp1 == vector3(0, 0, 0)) && !(cp2 == vector3(0, 0, 0))) + if (!(cp1 == Math3D::vector3(0, 0, 0)) && !(cp2 == Math3D::vector3(0, 0, 0))) SwitchExtension->Segments[0]->Init(p1, p1 + cp1, p2 + cp2, p2, segsize, r1, r2); else SwitchExtension->Segments[0]->Init(p1, p2, segsize, r1, r2); @@ -613,7 +614,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) segsize = 5.0; } // ułomny prosty - if (!(cp3 == vector3(0, 0, 0)) && !(cp4 == vector3(0, 0, 0))) + if (!(cp3 == Math3D::vector3(0, 0, 0)) && !(cp4 == Math3D::vector3(0, 0, 0))) { // dla skrzyżowania dróg dać odwrotnie końce, żeby brzegi generować lewym if (eType != tt_Cross) SwitchExtension->Segments[1]->Init(p3, p3 + cp3, p4 + cp4, p4, segsize, r3, r4); @@ -641,7 +642,7 @@ void TTrack::Load(cParser *parser, vector3 pOrigin) if( eType == tt_Switch ) // Ra: zamienić później na iloczyn wektorowy { - vector3 v1, v2; + Math3D::vector3 v1, v2; double a1, a2; v1 = SwitchExtension->Segments[0]->FastGetPoint_1() - SwitchExtension->Segments[0]->FastGetPoint_0(); @@ -940,7 +941,7 @@ bool TTrack::AddDynamicObject(TDynamicObject *Dynamic) Dynamic->MyTrack = NULL; // trzeba by to uzależnić od kierunku ruchu... return true; } - if( Global::iMultiplayer ) { + if( Global.iMultiplayer ) { // jeśli multiplayer if( true == Dynamics.empty() ) { // pierwszy zajmujący @@ -1032,7 +1033,7 @@ bool TTrack::RemoveDynamicObject(TDynamicObject *Dynamic) } } } - if( Global::iMultiplayer ) { + if( Global.iMultiplayer ) { // jeśli multiplayer if( true == Dynamics.empty() ) { // jeśli już nie ma żadnego @@ -1707,14 +1708,14 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { case tt_Cross: // skrzyżowanie dróg rysujemy inaczej { // ustalenie współrzędnych środka - przecięcie Point1-Point2 z CV4-Point4 double a[4]; // kąty osi ulic wchodzących - vector3 p[4]; // punkty się przydadzą do obliczeń + Math3D::vector3 p[4]; // punkty się przydadzą do obliczeń // na razie połowa odległości pomiędzy Point1 i Point2, potem się dopracuje a[0] = a[1] = 0.5; // parametr do poszukiwania przecięcia łuków // modyfikować a[0] i a[1] tak, aby trafić na przecięcie odcinka 34 p[0] = SwitchExtension->Segments[0]->FastGetPoint(a[0]); // współrzędne środka pierwszego odcinka p[1] = SwitchExtension->Segments[1]->FastGetPoint(a[1]); //-//- drugiego // p[2]=p[1]-p[0]; //jeśli różne od zera, przeliczyć a[0] i a[1] i wyznaczyć nowe punkty - vector3 oxz = p[0]; // punkt mapowania środka tekstury skrzyżowania + Math3D::vector3 oxz = p[0]; // punkt mapowania środka tekstury skrzyżowania p[0] = SwitchExtension->Segments[0]->GetDirection1(); // Point1 - pobranie wektorów kontrolnych p[1] = SwitchExtension->Segments[1]->GetDirection2(); // Point3 (bo zamienione) p[2] = SwitchExtension->Segments[0]->GetDirection2(); // Point2 @@ -2166,37 +2167,6 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { return; }; -void TTrack::EnvironmentSet() -{ // ustawienie zmienionego światła - switch( eEnvironment ) { - case e_canyon: { - Global::DayLight.apply_intensity( 0.4f ); - break; - } - case e_tunnel: { - Global::DayLight.apply_intensity( 0.2f ); - break; - } - default: { - break; - } - } -}; - -void TTrack::EnvironmentReset() -{ // przywrócenie domyślnego światła - switch( eEnvironment ) { - case e_canyon: - case e_tunnel: { - Global::DayLight.apply_intensity(); - break; - } - default: { - break; - } - } -}; - void TTrack::RenderDynSounds() { // odtwarzanie dźwięków pojazdów jest niezależne od ich wyświetlania for( auto dynamic : Dynamics ) { @@ -2535,11 +2505,11 @@ TTrack * TTrack::RaAnimate() double sina = -hlen * std::sin(glm::radians(SwitchExtension->fOffset)), cosa = -hlen * std::cos(glm::radians(SwitchExtension->fOffset)); SwitchExtension->vTrans = ac->TransGet(); - vector3 middle = + auto middle = location() + SwitchExtension->vTrans; // SwitchExtension->Segments[0]->FastGetPoint(0.5); - Segment->Init(middle + vector3(sina, 0.0, cosa), - middle - vector3(sina, 0.0, cosa), 10.0); // nowy odcinek + Segment->Init(middle + Math3D::vector3(sina, 0.0, cosa), + middle - Math3D::vector3(sina, 0.0, cosa), 10.0); // nowy odcinek for( auto dynamic : Dynamics ) { // minimalny ruch, aby przeliczyć pozycję dynamic->Move( 0.000001 ); @@ -2579,7 +2549,7 @@ bool TTrack::IsGroupable() return true; }; -bool Equal(vector3 v1, vector3 *v2) +bool Equal( Math3D::vector3 v1, Math3D::vector3 *v2) { // sprawdzenie odległości punktów // Ra: powinno być do 100cm wzdłuż toru i ze 2cm w poprzek (na prostej może nie być długiego // kawałka) @@ -2594,7 +2564,7 @@ bool Equal(vector3 v1, vector3 *v2) // return (SquareMagnitude(v1-*v2)<0.00012); //0.011^2=0.00012 }; -int TTrack::TestPoint(vector3 *Point) +int TTrack::TestPoint( Math3D::vector3 *Point) { // sprawdzanie, czy tory można połączyć switch (eType) { @@ -2822,7 +2792,7 @@ path_table::InitTracks() { auto const trackname { track->name() }; - if( ( Global::iHiddenEvents & 1 ) + if( ( Global.iHiddenEvents & 1 ) && ( false == trackname.empty() ) ) { // jeśli podana jest nazwa torów, można szukać eventów skojarzonych przez nazwę track->AssignEvents( diff --git a/Track.h b/Track.h index ee569462..f7494dc3 100644 --- a/Track.h +++ b/Track.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include #include +#include "classes.h" #include "Segment.h" #include "material.h" #include "scenenode.h" @@ -273,10 +274,6 @@ protected: // calculates path's bounding radius void radius_(); - -private: - void EnvironmentSet(); - void EnvironmentReset(); }; diff --git a/Traction.cpp b/Traction.cpp index 6ff114b3..cf7705a7 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation.h" #include "Globals.h" #include "logs.h" +#include "renderer.h" //--------------------------------------------------------------------------- /* @@ -576,9 +577,9 @@ TTraction::wire_color() const { default: {break; } } // w zaleźności od koloru swiatła - color.r *= Global::DayLight.ambient[ 0 ]; - color.g *= Global::DayLight.ambient[ 1 ]; - color.b *= Global::DayLight.ambient[ 2 ]; + color.r *= Global.DayLight.ambient[ 0 ]; + color.g *= Global.DayLight.ambient[ 1 ]; + color.b *= Global.DayLight.ambient[ 2 ]; } else { // tymczasowo pokazanie zasilanych odcinków diff --git a/TractionPower.cpp b/TractionPower.cpp index c83eb49a..8b0d309e 100644 --- a/TractionPower.cpp +++ b/TractionPower.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "TractionPower.h" +#include "parser.h" #include "Logs.h" //--------------------------------------------------------------------------- diff --git a/TractionPower.h b/TractionPower.h index f170e738..1a30c320 100644 --- a/TractionPower.h +++ b/TractionPower.h @@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include "classes.h" #include "scenenode.h" -#include "parser.h" //Tolaris-010603 #include "names.h" class TTractionPowerSource : public editor::basic_node { diff --git a/Train.cpp b/Train.cpp index 0b81c1ea..06d44e95 100644 --- a/Train.cpp +++ b/Train.cpp @@ -17,6 +17,8 @@ http://mozilla.org/MPL/2.0/. #include "Globals.h" #include "simulation.h" +#include "world.h" +#include "camera.h" #include "Logs.h" #include "MdlMngr.h" #include "Timer.h" @@ -317,9 +319,9 @@ TTrain::TTrain() { fPPress = fNPress = 0; // asMessage=""; - pMechShake = vector3(0, 0, 0); - vMechMovement = vector3(0, 0, 0); - pMechOffset = vector3(0, 0, 0); + pMechShake = Math3D::vector3(0, 0, 0); + vMechMovement = Math3D::vector3(0, 0, 0); + pMechOffset = Math3D::vector3(0, 0, 0); fBlinkTimer = 0; fHaslerTimer = 0; DynamicSet(NULL); // ustawia wszystkie mv* @@ -328,7 +330,7 @@ TTrain::TTrain() { bCabLight = false; bCabLightDim = false; //----- - pMechSittingPosition = vector3(0, 0, 0); // ABu: 180404 + pMechSittingPosition = Math3D::vector3(0, 0, 0); // ABu: 180404 InstrumentLightActive = false; // ABu: 030405 fTachoTimer = 0.0; // włączenie skoków wskazań prędkościomierza @@ -356,7 +358,7 @@ TTrain::TTrain() { bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) { // powiązanie ręcznego sterowania kabiną z pojazdem - // Global::pUserDynamic=NewDynamicObject; //pojazd renderowany bez trzęsienia + // Global.pUserDynamic=NewDynamicObject; //pojazd renderowany bez trzęsienia DynamicSet(NewDynamicObject); if (!e3d) if (DynamicObject->Mechanik == NULL) @@ -376,8 +378,8 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) } */ MechSpring.Init(0.015, 250); - vMechVelocity = vector3(0, 0, 0); - pMechOffset = vector3( 0, 0, 0 ); + vMechVelocity = Math3D::vector3(0, 0, 0); + pMechOffset = Math3D::vector3( 0, 0, 0 ); fMechSpringX = 1; fMechSpringY = 0.5; fMechSpringZ = 0.5; @@ -814,7 +816,7 @@ void TTrain::OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Co Train->mvOccupied->BrakeLevelAdd( 0.1 /*15.0 * Command.time_delta*/ ); } else { - Train->set_train_brake( Train->mvOccupied->BrakeCtrlPos + Global::fBrakeStep ); + Train->set_train_brake( Train->mvOccupied->BrakeCtrlPos + Global.fBrakeStep ); } } } @@ -827,7 +829,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co Train->mvOccupied->BrakeLevelAdd( -0.1 /*-15.0 * Command.time_delta*/ ); } else { - Train->set_train_brake( Train->mvOccupied->BrakeCtrlPos - Global::fBrakeStep ); + Train->set_train_brake( Train->mvOccupied->BrakeCtrlPos - Global.fBrakeStep ); } } else { @@ -835,7 +837,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co if( ( Train->mvOccupied->BrakeCtrlPos == -1 ) && ( Train->mvOccupied->BrakeHandle == FVel6 ) && ( Train->DynamicObject->Controller != AIdriver ) - && ( Global::iFeedbackMode < 3 ) ) { + && ( Global.iFeedbackMode < 3 ) ) { // Odskakiwanie hamulce EP Train->set_train_brake( 0 ); } @@ -853,7 +855,7 @@ void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Co if( ( Train->mvOccupied->BrakeCtrlPos == -1 ) && ( Train->mvOccupied->BrakeHandle == FVel6 ) && ( Train->DynamicObject->Controller != AIdriver ) - && ( Global::iFeedbackMode < 3 ) ) { + && ( Global.iFeedbackMode < 3 ) ) { // Odskakiwanie hamulce EP Train->set_train_brake( 0 ); } @@ -2576,14 +2578,14 @@ void TTrain::OnCommand_redmarkerstoggle( TTrain *Train, command_data const &Comm if( ( true == FreeFlyModeFlag ) && ( Command.action == GLFW_PRESS ) ) { - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, true ) ) }; + auto *vehicle { std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 10, false, true ) ) }; if( vehicle == nullptr ) { return; } int const CouplNr { clamp( vehicle->DirectionGet() - * ( LengthSquared3( vehicle->HeadPosition() - Global::pCameraPosition ) > LengthSquared3( vehicle->RearPosition() - Global::pCameraPosition ) ? + * ( LengthSquared3( vehicle->HeadPosition() - Global.pCameraPosition ) > LengthSquared3( vehicle->RearPosition() - Global.pCameraPosition ) ? 1 : -1 ), 0, 1 ) }; // z [-1,1] zrobić [0,1] @@ -2602,14 +2604,14 @@ void TTrain::OnCommand_endsignalstoggle( TTrain *Train, command_data const &Comm if( ( true == FreeFlyModeFlag ) && ( Command.action == GLFW_PRESS ) ) { - auto *vehicle { std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 10, false, true ) ) }; + auto *vehicle { std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 10, false, true ) ) }; if( vehicle == nullptr ) { return; } int const CouplNr { clamp( vehicle->DirectionGet() - * ( LengthSquared3( vehicle->HeadPosition() - Global::pCameraPosition ) > LengthSquared3( vehicle->RearPosition() - Global::pCameraPosition ) ? + * ( LengthSquared3( vehicle->HeadPosition() - Global.pCameraPosition ) > LengthSquared3( vehicle->RearPosition() - Global.pCameraPosition ) ? 1 : -1 ), 0, 1 ) }; // z [-1,1] zrobić [0,1] @@ -3141,8 +3143,8 @@ void TTrain::OnCommand_cabchangeforward( TTrain *Train, command_data const &Comm if( false == Train->CabChange( 1 ) ) { if( TestFlag( Train->DynamicObject->MoverParameters->Couplers[ side::front ].CouplingFlag, coupling::gangway ) ) { // przejscie do nastepnego pojazdu - Global::changeDynObj = Train->DynamicObject->PrevConnected; - Global::changeDynObj->MoverParameters->ActiveCab = ( + Global.changeDynObj = Train->DynamicObject->PrevConnected; + Global.changeDynObj->MoverParameters->ActiveCab = ( Train->DynamicObject->PrevConnectedNo ? -1 : 1 ); @@ -3157,8 +3159,8 @@ void TTrain::OnCommand_cabchangebackward( TTrain *Train, command_data const &Com if( false == Train->CabChange( -1 ) ) { if( TestFlag( Train->DynamicObject->MoverParameters->Couplers[ side::rear ].CouplingFlag, coupling::gangway ) ) { // przejscie do nastepnego pojazdu - Global::changeDynObj = Train->DynamicObject->NextConnected; - Global::changeDynObj->MoverParameters->ActiveCab = ( + Global.changeDynObj = Train->DynamicObject->NextConnected; + Global.changeDynObj->MoverParameters->ActiveCab = ( Train->DynamicObject->NextConnectedNo ? -1 : 1 ); @@ -3189,13 +3191,13 @@ void TTrain::UpdateMechPosition(double dt) // Granice mozna ustalic doswiadczalnie. Ja proponuje 14:20 double const iVel = std::min( DynamicObject->GetVelocity(), 150.0 ); - if( !Global::iSlowMotion // musi być pełna prędkość + if( !Global.iSlowMotion // musi być pełna prędkość && ( pMechOffset.y < 4.0 ) ) // Ra 15-01: przy oglądaniu pantografu bujanie przeszkadza { if( iVel > 0.5 ) { // acceleration-driven base shake shake += 1.25 * MechSpring.ComputateForces( - vector3( + Math3D::vector3( -mvControlled->AccN * dt * 5.0, // highlight side sway -mvControlled->AccVert * dt, -mvControlled->AccSVBased * dt * 1.25 ), // accent acceleration/deceleration @@ -3204,7 +3206,7 @@ void TTrain::UpdateMechPosition(double dt) if( Random( iVel ) > 25.0 ) { // extra shake at increased velocity shake += MechSpring.ComputateForces( - vector3( + Math3D::vector3( ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringX, ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringY, ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringZ ) @@ -3224,14 +3226,14 @@ void TTrain::UpdateMechPosition(double dt) if( ( pMechShake.y > fMechMaxSpring ) || ( pMechShake.y < -fMechMaxSpring ) ) vMechVelocity.y = -vMechVelocity.y; // ABu011104: 5*pMechShake.y, zeby ladnie pudlem rzucalo :) - pMechPosition = pMechOffset + vector3( 1.5 * pMechShake.x, 2.0 * pMechShake.y, 1.5 * pMechShake.z ); + pMechPosition = pMechOffset + Math3D::vector3( 1.5 * pMechShake.x, 2.0 * pMechShake.y, 1.5 * pMechShake.z ); // vMechMovement = 0.5 * vMechMovement; } else { // hamowanie rzucania przy spadku FPS pMechShake -= pMechShake * std::min( dt, 1.0 ); // po tym chyba potrafią zostać jakieś ułamki, które powodują zjazd pMechOffset += vMechMovement * dt; vMechVelocity.y = 0.5 * vMechVelocity.y; - pMechPosition = pMechOffset + vector3( pMechShake.x, 5 * pMechShake.y, pMechShake.z ); + pMechPosition = pMechOffset + Math3D::vector3( pMechShake.x, 5 * pMechShake.y, pMechShake.z ); // vMechMovement = 0.5 * vMechMovement; } // numer kabiny (-1: kabina B) @@ -3278,10 +3280,10 @@ void TTrain::UpdateMechPosition(double dt) }; // returns position of the mechanic in the scene coordinates -vector3 +Math3D::vector3 TTrain::GetWorldMechPosition() { - vector3 position = DynamicObject->mMatrix * pMechPosition; // położenie względem środka pojazdu w układzie scenerii + auto position = DynamicObject->mMatrix * pMechPosition; // położenie względem środka pojazdu w układzie scenerii position += DynamicObject->GetPosition(); return position; } @@ -3310,13 +3312,13 @@ bool TTrain::Update( double const Deltatime ) // update driver's position { - vector3 Vec = Global::pCamera->Velocity * -2.0;// -7.5 * Timer::GetDeltaRenderTime(); + auto Vec = Global.pCamera->Velocity * -2.0;// -7.5 * Timer::GetDeltaRenderTime(); Vec.y = -Vec.y; if( mvOccupied->ActiveCab < 0 ) { Vec *= -1.0f; Vec.y = -Vec.y; } - Vec.RotateY( Global::pCamera->Yaw ); + Vec.RotateY( Global.pCamera->Yaw ); vMechMovement = Vec; } @@ -3491,7 +3493,7 @@ bool TTrain::Update( double const Deltatime ) fEIMParams[1 + i][9] = 0; } - if (Global::iFeedbackMode == 4) + if (Global.iFeedbackMode == 4) { // wykonywać tylko gdy wyprowadzone na pulpit Console::ValueSet(0, mvOccupied->Compressor); // Ra: sterowanie miernikiem: zbiornik główny @@ -3509,7 +3511,7 @@ bool TTrain::Update( double const Deltatime ) /// napędu } - if (Global::bMWDmasterEnable) // pobieranie danych dla pulpitu port (COM) + if (Global.bMWDmasterEnable) // pobieranie danych dla pulpitu port (COM) { Console::ValueSet(0, mvOccupied->Compressor); // zbiornik główny Console::ValueSet(1, mvOccupied->PipePress); // przewód główny @@ -4067,7 +4069,7 @@ bool TTrain::Update( double const Deltatime ) { if (DynamicObject->Mechanik ? (DynamicObject->Mechanik->AIControllFlag ? false : - (Global::iFeedbackMode == 4 || (Global::bMWDmasterEnable && Global::bMWDBreakEnable))) : + (Global.iFeedbackMode == 4 || (Global.bMWDmasterEnable && Global.bMWDBreakEnable))) : false) // nie blokujemy AI { // Ra: nie najlepsze miejsce, ale na początek gdzieś to dać trzeba // Firleju: dlatego kasujemy i zastepujemy funkcją w Console @@ -4076,7 +4078,7 @@ bool TTrain::Update( double const Deltatime ) double b = Console::AnalogCalibrateGet(0); b = b * 8.0 - 2.0; b = clamp( b, -2.0, mvOccupied->BrakeCtrlPosNo ); // przycięcie zmiennej do granic - if (Global::bMWDdebugEnable && Global::iMWDDebugMode & 4) WriteLog("FV4a break position = " + to_string(b)); + if (Global.bMWDdebugEnable && Global.iMWDDebugMode & 4) WriteLog("FV4a break position = " + to_string(b)); ggBrakeCtrl.UpdateValue(b); // przesów bez zaokrąglenia mvOccupied->BrakeLevelSet(b); } @@ -4085,7 +4087,7 @@ bool TTrain::Update( double const Deltatime ) double b = Console::AnalogCalibrateGet(0); b = b * 7.0 - 1.0; b = clamp( b, -1.0, mvOccupied->BrakeCtrlPosNo ); // przycięcie zmiennej do granic - if (Global::bMWDdebugEnable && Global::iMWDDebugMode & 4) WriteLog("FVel6 break position = " + to_string(b)); + if (Global.bMWDdebugEnable && Global.iMWDDebugMode & 4) WriteLog("FVel6 break position = " + to_string(b)); ggBrakeCtrl.UpdateValue(b); // przesów bez zaokrąglenia mvOccupied->BrakeLevelSet(b); } @@ -4103,8 +4105,8 @@ bool TTrain::Update( double const Deltatime ) if( ( DynamicObject->Mechanik != nullptr ) && ( false == DynamicObject->Mechanik->AIControllFlag ) // nie blokujemy AI && ( mvOccupied->BrakeLocHandle == FD1 ) - && ( ( Global::iFeedbackMode == 4 ) - || ( Global::bMWDmasterEnable && Global::bMWDBreakEnable ) ) ) { + && ( ( Global.iFeedbackMode == 4 ) + || ( Global.bMWDmasterEnable && Global.bMWDBreakEnable ) ) ) { // Ra: nie najlepsze miejsce, ale na początek gdzieś to dać trzeba // Firleju: dlatego kasujemy i zastepujemy funkcją w Console auto const b = clamp( @@ -4113,8 +4115,8 @@ bool TTrain::Update( double const Deltatime ) ManualBrakePosNo ); ggLocalBrake.UpdateValue( b ); // przesów bez zaokrąglenia mvOccupied->LocalBrakePos = int( 1.09 * b ); // sposób zaokrąglania jest do ustalenia - if( ( true == Global::bMWDdebugEnable ) - && ( ( Global::iMWDDebugMode & 4 ) != 0 ) ) { + if( ( true == Global.bMWDdebugEnable ) + && ( ( Global.iMWDDebugMode & 4 ) != 0 ) ) { WriteLog( "FD1 break position = " + to_string( b ) ); } } @@ -4513,7 +4515,7 @@ TTrain::update_sounds( double const Deltatime ) { // szum w czasie jazdy if( ( false == FreeFlyModeFlag ) - && ( false == Global::CabWindowOpen ) + && ( false == Global.CabWindowOpen ) && ( DynamicObject->GetVelocity() > 0.5 ) ) { // frequency calculation @@ -4936,11 +4938,11 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) if (token != "none") { // bieżąca sciezka do tekstur to dynamic/... - Global::asCurrentTexturePath = DynamicObject->asBaseDir; + Global.asCurrentTexturePath = DynamicObject->asBaseDir; // szukaj kabinę jako oddzielny model TModel3d *kabina = TModelsManager::GetModel(DynamicObject->asBaseDir + token, true); // z powrotem defaultowa sciezka do tekstur - Global::asCurrentTexturePath = szTexturePath; + Global.asCurrentTexturePath = szTexturePath; // if (DynamicObject->mdKabina!=k) if (kabina != nullptr) { @@ -5048,23 +5050,23 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) void TTrain::MechStop() { // likwidacja ruchu kamery w kabinie (po powrocie przez [F4]) - pMechPosition = vector3(0, 0, 0); - pMechShake = vector3(0, 0, 0); - vMechMovement = vector3(0, 0, 0); - vMechVelocity = vector3(0, 0, 0); // tu zostawały jakieś ułamki, powodujące uciekanie kamery + pMechPosition = Math3D::vector3(0, 0, 0); + pMechShake = Math3D::vector3(0, 0, 0); + vMechMovement = Math3D::vector3(0, 0, 0); + vMechVelocity = Math3D::vector3(0, 0, 0); // tu zostawały jakieś ułamki, powodujące uciekanie kamery }; -vector3 TTrain::MirrorPosition(bool lewe) +Math3D::vector3 TTrain::MirrorPosition(bool lewe) { // zwraca współrzędne widoku kamery z lusterka switch (iCabn) { case 1: // przednia (1) return DynamicObject->mMatrix * - vector3(lewe ? Cabine[iCabn].CabPos2.x : Cabine[iCabn].CabPos1.x, + Math3D::vector3(lewe ? Cabine[iCabn].CabPos2.x : Cabine[iCabn].CabPos1.x, 1.5 + Cabine[iCabn].CabPos1.y, Cabine[iCabn].CabPos2.z); case 2: // tylna (-1) return DynamicObject->mMatrix * - vector3(lewe ? Cabine[iCabn].CabPos1.x : Cabine[iCabn].CabPos2.x, + Math3D::vector3(lewe ? Cabine[iCabn].CabPos1.x : Cabine[iCabn].CabPos2.x, 1.5 + Cabine[iCabn].CabPos1.y, Cabine[iCabn].CabPos1.z); } return DynamicObject->GetPosition(); // współrzędne środka pojazdu diff --git a/Train.h b/Train.h index 99d4bbe7..bb4e79ab 100644 --- a/Train.h +++ b/Train.h @@ -37,8 +37,8 @@ class TCab void Init(double Initx1, double Inity1, double Initz1, double Initx2, double Inity2, double Initz2, bool InitEnabled, bool InitOccupied); */ void Load(cParser &Parser); - vector3 CabPos1; - vector3 CabPos2; + Math3D::vector3 CabPos1; + Math3D::vector3 CabPos2; bool bEnabled; bool bOccupied; double dimm_r, dimm_g, dimm_b; // McZapkie-120503: tlumienie swiatla @@ -83,11 +83,11 @@ class TTrain // McZapkie-010302 bool Init(TDynamicObject *NewDynamicObject, bool e3d = false); - inline vector3 GetDirection() { return DynamicObject->VectorFront(); }; - inline vector3 GetUp() { return DynamicObject->VectorUp(); }; + inline Math3D::vector3 GetDirection() { return DynamicObject->VectorFront(); }; + inline Math3D::vector3 GetUp() { return DynamicObject->VectorUp(); }; inline std::string GetLabel( TSubModel const *Control ) const { return m_controlmapper.find( Control ); } void UpdateMechPosition(double dt); - vector3 GetWorldMechPosition(); + Math3D::vector3 GetWorldMechPosition(); bool Update( double const Deltatime ); void MechStop(); void SetLights(); @@ -421,11 +421,11 @@ public: // reszta może by?publiczna /* vector3 pPosition; */ - vector3 pMechOffset; // driverNpos - vector3 vMechMovement; - vector3 pMechPosition; - vector3 pMechShake; - vector3 vMechVelocity; + Math3D::vector3 pMechOffset; // driverNpos + Math3D::vector3 vMechMovement; + Math3D::vector3 pMechPosition; + Math3D::vector3 pMechShake; + Math3D::vector3 vMechVelocity; // McZapkie: do poruszania sie po kabinie // McZapkie: opis kabiny - obszar poruszania sie mechanika oraz zajetosc TCab Cabine[maxcab + 1]; // przedzial maszynowy, kabina 1 (A), kabina 2 (B) @@ -468,8 +468,8 @@ public: // reszta może by?publiczna bool bCabLight; // hunter-091012: czy swiatlo jest zapalone? bool bCabLightDim; // hunter-091012: czy przyciemnienie kabiny jest zapalone? - vector3 pMechSittingPosition; // ABu 180404 - vector3 MirrorPosition(bool lewe); + Math3D::vector3 pMechSittingPosition; // ABu 180404 + Math3D::vector3 MirrorPosition(bool lewe); private: double fBlinkTimer; diff --git a/TrkFoll.h b/TrkFoll.h index 2545ba58..4e1a4cfd 100644 --- a/TrkFoll.h +++ b/TrkFoll.h @@ -10,8 +10,8 @@ http://mozilla.org/MPL/2.0/. #ifndef TrkFollH #define TrkFollH -#include "Track.h" -#include "McZapkie\MOVER.h" +#include "classes.h" +#include "segment.h" class TTrackFollower { // oś poruszająca się po torze diff --git a/World.cpp b/World.cpp index 77404f11..a379184e 100644 --- a/World.cpp +++ b/World.cpp @@ -30,6 +30,7 @@ http://mozilla.org/MPL/2.0/. #include "Console.h" #include "color.h" #include "uilayer.h" +#include "uitranscripts.h" #include "translation.h" //--------------------------------------------------------------------------- @@ -65,9 +66,9 @@ simulation_time::init() { ::GetLocalTime( &m_time ); - if( Global::fMoveLight > 0.0 ) { + if( Global.fMoveLight > 0.0 ) { // day and month of the year can be overriden by scenario setup - daymonth( m_time.wDay, m_time.wMonth, m_time.wYear, static_cast( Global::fMoveLight ) ); + daymonth( m_time.wDay, m_time.wMonth, m_time.wYear, static_cast( Global.fMoveLight ) ); } if( requestedhour != (WORD)-1 ) { m_time.wHour = clamp( requestedhour, static_cast( 0 ), static_cast( 23 ) ); } @@ -185,7 +186,7 @@ TWorld::TWorld() Train = NULL; for (int i = 0; i < 10; ++i) KeyEvents[i] = NULL; // eventy wyzwalane klawiszami cyfrowymi - Global::iSlowMotion = 0; + Global.iSlowMotion = 0; pDynamicNearest = NULL; fTimeBuffer = 0.0; // bufor czasu aktualizacji dla stałego kroku fizyki fMaxDt = 0.01; //[s] początkowy krok czasowy fizyki @@ -221,34 +222,34 @@ bool TWorld::Init( GLFWwindow *Window ) { auto timestart = std::chrono::system_clock::now(); window = Window; - Global::window = Window; // do WM_COPYDATA - Global::pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań + Global.window = Window; // do WM_COPYDATA + Global.pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań - WriteLog( "\nStarting MaSzyna rail vehicle simulator (release: " + Global::asVersion + ")" ); + WriteLog( "\nStarting MaSzyna rail vehicle simulator (release: " + Global.asVersion + ")" ); WriteLog( "For online documentation and additional files refer to: http://eu07.pl"); 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\n" ); UILayer.set_background( "logo" ); - glfwSetWindowTitle( window, ( Global::AppName + " (" + Global::SceneryFile + ")" ).c_str() ); // nazwa scenerii + glfwSetWindowTitle( window, ( Global.AppName + " (" + Global.SceneryFile + ")" ).c_str() ); // nazwa scenerii UILayer.set_progress(0.01); UILayer.set_progress( "Loading scenery / Wczytywanie scenerii" ); GfxRenderer.Render(); WriteLog( "World setup..." ); - if( false == simulation::State.deserialize( Global::SceneryFile ) ) { return false; } + if( false == simulation::State.deserialize( Global.SceneryFile ) ) { return false; } simulation::Time.init(); Environment.init(); - Camera.Init(Global::FreeCameraInit[0], Global::FreeCameraInitAngle[0]); + Camera.Init(Global.FreeCameraInit[0], Global.FreeCameraInitAngle[0]); UILayer.set_progress( "Preparing train / Przygotowanie kabiny" ); - WriteLog( "Player train init: " + Global::asHumanCtrlVehicle ); + WriteLog( "Player train init: " + Global.asHumanCtrlVehicle ); TDynamicObject *nPlayerTrain; - if( Global::asHumanCtrlVehicle != "ghostview" ) - nPlayerTrain = simulation::Vehicles.find( Global::asHumanCtrlVehicle ); + if( Global.asHumanCtrlVehicle != "ghostview" ) + nPlayerTrain = simulation::Vehicles.find( Global.asHumanCtrlVehicle ); if (nPlayerTrain) { Train = new TTrain(); @@ -258,7 +259,7 @@ bool TWorld::Init( GLFWwindow *Window ) { mvControlled = Controlled->ControlledFind()->MoverParameters; WriteLog("Player train init OK"); - glfwSetWindowTitle( window, ( Global::AppName + " (" + Controlled->MoverParameters->Name + " @ " + Global::SceneryFile + ")" ).c_str() ); + glfwSetWindowTitle( window, ( Global.AppName + " (" + Controlled->MoverParameters->Name + " @ " + Global.SceneryFile + ")" ).c_str() ); FollowView(); } @@ -273,7 +274,7 @@ bool TWorld::Init( GLFWwindow *Window ) { } else { - if (Global::asHumanCtrlVehicle != "ghostview") + if (Global.asHumanCtrlVehicle != "ghostview") { Error("Player train doesn't exist!"); } @@ -283,10 +284,10 @@ bool TWorld::Init( GLFWwindow *Window ) { mvControlled = NULL; Camera.Type = tp_Free; DebugCamera = Camera; - Global::DebugCameraPosition = DebugCamera.Pos; + Global.DebugCameraPosition = DebugCamera.Pos; } - // if (!Global::bMultiplayer) //na razie włączone + // if (!Global.bMultiplayer) //na razie włączone { // eventy aktywowane z klawiatury tylko dla jednego użytkownika KeyEvents[ 0 ] = simulation::Events.FindEvent( "keyctrl00" ); KeyEvents[ 1 ] = simulation::Events.FindEvent( "keyctrl01" ); @@ -317,10 +318,10 @@ bool TWorld::Init( GLFWwindow *Window ) { Timer::ResetTimers(); // make 4 empty lines for the ui header, to cut down on work down the road - UIHeader->text_lines.emplace_back( "", Global::UITextColor ); - UIHeader->text_lines.emplace_back( "", Global::UITextColor ); - UIHeader->text_lines.emplace_back( "", Global::UITextColor ); - UIHeader->text_lines.emplace_back( "", Global::UITextColor ); + UIHeader->text_lines.emplace_back( "", Global.UITextColor ); + UIHeader->text_lines.emplace_back( "", Global.UITextColor ); + UIHeader->text_lines.emplace_back( "", Global.UITextColor ); + UIHeader->text_lines.emplace_back( "", Global.UITextColor ); // bind the panels with ui object. maybe not the best place for this but, eh UILayer.push_back( UIHeader ); UILayer.push_back( UITable ); @@ -331,7 +332,7 @@ bool TWorld::Init( GLFWwindow *Window ) { void TWorld::OnKeyDown(int cKey) { // dump keypress info in the log - if( !Global::iPause ) { + if( !Global.iPause ) { // podczas pauzy klawisze nie działają std::string keyinfo; auto keyname = glfwGetKeyName( cKey, 0 ); @@ -366,9 +367,9 @@ void TWorld::OnKeyDown(int cKey) { if( keyinfo.empty() == false ) { std::string keymodifiers; - if( Global::shiftState ) + if( Global.shiftState ) keymodifiers += "[Shift]+"; - if( Global::ctrlState ) + if( Global.ctrlState ) keymodifiers += "[Ctrl]+"; WriteLog( "Key pressed: " + keymodifiers + "[" + keyinfo + "]" ); @@ -380,41 +381,41 @@ void TWorld::OnKeyDown(int cKey) { if( ( cKey >= GLFW_KEY_0 ) && ( cKey <= GLFW_KEY_9 ) ) // klawisze cyfrowe { int i = cKey - GLFW_KEY_0; // numer klawisza - if (Global::shiftState) { + if (Global.shiftState) { // z [Shift] uruchomienie eventu - if( ( false == Global::iPause ) // podczas pauzy klawisze nie działają + if( ( false == Global.iPause ) // podczas pauzy klawisze nie działają && ( KeyEvents[ i ] != nullptr ) ) { simulation::Events.AddToQuery( KeyEvents[ i ], NULL ); } } else // zapamiętywanie kamery może działać podczas pauzy if (FreeFlyModeFlag) // w trybie latania można przeskakiwać do ustawionych kamer - if( ( Global::iTextMode != GLFW_KEY_F12 ) && - ( Global::iTextMode != GLFW_KEY_F3 ) ) // ograniczamy użycie kamer + if( ( Global.iTextMode != GLFW_KEY_F12 ) && + ( Global.iTextMode != GLFW_KEY_F3 ) ) // ograniczamy użycie kamer { - if ((!Global::FreeCameraInit[i].x) - && (!Global::FreeCameraInit[i].y) - && (!Global::FreeCameraInit[i].z)) + if ((!Global.FreeCameraInit[i].x) + && (!Global.FreeCameraInit[i].y) + && (!Global.FreeCameraInit[i].z)) { // jeśli kamera jest w punkcie zerowym, zapamiętanie współrzędnych i kątów - Global::FreeCameraInit[i] = Camera.Pos; - Global::FreeCameraInitAngle[i].x = Camera.Pitch; - Global::FreeCameraInitAngle[i].y = Camera.Yaw; - Global::FreeCameraInitAngle[i].z = Camera.Roll; + Global.FreeCameraInit[i] = Camera.Pos; + Global.FreeCameraInitAngle[i].x = Camera.Pitch; + Global.FreeCameraInitAngle[i].y = Camera.Yaw; + Global.FreeCameraInitAngle[i].z = Camera.Roll; // logowanie, żeby można było do scenerii przepisać WriteLog( - "camera " + std::to_string( Global::FreeCameraInit[i].x ) + " " - + std::to_string(Global::FreeCameraInit[i].y ) + " " - + std::to_string(Global::FreeCameraInit[i].z ) + " " - + std::to_string(RadToDeg(Global::FreeCameraInitAngle[i].x)) + " " - + std::to_string(RadToDeg(Global::FreeCameraInitAngle[i].y)) + " " - + std::to_string(RadToDeg(Global::FreeCameraInitAngle[i].z)) + " " + "camera " + std::to_string( Global.FreeCameraInit[i].x ) + " " + + std::to_string(Global.FreeCameraInit[i].y ) + " " + + std::to_string(Global.FreeCameraInit[i].z ) + " " + + std::to_string(RadToDeg(Global.FreeCameraInitAngle[i].x)) + " " + + std::to_string(RadToDeg(Global.FreeCameraInitAngle[i].y)) + " " + + std::to_string(RadToDeg(Global.FreeCameraInitAngle[i].z)) + " " + std::to_string(i) + " endcamera"); } else // również przeskakiwanie - { // Ra: to z tą kamerą (Camera.Pos i Global::pCameraPosition) jest trochę bez sensu - Global::SetCameraPosition( Global::FreeCameraInit[i] ); // nowa pozycja dla generowania obiektów - Camera.Init(Global::FreeCameraInit[i], - Global::FreeCameraInitAngle[i]); // przestawienie + { // Ra: to z tą kamerą (Camera.Pos i Global.pCameraPosition) jest trochę bez sensu + Global.pCameraPosition = Global.FreeCameraInit[i]; // nowa pozycja dla generowania obiektów + Camera.Init(Global.FreeCameraInit[i], + Global.FreeCameraInitAngle[i]); // przestawienie } } // będzie jeszcze załączanie sprzęgów z [Ctrl] @@ -426,59 +427,59 @@ void TWorld::OnKeyDown(int cKey) { case GLFW_KEY_F1: { if( DebugModeFlag ) { // additional time speedup keys in debug mode - if( Global::ctrlState ) { + if( Global.ctrlState ) { // ctrl-f3 simulation::Time.update( 20.0 * 60.0 ); } - else if( Global::shiftState ) { + else if( Global.shiftState ) { // shift-f3 simulation::Time.update( 5.0 * 60.0 ); } } - if( ( false == Global::ctrlState ) - && ( false == Global::shiftState ) ) { + if( ( false == Global.ctrlState ) + && ( false == Global.shiftState ) ) { // czas i relacja - if( Global::iTextMode == cKey ) { ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; } - if( Global::iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { + if( Global.iTextMode == cKey ) { ++Global.iScreenMode[ cKey - GLFW_KEY_F1 ]; } + if( Global.iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { // wyłączenie napisów - Global::iTextMode = 0; - Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; + Global.iTextMode = 0; + Global.iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; } else { - Global::iTextMode = cKey; + Global.iTextMode = cKey; } } break; } case GLFW_KEY_F2: { // parametry pojazdu - if( Global::iTextMode == cKey ) { ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; } - if( Global::iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { + if( Global.iTextMode == cKey ) { ++Global.iScreenMode[ cKey - GLFW_KEY_F1 ]; } + if( Global.iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { // wyłączenie napisów - Global::iTextMode = 0; - Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; + Global.iTextMode = 0; + Global.iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; } else { - Global::iTextMode = cKey; + Global.iTextMode = cKey; } break; } case GLFW_KEY_F3: { // timetable - if( Global::iTextMode == cKey ) { ++Global::iScreenMode[ cKey - GLFW_KEY_F1 ]; } - if( Global::iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { + if( Global.iTextMode == cKey ) { ++Global.iScreenMode[ cKey - GLFW_KEY_F1 ]; } + if( Global.iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { // wyłączenie napisów - Global::iTextMode = 0; - Global::iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; + Global.iTextMode = 0; + Global.iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; } else { - Global::iTextMode = cKey; + Global.iTextMode = cKey; } break; } case GLFW_KEY_F4: { - InOutKey( !Global::shiftState ); // distant view with Shift, short distance step out otherwise + InOutKey( !Global.shiftState ); // distant view with Shift, short distance step out otherwise break; } case GLFW_KEY_F5: { @@ -488,7 +489,7 @@ void TWorld::OnKeyDown(int cKey) { break; } - TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 50, true, false ) ); + TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 50, true, false ) ); if( ( tmp != nullptr ) && ( tmp != Controlled ) ) { @@ -510,22 +511,22 @@ void TWorld::OnKeyDown(int cKey) { } else SafeDelete( Train ); // i nie ma czym sterować - // Global::pUserDynamic=Controlled; //renerowanie pojazdu względem kabiny - // Global::iTextMode=VK_F4; + // Global.pUserDynamic=Controlled; //renerowanie pojazdu względem kabiny + // Global.iTextMode=VK_F4; if( Train ) InOutKey(); // do kabiny } } -// Global::iTextMode = cKey; +// Global.iTextMode = cKey; break; } case GLFW_KEY_F6: { -// Global::iTextMode = cKey; +// Global.iTextMode = cKey; // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! if( DebugModeFlag ) { - if( Global::ctrlState ) { Global::fTimeSpeed = ( Global::shiftState ? 60.0 : 20.0 ); } - else { Global::fTimeSpeed = ( Global::shiftState ? 5.0 : 1.0 ); } + if( Global.ctrlState ) { Global.fTimeSpeed = ( Global.shiftState ? 60.0 : 20.0 ); } + else { Global.fTimeSpeed = ( Global.shiftState ? 5.0 : 1.0 ); } } break; } @@ -533,15 +534,15 @@ void TWorld::OnKeyDown(int cKey) { // debug mode functions if( DebugModeFlag ) { - if( Global::ctrlState ) { + if( Global.ctrlState ) { // ctrl + f7 toggles static daylight ToggleDaylight(); break; } else { // f7: wireframe toggle - Global::bWireFrame = !Global::bWireFrame; - if( true == Global::bWireFrame ) { + Global.bWireFrame = !Global.bWireFrame; + if( true == Global.bWireFrame ) { glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); } else { @@ -552,88 +553,88 @@ void TWorld::OnKeyDown(int cKey) { break; } case GLFW_KEY_F8: { - if( Global::ctrlState - && Global::shiftState ) { + if( Global.ctrlState + && Global.shiftState ) { DebugCameraFlag = !DebugCameraFlag; // taka opcjonalna funkcja, może się czasem przydać } else { - Global::iTextMode = cKey; + Global.iTextMode = cKey; } break; } case GLFW_KEY_F9: { - Global::iTextMode = cKey; + Global.iTextMode = cKey; // wersja break; } case GLFW_KEY_F10: { - if( Global::iTextMode == cKey ) { - Global::iTextMode = - ( Global::iPause && ( cKey != GLFW_KEY_F1 ) ? + if( Global.iTextMode == cKey ) { + Global.iTextMode = + ( Global.iPause && ( cKey != GLFW_KEY_F1 ) ? GLFW_KEY_F1 : 0 ); // wyłączenie napisów, chyba że pauza } else { - Global::iTextMode = cKey; + Global.iTextMode = cKey; } break; } case GLFW_KEY_F12: { // coś tam jeszcze - if( Global::ctrlState - && Global::shiftState ) + if( Global.ctrlState + && Global.shiftState ) DebugModeFlag = !DebugModeFlag; // taka opcjonalna funkcja, może się czasem przydać else - Global::iTextMode = cKey; + Global.iTextMode = cKey; break; } } // if (cKey!=VK_F4) return; // nie są przekazywane do pojazdu wcale } - if( Global::iTextMode == GLFW_KEY_F10 ) // wyświetlone napisy klawiszem F10 + if( Global.iTextMode == GLFW_KEY_F10 ) // wyświetlone napisy klawiszem F10 { // i potwierdzenie if( cKey == GLFW_KEY_Y ) { // flaga wyjścia z programu ::PostQuitMessage( 0 ); -// Global::iTextMode = -1; +// Global.iTextMode = -1; } return; // nie przekazujemy do pociągu } - else if ((Global::iTextMode == GLFW_KEY_F12) ? (cKey >= '0') && (cKey <= '9') : false) + else if ((Global.iTextMode == GLFW_KEY_F12) ? (cKey >= '0') && (cKey <= '9') : false) { // tryb konfiguracji debugmode (przestawianie kamery już wyłączone - if (!Global::shiftState) // bez [Shift] + if (!Global.shiftState) // bez [Shift] { if (cKey == GLFW_KEY_1) - Global::iWriteLogEnabled ^= 1; // włącz/wyłącz logowanie do pliku + Global.iWriteLogEnabled ^= 1; // włącz/wyłącz logowanie do pliku else if (cKey == GLFW_KEY_2) { // włącz/wyłącz okno konsoli - Global::iWriteLogEnabled ^= 2; - if ((Global::iWriteLogEnabled & 2) == 0) // nie było okienka + Global.iWriteLogEnabled ^= 2; + if ((Global.iWriteLogEnabled & 2) == 0) // nie było okienka { // otwarcie okna AllocConsole(); // jeśli konsola już jest, to zwróci błąd; uwalniać nie ma po // co, bo się odłączy SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN); } } - // else if (cKey=='3') Global::iWriteLogEnabled^=4; //wypisywanie nazw torów + // else if (cKey=='3') Global.iWriteLogEnabled^=4; //wypisywanie nazw torów } } else if( cKey == GLFW_KEY_ESCAPE ) { // toggle pause - if( Global::iPause & 1 ) // jeśli pauza startowa - Global::iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować - else if( !( Global::iMultiplayer & 2 ) ) // w multiplayerze pauza nie ma sensu - Global::iPause ^= 2; // zmiana stanu zapauzowania - if( Global::iPause ) {// jak pauza - Global::iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację + if( Global.iPause & 1 ) // jeśli pauza startowa + Global.iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować + else if( !( Global.iMultiplayer & 2 ) ) // w multiplayerze pauza nie ma sensu + Global.iPause ^= 2; // zmiana stanu zapauzowania + if( Global.iPause ) {// jak pauza + Global.iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację } } else { if( ( true == DebugModeFlag ) - && ( false == Global::shiftState ) - && ( true == Global::ctrlState ) + && ( false == Global.shiftState ) + && ( true == Global.ctrlState ) && ( Controlled != nullptr ) && ( Controlled->Controller == Humandriver ) ) { @@ -690,7 +691,7 @@ void TWorld::InOutKey( bool const Near ) DistantView( Near ); } DebugCamera = Camera; - Global::DebugCameraPosition = DebugCamera.Pos; + Global.DebugCameraPosition = DebugCamera.Pos; } else { // jazda w kabinie @@ -698,7 +699,7 @@ void TWorld::InOutKey( bool const Near ) { Train->Dynamic()->bDisplayCab = true; Train->Dynamic()->ABuSetModelShake( - vector3(0, 0, 0)); // zerowanie przesunięcia przed powrotem? + Math3D::vector3(0, 0, 0)); // zerowanie przesunięcia przed powrotem? // Camera.Stop(); //zatrzymanie ruchu Train->MechStop(); FollowView(); // na pozycję mecha @@ -709,13 +710,13 @@ void TWorld::InOutKey( bool const Near ) // update window title to reflect the situation glfwSetWindowTitle( window, - ( Global::AppName + ( Global.AppName + " (" + ( Controlled != nullptr ? Controlled->MoverParameters->Name : "" ) + " @ " - + Global::SceneryFile + + Global.SceneryFile + ")" ).c_str() ); }; @@ -738,16 +739,16 @@ void TWorld::DistantView( bool const Near ) if( true == Near ) { Camera.Pos = - vector3( Camera.Pos.x, vehicle->GetPosition().y, Camera.Pos.z ) + Math3D::vector3( Camera.Pos.x, vehicle->GetPosition().y, Camera.Pos.z ) + left * vehicle->GetWidth() - + vector3( 1.25 * left.x, 1.6, 1.25 * left.z ); + + Math3D::vector3( 1.25 * left.x, 1.6, 1.25 * left.z ); } else { Camera.Pos = vehicle->GetPosition() + vehicle->VectorFront() * vehicle->MoverParameters->ActiveCab * 50.0 - + vector3( -10.0 * left.x, 1.6, -10.0 * left.z ); + + Math3D::vector3( -10.0 * left.x, 1.6, -10.0 * left.z ); } Camera.LookAt = vehicle->GetPosition(); @@ -765,13 +766,13 @@ void TWorld::FollowView(bool wycisz) { { // jeżeli poza kabiną, przestawiamy w jej okolicę - OK if( Train ) { // wyłączenie trzęsienia na siłę? - Train->Dynamic()->ABuSetModelShake( vector3() ); + Train->Dynamic()->ABuSetModelShake( {} ); } DistantView(); // przestawienie kamery //żeby nie bylo numerów z 'fruwajacym' lokiem - konsekwencja bujania pudła // tu ustawić nową, bo od niej liczą się odległości - Global::SetCameraPosition( Camera.Pos ); + Global.pCameraPosition = Camera.Pos; } else if (Train) { // korekcja ustawienia w kabinie - OK @@ -804,22 +805,22 @@ void TWorld::FollowView(bool wycisz) { bool TWorld::Update() { - Timer::UpdateTimers(Global::iPause != 0); + Timer::UpdateTimers(Global.iPause != 0); Timer::subsystem.sim_total.start(); - if( (Global::iPause == 0) + if( (Global.iPause == 0) || (m_init == false) ) { // jak pauza, to nie ma po co tego przeliczać simulation::Time.update( Timer::GetDeltaTime() ); // Ra 2014-07: przeliczenie kąta czasu (do animacji zależnych od czasu) auto const &time = simulation::Time.data(); - Global::fTimeAngleDeg = time.wHour * 15.0 + time.wMinute * 0.25 + ( ( time.wSecond + 0.001 * time.wMilliseconds ) / 240.0 ); - Global::fClockAngleDeg[ 0 ] = 36.0 * ( time.wSecond % 10 ); // jednostki sekund - Global::fClockAngleDeg[ 1 ] = 36.0 * ( time.wSecond / 10 ); // dziesiątki sekund - Global::fClockAngleDeg[ 2 ] = 36.0 * ( time.wMinute % 10 ); // jednostki minut - Global::fClockAngleDeg[ 3 ] = 36.0 * ( time.wMinute / 10 ); // dziesiątki minut - Global::fClockAngleDeg[ 4 ] = 36.0 * ( time.wHour % 10 ); // jednostki godzin - Global::fClockAngleDeg[ 5 ] = 36.0 * ( time.wHour / 10 ); // dziesiątki godzin + Global.fTimeAngleDeg = time.wHour * 15.0 + time.wMinute * 0.25 + ( ( time.wSecond + 0.001 * time.wMilliseconds ) / 240.0 ); + Global.fClockAngleDeg[ 0 ] = 36.0 * ( time.wSecond % 10 ); // jednostki sekund + Global.fClockAngleDeg[ 1 ] = 36.0 * ( time.wSecond / 10 ); // dziesiątki sekund + Global.fClockAngleDeg[ 2 ] = 36.0 * ( time.wMinute % 10 ); // jednostki minut + Global.fClockAngleDeg[ 3 ] = 36.0 * ( time.wMinute / 10 ); // dziesiątki minut + Global.fClockAngleDeg[ 4 ] = 36.0 * ( time.wHour % 10 ); // jednostki godzin + Global.fClockAngleDeg[ 5 ] = 36.0 * ( time.wHour / 10 ); // dziesiątki godzin Update_Environment(); } // koniec działań niewykonywanych podczas pauzy @@ -837,7 +838,7 @@ bool TWorld::Update() { { // Ra: czas dla fizyki jest skwantowany - fizykę lepiej przeliczać stałym krokiem // tak można np. moc silników itp., ale ruch musi być przeliczany w każdej klatce, bo // inaczej skacze - Global::tranTexts.Update(); // obiekt obsługujący stenogramy dźwięków na ekranie + Global.tranTexts.Update(); // obiekt obsługujący stenogramy dźwięków na ekranie Console::Update(); // obsługa cykli PoKeys (np. aktualizacja wyjść analogowych) double iter = ceil(fTimeBuffer / fMaxDt); // ile kroków się zmieściło od ostatniego sprawdzania? @@ -880,7 +881,7 @@ bool TWorld::Update() { // NOTE: experimentally changing this to prevent the desync. // TODO: test what happens if we hit more than 20 * 0.01 sec slices, i.e. less than 5 fps Timer::subsystem.sim_dynamics.start(); - if( true == Global::FullPhysics ) { + if( true == Global.FullPhysics ) { // mixed calculation mode, steps calculated in ~0.05s chunks while( updatecount >= 5 ) { simulation::State.update( stepdeltatime, 5 ); @@ -899,13 +900,13 @@ bool TWorld::Update() { // secondary fixed step simulation time routines while( m_secondaryupdateaccumulator >= m_secondaryupdaterate ) { - Global::tranTexts.Update(); // obiekt obsługujący stenogramy dźwięków na ekranie + ui::Transcripts.Update(); // obiekt obsługujący stenogramy dźwięków na ekranie // awaria PoKeys mogła włączyć pauzę - przekazać informację - if( Global::iMultiplayer ) // dajemy znać do serwera o wykonaniu - if( iPause != Global::iPause ) { // przesłanie informacji o pauzie do programu nadzorującego + if( Global.iMultiplayer ) // dajemy znać do serwera o wykonaniu + if( iPause != Global.iPause ) { // przesłanie informacji o pauzie do programu nadzorującego multiplayer::WyslijParam( 5, 3 ); // ramka 5 z czasem i stanem zapauzowania - iPause = Global::iPause; + iPause = Global.iPause; } // fixed step part of the camera update @@ -921,7 +922,7 @@ bool TWorld::Update() { // variable step simulation time routines - if( Global::changeDynObj ) { + if( Global.changeDynObj ) { // ABu zmiana pojazdu - przejście do innego ChangeDynamic(); } @@ -982,7 +983,7 @@ bool TWorld::Update() { void TWorld::Update_Camera( double const Deltatime ) { - if( false == Global::ControlPicking ) { + if( false == Global.ControlPicking ) { if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_LEFT ) == GLFW_PRESS ) { Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe if( Controlled && LengthSquared3( Controlled->GetPosition() - Camera.Pos ) < ( 1500 * 1500 ) ) { @@ -990,9 +991,9 @@ TWorld::Update_Camera( double const Deltatime ) { Camera.LookAt = Controlled->GetPosition(); } else { - TDynamicObject *d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 300, false, false ) ); + TDynamicObject *d = std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 300, false, false ) ); if( !d ) - d = std::get( simulation::Region->find_vehicle( Global::pCameraPosition, 1000, false, false ) ); // dalej szukanie, jesli bliżej nie ma + d = std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 1000, false, false ) ); // dalej szukanie, jesli bliżej nie ma if( d && pDynamicNearest ) { // jeśli jakiś jest znaleziony wcześniej @@ -1014,40 +1015,40 @@ TWorld::Update_Camera( double const Deltatime ) { } else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_MIDDLE ) == GLFW_PRESS ) { // middle mouse button controls zoom. - Global::ZoomFactor = std::min( 4.5f, Global::ZoomFactor + 15.0f * static_cast( Deltatime ) ); + Global.ZoomFactor = std::min( 4.5f, Global.ZoomFactor + 15.0f * static_cast( Deltatime ) ); } else if( glfwGetMouseButton( window, GLFW_MOUSE_BUTTON_MIDDLE ) != GLFW_PRESS ) { // reset zoom level if the button is no longer held down. // NOTE: yes, this is terrible way to go about it. it'll do for now. - Global::ZoomFactor = std::max( 1.0f, Global::ZoomFactor - 15.0f * static_cast( Deltatime ) ); + Global.ZoomFactor = std::max( 1.0f, Global.ZoomFactor - 15.0f * static_cast( Deltatime ) ); } } if( DebugCameraFlag ) { DebugCamera.Update(); } else { Camera.Update(); } // uwzględnienie ruchu wywołanego klawiszami // reset window state, it'll be set again if applicable in a check below - Global::CabWindowOpen = false; + Global.CabWindowOpen = false; if( ( Train != nullptr ) && ( Camera.Type == tp_Follow ) && ( false == DebugCameraFlag ) ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery - vector3 tempangle = Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); + auto tempangle = Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); double modelrotate = atan2( -tempangle.x, tempangle.z ); - if( (Global::ctrlState) - && ( (Console::Pressed( Global::Keys[ k_MechLeft ]) - || (Console::Pressed( Global::Keys[ k_MechRight ]))))) { + if( ( true == Global.ctrlState ) + && ( ( glfwGetKey( Global.window, GLFW_KEY_LEFT ) == GLFW_TRUE ) + || ( glfwGetKey( Global.window, GLFW_KEY_RIGHT ) == GLFW_TRUE ) ) ) { // jeśli lusterko lewe albo prawe (bez rzucania na razie) - Global::CabWindowOpen = true; + Global.CabWindowOpen = true; - bool lr = Console::Pressed( Global::Keys[ k_MechLeft ] ); + auto const lr { glfwGetKey( Global.window, GLFW_KEY_LEFT ) == GLFW_TRUE }; // Camera.Yaw powinno być wyzerowane, aby po powrocie patrzeć do przodu Camera.Pos = Controlled->GetPosition() + Train->MirrorPosition( lr ); // pozycja lusterka Camera.Yaw = 0; // odchylenie na bok od Camera.LookAt if( Train->Dynamic()->MoverParameters->ActiveCab == 0 ) Camera.LookAt = Camera.Pos - Train->GetDirection(); // gdy w korytarzu - else if( Global::shiftState ) { + else if( Global.shiftState ) { // patrzenie w bok przez szybę Camera.LookAt = Camera.Pos - ( lr ? -1 : 1 ) * Train->Dynamic()->VectorLeft() * Train->Dynamic()->MoverParameters->ActiveCab; } @@ -1062,7 +1063,7 @@ TWorld::Update_Camera( double const Deltatime ) { else { // patrzenie standardowe Camera.Pos = Train->GetWorldMechPosition(); // Train.GetPosition1(); - if( !Global::iPause ) { // podczas pauzy nie przeliczać kątów przypadkowymi wartościami + if( !Global.iPause ) { // podczas pauzy nie przeliczać kątów przypadkowymi wartościami Camera.Roll = atan( Train->pMechShake.x * Train->fMechRoll ); // hustanie kamery na boki Camera.Pitch -= 0.5 * atan( Train->vMechVelocity.z * Train->fMechPitch ); // hustanie kamery przod tyl //Ra: tu // jest uciekanie kamery w górę!!! @@ -1092,8 +1093,8 @@ TWorld::Update_Camera( double const Deltatime ) { // kamera nieruchoma } // all done, update camera position to the new value - Global::pCameraPosition = Camera.Pos; - Global::DebugCameraPosition = DebugCamera.Pos; + Global.pCameraPosition = Camera.Pos; + Global.DebugCameraPosition = DebugCamera.Pos; } void TWorld::Update_Environment() { @@ -1126,7 +1127,7 @@ TWorld::Update_UI() { UILayer.set_tooltip( ( cabcontrol ? cabcontrol->pName : "" ) ); } } - if( ( true == Global::ControlPicking ) && ( true == FreeFlyModeFlag ) && ( true == DebugModeFlag ) ) { + if( ( true == Global.ControlPicking ) && ( true == FreeFlyModeFlag ) && ( true == DebugModeFlag ) ) { auto const scenerynode = GfxRenderer.Pick_Node(); UILayer.set_tooltip( ( scenerynode ? @@ -1134,7 +1135,7 @@ TWorld::Update_UI() { "" ) ); } - switch( Global::iTextMode ) { + switch( Global.iTextMode ) { case( GLFW_KEY_F1 ) : { // f1, default mode: current time and timetable excerpt @@ -1144,7 +1145,7 @@ TWorld::Update_UI() { + to_string( time.wHour ) + ":" + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); - if( Global::iPause ) { + if( Global.iPause ) { uitextline1 += " (paused)"; } @@ -1170,7 +1171,7 @@ TWorld::Update_UI() { "!SHP! " : " " ); - if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { + if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { // detail mode on second key press uitextline2 += " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" @@ -1215,26 +1216,26 @@ TWorld::Update_UI() { + to_string( time.wHour ) + ":" + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); - if( Global::iPause ) { + if( Global.iPause ) { uitextline1 += " (paused)"; } - uitextline2 = Global::Bezogonkow( owner->Relation(), true ) + " (" + Global::Bezogonkow( owner->Timetable()->TrainName, true ) + ")"; - auto const nextstation = Global::Bezogonkow( owner->NextStop(), true ); + uitextline2 = Bezogonkow( owner->Relation(), true ) + " (" + Bezogonkow( owner->Timetable()->TrainName, true ) + ")"; + auto const nextstation = Bezogonkow( owner->NextStop(), true ); if( !nextstation.empty() ) { // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania uitextline3 = " -> " + nextstation; } - if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { + if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { if( 0 == table->StationCount ) { // only bother if there's stations to list - UITable->text_lines.emplace_back( "(no timetable)", Global::UITextColor ); + UITable->text_lines.emplace_back( "(no timetable)", Global.UITextColor ); } else { // header - UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global::UITextColor ); + UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global.UITextColor ); TMTableLine *tableline; for( int i = owner->iStationStart; i <= std::min( owner->iStationStart + 15, table->StationCount ); ++i ) { @@ -1257,14 +1258,14 @@ TWorld::Update_UI() { vmax = vmax.substr( vmax.length() - 3, 3 ); // z wyrównaniem do prawej UITable->text_lines.emplace_back( - Global::Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), + Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), ( ( owner->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ? float4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono - Global::UITextColor ) ); + Global.UITextColor ) ); // divider/footer - UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global::UITextColor ); + UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global.UITextColor ); } } } @@ -1433,17 +1434,14 @@ TWorld::Update_UI() { if( ( vehicle->Mechanik->VelNext == 0.0 ) && ( vehicle->Mechanik->eSignNext ) ) { // jeśli ma zapamiętany event semafora, nazwa eventu semafora - uitextline4 += - " (" - + Global::Bezogonkow( vehicle->Mechanik->eSignNext->asName ) - + ")"; + uitextline4 += " (" + Bezogonkow( vehicle->Mechanik->eSignNext->asName ) + ")"; } // biezaca komenda dla AI uitextline4 += ", command: " + vehicle->Mechanik->OrderCurrent(); } - if( Global::iScreenMode[ Global::iTextMode - GLFW_KEY_F1 ] == 1 ) { + if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { // f2 screen, track scan mode if( vehicle->Mechanik == nullptr ) { //żeby była tabelka, musi być AI @@ -1454,7 +1452,7 @@ TWorld::Update_UI() { do { std::string scanline = vehicle->Mechanik->TableText( i ); if( scanline.empty() ) { break; } - UITable->text_lines.emplace_back( Global::Bezogonkow( scanline ), Global::UITextColor ); + UITable->text_lines.emplace_back( Bezogonkow( scanline ), Global.UITextColor ); ++i; } while( i < speedtablesize ); // TController:iSpeedTableSize TODO: change when the table gets recoded } @@ -1472,8 +1470,8 @@ TWorld::Update_UI() { + std::string( "S SEE NEN NWW SW" ) .substr( 0 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); // current luminance level - uitextline2 = "Light level: " + to_string( Global::fLuminance, 3 ); - if( Global::FakeLight ) { uitextline2 += "(*)"; } + uitextline2 = "Light level: " + to_string( Global.fLuminance, 3 ); + if( Global.FakeLight ) { uitextline2 += "(*)"; } } break; @@ -1482,25 +1480,25 @@ TWorld::Update_UI() { case( GLFW_KEY_F8 ) : { // gfx renderer data uitextline1 = - "FoV: " + to_string( Global::FieldOfView / Global::ZoomFactor, 1 ) - + ", Draw range x " + to_string( Global::fDistanceFactor, 1 ) + "FoV: " + to_string( Global.FieldOfView / Global.ZoomFactor, 1 ) + + ", Draw range x " + to_string( Global.fDistanceFactor, 1 ) // + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) // + ", FPS: " + to_string( Timer::GetFPS(), 2 ); + ", FPS: " + std::to_string( static_cast(std::round(GfxRenderer.Framerate())) ); - if( Global::iSlowMotion ) { - uitextline1 += " (slowmotion " + to_string( Global::iSlowMotion ) + ")"; + if( Global.iSlowMotion ) { + uitextline1 += " (slowmotion " + to_string( Global.iSlowMotion ) + ")"; } uitextline2 = std::string( "Rendering mode: " ) - + ( Global::bUseVBO ? + + ( Global.bUseVBO ? "VBO" : "Display Lists" ) + " "; - if( false == Global::LastGLError.empty() ) { + if( false == Global.LastGLError.empty() ) { uitextline2 += "Last openGL error: " - + Global::LastGLError; + + Global.LastGLError; } // renderer stats uitextline3 = GfxRenderer.info_times(); @@ -1511,8 +1509,8 @@ TWorld::Update_UI() { case( GLFW_KEY_F9 ) : { // informacja o wersji - uitextline1 = "MaSzyna " + Global::asVersion; // informacja o wersji - if( Global::iMultiplayer ) { + uitextline1 = "MaSzyna " + Global.asVersion; // informacja o wersji + if( Global.iMultiplayer ) { uitextline1 += " (multiplayer mode is active)"; } uitextline3 = @@ -1532,8 +1530,8 @@ TWorld::Update_UI() { case( GLFW_KEY_F12 ) : { // opcje włączenia i wyłączenia logowania uitextline1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); - uitextline2 = "[1] log.txt " + std::string( ( Global::iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); - uitextline3 = "[2] Console " + std::string( ( Global::iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); + uitextline2 = "[1] log.txt " + std::string( ( Global.iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); + uitextline3 = "[2] Console " + std::string( ( Global.iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); break; } @@ -1650,7 +1648,7 @@ TWorld::Update_UI() { // induction motor data if( vehicle->MoverParameters->EngineType == ElectricInductionMotor ) { - UITable->text_lines.emplace_back( " eimc: eimv: press:", Global::UITextColor ); + UITable->text_lines.emplace_back( " eimc: eimv: press:", Global.UITextColor ); for( int i = 0; i <= 20; ++i ) { std::string parameters = @@ -1668,42 +1666,42 @@ TWorld::Update_UI() { parameters += " | " + vehicle->MED_labels[ i - 13 ] + to_string( vehicle->MED[ 0 ][ i - 13 ], 2, 9 ); } - UITable->text_lines.emplace_back( parameters, Global::UITextColor ); + UITable->text_lines.emplace_back( parameters, Global.UITextColor ); } } if (vehicle->MoverParameters->EngineType == DieselEngine) { std::string parameters = "param value"; - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "efill: " + to_string(vehicle->MoverParameters->dizel_fill, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "etorq: " + to_string(vehicle->MoverParameters->dizel_Torque, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "creal: " + to_string(vehicle->MoverParameters->dizel_engage, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "cdesi: " + to_string(vehicle->MoverParameters->dizel_engagestate, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "cdelt: " + to_string(vehicle->MoverParameters->dizel_engagedeltaomega, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "gears: " + to_string(vehicle->MoverParameters->dizel_automaticgearstatus, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "hydro value"; - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "hTCnI: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "hTCnO: " + to_string(vehicle->MoverParameters->hydro_TC_nOut, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "hTCTM: " + to_string(vehicle->MoverParameters->hydro_TC_TMRatio, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "hTCTI: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueIn, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "hTCTO: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueOut, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "hTCfl: " + to_string(vehicle->MoverParameters->hydro_TC_Fill, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "hTCLR: " + to_string(vehicle->MoverParameters->hydro_TC_LockupRate, 2, 9); - UITable->text_lines.emplace_back(parameters, Global::UITextColor); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); //parameters = "hTCXX: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); - //UITable->text_lines.emplace_back(parameters, Global::UITextColor); + //UITable->text_lines.emplace_back(parameters, Global.UITextColor); } } // if( DebugModeFlag && Controlled ) @@ -1713,7 +1711,7 @@ TWorld::Update_UI() { } #ifdef EU07_USE_OLD_UI_CODE - if( Controlled && DebugModeFlag && !Global::iTextMode ) { + if( Controlled && DebugModeFlag && !Global.iTextMode ) { uitextline1 += ( "; d_omega " ) + to_string( Controlled->MoverParameters->dizel_engagedeltaomega, 3 ); @@ -1740,9 +1738,9 @@ TWorld::Update_UI() { // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) auto &transcripts = UITranscripts->text_lines; transcripts.clear(); - for( auto const &transcript : Global::tranTexts.aLines ) { + for( auto const &transcript : ui::Transcripts.aLines ) { - if( Global::fTimeAngleDeg >= transcript.fShow ) { + if( Global.fTimeAngleDeg >= transcript.fShow ) { cParser parser( transcript.asText ); while( true == parser.getTokens( 1, false, "|" ) ) { @@ -1762,18 +1760,18 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) { case 0: // odesłanie identyfikatora wersji CommLog( Now() + " " + std::to_string(pRozkaz->iComm) + " version" + " rcvd"); - multiplayer::WyslijString(Global::asVersion, 0); // przedsatwienie się + multiplayer::WyslijString(Global.asVersion, 0); // przedsatwienie się break; case 1: // odesłanie identyfikatora wersji CommLog( Now() + " " + std::to_string(pRozkaz->iComm) + " scenery" + " rcvd"); - multiplayer::WyslijString(Global::SceneryFile, 1); // nazwa scenerii + multiplayer::WyslijString(Global.SceneryFile, 1); // nazwa scenerii break; case 2: { // event CommLog( Now() + " " + std::to_string( pRozkaz->iComm ) + " " + std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) + " rcvd" ); - if( Global::iMultiplayer ) { + if( Global.iMultiplayer ) { auto *event = simulation::Events.FindEvent( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); if( event != nullptr ) { if( ( event->Type == tp_Multiple ) @@ -1787,7 +1785,7 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) break; } case 3: // rozkaz dla AI - if (Global::iMultiplayer) + if (Global.iMultiplayer) { int i = int(pRozkaz->cString[8]); // długość pierwszego łańcucha (z przodu dwa floaty) CommLog( @@ -1827,20 +1825,20 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) { double t = pRozkaz->fPar[1]; simulation::Time.data().wDay = std::floor(t); // niby nie powinno być dnia, ale... - if (Global::fMoveLight >= 0) - Global::fMoveLight = t; // trzeba by deklinację Słońca przeliczyć + if (Global.fMoveLight >= 0) + Global.fMoveLight = t; // trzeba by deklinację Słońca przeliczyć simulation::Time.data().wHour = std::floor(24 * t) - 24.0 * simulation::Time.data().wDay; simulation::Time.data().wMinute = std::floor(60 * 24 * t) - 60.0 * (24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour); simulation::Time.data().wSecond = std::floor( 60 * 60 * 24 * t ) - 60.0 * ( 60.0 * ( 24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour ) + simulation::Time.data().wMinute ); } if (*pRozkaz->iPar & 2) { // ustawienie flag zapauzowania - Global::iPause = pRozkaz->fPar[2]; // zakładamy, że wysyłający wie, co robi + Global.iPause = pRozkaz->fPar[2]; // zakładamy, że wysyłający wie, co robi } } break; case 6: // pobranie parametrów ruchu pojazdu - if (Global::iMultiplayer) { + if (Global.iMultiplayer) { // Ra 2014-12: to ma działać również dla pojazdów bez obsady CommLog( Now() + " " @@ -1851,7 +1849,7 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) // jeśli długość nazwy jest niezerowa szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #7 auto *vehicle = ( pRozkaz->cString[ 1 ] == '*' ? - simulation::Vehicles.find( Global::asHumanCtrlVehicle ) : + simulation::Vehicles.find( Global.asHumanCtrlVehicle ) : simulation::Vehicles.find( std::string{ pRozkaz->cString + 1, (unsigned)pRozkaz->cString[ 0 ] } ) ); if( vehicle != nullptr ) { multiplayer::WyslijNamiary( vehicle ); // wysłanie informacji o pojeździe @@ -1892,7 +1890,7 @@ void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #13 auto *lookup = ( pRozkaz->cString[ 2 ] == '*' ? - simulation::Vehicles.find( Global::asHumanCtrlVehicle ) : // nazwa pojazdu użytkownika + simulation::Vehicles.find( Global.asHumanCtrlVehicle ) : // nazwa pojazdu użytkownika simulation::Vehicles.find( std::string( pRozkaz->cString + 2, (unsigned)pRozkaz->cString[ 1 ] ) ) ); // nazwa pojazdu if( lookup == nullptr ) { break; } // nothing found, nothing to do auto *d { lookup }; @@ -2007,11 +2005,11 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic) } } // z powrotem defaultowa sciezka do tekstur - Global::asCurrentTexturePath = ( szTexturePath ); + Global.asCurrentTexturePath = ( szTexturePath ); } else if( filetype == ".t3d" ) { // z modelami jest prościej - Global::asCurrentTexturePath = Path; + Global.asCurrentTexturePath = Path; TModelsManager::GetModel( Path + filename, false ); } } @@ -2038,7 +2036,7 @@ void TWorld::CabChange(TDynamicObject *old, TDynamicObject *now) { // ewentualna zmiana kabiny użytkownikowi if (Train) if (Train->Dynamic() == old) - Global::changeDynObj = now; // uruchomienie protezy + Global.changeDynObj = now; // uruchomienie protezy }; void TWorld::ChangeDynamic() { @@ -2056,7 +2054,7 @@ void TWorld::ChangeDynamic() { Train->Dynamic()->MechInside = false; } } - TDynamicObject *temp = Global::changeDynObj; + TDynamicObject *temp = Global.changeDynObj; Train->Dynamic()->bDisplayCab = false; Train->Dynamic()->ABuSetModelShake( {} ); @@ -2070,7 +2068,7 @@ void TWorld::ChangeDynamic() { Train->DynamicSet( temp ); Controlled = temp; mvControlled = Controlled->ControlledFind()->MoverParameters; - Global::asHumanCtrlVehicle = Train->Dynamic()->name(); + Global.asHumanCtrlVehicle = Train->Dynamic()->name(); if( Train->Dynamic()->Mechanik ) // AI może sobie samo pójść if( !Train->Dynamic()->Mechanik->AIControllFlag ) // tylko jeśli ręcznie prowadzony { @@ -2088,15 +2086,15 @@ void TWorld::ChangeDynamic() { Train->MechStop(); FollowView(); // na pozycję mecha } - Global::changeDynObj = NULL; + Global.changeDynObj = NULL; } void TWorld::ToggleDaylight() { - Global::FakeLight = !Global::FakeLight; + Global.FakeLight = !Global.FakeLight; - if( Global::FakeLight ) { + if( Global.FakeLight ) { // for fake daylight enter fixed hour Environment.time( 10, 30, 0 ); } @@ -2125,7 +2123,7 @@ TWorld::compute_season( int const Yearday ) const { []( dayseasonpair const &Left, const int Right ) { return Left.first < Right; } ); - Global::Season = lookup->second + ":"; + Global.Season = lookup->second + ":"; } @@ -2154,9 +2152,9 @@ world_environment::update() { glm::vec3 keylightcolor; if( moonlightlevel > sunlightlevel ) { // rare situations when the moon is brighter than the sun, typically at night - Global::SunAngle = m_moon.getAngle(); - Global::DayLight.set_position( m_moon.getPosition() ); - Global::DayLight.direction = -1.0f * m_moon.getDirection(); + Global.SunAngle = m_moon.getAngle(); + Global.DayLight.position = m_moon.getPosition(); + Global.DayLight.direction = -1.0f * m_moon.getDirection(); keylightintensity = moonlightlevel; // if the moon is up, it overrides the twilight twilightfactor = 0.0f; @@ -2164,51 +2162,51 @@ world_environment::update() { } else { // regular situation with sun as the key light - Global::SunAngle = m_sun.getAngle(); - Global::DayLight.set_position( m_sun.getPosition() ); - Global::DayLight.direction = -1.0f * m_sun.getDirection(); + Global.SunAngle = m_sun.getAngle(); + Global.DayLight.position = m_sun.getPosition(); + Global.DayLight.direction = -1.0f * m_sun.getDirection(); keylightintensity = sunlightlevel; // include 'golden hour' effect in twilight lighting - float const duskfactor = 1.0f - clamp( Global::SunAngle, 0.0f, 18.0f ) / 18.0f; + float const duskfactor = 1.0f - clamp( Global.SunAngle, 0.0f, 18.0f ) / 18.0f; keylightcolor = interpolate( glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), glm::vec3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), duskfactor ); } // ...update skydome to match the current sun position as well... - m_skydome.SetOvercastFactor( Global::Overcast ); + m_skydome.SetOvercastFactor( Global.Overcast ); m_skydome.Update( m_sun.getDirection() ); // ...retrieve current sky colour and brightness... auto const skydomecolour = m_skydome.GetAverageColor(); - auto const skydomehsv = RGBtoHSV( skydomecolour ); + auto const skydomehsv = colors::RGBtoHSV( skydomecolour ); // sun strength is reduced by overcast level - keylightintensity *= ( 1.0f - std::min( 1.f, Global::Overcast ) * 0.65f ); + keylightintensity *= ( 1.0f - std::min( 1.f, Global.Overcast ) * 0.65f ); // intensity combines intensity of the sun and the light reflected by the sky dome // it'd be more technically correct to have just the intensity of the sun here, // but whether it'd _look_ better is something to be tested auto const intensity = std::min( 1.15f * ( 0.05f + keylightintensity + skydomehsv.z ), 1.25f ); // the impact of sun component is reduced proportionally to overcast level, as overcast increases role of ambient light - auto const diffuselevel = interpolate( keylightintensity, intensity * ( 1.0f - twilightfactor ), 1.0f - std::min( 1.f, Global::Overcast ) * 0.75f ); + auto const diffuselevel = interpolate( keylightintensity, intensity * ( 1.0f - twilightfactor ), 1.0f - std::min( 1.f, Global.Overcast ) * 0.75f ); // ...update light colours and intensity. keylightcolor = keylightcolor * diffuselevel; - Global::DayLight.diffuse = glm::vec4( keylightcolor, Global::DayLight.diffuse.a ); - Global::DayLight.specular = glm::vec4( keylightcolor * 0.85f, diffuselevel ); + Global.DayLight.diffuse = glm::vec4( keylightcolor, Global.DayLight.diffuse.a ); + Global.DayLight.specular = glm::vec4( keylightcolor * 0.85f, diffuselevel ); // tonal impact of skydome color is inversely proportional to how high the sun is above the horizon // (this is pure conjecture, aimed more to 'look right' than be accurate) - float const ambienttone = clamp( 1.0f - ( Global::SunAngle / 90.0f ), 0.0f, 1.0f ); - Global::DayLight.ambient[ 0 ] = interpolate( skydomehsv.z, skydomecolour.x, ambienttone ); - Global::DayLight.ambient[ 1 ] = interpolate( skydomehsv.z, skydomecolour.y, ambienttone ); - Global::DayLight.ambient[ 2 ] = interpolate( skydomehsv.z, skydomecolour.z, ambienttone ); + float const ambienttone = clamp( 1.0f - ( Global.SunAngle / 90.0f ), 0.0f, 1.0f ); + Global.DayLight.ambient[ 0 ] = interpolate( skydomehsv.z, skydomecolour.x, ambienttone ); + Global.DayLight.ambient[ 1 ] = interpolate( skydomehsv.z, skydomecolour.y, ambienttone ); + Global.DayLight.ambient[ 2 ] = interpolate( skydomehsv.z, skydomecolour.z, ambienttone ); - Global::fLuminance = intensity; + Global.fLuminance = intensity; // update the fog. setting it to match the average colour of the sky dome is cheap // but quite effective way to make the distant items blend with background better - Global::FogColor[ 0 ] = skydomecolour.x; - Global::FogColor[ 1 ] = skydomecolour.y; - Global::FogColor[ 2 ] = skydomecolour.z; + Global.FogColor[ 0 ] = skydomecolour.x; + Global.FogColor[ 1 ] = skydomecolour.y; + Global.FogColor[ 2 ] = skydomecolour.z; } void diff --git a/World.h b/World.h index 57bfa8ba..56736115 100644 --- a/World.h +++ b/World.h @@ -12,14 +12,13 @@ http://mozilla.org/MPL/2.0/. #include #include +#include "classes.h" #include "Camera.h" -#include "scene.h" #include "sky.h" #include "sun.h" #include "moon.h" #include "stars.h" #include "skydome.h" -#include "mczapkie/mover.h" #include "messaging.h" // wrapper for simulation time diff --git a/audio.cpp b/audio.cpp index 63c36a5d..8d9da55b 100644 --- a/audio.cpp +++ b/audio.cpp @@ -11,8 +11,9 @@ http://mozilla.org/MPL/2.0/. #include "audio.h" #include "globals.h" -#include "mczapkie/mctools.h" +#include "utilities.h" #include "logs.h" +#include "resourcemanager.h" #define DR_WAV_IMPLEMENTATION #include "dr_wav.h" @@ -95,7 +96,7 @@ openal_buffer::fetch_caption() { std::string captionfilename { name }; captionfilename.erase( captionfilename.rfind( '.' ) ); // obcięcie rozszerzenia - captionfilename += "-" + Global::asLang + ".txt"; // już może być w różnych językach + captionfilename += "-" + Global.asLang + ".txt"; // już może być w różnych językach if( true == FileExists( captionfilename ) ) { // wczytanie std::ifstream inputfile( captionfilename ); @@ -133,13 +134,13 @@ buffer_manager::create( std::string const &Filename ) { audio::buffer_handle lookup { null_handle }; std::string filelookup; - if( false == Global::asCurrentDynamicPath.empty() ) { + if( false == Global.asCurrentDynamicPath.empty() ) { // try dynamic-specific sounds first - lookup = find_buffer( Global::asCurrentDynamicPath + filename ); + lookup = find_buffer( Global.asCurrentDynamicPath + filename ); if( lookup != null_handle ) { return lookup; } - filelookup = find_file( Global::asCurrentDynamicPath + filename ); + filelookup = find_file( Global.asCurrentDynamicPath + filename ); if( false == filelookup.empty() ) { return emplace( filelookup ); } diff --git a/audiorenderer.cpp b/audiorenderer.cpp index 2a7dcbdb..ae0cfed2 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -8,11 +8,13 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" - #include "audiorenderer.h" + #include "sound.h" #include "globals.h" +#include "camera.h" #include "logs.h" +#include "utilities.h" namespace audio { @@ -94,7 +96,7 @@ openal_source::sync_with( sound_properties const &State ) { */ // location properties.location = State.location; - sound_distance = properties.location - glm::dvec3 { Global::pCameraPosition }; + sound_distance = properties.location - glm::dvec3 { Global.pCameraPosition }; if( sound_range > 0 ) { // range cutoff check auto const cutoffrange = ( @@ -122,7 +124,7 @@ openal_source::sync_with( sound_properties const &State ) { properties.soundproofing = State.soundproofing; properties.soundproofing_stamp = State.soundproofing_stamp; - ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * Global::AudioVolume ); + ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * Global.AudioVolume ); } if( sound_range > 0 ) { auto const rangesquared { sound_range * sound_range }; @@ -138,7 +140,7 @@ openal_source::sync_with( sound_properties const &State ) { clamp( ( distancesquared - rangesquared ) / ( fadedistance * fadedistance ), 0.f, 1.f ) ) }; - ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * rangefactor * Global::AudioVolume ); + ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * rangefactor * Global.AudioVolume ); } is_in_range = ( distancesquared <= rangesquared ); } @@ -254,7 +256,7 @@ openal_renderer::init() { // // ::alDistanceModel( AL_LINEAR_DISTANCE ); ::alDistanceModel( AL_INVERSE_DISTANCE_CLAMPED ); - ::alListenerf( AL_GAIN, clamp( Global::AudioVolume, 1.f, 4.f ) ); + ::alListenerf( AL_GAIN, clamp( Global.AudioVolume, 1.f, 4.f ) ); // all done m_ready = true; return true; @@ -288,14 +290,14 @@ openal_renderer::update( double const Deltatime ) { // update listener glm::dmat4 cameramatrix; - Global::pCamera->SetMatrix( cameramatrix ); + Global.pCamera->SetMatrix( cameramatrix ); auto rotationmatrix { glm::mat3{ cameramatrix } }; glm::vec3 const orientation[] = { glm::vec3{ 0, 0,-1 } * rotationmatrix , glm::vec3{ 0, 1, 0 } * rotationmatrix }; ::alListenerfv( AL_ORIENTATION, reinterpret_cast( orientation ) ); /* - glm::dvec3 const listenerposition { Global::pCameraPosition }; + glm::dvec3 const listenerposition { Global.pCameraPosition }; // not used yet glm::vec3 const velocity { ( listenerposition - m_listenerposition ) / Deltatime }; m_listenerposition = listenerposition; @@ -380,7 +382,7 @@ bool openal_renderer::init_caps() { // NOTE: default value of audio renderer variable is empty string, meaning argument of NULL i.e. 'preferred' device - m_device = ::alcOpenDevice( Global::AudioRenderer.c_str() ); + m_device = ::alcOpenDevice( Global.AudioRenderer.c_str() ); if( m_device == nullptr ) { ErrorLog( "Failed to obtain audio device" ); return false; diff --git a/audiorenderer.h b/audiorenderer.h index e20608f2..e0cc5cd9 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "audio.h" #include "resourcemanager.h" +#include "uitranscripts.h" class sound_source; @@ -166,7 +167,7 @@ openal_source::bind( sound_source *Controller, uint32_sequence Sounds, Iterator_ auto const &buffer { audio::renderer.buffer( bufferhandle ) }; buffers.emplace_back( buffer.id ); if( false == buffer.caption.empty() ) { - Global::tranTexts.Add( buffer.caption ); } } ); + ui::Transcripts.Add( buffer.caption ); } } ); if( id != audio::null_resource ) { ::alSourceQueueBuffers( id, static_cast( buffers.size() ), buffers.data() ); diff --git a/color.h b/color.h index 0a618426..af6408a0 100644 --- a/color.h +++ b/color.h @@ -1,6 +1,9 @@ #pragma once -#include "float3d.h" +namespace colors { + +glm::vec4 const none{ 0.f, 0.f, 0.f, 1.f }; +glm::vec4 const white{ 1.f, 1.f, 1.f, 1.f }; inline glm::vec3 @@ -116,3 +119,5 @@ HSVtoRGB( glm::vec3 const &HSV ) { } return rgb; } + +} // namespace colors diff --git a/command.cpp b/command.cpp index 6a2f72ff..b24c988c 100644 --- a/command.cpp +++ b/command.cpp @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "logs.h" #include "timer.h" +#include "utilities.h" namespace simulation { @@ -178,7 +179,7 @@ command_relay::post( user_command const Command, std::uint64_t const Param1, std if( ( command.target == command_target::vehicle ) && ( true == FreeFlyModeFlag ) && ( ( false == DebugModeFlag ) - && ( true == Global::RealisticControlMode ) ) ) { + && ( true == Global.RealisticControlMode ) ) ) { // in realistic control mode don't pass vehicle commands if the user isn't in one, unless we're in debug mode return; } diff --git a/gamepadinput.cpp b/gamepadinput.cpp index 91f0cacf..ec433f1c 100644 --- a/gamepadinput.cpp +++ b/gamepadinput.cpp @@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "gamepadinput.h" #include "logs.h" #include "timer.h" -#include "usefull.h" +#include "utilities.h" glm::vec2 circle_to_square( glm::vec2 const &Point, int const Roundness = 0 ) { diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 2fde9b6d..c619436c 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -460,12 +460,12 @@ keyboard_input::poll() { glm::vec2 const movementhorizontal { // x-axis - ( Global::shiftState ? 1.f : 0.5f ) * + ( Global.shiftState ? 1.f : 0.5f ) * ( m_keys[ m_bindingscache.left ] != GLFW_RELEASE ? -1.f : m_keys[ m_bindingscache.right ] != GLFW_RELEASE ? 1.f : 0.f ), // z-axis - ( Global::shiftState ? 1.f : 0.5f ) * + ( Global.shiftState ? 1.f : 0.5f ) * ( m_keys[ m_bindingscache.forward ] != GLFW_RELEASE ? 1.f : m_keys[ m_bindingscache.back ] != GLFW_RELEASE ? -1.f : 0.f ) }; @@ -475,7 +475,7 @@ keyboard_input::poll() { double const movexparam = static_cast( movementhorizontal.x ); double const movezparam = static_cast( movementhorizontal.y ); m_relay.post( - ( true == Global::ctrlState ? + ( true == Global.ctrlState ? user_command::movehorizontalfast : user_command::movehorizontal ), reinterpret_cast( movexparam ), @@ -488,7 +488,7 @@ keyboard_input::poll() { float const movementvertical { // y-axis - ( Global::shiftState ? 1.f : 0.5f ) * + ( Global.shiftState ? 1.f : 0.5f ) * ( m_keys[ m_bindingscache.up ] != GLFW_RELEASE ? 1.f : m_keys[ m_bindingscache.down ] != GLFW_RELEASE ? -1.f : 0.f ) }; @@ -497,7 +497,7 @@ keyboard_input::poll() { || ( m_movementvertical != 0.f ) ) { double const moveyparam = static_cast( movementvertical ); m_relay.post( - ( true == Global::ctrlState ? + ( true == Global.ctrlState ? user_command::moveverticalfast : user_command::movevertical ), reinterpret_cast( moveyparam ), diff --git a/light.cpp b/light.cpp new file mode 100644 index 00000000..c17195c7 --- /dev/null +++ b/light.cpp @@ -0,0 +1,11 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "light.h" diff --git a/light.h b/light.h new file mode 100644 index 00000000..3eac437d --- /dev/null +++ b/light.h @@ -0,0 +1,23 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "color.h" + +// a simple light source, either omni- or directional +struct basic_light { + + glm::vec4 ambient { colors::none }; + glm::vec4 diffuse { colors::white }; + glm::vec4 specular { colors::white }; + glm::vec3 position; + glm::vec3 direction; + bool is_omnidirectional { true }; +}; diff --git a/lightarray.cpp b/lightarray.cpp index 9655da56..1c82284b 100644 --- a/lightarray.cpp +++ b/lightarray.cpp @@ -15,8 +15,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "lightarray.h" + #include "dynobj.h" -#include "driver.h" void light_array::insert( TDynamicObject const *Owner ) { diff --git a/lightarray.h b/lightarray.h index ff7b694e..700a34cd 100644 --- a/lightarray.h +++ b/lightarray.h @@ -1,9 +1,6 @@ #pragma once -#include -#include "dumb3d.h" -#include "float3d.h" -#include "dynobj.h" +#include "classes.h" // collection of virtual light sources present in the scene // used by the renderer to determine most suitable placement for actual light sources during render diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 5ac1908c..b02c522c 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -135,9 +135,6 @@ Source Files\input - - Source Files\mczapkie - Source Files\mczapkie @@ -234,6 +231,12 @@ Source Files + + Source Files + + + Source Files + @@ -257,9 +260,6 @@ Header Files - - Header Files - Header Files @@ -296,9 +296,6 @@ Header Files\mczapkie - - Header Files\mczapkie - Header Files\mczapkie @@ -455,6 +452,15 @@ Header Files + + Header Files + + + Header Files + + + Header Files + diff --git a/material.cpp b/material.cpp index 7e49e030..470d5ea4 100644 --- a/material.cpp +++ b/material.cpp @@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "material.h" #include "renderer.h" -#include "usefull.h" +#include "utilities.h" #include "globals.h" bool @@ -51,13 +51,13 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c if( value == "{" ) { // detect and optionally process config blocks cParser blockparser( Input.getToken( false, "}" ) ); - if( key == Global::Season ) { + if( key == Global.Season ) { // seasonal textures override generic textures while( true == deserialize_mapping( blockparser, 1, Loadnow ) ) { ; // all work is done in the header } } - else if( key == Global::Weather ) { + else if( key == Global.Weather ) { // weather textures override generic and seasonal textures while( true == deserialize_mapping( blockparser, 2, Loadnow ) ) { ; // all work is done in the header diff --git a/material.h b/material.h index 881c14b9..36341a23 100644 --- a/material.h +++ b/material.h @@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include "classes.h" #include "texture.h" -#include "parser.h" typedef int material_handle; diff --git a/messaging.cpp b/messaging.cpp index feb674dc..c9e59ded 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -47,7 +47,7 @@ WyslijEvent(const std::string &e, const std::string &d) cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = (DWORD)(12 + i + j); // 8+dwa liczniki i dwa zera kończące cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + e + " sent" ); } @@ -65,7 +65,7 @@ WyslijUszkodzenia(const std::string &t, char fl) cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = (DWORD)(11 + i); // 8+licznik i zero kończące cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); } @@ -82,7 +82,7 @@ WyslijString(const std::string &t, int n) cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = (DWORD)(10 + i); // 8+licznik i zero kończące cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); } @@ -102,7 +102,7 @@ WyslijNamiary(TDynamicObject const *Vehicle) int i = 32; size_t j = Vehicle->asName.length(); r.iPar[0] = i; // ilość danych liczbowych - r.fPar[1] = Global::fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) + r.fPar[1] = Global.fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) r.fPar[2] = Vehicle->MoverParameters->Loc.X; // pozycja X r.fPar[3] = Vehicle->MoverParameters->Loc.Y; // pozycja Y r.fPar[4] = Vehicle->MoverParameters->Loc.Z; // pozycja Z @@ -164,7 +164,7 @@ WyslijNamiary(TDynamicObject const *Vehicle) cData.cbData = (DWORD)(10 + i + j); // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); // WriteLog("Ramka poszla!"); CommLog( Now() + " " + std::to_string(r.iComm) + " " + Vehicle->asName + " sent"); } @@ -211,7 +211,7 @@ WyslijObsadzone() cData.cbData = 8 + 1984; // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " obsadzone" + " sent"); } @@ -226,8 +226,8 @@ WyslijParam(int nr, int fl) switch (nr) { // można tym przesyłać różne zestawy parametrów case 5: // czas i pauza - r.fPar[1] = Global::fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) - r.iPar[2] = Global::iPause; // stan zapauzowania + r.fPar[1] = Global.fTimeAngleDeg / 360.0; // aktualny czas (1.0=doba) + r.iPar[2] = Global.iPause; // stan zapauzowania i = 8; // dwa parametry po 4 bajty każdy break; } @@ -235,7 +235,7 @@ WyslijParam(int nr, int fl) cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = 12 + i; // 12+rozmiar danych cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global::window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); } #endif diff --git a/moon.cpp b/moon.cpp index d4da4c38..9722140f 100644 --- a/moon.cpp +++ b/moon.cpp @@ -3,7 +3,7 @@ #include "moon.h" #include "globals.h" #include "mtable.h" -#include "usefull.h" +#include "utilities.h" #include "world.h" ////////////////////////////////////////////////////////////////////////////////////////// @@ -36,7 +36,7 @@ void cMoon::update() { move(); - glm::vec3 position( 0.f, 0.f, -2000.f * Global::fDistanceFactor ); + glm::vec3 position( 0.f, 0.f, -2000.f * Global.fDistanceFactor ); position = glm::rotateX( position, glm::radians( static_cast( m_body.elevref ) ) ); position = glm::rotateY( position, glm::radians( static_cast( -m_body.hrang ) ) ); @@ -54,7 +54,7 @@ cMoon::render() { ::glEnd(); ::glPushMatrix(); ::glTranslatef( m_position.x, m_position.y, m_position.z ); - ::gluSphere( moonsphere, /* (float)( Global::iWindowHeight / Global::FieldOfView ) * 0.5 * */ ( m_body.distance / 60.2666 ) * 9.037461, 12, 12 ); + ::gluSphere( moonsphere, /* (float)( Global.iWindowHeight / Global.FieldOfView ) * 0.5 * */ ( m_body.distance / 60.2666 ) * 9.037461, 12, 12 ); ::glPopMatrix(); } diff --git a/mouseinput.cpp b/mouseinput.cpp index f885e090..873d8b90 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "mouseinput.h" -#include "usefull.h" +#include "utilities.h" #include "globals.h" #include "timer.h" #include "world.h" @@ -36,7 +36,7 @@ mouse_input::init() { void mouse_input::move( double Mousex, double Mousey ) { - if( false == Global::ControlPicking ) { + if( false == Global.ControlPicking ) { // default control mode m_relay.post( user_command::viewturn, @@ -71,7 +71,7 @@ mouse_input::move( double Mousex, double Mousey ) { void mouse_input::button( int const Button, int const Action ) { - if( false == Global::ControlPicking ) { return; } + if( false == Global.ControlPicking ) { return; } if( true == FreeFlyModeFlag ) { // world editor controls @@ -128,7 +128,7 @@ mouse_input::button( int const Button, int const Action ) { ); if( mousecommand != user_command::none ) { // check manually for commands which have 'fast' variants launched with shift modifier - if( Global::shiftState ) { + if( Global.shiftState ) { switch( mousecommand ) { case user_command::mastercontrollerincrease: { mousecommand = user_command::mastercontrollerincreasefast; break; } case user_command::mastercontrollerdecrease: { mousecommand = user_command::mastercontrollerdecreasefast; break; } @@ -184,7 +184,7 @@ mouse_input::poll() { auto updaterate { m_updaterate }; if( m_varyingpollrate ) { - updaterate /= std::max( 0.15, 2.0 * glm::length( m_cursorposition - m_commandstartcursor ) / std::max( 1, Global::iWindowHeight ) ); + updaterate /= std::max( 0.15, 2.0 * glm::length( m_cursorposition - m_commandstartcursor ) / std::max( 1, Global.iWindowHeight ) ); } while( m_updateaccumulator > updaterate ) { diff --git a/mtable.cpp b/mtable.cpp index 34faea9f..3cc1b0fd 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -9,7 +9,9 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "mtable.h" -#include "mczapkie/mctools.h" + +#include "world.h" +#include "utilities.h" double CompareTime(double t1h, double t1m, double t2h, double t2m) /*roznica czasu w minutach*/ // zwraca różnicę czasu diff --git a/mtable.h b/mtable.h index f5471f81..a456cffc 100644 --- a/mtable.h +++ b/mtable.h @@ -10,7 +10,8 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "world.h" + +#include "classes.h" namespace Mtable { diff --git a/McZapkie/mctools.cpp b/old/mctools.cpp similarity index 89% rename from McZapkie/mctools.cpp rename to old/mctools.cpp index 4fff8667..e653d75a 100644 --- a/McZapkie/mctools.cpp +++ b/old/mctools.cpp @@ -89,7 +89,7 @@ bool ClearFlag( int &Flag, int const Value ) { inline double Random(double a, double b) { std::uniform_real_distribution<> dis(a, b); - return dis(Global::random_engine); + return dis(Global.random_engine); } bool FuzzyLogic(double Test, double Threshold, double Probability) @@ -267,6 +267,25 @@ win1250_to_ascii( std::string &Input ) { } } +// Ra: tymczasowe rozwiązanie kwestii zagranicznych (czeskich) napisów +char bezogonkowo[] = "E?,?\"_++?%Sstzz" + " ^^L$A|S^CS<--RZo±,l'uP.,as>L\"lz" + "RAAAALCCCEEEEIIDDNNOOOOxRUUUUYTB" + "raaaalccceeeeiiddnnoooo-ruuuuyt?"; + +std::string Bezogonkow(std::string str, bool _) +{ // wycięcie liter z ogonkami, bo OpenGL nie umie wyświetlić + for (unsigned int i = 1; i < str.length(); ++i) + if (str[i] & 0x80) + str[i] = bezogonkowo[str[i] & 0x7F]; + else if (str[i] < ' ') // znaki sterujące nie są obsługiwane + str[i] = ' '; + else if (_) + if (str[i] == '_') // nazwy stacji nie mogą zawierać spacji + str[i] = ' '; // więc trzeba wyświetlać inaczej + return str; +}; + template <> bool extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { diff --git a/McZapkie/mctools.h b/old/mctools.h similarity index 98% rename from McZapkie/mctools.h rename to old/mctools.h index 88bdc80f..819791e2 100644 --- a/McZapkie/mctools.h +++ b/old/mctools.h @@ -112,6 +112,8 @@ std::string ToUpper(std::string const &text); // replaces polish letters with basic ascii void win1250_to_ascii( std::string &Input ); +// TODO: unify with win1250_to_ascii() +std::string Bezogonkow( std::string str, bool _ = false ); inline std::string diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index dc8989a3..02fde9db 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -392,7 +392,7 @@ geometrybank_manager::update() { gfx::geometrybank_handle geometrybank_manager::create_bank() { - if( true == Global::bUseVBO ) { m_geometrybanks.emplace_back( std::make_shared(), std::chrono::steady_clock::time_point() ); } + if( true == Global.bUseVBO ) { m_geometrybanks.emplace_back( std::make_shared(), std::chrono::steady_clock::time_point() ); } else { m_geometrybanks.emplace_back( std::make_shared(), std::chrono::steady_clock::time_point() ); } // NOTE: handle is effectively (index into chunk array + 1) this leaves value of 0 to serve as error/empty handle indication return { static_cast( m_geometrybanks.size() ), 0 }; diff --git a/renderer.cpp b/renderer.cpp index 2177046d..1d72f481 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "renderer.h" +#include "color.h" #include "globals.h" #include "timer.h" #include "simulation.h" @@ -20,7 +21,7 @@ http://mozilla.org/MPL/2.0/. #include "traction.h" #include "uilayer.h" #include "logs.h" -#include "usefull.h" +#include "utilities.h" opengl_renderer GfxRenderer; extern TWorld World; @@ -28,12 +29,33 @@ extern TWorld World; int const EU07_PICKBUFFERSIZE { 1024 }; // size of (square) textures bound with the pick framebuffer int const EU07_ENVIRONMENTBUFFERSIZE { 256 }; // size of (square) environmental cube map texture -namespace colors { +void +opengl_light::apply_intensity( float const Factor ) { -glm::vec4 const none { 0.f, 0.f, 0.f, 1.f }; -glm::vec4 const white{ 1.f, 1.f, 1.f, 1.f }; + if( Factor == 1.0 ) { + + ::glLightfv( id, GL_AMBIENT, glm::value_ptr( ambient ) ); + ::glLightfv( id, GL_DIFFUSE, glm::value_ptr( diffuse ) ); + ::glLightfv( id, GL_SPECULAR, glm::value_ptr( specular ) ); + } + else { + // temporary light scaling mechanics (ultimately this work will be left to the shaders + glm::vec4 scaledambient( ambient.r * Factor, ambient.g * Factor, ambient.b * Factor, ambient.a ); + glm::vec4 scaleddiffuse( diffuse.r * Factor, diffuse.g * Factor, diffuse.b * Factor, diffuse.a ); + glm::vec4 scaledspecular( specular.r * Factor, specular.g * Factor, specular.b * Factor, specular.a ); + glLightfv( id, GL_AMBIENT, glm::value_ptr( scaledambient ) ); + glLightfv( id, GL_DIFFUSE, glm::value_ptr( scaleddiffuse ) ); + glLightfv( id, GL_SPECULAR, glm::value_ptr( scaledspecular ) ); + } +} + +void +opengl_light::apply_angle() { + + ::glLightfv( id, GL_POSITION, glm::value_ptr( position ) ); + ::glLightfv( id, GL_SPOT_DIRECTION, glm::value_ptr( glm::vec4{ direction, ( is_omnidirectional ? 1.f : 0.f ) } ) ); +} -} // namespace colors void opengl_camera::update_frustum( glm::mat4 const &Projection, glm::mat4 const &Modelview ) { @@ -100,7 +122,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { glShadeModel( GL_SMOOTH ); // Enable Smooth Shading m_geometry.units().texture = ( - Global::BasicRenderer ? + Global.BasicRenderer ? std::vector{ m_diffusetextureunit } : std::vector{ m_normaltextureunit, m_diffusetextureunit } ); m_textures.assign_units( m_helpertextureunit, m_shadowtextureunit, m_normaltextureunit, m_diffusetextureunit ); // TODO: add reflections unit @@ -124,7 +146,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glLightModeli( GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR ); ::glMaterialf( GL_FRONT, GL_SHININESS, 15.0f ); - if( true == Global::ScaleSpecularValues ) { + if( true == Global.ScaleSpecularValues ) { m_specularopaquescalefactor = 0.25f; m_speculartranslucentscalefactor = 1.5f; } @@ -136,23 +158,21 @@ opengl_renderer::Init( GLFWwindow *Window ) { ::glEnable( GL_LIGHTING ); ::glEnable( GL_LIGHT0 ); - Global::DayLight.id = opengl_renderer::sunlight; - // directional light - // TODO, TBD: test omni-directional variant - Global::DayLight.position[ 3 ] = 1.0f; - ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); + m_sunlight.id = opengl_renderer::sunlight; +// ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); + Global.DayLight.is_omnidirectional = true; // rgb value for 5780 kelvin - Global::DayLight.diffuse[ 0 ] = 255.0f / 255.0f; - Global::DayLight.diffuse[ 1 ] = 242.0f / 255.0f; - Global::DayLight.diffuse[ 2 ] = 231.0f / 255.0f; + Global.DayLight.diffuse[ 0 ] = 255.0f / 255.0f; + Global.DayLight.diffuse[ 1 ] = 242.0f / 255.0f; + Global.DayLight.diffuse[ 2 ] = 231.0f / 255.0f; // create dynamic light pool - for( int idx = 0; idx < Global::DynamicLightCount; ++idx ) { + for( int idx = 0; idx < Global.DynamicLightCount; ++idx ) { opengl_light light; light.id = GL_LIGHT1 + idx; - light.position[ 3 ] = 1.0f; + light.is_omnidirectional = true; ::glLightf( light.id, GL_SPOT_CUTOFF, 7.5f ); ::glLightf( light.id, GL_SPOT_EXPONENT, 7.5f ); ::glLightf( light.id, GL_CONSTANT_ATTENUATION, 0.0f ); @@ -204,7 +224,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { } #endif // shadowmap resources - if( ( true == Global::RenderShadows ) + if( ( true == Global.RenderShadows ) && ( true == m_framebuffersupport ) ) { // primary shadow map { @@ -252,7 +272,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { } else { ErrorLog( "Shadows framebuffer setup failed" ); - Global::RenderShadows = false; + Global.RenderShadows = false; } // switch back to primary render target for now ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); @@ -305,14 +325,14 @@ opengl_renderer::Init( GLFWwindow *Window ) { } else { ErrorLog( "Cab shadows framebuffer setup failed" ); - Global::RenderShadows = false; + Global.RenderShadows = false; } } // switch back to primary render target for now ::glBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 ); } // environment cube map resources - if( ( false == Global::BasicRenderer ) + if( ( false == Global.BasicRenderer ) && ( true == m_framebuffersupport ) ) { // texture: ::glGenTextures( 1, &m_environmentcubetexture ); @@ -417,8 +437,8 @@ opengl_renderer::Render_pass( rendermode const Mode ) { case rendermode::color: { - if( ( true == Global::RenderShadows ) - && ( false == Global::bWireFrame ) + if( ( true == Global.RenderShadows ) + && ( false == Global.bWireFrame ) && ( true == World.InitPerformed() ) && ( m_shadowcolor != colors::white ) ) { @@ -465,7 +485,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } } - ::glViewport( 0, 0, Global::iWindowWidth, Global::iWindowHeight ); + ::glViewport( 0, 0, Global.iWindowWidth, Global.iWindowHeight ); if( World.InitPerformed() ) { auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); @@ -493,7 +513,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glColor4f( 1.f, 0.9f, 0.8f, 1.f ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_TEXTURE_2D ); - if( ( true == Global::RenderShadows ) && ( false == Global::bWireFrame ) ) { + if( ( true == Global.RenderShadows ) && ( false == Global.bWireFrame ) ) { m_shadowpass.camera.draw( m_renderpass.camera.position() - m_shadowpass.camera.position() ); } if( DebugCameraFlag ) { @@ -758,12 +778,12 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f if( false == World.InitPerformed() ) { return; } // setup draw range switch( Mode ) { - case rendermode::color: { Config.draw_range = Global::BaseDrawRange; break; } - case rendermode::shadows: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } - case rendermode::cabshadows: { Config.draw_range = ( Global::pWorld->train()->Dynamic()->MoverParameters->ActiveCab != 0 ? 10.f : 20.f ); break; } - case rendermode::reflections: { Config.draw_range = Global::BaseDrawRange; break; } + case rendermode::color: { Config.draw_range = Global.BaseDrawRange; break; } + case rendermode::shadows: { Config.draw_range = Global.BaseDrawRange * 0.5f; break; } + case rendermode::cabshadows: { Config.draw_range = ( Global.pWorld->train()->Dynamic()->MoverParameters->ActiveCab != 0 ? 10.f : 20.f ); break; } + case rendermode::reflections: { Config.draw_range = Global.BaseDrawRange; break; } case rendermode::pickcontrols: { Config.draw_range = 50.f; break; } - case rendermode::pickscenery: { Config.draw_range = Global::BaseDrawRange * 0.5f; break; } + case rendermode::pickscenery: { Config.draw_range = Global.BaseDrawRange * 0.5f; break; } default: { Config.draw_range = 0.f; break; } } // setup camera @@ -776,23 +796,23 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f case rendermode::color: { // modelview if( ( false == DebugCameraFlag ) || ( true == Ignoredebug ) ) { - camera.position() = Global::pCameraPosition; + camera.position() = Global.pCameraPosition; World.Camera.SetMatrix( viewmatrix ); } else { - camera.position() = Global::DebugCameraPosition; + camera.position() = Global.DebugCameraPosition; World.DebugCamera.SetMatrix( viewmatrix ); } // projection - auto const zfar = Config.draw_range * Global::fDistanceFactor * Zfar; + auto const zfar = Config.draw_range * Global.fDistanceFactor * Zfar; auto const znear = ( Znear > 0.f ? Znear * zfar : - 0.1f * Global::ZoomFactor ); + 0.1f * Global.ZoomFactor ); camera.projection() *= glm::perspective( - glm::radians( Global::FieldOfView / Global::ZoomFactor ), - std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), + glm::radians( Global.FieldOfView / Global.ZoomFactor ), + std::max( 1.f, (float)Global.iWindowWidth ) / std::max( 1.f, (float)Global.iWindowHeight ), znear, zfar ); break; @@ -800,7 +820,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f case rendermode::shadows: { // calculate lightview boundaries based on relevant area of the world camera frustum: // ...setup chunk of frustum we're interested in... - auto const zfar = std::min( 1.f, Global::shadowtune.depth / ( Global::BaseDrawRange * Global::fDistanceFactor ) * std::max( 1.f, Global::ZoomFactor * 0.5f ) ); + auto const zfar = std::min( 1.f, Global.shadowtune.depth / ( Global.BaseDrawRange * Global.fDistanceFactor ) * std::max( 1.f, Global.ZoomFactor * 0.5f ) ); renderpass_config worldview; setup_pass( worldview, rendermode::color, 0.f, zfar, true ); auto &frustumchunkshapepoints = worldview.camera.frustum_points(); @@ -811,9 +831,9 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // ...cap the vertical angle to keep shadows from getting too long... auto const lightvector = glm::normalize( glm::vec3{ - Global::DayLight.direction.x, - std::min( Global::DayLight.direction.y, -0.2f ), - Global::DayLight.direction.z } ); + Global.DayLight.direction.x, + std::min( Global.DayLight.direction.y, -0.2f ), + Global.DayLight.direction.z } ); // ...place the light source at the calculated centre and setup world space light view matrix... camera.position() = worldview.camera.position() + glm::dvec3{ frustumchunkcentre }; viewmatrix *= glm::lookAt( @@ -830,7 +850,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f } bounding_box( frustumchunkmin, frustumchunkmax, std::begin( frustumchunkshapepoints ), std::end( frustumchunkshapepoints ) ); // quantize the frustum points and add some padding, to reduce shadow shimmer on scale changes - auto const quantizationstep{ std::min( Global::shadowtune.depth, 50.f ) }; + auto const quantizationstep{ std::min( Global.shadowtune.depth, 50.f ) }; frustumchunkmin = quantizationstep * glm::floor( frustumchunkmin * ( 1.f / quantizationstep ) ); frustumchunkmax = quantizationstep * glm::ceil( frustumchunkmax * ( 1.f / quantizationstep ) ); // ...use the dimensions to set up light projection boundaries... @@ -844,16 +864,16 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // fixed ortho projection from old build, for quick quality comparisons camera.projection() *= glm::ortho( - -Global::shadowtune.width, Global::shadowtune.width, - -Global::shadowtune.width, Global::shadowtune.width, - -Global::shadowtune.depth, Global::shadowtune.depth ); - camera.position() = Global::pCameraPosition - glm::dvec3{ Global::DayLight.direction }; - if( camera.position().y - Global::pCameraPosition.y < 0.1 ) { - camera.position().y = Global::pCameraPosition.y + 0.1; + -Global.shadowtune.width, Global.shadowtune.width, + -Global.shadowtune.width, Global.shadowtune.width, + -Global.shadowtune.depth, Global.shadowtune.depth ); + camera.position() = Global.pCameraPosition - glm::dvec3{ Global.DayLight.direction }; + if( camera.position().y - Global.pCameraPosition.y < 0.1 ) { + camera.position().y = Global.pCameraPosition.y + 0.1; } viewmatrix *= glm::lookAt( camera.position(), - glm::dvec3{ Global::pCameraPosition }, + glm::dvec3{ Global.pCameraPosition }, glm::dvec3{ 0.f, 1.f, 0.f } ); */ // ... and adjust the projection to sample complete shadow map texels: @@ -874,13 +894,13 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // modelview auto const lightvector = glm::normalize( glm::vec3{ - Global::DayLight.direction.x, - std::min( Global::DayLight.direction.y, -0.2f ), - Global::DayLight.direction.z } ); - camera.position() = Global::pCameraPosition - glm::dvec3 { lightvector }; + Global.DayLight.direction.x, + std::min( Global.DayLight.direction.y, -0.2f ), + Global.DayLight.direction.z } ); + camera.position() = Global.pCameraPosition - glm::dvec3 { lightvector }; viewmatrix *= glm::lookAt( camera.position(), - glm::dvec3 { Global::pCameraPosition }, + glm::dvec3 { Global.pCameraPosition }, glm::dvec3 { 0.f, 1.f, 0.f } ); // projection auto const maphalfsize { Config.draw_range * 0.5f }; @@ -902,8 +922,8 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // modelview camera.position() = ( ( ( true == DebugCameraFlag ) && ( false == Ignoredebug ) ) ? - Global::DebugCameraPosition : - Global::pCameraPosition ); + Global.DebugCameraPosition : + Global.pCameraPosition ); glm::dvec3 const cubefacetargetvectors[ 6 ] = { { 1.0, 0.0, 0.0 }, { -1.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }, { 0.0, -1.0, 0.0 }, { 0.0, 0.0, 1.0 }, { 0.0, 0.0, -1.0 } }; glm::dvec3 const cubefaceupvectors[ 6 ] = { { 0.0, -1.0, 0.0 }, { 0.0, -1.0, 0.0 }, { 0.0, 0.0, 1.0 }, { 0.0, 0.0, -1.0 }, { 0.0, -1.0, 0.0 }, { 0.0, -1.0, 0.0 } }; auto const cubefaceindex = m_environmentcubetextureface - GL_TEXTURE_CUBE_MAP_POSITIVE_X; @@ -917,8 +937,8 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f glm::perspective( glm::radians( 90.f ), 1.f, - 0.1f * Global::ZoomFactor, - Config.draw_range * Global::fDistanceFactor ); + 0.1f * Global.ZoomFactor, + Config.draw_range * Global.fDistanceFactor ); break; } @@ -926,15 +946,15 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f case rendermode::pickscenery: { // TODO: scissor test for pick modes // modelview - camera.position() = Global::pCameraPosition; + camera.position() = Global.pCameraPosition; World.Camera.SetMatrix( viewmatrix ); // projection camera.projection() *= glm::perspective( - glm::radians( Global::FieldOfView / Global::ZoomFactor ), - std::max( 1.f, (float)Global::iWindowWidth ) / std::max( 1.f, (float)Global::iWindowHeight ), - 0.1f * Global::ZoomFactor, - Config.draw_range * Global::fDistanceFactor ); + glm::radians( Global.FieldOfView / Global.ZoomFactor ), + std::max( 1.f, (float)Global.iWindowWidth ) / std::max( 1.f, (float)Global.iWindowHeight ), + 0.1f * Global.ZoomFactor, + Config.draw_range * Global.fDistanceFactor ); break; } default: { @@ -984,14 +1004,14 @@ opengl_renderer::setup_drawing( bool const Alpha ) { case rendermode::reflections: { ::glEnable( GL_LIGHTING ); ::glShadeModel( GL_SMOOTH ); - if( Global::iMultisampling ) { + if( Global.iMultisampling ) { ::glEnable( GL_MULTISAMPLE ); } // setup fog - if( Global::fFogEnd > 0 ) { + if( Global.fFogEnd > 0 ) { // fog setup - ::glFogfv( GL_FOG_COLOR, Global::FogColor ); - ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / Global::fFogEnd ) ); + ::glFogfv( GL_FOG_COLOR, Global.FogColor ); + ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / Global.fFogEnd ) ); ::glEnable( GL_FOG ); } else { ::glDisable( GL_FOG ); } @@ -1005,7 +1025,7 @@ opengl_renderer::setup_drawing( bool const Alpha ) { ::glColor4fv( glm::value_ptr( colors::white ) ); ::glDisable( GL_LIGHTING ); ::glShadeModel( GL_FLAT ); - if( Global::iMultisampling ) { + if( Global.iMultisampling ) { ::glDisable( GL_MULTISAMPLE ); } ::glDisable( GL_FOG ); @@ -1028,7 +1048,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const select_unit( m_helpertextureunit ); if( ( true == Reflections ) - || ( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( false == Global::bWireFrame ) ) ) { + || ( ( true == Global.RenderShadows ) && ( true == Shadows ) && ( false == Global.bWireFrame ) ) ) { // we need to have texture on the helper for either the reflection and shadow generation (or both) if( true == m_environmentcubetexturesupport ) { // bind dynamic environment cube if it's enabled... @@ -1051,7 +1071,7 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const } } - if( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( false == Global::bWireFrame ) ) { + if( ( true == Global.RenderShadows ) && ( true == Shadows ) && ( false == Global.bWireFrame ) ) { ::glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE ); ::glTexEnvfv( GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, glm::value_ptr( m_shadowcolor ) ); @@ -1107,9 +1127,9 @@ opengl_renderer::setup_units( bool const Diffuse, bool const Shadows, bool const // shadow texture unit. // interpolates between primary colour and the previous unit, which should hold darkened variant of the primary colour if( m_shadowtextureunit >= 0 ) { - if( ( true == Global::RenderShadows ) + if( ( true == Global.RenderShadows ) && ( true == Shadows ) - && ( false == Global::bWireFrame ) + && ( false == Global.bWireFrame ) && ( m_shadowcolor != colors::white ) ) { select_unit( m_shadowtextureunit ); @@ -1211,8 +1231,8 @@ void opengl_renderer::setup_shadow_map( GLuint const Texture, glm::mat4 const &Transformation ) { if( ( m_shadowtextureunit == -1 ) - || ( false == Global::RenderShadows ) - || ( true == Global::bWireFrame ) + || ( false == Global.RenderShadows ) + || ( true == Global.bWireFrame ) || ( m_shadowcolor == colors::white ) ) { // shadows are off return; @@ -1241,9 +1261,9 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons select_unit( m_helpertextureunit ); if( ( true == Reflections ) - || ( ( true == Global::RenderShadows ) + || ( ( true == Global.RenderShadows ) && ( true == Shadows ) - && ( false == Global::bWireFrame ) + && ( false == Global.bWireFrame ) && ( m_shadowcolor != colors::white ) ) ) { if( true == m_environmentcubetexturesupport ) { ::glEnable( GL_TEXTURE_CUBE_MAP ); @@ -1263,7 +1283,7 @@ opengl_renderer::switch_units( bool const Diffuse, bool const Shadows, bool cons } // shadow texture unit. if( m_shadowtextureunit >= 0 ) { - if( ( true == Global::RenderShadows ) && ( true == Shadows ) && ( false == Global::bWireFrame ) ) { + if( ( true == Global.RenderShadows ) && ( true == Shadows ) && ( false == Global.bWireFrame ) ) { select_unit( m_shadowtextureunit ); ::glEnable( GL_TEXTURE_2D ); @@ -1312,6 +1332,33 @@ opengl_renderer::setup_shadow_color( glm::vec4 const &Shadowcolor ) { select_unit( m_diffusetextureunit ); } +void +opengl_renderer::setup_environment_light( TEnvironmentType const Environment ) { + + if( m_environment == Environment ) { return; } + + switch( Environment ) { + case e_flat: { + m_sunlight.apply_intensity(); + m_environment = e_flat; + break; + } + case e_canyon: { + m_sunlight.apply_intensity( 0.4f ); + m_environment = Environment; + break; + } + case e_tunnel: { + m_sunlight.apply_intensity( 0.2f ); + m_environment = Environment; + break; + } + default: { + break; + } + } +} + bool opengl_renderer::Render( world_environment *Environment ) { @@ -1328,9 +1375,9 @@ opengl_renderer::Render( world_environment *Environment ) { // soften shadows depending on sky overcast factor m_shadowcolor = glm::min( colors::white, - m_shadowcolor + glm::vec4{ glm::vec3{ 0.5f * Global::Overcast }, 1.f } ); + m_shadowcolor + glm::vec4{ glm::vec3{ 0.5f * Global.Overcast }, 1.f } ); - if( Global::bWireFrame ) { + if( Global.bWireFrame ) { // bez nieba w trybie rysowania linii return false; } @@ -1343,7 +1390,7 @@ opengl_renderer::Render( world_environment *Environment ) { // skydome Environment->m_skydome.Render(); - if( true == Global::bUseVBO ) { + if( true == Global.bUseVBO ) { // skydome uses a custom vbo which could potentially confuse the main geometry system. hardly elegant but, eh gfx::opengl_vbogeometrybank::reset(); } @@ -1352,7 +1399,7 @@ opengl_renderer::Render( world_environment *Environment ) { // setup ::glPushMatrix(); ::glRotatef( Environment->m_stars.m_latitude, 1.f, 0.f, 0.f ); // ustawienie osi OY na północ - ::glRotatef( -std::fmod( (float)Global::fTimeAngleDeg, 360.f ), 0.f, 1.f, 0.f ); // obrót dobowy osi OX + ::glRotatef( -std::fmod( (float)Global.fTimeAngleDeg, 360.f ), 0.f, 1.f, 0.f ); // obrót dobowy osi OX ::glPointSize( 2.f ); // render GfxRenderer.Render( Environment->m_stars.m_stars, nullptr, 1.0 ); @@ -1407,7 +1454,7 @@ opengl_renderer::Render( world_environment *Environment ) { { Bind_Texture( m_moontexture ); glm::vec3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); - ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, static_cast( 1.0 - Global::fLuminance * 0.5 ) ); + ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, static_cast( 1.0 - Global.fLuminance * 0.5 ) ); auto const moonposition = modelview * glm::vec4( Environment->m_moon.getDirection(), 1.0f ); ::glPushMatrix(); @@ -1453,7 +1500,7 @@ opengl_renderer::Render( world_environment *Environment ) { GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( interpolate( Environment->m_skydome.GetAverageColor(), suncolor, duskfactor * 0.25f ) - * interpolate( 1.f, 0.35f, Global::Overcast / 2.f ) // overcast darkens the clouds + * interpolate( 1.f, 0.35f, Global.Overcast / 2.f ) // overcast darkens the clouds * 2.5f // arbitrary adjustment factor ) ); // render @@ -1465,8 +1512,8 @@ opengl_renderer::Render( world_environment *Environment ) { ::glDisable( GL_LIGHTING ); } - Global::DayLight.apply_angle(); - Global::DayLight.apply_intensity(); + m_sunlight.apply_angle(); + m_sunlight.apply_intensity(); ::glPopMatrix(); ::glDepthMask( GL_TRUE ); @@ -1523,7 +1570,7 @@ void opengl_renderer::Bind_Material( material_handle const Material ) { auto const &material = m_materials.material( Material ); - if( false == Global::BasicRenderer ) { + if( false == Global.BasicRenderer ) { m_textures.bind( textureunit::normals, material.texture2 ); } m_textures.bind( textureunit::diffuse, material.texture1 ); @@ -1569,7 +1616,7 @@ opengl_renderer::Render( scene::basic_region *Region ) { glm::vec3 const cameraposition { m_renderpass.camera.position() }; auto const camerax = static_cast( std::floor( cameraposition.x / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2 ) ); auto const cameraz = static_cast( std::floor( cameraposition.z / scene::EU07_SECTIONSIZE + scene::EU07_REGIONSIDESECTIONCOUNT / 2 ) ); - int const segmentcount = 2 * static_cast( std::ceil( m_renderpass.draw_range * Global::fDistanceFactor / scene::EU07_SECTIONSIZE ) ); + int const segmentcount = 2 * static_cast( std::ceil( m_renderpass.draw_range * Global.fDistanceFactor / scene::EU07_SECTIONSIZE ) ); int const originx = camerax - segmentcount / 2; int const originz = cameraz - segmentcount / 2; @@ -1590,6 +1637,7 @@ opengl_renderer::Render( scene::basic_region *Region ) { switch( m_renderpass.draw_mode ) { case rendermode::color: { + m_sunlight = Global.DayLight; Update_Lights( simulation::Lights ); Render( std::begin( m_sectionqueue ), std::end( m_sectionqueue ) ); @@ -1851,11 +1899,11 @@ opengl_renderer::Render( scene::shape_node const &Shape, bool const Ignorerange switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( data.area.center - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( data.area.center - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( data.area.center - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = glm::length2( ( data.area.center - m_renderpass.camera.position() ) / (double)Global.ZoomFactor ) / Global.fDistanceFactor; break; } } @@ -1875,7 +1923,7 @@ opengl_renderer::Render( scene::shape_node const &Shape, bool const Ignorerange // NOTE: ambient component is set by diffuse component // NOTE: for the time being non-instanced shapes are rendered without specular component due to wrong/arbitrary values set in legacy scenarios // TBD, TODO: find a way to resolve this with the least amount of tears? - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( data.lighting.specular * Global::DayLight.specular.a * m_specularopaquescalefactor ) ); + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( data.lighting.specular * Global.DayLight.specular.a * m_specularopaquescalefactor ) ); */ break; } @@ -1905,11 +1953,11 @@ opengl_renderer::Render( TAnimModel *Instance ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Instance->location() - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( Instance->location() - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( Instance->location() - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( Instance->location() - m_renderpass.camera.position() ) / (double)Global.ZoomFactor ) / Global.fDistanceFactor; break; } } @@ -1959,11 +2007,11 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { float squaredistance; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { - squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global::pCameraPosition } } / Global::ZoomFactor ) / Global::fDistanceFactor; + squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global.pCameraPosition } } / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { - squaredistance = glm::length2( glm::vec3{ originoffset } / Global::ZoomFactor ) / Global::fDistanceFactor; + squaredistance = glm::length2( glm::vec3{ originoffset } / Global.ZoomFactor ) / Global.fDistanceFactor; break; } } @@ -1978,7 +2026,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { case rendermode::color: { if( Dynamic->fShade > 0.0f ) { // change light level based on light level of the occupied track - Global::DayLight.apply_intensity( Dynamic->fShade ); + m_sunlight.apply_intensity( Dynamic->fShade ); } m_renderspecular = true; // vehicles are rendered with specular component. static models without, at least for the time being // render @@ -2011,7 +2059,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { m_renderspecular = false; if( Dynamic->fShade > 0.0f ) { // restore regular light level - Global::DayLight.apply_intensity(); + m_sunlight.apply_intensity(); } break; } @@ -2077,7 +2125,7 @@ opengl_renderer::Render_cab( TDynamicObject const *Dynamic, bool const Alpha ) { // render path specific setup: if( Dynamic->fShade > 0.0f ) { // change light level based on light level of the occupied track - Global::DayLight.apply_intensity( Dynamic->fShade ); + m_sunlight.apply_intensity( Dynamic->fShade ); } if( Dynamic->InteriorLightLevel > 0.f ) { // crude way to light the cabin, until we have something more complete in place @@ -2095,7 +2143,7 @@ opengl_renderer::Render_cab( TDynamicObject const *Dynamic, bool const Alpha ) { // post-render restore if( Dynamic->fShade > 0.0f ) { // change light level based on light level of the occupied track - Global::DayLight.apply_intensity(); + m_sunlight.apply_intensity(); } if( Dynamic->InteriorLightLevel > 0.0f ) { // reset the overall ambient @@ -2242,14 +2290,14 @@ opengl_renderer::Render( TSubModel *Submodel ) { } // ...colors... ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub - if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + if( ( true == m_renderspecular ) && ( Global.DayLight.specular.a > 0.01f ) ) { // specular strength in legacy models is set uniformly to 150, 150, 150 so we scale it down for opaque elements - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_specularopaquescalefactor ) ); + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global.DayLight.specular.a * m_specularopaquescalefactor ) ); ::glEnable( GL_RESCALE_NORMAL ); } // ...luminance auto const unitstate = m_unitstate; - if( Global::fLuminance < Submodel->fLight ) { + if( Global.fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); // disable shadows so they don't obstruct self-lit items @@ -2263,10 +2311,10 @@ opengl_renderer::Render( TSubModel *Submodel ) { m_geometry.draw( Submodel->m_geometry ); // post-draw reset - if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + if( ( true == m_renderspecular ) && ( Global.DayLight.specular.a > 0.01f ) ) { ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); } - if( Global::fLuminance < Submodel->fLight ) { + if( Global.fLuminance < Submodel->fLight ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); /* @@ -2402,7 +2450,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // colour points are only rendered in colour mode(s) case rendermode::color: case rendermode::reflections: { - if( Global::fLuminance < Submodel->fLight ) { + if( Global.fLuminance < Submodel->fLight ) { // material configuration: ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); @@ -2456,7 +2504,7 @@ opengl_renderer::Render( TTrack *Track ) { switch( m_renderpass.draw_mode ) { case rendermode::color: case rendermode::reflections: { - Track->EnvironmentSet(); + setup_environment_light( Track->eEnvironment ); if( Track->m_material1 != 0 ) { Bind_Material( Track->m_material1 ); m_geometry.draw( std::begin( Track->Geometry1 ), std::end( Track->Geometry1 ) ); @@ -2465,7 +2513,7 @@ opengl_renderer::Render( TTrack *Track ) { Bind_Material( Track->m_material2 ); m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); } - Track->EnvironmentReset(); + setup_environment_light(); break; } case rendermode::shadows: { @@ -2529,10 +2577,10 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, switch( m_renderpass.draw_mode ) { case rendermode::color: case rendermode::reflections: { - track->EnvironmentSet(); + setup_environment_light( track->eEnvironment ); Bind_Material( track->m_material1 ); m_geometry.draw( std::begin( track->Geometry1 ), std::end( track->Geometry1 ) ); - track->EnvironmentReset(); + setup_environment_light(); break; } case rendermode::shadows: { @@ -2567,10 +2615,10 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, switch( m_renderpass.draw_mode ) { case rendermode::color: case rendermode::reflections: { - track->EnvironmentSet(); + setup_environment_light( track->eEnvironment ); Bind_Material( track->m_material2 ); m_geometry.draw( std::begin( track->Geometry2 ), std::end( track->Geometry2 ) ); - track->EnvironmentReset(); + setup_environment_light(); break; } case rendermode::shadows: { @@ -2712,7 +2760,7 @@ opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_seque ::glPushMatrix(); auto const originoffset { cell->m_area.center - m_renderpass.camera.position() }; ::glTranslated( originoffset.x, originoffset.y, originoffset.z ); - if( !Global::bSmoothTraction ) { + if( !Global.bSmoothTraction ) { // na liniach kiepsko wygląda - robi gradient ::glDisable( GL_LINE_SMOOTH ); } @@ -2722,7 +2770,7 @@ opengl_renderer::Render_Alpha( cell_sequence::reverse_iterator First, cell_seque for( auto &lines : cell->m_lines ) { Render_Alpha( lines ); } // post-render cleanup ::glLineWidth( 1.0 ); - if( !Global::bSmoothTraction ) { + if( !Global.bSmoothTraction ) { ::glEnable( GL_LINE_SMOOTH ); } ::glPopMatrix(); @@ -2746,11 +2794,11 @@ opengl_renderer::Render_Alpha( TAnimModel *Instance ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Instance->location() - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( Instance->location() - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( Instance->location() - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = glm::length2( ( Instance->location() - m_renderpass.camera.position() ) / (double)Global.ZoomFactor ) / Global.fDistanceFactor; break; } } @@ -2778,11 +2826,11 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( Traction->location() - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( Traction->location() - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( Traction->location() - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = glm::length2( ( Traction->location() - m_renderpass.camera.position() ) / (double)Global.ZoomFactor ) / Global.fDistanceFactor; break; } } @@ -2839,11 +2887,11 @@ opengl_renderer::Render_Alpha( scene::lines_node const &Lines ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = SquareMagnitude( ( data.area.center - Global::pCameraPosition ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( data.area.center - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { - distancesquared = SquareMagnitude( ( data.area.center - m_renderpass.camera.position() ) / Global::ZoomFactor ) / Global::fDistanceFactor; + distancesquared = glm::length2( ( data.area.center - m_renderpass.camera.position() ) / (double)Global.ZoomFactor ) / Global.fDistanceFactor; break; } } @@ -2867,7 +2915,7 @@ opengl_renderer::Render_Alpha( scene::lines_node const &Lines ) { ::glColor4fv( glm::value_ptr( glm::vec4{ - glm::vec3{ data.lighting.diffuse * Global::DayLight.ambient }, // w zaleznosci od koloru swiatla + glm::vec3{ data.lighting.diffuse * Global.DayLight.ambient }, // w zaleznosci od koloru swiatla std::min( 1.f, linealpha ) } ) ); // render m_geometry.draw( data.geometry ); @@ -2887,11 +2935,11 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { float squaredistance; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { - squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global::pCameraPosition } } / Global::ZoomFactor ) / Global::fDistanceFactor; + squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global.pCameraPosition } } / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { - squaredistance = glm::length2( glm::vec3{ originoffset } / Global::ZoomFactor ) / Global::fDistanceFactor; + squaredistance = glm::length2( glm::vec3{ originoffset } / Global.ZoomFactor ) / Global.fDistanceFactor; break; } } @@ -2903,7 +2951,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { if( Dynamic->fShade > 0.0f ) { // change light level based on light level of the occupied track - Global::DayLight.apply_intensity( Dynamic->fShade ); + m_sunlight.apply_intensity( Dynamic->fShade ); } m_renderspecular = true; @@ -2937,7 +2985,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { m_renderspecular = false; if( Dynamic->fShade > 0.0f ) { // restore regular light level - Global::DayLight.apply_intensity(); + m_sunlight.apply_intensity(); } ::glPopMatrix(); @@ -3052,12 +3100,12 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { } // ...colors... ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub - if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global::DayLight.specular.a * m_speculartranslucentscalefactor ) ); + if( ( true == m_renderspecular ) && ( Global.DayLight.specular.a > 0.01f ) ) { + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global.DayLight.specular.a * m_speculartranslucentscalefactor ) ); } // ...luminance auto const unitstate = m_unitstate; - if( Global::fLuminance < Submodel->fLight ) { + if( Global.fLuminance < Submodel->fLight ) { // zeby swiecilo na kolorowo ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( Submodel->f4Diffuse * Submodel->f4Emision.a ) ); // disable shadows so they don't obstruct self-lit items @@ -3071,10 +3119,10 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { m_geometry.draw( Submodel->m_geometry ); // post-draw reset - if( ( true == m_renderspecular ) && ( Global::DayLight.specular.a > 0.01f ) ) { + if( ( true == m_renderspecular ) && ( Global.DayLight.specular.a > 0.01f ) ) { ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); } - if( Global::fLuminance < Submodel->fLight ) { + if( Global.fLuminance < Submodel->fLight ) { // restore default (lack of) brightness ::glMaterialfv( GL_FRONT, GL_EMISSION, glm::value_ptr( colors::none ) ); /* @@ -3122,7 +3170,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { } else if( Submodel->eType == TP_FREESPOTLIGHT ) { - if( Global::fLuminance < Submodel->fLight ) { + if( Global.fLuminance < Submodel->fLight ) { // NOTE: we're forced here to redo view angle calculations etc, because this data isn't instanced but stored along with the single mesh // TODO: separate instance data from reusable geometry auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); @@ -3137,14 +3185,14 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { float glarelevel = 0.6f; // luminosity at night is at level of ~0.1, so the overall resulting transparency in clear conditions is ~0.5 at full 'brightness' if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) { // only bother if the viewer is inside the visibility cone - if( Global::Overcast > 1.0 ) { + if( Global.Overcast > 1.0 ) { // increase the glare in rainy/foggy conditions - glarelevel += std::max( 0.f, 0.5f * ( Global::Overcast - 1.f ) ); + glarelevel += std::max( 0.f, 0.5f * ( Global.Overcast - 1.f ) ); } // scale it down based on view angle glarelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); // reduce the glare in bright daylight - glarelevel = clamp( glarelevel - static_cast(Global::fLuminance), 0.f, 1.f ); + glarelevel = clamp( glarelevel - static_cast(Global.fLuminance), 0.f, 1.f ); if( glarelevel > 0.0f ) { // setup @@ -3243,15 +3291,15 @@ opengl_renderer::Update_Pick_Control() { // determine point to examine glm::dvec2 mousepos; glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); - mousepos.y = Global::iWindowHeight - mousepos.y; // cursor coordinates are flipped compared to opengl + mousepos.y = Global.iWindowHeight - mousepos.y; // cursor coordinates are flipped compared to opengl #ifdef EU07_USE_PICKING_FRAMEBUFFER glm::ivec2 pickbufferpos; if( true == m_framebuffersupport ) { // ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); pickbufferpos = glm::ivec2{ - mousepos.x * EU07_PICKBUFFERSIZE / std::max( 1, Global::iWindowWidth ), - mousepos.y * EU07_PICKBUFFERSIZE / std::max( 1, Global::iWindowHeight ) }; + mousepos.x * EU07_PICKBUFFERSIZE / std::max( 1, Global.iWindowWidth ), + mousepos.y * EU07_PICKBUFFERSIZE / std::max( 1, Global.iWindowHeight ) }; } else { // ::glReadBuffer( GL_BACK ); @@ -3290,15 +3338,15 @@ opengl_renderer::Update_Pick_Node() { // determine point to examine glm::dvec2 mousepos; glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); - mousepos.y = Global::iWindowHeight - mousepos.y; // cursor coordinates are flipped compared to opengl + mousepos.y = Global.iWindowHeight - mousepos.y; // cursor coordinates are flipped compared to opengl #ifdef EU07_USE_PICKING_FRAMEBUFFER glm::ivec2 pickbufferpos; if( true == m_framebuffersupport ) { // ::glReadBuffer( GL_COLOR_ATTACHMENT0_EXT ); pickbufferpos = glm::ivec2{ - mousepos.x * EU07_PICKBUFFERSIZE / Global::iWindowWidth, - mousepos.y * EU07_PICKBUFFERSIZE / Global::iWindowHeight + mousepos.x * EU07_PICKBUFFERSIZE / Global.iWindowWidth, + mousepos.y * EU07_PICKBUFFERSIZE / Global.iWindowHeight }; } else { @@ -3347,31 +3395,31 @@ opengl_renderer::Update( double const Deltatime ) { if( framerate > 90.0 ) { targetfactor = 3.0f; } else if( framerate > 60.0 ) { targetfactor = 1.5f; } else if( framerate > 30.0 ) { targetfactor = 1.25; } - else { targetfactor = std::max( Global::iWindowHeight / 768.f, 1.f ); } + else { targetfactor = std::max( Global.iWindowHeight / 768.f, 1.f ); } - if( targetfactor > Global::fDistanceFactor ) { + if( targetfactor > Global.fDistanceFactor ) { - Global::fDistanceFactor = std::min( targetfactor, Global::fDistanceFactor + 0.05f ); + Global.fDistanceFactor = std::min( targetfactor, Global.fDistanceFactor + 0.05f ); } - else if( targetfactor < Global::fDistanceFactor ) { + else if( targetfactor < Global.fDistanceFactor ) { - Global::fDistanceFactor = std::max( targetfactor, Global::fDistanceFactor - 0.05f ); + Global.fDistanceFactor = std::max( targetfactor, Global.fDistanceFactor - 0.05f ); } - if( ( framerate < 15.0 ) && ( Global::iSlowMotion < 7 ) ) { - Global::iSlowMotion = ( Global::iSlowMotion << 1 ) + 1; // zapalenie kolejnego bitu - if( Global::iSlowMotionMask & 1 ) - if( Global::iMultisampling ) // a multisampling jest włączony + if( ( framerate < 15.0 ) && ( Global.iSlowMotion < 7 ) ) { + Global.iSlowMotion = ( Global.iSlowMotion << 1 ) + 1; // zapalenie kolejnego bitu + if( Global.iSlowMotionMask & 1 ) + if( Global.iMultisampling ) // a multisampling jest włączony ::glDisable( GL_MULTISAMPLE ); // wyłączenie multisamplingu powinno poprawić FPS } - else if( ( framerate > 20.0 ) && Global::iSlowMotion ) { // FPS się zwiększył, można włączyć bajery - Global::iSlowMotion = ( Global::iSlowMotion >> 1 ); // zgaszenie bitu - if( Global::iSlowMotion == 0 ) // jeśli jest pełna prędkość - if( Global::iMultisampling ) // a multisampling jest włączony + else if( ( framerate > 20.0 ) && Global.iSlowMotion ) { // FPS się zwiększył, można włączyć bajery + Global.iSlowMotion = ( Global.iSlowMotion >> 1 ); // zgaszenie bitu + if( Global.iSlowMotion == 0 ) // jeśli jest pełna prędkość + if( Global.iMultisampling ) // a multisampling jest włączony ::glEnable( GL_MULTISAMPLE ); } - if( ( true == Global::ResourceSweep ) + if( ( true == Global.ResourceSweep ) && ( true == World.InitPerformed() ) ) { // garbage collection m_geometry.update(); @@ -3382,7 +3430,7 @@ opengl_renderer::Update( double const Deltatime ) { m_debugtimestext += m_textures.info(); } - if( ( true == Global::ControlPicking ) + if( ( true == Global.ControlPicking ) && ( false == FreeFlyModeFlag ) ) { Update_Pick_Control(); } @@ -3390,7 +3438,7 @@ opengl_renderer::Update( double const Deltatime ) { m_pickcontrolitem = nullptr; } // temporary conditions for testing. eventually will be coupled with editor mode - if( ( true == Global::ControlPicking ) + if( ( true == Global.ControlPicking ) && ( true == DebugModeFlag ) && ( true == FreeFlyModeFlag ) ) { Update_Pick_Node(); @@ -3403,7 +3451,7 @@ opengl_renderer::Update( double const Deltatime ) { if( glerror != GL_NO_ERROR ) { std::string glerrorstring( ( char * )::gluErrorString( glerror ) ); win1250_to_ascii( glerrorstring ); - Global::LastGLError = std::to_string( glerror ) + " (" + glerrorstring + ")"; + Global.LastGLError = std::to_string( glerror ) + " (" + glerrorstring + ")"; } } @@ -3456,10 +3504,10 @@ opengl_renderer::Update_Lights( light_array &Lights ) { continue; } // if the light passed tests so far, it's good enough - renderlight->set_position( lightoffset ); + renderlight->position = lightoffset; renderlight->direction = scenelight.direction; - auto luminance = static_cast( Global::fLuminance ); + auto luminance = static_cast( Global.fLuminance ); // adjust luminance level based on vehicle's location, e.g. tunnels auto const environment = scenelight.owner->fShade; if( environment > 0.f ) { @@ -3516,7 +3564,7 @@ opengl_renderer::Init_caps() { WriteLog( "Supported extensions: " + std::string((char *)glGetString( GL_EXTENSIONS )) ); - WriteLog( std::string("Render path: ") + ( Global::bUseVBO ? "VBO" : "Display lists" ) ); + WriteLog( std::string("Render path: ") + ( Global.bUseVBO ? "VBO" : "Display lists" ) ); if( GLEW_EXT_framebuffer_object ) { m_framebuffersupport = true; WriteLog( "Framebuffer objects enabled" ); @@ -3528,9 +3576,9 @@ opengl_renderer::Init_caps() { { GLint texturesize; ::glGetIntegerv( GL_MAX_TEXTURE_SIZE, &texturesize ); - Global::iMaxTextureSize = std::min( Global::iMaxTextureSize, texturesize ); - WriteLog( "Texture sizes capped at " + std::to_string( Global::iMaxTextureSize ) + " pixels" ); - m_shadowbuffersize = Global::shadowtune.map_size; + Global.iMaxTextureSize = std::min( Global.iMaxTextureSize, texturesize ); + WriteLog( "Texture sizes capped at " + std::to_string( Global.iMaxTextureSize ) + " pixels" ); + m_shadowbuffersize = Global.shadowtune.map_size; m_shadowbuffersize = std::min( m_shadowbuffersize, texturesize ); WriteLog( "Shadows map size capped at " + std::to_string( m_shadowbuffersize ) + " pixels" ); } @@ -3538,13 +3586,13 @@ opengl_renderer::Init_caps() { { GLint maxlights; ::glGetIntegerv( GL_MAX_LIGHTS, &maxlights ); - Global::DynamicLightCount = std::min( Global::DynamicLightCount, maxlights - 1 ); - WriteLog( "Dynamic light amount capped at " + std::to_string( Global::DynamicLightCount ) + " (" + std::to_string(maxlights) + " lights total supported by the gfx card)" ); + Global.DynamicLightCount = std::min( Global.DynamicLightCount, maxlights - 1 ); + WriteLog( "Dynamic light amount capped at " + std::to_string( Global.DynamicLightCount ) + " (" + std::to_string(maxlights) + " lights total supported by the gfx card)" ); } // select renderer mode - if( true == Global::BasicRenderer ) { + if( true == Global.BasicRenderer ) { WriteLog( "Basic renderer selected, shadow and reflection mapping will be disabled" ); - Global::RenderShadows = false; + Global.RenderShadows = false; m_diffusetextureunit = GL_TEXTURE0; m_helpertextureunit = -1; m_shadowtextureunit = -1; @@ -3555,8 +3603,8 @@ opengl_renderer::Init_caps() { ::glGetIntegerv( GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &maxtextureunits ); if( maxtextureunits < 4 ) { WriteLog( "Less than 4 texture units, shadow and reflection mapping will be disabled" ); - Global::BasicRenderer = true; - Global::RenderShadows = false; + Global.BasicRenderer = true; + Global.RenderShadows = false; m_diffusetextureunit = GL_TEXTURE0; m_helpertextureunit = -1; m_shadowtextureunit = -1; @@ -3564,8 +3612,8 @@ opengl_renderer::Init_caps() { } } - if( Global::iMultisampling ) { - WriteLog( "Using multisampling x" + std::to_string( 1 << Global::iMultisampling ) ); + if( Global.iMultisampling ) { + WriteLog( "Using multisampling x" + std::to_string( 1 << Global.iMultisampling ) ); } return true; diff --git a/renderer.h b/renderer.h index 50f35e99..517393e2 100644 --- a/renderer.h +++ b/renderer.h @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "GL/glew.h" #include "openglgeometrybank.h" #include "material.h" +#include "light.h" #include "lightarray.h" #include "dumb3d.h" #include "frustum.h" @@ -24,48 +25,19 @@ http://mozilla.org/MPL/2.0/. //#define EU07_USE_DEBUG_CABSHADOWMAP //#define EU07_USE_DEBUG_CAMERA -struct opengl_light { +struct opengl_light : public basic_light { - GLuint id{ (GLuint)-1 }; - glm::vec3 direction; - glm::vec4 - position { 0.f, 0.f, 0.f, 1.f }, // 4th parameter specifies directional(0) or omni-directional(1) light source - ambient { 0.f, 0.f, 0.f, 1.f }, - diffuse { 1.f, 1.f, 1.f, 1.f }, - specular { 1.f, 1.f, 1.f, 1.f }; + GLuint id { (GLuint)-1 }; - inline - void apply_intensity( float const Factor = 1.0f ) { + void + apply_intensity( float const Factor = 1.0f ); + void + apply_angle(); - if( Factor == 1.0 ) { - - glLightfv( id, GL_AMBIENT, glm::value_ptr(ambient) ); - glLightfv( id, GL_DIFFUSE, glm::value_ptr(diffuse) ); - glLightfv( id, GL_SPECULAR, glm::value_ptr(specular) ); - } - else { - // temporary light scaling mechanics (ultimately this work will be left to the shaders - glm::vec4 scaledambient( ambient.r * Factor, ambient.g * Factor, ambient.b * Factor, ambient.a ); - glm::vec4 scaleddiffuse( diffuse.r * Factor, diffuse.g * Factor, diffuse.b * Factor, diffuse.a ); - glm::vec4 scaledspecular( specular.r * Factor, specular.g * Factor, specular.b * Factor, specular.a ); - glLightfv( id, GL_AMBIENT, glm::value_ptr(scaledambient) ); - glLightfv( id, GL_DIFFUSE, glm::value_ptr(scaleddiffuse) ); - glLightfv( id, GL_SPECULAR, glm::value_ptr(scaledspecular) ); - } - } - inline - void apply_angle() { - - glLightfv( id, GL_POSITION, glm::value_ptr(position) ); - if( position.w == 1.f ) { - glLightfv( id, GL_SPOT_DIRECTION, glm::value_ptr(direction) ); - } - } - inline - void set_position( glm::vec3 const &Position ) { - - position = glm::vec4( Position, position.w ); - } + opengl_light & + operator=( basic_light const &Right ) { + basic_light::operator=( Right ); + return *this; } }; // encapsulates basic rendering setup. @@ -274,6 +246,8 @@ private: setup_shadow_map( GLuint const Texture, glm::mat4 const &Transformation ); void setup_shadow_color( glm::vec4 const &Shadowcolor ); + void + setup_environment_light( TEnvironmentType const Environment = e_flat ); void switch_units( bool const Diffuse, bool const Shadows, bool const Reflections ); // helper, texture manager method; activates specified texture unit @@ -343,6 +317,7 @@ private: gfx::geometrybank_manager m_geometry; material_manager m_materials; texture_manager m_textures; + opengl_light m_sunlight; opengllight_array m_lights; gfx::geometry_handle m_billboardgeometry { 0, 0 }; @@ -398,6 +373,7 @@ private: glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; glm::vec4 m_shadowcolor { 0.65f, 0.65f, 0.65f, 1.f }; + TEnvironmentType m_environment { e_flat }; float m_specularopaquescalefactor { 1.f }; float m_speculartranslucentscalefactor { 1.f }; bool m_renderspecular{ false }; // controls whether to include specular component in the calculations diff --git a/scene.cpp b/scene.cpp index 9487a7b6..f284a769 100644 --- a/scene.cpp +++ b/scene.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "timer.h" #include "logs.h" #include "sn_utils.h" +#include "renderer.h" namespace scene { @@ -54,7 +55,7 @@ basic_cell::update_traction( TDynamicObject *Vehicle, int const Pantographindex // jeśli ponad pantografem (bo może łapać druty spod wiaduktu) auto const fHorizontal = std::abs( glm::dot( vGdzie, vLeft ) ) - pantograph->fWidth; - if( ( Global::bEnableTraction ) + if( ( Global.bEnableTraction ) && ( fVertical < pantograph->PantWys - 0.15 ) ) { // jeśli drut jest niżej niż 15cm pod ślizgiem przełączamy w tryb połamania, o ile jedzie; // (bEnableTraction) aby dało się jeździć na koślawych sceneriach @@ -104,10 +105,10 @@ basic_cell::update_events() { // event launchers for( auto *launcher : m_eventlaunchers ) { if( ( true == launcher->check_conditions() ) - && ( SquareMagnitude( launcher->location() - Global::pCameraPosition ) < launcher->dRadius ) ) { + && ( SquareMagnitude( launcher->location() - Global.pCameraPosition ) < launcher->dRadius ) ) { WriteLog( "Eventlauncher " + launcher->name() ); - if( ( true == Global::shiftState ) + if( ( true == Global.shiftState ) && ( launcher->Event2 != nullptr ) ) { simulation::Events.AddToQuery( launcher->Event2, nullptr ); } @@ -827,9 +828,9 @@ void basic_region::update_events() { // render events and sounds from sectors near enough to the viewer auto const range = EU07_SECTIONSIZE; // arbitrary range - auto const §ionlist = sections( Global::pCameraPosition, range ); + auto const §ionlist = sections( Global.pCameraPosition, range ); for( auto *section : sectionlist ) { - section->update_events( Global::pCameraPosition, range ); + section->update_events( Global.pCameraPosition, range ); } } @@ -838,9 +839,9 @@ void basic_region::update_sounds() { // render events and sounds from sectors near enough to the viewer auto const range = 2750.f; // audible range of 100 db sound - auto const §ionlist = sections( Global::pCameraPosition, range ); + auto const §ionlist = sections( Global.pCameraPosition, range ); for( auto *section : sectionlist ) { - section->update_sounds( Global::pCameraPosition, range ); + section->update_sounds( Global.pCameraPosition, range ); } } @@ -872,7 +873,7 @@ basic_region::serialize( std::string const &Scenariofile ) const { // trim leading $ char rainsted utility may add to the base name for modified .scn files filename.erase( 0, 1 ); } - filename = Global::asCurrentSceneryPath + filename; + filename = Global.asCurrentSceneryPath + filename; if( ( filename.rfind( '.' ) != std::string::npos ) && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { // trim extension, it's typically going to be for different file type @@ -915,7 +916,7 @@ basic_region::deserialize( std::string const &Scenariofile ) { // trim leading $ char rainsted utility may add to the base name for modified .scn files filename.erase( 0, 1 ); } - filename = Global::asCurrentSceneryPath + filename; + filename = Global.asCurrentSceneryPath + filename; if( ( filename.rfind( '.' ) != std::string::npos ) && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { // trim extension, it's typically going to be for different file type diff --git a/scenenode.cpp b/scenenode.cpp index 4ebd51fe..588281c3 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "scenenode.h" +#include "model3d.h" #include "renderer.h" #include "logs.h" #include "sn_utils.h" diff --git a/scenenode.h b/scenenode.h index df7c6f64..f99c361d 100644 --- a/scenenode.h +++ b/scenenode.h @@ -11,11 +11,10 @@ http://mozilla.org/MPL/2.0/. #include +#include "classes.h" #include "material.h" #include "vertex.h" #include "openglgeometrybank.h" -#include "parser.h" -#include "model3d.h" struct lighting_data { diff --git a/simulation.cpp b/simulation.cpp index 7fa73290..4140e443 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -10,9 +10,11 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "simulation.h" +#include "world.h" #include "globals.h" #include "logs.h" #include "uilayer.h" +#include "renderer.h" namespace simulation { @@ -44,7 +46,7 @@ state_manager::deserialize( std::string const &Scenariofile ) { importscratchpad.binary.terrain = Region->deserialize( Scenariofile ); } // NOTE: for the time being import from text format is a given, since we don't have full binary serialization - cParser scenarioparser( Scenariofile, cParser::buffer_FILE, Global::asCurrentSceneryPath, Global::bLoadTraction ); + cParser scenarioparser( Scenariofile, cParser::buffer_FILE, Global.asCurrentSceneryPath, Global.bLoadTraction ); if( false == scenarioparser.ok() ) { return false; } @@ -56,7 +58,7 @@ state_manager::deserialize( std::string const &Scenariofile ) { Region->serialize( Scenariofile ); } - Global::iPause &= ~0x10; // koniec pauzy wczytywania + Global.iPause &= ~0x10; // koniec pauzy wczytywania return true; } @@ -153,10 +155,10 @@ state_manager::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad // fog range Input.getTokens( 2 ); Input - >> Global::fFogStart - >> Global::fFogEnd; + >> Global.fFogStart + >> Global.fFogEnd; - if( Global::fFogEnd > 0.0 ) { + if( Global.fFogEnd > 0.0 ) { // fog colour; optional legacy parameter, no longer used Input.getTokens( 3 ); } @@ -164,7 +166,7 @@ state_manager::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad std::string token { Input.getToken() }; if( token != "endatmo" ) { // optional overcast parameter - Global::Overcast = clamp( std::stof( token ), 0.f, 2.f ); + Global.Overcast = clamp( std::stof( token ), 0.f, 2.f ); } while( ( false == token.empty() ) && ( token != "endatmo" ) ) { @@ -194,15 +196,15 @@ state_manager::deserialize_camera( cParser &Input, scene::scratch_data &Scratchp } } while( token.compare( "endcamera" ) != 0 ); if( into < 0 ) - into = ++Global::iCameraLast; + into = ++Global.iCameraLast; if( into < 10 ) { // przepisanie do odpowiedniego miejsca w tabelce - Global::FreeCameraInit[ into ] = xyz; - Global::FreeCameraInitAngle[ into ] = + Global.FreeCameraInit[ into ] = xyz; + Global.FreeCameraInitAngle[ into ] = Math3D::vector3( glm::radians( abc.x ), glm::radians( abc.y ), glm::radians( abc.z ) ); - Global::iCameraLast = into; // numer ostatniej + Global.iCameraLast = into; // numer ostatniej } /* // cleaned up version of the above. @@ -231,7 +233,7 @@ void state_manager::deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ) { // config parameters (re)definition - Global::ConfigParse( Input ); + Global.ConfigParse( Input ); } void @@ -511,7 +513,7 @@ state_manager::deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad // sky model Input.getTokens( 1 ); Input - >> Global::asSky; + >> Global.asSky; // anything else left in the section has no defined meaning skip_until( Input, "endsky" ); } @@ -627,7 +629,7 @@ state_manager::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad TTraction * state_manager::deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - if( false == Global::bLoadTraction ) { + if( false == Global.bLoadTraction ) { skip_until( Input, "endtraction" ); return nullptr; } @@ -645,7 +647,7 @@ state_manager::deserialize_traction( cParser &Input, scene::scratch_data &Scratc TTractionPowerSource * state_manager::deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - if( false == Global::bLoadTraction ) { + if( false == Global.bLoadTraction ) { skip_until( Input, "end" ); return nullptr; } diff --git a/sky.cpp b/sky.cpp index 7d6ee679..42a57cac 100644 --- a/sky.cpp +++ b/sky.cpp @@ -17,10 +17,10 @@ http://mozilla.org/MPL/2.0/. void TSky::Init() { - if( ( Global::asSky != "1" ) - && ( Global::asSky != "0" ) ) { + if( ( Global.asSky != "1" ) + && ( Global.asSky != "0" ) ) { - mdCloud = TModelsManager::GetModel( Global::asSky ); + mdCloud = TModelsManager::GetModel( Global.asSky ); } }; diff --git a/sky.h b/sky.h index ca48434e..a2e8b76f 100644 --- a/sky.h +++ b/sky.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "Model3d.h" +#include "classes.h" class TSky { diff --git a/skydome.cpp b/skydome.cpp index 984e1e19..18b90505 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -2,7 +2,7 @@ #include "stdafx.h" #include "skydome.h" #include "color.h" -#include "usefull.h" +#include "utilities.h" // sky gradient based on "A practical analytic model for daylight" // by A. J. Preetham Peter Shirley Brian Smits (University of Utah) @@ -283,9 +283,9 @@ void CSkyDome::RebuildColors() { float const Z = ((1.0f - x - y) / y) * Y; colorconverter = glm::vec3( X, Y, Z ); - color = XYZtoRGB( colorconverter ); + color = colors::XYZtoRGB( colorconverter ); - colorconverter = RGBtoHSV(color); + colorconverter = colors::RGBtoHSV(color); if ( m_linearexpcontrol ) { // linear scale colorconverter.z *= m_expfactor; @@ -309,9 +309,9 @@ void CSkyDome::RebuildColors() { float const shiftfactor = clamp( interpolate(heightbasedphase, sunbasedphase, sunbasedphase), 0.0f, 1.0f ); // h = 210 makes for 'typical' sky tone shiftedcolor = glm::vec3( 210.0f, colorconverter.y, colorconverter.z ); - shiftedcolor = HSVtoRGB( shiftedcolor ); + shiftedcolor = colors::HSVtoRGB( shiftedcolor ); - color = HSVtoRGB(colorconverter); + color = colors::HSVtoRGB(colorconverter); color = interpolate( color, shiftedcolor, shiftfactor ); /* diff --git a/sound.cpp b/sound.cpp index c101e1d9..c74af434 100644 --- a/sound.cpp +++ b/sound.cpp @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "world.h" #include "train.h" +#include "dynobj.h" // constructors sound_source::sound_source( sound_placement const Placement, float const Range ) : @@ -154,7 +155,7 @@ sound_source::deserialize_filename( cParser &Input ) { filenames.emplace_back( token ); } if( false == filenames.empty() ) { - std::shuffle( std::begin( filenames ), std::end( filenames ), Global::random_engine ); + std::shuffle( std::begin( filenames ), std::end( filenames ), Global.random_engine ); return filenames.front(); } else { @@ -279,7 +280,7 @@ sound_source::deserialize_soundset( cParser &Input ) { soundsets.emplace_back( token ); } if( false == soundsets.empty() ) { - std::shuffle( std::begin( soundsets ), std::end( soundsets ), Global::random_engine ); + std::shuffle( std::begin( soundsets ), std::end( soundsets ), Global.random_engine ); return deserialize_soundset( cParser( soundsets.front() ) ); } } @@ -300,7 +301,7 @@ sound_source::copy_sounds( sound_source const &Source ) { void sound_source::play( int const Flags ) { - if( ( false == Global::bSoundEnabled ) + if( ( false == Global.bSoundEnabled ) || ( true == empty() ) ) { // if the sound is disabled altogether or nothing can be emitted from this source, no point wasting time return; @@ -311,7 +312,7 @@ sound_source::play( int const Flags ) { if( m_range > 0 ) { auto const cutoffrange { m_range * 5 }; - if( glm::length2( location() - glm::dvec3 { Global::pCameraPosition } ) > std::min( 2750.f * 2750.f, cutoffrange * cutoffrange ) ) { + if( glm::length2( location() - glm::dvec3 { Global.pCameraPosition } ) > std::min( 2750.f * 2750.f, cutoffrange * cutoffrange ) ) { // while we drop sounds from beyond sensible and/or audible range // we act as if it was activated normally, meaning no need to include the opening bookend in subsequent calls m_playbeginning = false; @@ -825,17 +826,17 @@ sound_source::update_soundproofing() { // NOTE, HACK: current cab id can vary from -1 to +1, and we use another higher priority value for open cab window // we use this as modifier to force re-calculations when moving between compartments or changing window state int const activecab = ( - Global::CabWindowOpen ? 2 : + Global.CabWindowOpen ? 2 : FreeFlyModeFlag ? 0 : - ( Global::pWorld->train() ? - Global::pWorld->train()->Dynamic()->MoverParameters->ActiveCab : + ( Global.pWorld->train() ? + Global.pWorld->train()->Dynamic()->MoverParameters->ActiveCab : 0 ) ); // location-based gain factor: std::uintptr_t soundproofingstamp = reinterpret_cast( ( FreeFlyModeFlag ? nullptr : - ( Global::pWorld->train() ? - Global::pWorld->train()->Dynamic() : + ( Global.pWorld->train() ? + Global.pWorld->train()->Dynamic() : nullptr ) ) ) + activecab; @@ -849,7 +850,7 @@ sound_source::update_soundproofing() { } case sound_placement::external: { m_properties.soundproofing = ( - ( ( soundproofingstamp == 0 ) || ( true == Global::CabWindowOpen ) ) ? + ( ( soundproofingstamp == 0 ) || ( true == Global.CabWindowOpen ) ) ? EU07_SOUNDPROOFING_NONE : // listener outside or has a window open EU07_SOUNDPROOFING_STRONG ); // listener in a vehicle with windows shut break; @@ -858,7 +859,7 @@ sound_source::update_soundproofing() { m_properties.soundproofing = ( soundproofingstamp == 0 ? EU07_SOUNDPROOFING_STRONG : // listener outside HACK: won't be true if active vehicle has open window - ( Global::pWorld->train()->Dynamic() != m_owner ? + ( Global.pWorld->train()->Dynamic() != m_owner ? EU07_SOUNDPROOFING_STRONG : // in another vehicle ( activecab == 0 ? EU07_SOUNDPROOFING_STRONG : // listener in the engine compartment @@ -867,9 +868,9 @@ sound_source::update_soundproofing() { } case sound_placement::engine: { m_properties.soundproofing = ( - ( ( soundproofingstamp == 0 ) || ( true == Global::CabWindowOpen ) ) ? + ( ( soundproofingstamp == 0 ) || ( true == Global.CabWindowOpen ) ) ? EU07_SOUNDPROOFING_SOME : // listener outside or has a window open - ( Global::pWorld->train()->Dynamic() != m_owner ? + ( Global.pWorld->train()->Dynamic() != m_owner ? EU07_SOUNDPROOFING_STRONG : // in another vehicle ( activecab == 0 ? EU07_SOUNDPROOFING_NONE : // listener in the engine compartment diff --git a/stars.h b/stars.h index 7541bf77..5619a0c1 100644 --- a/stars.h +++ b/stars.h @@ -1,6 +1,6 @@ #pragma once -#include "Model3d.h" +#include "classes.h" ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/sun.cpp b/sun.cpp index 9e744635..5fdbabeb 100644 --- a/sun.cpp +++ b/sun.cpp @@ -3,7 +3,7 @@ #include "sun.h" #include "globals.h" #include "mtable.h" -#include "usefull.h" +#include "utilities.h" #include "world.h" ////////////////////////////////////////////////////////////////////////////////////////// @@ -50,7 +50,7 @@ void cSun::update() { move(); - glm::vec3 position( 0.f, 0.f, -2000.f * Global::fDistanceFactor ); + glm::vec3 position( 0.f, 0.f, -2000.f * Global.fDistanceFactor ); position = glm::rotateX( position, glm::radians( static_cast( m_body.elevref ) ) ); position = glm::rotateY( position, glm::radians( static_cast( -m_body.hrang ) ) ); diff --git a/uilayer.cpp b/uilayer.cpp index cf1f0fbc..c8711db2 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -3,7 +3,7 @@ #include "stdafx.h" #include "uilayer.h" #include "globals.h" -#include "usefull.h" +#include "utilities.h" #include "renderer.h" #include "logs.h" @@ -33,14 +33,14 @@ ui_layer::init( GLFWwindow *Window ) { 0, // width of font 0, // angle of escapement 0, // orientation angle - (Global::bGlutFont ? FW_MEDIUM : FW_HEAVY), // font weight + (Global.bGlutFont ? FW_MEDIUM : FW_HEAVY), // font weight FALSE, // italic FALSE, // underline FALSE, // strikeout DEFAULT_CHARSET, // character set identifier OUT_DEFAULT_PRECIS, // output precision CLIP_DEFAULT_PRECIS, // clipping precision - (Global::bGlutFont ? CLEARTYPE_QUALITY : PROOF_QUALITY), // output quality + (Global.bGlutFont ? CLEARTYPE_QUALITY : PROOF_QUALITY), // output quality DEFAULT_PITCH | FF_DONTCARE, // family and pitch "Lucida Console"); // font name ::SelectObject(hDC, font); // selects the font we want @@ -48,14 +48,14 @@ ui_layer::init( GLFWwindow *Window ) { // builds 96 characters starting at character 32 WriteLog( "Display Lists font used" ); //+AnsiString(glGetError()) WriteLog( "Font init OK" ); //+AnsiString(glGetError()) - Global::DLFont = true; + Global.DLFont = true; return true; } else { ErrorLog( "Font init failed" ); // return false; // NOTE: we report success anyway, given some cards can't produce fonts in this manner - Global::DLFont = false; + Global.DLFont = false; return true; } } @@ -65,7 +65,7 @@ ui_layer::render() { glMatrixMode(GL_PROJECTION); glLoadIdentity(); - glOrtho( 0, std::max( 1, Global::iWindowWidth ), std::max( 1, Global::iWindowHeight ), 0, -1, 1 ); + glOrtho( 0, std::max( 1, Global.iWindowWidth ), std::max( 1, Global.iWindowHeight ), 0, -1, 1 ); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -141,15 +141,15 @@ ui_layer::render_progress() { } if( false == m_progresstext.empty() ) { - float const screenratio = static_cast( Global::iWindowWidth ) / Global::iWindowHeight; + float const screenratio = static_cast( Global.iWindowWidth ) / Global.iWindowHeight; float const width = ( screenratio >= (4.0f/3.0f) ? - ( 4.0f / 3.0f ) * Global::iWindowHeight : - Global::iWindowWidth ); + ( 4.0f / 3.0f ) * Global.iWindowHeight : + Global.iWindowWidth ); float const heightratio = ( screenratio >= ( 4.0f / 3.0f ) ? - Global::iWindowHeight / 768.f : - Global::iWindowHeight / 768.f * screenratio / ( 4.0f / 3.0f ) ); + Global.iWindowHeight / 768.f : + Global.iWindowHeight / 768.f * screenratio / ( 4.0f / 3.0f ) ); float const height = 768.0f * heightratio; ::glColor4f( 216.0f / 255.0f, 216.0f / 255.0f, 216.0f / 255.0f, 1.0f ); @@ -157,8 +157,8 @@ ui_layer::render_progress() { auto const textwidth = m_progresstext.size() * charsize; auto const textheight = 12.0f; ::glRasterPos2f( - ( 0.5f * ( Global::iWindowWidth - width ) + origin.x * heightratio ) + ( ( size.x * heightratio - textwidth ) * 0.5f * heightratio ), - ( 0.5f * ( Global::iWindowHeight - height ) + origin.y * heightratio ) + ( charsize ) + ( ( size.y * heightratio - textheight ) * 0.5f * heightratio ) ); + ( 0.5f * ( Global.iWindowWidth - width ) + origin.x * heightratio ) + ( ( size.x * heightratio - textwidth ) * 0.5f * heightratio ), + ( 0.5f * ( Global.iWindowHeight - height ) + origin.y * heightratio ) + ( charsize ) + ( ( size.y * heightratio - textheight ) * 0.5f * heightratio ) ); print( m_progresstext ); } @@ -173,8 +173,8 @@ ui_layer::render_panels() { glPushAttrib( GL_ENABLE_BIT ); glDisable( GL_TEXTURE_2D ); - float const width = std::min( 4.f / 3.f, static_cast(Global::iWindowWidth) / std::max( 1, Global::iWindowHeight ) ) * Global::iWindowHeight; - float const height = Global::iWindowHeight / 768.f; + float const width = std::min( 4.f / 3.f, static_cast(Global.iWindowWidth) / std::max( 1, Global.iWindowHeight ) ) * Global.iWindowHeight; + float const height = Global.iWindowHeight / 768.f; for( auto const &panel : m_panels ) { @@ -183,7 +183,7 @@ ui_layer::render_panels() { ::glColor4fv( &line.color.x ); ::glRasterPos2f( - 0.5f * ( Global::iWindowWidth - width ) + panel->origin_x * height, + 0.5f * ( Global.iWindowWidth - width ) + panel->origin_x * height, panel->origin_y * height + 20.f * lineidx ); print( line.data ); ++lineidx; @@ -247,10 +247,10 @@ ui_layer::render_texture() { glBegin( GL_TRIANGLE_STRIP ); - glMultiTexCoord2f( m_textureunit, 0.f, 1.f ); glVertex2f( offset, Global::iWindowHeight - offset - size ); - glMultiTexCoord2f( m_textureunit, 0.f, 0.f ); glVertex2f( offset, Global::iWindowHeight - offset ); - glMultiTexCoord2f( m_textureunit, 1.f, 1.f ); glVertex2f( offset + size, Global::iWindowHeight - offset - size ); - glMultiTexCoord2f( m_textureunit, 1.f, 0.f ); glVertex2f( offset + size, Global::iWindowHeight - offset ); + glMultiTexCoord2f( m_textureunit, 0.f, 1.f ); glVertex2f( offset, Global.iWindowHeight - offset - size ); + glMultiTexCoord2f( m_textureunit, 0.f, 0.f ); glVertex2f( offset, Global.iWindowHeight - offset ); + glMultiTexCoord2f( m_textureunit, 1.f, 1.f ); glVertex2f( offset + size, Global.iWindowHeight - offset - size ); + glMultiTexCoord2f( m_textureunit, 1.f, 0.f ); glVertex2f( offset + size, Global.iWindowHeight - offset ); glEnd(); @@ -263,7 +263,7 @@ ui_layer::render_texture() { void ui_layer::print( std::string const &Text ) { - if( (false == Global::DLFont) + if( (false == Global.DLFont) || (true == Text.empty()) ) return; @@ -278,29 +278,29 @@ ui_layer::print( std::string const &Text ) void ui_layer::quad( float4 const &Coordinates, float4 const &Color ) { - float const screenratio = static_cast( Global::iWindowWidth ) / Global::iWindowHeight; + float const screenratio = static_cast( Global.iWindowWidth ) / Global.iWindowHeight; float const width = ( screenratio >= ( 4.f / 3.f ) ? - ( 4.f / 3.f ) * Global::iWindowHeight : - Global::iWindowWidth ); + ( 4.f / 3.f ) * Global.iWindowHeight : + Global.iWindowWidth ); float const heightratio = ( screenratio >= ( 4.f / 3.f ) ? - Global::iWindowHeight / 768.f : - Global::iWindowHeight / 768.f * screenratio / ( 4.f / 3.f ) ); + Global.iWindowHeight / 768.f : + Global.iWindowHeight / 768.f * screenratio / ( 4.f / 3.f ) ); float const height = 768.f * heightratio; /* - float const heightratio = Global::iWindowHeight / 768.0f; + float const heightratio = Global.iWindowHeight / 768.0f; float const height = 768.0f * heightratio; - float const width = Global::iWindowWidth * heightratio; + float const width = Global.iWindowWidth * heightratio; */ glColor4fv(&Color.x); glBegin( GL_TRIANGLE_STRIP ); - glMultiTexCoord2f( m_textureunit, 0.f, 1.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); - glMultiTexCoord2f( m_textureunit, 0.f, 0.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); - glMultiTexCoord2f( m_textureunit, 1.f, 1.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.y * heightratio ); - glMultiTexCoord2f( m_textureunit, 1.f, 0.f ); glVertex2f( 0.5f * ( Global::iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global::iWindowHeight - height ) + Coordinates.w * heightratio ); + glMultiTexCoord2f( m_textureunit, 0.f, 1.f ); glVertex2f( 0.5f * ( Global.iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global.iWindowHeight - height ) + Coordinates.y * heightratio ); + glMultiTexCoord2f( m_textureunit, 0.f, 0.f ); glVertex2f( 0.5f * ( Global.iWindowWidth - width ) + Coordinates.x * heightratio, 0.5f * ( Global.iWindowHeight - height ) + Coordinates.w * heightratio ); + glMultiTexCoord2f( m_textureunit, 1.f, 1.f ); glVertex2f( 0.5f * ( Global.iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global.iWindowHeight - height ) + Coordinates.y * heightratio ); + glMultiTexCoord2f( m_textureunit, 1.f, 0.f ); glVertex2f( 0.5f * ( Global.iWindowWidth - width ) + Coordinates.z * heightratio, 0.5f * ( Global.iWindowHeight - height ) + Coordinates.w * heightratio ); glEnd(); } diff --git a/uitranscripts.cpp b/uitranscripts.cpp new file mode 100644 index 00000000..73797b2b --- /dev/null +++ b/uitranscripts.cpp @@ -0,0 +1,79 @@ + + +#include "stdafx.h" +#include "uitranscripts.h" + +#include "globals.h" +#include "parser.h" +#include "utilities.h" + +namespace ui { + +TTranscripts Transcripts; + +// dodanie linii do tabeli, (show) i (hide) w [s] od aktualnego czasu +void +TTranscripts::AddLine( std::string const &txt, float show, float hide, bool it ) { + + if( show == hide ) { return; } // komentarz jest ignorowany + + show = Global.fTimeAngleDeg + show / 240.0; // jeśli doba to 360, to 1s będzie równe 1/240 + hide = Global.fTimeAngleDeg + hide / 240.0; + + TTranscript transcript; + transcript.asText = txt; + transcript.fShow = show; + transcript.fHide = hide; + transcript.bItalic = it; + aLines.emplace_back( transcript ); + // set the next refresh time while at it + // TODO, TBD: sort the transcript lines? in theory, they should be coming arranged in the right order anyway + // short of cases with multiple sounds overleaping + fRefreshTime = aLines.front().fHide; +} + +// dodanie tekstów, długość dźwięku, czy istotne +void +TTranscripts::Add( std::string const &txt, bool backgorund ) { + + if( true == txt.empty() ) { return; } + + std::string asciitext{ txt }; win1250_to_ascii( asciitext ); // TODO: launch relevant conversion table based on language + cParser parser( asciitext ); + while( true == parser.getTokens( 3, false, "[]\n" ) ) { + + float begin, end; + std::string transcript; + parser + >> begin + >> end + >> transcript; + AddLine( transcript, 0.10 * begin, 0.12 * end, false ); + } + // try to handle malformed(?) cases with no show/hide times + std::string transcript; parser >> transcript; + while( false == transcript.empty() ) { + + // WriteLog( "Transcript text with no display/hide times: \"" + transcript + "\"" ); + AddLine( transcript, 0.0, 0.12 * transcript.size(), false ); + transcript = ""; parser >> transcript; + } +} + +// usuwanie niepotrzebnych (nie częściej niż 10 razy na sekundę) +void +TTranscripts::Update() { + + if( Global.fTimeAngleDeg < fRefreshTime ) { return; } // nie czas jeszcze na zmiany + + while( ( false == aLines.empty() ) + && ( Global.fTimeAngleDeg >= aLines.front().fHide ) ) { + // remove expired lines + aLines.pop_front(); + } + // update next refresh time + if( false == aLines.empty() ) { fRefreshTime = aLines.front().fHide; } + else { fRefreshTime = 360.0f; } +} + +} // namespace ui diff --git a/uitranscripts.h b/uitranscripts.h new file mode 100644 index 00000000..56c27f08 --- /dev/null +++ b/uitranscripts.h @@ -0,0 +1,40 @@ + +#pragma once + +#include +#include + +namespace ui { + +// klasa obsługująca linijkę napisu do dźwięku +struct TTranscript { + + float fShow; // czas pokazania + float fHide; // czas ukrycia/usunięcia + std::string asText; // tekst gotowy do wyświetlenia (usunięte znaczniki czasu) + bool bItalic; // czy kursywa (dźwięk nieistotny dla prowadzącego) +}; + +// klasa obsługująca napisy do dźwięków +class TTranscripts { + +public: +// methods + void AddLine( std::string const &txt, float show, float hide, bool it ); + // dodanie tekstów, długość dźwięku, czy istotne + void Add( std::string const &txt, bool background = false ); + // usuwanie niepotrzebnych (ok. 10 razy na sekundę) + void Update(); + +// members + std::deque aLines; + +private: +// members + float fRefreshTime { 360 }; // wartośc zaporowa + +}; + +extern TTranscripts Transcripts; + +} // namespace ui \ No newline at end of file diff --git a/usefull.h b/usefull.h deleted file mode 100644 index 4f2594b3..00000000 --- a/usefull.h +++ /dev/null @@ -1,117 +0,0 @@ -/* -This Source Code Form is subject to the -terms of the Mozilla Public License, v. -2.0. If a copy of the MPL was not -distributed with this file, You can -obtain one at -http://mozilla.org/MPL/2.0/. -*/ - -#pragma once - -#include "stdafx.h" - -#define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0)) - -#define DegToRad(a) ((M_PI / 180.0) * (a)) //(a) w nawiasie, bo może być dodawaniem -#define RadToDeg(r) ((180.0 / M_PI) * (r)) - -#define asModelsPath std::string("models\\") -#define asSceneryPath std::string("scenery\\") -#define szSceneryPath "scenery\\" -#define szTexturePath "textures\\" -#define szSoundPath "sounds\\" - -#define MAKE_ID4(a,b,c,d) (((std::uint32_t)(d)<<24)|((std::uint32_t)(c)<<16)|((std::uint32_t)(b)<<8)|(std::uint32_t)(a)) - -template -void SafeDelete( Type_ &Pointer ) { - delete Pointer; - Pointer = nullptr; -} - -template -void SafeDeleteArray( Type_ &Pointer ) { - delete[] Pointer; - Pointer = nullptr; -} - -template -Type_ -clamp( Type_ const Value, Type_ const Min, Type_ const Max ) { - - Type_ value = Value; - if( value < Min ) { value = Min; } - if( value > Max ) { value = Max; } - return value; -} - -// keeps the provided value in specified range 0-Range, as if the range was circular buffer -template -Type_ -clamp_circular( Type_ Value, Type_ const Range = static_cast(360) ) { - - Value -= Range * (int)( Value / Range ); // clamp the range to 0-360 - if( Value < Type_(0) ) Value += Range; - - return Value; -} - -template -Type_ -interpolate( Type_ const &First, Type_ const &Second, float const Factor ) { - - return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); -} - -template -Type_ -interpolate( Type_ const &First, Type_ const &Second, double const Factor ) { - - return ( First * ( 1.0 - Factor ) ) + ( Second * Factor ); -} - -// tests whether provided points form a degenerate triangle -template -bool -degenerate( VecType_ const &Vertex1, VecType_ const &Vertex2, VecType_ const &Vertex3 ) { - - // degenerate( A, B, C, minarea ) = ( ( B - A ).cross( C - A ) ).lengthSquared() < ( 4.0f * minarea * minarea ); - return ( glm::length2( glm::cross( Vertex2 - Vertex1, Vertex3 - Vertex1 ) ) == 0.0 ); -} - -// calculates bounding box for provided set of points -template -void -bounding_box( VecType_ &Mincorner, VecType_ &Maxcorner, Iterator_ First, Iterator_ Last ) { - - Mincorner = VecType_( typename std::numeric_limits::max() ); - Maxcorner = VecType_( typename std::numeric_limits::lowest() ); - - std::for_each( - First, Last, - [&]( typename Iterator_::value_type &point ) { - Mincorner = glm::min( Mincorner, VecType_{ point } ); - Maxcorner = glm::max( Maxcorner, VecType_{ point } ); } ); -} - -// finds point on specified segment closest to specified point in 3d space. returns: point on segment as value in range 0-1 where 0 = start and 1 = end of the segment -template -typename VecType_::value_type -nearest_segment_point( VecType_ const &Segmentstart, VecType_ const &Segmentend, VecType_ const &Point ) { - - auto const v = Segmentend - Segmentstart; - auto const w = Point - Segmentstart; - - auto const c1 = glm::dot( w, v ); - if( c1 <= 0.0 ) { - return 0.0; - } - auto const c2 = glm::dot( v, v ); - if( c2 <= c1 ) { - return 1.0; - } - return c1 / c2; -} - -//--------------------------------------------------------------------------- diff --git a/utilities.cpp b/utilities.cpp new file mode 100644 index 00000000..d515fb43 --- /dev/null +++ b/utilities.cpp @@ -0,0 +1,320 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ +/* +MaSzyna EU07 - SPKS +Brakes. +Copyright (C) 2007-2014 Maciej Cierniak +*/ +#include "stdafx.h" + +#include +#include +#ifndef WIN32 +#include +#endif + +#ifdef WIN32 +#define stat _stat +#endif + +#include "utilities.h" +#include "globals.h" + +bool DebugModeFlag = false; +bool FreeFlyModeFlag = false; +bool EditorModeFlag = true; +bool DebugCameraFlag = false; + +double Max0R(double x1, double x2) +{ + if (x1 > x2) + return x1; + else + return x2; +} + +double Min0R(double x1, double x2) +{ + if (x1 < x2) + return x1; + else + return x2; +} + +// shitty replacement for Borland timestamp function +// TODO: replace with something sensible +std::string Now() { + + std::time_t timenow = std::time( nullptr ); + std::tm tm = *std::localtime( &timenow ); + std::stringstream converter; + converter << std::put_time( &tm, "%c" ); + return converter.str(); +} + +bool SetFlag( int &Flag, int const Value ) { + + if( Value > 0 ) { + if( false == TestFlag( Flag, Value ) ) { + Flag |= Value; + return true; // true, gdy było wcześniej 0 i zostało ustawione + } + } + else if( Value < 0 ) { + // Value jest ujemne, czyli zerowanie flagi + return ClearFlag( Flag, -Value ); + } + return false; +} + +bool ClearFlag( int &Flag, int const Value ) { + + if( true == TestFlag( Flag, Value ) ) { + Flag &= ~Value; + return true; + } + else { + return false; + } +} + +inline double Random(double a, double b) +{ + std::uniform_real_distribution<> dis(a, b); + return dis(Global.random_engine); +} + +bool FuzzyLogic(double Test, double Threshold, double Probability) +{ + if ((Test > Threshold) && (!DebugModeFlag)) + return + (Random() < Probability * Threshold * 1.0 / Test) /*im wiekszy Test tym wieksza szansa*/; + else + return false; +} + +bool FuzzyLogicAI(double Test, double Threshold, double Probability) +{ + if ((Test > Threshold)) + return + (Random() < Probability * Threshold * 1.0 / Test) /*im wiekszy Test tym wieksza szansa*/; + else + return false; +} + +std::string DUE(std::string s) /*Delete Before Equal sign*/ +{ + //DUE = Copy(s, Pos("=", s) + 1, length(s)); + return s.substr(s.find("=") + 1, s.length()); +} + +std::string DWE(std::string s) /*Delete After Equal sign*/ +{ + size_t ep = s.find("="); + if (ep != std::string::npos) + //DWE = Copy(s, 1, ep - 1); + return s.substr(0, ep); + else + return s; +} + +std::string ExchangeCharInString( std::string const &Source, char const From, char const To ) +{ + std::string replacement; replacement.reserve( Source.size() ); + std::for_each( + std::begin( Source ), std::end( Source ), + [&](char const idx) { + if( idx != From ) { replacement += idx; } + else { replacement += To; } } ); + + return replacement; +} + +std::vector &Split(const std::string &s, char delim, std::vector &elems) +{ // dzieli tekst na wektor tekstow + + std::stringstream ss(s); + std::string item; + while (std::getline(ss, item, delim)) + { + elems.push_back(item); + } + return elems; +} + +std::vector Split(const std::string &s, char delim) +{ // dzieli tekst na wektor tekstow + std::vector elems; + Split(s, delim, elems); + return elems; +} + +std::vector Split(const std::string &s) +{ // dzieli tekst na wektor tekstow po białych znakach + std::vector elems; + std::stringstream ss(s); + std::string item; + while (ss >> item) + { + elems.push_back(item); + } + return elems; +} + +std::string to_string(int _Val) +{ + std::ostringstream o; + o << _Val; + return o.str(); +}; + +std::string to_string(unsigned int _Val) +{ + std::ostringstream o; + o << _Val; + return o.str(); +}; + +std::string to_string(double _Val) +{ + std::ostringstream o; + o << _Val; + return o.str(); +}; + +std::string to_string(int _Val, int precision) +{ + std::ostringstream o; + o << std::fixed << std::setprecision(precision); + o << _Val; + return o.str(); +}; + +std::string to_string(double _Val, int precision) +{ + std::ostringstream o; + o << std::fixed << std::setprecision(precision); + o << _Val; + return o.str(); +}; + +std::string to_string(int _Val, int precision, int width) +{ + std::ostringstream o; + o.width(width); + o << std::fixed << std::setprecision(precision); + o << _Val; + return o.str(); +}; + +std::string to_string(double const Value, int const Precision, int const Width) +{ + std::ostringstream converter; + converter << std::setw( Width ) << std::fixed << std::setprecision(Precision) << Value; + return converter.str(); +}; + +std::string to_hex_str( int const Value, int const Width ) +{ + std::ostringstream converter; + converter << "0x" << std::uppercase << std::setfill( '0' ) << std::setw( Width ) << std::hex << Value; + return converter.str(); +}; + +int stol_def(const std::string &str, const int &DefaultValue) { + + int result { DefaultValue }; + std::stringstream converter; + converter << str; + converter >> result; + return result; +} + +std::string ToLower(std::string const &text) +{ + std::string lowercase( text ); + std::transform(text.begin(), text.end(), lowercase.begin(), ::tolower); + return lowercase; +} + +std::string ToUpper(std::string const &text) +{ + std::string uppercase( text ); + std::transform(text.begin(), text.end(), uppercase.begin(), ::toupper); + return uppercase; +} + +// replaces polish letters with basic ascii +void +win1250_to_ascii( std::string &Input ) { + + std::unordered_map charmap{ + { 165, 'A' }, { 198, 'C' }, { 202, 'E' }, { 163, 'L' }, { 209, 'N' }, { 211, 'O' }, { 140, 'S' }, { 143, 'Z' }, { 175, 'Z' }, + { 185, 'a' }, { 230, 'c' }, { 234, 'e' }, { 179, 'l' }, { 241, 'n' }, { 243, 'o' }, { 156, 's' }, { 159, 'z' }, { 191, 'z' } + }; + std::unordered_map::const_iterator lookup; + for( auto &input : Input ) { + if( ( lookup = charmap.find( input ) ) != charmap.end() ) + input = lookup->second; + } +} + +// Ra: tymczasowe rozwiązanie kwestii zagranicznych (czeskich) napisów +char bezogonkowo[] = "E?,?\"_++?%Sstzz" + " ^^L$A|S^CS<--RZo±,l'uP.,as>L\"lz" + "RAAAALCCCEEEEIIDDNNOOOOxRUUUUYTB" + "raaaalccceeeeiiddnnoooo-ruuuuyt?"; + +std::string Bezogonkow(std::string str, bool _) +{ // wycięcie liter z ogonkami, bo OpenGL nie umie wyświetlić + for (unsigned int i = 1; i < str.length(); ++i) + if (str[i] & 0x80) + str[i] = bezogonkowo[str[i] & 0x7F]; + else if (str[i] < ' ') // znaki sterujące nie są obsługiwane + str[i] = ' '; + else if (_) + if (str[i] == '_') // nazwy stacji nie mogą zawierać spacji + str[i] = ' '; // więc trzeba wyświetlać inaczej + return str; +}; + +template <> +bool +extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { + + auto value = extract_value( Key, Input ); + if( false == value.empty() ) { + // set the specified variable to retrieved value + Variable = ( ToLower( value ) == "yes" ); + return true; // located the variable + } + else { + // set the variable to provided default value + if( false == Default.empty() ) { + Variable = ( ToLower( Default ) == "yes" ); + } + return false; // couldn't locate the variable in provided input + } +} + +bool +FileExists( std::string const &Filename ) { + + std::ifstream file( Filename ); + return( true == file.is_open() ); +} + +// returns time of last modification for specified file +std::time_t +last_modified( std::string const &Filename ) { + + struct stat filestat; + if( ::stat( Filename.c_str(), &filestat ) == 0 ) { return filestat.st_mtime; } + else { return 0; } +} diff --git a/utilities.h b/utilities.h new file mode 100644 index 00000000..a9501fca --- /dev/null +++ b/utilities.h @@ -0,0 +1,286 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "stdafx.h" + +#include +#include +#include +#include +#include + +/*rozne takie duperele do operacji na stringach w paszczalu, pewnie w delfi sa lepsze*/ +/*konwersja zmiennych na stringi, funkcje matematyczne, logiczne, lancuchowe, I/O etc*/ + +#define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0)) + +#define DegToRad(a) ((M_PI / 180.0) * (a)) //(a) w nawiasie, bo może być dodawaniem +#define RadToDeg(r) ((180.0 / M_PI) * (r)) + +#define asModelsPath std::string("models\\") +#define asSceneryPath std::string("scenery\\") +#define szSceneryPath "scenery\\" +#define szTexturePath "textures\\" +#define szSoundPath "sounds\\" + +#define MAKE_ID4(a,b,c,d) (((std::uint32_t)(d)<<24)|((std::uint32_t)(c)<<16)|((std::uint32_t)(b)<<8)|(std::uint32_t)(a)) + +extern bool DebugModeFlag; +extern bool FreeFlyModeFlag; +extern bool EditorModeFlag; +extern bool DebugCameraFlag; + +/*funkcje matematyczne*/ +double Max0R(double x1, double x2); +double Min0R(double x1, double x2); + +inline double Sign(double x) +{ + return x >= 0 ? 1.0 : -1.0; +} + +inline long Round(double const f) +{ + return (long)(f + 0.5); + //return lround(f); +} + +double Random(double a, double b); + +inline double Random() +{ + return Random(0.0,1.0); +} + +inline double Random(double b) +{ + return Random(0.0, b); +} + +inline double BorlandTime() +{ + auto timesinceepoch = std::time( nullptr ); + return timesinceepoch / (24.0 * 60 * 60); +/* + // std alternative + auto timesinceepoch = std::chrono::system_clock::now().time_since_epoch(); + return std::chrono::duration_cast( timesinceepoch ).count() / (24.0 * 60 * 60); +*/ +} + +std::string Now(); + +/*funkcje logiczne*/ +inline bool TestFlag( int const Flag, int const Value ) { return ( ( Flag & Value ) == Value ); } +bool SetFlag( int &Flag, int const Value); +bool ClearFlag(int &Flag, int const Value); + +bool FuzzyLogic(double Test, double Threshold, double Probability); +/*jesli Test>Threshold to losowanie*/ +bool FuzzyLogicAI(double Test, double Threshold, double Probability); +/*to samo ale zawsze niezaleznie od DebugFlag*/ + +/*operacje na stringach*/ +std::string DUE(std::string s); /*Delete Until Equal sign*/ +std::string DWE(std::string s); /*Delete While Equal sign*/ +std::string ExchangeCharInString( std::string const &Source, char const From, char const To ); // zamienia jeden znak na drugi +std::vector &Split(const std::string &s, char delim, std::vector &elems); +std::vector Split(const std::string &s, char delim); +//std::vector Split(const std::string &s); + +std::string to_string(int _Val); +std::string to_string(unsigned int _Val); +std::string to_string(int _Val, int precision); +std::string to_string(int _Val, int precision, int width); +std::string to_string(double _Val); +std::string to_string(double _Val, int precision); +std::string to_string(double _Val, int precision, int width); +std::string to_hex_str( int const _Val, int const width = 4 ); + +inline std::string to_string(bool _Val) { + + return _Val == true ? "true" : "false"; +} + +template +std::string to_string( glm::tvec3 const &Value ) { + return to_string( Value.x, 2 ) + ", " + to_string( Value.y, 2 ) + ", " + to_string( Value.z, 2 ); +} + +template +std::string to_string( glm::tvec4 const &Value, int const Width = 2 ) { + return to_string( Value.x, Width ) + ", " + to_string( Value.y, Width ) + ", " + to_string( Value.z, Width ) + ", " + to_string( Value.w, Width ); +} + +int stol_def(const std::string & str, const int & DefaultValue); + +std::string ToLower(std::string const &text); +std::string ToUpper(std::string const &text); + +// replaces polish letters with basic ascii +void win1250_to_ascii( std::string &Input ); +// TODO: unify with win1250_to_ascii() +std::string Bezogonkow( std::string str, bool _ = false ); + +inline +std::string +extract_value( std::string const &Key, std::string const &Input ) { + // NOTE, HACK: the leading space allows to uniformly look for " variable=" substring + std::string const input { " " + Input }; + std::string value; + auto lookup = input.find( " " + Key + "=" ); + if( lookup != std::string::npos ) { + value = input.substr( input.find_first_not_of( ' ', lookup + Key.size() + 2 ) ); + lookup = value.find( ' ' ); + if( lookup != std::string::npos ) { + // trim everything past the value + value.erase( lookup ); + } + } + return value; +} + +template +bool +extract_value( Type_ &Variable, std::string const &Key, std::string const &Input, std::string const &Default ) { + + auto value = extract_value( Key, Input ); + if( false == value.empty() ) { + // set the specified variable to retrieved value + std::stringstream converter; + converter << value; + converter >> Variable; + return true; // located the variable + } + else { + // set the variable to provided default value + if( false == Default.empty() ) { + std::stringstream converter; + converter << Default; + converter >> Variable; + } + return false; // couldn't locate the variable in provided input + } +} + +template <> +bool +extract_value( bool &Variable, std::string const &Key, std::string const &Input, std::string const &Default ); + +bool FileExists( std::string const &Filename ); + +// returns time of last modification for specified file +std::time_t last_modified( std::string const &Filename ); + +template +void SafeDelete( Type_ &Pointer ) { + delete Pointer; + Pointer = nullptr; +} + +template +void SafeDeleteArray( Type_ &Pointer ) { + delete[] Pointer; + Pointer = nullptr; +} + +template +Type_ +clamp( Type_ const Value, Type_ const Min, Type_ const Max ) { + + Type_ value = Value; + if( value < Min ) { value = Min; } + if( value > Max ) { value = Max; } + return value; +} + +// keeps the provided value in specified range 0-Range, as if the range was circular buffer +template +Type_ +clamp_circular( Type_ Value, Type_ const Range = static_cast(360) ) { + + Value -= Range * (int)( Value / Range ); // clamp the range to 0-360 + if( Value < Type_(0) ) Value += Range; + + return Value; +} + +template +Type_ +min_speed( Type_ const Left, Type_ const Right ) { + + return std::min( + ( Left != -1 ? + Left : + std::numeric_limits::max() ), + ( Right != -1 ? + Right : + std::numeric_limits::max() ) ); +} + +template +Type_ +interpolate( Type_ const &First, Type_ const &Second, float const Factor ) { + + return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); +} + +template +Type_ +interpolate( Type_ const &First, Type_ const &Second, double const Factor ) { + + return ( First * ( 1.0 - Factor ) ) + ( Second * Factor ); +} + +// tests whether provided points form a degenerate triangle +template +bool +degenerate( VecType_ const &Vertex1, VecType_ const &Vertex2, VecType_ const &Vertex3 ) { + + // degenerate( A, B, C, minarea ) = ( ( B - A ).cross( C - A ) ).lengthSquared() < ( 4.0f * minarea * minarea ); + return ( glm::length2( glm::cross( Vertex2 - Vertex1, Vertex3 - Vertex1 ) ) == 0.0 ); +} + +// calculates bounding box for provided set of points +template +void +bounding_box( VecType_ &Mincorner, VecType_ &Maxcorner, Iterator_ First, Iterator_ Last ) { + + Mincorner = VecType_( typename std::numeric_limits::max() ); + Maxcorner = VecType_( typename std::numeric_limits::lowest() ); + + std::for_each( + First, Last, + [&]( typename Iterator_::value_type &point ) { + Mincorner = glm::min( Mincorner, VecType_{ point } ); + Maxcorner = glm::max( Maxcorner, VecType_{ point } ); } ); +} + +// finds point on specified segment closest to specified point in 3d space. returns: point on segment as value in range 0-1 where 0 = start and 1 = end of the segment +template +typename VecType_::value_type +nearest_segment_point( VecType_ const &Segmentstart, VecType_ const &Segmentend, VecType_ const &Point ) { + + auto const v = Segmentend - Segmentstart; + auto const w = Point - Segmentstart; + + auto const c1 = glm::dot( w, v ); + if( c1 <= 0.0 ) { + return 0.0; + } + auto const c2 = glm::dot( v, v ); + if( c2 <= c1 ) { + return 1.0; + } + return c1 / c2; +} + +//--------------------------------------------------------------------------- diff --git a/vertex.h b/vertex.h index 0dcfbbb9..8ce99afa 100644 --- a/vertex.h +++ b/vertex.h @@ -10,7 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include -#include "usefull.h" +#include "utilities.h" // geometry vertex with double precision position struct world_vertex { diff --git a/windows.cpp b/windows.cpp index 28b46abc..5d9cef25 100644 --- a/windows.cpp +++ b/windows.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "World.h" -#include "usefull.h" +#include "utilities.h" #pragma warning (disable: 4091) #include From 1b655fac9b512f037ef2ba6fe79a8b0712c39b75 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 27 Jan 2018 16:05:19 +0100 Subject: [PATCH 264/426] build 180127. minor bug fixes --- Event.cpp | 6 ++- McZapkie/Mover.cpp | 7 +-- light.h | 2 +- renderer.cpp | 109 +++++++++++++++++++++++++-------------------- renderer.h | 2 +- version.h | 2 +- 6 files changed, 71 insertions(+), 57 deletions(-) diff --git a/Event.cpp b/Event.cpp index 1d0967dd..58d4002e 100644 --- a/Event.cpp +++ b/Event.cpp @@ -1011,7 +1011,7 @@ event_manager::CheckQuery() { } case tp_Visible: { if( m_workevent->Params[ 9 ].asEditorNode ) - m_workevent->Params[ 9 ].asEditorNode->visible( m_workevent->Params[ i ].asInt > 0 ); + m_workevent->Params[ 9 ].asEditorNode->visible( m_workevent->Params[ 0 ].asInt > 0 ); break; } case tp_Velocity: { @@ -1427,8 +1427,10 @@ event_manager::InitEvents() { } if( node != nullptr ) event->Params[ 9 ].asEditorNode = node; - else + else { + event->m_ignored = true; ErrorLog( "Bad event: visibility event \"" + event->asName + "\" cannot find item \"" + event->asNodeName + "\"" ); + } event->asNodeName = ""; break; } diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 051798d9..5fdba3de 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4259,19 +4259,20 @@ double TMoverParameters::TractionForce(double dt) } case 2: { // automatic + auto const motorcurrent{ std::min( ImaxHi, std::abs( Im ) ) }; if( ( std::abs( Itot ) > RVentMinI ) && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { RventRot += ( RVentnmax - * std::min( 1.0, ( ( Im / NPoweredAxles ) / RVentMinI ) ) - * Im / ImaxLo + * std::min( 1.0, ( ( motorcurrent / NPoweredAxles ) / RVentMinI ) ) + * motorcurrent / ImaxLo - RventRot ) * RVentSpeed * dt; } else if( ( DynamicBrakeType == dbrake_automatic ) && ( true == DynamicBrakeFlag ) ) { - RventRot += ( RVentnmax * Im / ImaxLo - RventRot ) * RVentSpeed * dt; + RventRot += ( RVentnmax * motorcurrent / ImaxLo - RventRot ) * RVentSpeed * dt; } else { RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); diff --git a/light.h b/light.h index 3eac437d..f3d68e5f 100644 --- a/light.h +++ b/light.h @@ -19,5 +19,5 @@ struct basic_light { glm::vec4 specular { colors::white }; glm::vec3 position; glm::vec3 direction; - bool is_omnidirectional { true }; + bool is_directional { true }; }; diff --git a/renderer.cpp b/renderer.cpp index 1d72f481..bc7f1d22 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -52,8 +52,10 @@ opengl_light::apply_intensity( float const Factor ) { void opengl_light::apply_angle() { - ::glLightfv( id, GL_POSITION, glm::value_ptr( position ) ); - ::glLightfv( id, GL_SPOT_DIRECTION, glm::value_ptr( glm::vec4{ direction, ( is_omnidirectional ? 1.f : 0.f ) } ) ); + ::glLightfv( id, GL_POSITION, glm::value_ptr( glm::vec4{ position, ( is_directional ? 0.f : 1.f ) } ) ); + if( false == is_directional ) { + ::glLightfv( id, GL_SPOT_DIRECTION, glm::value_ptr( direction ) ); + } } @@ -156,15 +158,15 @@ opengl_renderer::Init( GLFWwindow *Window ) { // setup lighting ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr(m_baseambient) ); ::glEnable( GL_LIGHTING ); - ::glEnable( GL_LIGHT0 ); + ::glEnable( opengl_renderer::sunlight ); - m_sunlight.id = opengl_renderer::sunlight; -// ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); - Global.DayLight.is_omnidirectional = true; // rgb value for 5780 kelvin Global.DayLight.diffuse[ 0 ] = 255.0f / 255.0f; Global.DayLight.diffuse[ 1 ] = 242.0f / 255.0f; Global.DayLight.diffuse[ 2 ] = 231.0f / 255.0f; + Global.DayLight.is_directional = true; + m_sunlight.id = opengl_renderer::sunlight; + // ::glLightf( opengl_renderer::sunlight, GL_SPOT_CUTOFF, 90.0f ); // create dynamic light pool for( int idx = 0; idx < Global.DynamicLightCount; ++idx ) { @@ -172,7 +174,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { opengl_light light; light.id = GL_LIGHT1 + idx; - light.is_omnidirectional = true; + light.is_directional = false; ::glLightf( light.id, GL_SPOT_CUTOFF, 7.5f ); ::glLightf( light.id, GL_SPOT_EXPONENT, 7.5f ); ::glLightf( light.id, GL_CONSTANT_ATTENUATION, 0.0f ); @@ -392,7 +394,9 @@ opengl_renderer::Render() { Timer::subsystem.gfx_total.stop(); Timer::subsystem.gfx_total.start(); // note: gfx_total is actually frame total, clean this up Timer::subsystem.gfx_color.start(); - + // fetch simulation data + m_sunlight = Global.DayLight; + // generate new frame m_renderpass.draw_mode = rendermode::none; // force setup anew m_debugtimestext.clear(); m_debugstats = debug_stats(); @@ -831,9 +835,9 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // ...cap the vertical angle to keep shadows from getting too long... auto const lightvector = glm::normalize( glm::vec3{ - Global.DayLight.direction.x, - std::min( Global.DayLight.direction.y, -0.2f ), - Global.DayLight.direction.z } ); + m_sunlight.direction.x, + std::min( m_sunlight.direction.y, -0.2f ), + m_sunlight.direction.z } ); // ...place the light source at the calculated centre and setup world space light view matrix... camera.position() = worldview.camera.position() + glm::dvec3{ frustumchunkcentre }; viewmatrix *= glm::lookAt( @@ -867,7 +871,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f -Global.shadowtune.width, Global.shadowtune.width, -Global.shadowtune.width, Global.shadowtune.width, -Global.shadowtune.depth, Global.shadowtune.depth ); - camera.position() = Global.pCameraPosition - glm::dvec3{ Global.DayLight.direction }; + camera.position() = Global.pCameraPosition - glm::dvec3{ m_sunlight.direction }; if( camera.position().y - Global.pCameraPosition.y < 0.1 ) { camera.position().y = Global.pCameraPosition.y + 0.1; } @@ -894,9 +898,9 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // modelview auto const lightvector = glm::normalize( glm::vec3{ - Global.DayLight.direction.x, - std::min( Global.DayLight.direction.y, -0.2f ), - Global.DayLight.direction.z } ); + m_sunlight.direction.x, + std::min( m_sunlight.direction.y, -0.2f ), + m_sunlight.direction.z } ); camera.position() = Global.pCameraPosition - glm::dvec3 { lightvector }; viewmatrix *= glm::lookAt( camera.position(), @@ -1335,28 +1339,26 @@ opengl_renderer::setup_shadow_color( glm::vec4 const &Shadowcolor ) { void opengl_renderer::setup_environment_light( TEnvironmentType const Environment ) { - if( m_environment == Environment ) { return; } - - switch( Environment ) { - case e_flat: { - m_sunlight.apply_intensity(); - m_environment = e_flat; - break; - } - case e_canyon: { - m_sunlight.apply_intensity( 0.4f ); - m_environment = Environment; - break; - } - case e_tunnel: { - m_sunlight.apply_intensity( 0.2f ); - m_environment = Environment; - break; - } - default: { - break; - } + switch( Environment ) { + case e_flat: { + m_sunlight.apply_intensity(); +// m_environment = Environment; + break; } + case e_canyon: { + m_sunlight.apply_intensity( 0.4f ); +// m_environment = Environment; + break; + } + case e_tunnel: { + m_sunlight.apply_intensity( 0.2f ); +// m_environment = Environment; + break; + } + default: { + break; + } + } } bool @@ -1637,7 +1639,6 @@ opengl_renderer::Render( scene::basic_region *Region ) { switch( m_renderpass.draw_mode ) { case rendermode::color: { - m_sunlight = Global.DayLight; Update_Lights( simulation::Lights ); Render( std::begin( m_sectionqueue ), std::end( m_sectionqueue ) ); @@ -1923,7 +1924,7 @@ opengl_renderer::Render( scene::shape_node const &Shape, bool const Ignorerange // NOTE: ambient component is set by diffuse component // NOTE: for the time being non-instanced shapes are rendered without specular component due to wrong/arbitrary values set in legacy scenarios // TBD, TODO: find a way to resolve this with the least amount of tears? - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( data.lighting.specular * Global.DayLight.specular.a * m_specularopaquescalefactor ) ); + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( data.lighting.specular * m_sunlight.specular.a * m_specularopaquescalefactor ) ); */ break; } @@ -2290,9 +2291,9 @@ opengl_renderer::Render( TSubModel *Submodel ) { } // ...colors... ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub - if( ( true == m_renderspecular ) && ( Global.DayLight.specular.a > 0.01f ) ) { + if( ( true == m_renderspecular ) && ( m_sunlight.specular.a > 0.01f ) ) { // specular strength in legacy models is set uniformly to 150, 150, 150 so we scale it down for opaque elements - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global.DayLight.specular.a * m_specularopaquescalefactor ) ); + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * m_sunlight.specular.a * m_specularopaquescalefactor ) ); ::glEnable( GL_RESCALE_NORMAL ); } // ...luminance @@ -2311,7 +2312,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { m_geometry.draw( Submodel->m_geometry ); // post-draw reset - if( ( true == m_renderspecular ) && ( Global.DayLight.specular.a > 0.01f ) ) { + if( ( true == m_renderspecular ) && ( m_sunlight.specular.a > 0.01f ) ) { ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); } if( Global.fLuminance < Submodel->fLight ) { @@ -2577,10 +2578,15 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, switch( m_renderpass.draw_mode ) { case rendermode::color: case rendermode::reflections: { - setup_environment_light( track->eEnvironment ); + if( track->eEnvironment != e_flat ) { + setup_environment_light( track->eEnvironment ); + } Bind_Material( track->m_material1 ); m_geometry.draw( std::begin( track->Geometry1 ), std::end( track->Geometry1 ) ); - setup_environment_light(); + if( track->eEnvironment != e_flat ) { + // restore default lighting + setup_environment_light(); + } break; } case rendermode::shadows: { @@ -2615,10 +2621,15 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, switch( m_renderpass.draw_mode ) { case rendermode::color: case rendermode::reflections: { - setup_environment_light( track->eEnvironment ); + if( track->eEnvironment != e_flat ) { + setup_environment_light( track->eEnvironment ); + } Bind_Material( track->m_material2 ); m_geometry.draw( std::begin( track->Geometry2 ), std::end( track->Geometry2 ) ); - setup_environment_light(); + if( track->eEnvironment != e_flat ) { + // restore default lighting + setup_environment_light(); + } break; } case rendermode::shadows: { @@ -2915,7 +2926,7 @@ opengl_renderer::Render_Alpha( scene::lines_node const &Lines ) { ::glColor4fv( glm::value_ptr( glm::vec4{ - glm::vec3{ data.lighting.diffuse * Global.DayLight.ambient }, // w zaleznosci od koloru swiatla + glm::vec3{ data.lighting.diffuse * m_sunlight.ambient }, // w zaleznosci od koloru swiatla std::min( 1.f, linealpha ) } ) ); // render m_geometry.draw( data.geometry ); @@ -3100,8 +3111,8 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { } // ...colors... ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub - if( ( true == m_renderspecular ) && ( Global.DayLight.specular.a > 0.01f ) ) { - ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * Global.DayLight.specular.a * m_speculartranslucentscalefactor ) ); + if( ( true == m_renderspecular ) && ( m_sunlight.specular.a > 0.01f ) ) { + ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * m_sunlight.specular.a * m_speculartranslucentscalefactor ) ); } // ...luminance auto const unitstate = m_unitstate; @@ -3119,7 +3130,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { m_geometry.draw( Submodel->m_geometry ); // post-draw reset - if( ( true == m_renderspecular ) && ( Global.DayLight.specular.a > 0.01f ) ) { + if( ( true == m_renderspecular ) && ( m_sunlight.specular.a > 0.01f ) ) { ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); } if( Global.fLuminance < Submodel->fLight ) { diff --git a/renderer.h b/renderer.h index 517393e2..22f1bef8 100644 --- a/renderer.h +++ b/renderer.h @@ -373,7 +373,7 @@ private: glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; glm::vec4 m_shadowcolor { 0.65f, 0.65f, 0.65f, 1.f }; - TEnvironmentType m_environment { e_flat }; +// TEnvironmentType m_environment { e_flat }; float m_specularopaquescalefactor { 1.f }; float m_speculartranslucentscalefactor { 1.f }; bool m_renderspecular{ false }; // controls whether to include specular component in the calculations diff --git a/version.h b/version.h index 8560b6c9..aef53048 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 124 +#define VERSION_MINOR 127 #define VERSION_REVISION 0 From 6696a3536d03a17f46b6d7a11bd269dca2c87539 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 29 Jan 2018 01:28:27 +0100 Subject: [PATCH 265/426] basic support for dmu vehicle type, cab sound positioning fix --- Driver.cpp | 85 +++++++++++++++++++++++++++++++++------------- McZapkie/MOVER.h | 2 ++ McZapkie/Mover.cpp | 6 +++- Model3d.cpp | 23 +++++++------ 4 files changed, 81 insertions(+), 35 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index b611b30d..ebbdfeae 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1394,7 +1394,18 @@ float TController::braking_distance_multiplier( float const Targetvelocity ) const { if( Targetvelocity > 65.f ) { return 1.f; } - if( Targetvelocity < 5.f ) { return 1.f; } + if( Targetvelocity < 5.f ) { + + if( ( mvOccupied->TrainType == dt_DMU ) + && ( mvOccupied->Vel < 40.0 ) + && ( Targetvelocity == 0.f ) ) { + // HACK: engaged automatic transmission means extra/earlier braking effort is needed for the last leg before full stop + return interpolate( 2.f, 1.f, static_cast( mvOccupied->Vel / 40.0 ) ); + } + else { + return 1.f; + } + } // stretch the braking distance up to 3 times; the lower the speed, the greater the stretch return interpolate( 3.f, 1.f, ( Targetvelocity - 5.f ) / 60.f ); } @@ -1518,8 +1529,11 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, } // fAccThreshold może podlegać uczeniu się - hamowanie powinno być rejestrowane, a potem analizowane - fAccThreshold = - ( mvOccupied->TrainType & dt_EZT ) ? -0.6 : -0.2; // próg opóźnienia dla zadziałania hamulca + // próg opóźnienia dla zadziałania hamulca + fAccThreshold = ( + mvOccupied->TrainType == dt_EZT ? -0.6 : + mvOccupied->TrainType == dt_DMU ? -0.4 : + -0.2 ); } // TrainParams=NewTrainParams; // if (TrainParams) @@ -1794,13 +1808,12 @@ void TController::AutoRewident() fBrake_a0[i+1] = 0; fBrake_a1[i+1] = 0; } - d = pVehicles[0]; // pojazd na czele składu - while (d) - { // 4. Przeliczanie siły hamowania - for (int i = 0; i < BrakeAccTableSize; i++) - { - fBrake_a0[i+1] += d->MoverParameters->BrakeForceR(0.25, velstep*(1 + 2 * i)); - fBrake_a1[i+1] += d->MoverParameters->BrakeForceR(1.00, velstep*(1 + 2 * i)); + // 4. Przeliczanie siły hamowania + d = pVehicles[0]; // pojazd na czele składu + while (d) { + for( int i = 0; i < BrakeAccTableSize; ++i ) { + fBrake_a0[ i + 1 ] += d->MoverParameters->BrakeForceR( 0.25, velstep*( 1 + 2 * i ) ); + fBrake_a1[ i + 1 ] += d->MoverParameters->BrakeForceR( 1.00, velstep*( 1 + 2 * i ) ); } d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } @@ -1811,12 +1824,15 @@ void TController::AutoRewident() fBrake_a0[i + 1] += 0.001*velstep*(1 + 2 * i); fBrake_a1[i+1] /= (12*fMass); } - if (mvOccupied->TrainType == dt_EZT) - { + if( mvOccupied->TrainType == dt_EZT ) { fAccThreshold = std::max(-fBrake_a0[BrakeAccTableSize] - 8 * fBrake_a1[BrakeAccTableSize], -0.6); fBrakeReaction = 0.25; } - else if (ustaw > 16) + else if( mvOccupied->TrainType == dt_DMU ) { + fAccThreshold = std::max( -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ], /*-0.7*/ -0.4 ); + fBrakeReaction = 0.25; + } + else if (ustaw > 16) { fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 4 * fBrake_a1[BrakeAccTableSize]; fBrakeReaction = 1.00 + fLength*0.004; @@ -1993,10 +2009,16 @@ bool TController::CheckVehicles(TOrders user) } } // Ra 2014-09: tymczasowo prymitywne ustawienie warunku pod kątem SN61 - if ((mvOccupied->TrainType == dt_EZT) || (iVehicles == 1)) - iDrivigFlags |= movePushPull; // zmiana czoła przez zmianę kabiny - else - iDrivigFlags &= ~movePushPull; // zmiana czoła przez manewry + if( ( mvOccupied->TrainType == dt_EZT ) + || ( mvOccupied->TrainType == dt_DMU ) + || ( iVehicles == 1 ) ) { + // zmiana czoła przez zmianę kabiny + iDrivigFlags |= movePushPull; + } + else { + // zmiana czoła przez manewry + iDrivigFlags &= ~movePushPull; + } } // blok wykonywany, gdy aktywnie prowadzi return true; } @@ -2419,8 +2441,8 @@ bool TController::IncBrake() bool standalone { true }; if( ( mvOccupied->TrainType == dt_ET41 ) || ( mvOccupied->TrainType == dt_ET42 ) ) { - // NOTE: we're doing simplified checks full of presuptions here. - // they'll break if someone does strange thing like turning around the second unit + // NOTE: we're doing simplified checks full of presuptions here. + // they'll break if someone does strange thing like turning around the second unit if( ( mvOccupied->Couplers[ 1 ].CouplingFlag & coupling::permanent ) && ( mvOccupied->Couplers[ 1 ].Connected->Couplers[ 1 ].CouplingFlag > 0 ) ) { standalone = false; @@ -2430,6 +2452,10 @@ bool TController::IncBrake() standalone = false; } } + else if( mvOccupied->TrainType == dt_DMU ) { + // enforce use of train brake for DMUs + standalone = false; + } else { /* standalone = @@ -2488,12 +2514,25 @@ bool TController::IncBrake() mvOccupied->BrakeDelayFlag > bdelay_G ? 1.0 : 1.25 ) ); +/* + // HACK: stronger braking to overcome SA134 engine behaviour + if( ( mvOccupied->TrainType == dt_DMU ) + && ( VelNext == 0.0 ) + && ( fBrakeDist < 200.0 ) ) { + mvOccupied->BrakeLevelAdd( + fBrakeDist / ActualProximityDist < 0.8 ? + 1.0 : + 3.0 ); + } +*/ } else { - OK = mvOccupied->BrakeLevelAdd(0.25); - if ((deltaAcc > 5 * fBrake_a1[0]) && (mvOccupied->BrakeCtrlPosR <= 3.0)) - mvOccupied->BrakeLevelAdd(0.75); + OK = mvOccupied->BrakeLevelAdd( 0.25 ); + if( ( deltaAcc > 5 * fBrake_a1[ 0 ] ) + && ( mvOccupied->BrakeCtrlPosR <= 3.0 ) ) { + mvOccupied->BrakeLevelAdd( 0.75 ); + } } } else @@ -4956,7 +4995,7 @@ TController::UpdateSituation(double dt) { } // yB: usunięte różne dziwne warunki, oddzielamy część zadającą od wykonawczej // zmniejszanie predkosci - if( mvOccupied->TrainType & dt_EZT ) { + if( mvOccupied->TrainType == dt_EZT ) { // właściwie, to warunek powinien być na działający EP // Ra: to dobrze hamuje EP w EZT if( ( AccDesired <= fAccThreshold ) // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 24094d74..9ba10588 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -208,6 +208,7 @@ enum sound { //szczególne typy pojazdów (inna obsługa) dla zmiennej TrainType //zamienione na flagi bitowe, aby szybko wybierać grupę (np. EZT+SZT) +// TODO: convert to enums, they're used as specific checks anyway static int const dt_Default = 0; static int const dt_EZT = 1; static int const dt_ET41 = 2; @@ -218,6 +219,7 @@ static int const dt_SN61 = 0x20; //nie używane w warunkach, ale ustawiane z CHK static int const dt_EP05 = 0x40; static int const dt_ET40 = 0x80; static int const dt_181 = 0x100; +static int const dt_DMU = 0x200; //stałe dla asynchronów static int const eimc_s_dfic = 0; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 5fdba3de..ab11d0f4 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3846,6 +3846,9 @@ double TMoverParameters::BrakeForceR(double ratio, double velocity) ratio = ratio + (1.5 - ratio)*std::min(1.0, Vel*0.02); if ((BrakeDelayFlag&bdelay_R) && (BrakeMethod%128 != bp_Cosid) && (BrakeMethod % 128 != bp_D1) && (BrakeMethod % 128 != bp_D2) && (Power<1) && (velocity<40)) ratio = ratio / 2; + if( ( TrainType == dt_DMU ) && ( velocity < 30.0 ) ) { + ratio -= 0.3; + } } } @@ -4294,7 +4297,7 @@ double TMoverParameters::TractionForce(double dt) case DieselElectric: { if( true == Mains ) { // TBD, TODO: currently ignores RVentType, fix this? - RventRot += clamp( DElist[ MainCtrlPos ].RPM - RventRot, -100.0, 50.0 ) * dt; + RventRot += clamp( DElist[ MainCtrlPos ].RPM / 60.0 - RventRot, -100.0, 50.0 ) * dt; } else { RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); @@ -6978,6 +6981,7 @@ void TMoverParameters::LoadFIZ_Param( std::string const &line ) { std::map types{ { "pseudodiesel", dt_PseudoDiesel }, { "ezt", dt_EZT }, + { "dmu", dt_DMU }, { "sn61", dt_SN61 }, { "et22", dt_ET22 }, { "et40", dt_ET40 }, diff --git a/Model3d.cpp b/Model3d.cpp index e988ba40..e659619b 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1169,17 +1169,18 @@ TSubModel::offset( float const Geometrytestoffsetthreshold ) const { // offset of zero generally means the submodel has optimized identity matrix // for such cases we resort to an estimate from submodel geometry // TODO: do proper bounding area calculation for submodel when loading mesh and grab the centre point from it here - if( m_geometry != null_handle ) { - auto const &vertices { GfxRenderer.Vertices( m_geometry ) }; - if( false == vertices.empty() ) { - // transformation matrix for the submodel can still contain rotation and/or scaling, - // so we pass the vertex positions through it rather than just grab them directly - offset = glm::vec3(); - auto const vertexfactor { 1.f / vertices.size() }; - auto const transformationmatrix { glm::make_mat4( parentmatrix.readArray() ) }; - for( auto const &vertex : vertices ) { - offset += glm::vec3 { transformationmatrix * glm::vec4 { vertex.position, 1 } } * vertexfactor; - } + auto const &vertices { ( + m_geometry != null_handle ? + GfxRenderer.Vertices( m_geometry ) : + Vertices ) }; + if( false == vertices.empty() ) { + // transformation matrix for the submodel can still contain rotation and/or scaling, + // so we pass the vertex positions through it rather than just grab them directly + offset = glm::vec3(); + auto const vertexfactor { 1.f / vertices.size() }; + auto const transformationmatrix { glm::make_mat4( parentmatrix.readArray() ) }; + for( auto const &vertex : vertices ) { + offset += glm::vec3 { transformationmatrix * glm::vec4 { vertex.position, 1 } } * vertexfactor; } } } From 23761dc66562e417c3943bbf33b786521faa2cf3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 31 Jan 2018 16:07:50 +0100 Subject: [PATCH 266/426] build 180131. support for nested material attribute definitions, minor bug fixes, refactoring and master branch unifications --- Driver.cpp | 9 ++--- DynObj.cpp | 55 +++++++++++++++--------------- DynObj.h | 3 +- EU07.cpp | 20 +++++------ EvLaunch.cpp | 28 +++++++--------- Event.cpp | 2 +- Float3d.h | 4 +-- Globals.cpp | 16 +++++---- Globals.h | 6 ++-- Logs.h | 8 ++--- McZapkie/Mover.cpp | 53 +++++++++++++++-------------- McZapkie/hamulce.h | 2 +- Train.cpp | 2 +- World.cpp | 6 ++-- material.cpp | 83 +++++++++++++++++++++++++++------------------- sound.cpp | 4 +-- sound.h | 2 +- uilayer.cpp | 24 ++++++-------- uilayer.h | 7 ++-- version.h | 2 +- 20 files changed, 172 insertions(+), 164 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index ebbdfeae..c355bdc4 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2616,19 +2616,14 @@ bool TController::DecBrake() bool TController::IncSpeed() { // zwiększenie prędkości; zwraca false, jeśli dalej się nie da zwiększać -#ifdef EU07_USE_OLD_SOUNDCODE - if (tsGuardSignal) // jeśli jest dźwięk kierownika - if (tsGuardSignal->GetStatus() & DSBSTATUS_PLAYING) // jeśli gada, to nie jedziemy - return false; -#else if( true == tsGuardSignal.is_playing() ) { + // jeśli gada, to nie jedziemy return false; } -#endif bool OK = true; if( ( iDrivigFlags & moveDoorOpened ) && ( VelDesired > 0.0 ) ) { // to prevent door shuffle on stop - // zamykanie drzwi - tutaj wykonuje tylko AI (zmienia fActionTime) + // zamykanie drzwi - tutaj wykonuje tylko AI (zmienia fActionTime) Doors( false ); } if( fActionTime < 0.0 ) { diff --git a/DynObj.cpp b/DynObj.cpp index bf418a16..37dfe06d 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3088,7 +3088,7 @@ bool TDynamicObject::Update(double dt, double dt1) { // trzeba usunąć to rozróżnienie case 0: if( ( Global.bLiveTraction == false ) - && ( p->hvPowerWire == nullptr ) ) { + && ( p->hvPowerWire == nullptr ) ) { // jeśli nie ma drutu, może pooszukiwać MoverParameters->PantFrontVolt = ( p->PantWys >= 1.2 ) ? @@ -3098,19 +3098,20 @@ bool TDynamicObject::Update(double dt, double dt1) else if( ( true == MoverParameters->PantFrontUp ) && ( PantDiff < 0.01 ) ) // tolerancja niedolegania { - if( ( MoverParameters->PantFrontVolt == 0.0 ) - && ( MoverParameters->PantRearVolt == 0.0 ) ) { - for( auto &pantograph : m_pantographsounds ) { - if( pantograph.sPantUp.offset().z > 0 ) { - // limit to pantographs located in the front half of the vehicle - pantograph.sPantUp.play( sound_flags::exclusive ); + if (p->hvPowerWire) { + auto const wirevoltage { p->hvPowerWire->VoltageGet( MoverParameters->Voltage, fPantCurrent ) }; + // TODO: refactor reaction to voltage change to mover as sound event for specific pantograph + if( ( MoverParameters->PantFrontVolt == 0.0 ) + && ( wirevoltage > 0.0 ) ) { + for( auto &pantograph : m_pantographsounds ) { + if( pantograph.sPantUp.offset().z > 0 ) { + // limit to pantographs located in the front half of the vehicle + pantograph.sPantUp.play( sound_flags::exclusive ); + } } } - } - if (p->hvPowerWire) { // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() - MoverParameters->PantFrontVolt = - p->hvPowerWire->VoltageGet(MoverParameters->Voltage, fPantCurrent); + MoverParameters->PantFrontVolt = wirevoltage; fCurrent -= fPantCurrent; // taki prąd płynie przez powyższy pantograf } else @@ -3131,16 +3132,18 @@ bool TDynamicObject::Update(double dt, double dt1) else if ( ( true == MoverParameters->PantRearUp ) && ( PantDiff < 0.01 ) ) { - if( ( MoverParameters->PantRearVolt == 0.0 ) - && ( MoverParameters->PantFrontVolt == 0.0 ) ) { - for( auto &pantograph : m_pantographsounds ) { - if( pantograph.sPantUp.offset().z < 0 ) { - // limit to pantographs located in the rear half of the vehicle - pantograph.sPantUp.play( sound_flags::exclusive ); + if (p->hvPowerWire) { + auto const wirevoltage { p->hvPowerWire->VoltageGet( MoverParameters->Voltage, fPantCurrent ) }; + // TODO: refactor reaction to voltage change to mover as sound event for specific pantograph + if( ( MoverParameters->PantRearVolt == 0.0 ) + && ( wirevoltage > 0.0 ) ) { + for( auto &pantograph : m_pantographsounds ) { + if( pantograph.sPantUp.offset().z < 0 ) { + // limit to pantographs located in the rear half of the vehicle + pantograph.sPantUp.play( sound_flags::exclusive ); + } } } - } - if (p->hvPowerWire) { // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() MoverParameters->PantRearVolt = p->hvPowerWire->VoltageGet( MoverParameters->Voltage, fPantCurrent ); fCurrent -= fPantCurrent; // taki prąd płynie przez powyższy pantograf @@ -3888,7 +3891,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, parser.getTokens(); parser >> token; if( ( token == "models:" ) - || ( token == "models:" ) ) { // crude way to handle utf8 bom potentially appearing before the first token + || ( token == "\xef\xbb\xbfmodels:" ) ) { // crude way to handle utf8 bom potentially appearing before the first token // modele i podmodele m_materialdata.multi_textures = 0; // czy jest wiele tekstur wymiennych? parser.getTokens(); @@ -4013,8 +4016,9 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // Ra: tu wczytywanie modelu ładunku jest w porządku if( false == asLoadName.empty() ) { // try first specialized version of the load model, vehiclename_loadname - auto const specializedloadfilename { BaseDir + TypeName + "_" + MoverParameters->LoadType + ".t3d" }; - if( true == FileExists( specializedloadfilename ) ) { + auto const specializedloadfilename { BaseDir + TypeName + "_" + MoverParameters->LoadType }; + if( ( true == FileExists( specializedloadfilename + ".e3d" ) ) + || ( true == FileExists( specializedloadfilename + ".t3d" ) ) ) { mdLoad = TModelsManager::GetModel( specializedloadfilename, true ); } if( mdLoad == nullptr ) { @@ -4629,8 +4633,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.rsWentylator.m_frequencyfactor /= MoverParameters->RVentnmax; } - else if( ( token == "transmission:" ) - && ( MoverParameters->EngineType == ElectricSeriesMotor ) ) { + else if( token == "transmission:" ) { // plik z dzwiekiem, mnozniki i ofsety amp. i czest. // NOTE, fixed default parameters, legacy system leftover m_powertrainsounds.transmission.m_amplitudefactor = 0.029; @@ -4777,7 +4780,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( token == "outernoise:" ) { // szum podczas jazdy: - rsOuterNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + rsOuterNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, MoverParameters->Vmax ); rsOuterNoise.owner( this ); rsOuterNoise.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); @@ -5041,7 +5044,7 @@ void TDynamicObject::RadioStop() if( ( MoverParameters->SecuritySystem.RadioStop ) && ( MoverParameters->Radio ) ) { // jeśli pojazd ma RadioStop i jest on aktywny - // HAX cast until math types unification + // HACK cast until math types unification Mechanik->PutCommand( "Emergency_brake", 1.0, 1.0, &static_cast(vPosition), stopRadio ); // add onscreen notification for human driver // TODO: do it selectively for the 'local' driver once the multiplayer is in diff --git a/DynObj.h b/DynObj.h index 0f7f941f..5157478d 100644 --- a/DynObj.h +++ b/DynObj.h @@ -269,6 +269,7 @@ private: }; struct pantograph_sounds { + // TODO: split pantograph sound into one for contact of arm with the wire, and electric arc sound sound_source sPantUp { sound_placement::external }; sound_source sPantDown { sound_placement::external }; }; @@ -455,7 +456,7 @@ private: TDynamicObject(); ~TDynamicObject(); // zwraca długość pojazdu albo 0, jeśli błąd - double TDynamicObject::Init( + double Init( std::string Name, std::string BaseDir, std::string asReplacableSkin, std::string Type_Name, TTrack *Track, double fDist, std::string DriverType, double fVel, std::string TrainName, float Load, std::string LoadType, bool Reversed, std::string); diff --git a/EU07.cpp b/EU07.cpp index c39eb8b8..50962461 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -191,7 +191,7 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo #ifdef CAN_I_HAS_LIBPNG switch( key ) { - case GLFW_KEY_F11: { + case GLFW_KEY_PRINT_SCREEN: { make_screenshot(); break; } @@ -426,20 +426,17 @@ int main(int argc, char *argv[]) ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) ); return -1; } - +#ifdef _WINDOWS Console *pConsole = new Console(); // Ra: nie wiem, czy ma to sens, ale jakoś zainicjowac trzeba -/* - if( !joyGetNumDevs() ) - WriteLog( "No joystick" ); -*/ +#endif if( Global.iConvertModels < 0 ) { Global.iConvertModels = -Global.iConvertModels; World.CreateE3D( "models\\" ); // rekurencyjne przeglądanie katalogów World.CreateE3D( "dynamic\\", true ); } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć - +#ifdef _WINDOWS Console::On(); // włączenie konsoli - +#endif try { while( ( false == glfwWindowShouldClose( window ) ) && ( true == World.Update() ) @@ -456,10 +453,11 @@ int main(int argc, char *argv[]) return -1; } - Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) - TPythonInterpreter::killInstance(); - SafeDelete( pConsole ); +#ifdef _WINDOWS + Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) + SafeDelete( pConsole ); +#endif SafeDelete( simulation::Region ); glfwDestroyWindow(window); diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 72da61a1..fbc02caa 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -128,22 +128,18 @@ bool TEventLauncher::Load(cParser *parser) bool TEventLauncher::check_conditions() { //"renderowanie" wyzwalacza - bool bCond = false; - if (iKey != 0) - { - if( Global.bActive ) { - // tylko jeśli okno jest aktywne - if( iKey > 255 ) { - // key and modifier - auto const modifier = ( iKey & 0xff00 ) >> 8; - bCond = ( Console::Pressed( iKey & 0xff ) ) - && ( ( modifier & 1 ) ? Global.shiftState : true ) - && ( ( modifier & 2 ) ? Global.ctrlState : true ); - } - else { - // just key - bCond = ( Console::Pressed( iKey & 0xff ) ); // czy klawisz wciśnięty - } + auto bCond { false }; + if (iKey != 0) { + if( iKey > 255 ) { + // key and modifier + auto const modifier = ( iKey & 0xff00 ) >> 8; + bCond = ( Console::Pressed( iKey & 0xff ) ) + && ( ( modifier & 1 ) ? Global.shiftState : true ) + && ( ( modifier & 2 ) ? Global.ctrlState : true ); + } + else { + // just key + bCond = ( Console::Pressed( iKey & 0xff ) ); // czy klawisz wciśnięty } } if (DeltaTime > 0) diff --git a/Event.cpp b/Event.cpp index 58d4002e..cc0d1dcd 100644 --- a/Event.cpp +++ b/Event.cpp @@ -1439,7 +1439,7 @@ event_manager::InitEvents() { auto *track = simulation::Paths.find( event->asNodeName ); if( track != nullptr ) { // dowiązanie toru - if( track->iAction == NULL ) { + if( track->iAction == 0 ) { // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia track->iAction |= 0x100; } diff --git a/Float3d.h b/Float3d.h index 6afdaef3..0216b000 100644 --- a/Float3d.h +++ b/Float3d.h @@ -104,11 +104,11 @@ class float4 z = c; w = d; }; - float inline float4::LengthSquared() const + float inline LengthSquared() const { return x * x + y * y + z * z + w * w; }; - float inline float4::Length() const + float inline Length() const { return sqrt(x * x + y * y + z * z + w * w); }; diff --git a/Globals.cpp b/Globals.cpp index 275d70da..c5717682 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -558,14 +558,14 @@ global_settings::ConfigParse(cParser &Parser) { // color of the ui text. NOTE: will be obsolete once the real ui is in place Parser.getTokens( 3, false ); Parser - >> UITextColor.x - >> UITextColor.y - >> UITextColor.z; - UITextColor.x = clamp( UITextColor.x, 0.0f, 255.0f ); - UITextColor.y = clamp( UITextColor.y, 0.0f, 255.0f ); - UITextColor.z = clamp( UITextColor.z, 0.0f, 255.0f ); + >> UITextColor.r + >> UITextColor.g + >> UITextColor.b; + UITextColor.r = clamp( UITextColor.r, 0.0f, 255.0f ); + UITextColor.g = clamp( UITextColor.g, 0.0f, 255.0f ); + UITextColor.b = clamp( UITextColor.b, 0.0f, 255.0f ); UITextColor = UITextColor / 255.0f; - UITextColor.w = 1.0f; + UITextColor.a = 1.0f; } else if (token == "pyscreenrendererpriority") { @@ -704,7 +704,9 @@ global_settings::ConfigParse(cParser &Parser) { // TBD: remove, or launch depending on passed flag? if (qp) { // to poniżej wykonywane tylko raz, jedynie po wczytaniu eu07.ini*/ +#ifdef _WINDOWS Console::ModeSet(iFeedbackMode, iFeedbackPort); // tryb pracy konsoli sterowniczej +#endif /*iFpsRadiusMax = 0.000025 * fFpsRadiusMax * fFpsRadiusMax; // maksymalny promień renderowania 3000.0 -> 225 if (iFpsRadiusMax > 400) diff --git a/Globals.h b/Globals.h index 27575025..c4a26cee 100644 --- a/Globals.h +++ b/Globals.h @@ -73,7 +73,7 @@ struct global_settings { double fFogStart{ 1700 }; double fFogEnd{ 2000 }; std::string Season; // season of the year, based on simulation date - std::string Weather{ "clear" }; // current weather + std::string Weather{ "clear:" }; // current weather bool FullPhysics{ true }; // full calculations performed for each simulation step bool bnewAirCouplers{ true }; double fMoveLight{ -1 }; // numer dnia w roku albo -1 @@ -89,7 +89,7 @@ struct global_settings { // ui int iTextMode{ 0 }; // tryb pracy wyświetlacza tekstowego int iScreenMode[ 12 ] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // numer ekranu wyświetlacza tekstowego - float4 UITextColor{ float4( 225.f / 255.f, 225.f / 255.f, 225.f / 255.f, 1.f ) }; // base color of UI text + glm::vec4 UITextColor { glm::vec4( 225.f / 255.f, 225.f / 255.f, 225.f / 255.f, 1.f ) }; // base color of UI text std::string asLang{ "pl" }; // domyślny język - http://tools.ietf.org/html/bcp47 // gfx int iWindowWidth{ 800 }; @@ -182,7 +182,7 @@ struct global_settings { int iMultiplayer{ 0 }; // blokada działania niektórych eventów na rzecz kominikacji // other std::string AppName{ "EU07" }; - std::string asVersion{ "couldn't retrieve version string" }; // z opisem + std::string asVersion{ "UNKNOWN" }; // z opisem // methods void LoadIniFile( std::string asFileName ); diff --git a/Logs.h b/Logs.h index 515baaa4..dee95e5f 100644 --- a/Logs.h +++ b/Logs.h @@ -13,10 +13,10 @@ http://mozilla.org/MPL/2.0/. enum logtype : unsigned int { - generic = 0x1, - file = 0x2, - model = 0x4, - texture = 0x8 + generic = ( 1 << 0 ), + file = ( 1 << 1 ), + model = ( 1 << 2 ), + texture = ( 1 << 3 ) }; void WriteLog( const char *str, logtype const Type = logtype::generic ); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index ab11d0f4..9257997e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6108,52 +6108,55 @@ bool TMoverParameters::ChangeOffsetH(double DeltaOffset) // ************************************************************************************************* std::string TMoverParameters::EngineDescription(int what) { - std::string outstr; - - outstr = ""; - switch (what) - { - case 0: - { - if (DamageFlag == 255) + std::string outstr { "OK" }; + switch (what) { + case 0: { + if( DamageFlag == 255 ) { outstr = "WRECKED"; - else - { - if (TestFlag(DamageFlag, dtrain_thinwheel)) - if (Power > 0.1) + } + else { + if( TestFlag( DamageFlag, dtrain_thinwheel ) ) { + if( Power > 0.1 ) outstr = "Thin wheel"; else outstr = "Load shifted"; - if (TestFlag(DamageFlag, dtrain_wheelwear)) + } + if( ( WheelFlat > 5.0 ) + || ( TestFlag( DamageFlag, dtrain_wheelwear ) ) ) { outstr = "Wheel wear"; - if (TestFlag(DamageFlag, dtrain_bearing)) + } + if( TestFlag( DamageFlag, dtrain_bearing ) ) { outstr = "Bearing damaged"; - if (TestFlag(DamageFlag, dtrain_coupling)) + } + if( TestFlag( DamageFlag, dtrain_coupling ) ) { outstr = "Coupler broken"; - if (TestFlag(DamageFlag, dtrain_loaddamage)) - if (Power > 0.1) + } + if( TestFlag( DamageFlag, dtrain_loaddamage ) ) { + if( Power > 0.1 ) outstr = "Ventilator damaged"; else outstr = "Load damaged"; - - if (TestFlag(DamageFlag, dtrain_loaddestroyed)) - if (Power > 0.1) + } + if( TestFlag( DamageFlag, dtrain_loaddestroyed ) ) { + if( Power > 0.1 ) outstr = "Engine damaged"; else outstr = "LOAD DESTROYED"; - if (TestFlag(DamageFlag, dtrain_axle)) + } + if( TestFlag( DamageFlag, dtrain_axle ) ) { outstr = "Axle broken"; - if (TestFlag(DamageFlag, dtrain_out)) + } + if( TestFlag( DamageFlag, dtrain_out ) ) { outstr = "DERAILED"; - if (outstr == "") - outstr = "OK"; + } } break; } - default: + default: { outstr = "Invalid qualifier"; break; } + } return outstr; } diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index c93cb184..f36fec48 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -513,7 +513,7 @@ class TDriverHandle { virtual double GetPos(int i); virtual double GetEP(double pos); - inline TDriverHandle() { ::SecureZeroMemory( Sounds, sizeof( Sounds ) ); } + inline TDriverHandle() { memset( Sounds, 0, sizeof( Sounds ) ); } }; class TFV4a : public TDriverHandle { diff --git a/Train.cpp b/Train.cpp index 06d44e95..86ef2991 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4772,7 +4772,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) } else if( token == "runningnoise:" ) { // szum podczas jazdy: - rsRunningNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency ); + rsRunningNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax ); rsRunningNoise.owner( DynamicObject ); rsRunningNoise.m_amplitudefactor /= ( 1 + mvOccupied->Vmax ); diff --git a/World.cpp b/World.cpp index a379184e..dcdd40db 100644 --- a/World.cpp +++ b/World.cpp @@ -1262,7 +1262,7 @@ TWorld::Update_UI() { ( ( owner->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ? - float4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono + glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono Global.UITextColor ) ); // divider/footer UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global.UITextColor ); @@ -1556,7 +1556,7 @@ TWorld::Update_UI() { + ", PM=" + to_string( vehicle->MoverParameters->WheelFlat, 1 ) + " mm; enrot=" + to_string( vehicle->MoverParameters->enrot * 60, 0 ) + " tmrot=" + to_string( std::abs( vehicle->MoverParameters->nrot ) * vehicle->MoverParameters->Transmision.Ratio * 60, 0 ) - + "; ventrot=" + to_string( vehicle->MoverParameters->RventRot, 1 ); + + "; ventrot=" + to_string( vehicle->MoverParameters->RventRot * 60, 1 ); uitextline2 = "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) @@ -1746,7 +1746,7 @@ TWorld::Update_UI() { while( true == parser.getTokens( 1, false, "|" ) ) { std::string transcriptline; parser >> transcriptline; - transcripts.emplace_back( transcriptline, float4( 1.0f, 1.0f, 0.0f, 1.0f ) ); + transcripts.emplace_back( transcriptline, glm::vec4( 1.0f, 1.0f, 0.0f, 1.0f ) ); } } } diff --git a/material.cpp b/material.cpp index 470d5ea4..d7ea8988 100644 --- a/material.cpp +++ b/material.cpp @@ -14,6 +14,14 @@ http://mozilla.org/MPL/2.0/. #include "utilities.h" #include "globals.h" +// helper, returns potential path part from provided file name +std::string path( std::string const &Filename ) { + return ( + Filename.rfind( '\\' ) != std::string::npos ? + Filename.substr( 0, Filename.rfind( '\\' ) + 1 ) : + "" ); +} + bool opengl_material::deserialize( cParser &Input, bool const Loadnow ) { @@ -33,51 +41,58 @@ opengl_material::deserialize( cParser &Input, bool const Loadnow ) { // imports member data pair from the config file bool opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow ) { + // token can be a key or block end + std::string const key { Input.getToken( true, "\n\r\t ,;[]" ) }; - if( false == Input.getTokens( 2, true, "\n\r\t;, " ) ) { - return false; - } + if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } - std::string path; - if( name.rfind( '\\' ) != std::string::npos ) { - path = name.substr( 0, name.rfind( '\\' ) + 1 ); - } + auto const value { Input.getToken( true, "\n\r\t ,;" ) }; - std::string key, value; - Input - >> key - >> value; - - if( value == "{" ) { - // detect and optionally process config blocks - cParser blockparser( Input.getToken( false, "}" ) ); - if( key == Global.Season ) { + if( Priority != -1 ) { + // regular attribute processing mode + if( key == Global.Weather ) { + // weather textures override generic (pri 0) and seasonal (pri 1) textures + // seasonal weather textures (pri 1+2=3) override generic weather (pri 2) textures + while( true == deserialize_mapping( Input, Priority + 2, Loadnow ) ) { + ; // all work is done in the header + } + } + else if( key == Global.Season ) { // seasonal textures override generic textures - while( true == deserialize_mapping( blockparser, 1, Loadnow ) ) { + while( true == deserialize_mapping( Input, 1, Loadnow ) ) { ; // all work is done in the header } } - else if( key == Global.Weather ) { - // weather textures override generic and seasonal textures - while( true == deserialize_mapping( blockparser, 2, Loadnow ) ) { + else if( key == "texture1:" ) { + if( ( texture1 == null_handle ) + || ( Priority > priority1 ) ) { + texture1 = GfxRenderer.Fetch_Texture( path( name ) + value, Loadnow ); + priority1 = Priority; + } + } + else if( key == "texture2:" ) { + if( ( texture2 == null_handle ) + || ( Priority > priority2 ) ) { + texture2 = GfxRenderer.Fetch_Texture( path( name ) + value, Loadnow ); + priority2 = Priority; + } + } + else if( value == "{" ) { + // unrecognized or ignored token, but comes with attribute block and potential further nesting + // go through it and discard the content + while( true == deserialize_mapping( Input, -1, Loadnow ) ) { ; // all work is done in the header } } } - else if( key == "texture1:" ) { - // TODO: full-fledged priority system - if( ( texture1 == null_handle ) - || ( Priority > priority1 ) ) { - texture1 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); - priority1 = Priority; - } - } - else if( key == "texture2:" ) { - // TODO: full-fledged priority system - if( ( texture2 == null_handle ) - || ( Priority > priority2 ) ) { - texture2 = GfxRenderer.Fetch_Texture( path + value, Loadnow ); - priority2 = Priority; + else { + // discard mode; ignores all retrieved tokens + if( value == "{" ) { + // ignored tokens can come with their own blocks, ignore these recursively + // go through it and discard the content + while( true == deserialize_mapping( Input, -1, Loadnow ) ) { + ; // all work is done in the header + } } } diff --git a/sound.cpp b/sound.cpp index c74af434..e92bd10c 100644 --- a/sound.cpp +++ b/sound.cpp @@ -36,7 +36,7 @@ sound_source::deserialize( std::string const &Input, sound_type const Legacytype } sound_source & -sound_source::deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters ) { +sound_source::deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters, int const Chunkrange ) { // cache parser config, as it may change during deserialization auto const inputautoclear { Input.autoclear() }; @@ -80,7 +80,7 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons m_crossfaderange * 0.01f ); */ } - m_soundchunks.back().second.fadeout = std::max( 100, m_soundchunks.back().second.threshold ); + m_soundchunks.back().second.fadeout = std::max( Chunkrange, m_soundchunks.back().second.threshold ); // m_soundchunks.back().second.fadeout = m_soundchunks.back().second.threshold; // test if the chunk table contains any actual samples while at it for( auto &soundchunk : m_soundchunks ) { diff --git a/sound.h b/sound.h index 816cfdcc..9fea133e 100644 --- a/sound.h +++ b/sound.h @@ -56,7 +56,7 @@ public: // methods // restores state of the class from provided data stream sound_source & - deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters = 0 ); + deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters = 0, int const Chunkrange = 100 ); sound_source & deserialize( std::string const &Input, sound_type const Legacytype, int const Legacyparameters = 0 ); // copies list of sounds from provided source diff --git a/uilayer.cpp b/uilayer.cpp index c8711db2..c857866e 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -126,18 +126,18 @@ ui_layer::render_progress() { size = glm::vec2{ 320.0f, 16.0f }; } - quad( float4( origin.x, origin.y, origin.x + size.x, origin.y + size.y ), float4(0.0f, 0.0f, 0.0f, 0.25f) ); + quad( glm::vec4( origin.x, origin.y, origin.x + size.x, origin.y + size.y ), glm::vec4(0.0f, 0.0f, 0.0f, 0.25f) ); // secondary bar if( m_subtaskprogress ) { quad( - float4( origin.x, origin.y, origin.x + size.x * m_subtaskprogress, origin.y + size.y), - float4( 8.0f/255.0f, 160.0f/255.0f, 8.0f/255.0f, 0.35f ) ); + glm::vec4( origin.x, origin.y, origin.x + size.x * m_subtaskprogress, origin.y + size.y), + glm::vec4( 8.0f/255.0f, 160.0f/255.0f, 8.0f/255.0f, 0.35f ) ); } // primary bar if( m_progress ) { quad( - float4( origin.x, origin.y, origin.x + size.x * m_progress, origin.y + size.y ), - float4( 8.0f / 255.0f, 160.0f / 255.0f, 8.0f / 255.0f, 1.0f ) ); + glm::vec4( origin.x, origin.y, origin.x + size.x * m_progress, origin.y + size.y ), + glm::vec4( 8.0f / 255.0f, 160.0f / 255.0f, 8.0f / 255.0f, 1.0f ) ); } if( false == m_progresstext.empty() ) { @@ -224,12 +224,12 @@ ui_layer::render_background() { 1024.0f : // legacy mode, square texture displayed as 4:3 image texture.width() / ( texture.height() / 768.0f ) ); quad( - float4( + glm::vec4( ( 1024.0f * 0.5f ) - ( width * 0.5f ), ( 768.0f * 0.5f ) - ( height * 0.5f ), ( 1024.0f * 0.5f ) - ( width * 0.5f ) + width, ( 768.0f * 0.5f ) - ( height * 0.5f ) + height ), - float4( 1.0f, 1.0f, 1.0f, 1.0f ) ); + colors::white ); } void @@ -276,7 +276,7 @@ ui_layer::print( std::string const &Text ) } void -ui_layer::quad( float4 const &Coordinates, float4 const &Color ) { +ui_layer::quad( glm::vec4 const &Coordinates, glm::vec4 const &Color ) { float const screenratio = static_cast( Global.iWindowWidth ) / Global.iWindowHeight; float const width = @@ -288,12 +288,8 @@ ui_layer::quad( float4 const &Coordinates, float4 const &Color ) { Global.iWindowHeight / 768.f : Global.iWindowHeight / 768.f * screenratio / ( 4.f / 3.f ) ); float const height = 768.f * heightratio; -/* - float const heightratio = Global.iWindowHeight / 768.0f; - float const height = 768.0f * heightratio; - float const width = Global.iWindowWidth * heightratio; -*/ - glColor4fv(&Color.x); + + glColor4fv(glm::value_ptr(Color)); glBegin( GL_TRIANGLE_STRIP ); diff --git a/uilayer.h b/uilayer.h index 0a0e1fd6..26733f81 100644 --- a/uilayer.h +++ b/uilayer.h @@ -3,7 +3,6 @@ #include #include "texture.h" -#include "float3d.h" // GuiLayer -- basic user interface class. draws requested information on top of openGL screen @@ -11,10 +10,10 @@ struct ui_panel { struct text_line { - float4 color; + glm::vec4 color; std::string data; - text_line( std::string const &Data, float4 const &Color): + text_line( std::string const &Data, glm::vec4 const &Color): data(Data), color(Color) {} }; @@ -84,7 +83,7 @@ private: print( std::string const &Text ); // draws a quad between coordinates x,y and z,w with uv-coordinates spanning 0-1 void - quad( float4 const &Coordinates, float4 const &Color ); + quad( glm::vec4 const &Coordinates, glm::vec4 const &Color ); // members: diff --git a/version.h b/version.h index aef53048..7d31f588 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 127 +#define VERSION_MINOR 131 #define VERSION_REVISION 0 From b3e7b88bbcfda49ff654a8fc7578202df3fbb1de Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 2 Feb 2018 15:49:13 +0100 Subject: [PATCH 267/426] build 180202. tga texture origin bit recognition, audio file load failure crash fix, cab controls positioning fix, --- Button.cpp | 2 +- DynObj.cpp | 18 ++++++------- Globals.h | 4 +-- Model3d.cpp | 3 ++- Texture.cpp | 21 +++++++++++++++ Texture.h | 3 ++- Train.cpp | 77 +++++++++++++---------------------------------------- Train.h | 50 +++++++++++++++------------------- audio.cpp | 65 +++++++++++++++++++++++++------------------- sound.h | 1 + version.h | 2 +- 11 files changed, 115 insertions(+), 131 deletions(-) diff --git a/Button.cpp b/Button.cpp index bbff6cce..7ff6a3e9 100644 --- a/Button.cpp +++ b/Button.cpp @@ -105,7 +105,7 @@ TButton::model_offset() const { return ( submodel != nullptr ? - submodel->offset( 2.5f ) : + submodel->offset( std::numeric_limits::max() ) : glm::vec3() ); } diff --git a/DynObj.cpp b/DynObj.cpp index 37dfe06d..4eda69ee 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -5875,16 +5875,14 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub } } - if( Vehicle.TrainType == dt_ET40 ) { - if( Vehicle.Vel > 0.1 ) { - transmission - .pitch( transmission.m_frequencyoffset + transmission.m_frequencyfactor * Vehicle.Vel ) - .gain( transmission.m_amplitudeoffset + transmission.m_amplitudefactor * Vehicle.Vel ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - transmission.stop(); - } + if( Vehicle.Vel > 0.1 ) { + transmission + .pitch( transmission.m_frequencyoffset + transmission.m_frequencyfactor * Vehicle.Vel ) + .gain( transmission.m_amplitudeoffset + transmission.m_amplitudefactor * Vehicle.Vel ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + transmission.stop(); } } diff --git a/Globals.h b/Globals.h index c4a26cee..19ecd7b3 100644 --- a/Globals.h +++ b/Globals.h @@ -72,8 +72,8 @@ struct global_settings { GLfloat FogColor[ 3 ] = { 0.6f, 0.7f, 0.8f }; double fFogStart{ 1700 }; double fFogEnd{ 2000 }; - std::string Season; // season of the year, based on simulation date - std::string Weather{ "clear:" }; // current weather + std::string Season{}; // season of the year, based on simulation date + std::string Weather{ "cloudy:" }; // current weather bool FullPhysics{ true }; // full calculations performed for each simulation step bool bnewAirCouplers{ true }; double fMoveLight{ -1 }; // numer dnia w roku albo -1 diff --git a/Model3d.cpp b/Model3d.cpp index e659619b..7c9873b6 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1187,7 +1187,8 @@ TSubModel::offset( float const Geometrytestoffsetthreshold ) const { if( true == TestFlag( iFlags, 0x0200 ) ) { // flip coordinates for t3d file which wasn't yet initialized - if( std::abs( offset.y ) > offset.z ) { + if( ( false == Global.pWorld->InitPerformed() ) + || ( false == Vertices.empty() ) ) { // NOTE, HACK: results require flipping if the model wasn't yet initialized, so we're using crude method to detect possible cases // TODO: sort out this mess, either unify offset lookups to take place before (or after) initialization, // or provide way to determine on submodel level whether the initialization took place diff --git a/Texture.cpp b/Texture.cpp index 7cb3654e..cec43583 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -484,6 +484,12 @@ opengl_texture::load_TGA() { return; } + if( ( tgaheader[ 17 ] & 0x20 ) != 0 ) { + // normally origin is bottom-left + // if byte 17 bit 5 is set, it is top-left and needs flip + flip_vertical(); + } + downsize( GL_BGRA ); if( ( data_width > Global.iMaxTextureSize ) || ( data_height > Global.iMaxTextureSize ) ) { // for non-square textures there's currently possibility the scaling routine will have to abort @@ -702,6 +708,21 @@ opengl_texture::downsize( GLuint const Format ) { }; } +void +opengl_texture::flip_vertical() { + + auto const swapsize { data_width * 4 }; + auto destination { data.begin() + ( data_height - 1 ) * swapsize }; + auto sampler { data.begin() }; + + for( auto row = 0; row < data_height / 2; ++row ) { + + std::swap_ranges( sampler, sampler + swapsize, destination ); + sampler += swapsize; + destination -= swapsize; + } +} + void texture_manager::assign_units( GLint const Helper, GLint const Shadows, GLint const Normals, GLint const Diffuse ) { diff --git a/Texture.h b/Texture.h index b6040169..0c05b97a 100644 --- a/Texture.h +++ b/Texture.h @@ -55,9 +55,10 @@ private: void load_TGA(); void set_filtering() const; void downsize( GLuint const Format ); + void flip_vertical(); // members - std::vector data; // texture data + std::vector data; // texture data (stored GL-style, bottom-left origin) resource_state data_state{ resource_state::none }; // current state of texture data int data_width{ 0 }, data_height{ 0 }, diff --git a/Train.cpp b/Train.cpp index 86ef2991..a121654d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -46,42 +46,6 @@ control_mapper::find( TSubModel const *Control ) const { } } -TCab::TCab() -{ - CabPos1.x = -1.0; - CabPos1.y = 1.0; - CabPos1.z = 1.0; - CabPos2.x = 1.0; - CabPos2.y = 1.0; - CabPos2.z = -1.0; - bEnabled = false; - bOccupied = true; - dimm_r = dimm_g = dimm_b = 1; - intlit_r = intlit_g = intlit_b = 0; - intlitlow_r = intlitlow_g = intlitlow_b = 0; -/* - iGaugesMax = 100; // 95 - trzeba pobierać to z pliku konfiguracyjnego - ggList = new TGauge[iGaugesMax]; - iGauges = 0; // na razie nie są dodane - iButtonsMax = 60; // 55 - trzeba pobierać to z pliku konfiguracyjnego - btList = new TButton[iButtonsMax]; - iButtons = 0; -*/ -} -/* -void TCab::Init(double Initx1, double Inity1, double Initz1, double Initx2, double Inity2, - double Initz2, bool InitEnabled, bool InitOccupied) -{ - CabPos1.x = Initx1; - CabPos1.y = Inity1; - CabPos1.z = Initz1; - CabPos2.x = Initx2; - CabPos2.y = Inity2; - CabPos2.z = Initz2; - bEnabled = InitEnabled; - bOccupied = InitOccupied; -} -*/ void TCab::Load(cParser &Parser) { // NOTE: clearing control tables here is bit of a crutch, imposed by current scheme of loading compartments anew on each cab change @@ -95,15 +59,15 @@ void TCab::Load(cParser &Parser) { Parser.getTokens( 9, false ); Parser - >> dimm_r - >> dimm_g - >> dimm_b - >> intlit_r - >> intlit_g - >> intlit_b - >> intlitlow_r - >> intlitlow_g - >> intlitlow_b; + >> dimm.r + >> dimm.g + >> dimm.b + >> intlit.r + >> intlit.g + >> intlit.b + >> intlitlow.r + >> intlitlow.g + >> intlitlow.b; Parser.getTokens(); Parser >> token; } CabPos1.x = std::stod( token ); @@ -119,14 +83,6 @@ void TCab::Load(cParser &Parser) bOccupied = true; } -TCab::~TCab() -{ -/* - delete[] ggList; - delete[] btList; -*/ -}; - TGauge &TCab::Gauge(int n) { // pobranie adresu obiektu aniomowanego ruchem /* @@ -427,12 +383,13 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) } PyObject *TTrain::GetTrainState() { - PyObject *dict = PyDict_New(); - if( dict == NULL ) { - return NULL; - } auto const &mover = DynamicObject->MoverParameters; + auto *dict = PyDict_New(); + if( ( dict == nullptr ) + || ( mover == nullptr ) ) { + return nullptr; + } PyDict_SetItemString( dict, "cab", PyGetInt( mover->ActiveCab ) ); // basic systems state data @@ -3110,7 +3067,8 @@ void TTrain::OnCommand_radiochanneldecrease( TTrain *Train, command_data const & void TTrain::OnCommand_radiostopsend( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { - if( true == Train->mvOccupied->Radio ) { + if( ( true == Train->mvOccupied->Radio ) + && ( Train->mvControlled->Battery || Train->mvControlled->ConverterFlag ) ) { simulation::Region->RadioStop( Train->Dynamic()->GetPosition() ); } // visual feedback @@ -3125,7 +3083,8 @@ void TTrain::OnCommand_radiostopsend( TTrain *Train, command_data const &Command void TTrain::OnCommand_radiostoptest( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { - if( Train->RadioChannel() == 10 ) { + if( ( Train->RadioChannel() == 10 ) + && ( Train->mvControlled->Battery || Train->mvControlled->ConverterFlag ) ) { Train->Dynamic()->RadioStop(); } // visual feedback diff --git a/Train.h b/Train.h index bb4e79ab..9b7d6807 100644 --- a/Train.h +++ b/Train.h @@ -28,35 +28,27 @@ const float fConverterPrzekaznik = 1.5f; // hunter-261211: do przekaznika nadmia // const double fBuzzerTime= 5.0f; const float fHaslerTime = 1.2f; -class TCab -{ - public: - TCab(); - ~TCab(); -/* - void Init(double Initx1, double Inity1, double Initz1, double Initx2, double Inity2, double Initz2, bool InitEnabled, bool InitOccupied); -*/ +class TCab { + +public: +// methods void Load(cParser &Parser); - Math3D::vector3 CabPos1; - Math3D::vector3 CabPos2; - bool bEnabled; - bool bOccupied; - double dimm_r, dimm_g, dimm_b; // McZapkie-120503: tlumienie swiatla - double intlit_r, intlit_g, intlit_b; // McZapkie-120503: oswietlenie kabiny - double intlitlow_r, intlitlow_g, intlitlow_b; // McZapkie-120503: przyciemnione oswietlenie kabiny - private: -/* - TGauge *ggList; // Ra 2014-08: lista animacji macierzowych (gałek) w kabinie - int iGaugesMax, iGauges; // ile miejsca w tablicy i ile jest w użyciu - TButton *btList; // Ra 2014-08: lista animacji dwustanowych (lampek) w kabinie - int iButtonsMax, iButtons; // ile miejsca w tablicy i ile jest w użyciu -*/ - std::vector ggList; - std::vector btList; - public: - TGauge &Gauge(int n = -1); // pobranie adresu obiektu - TButton &Button(int n = -1); // pobranie adresu obiektu void Update(); +// members + Math3D::vector3 CabPos1 { 0, 1, 1 }; + Math3D::vector3 CabPos2 { 0, 1, -1 }; + bool bEnabled { false }; + bool bOccupied { true }; + glm::vec3 dimm; // McZapkie-120503: tlumienie swiatla + glm::vec3 intlit; // McZapkie-120503: oswietlenie kabiny + glm::vec3 intlitlow; // McZapkie-120503: przyciemnione oswietlenie kabiny + TGauge &Gauge( int n = -1 ); // pobranie adresu obiektu + TButton &Button( int n = -1 ); // pobranie adresu obiektu + +private: +// members + std::vector ggList; + std::vector btList; }; class control_mapper { @@ -449,13 +441,13 @@ public: // reszta może by?publiczna sound_source rsHissE { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // nagle sound_source rsHissX { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // fala sound_source rsHissT { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // czasowy - sound_source rsSBHiss { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // local + sound_source rsSBHiss { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // local sound_source rsSBHissU { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // local, engage brakes float m_lastlocalbrakepressure { -1.f }; // helper, cached level of pressure in local brake cylinder float m_localbrakepressurechange { 0.f }; // recent change of pressure in local brake cylinder sound_source rsFadeSound { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; - sound_source rsRunningNoise{ sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE }; + sound_source rsRunningNoise{ sound_placement::internal, EU07_SOUND_GLOBALRANGE }; sound_source dsbHasler { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbBuzzer { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; diff --git a/audio.cpp b/audio.cpp index 8d9da55b..5b5ddaaf 100644 --- a/audio.cpp +++ b/audio.cpp @@ -30,16 +30,21 @@ openal_buffer::openal_buffer( std::string const &Filename ) : if( Filename.substr( Filename.rfind( '.' ) ) == ".wav" ) { // .wav file auto *file { drwav_open_file( Filename.c_str() ) }; - rate = file->sampleRate; - auto const samplecount { static_cast( file->totalSampleCount ) }; - data.resize( samplecount ); - drwav_read_s16( - file, - samplecount, - &data[ 0 ] ); - if( file->channels > 1 ) { - narrow_to_mono( file->channels ); - data.resize( samplecount / file->channels ); + if( file != nullptr ) { + rate = file->sampleRate; + auto const samplecount{ static_cast( file->totalSampleCount ) }; + data.resize( samplecount ); + drwav_read_s16( + file, + samplecount, + &data[ 0 ] ); + if( file->channels > 1 ) { + narrow_to_mono( file->channels ); + data.resize( samplecount / file->channels ); + } + } + else { + ErrorLog( "Bad file: failed do load audio file \"" + Filename + "\"", logtype::file ); } // we're done with the disk data drwav_close( file ); @@ -47,26 +52,32 @@ openal_buffer::openal_buffer( std::string const &Filename ) : else { // .flac or .ogg file auto *file { drflac_open_file( Filename.c_str() ) }; - rate = file->sampleRate; - auto const samplecount{ static_cast( file->totalSampleCount ) }; - data.resize( samplecount ); - drflac_read_s16( - file, - samplecount, - &data[ 0 ] ); - if( file->channels > 1 ) { - narrow_to_mono( file->channels ); - data.resize( samplecount / file->channels ); + if( file != nullptr ) { + rate = file->sampleRate; + auto const samplecount{ static_cast( file->totalSampleCount ) }; + data.resize( samplecount ); + drflac_read_s16( + file, + samplecount, + &data[ 0 ] ); + if( file->channels > 1 ) { + narrow_to_mono( file->channels ); + data.resize( samplecount / file->channels ); + } + } + else { + ErrorLog( "Bad file: failed do load audio file \"" + Filename + "\"", logtype::file ); } // we're done with the disk data drflac_close( file ); } - // send the data to openal side - ::alBufferData( id, AL_FORMAT_MONO16, data.data(), data.size() * sizeof( std::int16_t ), rate ); - // and get rid of the source, we shouldn't need it anymore - // TBD, TODO: delay data fetching and transfers until the buffer is actually used? - std::vector().swap( data ); - + if( false == data.empty() ) { + // send the data to openal side + ::alBufferData( id, AL_FORMAT_MONO16, data.data(), data.size() * sizeof( std::int16_t ), rate ); + // and get rid of the source, we shouldn't need it anymore + // TBD, TODO: delay data fetching and transfers until the buffer is actually used? + std::vector().swap( data ); + } fetch_caption(); } @@ -166,7 +177,7 @@ buffer_manager::create( std::string const &Filename ) { return emplace( filelookup ); } // if we still didn't find anything, give up - ErrorLog( "Bad file: failed do locate audio file \"" + Filename + "\"" ); + ErrorLog( "Bad file: failed do locate audio file \"" + Filename + "\"", logtype::file ); return null_handle; } diff --git a/sound.h b/sound.h index 9fea133e..56300924 100644 --- a/sound.h +++ b/sound.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "classes.h" #include "names.h" +float const EU07_SOUND_GLOBALRANGE { -1.f }; float const EU07_SOUND_CABCONTROLSCUTOFFRANGE { 7.5f }; float const EU07_SOUND_BRAKINGCUTOFFRANGE { 100.f }; float const EU07_SOUND_RUNNINGNOISECUTOFFRANGE { 200.f }; diff --git a/version.h b/version.h index 7d31f588..e50d1e4f 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 131 +#define VERSION_MINOR 202 #define VERSION_REVISION 0 From e8bb25454e9650f16e1ab60754063b72b758605a Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 3 Feb 2018 17:37:46 +0100 Subject: [PATCH 268/426] pre-merge syncs --- Classes.h | 2 +- Console.cpp | 2 +- DynObj.cpp | 20 +------------------- EU07.cpp | 18 ++++++++---------- EvLaunch.cpp | 2 +- Event.cpp | 4 ++-- Event.h | 4 ---- Globals.cpp | 2 +- Model3d.cpp | 17 +++++++++-------- World.cpp | 5 ++--- dumb3d.h | 2 +- messaging.cpp | 24 +++++++++++++++++++----- mouseinput.cpp | 3 +-- openglgeometrybank.h | 2 +- openglmatrixstack.h | 2 +- scene.h | 4 ---- simulation.cpp | 10 ---------- simulation.h | 4 ---- stdafx.h | 6 +++--- utilities.cpp | 2 +- 20 files changed, 53 insertions(+), 82 deletions(-) diff --git a/Classes.h b/Classes.h index 51ceaa35..202ac2aa 100644 --- a/Classes.h +++ b/Classes.h @@ -27,8 +27,8 @@ class sound_source; class TEventLauncher; class TTraction; // drut class TTractionPowerSource; // zasilanie drutów -class TCamera; class TWorld; +class TCamera; class simulation_time; class TMoverParameters; diff --git a/Console.cpp b/Console.cpp index db6f2d1a..94712fa6 100644 --- a/Console.cpp +++ b/Console.cpp @@ -84,7 +84,7 @@ TKeyTrans Console::ktTable[4 * 256]; // Ra: bajer do migania LED-ami w klawiaturze void SetLedState( unsigned char Code, bool bOn ) { -#ifdef _WINDOWS +#ifdef _WIN32 if( bOn != ( ::GetKeyState( Code ) != 0 ) ) { keybd_event( Code, MapVirtualKey( Code, 0 ), KEYEVENTF_EXTENDEDKEY | 0, 0 ); keybd_event( Code, MapVirtualKey( Code, 0 ), KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, 0 ); diff --git a/DynObj.cpp b/DynObj.cpp index 4eda69ee..439a6bfc 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3833,24 +3833,6 @@ void TDynamicObject::RenderSounds() { // special events if( MoverParameters->EventFlag ) { - // TODO: dedicated sound, played alongside regular noise - if( true == TestFlag( MoverParameters->DamageFlag, dtrain_wheelwear ) ) { -#ifdef EU07_USE_OLD_SOUNDCODE - if( rsOuterNoise.AM != 0 ) { - rsOuterNoise.Stop(); - float am = rsOuterNoise.AM; - float fa = rsOuterNoise.FA; - float fm = rsOuterNoise.FM; - rsOuterNoise.Init( "lomotpodkucia.wav", -1, 0, 0, 0, true ); // MC: zmiana szumu na lomot - if( rsOuterNoise.AM == 1 ) - rsOuterNoise.AM = am; - rsOuterNoise.AA = 0.7; - rsOuterNoise.FA = fa; - rsOuterNoise.FM = fm; - } -#else -#endif - } // McZapkie: w razie wykolejenia if( true == TestFlag( MoverParameters->DamageFlag, dtrain_out ) ) { if( GetVelocity() > 0 ) { @@ -5441,7 +5423,7 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) for( auto const &destination : destinations ) { - auto material = TextureTest( destination ); + auto material = TextureTest( ToLower( destination ) ); if( false == material.empty() ) { m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Material( material ); break; diff --git a/EU07.cpp b/EU07.cpp index 50962461..966256bc 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -38,7 +38,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #pragma comment( lib, "glfw3.lib" ) #pragma comment( lib, "glew32s.lib" ) #else -#ifdef _WINDOWS +#ifdef _WIN32 #pragma comment( lib, "glfw3dll.lib" ) #else #pragma comment( lib, "glfw3.lib" ) @@ -47,9 +47,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #endif // build_static #pragma comment( lib, "opengl32.lib" ) #pragma comment( lib, "glu32.lib" ) -#pragma comment( lib, "dsound.lib" ) #pragma comment( lib, "openal32.lib") -#pragma comment( lib, "winmm.lib" ) #pragma comment( lib, "setupapi.lib" ) #pragma comment( lib, "python27.lib" ) #pragma comment (lib, "dbghelp.lib") @@ -218,7 +216,7 @@ void scroll_callback( GLFWwindow* window, double xoffset, double yoffset ) { } } -#ifdef _WINDOWS +#ifdef _WIN32 extern "C" { GLFWAPI HWND glfwGetWin32Window(GLFWwindow* window); @@ -241,14 +239,14 @@ int main(int argc, char *argv[]) // this will turn on FPE for #IND and zerodiv state = _control87( state & ~( _EM_ZERODIVIDE | _EM_INVALID ), _MCW_EM ); #endif -#ifdef _WINDOWS +#ifdef _WIN32 ::SetUnhandledExceptionFilter( unhandled_handler ); #endif if (!glfwInit()) return -1; -#ifdef _WINDOWS +#ifdef _WIN32 DeleteFile( "log.txt" ); DeleteFile( "errors.txt" ); _mkdir("logs"); @@ -394,7 +392,7 @@ int main(int argc, char *argv[]) return -1; } -#ifdef _WINDOWS +#ifdef _WIN32 // setup wrapper for base glfw window proc, to handle copydata messages Hwnd = glfwGetWin32Window( window ); BaseWindowProc = (WNDPROC)::SetWindowLongPtr( Hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc ); @@ -426,7 +424,7 @@ int main(int argc, char *argv[]) ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) ); return -1; } -#ifdef _WINDOWS +#ifdef _WIN32 Console *pConsole = new Console(); // Ra: nie wiem, czy ma to sens, ale jakoś zainicjowac trzeba #endif if( Global.iConvertModels < 0 ) { @@ -434,7 +432,7 @@ int main(int argc, char *argv[]) World.CreateE3D( "models\\" ); // rekurencyjne przeglądanie katalogów World.CreateE3D( "dynamic\\", true ); } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć -#ifdef _WINDOWS +#ifdef _WIN32 Console::On(); // włączenie konsoli #endif try { @@ -454,7 +452,7 @@ int main(int argc, char *argv[]) } TPythonInterpreter::killInstance(); -#ifdef _WINDOWS +#ifdef _WIN32 Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) SafeDelete( pConsole ); #endif diff --git a/EvLaunch.cpp b/EvLaunch.cpp index fbc02caa..bbc7dcfc 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -32,7 +32,7 @@ http://mozilla.org/MPL/2.0/. // and the high byte holds modifiers: 0x1 = shift, 0x2 = ctrl, 0x4 = alt int vk_to_glfw_key( int const Keycode ) { -#ifdef _WINDOWS +#ifdef _WIN32 auto const code = VkKeyScan( Keycode ); char key = code & 0xff; char shiftstate = ( code & 0xff00 ) >> 8; diff --git a/Event.cpp b/Event.cpp index cc0d1dcd..4fcc7a1a 100644 --- a/Event.cpp +++ b/Event.cpp @@ -50,10 +50,10 @@ TEvent::~TEvent() { SafeDeleteArray(Params[10].asText); break; case tp_Animation: // nic - // SafeDeleteArray(Params[9].asText); //nie usuwać - nazwa jest zamieniana na wskaźnik do - // submodelu + // SafeDeleteArray(Params[9].asText); //nie usuwać - nazwa jest zamieniana na wskaźnik do submodelu if (Params[0].asInt == 4) // jeśli z pliku VMD SafeDeleteArray( Params[8].asPointer ); // zwolnić obszar + break; case tp_GetValues: // nic break; case tp_PutValues: // params[0].astext stores the token diff --git a/Event.h b/Event.h index d6492795..6ae2fa92 100644 --- a/Event.h +++ b/Event.h @@ -72,11 +72,7 @@ union TParam bool asBool; double asdouble; int asInt; -#ifdef EU07_USE_OLD_SOUNDCODE - TTextSound *tsTextSound; -#else sound_source *tsTextSound; -#endif char *asText; TCommandType asCommand; TTractionPowerSource *psPower; diff --git a/Globals.cpp b/Globals.cpp index c5717682..e40eb860 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -704,7 +704,7 @@ global_settings::ConfigParse(cParser &Parser) { // TBD: remove, or launch depending on passed flag? if (qp) { // to poniżej wykonywane tylko raz, jedynie po wczytaniu eu07.ini*/ -#ifdef _WINDOWS +#ifdef _WIN32 Console::ModeSet(iFeedbackMode, iFeedbackPort); // tryb pracy konsoli sterowniczej #endif /*iFpsRadiusMax = 0.000025 * fFpsRadiusMax * diff --git a/Model3d.cpp b/Model3d.cpp index 7c9873b6..047cd899 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1111,7 +1111,6 @@ TModel3d::~TModel3d() { if (iFlags & 0x0200) { // wczytany z pliku tekstowego, submodele sprzątają same SafeDelete( Root ); -// Root = nullptr; } else { // wczytano z pliku binarnego (jest właścicielem tablic) @@ -1121,17 +1120,19 @@ TModel3d::~TModel3d() { TSubModel *TModel3d::AddToNamed(const char *Name, TSubModel *SubModel) { - TSubModel *sm = Name ? GetFromName(Name) : NULL; + TSubModel *sm = Name ? GetFromName(Name) : nullptr; + if( ( sm == nullptr ) + && ( Name != nullptr ) && ( std::strcmp( Name, "none" ) != 0 ) ) { + ErrorLog( "Bad model: parent for sub-model \"" + SubModel->pName +"\" doesn't exist or is located after in the model data", logtype::model ); + } AddTo(sm, SubModel); // szukanie nadrzędnego return sm; // zwracamy wskaźnik do nadrzędnego submodelu }; -void TModel3d::AddTo(TSubModel *tmp, TSubModel *SubModel) -{ // jedyny poprawny sposób dodawania - // submodeli, inaczej mogą zginąć - // przy zapisie E3D - if (tmp) - { // jeśli znaleziony, podłączamy mu jako potomny +// jedyny poprawny sposób dodawania submodeli, inaczej mogą zginąć przy zapisie E3D +void TModel3d::AddTo(TSubModel *tmp, TSubModel *SubModel) { + if (tmp) { + // jeśli znaleziony, podłączamy mu jako potomny tmp->ChildAdd(SubModel); } else diff --git a/World.cpp b/World.cpp index dcdd40db..0f869be7 100644 --- a/World.cpp +++ b/World.cpp @@ -596,8 +596,7 @@ void TWorld::OnKeyDown(int cKey) { { // i potwierdzenie if( cKey == GLFW_KEY_Y ) { // flaga wyjścia z programu - ::PostQuitMessage( 0 ); -// Global.iTextMode = -1; + glfwSetWindowShouldClose( window, 1 ); } return; // nie przekazujemy do pociągu } @@ -1921,7 +1920,7 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic) double at{ 0.0 }; double shift{ 0.0 }; -#ifdef _WINDOWS +#ifdef _WIN32 std::string searchpattern( "*.*" ); diff --git a/dumb3d.h b/dumb3d.h index 2c59083b..ceec7c21 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -127,7 +127,7 @@ class matrix4x4 public: matrix4x4(void) { - ::SecureZeroMemory( e, sizeof( e ) ); + memset( e, 0, sizeof( e ) ); } // When defining matrices in C arrays, it is easiest to define them with diff --git a/messaging.cpp b/messaging.cpp index c9e59ded..41308f4d 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -15,26 +15,30 @@ http://mozilla.org/MPL/2.0/. #include "mtable.h" #include "logs.h" +#ifdef _WIN32 extern "C" { GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); //m7todo: potrzebne do directsound } +#endif namespace multiplayer { -#ifdef _WINDOWS void Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) { +#ifdef _WIN32 // wysłanie komunikatu do sterującego HWND h = FindWindow(ClassName.c_str(), 0); // można by to zapamiętać if (h == 0) h = FindWindow(0, ClassName.c_str()); // można by to zapamiętać SendMessage(h, Msg, wParam, lParam); +#endif } void WyslijEvent(const std::string &e, const std::string &d) { // Ra: jeszcze do wyczyszczenia +#ifdef _WIN32 DaneRozkaz r; r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = 2; // 2 - event @@ -49,12 +53,14 @@ WyslijEvent(const std::string &e, const std::string &d) cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + e + " sent" ); +#endif } void WyslijUszkodzenia(const std::string &t, char fl) { // wysłanie informacji w postaci pojedynczego tekstu - DaneRozkaz r; +#ifdef _WIN32 + DaneRozkaz r; r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = 13; // numer komunikatu size_t i = t.length(); @@ -67,11 +73,13 @@ WyslijUszkodzenia(const std::string &t, char fl) cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); +#endif } void WyslijString(const std::string &t, int n) { // wysłanie informacji w postaci pojedynczego tekstu +#ifdef _WIN32 DaneRozkaz r; r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = n; // numer komunikatu @@ -84,6 +92,7 @@ WyslijString(const std::string &t, int n) cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); +#endif } void @@ -95,7 +104,8 @@ WyslijWolny(const std::string &t) void WyslijNamiary(TDynamicObject const *Vehicle) { // wysłanie informacji o pojeździe - (float), długość ramki będzie zwiększana w miarę potrzeby - // WriteLog("Wysylam pojazd"); +#ifdef _WIN32 + // WriteLog("Wysylam pojazd"); DaneRozkaz r; r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = 7; // 7 - dane pojazdu @@ -167,12 +177,14 @@ WyslijNamiary(TDynamicObject const *Vehicle) Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); // WriteLog("Ramka poszla!"); CommLog( Now() + " " + std::to_string(r.iComm) + " " + Vehicle->asName + " sent"); +#endif } void WyslijObsadzone() { // wysłanie informacji o pojeździe - DaneRozkaz2 r; +#ifdef _WIN32 + DaneRozkaz2 r; r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = 12; // kod 12 for (int i=0; i<1984; ++i) r.cString[i] = 0; @@ -213,11 +225,13 @@ WyslijObsadzone() // WriteLog("Ramka gotowa"); Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " obsadzone" + " sent"); +#endif } void WyslijParam(int nr, int fl) { // wysłanie parametrów symulacji w ramce (nr) z flagami (fl) +#ifdef _WIN32 DaneRozkaz r; r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); r.iComm = nr; // zwykle 5 @@ -236,8 +250,8 @@ WyslijParam(int nr, int fl) cData.cbData = 12 + i; // 12+rozmiar danych cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); -} #endif +} } // multiplayer diff --git a/mouseinput.cpp b/mouseinput.cpp index 873d8b90..da2c7ee5 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -21,14 +21,13 @@ extern TWorld World; bool mouse_input::init() { -#ifdef _WINDOWS +#ifdef _WIN32 DWORD systemkeyboardspeed; ::SystemParametersInfo( SPI_GETKEYBOARDSPEED, 0, &systemkeyboardspeed, 0 ); m_updaterate = interpolate( 0.5, 0.04, systemkeyboardspeed / 31.0 ); DWORD systemkeyboarddelay; ::SystemParametersInfo( SPI_GETKEYBOARDDELAY, 0, &systemkeyboarddelay, 0 ); m_updatedelay = interpolate( 0.25, 1.0, systemkeyboarddelay / 3.0 ); - #endif return true; } diff --git a/openglgeometrybank.h b/openglgeometrybank.h index c2bf6ac2..dd937204 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include "GL/glew.h" -#ifdef _WINDOWS +#ifdef _WIN32 #include "GL/wglew.h" #endif #include "ResourceManager.h" diff --git a/openglmatrixstack.h b/openglmatrixstack.h index 4d988b8a..3859d21e 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. #include #include #include "GL/glew.h" -#ifdef _WINDOWS +#ifdef _WIN32 #include "GL/wglew.h" #endif diff --git a/scene.h b/scene.h index c5e7e620..c7f2dd6e 100644 --- a/scene.h +++ b/scene.h @@ -105,11 +105,7 @@ public: insert( TAnimModel *Instance ); // adds provided sound instance to the cell void -#ifdef EU07_USE_OLD_SOUNDCODE - insert( TTextSound *Sound ); -#else insert( sound_source *Sound ); -#endif // adds provided event launcher to the cell void insert( TEventLauncher *Launcher ); diff --git a/simulation.cpp b/simulation.cpp index 4140e443..d9c2b8b3 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -832,11 +832,7 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch return vehicle; } -#ifdef EU07_USE_OLD_SOUNDCODE -TTextSound * -#else sound_source * -#endif state_manager::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { glm::dvec3 location; @@ -848,16 +844,10 @@ state_manager::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpa // adjust location location = transform( location, Scratchpad ); -#ifdef EU07_USE_OLD_SOUNDCODE - auto const soundname { Input.getToken() }; - auto *sound = new TTextSound( soundname, Nodedata.range_max, location.x, location.y, location.z, false, false, Nodedata.range_min ); - sound->name( Nodedata.name ); -#else auto *sound = new sound_source( sound_placement::external, Nodedata.range_max ); sound->offset( location ); sound->name( Nodedata.name ); sound->deserialize( Input, sound_type::single ); -#endif skip_until( Input, "endsound" ); diff --git a/simulation.h b/simulation.h index ceceb2ac..0a344aa8 100644 --- a/simulation.h +++ b/simulation.h @@ -64,11 +64,7 @@ private: TEventLauncher * deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TAnimModel * deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); TDynamicObject * deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); -#ifdef EU07_USE_OLD_SOUNDCODE - TTextSound * deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); -#else sound_source * deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); -#endif // skips content of stream until specified token void skip_until( cParser &Input, std::string const &Token ); // transforms provided location by specifed rotation and offset diff --git a/stdafx.h b/stdafx.h index 9a043076..c2bcfa2b 100644 --- a/stdafx.h +++ b/stdafx.h @@ -18,7 +18,7 @@ #endif // _DEBUG #endif // operating system -#ifdef _WINDOWS +#ifdef _WIN32 #include "targetver.h" #define NOMINMAX #include @@ -73,12 +73,12 @@ #ifdef EU07_BUILD_STATIC #define GLEW_STATIC #else -#ifdef _WINDOWS +#ifdef _WIN32 #define GLFW_DLL #endif // _windows #endif // build_static #include "GL/glew.h" -#ifdef _WINDOWS +#ifdef _WIN32 #include "GL/wglew.h" #endif #define GLFW_INCLUDE_GLU diff --git a/utilities.cpp b/utilities.cpp index d515fb43..ac060970 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -84,7 +84,7 @@ bool ClearFlag( int &Flag, int const Value ) { } } -inline double Random(double a, double b) +double Random(double a, double b) { std::uniform_real_distribution<> dis(a, b); return dis(Global.random_engine); From 8b749394607da8c2424a07191ca97906747161f3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 6 Feb 2018 03:03:19 +0100 Subject: [PATCH 269/426] serial port input devices communication module replacement --- Button.cpp | 2 + Button.h | 6 +- Console.cpp | 225 ++++++------------------------ Console.h | 2 - EU07.cpp | 7 + Globals.cpp | 134 ++++++------------ Globals.h | 23 +--- Train.cpp | 287 +++++++++++++++++++++++++++------------ Train.h | 34 ++++- command.cpp | 7 +- command.h | 14 +- gamepadinput.cpp | 8 ++ keyboardinput.cpp | 12 +- maszyna.vcxproj.filters | 12 +- mouseinput.cpp | 10 +- {Console => old}/MWD.cpp | 0 {Console => old}/MWD.h | 0 uart.cpp | 243 +++++++++++++++++++++++++++++++++ uart.h | 92 +++++++++++++ 19 files changed, 712 insertions(+), 406 deletions(-) rename {Console => old}/MWD.cpp (100%) rename {Console => old}/MWD.h (100%) create mode 100644 uart.cpp create mode 100644 uart.h diff --git a/Button.cpp b/Button.cpp index 7ff6a3e9..cddcee09 100644 --- a/Button.cpp +++ b/Button.cpp @@ -132,6 +132,7 @@ void TButton::Update() { if( pModelOn != nullptr ) { pModelOn->iVisible = m_state; } if( pModelOff != nullptr ) { pModelOff->iVisible = (!m_state); } +#ifdef _WIN32 if (iFeedbackBit) { // jeżeli generuje informację zwrotną if (m_state) // zapalenie @@ -139,6 +140,7 @@ void TButton::Update() { else Console::BitsClear(iFeedbackBit); } +#endif }; void TButton::AssignBool(bool const *bValue) { diff --git a/Button.h b/Button.h index 5ac94579..7eced4e4 100644 --- a/Button.h +++ b/Button.h @@ -19,10 +19,14 @@ public: // methods TButton() = default; void Clear(int const i = -1); - inline void FeedbackBitSet( int const i ) { + inline + void FeedbackBitSet( int const i ) { iFeedbackBit = 1 << i; }; void Turn( bool const State ); inline + bool GetValue() const { + return ( m_state ? 1 : 0 ); } + inline bool Active() { return ( ( pModelOn != nullptr ) || ( pModelOff != nullptr ) ); } diff --git a/Console.cpp b/Console.cpp index 94712fa6..5dc0cd3e 100644 --- a/Console.cpp +++ b/Console.cpp @@ -12,7 +12,6 @@ http://mozilla.org/MPL/2.0/. #include "Globals.h" #include "LPT.h" #include "Logs.h" -#include "MWD.h" // maciek001: obsluga portu COM #include "PoKeys55.h" #include "utilities.h" @@ -54,31 +53,6 @@ Działanie jest następujące: /*******************************/ -/* //kod do przetrawienia: -//aby się nie włączacz wygaszacz ekranu, co jakiś czas naciska się wirtualnie ScrollLock - -[DllImport("user32.dll")] -static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo); - -private static void PressScrollLock() -{//przyciska i zwalnia ScrollLock - const byte vkScroll = 0x91; - const byte keyeventfKeyup = 0x2; - keybd_event(vkScroll, 0x45, 0, (UIntPtr)0); - keybd_event(vkScroll, 0x45, keyeventfKeyup, (UIntPtr)0); -}; - -[DllImport("user32.dll")] -private static extern bool SystemParametersInfo(int uAction,int uParam,int &lpvParam,int flags); - -public static Int32 GetScreenSaverTimeout() -{ - Int32 value=0; - SystemParametersInfo(14,0,&value,0); - return value; -}; -*/ - // static class member storage allocation TKeyTrans Console::ktTable[4 * 256]; @@ -99,7 +73,6 @@ int Console::iMode = 0; int Console::iConfig = 0; TPoKeys55 *Console::PoKeys55[2] = {NULL, NULL}; TLPT *Console::LPT = NULL; -TMWDComm *Console::MWDComm = NULL; // maciek001: obiekt dla MWD int Console::iSwitch[8]; // bistabilne w kabinie, załączane z [Shift], wyłączane bez int Console::iButton[8]; // monostabilne w kabinie, załączane podczas trzymania klawisza @@ -111,14 +84,12 @@ Console::Console() iSwitch[i] = 0; // bity 0..127 - bez [Ctrl], 128..255 - z [Ctrl] iButton[i] = 0; // bity 0..127 - bez [Shift], 128..255 - z [Shift] } - MWDComm = NULL; }; Console::~Console() { delete PoKeys55[0]; delete PoKeys55[1]; - delete MWDComm; }; void Console::ModeSet(int m, int h) @@ -166,18 +137,6 @@ int Console::On() break; } - if (Global.bMWDmasterEnable) - { - WriteLog("Opening ComPort"); - MWDComm = new TMWDComm(); - if (!(MWDComm->Open())) // jeżeli nie otwarł portu - { - WriteLog("ERROR: ComPort is NOT OPEN!"); - delete MWDComm; - MWDComm = NULL; - } - } - return 0; }; @@ -190,14 +149,9 @@ void Console::Off() SetLedState(VK_SCROLL, true); // przyciśnięty SetLedState(VK_SCROLL, false); // zwolniony } - delete PoKeys55[0]; - PoKeys55[0] = NULL; - delete PoKeys55[1]; - PoKeys55[1] = NULL; - delete LPT; - LPT = NULL; - delete MWDComm; - MWDComm = NULL; + SafeDelete( PoKeys55[0] ); + SafeDelete( PoKeys55[1] ); + SafeDelete( LPT ); }; void Console::BitsSet(int mask, int entry) @@ -289,56 +243,6 @@ void Console::BitsUpdate(int mask) } break; } - if (Global.bMWDmasterEnable) - { - // maciek001: MWDComm lampki i kontrolki - // out3: ogrzewanie sk?adu, opory rozruchowe, poslizg, zaluzjewent, -, -, czuwak, shp - // out4: stycz.liniowe, pezekaznikr??nicobwpomoc, nadmiarprzetw, roznicowy obw. g?, nadmiarsilniki, wylszybki, zanikpr?duprzyje?dzienaoporach, nadmiarsprezarki - // out5: HASLER */ - if (mask & 0x0001) if (iBits & 1) { - MWDComm->WriteDataBuff[4] |= 1 << 7; // SHP HASLER też - if (!MWDComm->bSHPstate) { - MWDComm->bSHPstate = true; - MWDComm->bPrzejazdSHP = true; - } - else MWDComm->bPrzejazdSHP = false; - } - else { - MWDComm->WriteDataBuff[4] &= ~(1 << 7); - MWDComm->bPrzejazdSHP = false; - MWDComm->bSHPstate = false; - } - if (mask & 0x0002) if (iBits & 2) MWDComm->WriteDataBuff[4] |= 1 << 6; // CA - else MWDComm->WriteDataBuff[4] &= ~(1 << 6); - if (mask & 0x0004) if (iBits & 4) MWDComm->WriteDataBuff[4] |= 1 << 1; // jazda na oporach rozruchowych - else MWDComm->WriteDataBuff[4] &= ~(1 << 1); - if (mask & 0x0008) if (iBits & 8) MWDComm->WriteDataBuff[5] |= 1 << 5; // wyłącznik szybki - else MWDComm->WriteDataBuff[5] &= ~(1 << 5); - if (mask & 0x0010) if (iBits & 0x10) MWDComm->WriteDataBuff[5] |= 1 << 4; // nadmiarowy silników trakcyjnych - else MWDComm->WriteDataBuff[5] &= ~(1 << 4); - if (mask & 0x0020) if (iBits & 0x20) MWDComm->WriteDataBuff[5] |= 1 << 0; // styczniki liniowe - else MWDComm->WriteDataBuff[5] &= ~(1 << 0); - if (mask & 0x0040) if (iBits & 0x40) MWDComm->WriteDataBuff[4] |= 1 << 2; // poślizg - else MWDComm->WriteDataBuff[4] &= ~(1 << 2); - if (mask & 0x0080) if (iBits & 0x80) MWDComm->WriteDataBuff[5] |= 1 << 2; // (nadmiarowy) przetwornicy? ++ - else MWDComm->WriteDataBuff[5] &= ~(1 << 2); - if (mask & 0x0100) if (iBits & 0x100) MWDComm->WriteDataBuff[5] |= 1 << 7; // nadmiarowy sprężarki - else MWDComm->WriteDataBuff[5] &= ~(1 << 7); - if (mask & 0x0200) if (iBits & 0x200) MWDComm->WriteDataBuff[2] |= 1 << 1; // wentylatory i opory - else MWDComm->WriteDataBuff[2] &= ~(1 << 1); - if (mask & 0x0400) if (iBits & 0x400) MWDComm->WriteDataBuff[2] |= 1 << 2; // wysoki rozruch - else MWDComm->WriteDataBuff[2] &= ~(1 << 2); - if (mask & 0x0800) if (iBits & 0x800) MWDComm->WriteDataBuff[4] |= 1 << 0; // ogrzewanie pociągu - else MWDComm->WriteDataBuff[4] &= ~(1 << 0); - if (mask & 0x1000) if (iBits & 0x1000) MWDComm->bHamowanie = true; // hasler: ciśnienie w hamulcach HASLER rysik 2 - else MWDComm->bHamowanie = false; - if (mask & 0x2000) if (iBits & 0x2000) MWDComm->WriteDataBuff[6] |= 1 << 4; // hasler: prąd "na" silnikach - HASLER rysik 3 - else MWDComm->WriteDataBuff[6] &= ~(1 << 4); - if (mask & 0x4000) if (iBits & 0x4000) MWDComm->WriteDataBuff[6] |= 1 << 7; // brzęczyk SHP/CA - else MWDComm->WriteDataBuff[6] &= ~(1 << 7); - //if(mask & 0x8000) if(iBits & 0x8000) MWDComm->WriteDataBuff[1] |= 1<<7; (puste) - //else MWDComm->WriteDataBuff[0] &= ~(1<<7); - } }; bool Console::Pressed(int x) @@ -351,85 +255,39 @@ bool Console::Pressed(int x) void Console::ValueSet(int x, double y) { // ustawienie wartości (y) na kanale analogowym (x) - if (iMode == 4) - if (PoKeys55[0]) - { - x = Global.iPoKeysPWM[x]; - if (Global.iCalibrateOutDebugInfo == x) - WriteLog("CalibrateOutDebugInfo: oryginal=" + std::to_string(y)); - if (Global.fCalibrateOutMax[x] > 0) - { - y = clamp( y, 0.0, Global.fCalibrateOutMax[x]); - if (Global.iCalibrateOutDebugInfo == x) - WriteLog(" cutted=" + std::to_string(y)); - y = y / Global.fCalibrateOutMax[x]; // sprowadzenie do <0,1> jeśli podana - // maksymalna wartość - if (Global.iCalibrateOutDebugInfo == x) - WriteLog(" fraction=" + std::to_string(y)); - } - double temp = (((((Global.fCalibrateOut[x][5] * y) + Global.fCalibrateOut[x][4]) * y + - Global.fCalibrateOut[x][3]) * - y + - Global.fCalibrateOut[x][2]) * - y + - Global.fCalibrateOut[x][1]) * - y + - Global.fCalibrateOut[x][0]; // zakres <0;1> - if (Global.iCalibrateOutDebugInfo == x) - WriteLog(" calibrated=" + std::to_string(temp)); - PoKeys55[0]->PWM(x, temp); + if( iMode != 4 ) { return; } + + if (PoKeys55[0]) + { + x = Global.iPoKeysPWM[x]; + if( Global.iCalibrateOutDebugInfo == x ) { + WriteLog( "CalibrateOutDebugInfo: oryginal=" + std::to_string( y ) ); } - if (Global.bMWDmasterEnable) - { - unsigned int iliczba; - switch (x) - { - case 0: iliczba = (unsigned int)floor((y / (Global.fMWDzg[0] * 10) * Global.fMWDzg[1]) + 0.5); // zbiornik główny - MWDComm->WriteDataBuff[12] = (unsigned char)(iliczba >> 8); - MWDComm->WriteDataBuff[11] = (unsigned char)iliczba; - if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Main tank press " + to_string(MWDComm->WriteDataBuff[12]) + " " + to_string(MWDComm->WriteDataBuff[11])); - break; - case 1: iliczba = (unsigned int)floor((y / (Global.fMWDpg[0] * 10) * Global.fMWDpg[1]) + 0.5); // przewód główny - MWDComm->WriteDataBuff[10] = (unsigned char)(iliczba >> 8); - MWDComm->WriteDataBuff[9] = (unsigned char)iliczba; - if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Main pipe press " + to_string(MWDComm->WriteDataBuff[10]) + " " + to_string(MWDComm->WriteDataBuff[9])); - break; - case 2: iliczba = (unsigned int)floor((y / (Global.fMWDph[0] * 10) * Global.fMWDph[1]) + 0.5); // cylinder hamulcowy - MWDComm->WriteDataBuff[8] = (unsigned char)(iliczba >> 8); - MWDComm->WriteDataBuff[7] = (unsigned char)iliczba; - if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Break press " + to_string(MWDComm->WriteDataBuff[8]) + " " + to_string(MWDComm->WriteDataBuff[7])); - break; - case 3: iliczba = (unsigned int)floor((y / Global.fMWDvolt[0] * Global.fMWDvolt[1]) + 0.5); // woltomierz WN - MWDComm->WriteDataBuff[14] = (unsigned char)(iliczba >> 8); - MWDComm->WriteDataBuff[13] = (unsigned char)iliczba; - if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Hi Volt meter " + to_string(MWDComm->WriteDataBuff[14]) + " " + to_string(MWDComm->WriteDataBuff[13])); - break; - case 4: iliczba = (unsigned int)floor((y / Global.fMWDamp[0] * Global.fMWDamp[1]) + 0.5); // amp WN 1 - MWDComm->WriteDataBuff[16] = (unsigned char)(iliczba >> 8); - MWDComm->WriteDataBuff[15] = (unsigned char)iliczba; - if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Apm meter1 " + to_string(MWDComm->WriteDataBuff[16]) + " " + to_string(MWDComm->WriteDataBuff[15])); - break; - case 5: iliczba = (unsigned int)floor((y / Global.fMWDamp[0] * Global.fMWDamp[1]) + 0.5); // amp WN 2 - MWDComm->WriteDataBuff[18] = (unsigned char)(iliczba >> 8); - MWDComm->WriteDataBuff[17] = (unsigned char)iliczba; - if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Apm meter2 " + to_string(MWDComm->WriteDataBuff[18]) + " " + to_string(MWDComm->WriteDataBuff[17])); - break; - case 6: iliczba = (unsigned int)floor((y / Global.fMWDamp[0] * Global.fMWDamp[1]) + 0.5); // amp WN 3 - MWDComm->WriteDataBuff[20] = (unsigned int)(iliczba >> 8); - MWDComm->WriteDataBuff[19] = (unsigned char)iliczba; - if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Apm meter3 " + to_string(MWDComm->WriteDataBuff[20]) + " " + to_string(MWDComm->WriteDataBuff[19])); - break; - case 7: if (Global.iPause) MWDComm->WriteDataBuff[0] = 0; //skoro pauza to hasler stoi i nie nabija kilometrów CHYBA NIE DZIAŁA! - else MWDComm->WriteDataBuff[0] = (unsigned char)floor(y); // prędkość dla np haslera - if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Speed: " + to_string(MWDComm->WriteDataBuff[0])); - break; - case 8: iliczba = (unsigned int)floor((y / Global.fMWDlowVolt[0] * Global.fMWDlowVolt[1]) + 0.5); // volt NN - MWDComm->WriteDataBuff[22] = (unsigned int)(iliczba >> 8); - MWDComm->WriteDataBuff[21] = (unsigned char)iliczba; - if (Global.bMWDmasterEnable && Global.iMWDDebugMode & 8) WriteLog("Low Volt meter " + to_string(MWDComm->WriteDataBuff[22]) + " " + to_string(MWDComm->WriteDataBuff[21])); - break; // przygotowane do wdrożenia, jeszcze nie wywoływane - } - } + if (Global.fCalibrateOutMax[x] > 0) + { + y = clamp( y, 0.0, Global.fCalibrateOutMax[x]); + if( Global.iCalibrateOutDebugInfo == x ) { + WriteLog( " cutted=" + std::to_string( y ) ); + } + // sprowadzenie do <0,1> jeśli podana maksymalna wartość + y = y / Global.fCalibrateOutMax[x]; + if( Global.iCalibrateOutDebugInfo == x ) { + WriteLog( " fraction=" + std::to_string( y ) ); + } + } + double temp = (((((Global.fCalibrateOut[x][5] * y) + Global.fCalibrateOut[x][4]) * y + + Global.fCalibrateOut[x][3]) * + y + + Global.fCalibrateOut[x][2]) * + y + + Global.fCalibrateOut[x][1]) * + y + + Global.fCalibrateOut[x][0]; // zakres <0;1> + if( Global.iCalibrateOutDebugInfo == x ) { + WriteLog( " calibrated=" + std::to_string( temp ) ); + } + PoKeys55[0]->PWM(x, temp); + } }; void Console::Update() @@ -447,11 +305,6 @@ void Console::Update() Global.iPause |= 8; // tak??? PoKeys55[0]->Connect(); // próba ponownego podłączenia } - if (Global.bMWDmasterEnable) - { - if (MWDComm->GetMWDState()) MWDComm->Run(); - else MWDComm->Close(); - } }; float Console::AnalogGet(int x) @@ -476,11 +329,6 @@ float Console::AnalogCalibrateGet(int x) if (x == 1) return b/10; else return b; } - if (Global.bMWDmasterEnable && Global.bMWDBreakEnable) - { - float b = (float)MWDComm->uiAnalog[x]; - return (b - Global.fMWDAnalogInCalib[x][0]) / (Global.fMWDAnalogInCalib[x][1] - Global.fMWDAnalogInCalib[x][0]); - } return -1.0; // odcięcie }; @@ -515,6 +363,7 @@ void Console::OnKeyDown(int k) } } }; + void Console::OnKeyUp(int k) { // puszczenie klawisza w zasadzie nie ma znaczenia dla iSwitch, ale zeruje iButton if ((k & 0x20000) == 0) // monostabilne tylko bez [Ctrl] @@ -523,10 +372,12 @@ void Console::OnKeyUp(int k) else iButton[char(k) >> 5] &= ~(1 << (k & 31)); // wyłącz monostabilny podstawowy }; + int Console::KeyDownConvert(int k) { return int(ktTable[k & 0x3FF].iDown); }; + int Console::KeyUpConvert(int k) { return int(ktTable[k & 0x3FF].iUp); diff --git a/Console.h b/Console.h index aedaff1f..fd9f6631 100644 --- a/Console.h +++ b/Console.h @@ -13,7 +13,6 @@ http://mozilla.org/MPL/2.0/. class TConsoleDevice; // urządzenie podłączalne za pomocą DLL class TPoKeys55; class TLPT; -class TMWDComm; // maciek001: dodana obsluga portu COM // klasy konwersji znaków wprowadzanych z klawiatury class TKeyTrans @@ -32,7 +31,6 @@ class Console static int iBits; // podstawowy zestaw lampek static TPoKeys55 *PoKeys55[2]; // może ich być kilka static TLPT *LPT; - static TMWDComm *MWDComm; // maciek001: na potrzeby MWD static void BitsUpdate(int mask); // zmienne dla trybu "jednokabinowego", potrzebne do współpracy z pulpitem (PoKeys) // używając klawiatury, każdy pojazd powinien mieć własny stan przełączników diff --git a/EU07.cpp b/EU07.cpp index 966256bc..ab3af211 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -32,6 +32,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "mouseinput.h" #include "gamepadinput.h" #include "Console.h" +#include "uart.h" #include "PyInt.h" #ifdef EU07_BUILD_STATIC @@ -50,6 +51,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #pragma comment( lib, "openal32.lib") #pragma comment( lib, "setupapi.lib" ) #pragma comment( lib, "python27.lib" ) +#pragma comment( lib, "libserialport-0.lib" ) #pragma comment (lib, "dbghelp.lib") #pragma comment (lib, "version.lib") #ifdef CAN_I_HAS_LIBPNG @@ -68,6 +70,7 @@ keyboard_input Keyboard; mouse_input Mouse; gamepad_input Gamepad; glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode +std::unique_ptr uart; } @@ -411,6 +414,9 @@ int main(int argc, char *argv[]) input::Keyboard.init(); input::Mouse.init(); input::Gamepad.init(); + if( true == Global.uart_conf.enable ) { + input::uart = std::make_unique(); + } Global.pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów try { @@ -443,6 +449,7 @@ int main(int argc, char *argv[]) input::Keyboard.poll(); if( true == Global.InputMouse ) { input::Mouse.poll(); } if( true == Global.InputGamepad ) { input::Gamepad.poll(); } + if( input::uart != nullptr ) { input::uart->poll(); } } } catch( std::bad_alloc const &Error ) { diff --git a/Globals.cpp b/Globals.cpp index e40eb860..62c33e69 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -579,102 +579,44 @@ global_settings::ConfigParse(cParser &Parser) { Parser.getTokens(); Parser >> InputGamepad; } - // maciek001: ustawienia MWD - else if (token == "mwdmasterenable") { // główne włączenie maszyny! - Parser.getTokens(); - Parser >> bMWDmasterEnable; - if (bMWDdebugEnable) WriteLog("SerialPort Master Enable"); - } - else if (token == "mwddebugenable") { // logowanie pracy - Parser.getTokens(); - Parser >> bMWDdebugEnable; - if (bMWDdebugEnable) WriteLog("MWD Debug Mode On"); - } - else if (token == "mwddebugmode") { // co ma być debugowane? - Parser.getTokens(1, false); - Parser >> iMWDDebugMode; - if (bMWDdebugEnable) WriteLog("Debug Mode = " + to_string(iMWDDebugMode)); - } - else if (token == "mwdcomportname") { // nazwa portu COM - Parser.getTokens(); - Parser >> sMWDPortId; - if (bMWDdebugEnable) WriteLog("PortName " + sMWDPortId); - } - else if (token == "mwdbaudrate") { // prędkość transmisji danych - Parser.getTokens(1, false); - Parser >> iMWDBaudrate; - if (bMWDdebugEnable) WriteLog("Baud rate = " + to_string((int)(iMWDBaudrate / 1000)) + (" kbps")); - } - else if (token == "mwdinputenable") { // włącz wejścia - Parser.getTokens(); - Parser >> bMWDInputEnable; - if (bMWDdebugEnable && bMWDInputEnable) WriteLog("MWD Input Enable"); - } - else if (token == "mwdbreakenable") { // włącz obsługę hamulców - Parser.getTokens(); - Parser >> bMWDBreakEnable; - if (bMWDdebugEnable && bMWDBreakEnable) WriteLog("MWD Break Enable"); - } - else if (token == "mwdmainbreakconfig") { // ustawienia hamulca zespolonego - Parser.getTokens(2, false); - Parser >> fMWDAnalogInCalib[0][0] >> fMWDAnalogInCalib[0][1]; - if (bMWDdebugEnable) WriteLog("Main break settings: " + to_string(fMWDAnalogInCalib[0][0]) + (" ") + to_string(fMWDAnalogInCalib[0][1])); - } - else if (token == "mwdlocbreakconfig") { // ustawienia hamulca lokomotywy - Parser.getTokens(2, false); - Parser >> fMWDAnalogInCalib[1][0] >> fMWDAnalogInCalib[1][1]; - if (bMWDdebugEnable) WriteLog("Locomotive break settings: " + to_string(fMWDAnalogInCalib[1][0]) + (" ") + to_string(fMWDAnalogInCalib[1][1])); - } - else if (token == "mwdanalogin1config") { // ustawienia hamulca zespolonego - Parser.getTokens(2, false); - Parser >> fMWDAnalogInCalib[2][0] >> fMWDAnalogInCalib[2][1]; - if (bMWDdebugEnable) WriteLog("Analog input 1 settings: " + to_string(fMWDAnalogInCalib[2][0]) + (" ") + to_string(fMWDAnalogInCalib[2][1])); - } - else if (token == "mwdanalogin2config") { // ustawienia hamulca lokomotywy - Parser.getTokens(2, false); - Parser >> fMWDAnalogInCalib[3][0] >> fMWDAnalogInCalib[3][1]; - if (bMWDdebugEnable) WriteLog("Analog input 2 settings: " + to_string(fMWDAnalogInCalib[3][0]) + (" ") + to_string(fMWDAnalogInCalib[3][1])); - } - else if (token == "mwdmaintankpress") { // max ciśnienie w zbiorniku głownym i rozdzielczość - Parser.getTokens(2, false); - Parser >> fMWDzg[0] >> fMWDzg[1]; - if (bMWDdebugEnable) WriteLog("MainAirTank settings: " + to_string(fMWDzg[0]) + (" ") + to_string(fMWDzg[1])); - } - else if (token == "mwdmainpipepress") { // max ciśnienie w przewodzie głownym i rozdzielczość - Parser.getTokens(2, false); - Parser >> fMWDpg[0] >> fMWDpg[1]; - if (bMWDdebugEnable) WriteLog("MainAirPipe settings: " + to_string(fMWDpg[0]) + (" ") + to_string(fMWDpg[1])); - } - else if (token == "mwdbreakpress") { // max ciśnienie w hamulcach i rozdzielczość - Parser.getTokens(2, false); - Parser >> fMWDph[0] >> fMWDph[1]; - if (bMWDdebugEnable) WriteLog("AirPipe settings: " + to_string(fMWDph[0]) + (" ") + to_string(fMWDph[1])); - } - else if (token == "mwdhivoltmeter") { // max napięcie na woltomierzu WN - Parser.getTokens(2, false); - Parser >> fMWDvolt[0] >> fMWDvolt[1]; - if (bMWDdebugEnable) WriteLog("VoltMeter settings: " + to_string(fMWDvolt[0]) + (" ") + to_string(fMWDvolt[1])); - } - else if (token == "mwdhiampmeter") { - Parser.getTokens(2, false); - Parser >> fMWDamp[0] >> fMWDamp[1]; - if (bMWDdebugEnable) WriteLog("Amp settings: " + to_string(fMWDamp[0]) + (" ") + to_string(fMWDamp[1])); - } - else if (token == "mwdlowvoltmeter") { - Parser.getTokens(2, false); - Parser >> fMWDlowVolt[0] >> fMWDlowVolt[1]; - if (bMWDdebugEnable) WriteLog("Low VoltMeter settings: " + to_string(fMWDlowVolt[0]) + (" ") + to_string(fMWDlowVolt[1])); - } - else if (token == "mwddivider") { - Parser.getTokens(1, false); - Parser >> iMWDdivider; - if (iMWDdivider == 0) - { - WriteLog("Dzielnik nie może być równy ZERO! Ustawiam na 1!"); - iMWDdivider = 1; - } - if (bMWDdebugEnable) WriteLog("Divider = " + to_string(iMWDdivider)); - } + else if( token == "uart" ) { + uart_conf.enable = true; + Parser.getTokens( 3, false ); + Parser + >> uart_conf.port + >> uart_conf.baud + >> uart_conf.updatetime; + } + else if( token == "uarttune" ) { + Parser.getTokens( 14 ); + Parser + >> uart_conf.mainbrakemin + >> uart_conf.mainbrakemax + >> uart_conf.localbrakemin + >> uart_conf.localbrakemax + >> uart_conf.tankmax + >> uart_conf.tankuart + >> uart_conf.pipemax + >> uart_conf.pipeuart + >> uart_conf.brakemax + >> uart_conf.brakeuart + >> uart_conf.hvmax + >> uart_conf.hvuart + >> uart_conf.currentmax + >> uart_conf.currentuart; + } + else if( token == "uartfeature" ) { + Parser.getTokens( 4 ); + Parser + >> uart_conf.mainenable + >> uart_conf.scndenable + >> uart_conf.trainenable + >> uart_conf.localenable; + } + else if( token == "uartdebug" ) { + Parser.getTokens( 1 ); + Parser >> uart_conf.debug; + } } while ((token != "") && (token != "endconfig")); //(!Parser->EndOfFile) // na koniec trochę zależności if (!bLoadTraction) // wczytywanie drutów i słupów diff --git a/Globals.h b/Globals.h index 19ecd7b3..59a8a487 100644 --- a/Globals.h +++ b/Globals.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "dumb3d.h" #include "float3d.h" #include "light.h" +#include "uart.h" #include "utilities.h" struct global_settings { @@ -60,8 +61,6 @@ struct global_settings { int iWriteLogEnabled{ 3 }; // maska bitowa: 1-zapis do pliku, 2-okienko, 4-nazwy torów bool MultipleLogs{ false }; unsigned int DisabledLogTypes{ 0 }; - bool bMWDdebugEnable{ false }; // włącz dodawanie do logu - int iMWDDebugMode{ 0 }; // co ma wyświetlać w logu // simulation bool RealisticControlMode{ false }; // controls ability to steer the vehicle from outside views bool bFreeFly{ false }; @@ -159,25 +158,7 @@ struct global_settings { 0, 0, 0, 0, 0, 0, 0 }; int iCalibrateOutDebugInfo { -1 }; // numer wyjścia kalibrowanego dla którego wyświetlać informacje podczas kalibracji int iPoKeysPWM[ 7 ] = { 0, 1, 2, 3, 4, 5, 6 }; // numery wejść dla PWM - // maciek001: konfiguracja wstępna portu COM - bool bMWDmasterEnable { false };// główne włączenie portu! - std::string sMWDPortId { "COM1" }; // nazwa portu z którego korzystamy - unsigned long int iMWDBaudrate{ 9600 }; // prędkość transmisji danych - bool bMWDInputEnable { false }; // włącz wejścia - bool bMWDBreakEnable { false }; // włącz wejścia analogowe - // wartość max potencjometru, wartość min potencjometru, rozdzielczość (max. wartość jaka może być) - double fMWDAnalogInCalib[ 4 ][ 2 ] = { - { 0, 1023 }, - { 0, 1023 }, - { 0, 1023 }, - { 0, 1023 } }; - double fMWDzg[ 2 ] = { 0.9, 1023 }; - double fMWDpg[ 2 ] = { 0.8, 1023 }; - double fMWDph[ 2 ] = { 0.6, 1023 }; - double fMWDvolt[ 2 ] = { 4000, 1023 }; - double fMWDamp[ 2 ] = { 800, 1023 }; - double fMWDlowVolt[ 2 ] = { 150, 1023 }; - int iMWDdivider { 5 }; + uart_input::conf_t uart_conf; // multiplayer int iMultiplayer{ 0 }; // blokada działania niektórych eventów na rzecz kominikacji // other diff --git a/Train.cpp b/Train.cpp index a121654d..100df383 100644 --- a/Train.cpp +++ b/Train.cpp @@ -159,19 +159,23 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::mastercontrollerincreasefast, &TTrain::OnCommand_mastercontrollerincreasefast }, { user_command::mastercontrollerdecrease, &TTrain::OnCommand_mastercontrollerdecrease }, { user_command::mastercontrollerdecreasefast, &TTrain::OnCommand_mastercontrollerdecreasefast }, + { user_command::mastercontrollerset, &TTrain::OnCommand_mastercontrollerset }, { user_command::secondcontrollerincrease, &TTrain::OnCommand_secondcontrollerincrease }, { user_command::secondcontrollerincreasefast, &TTrain::OnCommand_secondcontrollerincreasefast }, { user_command::secondcontrollerdecrease, &TTrain::OnCommand_secondcontrollerdecrease }, { user_command::secondcontrollerdecreasefast, &TTrain::OnCommand_secondcontrollerdecreasefast }, + { user_command::secondcontrollerset, &TTrain::OnCommand_secondcontrollerset }, { user_command::notchingrelaytoggle, &TTrain::OnCommand_notchingrelaytoggle }, { user_command::mucurrentindicatorothersourceactivate, &TTrain::OnCommand_mucurrentindicatorothersourceactivate }, { user_command::independentbrakeincrease, &TTrain::OnCommand_independentbrakeincrease }, { user_command::independentbrakeincreasefast, &TTrain::OnCommand_independentbrakeincreasefast }, { user_command::independentbrakedecrease, &TTrain::OnCommand_independentbrakedecrease }, { user_command::independentbrakedecreasefast, &TTrain::OnCommand_independentbrakedecreasefast }, + { user_command::independentbrakeset, &TTrain::OnCommand_independentbrakeset }, { user_command::independentbrakebailoff, &TTrain::OnCommand_independentbrakebailoff }, { user_command::trainbrakeincrease, &TTrain::OnCommand_trainbrakeincrease }, { user_command::trainbrakedecrease, &TTrain::OnCommand_trainbrakedecrease }, + { user_command::trainbrakeset, &TTrain::OnCommand_trainbrakeset }, { user_command::trainbrakecharging, &TTrain::OnCommand_trainbrakecharging }, { user_command::trainbrakerelease, &TTrain::OnCommand_trainbrakerelease }, { user_command::trainbrakefirstservice, &TTrain::OnCommand_trainbrakefirstservice }, @@ -437,9 +441,9 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "fuse", PyGetBool( mover->FuseFlag ) ); PyDict_SetItemString( dict, "epfuse", PyGetBool( mover->EpFuse )); // induction motor state data - char* TXTT[ 10 ] = { "fd", "fdt", "fdb", "pd", "pdt", "pdb", "itothv", "1", "2", "3" }; - char* TXTC[ 10 ] = { "fr", "frt", "frb", "pr", "prt", "prb", "im", "vm", "ihv", "uhv" }; - char* TXTP[ 3 ] = { "bc", "bp", "sp" }; + char const *TXTT[ 10 ] = { "fd", "fdt", "fdb", "pd", "pdt", "pdb", "itothv", "1", "2", "3" }; + char const *TXTC[ 10 ] = { "fr", "frt", "frb", "pr", "prt", "prb", "im", "vm", "ihv", "uhv" }; + char const *TXTP[ 3 ] = { "bc", "bp", "sp" }; for( int j = 0; j < 10; ++j ) PyDict_SetItemString( dict, ( std::string( "eimp_t_" ) + std::string( TXTT[ j ] ) ).c_str(), PyGetFloatS( fEIMParams[ 0 ][ j ] ) ); for( int i = 0; i < 8; ++i ) { @@ -496,6 +500,35 @@ PyObject *TTrain::GetTrainState() { return dict; } +TTrain::state_t +TTrain::get_state() const { + + return { + btLampkaSHP.GetValue(), + btLampkaCzuwaka.GetValue(), + btLampkaOpory.GetValue(), + btLampkaWylSzybki.GetValue(), + btLampkaNadmSil.GetValue(), + btLampkaStyczn.GetValue(), + btLampkaPoslizg.GetValue(), + btLampkaNadmPrzetw.GetValue(), + btLampkaPrzetwOff.GetValue(), + btLampkaNadmSpr.GetValue(), + btLampkaNadmWent.GetValue(), + btLampkaWysRozr.GetValue(), + btLampkaOgrzewanieSkladu.GetValue(), + btHaslerBrakes.GetValue(), + btHaslerCurrent.GetValue(), + ( TestFlag( mvOccupied->SecuritySystem.Status, s_CAalarm ) || TestFlag( mvOccupied->SecuritySystem.Status, s_SHPalarm ) ), + fTachoVelocity, + static_cast( mvOccupied->Compressor ), + static_cast( mvOccupied->PipePress ), + static_cast( mvOccupied->BrakePress ), + fHVoltage, + { fHCurrent[ ( mvControlled->TrainType & dt_EZT ) ? 0 : 1 ], fHCurrent[ 2 ], fHCurrent[ 3 ] } + }; +} + bool TTrain::is_eztoer() const { return @@ -596,6 +629,17 @@ void TTrain::OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data } } +void TTrain::OnCommand_mastercontrollerset( TTrain *Train, command_data const &Command ) { + + auto const targetposition { std::min( Command.param1, Train->mvControlled->MainCtrlPosNo ) }; + while( targetposition < Train->mvControlled->MainCtrlPos ) { + Train->mvControlled->DecMainCtrl( 1 ); + } + while( targetposition > Train->mvControlled->MainCtrlPos ) { + Train->mvControlled->IncMainCtrl( 1 ); + } +} + void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { @@ -678,6 +722,17 @@ void TTrain::OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data } } +void TTrain::OnCommand_secondcontrollerset( TTrain *Train, command_data const &Command ) { + + auto const targetposition { std::min( Command.param1, Train->mvControlled->ScndCtrlPosNo ) }; + while( targetposition < Train->mvControlled->ScndCtrlPos ) { + Train->mvControlled->DecScndCtrl( 1 ); + } + while( targetposition > Train->mvControlled->ScndCtrlPos ) { + Train->mvControlled->IncScndCtrl( 1 ); + } +} + void TTrain::OnCommand_independentbrakeincrease( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { @@ -724,6 +779,18 @@ void TTrain::OnCommand_independentbrakedecreasefast( TTrain *Train, command_data } } +void TTrain::OnCommand_independentbrakeset( TTrain *Train, command_data const &Command ) { + + Train->mvControlled->LocalBrakePos = ( + std::round( + interpolate( + 0.0, + LocalBrakePosNo, + clamp( + reinterpret_cast( Command.param1 ), + 0.0, 1.0 ) ) ) ); +} + void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data const &Command ) { if( false == FreeFlyModeFlag ) { @@ -801,6 +868,17 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co } } +void TTrain::OnCommand_trainbrakeset( TTrain *Train, command_data const &Command ) { + + Train->mvControlled->BrakeLevelSet( + interpolate( + Train->mvControlled->Handle->GetPos( bh_MIN ), + Train->mvControlled->Handle->GetPos( bh_MAX ), + clamp( + reinterpret_cast( Command.param1 ), + 0.0, 1.0 ) ) ); +} + void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Command ) { if( Command.action != GLFW_RELEASE ) { @@ -1293,6 +1371,8 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvOccupied->Battery ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + // wyłącznik jest też w SN61, ewentualnie załączać prąd na stałe z poziomu FIZ if( Train->mvOccupied->BatterySwitch( true ) ) { // bateria potrzebna np. do zapalenia świateł @@ -1312,6 +1392,8 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + if( Train->mvOccupied->BatterySwitch( false ) ) { // ewentualnie zablokować z FIZ, np. w samochodach się nie odłącza akumulatora if( Train->ggBatteryButton.SubModel ) { @@ -1334,6 +1416,8 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->PantFrontUp ) { // turn on... + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + Train->mvControlled->PantFrontSP = false; if( Train->mvControlled->PantFront( true ) ) { if( Train->mvControlled->PantFrontStart != 1 ) { @@ -1356,6 +1440,8 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const } else { // ...or turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + if( Train->mvOccupied->PantSwitchType == "impulse" ) { if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { @@ -1414,6 +1500,8 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->PantRearUp ) { // turn on... + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + Train->mvControlled->PantRearSP = false; if( Train->mvControlled->PantRear( true ) ) { if( Train->mvControlled->PantRearStart != 1 ) { @@ -1436,6 +1524,8 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & } else { // ...or turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + if( Train->mvOccupied->PantSwitchType == "impulse" ) { if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { @@ -1603,6 +1693,8 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com // press or hold... if( Train->m_linebreakerstate == 0 ) { // ...to close the circuit + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + if( Command.action == GLFW_PRESS ) { // fresh press, start fresh closing delay calculation Train->fMainRelayTimer = 0.0f; @@ -1649,6 +1741,8 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com } else if( Train->m_linebreakerstate == 1 ) { // ...to open the circuit + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + if( true == Train->mvControlled->MainSwitch( false ) ) { Train->m_linebreakerstate = -1; @@ -1755,6 +1849,8 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma if( ( false == Train->mvControlled->ConverterAllow ) && ( Train->ggConverterButton.GetValue() < 0.5 ) ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + // visual feedback Train->ggConverterButton.UpdateValue( 1.0, Train->dsbSwitch ); /* @@ -1782,6 +1878,8 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + // visual feedback Train->ggConverterButton.UpdateValue( 0.0, Train->dsbSwitch ); if( Train->ggConverterOffButton.SubModel != nullptr ) { @@ -1907,6 +2005,8 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->CompressorAllow ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + // visual feedback Train->ggCompressorButton.UpdateValue( 1.0, Train->dsbSwitch ); // impulse type switch has no effect if there's no power @@ -1920,6 +2020,8 @@ void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Comm } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + if( true == Train->mvControlled->CompressorSwitch( false ) ) { // NOTE: we don't have switch type definition for the compresor switch // so for the time being we have hard coded "impulse" switches for all EMUs @@ -1991,16 +2093,26 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C } return; } + + command_data command = Command; + if( Train->mvControlled->StLinSwitchType == "toggle" ) { + if( ( Command.hint == command_hint::on ) && ( true == Train->mvControlled->StLinSwitchOff ) ) { return; } + if( ( Command.hint == command_hint::off ) && ( false == Train->mvControlled->StLinSwitchOff ) ) { return; } + } + else if( Command.hint == command_hint::off ) { + command.action = GLFW_RELEASE; + } + // NOTE: because we don't have modeled actual circuits this is a simplification of the real mechanics // namely, pressing the button will flip it in the entire unit, which isn't exactly physically possible - if( Command.action == GLFW_PRESS ) { + if( command.action == GLFW_PRESS ) { // button works while it's held down but we can only pay attention to initial press if( false == Train->mvControlled->StLinSwitchOff ) { // open the connectors Train->mvControlled->StLinSwitchOff = true; if( ( Train->mvControlled->TrainType == dt_ET41 ) || ( Train->mvControlled->TrainType == dt_ET42 ) ) { - // crude implementation of the butto affecting entire unit for multi-unit engines + // crude implementation of the button affecting entire unit for multi-unit engines // TODO: rework it into part of standard command propagation system if( ( Train->mvControlled->Couplers[ 0 ].Connected != nullptr ) && ( true == TestFlag( Train->mvControlled->Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { @@ -2057,10 +2169,10 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C } } } - else if( Command.action == GLFW_RELEASE ) { + else if( command.action == GLFW_RELEASE ) { // button released if( Train->mvControlled->StLinSwitchType != "toggle" ) { - // default button type (impulse) works on button release + // default button type (impulse) ceases its work on button release Train->mvControlled->StLinSwitchOff = false; if( ( Train->mvControlled->TrainType == dt_ET41 ) || ( Train->mvControlled->TrainType == dt_ET42 ) ) { @@ -2105,6 +2217,8 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command ( false == Train->mvControlled->ShuntMode ) : ( Train->mvControlled->Imax < Train->mvControlled->ImaxHi ) ) ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + if( true == Train->mvControlled->CurrentSwitch( true ) ) { // visual feedback Train->ggMaxCurrentCtrl.UpdateValue( 1.0, Train->dsbSwitch ); @@ -2112,6 +2226,8 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + if( true == Train->mvControlled->CurrentSwitch( false ) ) { // visual feedback Train->ggMaxCurrentCtrl.UpdateValue( 0.0, Train->dsbSwitch ); @@ -2212,6 +2328,8 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C // only reacting to press, so the switch doesn't flip back and forth if key is held down if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_left ) == 0 ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; // visual feedback Train->ggLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); @@ -2222,6 +2340,8 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; // visual feedback Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -2245,6 +2365,8 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const & // only reacting to press, so the switch doesn't flip back and forth if key is held down if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_right ) == 0 ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; // visual feedback Train->ggRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); @@ -2255,6 +2377,8 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const & } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; // visual feedback Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -2278,12 +2402,16 @@ void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const & // only reacting to press, so the switch doesn't flip back and forth if key is held down if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_upper ) == 0 ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; // visual feedback Train->ggUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; // visual feedback Train->ggUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -2597,12 +2725,16 @@ void TTrain::OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &C // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->DynamicObject->DimHeadlights ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + Train->DynamicObject->DimHeadlights = true; // visual feedback Train->ggDimHeadlightsButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + Train->DynamicObject->DimHeadlights = false; // visual feedback Train->ggDimHeadlightsButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -2654,12 +2786,16 @@ void TTrain::OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->bCabLightDim ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + Train->bCabLightDim = true; // visual feedback Train->ggCabLightDimButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + Train->bCabLightDim = false; // visual feedback Train->ggCabLightDimButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -2709,12 +2845,16 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->Heating ) { // turn on + if( Command.hint == command_hint::off ) { return; } // caller wants the other state + Train->mvControlled->Heating = true; // visual feedback Train->ggTrainHeatingButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { //turn off + if( Command.hint == command_hint::on ) { return; } // caller wants the other state + Train->mvControlled->Heating = false; // visual feedback Train->ggTrainHeatingButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -2863,8 +3003,9 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma void TTrain::OnCommand_carcouplingincrease( TTrain *Train, command_data const &Command ) { - if( true == FreeFlyModeFlag ) { - // tryb freefly + if( ( true == FreeFlyModeFlag ) + && ( Command.action == GLFW_PRESS ) ) { + // tryb freefly, press only auto coupler { -1 }; auto *vehicle { Train->DynamicObject->ABuScanNearestObject( Train->DynamicObject->GetTrack(), 1, 1500, coupler ) }; if( vehicle == nullptr ) @@ -2884,8 +3025,9 @@ void TTrain::OnCommand_carcouplingincrease( TTrain *Train, command_data const &C void TTrain::OnCommand_carcouplingdisconnect( TTrain *Train, command_data const &Command ) { - if( true == FreeFlyModeFlag ) { - // tryb freefly + if( ( true == FreeFlyModeFlag ) + && ( Command.action == GLFW_PRESS ) ) { + // tryb freefly, press only auto coupler { -1 }; auto *vehicle { Train->DynamicObject->ABuScanNearestObject( Train->DynamicObject->GetTrack(), 1, 1500, coupler ) }; if( vehicle == nullptr ) @@ -3451,43 +3593,27 @@ bool TTrain::Update( double const Deltatime ) fEIMParams[1 + i][8] = 0; fEIMParams[1 + i][9] = 0; } - - if (Global.iFeedbackMode == 4) - { // wykonywać tylko gdy wyprowadzone na pulpit - Console::ValueSet(0, - mvOccupied->Compressor); // Ra: sterowanie miernikiem: zbiornik główny - Console::ValueSet(1, - mvOccupied->PipePress); // Ra: sterowanie miernikiem: przewód główny - Console::ValueSet(2, mvOccupied->BrakePress); // Ra: sterowanie miernikiem: cylinder hamulcowy - Console::ValueSet(3, fHVoltage); // woltomierz wysokiego napięcia - Console::ValueSet(4, fHCurrent[2]); // Ra: sterowanie miernikiem: drugi amperomierz - Console::ValueSet(5, - fHCurrent[(mvControlled->TrainType & dt_EZT) ? 0 : 1]); // pierwszy amperomierz; dla - // EZT prąd całkowity - Console::ValueSet(6, fTachoVelocity); ////Ra: prędkość na pin 43 - wyjście - /// analogowe (to nie jest PWM); - /// skakanie zapewnia mechanika - /// napędu +#ifdef _WIN32 + if (Global.iFeedbackMode == 4) { + // wykonywać tylko gdy wyprowadzone na pulpit + // Ra: sterowanie miernikiem: zbiornik główny + Console::ValueSet(0, mvOccupied->Compressor); + // Ra: sterowanie miernikiem: przewód główny + Console::ValueSet(1, mvOccupied->PipePress); + // Ra: sterowanie miernikiem: cylinder hamulcowy + Console::ValueSet(2, mvOccupied->BrakePress); + // woltomierz wysokiego napięcia + Console::ValueSet(3, fHVoltage); + // Ra: sterowanie miernikiem: drugi amperomierz + Console::ValueSet(4, fHCurrent[2]); + // pierwszy amperomierz; dla EZT prąd całkowity + Console::ValueSet(5, fHCurrent[(mvControlled->TrainType & dt_EZT) ? 0 : 1]); + // Ra: prędkość na pin 43 - wyjście analogowe (to nie jest PWM); skakanie zapewnia mechanika napędu + Console::ValueSet(6, fTachoVelocity); } - - if (Global.bMWDmasterEnable) // pobieranie danych dla pulpitu port (COM) - { - Console::ValueSet(0, mvOccupied->Compressor); // zbiornik główny - Console::ValueSet(1, mvOccupied->PipePress); // przewód główny - Console::ValueSet(2, mvOccupied->BrakePress); // cylinder hamulcowy - Console::ValueSet(3, fHVoltage); // woltomierz wysokiego napięcia - Console::ValueSet(4, fHCurrent[(mvControlled->TrainType & dt_EZT) ? 0 : 1]); - // pierwszy amperomierz; dla EZT prąd całkowity - Console::ValueSet(5, fHCurrent[2]); // drugi amperomierz 2 - Console::ValueSet(6, fHCurrent[3]); // drugi amperomierz 3 - Console::ValueSet(7, fTachoVelocity); - //Console::ValueSet(8, mvControlled->BatteryVoltage); // jeszcze nie pora ;) - } - - // hunter-080812: wyrzucanie szybkiego na elektrykach gdy nie ma napiecia - // przy dowolnym ustawieniu kierunkowego - // Ra: to już jest w T_MoverParameters::TractionForce(), ale zależy od - // kierunku +#endif + // hunter-080812: wyrzucanie szybkiego na elektrykach gdy nie ma napiecia przy dowolnym ustawieniu kierunkowego + // Ra: to już jest w T_MoverParameters::TractionForce(), ale zależy od kierunku if( ( mvControlled->Mains ) && ( mvControlled->EngineType == ElectricSeriesMotor ) ) { if( std::max( mvControlled->GetTrainsetVoltage(), std::fabs( mvControlled->RunningTraction.TractionVoltage ) ) < 0.5 * mvControlled->EnginePowerSource.MaxVoltage ) { @@ -4026,9 +4152,10 @@ bool TTrain::Update( double const Deltatime ) } if (ggBrakeCtrl.SubModel) { +#ifdef _WIN32 if (DynamicObject->Mechanik ? (DynamicObject->Mechanik->AIControllFlag ? false : - (Global.iFeedbackMode == 4 || (Global.bMWDmasterEnable && Global.bMWDBreakEnable))) : + (Global.iFeedbackMode == 4 /*|| (Global.bMWDmasterEnable && Global.bMWDBreakEnable)*/)) : false) // nie blokujemy AI { // Ra: nie najlepsze miejsce, ale na początek gdzieś to dać trzeba // Firleju: dlatego kasujemy i zastepujemy funkcją w Console @@ -4037,7 +4164,6 @@ bool TTrain::Update( double const Deltatime ) double b = Console::AnalogCalibrateGet(0); b = b * 8.0 - 2.0; b = clamp( b, -2.0, mvOccupied->BrakeCtrlPosNo ); // przycięcie zmiennej do granic - if (Global.bMWDdebugEnable && Global.iMWDDebugMode & 4) WriteLog("FV4a break position = " + to_string(b)); ggBrakeCtrl.UpdateValue(b); // przesów bez zaokrąglenia mvOccupied->BrakeLevelSet(b); } @@ -4046,13 +4172,13 @@ bool TTrain::Update( double const Deltatime ) double b = Console::AnalogCalibrateGet(0); b = b * 7.0 - 1.0; b = clamp( b, -1.0, mvOccupied->BrakeCtrlPosNo ); // przycięcie zmiennej do granic - if (Global.bMWDdebugEnable && Global.iMWDDebugMode & 4) WriteLog("FVel6 break position = " + to_string(b)); ggBrakeCtrl.UpdateValue(b); // przesów bez zaokrąglenia mvOccupied->BrakeLevelSet(b); } // else //standardowa prodedura z kranem powiązanym z klawiaturą // ggBrakeCtrl.UpdateValue(double(mvOccupied->BrakeCtrlPos)); } +#endif // else //standardowa prodedura z kranem powiązanym z klawiaturą // ggBrakeCtrl.UpdateValue(double(mvOccupied->BrakeCtrlPos)); ggBrakeCtrl.UpdateValue(mvOccupied->fBrakeCtrlPos); @@ -4060,12 +4186,12 @@ bool TTrain::Update( double const Deltatime ) } if( ggLocalBrake.SubModel ) { - +#ifdef _WIN32 if( ( DynamicObject->Mechanik != nullptr ) && ( false == DynamicObject->Mechanik->AIControllFlag ) // nie blokujemy AI && ( mvOccupied->BrakeLocHandle == FD1 ) && ( ( Global.iFeedbackMode == 4 ) - || ( Global.bMWDmasterEnable && Global.bMWDBreakEnable ) ) ) { + /*|| ( Global.bMWDmasterEnable && Global.bMWDBreakEnable )*/ ) ) { // Ra: nie najlepsze miejsce, ale na początek gdzieś to dać trzeba // Firleju: dlatego kasujemy i zastepujemy funkcją w Console auto const b = clamp( @@ -4074,12 +4200,10 @@ bool TTrain::Update( double const Deltatime ) ManualBrakePosNo ); ggLocalBrake.UpdateValue( b ); // przesów bez zaokrąglenia mvOccupied->LocalBrakePos = int( 1.09 * b ); // sposób zaokrąglania jest do ustalenia - if( ( true == Global.bMWDdebugEnable ) - && ( ( Global.iMWDDebugMode & 4 ) != 0 ) ) { - WriteLog( "FD1 break position = " + to_string( b ) ); - } } - else { + else +#endif + { // standardowa prodedura z kranem powiązanym z klawiaturą ggLocalBrake.UpdateValue( double( mvOccupied->LocalBrakePos ) ); } @@ -5146,6 +5270,27 @@ void TTrain::SetLights() // clears state of all cabin controls void TTrain::clear_cab_controls() { + // indicators exposed to custom control devices + btLampkaSHP.Clear(0); + btLampkaCzuwaka.Clear(1); + btLampkaOpory.Clear(2); + btLampkaWylSzybki.Clear(3); + btLampkaNadmSil.Clear(4); + btLampkaStyczn.Clear(5); + btLampkaPoslizg.Clear(6); + btLampkaNadmPrzetw.Clear(((mvControlled->TrainType & dt_EZT) != 0) ? -1 : 7); // EN57 nie ma tej lampki + btLampkaPrzetwOff.Clear(((mvControlled->TrainType & dt_EZT) != 0) ? 7 : -1 ); // za to ma tę + btLampkaNadmSpr.Clear(8); + btLampkaNadmWent.Clear(9); + btLampkaWysRozr.Clear(((mvControlled->TrainType & dt_ET22) != 0) ? -1 : 10); // ET22 nie ma tej lampki + btLampkaOgrzewanieSkladu.Clear(11); + btHaslerBrakes.Clear(12); // ciśnienie w cylindrach do odbijania na haslerze + btHaslerCurrent.Clear(13); // prąd na silnikach do odbijania na haslerze + // Jeśli ustawiamy nową wartość dla PoKeys wolna jest 15 + // Numer 14 jest używany dla buczka SHP w update_sounds() + + // other cab controls + // TODO: arrange in more readable manner, and eventually refactor ggMainCtrl.Clear(); ggMainCtrlAct.Clear(); ggScndCtrl.Clear(); @@ -5168,11 +5313,6 @@ void TTrain::clear_cab_controls() ggHornLowButton.Clear(); ggHornHighButton.Clear(); ggNextCurrentButton.Clear(); -/* - ggUniversal1Button.Clear(); - ggUniversal2Button.Clear(); - ggUniversal4Button.Clear(); -*/ for( auto &universal : ggUniversals ) { universal.Clear(); } @@ -5215,35 +5355,19 @@ void TTrain::clear_cab_controls() ggClockHInd.Clear(); ggEngineVoltage.Clear(); ggLVoltage.Clear(); - // ggLVoltage.Output(0); //Ra: sterowanie miernikiem: niskie napięcie - // ggEnrot1m.Clear(); - // ggEnrot2m.Clear(); - // ggEnrot3m.Clear(); - // ggEngageRatio.Clear(); ggMainGearStatus.Clear(); ggIgnitionKey.Clear(); - // Jeśli ustawiamy nową wartość dla PoKeys wolna jest 15 - // Numer 14 jest używany dla buczka SHP w innym miejscu - btLampkaPoslizg.Clear(6); - btLampkaStyczn.Clear(5); - btLampkaNadmPrzetw.Clear(((mvControlled->TrainType & dt_EZT) != 0) ? -1 : 7); // EN57 nie ma tej lampki + btLampkaPrzetw.Clear(); - btLampkaPrzetwOff.Clear(((mvControlled->TrainType & dt_EZT) != 0) ? 7 : -1 ); // za to ma tę btLampkaPrzetwB.Clear(); btLampkaPrzetwBOff.Clear(); btLampkaPrzekRozn.Clear(); btLampkaPrzekRoznPom.Clear(); - btLampkaNadmSil.Clear(4); btLampkaUkrotnienie.Clear(); btLampkaHamPosp.Clear(); - btLampkaWylSzybki.Clear(3); btLampkaWylSzybkiOff.Clear(); btLampkaWylSzybkiB.Clear(); btLampkaWylSzybkiBOff.Clear(); - btLampkaNadmWent.Clear(9); - btLampkaNadmSpr.Clear(8); - btLampkaOpory.Clear(2); - btLampkaWysRozr.Clear(((mvControlled->TrainType & dt_ET22) != 0) ? -1 : 10); // ET22 nie ma tej lampki btLampkaBezoporowa.Clear(); btLampkaBezoporowaB.Clear(); btLampkaMaxSila.Clear(); @@ -5254,9 +5378,6 @@ void TTrain::clear_cab_controls() btLampkaBlokadaDrzwi.Clear(); btInstrumentLight.Clear(); btLampkaWentZaluzje.Clear(); - btLampkaOgrzewanieSkladu.Clear(11); - btLampkaSHP.Clear(0); - btLampkaCzuwaka.Clear(1); btLampkaDoorLeft.Clear(); btLampkaDoorRight.Clear(); btLampkaDepartureSignal.Clear(); @@ -5308,8 +5429,6 @@ void TTrain::clear_cab_controls() ggRearUpperLightButton.Clear(); ggRearLeftEndLightButton.Clear(); ggRearRightEndLightButton.Clear(); - btHaslerBrakes.Clear(12); // ciśnienie w cylindrach do odbijania na haslerze - btHaslerCurrent.Clear(13); // prąd na silnikach do odbijania na haslerze } // NOTE: we can get rid of this function once we have per-cab persistent state diff --git a/Train.h b/Train.h index 9b7d6807..db392353 100644 --- a/Train.h +++ b/Train.h @@ -65,9 +65,34 @@ public: class TTrain { - friend class TWorld; // temporary due to use of play_sound TODO: refactor this - public: +// types + struct state_t { + std::uint8_t shp; + std::uint8_t alerter; + std::uint8_t motor_resistors; + std::uint8_t line_breaker; + std::uint8_t motor_overload; + std::uint8_t motor_connectors; + std::uint8_t wheelslip; + std::uint8_t converter_overload; + std::uint8_t converter_off; + std::uint8_t compressor_overload; + std::uint8_t ventilator_overload; + std::uint8_t motor_overload_threshold; + std::uint8_t train_heating; + std::uint8_t recorder_braking; + std::uint8_t recorder_power; + std::uint8_t alerter_sound; + float velocity; + float reservoir_pressure; + float pipe_pressure; + float brake_pressure; + float hv_voltage; + std::array hv_current; + }; + +// methods bool CabChange(int iDirection); bool ShowNextCurrent; // pokaz przd w podlaczonej lokomotywie (ET41) bool InitializeCab(int NewCabNo, std::string const &asFileName); @@ -86,6 +111,7 @@ class TTrain // McZapkie-310302: ladowanie parametrow z pliku bool LoadMMediaFile(std::string const &asFileName); PyObject *GetTrainState(); + state_t get_state() const; private: // types @@ -119,19 +145,23 @@ class TTrain static void OnCommand_mastercontrollerincreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_mastercontrollerdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_mastercontrollerset( TTrain *Train, command_data const &Command ); static void OnCommand_secondcontrollerincrease( TTrain *Train, command_data const &Command ); static void OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_secondcontrollerdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_secondcontrollerset( TTrain *Train, command_data const &Command ); static void OnCommand_notchingrelaytoggle( TTrain *Train, command_data const &Command ); static void OnCommand_mucurrentindicatorothersourceactivate( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakeincrease( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakeincreasefast( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakedecrease( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakedecreasefast( TTrain *Train, command_data const &Command ); + static void OnCommand_independentbrakeset( TTrain *Train, command_data const &Command ); static void OnCommand_independentbrakebailoff( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_trainbrakeset( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakecharging( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakerelease( TTrain *Train, command_data const &Command ); static void OnCommand_trainbrakefirstservice( TTrain *Train, command_data const &Command ); diff --git a/command.cpp b/command.cpp index b24c988c..e3ee9cad 100644 --- a/command.cpp +++ b/command.cpp @@ -26,18 +26,22 @@ commanddescription_sequence Commands_descriptions = { { "mastercontrollerincreasefast", command_target::vehicle }, { "mastercontrollerdecrease", command_target::vehicle }, { "mastercontrollerdecreasefast", command_target::vehicle }, + { "mastercontrollerset", command_target::vehicle }, { "secondcontrollerincrease", command_target::vehicle }, { "secondcontrollerincreasefast", command_target::vehicle }, { "secondcontrollerdecrease", command_target::vehicle }, { "secondcontrollerdecreasefast", command_target::vehicle }, + { "secondcontrollerset", command_target::vehicle }, { "mucurrentindicatorothersourceactivate", command_target::vehicle }, { "independentbrakeincrease", command_target::vehicle }, { "independentbrakeincreasefast", command_target::vehicle }, { "independentbrakedecrease", command_target::vehicle }, { "independentbrakedecreasefast", command_target::vehicle }, + { "independentbrakeset", command_target::vehicle }, { "independentbrakebailoff", command_target::vehicle }, { "trainbrakeincrease", command_target::vehicle }, { "trainbrakedecrease", command_target::vehicle }, + { "trainbrakeset", command_target::vehicle }, { "trainbrakecharging", command_target::vehicle }, { "trainbrakerelease", command_target::vehicle }, { "trainbrakefirstservice", command_target::vehicle }, @@ -173,7 +177,7 @@ command_queue::pop( command_data &Command, std::size_t const Recipient ) { } void -command_relay::post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, std::uint16_t const Recipient ) const { +command_relay::post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, command_hint const Hint, std::uint16_t const Recipient ) const { auto const &command = simulation::Commands_descriptions[ static_cast( Command ) ]; if( ( command.target == command_target::vehicle ) @@ -190,6 +194,7 @@ command_relay::post( user_command const Command, std::uint64_t const Param1, std Action, Param1, Param2, + Hint, Timer::GetDeltaTime() }, static_cast( command.target ) | Recipient ); /* diff --git a/command.h b/command.h index 98a69caa..ab8e32d1 100644 --- a/command.h +++ b/command.h @@ -20,18 +20,22 @@ enum class user_command { mastercontrollerincreasefast, mastercontrollerdecrease, mastercontrollerdecreasefast, + mastercontrollerset, secondcontrollerincrease, secondcontrollerincreasefast, secondcontrollerdecrease, secondcontrollerdecreasefast, + secondcontrollerset, mucurrentindicatorothersourceactivate, independentbrakeincrease, independentbrakeincreasefast, independentbrakedecrease, independentbrakedecreasefast, + independentbrakeset, independentbrakebailoff, trainbrakeincrease, trainbrakedecrease, + trainbrakeset, trainbrakecharging, trainbrakerelease, trainbrakefirstservice, @@ -135,6 +139,12 @@ enum class user_command { none = -1 }; +enum class command_hint { + off, + on, + none = -1 +}; + enum class command_target { userinterface, @@ -163,6 +173,7 @@ struct command_data { int action; // press, repeat or release std::uint64_t param1; std::uint64_t param2; + command_hint hint; double time_delta; }; @@ -212,7 +223,8 @@ public: // posts specified command for the specified recipient // TODO: replace uint16_t with recipient handle, based on item id void - post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, std::uint16_t const Recipient ) const; + post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, + int const Action, command_hint const Hint, std::uint16_t const Recipient ) const; private: // types // members diff --git a/gamepadinput.cpp b/gamepadinput.cpp index ec433f1c..e3b7c24b 100644 --- a/gamepadinput.cpp +++ b/gamepadinput.cpp @@ -201,6 +201,7 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g reinterpret_cast( turnx ), reinterpret_cast( turny ), GLFW_PRESS, + command_hint::none, // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place 0 ); @@ -218,6 +219,7 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g reinterpret_cast( movex ), reinterpret_cast( movez ), GLFW_PRESS, + command_hint::none, 0 ); } } @@ -247,6 +249,7 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.second, 0, 0, GLFW_RELEASE, + command_hint::none, Recipient ); m_modeaccumulator = 0.0f; } @@ -260,6 +263,7 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.first, 0, 0, GLFW_PRESS, + command_hint::none, Recipient ); m_modeaccumulator -= 1.0f; } @@ -271,6 +275,7 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.first, 0, 0, GLFW_RELEASE, + command_hint::none, Recipient ); m_modeaccumulator = 0.0f; } @@ -284,6 +289,7 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.first, 0, 0, GLFW_RELEASE, + command_hint::none, Recipient ); m_modeaccumulator = 0.0f; } @@ -297,6 +303,7 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.second, 0, 0, GLFW_PRESS, + command_hint::none, Recipient ); m_modeaccumulator += 1.0f; } @@ -308,6 +315,7 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.second, 0, 0, GLFW_RELEASE, + command_hint::none, Recipient ); m_modeaccumulator = 0.0f; } diff --git a/keyboardinput.cpp b/keyboardinput.cpp index c619436c..ee6fac6c 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -158,7 +158,7 @@ keyboard_input::key( int const Key, int const Action ) { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( lookup->second, 0, 0, Action, 0 ); + m_relay.post( lookup->second, 0, 0, Action, command_hint::none, 0 ); return true; } @@ -179,6 +179,8 @@ keyboard_input::default_bindings() { { GLFW_KEY_KP_SUBTRACT }, // mastercontrollerdecreasefast { GLFW_KEY_KP_SUBTRACT | keymodifier::shift }, + // mastercontrollerset + { -1 }, // secondcontrollerincrease { GLFW_KEY_KP_DIVIDE }, // secondcontrollerincreasefast @@ -187,6 +189,8 @@ keyboard_input::default_bindings() { { GLFW_KEY_KP_MULTIPLY }, // secondcontrollerdecreasefast { GLFW_KEY_KP_MULTIPLY | keymodifier::shift }, + // secondcontrollerset + { -1 }, // mucurrentindicatorothersourceactivate { GLFW_KEY_Z | keymodifier::shift }, // independentbrakeincrease @@ -197,12 +201,16 @@ keyboard_input::default_bindings() { { GLFW_KEY_KP_7 }, // independentbrakedecreasefast { GLFW_KEY_KP_7 | keymodifier::shift }, + // independentbrakeset + { -1 }, // independentbrakebailoff { GLFW_KEY_KP_4 }, // trainbrakeincrease { GLFW_KEY_KP_3 }, // trainbrakedecrease { GLFW_KEY_KP_9 }, + // trainbrakeset + { -1 }, // trainbrakecharging { GLFW_KEY_KP_DECIMAL }, // trainbrakerelease @@ -481,6 +489,7 @@ keyboard_input::poll() { reinterpret_cast( movexparam ), reinterpret_cast( movezparam ), GLFW_PRESS, + command_hint::none, 0 ); } @@ -503,6 +512,7 @@ keyboard_input::poll() { reinterpret_cast( moveyparam ), 0, GLFW_PRESS, + command_hint::none, 0 ); } diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index b02c522c..755e3ad1 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -147,9 +147,6 @@ Source Files - - Source Files\input - Source Files @@ -237,6 +234,9 @@ Source Files + + Source Files\input + @@ -368,9 +368,6 @@ Header Files - - Header Files\input - Header Files @@ -461,6 +458,9 @@ Header Files + + Header Files\input + diff --git a/mouseinput.cpp b/mouseinput.cpp index da2c7ee5..8ab848e9 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -42,6 +42,7 @@ mouse_input::move( double Mousex, double Mousey ) { reinterpret_cast( Mousex ), reinterpret_cast( Mousey ), GLFW_PRESS, + command_hint::none, // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place 0 ); @@ -60,6 +61,7 @@ mouse_input::move( double Mousex, double Mousey ) { reinterpret_cast( viewoffset.x ), reinterpret_cast( viewoffset.y ), GLFW_PRESS, + command_hint::none, // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place 0 ); @@ -102,7 +104,7 @@ mouse_input::button( int const Button, int const Action ) { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, 0 ); + m_relay.post( mousecommand, 0, 0, Action, command_hint::none, 0 ); mousecommand = user_command::none; } else { @@ -141,7 +143,7 @@ mouse_input::button( int const Button, int const Action ) { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, 0 ); + m_relay.post( mousecommand, 0, 0, Action, command_hint::none, 0 ); m_updateaccumulator = -0.25; // prevent potential command repeat right after issuing one switch( mousecommand ) { @@ -192,13 +194,13 @@ mouse_input::poll() { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( m_mousecommandleft, 0, 0, GLFW_REPEAT, 0 ); + m_relay.post( m_mousecommandleft, 0, 0, GLFW_REPEAT, command_hint::none, 0 ); } if( m_mousecommandright != user_command::none ) { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( m_mousecommandright, 0, 0, GLFW_REPEAT, 0 ); + m_relay.post( m_mousecommandright, 0, 0, GLFW_REPEAT, command_hint::none, 0 ); } m_updateaccumulator -= updaterate; } diff --git a/Console/MWD.cpp b/old/MWD.cpp similarity index 100% rename from Console/MWD.cpp rename to old/MWD.cpp diff --git a/Console/MWD.h b/old/MWD.h similarity index 100% rename from Console/MWD.h rename to old/MWD.h diff --git a/uart.cpp b/uart.cpp new file mode 100644 index 00000000..9ee42629 --- /dev/null +++ b/uart.cpp @@ -0,0 +1,243 @@ +#include "stdafx.h" +#include "uart.h" + +#include "Globals.h" +#include "World.h" +#include "Train.h" +#include "Logs.h" + +uart_input::uart_input() +{ + conf = Global.uart_conf; + + if (sp_get_port_by_name(conf.port.c_str(), &port) != SP_OK) + throw std::runtime_error("uart: cannot find specified port"); + + if (sp_open(port, SP_MODE_READ_WRITE) != SP_OK) + throw std::runtime_error("uart: cannot open port"); + + sp_port_config *config; + + if (sp_new_config(&config) != SP_OK || + sp_set_config_baudrate(config, conf.baud) != SP_OK || + sp_set_config_flowcontrol(config, SP_FLOWCONTROL_NONE) != SP_OK || + sp_set_config_bits(config, 8) != SP_OK || + sp_set_config_stopbits(config, 1) != SP_OK || + sp_set_config_parity(config, SP_PARITY_NONE) != SP_OK || + sp_set_config(port, config) != SP_OK) + throw std::runtime_error("uart: cannot set config"); + + sp_free_config(config); + + if (sp_flush(port, SP_BUF_BOTH) != SP_OK) + throw std::runtime_error("uart: cannot flush"); + + old_packet.fill(0); + last_update = std::chrono::high_resolution_clock::now(); +} + +uart_input::~uart_input() +{ + std::array buffer = { 0 }; + sp_blocking_write(port, (void*)buffer.data(), buffer.size(), 0); + sp_drain(port); + + sp_close(port); + sp_free_port(port); +} + +#define SPLIT_INT16(x) (uint8_t)x, (uint8_t)(x >> 8) + +void uart_input::poll() +{ + auto now = std::chrono::high_resolution_clock::now(); + if (std::chrono::duration(now - last_update).count() < conf.updatetime) + return; + last_update = now; + + auto *t = Global.pWorld->train(); + if (!t) + return; + + sp_return ret; + + if ((ret = sp_input_waiting(port)) >= 16) + { + std::array buffer; + ret = sp_blocking_read(port, (void*)buffer.data(), buffer.size(), 0); + if (ret < 0) + throw std::runtime_error("uart: failed to read from port"); + + if (conf.debug) + { + char buf[buffer.size() * 3 + 1]; + size_t pos = 0; + for (uint8_t b : buffer) + pos += sprintf(&buf[pos], "%02X ", b); + WriteLog("uart: rx: " + std::string(buf)); + } + + data_pending = false; + + for (auto entry : input_bits) + { + input_type_t type = std::get<2>(entry); + + size_t byte = std::get<0>(entry) / 8; + size_t bit = std::get<0>(entry) % 8; + + bool state = ( (buffer[byte] & (1 << bit)) != 0 ); + + bool repeat = (type == impulse_r || + type == impulse_r_off || + type == impulse_r_on); + + bool changed = ( (buffer[ byte ] & (1 << bit)) != (old_packet[ byte ] & (1 << bit)) ); + + if (!changed && !(repeat && state)) + continue; + + int action; + command_hint desired_state; + + if (type == toggle) + { + action = GLFW_PRESS; + desired_state = ( state ? command_hint::on : command_hint::off ); + } + else if (type == impulse_r_on) + { + action = ( state ? (changed ? GLFW_PRESS : GLFW_REPEAT) : GLFW_RELEASE ); + desired_state = command_hint::on; + } + else if (type == impulse_r_off) + { + action = ( state ? (changed ? GLFW_PRESS : GLFW_REPEAT) : GLFW_RELEASE ); + desired_state = command_hint::off; + } + else if (type == impulse || type == impulse_r) + { + action = ( state ? (changed ? GLFW_PRESS : GLFW_REPEAT) : GLFW_RELEASE ); + desired_state = command_hint::none; + } + + relay.post( std::get<1>(entry), 0, 0, action, desired_state, 0 ); + } + + if( true == conf.mainenable ) { + // master controller + relay.post( + user_command::mastercontrollerset, + buffer[ 6 ], + 0, + GLFW_PRESS, + command_hint::none, + // TODO: pass correct entity id once the missing systems are in place + 0 ); + } + if( true == conf.scndenable ) { + // second controller + relay.post( + user_command::secondcontrollerset, + buffer[ 7 ], + 0, + GLFW_PRESS, + command_hint::none, + // TODO: pass correct entity id once the missing systems are in place + 0 ); + } + if( true == conf.trainenable ) { + // train brake + double const position { (float)( ( (uint16_t)buffer[ 8 ] | ( (uint16_t)buffer[ 9 ] << 8 ) ) - conf.mainbrakemin ) / ( conf.mainbrakemax - conf.mainbrakemin ) }; + relay.post( + user_command::trainbrakeset, + reinterpret_cast( position ), + 0, + GLFW_PRESS, + command_hint::none, + // TODO: pass correct entity id once the missing systems are in place + 0 ); + } + if( true == conf.localenable ) { + // independent brake + double const position { (float)( ( (uint16_t)buffer[ 10 ] | ( (uint16_t)buffer[ 11 ] << 8 ) ) - conf.localbrakemin ) / ( conf.localbrakemax - conf.localbrakemin ) }; + relay.post( + user_command::independentbrakeset, + reinterpret_cast( position ), + 0, + GLFW_PRESS, + command_hint::none, + // TODO: pass correct entity id once the missing systems are in place + 0 ); + } + + old_packet = buffer; + } + + if (!data_pending && sp_output_waiting(port) == 0) + { + // TODO: ugly! move it into structure like input_bits + auto const trainstate = t->get_state(); + + uint8_t tacho = Global.iPause ? 0 : trainstate.velocity; + uint16_t tank_press = (uint16_t)std::min(conf.tankuart, trainstate.reservoir_pressure * 0.1f / conf.tankmax * conf.tankuart); + uint16_t pipe_press = (uint16_t)std::min(conf.pipeuart, trainstate.pipe_pressure * 0.1f / conf.pipemax * conf.pipeuart); + uint16_t brake_press = (uint16_t)std::min(conf.brakeuart, trainstate.brake_pressure * 0.1f / conf.brakemax * conf.brakeuart); + uint16_t hv_voltage = (uint16_t)std::min(conf.hvuart, trainstate.hv_voltage / conf.hvmax * conf.hvuart); + uint16_t current1 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[0]) / conf.currentmax * conf.currentuart; + uint16_t current2 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[1]) / conf.currentmax * conf.currentuart; + uint16_t current3 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[2]) / conf.currentmax * conf.currentuart; + + std::array buffer { + //byte 0 + tacho, + //byte 1 + 0, + //byte 2 + (uint8_t)( + trainstate.motor_resistors << 1 + | trainstate.motor_overload_threshold << 2), + //byte 3 + 0, + //byte 4 + (uint8_t)( + trainstate.train_heating << 0 + | trainstate.motor_resistors << 1 + | trainstate.wheelslip << 2 + | trainstate.alerter << 6 + | trainstate.shp << 7), + //byte 5 + (uint8_t)( + trainstate.motor_connectors << 0 + | trainstate.converter_overload << 2 + | trainstate.motor_overload << 4 + | trainstate.line_breaker << 5 + | trainstate.compressor_overload << 6), + //byte 6 + (uint8_t)( trainstate.alerter_sound << 7), + SPLIT_INT16(brake_press), //byte 7-8 + SPLIT_INT16(pipe_press), //byte 9-10 + SPLIT_INT16(tank_press), //byte 11-12 + SPLIT_INT16(hv_voltage), //byte 13-14 + SPLIT_INT16(current1), //byte 15-16 + SPLIT_INT16(current2), //byte 17-18 + SPLIT_INT16(current3), //byte 19-20 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 //byte 21-30 + }; + + if (conf.debug) + { + char buf[buffer.size() * 3 + 1]; + size_t pos = 0; + for (uint8_t b : buffer) + pos += sprintf(&buf[pos], "%02X ", b); + WriteLog("uart: tx: " + std::string(buf)); + } + + ret = sp_blocking_write(port, (void*)buffer.data(), buffer.size(), 0); + if (ret != buffer.size()) + throw std::runtime_error("uart: failed to write to port"); + + data_pending = true; + } +} diff --git a/uart.h b/uart.h new file mode 100644 index 00000000..4ab96f8f --- /dev/null +++ b/uart.h @@ -0,0 +1,92 @@ +#pragma once + +#include +#include "command.h" + +class uart_input +{ +public: +// types + struct conf_t { + bool enable = false; + std::string port; + int baud; + float updatetime; + + float mainbrakemin = 0.0f; + float mainbrakemax = 65535.0f; + float localbrakemin = 0.0f; + float localbrakemax = 65535.0f; + float tankmax = 10.0f; + float tankuart = 65535.0f; + float pipemax = 10.0f; + float pipeuart = 65535.0f; + float brakemax = 10.0f; + float brakeuart = 65535.0f; + float hvmax = 100000.0f; + float hvuart = 65535.0f; + float currentmax = 10000.0f; + float currentuart = 65535.0f; + + bool mainenable = true; + bool scndenable = true; + bool trainenable = true; + bool localenable = true; + + bool debug = false; + }; + +// methods + uart_input(); + ~uart_input(); + void poll(); + +private: +// types + enum input_type_t + { + toggle, + impulse, + impulse_r, + impulse_r_on, + impulse_r_off + }; + + std::array, 23> input_bits = + { + std::make_tuple(1, user_command::linebreakertoggle, impulse_r_off), + std::make_tuple(2, user_command::linebreakertoggle, impulse_r_on), + std::make_tuple(3, user_command::motoroverloadrelayreset, impulse), + std::make_tuple(5, user_command::converteroverloadrelayreset, impulse), + std::make_tuple(6, user_command::motorconnectorsopen, toggle), + std::make_tuple(7, user_command::alerteracknowledge, impulse_r), + + std::make_tuple(9, user_command::convertertoggle, toggle), + std::make_tuple(10, user_command::compressortoggle, toggle), + std::make_tuple(11, user_command::sandboxactivate, impulse), + std::make_tuple(12, user_command::heatingtoggle, toggle), + + std::make_tuple(15, user_command::motoroverloadrelaythresholdtoggle, toggle), + std::make_tuple(16, user_command::pantographtogglefront, toggle), + std::make_tuple(17, user_command::pantographtogglerear, toggle), + std::make_tuple(18, user_command::wheelspinbrakeactivate, impulse), + std::make_tuple(19, user_command::headlightsdimtoggle, toggle), + std::make_tuple(20, user_command::interiorlightdimtoggle, toggle), + std::make_tuple(21, user_command::independentbrakebailoff, impulse), + std::make_tuple(22, user_command::hornhighactivate, impulse), + std::make_tuple(23, user_command::hornlowactivate, impulse), + + std::make_tuple(24, user_command::batterytoggle, toggle), + std::make_tuple(25, user_command::headlighttoggleleft, toggle), + std::make_tuple(26, user_command::headlighttoggleupper, toggle), + std::make_tuple(27, user_command::headlighttoggleright, toggle) + }; + +// members + sp_port *port = nullptr; + command_relay relay; + std::array old_packet; + std::chrono::time_point last_update; + conf_t conf; + bool data_pending = false; +}; From ee8ba3c2056d4a858f152354301066323627b222 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 6 Feb 2018 15:24:36 +0100 Subject: [PATCH 270/426] minor dmu handling ai tweaks, minor bug fixes --- Driver.cpp | 14 +++++++++----- DynObj.cpp | 52 ++++++++++++++++++++++++---------------------------- Model3d.cpp | 2 +- World.cpp | 1 + 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index c355bdc4..9797d740 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1532,7 +1532,7 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, // próg opóźnienia dla zadziałania hamulca fAccThreshold = ( mvOccupied->TrainType == dt_EZT ? -0.6 : - mvOccupied->TrainType == dt_DMU ? -0.4 : + mvOccupied->TrainType == dt_DMU ? -0.45 : -0.2 ); } // TrainParams=NewTrainParams; @@ -1552,8 +1552,12 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, TableClear(); if( WriteLogFlag ) { - _mkdir( "physicslog\\" ); - LogFile.open( std::string( "physicslog\\" + VehicleName + ".dat" ), +#ifdef _WIN32 + _mkdir( "physicslog" ); +#elif __linux__ + mkdir( "physicslog", 0644 ); +#endif + LogFile.open( std::string( "physicslog/" + VehicleName + ".dat" ), std::ios::in | std::ios::out | std::ios::trunc ); #if LOGPRESS == 0 LogFile << std::string( " Time [s] Velocity [m/s] Acceleration [m/ss] Coupler.Dist[m] " @@ -1829,7 +1833,7 @@ void TController::AutoRewident() fBrakeReaction = 0.25; } else if( mvOccupied->TrainType == dt_DMU ) { - fAccThreshold = std::max( -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ], /*-0.7*/ -0.4 ); + fAccThreshold = std::max( -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ], -0.45 ); fBrakeReaction = 0.25; } else if (ustaw > 16) @@ -4565,7 +4569,7 @@ TController::UpdateSituation(double dt) { TDynamicObject *d = pVehicles[0]; // pojazd na czele składu while (d) { - AbsAccS += d->MoverParameters->TotalMass * d->MoverParameters->AccS * iDirection; + AbsAccS += d->MoverParameters->TotalMass * d->MoverParameters->AccS * d->DirectionGet() * iDirection; d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } AbsAccS /= fMass; diff --git a/DynObj.cpp b/DynObj.cpp index 439a6bfc..6497c8fd 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3047,10 +3047,11 @@ bool TDynamicObject::Update(double dt, double dt1) double k; // tymczasowy kąt double PantDiff; TAnimPant *p; // wskaźnik do obiektu danych pantografu - double fCurrent = (MoverParameters->DynamicBrakeFlag && MoverParameters->ResistorsFlag ? - 0 : - MoverParameters->Itot) + - MoverParameters->TotalCurrent; // prąd pobierany przez pojazd - bez + double fCurrent = ( + ( MoverParameters->DynamicBrakeFlag && MoverParameters->ResistorsFlag ) ? + 0 : + MoverParameters->Itot ) + + MoverParameters->TotalCurrent; // prąd pobierany przez pojazd - bez // sensu z tym (TotalCurrent) // TotalCurrent to bedzie prad nietrakcyjny (niezwiazany z napedem) // fCurrent+=fabs(MoverParameters->Voltage)*1e-6; //prąd płynący przez @@ -3099,10 +3100,13 @@ bool TDynamicObject::Update(double dt, double dt1) && ( PantDiff < 0.01 ) ) // tolerancja niedolegania { if (p->hvPowerWire) { - auto const wirevoltage { p->hvPowerWire->VoltageGet( MoverParameters->Voltage, fPantCurrent ) }; + auto const lastvoltage { MoverParameters->PantFrontVolt }; + // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() + MoverParameters->PantFrontVolt = p->hvPowerWire->VoltageGet( MoverParameters->Voltage, fPantCurrent ); + fCurrent -= fPantCurrent; // taki prąd płynie przez powyższy pantograf // TODO: refactor reaction to voltage change to mover as sound event for specific pantograph - if( ( MoverParameters->PantFrontVolt == 0.0 ) - && ( wirevoltage > 0.0 ) ) { + if( ( lastvoltage == 0.0 ) + && ( MoverParameters->PantFrontVolt > 0.0 ) ) { for( auto &pantograph : m_pantographsounds ) { if( pantograph.sPantUp.offset().z > 0 ) { // limit to pantographs located in the front half of the vehicle @@ -3110,9 +3114,6 @@ bool TDynamicObject::Update(double dt, double dt1) } } } - // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() - MoverParameters->PantFrontVolt = wirevoltage; - fCurrent -= fPantCurrent; // taki prąd płynie przez powyższy pantograf } else MoverParameters->PantFrontVolt = 0.0; @@ -3133,10 +3134,13 @@ bool TDynamicObject::Update(double dt, double dt1) && ( PantDiff < 0.01 ) ) { if (p->hvPowerWire) { - auto const wirevoltage { p->hvPowerWire->VoltageGet( MoverParameters->Voltage, fPantCurrent ) }; + auto const lastvoltage { MoverParameters->PantRearVolt }; + // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() + MoverParameters->PantRearVolt = p->hvPowerWire->VoltageGet( MoverParameters->Voltage, fPantCurrent ); + fCurrent -= fPantCurrent; // taki prąd płynie przez powyższy pantograf // TODO: refactor reaction to voltage change to mover as sound event for specific pantograph - if( ( MoverParameters->PantRearVolt == 0.0 ) - && ( wirevoltage > 0.0 ) ) { + if( ( lastvoltage == 0.0 ) + && ( MoverParameters->PantRearVolt > 0.0 ) ) { for( auto &pantograph : m_pantographsounds ) { if( pantograph.sPantUp.offset().z < 0 ) { // limit to pantographs located in the rear half of the vehicle @@ -3144,9 +3148,6 @@ bool TDynamicObject::Update(double dt, double dt1) } } } - // TODO: wyliczyć trzeba prąd przypadający na pantograf i wstawić do GetVoltage() - MoverParameters->PantRearVolt = p->hvPowerWire->VoltageGet( MoverParameters->Voltage, fPantCurrent ); - fCurrent -= fPantCurrent; // taki prąd płynie przez powyższy pantograf } else MoverParameters->PantRearVolt = 0.0; @@ -3180,26 +3181,21 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->PantFrontUp ) )// jeśli ma być podniesiony { if (PantDiff > 0.001) // jeśli nie dolega do drutu - { // jeśli poprzednia wysokość jest mniejsza niż pożądana, zwiększyć kąt - // dolnego + { // jeśli poprzednia wysokość jest mniejsza niż pożądana, zwiększyć kąt dolnego // ramienia zgodnie z ciśnieniem if (pantspeedfactor > 0.55 * PantDiff) // 0.55 to około pochodna kąta po wysokości k += 0.55 * PantDiff; // ograniczenie "skoku" w danej klatce else k += pantspeedfactor; // dolne ramię - // jeśli przekroczono kąt graniczny, zablokować pantograf (wymaga - // interwencji - // pociągu sieciowego) + // jeśli przekroczono kąt graniczny, zablokować pantograf + // (wymaga interwencji pociągu sieciowego) } - else if (PantDiff < -0.001) - { // drut się obniżył albo pantograf - // podniesiony za wysoko + else if (PantDiff < -0.001) { + // drut się obniżył albo pantograf podniesiony za wysoko // jeśli wysokość jest zbyt duża, wyznaczyć zmniejszenie kąta - // jeśli zmniejszenie kąta jest zbyt duże, przejść do trybu łamania - // pantografu - // if (PantFrontDiff<-0.05) //skok w dół o 5cm daje złąmanie - // pantografu + // jeśli zmniejszenie kąta jest zbyt duże, przejść do trybu łamania pantografu + // if (PantFrontDiff<-0.05) //skok w dół o 5cm daje złąmanie pantografu k += 0.4 * PantDiff; // mniej niż pochodna kąta po wysokości } // jeśli wysokość jest dobra, nic więcej nie liczyć } diff --git a/Model3d.cpp b/Model3d.cpp index 047cd899..f060d911 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -517,7 +517,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic } // Ra 15-01: należało by jeszcze uwzględnić skalowanie wprowadzane przez transformy, aby normalne po przeskalowaniu były jednostkowe if( glm::length2( vertexnormal ) == 0.0f ) { - WriteLog( "Bad model: zero lenght normal vector generated for sub-model \"" + pName + "\"", logtype::model ); + WriteLog( "Bad model: zero length normal vector generated for sub-model \"" + pName + "\"", logtype::model ); } Vertices[ vertexidx ].normal = ( glm::length2( vertexnormal ) > 0.0f ? diff --git a/World.cpp b/World.cpp index 0f869be7..3c97d687 100644 --- a/World.cpp +++ b/World.cpp @@ -362,6 +362,7 @@ void TWorld::OnKeyDown(int cKey) { case GLFW_KEY_F10: { keyinfo += "F10"; break; } case GLFW_KEY_F11: { keyinfo += "F11"; break; } case GLFW_KEY_F12: { keyinfo += "F12"; break; } + case GLFW_KEY_PAUSE: { keyinfo += "Pause"; break; } } } if( keyinfo.empty() == false ) { From e9c4714780eb19c53b9c8a4032584c3e47407b15 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 9 Feb 2018 20:31:20 +0100 Subject: [PATCH 271/426] cab shadows stability fix --- renderer.cpp | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/renderer.cpp b/renderer.cpp index bc7f1d22..a23c1dbf 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -175,10 +175,12 @@ opengl_renderer::Init( GLFWwindow *Window ) { light.id = GL_LIGHT1 + idx; light.is_directional = false; + ::glEnable( light.id ); // experimental intel chipset fix ::glLightf( light.id, GL_SPOT_CUTOFF, 7.5f ); ::glLightf( light.id, GL_SPOT_EXPONENT, 7.5f ); ::glLightf( light.id, GL_CONSTANT_ATTENUATION, 0.0f ); ::glLightf( light.id, GL_LINEAR_ATTENUATION, 0.035f ); + ::glDisable( light.id ); // experimental intel chipset fix m_lights.emplace_back( light ); } @@ -412,12 +414,27 @@ opengl_renderer::Render() { += "frame: " + to_string( Timer::subsystem.gfx_color.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) " += "gpu side: " + to_string( Timer::subsystem.gfx_swap.average(), 2 ) + " msec " += "(" + to_string( Timer::subsystem.gfx_color.average() + Timer::subsystem.gfx_swap.average(), 2 ) + " msec total)"; + m_debugstatstext = "drawcalls: " + to_string( m_debugstats.drawcalls ) + "; dyn: " + to_string( m_debugstats.dynamics ) + " mod: " + to_string( m_debugstats.models ) + " sub: " + to_string( m_debugstats.submodels ) + "; trk: " + to_string( m_debugstats.paths ) + " shp: " + to_string( m_debugstats.shapes ) + " trc: " + to_string( m_debugstats.traction ) + " lin: " + to_string( m_debugstats.lines ); - +/* + float lightcutoff{}, + lightexponent{}, + lightconstant{}, + lightlinear{}; + ::glGetLightfv( GL_LIGHT1, GL_SPOT_CUTOFF, &lightcutoff ); + ::glGetLightfv( GL_LIGHT1, GL_SPOT_EXPONENT, &lightexponent ); + ::glGetLightfv( GL_LIGHT1, GL_CONSTANT_ATTENUATION, &lightconstant ); + ::glGetLightfv( GL_LIGHT1, GL_LINEAR_ATTENUATION, &lightlinear ); + m_debugstatstext = + "light1 cutoff: " + to_string( lightcutoff, 2 ) + + " exponent: " + to_string( lightexponent, 2 ) + + " constant attn: " + to_string( lightconstant, 2 ) + + " linear attn: " + to_string( lightlinear, 3 ); +*/ ++m_framestamp; return true; // for now always succeed @@ -889,7 +906,11 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // ...transform coordinate change back to homogenous light space... shadowmapadjustment /= m_shadowbuffersize * 0.5f; // ... and bake the adjustment into the projection matrix - camera.projection() = glm::translate( glm::mat4{ 1.f }, glm::vec3{ shadowmapadjustment, 0.f } ) * camera.projection(); + camera.projection() = + glm::translate( + glm::mat4{ 1.f }, + glm::vec3{ shadowmapadjustment, 0.f } ) + * camera.projection(); break; } @@ -913,13 +934,14 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f -maphalfsize, maphalfsize, -maphalfsize, maphalfsize, -Config.draw_range, Config.draw_range ); +/* // adjust the projection to sample complete shadow map texels auto shadowmaptexel = glm::vec2 { camera.projection() * glm::mat4{ viewmatrix } * glm::vec4{ 0.f, 0.f, 0.f, 1.f } }; shadowmaptexel *= ( m_shadowbuffersize / 2 ) * 0.5f; auto shadowmapadjustment = glm::round( shadowmaptexel ) - shadowmaptexel; shadowmapadjustment /= ( m_shadowbuffersize / 2 ) * 0.5f; camera.projection() = glm::translate( glm::mat4{ 1.f }, glm::vec3{ shadowmapadjustment, 0.f } ) * camera.projection(); - +*/ break; } case rendermode::reflections: { From 0c880f3d4e87457d74fbdc6f7539332448d24ea6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 10 Feb 2018 19:53:21 +0100 Subject: [PATCH 272/426] serial port input device configuration, additional control commands and minor control logic tweaks --- DynObj.cpp | 2 +- EU07.cpp | 1 + Gauge.cpp | 5 + Gauge.h | 1 + McZapkie/Mover.cpp | 16 +- Train.cpp | 1869 ++++++++++++++++++++++++++------------------ Train.h | 38 + World.cpp | 2 +- command.cpp | 39 +- command.h | 43 +- gamepadinput.cpp | 8 - keyboardinput.cpp | 100 ++- mouseinput.cpp | 17 +- renderer.cpp | 3 + uart.cpp | 141 +++- uart.h | 49 +- 16 files changed, 1437 insertions(+), 897 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 6497c8fd..4c69da7e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3590,7 +3590,7 @@ void TDynamicObject::RenderSounds() { 0.0, 1.0 ); rsBrake .pitch( rsBrake.m_frequencyoffset + MoverParameters->Vel * rsBrake.m_frequencyfactor ) - .gain( rsBrake.m_amplitudeoffset + std::sqrt( brakeforceratio * interpolate( 0.4, 1.0, ( MoverParameters->Vel / ( 1 + MoverParameters->Vmax ) ) ) ) ) + .gain( rsBrake.m_amplitudeoffset + std::sqrt( brakeforceratio * interpolate( 0.4, 1.0, ( MoverParameters->Vel / ( 1 + MoverParameters->Vmax ) ) ) ) * rsBrake.m_amplitudefactor ) .play( sound_flags::exclusive | sound_flags::looping ); } else { diff --git a/EU07.cpp b/EU07.cpp index ab3af211..48dd293f 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -416,6 +416,7 @@ int main(int argc, char *argv[]) input::Gamepad.init(); if( true == Global.uart_conf.enable ) { input::uart = std::make_unique(); + input::uart->init(); } Global.pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów diff --git a/Gauge.cpp b/Gauge.cpp index 0f7a0c4f..75bf2e05 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -235,6 +235,11 @@ double TGauge::GetValue() const { return ( fValue - fOffset ) / fScale; } +double TGauge::GetDesiredValue() const { + // we feed value in range 0-1 so we should be getting it reported in the same range + return ( fDesiredValue - fOffset ) / fScale; +} + void TGauge::Update() { if( fValue != fDesiredValue ) { diff --git a/Gauge.h b/Gauge.h index 8f454c3f..adb105e6 100644 --- a/Gauge.h +++ b/Gauge.h @@ -38,6 +38,7 @@ public: void UpdateValue( double fNewDesired, sound_source &Fallbacksound ); void PutValue(double fNewDesired); double GetValue() const; + double GetDesiredValue() const; void Update(); void AssignFloat(float *fValue); void AssignDouble(double *dValue); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 9257997e..49507441 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1669,9 +1669,8 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) // all work is done in the loop header ; } - // OK:=true ; {takie chamskie, potem poprawie} <-Ra: kto mia³ to - // poprawiæ i po co? - if( ActiveDir == -1 ) { + // OK:=true ; {takie chamskie, potem poprawie} <-Ra: kto mia³ to poprawiæ i po co? + if( ActiveDir < 0 ) { while( ( RList[ MainCtrlPos ].Bn > 1 ) && IncMainCtrl( 1 ) ) { --MainCtrlPos; @@ -1702,7 +1701,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) } } } - if( ActiveDir == -1 ) { + if( ActiveDir < 0 ) { if( ( TrainType != dt_PseudoDiesel ) && ( RList[ MainCtrlPos ].Bn > 1 ) ) { // blokada wejścia na równoległą podczas jazdy do tyłu @@ -5206,9 +5205,12 @@ bool TMoverParameters::AutoRelayCheck(void) // Ra 2014-06: dla SN61 nie działa prawidłowo // rozlaczanie stycznikow liniowych - if ((!Mains) || (FuseFlag) || (MainCtrlPos == 0) || - ((BrakePress > 2.1) && (TrainType != dt_EZT)) || - (ActiveDir == 0)) // hunter-111211: wylacznik cisnieniowy + if( ( false == Mains ) + || ( true == FuseFlag ) + || ( true == StLinSwitchOff ) + || ( MainCtrlPos == 0 ) + || ( ( TrainType != dt_EZT ) && ( BrakePress > 2.1 ) ) + || ( ActiveDir == 0 ) ) // hunter-111211: wylacznik cisnieniowy { StLinFlag = false; // yBARC - rozlaczenie stycznikow liniowych OK = false; diff --git a/Train.cpp b/Train.cpp index 100df383..e746e52d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -195,6 +195,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::epbrakecontroltoggle, &TTrain::OnCommand_epbrakecontroltoggle }, { user_command::brakeactingspeedincrease, &TTrain::OnCommand_brakeactingspeedincrease }, { user_command::brakeactingspeeddecrease, &TTrain::OnCommand_brakeactingspeeddecrease }, + { user_command::brakeactingspeedsetcargo, &TTrain::OnCommand_brakeactingspeedsetcargo }, + { user_command::brakeactingspeedsetpassenger, &TTrain::OnCommand_brakeactingspeedsetpassenger }, + { user_command::brakeactingspeedsetrapid, &TTrain::OnCommand_brakeactingspeedsetrapid }, { user_command::brakeloadcompensationincrease, &TTrain::OnCommand_brakeloadcompensationincrease }, { user_command::brakeloadcompensationdecrease, &TTrain::OnCommand_brakeloadcompensationdecrease }, { user_command::mubrakingindicatortoggle, &TTrain::OnCommand_mubrakingindicatortoggle }, @@ -202,27 +205,50 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::reverserdecrease, &TTrain::OnCommand_reverserdecrease }, { user_command::alerteracknowledge, &TTrain::OnCommand_alerteracknowledge }, { user_command::batterytoggle, &TTrain::OnCommand_batterytoggle }, + { user_command::batteryenable, &TTrain::OnCommand_batteryenable }, + { user_command::batterydisable, &TTrain::OnCommand_batterydisable }, { user_command::pantographcompressorvalvetoggle, &TTrain::OnCommand_pantographcompressorvalvetoggle }, { user_command::pantographcompressoractivate, &TTrain::OnCommand_pantographcompressoractivate }, { user_command::pantographtogglefront, &TTrain::OnCommand_pantographtogglefront }, { user_command::pantographtogglerear, &TTrain::OnCommand_pantographtogglerear }, + { user_command::pantographraisefront, &TTrain::OnCommand_pantographraisefront }, + { user_command::pantographraiserear, &TTrain::OnCommand_pantographraiserear }, + { user_command::pantographlowerfront, &TTrain::OnCommand_pantographlowerfront }, + { user_command::pantographlowerrear, &TTrain::OnCommand_pantographlowerrear }, { user_command::pantographlowerall, &TTrain::OnCommand_pantographlowerall }, { user_command::linebreakertoggle, &TTrain::OnCommand_linebreakertoggle }, + { user_command::linebreakeropen, &TTrain::OnCommand_linebreakeropen }, + { user_command::linebreakerclose, &TTrain::OnCommand_linebreakerclose }, { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, + { user_command::converterenable, &TTrain::OnCommand_converterenable }, + { user_command::converterdisable, &TTrain::OnCommand_converterdisable }, { user_command::convertertogglelocal, &TTrain::OnCommand_convertertogglelocal }, { user_command::converteroverloadrelayreset, &TTrain::OnCommand_converteroverloadrelayreset }, { user_command::compressortoggle, &TTrain::OnCommand_compressortoggle }, + { user_command::compressorenable, &TTrain::OnCommand_compressorenable }, + { user_command::compressordisable, &TTrain::OnCommand_compressordisable }, { user_command::compressortogglelocal, &TTrain::OnCommand_compressortogglelocal }, { user_command::motorconnectorsopen, &TTrain::OnCommand_motorconnectorsopen }, + { user_command::motorconnectorsclose, &TTrain::OnCommand_motorconnectorsclose }, { user_command::motordisconnect, &TTrain::OnCommand_motordisconnect }, { user_command::motoroverloadrelaythresholdtoggle, &TTrain::OnCommand_motoroverloadrelaythresholdtoggle }, + { user_command::motoroverloadrelaythresholdsetlow, &TTrain::OnCommand_motoroverloadrelaythresholdsetlow }, + { user_command::motoroverloadrelaythresholdsethigh, &TTrain::OnCommand_motoroverloadrelaythresholdsethigh }, { user_command::motoroverloadrelayreset, &TTrain::OnCommand_motoroverloadrelayreset }, { user_command::heatingtoggle, &TTrain::OnCommand_heatingtoggle }, + { user_command::heatingenable, &TTrain::OnCommand_heatingenable }, + { user_command::heatingdisable, &TTrain::OnCommand_heatingdisable }, { user_command::lightspresetactivatenext, &TTrain::OnCommand_lightspresetactivatenext }, { user_command::lightspresetactivateprevious, &TTrain::OnCommand_lightspresetactivateprevious }, { user_command::headlighttoggleleft, &TTrain::OnCommand_headlighttoggleleft }, + { user_command::headlightenableleft, &TTrain::OnCommand_headlightenableleft }, + { user_command::headlightdisableleft, &TTrain::OnCommand_headlightdisableleft }, { user_command::headlighttoggleright, &TTrain::OnCommand_headlighttoggleright }, + { user_command::headlightenableright, &TTrain::OnCommand_headlightenableright }, + { user_command::headlightdisableright, &TTrain::OnCommand_headlightdisableright }, { user_command::headlighttoggleupper, &TTrain::OnCommand_headlighttoggleupper }, + { user_command::headlightenableupper, &TTrain::OnCommand_headlightenableupper }, + { user_command::headlightdisableupper, &TTrain::OnCommand_headlightdisableupper }, { user_command::redmarkertoggleleft, &TTrain::OnCommand_redmarkertoggleleft }, { user_command::redmarkertoggleright, &TTrain::OnCommand_redmarkertoggleright }, { user_command::headlighttogglerearleft, &TTrain::OnCommand_headlighttogglerearleft }, @@ -233,9 +259,17 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::redmarkerstoggle, &TTrain::OnCommand_redmarkerstoggle }, { user_command::endsignalstoggle, &TTrain::OnCommand_endsignalstoggle }, { user_command::headlightsdimtoggle, &TTrain::OnCommand_headlightsdimtoggle }, + { user_command::headlightsdimenable, &TTrain::OnCommand_headlightsdimenable }, + { user_command::headlightsdimdisable, &TTrain::OnCommand_headlightsdimdisable }, { user_command::interiorlighttoggle, &TTrain::OnCommand_interiorlighttoggle }, + { user_command::interiorlightenable, &TTrain::OnCommand_interiorlightenable }, + { user_command::interiorlightdimdisable, &TTrain::OnCommand_interiorlightdisable }, { user_command::interiorlightdimtoggle, &TTrain::OnCommand_interiorlightdimtoggle }, + { user_command::interiorlightdimenable, &TTrain::OnCommand_interiorlightdimenable }, + { user_command::interiorlightdimdisable, &TTrain::OnCommand_interiorlightdimdisable }, { user_command::instrumentlighttoggle, &TTrain::OnCommand_instrumentlighttoggle }, + { user_command::instrumentlightenable, &TTrain::OnCommand_instrumentlightenable }, + { user_command::instrumentlightdisable, &TTrain::OnCommand_instrumentlightdisable }, { user_command::doorlocktoggle, &TTrain::OnCommand_doorlocktoggle }, { user_command::doortoggleleft, &TTrain::OnCommand_doortoggleleft }, { user_command::doortoggleright, &TTrain::OnCommand_doortoggleright }, @@ -557,6 +591,54 @@ void TTrain::set_train_brake( double const Position ) { } } +void TTrain::set_train_brake_speed( TDynamicObject *Vehicle, int const Speed ) { + + if( true == Vehicle->MoverParameters->BrakeDelaySwitch( Speed ) ) { + // visual feedback + // TODO: add setting indicator to vehicle class, for external lever/indicator + if( Vehicle == DynamicObject ) { + if( ggBrakeProfileCtrl.SubModel != nullptr ) { + ggBrakeProfileCtrl.UpdateValue( + ( ( mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 2.0 : + mvOccupied->BrakeDelayFlag - 1 ), + dsbSwitch ); + } + if( ggBrakeProfileG.SubModel != nullptr ) { + ggBrakeProfileG.UpdateValue( + ( mvOccupied->BrakeDelayFlag == bdelay_G ? + 1.0 : + 0.0 ), + dsbSwitch ); + } + if( ggBrakeProfileR.SubModel != nullptr ) { + ggBrakeProfileR.UpdateValue( + ( ( mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? + 1.0 : + 0.0 ), + dsbSwitch ); + } + } + } +} + +void TTrain::set_paired_open_motor_connectors_button( bool const State ) { + + if( ( mvControlled->TrainType == dt_ET41 ) + || ( mvControlled->TrainType == dt_ET42 ) ) { + // crude implementation of the button affecting entire unit for multi-unit engines + // TODO: rework it into part of standard command propagation system + if( ( mvControlled->Couplers[ side::front ].Connected != nullptr ) + && ( true == TestFlag( mvControlled->Couplers[ side::front ].CouplingFlag, coupling::permanent ) ) ) { + mvControlled->Couplers[ side::front ].Connected->StLinSwitchOff = State; + } + if( ( mvControlled->Couplers[ side::rear ].Connected != nullptr ) + && ( true == TestFlag( mvControlled->Couplers[ side::rear ].CouplingFlag, coupling::permanent ) ) ) { + mvControlled->Couplers[ side::rear ].Connected->StLinSwitchOff = State; + } + } +} + // locates nearest vehicle belonging to the consist TDynamicObject * TTrain::find_nearest_consist_vehicle() const { @@ -802,17 +884,19 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons || ( Train->mvControlled->EngineType == ElectricInductionMotor ) ) && ( Train->mvOccupied->BrakeCtrlPosNo > 0 ) ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { // press or hold - Train->mvOccupied->BrakeReleaser( 1 ); // visual feedback Train->ggReleaserButton.UpdateValue( 1.0, Train->dsbSwitch ); + + Train->mvOccupied->BrakeReleaser( 1 ); } - else { + else if( Command.action == GLFW_RELEASE ) { // release - Train->mvOccupied->BrakeReleaser( 0 ); // visual feedback Train->ggReleaserButton.UpdateValue( 0.0, Train->dsbSwitch ); + + Train->mvOccupied->BrakeReleaser( 0 ); } } } @@ -820,11 +904,11 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons // car brake handling, while in walk mode auto *vehicle { Train->find_nearest_consist_vehicle() }; if( vehicle != nullptr ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { // press or hold vehicle->MoverParameters->BrakeReleaser( 1 ); } - else { + else if( Command.action == GLFW_RELEASE ) { // release vehicle->MoverParameters->BrakeReleaser( 0 ); } @@ -1069,34 +1153,33 @@ void TTrain::OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const if( Train->mvOccupied->BrakeSystem != ElectroPneumatic ) { // standard behaviour - if( Command.action != GLFW_RELEASE ) { - // press or hold - Train->mvControlled->AntiSlippingBrake(); + if( Command.action == GLFW_PRESS ) { // visual feedback Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbSwitch ); + + // NOTE: system activation is (repeatedly) done in the train update routine } - else { - // release + else if( Command.action == GLFW_RELEASE ) { // visual feedback Train->ggAntiSlipButton.UpdateValue( 0.0 ); } } else { // electro-pneumatic, custom case - if( Command.action != GLFW_RELEASE ) { - // press or hold + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbPneumaticSwitch ); + if( ( Train->mvOccupied->BrakeHandle == St113 ) && ( Train->mvControlled->EpFuse == true ) ) { Train->mvOccupied->SwitchEPBrake( 1 ); } - // visual feedback - Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbPneumaticSwitch ); } - else { - // release - Train->mvOccupied->SwitchEPBrake( 0 ); + else if( Command.action == GLFW_RELEASE ) { // visual feedback Train->ggAntiSlipButton.UpdateValue( 0.0 ); + + Train->mvOccupied->SwitchEPBrake( 0 ); } } } @@ -1112,22 +1195,16 @@ void TTrain::OnCommand_sandboxactivate( TTrain *Train, command_data const &Comma } if( Command.action == GLFW_PRESS ) { - // press - Train->mvControlled->Sandbox( true ); // visual feedback Train->ggSandButton.UpdateValue( 1.0, Train->dsbSwitch ); + + Train->mvControlled->Sandbox( true ); } else if( Command.action == GLFW_RELEASE) { - // release - Train->mvControlled->Sandbox( false ); -/* - // audio feedback - if( Train->ggAntiSlipButton.GetValue() > 0.5 ) { - Train->play_sound( Train->dsbSwitch ); - } -*/ // visual feedback Train->ggSandButton.UpdateValue( 0.0 ); + + Train->mvControlled->Sandbox( false ); } } @@ -1174,34 +1251,7 @@ void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data con vehicle->MoverParameters->BrakeDelayFlag << 1 : vehicle->MoverParameters->BrakeDelayFlag | bdelay_M ); - if( true == vehicle->MoverParameters->BrakeDelaySwitch( fasterbrakesetting ) ) { - - if( vehicle == Train->DynamicObject ) { - // visual feedback - // TODO: add setting indicator to vehicle - if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { - Train->ggBrakeProfileCtrl.UpdateValue( - ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? - 2.0 : - Train->mvOccupied->BrakeDelayFlag - 1 ), - Train->dsbSwitch ); - } - if( Train->ggBrakeProfileG.SubModel != nullptr ) { - Train->ggBrakeProfileG.UpdateValue( - ( Train->mvOccupied->BrakeDelayFlag == bdelay_G ? - 1.0 : - 0.0 ), - Train->dsbSwitch ); - } - if( Train->ggBrakeProfileR.SubModel != nullptr ) { - Train->ggBrakeProfileR.UpdateValue( - ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? - 1.0 : - 0.0 ), - Train->dsbSwitch ); - } - } - } + Train->set_train_brake_speed( vehicle, fasterbrakesetting ); } } @@ -1221,34 +1271,40 @@ void TTrain::OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data con vehicle->MoverParameters->BrakeDelayFlag >> 1 : vehicle->MoverParameters->BrakeDelayFlag ^ bdelay_M ); - if( true == vehicle->MoverParameters->BrakeDelaySwitch( slowerbrakesetting ) ) { + Train->set_train_brake_speed( vehicle, slowerbrakesetting ); + } +} - if( vehicle == Train->DynamicObject ) { - // visual feedback - // TODO: add setting indicator to vehicle - if( Train->ggBrakeProfileCtrl.SubModel != nullptr ) { - Train->ggBrakeProfileCtrl.UpdateValue( - ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? - 2.0 : - Train->mvOccupied->BrakeDelayFlag - 1 ), - Train->dsbSwitch ); - } - if( Train->ggBrakeProfileG.SubModel != nullptr ) { - Train->ggBrakeProfileG.UpdateValue( - ( Train->mvOccupied->BrakeDelayFlag == bdelay_G ? - 1.0 : - 0.0 ), - Train->dsbSwitch ); - } - if( Train->ggBrakeProfileR.SubModel != nullptr ) { - Train->ggBrakeProfileR.UpdateValue( - ( ( Train->mvOccupied->BrakeDelayFlag & bdelay_R ) != 0 ? - 1.0 : - 0.0 ), - Train->dsbSwitch ); - } - } - } +void TTrain::OnCommand_brakeactingspeedsetcargo( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle == nullptr ) { return; } + + Train->set_train_brake_speed( vehicle, bdelay_G ); + } +} + +void TTrain::OnCommand_brakeactingspeedsetpassenger( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + auto *vehicle { Train->find_nearest_consist_vehicle() }; + if( vehicle == nullptr ) { return; } + + Train->set_train_brake_speed( vehicle, bdelay_P ); + } +} + +void TTrain::OnCommand_brakeactingspeedsetrapid( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + auto *vehicle{ Train->find_nearest_consist_vehicle() }; + if( vehicle == nullptr ) { return; } + + Train->set_train_brake_speed( vehicle, bdelay_R ); } } @@ -1336,23 +1392,18 @@ void TTrain::OnCommand_reverserdecrease( TTrain *Train, command_data const &Comm void TTrain::OnCommand_alerteracknowledge( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { - // press or hold - Train->fCzuwakTestTimer += 0.035f; + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggSecurityResetButton.UpdateValue( 1.0, Train->dsbSwitch ); if( Train->CAflag == false ) { Train->CAflag = true; Train->mvOccupied->SecuritySystemReset(); } - else { - if( Train->fCzuwakTestTimer > 1.0 ) { - SetFlag( Train->mvOccupied->SecuritySystem.Status, s_CAtest ); - } - } - // visual feedback - Train->ggSecurityResetButton.UpdateValue( 1.0, Train->dsbSwitch ); } - else { - // release + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggSecurityResetButton.UpdateValue( 0.0 ); + Train->fCzuwakTestTimer = 0.0f; if( TestFlag( Train->mvOccupied->SecuritySystem.Status, s_CAtest ) ) { SetFlag( Train->mvOccupied->SecuritySystem.Status, -s_CAtest ); @@ -1360,8 +1411,6 @@ void TTrain::OnCommand_alerteracknowledge( TTrain *Train, command_data const &Co Train->mvOccupied->SecuritySystem.SystemBrakeCATestTimer = 0.0; } Train->CAflag = false; - // visual feedback - Train->ggSecurityResetButton.UpdateValue( 0.0 ); } } @@ -1371,40 +1420,56 @@ void TTrain::OnCommand_batterytoggle( TTrain *Train, command_data const &Command // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvOccupied->Battery ) { // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - // wyłącznik jest też w SN61, ewentualnie załączać prąd na stałe z poziomu FIZ - if( Train->mvOccupied->BatterySwitch( true ) ) { - // bateria potrzebna np. do zapalenia świateł - if( Train->ggBatteryButton.SubModel ) { - Train->ggBatteryButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - // side-effects - if( Train->mvOccupied->LightsPosNo > 0 ) { - Train->SetLights(); - } - if( TestFlag( Train->mvOccupied->SecuritySystem.SystemType, 2 ) ) { - // Ra: znowu w kabinie jest coś, co być nie powinno! - SetFlag( Train->mvOccupied->SecuritySystem.Status, s_active ); - SetFlag( Train->mvOccupied->SecuritySystem.Status, s_SHPalarm ); - } - } + OnCommand_batteryenable( Train, Command ); } else { //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state + OnCommand_batterydisable( Train, Command ); + } + } +} - if( Train->mvOccupied->BatterySwitch( false ) ) { - // ewentualnie zablokować z FIZ, np. w samochodach się nie odłącza akumulatora - if( Train->ggBatteryButton.SubModel ) { - Train->ggBatteryButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - // side-effects - if( false == Train->mvControlled->ConverterFlag ) { - // if there's no (low voltage) power source left, drop pantographs - Train->mvControlled->PantFront( false ); - Train->mvControlled->PantRear( false ); - } +void TTrain::OnCommand_batteryenable( TTrain *Train, command_data const &Command ) { + + if( true == Train->mvOccupied->Battery ) { return; } // already on + + if( Command.action == GLFW_PRESS ) { + // ignore repeats + // wyłącznik jest też w SN61, ewentualnie załączać prąd na stałe z poziomu FIZ + if( Train->mvOccupied->BatterySwitch( true ) ) { + // bateria potrzebna np. do zapalenia świateł + if( Train->ggBatteryButton.SubModel ) { + Train->ggBatteryButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + // side-effects + if( Train->mvOccupied->LightsPosNo > 0 ) { + Train->SetLights(); + } + if( TestFlag( Train->mvOccupied->SecuritySystem.SystemType, 2 ) ) { + // Ra: znowu w kabinie jest coś, co być nie powinno! + SetFlag( Train->mvOccupied->SecuritySystem.Status, s_active ); + SetFlag( Train->mvOccupied->SecuritySystem.Status, s_SHPalarm ); + } + } + } +} + +void TTrain::OnCommand_batterydisable( TTrain *Train, command_data const &Command ) { + + if( false == Train->mvOccupied->Battery ) { return; } // already off + + if( Command.action == GLFW_PRESS ) { + // ignore repeats + if( Train->mvOccupied->BatterySwitch( false ) ) { + // ewentualnie zablokować z FIZ, np. w samochodach się nie odłącza akumulatora + if( Train->ggBatteryButton.SubModel ) { + Train->ggBatteryButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + // side-effects + if( false == Train->mvControlled->ConverterFlag ) { + // if there's no (low voltage) power source left, drop pantographs + Train->mvControlled->PantFront( false ); + Train->mvControlled->PantRear( false ); } } } @@ -1416,65 +1481,16 @@ void TTrain::OnCommand_pantographtogglefront( TTrain *Train, command_data const // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->PantFrontUp ) { // turn on... - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - Train->mvControlled->PantFrontSP = false; - if( Train->mvControlled->PantFront( true ) ) { - if( Train->mvControlled->PantFrontStart != 1 ) { - // visual feedback - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - } + OnCommand_pantographraisefront( Train, Command ); } else { // ...or turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) - && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; - } - } - - Train->mvControlled->PantFrontSP = false; - if( false == Train->mvControlled->PantFront( false ) ) { - if( Train->mvControlled->PantFrontStart != 0 ) { - // visual feedback - if( Train->ggPantFrontButton.SubModel ) - Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantFrontButtonOff.SubModel ) - Train->ggPantFrontButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - } + OnCommand_pantographlowerfront( Train, Command ); } } else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position + // NOTE: this routine is used also by dedicated raise and lower commands if( Train->mvOccupied->PantSwitchType == "impulse" ) { if( Train->ggPantFrontButton.SubModel ) Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -1500,65 +1516,16 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->PantRearUp ) { // turn on... - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - Train->mvControlled->PantRearSP = false; - if( Train->mvControlled->PantRear( true ) ) { - if( Train->mvControlled->PantRearStart != 1 ) { - // visual feedback - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - } + OnCommand_pantographraiserear( Train, Command ); } else { // ...or turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - if( Train->mvOccupied->PantSwitchType == "impulse" ) { - if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) - && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { - // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it - // then another control has to be used (like pantographlowerall) - // TODO: we should have a way to define presense of cab controls without having to bind these to 3d submodels - return; - } - } - - Train->mvControlled->PantRearSP = false; - if( false == Train->mvControlled->PantRear( false ) ) { - if( Train->mvControlled->PantRearStart != 0 ) { - // visual feedback - if( Train->ggPantRearButton.SubModel ) - Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedButton.SubModel ) - Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); - // pantograph control can have two-button setup - if( Train->ggPantRearButtonOff.SubModel ) - Train->ggPantRearButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); - // NOTE: currently we animate the selectable pantograph control based on standard key presses - // TODO: implement actual selection control, and refactor handling this control setup in a separate method - if( Train->ggPantSelectedDownButton.SubModel ) - Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - } + OnCommand_pantographlowerrear( Train, Command ); } } else if( Command.action == GLFW_RELEASE ) { // impulse switches return automatically to neutral position + // NOTE: this routine is used also by dedicated raise and lower commands if( Train->mvOccupied->PantSwitchType == "impulse" ) { if( Train->ggPantRearButton.SubModel ) Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); @@ -1578,6 +1545,195 @@ void TTrain::OnCommand_pantographtogglerear( TTrain *Train, command_data const & } } +void TTrain::OnCommand_pantographraisefront( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + // visual feedback + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->PantFrontUp ) { return; } // already up + + // TBD, TODO: impulse switch should only work when the power is on? + if( Train->mvControlled->PantFront( true ) ) { + Train->mvControlled->PantFrontSP = false; + } + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + // NOTE: bit of a hax here, we're reusing button reset routine so we don't need a copy in every branch + OnCommand_pantographtogglefront( Train, Command ); + } +} + +void TTrain::OnCommand_pantographraiserear( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + // visual feedback + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 1.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->PantRearUp ) { return; } // already up + + // TBD, TODO: impulse switch should only work when the power is on? + if( Train->mvControlled->PantRear( true ) ) { + Train->mvControlled->PantRearSP = false; + } + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + // NOTE: bit of a hax here, we're reusing button reset routine so we don't need a copy in every branch + OnCommand_pantographtogglerear( Train, Command ); + } +} + +void TTrain::OnCommand_pantographlowerfront( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + if( Train->mvOccupied->PantSwitchType == "impulse" ) { + if( ( Train->ggPantFrontButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presence of cab controls without having to bind these to 3d submodels + return; + } + } + + // visual feedback + if( Train->ggPantFrontButton.SubModel ) + Train->ggPantFrontButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantFrontButtonOff.SubModel ) + Train->ggPantFrontButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->PantFrontUp ) { return; } // already down + + // TBD, TODO: impulse switch should only work when the power is on? + if( Train->mvControlled->PantFront( false ) ) { + Train->mvControlled->PantFrontSP = false; + } + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + // NOTE: bit of a hax here, we're reusing button reset routine so we don't need a copy in every branch + OnCommand_pantographtogglefront( Train, Command ); + } +} + +void TTrain::OnCommand_pantographlowerrear( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + if( Train->mvOccupied->PantSwitchType == "impulse" ) { + if( ( Train->ggPantRearButtonOff.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // with impulse buttons we expect a dedicated switch to lower the pantograph, and if the cabin lacks it + // then another control has to be used (like pantographlowerall) + // TODO: we should have a way to define presence of cab controls without having to bind these to 3d submodels + return; + } + } + + // visual feedback + if( Train->ggPantRearButton.SubModel ) + Train->ggPantRearButton.UpdateValue( 0.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedButton.SubModel ) + Train->ggPantSelectedButton.UpdateValue( 0.0, Train->dsbSwitch ); + // pantograph control can have two-button setup + if( Train->ggPantRearButtonOff.SubModel ) + Train->ggPantRearButtonOff.UpdateValue( 1.0, Train->dsbSwitch ); + // NOTE: currently we animate the selectable pantograph control based on standard key presses + // TODO: implement actual selection control, and refactor handling this control setup in a separate method + if( Train->ggPantSelectedDownButton.SubModel ) + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->PantRearUp ) { return; } // already down + + // TBD, TODO: impulse switch should only work when the power is on? + if( Train->mvControlled->PantRear( false ) ) { + Train->mvControlled->PantRearSP = false; + } + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + // NOTE: bit of a hax here, we're reusing button reset routine so we don't need a copy in every branch + OnCommand_pantographtogglerear( Train, Command ); + } +} + +void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ) { + + if( ( Train->ggPantAllDownButton.SubModel == nullptr ) + && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { + // TODO: expand definition of cab controls so we can know if the control is present without testing for presence of 3d switch + if( Command.action == GLFW_PRESS ) { + WriteLog( "Lower All Pantographs switch is missing, or wasn't defined" ); + } + return; + } + if( Command.action == GLFW_PRESS ) { + // press the button + // since we're just lowering all potential pantographs we don't need to test for state and effect + // front... + Train->mvControlled->PantFrontSP = false; + Train->mvControlled->PantFront( false ); + // ...and rear + Train->mvControlled->PantRearSP = false; + Train->mvControlled->PantRear( false ); + // visual feedback + if( Train->ggPantAllDownButton.SubModel ) + Train->ggPantAllDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Train->ggPantSelectedDownButton.SubModel ) { + Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + } + else if( Command.action == GLFW_RELEASE ) { + // release the button + // visual feedback + if( Train->ggPantAllDownButton.SubModel ) + Train->ggPantAllDownButton.UpdateValue( 0.0 ); + if( Train->ggPantSelectedDownButton.SubModel ) { + Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); + } + } +} + void TTrain::OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_data const &Command ) { if( ( Train->mvControlled->TrainType == dt_EZT ? @@ -1633,179 +1789,130 @@ void TTrain::OnCommand_pantographcompressoractivate( TTrain *Train, command_data } } -void TTrain::OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ) { - - if( ( Train->ggPantAllDownButton.SubModel == nullptr ) - && ( Train->ggPantSelectedDownButton.SubModel == nullptr ) ) { - // TODO: expand definition of cab controls so we can know if the control is present without testing for presence of 3d switch - if( Command.action == GLFW_PRESS ) { - WriteLog( "Lower All Pantographs switch is missing, or wasn't defined" ); - } - return; - } - if( Command.action == GLFW_PRESS ) { - // press the button - // since we're just lowering all potential pantographs we don't need to test for state and effect - // front... - Train->mvControlled->PantFrontSP = false; - Train->mvControlled->PantFront( false ); - // ...and rear - Train->mvControlled->PantRearSP = false; - Train->mvControlled->PantRear( false ); - // visual feedback - if( Train->ggPantAllDownButton.SubModel ) - Train->ggPantAllDownButton.UpdateValue( 1.0, Train->dsbSwitch ); - if( Train->ggPantSelectedDownButton.SubModel ) { - Train->ggPantSelectedDownButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - } - else if( Command.action == GLFW_RELEASE ) { - // release the button - // visual feedback - if( Train->ggPantAllDownButton.SubModel ) - Train->ggPantAllDownButton.UpdateValue( 0.0 ); - if( Train->ggPantSelectedDownButton.SubModel ) { - Train->ggPantSelectedDownButton.UpdateValue( 0.0 ); - } - } -} - void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ) { - if( ( Command.action == GLFW_PRESS ) - && ( Train->m_linebreakerstate == 1 ) - && ( false == Train->mvControlled->Mains ) - && ( Train->ggMainButton.GetValue() < 0.05 ) ) { - // crude way to catch cases where the main was knocked out and the user is trying to restart it - // because the state of the line breaker isn't changed to match, we need to do it here manually - Train->m_linebreakerstate = 0; - } - // NOTE: we don't have switch type definition for the line breaker switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( ( Train->m_linebreakerstate == 1 ) - && ( Train->mvControlled->TrainType == dt_EZT ) ) { - // a single impulse switch can't open the circuit, only close it - return; - } - if( Command.action != GLFW_RELEASE ) { // press or hold... if( Train->m_linebreakerstate == 0 ) { // ...to close the circuit - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - if( Command.action == GLFW_PRESS ) { - // fresh press, start fresh closing delay calculation - Train->fMainRelayTimer = 0.0f; - } - if( Train->ggMainOnButton.SubModel != nullptr ) { - // two separate switches to close and break the circuit - // visual feedback - Train->ggMainOnButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - else if( Train->ggMainButton.SubModel != nullptr ) { - // single two-state switch - // visual feedback - Train->ggMainButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - // keep track of period the button is held down, to determine when/if circuit closes - if( ( ( ( Train->mvControlled->EngineType != ElectricSeriesMotor ) - && ( Train->mvControlled->EngineType != ElectricInductionMotor ) ) ) - || ( Train->fHVoltage > 0.5 * Train->mvControlled->EnginePowerSource.MaxVoltage ) ) { - // prevent the switch from working if there's no power - // TODO: consider whether it makes sense for diesel engines and such - Train->fMainRelayTimer += 0.33f; // Command.time_delta * 5.0; - } -/* - if( Train->mvControlled->Mains != true ) { - // hunter-080812: poprawka - Train->mvControlled->ConverterSwitch( false ); - Train->mvControlled->CompressorSwitch( false ); - } -*/ - if( Train->fMainRelayTimer > Train->mvControlled->InitialCtrlDelay ) { - // wlaczanie WSa z opoznieniem - Train->m_linebreakerstate = 2; - // for diesels, we complete the engine start here - // TODO: consider arranging a better way to start the diesel engines - if( ( Train->mvControlled->EngineType == DieselEngine ) - || ( Train->mvControlled->EngineType == DieselElectric ) ) { - if( Train->mvControlled->MainSwitch( true ) ) { - // side-effects - Train->mvControlled->ConverterSwitch( ( Train->ggConverterButton.GetValue() > 0.5 ) || ( Train->mvControlled->ConverterStart == start::automatic ) ); - Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); - } - } - } + // NOTE: bit of a dirty shortcut here + OnCommand_linebreakerclose( Train, Command ); } else if( Train->m_linebreakerstate == 1 ) { // ...to open the circuit - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - if( true == Train->mvControlled->MainSwitch( false ) ) { - - Train->m_linebreakerstate = -1; - - if( Train->ggMainOffButton.SubModel != nullptr ) { - // two separate switches to close and break the circuit - // visual feedback - Train->ggMainOffButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - else if( Train->ggMainButton.SubModel != nullptr ) { - // single two-state switch -/* - // NOTE: we don't have switch type definition for the line breaker switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( Train->mvControlled->TrainType == dt_EZT ) { - // audio feedback - if( Command.action == GLFW_PRESS ) { - Train->play_sound( Train->dsbSwitch ); - } - // visual feedback - Train->ggMainButton.UpdateValue( 1.0 ); - } - else -*/ - { - // visual feedback - Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - } - } - // play sound immediately when the switch is hit, not after release - if( Train->fMainRelayTimer > 0.0f ) { - Train->fMainRelayTimer = 0.0f; - } + OnCommand_linebreakeropen( Train, Command ); } } else { // release... if( Train->m_linebreakerstate <= 0 ) { // ...after opening circuit, or holding for too short time to close it - // hunter-091012: przeniesione z mover.pas, zeby dzwiek sie nie zapetlal, - if( Train->fMainRelayTimer > 0.0f ) { - Train->fMainRelayTimer = 0.0f; + OnCommand_linebreakeropen( Train, Command ); + } + else { + // ...after closing the circuit + // NOTE: bit of a dirty shortcut here + OnCommand_linebreakerclose( Train, Command ); + } + } +} + +void TTrain::OnCommand_linebreakeropen( TTrain *Train, command_data const &Command ) { + + if( Command.action != GLFW_RELEASE ) { + // press or hold... + // visual feedback + if( Train->ggMainOffButton.SubModel != nullptr ) { + // two separate switches to close and break the circuit + Train->ggMainOffButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else if( Train->ggMainButton.SubModel != nullptr ) { + // single two-state switch + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( Train->mvControlled->TrainType == dt_EZT ) { + Train->ggMainButton.UpdateValue( 1.0, Train->dsbSwitch ); } - // we don't exactly know which of the two buttons was used, so reset both - // for setup with two separate swiches - if( Train->ggMainOnButton.SubModel != nullptr ) { - Train->ggMainOnButton.UpdateValue( 0.0, Train->dsbSwitch ); + else { + Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } - if( Train->ggMainOffButton.SubModel != nullptr ) { - Train->ggMainOffButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - // and the two-state switch too, for good measure + } + // play sound immediately when the switch is hit, not after release + Train->fMainRelayTimer = 0.0f; + + if( Train->m_linebreakerstate == 0 ) { return; } // already in the desired state + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( Train->mvControlled->TrainType == dt_EZT ) { + // a single impulse switch can't open the circuit, only close it + return; + } + + if( true == Train->mvControlled->MainSwitch( false ) ) { + Train->m_linebreakerstate = -1; + } + } + else { + // release... + // we don't exactly know which of the two buttons was used, so reset both + // for setup with two separate swiches + if( Train->ggMainOnButton.SubModel != nullptr ) { + Train->ggMainOnButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + if( Train->ggMainOffButton.SubModel != nullptr ) { + Train->ggMainOffButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + // and the two-state switch too, for good measure + if( Train->ggMainButton.SubModel != nullptr ) { + // visual feedback + Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + if( Train->m_linebreakerstate < 0 ) { + // finalize state change of the line breaker + Train->m_linebreakerstate = 0; + } + // on button release reset the closing timer + Train->fMainRelayTimer = 0.0f; + } +} + +void TTrain::OnCommand_linebreakerclose( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // press... + // visual feedback + if( Train->ggMainOnButton.SubModel != nullptr ) { + // two separate switches to close and break the circuit + Train->ggMainOnButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else if( Train->ggMainButton.SubModel != nullptr ) { + // single two-state switch + Train->ggMainButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + // the actual closing of the line breaker is handled in the train update routine + } + else if( Command.action == GLFW_RELEASE ) { + // release... + // visual feedback + if( Train->ggMainOnButton.SubModel != nullptr ) { + // setup with two separate switches + Train->ggMainOnButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + // NOTE: we don't have switch type definition for the line breaker switch + // so for the time being we have hard coded "impulse" switches for all EMUs + // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz + if( Train->mvControlled->TrainType == dt_EZT ) { if( Train->ggMainButton.SubModel != nullptr ) { // visual feedback Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } - // finalize the state of the line breaker - Train->m_linebreakerstate = 0; } - else { - // ...after closing the circuit + + if( Train->m_linebreakerstate == 1 ) { return; } // already in the desired state + + if( Train->m_linebreakerstate > 1 ) { // we don't need to start the diesel twice, but the other types still need to be launched if( ( Train->mvControlled->EngineType != DieselEngine ) && ( Train->mvControlled->EngineType != DieselElectric ) ) { @@ -1815,93 +1922,26 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); } } - // visual feedback - if( Train->ggMainOnButton.SubModel != nullptr ) { - // setup with two separate switches - Train->ggMainOnButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - // NOTE: we don't have switch type definition for the line breaker switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( Train->mvControlled->TrainType == dt_EZT ) { - if( Train->ggMainButton.SubModel != nullptr ) { - // visual feedback - Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - } - // finalize the state of the line breaker + // finalize state change of the line breaker Train->m_linebreakerstate = 1; } - // on button release reset the closing timer, just in case something elsewhere tries to read it + // on button release reset the closing timer Train->fMainRelayTimer = 0.0f; } } void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Command ) { - if( Train->mvControlled->ConverterStart == start::automatic ) { - // let the automatic thing do its automatic thing... - return; - } - if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down if( ( false == Train->mvControlled->ConverterAllow ) && ( Train->ggConverterButton.GetValue() < 0.5 ) ) { // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - // visual feedback - Train->ggConverterButton.UpdateValue( 1.0, Train->dsbSwitch ); -/* - if( ( Train->mvControlled->EnginePowerSource.SourceType != CurrentCollector ) - || ( Train->mvControlled->PantRearVolt != 0.0 ) - || ( Train->mvControlled->PantFrontVolt != 0.0 ) ) { -*/ - // impulse type switch has no effect if there's no power - // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway - if( ( Train->mvOccupied->ConvSwitchType != "impulse" ) - || ( Train->mvControlled->Mains ) ) { - // won't start if the line breaker button is still held - if( true == Train->mvControlled->ConverterSwitch( true ) ) { - // side effects - // control the compressor, if it's paired with the converter - if( Train->mvControlled->CompressorPower == 2 ) { - // hunter-091012: tak jest poprawnie - Train->mvControlled->CompressorSwitch( true ); - } - } - } -/* - } -*/ + OnCommand_converterenable( Train, Command ); } else { //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - // visual feedback - Train->ggConverterButton.UpdateValue( 0.0, Train->dsbSwitch ); - if( Train->ggConverterOffButton.SubModel != nullptr ) { - Train->ggConverterOffButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - if( true == Train->mvControlled->ConverterSwitch( false ) ) { - // side effects - // control the compressor, if it's paired with the converter - if( Train->mvControlled->CompressorPower == 2 ) { - // hunter-091012: tak jest poprawnie - Train->mvControlled->CompressorSwitch( false ); - } - if( ( Train->mvControlled->TrainType == dt_EZT ) - && ( !TestFlag( Train->mvControlled->EngDmgFlag, 4 ) ) ) { - Train->mvControlled->ConvOvldFlag = false; - } - // if there's no (low voltage) power source left, drop pantographs - if( false == Train->mvControlled->Battery ) { - Train->mvControlled->PantFront( false ); - Train->mvControlled->PantRear( false ); - } - } + OnCommand_converterdisable( Train, Command ); } } else if( Command.action == GLFW_RELEASE ) { @@ -1914,6 +1954,80 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma } } +void TTrain::OnCommand_converterenable( TTrain *Train, command_data const &Command ) { + + if( Train->mvControlled->ConverterStart == start::automatic ) { + // let the automatic thing do its automatic thing... + return; + } + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggConverterButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->ConverterAllow ) { return; } // already enabled + + // impulse type switch has no effect if there's no power + // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway + if( ( Train->mvOccupied->ConvSwitchType != "impulse" ) + || ( Train->mvControlled->Mains ) ) { + // won't start if the line breaker button is still held + if( true == Train->mvControlled->ConverterSwitch( true ) ) { + // side effects + // control the compressor, if it's paired with the converter + if( Train->mvControlled->CompressorPower == 2 ) { + // hunter-091012: tak jest poprawnie + Train->mvControlled->CompressorSwitch( true ); + } + } + } + } + else if( Command.action == GLFW_RELEASE ) { + // potentially reset impulse switch position, using shared code branch + OnCommand_convertertoggle( Train, Command ); + } +} + +void TTrain::OnCommand_converterdisable( TTrain *Train, command_data const &Command ) { + + if( Train->mvControlled->ConverterStart == start::automatic ) { + // let the automatic thing do its automatic thing... + return; + } + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggConverterButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggConverterOffButton.SubModel != nullptr ) { + Train->ggConverterOffButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + + if( false == Train->mvControlled->ConverterAllow ) { return; } // already disabled + + if( true == Train->mvControlled->ConverterSwitch( false ) ) { + // side effects + // control the compressor, if it's paired with the converter + if( Train->mvControlled->CompressorPower == 2 ) { + // hunter-091012: tak jest poprawnie + Train->mvControlled->CompressorSwitch( false ); + } + if( ( Train->mvControlled->TrainType == dt_EZT ) + && ( false == TestFlag( Train->mvControlled->EngDmgFlag, 4 ) ) ) { + Train->mvControlled->ConvOvldFlag = false; + } + // if there's no (low voltage) power source left, drop pantographs + if( false == Train->mvControlled->Battery ) { + Train->mvControlled->PantFront( false ); + Train->mvControlled->PantRear( false ); + } + } + } + else if( Command.action == GLFW_RELEASE ) { + // potentially reset impulse switch position, using shared code branch + OnCommand_convertertoggle( Train, Command ); + } +} + void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const &Command ) { if( Train->mvOccupied->ConverterStart == start::automatic ) { @@ -1979,17 +2093,16 @@ void TTrain::OnCommand_converteroverloadrelayreset( TTrain *Train, command_data } if( Command.action == GLFW_PRESS ) { - // press + // visual feedback + Train->ggConverterFuseButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( ( Train->mvControlled->Mains == false ) && ( Train->ggConverterButton.GetValue() < 0.05 ) && ( Train->mvControlled->TrainType != dt_EZT ) ) { Train->mvControlled->ConvOvldFlag = false; } - // visual feedback - Train->ggConverterFuseButton.UpdateValue( 1.0, Train->dsbSwitch ); } else if( Command.action == GLFW_RELEASE ) { - // release // visual feedback Train->ggConverterFuseButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -1997,63 +2110,79 @@ void TTrain::OnCommand_converteroverloadrelayreset( TTrain *Train, command_data void TTrain::OnCommand_compressortoggle( TTrain *Train, command_data const &Command ) { + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->CompressorAllow ) { + // turn on + OnCommand_compressorenable( Train, Command ); + } + else { + //turn off + OnCommand_compressordisable( Train, Command ); + } + } +/* + // disabled because we don't have yet support for compressor switch type definition + else if( Command.action == GLFW_RELEASE ) { + // on button release... + if( Train->mvOccupied->CompSwitchType == "impulse" ) { + // ...return switches to start position if applicable + Train->ggCompressorButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->ggCompressorOffButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + } +*/ +} + +void TTrain::OnCommand_compressorenable( TTrain *Train, command_data const &Command ) { + if( Train->mvControlled->CompressorPower >= 2 ) { return; } if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( false == Train->mvControlled->CompressorAllow ) { - // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state + // visual feedback + Train->ggCompressorButton.UpdateValue( 1.0, Train->dsbSwitch ); - // visual feedback - Train->ggCompressorButton.UpdateValue( 1.0, Train->dsbSwitch ); - // impulse type switch has no effect if there's no power - // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway - // (we're presuming impulse type switch for all EMUs for the time being) -// if( ( mvControlled->TrainType != dt_EZT ) -// || ( mvControlled->Mains ) ) { + if( true == Train->mvControlled->CompressorAllow ) { return; } // already enabled - Train->mvControlled->CompressorSwitch( true ); -// } - } - else { - //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state + // impulse type switch has no effect if there's no power + // NOTE: this is most likely setup wrong, but the whole thing is smoke and mirrors anyway +// if( ( Train->mvOccupied->CompSwitchType != "impulse" ) +// || ( Train->mvControlled->Mains ) ) { - if( true == Train->mvControlled->CompressorSwitch( false ) ) { - // NOTE: we don't have switch type definition for the compresor switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz -// if( mvControlled->TrainType == dt_EZT ) { -// // visual feedback -// ggCompressorButton.UpdateValue( 1.0 ); -// } -// else { - // visual feedback - Train->ggCompressorButton.UpdateValue( 0.0, Train->dsbSwitch ); -// } - } - } + Train->mvControlled->CompressorSwitch( true ); +// } } -/* - // disabled because EMUs have basic switches. left in case impulse switch code is needed, so we don't have to reinvent the wheel else if( Command.action == GLFW_RELEASE ) { - // on button release... - // TODO: check if compressor switch is two-state or impulse type - // NOTE: we don't have switch type definition for the compresor switch - // so for the time being we have hard coded "impulse" switches for all EMUs - // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz - if( mvControlled->TrainType == dt_EZT ) { - if( ggCompressorButton.SubModel != nullptr ) { - ggCompressorButton.UpdateValue( 0.0 ); - // audio feedback - play_sound( dsbSwitch ); - } - } + // potentially reset impulse switch position, using shared code branch + OnCommand_compressortoggle( Train, Command ); } + +} + +void TTrain::OnCommand_compressordisable( TTrain *Train, command_data const &Command ) { + + if( Train->mvControlled->CompressorPower >= 2 ) { + return; + } + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggCompressorButton.UpdateValue( 0.0, Train->dsbSwitch ); +/* + if( Train->ggCompressorOffButton.SubModel != nullptr ) { + Train->ggCompressorOffButton.UpdateValue( 1.0, Train->dsbSwitch ); + } */ + if( false == Train->mvControlled->CompressorAllow ) { return; } // already disabled + + Train->mvControlled->CompressorSwitch( false ); + } + else if( Command.action == GLFW_RELEASE ) { + // potentially reset impulse switch position, using shared code branch + OnCommand_compressortoggle( Train, Command ); + } } void TTrain::OnCommand_compressortogglelocal( TTrain *Train, command_data const &Command ) { @@ -2093,105 +2222,57 @@ void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &C } return; } - - command_data command = Command; - if( Train->mvControlled->StLinSwitchType == "toggle" ) { - if( ( Command.hint == command_hint::on ) && ( true == Train->mvControlled->StLinSwitchOff ) ) { return; } - if( ( Command.hint == command_hint::off ) && ( false == Train->mvControlled->StLinSwitchOff ) ) { return; } - } - else if( Command.hint == command_hint::off ) { - command.action = GLFW_RELEASE; - } - - // NOTE: because we don't have modeled actual circuits this is a simplification of the real mechanics + // HACK: because we don't have modeled actual circuits this is a simplification of the real mechanics // namely, pressing the button will flip it in the entire unit, which isn't exactly physically possible - if( command.action == GLFW_PRESS ) { - // button works while it's held down but we can only pay attention to initial press + if( Command.action == GLFW_PRESS ) { + // button works while it's held down but we can ignore repeats if( false == Train->mvControlled->StLinSwitchOff ) { // open the connectors - Train->mvControlled->StLinSwitchOff = true; - if( ( Train->mvControlled->TrainType == dt_ET41 ) - || ( Train->mvControlled->TrainType == dt_ET42 ) ) { - // crude implementation of the button affecting entire unit for multi-unit engines - // TODO: rework it into part of standard command propagation system - if( ( Train->mvControlled->Couplers[ 0 ].Connected != nullptr ) - && ( true == TestFlag( Train->mvControlled->Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { - // the first unit isn't allowed to start its compressor until second unit can start its own as well - Train->mvControlled->Couplers[ 0 ].Connected->StLinSwitchOff = true; - } - if( ( Train->mvControlled->Couplers[ 1 ].Connected != nullptr ) - && ( true == TestFlag( Train->mvControlled->Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { - // the first unit isn't allowed to start its compressor until second unit can start its own as well - Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = true; - } - } // visual feedback Train->ggStLinOffButton.UpdateValue( 1.0, Train->dsbSwitch ); - // yBARC - zmienione na przeciwne, bo true to zalaczone - Train->mvControlled->StLinFlag = false; - if( ( Train->mvControlled->TrainType == dt_ET41 ) - || ( Train->mvControlled->TrainType == dt_ET42 ) ) { - // crude implementation of the butto affecting entire unit for multi-unit engines - // TODO: rework it into part of standard command propagation system - if( ( Train->mvControlled->Couplers[ 0 ].Connected != nullptr ) - && ( true == TestFlag( Train->mvControlled->Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { - // the first unit isn't allowed to start its compressor until second unit can start its own as well - Train->mvControlled->Couplers[ 0 ].Connected->StLinFlag = false; - } - if( ( Train->mvControlled->Couplers[ 1 ].Connected != nullptr ) - && ( true == TestFlag( Train->mvControlled->Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { - // the first unit isn't allowed to start its compressor until second unit can start its own as well - Train->mvControlled->Couplers[ 1 ].Connected->StLinFlag = false; - } - } + + Train->mvControlled->StLinSwitchOff = true; + Train->set_paired_open_motor_connectors_button( true ); } else { - if( Train->mvControlled->StLinSwitchType == "toggle" ) { - // default type of button (impulse) has only one effect on press, but the toggle type can toggle the state - Train->mvControlled->StLinSwitchOff = false; - if( ( Train->mvControlled->TrainType == dt_ET41 ) - || ( Train->mvControlled->TrainType == dt_ET42 ) ) { - // crude implementation of the butto affecting entire unit for multi-unit engines - // TODO: rework it into part of standard command propagation system - if( ( Train->mvControlled->Couplers[ 0 ].Connected != nullptr ) - && ( true == TestFlag( Train->mvControlled->Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { - // the first unit isn't allowed to start its compressor until second unit can start its own as well - Train->mvControlled->Couplers[ 0 ].Connected->StLinSwitchOff = false; - } - if( ( Train->mvControlled->Couplers[ 1 ].Connected != nullptr ) - && ( true == TestFlag( Train->mvControlled->Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { - // the first unit isn't allowed to start its compressor until second unit can start its own as well - Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false; - } - } - // visual feedback - Train->ggStLinOffButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + // potentially close the connectors + OnCommand_motorconnectorsclose( Train, Command ); } } - else if( command.action == GLFW_RELEASE ) { + else if( Command.action == GLFW_RELEASE ) { // button released if( Train->mvControlled->StLinSwitchType != "toggle" ) { // default button type (impulse) ceases its work on button release + // visual feedback + Train->ggStLinOffButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->mvControlled->StLinSwitchOff = false; - if( ( Train->mvControlled->TrainType == dt_ET41 ) - || ( Train->mvControlled->TrainType == dt_ET42 ) ) { - // crude implementation of the butto affecting entire unit for multi-unit engines - // TODO: rework it into part of standard command propagation system - if( ( Train->mvControlled->Couplers[ 0 ].Connected != nullptr ) - && ( true == TestFlag( Train->mvControlled->Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { - // the first unit isn't allowed to start its compressor until second unit can start its own as well - Train->mvControlled->Couplers[ 0 ].Connected->StLinSwitchOff = false; - } - if( ( Train->mvControlled->Couplers[ 1 ].Connected != nullptr ) - && ( true == TestFlag( Train->mvControlled->Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { - // the first unit isn't allowed to start its compressor until second unit can start its own as well - Train->mvControlled->Couplers[ 1 ].Connected->StLinSwitchOff = false; - } - } + Train->set_paired_open_motor_connectors_button( false ); + } + } +} + +void TTrain::OnCommand_motorconnectorsclose( TTrain *Train, command_data const &Command ) { + + // TODO: don't rely on presense of 3d model to determine presence of the switch + if( Train->ggStLinOffButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Open Motor Power Connectors button is missing, or wasn't defined" ); + } + return; + } + + if( Command.action == GLFW_PRESS ) { + if( Train->mvControlled->StLinSwitchType == "toggle" ) { + // default type of button (impulse) has only one effect on press, but the toggle type can toggle the state // visual feedback Train->ggStLinOffButton.UpdateValue( 0.0, Train->dsbSwitch ); } + + if( false == Train->mvControlled->StLinSwitchOff ) { return; } // already closed + + Train->mvControlled->StLinSwitchOff = false; + Train->set_paired_open_motor_connectors_button( false ); } } @@ -2217,21 +2298,33 @@ void TTrain::OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command ( false == Train->mvControlled->ShuntMode ) : ( Train->mvControlled->Imax < Train->mvControlled->ImaxHi ) ) ) { // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - if( true == Train->mvControlled->CurrentSwitch( true ) ) { - // visual feedback - Train->ggMaxCurrentCtrl.UpdateValue( 1.0, Train->dsbSwitch ); - } + OnCommand_motoroverloadrelaythresholdsethigh( Train, Command ); } else { //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state + OnCommand_motoroverloadrelaythresholdsetlow( Train, Command ); + } + } +} - if( true == Train->mvControlled->CurrentSwitch( false ) ) { - // visual feedback - Train->ggMaxCurrentCtrl.UpdateValue( 0.0, Train->dsbSwitch ); - } +void TTrain::OnCommand_motoroverloadrelaythresholdsetlow( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( true == Train->mvControlled->CurrentSwitch( false ) ) { + // visual feedback + Train->ggMaxCurrentCtrl.UpdateValue( 0.0, Train->dsbSwitch ); + } + } +} + +void TTrain::OnCommand_motoroverloadrelaythresholdsethigh( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( true == Train->mvControlled->CurrentSwitch( true ) ) { + // visual feedback + Train->ggMaxCurrentCtrl.UpdateValue( 1.0, Train->dsbSwitch ); } } } @@ -2246,13 +2339,12 @@ void TTrain::OnCommand_motoroverloadrelayreset( TTrain *Train, command_data cons } if( Command.action == GLFW_PRESS ) { - // press - Train->mvControlled->FuseOn(); // visual feedback Train->ggFuseButton.UpdateValue( 1.0, Train->dsbSwitch ); + + Train->mvControlled->FuseOn(); } else if( Command.action == GLFW_RELEASE ) { - // release // visual feedback Train->ggFuseButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -2314,11 +2406,6 @@ void TTrain::OnCommand_lightspresetactivateprevious( TTrain *Train, command_data void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ) { - if( Train->mvOccupied->LightsPosNo > 0 ) { - // lights are controlled by preset selector - return; - } - int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? side::front : @@ -2328,34 +2415,65 @@ void TTrain::OnCommand_headlighttoggleleft( TTrain *Train, command_data const &C // only reacting to press, so the switch doesn't flip back and forth if key is held down if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_left ) == 0 ) { // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; - // visual feedback - Train->ggLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); - // if the light is controlled by 3-way switch, disable marker light - if( Train->ggLeftEndLightButton.SubModel == nullptr ) { - Train->DynamicObject->iLights[ vehicleside ] &= ~light::redmarker_left; - } + OnCommand_headlightenableleft( Train, Command ); } else { //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; - // visual feedback - Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + OnCommand_headlightdisableleft( Train, Command ); } } } -void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const &Command ) { +void TTrain::OnCommand_headlightenableleft( TTrain *Train, command_data const &Command ) { if( Train->mvOccupied->LightsPosNo > 0 ) { // lights are controlled by preset selector return; } + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_left ) != 0 ) { return; } // already enabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; + // visual feedback + Train->ggLeftLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + // if the light is controlled by 3-way switch, disable marker light + if( Train->ggLeftEndLightButton.SubModel == nullptr ) { + Train->DynamicObject->iLights[ vehicleside ] &= ~light::redmarker_left; + } + } +} + +void TTrain::OnCommand_headlightdisableleft( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_left ) == 0 ) { return; } // already disabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_left; + // visual feedback + Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + } +} + +void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const &Command ) { + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? side::front : @@ -2365,34 +2483,65 @@ void TTrain::OnCommand_headlighttoggleright( TTrain *Train, command_data const & // only reacting to press, so the switch doesn't flip back and forth if key is held down if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_right ) == 0 ) { // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; - // visual feedback - Train->ggRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); - // if the light is controlled by 3-way switch, disable marker light - if( Train->ggRightEndLightButton.SubModel == nullptr ) { - Train->DynamicObject->iLights[ vehicleside ] &= ~light::redmarker_right; - } + OnCommand_headlightenableright( Train, Command ); } else { //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; - // visual feedback - Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + OnCommand_headlightdisableright( Train, Command ); } } } -void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const &Command ) { +void TTrain::OnCommand_headlightenableright( TTrain *Train, command_data const &Command ) { if( Train->mvOccupied->LightsPosNo > 0 ) { // lights are controlled by preset selector return; } + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_right ) != 0 ) { return; } // already enabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; + // visual feedback + Train->ggRightLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + // if the light is controlled by 3-way switch, disable marker light + if( Train->ggRightEndLightButton.SubModel == nullptr ) { + Train->DynamicObject->iLights[ vehicleside ] &= ~light::redmarker_right; + } + } +} + +void TTrain::OnCommand_headlightdisableright( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_right ) == 0 ) { return; } // already disabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_right; + // visual feedback + Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + } +} + +void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const &Command ) { + int const vehicleside = ( Train->mvOccupied->ActiveCab == 1 ? side::front : @@ -2402,23 +2551,59 @@ void TTrain::OnCommand_headlighttoggleupper( TTrain *Train, command_data const & // only reacting to press, so the switch doesn't flip back and forth if key is held down if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_upper ) == 0 ) { // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; - // visual feedback - Train->ggUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + OnCommand_headlightenableupper( Train, Command ); } else { //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; - // visual feedback - Train->ggUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + OnCommand_headlightdisableupper( Train, Command ); } } } +void TTrain::OnCommand_headlightenableupper( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_upper ) != 0 ) { return; } // already enabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; + // visual feedback + Train->ggUpperLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + } +} + +void TTrain::OnCommand_headlightdisableupper( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::headlight_upper ) == 0 ) { return; } // already disabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::headlight_upper; + // visual feedback + Train->ggUpperLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + } +} + void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &Command ) { if( Train->mvOccupied->LightsPosNo > 0 ) { @@ -2712,126 +2897,210 @@ void TTrain::OnCommand_endsignalstoggle( TTrain *Train, command_data const &Comm void TTrain::OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &Command ) { - // NOTE: the check is disabled, as we're presuming light control is present in every vehicle - // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels - if( Train->ggDimHeadlightsButton.SubModel == nullptr ) { - if( Command.action == GLFW_PRESS ) { - WriteLog( "Dim Headlights switch is missing, or wasn't defined" ); - } - return; - } - if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->DynamicObject->DimHeadlights ) { // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - Train->DynamicObject->DimHeadlights = true; - // visual feedback - Train->ggDimHeadlightsButton.UpdateValue( 1.0, Train->dsbSwitch ); + OnCommand_headlightsdimenable( Train, Command ); } else { //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - Train->DynamicObject->DimHeadlights = false; - // visual feedback - Train->ggDimHeadlightsButton.UpdateValue( 0.0, Train->dsbSwitch ); + OnCommand_headlightsdimdisable( Train, Command ); } } } +void TTrain::OnCommand_headlightsdimenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Train->ggDimHeadlightsButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Dim Headlights switch is missing, or wasn't defined" ); + return; + } + // visual feedback + Train->ggDimHeadlightsButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->DynamicObject->DimHeadlights ) { return; } // already enabled + + Train->DynamicObject->DimHeadlights = true; + } +} + +void TTrain::OnCommand_headlightsdimdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Train->ggDimHeadlightsButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Dim Headlights switch is missing, or wasn't defined" ); + return; + } + // visual feedback + Train->ggDimHeadlightsButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->DynamicObject->DimHeadlights ) { return; } // already enabled + + Train->DynamicObject->DimHeadlights = false; + } +} + void TTrain::OnCommand_interiorlighttoggle( TTrain *Train, command_data const &Command ) { - // NOTE: the check is disabled, as we're presuming light control is present in every vehicle - // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels - if( Train->ggCabLightButton.SubModel == nullptr ) { - if( Command.action == GLFW_PRESS ) { - WriteLog( "Interior Light switch is missing, or wasn't defined" ); - } - return; - } - if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->bCabLight ) { // turn on - Train->bCabLight = true; - Train->btCabLight.Turn( true ); - // visual feedback - Train->ggCabLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + OnCommand_interiorlightenable( Train, Command ); } else { //turn off - Train->bCabLight = false; - Train->btCabLight.Turn( false ); - // visual feedback - Train->ggCabLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + OnCommand_interiorlightdisable( Train, Command ); } } } +void TTrain::OnCommand_interiorlightenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Train->ggCabLightButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Interior Light switch is missing, or wasn't defined" ); + return; + } + // visual feedback + Train->ggCabLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->bCabLight ) { return; } // already enabled + + Train->bCabLight = true; + Train->btCabLight.Turn( true ); + } +} + +void TTrain::OnCommand_interiorlightdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Train->ggCabLightButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Interior Light switch is missing, or wasn't defined" ); + return; + } + // visual feedback + Train->ggCabLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->bCabLight ) { return; } // already disabled + + Train->bCabLight = false; + Train->btCabLight.Turn( false ); + } +} + void TTrain::OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const &Command ) { - // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels - if( Train->ggCabLightDimButton.SubModel == nullptr ) { - if( Command.action == GLFW_PRESS ) { - WriteLog( "Dim Interior Light switch is missing, or wasn't defined" ); - } - return; - } - if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->bCabLightDim ) { // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - Train->bCabLightDim = true; - // visual feedback - Train->ggCabLightDimButton.UpdateValue( 1.0, Train->dsbSwitch ); + OnCommand_interiorlightdimenable( Train, Command ); } else { //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - Train->bCabLightDim = false; - // visual feedback - Train->ggCabLightDimButton.UpdateValue( 0.0, Train->dsbSwitch ); + OnCommand_interiorlightdimdisable( Train, Command ); } } } +void TTrain::OnCommand_interiorlightdimenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Train->ggCabLightDimButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Dim Interior Light switch is missing, or wasn't defined" ); + return; + } + // visual feedback + Train->ggCabLightDimButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->bCabLightDim ) { return; } // already enabled + + Train->bCabLightDim = true; + } +} + +void TTrain::OnCommand_interiorlightdimdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Train->ggCabLightDimButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Dim Interior Light switch is missing, or wasn't defined" ); + return; + } + // visual feedback + Train->ggCabLightDimButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->bCabLightDim ) { return; } // already disabled + + Train->bCabLightDim = false; + } +} + void TTrain::OnCommand_instrumentlighttoggle( TTrain *Train, command_data const &Command ) { - // NOTE: the check is disabled, as we're presuming light control is present in every vehicle - // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels - if( Train->ggInstrumentLightButton.SubModel == nullptr ) { - if( Command.action == GLFW_PRESS ) { - WriteLog( "Instrument light switch is missing, or wasn't defined" ); - } - return; - } - if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - // NOTE: instrument lighting isn't fully implemented, so we have to rely on the state of the 'button' i.e. light itself if( false == Train->InstrumentLightActive ) { // turn on - Train->InstrumentLightActive = true; - // visual feedback - Train->ggInstrumentLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + OnCommand_instrumentlightenable( Train, Command ); } else { //turn off - Train->InstrumentLightActive = false; - // visual feedback - Train->ggInstrumentLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + OnCommand_instrumentlightdisable( Train, Command ); } } } +void TTrain::OnCommand_instrumentlightenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Train->ggInstrumentLightButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Instrument Light switch is missing, or wasn't defined" ); + return; + } + // visual feedback + Train->ggInstrumentLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->InstrumentLightActive ) { return; } // already enabled + + Train->InstrumentLightActive = true; + } +} + +void TTrain::OnCommand_instrumentlightdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Train->ggInstrumentLightButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Instrument Light switch is missing, or wasn't defined" ); + return; + } + // visual feedback + Train->ggInstrumentLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->InstrumentLightActive ) { return; } // already disabled + + Train->InstrumentLightActive = false; + } +} + void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ) { if( Train->ggTrainHeatingButton.SubModel == nullptr ) { @@ -2845,23 +3114,39 @@ void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command // only reacting to press, so the switch doesn't flip back and forth if key is held down if( false == Train->mvControlled->Heating ) { // turn on - if( Command.hint == command_hint::off ) { return; } // caller wants the other state - - Train->mvControlled->Heating = true; - // visual feedback - Train->ggTrainHeatingButton.UpdateValue( 1.0, Train->dsbSwitch ); + OnCommand_heatingenable( Train, Command ); } else { //turn off - if( Command.hint == command_hint::on ) { return; } // caller wants the other state - - Train->mvControlled->Heating = false; - // visual feedback - Train->ggTrainHeatingButton.UpdateValue( 0.0, Train->dsbSwitch ); + OnCommand_heatingdisable( Train, Command ); } } } +void TTrain::OnCommand_heatingenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggTrainHeatingButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->Heating ) { return; } // already enabled + + Train->mvControlled->Heating = true; + } +} + +void TTrain::OnCommand_heatingdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggTrainHeatingButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->Heating ) { return; } // already disabled + + Train->mvControlled->Heating = false; + } +} + void TTrain::OnCommand_generictoggle( TTrain *Train, command_data const &Command ) { auto const itemindex = static_cast( Command.command ) - static_cast( user_command::generictoggle0 ); @@ -3391,7 +3676,66 @@ TTrain::GetWorldMechPosition() { bool TTrain::Update( double const Deltatime ) { - // check for sent user commands + // train state verification + // line breaker: + if( m_linebreakerstate == 0 ) { + if( true == mvControlled->Mains ) { + // crude way to sync state of the linebreaker with ai-issued commands + m_linebreakerstate = 1; + } + } + if( m_linebreakerstate == 1 ) { + if( ( mvControlled->EngineType == DieselElectric ) + && ( false == mvControlled->ConverterFlag ) ) { + // converter acts as a make-believe fuel pump so if it's off, kill the engine + // TODO: implement actual fuel system and move this check to the mover update + mvControlled->MainSwitch( false ); + } + if( false == mvControlled->Mains ) { + // crude way to catch cases where the main was knocked out and the user is trying to restart it + // because the state of the line breaker isn't changed to match, we need to do it here manually + m_linebreakerstate = 0; + } + } + if( ( ggMainButton.GetDesiredValue() > 0.95 ) + || ( ggMainOnButton.GetDesiredValue() > 0.95 ) ) { + // keep track of period the line breaker button is held down, to determine when/if circuit closes + if( ( fHVoltage > 0.5 * mvControlled->EnginePowerSource.MaxVoltage ) + || ( ( mvControlled->EngineType != ElectricSeriesMotor ) + && ( mvControlled->EngineType != ElectricInductionMotor ) + && ( true == mvControlled->Battery ) ) ) { + // prevent the switch from working if there's no power + // TODO: consider whether it makes sense for diesel engines and such + fMainRelayTimer += Deltatime; + } + if( m_linebreakerstate < 1 ) { + + if( fMainRelayTimer > mvControlled->InitialCtrlDelay ) { + // wlaczanie WSa z opoznieniem + m_linebreakerstate = 2; + // for diesels, we complete the engine start here + // TODO: consider arranging a better way to start the diesel engines + if( ( mvControlled->EngineType == DieselEngine ) + || ( mvControlled->EngineType == DieselElectric ) ) { + if( mvControlled->MainSwitch( true ) ) { + // side-effects + mvControlled->ConverterSwitch( ( ggConverterButton.GetDesiredValue() > 0.95 ) || ( mvControlled->ConverterStart == start::automatic ) ); + mvControlled->CompressorSwitch( ggCompressorButton.GetDesiredValue() > 0.95 ); + } + } + } + } + } + else { + // button isn't down, reset the timer + fMainRelayTimer = 0.0f; + } + if( ggMainOffButton.GetDesiredValue() > 0.95 ) { + // if the button disconnecting the line breaker is down prevent the timer from accumulating + fMainRelayTimer = 0.0f; + } + + // check for received user commands // NOTE: this is a temporary arrangement, for the transition period from old command setup to the new one // eventually commands are going to be retrieved directly by the vehicle, filtered through active control stand // and ultimately executed, provided the stand allows it. @@ -3817,6 +4161,38 @@ bool TTrain::Update( double const Deltatime ) if (mvControlled->Battery || mvControlled->ConverterFlag) { + // alerter test + if( true == CAflag ) { + if( ggSecurityResetButton.GetDesiredValue() > 0.95 ) { + fCzuwakTestTimer += Deltatime; + } + if( fCzuwakTestTimer > 1.0 ) { + SetFlag( mvOccupied->SecuritySystem.Status, s_CAtest ); + } + } + // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa + if( mvOccupied->SecuritySystem.Status > 0 ) { + if( fBlinkTimer > fCzuwakBlink ) + fBlinkTimer = -fCzuwakBlink; + else + fBlinkTimer += Deltatime; + + // hunter-091012: dodanie testu czuwaka + if( ( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) + || ( TestFlag( mvOccupied->SecuritySystem.Status, s_CAtest ) ) ) { + btLampkaCzuwaka.Turn( fBlinkTimer > 0 ); + } + else + btLampkaCzuwaka.Turn( false ); + + btLampkaSHP.Turn( TestFlag( mvOccupied->SecuritySystem.Status, s_active ) ); + } + else // wylaczone + { + btLampkaCzuwaka.Turn( false ); + btLampkaSHP.Turn( false ); + } + btLampkaWylSzybki.Turn( ( ( (m_linebreakerstate > 0) || (true == mvControlled->Mains) ) ? @@ -3900,6 +4276,8 @@ bool TTrain::Update( double const Deltatime ) } else { // wylaczone + btLampkaCzuwaka.Turn( false ); + btLampkaSHP.Turn( false ); btLampkaWylSzybki.Turn( false ); btLampkaWylSzybkiOff.Turn( false ); btLampkaWysRozr.Turn( false ); @@ -4239,29 +4617,6 @@ bool TTrain::Update( double const Deltatime ) //---------- - // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa - if (mvOccupied->SecuritySystem.Status > 0) - { - if (fBlinkTimer > fCzuwakBlink) - fBlinkTimer = -fCzuwakBlink; - else - fBlinkTimer += Deltatime; - - // hunter-091012: dodanie testu czuwaka - if( ( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) - || ( TestFlag( mvOccupied->SecuritySystem.Status, s_CAtest ) ) ) { - btLampkaCzuwaka.Turn( fBlinkTimer > 0 ); - } - else - btLampkaCzuwaka.Turn( false ); - - btLampkaSHP.Turn(TestFlag(mvOccupied->SecuritySystem.Status, s_active)); - } - else // wylaczone - { - btLampkaCzuwaka.Turn( false ); - btLampkaSHP.Turn( false ); - } // przelaczniki // ABu030405 obsluga lampki uniwersalnej: if( btInstrumentLight.Active() ) // w ogóle jest @@ -4382,27 +4737,25 @@ bool TTrain::Update( double const Deltatime ) } } - // catch cases where the power goes out, and the linebreaker state is left as closed - if( ( m_linebreakerstate == 1 ) - && ( false == mvControlled->Mains ) - && ( ggMainButton.GetValue() < 0.05 ) ) { - // crude way to catch cases where the main was knocked out and the user is trying to restart it - // because the state of the line breaker isn't changed to match, we need to do it here manually - m_linebreakerstate = 0; + // anti slip system activation, maintained while the control button is down + if( mvOccupied->BrakeSystem != ElectroPneumatic ) { + if( ggAntiSlipButton.GetDesiredValue() > 0.95 ) { + mvControlled->AntiSlippingBrake(); + } } // NOTE: crude way to have the pantographs go back up if they're dropped due to insufficient pressure etc // TODO: rework it into something more elegant, when redoing the whole consist/unit/cab etc arrangement if( ( mvControlled->Battery ) || ( mvControlled->ConverterFlag ) ) { - if( ggPantAllDownButton.GetValue() == 0.0 ) { + if( ggPantAllDownButton.GetDesiredValue() < 0.05 ) { // the 'lower all' button overrides state of switches, while active itself if( ( false == mvControlled->PantFrontUp ) - && ( ggPantFrontButton.GetValue() >= 1.0 ) ) { + && ( ggPantFrontButton.GetDesiredValue() >= 0.95 ) ) { mvControlled->PantFront( true ); } if( ( false == mvControlled->PantRearUp ) - && ( ggPantRearButton.GetValue() >= 1.0 ) ) { + && ( ggPantRearButton.GetDesiredValue() >= 0.95 ) ) { mvControlled->PantRear( true ); } } diff --git a/Train.h b/Train.h index db392353..4b300e42 100644 --- a/Train.h +++ b/Train.h @@ -133,6 +133,10 @@ class TTrain TDynamicObject *find_nearest_consist_vehicle() const; // moves train brake lever to specified position, potentially emits switch sound if conditions are met void set_train_brake( double const Position ); + // sets specified brake acting speed for specified vehicle, potentially updating state of cab controls to match + void set_train_brake_speed( TDynamicObject *Vehicle, int const Speed ); + // sets the motor connector button in paired unit to specified state + void set_paired_open_motor_connectors_button( bool const State ); // update function subroutines void update_sounds( double const Deltatime ); @@ -181,6 +185,9 @@ class TTrain static void OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_brakeactingspeedsetcargo( TTrain *Train, command_data const &Command ); + static void OnCommand_brakeactingspeedsetpassenger( TTrain *Train, command_data const &Command ); + static void OnCommand_brakeactingspeedsetrapid( TTrain *Train, command_data const &Command ); static void OnCommand_brakeloadcompensationincrease( TTrain *Train, command_data const &Command ); static void OnCommand_brakeloadcompensationdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data const &Command ); @@ -188,27 +195,50 @@ class TTrain static void OnCommand_reverserdecrease( TTrain *Train, command_data const &Command ); static void OnCommand_alerteracknowledge( TTrain *Train, command_data const &Command ); static void OnCommand_batterytoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_batteryenable( TTrain *Train, command_data const &Command ); + static void OnCommand_batterydisable( TTrain *Train, command_data const &Command ); static void OnCommand_pantographcompressorvalvetoggle( TTrain *Train, command_data const &Command ); static void OnCommand_pantographcompressoractivate( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglefront( TTrain *Train, command_data const &Command ); static void OnCommand_pantographtogglerear( TTrain *Train, command_data const &Command ); + static void OnCommand_pantographraisefront( TTrain *Train, command_data const &Command ); + static void OnCommand_pantographraiserear( TTrain *Train, command_data const &Command ); + static void OnCommand_pantographlowerfront( TTrain *Train, command_data const &Command ); + static void OnCommand_pantographlowerrear( TTrain *Train, command_data const &Command ); static void OnCommand_pantographlowerall( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_linebreakeropen( TTrain *Train, command_data const &Command ); + static void OnCommand_linebreakerclose( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_converterenable( TTrain *Train, command_data const &Command ); + static void OnCommand_converterdisable( TTrain *Train, command_data const &Command ); static void OnCommand_convertertogglelocal( TTrain *Train, command_data const &Command ); static void OnCommand_converteroverloadrelayreset( TTrain *Train, command_data const &Command ); static void OnCommand_compressortoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_compressorenable( TTrain *Train, command_data const &Command ); + static void OnCommand_compressordisable( TTrain *Train, command_data const &Command ); static void OnCommand_compressortogglelocal( TTrain *Train, command_data const &Command ); static void OnCommand_motorconnectorsopen( TTrain *Train, command_data const &Command ); + static void OnCommand_motorconnectorsclose( TTrain *Train, command_data const &Command ); static void OnCommand_motordisconnect( TTrain *Train, command_data const &Command ); static void OnCommand_motoroverloadrelaythresholdtoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_motoroverloadrelaythresholdsetlow( TTrain *Train, command_data const &Command ); + static void OnCommand_motoroverloadrelaythresholdsethigh( TTrain *Train, command_data const &Command ); static void OnCommand_motoroverloadrelayreset( TTrain *Train, command_data const &Command ); static void OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_heatingenable( TTrain *Train, command_data const &Command ); + static void OnCommand_heatingdisable( TTrain *Train, command_data const &Command ); static void OnCommand_lightspresetactivatenext( TTrain *Train, command_data const &Command ); static void OnCommand_lightspresetactivateprevious( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleleft( TTrain *Train, command_data const &Command ); + static void OnCommand_headlightenableleft( TTrain *Train, command_data const &Command ); + static void OnCommand_headlightdisableleft( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleright( TTrain *Train, command_data const &Command ); + static void OnCommand_headlightenableright( TTrain *Train, command_data const &Command ); + static void OnCommand_headlightdisableright( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttoggleupper( TTrain *Train, command_data const &Command ); + static void OnCommand_headlightenableupper( TTrain *Train, command_data const &Command ); + static void OnCommand_headlightdisableupper( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertoggleright( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttogglerearleft( TTrain *Train, command_data const &Command ); @@ -219,9 +249,17 @@ class TTrain static void OnCommand_redmarkerstoggle( TTrain *Train, command_data const &Command ); static void OnCommand_endsignalstoggle( TTrain *Train, command_data const &Command ); static void OnCommand_headlightsdimtoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_headlightsdimenable( TTrain *Train, command_data const &Command ); + static void OnCommand_headlightsdimdisable( TTrain *Train, command_data const &Command ); static void OnCommand_interiorlighttoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_interiorlightenable( TTrain *Train, command_data const &Command ); + static void OnCommand_interiorlightdisable( TTrain *Train, command_data const &Command ); static void OnCommand_interiorlightdimtoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_interiorlightdimenable( TTrain *Train, command_data const &Command ); + static void OnCommand_interiorlightdimdisable( TTrain *Train, command_data const &Command ); static void OnCommand_instrumentlighttoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_instrumentlightenable( TTrain *Train, command_data const &Command ); + static void OnCommand_instrumentlightdisable( TTrain *Train, command_data const &Command ); static void OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleright( TTrain *Train, command_data const &Command ); diff --git a/World.cpp b/World.cpp index 3c97d687..5ad41330 100644 --- a/World.cpp +++ b/World.cpp @@ -2163,7 +2163,7 @@ world_environment::update() { else { // regular situation with sun as the key light Global.SunAngle = m_sun.getAngle(); - Global.DayLight.position = m_sun.getPosition(); + Global.DayLight.position = m_sun.getDirection(); Global.DayLight.direction = -1.0f * m_sun.getDirection(); keylightintensity = sunlightlevel; // include 'golden hour' effect in twilight lighting diff --git a/command.cpp b/command.cpp index e3ee9cad..aa60c905 100644 --- a/command.cpp +++ b/command.cpp @@ -61,17 +61,28 @@ commanddescription_sequence Commands_descriptions = { { "reverserincrease", command_target::vehicle }, { "reverserdecrease", command_target::vehicle }, { "linebreakertoggle", command_target::vehicle }, + { "linebreakeropen", command_target::vehicle }, + { "linebreakerclose", command_target::vehicle }, { "convertertoggle", command_target::vehicle }, + { "converterenable", command_target::vehicle }, + { "converterdisable", command_target::vehicle }, { "convertertogglelocal", command_target::vehicle }, { "converteroverloadrelayreset", command_target::vehicle }, { "compressortoggle", command_target::vehicle }, + { "compressorenable", command_target::vehicle }, + { "compressordisable", command_target::vehicle }, { "compressortogglelocal", command_target::vehicle }, { "motoroverloadrelaythresholdtoggle", command_target::vehicle }, + { "motoroverloadrelaythresholdsetlow", command_target::vehicle }, + { "motoroverloadrelaythresholdsethigh", command_target::vehicle }, { "motoroverloadrelayreset", command_target::vehicle }, { "notchingrelaytoggle", command_target::vehicle }, { "epbrakecontroltoggle", command_target::vehicle }, { "brakeactingspeedincrease", command_target::vehicle }, { "brakeactingspeeddecrease", command_target::vehicle }, + { "brakeactingspeedsetcargo", command_target::vehicle }, + { "brakeactingspeedsetpassenger", command_target::vehicle }, + { "brakeactingspeedsetrapid", command_target::vehicle }, { "brakeloadcompensationincrease", command_target::vehicle }, { "brakeloadcompensationdecrease", command_target::vehicle }, { "mubrakingindicatortoggle", command_target::vehicle }, @@ -109,13 +120,25 @@ commanddescription_sequence Commands_descriptions = { { "pantographcompressoractivate", command_target::vehicle }, { "pantographtogglefront", command_target::vehicle }, { "pantographtogglerear", command_target::vehicle }, + { "pantographraisefront", command_target::vehicle }, + { "pantographraiserear", command_target::vehicle }, + { "pantographlowerfront", command_target::vehicle }, + { "pantographlowerrear", command_target::vehicle }, { "pantographlowerall", command_target::vehicle }, { "heatingtoggle", command_target::vehicle }, + { "heatingenable", command_target::vehicle }, + { "heatingdisable", command_target::vehicle }, { "lightspresetactivatenext", command_target::vehicle }, { "lightspresetactivateprevious", command_target::vehicle }, { "headlighttoggleleft", command_target::vehicle }, + { "headlightenableleft", command_target::vehicle }, + { "headlightdisableleft", command_target::vehicle }, { "headlighttoggleright", command_target::vehicle }, + { "headlightenableright", command_target::vehicle }, + { "headlightdisableright", command_target::vehicle }, { "headlighttoggleupper", command_target::vehicle }, + { "headlightenableupper", command_target::vehicle }, + { "headlightdisableupper", command_target::vehicle }, { "redmarkertoggleleft", command_target::vehicle }, { "redmarkertoggleright", command_target::vehicle }, { "headlighttogglerearleft", command_target::vehicle }, @@ -126,11 +149,20 @@ commanddescription_sequence Commands_descriptions = { { "redmarkerstoggle", command_target::vehicle }, { "endsignalstoggle", command_target::vehicle }, { "headlightsdimtoggle", command_target::vehicle }, + { "headlightsdimenable", command_target::vehicle }, + { "headlightsdimdisable", command_target::vehicle }, { "motorconnectorsopen", command_target::vehicle }, + { "motorconnectorsclose", command_target::vehicle }, { "motordisconnect", command_target::vehicle }, { "interiorlighttoggle", command_target::vehicle }, + { "interiorlightenable", command_target::vehicle }, + { "interiorlightdisable", command_target::vehicle }, { "interiorlightdimtoggle", command_target::vehicle }, + { "interiorlightdimenable", command_target::vehicle }, + { "interiorlightdimdisable", command_target::vehicle }, { "instrumentlighttoggle", command_target::vehicle }, + { "instrumentlightenable", command_target::vehicle }, + { "instrumentlightdisable", command_target::vehicle }, { "generictoggle0", command_target::vehicle }, { "generictoggle1", command_target::vehicle }, { "generictoggle2", command_target::vehicle }, @@ -141,7 +173,9 @@ commanddescription_sequence Commands_descriptions = { { "generictoggle7", command_target::vehicle }, { "generictoggle8", command_target::vehicle }, { "generictoggle9", command_target::vehicle }, - { "batterytoggle", command_target::vehicle } + { "batterytoggle", command_target::vehicle }, + { "batteryenable", command_target::vehicle }, + { "batterydisable", command_target::vehicle } }; } @@ -177,7 +211,7 @@ command_queue::pop( command_data &Command, std::size_t const Recipient ) { } void -command_relay::post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, command_hint const Hint, std::uint16_t const Recipient ) const { +command_relay::post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, std::uint16_t const Recipient ) const { auto const &command = simulation::Commands_descriptions[ static_cast( Command ) ]; if( ( command.target == command_target::vehicle ) @@ -194,7 +228,6 @@ command_relay::post( user_command const Command, std::uint64_t const Param1, std Action, Param1, Param2, - Hint, Timer::GetDeltaTime() }, static_cast( command.target ) | Recipient ); /* diff --git a/command.h b/command.h index ab8e32d1..380df31e 100644 --- a/command.h +++ b/command.h @@ -55,17 +55,28 @@ enum class user_command { reverserincrease, reverserdecrease, linebreakertoggle, + linebreakeropen, + linebreakerclose, convertertoggle, + converterenable, + converterdisable, convertertogglelocal, converteroverloadrelayreset, compressortoggle, + compressorenable, + compressordisable, compressortogglelocal, motoroverloadrelaythresholdtoggle, + motoroverloadrelaythresholdsetlow, + motoroverloadrelaythresholdsethigh, motoroverloadrelayreset, notchingrelaytoggle, epbrakecontroltoggle, brakeactingspeedincrease, brakeactingspeeddecrease, + brakeactingspeedsetcargo, + brakeactingspeedsetpassenger, + brakeactingspeedsetrapid, brakeloadcompensationincrease, brakeloadcompensationdecrease, mubrakingindicatortoggle, @@ -102,13 +113,25 @@ enum class user_command { pantographcompressoractivate, pantographtogglefront, pantographtogglerear, + pantographraisefront, + pantographraiserear, + pantographlowerfront, + pantographlowerrear, pantographlowerall, heatingtoggle, + heatingenable, + heatingdisable, lightspresetactivatenext, lightspresetactivateprevious, headlighttoggleleft, + headlightenableleft, + headlightdisableleft, headlighttoggleright, + headlightenableright, + headlightdisableright, headlighttoggleupper, + headlightenableupper, + headlightdisableupper, redmarkertoggleleft, redmarkertoggleright, headlighttogglerearleft, @@ -119,11 +142,20 @@ enum class user_command { redmarkerstoggle, endsignalstoggle, headlightsdimtoggle, + headlightsdimenable, + headlightsdimdisable, motorconnectorsopen, + motorconnectorsclose, motordisconnect, interiorlighttoggle, + interiorlightenable, + interiorlightdisable, interiorlightdimtoggle, + interiorlightdimenable, + interiorlightdimdisable, instrumentlighttoggle, + instrumentlightenable, + instrumentlightdisable, generictoggle0, generictoggle1, generictoggle2, @@ -135,16 +167,12 @@ enum class user_command { generictoggle8, generictoggle9, batterytoggle, + batteryenable, + batterydisable, none = -1 }; -enum class command_hint { - off, - on, - none = -1 -}; - enum class command_target { userinterface, @@ -173,7 +201,6 @@ struct command_data { int action; // press, repeat or release std::uint64_t param1; std::uint64_t param2; - command_hint hint; double time_delta; }; @@ -224,7 +251,7 @@ public: // TODO: replace uint16_t with recipient handle, based on item id void post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, - int const Action, command_hint const Hint, std::uint16_t const Recipient ) const; + int const Action, std::uint16_t const Recipient ) const; private: // types // members diff --git a/gamepadinput.cpp b/gamepadinput.cpp index e3b7c24b..ec433f1c 100644 --- a/gamepadinput.cpp +++ b/gamepadinput.cpp @@ -201,7 +201,6 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g reinterpret_cast( turnx ), reinterpret_cast( turny ), GLFW_PRESS, - command_hint::none, // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place 0 ); @@ -219,7 +218,6 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g reinterpret_cast( movex ), reinterpret_cast( movez ), GLFW_PRESS, - command_hint::none, 0 ); } } @@ -249,7 +247,6 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.second, 0, 0, GLFW_RELEASE, - command_hint::none, Recipient ); m_modeaccumulator = 0.0f; } @@ -263,7 +260,6 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.first, 0, 0, GLFW_PRESS, - command_hint::none, Recipient ); m_modeaccumulator -= 1.0f; } @@ -275,7 +271,6 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.first, 0, 0, GLFW_RELEASE, - command_hint::none, Recipient ); m_modeaccumulator = 0.0f; } @@ -289,7 +284,6 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.first, 0, 0, GLFW_RELEASE, - command_hint::none, Recipient ); m_modeaccumulator = 0.0f; } @@ -303,7 +297,6 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.second, 0, 0, GLFW_PRESS, - command_hint::none, Recipient ); m_modeaccumulator += 1.0f; } @@ -315,7 +308,6 @@ gamepad_input::process_mode( float const Value, std::uint16_t const Recipient ) lookup.second, 0, 0, GLFW_RELEASE, - command_hint::none, Recipient ); m_modeaccumulator = 0.0f; } diff --git a/keyboardinput.cpp b/keyboardinput.cpp index ee6fac6c..74dc998a 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -19,6 +19,11 @@ extern TWorld World; bool keyboard_input::recall_bindings() { + cParser bindingparser( "eu07_input-keyboard.ini", cParser::buffer_FILE ); + if( false == bindingparser.ok() ) { + return false; + } + // build helper translation tables std::unordered_map nametocommandmap; std::size_t commandid = 0; @@ -51,11 +56,7 @@ keyboard_input::recall_bindings() { { "num_0", GLFW_KEY_KP_0 }, { "num_.", GLFW_KEY_KP_DECIMAL } }; - cParser bindingparser( "eu07_input-keyboard.ini", cParser::buffer_FILE ); - if( false == bindingparser.ok() ) { - return false; - } - + // NOTE: to simplify things we expect one entry per line, and whole entry in one line while( true == bindingparser.getTokens( 1, true, "\n" ) ) { std::string bindingentry; @@ -80,6 +81,7 @@ keyboard_input::recall_bindings() { if( bindingkeyname == "shift" ) { binding |= keymodifier::shift; } else if( bindingkeyname == "ctrl" ) { binding |= keymodifier::control; } + else if( bindingkeyname == "none" ) { binding = -1; } else { // regular key, convert it to glfw key code auto const keylookup = nametokeymap.find( bindingkeyname ); @@ -158,7 +160,7 @@ keyboard_input::key( int const Key, int const Action ) { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( lookup->second, 0, 0, Action, command_hint::none, 0 ); + m_relay.post( lookup->second, 0, 0, Action, 0 ); return true; } @@ -249,18 +251,34 @@ keyboard_input::default_bindings() { { GLFW_KEY_R }, // linebreakertoggle { GLFW_KEY_M }, + // linebreakeropen + { -1 }, + // linebreakerclose + { -1 }, // convertertoggle { GLFW_KEY_X }, + // converterenable, + { -1 }, + // converterdisable, + { -1 }, // convertertogglelocal { GLFW_KEY_X | keymodifier::shift }, // converteroverloadrelayreset { GLFW_KEY_N | keymodifier::control }, // compressortoggle { GLFW_KEY_C }, + // compressorenable + { -1 }, + // compressordisable + { -1 }, // compressortoggleloal { GLFW_KEY_C | keymodifier::shift }, // motoroverloadrelaythresholdtoggle { GLFW_KEY_F }, + // motoroverloadrelaythresholdsetlow + { -1 }, + // motoroverloadrelaythresholdsethigh + { -1 }, // motoroverloadrelayreset { GLFW_KEY_N }, // notchingrelaytoggle @@ -271,6 +289,12 @@ keyboard_input::default_bindings() { { GLFW_KEY_B | keymodifier::shift }, // brakeactingspeeddecrease { GLFW_KEY_B }, + // brakeactingspeedsetcargo + { -1 }, + // brakeactingspeedsetpassenger + { -1 }, + // brakeactingspeedsetrapid + { -1 }, // brakeloadcompensationincrease { GLFW_KEY_H | keymodifier::shift | keymodifier::control }, // brakeloadcompensationdecrease @@ -323,11 +347,6 @@ keyboard_input::default_bindings() { { GLFW_KEY_INSERT }, // carcouplingdisconnect { GLFW_KEY_DELETE }, -/* -const int k_ProgramQuit = 46; -// const int k_ProgramPause= 47; -const int k_ProgramHelp = 48; -*/ // doortoggleleft { GLFW_KEY_COMMA }, // doortoggleright @@ -344,23 +363,44 @@ const int k_ProgramHelp = 48; { GLFW_KEY_P }, // pantographtogglerear { GLFW_KEY_O }, + // pantographraisefront + { -1 }, + // pantographraiserear + { -1 }, + // pantographlowerfront + { -1 }, + // pantographlowerrear + { -1 }, // pantographlowerall { GLFW_KEY_P | keymodifier::control }, // heatingtoggle { GLFW_KEY_H }, -/* -// const int k_FreeFlyMode= 59; -*/ + // heatingenable + { -1 }, + // heatingdisable + { -1 }, // lightspresetactivatenext { GLFW_KEY_T | keymodifier::shift }, // lightspresetactivateprevious { GLFW_KEY_T }, // headlighttoggleleft { GLFW_KEY_Y }, + // headlightenableleft + { -1 }, + // headlightdisableleft + { -1 }, // headlighttoggleright { GLFW_KEY_I }, + // headlightenableright + { -1 }, + // headlightdisableright + { -1 }, // headlighttoggleupper { GLFW_KEY_U }, + // headlightenableupper + { -1 }, + // headlightdisableupper + { -1 }, // redmarkertoggleleft { GLFW_KEY_Y | keymodifier::shift }, // redmarkertoggleright @@ -381,19 +421,34 @@ const int k_ProgramHelp = 48; { GLFW_KEY_E }, // headlightsdimtoggle { GLFW_KEY_L | keymodifier::control }, + // headlightsdimenable + { -1 }, + // headlightsdimdisable + { -1 }, // motorconnectorsopen { GLFW_KEY_L }, + // motorconnectorsclose + { -1 }, // motordisconnect { GLFW_KEY_E | keymodifier::control }, // interiorlighttoggle { GLFW_KEY_APOSTROPHE }, + // interiorlightenable + { -1 }, + // interiorlightdisable + { -1 }, // interiorlightdimtoggle { GLFW_KEY_APOSTROPHE | keymodifier::control }, + // interiorlightdimenable + { -1 }, + // interiorlightdimdisable + { -1 }, // instrumentlighttoggle { GLFW_KEY_SEMICOLON }, -/* -const int k_Active = 71; -*/ + // instrumentlightenable + { -1 }, + // instrumentlightdisable, + { -1 }, // "generictoggle0" { GLFW_KEY_0 }, // "generictoggle1" @@ -415,10 +470,11 @@ const int k_Active = 71; // "generictoggle9" { GLFW_KEY_9 }, // "batterytoggle" - { GLFW_KEY_J } -/* -const int k_WalkMode = 73; -*/ + { GLFW_KEY_J }, + // batteryenable + { -1 }, + // batterydisable + { -1 }, }; bind(); @@ -489,7 +545,6 @@ keyboard_input::poll() { reinterpret_cast( movexparam ), reinterpret_cast( movezparam ), GLFW_PRESS, - command_hint::none, 0 ); } @@ -512,7 +567,6 @@ keyboard_input::poll() { reinterpret_cast( moveyparam ), 0, GLFW_PRESS, - command_hint::none, 0 ); } diff --git a/mouseinput.cpp b/mouseinput.cpp index 8ab848e9..3b7a454f 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -42,12 +42,12 @@ mouse_input::move( double Mousex, double Mousey ) { reinterpret_cast( Mousex ), reinterpret_cast( Mousey ), GLFW_PRESS, - command_hint::none, // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place 0 ); } else { + // control picking mode if( false == m_pickmodepanning ) { // even if the view panning isn't active we capture the cursor position in case it does get activated m_cursorposition.x = Mousex; @@ -61,7 +61,6 @@ mouse_input::move( double Mousex, double Mousey ) { reinterpret_cast( viewoffset.x ), reinterpret_cast( viewoffset.y ), GLFW_PRESS, - command_hint::none, // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place 0 ); @@ -104,7 +103,7 @@ mouse_input::button( int const Button, int const Action ) { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, command_hint::none, 0 ); + m_relay.post( mousecommand, 0, 0, Action, 0 ); mousecommand = user_command::none; } else { @@ -143,7 +142,7 @@ mouse_input::button( int const Button, int const Action ) { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, command_hint::none, 0 ); + m_relay.post( mousecommand, 0, 0, Action, 0 ); m_updateaccumulator = -0.25; // prevent potential command repeat right after issuing one switch( mousecommand ) { @@ -194,13 +193,13 @@ mouse_input::poll() { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( m_mousecommandleft, 0, 0, GLFW_REPEAT, command_hint::none, 0 ); + m_relay.post( m_mousecommandleft, 0, 0, GLFW_REPEAT, 0 ); } if( m_mousecommandright != user_command::none ) { // NOTE: basic keyboard controls don't have any parameters // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place - m_relay.post( m_mousecommandright, 0, 0, GLFW_REPEAT, command_hint::none, 0 ); + m_relay.post( m_mousecommandright, 0, 0, GLFW_REPEAT, 0 ); } m_updateaccumulator -= updaterate; } @@ -244,11 +243,11 @@ mouse_input::default_bindings() { user_command::motoroverloadrelaythresholdtoggle, user_command::none } }, { "main_off_bt:", { - user_command::linebreakertoggle, + user_command::linebreakeropen, user_command::none } }, { "main_on_bt:",{ - user_command::linebreakertoggle, - user_command::none } }, // TODO: dedicated on and off line breaker commands + user_command::linebreakerclose, + user_command::none } }, { "security_reset_bt:", { user_command::alerteracknowledge, user_command::none } }, diff --git a/renderer.cpp b/renderer.cpp index a23c1dbf..97a79429 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -434,6 +434,9 @@ opengl_renderer::Render() { + " exponent: " + to_string( lightexponent, 2 ) + " constant attn: " + to_string( lightconstant, 2 ) + " linear attn: " + to_string( lightlinear, 3 ); +*/ +/* + m_debugstatstext = "sun hour angle: " + to_string( -World.Environment.m_sun.getHourAngle(), 6 ); */ ++m_framestamp; diff --git a/uart.cpp b/uart.cpp index 9ee42629..f48dd46b 100644 --- a/uart.cpp +++ b/uart.cpp @@ -4,6 +4,7 @@ #include "Globals.h" #include "World.h" #include "Train.h" +#include "parser.h" #include "Logs.h" uart_input::uart_input() @@ -38,7 +39,7 @@ uart_input::uart_input() uart_input::~uart_input() { - std::array buffer = { 0 }; + std::array buffer = { 0 }; sp_blocking_write(port, (void*)buffer.data(), buffer.size(), 0); sp_drain(port); @@ -46,6 +47,80 @@ uart_input::~uart_input() sp_free_port(port); } +bool +uart_input::recall_bindings() { + + m_inputbindings.clear(); + + cParser bindingparser( "eu07_input-uart.ini", cParser::buffer_FILE ); + if( false == bindingparser.ok() ) { + return false; + } + + // build helper translation tables + std::unordered_map nametocommandmap; + std::size_t commandid = 0; + for( auto const &description : simulation::Commands_descriptions ) { + nametocommandmap.emplace( + description.name, + static_cast( commandid ) ); + ++commandid; + } + std::unordered_map nametotypemap { + { "impulse", input_type_t::impulse }, + { "toggle", input_type_t::toggle }, + { "value", input_type_t::value } }; + + // NOTE: to simplify things we expect one entry per line, and whole entry in one line + while( true == bindingparser.getTokens( 1, true, "\n" ) ) { + + std::string bindingentry; + bindingparser >> bindingentry; + cParser entryparser( bindingentry ); + + if( true == entryparser.getTokens( 2, true, "\n\r\t " ) ) { + + std::size_t bindingpin {}; + std::string bindingtypename {}; + entryparser + >> bindingpin + >> bindingtypename; + + auto const typelookup = nametotypemap.find( bindingtypename ); + if( typelookup == nametotypemap.end() ) { + + WriteLog( "Uart binding for input pin " + std::to_string( bindingpin ) + " specified unknown control type, \"" + bindingtypename + "\"" ); + } + else { + + auto const bindingtype { typelookup->second }; + std::array bindingcommands { user_command::none, user_command::none }; + auto const commandcount { ( bindingtype == toggle ? 2 : 1 ) }; + for( int commandidx = 0; commandidx < commandcount; ++commandidx ) { + // grab command(s) associated with the input pin + auto const bindingcommandname { entryparser.getToken() }; + if( true == bindingcommandname.empty() ) { + // no tokens left, may as well complain then call it a day + WriteLog( "Uart binding for input pin " + std::to_string( bindingpin ) + " didn't specify associated command(s)" ); + break; + } + auto const commandlookup = nametocommandmap.find( bindingcommandname ); + if( commandlookup == nametocommandmap.end() ) { + WriteLog( "Uart binding for input pin " + std::to_string( bindingpin ) + " specified unknown command, \"" + bindingcommandname + "\"" ); + } + else { + bindingcommands[ commandidx ] = commandlookup->second; + } + } + // push the binding on the list + m_inputbindings.emplace_back( bindingpin, bindingtype, bindingcommands[ 0 ], bindingcommands[ 1 ] ); + } + } + } + + return true; +} + #define SPLIT_INT16(x) (uint8_t)x, (uint8_t)(x >> 8) void uart_input::poll() @@ -63,7 +138,7 @@ void uart_input::poll() if ((ret = sp_input_waiting(port)) >= 16) { - std::array buffer; + std::array buffer; // TBD, TODO: replace with vector of configurable size? ret = sp_blocking_read(port, (void*)buffer.data(), buffer.size(), 0); if (ret < 0) throw std::runtime_error("uart: failed to read from port"); @@ -79,49 +154,33 @@ void uart_input::poll() data_pending = false; - for (auto entry : input_bits) - { - input_type_t type = std::get<2>(entry); + for (auto const &entry : m_inputbindings) { - size_t byte = std::get<0>(entry) / 8; - size_t bit = std::get<0>(entry) % 8; + auto const byte { std::get( entry ) / 8 }; + auto const bit { std::get( entry ) % 8 }; - bool state = ( (buffer[byte] & (1 << bit)) != 0 ); + bool const state { ( ( buffer[ byte ] & ( 1 << bit ) ) != 0 ) }; + bool const changed { ( ( old_packet[ byte ] & ( 1 << bit ) ) != state ) }; - bool repeat = (type == impulse_r || - type == impulse_r_off || - type == impulse_r_on); + if( false == changed ) { continue; } - bool changed = ( (buffer[ byte ] & (1 << bit)) != (old_packet[ byte ] & (1 << bit)) ); + auto const type { std::get( entry ) }; + auto const action { ( + type != impulse ? + GLFW_PRESS : + ( true == state ? + GLFW_PRESS : + GLFW_RELEASE ) ) }; - if (!changed && !(repeat && state)) - continue; + auto const command { ( + type != toggle ? + std::get<2>( entry ) : + ( action == GLFW_PRESS ? + std::get<2>( entry ) : + std::get<3>( entry ) ) ) }; - int action; - command_hint desired_state; - - if (type == toggle) - { - action = GLFW_PRESS; - desired_state = ( state ? command_hint::on : command_hint::off ); - } - else if (type == impulse_r_on) - { - action = ( state ? (changed ? GLFW_PRESS : GLFW_REPEAT) : GLFW_RELEASE ); - desired_state = command_hint::on; - } - else if (type == impulse_r_off) - { - action = ( state ? (changed ? GLFW_PRESS : GLFW_REPEAT) : GLFW_RELEASE ); - desired_state = command_hint::off; - } - else if (type == impulse || type == impulse_r) - { - action = ( state ? (changed ? GLFW_PRESS : GLFW_REPEAT) : GLFW_RELEASE ); - desired_state = command_hint::none; - } - - relay.post( std::get<1>(entry), 0, 0, action, desired_state, 0 ); + // TODO: pass correct entity id once the missing systems are in place + relay.post( command, 0, 0, action, 0 ); } if( true == conf.mainenable ) { @@ -131,7 +190,6 @@ void uart_input::poll() buffer[ 6 ], 0, GLFW_PRESS, - command_hint::none, // TODO: pass correct entity id once the missing systems are in place 0 ); } @@ -142,7 +200,6 @@ void uart_input::poll() buffer[ 7 ], 0, GLFW_PRESS, - command_hint::none, // TODO: pass correct entity id once the missing systems are in place 0 ); } @@ -154,7 +211,6 @@ void uart_input::poll() reinterpret_cast( position ), 0, GLFW_PRESS, - command_hint::none, // TODO: pass correct entity id once the missing systems are in place 0 ); } @@ -166,7 +222,6 @@ void uart_input::poll() reinterpret_cast( position ), 0, GLFW_PRESS, - command_hint::none, // TODO: pass correct entity id once the missing systems are in place 0 ); } diff --git a/uart.h b/uart.h index 4ab96f8f..f4544110 100644 --- a/uart.h +++ b/uart.h @@ -39,53 +39,30 @@ public: // methods uart_input(); ~uart_input(); - void poll(); + bool + init() { return recall_bindings(); } + bool + recall_bindings(); + void + poll(); private: // types enum input_type_t { - toggle, - impulse, - impulse_r, - impulse_r_on, - impulse_r_off + toggle, // two commands, each mapped to one state; press event on state change + impulse, // one command; press event when set, release when cleared + value // one command; press event, value of specified byte passed as param1 }; - std::array, 23> input_bits = - { - std::make_tuple(1, user_command::linebreakertoggle, impulse_r_off), - std::make_tuple(2, user_command::linebreakertoggle, impulse_r_on), - std::make_tuple(3, user_command::motoroverloadrelayreset, impulse), - std::make_tuple(5, user_command::converteroverloadrelayreset, impulse), - std::make_tuple(6, user_command::motorconnectorsopen, toggle), - std::make_tuple(7, user_command::alerteracknowledge, impulse_r), - - std::make_tuple(9, user_command::convertertoggle, toggle), - std::make_tuple(10, user_command::compressortoggle, toggle), - std::make_tuple(11, user_command::sandboxactivate, impulse), - std::make_tuple(12, user_command::heatingtoggle, toggle), - - std::make_tuple(15, user_command::motoroverloadrelaythresholdtoggle, toggle), - std::make_tuple(16, user_command::pantographtogglefront, toggle), - std::make_tuple(17, user_command::pantographtogglerear, toggle), - std::make_tuple(18, user_command::wheelspinbrakeactivate, impulse), - std::make_tuple(19, user_command::headlightsdimtoggle, toggle), - std::make_tuple(20, user_command::interiorlightdimtoggle, toggle), - std::make_tuple(21, user_command::independentbrakebailoff, impulse), - std::make_tuple(22, user_command::hornhighactivate, impulse), - std::make_tuple(23, user_command::hornlowactivate, impulse), - - std::make_tuple(24, user_command::batterytoggle, toggle), - std::make_tuple(25, user_command::headlighttoggleleft, toggle), - std::make_tuple(26, user_command::headlighttoggleupper, toggle), - std::make_tuple(27, user_command::headlighttoggleright, toggle) - }; + using input_pin_t = std::tuple; + using inputpin_sequence = std::vector; // members sp_port *port = nullptr; + inputpin_sequence m_inputbindings; command_relay relay; - std::array old_packet; + std::array old_packet; // TBD, TODO: replace with vector of configurable size? std::chrono::time_point last_update; conf_t conf; bool data_pending = false; From 6d3ce4908f118a573ba63851f0b98ed548039f94 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 10 Feb 2018 19:54:22 +0100 Subject: [PATCH 273/426] build 180210. light source angle calculation tweak --- moon.cpp | 7 ++++--- sun.cpp | 28 +++++++++++++++++++++------- sun.h | 8 ++++++-- version.h | 2 +- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/moon.cpp b/moon.cpp index 9722140f..4bf7e8c5 100644 --- a/moon.cpp +++ b/moon.cpp @@ -118,10 +118,11 @@ void cMoon::move() { if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } double ut = localtime.wHour - + localtime.wMinute / 60.0 // too low resolution, noticeable skips - + localtime.wSecond / 3600.0; // good enough in normal circumstances + + localtime.wMinute / 60.0; // too low resolution, noticeable skips + // NOTE: finer resolution disabled to reduce shadow crawl in current implementation /* - + localtime.wMilliseconds / 3600000.0; // for really smooth movement + + localtime.wSecond / 3600.0 // good enough in normal circumstances + + localtime.wMilliseconds / 3600000.0; // for really smooth movement */ double daynumber = 367 * localtime.wYear - 7 * ( localtime.wYear + ( localtime.wMonth + 9 ) / 12 ) / 4 diff --git a/sun.cpp b/sun.cpp index 5fdbabeb..0dc2f98b 100644 --- a/sun.cpp +++ b/sun.cpp @@ -50,7 +50,7 @@ void cSun::update() { move(); - glm::vec3 position( 0.f, 0.f, -2000.f * Global.fDistanceFactor ); + glm::vec3 position( 0.f, 0.f, -1.f ); position = glm::rotateX( position, glm::radians( static_cast( m_body.elevref ) ) ); position = glm::rotateY( position, glm::radians( static_cast( -m_body.hrang ) ) ); @@ -72,11 +72,17 @@ cSun::render() { ::gluSphere( sunsphere, m_body.distance * 9.359157, 12, 12 ); ::glPopMatrix(); } - +/* +glm::vec3 +cSun::getPosition() { + + return m_position * 1000.f * Global.fDistanceFactor; +} +*/ glm::vec3 cSun::getDirection() { - return glm::normalize( m_position ); + return m_position; } float @@ -84,7 +90,14 @@ cSun::getAngle() { return (float)m_body.elevref; } - + +// return current hour angle +double +cSun::getHourAngle() const { + + return m_body.hrang; +} + float cSun::getIntensity() { irradiance(); @@ -128,10 +141,11 @@ void cSun::move() { if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } double ut = localtime.wHour - + localtime.wMinute / 60.0 // too low resolution, noticeable skips - + localtime.wSecond / 3600.0; // good enough in normal circumstances + + localtime.wMinute / 60.0; // too low resolution, noticeable skips + // NOTE: finer resolution disabled to reduce shadow crawl in current implementation /* - + localtime.wMilliseconds / 3600000.0; // for really smooth movement + + localtime.wSecond / 3600.0 // good enough in normal circumstances + + localtime.wMilliseconds / 3600000.0; // for really smooth movement */ double daynumber = 367 * localtime.wYear - 7 * ( localtime.wYear + ( localtime.wMonth + 9 ) / 12 ) / 4 diff --git a/sun.h b/sun.h index 4ab54d10..babc14af 100644 --- a/sun.h +++ b/sun.h @@ -18,13 +18,17 @@ public: void init(); void update(); void render(); +/* // returns location of the sun in the 3d scene - glm::vec3 getPosition() { return m_position; } + glm::vec3 getPosition(); +*/ // returns vector pointing at the sun glm::vec3 getDirection(); // returns current elevation above horizon float getAngle(); - // returns current intensity of the sun + // return current hour angle + double getHourAngle() const; + // returns current intensity of the sun float getIntensity(); // sets current time, overriding one acquired from the system clock void setTime( int const Hour, int const Minute, int const Second ); diff --git a/version.h b/version.h index e50d1e4f..3fa33005 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 202 +#define VERSION_MINOR 210 #define VERSION_REVISION 0 From c75f7138b82c6bb889678c666c3601d57c2a0aea Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 12 Feb 2018 16:19:53 +0100 Subject: [PATCH 274/426] basic weather-based texture selection, additional control commands, minor line breaker logic fixes --- McZapkie/Mover.cpp | 67 +++++++---- Train.cpp | 289 +++++++++++++++++++++++++++++---------------- Train.h | 8 +- World.cpp | 17 +++ World.h | 2 + command.cpp | 4 + command.h | 4 + keyboardinput.cpp | 8 ++ simulation.cpp | 3 + 9 files changed, 271 insertions(+), 131 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 49507441..d2e01f42 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5282,34 +5282,46 @@ bool TMoverParameters::AutoRelayCheck(void) && ( MainCtrlPos > 0 ) && ( MainCtrlPos != MainCtrlPosNo ) && ( FastSerialCircuit == 1 ) ) { - + // szybkie wchodzenie na bezoporowa (303E) + // MainCtrlActualPos:=MainCtrlPos; //hunter-111012: ++MainCtrlActualPos; - // MainCtrlActualPos:=MainCtrlPos; //hunter-111012: - // szybkie wchodzenie na bezoporowa (303E) - OK = true; - SetFlag(SoundFlag, sound::parallel | sound::loud); + if( MainCtrlPos - MainCtrlActualPos == 1 ) { + // HACK: ensure we play only single sound of basic relays for entire trasition; return false + // for all but last step despite configuration change, to prevent playback of the basic relay sound + // TBD, TODO: move the basic sound event here and enable it with call parameter + OK = true; + } + if( RList[ MainCtrlActualPos ].R == 0 ) { + SetFlag( SoundFlag, sound::parallel | sound::loud ); + OK = true; + } } else if ((LastRelayTime > CtrlDelay) && (ARFASI)) { // WriteLog("LRT = " + FloatToStr(LastRelayTime) + ", " + // FloatToStr(CtrlDelay)); - if ((TrainType == dt_ET22) && (MainCtrlPos > 1) && - ((RList[MainCtrlActualPos].Bn < RList[MainCtrlActualPos + 1].Bn) || - (DelayCtrlFlag))) // et22 z walem grupowym - if (!DelayCtrlFlag) // najpierw przejscie + if( ( TrainType == dt_ET22 ) + && ( MainCtrlPos > 1 ) + && ( ( RList[ MainCtrlActualPos ].Bn < RList[ MainCtrlActualPos + 1 ].Bn ) + || ( DelayCtrlFlag ) ) ) { + // et22 z walem grupowym + if( !DelayCtrlFlag ) // najpierw przejscie { ++MainCtrlActualPos; DelayCtrlFlag = true; // tryb przejscia OK = true; } - else if (LastRelayTime > 4 * CtrlDelay) // przejscie + else if( LastRelayTime > 4 * CtrlDelay ) // przejscie { DelayCtrlFlag = false; OK = true; } +/* else ; +*/ + } else // nie ET22 z wałem grupowym { ++MainCtrlActualPos; @@ -5317,30 +5329,33 @@ bool TMoverParameters::AutoRelayCheck(void) } //--------- // hunter-111211: poprawki - if (MainCtrlActualPos > 0) - if ((RList[MainCtrlActualPos].R == 0) && - (!(MainCtrlActualPos == MainCtrlPosNo))) // wejscie na bezoporowa - { - SetFlag(SoundFlag, sound::parallel | sound::loud); + if( MainCtrlActualPos > 0 ) { + if( ( RList[ MainCtrlActualPos ].R == 0 ) + && ( MainCtrlActualPos != MainCtrlPosNo ) ) { + // wejscie na bezoporowa + SetFlag( SoundFlag, sound::parallel | sound::loud ); } - else if ((RList[MainCtrlActualPos].R > 0) && - (RList[MainCtrlActualPos - 1].R == - 0)) // wejscie na drugi uklad - { - SetFlag(SoundFlag, sound::parallel); + else if( ( RList[ MainCtrlActualPos ].R > 0 ) + && ( RList[ MainCtrlActualPos - 1 ].R == 0 ) ) { + // wejscie na drugi uklad + SetFlag( SoundFlag, sound::parallel ); } + } } } else if (RList[MainCtrlActualPos].Relay > MainCtrlPos) { - if ((RList[MainCtrlPos].R == 0) && (MainCtrlPos > 0) && - (!(MainCtrlPos == MainCtrlPosNo)) && (FastSerialCircuit == 1)) - { + if( ( RList[ MainCtrlPos ].R == 0 ) + && ( MainCtrlPos > 0 ) + && ( !( MainCtrlPos == MainCtrlPosNo ) ) + && ( FastSerialCircuit == 1 ) ) { + // szybkie wchodzenie na bezoporowa (303E) + // MainCtrlActualPos:=MainCtrlPos; //hunter-111012: --MainCtrlActualPos; - // MainCtrlActualPos:=MainCtrlPos; //hunter-111012: - // szybkie wchodzenie na bezoporowa (303E) OK = true; - SetFlag(SoundFlag, sound::parallel); + if( RList[ MainCtrlActualPos ].R == 0 ) { + SetFlag( SoundFlag, sound::parallel ); + } } else if (LastRelayTime > CtrlDownDelay) { diff --git a/Train.cpp b/Train.cpp index e746e52d..413c6f1d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -250,7 +250,11 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::headlightenableupper, &TTrain::OnCommand_headlightenableupper }, { user_command::headlightdisableupper, &TTrain::OnCommand_headlightdisableupper }, { user_command::redmarkertoggleleft, &TTrain::OnCommand_redmarkertoggleleft }, + { user_command::redmarkerenableleft, &TTrain::OnCommand_redmarkerenableleft }, + { user_command::redmarkerdisableleft, &TTrain::OnCommand_redmarkerdisableleft }, { user_command::redmarkertoggleright, &TTrain::OnCommand_redmarkertoggleright }, + { user_command::redmarkerenableright, &TTrain::OnCommand_redmarkerenableright }, + { user_command::redmarkerdisableright, &TTrain::OnCommand_redmarkerdisableright }, { user_command::headlighttogglerearleft, &TTrain::OnCommand_headlighttogglerearleft }, { user_command::headlighttogglerearright, &TTrain::OnCommand_headlighttogglerearright }, { user_command::headlighttogglerearupper, &TTrain::OnCommand_headlighttogglerearupper }, @@ -1791,7 +1795,7 @@ void TTrain::OnCommand_pantographcompressoractivate( TTrain *Train, command_data void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { + if( Command.action == GLFW_PRESS ) { // press or hold... if( Train->m_linebreakerstate == 0 ) { // ...to close the circuit @@ -1803,24 +1807,28 @@ void TTrain::OnCommand_linebreakertoggle( TTrain *Train, command_data const &Com OnCommand_linebreakeropen( Train, Command ); } } - else { + else if( Command.action == GLFW_RELEASE ) { // release... - if( Train->m_linebreakerstate <= 0 ) { - // ...after opening circuit, or holding for too short time to close it - OnCommand_linebreakeropen( Train, Command ); - } - else { - // ...after closing the circuit - // NOTE: bit of a dirty shortcut here - OnCommand_linebreakerclose( Train, Command ); + if( ( Train->ggMainOnButton.SubModel != nullptr ) + || ( Train->mvControlled->TrainType == dt_EZT ) ) { + // only impulse switches react to release events; since we don't have switch type definition for the line breaker, + // we detect it from presence of relevant button, or presume such switch arrangement for EMUs + if( Train->m_linebreakerstate == 0 ) { + // ...after opening circuit, or holding for too short time to close it + OnCommand_linebreakeropen( Train, Command ); + } + else { + // ...after closing the circuit + // NOTE: bit of a dirty shortcut here + OnCommand_linebreakerclose( Train, Command ); + } } } } void TTrain::OnCommand_linebreakeropen( TTrain *Train, command_data const &Command ) { - if( Command.action != GLFW_RELEASE ) { - // press or hold... + if( Command.action == GLFW_PRESS ) { // visual feedback if( Train->ggMainOffButton.SubModel != nullptr ) { // two separate switches to close and break the circuit @@ -1838,6 +1846,10 @@ void TTrain::OnCommand_linebreakeropen( TTrain *Train, command_data const &Comma Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } } + else { + // fallback for cabs with no submodel + Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); + } // play sound immediately when the switch is hit, not after release Train->fMainRelayTimer = 0.0f; @@ -1851,11 +1863,11 @@ void TTrain::OnCommand_linebreakeropen( TTrain *Train, command_data const &Comma } if( true == Train->mvControlled->MainSwitch( false ) ) { - Train->m_linebreakerstate = -1; + Train->m_linebreakerstate = 0; } } - else { - // release... + else if( Command.action == GLFW_RELEASE ) { + // visual feedback // we don't exactly know which of the two buttons was used, so reset both // for setup with two separate swiches if( Train->ggMainOnButton.SubModel != nullptr ) { @@ -1866,22 +1878,14 @@ void TTrain::OnCommand_linebreakeropen( TTrain *Train, command_data const &Comma } // and the two-state switch too, for good measure if( Train->ggMainButton.SubModel != nullptr ) { - // visual feedback Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } - if( Train->m_linebreakerstate < 0 ) { - // finalize state change of the line breaker - Train->m_linebreakerstate = 0; - } - // on button release reset the closing timer - Train->fMainRelayTimer = 0.0f; } } void TTrain::OnCommand_linebreakerclose( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { - // press... // visual feedback if( Train->ggMainOnButton.SubModel != nullptr ) { // two separate switches to close and break the circuit @@ -1891,10 +1895,14 @@ void TTrain::OnCommand_linebreakerclose( TTrain *Train, command_data const &Comm // single two-state switch Train->ggMainButton.UpdateValue( 1.0, Train->dsbSwitch ); } + else { + // fallback for cabs with no submodel + Train->ggMainButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + // the actual closing of the line breaker is handled in the train update routine } else if( Command.action == GLFW_RELEASE ) { - // release... // visual feedback if( Train->ggMainOnButton.SubModel != nullptr ) { // setup with two separate switches @@ -1905,7 +1913,6 @@ void TTrain::OnCommand_linebreakerclose( TTrain *Train, command_data const &Comm // TODO: have proper switch type config for all switches, and put it in the cab switch descriptions, not in the .fiz if( Train->mvControlled->TrainType == dt_EZT ) { if( Train->ggMainButton.SubModel != nullptr ) { - // visual feedback Train->ggMainButton.UpdateValue( 0.0, Train->dsbSwitch ); } } @@ -1913,17 +1920,17 @@ void TTrain::OnCommand_linebreakerclose( TTrain *Train, command_data const &Comm if( Train->m_linebreakerstate == 1 ) { return; } // already in the desired state if( Train->m_linebreakerstate > 1 ) { - // we don't need to start the diesel twice, but the other types still need to be launched + // we don't need to start the diesel twice, but the other types (with impulse switch setup) still need to be launched if( ( Train->mvControlled->EngineType != DieselEngine ) && ( Train->mvControlled->EngineType != DieselElectric ) ) { if( Train->mvControlled->MainSwitch( true ) ) { // side-effects Train->mvControlled->ConverterSwitch( ( Train->ggConverterButton.GetValue() > 0.5 ) || ( Train->mvControlled->ConverterStart == start::automatic ) ); Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); + // finalize state change of the line breaker + Train->m_linebreakerstate = 1; } } - // finalize state change of the line breaker - Train->m_linebreakerstate = 1; } // on button release reset the closing timer Train->fMainRelayTimer = 0.0f; @@ -2606,90 +2613,160 @@ void TTrain::OnCommand_headlightdisableupper( TTrain *Train, command_data const void TTrain::OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &Command ) { + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_left ) == 0 ) { + // turn on + OnCommand_redmarkerenableleft( Train, Command ); + } + else { + //turn off + OnCommand_redmarkerdisableleft( Train, Command ); + } + } +} + +void TTrain::OnCommand_redmarkerenableleft( TTrain *Train, command_data const &Command ) { + if( Train->mvOccupied->LightsPosNo > 0 ) { // lights are controlled by preset selector return; } - int const vehicleside = - ( Train->mvOccupied->ActiveCab == 1 ? - side::front : - side::rear ); + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_left ) != 0 ) { return; } // already enabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_left; + // visual feedback + if( Train->ggLeftEndLightButton.SubModel != nullptr ) { + Train->ggLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch + // this is crude, but for now will do + Train->ggLeftLightButton.UpdateValue( -1.0, Train->dsbSwitch ); + // if the light is controlled by 3-way switch, disable the headlight + Train->DynamicObject->iLights[ vehicleside ] &= ~light::headlight_left; + } + } +} + +void TTrain::OnCommand_redmarkerdisableleft( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_left ) == 0 ) { - // turn on - Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_left; - // visual feedback - if( Train->ggLeftEndLightButton.SubModel != nullptr ) { - Train->ggLeftEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - else { - // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch - // this is crude, but for now will do - Train->ggLeftLightButton.UpdateValue( -1.0, Train->dsbSwitch ); - // if the light is controlled by 3-way switch, disable the headlight - Train->DynamicObject->iLights[ vehicleside ] &= ~light::headlight_left; - } + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_left ) == 0 ) { return; } // already disabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_left; + // visual feedback + if( Train->ggLeftEndLightButton.SubModel != nullptr ) { + Train->ggLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } else { - //turn off - Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_left; - // visual feedback - if( Train->ggLeftEndLightButton.SubModel != nullptr ) { - Train->ggLeftEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - else { - // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch - // this is crude, but for now will do - Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch + // this is crude, but for now will do + Train->ggLeftLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } void TTrain::OnCommand_redmarkertoggleright( TTrain *Train, command_data const &Command ) { + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_right ) == 0 ) { + // turn on + OnCommand_redmarkerenableright( Train, Command ); + } + else { + //turn off + OnCommand_redmarkerdisableright( Train, Command ); + } + } +} + +void TTrain::OnCommand_redmarkerenableright( TTrain *Train, command_data const &Command ) { + if( Train->mvOccupied->LightsPosNo > 0 ) { // lights are controlled by preset selector return; } - int const vehicleside = - ( Train->mvOccupied->ActiveCab == 1 ? - side::front : - side::rear ); + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_right ) != 0 ) { return; } // already enabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_right; + // visual feedback + if( Train->ggRightEndLightButton.SubModel != nullptr ) { + Train->ggRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch + // this is crude, but for now will do + Train->ggRightLightButton.UpdateValue( -1.0, Train->dsbSwitch ); + // if the light is controlled by 3-way switch, disable the headlight + Train->DynamicObject->iLights[ vehicleside ] &= ~light::headlight_right; + } + } +} + +void TTrain::OnCommand_redmarkerdisableright( TTrain *Train, command_data const &Command ) { + + if( Train->mvOccupied->LightsPosNo > 0 ) { + // lights are controlled by preset selector + return; + } if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_right ) == 0 ) { - // turn on - Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_right; - // visual feedback - if( Train->ggRightEndLightButton.SubModel != nullptr ) { - Train->ggRightEndLightButton.UpdateValue( 1.0, Train->dsbSwitch ); - } - else { - // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch - // this is crude, but for now will do - Train->ggRightLightButton.UpdateValue( -1.0, Train->dsbSwitch ); - // if the light is controlled by 3-way switch, disable the headlight - Train->DynamicObject->iLights[ vehicleside ] &= ~light::headlight_right; - } + int const vehicleside = + ( Train->mvOccupied->ActiveCab == 1 ? + side::front : + side::rear ); + + if( ( Train->DynamicObject->iLights[ vehicleside ] & light::redmarker_right ) == 0 ) { return; } // already disabled + + Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_right; + // visual feedback + if( Train->ggRightEndLightButton.SubModel != nullptr ) { + Train->ggRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } else { - //turn off - Train->DynamicObject->iLights[ vehicleside ] ^= light::redmarker_right; - // visual feedback - if( Train->ggRightEndLightButton.SubModel != nullptr ) { - Train->ggRightEndLightButton.UpdateValue( 0.0, Train->dsbSwitch ); - } - else { - // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch - // this is crude, but for now will do - Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + // we interpret lack of dedicated switch as a sign the light is controlled with 3-way switch + // this is crude, but for now will do + Train->ggRightLightButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -3697,6 +3774,7 @@ bool TTrain::Update( double const Deltatime ) m_linebreakerstate = 0; } } + if( ( ggMainButton.GetDesiredValue() > 0.95 ) || ( ggMainOnButton.GetDesiredValue() > 0.95 ) ) { // keep track of period the line breaker button is held down, to determine when/if circuit closes @@ -3708,23 +3786,6 @@ bool TTrain::Update( double const Deltatime ) // TODO: consider whether it makes sense for diesel engines and such fMainRelayTimer += Deltatime; } - if( m_linebreakerstate < 1 ) { - - if( fMainRelayTimer > mvControlled->InitialCtrlDelay ) { - // wlaczanie WSa z opoznieniem - m_linebreakerstate = 2; - // for diesels, we complete the engine start here - // TODO: consider arranging a better way to start the diesel engines - if( ( mvControlled->EngineType == DieselEngine ) - || ( mvControlled->EngineType == DieselElectric ) ) { - if( mvControlled->MainSwitch( true ) ) { - // side-effects - mvControlled->ConverterSwitch( ( ggConverterButton.GetDesiredValue() > 0.95 ) || ( mvControlled->ConverterStart == start::automatic ) ); - mvControlled->CompressorSwitch( ggCompressorButton.GetDesiredValue() > 0.95 ); - } - } - } - } } else { // button isn't down, reset the timer @@ -3734,6 +3795,28 @@ bool TTrain::Update( double const Deltatime ) // if the button disconnecting the line breaker is down prevent the timer from accumulating fMainRelayTimer = 0.0f; } + if( m_linebreakerstate == 0 ) { + if( fMainRelayTimer > mvControlled->InitialCtrlDelay ) { + // wlaczanie WSa z opoznieniem + // mark the line breaker as ready to close; for electric vehicles with impulse switch the setup is completed on button release + m_linebreakerstate = 2; + } + } + if( m_linebreakerstate == 2 ) { + // for diesels and/or vehicles with toggle switch setup we complete the engine start here + // TBD, TODO: arrange a better way to start the diesel engines + if( ( ggMainOffButton.SubModel == nullptr ) + || ( ( mvControlled->EngineType == DieselEngine ) + || ( mvControlled->EngineType == DieselElectric ) ) ) { + if( mvControlled->MainSwitch( true ) ) { + // side-effects + mvControlled->ConverterSwitch( ( ggConverterButton.GetDesiredValue() > 0.95 ) || ( mvControlled->ConverterStart == start::automatic ) ); + mvControlled->CompressorSwitch( ggCompressorButton.GetDesiredValue() > 0.95 ); + // finalize state change of the line breaker + m_linebreakerstate = 1; + } + } + } // check for received user commands // NOTE: this is a temporary arrangement, for the transition period from old command setup to the new one diff --git a/Train.h b/Train.h index 4b300e42..df9f2ac3 100644 --- a/Train.h +++ b/Train.h @@ -240,7 +240,11 @@ class TTrain static void OnCommand_headlightenableupper( TTrain *Train, command_data const &Command ); static void OnCommand_headlightdisableupper( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertoggleleft( TTrain *Train, command_data const &Command ); + static void OnCommand_redmarkerenableleft( TTrain *Train, command_data const &Command ); + static void OnCommand_redmarkerdisableleft( TTrain *Train, command_data const &Command ); static void OnCommand_redmarkertoggleright( TTrain *Train, command_data const &Command ); + static void OnCommand_redmarkerenableright( TTrain *Train, command_data const &Command ); + static void OnCommand_redmarkerdisableright( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttogglerearleft( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttogglerearright( TTrain *Train, command_data const &Command ); static void OnCommand_headlighttogglerearupper( TTrain *Train, command_data const &Command ); @@ -284,7 +288,7 @@ class TTrain TMoverParameters *mvSecond; // drugi człon (ET40, ET41, ET42, ukrotnienia) TMoverParameters *mvThird; // trzeci człon (SN61) // helper variable, to prevent immediate switch between closing and opening line breaker circuit - int m_linebreakerstate { 0 }; // -1: freshly open, 0: open, 1: closed, 2: freshly closed (and yes this is awful way to go about it) + int m_linebreakerstate { 0 }; // 0: open, 1: closed, 2: freshly closed (and yes this is awful way to go about it) static const commandhandler_map m_commandhandlers; control_mapper m_controlmapper; @@ -577,7 +581,7 @@ private: float fPress[20][3]; // cisnienia dla wszystkich czlonow static std::vector const fPress_labels; float fEIMParams[9][10]; // parametry dla silnikow asynchronicznych - int RadioChannel() { return iRadioChannel; }; + int RadioChannel() const { return iRadioChannel; }; // plays provided sound from position of the radio void radio_message( sound_source *Message, int const Channel ); inline TDynamicObject *Dynamic() { return DynamicObject; }; diff --git a/World.cpp b/World.cpp index 5ad41330..5c5533f5 100644 --- a/World.cpp +++ b/World.cpp @@ -1317,6 +1317,11 @@ TWorld::Update_UI() { uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); uitextline2 += ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorPower > 1 ) ? ( vehicle->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); uitextline2 += ( vehicle->MoverParameters->CompressorGovernorLock ? "!" : "." ); + + auto const train { Global.pWorld->train() }; + if( ( train != nullptr ) && ( train->Dynamic() == vehicle ) ) { + uitextline2 += " R: " + std::to_string( train->RadioChannel() ); + } /* uitextline2 += " AnlgB: " + to_string( tmp->MoverParameters->AnPos, 1 ) @@ -2124,9 +2129,21 @@ TWorld::compute_season( int const Yearday ) const { return Left.first < Right; } ); Global.Season = lookup->second + ":"; + // season can affect the weather so if it changes, re-calculate weather as well + compute_weather(); } +// calculates current weather +void +TWorld::compute_weather() const { + Global.Weather = ( + Global.Overcast < 0.25 ? "clear:" : + Global.Overcast < 1.0 ? "cloudy:" : + ( Global.Season != "winter:" ? + "rain:" : + "snow:" ) ); +} void world_environment::init() { diff --git a/World.h b/World.h index 56736115..c9654100 100644 --- a/World.h +++ b/World.h @@ -110,6 +110,8 @@ TWorld(); void ToggleDaylight(); // calculates current season of the year based on set simulation date void compute_season( int const Yearday ) const; + // calculates current weather + void compute_weather() const; // members diff --git a/command.cpp b/command.cpp index aa60c905..d249c849 100644 --- a/command.cpp +++ b/command.cpp @@ -140,7 +140,11 @@ commanddescription_sequence Commands_descriptions = { { "headlightenableupper", command_target::vehicle }, { "headlightdisableupper", command_target::vehicle }, { "redmarkertoggleleft", command_target::vehicle }, + { "redmarkerenableleft", command_target::vehicle }, + { "redmarkerdisableleft", command_target::vehicle }, { "redmarkertoggleright", command_target::vehicle }, + { "redmarkerenableright", command_target::vehicle }, + { "redmarkerdisableright", command_target::vehicle }, { "headlighttogglerearleft", command_target::vehicle }, { "headlighttogglerearright", command_target::vehicle }, { "headlighttogglerearupper", command_target::vehicle }, diff --git a/command.h b/command.h index 380df31e..d9695d37 100644 --- a/command.h +++ b/command.h @@ -133,7 +133,11 @@ enum class user_command { headlightenableupper, headlightdisableupper, redmarkertoggleleft, + redmarkerenableleft, + redmarkerdisableleft, redmarkertoggleright, + redmarkerenableright, + redmarkerdisableright, headlighttogglerearleft, headlighttogglerearright, headlighttogglerearupper, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 74dc998a..76f9a6ef 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -403,8 +403,16 @@ keyboard_input::default_bindings() { { -1 }, // redmarkertoggleleft { GLFW_KEY_Y | keymodifier::shift }, + // redmarkerenableleft + { -1 }, + // redmarkerdisableleft + { -1 }, // redmarkertoggleright { GLFW_KEY_I | keymodifier::shift }, + // redmarkerenableright + { -1 }, + // redmarkerdisableright + { -1 }, // headlighttogglerearleft { GLFW_KEY_Y | keymodifier::control }, // headlighttogglerearright diff --git a/simulation.cpp b/simulation.cpp index d9c2b8b3..1251ac4f 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -167,6 +167,9 @@ state_manager::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad if( token != "endatmo" ) { // optional overcast parameter Global.Overcast = clamp( std::stof( token ), 0.f, 2.f ); + // overcast drives weather so do a calculation here + // NOTE: ugly, clean it up when we're done with world refactoring + Global.pWorld->compute_weather(); } while( ( false == token.empty() ) && ( token != "endatmo" ) ) { From e65e01a7a21e5f8192ab71b357d8b7d58a90b50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 11 Feb 2018 21:16:31 +0100 Subject: [PATCH 275/426] removed excessive normalision for engine volume in diesel engines --- DynObj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DynObj.cpp b/DynObj.cpp index 4c69da7e..3de92a8b 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4574,7 +4574,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.engine.owner( this ); auto const amplitudedivisor = static_cast( ( - MoverParameters->EngineType == DieselEngine ? MoverParameters->nmax * 60 + MoverParameters->Power : + MoverParameters->EngineType == DieselEngine ? 1 : MoverParameters->EngineType == DieselElectric ? MoverParameters->Power * 3 : MoverParameters->nmax * 60 + MoverParameters->Power * 3 ) ); m_powertrainsounds.engine.m_amplitudefactor /= amplitudedivisor; From 62327d5d080342138f476bd3fec290de3afcd029 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 13 Feb 2018 23:58:31 +0100 Subject: [PATCH 276/426] no pneumatic relay sound on brake acting speed change, enabled playback of multiple bookend sounds, extra pantograph control for ai during longer stops, shadow angle calculation tweak, moon appearance tweak, minor bug fixes --- Driver.cpp | 134 ++++++++++++++++++++++++--------------------- Driver.h | 1 + DynObj.cpp | 7 ++- McZapkie/Mover.cpp | 12 ++-- Model3d.cpp | 2 +- Train.cpp | 6 +- TrkFoll.cpp | 18 +++--- World.cpp | 2 +- moon.cpp | 28 +++++----- moon.h | 2 - renderer.cpp | 35 +++++------- simulation.cpp | 5 ++ skydome.cpp | 2 +- sound.cpp | 40 ++++++++++++-- sound.h | 3 + sun.cpp | 26 +++++---- version.h | 2 +- 17 files changed, 185 insertions(+), 140 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 9797d740..92a62931 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1212,8 +1212,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } else { // zawalidrogi nie ma (albo pojazd jest samochodem), sprawdzić sygnał - if (sSpeedTable[i].iFlags & spShuntSemaphor) // jeśli Tm - w zasadzie to sprawdzić - // komendę! + if (sSpeedTable[i].iFlags & spShuntSemaphor) // jeśli Tm - w zasadzie to sprawdzić komendę! { // jeśli podana prędkość manewrowa if ((OrderCurrentGet() & Obey_train) ? v == 0.0 : false) { // jeśli tryb pociągowy a tarcze ma ShuntVelocity 0 0 @@ -3340,8 +3339,7 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N iDirectionOrder = -iDirection; // jak się podczepi, to jazda w przeciwną stronę OrderNext(Change_direction); } - WaitingTime = - 0.0; // nie ma co dalej czekać, można zatrąbić i jechać, chyba że już jedzie + WaitingTime = 0.0; // nie ma co dalej czekać, można zatrąbić i jechać, chyba że już jedzie } else // if (NewValue2==0.0) //zerowy sprzęg if (NewValue1 >= 0.0) // jeśli ilość wagonów inna niż wszystkie @@ -3358,8 +3356,7 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N else if (mvOccupied->Couplers[mvOccupied->DirAbsolute > 0 ? 1 : 0].CouplingFlag > 0) // z tyłu coś OrderNext(Disconnect); // jak ciągnie, to tylko odczep (NewValue1) wagonów - WaitingTime = - 0.0; // nie ma co dalej czekać, można zatrąbić i jechać, chyba że już jedzie + WaitingTime = 0.0; // nie ma co dalej czekać, można zatrąbić i jechać, chyba że już jedzie } if (NewValue1 == -1.0) { @@ -3495,6 +3492,13 @@ TController::UpdateSituation(double dt) { fActionTime += dt; // czas używany przy regulacji prędkości i zamykaniu drzwi LastReactionTime += dt; LastUpdatedTime += dt; + if( ( mvOccupied->Vel < 0.05 ) + && ( ( OrderCurrentGet() & ( Obey_train | Shunt ) ) != 0 ) ) { + IdleTime += dt; + } + else { + IdleTime = 0.0; + } // log vehicle data if( ( WriteLogFlag ) @@ -3628,14 +3632,12 @@ TController::UpdateSituation(double dt) { } } - if (mvOccupied->Vel > 0.0) { + if( mvOccupied->Vel > 1.0 ) { // jeżeli jedzie if( iDrivigFlags & moveDoorOpened ) { // jeśli drzwi otwarte - if( mvOccupied->Vel > 1.0 ) { - // nie zamykać drzwi przy drganiach, bo zatrzymanie na W4 akceptuje niewielkie prędkości - Doors( false ); - } + // nie zamykać drzwi przy drganiach, bo zatrzymanie na W4 akceptuje niewielkie prędkości + Doors( false ); } /* // NOTE: this section moved all cars to the edge of their respective roads @@ -3650,40 +3652,60 @@ TController::UpdateSituation(double dt) { mvOccupied->ChangeOffsetH(0.01 * mvOccupied->Vel * dt); // Ra: co to miało być, to nie wiem */ - if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) - { - if ((fOverhead2 >= 0.0) || iOverheadZero) - { // jeśli jazda bezprądowa albo z opuszczonym pantografem + } + + if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { + + if( mvOccupied->Vel > 0.05 ) { + // is moving + if( ( fOverhead2 >= 0.0 ) || iOverheadZero ) { + // jeśli jazda bezprądowa albo z opuszczonym pantografem while( DecSpeed( true ) ) { ; } // zerowanie napędu } - if ((fOverhead2 > 0.0) || iOverheadDown) - { // jazda z opuszczonymi pantografami - mvControlling->PantFront(false); - mvControlling->PantRear(false); + if( ( fOverhead2 > 0.0 ) || iOverheadDown ) { + // jazda z opuszczonymi pantografami + mvControlling->PantFront( false ); + mvControlling->PantRear( false ); } - else - { // jeśli nie trzeba opuszczać pantografów - if (iDirection >= 0) // jak jedzie w kierunku sprzęgu 0 - mvControlling->PantRear(true); // jazda na tylnym - else - mvControlling->PantFront(true); + else { + // jeśli nie trzeba opuszczać pantografów + // jazda na tylnym + if( iDirection >= 0 ) { + // jak jedzie w kierunku sprzęgu 0 + mvControlling->PantRear( true ); + } + else { + mvControlling->PantFront( true ); + } } - if (mvOccupied->Vel > 10) // opuszczenie przedniego po rozpędzeniu się - { - if (mvControlling->EnginePowerSource.CollectorParameters.CollectorsNo > - 1) // o ile jest więcej niż jeden - if (iDirection >= 0) // jak jedzie w kierunku sprzęgu 0 + if( mvOccupied->Vel > 10 ) { + // opuszczenie przedniego po rozpędzeniu się o ile jest więcej niż jeden + if( mvControlling->EnginePowerSource.CollectorParameters.CollectorsNo > 1 ) { + if( iDirection >= 0 ) // jak jedzie w kierunku sprzęgu 0 { // poczekać na podniesienie tylnego - if (mvControlling->PantRearVolt != - 0.0) // czy jest napięcie zasilające na tylnym? - mvControlling->PantFront(false); // opuszcza od sprzęgu 0 + if( mvControlling->PantRearVolt != 0.0 ) { + // czy jest napięcie zasilające na tylnym? + mvControlling->PantFront( false ); // opuszcza od sprzęgu 0 + } } - else - { // poczekać na podniesienie przedniego - if (mvControlling->PantFrontVolt != - 0.0) // czy jest napięcie zasilające na przednim? - mvControlling->PantRear(false); // opuszcza od sprzęgu 1 + else { // poczekać na podniesienie przedniego + if( mvControlling->PantFrontVolt != 0.0 ) { + // czy jest napięcie zasilające na przednim? + mvControlling->PantRear( false ); // opuszcza od sprzęgu 1 + } } + } + } + } + else { + if( ( IdleTime > 45.0 ) + // NOTE: abs(stoptime) covers either at least 15 sec remaining for a scheduled stop, or 15+ secs spent at a basic stop + && ( std::abs( fStopTime ) > 15.0 ) ) { + // spending a longer at a stop, raise also front pantograph + if( iDirection >= 0 ) // jak jedzie w kierunku sprzęgu 0 + mvControlling->PantFront( true ); + else + mvControlling->PantRear( true ); } } } @@ -4200,29 +4222,19 @@ TController::UpdateSituation(double dt) { } else SetDriverPsyche(); // Ra: było w PrepareEngine(), potrzebne tu? - // no albo przypisujemy -WaitingExpireTime, albo porównujemy z WaitingExpireTime - // if - // ((VelSignal==0.0)&&(WaitingTime>WaitingExpireTime)&&(mvOccupied->RunningTrack.Velmax!=0.0)) - if (OrderList[OrderPos] & - (Shunt | Obey_train | Connect)) // odjechać sam może tylko jeśli jest w trybie jazdy - { // automatyczne ruszanie po odstaniu albo spod SBL - if ((VelSignal == 0.0) && (WaitingTime > 0.0) && - (mvOccupied->RunningTrack.Velmax != 0.0)) - { // jeśli stoi, a upłynął czas oczekiwania i tor ma niezerową prędkość - /* - if (WriteLogFlag) - { - append(AIlogFile); - writeln(AILogFile,ElapsedTime:5:2,": ",Name," V=0 waiting time expired! - (",WaitingTime:4:1,")"); - close(AILogFile); - } - */ - if ((OrderList[OrderPos] & (Obey_train | Shunt)) ? - (iDrivigFlags & moveStopHere) : - false) - WaitingTime = -WaitingExpireTime; // zakaz ruszania z miejsca bez otrzymania - // wolnej drogi + + if (OrderList[OrderPos] & (Shunt | Obey_train | Connect)) { + // odjechać sam może tylko jeśli jest w trybie jazdy + // automatyczne ruszanie po odstaniu albo spod SBL + if( ( VelSignal == 0.0 ) + && ( WaitingTime > 0.0 ) + && ( mvOccupied->RunningTrack.Velmax != 0.0 ) ) { + // jeśli stoi, a upłynął czas oczekiwania i tor ma niezerową prędkość + if( ( OrderList[ OrderPos ] & ( Obey_train | Shunt ) ) + && ( iDrivigFlags & moveStopHere ) ) { + // zakaz ruszania z miejsca bez otrzymania wolnej drogi + WaitingTime = -WaitingExpireTime; + } else if (mvOccupied->CategoryFlag & 1) { // jeśli pociąg if (AIControllFlag) diff --git a/Driver.h b/Driver.h index 4161b7e8..cc8451e6 100644 --- a/Driver.h +++ b/Driver.h @@ -291,6 +291,7 @@ private: double fStopTime = 0.0; // czas postoju przed dalszą jazdą (np. na przystanku) double WaitingTime = 0.0; // zliczany czas oczekiwania do samoistnego ruszenia double WaitingExpireTime = 31.0; // tyle ma czekać, zanim się ruszy // maksymlany czas oczekiwania do samoistnego ruszenia + double IdleTime {}; // keeps track of time spent at a stop private: //---//---//---//---// koniec zmiennych, poniżej metody //---//---//---//---// void SetDriverPsyche(); diff --git a/DynObj.cpp b/DynObj.cpp index 3de92a8b..4aa0136c 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1106,9 +1106,10 @@ void TDynamicObject::ABuCheckMyTrack() // do jednej tablicy. Wykonuje sie tylko raz - po to 'ABuChecked' TTrack *OldTrack = MyTrack; TTrack *NewTrack = Axle0.GetTrack(); - if ((NewTrack != OldTrack) && OldTrack) - { - OldTrack->RemoveDynamicObject(this); + if( NewTrack != OldTrack ) { + if( OldTrack ) { + OldTrack->RemoveDynamicObject( this ); + } NewTrack->AddDynamicObject(this); } iAxleFirst = 0; // pojazd powiązany z przednią osią - Axle0 diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index d2e01f42..573f9434 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2974,10 +2974,7 @@ bool TMoverParameters::BrakeDelaySwitch(int BDS) } else rBDS = false; - if( true == rBDS ) { - // if setting was changed emit the sound of pneumatic relay - SetFlag( SoundFlag, sound::pneumatic ); - } + return rBDS; } @@ -8128,7 +8125,10 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) { WriteLog( "Ready to depart" ); CompressedVolume = VeselVolume * MinCompressor * ( 9.8 ) / 10.0; - ScndPipePress = CompressedVolume / VeselVolume; + ScndPipePress = ( + VeselVolume > 0.0 ? + CompressedVolume / VeselVolume : + 0.0 ); PipePress = CntrlPipePress; BrakePress = 0.0; LocalBrakePos = 0; @@ -8633,8 +8633,6 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C if( true == Hamulec->SetBDF( brakesetting ) ) { BrakeDelayFlag = brakesetting; OK = true; - // if setting was changed emit the sound of pneumatic relay - SetFlag( SoundFlag, sound::pneumatic ); } else { OK = false; diff --git a/Model3d.cpp b/Model3d.cpp index f060d911..323dd00d 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1223,7 +1223,7 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) { if (FileExists(name + ".t3d")) { - LoadFromTextFile(FileName, dynamic); // wczytanie tekstowego + LoadFromTextFile(name + ".t3d", dynamic); // wczytanie tekstowego if( !dynamic ) { // pojazdy dopiero po ustawieniu animacji Init(); // generowanie siatek i zapis E3D diff --git a/Train.cpp b/Train.cpp index 413c6f1d..e6cf14b3 100644 --- a/Train.cpp +++ b/Train.cpp @@ -3805,7 +3805,7 @@ bool TTrain::Update( double const Deltatime ) if( m_linebreakerstate == 2 ) { // for diesels and/or vehicles with toggle switch setup we complete the engine start here // TBD, TODO: arrange a better way to start the diesel engines - if( ( ggMainOffButton.SubModel == nullptr ) + if( ( ggMainOnButton.SubModel == nullptr ) || ( ( mvControlled->EngineType == DieselEngine ) || ( mvControlled->EngineType == DieselElectric ) ) ) { if( mvControlled->MainSwitch( true ) ) { @@ -4277,13 +4277,13 @@ bool TTrain::Update( double const Deltatime ) } btLampkaWylSzybki.Turn( - ( ( (m_linebreakerstate > 0) + ( ( (m_linebreakerstate == 2) || (true == mvControlled->Mains) ) ? true : false ) ); // NOTE: 'off' variant uses the same test, but opposite resulting states btLampkaWylSzybkiOff.Turn( - ( ( ( m_linebreakerstate > 0 ) + ( ( ( m_linebreakerstate == 2 ) || ( true == mvControlled->Mains ) ) ? false : true ) ); diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 9c9f9db9..0cc0f6d1 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -189,18 +189,19 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) */ if (s < 0) { // jeśli przekroczenie toru od strony Point1 - bCanSkip = bPrimary ? pCurrentTrack->CheckDynamicObject(Owner) : false; - if (bCanSkip) // tylko główna oś przenosi pojazd do innego toru - Owner->MyTrack->RemoveDynamicObject( - Owner); // zdejmujemy pojazd z dotychczasowego toru + bCanSkip = ( bPrimary && pCurrentTrack->CheckDynamicObject( Owner ) ); + if( bCanSkip ) { + // tylko główna oś przenosi pojazd do innego toru + // zdejmujemy pojazd z dotychczasowego toru + Owner->MyTrack->RemoveDynamicObject( Owner ); + } dir = fDirection; if (pCurrentTrack->eType == tt_Cross) { if (!SetCurrentTrack(pCurrentTrack->Connected(iSegment, fDirection), 0)) return false; // wyjście z błędem } - else if (!SetCurrentTrack(pCurrentTrack->Connected(-1, fDirection), - 0)) // ustawia fDirection + else if (!SetCurrentTrack(pCurrentTrack->Connected(-1, fDirection), 0)) // ustawia fDirection return false; // wyjście z błędem if (dir == fDirection) //(pCurrentTrack->iPrevDirection) { // gdy kierunek bez zmiany (Point1->Point2) @@ -215,8 +216,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) if (bCanSkip) { // jak główna oś, to dodanie pojazdu do nowego toru pCurrentTrack->AddDynamicObject(Owner); - iEventFlag = - 3; // McZapkie-020602: umozliwienie uruchamiania event1,2 po zmianie toru + iEventFlag = 3; // McZapkie-020602: umozliwienie uruchamiania event1,2 po zmianie toru iEventallFlag = 3; // McZapkie-280503: jw, dla eventall1,2 if (!Owner->MyTrack) return false; @@ -225,7 +225,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) } else if (s > pCurrentSegment->GetLength()) { // jeśli przekroczenie toru od strony Point2 - bCanSkip = bPrimary ? pCurrentTrack->CheckDynamicObject(Owner) : false; + bCanSkip = ( bPrimary && pCurrentTrack->CheckDynamicObject( Owner ) ); if (bCanSkip) // tylko główna oś przenosi pojazd do innego toru Owner->MyTrack->RemoveDynamicObject( Owner); // zdejmujemy pojazd z dotychczasowego toru diff --git a/World.cpp b/World.cpp index 5c5533f5..edc44db8 100644 --- a/World.cpp +++ b/World.cpp @@ -2170,7 +2170,7 @@ world_environment::update() { if( moonlightlevel > sunlightlevel ) { // rare situations when the moon is brighter than the sun, typically at night Global.SunAngle = m_moon.getAngle(); - Global.DayLight.position = m_moon.getPosition(); + Global.DayLight.position = m_moon.getDirection(); Global.DayLight.direction = -1.0f * m_moon.getDirection(); keylightintensity = moonlightlevel; // if the moon is up, it overrides the twilight diff --git a/moon.cpp b/moon.cpp index 4bf7e8c5..68bbfe51 100644 --- a/moon.cpp +++ b/moon.cpp @@ -36,11 +36,11 @@ void cMoon::update() { move(); - glm::vec3 position( 0.f, 0.f, -2000.f * Global.fDistanceFactor ); + glm::vec3 position( 0.f, 0.f, -1.f ); position = glm::rotateX( position, glm::radians( static_cast( m_body.elevref ) ) ); position = glm::rotateY( position, glm::radians( static_cast( -m_body.hrang ) ) ); - m_position = position; + m_position = glm::normalize( position ); } void @@ -48,12 +48,13 @@ cMoon::render() { ::glColor4f( 225.f / 255.f, 225.f / 255.f, 255.f / 255.f, 1.f ); // debug line to locate the moon easier + auto const position { m_position * 2000.f }; ::glBegin( GL_LINES ); - ::glVertex3fv( glm::value_ptr( m_position ) ); - ::glVertex3f( m_position.x, 0.f, m_position.z ); + ::glVertex3fv( glm::value_ptr( position ) ); + ::glVertex3f( position.x, 0.f, position.z ); ::glEnd(); ::glPushMatrix(); - ::glTranslatef( m_position.x, m_position.y, m_position.z ); + ::glTranslatef( position.x, position.y, position.z ); ::gluSphere( moonsphere, /* (float)( Global.iWindowHeight / Global.FieldOfView ) * 0.5 * */ ( m_body.distance / 60.2666 ) * 9.037461, 12, 12 ); ::glPopMatrix(); } @@ -61,7 +62,7 @@ cMoon::render() { glm::vec3 cMoon::getDirection() { - return glm::normalize( m_position ); + return m_position; } float @@ -117,14 +118,15 @@ void cMoon::move() { if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } - double ut = localtime.wHour - + localtime.wMinute / 60.0; // too low resolution, noticeable skips - // NOTE: finer resolution disabled to reduce shadow crawl in current implementation - /* - + localtime.wSecond / 3600.0 // good enough in normal circumstances + double ut = + localtime.wHour + + localtime.wMinute / 60.0 // too low resolution, noticeable skips + + localtime.wSecond / 3600.0; // good enough in normal circumstances +/* + localtime.wMilliseconds / 3600000.0; // for really smooth movement - */ - double daynumber = 367 * localtime.wYear +*/ + double daynumber + = 367 * localtime.wYear - 7 * ( localtime.wYear + ( localtime.wMonth + 9 ) / 12 ) / 4 + 275 * localtime.wMonth / 9 + localtime.wDay diff --git a/moon.h b/moon.h index c0caaa79..eb59a1a7 100644 --- a/moon.h +++ b/moon.h @@ -16,8 +16,6 @@ public: void init(); void update(); void render(); - // returns location of the sun in the 3d scene - glm::vec3 getPosition() { return m_position; } // returns vector pointing at the sun glm::vec3 getDirection(); // returns current elevation above horizon diff --git a/renderer.cpp b/renderer.cpp index 97a79429..16798f5f 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -397,7 +397,12 @@ opengl_renderer::Render() { Timer::subsystem.gfx_total.start(); // note: gfx_total is actually frame total, clean this up Timer::subsystem.gfx_color.start(); // fetch simulation data - m_sunlight = Global.DayLight; + if( World.InitPerformed() ) { + m_sunlight = Global.DayLight; + // quantize sun angle to reduce shadow crawl + auto const quantizationstep { 0.004f }; + m_sunlight.direction = glm::normalize( quantizationstep * glm::roundEven( m_sunlight.direction * ( 1.f / quantizationstep ) ) ); + } // generate new frame m_renderpass.draw_mode = rendermode::none; // force setup anew m_debugtimestext.clear(); @@ -420,24 +425,7 @@ opengl_renderer::Render() { + "; dyn: " + to_string( m_debugstats.dynamics ) + " mod: " + to_string( m_debugstats.models ) + " sub: " + to_string( m_debugstats.submodels ) + "; trk: " + to_string( m_debugstats.paths ) + " shp: " + to_string( m_debugstats.shapes ) + " trc: " + to_string( m_debugstats.traction ) + " lin: " + to_string( m_debugstats.lines ); -/* - float lightcutoff{}, - lightexponent{}, - lightconstant{}, - lightlinear{}; - ::glGetLightfv( GL_LIGHT1, GL_SPOT_CUTOFF, &lightcutoff ); - ::glGetLightfv( GL_LIGHT1, GL_SPOT_EXPONENT, &lightexponent ); - ::glGetLightfv( GL_LIGHT1, GL_CONSTANT_ATTENUATION, &lightconstant ); - ::glGetLightfv( GL_LIGHT1, GL_LINEAR_ATTENUATION, &lightlinear ); - m_debugstatstext = - "light1 cutoff: " + to_string( lightcutoff, 2 ) - + " exponent: " + to_string( lightexponent, 2 ) - + " constant attn: " + to_string( lightconstant, 2 ) - + " linear attn: " + to_string( lightlinear, 3 ); -*/ -/* - m_debugstatstext = "sun hour angle: " + to_string( -World.Environment.m_sun.getHourAngle(), 6 ); -*/ + ++m_framestamp; return true; // for now always succeed @@ -1481,7 +1469,14 @@ opengl_renderer::Render( world_environment *Environment ) { { Bind_Texture( m_moontexture ); glm::vec3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); - ::glColor4f( mooncolor.x, mooncolor.y, mooncolor.z, static_cast( 1.0 - Global.fLuminance * 0.5 ) ); + // fade the moon if it's near the sun in the sky, especially during the day + ::glColor4f( + mooncolor.r, mooncolor.g, mooncolor.b, + std::max( + 0.f, + 1.0 + - 0.5 * Global.fLuminance + - 0.65 * std::max( 0.f, glm::dot( Environment->m_sun.getDirection(), Environment->m_moon.getDirection() ) ) ) ); auto const moonposition = modelview * glm::vec4( Environment->m_moon.getDirection(), 1.0f ); ::glPushMatrix(); diff --git a/simulation.cpp b/simulation.cpp index 1251ac4f..54bbf03d 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -820,6 +820,11 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch } } else { + if( vehicle->MyTrack != nullptr ) { + // rare failure case where vehicle with length of 0 is added to the track, + // treated as error code and consequently deleted, but still remains on the track + vehicle->MyTrack->RemoveDynamicObject( vehicle ); + } delete vehicle; skip_until( Input, "enddynamic" ); return nullptr; diff --git a/skydome.cpp b/skydome.cpp index 18b90505..35d20491 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -305,7 +305,7 @@ void CSkyDome::RebuildColors() { auto const sunbasedphase = clamp( (1.0f / 15.0f) * ( degreesabovehorizon - 10.0f ), 0.0f, 1.0f ); // correction is applied in linear manner from the bottom, becomes fully in effect for vertices with y = 0.50 auto const heightbasedphase = clamp( vertex.y * 2.0f, 0.0f, 1.0f ); - // this height-based factor is reduced the farther the sky is up in the sky + // this height-based factor is reduced the farther the sun is up in the sky float const shiftfactor = clamp( interpolate(heightbasedphase, sunbasedphase, sunbasedphase), 0.0f, 1.0f ); // h = 210 makes for 'typical' sky tone shiftedcolor = glm::vec3( 210.0f, colorconverter.y, colorconverter.z ); diff --git a/sound.cpp b/sound.cpp index e92bd10c..cc334098 100644 --- a/sound.cpp +++ b/sound.cpp @@ -324,7 +324,13 @@ sound_source::play( int const Flags ) { if( m_pitchvariation == 0.f ) { m_pitchvariation = 0.01f * static_cast( Random( 97.5, 102.5 ) ); } - +/* + if( ( ( m_flags & sound_flags::exclusive ) != 0 ) + && ( sound( sound_id::end ).playing > 0 ) ) { + // request termination of the optional ending bookend for single instance sounds + m_stopend = true; + } +*/ if( sound( sound_id::main ).buffer != null_handle ) { // basic variant: single main sound, with optional bookends play_basic(); @@ -352,8 +358,8 @@ sound_source::play_basic() { } else { // for single part non-looping samples we allow spawning multiple instances, if not prevented by set flags - if( ( sound( sound_id::begin ).buffer == null_handle ) - && ( ( m_flags & ( sound_flags::exclusive | sound_flags::looping ) ) == 0 ) ) { + if( ( ( m_flags & ( sound_flags::exclusive | sound_flags::looping ) ) == 0 ) + && ( sound( sound_id::begin ).buffer == null_handle ) ) { insert( sound_id::main ); } } @@ -448,7 +454,7 @@ sound_source::stop( bool const Skipend ) { if( ( false == Skipend ) && ( sound( sound_id::end ).buffer != null_handle ) && ( sound( sound_id::end ).buffer != sound( sound_id::main ).buffer ) // end == main can happen in malformed legacy cases - && ( sound( sound_id::end ).playing == 0 ) ) { +/* && ( sound( sound_id::end ).playing == 0 ) */ ) { // spawn potentially defined sound end sample, if the emitter is currently active insert( sound_id::end ); } @@ -485,7 +491,18 @@ sound_source::update_basic( audio::openal_source &Source ) { } return; } - +/* + if( ( true == m_stopend ) + && ( Source.sounds[ Source.sound_index ] == sound_id::end ) ) { + // kill the sound if it's the bookend sample and stopping it was requested + Source.stop(); + update_counter( sound_id::end, -1 ); + if( sound( sound_id::end ).playing == 0 ) { + m_stopend = false; + } + return; + } +*/ if( sound( sound_id::begin ).buffer != null_handle ) { // potentially a multipart sound // detect the moment when the sound moves from startup sample to the main @@ -562,7 +579,18 @@ sound_source::update_combined( audio::openal_source &Source ) { } return; } - +/* + if( ( true == m_stopend ) + && ( Source.sounds[ Source.sound_index ] == sound_id::end ) ) { + // kill the sound if it's the bookend sample and stopping it was requested + Source.stop(); + update_counter( sound_id::end, -1 ); + if( sound( sound_id::end ).playing == 0 ) { + m_stopend = false; + } + return; + } +*/ if( sound( sound_id::begin ).buffer != null_handle ) { // potentially a multipart sound // detect the moment when the sound moves from startup sample to the main diff --git a/sound.h b/sound.h index 56300924..13143e44 100644 --- a/sound.h +++ b/sound.h @@ -203,6 +203,9 @@ private: sound_properties m_properties; // current properties of the emitted sounds float m_pitchvariation {}; // emitter-specific shift in base pitch bool m_stop { false }; // indicates active sample instances should be terminated +/* + bool m_stopend { false }; // indicates active instances of optional ending sound should be terminated +*/ bool m_playbeginning { true }; // indicates started sounds should be preceeded by opening bookend if there's one std::array m_sounds { {} }; // basic sounds emitted by the source, main and optional bookends std::vector m_soundchunks; // table of samples activated when associated variable is within certain range diff --git a/sun.cpp b/sun.cpp index 0dc2f98b..9f6e0a82 100644 --- a/sun.cpp +++ b/sun.cpp @@ -54,7 +54,7 @@ cSun::update() { position = glm::rotateX( position, glm::radians( static_cast( m_body.elevref ) ) ); position = glm::rotateY( position, glm::radians( static_cast( -m_body.hrang ) ) ); - m_position = position; + m_position = glm::normalize( position ); } void @@ -62,12 +62,13 @@ cSun::render() { ::glColor4f( 255.f / 255.f, 242.f / 255.f, 231.f / 255.f, 1.f ); // debug line to locate the sun easier - ::glBegin( GL_LINES ); - ::glVertex3fv( glm::value_ptr( m_position ) ); - ::glVertex3f( m_position.x, 0.f, m_position.z ); + auto const position { m_position * 2000.f }; + ::glBegin( GL_LINES ); + ::glVertex3fv( glm::value_ptr( position ) ); + ::glVertex3f( position.x, 0.f, position.z ); ::glEnd(); ::glPushMatrix(); - ::glTranslatef( m_position.x, m_position.y, m_position.z ); + ::glTranslatef( position.x, position.y, position.z ); // radius is a result of scaling true distance down to 2km -- it's scaled by equal ratio ::gluSphere( sunsphere, m_body.distance * 9.359157, 12, 12 ); ::glPopMatrix(); @@ -140,14 +141,15 @@ void cSun::move() { if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } - double ut = localtime.wHour - + localtime.wMinute / 60.0; // too low resolution, noticeable skips - // NOTE: finer resolution disabled to reduce shadow crawl in current implementation - /* - + localtime.wSecond / 3600.0 // good enough in normal circumstances + double ut = + localtime.wHour + + localtime.wMinute / 60.0 // too low resolution, noticeable skips + + localtime.wSecond / 3600.0; // good enough in normal circumstances +/* + localtime.wMilliseconds / 3600000.0; // for really smooth movement - */ - double daynumber = 367 * localtime.wYear +*/ + double daynumber = + 367 * localtime.wYear - 7 * ( localtime.wYear + ( localtime.wMonth + 9 ) / 12 ) / 4 + 275 * localtime.wMonth / 9 + localtime.wDay diff --git a/version.h b/version.h index 3fa33005..66ac26bd 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 210 +#define VERSION_MINOR 213 #define VERSION_REVISION 0 From 2dd82bf71bb6ec6eecb548db6baa8c2a46f28129 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 15 Feb 2018 15:25:03 +0100 Subject: [PATCH 277/426] build 180215. sound velocity calculation, ai brake charging logic tweak, 3d shapes boundary calculation fixes --- Driver.cpp | 23 +++++++++++++++++------ Driver.h | 1 + Model3d.cpp | 6 +++--- audiorenderer.cpp | 40 +++++++++++++++++++++++++++------------- audiorenderer.h | 4 +++- scene.cpp | 16 ++++++++-------- sound.cpp | 4 ++-- version.h | 2 +- 8 files changed, 62 insertions(+), 34 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 92a62931..2c6e3618 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -3488,6 +3488,10 @@ TController::UpdateSituation(double dt) { ElapsedTime += dt; WaitingTime += dt; fBrakeTime -= dt; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca + if( mvOccupied->fBrakeCtrlPos != mvOccupied->Handle->GetPos( bh_FS ) ) { + // brake charging timeout starts after charging ends + BrakeChargingCooldown += dt; + } fStopTime += dt; // zliczanie czasu postoju, nie ruszy dopóki ujemne fActionTime += dt; // czas używany przy regulacji prędkości i zamykaniu drzwi LastReactionTime += dt; @@ -4581,9 +4585,10 @@ TController::UpdateSituation(double dt) { TDynamicObject *d = pVehicles[0]; // pojazd na czele składu while (d) { - AbsAccS += d->MoverParameters->TotalMass * d->MoverParameters->AccS * d->DirectionGet() * iDirection; + AbsAccS += d->MoverParameters->TotalMass * d->MoverParameters->AccS * ( d->DirectionGet() == iDirection ? 1 : -1 ); d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } + AbsAccS *= iDirection; AbsAccS /= fMass; } AbsAccS_pub = AbsAccS; @@ -4890,16 +4895,22 @@ TController::UpdateSituation(double dt) { && ( AccDesired > -0.03 ) ) { mvOccupied->BrakeReleaser( 1 ); } + if( ( mvOccupied->BrakeCtrlPos == 0 ) - && ( AbsAccS < 0.0 ) - && ( AccDesired > -0.03 ) ) { + && ( AbsAccS < 0.03 ) + && ( AccDesired > -0.03 ) + && ( VelDesired - mvOccupied->Vel > 2.0 ) ) { if( ( mvOccupied->EqvtPipePress < 4.95 ) - && ( fReady > 0.35 ) ) { // a reszta składu jest na to gotowa + && ( fReady > 0.35 ) + && ( BrakeChargingCooldown >= 0.0 ) ) { - if( iDrivigFlags & moveOerlikons ) { + if( ( iDrivigFlags & moveOerlikons ) + || ( mvOccupied->BrakeDelayFlag & bdelay_G ) ) { // napełnianie w Oerlikonie - mvOccupied->BrakeLevelSet( -1 ); + mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_FS ) ); + // don't charge the brakes too often, or we risk overcharging + BrakeChargingCooldown = -120.0; } } else if( Need_BrakeRelease ) { diff --git a/Driver.h b/Driver.h index cc8451e6..c636411b 100644 --- a/Driver.h +++ b/Driver.h @@ -212,6 +212,7 @@ public: double fLastStopExpDist = -1.0; // odległość wygasania ostateniego przystanku double ReactionTime = 0.0; // czas reakcji Ra: czego i na co? świadomości AI double fBrakeTime = 0.0; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca + double BrakeChargingCooldown {}; // prevents the ai from trying to charge the train brake too frequently double fReady = 0.0; // poziom odhamowania wagonów bool Ready = false; // ABu: stan gotowosci do odjazdu - sprawdzenie odhamowania wagonow private: diff --git a/Model3d.cpp b/Model3d.cpp index 323dd00d..f232eb02 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -997,13 +997,13 @@ TSubModel::create_geometry( std::size_t &Dataoffset, gfx::geometrybank_handle co if( m_geometry != NULL ) { // calculate bounding radius while we're at it - // NOTE: doesn't take into account transformation hierarchy TODO: implement it - float squaredradius { 0.f }; + float squaredradius {}; // if this happens to be root node it may already have non-squared radius of the largest child // since we're comparing squared radii, we need to square it back for correct results m_boundingradius *= m_boundingradius; + auto const submodeloffset { offset( std::numeric_limits::max() ) }; for( auto const &vertex : GfxRenderer.Vertices( m_geometry ) ) { - squaredradius = static_cast( glm::length2( vertex.position ) ); + squaredradius = glm::length2( submodeloffset + vertex.position ); if( squaredradius > m_boundingradius ) { m_boundingradius = squaredradius; } diff --git a/audiorenderer.cpp b/audiorenderer.cpp index ae0cfed2..9c50de25 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -55,9 +55,12 @@ openal_source::stop() { // updates state of the source void -openal_source::update( double const Deltatime ) { +openal_source::update( double const Deltatime, glm::vec3 const &Listenervelocity ) { update_deltatime = Deltatime; // cached for time-based processing of data from the controller + if( sound_range < 0.0 ) { + sound_velocity = Listenervelocity; // cached for doppler shift calculation + } if( id != audio::null_resource ) { @@ -89,11 +92,15 @@ openal_source::sync_with( sound_properties const &State ) { sync = sync_state::bad_resource; return; } -/* // velocity - // not used yet - glm::vec3 const velocity { ( State.location - properties.location ) / update_deltatime }; -*/ + if( ( update_deltatime > 0.0 ) + && ( sound_range >= 0 ) + && ( properties.location != glm::dvec3() ) ) { + // after sound position was initialized we can start velocity calculations + sound_velocity = ( State.location - properties.location ) / update_deltatime; + } + // NOTE: velocity at this point can be either listener velocity for global sounds, actual sound velocity, or 0 if sound position is yet unknown + ::alSourcefv( id, AL_VELOCITY, glm::value_ptr( sound_velocity ) ); // location properties.location = State.location; sound_distance = properties.location - glm::dvec3 { Global.pCameraPosition }; @@ -289,6 +296,7 @@ void openal_renderer::update( double const Deltatime ) { // update listener + // orientation glm::dmat4 cameramatrix; Global.pCamera->SetMatrix( cameramatrix ); auto rotationmatrix { glm::mat3{ cameramatrix } }; @@ -296,18 +304,23 @@ openal_renderer::update( double const Deltatime ) { glm::vec3{ 0, 0,-1 } * rotationmatrix , glm::vec3{ 0, 1, 0 } * rotationmatrix }; ::alListenerfv( AL_ORIENTATION, reinterpret_cast( orientation ) ); -/* - glm::dvec3 const listenerposition { Global.pCameraPosition }; - // not used yet - glm::vec3 const velocity { ( listenerposition - m_listenerposition ) / Deltatime }; - m_listenerposition = listenerposition; -*/ + // velocity + if( Deltatime > 0 ) { + glm::dvec3 const listenerposition { Global.pCameraPosition }; + glm::dvec3 const listenermovement { listenerposition - m_listenerposition }; + m_listenerposition = listenerposition; + m_listenervelocity = ( + glm::length( listenermovement ) < 1000.0 ? // large jumps are typically camera changes + listenermovement / Deltatime : + glm::vec3() ); + ::alListenerfv( AL_VELOCITY, reinterpret_cast( glm::value_ptr( m_listenervelocity ) ) ); + } // update active emitters auto source { std::begin( m_sources ) }; while( source != std::end( m_sources ) ) { // update each source - source->update( Deltatime ); + source->update( Deltatime, m_listenervelocity ); // if after the update the source isn't playing, put it away on the spare stack, it's done if( false == source->is_playing ) { source->clear(); @@ -367,7 +380,8 @@ openal_renderer::fetch_source() { && ( leastimportantweight < 1.f ) ) { // only accept the candidate if it's outside of its nominal hearing range leastimportantsource->stop(); - leastimportantsource->update( 0 ); // HACK: a roundabout way to notify the controller its emitter has stopped + // HACK: dt of 0 is a roundabout way to notify the controller its emitter has stopped + leastimportantsource->update( 0, m_listenervelocity ); leastimportantsource->clear(); // we should be now free to grab the id and get rid of the remains newsource.id = leastimportantsource->id; diff --git a/audiorenderer.h b/audiorenderer.h index e0cc5cd9..54bcc5e9 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -63,7 +63,7 @@ struct openal_source { play(); // updates state of the source void - update( double const Deltatime ); + update( double const Deltatime, glm::vec3 const &Listenervelocity ); // configures state of the source to match the provided set of properties void sync_with( sound_properties const &State ); @@ -90,6 +90,7 @@ private: float pitch_variation { 1.f }; // emitter-specific variation of the base pitch float sound_range { 50.f }; // cached audible range of the emitted samples glm::vec3 sound_distance; // cached distance between sound and the listener + glm::vec3 sound_velocity; // sound movement vector bool is_in_range { false }; // helper, indicates the source was recently within audible range bool is_multipart { false }; // multi-part sounds are kept alive at longer ranges }; @@ -142,6 +143,7 @@ private: ALCcontext * m_context { nullptr }; bool m_ready { false }; // renderer is initialized and functional glm::dvec3 m_listenerposition; + glm::vec3 m_listenervelocity; buffer_manager m_buffers; // TBD: list of sources as vector, sorted by distance, for openal implementations with limited number of active sources? diff --git a/scene.cpp b/scene.cpp index f284a769..0fa018c5 100644 --- a/scene.cpp +++ b/scene.cpp @@ -649,6 +649,12 @@ void basic_section::insert( shape_node Shape ) { auto const &shapedata = Shape.data(); + + // re-calculate section radius, in case shape geometry extends outside the section's boundaries + m_area.radius = std::max( + m_area.radius, + static_cast( glm::length( m_area.center - shapedata.area.center ) + shapedata.area.radius ) ); + if( ( true == shapedata.translucent ) || ( shapedata.rangesquared_max <= 90000.0 ) || ( shapedata.rangesquared_min > 0.0 ) ) { @@ -657,11 +663,6 @@ basic_section::insert( shape_node Shape ) { } else { // large, opaque shapes are placed on section level - // re-calculate section radius, in case shape geometry extends outside the section's boundaries - m_area.radius = std::max( - m_area.radius, - static_cast( glm::length( m_area.center - Shape.data().area.center ) + Shape.data().area.radius ) ); - for( auto &shape : m_shapes ) { // check first if the shape can't be merged with one of the shapes already present in the section if( true == shape.merge( Shape ) ) { @@ -1038,13 +1039,12 @@ basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad, bool con while( true == RaTriangleDivider( shapes[ index ], shapes ) ) { ; // all work is done during expression check } - // with the trimming done we can calculate shape's bounding radius - shape.compute_radius(); } } // move the data into appropriate section(s) for( auto &shape : shapes ) { - + // with the potential splitting done we can calculate each chunk's bounding radius + shape.compute_radius(); if( point_inside( shape.m_data.area.center ) ) { // NOTE: nodes placed outside of region boundaries are discarded section( shape.m_data.area.center ).insert( shape ); diff --git a/sound.cpp b/sound.cpp index cc334098..f2b3c54e 100644 --- a/sound.cpp +++ b/sound.cpp @@ -835,8 +835,8 @@ sound_source::location() const { void sound_source::update_counter( sound_handle const Sound, int const Value ) { - sound( Sound ).playing += Value; - assert( sound( Sound ).playing >= 0 ); + sound( Sound ).playing = std::max( 0, sound( Sound ).playing + Value ); +// assert( sound( Sound ).playing >= 0 ); } void diff --git a/version.h b/version.h index 66ac26bd..ff584265 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 213 +#define VERSION_MINOR 215 #define VERSION_REVISION 0 From 98b82636a8caca1986c5e93d7a2351ea60342dc3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 17 Feb 2018 03:40:44 +0100 Subject: [PATCH 278/426] basic train station object, rudimentary passenger loading/unloading on stops, load percentage based submodel visibility --- Driver.cpp | 90 +++++++++++++++------------- DynObj.cpp | 126 ++++++++++++++++++++++++++++------------ DynObj.h | 10 +++- World.cpp | 3 +- World.h | 3 + maszyna.vcxproj.filters | 6 ++ station.cpp | 72 +++++++++++++++++++++++ station.h | 22 +++++++ 8 files changed, 252 insertions(+), 80 deletions(-) create mode 100644 station.cpp create mode 100644 station.h diff --git a/Driver.cpp b/Driver.cpp index 2c6e3618..d105df18 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -892,8 +892,6 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN mvOccupied->DoorLeft(true); if (p2 & prawe) mvOccupied->DoorRight(true); - // if (p2&3) //żeby jeszcze poczekał chwilę, zanim zamknie - // WaitingSet(10); //10 sekund (wziąć z rozkładu????) } } else @@ -917,50 +915,62 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // pojazd podłączony z tyłu (patrząc od czoła) p = p->Next(); } - // if (p7&3) //żeby jeszcze poczekał chwilę, zanim zamknie - // WaitingSet(10); //10 sekund (wziąć z rozkładu????) } - - if( fStopTime > -5 ) // na końcu rozkładu się ustawia 60s i tu by było skrócenie - WaitingSet( 15.0 + Random( 15.0 ) ); // 10 sekund (wziąć z rozkładu????) - czekanie - // niezależne od sposobu obsługi drzwi, bo opóźnia również kierownika } - if (TrainParams->UpdateMTable( simulation::Time, asNextStop) ) - { // to się wykona tylko raz po zatrzymaniu na W4 - if (TrainParams->CheckTrainLatency() < 0.0) - iDrivigFlags |= moveLate; // odnotowano spóźnienie - else - iDrivigFlags &= ~moveLate; // przyjazd o czasie - if (TrainParams->DirectionChange()) // jeśli "@" w rozkładzie, to - // wykonanie dalszych komend - { // wykonanie kolejnej komendy, nie dotyczy ostatniej stacji - if (iDrivigFlags & movePushPull) // SN61 ma się też nie ruszać, - // chyba że ma wagony - { + if (TrainParams->UpdateMTable( simulation::Time, asNextStop) ) { + // to się wykona tylko raz po zatrzymaniu na W4 + + // perform loading/unloading + auto const exchangetime { simulation::Station.update_load( pVehicles[ 0 ], *TrainParams ) }; + // TBD: adjust time to load exchange size + if( fStopTime > -55 ) { + // na końcu rozkładu się ustawia 60s i tu by było skrócenie +// WaitingSet( 15.0 + Random( 15.0 ) ); // 10 sekund (wziąć z rozkładu????) - czekanie + // with door open on both sides calculated loading time is halved + // p7=platform side (1:left, 2:right, 3:both) + auto const platformside = static_cast( std::floor( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) % 10; + WaitingSet( + platformside == 3 ? + exchangetime * 0.5 : + exchangetime ); + } + if( TrainParams->CheckTrainLatency() < 0.0 ) { + // odnotowano spóźnienie + iDrivigFlags |= moveLate; + } + else { + // przyjazd o czasie + iDrivigFlags &= ~moveLate; + } + if (TrainParams->DirectionChange()) { + // jeśli "@" w rozkładzie, to wykonanie dalszych komend + // wykonanie kolejnej komendy, nie dotyczy ostatniej stacji + if (iDrivigFlags & movePushPull) { + // SN61 ma się też nie ruszać, chyba że ma wagony iDrivigFlags |= moveStopHere; // EZT ma stać przy peronie - if (OrderNextGet() != Change_direction) - { + if (OrderNextGet() != Change_direction) { OrderPush(Change_direction); // zmiana kierunku - OrderPush(TrainParams->StationIndex < - TrainParams->StationCount ? - Obey_train : - Shunt); // to dalej wg rozkładu + OrderPush( + TrainParams->StationIndex < TrainParams->StationCount ? + Obey_train : + Shunt); // to dalej wg rozkładu } } - else // a dla lokomotyw... - iDrivigFlags &= - ~(moveStopPoint | moveStopHere); // pozwolenie na - // przejechanie za W4 - // przed czasem i nie - // ma stać - JumpToNextOrder(); // przejście do kolejnego rozkazu (zmiana - // kierunku, odczepianie) - iDrivigFlags &= ~moveStopCloser; // ma nie podjeżdżać pod W4 po - // przeciwnej stronie - sSpeedTable[i].iFlags = 0; // ten W4 nie liczy się już zupełnie - // (nie wyśle SetVelocity) - sSpeedTable[i].fVelNext = -1; // jechać - continue; // nie analizować prędkości + else { + // a dla lokomotyw... + // pozwolenie na przejechanie za W4 przed czasem i nie ma stać + iDrivigFlags &= ~( moveStopPoint | moveStopHere ); + } + // przejście do kolejnego rozkazu (zmiana kierunku, odczepianie) + JumpToNextOrder(); + // ma nie podjeżdżać pod W4 po przeciwnej stronie + iDrivigFlags &= ~moveStopCloser; + // ten W4 nie liczy się już zupełnie (nie wyśle SetVelocity) + sSpeedTable[i].iFlags = 0; + // jechać + sSpeedTable[i].fVelNext = -1; + // nie analizować prędkości + continue; } } if (OrderCurrentGet() == Shunt) diff --git a/DynObj.cpp b/DynObj.cpp index 4aa0136c..62d9b37b 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -976,6 +976,10 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) section.load->SetLightLevel( section.level, true ); } } + // load chunks visibility + for( auto const §ion : SectionLoadVisibility ) { + section.submodel->iVisible = section.visible; + } } // ABu 29.01.05 koniec przeklejenia ************************************* @@ -2010,9 +2014,9 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // check the low poly interior for potential compartments of interest, ie ones which can be individually lit // TODO: definition of relevant compartments in the .mmd file TSubModel *submodel { nullptr }; - if( ( submodel = mdLowPolyInt->GetFromName( "cab1" ) ) != nullptr ) { SectionLightLevels.emplace_back( submodel, nullptr, 0.0f ); } - if( ( submodel = mdLowPolyInt->GetFromName( "cab2" ) ) != nullptr ) { SectionLightLevels.emplace_back( submodel, nullptr, 0.0f ); } - if( ( submodel = mdLowPolyInt->GetFromName( "cab0" ) ) != nullptr ) { SectionLightLevels.emplace_back( submodel, nullptr, 0.0f ); } + if( ( submodel = mdLowPolyInt->GetFromName( "cab1" ) ) != nullptr ) { SectionLightLevels.push_back( { submodel, nullptr, 0.0f } ); } + if( ( submodel = mdLowPolyInt->GetFromName( "cab2" ) ) != nullptr ) { SectionLightLevels.push_back( { submodel, nullptr, 0.0f } ); } + if( ( submodel = mdLowPolyInt->GetFromName( "cab0" ) ) != nullptr ) { SectionLightLevels.push_back( { submodel, nullptr, 0.0f } ); } // passenger car compartments std::vector nameprefixes = { "corridor", "korytarz", "compartment", "przedzial" }; int compartmentindex; @@ -2027,19 +2031,17 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" std::to_string( compartmentindex ) ); submodel = mdLowPolyInt->GetFromName( compartmentname ); if( submodel != nullptr ) { - // if specified compartment was found we check also for potential matching section in the currently assigned load - // NOTE: if the load gets changed this will invalidate stored pointers. TODO: rebuild the table on load change - SectionLightLevels.emplace_back( + SectionLightLevels.push_back( { submodel, - ( mdLoad != nullptr ? - mdLoad->GetFromName( compartmentname ): - nullptr ), - 0.0f ); + nullptr, // pointers to load sections are generated afterwards + 0.0f } ); } ++compartmentindex; } while( ( submodel != nullptr ) || ( compartmentindex < 2 ) ); // chain can start from prefix00 or prefix01 } + update_load_sections(); + update_load_visibility(); } // wyszukiwanie zderzakow if( mdModel ) { @@ -2428,31 +2430,83 @@ bool TDynamicObject::UpdateForce(double dt, double dt1, bool FullVer) return true; } -void TDynamicObject::LoadUpdate() -{ // przeładowanie modelu ładunku +void TDynamicObject::LoadUpdate() { + // przeładowanie modelu ładunku // Ra: nie próbujemy wczytywać modeli miliony razy podczas renderowania!!! - if ((mdLoad == NULL) && (MoverParameters->Load > 0)) - { - std::string asLoadName = - asBaseDir + MoverParameters->LoadType + ".t3d"; // zapamiętany katalog pojazdu - // asLoadName=MoverParameters->LoadType; - // if (MoverParameters->LoadType!=AnsiString("passengers")) - Global.asCurrentTexturePath = asBaseDir; // bieżąca ścieżka do tekstur to dynamic/... - mdLoad = TModelsManager::GetModel(asLoadName.c_str()); // nowy ładunek - Global.asCurrentTexturePath = - std::string(szTexturePath); // z powrotem defaultowa sciezka do tekstur - // Ra: w MMD można by zapisać położenie modelu ładunku (np. węgiel) w - // zależności od - // załadowania + if( ( mdLoad == nullptr ) + && ( MoverParameters->Load > 0 ) ) { + + if( false == MoverParameters->LoadType.empty() ) { + + Global.asCurrentTexturePath = asBaseDir; // bieżąca ścieżka do tekstur to dynamic/... + + // try first specialized version of the load model, vehiclename_loadname + auto const specializedloadfilename { asBaseDir + MoverParameters->TypeName + "_" + MoverParameters->LoadType }; + if( ( true == FileExists( specializedloadfilename + ".e3d" ) ) + || ( true == FileExists( specializedloadfilename + ".t3d" ) ) ) { + mdLoad = TModelsManager::GetModel( specializedloadfilename, true ); + } + if( mdLoad == nullptr ) { + // if this fails, try generic load model + mdLoad = TModelsManager::GetModel( asBaseDir + MoverParameters->LoadType, true ); + } + // update bindings between lowpoly sections and potential load chunks placed inside them + update_load_sections(); + + Global.asCurrentTexturePath = std::string( szTexturePath ); // z powrotem defaultowa sciezka do tekstur + } + // Ra: w MMD można by zapisać położenie modelu ładunku (np. węgiel) w zależności od załadowania + } + else if( MoverParameters->Load == 0 ) { + // nie ma ładunku + mdLoad = nullptr; + // erase bindings between lowpoly sections and potential load chunks placed inside them + update_load_sections(); } - else if (MoverParameters->Load == 0) - mdLoad = NULL; // nie ma ładunku - // if ((mdLoad==NULL)&&(MoverParameters->Load>0)) - // { - // mdLoad=NULL; //Ra: to jest tu bez sensu - co autor miał na myśli? - // } MoverParameters->LoadStatus &= 3; // po zakończeniu będzie równe zero -}; +} + +void +TDynamicObject::update_load_sections() { + + SectionLoadVisibility.clear(); + + for( auto §ion : SectionLightLevels ) { + + section.load = ( + mdLoad != nullptr ? + mdLoad->GetFromName( section.compartment->pName ) : + nullptr ); + + if( section.load != nullptr ) { + SectionLoadVisibility.push_back( { section.load, false } ); + } + } + std::shuffle( std::begin( SectionLoadVisibility ), std::end( SectionLoadVisibility ), Global.random_engine ); +} + +void +TDynamicObject::update_load_visibility() { + + if( Random() < 0.25 ) { + std::shuffle( std::begin( SectionLoadVisibility ), std::end( SectionLoadVisibility ), Global.random_engine ); + } + + auto loadpercentage { ( + MoverParameters->MaxLoad == 0.0 ? + 0.0 : + 100.0 * MoverParameters->Load / MoverParameters->MaxLoad ) }; + auto const sectionloadpercentage { ( + SectionLoadVisibility.empty() ? + 0.0 : + 100.0 / SectionLoadVisibility.size() ) }; + // set as many sections as we can, given overall load percentage and how much of full percentage is covered by each chunk + std::for_each( + std::begin( SectionLoadVisibility ), std::end( SectionLoadVisibility ), + [&]( section_visibility §ion ) { + section.visible = ( loadpercentage > 0.0 ); + loadpercentage -= sectionloadpercentage; } ); +} /* Ra: @@ -3637,7 +3691,7 @@ void TDynamicObject::RenderSounds() { } // NBMX Obsluga drzwi, MC: zuniwersalnione if( ( true == MoverParameters->DoorLeftOpened ) - && ( dDoorMoveL < MoverParameters->DoorMaxShiftL ) ) { + && ( dDoorMoveL < MoverParameters->DoorMaxShiftL ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x > 0.f ) { @@ -3648,7 +3702,7 @@ void TDynamicObject::RenderSounds() { } } if( ( false == MoverParameters->DoorLeftOpened ) - && ( dDoorMoveL > 0.01 ) ) { + && ( dDoorMoveL > 0.01 ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x > 0.f ) { @@ -3659,7 +3713,7 @@ void TDynamicObject::RenderSounds() { } } if( ( true == MoverParameters->DoorRightOpened ) - && ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) ) { + && ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x < 0.f ) { @@ -3670,7 +3724,7 @@ void TDynamicObject::RenderSounds() { } } if( ( false == MoverParameters->DoorRightOpened ) - && ( dDoorMoveR > 0.01 ) ) { + && ( dDoorMoveR > 0.01 ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x < 0.f ) { diff --git a/DynObj.h b/DynObj.h index 5157478d..2cbe2230 100644 --- a/DynObj.h +++ b/DynObj.h @@ -194,13 +194,15 @@ public: TSubModel *compartment; TSubModel *load; float level; - section_light( TSubModel *Compartment, TSubModel *Load, float const Level ) : - compartment(Compartment), load(Load), level(Level) - {} }; std::vector SectionLightLevels; // table of light levels for specific compartments of associated 3d model bool SectionLightsActive { false }; // flag indicating whether section lights were set. float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) + struct section_visibility { + TSubModel *submodel; + bool visible; + }; + std::vector SectionLoadVisibility; // visibility of specific sections of the load 3d model private: // zmienne i metody do animacji submodeli; Ra: sprzatam animacje w pojeździe @@ -464,6 +466,8 @@ private: void AttachPrev(TDynamicObject *Object, int iType = 1); bool UpdateForce(double dt, double dt1, bool FullVer); void LoadUpdate(); + void update_load_sections(); + void update_load_visibility(); bool Update(double dt, double dt1); bool FastUpdate(double dt); void Move(double fDistance); diff --git a/World.cpp b/World.cpp index edc44db8..952d2e41 100644 --- a/World.cpp +++ b/World.cpp @@ -45,6 +45,7 @@ namespace simulation { simulation_time Time; +basic_station Station; } extern "C" @@ -1338,7 +1339,7 @@ TWorld::Update_UI() { if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) uitextline2 += "+Mg"; - uitextline2 += ", Load: " + to_string( vehicle->MoverParameters->LoadFlag, 0 ); + uitextline2 += ", Load: " + to_string( vehicle->MoverParameters->LoadFlag, 0 ) + " (" + to_string( vehicle->MoverParameters->Load, 0 ) + ")"; uitextline2 += "; Pant: " diff --git a/World.h b/World.h index c9654100..b0664611 100644 --- a/World.h +++ b/World.h @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. #include "stars.h" #include "skydome.h" #include "messaging.h" +#include "station.h" // wrapper for simulation time class simulation_time { @@ -59,6 +60,8 @@ namespace simulation { extern simulation_time Time; +extern basic_station Station; // temporary object, for station functionality tests + } // wrapper for environment elements -- sky, sun, stars, clouds etc diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 755e3ad1..9c66e203 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -237,6 +237,9 @@ Source Files\input + + Source Files + @@ -461,6 +464,9 @@ Header Files\input + + Header Files + diff --git a/station.cpp b/station.cpp new file mode 100644 index 00000000..2e4a7a98 --- /dev/null +++ b/station.cpp @@ -0,0 +1,72 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "station.h" + +#include "dynobj.h" +#include "mtable.h" + +// exchanges load with consist attached to specified vehicle, operating on specified schedule +double +basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule ) { + + auto const firststop { Schedule.StationIndex == 1 }; + auto const laststop { Schedule.StationIndex == Schedule.StationCount }; + // HACK: determine whether current station is a (small) stop from the presence of "po" at the name end + auto const stationname { Schedule.TimeTable[ Schedule.StationIndex ].StationName }; + auto const stationequipment { Schedule.TimeTable[ Schedule.StationIndex ].StationWare }; + auto const trainstop { ( + ( ( stationname.size() >= 2 ) && ( stationname.substr( stationname.size() - 2 ) == "po" ) ) + || ( stationequipment.find( "po" ) != std::string::npos ) ) }; + // train stops exchange smaller groups than regular stations + // NOTE: this is crude and unaccurate, but for now will do + auto const stationsizemodifier { ( trainstop ? 1.0 : 2.0 ) }; + // go through all vehicles and update their load + // NOTE: for the time being we limit ourselves to passenger-carrying cars only + auto exchangetime { 0.0 }; + + auto *vehicle { First }; + while( vehicle != nullptr ) { + + auto ¶meters { *vehicle->MoverParameters }; + + if( ( true == parameters.LoadType.empty() ) + && ( parameters.LoadAccepted.find( "passengers" ) != std::string::npos ) ) { + // set the type for empty cars + parameters.LoadType = "passengers"; + } + + if( parameters.LoadType == "passengers" ) { + // NOTE: for the time being we're doing simple, random load change calculation + // TODO: exchange driven by station parameters and time of the day + auto loadcount = static_cast( + laststop ? + 0 : + Random( parameters.MaxLoad * 0.15 * stationsizemodifier ) ); + if( true == firststop ) { + // slightly larger group at the initial station + loadcount *= 2; + } + auto unloadcount = static_cast( + firststop ? 0 : + laststop ? parameters.Load : + Random( parameters.MaxLoad * 0.10 * stationsizemodifier ) ); + + parameters.Load = clamp( parameters.Load + loadcount - unloadcount, 0, parameters.MaxLoad ); + vehicle->LoadUpdate(); + vehicle->update_load_visibility(); + + exchangetime = std::max( exchangetime, loadcount / parameters.LoadSpeed + unloadcount / parameters.UnLoadSpeed ); + } + vehicle = vehicle->Next(); + } + + return exchangetime; +} diff --git a/station.h b/station.h new file mode 100644 index 00000000..34b915f7 --- /dev/null +++ b/station.h @@ -0,0 +1,22 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "classes.h" + +// a simple station, performs freight and passenger exchanges with visiting consists +class basic_station { + +public: +// methods + // exchanges load with consist attached to specified vehicle, operating on specified schedule; returns: time needed for exchange, in seconds + double + update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule ); +}; \ No newline at end of file From e5967f72e016be7ce2a425eb96c6af66515f0b03 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 17 Feb 2018 03:42:07 +0100 Subject: [PATCH 279/426] sound state tracking fixes, uart toggle input command selection fix --- sound.cpp | 87 +++++++++++++++++++++++++++---------------------------- sound.h | 10 +++---- uart.cpp | 2 +- 3 files changed, 49 insertions(+), 50 deletions(-) diff --git a/sound.cpp b/sound.cpp index f2b3c54e..f45a9ff0 100644 --- a/sound.cpp +++ b/sound.cpp @@ -453,8 +453,8 @@ sound_source::stop( bool const Skipend ) { if( ( false == Skipend ) && ( sound( sound_id::end ).buffer != null_handle ) - && ( sound( sound_id::end ).buffer != sound( sound_id::main ).buffer ) // end == main can happen in malformed legacy cases -/* && ( sound( sound_id::end ).playing == 0 ) */ ) { +/* && ( sound( sound_id::end ).buffer != sound( sound_id::main ).buffer ) */ // end == main can happen in malformed legacy cases +/* && ( sound( sound_id::end ).playing == 0 ) */ ) { // spawn potentially defined sound end sample, if the emitter is currently active insert( sound_id::end ); } @@ -481,19 +481,31 @@ sound_source::update_basic( audio::openal_source &Source ) { if( true == Source.is_playing ) { - if( ( true == m_stop ) - && ( Source.sounds[ Source.sound_index ] != sound_id::end ) ) { - // kill the sound if stop was requested, unless it's sound bookend sample - Source.stop(); - update_counter( Source.sounds[ Source.sound_index ], -1 ); - if( false == is_playing() ) { - m_stop = false; + auto const soundhandle { Source.sounds[ Source.sound_index ] }; + + if( sound( sound_id::begin ).buffer != null_handle ) { + // potentially a multipart sound + // detect the moment when the sound moves from startup sample to the main + if( ( false == Source.is_looping ) + && ( soundhandle == sound_id::main ) ) { + // when it happens update active sample counters, and activate the looping + update_counter( sound_id::begin, -1 ); + update_counter( soundhandle, 1 ); + Source.loop( TestFlag( m_flags, sound_flags::looping ) ); } + } + + if( ( true == m_stop ) + && ( soundhandle != sound_id::end ) ) { + // kill the sound if stop was requested, unless it's sound bookend sample + update_counter( soundhandle, -1 ); + Source.stop(); + m_stop = is_playing(); // end the stop mode when all active sounds are dead return; } /* if( ( true == m_stopend ) - && ( Source.sounds[ Source.sound_index ] == sound_id::end ) ) { + && ( soundhandle == sound_id::end ) ) { // kill the sound if it's the bookend sample and stopping it was requested Source.stop(); update_counter( sound_id::end, -1 ); @@ -503,25 +515,13 @@ sound_source::update_basic( audio::openal_source &Source ) { return; } */ - if( sound( sound_id::begin ).buffer != null_handle ) { - // potentially a multipart sound - // detect the moment when the sound moves from startup sample to the main - auto const soundhandle { Source.sounds[ Source.sound_index ] }; - if( ( false == Source.is_looping ) - && ( soundhandle == sound_id::main ) ) { - // when it happens update active sample counters, and activate the looping - update_counter( sound_id::begin, -1 ); - update_counter( soundhandle, 1 ); - Source.loop( true ); - } - } // check and update if needed current sound properties update_location(); update_soundproofing(); Source.sync_with( m_properties ); if( Source.sync != sync_state::good ) { // if the sync went wrong we let the renderer kill its part of the emitter, and update our playcounter(s) to match - update_counter( Source.sounds[ Source.sound_index ], -1 ); + update_counter( soundhandle, -1 ); } } @@ -532,10 +532,9 @@ sound_source::update_basic( audio::openal_source &Source ) { // the emitter wasn't yet started auto const soundhandle { Source.sounds[ Source.sound_index ] }; // emitter initialization - if( ( soundhandle == sound_id::main ) - && ( true == TestFlag( m_flags, sound_flags::looping ) ) ) { + if( soundhandle == sound_id::main ) { // main sample can be optionally set to loop - Source.loop( true ); + Source.loop( TestFlag( m_flags, sound_flags::looping ) ); } Source.range( m_range ); Source.pitch( m_pitchvariation ); @@ -569,6 +568,18 @@ sound_source::update_combined( audio::openal_source &Source ) { auto const soundhandle { Source.sounds[ Source.sound_index ] }; + if( sound( sound_id::begin ).buffer != null_handle ) { + // potentially a multipart sound + // detect the moment when the sound moves from startup sample to the main + if( ( false == Source.is_looping ) + && ( soundhandle == ( sound_id::chunk | 0 ) ) ) { + // when it happens update active sample counters, and activate the looping + update_counter( sound_id::begin, -1 ); + update_counter( soundhandle, 1 ); + Source.loop( true ); + } + } + if( ( true == m_stop ) && ( soundhandle != sound_id::end ) ) { // kill the sound if stop was requested, unless it's sound bookend sample @@ -581,7 +592,7 @@ sound_source::update_combined( audio::openal_source &Source ) { } /* if( ( true == m_stopend ) - && ( Source.sounds[ Source.sound_index ] == sound_id::end ) ) { + && ( soundhandle == sound_id::end ) ) { // kill the sound if it's the bookend sample and stopping it was requested Source.stop(); update_counter( sound_id::end, -1 ); @@ -591,19 +602,6 @@ sound_source::update_combined( audio::openal_source &Source ) { return; } */ - if( sound( sound_id::begin ).buffer != null_handle ) { - // potentially a multipart sound - // detect the moment when the sound moves from startup sample to the main - auto const soundhandle { Source.sounds[ Source.sound_index ] }; - if( ( false == Source.is_looping ) - && ( soundhandle == ( sound_id::chunk | 0 ) ) ) { - // when it happens update active sample counters, and activate the looping - update_counter( sound_id::begin, -1 ); - update_counter( soundhandle, 1 ); - Source.loop( true ); - } - } - if( ( soundhandle & sound_id::chunk ) != 0 ) { // for sound chunks, test whether the chunk should still be active given current value of the controlling variable auto const soundpoint { compute_combined_point() }; @@ -628,7 +626,7 @@ sound_source::update_combined( audio::openal_source &Source ) { Source.sync_with( m_properties ); if( Source.sync != sync_state::good ) { // if the sync went wrong we let the renderer kill its part of the emitter, and update our playcounter(s) to match - update_counter( Source.sounds[ Source.sound_index ], -1 ); + update_counter( soundhandle, -1 ); } // ...and restore base properties m_properties = baseproperties; @@ -795,7 +793,7 @@ sound_source::empty() const { bool sound_source::is_playing( bool const Includesoundends ) const { - auto isplaying { ( sound( sound_id::begin ).playing + sound( sound_id::main ).playing ) > 0 }; + auto isplaying { ( sound( sound_id::begin ).playing > 0 ) || ( sound( sound_id::main ).playing > 0 ) }; if( ( false == isplaying ) && ( false == m_soundchunks.empty() ) ) { // for emitters with sample tables check also if any of the chunks is active @@ -835,8 +833,9 @@ sound_source::location() const { void sound_source::update_counter( sound_handle const Sound, int const Value ) { - sound( Sound ).playing = std::max( 0, sound( Sound ).playing + Value ); -// assert( sound( Sound ).playing >= 0 ); +// sound( Sound ).playing = std::max( 0, sound( Sound ).playing + Value ); + sound( Sound ).playing += Value; + assert( sound( Sound ).playing >= 0 ); } void diff --git a/sound.h b/sound.h index 13143e44..6ea03fda 100644 --- a/sound.h +++ b/sound.h @@ -179,15 +179,15 @@ private: template void insert( Iterator_ First, Iterator_ Last ) { - uint32_sequence sounds; + update_counter( *First, 1 ); std::vector buffers; + uint32_sequence sounds; std::for_each( First, Last, [&]( sound_handle const &soundhandle ) { - sounds.emplace_back( soundhandle ); - buffers.emplace_back( sound( soundhandle ).buffer ); } ); - audio::renderer.insert( std::begin( buffers ), std::end( buffers ), this, sounds ); - update_counter( *First, 1 ); } + buffers.emplace_back( sound( soundhandle ).buffer ); + sounds.emplace_back( soundhandle ); } ); + audio::renderer.insert( std::begin( buffers ), std::end( buffers ), this, sounds ); } sound_data & sound( sound_handle const Sound ); sound_data const & diff --git a/uart.cpp b/uart.cpp index f48dd46b..84dcba69 100644 --- a/uart.cpp +++ b/uart.cpp @@ -175,7 +175,7 @@ void uart_input::poll() auto const command { ( type != toggle ? std::get<2>( entry ) : - ( action == GLFW_PRESS ? + ( true == state ? std::get<2>( entry ) : std::get<3>( entry ) ) ) }; From 40e77acb696d59d4c11a5010f034601a029f8581 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 21 Feb 2018 23:11:10 +0100 Subject: [PATCH 280/426] load submodel visibility tweaks --- Driver.cpp | 117 ++++++++++++++++++++++++++++++---------------------- DynObj.cpp | 62 ++++++++++++++++++++++++---- DynObj.h | 2 + Model3d.cpp | 19 +++++++++ Model3d.h | 2 + station.cpp | 15 +++---- 6 files changed, 151 insertions(+), 66 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index d105df18..52585c06 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -934,6 +934,11 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN exchangetime * 0.5 : exchangetime ); } + // update brake settings and ai braking tables + // NOTE: this calculation is run after completing loading/unloading + // remember to move it to a more fitting spot, when loading/unloading taks some actual time + AutoRewident(); // nastawianie hamulca do jazdy pociągowej + if( TrainParams->CheckTrainLatency() < 0.0 ) { // odnotowano spóźnienie iDrivigFlags |= moveLate; @@ -1783,34 +1788,55 @@ void TController::AutoRewident() p = 0; // będziemy tu liczyć wagony od lokomotywy dla nastawy GP while (d) { // 3. Nastawianie - switch (ustaw) - { - case bdelay_P: // towarowy P - lokomotywa na G, reszta na P. - d->MoverParameters->BrakeDelaySwitch(d->MoverParameters->Power > 1 ? bdelay_G : - bdelay_P); - break; - case bdelay_G: // towarowy G - wszystko na G, jeśli nie ma to P (powinno się wyłączyć - // hamulec) - d->MoverParameters->BrakeDelaySwitch( - TestFlag(d->MoverParameters->BrakeDelays, bdelay_G) ? bdelay_G : bdelay_P); - break; - case bdelay_R: // towarowy GP - lokomotywa oraz 5 pierwszych pojazdów przy niej na G, reszta - // na P - if (d->MoverParameters->Power > 1) - { - d->MoverParameters->BrakeDelaySwitch(bdelay_G); - p = 0; // a jak będzie druga w środku? + if( ( true == AIControllFlag ) + || ( d != pVehicle ) ) { + // don't touch human-controlled vehicle, but others are free game + switch( ustaw ) { + + case bdelay_P: { + // towarowy P - lokomotywa na G, reszta na P. + d->MoverParameters->BrakeDelaySwitch( + d->MoverParameters->Power > 1 ? + bdelay_G : + bdelay_P ); + break; + } + case bdelay_G: { + // towarowy G - wszystko na G, jeśli nie ma to P (powinno się wyłączyć hamulec) + d->MoverParameters->BrakeDelaySwitch( + TestFlag( d->MoverParameters->BrakeDelays, bdelay_G ) ? + bdelay_G : + bdelay_P ); + break; + } + case bdelay_R: { + // towarowy GP - lokomotywa oraz 5 pierwszych pojazdów przy niej na G, reszta na P + if( d->MoverParameters->Power > 1 ) { + d->MoverParameters->BrakeDelaySwitch( bdelay_G ); + p = 0; // a jak będzie druga w środku? + } + else { + d->MoverParameters->BrakeDelaySwitch( + ++p <= 5 ? + bdelay_G : + bdelay_P ); + } + break; + } + case 16 + bdelay_R: { + // pasażerski R - na R, jeśli nie ma to P + d->MoverParameters->BrakeDelaySwitch( + TestFlag( d->MoverParameters->BrakeDelays, bdelay_R ) ? + bdelay_R : + bdelay_P ); + break; + } + case 16 + bdelay_P: { + // pasażerski P - wszystko na P + d->MoverParameters->BrakeDelaySwitch( bdelay_P ); + break; + } } - else - d->MoverParameters->BrakeDelaySwitch(++p <= 5 ? bdelay_G : bdelay_P); - break; - case 16 + bdelay_R: // pasażerski R - na R, jeśli nie ma to P - d->MoverParameters->BrakeDelaySwitch( - TestFlag(d->MoverParameters->BrakeDelays, bdelay_R) ? bdelay_R : bdelay_P); - break; - case 16 + bdelay_P: // pasażerski P - wszystko na P - d->MoverParameters->BrakeDelaySwitch(bdelay_P); - break; } d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } @@ -2105,22 +2131,16 @@ void TController::SetVelocity(double NewVel, double NewVelNext, TStopReason r) if (OrderList[OrderPos] ? OrderList[OrderPos] & (Obey_train | Shunt | Connect | Prepare_engine) : true) // jeśli jedzie w dowolnym trybie - if ((mvOccupied->Vel < - 1.0)) // jesli stoi (na razie, bo chyba powinien też, gdy hamuje przed semaforem) + if ((mvOccupied->Vel < 1.0)) // jesli stoi (na razie, bo chyba powinien też, gdy hamuje przed semaforem) if (iDrivigFlags & moveStartHorn) // jezeli trąbienie włączone - if (!(iDrivigFlags & (moveStartHornDone | moveConnect))) // jeśli nie zatrąbione - // i nie jest to moment - // podłączania składu - if (mvOccupied->CategoryFlag & 1) // tylko pociągi trąbią (unimogi tylko na - // torach, więc trzeba raczej sprawdzać - // tor) - if ((NewVel >= 1.0) || (NewVel < 0.0)) // o ile prędkość jest znacząca - { // fWarningDuration=0.3; //czas trąbienia - // if (AIControllFlag) //jak siedzi krasnoludek, to włączy trąbienie - // mvOccupied->WarningSignal=pVehicle->iHornWarning; //wysokość tonu - // (2=wysoki) - // iDrivigFlags|=moveStartHornDone; //nie trąbić aż do ruszenia - iDrivigFlags |= moveStartHornNow; // zatrąb po odhamowaniu + if (!(iDrivigFlags & (moveStartHornDone | moveConnect))) + // jeśli nie zatrąbione i nie jest to moment podłączania składu + if (mvOccupied->CategoryFlag & 1) + // tylko pociągi trąbią (unimogi tylko na torach, więc trzeba raczej sprawdzać tor) + if ((NewVel >= 1.0) || (NewVel < 0.0)) { + // o ile prędkość jest znacząca + // zatrąb po odhamowaniu + iDrivigFlags |= moveStartHornNow; } } VelSignal = NewVel; // prędkość zezwolona na aktualnym odcinku @@ -3659,12 +3679,9 @@ TController::UpdateSituation(double dt) { // but when enabled all the time it produces silly effect // przy prowadzeniu samochodu trzeba każdą oś odsuwać oddzielnie, inaczej kicha wychodzi if (mvOccupied->CategoryFlag & 2) // jeśli samochód - // if (fabs(mvOccupied->OffsetTrackH)Dim.W) //Ra: szerokość drogi tu - // powinna być? - if (!mvOccupied->ChangeOffsetH(-0.01 * mvOccupied->Vel * dt)) // ruch w poprzek - // drogi - mvOccupied->ChangeOffsetH(0.01 * mvOccupied->Vel * - dt); // Ra: co to miało być, to nie wiem + // if (fabs(mvOccupied->OffsetTrackH)Dim.W) //Ra: szerokość drogi tu powinna być? + if (!mvOccupied->ChangeOffsetH(-0.01 * mvOccupied->Vel * dt)) // ruch w poprzek drogi + mvOccupied->ChangeOffsetH(0.01 * mvOccupied->Vel * dt); // Ra: co to miało być, to nie wiem */ } @@ -3731,7 +3748,7 @@ TController::UpdateSituation(double dt) { if( fWarningDuration < 0.05 ) mvOccupied->WarningSignal = 0; // a tu się kończy } - if( mvOccupied->Vel >= 3.0 ) { + if( mvOccupied->Vel >= 5.0 ) { // jesli jedzie, można odblokować trąbienie, bo się wtedy nie włączy iDrivigFlags &= ~moveStartHornDone; // zatrąbi dopiero jak następnym razem stanie iDrivigFlags |= moveStartHorn; // i trąbić przed następnym ruszeniem @@ -3740,7 +3757,7 @@ TController::UpdateSituation(double dt) { if( ( true == TestFlag( iDrivigFlags, moveStartHornNow ) ) && ( true == Ready ) && ( iEngineActive != 0 ) - && ( fStopTime >= 0 ) ) { + && ( mvControlling->MainCtrlPos > 0 ) ) { // uruchomienie trąbienia przed ruszeniem fWarningDuration = 0.3; // czas trąbienia mvOccupied->WarningSignal = pVehicle->iHornWarning; // wysokość tonu (2=wysoki) diff --git a/DynObj.cpp b/DynObj.cpp index 62d9b37b..255fc17c 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -554,14 +554,14 @@ TDynamicObject::toggle_lights() { for( auto §ionlight : SectionLightLevels ) { std::string const &compartmentname = sectionlight.compartment->pName; - if( ( compartmentname.find( "corridor" ) != std::string::npos ) - || ( compartmentname.find( "korytarz" ) != std::string::npos ) ) { + if( ( compartmentname.find( "corridor" ) == 0 ) + || ( compartmentname.find( "korytarz" ) == 0 ) ) { // corridors are lit 100% of time sectionlight.level = 0.75f; } else if( - ( compartmentname.find( "compartment" ) != std::string::npos ) - || ( compartmentname.find( "przedzial" ) != std::string::npos ) ) { + ( compartmentname.find( "compartment" ) == 0 ) + || ( compartmentname.find( "przedzial" ) == 0 ) ) { // compartments are lit with 75% probability sectionlight.level = ( Random() < 0.75 ? 0.75f : 0.15f ); } @@ -979,6 +979,18 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) // load chunks visibility for( auto const §ion : SectionLoadVisibility ) { section.submodel->iVisible = section.visible; + if( false == section.visible ) { + // if the section root isn't visible we can skip meddling with its children + continue; + } + // if the section root is visible set the state of section chunks + auto *sectionchunk { section.submodel->ChildGet() }; + auto visiblechunkcount { section.visible_chunks }; + while( sectionchunk != nullptr ) { + sectionchunk->iVisible = ( visiblechunkcount > 0 ); + --visiblechunkcount; + sectionchunk = sectionchunk->NextGet(); + } } } // ABu 29.01.05 koniec przeklejenia ************************************* @@ -2450,6 +2462,11 @@ void TDynamicObject::LoadUpdate() { // if this fails, try generic load model mdLoad = TModelsManager::GetModel( asBaseDir + MoverParameters->LoadType, true ); } + if( mdLoad != nullptr ) { + // TODO: discern from vehicle component which merely uses vehicle directory and has no animations, so it can be initialized outright + // and actual vehicles which get their initialization after their animations are set up + mdLoad->Init(); + } // update bindings between lowpoly sections and potential load chunks placed inside them update_load_sections(); @@ -2478,18 +2495,19 @@ TDynamicObject::update_load_sections() { mdLoad->GetFromName( section.compartment->pName ) : nullptr ); - if( section.load != nullptr ) { + if( ( section.load != nullptr ) + && ( section.load->count_children() > 0 ) ) { SectionLoadVisibility.push_back( { section.load, false } ); } } - std::shuffle( std::begin( SectionLoadVisibility ), std::end( SectionLoadVisibility ), Global.random_engine ); + shuffle_load_sections(); } void TDynamicObject::update_load_visibility() { if( Random() < 0.25 ) { - std::shuffle( std::begin( SectionLoadVisibility ), std::end( SectionLoadVisibility ), Global.random_engine ); + shuffle_load_sections(); } auto loadpercentage { ( @@ -2505,7 +2523,33 @@ TDynamicObject::update_load_visibility() { std::begin( SectionLoadVisibility ), std::end( SectionLoadVisibility ), [&]( section_visibility §ion ) { section.visible = ( loadpercentage > 0.0 ); - loadpercentage -= sectionloadpercentage; } ); + section.visible_chunks = 0; + auto const sectionchunkcount { section.submodel->count_children() }; + auto const sectionchunkloadpercentage{ ( + sectionchunkcount == 0 ? + 0.0 : + sectionloadpercentage / sectionchunkcount ) }; + auto *sectionchunk { section.submodel->ChildGet() }; + while( sectionchunk != nullptr ) { + if( loadpercentage > 0.0 ) { + ++section.visible_chunks; + loadpercentage -= sectionchunkloadpercentage; + } + sectionchunk = sectionchunk->NextGet(); + } } ); +} + +void +TDynamicObject::shuffle_load_sections() { + + std::shuffle( std::begin( SectionLoadVisibility ), std::end( SectionLoadVisibility ), Global.random_engine ); + // shift chunks assigned to corridors to the end of the list, so they show up last + std::stable_partition( + std::begin( SectionLoadVisibility ), std::end( SectionLoadVisibility ), + []( section_visibility const §ion ) { + return ( + ( section.submodel->pName.find( "compartment" ) == 0 ) + || ( section.submodel->pName.find( "przedzial" ) == 0 ) ); } ); } /* @@ -3907,7 +3951,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, std::string asFileName = BaseDir + TypeName + ".mmd"; std::string asLoadName; if( false == MoverParameters->LoadType.empty() ) { - asLoadName = BaseDir + MoverParameters->LoadType + ".t3d"; + asLoadName = BaseDir + MoverParameters->LoadType; } std::string asAnimName; diff --git a/DynObj.h b/DynObj.h index 2cbe2230..9d48f188 100644 --- a/DynObj.h +++ b/DynObj.h @@ -201,6 +201,7 @@ public: struct section_visibility { TSubModel *submodel; bool visible; + int visible_chunks; }; std::vector SectionLoadVisibility; // visibility of specific sections of the load 3d model @@ -468,6 +469,7 @@ private: void LoadUpdate(); void update_load_sections(); void update_load_visibility(); + void shuffle_load_sections(); bool Update(double dt, double dt1); bool FastUpdate(double dt); void Move(double fDistance); diff --git a/Model3d.cpp b/Model3d.cpp index f232eb02..697c3552 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -725,6 +725,25 @@ void TSubModel::NextAdd(TSubModel *SubModel) Next = SubModel; }; +int TSubModel::count_siblings() { + + auto siblingcount { 0 }; + auto *sibling { Next }; + while( sibling != nullptr ) { + ++siblingcount; + sibling = sibling->Next; + } + return siblingcount; +} + +int TSubModel::count_children() { + + return ( + Child == nullptr ? + 0 : + 1 + Child->count_siblings() ); +} + int TSubModel::FlagsCheck() { // analiza koniecznych zmian pomiędzy submodelami // samo pomijanie glBindTexture() nie poprawi wydajności diff --git a/Model3d.h b/Model3d.h index b7ee145f..73e18d8d 100644 --- a/Model3d.h +++ b/Model3d.h @@ -160,6 +160,8 @@ public: void NextAdd(TSubModel *SubModel); TSubModel * NextGet() { return Next; }; TSubModel * ChildGet() { return Child; }; + int count_siblings(); + int count_children(); int TriangleAdd(TModel3d *m, material_handle tex, int tri); void SetRotate(float3 vNewRotateAxis, float fNewAngle); void SetRotateXYZ( Math3D::vector3 vNewAngles); diff --git a/station.cpp b/station.cpp index 2e4a7a98..601efe6f 100644 --- a/station.cpp +++ b/station.cpp @@ -46,6 +46,12 @@ basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Sch if( parameters.LoadType == "passengers" ) { // NOTE: for the time being we're doing simple, random load change calculation // TODO: exchange driven by station parameters and time of the day + auto unloadcount = static_cast( + firststop ? 0 : + laststop ? parameters.Load : + std::min( + parameters.Load, + Random( parameters.MaxLoad * 0.10 * stationsizemodifier ) ) ); auto loadcount = static_cast( laststop ? 0 : @@ -54,16 +60,11 @@ basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Sch // slightly larger group at the initial station loadcount *= 2; } - auto unloadcount = static_cast( - firststop ? 0 : - laststop ? parameters.Load : - Random( parameters.MaxLoad * 0.10 * stationsizemodifier ) ); - - parameters.Load = clamp( parameters.Load + loadcount - unloadcount, 0, parameters.MaxLoad ); + parameters.Load = std::min( parameters.MaxLoad, parameters.Load - unloadcount + loadcount ); vehicle->LoadUpdate(); vehicle->update_load_visibility(); - exchangetime = std::max( exchangetime, loadcount / parameters.LoadSpeed + unloadcount / parameters.UnLoadSpeed ); + exchangetime = std::max( exchangetime, unloadcount / parameters.UnLoadSpeed + loadcount / parameters.LoadSpeed); } vehicle = vehicle->Next(); } From da9b1431ea53353d4634ad6a370aff86ad117aca Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 21 Feb 2018 23:13:06 +0100 Subject: [PATCH 281/426] fog color calculation fix --- Globals.h | 2 +- World.cpp | 14 +++++++------- renderer.cpp | 33 ++++++++++++++++++++++++++++++++- skydome.cpp | 14 ++++++++------ skydome.h | 4 +++- 5 files changed, 51 insertions(+), 16 deletions(-) diff --git a/Globals.h b/Globals.h index 59a8a487..7a86dcfe 100644 --- a/Globals.h +++ b/Globals.h @@ -68,7 +68,7 @@ struct global_settings { float fFriction{ 1.f }; // mnożnik tarcia - KURS90 bool bLiveTraction{ true }; float Overcast{ 0.1f }; // NOTE: all this weather stuff should be moved elsewhere - GLfloat FogColor[ 3 ] = { 0.6f, 0.7f, 0.8f }; + glm::vec3 FogColor = { 0.6f, 0.7f, 0.8f }; double fFogStart{ 1700 }; double fFogEnd{ 2000 }; std::string Season{}; // season of the year, based on simulation date diff --git a/World.cpp b/World.cpp index 952d2e41..d39c2d79 100644 --- a/World.cpp +++ b/World.cpp @@ -1587,7 +1587,8 @@ TWorld::Update_UI() { Acc = ( vehicle->MoverParameters->Vel - VelPrev ) / 3.6; VelPrev = vehicle->MoverParameters->Vel; } - uitextline2 += ( "; As=" ) + to_string( Acc, 2 ); // przyspieszenie wzdłużne + uitextline2 += "; As=" + to_string( Acc, 2 ); // przyspieszenie wzdłużne + uitextline2 += " eAngle=" + to_string( std::cos( vehicle->MoverParameters->eAngle ), 2 ); uitextline3 = "cyl.ham. " + to_string( vehicle->MoverParameters->BrakePress, 2 ) @@ -2214,17 +2215,16 @@ world_environment::update() { // tonal impact of skydome color is inversely proportional to how high the sun is above the horizon // (this is pure conjecture, aimed more to 'look right' than be accurate) float const ambienttone = clamp( 1.0f - ( Global.SunAngle / 90.0f ), 0.0f, 1.0f ); - Global.DayLight.ambient[ 0 ] = interpolate( skydomehsv.z, skydomecolour.x, ambienttone ); - Global.DayLight.ambient[ 1 ] = interpolate( skydomehsv.z, skydomecolour.y, ambienttone ); - Global.DayLight.ambient[ 2 ] = interpolate( skydomehsv.z, skydomecolour.z, ambienttone ); + Global.DayLight.ambient[ 0 ] = interpolate( skydomehsv.z, skydomecolour.r, ambienttone ); + Global.DayLight.ambient[ 1 ] = interpolate( skydomehsv.z, skydomecolour.g, ambienttone ); + Global.DayLight.ambient[ 2 ] = interpolate( skydomehsv.z, skydomecolour.b, ambienttone ); Global.fLuminance = intensity; // update the fog. setting it to match the average colour of the sky dome is cheap // but quite effective way to make the distant items blend with background better - Global.FogColor[ 0 ] = skydomecolour.x; - Global.FogColor[ 1 ] = skydomecolour.y; - Global.FogColor[ 2 ] = skydomecolour.z; + // NOTE: base brightness calculation provides scaled up value, so we bring it back to 'real' one here + Global.FogColor = m_skydome.GetAverageHorizonColor(); } void diff --git a/renderer.cpp b/renderer.cpp index 16798f5f..ef68f662 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1027,7 +1027,7 @@ opengl_renderer::setup_drawing( bool const Alpha ) { // setup fog if( Global.fFogEnd > 0 ) { // fog setup - ::glFogfv( GL_FOG_COLOR, Global.FogColor ); + ::glFogfv( GL_FOG_COLOR, glm::value_ptr( Global.FogColor ) ); ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / Global.fFogEnd ) ); ::glEnable( GL_FOG ); } @@ -1808,6 +1808,37 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator Render( memcell ); } } +#endif +#ifdef EU07_USE_DEBUG_CULLING + // debug + ::glLineWidth( 2.f ); + float const width = cell->m_area.radius; + float const height = cell->m_area.radius * 0.2f; + glDisable( GL_LIGHTING ); + glDisable( GL_TEXTURE_2D ); + glColor3ub( 255, 128, 128 ); + glBegin( GL_LINE_LOOP ); + glVertex3f( -width, height, width ); + glVertex3f( -width, height, -width ); + glVertex3f( width, height, -width ); + glVertex3f( width, height, width ); + glEnd(); + glBegin( GL_LINE_LOOP ); + glVertex3f( -width, 0, width ); + glVertex3f( -width, 0, -width ); + glVertex3f( width, 0, -width ); + glVertex3f( width, 0, width ); + glEnd(); + glBegin( GL_LINES ); + glVertex3f( -width, height, width ); glVertex3f( -width, 0, width ); + glVertex3f( -width, height, -width ); glVertex3f( -width, 0, -width ); + glVertex3f( width, height, -width ); glVertex3f( width, 0, -width ); + glVertex3f( width, height, width ); glVertex3f( width, 0, width ); + glEnd(); + glColor3ub( 255, 255, 255 ); + glEnable( GL_TEXTURE_2D ); + glEnable( GL_LIGHTING ); + glLineWidth( 1.f ); #endif // post-render cleanup ::glPopMatrix(); diff --git a/skydome.cpp b/skydome.cpp index 35d20491..a4f426ad 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -243,7 +243,7 @@ void CSkyDome::RebuildColors() { zenithluminance = PerezFunctionO1( perezluminance, m_thetasun, zenithluminance ); // start with fresh average for the new pass - glm::vec3 averagecolor { 0.0f, 0.0f, 0.0f }; + glm::vec3 averagecolor, averagehorizoncolor; // trough all vertices glm::vec3 vertex; @@ -333,14 +333,16 @@ void CSkyDome::RebuildColors() { } // save m_colours[ i ] = color; - averagecolor += color * 8.0f; // save for edge cases each vertex goes in 8 triangles + averagecolor += color; + if( ( m_vertices.size() - i ) <= ( m_tesselation * 2 ) ) { + // calculate horizon colour from the bottom band of tris + averagehorizoncolor += color; + } } // NOTE: average reduced to 25% makes nice tint value for clouds lit from behind // down the road we could interpolate between it and full strength average, to improve accuracy of cloud appearance - m_averagecolour = averagecolor / static_cast( m_indices.size() ); - m_averagecolour.r = std::max( m_averagecolour.r, 0.0f ); - m_averagecolour.g = std::max( m_averagecolour.g, 0.0f ); - m_averagecolour.b = std::max( m_averagecolour.b, 0.0f ); + m_averagecolour = glm::max( glm::vec3(), averagecolor / static_cast( m_vertices.size() ) ); + m_averagehorizoncolour = glm::max( glm::vec3(), averagehorizoncolor / static_cast( m_tesselation * 2 ) ); if( m_coloursbuffer != -1 ) { // the colour buffer was already initialized, so on this run we update its content diff --git a/skydome.h b/skydome.h index e515bc3e..9b867499 100644 --- a/skydome.h +++ b/skydome.h @@ -23,7 +23,8 @@ public: void Render(); // retrieves average colour of the sky dome - glm::vec3 GetAverageColor() { return m_averagecolour; } + glm::vec3 GetAverageColor() { return m_averagecolour * 8.f / 6.f; } + glm::vec3 GetAverageHorizonColor() { return m_averagehorizoncolour; } private: // shading parametrs @@ -35,6 +36,7 @@ private: float m_overcast; float m_gammacorrection; glm::vec3 m_averagecolour; + glm::vec3 m_averagehorizoncolour; // data int const m_tesselation; From 0afa709249dee69e693904541034d3d85d0a0b2f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 21 Feb 2018 23:23:05 +0100 Subject: [PATCH 282/426] engine revolutions based cab shake, pantograph control tweaks --- McZapkie/MOVER.h | 2 +- McZapkie/Mover.cpp | 6 ++-- Spring.cpp | 2 +- Train.cpp | 89 +++++++++++++++++++++++++++++----------------- 4 files changed, 62 insertions(+), 37 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 9ba10588..c72285f9 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1021,7 +1021,7 @@ public: int PulseForceCount = 0; /*dla drezyny, silnika spalinowego i parowego*/ - double eAngle = 1.5; + double eAngle = M_PI * 0.5; /*-dla wagonow*/ double Load = 0.0; /*masa w T lub ilosc w sztukach - zaladowane*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 573f9434..8e6aa671 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8517,7 +8517,8 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C else if (Command == "PantFront") /*Winger 160204*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów // Czemu EZT ma być traktowane inaczej? Ukrotnienie ma, a człon może być odwrócony - if ((TrainType == dt_EZT)) + if ((TrainType == dt_EZT) + || (TrainType == dt_ET41)) { //'ezt' if ((CValue1 == 1)) { @@ -8561,7 +8562,8 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "PantRear") /*Winger 160204, ABu 310105 i 030305*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów - if ((TrainType == dt_EZT)) + if ((TrainType == dt_EZT) + ||(TrainType == dt_ET41)) { //'ezt' if ((CValue1 == 1)) { diff --git a/Spring.cpp b/Spring.cpp index 8a665677..daabb246 100644 --- a/Spring.cpp +++ b/Spring.cpp @@ -41,7 +41,7 @@ Math3D::vector3 TSpring::ComputateForces( Math3D::vector3 const &pPosition1, Mat // dist = VectorLength(&deltaP); // Magnitude of // deltaP dist = deltaP.Length(); - if (dist != 0.0 ) { + if( dist > 0.00001 ) { // Hterm = (dist - spring->restLen) * spring->Ks; // Ks * (dist - rest) Hterm = ( dist - restLen ) * Ks; // Ks * (dist - rest) diff --git a/Train.cpp b/Train.cpp index e6cf14b3..55762be9 100644 --- a/Train.cpp +++ b/Train.cpp @@ -3654,31 +3654,51 @@ void TTrain::UpdateMechPosition(double dt) // Granice mozna ustalic doswiadczalnie. Ja proponuje 14:20 double const iVel = std::min( DynamicObject->GetVelocity(), 150.0 ); - if( !Global.iSlowMotion // musi być pełna prędkość - && ( pMechOffset.y < 4.0 ) ) // Ra 15-01: przy oglądaniu pantografu bujanie przeszkadza + if( ( false == Global.iSlowMotion ) // musi być pełna prędkość + && ( pMechOffset.y < 4.0 ) ) // Ra 15-01: przy oglądaniu pantografu bujanie przeszkadza { + Math3D::vector3 shakevector; + if( ( mvOccupied->EngineType == DieselElectric ) + || ( mvOccupied->EngineType == DieselEngine ) ) { + if( std::abs( mvOccupied->enrot ) > 0.0 ) { + // engine vibration + shakevector.x += + ( std::cos( mvOccupied->eAngle * 4.0 ) * dt * 2.0 ) + // fade in with rpm < 300 + * clamp( + ( mvOccupied->enrot - 1.0 ) * 0.25, + 0.0, 1.0 ) + // fade out with rpm > 600 + * interpolate( + 1.0, 0.0, + clamp( + mvOccupied->enrot - 10.0, + 0.0, 1.0 ) ); + } + } if( iVel > 0.5 ) { // acceleration-driven base shake - shake += 1.25 * MechSpring.ComputateForces( - Math3D::vector3( - -mvControlled->AccN * dt * 5.0, // highlight side sway - -mvControlled->AccVert * dt, - -mvControlled->AccSVBased * dt * 1.25 ), // accent acceleration/deceleration - pMechShake ); - - if( Random( iVel ) > 25.0 ) { - // extra shake at increased velocity - shake += MechSpring.ComputateForces( - Math3D::vector3( - ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringX, - ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringY, - ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringZ ) - * 1.25, - pMechShake ); - // * (( 200 - DynamicObject->MyTrack->iQualityFlag ) * 0.0075 ); // scale to 75-150% based on track quality - } -// shake *= 0.85; + shakevector += Math3D::vector3( + -mvOccupied->AccN * dt * 5.0, // highlight side sway + -mvOccupied->AccVert * dt, + -mvOccupied->AccSVBased * dt * 1.25 ); // accent acceleration/deceleration } + + shake += 1.25 * MechSpring.ComputateForces( shakevector, pMechShake ); + + if( Random( iVel ) > 25.0 ) { + // extra shake at increased velocity + shake += MechSpring.ComputateForces( + Math3D::vector3( + ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringX, + ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringY, + ( Random( iVel * 2 ) - iVel ) / ( ( iVel * 2 ) * 4 ) * fMechSpringZ ) + * 1.25, + pMechShake ); + // * (( 200 - DynamicObject->MyTrack->iQualityFlag ) * 0.0075 ); // scale to 75-150% based on track quality + } + shake *= 0.85; + vMechVelocity -= ( shake + vMechVelocity * 100 ) * ( fMechSpringX + fMechSpringY + fMechSpringZ ) / ( 200 ); // shake *= 0.95 * dt; // shake damping @@ -4829,17 +4849,20 @@ bool TTrain::Update( double const Deltatime ) // NOTE: crude way to have the pantographs go back up if they're dropped due to insufficient pressure etc // TODO: rework it into something more elegant, when redoing the whole consist/unit/cab etc arrangement - if( ( mvControlled->Battery ) - || ( mvControlled->ConverterFlag ) ) { - if( ggPantAllDownButton.GetDesiredValue() < 0.05 ) { - // the 'lower all' button overrides state of switches, while active itself - if( ( false == mvControlled->PantFrontUp ) - && ( ggPantFrontButton.GetDesiredValue() >= 0.95 ) ) { - mvControlled->PantFront( true ); - } - if( ( false == mvControlled->PantRearUp ) - && ( ggPantRearButton.GetDesiredValue() >= 0.95 ) ) { - mvControlled->PantRear( true ); + if( false == DynamicObject->Mechanik->AIControllFlag ) { + // don't mess with the ai driving, at least not while switches don't follow ai-set vehicle state + if( ( mvControlled->Battery ) + || ( mvControlled->ConverterFlag ) ) { + if( ggPantAllDownButton.GetDesiredValue() < 0.05 ) { + // the 'lower all' button overrides state of switches, while active itself + if( ( false == mvControlled->PantFrontUp ) + && ( ggPantFrontButton.GetDesiredValue() >= 0.95 ) ) { + mvControlled->PantFront( true ); + } + if( ( false == mvControlled->PantRearUp ) + && ( ggPantRearButton.GetDesiredValue() >= 0.95 ) ) { + mvControlled->PantRear( true ); + } } } } @@ -4869,7 +4892,7 @@ bool TTrain::Update( double const Deltatime ) m_radiomessages.erase( std::remove_if( std::begin( m_radiomessages ), std::end( m_radiomessages ), - []( sound_source &source ) { + []( sound_source const &source ) { return ( false == source.is_playing() ); } ), std::end( m_radiomessages ) ); } From 89f76ff0e28c915678262cf695ef7f3c297a2547 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 24 Feb 2018 02:35:37 +0100 Subject: [PATCH 283/426] per-vehicle wheel flat definition support --- DynObj.cpp | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 255fc17c..951c0d7c 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1811,8 +1811,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" { size_t dlugosc = MoreParams.length(); ActPar = ToUpper(MoreParams.substr(0, kropka)); // pierwszy parametr; - MoreParams = MoreParams.substr(kropka + 1, dlugosc - kropka); // reszta do dalszej - // obrobki + MoreParams = MoreParams.substr(kropka + 1, dlugosc - kropka); // reszta do dalszej obrobki kropka = MoreParams.find("."); if (ActPar.substr(0, 1) == "B") // jesli hamulce @@ -1924,6 +1923,41 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" { } } // koniec hamulce + else if( ( ActPar.size() >= 3 ) + && ( ActPar.substr( 0, 2 ) == "WF" ) ) { + // wheel flat + // TODO: convert this whole mess to something more elegant one day + ActPar.erase( 0, 2 ); + auto fixedflatsize { 0 }; + { + // fixed size flat + auto const indexend { ActPar.find_first_not_of( "1234567890", 0 ) }; + fixedflatsize = std::atoi( ActPar.substr( 0, indexend ).c_str() ); + ActPar.erase( 0, indexend ); + } + // optional parameters + auto randomflatsize { 0 }; + auto randomflatchance { 100 }; + while( false == ActPar.empty() ) { + if( ActPar[ 0 ] == 'R' ) { + // random flat size + auto const indexstart { 1 }; + auto const indexend { ActPar.find_first_not_of( "1234567890", indexstart ) }; + randomflatsize = std::atoi( ActPar.substr( indexstart, indexend ).c_str() ); + ActPar.erase( 0, indexend ); + } + else if( ActPar[ 0 ] == 'P' ) { + // random flat probability + auto const indexstart { 1 }; + auto const indexend { ActPar.find_first_not_of( "1234567890", indexstart ) }; + randomflatchance = std::atoi( ActPar.substr( indexstart, indexend ).c_str() ); + ActPar.erase( 0, indexend ); + } + } + if( Random(0, 100) <= randomflatchance ) { + MoverParameters->WheelFlat += fixedflatsize + Random( 0, randomflatsize ); + } + } /* else if (ActPar.substr(0, 1) == "") // tu mozna wpisac inny prefiks i inne rzeczy { // jakies inne prefiksy From f3b7198246b2805686e5befd8823c1a87d5cc1ad Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 24 Feb 2018 02:38:02 +0100 Subject: [PATCH 284/426] engine revolution based cab shake configuration support, rear cab door controls animation fix --- Spring.cpp | 44 ++++++++++--------------------------------- Spring.h | 25 +++++++++++-------------- Train.cpp | 55 ++++++++++++++++++++++++++++++++++-------------------- Train.h | 7 +++++++ World.cpp | 11 +++++++---- 5 files changed, 70 insertions(+), 72 deletions(-) diff --git a/Spring.cpp b/Spring.cpp index daabb246..587be4f7 100644 --- a/Spring.cpp +++ b/Spring.cpp @@ -10,48 +10,31 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Spring.h" -TSpring::TSpring() -{ - vForce1 = vForce2 = Math3D::vector3(0, 0, 0); - Ks = 0; - Kd = 0; - restLen = 0; -} - -TSpring::~TSpring() -{ -} - -void TSpring::Init(double nrestLen, double nKs, double nKd) -{ +void TSpring::Init(double nKs, double nKd) { Ks = nKs; Kd = nKd; - restLen = nrestLen; } -Math3D::vector3 TSpring::ComputateForces( Math3D::vector3 const &pPosition1, Math3D::vector3 const &pPosition2) -{ +Math3D::vector3 TSpring::ComputateForces( Math3D::vector3 const &pPosition1, Math3D::vector3 const &pPosition2) { - double dist, Hterm, Dterm; - Math3D::vector3 springForce, deltaV; + Math3D::vector3 springForce; // p1 = &system[spring->p1]; // p2 = &system[spring->p2]; // VectorDifference(&p1->pos,&p2->pos,&deltaP); // Vector distance auto deltaP = pPosition1 - pPosition2; - // dist = VectorLength(&deltaP); // Magnitude of - // deltaP - dist = deltaP.Length(); - if( dist > 0.00001 ) { + // dist = VectorLength(&deltaP); // Magnitude of deltaP + auto dist = deltaP.Length(); + if( dist > restLen ) { // Hterm = (dist - spring->restLen) * spring->Ks; // Ks * (dist - rest) - Hterm = ( dist - restLen ) * Ks; // Ks * (dist - rest) + auto Hterm = ( dist - restLen ) * Ks; // Ks * (dist - rest) // VectorDifference(&p1->v,&p2->v,&deltaV); // Delta Velocity Vector - deltaV = pPosition1 - pPosition2; + auto deltaV = pPosition1 - pPosition2; // Dterm = (DotProduct(&deltaV,&deltaP) * spring->Kd) / dist; // Damping Term - // Dterm = (DotProduct(deltaV,deltaP) * Kd) / dist; - Dterm = 0; + auto Dterm = (DotProduct(deltaV,deltaP) * Kd) / dist; + //Dterm = 0; // ScaleVector(&deltaP,1.0f / dist, &springForce); // Normalize Distance Vector // ScaleVector(&springForce,-(Hterm + Dterm),&springForce); // Calc Force @@ -60,14 +43,7 @@ Math3D::vector3 TSpring::ComputateForces( Math3D::vector3 const &pPosition1, Mat // VectorDifference(&p2->f,&springForce,&p2->f); // - Force on Particle 2 } - vForce1 = springForce; - vForce2 = springForce; - return springForce; } -void TSpring::Render() -{ -} - //--------------------------------------------------------------------------- diff --git a/Spring.h b/Spring.h index 46c78d72..30fd0a1b 100644 --- a/Spring.h +++ b/Spring.h @@ -11,9 +11,8 @@ http://mozilla.org/MPL/2.0/. #define ParticlesH #include "dumb3d.h" - +/* #define STATIC_THRESHOLD 0.17f -// efine STATIC_THRESHOLD 0.03f const double m_Kd = 0.02f; // DAMPING FACTOR const double m_Kr = 0.8f; // 1.0 = SUPERBALL BOUNCE 0.0 = DEAD WEIGHT const double m_Ksh = 5.0f; // HOOK'S SPRING CONSTANT @@ -21,22 +20,20 @@ const double m_Ksd = 0.1f; // SPRING DAMPING CONSTANT const double m_Csf = 0.9f; // Default Static Friction const double m_Ckf = 0.7f; // Default Kinetic Friction +*/ +class TSpring { -class TSpring -{ - public: - TSpring(); - ~TSpring(); +public: + TSpring() = default; // void Init(TParticnp1, TParticle *np2, double nKs= 0.5f, double nKd= 0.002f, // double nrestLen= -1.0f); - void Init(double nrestLen, double nKs = 0.5f, double nKd = 0.002f); + void Init(double nKs = 0.5f, double nKd = 0.002f); Math3D::vector3 ComputateForces( Math3D::vector3 const &pPosition1, Math3D::vector3 const &pPosition2); - void Render(); - Math3D::vector3 vForce1, vForce2; - double restLen; // LENGTH OF SPRING AT REST - double Ks; // SPRING CONSTANT - double Kd; // SPRING DAMPING - private: +private: +// members + double restLen { 0.01 }; // LENGTH OF SPRING AT REST + double Ks { 0.0 }; // SPRING CONSTANT + double Kd { 0.0 }; // SPRING DAMPING }; //--------------------------------------------------------------------------- diff --git a/Train.cpp b/Train.cpp index 55762be9..1f7ab494 100644 --- a/Train.cpp +++ b/Train.cpp @@ -375,7 +375,7 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) } } */ - MechSpring.Init(0.015, 250); + MechSpring.Init(250); vMechVelocity = Math3D::vector3(0, 0, 0); pMechOffset = Math3D::vector3( 0, 0, 0 ); fMechSpringX = 1; @@ -3299,9 +3299,10 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman } } else { - // in the rear cab sides are reversed + // in the rear cab sides are reversed... if( Train->mvOccupied->DoorRight( true ) ) { - Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); + // ...but so are the switches + Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); } } } @@ -3313,9 +3314,10 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman } } else { - // in the rear cab sides are reversed + // in the rear cab sides are reversed... if( Train->mvOccupied->DoorRight( false ) ) { - Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); + // ...but so are the switches + Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -3340,9 +3342,10 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma } } else { - // in the rear cab sides are reversed + // in the rear cab sides are reversed... if( Train->mvOccupied->DoorLeft( true ) ) { - Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); + // ...but so are the switches + Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); } } } @@ -3354,9 +3357,10 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma } } else { - // in the rear cab sides are reversed + // in the rear cab sides are reversed... if( Train->mvOccupied->DoorLeft( false ) ) { - Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); + // ...but so are the switches + Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } @@ -3659,20 +3663,20 @@ void TTrain::UpdateMechPosition(double dt) { Math3D::vector3 shakevector; if( ( mvOccupied->EngineType == DieselElectric ) - || ( mvOccupied->EngineType == DieselEngine ) ) { + || ( mvOccupied->EngineType == DieselEngine ) ) { if( std::abs( mvOccupied->enrot ) > 0.0 ) { // engine vibration shakevector.x += - ( std::cos( mvOccupied->eAngle * 4.0 ) * dt * 2.0 ) - // fade in with rpm < 300 + ( std::cos( mvOccupied->eAngle * 4.0 ) * dt * EngineShake.scale ) + // fade in with rpm above threshold * clamp( - ( mvOccupied->enrot - 1.0 ) * 0.25, + ( mvOccupied->enrot - EngineShake.fadein_offset ) * EngineShake.fadein_factor, 0.0, 1.0 ) - // fade out with rpm > 600 + // fade out with rpm above threshold * interpolate( 1.0, 0.0, clamp( - mvOccupied->enrot - 10.0, + ( mvOccupied->enrot - EngineShake.fadeout_offset ) * EngineShake.fadeout_factor, 0.0, 1.0 ) ); } } @@ -3704,20 +3708,22 @@ void TTrain::UpdateMechPosition(double dt) // McZapkie: pMechShake += vMechVelocity * dt; + if( ( pMechShake.y > fMechMaxSpring ) + || ( pMechShake.y < -fMechMaxSpring ) ) { + vMechVelocity.y = -vMechVelocity.y; + } // Ra 2015-01: dotychczasowe rzucanie pMechOffset += vMechMovement * dt; - if( ( pMechShake.y > fMechMaxSpring ) || ( pMechShake.y < -fMechMaxSpring ) ) - vMechVelocity.y = -vMechVelocity.y; // ABu011104: 5*pMechShake.y, zeby ladnie pudlem rzucalo :) pMechPosition = pMechOffset + Math3D::vector3( 1.5 * pMechShake.x, 2.0 * pMechShake.y, 1.5 * pMechShake.z ); -// vMechMovement = 0.5 * vMechMovement; + +// pMechShake = interpolate( pMechShake, Math3D::vector3(), clamp( dt, 0.0, 1.0 ) ); } else { // hamowanie rzucania przy spadku FPS pMechShake -= pMechShake * std::min( dt, 1.0 ); // po tym chyba potrafią zostać jakieś ułamki, które powodują zjazd pMechOffset += vMechMovement * dt; vMechVelocity.y = 0.5 * vMechVelocity.y; pMechPosition = pMechOffset + Math3D::vector3( pMechShake.x, 5 * pMechShake.y, pMechShake.z ); -// vMechMovement = 0.5 * vMechMovement; } // numer kabiny (-1: kabina B) if( DynamicObject->Mechanik ) // może nie być? @@ -5328,7 +5334,7 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) parser >> ks >> kd; - MechSpring.Init(MechSpring.restLen, ks, kd); + MechSpring.Init(ks, kd); parser.getTokens(6, false); parser >> fMechSpringX @@ -5338,6 +5344,15 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) >> fMechRoll >> fMechPitch; } + else if( token == "enginespring:" ) { + parser.getTokens( 5, false ); + parser + >> EngineShake.scale + >> EngineShake.fadein_offset + >> EngineShake.fadein_factor + >> EngineShake.fadeout_offset + >> EngineShake.fadeout_factor; + } } while (token != ""); } diff --git a/Train.h b/Train.h index df9f2ac3..be519f27 100644 --- a/Train.h +++ b/Train.h @@ -501,6 +501,13 @@ public: // reszta może by?publiczna double fMechMaxSpring; double fMechRoll; double fMechPitch; + struct engineshake_config { + float scale { 2.f }; + float fadein_offset { 1.5f }; + float fadein_factor { 0.3f }; + float fadeout_offset { 10.f }; + float fadeout_factor { 0.5f }; + } EngineShake; sound_source dsbReverserKey { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // hunter-121211 sound_source dsbNastawnikJazdy { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; diff --git a/World.cpp b/World.cpp index d39c2d79..17518151 100644 --- a/World.cpp +++ b/World.cpp @@ -1064,10 +1064,13 @@ TWorld::Update_Camera( double const Deltatime ) { else { // patrzenie standardowe Camera.Pos = Train->GetWorldMechPosition(); // Train.GetPosition1(); - if( !Global.iPause ) { // podczas pauzy nie przeliczać kątów przypadkowymi wartościami - Camera.Roll = atan( Train->pMechShake.x * Train->fMechRoll ); // hustanie kamery na boki - Camera.Pitch -= 0.5 * atan( Train->vMechVelocity.z * Train->fMechPitch ); // hustanie kamery przod tyl //Ra: tu - // jest uciekanie kamery w górę!!! + if( !Global.iPause ) { + // podczas pauzy nie przeliczać kątów przypadkowymi wartościami + // hustanie kamery na boki + Camera.Roll = atan( Train->vMechVelocity.x * Train->fMechRoll ); + // hustanie kamery przod tyl + // Ra: tu jest uciekanie kamery w górę!!! + Camera.Pitch -= 0.5 * atan( Train->vMechVelocity.z * Train->fMechPitch ); } // ABu011104: rzucanie pudlem /* From 7440b1d902aa8511b3a15e9e45a4b4ff5cc700a1 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 24 Feb 2018 02:38:41 +0100 Subject: [PATCH 285/426] passenger stop departure horn fix --- Driver.cpp | 28 ++++++++++++++++------------ uilayer.cpp | 35 ++++++++++++++--------------------- version.h | 2 +- 3 files changed, 31 insertions(+), 34 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 52585c06..0dc1d019 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -919,7 +919,11 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } if (TrainParams->UpdateMTable( simulation::Time, asNextStop) ) { // to się wykona tylko raz po zatrzymaniu na W4 - + if( TrainParams->StationIndex < TrainParams->StationCount ) { + // jeśli są dalsze stacje, bez trąbienia przed odjazdem + // also ignore any horn cue that may be potentially set below 1 km/h and before the actual full stop + iDrivigFlags &= ~( moveStartHorn | moveStartHornNow ); + } // perform loading/unloading auto const exchangetime { simulation::Station.update_load( pVehicles[ 0 ], *TrainParams ) }; // TBD: adjust time to load exchange size @@ -947,6 +951,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // przyjazd o czasie iDrivigFlags &= ~moveLate; } + if (TrainParams->DirectionChange()) { // jeśli "@" w rozkładzie, to wykonanie dalszych komend // wykonanie kolejnej komendy, nie dotyczy ostatniej stacji @@ -985,7 +990,6 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } if (TrainParams->StationIndex < TrainParams->StationCount) { // jeśli są dalsze stacje, czekamy do godziny odjazdu - if (TrainParams->IsTimeToGo(simulation::Time.data().wHour, simulation::Time.data().wMinute)) { // z dalszą akcją czekamy do godziny odjazdu /* potencjalny problem z ruszaniem z w4 @@ -1008,16 +1012,16 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN + ": at " + std::to_string(simulation::Time.data().wHour) + ":" + std::to_string(simulation::Time.data().wMinute) + " next " + asNextStop); // informacja #endif - if (int(floor(sSpeedTable[i].evEvent->ValueGet(1))) & 1) - iDrivigFlags |= moveStopHere; // nie podjeżdżać do semafora, - // jeśli droga nie jest wolna - else - iDrivigFlags &= ~moveStopHere; //po czasie jedź dalej - iDrivigFlags |= moveStopCloser; // do następnego W4 podjechać - // blisko (z dociąganiem) - iDrivigFlags &= ~moveStartHorn; // bez trąbienia przed odjazdem - sSpeedTable[i].iFlags = - 0; // nie liczy się już zupełnie (nie wyśle SetVelocity) + if( int( floor( sSpeedTable[ i ].evEvent->ValueGet( 1 ) ) ) & 1 ) { + // nie podjeżdżać do semafora, jeśli droga nie jest wolna + iDrivigFlags |= moveStopHere; + } + else { + //po czasie jedź dalej + iDrivigFlags &= ~moveStopHere; + } + iDrivigFlags |= moveStopCloser; // do następnego W4 podjechać blisko (z dociąganiem) + sSpeedTable[i].iFlags = 0; // nie liczy się już zupełnie (nie wyśle SetVelocity) sSpeedTable[i].fVelNext = -1; // można jechać za W4 if (go == cm_Unknown) // jeśli nie było komendy wcześniej go = cm_Ready; // gotów do odjazdu z W4 (semafor może diff --git a/uilayer.cpp b/uilayer.cpp index c857866e..c5b218e2 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -74,12 +74,22 @@ ui_layer::render() { glDisable( GL_LIGHTING ); glDisable( GL_DEPTH_TEST ); glDisable( GL_ALPHA_TEST ); - glEnable( GL_BLEND ); + glEnable( GL_TEXTURE_2D ); + glEnable( GL_BLEND ); + + ::glColor4fv( glm::value_ptr( colors::white ) ); // render code here render_background(); render_texture(); + + glDisable( GL_TEXTURE_2D ); + glDisable( GL_TEXTURE_CUBE_MAP ); + render_progress(); + + glDisable( GL_BLEND ); + render_panels(); render_tooltip(); @@ -113,9 +123,6 @@ ui_layer::render_progress() { if( (m_progress == 0.0f) && (m_subtaskprogress == 0.0f) ) return; - glPushAttrib( GL_ENABLE_BIT ); - glDisable( GL_TEXTURE_2D ); - glm::vec2 origin, size; if( m_progressbottom == true ) { origin = glm::vec2{ 0.0f, 768.0f - 20.0f }; @@ -161,8 +168,6 @@ ui_layer::render_progress() { ( 0.5f * ( Global.iWindowHeight - height ) + origin.y * heightratio ) + ( charsize ) + ( ( size.y * heightratio - textheight ) * 0.5f * heightratio ) ); print( m_progresstext ); } - - glPopAttrib(); } void @@ -170,9 +175,6 @@ ui_layer::render_panels() { if( m_panels.empty() ) { return; } - glPushAttrib( GL_ENABLE_BIT ); - glDisable( GL_TEXTURE_2D ); - float const width = std::min( 4.f / 3.f, static_cast(Global.iWindowWidth) / std::max( 1, Global.iWindowHeight ) ) * Global.iWindowHeight; float const height = Global.iWindowHeight / 768.f; @@ -181,7 +183,7 @@ ui_layer::render_panels() { int lineidx = 0; for( auto const &line : panel->text_lines ) { - ::glColor4fv( &line.color.x ); + ::glColor4fv( glm::value_ptr( line.color ) ); ::glRasterPos2f( 0.5f * ( Global.iWindowWidth - width ) + panel->origin_x * height, panel->origin_y * height + 20.f * lineidx ); @@ -189,8 +191,6 @@ ui_layer::render_panels() { ++lineidx; } } - - glPopAttrib(); } void @@ -201,13 +201,9 @@ ui_layer::render_tooltip() { glm::dvec2 mousepos; glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); - glPushAttrib( GL_ENABLE_BIT ); - glDisable( GL_TEXTURE_2D ); - ::glColor4f( 1.0f, 1.0f, 1.0f, 1.0f ); + ::glColor4fv( glm::value_ptr( colors::white ) ); ::glRasterPos2f( mousepos.x + 20.0f, mousepos.y + 25.0f ); print( m_tooltip ); - - glPopAttrib(); } void @@ -236,8 +232,7 @@ void ui_layer::render_texture() { if( m_texture != 0 ) { - ::glColor4f( 1.f, 1.f, 1.f, 1.f ); - ::glDisable( GL_BLEND ); + ::glColor4fv( glm::value_ptr( colors::white ) ); GfxRenderer.Bind_Texture( null_handle ); ::glBindTexture( GL_TEXTURE_2D, m_texture ); @@ -255,8 +250,6 @@ ui_layer::render_texture() { glEnd(); ::glBindTexture( GL_TEXTURE_2D, 0 ); - - ::glEnable( GL_BLEND ); } } diff --git a/version.h b/version.h index ff584265..b579d2b0 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 215 +#define VERSION_MINOR 223 #define VERSION_REVISION 0 From b6206bc12cd091a7a3281f7820da3e5e616cfe3f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 1 Mar 2018 13:40:57 +0100 Subject: [PATCH 286/426] additional door control types, door operation tweaks, load exchange procedure enhancements, load exchange sounds --- Driver.cpp | 181 +++++++++++++++--------------------- Driver.h | 2 +- DynObj.cpp | 181 ++++++++++++++++++++++++++++++------ DynObj.h | 20 ++++ McZapkie/MOVER.h | 26 ++++-- McZapkie/Mover.cpp | 227 ++++++++++++++++++++++++++------------------- Train.cpp | 75 +++++++-------- station.cpp | 29 ++++-- station.h | 2 +- 9 files changed, 457 insertions(+), 286 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 0dc1d019..24ea9150 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -869,53 +869,15 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // jeśli długość peronu ((sSpeedTable[i].evEvent->ValueGet(2)) nie podana, // przyjąć odległość fMinProximityDist { // jeśli się zatrzymał przy W4, albo stał w momencie zobaczenia W4 - if (!AIControllFlag) // AI tylko sobie otwiera drzwi - iDrivigFlags &= ~moveStopCloser; // w razie przełączenia na AI ma - // nie podciągać do W4, gdy - // użytkownik zatrzymał za daleko - if ((iDrivigFlags & moveDoorOpened) == 0) - { // drzwi otwierać jednorazowo + if( !AIControllFlag ) { + // w razie przełączenia na AI ma nie podciągać do W4, gdy użytkownik zatrzymał za daleko + iDrivigFlags &= ~moveStopCloser; + } + + if( ( iDrivigFlags & moveDoorOpened ) == 0 ) { + // drzwi otwierać jednorazowo iDrivigFlags |= moveDoorOpened; // nie wykonywać drugi raz - if (mvOccupied->DoorOpenCtrl == 1) //(mvOccupied->TrainType==dt_EZT) - { // otwieranie drzwi w EZT - if (AIControllFlag) // tylko AI otwiera drzwi EZT, użytkownik - // musi samodzielnie - if (!mvOccupied->DoorLeftOpened && - !mvOccupied->DoorRightOpened) - { // otwieranie drzwi - int p2 = - int(floor(sSpeedTable[i].evEvent->ValueGet(2))) % - 10; // p7=platform side (1:left, 2:right, 3:both) - int lewe = (iDirection > 0) ? 1 : 2; // jeśli jedzie do tyłu, to drzwi otwiera odwrotnie - int prawe = (iDirection > 0) ? 2 : 1; - if (p2 & lewe) - mvOccupied->DoorLeft(true); - if (p2 & prawe) - mvOccupied->DoorRight(true); - } - } - else - { // otwieranie drzwi w składach wagonowych - docelowo wysyłać komendę zezwolenia na otwarcie drzwi - int p7, lewe, prawe; // p7=platform side (1:left, 2:right, 3:both) - // tu będzie jeszcze długość peronu zaokrąglona do 10m - // (20m bezpieczniej, bo nie modyfikuje bitu 1) - p7 = int(std::floor(sSpeedTable[i].evEvent->ValueGet(2))) % 10; - TDynamicObject *p = pVehicles[0]; // pojazd na czole składu - while (p) - { // otwieranie drzwi w pojazdach - flaga zezwolenia była by lepsza - // jeśli jedzie do tyłu, to drzwi otwiera odwrotnie - lewe = (p->DirectionGet() > 0) ? 1 : 2; - prawe = 3 - lewe; - // wagony muszą mieć baterię załączoną do otwarcia drzwi... - p->MoverParameters->BatterySwitch(true); - if (p7 & lewe) - p->MoverParameters->DoorLeft(true); - if (p7 & prawe) - p->MoverParameters->DoorRight(true); - // pojazd podłączony z tyłu (patrząc od czoła) - p = p->Next(); - } - } + Doors( true, static_cast( std::floor( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) % 10 ); } if (TrainParams->UpdateMTable( simulation::Time, asNextStop) ) { // to się wykona tylko raz po zatrzymaniu na W4 @@ -925,23 +887,9 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN iDrivigFlags &= ~( moveStartHorn | moveStartHornNow ); } // perform loading/unloading - auto const exchangetime { simulation::Station.update_load( pVehicles[ 0 ], *TrainParams ) }; - // TBD: adjust time to load exchange size - if( fStopTime > -55 ) { - // na końcu rozkładu się ustawia 60s i tu by było skrócenie -// WaitingSet( 15.0 + Random( 15.0 ) ); // 10 sekund (wziąć z rozkładu????) - czekanie - // with door open on both sides calculated loading time is halved - // p7=platform side (1:left, 2:right, 3:both) - auto const platformside = static_cast( std::floor( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) % 10; - WaitingSet( - platformside == 3 ? - exchangetime * 0.5 : - exchangetime ); - } - // update brake settings and ai braking tables - // NOTE: this calculation is run after completing loading/unloading - // remember to move it to a more fitting spot, when loading/unloading taks some actual time - AutoRewident(); // nastawianie hamulca do jazdy pociągowej + auto const platformside = static_cast( std::floor( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) % 10; + auto const exchangetime = simulation::Station.update_load( pVehicles[ 0 ], *TrainParams, platformside ); + WaitingSet( std::max( -fStopTime, exchangetime ) ); // na końcu rozkładu się ustawia 60s i tu by było skrócenie if( TrainParams->CheckTrainLatency() < 0.0 ) { // odnotowano spóźnienie @@ -1012,6 +960,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN + ": at " + std::to_string(simulation::Time.data().wHour) + ":" + std::to_string(simulation::Time.data().wMinute) + " next " + asNextStop); // informacja #endif + // update brake settings and ai braking tables + // NOTE: this calculation is expected to run after completing loading/unloading + AutoRewident(); // nastawianie hamulca do jazdy pociągowej + if( int( floor( sSpeedTable[ i ].evEvent->ValueGet( 1 ) ) ) & 1 ) { // nie podjeżdżać do semafora, jeśli droga nie jest wolna iDrivigFlags |= moveStopHere; @@ -2401,7 +2353,7 @@ bool TController::ReleaseEngine() ReactionTime = PrepareTime; if (AIControllFlag) { // jeśli steruje komputer - if (mvOccupied->DoorOpenCtrl == 1) + if (mvOccupied->DoorCloseCtrl == control::driver) { // zamykanie drzwi if (mvOccupied->DoorLeftOpened) mvOccupied->DoorLeft(false); @@ -3051,50 +3003,66 @@ void TController::SpeedSet() } }; -void TController::Doors(bool what) -{ // otwieranie/zamykanie drzwi w składzie albo (tylko AI) EZT - if (what) - { // otwarcie - } - else - { // zamykanie - if (mvOccupied->DoorOpenCtrl == 1) - { // jeśli drzwi sterowane z kabiny - if( AIControllFlag ) { - if( mvOccupied->DoorLeftOpened || mvOccupied->DoorRightOpened ) { - // AI zamyka drzwi przed odjazdem - if( ( true == mvOccupied->DoorClosureWarning ) - && ( false == mvOccupied->DepartureSignal ) - && ( true == TestFlag( iDrivigFlags, moveDoorOpened ) ) ) { - mvOccupied->signal_departure( true ); // załącenie bzyczka - fActionTime = -3.0 - 0.1 * Random( 10 ); // 3-4 second wait - } - if( fActionTime > -0.5 ) { - // Ra: trzeba by ustawić jakiś czas oczekiwania na zamknięcie się drzwi - mvOccupied->DoorLeft( false ); // zamykanie drzwi - mvOccupied->DoorRight( false ); - iDrivigFlags &= ~moveDoorOpened; - // 1.5-2.5 sec wait, +potentially 0.5 remaining - fActionTime = -1.5 - 0.1 * Random( 10 ); - } +// otwieranie/zamykanie drzwi w składzie albo (tylko AI) EZT +void TController::Doors( bool const Open, int const Side ) { + + if( true == Open ) { + // otwieranie drzwi + // otwieranie drzwi w składach wagonowych - docelowo wysyłać komendę zezwolenia na otwarcie drzwi + // tu będzie jeszcze długość peronu zaokrąglona do 10m (20m bezpieczniej, bo nie modyfikuje bitu 1) + // p7=platform side (1:left, 2:right, 3:both) + auto *vehicle = pVehicles[0]; // pojazd na czole składu + while( vehicle != nullptr ) { + // wagony muszą mieć baterię załączoną do otwarcia drzwi... + vehicle->MoverParameters->BatterySwitch( true ); + // otwieranie drzwi w pojazdach - flaga zezwolenia była by lepsza + if( vehicle->MoverParameters->DoorOpenCtrl != control::passenger ) { + // if the door are controlled by the driver, we let the user operate them... + if( true == AIControllFlag ) { + // ...unless this user is an ai + // p7=platform side (1:left, 2:right, 3:both) + // jeśli jedzie do tyłu, to drzwi otwiera odwrotnie + auto const lewe = ( vehicle->DirectionGet() > 0 ) ? 1 : 2; + auto const prawe = 3 - lewe; + if( Side & lewe ) + vehicle->MoverParameters->DoorLeft( true, range::local ); + if( Side & prawe ) + vehicle->MoverParameters->DoorRight( true, range::local ); } } + // pojazd podłączony z tyłu (patrząc od czoła) + vehicle = vehicle->Next(); } - else - { // jeśli nie, to zamykanie w składzie wagonowym - TDynamicObject *p = pVehicles[0]; // pojazd na czole składu - while (p) - { // zamykanie drzwi w pojazdach - flaga zezwolenia była by lepsza - p->MoverParameters->DoorLeft(false); // w lokomotywie można by nie zamykać... - p->MoverParameters->DoorRight(false); - p = p->Next(); // pojazd podłączony z tyłu (patrząc od czoła) + } + else { + // zamykanie + if( AIControllFlag ) { + if( ( true == mvOccupied->DoorClosureWarning ) + && ( false == mvOccupied->DepartureSignal ) + && ( true == TestFlag( iDrivigFlags, moveDoorOpened ) ) ) { + mvOccupied->signal_departure( true ); // załącenie bzyczka + fActionTime = -3.0 - 0.1 * Random( 10 ); // 3-4 second wait } - // WaitingSet(5); //10 sekund tu to za długo, opóźnia odjazd o pół minuty - fActionTime = -3.0 - 0.1 * Random(10); // czekanie sekundę, może trochę dłużej + } + + if( ( true == TestFlag( iDrivigFlags, moveDoorOpened ) ) + && ( ( fActionTime > -0.5 ) + || ( false == AIControllFlag ) ) ) { + // ai doesn't close the door until it's free to depart, but human driver has free reign to do stupid things + auto *vehicle = pVehicles[ 0 ]; // pojazd na czole składu + while( vehicle != nullptr ) { + // zamykanie drzwi w pojazdach - flaga zezwolenia była by lepsza + if( vehicle->MoverParameters->DoorCloseCtrl != control::passenger ) { + vehicle->MoverParameters->DoorLeft( false, range::local ); // w lokomotywie można by nie zamykać... + vehicle->MoverParameters->DoorRight( false, range::local ); + } + vehicle = vehicle->Next(); // pojazd podłączony z tyłu (patrząc od czoła) + } + fActionTime = -2.5 - 0.1 * Random( 10 ); // 2.5-3.5 sec wait, +potentially 0.5 remaining iDrivigFlags &= ~moveDoorOpened; // zostały zamknięte - nie wykonywać drugi raz } } -}; +} void TController::RecognizeCommand() { // odczytuje i wykonuje komendę przekazaną lokomotywie @@ -3632,7 +3600,7 @@ TController::UpdateSituation(double dt) { // for human-controlled vehicles with no door control and dynamic brake auto-activating with door open if( ( false == AIControllFlag ) && ( iDrivigFlags & moveDoorOpened ) - && ( mvOccupied->DoorOpenCtrl != 1 ) + && ( mvOccupied->DoorCloseCtrl != control::driver ) && ( mvControlling->MainCtrlPos > 0 ) ) { Doors( false ); } @@ -4098,7 +4066,10 @@ TController::UpdateSituation(double dt) { iDrivigFlags |= movePress; // następnie będzie dociskanie DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na przeciwny (dociskanie) CheckVehicles(); // od razu zmienić światła (zgasić) - bez tego się nie odczepi +/* + // NOTE: disabled to prevent closing the door before passengers can disembark fStopTime = 0.0; // nie ma na co czekać z odczepianiem +*/ } } else { @@ -4247,8 +4218,8 @@ TController::UpdateSituation(double dt) { && ( false == TestFlag( iDrivigFlags, movePress ) ) && ( iCoupler == 0 ) // && ( mvOccupied->Vel > 0.0 ) - && ( pVehicle->PrevConnected == nullptr ) - && ( pVehicle->NextConnected == nullptr ) ) { + && ( pVehicle->MoverParameters->Couplers[ side::front ].CouplingFlag == coupling::faux ) + && ( pVehicle->MoverParameters->Couplers[ side::rear ].CouplingFlag == coupling::faux ) ) { SetVelocity(0, 0, stopJoin); // 1. faza odczepiania: zatrzymanie // WriteLog("Zatrzymanie w celu odczepienia"); AccPreferred = std::min( 0.0, AccPreferred ); @@ -5040,7 +5011,7 @@ TController::UpdateSituation(double dt) { fMinProximityDist : // cars are allowed to move within min proximity distance fMaxProximityDist ) ? // other vehicle types keep wider margin true : - vel < VelNext ) ) { + ( vel + 1.0 ) < VelNext ) ) { // to można przyspieszyć IncSpeed(); } diff --git a/Driver.h b/Driver.h index c636411b..fa2a8afb 100644 --- a/Driver.h +++ b/Driver.h @@ -303,7 +303,7 @@ private: bool IncSpeed(); bool DecSpeed(bool force = false); void SpeedSet(); - void Doors(bool what); + void Doors(bool const Open, int const Side = 0); void RecognizeCommand(); // odczytuje komende przekazana lokomotywie void Activation(); // umieszczenie obsady w odpowiednim członie void ControllingSet(); // znajduje człon do sterowania diff --git a/DynObj.cpp b/DynObj.cpp index 951c0d7c..b1b86b16 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1924,37 +1924,49 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" } } // koniec hamulce else if( ( ActPar.size() >= 3 ) - && ( ActPar.substr( 0, 2 ) == "WF" ) ) { - // wheel flat - // TODO: convert this whole mess to something more elegant one day - ActPar.erase( 0, 2 ); + && ( ActPar[ 0 ] == 'W' ) ) { + // wheel + ActPar.erase( 0, 1 ); + auto fixedflatsize { 0 }; - { - // fixed size flat - auto const indexend { ActPar.find_first_not_of( "1234567890", 0 ) }; - fixedflatsize = std::atoi( ActPar.substr( 0, indexend ).c_str() ); - ActPar.erase( 0, indexend ); - } - // optional parameters auto randomflatsize { 0 }; - auto randomflatchance { 100 }; + auto flatchance { 100 }; + while( false == ActPar.empty() ) { - if( ActPar[ 0 ] == 'R' ) { - // random flat size - auto const indexstart { 1 }; - auto const indexend { ActPar.find_first_not_of( "1234567890", indexstart ) }; - randomflatsize = std::atoi( ActPar.substr( indexstart, indexend ).c_str() ); - ActPar.erase( 0, indexend ); - } - else if( ActPar[ 0 ] == 'P' ) { - // random flat probability - auto const indexstart { 1 }; - auto const indexend { ActPar.find_first_not_of( "1234567890", indexstart ) }; - randomflatchance = std::atoi( ActPar.substr( indexstart, indexend ).c_str() ); - ActPar.erase( 0, indexend ); + // TODO: convert this whole copy and paste mess to something more elegant one day + switch( ActPar[ 0 ] ) { + case 'F': { + // fixed flat size + auto const indexstart { 1 }; + auto const indexend { ActPar.find_first_not_of( "1234567890", indexstart ) }; + fixedflatsize = std::atoi( ActPar.substr( indexstart, indexend ).c_str() ); + ActPar.erase( 0, indexend ); + break; + } + case 'R': { + // random flat size + auto const indexstart { 1 }; + auto const indexend { ActPar.find_first_not_of( "1234567890", indexstart ) }; + randomflatsize = std::atoi( ActPar.substr( indexstart, indexend ).c_str() ); + ActPar.erase( 0, indexend ); + break; + } + case 'P': { + // random flat probability + auto const indexstart { 1 }; + auto const indexend { ActPar.find_first_not_of( "1234567890", indexstart ) }; + flatchance = std::atoi( ActPar.substr( indexstart, indexend ).c_str() ); + ActPar.erase( 0, indexend ); + break; + } + default: { + // unrecognized key + ActPar.erase( 0, 1 ); + break; + } } } - if( Random(0, 100) <= randomflatchance ) { + if( Random( 0, 100 ) <= flatchance ) { MoverParameters->WheelFlat += fixedflatsize + Random( 0, randomflatsize ); } } @@ -2476,6 +2488,87 @@ bool TDynamicObject::UpdateForce(double dt, double dt1, bool FullVer) return true; } +// initiates load change by specified amounts, with a platform on specified side +void TDynamicObject::LoadExchange( int const Disembark, int const Embark, int const Platform ) { + + if( ( MoverParameters->DoorOpenCtrl == control::passenger ) + || ( MoverParameters->DoorOpenCtrl == control::mixed ) ) { + // jeśli jedzie do tyłu, to drzwi otwiera odwrotnie + auto const lewe = ( DirectionGet() > 0 ) ? 1 : 2; + auto const prawe = 3 - lewe; + if( Platform & lewe ) { + MoverParameters->DoorLeft( true, range::local ); + } + if( Platform & prawe ) { + MoverParameters->DoorRight( true, range::local ); + } + } + m_exchange.unload_count += Disembark; + m_exchange.load_count += Embark; + m_exchange.speed_factor = ( + Platform == 3 ? + 2.0 : + 1.0 ); + m_exchange.time = 0.0; +} + +// update state of load exchange operation +void TDynamicObject::update_exchange( double const Deltatime ) { + + if( ( m_exchange.unload_count < 0.01 ) && ( m_exchange.load_count < 0.01 ) ) { return; } + + if( ( MoverParameters->Vel < 2.0 ) + && ( ( true == MoverParameters->DoorLeftOpened ) + || ( true == MoverParameters->DoorRightOpened ) ) ) { + + m_exchange.time += Deltatime; + while( ( m_exchange.unload_count > 0.01 ) + && ( m_exchange.time >= 1.0 ) ) { + + m_exchange.time -= 1.0; + auto const exchangesize = std::min( m_exchange.unload_count, MoverParameters->UnLoadSpeed * m_exchange.speed_factor ); + m_exchange.unload_count -= exchangesize; + MoverParameters->LoadStatus = 1; + MoverParameters->Load = std::max( 0.f, MoverParameters->Load - exchangesize ); + update_load_visibility(); + } + if( m_exchange.unload_count < 0.01 ) { + // finish any potential unloading operation before adding new load + // don't load more than can fit + m_exchange.load_count = std::min( m_exchange.load_count, MoverParameters->MaxLoad - MoverParameters->Load ); + while( ( m_exchange.load_count > 0.01 ) + && ( m_exchange.time >= 1.0 ) ) { + + m_exchange.time -= 1.0; + auto const exchangesize = std::min( m_exchange.load_count, MoverParameters->LoadSpeed * m_exchange.speed_factor ); + m_exchange.load_count -= exchangesize; + MoverParameters->LoadStatus = 2; + MoverParameters->Load = std::min( MoverParameters->MaxLoad, MoverParameters->Load + exchangesize ); // std::max not strictly needed but, eh + update_load_visibility(); + } + } + } + + if( MoverParameters->Vel > 2.0 ) { + // if the vehicle moves too fast cancel the exchange + m_exchange.unload_count = 0; + m_exchange.load_count = 0; + } + + if( ( m_exchange.unload_count < 0.01 ) + && ( m_exchange.load_count < 0.01 ) ) { + + MoverParameters->LoadStatus = 0; + // if the exchange is completed (or canceled) close the door, if applicable + if( ( MoverParameters->DoorCloseCtrl == control::passenger ) + || ( MoverParameters->DoorCloseCtrl == control::mixed ) ) { + + MoverParameters->DoorLeft( false, range::local ); + MoverParameters->DoorRight( false, range::local ); + } + } +} + void TDynamicObject::LoadUpdate() { // przeładowanie modelu ładunku // Ra: nie próbujemy wczytywać modeli miliony razy podczas renderowania!!! @@ -2494,7 +2587,11 @@ void TDynamicObject::LoadUpdate() { } if( mdLoad == nullptr ) { // if this fails, try generic load model - mdLoad = TModelsManager::GetModel( asBaseDir + MoverParameters->LoadType, true ); + auto const genericloadfilename { asBaseDir + MoverParameters->LoadType }; + if( ( true == FileExists( genericloadfilename + ".e3d" ) ) + || ( true == FileExists( genericloadfilename + ".t3d" ) ) ) { + mdLoad = TModelsManager::GetModel( genericloadfilename, true ); + } } if( mdLoad != nullptr ) { // TODO: discern from vehicle component which merely uses vehicle directory and has no animations, so it can be initialized outright @@ -2539,11 +2636,11 @@ TDynamicObject::update_load_sections() { void TDynamicObject::update_load_visibility() { - +/* if( Random() < 0.25 ) { shuffle_load_sections(); } - +*/ auto loadpercentage { ( MoverParameters->MaxLoad == 0.0 ? 0.0 : @@ -3521,6 +3618,8 @@ bool TDynamicObject::Update(double dt, double dt1) } MoverParameters->DerailReason = 0; //żeby tylko raz } + + update_exchange( dt ); if (MoverParameters->LoadStatus) LoadUpdate(); // zmiana modelu ładunku @@ -3561,6 +3660,7 @@ bool TDynamicObject::FastUpdate(double dt) // ResetdMoveLen(); FastMove(dDOMoveLen); + update_exchange( dt ); if (MoverParameters->LoadStatus) LoadUpdate(); // zmiana modelu ładunku return true; // Ra: chyba tak? @@ -3757,6 +3857,19 @@ void TDynamicObject::RenderSounds() { } // other sounds + // load exchange + if( MoverParameters->LoadStatus & 1 ) { + m_exchangesounds.unloading.play( sound_flags::exclusive ); + } + else { + m_exchangesounds.unloading.stop(); + } + if( MoverParameters->LoadStatus & 2 ) { + m_exchangesounds.loading.play( sound_flags::exclusive ); + } + else { + m_exchangesounds.loading.stop(); + } // NBMX sygnal odjazdu if( MoverParameters->DoorClosureWarning ) { if( MoverParameters->DepartureSignal ) { @@ -4878,6 +4991,16 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } } + else if( token == "unloading:" ) { + m_exchangesounds.unloading.deserialize( parser, sound_type::single ); + m_exchangesounds.unloading.owner( this ); + } + + else if( token == "loading:" ) { + m_exchangesounds.loading.deserialize( parser, sound_type::single ); + m_exchangesounds.loading.owner( this ); + } + else if( token == "sand:" ) { sSand.deserialize( parser, sound_type::multipart, sound_parameters::range ); sSand.owner( this ); diff --git a/DynObj.h b/DynObj.h index 9d48f188..a9ed165e 100644 --- a/DynObj.h +++ b/DynObj.h @@ -264,6 +264,13 @@ private: private: // types + struct exchange_data { + float unload_count { 0.f }; // amount to unload + float load_count { 0.f }; // amount to load + float speed_factor { 1.f }; // operation speed modifier + float time { 0.f }; // time spent on the operation + }; + struct coupler_sounds { sound_source dsbCouplerAttach { sound_placement::external }; // moved from cab sound_source dsbCouplerDetach { sound_placement::external }; // moved from cab @@ -282,6 +289,11 @@ private: sound_source rsDoorClose { sound_placement::general, 25.f }; }; + struct exchange_sounds { + sound_source loading { sound_placement::general }; + sound_source unloading { sound_placement::general }; + }; + struct axle_sounds { double distance; // distance to rail joint double offset; // axle offset from centre of the vehicle @@ -318,6 +330,8 @@ private: void ABuBogies(); void ABuModelRoll(); void TurnOff(); + // update state of load exchange operation + void update_exchange( double const Deltatime ); // members TButton btCoupler1; // sprzegi @@ -385,6 +399,9 @@ private: sound_source rscurve { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; // youBy sound_source rsDerailment { sound_placement::external, 250.f }; // McZapkie-051202 + exchange_data m_exchange; // state of active load exchange procedure, if any + exchange_sounds m_exchangesounds; // sounds associated with the load exchange + Math3D::vector3 modelShake; bool renderme; // yB - czy renderowac @@ -466,6 +483,8 @@ private: void create_controller( std::string const Type, bool const Trainset ); void AttachPrev(TDynamicObject *Object, int iType = 1); bool UpdateForce(double dt, double dt1, bool FullVer); + // initiates load change by specified amounts, with a platform on specified side + void LoadExchange( int const Disembark, int const Embark, int const Platform ); void LoadUpdate(); void update_load_sections(); void update_load_visibility(); @@ -553,6 +572,7 @@ private: void DestinationSet(std::string to, std::string numer); std::string TextureTest(std::string const &name); void OverheadTrack(float o); + double MED[9][8]; // lista zmiennych do debugowania hamulca ED static std::string const MED_labels[ 8 ]; }; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index c72285f9..709a9008 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -153,7 +153,8 @@ enum coupling { gangway = 0x10, mainhose = 0x20, heating = 0x40, - permanent = 0x80 + permanent = 0x80, + uic = 0x100 }; // possible effect ranges for control commands; exclusive enum range { @@ -176,6 +177,15 @@ enum light { redmarker_right = 0x20, rearendsignals = 0x40 }; + +// door operation methods; exclusive +enum control { + passenger, // local, opened/closed for duration of loading + driver, // remote, operated by the driver + autonomous, // local, closed when vehicle moves and/or after timeout + conductor, // remote, operated by the conductor + mixed // primary manual but answers also to remote control +}; /*typ hamulca elektrodynamicznego*/ static int const dbrake_none = 0; static int const dbrake_passive = 1; @@ -307,7 +317,7 @@ struct TCommand std::string Command; /*komenda*/ double Value1 = 0.0; /*argumenty komendy*/ double Value2 = 0.0; - int Coupling{ ctrain_controll }; // coupler flag used to determine command propagation + int Coupling { coupling::control }; // coupler flag used to determine command propagation TLocation Location; }; @@ -821,10 +831,10 @@ public: static std::vector const eimc_labels; double InverterFrequency { 0.0 }; // current frequency of power inverters /*-dla wagonow*/ - double MaxLoad = 0.0; /*masa w T lub ilosc w sztukach - ladownosc*/ + float MaxLoad = 0.f; /*masa w T lub ilosc w sztukach - ladownosc*/ std::string LoadAccepted; std::string LoadQuantity; /*co moze byc zaladowane, jednostki miary*/ double OverLoadFactor = 0.0; /*ile razy moze byc przekroczona ladownosc*/ - double LoadSpeed = 0.0; double UnLoadSpeed = 0.0;/*szybkosc na- i rozladunku jednostki/s*/ + float LoadSpeed = 0.f; float UnLoadSpeed = 0.f;/*szybkosc na- i rozladunku jednostki/s*/ int DoorOpenCtrl = 0; int DoorCloseCtrl = 0; /*0: przez pasazera, 1: przez maszyniste, 2: samoczynne (zamykanie)*/ double DoorStayOpen = 0.0; /*jak dlugo otwarte w przypadku DoorCloseCtrl=2*/ bool DoorClosureWarning = false; /*czy jest ostrzeganie przed zamknieciem*/ @@ -887,7 +897,7 @@ public: bool CompressorAllowLocal{ true }; // local device state override (most units don't have this fitted so it's set to true not to intefere) bool CompressorGovernorLock{ false }; // indicates whether compressor pressure switch was activated due to reaching cut-out pressure // TODO converter parameters, for when we start cleaning up mover parameters - start ConverterStart{ manual }; // whether converter is started manually, or by other means + start ConverterStart{ start::manual }; // whether converter is started manually, or by other means float ConverterStartDelay{ 0.0f }; // delay (in seconds) before the converter is started, once its activation conditions are met double ConverterStartDelayTimer{ 0.0 }; // helper, for tracking whether converter start delay passed bool ConverterAllow = false; /*zezwolenie na prace przetwornicy NBMX*/ @@ -1024,7 +1034,7 @@ public: double eAngle = M_PI * 0.5; /*-dla wagonow*/ - double Load = 0.0; /*masa w T lub ilosc w sztukach - zaladowane*/ + float Load = 0.f; /*masa w T lub ilosc w sztukach - zaladowane*/ std::string LoadType; /*co jest zaladowane*/ int LoadStatus = 0; //+1=trwa rozladunek,+2=trwa zaladunek,+4=zakończono,0=zaktualizowany model double LastLoadChangeTime = 0.0; //raz (roz)ładowania @@ -1220,8 +1230,8 @@ public: /* funckje dla wagonow*/ bool LoadingDone(double LSpeed, std::string LoadInit); - bool DoorLeft(bool State); //obsluga drzwi lewych - bool DoorRight(bool State); //obsluga drzwi prawych + bool DoorLeft(bool State, int const Notify = range::consist ); //obsluga drzwi lewych + bool DoorRight(bool State, int const Notify = range::consist ); //obsluga drzwi prawych bool DoorBlockedFlag(void); //sprawdzenie blokady drzwi bool signal_departure( bool const State, int const Notify = range::consist ); // toggles departure warning diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 8e6aa671..cd52d053 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6006,65 +6006,80 @@ bool TMoverParameters::DoorBlockedFlag(void) // Q: 20160713 // Otwiera / zamyka lewe drzwi // ************************************************************************************************* -bool TMoverParameters::DoorLeft(bool State) -{ - bool DL = false; - if ((DoorLeftOpened != State) && (DoorBlockedFlag() == false) && (Battery == true)) - { - DL = true; - DoorLeftOpened = State; - if (State == true) - { - if (CabNo > 0) - SendCtrlToNext("DoorOpen", 1, CabNo); // 1=lewe, 2=prawe - else - SendCtrlToNext("DoorOpen", 2, CabNo); // zamiana - CompressedVolume -= 0.003; - } - else - { - if (CabNo > 0) - SendCtrlToNext("DoorClose", 1, CabNo); - else - SendCtrlToNext("DoorClose", 2, CabNo); - } +// NOTE: door methods work regardless of vehicle door control type, +// but commands issued through the command system work only for vehicles which accept remote door control +bool TMoverParameters::DoorLeft(bool State, int const Notify ) { + + if( DoorLeftOpened == State ) { + // TBD: should the command be passed to other vehicles regardless of whether it affected the primary target? + // (for the time being no, methods are often invoked blindly which would lead to commands spam) + return false; } - else - DL = false; - return DL; + + bool result { false }; + + if( ( Battery == true ) + && ( DoorBlockedFlag() == false ) ) { + + DoorLeftOpened = State; + result = true; + } + if( Notify != range::local ) { + + SendCtrlToNext( + ( State == true ? + "DoorOpen" : + "DoorClose" ), + ( CabNo > 0 ? // 1=lewe, 2=prawe (swap if reversed) + 1 : + 2 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return result; } // ************************************************************************************************* // Q: 20160713 // Otwiera / zamyka prawe drzwi // ************************************************************************************************* -bool TMoverParameters::DoorRight(bool State) -{ - bool DR = false; - if ((DoorRightOpened != State) && (DoorBlockedFlag() == false) && (Battery == true)) - { - DR = true; - DoorRightOpened = State; - if (State == true) - { - if (CabNo > 0) - SendCtrlToNext("DoorOpen", 2, CabNo); // 1=lewe, 2=prawe - else - SendCtrlToNext("DoorOpen", 1, CabNo); // zamiana - CompressedVolume -= 0.003; - } - else - { - if (CabNo > 0) - SendCtrlToNext("DoorClose", 2, CabNo); - else - SendCtrlToNext("DoorClose", 1, CabNo); - } - } - else - DR = false; +// NOTE: door methods work regardless of vehicle door control type, +// but commands issued through the command system work only for vehicles which accept remote door control +bool TMoverParameters::DoorRight(bool State, int const Notify ) { - return DR; + if( DoorRightOpened == State ) { + // TBD: should the command be passed to other vehicles regardless of whether it affected the primary target? + // (for the time being no, methods are often invoked blindly which would lead to commands spam) + return false; + } + + bool result { false }; + + if( ( Battery == true ) + && ( DoorBlockedFlag() == false ) ) { + + DoorRightOpened = State; + result = true; + } + if( Notify != range::local ) { + + SendCtrlToNext( + ( State == true ? + "DoorOpen" : + "DoorClose" ), + ( CabNo > 0 ? // 1=lewe, 2=prawe (swap if reversed) + 2 : + 1 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return result; } // toggles departure warning @@ -6086,8 +6101,8 @@ TMoverParameters::signal_departure( bool const State, int const Notify ) { 0 ), CabNo, ( Notify == range::unit ? - ctrain_controll | ctrain_depot : - ctrain_controll ) ); + coupling::control | coupling::permanent : + coupling::control ) ); } return true; @@ -7184,8 +7199,8 @@ void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { auto lookup = compressorpowers.find( extract_value( "CompressorPower", line ) ); CompressorPower = lookup != compressorpowers.end() ? - lookup->second : - 1; + lookup->second : + 1; } if( true == extract_value( AirLeakRate, "AirLeakRate", line, "" ) ) { @@ -7196,16 +7211,31 @@ void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { void TMoverParameters::LoadFIZ_Doors( std::string const &line ) { - DoorOpenCtrl = 0; - std::string openctrl; extract_value( openctrl, "OpenCtrl", line, "" ); - if( openctrl == "DriverCtrl" ) { DoorOpenCtrl = 1; } - - DoorCloseCtrl = 0; - std::string closectrl; extract_value( closectrl, "CloseCtrl", line, "" ); - if( closectrl == "DriverCtrl" ) { DoorCloseCtrl = 1; } - else if( closectrl == "AutomaticCtrl" ) { DoorCloseCtrl = 2; } - - if( DoorCloseCtrl == 2 ) { extract_value( DoorStayOpen, "DoorStayOpen", line, "" ); } + std::map doorcontrols { + { "Passenger", control::passenger }, + { "AutomaticCtrl", control::autonomous }, + { "DriverCtrl", control::driver }, + { "Conductor", control::conductor }, + { "Mixed", control::mixed } + }; + // opening method + { + auto lookup = doorcontrols.find( extract_value( "OpenCtrl", line ) ); + DoorOpenCtrl = + lookup != doorcontrols.end() ? + lookup->second : + control::passenger; + } + // closing method + { + auto lookup = doorcontrols.find( extract_value( "CloseCtrl", line ) ); + DoorCloseCtrl = + lookup != doorcontrols.end() ? + lookup->second : + control::passenger; + } + // automatic closing timer + if( DoorCloseCtrl == control::autonomous ) { extract_value( DoorStayOpen, "DoorStayOpen", line, "" ); } extract_value( DoorOpenSpeed, "OpenSpeed", line, "" ); extract_value( DoorCloseSpeed, "CloseSpeed", line, "" ); @@ -8315,6 +8345,7 @@ bool TMoverParameters::SendCtrlToNext( std::string const CtrlCommand, double con // musi być wybrana niezerowa kabina if( ( Couplers[ d ].Connected != nullptr ) && ( TestFlag( Couplers[ d ].CouplingFlag, Couplertype ) ) ) { + if( Couplers[ d ].ConnectedNr != d ) { // jeśli ten nastpęny jest zgodny z aktualnym if( Couplers[ d ].Connected->SetInternalCommand( CtrlCommand, ctrlvalue, dir, Couplertype ) ) @@ -8473,38 +8504,48 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "DoorOpen") /*NBMX*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów - if ((CValue2 > 0)) - { // normalne ustawienie pojazdu - if ((CValue1 == 1) || (CValue1 == 3)) - DoorLeftOpened = true; - if ((CValue1 == 2) || (CValue1 == 3)) - DoorRightOpened = true; - } - else - { // odwrotne ustawienie pojazdu - if ((CValue1 == 2) || (CValue1 == 3)) - DoorLeftOpened = true; - if ((CValue1 == 1) || (CValue1 == 3)) - DoorRightOpened = true; - } + if( ( DoorCloseCtrl == control::conductor ) + || ( DoorCloseCtrl == control::driver ) + || ( DoorCloseCtrl == control::mixed ) ) { + // ignore remote command if the door is only operated locally + if( CValue2 > 0 ) { + // normalne ustawienie pojazdu + if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) + DoorLeftOpened = true; + if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) + DoorRightOpened = true; + } + else { + // odwrotne ustawienie pojazdu + if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) + DoorLeftOpened = true; + if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) + DoorRightOpened = true; + } + } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "DoorClose") /*NBMX*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów - if ((CValue2 > 0)) - { // normalne ustawienie pojazdu - if ((CValue1 == 1) || (CValue1 == 3)) - DoorLeftOpened = false; - if ((CValue1 == 2) || (CValue1 == 3)) - DoorRightOpened = false; - } - else - { // odwrotne ustawienie pojazdu - if ((CValue1 == 2) || (CValue1 == 3)) - DoorLeftOpened = false; - if ((CValue1 == 1) || (CValue1 == 3)) - DoorRightOpened = false; - } + if( ( DoorCloseCtrl == control::conductor ) + || ( DoorCloseCtrl == control::driver ) + || ( DoorCloseCtrl == control::mixed ) ) { + // ignore remote command if the door is only operated locally + if( CValue2 > 0 ) { + // normalne ustawienie pojazdu + if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) + DoorLeftOpened = false; + if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) + DoorRightOpened = false; + } + else { + // odwrotne ustawienie pojazdu + if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) + DoorLeftOpened = false; + if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) + DoorRightOpened = false; + } + } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if( Command == "DepartureSignal" ) { diff --git a/Train.cpp b/Train.cpp index 1f7ab494..e2794c55 100644 --- a/Train.cpp +++ b/Train.cpp @@ -375,12 +375,12 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) } } */ - MechSpring.Init(250); + MechSpring.Init(125.0); vMechVelocity = Math3D::vector3(0, 0, 0); pMechOffset = Math3D::vector3( 0, 0, 0 ); - fMechSpringX = 1; - fMechSpringY = 0.5; - fMechSpringZ = 0.5; + fMechSpringX = 0.2; + fMechSpringY = 0.2; + fMechSpringZ = 0.1; fMechMaxSpring = 0.15; fMechRoll = 0.05; fMechPitch = 0.1; @@ -3283,9 +3283,6 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ) { - if( Train->mvOccupied->DoorOpenCtrl != 1 ) { - return; - } if( Command.action == GLFW_PRESS ) { // NOTE: test how the door state check works with consists where the occupied vehicle doesn't have opening doors if( false == ( @@ -3293,76 +3290,74 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman Train->mvOccupied->DoorLeftOpened : Train->mvOccupied->DoorRightOpened ) ) { // open + if( Train->mvOccupied->DoorOpenCtrl != control::driver ) { + return; + } if( Train->mvOccupied->ActiveCab == 1 ) { - if( Train->mvOccupied->DoorLeft( true ) ) { - Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); - } + Train->mvOccupied->DoorLeft( true ); } else { // in the rear cab sides are reversed... - if( Train->mvOccupied->DoorRight( true ) ) { - // ...but so are the switches - Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); - } + Train->mvOccupied->DoorRight( true ); } + // visual feedback + Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { // close + if( Train->mvOccupied->DoorCloseCtrl != control::driver ) { + return; + } + // TODO: move door opening/closing to the update, so the switch animation doesn't hinge on door working if( Train->mvOccupied->ActiveCab == 1 ) { - if( Train->mvOccupied->DoorLeft( false ) ) { - Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + Train->mvOccupied->DoorLeft( false ); } else { // in the rear cab sides are reversed... - if( Train->mvOccupied->DoorRight( false ) ) { - // ...but so are the switches - Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + Train->mvOccupied->DoorRight( false ); } + // visual feedback + Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Command ) { - if( Train->mvOccupied->DoorOpenCtrl != 1 ) { - return; - } if( Command.action == GLFW_PRESS ) { // NOTE: test how the door state check works with consists where the occupied vehicle doesn't have opening doors if( false == ( Train->mvOccupied->ActiveCab == 1 ? - Train->mvOccupied->DoorRightOpened : - Train->mvOccupied->DoorLeftOpened ) ) { + Train->mvOccupied->DoorRightOpened : + Train->mvOccupied->DoorLeftOpened ) ) { // open + if( Train->mvOccupied->DoorOpenCtrl != control::driver ) { + return; + } if( Train->mvOccupied->ActiveCab == 1 ) { - if( Train->mvOccupied->DoorRight( true ) ) { - Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); - } + Train->mvOccupied->DoorRight( true ); } else { // in the rear cab sides are reversed... - if( Train->mvOccupied->DoorLeft( true ) ) { - // ...but so are the switches - Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); - } + Train->mvOccupied->DoorLeft( true ); } + // visual feedback + Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { // close + if( Train->mvOccupied->DoorCloseCtrl != control::driver ) { + return; + } if( Train->mvOccupied->ActiveCab == 1 ) { - if( Train->mvOccupied->DoorRight( false ) ) { - Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + Train->mvOccupied->DoorRight( false ); } else { // in the rear cab sides are reversed... - if( Train->mvOccupied->DoorLeft( false ) ) { - // ...but so are the switches - Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); - } + Train->mvOccupied->DoorLeft( false ); } + // visual feedback + Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); } } } diff --git a/station.cpp b/station.cpp index 601efe6f..ca440dcb 100644 --- a/station.cpp +++ b/station.cpp @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. // exchanges load with consist attached to specified vehicle, operating on specified schedule double -basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule ) { +basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int const Platform ) { auto const firststop { Schedule.StationIndex == 1 }; auto const laststop { Schedule.StationIndex == Schedule.StationCount }; @@ -30,7 +30,13 @@ basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Sch auto const stationsizemodifier { ( trainstop ? 1.0 : 2.0 ) }; // go through all vehicles and update their load // NOTE: for the time being we limit ourselves to passenger-carrying cars only - auto exchangetime { 0.0 }; + auto exchangetime { 0.f }; + // platform (1:left, 2:right, 3:both) + // with exchange performed on both sides waiting times are halved + auto const exchangetimemodifier { ( + Platform == 3 ? + 0.5f : + 1.0f ) }; auto *vehicle { First }; while( vehicle != nullptr ) { @@ -47,24 +53,29 @@ basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Sch // NOTE: for the time being we're doing simple, random load change calculation // TODO: exchange driven by station parameters and time of the day auto unloadcount = static_cast( - firststop ? 0 : laststop ? parameters.Load : - std::min( + firststop ? 0 : + std::min( parameters.Load, Random( parameters.MaxLoad * 0.10 * stationsizemodifier ) ) ); auto loadcount = static_cast( laststop ? 0 : - Random( parameters.MaxLoad * 0.15 * stationsizemodifier ) ); + Random( parameters.MaxLoad * 0.15f * stationsizemodifier ) ); if( true == firststop ) { // slightly larger group at the initial station loadcount *= 2; } - parameters.Load = std::min( parameters.MaxLoad, parameters.Load - unloadcount + loadcount ); - vehicle->LoadUpdate(); - vehicle->update_load_visibility(); - exchangetime = std::max( exchangetime, unloadcount / parameters.UnLoadSpeed + loadcount / parameters.LoadSpeed); + if( ( unloadcount > 0 ) || ( loadcount > 0 ) ) { + + vehicle->LoadExchange( unloadcount, loadcount, Platform ); +/* + vehicle->LoadUpdate(); + vehicle->update_load_visibility(); +*/ + exchangetime = std::max( exchangetime, exchangetimemodifier * ( unloadcount / parameters.UnLoadSpeed + loadcount / parameters.LoadSpeed ) ); + } } vehicle = vehicle->Next(); } diff --git a/station.h b/station.h index 34b915f7..5c7c760b 100644 --- a/station.h +++ b/station.h @@ -18,5 +18,5 @@ public: // methods // exchanges load with consist attached to specified vehicle, operating on specified schedule; returns: time needed for exchange, in seconds double - update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule ); + update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int const Platform ); }; \ No newline at end of file From a1e2ad60d4524d31ae0b7379e485218b7e95f86d Mon Sep 17 00:00:00 2001 From: milek7 Date: Mon, 26 Feb 2018 18:05:53 +0100 Subject: [PATCH 287/426] texture compressing switch --- Globals.cpp | 4 ++++ Globals.h | 1 + Texture.cpp | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Globals.cpp b/Globals.cpp index 62c33e69..076738b9 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -617,6 +617,10 @@ global_settings::ConfigParse(cParser &Parser) { Parser.getTokens( 1 ); Parser >> uart_conf.debug; } + else if( token == "compresstex" ) { + Parser.getTokens( 1 ); + Parser >> compress_tex; + } } while ((token != "") && (token != "endconfig")); //(!Parser->EndOfFile) // na koniec trochę zależności if (!bLoadTraction) // wczytywanie drutów i słupów diff --git a/Globals.h b/Globals.h index 7a86dcfe..cfa502ab 100644 --- a/Globals.h +++ b/Globals.h @@ -118,6 +118,7 @@ struct global_settings { float SplineFidelity{ 1.f }; // determines segment size during conversion of splines to geometry bool ResourceSweep{ true }; // gfx resource garbage collection bool ResourceMove{ false }; // gfx resources are moved between cpu and gpu side instead of sending a copy + bool compress_tex{ true }; // all textures are compressed on gpu side std::string asSky{ "1" }; bool bGlutFont{ false }; // czy tekst generowany przez GLUT32.DLL double fFpsAverage{ 20.0 }; // oczekiwana wartosć FPS diff --git a/Texture.cpp b/Texture.cpp index cec43583..2715af97 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -589,7 +589,10 @@ opengl_texture::create() { else { // uncompressed texture data. have the gfx card do the compression as it sees fit ::glTexImage2D( - GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA, + GL_TEXTURE_2D, 0, + ( Global.compress_tex ? + GL_COMPRESSED_RGBA : + GL_RGBA ), data_width, data_height, 0, data_format, GL_UNSIGNED_BYTE, (GLubyte *)&data[ 0 ] ); } From 710f7e3fbc9135ba7611826afdcd1ccffab97bd8 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 1 Mar 2018 16:07:52 +0100 Subject: [PATCH 288/426] master branch unification: cross-platform python interpreter --- EU07.cpp | 3 +- Globals.cpp | 7 ----- PyInt.cpp | 83 +++++++++++++++++++---------------------------------- PyInt.h | 23 +++++++-------- 4 files changed, 41 insertions(+), 75 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 48dd293f..980c9716 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -459,7 +459,6 @@ int main(int argc, char *argv[]) return -1; } - TPythonInterpreter::killInstance(); #ifdef _WIN32 Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) SafeDelete( pConsole ); @@ -469,5 +468,7 @@ int main(int argc, char *argv[]) glfwDestroyWindow(window); glfwTerminate(); + TPythonInterpreter::killInstance(); + return 0; } diff --git a/Globals.cpp b/Globals.cpp index 076738b9..97b1e3c3 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -567,13 +567,6 @@ global_settings::ConfigParse(cParser &Parser) { UITextColor = UITextColor / 255.0f; UITextColor.a = 1.0f; } - else if (token == "pyscreenrendererpriority") - { - // priority of python screen renderer - Parser.getTokens(); - Parser >> token; - TPythonInterpreter::getInstance()->setScreenRendererPriority(token.c_str()); - } else if( token == "input.gamepad" ) { // czy grupować eventy o tych samych nazwach Parser.getTokens(); diff --git a/PyInt.cpp b/PyInt.cpp index c59917af..e426af9f 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -3,7 +3,7 @@ #include "parser.h" #include "renderer.h" -#include "model3d.h" +#include "Model3d.h" #include "Train.h" #include "Logs.h" @@ -11,20 +11,30 @@ TPythonInterpreter *TPythonInterpreter::_instance = NULL; //#define _PY_INT_MORE_LOG +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wwrite-strings" +#endif + TPythonInterpreter::TPythonInterpreter() { WriteLog("Loading Python ..."); +#ifdef _WIN32 if (sizeof(void*) == 8) Py_SetPythonHome("python64"); else Py_SetPythonHome("python"); +#elif __linux__ + if (sizeof(void*) == 8) + Py_SetPythonHome("linuxpython64"); + else + Py_SetPythonHome("linuxpython"); +#endif Py_Initialize(); _main = PyImport_ImportModule("__main__"); if (_main == NULL) { WriteLog("Cannot import Python module __main__"); } - _screenRendererPriority = THREAD_PRIORITY_NORMAL; // domyslny priorytet normalny PyObject *cStringModule = PyImport_ImportModule("cStringIO"); _stdErr = NULL; if (cStringModule == NULL) @@ -111,7 +121,7 @@ FILE *TPythonInterpreter::_getFile( std::string const &lookupPath, std::string c #endif // _PY_INT_MORE_LOG if( nullptr != file ) { return file; } } - std::string sourcefilepath = "python\\local\\" + className + ".py"; + std::string sourcefilepath = "python/local/" + className + ".py"; FILE *file = fopen( sourcefilepath.c_str(), "r" ); #ifdef _PY_INT_MORE_LOG WriteLog( sourceFilePath ); @@ -136,7 +146,7 @@ FILE *TPythonInterpreter::_getFile( std::string const &lookupPath, std::string c return file; } } - char *basePath = "python\\local\\"; + char *basePath = "python/local/"; sourceFilePath = (char *)calloc(strlen(basePath) + strlen(className) + 4, sizeof(char)); strcat(sourceFilePath, basePath); strcat(sourceFilePath, className); @@ -233,38 +243,6 @@ PyObject *TPythonInterpreter::newClass(std::string const &className, PyObject *a return object; } -void TPythonInterpreter::setScreenRendererPriority(const char *priority) -{ - if (strncmp(priority, "normal", 6) == 0) - { - _screenRendererPriority = THREAD_PRIORITY_NORMAL; -//#ifdef _PY_INT_MORE_LOG - WriteLog("Python screen renderer priority: Normal"); -//#endif // _PY_INT_MORE_LOG - } - else if (strncmp(priority, "lower", 5) == 0) - { - _screenRendererPriority = THREAD_PRIORITY_BELOW_NORMAL; -//#ifdef _PY_INT_MORE_LOG - WriteLog("Python screen renderer priority: Lower"); -//#endif // _PY_INT_MORE_LOG - } - else if (strncmp(priority, "lowest", 6) == 0) - { - _screenRendererPriority = THREAD_PRIORITY_LOWEST; -//#ifdef _PY_INT_MORE_LOG - WriteLog("Python screen renderer priority: Lowest"); -//#endif // _PY_INT_MORE_LOG - } - else if (strncmp(priority, "idle", 4) == 0) - { - _screenRendererPriority = THREAD_PRIORITY_IDLE; -//#ifdef _PY_INT_MORE_LOG - WriteLog("Python screen renderer priority: Idle"); -//#endif // _PY_INT_MORE_LOG - } -} - TPythonScreenRenderer::TPythonScreenRenderer(int textureId, PyObject *renderer) { _textureId = textureId; @@ -379,6 +357,10 @@ void TPythonScreenRenderer::render(PyObject *trainState) } } +#ifdef __GNUC__ +#pragma GCC diagnostic pop +#endif + TPythonScreenRenderer::~TPythonScreenRenderer() { #ifdef _PY_INT_MORE_LOG @@ -419,8 +401,9 @@ void TPythonScreens::reset(void *train) if (_thread != NULL) { // WriteLog("Awaiting python thread to end"); - WaitForSingleObject(_thread, INFINITE); - _thread = NULL; + _thread->join(); + delete _thread; + _thread = nullptr; } _terminationFlag = false; _cleanupReadyFlag = false; @@ -496,6 +479,7 @@ void TPythonScreens::update() void TPythonScreens::setLookupPath(std::string const &path) { _lookupPath = path; + std::replace(_lookupPath.begin(), _lookupPath.end(), '\\', '/'); } TPythonScreens::TPythonScreens() @@ -553,7 +537,11 @@ void TPythonScreens::run() _renderReadyFlag = true; while (!_cleanupReadyFlag && !_terminationFlag) { +#ifdef _WIN32 Sleep(100); +#elif __linux__ + usleep(100*1000); +#endif } if (_terminationFlag) { @@ -568,33 +556,20 @@ void TPythonScreens::finish() _thread = NULL; } -DWORD WINAPI ScreenRendererThread(LPVOID lpParam) +void ScreenRendererThread(TPythonScreens* renderer) { - TPythonScreens *renderer = (TPythonScreens *)lpParam; renderer->run(); renderer->finish(); #ifdef _PY_INT_MORE_LOG WriteLog("Python Screen Renderer Thread Ends"); #endif // _PY_INT_MORE_LOG - return true; } void TPythonScreens::start() { if (_screens.size() > 0) { - _thread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)ScreenRendererThread, this, - CREATE_SUSPENDED, reinterpret_cast(&_threadId)); - if (_thread != NULL) - { - SetThreadPriority(_thread, - TPythonInterpreter::getInstance()->getScreenRendererPriotity()); - if (ResumeThread(_thread) != (DWORD)-1) - { - return; - } - } - WriteLog("Python Screen Renderer Thread Did Not Start"); + _thread = new std::thread(ScreenRendererThread, this); } } @@ -616,4 +591,4 @@ void TPythonScreens::_freeTrainState() Py_CLEAR(_trainState); _trainState = NULL; } -} +} \ No newline at end of file diff --git a/PyInt.h b/PyInt.h index fa76e7a0..aad4411c 100644 --- a/PyInt.h +++ b/PyInt.h @@ -1,9 +1,13 @@ #ifndef PyIntH #define PyIntH -#include -#include -#include +#ifdef _POSIX_C_SOURCE +#undef _POSIX_C_SOURCE +#endif + +#ifdef _XOPEN_SOURCE +#undef _XOPEN_SOURCE +#endif #ifdef _DEBUG #undef _DEBUG // bez tego macra Py_DECREF powoduja problemy przy linkowaniu @@ -12,7 +16,7 @@ #else #include "Python.h" #endif -#include "classes.h" +#include "Classes.h" #define PyGetFloat(param) PyFloat_FromDouble(param >= 0 ? param : -param) #define PyGetFloatS(param) PyFloat_FromDouble(param) @@ -35,7 +39,6 @@ class TPythonInterpreter TPythonInterpreter(); ~TPythonInterpreter() {} static TPythonInterpreter *_instance; - int _screenRendererPriority = 0; // std::set _classes; std::set _classes; PyObject *_main; @@ -52,11 +55,6 @@ class TPythonInterpreter */ bool loadClassFile( std::string const &lookupPath, std::string const &className ); PyObject *newClass( std::string const &className ); PyObject *newClass( std::string const &className, PyObject *argsTuple ); - int getScreenRendererPriotity() - { - return _screenRendererPriority; - }; - void setScreenRendererPriority(const char *priority); void handleError(); }; @@ -83,8 +81,7 @@ class TPythonScreens bool _cleanupReadyFlag; bool _renderReadyFlag; bool _terminationFlag; - void *_thread; - unsigned int _threadId; + std::thread *_thread; std::vector _screens; std::string _lookupPath; void *_train; @@ -104,4 +101,4 @@ class TPythonScreens void finish(); }; -#endif // PyIntH +#endif // PyIntH \ No newline at end of file From 55ae503dbb4d97370a99521e763de0f2f51884f8 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 3 Mar 2018 22:07:49 +0100 Subject: [PATCH 289/426] texture and 3d model lookup fixes and cross-platform compatibility --- MdlMngr.cpp | 93 ++++++++++++++++++++++++++++++++++++---------------- MdlMngr.h | 12 +++++-- Texture.cpp | 43 ++++++++++-------------- material.cpp | 12 +++---- renderer.cpp | 8 ++--- utilities.h | 9 +++-- 6 files changed, 103 insertions(+), 74 deletions(-) diff --git a/MdlMngr.cpp b/MdlMngr.cpp index 41d95897..4a611785 100644 --- a/MdlMngr.cpp +++ b/MdlMngr.cpp @@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "model3d.h" #include "Globals.h" +#include "logs.h" #include "utilities.h" // wczytanie modelu do kontenerka @@ -78,42 +79,76 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic) // - wczytanie uproszczonego wnętrza, ścieżka dokładna, tekstury z katalogu modelu // - niebo animowane, ścieżka brana ze wpisu, tekstury nieokreślone // - wczytanie modelu animowanego - Init() - sprawdzić - std::string buf; - std::string const buftp = Global.asCurrentTexturePath; // zapamiętanie aktualnej ścieżki do tekstur, - if( Name.find('\\') == std::string::npos ) - { - buf = "models\\" + Name; // Ra: było by lepiej katalog dodać w parserze - if( Name.find( '/') != std::string::npos) - { - Global.asCurrentTexturePath = Global.asCurrentTexturePath + Name; - Global.asCurrentTexturePath.erase(Global.asCurrentTexturePath.find("/") + 1, - Global.asCurrentTexturePath.length()); - } + std::string const buftp { Global.asCurrentTexturePath }; // zapamiętanie aktualnej ścieżki do tekstur, + std::string filename { Name }; + if( Name.find( '/' ) != std::string::npos ) { + // pobieranie tekstur z katalogu, w którym jest model + Global.asCurrentTexturePath += Name; + Global.asCurrentTexturePath.erase( Global.asCurrentTexturePath.rfind( "/" ) + 1 ); } - else - { - buf = Name; - if( Dynamic ) { - // na razie tak, bo nie wiadomo, jaki może mieć wpływ na pozostałe modele - if( Name.find( '/' ) != std::string::npos ) { // pobieranie tekstur z katalogu, w którym jest model - Global.asCurrentTexturePath = Global.asCurrentTexturePath + Name; - Global.asCurrentTexturePath.erase( - Global.asCurrentTexturePath.find( "/" ) + 1, - Global.asCurrentTexturePath.length() - 1 ); - } - } - } - buf = ToLower( buf ); - auto const lookup = m_modelsmap.find( buf ); - if( lookup != m_modelsmap.end() ) { + filename = ToLower( filename ); + if( ( filename.rfind( '.' ) != std::string::npos ) + && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { + // trim extension if there's one, but don't mistake folder traverse for extension + filename.erase( filename.rfind( '.' ) ); + } + + // see if we have it in the databank + auto *model { find_in_databank( filename ) }; + if( model != nullptr ) { Global.asCurrentTexturePath = buftp; - return ( m_models[ lookup->second ].Model.get() ); + return model; } - auto model = LoadModel(buf, Dynamic); // model nie znaleziony, to wczytać + // not yet loaded, check if it's on disk + std::string lookup { find_on_disk( filename ) }; + + if( false == lookup.empty() ) { + model = LoadModel( lookup, Dynamic ); // model nie znaleziony, to wczytać + } + else { + // there's nothing matching in the databank nor on the disk, report failure + ErrorLog( "Bad file: failed do locate 3d model file \"" + filename + "\"", logtype::file ); + } Global.asCurrentTexturePath = buftp; // odtworzenie ścieżki do tekstur return model; // NULL jeśli błąd }; +TModel3d * +TModelsManager::find_in_databank( std::string const &Name ) { + + std::vector filenames { + Name, + szModelPath + Name }; + + for( auto const &filename : filenames ) { + auto const lookup { m_modelsmap.find( filename ) }; + if( lookup != m_modelsmap.end() ) { + return ( m_models[ lookup->second ].Model.get() ); + } + } + + return nullptr; +} + +// checks whether specified file exists. returns name of the located file, or empty string. +std::string +TModelsManager::find_on_disk( std::string const &Name ) { + + std::vector extensions { { ".e3d" }, { ".t3d" } }; + for( auto const &extension : extensions ) { + + auto lookup = ( + FileExists( Name + extension ) ? Name : + FileExists( szModelPath + Name + extension ) ? szModelPath + Name : + "" ); + if( false == lookup.empty() ) { + return lookup; + } + } + + return {}; +} + //--------------------------------------------------------------------------- diff --git a/MdlMngr.h b/MdlMngr.h index a70d60b5..af26306f 100644 --- a/MdlMngr.h +++ b/MdlMngr.h @@ -20,6 +20,11 @@ private: // klasa statyczna, nie ma obiektu class TModelsManager { +public: + // McZapkie: dodalem sciezke, notabene Path!=Patch :) + static TModel3d *GetModel( std::string const &Name, bool dynamic = false ); + +private: // types: typedef std::deque modelcontainer_sequence; typedef std::unordered_map stringmodelcontainerindex_map; @@ -28,9 +33,10 @@ class TModelsManager { static stringmodelcontainerindex_map m_modelsmap; // methods: static TModel3d *LoadModel( std::string const &Name, bool const Dynamic ); -public: - // McZapkie: dodalem sciezke, notabene Path!=Patch :) - static TModel3d *GetModel( std::string const &Name, bool dynamic = false ); + static TModel3d *find_in_databank( std::string const &Name ); + // checks whether specified file exists. returns name of the located file, or empty string. + static std::string find_on_disk( std::string const &Name ); + }; //--------------------------------------------------------------------------- diff --git a/Texture.cpp b/Texture.cpp index 2715af97..1a6a6a55 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -766,22 +766,12 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { Filename.erase( Filename.rfind( '.' ) ); } - for( char &c : Filename ) { - // change forward slashes to windows ones. NOTE: probably not strictly necessary, but eh - c = ( c == '/' ? '\\' : c ); - } -/* - std::transform( - Filename.begin(), Filename.end(), - Filename.begin(), - []( char Char ){ return Char == '/' ? '\\' : Char; } ); -*/ - if( Filename.find( '\\' ) == std::string::npos ) { - // jeśli bieżaca ścieżka do tekstur nie została dodana to dodajemy domyślną - Filename = szTexturePath + Filename; - } + // change slashes to cross-platform + std::replace( + std::begin( Filename ), std::end( Filename ), + '\\', '/' ); - std::vector extensions{ { ".dds" }, { ".tga" }, { ".bmp" }, { ".ext" } }; + std::vector extensions { { ".dds" }, { ".tga" }, { ".bmp" }, { ".ext" } }; // try to locate requested texture in the databank auto lookup = find_in_databank( Filename + Global.szDefaultExt ); @@ -956,17 +946,19 @@ texture_manager::info() const { texture_handle texture_manager::find_in_databank( std::string const &Texturename ) const { - auto lookup = m_texturemappings.find( Texturename ); - if( lookup != m_texturemappings.end() ) { - return lookup->second; - } - // jeszcze próba z dodatkową ścieżką - lookup = m_texturemappings.find( szTexturePath + Texturename ); + std::vector filenames { + Global.asCurrentTexturePath + Texturename, + Texturename, + szTexturePath + Texturename }; - return ( - lookup != m_texturemappings.end() ? - lookup->second : - npos ); + for( auto const &filename : filenames ) { + auto const lookup { m_texturemappings.find( filename ) }; + if( lookup != m_texturemappings.end() ) { + return lookup->second; + } + } + + return npos; } // checks whether specified file exists. @@ -974,6 +966,7 @@ std::string texture_manager::find_on_disk( std::string const &Texturename ) const { return( + FileExists( Global.asCurrentTexturePath + Texturename ) ? Global.asCurrentTexturePath + Texturename : FileExists( Texturename ) ? Texturename : FileExists( szTexturePath + Texturename ) ? szTexturePath + Texturename : "" ); diff --git a/material.cpp b/material.cpp index d7ea8988..b57643c6 100644 --- a/material.cpp +++ b/material.cpp @@ -66,14 +66,14 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c else if( key == "texture1:" ) { if( ( texture1 == null_handle ) || ( Priority > priority1 ) ) { - texture1 = GfxRenderer.Fetch_Texture( path( name ) + value, Loadnow ); + texture1 = GfxRenderer.Fetch_Texture( value, Loadnow ); priority1 = Priority; } } else if( key == "texture2:" ) { if( ( texture2 == null_handle ) || ( Priority > priority2 ) ) { - texture2 = GfxRenderer.Fetch_Texture( path( name ) + value, Loadnow ); + texture2 = GfxRenderer.Fetch_Texture( value, Loadnow ); priority2 = Priority; } } @@ -117,14 +117,10 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { } filename += ".mat"; - // change forward slashes to windows ones. NOTE: probably not strictly necessary, but eh + // change slashes to llinux-compatible std::replace( std::begin( filename ), std::end( filename ), - '/', '\\' ); - if( filename.find( '\\' ) == std::string::npos ) { - // jeśli bieżaca ścieżka do tekstur nie została dodana to dodajemy domyślną - filename = szTexturePath + filename; - } + '\\', '/' ); // try to locate requested material in the databank auto const databanklookup = find_in_databank( filename ); diff --git a/renderer.cpp b/renderer.cpp index ef68f662..014b0223 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -186,11 +186,11 @@ opengl_renderer::Init( GLFWwindow *Window ) { } // preload some common textures WriteLog( "Loading common gfx data..." ); - m_glaretexture = Fetch_Texture( "fx\\lightglare" ); - m_suntexture = Fetch_Texture( "fx\\sun" ); - m_moontexture = Fetch_Texture( "fx\\moon" ); + m_glaretexture = Fetch_Texture( "fx/lightglare" ); + m_suntexture = Fetch_Texture( "fx/sun" ); + m_moontexture = Fetch_Texture( "fx/moon" ); if( m_helpertextureunit >= 0 ) { - m_reflectiontexture = Fetch_Texture( "fx\\reflections" ); + m_reflectiontexture = Fetch_Texture( "fx/reflections" ); } WriteLog( "...gfx data pre-loading done" ); diff --git a/utilities.h b/utilities.h index a9501fca..40675435 100644 --- a/utilities.h +++ b/utilities.h @@ -25,11 +25,10 @@ http://mozilla.org/MPL/2.0/. #define DegToRad(a) ((M_PI / 180.0) * (a)) //(a) w nawiasie, bo może być dodawaniem #define RadToDeg(r) ((180.0 / M_PI) * (r)) -#define asModelsPath std::string("models\\") -#define asSceneryPath std::string("scenery\\") -#define szSceneryPath "scenery\\" -#define szTexturePath "textures\\" -#define szSoundPath "sounds\\" +#define szSceneryPath "scenery/" +#define szTexturePath "textures/" +#define szModelPath "models/" +#define szSoundPath "sounds/" #define MAKE_ID4(a,b,c,d) (((std::uint32_t)(d)<<24)|((std::uint32_t)(c)<<16)|((std::uint32_t)(b)<<8)|(std::uint32_t)(a)) From 24b25ec419bcedef142913a3b2d6aa7a5ee2e08d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 6 Mar 2018 20:19:34 +0100 Subject: [PATCH 290/426] build 180306. locations definiton support for door and traction motors --- Driver.h | 5 +- DynObj.cpp | 152 +++++++++++++++++++++++++++++++++------------ DynObj.h | 2 +- McZapkie/Mover.cpp | 13 ++-- World.cpp | 14 +++-- version.h | 2 +- 6 files changed, 133 insertions(+), 55 deletions(-) diff --git a/Driver.h b/Driver.h index fa2a8afb..c225a0c5 100644 --- a/Driver.h +++ b/Driver.h @@ -282,17 +282,18 @@ private: int iOverheadZero = 0; // suma bitowa jezdy bezprądowej, bity ustawiane przez pojazdy z podniesionymi pantografami int iOverheadDown = 0; // suma bitowa opuszczenia pantografów, bity ustawiane przez pojazdy z podniesionymi pantografami double fVoltage = 0.0; // uśrednione napięcie sieci: przy spadku poniżej wartości minimalnej opóźnić rozruch o losowy czas - private: + private: double fMaxProximityDist = 50.0; // stawanie między 30 a 60 m przed przeszkodą // akceptowalna odległość stanięcia przed przeszkodą TStopReason eStopReason = stopSleep; // powód zatrzymania przy ustawieniu zerowej prędkości // na początku śpi std::string VehicleName; double fVelPlus = 0.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania double fVelMinus = 0.0; // margines obniżenia prędkości, powodujący załączenie napędu double fWarningDuration = 0.0; // ile czasu jeszcze trąbić - double fStopTime = 0.0; // czas postoju przed dalszą jazdą (np. na przystanku) double WaitingTime = 0.0; // zliczany czas oczekiwania do samoistnego ruszenia double WaitingExpireTime = 31.0; // tyle ma czekać, zanim się ruszy // maksymlany czas oczekiwania do samoistnego ruszenia double IdleTime {}; // keeps track of time spent at a stop + public: + double fStopTime = 0.0; // czas postoju przed dalszą jazdą (np. na przystanku) private: //---//---//---//---// koniec zmiennych, poniżej metody //---//---//---//---// void SetDriverPsyche(); diff --git a/DynObj.cpp b/DynObj.cpp index b1b86b16..3ff466f8 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1008,19 +1008,19 @@ TDynamicObject * TDynamicObject::ABuFindNearestObject(TTrack *Track, TDynamicObj if( CouplNr == -2 ) { // wektor [kamera-obiekt] - poszukiwanie obiektu - if( LengthSquared3( Global.pCameraPosition - dynamic->vPosition ) < 100.0 ) { + if( Math3D::LengthSquared3( Global.pCameraPosition - dynamic->vPosition ) < 100.0 ) { // 10 metrów return dynamic; } } else { // jeśli (CouplNr) inne niz -2, szukamy sprzęgu - if( LengthSquared3( Global.pCameraPosition - dynamic->vCoulpler[ 0 ] ) < 25.0 ) { + if( Math3D::LengthSquared3( Global.pCameraPosition - dynamic->vCoulpler[ 0 ] ) < 25.0 ) { // 5 metrów CouplNr = 0; return dynamic; } - if( LengthSquared3( Global.pCameraPosition - dynamic->vCoulpler[ 1 ] ) < 25.0 ) { + if( Math3D::LengthSquared3( Global.pCameraPosition - dynamic->vCoulpler[ 1 ] ) < 25.0 ) { // 5 metrów CouplNr = 1; return dynamic; @@ -4576,8 +4576,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, asAnimName = token + std::to_string( i + 1 ); pants[ i ].smElement[ 4 ] = mdModel->GetFromName( asAnimName ); pants[ i ].smElement[ 4 ]->WillBeAnimated(); -/* pants[ i ].yUpdate = UpdatePant; -*/ pants[ i ].yUpdate = std::bind( &TDynamicObject::UpdatePant, this, std::placeholders::_1 ); + pants[ i ].yUpdate = std::bind( &TDynamicObject::UpdatePant, this, std::placeholders::_1 ); pants[ i ].fMaxDist = 300 * 300; // nie podnosić w większej odległości pants[ i ].iNumber = i; } @@ -4775,8 +4774,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, pAnimations[i + j].fSpeed = (pAnimations[i + j].fSpeed + 100) / 100; // Ra: te współczynniki są bez sensu, bo modyfikują wektor przesunięcia } - // create sound emitters for the door - m_doorsounds.emplace_back(); } } @@ -4835,11 +4832,28 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( ( token == "tractionmotor:" ) && ( MoverParameters->Power > 0 ) ) { // plik z dzwiekiem silnika, mnozniki i ofsety amp. i czest. - m_powertrainsounds.motor.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); - m_powertrainsounds.motor.owner( this ); + sound_source motortemplate { sound_placement::external }; + motortemplate.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); + motortemplate.owner( this ); auto const amplitudedivisor = static_cast( MoverParameters->nmax * 60 + MoverParameters->Power * 3 ); - m_powertrainsounds.motor.m_amplitudefactor /= amplitudedivisor; + motortemplate.m_amplitudefactor /= amplitudedivisor; + + if( true == m_powertrainsounds.motors.empty() ) { + // fallback for cases without specified motor locations, convert sound template to a single sound source + m_powertrainsounds.motors.emplace_back( motortemplate ); + } + else { + // + for( auto &motor : m_powertrainsounds.motors ) { + // apply configuration to all defined motors + // combine potential x- and y-axis offsets of the sound template with z-axis offsets of individual motors + auto motoroffset { motortemplate.offset() }; + motoroffset.z = motor.offset().z; + motor = motortemplate; + motor.offset( motoroffset ); + } + } } else if( token == "inverter:" ) { @@ -4974,20 +4988,26 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else if( token == "dooropen:" ) { - sound_source dooropen { sound_placement::general }; - dooropen.deserialize( parser, sound_type::single ); - dooropen.owner( this ); + sound_source doortemplate { sound_placement::general }; + doortemplate.deserialize( parser, sound_type::single ); + doortemplate.owner( this ); for( auto &door : m_doorsounds ) { - door.rsDoorOpen = dooropen; + // apply configuration to all defined doors, but preserve their individual offsets + auto const dooroffset { door.rsDoorOpen.offset() }; + door.rsDoorOpen = doortemplate; + door.rsDoorOpen.offset( dooroffset ); } } else if( token == "doorclose:" ) { - sound_source doorclose { sound_placement::general }; - doorclose.deserialize( parser, sound_type::single ); - doorclose.owner( this ); + sound_source doortemplate { sound_placement::general }; + doortemplate.deserialize( parser, sound_type::single ); + doortemplate.owner( this ); for( auto &door : m_doorsounds ) { - door.rsDoorClose = doorclose; + // apply configuration to all defined doors, but preserve their individual offsets + auto const dooroffset { door.rsDoorClose.offset() }; + door.rsDoorClose = doortemplate; + door.rsDoorClose.offset( dooroffset ); } } @@ -5032,6 +5052,61 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } // sounds: + else if( token == "locations:" ) { + do { + token = ""; + parser.getTokens(); parser >> token; + + if( token == "doors:" ) { + // a list of pairs: offset along vehicle's z-axis and sides on which the door is present; followed with "end" + while( ( ( token = parser.getToken() ) != "" ) + && ( token != "end" ) ) { + // vehicle faces +Z in 'its' space, for door locations negative value means ahead of centre + auto const offset { std::atof( token.c_str() ) * -1.f }; + // recognized side specifications are "right", "left" and "both" + auto const sides { parser.getToken() }; + // NOTE: we skip setting owner of the sounds, it'll be done during individual sound deserialization + door_sounds door; + // add entries to the list: + if( ( sides == "both" ) + || ( sides == "left" ) ) { + // left... + auto const location { glm::vec3 { MoverParameters->DimHalf.x, MoverParameters->DimHalf.y, offset } }; + door.rsDoorClose.offset( location ); + door.rsDoorOpen.offset( location ); + m_doorsounds.emplace_back( door ); + } + if( ( sides == "both" ) + || ( sides == "right" ) ) { + // ...and right + auto const location { glm::vec3 { -MoverParameters->DimHalf.x, MoverParameters->DimHalf.y, offset } }; + door.rsDoorClose.offset( location ); + door.rsDoorOpen.offset( location ); + m_doorsounds.emplace_back( door ); + } + } + } + + else if( token == "tractionmotors:" ) { + // a list of offsets along vehicle's z-axis; followed with "end" + while( ( ( token = parser.getToken() ) != "" ) + && ( token != "end" ) ) { + // vehicle faces +Z in 'its' space, for motor locations negative value means ahead of centre + auto const offset { std::atof( token.c_str() ) * -1.f }; + // NOTE: we skip setting owner of the sounds, it'll be done during individual sound deserialization + sound_source motor { sound_placement::external }; // generally traction motor + // add entry to the list + auto const location { glm::vec3 { 0.f, 0.f, offset } }; + motor.offset( location ); + m_powertrainsounds.motors.emplace_back( motor ); + } + } + + } while( ( token != "" ) + && ( token != "endlocations" ) ); + + } // locations: + else if( token == "internaldata:" ) { // dalej nie czytaj do { @@ -5245,25 +5320,13 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // zliczanie wcześniejszych animacji dooranimationfirstindex += iAnimType[ i ]; } - std::size_t doorindex { 0 }; - for( auto &doorsounds : m_doorsounds ) { - - auto submodel { pAnimations[ dooranimationfirstindex + doorindex ].smAnimated }; - if( submodel == nullptr ) { continue; } - - auto const dooroffset { pAnimations[ dooranimationfirstindex + doorindex ].smAnimated->offset( std::numeric_limits::max() ) }; - - doorsounds.rsDoorClose.offset( dooroffset ); - doorsounds.rsDoorOpen.offset( dooroffset ); - ++doorindex; - } // couplers - auto const frontcoupleroffset { glm::vec3{ 0.f, 1.f, MoverParameters->Dim.L * 0.5f } }; + auto const frontcoupleroffset { glm::vec3{ 0.f, 1.f, MoverParameters->DimHalf.z } }; m_couplersounds[ side::front ].dsbCouplerAttach.offset( frontcoupleroffset ); m_couplersounds[ side::front ].dsbCouplerDetach.offset( frontcoupleroffset ); m_couplersounds[ side::front ].dsbCouplerStretch.offset( frontcoupleroffset ); m_couplersounds[ side::front ].dsbBufferClamp.offset( frontcoupleroffset ); - auto const rearcoupleroffset{ glm::vec3{ 0.f, 1.f, MoverParameters->Dim.L * -0.5f } }; + auto const rearcoupleroffset{ glm::vec3{ 0.f, 1.f, MoverParameters->DimHalf.z * -1.f } }; m_couplersounds[ side::rear ].dsbCouplerAttach.offset( rearcoupleroffset ); m_couplersounds[ side::rear ].dsbCouplerDetach.offset( rearcoupleroffset ); m_couplersounds[ side::rear ].dsbCouplerStretch.offset( rearcoupleroffset ); @@ -5958,10 +6021,12 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub // motor sounds volume = 0.0; if( ( true == Vehicle.Mains ) - && ( false == Vehicle.dizel_enginestart ) ) { + && ( false == Vehicle.dizel_enginestart ) + && ( false == motors.empty() ) ) { if( std::fabs( Vehicle.enrot ) > 0.01 ) { + auto const &motor { motors.front() }; // frequency calculation auto normalizer { 1.f }; if( true == motor.is_combined() ) { @@ -6023,19 +6088,28 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub volume *= std::max( 0.25f, motor_momentum ); if( motor_volume >= 0.05 ) { - motor - .pitch( frequency ) - .gain( motor_volume ) - .play( sound_flags::exclusive | sound_flags::looping ); + // apply calculated parameters to all motor instances + for( auto &motor : motors ) { + motor + .pitch( frequency ) + .gain( motor_volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } } } else { - motor.stop(); + // stop all motor instances + for( auto &motor : motors ) { + motor.stop(); + } } } motor_volume = interpolate( motor_volume, volume, 0.25 ); if( motor_volume < 0.05 ) { - motor.stop(); + // stop all motor instances + for( auto &motor : motors ) { + motor.stop(); + } } // inverter sounds if( Vehicle.EngineType == ElectricInductionMotor ) { diff --git a/DynObj.h b/DynObj.h index a9ed165e..e5381ceb 100644 --- a/DynObj.h +++ b/DynObj.h @@ -302,7 +302,7 @@ private: struct powertrain_sounds { sound_source inverter { sound_placement::engine }; - sound_source motor { sound_placement::external }; // generally traction motor + std::vector motors; // generally traction motor(s) double motor_volume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal float motor_momentum { 0.f }; // recent change in motor revolutions sound_source motor_relay { sound_placement::engine }; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index cd52d053..8d617547 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -305,9 +305,6 @@ Name( NameInit ) WriteLog("init default physic values for " + NameInit + ", [" + TypeNameInit + "], [" + LoadTypeInitial + "]"); Dim = TDimension(); - DimHalf.x = 0.5 * Dim.W; // połowa szerokości, OX jest w bok? - DimHalf.y = 0.5 * Dim.L; // połowa długości, OY jest do przodu? - DimHalf.z = 0.5 * Dim.H; // połowa wysokości, OZ jest w górę? // BrakeLevelSet(-2); //Pascal ustawia na 0, przestawimy na odcięcie (CHK jest jeszcze nie wczytane!) iLights[ 0 ] = 0; @@ -6240,17 +6237,12 @@ bool TMoverParameters::Physic_ReActivation(void) // DO PRZETLUMACZENIA NA KONCU // ************************************************************************************************* // FUNKCJE PARSERA WCZYTYWANIA PLIKU FIZYKI POJAZDU // ************************************************************************************************* -std::string p0, p1, p2, p3, p4, p5, p6, p7; -std::string vS; -int vI; -double vD; bool startBPT; bool startMPT, startMPT0; bool startRLIST; bool startDLIST, startFFLIST, startWWLIST; bool startLIGHTSLIST; int LISTLINE; -std::vector x; // ************************************************************************************************* // Q: 20160717 @@ -7059,6 +7051,11 @@ void TMoverParameters::LoadFIZ_Dimensions( std::string const &line ) { extract_value( Dim.L, "L", line, "" ); extract_value( Dim.H, "H", line, "" ); extract_value( Dim.W, "W", line, "" ); + + DimHalf.x = 0.5 * Dim.W; // połowa szerokości, OX jest w bok? + DimHalf.y = 0.5 * Dim.L; // połowa długości, OY jest do przodu? + DimHalf.z = 0.5 * Dim.H; // połowa wysokości, OZ jest w górę? + extract_value( Cx, "Cx", line, "0.3" ); if( Dim.H <= 2.0 ) { //gdyby nie było parametru, lepsze to niż zero diff --git a/World.cpp b/World.cpp index 17518151..b6005609 100644 --- a/World.cpp +++ b/World.cpp @@ -1186,9 +1186,15 @@ TWorld::Update_UI() { " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; - auto const trackblockdistance{ std::abs( Controlled->Mechanik->TrackBlock() ) }; - if( trackblockdistance <= 75.0 ) { - uitextline4 += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; + auto const stoptime { static_cast( -1.0 * Controlled->Mechanik->fStopTime ) }; + if( stoptime > 0 ) { + uitextline4 += " Loading/unloading in progress (" + to_string( stoptime ) + ( stoptime > 1 ? " seconds" : " second" ) + " left)"; + } + else { + auto const trackblockdistance{ std::abs( Controlled->Mechanik->TrackBlock() ) }; + if( trackblockdistance <= 75.0 ) { + uitextline4 += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; + } } } } @@ -1342,7 +1348,7 @@ TWorld::Update_UI() { if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) uitextline2 += "+Mg"; - uitextline2 += ", Load: " + to_string( vehicle->MoverParameters->LoadFlag, 0 ) + " (" + to_string( vehicle->MoverParameters->Load, 0 ) + ")"; + uitextline2 += ", Load: " + to_string( vehicle->MoverParameters->Load, 0 ) + " (" + to_string( vehicle->MoverParameters->LoadFlag, 0 ) + ")"; uitextline2 += "; Pant: " diff --git a/version.h b/version.h index b579d2b0..1bf81cf4 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 223 +#define VERSION_MINOR 306 #define VERSION_REVISION 0 From 5d6008008419afb57a17be54cc25cb3e4c4ca47e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 8 Mar 2018 18:15:01 +0100 Subject: [PATCH 291/426] build 180308. location definition for bogies, serial port output fixes --- DynObj.cpp | 79 ++++++++++++++++++++++++++++++++++++++++-------------- DynObj.h | 2 +- Train.cpp | 2 +- uart.cpp | 35 +++++++++++++++--------- version.h | 2 +- 5 files changed, 85 insertions(+), 35 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 3ff466f8..6e7ffae2 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3940,7 +3940,7 @@ void TDynamicObject::RenderSounds() { } // szum w czasie jazdy if( ( GetVelocity() > 0.5 ) - && ( false == rsOuterNoise.empty() ) + && ( false == m_bogiesounds.empty() ) && ( // compound test whether the vehicle belongs to user-driven consist (as these don't emit outer noise in cab view) FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise // Global.pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) @@ -3949,19 +3949,20 @@ void TDynamicObject::RenderSounds() { Global.CabWindowOpen ? true : // sticking head out we get to hear outer noise false ) ) { - // frequency calculation - auto const normalizer{ ( - true == rsOuterNoise.is_combined() ? + auto const &bogiesound { m_bogiesounds.front() }; + // frequency calculation + auto const normalizer { ( + true == bogiesound.is_combined() ? MoverParameters->Vmax * 0.01f : 1.f ) }; frequency = - rsOuterNoise.m_frequencyoffset - + rsOuterNoise.m_frequencyfactor * MoverParameters->Vel * normalizer; + bogiesound.m_frequencyoffset + + bogiesound.m_frequencyfactor * MoverParameters->Vel * normalizer; // volume calculation volume = - rsOuterNoise.m_amplitudeoffset + - rsOuterNoise.m_amplitudefactor * MoverParameters->Vel; + bogiesound.m_amplitudeoffset + + bogiesound.m_amplitudefactor * MoverParameters->Vel; if( brakeforceratio > 0.0 ) { // hamulce wzmagaja halas volume *= 1 + 0.125 * brakeforceratio; @@ -3978,18 +3979,26 @@ void TDynamicObject::RenderSounds() { 0.0, 1.0 ) ); if( volume > 0.05 ) { - rsOuterNoise - .pitch( frequency ) // arbitrary limits to prevent the pitch going out of whack - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); + // apply calculated parameters to all motor instances + for( auto &bogiesound : m_bogiesounds ) { + bogiesound + .pitch( frequency ) // arbitrary limits to prevent the pitch going out of whack + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } } else { - rsOuterNoise.stop(); + // stop all noise instances + for( auto &bogiesound : m_bogiesounds ) { + bogiesound.stop(); + } } } else { // don't play the optional ending sound if the listener switches views - rsOuterNoise.stop( false == FreeFlyModeFlag ); + for( auto &bogiesound : m_bogiesounds ) { + bogiesound.stop( false == FreeFlyModeFlag ); + } } // flat spot sound if( MoverParameters->CategoryFlag == 1 ) { @@ -4844,9 +4853,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.motors.emplace_back( motortemplate ); } else { - // + // apply configuration to all defined motors for( auto &motor : m_powertrainsounds.motors ) { - // apply configuration to all defined motors // combine potential x- and y-axis offsets of the sound template with z-axis offsets of individual motors auto motoroffset { motortemplate.offset() }; motoroffset.z = motor.offset().z; @@ -5034,11 +5042,27 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( token == "outernoise:" ) { // szum podczas jazdy: - rsOuterNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, MoverParameters->Vmax ); - rsOuterNoise.owner( this ); + sound_source noisetemplate { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; + noisetemplate.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, MoverParameters->Vmax ); + noisetemplate.owner( this ); - rsOuterNoise.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); - rsOuterNoise.m_frequencyfactor /= ( 1 + MoverParameters->Vmax ); + noisetemplate.m_amplitudefactor /= ( 1 + MoverParameters->Vmax ); + noisetemplate.m_frequencyfactor /= ( 1 + MoverParameters->Vmax ); + + if( true == m_bogiesounds.empty() ) { + // fallback for cases without specified noise locations, convert sound template to a single sound source + m_bogiesounds.emplace_back( noisetemplate ); + } + else { + // apply configuration to all defined bogies + for( auto &bogie : m_bogiesounds ) { + // combine potential x- and y-axis offsets of the sound template with z-axis offsets of individual motors + auto bogieoffset { noisetemplate.offset() }; + bogieoffset.z = bogie.offset().z; + bogie = noisetemplate; + bogie.offset( bogieoffset ); + } + } } else if( token == "wheelflat:" ) { @@ -5102,6 +5126,21 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } } + else if( token == "bogies:" ) { + // a list of offsets along vehicle's z-axis; followed with "end" + while( ( ( token = parser.getToken() ) != "" ) + && ( token != "end" ) ) { + // vehicle faces +Z in 'its' space, for bogie locations negative value means ahead of centre + auto const offset { std::atof( token.c_str() ) * -1.f }; + // NOTE: we skip setting owner of the sounds, it'll be done during individual sound deserialization + sound_source bogienoise { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; + // add entry to the list + auto const location { glm::vec3 { 0.f, 0.f, offset } }; + bogienoise.offset( location ); + m_bogiesounds.emplace_back( bogienoise ); + } + } + } while( ( token != "" ) && ( token != "endlocations" ) ); diff --git a/DynObj.h b/DynObj.h index e5381ceb..caa307e7 100644 --- a/DynObj.h +++ b/DynObj.h @@ -394,7 +394,7 @@ private: sound_source sDepartureSignal { sound_placement::general }; sound_source sHorn1 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source sHorn2 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; - sound_source rsOuterNoise { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; + std::vector m_bogiesounds; // TBD, TODO: wrapper for all bogie-related sounds (noise, brakes, squeal etc) sound_source m_wheelflat { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source rscurve { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; // youBy sound_source rsDerailment { sound_placement::external, 250.f }; // McZapkie-051202 diff --git a/Train.cpp b/Train.cpp index e2794c55..10942633 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5755,8 +5755,8 @@ void TTrain::clear_cab_controls() btLampkaOgrzewanieSkladu.Clear(11); btHaslerBrakes.Clear(12); // ciśnienie w cylindrach do odbijania na haslerze btHaslerCurrent.Clear(13); // prąd na silnikach do odbijania na haslerze - // Jeśli ustawiamy nową wartość dla PoKeys wolna jest 15 // Numer 14 jest używany dla buczka SHP w update_sounds() + // Jeśli ustawiamy nową wartość dla PoKeys wolna jest 15 // other cab controls // TODO: arrange in more readable manner, and eventually refactor diff --git a/uart.cpp b/uart.cpp index 84dcba69..fd86ed2a 100644 --- a/uart.cpp +++ b/uart.cpp @@ -239,9 +239,9 @@ void uart_input::poll() uint16_t pipe_press = (uint16_t)std::min(conf.pipeuart, trainstate.pipe_pressure * 0.1f / conf.pipemax * conf.pipeuart); uint16_t brake_press = (uint16_t)std::min(conf.brakeuart, trainstate.brake_pressure * 0.1f / conf.brakemax * conf.brakeuart); uint16_t hv_voltage = (uint16_t)std::min(conf.hvuart, trainstate.hv_voltage / conf.hvmax * conf.hvuart); - uint16_t current1 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[0]) / conf.currentmax * conf.currentuart; - uint16_t current2 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[1]) / conf.currentmax * conf.currentuart; - uint16_t current3 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[2]) / conf.currentmax * conf.currentuart; + uint16_t current1 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[0] / conf.currentmax * conf.currentuart); + uint16_t current2 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[1] / conf.currentmax * conf.currentuart); + uint16_t current3 = (uint16_t)std::min(conf.currentuart, trainstate.hv_current[2] / conf.currentmax * conf.currentuart); std::array buffer { //byte 0 @@ -269,15 +269,26 @@ void uart_input::poll() | trainstate.line_breaker << 5 | trainstate.compressor_overload << 6), //byte 6 - (uint8_t)( trainstate.alerter_sound << 7), - SPLIT_INT16(brake_press), //byte 7-8 - SPLIT_INT16(pipe_press), //byte 9-10 - SPLIT_INT16(tank_press), //byte 11-12 - SPLIT_INT16(hv_voltage), //byte 13-14 - SPLIT_INT16(current1), //byte 15-16 - SPLIT_INT16(current2), //byte 17-18 - SPLIT_INT16(current3), //byte 19-20 - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 //byte 21-30 + (uint8_t)( + trainstate.recorder_braking << 3 + | trainstate.recorder_power << 4 + | trainstate.alerter_sound << 7), + //byte 7-8 + SPLIT_INT16(brake_press), + //byte 9-10 + SPLIT_INT16(pipe_press), + //byte 11-12 + SPLIT_INT16(tank_press), + //byte 13-14 + SPLIT_INT16(hv_voltage), + //byte 15-16 + SPLIT_INT16(current1), + //byte 17-18 + SPLIT_INT16(current2), + //byte 19-20 + SPLIT_INT16(current3), + //byte 21-30 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; if (conf.debug) diff --git a/version.h b/version.h index 1bf81cf4..0783fe3f 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 306 +#define VERSION_MINOR 308 #define VERSION_REVISION 0 From 0bf9d233aa9f352fedba7d650b11a8e86f0218eb Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 9 Mar 2018 19:31:19 +0100 Subject: [PATCH 292/426] build 180309. additional control commands, serial port output fix --- DynObj.cpp | 8 +++---- McZapkie/MOVER.h | 2 -- McZapkie/Mover.cpp | 4 ---- Train.cpp | 58 ++++++++++++++++++++++++++++++++++++++++++++++ Train.h | 3 +++ color.h | 1 + command.cpp | 3 +++ command.h | 3 +++ keyboardinput.cpp | 6 +++++ renderer.cpp | 6 ++--- renderer.h | 2 +- uart.cpp | 2 +- version.h | 2 +- 13 files changed, 84 insertions(+), 16 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 6e7ffae2..3bef8953 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -5095,7 +5095,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, if( ( sides == "both" ) || ( sides == "left" ) ) { // left... - auto const location { glm::vec3 { MoverParameters->DimHalf.x, MoverParameters->DimHalf.y, offset } }; + auto const location { glm::vec3 { MoverParameters->Dim.W * 0.5f, MoverParameters->Dim.H * 0.5f, offset } }; door.rsDoorClose.offset( location ); door.rsDoorOpen.offset( location ); m_doorsounds.emplace_back( door ); @@ -5103,7 +5103,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, if( ( sides == "both" ) || ( sides == "right" ) ) { // ...and right - auto const location { glm::vec3 { -MoverParameters->DimHalf.x, MoverParameters->DimHalf.y, offset } }; + auto const location { glm::vec3 { MoverParameters->Dim.W * -0.5f, MoverParameters->Dim.H * 0.5f, offset } }; door.rsDoorClose.offset( location ); door.rsDoorOpen.offset( location ); m_doorsounds.emplace_back( door ); @@ -5360,12 +5360,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, dooranimationfirstindex += iAnimType[ i ]; } // couplers - auto const frontcoupleroffset { glm::vec3{ 0.f, 1.f, MoverParameters->DimHalf.z } }; + auto const frontcoupleroffset { glm::vec3{ 0.f, 1.f, MoverParameters->Dim.L * 0.5f } }; m_couplersounds[ side::front ].dsbCouplerAttach.offset( frontcoupleroffset ); m_couplersounds[ side::front ].dsbCouplerDetach.offset( frontcoupleroffset ); m_couplersounds[ side::front ].dsbCouplerStretch.offset( frontcoupleroffset ); m_couplersounds[ side::front ].dsbBufferClamp.offset( frontcoupleroffset ); - auto const rearcoupleroffset{ glm::vec3{ 0.f, 1.f, MoverParameters->DimHalf.z * -1.f } }; + auto const rearcoupleroffset { glm::vec3{ 0.f, 1.f, MoverParameters->Dim.L * -0.5f } }; m_couplersounds[ side::rear ].dsbCouplerAttach.offset( rearcoupleroffset ); m_couplersounds[ side::rear ].dsbCouplerDetach.offset( rearcoupleroffset ); m_couplersounds[ side::rear ].dsbCouplerStretch.offset( rearcoupleroffset ); diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 709a9008..20eb0834 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1067,8 +1067,6 @@ public: double TotalMassxg = 0.0; /*TotalMass*g*/ Math3D::vector3 vCoulpler[2]; // powtórzenie współrzędnych sprzęgów z DynObj :/ - Math3D::vector3 DimHalf; // połowy rozmiarów do obliczeń geometrycznych - // int WarningSignal; //0: nie trabi, 1,2: trabi syreną o podanym numerze int WarningSignal = 0; // tymczasowo 8bit, ze względu na funkcje w MTools double fBrakeCtrlPos = -2.0; // płynna nastawa hamulca zespolonego bool bPantKurek3 = true; // kurek trójdrogowy (pantografu): true=połączenie z ZG, false=połączenie z małą sprężarką // domyślnie zbiornik pantografu połączony jest ze zbiornikiem głównym diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 8d617547..1a47377f 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7052,10 +7052,6 @@ void TMoverParameters::LoadFIZ_Dimensions( std::string const &line ) { extract_value( Dim.H, "H", line, "" ); extract_value( Dim.W, "W", line, "" ); - DimHalf.x = 0.5 * Dim.W; // połowa szerokości, OX jest w bok? - DimHalf.y = 0.5 * Dim.L; // połowa długości, OY jest do przodu? - DimHalf.z = 0.5 * Dim.H; // połowa wysokości, OZ jest w górę? - extract_value( Cx, "Cx", line, "0.3" ); if( Dim.H <= 2.0 ) { //gdyby nie było parametru, lepsze to niż zero diff --git a/Train.cpp b/Train.cpp index 10942633..7f662a1b 100644 --- a/Train.cpp +++ b/Train.cpp @@ -203,6 +203,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::mubrakingindicatortoggle, &TTrain::OnCommand_mubrakingindicatortoggle }, { user_command::reverserincrease, &TTrain::OnCommand_reverserincrease }, { user_command::reverserdecrease, &TTrain::OnCommand_reverserdecrease }, + { user_command::reverserforward, &TTrain::OnCommand_reverserforward }, + { user_command::reverserneutral, &TTrain::OnCommand_reverserneutral }, + { user_command::reverserbackward, &TTrain::OnCommand_reverserbackward }, { user_command::alerteracknowledge, &TTrain::OnCommand_alerteracknowledge }, { user_command::batterytoggle, &TTrain::OnCommand_batterytoggle }, { user_command::batteryenable, &TTrain::OnCommand_batteryenable }, @@ -1394,6 +1397,61 @@ void TTrain::OnCommand_reverserdecrease( TTrain *Train, command_data const &Comm } } +void TTrain::OnCommand_reverserforward( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + if( Train->mvOccupied->ActiveDir < 1 ) { + + while( ( Train->mvOccupied->ActiveDir < 1 ) + && ( true == Train->mvOccupied->DirectionForward() ) ) { + // all work is done in the header + } + // aktualizacja skrajnych pojazdów w składzie + if( ( Train->mvOccupied->ActiveDir == 1 ) + && ( Train->DynamicObject->Mechanik ) ) { + + Train->DynamicObject->Mechanik->CheckVehicles( Change_direction ); + } + } + } +} + +void TTrain::OnCommand_reverserneutral( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + while( ( Train->mvOccupied->ActiveDir < 0 ) + && ( true == Train->mvOccupied->DirectionForward() ) ) { + // all work is done in the header + } + while( ( Train->mvOccupied->ActiveDir > 0 ) + && ( true == Train->mvOccupied->DirectionBackward() ) ) { + // all work is done in the header + } + } +} + +void TTrain::OnCommand_reverserbackward( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + if( Train->mvOccupied->ActiveDir > -1 ) { + + while( ( Train->mvOccupied->ActiveDir > -1 ) + && ( true == Train->mvOccupied->DirectionBackward() ) ) { + // all work is done in the header + } + // aktualizacja skrajnych pojazdów w składzie + if( ( Train->mvOccupied->ActiveDir == -1 ) + && ( Train->DynamicObject->Mechanik ) ) { + + Train->DynamicObject->Mechanik->CheckVehicles( Change_direction ); + } + } + } +} + void TTrain::OnCommand_alerteracknowledge( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { diff --git a/Train.h b/Train.h index be519f27..206c2481 100644 --- a/Train.h +++ b/Train.h @@ -193,6 +193,9 @@ class TTrain static void OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data const &Command ); static void OnCommand_reverserincrease( TTrain *Train, command_data const &Command ); static void OnCommand_reverserdecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_reverserforward( TTrain *Train, command_data const &Command ); + static void OnCommand_reverserneutral( TTrain *Train, command_data const &Command ); + static void OnCommand_reverserbackward( TTrain *Train, command_data const &Command ); static void OnCommand_alerteracknowledge( TTrain *Train, command_data const &Command ); static void OnCommand_batterytoggle( TTrain *Train, command_data const &Command ); static void OnCommand_batteryenable( TTrain *Train, command_data const &Command ); diff --git a/color.h b/color.h index af6408a0..1ec63e80 100644 --- a/color.h +++ b/color.h @@ -4,6 +4,7 @@ namespace colors { glm::vec4 const none{ 0.f, 0.f, 0.f, 1.f }; glm::vec4 const white{ 1.f, 1.f, 1.f, 1.f }; +glm::vec4 const shadow{ 0.65f, 0.65f, 0.65f, 1.f }; inline glm::vec3 diff --git a/command.cpp b/command.cpp index d249c849..289013f0 100644 --- a/command.cpp +++ b/command.cpp @@ -60,6 +60,9 @@ commanddescription_sequence Commands_descriptions = { { "sandboxactivate", command_target::vehicle }, { "reverserincrease", command_target::vehicle }, { "reverserdecrease", command_target::vehicle }, + { "reverserforward", command_target::vehicle }, + { "reverserneutral", command_target::vehicle }, + { "reverserbackward", command_target::vehicle }, { "linebreakertoggle", command_target::vehicle }, { "linebreakeropen", command_target::vehicle }, { "linebreakerclose", command_target::vehicle }, diff --git a/command.h b/command.h index d9695d37..99e24e74 100644 --- a/command.h +++ b/command.h @@ -54,6 +54,9 @@ enum class user_command { sandboxactivate, reverserincrease, reverserdecrease, + reverserforward, + reverserneutral, + reverserbackward, linebreakertoggle, linebreakeropen, linebreakerclose, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 76f9a6ef..bed57883 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -249,6 +249,12 @@ keyboard_input::default_bindings() { { GLFW_KEY_D }, // reverserdecrease { GLFW_KEY_R }, + // reverserforward + { -1 }, + // reverserneutral + { -1 }, + // reverserbackward + { -1 }, // linebreakertoggle { GLFW_KEY_M }, // linebreakeropen diff --git a/renderer.cpp b/renderer.cpp index 014b0223..64f27146 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1379,18 +1379,18 @@ opengl_renderer::Render( world_environment *Environment ) { // calculate shadow tone, based on positions of celestial bodies m_shadowcolor = interpolate( - glm::vec4{ 0.5f, 0.5f, 0.5f, 1.f }, + glm::vec4{ colors::shadow }, glm::vec4{ colors::white }, clamp( -Environment->m_sun.getAngle(), 0.f, 6.f ) / 6.f ); if( ( Environment->m_sun.getAngle() < -18.f ) && ( Environment->m_moon.getAngle() > 0.f ) ) { // turn on moon shadows after nautical twilight, if the moon is actually up - m_shadowcolor = glm::vec4{ 0.5f, 0.5f, 0.5f, 1.f }; + m_shadowcolor = colors::shadow; } // soften shadows depending on sky overcast factor m_shadowcolor = glm::min( colors::white, - m_shadowcolor + glm::vec4{ glm::vec3{ 0.5f * Global.Overcast }, 1.f } ); + m_shadowcolor + ( ( colors::white - colors::shadow ) * Global.Overcast ) ); if( Global.bWireFrame ) { // bez nieba w trybie rysowania linii diff --git a/renderer.h b/renderer.h index 22f1bef8..852cb70e 100644 --- a/renderer.h +++ b/renderer.h @@ -372,7 +372,7 @@ private: std::string m_debugstatstext; glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; - glm::vec4 m_shadowcolor { 0.65f, 0.65f, 0.65f, 1.f }; + glm::vec4 m_shadowcolor { colors::shadow }; // TEnvironmentType m_environment { e_flat }; float m_specularopaquescalefactor { 1.f }; float m_speculartranslucentscalefactor { 1.f }; diff --git a/uart.cpp b/uart.cpp index fd86ed2a..56d168e5 100644 --- a/uart.cpp +++ b/uart.cpp @@ -250,7 +250,7 @@ void uart_input::poll() 0, //byte 2 (uint8_t)( - trainstate.motor_resistors << 1 + trainstate.ventilator_overload << 1 | trainstate.motor_overload_threshold << 2), //byte 3 0, diff --git a/version.h b/version.h index 0783fe3f..bfd5fa7d 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 308 +#define VERSION_MINOR 309 #define VERSION_REVISION 0 From d96b2591916c2cda94c02319b5e02a8c97efb4ef Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 11 Mar 2018 15:48:30 +0100 Subject: [PATCH 293/426] additional serial port data output, 3d model load failure caching, minor refactoring and bug fixes --- Driver.cpp | 6 +++--- DynObj.cpp | 12 ++++-------- MdlMngr.cpp | 35 +++++++++++++++++------------------ MdlMngr.h | 2 +- Texture.cpp | 7 +------ Train.cpp | 1 + Train.h | 1 + audio.cpp | 7 +------ material.cpp | 6 +----- openglmatrixstack.h | 8 ++++---- scene.cpp | 12 ++---------- uart.cpp | 1 + utilities.cpp | 16 ++++++++++++++++ utilities.h | 4 ++++ version.h | 2 +- 15 files changed, 58 insertions(+), 62 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 24ea9150..8ed2c162 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -886,6 +886,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // also ignore any horn cue that may be potentially set below 1 km/h and before the actual full stop iDrivigFlags &= ~( moveStartHorn | moveStartHornNow ); } + // perform loading/unloading auto const platformside = static_cast( std::floor( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) % 10; auto const exchangetime = simulation::Station.update_load( pVehicles[ 0 ], *TrainParams, platformside ); @@ -3010,7 +3011,6 @@ void TController::Doors( bool const Open, int const Side ) { // otwieranie drzwi // otwieranie drzwi w składach wagonowych - docelowo wysyłać komendę zezwolenia na otwarcie drzwi // tu będzie jeszcze długość peronu zaokrąglona do 10m (20m bezpieczniej, bo nie modyfikuje bitu 1) - // p7=platform side (1:left, 2:right, 3:both) auto *vehicle = pVehicles[0]; // pojazd na czole składu while( vehicle != nullptr ) { // wagony muszą mieć baterię załączoną do otwarcia drzwi... @@ -3020,7 +3020,7 @@ void TController::Doors( bool const Open, int const Side ) { // if the door are controlled by the driver, we let the user operate them... if( true == AIControllFlag ) { // ...unless this user is an ai - // p7=platform side (1:left, 2:right, 3:both) + // Side=platform side (1:left, 2:right, 3:both) // jeśli jedzie do tyłu, to drzwi otwiera odwrotnie auto const lewe = ( vehicle->DirectionGet() > 0 ) ? 1 : 2; auto const prawe = 3 - lewe; @@ -3052,7 +3052,7 @@ void TController::Doors( bool const Open, int const Side ) { auto *vehicle = pVehicles[ 0 ]; // pojazd na czole składu while( vehicle != nullptr ) { // zamykanie drzwi w pojazdach - flaga zezwolenia była by lepsza - if( vehicle->MoverParameters->DoorCloseCtrl != control::passenger ) { + if( vehicle->MoverParameters->DoorCloseCtrl != control::autonomous ) { vehicle->MoverParameters->DoorLeft( false, range::local ); // w lokomotywie można by nie zamykać... vehicle->MoverParameters->DoorRight( false, range::local ); } diff --git a/DynObj.cpp b/DynObj.cpp index 3bef8953..454946f9 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2581,17 +2581,11 @@ void TDynamicObject::LoadUpdate() { // try first specialized version of the load model, vehiclename_loadname auto const specializedloadfilename { asBaseDir + MoverParameters->TypeName + "_" + MoverParameters->LoadType }; - if( ( true == FileExists( specializedloadfilename + ".e3d" ) ) - || ( true == FileExists( specializedloadfilename + ".t3d" ) ) ) { - mdLoad = TModelsManager::GetModel( specializedloadfilename, true ); - } + mdLoad = TModelsManager::GetModel( specializedloadfilename, true ); if( mdLoad == nullptr ) { // if this fails, try generic load model auto const genericloadfilename { asBaseDir + MoverParameters->LoadType }; - if( ( true == FileExists( genericloadfilename + ".e3d" ) ) - || ( true == FileExists( genericloadfilename + ".t3d" ) ) ) { - mdLoad = TModelsManager::GetModel( genericloadfilename, true ); - } + mdLoad = TModelsManager::GetModel( genericloadfilename, true ); } if( mdLoad != nullptr ) { // TODO: discern from vehicle component which merely uses vehicle directory and has no animations, so it can be initialized outright @@ -4162,6 +4156,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, int skinindex = 0; std::string texturename; nameparser >> texturename; while( ( texturename != "" ) && ( skinindex < 4 ) ) { + erase_extension( texturename ); m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + texturename ); ++skinindex; texturename = ""; nameparser >> texturename; @@ -4170,6 +4165,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else { // otherwise try the basic approach + erase_extension( ReplacableSkin ); int skinindex = 0; do { material_handle material = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), true ); diff --git a/MdlMngr.cpp b/MdlMngr.cpp index 4a611785..7adff69a 100644 --- a/MdlMngr.cpp +++ b/MdlMngr.cpp @@ -37,7 +37,7 @@ TMdlContainer::LoadModel(std::string const &Name, bool const Dynamic) { } }; -TModelsManager::modelcontainer_sequence TModelsManager::m_models; +TModelsManager::modelcontainer_sequence TModelsManager::m_models { 1, {} }; TModelsManager::stringmodelcontainerindex_map TModelsManager::m_modelsmap; // wczytanie modelu do tablicy @@ -48,12 +48,12 @@ TModelsManager::LoadModel(std::string const &Name, bool dynamic) { auto model = m_models.back().LoadModel( Name, dynamic ); if( model != nullptr ) { m_modelsmap.emplace( Name, m_models.size() - 1 ); - return model; } else { m_models.pop_back(); - return nullptr; + m_modelsmap.emplace( Name, null_handle ); } + return model; } TModel3d * @@ -87,35 +87,34 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic) Global.asCurrentTexturePath.erase( Global.asCurrentTexturePath.rfind( "/" ) + 1 ); } + erase_extension( filename ); filename = ToLower( filename ); - if( ( filename.rfind( '.' ) != std::string::npos ) - && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { - // trim extension if there's one, but don't mistake folder traverse for extension - filename.erase( filename.rfind( '.' ) ); - } // see if we have it in the databank - auto *model { find_in_databank( filename ) }; - if( model != nullptr ) { + auto banklookup { find_in_databank( filename ) }; + TModel3d *model { banklookup.second }; + if( true == banklookup.first ) { Global.asCurrentTexturePath = buftp; return model; } - // not yet loaded, check if it's on disk - std::string lookup { find_on_disk( filename ) }; + // first load attempt, check if it's on disk + std::string disklookup { find_on_disk( filename ) }; - if( false == lookup.empty() ) { - model = LoadModel( lookup, Dynamic ); // model nie znaleziony, to wczytać + if( false == disklookup.empty() ) { + model = LoadModel( disklookup, Dynamic ); // model nie znaleziony, to wczytać } else { - // there's nothing matching in the databank nor on the disk, report failure + // there's nothing matching in the databank nor on the disk, report failure... ErrorLog( "Bad file: failed do locate 3d model file \"" + filename + "\"", logtype::file ); + // ...and link it with the error model slot + m_modelsmap.emplace( filename, null_handle ); } Global.asCurrentTexturePath = buftp; // odtworzenie ścieżki do tekstur return model; // NULL jeśli błąd }; -TModel3d * +std::pair TModelsManager::find_in_databank( std::string const &Name ) { std::vector filenames { @@ -125,11 +124,11 @@ TModelsManager::find_in_databank( std::string const &Name ) { for( auto const &filename : filenames ) { auto const lookup { m_modelsmap.find( filename ) }; if( lookup != m_modelsmap.end() ) { - return ( m_models[ lookup->second ].Model.get() ); + return { true, m_models[ lookup->second ].Model.get() }; } } - return nullptr; + return { false, nullptr }; } // checks whether specified file exists. returns name of the located file, or empty string. diff --git a/MdlMngr.h b/MdlMngr.h index af26306f..ef4f2535 100644 --- a/MdlMngr.h +++ b/MdlMngr.h @@ -33,7 +33,7 @@ private: static stringmodelcontainerindex_map m_modelsmap; // methods: static TModel3d *LoadModel( std::string const &Name, bool const Dynamic ); - static TModel3d *find_in_databank( std::string const &Name ); + static std::pair find_in_databank( std::string const &Name ); // checks whether specified file exists. returns name of the located file, or empty string. static std::string find_on_disk( std::string const &Name ); diff --git a/Texture.cpp b/Texture.cpp index 1a6a6a55..f148dc8b 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -760,12 +760,7 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { Filename.erase( traitpos ); } - if( ( Filename.rfind( '.' ) != std::string::npos ) - && ( Filename.rfind( '.' ) != Filename.rfind( ".." ) + 1 ) ) { - // trim extension if there's one, but don't mistake folder traverse for extension - Filename.erase( Filename.rfind( '.' ) ); - } - + erase_extension( Filename ); // change slashes to cross-platform std::replace( std::begin( Filename ), std::end( Filename ), diff --git a/Train.cpp b/Train.cpp index 7f662a1b..3fd39ca7 100644 --- a/Train.cpp +++ b/Train.cpp @@ -547,6 +547,7 @@ TTrain::get_state() const { return { btLampkaSHP.GetValue(), btLampkaCzuwaka.GetValue(), + btLampkaRadioStop.GetValue(), btLampkaOpory.GetValue(), btLampkaWylSzybki.GetValue(), btLampkaNadmSil.GetValue(), diff --git a/Train.h b/Train.h index 206c2481..e8a449df 100644 --- a/Train.h +++ b/Train.h @@ -70,6 +70,7 @@ class TTrain struct state_t { std::uint8_t shp; std::uint8_t alerter; + std::uint8_t radio_stop; std::uint8_t motor_resistors; std::uint8_t line_breaker; std::uint8_t motor_overload; diff --git a/audio.cpp b/audio.cpp index 5b5ddaaf..e90a57ca 100644 --- a/audio.cpp +++ b/audio.cpp @@ -132,12 +132,7 @@ buffer_manager::create( std::string const &Filename ) { auto filename { ToLower( Filename ) }; - auto const dotpos { filename.rfind( '.' ) }; - if( ( dotpos != std::string::npos ) - && ( dotpos != filename.rfind( ".." ) + 1 ) ) { - // trim extension if there's one, but don't mistake folder traverse for extension - filename.erase( dotpos ); - } + erase_extension( filename ); // convert slashes std::replace( std::begin( filename ), std::end( filename ), diff --git a/material.cpp b/material.cpp index b57643c6..b2fcb201 100644 --- a/material.cpp +++ b/material.cpp @@ -110,11 +110,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { if( filename.find( '|' ) != std::string::npos ) filename.erase( filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury - if( ( filename.rfind( '.' ) != std::string::npos ) - && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { - // we can get extension for .mat or, in legacy files, some image format. just trim it and set it to material file extension - filename.erase( filename.rfind( '.' ) ); - } + erase_extension( filename ); filename += ".mat"; // change slashes to llinux-compatible diff --git a/openglmatrixstack.h b/openglmatrixstack.h index 3859d21e..d37a8cf1 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -38,9 +38,9 @@ public: m_stack.emplace( m_stack.top() ); } void pop_matrix() { - m_stack.pop(); - if( m_stack.empty() ) { m_stack.emplace( 1.f ); } - upload(); } + if( m_stack.size() > 1 ) { + m_stack.pop(); + upload(); } } void load_identity() { m_stack.top() = glm::mat4( 1.f ); @@ -80,7 +80,7 @@ private: // methods: void - upload() { ::glLoadMatrixf( &m_stack.top()[0][0] ); } + upload() { ::glLoadMatrixf( glm::value_ptr( m_stack.top() ) ); } // members: mat4_stack m_stack; diff --git a/scene.cpp b/scene.cpp index 0fa018c5..9fef581d 100644 --- a/scene.cpp +++ b/scene.cpp @@ -874,12 +874,8 @@ basic_region::serialize( std::string const &Scenariofile ) const { // trim leading $ char rainsted utility may add to the base name for modified .scn files filename.erase( 0, 1 ); } + erase_extension( filename ); filename = Global.asCurrentSceneryPath + filename; - if( ( filename.rfind( '.' ) != std::string::npos ) - && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { - // trim extension, it's typically going to be for different file type - filename.erase( filename.rfind( '.' ) ); - } filename += EU07_FILEEXTENSION_REGION; std::ofstream output { filename, std::ios::binary }; @@ -917,12 +913,8 @@ basic_region::deserialize( std::string const &Scenariofile ) { // trim leading $ char rainsted utility may add to the base name for modified .scn files filename.erase( 0, 1 ); } + erase_extension( filename ); filename = Global.asCurrentSceneryPath + filename; - if( ( filename.rfind( '.' ) != std::string::npos ) - && ( filename.rfind( '.' ) != filename.rfind( ".." ) + 1 ) ) { - // trim extension, it's typically going to be for different file type - filename.erase( filename.rfind( '.' ) ); - } filename += EU07_FILEEXTENSION_REGION; if( false == FileExists( filename ) ) { diff --git a/uart.cpp b/uart.cpp index 56d168e5..9dcb9394 100644 --- a/uart.cpp +++ b/uart.cpp @@ -272,6 +272,7 @@ void uart_input::poll() (uint8_t)( trainstate.recorder_braking << 3 | trainstate.recorder_power << 4 + | trainstate.radio_stop <<5 | trainstate.alerter_sound << 7), //byte 7-8 SPLIT_INT16(brake_press), diff --git a/utilities.cpp b/utilities.cpp index ac060970..3f791750 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -318,3 +318,19 @@ last_modified( std::string const &Filename ) { if( ::stat( Filename.c_str(), &filestat ) == 0 ) { return filestat.st_mtime; } else { return 0; } } + +// potentially erases file extension from provided file name. returns: true if extension was removed, false otherwise +bool +erase_extension( std::string &Filename ) { + + auto const extensionpos { Filename.rfind( '.' ) }; + + if( extensionpos == std::string::npos ) { return false; } + + if( extensionpos != Filename.rfind( ".." ) + 1 ) { + // we can get extension for .mat or, in legacy files, some image format. just trim it and set it to material file extension + Filename.erase( extensionpos ); + return true; + } + return false; +} diff --git a/utilities.h b/utilities.h index 40675435..6d182c7d 100644 --- a/utilities.h +++ b/utilities.h @@ -179,6 +179,10 @@ bool FileExists( std::string const &Filename ); // returns time of last modification for specified file std::time_t last_modified( std::string const &Filename ); +// potentially erases file extension from provided file name. returns: true if extension was removed, false otherwise +bool +erase_extension( std::string &Filename ); + template void SafeDelete( Type_ &Pointer ) { delete Pointer; diff --git a/version.h b/version.h index bfd5fa7d..db28cc62 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 309 +#define VERSION_MINOR 311 #define VERSION_REVISION 0 From c100fcb7d8ae85e5262abbef20f0ffdf810a5bd5 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 13 Mar 2018 21:22:09 +0100 Subject: [PATCH 294/426] build 180313. automatic door, door controls ai tweaks, truck hunting camera shake --- Driver.cpp | 68 +++++++++++++++------ Driver.h | 2 + DynObj.cpp | 21 ++++++- McZapkie/MOVER.h | 8 ++- McZapkie/Mover.cpp | 148 ++++++++++++++++++++++++++++++++++----------- Train.cpp | 27 ++++++++- Train.h | 11 +++- mouseinput.cpp | 9 +-- version.h | 2 +- 9 files changed, 232 insertions(+), 64 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 8ed2c162..0590b80f 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1954,19 +1954,26 @@ bool TController::CheckVehicles(TOrders user) } else if (OrderCurrentGet() & (Shunt | Connect)) { - Lights(16, (pVehicles[1]->MoverParameters->CabNo) ? - 1 : - 0); //światła manewrowe (Tb1) na pojeździe z napędem + Lights( + light::headlight_right, + ( pVehicles[ 1 ]->MoverParameters->CabNo ) ? + 1 : + 0 ); //światła manewrowe (Tb1) na pojeździe z napędem if (OrderCurrentGet() & Connect) // jeśli łączenie, skanować dalej pVehicles[0]->fScanDist = 5000.0; // odległość skanowania w poszukiwaniu innych pojazdów } - else if (OrderCurrentGet() == Disconnect) - if (mvOccupied->ActiveDir > 0) // jak ma kierunek do przodu - Lights(16, 0); //światła manewrowe (Tb1) tylko z przodu, aby nie pozostawić - // odczepionego ze światłem - else // jak dociska - Lights(0, 16); //światła manewrowe (Tb1) tylko z przodu, aby nie pozostawić - // odczepionego ze światłem + else if( OrderCurrentGet() == Disconnect ) { + if( mvOccupied->ActiveDir > 0 ) { + // jak ma kierunek do przodu + // światła manewrowe (Tb1) tylko z przodu, aby nie pozostawić odczepionego ze światłem + Lights( light::headlight_right, 0 ); + } + else { + // jak dociska + // światła manewrowe (Tb1) tylko z przodu, aby nie pozostawić odczepionego ze światłem + Lights( 0, light::headlight_right ); + } + } } else // Ra 2014-02: lepiej tu niż w pętli obsługującej komendy, bo tam się zmieni informacja // o składzie @@ -3036,6 +3043,11 @@ void TController::Doors( bool const Open, int const Side ) { } else { // zamykanie + if( false == doors_open() ) { + // the doors are already closed, we can skip all hard work + iDrivigFlags &= ~moveDoorOpened; + } + if( AIControllFlag ) { if( ( true == mvOccupied->DoorClosureWarning ) && ( false == mvOccupied->DepartureSignal ) @@ -3064,6 +3076,23 @@ void TController::Doors( bool const Open, int const Side ) { } } +// returns true if any vehicle in the consist has open doors +bool +TController::doors_open() const { + + auto *vehicle = pVehicles[ 0 ]; // pojazd na czole składu + while( vehicle != nullptr ) { + if( ( vehicle->MoverParameters->DoorRightOpened == true ) + || ( vehicle->MoverParameters->DoorLeftOpened == true ) ) { + // any open door is enough + return true; + } + vehicle = vehicle->Next(); + } + // if we're still here there's nothing open + return false; +} + void TController::RecognizeCommand() { // odczytuje i wykonuje komendę przekazaną lokomotywie TCommand *c = &mvOccupied->CommandIn; @@ -3128,6 +3157,9 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N } else { // inicjacja pierwszego przystanku i pobranie jego nazwy + // HACK: clear the potentially set door state flag to ensure door get opened if applicable + iDrivigFlags &= ~( moveDoorOpened ); + TrainParams->UpdateMTable( simulation::Time, TrainParams->NextStationName ); TrainParams->StationIndexInc(); // przejście do następnej iStationStart = TrainParams->StationIndex; @@ -3903,8 +3935,7 @@ TController::UpdateSituation(double dt) { // jeśli stanął już blisko, unikając zderzenia i można próbować podłączyć fMinProximityDist = -0.5; fMaxProximityDist = 0.0; //[m] dojechać maksymalnie - fVelPlus = 0.5; // dopuszczalne przekroczenie prędkości na ograniczeniu bez - // hamowania + fVelPlus = 0.5; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania fVelMinus = 0.5; // margines prędkości powodujący załączenie napędu if (AIControllFlag) { // to robi tylko AI, wersję dla człowieka trzeba dopiero zrobić @@ -3952,11 +3983,7 @@ TController::UpdateSituation(double dt) { CheckVehicles(); // sprawdzić światła nowego składu JumpToNextOrder(); // wykonanie następnej komendy } -/* - // NOTE: disabled as speed limit is decided in another place based on distance to potential target - else - SetVelocity(2.0, 0.0); // jazda w ustawionym kierunku z prędkością 2 (18s) -*/ + } // if (AIControllFlag) //koniec zblokowania, bo była zmienna lokalna } else { @@ -5167,8 +5194,13 @@ void TController::JumpToFirstOrder() void TController::OrderCheck() { // reakcja na zmianę rozkazu - if (OrderList[OrderPos] & (Shunt | Connect | Obey_train)) + if( OrderList[ OrderPos ] & ( Shunt | Connect | Obey_train ) ) { CheckVehicles(); // sprawdzić światła + } + if( OrderList[ OrderPos ] & ( Shunt | Connect ) ) { + // HACK: ensure consist doors will be closed on departure + iDrivigFlags |= moveDoorOpened; + } if (OrderList[OrderPos] & Change_direction) // może być nałożona na inną i wtedy ma priorytet iDirectionOrder = -iDirection; // trzeba zmienić jawnie, bo się nie domyśli else if (OrderList[OrderPos] == Obey_train) diff --git a/Driver.h b/Driver.h index c225a0c5..aef33df6 100644 --- a/Driver.h +++ b/Driver.h @@ -305,6 +305,8 @@ private: bool DecSpeed(bool force = false); void SpeedSet(); void Doors(bool const Open, int const Side = 0); + // returns true if any vehicle in the consist has an open door + bool doors_open() const; void RecognizeCommand(); // odczytuje komende przekazana lokomotywie void Activation(); // umieszczenie obsady w odpowiednim członie void ControllingSet(); // znajduje człon do sterowania diff --git a/DynObj.cpp b/DynObj.cpp index 454946f9..687e0d9e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1959,6 +1959,15 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" ActPar.erase( 0, indexend ); break; } + case 'H': { + // truck hunting + auto const indexstart { 1 }; + auto const indexend { ActPar.find_first_not_of( "1234567890", indexstart ) }; + auto const huntingchance { std::atoi( ActPar.substr( indexstart, indexend ).c_str() ) }; + MoverParameters->TruckHunting = ( Random( 0, 100 ) <= huntingchance ); + ActPar.erase( 0, indexend ); + break; + } default: { // unrecognized key ActPar.erase( 0, 1 ); @@ -2563,8 +2572,16 @@ void TDynamicObject::update_exchange( double const Deltatime ) { if( ( MoverParameters->DoorCloseCtrl == control::passenger ) || ( MoverParameters->DoorCloseCtrl == control::mixed ) ) { - MoverParameters->DoorLeft( false, range::local ); - MoverParameters->DoorRight( false, range::local ); + if( ( MoverParameters->Vel > 2.0 ) + || ( Random() < ( + // remotely controlled door are more likely to be left open + MoverParameters->DoorCloseCtrl == control::passenger ? + 0.75 : + 0.50 ) ) ) { + + MoverParameters->DoorLeft( false, range::local ); + MoverParameters->DoorRight( false, range::local ); + } } } } diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 20eb0834..222004de 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -869,6 +869,7 @@ public: double AccVert = 0.0; // vertical acceleration double nrot = 0.0; double WheelFlat = 0.0; + bool TruckHunting { true }; // enable/disable truck hunting calculation /*! rotacja kol [obr/s]*/ double EnginePower = 0.0; /*! chwilowa moc silnikow*/ double dL = 0.0; double Fb = 0.0; double Ff = 0.0; /*przesuniecie, sila hamowania i tarcia*/ @@ -1041,8 +1042,10 @@ public: bool DoorBlocked = false; //Czy jest blokada drzwi bool DoorLeftOpened = false; //stan drzwi + double DoorLeftOpenTimer { -1.0 }; // left door closing timer for automatic door type bool DoorRightOpened = false; - bool PantFrontUp = false; //stan patykow 'Winger 160204 + double DoorRightOpenTimer{ -1.0 }; // right door closing timer for automatic door type + bool PantFrontUp = false; //stan patykow 'Winger 160204 bool PantRearUp = false; bool PantFrontSP = true; //dzwiek patykow 'Winger 010304 bool PantRearSP = true; @@ -1232,8 +1235,9 @@ public: bool DoorRight(bool State, int const Notify = range::consist ); //obsluga drzwi prawych bool DoorBlockedFlag(void); //sprawdzenie blokady drzwi bool signal_departure( bool const State, int const Notify = range::consist ); // toggles departure warning + void update_autonomous_doors( double const Deltatime ); // automatic door controller update - /* funkcje dla samochodow*/ + /* funkcje dla samochodow*/ bool ChangeOffsetH(double DeltaOffset); /*funkcje ladujace pliki opisujace pojazd*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 1a47377f..7f22b320 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1409,23 +1409,10 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap // hamulec antypoślizgowy - wyłączanie if ((BrakeSlippingTimer > 0.8) && (ASBType != 128)) // ASBSpeed=0.8 Hamulec->ASB(0); - // SetFlag(BrakeStatus,-b_antislip); BrakeSlippingTimer += dt; - // sypanie piasku - wyłączone i piasek się nie kończy - błędy AI - // if AIControllFlag then - // if SandDose then - // if Sand>0 then - // begin - // Sand:=Sand-NPoweredAxles*SandSpeed*dt; - // if Random

10) and (not DebugmodeFlag) then + // automatic doors + update_autonomous_doors( dt ); + // security system if (!DebugModeFlag) SecuritySystemCheck(dt1); @@ -1533,6 +1520,8 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape if ((BrakeSlippingTimer > 0.8) && (ASBType != 128)) // ASBSpeed=0.8 Hamulec->ASB(0); BrakeSlippingTimer += dt; + // automatic doors + update_autonomous_doors( dt ); return d; }; @@ -6016,10 +6005,20 @@ bool TMoverParameters::DoorLeft(bool State, int const Notify ) { bool result { false }; if( ( Battery == true ) - && ( DoorBlockedFlag() == false ) ) { + && ( ( State == false ) // closing door works always, but if the lock is engaged they can't be opened + || ( DoorBlockedFlag() == false ) ) ) { DoorLeftOpened = State; result = true; + + if( DoorCloseCtrl == control::autonomous ) { + // activate or disable the door timer depending on whether door were open or closed + // NOTE: this it a local-only operation but shouldn't be an issue as automatic door are operated locally anyway + DoorLeftOpenTimer = ( + State == true ? + DoorStayOpen : + -1.0 ); + } } if( Notify != range::local ) { @@ -6056,10 +6055,20 @@ bool TMoverParameters::DoorRight(bool State, int const Notify ) { bool result { false }; if( ( Battery == true ) - && ( DoorBlockedFlag() == false ) ) { + && ( ( State == false ) + || ( DoorBlockedFlag() == false ) ) ) { DoorRightOpened = State; result = true; + + if( DoorCloseCtrl == control::autonomous ) { + // activate or disable the door timer depending on whether door were open or closed + // NOTE: this it a local-only operation but shouldn't be an issue as automatic door are operated locally anyway + DoorRightOpenTimer = ( + State == true ? + DoorStayOpen : + -1.0 ); + } } if( Notify != range::local ) { @@ -6105,6 +6114,45 @@ TMoverParameters::signal_departure( bool const State, int const Notify ) { return true; } +// automatic door controller update +void +TMoverParameters::update_autonomous_doors( double const Deltatime ) { + + if( ( DoorCloseCtrl != control::autonomous ) + || ( ( false == DoorLeftOpened ) + && ( false == DoorRightOpened ) ) ) { + // nothing to do + return; + } + + if( DoorStayOpen > 0.0 ) { + // update door timers if the door close after defined time + if( DoorLeftOpenTimer >= 0.0 ) { DoorLeftOpenTimer -= Deltatime; } + if( DoorRightOpenTimer >= 0.0 ) { DoorRightOpenTimer -= Deltatime; } + } + if( ( LoadStatus & ( 2 | 1 ) ) != 0 ) { + // if there's load exchange in progress, reset the timer(s) for already open doors + if( true == DoorLeftOpened ) { DoorLeftOpenTimer = DoorStayOpen; } + if( true == DoorRightOpened ) { DoorRightOpenTimer = DoorStayOpen; } + } + // the door are closed if their timer goes below 0, or if the vehicle is moving at > 5 km/h + // NOTE: timer value of 0 is 'special' as it means the door will stay open until vehicle is moving + if( true == DoorLeftOpened ) { + if( ( DoorLeftOpenTimer < 0.0 ) + || ( Vel > 5.0 ) ) { + // close the door and set the timer to expired state (closing may happen sooner if vehicle starts moving) + DoorLeft( false, range::local ); + } + } + if( true == DoorRightOpened ) { + if( ( DoorRightOpenTimer < 0.0 ) + || ( Vel > 5.0 ) ) { + // close the door and set the timer to expired state (closing may happen sooner if vehicle starts moving) + DoorRight( false, range::local ); + } + } +} + // ************************************************************************************************* // Q: 20160713 // Przesuwa pojazd o podaną wartość w bok względem toru (dla samochodów) @@ -8503,17 +8551,33 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C // ignore remote command if the door is only operated locally if( CValue2 > 0 ) { // normalne ustawienie pojazdu - if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) - DoorLeftOpened = true; - if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) - DoorRightOpened = true; + if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) { + DoorLeftOpened = ( + ( ( true == Battery ) && ( false == DoorBlockedFlag() ) ) ? + true : + DoorLeftOpened ); + } + if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) { + DoorRightOpened = ( + ( ( true == Battery ) && ( false == DoorBlockedFlag() ) ) ? + true : + DoorRightOpened ); + } } else { // odwrotne ustawienie pojazdu - if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) - DoorLeftOpened = true; - if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) - DoorRightOpened = true; + if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) { + DoorLeftOpened = ( + ( ( true == Battery ) && ( false == DoorBlockedFlag() ) ) ? + true : + DoorLeftOpened ); + } + if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) { + DoorRightOpened = ( + ( ( true == Battery ) && ( false == DoorBlockedFlag() ) ) ? + true : + DoorRightOpened ); + } } } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); @@ -8526,17 +8590,33 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C // ignore remote command if the door is only operated locally if( CValue2 > 0 ) { // normalne ustawienie pojazdu - if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) - DoorLeftOpened = false; - if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) - DoorRightOpened = false; + if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) { + DoorLeftOpened = ( + true == Battery ? + false : + DoorLeftOpened ); + } + if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) { + DoorRightOpened = ( + true == Battery ? + false : + DoorRightOpened ); + } } else { // odwrotne ustawienie pojazdu - if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) - DoorLeftOpened = false; - if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) - DoorRightOpened = false; + if( ( CValue1 == 2 ) || ( CValue1 == 3 ) ) { + DoorLeftOpened = ( + true == Battery ? + false : + DoorLeftOpened ); + } + if( ( CValue1 == 1 ) || ( CValue1 == 3 ) ) { + DoorRightOpened = ( + true == Battery ? + false : + DoorRightOpened ); + } } } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); diff --git a/Train.cpp b/Train.cpp index 3fd39ca7..92f5e435 100644 --- a/Train.cpp +++ b/Train.cpp @@ -3721,7 +3721,7 @@ void TTrain::UpdateMechPosition(double dt) if( std::abs( mvOccupied->enrot ) > 0.0 ) { // engine vibration shakevector.x += - ( std::cos( mvOccupied->eAngle * 4.0 ) * dt * EngineShake.scale ) + ( std::sin( mvOccupied->eAngle * 4.0 ) * dt * EngineShake.scale ) // fade in with rpm above threshold * clamp( ( mvOccupied->enrot - EngineShake.fadein_offset ) * EngineShake.fadein_factor, @@ -3734,6 +3734,20 @@ void TTrain::UpdateMechPosition(double dt) 0.0, 1.0 ) ); } } + + if( ( HuntingShake.fadein_begin > 0.f ) + && ( true == mvOccupied->TruckHunting ) ) { + // hunting oscillation + HuntingAngle = clamp_circular( HuntingAngle + 4.0 * HuntingShake.frequency * dt * mvOccupied->Vel, 360.0 ); + shakevector.x += + ( std::sin( glm::radians( HuntingAngle ) ) * dt * HuntingShake.scale ) + * interpolate( + 0.0, 1.0, + clamp( + ( mvOccupied->Vel - HuntingShake.fadein_begin ) / ( HuntingShake.fadein_end - HuntingShake.fadein_begin ), + 0.0, 1.0 ) ); + } + if( iVel > 0.5 ) { // acceleration-driven base shake shakevector += Math3D::vector3( @@ -5406,6 +5420,17 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) >> EngineShake.fadein_factor >> EngineShake.fadeout_offset >> EngineShake.fadeout_factor; + // offsets values are provided as rpm for convenience + EngineShake.fadein_offset /= 60.f; + EngineShake.fadeout_offset /= 60.f; + } + else if( token == "huntingspring:" ) { + parser.getTokens( 4, false ); + parser + >> HuntingShake.scale + >> HuntingShake.frequency + >> HuntingShake.fadein_begin + >> HuntingShake.fadein_end; } } while (token != ""); diff --git a/Train.h b/Train.h index e8a449df..1f254959 100644 --- a/Train.h +++ b/Train.h @@ -507,11 +507,18 @@ public: // reszta może by?publiczna double fMechPitch; struct engineshake_config { float scale { 2.f }; - float fadein_offset { 1.5f }; + float fadein_offset { 1.5f }; // 90 rpm float fadein_factor { 0.3f }; - float fadeout_offset { 10.f }; + float fadeout_offset { 10.f }; // 600 rpm float fadeout_factor { 0.5f }; } EngineShake; + struct huntingshake_config { + float scale { 1.f }; + float frequency { 1.f }; + float fadein_begin { 0.f }; // effect start speed in km/h + float fadein_end { 0.f }; // full effect speed in km/h + } HuntingShake; + float HuntingAngle { 0.f }; // crude approximation of hunting oscillation; current angle of sine wave sound_source dsbReverserKey { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // hunter-121211 sound_source dsbNastawnikJazdy { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; diff --git a/mouseinput.cpp b/mouseinput.cpp index 3b7a454f..004749e7 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -233,12 +233,13 @@ mouse_input::default_bindings() { { "brakeprofile_sw:", { user_command::brakeactingspeedincrease, user_command::brakeactingspeeddecrease } }, + // TODO: dedicated methods for braking speed switches { "brakeprofileg_sw:", { - user_command::brakeactingspeeddecrease, - user_command::none } }, + user_command::brakeactingspeedsetcargo, + user_command::brakeactingspeedsetpassenger } }, { "brakeprofiler_sw:", { - user_command::brakeactingspeedincrease, - user_command::none } }, + user_command::brakeactingspeedsetrapid, + user_command::brakeactingspeedsetpassenger } }, { "maxcurrent_sw:", { user_command::motoroverloadrelaythresholdtoggle, user_command::none } }, diff --git a/version.h b/version.h index db28cc62..c9e03a58 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 311 +#define VERSION_MINOR 313 #define VERSION_REVISION 0 From 4ee60eacbdf6ac29ecf144340747a03eed474701 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 18 Mar 2018 15:12:15 +0100 Subject: [PATCH 295/426] ignition sound enhancement, diesel engine volume calculation fix, duplicated event execution fix --- DynObj.cpp | 15 ++++++++++----- Event.cpp | 10 +++++++--- version.h | 2 +- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 687e0d9e..1b711cec 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4840,7 +4840,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, auto const amplitudedivisor = static_cast( ( MoverParameters->EngineType == DieselEngine ? 1 : - MoverParameters->EngineType == DieselElectric ? MoverParameters->Power * 3 : + MoverParameters->EngineType == DieselElectric ? 1 : MoverParameters->nmax * 60 + MoverParameters->Power * 3 ) ); m_powertrainsounds.engine.m_amplitudefactor /= amplitudedivisor; } @@ -5912,10 +5912,12 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub switch( Vehicle.EngineType ) { // TODO: check calculated values case DieselElectric: { + volume = engine.m_amplitudeoffset - + engine.m_amplitudefactor * ( Vehicle.EnginePower / 1000 / Vehicle.Power ) - + 0.2 * ( Vehicle.enrot * 60 ) / ( Vehicle.DElist[ Vehicle.MainCtrlPosNo ].RPM ); + + engine.m_amplitudefactor * ( + 0.25 * ( Vehicle.EnginePower / Vehicle.Power ) + + 0.75 * ( Vehicle.enrot * 60 ) / ( Vehicle.DElist[ Vehicle.MainCtrlPosNo ].RPM ) ); break; } case DieselEngine: { @@ -5923,7 +5925,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub volume = ( Vehicle.EnginePower > 0 ? engine.m_amplitudeoffset + engine.m_amplitudefactor * Vehicle.dizel_fill : - engine.m_amplitudeoffset * 0.9f + engine.m_amplitudefactor * std::fabs( Vehicle.enrot / Vehicle.dizel_nmax ) ); + engine.m_amplitudeoffset + engine.m_amplitudefactor * std::fabs( Vehicle.enrot / Vehicle.dizel_nmax ) ); } break; } @@ -6043,7 +6045,10 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub || ( Vehicle.EngineType == DieselElectric ) ) { if( true == Vehicle.dizel_enginestart ) { - engine_ignition.play( sound_flags::exclusive ); + engine_ignition + .pitch( engine_ignition.m_frequencyoffset + engine_ignition.m_frequencyfactor * 1.f ) + .gain( engine_ignition.m_amplitudeoffset + engine_ignition.m_amplitudefactor * 1.f ) + .play( sound_flags::exclusive ); } } diff --git a/Event.cpp b/Event.cpp index 4fcc7a1a..2752e213 100644 --- a/Event.cpp +++ b/Event.cpp @@ -825,7 +825,7 @@ event_manager::FindEvent( std::string const &Name ) { bool event_manager::AddToQuery( TEvent *Event, TDynamicObject *Owner ) { - if( ( false == Event->m_ignored ) && ( true == Event->bEnabled ) ) { + if( true == Event->bEnabled ) { // jeśli może być dodany do kolejki (nie używany w skanowaniu) if( !Event->iQueued ) // jeśli nie dodany jeszcze do kolejki { // kolejka eventów jest posortowana względem (fStartTime) @@ -835,10 +835,13 @@ event_manager::AddToQuery( TEvent *Event, TDynamicObject *Owner ) { // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję // wykonującą eventy i ją wywołać - if( EventConditon( Event ) ) { // teraz mogą być warunki do tych eventów + if( ( false == Event->m_ignored ) + && ( true == EventConditon( Event ) ) ) { // teraz mogą być warunki do tych eventów + Event->Params[ 5 ].asMemCell->UpdateValues( Event->Params[ 0 ].asText, Event->Params[ 1 ].asdouble, Event->Params[ 2 ].asdouble, Event->iFlags ); + if( Event->Params[ 6 ].asTrack ) { // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla // wszystkich 'dynamic' na danym torze for( auto dynamic : Event->Params[ 6 ].asTrack->Dynamics ) { @@ -869,7 +872,8 @@ event_manager::AddToQuery( TEvent *Event, TDynamicObject *Owner ) { && ( ( false == Event->bEnabled ) || ( Event->iQueued > 0 ) ) ); } - if( Event != nullptr ) { + if( ( Event != nullptr ) + && ( false == Event->m_ignored ) ) { // standardowe dodanie do kolejki ++Event->iQueued; // zabezpieczenie przed podwójnym dodaniem do kolejki WriteLog( "EVENT ADDED TO QUEUE" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->asName ); diff --git a/version.h b/version.h index c9e03a58..c7d482bd 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 313 +#define VERSION_MINOR 318 #define VERSION_REVISION 0 From 64dea17e6ffa1176f48195ee7d779059210c75da Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 27 Mar 2018 00:49:17 +0200 Subject: [PATCH 296/426] basic fuel pump, brake reservoirs air leaks, support for combined axle clatter sounds, dedicated loud buffer clash and coupler stretch sounds --- Driver.cpp | 12 ++- DynObj.cpp | 133 +++++++++++++++++-------- DynObj.h | 2 + McZapkie/MOVER.h | 13 ++- McZapkie/Mover.cpp | 229 ++++++++++++++++++++++++++++++------------- McZapkie/hamulce.cpp | 11 +++ McZapkie/hamulce.h | 2 + Train.h | 5 + World.cpp | 1 + command.cpp | 3 + command.h | 3 + keyboardinput.cpp | 6 ++ mouseinput.cpp | 3 + translation.h | 1 + version.h | 2 +- 15 files changed, 316 insertions(+), 110 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 0590b80f..c939958b 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2226,6 +2226,7 @@ bool TController::PrepareEngine() if (AIControllFlag) { // część wykonawcza dla sterowania przez komputer mvOccupied->BatterySwitch(true); + mvOccupied->FuelPumpSwitch( true ); if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { // jeśli silnikowy jest pantografującym mvControlling->PantFront( true ); @@ -3053,7 +3054,7 @@ void TController::Doors( bool const Open, int const Side ) { && ( false == mvOccupied->DepartureSignal ) && ( true == TestFlag( iDrivigFlags, moveDoorOpened ) ) ) { mvOccupied->signal_departure( true ); // załącenie bzyczka - fActionTime = -3.0 - 0.1 * Random( 10 ); // 3-4 second wait + fActionTime = -1.5 - 0.1 * Random( 10 ); // 1.5-2.5 second wait } } @@ -3070,8 +3071,15 @@ void TController::Doors( bool const Open, int const Side ) { } vehicle = vehicle->Next(); // pojazd podłączony z tyłu (patrząc od czoła) } - fActionTime = -2.5 - 0.1 * Random( 10 ); // 2.5-3.5 sec wait, +potentially 0.5 remaining + fActionTime = -2.0 - 0.1 * Random( 15 ); // 2.0-3.5 sec wait, +potentially 0.5 remaining iDrivigFlags &= ~moveDoorOpened; // zostały zamknięte - nie wykonywać drugi raz + + if( Random( 100 ) < Random( 100 ) ) { + // potentially turn off the warning before actual departure + // TBD, TODO: dedicated buzzer duration counter + mvOccupied->signal_departure( false ); + } + } } } diff --git a/DynObj.cpp b/DynObj.cpp index 1b711cec..da4436ce 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3190,8 +3190,13 @@ bool TDynamicObject::Update(double dt, double dt1) } if( dRailLength != -1 ) { if( MoverParameters->Vel > 0 ) { - - double volume = ( 20.0 + MyTrack->iDamageFlag ) / 21; + // TODO: track quality and/or environment factors as separate subroutine + auto volume = + interpolate( + 0.8, 1.2, + clamp( + MyTrack->iQualityFlag / 20.0, + 0.0, 1.0 ) ); switch( MyTrack->eEnvironment ) { case e_tunnel: { volume *= 1.1; @@ -3212,7 +3217,15 @@ bool TDynamicObject::Update(double dt, double dt1) if( axle.distance < 0 ) { axle.distance += dRailLength; if( MoverParameters->Vel > 2.5 ) { - axle.clatter.gain( volume ).play(); + // NOTE: for combined clatter sound we supply 1/100th of actual value, as the sound module converts does the opposite, converting received (typically) 0-1 values to 0-100 range + auto const frequency = ( + true == axle.clatter.is_combined() ? + MoverParameters->Vel * 0.01 : + 1.0 ); + axle.clatter + .pitch( frequency ) + .gain( volume ) + .play(); // crude bump simulation, drop down on even axles, move back up on the odd ones MoverParameters->AccVert += interpolate( @@ -3250,23 +3263,6 @@ bool TDynamicObject::Update(double dt, double dt1) } } */ - if ((MoverParameters->TrainType == dt_ET40) || (MoverParameters->TrainType == dt_EP05)) - { // dla ET40 i EU05 automatyczne cofanie nastawnika - i tak - // nie będzie to działać dobrze... - /* if - ((MoverParameters->MainCtrlPos>MoverParameters->MainCtrlActualPos)&&(abs(MoverParameters->Im)>MoverParameters->IminHi)) - { - MoverParameters->DecMainCtrl(1); - } */ - if( ( glfwGetKey( Global.window, GLFW_KEY_KP_ADD ) != GLFW_TRUE ) - && ( MoverParameters->MainCtrlPos > MoverParameters->MainCtrlActualPos ) ) { - MoverParameters->DecMainCtrl( 1 ); - } - if( ( glfwGetKey( Global.window, GLFW_KEY_KP_SUBTRACT ) != GLFW_TRUE ) - && ( MoverParameters->MainCtrlPos < MoverParameters->MainCtrlActualPos ) ) { - MoverParameters->IncMainCtrl( 1 ); // Ra 15-01: a to nie miało być tylko cofanie? - } - } if (MoverParameters->Vel != 0) { // McZapkie-050402: krecenie kolami: @@ -3972,22 +3968,29 @@ void TDynamicObject::RenderSounds() { // volume calculation volume = - bogiesound.m_amplitudeoffset + - bogiesound.m_amplitudefactor * MoverParameters->Vel; + bogiesound.m_amplitudeoffset + + bogiesound.m_amplitudefactor * MoverParameters->Vel; if( brakeforceratio > 0.0 ) { // hamulce wzmagaja halas volume *= 1 + 0.125 * brakeforceratio; } // scale volume by track quality - volume *= ( 20.0 + MyTrack->iDamageFlag ) / 21; - // scale volume with vehicle speed - // TBD, TODO: disable the scaling for sounds combined from speed-based samples? + // TODO: track quality and/or environment factors as separate subroutine volume *= interpolate( - 0.0, 1.0, + 0.8, 1.2, clamp( - MoverParameters->Vel / 40.0, + MyTrack->iQualityFlag / 20.0, 0.0, 1.0 ) ); + // for single sample sounds muffle the playback at low speeds + if( false == bogiesound.is_combined() ) { + volume *= + interpolate( + 0.0, 1.0, + clamp( + MoverParameters->Vel / 40.0, + 0.0, 1.0 ) ); + } if( volume > 0.05 ) { // apply calculated parameters to all motor instances @@ -4069,21 +4072,51 @@ void TDynamicObject::RenderSounds() { if( true == TestFlag( coupler.sounds, sound::bufferclash ) ) { // zderzaki uderzaja o siebie - couplersounds.dsbBufferClamp - .gain( - true == TestFlag( coupler.sounds, sound::loud ) ? - 1.f : - 0.65f ) - .play( sound_flags::exclusive ); + if( true == TestFlag( coupler.sounds, sound::loud ) ) { + // loud clash + if( false == couplersounds.dsbBufferClamp_loud.empty() ) { + // dedicated sound for loud clash + couplersounds.dsbBufferClamp_loud + .gain( 1.f ) + .play( sound_flags::exclusive ); + } + else { + // fallback on the standard sound + couplersounds.dsbBufferClamp + .gain( 1.f ) + .play( sound_flags::exclusive ); + } + } + else { + // basic clash + couplersounds.dsbBufferClamp + .gain( 0.65f ) + .play( sound_flags::exclusive ); + } } if( true == TestFlag( coupler.sounds, sound::couplerstretch ) ) { // sprzegi sie rozciagaja - couplersounds.dsbCouplerStretch - .gain( - true == TestFlag( coupler.sounds, sound::loud ) ? - 1.f : - 0.65f ) - .play( sound_flags::exclusive ); + if( true == TestFlag( coupler.sounds, sound::loud ) ) { + // loud stretch + if( false == couplersounds.dsbCouplerStretch_loud.empty() ) { + // dedicated sound for loud stretch + couplersounds.dsbCouplerStretch_loud + .gain( 1.f ) + .play( sound_flags::exclusive ); + } + else { + // fallback on the standard sound + couplersounds.dsbCouplerStretch + .gain( 1.f ) + .play( sound_flags::exclusive ); + } + } + else { + // basic clash + couplersounds.dsbCouplerStretch + .gain( 0.65f ) + .play( sound_flags::exclusive ); + } } coupler.sounds = 0; @@ -5257,6 +5290,15 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, couplersounds.dsbCouplerStretch = couplerstretch; } } + else if( token == "couplerstretch_loud:" ) { + // coupler stretching + sound_source couplerstretch { sound_placement::external }; + couplerstretch.deserialize( parser, sound_type::single ); + couplerstretch.owner( this ); + for( auto &couplersounds : m_couplersounds ) { + couplersounds.dsbCouplerStretch_loud = couplerstretch; + } + } else if( token == "bufferclamp:" ) { // buffers hitting one another sound_source bufferclash { sound_placement::external }; @@ -5266,6 +5308,15 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, couplersounds.dsbBufferClamp = bufferclash; } } + else if( token == "bufferclamp_loud:" ) { + // buffers hitting one another + sound_source bufferclash { sound_placement::external }; + bufferclash.deserialize( parser, sound_type::single ); + bufferclash.owner( this ); + for( auto &couplersounds : m_couplersounds ) { + couplersounds.dsbBufferClamp_loud = bufferclash; + } + } } while( token != "" ); @@ -5377,12 +5428,16 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_couplersounds[ side::front ].dsbCouplerAttach.offset( frontcoupleroffset ); m_couplersounds[ side::front ].dsbCouplerDetach.offset( frontcoupleroffset ); m_couplersounds[ side::front ].dsbCouplerStretch.offset( frontcoupleroffset ); + m_couplersounds[ side::front ].dsbCouplerStretch_loud.offset( frontcoupleroffset ); m_couplersounds[ side::front ].dsbBufferClamp.offset( frontcoupleroffset ); + m_couplersounds[ side::front ].dsbBufferClamp_loud.offset( frontcoupleroffset ); auto const rearcoupleroffset { glm::vec3{ 0.f, 1.f, MoverParameters->Dim.L * -0.5f } }; m_couplersounds[ side::rear ].dsbCouplerAttach.offset( rearcoupleroffset ); m_couplersounds[ side::rear ].dsbCouplerDetach.offset( rearcoupleroffset ); m_couplersounds[ side::rear ].dsbCouplerStretch.offset( rearcoupleroffset ); + m_couplersounds[ side::rear ].dsbCouplerStretch_loud.offset( rearcoupleroffset ); m_couplersounds[ side::rear ].dsbBufferClamp.offset( rearcoupleroffset ); + m_couplersounds[ side::rear ].dsbBufferClamp_loud.offset( rearcoupleroffset ); } //--------------------------------------------------------------------------- diff --git a/DynObj.h b/DynObj.h index caa307e7..664eb18f 100644 --- a/DynObj.h +++ b/DynObj.h @@ -275,7 +275,9 @@ private: sound_source dsbCouplerAttach { sound_placement::external }; // moved from cab sound_source dsbCouplerDetach { sound_placement::external }; // moved from cab sound_source dsbCouplerStretch { sound_placement::external }; // moved from cab + sound_source dsbCouplerStretch_loud { sound_placement::external }; sound_source dsbBufferClamp { sound_placement::external }; // moved from cab + sound_source dsbBufferClamp_loud { sound_placement::external }; }; struct pantograph_sounds { diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 222004de..f1056f95 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -85,7 +85,6 @@ const double Steel2Steel_friction = 0.15; //tarcie statyczne const double g = 9.81; //przyspieszenie ziemskie const double SandSpeed = 0.1; //ile kg/s} const double Pirazy2 = 6.2831853071794f; -#define PI 3.1415926535897f //-- var, const, procedure --------------------------------------------------- static bool const Go = true; @@ -618,6 +617,15 @@ struct TCoupling { int sounds { 0 }; // sounds emitted by the coupling devices }; +// basic approximation of a fuel pump +// TODO: fuel consumption, optional automatic engine start after activation +struct fuel_pump { + + bool is_enabled { false }; // device is allowed/requested to operate + bool is_active { false }; // device is working + start start_type { start::manual }; +}; + class TMoverParameters { // Ra: wrapper na kod pascalowy, przejmujący jego funkcje Q: 20160824 - juz nie wrapper a klasa bazowa :) public: @@ -904,6 +912,7 @@ public: bool ConverterAllow = false; /*zezwolenie na prace przetwornicy NBMX*/ bool ConverterAllowLocal{ true }; // local device state override (most units don't have this fitted so it's set to true not to intefere) bool ConverterFlag = false; /*! czy wlaczona przetwornica NBMX*/ + fuel_pump FuelPump; int BrakeCtrlPos = -2; /*nastawa hamulca zespolonego*/ double BrakeCtrlPosR = 0.0; /*nastawa hamulca zespolonego - plynna dla FV4a*/ @@ -1190,12 +1199,14 @@ public: /*--funkcje dla lokomotyw*/ bool DirectionBackward(void);/*! kierunek ruchu*/ + bool FuelPumpSwitch( bool State, int const Notify = range::consist ); // fuel pump state toggle bool MainSwitch( bool const State, int const Notify = range::consist );/*! wylacznik glowny*/ bool ConverterSwitch( bool State, int const Notify = range::consist );/*! wl/wyl przetwornicy*/ bool CompressorSwitch( bool State, int const Notify = range::consist );/*! wl/wyl sprezarki*/ /*-funkcje typowe dla lokomotywy elektrycznej*/ void ConverterCheck( double const Timestep ); // przetwornica + void FuelPumpCheck( double const Timestep ); bool FuseOn(void); //bezpiecznik nadamiary bool FuseFlagCheck(void); // sprawdzanie flagi nadmiarowego void FuseOff(void); // wylaczenie nadmiarowego diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 7f22b320..2ae53a80 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1572,6 +1572,14 @@ void TMoverParameters::ConverterCheck( double const Timestep ) { } }; +// fuel pump status update +void TMoverParameters::FuelPumpCheck( double const Timestep ) { + + FuelPump.is_active = ( + ( true == FuelPump.is_enabled ) + && ( true == Battery ) ); +} + double TMoverParameters::ShowCurrent(int AmpN) { // Odczyt poboru prądu na podanym amperomierzu switch (EngineType) @@ -2339,13 +2347,38 @@ bool TMoverParameters::AntiSlippingButton(void) return (AntiSlippingBrake() /*|| Sandbox(true)*/); } +// fuel pump state toggle +bool TMoverParameters::FuelPumpSwitch( bool State, int const Notify ) { + + if( FuelPump.start_type == start::automatic ) { + // automatic fuel pump ignores 'manual' state commands + return false; + } + + bool const initialstate { FuelPump.is_enabled }; + + FuelPump.is_enabled = State; + + if( Notify != range::local ) { + SendCtrlToNext( + "FuelPumpSwitch", + ( FuelPump.is_enabled ? 1 : 0 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( FuelPump.is_enabled != initialstate ); +} + // ************************************************************************************************* // Q: 20160713 // włączenie / wyłączenie obwodu głownego // ************************************************************************************************* bool TMoverParameters::MainSwitch( bool const State, int const Notify ) { - bool MS = false; // Ra: przeniesione z końca + bool const initialstate { Mains }; if( ( Mains != State ) && ( MainCtrlPosNo > 0 ) ) { @@ -2357,46 +2390,59 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) && ( false == TestFlag( DamageFlag, dtrain_out ) ) && ( false == TestFlag( EngDmgFlag, 1 ) ) ) ) { - if( true == Mains ) { - // jeśli był załączony - if( Notify != range::local ) { - // wysłanie wyłączenia do pozostałych? - SendCtrlToNext( - "MainSwitch", int( State ), CabNo, - ( Notify == range::unit ? - coupling::control | coupling::permanent : - coupling::control ) ); + if( true == State ) { + // switch on + if( ( EngineType == DieselEngine ) + || ( EngineType == DieselElectric ) ) { + + if( true == FuelPump.start_type == start::automatic ) { + // potentially force start of the fuel pump + // TODO: the whole diesel start sequence is a special kind of a mess, clean it up when refactoring + FuelPump.is_enabled = true; + FuelPumpCheck( 0.0 ); + } + if( true == FuelPump.is_active ) { + Mains = true; + dizel_enginestart = true; + } + } + else { + Mains = true; } } - Mains = State; - MS = true; // wartość zwrotna - LastSwitchingTime = 0; - - if( true == Mains ) { - // jeśli został załączony - if( Notify != range::local ) { - // wysłanie wyłączenia do pozostałych? - SendCtrlToNext( - "MainSwitch", int( State ), CabNo, - ( Notify == range::unit ? - coupling::control | coupling::permanent : - coupling::control ) ); + else { + Mains = false; + if( true == FuelPump.start_type == start::automatic ) { + // if the engine is off, switch off automatic fuel pump + FuelPump.is_enabled = false; } } - if( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) { - dizel_enginestart = State; - } if( ( TrainType == dt_EZT ) && ( false == State ) ) { ConvOvldFlag = true; } + + if( Mains != initialstate ) { + LastSwitchingTime = 0; + } + + if( Notify != range::local ) { + // pass the command to other vehicles + SendCtrlToNext( + "MainSwitch", + ( State ? 1 : 0 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + } } // else MainSwitch:=false; - return MS; + return ( Mains != initialstate ); } // ************************************************************************************************* @@ -3023,6 +3069,8 @@ void TMoverParameters::UpdateBrakePressure(double dt) dpLocalValve = 0; dpBrake = 0; + Hamulec->ForceLeak( dt * AirLeakRate * 0.25 ); // fake air leaks from brake system reservoirs + BrakePress = Hamulec->GetBCP(); // BrakePress:=(Hamulec as TEst4).ImplsRes.pa; Volume = Hamulec->GetBRP(); @@ -3066,8 +3114,9 @@ void TMoverParameters::CompressorCheck(double dt) } else { - if( ( EngineType == DieselEngine ) - && ( CompressorPower == 0 ) ) { + if( ( CompressorPower == 0 ) + && ( ( EngineType == DieselEngine ) + || ( EngineType == DieselElectric ) ) ) { // experimental: make sure compressor coupled with diesel engine is always ready for work CompressorAllow = true; } @@ -4065,7 +4114,7 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) // 090503: dzwieki pracy sprzegu SetFlag( Couplers[ CouplerN ].sounds, - ( absdV > 0.1 ? + ( absdV > 0.035 ? ( sound::couplerstretch | sound::loud ) : sound::couplerstretch ) ); } @@ -4168,8 +4217,9 @@ double TMoverParameters::TractionForce(double dt) // youBy switch( EngineType ) { case DieselElectric: { - if( true == ConverterFlag ) { - // NOTE: converter is currently a stand-in for a fuel pump + if( ( true == Mains ) + && ( true == FuelPump.is_active ) ) { + tmp = DElist[ MainCtrlPos ].RPM / 60.0; if( ( true == Heating ) @@ -4436,7 +4486,8 @@ double TMoverParameters::TractionForce(double dt) PosRatio = currentgenpower / DElist[MainCtrlPosNo].GenPower; // stosunek mocy teraz do mocy max - if( ( MainCtrlPos > 0 ) && ( ConverterFlag ) ) { + // NOTE: Mains in this context is working diesel engine + if( ( true == Mains ) && ( MainCtrlPos > 0 ) ) { if( tmpV < ( Vhyp * power / DElist[ MainCtrlPosNo ].GenPower ) ) { // czy na czesci prostej, czy na hiperboli @@ -5690,10 +5741,15 @@ bool TMoverParameters::dizel_AutoGearCheck(void) // ************************************************************************************************* bool TMoverParameters::dizel_Update(double dt) { - double const fillspeed { 2 }; - bool DU { false }; + FuelPumpCheck( dt ); + // potentially automatic engine start after fuel pump was activated + if( ( true == Mains ) + && ( false == FuelPump.is_active ) ) { + // knock out the engine if the fuel pump isn't feeding it + // TBD, TODO: grace period before the engine is starved for fuel and knocked out + MainSwitch( false ); + } - // dizel_Update:=false; if( ( true == dizel_enginestart ) && ( LastSwitchingTime >= InitialCtrlDelay ) ) { dizel_enginestart = false; @@ -5707,9 +5763,12 @@ bool TMoverParameters::dizel_Update(double dt) DElist[ 0 ].RPM / 60.0 ) ); } + bool DU { false }; + if( EngineType == DieselEngine ) { dizel_EngageChange( dt ); DU = dizel_AutoGearCheck(); + double const fillspeed { 2 }; dizel_fill = dizel_fill + fillspeed * dt * ( dizel_fillcheck( MainCtrlPos ) - dizel_fill ); } @@ -5722,19 +5781,24 @@ bool TMoverParameters::dizel_Update(double dt) // ************************************************************************************************* double TMoverParameters::dizel_fillcheck(int mcp) { - double realfill, nreg; + auto realfill { 0.0 }; - realfill = 0; - nreg = 0; - if (Mains && (MainCtrlPosNo > 0)) - { - if (dizel_enginestart && - (LastSwitchingTime >= 0.9 * InitialCtrlDelay)) // wzbogacenie przy rozruchu - realfill = 1; - else - realfill = RList[mcp].R; // napelnienie zalezne od MainCtrlPos + if( ( true == Mains ) + && ( MainCtrlPosNo > 0 ) + && ( true == FuelPump.is_active ) ) { + + if( ( true == dizel_enginestart ) + && ( LastSwitchingTime >= 0.9 * InitialCtrlDelay ) ) { + // wzbogacenie przy rozruchu + realfill = 1; + } + else { + // napelnienie zalezne od MainCtrlPos + realfill = RList[ mcp ].R; + } if (dizel_nmax_cutoff > 0) { + auto nreg { 0.0 }; switch (RList[MainCtrlPos].Mn) { case 0: @@ -5749,13 +5813,8 @@ double TMoverParameters::dizel_fillcheck(int mcp) break; default: realfill = 0; // sluczaj + break; } - /*if (enrot > nreg) - realfill = realfill * (3.9 - 3.0 * abs(enrot) / nreg); - if (enrot > dizel_nmax_cutoff) - realfill = realfill * (9.8 - 9.0 * abs(enrot) / dizel_nmax_cutoff); - if (enrot < dizel_nmin) - realfill = realfill * (1.0 + (dizel_nmin - abs(enrot)) / dizel_nmin);*/ if (enrot > nreg) //nad predkoscia regulatora zeruj dawke realfill = 0; if (enrot < nreg) //pod predkoscia regulatora dawka zadana @@ -5764,11 +5823,8 @@ double TMoverParameters::dizel_fillcheck(int mcp) realfill = 1; } } - if (realfill < 0) - realfill = 0; - if (realfill > 1) - realfill = 1; - return realfill; + + return clamp( realfill, 0.0, 1.0 ); } // ************************************************************************************************* @@ -5794,7 +5850,7 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) Moment = -dizel_Mstand; } if( ( enrot < dizel_nmin / 10.0 ) - && ( eAngle < PI / 2.0 ) ) { + && ( eAngle < M_PI_2 ) ) { // wstrzymywanie przy malych obrotach Moment -= dizel_Mstand; } @@ -7553,7 +7609,7 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { // converter { - std::map starts{ + std::map starts { { "Manual", start::manual }, { "Automatic", start::automatic } }; @@ -7564,6 +7620,20 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { start::manual; } extract_value( ConverterStartDelay, "ConverterStartDelay", line, "" ); + + // fuel pump + { + std::map starts { + { "Manual", start::manual }, + { "Automatic", start::automatic } + }; + auto lookup = starts.find( extract_value( "FuelStart", line ) ); + FuelPump.start_type = + lookup != starts.end() ? + lookup->second : + start::manual; + } + } void TMoverParameters::LoadFIZ_Light( std::string const &line ) { @@ -8451,16 +8521,41 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C OK = BrakeReleaser(Round(CValue1)); // samo się przesyła dalej // OK:=SendCtrlToNext(command,CValue1,CValue2); //to robiło kaskadę 2^n } + else if (Command == "FuelPumpSwitch") { + if( FuelPump.start_type == start::manual ) { + // automatic fuel pump ignores 'manual' state commands + FuelPump.is_enabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } else if (Command == "MainSwitch") { - if (CValue1 == 1) - { - Mains = true; - if ((EngineType == DieselEngine) && Mains) - dizel_enginestart = true; + if (CValue1 == 1) { + + if( ( EngineType == DieselEngine ) + || ( EngineType == DieselElectric ) ) { + if( true == FuelPump.start_type == start::automatic ) { + // potentially force start of the fuel pump + // TODO: the whole diesel start sequence is a special kind of mess, clean it up when refactoring + FuelPump.is_enabled = true; + FuelPumpCheck( 0.0 ); + } + if( true == FuelPump.is_active ) { + Mains = true; + dizel_enginestart = true; + } + } + else { + Mains = true; + } } - else - Mains = false; + else { + Mains = false; + if( true == FuelPump.start_type == start::automatic ) { + // if the engine is off, switch off automatic fuel pump + FuelPump.is_enabled = false; + } + } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "Direction") diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index e5f64025..10f2e949 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -412,6 +412,17 @@ void TBrake::ForceEmptiness() BrakeRes->Act(); } +// removes specified amount of air from the reservoirs +// NOTE: experimental feature, for now limited only to brake reservoir +void TBrake::ForceLeak( double const Amount ) { + + BrakeRes->Flow( -Amount * BrakeRes->P() ); + ValveRes->Flow( -Amount * ValveRes->P() * 0.01 ); // this reservoir has hard coded, tiny capacity compared to other parts + + BrakeRes->Act(); + ValveRes->Act(); +} + //---WESTINGHOUSE--- void TWest::Init( double const PP, double const HPP, double const LPP, double const BP, int const BDF ) diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index f36fec48..ac6fbf9a 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -211,6 +211,8 @@ class TBrake { int GetStatus(); //flaga statusu, moze sie przydac do odglosow void SetASBP( double const Press ); //ustalenie cisnienia pp virtual void ForceEmptiness(); + // removes specified amount of air from the reservoirs + virtual void ForceLeak( double const Amount ); int GetSoundFlag(); int GetBrakeStatus() const { return BrakeStatus; } void SetBrakeStatus( int const Status ) { BrakeStatus = Status; } diff --git a/Train.h b/Train.h index 1f254959..9b530afc 100644 --- a/Train.h +++ b/Train.h @@ -213,6 +213,9 @@ class TTrain static void OnCommand_linebreakertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakeropen( TTrain *Train, command_data const &Command ); static void OnCommand_linebreakerclose( TTrain *Train, command_data const &Command ); + static void OnCommand_fuelpumptoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_fuelpumpenable( TTrain *Train, command_data const &Command ); + static void OnCommand_fuelpumpdisable( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_converterenable( TTrain *Train, command_data const &Command ); static void OnCommand_converterdisable( TTrain *Train, command_data const &Command ); @@ -402,6 +405,8 @@ public: // reszta może by?publiczna TGauge ggSignallingButton; TGauge ggDoorSignallingButton; + TGauge ggFuelPumpButton; // fuel pump switch + TButton btLampkaPoslizg; TButton btLampkaStyczn; TButton btLampkaNadmPrzetw; diff --git a/World.cpp b/World.cpp index b6005609..09b440b4 100644 --- a/World.cpp +++ b/World.cpp @@ -1323,6 +1323,7 @@ TWorld::Update_UI() { uitextline2 += ( vehicle->MoverParameters->PantRearUp ? ( vehicle->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; uitextline2 += ( vehicle->MoverParameters->PantFrontUp ? ( vehicle->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; uitextline2 += ( vehicle->MoverParameters->PantPressLockActive ? "!" : ( vehicle->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); + uitextline2 += ( vehicle->MoverParameters->FuelPump.is_enabled ? ( vehicle->MoverParameters->FuelPump.is_active ? "F" : "f" ) : "." );; uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); uitextline2 += ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorPower > 1 ) ? ( vehicle->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); diff --git a/command.cpp b/command.cpp index 289013f0..ba7e2d3b 100644 --- a/command.cpp +++ b/command.cpp @@ -63,6 +63,9 @@ commanddescription_sequence Commands_descriptions = { { "reverserforward", command_target::vehicle }, { "reverserneutral", command_target::vehicle }, { "reverserbackward", command_target::vehicle }, + { "fuelpumptoggle", command_target::vehicle }, + { "fuelpumpenable", command_target::vehicle }, + { "fuelpumpdisable", command_target::vehicle }, { "linebreakertoggle", command_target::vehicle }, { "linebreakeropen", command_target::vehicle }, { "linebreakerclose", command_target::vehicle }, diff --git a/command.h b/command.h index 99e24e74..ee5b1f3a 100644 --- a/command.h +++ b/command.h @@ -57,6 +57,9 @@ enum class user_command { reverserforward, reverserneutral, reverserbackward, + fuelpumptoggle, + fuelpumpenable, + fuelpumpdisable, linebreakertoggle, linebreakeropen, linebreakerclose, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index bed57883..e0c63d02 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -255,6 +255,12 @@ keyboard_input::default_bindings() { { -1 }, // reverserbackward { -1 }, + // fuelpumptoggle + { GLFW_KEY_F }, + // fuelpumpenable, + { -1 }, + // fuelpumpdisable, + { -1 }, // linebreakertoggle { GLFW_KEY_M }, // linebreakeropen diff --git a/mouseinput.cpp b/mouseinput.cpp index 004749e7..582162b2 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -243,6 +243,9 @@ mouse_input::default_bindings() { { "maxcurrent_sw:", { user_command::motoroverloadrelaythresholdtoggle, user_command::none } }, + { "fuelpump_sw:", { + user_command::fuelpumptoggle, + user_command::none } }, { "main_off_bt:", { user_command::linebreakeropen, user_command::none } }, diff --git a/translation.h b/translation.h index 6233b87f..e7dbf543 100644 --- a/translation.h +++ b/translation.h @@ -29,6 +29,7 @@ static std::unordered_map m_cabcontrols = { { "brakeprofileg_sw:", "brake acting speed: cargo" }, { "brakeprofiler_sw:", "brake acting speed: rapid" }, { "maxcurrent_sw:", "motor overload relay threshold" }, + { "fuelpump_sw:", "fuel pump" }, { "main_off_bt:", "line breaker" }, { "main_on_bt:", "line breaker" }, { "security_reset_bt:", "alerter" }, diff --git a/version.h b/version.h index c7d482bd..bc9715f3 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 318 +#define VERSION_MINOR 326 #define VERSION_REVISION 0 From 6ffced1d9006e619d7e90abd7a124b73c1970eee Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 29 Mar 2018 03:48:21 +0200 Subject: [PATCH 297/426] file access cross-platform compatibility fixes --- DynObj.cpp | 15 ++++++++++----- EU07.cpp | 4 ++-- Event.cpp | 3 +-- MdlMngr.cpp | 7 ++++--- PyInt.cpp | 2 +- Texture.cpp | 5 +---- World.cpp | 2 +- audio.cpp | 5 +---- material.cpp | 11 ++++------- stars.cpp | 2 +- utilities.cpp | 9 +++++++++ utilities.h | 5 +++++ 12 files changed, 40 insertions(+), 30 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index da4436ce..c188cc77 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1733,7 +1733,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" ) { // Ustawienie początkowe pojazdu iDirection = (Reversed ? 0 : 1); // Ra: 0, jeśli ma być wstawiony jako obrócony tyłem - asBaseDir = "dynamic\\" + BaseDir + "\\"; // McZapkie-310302 + asBaseDir = szDynamicPath + BaseDir + "/"; // McZapkie-310302 + replace_slashes( asBaseDir ); asName = Name; std::string asAnimName = ""; // zmienna robocza do wyszukiwania osi i wózków // Ra: zmieniamy znaczenie obsady na jednoliterowe, żeby dosadzić kierownika @@ -1768,9 +1769,9 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" if (!MoverParameters->LoadFIZ(asBaseDir)) { // jak wczytanie CHK się nie uda, to błąd if (ConversionError == 666) - ErrorLog( "Bad vehicle: failed do locate definition file \"" + BaseDir + "\\" + Type_Name + ".fiz" + "\"" ); + ErrorLog( "Bad vehicle: failed do locate definition file \"" + BaseDir + "/" + Type_Name + ".fiz" + "\"" ); else { - ErrorLog( "Bad vehicle: failed to load definition from file \"" + BaseDir + "\\" + Type_Name + ".fiz\" (error " + to_string( ConversionError ) + ")" ); + ErrorLog( "Bad vehicle: failed to load definition from file \"" + BaseDir + "/" + Type_Name + ".fiz\" (error " + to_string( ConversionError ) + ")" ); } return 0.0; // zerowa długość to brak pojazdu } @@ -1780,8 +1781,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" (fVel > 0 ? 1 : -1) * Cab * (iDirection ? 1 : -1))) // jak jedzie lub obsadzony to gotowy do drogi { - Error("Parameters mismatch: dynamic object " + asName + " from\n" + BaseDir + "\\" + - Type_Name); + Error("Parameters mismatch: dynamic object " + asName + " from \"" + BaseDir + "/" + Type_Name + "\"" ); return 0.0; // zerowa długość to brak pojazdu } // ustawienie pozycji hamulca @@ -4173,11 +4173,16 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_materialdata.multi_textures = 0; // czy jest wiele tekstur wymiennych? parser.getTokens(); parser >> asModel; + replace_slashes( asModel ); if( asModel[asModel.size() - 1] == '#' ) // Ra 2015-01: nie podoba mi siê to { // model wymaga wielu tekstur wymiennych m_materialdata.multi_textures = 1; asModel.erase( asModel.length() - 1 ); } + // name can contain leading slash, erase it to avoid creation of double slashes when the name is combined with current directory + if( asModel[ 0 ] == '/' ) { + asModel.erase( 0, 1 ); + } std::size_t i = asModel.find( ',' ); if ( i != std::string::npos ) { // Ra 2015-01: może szukać przecinka w nazwie modelu, a po przecinku była by liczba tekstur? diff --git a/EU07.cpp b/EU07.cpp index 980c9716..589c6017 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -436,8 +436,8 @@ int main(int argc, char *argv[]) #endif if( Global.iConvertModels < 0 ) { Global.iConvertModels = -Global.iConvertModels; - World.CreateE3D( "models\\" ); // rekurencyjne przeglądanie katalogów - World.CreateE3D( "dynamic\\", true ); + World.CreateE3D( szModelPath ); // rekurencyjne przeglądanie katalogów + World.CreateE3D( szDynamicPath, true ); } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć #ifdef _WIN32 Console::On(); // włączenie konsoli diff --git a/Event.cpp b/Event.cpp index 2752e213..45155d95 100644 --- a/Event.cpp +++ b/Event.cpp @@ -476,9 +476,8 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) } else if (token.substr(token.length() - 4, 4) == ".vmd") // na razie tu, może będzie inaczej { // animacja z pliku VMD -// TFileStream *fs = new TFileStream( "models\\" + AnsiString( token.c_str() ), fmOpenRead ); { - std::ifstream file( "models\\" + token, std::ios::binary | std::ios::ate ); file.unsetf( std::ios::skipws ); + std::ifstream file( szModelPath + token, std::ios::binary | std::ios::ate ); file.unsetf( std::ios::skipws ); auto size = file.tellg(); // ios::ate already positioned us at the end of the file file.seekg( 0, std::ios::beg ); // rewind the caret afterwards Params[ 7 ].asInt = size; diff --git a/MdlMngr.cpp b/MdlMngr.cpp index 7adff69a..3dea431c 100644 --- a/MdlMngr.cpp +++ b/MdlMngr.cpp @@ -81,12 +81,13 @@ TModelsManager::GetModel(std::string const &Name, bool const Dynamic) // - wczytanie modelu animowanego - Init() - sprawdzić std::string const buftp { Global.asCurrentTexturePath }; // zapamiętanie aktualnej ścieżki do tekstur, std::string filename { Name }; - if( Name.find( '/' ) != std::string::npos ) { + if( ( false == Dynamic ) + && ( Name.find( '/' ) != std::string::npos ) ) { // pobieranie tekstur z katalogu, w którym jest model + // when loading vehicles the path is set by the calling routine, so we can skip it here Global.asCurrentTexturePath += Name; - Global.asCurrentTexturePath.erase( Global.asCurrentTexturePath.rfind( "/" ) + 1 ); + Global.asCurrentTexturePath.erase( Global.asCurrentTexturePath.rfind( '/' ) + 1 ); } - erase_extension( filename ); filename = ToLower( filename ); diff --git a/PyInt.cpp b/PyInt.cpp index e426af9f..c4615c50 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -479,7 +479,7 @@ void TPythonScreens::update() void TPythonScreens::setLookupPath(std::string const &path) { _lookupPath = path; - std::replace(_lookupPath.begin(), _lookupPath.end(), '\\', '/'); + replace_slashes( _lookupPath ); } TPythonScreens::TPythonScreens() diff --git a/Texture.cpp b/Texture.cpp index f148dc8b..d077195b 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -761,10 +761,7 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { } erase_extension( Filename ); - // change slashes to cross-platform - std::replace( - std::begin( Filename ), std::end( Filename ), - '\\', '/' ); + replace_slashes( Filename ); std::vector extensions { { ".dds" }, { ".tga" }, { ".bmp" }, { ".ext" } }; diff --git a/World.cpp b/World.cpp index 09b440b4..23b6793b 100644 --- a/World.cpp +++ b/World.cpp @@ -1955,7 +1955,7 @@ void TWorld::CreateE3D(std::string const &Path, bool Dynamic) // launch recursive search for sub-directories... if( filename == "." ) { continue; } if( filename == ".." ) { continue; } - CreateE3D( Path + filename + "\\", Dynamic ); + CreateE3D( Path + filename + "/", Dynamic ); } else { // process the file diff --git a/audio.cpp b/audio.cpp index e90a57ca..c9511e2e 100644 --- a/audio.cpp +++ b/audio.cpp @@ -133,10 +133,7 @@ buffer_manager::create( std::string const &Filename ) { auto filename { ToLower( Filename ) }; erase_extension( filename ); - // convert slashes - std::replace( - std::begin( filename ), std::end( filename ), - '\\', '/' ); + replace_slashes( filename ); audio::buffer_handle lookup { null_handle }; std::string filelookup; diff --git a/material.cpp b/material.cpp index b2fcb201..31b10d5c 100644 --- a/material.cpp +++ b/material.cpp @@ -17,8 +17,8 @@ http://mozilla.org/MPL/2.0/. // helper, returns potential path part from provided file name std::string path( std::string const &Filename ) { return ( - Filename.rfind( '\\' ) != std::string::npos ? - Filename.substr( 0, Filename.rfind( '\\' ) + 1 ) : + Filename.rfind( '/' ) != std::string::npos ? + Filename.substr( 0, Filename.rfind( '/' ) + 1 ) : "" ); } @@ -111,12 +111,9 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { filename.erase( filename.find( '|' ) ); // po | może być nazwa kolejnej tekstury erase_extension( filename ); - filename += ".mat"; + replace_slashes( filename ); - // change slashes to llinux-compatible - std::replace( - std::begin( filename ), std::end( filename ), - '\\', '/' ); + filename += ".mat"; // try to locate requested material in the databank auto const databanklookup = find_in_databank( filename ); diff --git a/stars.cpp b/stars.cpp index b7c9ef79..1f0b87ed 100644 --- a/stars.cpp +++ b/stars.cpp @@ -10,5 +10,5 @@ void cStars::init() { - m_stars = TModelsManager::GetModel( "models\\skydome_stars.t3d", false ); + m_stars = TModelsManager::GetModel( "skydome_stars.t3d", false ); } diff --git a/utilities.cpp b/utilities.cpp index 3f791750..8e3475ac 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -334,3 +334,12 @@ erase_extension( std::string &Filename ) { } return false; } + +// potentially replaces backward slashes in provided file path with unix-compatible forward slashes +void +replace_slashes( std::string &Filename ) { + + std::replace( + std::begin( Filename ), std::end( Filename ), + '\\', '/' ); +} diff --git a/utilities.h b/utilities.h index 6d182c7d..26918a8b 100644 --- a/utilities.h +++ b/utilities.h @@ -28,6 +28,7 @@ http://mozilla.org/MPL/2.0/. #define szSceneryPath "scenery/" #define szTexturePath "textures/" #define szModelPath "models/" +#define szDynamicPath "dynamic/" #define szSoundPath "sounds/" #define MAKE_ID4(a,b,c,d) (((std::uint32_t)(d)<<24)|((std::uint32_t)(c)<<16)|((std::uint32_t)(b)<<8)|(std::uint32_t)(a)) @@ -183,6 +184,10 @@ std::time_t last_modified( std::string const &Filename ); bool erase_extension( std::string &Filename ); +// potentially replaces backward slashes in provided file path with unix-compatible forward slashes +void +replace_slashes( std::string &Filename ); + template void SafeDelete( Type_ &Pointer ) { delete Pointer; From 1fd89923f64cd4412f4423d0135a3760d54a0ee6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 29 Mar 2018 23:19:14 +0200 Subject: [PATCH 298/426] compressor governor lock tweaks, fuel pump cab indicator, optional offset for scenario clock --- Globals.cpp | 5 + Globals.h | 1 + McZapkie/Mover.cpp | 336 +++++++++++++++++++++++++-------------------- Train.cpp | 110 +++++++++++++-- Train.h | 1 + World.cpp | 14 +- mtable.cpp | 8 +- version.h | 2 +- 8 files changed, 307 insertions(+), 170 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index 97b1e3c3..8684f5d3 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -308,6 +308,11 @@ global_settings::ConfigParse(cParser &Parser) { // max 8 lights per opengl specs, minus one used for sun. at least one light for controlled vehicle DynamicLightCount = clamp( DynamicLightCount, 1, 7 ); } + else if( token == "scenario.time.offset" ) { + // shift (in hours) applied to train timetables + Parser.getTokens( 1, false ); + Parser >> ScenarioTimeOffset; + } else if( token == "scalespeculars" ) { // whether strength of specular highlights should be adjusted (generally needed for legacy 3d models) Parser.getTokens(); diff --git a/Globals.h b/Globals.h index cfa502ab..1480847a 100644 --- a/Globals.h +++ b/Globals.h @@ -79,6 +79,7 @@ struct global_settings { bool FakeLight{ false }; // toggle between fixed and dynamic daylight double fTimeSpeed{ 1.0 }; // przyspieszenie czasu, zmienna do testów double fLatitudeDeg{ 52.0 }; // szerokość geograficzna + float ScenarioTimeOffset { 0.f }; // time shift (in hours) applied to train timetables bool bInactivePause{ true }; // automatyczna pauza, gdy okno nieaktywne int iSlowMotionMask{ -1 }; // maska wyłączanych właściwości bool bHideConsole{ false }; // hunter-271211: ukrywanie konsoli diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 2ae53a80..1958bd0a 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3080,89 +3080,175 @@ void TMoverParameters::UpdateBrakePressure(double dt) // Q: 20160712 // Obliczanie pracy sprężarki // ************************************************************************************************* +// TODO: clean the method up, a lot of the code is redundant void TMoverParameters::CompressorCheck(double dt) { + if( VeselVolume == 0.0 ) { return; } + CompressedVolume = std::max( 0.0, CompressedVolume - dt * AirLeakRate * 0.1 ); // nieszczelności: 0.001=1l/s - // if (CompressorSpeed>0.0) then //ten warunek został sprawdzony przy wywołaniu funkcji - if (VeselVolume > 0) - { - if (MaxCompressor - MinCompressor < 0.0001) - { - // if (Mains && (MainCtrlPos > 1)) - if (CompressorAllow && CompressorAllowLocal && Mains && (MainCtrlPos > 0)) - { - if (Compressor < MaxCompressor) - if ((EngineType == DieselElectric) && (CompressorPower > 0)) - CompressedVolume += dt * CompressorSpeed * - (2.0 * MaxCompressor - Compressor) / MaxCompressor * - (DElist[MainCtrlPos].RPM / DElist[MainCtrlPosNo].RPM); - else - { - CompressedVolume += - dt * CompressorSpeed * (2.0 * MaxCompressor - Compressor) / MaxCompressor; - TotalCurrent += 0.0015 - * Voltage; // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę - } + if( ( true == CompressorGovernorLock ) + && ( Compressor < MinCompressor ) ) { + // if the pressure drops below the cut-in level, we can reset compressor governor + // TBD, TODO: don't operate the lock without battery power? + CompressorGovernorLock = false; + } + + if (MaxCompressor - MinCompressor < 0.0001) { + // TODO: investigate purpose of this branch and whether it can be removed as it duplicates later code + if( ( true == CompressorAllow ) + && ( true == CompressorAllowLocal ) + && ( true == Mains ) + && ( MainCtrlPos > 0 ) ) { + if( Compressor < MaxCompressor ) { + if( ( EngineType == DieselElectric ) + && ( CompressorPower > 0 ) ) { + CompressedVolume += + CompressorSpeed + * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor + * ( DElist[ MainCtrlPos ].RPM / DElist[ MainCtrlPosNo ].RPM ) + * dt; + } + else { + CompressedVolume += + CompressorSpeed + * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor + * dt; + TotalCurrent += 0.0015 * Voltage; // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę + } + } + else { + CompressedVolume = CompressedVolume * 0.8; + SetFlag(SoundFlag, sound::relay | sound::loud); + } + } + } + else { + if( ( ( CompressorPower == 0 ) + || ( CompressorPower == 3 ) ) + && ( ( EngineType == DieselEngine ) + || ( EngineType == DieselElectric ) ) ) { + // experimental: make sure compressor coupled with diesel engine is always ready for work + CompressorAllow = true; + } + if (CompressorFlag) // jeśli sprężarka załączona + { // sprawdzić możliwe warunki wyłączenia sprężarki + if (CompressorPower == 5) // jeśli zasilanie z sąsiedniego członu + { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) + if (Couplers[1].Connected != NULL) + CompressorFlag = + ( Couplers[ 1 ].Connected->CompressorAllow + && Couplers[ 1 ].Connected->CompressorAllowLocal + && Couplers[ 1 ].Connected->Mains + && Couplers[ 1 ].Connected->ConverterFlag ); else - { - CompressedVolume = CompressedVolume * 0.8; - SetFlag(SoundFlag, sound::relay | sound::loud); - // SetFlag(SoundFlag, sound::loud); + CompressorFlag = false; // bez tamtego członu nie zadziała + } + else if (CompressorPower == 4) // jeśli zasilanie z poprzedniego członu + { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) + if (Couplers[0].Connected != NULL) + CompressorFlag = + ( Couplers[ 0 ].Connected->CompressorAllow + && Couplers[ 0 ].Connected->CompressorAllowLocal + && Couplers[ 0 ].Connected->Mains + && Couplers[ 0 ].Connected->ConverterFlag ); + else + CompressorFlag = false; // bez tamtego członu nie zadziała + } + else + CompressorFlag = + ( ( CompressorAllow ) + && ( CompressorAllowLocal ) + && ( Mains ) + && ( ( ConverterFlag ) + || ( CompressorPower == 0 ) + || ( CompressorPower == 3 ) ) ); + + if( Compressor > MaxCompressor ) { + // wyłącznik ciśnieniowy jest niezależny od sposobu zasilania + // TBD, TODO: don't operate the lock without battery power? + if( ( CompressorPower == 0 ) + || ( CompressorPower == 3 ) ) { + // if the compressor is powered directly by the engine the lock can't turn it off and instead just changes the output + if( false == CompressorGovernorLock ) { + // emit relay sound when the lock engages (the state change itself is below) and presumably changes where the air goes + SetFlag( SoundFlag, sound::relay | sound::loud ); + } + } + else { + // if the compressor isn't coupled with the engine the lock can control its state freely + CompressorFlag = false; + } + CompressorGovernorLock = true; // prevent manual activation until the pressure goes below cut-in level + } + + if( ( TrainType == dt_ET41 ) + || ( TrainType == dt_ET42 ) ) { + // for these multi-unit engines compressors turn off whenever any of them was affected by the governor + // NOTE: this is crude implementation, TODO: re-implement when a more elegant/flexible system is in place + if( ( Couplers[ 1 ].Connected != nullptr ) + && ( true == TestFlag( Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { + // the first unit isn't allowed to start its compressor until second unit can start its own as well + CompressorFlag &= ( Couplers[ 1 ].Connected->CompressorGovernorLock == false ); + } + if( ( Couplers[ 0 ].Connected != nullptr ) + && ( true == TestFlag( Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { + // the second unit isn't allowed to start its compressor until first unit can start its own as well + CompressorFlag &= ( Couplers[ 0 ].Connected->CompressorGovernorLock == false ); } } } - else - { - if( ( CompressorPower == 0 ) - && ( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) ) { - // experimental: make sure compressor coupled with diesel engine is always ready for work - CompressorAllow = true; - } - if (CompressorFlag) // jeśli sprężarka załączona - { // sprawdzić możliwe warunki wyłączenia sprężarki - if (CompressorPower == 5) // jeśli zasilanie z sąsiedniego członu + else { + // jeśli nie załączona + if( ( LastSwitchingTime > CtrlDelay ) + && ( ( Compressor < MinCompressor ) + || ( ( Compressor < MaxCompressor ) + && ( false == CompressorGovernorLock ) ) ) ) { + // załączenie przy małym ciśnieniu + // jeśli nie załączona, a ciśnienie za małe + // or if the switch is on and the pressure isn't maxed + if( CompressorPower == 5 ) // jeśli zasilanie z następnego członu { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if (Couplers[1].Connected != NULL) + if( Couplers[ 1 ].Connected != nullptr ) { CompressorFlag = ( Couplers[ 1 ].Connected->CompressorAllow && Couplers[ 1 ].Connected->CompressorAllowLocal && Couplers[ 1 ].Connected->Mains && Couplers[ 1 ].Connected->ConverterFlag ); - else + } + else { CompressorFlag = false; // bez tamtego członu nie zadziała + } } - else if (CompressorPower == 4) // jeśli zasilanie z poprzedniego członu + else if( CompressorPower == 4 ) // jeśli zasilanie z poprzedniego członu { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if (Couplers[0].Connected != NULL) + if( Couplers[ 0 ].Connected != nullptr ) { CompressorFlag = ( Couplers[ 0 ].Connected->CompressorAllow && Couplers[ 0 ].Connected->CompressorAllowLocal && Couplers[ 0 ].Connected->Mains && Couplers[ 0 ].Connected->ConverterFlag ); - else + } + else { CompressorFlag = false; // bez tamtego członu nie zadziała + } } - else + else { CompressorFlag = - ( ( CompressorAllow ) + ( ( CompressorAllow ) && ( CompressorAllowLocal ) && ( Mains ) && ( ( ConverterFlag ) - || ( CompressorPower == 0 ) ) ); - - if( Compressor > MaxCompressor ) { - // wyłącznik ciśnieniowy jest niezależny od sposobu zasilania - CompressorFlag = false; - CompressorGovernorLock = true; // prevent manual activation until the pressure goes below cut-in level + || ( CompressorPower == 0 ) + || ( CompressorPower == 3 ) ) ); } + // NOTE: crude way to enforce simultaneous activation of compressors in multi-unit setups + // TODO: replace this with a more universal activation system down the road if( ( TrainType == dt_ET41 ) || ( TrainType == dt_ET42 ) ) { - // for these multi-unit engines compressors turn off whenever any of them was affected by the governor - // NOTE: this is crude implementation, TODO: re-implement when a more elegant/flexible system is in place - if( ( Couplers[ 1 ].Connected != nullptr ) + + if( ( Couplers[1].Connected != nullptr ) && ( true == TestFlag( Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { // the first unit isn't allowed to start its compressor until second unit can start its own as well CompressorFlag &= ( Couplers[ 1 ].Connected->CompressorGovernorLock == false ); @@ -3173,110 +3259,67 @@ void TMoverParameters::CompressorCheck(double dt) CompressorFlag &= ( Couplers[ 0 ].Connected->CompressorGovernorLock == false ); } } - } - else { - // jeśli nie załączona - if( Compressor < MinCompressor ) { - // if the pressure drops below the cut-in level, we can reset compressor governor - CompressorGovernorLock = false; - } - if( ( ( Compressor < MinCompressor ) - || ( ( Compressor < MaxCompressor ) - && ( false == CompressorGovernorLock ) ) ) - && ( LastSwitchingTime > CtrlDelay ) ) { - // załączenie przy małym ciśnieniu - // jeśli nie załączona, a ciśnienie za małe - // or if the switch is on and the pressure isn't maxed - if( CompressorPower == 5 ) // jeśli zasilanie z następnego członu - { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if( Couplers[ 1 ].Connected != nullptr ) { - CompressorFlag = - ( Couplers[ 1 ].Connected->CompressorAllow - && Couplers[ 1 ].Connected->CompressorAllowLocal - && Couplers[ 1 ].Connected->Mains - && Couplers[ 1 ].Connected->ConverterFlag ); - } - else { - CompressorFlag = false; // bez tamtego członu nie zadziała - } - } - else if( CompressorPower == 4 ) // jeśli zasilanie z poprzedniego członu - { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if( Couplers[ 0 ].Connected != nullptr ) { - CompressorFlag = - ( Couplers[ 0 ].Connected->CompressorAllow - && Couplers[ 0 ].Connected->CompressorAllowLocal - && Couplers[ 0 ].Connected->Mains - && Couplers[ 0 ].Connected->ConverterFlag ); - } - else { - CompressorFlag = false; // bez tamtego członu nie zadziała - } - } - else { - CompressorFlag = - ( ( CompressorAllow ) - && ( CompressorAllowLocal ) - && ( Mains ) - && ( ( ConverterFlag ) - || ( CompressorPower == 0 ) ) ); - } - - // NOTE: crude way to enforce simultaneous activation of compressors in multi-unit setups - // TODO: replace this with a more universal activation system down the road - if( ( TrainType == dt_ET41 ) - || ( TrainType == dt_ET42 ) ) { - - if( ( Couplers[1].Connected != nullptr ) - && ( true == TestFlag( Couplers[ 1 ].CouplingFlag, coupling::permanent ) ) ) { - // the first unit isn't allowed to start its compressor until second unit can start its own as well - CompressorFlag &= ( Couplers[ 1 ].Connected->CompressorGovernorLock == false ); - } - if( ( Couplers[ 0 ].Connected != nullptr ) - && ( true == TestFlag( Couplers[ 0 ].CouplingFlag, coupling::permanent ) ) ) { - // the second unit isn't allowed to start its compressor until first unit can start its own as well - CompressorFlag &= ( Couplers[ 0 ].Connected->CompressorGovernorLock == false ); - } - } - - if( CompressorFlag ) { - // jeśli została załączona - LastSwitchingTime = 0; // to trzeba ograniczyć ponowne włączenie - } + if( CompressorFlag ) { + // jeśli została załączona + LastSwitchingTime = 0; // to trzeba ograniczyć ponowne włączenie } } + } - if( CompressorFlag ) { - if( ( EngineType == DieselElectric ) && ( CompressorPower > 0 ) ) { + if( CompressorFlag ) { + if( ( EngineType == DieselElectric ) + && ( ( CompressorPower == 0 ) + || ( CompressorPower == 3 ) ) ) { + if( false == CompressorGovernorLock ) { CompressedVolume += - dt * CompressorSpeed + CompressorSpeed * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor - * ( DElist[ MainCtrlPos ].RPM / DElist[ MainCtrlPosNo ].RPM ); + * ( DElist[ MainCtrlPos ].RPM / DElist[ MainCtrlPosNo ].RPM ) + * dt; } - else if( ( EngineType == DieselEngine ) && ( CompressorPower == 0 ) ) { +/* + else { + // the lock is active, air is being vented out + CompressedVolume -= 0.1 * dt; + } +*/ + } + else if( ( EngineType == DieselEngine ) + && ( ( CompressorPower == 0 ) + || ( CompressorPower == 3 ) ) ) { + if( false == CompressorGovernorLock ) { // experimental: compressor coupled with diesel engine, output scaled by current engine rotational speed CompressedVolume += - dt * CompressorSpeed + CompressorSpeed * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor - * ( std::abs( enrot ) / nmax ); + * ( std::abs( enrot ) / nmax ) + * dt; + } +/* + else { + // the lock is active, air is being vented out + CompressedVolume -= 0.1 * dt; + } +*/ + } + else { + CompressedVolume += + CompressorSpeed + * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor + * dt; + + if( ( CompressorPower == 5 ) && ( Couplers[ 1 ].Connected != NULL ) ) { + // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę + Couplers[ 1 ].Connected->TotalCurrent += 0.0015 * Couplers[ 1 ].Connected->Voltage; + } + else if( ( CompressorPower == 4 ) && ( Couplers[ 0 ].Connected != NULL ) ) { + // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę + Couplers[ 0 ].Connected->TotalCurrent += 0.0015 * Couplers[ 0 ].Connected->Voltage; } else { - CompressedVolume += - dt * CompressorSpeed * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor; - if( ( CompressorPower == 5 ) && ( Couplers[ 1 ].Connected != NULL ) ) - Couplers[ 1 ].Connected->TotalCurrent += - 0.0015 * Couplers[ 1 ].Connected->Voltage; // tymczasowo tylko obciążenie - // sprężarki, tak z 5A na - // sprężarkę - else if( ( CompressorPower == 4 ) && ( Couplers[ 0 ].Connected != NULL ) ) - Couplers[ 0 ].Connected->TotalCurrent += - 0.0015 * Couplers[ 0 ].Connected->Voltage; // tymczasowo tylko obciążenie - // sprężarki, tak z 5A na - // sprężarkę - else - TotalCurrent += 0.0015 * - Voltage; // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę + // tymczasowo tylko obciążenie sprężarki, tak z 5A na sprężarkę + TotalCurrent += 0.0015 * Voltage; } } } @@ -7287,11 +7330,12 @@ void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { extract_value( CompressorSpeed, "CompressorSpeed", line, "" ); { std::map compressorpowers{ + { "Main", 0 }, + // 1: default, powered by converter, with manual state control { "Converter", 2 }, - { "Engine", 3 }, + { "Engine", 3 }, // equivalent of 0, TODO: separate 'main' and 'engine' in the code { "Coupler1", 4 },//włączana w silnikowym EZT z przodu - { "Coupler2", 5 },//włączana w silnikowym EZT z tyłu - { "Main", 0 } + { "Coupler2", 5 } //włączana w silnikowym EZT z tyłu }; auto lookup = compressorpowers.find( extract_value( "CompressorPower", line ) ); CompressorPower = diff --git a/Train.cpp b/Train.cpp index 92f5e435..350da7de 100644 --- a/Train.cpp +++ b/Train.cpp @@ -222,6 +222,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::linebreakertoggle, &TTrain::OnCommand_linebreakertoggle }, { user_command::linebreakeropen, &TTrain::OnCommand_linebreakeropen }, { user_command::linebreakerclose, &TTrain::OnCommand_linebreakerclose }, + { user_command::fuelpumptoggle, &TTrain::OnCommand_fuelpumptoggle }, + { user_command::fuelpumpenable, &TTrain::OnCommand_fuelpumpenable }, + { user_command::fuelpumpdisable, &TTrain::OnCommand_fuelpumpdisable }, { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, { user_command::converterenable, &TTrain::OnCommand_converterenable }, { user_command::converterdisable, &TTrain::OnCommand_converterdisable }, @@ -1996,6 +1999,45 @@ void TTrain::OnCommand_linebreakerclose( TTrain *Train, command_data const &Comm } } +void TTrain::OnCommand_fuelpumptoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->FuelPump.is_enabled ) { + // turn on + OnCommand_fuelpumpenable( Train, Command ); + } + else { + //turn off + OnCommand_fuelpumpdisable( Train, Command ); + } + } +} + +void TTrain::OnCommand_fuelpumpenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggFuelPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->FuelPump.is_enabled ) { return; } // already enabled + + Train->mvControlled->FuelPumpSwitch( true ); + } +} + +void TTrain::OnCommand_fuelpumpdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggFuelPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->FuelPump.is_enabled ) { return; } // already disabled + + Train->mvControlled->FuelPumpSwitch( false ); + } +} + void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { @@ -3856,12 +3898,6 @@ bool TTrain::Update( double const Deltatime ) } } if( m_linebreakerstate == 1 ) { - if( ( mvControlled->EngineType == DieselElectric ) - && ( false == mvControlled->ConverterFlag ) ) { - // converter acts as a make-believe fuel pump so if it's off, kill the engine - // TODO: implement actual fuel system and move this check to the mover update - mvControlled->MainSwitch( false ); - } if( false == mvControlled->Mains ) { // crude way to catch cases where the main was knocked out and the user is trying to restart it // because the state of the line breaker isn't changed to match, we need to do it here manually @@ -3909,6 +3945,9 @@ bool TTrain::Update( double const Deltatime ) // finalize state change of the line breaker m_linebreakerstate = 1; } + else { + m_linebreakerstate = 0; + } } } @@ -3946,6 +3985,23 @@ bool TTrain::Update( double const Deltatime ) if (DynamicObject->mdKabina) { // Ra: TODO: odczyty klawiatury/pulpitu nie powinny być uzależnione od istnienia modelu kabiny + + if( ( DynamicObject->Mechanik != nullptr ) + && ( false == DynamicObject->Mechanik->AIControllFlag ) // nie blokujemy AI + && ( ( mvOccupied->TrainType == dt_ET40 ) + || ( mvOccupied->TrainType == dt_EP05 ) ) ) { + // dla ET40 i EU05 automatyczne cofanie nastawnika - i tak nie będzie to działać dobrze... + // TODO: remove direct keyboard check, use deltatime to stabilize speed + if( ( glfwGetKey( Global.window, GLFW_KEY_KP_ADD ) != GLFW_TRUE ) + && ( mvOccupied->MainCtrlPos > mvOccupied->MainCtrlActualPos ) ) { + mvOccupied->DecMainCtrl( 1 ); + } + if( ( glfwGetKey( Global.window, GLFW_KEY_KP_SUBTRACT ) != GLFW_TRUE ) + && ( mvOccupied->MainCtrlPos < mvOccupied->MainCtrlActualPos ) ) { + mvOccupied->IncMainCtrl( 1 ); // Ra 15-01: a to nie miało być tylko cofanie? + } + } + tor = DynamicObject->GetTrack(); // McZapkie-180203 // McZapkie: predkosc wyswietlana na tachometrze brana jest z obrotow kol float maxtacho = 3; @@ -4430,6 +4486,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaNapNastHam.Turn(mvControlled->ActiveDir != 0); // napiecie na nastawniku hamulcowym btLampkaSprezarka.Turn(mvControlled->CompressorFlag); // mutopsitka dziala btLampkaSprezarkaOff.Turn( false == mvControlled->CompressorFlag ); + btLampkaFuelPumpOff.Turn( false == mvControlled->FuelPump.is_active ); // boczniki unsigned char scp; // Ra: dopisałem "unsigned" // Ra: w SU45 boczniki wchodzą na MainCtrlPos, a nie na MainCtrlActualPos @@ -4469,6 +4526,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaNadmPrzetw.Turn( false ); btLampkaSprezarka.Turn( false ); btLampkaSprezarkaOff.Turn( false ); + btLampkaFuelPumpOff.Turn( false ); btLampkaBezoporowa.Turn( false ); } if (mvControlled->Signalling == true) { @@ -4874,6 +4932,8 @@ bool TTrain::Update( double const Deltatime ) ggCabLightButton.Update(); ggCabLightDimButton.Update(); ggBatteryButton.Update(); + + ggFuelPumpButton.Update(); //------ pyScreens.update(); } @@ -5157,15 +5217,22 @@ TTrain::update_sounds( double const Deltatime ) { volume *= 1 + 0.125 * brakeforceratio; } // scale volume by track quality - volume *= ( 20.0 + DynamicObject->MyTrack->iDamageFlag ) / 21; - // scale volume with vehicle speed - // TBD, TODO: disable the scaling for sounds combined from speed-based samples? + // TODO: track quality and/or environment factors as separate subroutine volume *= interpolate( - 0.0, 1.0, + 0.8, 1.2, clamp( - mvOccupied->Vel / 40.0, + DynamicObject->MyTrack->iQualityFlag / 20.0, 0.0, 1.0 ) ); + // for single sample sounds muffle the playback at low speeds + if( false == rsRunningNoise.is_combined() ) { + volume *= + interpolate( + 0.0, 1.0, + clamp( + mvOccupied->Vel / 40.0, + 0.0, 1.0 ) ); + } if( volume > 0.05 ) { rsRunningNoise @@ -5911,6 +5978,8 @@ void TTrain::clear_cab_controls() ggMainGearStatus.Clear(); ggIgnitionKey.Clear(); + ggFuelPumpButton.Clear(); + btLampkaPrzetw.Clear(); btLampkaPrzetwB.Clear(); btLampkaPrzetwBOff.Clear(); @@ -5950,6 +6019,7 @@ void TTrain::clear_cab_controls() btLampkaSprezarkaB.Clear(); btLampkaSprezarkaOff.Clear(); btLampkaSprezarkaBOff.Clear(); + btLampkaFuelPumpOff.Clear(); btLampkaNapNastHam.Clear(); btLampkaStycznB.Clear(); btLampkaHamowanie1zes.Clear(); @@ -6072,9 +6142,14 @@ void TTrain::set_cab_controls() { 1.0 : 0.0 ); // motor overload relay threshold / shunt mode - if( mvControlled->Imax == mvControlled->ImaxHi ) { - ggMaxCurrentCtrl.PutValue( 1.0 ); - } + ggMaxCurrentCtrl.PutValue( + ( true == mvControlled->ShuntModeAllow ? + ( true == mvControlled->ShuntMode ? + 1.0 : + 0.0 ) : + ( mvControlled->Imax == mvControlled->ImaxHi ? + 1.0 : + 0.0 ) ) ); // lights ggLightsButton.PutValue( mvOccupied->LightsPos - 1 ); @@ -6169,6 +6244,11 @@ void TTrain::set_cab_controls() { ShowNextCurrent ? 1.0 : 0.0 ); + // fuel pump + ggFuelPumpButton.PutValue( + mvOccupied->FuelPump.is_enabled ? + 1.0 : + 0.0 ); // we reset all indicators, as they're set during the update pass // TODO: when cleaning up break setting indicator state into a separate function, so we can reuse it @@ -6232,6 +6312,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-compressorb:", btLampkaSprezarkaB }, { "i-compressoroff:", btLampkaSprezarkaOff }, { "i-compressorboff:", btLampkaSprezarkaBOff }, + { "i-fuelpumpoff:", btLampkaFuelPumpOff }, { "i-voltbrake:", btLampkaNapNastHam }, { "i-resistorsb:", btLampkaOporyB }, { "i-contactorsb:", btLampkaStycznB }, @@ -6332,6 +6413,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "converterlocal_sw:", ggConverterLocalButton }, { "converteroff_sw:", ggConverterOffButton }, { "main_sw:", ggMainButton }, + { "fuelpump_sw:", ggFuelPumpButton }, { "radio_sw:", ggRadioButton }, { "radiochannel_sw:", ggRadioChannelSelector }, { "radiochannelprev_sw:", ggRadioChannelPrevious }, diff --git a/Train.h b/Train.h index 9b530afc..b255c784 100644 --- a/Train.h +++ b/Train.h @@ -452,6 +452,7 @@ public: // reszta może by?publiczna TButton btLampkaSprezarkaB; TButton btLampkaSprezarkaOff; TButton btLampkaSprezarkaBOff; + TButton btLampkaFuelPumpOff; TButton btLampkaBocznik1; TButton btLampkaBocznik2; TButton btLampkaBocznik3; diff --git a/World.cpp b/World.cpp index 23b6793b..1cb15127 100644 --- a/World.cpp +++ b/World.cpp @@ -61,10 +61,11 @@ simulation_time::init() { { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; ::memcpy( m_monthdaycounts, monthdaycounts, sizeof( monthdaycounts ) ); + // potentially adjust scenario clock + auto const requestedtime { clamp_circular( m_time.wHour * 60 + m_time.wMinute + Global.ScenarioTimeOffset * 60, 1440 ) }; + auto const requestedhour { ( requestedtime / 60 ) % 60 }; + auto const requestedminute { requestedtime % 60 }; // cache requested elements, if any - WORD const requestedhour = m_time.wHour; - WORD const requestedminute = m_time.wMinute; - ::GetLocalTime( &m_time ); if( Global.fMoveLight > 0.0 ) { @@ -72,10 +73,11 @@ simulation_time::init() { daymonth( m_time.wDay, m_time.wMonth, m_time.wYear, static_cast( Global.fMoveLight ) ); } - if( requestedhour != (WORD)-1 ) { m_time.wHour = clamp( requestedhour, static_cast( 0 ), static_cast( 23 ) ); } - if( requestedminute != (WORD)-1 ) { m_time.wMinute = clamp( requestedminute, static_cast( 0 ), static_cast( 59 ) ); } + if( requestedhour != -1 ) { m_time.wHour = static_cast( clamp( requestedhour, 0, 23 ) ); } + if( requestedminute != -1 ) { m_time.wMinute = static_cast( clamp( requestedminute, 0, 59 ) ); } // if the time is taken from the local clock leave the seconds intact, otherwise set them to zero - if( ( requestedhour != (WORD)-1 ) || ( requestedminute != (WORD)-1 ) ) { + if( ( requestedhour != -1 ) + || ( requestedminute != 1 ) ) { m_time.wSecond = 0; } diff --git a/mtable.cpp b/mtable.cpp index 3cc1b0fd..a5109fd8 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "mtable.h" +#include "globals.h" #include "world.h" #include "utilities.h" @@ -521,20 +522,21 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) // NextStationName:=TimeTable[1].StationName; /* TTVmax:=TimeTable[1].vmax; */ } - if ((iPlus != 0)) // jeżeli jest przesunięcie rozkładu + auto const timeoffset { static_cast( Global.ScenarioTimeOffset * 60 ) + iPlus }; + if( timeoffset != 0.0 ) // jeżeli jest przesunięcie rozkładu { long i_end = StationCount + 1; for (i = 1; i < i_end; ++i) // bez with, bo ciężko się przenosi na C++ { if ((TimeTable[i].Ah >= 0)) { - time = iPlus + TimeTable[i].Ah * 60 + TimeTable[i].Am; // nowe minuty + time = clamp_circular( TimeTable[i].Ah * 60 + TimeTable[i].Am + timeoffset, 1440 ); // nowe minuty TimeTable[i].Am = time % 60; TimeTable[i].Ah = (time /*div*/ / 60) % 60; } if ((TimeTable[i].Dh >= 0)) { - time = iPlus + TimeTable[i].Dh * 60 + TimeTable[i].Dm; // nowe minuty + time = clamp_circular( TimeTable[i].Dh * 60 + TimeTable[i].Dm + timeoffset, 1440 ); // nowe minuty TimeTable[i].Dm = time % 60; TimeTable[i].Dh = (time /*div*/ / 60) % 60; } diff --git a/version.h b/version.h index bc9715f3..91b2b070 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 326 +#define VERSION_MINOR 329 #define VERSION_REVISION 0 From fe9f509b3be031151b89c49b66f5f6cf007c9a77 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 30 Mar 2018 14:54:11 +0200 Subject: [PATCH 299/426] scenario clock offset applied to event launchers --- EvLaunch.cpp | 13 +++++++++++-- World.cpp | 2 +- mtable.cpp | 19 +++++++++---------- version.h | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/EvLaunch.cpp b/EvLaunch.cpp index bbc7dcfc..b8e1f08a 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -72,8 +72,17 @@ bool TEventLauncher::Load(cParser *parser) iMinute = int(DeltaTime) % 100; // minuty są najmłodszymi cyframi dziesietnymi iHour = int(DeltaTime - iMinute) / 100; // godzina to setki DeltaTime = 0; // bez powtórzeń - WriteLog("EventLauncher at " + std::to_string(iHour) + ":" + - std::to_string(iMinute)); // wyświetlenie czasu + // potentially shift the provided time by requested offset + auto const timeoffset { static_cast( Global.ScenarioTimeOffset * 60 ) }; + if( timeoffset != 0 ) { + auto const adjustedtime { clamp_circular( iHour * 60 + iMinute + timeoffset, 24 * 60 ) }; + iHour = ( adjustedtime / 60 ) % 60; + iMinute = adjustedtime % 60; + } + WriteLog( + "EventLauncher at " + + std::to_string( iHour ) + ":" + + ( iMinute < 10 ? "0" : "" ) + to_string( iMinute ) ); // wyświetlenie czasu } parser->getTokens(); *parser >> token; diff --git a/World.cpp b/World.cpp index 1cb15127..f11a18e0 100644 --- a/World.cpp +++ b/World.cpp @@ -62,7 +62,7 @@ simulation_time::init() { ::memcpy( m_monthdaycounts, monthdaycounts, sizeof( monthdaycounts ) ); // potentially adjust scenario clock - auto const requestedtime { clamp_circular( m_time.wHour * 60 + m_time.wMinute + Global.ScenarioTimeOffset * 60, 1440 ) }; + auto const requestedtime { clamp_circular( m_time.wHour * 60 + m_time.wMinute + Global.ScenarioTimeOffset * 60, 24 * 60 ) }; auto const requestedhour { ( requestedtime / 60 ) % 60 }; auto const requestedminute { requestedtime % 60 }; // cache requested elements, if any diff --git a/mtable.cpp b/mtable.cpp index a5109fd8..74ce57b3 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -230,8 +230,6 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) std::ifstream fin; bool EndTable; double vActual; - int i; - int time; // do zwiększania czasu int ConversionError = 0; EndTable = false; @@ -523,22 +521,23 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) /* TTVmax:=TimeTable[1].vmax; */ } auto const timeoffset { static_cast( Global.ScenarioTimeOffset * 60 ) + iPlus }; - if( timeoffset != 0.0 ) // jeżeli jest przesunięcie rozkładu + if( timeoffset != 0 ) // jeżeli jest przesunięcie rozkładu { long i_end = StationCount + 1; - for (i = 1; i < i_end; ++i) // bez with, bo ciężko się przenosi na C++ + int adjustedtime; // do zwiększania czasu + for (auto i = 1; i < i_end; ++i) // bez with, bo ciężko się przenosi na C++ { if ((TimeTable[i].Ah >= 0)) { - time = clamp_circular( TimeTable[i].Ah * 60 + TimeTable[i].Am + timeoffset, 1440 ); // nowe minuty - TimeTable[i].Am = time % 60; - TimeTable[i].Ah = (time /*div*/ / 60) % 60; + adjustedtime = clamp_circular( TimeTable[i].Ah * 60 + TimeTable[i].Am + timeoffset, 24 * 60 ); // nowe minuty + TimeTable[i].Am = adjustedtime % 60; + TimeTable[i].Ah = (adjustedtime /*div*/ / 60) % 60; } if ((TimeTable[i].Dh >= 0)) { - time = clamp_circular( TimeTable[i].Dh * 60 + TimeTable[i].Dm + timeoffset, 1440 ); // nowe minuty - TimeTable[i].Dm = time % 60; - TimeTable[i].Dh = (time /*div*/ / 60) % 60; + adjustedtime = clamp_circular( TimeTable[i].Dh * 60 + TimeTable[i].Dm + timeoffset, 24 * 60 ); // nowe minuty + TimeTable[i].Dm = adjustedtime % 60; + TimeTable[i].Dh = (adjustedtime /*div*/ / 60) % 60; } } } diff --git a/version.h b/version.h index 91b2b070..daaacb26 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 329 +#define VERSION_MINOR 330 #define VERSION_REVISION 0 From 07f14381a8b85d5d708461e1cd5a16ce6cf57ce4 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 31 Mar 2018 04:08:01 +0200 Subject: [PATCH 300/426] build 180331. minor bug fixes --- McZapkie/Mover.cpp | 6 ++++-- Track.cpp | 4 +++- version.h | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 1958bd0a..3742a739 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3167,8 +3167,10 @@ void TMoverParameters::CompressorCheck(double dt) if( Compressor > MaxCompressor ) { // wyłącznik ciśnieniowy jest niezależny od sposobu zasilania // TBD, TODO: don't operate the lock without battery power? - if( ( CompressorPower == 0 ) - || ( CompressorPower == 3 ) ) { + if( ( ( CompressorPower == 0 ) + || ( CompressorPower == 3 ) ) + && ( ( EngineType == DieselEngine ) + || ( EngineType == DieselElectric ) ) ) { // if the compressor is powered directly by the engine the lock can't turn it off and instead just changes the output if( false == CompressorGovernorLock ) { // emit relay sound when the lock engages (the state change itself is below) and presumably changes where the air goes diff --git a/Track.cpp b/Track.cpp index c7082bb4..596f3116 100644 --- a/Track.cpp +++ b/Track.cpp @@ -415,7 +415,9 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) >> fSoundDistance; fTrackWidth2 = fTrackWidth; // rozstaw/szerokość w punkcie 2, na razie taka sama parser->getTokens(2); - *parser >> iQualityFlag >> iDamageFlag; + *parser + >> iQualityFlag + >> iDamageFlag; if (iDamageFlag & 128) iAction |= 0x80; // flaga wykolejania z powodu uszkodzenia parser->getTokens(); diff --git a/version.h b/version.h index daaacb26..1ed2cbd9 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 330 +#define VERSION_MINOR 331 #define VERSION_REVISION 0 From 87f078925c87a977c1f74edcba56229b954e44c8 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 6 Apr 2018 01:12:15 +0200 Subject: [PATCH 301/426] build 180404. optional scenario clock sync with current local time, keyboard input for the ui layer --- DynObj.h | 4 +- EU07.cpp | 7 +- EvLaunch.cpp | 2 +- Globals.cpp | 5 + Globals.h | 1 + World.cpp | 808 +++--------------------------------------------- World.h | 19 +- mtable.cpp | 4 +- simulation.cpp | 11 + uilayer.cpp | 812 ++++++++++++++++++++++++++++++++++++++++++++++++- uilayer.h | 19 +- version.h | 2 +- 12 files changed, 898 insertions(+), 796 deletions(-) diff --git a/DynObj.h b/DynObj.h index 664eb18f..d534d69c 100644 --- a/DynObj.h +++ b/DynObj.h @@ -518,7 +518,7 @@ private: return mMatrix.readArray(); }; inline double * Matrix() { return mMatrix.getArray(); }; - inline double GetVelocity() { + inline double GetVelocity() const { return MoverParameters->Vel; }; inline double GetLength() const { return MoverParameters->Dim.L; }; @@ -561,7 +561,7 @@ private: float GetEPP(); // wyliczanie sredniego cisnienia w PG int DirectionSet(int d); // ustawienie kierunku w składzie // odczyt kierunku w składzie - int DirectionGet() { + int DirectionGet() const { return iDirection + iDirection - 1; }; int DettachStatus(int dir); int Dettach(int dir); diff --git a/EU07.cpp b/EU07.cpp index 589c6017..f1f1c90b 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -148,11 +148,14 @@ void mouse_button_callback( GLFWwindow* window, int button, int action, int mods void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) { - input::Keyboard.key( key, action ); - Global.shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; Global.ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; + // give the ui first shot at the input processing... + if( true == UILayer.on_key( key, action ) ) { return; } + // ...if the input is left untouched, pass it on + input::Keyboard.key( key, action ); + if( ( true == Global.InputMouse ) && ( ( key == GLFW_KEY_LEFT_ALT ) || ( key == GLFW_KEY_RIGHT_ALT ) ) ) { diff --git a/EvLaunch.cpp b/EvLaunch.cpp index b8e1f08a..30700599 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -76,7 +76,7 @@ bool TEventLauncher::Load(cParser *parser) auto const timeoffset { static_cast( Global.ScenarioTimeOffset * 60 ) }; if( timeoffset != 0 ) { auto const adjustedtime { clamp_circular( iHour * 60 + iMinute + timeoffset, 24 * 60 ) }; - iHour = ( adjustedtime / 60 ) % 60; + iHour = ( adjustedtime / 60 ) % 24; iMinute = adjustedtime % 60; } WriteLog( diff --git a/Globals.cpp b/Globals.cpp index 8684f5d3..1aad7435 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -313,6 +313,11 @@ global_settings::ConfigParse(cParser &Parser) { Parser.getTokens( 1, false ); Parser >> ScenarioTimeOffset; } + else if( token == "scenario.time.current" ) { + // sync simulation time with local clock + Parser.getTokens( 1, false ); + Parser >> ScenarioTimeCurrent; + } else if( token == "scalespeculars" ) { // whether strength of specular highlights should be adjusted (generally needed for legacy 3d models) Parser.getTokens(); diff --git a/Globals.h b/Globals.h index 1480847a..28792b19 100644 --- a/Globals.h +++ b/Globals.h @@ -80,6 +80,7 @@ struct global_settings { double fTimeSpeed{ 1.0 }; // przyspieszenie czasu, zmienna do testów double fLatitudeDeg{ 52.0 }; // szerokość geograficzna float ScenarioTimeOffset { 0.f }; // time shift (in hours) applied to train timetables + bool ScenarioTimeCurrent { false }; // automatic time shift to match scenario time with local clock bool bInactivePause{ true }; // automatyczna pauza, gdy okno nieaktywne int iSlowMotionMask{ -1 }; // maska wyłączanych właściwości bool bHideConsole{ false }; // hunter-271211: ukrywanie konsoli diff --git a/World.cpp b/World.cpp index f11a18e0..014967e7 100644 --- a/World.cpp +++ b/World.cpp @@ -30,17 +30,9 @@ http://mozilla.org/MPL/2.0/. #include "Console.h" #include "color.h" #include "uilayer.h" -#include "uitranscripts.h" -#include "translation.h" //--------------------------------------------------------------------------- -TDynamicObject *Controlled = NULL; // pojazd, który prowadzimy - -std::shared_ptr UIHeader = std::make_shared( 20, 20 ); // header ui panel -std::shared_ptr UITable = std::make_shared( 20, 100 ); // schedule or scan table -std::shared_ptr UITranscripts = std::make_shared( 85, 600 ); // voice transcripts - namespace simulation { simulation_time Time; @@ -63,7 +55,7 @@ simulation_time::init() { // potentially adjust scenario clock auto const requestedtime { clamp_circular( m_time.wHour * 60 + m_time.wMinute + Global.ScenarioTimeOffset * 60, 24 * 60 ) }; - auto const requestedhour { ( requestedtime / 60 ) % 60 }; + auto const requestedhour { ( requestedtime / 60 ) % 24 }; auto const requestedminute { requestedtime % 60 }; // cache requested elements, if any ::GetLocalTime( &m_time ); @@ -190,7 +182,6 @@ TWorld::TWorld() for (int i = 0; i < 10; ++i) KeyEvents[i] = NULL; // eventy wyzwalane klawiszami cyfrowymi Global.iSlowMotion = 0; - pDynamicNearest = NULL; fTimeBuffer = 0.0; // bufor czasu aktualizacji dla stałego kroku fizyki fMaxDt = 0.01; //[s] początkowy krok czasowy fizyki fTime50Hz = 0.0; // bufor czasu dla komunikacji z PoKeys @@ -307,29 +298,13 @@ bool TWorld::Init( GLFWwindow *Window ) { WriteLog( "Load time: " + std::to_string( std::chrono::duration_cast(( std::chrono::system_clock::now() - timestart )).count() ) + " seconds"); -/* - if (DebugModeFlag) // w Debugmode automatyczne włączenie AI - if (Train) - if (Train->Dynamic()->Mechanik) - Train->Dynamic()->Mechanik->TakeControl(true); -*/ + UILayer.set_progress(); UILayer.set_progress( "" ); UILayer.set_background( "" ); - UILayer.clear_texts(); Timer::ResetTimers(); - // make 4 empty lines for the ui header, to cut down on work down the road - UIHeader->text_lines.emplace_back( "", Global.UITextColor ); - UIHeader->text_lines.emplace_back( "", Global.UITextColor ); - UIHeader->text_lines.emplace_back( "", Global.UITextColor ); - UIHeader->text_lines.emplace_back( "", Global.UITextColor ); - // bind the panels with ui object. maybe not the best place for this but, eh - UILayer.push_back( UIHeader ); - UILayer.push_back( UITable ); - UILayer.push_back( UITranscripts ); - return true; }; @@ -427,60 +402,23 @@ void TWorld::OnKeyDown(int cKey) { else if( ( cKey >= GLFW_KEY_F1 ) && ( cKey <= GLFW_KEY_F12 ) ) { switch (cKey) { - + case GLFW_KEY_F1: { + if( DebugModeFlag ) { - // additional time speedup keys in debug mode + // additional simulation clock jump keys in debug mode if( Global.ctrlState ) { - // ctrl-f3 + // ctrl-f1 simulation::Time.update( 20.0 * 60.0 ); } else if( Global.shiftState ) { - // shift-f3 + // shift-f1 simulation::Time.update( 5.0 * 60.0 ); } } - if( ( false == Global.ctrlState ) - && ( false == Global.shiftState ) ) { - // czas i relacja - if( Global.iTextMode == cKey ) { ++Global.iScreenMode[ cKey - GLFW_KEY_F1 ]; } - if( Global.iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { - // wyłączenie napisów - Global.iTextMode = 0; - Global.iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; - } - else { - Global.iTextMode = cKey; - } - } - break; - } - case GLFW_KEY_F2: { - // parametry pojazdu - if( Global.iTextMode == cKey ) { ++Global.iScreenMode[ cKey - GLFW_KEY_F1 ]; } - if( Global.iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { - // wyłączenie napisów - Global.iTextMode = 0; - Global.iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; - } - else { - Global.iTextMode = cKey; - } - break; - } - case GLFW_KEY_F3: { - // timetable - if( Global.iTextMode == cKey ) { ++Global.iScreenMode[ cKey - GLFW_KEY_F1 ]; } - if( Global.iScreenMode[ cKey - GLFW_KEY_F1 ] > 1 ) { - // wyłączenie napisów - Global.iTextMode = 0; - Global.iScreenMode[ cKey - GLFW_KEY_F1 ] = 0; - } - else { - Global.iTextMode = cKey; - } break; } + case GLFW_KEY_F4: { InOutKey( !Global.shiftState ); // distant view with Shift, short distance step out otherwise @@ -510,27 +448,27 @@ void TWorld::OnKeyDown(int cKey) { if( Train == nullptr ) Train = new TTrain(); // jeśli niczym jeszcze nie jeździlismy if( Train->Init( Controlled ) ) { // przejmujemy sterowanie - if( !DebugModeFlag ) // w DebugMode nadal prowadzi AI + if( !DebugModeFlag ) { + // w DebugMode nadal prowadzi AI Controlled->Mechanik->TakeControl( false ); + } } - else + else { SafeDelete( Train ); // i nie ma czym sterować - // Global.pUserDynamic=Controlled; //renerowanie pojazdu względem kabiny - // Global.iTextMode=VK_F4; - if( Train ) + } + if( Train ) { InOutKey(); // do kabiny + } } } -// Global.iTextMode = cKey; break; } case GLFW_KEY_F6: { -// Global.iTextMode = cKey; // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! if( DebugModeFlag ) { if( Global.ctrlState ) { Global.fTimeSpeed = ( Global.shiftState ? 60.0 : 20.0 ); } - else { Global.fTimeSpeed = ( Global.shiftState ? 5.0 : 1.0 ); } + else { Global.fTimeSpeed = ( Global.shiftState ? 5.0 : 1.0 ); } } break; } @@ -538,13 +476,22 @@ void TWorld::OnKeyDown(int cKey) { // debug mode functions if( DebugModeFlag ) { - if( Global.ctrlState ) { + if( Global.ctrlState + && Global.shiftState ) { + // shift + ctrl + f7 toggles between debug and regular camera + DebugCameraFlag = !DebugCameraFlag; + } + else if( Global.ctrlState ) { // ctrl + f7 toggles static daylight ToggleDaylight(); break; } + else if( Global.shiftState ) { + // shift + f7 is currently unused + } else { // f7: wireframe toggle + // TODO: pass this to renderer instead of making direct calls Global.bWireFrame = !Global.bWireFrame; if( true == Global.bWireFrame ) { glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); @@ -556,55 +503,24 @@ void TWorld::OnKeyDown(int cKey) { } break; } - case GLFW_KEY_F8: { + case GLFW_KEY_F12: { + // quick debug mode toggle if( Global.ctrlState && Global.shiftState ) { - DebugCameraFlag = !DebugCameraFlag; // taka opcjonalna funkcja, może się czasem przydać - } - else { - Global.iTextMode = cKey; + DebugModeFlag = !DebugModeFlag; } break; } - case GLFW_KEY_F9: { - Global.iTextMode = cKey; - // wersja - break; - } - case GLFW_KEY_F10: { - if( Global.iTextMode == cKey ) { - Global.iTextMode = - ( Global.iPause && ( cKey != GLFW_KEY_F1 ) ? - GLFW_KEY_F1 : - 0 ); // wyłączenie napisów, chyba że pauza - } - else { - Global.iTextMode = cKey; - } - break; - } - case GLFW_KEY_F12: { - // coś tam jeszcze - if( Global.ctrlState - && Global.shiftState ) - DebugModeFlag = !DebugModeFlag; // taka opcjonalna funkcja, może się czasem przydać - else - Global.iTextMode = cKey; + + default: { break; } } // if (cKey!=VK_F4) return; // nie są przekazywane do pojazdu wcale } - if( Global.iTextMode == GLFW_KEY_F10 ) // wyświetlone napisy klawiszem F10 - { // i potwierdzenie - if( cKey == GLFW_KEY_Y ) { - // flaga wyjścia z programu - glfwSetWindowShouldClose( window, 1 ); - } - return; // nie przekazujemy do pociągu - } - else if ((Global.iTextMode == GLFW_KEY_F12) ? (cKey >= '0') && (cKey <= '9') : false) + + if ((Global.iTextMode == GLFW_KEY_F12) ? (cKey >= '0') && (cKey <= '9') : false) { // tryb konfiguracji debugmode (przestawianie kamery już wyłączone if (!Global.shiftState) // bez [Shift] { @@ -951,7 +867,7 @@ bool TWorld::Update() { fTime50Hz += dt; // w pauzie też trzeba zliczać czas, bo przy dużym FPS będzie problem z odczytem ramek while( fTime50Hz >= 1.0 / 50.0 ) { Console::Update(); // to i tak trzeba wywoływać - Update_UI(); + UILayer.update(); // decelerate camera Camera.Velocity *= 0.65; if( std::abs( Camera.Velocity.x ) < 0.01 ) { Camera.Velocity.x = 0.0; } @@ -1115,662 +1031,6 @@ void TWorld::ResourceSweep() */ }; -void -TWorld::Update_UI() { - - UITable->text_lines.clear(); - std::string uitextline1, uitextline2, uitextline3, uitextline4; - UILayer.set_tooltip( "" ); - - if( ( Train != nullptr ) && ( false == FreeFlyModeFlag ) ) { - if( false == DebugModeFlag ) { - // in regular mode show control functions, for defined controls - UILayer.set_tooltip( locale::label_cab_control( Train->GetLabel( GfxRenderer.Pick_Control() ) ) ); - } - else { - // in debug mode show names of submodels, to help with cab setup and/or debugging - auto const cabcontrol = GfxRenderer.Pick_Control(); - UILayer.set_tooltip( ( cabcontrol ? cabcontrol->pName : "" ) ); - } - } - if( ( true == Global.ControlPicking ) && ( true == FreeFlyModeFlag ) && ( true == DebugModeFlag ) ) { - auto const scenerynode = GfxRenderer.Pick_Node(); - UILayer.set_tooltip( - ( scenerynode ? - scenerynode->name() : - "" ) ); - } - - switch( Global.iTextMode ) { - - case( GLFW_KEY_F1 ) : { - // f1, default mode: current time and timetable excerpt - auto const &time = simulation::Time.data(); - uitextline1 = - "Time: " - + to_string( time.wHour ) + ":" - + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" - + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); - if( Global.iPause ) { - uitextline1 += " (paused)"; - } - - if( ( Controlled != nullptr ) - && ( Controlled->Mechanik != nullptr ) ) { - - auto const &mover = Controlled->MoverParameters; - auto const &driver = Controlled->Mechanik; - - uitextline2 = "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ); - if( mover->ActiveDir > 0 ) { uitextline2 += " D"; } - else if( mover->ActiveDir < 0 ) { uitextline2 += " R"; } - else { uitextline2 += " N"; } - - uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + std::to_string( mover->LocalBrakePos ) + ( mover->SlippingWheels ? " !" : " " ); - - uitextline4 = ( - true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? - "!ALERTER! " : - " " ); - uitextline4 += ( - true == TestFlag( mover->SecuritySystem.Status, s_active ) ? - "!SHP! " : - " " ); - - if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { - // detail mode on second key press - uitextline2 += - " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" - + " (limit: " + std::to_string( static_cast( std::floor( driver->VelDesired ) ) ) + " km/h" - + ", next limit: " + std::to_string( static_cast( std::floor( Controlled->Mechanik->VelNext ) ) ) + " km/h" - + " in " + to_string( Controlled->Mechanik->ActualProximityDist * 0.001, 1 ) + " km)"; - uitextline3 += - " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" - + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; - - auto const stoptime { static_cast( -1.0 * Controlled->Mechanik->fStopTime ) }; - if( stoptime > 0 ) { - uitextline4 += " Loading/unloading in progress (" + to_string( stoptime ) + ( stoptime > 1 ? " seconds" : " second" ) + " left)"; - } - else { - auto const trackblockdistance{ std::abs( Controlled->Mechanik->TrackBlock() ) }; - if( trackblockdistance <= 75.0 ) { - uitextline4 += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; - } - } - } - } - - break; - } - - case( GLFW_KEY_F2 ) : { - // timetable - auto *vehicle { - ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : - Controlled ) }; // w trybie latania lokalizujemy wg mapy - - if( vehicle == nullptr ) { break; } - // if the nearest located vehicle doesn't have a direct driver, try to query its owner - auto const owner = ( - ( ( vehicle->Mechanik != nullptr ) && ( vehicle->Mechanik->Primary() ) ) ? - vehicle->Mechanik : - vehicle->ctOwner ); - if( owner == nullptr ){ break; } - - auto const table = owner->Timetable(); - if( table == nullptr ) { break; } - - auto const &time = simulation::Time.data(); - uitextline1 = - "Time: " - + to_string( time.wHour ) + ":" - + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" - + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); - if( Global.iPause ) { - uitextline1 += " (paused)"; - } - - uitextline2 = Bezogonkow( owner->Relation(), true ) + " (" + Bezogonkow( owner->Timetable()->TrainName, true ) + ")"; - auto const nextstation = Bezogonkow( owner->NextStop(), true ); - if( !nextstation.empty() ) { - // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania - uitextline3 = " -> " + nextstation; - } - - if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { - - if( 0 == table->StationCount ) { - // only bother if there's stations to list - UITable->text_lines.emplace_back( "(no timetable)", Global.UITextColor ); - } - else { - // header - UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global.UITextColor ); - - TMTableLine *tableline; - for( int i = owner->iStationStart; i <= std::min( owner->iStationStart + 15, table->StationCount ); ++i ) { - // wyświetlenie pozycji z rozkładu - tableline = table->TimeTable + i; // linijka rozkładu - - std::string station = - ( tableline->StationName + " " ).substr( 0, 26 ); - std::string arrival = - ( tableline->Ah >= 0 ? - to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : - " " ); - std::string departure = - ( tableline->Dh >= 0 ? - to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : - " " ); - std::string vmax = - " " - + to_string( tableline->vmax, 0 ); - vmax = vmax.substr( vmax.length() - 3, 3 ); // z wyrównaniem do prawej - - UITable->text_lines.emplace_back( - Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), - ( ( owner->iStationStart < table->StationIndex ) - && ( i < table->StationIndex ) - && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ? - glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono - Global.UITextColor ) ); - // divider/footer - UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global.UITextColor ); - } - } - } - - break; - } - - case( GLFW_KEY_F3 ) : { - - auto *vehicle{ - ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : - Controlled ) }; // w trybie latania lokalizujemy wg mapy - - if( vehicle != nullptr ) { - // jeśli domyślny ekran po pierwszym naciśnięciu - uitextline1 = "Vehicle name: " + vehicle->MoverParameters->Name; - - if( ( vehicle->Mechanik == nullptr ) && ( vehicle->ctOwner ) ) { - // for cars other than leading unit indicate the leader - uitextline1 += ", owned by " + vehicle->ctOwner->OwnerName(); - } - uitextline1 += "; Status: " + vehicle->MoverParameters->EngineDescription( 0 ); - // informacja o sprzęgach - uitextline1 += - "; C0:" + - ( vehicle->PrevConnected ? - vehicle->PrevConnected->name() + ":" + to_string( vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag ) + ( - vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag == 0 ? - " (" + to_string( vehicle->MoverParameters->Couplers[ 0 ].CoupleDist, 1 ) + " m)" : - "" ) : - "none" ); - uitextline1 += - " C1:" + - ( vehicle->NextConnected ? - vehicle->NextConnected->name() + ":" + to_string( vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag ) + ( - vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag == 0 ? - " (" + to_string( vehicle->MoverParameters->Couplers[ 1 ].CoupleDist, 1 ) + " m)" : - "" ) : - "none" ); - - // equipment flags - uitextline2 = ( vehicle->MoverParameters->Battery ? "B" : "." ); - uitextline2 += ( vehicle->MoverParameters->Mains ? "M" : "." ); - uitextline2 += ( vehicle->MoverParameters->PantRearUp ? ( vehicle->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; - uitextline2 += ( vehicle->MoverParameters->PantFrontUp ? ( vehicle->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; - uitextline2 += ( vehicle->MoverParameters->PantPressLockActive ? "!" : ( vehicle->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); - uitextline2 += ( vehicle->MoverParameters->FuelPump.is_enabled ? ( vehicle->MoverParameters->FuelPump.is_active ? "F" : "f" ) : "." );; - uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); - uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); - uitextline2 += ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorPower > 1 ) ? ( vehicle->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); - uitextline2 += ( vehicle->MoverParameters->CompressorGovernorLock ? "!" : "." ); - - auto const train { Global.pWorld->train() }; - if( ( train != nullptr ) && ( train->Dynamic() == vehicle ) ) { - uitextline2 += " R: " + std::to_string( train->RadioChannel() ); - } -/* - uitextline2 += - " AnlgB: " + to_string( tmp->MoverParameters->AnPos, 1 ) - + "+" - + to_string( tmp->MoverParameters->LocalBrakePosA, 1 ) -*/ - uitextline2 += " Bdelay: "; - if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) - uitextline2 += "G"; - if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) - uitextline2 += "P"; - if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) - uitextline2 += "R"; - if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) - uitextline2 += "+Mg"; - - uitextline2 += ", Load: " + to_string( vehicle->MoverParameters->Load, 0 ) + " (" + to_string( vehicle->MoverParameters->LoadFlag, 0 ) + ")"; - - uitextline2 += - "; Pant: " - + to_string( vehicle->MoverParameters->PantPress, 2 ) - + ( vehicle->MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" ); - - uitextline2 += - "; Ft: " + to_string( - vehicle->MoverParameters->Ft * 0.001f * ( - vehicle->MoverParameters->ActiveCab ? vehicle->MoverParameters->ActiveCab : - vehicle->ctOwner ? vehicle->ctOwner->Controlling()->ActiveCab : - 1 ), 1 ) - + ", Fb: " + to_string( vehicle->MoverParameters->Fb * 0.001f, 1 ) - + ", Fr: " + to_string( vehicle->MoverParameters->Adhesive( vehicle->MoverParameters->RunningTrack.friction ), 2 ) - + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : "" ); - - if( vehicle->Mechanik ) { - uitextline2 += "; Ag: " + to_string( vehicle->Mechanik->fAccGravity, 2 ); - } - - uitextline2 += - "; TC:" - + to_string( vehicle->MoverParameters->TotalCurrent, 0 ); - auto const frontcouplerhighvoltage = - to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.voltage, 0 ) - + "@" - + to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.current, 0 ); - auto const rearcouplerhighvoltage = - to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.voltage, 0 ) - + "@" - + to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.current, 0 ); - uitextline2 += ", HV: "; - if( vehicle->MoverParameters->Couplers[ side::front ].power_high.local == false ) { - uitextline2 += - "(" + frontcouplerhighvoltage + ")-" - + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" - + "-(" + rearcouplerhighvoltage + ")"; - } - else { - uitextline2 += - frontcouplerhighvoltage - + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" - + rearcouplerhighvoltage; - } - - uitextline3 += - "TrB: " + to_string( vehicle->MoverParameters->BrakePress, 2 ) - + ", " + to_hex_str( vehicle->MoverParameters->Hamulec->GetBrakeStatus(), 2 ); - - uitextline3 += - "; LcB: " + to_string( vehicle->MoverParameters->LocBrakePress, 2 ) - + "; hat: " + to_string( vehicle->MoverParameters->BrakeCtrlPos2, 2 ) - + "; pipes: " + to_string( vehicle->MoverParameters->PipePress, 2 ) - + "/" + to_string( vehicle->MoverParameters->ScndPipePress, 2 ) - + "/" + to_string( vehicle->MoverParameters->EqvtPipePress, 2 ) - + ", MT: " + to_string( vehicle->MoverParameters->CompressedVolume, 3 ) - + ", BT: " + to_string( vehicle->MoverParameters->Volume, 3 ) - + ", CtlP: " + to_string( vehicle->MoverParameters->CntrlPipePress, 3 ) - + ", CtlT: " + to_string( vehicle->MoverParameters->Hamulec->GetCRP(), 3 ); - - if( vehicle->MoverParameters->ManualBrakePos > 0 ) { - - uitextline3 += "; manual brake on"; - } -/* - if( tmp->MoverParameters->LocalBrakePos > 0 ) { - - uitextline3 += ", local brake on"; - } - else { - - uitextline3 += ", local brake off"; - } -*/ - if( vehicle->Mechanik ) { - // o ile jest ktoś w środku - std::string flags = "cpapcplhhndoiefgvdpseil "; // flagi AI (definicja w Driver.h) - for( int i = 0, j = 1; i < 23; ++i, j <<= 1 ) - if( false == ( vehicle->Mechanik->DrivigFlags() & j ) ) // jak bit ustawiony - flags[ i ] = '.';// std::toupper( flags[ i ] ); // ^= 0x20; // to zmiana na wielką literę - - uitextline4 = flags; - - uitextline4 += - "Driver: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) - + " Ad=" + to_string( vehicle->Mechanik->AccDesired, 2 ) - + " Ah=" + to_string( vehicle->Mechanik->fAccThreshold, 2 ) - + "@" + to_string( vehicle->Mechanik->fBrake_a0[ 0 ], 2 ) - + "+" + to_string( vehicle->Mechanik->fBrake_a1[ 0 ], 2 ) - + " Bd=" + to_string( vehicle->Mechanik->fBrakeDist, 0 ) - + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ) - + " VSl=" + to_string( vehicle->Mechanik->VelSignalLast, 0 ) - + " VLl=" + to_string( vehicle->Mechanik->VelLimitLast, 0 ) - + " VRd=" + to_string( vehicle->Mechanik->VelRoad, 0 ) - + " VRst=" + to_string( vehicle->Mechanik->VelRestricted, 0 ); - - if( ( vehicle->Mechanik->VelNext == 0.0 ) - && ( vehicle->Mechanik->eSignNext ) ) { - // jeśli ma zapamiętany event semafora, nazwa eventu semafora - uitextline4 += " (" + Bezogonkow( vehicle->Mechanik->eSignNext->asName ) + ")"; - } - - // biezaca komenda dla AI - uitextline4 += ", command: " + vehicle->Mechanik->OrderCurrent(); - } - - if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { - // f2 screen, track scan mode - if( vehicle->Mechanik == nullptr ) { - //żeby była tabelka, musi być AI - break; - } - - std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( vehicle->Mechanik->TableSize() ) - 1, 0, 30 ); - do { - std::string scanline = vehicle->Mechanik->TableText( i ); - if( scanline.empty() ) { break; } - UITable->text_lines.emplace_back( Bezogonkow( scanline ), Global.UITextColor ); - ++i; - } while( i < speedtablesize ); // TController:iSpeedTableSize TODO: change when the table gets recoded - } - } - else { - // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika - uitextline1 = - "Camera position: " - + to_string( Camera.Pos.x, 2 ) + " " - + to_string( Camera.Pos.y, 2 ) + " " - + to_string( Camera.Pos.z, 2 ) - + ", azimuth: " - + to_string( 180.0 - RadToDeg( Camera.Yaw ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód - + " " - + std::string( "S SEE NEN NWW SW" ) - .substr( 0 + 2 * floor( fmod( 8 + ( Camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); - // current luminance level - uitextline2 = "Light level: " + to_string( Global.fLuminance, 3 ); - if( Global.FakeLight ) { uitextline2 += "(*)"; } - } - - break; - } - - case( GLFW_KEY_F8 ) : { - // gfx renderer data - uitextline1 = - "FoV: " + to_string( Global.FieldOfView / Global.ZoomFactor, 1 ) - + ", Draw range x " + to_string( Global.fDistanceFactor, 1 ) -// + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) -// + ", FPS: " + to_string( Timer::GetFPS(), 2 ); - + ", FPS: " + std::to_string( static_cast(std::round(GfxRenderer.Framerate())) ); - if( Global.iSlowMotion ) { - uitextline1 += " (slowmotion " + to_string( Global.iSlowMotion ) + ")"; - } - - uitextline2 = - std::string( "Rendering mode: " ) - + ( Global.bUseVBO ? - "VBO" : - "Display Lists" ) - + " "; - if( false == Global.LastGLError.empty() ) { - uitextline2 += - "Last openGL error: " - + Global.LastGLError; - } - // renderer stats - uitextline3 = GfxRenderer.info_times(); - uitextline4 = GfxRenderer.info_stats(); - - break; - } - - case( GLFW_KEY_F9 ) : { - // informacja o wersji - uitextline1 = "MaSzyna " + Global.asVersion; // informacja o wersji - if( Global.iMultiplayer ) { - uitextline1 += " (multiplayer mode is active)"; - } - uitextline3 = - "vehicles: " + to_string( Timer::subsystem.sim_dynamics.average(), 2 ) + " msec" - + " update total: " + to_string( Timer::subsystem.sim_total.average(), 2 ) + " msec"; - - break; - } - - case( GLFW_KEY_F10 ) : { - - uitextline1 = ( "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]." ); - - break; - } - - case( GLFW_KEY_F12 ) : { - // opcje włączenia i wyłączenia logowania - uitextline1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); - uitextline2 = "[1] log.txt " + std::string( ( Global.iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); - uitextline3 = "[2] Console " + std::string( ( Global.iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); - - break; - } - - default: { - // uncovered cases, nothing to do here... - // ... unless we're in debug mode - if( DebugModeFlag ) { - - auto *vehicle { - ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( Camera.Pos, 20, false, false ) ) : - Controlled ) }; // w trybie latania lokalizujemy wg mapy - if( vehicle == nullptr ) { - break; - } - uitextline1 = - "vel: " + to_string( vehicle->GetVelocity(), 2 ) + "/" + to_string( vehicle->MoverParameters->nrot* M_PI * vehicle->MoverParameters->WheelDiameter * 3.6, 2 ) - + " km/h;" + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : " " ) - + " dist: " + to_string( vehicle->MoverParameters->DistCounter, 2 ) + " km" - + "; pos: [" + to_string( vehicle->GetPosition().x, 2 ) + ", " + to_string( vehicle->GetPosition().y, 2 ) + ", " + to_string( vehicle->GetPosition().z, 2 ) + "]" - + ", PM=" + to_string( vehicle->MoverParameters->WheelFlat, 1 ) - + " mm; enrot=" + to_string( vehicle->MoverParameters->enrot * 60, 0 ) - + " tmrot=" + to_string( std::abs( vehicle->MoverParameters->nrot ) * vehicle->MoverParameters->Transmision.Ratio * 60, 0 ) - + "; ventrot=" + to_string( vehicle->MoverParameters->RventRot * 60, 1 ); - - uitextline2 = - "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) - + "; HamP=" + std::to_string( vehicle->MoverParameters->LocalBrakePos ) + "/" + to_string( vehicle->MoverParameters->LocalBrakePosA, 2 ) - + "; NasJ=" + std::to_string( vehicle->MoverParameters->MainCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->MainCtrlActualPos ) + ")" - + ( vehicle->MoverParameters->ShuntMode ? - "; NasB=" + to_string( vehicle->MoverParameters->AnPos, 2 ) : - "; NasB=" + std::to_string( vehicle->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->ScndCtrlActualPos ) + ")" ) - + "; I=" + - ( vehicle->MoverParameters->TrainType == dt_EZT ? - std::to_string( int( vehicle->MoverParameters->ShowCurrent( 0 ) ) ) : - std::to_string( int( vehicle->MoverParameters->Im ) ) ) - + "; U=" + to_string( int( vehicle->MoverParameters->RunningTraction.TractionVoltage + 0.5 ) ) - + "; R=" + - ( std::abs( vehicle->MoverParameters->RunningShape.R ) > 10000.0 ? - "~0.0" : - to_string( vehicle->MoverParameters->RunningShape.R, 1 ) ) - + " An=" + to_string( vehicle->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne - - if( tprev != simulation::Time.data().wSecond ) { - tprev = simulation::Time.data().wSecond; - Acc = ( vehicle->MoverParameters->Vel - VelPrev ) / 3.6; - VelPrev = vehicle->MoverParameters->Vel; - } - uitextline2 += "; As=" + to_string( Acc, 2 ); // przyspieszenie wzdłużne - uitextline2 += " eAngle=" + to_string( std::cos( vehicle->MoverParameters->eAngle ), 2 ); - - uitextline3 = - "cyl.ham. " + to_string( vehicle->MoverParameters->BrakePress, 2 ) - + "; prz.gl. " + to_string( vehicle->MoverParameters->PipePress, 2 ) - + "; zb.gl. " + to_string( vehicle->MoverParameters->CompressedVolume, 2 ) - // youBy - drugi wezyk - + "; p.zas. " + to_string( vehicle->MoverParameters->ScndPipePress, 2 ); - - // McZapkie: warto wiedziec w jakim stanie sa przelaczniki - if( vehicle->MoverParameters->ConvOvldFlag ) - uitextline3 += " C! "; - else if( vehicle->MoverParameters->FuseFlag ) - uitextline3 += " F! "; - else if( !vehicle->MoverParameters->Mains ) - uitextline3 += " () "; - else { - switch( - vehicle->MoverParameters->ActiveDir * - ( vehicle->MoverParameters->Imin == vehicle->MoverParameters->IminLo ? - 1 : - 2 ) ) { - case 2: { uitextline3 += " >> "; break; } - case 1: { uitextline3 += " -> "; break; } - case 0: { uitextline3 += " -- "; break; } - case -1: { uitextline3 += " <- "; break; } - case -2: { uitextline3 += " << "; break; } - } - } - // McZapkie: predkosc szlakowa - if( vehicle->MoverParameters->RunningTrack.Velmax == -1 ) { - uitextline3 += " Vtrack=Vmax"; - } - else { - uitextline3 += " Vtrack " + to_string( vehicle->MoverParameters->RunningTrack.Velmax, 2 ); - } - - if( ( vehicle->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) - || ( vehicle->MoverParameters->TrainType == dt_EZT ) ) { - uitextline3 += - "; pant. " + to_string( vehicle->MoverParameters->PantPress, 2 ) - + ( vehicle->MoverParameters->bPantKurek3 ? "=" : "^" ) + "ZG"; - } - - // McZapkie: komenda i jej parametry - if( vehicle->MoverParameters->CommandIn.Command != ( "" ) ) { - uitextline4 = - "C:" + vehicle->MoverParameters->CommandIn.Command - + " V1=" + to_string( vehicle->MoverParameters->CommandIn.Value1, 0 ) - + " V2=" + to_string( vehicle->MoverParameters->CommandIn.Value2, 0 ); - } - if( ( vehicle->Mechanik ) - && ( vehicle->Mechanik->AIControllFlag == AIdriver ) ) { - uitextline4 += - "AI: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) - + " ad=" + to_string(vehicle->Mechanik->AccDesired, 2) - + "/" + to_string(vehicle->Mechanik->AccDesired*vehicle->Mechanik->BrakeAccFactor(), 2) - + " atrain=" + to_string(vehicle->Mechanik->fBrake_a0[0], 2) - + "+" + to_string(vehicle->Mechanik->fBrake_a1[0], 2) - + " aS=" + to_string(vehicle->Mechanik->AbsAccS_pub, 2) - + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ); - } - - // induction motor data - if( vehicle->MoverParameters->EngineType == ElectricInductionMotor ) { - - UITable->text_lines.emplace_back( " eimc: eimv: press:", Global.UITextColor ); - for( int i = 0; i <= 20; ++i ) { - - std::string parameters = - vehicle->MoverParameters->eimc_labels[ i ] + to_string( vehicle->MoverParameters->eimc[ i ], 2, 9 ) - + " | " - + vehicle->MoverParameters->eimv_labels[ i ] + to_string( vehicle->MoverParameters->eimv[ i ], 2, 9 ); - - if( i < 10 ) { - parameters += " | " + Train->fPress_labels[i] + to_string( Train->fPress[ i ][ 0 ], 2, 9 ); - } - else if( i == 12 ) { - parameters += " med:"; - } - else if( i >= 13 ) { - parameters += " | " + vehicle->MED_labels[ i - 13 ] + to_string( vehicle->MED[ 0 ][ i - 13 ], 2, 9 ); - } - - UITable->text_lines.emplace_back( parameters, Global.UITextColor ); - } - } - if (vehicle->MoverParameters->EngineType == DieselEngine) { - std::string parameters = "param value"; - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "efill: " + to_string(vehicle->MoverParameters->dizel_fill, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "etorq: " + to_string(vehicle->MoverParameters->dizel_Torque, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "creal: " + to_string(vehicle->MoverParameters->dizel_engage, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "cdesi: " + to_string(vehicle->MoverParameters->dizel_engagestate, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "cdelt: " + to_string(vehicle->MoverParameters->dizel_engagedeltaomega, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "gears: " + to_string(vehicle->MoverParameters->dizel_automaticgearstatus, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hydro value"; - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCnI: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCnO: " + to_string(vehicle->MoverParameters->hydro_TC_nOut, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTM: " + to_string(vehicle->MoverParameters->hydro_TC_TMRatio, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTI: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueIn, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTO: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueOut, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCfl: " + to_string(vehicle->MoverParameters->hydro_TC_Fill, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCLR: " + to_string(vehicle->MoverParameters->hydro_TC_LockupRate, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - //parameters = "hTCXX: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); - //UITable->text_lines.emplace_back(parameters, Global.UITextColor); - } - - } // if( DebugModeFlag && Controlled ) - - break; - } - } - -#ifdef EU07_USE_OLD_UI_CODE - if( Controlled && DebugModeFlag && !Global.iTextMode ) { - - uitextline1 += - ( "; d_omega " ) + to_string( Controlled->MoverParameters->dizel_engagedeltaomega, 3 ); - - if( Controlled->MoverParameters->EngineType == ElectricInductionMotor ) { - - for( int i = 0; i <= 8; i++ ) { - for( int j = 0; j <= 9; j++ ) { - glRasterPos2f( 0.05f + 0.03f * i, 0.16f - 0.01f * j ); - uitextline4 = to_string( Train->fEIMParams[ i ][ j ], 2 ); - } - } - } - } -#endif - - // update the ui header texts - auto &headerdata = UIHeader->text_lines; - headerdata[ 0 ].data = uitextline1; - headerdata[ 1 ].data = uitextline2; - headerdata[ 2 ].data = uitextline3; - headerdata[ 3 ].data = uitextline4; - - // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) - auto &transcripts = UITranscripts->text_lines; - transcripts.clear(); - for( auto const &transcript : ui::Transcripts.aLines ) { - - if( Global.fTimeAngleDeg >= transcript.fShow ) { - - cParser parser( transcript.asText ); - while( true == parser.getTokens( 1, false, "|" ) ) { - - std::string transcriptline; parser >> transcriptline; - transcripts.emplace_back( transcriptline, glm::vec4( 1.0f, 1.0f, 0.0f, 1.0f ) ); - } - } - } -} - //--------------------------------------------------------------------------- void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) { // odebranie komunikatu z serwera diff --git a/World.h b/World.h index b0664611..5db1287d 100644 --- a/World.h +++ b/World.h @@ -109,6 +109,8 @@ TWorld(); void TrainDelete(TDynamicObject *d = NULL); TTrain const * train() const { return Train; } + TDynamicObject const * + controlled() const { return Controlled; } // switches between static and dynamic daylight calculation void ToggleDaylight(); // calculates current season of the year based on set simulation date @@ -121,7 +123,6 @@ TWorld(); private: void Update_Environment(); void Update_Camera( const double Deltatime ); - void Update_UI(); void ResourceSweep(); // handles vehicle change flag void ChangeDynamic(); @@ -133,21 +134,19 @@ private: TCamera DebugCamera; world_environment Environment; TTrain *Train; - TDynamicObject *pDynamicNearest; - bool Paused{ true }; + TDynamicObject *Controlled { nullptr }; // pojazd, który prowadzimy + TDynamicObject *pDynamicNearest { nullptr }; + bool Paused { true }; TEvent *KeyEvents[10]; // eventy wyzwalane z klawiaury TMoverParameters *mvControlled; // wskaźnik na człon silnikowy, do wyświetlania jego parametrów double fTime50Hz; // bufor czasu dla komunikacji z PoKeys double fTimeBuffer; // bufor czasu aktualizacji dla stałego kroku fizyki double fMaxDt; //[s] krok czasowy fizyki (0.01 dla normalnych warunków) - double m_primaryupdaterate{ 1.0 / 100.0 }; - double m_secondaryupdaterate{ 1.0 / 50.0 }; - double m_primaryupdateaccumulator{ m_secondaryupdaterate }; // keeps track of elapsed simulation time, for core fixed step routines - double m_secondaryupdateaccumulator{ m_secondaryupdaterate }; // keeps track of elapsed simulation time, for less important fixed step routines + double const m_primaryupdaterate { 1.0 / 100.0 }; + double const m_secondaryupdaterate { 1.0 / 50.0 }; + double m_primaryupdateaccumulator { m_secondaryupdaterate }; // keeps track of elapsed simulation time, for core fixed step routines + double m_secondaryupdateaccumulator { m_secondaryupdaterate }; // keeps track of elapsed simulation time, for less important fixed step routines int iPause; // wykrywanie zmian w zapauzowaniu - double VelPrev; // poprzednia prędkość - int tprev; // poprzedni czas - double Acc; // przyspieszenie styczne bool m_init { false }; // indicates whether initial update of the world was performed GLFWwindow *window; }; diff --git a/mtable.cpp b/mtable.cpp index 74ce57b3..0cc1870d 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -531,13 +531,13 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) { adjustedtime = clamp_circular( TimeTable[i].Ah * 60 + TimeTable[i].Am + timeoffset, 24 * 60 ); // nowe minuty TimeTable[i].Am = adjustedtime % 60; - TimeTable[i].Ah = (adjustedtime /*div*/ / 60) % 60; + TimeTable[i].Ah = (adjustedtime / 60) % 24; } if ((TimeTable[i].Dh >= 0)) { adjustedtime = clamp_circular( TimeTable[i].Dh * 60 + TimeTable[i].Dm + timeoffset, 24 * 60 ); // nowe minuty TimeTable[i].Dm = adjustedtime % 60; - TimeTable[i].Dh = (adjustedtime /*div*/ / 60) % 60; + TimeTable[i].Dh = (adjustedtime / 60) % 24; } } } diff --git a/simulation.cpp b/simulation.cpp index 54bbf03d..1d6e2239 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -539,6 +539,17 @@ state_manager::deserialize_time( cParser &Input, scene::scratch_data &Scratchpad >> time.wHour >> time.wMinute; + if( true == Global.ScenarioTimeCurrent ) { + // calculate time shift required to match scenario time with local clock + auto timenow = std::time( 0 ); + auto *localtime = std::localtime( &timenow ); + Global.ScenarioTimeOffset = + clamp_circular( + ( localtime->tm_hour * 60 + localtime->tm_min ) - ( time.wHour * 60 + time.wMinute ), + 24 * 60 ) + / 60.f; + } + // remaining sunrise and sunset parameters are no longer used, as they're now calculated dynamically // anything else left in the section has no defined meaning skip_until( Input, "endtime" ); diff --git a/uilayer.cpp b/uilayer.cpp index c5b218e2..115de349 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -2,9 +2,18 @@ #include "stdafx.h" #include "uilayer.h" +#include "uitranscripts.h" + #include "globals.h" -#include "utilities.h" +#include "translation.h" +#include "simulation.h" +#include "mtable.h" +#include "train.h" +#include "dynobj.h" +#include "model3d.h" #include "renderer.h" +#include "timer.h" +#include "utilities.h" #include "logs.h" ui_layer UILayer; @@ -25,6 +34,21 @@ ui_layer::~ui_layer() { bool ui_layer::init( GLFWwindow *Window ) { + clear_texts(); + + UIHeader = std::make_shared( 20, 20 ); // header ui panel + UITable = std::make_shared( 20, 100 ); // schedule or scan table + UITranscripts = std::make_shared( 85, 600 ); // voice transcripts + // make 4 empty lines for the ui header, to cut down on work down the road + UIHeader->text_lines.emplace_back( "", Global.UITextColor ); + UIHeader->text_lines.emplace_back( "", Global.UITextColor ); + UIHeader->text_lines.emplace_back( "", Global.UITextColor ); + UIHeader->text_lines.emplace_back( "", Global.UITextColor ); + // bind the panels with ui object. maybe not the best place for this but, eh + push_back( UIHeader ); + push_back( UITable ); + push_back( UITranscripts ); + m_window = Window; HFONT font; // Windows Font ID m_fontbase = ::glGenLists(96); // storage for 96 characters @@ -60,6 +84,792 @@ ui_layer::init( GLFWwindow *Window ) { } } +// potentially processes provided input key. returns: true if key was processed, false otherwise +bool +ui_layer::on_key( int const Key, int const Action ) { + // TODO: pass the input first through an active ui element if there's any + // if the ui element shows no interest or we don't have one, try to interpret the input yourself: + // shared conditions + switch( Key ) { + + case GLFW_KEY_F1: + case GLFW_KEY_F2: + case GLFW_KEY_F3: + case GLFW_KEY_F8: + case GLFW_KEY_F9: + case GLFW_KEY_F10: + case GLFW_KEY_F12: { // ui mode selectors + + if( ( true == Global.ctrlState ) + || ( true == Global.shiftState ) ) { + // only react to keys without modifiers + return false; + } + + if( Action == GLFW_RELEASE ) { return true; } // recognized, but ignored + } + + default: { // everything else + break; + } + } + + switch (Key) { + + case GLFW_KEY_F1: { + // basic consist info + if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } + if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { + // wyłączenie napisów + Global.iTextMode = 0; + Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; + } + else { + Global.iTextMode = Key; + } + return true; + } + + case GLFW_KEY_F2: { + // parametry pojazdu + if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } + if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { + // wyłączenie napisów + Global.iTextMode = 0; + Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; + } + else { + Global.iTextMode = Key; + } + return true; + } + + case GLFW_KEY_F3: { + // timetable + if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } + if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { + // wyłączenie napisów + Global.iTextMode = 0; + Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; + } + else { + Global.iTextMode = Key; + } + return true; + } + + case GLFW_KEY_F8: { + // renderer debug data + Global.iTextMode = Key; + return true; + } + + case GLFW_KEY_F9: { + // wersja + Global.iTextMode = Key; + return true; + } + + case GLFW_KEY_F10: { + // quit + if( Global.iTextMode == Key ) { + Global.iTextMode = + ( Global.iPause && ( Key != GLFW_KEY_F1 ) ? + GLFW_KEY_F1 : + 0 ); // wyłączenie napisów, chyba że pauza + } + else { + Global.iTextMode = Key; + } + return true; + } + + case GLFW_KEY_F12: { + // coś tam jeszcze + Global.iTextMode = Key; + return true; + } + + case GLFW_KEY_Y: { + // potentially quit + if( Global.iTextMode != GLFW_KEY_F10 ) { return false; } // not in quit mode + + if( Action == GLFW_RELEASE ) { return true; } // recognized, but ignored + + glfwSetWindowShouldClose( m_window, 1 ); + return true; + } + + default: { + break; + } + } + + return false; +} + +// updates state of UI elements +void +ui_layer::update() { + + UITable->text_lines.clear(); + std::string uitextline1, uitextline2, uitextline3, uitextline4; + UILayer.set_tooltip( "" ); + + auto const *train { ( Global.pWorld ? Global.pWorld->train() : nullptr ) }; + auto const *controlled { ( Global.pWorld ? Global.pWorld->controlled() : nullptr ) }; + auto const *camera { Global.pCamera }; + + if( ( train != nullptr ) && ( false == FreeFlyModeFlag ) ) { + if( false == DebugModeFlag ) { + // in regular mode show control functions, for defined controls + UILayer.set_tooltip( locale::label_cab_control( train->GetLabel( GfxRenderer.Pick_Control() ) ) ); + } + else { + // in debug mode show names of submodels, to help with cab setup and/or debugging + auto const cabcontrol = GfxRenderer.Pick_Control(); + UILayer.set_tooltip( ( cabcontrol ? cabcontrol->pName : "" ) ); + } + } + if( ( true == Global.ControlPicking ) && ( true == FreeFlyModeFlag ) && ( true == DebugModeFlag ) ) { + auto const scenerynode = GfxRenderer.Pick_Node(); + UILayer.set_tooltip( + ( scenerynode ? + scenerynode->name() : + "" ) ); + } + + switch( Global.iTextMode ) { + + case( GLFW_KEY_F1 ) : { + // f1, default mode: current time and timetable excerpt + auto const &time = simulation::Time.data(); + uitextline1 = + "Time: " + + to_string( time.wHour ) + ":" + + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" + + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); + if( Global.iPause ) { + uitextline1 += " (paused)"; + } + + if( ( controlled != nullptr ) + && ( controlled->Mechanik != nullptr ) ) { + + auto const &mover = controlled->MoverParameters; + auto const &driver = controlled->Mechanik; + + uitextline2 = "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ); + if( mover->ActiveDir > 0 ) { uitextline2 += " D"; } + else if( mover->ActiveDir < 0 ) { uitextline2 += " R"; } + else { uitextline2 += " N"; } + + uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + std::to_string( mover->LocalBrakePos ) + ( mover->SlippingWheels ? " !" : " " ); + + uitextline4 = ( + true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? + "!ALERTER! " : + " " ); + uitextline4 += ( + true == TestFlag( mover->SecuritySystem.Status, s_active ) ? + "!SHP! " : + " " ); + + if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { + // detail mode on second key press + uitextline2 += + " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" + + " (limit: " + std::to_string( static_cast( std::floor( driver->VelDesired ) ) ) + " km/h" + + ", next limit: " + std::to_string( static_cast( std::floor( controlled->Mechanik->VelNext ) ) ) + " km/h" + + " in " + to_string( controlled->Mechanik->ActualProximityDist * 0.001, 1 ) + " km)"; + uitextline3 += + " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; + + auto const stoptime { static_cast( -1.0 * controlled->Mechanik->fStopTime ) }; + if( stoptime > 0 ) { + uitextline4 += " Loading/unloading in progress (" + to_string( stoptime ) + ( stoptime > 1 ? " seconds" : " second" ) + " left)"; + } + else { + auto const trackblockdistance{ std::abs( controlled->Mechanik->TrackBlock() ) }; + if( trackblockdistance <= 75.0 ) { + uitextline4 += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; + } + } + } + } + + break; + } + + case( GLFW_KEY_F2 ) : { + // timetable + auto *vehicle { + ( FreeFlyModeFlag ? + std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : + controlled ) }; // w trybie latania lokalizujemy wg mapy + + if( vehicle == nullptr ) { break; } + // if the nearest located vehicle doesn't have a direct driver, try to query its owner + auto const owner = ( + ( ( vehicle->Mechanik != nullptr ) && ( vehicle->Mechanik->Primary() ) ) ? + vehicle->Mechanik : + vehicle->ctOwner ); + if( owner == nullptr ){ break; } + + auto const table = owner->Timetable(); + if( table == nullptr ) { break; } + + auto const &time = simulation::Time.data(); + uitextline1 = + "Time: " + + to_string( time.wHour ) + ":" + + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" + + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); + if( Global.iPause ) { + uitextline1 += " (paused)"; + } + + uitextline2 = Bezogonkow( owner->Relation(), true ) + " (" + Bezogonkow( owner->Timetable()->TrainName, true ) + ")"; + auto const nextstation = Bezogonkow( owner->NextStop(), true ); + if( !nextstation.empty() ) { + // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania + uitextline3 = " -> " + nextstation; + } + + if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { + + if( 0 == table->StationCount ) { + // only bother if there's stations to list + UITable->text_lines.emplace_back( "(no timetable)", Global.UITextColor ); + } + else { + // header + UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global.UITextColor ); + + TMTableLine *tableline; + for( int i = owner->iStationStart; i <= std::min( owner->iStationStart + 15, table->StationCount ); ++i ) { + // wyświetlenie pozycji z rozkładu + tableline = table->TimeTable + i; // linijka rozkładu + + std::string station = + ( tableline->StationName + " " ).substr( 0, 26 ); + std::string arrival = + ( tableline->Ah >= 0 ? + to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : + " " ); + std::string departure = + ( tableline->Dh >= 0 ? + to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : + " " ); + std::string vmax = + " " + + to_string( tableline->vmax, 0 ); + vmax = vmax.substr( vmax.length() - 3, 3 ); // z wyrównaniem do prawej + + UITable->text_lines.emplace_back( + Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), + ( ( owner->iStationStart < table->StationIndex ) + && ( i < table->StationIndex ) + && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ? + glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono + Global.UITextColor ) ); + // divider/footer + UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global.UITextColor ); + } + } + } + + break; + } + + case( GLFW_KEY_F3 ) : { + + auto *vehicle{ + ( FreeFlyModeFlag ? + std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : + controlled ) }; // w trybie latania lokalizujemy wg mapy + + if( vehicle != nullptr ) { + // jeśli domyślny ekran po pierwszym naciśnięciu + uitextline1 = "Vehicle name: " + vehicle->MoverParameters->Name; + + if( ( vehicle->Mechanik == nullptr ) && ( vehicle->ctOwner ) ) { + // for cars other than leading unit indicate the leader + uitextline1 += ", owned by " + vehicle->ctOwner->OwnerName(); + } + uitextline1 += "; Status: " + vehicle->MoverParameters->EngineDescription( 0 ); + // informacja o sprzęgach + uitextline1 += + "; C0:" + + ( vehicle->PrevConnected ? + vehicle->PrevConnected->name() + ":" + to_string( vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag ) + ( + vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag == 0 ? + " (" + to_string( vehicle->MoverParameters->Couplers[ 0 ].CoupleDist, 1 ) + " m)" : + "" ) : + "none" ); + uitextline1 += + " C1:" + + ( vehicle->NextConnected ? + vehicle->NextConnected->name() + ":" + to_string( vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag ) + ( + vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag == 0 ? + " (" + to_string( vehicle->MoverParameters->Couplers[ 1 ].CoupleDist, 1 ) + " m)" : + "" ) : + "none" ); + + // equipment flags + uitextline2 = ( vehicle->MoverParameters->Battery ? "B" : "." ); + uitextline2 += ( vehicle->MoverParameters->Mains ? "M" : "." ); + uitextline2 += ( vehicle->MoverParameters->PantRearUp ? ( vehicle->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; + uitextline2 += ( vehicle->MoverParameters->PantFrontUp ? ( vehicle->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; + uitextline2 += ( vehicle->MoverParameters->PantPressLockActive ? "!" : ( vehicle->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); + uitextline2 += ( vehicle->MoverParameters->FuelPump.is_enabled ? ( vehicle->MoverParameters->FuelPump.is_active ? "F" : "f" ) : "." );; + uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); + uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); + uitextline2 += ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorPower > 1 ) ? ( vehicle->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); + uitextline2 += ( vehicle->MoverParameters->CompressorGovernorLock ? "!" : "." ); + + auto const train { Global.pWorld->train() }; + if( ( train != nullptr ) && ( train->Dynamic() == vehicle ) ) { + uitextline2 += " R: " + std::to_string( train->RadioChannel() ); + } +/* + uitextline2 += + " AnlgB: " + to_string( tmp->MoverParameters->AnPos, 1 ) + + "+" + + to_string( tmp->MoverParameters->LocalBrakePosA, 1 ) +*/ + uitextline2 += " Bdelay: "; + if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) + uitextline2 += "G"; + if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) + uitextline2 += "P"; + if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) + uitextline2 += "R"; + if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) + uitextline2 += "+Mg"; + + uitextline2 += ", Load: " + to_string( vehicle->MoverParameters->Load, 0 ) + " (" + to_string( vehicle->MoverParameters->LoadFlag, 0 ) + ")"; + + uitextline2 += + "; Pant: " + + to_string( vehicle->MoverParameters->PantPress, 2 ) + + ( vehicle->MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" ); + + uitextline2 += + "; Ft: " + to_string( + vehicle->MoverParameters->Ft * 0.001f * ( + vehicle->MoverParameters->ActiveCab ? vehicle->MoverParameters->ActiveCab : + vehicle->ctOwner ? vehicle->ctOwner->Controlling()->ActiveCab : + 1 ), 1 ) + + ", Fb: " + to_string( vehicle->MoverParameters->Fb * 0.001f, 1 ) + + ", Fr: " + to_string( vehicle->MoverParameters->Adhesive( vehicle->MoverParameters->RunningTrack.friction ), 2 ) + + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : "" ); + + if( vehicle->Mechanik ) { + uitextline2 += "; Ag: " + to_string( vehicle->Mechanik->fAccGravity, 2 ); + } + + uitextline2 += + "; TC:" + + to_string( vehicle->MoverParameters->TotalCurrent, 0 ); + auto const frontcouplerhighvoltage = + to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.voltage, 0 ) + + "@" + + to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.current, 0 ); + auto const rearcouplerhighvoltage = + to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.voltage, 0 ) + + "@" + + to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.current, 0 ); + uitextline2 += ", HV: "; + if( vehicle->MoverParameters->Couplers[ side::front ].power_high.local == false ) { + uitextline2 += + "(" + frontcouplerhighvoltage + ")-" + + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" + + "-(" + rearcouplerhighvoltage + ")"; + } + else { + uitextline2 += + frontcouplerhighvoltage + + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" + + rearcouplerhighvoltage; + } + + uitextline3 += + "TrB: " + to_string( vehicle->MoverParameters->BrakePress, 2 ) + + ", " + to_hex_str( vehicle->MoverParameters->Hamulec->GetBrakeStatus(), 2 ); + + uitextline3 += + "; LcB: " + to_string( vehicle->MoverParameters->LocBrakePress, 2 ) + + "; hat: " + to_string( vehicle->MoverParameters->BrakeCtrlPos2, 2 ) + + "; pipes: " + to_string( vehicle->MoverParameters->PipePress, 2 ) + + "/" + to_string( vehicle->MoverParameters->ScndPipePress, 2 ) + + "/" + to_string( vehicle->MoverParameters->EqvtPipePress, 2 ) + + ", MT: " + to_string( vehicle->MoverParameters->CompressedVolume, 3 ) + + ", BT: " + to_string( vehicle->MoverParameters->Volume, 3 ) + + ", CtlP: " + to_string( vehicle->MoverParameters->CntrlPipePress, 3 ) + + ", CtlT: " + to_string( vehicle->MoverParameters->Hamulec->GetCRP(), 3 ); + + if( vehicle->MoverParameters->ManualBrakePos > 0 ) { + + uitextline3 += "; manual brake on"; + } +/* + if( tmp->MoverParameters->LocalBrakePos > 0 ) { + + uitextline3 += ", local brake on"; + } + else { + + uitextline3 += ", local brake off"; + } +*/ + if( vehicle->Mechanik ) { + // o ile jest ktoś w środku + std::string flags = "cpapcplhhndoiefgvdpseil "; // flagi AI (definicja w Driver.h) + for( int i = 0, j = 1; i < 23; ++i, j <<= 1 ) + if( false == ( vehicle->Mechanik->DrivigFlags() & j ) ) // jak bit ustawiony + flags[ i ] = '.';// std::toupper( flags[ i ] ); // ^= 0x20; // to zmiana na wielką literę + + uitextline4 = flags; + + uitextline4 += + "Driver: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) + + " Ad=" + to_string( vehicle->Mechanik->AccDesired, 2 ) + + " Ah=" + to_string( vehicle->Mechanik->fAccThreshold, 2 ) + + "@" + to_string( vehicle->Mechanik->fBrake_a0[ 0 ], 2 ) + + "+" + to_string( vehicle->Mechanik->fBrake_a1[ 0 ], 2 ) + + " Bd=" + to_string( vehicle->Mechanik->fBrakeDist, 0 ) + + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ) + + " VSl=" + to_string( vehicle->Mechanik->VelSignalLast, 0 ) + + " VLl=" + to_string( vehicle->Mechanik->VelLimitLast, 0 ) + + " VRd=" + to_string( vehicle->Mechanik->VelRoad, 0 ) + + " VRst=" + to_string( vehicle->Mechanik->VelRestricted, 0 ); + + if( ( vehicle->Mechanik->VelNext == 0.0 ) + && ( vehicle->Mechanik->eSignNext ) ) { + // jeśli ma zapamiętany event semafora, nazwa eventu semafora + uitextline4 += " (" + Bezogonkow( vehicle->Mechanik->eSignNext->asName ) + ")"; + } + + // biezaca komenda dla AI + uitextline4 += ", command: " + vehicle->Mechanik->OrderCurrent(); + } + + if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { + // f2 screen, track scan mode + if( vehicle->Mechanik == nullptr ) { + //żeby była tabelka, musi być AI + break; + } + + std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( vehicle->Mechanik->TableSize() ) - 1, 0, 30 ); + do { + std::string scanline = vehicle->Mechanik->TableText( i ); + if( scanline.empty() ) { break; } + UITable->text_lines.emplace_back( Bezogonkow( scanline ), Global.UITextColor ); + ++i; + } while( i < speedtablesize ); // TController:iSpeedTableSize TODO: change when the table gets recoded + } + } + else { + // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika + uitextline1 = + "Camera position: " + + to_string( camera->Pos.x, 2 ) + " " + + to_string( camera->Pos.y, 2 ) + " " + + to_string( camera->Pos.z, 2 ) + + ", azimuth: " + + to_string( 180.0 - glm::degrees( camera->Yaw ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód + + " " + + std::string( "S SEE NEN NWW SW" ) + .substr( 0 + 2 * floor( fmod( 8 + ( camera->Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); + // current luminance level + uitextline2 = "Light level: " + to_string( Global.fLuminance, 3 ); + if( Global.FakeLight ) { uitextline2 += "(*)"; } + } + + break; + } + + case( GLFW_KEY_F8 ) : { + // gfx renderer data + uitextline1 = + "FoV: " + to_string( Global.FieldOfView / Global.ZoomFactor, 1 ) + + ", Draw range x " + to_string( Global.fDistanceFactor, 1 ) +// + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) +// + ", FPS: " + to_string( Timer::GetFPS(), 2 ); + + ", FPS: " + std::to_string( static_cast(std::round(GfxRenderer.Framerate())) ); + if( Global.iSlowMotion ) { + uitextline1 += " (slowmotion " + to_string( Global.iSlowMotion ) + ")"; + } + + uitextline2 = + std::string( "Rendering mode: " ) + + ( Global.bUseVBO ? + "VBO" : + "Display Lists" ) + + " "; + if( false == Global.LastGLError.empty() ) { + uitextline2 += + "Last openGL error: " + + Global.LastGLError; + } + // renderer stats + uitextline3 = GfxRenderer.info_times(); + uitextline4 = GfxRenderer.info_stats(); + + break; + } + + case( GLFW_KEY_F9 ) : { + // informacja o wersji + uitextline1 = "MaSzyna " + Global.asVersion; // informacja o wersji + if( Global.iMultiplayer ) { + uitextline1 += " (multiplayer mode is active)"; + } + uitextline3 = + "vehicles: " + to_string( Timer::subsystem.sim_dynamics.average(), 2 ) + " msec" + + " update total: " + to_string( Timer::subsystem.sim_total.average(), 2 ) + " msec"; + + break; + } + + case( GLFW_KEY_F10 ) : { + + uitextline1 = ( "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]." ); + + break; + } + + case( GLFW_KEY_F12 ) : { + // opcje włączenia i wyłączenia logowania + uitextline1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); + uitextline2 = "[1] log.txt " + std::string( ( Global.iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); + uitextline3 = "[2] Console " + std::string( ( Global.iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); + + break; + } + + default: { + // uncovered cases, nothing to do here... + // ... unless we're in debug mode + if( DebugModeFlag ) { + + auto *vehicle { + ( FreeFlyModeFlag ? + std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : + controlled ) }; // w trybie latania lokalizujemy wg mapy + if( vehicle == nullptr ) { + break; + } + uitextline1 = + "vel: " + to_string( vehicle->GetVelocity(), 2 ) + "/" + to_string( vehicle->MoverParameters->nrot* M_PI * vehicle->MoverParameters->WheelDiameter * 3.6, 2 ) + + " km/h;" + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : " " ) + + " dist: " + to_string( vehicle->MoverParameters->DistCounter, 2 ) + " km" + + "; pos: [" + to_string( vehicle->GetPosition().x, 2 ) + ", " + to_string( vehicle->GetPosition().y, 2 ) + ", " + to_string( vehicle->GetPosition().z, 2 ) + "]" + + ", PM=" + to_string( vehicle->MoverParameters->WheelFlat, 1 ) + + " mm; enrot=" + to_string( vehicle->MoverParameters->enrot * 60, 0 ) + + " tmrot=" + to_string( std::abs( vehicle->MoverParameters->nrot ) * vehicle->MoverParameters->Transmision.Ratio * 60, 0 ) + + "; ventrot=" + to_string( vehicle->MoverParameters->RventRot * 60, 1 ); + + uitextline2 = + "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) + + "; HamP=" + std::to_string( vehicle->MoverParameters->LocalBrakePos ) + "/" + to_string( vehicle->MoverParameters->LocalBrakePosA, 2 ) + + "; NasJ=" + std::to_string( vehicle->MoverParameters->MainCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->MainCtrlActualPos ) + ")" + + ( vehicle->MoverParameters->ShuntMode ? + "; NasB=" + to_string( vehicle->MoverParameters->AnPos, 2 ) : + "; NasB=" + std::to_string( vehicle->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->ScndCtrlActualPos ) + ")" ) + + "; I=" + + ( vehicle->MoverParameters->TrainType == dt_EZT ? + std::to_string( int( vehicle->MoverParameters->ShowCurrent( 0 ) ) ) : + std::to_string( int( vehicle->MoverParameters->Im ) ) ) + + "; U=" + to_string( int( vehicle->MoverParameters->RunningTraction.TractionVoltage + 0.5 ) ) + + "; R=" + + ( std::abs( vehicle->MoverParameters->RunningShape.R ) > 10000.0 ? + "~0.0" : + to_string( vehicle->MoverParameters->RunningShape.R, 1 ) ) + + " An=" + to_string( vehicle->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne + + if( tprev != simulation::Time.data().wSecond ) { + tprev = simulation::Time.data().wSecond; + Acc = ( vehicle->MoverParameters->Vel - VelPrev ) / 3.6; + VelPrev = vehicle->MoverParameters->Vel; + } + uitextline2 += "; As=" + to_string( Acc, 2 ); // przyspieszenie wzdłużne + uitextline2 += " eAngle=" + to_string( std::cos( vehicle->MoverParameters->eAngle ), 2 ); + + uitextline3 = + "cyl.ham. " + to_string( vehicle->MoverParameters->BrakePress, 2 ) + + "; prz.gl. " + to_string( vehicle->MoverParameters->PipePress, 2 ) + + "; zb.gl. " + to_string( vehicle->MoverParameters->CompressedVolume, 2 ) + // youBy - drugi wezyk + + "; p.zas. " + to_string( vehicle->MoverParameters->ScndPipePress, 2 ); + + // McZapkie: warto wiedziec w jakim stanie sa przelaczniki + if( vehicle->MoverParameters->ConvOvldFlag ) + uitextline3 += " C! "; + else if( vehicle->MoverParameters->FuseFlag ) + uitextline3 += " F! "; + else if( !vehicle->MoverParameters->Mains ) + uitextline3 += " () "; + else { + switch( + vehicle->MoverParameters->ActiveDir * + ( vehicle->MoverParameters->Imin == vehicle->MoverParameters->IminLo ? + 1 : + 2 ) ) { + case 2: { uitextline3 += " >> "; break; } + case 1: { uitextline3 += " -> "; break; } + case 0: { uitextline3 += " -- "; break; } + case -1: { uitextline3 += " <- "; break; } + case -2: { uitextline3 += " << "; break; } + } + } + // McZapkie: predkosc szlakowa + if( vehicle->MoverParameters->RunningTrack.Velmax == -1 ) { + uitextline3 += " Vtrack=Vmax"; + } + else { + uitextline3 += " Vtrack " + to_string( vehicle->MoverParameters->RunningTrack.Velmax, 2 ); + } + + if( ( vehicle->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) + || ( vehicle->MoverParameters->TrainType == dt_EZT ) ) { + uitextline3 += + "; pant. " + to_string( vehicle->MoverParameters->PantPress, 2 ) + + ( vehicle->MoverParameters->bPantKurek3 ? "=" : "^" ) + "ZG"; + } + + // McZapkie: komenda i jej parametry + if( vehicle->MoverParameters->CommandIn.Command != ( "" ) ) { + uitextline4 = + "C:" + vehicle->MoverParameters->CommandIn.Command + + " V1=" + to_string( vehicle->MoverParameters->CommandIn.Value1, 0 ) + + " V2=" + to_string( vehicle->MoverParameters->CommandIn.Value2, 0 ); + } + if( ( vehicle->Mechanik ) + && ( vehicle->Mechanik->AIControllFlag == AIdriver ) ) { + uitextline4 += + "AI: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) + + " ad=" + to_string(vehicle->Mechanik->AccDesired, 2) + + "/" + to_string(vehicle->Mechanik->AccDesired*vehicle->Mechanik->BrakeAccFactor(), 2) + + " atrain=" + to_string(vehicle->Mechanik->fBrake_a0[0], 2) + + "+" + to_string(vehicle->Mechanik->fBrake_a1[0], 2) + + " aS=" + to_string(vehicle->Mechanik->AbsAccS_pub, 2) + + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ); + } + + // induction motor data + if( vehicle->MoverParameters->EngineType == ElectricInductionMotor ) { + + UITable->text_lines.emplace_back( " eimc: eimv: press:", Global.UITextColor ); + for( int i = 0; i <= 20; ++i ) { + + std::string parameters = + vehicle->MoverParameters->eimc_labels[ i ] + to_string( vehicle->MoverParameters->eimc[ i ], 2, 9 ) + + " | " + + vehicle->MoverParameters->eimv_labels[ i ] + to_string( vehicle->MoverParameters->eimv[ i ], 2, 9 ); + + if( i < 10 ) { + parameters += " | " + train->fPress_labels[i] + to_string( train->fPress[ i ][ 0 ], 2, 9 ); + } + else if( i == 12 ) { + parameters += " med:"; + } + else if( i >= 13 ) { + parameters += " | " + vehicle->MED_labels[ i - 13 ] + to_string( vehicle->MED[ 0 ][ i - 13 ], 2, 9 ); + } + + UITable->text_lines.emplace_back( parameters, Global.UITextColor ); + } + } + if (vehicle->MoverParameters->EngineType == DieselEngine) { + std::string parameters = "param value"; + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "efill: " + to_string(vehicle->MoverParameters->dizel_fill, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "etorq: " + to_string(vehicle->MoverParameters->dizel_Torque, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "creal: " + to_string(vehicle->MoverParameters->dizel_engage, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "cdesi: " + to_string(vehicle->MoverParameters->dizel_engagestate, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "cdelt: " + to_string(vehicle->MoverParameters->dizel_engagedeltaomega, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "gears: " + to_string(vehicle->MoverParameters->dizel_automaticgearstatus, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hydro value"; + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCnI: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCnO: " + to_string(vehicle->MoverParameters->hydro_TC_nOut, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCTM: " + to_string(vehicle->MoverParameters->hydro_TC_TMRatio, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCTI: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueIn, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCTO: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueOut, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCfl: " + to_string(vehicle->MoverParameters->hydro_TC_Fill, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCLR: " + to_string(vehicle->MoverParameters->hydro_TC_LockupRate, 2, 9); + UITable->text_lines.emplace_back(parameters, Global.UITextColor); + //parameters = "hTCXX: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); + //UITable->text_lines.emplace_back(parameters, Global.UITextColor); + } + + } // if( DebugModeFlag && Controlled ) + + break; + } + } + +#ifdef EU07_USE_OLD_UI_CODE + if( Controlled && DebugModeFlag && !Global.iTextMode ) { + + uitextline1 += + ( "; d_omega " ) + to_string( Controlled->MoverParameters->dizel_engagedeltaomega, 3 ); + + if( Controlled->MoverParameters->EngineType == ElectricInductionMotor ) { + + for( int i = 0; i <= 8; i++ ) { + for( int j = 0; j <= 9; j++ ) { + glRasterPos2f( 0.05f + 0.03f * i, 0.16f - 0.01f * j ); + uitextline4 = to_string( Train->fEIMParams[ i ][ j ], 2 ); + } + } + } + } +#endif + + // update the ui header texts + auto &headerdata = UIHeader->text_lines; + headerdata[ 0 ].data = uitextline1; + headerdata[ 1 ].data = uitextline2; + headerdata[ 2 ].data = uitextline3; + headerdata[ 3 ].data = uitextline4; + + // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) + auto &transcripts = UITranscripts->text_lines; + transcripts.clear(); + for( auto const &transcript : ui::Transcripts.aLines ) { + + if( Global.fTimeAngleDeg >= transcript.fShow ) { + + cParser parser( transcript.asText ); + while( true == parser.getTokens( 1, false, "|" ) ) { + + std::string transcriptline; parser >> transcriptline; + transcripts.emplace_back( transcriptline, glm::vec4( 1.0f, 1.0f, 0.0f, 1.0f ) ); + } + } + } + +} + void ui_layer::render() { diff --git a/uilayer.h b/uilayer.h index 26733f81..4b25d88c 100644 --- a/uilayer.h +++ b/uilayer.h @@ -1,4 +1,4 @@ - + #pragma once #include @@ -40,8 +40,15 @@ public: // methods: bool init( GLFWwindow *Window ); + // assign texturing hardware unit void set_unit( GLint const Textureunit ) { m_textureunit = Textureunit; } + // potentially processes provided input key. returns: true if the input was processed, false otherwise + bool + on_key( int const Key, int const Action ); + // updates state of UI elements + void + update(); // draws requested UI elements void render(); @@ -85,11 +92,10 @@ private: void quad( glm::vec4 const &Coordinates, glm::vec4 const &Color ); - // members: GLFWwindow *m_window { nullptr }; GLint m_textureunit{ GL_TEXTURE0 }; - GLuint m_fontbase { (GLuint)-1 }; // numer DL dla znakw w napisach + GLuint m_fontbase { (GLuint)-1 }; // numer DL dla znaków w napisach // progress bar config. TODO: put these together into an object float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. @@ -101,6 +107,13 @@ private: GLuint m_texture { 0 }; std::vector > m_panels; std::string m_tooltip; + // TODO: clean these legacy components up + std::shared_ptr UIHeader; // header ui panel + std::shared_ptr UITable; // schedule or scan table + std::shared_ptr UITranscripts; // voice transcripts + int tprev; // poprzedni czas + double VelPrev; // poprzednia prędkość + double Acc; // przyspieszenie styczne }; extern ui_layer UILayer; diff --git a/version.h b/version.h index 1ed2cbd9..87f62dea 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 331 +#define VERSION_MINOR 404 #define VERSION_REVISION 0 From 03d4720b3eef0adbaac0433f9dcc1e334df4de3b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 11 Apr 2018 00:39:09 +0200 Subject: [PATCH 302/426] build 180411. basic oil pump, diesel engine startup procedure --- Driver.cpp | 11 +- DynObj.cpp | 54 ++++++--- DynObj.h | 2 + McZapkie/MOVER.h | 27 ++++- McZapkie/Mover.cpp | 268 +++++++++++++++++++++++++++++++-------------- Train.cpp | 88 +++++++++++---- Train.h | 4 + command.cpp | 3 + command.h | 3 + keyboardinput.cpp | 6 + mouseinput.cpp | 3 + simulation.cpp | 8 +- translation.h | 1 + uilayer.cpp | 10 +- version.h | 2 +- 15 files changed, 351 insertions(+), 139 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index c939958b..6967e5f1 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2225,8 +2225,12 @@ bool TController::PrepareEngine() } if (AIControllFlag) { // część wykonawcza dla sterowania przez komputer - mvOccupied->BatterySwitch(true); - mvOccupied->FuelPumpSwitch( true ); + mvOccupied->BatterySwitch( true ); + if( ( mvOccupied->EngineType == DieselElectric ) + || ( mvOccupied->EngineType == DieselEngine ) ) { + mvOccupied->FuelPumpSwitch( true ); + mvOccupied->OilPumpSwitch( true ); + } if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { // jeśli silnikowy jest pantografującym mvControlling->PantFront( true ); @@ -2294,7 +2298,7 @@ bool TController::PrepareEngine() else if (false == mvControlling->Mains) { while (DecSpeed(true)) ; // zerowanie napędu - +/* if( ( mvOccupied->EngineType == DieselEngine ) || ( mvOccupied->EngineType == DieselElectric ) ) { // start helper devices before spinning up the engine @@ -2302,6 +2306,7 @@ bool TController::PrepareEngine() mvOccupied->ConverterSwitch( true ); mvOccupied->CompressorSwitch( true ); } +*/ if( mvOccupied->TrainType == dt_SN61 ) { // specjalnie dla SN61 żeby nie zgasł if( mvControlling->RList[ mvControlling->MainCtrlPos ].Mn == 0 ) { diff --git a/DynObj.cpp b/DynObj.cpp index c188cc77..f1d3ea43 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4889,6 +4889,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.engine_revving.owner( this ); } + else if( token == "oilpump:" ) { + // plik z dzwiekiem wentylatora, mnozniki i ofsety amp. i czest. + m_powertrainsounds.oil_pump.deserialize( parser, sound_type::single ); + m_powertrainsounds.oil_pump.owner( this ); + } + else if( ( token == "tractionmotor:" ) && ( MoverParameters->Power > 0 ) ) { // plik z dzwiekiem silnika, mnozniki i ofsety amp. i czest. @@ -5944,9 +5950,37 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub double frequency { 1.0 }; double volume { 0.0 }; + // oil pump + if( true == Vehicle.OilPump.is_active ) { + oil_pump + .pitch( oil_pump.m_frequencyoffset + oil_pump.m_frequencyfactor * 1.f ) + .gain( oil_pump.m_amplitudeoffset + oil_pump.m_amplitudefactor * 1.f ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + oil_pump.stop(); + } + // engine sounds - if( ( true == Vehicle.Mains ) - && ( false == Vehicle.dizel_enginestart ) ) { + // ignition + if( engine_state_last != Vehicle.Mains ) { + + if( true == Vehicle.Mains ) { + // main circuit/engine activation + // TODO: separate engine and main circuit + engine_ignition + .pitch( engine_ignition.m_frequencyoffset + engine_ignition.m_frequencyfactor * 1.f ) + .gain( engine_ignition.m_amplitudeoffset + engine_ignition.m_amplitudefactor * 1.f ) + .play( sound_flags::exclusive ); + } + else { + // main circuit/engine deactivation + engine_ignition.stop(); + } + engine_state_last = Vehicle.Mains; + } + // main engine sound + if( true == Vehicle.Mains ) { if( ( std::fabs( Vehicle.enrot ) > 0.01 ) // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach @@ -6058,7 +6092,6 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub engine.stop(); } - // youBy - przenioslem, bo diesel tez moze miec turbo if( Vehicle.TurboTest > 0 ) { // udawanie turbo: @@ -6100,19 +6133,6 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub } } - // diesel startup - if( ( Vehicle.EngineType == DieselEngine ) - || ( Vehicle.EngineType == DieselElectric ) ) { - - if( true == Vehicle.dizel_enginestart ) { - engine_ignition - .pitch( engine_ignition.m_frequencyoffset + engine_ignition.m_frequencyfactor * 1.f ) - .gain( engine_ignition.m_amplitudeoffset + engine_ignition.m_amplitudefactor * 1.f ) - .play( sound_flags::exclusive ); - } - } - - if( Vehicle.dizel_engage > 0.1 ) { if( std::abs( Vehicle.dizel_engagedeltaomega ) > 0.2 ) { frequency = rsEngageSlippery.m_frequencyoffset + rsEngageSlippery.m_frequencyfactor * std::fabs( Vehicle.dizel_engagedeltaomega ); @@ -6138,7 +6158,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub // motor sounds volume = 0.0; if( ( true == Vehicle.Mains ) - && ( false == Vehicle.dizel_enginestart ) + && ( false == Vehicle.dizel_ignition ) && ( false == motors.empty() ) ) { if( std::fabs( Vehicle.enrot ) > 0.01 ) { diff --git a/DynObj.h b/DynObj.h index d534d69c..0eb826e2 100644 --- a/DynObj.h +++ b/DynObj.h @@ -314,12 +314,14 @@ private: sound_source rsWentylator { sound_placement::engine }; // McZapkie-030302 sound_source engine { sound_placement::engine }; // generally diesel engine sound_source engine_ignition { sound_placement::engine }; // moved from cab + bool engine_state_last { false }; // helper, cached previous state of the engine double engine_volume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal sound_source engine_revving { sound_placement::engine }; // youBy float engine_revs_last { -1.f }; // helper, cached rpm of the engine float engine_revs_change { 0.f }; // recent change in engine revolutions sound_source engine_turbo { sound_placement::engine }; double engine_turbo_pitch { 1.0 }; + sound_source oil_pump { sound_placement::engine }; sound_source transmission { sound_placement::engine }; sound_source rsEngageSlippery { sound_placement::engine }; // moved from cab diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index f1056f95..6a2d8bf1 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -164,7 +164,8 @@ enum range { // start method for devices; exclusive enum start { manual, - automatic + automatic, + manualwithautofallback }; // recognized vehicle light locations and types; can be combined enum light { @@ -626,6 +627,19 @@ struct fuel_pump { start start_type { start::manual }; }; +// basic approximation of a fuel pump +// TODO: fuel consumption, optional automatic engine start after activation +struct oil_pump { + + bool is_enabled { false }; // device is allowed/requested to operate + bool is_active { false }; // device is working + start start_type { start::manual }; + float resource_amount { 1.f }; + float pressure_minimum { 0.f }; // lowest acceptable working pressure + float pressure_target { 0.f }; + float pressure_present { 0.f }; +}; + class TMoverParameters { // Ra: wrapper na kod pascalowy, przejmujący jego funkcje Q: 20160824 - juz nie wrapper a klasa bazowa :) public: @@ -913,6 +927,7 @@ public: bool ConverterAllowLocal{ true }; // local device state override (most units don't have this fitted so it's set to true not to intefere) bool ConverterFlag = false; /*! czy wlaczona przetwornica NBMX*/ fuel_pump FuelPump; + oil_pump OilPump; int BrakeCtrlPos = -2; /*nastawa hamulca zespolonego*/ double BrakeCtrlPosR = 0.0; /*nastawa hamulca zespolonego - plynna dla FV4a*/ @@ -1010,7 +1025,8 @@ public: double dizel_engagestate = 0.0; /*sprzeglo skrzyni biegow: 0 - luz, 1 - wlaczone, 0.5 - wlaczone 50% (z poslizgiem)*/ double dizel_engage = 0.0; /*sprzeglo skrzyni biegow: aktualny docisk*/ double dizel_automaticgearstatus = 0.0; /*0 - bez zmiany, -1 zmiana na nizszy +1 zmiana na wyzszy*/ - bool dizel_enginestart = false; /*czy trwa rozruch silnika*/ + bool dizel_startup { false }; // engine startup procedure request indicator + bool dizel_ignition = false; // engine ignition request indicator double dizel_engagedeltaomega = 0.0; /*roznica predkosci katowych tarcz sprzegla*/ double dizel_n_old = 0.0; /*poredkosc na potrzeby obliczen sprzegiel*/ double dizel_Torque = 0.0; /*poredkosc na potrzeby obliczen sprzegiel*/ @@ -1200,6 +1216,7 @@ public: /*--funkcje dla lokomotyw*/ bool DirectionBackward(void);/*! kierunek ruchu*/ bool FuelPumpSwitch( bool State, int const Notify = range::consist ); // fuel pump state toggle + bool OilPumpSwitch( bool State, int const Notify = range::consist ); // oil pump state toggle bool MainSwitch( bool const State, int const Notify = range::consist );/*! wylacznik glowny*/ bool ConverterSwitch( bool State, int const Notify = range::consist );/*! wl/wyl przetwornicy*/ bool CompressorSwitch( bool State, int const Notify = range::consist );/*! wl/wyl sprezarki*/ @@ -1207,7 +1224,8 @@ public: /*-funkcje typowe dla lokomotywy elektrycznej*/ void ConverterCheck( double const Timestep ); // przetwornica void FuelPumpCheck( double const Timestep ); - bool FuseOn(void); //bezpiecznik nadamiary + void OilPumpCheck( double const Timestep ); + bool FuseOn(void); //bezpiecznik nadamiary bool FuseFlagCheck(void); // sprawdzanie flagi nadmiarowego void FuseOff(void); // wylaczenie nadmiarowego double ShowCurrent( int AmpN ); //pokazuje bezwgl. wartosc pradu na wybranym amperomierzu @@ -1238,7 +1256,8 @@ public: bool dizel_AutoGearCheck(void); double dizel_fillcheck(int mcp); double dizel_Momentum(double dizel_fill, double n, double dt); - bool dizel_Update(double dt); + bool dizel_StartupCheck(); + bool dizel_Update(double dt); /* funckje dla wagonow*/ bool LoadingDone(double LSpeed, std::string LoadInit); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 3742a739..3076ec0f 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1554,6 +1554,10 @@ double TMoverParameters::ShowEngineRotation(int VehN) // sprawdzanie przetwornicy void TMoverParameters::ConverterCheck( double const Timestep ) { // TODO: move other converter checks here, to have it all in one place for potential device object + if( ConverterStart == start::automatic ) { + ConverterAllow = Mains; + } + if( ( ConverterAllow ) && ( ConverterAllowLocal ) && ( false == PantPressLockActive ) @@ -1575,11 +1579,56 @@ void TMoverParameters::ConverterCheck( double const Timestep ) { // fuel pump status update void TMoverParameters::FuelPumpCheck( double const Timestep ) { + if( FuelPump.start_type == start::automatic ) { + FuelPump.is_enabled = ( dizel_startup || Mains ); + } FuelPump.is_active = ( ( true == FuelPump.is_enabled ) && ( true == Battery ) ); } +// oil pump status update +void TMoverParameters::OilPumpCheck( double const Timestep ) { + + OilPump.is_active = + ( ( true == Battery ) + && ( OilPump.start_type == start::manual ? ( OilPump.is_enabled ) : + OilPump.start_type == start::automatic ? ( dizel_startup || Mains ) : + OilPump.start_type == start::manualwithautofallback ? ( OilPump.is_enabled || dizel_startup || Mains ) : + false ) ); // shouldn't ever get this far but, eh + + auto const maxrevolutions { + EngineType == DieselEngine ? + dizel_nmax : + DElist[ MainCtrlPosNo ].RPM / 60.0 }; + auto const minpressure { + OilPump.pressure_minimum > 0.f ? + OilPump.pressure_minimum : + 0.1f }; // arbitrary fallback value + auto const maxpressure { 0.65f }; // arbitrary value + + OilPump.pressure_target = ( + false == OilPump.is_active ? 0.f : + enrot > 0.1 ? std::max( minpressure, maxpressure * clamp( enrot / maxrevolutions, 0.0, 1.0 ) ) * OilPump.resource_amount : + minpressure ); + + if( OilPump.pressure_present < OilPump.pressure_target ) { + // TODO: scale change rate from 0.01-0.05 with oil/engine temperature/idle time + OilPump.pressure_present = + std::min( + OilPump.pressure_target, + OilPump.pressure_present + ( enrot > 5.0 ? 0.05 : 0.035 ) * Timestep ); + } + if( OilPump.pressure_present > OilPump.pressure_target ) { + OilPump.pressure_present = + std::max( + OilPump.pressure_target, + OilPump.pressure_present - 0.01 * Timestep ); + } + OilPump.pressure_present = clamp( OilPump.pressure_present, 0.f, 1.5f ); +} + + double TMoverParameters::ShowCurrent(int AmpN) { // Odczyt poboru prądu na podanym amperomierzu switch (EngineType) @@ -2372,13 +2421,38 @@ bool TMoverParameters::FuelPumpSwitch( bool State, int const Notify ) { return ( FuelPump.is_enabled != initialstate ); } +// oil pump state toggle +bool TMoverParameters::OilPumpSwitch( bool State, int const Notify ) { + + if( OilPump.start_type == start::automatic ) { + // automatic pump ignores 'manual' state commands + return false; + } + + bool const initialstate { OilPump.is_enabled }; + + OilPump.is_enabled = State; + + if( Notify != range::local ) { + SendCtrlToNext( + "OilPumpSwitch", + ( OilPump.is_enabled ? 1 : 0 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( OilPump.is_enabled != initialstate ); +} + // ************************************************************************************************* // Q: 20160713 // włączenie / wyłączenie obwodu głownego // ************************************************************************************************* bool TMoverParameters::MainSwitch( bool const State, int const Notify ) { - bool const initialstate { Mains }; + bool const initialstate { Mains || dizel_startup }; if( ( Mains != State ) && ( MainCtrlPosNo > 0 ) ) { @@ -2394,17 +2468,8 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) // switch on if( ( EngineType == DieselEngine ) || ( EngineType == DieselElectric ) ) { - - if( true == FuelPump.start_type == start::automatic ) { - // potentially force start of the fuel pump - // TODO: the whole diesel start sequence is a special kind of a mess, clean it up when refactoring - FuelPump.is_enabled = true; - FuelPumpCheck( 0.0 ); - } - if( true == FuelPump.is_active ) { - Mains = true; - dizel_enginestart = true; - } + // launch diesel engine startup procedure + dizel_startup = true; } else { Mains = true; @@ -2412,10 +2477,6 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) } else { Mains = false; - if( true == FuelPump.start_type == start::automatic ) { - // if the engine is off, switch off automatic fuel pump - FuelPump.is_enabled = false; - } } if( ( TrainType == dt_EZT ) @@ -2438,11 +2499,10 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) coupling::control | coupling::permanent : coupling::control ) ); } - } } - // else MainSwitch:=false; - return ( Mains != initialstate ); + + return ( ( Mains || dizel_startup ) != initialstate ); } // ************************************************************************************************* @@ -2457,8 +2517,6 @@ bool TMoverParameters::ConverterSwitch( bool State, int const Notify ) { ConverterAllow = State; CS = true; - if (CompressorPower == 2) - CompressorAllow = ConverterAllow; } if( ConverterAllow == true ) { if( Notify != range::local ) { @@ -2488,11 +2546,13 @@ bool TMoverParameters::ConverterSwitch( bool State, int const Notify ) // ************************************************************************************************* bool TMoverParameters::CompressorSwitch( bool State, int const Notify ) { + if( CompressorPower > 1 ) { + // only pay attention if the compressor can be controlled manually + return false; + } + bool CS = false; // Ra: normalnie chyba tak? - // if State=true then - // if ((CompressorPower=2) and (not ConverterAllow)) then - // State:=false; //yB: to juz niepotrzebne - if ((CompressorAllow != State) && (CompressorPower < 2)) + if ( CompressorAllow != State ) { CompressorAllow = State; CS = true; @@ -3094,6 +3154,10 @@ void TMoverParameters::CompressorCheck(double dt) CompressorGovernorLock = false; } + if( CompressorPower == 2 ) { + CompressorAllow = ConverterAllow; + } + if (MaxCompressor - MinCompressor < 0.0001) { // TODO: investigate purpose of this branch and whether it can be removed as it duplicates later code if( ( true == CompressorAllow ) @@ -3124,10 +3188,7 @@ void TMoverParameters::CompressorCheck(double dt) } } else { - if( ( ( CompressorPower == 0 ) - || ( CompressorPower == 3 ) ) - && ( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) ) { + if( CompressorPower == 3 ) { // experimental: make sure compressor coupled with diesel engine is always ready for work CompressorAllow = true; } @@ -3167,10 +3228,7 @@ void TMoverParameters::CompressorCheck(double dt) if( Compressor > MaxCompressor ) { // wyłącznik ciśnieniowy jest niezależny od sposobu zasilania // TBD, TODO: don't operate the lock without battery power? - if( ( ( CompressorPower == 0 ) - || ( CompressorPower == 3 ) ) - && ( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) ) { + if( CompressorPower == 3 ) { // if the compressor is powered directly by the engine the lock can't turn it off and instead just changes the output if( false == CompressorGovernorLock ) { // emit relay sound when the lock engages (the state change itself is below) and presumably changes where the air goes @@ -3270,42 +3328,29 @@ void TMoverParameters::CompressorCheck(double dt) } if( CompressorFlag ) { - if( ( EngineType == DieselElectric ) - && ( ( CompressorPower == 0 ) - || ( CompressorPower == 3 ) ) ) { + // working compressor adds air to the air reservoir + if( CompressorPower == 3 ) { + // the compressor is coupled with the diesel engine, engine revolutions affect the output if( false == CompressorGovernorLock ) { + auto const enginefactor { ( + EngineType == DieselElectric ? ( DElist[ MainCtrlPos ].RPM / DElist[ MainCtrlPosNo ].RPM ) : + EngineType == DieselEngine ? ( std::abs( enrot ) / nmax ) : + 1.0 ) }; // shouldn't ever get here but, eh CompressedVolume += CompressorSpeed * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor - * ( DElist[ MainCtrlPos ].RPM / DElist[ MainCtrlPosNo ].RPM ) + * enginefactor * dt; } /* else { - // the lock is active, air is being vented out - CompressedVolume -= 0.1 * dt; - } -*/ - } - else if( ( EngineType == DieselEngine ) - && ( ( CompressorPower == 0 ) - || ( CompressorPower == 3 ) ) ) { - if( false == CompressorGovernorLock ) { - // experimental: compressor coupled with diesel engine, output scaled by current engine rotational speed - CompressedVolume += - CompressorSpeed - * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor - * ( std::abs( enrot ) / nmax ) - * dt; - } -/* - else { - // the lock is active, air is being vented out - CompressedVolume -= 0.1 * dt; + // the lock is active, air is being vented out at arbitrary rate + CompressedVolume -= 0.01 * dt; } */ } else { + // the compressor is a stand-alone device, working at steady pace CompressedVolume += CompressorSpeed * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor @@ -5780,32 +5825,67 @@ bool TMoverParameters::dizel_AutoGearCheck(void) return OK; } +// performs diesel engine startup procedure; potentially clears startup switch; returns: true if the engine can be started, false otherwise +bool TMoverParameters::dizel_StartupCheck() { + + auto engineisready { true }; // make inital optimistic presumption, then watch the reality crush it + + // test the fuel pump + if( false == FuelPump.is_active ) { + engineisready = false; + if( FuelPump.start_type == start::manual ) { + // with manual pump control startup procedure is done only once per starter switch press + dizel_startup = false; + } + } + // test the oil pump + if( ( false == OilPump.is_active ) + || ( OilPump.pressure_present < OilPump.pressure_minimum ) ) { + engineisready = false; + if( OilPump.start_type == start::manual ) { + // with manual pump control startup procedure is done only once per starter switch press + dizel_startup = false; + } + } + + return engineisready; +} + // ************************************************************************************************* // Q: 20160715 // Aktualizacja stanu silnika // ************************************************************************************************* -bool TMoverParameters::dizel_Update(double dt) -{ +bool TMoverParameters::dizel_Update(double dt) { + + OilPumpCheck( dt ); FuelPumpCheck( dt ); - // potentially automatic engine start after fuel pump was activated - if( ( true == Mains ) - && ( false == FuelPump.is_active ) ) { - // knock out the engine if the fuel pump isn't feeding it - // TBD, TODO: grace period before the engine is starved for fuel and knocked out - MainSwitch( false ); + if( ( true == dizel_startup ) + && ( true == dizel_StartupCheck() ) ) { + dizel_ignition = true; } - if( ( true == dizel_enginestart ) + if( ( true == dizel_ignition ) && ( LastSwitchingTime >= InitialCtrlDelay ) ) { - dizel_enginestart = false; - LastSwitchingTime = 0; + dizel_startup = false; + dizel_ignition = false; + // TODO: split engine and main circuit state indicator in two separate flags + Mains = true; + LastSwitchingTime = 0; enrot = std::max( enrot, 0.35 * ( // TODO: dac zaleznie od temperatury i baterii EngineType == DieselEngine ? dizel_nmin : DElist[ 0 ].RPM / 60.0 ) ); + + } + + if( ( true == Mains ) + && ( false == FuelPump.is_active ) ) { + // knock out the engine if the fuel pump isn't feeding it + // TBD, TODO: grace period before the engine is starved for fuel and knocked out + MainSwitch( false ); } bool DU { false }; @@ -5832,9 +5912,11 @@ double TMoverParameters::dizel_fillcheck(int mcp) && ( MainCtrlPosNo > 0 ) && ( true == FuelPump.is_active ) ) { - if( ( true == dizel_enginestart ) + if( ( true == dizel_ignition ) && ( LastSwitchingTime >= 0.9 * InitialCtrlDelay ) ) { // wzbogacenie przy rozruchu + // NOTE: ignition flag is reset before this code is executed + // TODO: sort this out realfill = 1; } else { @@ -5899,7 +5981,7 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) // wstrzymywanie przy malych obrotach Moment -= dizel_Mstand; } - if (true == dizel_enginestart) + if (true == dizel_ignition) Moment += dizel_Mstand / (0.3 + std::max(0.0, enrot/dizel_nmin)); //rozrusznik dizel_Torque = Moment; @@ -6010,7 +6092,7 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) } - if ((enrot <= 0) && (!dizel_enginestart)) + if ((enrot <= 0) && (!dizel_ignition)) { Mains = false; enrot = 0; @@ -7680,6 +7762,19 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { start::manual; } + // oil pump + { + std::map starts { + { "Manual", start::manual }, + { "Automatic", start::automatic }, + { "Mixed", start::manualwithautofallback } + }; + auto lookup = starts.find( extract_value( "OilStart", line ) ); + OilPump.start_type = + lookup != starts.end() ? + lookup->second : + start::manual; + } } void TMoverParameters::LoadFIZ_Light( std::string const &line ) { @@ -7833,6 +7928,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value(hydro_R_MinVel, "R_MinVel", Input, ""); } } + extract_value( OilPump.pressure_minimum, "MinOilPressure", Input, "" ); break; } case DieselElectric: { //youBy @@ -7853,6 +7949,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { ImaxHi = 2; ImaxLo = 1; } + extract_value( OilPump.pressure_minimum, "OilMinPressure", Input, "" ); break; } case ElectricInductionMotor: { @@ -8132,6 +8229,13 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) Sand = SandCapacity; + // NOTE: for diesel-powered vehicles we automatically convert legacy "main" power source to more accurate "engine" + if( ( CompressorPower == 0 ) + && ( ( EngineType == DieselEngine ) + || ( EngineType == DieselElectric ) ) ) { + CompressorPower = 3; + } + // WriteLog("aa = " + AxleArangement + " " + std::string( Pos("o", AxleArangement)) ); if( ( AxleArangement.find( "o" ) != std::string::npos ) && ( EngineType == ElectricSeriesMotor ) ) { @@ -8574,22 +8678,20 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } + else if (Command == "OilPumpSwitch") { + if( OilPump.start_type == start::manual ) { + // automatic pump ignores 'manual' state commands + OilPump.is_enabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } else if (Command == "MainSwitch") { if (CValue1 == 1) { if( ( EngineType == DieselEngine ) || ( EngineType == DieselElectric ) ) { - if( true == FuelPump.start_type == start::automatic ) { - // potentially force start of the fuel pump - // TODO: the whole diesel start sequence is a special kind of mess, clean it up when refactoring - FuelPump.is_enabled = true; - FuelPumpCheck( 0.0 ); - } - if( true == FuelPump.is_active ) { - Mains = true; - dizel_enginestart = true; - } + dizel_startup = true; } else { Mains = true; @@ -8597,10 +8699,6 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else { Mains = false; - if( true == FuelPump.start_type == start::automatic ) { - // if the engine is off, switch off automatic fuel pump - FuelPump.is_enabled = false; - } } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } diff --git a/Train.cpp b/Train.cpp index 350da7de..60301c0d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -225,6 +225,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::fuelpumptoggle, &TTrain::OnCommand_fuelpumptoggle }, { user_command::fuelpumpenable, &TTrain::OnCommand_fuelpumpenable }, { user_command::fuelpumpdisable, &TTrain::OnCommand_fuelpumpdisable }, + { user_command::oilpumptoggle, &TTrain::OnCommand_oilpumptoggle }, + { user_command::oilpumpenable, &TTrain::OnCommand_oilpumpenable }, + { user_command::oilpumpdisable, &TTrain::OnCommand_oilpumpdisable }, { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, { user_command::converterenable, &TTrain::OnCommand_converterenable }, { user_command::converterdisable, &TTrain::OnCommand_converterdisable }, @@ -1981,17 +1984,15 @@ void TTrain::OnCommand_linebreakerclose( TTrain *Train, command_data const &Comm if( Train->m_linebreakerstate == 1 ) { return; } // already in the desired state - if( Train->m_linebreakerstate > 1 ) { + if( Train->m_linebreakerstate == 2 ) { // we don't need to start the diesel twice, but the other types (with impulse switch setup) still need to be launched if( ( Train->mvControlled->EngineType != DieselEngine ) && ( Train->mvControlled->EngineType != DieselElectric ) ) { - if( Train->mvControlled->MainSwitch( true ) ) { - // side-effects - Train->mvControlled->ConverterSwitch( ( Train->ggConverterButton.GetValue() > 0.5 ) || ( Train->mvControlled->ConverterStart == start::automatic ) ); - Train->mvControlled->CompressorSwitch( Train->ggCompressorButton.GetValue() > 0.5 ); - // finalize state change of the line breaker - Train->m_linebreakerstate = 1; - } + // try to finalize state change of the line breaker, set the state based on the outcome + Train->m_linebreakerstate = ( + Train->mvControlled->MainSwitch( true ) ? + 1 : + 0 ); } } // on button release reset the closing timer @@ -2038,6 +2039,45 @@ void TTrain::OnCommand_fuelpumpdisable( TTrain *Train, command_data const &Comma } } +void TTrain::OnCommand_oilpumptoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->OilPump.is_enabled ) { + // turn on + OnCommand_oilpumpenable( Train, Command ); + } + else { + //turn off + OnCommand_oilpumpdisable( Train, Command ); + } + } +} + +void TTrain::OnCommand_oilpumpenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggOilPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->OilPump.is_enabled ) { return; } // already enabled + + Train->mvControlled->OilPumpSwitch( true ); + } +} + +void TTrain::OnCommand_oilpumpdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggOilPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->OilPump.is_enabled ) { return; } // already disabled + + Train->mvControlled->OilPumpSwitch( false ); + } +} + void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { @@ -3934,20 +3974,14 @@ bool TTrain::Update( double const Deltatime ) } if( m_linebreakerstate == 2 ) { // for diesels and/or vehicles with toggle switch setup we complete the engine start here - // TBD, TODO: arrange a better way to start the diesel engines if( ( ggMainOnButton.SubModel == nullptr ) || ( ( mvControlled->EngineType == DieselEngine ) || ( mvControlled->EngineType == DieselElectric ) ) ) { - if( mvControlled->MainSwitch( true ) ) { - // side-effects - mvControlled->ConverterSwitch( ( ggConverterButton.GetDesiredValue() > 0.95 ) || ( mvControlled->ConverterStart == start::automatic ) ); - mvControlled->CompressorSwitch( ggCompressorButton.GetDesiredValue() > 0.95 ); - // finalize state change of the line breaker - m_linebreakerstate = 1; - } - else { - m_linebreakerstate = 0; - } + // try to finalize state change of the line breaker, set the state based on the outcome + m_linebreakerstate = ( + mvControlled->MainSwitch( true ) ? + 1 : + 0 ); } } @@ -4364,7 +4398,7 @@ bool TTrain::Update( double const Deltatime ) } if (ggIgnitionKey.SubModel) { - ggIgnitionKey.UpdateValue(mvControlled->dizel_enginestart); + ggIgnitionKey.UpdateValue(mvControlled->dizel_startup); ggIgnitionKey.Update(); } } @@ -4934,6 +4968,7 @@ bool TTrain::Update( double const Deltatime ) ggBatteryButton.Update(); ggFuelPumpButton.Update(); + ggOilPumpButton.Update(); //------ pyScreens.update(); } @@ -5979,6 +6014,7 @@ void TTrain::clear_cab_controls() ggIgnitionKey.Clear(); ggFuelPumpButton.Clear(); + ggOilPumpButton.Clear(); btLampkaPrzetw.Clear(); btLampkaPrzetwB.Clear(); @@ -6249,6 +6285,11 @@ void TTrain::set_cab_controls() { mvOccupied->FuelPump.is_enabled ? 1.0 : 0.0 ); + // oil pump + ggOilPumpButton.PutValue( + mvOccupied->OilPump.is_enabled ? + 1.0 : + 0.0 ); // we reset all indicators, as they're set during the update pass // TODO: when cleaning up break setting indicator state into a separate function, so we can reuse it @@ -6414,6 +6455,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "converteroff_sw:", ggConverterOffButton }, { "main_sw:", ggMainButton }, { "fuelpump_sw:", ggFuelPumpButton }, + { "oilpump_sw:", ggOilPumpButton }, { "radio_sw:", ggRadioButton }, { "radiochannel_sw:", ggRadioChannelSelector }, { "radiochannelprev_sw:", ggRadioChannelPrevious }, @@ -6573,6 +6615,12 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina, nullptr, 0.1); gauge.AssignDouble(&mvOccupied->Compressor); } + else if( Label == "oilpress:" ) { + // oil pressure + auto &gauge = Cabine[ Cabindex ].Gauge( -1 ); // pierwsza wolna gałka + gauge.Load( Parser, DynamicObject, DynamicObject->mdKabina, nullptr ); + gauge.AssignFloat( &mvOccupied->OilPump.pressure_present ); + } // yB - dla drugiej sekcji else if (Label == "hvbcurrent1:") { diff --git a/Train.h b/Train.h index b255c784..c9bc1e7b 100644 --- a/Train.h +++ b/Train.h @@ -216,6 +216,9 @@ class TTrain static void OnCommand_fuelpumptoggle( TTrain *Train, command_data const &Command ); static void OnCommand_fuelpumpenable( TTrain *Train, command_data const &Command ); static void OnCommand_fuelpumpdisable( TTrain *Train, command_data const &Command ); + static void OnCommand_oilpumptoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_oilpumpenable( TTrain *Train, command_data const &Command ); + static void OnCommand_oilpumpdisable( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_converterenable( TTrain *Train, command_data const &Command ); static void OnCommand_converterdisable( TTrain *Train, command_data const &Command ); @@ -406,6 +409,7 @@ public: // reszta może by?publiczna TGauge ggDoorSignallingButton; TGauge ggFuelPumpButton; // fuel pump switch + TGauge ggOilPumpButton; // fuel pump switch TButton btLampkaPoslizg; TButton btLampkaStyczn; diff --git a/command.cpp b/command.cpp index ba7e2d3b..935e2d4c 100644 --- a/command.cpp +++ b/command.cpp @@ -66,6 +66,9 @@ commanddescription_sequence Commands_descriptions = { { "fuelpumptoggle", command_target::vehicle }, { "fuelpumpenable", command_target::vehicle }, { "fuelpumpdisable", command_target::vehicle }, + { "oilpumptoggle", command_target::vehicle }, + { "oilpumpenable", command_target::vehicle }, + { "oilpumpdisable", command_target::vehicle }, { "linebreakertoggle", command_target::vehicle }, { "linebreakeropen", command_target::vehicle }, { "linebreakerclose", command_target::vehicle }, diff --git a/command.h b/command.h index ee5b1f3a..d34f936b 100644 --- a/command.h +++ b/command.h @@ -60,6 +60,9 @@ enum class user_command { fuelpumptoggle, fuelpumpenable, fuelpumpdisable, + oilpumptoggle, + oilpumpenable, + oilpumpdisable, linebreakertoggle, linebreakeropen, linebreakerclose, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index e0c63d02..f4f72199 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -261,6 +261,12 @@ keyboard_input::default_bindings() { { -1 }, // fuelpumpdisable, { -1 }, + // oilpumptoggle + { GLFW_KEY_F | keymodifier::shift }, + // oilpumpenable, + { -1 }, + // oilpumpdisable, + { -1 }, // linebreakertoggle { GLFW_KEY_M }, // linebreakeropen diff --git a/mouseinput.cpp b/mouseinput.cpp index 582162b2..5b2e6826 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -246,6 +246,9 @@ mouse_input::default_bindings() { { "fuelpump_sw:", { user_command::fuelpumptoggle, user_command::none } }, + { "oilpump_sw:", { + user_command::oilpumptoggle, + user_command::none } }, { "main_off_bt:", { user_command::linebreakeropen, user_command::none } }, diff --git a/simulation.cpp b/simulation.cpp index 1d6e2239..978ad2ea 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -542,12 +542,8 @@ state_manager::deserialize_time( cParser &Input, scene::scratch_data &Scratchpad if( true == Global.ScenarioTimeCurrent ) { // calculate time shift required to match scenario time with local clock auto timenow = std::time( 0 ); - auto *localtime = std::localtime( &timenow ); - Global.ScenarioTimeOffset = - clamp_circular( - ( localtime->tm_hour * 60 + localtime->tm_min ) - ( time.wHour * 60 + time.wMinute ), - 24 * 60 ) - / 60.f; + auto const *localtime = std::localtime( &timenow ); + Global.ScenarioTimeOffset = ( ( localtime->tm_hour * 60 + localtime->tm_min ) - ( time.wHour * 60 + time.wMinute ) ) / 60.f; } // remaining sunrise and sunset parameters are no longer used, as they're now calculated dynamically diff --git a/translation.h b/translation.h index e7dbf543..2c1fd25b 100644 --- a/translation.h +++ b/translation.h @@ -30,6 +30,7 @@ static std::unordered_map m_cabcontrols = { { "brakeprofiler_sw:", "brake acting speed: rapid" }, { "maxcurrent_sw:", "motor overload relay threshold" }, { "fuelpump_sw:", "fuel pump" }, + { "oilpump_sw:", "oil pump" }, { "main_off_bt:", "line breaker" }, { "main_on_bt:", "line breaker" }, { "security_reset_bt:", "alerter" }, diff --git a/uilayer.cpp b/uilayer.cpp index 115de349..b0a597b3 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -420,10 +420,11 @@ ui_layer::update() { // equipment flags uitextline2 = ( vehicle->MoverParameters->Battery ? "B" : "." ); uitextline2 += ( vehicle->MoverParameters->Mains ? "M" : "." ); - uitextline2 += ( vehicle->MoverParameters->PantRearUp ? ( vehicle->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." );; - uitextline2 += ( vehicle->MoverParameters->PantFrontUp ? ( vehicle->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." );; + uitextline2 += ( vehicle->MoverParameters->PantRearUp ? ( vehicle->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." ); + uitextline2 += ( vehicle->MoverParameters->PantFrontUp ? ( vehicle->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." ); uitextline2 += ( vehicle->MoverParameters->PantPressLockActive ? "!" : ( vehicle->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); - uitextline2 += ( vehicle->MoverParameters->FuelPump.is_enabled ? ( vehicle->MoverParameters->FuelPump.is_active ? "F" : "f" ) : "." );; + uitextline2 += ( vehicle->MoverParameters->FuelPump.is_enabled ? ( vehicle->MoverParameters->FuelPump.is_active ? "F" : "f" ) : "." ); + uitextline2 += ( vehicle->MoverParameters->OilPump.is_active ? "O" : ( vehicle->MoverParameters->OilPump.is_enabled ? "o" : "." ) ); uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); uitextline2 += ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorPower > 1 ) ? ( vehicle->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); @@ -698,7 +699,10 @@ ui_layer::update() { VelPrev = vehicle->MoverParameters->Vel; } uitextline2 += "; As=" + to_string( Acc, 2 ); // przyspieszenie wzdłużne +/* uitextline2 += " eAngle=" + to_string( std::cos( vehicle->MoverParameters->eAngle ), 2 ); +*/ + uitextline2 += " oilP=" + to_string( vehicle->MoverParameters->OilPump.pressure_present, 3 ); uitextline3 = "cyl.ham. " + to_string( vehicle->MoverParameters->BrakePress, 2 ) diff --git a/version.h b/version.h index 87f62dea..f1e336ed 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 404 +#define VERSION_MINOR 411 #define VERSION_REVISION 0 From aac16c55be3961ccb1b3b43d9c2722737e8fa147 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 16 Apr 2018 20:08:30 +0200 Subject: [PATCH 303/426] basic diesel engine temperature calculations heating/cooling subsystem devices --- Driver.cpp | 75 ++++-- Driver.h | 1 + DynObj.cpp | 33 ++- McZapkie/MOVER.h | 89 ++++++- McZapkie/Mover.cpp | 595 +++++++++++++++++++++++++++++++++++++++------ Train.cpp | 302 ++++++++++++++++++++++- Train.h | 24 +- command.cpp | 15 ++ command.h | 15 ++ keyboardinput.cpp | 30 +++ mouseinput.cpp | 12 + translation.h | 5 + uilayer.cpp | 14 +- 13 files changed, 1105 insertions(+), 105 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 6967e5f1..eb44fdf0 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2226,10 +2226,12 @@ bool TController::PrepareEngine() if (AIControllFlag) { // część wykonawcza dla sterowania przez komputer mvOccupied->BatterySwitch( true ); - if( ( mvOccupied->EngineType == DieselElectric ) - || ( mvOccupied->EngineType == DieselEngine ) ) { - mvOccupied->FuelPumpSwitch( true ); - mvOccupied->OilPumpSwitch( true ); + if( ( mvControlling->EngineType == DieselElectric ) + || ( mvControlling->EngineType == DieselEngine ) ) { + mvControlling->OilPumpSwitch( true ); + if( true == UpdateHeating() ) { + mvControlling->FuelPumpSwitch( true ); + } } if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { // jeśli silnikowy jest pantografującym @@ -2298,22 +2300,13 @@ bool TController::PrepareEngine() else if (false == mvControlling->Mains) { while (DecSpeed(true)) ; // zerowanie napędu -/* - if( ( mvOccupied->EngineType == DieselEngine ) - || ( mvOccupied->EngineType == DieselElectric ) ) { - // start helper devices before spinning up the engine - // TODO: replace with dedicated diesel engine subsystems - mvOccupied->ConverterSwitch( true ); - mvOccupied->CompressorSwitch( true ); - } -*/ if( mvOccupied->TrainType == dt_SN61 ) { // specjalnie dla SN61 żeby nie zgasł if( mvControlling->RList[ mvControlling->MainCtrlPos ].Mn == 0 ) { mvControlling->IncMainCtrl( 1 ); } } - OK = mvControlling->MainSwitch(true); + mvControlling->MainSwitch(true); /* if (mvControlling->EngineType == DieselEngine) { // Ra 2014-06: dla SN61 trzeba wrzucić pierwszą pozycję - nie wiem, czy tutaj... @@ -2345,6 +2338,7 @@ bool TController::PrepareEngine() } else OK = false; + OK = OK && (mvOccupied->ActiveDir != 0) && (mvControlling->CompressorAllow); if (OK) { @@ -5168,6 +5162,59 @@ TController::UpdateSituation(double dt) { } // switch (OrderList[OrderPos]) } +// configures vehicle heating given current situation; returns: true if vehicle can be operated normally, false otherwise +bool +TController::UpdateHeating() { + + switch( mvControlling->EngineType ) { + + case DieselElectric: + case DieselEngine: { + + auto const &heat { mvControlling->dizel_heat }; + + // determine whether there's need to enable the water heater + // if the heater has configured maximum temperature, it'll disable itself automatically, so we can leave it always running + // otherwise enable the heater only to maintain minimum required temperature + auto const lowtemperature { ( + ( ( heat.water.config.temp_min > 0 ) && ( heat.temperatura1 < heat.water.config.temp_min + ( mvControlling->WaterHeater.is_active ? 5 : 0 ) ) ) + || ( ( heat.water_aux.config.temp_min > 0 ) && ( heat.temperatura2 < heat.water_aux.config.temp_min + ( mvControlling->WaterHeater.is_active ? 5 : 0 ) ) ) + || ( ( heat.oil.config.temp_min > 0 ) && ( heat.To < heat.oil.config.temp_min + ( mvControlling->WaterHeater.is_active ? 5 : 0 ) ) ) ) }; + auto const heateron { ( + ( mvControlling->WaterHeater.config.temp_max > 0 ) + || ( true == lowtemperature ) ) }; + if( true == heateron ) { + // make sure the water pump is running before enabling the heater + if( false == mvControlling->WaterPump.is_active ) { + mvControlling->WaterPumpBreakerSwitch( true ); + mvControlling->WaterPumpSwitch( true ); + } + if( true == mvControlling->WaterPump.is_active ) { + mvControlling->WaterHeaterBreakerSwitch( true ); + mvControlling->WaterHeaterSwitch( true ); + mvControlling->WaterCircuitsLinkSwitch( true ); + } + } + else { + // no need to heat anything up, switch the heater off + mvControlling->WaterCircuitsLinkSwitch( false ); + mvControlling->WaterHeaterSwitch( false ); + mvControlling->WaterHeaterBreakerSwitch( false ); + // optionally turn off the water pump as well + if( mvControlling->WaterPump.start_type != start::battery ) { + mvControlling->WaterPumpSwitch( false ); + mvControlling->WaterPumpBreakerSwitch( false ); + } + } + + return ( false == lowtemperature ); + } + default: { + return true; + } + } +} + void TController::JumpToNextOrder() { // wykonanie kolejnej komendy z tablicy rozkazów if (OrderList[OrderPos] != Wait_for_orders) diff --git a/Driver.h b/Driver.h index aef33df6..214df307 100644 --- a/Driver.h +++ b/Driver.h @@ -318,6 +318,7 @@ private: void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation, TStopReason reason = stopComm); bool PutCommand( std::string NewCommand, double NewValue1, double NewValue2, glm::dvec3 const *NewLocation, TStopReason reason = stopComm ); void UpdateSituation(double dt); // uruchamiac przynajmniej raz na sekundę + bool UpdateHeating(); // procedury dotyczace rozkazow dla maszynisty // uaktualnia informacje o prędkości void SetVelocity(double NewVel, double NewVelNext, TStopReason r = stopNone); diff --git a/DynObj.cpp b/DynObj.cpp index f1d3ea43..81b465a5 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1978,7 +1978,34 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" if( Random( 0, 100 ) <= flatchance ) { MoverParameters->WheelFlat += fixedflatsize + Random( 0, randomflatsize ); } - } + } // wheel + else if( ( ActPar.size() >= 2 ) + && ( ActPar[ 0 ] == 'T' ) ) { + // temperature + ActPar.erase( 0, 1 ); + + auto setambient { false }; + + while( false == ActPar.empty() ) { + switch( ActPar[ 0 ] ) { + case 'A': { + // cold start, set all temperatures to ambient level + setambient = true; + ActPar.erase( 0, 1 ); + break; + } + default: { + // unrecognized key + ActPar.erase( 0, 1 ); + break; + } + } + } + if( true == setambient ) { + // TODO: pull ambient temperature from environment data + MoverParameters->dizel_HeatSet( 15.f ); + } + } // temperature /* else if (ActPar.substr(0, 1) == "") // tu mozna wpisac inny prefiks i inne rzeczy { // jakies inne prefiksy @@ -2707,7 +2734,7 @@ histerezę czasową, aby te tryby pracy nie przełączały się zbyt szybko. bool TDynamicObject::Update(double dt, double dt1) { - if (dt == 0) + if (dt1 == 0) return true; // Ra: pauza if (!MoverParameters->PhysicActivation && !MechInside) // to drugie, bo będąc w maszynowym blokuje się fizyka @@ -2867,7 +2894,7 @@ bool TDynamicObject::Update(double dt, double dt1) tmpTraction.TractionVoltage = v; } else { - NoVoltTime += dt; + NoVoltTime += dt1; if( NoVoltTime > 0.2 ) { // jeśli brak zasilania dłużej niż 0.2 sekundy (25km/h pod izolatorem daje 0.15s) // Ra 2F1H: prowizorka, trzeba przechować napięcie, żeby nie wywalało WS pod izolatorem diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 6a2d8bf1..97231ad9 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -165,7 +165,8 @@ enum range { enum start { manual, automatic, - manualwithautofallback + manualwithautofallback, + battery }; // recognized vehicle light locations and types; can be combined enum light { @@ -640,6 +641,78 @@ struct oil_pump { float pressure_present { 0.f }; }; +struct water_pump { + + bool breaker { true }; // device is allowed to operate + bool is_enabled { false }; // device is requested to operate + bool is_active { false }; // device is working + start start_type { start::manual }; +}; + +struct water_heater { + + bool breaker { true }; // device is allowed to operate + bool is_enabled { false }; // device is requested to operate + bool is_active { false }; // device is working + bool is_damaged { false }; // device is damaged + + struct heater_config_t { + float temp_min { -1 }; // lowest accepted temperature + float temp_max { -1 }; // highest accepted temperature + } config; +}; + +struct heat_data { + // input, state of relevant devices + bool cooling { false }; // TODO: user controlled device, implement +// bool okienko { true }; // window in the engine compartment + // system configuration + bool auxiliary_water_circuit { false }; // cooling system has an extra water circuit + // heat exchange factors + double kw { 0.35 }; + double kv { 0.6 }; + double kfe { 1.0 }; + double kfs { 80.0 }; + double kfo { 25.0 }; + double kfo2 { 25.0 }; + // system parts + struct fluid_circuit_t { + + struct circuit_config_t { + float temp_min { -1 }; // lowest accepted temperature + float temp_max { -1 }; // highest accepted temperature + float temp_cooling { -1 }; // active cooling activation point + float temp_flow { -1 }; // fluid flow activation point + bool shutters { false }; // the radiator has shutters to assist the cooling + } config; + bool is_cold { false }; // fluid is too cold + bool is_warm { false }; // fluid is too hot + bool is_hot { false }; // fluid temperature crossed cooling threshold + bool is_flowing { false }; // fluid is being pushed through the circuit + } water, + water_aux, + oil; + // output, state of affected devices + bool PA { false }; // malfunction flag + float rpmw { 0.0 }; // current main circuit fan revolutions + float rpmwz { 0.0 }; // desired main circuit fan revolutions + bool zaluzje1 { false }; + float rpmw2 { 0.0 }; // current auxiliary circuit fan revolutions + float rpmwz2 { 0.0 }; // desired auxiliary circuit fan revolutions + bool zaluzje2 { false }; + // output, temperatures + float Te { 15.0 }; // ambient temperature TODO: get it from environment data + // NOTE: by default the engine is initialized in warm, startup-ready state + float Ts { 50.0 }; // engine temperature + float To { 45.0 }; // oil temperature + float Tsr { 50.0 }; // main circuit radiator temperature (?) + float Twy { 50.0 }; // main circuit water temperature + float Tsr2 { 40.0 }; // secondary circuit radiator temperature (?) + float Twy2 { 40.0 }; // secondary circuit water temperature + float temperatura1 { 50.0 }; + float temperatura2 { 40.0 }; +}; + class TMoverParameters { // Ra: wrapper na kod pascalowy, przejmujący jego funkcje Q: 20160824 - juz nie wrapper a klasa bazowa :) public: @@ -928,6 +1001,10 @@ public: bool ConverterFlag = false; /*! czy wlaczona przetwornica NBMX*/ fuel_pump FuelPump; oil_pump OilPump; + water_pump WaterPump; + water_heater WaterHeater; + bool WaterCircuitsLink { false }; // optional connection between water circuits + heat_data dizel_heat; int BrakeCtrlPos = -2; /*nastawa hamulca zespolonego*/ double BrakeCtrlPosR = 0.0; /*nastawa hamulca zespolonego - plynna dla FV4a*/ @@ -1123,6 +1200,7 @@ public: void UpdateBatteryVoltage(double dt); double ComputeMovement(double dt, double dt1, const TTrackShape &Shape, TTrackParam &Track, TTractionParam &ElectricTraction, const TLocation &NewLoc, TRotation &NewRot); //oblicza przesuniecie pojazdu double FastComputeMovement(double dt, const TTrackShape &Shape, TTrackParam &Track, const TLocation &NewLoc, TRotation &NewRot); //oblicza przesuniecie pojazdu - wersja zoptymalizowana + void compute_movement_( double const Deltatime ); double ShowEngineRotation(int VehN); // Q ******************************************************************************************* @@ -1215,6 +1293,11 @@ public: /*--funkcje dla lokomotyw*/ bool DirectionBackward(void);/*! kierunek ruchu*/ + bool WaterPumpBreakerSwitch( bool State, int const Notify = range::consist ); // water pump breaker state toggle + bool WaterPumpSwitch( bool State, int const Notify = range::consist ); // water pump state toggle + bool WaterHeaterBreakerSwitch( bool State, int const Notify = range::consist ); // water heater breaker state toggle + bool WaterHeaterSwitch( bool State, int const Notify = range::consist ); // water heater state toggle + bool WaterCircuitsLinkSwitch( bool State, int const Notify = range::consist ); // water circuits link state toggle bool FuelPumpSwitch( bool State, int const Notify = range::consist ); // fuel pump state toggle bool OilPumpSwitch( bool State, int const Notify = range::consist ); // oil pump state toggle bool MainSwitch( bool const State, int const Notify = range::consist );/*! wylacznik glowny*/ @@ -1223,6 +1306,8 @@ public: /*-funkcje typowe dla lokomotywy elektrycznej*/ void ConverterCheck( double const Timestep ); // przetwornica + void WaterPumpCheck( double const Timestep ); + void WaterHeaterCheck( double const Timestep ); void FuelPumpCheck( double const Timestep ); void OilPumpCheck( double const Timestep ); bool FuseOn(void); //bezpiecznik nadamiary @@ -1256,6 +1341,8 @@ public: bool dizel_AutoGearCheck(void); double dizel_fillcheck(int mcp); double dizel_Momentum(double dizel_fill, double n, double dt); + void dizel_HeatSet( float const Value ); + void dizel_Heat( double const dt ); bool dizel_StartupCheck(); bool dizel_Update(double dt); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 3076ec0f..b340ca79 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1372,46 +1372,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap dL = 0; // koniec procedury, tu nastepuja dodatkowe procedury pomocnicze - - // sprawdzanie i ewentualnie wykonywanie->kasowanie poleceń - if (LoadStatus > 0) // czas doliczamy tylko jeśli trwa (roz)ładowanie - LastLoadChangeTime += dt; // czas (roz)ładunku - - RunInternalCommand(); - - // automatyczny rozruch - if (EngineType == ElectricSeriesMotor) - - if (AutoRelayCheck()) - SetFlag(SoundFlag, sound::relay); - - if( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) { - if( dizel_Update( dt ) ) { - SetFlag( SoundFlag, sound::relay ); - } - } - // uklady hamulcowe: - if (VeselVolume > 0) - Compressor = CompressedVolume / VeselVolume; - else - { - Compressor = 0; - CompressorFlag = false; - }; - ConverterCheck(dt); - if (CompressorSpeed > 0.0) // sprężarka musi mieć jakąś niezerową wydajność - CompressorCheck(dt); //żeby rozważać jej załączenie i pracę - UpdateBrakePressure(dt); - UpdatePipePressure(dt); - UpdateBatteryVoltage(dt); - UpdateScndPipePressure(dt); // druga rurka, youBy - // hamulec antypoślizgowy - wyłączanie - if ((BrakeSlippingTimer > 0.8) && (ASBType != 128)) // ASBSpeed=0.8 - Hamulec->ASB(0); - BrakeSlippingTimer += dt; - // automatic doors - update_autonomous_doors( dt ); + compute_movement_( dt ); // security system if (!DebugModeFlag) SecuritySystemCheck(dt1); @@ -1491,16 +1452,32 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape dL = 0; // koniec procedury, tu nastepuja dodatkowe procedury pomocnicze + compute_movement_( dt ); + + return d; +}; + +// updates shared between 'fast' and regular movement computation methods +void TMoverParameters::compute_movement_( double const Deltatime ) { // sprawdzanie i ewentualnie wykonywanie->kasowanie poleceń if (LoadStatus > 0) // czas doliczamy tylko jeśli trwa (roz)ładowanie - LastLoadChangeTime += dt; // czas (roz)ładunku + LastLoadChangeTime += Deltatime; // czas (roz)ładunku RunInternalCommand(); - if (EngineType == DieselEngine) - if (dizel_Update(dt)) + // automatyczny rozruch + if (EngineType == ElectricSeriesMotor) + + if (AutoRelayCheck()) SetFlag(SoundFlag, sound::relay); + + if( ( EngineType == DieselEngine ) + || ( EngineType == DieselElectric ) ) { + if( dizel_Update( Deltatime ) ) { + SetFlag( SoundFlag, sound::relay ); + } + } // uklady hamulcowe: if (VeselVolume > 0) Compressor = CompressedVolume / VeselVolume; @@ -1509,22 +1486,24 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape Compressor = 0; CompressorFlag = false; }; - ConverterCheck(dt); - if (CompressorSpeed > 0.0) // sprężarka musi mieć jakąś niezerową wydajność - CompressorCheck(dt); //żeby rozważać jej załączenie i pracę - UpdateBrakePressure(dt); - UpdatePipePressure(dt); - UpdateScndPipePressure(dt); // druga rurka, youBy - UpdateBatteryVoltage(dt); - // hamulec antyposlizgowy - wyłączanie - if ((BrakeSlippingTimer > 0.8) && (ASBType != 128)) // ASBSpeed=0.8 - Hamulec->ASB(0); - BrakeSlippingTimer += dt; + ConverterCheck(Deltatime); + if( CompressorSpeed > 0.0 ) { + // sprężarka musi mieć jakąś niezerową wydajność żeby rozważać jej załączenie i pracę + CompressorCheck( Deltatime ); + } + UpdateBrakePressure(Deltatime); + UpdatePipePressure(Deltatime); + UpdateBatteryVoltage(Deltatime); + UpdateScndPipePressure(Deltatime); // druga rurka, youBy + + if( ( BrakeSlippingTimer > 0.8 ) && ( ASBType != 128 ) ) { // ASBSpeed=0.8 + // hamulec antypoślizgowy - wyłączanie + Hamulec->ASB( 0 ); + } + BrakeSlippingTimer += Deltatime; // automatic doors - update_autonomous_doors( dt ); - - return d; -}; + update_autonomous_doors( Deltatime ); +} double TMoverParameters::ShowEngineRotation(int VehN) { // Zwraca wartość prędkości obrotowej silnika wybranego pojazdu. Do 3 pojazdów (3×SN61). @@ -1576,6 +1555,35 @@ void TMoverParameters::ConverterCheck( double const Timestep ) { } }; +// water pump status check +void TMoverParameters::WaterPumpCheck( double const Timestep ) { + // NOTE: breaker override with start type is sm42 specific hack, replace with ability to define the presence of the breaker + WaterPump.is_active = ( + ( true == Battery ) + && ( true == WaterPump.breaker ) + && ( ( true == WaterPump.is_enabled ) || ( WaterPump.start_type == start::battery ) ) ); +} + +// water heater status check +void TMoverParameters::WaterHeaterCheck( double const Timestep ) { + + WaterHeater.is_active = ( + ( false == WaterHeater.is_damaged ) + && ( true == Battery ) + && ( true == WaterHeater.is_enabled ) + && ( true == WaterHeater.breaker ) + && ( ( WaterHeater.config.temp_min < 0 ) || ( dizel_heat.temperatura1 < WaterHeater.config.temp_min ) ) ); + + if( ( WaterHeater.config.temp_max > 0 ) + && ( dizel_heat.temperatura1 > WaterHeater.config.temp_max ) ) { + WaterHeater.is_active = false; + } + + WaterHeater.is_damaged |= ( + ( true == WaterHeater.is_active ) + && ( false == WaterPump.is_active ) ); +} + // fuel pump status update void TMoverParameters::FuelPumpCheck( double const Timestep ) { @@ -1590,12 +1598,12 @@ void TMoverParameters::FuelPumpCheck( double const Timestep ) { // oil pump status update void TMoverParameters::OilPumpCheck( double const Timestep ) { - OilPump.is_active = - ( ( true == Battery ) - && ( OilPump.start_type == start::manual ? ( OilPump.is_enabled ) : - OilPump.start_type == start::automatic ? ( dizel_startup || Mains ) : - OilPump.start_type == start::manualwithautofallback ? ( OilPump.is_enabled || dizel_startup || Mains ) : - false ) ); // shouldn't ever get this far but, eh + OilPump.is_active = ( + ( true == Battery ) + && ( OilPump.start_type == start::manual ? ( OilPump.is_enabled ) : + OilPump.start_type == start::automatic ? ( dizel_startup || Mains ) : + OilPump.start_type == start::manualwithautofallback ? ( OilPump.is_enabled || dizel_startup || Mains ) : + false ) ); // shouldn't ever get this far but, eh auto const maxrevolutions { EngineType == DieselEngine ? @@ -1604,13 +1612,13 @@ void TMoverParameters::OilPumpCheck( double const Timestep ) { auto const minpressure { OilPump.pressure_minimum > 0.f ? OilPump.pressure_minimum : - 0.1f }; // arbitrary fallback value + 0.15f }; // arbitrary fallback value auto const maxpressure { 0.65f }; // arbitrary value OilPump.pressure_target = ( - false == OilPump.is_active ? 0.f : - enrot > 0.1 ? std::max( minpressure, maxpressure * clamp( enrot / maxrevolutions, 0.0, 1.0 ) ) * OilPump.resource_amount : - minpressure ); + enrot > 0.1 ? interpolate( minpressure, maxpressure, static_cast( clamp( enrot / maxrevolutions, 0.0, 1.0 ) ) ) * OilPump.resource_amount : + true == OilPump.is_active ? minpressure : + 0.f ); if( OilPump.pressure_present < OilPump.pressure_target ) { // TODO: scale change rate from 0.01-0.05 with oil/engine temperature/idle time @@ -2396,6 +2404,131 @@ bool TMoverParameters::AntiSlippingButton(void) return (AntiSlippingBrake() /*|| Sandbox(true)*/); } +// water pump breaker state toggle +bool TMoverParameters::WaterPumpBreakerSwitch( bool State, int const Notify ) { +/* + if( FuelPump.start_type == start::automatic ) { + // automatic fuel pump ignores 'manual' state commands + return false; + } +*/ + bool const initialstate { WaterPump.breaker }; + + WaterPump.breaker = State; + + if( Notify != range::local ) { + SendCtrlToNext( + "WaterPumpBreakerSwitch", + ( WaterPump.breaker ? 1 : 0 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( WaterPump.breaker != initialstate ); +} + +// water pump state toggle +bool TMoverParameters::WaterPumpSwitch( bool State, int const Notify ) { + + if( WaterPump.start_type == start::battery ) { + // automatic fuel pump ignores 'manual' state commands + return false; + } + + bool const initialstate { WaterPump.is_enabled }; + + WaterPump.is_enabled = State; + + if( Notify != range::local ) { + SendCtrlToNext( + "WaterPumpSwitch", + ( WaterPump.is_enabled ? 1 : 0 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( WaterPump.is_enabled != initialstate ); +} + +// water heater breaker state toggle +bool TMoverParameters::WaterHeaterBreakerSwitch( bool State, int const Notify ) { +/* + if( FuelPump.start_type == start::automatic ) { + // automatic fuel pump ignores 'manual' state commands + return false; + } +*/ + bool const initialstate { WaterHeater.breaker }; + + WaterHeater.breaker = State; + + if( Notify != range::local ) { + SendCtrlToNext( + "WaterHeaterBreakerSwitch", + ( WaterHeater.breaker ? 1 : 0 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( WaterHeater.breaker != initialstate ); +} + +// water heater state toggle +bool TMoverParameters::WaterHeaterSwitch( bool State, int const Notify ) { +/* + if( FuelPump.start_type == start::automatic ) { + // automatic fuel pump ignores 'manual' state commands + return false; + } +*/ + bool const initialstate { WaterHeater.is_enabled }; + + WaterHeater.is_enabled = State; + + if( Notify != range::local ) { + SendCtrlToNext( + "WaterHeaterSwitch", + ( WaterHeater.is_enabled ? 1 : 0 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( WaterHeater.is_enabled != initialstate ); +} + +// water circuits link state toggle +bool TMoverParameters::WaterCircuitsLinkSwitch( bool State, int const Notify ) { + + if( false == dizel_heat.auxiliary_water_circuit ) { + // can't link the circuits if the vehicle only has one + return false; + } + + bool const initialstate { WaterCircuitsLink }; + + WaterCircuitsLink = State; + + if( Notify != range::local ) { + SendCtrlToNext( + "WaterCircuitsLinkSwitch", + ( WaterCircuitsLink ? 1 : 0 ), + CabNo, + ( Notify == range::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( WaterCircuitsLink != initialstate ); +} + // fuel pump state toggle bool TMoverParameters::FuelPumpSwitch( bool State, int const Notify ) { @@ -4417,12 +4550,30 @@ double TMoverParameters::TractionForce(double dt) } case DieselElectric: { + // NOTE: for this type RventRot is the speed of motor blowers; we also update radiator fans while at it if( true == Mains ) { // TBD, TODO: currently ignores RVentType, fix this? - RventRot += clamp( DElist[ MainCtrlPos ].RPM / 60.0 - RventRot, -100.0, 50.0 ) * dt; + RventRot += clamp( enrot - RventRot, -100.0, 50.0 ) * dt; + dizel_heat.rpmw += clamp( dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f ) * dt; + dizel_heat.rpmw += clamp( dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f ) * dt; } else { RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); + dizel_heat.rpmw *= std::max( 0.0, 1.0 - dizel_heat.rpmw * dt ); + dizel_heat.rpmw2 *= std::max( 0.0, 1.0 - dizel_heat.rpmw2 * dt ); + } + break; + } + + case DieselEngine: { + // NOTE: we update only radiator fans, as vehicles with diesel engine don't have other ventilators + if( true == Mains ) { + dizel_heat.rpmw += clamp( dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f ) * dt; + dizel_heat.rpmw += clamp( dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f ) * dt; + } + else { + dizel_heat.rpmw *= std::max( 0.0, 1.0 - dizel_heat.rpmw * dt ); + dizel_heat.rpmw2 *= std::max( 0.0, 1.0 - dizel_heat.rpmw2 * dt ); } break; } @@ -4521,11 +4672,9 @@ double TMoverParameters::TractionForce(double dt) if( MainSwitch( false, ( TrainType == dt_EZT ? range::unit : range::local ) ) ) // TODO: check whether we need to send this EMU-wide EventFlag = true; // wywalanie szybkiego z powodu niewłaściwego napięcia - if (((DynamicBrakeType == dbrake_automatic) || (DynamicBrakeType == dbrake_switch)) && - (DynamicBrakeFlag)) + if (((DynamicBrakeType == dbrake_automatic) || (DynamicBrakeType == dbrake_switch)) && (DynamicBrakeFlag)) Itot = Im * 2; // 2x2 silniki w EP09 - else if ((TrainType == dt_EZT) && (Imin == IminLo) && - (ScndS)) // yBARC - boczniki na szeregu poprawnie + else if ((TrainType == dt_EZT) && (Imin == IminLo) && (ScndS)) // yBARC - boczniki na szeregu poprawnie Itot = Im; else Itot = Im * RList[MainCtrlActualPos].Bn; // prad silnika * ilosc galezi @@ -5847,6 +5996,12 @@ bool TMoverParameters::dizel_StartupCheck() { dizel_startup = false; } } + // test the water circuits and water temperature + if( true == dizel_heat.PA ) { + engineisready = false; + // TBD, TODO: reset startup procedure depending on pump and heater control mode + dizel_startup = false; + } return engineisready; } @@ -5857,6 +6012,8 @@ bool TMoverParameters::dizel_StartupCheck() { // ************************************************************************************************* bool TMoverParameters::dizel_Update(double dt) { + WaterPumpCheck( dt ); + WaterHeaterCheck( dt ); OilPumpCheck( dt ); FuelPumpCheck( dt ); if( ( true == dizel_startup ) @@ -5897,6 +6054,8 @@ bool TMoverParameters::dizel_Update(double dt) { dizel_fill = dizel_fill + fillspeed * dt * ( dizel_fillcheck( MainCtrlPos ) - dizel_fill ); } + dizel_Heat( dt ); + return DU; } @@ -6103,6 +6262,205 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) return gearMoment; } +// sets component temperatures to specified value +void TMoverParameters::dizel_HeatSet( float const Value ) { + + dizel_heat.Te = // TODO: don't include ambient temperature, pull it from environment data instead + dizel_heat.Ts = + dizel_heat.To = + dizel_heat.Tsr = + dizel_heat.Twy = + dizel_heat.Tsr2 = + dizel_heat.Twy2 = + dizel_heat.temperatura1 = + dizel_heat.temperatura2 = Value; +} + +// calculates diesel engine temperature and heat transfers +// adapted from scripts written by adamst +// NOTE: originally executed twice per second +void TMoverParameters::dizel_Heat( double const dt ) { + + auto const qs { 44700.0 }; + auto const Cs { 11000.0 }; + auto const Cw { 4.189 }; + auto const Co { 1.885 }; + auto const gwmin { 400.0 }; + auto const gwmax { 4000.0 }; + auto const gwmin2 { 400.0 }; + auto const gwmax2 { 4000.0 }; + + auto const engineon { ( Mains ? 1 : 0 ) }; + auto const engineoff { ( Mains ? 0 : 1 ) }; + auto const rpm { enrot * 60 }; + // TODO: calculate this once and cache for further use, instead of doing it repeatedly all over the place + auto const maxrevolutions { ( + EngineType == DieselEngine ? dizel_nmax * 60 : + EngineType == DieselElectric ? DElist[ MainCtrlPosNo ].RPM : + std::numeric_limits::max() ) }; // shouldn't ever get here but, eh + auto const revolutionsfactor { clamp( rpm / maxrevolutions, 0.0, 1.0 ) }; + auto const waterpump { WaterPump.is_active ? 1 : 0 }; + + auto const gw = engineon * interpolate( gwmin, gwmax, revolutionsfactor ) + waterpump * 1000 + engineoff * 200; + auto const gw2 = engineon * interpolate( gwmin2, gwmax2, revolutionsfactor ) + waterpump * 1000 + engineoff * 200; + auto const gwO = interpolate( gwmin, gwmax, revolutionsfactor ); + + dizel_heat.water.is_cold = ( + ( dizel_heat.water.config.temp_min > 0 ) + && ( dizel_heat.temperatura1 < dizel_heat.water.config.temp_min - ( Mains ? 5 : 0 ) ) ); + dizel_heat.water.is_hot = ( + ( dizel_heat.water.config.temp_max > 0 ) + && ( dizel_heat.temperatura1 > dizel_heat.water.config.temp_max - ( dizel_heat.water.is_hot ? 8 : 0 ) ) ); + dizel_heat.water_aux.is_cold = ( + ( dizel_heat.water_aux.config.temp_min > 0 ) + && ( dizel_heat.temperatura2 < dizel_heat.water_aux.config.temp_min - ( Mains ? 5 : 0 ) ) ); + dizel_heat.water_aux.is_hot = ( + ( dizel_heat.water_aux.config.temp_max > 0 ) + && ( dizel_heat.temperatura2 > dizel_heat.water_aux.config.temp_max - ( dizel_heat.water_aux.is_hot ? 8 : 0 ) ) ); + dizel_heat.oil.is_cold = ( + ( dizel_heat.oil.config.temp_min > 0 ) + && ( dizel_heat.To < dizel_heat.oil.config.temp_min - ( Mains ? 5 : 0 ) ) ); + dizel_heat.oil.is_hot = ( + ( dizel_heat.oil.config.temp_max > 0 ) + && ( dizel_heat.To > dizel_heat.oil.config.temp_max - ( dizel_heat.oil.is_hot ? 8 : 0 ) ) ); + + auto const PT = ( + ( false == dizel_heat.water.is_cold ) + && ( false == dizel_heat.water.is_hot ) + && ( false == dizel_heat.water_aux.is_cold ) + && ( false == dizel_heat.water_aux.is_hot ) + && ( false == dizel_heat.oil.is_cold ) + && ( false == dizel_heat.oil.is_hot ) /* && ( false == awaria_termostatow ) */ ) /* || PTp */; + auto const PPT = ( false == PT ) /* && ( false == PPTp ) */; + dizel_heat.PA = ( /* ( ( !zamkniecie or niedomkniecie ) and !WBD ) || */ PPT /* || nurnik || ( woda < 7 ) */ ) /* && ( !PAp ) */; + + // engine heat transfers + auto const Ge { engineon * ( 0.21 * EnginePower + 12 ) / 3600 }; + // TODO: replace fixed heating power cost with more accurate calculation + auto const obciazenie { engineon * ( ( EnginePower / 950 ) + ( Heating ? HeatingPower : 0 ) + 70 ) }; + auto const Qd { qs * Ge - obciazenie }; + // silnik oddaje czesc ciepla do wody chlodzacej, a takze pewna niewielka czesc do otoczenia, modyfikowane przez okienko + auto const Qs { ( Qd - ( dizel_heat.kfs * ( dizel_heat.Ts - dizel_heat.Tsr ) ) - ( dizel_heat.kfe * /* ( 0.3 + 0.7 * ( dizel_heat.okienko ? 1 : 0 ) ) * */ ( dizel_heat.Ts - dizel_heat.Te ) ) ) }; + auto const dTss { Qs / Cs }; + dizel_heat.Ts += ( dTss * dt ); + + // oil heat transfers + // olej oddaje cieplo do wody gdy krazy przez wymiennik ciepla == wlaczona pompka lub silnik + auto const dTo { ( + dizel_heat.auxiliary_water_circuit ? + ( ( dizel_heat.kfo * ( dizel_heat.Ts - dizel_heat.To ) ) - ( dizel_heat.kfs * ( 0.3 ) * ( dizel_heat.To - dizel_heat.Tsr2 ) ) ) / ( gwO * Co ) : + ( ( dizel_heat.kfo * ( dizel_heat.Ts - dizel_heat.To ) ) - ( dizel_heat.kfo2 * ( dizel_heat.To - dizel_heat.Tsr ) ) ) / ( gwO * Co ) ) }; + dizel_heat.To += ( dTo * dt ); + + // heater +/* + if( typ == "SP45" ) + Qp = (float)( podgrzewacz and ( true == WaterPump.is_active ) and ( Twy < 55 ) and ( Twy2 < 55 ) ) * 1000; + else +*/ + auto const Qp = ( ( ( true == WaterHeater.is_active ) && ( true == WaterPump.is_active ) && ( dizel_heat.Twy < 60 ) && ( dizel_heat.Twy2 < 60 ) ) ? 1 : 0 ) * 1000; + + auto const kurek07 { 1 }; // unknown/unimplemented device TBD, TODO: identify and implement? + + if( true == dizel_heat.auxiliary_water_circuit ) { + // auxiliary water circuit setup + dizel_heat.water_aux.is_warm = ( + ( true == dizel_heat.cooling ) + || ( ( true == Mains ) + && ( BatteryVoltage > 70 ) /* && !bezpompy && !awaria_chlodzenia && !WS10 */ + && ( dizel_heat.water_aux.config.temp_cooling > 0 ) + && ( dizel_heat.temperatura2 > dizel_heat.water_aux.config.temp_cooling - ( dizel_heat.water_aux.is_warm ? 8 : 0 ) ) ) ); + auto const PTC2 { ( dizel_heat.water_aux.is_warm /*or PTC2p*/ ? 1 : 0 ) }; + dizel_heat.rpmwz2 = PTC2 * 80 * rpm / ( ( 0.5 * rpm ) + 500 ); + dizel_heat.zaluzje2 = ( dizel_heat.water_aux.config.shutters ? PTC2 : true ); // no shutters is an equivalent to having them open + auto const zaluzje2 { ( dizel_heat.zaluzje2 ? 1 : 0 ) }; + // auxiliary water circuit heat transfer values + auto const kf2 { kurek07 * ( ( dizel_heat.kw * ( 0.3 + 0.7 * zaluzje2 ) ) * dizel_heat.rpmw2 + ( dizel_heat.kv * ( 0.3 + 0.7 * zaluzje2 ) * Vel / 3.6 ) ) + 2 }; + auto const dTs2 { ( ( dizel_heat.kfs * ( 0.3 ) * ( dizel_heat.To - dizel_heat.Tsr2 ) ) ) / ( gw2 * Cw ) }; + // przy otwartym kurku B ma³y obieg jest dogrzewany przez du¿y - stosujemy przy korzystaniu z podgrzewacza oraz w zimie + auto const Qch2 { -kf2 * ( dizel_heat.Tsr2 - dizel_heat.Te ) + ( 80 * ( true == WaterCircuitsLink ? 1 : 0 ) * ( dizel_heat.Twy - dizel_heat.Tsr2 ) ) }; + auto const dTch2 { Qch2 / ( gw2 * Cw ) }; + // auxiliary water circuit heat transfers finalization + // NOTE: since primary circuit doesn't read data from the auxiliary one, we can pretty safely finalize auxiliary updates before touching the primary circuit + auto const Twe2 { dizel_heat.Twy2 + ( dTch2 * dt ) }; + dizel_heat.Twy2 = Twe2 + ( dTs2 * dt ); + dizel_heat.Tsr2 = 0.5 * ( dizel_heat.Twy2 + Twe2 ); + dizel_heat.temperatura2 = dizel_heat.Twy2; + } + // primary water circuit setup + dizel_heat.water.is_flowing = ( + ( dizel_heat.water.config.temp_flow < 0 ) + || ( dizel_heat.temperatura1 > dizel_heat.water.config.temp_flow - ( dizel_heat.water.is_flowing ? 5 : 0 ) ) ); + auto const obieg { ( dizel_heat.water.is_flowing ? 1 : 0 ) }; + dizel_heat.water.is_warm = ( + ( true == dizel_heat.cooling ) + || ( ( true == Mains ) + && ( BatteryVoltage > 70 ) /* && !bezpompy && !awaria_chlodzenia && !WS10 */ + && ( dizel_heat.water.config.temp_cooling > 0 ) + && ( dizel_heat.temperatura1 > dizel_heat.water.config.temp_cooling - ( dizel_heat.water.is_warm ? 8 : 0 ) ) ) ); + auto const PTC1 { ( dizel_heat.water.is_warm /*or PTC1p*/ ? 1 : 0 ) }; + dizel_heat.rpmwz = PTC1 * 80 * rpm / ( ( 0.5 * rpm ) + 500 ); + dizel_heat.zaluzje1 = ( dizel_heat.water.config.shutters ? PTC1 : true ); // no shutters is an equivalent to having them open + auto const zaluzje1 { ( dizel_heat.zaluzje1 ? 1 : 0 ) }; + // primary water circuit heat transfer values + auto const kf { obieg * kurek07 * ( ( dizel_heat.kw * ( 0.3 + 0.7 * zaluzje1 ) ) * dizel_heat.rpmw + ( dizel_heat.kv * ( 0.3 + 0.7 * zaluzje1 ) * Vel / 3.6 ) + 3 ) + 2 }; + auto const dTs { ( + dizel_heat.auxiliary_water_circuit ? + ( ( dizel_heat.kfs * ( dizel_heat.Ts - dizel_heat.Tsr ) ) ) / ( gw * Cw ) : + ( ( dizel_heat.kfs * ( dizel_heat.Ts - dizel_heat.Tsr ) ) + ( dizel_heat.kfo2 * ( dizel_heat.To - dizel_heat.Tsr ) ) ) / ( gw * Cw ) ) }; + auto const Qch { -kf * ( dizel_heat.Tsr - dizel_heat.Te ) + Qp }; + auto const dTch { Qch / ( gw * Cw ) }; + // primary water circuit heat transfers finalization + auto const Twe { dizel_heat.Twy + ( dTch * dt ) }; + dizel_heat.Twy = Twe + ( dTs * dt ); + dizel_heat.Tsr = 0.5 * ( dizel_heat.Twy + Twe ); + dizel_heat.temperatura1 = dizel_heat.Twy; +/* + fuelConsumed = fuelConsumed + ( Ge * 0.5 ); + + while( fuelConsumed >= 0.83 ) { + fuelConsumed = fuelConsumed - 0.83; + fuelQueue.DestroyProductMatching( null, 1 ); + }//if + + if( engineon ) + temp_turbo = temp_turbo + 0.3 * ( t_pozycja ); + if( t_pozycja == 0 and cisnienie > 0.04 ) + temp_turbo = temp_turbo - 1; + + if( temp_turbo > 400 ) + temp_turbo = 400; + if( temp_turbo < 0 ) + temp_turbo = 0; + + if( temp_turbo > 50 and cisnienie < 0.05 ) + timer_turbo = timer_turbo + 1; + + if( temp_turbo == 0 ) + timer_turbo = 0; + + if( timer_turbo > 360 ) { + awaria_turbo = true; + timer_turbo = 400; + } + + if( Ts < 50 ) + p_odpal = 3; + if( Ts > 49 and Ts < 76 ) + p_odpal = 4; + if( Ts > 75 ) + p_odpal = 7; + + stukanie = stukanie or awaria_oleju; + + if( awaria_oleju == true and ilosc_oleju > 0 ) { + ilosc_oleju = ilosc_oleju - ( 0.002 * rpm / 1500 ); + } + if( awaria_oleju == true and cisnienie < 0.06 ) + damage = 1; +*/ +} + // ************************************************************************************************* // Q: 20160713 // Test zakończenia załadunku / rozładunku @@ -7775,6 +8133,19 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { lookup->second : start::manual; } + + // water pump + { + std::map starts { + { "Manual", start::manual }, + { "Battery", start::battery } + }; + auto lookup = starts.find( extract_value( "WaterStart", line ) ); + WaterPump.start_type = + lookup != starts.end() ? + lookup->second : + start::manual; + } } void TMoverParameters::LoadFIZ_Light( std::string const &line ) { @@ -7987,7 +8358,31 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { default: { // nothing here } - } + } // engine type + + // engine cooling factore + extract_value( dizel_heat.kw, "HeatKW", Input, "" ); + extract_value( dizel_heat.kv, "HeatKV", Input, "" ); + extract_value( dizel_heat.kfe, "HeatKFE", Input, "" ); + extract_value( dizel_heat.kfs, "HeatKFS", Input, "" ); + extract_value( dizel_heat.kfo, "HeatKFO", Input, "" ); + extract_value( dizel_heat.kfo2, "HeatKFO2", Input, "" ); + // engine cooling systems + extract_value( dizel_heat.water.config.temp_min, "WaterMinTemperature", Input, "" ); + extract_value( dizel_heat.water.config.temp_max, "WaterMaxTemperature", Input, "" ); + extract_value( dizel_heat.water.config.temp_flow, "WaterFlowTemperature", Input, "" ); + extract_value( dizel_heat.water.config.temp_cooling, "WaterCoolingTemperature", Input, "" ); + extract_value( dizel_heat.water.config.shutters, "WaterShutters", Input, "" ); + extract_value( dizel_heat.auxiliary_water_circuit, "WaterAuxCircuit", Input, "" ); + extract_value( dizel_heat.water_aux.config.temp_min, "WaterAuxMinTemperature", Input, "" ); + extract_value( dizel_heat.water_aux.config.temp_max, "WaterAuxMaxTemperature", Input, "" ); + extract_value( dizel_heat.water_aux.config.temp_cooling, "WaterAuxCoolingTemperature", Input, "" ); + extract_value( dizel_heat.water_aux.config.shutters, "WaterAuxShutters", Input, "" ); + extract_value( dizel_heat.oil.config.temp_min, "OilMinTemperature", Input, "" ); + extract_value( dizel_heat.oil.config.temp_max, "OilMaxTemperature", Input, "" ); + // water heater + extract_value( WaterHeater.config.temp_min, "HeaterMinTemperature", Input, "" ); + extract_value( WaterHeater.config.temp_max, "HeaterMaxTemperature", Input, "" ); } void TMoverParameters::LoadFIZ_Switches( std::string const &Input ) { @@ -8671,15 +9066,63 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C OK = BrakeReleaser(Round(CValue1)); // samo się przesyła dalej // OK:=SendCtrlToNext(command,CValue1,CValue2); //to robiło kaskadę 2^n } + else if( Command == "WaterPumpBreakerSwitch" ) { +/* + if( FuelPump.start_type != start::automatic ) { + // automatic fuel pump ignores 'manual' state commands +*/ + WaterPump.breaker = ( CValue1 == 1 ); +/* + } +*/ + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } + else if( Command == "WaterPumpSwitch" ) { + + if( WaterPump.start_type != start::battery ) { + // automatic fuel pump ignores 'manual' state commands + WaterPump.is_enabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } + else if( Command == "WaterHeaterBreakerSwitch" ) { +/* + if( FuelPump.start_type != start::automatic ) { + // automatic fuel pump ignores 'manual' state commands +*/ + WaterHeater.breaker = ( CValue1 == 1 ); +/* + } +*/ + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } + else if( Command == "WaterHeaterSwitch" ) { +/* + if( FuelPump.start_type != start::automatic ) { + // automatic fuel pump ignores 'manual' state commands +*/ + WaterHeater.is_enabled = ( CValue1 == 1 ); +/* + } +*/ + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } + else if( Command == "WaterCircuitsLinkSwitch" ) { + if( true == dizel_heat.auxiliary_water_circuit ) { + // can only link circuits if the vehicle has more than one of them + WaterCircuitsLink = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } else if (Command == "FuelPumpSwitch") { - if( FuelPump.start_type == start::manual ) { + if( FuelPump.start_type != start::automatic ) { // automatic fuel pump ignores 'manual' state commands FuelPump.is_enabled = ( CValue1 == 1 ); } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "OilPumpSwitch") { - if( OilPump.start_type == start::manual ) { + if( OilPump.start_type != start::automatic ) { // automatic pump ignores 'manual' state commands OilPump.is_enabled = ( CValue1 == 1 ); } diff --git a/Train.cpp b/Train.cpp index 60301c0d..9a991709 100644 --- a/Train.cpp +++ b/Train.cpp @@ -228,6 +228,21 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::oilpumptoggle, &TTrain::OnCommand_oilpumptoggle }, { user_command::oilpumpenable, &TTrain::OnCommand_oilpumpenable }, { user_command::oilpumpdisable, &TTrain::OnCommand_oilpumpdisable }, + { user_command::waterheaterbreakertoggle, &TTrain::OnCommand_waterheaterbreakertoggle }, + { user_command::waterheaterbreakerclose, &TTrain::OnCommand_waterheaterbreakerclose }, + { user_command::waterheaterbreakeropen, &TTrain::OnCommand_waterheaterbreakeropen }, + { user_command::waterheatertoggle, &TTrain::OnCommand_waterheatertoggle }, + { user_command::waterheaterenable, &TTrain::OnCommand_waterheaterenable }, + { user_command::waterheaterdisable, &TTrain::OnCommand_waterheaterdisable }, + { user_command::waterpumpbreakertoggle, &TTrain::OnCommand_waterpumpbreakertoggle }, + { user_command::waterpumpbreakerclose, &TTrain::OnCommand_waterpumpbreakerclose }, + { user_command::waterpumpbreakeropen, &TTrain::OnCommand_waterpumpbreakeropen }, + { user_command::waterpumptoggle, &TTrain::OnCommand_waterpumptoggle }, + { user_command::waterpumpenable, &TTrain::OnCommand_waterpumpenable }, + { user_command::waterpumpdisable, &TTrain::OnCommand_waterpumpdisable }, + { user_command::watercircuitslinktoggle, &TTrain::OnCommand_watercircuitslinktoggle }, + { user_command::watercircuitslinkenable, &TTrain::OnCommand_watercircuitslinkenable }, + { user_command::watercircuitslinkdisable, &TTrain::OnCommand_watercircuitslinkdisable }, { user_command::convertertoggle, &TTrain::OnCommand_convertertoggle }, { user_command::converterenable, &TTrain::OnCommand_converterenable }, { user_command::converterdisable, &TTrain::OnCommand_converterdisable }, @@ -2078,6 +2093,201 @@ void TTrain::OnCommand_oilpumpdisable( TTrain *Train, command_data const &Comman } } +void TTrain::OnCommand_waterheaterbreakertoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->WaterHeater.breaker ) { + // turn on + OnCommand_waterheaterbreakerclose( Train, Command ); + } + else { + //turn off + OnCommand_waterheaterbreakeropen( Train, Command ); + } + } +} + +void TTrain::OnCommand_waterheaterbreakerclose( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterHeaterBreakerButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->WaterHeater.breaker ) { return; } // already enabled + + Train->mvControlled->WaterHeaterBreakerSwitch( true ); + } +} + +void TTrain::OnCommand_waterheaterbreakeropen( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterHeaterBreakerButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->WaterHeater.breaker ) { return; } // already enabled + + Train->mvControlled->WaterHeaterBreakerSwitch( false ); + } +} + +void TTrain::OnCommand_waterheatertoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->WaterHeater.is_enabled ) { + // turn on + OnCommand_waterheaterenable( Train, Command ); + } + else { + //turn off + OnCommand_waterheaterdisable( Train, Command ); + } + } +} + +void TTrain::OnCommand_waterheaterenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterHeaterButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->WaterHeater.is_enabled ) { return; } // already enabled + + Train->mvControlled->WaterHeaterSwitch( true ); + } +} + +void TTrain::OnCommand_waterheaterdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterHeaterButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->WaterHeater.is_enabled ) { return; } // already disabled + + Train->mvControlled->WaterHeaterSwitch( false ); + } +} + +void TTrain::OnCommand_waterpumpbreakertoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->WaterPump.breaker ) { + // turn on + OnCommand_waterpumpbreakerclose( Train, Command ); + } + else { + //turn off + OnCommand_waterpumpbreakeropen( Train, Command ); + } + } +} + +void TTrain::OnCommand_waterpumpbreakerclose( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterPumpBreakerButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->WaterPump.breaker ) { return; } // already enabled + + Train->mvControlled->WaterPumpBreakerSwitch( true ); + } +} + +void TTrain::OnCommand_waterpumpbreakeropen( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterPumpBreakerButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->WaterPump.breaker ) { return; } // already enabled + + Train->mvControlled->WaterPumpBreakerSwitch( false ); + } +} + +void TTrain::OnCommand_waterpumptoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->WaterPump.is_enabled ) { + // turn on + OnCommand_waterpumpenable( Train, Command ); + } + else { + //turn off + OnCommand_waterpumpdisable( Train, Command ); + } + } +} + +void TTrain::OnCommand_waterpumpenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->WaterPump.is_enabled ) { return; } // already enabled + + Train->mvControlled->WaterPumpSwitch( true ); + } +} + +void TTrain::OnCommand_waterpumpdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->WaterPump.is_enabled ) { return; } // already disabled + + Train->mvControlled->WaterPumpSwitch( false ); + } +} + +void TTrain::OnCommand_watercircuitslinktoggle( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( false == Train->mvControlled->WaterCircuitsLink ) { + // turn on + OnCommand_watercircuitslinkenable( Train, Command ); + } + else { + //turn off + OnCommand_watercircuitslinkdisable( Train, Command ); + } + } +} + +void TTrain::OnCommand_watercircuitslinkenable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterCircuitsLinkButton.UpdateValue( 1.0, Train->dsbSwitch ); + + if( true == Train->mvControlled->WaterCircuitsLink ) { return; } // already enabled + + Train->mvControlled->WaterCircuitsLinkSwitch( true ); + } +} + +void TTrain::OnCommand_watercircuitslinkdisable( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterCircuitsLinkButton.UpdateValue( 0.0, Train->dsbSwitch ); + + if( false == Train->mvControlled->WaterCircuitsLink ) { return; } // already disabled + + Train->mvControlled->WaterCircuitsLinkSwitch( false ); + } +} + void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { @@ -3938,8 +4148,8 @@ bool TTrain::Update( double const Deltatime ) } } if( m_linebreakerstate == 1 ) { - if( false == mvControlled->Mains ) { - // crude way to catch cases where the main was knocked out and the user is trying to restart it + if( false == ( mvControlled->Mains || mvControlled->dizel_startup ) ) { + // crude way to catch cases where the main was knocked out // because the state of the line breaker isn't changed to match, we need to do it here manually m_linebreakerstate = 0; } @@ -4481,8 +4691,11 @@ bool TTrain::Update( double const Deltatime ) mvControlled->ResistorsFlagCheck() : false ); - btLampkaBezoporowa.Turn( mvControlled->ResistorsFlagCheck() || ( mvControlled->MainCtrlActualPos == 0 ) ); // do EU04 - if( ( mvControlled->Itot != 0 ) + btLampkaBezoporowa.Turn( + ( true == mvControlled->ResistorsFlagCheck() ) + || ( mvControlled->MainCtrlActualPos == 0 ) ); // do EU04 + + if( ( mvControlled->Im != 0 ) || ( mvOccupied->BrakePress > 2 ) || ( mvOccupied->PipePress < 3.6 ) ) { // Ra: czy to jest udawanie działania styczników liniowych? @@ -4721,6 +4934,9 @@ bool TTrain::Update( double const Deltatime ) btLampkaRearRightLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_right ) != 0 ); btLampkaRearLeftEndLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::redmarker_left ) != 0 ); btLampkaRearRightEndLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::redmarker_right ) != 0 ); + // others + btLampkaMalfunction.Turn( mvControlled->dizel_heat.PA ); + btLampkaMotorBlowers.Turn( mvControlled->RventRot > 0.1 ); } else { // gdy bateria wyłączona @@ -4752,6 +4968,9 @@ bool TTrain::Update( double const Deltatime ) btLampkaRearRightLight.Turn( false ); btLampkaRearLeftEndLight.Turn( false ); btLampkaRearRightEndLight.Turn( false ); + // others + btLampkaMalfunction.Turn( false ); + btLampkaMotorBlowers.Turn( false ); } // McZapkie-080602: obroty (albo translacje) regulatorow @@ -4967,6 +5186,11 @@ bool TTrain::Update( double const Deltatime ) ggCabLightDimButton.Update(); ggBatteryButton.Update(); + ggWaterPumpBreakerButton.Update(); + ggWaterPumpButton.Update(); + ggWaterHeaterBreakerButton.Update(); + ggWaterHeaterButton.Update(); + ggWaterCircuitsLinkButton.Update(); ggFuelPumpButton.Update(); ggOilPumpButton.Update(); //------ @@ -6013,6 +6237,11 @@ void TTrain::clear_cab_controls() ggMainGearStatus.Clear(); ggIgnitionKey.Clear(); + ggWaterPumpBreakerButton.Clear(); + ggWaterPumpButton.Clear(); + ggWaterHeaterBreakerButton.Clear(); + ggWaterHeaterButton.Clear(); + ggWaterCircuitsLinkButton.Clear(); ggFuelPumpButton.Clear(); ggOilPumpButton.Clear(); @@ -6075,6 +6304,10 @@ void TTrain::clear_cab_controls() btLampkaRearLeftEndLight.Clear(); btLampkaRearRightEndLight.Clear(); btCabLight.Clear(); // hunter-171012 + // others + btLampkaMalfunction.Clear(); + btLampkaMotorBlowers.Clear(); + ggLeftLightButton.Clear(); ggRightLightButton.Clear(); ggUpperLightButton.Clear(); @@ -6280,14 +6513,36 @@ void TTrain::set_cab_controls() { ShowNextCurrent ? 1.0 : 0.0 ); + // water pump + ggWaterPumpBreakerButton.PutValue( + mvControlled->WaterPump.breaker ? + 1.0 : + 0.0 ); + ggWaterPumpButton.PutValue( + mvControlled->WaterPump.is_enabled ? + 1.0 : + 0.0 ); + // water heater + ggWaterHeaterBreakerButton.PutValue( + mvControlled->WaterHeater.breaker ? + 1.0 : + 0.0 ); + ggWaterHeaterButton.PutValue( + mvControlled->WaterHeater.is_enabled ? + 1.0 : + 0.0 ); + ggWaterCircuitsLinkButton.PutValue( + mvControlled->WaterCircuitsLink ? + 1.0 : + 0.0 ); // fuel pump ggFuelPumpButton.PutValue( - mvOccupied->FuelPump.is_enabled ? + mvControlled->FuelPump.is_enabled ? 1.0 : 0.0 ); // oil pump ggOilPumpButton.PutValue( - mvOccupied->OilPump.is_enabled ? + mvControlled->OilPump.is_enabled ? 1.0 : 0.0 ); @@ -6329,6 +6584,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-no_resistors_b:", btLampkaBezoporowaB }, { "i-highcurrent:", btLampkaWysRozr }, { "i-vent_trim:", btLampkaWentZaluzje }, + { "i-motorblowers:", btLampkaMotorBlowers }, { "i-trainheating:", btLampkaOgrzewanieSkladu }, { "i-security_aware:", btLampkaCzuwaka }, { "i-security_cabsignal:", btLampkaSHP }, @@ -6358,6 +6614,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-resistorsb:", btLampkaOporyB }, { "i-contactorsb:", btLampkaStycznB }, { "i-conv_ovldb:", btLampkaNadmPrzetwB }, + { "i-malfunction:", btLampkaMalfunction }, { "i-forward:", btLampkaForward }, { "i-backward:", btLampkaBackward }, { "i-upperlight:", btLampkaUpperLight }, @@ -6396,6 +6653,14 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co button.Load(Parser, DynamicObject, DynamicObject->mdKabina); button.AssignBool(bDoors[0] + 3 * i); } +/* + else if( Label == "i-malfunction:" ) { + // generic malfunction indicator + auto &button = Cabine[ Cabindex ].Button( -1 ); // pierwsza wolna gałka + button.Load( Parser, DynamicObject, DynamicObject->mdKabina ); + button.AssignBool( &mvOccupied->dizel_heat.PA ); + } +*/ else { // failed to match the label @@ -6454,6 +6719,11 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "converterlocal_sw:", ggConverterLocalButton }, { "converteroff_sw:", ggConverterOffButton }, { "main_sw:", ggMainButton }, + { "waterpumpbreaker_sw:", ggWaterPumpBreakerButton }, + { "waterpump_sw:", ggWaterPumpButton }, + { "waterheaterbreaker_sw:", ggWaterHeaterBreakerButton }, + { "waterheater_sw:", ggWaterHeaterButton }, + { "watercircuitslink_sw:", ggWaterCircuitsLinkButton }, { "fuelpump_sw:", ggFuelPumpButton }, { "oilpump_sw:", ggOilPumpButton }, { "radio_sw:", ggRadioButton }, @@ -6619,7 +6889,25 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con // oil pressure auto &gauge = Cabine[ Cabindex ].Gauge( -1 ); // pierwsza wolna gałka gauge.Load( Parser, DynamicObject, DynamicObject->mdKabina, nullptr ); - gauge.AssignFloat( &mvOccupied->OilPump.pressure_present ); + gauge.AssignFloat( &mvControlled->OilPump.pressure_present ); + } + else if( Label == "oiltemp:" ) { + // oil temperature + auto &gauge = Cabine[ Cabindex ].Gauge( -1 ); // pierwsza wolna gałka + gauge.Load( Parser, DynamicObject, DynamicObject->mdKabina, nullptr ); + gauge.AssignFloat( &mvControlled->dizel_heat.To ); + } + else if( Label == "water1temp:" ) { + // main circuit water temperature + auto &gauge = Cabine[ Cabindex ].Gauge( -1 ); // pierwsza wolna gałka + gauge.Load( Parser, DynamicObject, DynamicObject->mdKabina, nullptr ); + gauge.AssignFloat( &mvControlled->dizel_heat.temperatura1 ); + } + else if( Label == "water2temp:" ) { + // auxiliary circuit water temperature + auto &gauge = Cabine[ Cabindex ].Gauge( -1 ); // pierwsza wolna gałka + gauge.Load( Parser, DynamicObject, DynamicObject->mdKabina, nullptr ); + gauge.AssignFloat( &mvControlled->dizel_heat.temperatura2 ); } // yB - dla drugiej sekcji else if (Label == "hvbcurrent1:") diff --git a/Train.h b/Train.h index c9bc1e7b..60636020 100644 --- a/Train.h +++ b/Train.h @@ -219,6 +219,21 @@ class TTrain static void OnCommand_oilpumptoggle( TTrain *Train, command_data const &Command ); static void OnCommand_oilpumpenable( TTrain *Train, command_data const &Command ); static void OnCommand_oilpumpdisable( TTrain *Train, command_data const &Command ); + static void OnCommand_waterheaterbreakertoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_waterheaterbreakerclose( TTrain *Train, command_data const &Command ); + static void OnCommand_waterheaterbreakeropen( TTrain *Train, command_data const &Command ); + static void OnCommand_waterheatertoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_waterheaterenable( TTrain *Train, command_data const &Command ); + static void OnCommand_waterheaterdisable( TTrain *Train, command_data const &Command ); + static void OnCommand_waterpumpbreakertoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_waterpumpbreakerclose( TTrain *Train, command_data const &Command ); + static void OnCommand_waterpumpbreakeropen( TTrain *Train, command_data const &Command ); + static void OnCommand_waterpumptoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_waterpumpenable( TTrain *Train, command_data const &Command ); + static void OnCommand_waterpumpdisable( TTrain *Train, command_data const &Command ); + static void OnCommand_watercircuitslinktoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_watercircuitslinkenable( TTrain *Train, command_data const &Command ); + static void OnCommand_watercircuitslinkdisable( TTrain *Train, command_data const &Command ); static void OnCommand_convertertoggle( TTrain *Train, command_data const &Command ); static void OnCommand_converterenable( TTrain *Train, command_data const &Command ); static void OnCommand_converterdisable( TTrain *Train, command_data const &Command ); @@ -408,6 +423,11 @@ public: // reszta może by?publiczna TGauge ggSignallingButton; TGauge ggDoorSignallingButton; + TGauge ggWaterPumpBreakerButton; // water pump breaker switch + TGauge ggWaterPumpButton; // water pump switch + TGauge ggWaterHeaterBreakerButton; // water heater breaker switch + TGauge ggWaterHeaterButton; // water heater switch + TGauge ggWaterCircuitsLinkButton; TGauge ggFuelPumpButton; // fuel pump switch TGauge ggOilPumpButton; // fuel pump switch @@ -468,7 +488,6 @@ public: // reszta może by?publiczna TButton btLampkaBrakeProfileG; // cargo train brake acting speed TButton btLampkaBrakeProfileP; // passenger train brake acting speed TButton btLampkaBrakeProfileR; // rapid brake acting speed - // KURS90 TButton btLampkaBoczniki; TButton btLampkaMaxSila; @@ -491,6 +510,9 @@ public: // reszta może by?publiczna TButton btLampkaRearRightLight; TButton btLampkaRearLeftEndLight; TButton btLampkaRearRightEndLight; + // other + TButton btLampkaMalfunction; + TButton btLampkaMotorBlowers; TButton btCabLight; // hunter-171012: lampa oswietlajaca kabine // Ra 2013-12: wirtualne "lampki" do odbijania na haslerze w PoKeys diff --git a/command.cpp b/command.cpp index 935e2d4c..c7b0073f 100644 --- a/command.cpp +++ b/command.cpp @@ -63,6 +63,21 @@ commanddescription_sequence Commands_descriptions = { { "reverserforward", command_target::vehicle }, { "reverserneutral", command_target::vehicle }, { "reverserbackward", command_target::vehicle }, + { "waterpumpbreakertoggle", command_target::vehicle }, + { "waterpumpbreakerclose", command_target::vehicle }, + { "waterpumpbreakeropen", command_target::vehicle }, + { "waterpumptoggle", command_target::vehicle }, + { "waterpumpenable", command_target::vehicle }, + { "waterpumpdisable", command_target::vehicle }, + { "waterheaterbreakertoggle", command_target::vehicle }, + { "waterheaterbreakerclose", command_target::vehicle }, + { "waterheaterbreakeropen", command_target::vehicle }, + { "waterheatertoggle", command_target::vehicle }, + { "waterheaterenable", command_target::vehicle }, + { "waterheaterdisable", command_target::vehicle }, + { "watercircuitslinktoggle", command_target::vehicle }, + { "watercircuitslinkenable", command_target::vehicle }, + { "watercircuitslinkdisable", command_target::vehicle }, { "fuelpumptoggle", command_target::vehicle }, { "fuelpumpenable", command_target::vehicle }, { "fuelpumpdisable", command_target::vehicle }, diff --git a/command.h b/command.h index d34f936b..be90b1c8 100644 --- a/command.h +++ b/command.h @@ -57,6 +57,21 @@ enum class user_command { reverserforward, reverserneutral, reverserbackward, + waterpumpbreakertoggle, + waterpumpbreakerclose, + waterpumpbreakeropen, + waterpumptoggle, + waterpumpenable, + waterpumpdisable, + waterheaterbreakertoggle, + waterheaterbreakerclose, + waterheaterbreakeropen, + waterheatertoggle, + waterheaterenable, + waterheaterdisable, + watercircuitslinktoggle, + watercircuitslinkenable, + watercircuitslinkdisable, fuelpumptoggle, fuelpumpenable, fuelpumpdisable, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index f4f72199..4f60b08f 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -255,6 +255,36 @@ keyboard_input::default_bindings() { { -1 }, // reverserbackward { -1 }, + // waterpumpbreakertoggle + { GLFW_KEY_W | keymodifier::control }, + // waterpumpbreakerclose + { -1 }, + // waterpumpbreakeropen + { -1 }, + // waterpumptoggle + { GLFW_KEY_W }, + // waterpumpenable + { -1 }, + // waterpumpdisable + { -1 }, + // waterheaterbreakertoggle + { GLFW_KEY_W | keymodifier::control | keymodifier::shift }, + // waterheaterbreakerclose + { -1 }, + // waterheaterbreakeropen + { -1 }, + // waterheatertoggle + { GLFW_KEY_W | keymodifier::shift }, + // waterheaterenable + { -1 }, + // waterheaterdisable + { -1 }, + // watercircuitslinktoggle + { GLFW_KEY_H | keymodifier::shift }, + // watercircuitslinkenable + { -1 }, + // watercircuitslinkdisable + { -1 }, // fuelpumptoggle { GLFW_KEY_F }, // fuelpumpenable, diff --git a/mouseinput.cpp b/mouseinput.cpp index 5b2e6826..5e4ea8ee 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -243,6 +243,18 @@ mouse_input::default_bindings() { { "maxcurrent_sw:", { user_command::motoroverloadrelaythresholdtoggle, user_command::none } }, + { "waterpumpbreaker_sw:", { + user_command::waterpumpbreakertoggle, + user_command::none } }, + { "waterpump_sw:", { + user_command::waterpumptoggle, + user_command::none } }, + { "waterheaterbreaker_sw:", { + user_command::waterheaterbreakertoggle, + user_command::none } }, + { "waterheater_sw:", { + user_command::waterheatertoggle, + user_command::none } }, { "fuelpump_sw:", { user_command::fuelpumptoggle, user_command::none } }, diff --git a/translation.h b/translation.h index 2c1fd25b..d60c3fef 100644 --- a/translation.h +++ b/translation.h @@ -29,6 +29,11 @@ static std::unordered_map m_cabcontrols = { { "brakeprofileg_sw:", "brake acting speed: cargo" }, { "brakeprofiler_sw:", "brake acting speed: rapid" }, { "maxcurrent_sw:", "motor overload relay threshold" }, + { "waterpump_sw:", "water pump" }, + { "waterpumpbreaker_sw:", "water pump breaker" }, + { "waterheater_sw:", "water heater" }, + { "waterheaterbreaker_sw:", "water heater breaker" }, + { "watercircuitslink_sw:", "water circuits link" }, { "fuelpump_sw:", "fuel pump" }, { "oilpump_sw:", "oil pump" }, { "main_off_bt:", "line breaker" }, diff --git a/uilayer.cpp b/uilayer.cpp index b0a597b3..21b71d02 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -423,7 +423,9 @@ ui_layer::update() { uitextline2 += ( vehicle->MoverParameters->PantRearUp ? ( vehicle->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." ); uitextline2 += ( vehicle->MoverParameters->PantFrontUp ? ( vehicle->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." ); uitextline2 += ( vehicle->MoverParameters->PantPressLockActive ? "!" : ( vehicle->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); - uitextline2 += ( vehicle->MoverParameters->FuelPump.is_enabled ? ( vehicle->MoverParameters->FuelPump.is_active ? "F" : "f" ) : "." ); + uitextline2 += ( vehicle->MoverParameters->WaterPump.is_active ? "W" : ( false == vehicle->MoverParameters->WaterPump.breaker ? "-" : ( vehicle->MoverParameters->WaterPump.is_enabled ? "w" : "." ) ) ); + uitextline2 += ( true == vehicle->MoverParameters->WaterHeater.is_damaged ? "!" : ( vehicle->MoverParameters->WaterHeater.is_active ? "H" : ( false == vehicle->MoverParameters->WaterHeater.breaker ? "-" : ( vehicle->MoverParameters->WaterHeater.is_enabled ? "h" : "." ) ) ) ); + uitextline2 += ( vehicle->MoverParameters->FuelPump.is_active ? "F" : ( vehicle->MoverParameters->FuelPump.is_enabled ? "f" : "." ) ); uitextline2 += ( vehicle->MoverParameters->OilPump.is_active ? "O" : ( vehicle->MoverParameters->OilPump.is_enabled ? "o" : "." ) ); uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); @@ -673,7 +675,8 @@ ui_layer::update() { + ", PM=" + to_string( vehicle->MoverParameters->WheelFlat, 1 ) + " mm; enrot=" + to_string( vehicle->MoverParameters->enrot * 60, 0 ) + " tmrot=" + to_string( std::abs( vehicle->MoverParameters->nrot ) * vehicle->MoverParameters->Transmision.Ratio * 60, 0 ) - + "; ventrot=" + to_string( vehicle->MoverParameters->RventRot * 60, 1 ); + + "; ventrot=" + to_string( vehicle->MoverParameters->RventRot * 60, 1 ) + + "; fanrot=" + to_string( vehicle->MoverParameters->dizel_heat.rpmw, 1 ) + ", " + to_string( vehicle->MoverParameters->dizel_heat.rpmw2, 1 ); uitextline2 = "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) @@ -702,7 +705,12 @@ ui_layer::update() { /* uitextline2 += " eAngle=" + to_string( std::cos( vehicle->MoverParameters->eAngle ), 2 ); */ - uitextline2 += " oilP=" + to_string( vehicle->MoverParameters->OilPump.pressure_present, 3 ); + uitextline2 += "; oilP=" + to_string( vehicle->MoverParameters->OilPump.pressure_present, 3 ); + uitextline2 += " oilT=" + to_string( vehicle->MoverParameters->dizel_heat.To, 2 ); + uitextline2 += "; waterT=" + to_string( vehicle->MoverParameters->dizel_heat.temperatura1, 2 ); + uitextline2 += ( vehicle->MoverParameters->WaterCircuitsLink ? "-" : "|" ); + uitextline2 += to_string( vehicle->MoverParameters->dizel_heat.temperatura2, 2 ); + uitextline2 += "; engineT=" + to_string( vehicle->MoverParameters->dizel_heat.Ts, 2 ); uitextline3 = "cyl.ham. " + to_string( vehicle->MoverParameters->BrakePress, 2 ) From 0cb90a4e9ae7eee20fd0f1421032e7ebb29b0529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 15 Apr 2018 14:58:51 +0200 Subject: [PATCH 304/426] Improved speed controller - speed can be selected by SecondControlPosition --- Driver.cpp | 20 ++++++++++++++++++-- Driver.h | 1 + McZapkie/MOVER.h | 3 +++ McZapkie/Mover.cpp | 35 ++++++++++++++++++++++++++++++++--- 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index eb44fdf0..1c2522ef 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2728,13 +2728,14 @@ bool TController::IncSpeed() { OK = mvControlling->IncMainCtrl(std::max(1,mvOccupied->MainCtrlPosNo/10)); //tutaj jeszcze powinien być tempomat - mvControlling->IncScndCtrl(1); + double SpeedCntrl = VelDesired; if (fProximityDist < 50) { SpeedCntrl = std::min(SpeedCntrl, VelNext); } - mvControlling->RunCommand("SpeedCntrl", VelDesired, mvControlling->CabNo); + this->SpeedCntrl(SpeedCntrl); + } break; case WheelsDriven: @@ -3011,6 +3012,21 @@ void TController::SpeedSet() } }; +void TController::SpeedCntrl(double DesiredSpeed) +{ + if (mvControlling->ScndCtrlPosNo == 1) + { + mvControlling->IncScndCtrl(1); + mvControlling->RunCommand("SpeedCntrl", DesiredSpeed, mvControlling->CabNo); + } + else if (mvControlling->ScndCtrlPosNo > 1) + { + int DesiredPos = 1 + mvControlling->ScndCtrlPosNo * ((DesiredSpeed - 1.0) / mvControlling->Vmax); + while (mvControlling->ScndCtrlPos > DesiredPos) mvControlling->DecScndCtrl(1); + while (mvControlling->ScndCtrlPos < DesiredPos) mvControlling->IncScndCtrl(1); + } +}; + // otwieranie/zamykanie drzwi w składzie albo (tylko AI) EZT void TController::Doors( bool const Open, int const Side ) { diff --git a/Driver.h b/Driver.h index 214df307..95277696 100644 --- a/Driver.h +++ b/Driver.h @@ -304,6 +304,7 @@ private: bool IncSpeed(); bool DecSpeed(bool force = false); void SpeedSet(); + void SpeedCntrl(double DesiredSpeed); void Doors(bool const Open, int const Side = 0); // returns true if any vehicle in the consist has an open door bool doors_open() const; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 97231ad9..a67278b5 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -940,6 +940,7 @@ public: double PlatformMaxShift = 0.5; /*wysuniecie stopnia*/ int PlatformOpenMethod = 1; /*sposob animacji stopnia*/ bool ScndS = false; /*Czy jest bocznikowanie na szeregowej*/ + double SpeedCtrlDelay = 2; /*opoznienie dzialania tempomatu z wybieralna predkoscia*/ /*--sekcja zmiennych*/ /*--opis konkretnego egzemplarza taboru*/ TLocation Loc; //pozycja pojazdów do wyznaczenia odległości pomiędzy sprzęgami @@ -1127,6 +1128,8 @@ public: /*- zmienne dla lokomotyw z silnikami indukcyjnymi -*/ double eimv[21]; static std::vector const eimv_labels; + double SpeedCtrlTimer = 0; /*zegar dzialania tempomatu z wybieralna predkoscia*/ + double NewSpeed = 0; /*nowa predkosc do zadania*/ /*-zmienne dla drezyny*/ double PulseForce = 0.0; /*przylozona sila*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b340ca79..9a5200f0 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2002,7 +2002,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) if (LastRelayTime > CtrlDelay) LastRelayTime = 0; - if ((OK) && (EngineType == ElectricInductionMotor)) + if ((OK) && (EngineType == ElectricInductionMotor) && (ScndCtrlPosNo == 1)) { // NOTE: round() already adds 0.5, are the ones added here as well correct? if ((Vmax < 250)) @@ -2060,7 +2060,7 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed) if (LastRelayTime > CtrlDownDelay) LastRelayTime = 0; - if ((OK) && (EngineType == ElectricInductionMotor)) + if ((OK) && (EngineType == ElectricInductionMotor) && (ScndCtrlPosNo == 1)) { ScndCtrlActualPos = 0; SendCtrlToNext("SpeedCntrl", ScndCtrlActualPos, CabNo); @@ -4992,6 +4992,32 @@ double TMoverParameters::TractionForce(double dt) } if( true == Mains ) { + //tempomat + + if (ScndCtrlPosNo > 1) + { + if (ScndCtrlPos != NewSpeed) + { + + SpeedCtrlTimer = 0; + NewSpeed = ScndCtrlPos; + } + else + { + SpeedCtrlTimer += dt; + if (SpeedCtrlTimer > SpeedCtrlDelay) + { + int NewSCAP = (Vmax < 250 ? 1 : 0.5) * (float)ScndCtrlPos / (float)ScndCtrlPosNo * Vmax; + if (NewSCAP != ScndCtrlActualPos) + { + ScndCtrlActualPos = NewSCAP; + SendCtrlToNext("SpeedCntrl", ScndCtrlActualPos, CabNo); + } + } + } + } + + dtrans = Hamulec->GetEDBCP(); if (((DoorLeftOpened) || (DoorRightOpened))) DynamicBrakeFlag = true; @@ -5031,7 +5057,7 @@ double TMoverParameters::TractionForce(double dt) eimv[eimv_Fzad] = PosRatio; if ((Flat) && (eimc[eimc_p_F0] * eimv[eimv_Fful] > 0)) PosRatio = Min0R(PosRatio * eimc[eimc_p_F0] / eimv[eimv_Fful], 1); - if (ScndCtrlActualPos > 0) + if (ScndCtrlActualPos > 0) //speed control if (Vmax < 250) PosRatio = Min0R(PosRatio, Max0R(-1, 0.5 * (ScndCtrlActualPos - Vel))); else @@ -8093,6 +8119,9 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { extract_value( StopBrakeDecc, "SBD", line, "" ); + // speed control + extract_value( SpeedCtrlDelay, "SpeedCtrlDelay", line, "" ); + // converter { std::map starts { From db9d34aa6b8719e9e7d3fddf48886c9d6cc6a510 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 15 Apr 2018 17:48:09 +0200 Subject: [PATCH 305/426] Fix for diesel engine work with fast gear change or no direction set --- McZapkie/Mover.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 9a5200f0..3fbbf0c3 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6148,7 +6148,7 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) double Moment = 0, enMoment = 0, gearMoment = 0, eps = 0, newn = 0, friction = 0, neps = 0; double TorqueH = 0, TorqueL = 0, TorqueC = 0; n = n * CabNo; - if (MotorParam[ScndCtrlActualPos].mIsat < 0.001) + if ((MotorParam[ScndCtrlActualPos].mIsat < 0.001)||(ActiveDir == 0)) n = enrot; friction = dizel_engagefriction; hydro_TC_nIn = enrot; //wal wejsciowy przetwornika momentu @@ -6260,7 +6260,7 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) } eps = enMoment / dizel_AIM; newn = enrot + eps * dt; - if ((newn - n)*(enrot - dizel_n_old) < 0) //przejscie przez zero - slizgalo sie i przestało + if (((newn - n)*(enrot - dizel_n_old) < 0)&&(TorqueC>0.1)) //przejscie przez zero - slizgalo sie i przestało newn = n; if ((newn * enrot <= 0) && (eps * enrot < 0)) //przejscie przez zero obrotow newn = 0; From bb87a63eed9d23e44a54cf7dbb0fba07775f5ad0 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 18 Apr 2018 15:04:04 +0200 Subject: [PATCH 306/426] varying scale cab control animation types, basic shunt mode power slider cab control, minor ai logic tweaks, minor bug fixes --- Driver.cpp | 22 +++- EU07.cpp | 4 +- Gauge.cpp | 275 ++++++++++++++++++++++++--------------------- Gauge.h | 38 ++++--- McZapkie/Mover.cpp | 23 ++-- Train.cpp | 20 +++- Train.h | 1 + 7 files changed, 224 insertions(+), 159 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 1c2522ef..6af63776 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2223,13 +2223,15 @@ bool TController::PrepareEngine() voltfront = true; } } + auto workingtemperature { true }; if (AIControllFlag) { // część wykonawcza dla sterowania przez komputer mvOccupied->BatterySwitch( true ); if( ( mvControlling->EngineType == DieselElectric ) || ( mvControlling->EngineType == DieselEngine ) ) { mvControlling->OilPumpSwitch( true ); - if( true == UpdateHeating() ) { + workingtemperature = UpdateHeating(); + if( true == workingtemperature ) { mvControlling->FuelPumpSwitch( true ); } } @@ -2339,7 +2341,7 @@ bool TController::PrepareEngine() else OK = false; - OK = OK && (mvOccupied->ActiveDir != 0) && (mvControlling->CompressorAllow); + OK = OK && (mvOccupied->ActiveDir != 0) && (mvControlling->CompressorAllow) && (workingtemperature); if (OK) { if (eStopReason == stopSleep) // jeśli dotychczas spał @@ -2378,6 +2380,7 @@ bool TController::ReleaseEngine() mvControlling->PantFront(false); mvControlling->PantRear(false); } + // line breaker OK = mvControlling->MainSwitch(false); } else @@ -2410,7 +2413,20 @@ bool TController::ReleaseEngine() eAction = actSleep; //śpi (wygaszony) if (AIControllFlag) { - Lights(0, 0); // gasimy światła + if( ( mvControlling->EngineType == DieselElectric ) + || ( mvControlling->EngineType == DieselEngine ) ) { + // heating/cooling subsystem + mvControlling->WaterHeaterSwitch( false ); + // optionally turn off the water pump as well + if( mvControlling->WaterPump.start_type != start::battery ) { + mvControlling->WaterPumpSwitch( false ); + } + // fuel and oil subsystems + mvControlling->FuelPumpSwitch( false ); + mvControlling->OilPumpSwitch( false ); + } + // gasimy światła + Lights(0, 0); mvOccupied->BatterySwitch(false); } OrderNext(Wait_for_orders); //żeby nie próbował coś robić dalej diff --git a/EU07.cpp b/EU07.cpp index f1f1c90b..ff276ba6 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -412,7 +412,9 @@ int main(int argc, char *argv[]) return -1; } - audio::renderer.init(); + if( Global.bSoundEnabled ) { + Global.bSoundEnabled &= audio::renderer.init(); + } input::Keyboard.init(); input::Mouse.init(); diff --git a/Gauge.cpp b/Gauge.cpp index 75bf2e05..cb1b8440 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -21,46 +21,54 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "renderer.h" -void TGauge::Init(TSubModel *NewSubModel, TGaugeType eNewType, double fNewScale, double fNewOffset, double fNewFriction, double fNewValue) +void TGauge::Init(TSubModel *Submodel, TGaugeType Type, float Scale, float Offset, float Friction, float Value, float const Endvalue, float const Endscale, bool const Interpolatescale ) { // ustawienie parametrów animacji submodelu - if (NewSubModel) { - // warunek na wszelki wypadek, gdyby się submodel nie podłączył - fFriction = fNewFriction; - fValue = fNewValue; - fOffset = fNewOffset; - fScale = fNewScale; - SubModel = NewSubModel; - eType = eNewType; - if (eType == gt_Digital) { + SubModel = Submodel; + m_value = Value; + m_type = Type; + m_scale = Scale; + m_offset = Offset; + m_friction = Friction; + m_interpolatescale = Interpolatescale; + m_endvalue = Endvalue; + m_endscale = Endscale; - TSubModel *sm = SubModel->ChildGet(); - do { - // pętla po submodelach potomnych i obracanie ich o kąt zależy od cyfry w (fValue) - if (sm->pName.size()) - { // musi mieć niepustą nazwę - if (sm->pName[0] >= '0') - if (sm->pName[0] <= '9') - sm->WillBeAnimated(); // wyłączenie optymalizacji - } - sm = sm->NextGet(); - } while (sm); - } - else // a banan może być z optymalizacją? - NewSubModel->WillBeAnimated(); // wyłączenie ignowania jedynkowego transformu - // pass submodel location to defined sounds - auto const offset { model_offset() }; - m_soundfxincrease.offset( offset ); - m_soundfxdecrease.offset( offset ); - for( auto &soundfxrecord : m_soundfxvalues ) { - soundfxrecord.second.offset( offset ); - } + if( Submodel == nullptr ) { + // warunek na wszelki wypadek, gdyby się submodel nie podłączył + return; + } + + if( m_type == gt_Digital ) { + + TSubModel *sm = SubModel->ChildGet(); + do { + // pętla po submodelach potomnych i obracanie ich o kąt zależy od cyfry w (fValue) + if( sm->pName.size() ) { // musi mieć niepustą nazwę + if( sm->pName[ 0 ] >= '0' ) + if( sm->pName[ 0 ] <= '9' ) + sm->WillBeAnimated(); // wyłączenie optymalizacji + } + sm = sm->NextGet(); + } while( sm ); + } + else // a banan może być z optymalizacją? + Submodel->WillBeAnimated(); // wyłączenie ignowania jedynkowego transformu + // pass submodel location to defined sounds + auto const offset{ model_offset() }; + m_soundfxincrease.offset( offset ); + m_soundfxdecrease.offset( offset ); + for( auto &soundfxrecord : m_soundfxvalues ) { + soundfxrecord.second.offset( offset ); } }; bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, TModel3d *md2, double mul ) { std::string submodelname, gaugetypename; - double scale, offset, friction; + float scale, endscale, endvalue, offset, friction; + endscale = -1; + endvalue = -1; + bool interpolatescale { false }; Parser.getTokens(); if( Parser.peek() != "{" ) { @@ -72,6 +80,14 @@ bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, >> scale >> offset >> friction; + if( ( gaugetypename == "rotvar" ) + || ( gaugetypename == "movvar" ) ) { + interpolatescale = true; + Parser.getTokens( 2, false ); + Parser + >> endvalue + >> endscale; + } } else { // new, block type config @@ -83,6 +99,14 @@ bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, >> scale >> offset >> friction; + if( ( gaugetypename == "rotvar" ) + || ( gaugetypename == "movvar" ) ) { + interpolatescale = true; + Parser.getTokens( 2, false ); + Parser + >> endvalue + >> endscale; + } // new, variable length section while( true == Load_mapping( Parser ) ) { ; // all work done by while() @@ -97,11 +121,10 @@ bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, } scale *= mul; - TSubModel *submodel = md1->GetFromName( submodelname ); - if( scale == 0.0 ) { - ErrorLog( "Bad model: scale of 0.0 defined for sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\". Forcing scale of 1.0 to prevent division by 0", logtype::model ); - scale = 1.0; + if( interpolatescale ) { + endscale *= mul; } + TSubModel *submodel = md1->GetFromName( submodelname ); if (submodel) // jeśli nie znaleziony md2 = nullptr; // informacja, że znaleziony else if (md2) // a jest podany drugi model (np. zewnętrzny) @@ -111,7 +134,10 @@ bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, } std::map gaugetypes { + { "rot", gt_Rotate }, + { "rotvar", gt_Rotate }, { "mov", gt_Move }, + { "movvar", gt_Move }, { "wip", gt_Wiper }, { "dgt", gt_Digital } }; @@ -119,8 +145,9 @@ bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, auto const type = ( lookup != gaugetypes.end() ? lookup->second : - gt_Rotate ); - Init(submodel, type, scale, offset, friction); + gt_Unknown ); + + Init( submodel, type, scale, offset, friction, 0, endvalue, endscale, interpolatescale ); return md2 != nullptr; // true, gdy podany model zewnętrzny, a w kabinie nie było }; @@ -151,51 +178,27 @@ TGauge::Load_mapping( cParser &Input ) { return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized } -void TGauge::PermIncValue(double fNewDesired) -{ - fDesiredValue = fDesiredValue + fNewDesired * fScale + fOffset; - if (fDesiredValue - fOffset > 360 / fScale) - { - fDesiredValue = fDesiredValue - (360 / fScale); - fValue = fValue - (360 / fScale); - } -}; - -void TGauge::IncValue(double fNewDesired) -{ // używane tylko dla uniwersali - fDesiredValue = fDesiredValue + fNewDesired * fScale + fOffset; - if (fDesiredValue > fScale + fOffset) - fDesiredValue = fScale + fOffset; -}; - -void TGauge::DecValue(double fNewDesired) -{ // używane tylko dla uniwersali - fDesiredValue = fDesiredValue - fNewDesired * fScale + fOffset; - if (fDesiredValue < 0) - fDesiredValue = 0; -}; - void -TGauge::UpdateValue( double fNewDesired ) { +TGauge::UpdateValue( float fNewDesired ) { return UpdateValue( fNewDesired, nullptr ); } void -TGauge::UpdateValue( double fNewDesired, sound_source &Fallbacksound ) { +TGauge::UpdateValue( float fNewDesired, sound_source &Fallbacksound ) { return UpdateValue( fNewDesired, &Fallbacksound ); } // ustawienie wartości docelowej. plays provided fallback sound, if no sound was defined in the control itself void -TGauge::UpdateValue( double fNewDesired, sound_source *Fallbacksound ) { +TGauge::UpdateValue( float fNewDesired, sound_source *Fallbacksound ) { auto const desiredtimes100 = static_cast( std::round( 100.0 * fNewDesired ) ); - if( static_cast( std::round( 100.0 * ( fDesiredValue - fOffset ) / fScale ) ) == desiredtimes100 ) { + if( desiredtimes100 == static_cast( 100.0 * m_targetvalue ) ) { return; } - fDesiredValue = fNewDesired * fScale + fOffset; + m_targetvalue = fNewDesired; // if there's any sound associated with new requested value, play it // check value-specific table first... if( desiredtimes100 % 100 == 0 ) { @@ -224,115 +227,137 @@ TGauge::UpdateValue( double fNewDesired, sound_source *Fallbacksound ) { } }; -void TGauge::PutValue(double fNewDesired) +void TGauge::PutValue(float fNewDesired) { // McZapkie-281102: natychmiastowe wpisanie wartosci - fDesiredValue = fNewDesired * fScale + fOffset; - fValue = fDesiredValue; + m_targetvalue = fNewDesired; + m_value = m_targetvalue; }; -double TGauge::GetValue() const { +float TGauge::GetValue() const { // we feed value in range 0-1 so we should be getting it reported in the same range - return ( fValue - fOffset ) / fScale; + return m_value; } -double TGauge::GetDesiredValue() const { +float TGauge::GetDesiredValue() const { // we feed value in range 0-1 so we should be getting it reported in the same range - return ( fDesiredValue - fOffset ) / fScale; + return m_targetvalue; } void TGauge::Update() { - if( fValue != fDesiredValue ) { + if( m_value != m_targetvalue ) { float dt = Timer::GetDeltaTime(); - if( ( fFriction > 0 ) && ( dt < 0.5 * fFriction ) ) { + if( ( m_friction > 0 ) && ( dt < 0.5 * m_friction ) ) { // McZapkie-281102: zabezpieczenie przed oscylacjami dla dlugich czasow - fValue += dt * ( fDesiredValue - fValue ) / fFriction; - if( std::abs( fDesiredValue - fValue ) <= 0.0001 ) { + m_value += dt * ( m_targetvalue - m_value ) / m_friction; + if( std::abs( m_targetvalue - m_value ) <= 0.0001 ) { // close enough, we can stop updating the model - fValue = fDesiredValue; // set it exactly as requested just in case it matters + m_value = m_targetvalue; // set it exactly as requested just in case it matters } } else { - fValue = fDesiredValue; + m_value = m_targetvalue; } } if( SubModel ) { // warunek na wszelki wypadek, gdyby się submodel nie podłączył - TSubModel *sm; - switch (eType) - { - case gt_Rotate: - SubModel->SetRotate(float3(0, 1, 0), fValue * 360.0); - break; - case gt_Move: - SubModel->SetTranslate(float3(0, 0, fValue)); - break; - case gt_Wiper: - SubModel->SetRotate(float3(0, 1, 0), fValue * 360.0); - sm = SubModel->ChildGet(); - if (sm) - { - sm->SetRotate(float3(0, 1, 0), fValue * 360.0); - sm = sm->ChildGet(); - if (sm) - sm->SetRotate(float3(0, 1, 0), fValue * 360.0); + switch (m_type) { + case gt_Rotate: { + SubModel->SetRotate( float3( 0, 1, 0 ), GetScaledValue() * 360.0 ); + break; } - break; - case gt_Digital: // Ra 2014-07: licznik cyfrowy - sm = SubModel->ChildGet(); -/* std::string n = FormatFloat( "0000000000", floor( fValue ) ); // na razie tak trochę bez sensu -*/ std::string n( "000000000" + std::to_string( static_cast( std::floor( fValue ) ) ) ); - if( n.length() > 10 ) { n.erase( 0, n.length() - 10 ); } // also dumb but should work for now - do - { // pętla po submodelach potomnych i obracanie ich o kąt zależy od cyfry w (fValue) - if( sm->pName.size() ) { - // musi mieć niepustą nazwę - if( ( sm->pName[ 0 ] >= '0' ) - && ( sm->pName[ 0 ] <= '9' ) ) { - - sm->SetRotate( - float3( 0, 1, 0 ), - -36.0 * ( n[ '0' + 9 - sm->pName[ 0 ] ] - '0' ) ); - } + case gt_Move: { + SubModel->SetTranslate( float3( 0, 0, GetScaledValue() ) ); + break; + } + case gt_Wiper: { + auto const scaledvalue { GetScaledValue() }; + SubModel->SetRotate( float3( 0, 1, 0 ), scaledvalue * 360.0 ); + auto *sm = SubModel->ChildGet(); + if( sm ) { + sm->SetRotate( float3( 0, 1, 0 ), scaledvalue * 360.0 ); + sm = sm->ChildGet(); + if( sm ) + sm->SetRotate( float3( 0, 1, 0 ), scaledvalue * 360.0 ); } - sm = sm->NextGet(); - } while (sm); - break; + break; + } + case gt_Digital: { + // Ra 2014-07: licznik cyfrowy + auto *sm = SubModel->ChildGet(); +/* std::string n = FormatFloat( "0000000000", floor( fValue ) ); // na razie tak trochę bez sensu +*/ std::string n( "000000000" + std::to_string( static_cast( std::floor( GetScaledValue() ) ) ) ); + if( n.length() > 10 ) { n.erase( 0, n.length() - 10 ); } // also dumb but should work for now + do { // pętla po submodelach potomnych i obracanie ich o kąt zależy od cyfry w (fValue) + if( sm->pName.size() ) { + // musi mieć niepustą nazwę + if( ( sm->pName[ 0 ] >= '0' ) + && ( sm->pName[ 0 ] <= '9' ) ) { + + sm->SetRotate( + float3( 0, 1, 0 ), + -36.0 * ( n[ '0' + 9 - sm->pName[ 0 ] ] - '0' ) ); + } + } + sm = sm->NextGet(); + } while( sm ); + break; + } + default: { + break; + } } } }; void TGauge::AssignFloat(float *fValue) { - cDataType = 'f'; + m_datatype = 'f'; fData = fValue; }; + void TGauge::AssignDouble(double *dValue) { - cDataType = 'd'; + m_datatype = 'd'; dData = dValue; }; + void TGauge::AssignInt(int *iValue) { - cDataType = 'i'; + m_datatype = 'i'; iData = iValue; }; + void TGauge::UpdateValue() { // ustawienie wartości docelowej z parametru - switch (cDataType) + switch (m_datatype) { // to nie jest zbyt optymalne, można by zrobić osobne funkcje case 'f': - fDesiredValue = (*fData) * fScale + fOffset; + m_targetvalue = (*fData); break; case 'd': - fDesiredValue = (*dData) * fScale + fOffset; + m_targetvalue = (*dData); break; case 'i': - fDesiredValue = (*iData) * fScale + fOffset; + m_targetvalue = (*iData); break; } }; +float TGauge::GetScaledValue() const { + + return ( + ( false == m_interpolatescale ) ? + m_value * m_scale + m_offset : + m_value + * interpolate( + m_scale, m_endscale, + clamp( + m_value / m_endvalue, + 0.f, 1.f ) ) + + m_offset ); +} + // returns offset of submodel associated with the button from the model centre glm::vec3 TGauge::model_offset() const { diff --git a/Gauge.h b/Gauge.h index adb105e6..40f82cca 100644 --- a/Gauge.h +++ b/Gauge.h @@ -29,16 +29,13 @@ public: TGauge() = default; inline void Clear() { *this = TGauge(); } - void Init(TSubModel *NewSubModel, TGaugeType eNewTyp, double fNewScale = 1, double fNewOffset = 0, double fNewFriction = 0, double fNewValue = 0); + void Init(TSubModel *Submodel, TGaugeType Type, float Scale = 1, float Offset = 0, float Friction = 0, float Value = 0, float const Endvalue = -1.0, float const Endscale = -1.0, bool const Interpolate = false ); bool Load(cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, TModel3d *md2 = nullptr, double mul = 1.0); - void PermIncValue(double fNewDesired); - void IncValue(double fNewDesired); - void DecValue(double fNewDesired); - void UpdateValue( double fNewDesired ); - void UpdateValue( double fNewDesired, sound_source &Fallbacksound ); - void PutValue(double fNewDesired); - double GetValue() const; - double GetDesiredValue() const; + void UpdateValue( float fNewDesired ); + void UpdateValue( float fNewDesired, sound_source &Fallbacksound ); + void PutValue(float fNewDesired); + float GetValue() const; + float GetDesiredValue() const; void Update(); void AssignFloat(float *fValue); void AssignDouble(double *dValue); @@ -54,15 +51,22 @@ private: // imports member data pair from the config file bool Load_mapping( cParser &Input ); - void UpdateValue( double fNewDesired, sound_source *Fallbacksound ); + void + UpdateValue( float fNewDesired, sound_source *Fallbacksound ); + float + GetScaledValue() const; + // members - TGaugeType eType { gt_Unknown }; // typ ruchu - double fFriction { 0.0 }; // hamowanie przy zliżaniu się do zadanej wartości - double fDesiredValue { 0.0 }; // wartość docelowa - double fValue { 0.0 }; // wartość obecna - double fOffset { 0.0 }; // wartość początkowa ("0") - double fScale { 1.0 }; // wartość końcowa ("1") - char cDataType; // typ zmiennej parametru: f-float, d-double, i-int + TGaugeType m_type { gt_Unknown }; // typ ruchu + float m_friction { 0.f }; // hamowanie przy zliżaniu się do zadanej wartości + float m_targetvalue { 0.f }; // wartość docelowa + float m_value { 0.f }; // wartość obecna + float m_offset { 0.f }; // wartość początkowa ("0") + float m_scale { 1.f }; // scale applied to the value at the start of accepted value range + float m_endscale { -1.f }; // scale applied to the value at the end of accepted value range + float m_endvalue { -1.f }; // end value of accepted value range + bool m_interpolatescale { false }; + char m_datatype; // typ zmiennej parametru: f-float, d-double, i-int union { // wskaźnik na parametr pokazywany przez animację float *fData; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 3fbbf0c3..e65ae1f2 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1572,7 +1572,7 @@ void TMoverParameters::WaterHeaterCheck( double const Timestep ) { && ( true == Battery ) && ( true == WaterHeater.is_enabled ) && ( true == WaterHeater.breaker ) - && ( ( WaterHeater.config.temp_min < 0 ) || ( dizel_heat.temperatura1 < WaterHeater.config.temp_min ) ) ); + && ( ( WaterHeater.is_active ) || ( WaterHeater.config.temp_min < 0 ) || ( dizel_heat.temperatura1 < WaterHeater.config.temp_min ) ) ); if( ( WaterHeater.config.temp_max > 0 ) && ( dizel_heat.temperatura1 > WaterHeater.config.temp_max ) ) { @@ -4555,7 +4555,7 @@ double TMoverParameters::TractionForce(double dt) // TBD, TODO: currently ignores RVentType, fix this? RventRot += clamp( enrot - RventRot, -100.0, 50.0 ) * dt; dizel_heat.rpmw += clamp( dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f ) * dt; - dizel_heat.rpmw += clamp( dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f ) * dt; + dizel_heat.rpmw2 += clamp( dizel_heat.rpmwz2 - dizel_heat.rpmw2, -100.f, 50.f ) * dt; } else { RventRot *= std::max( 0.0, 1.0 - RVentSpeed * dt ); @@ -4569,7 +4569,7 @@ double TMoverParameters::TractionForce(double dt) // NOTE: we update only radiator fans, as vehicles with diesel engine don't have other ventilators if( true == Mains ) { dizel_heat.rpmw += clamp( dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f ) * dt; - dizel_heat.rpmw += clamp( dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f ) * dt; + dizel_heat.rpmw2 += clamp( dizel_heat.rpmwz2 - dizel_heat.rpmw2, -100.f, 50.f ) * dt; } else { dizel_heat.rpmw *= std::max( 0.0, 1.0 - dizel_heat.rpmw * dt ); @@ -4703,11 +4703,18 @@ double TMoverParameters::TractionForce(double dt) // tmpV:=V*CabNo*ActiveDir; auto const tmpV { nrot * Pirazy2 * 0.5 * WheelDiameter * DirAbsolute }; //*CabNo*ActiveDir; // jazda manewrowa - if (ShuntMode) - { - Voltage = (SST[MainCtrlPos].Umax * AnPos) + (SST[MainCtrlPos].Umin * (1.0 - AnPos)); - tmp = (SST[MainCtrlPos].Pmax * AnPos) + (SST[MainCtrlPos].Pmin * (1.0 - AnPos)); - Ft = tmp * 1000.0 / (abs(tmpV) + 1.6); + if( true == ShuntMode ) { + if( ( true == Mains ) && ( MainCtrlPos > 0 ) ) { + Voltage = ( SST[ MainCtrlPos ].Umax * AnPos ) + ( SST[ MainCtrlPos ].Umin * ( 1.0 - AnPos ) ); + // NOTE: very crude way to approximate power generated at current rpm instead of instant top output + auto const rpmratio { 60.0 * enrot / DElist[ MainCtrlPos ].RPM }; + tmp = rpmratio * ( SST[ MainCtrlPos ].Pmax * AnPos ) + ( SST[ MainCtrlPos ].Pmin * ( 1.0 - AnPos ) ); + Ft = tmp * 1000.0 / ( abs( tmpV ) + 1.6 ); + } + else { + Voltage = 0; + Ft = 0; + } PosRatio = 1; } else // jazda ciapongowa diff --git a/Train.cpp b/Train.cpp index 9a991709..2855f13c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -757,7 +757,7 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con // on press or hold if( Train->mvControlled->ShuntMode ) { Train->mvControlled->AnPos = clamp( - Train->mvControlled->AnPos + ( Command.time_delta * 1.0f ), + Train->mvControlled->AnPos + ( Command.time_delta * 2.0 ), 0.0, 1.0 ); } else { @@ -818,7 +818,7 @@ void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data con // on press or hold if( Train->mvControlled->ShuntMode ) { Train->mvControlled->AnPos = clamp( - Train->mvControlled->AnPos - ( Command.time_delta * 1.0f ), + Train->mvControlled->AnPos - ( Command.time_delta * 2.0 ), 0.0, 1.0 ); } Train->mvControlled->DecScndCtrl( 1 ); @@ -4867,6 +4867,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaNadmPrzetwB.Turn( tmp->MoverParameters->ConvOvldFlag ); // nadmiarowy przetwornicy? btLampkaPrzetwB.Turn( tmp->MoverParameters->ConverterFlag ); // zalaczenie przetwornicy btLampkaPrzetwBOff.Turn( false == tmp->MoverParameters->ConverterFlag ); + btLampkaMalfunctionB.Turn( tmp->MoverParameters->dizel_heat.PA ); } else // wylaczone { @@ -4881,6 +4882,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaNadmPrzetwB.Turn( false ); btLampkaPrzetwB.Turn( false ); btLampkaPrzetwBOff.Turn( false ); + btLampkaMalfunctionB.Turn( false ); } } @@ -6306,6 +6308,7 @@ void TTrain::clear_cab_controls() btCabLight.Clear(); // hunter-171012 // others btLampkaMalfunction.Clear(); + btLampkaMalfunctionB.Clear(); btLampkaMotorBlowers.Clear(); ggLeftLightButton.Clear(); @@ -6615,6 +6618,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-contactorsb:", btLampkaStycznB }, { "i-conv_ovldb:", btLampkaNadmPrzetwB }, { "i-malfunction:", btLampkaMalfunction }, + { "i-malfunctionb:", btLampkaMalfunctionB }, { "i-forward:", btLampkaForward }, { "i-backward:", btLampkaBackward }, { "i-upperlight:", btLampkaUpperLight }, @@ -6937,9 +6941,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con if (Parser.getToken() == "analog") { // McZapkie-300302: zegarek - ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), gt_Rotate, 1.0/60.0, 0, 0); - ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), gt_Rotate, 1.0/60.0, 0, 0); - ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), gt_Rotate, 1.0/12.0, 0, 0); + ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), gt_Rotate, 1.0/60.0); + ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), gt_Rotate, 1.0/60.0); + ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), gt_Rotate, 1.0/12.0); } } else if (Label == "evoltage:") @@ -7002,6 +7006,12 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignDouble(&mvControlled->DistCounter); } + else if( Label == "shuntmodepower:" ) { + // shunt mode power slider + auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka + gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); + gauge.AssignDouble(&mvControlled->AnPos); + } else { // failed to match the label diff --git a/Train.h b/Train.h index 60636020..46b51400 100644 --- a/Train.h +++ b/Train.h @@ -512,6 +512,7 @@ public: // reszta może by?publiczna TButton btLampkaRearRightEndLight; // other TButton btLampkaMalfunction; + TButton btLampkaMalfunctionB; TButton btLampkaMotorBlowers; TButton btCabLight; // hunter-171012: lampa oswietlajaca kabine From fc1f57a5d40be668c8bc99a06b314a9da981d223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Tue, 17 Apr 2018 22:42:26 +0200 Subject: [PATCH 307/426] Fixed BrakeHandle type MHZ_EN57 and brake operation mode selector --- DynObj.cpp | 2 +- Train.cpp | 36 ++++++++++++++++++++++++++++++++++++ Train.h | 2 ++ command.cpp | 2 ++ command.h | 2 ++ keyboardinput.cpp | 4 ++++ 6 files changed, 47 insertions(+), 1 deletion(-) diff --git a/DynObj.cpp b/DynObj.cpp index 81b465a5..143d4cf0 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3025,7 +3025,7 @@ bool TDynamicObject::Update(double dt, double dt1) } auto FzadED { 0.0 }; - if( ( MoverParameters->EpFuse ) + if( ( MoverParameters->EpFuse && (MoverParameters->BrakeHandle != MHZ_EN57)) || ( ( MoverParameters->BrakeHandle == MHZ_EN57 ) && ( MoverParameters->BrakeOpModeFlag & bom_MED ) ) ) { FzadED = std::min( Fzad, FmaxED ); diff --git a/Train.cpp b/Train.cpp index 2855f13c..1000932f 100644 --- a/Train.cpp +++ b/Train.cpp @@ -193,6 +193,8 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::wheelspinbrakeactivate, &TTrain::OnCommand_wheelspinbrakeactivate }, { user_command::sandboxactivate, &TTrain::OnCommand_sandboxactivate }, { user_command::epbrakecontroltoggle, &TTrain::OnCommand_epbrakecontroltoggle }, + { user_command::brakeoperationmodeincrease, &TTrain::OnCommand_brakeoperationmodeincrease }, + { user_command::brakeoperationmodedecrease, &TTrain::OnCommand_brakeoperationmodedecrease }, { user_command::brakeactingspeedincrease, &TTrain::OnCommand_brakeactingspeedincrease }, { user_command::brakeactingspeeddecrease, &TTrain::OnCommand_brakeactingspeeddecrease }, { user_command::brakeactingspeedsetcargo, &TTrain::OnCommand_brakeactingspeedsetcargo }, @@ -1264,6 +1266,40 @@ void TTrain::OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const & } } +void TTrain::OnCommand_brakeoperationmodeincrease(TTrain *Train, command_data const &Command) { + + if (Command.action == GLFW_PRESS) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if (0 < (Train->mvOccupied->BrakeOpModeFlag * 2) & Train->mvOccupied->BrakeOpModes) { + // next mode + Train->mvOccupied->BrakeOpModeFlag *= 2; + // audio feedback + Train->dsbPneumaticSwitch.play(); + // visual feedback + // NOTE: there's no button for brake operation mode switch + // TBD, TODO: add brake operation mode switch? + } + } +} + +void TTrain::OnCommand_brakeoperationmodedecrease(TTrain *Train, command_data const &Command) { + + if (Command.action == GLFW_PRESS) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if (0 < (Train->mvOccupied->BrakeOpModeFlag / 2) & Train->mvOccupied->BrakeOpModes) { + // previous mode + Train->mvOccupied->BrakeOpModeFlag /= 2; + // audio feedback + Train->dsbPneumaticSwitch.play(); + // visual feedback + // NOTE: there's no button for brake operation mode switch + // TBD, TODO: add brake operation mode switch? + } + } +} + + + void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { diff --git a/Train.h b/Train.h index 46b51400..020bda93 100644 --- a/Train.h +++ b/Train.h @@ -184,6 +184,8 @@ class TTrain static void OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const &Command ); static void OnCommand_sandboxactivate( TTrain *Train, command_data const &Command ); static void OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_brakeoperationmodeincrease(TTrain *Train, command_data const &Command); + static void OnCommand_brakeoperationmodedecrease(TTrain *Train, command_data const &Command); static void OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeedsetcargo( TTrain *Train, command_data const &Command ); diff --git a/command.cpp b/command.cpp index c7b0073f..8fb41b2c 100644 --- a/command.cpp +++ b/command.cpp @@ -102,6 +102,8 @@ commanddescription_sequence Commands_descriptions = { { "motoroverloadrelayreset", command_target::vehicle }, { "notchingrelaytoggle", command_target::vehicle }, { "epbrakecontroltoggle", command_target::vehicle }, + { "brakeoperationmodeincrease", command_target::vehicle }, + { "brakeoperationmodedecrease", command_target::vehicle }, { "brakeactingspeedincrease", command_target::vehicle }, { "brakeactingspeeddecrease", command_target::vehicle }, { "brakeactingspeedsetcargo", command_target::vehicle }, diff --git a/command.h b/command.h index be90b1c8..db47786f 100644 --- a/command.h +++ b/command.h @@ -96,6 +96,8 @@ enum class user_command { motoroverloadrelayreset, notchingrelaytoggle, epbrakecontroltoggle, + brakeoperationmodeincrease, + brakeoperationmodedecrease, brakeactingspeedincrease, brakeactingspeeddecrease, brakeactingspeedsetcargo, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 4f60b08f..67e5e850 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -333,6 +333,10 @@ keyboard_input::default_bindings() { { GLFW_KEY_G }, // epbrakecontroltoggle { GLFW_KEY_Z | keymodifier::control }, + // brakeoperationmodeincrease + { GLFW_KEY_L | keymodifier::shift }, + // brakeoperationmodedecrease + { GLFW_KEY_L}, // brakeactingspeedincrease { GLFW_KEY_B | keymodifier::shift }, // brakeactingspeeddecrease From 430ab99f8e20bfd6fb0e8db6a0b0b03beda07f44 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 18 Apr 2018 22:14:16 +0200 Subject: [PATCH 308/426] compressor start method, minor ai vehicle preparation logic tweaks, minor refactoring --- Driver.cpp | 12 +++--- McZapkie/MOVER.h | 5 ++- McZapkie/Mover.cpp | 97 ++++++++++++++++++++++++++-------------------- Train.cpp | 22 +++++------ Train.h | 4 +- command.cpp | 4 +- command.h | 4 +- keyboardinput.cpp | 8 ++-- version.h | 2 +- 9 files changed, 86 insertions(+), 72 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 6af63776..c7c5793f 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2237,8 +2237,8 @@ bool TController::PrepareEngine() } if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { // jeśli silnikowy jest pantografującym - mvControlling->PantFront( true ); - mvControlling->PantRear( true ); + mvOccupied->PantFront( true ); + mvOccupied->PantRear( true ); if (mvControlling->PantPress < 4.2) { // załączenie małej sprężarki if( mvControlling->TrainType != dt_EZT ) { @@ -2266,11 +2266,11 @@ bool TController::PrepareEngine() if( !iDirection ) { // jeśli nie ma ustalonego kierunku if( ( mvControlling->PantFrontVolt != 0.0 ) || ( mvControlling->PantRearVolt != 0.0 ) || voltfront || voltrear ) { - if( mvOccupied->Couplers[ 1 ].CouplingFlag == ctrain_virtual ) { + if( mvOccupied->Couplers[ 1 ].CouplingFlag == coupling::faux ) { // jeśli z tyłu nie ma nic iDirection = -1; // jazda w kierunku sprzęgu 1 } - if( mvOccupied->Couplers[ 0 ].CouplingFlag == ctrain_virtual ) { + if( mvOccupied->Couplers[ 0 ].CouplingFlag == coupling::faux ) { // jeśli z przodu nie ma nic iDirection = 1; // jazda w kierunku sprzęgu 0 } @@ -2332,7 +2332,7 @@ bool TController::PrepareEngine() OK = ( OrderDirectionChange( iDirection, mvOccupied ) == -1 ); mvOccupied->ConverterSwitch( true ); // w EN57 sprężarka w ra jest zasilana z silnikowego - mvControlling->CompressorSwitch( true ); + mvOccupied->CompressorSwitch( true ); } } else @@ -2341,7 +2341,7 @@ bool TController::PrepareEngine() else OK = false; - OK = OK && (mvOccupied->ActiveDir != 0) && (mvControlling->CompressorAllow) && (workingtemperature); + OK = OK && ( mvOccupied->ActiveDir != 0 ) && ( mvControlling->ScndPipePress > 4.5 ) && ( workingtemperature ); if (OK) { if (eStopReason == stopSleep) // jeśli dotychczas spał diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index a67278b5..4a1cd438 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -860,7 +860,7 @@ public: double RVentCutOff = 0.0; /*rezystancja wylaczania wentylatorow dla RVentType=2*/ double RVentSpeed { 0.5 }; //rozpedzanie sie wentylatora obr/s^2} double RVentMinI { 50.0 }; //przy jakim pradzie sie wylaczaja} - int CompressorPower = 1; /*0: bezp. z obwodow silnika, 1: z przetwornicy, reczne, 2: w przetwornicy, stale, 5: z silnikowego*/ + int CompressorPower = 1; // 0: main circuit, 1: z przetwornicy, reczne, 2: w przetwornicy, stale, 3: diesel engine, 4: converter of unit in front, 5: converter of unit behind int SmallCompressorPower = 0; /*Winger ZROBIC*/ bool Trafo = false; /*pojazd wyposażony w transformator*/ @@ -993,6 +993,7 @@ public: bool CompressorAllow = false; /*! zezwolenie na uruchomienie sprezarki NBMX*/ bool CompressorAllowLocal{ true }; // local device state override (most units don't have this fitted so it's set to true not to intefere) bool CompressorGovernorLock{ false }; // indicates whether compressor pressure switch was activated due to reaching cut-out pressure + start CompressorStart{ start::manual }; // whether the compressor is started manually, or another way // TODO converter parameters, for when we start cleaning up mover parameters start ConverterStart{ start::manual }; // whether converter is started manually, or by other means float ConverterStartDelay{ 0.0f }; // delay (in seconds) before the converter is started, once its activation conditions are met @@ -1269,7 +1270,7 @@ public: bool IncBrakePress(double &brake, double PressLimit, double dp); bool DecBrakePress(double &brake, double PressLimit, double dp); bool BrakeDelaySwitch(int BDS);/*! przelaczanie nastawy opoznienia*/ - bool IncBrakeMult(void);/*przelaczanie prozny/ladowny*/ + bool IncBrakeMult(void);/*przelaczanie prozny/ladowny*/ bool DecBrakeMult(void); /*pomocnicze funkcje dla ukladow pneumatycznych*/ void UpdateBrakePressure(double dt); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index e65ae1f2..d16bac76 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2679,7 +2679,7 @@ bool TMoverParameters::ConverterSwitch( bool State, int const Notify ) // ************************************************************************************************* bool TMoverParameters::CompressorSwitch( bool State, int const Notify ) { - if( CompressorPower > 1 ) { + if( CompressorStart != start::manual ) { // only pay attention if the compressor can be controlled manually return false; } @@ -3323,35 +3323,38 @@ void TMoverParameters::CompressorCheck(double dt) else { if( CompressorPower == 3 ) { // experimental: make sure compressor coupled with diesel engine is always ready for work - CompressorAllow = true; + CompressorStart = start::automatic; } if (CompressorFlag) // jeśli sprężarka załączona { // sprawdzić możliwe warunki wyłączenia sprężarki if (CompressorPower == 5) // jeśli zasilanie z sąsiedniego członu { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if (Couplers[1].Connected != NULL) - CompressorFlag = - ( Couplers[ 1 ].Connected->CompressorAllow - && Couplers[ 1 ].Connected->CompressorAllowLocal - && Couplers[ 1 ].Connected->Mains - && Couplers[ 1 ].Connected->ConverterFlag ); - else - CompressorFlag = false; // bez tamtego członu nie zadziała + if( Couplers[ side::rear ].Connected != NULL ) { + CompressorFlag = ( + ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + && ( CompressorAllowLocal ) + && ( Couplers[ side::rear ].Connected->ConverterFlag ) ); + } + else { + // bez tamtego członu nie zadziała + CompressorFlag = false; + } } else if (CompressorPower == 4) // jeśli zasilanie z poprzedniego członu { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if (Couplers[0].Connected != NULL) - CompressorFlag = - ( Couplers[ 0 ].Connected->CompressorAllow - && Couplers[ 0 ].Connected->CompressorAllowLocal - && Couplers[ 0 ].Connected->Mains - && Couplers[ 0 ].Connected->ConverterFlag ); - else + if( Couplers[ side::front ].Connected != NULL ) { + CompressorFlag = ( + ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + && ( CompressorAllowLocal ) + && ( Couplers[ side::front ].Connected->ConverterFlag ) ); + } + else { CompressorFlag = false; // bez tamtego członu nie zadziała + } } else - CompressorFlag = - ( ( CompressorAllow ) + CompressorFlag = ( + ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) && ( CompressorAllowLocal ) && ( Mains ) && ( ( ConverterFlag ) @@ -3402,38 +3405,37 @@ void TMoverParameters::CompressorCheck(double dt) // or if the switch is on and the pressure isn't maxed if( CompressorPower == 5 ) // jeśli zasilanie z następnego członu { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if( Couplers[ 1 ].Connected != nullptr ) { - CompressorFlag = - ( Couplers[ 1 ].Connected->CompressorAllow - && Couplers[ 1 ].Connected->CompressorAllowLocal - && Couplers[ 1 ].Connected->Mains - && Couplers[ 1 ].Connected->ConverterFlag ); - } + if( Couplers[ side::rear ].Connected != NULL ) { + CompressorFlag = ( + ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + && ( CompressorAllowLocal ) + && ( Couplers[ side::rear ].Connected->ConverterFlag ) ); + } else { - CompressorFlag = false; // bez tamtego członu nie zadziała + // bez tamtego członu nie zadziała + CompressorFlag = false; } } else if( CompressorPower == 4 ) // jeśli zasilanie z poprzedniego członu { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) - if( Couplers[ 0 ].Connected != nullptr ) { - CompressorFlag = - ( Couplers[ 0 ].Connected->CompressorAllow - && Couplers[ 0 ].Connected->CompressorAllowLocal - && Couplers[ 0 ].Connected->Mains - && Couplers[ 0 ].Connected->ConverterFlag ); + if( Couplers[ side::front ].Connected != NULL ) { + CompressorFlag = ( + ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + && ( CompressorAllowLocal ) + && ( Couplers[ side::front ].Connected->ConverterFlag ) ); } else { CompressorFlag = false; // bez tamtego członu nie zadziała } } else { - CompressorFlag = - ( ( CompressorAllow ) - && ( CompressorAllowLocal ) - && ( Mains ) - && ( ( ConverterFlag ) - || ( CompressorPower == 0 ) - || ( CompressorPower == 3 ) ) ); + CompressorFlag = ( + ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + && ( CompressorAllowLocal ) + && ( Mains ) + && ( ( ConverterFlag ) + || ( CompressorPower == 0 ) + || ( CompressorPower == 3 ) ) ); } // NOTE: crude way to enforce simultaneous activation of compressors in multi-unit setups @@ -8143,6 +8145,19 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { } extract_value( ConverterStartDelay, "ConverterStartDelay", line, "" ); + // compressor + { + std::map starts { + { "Manual", start::manual }, + { "Automatic", start::automatic } + }; + auto lookup = starts.find( extract_value( "CompressorStart", line ) ); + CompressorStart = + lookup != starts.end() ? + lookup->second : + start::manual; + } + // fuel pump { std::map starts { @@ -9256,7 +9271,7 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C // end else if (Command == "CompressorSwitch") /*NBMX*/ { - if( CompressorPower < 2 ) { + if( CompressorStart == start::manual ) { CompressorAllow = ( CValue1 == 1 ); } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); diff --git a/Train.cpp b/Train.cpp index 1000932f..ad0f59b3 100644 --- a/Train.cpp +++ b/Train.cpp @@ -193,8 +193,8 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::wheelspinbrakeactivate, &TTrain::OnCommand_wheelspinbrakeactivate }, { user_command::sandboxactivate, &TTrain::OnCommand_sandboxactivate }, { user_command::epbrakecontroltoggle, &TTrain::OnCommand_epbrakecontroltoggle }, - { user_command::brakeoperationmodeincrease, &TTrain::OnCommand_brakeoperationmodeincrease }, - { user_command::brakeoperationmodedecrease, &TTrain::OnCommand_brakeoperationmodedecrease }, + { user_command::trainbrakeoperationmodeincrease, &TTrain::OnCommand_trainbrakeoperationmodeincrease }, + { user_command::trainbrakeoperationmodedecrease, &TTrain::OnCommand_trainbrakeoperationmodedecrease }, { user_command::brakeactingspeedincrease, &TTrain::OnCommand_brakeactingspeedincrease }, { user_command::brakeactingspeeddecrease, &TTrain::OnCommand_brakeactingspeeddecrease }, { user_command::brakeactingspeedsetcargo, &TTrain::OnCommand_brakeactingspeedsetcargo }, @@ -1266,14 +1266,14 @@ void TTrain::OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const & } } -void TTrain::OnCommand_brakeoperationmodeincrease(TTrain *Train, command_data const &Command) { +void TTrain::OnCommand_trainbrakeoperationmodeincrease(TTrain *Train, command_data const &Command) { if (Command.action == GLFW_PRESS) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if (0 < (Train->mvOccupied->BrakeOpModeFlag * 2) & Train->mvOccupied->BrakeOpModes) { - // next mode - Train->mvOccupied->BrakeOpModeFlag *= 2; - // audio feedback + if( ( ( Train->mvOccupied->BrakeOpModeFlag << 1 ) & Train->mvOccupied->BrakeOpModes ) != 0 ) { + // next mode + Train->mvOccupied->BrakeOpModeFlag <<= 1; + // audio feedback Train->dsbPneumaticSwitch.play(); // visual feedback // NOTE: there's no button for brake operation mode switch @@ -1282,13 +1282,13 @@ void TTrain::OnCommand_brakeoperationmodeincrease(TTrain *Train, command_data co } } -void TTrain::OnCommand_brakeoperationmodedecrease(TTrain *Train, command_data const &Command) { +void TTrain::OnCommand_trainbrakeoperationmodedecrease(TTrain *Train, command_data const &Command) { if (Command.action == GLFW_PRESS) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if (0 < (Train->mvOccupied->BrakeOpModeFlag / 2) & Train->mvOccupied->BrakeOpModes) { + if( ( ( Train->mvOccupied->BrakeOpModeFlag >> 1 ) & Train->mvOccupied->BrakeOpModes ) != 0 ) { // previous mode - Train->mvOccupied->BrakeOpModeFlag /= 2; + Train->mvOccupied->BrakeOpModeFlag >>= 1; // audio feedback Train->dsbPneumaticSwitch.play(); // visual feedback @@ -1298,8 +1298,6 @@ void TTrain::OnCommand_brakeoperationmodedecrease(TTrain *Train, command_data co } } - - void TTrain::OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { diff --git a/Train.h b/Train.h index 020bda93..5880dc47 100644 --- a/Train.h +++ b/Train.h @@ -184,8 +184,8 @@ class TTrain static void OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const &Command ); static void OnCommand_sandboxactivate( TTrain *Train, command_data const &Command ); static void OnCommand_epbrakecontroltoggle( TTrain *Train, command_data const &Command ); - static void OnCommand_brakeoperationmodeincrease(TTrain *Train, command_data const &Command); - static void OnCommand_brakeoperationmodedecrease(TTrain *Train, command_data const &Command); + static void OnCommand_trainbrakeoperationmodeincrease(TTrain *Train, command_data const &Command); + static void OnCommand_trainbrakeoperationmodedecrease(TTrain *Train, command_data const &Command); static void OnCommand_brakeactingspeedincrease( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeeddecrease( TTrain *Train, command_data const &Command ); static void OnCommand_brakeactingspeedsetcargo( TTrain *Train, command_data const &Command ); diff --git a/command.cpp b/command.cpp index 8fb41b2c..657e99b8 100644 --- a/command.cpp +++ b/command.cpp @@ -102,8 +102,8 @@ commanddescription_sequence Commands_descriptions = { { "motoroverloadrelayreset", command_target::vehicle }, { "notchingrelaytoggle", command_target::vehicle }, { "epbrakecontroltoggle", command_target::vehicle }, - { "brakeoperationmodeincrease", command_target::vehicle }, - { "brakeoperationmodedecrease", command_target::vehicle }, + { "trainbrakeoperationmodeincrease", command_target::vehicle }, + { "trainbrakeoperationmodedecrease", command_target::vehicle }, { "brakeactingspeedincrease", command_target::vehicle }, { "brakeactingspeeddecrease", command_target::vehicle }, { "brakeactingspeedsetcargo", command_target::vehicle }, diff --git a/command.h b/command.h index db47786f..96ecefd5 100644 --- a/command.h +++ b/command.h @@ -96,8 +96,8 @@ enum class user_command { motoroverloadrelayreset, notchingrelaytoggle, epbrakecontroltoggle, - brakeoperationmodeincrease, - brakeoperationmodedecrease, + trainbrakeoperationmodeincrease, + trainbrakeoperationmodedecrease, brakeactingspeedincrease, brakeactingspeeddecrease, brakeactingspeedsetcargo, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 67e5e850..76d5da28 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -333,10 +333,10 @@ keyboard_input::default_bindings() { { GLFW_KEY_G }, // epbrakecontroltoggle { GLFW_KEY_Z | keymodifier::control }, - // brakeoperationmodeincrease - { GLFW_KEY_L | keymodifier::shift }, - // brakeoperationmodedecrease - { GLFW_KEY_L}, + // trainbrakeoperationmodeincrease + { GLFW_KEY_KP_3 | keymodifier::shift | keymodifier::control }, + // trainbrakeoperationmodedecrease + { GLFW_KEY_KP_9 | keymodifier::shift | keymodifier::control }, // brakeactingspeedincrease { GLFW_KEY_B | keymodifier::shift }, // brakeactingspeeddecrease diff --git a/version.h b/version.h index f1e336ed..85730745 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 411 +#define VERSION_MINOR 418 #define VERSION_REVISION 0 From ab17f5a4f449963f60b96f8d25137a9941186586 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Wed, 18 Apr 2018 17:22:04 +0200 Subject: [PATCH 309/426] Fixed minimal position for MHZ_EN57 --- McZapkie/hamulce.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 10f2e949..7381c787 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -22,7 +22,7 @@ Copyright (C) 2007-2014 Maciej Cierniak static double const DPL = 0.25; double const TFV4aM::pos_table[11] = {-2, 6, -1, 0, -2, 1, 4, 6, 0, 0, 0}; -double const TMHZ_EN57::pos_table[11] = {-2, 10, -1, 0, 0, 2, 9, 10, 0, 0, 0}; +double const TMHZ_EN57::pos_table[11] = {-1, 10, -1, 0, 0, 2, 9, 10, 0, 0, 0}; double const TM394::pos_table[11] = {-1, 5, -1, 0, 1, 2, 4, 5, 0, 0, 0}; double const TH14K1::BPT_K[6][2] = {{10, 0}, {4, 1}, {0, 1}, {4, 0}, {4, -1}, {15, -1}}; double const TH14K1::pos_table[11] = {-1, 4, -1, 0, 1, 2, 3, 4, 0, 0, 0}; From 6349a134250d040b2fdb674201cf0179ac05cc5d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 19 Apr 2018 23:17:56 +0200 Subject: [PATCH 310/426] build 180419. radiator fan sounds, radiator shutters submodels, minor enhancements and bug fixes --- Driver.cpp | 17 +++--- DynObj.cpp | 134 ++++++++++++++++++++++++++------------------- DynObj.h | 4 ++ McZapkie/Mover.cpp | 3 +- Train.cpp | 5 +- mouseinput.cpp | 3 + translation.h | 1 + version.h | 2 +- 8 files changed, 102 insertions(+), 67 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index c7c5793f..38d5c3a7 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2341,16 +2341,19 @@ bool TController::PrepareEngine() else OK = false; - OK = OK && ( mvOccupied->ActiveDir != 0 ) && ( mvControlling->ScndPipePress > 4.5 ) && ( workingtemperature ); - if (OK) - { - if (eStopReason == stopSleep) // jeśli dotychczas spał - eStopReason = stopNone; // teraz nie ma powodu do stania + if( ( true == OK ) + && ( mvOccupied->ActiveDir != 0 ) + && ( true == workingtemperature ) + && ( ( mvControlling->ScndPipePress > 4.5 ) || ( mvControlling->VeselVolume == 0.0 ) ) ) { + + if( eStopReason == stopSleep ) { + // jeśli dotychczas spał teraz nie ma powodu do stania + eStopReason = stopNone; + } iEngineActive = 1; return true; } - else - { + else { iEngineActive = 0; return false; } diff --git a/DynObj.cpp b/DynObj.cpp index 143d4cf0..df23e13b 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -584,18 +584,15 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) if (vFloor.z > 0.0) mdLoad->GetSMRoot()->SetTranslate(modelShake + vFloor); - if (ObjSqrDist < 160000) // gdy bliżej niż 400m + if (ObjSqrDist < ( 400 * 400 ) ) // gdy bliżej niż 400m { for (int i = 0; i < iAnimations; ++i) // wykonanie kolejnych animacji - if (ObjSqrDist < pAnimations[i].fMaxDist) - if (pAnimations[i].yUpdate) // jeśli zdefiniowana funkcja - pAnimations[ i ].yUpdate( &pAnimations[i] ); // aktualizacja animacji (położenia submodeli -/* - pAnimations[i].yUpdate(pAnimations + - i); // aktualizacja animacji (położenia submodeli -*/ + if (ObjSqrDist < pAnimations[ i ].fMaxDist) + if (pAnimations[ i ].yUpdate) // jeśli zdefiniowana funkcja + pAnimations[ i ].yUpdate( &pAnimations[ i ] ); // aktualizacja animacji (położenia submodeli + if( ( mdModel != nullptr ) - && ( ObjSqrDist < 2500 ) ) { + && ( ObjSqrDist < ( 50 * 50 ) ) ) { // gdy bliżej niż 50m // ABu290105: rzucanie pudlem // te animacje wymagają bananów w modelach! @@ -658,11 +655,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) } btnOn = true; } - // else - //{ - // btCPneumatic1.TurnOff(); - // btCPneumatic1r.TurnOff(); - //} if (TestFlag(MoverParameters->Couplers[1].CouplingFlag, ctrain_pneumatic)) { @@ -683,11 +675,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) } btnOn = true; } - // else - //{ - // btCPneumatic2.TurnOff(); - // btCPneumatic2r.TurnOff(); - //} // przewody zasilajace, j.w. (yB) if (TestFlag(MoverParameters->Couplers[0].CouplingFlag, ctrain_scndpneumatic)) @@ -709,11 +696,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) } btnOn = true; } - // else - //{ - // btPneumatic1.TurnOff(); - // btPneumatic1r.TurnOff(); - //} if (TestFlag(MoverParameters->Couplers[1].CouplingFlag, ctrain_scndpneumatic)) { @@ -734,11 +716,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) } btnOn = true; } - // else - //{ - // btPneumatic2.TurnOff(); - // btPneumatic2r.TurnOff(); - //} } //*********************************************************************************/ else // po staremu ABu'oewmu @@ -753,11 +730,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) btCPneumatic1r.TurnOn(); btnOn = true; } - // else - //{ - // btCPneumatic1.TurnOff(); - // btCPneumatic1r.TurnOff(); - //} if (TestFlag(MoverParameters->Couplers[1].CouplingFlag, ctrain_pneumatic)) { @@ -767,11 +739,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) btCPneumatic2r.TurnOn(); btnOn = true; } - // else - //{ - // btCPneumatic2.TurnOff(); - // btCPneumatic2r.TurnOff(); - //} // przewody powietrzne j.w., ABu: decyzja czy rysowac tylko na podstawie // 'render' @@ -784,11 +751,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) btPneumatic1r.TurnOn(); btnOn = true; } - // else - //{ - // btPneumatic1.TurnOff(); - // btPneumatic1r.TurnOff(); - //} if (TestFlag(MoverParameters->Couplers[1].CouplingFlag, ctrain_scndpneumatic)) { @@ -798,11 +760,6 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) btPneumatic2r.TurnOn(); btnOn = true; } - // else - //{ - // btPneumatic2.TurnOff(); - // btPneumatic2r.TurnOff(); - //} } //*************************************************************/// koniec // wezykow @@ -817,7 +774,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) if (dist < 0) smBuforPrawy[i]->SetTranslate( Math3D::vector3(dist, 0, 0)); } - } + } // vehicle within 50m // Winger 160204 - podnoszenie pantografow @@ -917,6 +874,19 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) if (smWahacze[i]) smWahacze[i]->SetRotate(float3(1, 0, 0), fWahaczeAmp * cos(MoverParameters->eAngle)); + + // cooling shutters + // NOTE: shutters display _on state when they're closed, _off otherwise + if( ( true == MoverParameters->dizel_heat.water.config.shutters ) + && ( false == MoverParameters->dizel_heat.zaluzje1 ) ) { + btShutters1.Turn( true ); + btnOn = true; + } + if( ( true == MoverParameters->dizel_heat.water_aux.config.shutters ) + && ( false == MoverParameters->dizel_heat.zaluzje2 ) ) { + btShutters2.Turn( true ); + btnOn = true; + } if( ( Mechanik != nullptr ) && ( Mechanik->GetAction() != actSleep ) ) { @@ -927,7 +897,9 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) btnOn = true; } } - } + + } // vehicle within 400m + if( MoverParameters->Battery || MoverParameters->ConverterFlag ) { // sygnały czoła pociagu //Ra: wyświetlamy bez // ograniczeń odległości, by były widoczne z @@ -992,6 +964,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) sectionchunk = sectionchunk->NextGet(); } } + } // ABu 29.01.05 koniec przeklejenia ************************************* @@ -2102,6 +2075,12 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" iInventory[ side::rear ] |= btHeadSignals23.Active() ? light::headlight_right : 0; btMechanik1.Init( "mechanik1", mdLowPolyInt, false); btMechanik2.Init( "mechanik2", mdLowPolyInt, false); + if( MoverParameters->dizel_heat.water.config.shutters ) { + btShutters1.Init( "shutters1", mdModel, false ); + } + if( MoverParameters->dizel_heat.water_aux.config.shutters ) { + btShutters1.Init( "shutters2", mdModel, false ); + } TurnOff(); // resetowanie zmiennych submodeli if( mdLowPolyInt != nullptr ) { @@ -3740,6 +3719,8 @@ void TDynamicObject::TurnOff() btHeadSignals23.Turn( false ); btMechanik1.Turn( false ); btMechanik2.Turn( false ); + btShutters1.Turn( false ); + btShutters2.Turn( false ); }; // przeliczanie dźwięków, bo będzie słychać bez wyświetlania sektora z pojazdem @@ -3768,7 +3749,7 @@ void TDynamicObject::RenderSounds() { sConverter.stop(); } - if( MoverParameters->VeselVolume > 0 ) { + if( MoverParameters->CompressorSpeed > 0.0 ) { // McZapkie! - dzwiek compressor.wav tylko gdy dziala sprezarka if( MoverParameters->CompressorFlag ) { sCompressor.play( sound_flags::exclusive | sound_flags::looping ); @@ -4963,6 +4944,18 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.rsWentylator.m_frequencyfactor /= MoverParameters->RVentnmax; } + else if( token == "radiatorfan1:" ) { + // primary circuit radiator fan + m_powertrainsounds.radiator_fan.deserialize( parser, sound_type::single ); + m_powertrainsounds.radiator_fan.owner( this ); + } + + else if( token == "radiatorfan2" ) { + // auxiliary circuit radiator fan + m_powertrainsounds.radiator_fan.deserialize( parser, sound_type::single ); + m_powertrainsounds.radiator_fan.owner( this ); + } + else if( token == "transmission:" ) { // plik z dzwiekiem, mnozniki i ofsety amp. i czest. // NOTE, fixed default parameters, legacy system leftover @@ -5958,8 +5951,9 @@ TDynamicObject::powertrain_sounds::position( glm::vec3 const Location ) { auto const nullvector { glm::vec3() }; std::vector enginesounds = { - &motor_relay, &dsbWejscie_na_bezoporow, &motor_parallel, &rsWentylator, - &engine, &engine_ignition, &engine_revving, &engine_turbo, + &inverter, + &motor_relay, &dsbWejscie_na_bezoporow, &motor_parallel, &motor_shuntfield, &rsWentylator, + &engine, &engine_ignition, &engine_revving, &engine_turbo, &oil_pump, &radiator_fan, &radiator_fan_aux, &transmission, &rsEngageSlippery }; for( auto sound : enginesounds ) { @@ -6185,7 +6179,6 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub // motor sounds volume = 0.0; if( ( true == Vehicle.Mains ) - && ( false == Vehicle.dizel_ignition ) && ( false == motors.empty() ) ) { if( std::fabs( Vehicle.enrot ) > 0.01 ) { @@ -6279,7 +6272,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( Vehicle.EngineType == ElectricInductionMotor ) { if( Vehicle.InverterFrequency > 0.1 ) { - volume = inverter.m_amplitudeoffset + inverter.m_amplitudefactor * std::sqrt( std::fabs( Vehicle.dizel_fill ) ); + volume = inverter.m_amplitudeoffset + inverter.m_amplitudefactor * std::sqrt( std::abs( Vehicle.dizel_fill ) ); inverter .pitch( inverter.m_frequencyoffset + inverter.m_frequencyfactor * Vehicle.InverterFrequency ) @@ -6302,6 +6295,35 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub // ...otherwise shut down the sound rsWentylator.stop(); } + // radiator fan sounds + if( ( Vehicle.EngineType == DieselEngine ) + || ( Vehicle.EngineType == DieselElectric ) ) { + + if( Vehicle.dizel_heat.rpmw > 0.1 ) { + // NOTE: fan speed tends to max out at ~100 rpm; by default we try to get pitch range of 0.5-1.5 and volume range of 0.5-1.0 + radiator_fan + .pitch( 0.5 + radiator_fan.m_frequencyoffset + radiator_fan.m_frequencyfactor * Vehicle.dizel_heat.rpmw * 0.01 ) + .gain( 0.5 + radiator_fan.m_amplitudeoffset + 0.5 * radiator_fan.m_amplitudefactor * Vehicle.dizel_heat.rpmw * 0.01 ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + // ...otherwise shut down the sound + radiator_fan.stop(); + } + + if( Vehicle.dizel_heat.rpmw2 > 0.1 ) { + // NOTE: fan speed tends to max out at ~100 rpm; by default we try to get pitch range of 0.5-1.5 and volume range of 0.5-1.0 + radiator_fan_aux + .pitch( 0.5 + radiator_fan_aux.m_frequencyoffset + radiator_fan_aux.m_frequencyfactor * Vehicle.dizel_heat.rpmw2 * 0.01 ) + .gain( 0.5 + radiator_fan_aux.m_amplitudeoffset + 0.5 * radiator_fan_aux.m_amplitudefactor * Vehicle.dizel_heat.rpmw2 * 0.01 ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + // ...otherwise shut down the sound + radiator_fan_aux.stop(); + } + } + // relay sounds auto const soundflags { Vehicle.SoundFlag }; if( TestFlag( soundflags, sound::relay ) ) { diff --git a/DynObj.h b/DynObj.h index 0eb826e2..3ab1373b 100644 --- a/DynObj.h +++ b/DynObj.h @@ -322,6 +322,8 @@ private: sound_source engine_turbo { sound_placement::engine }; double engine_turbo_pitch { 1.0 }; sound_source oil_pump { sound_placement::engine }; + sound_source radiator_fan { sound_placement::engine }; + sound_source radiator_fan_aux { sound_placement::engine }; sound_source transmission { sound_placement::engine }; sound_source rsEngageSlippery { sound_placement::engine }; // moved from cab @@ -371,6 +373,8 @@ private: TButton btHeadSignals23; TButton btMechanik1; TButton btMechanik2; + TButton btShutters1; // cooling shutters for primary water circuit + TButton btShutters2; // cooling shutters for auxiliary water circuit double dRailLength { 0.0 }; std::vector m_axlesounds; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index d16bac76..4caeffdc 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7800,8 +7800,9 @@ void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { DeltaPipePress = HighPipePress - LowPipePress; extract_value( VeselVolume, "Vv", line, "" ); +/* if( VeselVolume == 0.0 ) { VeselVolume = 0.01; } - +*/ extract_value( MinCompressor, "MinCP", line, "" ); extract_value( MaxCompressor, "MaxCP", line, "" ); extract_value( CompressorSpeed, "CompressorSpeed", line, "" ); diff --git a/Train.cpp b/Train.cpp index ad0f59b3..527c9889 100644 --- a/Train.cpp +++ b/Train.cpp @@ -759,7 +759,7 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con // on press or hold if( Train->mvControlled->ShuntMode ) { Train->mvControlled->AnPos = clamp( - Train->mvControlled->AnPos + ( Command.time_delta * 2.0 ), + Train->mvControlled->AnPos + 0.025, 0.0, 1.0 ); } else { @@ -820,7 +820,7 @@ void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data con // on press or hold if( Train->mvControlled->ShuntMode ) { Train->mvControlled->AnPos = clamp( - Train->mvControlled->AnPos - ( Command.time_delta * 2.0 ), + Train->mvControlled->AnPos - 0.025, 0.0, 1.0 ); } Train->mvControlled->DecScndCtrl( 1 ); @@ -7045,6 +7045,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con auto &gauge = Cabine[Cabindex].Gauge(-1); // pierwsza wolna gałka gauge.Load(Parser, DynamicObject, DynamicObject->mdKabina); gauge.AssignDouble(&mvControlled->AnPos); + m_controlmapper.insert( gauge, "shuntmodepower:" ); } else { diff --git a/mouseinput.cpp b/mouseinput.cpp index 5e4ea8ee..6d8bbda2 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -215,6 +215,9 @@ mouse_input::default_bindings() { { "scndctrl:", { user_command::secondcontrollerincrease, user_command::secondcontrollerdecrease } }, + { "shuntmodepower:", { + user_command::secondcontrollerincrease, + user_command::secondcontrollerdecrease } }, { "dirkey:", { user_command::reverserincrease, user_command::reverserdecrease } }, diff --git a/translation.h b/translation.h index d60c3fef..d48cd8ce 100644 --- a/translation.h +++ b/translation.h @@ -20,6 +20,7 @@ std::string static std::unordered_map m_cabcontrols = { { "mainctrl:", "master controller" }, { "scndctrl:", "second controller" }, + { "shuntmodepower:", "shunt mode power" }, { "dirkey:" , "reverser" }, { "brakectrl:", "train brake" }, { "localbrake:", "independent brake" }, diff --git a/version.h b/version.h index 85730745..4af1a0c5 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 418 +#define VERSION_MINOR 419 #define VERSION_REVISION 0 From beede908856cc9cb3da18d5502eab62717c0e0dd Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 21 Apr 2018 14:38:02 +0200 Subject: [PATCH 311/426] train timetable rewind fix --- Driver.cpp | 82 ++++++++++++++++++++++++---------------------- McZapkie/Mover.cpp | 27 ++++++++------- mtable.cpp | 55 ++++++++++++++----------------- mtable.h | 2 +- 4 files changed, 82 insertions(+), 84 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 38d5c3a7..857202e3 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -815,8 +815,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN { // porównuje do następnej stacji, więc trzeba przewinąć do poprzedniej // nastepnie ustawić następną na aktualną tak żeby prawidłowo ją obsłużył w następnym kroku - TrainParams->RewindTimeTable(sSpeedTable[i].evEvent->CommandGet()); - asNextStop = TrainParams->NextStop(); + if( true == TrainParams->RewindTimeTable( sSpeedTable[ i ].evEvent->CommandGet() ) ) { + asNextStop = TrainParams->NextStop(); + iStationStart = TrainParams->StationIndex; + } } else if( sSpeedTable[ i ].fDist < -fLength ) { // jeśli został przejechany @@ -996,13 +998,13 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN #endif asNextStop = TrainParams->NextStop(); // informacja o końcu trasy TrainParams->NewName("none"); // czyszczenie nieaktualnego rozkładu - // TableClear(); //aby od nowa sprawdziło W4 z inną nazwą już - to - // nie jest dobry pomysł - iDrivigFlags &= - ~(moveStopCloser | - moveStopPoint); // ma nie podjeżdżać pod W4 i ma je pomijać - sSpeedTable[i].iFlags = - 0; // W4 nie liczy się już (nie wyśle SetVelocity) + // ma nie podjeżdżać pod W4 i ma je pomijać + iDrivigFlags &= ~( moveStopCloser ); + if( false == TestFlag( iDrivigFlags, movePushPull ) ) { + // if the consist can change direction through a simple cab change it doesn't need fiddling with recognition of passenger stops + iDrivigFlags &= ~( moveStopPoint ); + } + sSpeedTable[i].iFlags = 0; // W4 nie liczy się już (nie wyśle SetVelocity) sSpeedTable[i].fVelNext = -1; // można jechać za W4 fLastStopExpDist = -1.0f; // nie ma rozkładu, nie ma usuwania stacji WaitingSet(60); // tak ze 2 minuty, aż wszyscy wysiądą @@ -3271,8 +3273,7 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N // CheckVehicles(); //sprawdzenie składu, AI zapali światła TableClear(); // wyczyszczenie tabelki prędkości, bo na nowo trzeba określić kierunek i // sprawdzić przystanki - OrdersInit( - fabs(NewValue1)); // ustalenie tabelki komend wg rozkładu oraz prędkości początkowej + OrdersInit(fabs(NewValue1)); // ustalenie tabelki komend wg rozkładu oraz prędkości początkowej // if (NewValue1!=0.0) if (!AIControllFlag) DirectionForward(NewValue1>0.0); //ustawienie // nawrotnika użytkownikowi (propaguje się do członów) // if (NewValue1>0) @@ -5375,8 +5376,6 @@ inline TOrders TController::OrderNextGet() void TController::OrdersInit(double fVel) { // wypełnianie tabelki rozkazów na podstawie rozkładu // ustawienie kolejności komend, niezależnie kto prowadzi - // Mechanik->OrderPush(Wait_for_orders); //czekanie na lepsze czasy - // OrderPos=OrderTop=0; //wypełniamy od pozycji 0 OrdersClear(); // usunięcie poprzedniej tabeli OrderPush(Prepare_engine); // najpierw odpalenie silnika if (TrainParams->TrainName == "none") @@ -5390,16 +5389,14 @@ void TController::OrdersInit(double fVel) OrderPush(Shunt); // dla prędkości 0.01 włączamy jazdę manewrową else if (TrainParams ? (TrainParams->DirectionChange() ? // jeśli obrót na pierwszym przystanku - ((iDrivigFlags & - movePushPull) ? // SZT również! SN61 zależnie od wagonów... + ((iDrivigFlags & movePushPull) ? // SZT również! SN61 zależnie od wagonów... (TrainParams->TimeTable[1].StationName == TrainParams->Relation1) : false) : false) : true) OrderPush(Shunt); // a teraz start będzie w manewrowym, a tryb pociągowy włączy W4 else - // jeśli start z pierwszej stacji i jednocześnie jest na niej zmiana kierunku, to EZT ma - // mieć Shunt + // jeśli start z pierwszej stacji i jednocześnie jest na niej zmiana kierunku, to EZT ma mieć Shunt OrderPush(Obey_train); // dla starych scenerii start w trybie pociagowym if (DebugModeFlag) // normalnie nie ma po co tego wypisywać WriteLog("/* Timetable: " + TrainParams->ShowRelation()); @@ -5407,10 +5404,14 @@ void TController::OrdersInit(double fVel) for (int i = 0; i <= TrainParams->StationCount; ++i) { t = TrainParams->TimeTable + i; - if (DebugModeFlag) // normalnie nie ma po co tego wypisywa? - WriteLog(t->StationName + " " + std::to_string(t->Ah) + ":" + - std::to_string(t->Am) + ", " + std::to_string(t->Dh) + ":" + - std::to_string(t->Dm) + " " + t->StationWare); + if (DebugModeFlag) { + // normalnie nie ma po co tego wypisywa? + WriteLog( + t->StationName + + " " + std::to_string(t->Ah) + ":" + std::to_string(t->Am) + + ", " + std::to_string(t->Dh) + ":" + std::to_string(t->Dm) + + " " + t->StationWare); + } if (t->StationWare.find('@') != std::string::npos) { // zmiana kierunku i dalsza jazda wg rozk?adu if (iDrivigFlags & movePushPull) // SZT również! SN61 zależnie od wagonów... @@ -5421,33 +5422,34 @@ void TController::OrdersInit(double fVel) { // dla zwykłego składu wagonowego odczepiamy lokomotywę OrderPush(Disconnect); // odczepienie lokomotywy OrderPush(Shunt); // a dalej manewry - if (i <= TrainParams->StationCount) // 130827: to się jednak nie sprawdza - { //"@" na ostatniej robi tylko odpięcie - // OrderPush(Change_direction); //zmiana kierunku - // OrderPush(Shunt); //jazda na drugą stronę składu - // OrderPush(Change_direction); //zmiana kierunku - // OrderPush(Connect); //jazda pod wagony - } } if (i < TrainParams->StationCount) // jak nie ostatnia stacja OrderPush(Obey_train); // to dalej wg rozkładu } } - if (DebugModeFlag) // normalnie nie ma po co tego wypisywać - WriteLog("*/"); + if( DebugModeFlag ) { + // normalnie nie ma po co tego wypisywać + WriteLog( "*/" ); + } OrderPush(Shunt); // po wykonaniu rozkładu przełączy się na manewry } // McZapkie-100302 - to ma byc wyzwalane ze scenerii - if (fVel == 0.0) - SetVelocity(0, 0, stopSleep); // jeśli nie ma prędkości początkowej, to śpi - else - { // jeśli podana niezerowa prędkość - if ((fVel >= 1.0) || - (fVel < 0.02)) // jeśli ma jechać - dla 0.01 ma podjechać manewrowo po podaniu sygnału - iDrivigFlags = (iDrivigFlags & ~moveStopHere) | - moveStopCloser; // to do następnego W4 ma podjechać blisko - else - iDrivigFlags |= moveStopHere; // czekać na sygnał + if( fVel == 0.0 ) { + // jeśli nie ma prędkości początkowej, to śpi + SetVelocity( 0, 0, stopSleep ); + } + else { + // jeśli podana niezerowa prędkość + if( ( fVel >= 1.0 ) + || ( fVel < 0.02 ) ) { + // jeśli ma jechać - dla 0.01 ma podjechać manewrowo po podaniu sygnału + // to do następnego W4 ma podjechać blisko + iDrivigFlags = ( iDrivigFlags & ~( moveStopHere ) ) | moveStopCloser; + } + else { + // czekać na sygnał + iDrivigFlags |= moveStopHere; + } JumpToFirstOrder(); if (fVel >= 1.0) // jeśli ma jechać SetVelocity(fVel, -1); // ma ustawić żądaną prędkość diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 4caeffdc..a50487d4 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1479,6 +1479,7 @@ void TMoverParameters::compute_movement_( double const Deltatime ) { } } // uklady hamulcowe: + ConverterCheck( Deltatime ); if (VeselVolume > 0) Compressor = CompressedVolume / VeselVolume; else @@ -1486,7 +1487,6 @@ void TMoverParameters::compute_movement_( double const Deltatime ) { Compressor = 0; CompressorFlag = false; }; - ConverterCheck(Deltatime); if( CompressorSpeed > 0.0 ) { // sprężarka musi mieć jakąś niezerową wydajność żeby rozważać jej załączenie i pracę CompressorCheck( Deltatime ); @@ -3791,17 +3791,12 @@ void TMoverParameters::UpdateScndPipePressure(double dt) } Pipe2->Flow(Hamulec->GetHPFlow(ScndPipePress, dt)); -/* // NOTE: condition disabled to allow the air flow from the main hose to the main tank as well - if (((Compressor > ScndPipePress) && (CompressorSpeed > 0.0001)) || (TrainType == dt_EZT)) - { -*/ + if( /* ( ( Compressor > ScndPipePress ) && ( */ VeselVolume > 0.0 /* ) ) || ( TrainType == dt_EZT ) || ( TrainType == dt_DMU ) */ ) { dV = PF(Compressor, ScndPipePress, Spz) * dt; CompressedVolume += dV / 1000.0; Pipe2->Flow(-dV); -/* } -*/ Pipe2->Flow(dv1 + dv2); Pipe2->Act(); ScndPipePress = Pipe2->P(); @@ -8864,9 +8859,10 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) WriteLog( "Ready to depart" ); CompressedVolume = VeselVolume * MinCompressor * ( 9.8 ) / 10.0; ScndPipePress = ( - VeselVolume > 0.0 ? - CompressedVolume / VeselVolume : - 0.0 ); + VeselVolume > 0.0 ? CompressedVolume / VeselVolume : + ( Couplers[ side::front ].AllowedFlag & coupling::mainhose ) != 0 ? 5.0 : + ( Couplers[ side::rear ].AllowedFlag & coupling::mainhose ) != 0 ? 5.0 : + 0.0 ); PipePress = CntrlPipePress; BrakePress = 0.0; LocalBrakePos = 0; @@ -8889,7 +8885,14 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) WriteLog( "Braked" ); Volume = BrakeVVolume * MaxBrakePress[ 3 ]; CompressedVolume = VeselVolume * MinCompressor * 0.55; +/* ScndPipePress = 5.1; +*/ + ScndPipePress = ( + VeselVolume > 0.0 ? CompressedVolume / VeselVolume : + ( Couplers[ side::front ].AllowedFlag & coupling::mainhose ) != 0 ? 5.1 : + ( Couplers[ side::rear ].AllowedFlag & coupling::mainhose ) != 0 ? 5.1 : + 0.0 ); PipePress = LowPipePress; PipeBrakePress = MaxBrakePress[ 3 ] * 0.5; BrakePress = MaxBrakePress[ 3 ] * 0.5; @@ -8957,9 +8960,9 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) CompressorPower = 0; Hamulec->Init(PipePress, HighPipePress, LowPipePress, BrakePress, BrakeDelayFlag); - +/* ScndPipePress = Compressor; - +*/ // WriteLogSS("OK=", BoolTo10(OK)); // WriteLog(""); diff --git a/mtable.cpp b/mtable.cpp index 0cc1870d..90e77d9d 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -83,8 +83,7 @@ bool TTrainParameters::UpdateMTable(double hh, double mm, std::string const &New { if (NewName == NextStationName) // jeśli dojechane do następnego { // Ra: wywołanie może być powtarzane, jak stoi na W4 - if (TimeTable[StationIndex + 1].km - TimeTable[StationIndex].km < - 0) // to jest bez sensu + if (TimeTable[StationIndex + 1].km - TimeTable[StationIndex].km < 0) // to jest bez sensu Direction = -1; else Direction = 1; // prowizorka bo moze byc zmiana kilometrazu @@ -92,46 +91,40 @@ bool TTrainParameters::UpdateMTable(double hh, double mm, std::string const &New LastStationLatency = CompareTime(hh, mm, TimeTable[StationIndex].Dh, TimeTable[StationIndex].Dm); // inc(StationIndex); //przejście do następnej pozycji StationIndex<=StationCount - if (StationIndex < - StationCount) // Ra: "<", bo dodaje 1 przy przejściu do następnej stacji - { // jeśli nie ostatnia stacja + // Ra: "<", bo dodaje 1 przy przejściu do następnej stacji + if (StationIndex < StationCount) { + // jeśli nie ostatnia stacja NextStationName = TimeTable[StationIndex + 1].StationName; // zapamiętanie nazwy - TTVmax = TimeTable[StationIndex + 1] - .vmax; // Ra: nowa prędkość rozkładowa na kolejnym odcinku + // Ra: nowa prędkość rozkładowa na kolejnym odcinku + TTVmax = TimeTable[StationIndex + 1].vmax; + } + else { + // gdy ostatnia stacja, nie ma następnej stacji + NextStationName = ""; } - else // gdy ostatnia stacja - NextStationName = ""; // nie ma następnej stacji OK = true; } } return OK; /*czy jest nastepna stacja*/ } -void Mtable::TTrainParameters::RewindTimeTable(std::string actualStationName) -{ - //actualStationName = ToLower(actualStationName); // na małe znaki - if (int s = actualStationName.find("PassengerStopPoint:") != std::string::npos) - { - actualStationName = ToLower(actualStationName.substr(s + 19)); +bool Mtable::TTrainParameters::RewindTimeTable(std::string actualStationName) { + + if( actualStationName.compare( 0, 19, "PassengerStopPoint:" ) == 0 ) { + actualStationName = ToLower( actualStationName.substr( 19 ) ); } - for (int i = 1; i <= StationCount; i++) - { // przechodzimy po całej tabelce i sprawdzamy nazwy stacji (bez pierwszej) - if (ToLower(TimeTable[i].StationName) == actualStationName) - { // nazwa stacji zgodna - // więc ustawiamy na poprzednią, żeby w następnym kroku poprawnie obsłużyć - StationIndex = i - 1; - if (StationIndex < - StationCount) // Ra: "<", bo dodaje 1 przy przejściu do następnej stacji - { // jeśli nie ostatnia stacja - NextStationName = TimeTable[StationIndex + 1].StationName; // zapamiętanie nazwy - TTVmax = TimeTable[StationIndex + 1] - .vmax; // Ra: nowa prędkość rozkładowa na kolejnym odcinku - } - else // gdy ostatnia stacja - NextStationName = ""; // nie ma następnej stacji - break; // znaleźliśmy więc kończymy + for( auto i = 1; i <= StationCount; ++i ) { + // przechodzimy po całej tabelce i sprawdzamy nazwy stacji (bez pierwszej) + if (ToLower(TimeTable[i].StationName) == actualStationName) { + // nazwa stacji zgodna więc ustawiamy na poprzednią, żeby w następnym kroku poprawnie obsłużyć + StationIndex = i; + NextStationName = TimeTable[ i ].StationName; + TTVmax = TimeTable[ i ].vmax; + return true; // znaleźliśmy więc kończymy } } + // failed to find a match + return false; } void TTrainParameters::StationIndexInc() diff --git a/mtable.h b/mtable.h index a456cffc..458162a2 100644 --- a/mtable.h +++ b/mtable.h @@ -77,7 +77,7 @@ class TTrainParameters bool IsTimeToGo(double hh, double mm); bool UpdateMTable(double hh, double mm, std::string const &NewName); bool UpdateMTable( simulation_time const &Time, std::string const &NewName ); - void RewindTimeTable( std::string actualStationName ); + bool RewindTimeTable( std::string actualStationName ); TTrainParameters( std::string const &NewTrainName ); void NewName(std::string const &NewTrainName); void UpdateVelocity(int StationCount, double vActual); From 92e4b0d653c78ddc99703097c55948fc0faff2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Thu, 19 Apr 2018 22:48:30 +0200 Subject: [PATCH 312/426] Speed control fix for AI --- Driver.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 857202e3..9953ad8b 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2750,12 +2750,12 @@ bool TController::IncSpeed() OK = mvControlling->IncMainCtrl(std::max(1,mvOccupied->MainCtrlPosNo/10)); //tutaj jeszcze powinien być tempomat - double SpeedCntrl = VelDesired; + double SpeedCntrlVel = VelDesired; if (fProximityDist < 50) { - SpeedCntrl = std::min(SpeedCntrl, VelNext); + SpeedCntrlVel = std::min(SpeedCntrlVel, VelNext); } - this->SpeedCntrl(SpeedCntrl); + SpeedCntrl(SpeedCntrlVel); } break; @@ -2817,15 +2817,6 @@ bool TController::DecSpeed(bool force) break; case ElectricInductionMotor: OK = mvControlling->DecMainCtrl(1); - if ((mvControlling->ScndCtrlPosNo > 0)&&(mvControlling->Mains)) //jeżeli tempomat - { - mvControlling->IncScndCtrl(1); - mvControlling->RunCommand("SpeedCntrl", VelDesired, mvControlling->CabNo); - } - else - { - mvControlling->DecScndCtrl(2); - } break; case WheelsDriven: if (!mvControlling->CabNo) From 0a938047687818b7d758405d040d55d033fb0277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sat, 21 Apr 2018 12:31:42 +0200 Subject: [PATCH 313/426] Fix for AI to use MHZ_EN57 properly --- Driver.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 9953ad8b..09a065b9 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1840,6 +1840,12 @@ void TController::AutoRewident() fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 1 * fBrake_a1[BrakeAccTableSize]; fBrakeReaction = 1.00 + fLength*0.005; } + for (int i = 1; i <= 8; i *= 2) //ustawianie trybu pracy zadajnika hamulca, wystarczy raz po inicjalizacji AI + { + if ((mvOccupied->BrakeOpModes & i) > 0) { + mvOccupied->BrakeOpModeFlag = i; + } + } } double TController::ESMVelocity(bool Main) @@ -2564,7 +2570,13 @@ bool TController::IncBrake() } case ElectroPneumatic: { if( mvOccupied->EngineType == ElectricInductionMotor ) { - OK = mvOccupied->IncLocalBrakeLevel( 1 ); + if (mvOccupied->BrakeHandle == MHZ_EN57) { + if (mvOccupied->BrakeCtrlPos < mvOccupied->Handle->GetPos(bh_FB)) + OK = mvOccupied->BrakeLevelAdd(1.0); + } + else { + OK = mvOccupied->IncLocalBrakeLevel(1); + } } else if( mvOccupied->fBrakeCtrlPos != mvOccupied->Handle->GetPos( bh_EPB ) ) { mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_EPB ) ); @@ -2612,10 +2624,15 @@ bool TController::DecBrake() Need_BrakeRelease = true; break; case ElectroPneumatic: - if (mvOccupied->EngineType == ElectricInductionMotor) - { - OK = mvOccupied->DecLocalBrakeLevel(1); - } + if (mvOccupied->EngineType == ElectricInductionMotor) { + if (mvOccupied->BrakeHandle == MHZ_EN57) { + if (mvOccupied->BrakeCtrlPos > mvOccupied->Handle->GetPos(bh_MB)) + OK = mvOccupied->BrakeLevelAdd(-1.0); + } + else { + OK = mvOccupied->DecLocalBrakeLevel(1); + } + } else if (mvOccupied->fBrakeCtrlPos != mvOccupied->Handle->GetPos(bh_EPR)) { mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_EPR)); From 2afae2787328f0282bb535774c4555503a263f73 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 22 Apr 2018 16:17:25 +0200 Subject: [PATCH 314/426] minor tweaks and bug fixes --- Driver.cpp | 20 +++++++++++--------- McZapkie/Mover.cpp | 8 ++++---- keyboardinput.cpp | 4 ++-- uilayer.cpp | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 09a065b9..c8f71f9f 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -854,17 +854,19 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } // koniec obsługi przelotu na W4 else { // zatrzymanie na W4 - if (!eSignNext) //jeśli nie widzi następnego sygnału - eSignNext = sSpeedTable[i].evEvent; //ustawia dotychczasową - if (mvOccupied->Vel > 0.3) // jeśli jedzie (nie trzeba czekać, aż się - // drgania wytłumią - drzwi zamykane od 1.0) - sSpeedTable[i].fVelNext = 0; // to będzie zatrzymanie - // else if - // ((iDrivigFlags&moveStopCloser)?sSpeedTable[i].fDist<=fMaxProximityDist*(AIControllFlag?1.0:10.0):true) + if( !eSignNext ) { + //jeśli nie widzi następnego sygnału ustawia dotychczasową + eSignNext = sSpeedTable[ i ].evEvent; + } + if( mvOccupied->Vel > 0.3 ) { + // jeśli jedzie (nie trzeba czekać, aż się drgania wytłumią - drzwi zamykane od 1.0) to będzie zatrzymanie + sSpeedTable[ i ].fVelNext = 0; + } else if ((iDrivigFlags & moveStopCloser) ? sSpeedTable[i].fDist + fLength <= - Max0R(sSpeedTable[i].evEvent->ValueGet(2), - fMaxProximityDist + fLength) : + std::max( + sSpeedTable[i].evEvent->ValueGet(2), + 2.0 * fMaxProximityDist + fLength) : // fmaxproximitydist typically equals ~50 m sSpeedTable[i].fDist < d_to_next_sem) // Ra 2F1I: odległość plus długość pociągu musi być mniejsza od długości // peronu, chyba że pociąg jest dłuższy, to wtedy minimalna diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index a50487d4..e647a0e8 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3331,7 +3331,7 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if( Couplers[ side::rear ].Connected != NULL ) { CompressorFlag = ( - ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( Couplers[ side::rear ].Connected->CompressorAllow ) || ( CompressorStart == start::automatic ) ) && ( CompressorAllowLocal ) && ( Couplers[ side::rear ].Connected->ConverterFlag ) ); } @@ -3344,7 +3344,7 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if( Couplers[ side::front ].Connected != NULL ) { CompressorFlag = ( - ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( Couplers[ side::front ].Connected->CompressorAllow ) || ( CompressorStart == start::automatic ) ) && ( CompressorAllowLocal ) && ( Couplers[ side::front ].Connected->ConverterFlag ) ); } @@ -3407,7 +3407,7 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if( Couplers[ side::rear ].Connected != NULL ) { CompressorFlag = ( - ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( Couplers[ side::rear ].Connected->CompressorAllow ) || ( CompressorStart == start::automatic ) ) && ( CompressorAllowLocal ) && ( Couplers[ side::rear ].Connected->ConverterFlag ) ); } @@ -3420,7 +3420,7 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if( Couplers[ side::front ].Connected != NULL ) { CompressorFlag = ( - ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( Couplers[ side::front ].Connected->CompressorAllow ) || ( CompressorStart == start::automatic ) ) && ( CompressorAllowLocal ) && ( Couplers[ side::front ].Connected->ConverterFlag ) ); } diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 76d5da28..e092e5c9 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -334,9 +334,9 @@ keyboard_input::default_bindings() { // epbrakecontroltoggle { GLFW_KEY_Z | keymodifier::control }, // trainbrakeoperationmodeincrease - { GLFW_KEY_KP_3 | keymodifier::shift | keymodifier::control }, + { GLFW_KEY_KP_2 | keymodifier::control }, // trainbrakeoperationmodedecrease - { GLFW_KEY_KP_9 | keymodifier::shift | keymodifier::control }, + { GLFW_KEY_KP_8 | keymodifier::control }, // brakeactingspeedincrease { GLFW_KEY_B | keymodifier::shift }, // brakeactingspeeddecrease diff --git a/uilayer.cpp b/uilayer.cpp index 21b71d02..0898df17 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -429,7 +429,7 @@ ui_layer::update() { uitextline2 += ( vehicle->MoverParameters->OilPump.is_active ? "O" : ( vehicle->MoverParameters->OilPump.is_enabled ? "o" : "." ) ); uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); - uitextline2 += ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorPower > 1 ) ? ( vehicle->MoverParameters->CompressorFlag ? "C" : "c" ) : "." ) ); + uitextline2 += ( vehicle->MoverParameters->CompressorFlag ? "C" : ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorStart == start::automatic ) ? "c" : "." ) ) ); uitextline2 += ( vehicle->MoverParameters->CompressorGovernorLock ? "!" : "." ); auto const train { Global.pWorld->train() }; From c57f0097d34ca42f9697ba20708f6060c249e698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sat, 21 Apr 2018 22:15:20 +0200 Subject: [PATCH 315/426] Fix in AI DecBrake() for MHZ_EN57 --- Driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Driver.cpp b/Driver.cpp index c8f71f9f..c1ac9334 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2628,7 +2628,7 @@ bool TController::DecBrake() case ElectroPneumatic: if (mvOccupied->EngineType == ElectricInductionMotor) { if (mvOccupied->BrakeHandle == MHZ_EN57) { - if (mvOccupied->BrakeCtrlPos > mvOccupied->Handle->GetPos(bh_MB)) + if (mvOccupied->BrakeCtrlPos > mvOccupied->Handle->GetPos(bh_RP)) OK = mvOccupied->BrakeLevelAdd(-1.0); } else { From 64ffdbf690932d7fcee99d4150274320af964ec2 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 23 Apr 2018 02:45:36 +0200 Subject: [PATCH 316/426] passenger stop ai logic tweaks, engine turbo sound volume change rate unification --- Driver.cpp | 114 +++++++++++++++++++++++++++-------------------------- DynObj.cpp | 37 +++++++---------- 2 files changed, 72 insertions(+), 79 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index c1ac9334..3c165ca6 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -797,6 +797,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN double v; // prędkość double d; // droga double d_to_next_sem = 10000.0; //ustaiwamy na pewno dalej niż widzi AI + bool isatpassengerstop { false }; // true if the consist is within acceptable range of w4 post TCommandType go = cm_Unknown; eSignNext = NULL; // te flagi są ustawiane tutaj, w razie potrzeby @@ -852,8 +853,20 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN continue; // nie analizować prędkości } } // koniec obsługi przelotu na W4 - else - { // zatrzymanie na W4 + else { + // zatrzymanie na W4 + isatpassengerstop = ( + // Ra 2F1I: odległość plus długość pociągu musi być mniejsza od długości + // peronu, chyba że pociąg jest dłuższy, to wtedy minimalna. + // jeśli długość peronu ((sSpeedTable[i].evEvent->ValueGet(2)) nie podana, + // przyjąć odległość fMinProximityDist + ( iDrivigFlags & moveStopCloser ) ? + ( sSpeedTable[ i ].fDist + fLength ) <= + std::max( + sSpeedTable[ i ].evEvent->ValueGet( 2 ), + 2.0 * fMaxProximityDist + fLength ) : // fmaxproximitydist typically equals ~50 m + sSpeedTable[ i ].fDist < d_to_next_sem ); + if( !eSignNext ) { //jeśli nie widzi następnego sygnału ustawia dotychczasową eSignNext = sSpeedTable[ i ].evEvent; @@ -862,17 +875,8 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // jeśli jedzie (nie trzeba czekać, aż się drgania wytłumią - drzwi zamykane od 1.0) to będzie zatrzymanie sSpeedTable[ i ].fVelNext = 0; } - else if ((iDrivigFlags & moveStopCloser) ? - sSpeedTable[i].fDist + fLength <= - std::max( - sSpeedTable[i].evEvent->ValueGet(2), - 2.0 * fMaxProximityDist + fLength) : // fmaxproximitydist typically equals ~50 m - sSpeedTable[i].fDist < d_to_next_sem) - // Ra 2F1I: odległość plus długość pociągu musi być mniejsza od długości - // peronu, chyba że pociąg jest dłuższy, to wtedy minimalna - // jeśli długość peronu ((sSpeedTable[i].evEvent->ValueGet(2)) nie podana, - // przyjąć odległość fMinProximityDist - { // jeśli się zatrzymał przy W4, albo stał w momencie zobaczenia W4 + else if( true == isatpassengerstop ) { + // jeśli się zatrzymał przy W4, albo stał w momencie zobaczenia W4 if( !AIControllFlag ) { // w razie przełączenia na AI ma nie podciągać do W4, gdy użytkownik zatrzymał za daleko iDrivigFlags &= ~moveStopCloser; @@ -881,8 +885,9 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if( ( iDrivigFlags & moveDoorOpened ) == 0 ) { // drzwi otwierać jednorazowo iDrivigFlags |= moveDoorOpened; // nie wykonywać drugi raz - Doors( true, static_cast( std::floor( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) % 10 ); + Doors( true, static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) ) % 10 ); } + if (TrainParams->UpdateMTable( simulation::Time, asNextStop) ) { // to się wykona tylko raz po zatrzymaniu na W4 if( TrainParams->StationIndex < TrainParams->StationCount ) { @@ -892,7 +897,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } // perform loading/unloading - auto const platformside = static_cast( std::floor( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) % 10; + auto const platformside = static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) ) % 10; auto const exchangetime = simulation::Station.update_load( pVehicles[ 0 ], *TrainParams, platformside ); WaitingSet( std::max( -fStopTime, exchangetime ) ); // na końcu rozkładu się ustawia 60s i tu by było skrócenie @@ -936,29 +941,21 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN continue; } } - if (OrderCurrentGet() == Shunt) - { + + if (OrderCurrentGet() == Shunt) { OrderNext(Obey_train); // uruchomić jazdę pociągową CheckVehicles(); // zmienić światła } - if (TrainParams->StationIndex < TrainParams->StationCount) - { // jeśli są dalsze stacje, czekamy do godziny odjazdu - if (TrainParams->IsTimeToGo(simulation::Time.data().wHour, simulation::Time.data().wMinute)) - { // z dalszą akcją czekamy do godziny odjazdu - /* potencjalny problem z ruszaniem z w4 - if (TrainParams->CheckTrainLatency() < 0) - WaitingSet(20); //Jak spóźniony to czeka 20s - */ - // iDrivigFlags|=moveLate1; //oflagować, gdy odjazd ze - // spóźnieniem, będzie jechał forsowniej - fLastStopExpDist = - mvOccupied->DistCounter + 0.050 + - 0.001 * fLength; // przy jakim dystansie (stanie licznika) - // ma przesunąć na następny postój - // Controlled-> //zapisać odległość do przejechania + + if (TrainParams->StationIndex < TrainParams->StationCount) { + // jeśli są dalsze stacje, czekamy do godziny odjazdu + if (TrainParams->IsTimeToGo(simulation::Time.data().wHour, simulation::Time.data().wMinute)) { + // z dalszą akcją czekamy do godziny odjazdu + isatpassengerstop = false; + // przy jakim dystansie (stanie licznika) ma przesunąć na następny postój + fLastStopExpDist = mvOccupied->DistCounter + 0.050 + 0.001 * fLength; TrainParams->StationIndexInc(); // przejście do następnej asNextStop = TrainParams->NextStop(); // pobranie kolejnego miejsca zatrzymania -// TableClear(); //aby od nowa sprawdziło W4 z inną nazwą już - to nie jest dobry pomysł #if LOGSTOPS WriteLog( pVehicle->asName + " as " + TrainParams->TrainName @@ -990,8 +987,8 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN continue; // nie analizować prędkości } // koniec startu z zatrzymania } // koniec obsługi początkowych stacji - else - { // jeśli dojechaliśmy do końca rozkładu + else { + // jeśli dojechaliśmy do końca rozkładu #if LOGSTOPS WriteLog( pVehicle->asName + " as " + TrainParams->TrainName @@ -1026,7 +1023,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN continue; // nie analizować prędkości } } // koniec obsługi W4 - v = sSpeedTable[i].fVelNext; // odczyt prędkości do zmiennej pomocniczej + v = sSpeedTable[ i ].fVelNext; // odczyt prędkości do zmiennej pomocniczej if( sSpeedTable[ i ].iFlags & spSwitch ) { // zwrotnice są usuwane z tabelki dopiero po zjechaniu z nich iDrivigFlags |= moveSwitchFound; // rozjazd z przodu/pod ogranicza np. sens skanowania wstecz @@ -1190,12 +1187,13 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN { // zawalidrogi nie ma (albo pojazd jest samochodem), sprawdzić sygnał if (sSpeedTable[i].iFlags & spShuntSemaphor) // jeśli Tm - w zasadzie to sprawdzić komendę! { // jeśli podana prędkość manewrowa - if ((OrderCurrentGet() & Obey_train) ? v == 0.0 : false) - { // jeśli tryb pociągowy a tarcze ma ShuntVelocity 0 0 + if( ( v == 0.0 ) && ( true == TestFlag( OrderCurrentGet(), Obey_train ) ) ) { + // jeśli tryb pociągowy a tarcze ma ShuntVelocity 0 0 v = -1; // ignorować, chyba że prędkość stanie się niezerowa - if (sSpeedTable[i].iFlags & spElapsed) // a jak przejechana - sSpeedTable[i].iFlags = 0; // to można usunąć, bo podstawowy automat - // usuwa tylko niezerowe + if( true == TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) ) { + // a jak przejechana to można usunąć, bo podstawowy automat usuwa tylko niezerowe + sSpeedTable[ i ].iFlags = 0; + } } else if (go == cm_Unknown) // jeśli jeszcze nie ma komendy if (v != 0.0) // komenda jest tylko gdy ma jechać, bo stoi na podstawie @@ -1269,19 +1267,19 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } } // jeśli nie ma zawalidrogi } // jeśli event - if (v >= 0.0) - { // pozycje z prędkością -1 można spokojnie pomijać + + if (v >= 0.0) { + // pozycje z prędkością -1 można spokojnie pomijać d = sSpeedTable[i].fDist; if( ( d > 0.0 ) && ( false == TestFlag( sSpeedTable[ i ].iFlags, spElapsed ) ) ) { // sygnał lub ograniczenie z przodu (+32=przejechane) // 2014-02: jeśli stoi, a ma do przejechania kawałek, to niech jedzie - if( ( mvOccupied->Vel == 0.0 ) - && ( d > fMaxProximityDist ) - && ( true == TestFlag( sSpeedTable[ i ].iFlags, ( spEnabled | spEvent | spPassengerStopPoint ) ) ) ) { + if( ( mvOccupied->Vel < 0.01 ) + && ( true == TestFlag( sSpeedTable[ i ].iFlags, ( spEnabled | spEvent | spPassengerStopPoint ) ) ) + && ( false == isatpassengerstop ) ) { // ma podjechać bliżej - czy na pewno w tym miejscu taki warunek? - a = ( - iDrivigFlags & moveStopCloser ? + a = ( iDrivigFlags & moveStopCloser ? fAcc : 0.0 ); } @@ -1351,14 +1349,16 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN VelSignalLast = -1.0; // jeśli mieliśmy ograniczenie z semafora i nie ma przed nami //analiza spisanych z tabelki ograniczeń i nadpisanie aktualnego - if (VelSignalLast >= 0.0) - fVelDes = Min0R(fVelDes, VelSignalLast); - if (VelLimitLast >= 0.0) - fVelDes = Min0R(fVelDes, VelLimitLast); - if (VelRoad >= 0.0) - fVelDes = Min0R(fVelDes, VelRoad); - if( VelRestricted >= 0.0 ) - fVelDes = Min0R( fVelDes, VelRestricted ); + if( ( true == isatpassengerstop ) && ( mvOccupied->Vel < 0.01 ) ) { + // if stopped at a valid passenger stop, hold there + fVelDes = 0.0; + } + else { + fVelDes = min_speed( fVelDes, VelSignalLast ); + fVelDes = min_speed( fVelDes, VelLimitLast ); + fVelDes = min_speed( fVelDes, VelRoad ); + fVelDes = min_speed( fVelDes, VelRestricted ); + } // nastepnego semafora albo zwrotnicy to uznajemy, że mijamy W5 FirstSemaphorDist = d_to_next_sem; // przepisanie znalezionej wartosci do zmiennej return go; @@ -4443,6 +4443,8 @@ TController::UpdateSituation(double dt) { } } break; + default: + break; } if( VelNext == 0.0 ) { diff --git a/DynObj.cpp b/DynObj.cpp index df23e13b..888acc47 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -6117,40 +6117,31 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( Vehicle.TurboTest > 0 ) { // udawanie turbo: auto const goalpitch { std::max( 0.025, ( engine_volume + engine_turbo.m_frequencyoffset ) * engine_turbo.m_frequencyfactor ) }; - auto const goalvolume { std::max( 0.0, ( engine_turbo_pitch + engine_turbo.m_amplitudeoffset ) * engine_turbo.m_amplitudefactor ) }; + auto const goalvolume { ( + ( ( Vehicle.MainCtrlPos >= Vehicle.TurboTest ) && ( Vehicle.enrot > 0.1 ) ) ? + std::max( 0.0, ( engine_turbo_pitch + engine_turbo.m_amplitudeoffset ) * engine_turbo.m_amplitudefactor ) : + 0.0 ) }; auto const currentvolume { engine_turbo.gain() }; auto const changerate { 0.4 * Deltatime }; - if( ( Vehicle.MainCtrlPos >= Vehicle.TurboTest ) - && ( Vehicle.enrot > 0.1 ) ) { + engine_turbo_pitch = ( + engine_turbo_pitch > goalpitch ? + std::max( goalpitch, engine_turbo_pitch - changerate * 0.5 ) : + std::min( goalpitch, engine_turbo_pitch + changerate ) ); - engine_turbo_pitch = ( - engine_turbo_pitch > goalpitch ? - std::max( goalpitch, engine_turbo_pitch - changerate * 0.5 ) : - std::min( goalpitch, engine_turbo_pitch + changerate ) ); - - volume = ( - currentvolume > goalvolume ? - std::max( goalvolume, currentvolume - changerate ) : - std::min( goalvolume, currentvolume + changerate ) ); + volume = ( + currentvolume > goalvolume ? + std::max( goalvolume, currentvolume - changerate ) : + std::min( goalvolume, currentvolume + changerate ) ); + if( volume > 0.05 ) { engine_turbo .pitch( 0.4 + engine_turbo_pitch * 0.4 ) .gain( volume ) .play( sound_flags::exclusive | sound_flags::looping ); } else { - engine_turbo_pitch = std::max( goalpitch, engine_turbo_pitch - changerate * 0.5 ); - volume = std::max( 0.0, engine_turbo.gain() - 2.0 * Deltatime ); - if( volume > 0.05 ) { - engine_turbo - .pitch( 0.4 + engine_turbo_pitch * 0.4 ) - .gain( volume ); - } - else { - engine_turbo.stop(); - engine_turbo_pitch = goalpitch; - } + engine_turbo.stop(); } } From 139b49734ee543a8158707852828b33b9910207f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 22 Apr 2018 21:29:58 +0200 Subject: [PATCH 317/426] Adding more parameters for blendingE P and ED brakes --- DynObj.cpp | 10 +++++----- McZapkie/MOVER.h | 10 +++++++++- McZapkie/Mover.cpp | 18 ++++++++++++++++++ 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 888acc47..5cca786c 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2955,7 +2955,7 @@ bool TDynamicObject::Update(double dt, double dt1) p->MoverParameters->BrakeCylNo * p->MoverParameters->BrakeRigEff; FmaxPN += Nmax * p->MoverParameters->Hamulec->GetFC( Nmax / (p->MoverParameters->NAxles * p->MoverParameters->NBpA), - p->MoverParameters->Vmax) * + p->MoverParameters->MED_Vref) * 1000; // sila hamowania pn FmaxED += ((p->MoverParameters->Mains) && (p->MoverParameters->ActiveDir != 0) && (p->MoverParameters->eimc[eimc_p_Fh] * p->MoverParameters->NPoweredAxles > @@ -2974,7 +2974,7 @@ bool TDynamicObject::Update(double dt, double dt1) osie += p->MoverParameters->NAxles; } - auto const amax = FmaxPN / masamax; + auto const amax = std::min(FmaxPN / masamax, MoverParameters->MED_amax); if ((MoverParameters->Vel < 0.5) && (MoverParameters->BrakePress > 0.2) || (dDoorMoveL > 0.001) || (dDoorMoveR > 0.001)) { @@ -3044,7 +3044,7 @@ bool TDynamicObject::Update(double dt, double dt1) FmaxEP[i] = Nmax * p->MoverParameters->Hamulec->GetFC( Nmax / (p->MoverParameters->NAxles * p->MoverParameters->NBpA), - p->MoverParameters->Vmax) * + p->MoverParameters->MED_Vref) * 1000; // sila hamowania pn PrzekrF[i] = false; @@ -3106,10 +3106,10 @@ bool TDynamicObject::Update(double dt, double dt1) p->MoverParameters->BrakeCylMult[0] - p->MoverParameters->BrakeSlckAdj) * p->MoverParameters->BrakeCylNo * p->MoverParameters->BrakeRigEff; + float VelC = ((FrED > 0.1) || p->MoverParameters->MED_EPVC ? clamp(p->MoverParameters->Vel, p->MoverParameters->MED_Vmin, p->MoverParameters->MED_Vmax) : p->MoverParameters->MED_Vref);//korekcja EP po prędkości float FmaxPoj = Nmax * p->MoverParameters->Hamulec->GetFC( - Nmax / (p->MoverParameters->NAxles * p->MoverParameters->NBpA), - p->MoverParameters->Vel) * + Nmax / (p->MoverParameters->NAxles * p->MoverParameters->NBpA), VelC) * 1000; // sila hamowania pn p->MoverParameters->LocalBrakePosA = (p->MoverParameters->SlippingWheels ? 0 : FzEP[i] / FmaxPoj); if (p->MoverParameters->LocalBrakePosA>0.009) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 4a1cd438..17bef5a5 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -922,9 +922,16 @@ public: double Ftmax = 0.0; /*- dla lokomotyw z silnikami indukcyjnymi -*/ double eimc[26]; - bool EIMCLogForce; // + bool EIMCLogForce = false; // static std::vector const eimc_labels; double InverterFrequency { 0.0 }; // current frequency of power inverters + /* -dla pojazdów z blendingiem EP/ED (MED) */ + double MED_Vmax = 0; // predkosc maksymalna dla obliczen chwilowej sily hamowania EP w MED + double MED_Vmin = 0; // predkosc minimalna dla obliczen chwilowej sily hamowania EP w MED + double MED_Vref = 0; // predkosc referencyjna dla obliczen dostepnej sily hamowania EP w MED + double MED_amax = 9.81; // maksymalne opoznienie hamowania sluzbowego MED + bool MED_EPVC = 0; // czy korekcja sily hamowania EP, gdy nie ma dostepnego ED + bool MED_Ncor = 0; // czy korekcja sily hamowania z uwzglednieniem nacisku /*-dla wagonow*/ float MaxLoad = 0.f; /*masa w T lub ilosc w sztukach - ladownosc*/ std::string LoadAccepted; std::string LoadQuantity; /*co moze byc zaladowane, jednostki miary*/ @@ -1375,6 +1382,7 @@ private: void LoadFIZ_BuffCoupl( std::string const &line, int const Index ); void LoadFIZ_TurboPos( std::string const &line ); void LoadFIZ_Cntrl( std::string const &line ); + void LoadFIZ_Blending(std::string const &line); void LoadFIZ_Light( std::string const &line ); void LoadFIZ_Security( std::string const &line ); void LoadFIZ_Clima( std::string const &line ); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index e647a0e8..4422b0c3 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7432,6 +7432,14 @@ bool TMoverParameters::LoadFIZ(std::string chkpath) continue; } + if (issection("Blending:", inputline)) { + + startBPT = true; LISTLINE = 0; + fizlines.emplace( "Blending", inputline); + LoadFIZ_Blending( inputline ); + continue; + } + if( issection( "Light:", inputline ) ) { startBPT = false; @@ -8195,6 +8203,16 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { } } +void TMoverParameters::LoadFIZ_Blending(std::string const &line) { + + extract_value(MED_Vmax, "MED_Vmax", line, to_string(Vmax)); + extract_value(MED_Vmin, "MED_Vmin", line, "0"); + extract_value(MED_Vref, "MED_Vref", line, to_string(Vmax)); + extract_value(MED_amax, "MED_amax", line, "9.81"); + MED_EPVC = (extract_value("MED_EPVC", line).find("Yes") != std::string::npos); + MED_Ncor = (extract_value("MED_Ncor", line).find("Yes") != std::string::npos); + +} void TMoverParameters::LoadFIZ_Light( std::string const &line ) { LightPowerSource.SourceType = LoadFIZ_SourceDecode( extract_value( "Light", line ) ); From 22df82c8c052ccb4293af502811066420ddcd0fc Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 28 Apr 2018 16:38:12 +0200 Subject: [PATCH 318/426] minor refactoring and bug fixes --- DynObj.cpp | 1 + McZapkie/Mover.cpp | 17 ++++++++--------- Train.cpp | 2 +- sound.cpp | 8 ++++++++ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 5cca786c..2ea215d2 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -5064,6 +5064,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // pliki z turbogeneratorem m_powertrainsounds.engine_turbo.deserialize( parser, sound_type::multipart, sound_parameters::range ); m_powertrainsounds.engine_turbo.owner( this ); + m_powertrainsounds.engine_turbo.gain( 0 ); } else if( token == "small-compressor:" ) { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 4422b0c3..f9417825 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8115,9 +8115,9 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { else if( autorelay == "Yes" ) { AutoRelayType = 1; } else { AutoRelayType = 0; } - CoupledCtrl = ( extract_value( "CoupledCtrl", line ) == "Yes" ); + extract_value( CoupledCtrl, "CoupledCtrl", line, "" ); - ScndS = ( extract_value( "ScndS", line ) == "Yes" ); // brak pozycji rownoleglej przy niskiej nastawie PSR + extract_value( ScndS, "ScndS", line, "" ); // brak pozycji rownoleglej przy niskiej nastawie PSR extract_value( InitialCtrlDelay, "IniCDelay", line, "" ); extract_value( CtrlDelay, "SCDelay", line, "" ); @@ -8209,8 +8209,8 @@ void TMoverParameters::LoadFIZ_Blending(std::string const &line) { extract_value(MED_Vmin, "MED_Vmin", line, "0"); extract_value(MED_Vref, "MED_Vref", line, to_string(Vmax)); extract_value(MED_amax, "MED_amax", line, "9.81"); - MED_EPVC = (extract_value("MED_EPVC", line).find("Yes") != std::string::npos); - MED_Ncor = (extract_value("MED_Ncor", line).find("Yes") != std::string::npos); + extract_value(MED_EPVC, "MED_EPVC", line, ""); + extract_value(MED_Ncor, "MED_Ncor", line, ""); } void TMoverParameters::LoadFIZ_Light( std::string const &line ) { @@ -8241,7 +8241,7 @@ void TMoverParameters::LoadFIZ_Security( std::string const &line ) { extract_value( SecuritySystem.AwareMinSpeed, "AwareMinSpeed", line, "" ); extract_value( SecuritySystem.SoundSignalDelay, "SoundSignalDelay", line, "" ); extract_value( SecuritySystem.EmergencyBrakeDelay, "EmergencyBrakeDelay", line, "" ); - SecuritySystem.RadioStop = ( extract_value( "RadioStop", line ).find( "Yes" ) != std::string::npos ); + extract_value( SecuritySystem.RadioStop, "RadioStop", line, "" ); } void TMoverParameters::LoadFIZ_Clima( std::string const &line ) { @@ -8320,7 +8320,6 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { // TODO: unify naming scheme and sort out which diesel engine params are used where and how extract_value( nmax, "nmax", Input, "" ); nmax /= 60.0; -// nmax = dizel_nmax; // not sure if this is needed, but just in case extract_value( dizel_nmax_cutoff, "nmax_cutoff", Input, "0.0" ); dizel_nmax_cutoff /= 60.0; extract_value( dizel_AIM, "AIM", Input, "1.0" ); @@ -8338,7 +8337,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { } } - hydro_TC = (extract_value("IsTC", Input) == "Yes"); + extract_value(hydro_TC, "IsTC", Input, ""); if (true == hydro_TC) { extract_value(hydro_TC_TMMax, "TC_TMMax", Input, ""); extract_value(hydro_TC_CouplingPoint, "TC_CP", Input, ""); @@ -8353,7 +8352,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value(hydro_TC_LockupSpeed, "TC_LS", Input, ""); extract_value(hydro_TC_UnlockSpeed, "TC_ULS", Input, ""); - hydro_R = (extract_value("IsRetarder", Input) == "Yes"); + extract_value(hydro_R, "IsRetarder", Input, ""); if (true == hydro_R) { extract_value(hydro_R_Placement, "R_Place", Input, ""); extract_value(hydro_R_TorqueInIn, "R_TII", Input, ""); @@ -8414,7 +8413,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value( eimc[ eimc_p_Imax ], "Imax", Input, "" ); extract_value( eimc[ eimc_p_abed ], "abed", Input, "" ); extract_value( eimc[ eimc_p_eped ], "edep", Input, "" ); - EIMCLogForce = ( extract_value( "eimclf", Input ) == "Yes" ); + extract_value( EIMCLogForce, "eimclf", Input, "" ); Flat = ( extract_value( "Flat", Input ) == "1" ); diff --git a/Train.cpp b/Train.cpp index 527c9889..2bfe85f2 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4371,7 +4371,7 @@ bool TTrain::Update( double const Deltatime ) asCarName[i] = p->name(); bPants[iUnitNo - 1][0] = (bPants[iUnitNo - 1][0] || p->MoverParameters->PantFrontUp); bPants[iUnitNo - 1][1] = (bPants[iUnitNo - 1][1] || p->MoverParameters->PantRearUp); - bComp[iUnitNo - 1][0] = (bComp[iUnitNo - 1][0] || p->MoverParameters->CompressorAllow); + bComp[iUnitNo - 1][0] = (bComp[iUnitNo - 1][0] || p->MoverParameters->CompressorAllow || (p->MoverParameters->CompressorStart == start::automatic)); bSlip[i] = p->MoverParameters->SlippingWheels; if (p->MoverParameters->CompressorSpeed > 0.00001) { diff --git a/sound.cpp b/sound.cpp index f45a9ff0..2c1360f3 100644 --- a/sound.cpp +++ b/sound.cpp @@ -135,6 +135,14 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons // restore parser behaviour Input.autoclear( inputautoclear ); + // catch and correct oddball cases with the same sample assigned as all parts of multipart sound + if( m_sounds[ begin ].buffer == m_sounds[ main ].buffer ) { + m_sounds[ begin ].buffer = null_handle; + } + if( m_sounds[ end ].buffer == m_sounds[ main ].buffer ) { + m_sounds[ end ].buffer = null_handle; + } + return *this; } From b9be22eb25377ba2be4280eb206277377225d624 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 28 Apr 2018 16:45:19 +0200 Subject: [PATCH 319/426] configurable python renderer update rate --- Globals.cpp | 19 ++++++++++++++----- Globals.h | 1 + PyInt.cpp | 18 +++++++++++------- PyInt.h | 26 ++++++++------------------ 4 files changed, 34 insertions(+), 30 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index 1aad7435..0ef35fe2 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -564,6 +564,17 @@ global_settings::ConfigParse(cParser &Parser) { Parser.getTokens(1, false); Parser >> asLang; } + else if( token == "pyscreenrendererpriority" ) + { + // old variable, repurposed as update rate of python screen renderer + Parser.getTokens(); + Parser >> token; + auto const priority { ToLower( token ) }; + PythonScreenUpdateRate = ( + priority == "lower" ? 500 : + priority == "lowest" ? 1000 : + 200 ); + } else if( token == "uitextcolor" ) { // color of the ui text. NOTE: will be obsolete once the real ui is in place Parser.getTokens( 3, false ); @@ -571,11 +582,9 @@ global_settings::ConfigParse(cParser &Parser) { >> UITextColor.r >> UITextColor.g >> UITextColor.b; - UITextColor.r = clamp( UITextColor.r, 0.0f, 255.0f ); - UITextColor.g = clamp( UITextColor.g, 0.0f, 255.0f ); - UITextColor.b = clamp( UITextColor.b, 0.0f, 255.0f ); - UITextColor = UITextColor / 255.0f; - UITextColor.a = 1.0f; + glm::clamp( UITextColor, 0.f, 255.f ); + UITextColor = UITextColor / 255.f; + UITextColor.a = 1.f; } else if( token == "input.gamepad" ) { // czy grupować eventy o tych samych nazwach diff --git a/Globals.h b/Globals.h index 28792b19..2a008830 100644 --- a/Globals.h +++ b/Globals.h @@ -88,6 +88,7 @@ struct global_settings { bool bJoinEvents{ false }; // czy grupować eventy o tych samych nazwach int iHiddenEvents{ 1 }; // czy łączyć eventy z torami poprzez nazwę toru // ui + int PythonScreenUpdateRate { 200 }; // delay between python-based screen updates, in milliseconds int iTextMode{ 0 }; // tryb pracy wyświetlacza tekstowego int iScreenMode[ 12 ] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // numer ekranu wyświetlacza tekstowego glm::vec4 UITextColor { glm::vec4( 225.f / 255.f, 225.f / 255.f, 225.f / 255.f, 1.f ) }; // base color of UI text diff --git a/PyInt.cpp b/PyInt.cpp index c4615c50..4ce82105 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "PyInt.h" +#include "globals.h" #include "parser.h" #include "renderer.h" #include "Model3d.h" @@ -456,6 +457,7 @@ void TPythonScreens::init(cParser &parser, TModel3d *model, std::string const &n WriteLog( "Python Screen: null renderer for " + pyClassName + " - Ignoring screen" ); return; // nie mozna utworzyc obiektu Pythonowego } + m_updaterate = Global.PythonScreenUpdateRate; TPythonScreenRenderer *renderer = new TPythonScreenRenderer(textureId, pyRenderer); _screens.push_back(renderer); WriteLog( "Created python screen " + pyClassName + " on submodel " + subModelName + " (" + std::to_string(textureId) + ")" ); @@ -485,10 +487,6 @@ void TPythonScreens::setLookupPath(std::string const &path) TPythonScreens::TPythonScreens() { TPythonInterpreter::getInstance()->loadClassFile("", "abstractscreenrenderer"); - _terminationFlag = false; - _renderReadyFlag = false; - _cleanupReadyFlag = false; - _thread = NULL; } TPythonScreens::~TPythonScreens() @@ -512,6 +510,7 @@ void TPythonScreens::run() { while (1) { + m_updatestopwatch.start(); if (_terminationFlag) { return; @@ -535,12 +534,17 @@ void TPythonScreens::run() return; } _renderReadyFlag = true; + m_updatestopwatch.stop(); while (!_cleanupReadyFlag && !_terminationFlag) { + auto const sleeptime { + std::max( + 100, + m_updaterate - static_cast( m_updatestopwatch.average() ) ) }; #ifdef _WIN32 - Sleep(100); + Sleep( sleeptime ); #elif __linux__ - usleep(100*1000); + usleep( sleeptime * 1000 ); #endif } if (_terminationFlag) @@ -553,7 +557,7 @@ void TPythonScreens::run() void TPythonScreens::finish() { - _thread = NULL; + // nothing to do here, proper clean up takes place afterwards } void ScreenRendererThread(TPythonScreens* renderer) diff --git a/PyInt.h b/PyInt.h index aad4411c..bb4f8281 100644 --- a/PyInt.h +++ b/PyInt.h @@ -17,6 +17,7 @@ #include "Python.h" #endif #include "Classes.h" +#include "timer.h" #define PyGetFloat(param) PyFloat_FromDouble(param >= 0 ? param : -param) #define PyGetFloatS(param) PyFloat_FromDouble(param) @@ -25,34 +26,21 @@ #define PyGetBool(param) param ? Py_True : Py_False #define PyGetString(param) PyString_FromString(param) -struct ltstr -{ - bool operator()(const char *s1, const char *s2) const - { - return strcmp(s1, s2) < 0; - } -}; - class TPythonInterpreter { protected: TPythonInterpreter(); ~TPythonInterpreter() {} static TPythonInterpreter *_instance; -// std::set _classes; std::set _classes; PyObject *_main; PyObject *_stdErr; -// FILE *_getFile(const char *lookupPath, const char *className); FILE *_getFile( std::string const &lookupPath, std::string const &className ); public: static TPythonInterpreter *getInstance(); static void killInstance(); -/* bool loadClassFile(const char *lookupPath, const char *className); - PyObject *newClass(const char *className); - PyObject *newClass(const char *className, PyObject *argsTuple); -*/ bool loadClassFile( std::string const &lookupPath, std::string const &className ); + bool loadClassFile( std::string const &lookupPath, std::string const &className ); PyObject *newClass( std::string const &className ); PyObject *newClass( std::string const &className, PyObject *argsTuple ); void handleError(); @@ -78,16 +66,18 @@ class TPythonScreenRenderer class TPythonScreens { protected: - bool _cleanupReadyFlag; - bool _renderReadyFlag; - bool _terminationFlag; - std::thread *_thread; + bool _cleanupReadyFlag{ false }; + bool _renderReadyFlag{ false }; + bool _terminationFlag{ false }; + std::thread *_thread{ nullptr }; std::vector _screens; std::string _lookupPath; void *_train; void _cleanup(); void _freeTrainState(); PyObject *_trainState; + int m_updaterate { 200 }; + Timer::stopwatch m_updatestopwatch; public: void reset(void *train); From 1d481acbf3bc1b426fe472f5a6262b41bbcc36b5 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 29 Apr 2018 21:51:13 +0200 Subject: [PATCH 320/426] build 180429. vorbis ogg audio data format support, minor bug fixes --- McZapkie/Mover.cpp | 4 +- audio.cpp | 32 +- stb_vorbis.c | 5462 ++++++++++++++++++++++++++++++++++++++++++++ uart.cpp | 2 +- version.h | 2 +- 5 files changed, 5493 insertions(+), 9 deletions(-) create mode 100644 stb_vorbis.c diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index f9417825..d098da3d 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6402,7 +6402,7 @@ void TMoverParameters::dizel_Heat( double const dt ) { && ( dizel_heat.temperatura2 > dizel_heat.water_aux.config.temp_cooling - ( dizel_heat.water_aux.is_warm ? 8 : 0 ) ) ) ); auto const PTC2 { ( dizel_heat.water_aux.is_warm /*or PTC2p*/ ? 1 : 0 ) }; dizel_heat.rpmwz2 = PTC2 * 80 * rpm / ( ( 0.5 * rpm ) + 500 ); - dizel_heat.zaluzje2 = ( dizel_heat.water_aux.config.shutters ? PTC2 : true ); // no shutters is an equivalent to having them open + dizel_heat.zaluzje2 = ( dizel_heat.water_aux.config.shutters ? ( PTC2 == 1 ) : true ); // no shutters is an equivalent to having them open auto const zaluzje2 { ( dizel_heat.zaluzje2 ? 1 : 0 ) }; // auxiliary water circuit heat transfer values auto const kf2 { kurek07 * ( ( dizel_heat.kw * ( 0.3 + 0.7 * zaluzje2 ) ) * dizel_heat.rpmw2 + ( dizel_heat.kv * ( 0.3 + 0.7 * zaluzje2 ) * Vel / 3.6 ) ) + 2 }; @@ -6430,7 +6430,7 @@ void TMoverParameters::dizel_Heat( double const dt ) { && ( dizel_heat.temperatura1 > dizel_heat.water.config.temp_cooling - ( dizel_heat.water.is_warm ? 8 : 0 ) ) ) ); auto const PTC1 { ( dizel_heat.water.is_warm /*or PTC1p*/ ? 1 : 0 ) }; dizel_heat.rpmwz = PTC1 * 80 * rpm / ( ( 0.5 * rpm ) + 500 ); - dizel_heat.zaluzje1 = ( dizel_heat.water.config.shutters ? PTC1 : true ); // no shutters is an equivalent to having them open + dizel_heat.zaluzje1 = ( dizel_heat.water.config.shutters ? ( PTC1 == 1 ) : true ); // no shutters is an equivalent to having them open auto const zaluzje1 { ( dizel_heat.zaluzje1 ? 1 : 0 ) }; // primary water circuit heat transfer values auto const kf { obieg * kurek07 * ( ( dizel_heat.kw * ( 0.3 + 0.7 * zaluzje1 ) ) * dizel_heat.rpmw + ( dizel_heat.kv * ( 0.3 + 0.7 * zaluzje1 ) * Vel / 3.6 ) + 3 ) + 2 }; diff --git a/audio.cpp b/audio.cpp index c9511e2e..188a0d20 100644 --- a/audio.cpp +++ b/audio.cpp @@ -15,6 +15,8 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "resourcemanager.h" +#define STB_VORBIS_HEADER_ONLY +#include "stb_vorbis.c" #define DR_WAV_IMPLEMENTATION #include "dr_wav.h" #define DR_FLAC_IMPLEMENTATION @@ -27,8 +29,28 @@ openal_buffer::openal_buffer( std::string const &Filename ) : ::alGenBuffers( 1, &id ); // fetch audio data - if( Filename.substr( Filename.rfind( '.' ) ) == ".wav" ) { - // .wav file + if( Filename.substr( Filename.rfind( '.' ) ) == ".ogg" ) { + // vorbis .ogg audio data file + // TBD, TODO: customized vorbis_decode to avoid unnecessary shuffling around of the decoded data + int channels, samplerate; + std::int16_t *filedata { nullptr }; + auto const samplecount{ stb_vorbis_decode_filename( Filename.c_str(), &channels, &samplerate, &filedata ) }; + if( samplecount > 0 ) { + rate = samplerate; + data.resize( samplecount ); + std::copy( filedata, filedata + samplecount, std::begin( data ) ); + free( filedata ); + if( channels > 1 ) { + narrow_to_mono( channels ); + data.resize( samplecount / channels ); + } + } + else { + ErrorLog( "Bad file: failed do load audio file \"" + Filename + "\"", logtype::file ); + } + } + else if( Filename.substr( Filename.rfind( '.' ) ) == ".wav" ) { + // .wav audio data file auto *file { drwav_open_file( Filename.c_str() ) }; if( file != nullptr ) { rate = file->sampleRate; @@ -49,8 +71,8 @@ openal_buffer::openal_buffer( std::string const &Filename ) : // we're done with the disk data drwav_close( file ); } - else { - // .flac or .ogg file + else if( Filename.substr( Filename.rfind( '.' ) ) == ".flac" ) { + // .flac audio data file auto *file { drflac_open_file( Filename.c_str() ) }; if( file != nullptr ) { rate = file->sampleRate; @@ -209,7 +231,7 @@ buffer_manager::find_buffer( std::string const &Buffername ) const { std::string buffer_manager::find_file( std::string const &Filename ) const { - std::vector const extensions { ".wav", ".flac", ".ogg" }; + std::vector const extensions { ".ogg", ".flac", ".wav" }; for( auto const &extension : extensions ) { if( FileExists( Filename + extension ) ) { diff --git a/stb_vorbis.c b/stb_vorbis.c new file mode 100644 index 00000000..69a23bca --- /dev/null +++ b/stb_vorbis.c @@ -0,0 +1,5462 @@ +// Ogg Vorbis audio decoder - v1.14 - public domain +// http://nothings.org/stb_vorbis/ +// +// Original version written by Sean Barrett in 2007. +// +// Originally sponsored by RAD Game Tools. Seeking implementation +// sponsored by Phillip Bennefall, Marc Andersen, Aaron Baker, +// Elias Software, Aras Pranckevicius, and Sean Barrett. +// +// LICENSE +// +// See end of file for license information. +// +// Limitations: +// +// - floor 0 not supported (used in old ogg vorbis files pre-2004) +// - lossless sample-truncation at beginning ignored +// - cannot concatenate multiple vorbis streams +// - sample positions are 32-bit, limiting seekable 192Khz +// files to around 6 hours (Ogg supports 64-bit) +// +// Feature contributors: +// Dougall Johnson (sample-exact seeking) +// +// Bugfix/warning contributors: +// Terje Mathisen Niklas Frykholm Andy Hill +// Casey Muratori John Bolton Gargaj +// Laurent Gomila Marc LeBlanc Ronny Chevalier +// Bernhard Wodo Evan Balster alxprd@github +// Tom Beaumont Ingo Leitgeb Nicolas Guillemot +// Phillip Bennefall Rohit Thiago Goulart +// manxorist@github saga musix github:infatum +// Timur Gagiev +// +// Partial history: +// 1.14 - 2018-02-11 - delete bogus dealloca usage +// 1.13 - 2018-01-29 - fix truncation of last frame (hopefully) +// 1.12 - 2017-11-21 - limit residue begin/end to blocksize/2 to avoid large temp allocs in bad/corrupt files +// 1.11 - 2017-07-23 - fix MinGW compilation +// 1.10 - 2017-03-03 - more robust seeking; fix negative ilog(); clear error in open_memory +// 1.09 - 2016-04-04 - back out 'truncation of last frame' fix from previous version +// 1.08 - 2016-04-02 - warnings; setup memory leaks; truncation of last frame +// 1.07 - 2015-01-16 - fixes for crashes on invalid files; warning fixes; const +// 1.06 - 2015-08-31 - full, correct support for seeking API (Dougall Johnson) +// some crash fixes when out of memory or with corrupt files +// fix some inappropriately signed shifts +// 1.05 - 2015-04-19 - don't define __forceinline if it's redundant +// 1.04 - 2014-08-27 - fix missing const-correct case in API +// 1.03 - 2014-08-07 - warning fixes +// 1.02 - 2014-07-09 - declare qsort comparison as explicitly _cdecl in Windows +// 1.01 - 2014-06-18 - fix stb_vorbis_get_samples_float (interleaved was correct) +// 1.0 - 2014-05-26 - fix memory leaks; fix warnings; fix bugs in >2-channel; +// (API change) report sample rate for decode-full-file funcs +// +// See end of file for full version history. + + +////////////////////////////////////////////////////////////////////////////// +// +// HEADER BEGINS HERE +// + +#ifndef STB_VORBIS_INCLUDE_STB_VORBIS_H +#define STB_VORBIS_INCLUDE_STB_VORBIS_H + +#if defined(STB_VORBIS_NO_CRT) && !defined(STB_VORBIS_NO_STDIO) +#define STB_VORBIS_NO_STDIO 1 +#endif + +#ifndef STB_VORBIS_NO_STDIO +#include +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/////////// THREAD SAFETY + +// Individual stb_vorbis* handles are not thread-safe; you cannot decode from +// them from multiple threads at the same time. However, you can have multiple +// stb_vorbis* handles and decode from them independently in multiple thrads. + + +/////////// MEMORY ALLOCATION + +// normally stb_vorbis uses malloc() to allocate memory at startup, +// and alloca() to allocate temporary memory during a frame on the +// stack. (Memory consumption will depend on the amount of setup +// data in the file and how you set the compile flags for speed +// vs. size. In my test files the maximal-size usage is ~150KB.) +// +// You can modify the wrapper functions in the source (setup_malloc, +// setup_temp_malloc, temp_malloc) to change this behavior, or you +// can use a simpler allocation model: you pass in a buffer from +// which stb_vorbis will allocate _all_ its memory (including the +// temp memory). "open" may fail with a VORBIS_outofmem if you +// do not pass in enough data; there is no way to determine how +// much you do need except to succeed (at which point you can +// query get_info to find the exact amount required. yes I know +// this is lame). +// +// If you pass in a non-NULL buffer of the type below, allocation +// will occur from it as described above. Otherwise just pass NULL +// to use malloc()/alloca() + +typedef struct +{ + char *alloc_buffer; + int alloc_buffer_length_in_bytes; +} stb_vorbis_alloc; + + +/////////// FUNCTIONS USEABLE WITH ALL INPUT MODES + +typedef struct stb_vorbis stb_vorbis; + +typedef struct +{ + unsigned int sample_rate; + int channels; + + unsigned int setup_memory_required; + unsigned int setup_temp_memory_required; + unsigned int temp_memory_required; + + int max_frame_size; +} stb_vorbis_info; + +// get general information about the file +extern stb_vorbis_info stb_vorbis_get_info(stb_vorbis *f); + +// get the last error detected (clears it, too) +extern int stb_vorbis_get_error(stb_vorbis *f); + +// close an ogg vorbis file and free all memory in use +extern void stb_vorbis_close(stb_vorbis *f); + +// this function returns the offset (in samples) from the beginning of the +// file that will be returned by the next decode, if it is known, or -1 +// otherwise. after a flush_pushdata() call, this may take a while before +// it becomes valid again. +// NOT WORKING YET after a seek with PULLDATA API +extern int stb_vorbis_get_sample_offset(stb_vorbis *f); + +// returns the current seek point within the file, or offset from the beginning +// of the memory buffer. In pushdata mode it returns 0. +extern unsigned int stb_vorbis_get_file_offset(stb_vorbis *f); + +/////////// PUSHDATA API + +#ifndef STB_VORBIS_NO_PUSHDATA_API + +// this API allows you to get blocks of data from any source and hand +// them to stb_vorbis. you have to buffer them; stb_vorbis will tell +// you how much it used, and you have to give it the rest next time; +// and stb_vorbis may not have enough data to work with and you will +// need to give it the same data again PLUS more. Note that the Vorbis +// specification does not bound the size of an individual frame. + +extern stb_vorbis *stb_vorbis_open_pushdata( + const unsigned char * datablock, int datablock_length_in_bytes, + int *datablock_memory_consumed_in_bytes, + int *error, + const stb_vorbis_alloc *alloc_buffer); +// create a vorbis decoder by passing in the initial data block containing +// the ogg&vorbis headers (you don't need to do parse them, just provide +// the first N bytes of the file--you're told if it's not enough, see below) +// on success, returns an stb_vorbis *, does not set error, returns the amount of +// data parsed/consumed on this call in *datablock_memory_consumed_in_bytes; +// on failure, returns NULL on error and sets *error, does not change *datablock_memory_consumed +// if returns NULL and *error is VORBIS_need_more_data, then the input block was +// incomplete and you need to pass in a larger block from the start of the file + +extern int stb_vorbis_decode_frame_pushdata( + stb_vorbis *f, + const unsigned char *datablock, int datablock_length_in_bytes, + int *channels, // place to write number of float * buffers + float ***output, // place to write float ** array of float * buffers + int *samples // place to write number of output samples + ); +// decode a frame of audio sample data if possible from the passed-in data block +// +// return value: number of bytes we used from datablock +// +// possible cases: +// 0 bytes used, 0 samples output (need more data) +// N bytes used, 0 samples output (resynching the stream, keep going) +// N bytes used, M samples output (one frame of data) +// note that after opening a file, you will ALWAYS get one N-bytes,0-sample +// frame, because Vorbis always "discards" the first frame. +// +// Note that on resynch, stb_vorbis will rarely consume all of the buffer, +// instead only datablock_length_in_bytes-3 or less. This is because it wants +// to avoid missing parts of a page header if they cross a datablock boundary, +// without writing state-machiney code to record a partial detection. +// +// The number of channels returned are stored in *channels (which can be +// NULL--it is always the same as the number of channels reported by +// get_info). *output will contain an array of float* buffers, one per +// channel. In other words, (*output)[0][0] contains the first sample from +// the first channel, and (*output)[1][0] contains the first sample from +// the second channel. + +extern void stb_vorbis_flush_pushdata(stb_vorbis *f); +// inform stb_vorbis that your next datablock will not be contiguous with +// previous ones (e.g. you've seeked in the data); future attempts to decode +// frames will cause stb_vorbis to resynchronize (as noted above), and +// once it sees a valid Ogg page (typically 4-8KB, as large as 64KB), it +// will begin decoding the _next_ frame. +// +// if you want to seek using pushdata, you need to seek in your file, then +// call stb_vorbis_flush_pushdata(), then start calling decoding, then once +// decoding is returning you data, call stb_vorbis_get_sample_offset, and +// if you don't like the result, seek your file again and repeat. +#endif + + +////////// PULLING INPUT API + +#ifndef STB_VORBIS_NO_PULLDATA_API +// This API assumes stb_vorbis is allowed to pull data from a source-- +// either a block of memory containing the _entire_ vorbis stream, or a +// FILE * that you or it create, or possibly some other reading mechanism +// if you go modify the source to replace the FILE * case with some kind +// of callback to your code. (But if you don't support seeking, you may +// just want to go ahead and use pushdata.) + +#if !defined(STB_VORBIS_NO_STDIO) && !defined(STB_VORBIS_NO_INTEGER_CONVERSION) +extern int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_rate, short **output); +#endif +#if !defined(STB_VORBIS_NO_INTEGER_CONVERSION) +extern int stb_vorbis_decode_memory(const unsigned char *mem, int len, int *channels, int *sample_rate, short **output); +#endif +// decode an entire file and output the data interleaved into a malloc()ed +// buffer stored in *output. The return value is the number of samples +// decoded, or -1 if the file could not be opened or was not an ogg vorbis file. +// When you're done with it, just free() the pointer returned in *output. + +extern stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len, + int *error, const stb_vorbis_alloc *alloc_buffer); +// create an ogg vorbis decoder from an ogg vorbis stream in memory (note +// this must be the entire stream!). on failure, returns NULL and sets *error + +#ifndef STB_VORBIS_NO_STDIO +extern stb_vorbis * stb_vorbis_open_filename(const char *filename, + int *error, const stb_vorbis_alloc *alloc_buffer); +// create an ogg vorbis decoder from a filename via fopen(). on failure, +// returns NULL and sets *error (possibly to VORBIS_file_open_failure). + +extern stb_vorbis * stb_vorbis_open_file(FILE *f, int close_handle_on_close, + int *error, const stb_vorbis_alloc *alloc_buffer); +// create an ogg vorbis decoder from an open FILE *, looking for a stream at +// the _current_ seek point (ftell). on failure, returns NULL and sets *error. +// note that stb_vorbis must "own" this stream; if you seek it in between +// calls to stb_vorbis, it will become confused. Morever, if you attempt to +// perform stb_vorbis_seek_*() operations on this file, it will assume it +// owns the _entire_ rest of the file after the start point. Use the next +// function, stb_vorbis_open_file_section(), to limit it. + +extern stb_vorbis * stb_vorbis_open_file_section(FILE *f, int close_handle_on_close, + int *error, const stb_vorbis_alloc *alloc_buffer, unsigned int len); +// create an ogg vorbis decoder from an open FILE *, looking for a stream at +// the _current_ seek point (ftell); the stream will be of length 'len' bytes. +// on failure, returns NULL and sets *error. note that stb_vorbis must "own" +// this stream; if you seek it in between calls to stb_vorbis, it will become +// confused. +#endif + +extern int stb_vorbis_seek_frame(stb_vorbis *f, unsigned int sample_number); +extern int stb_vorbis_seek(stb_vorbis *f, unsigned int sample_number); +// these functions seek in the Vorbis file to (approximately) 'sample_number'. +// after calling seek_frame(), the next call to get_frame_*() will include +// the specified sample. after calling stb_vorbis_seek(), the next call to +// stb_vorbis_get_samples_* will start with the specified sample. If you +// do not need to seek to EXACTLY the target sample when using get_samples_*, +// you can also use seek_frame(). + +extern int stb_vorbis_seek_start(stb_vorbis *f); +// this function is equivalent to stb_vorbis_seek(f,0) + +extern unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f); +extern float stb_vorbis_stream_length_in_seconds(stb_vorbis *f); +// these functions return the total length of the vorbis stream + +extern int stb_vorbis_get_frame_float(stb_vorbis *f, int *channels, float ***output); +// decode the next frame and return the number of samples. the number of +// channels returned are stored in *channels (which can be NULL--it is always +// the same as the number of channels reported by get_info). *output will +// contain an array of float* buffers, one per channel. These outputs will +// be overwritten on the next call to stb_vorbis_get_frame_*. +// +// You generally should not intermix calls to stb_vorbis_get_frame_*() +// and stb_vorbis_get_samples_*(), since the latter calls the former. + +#ifndef STB_VORBIS_NO_INTEGER_CONVERSION +extern int stb_vorbis_get_frame_short_interleaved(stb_vorbis *f, int num_c, short *buffer, int num_shorts); +extern int stb_vorbis_get_frame_short (stb_vorbis *f, int num_c, short **buffer, int num_samples); +#endif +// decode the next frame and return the number of *samples* per channel. +// Note that for interleaved data, you pass in the number of shorts (the +// size of your array), but the return value is the number of samples per +// channel, not the total number of samples. +// +// The data is coerced to the number of channels you request according to the +// channel coercion rules (see below). You must pass in the size of your +// buffer(s) so that stb_vorbis will not overwrite the end of the buffer. +// The maximum buffer size needed can be gotten from get_info(); however, +// the Vorbis I specification implies an absolute maximum of 4096 samples +// per channel. + +// Channel coercion rules: +// Let M be the number of channels requested, and N the number of channels present, +// and Cn be the nth channel; let stereo L be the sum of all L and center channels, +// and stereo R be the sum of all R and center channels (channel assignment from the +// vorbis spec). +// M N output +// 1 k sum(Ck) for all k +// 2 * stereo L, stereo R +// k l k > l, the first l channels, then 0s +// k l k <= l, the first k channels +// Note that this is not _good_ surround etc. mixing at all! It's just so +// you get something useful. + +extern int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float *buffer, int num_floats); +extern int stb_vorbis_get_samples_float(stb_vorbis *f, int channels, float **buffer, int num_samples); +// gets num_samples samples, not necessarily on a frame boundary--this requires +// buffering so you have to supply the buffers. DOES NOT APPLY THE COERCION RULES. +// Returns the number of samples stored per channel; it may be less than requested +// at the end of the file. If there are no more samples in the file, returns 0. + +#ifndef STB_VORBIS_NO_INTEGER_CONVERSION +extern int stb_vorbis_get_samples_short_interleaved(stb_vorbis *f, int channels, short *buffer, int num_shorts); +extern int stb_vorbis_get_samples_short(stb_vorbis *f, int channels, short **buffer, int num_samples); +#endif +// gets num_samples samples, not necessarily on a frame boundary--this requires +// buffering so you have to supply the buffers. Applies the coercion rules above +// to produce 'channels' channels. Returns the number of samples stored per channel; +// it may be less than requested at the end of the file. If there are no more +// samples in the file, returns 0. + +#endif + +//////// ERROR CODES + +enum STBVorbisError +{ + VORBIS__no_error, + + VORBIS_need_more_data=1, // not a real error + + VORBIS_invalid_api_mixing, // can't mix API modes + VORBIS_outofmem, // not enough memory + VORBIS_feature_not_supported, // uses floor 0 + VORBIS_too_many_channels, // STB_VORBIS_MAX_CHANNELS is too small + VORBIS_file_open_failure, // fopen() failed + VORBIS_seek_without_length, // can't seek in unknown-length file + + VORBIS_unexpected_eof=10, // file is truncated? + VORBIS_seek_invalid, // seek past EOF + + // decoding errors (corrupt/invalid stream) -- you probably + // don't care about the exact details of these + + // vorbis errors: + VORBIS_invalid_setup=20, + VORBIS_invalid_stream, + + // ogg errors: + VORBIS_missing_capture_pattern=30, + VORBIS_invalid_stream_structure_version, + VORBIS_continued_packet_flag_invalid, + VORBIS_incorrect_stream_serial_number, + VORBIS_invalid_first_page, + VORBIS_bad_packet_type, + VORBIS_cant_find_last_page, + VORBIS_seek_failed +}; + + +#ifdef __cplusplus +} +#endif + +#endif // STB_VORBIS_INCLUDE_STB_VORBIS_H +// +// HEADER ENDS HERE +// +////////////////////////////////////////////////////////////////////////////// + +#ifndef STB_VORBIS_HEADER_ONLY + +// global configuration settings (e.g. set these in the project/makefile), +// or just set them in this file at the top (although ideally the first few +// should be visible when the header file is compiled too, although it's not +// crucial) + +// STB_VORBIS_NO_PUSHDATA_API +// does not compile the code for the various stb_vorbis_*_pushdata() +// functions +// #define STB_VORBIS_NO_PUSHDATA_API + +// STB_VORBIS_NO_PULLDATA_API +// does not compile the code for the non-pushdata APIs +// #define STB_VORBIS_NO_PULLDATA_API + +// STB_VORBIS_NO_STDIO +// does not compile the code for the APIs that use FILE *s internally +// or externally (implied by STB_VORBIS_NO_PULLDATA_API) +// #define STB_VORBIS_NO_STDIO + +// STB_VORBIS_NO_INTEGER_CONVERSION +// does not compile the code for converting audio sample data from +// float to integer (implied by STB_VORBIS_NO_PULLDATA_API) +// #define STB_VORBIS_NO_INTEGER_CONVERSION + +// STB_VORBIS_NO_FAST_SCALED_FLOAT +// does not use a fast float-to-int trick to accelerate float-to-int on +// most platforms which requires endianness be defined correctly. +//#define STB_VORBIS_NO_FAST_SCALED_FLOAT + + +// STB_VORBIS_MAX_CHANNELS [number] +// globally define this to the maximum number of channels you need. +// The spec does not put a restriction on channels except that +// the count is stored in a byte, so 255 is the hard limit. +// Reducing this saves about 16 bytes per value, so using 16 saves +// (255-16)*16 or around 4KB. Plus anything other memory usage +// I forgot to account for. Can probably go as low as 8 (7.1 audio), +// 6 (5.1 audio), or 2 (stereo only). +#ifndef STB_VORBIS_MAX_CHANNELS +#define STB_VORBIS_MAX_CHANNELS 16 // enough for anyone? +#endif + +// STB_VORBIS_PUSHDATA_CRC_COUNT [number] +// after a flush_pushdata(), stb_vorbis begins scanning for the +// next valid page, without backtracking. when it finds something +// that looks like a page, it streams through it and verifies its +// CRC32. Should that validation fail, it keeps scanning. But it's +// possible that _while_ streaming through to check the CRC32 of +// one candidate page, it sees another candidate page. This #define +// determines how many "overlapping" candidate pages it can search +// at once. Note that "real" pages are typically ~4KB to ~8KB, whereas +// garbage pages could be as big as 64KB, but probably average ~16KB. +// So don't hose ourselves by scanning an apparent 64KB page and +// missing a ton of real ones in the interim; so minimum of 2 +#ifndef STB_VORBIS_PUSHDATA_CRC_COUNT +#define STB_VORBIS_PUSHDATA_CRC_COUNT 4 +#endif + +// STB_VORBIS_FAST_HUFFMAN_LENGTH [number] +// sets the log size of the huffman-acceleration table. Maximum +// supported value is 24. with larger numbers, more decodings are O(1), +// but the table size is larger so worse cache missing, so you'll have +// to probe (and try multiple ogg vorbis files) to find the sweet spot. +#ifndef STB_VORBIS_FAST_HUFFMAN_LENGTH +#define STB_VORBIS_FAST_HUFFMAN_LENGTH 10 +#endif + +// STB_VORBIS_FAST_BINARY_LENGTH [number] +// sets the log size of the binary-search acceleration table. this +// is used in similar fashion to the fast-huffman size to set initial +// parameters for the binary search + +// STB_VORBIS_FAST_HUFFMAN_INT +// The fast huffman tables are much more efficient if they can be +// stored as 16-bit results instead of 32-bit results. This restricts +// the codebooks to having only 65535 possible outcomes, though. +// (At least, accelerated by the huffman table.) +#ifndef STB_VORBIS_FAST_HUFFMAN_INT +#define STB_VORBIS_FAST_HUFFMAN_SHORT +#endif + +// STB_VORBIS_NO_HUFFMAN_BINARY_SEARCH +// If the 'fast huffman' search doesn't succeed, then stb_vorbis falls +// back on binary searching for the correct one. This requires storing +// extra tables with the huffman codes in sorted order. Defining this +// symbol trades off space for speed by forcing a linear search in the +// non-fast case, except for "sparse" codebooks. +// #define STB_VORBIS_NO_HUFFMAN_BINARY_SEARCH + +// STB_VORBIS_DIVIDES_IN_RESIDUE +// stb_vorbis precomputes the result of the scalar residue decoding +// that would otherwise require a divide per chunk. you can trade off +// space for time by defining this symbol. +// #define STB_VORBIS_DIVIDES_IN_RESIDUE + +// STB_VORBIS_DIVIDES_IN_CODEBOOK +// vorbis VQ codebooks can be encoded two ways: with every case explicitly +// stored, or with all elements being chosen from a small range of values, +// and all values possible in all elements. By default, stb_vorbis expands +// this latter kind out to look like the former kind for ease of decoding, +// because otherwise an integer divide-per-vector-element is required to +// unpack the index. If you define STB_VORBIS_DIVIDES_IN_CODEBOOK, you can +// trade off storage for speed. +//#define STB_VORBIS_DIVIDES_IN_CODEBOOK + +#ifdef STB_VORBIS_CODEBOOK_SHORTS +#error "STB_VORBIS_CODEBOOK_SHORTS is no longer supported as it produced incorrect results for some input formats" +#endif + +// STB_VORBIS_DIVIDE_TABLE +// this replaces small integer divides in the floor decode loop with +// table lookups. made less than 1% difference, so disabled by default. + +// STB_VORBIS_NO_INLINE_DECODE +// disables the inlining of the scalar codebook fast-huffman decode. +// might save a little codespace; useful for debugging +// #define STB_VORBIS_NO_INLINE_DECODE + +// STB_VORBIS_NO_DEFER_FLOOR +// Normally we only decode the floor without synthesizing the actual +// full curve. We can instead synthesize the curve immediately. This +// requires more memory and is very likely slower, so I don't think +// you'd ever want to do it except for debugging. +// #define STB_VORBIS_NO_DEFER_FLOOR + + + + +////////////////////////////////////////////////////////////////////////////// + +#ifdef STB_VORBIS_NO_PULLDATA_API + #define STB_VORBIS_NO_INTEGER_CONVERSION + #define STB_VORBIS_NO_STDIO +#endif + +#if defined(STB_VORBIS_NO_CRT) && !defined(STB_VORBIS_NO_STDIO) + #define STB_VORBIS_NO_STDIO 1 +#endif + +#ifndef STB_VORBIS_NO_INTEGER_CONVERSION +#ifndef STB_VORBIS_NO_FAST_SCALED_FLOAT + + // only need endianness for fast-float-to-int, which we don't + // use for pushdata + + #ifndef STB_VORBIS_BIG_ENDIAN + #define STB_VORBIS_ENDIAN 0 + #else + #define STB_VORBIS_ENDIAN 1 + #endif + +#endif +#endif + + +#ifndef STB_VORBIS_NO_STDIO +#include +#endif + +#ifndef STB_VORBIS_NO_CRT + #include + #include + #include + #include + + // find definition of alloca if it's not in stdlib.h: + #if defined(_MSC_VER) || defined(__MINGW32__) + #include + #endif + #if defined(__linux__) || defined(__linux) || defined(__EMSCRIPTEN__) + #include + #endif +#else // STB_VORBIS_NO_CRT + #define NULL 0 + #define malloc(s) 0 + #define free(s) ((void) 0) + #define realloc(s) 0 +#endif // STB_VORBIS_NO_CRT + +#include + +#ifdef __MINGW32__ + // eff you mingw: + // "fixed": + // http://sourceforge.net/p/mingw-w64/mailman/message/32882927/ + // "no that broke the build, reverted, who cares about C": + // http://sourceforge.net/p/mingw-w64/mailman/message/32890381/ + #ifdef __forceinline + #undef __forceinline + #endif + #define __forceinline + #define alloca __builtin_alloca +#elif !defined(_MSC_VER) + #if __GNUC__ + #define __forceinline inline + #else + #define __forceinline + #endif +#endif + +#if STB_VORBIS_MAX_CHANNELS > 256 +#error "Value of STB_VORBIS_MAX_CHANNELS outside of allowed range" +#endif + +#if STB_VORBIS_FAST_HUFFMAN_LENGTH > 24 +#error "Value of STB_VORBIS_FAST_HUFFMAN_LENGTH outside of allowed range" +#endif + + +#if 0 +#include +#define CHECK(f) _CrtIsValidHeapPointer(f->channel_buffers[1]) +#else +#define CHECK(f) ((void) 0) +#endif + +#define MAX_BLOCKSIZE_LOG 13 // from specification +#define MAX_BLOCKSIZE (1 << MAX_BLOCKSIZE_LOG) + + +typedef unsigned char uint8; +typedef signed char int8; +typedef unsigned short uint16; +typedef signed short int16; +typedef unsigned int uint32; +typedef signed int int32; + +#ifndef TRUE +#define TRUE 1 +#define FALSE 0 +#endif + +typedef float codetype; + +// @NOTE +// +// Some arrays below are tagged "//varies", which means it's actually +// a variable-sized piece of data, but rather than malloc I assume it's +// small enough it's better to just allocate it all together with the +// main thing +// +// Most of the variables are specified with the smallest size I could pack +// them into. It might give better performance to make them all full-sized +// integers. It should be safe to freely rearrange the structures or change +// the sizes larger--nothing relies on silently truncating etc., nor the +// order of variables. + +#define FAST_HUFFMAN_TABLE_SIZE (1 << STB_VORBIS_FAST_HUFFMAN_LENGTH) +#define FAST_HUFFMAN_TABLE_MASK (FAST_HUFFMAN_TABLE_SIZE - 1) + +typedef struct +{ + int dimensions, entries; + uint8 *codeword_lengths; + float minimum_value; + float delta_value; + uint8 value_bits; + uint8 lookup_type; + uint8 sequence_p; + uint8 sparse; + uint32 lookup_values; + codetype *multiplicands; + uint32 *codewords; + #ifdef STB_VORBIS_FAST_HUFFMAN_SHORT + int16 fast_huffman[FAST_HUFFMAN_TABLE_SIZE]; + #else + int32 fast_huffman[FAST_HUFFMAN_TABLE_SIZE]; + #endif + uint32 *sorted_codewords; + int *sorted_values; + int sorted_entries; +} Codebook; + +typedef struct +{ + uint8 order; + uint16 rate; + uint16 bark_map_size; + uint8 amplitude_bits; + uint8 amplitude_offset; + uint8 number_of_books; + uint8 book_list[16]; // varies +} Floor0; + +typedef struct +{ + uint8 partitions; + uint8 partition_class_list[32]; // varies + uint8 class_dimensions[16]; // varies + uint8 class_subclasses[16]; // varies + uint8 class_masterbooks[16]; // varies + int16 subclass_books[16][8]; // varies + uint16 Xlist[31*8+2]; // varies + uint8 sorted_order[31*8+2]; + uint8 neighbors[31*8+2][2]; + uint8 floor1_multiplier; + uint8 rangebits; + int values; +} Floor1; + +typedef union +{ + Floor0 floor0; + Floor1 floor1; +} Floor; + +typedef struct +{ + uint32 begin, end; + uint32 part_size; + uint8 classifications; + uint8 classbook; + uint8 **classdata; + int16 (*residue_books)[8]; +} Residue; + +typedef struct +{ + uint8 magnitude; + uint8 angle; + uint8 mux; +} MappingChannel; + +typedef struct +{ + uint16 coupling_steps; + MappingChannel *chan; + uint8 submaps; + uint8 submap_floor[15]; // varies + uint8 submap_residue[15]; // varies +} Mapping; + +typedef struct +{ + uint8 blockflag; + uint8 mapping; + uint16 windowtype; + uint16 transformtype; +} Mode; + +typedef struct +{ + uint32 goal_crc; // expected crc if match + int bytes_left; // bytes left in packet + uint32 crc_so_far; // running crc + int bytes_done; // bytes processed in _current_ chunk + uint32 sample_loc; // granule pos encoded in page +} CRCscan; + +typedef struct +{ + uint32 page_start, page_end; + uint32 last_decoded_sample; +} ProbedPage; + +struct stb_vorbis +{ + // user-accessible info + unsigned int sample_rate; + int channels; + + unsigned int setup_memory_required; + unsigned int temp_memory_required; + unsigned int setup_temp_memory_required; + + // input config +#ifndef STB_VORBIS_NO_STDIO + FILE *f; + uint32 f_start; + int close_on_free; +#endif + + uint8 *stream; + uint8 *stream_start; + uint8 *stream_end; + + uint32 stream_len; + + uint8 push_mode; + + uint32 first_audio_page_offset; + + ProbedPage p_first, p_last; + + // memory management + stb_vorbis_alloc alloc; + int setup_offset; + int temp_offset; + + // run-time results + int eof; + enum STBVorbisError error; + + // user-useful data + + // header info + int blocksize[2]; + int blocksize_0, blocksize_1; + int codebook_count; + Codebook *codebooks; + int floor_count; + uint16 floor_types[64]; // varies + Floor *floor_config; + int residue_count; + uint16 residue_types[64]; // varies + Residue *residue_config; + int mapping_count; + Mapping *mapping; + int mode_count; + Mode mode_config[64]; // varies + + uint32 total_samples; + + // decode buffer + float *channel_buffers[STB_VORBIS_MAX_CHANNELS]; + float *outputs [STB_VORBIS_MAX_CHANNELS]; + + float *previous_window[STB_VORBIS_MAX_CHANNELS]; + int previous_length; + + #ifndef STB_VORBIS_NO_DEFER_FLOOR + int16 *finalY[STB_VORBIS_MAX_CHANNELS]; + #else + float *floor_buffers[STB_VORBIS_MAX_CHANNELS]; + #endif + + uint32 current_loc; // sample location of next frame to decode + int current_loc_valid; + + // per-blocksize precomputed data + + // twiddle factors + float *A[2],*B[2],*C[2]; + float *window[2]; + uint16 *bit_reverse[2]; + + // current page/packet/segment streaming info + uint32 serial; // stream serial number for verification + int last_page; + int segment_count; + uint8 segments[255]; + uint8 page_flag; + uint8 bytes_in_seg; + uint8 first_decode; + int next_seg; + int last_seg; // flag that we're on the last segment + int last_seg_which; // what was the segment number of the last seg? + uint32 acc; + int valid_bits; + int packet_bytes; + int end_seg_with_known_loc; + uint32 known_loc_for_packet; + int discard_samples_deferred; + uint32 samples_output; + + // push mode scanning + int page_crc_tests; // only in push_mode: number of tests active; -1 if not searching +#ifndef STB_VORBIS_NO_PUSHDATA_API + CRCscan scan[STB_VORBIS_PUSHDATA_CRC_COUNT]; +#endif + + // sample-access + int channel_buffer_start; + int channel_buffer_end; +}; + +#if defined(STB_VORBIS_NO_PUSHDATA_API) + #define IS_PUSH_MODE(f) FALSE +#elif defined(STB_VORBIS_NO_PULLDATA_API) + #define IS_PUSH_MODE(f) TRUE +#else + #define IS_PUSH_MODE(f) ((f)->push_mode) +#endif + +typedef struct stb_vorbis vorb; + +static int error(vorb *f, enum STBVorbisError e) +{ + f->error = e; + if (!f->eof && e != VORBIS_need_more_data) { + f->error=e; // breakpoint for debugging + } + return 0; +} + + +// these functions are used for allocating temporary memory +// while decoding. if you can afford the stack space, use +// alloca(); otherwise, provide a temp buffer and it will +// allocate out of those. + +#define array_size_required(count,size) (count*(sizeof(void *)+(size))) + +#define temp_alloc(f,size) (f->alloc.alloc_buffer ? setup_temp_malloc(f,size) : alloca(size)) +#define temp_free(f,p) 0 +#define temp_alloc_save(f) ((f)->temp_offset) +#define temp_alloc_restore(f,p) ((f)->temp_offset = (p)) + +#define temp_block_array(f,count,size) make_block_array(temp_alloc(f,array_size_required(count,size)), count, size) + +// given a sufficiently large block of memory, make an array of pointers to subblocks of it +static void *make_block_array(void *mem, int count, int size) +{ + int i; + void ** p = (void **) mem; + char *q = (char *) (p + count); + for (i=0; i < count; ++i) { + p[i] = q; + q += size; + } + return p; +} + +static void *setup_malloc(vorb *f, int sz) +{ + sz = (sz+3) & ~3; + f->setup_memory_required += sz; + if (f->alloc.alloc_buffer) { + void *p = (char *) f->alloc.alloc_buffer + f->setup_offset; + if (f->setup_offset + sz > f->temp_offset) return NULL; + f->setup_offset += sz; + return p; + } + return sz ? malloc(sz) : NULL; +} + +static void setup_free(vorb *f, void *p) +{ + if (f->alloc.alloc_buffer) return; // do nothing; setup mem is a stack + free(p); +} + +static void *setup_temp_malloc(vorb *f, int sz) +{ + sz = (sz+3) & ~3; + if (f->alloc.alloc_buffer) { + if (f->temp_offset - sz < f->setup_offset) return NULL; + f->temp_offset -= sz; + return (char *) f->alloc.alloc_buffer + f->temp_offset; + } + return malloc(sz); +} + +static void setup_temp_free(vorb *f, void *p, int sz) +{ + if (f->alloc.alloc_buffer) { + f->temp_offset += (sz+3)&~3; + return; + } + free(p); +} + +#define CRC32_POLY 0x04c11db7 // from spec + +static uint32 crc_table[256]; +static void crc32_init(void) +{ + int i,j; + uint32 s; + for(i=0; i < 256; i++) { + for (s=(uint32) i << 24, j=0; j < 8; ++j) + s = (s << 1) ^ (s >= (1U<<31) ? CRC32_POLY : 0); + crc_table[i] = s; + } +} + +static __forceinline uint32 crc32_update(uint32 crc, uint8 byte) +{ + return (crc << 8) ^ crc_table[byte ^ (crc >> 24)]; +} + + +// used in setup, and for huffman that doesn't go fast path +static unsigned int bit_reverse(unsigned int n) +{ + n = ((n & 0xAAAAAAAA) >> 1) | ((n & 0x55555555) << 1); + n = ((n & 0xCCCCCCCC) >> 2) | ((n & 0x33333333) << 2); + n = ((n & 0xF0F0F0F0) >> 4) | ((n & 0x0F0F0F0F) << 4); + n = ((n & 0xFF00FF00) >> 8) | ((n & 0x00FF00FF) << 8); + return (n >> 16) | (n << 16); +} + +static float square(float x) +{ + return x*x; +} + +// this is a weird definition of log2() for which log2(1) = 1, log2(2) = 2, log2(4) = 3 +// as required by the specification. fast(?) implementation from stb.h +// @OPTIMIZE: called multiple times per-packet with "constants"; move to setup +static int ilog(int32 n) +{ + static signed char log2_4[16] = { 0,1,2,2,3,3,3,3,4,4,4,4,4,4,4,4 }; + + if (n < 0) return 0; // signed n returns 0 + + // 2 compares if n < 16, 3 compares otherwise (4 if signed or n > 1<<29) + if (n < (1 << 14)) + if (n < (1 << 4)) return 0 + log2_4[n ]; + else if (n < (1 << 9)) return 5 + log2_4[n >> 5]; + else return 10 + log2_4[n >> 10]; + else if (n < (1 << 24)) + if (n < (1 << 19)) return 15 + log2_4[n >> 15]; + else return 20 + log2_4[n >> 20]; + else if (n < (1 << 29)) return 25 + log2_4[n >> 25]; + else return 30 + log2_4[n >> 30]; +} + +#ifndef M_PI + #define M_PI 3.14159265358979323846264f // from CRC +#endif + +// code length assigned to a value with no huffman encoding +#define NO_CODE 255 + +/////////////////////// LEAF SETUP FUNCTIONS ////////////////////////// +// +// these functions are only called at setup, and only a few times +// per file + +static float float32_unpack(uint32 x) +{ + // from the specification + uint32 mantissa = x & 0x1fffff; + uint32 sign = x & 0x80000000; + uint32 exp = (x & 0x7fe00000) >> 21; + double res = sign ? -(double)mantissa : (double)mantissa; + return (float) ldexp((float)res, exp-788); +} + + +// zlib & jpeg huffman tables assume that the output symbols +// can either be arbitrarily arranged, or have monotonically +// increasing frequencies--they rely on the lengths being sorted; +// this makes for a very simple generation algorithm. +// vorbis allows a huffman table with non-sorted lengths. This +// requires a more sophisticated construction, since symbols in +// order do not map to huffman codes "in order". +static void add_entry(Codebook *c, uint32 huff_code, int symbol, int count, int len, uint32 *values) +{ + if (!c->sparse) { + c->codewords [symbol] = huff_code; + } else { + c->codewords [count] = huff_code; + c->codeword_lengths[count] = len; + values [count] = symbol; + } +} + +static int compute_codewords(Codebook *c, uint8 *len, int n, uint32 *values) +{ + int i,k,m=0; + uint32 available[32]; + + memset(available, 0, sizeof(available)); + // find the first entry + for (k=0; k < n; ++k) if (len[k] < NO_CODE) break; + if (k == n) { assert(c->sorted_entries == 0); return TRUE; } + // add to the list + add_entry(c, 0, k, m++, len[k], values); + // add all available leaves + for (i=1; i <= len[k]; ++i) + available[i] = 1U << (32-i); + // note that the above code treats the first case specially, + // but it's really the same as the following code, so they + // could probably be combined (except the initial code is 0, + // and I use 0 in available[] to mean 'empty') + for (i=k+1; i < n; ++i) { + uint32 res; + int z = len[i], y; + if (z == NO_CODE) continue; + // find lowest available leaf (should always be earliest, + // which is what the specification calls for) + // note that this property, and the fact we can never have + // more than one free leaf at a given level, isn't totally + // trivial to prove, but it seems true and the assert never + // fires, so! + while (z > 0 && !available[z]) --z; + if (z == 0) { return FALSE; } + res = available[z]; + assert(z >= 0 && z < 32); + available[z] = 0; + add_entry(c, bit_reverse(res), i, m++, len[i], values); + // propogate availability up the tree + if (z != len[i]) { + assert(len[i] >= 0 && len[i] < 32); + for (y=len[i]; y > z; --y) { + assert(available[y] == 0); + available[y] = res + (1 << (32-y)); + } + } + } + return TRUE; +} + +// accelerated huffman table allows fast O(1) match of all symbols +// of length <= STB_VORBIS_FAST_HUFFMAN_LENGTH +static void compute_accelerated_huffman(Codebook *c) +{ + int i, len; + for (i=0; i < FAST_HUFFMAN_TABLE_SIZE; ++i) + c->fast_huffman[i] = -1; + + len = c->sparse ? c->sorted_entries : c->entries; + #ifdef STB_VORBIS_FAST_HUFFMAN_SHORT + if (len > 32767) len = 32767; // largest possible value we can encode! + #endif + for (i=0; i < len; ++i) { + if (c->codeword_lengths[i] <= STB_VORBIS_FAST_HUFFMAN_LENGTH) { + uint32 z = c->sparse ? bit_reverse(c->sorted_codewords[i]) : c->codewords[i]; + // set table entries for all bit combinations in the higher bits + while (z < FAST_HUFFMAN_TABLE_SIZE) { + c->fast_huffman[z] = i; + z += 1 << c->codeword_lengths[i]; + } + } + } +} + +#ifdef _MSC_VER +#define STBV_CDECL __cdecl +#else +#define STBV_CDECL +#endif + +static int STBV_CDECL uint32_compare(const void *p, const void *q) +{ + uint32 x = * (uint32 *) p; + uint32 y = * (uint32 *) q; + return x < y ? -1 : x > y; +} + +static int include_in_sort(Codebook *c, uint8 len) +{ + if (c->sparse) { assert(len != NO_CODE); return TRUE; } + if (len == NO_CODE) return FALSE; + if (len > STB_VORBIS_FAST_HUFFMAN_LENGTH) return TRUE; + return FALSE; +} + +// if the fast table above doesn't work, we want to binary +// search them... need to reverse the bits +static void compute_sorted_huffman(Codebook *c, uint8 *lengths, uint32 *values) +{ + int i, len; + // build a list of all the entries + // OPTIMIZATION: don't include the short ones, since they'll be caught by FAST_HUFFMAN. + // this is kind of a frivolous optimization--I don't see any performance improvement, + // but it's like 4 extra lines of code, so. + if (!c->sparse) { + int k = 0; + for (i=0; i < c->entries; ++i) + if (include_in_sort(c, lengths[i])) + c->sorted_codewords[k++] = bit_reverse(c->codewords[i]); + assert(k == c->sorted_entries); + } else { + for (i=0; i < c->sorted_entries; ++i) + c->sorted_codewords[i] = bit_reverse(c->codewords[i]); + } + + qsort(c->sorted_codewords, c->sorted_entries, sizeof(c->sorted_codewords[0]), uint32_compare); + c->sorted_codewords[c->sorted_entries] = 0xffffffff; + + len = c->sparse ? c->sorted_entries : c->entries; + // now we need to indicate how they correspond; we could either + // #1: sort a different data structure that says who they correspond to + // #2: for each sorted entry, search the original list to find who corresponds + // #3: for each original entry, find the sorted entry + // #1 requires extra storage, #2 is slow, #3 can use binary search! + for (i=0; i < len; ++i) { + int huff_len = c->sparse ? lengths[values[i]] : lengths[i]; + if (include_in_sort(c,huff_len)) { + uint32 code = bit_reverse(c->codewords[i]); + int x=0, n=c->sorted_entries; + while (n > 1) { + // invariant: sc[x] <= code < sc[x+n] + int m = x + (n >> 1); + if (c->sorted_codewords[m] <= code) { + x = m; + n -= (n>>1); + } else { + n >>= 1; + } + } + assert(c->sorted_codewords[x] == code); + if (c->sparse) { + c->sorted_values[x] = values[i]; + c->codeword_lengths[x] = huff_len; + } else { + c->sorted_values[x] = i; + } + } + } +} + +// only run while parsing the header (3 times) +static int vorbis_validate(uint8 *data) +{ + static uint8 vorbis[6] = { 'v', 'o', 'r', 'b', 'i', 's' }; + return memcmp(data, vorbis, 6) == 0; +} + +// called from setup only, once per code book +// (formula implied by specification) +static int lookup1_values(int entries, int dim) +{ + int r = (int) floor(exp((float) log((float) entries) / dim)); + if ((int) floor(pow((float) r+1, dim)) <= entries) // (int) cast for MinGW warning; + ++r; // floor() to avoid _ftol() when non-CRT + assert(pow((float) r+1, dim) > entries); + assert((int) floor(pow((float) r, dim)) <= entries); // (int),floor() as above + return r; +} + +// called twice per file +static void compute_twiddle_factors(int n, float *A, float *B, float *C) +{ + int n4 = n >> 2, n8 = n >> 3; + int k,k2; + + for (k=k2=0; k < n4; ++k,k2+=2) { + A[k2 ] = (float) cos(4*k*M_PI/n); + A[k2+1] = (float) -sin(4*k*M_PI/n); + B[k2 ] = (float) cos((k2+1)*M_PI/n/2) * 0.5f; + B[k2+1] = (float) sin((k2+1)*M_PI/n/2) * 0.5f; + } + for (k=k2=0; k < n8; ++k,k2+=2) { + C[k2 ] = (float) cos(2*(k2+1)*M_PI/n); + C[k2+1] = (float) -sin(2*(k2+1)*M_PI/n); + } +} + +static void compute_window(int n, float *window) +{ + int n2 = n >> 1, i; + for (i=0; i < n2; ++i) + window[i] = (float) sin(0.5 * M_PI * square((float) sin((i - 0 + 0.5) / n2 * 0.5 * M_PI))); +} + +static void compute_bitreverse(int n, uint16 *rev) +{ + int ld = ilog(n) - 1; // ilog is off-by-one from normal definitions + int i, n8 = n >> 3; + for (i=0; i < n8; ++i) + rev[i] = (bit_reverse(i) >> (32-ld+3)) << 2; +} + +static int init_blocksize(vorb *f, int b, int n) +{ + int n2 = n >> 1, n4 = n >> 2, n8 = n >> 3; + f->A[b] = (float *) setup_malloc(f, sizeof(float) * n2); + f->B[b] = (float *) setup_malloc(f, sizeof(float) * n2); + f->C[b] = (float *) setup_malloc(f, sizeof(float) * n4); + if (!f->A[b] || !f->B[b] || !f->C[b]) return error(f, VORBIS_outofmem); + compute_twiddle_factors(n, f->A[b], f->B[b], f->C[b]); + f->window[b] = (float *) setup_malloc(f, sizeof(float) * n2); + if (!f->window[b]) return error(f, VORBIS_outofmem); + compute_window(n, f->window[b]); + f->bit_reverse[b] = (uint16 *) setup_malloc(f, sizeof(uint16) * n8); + if (!f->bit_reverse[b]) return error(f, VORBIS_outofmem); + compute_bitreverse(n, f->bit_reverse[b]); + return TRUE; +} + +static void neighbors(uint16 *x, int n, int *plow, int *phigh) +{ + int low = -1; + int high = 65536; + int i; + for (i=0; i < n; ++i) { + if (x[i] > low && x[i] < x[n]) { *plow = i; low = x[i]; } + if (x[i] < high && x[i] > x[n]) { *phigh = i; high = x[i]; } + } +} + +// this has been repurposed so y is now the original index instead of y +typedef struct +{ + uint16 x,id; +} stbv__floor_ordering; + +static int STBV_CDECL point_compare(const void *p, const void *q) +{ + stbv__floor_ordering *a = (stbv__floor_ordering *) p; + stbv__floor_ordering *b = (stbv__floor_ordering *) q; + return a->x < b->x ? -1 : a->x > b->x; +} + +// +/////////////////////// END LEAF SETUP FUNCTIONS ////////////////////////// + + +#if defined(STB_VORBIS_NO_STDIO) + #define USE_MEMORY(z) TRUE +#else + #define USE_MEMORY(z) ((z)->stream) +#endif + +static uint8 get8(vorb *z) +{ + if (USE_MEMORY(z)) { + if (z->stream >= z->stream_end) { z->eof = TRUE; return 0; } + return *z->stream++; + } + + #ifndef STB_VORBIS_NO_STDIO + { + int c = fgetc(z->f); + if (c == EOF) { z->eof = TRUE; return 0; } + return c; + } + #endif +} + +static uint32 get32(vorb *f) +{ + uint32 x; + x = get8(f); + x += get8(f) << 8; + x += get8(f) << 16; + x += (uint32) get8(f) << 24; + return x; +} + +static int getn(vorb *z, uint8 *data, int n) +{ + if (USE_MEMORY(z)) { + if (z->stream+n > z->stream_end) { z->eof = 1; return 0; } + memcpy(data, z->stream, n); + z->stream += n; + return 1; + } + + #ifndef STB_VORBIS_NO_STDIO + if (fread(data, n, 1, z->f) == 1) + return 1; + else { + z->eof = 1; + return 0; + } + #endif +} + +static void skip(vorb *z, int n) +{ + if (USE_MEMORY(z)) { + z->stream += n; + if (z->stream >= z->stream_end) z->eof = 1; + return; + } + #ifndef STB_VORBIS_NO_STDIO + { + long x = ftell(z->f); + fseek(z->f, x+n, SEEK_SET); + } + #endif +} + +static int set_file_offset(stb_vorbis *f, unsigned int loc) +{ + #ifndef STB_VORBIS_NO_PUSHDATA_API + if (f->push_mode) return 0; + #endif + f->eof = 0; + if (USE_MEMORY(f)) { + if (f->stream_start + loc >= f->stream_end || f->stream_start + loc < f->stream_start) { + f->stream = f->stream_end; + f->eof = 1; + return 0; + } else { + f->stream = f->stream_start + loc; + return 1; + } + } + #ifndef STB_VORBIS_NO_STDIO + if (loc + f->f_start < loc || loc >= 0x80000000) { + loc = 0x7fffffff; + f->eof = 1; + } else { + loc += f->f_start; + } + if (!fseek(f->f, loc, SEEK_SET)) + return 1; + f->eof = 1; + fseek(f->f, f->f_start, SEEK_END); + return 0; + #endif +} + + +static uint8 ogg_page_header[4] = { 0x4f, 0x67, 0x67, 0x53 }; + +static int capture_pattern(vorb *f) +{ + if (0x4f != get8(f)) return FALSE; + if (0x67 != get8(f)) return FALSE; + if (0x67 != get8(f)) return FALSE; + if (0x53 != get8(f)) return FALSE; + return TRUE; +} + +#define PAGEFLAG_continued_packet 1 +#define PAGEFLAG_first_page 2 +#define PAGEFLAG_last_page 4 + +static int start_page_no_capturepattern(vorb *f) +{ + uint32 loc0,loc1,n; + // stream structure version + if (0 != get8(f)) return error(f, VORBIS_invalid_stream_structure_version); + // header flag + f->page_flag = get8(f); + // absolute granule position + loc0 = get32(f); + loc1 = get32(f); + // @TODO: validate loc0,loc1 as valid positions? + // stream serial number -- vorbis doesn't interleave, so discard + get32(f); + //if (f->serial != get32(f)) return error(f, VORBIS_incorrect_stream_serial_number); + // page sequence number + n = get32(f); + f->last_page = n; + // CRC32 + get32(f); + // page_segments + f->segment_count = get8(f); + if (!getn(f, f->segments, f->segment_count)) + return error(f, VORBIS_unexpected_eof); + // assume we _don't_ know any the sample position of any segments + f->end_seg_with_known_loc = -2; + if (loc0 != ~0U || loc1 != ~0U) { + int i; + // determine which packet is the last one that will complete + for (i=f->segment_count-1; i >= 0; --i) + if (f->segments[i] < 255) + break; + // 'i' is now the index of the _last_ segment of a packet that ends + if (i >= 0) { + f->end_seg_with_known_loc = i; + f->known_loc_for_packet = loc0; + } + } + if (f->first_decode) { + int i,len; + ProbedPage p; + len = 0; + for (i=0; i < f->segment_count; ++i) + len += f->segments[i]; + len += 27 + f->segment_count; + p.page_start = f->first_audio_page_offset; + p.page_end = p.page_start + len; + p.last_decoded_sample = loc0; + f->p_first = p; + } + f->next_seg = 0; + return TRUE; +} + +static int start_page(vorb *f) +{ + if (!capture_pattern(f)) return error(f, VORBIS_missing_capture_pattern); + return start_page_no_capturepattern(f); +} + +static int start_packet(vorb *f) +{ + while (f->next_seg == -1) { + if (!start_page(f)) return FALSE; + if (f->page_flag & PAGEFLAG_continued_packet) + return error(f, VORBIS_continued_packet_flag_invalid); + } + f->last_seg = FALSE; + f->valid_bits = 0; + f->packet_bytes = 0; + f->bytes_in_seg = 0; + // f->next_seg is now valid + return TRUE; +} + +static int maybe_start_packet(vorb *f) +{ + if (f->next_seg == -1) { + int x = get8(f); + if (f->eof) return FALSE; // EOF at page boundary is not an error! + if (0x4f != x ) return error(f, VORBIS_missing_capture_pattern); + if (0x67 != get8(f)) return error(f, VORBIS_missing_capture_pattern); + if (0x67 != get8(f)) return error(f, VORBIS_missing_capture_pattern); + if (0x53 != get8(f)) return error(f, VORBIS_missing_capture_pattern); + if (!start_page_no_capturepattern(f)) return FALSE; + if (f->page_flag & PAGEFLAG_continued_packet) { + // set up enough state that we can read this packet if we want, + // e.g. during recovery + f->last_seg = FALSE; + f->bytes_in_seg = 0; + return error(f, VORBIS_continued_packet_flag_invalid); + } + } + return start_packet(f); +} + +static int next_segment(vorb *f) +{ + int len; + if (f->last_seg) return 0; + if (f->next_seg == -1) { + f->last_seg_which = f->segment_count-1; // in case start_page fails + if (!start_page(f)) { f->last_seg = 1; return 0; } + if (!(f->page_flag & PAGEFLAG_continued_packet)) return error(f, VORBIS_continued_packet_flag_invalid); + } + len = f->segments[f->next_seg++]; + if (len < 255) { + f->last_seg = TRUE; + f->last_seg_which = f->next_seg-1; + } + if (f->next_seg >= f->segment_count) + f->next_seg = -1; + assert(f->bytes_in_seg == 0); + f->bytes_in_seg = len; + return len; +} + +#define EOP (-1) +#define INVALID_BITS (-1) + +static int get8_packet_raw(vorb *f) +{ + if (!f->bytes_in_seg) { // CLANG! + if (f->last_seg) return EOP; + else if (!next_segment(f)) return EOP; + } + assert(f->bytes_in_seg > 0); + --f->bytes_in_seg; + ++f->packet_bytes; + return get8(f); +} + +static int get8_packet(vorb *f) +{ + int x = get8_packet_raw(f); + f->valid_bits = 0; + return x; +} + +static void flush_packet(vorb *f) +{ + while (get8_packet_raw(f) != EOP); +} + +// @OPTIMIZE: this is the secondary bit decoder, so it's probably not as important +// as the huffman decoder? +static uint32 get_bits(vorb *f, int n) +{ + uint32 z; + + if (f->valid_bits < 0) return 0; + if (f->valid_bits < n) { + if (n > 24) { + // the accumulator technique below would not work correctly in this case + z = get_bits(f, 24); + z += get_bits(f, n-24) << 24; + return z; + } + if (f->valid_bits == 0) f->acc = 0; + while (f->valid_bits < n) { + int z = get8_packet_raw(f); + if (z == EOP) { + f->valid_bits = INVALID_BITS; + return 0; + } + f->acc += z << f->valid_bits; + f->valid_bits += 8; + } + } + if (f->valid_bits < 0) return 0; + z = f->acc & ((1 << n)-1); + f->acc >>= n; + f->valid_bits -= n; + return z; +} + +// @OPTIMIZE: primary accumulator for huffman +// expand the buffer to as many bits as possible without reading off end of packet +// it might be nice to allow f->valid_bits and f->acc to be stored in registers, +// e.g. cache them locally and decode locally +static __forceinline void prep_huffman(vorb *f) +{ + if (f->valid_bits <= 24) { + if (f->valid_bits == 0) f->acc = 0; + do { + int z; + if (f->last_seg && !f->bytes_in_seg) return; + z = get8_packet_raw(f); + if (z == EOP) return; + f->acc += (unsigned) z << f->valid_bits; + f->valid_bits += 8; + } while (f->valid_bits <= 24); + } +} + +enum +{ + VORBIS_packet_id = 1, + VORBIS_packet_comment = 3, + VORBIS_packet_setup = 5 +}; + +static int codebook_decode_scalar_raw(vorb *f, Codebook *c) +{ + int i; + prep_huffman(f); + + if (c->codewords == NULL && c->sorted_codewords == NULL) + return -1; + + // cases to use binary search: sorted_codewords && !c->codewords + // sorted_codewords && c->entries > 8 + if (c->entries > 8 ? c->sorted_codewords!=NULL : !c->codewords) { + // binary search + uint32 code = bit_reverse(f->acc); + int x=0, n=c->sorted_entries, len; + + while (n > 1) { + // invariant: sc[x] <= code < sc[x+n] + int m = x + (n >> 1); + if (c->sorted_codewords[m] <= code) { + x = m; + n -= (n>>1); + } else { + n >>= 1; + } + } + // x is now the sorted index + if (!c->sparse) x = c->sorted_values[x]; + // x is now sorted index if sparse, or symbol otherwise + len = c->codeword_lengths[x]; + if (f->valid_bits >= len) { + f->acc >>= len; + f->valid_bits -= len; + return x; + } + + f->valid_bits = 0; + return -1; + } + + // if small, linear search + assert(!c->sparse); + for (i=0; i < c->entries; ++i) { + if (c->codeword_lengths[i] == NO_CODE) continue; + if (c->codewords[i] == (f->acc & ((1 << c->codeword_lengths[i])-1))) { + if (f->valid_bits >= c->codeword_lengths[i]) { + f->acc >>= c->codeword_lengths[i]; + f->valid_bits -= c->codeword_lengths[i]; + return i; + } + f->valid_bits = 0; + return -1; + } + } + + error(f, VORBIS_invalid_stream); + f->valid_bits = 0; + return -1; +} + +#ifndef STB_VORBIS_NO_INLINE_DECODE + +#define DECODE_RAW(var, f,c) \ + if (f->valid_bits < STB_VORBIS_FAST_HUFFMAN_LENGTH) \ + prep_huffman(f); \ + var = f->acc & FAST_HUFFMAN_TABLE_MASK; \ + var = c->fast_huffman[var]; \ + if (var >= 0) { \ + int n = c->codeword_lengths[var]; \ + f->acc >>= n; \ + f->valid_bits -= n; \ + if (f->valid_bits < 0) { f->valid_bits = 0; var = -1; } \ + } else { \ + var = codebook_decode_scalar_raw(f,c); \ + } + +#else + +static int codebook_decode_scalar(vorb *f, Codebook *c) +{ + int i; + if (f->valid_bits < STB_VORBIS_FAST_HUFFMAN_LENGTH) + prep_huffman(f); + // fast huffman table lookup + i = f->acc & FAST_HUFFMAN_TABLE_MASK; + i = c->fast_huffman[i]; + if (i >= 0) { + f->acc >>= c->codeword_lengths[i]; + f->valid_bits -= c->codeword_lengths[i]; + if (f->valid_bits < 0) { f->valid_bits = 0; return -1; } + return i; + } + return codebook_decode_scalar_raw(f,c); +} + +#define DECODE_RAW(var,f,c) var = codebook_decode_scalar(f,c); + +#endif + +#define DECODE(var,f,c) \ + DECODE_RAW(var,f,c) \ + if (c->sparse) var = c->sorted_values[var]; + +#ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK + #define DECODE_VQ(var,f,c) DECODE_RAW(var,f,c) +#else + #define DECODE_VQ(var,f,c) DECODE(var,f,c) +#endif + + + + + + +// CODEBOOK_ELEMENT_FAST is an optimization for the CODEBOOK_FLOATS case +// where we avoid one addition +#define CODEBOOK_ELEMENT(c,off) (c->multiplicands[off]) +#define CODEBOOK_ELEMENT_FAST(c,off) (c->multiplicands[off]) +#define CODEBOOK_ELEMENT_BASE(c) (0) + +static int codebook_decode_start(vorb *f, Codebook *c) +{ + int z = -1; + + // type 0 is only legal in a scalar context + if (c->lookup_type == 0) + error(f, VORBIS_invalid_stream); + else { + DECODE_VQ(z,f,c); + if (c->sparse) assert(z < c->sorted_entries); + if (z < 0) { // check for EOP + if (!f->bytes_in_seg) + if (f->last_seg) + return z; + error(f, VORBIS_invalid_stream); + } + } + return z; +} + +static int codebook_decode(vorb *f, Codebook *c, float *output, int len) +{ + int i,z = codebook_decode_start(f,c); + if (z < 0) return FALSE; + if (len > c->dimensions) len = c->dimensions; + +#ifdef STB_VORBIS_DIVIDES_IN_CODEBOOK + if (c->lookup_type == 1) { + float last = CODEBOOK_ELEMENT_BASE(c); + int div = 1; + for (i=0; i < len; ++i) { + int off = (z / div) % c->lookup_values; + float val = CODEBOOK_ELEMENT_FAST(c,off) + last; + output[i] += val; + if (c->sequence_p) last = val + c->minimum_value; + div *= c->lookup_values; + } + return TRUE; + } +#endif + + z *= c->dimensions; + if (c->sequence_p) { + float last = CODEBOOK_ELEMENT_BASE(c); + for (i=0; i < len; ++i) { + float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last; + output[i] += val; + last = val + c->minimum_value; + } + } else { + float last = CODEBOOK_ELEMENT_BASE(c); + for (i=0; i < len; ++i) { + output[i] += CODEBOOK_ELEMENT_FAST(c,z+i) + last; + } + } + + return TRUE; +} + +static int codebook_decode_step(vorb *f, Codebook *c, float *output, int len, int step) +{ + int i,z = codebook_decode_start(f,c); + float last = CODEBOOK_ELEMENT_BASE(c); + if (z < 0) return FALSE; + if (len > c->dimensions) len = c->dimensions; + +#ifdef STB_VORBIS_DIVIDES_IN_CODEBOOK + if (c->lookup_type == 1) { + int div = 1; + for (i=0; i < len; ++i) { + int off = (z / div) % c->lookup_values; + float val = CODEBOOK_ELEMENT_FAST(c,off) + last; + output[i*step] += val; + if (c->sequence_p) last = val; + div *= c->lookup_values; + } + return TRUE; + } +#endif + + z *= c->dimensions; + for (i=0; i < len; ++i) { + float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last; + output[i*step] += val; + if (c->sequence_p) last = val; + } + + return TRUE; +} + +static int codebook_decode_deinterleave_repeat(vorb *f, Codebook *c, float **outputs, int ch, int *c_inter_p, int *p_inter_p, int len, int total_decode) +{ + int c_inter = *c_inter_p; + int p_inter = *p_inter_p; + int i,z, effective = c->dimensions; + + // type 0 is only legal in a scalar context + if (c->lookup_type == 0) return error(f, VORBIS_invalid_stream); + + while (total_decode > 0) { + float last = CODEBOOK_ELEMENT_BASE(c); + DECODE_VQ(z,f,c); + #ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK + assert(!c->sparse || z < c->sorted_entries); + #endif + if (z < 0) { + if (!f->bytes_in_seg) + if (f->last_seg) return FALSE; + return error(f, VORBIS_invalid_stream); + } + + // if this will take us off the end of the buffers, stop short! + // we check by computing the length of the virtual interleaved + // buffer (len*ch), our current offset within it (p_inter*ch)+(c_inter), + // and the length we'll be using (effective) + if (c_inter + p_inter*ch + effective > len * ch) { + effective = len*ch - (p_inter*ch - c_inter); + } + + #ifdef STB_VORBIS_DIVIDES_IN_CODEBOOK + if (c->lookup_type == 1) { + int div = 1; + for (i=0; i < effective; ++i) { + int off = (z / div) % c->lookup_values; + float val = CODEBOOK_ELEMENT_FAST(c,off) + last; + if (outputs[c_inter]) + outputs[c_inter][p_inter] += val; + if (++c_inter == ch) { c_inter = 0; ++p_inter; } + if (c->sequence_p) last = val; + div *= c->lookup_values; + } + } else + #endif + { + z *= c->dimensions; + if (c->sequence_p) { + for (i=0; i < effective; ++i) { + float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last; + if (outputs[c_inter]) + outputs[c_inter][p_inter] += val; + if (++c_inter == ch) { c_inter = 0; ++p_inter; } + last = val; + } + } else { + for (i=0; i < effective; ++i) { + float val = CODEBOOK_ELEMENT_FAST(c,z+i) + last; + if (outputs[c_inter]) + outputs[c_inter][p_inter] += val; + if (++c_inter == ch) { c_inter = 0; ++p_inter; } + } + } + } + + total_decode -= effective; + } + *c_inter_p = c_inter; + *p_inter_p = p_inter; + return TRUE; +} + +static int predict_point(int x, int x0, int x1, int y0, int y1) +{ + int dy = y1 - y0; + int adx = x1 - x0; + // @OPTIMIZE: force int division to round in the right direction... is this necessary on x86? + int err = abs(dy) * (x - x0); + int off = err / adx; + return dy < 0 ? y0 - off : y0 + off; +} + +// the following table is block-copied from the specification +static float inverse_db_table[256] = +{ + 1.0649863e-07f, 1.1341951e-07f, 1.2079015e-07f, 1.2863978e-07f, + 1.3699951e-07f, 1.4590251e-07f, 1.5538408e-07f, 1.6548181e-07f, + 1.7623575e-07f, 1.8768855e-07f, 1.9988561e-07f, 2.1287530e-07f, + 2.2670913e-07f, 2.4144197e-07f, 2.5713223e-07f, 2.7384213e-07f, + 2.9163793e-07f, 3.1059021e-07f, 3.3077411e-07f, 3.5226968e-07f, + 3.7516214e-07f, 3.9954229e-07f, 4.2550680e-07f, 4.5315863e-07f, + 4.8260743e-07f, 5.1396998e-07f, 5.4737065e-07f, 5.8294187e-07f, + 6.2082472e-07f, 6.6116941e-07f, 7.0413592e-07f, 7.4989464e-07f, + 7.9862701e-07f, 8.5052630e-07f, 9.0579828e-07f, 9.6466216e-07f, + 1.0273513e-06f, 1.0941144e-06f, 1.1652161e-06f, 1.2409384e-06f, + 1.3215816e-06f, 1.4074654e-06f, 1.4989305e-06f, 1.5963394e-06f, + 1.7000785e-06f, 1.8105592e-06f, 1.9282195e-06f, 2.0535261e-06f, + 2.1869758e-06f, 2.3290978e-06f, 2.4804557e-06f, 2.6416497e-06f, + 2.8133190e-06f, 2.9961443e-06f, 3.1908506e-06f, 3.3982101e-06f, + 3.6190449e-06f, 3.8542308e-06f, 4.1047004e-06f, 4.3714470e-06f, + 4.6555282e-06f, 4.9580707e-06f, 5.2802740e-06f, 5.6234160e-06f, + 5.9888572e-06f, 6.3780469e-06f, 6.7925283e-06f, 7.2339451e-06f, + 7.7040476e-06f, 8.2047000e-06f, 8.7378876e-06f, 9.3057248e-06f, + 9.9104632e-06f, 1.0554501e-05f, 1.1240392e-05f, 1.1970856e-05f, + 1.2748789e-05f, 1.3577278e-05f, 1.4459606e-05f, 1.5399272e-05f, + 1.6400004e-05f, 1.7465768e-05f, 1.8600792e-05f, 1.9809576e-05f, + 2.1096914e-05f, 2.2467911e-05f, 2.3928002e-05f, 2.5482978e-05f, + 2.7139006e-05f, 2.8902651e-05f, 3.0780908e-05f, 3.2781225e-05f, + 3.4911534e-05f, 3.7180282e-05f, 3.9596466e-05f, 4.2169667e-05f, + 4.4910090e-05f, 4.7828601e-05f, 5.0936773e-05f, 5.4246931e-05f, + 5.7772202e-05f, 6.1526565e-05f, 6.5524908e-05f, 6.9783085e-05f, + 7.4317983e-05f, 7.9147585e-05f, 8.4291040e-05f, 8.9768747e-05f, + 9.5602426e-05f, 0.00010181521f, 0.00010843174f, 0.00011547824f, + 0.00012298267f, 0.00013097477f, 0.00013948625f, 0.00014855085f, + 0.00015820453f, 0.00016848555f, 0.00017943469f, 0.00019109536f, + 0.00020351382f, 0.00021673929f, 0.00023082423f, 0.00024582449f, + 0.00026179955f, 0.00027881276f, 0.00029693158f, 0.00031622787f, + 0.00033677814f, 0.00035866388f, 0.00038197188f, 0.00040679456f, + 0.00043323036f, 0.00046138411f, 0.00049136745f, 0.00052329927f, + 0.00055730621f, 0.00059352311f, 0.00063209358f, 0.00067317058f, + 0.00071691700f, 0.00076350630f, 0.00081312324f, 0.00086596457f, + 0.00092223983f, 0.00098217216f, 0.0010459992f, 0.0011139742f, + 0.0011863665f, 0.0012634633f, 0.0013455702f, 0.0014330129f, + 0.0015261382f, 0.0016253153f, 0.0017309374f, 0.0018434235f, + 0.0019632195f, 0.0020908006f, 0.0022266726f, 0.0023713743f, + 0.0025254795f, 0.0026895994f, 0.0028643847f, 0.0030505286f, + 0.0032487691f, 0.0034598925f, 0.0036847358f, 0.0039241906f, + 0.0041792066f, 0.0044507950f, 0.0047400328f, 0.0050480668f, + 0.0053761186f, 0.0057254891f, 0.0060975636f, 0.0064938176f, + 0.0069158225f, 0.0073652516f, 0.0078438871f, 0.0083536271f, + 0.0088964928f, 0.009474637f, 0.010090352f, 0.010746080f, + 0.011444421f, 0.012188144f, 0.012980198f, 0.013823725f, + 0.014722068f, 0.015678791f, 0.016697687f, 0.017782797f, + 0.018938423f, 0.020169149f, 0.021479854f, 0.022875735f, + 0.024362330f, 0.025945531f, 0.027631618f, 0.029427276f, + 0.031339626f, 0.033376252f, 0.035545228f, 0.037855157f, + 0.040315199f, 0.042935108f, 0.045725273f, 0.048696758f, + 0.051861348f, 0.055231591f, 0.058820850f, 0.062643361f, + 0.066714279f, 0.071049749f, 0.075666962f, 0.080584227f, + 0.085821044f, 0.091398179f, 0.097337747f, 0.10366330f, + 0.11039993f, 0.11757434f, 0.12521498f, 0.13335215f, + 0.14201813f, 0.15124727f, 0.16107617f, 0.17154380f, + 0.18269168f, 0.19456402f, 0.20720788f, 0.22067342f, + 0.23501402f, 0.25028656f, 0.26655159f, 0.28387361f, + 0.30232132f, 0.32196786f, 0.34289114f, 0.36517414f, + 0.38890521f, 0.41417847f, 0.44109412f, 0.46975890f, + 0.50028648f, 0.53279791f, 0.56742212f, 0.60429640f, + 0.64356699f, 0.68538959f, 0.72993007f, 0.77736504f, + 0.82788260f, 0.88168307f, 0.9389798f, 1.0f +}; + + +// @OPTIMIZE: if you want to replace this bresenham line-drawing routine, +// note that you must produce bit-identical output to decode correctly; +// this specific sequence of operations is specified in the spec (it's +// drawing integer-quantized frequency-space lines that the encoder +// expects to be exactly the same) +// ... also, isn't the whole point of Bresenham's algorithm to NOT +// have to divide in the setup? sigh. +#ifndef STB_VORBIS_NO_DEFER_FLOOR +#define LINE_OP(a,b) a *= b +#else +#define LINE_OP(a,b) a = b +#endif + +#ifdef STB_VORBIS_DIVIDE_TABLE +#define DIVTAB_NUMER 32 +#define DIVTAB_DENOM 64 +int8 integer_divide_table[DIVTAB_NUMER][DIVTAB_DENOM]; // 2KB +#endif + +static __forceinline void draw_line(float *output, int x0, int y0, int x1, int y1, int n) +{ + int dy = y1 - y0; + int adx = x1 - x0; + int ady = abs(dy); + int base; + int x=x0,y=y0; + int err = 0; + int sy; + +#ifdef STB_VORBIS_DIVIDE_TABLE + if (adx < DIVTAB_DENOM && ady < DIVTAB_NUMER) { + if (dy < 0) { + base = -integer_divide_table[ady][adx]; + sy = base-1; + } else { + base = integer_divide_table[ady][adx]; + sy = base+1; + } + } else { + base = dy / adx; + if (dy < 0) + sy = base - 1; + else + sy = base+1; + } +#else + base = dy / adx; + if (dy < 0) + sy = base - 1; + else + sy = base+1; +#endif + ady -= abs(base) * adx; + if (x1 > n) x1 = n; + if (x < x1) { + LINE_OP(output[x], inverse_db_table[y]); + for (++x; x < x1; ++x) { + err += ady; + if (err >= adx) { + err -= adx; + y += sy; + } else + y += base; + LINE_OP(output[x], inverse_db_table[y]); + } + } +} + +static int residue_decode(vorb *f, Codebook *book, float *target, int offset, int n, int rtype) +{ + int k; + if (rtype == 0) { + int step = n / book->dimensions; + for (k=0; k < step; ++k) + if (!codebook_decode_step(f, book, target+offset+k, n-offset-k, step)) + return FALSE; + } else { + for (k=0; k < n; ) { + if (!codebook_decode(f, book, target+offset, n-k)) + return FALSE; + k += book->dimensions; + offset += book->dimensions; + } + } + return TRUE; +} + +// n is 1/2 of the blocksize -- +// specification: "Correct per-vector decode length is [n]/2" +static void decode_residue(vorb *f, float *residue_buffers[], int ch, int n, int rn, uint8 *do_not_decode) +{ + int i,j,pass; + Residue *r = f->residue_config + rn; + int rtype = f->residue_types[rn]; + int c = r->classbook; + int classwords = f->codebooks[c].dimensions; + unsigned int actual_size = rtype == 2 ? n*2 : n; + unsigned int limit_r_begin = (r->begin < actual_size ? r->begin : actual_size); + unsigned int limit_r_end = (r->end < actual_size ? r->end : actual_size); + int n_read = limit_r_end - limit_r_begin; + int part_read = n_read / r->part_size; + int temp_alloc_point = temp_alloc_save(f); + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + uint8 ***part_classdata = (uint8 ***) temp_block_array(f,f->channels, part_read * sizeof(**part_classdata)); + #else + int **classifications = (int **) temp_block_array(f,f->channels, part_read * sizeof(**classifications)); + #endif + + CHECK(f); + + for (i=0; i < ch; ++i) + if (!do_not_decode[i]) + memset(residue_buffers[i], 0, sizeof(float) * n); + + if (rtype == 2 && ch != 1) { + for (j=0; j < ch; ++j) + if (!do_not_decode[j]) + break; + if (j == ch) + goto done; + + for (pass=0; pass < 8; ++pass) { + int pcount = 0, class_set = 0; + if (ch == 2) { + while (pcount < part_read) { + int z = r->begin + pcount*r->part_size; + int c_inter = (z & 1), p_inter = z>>1; + if (pass == 0) { + Codebook *c = f->codebooks+r->classbook; + int q; + DECODE(q,f,c); + if (q == EOP) goto done; + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + part_classdata[0][class_set] = r->classdata[q]; + #else + for (i=classwords-1; i >= 0; --i) { + classifications[0][i+pcount] = q % r->classifications; + q /= r->classifications; + } + #endif + } + for (i=0; i < classwords && pcount < part_read; ++i, ++pcount) { + int z = r->begin + pcount*r->part_size; + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + int c = part_classdata[0][class_set][i]; + #else + int c = classifications[0][pcount]; + #endif + int b = r->residue_books[c][pass]; + if (b >= 0) { + Codebook *book = f->codebooks + b; + #ifdef STB_VORBIS_DIVIDES_IN_CODEBOOK + if (!codebook_decode_deinterleave_repeat(f, book, residue_buffers, ch, &c_inter, &p_inter, n, r->part_size)) + goto done; + #else + // saves 1% + if (!codebook_decode_deinterleave_repeat(f, book, residue_buffers, ch, &c_inter, &p_inter, n, r->part_size)) + goto done; + #endif + } else { + z += r->part_size; + c_inter = z & 1; + p_inter = z >> 1; + } + } + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + ++class_set; + #endif + } + } else if (ch == 1) { + while (pcount < part_read) { + int z = r->begin + pcount*r->part_size; + int c_inter = 0, p_inter = z; + if (pass == 0) { + Codebook *c = f->codebooks+r->classbook; + int q; + DECODE(q,f,c); + if (q == EOP) goto done; + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + part_classdata[0][class_set] = r->classdata[q]; + #else + for (i=classwords-1; i >= 0; --i) { + classifications[0][i+pcount] = q % r->classifications; + q /= r->classifications; + } + #endif + } + for (i=0; i < classwords && pcount < part_read; ++i, ++pcount) { + int z = r->begin + pcount*r->part_size; + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + int c = part_classdata[0][class_set][i]; + #else + int c = classifications[0][pcount]; + #endif + int b = r->residue_books[c][pass]; + if (b >= 0) { + Codebook *book = f->codebooks + b; + if (!codebook_decode_deinterleave_repeat(f, book, residue_buffers, ch, &c_inter, &p_inter, n, r->part_size)) + goto done; + } else { + z += r->part_size; + c_inter = 0; + p_inter = z; + } + } + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + ++class_set; + #endif + } + } else { + while (pcount < part_read) { + int z = r->begin + pcount*r->part_size; + int c_inter = z % ch, p_inter = z/ch; + if (pass == 0) { + Codebook *c = f->codebooks+r->classbook; + int q; + DECODE(q,f,c); + if (q == EOP) goto done; + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + part_classdata[0][class_set] = r->classdata[q]; + #else + for (i=classwords-1; i >= 0; --i) { + classifications[0][i+pcount] = q % r->classifications; + q /= r->classifications; + } + #endif + } + for (i=0; i < classwords && pcount < part_read; ++i, ++pcount) { + int z = r->begin + pcount*r->part_size; + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + int c = part_classdata[0][class_set][i]; + #else + int c = classifications[0][pcount]; + #endif + int b = r->residue_books[c][pass]; + if (b >= 0) { + Codebook *book = f->codebooks + b; + if (!codebook_decode_deinterleave_repeat(f, book, residue_buffers, ch, &c_inter, &p_inter, n, r->part_size)) + goto done; + } else { + z += r->part_size; + c_inter = z % ch; + p_inter = z / ch; + } + } + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + ++class_set; + #endif + } + } + } + goto done; + } + CHECK(f); + + for (pass=0; pass < 8; ++pass) { + int pcount = 0, class_set=0; + while (pcount < part_read) { + if (pass == 0) { + for (j=0; j < ch; ++j) { + if (!do_not_decode[j]) { + Codebook *c = f->codebooks+r->classbook; + int temp; + DECODE(temp,f,c); + if (temp == EOP) goto done; + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + part_classdata[j][class_set] = r->classdata[temp]; + #else + for (i=classwords-1; i >= 0; --i) { + classifications[j][i+pcount] = temp % r->classifications; + temp /= r->classifications; + } + #endif + } + } + } + for (i=0; i < classwords && pcount < part_read; ++i, ++pcount) { + for (j=0; j < ch; ++j) { + if (!do_not_decode[j]) { + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + int c = part_classdata[j][class_set][i]; + #else + int c = classifications[j][pcount]; + #endif + int b = r->residue_books[c][pass]; + if (b >= 0) { + float *target = residue_buffers[j]; + int offset = r->begin + pcount * r->part_size; + int n = r->part_size; + Codebook *book = f->codebooks + b; + if (!residue_decode(f, book, target, offset, n, rtype)) + goto done; + } + } + } + } + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + ++class_set; + #endif + } + } + done: + CHECK(f); + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + temp_free(f,part_classdata); + #else + temp_free(f,classifications); + #endif + temp_alloc_restore(f,temp_alloc_point); +} + + +#if 0 +// slow way for debugging +void inverse_mdct_slow(float *buffer, int n) +{ + int i,j; + int n2 = n >> 1; + float *x = (float *) malloc(sizeof(*x) * n2); + memcpy(x, buffer, sizeof(*x) * n2); + for (i=0; i < n; ++i) { + float acc = 0; + for (j=0; j < n2; ++j) + // formula from paper: + //acc += n/4.0f * x[j] * (float) cos(M_PI / 2 / n * (2 * i + 1 + n/2.0)*(2*j+1)); + // formula from wikipedia + //acc += 2.0f / n2 * x[j] * (float) cos(M_PI/n2 * (i + 0.5 + n2/2)*(j + 0.5)); + // these are equivalent, except the formula from the paper inverts the multiplier! + // however, what actually works is NO MULTIPLIER!?! + //acc += 64 * 2.0f / n2 * x[j] * (float) cos(M_PI/n2 * (i + 0.5 + n2/2)*(j + 0.5)); + acc += x[j] * (float) cos(M_PI / 2 / n * (2 * i + 1 + n/2.0)*(2*j+1)); + buffer[i] = acc; + } + free(x); +} +#elif 0 +// same as above, but just barely able to run in real time on modern machines +void inverse_mdct_slow(float *buffer, int n, vorb *f, int blocktype) +{ + float mcos[16384]; + int i,j; + int n2 = n >> 1, nmask = (n << 2) -1; + float *x = (float *) malloc(sizeof(*x) * n2); + memcpy(x, buffer, sizeof(*x) * n2); + for (i=0; i < 4*n; ++i) + mcos[i] = (float) cos(M_PI / 2 * i / n); + + for (i=0; i < n; ++i) { + float acc = 0; + for (j=0; j < n2; ++j) + acc += x[j] * mcos[(2 * i + 1 + n2)*(2*j+1) & nmask]; + buffer[i] = acc; + } + free(x); +} +#elif 0 +// transform to use a slow dct-iv; this is STILL basically trivial, +// but only requires half as many ops +void dct_iv_slow(float *buffer, int n) +{ + float mcos[16384]; + float x[2048]; + int i,j; + int n2 = n >> 1, nmask = (n << 3) - 1; + memcpy(x, buffer, sizeof(*x) * n); + for (i=0; i < 8*n; ++i) + mcos[i] = (float) cos(M_PI / 4 * i / n); + for (i=0; i < n; ++i) { + float acc = 0; + for (j=0; j < n; ++j) + acc += x[j] * mcos[((2 * i + 1)*(2*j+1)) & nmask]; + buffer[i] = acc; + } +} + +void inverse_mdct_slow(float *buffer, int n, vorb *f, int blocktype) +{ + int i, n4 = n >> 2, n2 = n >> 1, n3_4 = n - n4; + float temp[4096]; + + memcpy(temp, buffer, n2 * sizeof(float)); + dct_iv_slow(temp, n2); // returns -c'-d, a-b' + + for (i=0; i < n4 ; ++i) buffer[i] = temp[i+n4]; // a-b' + for ( ; i < n3_4; ++i) buffer[i] = -temp[n3_4 - i - 1]; // b-a', c+d' + for ( ; i < n ; ++i) buffer[i] = -temp[i - n3_4]; // c'+d +} +#endif + +#ifndef LIBVORBIS_MDCT +#define LIBVORBIS_MDCT 0 +#endif + +#if LIBVORBIS_MDCT +// directly call the vorbis MDCT using an interface documented +// by Jeff Roberts... useful for performance comparison +typedef struct +{ + int n; + int log2n; + + float *trig; + int *bitrev; + + float scale; +} mdct_lookup; + +extern void mdct_init(mdct_lookup *lookup, int n); +extern void mdct_clear(mdct_lookup *l); +extern void mdct_backward(mdct_lookup *init, float *in, float *out); + +mdct_lookup M1,M2; + +void inverse_mdct(float *buffer, int n, vorb *f, int blocktype) +{ + mdct_lookup *M; + if (M1.n == n) M = &M1; + else if (M2.n == n) M = &M2; + else if (M1.n == 0) { mdct_init(&M1, n); M = &M1; } + else { + if (M2.n) __asm int 3; + mdct_init(&M2, n); + M = &M2; + } + + mdct_backward(M, buffer, buffer); +} +#endif + + +// the following were split out into separate functions while optimizing; +// they could be pushed back up but eh. __forceinline showed no change; +// they're probably already being inlined. +static void imdct_step3_iter0_loop(int n, float *e, int i_off, int k_off, float *A) +{ + float *ee0 = e + i_off; + float *ee2 = ee0 + k_off; + int i; + + assert((n & 3) == 0); + for (i=(n>>2); i > 0; --i) { + float k00_20, k01_21; + k00_20 = ee0[ 0] - ee2[ 0]; + k01_21 = ee0[-1] - ee2[-1]; + ee0[ 0] += ee2[ 0];//ee0[ 0] = ee0[ 0] + ee2[ 0]; + ee0[-1] += ee2[-1];//ee0[-1] = ee0[-1] + ee2[-1]; + ee2[ 0] = k00_20 * A[0] - k01_21 * A[1]; + ee2[-1] = k01_21 * A[0] + k00_20 * A[1]; + A += 8; + + k00_20 = ee0[-2] - ee2[-2]; + k01_21 = ee0[-3] - ee2[-3]; + ee0[-2] += ee2[-2];//ee0[-2] = ee0[-2] + ee2[-2]; + ee0[-3] += ee2[-3];//ee0[-3] = ee0[-3] + ee2[-3]; + ee2[-2] = k00_20 * A[0] - k01_21 * A[1]; + ee2[-3] = k01_21 * A[0] + k00_20 * A[1]; + A += 8; + + k00_20 = ee0[-4] - ee2[-4]; + k01_21 = ee0[-5] - ee2[-5]; + ee0[-4] += ee2[-4];//ee0[-4] = ee0[-4] + ee2[-4]; + ee0[-5] += ee2[-5];//ee0[-5] = ee0[-5] + ee2[-5]; + ee2[-4] = k00_20 * A[0] - k01_21 * A[1]; + ee2[-5] = k01_21 * A[0] + k00_20 * A[1]; + A += 8; + + k00_20 = ee0[-6] - ee2[-6]; + k01_21 = ee0[-7] - ee2[-7]; + ee0[-6] += ee2[-6];//ee0[-6] = ee0[-6] + ee2[-6]; + ee0[-7] += ee2[-7];//ee0[-7] = ee0[-7] + ee2[-7]; + ee2[-6] = k00_20 * A[0] - k01_21 * A[1]; + ee2[-7] = k01_21 * A[0] + k00_20 * A[1]; + A += 8; + ee0 -= 8; + ee2 -= 8; + } +} + +static void imdct_step3_inner_r_loop(int lim, float *e, int d0, int k_off, float *A, int k1) +{ + int i; + float k00_20, k01_21; + + float *e0 = e + d0; + float *e2 = e0 + k_off; + + for (i=lim >> 2; i > 0; --i) { + k00_20 = e0[-0] - e2[-0]; + k01_21 = e0[-1] - e2[-1]; + e0[-0] += e2[-0];//e0[-0] = e0[-0] + e2[-0]; + e0[-1] += e2[-1];//e0[-1] = e0[-1] + e2[-1]; + e2[-0] = (k00_20)*A[0] - (k01_21) * A[1]; + e2[-1] = (k01_21)*A[0] + (k00_20) * A[1]; + + A += k1; + + k00_20 = e0[-2] - e2[-2]; + k01_21 = e0[-3] - e2[-3]; + e0[-2] += e2[-2];//e0[-2] = e0[-2] + e2[-2]; + e0[-3] += e2[-3];//e0[-3] = e0[-3] + e2[-3]; + e2[-2] = (k00_20)*A[0] - (k01_21) * A[1]; + e2[-3] = (k01_21)*A[0] + (k00_20) * A[1]; + + A += k1; + + k00_20 = e0[-4] - e2[-4]; + k01_21 = e0[-5] - e2[-5]; + e0[-4] += e2[-4];//e0[-4] = e0[-4] + e2[-4]; + e0[-5] += e2[-5];//e0[-5] = e0[-5] + e2[-5]; + e2[-4] = (k00_20)*A[0] - (k01_21) * A[1]; + e2[-5] = (k01_21)*A[0] + (k00_20) * A[1]; + + A += k1; + + k00_20 = e0[-6] - e2[-6]; + k01_21 = e0[-7] - e2[-7]; + e0[-6] += e2[-6];//e0[-6] = e0[-6] + e2[-6]; + e0[-7] += e2[-7];//e0[-7] = e0[-7] + e2[-7]; + e2[-6] = (k00_20)*A[0] - (k01_21) * A[1]; + e2[-7] = (k01_21)*A[0] + (k00_20) * A[1]; + + e0 -= 8; + e2 -= 8; + + A += k1; + } +} + +static void imdct_step3_inner_s_loop(int n, float *e, int i_off, int k_off, float *A, int a_off, int k0) +{ + int i; + float A0 = A[0]; + float A1 = A[0+1]; + float A2 = A[0+a_off]; + float A3 = A[0+a_off+1]; + float A4 = A[0+a_off*2+0]; + float A5 = A[0+a_off*2+1]; + float A6 = A[0+a_off*3+0]; + float A7 = A[0+a_off*3+1]; + + float k00,k11; + + float *ee0 = e +i_off; + float *ee2 = ee0+k_off; + + for (i=n; i > 0; --i) { + k00 = ee0[ 0] - ee2[ 0]; + k11 = ee0[-1] - ee2[-1]; + ee0[ 0] = ee0[ 0] + ee2[ 0]; + ee0[-1] = ee0[-1] + ee2[-1]; + ee2[ 0] = (k00) * A0 - (k11) * A1; + ee2[-1] = (k11) * A0 + (k00) * A1; + + k00 = ee0[-2] - ee2[-2]; + k11 = ee0[-3] - ee2[-3]; + ee0[-2] = ee0[-2] + ee2[-2]; + ee0[-3] = ee0[-3] + ee2[-3]; + ee2[-2] = (k00) * A2 - (k11) * A3; + ee2[-3] = (k11) * A2 + (k00) * A3; + + k00 = ee0[-4] - ee2[-4]; + k11 = ee0[-5] - ee2[-5]; + ee0[-4] = ee0[-4] + ee2[-4]; + ee0[-5] = ee0[-5] + ee2[-5]; + ee2[-4] = (k00) * A4 - (k11) * A5; + ee2[-5] = (k11) * A4 + (k00) * A5; + + k00 = ee0[-6] - ee2[-6]; + k11 = ee0[-7] - ee2[-7]; + ee0[-6] = ee0[-6] + ee2[-6]; + ee0[-7] = ee0[-7] + ee2[-7]; + ee2[-6] = (k00) * A6 - (k11) * A7; + ee2[-7] = (k11) * A6 + (k00) * A7; + + ee0 -= k0; + ee2 -= k0; + } +} + +static __forceinline void iter_54(float *z) +{ + float k00,k11,k22,k33; + float y0,y1,y2,y3; + + k00 = z[ 0] - z[-4]; + y0 = z[ 0] + z[-4]; + y2 = z[-2] + z[-6]; + k22 = z[-2] - z[-6]; + + z[-0] = y0 + y2; // z0 + z4 + z2 + z6 + z[-2] = y0 - y2; // z0 + z4 - z2 - z6 + + // done with y0,y2 + + k33 = z[-3] - z[-7]; + + z[-4] = k00 + k33; // z0 - z4 + z3 - z7 + z[-6] = k00 - k33; // z0 - z4 - z3 + z7 + + // done with k33 + + k11 = z[-1] - z[-5]; + y1 = z[-1] + z[-5]; + y3 = z[-3] + z[-7]; + + z[-1] = y1 + y3; // z1 + z5 + z3 + z7 + z[-3] = y1 - y3; // z1 + z5 - z3 - z7 + z[-5] = k11 - k22; // z1 - z5 + z2 - z6 + z[-7] = k11 + k22; // z1 - z5 - z2 + z6 +} + +static void imdct_step3_inner_s_loop_ld654(int n, float *e, int i_off, float *A, int base_n) +{ + int a_off = base_n >> 3; + float A2 = A[0+a_off]; + float *z = e + i_off; + float *base = z - 16 * n; + + while (z > base) { + float k00,k11; + + k00 = z[-0] - z[-8]; + k11 = z[-1] - z[-9]; + z[-0] = z[-0] + z[-8]; + z[-1] = z[-1] + z[-9]; + z[-8] = k00; + z[-9] = k11 ; + + k00 = z[ -2] - z[-10]; + k11 = z[ -3] - z[-11]; + z[ -2] = z[ -2] + z[-10]; + z[ -3] = z[ -3] + z[-11]; + z[-10] = (k00+k11) * A2; + z[-11] = (k11-k00) * A2; + + k00 = z[-12] - z[ -4]; // reverse to avoid a unary negation + k11 = z[ -5] - z[-13]; + z[ -4] = z[ -4] + z[-12]; + z[ -5] = z[ -5] + z[-13]; + z[-12] = k11; + z[-13] = k00; + + k00 = z[-14] - z[ -6]; // reverse to avoid a unary negation + k11 = z[ -7] - z[-15]; + z[ -6] = z[ -6] + z[-14]; + z[ -7] = z[ -7] + z[-15]; + z[-14] = (k00+k11) * A2; + z[-15] = (k00-k11) * A2; + + iter_54(z); + iter_54(z-8); + z -= 16; + } +} + +static void inverse_mdct(float *buffer, int n, vorb *f, int blocktype) +{ + int n2 = n >> 1, n4 = n >> 2, n8 = n >> 3, l; + int ld; + // @OPTIMIZE: reduce register pressure by using fewer variables? + int save_point = temp_alloc_save(f); + float *buf2 = (float *) temp_alloc(f, n2 * sizeof(*buf2)); + float *u=NULL,*v=NULL; + // twiddle factors + float *A = f->A[blocktype]; + + // IMDCT algorithm from "The use of multirate filter banks for coding of high quality digital audio" + // See notes about bugs in that paper in less-optimal implementation 'inverse_mdct_old' after this function. + + // kernel from paper + + + // merged: + // copy and reflect spectral data + // step 0 + + // note that it turns out that the items added together during + // this step are, in fact, being added to themselves (as reflected + // by step 0). inexplicable inefficiency! this became obvious + // once I combined the passes. + + // so there's a missing 'times 2' here (for adding X to itself). + // this propogates through linearly to the end, where the numbers + // are 1/2 too small, and need to be compensated for. + + { + float *d,*e, *AA, *e_stop; + d = &buf2[n2-2]; + AA = A; + e = &buffer[0]; + e_stop = &buffer[n2]; + while (e != e_stop) { + d[1] = (e[0] * AA[0] - e[2]*AA[1]); + d[0] = (e[0] * AA[1] + e[2]*AA[0]); + d -= 2; + AA += 2; + e += 4; + } + + e = &buffer[n2-3]; + while (d >= buf2) { + d[1] = (-e[2] * AA[0] - -e[0]*AA[1]); + d[0] = (-e[2] * AA[1] + -e[0]*AA[0]); + d -= 2; + AA += 2; + e -= 4; + } + } + + // now we use symbolic names for these, so that we can + // possibly swap their meaning as we change which operations + // are in place + + u = buffer; + v = buf2; + + // step 2 (paper output is w, now u) + // this could be in place, but the data ends up in the wrong + // place... _somebody_'s got to swap it, so this is nominated + { + float *AA = &A[n2-8]; + float *d0,*d1, *e0, *e1; + + e0 = &v[n4]; + e1 = &v[0]; + + d0 = &u[n4]; + d1 = &u[0]; + + while (AA >= A) { + float v40_20, v41_21; + + v41_21 = e0[1] - e1[1]; + v40_20 = e0[0] - e1[0]; + d0[1] = e0[1] + e1[1]; + d0[0] = e0[0] + e1[0]; + d1[1] = v41_21*AA[4] - v40_20*AA[5]; + d1[0] = v40_20*AA[4] + v41_21*AA[5]; + + v41_21 = e0[3] - e1[3]; + v40_20 = e0[2] - e1[2]; + d0[3] = e0[3] + e1[3]; + d0[2] = e0[2] + e1[2]; + d1[3] = v41_21*AA[0] - v40_20*AA[1]; + d1[2] = v40_20*AA[0] + v41_21*AA[1]; + + AA -= 8; + + d0 += 4; + d1 += 4; + e0 += 4; + e1 += 4; + } + } + + // step 3 + ld = ilog(n) - 1; // ilog is off-by-one from normal definitions + + // optimized step 3: + + // the original step3 loop can be nested r inside s or s inside r; + // it's written originally as s inside r, but this is dumb when r + // iterates many times, and s few. So I have two copies of it and + // switch between them halfway. + + // this is iteration 0 of step 3 + imdct_step3_iter0_loop(n >> 4, u, n2-1-n4*0, -(n >> 3), A); + imdct_step3_iter0_loop(n >> 4, u, n2-1-n4*1, -(n >> 3), A); + + // this is iteration 1 of step 3 + imdct_step3_inner_r_loop(n >> 5, u, n2-1 - n8*0, -(n >> 4), A, 16); + imdct_step3_inner_r_loop(n >> 5, u, n2-1 - n8*1, -(n >> 4), A, 16); + imdct_step3_inner_r_loop(n >> 5, u, n2-1 - n8*2, -(n >> 4), A, 16); + imdct_step3_inner_r_loop(n >> 5, u, n2-1 - n8*3, -(n >> 4), A, 16); + + l=2; + for (; l < (ld-3)>>1; ++l) { + int k0 = n >> (l+2), k0_2 = k0>>1; + int lim = 1 << (l+1); + int i; + for (i=0; i < lim; ++i) + imdct_step3_inner_r_loop(n >> (l+4), u, n2-1 - k0*i, -k0_2, A, 1 << (l+3)); + } + + for (; l < ld-6; ++l) { + int k0 = n >> (l+2), k1 = 1 << (l+3), k0_2 = k0>>1; + int rlim = n >> (l+6), r; + int lim = 1 << (l+1); + int i_off; + float *A0 = A; + i_off = n2-1; + for (r=rlim; r > 0; --r) { + imdct_step3_inner_s_loop(lim, u, i_off, -k0_2, A0, k1, k0); + A0 += k1*4; + i_off -= 8; + } + } + + // iterations with count: + // ld-6,-5,-4 all interleaved together + // the big win comes from getting rid of needless flops + // due to the constants on pass 5 & 4 being all 1 and 0; + // combining them to be simultaneous to improve cache made little difference + imdct_step3_inner_s_loop_ld654(n >> 5, u, n2-1, A, n); + + // output is u + + // step 4, 5, and 6 + // cannot be in-place because of step 5 + { + uint16 *bitrev = f->bit_reverse[blocktype]; + // weirdly, I'd have thought reading sequentially and writing + // erratically would have been better than vice-versa, but in + // fact that's not what my testing showed. (That is, with + // j = bitreverse(i), do you read i and write j, or read j and write i.) + + float *d0 = &v[n4-4]; + float *d1 = &v[n2-4]; + while (d0 >= v) { + int k4; + + k4 = bitrev[0]; + d1[3] = u[k4+0]; + d1[2] = u[k4+1]; + d0[3] = u[k4+2]; + d0[2] = u[k4+3]; + + k4 = bitrev[1]; + d1[1] = u[k4+0]; + d1[0] = u[k4+1]; + d0[1] = u[k4+2]; + d0[0] = u[k4+3]; + + d0 -= 4; + d1 -= 4; + bitrev += 2; + } + } + // (paper output is u, now v) + + + // data must be in buf2 + assert(v == buf2); + + // step 7 (paper output is v, now v) + // this is now in place + { + float *C = f->C[blocktype]; + float *d, *e; + + d = v; + e = v + n2 - 4; + + while (d < e) { + float a02,a11,b0,b1,b2,b3; + + a02 = d[0] - e[2]; + a11 = d[1] + e[3]; + + b0 = C[1]*a02 + C[0]*a11; + b1 = C[1]*a11 - C[0]*a02; + + b2 = d[0] + e[ 2]; + b3 = d[1] - e[ 3]; + + d[0] = b2 + b0; + d[1] = b3 + b1; + e[2] = b2 - b0; + e[3] = b1 - b3; + + a02 = d[2] - e[0]; + a11 = d[3] + e[1]; + + b0 = C[3]*a02 + C[2]*a11; + b1 = C[3]*a11 - C[2]*a02; + + b2 = d[2] + e[ 0]; + b3 = d[3] - e[ 1]; + + d[2] = b2 + b0; + d[3] = b3 + b1; + e[0] = b2 - b0; + e[1] = b1 - b3; + + C += 4; + d += 4; + e -= 4; + } + } + + // data must be in buf2 + + + // step 8+decode (paper output is X, now buffer) + // this generates pairs of data a la 8 and pushes them directly through + // the decode kernel (pushing rather than pulling) to avoid having + // to make another pass later + + // this cannot POSSIBLY be in place, so we refer to the buffers directly + + { + float *d0,*d1,*d2,*d3; + + float *B = f->B[blocktype] + n2 - 8; + float *e = buf2 + n2 - 8; + d0 = &buffer[0]; + d1 = &buffer[n2-4]; + d2 = &buffer[n2]; + d3 = &buffer[n-4]; + while (e >= v) { + float p0,p1,p2,p3; + + p3 = e[6]*B[7] - e[7]*B[6]; + p2 = -e[6]*B[6] - e[7]*B[7]; + + d0[0] = p3; + d1[3] = - p3; + d2[0] = p2; + d3[3] = p2; + + p1 = e[4]*B[5] - e[5]*B[4]; + p0 = -e[4]*B[4] - e[5]*B[5]; + + d0[1] = p1; + d1[2] = - p1; + d2[1] = p0; + d3[2] = p0; + + p3 = e[2]*B[3] - e[3]*B[2]; + p2 = -e[2]*B[2] - e[3]*B[3]; + + d0[2] = p3; + d1[1] = - p3; + d2[2] = p2; + d3[1] = p2; + + p1 = e[0]*B[1] - e[1]*B[0]; + p0 = -e[0]*B[0] - e[1]*B[1]; + + d0[3] = p1; + d1[0] = - p1; + d2[3] = p0; + d3[0] = p0; + + B -= 8; + e -= 8; + d0 += 4; + d2 += 4; + d1 -= 4; + d3 -= 4; + } + } + + temp_free(f,buf2); + temp_alloc_restore(f,save_point); +} + +#if 0 +// this is the original version of the above code, if you want to optimize it from scratch +void inverse_mdct_naive(float *buffer, int n) +{ + float s; + float A[1 << 12], B[1 << 12], C[1 << 11]; + int i,k,k2,k4, n2 = n >> 1, n4 = n >> 2, n8 = n >> 3, l; + int n3_4 = n - n4, ld; + // how can they claim this only uses N words?! + // oh, because they're only used sparsely, whoops + float u[1 << 13], X[1 << 13], v[1 << 13], w[1 << 13]; + // set up twiddle factors + + for (k=k2=0; k < n4; ++k,k2+=2) { + A[k2 ] = (float) cos(4*k*M_PI/n); + A[k2+1] = (float) -sin(4*k*M_PI/n); + B[k2 ] = (float) cos((k2+1)*M_PI/n/2); + B[k2+1] = (float) sin((k2+1)*M_PI/n/2); + } + for (k=k2=0; k < n8; ++k,k2+=2) { + C[k2 ] = (float) cos(2*(k2+1)*M_PI/n); + C[k2+1] = (float) -sin(2*(k2+1)*M_PI/n); + } + + // IMDCT algorithm from "The use of multirate filter banks for coding of high quality digital audio" + // Note there are bugs in that pseudocode, presumably due to them attempting + // to rename the arrays nicely rather than representing the way their actual + // implementation bounces buffers back and forth. As a result, even in the + // "some formulars corrected" version, a direct implementation fails. These + // are noted below as "paper bug". + + // copy and reflect spectral data + for (k=0; k < n2; ++k) u[k] = buffer[k]; + for ( ; k < n ; ++k) u[k] = -buffer[n - k - 1]; + // kernel from paper + // step 1 + for (k=k2=k4=0; k < n4; k+=1, k2+=2, k4+=4) { + v[n-k4-1] = (u[k4] - u[n-k4-1]) * A[k2] - (u[k4+2] - u[n-k4-3])*A[k2+1]; + v[n-k4-3] = (u[k4] - u[n-k4-1]) * A[k2+1] + (u[k4+2] - u[n-k4-3])*A[k2]; + } + // step 2 + for (k=k4=0; k < n8; k+=1, k4+=4) { + w[n2+3+k4] = v[n2+3+k4] + v[k4+3]; + w[n2+1+k4] = v[n2+1+k4] + v[k4+1]; + w[k4+3] = (v[n2+3+k4] - v[k4+3])*A[n2-4-k4] - (v[n2+1+k4]-v[k4+1])*A[n2-3-k4]; + w[k4+1] = (v[n2+1+k4] - v[k4+1])*A[n2-4-k4] + (v[n2+3+k4]-v[k4+3])*A[n2-3-k4]; + } + // step 3 + ld = ilog(n) - 1; // ilog is off-by-one from normal definitions + for (l=0; l < ld-3; ++l) { + int k0 = n >> (l+2), k1 = 1 << (l+3); + int rlim = n >> (l+4), r4, r; + int s2lim = 1 << (l+2), s2; + for (r=r4=0; r < rlim; r4+=4,++r) { + for (s2=0; s2 < s2lim; s2+=2) { + u[n-1-k0*s2-r4] = w[n-1-k0*s2-r4] + w[n-1-k0*(s2+1)-r4]; + u[n-3-k0*s2-r4] = w[n-3-k0*s2-r4] + w[n-3-k0*(s2+1)-r4]; + u[n-1-k0*(s2+1)-r4] = (w[n-1-k0*s2-r4] - w[n-1-k0*(s2+1)-r4]) * A[r*k1] + - (w[n-3-k0*s2-r4] - w[n-3-k0*(s2+1)-r4]) * A[r*k1+1]; + u[n-3-k0*(s2+1)-r4] = (w[n-3-k0*s2-r4] - w[n-3-k0*(s2+1)-r4]) * A[r*k1] + + (w[n-1-k0*s2-r4] - w[n-1-k0*(s2+1)-r4]) * A[r*k1+1]; + } + } + if (l+1 < ld-3) { + // paper bug: ping-ponging of u&w here is omitted + memcpy(w, u, sizeof(u)); + } + } + + // step 4 + for (i=0; i < n8; ++i) { + int j = bit_reverse(i) >> (32-ld+3); + assert(j < n8); + if (i == j) { + // paper bug: original code probably swapped in place; if copying, + // need to directly copy in this case + int i8 = i << 3; + v[i8+1] = u[i8+1]; + v[i8+3] = u[i8+3]; + v[i8+5] = u[i8+5]; + v[i8+7] = u[i8+7]; + } else if (i < j) { + int i8 = i << 3, j8 = j << 3; + v[j8+1] = u[i8+1], v[i8+1] = u[j8 + 1]; + v[j8+3] = u[i8+3], v[i8+3] = u[j8 + 3]; + v[j8+5] = u[i8+5], v[i8+5] = u[j8 + 5]; + v[j8+7] = u[i8+7], v[i8+7] = u[j8 + 7]; + } + } + // step 5 + for (k=0; k < n2; ++k) { + w[k] = v[k*2+1]; + } + // step 6 + for (k=k2=k4=0; k < n8; ++k, k2 += 2, k4 += 4) { + u[n-1-k2] = w[k4]; + u[n-2-k2] = w[k4+1]; + u[n3_4 - 1 - k2] = w[k4+2]; + u[n3_4 - 2 - k2] = w[k4+3]; + } + // step 7 + for (k=k2=0; k < n8; ++k, k2 += 2) { + v[n2 + k2 ] = ( u[n2 + k2] + u[n-2-k2] + C[k2+1]*(u[n2+k2]-u[n-2-k2]) + C[k2]*(u[n2+k2+1]+u[n-2-k2+1]))/2; + v[n-2 - k2] = ( u[n2 + k2] + u[n-2-k2] - C[k2+1]*(u[n2+k2]-u[n-2-k2]) - C[k2]*(u[n2+k2+1]+u[n-2-k2+1]))/2; + v[n2+1+ k2] = ( u[n2+1+k2] - u[n-1-k2] + C[k2+1]*(u[n2+1+k2]+u[n-1-k2]) - C[k2]*(u[n2+k2]-u[n-2-k2]))/2; + v[n-1 - k2] = (-u[n2+1+k2] + u[n-1-k2] + C[k2+1]*(u[n2+1+k2]+u[n-1-k2]) - C[k2]*(u[n2+k2]-u[n-2-k2]))/2; + } + // step 8 + for (k=k2=0; k < n4; ++k,k2 += 2) { + X[k] = v[k2+n2]*B[k2 ] + v[k2+1+n2]*B[k2+1]; + X[n2-1-k] = v[k2+n2]*B[k2+1] - v[k2+1+n2]*B[k2 ]; + } + + // decode kernel to output + // determined the following value experimentally + // (by first figuring out what made inverse_mdct_slow work); then matching that here + // (probably vorbis encoder premultiplies by n or n/2, to save it on the decoder?) + s = 0.5; // theoretically would be n4 + + // [[[ note! the s value of 0.5 is compensated for by the B[] in the current code, + // so it needs to use the "old" B values to behave correctly, or else + // set s to 1.0 ]]] + for (i=0; i < n4 ; ++i) buffer[i] = s * X[i+n4]; + for ( ; i < n3_4; ++i) buffer[i] = -s * X[n3_4 - i - 1]; + for ( ; i < n ; ++i) buffer[i] = -s * X[i - n3_4]; +} +#endif + +static float *get_window(vorb *f, int len) +{ + len <<= 1; + if (len == f->blocksize_0) return f->window[0]; + if (len == f->blocksize_1) return f->window[1]; + assert(0); + return NULL; +} + +#ifndef STB_VORBIS_NO_DEFER_FLOOR +typedef int16 YTYPE; +#else +typedef int YTYPE; +#endif +static int do_floor(vorb *f, Mapping *map, int i, int n, float *target, YTYPE *finalY, uint8 *step2_flag) +{ + int n2 = n >> 1; + int s = map->chan[i].mux, floor; + floor = map->submap_floor[s]; + if (f->floor_types[floor] == 0) { + return error(f, VORBIS_invalid_stream); + } else { + Floor1 *g = &f->floor_config[floor].floor1; + int j,q; + int lx = 0, ly = finalY[0] * g->floor1_multiplier; + for (q=1; q < g->values; ++q) { + j = g->sorted_order[q]; + #ifndef STB_VORBIS_NO_DEFER_FLOOR + if (finalY[j] >= 0) + #else + if (step2_flag[j]) + #endif + { + int hy = finalY[j] * g->floor1_multiplier; + int hx = g->Xlist[j]; + if (lx != hx) + draw_line(target, lx,ly, hx,hy, n2); + CHECK(f); + lx = hx, ly = hy; + } + } + if (lx < n2) { + // optimization of: draw_line(target, lx,ly, n,ly, n2); + for (j=lx; j < n2; ++j) + LINE_OP(target[j], inverse_db_table[ly]); + CHECK(f); + } + } + return TRUE; +} + +// The meaning of "left" and "right" +// +// For a given frame: +// we compute samples from 0..n +// window_center is n/2 +// we'll window and mix the samples from left_start to left_end with data from the previous frame +// all of the samples from left_end to right_start can be output without mixing; however, +// this interval is 0-length except when transitioning between short and long frames +// all of the samples from right_start to right_end need to be mixed with the next frame, +// which we don't have, so those get saved in a buffer +// frame N's right_end-right_start, the number of samples to mix with the next frame, +// has to be the same as frame N+1's left_end-left_start (which they are by +// construction) + +static int vorbis_decode_initial(vorb *f, int *p_left_start, int *p_left_end, int *p_right_start, int *p_right_end, int *mode) +{ + Mode *m; + int i, n, prev, next, window_center; + f->channel_buffer_start = f->channel_buffer_end = 0; + + retry: + if (f->eof) return FALSE; + if (!maybe_start_packet(f)) + return FALSE; + // check packet type + if (get_bits(f,1) != 0) { + if (IS_PUSH_MODE(f)) + return error(f,VORBIS_bad_packet_type); + while (EOP != get8_packet(f)); + goto retry; + } + + if (f->alloc.alloc_buffer) + assert(f->alloc.alloc_buffer_length_in_bytes == f->temp_offset); + + i = get_bits(f, ilog(f->mode_count-1)); + if (i == EOP) return FALSE; + if (i >= f->mode_count) return FALSE; + *mode = i; + m = f->mode_config + i; + if (m->blockflag) { + n = f->blocksize_1; + prev = get_bits(f,1); + next = get_bits(f,1); + } else { + prev = next = 0; + n = f->blocksize_0; + } + +// WINDOWING + + window_center = n >> 1; + if (m->blockflag && !prev) { + *p_left_start = (n - f->blocksize_0) >> 2; + *p_left_end = (n + f->blocksize_0) >> 2; + } else { + *p_left_start = 0; + *p_left_end = window_center; + } + if (m->blockflag && !next) { + *p_right_start = (n*3 - f->blocksize_0) >> 2; + *p_right_end = (n*3 + f->blocksize_0) >> 2; + } else { + *p_right_start = window_center; + *p_right_end = n; + } + + return TRUE; +} + +static int vorbis_decode_packet_rest(vorb *f, int *len, Mode *m, int left_start, int left_end, int right_start, int right_end, int *p_left) +{ + Mapping *map; + int i,j,k,n,n2; + int zero_channel[256]; + int really_zero_channel[256]; + +// WINDOWING + + n = f->blocksize[m->blockflag]; + map = &f->mapping[m->mapping]; + +// FLOORS + n2 = n >> 1; + + CHECK(f); + + for (i=0; i < f->channels; ++i) { + int s = map->chan[i].mux, floor; + zero_channel[i] = FALSE; + floor = map->submap_floor[s]; + if (f->floor_types[floor] == 0) { + return error(f, VORBIS_invalid_stream); + } else { + Floor1 *g = &f->floor_config[floor].floor1; + if (get_bits(f, 1)) { + short *finalY; + uint8 step2_flag[256]; + static int range_list[4] = { 256, 128, 86, 64 }; + int range = range_list[g->floor1_multiplier-1]; + int offset = 2; + finalY = f->finalY[i]; + finalY[0] = get_bits(f, ilog(range)-1); + finalY[1] = get_bits(f, ilog(range)-1); + for (j=0; j < g->partitions; ++j) { + int pclass = g->partition_class_list[j]; + int cdim = g->class_dimensions[pclass]; + int cbits = g->class_subclasses[pclass]; + int csub = (1 << cbits)-1; + int cval = 0; + if (cbits) { + Codebook *c = f->codebooks + g->class_masterbooks[pclass]; + DECODE(cval,f,c); + } + for (k=0; k < cdim; ++k) { + int book = g->subclass_books[pclass][cval & csub]; + cval = cval >> cbits; + if (book >= 0) { + int temp; + Codebook *c = f->codebooks + book; + DECODE(temp,f,c); + finalY[offset++] = temp; + } else + finalY[offset++] = 0; + } + } + if (f->valid_bits == INVALID_BITS) goto error; // behavior according to spec + step2_flag[0] = step2_flag[1] = 1; + for (j=2; j < g->values; ++j) { + int low, high, pred, highroom, lowroom, room, val; + low = g->neighbors[j][0]; + high = g->neighbors[j][1]; + //neighbors(g->Xlist, j, &low, &high); + pred = predict_point(g->Xlist[j], g->Xlist[low], g->Xlist[high], finalY[low], finalY[high]); + val = finalY[j]; + highroom = range - pred; + lowroom = pred; + if (highroom < lowroom) + room = highroom * 2; + else + room = lowroom * 2; + if (val) { + step2_flag[low] = step2_flag[high] = 1; + step2_flag[j] = 1; + if (val >= room) + if (highroom > lowroom) + finalY[j] = val - lowroom + pred; + else + finalY[j] = pred - val + highroom - 1; + else + if (val & 1) + finalY[j] = pred - ((val+1)>>1); + else + finalY[j] = pred + (val>>1); + } else { + step2_flag[j] = 0; + finalY[j] = pred; + } + } + +#ifdef STB_VORBIS_NO_DEFER_FLOOR + do_floor(f, map, i, n, f->floor_buffers[i], finalY, step2_flag); +#else + // defer final floor computation until _after_ residue + for (j=0; j < g->values; ++j) { + if (!step2_flag[j]) + finalY[j] = -1; + } +#endif + } else { + error: + zero_channel[i] = TRUE; + } + // So we just defer everything else to later + + // at this point we've decoded the floor into buffer + } + } + CHECK(f); + // at this point we've decoded all floors + + if (f->alloc.alloc_buffer) + assert(f->alloc.alloc_buffer_length_in_bytes == f->temp_offset); + + // re-enable coupled channels if necessary + memcpy(really_zero_channel, zero_channel, sizeof(really_zero_channel[0]) * f->channels); + for (i=0; i < map->coupling_steps; ++i) + if (!zero_channel[map->chan[i].magnitude] || !zero_channel[map->chan[i].angle]) { + zero_channel[map->chan[i].magnitude] = zero_channel[map->chan[i].angle] = FALSE; + } + + CHECK(f); +// RESIDUE DECODE + for (i=0; i < map->submaps; ++i) { + float *residue_buffers[STB_VORBIS_MAX_CHANNELS]; + int r; + uint8 do_not_decode[256]; + int ch = 0; + for (j=0; j < f->channels; ++j) { + if (map->chan[j].mux == i) { + if (zero_channel[j]) { + do_not_decode[ch] = TRUE; + residue_buffers[ch] = NULL; + } else { + do_not_decode[ch] = FALSE; + residue_buffers[ch] = f->channel_buffers[j]; + } + ++ch; + } + } + r = map->submap_residue[i]; + decode_residue(f, residue_buffers, ch, n2, r, do_not_decode); + } + + if (f->alloc.alloc_buffer) + assert(f->alloc.alloc_buffer_length_in_bytes == f->temp_offset); + CHECK(f); + +// INVERSE COUPLING + for (i = map->coupling_steps-1; i >= 0; --i) { + int n2 = n >> 1; + float *m = f->channel_buffers[map->chan[i].magnitude]; + float *a = f->channel_buffers[map->chan[i].angle ]; + for (j=0; j < n2; ++j) { + float a2,m2; + if (m[j] > 0) + if (a[j] > 0) + m2 = m[j], a2 = m[j] - a[j]; + else + a2 = m[j], m2 = m[j] + a[j]; + else + if (a[j] > 0) + m2 = m[j], a2 = m[j] + a[j]; + else + a2 = m[j], m2 = m[j] - a[j]; + m[j] = m2; + a[j] = a2; + } + } + CHECK(f); + + // finish decoding the floors +#ifndef STB_VORBIS_NO_DEFER_FLOOR + for (i=0; i < f->channels; ++i) { + if (really_zero_channel[i]) { + memset(f->channel_buffers[i], 0, sizeof(*f->channel_buffers[i]) * n2); + } else { + do_floor(f, map, i, n, f->channel_buffers[i], f->finalY[i], NULL); + } + } +#else + for (i=0; i < f->channels; ++i) { + if (really_zero_channel[i]) { + memset(f->channel_buffers[i], 0, sizeof(*f->channel_buffers[i]) * n2); + } else { + for (j=0; j < n2; ++j) + f->channel_buffers[i][j] *= f->floor_buffers[i][j]; + } + } +#endif + +// INVERSE MDCT + CHECK(f); + for (i=0; i < f->channels; ++i) + inverse_mdct(f->channel_buffers[i], n, f, m->blockflag); + CHECK(f); + + // this shouldn't be necessary, unless we exited on an error + // and want to flush to get to the next packet + flush_packet(f); + + if (f->first_decode) { + // assume we start so first non-discarded sample is sample 0 + // this isn't to spec, but spec would require us to read ahead + // and decode the size of all current frames--could be done, + // but presumably it's not a commonly used feature + f->current_loc = -n2; // start of first frame is positioned for discard + // we might have to discard samples "from" the next frame too, + // if we're lapping a large block then a small at the start? + f->discard_samples_deferred = n - right_end; + f->current_loc_valid = TRUE; + f->first_decode = FALSE; + } else if (f->discard_samples_deferred) { + if (f->discard_samples_deferred >= right_start - left_start) { + f->discard_samples_deferred -= (right_start - left_start); + left_start = right_start; + *p_left = left_start; + } else { + left_start += f->discard_samples_deferred; + *p_left = left_start; + f->discard_samples_deferred = 0; + } + } else if (f->previous_length == 0 && f->current_loc_valid) { + // we're recovering from a seek... that means we're going to discard + // the samples from this packet even though we know our position from + // the last page header, so we need to update the position based on + // the discarded samples here + // but wait, the code below is going to add this in itself even + // on a discard, so we don't need to do it here... + } + + // check if we have ogg information about the sample # for this packet + if (f->last_seg_which == f->end_seg_with_known_loc) { + // if we have a valid current loc, and this is final: + if (f->current_loc_valid && (f->page_flag & PAGEFLAG_last_page)) { + uint32 current_end = f->known_loc_for_packet; + // then let's infer the size of the (probably) short final frame + if (current_end < f->current_loc + (right_end-left_start)) { + if (current_end < f->current_loc) { + // negative truncation, that's impossible! + *len = 0; + } else { + *len = current_end - f->current_loc; + } + *len += left_start; // this doesn't seem right, but has no ill effect on my test files + if (*len > right_end) *len = right_end; // this should never happen + f->current_loc += *len; + return TRUE; + } + } + // otherwise, just set our sample loc + // guess that the ogg granule pos refers to the _middle_ of the + // last frame? + // set f->current_loc to the position of left_start + f->current_loc = f->known_loc_for_packet - (n2-left_start); + f->current_loc_valid = TRUE; + } + if (f->current_loc_valid) + f->current_loc += (right_start - left_start); + + if (f->alloc.alloc_buffer) + assert(f->alloc.alloc_buffer_length_in_bytes == f->temp_offset); + *len = right_end; // ignore samples after the window goes to 0 + CHECK(f); + + return TRUE; +} + +static int vorbis_decode_packet(vorb *f, int *len, int *p_left, int *p_right) +{ + int mode, left_end, right_end; + if (!vorbis_decode_initial(f, p_left, &left_end, p_right, &right_end, &mode)) return 0; + return vorbis_decode_packet_rest(f, len, f->mode_config + mode, *p_left, left_end, *p_right, right_end, p_left); +} + +static int vorbis_finish_frame(stb_vorbis *f, int len, int left, int right) +{ + int prev,i,j; + // we use right&left (the start of the right- and left-window sin()-regions) + // to determine how much to return, rather than inferring from the rules + // (same result, clearer code); 'left' indicates where our sin() window + // starts, therefore where the previous window's right edge starts, and + // therefore where to start mixing from the previous buffer. 'right' + // indicates where our sin() ending-window starts, therefore that's where + // we start saving, and where our returned-data ends. + + // mixin from previous window + if (f->previous_length) { + int i,j, n = f->previous_length; + float *w = get_window(f, n); + for (i=0; i < f->channels; ++i) { + for (j=0; j < n; ++j) + f->channel_buffers[i][left+j] = + f->channel_buffers[i][left+j]*w[ j] + + f->previous_window[i][ j]*w[n-1-j]; + } + } + + prev = f->previous_length; + + // last half of this data becomes previous window + f->previous_length = len - right; + + // @OPTIMIZE: could avoid this copy by double-buffering the + // output (flipping previous_window with channel_buffers), but + // then previous_window would have to be 2x as large, and + // channel_buffers couldn't be temp mem (although they're NOT + // currently temp mem, they could be (unless we want to level + // performance by spreading out the computation)) + for (i=0; i < f->channels; ++i) + for (j=0; right+j < len; ++j) + f->previous_window[i][j] = f->channel_buffers[i][right+j]; + + if (!prev) + // there was no previous packet, so this data isn't valid... + // this isn't entirely true, only the would-have-overlapped data + // isn't valid, but this seems to be what the spec requires + return 0; + + // truncate a short frame + if (len < right) right = len; + + f->samples_output += right-left; + + return right - left; +} + +static int vorbis_pump_first_frame(stb_vorbis *f) +{ + int len, right, left, res; + res = vorbis_decode_packet(f, &len, &left, &right); + if (res) + vorbis_finish_frame(f, len, left, right); + return res; +} + +#ifndef STB_VORBIS_NO_PUSHDATA_API +static int is_whole_packet_present(stb_vorbis *f, int end_page) +{ + // make sure that we have the packet available before continuing... + // this requires a full ogg parse, but we know we can fetch from f->stream + + // instead of coding this out explicitly, we could save the current read state, + // read the next packet with get8() until end-of-packet, check f->eof, then + // reset the state? but that would be slower, esp. since we'd have over 256 bytes + // of state to restore (primarily the page segment table) + + int s = f->next_seg, first = TRUE; + uint8 *p = f->stream; + + if (s != -1) { // if we're not starting the packet with a 'continue on next page' flag + for (; s < f->segment_count; ++s) { + p += f->segments[s]; + if (f->segments[s] < 255) // stop at first short segment + break; + } + // either this continues, or it ends it... + if (end_page) + if (s < f->segment_count-1) return error(f, VORBIS_invalid_stream); + if (s == f->segment_count) + s = -1; // set 'crosses page' flag + if (p > f->stream_end) return error(f, VORBIS_need_more_data); + first = FALSE; + } + for (; s == -1;) { + uint8 *q; + int n; + + // check that we have the page header ready + if (p + 26 >= f->stream_end) return error(f, VORBIS_need_more_data); + // validate the page + if (memcmp(p, ogg_page_header, 4)) return error(f, VORBIS_invalid_stream); + if (p[4] != 0) return error(f, VORBIS_invalid_stream); + if (first) { // the first segment must NOT have 'continued_packet', later ones MUST + if (f->previous_length) + if ((p[5] & PAGEFLAG_continued_packet)) return error(f, VORBIS_invalid_stream); + // if no previous length, we're resynching, so we can come in on a continued-packet, + // which we'll just drop + } else { + if (!(p[5] & PAGEFLAG_continued_packet)) return error(f, VORBIS_invalid_stream); + } + n = p[26]; // segment counts + q = p+27; // q points to segment table + p = q + n; // advance past header + // make sure we've read the segment table + if (p > f->stream_end) return error(f, VORBIS_need_more_data); + for (s=0; s < n; ++s) { + p += q[s]; + if (q[s] < 255) + break; + } + if (end_page) + if (s < n-1) return error(f, VORBIS_invalid_stream); + if (s == n) + s = -1; // set 'crosses page' flag + if (p > f->stream_end) return error(f, VORBIS_need_more_data); + first = FALSE; + } + return TRUE; +} +#endif // !STB_VORBIS_NO_PUSHDATA_API + +static int start_decoder(vorb *f) +{ + uint8 header[6], x,y; + int len,i,j,k, max_submaps = 0; + int longest_floorlist=0; + + // first page, first packet + + if (!start_page(f)) return FALSE; + // validate page flag + if (!(f->page_flag & PAGEFLAG_first_page)) return error(f, VORBIS_invalid_first_page); + if (f->page_flag & PAGEFLAG_last_page) return error(f, VORBIS_invalid_first_page); + if (f->page_flag & PAGEFLAG_continued_packet) return error(f, VORBIS_invalid_first_page); + // check for expected packet length + if (f->segment_count != 1) return error(f, VORBIS_invalid_first_page); + if (f->segments[0] != 30) return error(f, VORBIS_invalid_first_page); + // read packet + // check packet header + if (get8(f) != VORBIS_packet_id) return error(f, VORBIS_invalid_first_page); + if (!getn(f, header, 6)) return error(f, VORBIS_unexpected_eof); + if (!vorbis_validate(header)) return error(f, VORBIS_invalid_first_page); + // vorbis_version + if (get32(f) != 0) return error(f, VORBIS_invalid_first_page); + f->channels = get8(f); if (!f->channels) return error(f, VORBIS_invalid_first_page); + if (f->channels > STB_VORBIS_MAX_CHANNELS) return error(f, VORBIS_too_many_channels); + f->sample_rate = get32(f); if (!f->sample_rate) return error(f, VORBIS_invalid_first_page); + get32(f); // bitrate_maximum + get32(f); // bitrate_nominal + get32(f); // bitrate_minimum + x = get8(f); + { + int log0,log1; + log0 = x & 15; + log1 = x >> 4; + f->blocksize_0 = 1 << log0; + f->blocksize_1 = 1 << log1; + if (log0 < 6 || log0 > 13) return error(f, VORBIS_invalid_setup); + if (log1 < 6 || log1 > 13) return error(f, VORBIS_invalid_setup); + if (log0 > log1) return error(f, VORBIS_invalid_setup); + } + + // framing_flag + x = get8(f); + if (!(x & 1)) return error(f, VORBIS_invalid_first_page); + + // second packet! + if (!start_page(f)) return FALSE; + + if (!start_packet(f)) return FALSE; + do { + len = next_segment(f); + skip(f, len); + f->bytes_in_seg = 0; + } while (len); + + // third packet! + if (!start_packet(f)) return FALSE; + + #ifndef STB_VORBIS_NO_PUSHDATA_API + if (IS_PUSH_MODE(f)) { + if (!is_whole_packet_present(f, TRUE)) { + // convert error in ogg header to write type + if (f->error == VORBIS_invalid_stream) + f->error = VORBIS_invalid_setup; + return FALSE; + } + } + #endif + + crc32_init(); // always init it, to avoid multithread race conditions + + if (get8_packet(f) != VORBIS_packet_setup) return error(f, VORBIS_invalid_setup); + for (i=0; i < 6; ++i) header[i] = get8_packet(f); + if (!vorbis_validate(header)) return error(f, VORBIS_invalid_setup); + + // codebooks + + f->codebook_count = get_bits(f,8) + 1; + f->codebooks = (Codebook *) setup_malloc(f, sizeof(*f->codebooks) * f->codebook_count); + if (f->codebooks == NULL) return error(f, VORBIS_outofmem); + memset(f->codebooks, 0, sizeof(*f->codebooks) * f->codebook_count); + for (i=0; i < f->codebook_count; ++i) { + uint32 *values; + int ordered, sorted_count; + int total=0; + uint8 *lengths; + Codebook *c = f->codebooks+i; + CHECK(f); + x = get_bits(f, 8); if (x != 0x42) return error(f, VORBIS_invalid_setup); + x = get_bits(f, 8); if (x != 0x43) return error(f, VORBIS_invalid_setup); + x = get_bits(f, 8); if (x != 0x56) return error(f, VORBIS_invalid_setup); + x = get_bits(f, 8); + c->dimensions = (get_bits(f, 8)<<8) + x; + x = get_bits(f, 8); + y = get_bits(f, 8); + c->entries = (get_bits(f, 8)<<16) + (y<<8) + x; + ordered = get_bits(f,1); + c->sparse = ordered ? 0 : get_bits(f,1); + + if (c->dimensions == 0 && c->entries != 0) return error(f, VORBIS_invalid_setup); + + if (c->sparse) + lengths = (uint8 *) setup_temp_malloc(f, c->entries); + else + lengths = c->codeword_lengths = (uint8 *) setup_malloc(f, c->entries); + + if (!lengths) return error(f, VORBIS_outofmem); + + if (ordered) { + int current_entry = 0; + int current_length = get_bits(f,5) + 1; + while (current_entry < c->entries) { + int limit = c->entries - current_entry; + int n = get_bits(f, ilog(limit)); + if (current_entry + n > (int) c->entries) { return error(f, VORBIS_invalid_setup); } + memset(lengths + current_entry, current_length, n); + current_entry += n; + ++current_length; + } + } else { + for (j=0; j < c->entries; ++j) { + int present = c->sparse ? get_bits(f,1) : 1; + if (present) { + lengths[j] = get_bits(f, 5) + 1; + ++total; + if (lengths[j] == 32) + return error(f, VORBIS_invalid_setup); + } else { + lengths[j] = NO_CODE; + } + } + } + + if (c->sparse && total >= c->entries >> 2) { + // convert sparse items to non-sparse! + if (c->entries > (int) f->setup_temp_memory_required) + f->setup_temp_memory_required = c->entries; + + c->codeword_lengths = (uint8 *) setup_malloc(f, c->entries); + if (c->codeword_lengths == NULL) return error(f, VORBIS_outofmem); + memcpy(c->codeword_lengths, lengths, c->entries); + setup_temp_free(f, lengths, c->entries); // note this is only safe if there have been no intervening temp mallocs! + lengths = c->codeword_lengths; + c->sparse = 0; + } + + // compute the size of the sorted tables + if (c->sparse) { + sorted_count = total; + } else { + sorted_count = 0; + #ifndef STB_VORBIS_NO_HUFFMAN_BINARY_SEARCH + for (j=0; j < c->entries; ++j) + if (lengths[j] > STB_VORBIS_FAST_HUFFMAN_LENGTH && lengths[j] != NO_CODE) + ++sorted_count; + #endif + } + + c->sorted_entries = sorted_count; + values = NULL; + + CHECK(f); + if (!c->sparse) { + c->codewords = (uint32 *) setup_malloc(f, sizeof(c->codewords[0]) * c->entries); + if (!c->codewords) return error(f, VORBIS_outofmem); + } else { + unsigned int size; + if (c->sorted_entries) { + c->codeword_lengths = (uint8 *) setup_malloc(f, c->sorted_entries); + if (!c->codeword_lengths) return error(f, VORBIS_outofmem); + c->codewords = (uint32 *) setup_temp_malloc(f, sizeof(*c->codewords) * c->sorted_entries); + if (!c->codewords) return error(f, VORBIS_outofmem); + values = (uint32 *) setup_temp_malloc(f, sizeof(*values) * c->sorted_entries); + if (!values) return error(f, VORBIS_outofmem); + } + size = c->entries + (sizeof(*c->codewords) + sizeof(*values)) * c->sorted_entries; + if (size > f->setup_temp_memory_required) + f->setup_temp_memory_required = size; + } + + if (!compute_codewords(c, lengths, c->entries, values)) { + if (c->sparse) setup_temp_free(f, values, 0); + return error(f, VORBIS_invalid_setup); + } + + if (c->sorted_entries) { + // allocate an extra slot for sentinels + c->sorted_codewords = (uint32 *) setup_malloc(f, sizeof(*c->sorted_codewords) * (c->sorted_entries+1)); + if (c->sorted_codewords == NULL) return error(f, VORBIS_outofmem); + // allocate an extra slot at the front so that c->sorted_values[-1] is defined + // so that we can catch that case without an extra if + c->sorted_values = ( int *) setup_malloc(f, sizeof(*c->sorted_values ) * (c->sorted_entries+1)); + if (c->sorted_values == NULL) return error(f, VORBIS_outofmem); + ++c->sorted_values; + c->sorted_values[-1] = -1; + compute_sorted_huffman(c, lengths, values); + } + + if (c->sparse) { + setup_temp_free(f, values, sizeof(*values)*c->sorted_entries); + setup_temp_free(f, c->codewords, sizeof(*c->codewords)*c->sorted_entries); + setup_temp_free(f, lengths, c->entries); + c->codewords = NULL; + } + + compute_accelerated_huffman(c); + + CHECK(f); + c->lookup_type = get_bits(f, 4); + if (c->lookup_type > 2) return error(f, VORBIS_invalid_setup); + if (c->lookup_type > 0) { + uint16 *mults; + c->minimum_value = float32_unpack(get_bits(f, 32)); + c->delta_value = float32_unpack(get_bits(f, 32)); + c->value_bits = get_bits(f, 4)+1; + c->sequence_p = get_bits(f,1); + if (c->lookup_type == 1) { + c->lookup_values = lookup1_values(c->entries, c->dimensions); + } else { + c->lookup_values = c->entries * c->dimensions; + } + if (c->lookup_values == 0) return error(f, VORBIS_invalid_setup); + mults = (uint16 *) setup_temp_malloc(f, sizeof(mults[0]) * c->lookup_values); + if (mults == NULL) return error(f, VORBIS_outofmem); + for (j=0; j < (int) c->lookup_values; ++j) { + int q = get_bits(f, c->value_bits); + if (q == EOP) { setup_temp_free(f,mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_invalid_setup); } + mults[j] = q; + } + +#ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK + if (c->lookup_type == 1) { + int len, sparse = c->sparse; + float last=0; + // pre-expand the lookup1-style multiplicands, to avoid a divide in the inner loop + if (sparse) { + if (c->sorted_entries == 0) goto skip; + c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->sorted_entries * c->dimensions); + } else + c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->entries * c->dimensions); + if (c->multiplicands == NULL) { setup_temp_free(f,mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_outofmem); } + len = sparse ? c->sorted_entries : c->entries; + for (j=0; j < len; ++j) { + unsigned int z = sparse ? c->sorted_values[j] : j; + unsigned int div=1; + for (k=0; k < c->dimensions; ++k) { + int off = (z / div) % c->lookup_values; + float val = mults[off]; + val = mults[off]*c->delta_value + c->minimum_value + last; + c->multiplicands[j*c->dimensions + k] = val; + if (c->sequence_p) + last = val; + if (k+1 < c->dimensions) { + if (div > UINT_MAX / (unsigned int) c->lookup_values) { + setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values); + return error(f, VORBIS_invalid_setup); + } + div *= c->lookup_values; + } + } + } + c->lookup_type = 2; + } + else +#endif + { + float last=0; + CHECK(f); + c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->lookup_values); + if (c->multiplicands == NULL) { setup_temp_free(f, mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_outofmem); } + for (j=0; j < (int) c->lookup_values; ++j) { + float val = mults[j] * c->delta_value + c->minimum_value + last; + c->multiplicands[j] = val; + if (c->sequence_p) + last = val; + } + } +#ifndef STB_VORBIS_DIVIDES_IN_CODEBOOK + skip:; +#endif + setup_temp_free(f, mults, sizeof(mults[0])*c->lookup_values); + + CHECK(f); + } + CHECK(f); + } + + // time domain transfers (notused) + + x = get_bits(f, 6) + 1; + for (i=0; i < x; ++i) { + uint32 z = get_bits(f, 16); + if (z != 0) return error(f, VORBIS_invalid_setup); + } + + // Floors + f->floor_count = get_bits(f, 6)+1; + f->floor_config = (Floor *) setup_malloc(f, f->floor_count * sizeof(*f->floor_config)); + if (f->floor_config == NULL) return error(f, VORBIS_outofmem); + for (i=0; i < f->floor_count; ++i) { + f->floor_types[i] = get_bits(f, 16); + if (f->floor_types[i] > 1) return error(f, VORBIS_invalid_setup); + if (f->floor_types[i] == 0) { + Floor0 *g = &f->floor_config[i].floor0; + g->order = get_bits(f,8); + g->rate = get_bits(f,16); + g->bark_map_size = get_bits(f,16); + g->amplitude_bits = get_bits(f,6); + g->amplitude_offset = get_bits(f,8); + g->number_of_books = get_bits(f,4) + 1; + for (j=0; j < g->number_of_books; ++j) + g->book_list[j] = get_bits(f,8); + return error(f, VORBIS_feature_not_supported); + } else { + stbv__floor_ordering p[31*8+2]; + Floor1 *g = &f->floor_config[i].floor1; + int max_class = -1; + g->partitions = get_bits(f, 5); + for (j=0; j < g->partitions; ++j) { + g->partition_class_list[j] = get_bits(f, 4); + if (g->partition_class_list[j] > max_class) + max_class = g->partition_class_list[j]; + } + for (j=0; j <= max_class; ++j) { + g->class_dimensions[j] = get_bits(f, 3)+1; + g->class_subclasses[j] = get_bits(f, 2); + if (g->class_subclasses[j]) { + g->class_masterbooks[j] = get_bits(f, 8); + if (g->class_masterbooks[j] >= f->codebook_count) return error(f, VORBIS_invalid_setup); + } + for (k=0; k < 1 << g->class_subclasses[j]; ++k) { + g->subclass_books[j][k] = get_bits(f,8)-1; + if (g->subclass_books[j][k] >= f->codebook_count) return error(f, VORBIS_invalid_setup); + } + } + g->floor1_multiplier = get_bits(f,2)+1; + g->rangebits = get_bits(f,4); + g->Xlist[0] = 0; + g->Xlist[1] = 1 << g->rangebits; + g->values = 2; + for (j=0; j < g->partitions; ++j) { + int c = g->partition_class_list[j]; + for (k=0; k < g->class_dimensions[c]; ++k) { + g->Xlist[g->values] = get_bits(f, g->rangebits); + ++g->values; + } + } + // precompute the sorting + for (j=0; j < g->values; ++j) { + p[j].x = g->Xlist[j]; + p[j].id = j; + } + qsort(p, g->values, sizeof(p[0]), point_compare); + for (j=0; j < g->values; ++j) + g->sorted_order[j] = (uint8) p[j].id; + // precompute the neighbors + for (j=2; j < g->values; ++j) { + int low,hi; + neighbors(g->Xlist, j, &low,&hi); + g->neighbors[j][0] = low; + g->neighbors[j][1] = hi; + } + + if (g->values > longest_floorlist) + longest_floorlist = g->values; + } + } + + // Residue + f->residue_count = get_bits(f, 6)+1; + f->residue_config = (Residue *) setup_malloc(f, f->residue_count * sizeof(f->residue_config[0])); + if (f->residue_config == NULL) return error(f, VORBIS_outofmem); + memset(f->residue_config, 0, f->residue_count * sizeof(f->residue_config[0])); + for (i=0; i < f->residue_count; ++i) { + uint8 residue_cascade[64]; + Residue *r = f->residue_config+i; + f->residue_types[i] = get_bits(f, 16); + if (f->residue_types[i] > 2) return error(f, VORBIS_invalid_setup); + r->begin = get_bits(f, 24); + r->end = get_bits(f, 24); + if (r->end < r->begin) return error(f, VORBIS_invalid_setup); + r->part_size = get_bits(f,24)+1; + r->classifications = get_bits(f,6)+1; + r->classbook = get_bits(f,8); + if (r->classbook >= f->codebook_count) return error(f, VORBIS_invalid_setup); + for (j=0; j < r->classifications; ++j) { + uint8 high_bits=0; + uint8 low_bits=get_bits(f,3); + if (get_bits(f,1)) + high_bits = get_bits(f,5); + residue_cascade[j] = high_bits*8 + low_bits; + } + r->residue_books = (short (*)[8]) setup_malloc(f, sizeof(r->residue_books[0]) * r->classifications); + if (r->residue_books == NULL) return error(f, VORBIS_outofmem); + for (j=0; j < r->classifications; ++j) { + for (k=0; k < 8; ++k) { + if (residue_cascade[j] & (1 << k)) { + r->residue_books[j][k] = get_bits(f, 8); + if (r->residue_books[j][k] >= f->codebook_count) return error(f, VORBIS_invalid_setup); + } else { + r->residue_books[j][k] = -1; + } + } + } + // precompute the classifications[] array to avoid inner-loop mod/divide + // call it 'classdata' since we already have r->classifications + r->classdata = (uint8 **) setup_malloc(f, sizeof(*r->classdata) * f->codebooks[r->classbook].entries); + if (!r->classdata) return error(f, VORBIS_outofmem); + memset(r->classdata, 0, sizeof(*r->classdata) * f->codebooks[r->classbook].entries); + for (j=0; j < f->codebooks[r->classbook].entries; ++j) { + int classwords = f->codebooks[r->classbook].dimensions; + int temp = j; + r->classdata[j] = (uint8 *) setup_malloc(f, sizeof(r->classdata[j][0]) * classwords); + if (r->classdata[j] == NULL) return error(f, VORBIS_outofmem); + for (k=classwords-1; k >= 0; --k) { + r->classdata[j][k] = temp % r->classifications; + temp /= r->classifications; + } + } + } + + f->mapping_count = get_bits(f,6)+1; + f->mapping = (Mapping *) setup_malloc(f, f->mapping_count * sizeof(*f->mapping)); + if (f->mapping == NULL) return error(f, VORBIS_outofmem); + memset(f->mapping, 0, f->mapping_count * sizeof(*f->mapping)); + for (i=0; i < f->mapping_count; ++i) { + Mapping *m = f->mapping + i; + int mapping_type = get_bits(f,16); + if (mapping_type != 0) return error(f, VORBIS_invalid_setup); + m->chan = (MappingChannel *) setup_malloc(f, f->channels * sizeof(*m->chan)); + if (m->chan == NULL) return error(f, VORBIS_outofmem); + if (get_bits(f,1)) + m->submaps = get_bits(f,4)+1; + else + m->submaps = 1; + if (m->submaps > max_submaps) + max_submaps = m->submaps; + if (get_bits(f,1)) { + m->coupling_steps = get_bits(f,8)+1; + for (k=0; k < m->coupling_steps; ++k) { + m->chan[k].magnitude = get_bits(f, ilog(f->channels-1)); + m->chan[k].angle = get_bits(f, ilog(f->channels-1)); + if (m->chan[k].magnitude >= f->channels) return error(f, VORBIS_invalid_setup); + if (m->chan[k].angle >= f->channels) return error(f, VORBIS_invalid_setup); + if (m->chan[k].magnitude == m->chan[k].angle) return error(f, VORBIS_invalid_setup); + } + } else + m->coupling_steps = 0; + + // reserved field + if (get_bits(f,2)) return error(f, VORBIS_invalid_setup); + if (m->submaps > 1) { + for (j=0; j < f->channels; ++j) { + m->chan[j].mux = get_bits(f, 4); + if (m->chan[j].mux >= m->submaps) return error(f, VORBIS_invalid_setup); + } + } else + // @SPECIFICATION: this case is missing from the spec + for (j=0; j < f->channels; ++j) + m->chan[j].mux = 0; + + for (j=0; j < m->submaps; ++j) { + get_bits(f,8); // discard + m->submap_floor[j] = get_bits(f,8); + m->submap_residue[j] = get_bits(f,8); + if (m->submap_floor[j] >= f->floor_count) return error(f, VORBIS_invalid_setup); + if (m->submap_residue[j] >= f->residue_count) return error(f, VORBIS_invalid_setup); + } + } + + // Modes + f->mode_count = get_bits(f, 6)+1; + for (i=0; i < f->mode_count; ++i) { + Mode *m = f->mode_config+i; + m->blockflag = get_bits(f,1); + m->windowtype = get_bits(f,16); + m->transformtype = get_bits(f,16); + m->mapping = get_bits(f,8); + if (m->windowtype != 0) return error(f, VORBIS_invalid_setup); + if (m->transformtype != 0) return error(f, VORBIS_invalid_setup); + if (m->mapping >= f->mapping_count) return error(f, VORBIS_invalid_setup); + } + + flush_packet(f); + + f->previous_length = 0; + + for (i=0; i < f->channels; ++i) { + f->channel_buffers[i] = (float *) setup_malloc(f, sizeof(float) * f->blocksize_1); + f->previous_window[i] = (float *) setup_malloc(f, sizeof(float) * f->blocksize_1/2); + f->finalY[i] = (int16 *) setup_malloc(f, sizeof(int16) * longest_floorlist); + if (f->channel_buffers[i] == NULL || f->previous_window[i] == NULL || f->finalY[i] == NULL) return error(f, VORBIS_outofmem); + memset(f->channel_buffers[i], 0, sizeof(float) * f->blocksize_1); + #ifdef STB_VORBIS_NO_DEFER_FLOOR + f->floor_buffers[i] = (float *) setup_malloc(f, sizeof(float) * f->blocksize_1/2); + if (f->floor_buffers[i] == NULL) return error(f, VORBIS_outofmem); + #endif + } + + if (!init_blocksize(f, 0, f->blocksize_0)) return FALSE; + if (!init_blocksize(f, 1, f->blocksize_1)) return FALSE; + f->blocksize[0] = f->blocksize_0; + f->blocksize[1] = f->blocksize_1; + +#ifdef STB_VORBIS_DIVIDE_TABLE + if (integer_divide_table[1][1]==0) + for (i=0; i < DIVTAB_NUMER; ++i) + for (j=1; j < DIVTAB_DENOM; ++j) + integer_divide_table[i][j] = i / j; +#endif + + // compute how much temporary memory is needed + + // 1. + { + uint32 imdct_mem = (f->blocksize_1 * sizeof(float) >> 1); + uint32 classify_mem; + int i,max_part_read=0; + for (i=0; i < f->residue_count; ++i) { + Residue *r = f->residue_config + i; + unsigned int actual_size = f->blocksize_1 / 2; + unsigned int limit_r_begin = r->begin < actual_size ? r->begin : actual_size; + unsigned int limit_r_end = r->end < actual_size ? r->end : actual_size; + int n_read = limit_r_end - limit_r_begin; + int part_read = n_read / r->part_size; + if (part_read > max_part_read) + max_part_read = part_read; + } + #ifndef STB_VORBIS_DIVIDES_IN_RESIDUE + classify_mem = f->channels * (sizeof(void*) + max_part_read * sizeof(uint8 *)); + #else + classify_mem = f->channels * (sizeof(void*) + max_part_read * sizeof(int *)); + #endif + + // maximum reasonable partition size is f->blocksize_1 + + f->temp_memory_required = classify_mem; + if (imdct_mem > f->temp_memory_required) + f->temp_memory_required = imdct_mem; + } + + f->first_decode = TRUE; + + if (f->alloc.alloc_buffer) { + assert(f->temp_offset == f->alloc.alloc_buffer_length_in_bytes); + // check if there's enough temp memory so we don't error later + if (f->setup_offset + sizeof(*f) + f->temp_memory_required > (unsigned) f->temp_offset) + return error(f, VORBIS_outofmem); + } + + f->first_audio_page_offset = stb_vorbis_get_file_offset(f); + + return TRUE; +} + +static void vorbis_deinit(stb_vorbis *p) +{ + int i,j; + if (p->residue_config) { + for (i=0; i < p->residue_count; ++i) { + Residue *r = p->residue_config+i; + if (r->classdata) { + for (j=0; j < p->codebooks[r->classbook].entries; ++j) + setup_free(p, r->classdata[j]); + setup_free(p, r->classdata); + } + setup_free(p, r->residue_books); + } + } + + if (p->codebooks) { + CHECK(p); + for (i=0; i < p->codebook_count; ++i) { + Codebook *c = p->codebooks + i; + setup_free(p, c->codeword_lengths); + setup_free(p, c->multiplicands); + setup_free(p, c->codewords); + setup_free(p, c->sorted_codewords); + // c->sorted_values[-1] is the first entry in the array + setup_free(p, c->sorted_values ? c->sorted_values-1 : NULL); + } + setup_free(p, p->codebooks); + } + setup_free(p, p->floor_config); + setup_free(p, p->residue_config); + if (p->mapping) { + for (i=0; i < p->mapping_count; ++i) + setup_free(p, p->mapping[i].chan); + setup_free(p, p->mapping); + } + CHECK(p); + for (i=0; i < p->channels && i < STB_VORBIS_MAX_CHANNELS; ++i) { + setup_free(p, p->channel_buffers[i]); + setup_free(p, p->previous_window[i]); + #ifdef STB_VORBIS_NO_DEFER_FLOOR + setup_free(p, p->floor_buffers[i]); + #endif + setup_free(p, p->finalY[i]); + } + for (i=0; i < 2; ++i) { + setup_free(p, p->A[i]); + setup_free(p, p->B[i]); + setup_free(p, p->C[i]); + setup_free(p, p->window[i]); + setup_free(p, p->bit_reverse[i]); + } + #ifndef STB_VORBIS_NO_STDIO + if (p->close_on_free) fclose(p->f); + #endif +} + +void stb_vorbis_close(stb_vorbis *p) +{ + if (p == NULL) return; + vorbis_deinit(p); + setup_free(p,p); +} + +static void vorbis_init(stb_vorbis *p, const stb_vorbis_alloc *z) +{ + memset(p, 0, sizeof(*p)); // NULL out all malloc'd pointers to start + if (z) { + p->alloc = *z; + p->alloc.alloc_buffer_length_in_bytes = (p->alloc.alloc_buffer_length_in_bytes+3) & ~3; + p->temp_offset = p->alloc.alloc_buffer_length_in_bytes; + } + p->eof = 0; + p->error = VORBIS__no_error; + p->stream = NULL; + p->codebooks = NULL; + p->page_crc_tests = -1; + #ifndef STB_VORBIS_NO_STDIO + p->close_on_free = FALSE; + p->f = NULL; + #endif +} + +int stb_vorbis_get_sample_offset(stb_vorbis *f) +{ + if (f->current_loc_valid) + return f->current_loc; + else + return -1; +} + +stb_vorbis_info stb_vorbis_get_info(stb_vorbis *f) +{ + stb_vorbis_info d; + d.channels = f->channels; + d.sample_rate = f->sample_rate; + d.setup_memory_required = f->setup_memory_required; + d.setup_temp_memory_required = f->setup_temp_memory_required; + d.temp_memory_required = f->temp_memory_required; + d.max_frame_size = f->blocksize_1 >> 1; + return d; +} + +int stb_vorbis_get_error(stb_vorbis *f) +{ + int e = f->error; + f->error = VORBIS__no_error; + return e; +} + +static stb_vorbis * vorbis_alloc(stb_vorbis *f) +{ + stb_vorbis *p = (stb_vorbis *) setup_malloc(f, sizeof(*p)); + return p; +} + +#ifndef STB_VORBIS_NO_PUSHDATA_API + +void stb_vorbis_flush_pushdata(stb_vorbis *f) +{ + f->previous_length = 0; + f->page_crc_tests = 0; + f->discard_samples_deferred = 0; + f->current_loc_valid = FALSE; + f->first_decode = FALSE; + f->samples_output = 0; + f->channel_buffer_start = 0; + f->channel_buffer_end = 0; +} + +static int vorbis_search_for_page_pushdata(vorb *f, uint8 *data, int data_len) +{ + int i,n; + for (i=0; i < f->page_crc_tests; ++i) + f->scan[i].bytes_done = 0; + + // if we have room for more scans, search for them first, because + // they may cause us to stop early if their header is incomplete + if (f->page_crc_tests < STB_VORBIS_PUSHDATA_CRC_COUNT) { + if (data_len < 4) return 0; + data_len -= 3; // need to look for 4-byte sequence, so don't miss + // one that straddles a boundary + for (i=0; i < data_len; ++i) { + if (data[i] == 0x4f) { + if (0==memcmp(data+i, ogg_page_header, 4)) { + int j,len; + uint32 crc; + // make sure we have the whole page header + if (i+26 >= data_len || i+27+data[i+26] >= data_len) { + // only read up to this page start, so hopefully we'll + // have the whole page header start next time + data_len = i; + break; + } + // ok, we have it all; compute the length of the page + len = 27 + data[i+26]; + for (j=0; j < data[i+26]; ++j) + len += data[i+27+j]; + // scan everything up to the embedded crc (which we must 0) + crc = 0; + for (j=0; j < 22; ++j) + crc = crc32_update(crc, data[i+j]); + // now process 4 0-bytes + for ( ; j < 26; ++j) + crc = crc32_update(crc, 0); + // len is the total number of bytes we need to scan + n = f->page_crc_tests++; + f->scan[n].bytes_left = len-j; + f->scan[n].crc_so_far = crc; + f->scan[n].goal_crc = data[i+22] + (data[i+23] << 8) + (data[i+24]<<16) + (data[i+25]<<24); + // if the last frame on a page is continued to the next, then + // we can't recover the sample_loc immediately + if (data[i+27+data[i+26]-1] == 255) + f->scan[n].sample_loc = ~0; + else + f->scan[n].sample_loc = data[i+6] + (data[i+7] << 8) + (data[i+ 8]<<16) + (data[i+ 9]<<24); + f->scan[n].bytes_done = i+j; + if (f->page_crc_tests == STB_VORBIS_PUSHDATA_CRC_COUNT) + break; + // keep going if we still have room for more + } + } + } + } + + for (i=0; i < f->page_crc_tests;) { + uint32 crc; + int j; + int n = f->scan[i].bytes_done; + int m = f->scan[i].bytes_left; + if (m > data_len - n) m = data_len - n; + // m is the bytes to scan in the current chunk + crc = f->scan[i].crc_so_far; + for (j=0; j < m; ++j) + crc = crc32_update(crc, data[n+j]); + f->scan[i].bytes_left -= m; + f->scan[i].crc_so_far = crc; + if (f->scan[i].bytes_left == 0) { + // does it match? + if (f->scan[i].crc_so_far == f->scan[i].goal_crc) { + // Houston, we have page + data_len = n+m; // consumption amount is wherever that scan ended + f->page_crc_tests = -1; // drop out of page scan mode + f->previous_length = 0; // decode-but-don't-output one frame + f->next_seg = -1; // start a new page + f->current_loc = f->scan[i].sample_loc; // set the current sample location + // to the amount we'd have decoded had we decoded this page + f->current_loc_valid = f->current_loc != ~0U; + return data_len; + } + // delete entry + f->scan[i] = f->scan[--f->page_crc_tests]; + } else { + ++i; + } + } + + return data_len; +} + +// return value: number of bytes we used +int stb_vorbis_decode_frame_pushdata( + stb_vorbis *f, // the file we're decoding + const uint8 *data, int data_len, // the memory available for decoding + int *channels, // place to write number of float * buffers + float ***output, // place to write float ** array of float * buffers + int *samples // place to write number of output samples + ) +{ + int i; + int len,right,left; + + if (!IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing); + + if (f->page_crc_tests >= 0) { + *samples = 0; + return vorbis_search_for_page_pushdata(f, (uint8 *) data, data_len); + } + + f->stream = (uint8 *) data; + f->stream_end = (uint8 *) data + data_len; + f->error = VORBIS__no_error; + + // check that we have the entire packet in memory + if (!is_whole_packet_present(f, FALSE)) { + *samples = 0; + return 0; + } + + if (!vorbis_decode_packet(f, &len, &left, &right)) { + // save the actual error we encountered + enum STBVorbisError error = f->error; + if (error == VORBIS_bad_packet_type) { + // flush and resynch + f->error = VORBIS__no_error; + while (get8_packet(f) != EOP) + if (f->eof) break; + *samples = 0; + return (int) (f->stream - data); + } + if (error == VORBIS_continued_packet_flag_invalid) { + if (f->previous_length == 0) { + // we may be resynching, in which case it's ok to hit one + // of these; just discard the packet + f->error = VORBIS__no_error; + while (get8_packet(f) != EOP) + if (f->eof) break; + *samples = 0; + return (int) (f->stream - data); + } + } + // if we get an error while parsing, what to do? + // well, it DEFINITELY won't work to continue from where we are! + stb_vorbis_flush_pushdata(f); + // restore the error that actually made us bail + f->error = error; + *samples = 0; + return 1; + } + + // success! + len = vorbis_finish_frame(f, len, left, right); + for (i=0; i < f->channels; ++i) + f->outputs[i] = f->channel_buffers[i] + left; + + if (channels) *channels = f->channels; + *samples = len; + *output = f->outputs; + return (int) (f->stream - data); +} + +stb_vorbis *stb_vorbis_open_pushdata( + const unsigned char *data, int data_len, // the memory available for decoding + int *data_used, // only defined if result is not NULL + int *error, const stb_vorbis_alloc *alloc) +{ + stb_vorbis *f, p; + vorbis_init(&p, alloc); + p.stream = (uint8 *) data; + p.stream_end = (uint8 *) data + data_len; + p.push_mode = TRUE; + if (!start_decoder(&p)) { + if (p.eof) + *error = VORBIS_need_more_data; + else + *error = p.error; + return NULL; + } + f = vorbis_alloc(&p); + if (f) { + *f = p; + *data_used = (int) (f->stream - data); + *error = 0; + return f; + } else { + vorbis_deinit(&p); + return NULL; + } +} +#endif // STB_VORBIS_NO_PUSHDATA_API + +unsigned int stb_vorbis_get_file_offset(stb_vorbis *f) +{ + #ifndef STB_VORBIS_NO_PUSHDATA_API + if (f->push_mode) return 0; + #endif + if (USE_MEMORY(f)) return (unsigned int) (f->stream - f->stream_start); + #ifndef STB_VORBIS_NO_STDIO + return (unsigned int) (ftell(f->f) - f->f_start); + #endif +} + +#ifndef STB_VORBIS_NO_PULLDATA_API +// +// DATA-PULLING API +// + +static uint32 vorbis_find_page(stb_vorbis *f, uint32 *end, uint32 *last) +{ + for(;;) { + int n; + if (f->eof) return 0; + n = get8(f); + if (n == 0x4f) { // page header candidate + unsigned int retry_loc = stb_vorbis_get_file_offset(f); + int i; + // check if we're off the end of a file_section stream + if (retry_loc - 25 > f->stream_len) + return 0; + // check the rest of the header + for (i=1; i < 4; ++i) + if (get8(f) != ogg_page_header[i]) + break; + if (f->eof) return 0; + if (i == 4) { + uint8 header[27]; + uint32 i, crc, goal, len; + for (i=0; i < 4; ++i) + header[i] = ogg_page_header[i]; + for (; i < 27; ++i) + header[i] = get8(f); + if (f->eof) return 0; + if (header[4] != 0) goto invalid; + goal = header[22] + (header[23] << 8) + (header[24]<<16) + (header[25]<<24); + for (i=22; i < 26; ++i) + header[i] = 0; + crc = 0; + for (i=0; i < 27; ++i) + crc = crc32_update(crc, header[i]); + len = 0; + for (i=0; i < header[26]; ++i) { + int s = get8(f); + crc = crc32_update(crc, s); + len += s; + } + if (len && f->eof) return 0; + for (i=0; i < len; ++i) + crc = crc32_update(crc, get8(f)); + // finished parsing probable page + if (crc == goal) { + // we could now check that it's either got the last + // page flag set, OR it's followed by the capture + // pattern, but I guess TECHNICALLY you could have + // a file with garbage between each ogg page and recover + // from it automatically? So even though that paranoia + // might decrease the chance of an invalid decode by + // another 2^32, not worth it since it would hose those + // invalid-but-useful files? + if (end) + *end = stb_vorbis_get_file_offset(f); + if (last) { + if (header[5] & 0x04) + *last = 1; + else + *last = 0; + } + set_file_offset(f, retry_loc-1); + return 1; + } + } + invalid: + // not a valid page, so rewind and look for next one + set_file_offset(f, retry_loc); + } + } +} + + +#define SAMPLE_unknown 0xffffffff + +// seeking is implemented with a binary search, which narrows down the range to +// 64K, before using a linear search (because finding the synchronization +// pattern can be expensive, and the chance we'd find the end page again is +// relatively high for small ranges) +// +// two initial interpolation-style probes are used at the start of the search +// to try to bound either side of the binary search sensibly, while still +// working in O(log n) time if they fail. + +static int get_seek_page_info(stb_vorbis *f, ProbedPage *z) +{ + uint8 header[27], lacing[255]; + int i,len; + + // record where the page starts + z->page_start = stb_vorbis_get_file_offset(f); + + // parse the header + getn(f, header, 27); + if (header[0] != 'O' || header[1] != 'g' || header[2] != 'g' || header[3] != 'S') + return 0; + getn(f, lacing, header[26]); + + // determine the length of the payload + len = 0; + for (i=0; i < header[26]; ++i) + len += lacing[i]; + + // this implies where the page ends + z->page_end = z->page_start + 27 + header[26] + len; + + // read the last-decoded sample out of the data + z->last_decoded_sample = header[6] + (header[7] << 8) + (header[8] << 16) + (header[9] << 24); + + // restore file state to where we were + set_file_offset(f, z->page_start); + return 1; +} + +// rarely used function to seek back to the preceeding page while finding the +// start of a packet +static int go_to_page_before(stb_vorbis *f, unsigned int limit_offset) +{ + unsigned int previous_safe, end; + + // now we want to seek back 64K from the limit + if (limit_offset >= 65536 && limit_offset-65536 >= f->first_audio_page_offset) + previous_safe = limit_offset - 65536; + else + previous_safe = f->first_audio_page_offset; + + set_file_offset(f, previous_safe); + + while (vorbis_find_page(f, &end, NULL)) { + if (end >= limit_offset && stb_vorbis_get_file_offset(f) < limit_offset) + return 1; + set_file_offset(f, end); + } + + return 0; +} + +// implements the search logic for finding a page and starting decoding. if +// the function succeeds, current_loc_valid will be true and current_loc will +// be less than or equal to the provided sample number (the closer the +// better). +static int seek_to_sample_coarse(stb_vorbis *f, uint32 sample_number) +{ + ProbedPage left, right, mid; + int i, start_seg_with_known_loc, end_pos, page_start; + uint32 delta, stream_length, padding; + double offset, bytes_per_sample; + int probe = 0; + + // find the last page and validate the target sample + stream_length = stb_vorbis_stream_length_in_samples(f); + if (stream_length == 0) return error(f, VORBIS_seek_without_length); + if (sample_number > stream_length) return error(f, VORBIS_seek_invalid); + + // this is the maximum difference between the window-center (which is the + // actual granule position value), and the right-start (which the spec + // indicates should be the granule position (give or take one)). + padding = ((f->blocksize_1 - f->blocksize_0) >> 2); + if (sample_number < padding) + sample_number = 0; + else + sample_number -= padding; + + left = f->p_first; + while (left.last_decoded_sample == ~0U) { + // (untested) the first page does not have a 'last_decoded_sample' + set_file_offset(f, left.page_end); + if (!get_seek_page_info(f, &left)) goto error; + } + + right = f->p_last; + assert(right.last_decoded_sample != ~0U); + + // starting from the start is handled differently + if (sample_number <= left.last_decoded_sample) { + if (stb_vorbis_seek_start(f)) + return 1; + return 0; + } + + while (left.page_end != right.page_start) { + assert(left.page_end < right.page_start); + // search range in bytes + delta = right.page_start - left.page_end; + if (delta <= 65536) { + // there's only 64K left to search - handle it linearly + set_file_offset(f, left.page_end); + } else { + if (probe < 2) { + if (probe == 0) { + // first probe (interpolate) + double data_bytes = right.page_end - left.page_start; + bytes_per_sample = data_bytes / right.last_decoded_sample; + offset = left.page_start + bytes_per_sample * (sample_number - left.last_decoded_sample); + } else { + // second probe (try to bound the other side) + double error = ((double) sample_number - mid.last_decoded_sample) * bytes_per_sample; + if (error >= 0 && error < 8000) error = 8000; + if (error < 0 && error > -8000) error = -8000; + offset += error * 2; + } + + // ensure the offset is valid + if (offset < left.page_end) + offset = left.page_end; + if (offset > right.page_start - 65536) + offset = right.page_start - 65536; + + set_file_offset(f, (unsigned int) offset); + } else { + // binary search for large ranges (offset by 32K to ensure + // we don't hit the right page) + set_file_offset(f, left.page_end + (delta / 2) - 32768); + } + + if (!vorbis_find_page(f, NULL, NULL)) goto error; + } + + for (;;) { + if (!get_seek_page_info(f, &mid)) goto error; + if (mid.last_decoded_sample != ~0U) break; + // (untested) no frames end on this page + set_file_offset(f, mid.page_end); + assert(mid.page_start < right.page_start); + } + + // if we've just found the last page again then we're in a tricky file, + // and we're close enough. + if (mid.page_start == right.page_start) + break; + + if (sample_number < mid.last_decoded_sample) + right = mid; + else + left = mid; + + ++probe; + } + + // seek back to start of the last packet + page_start = left.page_start; + set_file_offset(f, page_start); + if (!start_page(f)) return error(f, VORBIS_seek_failed); + end_pos = f->end_seg_with_known_loc; + assert(end_pos >= 0); + + for (;;) { + for (i = end_pos; i > 0; --i) + if (f->segments[i-1] != 255) + break; + + start_seg_with_known_loc = i; + + if (start_seg_with_known_loc > 0 || !(f->page_flag & PAGEFLAG_continued_packet)) + break; + + // (untested) the final packet begins on an earlier page + if (!go_to_page_before(f, page_start)) + goto error; + + page_start = stb_vorbis_get_file_offset(f); + if (!start_page(f)) goto error; + end_pos = f->segment_count - 1; + } + + // prepare to start decoding + f->current_loc_valid = FALSE; + f->last_seg = FALSE; + f->valid_bits = 0; + f->packet_bytes = 0; + f->bytes_in_seg = 0; + f->previous_length = 0; + f->next_seg = start_seg_with_known_loc; + + for (i = 0; i < start_seg_with_known_loc; i++) + skip(f, f->segments[i]); + + // start decoding (optimizable - this frame is generally discarded) + if (!vorbis_pump_first_frame(f)) + return 0; + if (f->current_loc > sample_number) + return error(f, VORBIS_seek_failed); + return 1; + +error: + // try to restore the file to a valid state + stb_vorbis_seek_start(f); + return error(f, VORBIS_seek_failed); +} + +// the same as vorbis_decode_initial, but without advancing +static int peek_decode_initial(vorb *f, int *p_left_start, int *p_left_end, int *p_right_start, int *p_right_end, int *mode) +{ + int bits_read, bytes_read; + + if (!vorbis_decode_initial(f, p_left_start, p_left_end, p_right_start, p_right_end, mode)) + return 0; + + // either 1 or 2 bytes were read, figure out which so we can rewind + bits_read = 1 + ilog(f->mode_count-1); + if (f->mode_config[*mode].blockflag) + bits_read += 2; + bytes_read = (bits_read + 7) / 8; + + f->bytes_in_seg += bytes_read; + f->packet_bytes -= bytes_read; + skip(f, -bytes_read); + if (f->next_seg == -1) + f->next_seg = f->segment_count - 1; + else + f->next_seg--; + f->valid_bits = 0; + + return 1; +} + +int stb_vorbis_seek_frame(stb_vorbis *f, unsigned int sample_number) +{ + uint32 max_frame_samples; + + if (IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing); + + // fast page-level search + if (!seek_to_sample_coarse(f, sample_number)) + return 0; + + assert(f->current_loc_valid); + assert(f->current_loc <= sample_number); + + // linear search for the relevant packet + max_frame_samples = (f->blocksize_1*3 - f->blocksize_0) >> 2; + while (f->current_loc < sample_number) { + int left_start, left_end, right_start, right_end, mode, frame_samples; + if (!peek_decode_initial(f, &left_start, &left_end, &right_start, &right_end, &mode)) + return error(f, VORBIS_seek_failed); + // calculate the number of samples returned by the next frame + frame_samples = right_start - left_start; + if (f->current_loc + frame_samples > sample_number) { + return 1; // the next frame will contain the sample + } else if (f->current_loc + frame_samples + max_frame_samples > sample_number) { + // there's a chance the frame after this could contain the sample + vorbis_pump_first_frame(f); + } else { + // this frame is too early to be relevant + f->current_loc += frame_samples; + f->previous_length = 0; + maybe_start_packet(f); + flush_packet(f); + } + } + // the next frame will start with the sample + assert(f->current_loc == sample_number); + return 1; +} + +int stb_vorbis_seek(stb_vorbis *f, unsigned int sample_number) +{ + if (!stb_vorbis_seek_frame(f, sample_number)) + return 0; + + if (sample_number != f->current_loc) { + int n; + uint32 frame_start = f->current_loc; + stb_vorbis_get_frame_float(f, &n, NULL); + assert(sample_number > frame_start); + assert(f->channel_buffer_start + (int) (sample_number-frame_start) <= f->channel_buffer_end); + f->channel_buffer_start += (sample_number - frame_start); + } + + return 1; +} + +int stb_vorbis_seek_start(stb_vorbis *f) +{ + if (IS_PUSH_MODE(f)) { return error(f, VORBIS_invalid_api_mixing); } + set_file_offset(f, f->first_audio_page_offset); + f->previous_length = 0; + f->first_decode = TRUE; + f->next_seg = -1; + return vorbis_pump_first_frame(f); +} + +unsigned int stb_vorbis_stream_length_in_samples(stb_vorbis *f) +{ + unsigned int restore_offset, previous_safe; + unsigned int end, last_page_loc; + + if (IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing); + if (!f->total_samples) { + unsigned int last; + uint32 lo,hi; + char header[6]; + + // first, store the current decode position so we can restore it + restore_offset = stb_vorbis_get_file_offset(f); + + // now we want to seek back 64K from the end (the last page must + // be at most a little less than 64K, but let's allow a little slop) + if (f->stream_len >= 65536 && f->stream_len-65536 >= f->first_audio_page_offset) + previous_safe = f->stream_len - 65536; + else + previous_safe = f->first_audio_page_offset; + + set_file_offset(f, previous_safe); + // previous_safe is now our candidate 'earliest known place that seeking + // to will lead to the final page' + + if (!vorbis_find_page(f, &end, &last)) { + // if we can't find a page, we're hosed! + f->error = VORBIS_cant_find_last_page; + f->total_samples = 0xffffffff; + goto done; + } + + // check if there are more pages + last_page_loc = stb_vorbis_get_file_offset(f); + + // stop when the last_page flag is set, not when we reach eof; + // this allows us to stop short of a 'file_section' end without + // explicitly checking the length of the section + while (!last) { + set_file_offset(f, end); + if (!vorbis_find_page(f, &end, &last)) { + // the last page we found didn't have the 'last page' flag + // set. whoops! + break; + } + previous_safe = last_page_loc+1; + last_page_loc = stb_vorbis_get_file_offset(f); + } + + set_file_offset(f, last_page_loc); + + // parse the header + getn(f, (unsigned char *)header, 6); + // extract the absolute granule position + lo = get32(f); + hi = get32(f); + if (lo == 0xffffffff && hi == 0xffffffff) { + f->error = VORBIS_cant_find_last_page; + f->total_samples = SAMPLE_unknown; + goto done; + } + if (hi) + lo = 0xfffffffe; // saturate + f->total_samples = lo; + + f->p_last.page_start = last_page_loc; + f->p_last.page_end = end; + f->p_last.last_decoded_sample = lo; + + done: + set_file_offset(f, restore_offset); + } + return f->total_samples == SAMPLE_unknown ? 0 : f->total_samples; +} + +float stb_vorbis_stream_length_in_seconds(stb_vorbis *f) +{ + return stb_vorbis_stream_length_in_samples(f) / (float) f->sample_rate; +} + + + +int stb_vorbis_get_frame_float(stb_vorbis *f, int *channels, float ***output) +{ + int len, right,left,i; + if (IS_PUSH_MODE(f)) return error(f, VORBIS_invalid_api_mixing); + + if (!vorbis_decode_packet(f, &len, &left, &right)) { + f->channel_buffer_start = f->channel_buffer_end = 0; + return 0; + } + + len = vorbis_finish_frame(f, len, left, right); + for (i=0; i < f->channels; ++i) + f->outputs[i] = f->channel_buffers[i] + left; + + f->channel_buffer_start = left; + f->channel_buffer_end = left+len; + + if (channels) *channels = f->channels; + if (output) *output = f->outputs; + return len; +} + +#ifndef STB_VORBIS_NO_STDIO + +stb_vorbis * stb_vorbis_open_file_section(FILE *file, int close_on_free, int *error, const stb_vorbis_alloc *alloc, unsigned int length) +{ + stb_vorbis *f, p; + vorbis_init(&p, alloc); + p.f = file; + p.f_start = (uint32) ftell(file); + p.stream_len = length; + p.close_on_free = close_on_free; + if (start_decoder(&p)) { + f = vorbis_alloc(&p); + if (f) { + *f = p; + vorbis_pump_first_frame(f); + return f; + } + } + if (error) *error = p.error; + vorbis_deinit(&p); + return NULL; +} + +stb_vorbis * stb_vorbis_open_file(FILE *file, int close_on_free, int *error, const stb_vorbis_alloc *alloc) +{ + unsigned int len, start; + start = (unsigned int) ftell(file); + fseek(file, 0, SEEK_END); + len = (unsigned int) (ftell(file) - start); + fseek(file, start, SEEK_SET); + return stb_vorbis_open_file_section(file, close_on_free, error, alloc, len); +} + +stb_vorbis * stb_vorbis_open_filename(const char *filename, int *error, const stb_vorbis_alloc *alloc) +{ + FILE *f = fopen(filename, "rb"); + if (f) + return stb_vorbis_open_file(f, TRUE, error, alloc); + if (error) *error = VORBIS_file_open_failure; + return NULL; +} +#endif // STB_VORBIS_NO_STDIO + +stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len, int *error, const stb_vorbis_alloc *alloc) +{ + stb_vorbis *f, p; + if (data == NULL) return NULL; + vorbis_init(&p, alloc); + p.stream = (uint8 *) data; + p.stream_end = (uint8 *) data + len; + p.stream_start = (uint8 *) p.stream; + p.stream_len = len; + p.push_mode = FALSE; + if (start_decoder(&p)) { + f = vorbis_alloc(&p); + if (f) { + *f = p; + vorbis_pump_first_frame(f); + if (error) *error = VORBIS__no_error; + return f; + } + } + if (error) *error = p.error; + vorbis_deinit(&p); + return NULL; +} + +#ifndef STB_VORBIS_NO_INTEGER_CONVERSION +#define PLAYBACK_MONO 1 +#define PLAYBACK_LEFT 2 +#define PLAYBACK_RIGHT 4 + +#define L (PLAYBACK_LEFT | PLAYBACK_MONO) +#define C (PLAYBACK_LEFT | PLAYBACK_RIGHT | PLAYBACK_MONO) +#define R (PLAYBACK_RIGHT | PLAYBACK_MONO) + +static int8 channel_position[7][6] = +{ + { 0 }, + { C }, + { L, R }, + { L, C, R }, + { L, R, L, R }, + { L, C, R, L, R }, + { L, C, R, L, R, C }, +}; + + +#ifndef STB_VORBIS_NO_FAST_SCALED_FLOAT + typedef union { + float f; + int i; + } float_conv; + typedef char stb_vorbis_float_size_test[sizeof(float)==4 && sizeof(int) == 4]; + #define FASTDEF(x) float_conv x + // add (1<<23) to convert to int, then divide by 2^SHIFT, then add 0.5/2^SHIFT to round + #define MAGIC(SHIFT) (1.5f * (1 << (23-SHIFT)) + 0.5f/(1 << SHIFT)) + #define ADDEND(SHIFT) (((150-SHIFT) << 23) + (1 << 22)) + #define FAST_SCALED_FLOAT_TO_INT(temp,x,s) (temp.f = (x) + MAGIC(s), temp.i - ADDEND(s)) + #define check_endianness() +#else + #define FAST_SCALED_FLOAT_TO_INT(temp,x,s) ((int) ((x) * (1 << (s)))) + #define check_endianness() + #define FASTDEF(x) +#endif + +static void copy_samples(short *dest, float *src, int len) +{ + int i; + check_endianness(); + for (i=0; i < len; ++i) { + FASTDEF(temp); + int v = FAST_SCALED_FLOAT_TO_INT(temp, src[i],15); + if ((unsigned int) (v + 32768) > 65535) + v = v < 0 ? -32768 : 32767; + dest[i] = v; + } +} + +static void compute_samples(int mask, short *output, int num_c, float **data, int d_offset, int len) +{ + #define BUFFER_SIZE 32 + float buffer[BUFFER_SIZE]; + int i,j,o,n = BUFFER_SIZE; + check_endianness(); + for (o = 0; o < len; o += BUFFER_SIZE) { + memset(buffer, 0, sizeof(buffer)); + if (o + n > len) n = len - o; + for (j=0; j < num_c; ++j) { + if (channel_position[num_c][j] & mask) { + for (i=0; i < n; ++i) + buffer[i] += data[j][d_offset+o+i]; + } + } + for (i=0; i < n; ++i) { + FASTDEF(temp); + int v = FAST_SCALED_FLOAT_TO_INT(temp,buffer[i],15); + if ((unsigned int) (v + 32768) > 65535) + v = v < 0 ? -32768 : 32767; + output[o+i] = v; + } + } +} + +static void compute_stereo_samples(short *output, int num_c, float **data, int d_offset, int len) +{ + #define BUFFER_SIZE 32 + float buffer[BUFFER_SIZE]; + int i,j,o,n = BUFFER_SIZE >> 1; + // o is the offset in the source data + check_endianness(); + for (o = 0; o < len; o += BUFFER_SIZE >> 1) { + // o2 is the offset in the output data + int o2 = o << 1; + memset(buffer, 0, sizeof(buffer)); + if (o + n > len) n = len - o; + for (j=0; j < num_c; ++j) { + int m = channel_position[num_c][j] & (PLAYBACK_LEFT | PLAYBACK_RIGHT); + if (m == (PLAYBACK_LEFT | PLAYBACK_RIGHT)) { + for (i=0; i < n; ++i) { + buffer[i*2+0] += data[j][d_offset+o+i]; + buffer[i*2+1] += data[j][d_offset+o+i]; + } + } else if (m == PLAYBACK_LEFT) { + for (i=0; i < n; ++i) { + buffer[i*2+0] += data[j][d_offset+o+i]; + } + } else if (m == PLAYBACK_RIGHT) { + for (i=0; i < n; ++i) { + buffer[i*2+1] += data[j][d_offset+o+i]; + } + } + } + for (i=0; i < (n<<1); ++i) { + FASTDEF(temp); + int v = FAST_SCALED_FLOAT_TO_INT(temp,buffer[i],15); + if ((unsigned int) (v + 32768) > 65535) + v = v < 0 ? -32768 : 32767; + output[o2+i] = v; + } + } +} + +static void convert_samples_short(int buf_c, short **buffer, int b_offset, int data_c, float **data, int d_offset, int samples) +{ + int i; + if (buf_c != data_c && buf_c <= 2 && data_c <= 6) { + static int channel_selector[3][2] = { {0}, {PLAYBACK_MONO}, {PLAYBACK_LEFT, PLAYBACK_RIGHT} }; + for (i=0; i < buf_c; ++i) + compute_samples(channel_selector[buf_c][i], buffer[i]+b_offset, data_c, data, d_offset, samples); + } else { + int limit = buf_c < data_c ? buf_c : data_c; + for (i=0; i < limit; ++i) + copy_samples(buffer[i]+b_offset, data[i]+d_offset, samples); + for ( ; i < buf_c; ++i) + memset(buffer[i]+b_offset, 0, sizeof(short) * samples); + } +} + +int stb_vorbis_get_frame_short(stb_vorbis *f, int num_c, short **buffer, int num_samples) +{ + float **output; + int len = stb_vorbis_get_frame_float(f, NULL, &output); + if (len > num_samples) len = num_samples; + if (len) + convert_samples_short(num_c, buffer, 0, f->channels, output, 0, len); + return len; +} + +static void convert_channels_short_interleaved(int buf_c, short *buffer, int data_c, float **data, int d_offset, int len) +{ + int i; + check_endianness(); + if (buf_c != data_c && buf_c <= 2 && data_c <= 6) { + assert(buf_c == 2); + for (i=0; i < buf_c; ++i) + compute_stereo_samples(buffer, data_c, data, d_offset, len); + } else { + int limit = buf_c < data_c ? buf_c : data_c; + int j; + for (j=0; j < len; ++j) { + for (i=0; i < limit; ++i) { + FASTDEF(temp); + float f = data[i][d_offset+j]; + int v = FAST_SCALED_FLOAT_TO_INT(temp, f,15);//data[i][d_offset+j],15); + if ((unsigned int) (v + 32768) > 65535) + v = v < 0 ? -32768 : 32767; + *buffer++ = v; + } + for ( ; i < buf_c; ++i) + *buffer++ = 0; + } + } +} + +int stb_vorbis_get_frame_short_interleaved(stb_vorbis *f, int num_c, short *buffer, int num_shorts) +{ + float **output; + int len; + if (num_c == 1) return stb_vorbis_get_frame_short(f,num_c,&buffer, num_shorts); + len = stb_vorbis_get_frame_float(f, NULL, &output); + if (len) { + if (len*num_c > num_shorts) len = num_shorts / num_c; + convert_channels_short_interleaved(num_c, buffer, f->channels, output, 0, len); + } + return len; +} + +int stb_vorbis_get_samples_short_interleaved(stb_vorbis *f, int channels, short *buffer, int num_shorts) +{ + float **outputs; + int len = num_shorts / channels; + int n=0; + int z = f->channels; + if (z > channels) z = channels; + while (n < len) { + int k = f->channel_buffer_end - f->channel_buffer_start; + if (n+k >= len) k = len - n; + if (k) + convert_channels_short_interleaved(channels, buffer, f->channels, f->channel_buffers, f->channel_buffer_start, k); + buffer += k*channels; + n += k; + f->channel_buffer_start += k; + if (n == len) break; + if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break; + } + return n; +} + +int stb_vorbis_get_samples_short(stb_vorbis *f, int channels, short **buffer, int len) +{ + float **outputs; + int n=0; + int z = f->channels; + if (z > channels) z = channels; + while (n < len) { + int k = f->channel_buffer_end - f->channel_buffer_start; + if (n+k >= len) k = len - n; + if (k) + convert_samples_short(channels, buffer, n, f->channels, f->channel_buffers, f->channel_buffer_start, k); + n += k; + f->channel_buffer_start += k; + if (n == len) break; + if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) break; + } + return n; +} + +#ifndef STB_VORBIS_NO_STDIO +int stb_vorbis_decode_filename(const char *filename, int *channels, int *sample_rate, short **output) +{ + int data_len, offset, total, limit, error; + short *data; + stb_vorbis *v = stb_vorbis_open_filename(filename, &error, NULL); + if (v == NULL) return -1; + limit = v->channels * 4096; + *channels = v->channels; + if (sample_rate) + *sample_rate = v->sample_rate; + offset = data_len = 0; + total = limit; + data = (short *) malloc(total * sizeof(*data)); + if (data == NULL) { + stb_vorbis_close(v); + return -2; + } + for (;;) { + int n = stb_vorbis_get_frame_short_interleaved(v, v->channels, data+offset, total-offset); + if (n == 0) break; + data_len += n; + offset += n * v->channels; + if (offset + limit > total) { + short *data2; + total *= 2; + data2 = (short *) realloc(data, total * sizeof(*data)); + if (data2 == NULL) { + free(data); + stb_vorbis_close(v); + return -2; + } + data = data2; + } + } + *output = data; + stb_vorbis_close(v); + return data_len; +} +#endif // NO_STDIO + +int stb_vorbis_decode_memory(const uint8 *mem, int len, int *channels, int *sample_rate, short **output) +{ + int data_len, offset, total, limit, error; + short *data; + stb_vorbis *v = stb_vorbis_open_memory(mem, len, &error, NULL); + if (v == NULL) return -1; + limit = v->channels * 4096; + *channels = v->channels; + if (sample_rate) + *sample_rate = v->sample_rate; + offset = data_len = 0; + total = limit; + data = (short *) malloc(total * sizeof(*data)); + if (data == NULL) { + stb_vorbis_close(v); + return -2; + } + for (;;) { + int n = stb_vorbis_get_frame_short_interleaved(v, v->channels, data+offset, total-offset); + if (n == 0) break; + data_len += n; + offset += n * v->channels; + if (offset + limit > total) { + short *data2; + total *= 2; + data2 = (short *) realloc(data, total * sizeof(*data)); + if (data2 == NULL) { + free(data); + stb_vorbis_close(v); + return -2; + } + data = data2; + } + } + *output = data; + stb_vorbis_close(v); + return data_len; +} +#endif // STB_VORBIS_NO_INTEGER_CONVERSION + +int stb_vorbis_get_samples_float_interleaved(stb_vorbis *f, int channels, float *buffer, int num_floats) +{ + float **outputs; + int len = num_floats / channels; + int n=0; + int z = f->channels; + if (z > channels) z = channels; + while (n < len) { + int i,j; + int k = f->channel_buffer_end - f->channel_buffer_start; + if (n+k >= len) k = len - n; + for (j=0; j < k; ++j) { + for (i=0; i < z; ++i) + *buffer++ = f->channel_buffers[i][f->channel_buffer_start+j]; + for ( ; i < channels; ++i) + *buffer++ = 0; + } + n += k; + f->channel_buffer_start += k; + if (n == len) + break; + if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) + break; + } + return n; +} + +int stb_vorbis_get_samples_float(stb_vorbis *f, int channels, float **buffer, int num_samples) +{ + float **outputs; + int n=0; + int z = f->channels; + if (z > channels) z = channels; + while (n < num_samples) { + int i; + int k = f->channel_buffer_end - f->channel_buffer_start; + if (n+k >= num_samples) k = num_samples - n; + if (k) { + for (i=0; i < z; ++i) + memcpy(buffer[i]+n, f->channel_buffers[i]+f->channel_buffer_start, sizeof(float)*k); + for ( ; i < channels; ++i) + memset(buffer[i]+n, 0, sizeof(float) * k); + } + n += k; + f->channel_buffer_start += k; + if (n == num_samples) + break; + if (!stb_vorbis_get_frame_float(f, NULL, &outputs)) + break; + } + return n; +} +#endif // STB_VORBIS_NO_PULLDATA_API + +/* Version history + 1.12 - 2017-11-21 - limit residue begin/end to blocksize/2 to avoid large temp allocs in bad/corrupt files + 1.11 - 2017-07-23 - fix MinGW compilation + 1.10 - 2017-03-03 - more robust seeking; fix negative ilog(); clear error in open_memory + 1.09 - 2016-04-04 - back out 'avoid discarding last frame' fix from previous version + 1.08 - 2016-04-02 - fixed multiple warnings; fix setup memory leaks; + avoid discarding last frame of audio data + 1.07 - 2015-01-16 - fixed some warnings, fix mingw, const-correct API + some more crash fixes when out of memory or with corrupt files + 1.06 - 2015-08-31 - full, correct support for seeking API (Dougall Johnson) + some crash fixes when out of memory or with corrupt files + 1.05 - 2015-04-19 - don't define __forceinline if it's redundant + 1.04 - 2014-08-27 - fix missing const-correct case in API + 1.03 - 2014-08-07 - Warning fixes + 1.02 - 2014-07-09 - Declare qsort compare function _cdecl on windows + 1.01 - 2014-06-18 - fix stb_vorbis_get_samples_float + 1.0 - 2014-05-26 - fix memory leaks; fix warnings; fix bugs in multichannel + (API change) report sample rate for decode-full-file funcs + 0.99996 - bracket #include for macintosh compilation by Laurent Gomila + 0.99995 - use union instead of pointer-cast for fast-float-to-int to avoid alias-optimization problem + 0.99994 - change fast-float-to-int to work in single-precision FPU mode, remove endian-dependence + 0.99993 - remove assert that fired on legal files with empty tables + 0.99992 - rewind-to-start + 0.99991 - bugfix to stb_vorbis_get_samples_short by Bernhard Wodo + 0.9999 - (should have been 0.99990) fix no-CRT support, compiling as C++ + 0.9998 - add a full-decode function with a memory source + 0.9997 - fix a bug in the read-from-FILE case in 0.9996 addition + 0.9996 - query length of vorbis stream in samples/seconds + 0.9995 - bugfix to another optimization that only happened in certain files + 0.9994 - bugfix to one of the optimizations that caused significant (but inaudible?) errors + 0.9993 - performance improvements; runs in 99% to 104% of time of reference implementation + 0.9992 - performance improvement of IMDCT; now performs close to reference implementation + 0.9991 - performance improvement of IMDCT + 0.999 - (should have been 0.9990) performance improvement of IMDCT + 0.998 - no-CRT support from Casey Muratori + 0.997 - bugfixes for bugs found by Terje Mathisen + 0.996 - bugfix: fast-huffman decode initialized incorrectly for sparse codebooks; fixing gives 10% speedup - found by Terje Mathisen + 0.995 - bugfix: fix to 'effective' overrun detection - found by Terje Mathisen + 0.994 - bugfix: garbage decode on final VQ symbol of a non-multiple - found by Terje Mathisen + 0.993 - bugfix: pushdata API required 1 extra byte for empty page (failed to consume final page if empty) - found by Terje Mathisen + 0.992 - fixes for MinGW warning + 0.991 - turn fast-float-conversion on by default + 0.990 - fix push-mode seek recovery if you seek into the headers + 0.98b - fix to bad release of 0.98 + 0.98 - fix push-mode seek recovery; robustify float-to-int and support non-fast mode + 0.97 - builds under c++ (typecasting, don't use 'class' keyword) + 0.96 - somehow MY 0.95 was right, but the web one was wrong, so here's my 0.95 rereleased as 0.96, fixes a typo in the clamping code + 0.95 - clamping code for 16-bit functions + 0.94 - not publically released + 0.93 - fixed all-zero-floor case (was decoding garbage) + 0.92 - fixed a memory leak + 0.91 - conditional compiles to omit parts of the API and the infrastructure to support them: STB_VORBIS_NO_PULLDATA_API, STB_VORBIS_NO_PUSHDATA_API, STB_VORBIS_NO_STDIO, STB_VORBIS_NO_INTEGER_CONVERSION + 0.90 - first public release +*/ + +#endif // STB_VORBIS_HEADER_ONLY + + +/* +------------------------------------------------------------------------------ +This software is available under 2 licenses -- choose whichever you prefer. +------------------------------------------------------------------------------ +ALTERNATIVE A - MIT License +Copyright (c) 2017 Sean Barrett +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------ +ALTERNATIVE B - Public Domain (www.unlicense.org) +This is free and unencumbered software released into the public domain. +Anyone is free to copy, modify, publish, use, compile, sell, or distribute this +software, either in source code form or as a compiled binary, for any purpose, +commercial or non-commercial, and by any means. +In jurisdictions that recognize copyright laws, the author or authors of this +software dedicate any and all copyright interest in the software to the public +domain. We make this dedication for the benefit of the public at large and to +the detriment of our heirs and successors. We intend this dedication to be an +overt act of relinquishment in perpetuity of all present and future rights to +this software under copyright law. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +------------------------------------------------------------------------------ +*/ \ No newline at end of file diff --git a/uart.cpp b/uart.cpp index 9dcb9394..2672c6bf 100644 --- a/uart.cpp +++ b/uart.cpp @@ -160,7 +160,7 @@ void uart_input::poll() auto const bit { std::get( entry ) % 8 }; bool const state { ( ( buffer[ byte ] & ( 1 << bit ) ) != 0 ) }; - bool const changed { ( ( old_packet[ byte ] & ( 1 << bit ) ) != state ) }; + bool const changed { ( ( ( old_packet[ byte ] & ( 1 << bit ) ) != 0 ) != state ) }; if( false == changed ) { continue; } diff --git a/version.h b/version.h index 4af1a0c5..43026737 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 419 +#define VERSION_MINOR 429 #define VERSION_REVISION 0 From aa9626901f995189ed67700120e16c2af0d0c870 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 6 May 2018 04:05:43 +0200 Subject: [PATCH 321/426] build 180505. animated mirrors and doorsteps, support for spotlight hotspot width attribute, per-sound radio message range, support for combined tachometer sound, minor bug fixes --- DynObj.cpp | 349 +++++++++++++++++++++++++++++++-------------- DynObj.h | 38 +++-- McZapkie/MOVER.h | 7 +- McZapkie/Mover.cpp | 12 +- Model3d.cpp | 6 +- Train.cpp | 14 +- renderer.cpp | 36 ++++- renderer.h | 1 + scene.cpp | 5 +- simulation.cpp | 6 +- sound.cpp | 7 + sound.h | 3 + uilayer.cpp | 2 +- version.h | 2 +- 14 files changed, 351 insertions(+), 137 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 2ea215d2..3b7b73bf 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -70,8 +70,7 @@ void TAnimPant::AKP_4E() }; //--------------------------------------------------------------------------- int TAnim::TypeSet(int i, int fl) -{ // ustawienie typu animacji i zależnej od - // niego ilości animowanych submodeli +{ // ustawienie typu animacji i zależnej od niego ilości animowanych submodeli fMaxDist = -1.0; // normalnie nie pokazywać switch (i) { // maska 0x000F: ile używa wskaźników na submodele (0 gdy jeden, @@ -104,16 +103,19 @@ int TAnim::TypeSet(int i, int fl) case 6: iFlags = 0x068; break; // 6-tłok i rozrząd - 8 submodeli + case 7: + iFlags = 0x070; + break; // doorstep + case 8: + iFlags = 0x080; + break; // mirror default: iFlags = 0; } yUpdate = nullptr; return iFlags & 15; // ile wskaźników rezerwować dla danego typu animacji }; -TAnim::TAnim() -{ // potrzebne to w ogóle? - iFlags = -1; // nieznany typ - destruktor nic nie usuwa -}; + TAnim::~TAnim() { // usuwanie animacji switch (iFlags & 0xF0) @@ -124,13 +126,15 @@ TAnim::~TAnim() case 0x50: // 5-pantograf delete fParamPants; break; - case 0x60: // 6-tłok i rozrząd + default: break; } }; +/* void TAnim::Parovoz(){ // animowanie tłoka i rozrządu parowozu }; +*/ //--------------------------------------------------------------------------- TDynamicObject * TDynamicObject::FirstFind(int &coupler_nr, int cf) { // szukanie skrajnego połączonego pojazdu w pociagu @@ -400,11 +404,6 @@ void TDynamicObject::UpdateBoogie(TAnim *pAnim) void TDynamicObject::UpdateDoorTranslate(TAnim *pAnim) { // animacja drzwi - przesuw - // WriteLog("Dla drzwi nr:", i); - // WriteLog("Wspolczynnik", DoorSpeedFactor[i]); - // Ra: te współczynniki są bez sensu, bo modyfikują wektor przesunięcia - // w efekcie drzwi otwierane na zewnątrz będą odlatywac dowolnie daleko :) - // ograniczyłem zakres ruchu funkcją max if (pAnim->smAnimated) { if( pAnim->iNumber & 1 ) { @@ -427,9 +426,7 @@ void TDynamicObject::UpdateDoorTranslate(TAnim *pAnim) void TDynamicObject::UpdateDoorRotate(TAnim *pAnim) { // animacja drzwi - obrót if (pAnim->smAnimated) - { // if (MoverParameters->DoorOpenMethod==2) //obrotowe - // albo dwójłomne (trzeba kombinowac - // submodelami i ShiftL=90,R=180) + { if (pAnim->iNumber & 1) pAnim->smAnimated->SetRotate(float3(1, 0, 0), dDoorMoveR); else @@ -440,9 +437,7 @@ void TDynamicObject::UpdateDoorRotate(TAnim *pAnim) void TDynamicObject::UpdateDoorFold(TAnim *pAnim) { // animacja drzwi - obrót if (pAnim->smAnimated) - { // if (MoverParameters->DoorOpenMethod==2) //obrotowe - // albo dwójłomne (trzeba kombinowac - // submodelami i ShiftL=90,R=180) + { if (pAnim->iNumber & 1) { pAnim->smAnimated->SetRotate(float3(0, 0, 1), dDoorMoveR); @@ -458,7 +453,6 @@ void TDynamicObject::UpdateDoorFold(TAnim *pAnim) else { pAnim->smAnimated->SetRotate(float3(0, 0, 1), dDoorMoveL); - // SubModel->SetRotate(float3(0,1,0),fValue*360.0); TSubModel *sm = pAnim->smAnimated->ChildGet(); // skrzydło mniejsze if (sm) { @@ -471,6 +465,35 @@ void TDynamicObject::UpdateDoorFold(TAnim *pAnim) } }; +void TDynamicObject::UpdateDoorPlug(TAnim *pAnim) +{ // animacja drzwi - odskokprzesuw + if (pAnim->smAnimated) { + + if( pAnim->iNumber & 1 ) { + pAnim->smAnimated->SetTranslate( + Math3D::vector3 { + std::min( + dDoorMoveR * 2, + MoverParameters->DoorMaxPlugShift ), + 0.0, + std::max( + 0.0, + dDoorMoveR - MoverParameters->DoorMaxPlugShift * 0.5f ) } ); + } + else { + pAnim->smAnimated->SetTranslate( + Math3D::vector3 { + std::min( + dDoorMoveL * 2, + MoverParameters->DoorMaxPlugShift ), + 0.0, + std::max( + 0.0, + dDoorMoveL - MoverParameters->DoorMaxPlugShift * 0.5f ) } ); + } + } +} + void TDynamicObject::UpdatePant(TAnim *pAnim) { // animacja pantografu - 4 obracane ramiona, ślizg piąty float a, b, c; @@ -487,37 +510,66 @@ void TDynamicObject::UpdatePant(TAnim *pAnim) pAnim->smElement[3]->SetRotate(float3(-1, 0, 0), c); if (pAnim->smElement[4]) pAnim->smElement[4]->SetRotate(float3(-1, 0, 0), b); //ślizg -}; +} -void TDynamicObject::UpdateDoorPlug(TAnim *pAnim) -{ // animacja drzwi - odskokprzesuw - if (pAnim->smAnimated) { +// doorstep animation, shift +void TDynamicObject::UpdatePlatformTranslate( TAnim *pAnim ) { - if( pAnim->iNumber & 1 ) { - pAnim->smAnimated->SetTranslate( - Math3D::vector3 { - std::min( - dDoorMoveR * 2, - MoverParameters->DoorMaxPlugShift ), - 0.0, - std::max( - 0.0, - dDoorMoveR - MoverParameters->DoorMaxPlugShift * 0.5 ) } ); - } - else { - pAnim->smAnimated->SetTranslate( - Math3D::vector3 { - std::min( - dDoorMoveL * 2, - MoverParameters->DoorMaxPlugShift ), - 0.0, - std::max( - 0.0, - dDoorMoveL - MoverParameters->DoorMaxPlugShift * 0.5f ) } ); - } + if( pAnim->smAnimated == nullptr ) { return; } + + if( pAnim->iNumber & 1 ) { + pAnim->smAnimated->SetTranslate( + Math3D::vector3{ + interpolate( 0.0, MoverParameters->PlatformMaxShift, dDoorstepMoveR ), + 0.0, + 0.0 } ); } -}; + else { + pAnim->smAnimated->SetTranslate( + Math3D::vector3{ + interpolate( 0.0, MoverParameters->PlatformMaxShift, dDoorstepMoveL ), + 0.0, + 0.0 } ); + } +} +// doorstep animation, rotate +void TDynamicObject::UpdatePlatformRotate( TAnim *pAnim ) { + + if( pAnim->smAnimated == nullptr ) { return; } + + if( pAnim->iNumber & 1 ) + pAnim->smAnimated->SetRotate( + float3( 0, 1, 0 ), + interpolate( 0.0, MoverParameters->PlatformMaxShift, dDoorstepMoveR ) ); + else + pAnim->smAnimated->SetRotate( + float3( 0, 1, 0 ), + interpolate( 0.0, MoverParameters->PlatformMaxShift, dDoorstepMoveL ) ); +} + +// mirror animation, rotate +void TDynamicObject::UpdateMirror( TAnim *pAnim ) { + + if( pAnim->smAnimated == nullptr ) { return; } + + // only animate the mirror if it's located on the same end of the vehicle as the active cab + auto const isactive { ( + ( ( pAnim->iNumber & 0xf ) >> 4 ) == ( MoverParameters->ActiveCab > 0 ? side::front : side::rear ) ? + 1.0 : + 0.0 ) }; + + if( pAnim->iNumber & 1 ) + pAnim->smAnimated->SetRotate( + float3( 0, 1, 0 ), + interpolate( 0.0, MoverParameters->MirrorMaxShift, dMirrorMoveR * isactive ) ); + else + pAnim->smAnimated->SetRotate( + float3( 0, 1, 0 ), + interpolate( 0.0, MoverParameters->MirrorMaxShift, dMirrorMoveL * isactive ) ); +} + +/* void TDynamicObject::UpdateLeverDouble(TAnim *pAnim) { // animacja gałki zależna od double pAnim->smAnimated->SetRotate(float3(1, 0, 0), pAnim->fSpeed * *pAnim->fDoubleBase); @@ -537,7 +589,7 @@ void TDynamicObject::UpdateLeverEnum(TAnim *pAnim) // pAnim->fParam[0]; - dodać lepkość pAnim->smAnimated->SetRotate(float3(1, 0, 0), pAnim->fParam[*pAnim->iIntBase]); }; - +*/ // sets light levels for registered interior sections void TDynamicObject::toggle_lights() { @@ -586,10 +638,14 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) if (ObjSqrDist < ( 400 * 400 ) ) // gdy bliżej niż 400m { - for (int i = 0; i < iAnimations; ++i) // wykonanie kolejnych animacji - if (ObjSqrDist < pAnimations[ i ].fMaxDist) - if (pAnimations[ i ].yUpdate) // jeśli zdefiniowana funkcja - pAnimations[ i ].yUpdate( &pAnimations[ i ] ); // aktualizacja animacji (położenia submodeli + for( auto &animation : pAnimations ) { + // wykonanie kolejnych animacji + if( ( ObjSqrDist < animation.fMaxDist ) + && ( animation.yUpdate ) ) { + // jeśli zdefiniowana funkcja aktualizacja animacji (położenia submodeli + animation.yUpdate( &animation ); + } + } if( ( mdModel != nullptr ) && ( ObjSqrDist < ( 50 * 50 ) ) ) { @@ -1655,13 +1711,6 @@ TDynamicObject::TDynamicObject() { // w MMD) // ustawienie liczby modeli animowanych podczas konstruowania obiektu a nie na 0 // prowadzi prosto do wysypów jeśli źle zdefiniowane mmd - iAnimType[ANIM_WHEELS] = 0; // 0-osie (8) - iAnimType[ANIM_DOORS] = 0; // 1-drzwi (8) - iAnimType[ANIM_LEVERS] = 0; // 2-wahacze (4) - np. nogi konia - iAnimType[ANIM_BUFFERS] = 0; // 3-zderzaki (4) - iAnimType[ANIM_BOOGIES] = 0; // 4-wózki (2) - iAnimType[ANIM_PANTS] = 0; // 5-pantografy (2) - iAnimType[ANIM_STEAMS] = 0; // 6-tłoki (napęd parowozu) iAnimations = 0; // na razie nie ma żadnego pAnimated = NULL; fShade = 0.0; // standardowe oświetlenie na starcie @@ -3603,6 +3652,60 @@ bool TDynamicObject::Update(double dt, double dt1) dDoorMoveR -= dt1 * MoverParameters->DoorCloseSpeed; dDoorMoveR = std::max( dDoorMoveR, 0.0 ); } + // doorsteps + if( ( dDoorstepMoveL < 1.0 ) + && ( true == MoverParameters->DoorLeftOpened ) ) { + dDoorstepMoveL = std::min( + 1.0, + dDoorstepMoveL + MoverParameters->PlatformSpeed * dt1 ); + } + if( ( dDoorstepMoveL > 0.0 ) + && ( false == MoverParameters->DoorLeftOpened ) ) { + dDoorstepMoveL = std::max( + 0.0, + dDoorstepMoveL - MoverParameters->PlatformSpeed * dt1 ); + } + if( ( dDoorstepMoveR < 1.0 ) + && ( true == MoverParameters->DoorRightOpened ) ) { + dDoorstepMoveR = std::min( + 1.0, + dDoorstepMoveR + MoverParameters->PlatformSpeed * dt1 ); + } + if( ( dDoorstepMoveR > 0.0 ) + && ( false == MoverParameters->DoorRightOpened ) ) { + dDoorstepMoveR = std::max( + 0.0, + dDoorstepMoveR - MoverParameters->PlatformSpeed * dt1 ); + } + // mirrors + if( MoverParameters->Vel > 5.0 ) { + // automatically fold mirrors when above velocity threshold + if( dMirrorMoveL > 0.0 ) { + dMirrorMoveL = std::max( + 0.0, + dMirrorMoveL - 1.0 * dt1 ); + } + if( dMirrorMoveR > 0.0 ) { + dMirrorMoveR = std::max( + 0.0, + dMirrorMoveR - 1.0 * dt1 ); + } + } + else { + // unfold mirror on the side with open doors, if not moving too fast + if( ( dMirrorMoveL < 1.0 ) + && ( true == MoverParameters->DoorLeftOpened ) ) { + dMirrorMoveL = std::min( + 1.0, + dMirrorMoveL + 1.0 * dt1 ); + } + if( ( dMirrorMoveR < 1.0 ) + && ( true == MoverParameters->DoorRightOpened ) ) { + dMirrorMoveR = std::min( + 1.0, + dMirrorMoveR + 1.0 * dt1 ); + } + } // compartment lights // if the vehicle has a controller, we base the light state on state of the controller otherwise we check the vehicle itself @@ -4338,43 +4441,23 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, { // kolejne liczby to ilość animacj, -1 to znacznik końca parser.getTokens( 1, false ); parser >> ile; // ilość danego typu animacji - // if (co==ANIM_PANTS) - // if (!Global.bLoadTraction) - // if (!DebugModeFlag) //w debugmode pantografy mają "niby działać" - // ile=0; //wyłączenie animacji pantografów - if (co < ANIM_TYPES) - if (ile >= 0) - { - iAnimType[co] = ile; // zapamiętanie - iAnimations += ile; // ogólna ilość animacji - } + if (ile >= 0) + { + iAnimType[co] = ile; // zapamiętanie + iAnimations += ile; // ogólna ilość animacji + } + else { + iAnimType[co] = 0; + } ++co; - } while (ile >= 0); //-1 to znacznik końca + } while ( (ile >= 0) && (co < ANIM_TYPES) ); //-1 to znacznik końca - while( co < ANIM_TYPES ) { - iAnimType[ co++ ] = 0; // zerowanie pozostałych - } - parser.getTokens(); parser >> token; // NOTE: should this be here? seems at best superfluous + parser.getTokens(); parser >> token; } - // WriteLog("Total animations: "+AnsiString(iAnimations)); } if( true == pAnimations.empty() ) { // Ra: tworzenie tabeli animacji, jeśli jeszcze nie było -/* - // disabled as default animation amounts are no longer supported - if( !iAnimations ) { - // jeśli nie podano jawnie, ile ma być animacji - iAnimations = 28; // tyle było kiedyś w każdym pojeździe (2 wiązary wypadły) - } -*/ - /* //pojazd może mieć pantograf do innych celów niż napęd - if (MoverParameters->EnginePowerSource.SourceType!=CurrentCollector) - {//nie będzie pantografów, to się trochę uprości - iAnimations-=iAnimType[ANIM_PANTS]; //domyślnie były 2 pantografy - iAnimType[ANIM_PANTS]=0; - } - */ pAnimations.resize( iAnimations ); int i, j, k = 0, sm = 0; for (j = 0; j < ANIM_TYPES; ++j) @@ -4787,23 +4870,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, parser >> fWahaczeAmp; } } - /* - else if (str == AnsiString("engineer:")) - { // nazwa submodelu maszynisty - str = Parser->GetNextSymbol(); - smMechanik0 = mdModel->GetFromName(str.c_str()); - if (!smMechanik0) - { // jak nie ma bez numerka, to może jest z - // numerkiem? - smMechanik0 = mdModel->GetFromName(AnsiString(str + "1").c_str()); - smMechanik1 = mdModel->GetFromName(AnsiString(str + "2").c_str()); - } - // aby dało się go obracać, musi mieć włączoną animację w T3D! - // if (!smMechanik1) //jeśli drugiego nie ma - // if (smMechanik0) //a jest pierwszy - // smMechanik0->WillBeAnimated(); //to będziemy go obracać - } - */ else if( token == "animdoorprefix:" ) { // nazwa animowanych drzwi @@ -4838,9 +4904,80 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } pAnimations[i + j].iNumber = i; // parzyste działają inaczej niż nieparzyste pAnimations[i + j].fMaxDist = 300 * 300; // drzwi to z daleka widać +/* + // NOTE: no longer used pAnimations[i + j].fSpeed = Random(150); // oryginalny koncept z DoorSpeedFactor pAnimations[i + j].fSpeed = (pAnimations[i + j].fSpeed + 100) / 100; - // Ra: te współczynniki są bez sensu, bo modyfikują wektor przesunięcia +*/ + } + } + } + + else if( token == "animstepprefix:" ) { + // animated doorstep submodel name prefix + int i, j; + parser.getTokens(1, false); parser >> token; + for (i = 0, j = 0; i < ANIM_DOORSTEPS; ++i) + j += iAnimType[i]; // zliczanie wcześniejszych animacji + for (i = 0; i < iAnimType[ANIM_DOORSTEPS]; ++i) // liczba drzwi + { // NBMX wrzesien 2003: wyszukiwanie drzwi o nazwie str* + // ustalenie submodelu + asAnimName = token + std::to_string(i + 1); + pAnimations[i + j].smAnimated = mdModel->GetFromName(asAnimName); + if (pAnimations[i + j].smAnimated) + { //++iAnimatedDoors; + pAnimations[i + j].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu + switch (MoverParameters->PlatformOpenMethod) + { // od razu zapinamy potrzebny typ animacji + case 1: // shift + pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdatePlatformTranslate, this, std::placeholders::_1 ); + break; + case 2: // rotate + pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdatePlatformRotate, this, std::placeholders::_1 ); + break; + default: + break; + } + pAnimations[i + j].iNumber = i; // parzyste działają inaczej niż nieparzyste + pAnimations[i + j].fMaxDist = 150 * 150; // drzwi to z daleka widać +/* + // NOTE: no longer used + pAnimations[i + j].fSpeed = Random(150); // oryginalny koncept z DoorSpeedFactor + pAnimations[i + j].fSpeed = (pAnimations[i + j].fSpeed + 100) / 100; +*/ + } + } + } + + else if( token == "animmirrorprefix:" ) { + // animated mirror submodel name prefix + int i, j; + parser.getTokens( 1, false ); parser >> token; + for( i = 0, j = 0; i < ANIM_MIRRORS; ++i ) + j += iAnimType[ i ]; // zliczanie wcześniejszych animacji + for( i = 0; i < iAnimType[ ANIM_MIRRORS ]; ++i ) // liczba drzwi + { // NBMX wrzesien 2003: wyszukiwanie drzwi o nazwie str* + // ustalenie submodelu + asAnimName = token + std::to_string( i + 1 ); + pAnimations[ i + j ].smAnimated = mdModel->GetFromName( asAnimName ); + if( pAnimations[ i + j ].smAnimated ) { + pAnimations[ i + j ].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu + // od razu zapinamy potrzebny typ animacji + auto const offset { pAnimations[ i + j ].smAnimated->offset() }; + pAnimations[ i + j ].yUpdate = std::bind( &TDynamicObject::UpdateMirror, this, std::placeholders::_1 ); + // we don't expect more than 2-4 mirrors, so it should be safe to store submodel location (front/rear) in the higher bits + // parzyste działają inaczej niż nieparzyste + pAnimations[ i + j ].iNumber = + ( ( pAnimations[ i + j ].smAnimated->offset().z > 0 ? + side::front : + side::rear ) << 4 ) + + i; + pAnimations[ i + j ].fMaxDist = 150 * 150; // drzwi to z daleka widać +/* + // NOTE: no longer used + pAnimations[i + j].fSpeed = Random(150); // oryginalny koncept z DoorSpeedFactor + pAnimations[i + j].fSpeed = (pAnimations[i + j].fSpeed + 100) / 100; +*/ } } } diff --git a/DynObj.h b/DynObj.h index 3ab1373b..b2094cce 100644 --- a/DynObj.h +++ b/DynObj.h @@ -23,7 +23,6 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- -int const ANIM_TYPES = 7; // Ra: ilość typów animacji int const ANIM_WHEELS = 0; // koła int const ANIM_DOORS = 1; // drzwi int const ANIM_LEVERS = 2; // elementy obracane (wycieraczki, koła skrętne, przestawiacze, klocki ham.) @@ -31,6 +30,9 @@ int const ANIM_BUFFERS = 3; // elementy przesuwane (zderzaki) int const ANIM_BOOGIES = 4; // wózki (są skręcane w dwóch osiach) int const ANIM_PANTS = 5; // pantografy int const ANIM_STEAMS = 6; // napęd parowozu +int const ANIM_DOORSTEPS = 7; +int const ANIM_MIRRORS = 8; +int const ANIM_TYPES = 9; // Ra: ilość typów animacji class TAnim; //typedef void(__closure *TUpdate)(TAnim *pAnim); // typ funkcji aktualizującej położenie submodeli @@ -103,7 +105,14 @@ class TAnimPant class TAnim { // klasa animowanej części pojazdu (koła, drzwi, pantografy, burty, napęd parowozu, siłowniki // itd.) - public: +public: +// constructor + TAnim() = default; +// destructor + ~TAnim(); +// methods + int TypeSet( int i, int fl = 0 ); // ustawienie typu +// members union { TSubModel *smAnimated; // animowany submodel (jeśli tylko jeden, np. oś) @@ -125,16 +134,15 @@ class TAnim int *iIntBase; // jakiś int w fizyce }; // void _fastcall Update(); //wskaźnik do funkcji aktualizacji animacji - int iFlags; // flagi animacji + int iFlags{ 0 }; // flagi animacji float fMaxDist; // do jakiej odległości wykonywana jest animacja float fSpeed; // parametr szybkości animacji int iNumber; // numer kolejny obiektu - public: - TAnim(); - ~TAnim(); + TUpdate yUpdate; // metoda TDynamicObject aktualizująca animację - int TypeSet(int i, int fl = 0); // ustawienie typu +/* void Parovoz(); // wykonanie obliczeń animacji +*/ }; //--------------------------------------------------------------------------- @@ -215,16 +223,15 @@ public: *Material() const { return &m_materialdata; } // tymczasowo udostępnione do wyszukiwania drutu - int iAnimType[ ANIM_TYPES ]; // 0-osie,1-drzwi,2-obracane,3-zderzaki,4-wózki,5-pantografy,6-tłoki + std::array iAnimType{ 0 }; // 0-osie,1-drzwi,2-obracane,3-zderzaki,4-wózki,5-pantografy,6-tłoki private: int iAnimations; // liczba obiektów animujących -/* - TAnim *pAnimations; // obiekty animujące (zawierają wskaźnik do funkcji wykonującej animację) -*/ std::vector pAnimations; TSubModel ** pAnimated; // lista animowanych submodeli (może być ich więcej niż obiektów animujących) double dWheelAngle[3]; // kąty obrotu kół: 0=przednie toczne, 1=napędzające i wiązary, 2=tylne toczne +/* void UpdateNone(TAnim *pAnim){}; // animacja pusta (funkcje ustawiania submodeli, gdy blisko kamery) +*/ void UpdateAxle(TAnim *pAnim); // animacja osi void UpdateBoogie(TAnim *pAnim); // animacja wózka void UpdateDoorTranslate(TAnim *pAnim); // animacja drzwi - przesuw @@ -232,10 +239,15 @@ private: void UpdateDoorFold(TAnim *pAnim); // animacja drzwi - składanie void UpdateDoorPlug(TAnim *pAnim); // animacja drzwi - odskokowo-przesuwne void UpdatePant(TAnim *pAnim); // animacja pantografu + void UpdatePlatformTranslate(TAnim *pAnim); // doorstep animation, shift + void UpdatePlatformRotate(TAnim *pAnim); // doorstep animation, rotate + void UpdateMirror(TAnim *pAnim); // mirror animation +/* void UpdateLeverDouble(TAnim *pAnim); // animacja gałki zależna od double void UpdateLeverFloat(TAnim *pAnim); // animacja gałki zależna od float void UpdateLeverInt(TAnim *pAnim); // animacja gałki zależna od int (wartość) void UpdateLeverEnum(TAnim *pAnim); // animacja gałki zależna od int (lista kątów) +*/ void toggle_lights(); // switch light levels for registered interior sections private: // Ra: ciąg dalszy animacji, dopiero do ogarnięcia // ABuWozki 060504 @@ -257,6 +269,10 @@ private: double NoVoltTime; // czas od utraty zasilania double dDoorMoveL; // NBMX double dDoorMoveR; // NBMX + double dDoorstepMoveL{ 0.0 }; + double dDoorstepMoveR{ 0.0 }; + double dMirrorMoveL{ 0.0 }; + double dMirrorMoveR{ 0.0 }; TSubModel *smBrakeSet; // nastawa hamulca (wajcha) TSubModel *smLoadSet; // nastawa ładunku (wajcha) TSubModel *smWiper; // wycieraczka (poniekąd też wajcha) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 17bef5a5..4430987e 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -943,9 +943,10 @@ public: double DoorOpenSpeed = 1.0; double DoorCloseSpeed = 1.0; /*predkosc otwierania i zamykania w j.u. */ double DoorMaxShiftL = 0.5; double DoorMaxShiftR = 0.5; double DoorMaxPlugShift = 0.1;/*szerokosc otwarcia lub kat*/ int DoorOpenMethod = 2; /*sposob otwarcia - 1: przesuwne, 2: obrotowe, 3: trójelementowe*/ - double PlatformSpeed = 0.25; /*szybkosc stopnia*/ - double PlatformMaxShift = 0.5; /*wysuniecie stopnia*/ - int PlatformOpenMethod = 1; /*sposob animacji stopnia*/ + double PlatformSpeed = 0.5; /*szybkosc stopnia*/ + double PlatformMaxShift { 45.0 }; /*wysuniecie stopnia*/ + int PlatformOpenMethod { 2 }; /*sposob animacji stopnia*/ + double MirrorMaxShift { 90.0 }; bool ScndS = false; /*Czy jest bocznikowanie na szeregowej*/ double SpeedCtrlDelay = 2; /*opoznienie dzialania tempomatu z wybieralna predkoscia*/ /*--sekcja zmiennych*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index d098da3d..a85795e3 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1591,8 +1591,8 @@ void TMoverParameters::FuelPumpCheck( double const Timestep ) { FuelPump.is_enabled = ( dizel_startup || Mains ); } FuelPump.is_active = ( - ( true == FuelPump.is_enabled ) - && ( true == Battery ) ); + ( true == Battery ) + && ( true == FuelPump.is_enabled ) ); } // oil pump status update @@ -7863,8 +7863,8 @@ void TMoverParameters::LoadFIZ_Doors( std::string const &line ) { extract_value( DoorCloseSpeed, "CloseSpeed", line, "" ); extract_value( DoorMaxShiftL, "DoorMaxShiftL", line, "" ); extract_value( DoorMaxShiftR, "DoorMaxShiftR", line, "" ); + extract_value( DoorMaxPlugShift, "DoorMaxShiftPlug", line, "" ); - DoorOpenMethod = 2; //obrót, default std::string openmethod; extract_value( openmethod, "DoorOpenMethod", line, "" ); if( openmethod == "Shift" ) { DoorOpenMethod = 1; } //przesuw else if( openmethod == "Fold" ) { DoorOpenMethod = 3; } //3 submodele się obracają @@ -7876,11 +7876,11 @@ void TMoverParameters::LoadFIZ_Doors( std::string const &line ) { std::string doorblocked; extract_value( doorblocked, "DoorBlocked", line, "" ); DoorBlocked = ( doorblocked == "Yes" ); - extract_value( DoorMaxPlugShift, "DoorMaxShiftPlug", line, "" ); extract_value( PlatformSpeed, "PlatformSpeed", line, "" ); - extract_value( PlatformMaxShift, "PlatformMaxSpeed", line, "" ); + extract_value( PlatformMaxShift, "PlatformMaxShift", line, "" ); + + extract_value( MirrorMaxShift, "MirrorMaxShift", line, "" ); - PlatformOpenMethod = 2; // obrót, default std::string platformopenmethod; extract_value( platformopenmethod, "PlatformOpenMethod", line, "" ); if( platformopenmethod == "Shift" ) { PlatformOpenMethod = 1; } // przesuw } diff --git a/Model3d.cpp b/Model3d.cpp index 697c3552..f1fadfbe 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1222,12 +1222,16 @@ TSubModel::offset( float const Geometrytestoffsetthreshold ) const { bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) { // wczytanie modelu z pliku +/* + // NOTE: disabled, this work is now done by the model manager std::string name = ToLower(FileName); // trim extension if needed if( name.rfind( '.' ) != std::string::npos ) { name.erase(name.rfind('.')); } +*/ + auto const name { FileName }; asBinary = name + ".e3d"; if (FileExists(asBinary)) @@ -1255,7 +1259,7 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem if (false == result) { - ErrorLog("Bad model: failed to load 3d model \"" + FileName + "\""); + ErrorLog("Bad model: failed to load 3d model \"" + name + "\""); } return result; }; diff --git a/Train.cpp b/Train.cpp index 2bfe85f2..bcba552d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5580,7 +5580,13 @@ TTrain::update_sounds( double const Deltatime ) { } if( fTachoCount > 3.f ) { - dsbHasler.play( sound_flags::exclusive | sound_flags::looping ); + auto const frequency { ( + true == dsbHasler.is_combined() ? + fTachoVelocity * 0.01 : + 1.0 ) }; + dsbHasler + .pitch( frequency ) + .play( sound_flags::exclusive | sound_flags::looping ); } else if( fTachoCount < 1.f ) { dsbHasler.stop(); @@ -6139,8 +6145,10 @@ TTrain::radio_message( sound_source *Message, int const Channel ) { // skip message playback if the radio isn't able to receive it return; } - auto const radiorange { 7500 * 7500 }; - if( glm::length2( Message->location() - glm::dvec3 { DynamicObject->GetPosition() } ) > radiorange ) { + auto const soundrange { Message->range() }; + if( ( soundrange > 0 ) + && ( glm::length2( Message->location() - glm::dvec3 { DynamicObject->GetPosition() } ) > ( soundrange * soundrange ) ) ) { + // skip message playback if the receiver is outside of the emitter's range return; } diff --git a/renderer.cpp b/renderer.cpp index 64f27146..b8366cf3 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1939,6 +1939,38 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ++first; } +#ifdef EU07_USE_DEBUG_SOUNDEMITTERS + // sound emitters + if( DebugModeFlag ) { + switch( m_renderpass.draw_mode ) { + case rendermode::color: { + + ::glPushAttrib( GL_ENABLE_BIT ); + ::glDisable( GL_TEXTURE_2D ); + ::glColor3f( 0.36f, 0.75f, 0.35f ); + + for( auto const &audiosource : audio::renderer.m_sources ) { + + ::glPushMatrix(); + auto const position = audiosource.properties.location - m_renderpass.camera.position(); + ::glTranslated( position.x, position.y, position.z ); + + ::gluSphere( m_quadric, 0.1, 4, 2 ); + + ::glPopMatrix(); + } + + ::glPopAttrib(); + + break; + } + default: { + break; + } + } + } +#endif + } void @@ -2451,7 +2483,9 @@ opengl_renderer::Render( TSubModel *Submodel ) { // kąt większy niż maksymalny stożek swiatła float lightlevel = 1.f; // TODO, TBD: parameter to control light strength // view angle attenuation - float const anglefactor = ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); + float const anglefactor = clamp( + ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( Submodel->fCosHotspotAngle - Submodel->fCosFalloffAngle ), + 0.f, 1.f ); // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances float const distancefactor = std::max( 0.5f, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / Submodel->fSquareMaxDist ); diff --git a/renderer.h b/renderer.h index 852cb70e..f9b0281e 100644 --- a/renderer.h +++ b/renderer.h @@ -24,6 +24,7 @@ http://mozilla.org/MPL/2.0/. //#define EU07_USE_DEBUG_SHADOWMAP //#define EU07_USE_DEBUG_CABSHADOWMAP //#define EU07_USE_DEBUG_CAMERA +//#define EU07_USE_DEBUG_SOUNDEMITTERS struct opengl_light : public basic_light { diff --git a/scene.cpp b/scene.cpp index 9fef581d..be68f31f 100644 --- a/scene.cpp +++ b/scene.cpp @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. namespace scene { std::string const EU07_FILEEXTENSION_REGION { ".sbt" }; +std::uint32_t const EU07_FILEVERSION_REGION { MAKE_ID4( 'S', 'B', 'T', 1 ) }; // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void @@ -883,7 +884,7 @@ basic_region::serialize( std::string const &Scenariofile ) const { // region file version 1 // header: EU07SBT + version (0-255) sn_utils::ls_uint32( output, MAKE_ID4( 'E', 'U', '0', '7' ) ); - sn_utils::ls_uint32( output, MAKE_ID4( 'S', 'B', 'T', 1 ) ); + sn_utils::ls_uint32( output, EU07_FILEVERSION_REGION ); // sections // TBD, TODO: build table of sections and file offsets, if we postpone section loading until they're within range std::uint32_t sectioncount { 0 }; @@ -928,7 +929,7 @@ basic_region::deserialize( std::string const &Scenariofile ) { uint32_t headertype { sn_utils::ld_uint32( input ) }; if( ( headermain != MAKE_ID4( 'E', 'U', '0', '7' ) - || ( headertype != MAKE_ID4( 'S', 'B', 'T', 1 ) ) ) ) { + || ( headertype != EU07_FILEVERSION_REGION ) ) ) { // wrong file type WriteLog( "Bad file: \"" + filename + "\" is of either unrecognized type or version" ); return false; diff --git a/simulation.cpp b/simulation.cpp index 978ad2ea..4499ba68 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -713,11 +713,13 @@ state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpa auto *instance = new TAnimModel( Nodedata ); instance->RaAnglesSet( Scratchpad.location.rotation + rotation ); // dostosowanie do pochylania linii - if( false == instance->Load( &Input, false ) ) { + if( instance->Load( &Input, false ) ) { + instance->location( transform( location, Scratchpad ) ); + } + else { // model nie wczytał się - ignorowanie node SafeDelete( instance ); } - instance->location( transform( location, Scratchpad ) ); return instance; } diff --git a/sound.cpp b/sound.cpp index 2c1360f3..d634b385 100644 --- a/sound.cpp +++ b/sound.cpp @@ -838,6 +838,13 @@ sound_source::location() const { + m_owner->VectorFront() * m_offset.z }; } +// returns defined range of the sound +float const +sound_source::range() const { + + return m_range; +} + void sound_source::update_counter( sound_handle const Sound, int const Value ) { diff --git a/sound.h b/sound.h index 6ea03fda..55a0a1ed 100644 --- a/sound.h +++ b/sound.h @@ -111,6 +111,9 @@ public: // returns location of the sound source in simulation region space glm::dvec3 const location() const; + // returns defined range of the sound + float const + range() const; // members float m_amplitudefactor { 1.f }; // helper, value potentially used by gain calculation diff --git a/uilayer.cpp b/uilayer.cpp index 0898df17..3e81b53f 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -434,7 +434,7 @@ ui_layer::update() { auto const train { Global.pWorld->train() }; if( ( train != nullptr ) && ( train->Dynamic() == vehicle ) ) { - uitextline2 += " R: " + std::to_string( train->RadioChannel() ); + uitextline2 += ( vehicle->MoverParameters->Radio ? " R: " : " r: " ) + std::to_string( train->RadioChannel() ); } /* uitextline2 += diff --git a/version.h b/version.h index 43026737..96a56e56 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 429 +#define VERSION_MINOR 505 #define VERSION_REVISION 0 From b5f334a1fad9a674257627e69510e8b644b586c3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 8 May 2018 16:18:08 +0200 Subject: [PATCH 322/426] build 180508. configurable maximum oil pressure, door closing animation delay, whistle sound, indicators for water temperature and oil pressure in controlled vehicle/unit, minor bug fixes --- Driver.cpp | 2 +- DynObj.cpp | 105 ++++++++++++++++++++++++++------------------ DynObj.h | 3 ++ Globals.cpp | 6 +++ Globals.h | 1 + McZapkie/MOVER.h | 5 ++- McZapkie/Mover.cpp | 71 ++++++++++++++++-------------- Train.cpp | 106 +++++++++++++++++++++++++-------------------- Train.h | 5 +++ World.cpp | 1 + command.cpp | 1 + command.h | 1 + keyboardinput.cpp | 4 +- mouseinput.cpp | 3 ++ translation.h | 1 + version.h | 2 +- 16 files changed, 192 insertions(+), 125 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 3c165ca6..42533eba 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -3515,7 +3515,7 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N if (NewValue1 > 0) { fWarningDuration = NewValue1; // czas trąbienia - mvOccupied->WarningSignal = (NewValue2 > 1) ? 2 : 1; // wysokość tonu + mvOccupied->WarningSignal = NewValue2; // horn combination flag } } else if (NewCommand == "Radio_channel") diff --git a/DynObj.cpp b/DynObj.cpp index 3b7b73bf..67e43ddd 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -555,9 +555,9 @@ void TDynamicObject::UpdateMirror( TAnim *pAnim ) { // only animate the mirror if it's located on the same end of the vehicle as the active cab auto const isactive { ( - ( ( pAnim->iNumber & 0xf ) >> 4 ) == ( MoverParameters->ActiveCab > 0 ? side::front : side::rear ) ? - 1.0 : - 0.0 ) }; + MoverParameters->ActiveCab > 0 ? ( ( pAnim->iNumber >> 4 ) == side::front ? 1.0 : 0.0 ) : + MoverParameters->ActiveCab < 0 ? ( ( pAnim->iNumber >> 4 ) == side::rear ? 1.0 : 0.0 ) : + 0.0 ) }; if( pAnim->iNumber & 1 ) pAnim->smAnimated->SetRotate( @@ -2025,7 +2025,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" } if( true == setambient ) { // TODO: pull ambient temperature from environment data - MoverParameters->dizel_HeatSet( 15.f ); + MoverParameters->dizel_HeatSet( Global.AirTemperature ); } } // temperature /* else if (ActPar.substr(0, 1) == "") // tu mozna wpisac inny prefiks i inne rzeczy @@ -3636,21 +3636,29 @@ bool TDynamicObject::Update(double dt, double dt1) && ( true == MoverParameters->DoorLeftOpened ) ) { dDoorMoveL += dt1 * MoverParameters->DoorOpenSpeed; dDoorMoveL = std::min( dDoorMoveL, MoverParameters->DoorMaxShiftL ); + DoorDelayL = 0.f; } - if( ( dDoorMoveL > 0 ) + if( ( dDoorMoveL > 0.0 ) && ( false == MoverParameters->DoorLeftOpened ) ) { - dDoorMoveL -= dt1 * MoverParameters->DoorCloseSpeed; - dDoorMoveL = std::max( dDoorMoveL, 0.0 ); + DoorDelayL += dt1; + if( DoorDelayL > MoverParameters->DoorCloseDelay ) { + dDoorMoveL -= dt1 * MoverParameters->DoorCloseSpeed; + dDoorMoveL = std::max( dDoorMoveL, 0.0 ); + } } if( ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) && ( true == MoverParameters->DoorRightOpened ) ) { dDoorMoveR += dt1 * MoverParameters->DoorOpenSpeed; dDoorMoveR = std::min( dDoorMoveR, MoverParameters->DoorMaxShiftR ); - } - if( ( dDoorMoveR > 0 ) + DoorDelayR = 0.f; + } + if( ( dDoorMoveR > 0.0 ) && ( false == MoverParameters->DoorRightOpened ) ) { - dDoorMoveR -= dt1 * MoverParameters->DoorCloseSpeed; - dDoorMoveR = std::max( dDoorMoveR, 0.0 ); + DoorDelayR += dt1; + if( DoorDelayR > MoverParameters->DoorCloseDelay ) { + dDoorMoveR -= dt1 * MoverParameters->DoorCloseSpeed; + dDoorMoveR = std::max( dDoorMoveR, 0.0 ); + } } // doorsteps if( ( dDoorstepMoveL < 1.0 ) @@ -3660,7 +3668,8 @@ bool TDynamicObject::Update(double dt, double dt1) dDoorstepMoveL + MoverParameters->PlatformSpeed * dt1 ); } if( ( dDoorstepMoveL > 0.0 ) - && ( false == MoverParameters->DoorLeftOpened ) ) { + && ( false == MoverParameters->DoorLeftOpened ) + && ( DoorDelayL > MoverParameters->DoorCloseDelay ) ) { dDoorstepMoveL = std::max( 0.0, dDoorstepMoveL - MoverParameters->PlatformSpeed * dt1 ); @@ -3672,7 +3681,8 @@ bool TDynamicObject::Update(double dt, double dt1) dDoorstepMoveR + MoverParameters->PlatformSpeed * dt1 ); } if( ( dDoorstepMoveR > 0.0 ) - && ( false == MoverParameters->DoorRightOpened ) ) { + && ( false == MoverParameters->DoorRightOpened ) + && ( DoorDelayR > MoverParameters->DoorCloseDelay ) ) { dDoorstepMoveR = std::max( 0.0, dDoorstepMoveR - MoverParameters->PlatformSpeed * dt1 ); @@ -3990,7 +4000,14 @@ void TDynamicObject::RenderSounds() { } // NBMX sygnal odjazdu if( MoverParameters->DoorClosureWarning ) { - if( MoverParameters->DepartureSignal ) { + if( ( MoverParameters->DepartureSignal ) +/* + || ( ( MoverParameters->DoorCloseCtrl = control::autonomous ) + && ( ( ( false == MoverParameters->DoorLeftOpened ) && ( dDoorMoveL > 0.0 ) ) + || ( ( false == MoverParameters->DoorRightOpened ) && ( dDoorMoveR > 0.0 ) ) ) ) +*/ + ) { + // for the autonomous doors play the warning automatically whenever a door is closing // MC: pod warunkiem ze jest zdefiniowane w chk sDepartureSignal.play( sound_flags::exclusive | sound_flags::looping ); } @@ -4056,6 +4073,12 @@ void TDynamicObject::RenderSounds() { else { sHorn2.stop(); } + if( TestFlag( MoverParameters->WarningSignal, 4 ) ) { + sHorn3.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + sHorn3.stop(); + } // szum w czasie jazdy if( ( GetVelocity() > 0.5 ) && ( false == m_bogiesounds.empty() ) @@ -4452,43 +4475,37 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, ++co; } while ( (ile >= 0) && (co < ANIM_TYPES) ); //-1 to znacznik końca - parser.getTokens(); parser >> token; - } - } - - if( true == pAnimations.empty() ) { - // Ra: tworzenie tabeli animacji, jeśli jeszcze nie było - pAnimations.resize( iAnimations ); - int i, j, k = 0, sm = 0; - for (j = 0; j < ANIM_TYPES; ++j) - for (i = 0; i < iAnimType[j]; ++i) + pAnimations.resize( iAnimations ); + int i, j, k = 0, sm = 0; + for (j = 0; j < ANIM_TYPES; ++j) + for (i = 0; i < iAnimType[j]; ++i) + { + if (j == ANIM_PANTS) // zliczamy poprzednie animacje + if (!pants) + if (iAnimType[ANIM_PANTS]) // o ile jakieś pantografy są (a domyślnie są) + pants = &pAnimations[k]; // zapamiętanie na potrzeby wyszukania submodeli + pAnimations[k].iShift = sm; // przesunięcie do przydzielenia wskaźnika + sm += pAnimations[k++].TypeSet(j); // ustawienie typu animacji i zliczanie tablicowanych submodeli + } + if (sm) // o ile są bardziej złożone animacje { - if (j == ANIM_PANTS) // zliczamy poprzednie animacje - if (!pants) - if (iAnimType[ANIM_PANTS]) // o ile jakieś pantografy są (a domyślnie są) - pants = &pAnimations[k]; // zapamiętanie na potrzeby wyszukania submodeli - pAnimations[k].iShift = sm; // przesunięcie do przydzielenia wskaźnika - sm += pAnimations[k++].TypeSet(j); // ustawienie typu animacji i zliczanie tablicowanych submodeli + pAnimated = new TSubModel *[sm]; // tabela na animowane submodele + for (k = 0; k < iAnimations; ++k) + pAnimations[k].smElement = pAnimated + pAnimations[k].iShift; // przydzielenie wskaźnika do tabelki } - if (sm) // o ile są bardziej złożone animacje - { - pAnimated = new TSubModel *[sm]; // tabela na animowane submodele - for (k = 0; k < iAnimations; ++k) - pAnimations[k].smElement = pAnimated + pAnimations[k].iShift; // przydzielenie wskaźnika do tabelki } } - if(token == "lowpolyinterior:") { + else if(token == "lowpolyinterior:") { // ABu: wnetrze lowpoly parser.getTokens(); parser >> asModel; asModel = BaseDir + asModel; // McZapkie-200702 - dynamics maja swoje modele w dynamic/basedir Global.asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... mdLowPolyInt = TModelsManager::GetModel(asModel, true); - // Global.asCurrentTexturePath=AnsiString(szTexturePath); //kiedyś uproszczone wnętrze mieszało tekstury nieba } - if( token == "brakemode:" ) { + else if( token == "brakemode:" ) { // Ra 15-01: gałka nastawy hamulca parser.getTokens(); parser >> asAnimName; @@ -4496,7 +4513,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // jeszcze wczytać kąty obrotu dla poszczególnych ustawień } - if( token == "loadmode:" ) { + else if( token == "loadmode:" ) { // Ra 15-01: gałka nastawy hamulca parser.getTokens(); parser >> asAnimName; @@ -4566,7 +4583,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // Ra: pantografy po nowemu mają literki i numerki } // Pantografy - Winger 160204 - if( token == "animpantrd1prefix:" ) { + else if( token == "animpantrd1prefix:" ) { // prefiks ramion dolnych 1 parser.getTokens(); parser >> token; float4x4 m; // macierz do wyliczenia pozycji i wektora ruchu pantografu @@ -4733,6 +4750,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } } } + else if( token == "pantfactors:" ) { // Winger 010304: // parametry pantografow @@ -5153,12 +5171,17 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // pliki z trabieniem wysokoton. sHorn2.deserialize( parser, sound_type::multipart, sound_parameters::range ); sHorn2.owner( this ); - + // TBD, TODO: move horn selection to ai config file if( iHornWarning ) { iHornWarning = 2; // numer syreny do użycia po otrzymaniu sygnału do jazdy } } + else if( token == "horn3:" ) { + sHorn3.deserialize( parser, sound_type::multipart, sound_parameters::range ); + sHorn3.owner( this ); + } + else if( token == "departuresignal:" ) { // pliki z sygnalem odjazdu sDepartureSignal.deserialize( parser, sound_type::multipart, sound_parameters::range ); diff --git a/DynObj.h b/DynObj.h index b2094cce..8ed4913e 100644 --- a/DynObj.h +++ b/DynObj.h @@ -267,6 +267,8 @@ private: public: TAnim *pants; // indeks obiektu animującego dla pantografu 0 double NoVoltTime; // czas od utraty zasilania + float DoorDelayL{ 0.f }; // left side door closing delay timer + float DoorDelayR{ 0.f }; // right side door closing delay timer double dDoorMoveL; // NBMX double dDoorMoveR; // NBMX double dDoorstepMoveL{ 0.0 }; @@ -418,6 +420,7 @@ private: sound_source sDepartureSignal { sound_placement::general }; sound_source sHorn1 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source sHorn2 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; + sound_source sHorn3 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; std::vector m_bogiesounds; // TBD, TODO: wrapper for all bogie-related sounds (noise, brakes, squeal etc) sound_source m_wheelflat { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source rscurve { sound_placement::external, EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; // youBy diff --git a/Globals.cpp b/Globals.cpp index 0ef35fe2..4c1e9048 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -318,6 +318,12 @@ global_settings::ConfigParse(cParser &Parser) { Parser.getTokens( 1, false ); Parser >> ScenarioTimeCurrent; } + else if( token == "scenario.weather.temperature" ) { + // selected device for audio renderer + Parser.getTokens(); + Parser >> AirTemperature; + AirTemperature = clamp( AirTemperature, -15.f, 45.f ); + } else if( token == "scalespeculars" ) { // whether strength of specular highlights should be adjusted (generally needed for legacy 3d models) Parser.getTokens(); diff --git a/Globals.h b/Globals.h index 2a008830..f141c17e 100644 --- a/Globals.h +++ b/Globals.h @@ -45,6 +45,7 @@ struct global_settings { bool DLFont{ false }; // switch indicating presence of basic font bool bActive{ true }; // czy jest aktywnym oknem int iPause{ 0 }; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie + float AirTemperature{ 15.f }; // settings // filesystem bool bLoadTraction{ true }; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 4430987e..2507d7f6 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -637,6 +637,7 @@ struct oil_pump { start start_type { start::manual }; float resource_amount { 1.f }; float pressure_minimum { 0.f }; // lowest acceptable working pressure + float pressure_maximum { 0.f }; // oil pressure at maximum engine revolutions float pressure_target { 0.f }; float pressure_present { 0.f }; }; @@ -943,6 +944,7 @@ public: double DoorOpenSpeed = 1.0; double DoorCloseSpeed = 1.0; /*predkosc otwierania i zamykania w j.u. */ double DoorMaxShiftL = 0.5; double DoorMaxShiftR = 0.5; double DoorMaxPlugShift = 0.1;/*szerokosc otwarcia lub kat*/ int DoorOpenMethod = 2; /*sposob otwarcia - 1: przesuwne, 2: obrotowe, 3: trójelementowe*/ + float DoorCloseDelay { 0.f }; // delay (in seconds) before the door begin closing, once conditions to close are met double PlatformSpeed = 0.5; /*szybkosc stopnia*/ double PlatformMaxShift { 45.0 }; /*wysuniecie stopnia*/ int PlatformOpenMethod { 2 }; /*sposob animacji stopnia*/ @@ -1065,7 +1067,7 @@ public: int DirAbsolute = 0; //zadany kierunek jazdy względem sprzęgów (1=w strone 0,-1=w stronę 1) int ActiveCab = 0; //numer kabiny, w ktorej jest obsada (zwykle jedna na skład) double LastSwitchingTime = 0.0; /*czas ostatniego przelaczania czegos*/ - //WarningSignal: byte; {0: nie trabi, 1,2: trabi} + int WarningSignal = 0; // 0: nie trabi, 1,2,4: trabi bool DepartureSignal = false; /*sygnal odjazdu*/ bool InsideConsist = false; /*-zmienne dla lokomotywy elektrycznej*/ @@ -1184,7 +1186,6 @@ public: double TotalMassxg = 0.0; /*TotalMass*g*/ Math3D::vector3 vCoulpler[2]; // powtórzenie współrzędnych sprzęgów z DynObj :/ - int WarningSignal = 0; // tymczasowo 8bit, ze względu na funkcje w MTools double fBrakeCtrlPos = -2.0; // płynna nastawa hamulca zespolonego bool bPantKurek3 = true; // kurek trójdrogowy (pantografu): true=połączenie z ZG, false=połączenie z małą sprężarką // domyślnie zbiornik pantografu połączony jest ze zbiornikiem głównym int iProblem = 0; // flagi problemów z taborem, aby AI nie musiało porównywać; 0=może jechać diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index a85795e3..c60fa0df 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1613,10 +1613,9 @@ void TMoverParameters::OilPumpCheck( double const Timestep ) { OilPump.pressure_minimum > 0.f ? OilPump.pressure_minimum : 0.15f }; // arbitrary fallback value - auto const maxpressure { 0.65f }; // arbitrary value OilPump.pressure_target = ( - enrot > 0.1 ? interpolate( minpressure, maxpressure, static_cast( clamp( enrot / maxrevolutions, 0.0, 1.0 ) ) ) * OilPump.resource_amount : + enrot > 0.1 ? interpolate( minpressure, OilPump.pressure_maximum, static_cast( clamp( enrot / maxrevolutions, 0.0, 1.0 ) ) ) * OilPump.resource_amount : true == OilPump.is_active ? minpressure : 0.f ); @@ -6320,6 +6319,8 @@ void TMoverParameters::dizel_Heat( double const dt ) { auto const gwmin2 { 400.0 }; auto const gwmax2 { 4000.0 }; + dizel_heat.Te = Global.AirTemperature; + auto const engineon { ( Mains ? 1 : 0 ) }; auto const engineoff { ( Mains ? 0 : 1 ) }; auto const rpm { enrot * 60 }; @@ -6709,14 +6710,14 @@ TMoverParameters::update_autonomous_doors( double const Deltatime ) { // the door are closed if their timer goes below 0, or if the vehicle is moving at > 5 km/h // NOTE: timer value of 0 is 'special' as it means the door will stay open until vehicle is moving if( true == DoorLeftOpened ) { - if( ( DoorLeftOpenTimer < 0.0 ) + if( ( ( DoorStayOpen > 0.0 ) && ( DoorLeftOpenTimer < 0.0 ) ) || ( Vel > 5.0 ) ) { // close the door and set the timer to expired state (closing may happen sooner if vehicle starts moving) DoorLeft( false, range::local ); } } if( true == DoorRightOpened ) { - if( ( DoorRightOpenTimer < 0.0 ) + if( ( ( DoorStayOpen > 0.0 ) && ( DoorRightOpenTimer < 0.0 ) ) || ( Vel > 5.0 ) ) { // close the door and set the timer to expired state (closing may happen sooner if vehicle starts moving) DoorRight( false, range::local ); @@ -7861,6 +7862,7 @@ void TMoverParameters::LoadFIZ_Doors( std::string const &line ) { extract_value( DoorOpenSpeed, "OpenSpeed", line, "" ); extract_value( DoorCloseSpeed, "CloseSpeed", line, "" ); + extract_value( DoorCloseDelay, "DoorCloseDelay", line, "" ); extract_value( DoorMaxShiftL, "DoorMaxShiftL", line, "" ); extract_value( DoorMaxShiftR, "DoorMaxShiftR", line, "" ); extract_value( DoorMaxPlugShift, "DoorMaxShiftPlug", line, "" ); @@ -8363,7 +8365,6 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value(hydro_R_MinVel, "R_MinVel", Input, ""); } } - extract_value( OilPump.pressure_minimum, "MinOilPressure", Input, "" ); break; } case DieselElectric: { //youBy @@ -8384,7 +8385,6 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { ImaxHi = 2; ImaxLo = 1; } - extract_value( OilPump.pressure_minimum, "OilMinPressure", Input, "" ); break; } case ElectricInductionMotor: { @@ -8424,29 +8424,36 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { } } // engine type - // engine cooling factore - extract_value( dizel_heat.kw, "HeatKW", Input, "" ); - extract_value( dizel_heat.kv, "HeatKV", Input, "" ); - extract_value( dizel_heat.kfe, "HeatKFE", Input, "" ); - extract_value( dizel_heat.kfs, "HeatKFS", Input, "" ); - extract_value( dizel_heat.kfo, "HeatKFO", Input, "" ); - extract_value( dizel_heat.kfo2, "HeatKFO2", Input, "" ); - // engine cooling systems - extract_value( dizel_heat.water.config.temp_min, "WaterMinTemperature", Input, "" ); - extract_value( dizel_heat.water.config.temp_max, "WaterMaxTemperature", Input, "" ); - extract_value( dizel_heat.water.config.temp_flow, "WaterFlowTemperature", Input, "" ); - extract_value( dizel_heat.water.config.temp_cooling, "WaterCoolingTemperature", Input, "" ); - extract_value( dizel_heat.water.config.shutters, "WaterShutters", Input, "" ); - extract_value( dizel_heat.auxiliary_water_circuit, "WaterAuxCircuit", Input, "" ); - extract_value( dizel_heat.water_aux.config.temp_min, "WaterAuxMinTemperature", Input, "" ); - extract_value( dizel_heat.water_aux.config.temp_max, "WaterAuxMaxTemperature", Input, "" ); - extract_value( dizel_heat.water_aux.config.temp_cooling, "WaterAuxCoolingTemperature", Input, "" ); - extract_value( dizel_heat.water_aux.config.shutters, "WaterAuxShutters", Input, "" ); - extract_value( dizel_heat.oil.config.temp_min, "OilMinTemperature", Input, "" ); - extract_value( dizel_heat.oil.config.temp_max, "OilMaxTemperature", Input, "" ); - // water heater - extract_value( WaterHeater.config.temp_min, "HeaterMinTemperature", Input, "" ); - extract_value( WaterHeater.config.temp_max, "HeaterMaxTemperature", Input, "" ); + // NOTE: elements shared by both diesel engine variants; crude but, eh + if( ( EngineType == DieselEngine ) + || ( EngineType == DieselElectric ) ) { + // oil pump + extract_value( OilPump.pressure_minimum, "OilMinPressure", Input, "" ); + extract_value( OilPump.pressure_maximum, "OilMaxPressure", Input, "" ); + // engine cooling factore + extract_value( dizel_heat.kw, "HeatKW", Input, "" ); + extract_value( dizel_heat.kv, "HeatKV", Input, "" ); + extract_value( dizel_heat.kfe, "HeatKFE", Input, "" ); + extract_value( dizel_heat.kfs, "HeatKFS", Input, "" ); + extract_value( dizel_heat.kfo, "HeatKFO", Input, "" ); + extract_value( dizel_heat.kfo2, "HeatKFO2", Input, "" ); + // engine cooling systems + extract_value( dizel_heat.water.config.temp_min, "WaterMinTemperature", Input, "" ); + extract_value( dizel_heat.water.config.temp_max, "WaterMaxTemperature", Input, "" ); + extract_value( dizel_heat.water.config.temp_flow, "WaterFlowTemperature", Input, "" ); + extract_value( dizel_heat.water.config.temp_cooling, "WaterCoolingTemperature", Input, "" ); + extract_value( dizel_heat.water.config.shutters, "WaterShutters", Input, "" ); + extract_value( dizel_heat.auxiliary_water_circuit, "WaterAuxCircuit", Input, "" ); + extract_value( dizel_heat.water_aux.config.temp_min, "WaterAuxMinTemperature", Input, "" ); + extract_value( dizel_heat.water_aux.config.temp_max, "WaterAuxMaxTemperature", Input, "" ); + extract_value( dizel_heat.water_aux.config.temp_cooling, "WaterAuxCoolingTemperature", Input, "" ); + extract_value( dizel_heat.water_aux.config.shutters, "WaterAuxShutters", Input, "" ); + extract_value( dizel_heat.oil.config.temp_min, "OilMinTemperature", Input, "" ); + extract_value( dizel_heat.oil.config.temp_max, "OilMaxTemperature", Input, "" ); + // water heater + extract_value( WaterHeater.config.temp_min, "HeaterMinTemperature", Input, "" ); + extract_value( WaterHeater.config.temp_max, "HeaterMaxTemperature", Input, "" ); + } } void TMoverParameters::LoadFIZ_Switches( std::string const &Input ) { @@ -9299,9 +9306,9 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "DoorOpen") /*NBMX*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów - if( ( DoorCloseCtrl == control::conductor ) - || ( DoorCloseCtrl == control::driver ) - || ( DoorCloseCtrl == control::mixed ) ) { + if( ( DoorOpenCtrl == control::conductor ) + || ( DoorOpenCtrl == control::driver ) + || ( DoorOpenCtrl == control::mixed ) ) { // ignore remote command if the door is only operated locally if( CValue2 > 0 ) { // normalne ustawienie pojazdu diff --git a/Train.cpp b/Train.cpp index bcba552d..3124b6e0 100644 --- a/Train.cpp +++ b/Train.cpp @@ -308,6 +308,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::departureannounce, &TTrain::OnCommand_departureannounce }, { user_command::hornlowactivate, &TTrain::OnCommand_hornlowactivate }, { user_command::hornhighactivate, &TTrain::OnCommand_hornhighactivate }, + { user_command::whistleactivate, &TTrain::OnCommand_whistleactivate }, { user_command::radiotoggle, &TTrain::OnCommand_radiotoggle }, { user_command::radiochannelincrease, &TTrain::OnCommand_radiochannelincrease }, { user_command::radiochanneldecrease, &TTrain::OnCommand_radiochanneldecrease }, @@ -382,25 +383,18 @@ TTrain::TTrain() { bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) { // powiązanie ręcznego sterowania kabiną z pojazdem - // Global.pUserDynamic=NewDynamicObject; //pojazd renderowany bez trzęsienia + if( NewDynamicObject->Mechanik == nullptr ) { + ErrorLog( "Bad config: can't take control of inactive vehicle \"" + NewDynamicObject->asName + "\"" ); + return false; + } + DynamicSet(NewDynamicObject); if (!e3d) if (DynamicObject->Mechanik == NULL) return false; - // if (DynamicObject->Mechanik->AIControllFlag==AIdriver) - // return false; + DynamicObject->MechInside = true; - /* iPozSzereg=28; - for (int i=1; iMainCtrlPosNo; i++) - { - if (mvControlled->RList[i].Bn>1) - { - iPozSzereg=i-1; - i=mvControlled->MainCtrlPosNo+1; - } - } - */ MechSpring.Init(125.0); vMechVelocity = Math3D::vector3(0, 0, 0); pMechOffset = Math3D::vector3( 0, 0, 0 ); @@ -416,25 +410,6 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) return false; } - // McZapkie: w razie wykolejenia - // dsbDerailment=TSoundsManager::GetFromName("derail.wav"); - // McZapkie: jazda luzem: - // dsbRunningNoise=TSoundsManager::GetFromName("runningnoise.wav"); - - // McZapkie? - dzwieki slyszalne tylko wewnatrz kabiny - generowane przez - // obiekt sterowany: - - // McZapkie-080302 sWentylatory.Init("wenton.wav","went.wav","wentoff.wav"); - // McZapkie-010302 - // sCompressor.Init("compressor-start.wav","compressor.wav","compressor-stop.wav"); - - // sHorn1.Init("horn1.wav",0.3); - // sHorn2.Init("horn2.wav",0.3); - - // sHorn1.Init("horn1-start.wav","horn1.wav","horn1-stop.wav"); - // sHorn2.Init("horn2-start.wav","horn2.wav","horn2-stop.wav"); - - // sConverter.Init("converter.wav",1.5); //NBMX obsluga przez AdvSound iCabn = 0; // Ra: taka proteza - przesłanie kierunku do członów connected if (mvControlled->ActiveDir > 0) @@ -3895,6 +3870,32 @@ void TTrain::OnCommand_hornhighactivate( TTrain *Train, command_data const &Comm } } +void TTrain::OnCommand_whistleactivate( TTrain *Train, command_data const &Command ) { + + if( Train->ggWhistleButton.SubModel == nullptr ) { + if( Command.action == GLFW_PRESS ) { + WriteLog( "Whistle button is missing, or wasn't defined" ); + } + return; + } + + if( Command.action == GLFW_PRESS ) { + // only need to react to press, sound will continue until stopped + if( false == TestFlag( Train->mvOccupied->WarningSignal, 4 ) ) { + // turn on + Train->mvOccupied->WarningSignal |= 4; + // visual feedback + Train->ggWhistleButton.UpdateValue( 1.0 ); + } + } + else if( Command.action == GLFW_RELEASE ) { + // turn off + Train->mvOccupied->WarningSignal &= ~4; + // visual feedback + Train->ggWhistleButton.UpdateValue( 0.0 ); + } +} + void TTrain::OnCommand_radiotoggle( TTrain *Train, command_data const &Command ) { if( Train->ggRadioButton.SubModel == nullptr ) { @@ -4530,30 +4531,34 @@ bool TTrain::Update( double const Deltatime ) if ((TestFlag(mvControlled->Couplers[0].CouplingFlag, ctrain_controll)) && (mvOccupied->ActiveCab == -1)) tmp = DynamicObject->PrevConnected; - if (tmp) - if (tmp->MoverParameters->Power > 0) - { - if (ggI1B.SubModel) - { - ggI1B.UpdateValue(tmp->MoverParameters->ShowCurrent(1)); + if( tmp ) { + if( tmp->MoverParameters->Power > 0 ) { + if( ggI1B.SubModel ) { + ggI1B.UpdateValue( tmp->MoverParameters->ShowCurrent( 1 ) ); ggI1B.Update(); } - if (ggI2B.SubModel) - { - ggI2B.UpdateValue(tmp->MoverParameters->ShowCurrent(2)); + if( ggI2B.SubModel ) { + ggI2B.UpdateValue( tmp->MoverParameters->ShowCurrent( 2 ) ); ggI2B.Update(); } - if (ggI3B.SubModel) - { - ggI3B.UpdateValue(tmp->MoverParameters->ShowCurrent(3)); + if( ggI3B.SubModel ) { + ggI3B.UpdateValue( tmp->MoverParameters->ShowCurrent( 3 ) ); ggI3B.Update(); } - if (ggItotalB.SubModel) - { - ggItotalB.UpdateValue(tmp->MoverParameters->ShowCurrent(0)); + if( ggItotalB.SubModel ) { + ggItotalB.UpdateValue( tmp->MoverParameters->ShowCurrent( 0 ) ); ggItotalB.Update(); } + if( ggWater1TempB.SubModel ) { + ggWater1TempB.UpdateValue( tmp->MoverParameters->dizel_heat.temperatura1 ); + ggWater1TempB.Update(); + } + if( ggOilPressB.SubModel ) { + ggOilPressB.UpdateValue( tmp->MoverParameters->OilPump.pressure_present ); + ggOilPressB.Update(); + } } + } } // McZapkie-300302: zegarek if (ggClockMInd.SubModel) @@ -5213,6 +5218,7 @@ bool TTrain::Update( double const Deltatime ) ggHornButton.Update(); ggHornLowButton.Update(); ggHornHighButton.Update(); + ggWhistleButton.Update(); for( auto &universal : ggUniversals ) { universal.Update(); } @@ -6235,6 +6241,7 @@ void TTrain::clear_cab_controls() ggHornButton.Clear(); ggHornLowButton.Clear(); ggHornHighButton.Clear(); + ggWhistleButton.Clear(); ggNextCurrentButton.Clear(); for( auto &universal : ggUniversals ) { universal.Clear(); @@ -6272,6 +6279,8 @@ void TTrain::clear_cab_controls() ggI2B.Clear(); ggI3B.Clear(); ggItotalB.Clear(); + ggOilPressB.Clear(); + ggWater1TempB.Clear(); ggClockSInd.Clear(); ggClockMInd.Clear(); @@ -6741,6 +6750,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "horn_bt:", ggHornButton }, { "hornlow_bt:", ggHornLowButton }, { "hornhigh_bt:", ggHornHighButton }, + { "whistle_bt:", ggHornHighButton }, { "fuse_bt:", ggFuseButton }, { "converterfuse_bt:", ggConverterFuseButton }, { "stlinoff_bt:", ggStLinOffButton }, @@ -6769,9 +6779,11 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "waterpump_sw:", ggWaterPumpButton }, { "waterheaterbreaker_sw:", ggWaterHeaterBreakerButton }, { "waterheater_sw:", ggWaterHeaterButton }, + { "water1tempb:", ggWater1TempB }, { "watercircuitslink_sw:", ggWaterCircuitsLinkButton }, { "fuelpump_sw:", ggFuelPumpButton }, { "oilpump_sw:", ggOilPumpButton }, + { "oilpressb:", ggOilPressB }, { "radio_sw:", ggRadioButton }, { "radiochannel_sw:", ggRadioChannelSelector }, { "radiochannelprev_sw:", ggRadioChannelPrevious }, diff --git a/Train.h b/Train.h index 5880dc47..b5bbd429 100644 --- a/Train.h +++ b/Train.h @@ -299,6 +299,7 @@ class TTrain static void OnCommand_departureannounce( TTrain *Train, command_data const &Command ); static void OnCommand_hornlowactivate( TTrain *Train, command_data const &Command ); static void OnCommand_hornhighactivate( TTrain *Train, command_data const &Command ); + static void OnCommand_whistleactivate( TTrain *Train, command_data const &Command ); static void OnCommand_radiotoggle( TTrain *Train, command_data const &Command ); static void OnCommand_radiochannelincrease( TTrain *Train, command_data const &Command ); static void OnCommand_radiochanneldecrease( TTrain *Train, command_data const &Command ); @@ -336,6 +337,9 @@ public: // reszta może by?publiczna TGauge ggI3B; TGauge ggItotalB; + TGauge ggOilPressB; + TGauge ggWater1TempB; + // McZapkie: definicje regulatorow TGauge ggMainCtrl; TGauge ggMainCtrlAct; @@ -395,6 +399,7 @@ public: // reszta może by?publiczna TGauge ggHornButton; TGauge ggHornLowButton; TGauge ggHornHighButton; + TGauge ggWhistleButton; TGauge ggNextCurrentButton; std::array ggUniversals; // NOTE: temporary arrangement until we have dynamically built control table diff --git a/World.cpp b/World.cpp index 014967e7..0e3f20ea 100644 --- a/World.cpp +++ b/World.cpp @@ -263,6 +263,7 @@ bool TWorld::Init( GLFWwindow *Window ) { FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie Controlled = NULL; mvControlled = NULL; + SafeDelete( Train ); Camera.Type = tp_Free; } } diff --git a/command.cpp b/command.cpp index 657e99b8..bcc640d7 100644 --- a/command.cpp +++ b/command.cpp @@ -115,6 +115,7 @@ commanddescription_sequence Commands_descriptions = { { "alerteracknowledge", command_target::vehicle }, { "hornlowactivate", command_target::vehicle }, { "hornhighactivate", command_target::vehicle }, + { "whistleactivate", command_target::vehicle }, { "radiotoggle", command_target::vehicle }, { "radiochannelincrease", command_target::vehicle }, { "radiochanneldecrease", command_target::vehicle }, diff --git a/command.h b/command.h index 96ecefd5..547ea93c 100644 --- a/command.h +++ b/command.h @@ -109,6 +109,7 @@ enum class user_command { alerteracknowledge, hornlowactivate, hornhighactivate, + whistleactivate, radiotoggle, radiochannelincrease, radiochanneldecrease, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index e092e5c9..e12d1072 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -358,7 +358,9 @@ keyboard_input::default_bindings() { // hornlowactivate { GLFW_KEY_A }, // hornhighactivate - { GLFW_KEY_A | keymodifier::shift }, + { GLFW_KEY_S }, + // whistleactivate + { GLFW_KEY_Z }, // radiotoggle { GLFW_KEY_R | keymodifier::control }, // radiochannelincrease diff --git a/mouseinput.cpp b/mouseinput.cpp index 6d8bbda2..ba9e7288 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -291,6 +291,9 @@ mouse_input::default_bindings() { { "hornhigh_bt:", { user_command::hornhighactivate, user_command::none } }, + { "whistle_bt:", { + user_command::whistleactivate, + user_command::none } }, { "fuse_bt:", { user_command::motoroverloadrelayreset, user_command::none } }, diff --git a/translation.h b/translation.h index d48cd8ce..5c35b97c 100644 --- a/translation.h +++ b/translation.h @@ -46,6 +46,7 @@ static std::unordered_map m_cabcontrols = { { "horn_bt:", "horn" }, { "hornlow_bt:", "low tone horn" }, { "hornhigh_bt:", "high tone horn" }, + { "whistle_bt:", "whistle" }, { "fuse_bt:", "motor overload relay reset" }, { "converterfuse_bt:", "converter overload relay reset" }, { "stlinoff_bt:", "motor connectors" }, diff --git a/version.h b/version.h index 96a56e56..6e8f9b75 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 505 +#define VERSION_MINOR 508 #define VERSION_REVISION 0 From 32feae8ff60b2d8827e77ccfa34f73d5c3787469 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 11 May 2018 14:54:06 +0200 Subject: [PATCH 323/426] air temperature readout for python scripts, scenarion inspector ui mode --- Event.h | 4 +++ Globals.cpp | 4 ++- Train.cpp | 83 ++++++++++++++++++++++++++++++++--------------------- uilayer.cpp | 35 +++++++++++++++++++++- 4 files changed, 91 insertions(+), 35 deletions(-) diff --git a/Event.h b/Event.h index 6ae2fa92..27bad969 100644 --- a/Event.h +++ b/Event.h @@ -132,6 +132,10 @@ public: bool insert( TEventLauncher *Launcher ) { return m_launchers.insert( Launcher ); } + // returns first event in the queue + TEvent * + begin() { + return QueryRootEvent; } // legacy method, returns pointer to specified event, or null TEvent * FindEvent( std::string const &Name ); diff --git a/Globals.cpp b/Globals.cpp index 4c1e9048..df17cb64 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -322,7 +322,9 @@ global_settings::ConfigParse(cParser &Parser) { // selected device for audio renderer Parser.getTokens(); Parser >> AirTemperature; - AirTemperature = clamp( AirTemperature, -15.f, 45.f ); + if( false == DebugModeFlag ) { + AirTemperature = clamp( AirTemperature, -15.f, 45.f ); + } } else if( token == "scalespeculars" ) { // whether strength of specular highlights should be adjusted (generally needed for legacy 3d models) diff --git a/Train.cpp b/Train.cpp index 3124b6e0..e805954e 100644 --- a/Train.cpp +++ b/Train.cpp @@ -535,6 +535,7 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "hours", PyGetInt( simulation::Time.data().wHour ) ); PyDict_SetItemString( dict, "minutes", PyGetInt( simulation::Time.data().wMinute ) ); PyDict_SetItemString( dict, "seconds", PyGetInt( simulation::Time.second() ) ); + PyDict_SetItemString( dict, "air_temperature", PyGetInt( Global.AirTemperature ) ); return dict; } @@ -6396,44 +6397,60 @@ void TTrain::set_cab_controls() { ggRadioChannelSelector.PutValue( iRadioChannel - 1 ); // pantographs if( mvOccupied->PantSwitchType != "impulse" ) { - ggPantFrontButton.PutValue( - ( mvControlled->PantFrontUp ? - 1.0 : - 0.0 ) ); - ggPantFrontButtonOff.PutValue( - ( mvControlled->PantFrontUp ? - 0.0 : - 1.0 ) ); + if( ggPantFrontButton.SubModel ) { + ggPantFrontButton.PutValue( + ( mvControlled->PantFrontUp ? + 1.0 : + 0.0 ) ); + } + if( ggPantFrontButtonOff.SubModel ) { + ggPantFrontButtonOff.PutValue( + ( mvControlled->PantFrontUp ? + 0.0 : + 1.0 ) ); + } // NOTE: currently we animate the selectable pantograph control for both pantographs // TODO: implement actual selection control, and refactor handling this control setup in a separate method - ggPantSelectedButton.PutValue( - ( mvControlled->PantFrontUp ? - 1.0 : - 0.0 ) ); - ggPantSelectedDownButton.PutValue( - ( mvControlled->PantFrontUp ? - 0.0 : - 1.0 ) ); + if( ggPantSelectedButton.SubModel ) { + ggPantSelectedButton.PutValue( + ( mvControlled->PantFrontUp ? + 1.0 : + 0.0 ) ); + } + if( ggPantSelectedDownButton.SubModel ) { + ggPantSelectedDownButton.PutValue( + ( mvControlled->PantFrontUp ? + 0.0 : + 1.0 ) ); + } } if( mvOccupied->PantSwitchType != "impulse" ) { - ggPantRearButton.PutValue( - ( mvControlled->PantRearUp ? - 1.0 : - 0.0 ) ); - ggPantRearButtonOff.PutValue( - ( mvControlled->PantRearUp ? - 0.0 : - 1.0 ) ); + if( ggPantRearButton.SubModel ) { + ggPantRearButton.PutValue( + ( mvControlled->PantRearUp ? + 1.0 : + 0.0 ) ); + } + if( ggPantRearButtonOff.SubModel ) { + ggPantRearButtonOff.PutValue( + ( mvControlled->PantRearUp ? + 0.0 : + 1.0 ) ); + } // NOTE: currently we animate the selectable pantograph control for both pantographs // TODO: implement actual selection control, and refactor handling this control setup in a separate method - ggPantSelectedButton.PutValue( - ( mvControlled->PantRearUp ? - 1.0 : - 0.0 ) ); - ggPantSelectedDownButton.PutValue( - ( mvControlled->PantRearUp ? - 0.0 : - 1.0 ) ); + if( ggPantSelectedButton.SubModel ) { + ggPantSelectedButton.PutValue( + ( mvControlled->PantRearUp ? + 1.0 : + 0.0 ) ); + } + if( ggPantSelectedDownButton.SubModel ) { + ggPantSelectedDownButton.PutValue( + ( mvControlled->PantRearUp ? + 0.0 : + 1.0 ) ); + } } // auxiliary compressor ggPantCompressorValve.PutValue( @@ -6750,7 +6767,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "horn_bt:", ggHornButton }, { "hornlow_bt:", ggHornLowButton }, { "hornhigh_bt:", ggHornHighButton }, - { "whistle_bt:", ggHornHighButton }, + { "whistle_bt:", ggWhistleButton }, { "fuse_bt:", ggFuseButton }, { "converterfuse_bt:", ggConverterFuseButton }, { "stlinoff_bt:", ggStLinOffButton }, diff --git a/uilayer.cpp b/uilayer.cpp index 3e81b53f..da030c78 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -184,6 +184,12 @@ ui_layer::on_key( int const Key, int const Action ) { return true; } + case GLFW_KEY_F11: { + // scenario inspector + Global.iTextMode = Key; + return true; + } + case GLFW_KEY_F12: { // coś tam jeszcze Global.iTextMode = Key; @@ -641,7 +647,34 @@ ui_layer::update() { case( GLFW_KEY_F10 ) : { - uitextline1 = ( "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]." ); + uitextline1 = "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]."; + + break; + } + + case( GLFW_KEY_F11 ): { + // scenario inspector + auto const time { Timer::GetTime() }; + auto const *event { simulation::Events.begin() }; + auto eventtableindex{ 0 }; + while( ( event != nullptr ) + && ( eventtableindex < 30 ) ) { + + if( ( false == event->m_ignored ) + && ( true == event->bEnabled ) ) { + + auto const delay { " " + to_string( std::max( 0.0, event->fStartTime - time ), 1 ) }; + auto const eventline = + "Delay: " + delay.substr( delay.length() - 6 ) + + ", Event: " + event->asName + + ( event->Activator ? " (by: " + event->Activator->asName + ")" : "" ) + + ( event->evJoined ? " (joint event)" : "" ); + + UITable->text_lines.emplace_back( eventline, Global.UITextColor ); + ++eventtableindex; + } + event = event->evNext; + } break; } From 847f4db5b40ba6210a0d1be37808dbf8880fffd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Thu, 10 May 2018 21:04:58 +0200 Subject: [PATCH 324/426] Added definition of rapid velocity for EStED brake valve --- McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 2 ++ McZapkie/hamulce.cpp | 7 ++++++- McZapkie/hamulce.h | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 2507d7f6..a645a342 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -807,6 +807,7 @@ public: double BrakeSlckAdj = 0.0; /*opor nastawiacza skoku tloka, kN*/ double BrakeRigEff = 0.0; /*sprawnosc przekladni dzwigniowej*/ double RapidMult = 1.0; /*przelozenie rapidu*/ + double RapidVel = 55.0; /*szybkosc przelaczania rapidu*/ int BrakeValveSize = 0; std::string BrakeValveParams; double Spg = 0.0; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index c60fa0df..015622e8 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7789,6 +7789,7 @@ void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { } extract_value( RapidMult, "RM", line, "1" ); + extract_value( RapidVel, "RV", line, "55" ); } } else { @@ -8779,6 +8780,7 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) WriteLog( "XBT EStED" ); Hamulec = std::make_shared( MaxBrakePress[ 3 ], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA ); Hamulec->SetRM( RapidMult ); + Hamulec->SetRV( RapidVel ); if( MBPM < 2 ) { //jesli przystawka wazaca Hamulec->SetLP( 0, MaxBrakePress[ 3 ], 0 ); diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index 7381c787..ee414c1d 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -1514,7 +1514,7 @@ double TEStED::GetPF( double const PP, double const dt, double const Vel ) Miedzypoj->Flow(dv * dt * 0.15); RapidTemp = - RapidTemp + (RM * int((Vel > 55) && (BrakeDelayFlag == bdelay_R)) - RapidTemp) * dt / 2; + RapidTemp + (RM * int((Vel > RV) && (BrakeDelayFlag == bdelay_R)) - RapidTemp) * dt / 2; temp = Max0R(1 - RapidTemp, 0.001); // if EDFlag then temp:=1000; // temp:=temp/(1-); @@ -1636,6 +1636,11 @@ void TEStED::SetLP( double const TM, double const LM, double const TBP ) TareBP = TBP; } +void TEStED::SetRV(double const RVR) +{ + RV = RVR; +} + //---DAKO CV1--- void TCV1::CheckState( double const BCP, double &dV1 ) diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index ac6fbf9a..93e89d37 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -204,6 +204,7 @@ class TBrake { void Releaser( int const state ); //odluzniacz virtual void SetEPS( double const nEPS ); //hamulec EP virtual void SetRM( double const RMR ) {}; //ustalenie przelozenia rapida + virtual void SetRV( double const RVR) {}; //ustalenie przelozenia rapida virtual void SetLP(double const TM, double const LM, double const TBP) {}; //parametry przystawki wazacej virtual void SetLBP(double const P) {}; //cisnienie z hamulca pomocniczego virtual void PLC(double const mass) {}; //wspolczynnik cisnienia przystawki wazacej @@ -333,6 +334,7 @@ class TLSt : public TESt4R { protected: double LBP = 0.0; //cisnienie hamulca pomocniczego double RM = 0.0; //przelozenie rapida + double RV = 0.0; double EDFlag = 0.0; //luzowanie hamulca z powodu zalaczonego ED public: @@ -368,6 +370,7 @@ class TEStED : public TLSt { //zawor z EP09 - Est4 z oddzielnym przekladnikiem, double GetEDBCP()/*override*/; //cisnienie tylko z hamulca zasadniczego, uzywane do hamulca ED void PLC(double const mass); //wspolczynnik cisnienia przystawki wazacej void SetLP( double const TM, double const LM, double const TBP ); //parametry przystawki wazacej + void SetRV(double const RVR); //ustalenie predkosci przelaczenia rapida inline TEStED(double i_mbp, double i_bcr, double i_bcd, double i_brc, int i_bcn, int i_BD, int i_mat, int i_ba, int i_nbpa) : TLSt( i_mbp, i_bcr, i_bcd, i_brc, i_bcn, i_BD, i_mat, i_ba, i_nbpa) From 0787be500a134f82ded7930d1681aea003fa92f6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 15 May 2018 19:49:17 +0200 Subject: [PATCH 325/426] build 180515. brake cylinder and doorstep sounds, comprehensive gauge update sound trigggers, vehicle removal from marked tracks, minor bug fixes --- DynObj.cpp | 268 ++++++++++++++++++++++++++++++++++++--------- DynObj.h | 13 ++- Gauge.cpp | 17 ++- Gauge.h | 10 +- McZapkie/MOVER.h | 2 +- McZapkie/Mover.cpp | 2 +- TrkFoll.cpp | 9 +- sound.cpp | 23 ++-- sound.h | 4 +- version.h | 2 +- 10 files changed, 266 insertions(+), 84 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 67e43ddd..47593521 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3882,14 +3882,40 @@ void TDynamicObject::RenderSounds() { // brake system and braking sounds: + + // brake cylinder piston + auto const brakepressureratio { std::max( 0.0, MoverParameters->BrakePress ) / std::max( 1.0, MoverParameters->MaxBrakePress[ 3 ] ) }; + if( m_lastbrakepressure != -1.f ) { + auto const quantizedratio { static_cast( 15 * brakepressureratio ) }; + auto const lastbrakepressureratio { std::max( 0.f, m_lastbrakepressure ) / std::max( 1.0, MoverParameters->MaxBrakePress[ 3 ] ) }; + auto const quantizedratiochange { quantizedratio - static_cast( 15 * lastbrakepressureratio ) }; + if( quantizedratiochange > 0 ) { + m_brakecylinderpistonadvance + .pitch( + true == m_brakecylinderpistonadvance.is_combined() ? + quantizedratio * 0.01f : + m_brakecylinderpistonadvance.m_frequencyoffset + m_brakecylinderpistonadvance.m_frequencyfactor * 1.f ) + .play(); + } + else if( quantizedratiochange < 0 ) { + m_brakecylinderpistonrecede + .pitch( + true == m_brakecylinderpistonrecede.is_combined() ? + quantizedratio * 0.01f : + m_brakecylinderpistonrecede.m_frequencyoffset + m_brakecylinderpistonrecede.m_frequencyfactor * 1.f ) + .play(); + } + } + + // air release if( m_lastbrakepressure != -1.f ) { // calculate rate of pressure drop in brake cylinder, once it's been initialized auto const brakepressuredifference{ m_lastbrakepressure - MoverParameters->BrakePress }; m_brakepressurechange = interpolate( m_brakepressurechange, brakepressuredifference / dt, 0.005f ); } m_lastbrakepressure = MoverParameters->BrakePress; - // ensure some basic level of volume and scale it up depending on pressure in the cylinder; scale this by the leak rate - volume = 20 * m_brakepressurechange * ( 0.25 + 0.75 * ( std::max( 0.0, MoverParameters->BrakePress ) / std::max( 1.0, MoverParameters->MaxBrakePress[ 3 ] ) ) ); + // ensure some basic level of volume and scale it up depending on pressure in the cylinder; scale this by the air release rate + volume = 20 * m_brakepressurechange * ( 0.25 + 0.75 * brakepressureratio ); if( volume > 0.075f ) { rsUnbrake .gain( volume ) @@ -3917,6 +3943,7 @@ void TDynamicObject::RenderSounds() { sReleaser.stop(); } + // slipping wheels if( MoverParameters->SlippingWheels ) { if( ( MoverParameters->UnitBrakeForce > 100.0 ) @@ -3940,6 +3967,7 @@ void TDynamicObject::RenderSounds() { sSand.stop(); } + // brakes auto brakeforceratio{ 0.0 }; if( //( false == mvOccupied->SlippingWheels ) && ( MoverParameters->UnitBrakeForce > 10.0 ) @@ -4016,47 +4044,96 @@ void TDynamicObject::RenderSounds() { } } // NBMX Obsluga drzwi, MC: zuniwersalnione - if( ( true == MoverParameters->DoorLeftOpened ) - && ( dDoorMoveL < MoverParameters->DoorMaxShiftL ) ) { - - for( auto &door : m_doorsounds ) { - if( door.rsDoorClose.offset().x > 0.f ) { - // determine left side doors from their offset - door.rsDoorOpen.play( sound_flags::exclusive ); - door.rsDoorClose.stop(); + if( true == MoverParameters->DoorLeftOpened ) { + // open left door + // door sounds + if( dDoorMoveL < MoverParameters->DoorMaxShiftL ) { + for( auto &door : m_doorsounds ) { + if( door.rsDoorClose.offset().x > 0.f ) { + // determine left side doors from their offset + door.rsDoorOpen.play( sound_flags::exclusive ); + door.rsDoorClose.stop(); + } + } + } + // doorstep sounds + if( dDoorstepMoveL < 1.0 ) { + for( auto &door : m_doorsounds ) { + if( door.step_close.offset().x > 0.f ) { + door.step_open.play( sound_flags::exclusive ); + door.step_close.stop(); + } } } } - if( ( false == MoverParameters->DoorLeftOpened ) - && ( dDoorMoveL > 0.01 ) ) { - - for( auto &door : m_doorsounds ) { - if( door.rsDoorClose.offset().x > 0.f ) { - // determine left side doors from their offset - door.rsDoorClose.play( sound_flags::exclusive ); - door.rsDoorOpen.stop(); + if( false == MoverParameters->DoorLeftOpened ) { + // close left door + // door sounds can start playing before the door begins moving + if( dDoorMoveL > 0.0 ) { + for( auto &door : m_doorsounds ) { + if( door.rsDoorClose.offset().x > 0.f ) { + // determine left side doors from their offset + door.rsDoorClose.play( sound_flags::exclusive ); + door.rsDoorOpen.stop(); + } + } + } + // doorstep sounds are played only when the doorstep is moving + if( ( dDoorstepMoveL > 0.0 ) + && ( dDoorstepMoveL < 1.0 ) ) { + for( auto &door : m_doorsounds ) { + if( door.step_close.offset().x > 0.f ) { + // determine left side doors from their offset + door.step_close.play( sound_flags::exclusive ); + door.step_open.stop(); + } } } } - if( ( true == MoverParameters->DoorRightOpened ) - && ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) ) { - for( auto &door : m_doorsounds ) { - if( door.rsDoorClose.offset().x < 0.f ) { - // determine left side doors from their offset - door.rsDoorOpen.play( sound_flags::exclusive ); - door.rsDoorClose.stop(); + if( true == MoverParameters->DoorRightOpened ) { + // open right door + // door sounds + if( dDoorMoveR < MoverParameters->DoorMaxShiftR ) { + for( auto &door : m_doorsounds ) { + if( door.rsDoorClose.offset().x < 0.f ) { + // determine right side doors from their offset + door.rsDoorOpen.play( sound_flags::exclusive ); + door.rsDoorClose.stop(); + } + } + } + // doorstep sounds + if( dDoorstepMoveR < 1.0 ) { + for( auto &door : m_doorsounds ) { + if( door.step_close.offset().x < 0.f ) { + door.step_open.play( sound_flags::exclusive ); + door.step_close.stop(); + } } } } - if( ( false == MoverParameters->DoorRightOpened ) - && ( dDoorMoveR > 0.01 ) ) { - - for( auto &door : m_doorsounds ) { - if( door.rsDoorClose.offset().x < 0.f ) { - // determine left side doors from their offset - door.rsDoorClose.play( sound_flags::exclusive ); - door.rsDoorOpen.stop(); + if( false == MoverParameters->DoorRightOpened ) { + // close right door + // door sounds can start playing before the door begins moving + if( dDoorMoveR > 0.0 ) { + for( auto &door : m_doorsounds ) { + if( door.rsDoorClose.offset().x < 0.f ) { + // determine left side doors from their offset + door.rsDoorClose.play( sound_flags::exclusive ); + door.rsDoorOpen.stop(); + } + } + } + // doorstep sounds are played only when the doorstep is moving + if( ( dDoorstepMoveR > 0.0 ) + && ( dDoorstepMoveR < 1.0 ) ) { + for( auto &door : m_doorsounds ) { + if( door.step_close.offset().x < 0.f ) { + // determine left side doors from their offset + door.step_close.play( sound_flags::exclusive ); + door.step_open.stop(); + } } } } @@ -5136,6 +5213,18 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, rsPisk.m_amplitudeoffset *= ( 105.f - Random( 10.f ) ) / 100.f; } + else if( token == "brakecylinderinc:" ) { + // brake cylinder pressure increase sounds + m_brakecylinderpistonadvance.deserialize( parser, sound_type::single ); + m_brakecylinderpistonadvance.owner( this ); + } + + else if( token == "brakecylinderdec:" ) { + // brake cylinder pressure decrease sounds + m_brakecylinderpistonrecede.deserialize( parser, sound_type::single ); + m_brakecylinderpistonrecede.owner( this ); + } + else if( token == "brakeacc:" ) { // plik z przyspieszaczem (upust po zlapaniu hamowania) sBrakeAcc.deserialize( parser, sound_type::single ); @@ -5234,29 +5323,53 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else if( token == "dooropen:" ) { - sound_source doortemplate { sound_placement::general }; - doortemplate.deserialize( parser, sound_type::single ); - doortemplate.owner( this ); + sound_source soundtemplate { sound_placement::general }; + soundtemplate.deserialize( parser, sound_type::single ); + soundtemplate.owner( this ); for( auto &door : m_doorsounds ) { // apply configuration to all defined doors, but preserve their individual offsets auto const dooroffset { door.rsDoorOpen.offset() }; - door.rsDoorOpen = doortemplate; + door.rsDoorOpen = soundtemplate; door.rsDoorOpen.offset( dooroffset ); } } else if( token == "doorclose:" ) { - sound_source doortemplate { sound_placement::general }; - doortemplate.deserialize( parser, sound_type::single ); - doortemplate.owner( this ); + sound_source soundtemplate { sound_placement::general }; + soundtemplate.deserialize( parser, sound_type::single ); + soundtemplate.owner( this ); for( auto &door : m_doorsounds ) { // apply configuration to all defined doors, but preserve their individual offsets auto const dooroffset { door.rsDoorClose.offset() }; - door.rsDoorClose = doortemplate; + door.rsDoorClose = soundtemplate; door.rsDoorClose.offset( dooroffset ); } } + else if( token == "doorstepopen:" ) { + sound_source soundtemplate { sound_placement::general }; + soundtemplate.deserialize( parser, sound_type::single ); + soundtemplate.owner( this ); + for( auto &door : m_doorsounds ) { + // apply configuration to all defined doors, but preserve their individual offsets + auto const dooroffset { door.step_open.offset() }; + door.step_open = soundtemplate; + door.step_open.offset( dooroffset ); + } + } + + else if( token == "doorstepclose:" ) { + sound_source soundtemplate { sound_placement::general }; + soundtemplate.deserialize( parser, sound_type::single ); + soundtemplate.owner( this ); + for( auto &door : m_doorsounds ) { + // apply configuration to all defined doors, but preserve their individual offsets + auto const dooroffset { door.step_close.offset() }; + door.step_close = soundtemplate; + door.step_close.offset( dooroffset ); + } + } + else if( token == "unloading:" ) { m_exchangesounds.unloading.deserialize( parser, sound_type::single ); m_exchangesounds.unloading.owner( this ); @@ -5336,6 +5449,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, auto const location { glm::vec3 { MoverParameters->Dim.W * 0.5f, MoverParameters->Dim.H * 0.5f, offset } }; door.rsDoorClose.offset( location ); door.rsDoorOpen.offset( location ); + door.step_close.offset( location ); + door.step_open.offset( location ); m_doorsounds.emplace_back( door ); } if( ( sides == "both" ) @@ -5344,6 +5459,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, auto const location { glm::vec3 { MoverParameters->Dim.W * -0.5f, MoverParameters->Dim.H * 0.5f, offset } }; door.rsDoorClose.offset( location ); door.rsDoorOpen.offset( location ); + door.step_close.offset( location ); + door.step_open.offset( location ); m_doorsounds.emplace_back( door ); } } @@ -6570,19 +6687,9 @@ vehicle_table::update( double Deltatime, int Iterationcount ) { // Ra 2015-01: tylko tu przelicza sieć trakcyjną vehicle->Update( Deltatime, totaltime ); } -/* - // TODO: re-implement - if (TDynamicObject::bDynamicRemove) - { // jeśli jest coś do usunięcia z listy, to trzeba na końcu - for (TGroundNode *Current = nRootDynamic; Current; Current = Current->nNext) - if ( false == Current->DynamicObject->bEnabled) - { - DynamicRemove(Current->DynamicObject); // usunięcie tego i podłączonych - Current = nRootDynamic; // sprawdzanie listy od początku - } - TDynamicObject::bDynamicRemove = false; // na razie koniec - } -*/ + + // jeśli jest coś do usunięcia z listy, to trzeba na końcu + erase_disabled(); } // legacy method, checks for presence and height of traction wire for specified vehicle @@ -6693,3 +6800,56 @@ vehicle_table::DynamicList( bool const Onlycontrolled ) const { // informacja o końcu listy multiplayer::WyslijString( "none", 6 ); } + +// maintenance; removes from tracks consists with vehicles marked as disabled +bool +vehicle_table::erase_disabled() { + + if( false == TDynamicObject::bDynamicRemove ) { return false; } + + // go through the list and retrieve vehicles scheduled for removal... + type_sequence disabledvehicles; + for( auto *vehicle : m_items ) { + if( false == vehicle->bEnabled ) { + disabledvehicles.emplace_back( vehicle ); + } + } + // ...now propagate removal flag through affected consists... + for( auto *vehicle : disabledvehicles ) { + TDynamicObject *coupledvehicle { vehicle }; + while( ( coupledvehicle = coupledvehicle->Next() ) != nullptr ) { + coupledvehicle->bEnabled = false; + } + // (try to) run propagation in both directions, it's simpler than branching based on direction etc + coupledvehicle = vehicle; + while( ( coupledvehicle = coupledvehicle->Prev() ) != nullptr ) { + coupledvehicle->bEnabled = false; + } + } + // ...then actually remove all disabled vehicles... + auto vehicleiter = std::begin( m_items ); + while( vehicleiter != std::end( m_items ) ) { + + auto *vehicle { *vehicleiter }; + + if( true == vehicle->bEnabled ) { + ++vehicleiter; + } + else { + if( vehicle->MyTrack != nullptr ) { + vehicle->MyTrack->RemoveDynamicObject( vehicle ); + } + // clear potential train binding + Global.pWorld->TrainDelete( vehicle ); + // remove potential entries in the light array + simulation::Lights.remove( vehicle ); + // finally get rid of the vehicle and its record themselves + SafeDelete( vehicle ); + vehicleiter = m_items.erase( vehicleiter ); + } + } + // ...and call it a day + TDynamicObject::bDynamicRemove = false; + + return true; +} diff --git a/DynObj.h b/DynObj.h index 8ed4913e..597abed9 100644 --- a/DynObj.h +++ b/DynObj.h @@ -307,6 +307,8 @@ private: struct door_sounds { sound_source rsDoorOpen { sound_placement::general, 25.f }; // Ra: przeniesione z kabiny sound_source rsDoorClose { sound_placement::general, 25.f }; + sound_source step_open { sound_placement::general, 25.f }; + sound_source step_close { sound_placement::general, 25.f }; }; struct exchange_sounds { @@ -408,8 +410,10 @@ private: bool bBrakeAcc { false }; sound_source rsPisk { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // McZapkie-260302 sound_source rsUnbrake { sound_placement::external }; // yB - odglos luzowania - float m_lastbrakepressure { -1.f }; // helper, cached level of pressure in brake cylinder - float m_brakepressurechange { 0.f }; // recent change of pressure in brake cylinder + sound_source m_brakecylinderpistonadvance { sound_placement::external }; + sound_source m_brakecylinderpistonrecede { sound_placement::external }; + float m_lastbrakepressure { -1.f }; // helper, cached level of pressure in the brake cylinder + float m_brakepressurechange { 0.f }; // recent change of pressure in the brake cylinder sound_source sReleaser { sound_placement::external }; sound_source rsSlippery { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // moved from cab sound_source sSand { sound_placement::external }; @@ -618,6 +622,11 @@ public: // legacy method, sends list of vehicles over network void DynamicList( bool const Onlycontrolled = false ) const; + +private: + // maintenance; removes from tracks consists with vehicles marked as disabled + bool + erase_disabled(); }; //--------------------------------------------------------------------------- diff --git a/Gauge.cpp b/Gauge.cpp index cb1b8440..c7e5ad1e 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -21,6 +21,13 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "renderer.h" +TGauge::TGauge( sound_source const &Soundtemplate ) : + m_soundtemplate( Soundtemplate ) +{ + m_soundfxincrease = m_soundtemplate; + m_soundfxdecrease = m_soundtemplate; +} + void TGauge::Init(TSubModel *Submodel, TGaugeType Type, float Scale, float Offset, float Friction, float Value, float const Endvalue, float const Endscale, bool const Interpolatescale ) { // ustawienie parametrów animacji submodelu SubModel = Submodel; @@ -172,7 +179,7 @@ TGauge::Load_mapping( cParser &Input ) { if( indexstart != std::string::npos ) { m_soundfxvalues.emplace( std::stoi( key.substr( indexstart, indexend - indexstart ) ), - sound_source( sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE ).deserialize( Input, sound_type::single ) ); + sound_source( m_soundtemplate ).deserialize( Input, sound_type::single ) ); } } return true; // return value marks a key: value pair was extracted, nothing about whether it's recognized @@ -333,13 +340,15 @@ void TGauge::UpdateValue() switch (m_datatype) { // to nie jest zbyt optymalne, można by zrobić osobne funkcje case 'f': - m_targetvalue = (*fData); + UpdateValue( *fData ); break; case 'd': - m_targetvalue = (*dData); + UpdateValue( *dData ); break; case 'i': - m_targetvalue = (*iData); + UpdateValue( *iData ); + break; + default: break; } }; diff --git a/Gauge.h b/Gauge.h index 40f82cca..87e78781 100644 --- a/Gauge.h +++ b/Gauge.h @@ -27,8 +27,11 @@ class TGauge { public: // methods TGauge() = default; + explicit TGauge( sound_source const &Soundtemplate ); + inline - void Clear() { *this = TGauge(); } + void Clear() { + *this = TGauge(); } void Init(TSubModel *Submodel, TGaugeType Type, float Scale = 1, float Offset = 0, float Friction = 0, float Value = 0, float const Endvalue = -1.0, float const Endscale = -1.0, bool const Interpolate = false ); bool Load(cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, TModel3d *md2 = nullptr, double mul = 1.0); void UpdateValue( float fNewDesired ); @@ -73,8 +76,9 @@ private: double *dData { nullptr }; int *iData; }; - sound_source m_soundfxincrease { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // sound associated with increasing control's value - sound_source m_soundfxdecrease { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // sound associated with decreasing control's value + sound_source m_soundtemplate { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // shared properties for control's sounds + sound_source m_soundfxincrease { m_soundtemplate }; // sound associated with increasing control's value + sound_source m_soundfxdecrease { m_soundtemplate }; // sound associated with decreasing control's value std::map m_soundfxvalues; // sounds associated with specific values }; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index a645a342..ecf35362 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -637,7 +637,7 @@ struct oil_pump { start start_type { start::manual }; float resource_amount { 1.f }; float pressure_minimum { 0.f }; // lowest acceptable working pressure - float pressure_maximum { 0.f }; // oil pressure at maximum engine revolutions + float pressure_maximum { 0.65f }; // oil pressure at maximum engine revolutions float pressure_target { 0.f }; float pressure_present { 0.f }; }; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 015622e8..63198517 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6379,7 +6379,7 @@ void TMoverParameters::dizel_Heat( double const dt ) { // olej oddaje cieplo do wody gdy krazy przez wymiennik ciepla == wlaczona pompka lub silnik auto const dTo { ( dizel_heat.auxiliary_water_circuit ? - ( ( dizel_heat.kfo * ( dizel_heat.Ts - dizel_heat.To ) ) - ( dizel_heat.kfs * ( 0.3 ) * ( dizel_heat.To - dizel_heat.Tsr2 ) ) ) / ( gwO * Co ) : + ( ( dizel_heat.kfo * ( dizel_heat.Ts - dizel_heat.To ) ) - ( dizel_heat.kfo2 * ( dizel_heat.To - dizel_heat.Tsr2 ) ) ) / ( gwO * Co ) : ( ( dizel_heat.kfo * ( dizel_heat.Ts - dizel_heat.To ) ) - ( dizel_heat.kfo2 * ( dizel_heat.To - dizel_heat.Tsr ) ) ) / ( gwO * Co ) ) }; dizel_heat.To += ( dTo * dt ); diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 0cc0f6d1..9427fae6 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -227,8 +227,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) { // jeśli przekroczenie toru od strony Point2 bCanSkip = ( bPrimary && pCurrentTrack->CheckDynamicObject( Owner ) ); if (bCanSkip) // tylko główna oś przenosi pojazd do innego toru - Owner->MyTrack->RemoveDynamicObject( - Owner); // zdejmujemy pojazd z dotychczasowego toru + Owner->MyTrack->RemoveDynamicObject(Owner); // zdejmujemy pojazd z dotychczasowego toru fDistance = s - pCurrentSegment->GetLength(); dir = fDirection; if (pCurrentTrack->eType == tt_Cross) @@ -236,8 +235,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) if (!SetCurrentTrack(pCurrentTrack->Connected(iSegment, fDirection), 1)) return false; // wyjście z błędem } - else if (!SetCurrentTrack(pCurrentTrack->Connected(1, fDirection), - 1)) // ustawia fDirection + else if (!SetCurrentTrack(pCurrentTrack->Connected(1, fDirection), 1)) // ustawia fDirection return false; // wyjście z błędem if (dir != fDirection) //(pCurrentTrack->iNextDirection) { // gdy zmiana kierunku toru (Point2->Point2) @@ -249,8 +247,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) if (bCanSkip) { // jak główna oś, to dodanie pojazdu do nowego toru pCurrentTrack->AddDynamicObject(Owner); - iEventFlag = - 3; // McZapkie-020602: umozliwienie uruchamiania event1,2 po zmianie toru + iEventFlag = 3; // McZapkie-020602: umozliwienie uruchamiania event1,2 po zmianie toru iEventallFlag = 3; if (!Owner->MyTrack) return false; diff --git a/sound.cpp b/sound.cpp index d634b385..bd903e66 100644 --- a/sound.cpp +++ b/sound.cpp @@ -216,7 +216,7 @@ sound_source::deserialize_mapping( cParser &Input ) { auto const pitch { Input.getToken( false, "\n\r\t ,;" ) }; for( auto &chunk : m_soundchunks ) { if( chunk.second.threshold == index ) { - chunk.second.pitch = pitch; + chunk.second.pitch = ( pitch > 0.f ? pitch : 1.f ); break; } } @@ -386,8 +386,9 @@ sound_source::play_combined() { if( soundpoint < soundchunk.second.fadein ) { break; } if( soundpoint >= soundchunk.second.fadeout ) { continue; } - if( ( soundchunk.first.playing > 0 ) - || ( soundchunk.first.buffer == null_handle ) ) { + if( ( soundchunk.first.buffer == null_handle ) + || ( ( ( m_flags & ( sound_flags::exclusive | sound_flags::looping ) ) != 0 ) + && ( soundchunk.first.playing > 0 ) ) ) { // combined sounds only play looped, single copy of each activated chunk continue; } @@ -612,13 +613,15 @@ sound_source::update_combined( audio::openal_source &Source ) { */ if( ( soundhandle & sound_id::chunk ) != 0 ) { // for sound chunks, test whether the chunk should still be active given current value of the controlling variable - auto const soundpoint { compute_combined_point() }; - auto const &soundchunk { m_soundchunks[ soundhandle ^ sound_id::chunk ] }; - if( ( soundpoint < soundchunk.second.fadein ) - || ( soundpoint >= soundchunk.second.fadeout ) ) { - Source.stop(); - update_counter( soundhandle, -1 ); - return; + if( ( m_flags & ( sound_flags::exclusive | sound_flags::looping ) ) != 0 ) { + auto const soundpoint { compute_combined_point() }; + auto const &soundchunk { m_soundchunks[ soundhandle ^ sound_id::chunk ] }; + if( ( soundpoint < soundchunk.second.fadein ) + || ( soundpoint >= soundchunk.second.fadeout ) ) { + Source.stop(); + update_counter( soundhandle, -1 ); + return; + } } } diff --git a/sound.h b/sound.h index 55a0a1ed..004e662b 100644 --- a/sound.h +++ b/sound.h @@ -30,8 +30,8 @@ enum sound_parameters { }; enum sound_flags { - looping = 0x1, // the main sample will be looping; implied for multi-sounds - exclusive = 0x2, // the source won't dispatch more than one active instance of the sound; implied for multi-sounds + looping = 0x1, // the main sample will be looping + exclusive = 0x2, // the source won't dispatch more than one active instance of the sound event = 0x80 // sound was activated by an event; we should keep note of the activation state for the update() calls it may receive }; diff --git a/version.h b/version.h index 6e8f9b75..cf8ca48a 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 508 +#define VERSION_MINOR 515 #define VERSION_REVISION 0 From 45e751312ad906be276c4ab778e4d226afd7914d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 17 May 2018 00:23:20 +0200 Subject: [PATCH 326/426] train timetable readout for python scripts, timetable ui mode enhancements, minor bug fixes --- Driver.cpp | 11 +++++-- Driver.h | 11 +++---- McZapkie/Mover.cpp | 4 +-- Train.cpp | 77 +++++++++++++++++++++++++++++----------------- messaging.cpp | 2 +- mtable.cpp | 61 ++++++------------------------------ mtable.h | 5 ++- uilayer.cpp | 67 +++++++++++++++++++++++++++------------- utilities.cpp | 20 ++++++++++++ utilities.h | 2 ++ version.h | 2 +- 11 files changed, 145 insertions(+), 117 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 42533eba..4983f077 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -5882,22 +5882,27 @@ void TController::DirectionForward(bool forward) } }; +Mtable::TTrainParameters const * +TController::TrainTimetable() const { + return TrainParams; +} + std::string TController::Relation() { // zwraca relację pociągu return TrainParams->ShowRelation(); }; -std::string TController::TrainName() +std::string TController::TrainName() const { // zwraca numer pociągu return TrainParams->TrainName; }; -int TController::StationCount() +int TController::StationCount() const { // zwraca ilość stacji (miejsc zatrzymania) return TrainParams->StationCount; }; -int TController::StationIndex() +int TController::StationIndex() const { // zwraca indeks aktualnej stacji (miejsca zatrzymania) return TrainParams->StationIndex; }; diff --git a/Driver.h b/Driver.h index 95277696..f429fef6 100644 --- a/Driver.h +++ b/Driver.h @@ -314,8 +314,6 @@ private: void AutoRewident(); // ustawia hamulce w składzie double ESMVelocity(bool Main); public: - Mtable::TTrainParameters *Timetable() { - return TrainParams; }; void PutCommand(std::string NewCommand, double NewValue1, double NewValue2, const TLocation &NewLocation, TStopReason reason = stopComm); bool PutCommand( std::string NewCommand, double NewValue1, double NewValue2, glm::dvec3 const *NewLocation, TStopReason reason = stopComm ); void UpdateSituation(double dt); // uruchamiac przynajmniej raz na sekundę @@ -385,13 +383,14 @@ private: void PhysicsLog(); std::string StopReasonText(); ~TController(); - std::string NextStop(); void TakeControl(bool yes); + Mtable::TTrainParameters const * TrainTimetable() const; + std::string TrainName() const; std::string Relation(); - std::string TrainName(); - int StationCount(); - int StationIndex(); + int StationCount() const; + int StationIndex() const; bool IsStop(); + std::string NextStop(); inline bool Primary() const { return ( ( iDrivigFlags & movePrimary ) != 0 ); }; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 63198517..07c7e34f 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6398,7 +6398,7 @@ void TMoverParameters::dizel_Heat( double const dt ) { dizel_heat.water_aux.is_warm = ( ( true == dizel_heat.cooling ) || ( ( true == Mains ) - && ( BatteryVoltage > 70 ) /* && !bezpompy && !awaria_chlodzenia && !WS10 */ + && ( BatteryVoltage > ( 0.75 * NominalBatteryVoltage ) ) /* && !bezpompy && !awaria_chlodzenia && !WS10 */ && ( dizel_heat.water_aux.config.temp_cooling > 0 ) && ( dizel_heat.temperatura2 > dizel_heat.water_aux.config.temp_cooling - ( dizel_heat.water_aux.is_warm ? 8 : 0 ) ) ) ); auto const PTC2 { ( dizel_heat.water_aux.is_warm /*or PTC2p*/ ? 1 : 0 ) }; @@ -6426,7 +6426,7 @@ void TMoverParameters::dizel_Heat( double const dt ) { dizel_heat.water.is_warm = ( ( true == dizel_heat.cooling ) || ( ( true == Mains ) - && ( BatteryVoltage > 70 ) /* && !bezpompy && !awaria_chlodzenia && !WS10 */ + && ( BatteryVoltage > ( 0.75 * NominalBatteryVoltage ) ) /* && !bezpompy && !awaria_chlodzenia && !WS10 */ && ( dizel_heat.water.config.temp_cooling > 0 ) && ( dizel_heat.temperatura1 > dizel_heat.water.config.temp_cooling - ( dizel_heat.water.is_warm ? 8 : 0 ) ) ) ); auto const PTC1 { ( dizel_heat.water.is_warm /*or PTC1p*/ ? 1 : 0 ) }; diff --git a/Train.cpp b/Train.cpp index e805954e..292d9087 100644 --- a/Train.cpp +++ b/Train.cpp @@ -23,6 +23,7 @@ http://mozilla.org/MPL/2.0/. #include "MdlMngr.h" #include "Timer.h" #include "Driver.h" +#include "mtable.h" #include "Console.h" void @@ -430,7 +431,7 @@ PyObject *TTrain::GetTrainState() { auto const &mover = DynamicObject->MoverParameters; auto *dict = PyDict_New(); if( ( dict == nullptr ) - || ( mover == nullptr ) ) { + || ( mover == nullptr ) ) { return nullptr; } @@ -450,14 +451,14 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "scnd_ctrl_actual_pos", PyGetInt( mover->ScndCtrlActualPos ) ); // brakes PyDict_SetItemString( dict, "manual_brake", PyGetBool( mvOccupied->ManualBrakePos > 0 ) ); - bool const bEP = ( mvControlled->LocHandle->GetCP()>0.2 ) || ( fEIMParams[ 0 ][ 2 ]>0.01 ); + bool const bEP = ( mvControlled->LocHandle->GetCP() > 0.2 ) || ( fEIMParams[ 0 ][ 2 ] > 0.01 ); PyDict_SetItemString( dict, "dir_brake", PyGetBool( bEP ) ); bool bPN; if( ( typeid( *mvControlled->Hamulec ) == typeid( TLSt ) ) - || ( typeid( *mvControlled->Hamulec ) == typeid( TEStED ) ) ) { + || ( typeid( *mvControlled->Hamulec ) == typeid( TEStED ) ) ) { TBrake* temp_ham = mvControlled->Hamulec.get(); - bPN = ( static_cast( temp_ham )->GetEDBCP()>0.2 ); + bPN = ( static_cast( temp_ham )->GetEDBCP() > 0.2 ); } else bPN = false; @@ -472,13 +473,13 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "velocity", PyGetFloat( mover->Vel ) ); PyDict_SetItemString( dict, "tractionforce", PyGetFloat( mover->Ft ) ); PyDict_SetItemString( dict, "slipping_wheels", PyGetBool( mover->SlippingWheels ) ); - PyDict_SetItemString( dict, "sanding", PyGetBool( mover->SandDose )); + PyDict_SetItemString( dict, "sanding", PyGetBool( mover->SandDose ) ); // electric current data PyDict_SetItemString( dict, "traction_voltage", PyGetFloat( mover->RunningTraction.TractionVoltage ) ); PyDict_SetItemString( dict, "voltage", PyGetFloat( mover->Voltage ) ); PyDict_SetItemString( dict, "im", PyGetFloat( mover->Im ) ); PyDict_SetItemString( dict, "fuse", PyGetBool( mover->FuseFlag ) ); - PyDict_SetItemString( dict, "epfuse", PyGetBool( mover->EpFuse )); + PyDict_SetItemString( dict, "epfuse", PyGetBool( mover->EpFuse ) ); // induction motor state data char const *TXTT[ 10 ] = { "fd", "fdt", "fdb", "pd", "pdt", "pdb", "itothv", "1", "2", "3" }; char const *TXTC[ 10 ] = { "fr", "frt", "frb", "pr", "prt", "prb", "im", "vm", "ihv", "uhv" }; @@ -487,23 +488,24 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, ( std::string( "eimp_t_" ) + std::string( TXTT[ j ] ) ).c_str(), PyGetFloatS( fEIMParams[ 0 ][ j ] ) ); for( int i = 0; i < 8; ++i ) { for( int j = 0; j < 10; ++j ) - PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_" ) + std::string( TXTC[ j ] ) ).c_str(), PyGetFloatS( fEIMParams[ i + 1 ][ j ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_ms" ) ).c_str(), PyGetBool( bMains[ i ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_cv" ) ).c_str(), PyGetFloatS( fCntVol[ i ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_u" ) + std::to_string( i + 1 ) + std::string( "_pf" ) ).c_str(), PyGetBool( bPants[ i ][ 0 ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_u" ) + std::to_string( i + 1 ) + std::string( "_pr" ) ).c_str(), PyGetBool( bPants[ i ][ 1 ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_fuse" ) ).c_str(), PyGetBool( bFuse[ i ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_batt" ) ).c_str(), PyGetBool( bBatt[ i ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_conv" ) ).c_str(), PyGetBool( bConv[ i ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_u" ) + std::to_string( i + 1 ) + std::string( "_comp_a" ) ).c_str(), PyGetBool( bComp[ i ][ 0 ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_u" ) + std::to_string( i + 1 ) + std::string( "_comp_w" ) ).c_str(), PyGetBool( bComp[ i ][ 1 ] ) ); - PyDict_SetItemString( dict, ( std::string( "eimp_c" ) + std::to_string( i + 1 ) + std::string( "_heat" ) ).c_str(), PyGetBool( bHeat[ i ] ) ); + PyDict_SetItemString( dict, ( "eimp_c" + std::to_string( i + 1 ) + "_" + std::string( TXTC[ j ] ) ).c_str(), PyGetFloatS( fEIMParams[ i + 1 ][ j ] ) ); + + PyDict_SetItemString( dict, ( "eimp_c" + std::to_string( i + 1 ) + "_ms" ).c_str(), PyGetBool( bMains[ i ] ) ); + PyDict_SetItemString( dict, ( "eimp_c" + std::to_string( i + 1 ) + "_cv" ).c_str(), PyGetFloatS( fCntVol[ i ] ) ); + PyDict_SetItemString( dict, ( "eimp_u" + std::to_string( i + 1 ) + "_pf" ).c_str(), PyGetBool( bPants[ i ][ 0 ] ) ); + PyDict_SetItemString( dict, ( "eimp_u" + std::to_string( i + 1 ) + "_pr" ).c_str(), PyGetBool( bPants[ i ][ 1 ] ) ); + PyDict_SetItemString( dict, ( "eimp_c" + std::to_string( i + 1 ) + "_fuse" ).c_str(), PyGetBool( bFuse[ i ] ) ); + PyDict_SetItemString( dict, ( "eimp_c" + std::to_string( i + 1 ) + "_batt" ).c_str(), PyGetBool( bBatt[ i ] ) ); + PyDict_SetItemString( dict, ( "eimp_c" + std::to_string( i + 1 ) + "_conv" ).c_str(), PyGetBool( bConv[ i ] ) ); + PyDict_SetItemString( dict, ( "eimp_u" + std::to_string( i + 1 ) + "_comp_a" ).c_str(), PyGetBool( bComp[ i ][ 0 ] ) ); + PyDict_SetItemString( dict, ( "eimp_u" + std::to_string( i + 1 ) + "_comp_w" ).c_str(), PyGetBool( bComp[ i ][ 1 ] ) ); + PyDict_SetItemString( dict, ( "eimp_c" + std::to_string( i + 1 ) + "_heat" ).c_str(), PyGetBool( bHeat[ i ] ) ); } for( int i = 0; i < 20; ++i ) { for( int j = 0; j < 3; ++j ) - PyDict_SetItemString( dict, ( std::string( "eimp_pn" ) + std::to_string( i + 1 ) + std::string( "_" ) + std::string( TXTP[ j ] ) ).c_str(), - PyGetFloatS( fPress[ i ][ j ] ) ); + PyDict_SetItemString( dict, ( "eimp_pn" + std::to_string( i + 1 ) + "_" + TXTP[ j ] ).c_str(), + PyGetFloatS( fPress[ i ][ j ] ) ); } // multi-unit state data PyDict_SetItemString( dict, "car_no", PyGetInt( iCarNo ) ); @@ -511,17 +513,16 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "unit_no", PyGetInt( iUnitNo ) ); for( int i = 0; i < 20; i++ ) { - PyDict_SetItemString( dict, ( std::string( "doors_" ) + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 0 ] ) ); - PyDict_SetItemString( dict, ( std::string( "doors_r_" ) + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 1 ] ) ); - PyDict_SetItemString( dict, ( std::string( "doors_l_" ) + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 2 ] ) ); - PyDict_SetItemString( dict, ( std::string( "doors_no_" ) + std::to_string( i + 1 ) ).c_str(), PyGetInt( iDoorNo[ i ] ) ); - PyDict_SetItemString( dict, ( std::string( "code_" ) + std::to_string( i + 1 ) ).c_str(), PyGetString( std::string( std::to_string( iUnits[ i ] ) + - cCode[ i ] ).c_str() ) ); - PyDict_SetItemString( dict, ( std::string( "car_name" ) + std::to_string( i + 1 ) ).c_str(), PyGetString( asCarName[ i ].c_str() ) ); - PyDict_SetItemString( dict, ( std::string( "slip_" ) + std::to_string( i + 1 )).c_str(), PyGetBool( bSlip[i]) ); + PyDict_SetItemString( dict, ( "doors_" + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 0 ] ) ); + PyDict_SetItemString( dict, ( "doors_r_" + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 1 ] ) ); + PyDict_SetItemString( dict, ( "doors_l_" + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 2 ] ) ); + PyDict_SetItemString( dict, ( "doors_no_" + std::to_string( i + 1 ) ).c_str(), PyGetInt( iDoorNo[ i ] ) ); + PyDict_SetItemString( dict, ( "code_" + std::to_string( i + 1 ) ).c_str(), PyGetString( ( std::to_string( iUnits[ i ] ) + cCode[ i ] ).c_str() ) ); + PyDict_SetItemString( dict, ( "car_name" + std::to_string( i + 1 ) ).c_str(), PyGetString( asCarName[ i ].c_str() ) ); + PyDict_SetItemString( dict, ( "slip_" + std::to_string( i + 1 ) ).c_str(), PyGetBool( bSlip[ i ] ) ); } // ai state data - auto const &driver = DynamicObject->Mechanik; + auto const *driver = DynamicObject->Mechanik; PyDict_SetItemString( dict, "velocity_desired", PyGetFloat( driver->VelDesired ) ); PyDict_SetItemString( dict, "velroad", PyGetFloat( driver->VelRoad ) ); @@ -530,7 +531,27 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "velsignalnext", PyGetFloat( driver->VelSignalNext ) ); PyDict_SetItemString( dict, "velnext", PyGetFloat( driver->VelNext ) ); PyDict_SetItemString( dict, "actualproximitydist", PyGetFloat( driver->ActualProximityDist ) ); + // train data PyDict_SetItemString( dict, "trainnumber", PyGetString( driver->TrainName().c_str() ) ); + PyDict_SetItemString( dict, "train_stationindex", PyGetInt( driver->StationIndex() ) ); + auto const stationcount { driver->StationCount() }; + PyDict_SetItemString( dict, "train_stationcount", PyGetInt( stationcount ) ); + if( stationcount > 0 ) { + // timetable stations data, if there's any + auto const *timetable { driver->TrainTimetable() }; + for( auto stationidx = 1; stationidx <= stationcount; ++stationidx ) { + auto const stationlabel { "train_station" + std::to_string( stationidx ) + "_" }; + auto const &timetableline { timetable->TimeTable[ stationidx ] }; + PyDict_SetItemString( dict, ( stationlabel + "name" ).c_str(), PyGetString( Bezogonkow( timetableline.StationName ).c_str() ) ); + PyDict_SetItemString( dict, ( stationlabel + "fclt" ).c_str(), PyGetString( Bezogonkow( timetableline.StationWare ).c_str() ) ); + PyDict_SetItemString( dict, ( stationlabel + "lctn" ).c_str(), PyGetFloat( timetableline.km ) ); + PyDict_SetItemString( dict, ( stationlabel + "vmax" ).c_str(), PyGetInt( timetableline.vmax ) ); + PyDict_SetItemString( dict, ( stationlabel + "ah" ).c_str(), PyGetInt( timetableline.Ah ) ); + PyDict_SetItemString( dict, ( stationlabel + "am" ).c_str(), PyGetInt( timetableline.Am ) ); + PyDict_SetItemString( dict, ( stationlabel + "dh" ).c_str(), PyGetInt( timetableline.Dh ) ); + PyDict_SetItemString( dict, ( stationlabel + "dm" ).c_str(), PyGetInt( timetableline.Dm ) ); + } + } // world state data PyDict_SetItemString( dict, "hours", PyGetInt( simulation::Time.data().wHour ) ); PyDict_SetItemString( dict, "minutes", PyGetInt( simulation::Time.data().wMinute ) ); diff --git a/messaging.cpp b/messaging.cpp index 41308f4d..f651d6c4 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -201,7 +201,7 @@ WyslijObsadzone() r.fPar[ 16 * i + 6 ] = vehicle->GetPosition().z; r.iPar[ 16 * i + 7 ] = vehicle->Mechanik->GetAction(); strcpy( r.cString + 64 * i + 32, vehicle->GetTrack()->IsolatedName().c_str() ); - strcpy( r.cString + 64 * i + 48, vehicle->Mechanik->Timetable()->TrainName.c_str() ); + strcpy( r.cString + 64 * i + 48, vehicle->Mechanik->TrainName().c_str() ); i++; if( i > 30 ) break; } diff --git a/mtable.cpp b/mtable.cpp index 90e77d9d..b92d10b4 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -14,26 +14,6 @@ http://mozilla.org/MPL/2.0/. #include "world.h" #include "utilities.h" -double CompareTime(double t1h, double t1m, double t2h, double t2m) /*roznica czasu w minutach*/ -// zwraca różnicę czasu -// jeśli pierwsza jest aktualna, a druga rozkładowa, to ujemna oznacza opóżnienie -// na dłuższą metę trzeba uwzględnić datę, jakby opóżnienia miały przekraczać 12h (towarowych) -{ - double t; - - if ((t2h < 0)) - return 0; - else - { - t = (t2h - t1h) * 60 + t2m - t1m; // jeśli t2=00:05, a t1=23:50, to różnica wyjdzie ujemna - if ((t < -720)) // jeśli różnica przekracza 12h na minus - t = t + 1440; // to dodanie doby minut;else - if ((t > 720)) // jeśli przekracza 12h na plus - t = t - 1440; // to odjęcie doby minut - return t; - } -} - double TTrainParameters::CheckTrainLatency() { if ((LastStationLatency > 1.0) || (LastStationLatency < 0)) @@ -178,18 +158,7 @@ void TTrainParameters::NewName(std::string const &NewTrainName) Relation2 = ""; for (int i = 0; i < MaxTTableSize + 1; ++i) { - TMTableLine *t = &TimeTable[i]; - t->km = 0; - t->vmax = -1; - t->StationName = "nowhere"; - t->StationWare = ""; - t->TrackNo = 1; - t->Ah = -1; - t->Am = -1; - t->Dh = -1; - t->Dm = -1; - t->tm = 0; - t->WaitTime = 0; + TimeTable[ i ] = TMTableLine(); } TTVmax = 100; /*wykasowac*/ BrakeRatio = 0; @@ -387,15 +356,12 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) { if (s.find(hrsd) != std::string::npos) { - record->Ah = atoi( - s.substr(0, s.find(hrsd)).c_str()); // godzina przyjazdu - record->Am = atoi(s.substr(s.find(hrsd) + 1, s.length()) - .c_str()); // minuta przyjazdu + record->Ah = atoi( s.substr(0, s.find(hrsd)).c_str()); // godzina przyjazdu + record->Am = atoi(s.substr(s.find(hrsd) + 1, s.length()).c_str()); // minuta przyjazdu } else { - record->Ah = TimeTable[StationCount - 1] - .Ah; // godzina z poprzedniej pozycji + record->Ah = TimeTable[StationCount - 1].Ah; // godzina z poprzedniej pozycji record->Am = atoi(s.c_str()); // bo tylko minuty podane } } @@ -440,29 +406,20 @@ bool TTrainParameters::LoadTTfile(std::string scnpath, int iPlus, double vmax) { if (s.find(hrsd) != std::string::npos) { - record->Dh = - atoi(s.substr(0, s.find(hrsd)).c_str()); // godzina odjazdu - record->Dm = atoi(s.substr(s.find(hrsd) + 1, s.length()) - .c_str()); // minuta odjazdu + record->Dh = atoi(s.substr(0, s.find(hrsd)).c_str()); // godzina odjazdu + record->Dm = atoi(s.substr(s.find(hrsd) + 1, s.length()).c_str()); // minuta odjazdu } else { - record->Dh = TimeTable[StationCount - 1] - .Dh; // godzina z poprzedniej pozycji + record->Dh = TimeTable[StationCount - 1].Dh; // godzina z poprzedniej pozycji record->Dm = atoi(s.c_str()); // bo tylko minuty podane } } else { - record->Dh = record->Ah; // odjazd o tej samej, co przyjazd (dla - // ostatniego też) - record->Dm = record->Am; // bo są używane do wyliczenia opóźnienia - // po dojechaniu + record->Dh = record->Ah; // odjazd o tej samej, co przyjazd (dla ostatniego też) + record->Dm = record->Am; // bo są używane do wyliczenia opóźnienia po dojechaniu } - if ((record->Ah >= 0)) - record->WaitTime = (int)(CompareTime(record->Ah, record->Am, - record->Dh, record->Dm) + - 0.1); do { fin >> s; diff --git a/mtable.h b/mtable.h index 458162a2..abdb9449 100644 --- a/mtable.h +++ b/mtable.h @@ -36,15 +36,14 @@ struct TMTableLine int Dh; int Dm; // godz. i min. odjazdu double tm; // czas jazdy do tej stacji w min. (z kolumny) - int WaitTime; // czas postoju (liczony plus 6 sekund) TMTableLine() { km = 0; vmax = -1; StationName = "nowhere", StationWare = ""; TrackNo = 1; - Ah, Am, Dh, Dm = -1; - WaitTime, tm = 0; + Ah = Am = Dh = Dm = -1; + tm = 0; } }; diff --git a/uilayer.cpp b/uilayer.cpp index da030c78..f0581dc4 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -323,7 +323,7 @@ ui_layer::update() { vehicle->ctOwner ); if( owner == nullptr ){ break; } - auto const table = owner->Timetable(); + auto const *table = owner->TrainTimetable(); if( table == nullptr ) { break; } auto const &time = simulation::Time.data(); @@ -336,7 +336,7 @@ ui_layer::update() { uitextline1 += " (paused)"; } - uitextline2 = Bezogonkow( owner->Relation(), true ) + " (" + Bezogonkow( owner->Timetable()->TrainName, true ) + ")"; + uitextline2 = Bezogonkow( owner->Relation(), true ) + " (" + Bezogonkow( owner->TrainName(), true ) + ")"; auto const nextstation = Bezogonkow( owner->NextStop(), true ); if( !nextstation.empty() ) { // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania @@ -351,37 +351,62 @@ ui_layer::update() { } else { // header - UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global.UITextColor ); + UITable->text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); - TMTableLine *tableline; - for( int i = owner->iStationStart; i <= std::min( owner->iStationStart + 15, table->StationCount ); ++i ) { + TMTableLine const *tableline; + for( int i = owner->iStationStart; i <= std::min( owner->iStationStart + 10, table->StationCount ); ++i ) { // wyświetlenie pozycji z rozkładu tableline = table->TimeTable + i; // linijka rozkładu - std::string station = - ( tableline->StationName + " " ).substr( 0, 26 ); - std::string arrival = - ( tableline->Ah >= 0 ? - to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : - " " ); - std::string departure = - ( tableline->Dh >= 0 ? - to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : - " " ); std::string vmax = " " + to_string( tableline->vmax, 0 ); - vmax = vmax.substr( vmax.length() - 3, 3 ); // z wyrównaniem do prawej + vmax = vmax.substr( vmax.size() - 3, 3 ); // z wyrównaniem do prawej + std::string const station = ( + Bezogonkow( tableline->StationName, true ) + + " " ) + .substr( 0, 34 ); + std::string const location = ( + ( tableline->km > 0.0 ? + to_string( tableline->km, 2 ) : + "" ) + + " " ) + .substr( 0, 34 - tableline->StationWare.size() ); + std::string const arrival = ( + tableline->Ah >= 0 ? + to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : + " | " ); + std::string const departure = ( + tableline->Dh >= 0 ? + to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : + " | " ); + auto const candeparture = ( + ( owner->iStationStart < table->StationIndex ) + && ( i < table->StationIndex ) + && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ); + auto traveltime = + " " + + ( i < 2 ? "" : + tableline->Ah >= 0 ? to_string( CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Ah, tableline->Am ), 0 ) : + to_string( std::max( 0.0, CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Dh, tableline->Dm ) - 0.5 ), 0 ) ); + traveltime = traveltime.substr( traveltime.size() - 3, 3 ); // z wyrównaniem do prawej UITable->text_lines.emplace_back( - Bezogonkow( "| " + station + " | " + arrival + " | " + departure + " | " + vmax + " | " + tableline->StationWare, true ), - ( ( owner->iStationStart < table->StationIndex ) - && ( i < table->StationIndex ) - && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ? + ( "| " + vmax + " | " + station + " | " + arrival + " | " + traveltime + " |" ), + ( candeparture ? + glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono + Global.UITextColor ) ); + UITable->text_lines.emplace_back( + ( "| | " + location + tableline->StationWare + " | " + departure + " | |" ), + ( candeparture ? glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono Global.UITextColor ) ); // divider/footer - UITable->text_lines.emplace_back( "+----------------------------+-------+-------+-----+", Global.UITextColor ); + UITable->text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); + } + if( owner->iStationStart + 10 < table->StationCount ) { + // if we can't display entire timetable, add a scrolling indicator at the bottom + UITable->text_lines.emplace_back( " ... ", Global.UITextColor ); } } } diff --git a/utilities.cpp b/utilities.cpp index 8e3475ac..18de7454 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -58,6 +58,26 @@ std::string Now() { return converter.str(); } +// zwraca różnicę czasu +// jeśli pierwsza jest aktualna, a druga rozkładowa, to ujemna oznacza opóżnienie +// na dłuższą metę trzeba uwzględnić datę, jakby opóżnienia miały przekraczać 12h (towarowych) +double CompareTime(double t1h, double t1m, double t2h, double t2m) { + + double t; + + if ((t2h < 0)) + return 0; + else + { + t = (t2h - t1h) * 60 + t2m - t1m; // jeśli t2=00:05, a t1=23:50, to różnica wyjdzie ujemna + if ((t < -720)) // jeśli różnica przekracza 12h na minus + t = t + 1440; // to dodanie doby minut;else + if ((t > 720)) // jeśli przekracza 12h na plus + t = t - 1440; // to odjęcie doby minut + return t; + } +} + bool SetFlag( int &Flag, int const Value ) { if( Value > 0 ) { diff --git a/utilities.h b/utilities.h index 26918a8b..856f2de8 100644 --- a/utilities.h +++ b/utilities.h @@ -78,6 +78,8 @@ inline double BorlandTime() std::string Now(); +double CompareTime( double t1h, double t1m, double t2h, double t2m ); + /*funkcje logiczne*/ inline bool TestFlag( int const Flag, int const Value ) { return ( ( Flag & Value ) == Value ); } bool SetFlag( int &Flag, int const Value); diff --git a/version.h b/version.h index cf8ca48a..9878d37c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 515 +#define VERSION_MINOR 516 #define VERSION_REVISION 0 From 6fd7dfc2feb88fb9980a5867984f10415b5d3a34 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 18 May 2018 19:58:46 +0200 Subject: [PATCH 327/426] door and doorstep animations sync, temperature values included in the physics log --- Driver.cpp | 61 ++++++++++++++++++++++----------- DynObj.cpp | 88 +++++++++++++++++++++++++++++++++++++++++------- McZapkie/MOVER.h | 2 +- Train.cpp | 8 ++--- Train.h | 10 +++--- uilayer.cpp | 4 +-- 6 files changed, 129 insertions(+), 44 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 4983f077..66fb8835 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1535,12 +1535,15 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, LogFile.open( std::string( "physicslog/" + VehicleName + ".dat" ), std::ios::in | std::ios::out | std::ios::trunc ); #if LOGPRESS == 0 - LogFile << std::string( " Time [s] Velocity [m/s] Acceleration [m/ss] Coupler.Dist[m] " - "Coupler.Force[N] TractionForce [kN] FrictionForce [kN] " - "BrakeForce [kN] BrakePress [MPa] PipePress [MPa] " - "MotorCurrent [A] MCP SCP BCP LBP DmgFlag Command CVal1 CVal2" ) - .c_str() + LogFile + << "Time[s] Velocity[m/s] Acceleration[m/ss] " + << "Coupler.Dist[m] Coupler.Force[N] TractionForce[kN] FrictionForce[kN] BrakeForce[kN] " + << "BrakePress[MPa] PipePress[MPa] MotorCurrent[A] " + << "MCP SCP BCP LBP Direction Command CVal1 CVal2 " + << "Security Wheelslip " + << "EngineTemp[Deg] OilTemp[Deg] WaterTemp[Deg] WaterAuxTemp[Deg]" << "\r\n"; + LogFile << std::fixed << std::setprecision( 4 ); #endif #if LOGPRESS == 1 LogFile << string( "t\tVel\tAcc\tPP\tVVP\tBP\tBVP\tCVP" ).c_str() << "\n"; @@ -3539,20 +3542,40 @@ void TController::PhysicsLog() if (LogFile.is_open()) { #if LOGPRESS == 0 - LogFile << ElapsedTime << " " << fabs(11.31 * mvOccupied->WheelDiameter * mvOccupied->nrot) - << " "; - LogFile << mvControlling->AccS << " " << mvOccupied->Couplers[1].Dist << " " - << mvOccupied->Couplers[1].CForce << " "; - LogFile << mvOccupied->Ft << " " << mvOccupied->Ff << " " << mvOccupied->Fb << " " - << mvOccupied->BrakePress << " "; - LogFile << mvOccupied->PipePress << " " << mvControlling->Im << " " - << int(mvControlling->MainCtrlPos) << " "; - LogFile << int(mvControlling->ScndCtrlPos) << " " << int(mvOccupied->BrakeCtrlPos) - << " " << int(mvOccupied->LocalBrakePos) << " "; - LogFile << int(mvControlling->ActiveDir) << " " << mvOccupied->CommandIn.Command.c_str() - << " " << mvOccupied->CommandIn.Value1 << " "; - LogFile << mvOccupied->CommandIn.Value2 << " " << int(mvControlling->SecuritySystem.Status) - << " " << int(mvControlling->SlippingWheels) << "\r\n"; +/* +<< "Time[s] Velocity[m/s] Acceleration[m/ss] " +<< "Coupler.Dist[m] Coupler.Force[N] TractionForce[kN] FrictionForce[kN] BrakeForce[kN] " +<< "BrakePress[MPa] PipePress[MPa] MotorCurrent[A] " +<< "MCP SCP BCP LBP DmgFlag Command CVal1 CVal2 " +<< "EngineTemp[Deg] OilTemp[Deg] WaterTemp[Deg] WaterAuxTemp[Deg]" +*/ + LogFile + << ElapsedTime << " " + << fabs(11.31 * mvOccupied->WheelDiameter * mvOccupied->nrot) << " " + << mvControlling->AccS << " " + << mvOccupied->Couplers[1].Dist << " " + << mvOccupied->Couplers[1].CForce << " " + << mvOccupied->Ft << " " + << mvOccupied->Ff << " " + << mvOccupied->Fb << " " + << mvOccupied->BrakePress << " " + << mvOccupied->PipePress << " " + << mvControlling->Im << " " + << int(mvControlling->MainCtrlPos) << " " + << int(mvControlling->ScndCtrlPos) << " " + << int(mvOccupied->BrakeCtrlPos) << " " + << int(mvOccupied->LocalBrakePos) << " " + << int(mvControlling->ActiveDir) << " " + << ( mvOccupied->CommandIn.Command.empty() ? "none" : mvOccupied->CommandIn.Command.c_str() ) << " " + << mvOccupied->CommandIn.Value1 << " " + << mvOccupied->CommandIn.Value2 << " " + << int(mvControlling->SecuritySystem.Status) << " " + << int(mvControlling->SlippingWheels) << " " + << mvControlling->dizel_heat.Ts << " " + << mvControlling->dizel_heat.To << " " + << mvControlling->dizel_heat.temperatura1 << " " + << mvControlling->dizel_heat.temperatura2 + << "\r\n"; #endif #if LOGPRESS == 1 LogFile << ElapsedTime << "\t" << fabs(11.31 * mvOccupied->WheelDiameter * mvOccupied->nrot) diff --git a/DynObj.cpp b/DynObj.cpp index 47593521..f28294a0 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3632,14 +3632,31 @@ bool TDynamicObject::Update(double dt, double dt1) } // NBMX Obsluga drzwi, MC: zuniwersalnione + // TODO: fully generalized door assembly if( ( dDoorMoveL < MoverParameters->DoorMaxShiftL ) && ( true == MoverParameters->DoorLeftOpened ) ) { - dDoorMoveL += dt1 * MoverParameters->DoorOpenSpeed; - dDoorMoveL = std::min( dDoorMoveL, MoverParameters->DoorMaxShiftL ); + // open left door + if( ( MoverParameters->TrainType == dt_EZT ) + || ( MoverParameters->TrainType == dt_DMU ) ) { + // multi-unit vehicles typically open door only after unfolding the doorstep + if( ( MoverParameters->PlatformMaxShift == 0.0 ) // no wait if no doorstep + || ( MoverParameters->PlatformOpenMethod == 2 ) // no wait for rotating doorstep + || ( dDoorstepMoveL == 1.0 ) ) { + dDoorMoveL = std::min( + MoverParameters->DoorMaxShiftL, + dDoorMoveL + MoverParameters->DoorOpenSpeed * dt1 ); + } + } + else { + dDoorMoveL = std::min( + MoverParameters->DoorMaxShiftL, + dDoorMoveL + MoverParameters->DoorOpenSpeed * dt1 ); + } DoorDelayL = 0.f; } if( ( dDoorMoveL > 0.0 ) && ( false == MoverParameters->DoorLeftOpened ) ) { + // close left door DoorDelayL += dt1; if( DoorDelayL > MoverParameters->DoorCloseDelay ) { dDoorMoveL -= dt1 * MoverParameters->DoorCloseSpeed; @@ -3648,12 +3665,28 @@ bool TDynamicObject::Update(double dt, double dt1) } if( ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) && ( true == MoverParameters->DoorRightOpened ) ) { - dDoorMoveR += dt1 * MoverParameters->DoorOpenSpeed; - dDoorMoveR = std::min( dDoorMoveR, MoverParameters->DoorMaxShiftR ); + // open right door + if( ( MoverParameters->TrainType == dt_EZT ) + || ( MoverParameters->TrainType == dt_DMU ) ) { + // multi-unit vehicles typically open door only after unfolding the doorstep + if( ( MoverParameters->PlatformMaxShift == 0.0 ) // no wait if no doorstep + || ( MoverParameters->PlatformOpenMethod == 2 ) // no wait for rotating doorstep + || ( dDoorstepMoveR == 1.0 ) ) { + dDoorMoveR = std::min( + MoverParameters->DoorMaxShiftR, + dDoorMoveR + MoverParameters->DoorOpenSpeed * dt1 ); + } + } + else { + dDoorMoveR = std::min( + MoverParameters->DoorMaxShiftR, + dDoorMoveR + MoverParameters->DoorOpenSpeed * dt1 ); + } DoorDelayR = 0.f; } if( ( dDoorMoveR > 0.0 ) && ( false == MoverParameters->DoorRightOpened ) ) { + // close right door DoorDelayR += dt1; if( DoorDelayR > MoverParameters->DoorCloseDelay ) { dDoorMoveR -= dt1 * MoverParameters->DoorCloseSpeed; @@ -3663,6 +3696,7 @@ bool TDynamicObject::Update(double dt, double dt1) // doorsteps if( ( dDoorstepMoveL < 1.0 ) && ( true == MoverParameters->DoorLeftOpened ) ) { + // unfold left doorstep dDoorstepMoveL = std::min( 1.0, dDoorstepMoveL + MoverParameters->PlatformSpeed * dt1 ); @@ -3670,12 +3704,25 @@ bool TDynamicObject::Update(double dt, double dt1) if( ( dDoorstepMoveL > 0.0 ) && ( false == MoverParameters->DoorLeftOpened ) && ( DoorDelayL > MoverParameters->DoorCloseDelay ) ) { - dDoorstepMoveL = std::max( - 0.0, - dDoorstepMoveL - MoverParameters->PlatformSpeed * dt1 ); + // fold left doorstep + if( ( MoverParameters->TrainType == dt_EZT ) + || ( MoverParameters->TrainType == dt_DMU ) ) { + // multi-unit vehicles typically fold the doorstep only after closing the door + if( dDoorMoveL == 0.0 ) { + dDoorstepMoveL = std::max( + 0.0, + dDoorstepMoveL - MoverParameters->PlatformSpeed * dt1 ); + } + } + else { + dDoorstepMoveL = std::max( + 0.0, + dDoorstepMoveL - MoverParameters->PlatformSpeed * dt1 ); + } } if( ( dDoorstepMoveR < 1.0 ) && ( true == MoverParameters->DoorRightOpened ) ) { + // unfold right doorstep dDoorstepMoveR = std::min( 1.0, dDoorstepMoveR + MoverParameters->PlatformSpeed * dt1 ); @@ -3683,9 +3730,21 @@ bool TDynamicObject::Update(double dt, double dt1) if( ( dDoorstepMoveR > 0.0 ) && ( false == MoverParameters->DoorRightOpened ) && ( DoorDelayR > MoverParameters->DoorCloseDelay ) ) { - dDoorstepMoveR = std::max( - 0.0, - dDoorstepMoveR - MoverParameters->PlatformSpeed * dt1 ); + // fold right doorstep + if( ( MoverParameters->TrainType == dt_EZT ) + || ( MoverParameters->TrainType == dt_DMU ) ) { + // multi-unit vehicles typically fold the doorstep only after closing the door + if( dDoorMoveR == 0.0 ) { + dDoorstepMoveR = std::max( + 0.0, + dDoorstepMoveR - MoverParameters->PlatformSpeed * dt1 ); + } + } + else { + dDoorstepMoveR = std::max( + 0.0, + dDoorstepMoveR - MoverParameters->PlatformSpeed * dt1 ); + } } // mirrors if( MoverParameters->Vel > 5.0 ) { @@ -4044,10 +4103,13 @@ void TDynamicObject::RenderSounds() { } } // NBMX Obsluga drzwi, MC: zuniwersalnione + // TODO: fully generalized door assembly if( true == MoverParameters->DoorLeftOpened ) { // open left door // door sounds - if( dDoorMoveL < MoverParameters->DoorMaxShiftL ) { + // due to potential wait for the doorstep we play the sound only during actual animation + if( ( dDoorMoveL > 0.0 ) + && ( dDoorMoveL < MoverParameters->DoorMaxShiftL ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x > 0.f ) { // determine left side doors from their offset @@ -4094,7 +4156,9 @@ void TDynamicObject::RenderSounds() { if( true == MoverParameters->DoorRightOpened ) { // open right door // door sounds - if( dDoorMoveR < MoverParameters->DoorMaxShiftR ) { + // due to potential wait for the doorstep we play the sound only during actual animation + if( ( dDoorMoveR > 0.0 ) + && ( dDoorMoveR < MoverParameters->DoorMaxShiftR ) ) { for( auto &door : m_doorsounds ) { if( door.rsDoorClose.offset().x < 0.f ) { // determine right side doors from their offset diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index ecf35362..36ef0e90 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -947,7 +947,7 @@ public: int DoorOpenMethod = 2; /*sposob otwarcia - 1: przesuwne, 2: obrotowe, 3: trójelementowe*/ float DoorCloseDelay { 0.f }; // delay (in seconds) before the door begin closing, once conditions to close are met double PlatformSpeed = 0.5; /*szybkosc stopnia*/ - double PlatformMaxShift { 45.0 }; /*wysuniecie stopnia*/ + double PlatformMaxShift { 0.0 }; /*wysuniecie stopnia*/ int PlatformOpenMethod { 2 }; /*sposob animacji stopnia*/ double MirrorMaxShift { 90.0 }; bool ScndS = false; /*Czy jest bocznikowanie na szeregowej*/ diff --git a/Train.cpp b/Train.cpp index 292d9087..94d79a80 100644 --- a/Train.cpp +++ b/Train.cpp @@ -335,9 +335,7 @@ std::vector const TTrain::fPress_labels = { }; TTrain::TTrain() { -/* - Universal4Active = false; -*/ + ShowNextCurrent = false; // McZapkie-240302 - przyda sie do tachometru fTachoVelocity = 0; @@ -428,10 +426,10 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) PyObject *TTrain::GetTrainState() { - auto const &mover = DynamicObject->MoverParameters; + auto const *mover = DynamicObject->MoverParameters; auto *dict = PyDict_New(); if( ( dict == nullptr ) - || ( mover == nullptr ) ) { + || ( mover == nullptr ) ) { return nullptr; } diff --git a/Train.h b/Train.h index b5bbd429..5e1ff929 100644 --- a/Train.h +++ b/Train.h @@ -310,11 +310,11 @@ class TTrain static void OnCommand_generictoggle( TTrain *Train, command_data const &Command ); // members - TDynamicObject *DynamicObject; // przestawia zmiana pojazdu [F5] - TMoverParameters *mvControlled; // człon, w którym sterujemy silnikiem - TMoverParameters *mvOccupied; // człon, w którym sterujemy hamulcem - TMoverParameters *mvSecond; // drugi człon (ET40, ET41, ET42, ukrotnienia) - TMoverParameters *mvThird; // trzeci człon (SN61) + TDynamicObject *DynamicObject { nullptr }; // przestawia zmiana pojazdu [F5] + TMoverParameters *mvControlled { nullptr }; // człon, w którym sterujemy silnikiem + TMoverParameters *mvOccupied { nullptr }; // człon, w którym sterujemy hamulcem + TMoverParameters *mvSecond { nullptr }; // drugi człon (ET40, ET41, ET42, ukrotnienia) + TMoverParameters *mvThird { nullptr }; // trzeci człon (SN61) // helper variable, to prevent immediate switch between closing and opening line breaker circuit int m_linebreakerstate { 0 }; // 0: open, 1: closed, 2: freshly closed (and yes this is awful way to go about it) static const commandhandler_map m_commandhandlers; diff --git a/uilayer.cpp b/uilayer.cpp index f0581dc4..15eee48b 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -950,7 +950,7 @@ ui_layer::render() { glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); + glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); // blendfunc included since 3rd party gui doesn't play nice glDisable( GL_LIGHTING ); glDisable( GL_DEPTH_TEST ); glDisable( GL_ALPHA_TEST ); @@ -973,7 +973,7 @@ ui_layer::render() { render_panels(); render_tooltip(); - glPopAttrib(); + glPopAttrib(); } void From e12529243dcd450b0e4423e2b7dd0b12fddaac81 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 21 May 2018 03:34:01 +0200 Subject: [PATCH 328/426] vehicle mesh load fail crash fix, material and texture loading tweaks, minor bug fixes --- DynObj.cpp | 176 ++++++++++++++++++++++++++++----------------------- Model3d.cpp | 8 ++- Texture.cpp | 4 ++ Train.cpp | 31 +++++++-- material.cpp | 35 ++++++---- uilayer.cpp | 2 +- 6 files changed, 158 insertions(+), 98 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index f28294a0..86ddbc83 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -40,6 +40,16 @@ std::string const TDynamicObject::MED_labels[] = { bool TDynamicObject::bDynamicRemove { false }; +// helper, locates submodel with specified name in specified 3d model; returns: pointer to the submodel, or null +TSubModel * +GetSubmodelFromName( TModel3d * const Model, std::string const Name ) { + + return ( + Model ? + Model->GetFromName( Name ) : + nullptr ); +} + //--------------------------------------------------------------------------- void TAnimPant::AKP_4E() { // ustawienie wymiarów dla pantografu AKP-4E @@ -4421,7 +4431,7 @@ void TDynamicObject::RenderSounds() { // wczytywanie pliku z danymi multimedialnymi (dzwieki) void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, std::string ReplacableSkin ) { - double dSDist; + replace_slashes( BaseDir ); Global.asCurrentDynamicPath = BaseDir; std::string asFileName = BaseDir + TypeName + ".mmd"; std::string asLoadName; @@ -4469,10 +4479,9 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, asModel = BaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje modele w dynamics/basedir Global.asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... mdModel = TModelsManager::GetModel(asModel, true); - assert( mdModel != nullptr ); // TODO: handle this more gracefully than all going to shit if (ReplacableSkin != "none") { - std::string nowheretexture = TextureTest(Global.asCurrentTexturePath + "nowhere"); // na razie prymitywnie + std::string nowheretexture = TextureTest( Global.asCurrentTexturePath + "nowhere" ); // na razie prymitywnie if( false == nowheretexture.empty() ) { m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Material( nowheretexture ); } @@ -4486,8 +4495,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, int skinindex = 0; std::string texturename; nameparser >> texturename; while( ( texturename != "" ) && ( skinindex < 4 ) ) { - erase_extension( texturename ); - m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + texturename ); + m_materialdata.replacable_skins[ skinindex + 1 ] = GfxRenderer.Fetch_Material( texturename ); ++skinindex; texturename = ""; nameparser >> texturename; } @@ -4498,7 +4506,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, erase_extension( ReplacableSkin ); int skinindex = 0; do { - material_handle material = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + ReplacableSkin + "," + std::to_string( skinindex + 1 ), true ); + material_handle material = GfxRenderer.Fetch_Material( ReplacableSkin + "," + std::to_string( skinindex + 1 ), true ); if( material == null_handle ) { break; } @@ -4508,12 +4516,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_materialdata.multi_textures = skinindex; if( m_materialdata.multi_textures == 0 ) { // zestaw nie zadziałał, próbujemy normanie - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + ReplacableSkin ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( ReplacableSkin ); } } } else { - m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( Global.asCurrentTexturePath + ReplacableSkin ); + m_materialdata.replacable_skins[ 1 ] = GfxRenderer.Fetch_Material( ReplacableSkin ); } if( GfxRenderer.Material( m_materialdata.replacable_skins[ 1 ] ).has_alpha ) { // tekstura -1 z kanałem alfa - nie renderować w cyklu nieprzezroczystych @@ -4641,6 +4649,11 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // ABu: wnetrze lowpoly parser.getTokens(); parser >> asModel; + replace_slashes( asModel ); + if( asModel[ 0 ] == '/' ) { + // filename can potentially begin with a slash, and we don't need it + asModel.erase( 0, 1 ); + } asModel = BaseDir + asModel; // McZapkie-200702 - dynamics maja swoje modele w dynamic/basedir Global.asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... mdLowPolyInt = TModelsManager::GetModel(asModel, true); @@ -4650,7 +4663,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // Ra 15-01: gałka nastawy hamulca parser.getTokens(); parser >> asAnimName; - smBrakeMode = mdModel->GetFromName(asAnimName); + smBrakeMode = GetSubmodelFromName( mdModel, asAnimName ); // jeszcze wczytać kąty obrotu dla poszczególnych ustawień } @@ -4658,7 +4671,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // Ra 15-01: gałka nastawy hamulca parser.getTokens(); parser >> asAnimName; - smLoadMode = mdModel->GetFromName(asAnimName); + smLoadMode = GetSubmodelFromName( mdModel, asAnimName ); // jeszcze wczytać kąty obrotu dla poszczególnych ustawień } @@ -4670,7 +4683,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, for (i = 0; i < iAnimType[ANIM_WHEELS]; ++i) // liczba osi { // McZapkie-050402: wyszukiwanie kol o nazwie str* asAnimName = token + std::to_string(i + 1); - pAnimations[i].smAnimated = mdModel->GetFromName(asAnimName); // ustalenie submodelu + pAnimations[i].smAnimated = GetSubmodelFromName( mdModel, asAnimName ); if (pAnimations[i].smAnimated) { //++iAnimatedAxles; pAnimations[i].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu @@ -4733,7 +4746,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, for (int i = 0; i < iAnimType[ANIM_PANTS]; i++) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* asAnimName = token + std::to_string(i + 1); - sm = mdModel->GetFromName(asAnimName); + sm = GetSubmodelFromName( mdModel, asAnimName ); pants[i].smElement[0] = sm; // jak NULL, to nie będzie animowany if (sm) { // w EP09 wywalało się tu z powodu NULL @@ -4742,27 +4755,22 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // m(3)[1]=m[3][1]+0.054; //w górę o wysokość ślizgu (na razie tak) if ((mdModel->Flags() & 0x8000) == 0) // jeśli wczytano z T3D m.InitialRotate(); // może być potrzebny dodatkowy obrót, jeśli wczytano z T3D, tzn. przed wykonaniem Init() - pants[i].fParamPants->vPos.z = - m[3][0]; // przesunięcie w bok (asymetria) - pants[i].fParamPants->vPos.y = - m[3][1]; // przesunięcie w górę odczytane z modelu + pants[i].fParamPants->vPos.z = m[3][0]; // przesunięcie w bok (asymetria) + pants[i].fParamPants->vPos.y = m[3][1]; // przesunięcie w górę odczytane z modelu if ((sm = pants[i].smElement[0]->ChildGet()) != NULL) { // jeśli ma potomny, można policzyć długość (odległość potomnego od osi obrotu) m = float4x4(*sm->GetMatrix()); // wystarczyłby wskaźnik, nie trzeba kopiować // może trzeba: pobrać macierz dolnego ramienia, wyzerować przesunięcie, przemnożyć przez macierz górnego pants[i].fParamPants->fHoriz = -fabs(m[3][1]); - pants[i].fParamPants->fLenL1 = - hypot(m[3][1], m[3][2]); // po osi OX nie potrzeba - pants[i].fParamPants->fAngleL0 = - atan2(fabs(m[3][2]), fabs(m[3][1])); + pants[i].fParamPants->fLenL1 = hypot(m[3][1], m[3][2]); // po osi OX nie potrzeba + pants[i].fParamPants->fAngleL0 = atan2(fabs(m[3][2]), fabs(m[3][1])); // if (pants[i].fParamPants->fAngleL0fAngleL0+=M_PI; //gdyby w odwrotną stronę wyszło // if // ((pants[i].fParamPants->fAngleL0<0.03)||(pants[i].fParamPants->fAngleL0>0.09)) // //normalnie ok. 0.05 // pants[i].fParamPants->fAngleL0=pants[i].fParamPants->fAngleL; - pants[i].fParamPants->fAngleL = pants[i].fParamPants->fAngleL0; // początkowy kąt dolnego - // ramienia + pants[i].fParamPants->fAngleL = pants[i].fParamPants->fAngleL0; // początkowy kąt dolnego ramienia if ((sm = sm->ChildGet()) != NULL) { // jeśli dalej jest ślizg, można policzyć długość górnego ramienia m = float4x4(*sm->GetMatrix()); // wystarczyłby wskaźnik, @@ -4788,12 +4796,9 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, float det = Det(m); if (std::fabs(det - 1.0) < 0.001) // dopuszczamy 1 promil błędu na skalowaniu ślizgu { // skalowanie jest w normie, można pobrać wymiary z modelu - pants[i].fParamPants->fHeight = - sm->MaxY(m); // przeliczenie maksimum wysokości wierzchołków względem macierzy - pants[i].fParamPants->fHeight -= - m[3][1]; // odjęcie wysokości pivota ślizgu - pants[i].fParamPants->vPos.x = - m[3][2]; // przy okazji odczytać z modelu pozycję w długości + pants[i].fParamPants->fHeight = sm->MaxY(m); // przeliczenie maksimum wysokości wierzchołków względem macierzy + pants[i].fParamPants->fHeight -= m[3][1]; // odjęcie wysokości pivota ślizgu + pants[i].fParamPants->vPos.x = m[3][2]; // przy okazji odczytać z modelu pozycję w długości // ErrorLog("Model OK: "+asModel+", // height="+pants[i].fParamPants->fHeight); // ErrorLog("Model OK: "+asModel+", @@ -4801,8 +4806,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else { // gdy ktoś przesadził ze skalowaniem - pants[i].fParamPants->fHeight = - 0.0; // niech będzie odczyt z pantfactors: + pants[i].fParamPants->fHeight = 0.0; // niech będzie odczyt z pantfactors: ErrorLog( "Bad model: " + asModel + ", scale of " + (sm->pName) + " is " + std::to_string(100.0 * det) + "%", logtype::model ); @@ -4810,8 +4814,11 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } } } - else - ErrorLog("Bad model: " + asFileName + " - missed submodel " + asAnimName, logtype::model); // brak ramienia + else { + // brak ramienia + pants[ i ].fParamPants->fHeight = 0.0; // niech będzie odczyt z pantfactors: + ErrorLog( "Bad model: " + asFileName + " - missed submodel " + asAnimName, logtype::model ); + } } } @@ -4824,7 +4831,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* asAnimName = token + std::to_string( i + 1 ); - sm = mdModel->GetFromName( asAnimName ); + sm = GetSubmodelFromName( mdModel, asAnimName ); pants[ i ].smElement[ 1 ] = sm; // jak NULL, to nie będzie animowany if( sm ) { // w EP09 wywalało się tu z powodu NULL sm->WillBeAnimated(); @@ -4853,43 +4860,49 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, else if( token == "animpantrg1prefix:" ) { // prefiks ramion górnych 1 parser.getTokens(); parser >> token; - if( pants ) { - for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { + if( pants ) { + for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* - asAnimName = token + std::to_string( i + 1 ); - pants[ i ].smElement[ 2 ] = mdModel->GetFromName( asAnimName ); - pants[ i ].smElement[ 2 ]->WillBeAnimated(); - } + asAnimName = token + std::to_string( i + 1 ); + pants[ i ].smElement[ 2 ] = GetSubmodelFromName( mdModel, asAnimName ); + if( pants[ i ].smElement[ 2 ] ) { + pants[ i ].smElement[ 2 ]->WillBeAnimated(); + } } + } } else if( token == "animpantrg2prefix:" ) { // prefiks ramion górnych 2 - parser.getTokens(); parser >> token; - if( pants ) { - for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { + parser.getTokens(); parser >> token; + if( pants ) { + for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* - asAnimName = token + std::to_string( i + 1 ); - pants[ i ].smElement[ 3 ] = mdModel->GetFromName( asAnimName ); - pants[ i ].smElement[ 3 ]->WillBeAnimated(); - } + asAnimName = token + std::to_string( i + 1 ); + pants[ i ].smElement[ 3 ] = GetSubmodelFromName( mdModel, asAnimName ); + if( pants[ i ].smElement[ 3 ] ) { + pants[ i ].smElement[ 3 ]->WillBeAnimated(); + } } + } } else if( token == "animpantslprefix:" ) { // prefiks ślizgaczy parser.getTokens(); parser >> token; - if( pants ) { - for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { + if( pants ) { + for( int i = 0; i < iAnimType[ ANIM_PANTS ]; i++ ) { // Winger 160204: wyszukiwanie max 2 patykow o nazwie str* - asAnimName = token + std::to_string( i + 1 ); - pants[ i ].smElement[ 4 ] = mdModel->GetFromName( asAnimName ); - pants[ i ].smElement[ 4 ]->WillBeAnimated(); - pants[ i ].yUpdate = std::bind( &TDynamicObject::UpdatePant, this, std::placeholders::_1 ); - pants[ i ].fMaxDist = 300 * 300; // nie podnosić w większej odległości - pants[ i ].iNumber = i; - } + asAnimName = token + std::to_string( i + 1 ); + pants[ i ].smElement[ 4 ] = GetSubmodelFromName( mdModel, asAnimName ); + if( pants[ i ].smElement[ 4 ] ) { + pants[ i ].smElement[ 4 ]->WillBeAnimated(); + pants[ i ].yUpdate = std::bind( &TDynamicObject::UpdatePant, this, std::placeholders::_1 ); + pants[ i ].fMaxDist = 300 * 300; // nie podnosić w większej odległości + pants[ i ].iNumber = i; + } } + } } else if( token == "pantfactors:" ) { @@ -4914,34 +4927,38 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, if( pants ) { for( int i = 0; i < iAnimType[ ANIM_PANTS ]; ++i ) { // przepisanie współczynników do pantografów (na razie nie będzie lepiej) - pants[ i ].fParamPants->fAngleL = pants[ i ].fParamPants->fAngleL0; // początkowy kąt dolnego ramienia - pants[ i ].fParamPants->fAngleU = pants[ i ].fParamPants->fAngleU0; // początkowy kąt + auto &pantograph { *(pants[ i ].fParamPants) }; + + pantograph.fAngleL = pantograph.fAngleL0; // początkowy kąt dolnego ramienia + pantograph.fAngleU = pantograph.fAngleU0; // początkowy kąt // pants[i].fParamPants->PantWys=1.22*sin(pants[i].fParamPants->fAngleL)+1.755*sin(pants[i].fParamPants->fAngleU); // //wysokość początkowa // pants[i].fParamPants->PantWys=1.176289*sin(pants[i].fParamPants->fAngleL)+1.724482197*sin(pants[i].fParamPants->fAngleU); // //wysokość początkowa - if( pants[ i ].fParamPants->fHeight == 0.0 ) // gdy jest nieprawdopodobna wartość (np. nie znaleziony ślizg) + if( pantograph.fHeight == 0.0 ) // gdy jest nieprawdopodobna wartość (np. nie znaleziony ślizg) { // gdy pomiary modelu nie udały się, odczyt podanych parametrów z MMD - pants[ i ].fParamPants->vPos.x = + pantograph.vPos.x = ( i & 1 ) ? pant2x : pant1x; - pants[ i ].fParamPants->fHeight = + pantograph.fHeight = ( i & 1 ) ? pant2h : pant1h; // wysokość ślizgu jest zapisana w MMD } - pants[ i ].fParamPants->PantWys = - pants[ i ].fParamPants->fLenL1 * sin( pants[ i ].fParamPants->fAngleL ) + - pants[ i ].fParamPants->fLenU1 * sin( pants[ i ].fParamPants->fAngleU ) + - pants[ i ].fParamPants->fHeight; // wysokość początkowa - // pants[i].fParamPants->vPos.y=panty-panth-pants[i].fParamPants->PantWys; - // //np. 4.429-0.097=4.332=~4.335 - // pants[i].fParamPants->vPos.z=0; //niezerowe dla pantografów - // asymetrycznych - pants[ i ].fParamPants->PantTraction = pants[ i ].fParamPants->PantWys; + pantograph.PantWys = + pantograph.fLenL1 * sin( pantograph.fAngleL ) + + pantograph.fLenU1 * sin( pantograph.fAngleU ) + + pantograph.fHeight; // wysokość początkowa + // pants[i].fParamPants->vPos.y=panty-panth-pants[i].fParamPants->PantWys; //np. 4.429-0.097=4.332=~4.335 + if( pantograph.vPos.y == 0.0 ) { + // crude fallback, place the pantograph(s) atop of the vehicle-sized box + pantograph.vPos.y = MoverParameters->Dim.H - pantograph.fHeight - pantograph.PantWys; + } + // pants[i].fParamPants->vPos.z=0; //niezerowe dla pantografów asymetrycznych + pantograph.PantTraction = pantograph.PantWys; // połowa szerokości ślizgu; jest w "Power: CSW=" - pants[ i ].fParamPants->fWidth = 0.5 * MoverParameters->EnginePowerSource.CollectorParameters.CSW; + pantograph.fWidth = 0.5 * MoverParameters->EnginePowerSource.CollectorParameters.CSW; // create sound emitters for the pantograph m_pantographsounds.emplace_back(); @@ -5017,11 +5034,13 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // prefiks wahaczy parser.getTokens(); parser >> token; asAnimName = ""; - for (int i = 1; i <= 4; i++) - { // McZapkie-050402: wyszukiwanie max 4 wahaczy o nazwie str* - asAnimName = token + std::to_string(i); - smWahacze[i - 1] = mdModel->GetFromName(asAnimName); - smWahacze[i - 1]->WillBeAnimated(); + for( int i = 1; i <= 4; ++i ) { + // McZapkie-050402: wyszukiwanie max 4 wahaczy o nazwie str* + asAnimName = token + std::to_string( i ); + smWahacze[ i - 1 ] = GetSubmodelFromName( mdModel, asAnimName ); + if( smWahacze[ i - 1 ] ) { + smWahacze[ i - 1 ]->WillBeAnimated(); + } } parser.getTokens(); parser >> token; if( token == "pendulumamplitude:" ) { @@ -5040,7 +5059,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, { // NBMX wrzesien 2003: wyszukiwanie drzwi o nazwie str* // ustalenie submodelu asAnimName = token + std::to_string(i + 1); - pAnimations[i + j].smAnimated = mdModel->GetFromName(asAnimName); + pAnimations[ i + j ].smAnimated = GetSubmodelFromName( mdModel, asAnimName ); if (pAnimations[i + j].smAnimated) { //++iAnimatedDoors; pAnimations[i + j].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu @@ -5082,7 +5101,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, { // NBMX wrzesien 2003: wyszukiwanie drzwi o nazwie str* // ustalenie submodelu asAnimName = token + std::to_string(i + 1); - pAnimations[i + j].smAnimated = mdModel->GetFromName(asAnimName); + pAnimations[i + j].smAnimated = GetSubmodelFromName( mdModel, asAnimName ); if (pAnimations[i + j].smAnimated) { //++iAnimatedDoors; pAnimations[i + j].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu @@ -5118,7 +5137,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, { // NBMX wrzesien 2003: wyszukiwanie drzwi o nazwie str* // ustalenie submodelu asAnimName = token + std::to_string( i + 1 ); - pAnimations[ i + j ].smAnimated = mdModel->GetFromName( asAnimName ); + pAnimations[ i + j ].smAnimated = GetSubmodelFromName( mdModel, asAnimName ); if( pAnimations[ i + j ].smAnimated ) { pAnimations[ i + j ].smAnimated->WillBeAnimated(); // wyłączenie optymalizacji transformu // od razu zapinamy potrzebny typ animacji @@ -5153,6 +5172,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, parser.getTokens(); parser >> token; if( token == "wheel_clatter:" ){ // polozenia osi w/m srodka pojazdu + double dSDist; parser.getTokens( 1, false ); parser >> dSDist; while( ( ( token = parser.getToken() ) != "" ) diff --git a/Model3d.cpp b/Model3d.cpp index f1fadfbe..d3215806 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -326,12 +326,14 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic m_material = -4; iFlags |= (Opacity < 1.0) ? 8 : 0x10; // zmienna tekstura 4 } - else - { // jeśli tylko nazwa pliku, to dawać bieżącą ścieżkę do tekstur + else { Name_Material(material); +/* if( material.find_first_of( "/\\" ) == material.npos ) { + // jeśli tylko nazwa pliku, to dawać bieżącą ścieżkę do tekstur material.insert( 0, Global.asCurrentTexturePath ); } +*/ m_material = GfxRenderer.Fetch_Material( material ); // renderowanie w cyklu przezroczystych tylko jeśli: // 1. Opacity=0 (przejściowo <1, czy tam <100) oraz @@ -1657,9 +1659,11 @@ void TSubModel::BinInit(TSubModel *s, float4x4 *m, std::vector *t, auto const materialindex = static_cast( iTexture ); if( materialindex < t->size() ) { m_materialname = t->at( materialindex ); +/* if( m_materialname.find_last_of( "/\\" ) == std::string::npos ) { m_materialname = Global.asCurrentTexturePath + m_materialname; } +*/ m_material = GfxRenderer.Fetch_Material( m_materialname ); if( ( iFlags & 0x30 ) == 0 ) { // texture-alpha based fallback if for some reason we don't have opacity flag set yet diff --git a/Texture.cpp b/Texture.cpp index d077195b..c6c2f074 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -762,6 +762,10 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { erase_extension( Filename ); replace_slashes( Filename ); + if( Filename[ 0 ] == '/' ) { + // filename can potentially begin with a slash, and we don't need it + Filename.erase( 0, 1 ); + } std::vector extensions { { ".dds" }, { ".tga" }, { ".bmp" }, { ".ext" } }; diff --git a/Train.cpp b/Train.cpp index 94d79a80..9cdb0d76 100644 --- a/Train.cpp +++ b/Train.cpp @@ -752,7 +752,8 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold - if( Train->mvControlled->ShuntMode ) { + if( ( Train->mvControlled->EngineType == DieselElectric ) + && ( true == Train->mvControlled->ShuntMode ) ) { Train->mvControlled->AnPos = clamp( Train->mvControlled->AnPos + 0.025, 0.0, 1.0 ); @@ -767,7 +768,13 @@ void TTrain::OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold - Train->mvControlled->IncScndCtrl( 2 ); + if( ( Train->mvControlled->EngineType == DieselElectric ) + && ( true == Train->mvControlled->ShuntMode ) ) { + Train->mvControlled->AnPos = 1.0; + } + else { + Train->mvControlled->IncScndCtrl( 2 ); + } } } @@ -813,12 +820,15 @@ void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold - if( Train->mvControlled->ShuntMode ) { + if( ( Train->mvControlled->EngineType == DieselElectric ) + && ( true == Train->mvControlled->ShuntMode ) ) { Train->mvControlled->AnPos = clamp( Train->mvControlled->AnPos - 0.025, 0.0, 1.0 ); } - Train->mvControlled->DecScndCtrl( 1 ); + else { + Train->mvControlled->DecScndCtrl( 1 ); + } } } @@ -826,7 +836,13 @@ void TTrain::OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold - Train->mvControlled->DecScndCtrl( 2 ); + if( ( Train->mvControlled->EngineType == DieselElectric ) + && ( true == Train->mvControlled->ShuntMode ) ) { + Train->mvControlled->AnPos = 0.0; + } + else { + Train->mvControlled->DecScndCtrl( 2 ); + } } } @@ -5970,6 +5986,11 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) // bieżąca sciezka do tekstur to dynamic/... Global.asCurrentTexturePath = DynamicObject->asBaseDir; // szukaj kabinę jako oddzielny model + // name can contain leading slash, erase it to avoid creation of double slashes when the name is combined with current directory + replace_slashes( token ); + if( token[ 0 ] == '/' ) { + token.erase( 0, 1 ); + } TModel3d *kabina = TModelsManager::GetModel(DynamicObject->asBaseDir + token, true); // z powrotem defaultowa sciezka do tekstur Global.asCurrentTexturePath = szTexturePath; diff --git a/material.cpp b/material.cpp index 31b10d5c..6ece317b 100644 --- a/material.cpp +++ b/material.cpp @@ -112,6 +112,10 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { erase_extension( filename ); replace_slashes( filename ); + if( filename[ 0 ] == '/' ) { + // filename can potentially begin with a slash, and we don't need it + filename.erase( 0, 1 ); + } filename += ".mat"; @@ -122,7 +126,6 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { } // if this fails, try to look for it on disk opengl_material material; - material.name = filename; auto const disklookup = find_on_disk( filename ); if( disklookup != "" ) { cParser materialparser( disklookup, cParser::buffer_FILE ); @@ -130,6 +133,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { // deserialization failed but the .mat file does exist, so we give up at this point return null_handle; } + material.name = disklookup; } else { // if there's no .mat file, this could be legacy method of referring just to diffuse texture directly, make a material out of it in such case @@ -138,6 +142,10 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { // if there's also no texture, give up return null_handle; } + // use texture path and name to tell the newly created materials apart + filename = GfxRenderer.Texture( material.texture1 ).name; + erase_extension( filename ); + material.name = filename + ".mat"; material.has_alpha = GfxRenderer.Texture( material.texture1 ).has_alpha; } @@ -147,21 +155,23 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { return handle; }; -// checks whether specified texture is in the texture bank. returns texture id, or npos. +// checks whether specified material is in the material bank. returns handle to the material, or a null handle material_handle material_manager::find_in_databank( std::string const &Materialname ) const { - auto lookup = m_materialmappings.find( Materialname ); - if( lookup != m_materialmappings.end() ) { - return lookup->second; - } - // jeszcze próba z dodatkową ścieżką - lookup = m_materialmappings.find( szTexturePath + Materialname ); + std::vector filenames { + Global.asCurrentTexturePath + Materialname, + Materialname, + szTexturePath + Materialname }; - return ( - lookup != m_materialmappings.end() ? - lookup->second : - null_handle ); + for( auto const &filename : filenames ) { + auto const lookup { m_materialmappings.find( filename ) }; + if( lookup != m_materialmappings.end() ) { + return lookup->second; + } + } + + return null_handle; } // checks whether specified file exists. @@ -170,6 +180,7 @@ std::string material_manager::find_on_disk( std::string const &Materialname ) const { return( + FileExists( Global.asCurrentTexturePath + Materialname ) ? Global.asCurrentTexturePath + Materialname : FileExists( Materialname ) ? Materialname : FileExists( szTexturePath + Materialname ) ? szTexturePath + Materialname : "" ); diff --git a/uilayer.cpp b/uilayer.cpp index 15eee48b..0f8a3f34 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -740,7 +740,7 @@ ui_layer::update() { "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) + "; HamP=" + std::to_string( vehicle->MoverParameters->LocalBrakePos ) + "/" + to_string( vehicle->MoverParameters->LocalBrakePosA, 2 ) + "; NasJ=" + std::to_string( vehicle->MoverParameters->MainCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->MainCtrlActualPos ) + ")" - + ( vehicle->MoverParameters->ShuntMode ? + + ( ( vehicle->MoverParameters->ShuntMode && vehicle->MoverParameters->EngineType == DieselElectric ) ? "; NasB=" + to_string( vehicle->MoverParameters->AnPos, 2 ) : "; NasB=" + std::to_string( vehicle->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->ScndCtrlActualPos ) + ")" ) + "; I=" + From aa520aa3e7cf42031d42e826438cb5465741150e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 21 May 2018 22:34:16 +0200 Subject: [PATCH 329/426] build 180521. diesel engine power calculation fix --- McZapkie/Mover.cpp | 9 +++++---- uilayer.cpp | 3 ++- version.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 07c7e34f..b2a14981 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4682,10 +4682,11 @@ double TMoverParameters::TractionForce(double dt) case DieselEngine: { - EnginePower = dmoment * enrot; - if (MainCtrlPos > 1) - dmoment -= - dizel_Mstand * (0.2 * enrot / dizel_nmax); // dodatkowe opory z powodu sprezarki} + EnginePower = ( 2 * dizel_Mstand + dmoment ) * enrot * ( 2.0 * M_PI / 1000.0 ); + if( MainCtrlPos > 1 ) { + // dodatkowe opory z powodu sprezarki} + dmoment -= dizel_Mstand * ( 0.2 * enrot / dizel_nmax ); + } Mm = dmoment; //bylo * dizel_engage Mw = Mm * dtrans; // dmoment i dtrans policzone przy okazji enginerotation Fw = Mw * 2.0 / WheelDiameter / NPoweredAxles; diff --git a/uilayer.cpp b/uilayer.cpp index 0f8a3f34..40a08c22 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -731,7 +731,8 @@ ui_layer::update() { + " dist: " + to_string( vehicle->MoverParameters->DistCounter, 2 ) + " km" + "; pos: [" + to_string( vehicle->GetPosition().x, 2 ) + ", " + to_string( vehicle->GetPosition().y, 2 ) + ", " + to_string( vehicle->GetPosition().z, 2 ) + "]" + ", PM=" + to_string( vehicle->MoverParameters->WheelFlat, 1 ) - + " mm; enrot=" + to_string( vehicle->MoverParameters->enrot * 60, 0 ) + + " mm; enpwr=" + to_string( vehicle->MoverParameters->EnginePower, 1 ) + + "; enrot=" + to_string( vehicle->MoverParameters->enrot * 60, 0 ) + " tmrot=" + to_string( std::abs( vehicle->MoverParameters->nrot ) * vehicle->MoverParameters->Transmision.Ratio * 60, 0 ) + "; ventrot=" + to_string( vehicle->MoverParameters->RventRot * 60, 1 ) + "; fanrot=" + to_string( vehicle->MoverParameters->dizel_heat.rpmw, 1 ) + ", " + to_string( vehicle->MoverParameters->dizel_heat.rpmw2, 1 ); diff --git a/version.h b/version.h index 9878d37c..389f81b0 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 516 +#define VERSION_MINOR 521 #define VERSION_REVISION 0 From 2c1c29600e56c9b83a508eeaf4df6cb1e6c66783 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 27 May 2018 02:31:40 +0200 Subject: [PATCH 330/426] build 180527. smoother camera rotation, semi-persistent cab camera angle between view swaps, configurable default cab camera view angle, diesel engine power calculation fix, minor refactoring and fixes for content files lookups and loading --- Camera.cpp | 47 +++++++++++++++++++++++----- Camera.h | 12 ++++---- Driver.cpp | 19 ++++++++---- DynObj.cpp | 46 +++++++++++++++++----------- DynObj.h | 1 - McZapkie/Mover.cpp | 68 ++++++++++++++++++++++++++++------------- Texture.cpp | 76 ++++++++++++++++++---------------------------- Texture.h | 4 ++- Train.cpp | 56 +++++++++++++++++++++++----------- Train.h | 1 + World.cpp | 36 ++++++++++++++-------- audio.cpp | 21 ++++++------- material.cpp | 31 +++++++++---------- material.h | 5 ++- utilities.cpp | 14 +++++++++ utilities.h | 2 ++ version.h | 2 +- 17 files changed, 272 insertions(+), 169 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index 1be5d772..b58901f7 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -18,8 +18,7 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- -void TCamera::Init( Math3D::vector3 NPos, Math3D::vector3 NAngle) -{ +void TCamera::Init( Math3D::vector3 NPos, Math3D::vector3 NAngle) { vUp = Math3D::vector3(0, 1, 0); Velocity = Math3D::vector3(0, 0, 0); @@ -31,8 +30,15 @@ void TCamera::Init( Math3D::vector3 NPos, Math3D::vector3 NAngle) Type = (Global.bFreeFly ? tp_Free : tp_Follow); }; -void TCamera::OnCursorMove(double x, double y) { +void TCamera::Reset() { + Pitch = Yaw = Roll = 0; + m_rotationoffsets = {}; +}; + + +void TCamera::OnCursorMove(double x, double y) { +/* Yaw -= x; while( Yaw > M_PI ) { Yaw -= 2 * M_PI; @@ -45,6 +51,8 @@ void TCamera::OnCursorMove(double x, double y) { // jeżeli jazda z pojazdem ograniczenie kąta spoglądania w dół i w górę Pitch = clamp( Pitch, -M_PI_4, M_PI_4 ); } +*/ + m_rotationoffsets += glm::dvec3 { y, x, 0.0 }; } bool @@ -151,8 +159,9 @@ void TCamera::Update() OnCommand( command ); } - auto const deltatime = Timer::GetDeltaRenderTime(); // czas bez pauzy + auto const deltatime { Timer::GetDeltaRenderTime() }; // czas bez pauzy + // update position if( ( Type == tp_Free ) || ( false == Global.ctrlState ) || ( true == DebugCameraFlag ) ) { @@ -170,6 +179,24 @@ void TCamera::Update() Vec.RotateY( Yaw ); Pos += Vec * 5.0 * deltatime; } + // update rotation + auto const rotationfactor { std::min( 1.0, 20 * deltatime ) }; + + Yaw -= rotationfactor * m_rotationoffsets.y; + m_rotationoffsets.y *= ( 1.0 - rotationfactor ); + while( Yaw > M_PI ) { + Yaw -= 2 * M_PI; + } + while( Yaw < -M_PI ) { + Yaw += 2 * M_PI; + } + + Pitch -= rotationfactor * m_rotationoffsets.x; + m_rotationoffsets.x *= ( 1.0 - rotationfactor ); + if( Type == tp_Follow ) { + // jeżeli jazda z pojazdem ograniczenie kąta spoglądania w dół i w górę + Pitch = clamp( Pitch, -M_PI_4, M_PI_4 ); + } } Math3D::vector3 TCamera::GetDirection() { @@ -200,11 +227,15 @@ bool TCamera::SetMatrix( glm::dmat4 &Matrix ) { void TCamera::RaLook() { // zmiana kierunku patrzenia - przelicza Yaw Math3D::vector3 where = LookAt - Pos + Math3D::vector3(0, 3, 0); // trochę w górę od szyn - if ((where.x != 0.0) || (where.z != 0.0)) - Yaw = atan2(-where.x, -where.z); // kąt horyzontalny + if( ( where.x != 0.0 ) || ( where.z != 0.0 ) ) { + Yaw = atan2( -where.x, -where.z ); // kąt horyzontalny + m_rotationoffsets.y = 0.0; + } double l = Math3D::Length3(where); - if (l > 0.0) - Pitch = asin(where.y / l); // kąt w pionie + if( l > 0.0 ) { + Pitch = asin( where.y / l ); // kąt w pionie + m_rotationoffsets.x = 0.0; + } }; void TCamera::Stop() diff --git a/Camera.h b/Camera.h index ba9bb0f6..9a70d438 100644 --- a/Camera.h +++ b/Camera.h @@ -22,14 +22,9 @@ enum TCameraType class TCamera { - private: - glm::dvec3 m_moverate; - public: // McZapkie: potrzebuje do kiwania na boki void Init( Math3D::vector3 NPos, Math3D::vector3 NAngle); - inline - void Reset() { - Pitch = Yaw = Roll = 0; }; + void Reset(); void OnCursorMove(double const x, double const y); bool OnCommand( command_data const &Command ); void Update(); @@ -46,4 +41,9 @@ class TCamera { Math3D::vector3 LookAt; // współrzędne punktu, na który ma patrzeć Math3D::vector3 vUp; Math3D::vector3 Velocity; + +private: + glm::dvec3 m_moverate; + glm::dvec3 m_rotationoffsets; // requested changes to pitch, yaw and roll + }; diff --git a/Driver.cpp b/Driver.cpp index 66fb8835..1b0042a6 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -3222,17 +3222,24 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N iStationStart = TrainParams->StationIndex; asNextStop = TrainParams->NextStop(); iDrivigFlags |= movePrimary; // skoro dostał rozkład, to jest teraz głównym - NewCommand = Global.asCurrentSceneryPath + NewCommand + ".wav"; // na razie jeden - if (FileExists(NewCommand)) { + NewCommand = Global.asCurrentSceneryPath + NewCommand; + auto lookup = + FileExists( + { NewCommand }, + { ".ogg", ".flac", ".wav" } ); + if( false == lookup.first.empty() ) { // wczytanie dźwięku odjazdu podawanego bezpośrenido - tsGuardSignal = sound_source( sound_placement::external, 75.f ).deserialize( NewCommand, sound_type::single ); + tsGuardSignal = sound_source( sound_placement::external, 75.f ).deserialize( lookup.first + lookup.second, sound_type::single ); iGuardRadio = 0; // nie przez radio } else { - NewCommand = NewCommand.insert(NewCommand.rfind('.'),"radio"); // wstawienie przed kropkč - if (FileExists(NewCommand)) { + auto lookup = + FileExists( + { NewCommand + "radio" }, + { ".ogg", ".flac", ".wav" } ); + if( false == lookup.first.empty() ) { // wczytanie dźwięku odjazdu w wersji radiowej (słychać tylko w kabinie) - tsGuardSignal = sound_source( sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE ).deserialize( NewCommand, sound_type::single ); + tsGuardSignal = sound_source( sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE ).deserialize( lookup.first + lookup.second, sound_type::single ); iGuardRadio = iRadioChannel; } } diff --git a/DynObj.cpp b/DynObj.cpp index 86ddbc83..1e1393de 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -50,6 +50,18 @@ GetSubmodelFromName( TModel3d * const Model, std::string const Name ) { nullptr ); } +// Ra 2015-01: sprawdzenie dostępności tekstury o podanej nazwie +std::string +TextureTest( std::string const &Name ) { + + auto const lookup { + FileExists( + { Global.asCurrentTexturePath + Name, Name, szTexturePath + Name }, + { ".mat", ".dds", ".tga", ".bmp" } ) }; + + return ( lookup.first + lookup.second ); +} + //--------------------------------------------------------------------------- void TAnimPant::AKP_4E() { // ustawienie wymiarów dla pantografu AKP-4E @@ -4481,7 +4493,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, mdModel = TModelsManager::GetModel(asModel, true); if (ReplacableSkin != "none") { - std::string nowheretexture = TextureTest( Global.asCurrentTexturePath + "nowhere" ); // na razie prymitywnie + std::string nowheretexture = TextureTest( "nowhere" ); // na razie prymitywnie if( false == nowheretexture.empty() ) { m_materialdata.replacable_skins[ 4 ] = GfxRenderer.Fetch_Material( nowheretexture ); } @@ -6204,17 +6216,6 @@ int TDynamicObject::RouteWish(TTrack *tr) return Mechanik ? Mechanik->CrossRoute(tr) : 0; // wg AI albo prosto }; -std::string TDynamicObject::TextureTest(std::string const &name) -{ // Ra 2015-01: sprawdzenie dostępności tekstury o podanej nazwie - std::vector extensions = { ".mat", ".dds", ".tga", ".bmp" }; - for( auto const &extension : extensions ) { - if( true == FileExists( name + extension ) ) { - return name + extension; - } - } - return ""; // nie znaleziona -}; - void TDynamicObject::DestinationSet(std::string to, std::string numer) { // ustawienie stacji docelowej oraz wymiennej tekstury 4, jeśli istnieje plik // w zasadzie, to każdy wagon mógłby mieć inną stację docelową @@ -6228,13 +6229,20 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) numer = Bezogonkow(numer); asDestination = to; to = Bezogonkow(to); // do szukania pliku obcinamy ogonki - + if( true == to.empty() ) { + to = "nowhere"; + } + // destination textures are kept in the vehicle's directory so we point the current texture path there + auto const currenttexturepath { Global.asCurrentTexturePath }; + Global.asCurrentTexturePath = asBaseDir; + // now see if we can find any version of the texture std::vector destinations = { - asBaseDir + numer + "@" + MoverParameters->TypeName, - asBaseDir + numer, - asBaseDir + to + "@" + MoverParameters->TypeName, - asBaseDir + to, - asBaseDir + "nowhere" }; + numer + '@' + MoverParameters->TypeName, + numer, + to + '@' + MoverParameters->TypeName, + to, + "nowhere" + '@' + MoverParameters->TypeName, + "nowhere" }; for( auto const &destination : destinations ) { @@ -6244,6 +6252,8 @@ void TDynamicObject::DestinationSet(std::string to, std::string numer) break; } } + // whether we got anything, restore previous texture path + Global.asCurrentTexturePath = currenttexturepath; }; void TDynamicObject::OverheadTrack(float o) diff --git a/DynObj.h b/DynObj.h index 597abed9..9681b981 100644 --- a/DynObj.h +++ b/DynObj.h @@ -601,7 +601,6 @@ private: // zapytanie do AI, po którym segmencie skrzyżowania jechać int RouteWish(TTrack *tr); void DestinationSet(std::string to, std::string numer); - std::string TextureTest(std::string const &name); void OverheadTrack(float o); double MED[9][8]; // lista zmiennych do debugowania hamulca ED diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b2a14981..ef15db9b 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4426,8 +4426,7 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) // Q: 20160714 // oblicza sile trakcyjna lokomotywy (dla elektrowozu tez calkowity prad) // ************************************************************************************************* -double TMoverParameters::TractionForce(double dt) -{ +double TMoverParameters::TractionForce( double dt ) { double PosRatio, dmoment, dtrans, tmp; Ft = 0; @@ -4437,13 +4436,13 @@ double TMoverParameters::TractionForce(double dt) switch( EngineType ) { case DieselElectric: { if( ( true == Mains ) - && ( true == FuelPump.is_active ) ) { + && ( true == FuelPump.is_active ) ) { tmp = DElist[ MainCtrlPos ].RPM / 60.0; if( ( true == Heating ) - && ( HeatingPower > 0 ) - && ( MainCtrlPosNo > MainCtrlPos ) ) { + && ( HeatingPower > 0 ) + && ( MainCtrlPosNo > MainCtrlPos ) ) { int i = MainCtrlPosNo; while( DElist[ i - 2 ].RPM / 60.0 > tmp ) { @@ -4460,8 +4459,8 @@ double TMoverParameters::TractionForce(double dt) enrot = clamp( enrot + ( dt / 1.25 ) * ( // TODO: equivalent of dizel_aim instead of fixed inertia enrot < tmp ? - 1.0 : - -2.0 ), // NOTE: revolutions drop faster than they rise, maybe? TBD: maybe not + 1.0 : + -2.0 ), // NOTE: revolutions drop faster than they rise, maybe? TBD: maybe not 0.0, std::max( tmp, enrot ) ); if( std::abs( tmp - enrot ) < 0.001 ) { enrot = tmp; @@ -4503,7 +4502,7 @@ double TMoverParameters::TractionForce(double dt) case 1: { // manual if( ( ActiveDir != 0 ) - && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { + && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { RventRot += ( RVentnmax - RventRot ) * RVentSpeed * dt; } else { @@ -4515,7 +4514,7 @@ double TMoverParameters::TractionForce(double dt) case 2: { // automatic auto const motorcurrent{ std::min( ImaxHi, std::abs( Im ) ) }; if( ( std::abs( Itot ) > RVentMinI ) - && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { + && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { RventRot += ( RVentnmax @@ -4525,7 +4524,7 @@ double TMoverParameters::TractionForce(double dt) * RVentSpeed * dt; } else if( ( DynamicBrakeType == dbrake_automatic ) - && ( true == DynamicBrakeFlag ) ) { + && ( true == DynamicBrakeFlag ) ) { RventRot += ( RVentnmax * motorcurrent / ImaxLo - RventRot ) * RVentSpeed * dt; } else { @@ -4579,13 +4578,35 @@ double TMoverParameters::TractionForce(double dt) } } + switch( EngineType ) { + case Dumb: { + PosRatio = ( MainCtrlPos + ScndCtrlPos ) / ( MainCtrlPosNo + ScndCtrlPosNo + 0.01 ); + EnginePower = 1000.0 * Power * PosRatio; + break; + } + case DieselEngine: { + EnginePower = ( 2 * dizel_Mstand + dmoment ) * enrot * ( 2.0 * M_PI / 1000.0 ); + if( MainCtrlPos > 1 ) { + // dodatkowe opory z powodu sprezarki} + dmoment -= dizel_Mstand * ( 0.2 * enrot / dizel_nmax ); + } + break; + } + case DieselElectric: { + EnginePower = 0; // the actual calculation is done in two steps later in the method + break; + } + default: { + break; + } + } + if (ActiveDir != 0) switch (EngineType) { case Dumb: { - PosRatio = (MainCtrlPos + ScndCtrlPos) / (MainCtrlPosNo + ScndCtrlPosNo + 0.01); - if (Mains && (ActiveDir != 0) && (CabNo != 0)) + if (Mains && (CabNo != 0)) { if (Vel > 0.1) { @@ -4597,7 +4618,6 @@ double TMoverParameters::TractionForce(double dt) } else Ft = 0; - EnginePower = 1000.0 * Power * PosRatio; break; } // Dumb @@ -4682,11 +4702,6 @@ double TMoverParameters::TractionForce(double dt) case DieselEngine: { - EnginePower = ( 2 * dizel_Mstand + dmoment ) * enrot * ( 2.0 * M_PI / 1000.0 ); - if( MainCtrlPos > 1 ) { - // dodatkowe opory z powodu sprezarki} - dmoment -= dizel_Mstand * ( 0.2 * enrot / dizel_nmax ); - } Mm = dmoment; //bylo * dizel_engage Mw = Mm * dtrans; // dmoment i dtrans policzone przy okazji enginerotation Fw = Mw * 2.0 / WheelDiameter / NPoweredAxles; @@ -4995,9 +5010,7 @@ double TMoverParameters::TractionForce(double dt) } } if( true == Mains ) { - //tempomat - if (ScndCtrlPosNo > 1) { if (ScndCtrlPos != NewSpeed) @@ -5021,7 +5034,6 @@ double TMoverParameters::TractionForce(double dt) } } - dtrans = Hamulec->GetEDBCP(); if (((DoorLeftOpened) || (DoorRightOpened))) DynamicBrakeFlag = true; @@ -5241,6 +5253,20 @@ double TMoverParameters::TractionForce(double dt) break; } } // case EngineType + + switch( EngineType ) { + case DieselElectric: { + // rough approximation of extra effort to overcome friction etc + auto const rpmratio{ 60.0 * enrot / DElist[ MainCtrlPosNo ].RPM }; + EnginePower += rpmratio * 0.2 * DElist[ MainCtrlPosNo ].GenPower; + break; + } + default: { + break; + } + } + + return Ft; } diff --git a/Texture.cpp b/Texture.cpp index c6c2f074..6ab10f62 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -767,55 +767,22 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { Filename.erase( 0, 1 ); } - std::vector extensions { { ".dds" }, { ".tga" }, { ".bmp" }, { ".ext" } }; - // try to locate requested texture in the databank - auto lookup = find_in_databank( Filename + Global.szDefaultExt ); + auto lookup { find_in_databank( Filename ) }; if( lookup != npos ) { - // start with the default extension... return lookup; } - else { - // ...then try recognized file extensions other than default - for( auto const &extension : extensions ) { - - if( extension == Global.szDefaultExt ) { - // we already tried this one - continue; - } - lookup = find_in_databank( Filename + extension ); - if( lookup != npos ) { - - return lookup; - } - } - } // if we don't have the texture in the databank, check if it's on disk - std::string filename = find_on_disk( Filename + Global.szDefaultExt ); - if( true == filename.empty() ) { - // if the default lookup fails, try other known extensions - for( auto const &extension : extensions ) { + auto const disklookup { find_on_disk( Filename ) }; - if( extension == Global.szDefaultExt ) { - // we already tried this one - continue; - } - filename = find_on_disk( Filename + extension ); - if( false == filename.empty() ) { - // we found something, don't bother with others - break; - } - } - } - - if( true == filename.empty() ) { + if( true == disklookup.first.empty() ) { // there's nothing matching in the databank nor on the disk, report failure ErrorLog( "Bad file: failed do locate texture file \"" + Filename + "\"", logtype::file ); return npos; } auto texture = new opengl_texture(); - texture->name = filename; + texture->name = disklookup.first + disklookup.second; if( Filename.find('#') != std::string::npos ) { // temporary code for legacy assets -- textures with names beginning with # are to be sharpened traits += '#'; @@ -823,9 +790,9 @@ texture_manager::create( std::string Filename, bool const Loadnow ) { texture->traits = traits; auto const textureindex = (texture_handle)m_textures.size(); m_textures.emplace_back( texture, std::chrono::steady_clock::time_point() ); - m_texturemappings.emplace( filename, textureindex ); + m_texturemappings.emplace( disklookup.first, textureindex ); - WriteLog( "Created texture object for \"" + filename + "\"", logtype::texture ); + WriteLog( "Created texture object for \"" + disklookup.first + disklookup.second + "\"", logtype::texture ); if( true == Loadnow ) { @@ -942,7 +909,7 @@ texture_manager::info() const { texture_handle texture_manager::find_in_databank( std::string const &Texturename ) const { - std::vector filenames { + std::vector const filenames { Global.asCurrentTexturePath + Texturename, Texturename, szTexturePath + Texturename }; @@ -953,19 +920,34 @@ texture_manager::find_in_databank( std::string const &Texturename ) const { return lookup->second; } } - + // all lookups failed return npos; } // checks whether specified file exists. -std::string +std::pair texture_manager::find_on_disk( std::string const &Texturename ) const { - return( - FileExists( Global.asCurrentTexturePath + Texturename ) ? Global.asCurrentTexturePath + Texturename : - FileExists( Texturename ) ? Texturename : - FileExists( szTexturePath + Texturename ) ? szTexturePath + Texturename : - "" ); + std::vector const filenames { + Global.asCurrentTexturePath + Texturename, + Texturename, + szTexturePath + Texturename }; + + auto lookup = + FileExists( + filenames, + { Global.szDefaultExt } ); + + if( false == lookup.first.empty() ) { + return lookup; + } + + // if the first attempt fails, try entire extension list + // NOTE: slightly wasteful as it means preferred extension is tested twice, but, eh + return ( + FileExists( + filenames, + { ".dds", ".tga", ".bmp", ".ext" } ) ); } //--------------------------------------------------------------------------- diff --git a/Texture.h b/Texture.h index 0c05b97a..b57cd20d 100644 --- a/Texture.h +++ b/Texture.h @@ -21,6 +21,8 @@ struct opengl_texture { static DDPIXELFORMAT deserialize_ddpf(std::istream&); static DDSCAPS2 deserialize_ddscaps(std::istream&); +// constructors + opengl_texture() = default; // methods void load(); @@ -120,7 +122,7 @@ private: texture_handle find_in_databank( std::string const &Texturename ) const; // checks whether specified file exists. returns name of the located file, or empty string. - std::string + std::pair find_on_disk( std::string const &Texturename ) const; void delete_textures(); diff --git a/Train.cpp b/Train.cpp index 9cdb0d76..f298e28c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5882,6 +5882,10 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) sound->offset( nullvector ); sound->owner( DynamicObject ); } + // reset view angles + pMechViewAngle = { 0.0, 0.0 }; + Global.pCamera->Pitch = pMechViewAngle.x; + Global.pCamera->Yaw = pMechViewAngle.y; pyScreens.reset(this); pyScreens.setLookupPath(DynamicObject->asBaseDir); @@ -5934,41 +5938,59 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { // jeśli znaleziony wpis kabiny Cabine[cabindex].Load(*parser); - // NOTE: the next part is likely to break if sitpos doesn't follow pos + // NOTE: the position and angle definitions depend on strict entry order + // TODO: refactor into more flexible arrangement parser->getTokens(); *parser >> token; + if( token == std::string( "driver" + std::to_string( cabindex ) + "angle:" ) ) { + // camera view angle + parser->getTokens( 2, false ); + // angle is specified in degrees but internally stored in radians + glm::vec2 viewangle; + *parser + >> viewangle.y // yaw first, then pitch + >> viewangle.x; + pMechViewAngle = glm::radians( viewangle ); + Global.pCamera->Pitch = pMechViewAngle.x; + Global.pCamera->Yaw = pMechViewAngle.y; + + parser->getTokens(); + *parser >> token; + } if (token == std::string("driver" + std::to_string(cabindex) + "pos:")) { // pozycja poczatkowa maszynisty parser->getTokens(3, false); - *parser >> pMechOffset.x >> pMechOffset.y >> pMechOffset.z; - pMechSittingPosition.x = pMechOffset.x; - pMechSittingPosition.y = pMechOffset.y; - pMechSittingPosition.z = pMechOffset.z; + *parser + >> pMechOffset.x + >> pMechOffset.y + >> pMechOffset.z; + pMechSittingPosition = pMechOffset; + + parser->getTokens(); + *parser >> token; } // ABu: pozycja siedzaca mechanika - parser->getTokens(); - *parser >> token; if (token == std::string("driver" + std::to_string(cabindex) + "sitpos:")) { // ABu 180404 pozycja siedzaca maszynisty parser->getTokens(3, false); - *parser >> pMechSittingPosition.x >> pMechSittingPosition.y >> pMechSittingPosition.z; - parse = true; + *parser + >> pMechSittingPosition.x + >> pMechSittingPosition.y + >> pMechSittingPosition.z; + + parser->getTokens(); + *parser >> token; } // else parse=false; - do - { - // ABu: wstawione warunki, wczesniej tylko to: - // str=Parser->GetNextSymbol().LowerCase(); - if (parse == true) { - + do { + if( parse == true ) { token = ""; parser->getTokens(); *parser >> token; } - else - { + else { parse = true; } // inicjacja kabiny diff --git a/Train.h b/Train.h index 5e1ff929..7b0243c0 100644 --- a/Train.h +++ b/Train.h @@ -592,6 +592,7 @@ public: // reszta może by?publiczna Math3D::vector3 pMechSittingPosition; // ABu 180404 Math3D::vector3 MirrorPosition(bool lewe); + glm::vec2 pMechViewAngle { 0.0, 0.0 }; // camera pitch and yaw values, preserved while in external view private: double fBlinkTimer; diff --git a/World.cpp b/World.cpp index 0e3f20ea..361ad5a9 100644 --- a/World.cpp +++ b/World.cpp @@ -607,6 +607,7 @@ void TWorld::InOutKey( bool const Near ) if (Train) { // cache current cab position so there's no need to set it all over again after each out-in switch Train->pMechSittingPosition = Train->pMechOffset; + Train->Dynamic()->bDisplayCab = false; DistantView( Near ); } @@ -618,9 +619,8 @@ void TWorld::InOutKey( bool const Near ) if (Train) { Train->Dynamic()->bDisplayCab = true; - Train->Dynamic()->ABuSetModelShake( - Math3D::vector3(0, 0, 0)); // zerowanie przesunięcia przed powrotem? - // Camera.Stop(); //zatrzymanie ruchu + // zerowanie przesunięcia przed powrotem? + Train->Dynamic()->ABuSetModelShake( { 0, 0, 0 } ); Train->MechStop(); FollowView(); // na pozycję mecha } @@ -694,14 +694,12 @@ void TWorld::FollowView(bool wycisz) { // tu ustawić nową, bo od niej liczą się odległości Global.pCameraPosition = Camera.Pos; } - else if (Train) - { // korekcja ustawienia w kabinie - OK - if( wycisz ) { - // wyciszenie dźwięków z poprzedniej pozycji - // trzymanie prawego w kabinie daje marny efekt - // TODO: re-implement, old one kinda didn't really work - } + else if (Train) { Camera.Pos = Train->pMechPosition; + // potentially restore cached camera angles + Camera.Pitch = Train->pMechViewAngle.x; + Camera.Yaw = Train->pMechViewAngle.y; + Camera.Roll = std::atan(Train->pMechShake.x * Train->fMechRoll); // hustanie kamery na boki Camera.Pitch -= 0.5 * std::atan(Train->vMechVelocity.z * Train->fMechPitch); // hustanie kamery przod tyl @@ -946,6 +944,14 @@ TWorld::Update_Camera( double const Deltatime ) { if( DebugCameraFlag ) { DebugCamera.Update(); } else { Camera.Update(); } // uwzględnienie ruchu wywołanego klawiszami + + if( ( false == FreeFlyModeFlag ) + && ( false == Global.CabWindowOpen ) + && ( Train != nullptr ) ) { + // cache cab camera view angles in case of view type switch + Train->pMechViewAngle = { Camera.Pitch, Camera.Yaw }; + } + // reset window state, it'll be set again if applicable in a check below Global.CabWindowOpen = false; @@ -954,7 +960,7 @@ TWorld::Update_Camera( double const Deltatime ) { && ( false == DebugCameraFlag ) ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery auto tempangle = Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); - double modelrotate = atan2( -tempangle.x, tempangle.z ); +// double modelrotate = atan2( -tempangle.x, tempangle.z ); if( ( true == Global.ctrlState ) && ( ( glfwGetKey( Global.window, GLFW_KEY_LEFT ) == GLFW_TRUE ) @@ -982,6 +988,11 @@ TWorld::Update_Camera( double const Deltatime ) { } else { // patrzenie standardowe + // potentially restore view angle after returning from external view + // TODO: mirror view toggle as separate method + Camera.Pitch = Train->pMechViewAngle.x; + Camera.Yaw = Train->pMechViewAngle.y; + Camera.Pos = Train->GetWorldMechPosition(); // Train.GetPosition1(); if( !Global.iPause ) { // podczas pauzy nie przeliczać kątów przypadkowymi wartościami @@ -991,8 +1002,8 @@ TWorld::Update_Camera( double const Deltatime ) { // Ra: tu jest uciekanie kamery w górę!!! Camera.Pitch -= 0.5 * atan( Train->vMechVelocity.z * Train->fMechPitch ); } - // ABu011104: rzucanie pudlem /* + // ABu011104: rzucanie pudlem vector3 temp; if( abs( Train->pMechShake.y ) < 0.25 ) temp = vector3( 0, 0, 6 * Train->pMechShake.y ); @@ -1004,7 +1015,6 @@ TWorld::Update_Camera( double const Deltatime ) { Controlled->ABuSetModelShake( temp ); // ABu: koniec rzucania */ - if( Train->Dynamic()->MoverParameters->ActiveCab == 0 ) Camera.LookAt = Train->GetWorldMechPosition() + Train->GetDirection() * 5.0; // gdy w korytarzu else // patrzenie w kierunku osi pojazdu, z uwzględnieniem kabiny diff --git a/audio.cpp b/audio.cpp index 188a0d20..3ade7513 100644 --- a/audio.cpp +++ b/audio.cpp @@ -210,8 +210,9 @@ buffer_manager::emplace( std::string Filename ) { m_buffers.emplace_back( Filename ); // NOTE: we store mapping without file type extension, to simplify lookups + erase_extension( Filename ); m_buffermappings.emplace( - Filename.erase( Filename.rfind( '.' ) ), + Filename, handle ); return handle; @@ -220,26 +221,22 @@ buffer_manager::emplace( std::string Filename ) { audio::buffer_handle buffer_manager::find_buffer( std::string const &Buffername ) const { - auto lookup = m_buffermappings.find( Buffername ); - if( lookup != m_buffermappings.end() ) + auto const lookup = m_buffermappings.find( Buffername ); + if( lookup != std::end( m_buffermappings ) ) return lookup->second; else return null_handle; } - std::string buffer_manager::find_file( std::string const &Filename ) const { - std::vector const extensions { ".ogg", ".flac", ".wav" }; + auto const lookup { + FileExists( + { Filename }, + { ".ogg", ".flac", ".wav" } ) }; - for( auto const &extension : extensions ) { - if( FileExists( Filename + extension ) ) { - // valid name on success - return Filename + extension; - } - } - return {}; // empty string on failure + return lookup.first + lookup.second; } } // audio diff --git a/material.cpp b/material.cpp index 6ece317b..3bd748d5 100644 --- a/material.cpp +++ b/material.cpp @@ -117,23 +117,21 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { filename.erase( 0, 1 ); } - filename += ".mat"; - // try to locate requested material in the databank - auto const databanklookup = find_in_databank( filename ); + auto const databanklookup { find_in_databank( filename ) }; if( databanklookup != null_handle ) { return databanklookup; } // if this fails, try to look for it on disk opengl_material material; - auto const disklookup = find_on_disk( filename ); - if( disklookup != "" ) { - cParser materialparser( disklookup, cParser::buffer_FILE ); + auto const disklookup { find_on_disk( filename ) }; + if( false == disklookup.first.empty() ) { + cParser materialparser( disklookup.first + disklookup.second, cParser::buffer_FILE ); if( false == material.deserialize( materialparser, Loadnow ) ) { // deserialization failed but the .mat file does exist, so we give up at this point return null_handle; } - material.name = disklookup; + material.name = disklookup.first; } else { // if there's no .mat file, this could be legacy method of referring just to diffuse texture directly, make a material out of it in such case @@ -145,7 +143,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { // use texture path and name to tell the newly created materials apart filename = GfxRenderer.Texture( material.texture1 ).name; erase_extension( filename ); - material.name = filename + ".mat"; + material.name = filename; material.has_alpha = GfxRenderer.Texture( material.texture1 ).has_alpha; } @@ -159,7 +157,7 @@ material_manager::create( std::string const &Filename, bool const Loadnow ) { material_handle material_manager::find_in_databank( std::string const &Materialname ) const { - std::vector filenames { + std::vector const filenames { Global.asCurrentTexturePath + Materialname, Materialname, szTexturePath + Materialname }; @@ -170,20 +168,19 @@ material_manager::find_in_databank( std::string const &Materialname ) const { return lookup->second; } } - + // all lookups failed return null_handle; } // checks whether specified file exists. -// NOTE: this is direct copy of the method used by texture manager. TBD, TODO: refactor into common routine? -std::string +// NOTE: technically could be static, but we might want to switch from global texture path to instance-specific at some point +std::pair material_manager::find_on_disk( std::string const &Materialname ) const { - return( - FileExists( Global.asCurrentTexturePath + Materialname ) ? Global.asCurrentTexturePath + Materialname : - FileExists( Materialname ) ? Materialname : - FileExists( szTexturePath + Materialname ) ? szTexturePath + Materialname : - "" ); + return ( + FileExists( + { Global.asCurrentTexturePath + Materialname, Materialname, szTexturePath + Materialname }, + { ".mat" } ) ); } //--------------------------------------------------------------------------- diff --git a/material.h b/material.h index 36341a23..11c035db 100644 --- a/material.h +++ b/material.h @@ -25,6 +25,9 @@ struct opengl_material { bool has_alpha { false }; // alpha state, calculated from presence of alpha in texture1 std::string name; +// constructors + opengl_material() = default; + // methods bool deserialize( cParser &Input, bool const Loadnow ); @@ -59,7 +62,7 @@ private: material_handle find_in_databank( std::string const &Materialname ) const; // checks whether specified file exists. returns name of the located file, or empty string. - std::string + std::pair find_on_disk( std::string const &Materialname ) const; // members: material_sequence m_materials; diff --git a/utilities.cpp b/utilities.cpp index 18de7454..1bb7fb98 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -330,6 +330,20 @@ FileExists( std::string const &Filename ) { return( true == file.is_open() ); } +std::pair +FileExists( std::vector const &Names, std::vector const &Extensions ) { + + for( auto const &name : Names ) { + for( auto const &extension : Extensions ) { + if( FileExists( name + extension ) ) { + return { name, extension }; + } + } + } + // nothing found + return { {}, {} }; +} + // returns time of last modification for specified file std::time_t last_modified( std::string const &Filename ) { diff --git a/utilities.h b/utilities.h index 856f2de8..d8344859 100644 --- a/utilities.h +++ b/utilities.h @@ -179,6 +179,8 @@ extract_value( bool &Variable, std::string const &Key, std::string const &Input, bool FileExists( std::string const &Filename ); +std::pair FileExists( std::vector const &Names, std::vector const &Extensions ); + // returns time of last modification for specified file std::time_t last_modified( std::string const &Filename ); diff --git a/version.h b/version.h index 389f81b0..036ce179 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 521 +#define VERSION_MINOR 527 #define VERSION_REVISION 0 From 94f923ebb8d3814b7f2717029dcac8187ae6b5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 27 May 2018 17:47:07 +0200 Subject: [PATCH 331/426] Additional diesel regulator modes for SN61 --- McZapkie/Mover.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index ef15db9b..1222137e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6014,6 +6014,18 @@ bool TMoverParameters::dizel_AutoGearCheck(void) case 2: dizel_EngageSwitch(1.0); break; + case 3: + if (Vel>dizel_minVelfullengage) + dizel_EngageSwitch(1.0); + else + dizel_EngageSwitch(0.5); + break; + case 4: + if (Vel>dizel_minVelfullengage) + dizel_EngageSwitch(1.0); + else + dizel_EngageSwitch(0.66); + break; default: if (hydro_TC && hydro_TC_Fill>0.01) dizel_EngageSwitch(1.0); @@ -6153,6 +6165,18 @@ double TMoverParameters::dizel_fillcheck(int mcp) else nreg = dizel_nmin; break; + case 3: + if ((dizel_automaticgearstatus == 0) && (Vel > dizel_minVelfullengage)) + nreg = dizel_nmax; + else + nreg = dizel_nmin; + break; + case 4: + if ((dizel_automaticgearstatus == 0) && (Vel > dizel_minVelfullengage)) + nreg = dizel_nmax; + else + nreg = dizel_nmin * 0.75 + dizel_nmax * 0.25; + break; default: realfill = 0; // sluczaj break; From 1fa2f201f2ddebc7e4cf28e8389eb38a28ac2c5b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 31 May 2018 20:23:15 +0200 Subject: [PATCH 332/426] build 180531. configurable cooling fans rotation rate, additional reverser position command, minor bug fixes --- DynObj.cpp | 3 ++- McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 7 ++++--- Model3d.cpp | 6 ++---- Train.cpp | 12 ++++++++++++ Train.h | 1 + command.cpp | 1 + command.h | 1 + keyboardinput.cpp | 2 ++ material.cpp | 8 -------- utilities.cpp | 10 ++++++++++ utilities.h | 5 +++++ version.h | 2 +- 13 files changed, 42 insertions(+), 17 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 1e1393de..15930bdc 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4562,7 +4562,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } if( !MoverParameters->LoadAccepted.empty() ) { - if( MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) { + if( ( MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) + && ( asLoadName == "pantstate" ) ) { // wartość niby "pantstate" - nazwa dla formalności, ważna jest ilość if( MoverParameters->Load == 1 ) { MoverParameters->PantFront( true ); diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 36ef0e90..47017c54 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -669,6 +669,7 @@ struct heat_data { // bool okienko { true }; // window in the engine compartment // system configuration bool auxiliary_water_circuit { false }; // cooling system has an extra water circuit + double fan_speed { 0.075 }; // cooling fan rpm; either fraction of engine rpm, or absolute value if negative // heat exchange factors double kw { 0.35 }; double kv { 0.6 }; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 1222137e..5c7ef166 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1616,7 +1616,7 @@ void TMoverParameters::OilPumpCheck( double const Timestep ) { OilPump.pressure_target = ( enrot > 0.1 ? interpolate( minpressure, OilPump.pressure_maximum, static_cast( clamp( enrot / maxrevolutions, 0.0, 1.0 ) ) ) * OilPump.resource_amount : - true == OilPump.is_active ? minpressure : + true == OilPump.is_active ? std::min( minpressure + 0.1f, OilPump.pressure_maximum ) : // slight pressure margin to give time to switch off the pump and start the engine 0.f ); if( OilPump.pressure_present < OilPump.pressure_target ) { @@ -6453,7 +6453,7 @@ void TMoverParameters::dizel_Heat( double const dt ) { && ( dizel_heat.water_aux.config.temp_cooling > 0 ) && ( dizel_heat.temperatura2 > dizel_heat.water_aux.config.temp_cooling - ( dizel_heat.water_aux.is_warm ? 8 : 0 ) ) ) ); auto const PTC2 { ( dizel_heat.water_aux.is_warm /*or PTC2p*/ ? 1 : 0 ) }; - dizel_heat.rpmwz2 = PTC2 * 80 * rpm / ( ( 0.5 * rpm ) + 500 ); + dizel_heat.rpmwz2 = PTC2 * ( dizel_heat.fan_speed >= 0 ? ( rpm * dizel_heat.fan_speed ) : ( dizel_heat.fan_speed * -1 ) ); dizel_heat.zaluzje2 = ( dizel_heat.water_aux.config.shutters ? ( PTC2 == 1 ) : true ); // no shutters is an equivalent to having them open auto const zaluzje2 { ( dizel_heat.zaluzje2 ? 1 : 0 ) }; // auxiliary water circuit heat transfer values @@ -6481,7 +6481,7 @@ void TMoverParameters::dizel_Heat( double const dt ) { && ( dizel_heat.water.config.temp_cooling > 0 ) && ( dizel_heat.temperatura1 > dizel_heat.water.config.temp_cooling - ( dizel_heat.water.is_warm ? 8 : 0 ) ) ) ); auto const PTC1 { ( dizel_heat.water.is_warm /*or PTC1p*/ ? 1 : 0 ) }; - dizel_heat.rpmwz = PTC1 * 80 * rpm / ( ( 0.5 * rpm ) + 500 ); + dizel_heat.rpmwz = PTC1 * ( dizel_heat.fan_speed >= 0 ? ( rpm * dizel_heat.fan_speed ) : ( dizel_heat.fan_speed * -1 ) ); dizel_heat.zaluzje1 = ( dizel_heat.water.config.shutters ? ( PTC1 == 1 ) : true ); // no shutters is an equivalent to having them open auto const zaluzje1 { ( dizel_heat.zaluzje1 ? 1 : 0 ) }; // primary water circuit heat transfer values @@ -8502,6 +8502,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value( dizel_heat.water_aux.config.shutters, "WaterAuxShutters", Input, "" ); extract_value( dizel_heat.oil.config.temp_min, "OilMinTemperature", Input, "" ); extract_value( dizel_heat.oil.config.temp_max, "OilMaxTemperature", Input, "" ); + extract_value( dizel_heat.fan_speed, "WaterCoolingFanSpeed", Input, "" ); // water heater extract_value( WaterHeater.config.temp_min, "HeaterMinTemperature", Input, "" ); extract_value( WaterHeater.config.temp_max, "HeaterMaxTemperature", Input, "" ); diff --git a/Model3d.cpp b/Model3d.cpp index d3215806..2fe12510 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1241,8 +1241,6 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) LoadFromBinFile(asBinary, dynamic); asBinary = ""; // wyłączenie zapisu Init(); - // cache the file name, in case someone wants it later - m_filename = name + ".e3d"; } else { @@ -1253,10 +1251,10 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) // pojazdy dopiero po ustawieniu animacji Init(); // generowanie siatek i zapis E3D } - // cache the file name, in case someone wants it later - m_filename = name + ".t3d"; } } + // cache the file name, in case someone wants it later + m_filename = name; bool const result = Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem if (false == result) diff --git a/Train.cpp b/Train.cpp index f298e28c..e72dc35b 100644 --- a/Train.cpp +++ b/Train.cpp @@ -206,6 +206,7 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::mubrakingindicatortoggle, &TTrain::OnCommand_mubrakingindicatortoggle }, { user_command::reverserincrease, &TTrain::OnCommand_reverserincrease }, { user_command::reverserdecrease, &TTrain::OnCommand_reverserdecrease }, + { user_command::reverserforwardhigh, &TTrain::OnCommand_reverserforwardhigh }, { user_command::reverserforward, &TTrain::OnCommand_reverserforward }, { user_command::reverserneutral, &TTrain::OnCommand_reverserneutral }, { user_command::reverserbackward, &TTrain::OnCommand_reverserbackward }, @@ -1464,9 +1465,20 @@ void TTrain::OnCommand_reverserdecrease( TTrain *Train, command_data const &Comm } } +void TTrain::OnCommand_reverserforwardhigh( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + OnCommand_reverserforward( Train, Command ); + OnCommand_reverserincrease( Train, Command ); + } +} + void TTrain::OnCommand_reverserforward( TTrain *Train, command_data const &Command ) { if( Command.action == GLFW_PRESS ) { + // HACK: try to move the reverser one position back, in case it's set to "high forward" + OnCommand_reverserdecrease( Train, Command ); if( Train->mvOccupied->ActiveDir < 1 ) { diff --git a/Train.h b/Train.h index 7b0243c0..10416620 100644 --- a/Train.h +++ b/Train.h @@ -196,6 +196,7 @@ class TTrain static void OnCommand_mubrakingindicatortoggle( TTrain *Train, command_data const &Command ); static void OnCommand_reverserincrease( TTrain *Train, command_data const &Command ); static void OnCommand_reverserdecrease( TTrain *Train, command_data const &Command ); + static void OnCommand_reverserforwardhigh( TTrain *Train, command_data const &Command ); static void OnCommand_reverserforward( TTrain *Train, command_data const &Command ); static void OnCommand_reverserneutral( TTrain *Train, command_data const &Command ); static void OnCommand_reverserbackward( TTrain *Train, command_data const &Command ); diff --git a/command.cpp b/command.cpp index bcc640d7..85d33b61 100644 --- a/command.cpp +++ b/command.cpp @@ -60,6 +60,7 @@ commanddescription_sequence Commands_descriptions = { { "sandboxactivate", command_target::vehicle }, { "reverserincrease", command_target::vehicle }, { "reverserdecrease", command_target::vehicle }, + { "reverserforwardhigh", command_target::vehicle }, { "reverserforward", command_target::vehicle }, { "reverserneutral", command_target::vehicle }, { "reverserbackward", command_target::vehicle }, diff --git a/command.h b/command.h index 547ea93c..d44e90fd 100644 --- a/command.h +++ b/command.h @@ -54,6 +54,7 @@ enum class user_command { sandboxactivate, reverserincrease, reverserdecrease, + reverserforwardhigh, reverserforward, reverserneutral, reverserbackward, diff --git a/keyboardinput.cpp b/keyboardinput.cpp index e12d1072..acede6ab 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -249,6 +249,8 @@ keyboard_input::default_bindings() { { GLFW_KEY_D }, // reverserdecrease { GLFW_KEY_R }, + // reverserforwardhigh + { -1 }, // reverserforward { -1 }, // reverserneutral diff --git a/material.cpp b/material.cpp index 3bd748d5..0cfad9d4 100644 --- a/material.cpp +++ b/material.cpp @@ -14,14 +14,6 @@ http://mozilla.org/MPL/2.0/. #include "utilities.h" #include "globals.h" -// helper, returns potential path part from provided file name -std::string path( std::string const &Filename ) { - return ( - Filename.rfind( '/' ) != std::string::npos ? - Filename.substr( 0, Filename.rfind( '/' ) + 1 ) : - "" ); -} - bool opengl_material::deserialize( cParser &Input, bool const Loadnow ) { diff --git a/utilities.cpp b/utilities.cpp index 1bb7fb98..af1deec4 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -377,3 +377,13 @@ replace_slashes( std::string &Filename ) { std::begin( Filename ), std::end( Filename ), '\\', '/' ); } + +// returns potential path part from provided file name +std::string +substr_path( std::string const &Filename ) { + + return ( + Filename.rfind( '/' ) != std::string::npos ? + Filename.substr( 0, Filename.rfind( '/' ) + 1 ) : + "" ); +} diff --git a/utilities.h b/utilities.h index d8344859..3bd9f9e8 100644 --- a/utilities.h +++ b/utilities.h @@ -192,6 +192,9 @@ erase_extension( std::string &Filename ); void replace_slashes( std::string &Filename ); +// returns potential path part from provided file name +std::string substr_path( std::string const &Filename ); + template void SafeDelete( Type_ &Pointer ) { delete Pointer; @@ -229,6 +232,8 @@ template Type_ min_speed( Type_ const Left, Type_ const Right ) { + if( Left == Right ) { return Left; } + return std::min( ( Left != -1 ? Left : diff --git a/version.h b/version.h index 036ce179..7166095d 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 527 +#define VERSION_MINOR 531 #define VERSION_REVISION 0 From 89e1f25556c5970f1de445ec69f6cf0a4fcb7773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 27 May 2018 15:30:45 +0200 Subject: [PATCH 333/426] Optional logging for MED-braking --- DynObj.cpp | 47 ++++++++++++++++++++++++++++++++++++++++++++++- DynObj.h | 4 ++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/DynObj.cpp b/DynObj.cpp index 15930bdc..955d6008 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3073,7 +3073,20 @@ bool TDynamicObject::Update(double dt, double dt1) { Fzad = std::max(MoverParameters->StopBrakeDecc * masa, Fzad); } - + if ((Fzad > 1) && (!MEDLogFile.is_open()) && (MoverParameters->Vel > 1)) + { + MEDLogFile.open(std::string("MEDLOGS/" + MoverParameters->Name + "_" + to_string(++MEDLogCount) + ".csv"), + std::ios::in | std::ios::out | std::ios::trunc); + MEDLogFile << std::string("t\tVel\tMasa\tOsie\tFmaxPN\tFmaxED\tFfulED\tFrED\tFzad\tFzadED\tFzadPN").c_str(); + for(int k=1;k<=np;k++) + { + MEDLogFile << "\tBP" << k; + } + MEDLogFile << "\n"; + MEDLogFile.flush(); + MEDLogInactiveTime = 0; + MEDLogTime = 0; + } auto FzadED { 0.0 }; if( ( MoverParameters->EpFuse && (MoverParameters->BrakeHandle != MHZ_EN57)) || ( ( MoverParameters->BrakeHandle == MHZ_EN57 ) @@ -3208,6 +3221,38 @@ bool TDynamicObject::Update(double dt, double dt1) MED[0][6] = FzadPN*0.001; MED[0][7] = nPrzekrF; + if (MEDLogFile.is_open()) + { + MEDLogFile << MEDLogTime << "\t" << MoverParameters->Vel << "\t" << masa*0.001 << "\t" << osie << "\t" << FmaxPN*0.001 << "\t" << FmaxED*0.001 << "\t" + << FfulED*0.001 << "\t" << FrED*0.001 << "\t" << Fzad*0.001 << "\t" << FzadED*0.001 << "\t" << FzadPN*0.001; + for (TDynamicObject *p = GetFirstDynamic(MoverParameters->ActiveCab < 0 ? 1 : 0, 4); p; + (true == kier ? p = p->NextC(4) : p = p->PrevC(4))) + { + MEDLogFile << "\t" << p->MoverParameters->BrakePress; + } + MEDLogFile << "\n"; + if (floor(MEDLogTime + dt1) > floor(MEDLogTime)) + { + MEDLogFile.flush(); + } + MEDLogTime += dt1; + + if ((MoverParameters->Vel < 0.1) || (MoverParameters->MainCtrlPos > 0)) + { + MEDLogInactiveTime += dt1; + } + else + { + MEDLogInactiveTime = 0; + } + if (MEDLogInactiveTime > 5) + { + MEDLogFile.flush(); + MEDLogFile.close(); + } + + } + delete[] PrzekrF; delete[] FzED; delete[] FzEP; diff --git a/DynObj.h b/DynObj.h index 9681b981..0ce49ba3 100644 --- a/DynObj.h +++ b/DynObj.h @@ -605,6 +605,10 @@ private: double MED[9][8]; // lista zmiennych do debugowania hamulca ED static std::string const MED_labels[ 8 ]; + std::ofstream MEDLogFile; // zapis parametrów hamowania + double MEDLogTime = 0; + double MEDLogInactiveTime = 0; + int MEDLogCount = 0; }; From 1d0cfdb8b12385461a660548a90a05209856bbe4 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 1 Jun 2018 23:23:58 +0200 Subject: [PATCH 334/426] shuntfield sound for vehicles with diesel-electric engine, sound positioning support for cab controls, minor AI tweaks and bug fixes --- Button.cpp | 9 +++- Driver.cpp | 101 ++++++++++++++++++++++++--------------------- Gauge.cpp | 13 ++++-- McZapkie/Mover.cpp | 6 +++ 4 files changed, 77 insertions(+), 52 deletions(-) diff --git a/Button.cpp b/Button.cpp index cddcee09..0c9df08b 100644 --- a/Button.cpp +++ b/Button.cpp @@ -75,9 +75,14 @@ void TButton::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *pMod } // pass submodel location to defined sounds + auto const nulloffset { glm::vec3{} }; auto const offset { model_offset() }; - m_soundfxincrease.offset( offset ); - m_soundfxdecrease.offset( offset ); + if( m_soundfxincrease.offset() == nulloffset ) { + m_soundfxincrease.offset( offset ); + } + if( m_soundfxdecrease.offset() == nulloffset ) { + m_soundfxdecrease.offset( offset ); + } } bool diff --git a/Driver.cpp b/Driver.cpp index 1b0042a6..e38e55c7 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1327,7 +1327,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN fNext = v; // istotna jest prędkość na końcu tego odcinka fDist = d; // dlugość odcinka } - else if ((fAcc > 0) && (v > 0) && (v <= fNext)) { + else if ((fAcc > 0) && (v >= 0) && (v <= fNext)) { // jeśli nie ma wskazań do hamowania, można podać drogę i prędkość na jej końcu fNext = v; // istotna jest prędkość na końcu tego odcinka fDist = d; // dlugość odcinka (kolejne pozycje mogą wydłużać drogę, jeśli prędkość jest stała) @@ -4614,7 +4614,7 @@ TController::UpdateSituation(double dt) { // w Connect nie, bo moveStopHere odnosi się do stanu po połączeniu if( ( iDrivigFlags & moveStopHere ) && ( vel == 0.0 ) - && ( VelNext == 0.0 ) ) { + && ( VelSignal == 0.0 ) ) { // jeśli ma czekać na wolną drogę, stoi a wyjazdu nie ma, to ma stać VelDesired = 0.0; } @@ -4651,45 +4651,49 @@ TController::UpdateSituation(double dt) { VelDesired, TrainParams->TTVmax ); } - if (VelDesired > 0.0) + + if( ( VelDesired > 0.0 ) + && ( iDrivigFlags & moveGuardSignal ) + && ( OrderCurrentGet() & Obey_train ) ) { + // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas stania + iDrivigFlags &= ~moveGuardSignal; // tylko raz nadać + if( false == tsGuardSignal.empty() ) { + tsGuardSignal.stop(); + // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy + // bezpośrednim + // albo trzeba zrobić dwa dźwięki, jeden bezpośredni, słyszalny w + // pobliżu, a drugi radiowy, słyszalny w innych lokomotywach + // na razie zakładam, że to nie jest dźwięk radiowy, bo trzeba by zrobić + // obsługę kanałów radiowych itd. + if( iGuardRadio == 0 ) { + // jeśli nie przez radio + tsGuardSignal.owner( pVehicle ); + // place virtual conductor some distance away + tsGuardSignal.offset( { pVehicle->MoverParameters->Dim.W * -0.75f, 1.7f, std::min( -20.0, -0.2 * fLength ) } ); + tsGuardSignal.play( sound_flags::exclusive ); + } + else { + // if (iGuardRadio==iRadioChannel) //zgodność kanału + // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu + // (albo może mieć radio przenośne) - kierownik mógłby powtarzać + // przy braku reakcji + // TODO: proper system for sending/receiving radio messages + // place the sound in appropriate cab of the manned vehicle + tsGuardSignal.owner( pVehicle ); + tsGuardSignal.offset( { 0.f, 2.f, pVehicle->MoverParameters->Dim.L * 0.4f * ( pVehicle->MoverParameters->ActiveCab < 0 ? -1 : 1 ) } ); + tsGuardSignal.play( sound_flags::exclusive ); + } + } +/* if( ( ( iDrivigFlags & moveStopHere ) == 0 ) || ( ( SemNextIndex != -1 ) && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) ) { // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w // składzie, jeśli nie mamy czekać na sygnał też trzeba odpalić - if (iDrivigFlags & moveGuardSignal) - { // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas stania - iDrivigFlags &= ~moveGuardSignal; // tylko raz nadać - if( false == tsGuardSignal.empty() ) { - tsGuardSignal.stop(); - // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy - // bezpośrednim - // albo trzeba zrobić dwa dźwięki, jeden bezpośredni, słyszalny w - // pobliżu, a drugi radiowy, słyszalny w innych lokomotywach - // na razie zakładam, że to nie jest dźwięk radiowy, bo trzeba by zrobić - // obsługę kanałów radiowych itd. - if( iGuardRadio == 0 ) { - // jeśli nie przez radio - tsGuardSignal.owner( pVehicle ); - // place virtual conductor some distance away - tsGuardSignal.offset( { pVehicle->MoverParameters->Dim.W * -0.75f, 1.7f, std::min( -20.0, -0.2 * fLength ) } ); - tsGuardSignal.play( sound_flags::exclusive ); - } - else { - // if (iGuardRadio==iRadioChannel) //zgodność kanału - // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu - // (albo może mieć radio przenośne) - kierownik mógłby powtarzać - // przy braku reakcji - // TODO: proper system for sending/receiving radio messages - // place the sound in appropriate cab of the manned vehicle - tsGuardSignal.owner( pVehicle ); - tsGuardSignal.offset( { 0.f, 2.f, pVehicle->MoverParameters->Dim.L * 0.4f * ( pVehicle->MoverParameters->ActiveCab < 0 ? -1 : 1 ) } ); - tsGuardSignal.play( sound_flags::exclusive ); - } - } - } } +*/ + } if( mvOccupied->V == 0.0 ) { // Ra 2014-03: jesli skład stoi, to działa na niego składowa styczna grawitacji AbsAccS = fAccGravity; @@ -4730,7 +4734,7 @@ TController::UpdateSituation(double dt) { if (vel > 0.0) { // jeśli jedzie if( ( vel < VelNext ) - && ( ActualProximityDist > fMaxProximityDist * ( 1.0 + 0.1 * vel ) ) ) { + && ( ActualProximityDist > fMaxProximityDist * ( 1.0 + 0.1 * vel ) ) ) { // jeśli jedzie wolniej niż można i jest wystarczająco daleko, to można przyspieszyć if( AccPreferred > 0.0 ) { // jeśli nie ma zawalidrogi dojedz do semafora/przeszkody @@ -4769,18 +4773,21 @@ TController::UpdateSituation(double dt) { } else { // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) - // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever - auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); - AccDesired = std::min( - AccDesired, - ( VelNext * VelNext - vel * vel ) - / ( 25.92 - * std::max( - ActualProximityDist - brakingpointoffset, - std::min( - ActualProximityDist, - brakingpointoffset ) ) - + 0.1 ) ); // najpierw hamuje mocniej, potem zluzuje + if( ( std::max( 75.0, fMaxProximityDist ) + fBrakeDist * braking_distance_multiplier( VelNext ) ) >= ( ActualProximityDist - fMaxProximityDist ) ) { + // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good + // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever + auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); + AccDesired = std::min( + AccDesired, + ( VelNext * VelNext - vel * vel ) + / ( 25.92 + * std::max( + ActualProximityDist - brakingpointoffset, + std::min( + ActualProximityDist, + brakingpointoffset ) ) + + 0.1 ) ); // najpierw hamuje mocniej, potem zluzuje + } } AccDesired = std::min( AccDesired, AccPreferred ); } diff --git a/Gauge.cpp b/Gauge.cpp index c7e5ad1e..bc15ec3a 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -61,11 +61,18 @@ void TGauge::Init(TSubModel *Submodel, TGaugeType Type, float Scale, float Offse else // a banan może być z optymalizacją? Submodel->WillBeAnimated(); // wyłączenie ignowania jedynkowego transformu // pass submodel location to defined sounds + auto const nulloffset { glm::vec3{} }; auto const offset{ model_offset() }; - m_soundfxincrease.offset( offset ); - m_soundfxdecrease.offset( offset ); + if( m_soundfxincrease.offset() == nulloffset ) { + m_soundfxincrease.offset( offset ); + } + if( m_soundfxdecrease.offset() == nulloffset ) { + m_soundfxdecrease.offset( offset ); + } for( auto &soundfxrecord : m_soundfxvalues ) { - soundfxrecord.second.offset( offset ); + if( soundfxrecord.second.offset() == nulloffset ) { + soundfxrecord.second.offset( offset ); + } } }; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 5c7ef166..0034732f 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -4850,6 +4850,8 @@ double TMoverParameters::TractionForce( double dt ) { else { if( AutoRelayFlag ) { + auto const shuntfieldstate { ScndCtrlPos }; + switch( RelayType ) { case 0: { @@ -4995,6 +4997,10 @@ double TMoverParameters::TractionForce( double dt ) { break; } } // switch RelayType + + if( ScndCtrlPos != shuntfieldstate ) { + SetFlag( SoundFlag, ( sound::relay | sound::shuntfield ) ); + } } } break; From ca07dfad728f89c8a94ca1f8f92c5412376cb2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Thu, 31 May 2018 22:31:11 +0200 Subject: [PATCH 335/426] Rapid multiplier also in MED braking --- DynObj.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/DynObj.cpp b/DynObj.cpp index 955d6008..c57d4a7a 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3044,8 +3044,13 @@ bool TDynamicObject::Update(double dt, double dt1) masa += p->MoverParameters->TotalMass; osie += p->MoverParameters->NAxles; } + double RapidMult = 1.0; + if (((MoverParameters->BrakeDelays & (bdelay_P + bdelay_R)) == (bdelay_P + bdelay_R)) + && (MoverParameters->BrakeDelayFlag & bdelay_P)) + RapidMult = MoverParameters->RapidMult; + + auto const amax = RapidMult * std::min(FmaxPN / masamax, MoverParameters->MED_amax); - auto const amax = std::min(FmaxPN / masamax, MoverParameters->MED_amax); if ((MoverParameters->Vel < 0.5) && (MoverParameters->BrakePress > 0.2) || (dDoorMoveL > 0.001) || (dDoorMoveR > 0.001)) { From 45fc26c59641a7bc847ad27d0d527b3cdd601d35 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 4 Jun 2018 00:05:36 +0200 Subject: [PATCH 336/426] brake delay command propagation, vehicle controller state command fixes --- McZapkie/Mover.cpp | 1 + Train.cpp | 32 +++++++++++++++++++++++--------- uilayer.cpp | 12 +++++++++--- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 0034732f..47368df9 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -9574,6 +9574,7 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C else { OK = false; } + SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "Sandbox") { diff --git a/Train.cpp b/Train.cpp index e72dc35b..1d830d27 100644 --- a/Train.cpp +++ b/Train.cpp @@ -740,12 +740,22 @@ void TTrain::OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data void TTrain::OnCommand_mastercontrollerset( TTrain *Train, command_data const &Command ) { - auto const targetposition { std::min( Command.param1, Train->mvControlled->MainCtrlPosNo ) }; - while( targetposition < Train->mvControlled->MainCtrlPos ) { - Train->mvControlled->DecMainCtrl( 1 ); + auto positionchange { + std::min( + Command.param1, + ( Train->mvControlled->CoupledCtrl ? + Train->mvControlled->MainCtrlPosNo + Train->mvControlled->ScndCtrlPosNo : + Train->mvControlled->MainCtrlPosNo ) ) + - ( Train->mvControlled->CoupledCtrl ? + Train->mvControlled->MainCtrlPos + Train->mvControlled->ScndCtrlPos : + Train->mvControlled->MainCtrlPos ) }; + while( ( positionchange < 0 ) + && ( true == Train->mvControlled->DecMainCtrl( 1 ) ) ) { + ++positionchange; } - while( targetposition > Train->mvControlled->MainCtrlPos ) { - Train->mvControlled->IncMainCtrl( 1 ); + while( ( positionchange > 0 ) + && ( true == Train->mvControlled->IncMainCtrl( 1 ) ) ) { + --positionchange; } } @@ -850,11 +860,15 @@ void TTrain::OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data void TTrain::OnCommand_secondcontrollerset( TTrain *Train, command_data const &Command ) { auto const targetposition { std::min( Command.param1, Train->mvControlled->ScndCtrlPosNo ) }; - while( targetposition < Train->mvControlled->ScndCtrlPos ) { - Train->mvControlled->DecScndCtrl( 1 ); + while( ( targetposition < Train->mvControlled->ScndCtrlPos ) + && ( true == Train->mvControlled->DecScndCtrl( 1 ) ) ) { + // all work is done in the header + ; } - while( targetposition > Train->mvControlled->ScndCtrlPos ) { - Train->mvControlled->IncScndCtrl( 1 ); + while( ( targetposition > Train->mvControlled->ScndCtrlPos ) + && ( true == Train->mvControlled->IncScndCtrl( 1 ) ) ) { + // all work is done in the header + ; } } diff --git a/uilayer.cpp b/uilayer.cpp index 40a08c22..b31d716e 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -283,11 +283,17 @@ ui_layer::update() { if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { // detail mode on second key press + auto const speedlimit { static_cast( std::floor( driver->VelDesired ) ) }; uitextline2 += " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" - + " (limit: " + std::to_string( static_cast( std::floor( driver->VelDesired ) ) ) + " km/h" - + ", next limit: " + std::to_string( static_cast( std::floor( controlled->Mechanik->VelNext ) ) ) + " km/h" - + " in " + to_string( controlled->Mechanik->ActualProximityDist * 0.001, 1 ) + " km)"; + + " (limit: " + std::to_string( speedlimit ) + " km/h"; + auto const nextspeedlimit { static_cast( std::floor( controlled->Mechanik->VelNext ) ) }; + if( nextspeedlimit != speedlimit ) { + uitextline2 += + ", new limit: " + std::to_string( nextspeedlimit ) + " km/h" + + " in " + to_string( controlled->Mechanik->ActualProximityDist * 0.001, 1 ) + " km"; + } + uitextline2 += ")"; uitextline3 += " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; From ce0cd764ec03f7385655115307ec8b90cd7d0c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 3 Jun 2018 21:24:48 +0200 Subject: [PATCH 337/426] Added MHZ_K5P brake handle for new EMUs/DMUs --- McZapkie/MOVER.h | 2 +- McZapkie/Mover.cpp | 4 ++ McZapkie/hamulce.cpp | 116 ++++++++++++++++++++++++++++++++++++++++++- McZapkie/hamulce.h | 25 ++++++++++ 4 files changed, 145 insertions(+), 2 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 47017c54..fa217caf 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -355,7 +355,7 @@ enum TBrakeSystem { Individual, Pneumatic, ElectroPneumatic }; /*podtypy hamulcow zespolonych*/ enum TBrakeSubSystem { ss_None, ss_W, ss_K, ss_KK, ss_Hik, ss_ESt, ss_KE, ss_LSt, ss_MT, ss_Dako }; enum TBrakeValve { NoValve, W, W_Lu_VI, W_Lu_L, W_Lu_XR, K, Kg, Kp, Kss, Kkg, Kkp, Kks, Hikg1, Hikss, Hikp1, KE, SW, EStED, NESt3, ESt3, LSt, ESt4, ESt3AL2, EP1, EP2, M483, CV1_L_TR, CV1, CV1_R, Other }; -enum TBrakeHandle { NoHandle, West, FV4a, M394, M254, FVel1, FVel6, D2, Knorr, FD1, BS2, testH, St113, MHZ_P, MHZ_T, MHZ_EN57 }; +enum TBrakeHandle { NoHandle, West, FV4a, M394, M254, FVel1, FVel6, D2, Knorr, FD1, BS2, testH, St113, MHZ_P, MHZ_T, MHZ_EN57, MHZ_K5P }; /*typy hamulcow indywidualnych*/ enum TLocalBrake { NoBrake, ManualBrake, PneumaticBrake, HydraulicBrake }; /*dla osob/towar: opoznienie hamowania/odhamowania*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 47368df9..0179d83f 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8088,6 +8088,7 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { { "test", testH }, { "D2", D2 }, { "MHZ_EN57", MHZ_EN57 }, + { "MHZ_K5P", MHZ_K5P }, { "M394", M394 }, { "Knorr", Knorr }, { "Westinghouse", West }, @@ -8895,6 +8896,9 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) case St113: Handle = std::make_shared(); break; + case MHZ_K5P: + Handle = std::make_shared(); + break; default: Handle = std::make_shared(); } diff --git a/McZapkie/hamulce.cpp b/McZapkie/hamulce.cpp index ee414c1d..454f58c2 100644 --- a/McZapkie/hamulce.cpp +++ b/McZapkie/hamulce.cpp @@ -23,6 +23,7 @@ Copyright (C) 2007-2014 Maciej Cierniak static double const DPL = 0.25; double const TFV4aM::pos_table[11] = {-2, 6, -1, 0, -2, 1, 4, 6, 0, 0, 0}; double const TMHZ_EN57::pos_table[11] = {-1, 10, -1, 0, 0, 2, 9, 10, 0, 0, 0}; +double const TMHZ_K5P::pos_table[11] = { -1, 3, -1, 0, 1, 1, 2, 3, 0, 0, 0 }; double const TM394::pos_table[11] = {-1, 5, -1, 0, 1, 2, 4, 5, 0, 0, 0}; double const TH14K1::BPT_K[6][2] = {{10, 0}, {4, 1}, {0, 1}, {4, 0}, {4, -1}, {15, -1}}; double const TH14K1::pos_table[11] = {-1, 4, -1, 0, 1, 2, 3, 4, 0, 0, 0}; @@ -2516,7 +2517,7 @@ bool TFV4aM::EQ(double pos, double i_pos) return (pos <= i_pos + 0.5) && (pos > i_pos - 0.5); } -//---FV4a/M--- nowonapisany kran bez poprawki IC +//---MHZ_EN57--- manipulator hamulca zespolonego do EN57 double TMHZ_EN57::GetPF( double i_bcp, double PP, double HP, double dt, double ep ) { static int const LBDelay = 100; @@ -2656,6 +2657,119 @@ bool TMHZ_EN57::EQ(double pos, double i_pos) return (pos <= i_pos + 0.5) && (pos > i_pos - 0.5); } +//---MHZ_K5P--- manipulator hamulca zespolonego Knorr 5-ciopozycyjny + +double TMHZ_K5P::GetPF(double i_bcp, double PP, double HP, double dt, double ep) { + static int const LBDelay = 100; + + double LimPP; + double dpPipe; + double dpMainValve; + double ActFlowSpeed; + double DP; + double pom; + + for (int idx = 0; idx < 5; ++idx) { + Sounds[idx] = 0; + } + + DP = 0; + + i_bcp = Max0R(Min0R(i_bcp, 2.999), -0.999); // na wszelki wypadek, zeby nie wyszlo poza zakres + + if ((TP > 0)) + { + DP = 0.004; + TP = TP - DP * dt; + Sounds[s_fv4a_t] = DP; + } + else + { + TP = 0; + } + + if (EQ(i_bcp, 1)) //odcięcie - nie rób nic + LimPP = CP; + else if (i_bcp > 1) //hamowanie + LimPP = 3.4; + else //luzowanie + LimPP = 5.0; + pom = CP; + LimPP = Min0R(LimPP + TP + RedAdj, HP); // pozycja + czasowy lub zasilanie + ActFlowSpeed = 4; + + if ((LimPP > CP)) // podwyzszanie szybkie + CP = CP + 9 * Min0R(abs(LimPP - CP), 0.05) * PR(CP, LimPP) * dt; // zbiornik sterujacy; + else + CP = CP + 9 * Min0R(abs(LimPP - CP), 0.05) * PR(CP, LimPP) * dt; // zbiornik sterujacy + + LimPP = pom; // cp + dpPipe = Min0R(HP, LimPP); + + if (dpPipe > PP) + dpMainValve = -PFVa(HP, PP, ActFlowSpeed / LBDelay, dpPipe, 0.4); + else + dpMainValve = PFVd(PP, 0, ActFlowSpeed / LBDelay, dpPipe, 0.4); + + if (EQ(i_bcp, -1)) + { + if ((TP < 1)) + TP = TP + 0.03 * dt; + } + + if (EQ(i_bcp, 3)) + { + DP = PF(0, PP, 2 * ActFlowSpeed / LBDelay); + dpMainValve = DP; + Sounds[s_fv4a_e] = DP; + Sounds[s_fv4a_u] = 0; + Sounds[s_fv4a_b] = 0; + Sounds[s_fv4a_x] = 0; + } + else + { + if (dpMainValve > 0) + Sounds[s_fv4a_b] = dpMainValve; + else + Sounds[s_fv4a_u] = -dpMainValve; + } + + return dpMainValve * dt; +} + +void TMHZ_K5P::Init(double Press) +{ + CP = Press; +} + +void TMHZ_K5P::SetReductor(double nAdj) +{ + RedAdj = nAdj; +} + +double TMHZ_K5P::GetSound(int i) +{ + if (i > 4) + return 0; + else + return Sounds[i]; +} + +double TMHZ_K5P::GetPos(int i) +{ + return pos_table[i]; +} + +double TMHZ_K5P::GetCP() +{ + return RP; +} + +bool TMHZ_K5P::EQ(double pos, double i_pos) +{ + return (pos <= i_pos + 0.5) && (pos > i_pos - 0.5); +} + //---M394--- Matrosow double TM394::GetPF(double i_bcp, double PP, double HP, double dt, double ep) diff --git a/McZapkie/hamulce.h b/McZapkie/hamulce.h index 93e89d37..07134e18 100644 --- a/McZapkie/hamulce.h +++ b/McZapkie/hamulce.h @@ -591,6 +591,31 @@ class TMHZ_EN57 : public TDriverHandle { {} }; +class TMHZ_K5P : public TDriverHandle { + +private: + double CP = 0.0; //zbiornik sterujący + double TP = 0.0; //zbiornik czasowy + double RP = 0.0; //zbiornik redukcyjny + double RedAdj = 0.0; //dostosowanie reduktora cisnienia (krecenie kapturkiem) + bool Fala = false; + static double const pos_table[11]; //= { -2, 10, -1, 0, 0, 2, 9, 10, 0, 0, 0 }; + + bool EQ(double pos, double i_pos); + +public: + double GetPF(double i_bcp, double PP, double HP, double dt, double ep)/*override*/; + void Init(double Press)/*override*/; + void SetReductor(double nAdj)/*override*/; + double GetSound(int i)/*override*/; + double GetPos(int i)/*override*/; + double GetCP()/*override*/; + + inline TMHZ_K5P(void) : + TDriverHandle() + {} +}; + /* FBS2= class(TTDriverHandle) private CP, TP, RP: real; //zbiornik sterujący, czasowy, redukcyjny From 0fe26048e9d55f4a5c621b2e3f3de48482684681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 3 Jun 2018 22:22:14 +0200 Subject: [PATCH 338/426] Modified loading of "Flat" parameter for EIM --- McZapkie/Mover.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 0179d83f..6b8335fe 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8474,8 +8474,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value( eimc[ eimc_p_eped ], "edep", Input, "" ); extract_value( EIMCLogForce, "eimclf", Input, "" ); - Flat = ( extract_value( "Flat", Input ) == "1" ); - + extract_value( Flat, "Flat", Input, ""); break; } default: { From e3f7ea33b3bbd996642b999d1e4a9173ad3247b2 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 9 Jun 2018 13:03:03 +0200 Subject: [PATCH 339/426] build 180609. vehicle engine revolutions parameter, minor ai logic tweaks --- Driver.cpp | 111 ++++++++++++++++++++++++++------------------- DynObj.cpp | 6 ++- McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 27 ++++++----- Train.cpp | 6 +-- version.h | 2 +- 6 files changed, 89 insertions(+), 64 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index e38e55c7..81de10c1 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1006,7 +1006,10 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN sSpeedTable[i].iFlags = 0; // W4 nie liczy się już (nie wyśle SetVelocity) sSpeedTable[i].fVelNext = -1; // można jechać za W4 fLastStopExpDist = -1.0f; // nie ma rozkładu, nie ma usuwania stacji +/* + // NOTE: disabled as it's no longer needed, required time is calculated as part of loading/unloading procedure WaitingSet(60); // tak ze 2 minuty, aż wszyscy wysiądą +*/ // wykonanie kolejnego rozkazu (Change_direction albo Shunt) JumpToNextOrder(); // ma się nie ruszać aż do momentu podania sygnału @@ -2274,7 +2277,7 @@ bool TController::PrepareEngine() { // najpierw ustalamy kierunek, jeśli nie został ustalony if( !iDirection ) { // jeśli nie ma ustalonego kierunku - if( mvOccupied->V == 0 ) { // ustalenie kierunku, gdy stoi + if( mvOccupied->Vel < 0.01 ) { // ustalenie kierunku, gdy stoi iDirection = mvOccupied->CabNo; // wg wybranej kabiny if( !iDirection ) { // jeśli nie ma ustalonego kierunku @@ -4610,20 +4613,7 @@ TController::UpdateSituation(double dt) { } // sprawdzamy możliwe ograniczenia prędkości - if( OrderCurrentGet() & ( Shunt | Obey_train ) ) { - // w Connect nie, bo moveStopHere odnosi się do stanu po połączeniu - if( ( iDrivigFlags & moveStopHere ) - && ( vel == 0.0 ) - && ( VelSignal == 0.0 ) ) { - // jeśli ma czekać na wolną drogę, stoi a wyjazdu nie ma, to ma stać - VelDesired = 0.0; - } - } - if( fStopTime < 0 ) { - // czas postoju przed dalszą jazdą (np. na przystanku) - VelDesired = 0.0; // jak ma czekać, to nie ma jazdy - } - else if( VelSignal >= 0 ) { + if( VelSignal >= 0 ) { // jeśli skład był zatrzymany na początku i teraz już może jechać VelDesired = min_speed( @@ -4640,27 +4630,56 @@ TController::UpdateSituation(double dt) { if( VelforDriver >= 0 ) { // tu jest zero przy zmianie kierunku jazdy // Ra: tu może być 40, jeśli mechanik nie ma znajomości szlaaku, albo kierowca jeździ 70 - VelDesired = min_speed( VelDesired, VelforDriver ); - } - if( ( TrainParams != nullptr ) - && ( TrainParams->CheckTrainLatency() < 5.0 ) - && ( TrainParams->TTVmax > 0.0 ) ) { - // jesli nie spozniony to nie przekraczać rozkladowej VelDesired = min_speed( VelDesired, - TrainParams->TTVmax ); + VelforDriver ); + } + if( fStopTime < 0 ) { + // czas postoju przed dalszą jazdą (np. na przystanku) + VelDesired = 0.0; // jak ma czekać, to nie ma jazdy } - if( ( VelDesired > 0.0 ) - && ( iDrivigFlags & moveGuardSignal ) - && ( OrderCurrentGet() & Obey_train ) ) { + if( ( OrderCurrentGet() & Obey_train ) != 0 ) { + + if( ( TrainParams->CheckTrainLatency() < 5.0 ) + && ( TrainParams->TTVmax > 0.0 ) ) { + // jesli nie spozniony to nie przekraczać rozkladowej + VelDesired = + min_speed( + VelDesired, + TrainParams->TTVmax ); + } + + if( ( ( iDrivigFlags & moveStopHere ) != 0 ) + && ( vel < 0.01 ) + && ( SemNextIndex != -1 ) + && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) + && ( sSpeedTable[ SemNextIndex ].fVelNext == 0.0 ) ) { + // don't depart if told to wait at passenger stop until allowed to by the signal + VelDesired = 0.0; + } + } + + if( ( OrderCurrentGet() & ( Shunt | Obey_train ) ) != 0 ) { + // w Connect nie, bo moveStopHere odnosi się do stanu po połączeniu + if( ( ( iDrivigFlags & moveStopHere ) != 0 ) + && ( vel < 0.01 ) + && ( VelSignal == 0.0 ) ) { + // jeśli ma czekać na wolną drogę, stoi a wyjazdu nie ma, to ma stać + VelDesired = 0.0; + } + } + // end of speed caps checks + + if( ( ( OrderCurrentGet() & Obey_train ) != 0 ) + && ( ( iDrivigFlags & moveGuardSignal ) != 0 ) + && ( VelDesired > 0.0 ) ) { // komunikat od kierownika tu, bo musi być wolna droga i odczekany czas stania iDrivigFlags &= ~moveGuardSignal; // tylko raz nadać if( false == tsGuardSignal.empty() ) { tsGuardSignal.stop(); - // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy - // bezpośrednim + // w zasadzie to powinien mieć flagę, czy jest dźwiękiem radiowym, czy bezpośrednim // albo trzeba zrobić dwa dźwięki, jeden bezpośredni, słyszalny w // pobliżu, a drugi radiowy, słyszalny w innych lokomotywach // na razie zakładam, że to nie jest dźwięk radiowy, bo trzeba by zrobić @@ -4675,8 +4694,7 @@ TController::UpdateSituation(double dt) { else { // if (iGuardRadio==iRadioChannel) //zgodność kanału // if (!FreeFlyModeFlag) //obserwator musi być w środku pojazdu - // (albo może mieć radio przenośne) - kierownik mógłby powtarzać - // przy braku reakcji + // (albo może mieć radio przenośne) - kierownik mógłby powtarzać przy braku reakcji // TODO: proper system for sending/receiving radio messages // place the sound in appropriate cab of the manned vehicle tsGuardSignal.owner( pVehicle ); @@ -4684,17 +4702,9 @@ TController::UpdateSituation(double dt) { tsGuardSignal.play( sound_flags::exclusive ); } } -/* - if( ( ( iDrivigFlags & moveStopHere ) == 0 ) - || ( ( SemNextIndex != -1 ) - && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) - && ( sSpeedTable[SemNextIndex].fVelNext != 0.0 ) ) ) { - // jeśli można jechać, to odpalić dźwięk kierownika oraz zamknąć drzwi w - // składzie, jeśli nie mamy czekać na sygnał też trzeba odpalić - } -*/ } - if( mvOccupied->V == 0.0 ) { + + if( mvOccupied->Vel < 0.01 ) { // Ra 2014-03: jesli skład stoi, to działa na niego składowa styczna grawitacji AbsAccS = fAccGravity; } @@ -5235,13 +5245,22 @@ TController::UpdateSituation(double dt) { } if (AIControllFlag) { // odhamowywanie składu po zatrzymaniu i zabezpieczanie lokomotywy - if ((OrderList[OrderPos] & (Disconnect | Connect)) == - 0) // przy (p)odłączaniu nie zwalniamy tu hamulca - if ((mvOccupied->V == 0.0) && ((VelDesired == 0.0) || (AccDesired == 0.0))) - if (mvOccupied->BrakeCtrlPos == mvOccupied->Handle->GetPos(bh_RP)) - mvOccupied->IncLocalBrakeLevel(1); // dodatkowy na pozycję 1 - else - mvOccupied->BrakeLevelSet(mvOccupied->Handle->GetPos(bh_RP)); + if( ( ( OrderList[ OrderPos ] & ( Disconnect | Connect ) ) == 0 ) + && ( std::abs( fAccGravity ) < 0.01 ) ) { + // przy (p)odłączaniu nie zwalniamy tu hamulca + // only do this on flats, on slopes keep applied the train brake + if( ( mvOccupied->Vel < 0.01 ) + && ( ( VelDesired == 0.0 ) + || ( AccDesired == 0.0 ) ) ) { + if( mvOccupied->BrakeCtrlPos == mvOccupied->Handle->GetPos( bh_RP ) ) { + // dodatkowy na pozycję 1 + mvOccupied->IncLocalBrakeLevel( 1 ); + } + else { + mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_RP ) ); + } + } + } } break; // rzeczy robione przy jezdzie } // switch (OrderList[OrderPos]) diff --git a/DynObj.cpp b/DynObj.cpp index c57d4a7a..09eb90c2 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4670,10 +4670,12 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, */ if( true == pAnimations.empty() ) { // jeśli nie ma jeszcze tabeli animacji, można odczytać nowe ilości - int co = 0, ile = -1; + int co = 0; iAnimations = 0; + int ile; do { // kolejne liczby to ilość animacj, -1 to znacznik końca + ile = -1; parser.getTokens( 1, false ); parser >> ile; // ilość danego typu animacji if (ile >= 0) @@ -6426,7 +6428,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub // main engine sound if( true == Vehicle.Mains ) { - if( ( std::fabs( Vehicle.enrot ) > 0.01 ) + if( ( std::abs( Vehicle.enrot ) > 0.01 ) // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach || ( Vehicle.EngineType == Dumb ) ) { diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index fa217caf..dec46d5e 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -741,6 +741,7 @@ public: double Mred = 0.0; /*Ra: zredukowane masy wirujące; potrzebne do obliczeń hamowania*/ double TotalMass = 0.0; /*wyliczane przez ComputeMass*/ double HeatingPower = 0.0; + double EngineHeatingRPM { 0.0 }; // guaranteed engine revolutions with heating enabled double LightPower = 0.0; /*moc pobierana na ogrzewanie/oswietlenie*/ double BatteryVoltage = 0.0; /*Winger - baterie w elektrykach*/ bool Battery = false; /*Czy sa zalavzone baterie*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 6b8335fe..56e2505e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3302,7 +3302,7 @@ void TMoverParameters::CompressorCheck(double dt) CompressedVolume += CompressorSpeed * ( 2.0 * MaxCompressor - Compressor ) / MaxCompressor - * ( DElist[ MainCtrlPos ].RPM / DElist[ MainCtrlPosNo ].RPM ) + * ( ( 60.0 * std::abs( enrot ) ) / DElist[ MainCtrlPosNo ].RPM ) * dt; } else { @@ -3467,7 +3467,7 @@ void TMoverParameters::CompressorCheck(double dt) // the compressor is coupled with the diesel engine, engine revolutions affect the output if( false == CompressorGovernorLock ) { auto const enginefactor { ( - EngineType == DieselElectric ? ( DElist[ MainCtrlPos ].RPM / DElist[ MainCtrlPosNo ].RPM ) : + EngineType == DieselElectric ? ( ( 60.0 * std::abs( enrot ) ) / DElist[ MainCtrlPosNo ].RPM ) : EngineType == DieselEngine ? ( std::abs( enrot ) / nmax ) : 1.0 ) }; // shouldn't ever get here but, eh CompressedVolume += @@ -4436,19 +4436,21 @@ double TMoverParameters::TractionForce( double dt ) { switch( EngineType ) { case DieselElectric: { if( ( true == Mains ) - && ( true == FuelPump.is_active ) ) { + && ( true == FuelPump.is_active ) ) { tmp = DElist[ MainCtrlPos ].RPM / 60.0; if( ( true == Heating ) - && ( HeatingPower > 0 ) - && ( MainCtrlPosNo > MainCtrlPos ) ) { - - int i = MainCtrlPosNo; - while( DElist[ i - 2 ].RPM / 60.0 > tmp ) { - --i; - } - tmp = DElist[ i ].RPM / 60.0; + && ( HeatingPower > 0 ) + && ( EngineHeatingRPM > 0 ) ) { + // bump engine revolutions up if needed, when heating is on + tmp = + std::max( + tmp, + std::min( + DElist[ MainCtrlPosNo ].RPM, + EngineHeatingRPM ) + / 60.0 ); } } else { @@ -4719,6 +4721,7 @@ double TMoverParameters::TractionForce( double dt ) { if( ( true == Mains ) && ( MainCtrlPos > 0 ) ) { Voltage = ( SST[ MainCtrlPos ].Umax * AnPos ) + ( SST[ MainCtrlPos ].Umin * ( 1.0 - AnPos ) ); // NOTE: very crude way to approximate power generated at current rpm instead of instant top output + // NOTE, TODO: doesn't take into account potentially increased revolutions if heating is on, fix it auto const rpmratio { 60.0 * enrot / DElist[ MainCtrlPos ].RPM }; tmp = rpmratio * ( SST[ MainCtrlPos ].Pmax * AnPos ) + ( SST[ MainCtrlPos ].Pmin * ( 1.0 - AnPos ) ); Ft = tmp * 1000.0 / ( abs( tmpV ) + 1.6 ); @@ -4735,6 +4738,7 @@ double TMoverParameters::TractionForce( double dt ) { if( true == Heating ) { power -= HeatingPower; } if( power < 0.0 ) { power = 0.0; } // NOTE: very crude way to approximate power generated at current rpm instead of instant top output + // NOTE, TODO: doesn't take into account potentially increased revolutions if heating is on, fix it auto const currentgenpower { ( DElist[ MainCtrlPos ].RPM > 0 ? DElist[ MainCtrlPos ].GenPower * ( 60.0 * enrot / DElist[ MainCtrlPos ].RPM ) : @@ -8444,6 +8448,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { ImaxHi = 2; ImaxLo = 1; } + extract_value( EngineHeatingRPM, "HeatingRPM", Input, "" ); break; } case ElectricInductionMotor: { diff --git a/Train.cpp b/Train.cpp index 1d830d27..5d2f7133 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5198,10 +5198,8 @@ bool TTrain::Update( double const Deltatime ) //--------- // hunter-080812: poprawka na ogrzewanie w elektrykach - usuniete uzaleznienie od przetwornicy if( ( mvControlled->Heating == true ) - && ( ( mvControlled->ConverterFlag ) - || ( ( mvControlled->EngineType == ElectricSeriesMotor ) - && ( mvControlled->Mains == true ) - && ( mvControlled->ConvOvldFlag == false ) ) ) ) + && ( mvControlled->Mains == true ) + && ( mvControlled->ConvOvldFlag == false ) ) btLampkaOgrzewanieSkladu.Turn( true ); else btLampkaOgrzewanieSkladu.Turn( false ); diff --git a/version.h b/version.h index 7166095d..020fbc89 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 531 +#define VERSION_MINOR 609 #define VERSION_REVISION 0 From 457de678c3c0545db9f5702dbadfe0d54b310e5d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 13 Jun 2018 16:51:57 +0200 Subject: [PATCH 340/426] basic scenery data export in legacy text format --- AnimModel.cpp | 112 +++++++--- AnimModel.h | 21 +- EvLaunch.cpp | 85 +++++++- EvLaunch.h | 17 +- Event.cpp | 244 +++++++++++++++++++-- Event.h | 10 +- MemCell.cpp | 35 ++++ MemCell.h | 12 +- Names.h | 3 + Segment.cpp | 62 ++++-- Segment.h | 18 ++ Track.cpp | 523 +++++++++++++++++++++++++++++++++++----------- Track.h | 23 +- Traction.cpp | 84 ++++++-- Traction.h | 17 +- TractionPower.cpp | 46 ++++ TractionPower.h | 42 ++-- World.cpp | 84 ++++---- scene.cpp | 35 +++- scene.h | 11 +- scenenode.cpp | 61 +++++- scenenode.h | 34 ++- simulation.cpp | 68 +++++- simulation.h | 4 + sound.cpp | 37 ++++ sound.h | 3 + uilayer.cpp | 1 + 27 files changed, 1383 insertions(+), 309 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 1f34f67a..e0f108a6 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -423,13 +423,6 @@ TAnimModel::~TAnimModel() SafeDelete(pRoot); } -bool TAnimModel::Init(TModel3d *pNewModel) -{ - fBlinkTimer = double(Random(1000 * fOffTime)) / (1000 * fOffTime); - pModel = pNewModel; - return (pModel != nullptr); -} - bool TAnimModel::Init(std::string const &asName, std::string const &asReplacableTexture) { if( asReplacableTexture.substr( 0, 1 ) == "*" ) { @@ -445,17 +438,21 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable m_materialdata.textures_alpha = 0x31310031; } else{ - // tekstura nieprzezroczysta - nie renderować w cyklu + // tekstura nieprzezroczysta - nie renderować w cyklu przezroczystych m_materialdata.textures_alpha = 0x30300030; } - // przezroczystych - return (Init(TModelsManager::GetModel(asName))); + + fBlinkTimer = double( Random( 1000 * fOffTime ) ) / ( 1000 * fOffTime ); + + pModel = TModelsManager::GetModel( asName ); + return ( pModel != nullptr ); } bool TAnimModel::Load(cParser *parser, bool ter) { // rozpoznanie wpisu modelu i ustawienie świateł std::string name = parser->getToken(); - std::string texture = parser->getToken(false); // tekstura (zmienia na małe) + std::string texture = parser->getToken(); // tekstura (zmienia na małe) + replace_slashes( name ); if (!Init( name, texture )) { if (name != "notload") @@ -504,7 +501,7 @@ bool TAnimModel::Load(cParser *parser, bool ter) while( ( token != "" ) && ( token != "endmodel" ) ) { - LightSet( i, std::stod( token ) ); // stan światła jest liczbą z ułamkiem + LightSet( i, std::stof( token ) ); // stan światła jest liczbą z ułamkiem ++i; token = ""; @@ -563,15 +560,6 @@ void TAnimModel::RaAnimate( unsigned int const Framestamp ) { m_framestamp = Framestamp; }; -// calculates piece's bounding radius -void -TAnimModel::radius_() { - - if( pModel != nullptr ) { - m_area.radius = pModel->bounding_radius(); - } -} - void TAnimModel::RaPrepare() { // ustawia światła i animacje we wzorcu modelu przed renderowaniem egzemplarza bool state; // stan światła @@ -584,7 +572,11 @@ void TAnimModel::RaPrepare() state = ( fBlinkTimer < fOnTime ); break; case ls_Dark: // zapalone, gdy ciemno - state = ( Global.fLuminance <= ( lsLights[i] - 3.0 ) ); + state = ( + Global.fLuminance <= ( + lsLights[i] == 3.f ? + DefaultDarkThresholdLevel : + ( lsLights[i] - 3.f ) ) ); break; default: // zapalony albo zgaszony state = (lightmode == ls_On); @@ -780,15 +772,17 @@ void TAnimModel::LightSet(int const n, float const v) } case ls_Dark: { // zapalenie świateł zależne od oświetlenia scenerii - if( v == 3.0 ) { +/* + if( v == 3.f ) { // standardowy próg zaplania - lsLights[ n ] = 3.0 + DefaultDarkThresholdLevel; + lsLights[ n ] = 3.f + DefaultDarkThresholdLevel; } +*/ break; } } }; -//--------------------------------------------------------------------------- + void TAnimModel::AnimUpdate(double dt) { // wykonanie zakolejkowanych animacji, nawet gdy modele nie są aktualnie wyświetlane TAnimContainer *p = TAnimModel::acAnimList; @@ -798,4 +792,72 @@ void TAnimModel::AnimUpdate(double dt) p = p->acAnimNext; // na razie bez usuwania z listy, bo głównie obrotnica na nią wchodzi } }; + +// radius() subclass details, calculates node's bounding radius +float +TAnimModel::radius_() { + + return ( + pModel ? + pModel->bounding_radius() : + 0.f ); +} + +// serialize() subclass details, sends content of the subclass to provided stream +void +TAnimModel::serialize_( std::ostream &Output ) const { + + // TODO: implement +} +// deserialize() subclass details, restores content of the subclass from provided stream +void +TAnimModel::deserialize_( std::istream &Input ) { + + // TODO: implement +} + +// export() subclass details, sends basic content of the class in legacy (text) format to provided stream +void +TAnimModel::export_as_text_( std::ostream &Output ) const { + // header + Output << "model "; + // location and rotation + Output + << location().x << ' ' + << location().y << ' ' + << location().z << ' ' + << vAngle.y << ' '; + // 3d shape + auto modelfile { ( + pModel ? + pModel->NameGet() + ".t3d" : // rainsted requires model file names to include an extension + "none" ) }; + if( modelfile.find( szModelPath ) == 0 ) { + // don't include 'models/' in the path + modelfile.erase( 0, std::string{ szModelPath }.size() ); + } + Output << modelfile << ' '; + // texture + auto texturefile { ( + m_materialdata.replacable_skins[ 1 ] != null_handle ? + GfxRenderer.Material( m_materialdata.replacable_skins[ 1 ] ).name : + "none" ) }; + if( texturefile.find( szTexturePath ) == 0 ) { + // don't include 'textures/' in the path + texturefile.erase( 0, std::string{ szTexturePath }.size() ); + } + Output << texturefile << ' '; + // light submodels activation configuration + if( iNumLights > 0 ) { + Output << "lights "; + for( int lightidx = 0; lightidx < iNumLights; ++lightidx ) { + Output << lsLights[ lightidx ] << ' '; + } + } + // footer + Output + << "endmodel" + << "\n"; +} + //--------------------------------------------------------------------------- diff --git a/AnimModel.h b/AnimModel.h index 7cdb5248..de4124ae 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -122,7 +122,7 @@ class TAnimAdvanced }; // opakowanie modelu, określające stan egzemplarza -class TAnimModel : public editor::basic_node { +class TAnimModel : public scene::basic_node { friend class opengl_renderer; @@ -133,15 +133,12 @@ public: ~TAnimModel(); // methods static void AnimUpdate( double dt ); - bool Init(TModel3d *pNewModel); bool Init(std::string const &asName, std::string const &asReplacableTexture); bool Load(cParser *parser, bool ter = false); TAnimContainer * AddContainer(std::string const &Name); TAnimContainer * GetContainer(std::string const &Name = ""); void RaAnglesSet( glm::vec3 Angles ) { - vAngle.x = Angles.x; - vAngle.y = Angles.y; - vAngle.z = Angles.z; }; + vAngle = { Angles }; }; void LightSet( int const n, float const v ); void AnimationVND( void *pData, double a, double b, double c, double d ); bool TerrainLoaded(); @@ -159,16 +156,20 @@ public: // members static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania -protected: - // calculates piece's bounding radius - void - radius_(); - private: // methods void RaPrepare(); // ustawienie animacji egzemplarza na wzorcu void RaAnimate( unsigned int const Framestamp ); // przeliczenie animacji egzemplarza void Advanced(); + // radius() subclass details, calculates node's bounding radius + float radius_(); + // serialize() subclass details, sends content of the subclass to provided stream + void serialize_( std::ostream &Output ) const; + // deserialize() subclass details, restores content of the subclass from provided stream + void deserialize_( std::istream &Input ); + // export() subclass details, sends basic content of the class in legacy (text) format to provided stream + void export_as_text_( std::ostream &Output ) const; + // members TAnimContainer *pRoot { nullptr }; // pojemniki sterujące, tylko dla aniomowanych submodeli TModel3d *pModel { nullptr }; diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 30700599..999925d2 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -194,11 +194,90 @@ bool TEventLauncher::IsGlobal() const { && ( dRadius < 0.0 ) ); // bez ograniczenia zasięgu } -// calculates node's bounding radius -void +// radius() subclass details, calculates node's bounding radius +float TEventLauncher::radius_() { - m_area.radius = std::sqrt( dRadius ); + return std::sqrt( dRadius ); +} + +// serialize() subclass details, sends content of the subclass to provided stream +void +TEventLauncher::serialize_( std::ostream &Output ) const { + + // TODO: implement +} +// deserialize() subclass details, restores content of the subclass from provided stream +void +TEventLauncher::deserialize_( std::istream &Input ) { + + // TODO: implement +} + +// export() subclass details, sends basic content of the class in legacy (text) format to provided stream +void +TEventLauncher::export_as_text_( std::ostream &Output ) const { + // header + Output << "eventlauncher "; + // location + Output + << location().x << ' ' + << location().y << ' ' + << location().z << ' '; + // activation radius + Output + << ( dRadius > 0 ? std::sqrt( dRadius ) : dRadius ) << ' '; + // activation key + if( iKey != 0 ) { + auto const key { iKey & 0xff }; + auto const modifier { ( iKey & 0xff00 ) >> 8 }; + if( ( key >= GLFW_KEY_A ) && ( key <= GLFW_KEY_Z ) ) { + Output << static_cast(( 'A' + key - GLFW_KEY_A + ( ( modifier & 1 ) == 0 ? 32 : 0 ) )) << ' '; + } + else if( ( key >= GLFW_KEY_0 ) && ( key <= GLFW_KEY_9 ) ) { + Output << static_cast(( '0' + key - GLFW_KEY_0 )) << ' '; + } + } + else { + Output << "none "; + } + // activation interval or hour + if( DeltaTime != 0 ) { + // cyclical launcher + Output << -DeltaTime << ' '; + } + else { + // single activation at specified time + if( ( iHour < 0 ) + && ( iMinute < 0 ) ) { + Output << DeltaTime << ' '; + } + else { + // NOTE: activation hour might be affected by user-requested time offset + auto const timeoffset{ static_cast( Global.ScenarioTimeOffset * 60 ) }; + auto const adjustedtime{ clamp_circular( iHour * 60 + iMinute - timeoffset, 24 * 60 ) }; + Output + << ( adjustedtime / 60 ) % 24 + << ( adjustedtime % 60 ) + << ' '; + } + } + // associated event(s) + Output << ( asEvent1Name.empty() ? "none" : asEvent1Name ) << ' '; + Output << ( asEvent2Name.empty() ? "none" : asEvent2Name ) << ' '; + if( false == asMemCellName.empty() ) { + // conditional event + Output + << "condition " + << asMemCellName << ' ' + << szText << ' ' + << ( ( iCheckMask & conditional_memval1 ) != 0 ? to_string( fVal1 ) : "*" ) << ' ' + << ( ( iCheckMask & conditional_memval2 ) != 0 ? to_string( fVal2 ) : "*" ) << ' '; + } + // footer + Output + << "end" + << "\n"; } //--------------------------------------------------------------------------- diff --git a/EvLaunch.h b/EvLaunch.h index b10bed2d..83487d50 100644 --- a/EvLaunch.h +++ b/EvLaunch.h @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "Classes.h" #include "scenenode.h" -class TEventLauncher : public editor::basic_node { +class TEventLauncher : public scene::basic_node { public: // constructor @@ -37,12 +37,17 @@ public: int iCheckMask { 0 }; double dRadius { 0.0 }; -protected: - // calculates node's bounding radius - void - radius_(); - private: +// methods + // radius() subclass details, calculates node's bounding radius + float radius_(); + // serialize() subclass details, sends content of the subclass to provided stream + void serialize_( std::ostream &Output ) const; + // deserialize() subclass details, restores content of the subclass from provided stream + void deserialize_( std::istream &Input ); + // export() subclass details, sends basic content of the class in legacy (text) format to provided stream + void export_as_text_( std::ostream &Output ) const; + // members int iKey { 0 }; double DeltaTime { -1.0 }; diff --git a/Event.cpp b/Event.cpp index 45155d95..761c95f6 100644 --- a/Event.cpp +++ b/Event.cpp @@ -304,9 +304,9 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) if (token.find('#') != std::string::npos) token.erase(token.find('#')); // obcięcie unikatowości win1250_to_ascii( token ); // get rid of non-ascii chars - bEnabled = false; // nie do kolejki (dla SetVelocity też, ale jak jest do toru - // dowiązany) Params[6].asCommand = cm_PassengerStopPoint; + // nie do kolejki (dla SetVelocity też, ale jak jest do toru dowiązany) + bEnabled = false; } else if (token == "SetVelocity") { @@ -328,11 +328,6 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) bEnabled = false; Params[6].asCommand = cm_ShuntVelocity; } - //else if (str == "SetProximityVelocity") - //{ - // bEnabled = false; - // Params[6].asCommand = cm_SetProximityVelocity; - //} else if (token == "OutsideStation") { bEnabled = false; // ma być skanowny, aby AI nie przekraczało W5 @@ -391,6 +386,11 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) } } } while( token.compare( "endevent" ) != 0 ); + while( paramidx < 8 ) { + // HACK: mark unspecified lights with magic value + Params[ paramidx ].asdouble = -2.0; + ++paramidx; + } break; } case tp_Visible: // zmiana wyświetlania obiektu @@ -403,7 +403,7 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) case tp_Velocity: parser->getTokens(); *parser >> token; - Params[0].asdouble = atof(token.c_str()) * 0.28; + Params[0].asdouble = atof(token.c_str()) * ( 1000.0 / 3600.0 ); parser->getTokens(); *parser >> token; break; @@ -420,7 +420,6 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) *parser >> token; break; case tp_Exit: - asNodeName = ExchangeCharInString( asNodeName, '_', ' ' ); parser->getTokens(); *parser >> token; break; @@ -605,6 +604,191 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) } }; +// sends basic content of the class in legacy (text) format to provided stream +void +TEvent::export_as_text( std::ostream &Output ) const { + + if( Type == tp_Unknown ) { return; } + + // header + Output << "event "; + // name + Output << asName << ' '; + // type + std::vector const types { + "unknown", "sound", "exit", "disable", "velocity", "animation", "lights", + "updatevalues", "getvalues", "putvalues", "switch", "dynvel", "trackvel", + "multiple", "addvalues", "copyvalues", "whois", "logvalues", "visible", + "voltage", "message", "friction" }; + Output << types[ Type ] << ' '; + // delay + Output << fDelay << ' '; + // associated node + Output << ( asNodeName.empty() ? "none" : asNodeName ) << ' '; + // type-specific attributes + switch( Type ) { + case tp_AddValues: + case tp_UpdateValues: { + Output + << ( ( iFlags & update_memstring ) == 0 ? "*" : Params[ 0 ].asText ) << ' ' + << ( ( iFlags & update_memval1 ) == 0 ? "*" : to_string( Params[ 1 ].asdouble ) ) << ' ' + << ( ( iFlags & update_memval2 ) == 0 ? "*" : to_string( Params[ 2 ].asdouble ) ) << ' '; + break; + } + case tp_CopyValues: { + // NOTE: there's no way to get the original parameter value if it doesn't point to existing memcell + Output + << ( Params[ 9 ].asMemCell == nullptr ? "none" : Params[ 9 ].asMemCell->name() ) << ' ' + << ( iFlags & ( update_memstring | update_memval1 | update_memval2 ) ) << ' '; + break; + } + case tp_PutValues: { + Output + // location + << Params[ 3 ].asdouble << ' ' + << Params[ 4 ].asdouble << ' ' + << Params[ 5 ].asdouble << ' ' + // command + << Params[ 0 ].asText << ' ' + << Params[ 1 ].asdouble << ' ' + << Params[ 2 ].asdouble << ' '; + break; + } + case tp_Multiple: { + // NOTE: conditional_anyelse won't work when event cap is removed + bool hasconditionalelse { false }; + for( auto eventidx = 0; eventidx < 8; ++eventidx ) { + if( Params[ eventidx ].asEvent == nullptr ) { continue; } + if( ( iFlags & ( conditional_else << eventidx ) ) == 0 ) { + Output << Params[ eventidx ].asEvent->asName << ' '; + } + else { + // this event is executed as part of the 'else' block + hasconditionalelse = true; + } + } + // optional 'else' block + if( true == hasconditionalelse ) { + Output << "else "; + for( auto eventidx = 0; eventidx < 8; ++eventidx ) { + if( Params[ eventidx ].asEvent == nullptr ) { continue; } + if( ( iFlags & ( conditional_else << eventidx ) ) != 0 ) { + Output << Params[ eventidx ].asEvent->asName << ' '; + } + } + } + break; + } + case tp_Visible: { + Output << Params[ 0 ].asInt << ' '; + break; + } + case tp_Switch: { + Output << Params[ 0 ].asInt << ' '; + if( ( Params[ 1 ].asdouble != -1.0 ) + || ( Params[ 2 ].asdouble != -1.0 ) ) { + Output << Params[ 1 ].asdouble << ' '; + } + if( Params[ 2 ].asdouble != -1.0 ) { + Output << Params[ 2 ].asdouble << ' '; + } + break; + } + case tp_Lights: { + auto lightidx { 0 }; + while( ( lightidx < iMaxNumLights ) + && ( Params[ lightidx ].asdouble > -2.0 ) ) { + Output << Params[ lightidx ].asdouble << ' '; + ++lightidx; + } + break; + } + case tp_Animation: { + // animation type + Output << ( + Params[ 0 ].asInt == 1 ? "rotate" : + Params[ 0 ].asInt == 2 ? "translate" : + // NOTE: .vmd animation doesn't preserve file name, can't be exported. TODO: fix this + Params[ 0 ].asInt == 8 ? "digital" : + "none" ) + << ' '; + // submodel + Output << ( + Params[ 9 ].asAnimContainer != nullptr ? + Params[ 9 ].asAnimContainer->NameGet() : + "none" ) << ' '; + // animation parameters + Output + << Params[ 1 ].asdouble << ' ' + << Params[ 2 ].asdouble << ' ' + << Params[ 3 ].asdouble << ' ' + << Params[ 4 ].asdouble << ' '; + break; + } + case tp_Sound: { + // playback mode + Output << Params[ 0 ].asInt << ' '; + // optional radio channel + if( Params[ 1 ].asdouble > 0.0 ) { + Output << Params[ 1 ].asdouble << ' '; + } + break; + } + case tp_DynVel: + case tp_TrackVel: + case tp_Voltage: + case tp_Friction: { + Output << Params[ 0 ].asdouble << ' '; + break; + } + case tp_Velocity: { + Output << Params[ 0 ].asdouble * ( 3600.0 / 1000.0 ) << ' '; + break; + } + case tp_WhoIs: { + Output + << ( iFlags & ( update_memstring | update_memval1 | update_memval2 ) ) << ' '; + break; + } + default: { + break; + } + } + // optional conditions + // NOTE: for flexibility condition check and export is performed for all event types rather than only for these which support it currently + auto const isconditional { ( conditional_trackoccupied | conditional_trackfree | conditional_propability | conditional_memcompare ) }; + if( ( ( iFlags & isconditional ) != 0 ) ) { + Output << "condition "; + if( ( iFlags & conditional_trackoccupied ) != 0 ) { + Output << "trackoccupied "; + } + else if( ( iFlags & conditional_trackfree ) != 0 ) { + Output << "trackfree "; + } + else if( ( iFlags & conditional_propability ) != 0 ) { + Output + << "propability " + << Params[ 10 ].asdouble << ' '; + } + else if( ( iFlags & conditional_memcompare ) != 0 ) { + Output + << "memcompare " + << ( ( iFlags & conditional_memstring ) == 0 ? "*" : Params[ 10 ].asText ) << ' ' + << ( ( iFlags & conditional_memval1 ) == 0 ? "*" : to_string( Params[ 11 ].asdouble ) ) << ' ' + << ( ( iFlags & conditional_memval2 ) == 0 ? "*" : to_string( Params[ 12 ].asdouble ) ) << ' '; + } + } + if( fRandomDelay != 0.0 ) { + Output + << "randomdelay " + << fRandomDelay << ' '; + } + // footer + Output + << "endevent" + << "\n"; +} + void TEvent::AddToQuery( TEvent *Event, TEvent *&Start ) { TEvent *target( Start ); @@ -1002,6 +1186,10 @@ event_manager::CheckQuery() { case tp_Lights: { if( m_workevent->Params[ 9 ].asModel ) { for( i = 0; i < iMaxNumLights; ++i ) { + if( m_workevent->Params[ i ].asdouble == -2.0 ) { + // processed all supplied values, bail out + break; + } if( m_workevent->Params[ i ].asdouble >= 0 ) { // -1 zostawia bez zmiany m_workevent->Params[ 9 ].asModel->LightSet( @@ -1013,8 +1201,8 @@ event_manager::CheckQuery() { break; } case tp_Visible: { - if( m_workevent->Params[ 9 ].asEditorNode ) - m_workevent->Params[ 9 ].asEditorNode->visible( m_workevent->Params[ 0 ].asInt > 0 ); + if( m_workevent->Params[ 9 ].asSceneNode ) + m_workevent->Params[ 9 ].asSceneNode->visible( m_workevent->Params[ 0 ].asInt > 0 ); break; } case tp_Velocity: { @@ -1022,8 +1210,12 @@ event_manager::CheckQuery() { break; } case tp_Exit: { - MessageBox( 0, m_workevent->asNodeName.c_str(), " THE END ", MB_OK ); - Global.iTextMode = -1; // wyłączenie takie samo jak sekwencja F10 -> Y + // wyłączenie takie samo jak sekwencja F10 -> Y + MessageBox( + 0, + ExchangeCharInString( m_workevent->asNodeName, '_', ' ' ).c_str(), + " THE END ", + MB_OK ); return false; } case tp_Sound: { @@ -1404,7 +1596,6 @@ event_manager::InitEvents() { else { ErrorLog( "Bad event: animation event \"" + event->asName + "\" cannot find model instance \"" + event->asNodeName + "\"" ); } - event->asNodeName = ""; break; } case tp_Lights: { @@ -1414,12 +1605,11 @@ event_manager::InitEvents() { event->Params[ 9 ].asModel = instance; else ErrorLog( "Bad event: lights event \"" + event->asName + "\" cannot find model instance \"" + event->asNodeName + "\"" ); - event->asNodeName = ""; break; } case tp_Visible: { // ukrycie albo przywrócenie obiektu - editor::basic_node *node = simulation::Instances.find( event->asNodeName ); // najpierw model + scene::basic_node *node = simulation::Instances.find( event->asNodeName ); // najpierw model if( node == nullptr ) { // albo tory? node = simulation::Paths.find( event->asNodeName ); @@ -1429,12 +1619,11 @@ event_manager::InitEvents() { node = simulation::Traction.find( event->asNodeName ); } if( node != nullptr ) - event->Params[ 9 ].asEditorNode = node; + event->Params[ 9 ].asSceneNode = node; else { event->m_ignored = true; ErrorLog( "Bad event: visibility event \"" + event->asName + "\" cannot find item \"" + event->asNodeName + "\"" ); } - event->asNodeName = ""; break; } case tp_Switch: { @@ -1460,7 +1649,6 @@ event_manager::InitEvents() { else { ErrorLog( "Bad event: switch event \"" + event->asName + "\" cannot find track \"" + event->asNodeName + "\"" ); } - event->asNodeName = ""; break; } case tp_Sound: { @@ -1470,7 +1658,6 @@ event_manager::InitEvents() { event->Params[ 9 ].tsTextSound = sound; else ErrorLog( "Bad event: sound event \"" + event->asName + "\" cannot find static sound \"" + event->asNodeName + "\"" ); - event->asNodeName = ""; break; } case tp_TrackVel: { @@ -1486,7 +1673,6 @@ event_manager::InitEvents() { ErrorLog( "Bad event: track velocity event \"" + event->asName + "\" cannot find track \"" + event->asNodeName + "\"" ); } } - event->asNodeName = ""; break; } case tp_DynVel: { @@ -1500,7 +1686,6 @@ event_manager::InitEvents() { else ErrorLog( "Bad event: vehicle velocity event \"" + event->asName + "\" cannot find vehicle \"" + event->asNodeName + "\"" ); } - event->asNodeName = ""; break; } case tp_Multiple: { @@ -1548,7 +1733,6 @@ event_manager::InitEvents() { else ErrorLog( "Bad event: voltage event \"" + event->asName + "\" cannot find power source \"" + event->asNodeName + "\"" ); } - event->asNodeName = ""; break; } case tp_Message: { @@ -1597,6 +1781,20 @@ event_manager::InitLaunchers() { } } +// sends basic content of the class in legacy (text) format to provided stream +void +event_manager::export_as_text( std::ostream &Output ) const { + + Output << "// events\n"; + for( auto const *event : m_events ) { + event->export_as_text( Output ); + } + Output << "// event launchers\n"; + for( auto const *launcher : m_launchers.sequence() ) { + launcher->export_as_text( Output ); + } +} + // legacy method, verifies condition for specified event bool event_manager::EventConditon( TEvent *Event ) { diff --git a/Event.h b/Event.h index 27bad969..13d62043 100644 --- a/Event.h +++ b/Event.h @@ -17,7 +17,6 @@ http://mozilla.org/MPL/2.0/. enum TEventType { tp_Unknown, tp_Sound, - tp_SoundPos, tp_Exit, tp_Disable, tp_Velocity, @@ -31,7 +30,6 @@ enum TEventType { tp_TrackVel, tp_Multiple, tp_AddValues, -// tp_Ignored, // NOTE: refactored to separate flag tp_CopyValues, tp_WhoIs, tp_LogValues, @@ -61,7 +59,7 @@ union TParam { void *asPointer; TMemCell *asMemCell; - editor::basic_node *asEditorNode; + scene::basic_node *asSceneNode; glm::dvec3 const *asLocation; TTrack *asTrack; TAnimModel *asModel; @@ -103,6 +101,9 @@ public: TEvent(std::string const &m = ""); ~TEvent(); void Load(cParser *parser, Math3D::vector3 const &org); + // sends basic content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; static void AddToQuery( TEvent *Event, TEvent *&Start ); std::string CommandGet(); TCommandType Command(); @@ -151,6 +152,9 @@ public: // legacy method, initializes event launchers after deserialization from scenario file void InitLaunchers(); + // sends basic content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; private: // types diff --git a/MemCell.cpp b/MemCell.cpp index 7e8b379f..12128e24 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -164,6 +164,41 @@ void TMemCell::AssignEvents(TEvent *e) OnSent = e; }; +// serialize() subclass details, sends content of the subclass to provided stream +void +TMemCell::serialize_( std::ostream &Output ) const { + + // TODO: implement +} +// deserialize() subclass details, restores content of the subclass from provided stream +void +TMemCell::deserialize_( std::istream &Input ) { + + // TODO: implement +} + +// export() subclass details, sends basic content of the class in legacy (text) format to provided stream +void +TMemCell::export_as_text_( std::ostream &Output ) const { + // header + Output << "memcell "; + // location + Output + << location().x << ' ' + << location().y << ' ' + << location().z << ' ' + // cell data + << szText << ' ' + << fValue1 << ' ' + << fValue2 << ' ' + // associated track + << ( asTrackName.empty() ? "none" : asTrackName ) << ' ' + // footer + << "endmemcell" + << "\n"; +} + + // legacy method, initializes traction after deserialization from scenario file diff --git a/MemCell.h b/MemCell.h index adbbcbfd..de54860f 100644 --- a/MemCell.h +++ b/MemCell.h @@ -13,10 +13,11 @@ http://mozilla.org/MPL/2.0/. #include "scenenode.h" #include "names.h" -class TMemCell : public editor::basic_node { +class TMemCell : public scene::basic_node { public: std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac + bool is_exportable { true }; // export helper; autogenerated cells don't need to be exported explicit TMemCell( scene::node_data const &Nodedata ); @@ -49,6 +50,15 @@ public: void AssignEvents(TEvent *e); private: +// methods + // serialize() subclass details, sends content of the subclass to provided stream + void serialize_( std::ostream &Output ) const; + // deserialize() subclass details, restores content of the subclass from provided stream + void deserialize_( std::istream &Input ); + // export() subclass details, sends basic content of the class in legacy (text) format to provided stream + void export_as_text_( std::ostream &Output ) const; + +// members // content std::string szText; double fValue1 { 0.0 }; diff --git a/Names.h b/Names.h index 0a7c534d..e8cc93b0 100644 --- a/Names.h +++ b/Names.h @@ -60,5 +60,8 @@ public: type_sequence & sequence() { return m_items; } + type_sequence const & + sequence() const { + return m_items; } }; diff --git a/Segment.cpp b/Segment.cpp index fdd82ece..91999747 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -18,8 +18,36 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- -// 101206 Ra: trapezoidalne drogi -// 110806 Ra: odwrócone mapowanie wzdłuż - Point1 == 1.0 +// helper, restores content of a 3d vector from provided input stream +// TODO: review and clean up the helper routines, there's likely some redundant ones +Math3D::vector3 LoadPoint( cParser &Input ) { + // pobranie współrzędnych punktu + Input.getTokens( 3 ); + Math3D::vector3 point; + Input + >> point.x + >> point.y + >> point.z; + + return point; +} + + +void +segment_data::deserialize( cParser &Input, Math3D::vector3 const &Offset ) { + + points[ segment_data::point::start ] = LoadPoint( Input ) + Offset; + Input.getTokens(); + Input >> rolls[ 0 ]; + points[ segment_data::point::control1 ] = LoadPoint( Input ); + points[ segment_data::point::control2 ] = LoadPoint( Input ); + points[ segment_data::point::end ] = LoadPoint( Input ) + Offset; + Input.getTokens( 2 ); + Input + >> rolls[ 1 ] + >> radius; +} + TSegment::TSegment(TTrack *owner) : pOwner( owner ) @@ -62,6 +90,7 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M // poprawienie przechyłki fRoll1 = glm::radians(fNewRoll1); // Ra: przeliczone jest bardziej przydatne do obliczeń fRoll2 = glm::radians(fNewRoll2); + bCurve = bIsCurve; if (Global.bRollFix) { // Ra: poprawianie przechyłki // Przechyłka powinna być na środku wewnętrznej szyny, a standardowo jest w osi @@ -91,7 +120,6 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M // kąt w planie, żeby nie liczyć wielokrotnie // Ra: ten kąt jeszcze do przemyślenia jest fDirection = -std::atan2(Point2.x - Point1.x, Point2.z - Point1.z); - bCurve = bIsCurve; if (bCurve) { // przeliczenie współczynników wielomianu, będzie mniej mnożeń i można policzyć pochodne vC = 3.0 * (CPointOut - Point1); // t^1 @@ -99,9 +127,9 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M vA = Point2 - Point1 - vC - vB; // t^3 fLength = ComputeLength(); } - else - fLength = (Point1 - Point2).Length(); - fStep = fNewStep; + else { + fLength = ( Point1 - Point2 ).Length(); + } if (fLength <= 0) { ErrorLog( "Bad track: zero length spline \"" + pOwner->name() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); @@ -111,17 +139,25 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M */ } - if( ( pOwner->eType == tt_Switch ) - && ( fStep * 3.0 > fLength ) ) { - // NOTE: a workaround for too short switches (less than 3 segments) messing up animation/generation of blades - fStep = fLength / 3.0; - } - fStoop = std::atan2((Point2.y - Point1.y), fLength); // pochylenie toru prostego, żeby nie liczyć wielokrotnie - SafeDeleteArray(fTsBuffer); + fStep = fNewStep; + // NOTE: optionally replace this part with the commented version, after solving geometry issues with double switches + if( ( pOwner->eType == tt_Switch ) + && ( fStep * ( 3.0 * Global.SplineFidelity ) > fLength ) ) { + // NOTE: a workaround for too short switches (less than 3 segments) messing up animation/generation of blades + fStep = fLength / ( 3.0 * Global.SplineFidelity ); + } iSegCount = static_cast( std::ceil( fLength / fStep ) ); // potrzebne do VBO +/* + iSegCount = ( + pOwner->eType == tt_Switch ? + 6 * Global.SplineFidelity : + static_cast( std::ceil( fLength / fStep ) ) ); // potrzebne do VBO +*/ fStep = fLength / iSegCount; // update step to equalize size of individual pieces + + SafeDeleteArray( fTsBuffer ); fTsBuffer = new double[ iSegCount + 1 ]; fTsBuffer[ 0 ] = 0.0; for( int i = 1; i < iSegCount; ++i ) { diff --git a/Segment.h b/Segment.h index 4b138fe4..c2adc3a6 100644 --- a/Segment.h +++ b/Segment.h @@ -14,6 +14,24 @@ http://mozilla.org/MPL/2.0/. #include "openglgeometrybank.h" #include "utilities.h" +struct segment_data { +// types + enum point { + start = 0, + control1, + control2, + end + }; +// members + std::array points {}; + std::array rolls {}; + float radius {}; +// constructors + segment_data() = default; +// methods + void deserialize( cParser &Input, Math3D::vector3 const &Offset ); +}; + class TSegment { // aproksymacja toru (zwrotnica ma dwa takie, jeden z nich jest aktywny) private: diff --git a/Track.cpp b/Track.cpp index 596f3116..29fc9b30 100644 --- a/Track.cpp +++ b/Track.cpp @@ -343,14 +343,6 @@ void TTrack::ConnectNextNext(TTrack *pTrack, int typ) } } -Math3D::vector3 LoadPoint(cParser *parser) -{ // pobranie współrzędnych punktu - Math3D::vector3 p; - parser->getTokens(3); - *parser >> p.x >> p.y >> p.z; - return p; -} - void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) { // pobranie obiektu trajektorii ruchu Math3D::vector3 pt, vec, p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań @@ -473,20 +465,44 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) WriteLog("unvis"); Init(); // ustawia SwitchExtension double segsize = 5.0; // długość odcinka segmentowania - switch (eType) - { // Ra: łuki segmentowane co 5m albo 314-kątem foremnym - case tt_Table: // obrotnica jest prawie jak zwykły tor + + // path data + // all subtypes contain at least one path + m_paths.emplace_back(); + m_paths.back().deserialize( *parser, pOrigin ); + switch( eType ) { + case tt_Switch: + case tt_Cross: + case tt_Tributary: { + // these subtypes contain additional path + m_paths.emplace_back(); + m_paths.back().deserialize( *parser, pOrigin ); + break; + } + default: { + break; + } + } + + switch (eType) { + // Ra: łuki segmentowane co 5m albo 314-kątem foremnym + case tt_Table: { + // obrotnica jest prawie jak zwykły tor iAction |= 2; // flaga zmiany położenia typu obrotnica - case tt_Normal: - p1 = LoadPoint(parser) + pOrigin; // pobranie współrzędnych P1 - parser->getTokens(); - *parser >> r1; // pobranie przechyłki w P1 - cp1 = LoadPoint(parser); // pobranie współrzędnych punktów kontrolnych - cp2 = LoadPoint(parser); - p2 = LoadPoint(parser) + pOrigin; // pobranie współrzędnych P2 - parser->getTokens(2); - *parser >> r2 >> fRadius; // pobranie przechyłki w P1 i promienia - fRadius = fabs(fRadius); // we wpisie może być ujemny + } + case tt_Normal: { + // pobranie współrzędnych P1 + auto const &path { m_paths[ 0 ] }; + p1 = path.points[ segment_data::point::start ]; + // pobranie współrzędnych punktów kontrolnych + cp1 = path.points[ segment_data::point::control1 ]; + cp2 = path.points[ segment_data::point::control2 ]; + // pobranie współrzędnych P2 + p2 = path.points[ segment_data::point::end ]; + r1 = path.rolls[ 0 ]; + r2 = path.rolls[ 1 ]; + fRadius = std::abs( path.radius ); // we wpisie może być ujemny + if (iCategoryFlag & 1) { // zero na główce szyny p1.y += 0.18; @@ -502,7 +518,11 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) if( fRadius != 0 ) { // gdy podany promień - segsize = clamp( std::abs( fRadius ) * ( 0.02 / Global.SplineFidelity ), 2.0 / Global.SplineFidelity, 10.0 ); + segsize = + clamp( + std::abs( fRadius ) * ( 0.02 / Global.SplineFidelity ), + 2.0 / Global.SplineFidelity, + 10.0 / Global.SplineFidelity ); } else { // HACK: crude check whether claimed straight is an actual straight piece @@ -512,7 +532,11 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) } else { // HACK: divide roughly in 10 segments. - segsize = clamp( ( p1 - p2 ).Length() * ( 0.1 / Global.SplineFidelity ), 2.0 / Global.SplineFidelity, 10.0 ); + segsize = + clamp( + ( p1 - p2 ).Length() * 0.1, + 2.0 / Global.SplineFidelity, + 10.0 / Global.SplineFidelity ); } } @@ -529,6 +553,7 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) if ((r1 != 0) || (r2 != 0)) iTrapezoid = 1; // są przechyłki do uwzględniania w rysowaniu + if (eType == tt_Table) // obrotnica ma doklejkę { // SwitchExtension=new TSwitchExtension(this,1); //dodatkowe zmienne dla obrotnicy SwitchExtension->Segments[0]->Init(p1, p2, segsize); // kopia oryginalnego toru @@ -549,56 +574,92 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) fTexRatio2 = w / h; // proporcja boków } break; - - case tt_Cross: // skrzyżowanie dróg - 4 punkty z wektorami kontrolnymi - segsize = 1.0; // specjalne segmentowanie ze względu na małe promienie + } + case tt_Cross: { + // skrzyżowanie dróg - 4 punkty z wektorami kontrolnymi +// segsize = 1.0; // specjalne segmentowanie ze względu na małe promienie + } case tt_Tributary: // dopływ - case tt_Switch: // zwrotnica + case tt_Switch: { // zwrotnica iAction |= 1; // flaga zmiany położenia typu zwrotnica lub skrzyżowanie dróg // problemy z animacją iglic powstaje, gdzy odcinek prosty ma zmienną przechyłkę // wtedy dzieli się na dodatkowe odcinki (po 0.2m, bo R=0) i animację diabli biorą // Ra: na razie nie podejmuję się przerabiania iglic // SwitchExtension=new TSwitchExtension(this,eType==tt_Cross?6:2); //zwrotnica ma doklejkę + auto const &path { m_paths[ 0 ] }; + p1 = path.points[ segment_data::point::start ]; + // pobranie współrzędnych punktów kontrolnych + cp1 = path.points[ segment_data::point::control1 ]; + cp2 = path.points[ segment_data::point::control2 ]; + // pobranie współrzędnych P2 + p2 = path.points[ segment_data::point::end ]; + r1 = path.rolls[ 0 ]; + r2 = path.rolls[ 1 ]; + fRadiusTable[0] = std::abs( path.radius ); // we wpisie może być ujemny - p1 = LoadPoint(parser) + pOrigin; // pobranie współrzędnych P1 - parser->getTokens(); - *parser >> r1; - cp1 = LoadPoint(parser); - cp2 = LoadPoint(parser); - p2 = LoadPoint(parser) + pOrigin; // pobranie współrzędnych P2 - parser->getTokens(2); - *parser >> r2 >> fRadiusTable[0]; - fRadiusTable[0] = fabs(fRadiusTable[0]); // we wpisie może być ujemny if (iCategoryFlag & 1) { // zero na główce szyny p1.y += 0.18; p2.y += 0.18; // na przechyłce doliczyć jeszcze pół przechyłki? } - if (fRadiusTable[0] > 0) - segsize = clamp( 0.2 + fRadiusTable[0] * 0.02, 2.0, 5.0 ); - else if (eType != tt_Cross) // dla skrzyżowań muszą być podane kontrolne - { // jak promień zerowy, to przeliczamy punkty kontrolne - cp1 = (p1 + p1 + p2) / 3.0 - p1; // jak jest prosty, to się zoptymalizuje - cp2 = (p1 + p2 + p2) / 3.0 - p2; - segsize = 5.0; - } // ułomny prosty - if (!(cp1 == Math3D::vector3(0, 0, 0)) && !(cp2 == Math3D::vector3(0, 0, 0))) - SwitchExtension->Segments[0]->Init(p1, p1 + cp1, p2 + cp2, p2, segsize, r1, r2); - else - SwitchExtension->Segments[0]->Init(p1, p2, segsize, r1, r2); + if( eType != tt_Cross ) { + // dla skrzyżowań muszą być podane kontrolne + if( ( ( ( p1 + p1 + p2 ) / 3.0 - p1 - cp1 ).Length() < 0.02 ) + || ( ( ( p1 + p2 + p2 ) / 3.0 - p2 + cp1 ).Length() < 0.02 ) ) { + // "prostowanie" prostych z kontrolnymi, dokładność 2cm + cp1 = cp2 = Math3D::vector3( 0, 0, 0 ); + } + } + + if( fRadiusTable[ 0 ] != 0 ) { + // gdy podany promień + segsize = + clamp( + std::abs( fRadiusTable[ 0 ] ) * ( 0.02 / Global.SplineFidelity ), + 2.0 / Global.SplineFidelity, + 10.0 / Global.SplineFidelity ); + } + else { + // HACK: crude check whether claimed straight is an actual straight piece + if( ( cp1 == Math3D::vector3() ) + && ( cp2 == Math3D::vector3() ) ) { + segsize = 10.0; // for straights, 10m per segment works good enough + } + else { + // HACK: divide roughly in 10 segments. + segsize = + clamp( + ( p1 - p2 ).Length() * 0.1, + 2.0 / Global.SplineFidelity, + 10.0 / Global.SplineFidelity ); + } + } + + if( ( cp1 == Math3D::vector3( 0, 0, 0 ) ) + && ( cp2 == Math3D::vector3( 0, 0, 0 ) ) ) { + // Ra: hm, czasem dla prostego są podane... + // gdy prosty, kontrolne wyliczane przy zmiennej przechyłce + SwitchExtension->Segments[ 0 ]->Init( p1, p2, segsize, r1, r2 ); + } + else { + // gdy łuk (ustawia bCurve=true) + SwitchExtension->Segments[ 0 ]->Init( p1, cp1 + p1, cp2 + p2, p2, segsize, r1, r2 ); + } + + auto const &path2 { m_paths[ 1 ] }; + p3 = path2.points[ segment_data::point::start ]; + // pobranie współrzędnych punktów kontrolnych + cp3 = path2.points[ segment_data::point::control1 ]; + cp4 = path2.points[ segment_data::point::control2 ]; + // pobranie współrzędnych P2 + p4 = path2.points[ segment_data::point::end ]; + r3 = path2.rolls[ 0 ]; + r4 = path2.rolls[ 1 ]; + fRadiusTable[1] = std::abs( path2.radius ); // we wpisie może być ujemny - p3 = LoadPoint(parser) + pOrigin; // pobranie współrzędnych P3 - parser->getTokens(); - *parser >> r3; - cp3 = LoadPoint(parser); - cp4 = LoadPoint(parser); - p4 = LoadPoint(parser) + pOrigin; // pobranie współrzędnych P4 - parser->getTokens(2); - *parser >> r4 >> fRadiusTable[1]; - fRadiusTable[1] = fabs(fRadiusTable[1]); // we wpisie może być ujemny if (iCategoryFlag & 1) { // zero na główce szyny p3.y += 0.18; @@ -606,25 +667,54 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) // na przechyłce doliczyć jeszcze pół przechyłki? } - if (fRadiusTable[1] > 0) - segsize = clamp( 0.2 + fRadiusTable[ 1 ] * 0.02, 2.0, 5.0 ); - - else if (eType != tt_Cross) // dla skrzyżowań muszą być podane kontrolne - { // jak promień zerowy, to przeliczamy punkty kontrolne - cp3 = (p3 + p3 + p4) / 3.0 - p3; // jak jest prosty, to się zoptymalizuje - cp4 = (p3 + p4 + p4) / 3.0 - p4; - segsize = 5.0; - } // ułomny prosty - - if (!(cp3 == Math3D::vector3(0, 0, 0)) && !(cp4 == Math3D::vector3(0, 0, 0))) - { // dla skrzyżowania dróg dać odwrotnie końce, żeby brzegi generować lewym - if (eType != tt_Cross) - SwitchExtension->Segments[1]->Init(p3, p3 + cp3, p4 + cp4, p4, segsize, r3, r4); - else - SwitchExtension->Segments[1]->Init(p4, p4 + cp4, p3 + cp3, p3, segsize, r4, r3); // odwrócony + if( eType != tt_Cross ) { + // dla skrzyżowań muszą być podane kontrolne + if( ( ( ( p3 + p3 + p4 ) / 3.0 - p3 - cp3 ).Length() < 0.02 ) + || ( ( ( p3 + p4 + p4 ) / 3.0 - p4 + cp3 ).Length() < 0.02 ) ) { + // "prostowanie" prostych z kontrolnymi, dokładność 2cm + cp3 = cp4 = Math3D::vector3( 0, 0, 0 ); + } + } + + if( fRadiusTable[ 1 ] != 0 ) { + // gdy podany promień + segsize = + clamp( + std::abs( fRadiusTable[ 1 ] ) * ( 0.02 / Global.SplineFidelity ), + 2.0 / Global.SplineFidelity, + 10.0 / Global.SplineFidelity ); + } + else { + // HACK: crude check whether claimed straight is an actual straight piece + if( ( cp3 == Math3D::vector3() ) + && ( cp4 == Math3D::vector3() ) ) { + segsize = 10.0; // for straights, 10m per segment works good enough + } + else { + // HACK: divide roughly in 10 segments. + segsize = + clamp( + ( p3 - p4 ).Length() * 0.1, + 2.0 / Global.SplineFidelity, + 10.0 / Global.SplineFidelity ); + } + } + + if( ( cp3 == Math3D::vector3( 0, 0, 0 ) ) + && ( cp4 == Math3D::vector3( 0, 0, 0 ) ) ) { + // Ra: hm, czasem dla prostego są podane... + // gdy prosty, kontrolne wyliczane przy zmiennej przechyłce + SwitchExtension->Segments[ 1 ]->Init( p3, p4, segsize, r3, r4 ); + } + else { + if( eType != tt_Cross ) { + SwitchExtension->Segments[ 1 ]->Init( p3, p3 + cp3, p4 + cp4, p4, segsize, r3, r4 ); + } + else { + // dla skrzyżowania dróg dać odwrotnie końce, żeby brzegi generować lewym + SwitchExtension->Segments[ 1 ]->Init( p4, p4 + cp4, p3 + cp3, p3, segsize, r4, r3 ); // odwrócony + } } - else - SwitchExtension->Segments[1]->Init(p3, p4, segsize, r3, r4); if (eType == tt_Cross) { // Ra 2014-07: dla skrzyżowań będą dodatkowe segmenty @@ -646,10 +736,10 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) { Math3D::vector3 v1, v2; double a1, a2; - v1 = SwitchExtension->Segments[0]->FastGetPoint_1() - - SwitchExtension->Segments[0]->FastGetPoint_0(); - v2 = SwitchExtension->Segments[1]->FastGetPoint_1() - - SwitchExtension->Segments[1]->FastGetPoint_0(); + v1 = SwitchExtension->Segments[0]->FastGetPoint_1() + - SwitchExtension->Segments[0]->FastGetPoint_0(); + v2 = SwitchExtension->Segments[1]->FastGetPoint_1() + - SwitchExtension->Segments[1]->FastGetPoint_0(); a1 = atan2(v1.x, v1.z); a2 = atan2(v2.x, v2.z); a2 = a2 - a1; @@ -660,7 +750,10 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) SwitchExtension->RightSwitch = a2 < 0; // lustrzany układ OXY... } break; + } } + + // optional attributes parser->getTokens(); *parser >> token; str = token; @@ -707,9 +800,9 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) parser->getTokens(); *parser >> fVelocity; //*0.28; McZapkie-010602 if (SwitchExtension) // jeśli tor ruchomy - if (std::fabs(fVelocity) >= 1.0) //żeby zero nie ograniczało dożywotnio - SwitchExtension->fVelocity = static_cast(fVelocity); // zapamiętanie głównego ograniczenia; a - // np. -40 ogranicza tylko na bok + if (std::abs(fVelocity) >= 1.0) //żeby zero nie ograniczało dożywotnio + // zapamiętanie głównego ograniczenia; a np. -40 ogranicza tylko na bok + SwitchExtension->fVelocity = static_cast(fVelocity); } else if (str == "isolated") { // obwód izolowany, do którego tor należy @@ -777,20 +870,25 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) } // TODO: refactor this mess -bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2) +bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2, bool const Explicit ) { bool bError = false; if( NewEvent0 == nullptr ) { if( false == asEvent0Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEvent0Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; + if( true == Explicit ) { + ErrorLog( "Bad event: event \"" + asEvent0Name + "\" assigned to track \"" + m_name + "\" does not exist" ); + } } } else { if( evEvent0 == nullptr ) { evEvent0 = NewEvent0; +/* + // preserve event names, we'll need them if we want the scenario export to be unaffected by missing events and such asEvent0Name = ""; +*/ iEvents |= 1; // sumaryczna informacja o eventach } else { @@ -801,14 +899,18 @@ bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent if( NewEvent1 == nullptr ) { if( false == asEvent1Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEvent1Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; + if( true == Explicit ) { + ErrorLog( "Bad event: event \"" + asEvent1Name + "\" assigned to track \"" + m_name + "\" does not exist" ); + } } } else { if( evEvent1 == nullptr ) { evEvent1 = NewEvent1; +/* asEvent1Name = ""; +*/ iEvents |= 2; // sumaryczna informacja o eventach } else { @@ -819,14 +921,18 @@ bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent if( NewEvent2 == nullptr ) { if( false == asEvent2Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEvent2Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; + if( true == Explicit ) { + ErrorLog( "Bad event: event \"" + asEvent2Name + "\" assigned to track \"" + m_name + "\" does not exist" ); + } } } else { if( evEvent2 == nullptr ) { evEvent2 = NewEvent2; +/* asEvent2Name = ""; +*/ iEvents |= 4; // sumaryczna informacja o eventach } else { @@ -838,20 +944,25 @@ bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent return ( bError == false ); } -bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2) +bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2, bool const Explicit) { bool bError = false; if( NewEvent0 == nullptr ) { if( false == asEventall0Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEventall0Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; + if( true == Explicit ) { + ErrorLog( "Bad event: event \"" + asEventall0Name + "\" assigned to track \"" + m_name + "\" does not exist" ); + } } } else { if( evEventall0 == nullptr ) { evEventall0 = NewEvent0; +/* + // preserve event names, we'll need them if we want the scenario export to be unaffected by missing events and such asEventall0Name = ""; +*/ iEvents |= 8; // sumaryczna informacja o eventach } else { @@ -862,14 +973,18 @@ bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEv if( NewEvent1 == nullptr ) { if( false == asEventall1Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEventall1Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; + if( true == Explicit ) { + ErrorLog( "Bad event: event \"" + asEventall1Name + "\" assigned to track \"" + m_name + "\" does not exist" ); + } } } else { if( evEventall1 == nullptr ) { evEventall1 = NewEvent1; +/* asEventall1Name = ""; +*/ iEvents |= 16; // sumaryczna informacja o eventach } else { @@ -880,14 +995,18 @@ bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEv if( NewEvent2 == nullptr ) { if( false == asEventall2Name.empty() ) { - ErrorLog( "Bad event: event \"" + asEventall2Name + "\" assigned to track \"" + m_name + "\" does not exist" ); bError = true; + if( true == Explicit ) { + ErrorLog( "Bad event: event \"" + asEventall2Name + "\" assigned to track \"" + m_name + "\" does not exist" ); + } } } else { if( evEventall2 == nullptr ) { evEventall2 = NewEvent2; +/* asEventall2Name = ""; +*/ iEvents |= 32; // sumaryczna informacja o eventach } else { @@ -1404,6 +1523,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { {szyna[ i ].texture.x, 0.f} }; } // TODO, TBD: change all track geometry to triangles, to allow packing data in less, larger buffers + auto const bladelength { 2 * Global.SplineFidelity }; if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa gfx::vertex_array vertices; @@ -1412,11 +1532,11 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength, 1.0, bladelength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // left blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, bladelength, SwitchExtension->fOffset2 ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -1425,11 +1545,11 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength, 1.0, bladelength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // right blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, bladelength, -fMaxOffset + SwitchExtension->fOffset1 ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -1442,11 +1562,11 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength, 1.0, 2 ); // prawa szyna za iglicą + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength, 1.0, bladelength ); // prawa szyna za iglicą Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // right blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, bladelength, -SwitchExtension->fOffset2 ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -1455,11 +1575,11 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength, 1.0, 2 ); // lewa szyna za iglicą + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength, 1.0, bladelength ); // lewa szyna za iglicą Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // left blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, bladelength, fMaxOffset - SwitchExtension->fOffset1 ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -2220,9 +2340,13 @@ bool TTrack::Switch(int i, float const t, float const d) iNextDirection = SwitchExtension->iNextDirection[i]; iPrevDirection = SwitchExtension->iPrevDirection[i]; fRadius = fRadiusTable[i]; // McZapkie: wybor promienia toru - if (SwitchExtension->fVelocity <= - -2) //-1 oznacza maksymalną prędkość, a dalsze ujemne to ograniczenie na bok + if( SwitchExtension->fVelocity <= -2 ) { + //-1 oznacza maksymalną prędkość, a dalsze ujemne to ograniczenie na bok fVelocity = i ? -SwitchExtension->fVelocity : -1; + } + else { + fVelocity = SwitchExtension->fVelocity; + } if (SwitchExtension->pOwner ? SwitchExtension->pOwner->RaTrackAnimAdd(this) : true) // jeśli nie dodane do animacji { // nie ma się co bawić @@ -2455,17 +2579,18 @@ TTrack * TTrack::RaAnimate() gfx::vertex_array vertices; + auto const bladelength { 2 * Global.SplineFidelity }; if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa if( m_material1 ) { // left blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, bladelength, SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } if( m_material2 ) { // right blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -fMaxOffset + SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, bladelength, -fMaxOffset + SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); vertices.clear(); } @@ -2473,13 +2598,13 @@ TTrack * TTrack::RaAnimate() else { // lewa działa lepiej niż prawa if( m_material1 ) { // right blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, 2, -SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, bladelength, -SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } if( m_material2 ) { // left blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, 2, fMaxOffset - SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, bladelength, fMaxOffset - SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); vertices.clear(); } @@ -2659,32 +2784,188 @@ TTrack::endpoints() const { } } -// calculates path's bounding radius -void +// radius() subclass details, calculates node's bounding radius +float TTrack::radius_() { - auto const points = endpoints(); + auto const points { endpoints() }; + auto radius { 0.f }; for( auto &point : points ) { - m_area.radius = std::max( - m_area.radius, + radius = std::max( + radius, static_cast( glm::length( m_area.center - point ) ) ); // extra margin to prevent driven vehicle from flicking } + return radius; +} + +// serialize() subclass details, sends content of the subclass to provided stream +void +TTrack::serialize_( std::ostream &Output ) const { + + // TODO: implement +} +// deserialize() subclass details, restores content of the subclass from provided stream +void +TTrack::deserialize_( std::istream &Input ) { + + // TODO: implement +} + +// export() subclass details, sends basic content of the class in legacy (text) format to provided stream +void +TTrack::export_as_text_( std::ostream &Output ) const { + // header + Output << "track "; + // type + Output << ( + eType == tt_Normal ? ( + iCategoryFlag == 1 ? "normal" : + iCategoryFlag == 2 ? "road" : + iCategoryFlag == 4 ? "river" : + "none" ) : + eType == tt_Switch ? "switch" : + eType == tt_Cross ? "cross" : + eType == tt_Table ? "turn" : + eType == tt_Tributary ? "tributary" : + "none" ) + << ' '; + // basic attributes + Output + << Length() << ' ' + << fTrackWidth << ' ' + << fFriction << ' ' + << fSoundDistance << ' ' + << iQualityFlag << ' ' + << iDamageFlag << ' '; + // environment + Output << ( + eEnvironment == e_flat ? "flat" : + eEnvironment == e_bridge ? "bridge" : + eEnvironment == e_tunnel ? "tunnel" : + eEnvironment == e_bank ? "bank" : + eEnvironment == e_canyon ? "canyon" : + eEnvironment == e_mountains ? "mountains" : + "none" ) + << ' '; + // visibility + // NOTE: 'invis' would be less wrong than 'unvis', but potentially incompatible with old 3rd party tools + Output << ( m_visible ? "vis" : "unvis" ) << ' '; + if( m_visible ) { + // texture parameters are supplied only if the path is set as visible + auto texturefile { ( + m_material1 != null_handle ? + GfxRenderer.Material( m_material1 ).name : + "none" ) }; + if( texturefile.find( szTexturePath ) == 0 ) { + // don't include 'textures/' in the path + texturefile.erase( 0, std::string{ szTexturePath }.size() ); + } + Output + << texturefile << ' ' + << fTexLength << ' '; + + texturefile = ( + m_material2 != null_handle ? + GfxRenderer.Material( m_material2 ).name : + "none" ); + if( texturefile.find( szTexturePath ) == 0 ) { + // don't include 'textures/' in the path + texturefile.erase( 0, std::string{ szTexturePath }.size() ); + } + Output << texturefile << ' '; + + Output + << (fTexHeight1 - fTexHeightOffset ) * ( ( iCategoryFlag & 4 ) ? -1 : 1 ) << ' ' + << fTexWidth << ' ' + << fTexSlope << ' '; + } + // path data + for( auto const &path : m_paths ) { + Output + << path.points[ segment_data::point::start ].x << ' ' + << path.points[ segment_data::point::start ].y << ' ' + << path.points[ segment_data::point::start ].z << ' ' + << path.rolls[ 0 ] << ' ' + + << path.points[ segment_data::point::control1 ].x << ' ' + << path.points[ segment_data::point::control1 ].y << ' ' + << path.points[ segment_data::point::control1 ].z << ' ' + + << path.points[ segment_data::point::control2 ].x << ' ' + << path.points[ segment_data::point::control2 ].y << ' ' + << path.points[ segment_data::point::control2 ].z << ' ' + + << path.points[ segment_data::point::end ].x << ' ' + << path.points[ segment_data::point::end ].y << ' ' + << path.points[ segment_data::point::end ].z << ' ' + << path.rolls[ 1 ] << ' ' + + << path.radius << ' '; + } + // optional attributes + if( false == asEvent0Name.empty() ) { + Output << "event0 " << asEvent0Name << ' '; + } + if( false == asEvent1Name.empty() ) { + Output << "event1 " << asEvent1Name << ' '; + } + if( false == asEvent2Name.empty() ) { + Output << "event2 " << asEvent2Name << ' '; + } + if( false == asEventall0Name.empty() ) { + Output << "eventall0 " << asEventall0Name << ' '; + } + if( false == asEventall1Name.empty() ) { + Output << "eventall1 " << asEventall1Name << ' '; + } + if( false == asEventall2Name.empty() ) { + Output << "eventall2 " << asEventall2Name << ' '; + } + if( ( SwitchExtension ) + && ( SwitchExtension->fVelocity != -1.0 ) ) { + Output << "velocity " << SwitchExtension->fVelocity << ' '; + } + else { + if( fVelocity != -1.0 ) { + Output << "velocity " << fVelocity << ' '; + } + } + if( pIsolated ) { + Output << "isolated " << pIsolated->asName << ' '; + } + if( fOverhead != -1.0 ) { + Output << "overhead " << fOverhead << ' '; + } + // footer + Output + << "endtrack" + << "\n"; } void TTrack::MovedUp1(float const dh) { // poprawienie przechyłki wymaga wydłużenia podsypki fTexHeight1 += dh; + fTexHeightOffset += dh; }; -void TTrack::VelocitySet(float v) -{ // ustawienie prędkości z ograniczeniem do pierwotnej wartości (zapisanej w scenerii) - if (SwitchExtension ? SwitchExtension->fVelocity >= 0.0 : false) - { // zwrotnica może mieć odgórne ograniczenie, nieprzeskakiwalne eventem - if (v > SwitchExtension->fVelocity ? true : v < 0.0) - return void(fVelocity = - SwitchExtension->fVelocity); // maksymalnie tyle, ile było we wpisie +// ustawienie prędkości z ograniczeniem do pierwotnej wartości (zapisanej w scenerii) +void TTrack::VelocitySet(float v) { + // TBD, TODO: add a variable to preserve potential speed limit set by the track configuration on basic track pieces + if( ( SwitchExtension ) + && ( SwitchExtension->fVelocity != -1 ) ) { + // zwrotnica może mieć odgórne ograniczenie, nieprzeskakiwalne eventem + fVelocity = + min_speed( + v, + ( SwitchExtension->fVelocity > 0 ? + SwitchExtension->fVelocity : // positive limit applies to both switch tracks + ( SwitchExtension->CurrentIndex == 0 ? + -1 : // negative limit applies only to the diverging track + -SwitchExtension->fVelocity ) ) ); + } + else { + fVelocity = v; // nie ma ograniczenia } - fVelocity = v; // nie ma ograniczenia }; double TTrack::VelocityGet() @@ -2800,11 +3081,13 @@ path_table::InitTracks() { track->AssignEvents( simulation::Events.FindEvent( trackname + ":event0" ), simulation::Events.FindEvent( trackname + ":event1" ), - simulation::Events.FindEvent( trackname + ":event2" ) ); + simulation::Events.FindEvent( trackname + ":event2" ), + false ); track->AssignallEvents( simulation::Events.FindEvent( trackname + ":eventall0" ), simulation::Events.FindEvent( trackname + ":eventall1" ), - simulation::Events.FindEvent( trackname + ":eventall2" ) ); + simulation::Events.FindEvent( trackname + ":eventall2" ), + false ); } switch (track->eType) { @@ -2948,6 +3231,8 @@ path_table::InitTracks() { scene::node_data nodedata; nodedata.name = isolated->asName; auto *memorycell = new TMemCell( nodedata ); // to nie musi mieć nazwy, nazwa w wyszukiwarce wystarczy + // NOTE: autogenerated cells aren't exported; they'll be autogenerated anew when exported file is loaded + memorycell->is_exportable = false; simulation::Memory.insert( memorycell ); isolated->pMemCell = memorycell; // wskaźnik komóki przekazany do odcinka izolowanego } diff --git a/Track.h b/Track.h index f7494dc3..c47836b8 100644 --- a/Track.h +++ b/Track.h @@ -124,7 +124,7 @@ private: }; // trajektoria ruchu - opakowanie -class TTrack : public editor::basic_node { +class TTrack : public scene::basic_node { friend class opengl_renderer; @@ -142,6 +142,7 @@ private: float fTexRatio1 = 1.0f; // proporcja boków tekstury nawierzchni (żeby zaoszczędzić na rozmiarach tekstur...) float fTexRatio2 = 1.0f; // proporcja boków tekstury chodnika (żeby zaoszczędzić na rozmiarach tekstur...) float fTexHeight1 = 0.6f; // wysokość brzegu względem trajektorii + float fTexHeightOffset = 0.f; // potential adjustment to account for the path roll float fTexWidth = 0.9f; // szerokość boku float fTexSlope = 0.9f; @@ -152,6 +153,8 @@ private: geometryhandle_sequence Geometry1; // geometry chunks textured with texture 1 geometryhandle_sequence Geometry2; // geometry chunks textured with texture 2 + std::vector m_paths; // source data for owned paths + public: typedef std::deque dynamics_sequence; dynamics_sequence Dynamics; @@ -231,8 +234,8 @@ public: SwitchExtension->iRoads - 1 : 1 ); } void Load(cParser *parser, Math3D::vector3 pOrigin); - bool AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); - bool AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2); + bool AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2, bool const Explicit = true ); + bool AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2, bool const Explicit = true ); bool AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus); bool CheckDynamicObject(TDynamicObject *Dynamic); bool AddDynamicObject(TDynamicObject *Dynamic); @@ -270,10 +273,16 @@ public: double VelocityGet(); void ConnectionsLog(); -protected: - // calculates path's bounding radius - void - radius_(); +private: + // radius() subclass details, calculates node's bounding radius + float radius_(); + // serialize() subclass details, sends content of the subclass to provided stream + void serialize_( std::ostream &Output ) const; + // deserialize() subclass details, restores content of the subclass from provided stream + void deserialize_( std::istream &Input ); + // export() subclass details, sends basic content of the class in legacy (text) format to provided stream + void export_as_text_( std::ostream &Output ) const; + }; diff --git a/Traction.cpp b/Traction.cpp index cf7705a7..e993ff0e 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -529,18 +529,6 @@ double TTraction::VoltageGet(double u, double i) return 0.0; // gdy nie podłączony wcale? }; -// calculates path's bounding radius -void -TTraction::radius_() { - - auto const points = endpoints(); - for( auto &point : points ) { - m_area.radius = std::max( - m_area.radius, - static_cast( glm::length( m_area.center - point ) ) ); - } -} - glm::vec3 TTraction::wire_color() const { @@ -580,6 +568,7 @@ TTraction::wire_color() const { color.r *= Global.DayLight.ambient[ 0 ]; color.g *= Global.DayLight.ambient[ 1 ]; color.b *= Global.DayLight.ambient[ 2 ]; + color *= 0.5f; } else { // tymczasowo pokazanie zasilanych odcinków @@ -675,6 +664,77 @@ TTraction::wire_color() const { return color; } +// radius() subclass details, calculates node's bounding radius +float +TTraction::radius_() { + + auto const points { endpoints() }; + auto radius { 0.f }; + for( auto &point : points ) { + radius = std::max( + radius, + static_cast( glm::length( m_area.center - point ) ) ); + } + return radius; +} + +// serialize() subclass details, sends content of the subclass to provided stream +void +TTraction::serialize_( std::ostream &Output ) const { + + // TODO: implement +} +// deserialize() subclass details, restores content of the subclass from provided stream +void +TTraction::deserialize_( std::istream &Input ) { + + // TODO: implement +} + +// export() subclass details, sends basic content of the class in legacy (text) format to provided stream +void +TTraction::export_as_text_( std::ostream &Output ) const { + // header + Output << "traction "; + // basic attributes + Output + << asPowerSupplyName << ' ' + << NominalVoltage << ' ' + << MaxCurrent << ' ' + << ( fResistivity * 1000 ) << ' ' + << ( + Material == 2 ? "al" : + Material == 0 ? "none" : + "cu" ) << ' ' + << WireThickness << ' ' + << DamageFlag << ' '; + // path data + Output + << pPoint1.x << ' ' << pPoint1.y << ' ' << pPoint1.z << ' ' + << pPoint2.x << ' ' << pPoint2.y << ' ' << pPoint2.z << ' ' + << pPoint3.x << ' ' << pPoint3.y << ' ' << pPoint3.z << ' ' + << pPoint4.x << ' ' << pPoint4.y << ' ' << pPoint4.z << ' '; + // minimum height + Output << ( ( pPoint3.y - pPoint1.y + pPoint4.y - pPoint2.y ) * 0.5 - fHeightDifference ) << ' '; + // segment length + Output << static_cast( iNumSections ? glm::length( pPoint1 - pPoint2 ) / iNumSections : 0.0 ) << ' '; + // wire data + Output + << Wires << ' ' + << WireOffset << ' '; + // visibility + // NOTE: 'invis' would be less wrong than 'unvis', but potentially incompatible with old 3rd party tools + Output << ( m_visible ? "vis" : "unvis" ) << ' '; + // optional attributes + if( false == asParallel.empty() ) { + Output << "parallel " << asParallel << ' '; + } + // footer + Output + << "endtraction" + << "\n"; +} + // legacy method, initializes traction after deserialization from scenario file diff --git a/Traction.h b/Traction.h index c8ccb432..120a7599 100644 --- a/Traction.h +++ b/Traction.h @@ -18,7 +18,7 @@ http://mozilla.org/MPL/2.0/. class TTractionPowerSource; -class TTraction : public editor::basic_node { +class TTraction : public scene::basic_node { friend class opengl_renderer; @@ -73,13 +73,18 @@ class TTraction : public editor::basic_node { void PowerSet(TTractionPowerSource *ps); double VoltageGet(double u, double i); -protected: - // calculates piece's bounding radius - void - radius_(); - private: +// methods glm::vec3 wire_color() const; + // radius() subclass details, calculates node's bounding radius + float radius_(); + // serialize() subclass details, sends content of the subclass to provided stream + void serialize_( std::ostream &Output ) const; + // deserialize() subclass details, restores content of the subclass from provided stream + void deserialize_( std::istream &Input ); + // export() subclass details, sends basic content of the class in legacy (text) format to provided stream + void export_as_text_( std::ostream &Output ) const; + }; diff --git a/TractionPower.cpp b/TractionPower.cpp index 8b0d309e..48ff6d4a 100644 --- a/TractionPower.cpp +++ b/TractionPower.cpp @@ -141,6 +141,52 @@ void TTractionPowerSource::PowerSet(TTractionPowerSource *ps) // else ErrorLog("nie może być więcej punktów zasilania niż dwa"); }; +// serialize() subclass details, sends content of the subclass to provided stream +void +TTractionPowerSource::serialize_( std::ostream &Output ) const { + + // TODO: implement +} + +// deserialize() subclass details, restores content of the subclass from provided stream +void +TTractionPowerSource::deserialize_( std::istream &Input ) { + + // TODO: implement +} + +// export() subclass details, sends basic content of the class in legacy (text) format to provided stream +void +TTractionPowerSource::export_as_text_( std::ostream &Output ) const { + // header + Output << "tractionpowersource "; + // placement + Output + << location().x << ' ' + << location().y << ' ' + << location().z << ' '; + // basic attributes + Output + << NominalVoltage << ' ' + << VoltageFrequency << ' ' + << InternalRes << ' ' + << MaxOutputCurrent << ' ' + << FastFuseTimeOut << ' ' + << FastFuseRepetition << ' ' + << SlowFuseTimeOut << ' '; + // optional attributes + if( true == Recuperation ) { + Output << "recuperation "; + } + if( true == bSection ) { + Output << "section "; + } + // footer + Output + << "end" + << "\n"; +} + // legacy method, calculates changes in simulation state over specified time diff --git a/TractionPower.h b/TractionPower.h index 1a30c320..33ab8983 100644 --- a/TractionPower.h +++ b/TractionPower.h @@ -13,9 +13,33 @@ http://mozilla.org/MPL/2.0/. #include "scenenode.h" #include "names.h" -class TTractionPowerSource : public editor::basic_node { +class TTractionPowerSource : public scene::basic_node { - private: +public: +// constructor + TTractionPowerSource( scene::node_data const &Nodedata ); +// methods + void Init(double const u, double const i); + bool Load(cParser *parser); + bool Update(double dt); + double CurrentGet(double res); + void VoltageSet(double const v) { + NominalVoltage = v; }; + void PowerSet(TTractionPowerSource *ps); +// members + TTractionPowerSource *psNode[ 2 ] = { nullptr, nullptr }; // zasilanie na końcach dla sekcji + bool bSection = false; // czy jest sekcją + +private: +// methods + // serialize() subclass details, sends content of the subclass to provided stream + void serialize_( std::ostream &Output ) const; + // deserialize() subclass details, restores content of the subclass from provided stream + void deserialize_( std::istream &Input ); + // export() subclass details, sends basic content of the class in legacy (text) format to provided stream + void export_as_text_( std::ostream &Output ) const; + +// members double NominalVoltage = 0.0; double VoltageFrequency = 0.0; double InternalRes = 0.2; @@ -34,20 +58,6 @@ class TTractionPowerSource : public editor::basic_node { double FuseTimer = 0.0; int FuseCounter = 0; -public: - // zmienne publiczne - TTractionPowerSource *psNode[ 2 ] = { nullptr, nullptr }; // zasilanie na końcach dla sekcji - bool bSection = false; // czy jest sekcją - - TTractionPowerSource( scene::node_data const &Nodedata ); - - void Init(double const u, double const i); - bool Load(cParser *parser); - bool Update(double dt); - double CurrentGet(double res); - void VoltageSet(double const v) { - NominalVoltage = v; }; - void PowerSet(TTractionPowerSource *ps); }; diff --git a/World.cpp b/World.cpp index 361ad5a9..37be858b 100644 --- a/World.cpp +++ b/World.cpp @@ -311,49 +311,47 @@ bool TWorld::Init( GLFWwindow *Window ) { void TWorld::OnKeyDown(int cKey) { // dump keypress info in the log - if( !Global.iPause ) { - // podczas pauzy klawisze nie działają - std::string keyinfo; - auto keyname = glfwGetKeyName( cKey, 0 ); - if( keyname != nullptr ) { - keyinfo += std::string( keyname ); - } - else { - switch( cKey ) { + // podczas pauzy klawisze nie działają + std::string keyinfo; + auto keyname = glfwGetKeyName( cKey, 0 ); + if( keyname != nullptr ) { + keyinfo += std::string( keyname ); + } + else { + switch( cKey ) { - case GLFW_KEY_SPACE: { keyinfo += "Space"; break; } - case GLFW_KEY_ENTER: { keyinfo += "Enter"; break; } - case GLFW_KEY_ESCAPE: { keyinfo += "Esc"; break; } - case GLFW_KEY_TAB: { keyinfo += "Tab"; break; } - case GLFW_KEY_INSERT: { keyinfo += "Insert"; break; } - case GLFW_KEY_DELETE: { keyinfo += "Delete"; break; } - case GLFW_KEY_HOME: { keyinfo += "Home"; break; } - case GLFW_KEY_END: { keyinfo += "End"; break; } - case GLFW_KEY_F1: { keyinfo += "F1"; break; } - case GLFW_KEY_F2: { keyinfo += "F2"; break; } - case GLFW_KEY_F3: { keyinfo += "F3"; break; } - case GLFW_KEY_F4: { keyinfo += "F4"; break; } - case GLFW_KEY_F5: { keyinfo += "F5"; break; } - case GLFW_KEY_F6: { keyinfo += "F6"; break; } - case GLFW_KEY_F7: { keyinfo += "F7"; break; } - case GLFW_KEY_F8: { keyinfo += "F8"; break; } - case GLFW_KEY_F9: { keyinfo += "F9"; break; } - case GLFW_KEY_F10: { keyinfo += "F10"; break; } - case GLFW_KEY_F11: { keyinfo += "F11"; break; } - case GLFW_KEY_F12: { keyinfo += "F12"; break; } - case GLFW_KEY_PAUSE: { keyinfo += "Pause"; break; } - } + case GLFW_KEY_SPACE: { keyinfo += "Space"; break; } + case GLFW_KEY_ENTER: { keyinfo += "Enter"; break; } + case GLFW_KEY_ESCAPE: { keyinfo += "Esc"; break; } + case GLFW_KEY_TAB: { keyinfo += "Tab"; break; } + case GLFW_KEY_INSERT: { keyinfo += "Insert"; break; } + case GLFW_KEY_DELETE: { keyinfo += "Delete"; break; } + case GLFW_KEY_HOME: { keyinfo += "Home"; break; } + case GLFW_KEY_END: { keyinfo += "End"; break; } + case GLFW_KEY_F1: { keyinfo += "F1"; break; } + case GLFW_KEY_F2: { keyinfo += "F2"; break; } + case GLFW_KEY_F3: { keyinfo += "F3"; break; } + case GLFW_KEY_F4: { keyinfo += "F4"; break; } + case GLFW_KEY_F5: { keyinfo += "F5"; break; } + case GLFW_KEY_F6: { keyinfo += "F6"; break; } + case GLFW_KEY_F7: { keyinfo += "F7"; break; } + case GLFW_KEY_F8: { keyinfo += "F8"; break; } + case GLFW_KEY_F9: { keyinfo += "F9"; break; } + case GLFW_KEY_F10: { keyinfo += "F10"; break; } + case GLFW_KEY_F11: { keyinfo += "F11"; break; } + case GLFW_KEY_F12: { keyinfo += "F12"; break; } + case GLFW_KEY_PAUSE: { keyinfo += "Pause"; break; } } - if( keyinfo.empty() == false ) { + } + if( keyinfo.empty() == false ) { - std::string keymodifiers; - if( Global.shiftState ) - keymodifiers += "[Shift]+"; - if( Global.ctrlState ) - keymodifiers += "[Ctrl]+"; + std::string keymodifiers; + if( Global.shiftState ) + keymodifiers += "[Shift]+"; + if( Global.ctrlState ) + keymodifiers += "[Ctrl]+"; - WriteLog( "Key pressed: " + keymodifiers + "[" + keyinfo + "]" ); - } + WriteLog( "Key pressed: " + keymodifiers + "[" + keyinfo + "]" ); } // actual key processing @@ -504,6 +502,14 @@ void TWorld::OnKeyDown(int cKey) { } break; } + case GLFW_KEY_F11: { + // scenery export + if( Global.ctrlState + && Global.shiftState ) { + simulation::State.export_as_text( Global.SceneryFile ); + } + break; + } case GLFW_KEY_F12: { // quick debug mode toggle if( Global.ctrlState diff --git a/scene.cpp b/scene.cpp index be68f31f..ea251a9b 100644 --- a/scene.cpp +++ b/scene.cpp @@ -228,6 +228,17 @@ basic_cell::deserialize( std::istream &Input ) { || ( false == m_lines.empty() ) ); } +// sends content of the class in legacy (text) format to provided stream +void +basic_cell::export_as_text( std::ostream &Output ) const { + + // text format export dumps only relevant basic objects + // sounds + for( auto const *sound : m_sounds ) { + sound->export_as_text( Output ); + } +} + // adds provided shape to the cell void basic_cell::insert( shape_node Shape ) { @@ -530,7 +541,7 @@ basic_cell::create_geometry( gfx::geometrybank_handle const &Bank ) { // adjusts cell bounding area to enclose specified node void -basic_cell::enclose_area( editor::basic_node *Node ) { +basic_cell::enclose_area( scene::basic_node *Node ) { m_area.radius = std::max( m_area.radius, @@ -645,6 +656,16 @@ basic_section::deserialize( std::istream &Input ) { } } +// sends content of the class in legacy (text) format to provided stream +void +basic_section::export_as_text( std::ostream &Output ) const { + + // text format export dumps only relevant basic objects from non-empty cells + for( auto const &cell : m_cells ) { + cell.export_as_text( Output ); + } +} + // adds provided shape to the section void basic_section::insert( shape_node Shape ) { @@ -949,6 +970,18 @@ basic_region::deserialize( std::string const &Scenariofile ) { return true; } +// sends content of the class in legacy (text) format to provided stream +void +basic_region::export_as_text( std::ostream &Output ) const { + + for( auto *section : m_sections ) { + // text format export dumps only relevant basic objects from non-empty sections + if( section != nullptr ) { + section->export_as_text( Output ); + } + } +} + // legacy method, links specified path piece with potential neighbours void basic_region::TrackJoin( TTrack *Track ) { diff --git a/scene.h b/scene.h index c7f2dd6e..8a435ef1 100644 --- a/scene.h +++ b/scene.h @@ -88,6 +88,9 @@ public: // restores content of the class from provided stream void deserialize( std::istream &Input ); + // sends content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; // adds provided shape to the cell void insert( shape_node Shape ); @@ -149,7 +152,7 @@ private: using eventlauncher_sequence = std::vector; // methods void - enclose_area( editor::basic_node *Node ); + enclose_area( scene::basic_node *Node ); // members scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_CELLSIZE ) }; bool m_active { false }; // whether the cell holds any actual data @@ -199,6 +202,9 @@ public: // restores content of the class from provided stream void deserialize( std::istream &Input ); + // sends content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; // adds provided shape to the section void insert( shape_node Shape ); @@ -289,6 +295,9 @@ public: // restores content of the class from file with specified name. returns: true on success, false otherwise bool deserialize( std::string const &Scenariofile ); + // sends content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; // legacy method, links specified path piece with potential neighbours void TrackJoin( TTrack *Track ); diff --git a/scenenode.cpp b/scenenode.cpp index 588281c3..19c3ca5a 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -142,7 +142,7 @@ shape_node::deserialize( std::istream &Input ) { // restores content of the node from provided input stream shape_node & -shape_node::deserialize( cParser &Input, scene::node_data const &Nodedata ) { +shape_node::import( cParser &Input, scene::node_data const &Nodedata ) { // import common data m_name = Nodedata.name; @@ -523,7 +523,7 @@ lines_node::deserialize( std::istream &Input ) { // restores content of the node from provded input stream lines_node & -lines_node::deserialize( cParser &Input, scene::node_data const &Nodedata ) { +lines_node::import( cParser &Input, scene::node_data const &Nodedata ) { // import common data m_name = Nodedata.name; @@ -684,12 +684,9 @@ memory_node::deserialize( cParser &Input, node_data const &Nodedata ) { memorycell.Load( &Input ); } */ -} // scene -namespace editor { - basic_node::basic_node( scene::node_data const &Nodedata ) : m_name( Nodedata.name ) { @@ -700,23 +697,69 @@ basic_node::basic_node( scene::node_data const &Nodedata ) : std::numeric_limits::max() ); } +// sends content of the class to provided stream +void +basic_node::serialize( std::ostream &Output ) const { + // bounding area + m_area.serialize( Output ); + // visibility + sn_utils::ls_float64( Output, m_rangesquaredmin ); + sn_utils::ls_float64( Output, m_rangesquaredmax ); + sn_utils::s_bool( Output, m_visible ); + // name + sn_utils::s_str( Output, m_name ); + // template method implementation + serialize_( Output ); +} + +// restores content of the class from provided stream +void +basic_node::deserialize( std::istream &Input ) { + // bounding area + m_area.deserialize( Input ); + // visibility + m_rangesquaredmin = sn_utils::ld_float64( Input ); + m_rangesquaredmax = sn_utils::ld_float64( Input ); + m_visible = sn_utils::d_bool( Input ); + // name + m_name = sn_utils::d_str( Input ); + // template method implementation + deserialize_( Input ); +} + +// sends basic content of the class in legacy (text) format to provided stream +void +basic_node::export_as_text( std::ostream &Output ) const { + + Output + // header + << "node" + // visibility + << ' ' << ( m_rangesquaredmax < std::numeric_limits::max() ? std::sqrt( m_rangesquaredmax ) : -1 ) + << ' ' << std::sqrt( m_rangesquaredmin ) + // name + << ' ' << m_name << ' '; + // template method implementation + export_as_text_( Output ); +} + float const & basic_node::radius() { if( m_area.radius == -1.0 ) { // calculate if needed - radius_(); + m_area.radius = radius_(); } return m_area.radius; } // radius() subclass details, calculates node's bounding radius // by default nodes are 'virtual don't extend from their center point -void +float basic_node::radius_() { - m_area.radius = 0.f; + return 0.f; } -} // editor +} // scene //--------------------------------------------------------------------------- diff --git a/scenenode.h b/scenenode.h index f99c361d..3b922698 100644 --- a/scenenode.h +++ b/scenenode.h @@ -112,7 +112,7 @@ public: deserialize( std::istream &Input ); // restores content of the node from provided input stream shape_node & - deserialize( cParser &Input, scene::node_data const &Nodedata ); + import( cParser &Input, scene::node_data const &Nodedata ); // imports data from provided submodel shape_node & convert( TSubModel const *Submodel ); @@ -201,7 +201,7 @@ public: deserialize( std::istream &Input ); // restores content of the node from provided input stream lines_node & - deserialize( cParser &Input, scene::node_data const &Nodedata ); + import( cParser &Input, scene::node_data const &Nodedata ); // adds content of provided node to already enclosed geometry. returns: true if merge could be performed bool merge( lines_node &Lines ); @@ -295,12 +295,9 @@ private: TTrack * m_path; }; */ -} // scene -namespace editor { - // base interface for nodes which can be actvated in scenario editor struct basic_node { @@ -310,6 +307,15 @@ public: // destructor virtual ~basic_node() = default; // methods + // sends content of the class to provided stream + void + serialize( std::ostream &Output ) const; + // restores content of the class from provided stream + void + deserialize( std::istream &Input ); + // sends basic content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; std::string const & name() const; void @@ -324,15 +330,23 @@ public: visible() const; protected: -// methods - // radius() subclass details, calculates node's bounding radius - virtual void radius_(); // members scene::bounding_area m_area; - bool m_visible { true }; double m_rangesquaredmin { 0.0 }; // visibility range, min double m_rangesquaredmax { 0.0 }; // visibility range, max + bool m_visible { true }; // visibility flag std::string m_name; + +private: +// methods + // radius() subclass details, calculates node's bounding radius + virtual float radius_(); + // serialize() subclass details, sends content of the subclass to provided stream + virtual void serialize_( std::ostream &Output ) const = 0; + // deserialize() subclass details, restores content of the subclass from provided stream + virtual void deserialize_( std::istream &Input ) = 0; + // export() subclass details, sends basic content of the class in legacy (text) format to provided stream + virtual void export_as_text_( std::ostream &Output ) const = 0; }; inline @@ -365,6 +379,6 @@ basic_node::visible() const { return m_visible; } -} // editor +} // scene //--------------------------------------------------------------------------- diff --git a/simulation.cpp b/simulation.cpp index 4499ba68..8e6cb57d 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "uilayer.h" #include "renderer.h" + namespace simulation { state_manager State; @@ -57,8 +58,6 @@ state_manager::deserialize( std::string const &Scenariofile ) { // as long as the scenario file wasn't rainsted-created base file override Region->serialize( Scenariofile ); } - - Global.iPause &= ~0x10; // koniec pauzy wczytywania return true; } @@ -409,7 +408,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == Scratchpad.binary.terrain ) { simulation::Region->insert_shape( - scene::shape_node().deserialize( + scene::shape_node().import( Input, nodedata ), Scratchpad, true ); @@ -426,7 +425,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == Scratchpad.binary.terrain ) { simulation::Region->insert_lines( - scene::lines_node().deserialize( + scene::lines_node().import( Input, nodedata ), Scratchpad ); } @@ -439,7 +438,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad auto *memorycell { deserialize_memorycell( Input, Scratchpad, nodedata ) }; if( false == simulation::Memory.insert( memorycell ) ) { - ErrorLog( "Bad scenario: memory cell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } /* // TODO: implement this @@ -897,6 +896,65 @@ state_manager::transform( glm::dvec3 Location, scene::scratch_data const &Scratc return Location; } + +// stores class data in specified file, in legacy (text) format +void +state_manager::export_as_text( std::string const &Scenariofile ) const { + + if( Scenariofile == "$.scn" ) { + ErrorLog( "Bad file: scenery export not supported for file \"$.scn\"" ); + } + else { + WriteLog( "Scenery data export in progress..." ); + } + + auto filename { Scenariofile }; + while( filename[ 0 ] == '$' ) { + // trim leading $ char rainsted utility may add to the base name for modified .scn files + filename.erase( 0, 1 ); + } + erase_extension( filename ); + filename = Global.asCurrentSceneryPath + filename + "_export"; + + std::ofstream scmfile { filename + ".scm" }; + // tracks + scmfile << "// paths\n"; + for( auto const *path : Paths.sequence() ) { + path->export_as_text( scmfile ); + } + // traction + scmfile << "// traction\n"; + for( auto const *traction : Traction.sequence() ) { + traction->export_as_text( scmfile ); + } + // power grid + scmfile << "// traction power sources\n"; + for( auto const *powersource : Powergrid.sequence() ) { + powersource->export_as_text( scmfile ); + } + // models + scmfile << "// instanced models\n"; + for( auto const *instance : Instances.sequence() ) { + instance->export_as_text( scmfile ); + } + // sounds + scmfile << "// sounds\n"; + Region->export_as_text( scmfile ); + + std::ofstream ctrfile { filename + ".ctr" }; + // mem cells + ctrfile << "// memory cells\n"; + for( auto const *memorycell : Memory.sequence() ) { + if( true == memorycell->is_exportable ) { + memorycell->export_as_text( ctrfile ); + } + } + // events + Events.export_as_text( ctrfile ); + + WriteLog( "Scenery data export done." ); +} + } // simulation //--------------------------------------------------------------------------- diff --git a/simulation.h b/simulation.h index 0a344aa8..91f3785f 100644 --- a/simulation.h +++ b/simulation.h @@ -36,6 +36,9 @@ public: update( double Deltatime, int Iterationcount ); bool deserialize( std::string const &Scenariofile ); + // stores class data in specified file, in legacy (text) format + void + export_as_text( std::string const &Scenariofile ) const; private: // methods @@ -69,6 +72,7 @@ private: void skip_until( cParser &Input, std::string const &Token ); // transforms provided location by specifed rotation and offset glm::dvec3 transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ); + }; extern state_manager State; diff --git a/sound.cpp b/sound.cpp index bd903e66..da071a6a 100644 --- a/sound.cpp +++ b/sound.cpp @@ -293,6 +293,43 @@ sound_source::deserialize_soundset( cParser &Input ) { } } +// sends content of the class in legacy (text) format to provided stream +// NOTE: currently exports only the main sound +void +sound_source::export_as_text( std::ostream &Output ) const { + + if( sound( sound_id::main ).buffer == null_handle ) { return; } + + // generic node header + Output + << "node " + // visibility + << m_range << ' ' + << 0 << ' ' + // name + << m_name << ' '; + // sound node header + Output + << "sound "; + // location + Output + << m_offset.x << ' ' + << m_offset.y << ' ' + << m_offset.z << ' '; + // sound data + auto soundfile { audio::renderer.buffer( sound( sound_id::main ).buffer ).name }; + if( soundfile.find( szSoundPath ) == 0 ) { + // don't include 'sounds/' in the path + soundfile.erase( 0, std::string{ szSoundPath }.size() ); + } + Output + << soundfile << ' '; + // footer + Output + << "endsound" + << "\n"; +} + // copies list of sounds from provided source sound_source & sound_source::copy_sounds( sound_source const &Source ) { diff --git a/sound.h b/sound.h index 004e662b..7a3b1cde 100644 --- a/sound.h +++ b/sound.h @@ -60,6 +60,9 @@ public: deserialize( cParser &Input, sound_type const Legacytype, int const Legacyparameters = 0, int const Chunkrange = 100 ); sound_source & deserialize( std::string const &Input, sound_type const Legacytype, int const Legacyparameters = 0 ); + // sends content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; // copies list of sounds from provided source sound_source & copy_sounds( sound_source const &Source ); diff --git a/uilayer.cpp b/uilayer.cpp index b31d716e..5c16c0cf 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -98,6 +98,7 @@ ui_layer::on_key( int const Key, int const Action ) { case GLFW_KEY_F8: case GLFW_KEY_F9: case GLFW_KEY_F10: + case GLFW_KEY_F11: case GLFW_KEY_F12: { // ui mode selectors if( ( true == Global.ctrlState ) From c2f0df9a0b9b52adcbf5e5259f0bc811ea201d80 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 13 Jun 2018 16:52:42 +0200 Subject: [PATCH 341/426] minor ai tweaks, minor bug fixes --- Driver.cpp | 2 +- DynObj.cpp | 11 ++++++----- Train.cpp | 8 ++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 81de10c1..5c569fac 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4783,7 +4783,7 @@ TController::UpdateSituation(double dt) { } else { // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) - if( ( std::max( 75.0, fMaxProximityDist ) + fBrakeDist * braking_distance_multiplier( VelNext ) ) >= ( ActualProximityDist - fMaxProximityDist ) ) { + if( ( std::max( 100.0, fMaxProximityDist ) + fBrakeDist * braking_distance_multiplier( VelNext ) ) >= ( ActualProximityDist - fMaxProximityDist ) ) { // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); diff --git a/DynObj.cpp b/DynObj.cpp index 09eb90c2..ffb1401c 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -6559,11 +6559,12 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub std::max( goalvolume, currentvolume - changerate ) : std::min( goalvolume, currentvolume + changerate ) ); + engine_turbo + .pitch( 0.4 + engine_turbo_pitch * 0.4 ) + .gain( volume ); + if( volume > 0.05 ) { - engine_turbo - .pitch( 0.4 + engine_turbo_pitch * 0.4 ) - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); + engine_turbo.play( sound_flags::exclusive | sound_flags::looping ); } else { engine_turbo.stop(); @@ -6597,7 +6598,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( ( true == Vehicle.Mains ) && ( false == motors.empty() ) ) { - if( std::fabs( Vehicle.enrot ) > 0.01 ) { + if( std::abs( Vehicle.enrot ) > 0.01 ) { auto const &motor { motors.front() }; // frequency calculation diff --git a/Train.cpp b/Train.cpp index 5d2f7133..ed73145d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4345,7 +4345,7 @@ bool TTrain::Update( double const Deltatime ) tor = DynamicObject->GetTrack(); // McZapkie-180203 // McZapkie: predkosc wyswietlana na tachometrze brana jest z obrotow kol - float maxtacho = 3; + auto const maxtacho { 3.0 }; fTachoVelocity = static_cast( std::min( std::abs(11.31 * mvControlled->WheelDiameter * mvControlled->nrot), mvControlled->Vmax * 1.05) ); { // skacze osobna zmienna float ff = simulation::Time.data().wSecond; // skacze co sekunde - pol sekundy @@ -4361,12 +4361,12 @@ bool TTrain::Update( double const Deltatime ) } if (fTachoVelocity > 1) // McZapkie-270503: podkrecanie tachometru { - if (fTachoCount < maxtacho) - fTachoCount += Deltatime * 3; // szybciej zacznij stukac + // szybciej zacznij stukac + fTachoCount = std::min( maxtacho, fTachoCount + Deltatime * 3 ); } else if( fTachoCount > 0 ) { // schodz powoli - niektore haslery to ze 4 sekundy potrafia stukac - fTachoCount -= Deltatime * 0.66; + fTachoCount = std::max( 0.0, fTachoCount - Deltatime * 0.66 ); } // Ra 2014-09: napięcia i prądy muszą być ustalone najpierw, bo wysyłane są ewentualnie na PoKeys From 0fe653cab9a5a493e56bf6fc567a707cef545869 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 13 Jun 2018 21:42:22 +0200 Subject: [PATCH 342/426] support for binding multiple events to path pieces --- Driver.cpp | 111 ++++++++++++----------- Driver.h | 2 +- Track.cpp | 234 +++++++++++-------------------------------------- Track.h | 20 +++-- TrkFoll.cpp | 104 ++++++++++++++-------- simulation.cpp | 2 +- 6 files changed, 195 insertions(+), 278 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 5c569fac..d569c429 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -418,15 +418,17 @@ void TController::TableClear() eSignSkip = nullptr; // nic nie pomijamy }; -TEvent * TController::CheckTrackEvent( TTrack *Track, double const fDirection ) const +std::vector TController::CheckTrackEvent( TTrack *Track, double const fDirection ) const { // sprawdzanie eventów na podanym torze do podstawowego skanowania - TEvent *e = (fDirection > 0) ? Track->evEvent2 : Track->evEvent1; - if (!e) - return NULL; - if (e->bEnabled) - return NULL; - // jednak wszystkie W4 do tabelki, bo jej czyszczenie na przystanku wprowadza zamieszanie - return e; + std::vector events; + auto const &eventsequence { ( fDirection > 0 ? Track->m_events2 : Track->m_events1 ) }; + for( auto const &event : eventsequence ) { + if( ( event.second != nullptr ) + && ( false == event.second->bEnabled ) ) { + events.emplace_back( event.second ); + } + } + return events; } bool TController::TableAddNew() @@ -462,7 +464,6 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) TTrack *pTrack{ nullptr }; // zaczynamy od ostatniego analizowanego toru double fTrackLength{ 0.0 }; // długość aktualnego toru (krótsza dla pierwszego) double fCurrentDistance{ 0.0 }; // aktualna przeskanowana długość - TEvent *pEvent{ nullptr }; double fLastDir{ 0.0 }; if (iTableDirection != iDirection ) { @@ -538,47 +539,50 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) WriteLog( "Speed table for " + OwnerName() + " tracing through track " + pTrack->name() ); } - if( ( pEvent = CheckTrackEvent( pTrack, fLastDir ) ) != nullptr ) // jeśli jest semafor na tym torze - { // trzeba sprawdzić tabelkę, bo dodawanie drugi raz tego samego przystanku nie jest korzystne - if (TableNotFound(pEvent)) // jeśli nie ma - { - TableAddNew(); // zawsze jest true + auto const events { CheckTrackEvent( pTrack, fLastDir ) }; + for( auto *pEvent : events ) { + if( pEvent != nullptr ) // jeśli jest semafor na tym torze + { // trzeba sprawdzić tabelkę, bo dodawanie drugi raz tego samego przystanku nie jest korzystne + if (TableNotFound(pEvent)) // jeśli nie ma + { + TableAddNew(); // zawsze jest true - if (Global.iWriteLogEnabled & 8) { - WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->asName); - } - auto &newspeedpoint = sSpeedTable[iLast]; + if (Global.iWriteLogEnabled & 8) { + WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->asName); + } + auto &newspeedpoint = sSpeedTable[iLast]; /* - if( newspeedpoint.Set( - pEvent, - fCurrentDistance + ProjectEventOnTrack( pEvent, pTrack, fLastDir ), - OrderCurrentGet() ) ) { + if( newspeedpoint.Set( + pEvent, + fCurrentDistance + ProjectEventOnTrack( pEvent, pTrack, fLastDir ), + OrderCurrentGet() ) ) { */ - if( newspeedpoint.Set( - pEvent, - GetDistanceToEvent( pTrack, pEvent, fLastDir, fCurrentDistance ), - OrderCurrentGet() ) ) { + if( newspeedpoint.Set( + pEvent, + GetDistanceToEvent( pTrack, pEvent, fLastDir, fCurrentDistance ), + OrderCurrentGet() ) ) { - fDistance = newspeedpoint.fDist; // jeśli sygnał stop, to nie ma potrzeby dalej skanować - SemNextStopIndex = iLast; - if (SemNextIndex == -1) { - SemNextIndex = iLast; + fDistance = newspeedpoint.fDist; // jeśli sygnał stop, to nie ma potrzeby dalej skanować + SemNextStopIndex = iLast; + if (SemNextIndex == -1) { + SemNextIndex = iLast; + } + if (Global.iWriteLogEnabled & 8) { + WriteLog("(stop signal from " + + (SemNextStopIndex != -1 ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor") + + ")"); + } } - if (Global.iWriteLogEnabled & 8) { - WriteLog("(stop signal from " - + (SemNextStopIndex != -1 ? sSpeedTable[SemNextStopIndex].GetName() : "unknown semaphor") - + ")"); - } - } - else { - if ((true == newspeedpoint.IsProperSemaphor(OrderCurrentGet())) - && (SemNextIndex == -1)) { - SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze - } - if (Global.iWriteLogEnabled & 8) { - WriteLog("(forward signal for " - + (SemNextIndex != -1 ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor") - + ")"); + else { + if( ( true == newspeedpoint.IsProperSemaphor( OrderCurrentGet() ) ) + && ( SemNextIndex == -1 ) ) { + SemNextIndex = iLast; // sprawdzamy czy pierwszy na drodze + } + if (Global.iWriteLogEnabled & 8) { + WriteLog("(forward signal for " + + (SemNextIndex != -1 ? sSpeedTable[SemNextIndex].GetName() : "unknown semaphor") + + ")"); + } } } } @@ -5563,12 +5567,17 @@ bool TController::BackwardTrackBusy(TTrack *Track) TEvent * TController::CheckTrackEventBackward(double fDirection, TTrack *Track) { // sprawdzanie eventu w torze, czy jest sygnałowym - skanowanie do tyłu - TEvent *e = (fDirection > 0) ? Track->evEvent2 : Track->evEvent1; - if (e) - if (!e->bEnabled) // jeśli sygnałowy (nie dodawany do kolejki) - if (e->Type == tp_GetValues) // PutValues nie może się zmienić - return e; - return NULL; + // NOTE: this method returns only one event which meets the conditions, due to limitations in the caller + // TBD, TODO: clean up the caller and return all suitable events, as in theory things will go awry if the track has more than one signal + auto const &eventsequence { ( fDirection > 0 ? Track->m_events2 : Track->m_events1 ) }; + for( auto const &event : eventsequence ) { + if( ( event.second != nullptr ) + && ( false == event.second->bEnabled ) + && ( event.second->Type == tp_GetValues ) ) { + return event.second; + } + } + return nullptr; }; TTrack * TController::BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, TEvent *&Event) diff --git a/Driver.h b/Driver.h index f429fef6..d54f5fcc 100644 --- a/Driver.h +++ b/Driver.h @@ -349,7 +349,7 @@ private: int OrderDirectionChange(int newdir, TMoverParameters *Vehicle); void Lights(int head, int rear); // Ra: metody obsługujące skanowanie toru - TEvent *CheckTrackEvent(TTrack *Track, double const fDirection ) const; + std::vector CheckTrackEvent(TTrack *Track, double const fDirection ) const; bool TableAddNew(); bool TableNotFound(TEvent const *Event) const; void TableTraceRoute(double fDistance, TDynamicObject *pVehicle = nullptr); diff --git a/Track.cpp b/Track.cpp index 29fc9b30..cc7b9ec9 100644 --- a/Track.cpp +++ b/Track.cpp @@ -763,37 +763,37 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) { parser->getTokens(); *parser >> token; - asEvent0Name = token; + m_events0.emplace_back( token, nullptr ); } else if (str == "event1") { parser->getTokens(); *parser >> token; - asEvent1Name = token; + m_events1.emplace_back( token, nullptr ); } else if (str == "event2") { parser->getTokens(); *parser >> token; - asEvent2Name = token; + m_events2.emplace_back( token, nullptr ); } else if (str == "eventall0") { parser->getTokens(); *parser >> token; - asEventall0Name = token; + m_events0all.emplace_back( token, nullptr ); } else if (str == "eventall1") { parser->getTokens(); *parser >> token; - asEventall1Name = token; + m_events1all.emplace_back( token, nullptr ); } else if (str == "eventall2") { parser->getTokens(); *parser >> token; - asEventall2Name = token; + m_events2all.emplace_back( token, nullptr ); } else if (str == "velocity") { @@ -869,153 +869,44 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) / 3.0 } ); } -// TODO: refactor this mess -bool TTrack::AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2, bool const Explicit ) -{ - bool bError = false; +bool TTrack::AssignEvents() { - if( NewEvent0 == nullptr ) { - if( false == asEvent0Name.empty() ) { - bError = true; - if( true == Explicit ) { - ErrorLog( "Bad event: event \"" + asEvent0Name + "\" assigned to track \"" + m_name + "\" does not exist" ); + bool lookupfail { false }; + + std::vector< std::pair< std::string, event_sequence * > > const eventsequences { + { "event0", &m_events0 }, { "eventall0", &m_events0all }, + { "event1", &m_events1 }, { "eventall1", &m_events1all }, + { "event2", &m_events2 }, { "eventall2", &m_events2all } }; + + for( auto &eventsequence : eventsequences ) { + for( auto &event : *( eventsequence.second ) ) { + event.second = simulation::Events.FindEvent( event.first ); + if( event.second != nullptr ) { + m_events = true; + } + else { + ErrorLog( "Bad event: event \"" + event.first + "\" assigned to track \"" + m_name + "\" does not exist" ); + lookupfail = true; } } } - else { - if( evEvent0 == nullptr ) { - evEvent0 = NewEvent0; -/* - // preserve event names, we'll need them if we want the scenario export to be unaffected by missing events and such - asEvent0Name = ""; -*/ - iEvents |= 1; // sumaryczna informacja o eventach - } - else { - ErrorLog( "Bad track: event \"" + NewEvent0->asName + "\" cannot be assigned to track, track already has one" ); - bError = true; - } - } - if( NewEvent1 == nullptr ) { - if( false == asEvent1Name.empty() ) { - bError = true; - if( true == Explicit ) { - ErrorLog( "Bad event: event \"" + asEvent1Name + "\" assigned to track \"" + m_name + "\" does not exist" ); + auto const trackname { name() }; + + if( ( Global.iHiddenEvents & 1 ) + && ( false == trackname.empty() ) ) { + // jeśli podana jest nazwa torów, można szukać eventów skojarzonych przez nazwę + for( auto &eventsequence : eventsequences ) { + auto *event = simulation::Events.FindEvent( trackname + ':' + eventsequence.first ); + if( event != nullptr ) { + // HACK: auto-associated events come with empty lookup string, to avoid including them in the text format export + eventsequence.second->emplace_back( "", event ); + m_events = true; } } } - else { - if( evEvent1 == nullptr ) { - evEvent1 = NewEvent1; -/* - asEvent1Name = ""; -*/ - iEvents |= 2; // sumaryczna informacja o eventach - } - else { - ErrorLog( "Bad track: event \"" + NewEvent1->asName + "\" cannot be assigned to track, track already has one" ); - bError = true; - } - } - if( NewEvent2 == nullptr ) { - if( false == asEvent2Name.empty() ) { - bError = true; - if( true == Explicit ) { - ErrorLog( "Bad event: event \"" + asEvent2Name + "\" assigned to track \"" + m_name + "\" does not exist" ); - } - } - } - else { - if( evEvent2 == nullptr ) { - evEvent2 = NewEvent2; -/* - asEvent2Name = ""; -*/ - iEvents |= 4; // sumaryczna informacja o eventach - } - else { - ErrorLog( "Bad track: event \"" + NewEvent2->asName + "\" cannot be assigned to track, track already has one" ); - bError = true; - } - } - - return ( bError == false ); -} - -bool TTrack::AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2, bool const Explicit) -{ - bool bError = false; - - if( NewEvent0 == nullptr ) { - if( false == asEventall0Name.empty() ) { - bError = true; - if( true == Explicit ) { - ErrorLog( "Bad event: event \"" + asEventall0Name + "\" assigned to track \"" + m_name + "\" does not exist" ); - } - } - } - else { - if( evEventall0 == nullptr ) { - evEventall0 = NewEvent0; -/* - // preserve event names, we'll need them if we want the scenario export to be unaffected by missing events and such - asEventall0Name = ""; -*/ - iEvents |= 8; // sumaryczna informacja o eventach - } - else { - ErrorLog( "Bad track: event \"" + NewEvent0->asName + "\" cannot be assigned to track, track already has one" ); - bError = true; - } - } - - if( NewEvent1 == nullptr ) { - if( false == asEventall1Name.empty() ) { - bError = true; - if( true == Explicit ) { - ErrorLog( "Bad event: event \"" + asEventall1Name + "\" assigned to track \"" + m_name + "\" does not exist" ); - } - } - } - else { - if( evEventall1 == nullptr ) { - evEventall1 = NewEvent1; -/* - asEventall1Name = ""; -*/ - iEvents |= 16; // sumaryczna informacja o eventach - } - else { - ErrorLog( "Bad track: event \"" + NewEvent1->asName + "\" cannot be assigned to track, track already has one" ); - bError = true; - } - } - - if( NewEvent2 == nullptr ) { - if( false == asEventall2Name.empty() ) { - bError = true; - if( true == Explicit ) { - ErrorLog( "Bad event: event \"" + asEventall2Name + "\" assigned to track \"" + m_name + "\" does not exist" ); - } - } - } - else { - if( evEventall2 == nullptr ) { - evEventall2 = NewEvent2; -/* - asEventall2Name = ""; -*/ - iEvents |= 32; // sumaryczna informacja o eventach - } - else { - ErrorLog( "Bad track: event \"" + NewEvent2->asName + "\" cannot be assigned to track, track already has one" ); - bError = true; - } - } - - return ( bError == false ); + return ( lookupfail == false ); } bool TTrack::AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus) @@ -2903,23 +2794,19 @@ TTrack::export_as_text_( std::ostream &Output ) const { << path.radius << ' '; } // optional attributes - if( false == asEvent0Name.empty() ) { - Output << "event0 " << asEvent0Name << ' '; - } - if( false == asEvent1Name.empty() ) { - Output << "event1 " << asEvent1Name << ' '; - } - if( false == asEvent2Name.empty() ) { - Output << "event2 " << asEvent2Name << ' '; - } - if( false == asEventall0Name.empty() ) { - Output << "eventall0 " << asEventall0Name << ' '; - } - if( false == asEventall1Name.empty() ) { - Output << "eventall1 " << asEventall1Name << ' '; - } - if( false == asEventall2Name.empty() ) { - Output << "eventall2 " << asEventall2Name << ' '; + std::vector< std::pair< std::string, event_sequence const * > > const eventsequences { + { "event0", &m_events0 }, { "eventall0", &m_events0all }, + { "event1", &m_events1 }, { "eventall1", &m_events1all }, + { "event2", &m_events2 }, { "eventall2", &m_events2all } }; + + for( auto &eventsequence : eventsequences ) { + for( auto &event : *( eventsequence.second ) ) { + if( false == event.first.empty() ) { + Output + << eventsequence.first << ' ' + << event.first << ' '; + } + } } if( ( SwitchExtension ) && ( SwitchExtension->fVelocity != -1.0 ) ) { @@ -3063,33 +2950,10 @@ path_table::InitTracks() { for( auto first = std::rbegin(m_items); first != std::rend(m_items); ++first ) { auto *track = *first; #endif - - track->AssignEvents( - simulation::Events.FindEvent( track->asEvent0Name ), - simulation::Events.FindEvent( track->asEvent1Name ), - simulation::Events.FindEvent( track->asEvent2Name ) ); - track->AssignallEvents( - simulation::Events.FindEvent( track->asEventall0Name ), - simulation::Events.FindEvent( track->asEventall1Name ), - simulation::Events.FindEvent( track->asEventall2Name ) ); + track->AssignEvents(); auto const trackname { track->name() }; - if( ( Global.iHiddenEvents & 1 ) - && ( false == trackname.empty() ) ) { - // jeśli podana jest nazwa torów, można szukać eventów skojarzonych przez nazwę - track->AssignEvents( - simulation::Events.FindEvent( trackname + ":event0" ), - simulation::Events.FindEvent( trackname + ":event1" ), - simulation::Events.FindEvent( trackname + ":event2" ), - false ); - track->AssignallEvents( - simulation::Events.FindEvent( trackname + ":eventall0" ), - simulation::Events.FindEvent( trackname + ":eventall1" ), - simulation::Events.FindEvent( trackname + ":eventall2" ), - false ); - } - switch (track->eType) { // TODO: re-enable case tt_Table: { diff --git a/Track.h b/Track.h index c47836b8..a97f2601 100644 --- a/Track.h +++ b/Track.h @@ -149,16 +149,26 @@ private: glm::dvec3 m_origin; material_handle m_material1 = 0; // tekstura szyn albo nawierzchni material_handle m_material2 = 0; // tekstura automatycznej podsypki albo pobocza - typedef std::vector geometryhandle_sequence; + using geometryhandle_sequence = std::vector; geometryhandle_sequence Geometry1; // geometry chunks textured with texture 1 geometryhandle_sequence Geometry2; // geometry chunks textured with texture 2 std::vector m_paths; // source data for owned paths public: - typedef std::deque dynamics_sequence; + using dynamics_sequence = std::deque; + using event_sequence = std::vector >; + dynamics_sequence Dynamics; - int iEvents = 0; // Ra: flaga informująca o obecności eventów + event_sequence + m_events0all, + m_events1all, + m_events2all, + m_events0, + m_events1, + m_events2; + bool m_events { false }; // Ra: flaga informująca o obecności eventów +/* TEvent *evEventall0 = nullptr; // McZapkie-140302: wyzwalany gdy pojazd stoi TEvent *evEventall1 = nullptr; TEvent *evEventall2 = nullptr; @@ -171,6 +181,7 @@ public: std::string asEvent0Name; std::string asEvent1Name; std::string asEvent2Name; +*/ int iNextDirection = 0; // 0:Point1, 1:Point2, 3:do odchylonego na zwrotnicy int iPrevDirection = 0; // domyślnie wirtualne odcinki dołączamy stroną od Point1 TTrackType eType = tt_Normal; // domyślnie zwykły @@ -234,8 +245,7 @@ public: SwitchExtension->iRoads - 1 : 1 ); } void Load(cParser *parser, Math3D::vector3 pOrigin); - bool AssignEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2, bool const Explicit = true ); - bool AssignallEvents(TEvent *NewEvent0, TEvent *NewEvent1, TEvent *NewEvent2, bool const Explicit = true ); + bool AssignEvents(); bool AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus); bool CheckDynamicObject(TDynamicObject *Dynamic); bool AddDynamicObject(TDynamicObject *Dynamic); diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 9427fae6..b4868e2a 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -101,7 +101,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) { // pętla przesuwająca wózek przez kolejne tory, aż do trafienia w jakiś if( pCurrentTrack == nullptr ) { return false; } // nie ma toru, to nie ma przesuwania // TODO: refactor following block as track method - if( pCurrentTrack->iEvents ) { // sumaryczna informacja o eventach + if( pCurrentTrack->m_events ) { // sumaryczna informacja o eventach // omijamy cały ten blok, gdy tor nie ma on żadnych eventów (większość nie ma) if( ( std::abs( fDistance ) < 0.01 ) && ( Owner->GetVelocity() < 0.01 ) ) { @@ -109,14 +109,18 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) if( ( Owner->Mechanik != nullptr ) && ( Owner->Mechanik->Primary() ) ) { // tylko dla jednego członu - if( ( pCurrentTrack->evEvent0 ) - && ( pCurrentTrack->evEvent0->iQueued == 0 ) ) { - simulation::Events.AddToQuery( pCurrentTrack->evEvent0, Owner ); + for( auto &event : pCurrentTrack->m_events0 ) { + if( ( event.second != nullptr ) + && ( event.second->iQueued == 0 ) ) { + simulation::Events.AddToQuery( event.second, Owner ); + } } } - if( ( pCurrentTrack->evEventall0 ) - && ( pCurrentTrack->evEventall0->iQueued == 0 ) ) { - simulation::Events.AddToQuery( pCurrentTrack->evEventall0, Owner ); + for( auto &event : pCurrentTrack->m_events0all ) { + if( ( event.second != nullptr ) + && ( event.second->iQueued == 0 ) ) { + simulation::Events.AddToQuery( event.second, Owner ); + } } } else if (fDistance < 0) { @@ -127,20 +131,27 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) && ( Owner->Mechanik->Primary() ) ) { // tylko dla jednego członu // McZapkie-280503: wyzwalanie event tylko dla pojazdow z obsada - if( ( true == bPrimary ) - && ( pCurrentTrack->evEvent1 != nullptr ) - && ( pCurrentTrack->evEvent1->iQueued == 0 ) ) { - // dodanie do kolejki - simulation::Events.AddToQuery( pCurrentTrack->evEvent1, Owner ); + if( true == bPrimary ) { + for( auto &event : pCurrentTrack->m_events1 ) { + if( ( event.second != nullptr ) + && ( event.second->iQueued == 0 ) ) { + // dodanie do kolejki + simulation::Events.AddToQuery( event.second, Owner ); + } + } } } } if( SetFlag( iEventallFlag, -1 ) ) { // McZapkie-280503: wyzwalanie eventall dla wszystkich pojazdow - if( ( true == bPrimary ) - && ( pCurrentTrack->evEventall1 != nullptr ) - && ( pCurrentTrack->evEventall1->iQueued == 0 ) ) { - simulation::Events.AddToQuery( pCurrentTrack->evEventall1, Owner ); // dodanie do kolejki + if( true == bPrimary ) { + for( auto &event : pCurrentTrack->m_events1all ) { + if( ( event.second != nullptr ) + && ( event.second->iQueued == 0 ) ) { + // dodanie do kolejki + simulation::Events.AddToQuery( event.second, Owner ); + } + } } } } @@ -151,19 +162,27 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) if( ( Owner->Mechanik != nullptr ) && ( Owner->Mechanik->Primary() ) ) { // tylko dla jednego członu - if( ( true == bPrimary ) - && ( pCurrentTrack->evEvent2 != nullptr ) - && ( pCurrentTrack->evEvent2->iQueued == 0 ) ) { - simulation::Events.AddToQuery( pCurrentTrack->evEvent2, Owner ); + if( true == bPrimary ) { + for( auto &event : pCurrentTrack->m_events2 ) { + if( ( event.second != nullptr ) + && ( event.second->iQueued == 0 ) ) { + // dodanie do kolejki + simulation::Events.AddToQuery( event.second, Owner ); + } + } } } } if( SetFlag( iEventallFlag, -2 ) ) { // sprawdza i zeruje na przyszłość, true jeśli zmieni z 2 na 0 - if( ( true == bPrimary ) - && ( pCurrentTrack->evEventall2 != nullptr ) - && ( pCurrentTrack->evEventall2->iQueued == 0 ) ) { - simulation::Events.AddToQuery( pCurrentTrack->evEventall2, Owner ); + if( true == bPrimary ) { + for( auto &event : pCurrentTrack->m_events2all ) { + if( ( event.second != nullptr ) + && ( event.second->iQueued == 0 ) ) { + // dodanie do kolejki + simulation::Events.AddToQuery( event.second, Owner ); + } + } } } } @@ -258,18 +277,33 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) { // gdy zostaje na tym samym torze (przesuwanie już nie zmienia toru) if (bPrimary) { // tylko gdy początkowe ustawienie, dodajemy eventy stania do kolejki - if (Owner->MoverParameters->ActiveCab != 0) - // if (Owner->MoverParameters->CabNo!=0) - { - if (pCurrentTrack->evEvent1 && pCurrentTrack->evEvent1->fDelay <= -1.0f) - simulation::Events.AddToQuery(pCurrentTrack->evEvent1, Owner); - if (pCurrentTrack->evEvent2 && pCurrentTrack->evEvent2->fDelay <= -1.0f) - simulation::Events.AddToQuery(pCurrentTrack->evEvent2, Owner); + if (Owner->MoverParameters->ActiveCab != 0) { + + for( auto &event : pCurrentTrack->m_events1 ) { + if( ( event.second != nullptr ) + && ( event.second->fDelay <= -1.0 ) ) { + simulation::Events.AddToQuery( event.second, Owner ); + } + } + for( auto &event : pCurrentTrack->m_events2 ) { + if( ( event.second != nullptr ) + && ( event.second->fDelay <= -1.0 ) ) { + simulation::Events.AddToQuery( event.second, Owner ); + } + } + } + for( auto &event : pCurrentTrack->m_events1all ) { + if( ( event.second != nullptr ) + && ( event.second->fDelay <= -1.0 ) ) { + simulation::Events.AddToQuery( event.second, Owner ); + } + } + for( auto &event : pCurrentTrack->m_events2all ) { + if( ( event.second != nullptr ) + && ( event.second->fDelay <= -1.0 ) ) { + simulation::Events.AddToQuery( event.second, Owner ); + } } - if (pCurrentTrack->evEventall1 && pCurrentTrack->evEventall1->fDelay <= -1.0f) - simulation::Events.AddToQuery(pCurrentTrack->evEventall1, Owner); - if (pCurrentTrack->evEventall2 && pCurrentTrack->evEventall2->fDelay <= -1.0f) - simulation::Events.AddToQuery(pCurrentTrack->evEventall2, Owner); } fCurrentDistance = s; // fDistance=0; diff --git a/simulation.cpp b/simulation.cpp index 8e6cb57d..ec2da2f8 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -789,7 +789,7 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch } if( ( true == Scratchpad.trainset.vehicles.empty() ) // jeśli pierwszy pojazd, - && ( false == path->asEvent0Name.empty() ) // tor ma Event0 + && ( false == path->m_events0.empty() ) // tor ma Event0 && ( std::abs( velocity ) <= 1.f ) // a skład stoi && ( Scratchpad.trainset.offset >= 0.0 ) // ale może nie sięgać na owy tor && ( Scratchpad.trainset.offset < 8.0 ) ) { // i raczej nie sięga From e54468f8311df3fdf1f1b10c9fa454c5fbe8bd41 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 14 Jun 2018 17:38:45 +0200 Subject: [PATCH 343/426] build 180614. relaxed children count limit for multi-events, minor scene code cleanup --- Driver.cpp | 34 +++++++++------------ Event.cpp | 89 +++++++++++++++++++++--------------------------------- Event.h | 49 ++++++++++++++++-------------- scene.cpp | 14 ++++----- version.h | 2 +- 5 files changed, 82 insertions(+), 106 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index d569c429..dac6baf9 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4023,9 +4023,9 @@ TController::UpdateSituation(double dt) { // podłączanie do składu if (iDrivigFlags & moveConnect) { // jeśli stanął już blisko, unikając zderzenia i można próbować podłączyć - fMinProximityDist = -0.5; + fMinProximityDist = -1.0; fMaxProximityDist = 0.0; //[m] dojechać maksymalnie - fVelPlus = 0.5; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania + fVelPlus = 1.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania fVelMinus = 0.5; // margines prędkości powodujący załączenie napędu if (AIControllFlag) { // to robi tylko AI, wersję dla człowieka trzeba dopiero zrobić @@ -4033,21 +4033,17 @@ TController::UpdateSituation(double dt) { bool ok; // true gdy się podłączy (uzyskany sprzęg będzie zgodny z żądanym) if (pVehicles[0]->DirectionGet() > 0) // jeśli sprzęg 0 { // sprzęg 0 - próba podczepienia - if (pVehicles[0]->MoverParameters->Couplers[0].Connected) // jeśli jest coś - // wykryte (a - // chyba jest, - // nie?) - if (pVehicles[0]->MoverParameters->Attach( - 0, 2, pVehicles[0]->MoverParameters->Couplers[0].Connected, - iCoupler)) - { - // pVehicles[0]->dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); - // pVehicles[0]->dsbCouplerAttach->Play(0,0,0); + if( pVehicles[ 0 ]->MoverParameters->Couplers[ 0 ].Connected ) { + // jeśli jest coś wykryte (a chyba jest, nie?) + if( pVehicles[ 0 ]->MoverParameters->Attach( + 0, 2, pVehicles[ 0 ]->MoverParameters->Couplers[ 0 ].Connected, + iCoupler ) ) { + // pVehicles[0]->dsbCouplerAttach->SetVolume(DSBVOLUME_MAX); + // pVehicles[0]->dsbCouplerAttach->Play(0,0,0); } - // WriteLog("CoupleDist[0]="+AnsiString(pVehicles[0]->MoverParameters->Couplers[0].CoupleDist)+", - // Connected[0]="+AnsiString(pVehicles[0]->MoverParameters->Couplers[0].CouplingFlag)); - ok = (pVehicles[0]->MoverParameters->Couplers[0].CouplingFlag == - iCoupler); // udało się? (mogło częściowo) + } + // udało się? (mogło częściowo) + ok = (pVehicles[0]->MoverParameters->Couplers[0].CouplingFlag == iCoupler); } else // if (pVehicles[0]->MoverParameters->DirAbsolute<0) //jeśli sprzęg 1 { // sprzęg 1 - próba podczepienia @@ -4060,10 +4056,8 @@ TController::UpdateSituation(double dt) { // pVehicles[0]->dsbCouplerAttach->Play(0,0,0); } } - // WriteLog("CoupleDist[1]="+AnsiString(Controlling->Couplers[1].CoupleDist)+", - // Connected[0]="+AnsiString(Controlling->Couplers[1].CouplingFlag)); - ok = (pVehicles[0]->MoverParameters->Couplers[1].CouplingFlag == - iCoupler); // udało się? (mogło częściowo) + // udało się? (mogło częściowo) + ok = (pVehicles[0]->MoverParameters->Couplers[1].CouplingFlag == iCoupler); } if (ok) { // jeżeli został podłączony diff --git a/Event.cpp b/Event.cpp index 761c95f6..7721cd92 100644 --- a/Event.cpp +++ b/Event.cpp @@ -536,8 +536,7 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) *parser >> token; break; case tp_Multiple: { - int paramidx { 0 }; - bool ti { false }; // flaga dla else + bool conditionalelse { false }; // flaga dla else parser->getTokens(); *parser >> token; @@ -548,18 +547,7 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) if( token != "else" ) { if( token.substr( 0, 5 ) != "none_" ) { // eventy rozpoczynające się od "none_" są ignorowane - if( paramidx < 8 ) { - Params[ paramidx ].asText = new char[ token.size() + 1 ]; - strcpy( Params[ paramidx ].asText, token.c_str() ); - if( ti ) { - // oflagowanie dla eventów "else" - iFlags |= conditional_else << paramidx; - } - ++paramidx; - } - else { - ErrorLog( "Bad event: multi-event \"" + asName + "\" with more than 8 events; discarding link to event \"" + token + "\"" ); - } + m_children.emplace_back( token, nullptr, ( conditionalelse == false ) ); } else { WriteLog( "Multi-event \"" + asName + "\" ignored link to event \"" + token + "\"" ); @@ -567,7 +555,8 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) } else { // zmiana flagi dla słowa "else" - ti = !ti; + conditionalelse = !conditionalelse; + m_conditionalelse = true; } parser->getTokens(); *parser >> token; @@ -655,25 +644,19 @@ TEvent::export_as_text( std::ostream &Output ) const { break; } case tp_Multiple: { - // NOTE: conditional_anyelse won't work when event cap is removed - bool hasconditionalelse { false }; - for( auto eventidx = 0; eventidx < 8; ++eventidx ) { - if( Params[ eventidx ].asEvent == nullptr ) { continue; } - if( ( iFlags & ( conditional_else << eventidx ) ) == 0 ) { - Output << Params[ eventidx ].asEvent->asName << ' '; - } - else { - // this event is executed as part of the 'else' block - hasconditionalelse = true; + for( auto const &childevent : m_children ) { + if( std::get( childevent ) == nullptr ) { continue; } + if( true == std::get( childevent ) ) { + Output << std::get( childevent ) << ' '; } } // optional 'else' block - if( true == hasconditionalelse ) { + if( true == m_conditionalelse ) { Output << "else "; - for( auto eventidx = 0; eventidx < 8; ++eventidx ) { - if( Params[ eventidx ].asEvent == nullptr ) { continue; } - if( ( iFlags & ( conditional_else << eventidx ) ) != 0 ) { - Output << Params[ eventidx ].asEvent->asName << ' '; + for( auto const &childevent : m_children ) { + if( std::get( childevent ) == nullptr ) { continue; } + if( false == std::get( childevent ) ) { + Output << std::get( childevent ) << ' '; } } } @@ -1317,29 +1300,30 @@ event_manager::CheckQuery() { Error("Event \"DynVel\" is obsolete"); break; case tp_Multiple: { - auto const bCondition = EventConditon(m_workevent); - if( ( bCondition ) - || ( m_workevent->iFlags & conditional_anyelse ) ) { + auto const condition { EventConditon( m_workevent ) }; + if( ( true == condition ) + || ( true == m_workevent->m_conditionalelse ) ) { // warunek spelniony albo było użyte else WriteLog("Type: Multi-event"); - for (i = 0; i < 8; ++i) { - // dodawane do kolejki w kolejności zapisania - if( m_workevent->Params[ i ].asEvent ) { - if( bCondition != ( ( ( m_workevent->iFlags & ( conditional_else << i ) ) != 0 ) ) ) { - if( m_workevent->Params[ i ].asEvent != m_workevent ) - AddToQuery( m_workevent->Params[ i ].asEvent, m_workevent->Activator ); // normalnie dodać - else { - // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania - if( m_workevent->fDelay >= 5.0 ) { - AddToQuery( m_workevent, m_workevent->Activator ); - } - } + for( auto &childevent : m_workevent->m_children ) { + auto *childeventdata { std::get( childevent ) }; + if( childeventdata == nullptr ) { continue; } + if( std::get( childevent ) != condition ) { continue; } + + if( childeventdata != m_workevent ) { + // normalnie dodać + AddToQuery( childeventdata, m_workevent->Activator ); + } + else { + // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania + if( m_workevent->fDelay >= 5.0 ) { + AddToQuery( m_workevent, m_workevent->Activator ); } } } if( Global.iMultiplayer ) { // dajemy znać do serwera o wykonaniu - if( ( m_workevent->iFlags & conditional_anyelse ) == 0 ) { + if( false == m_workevent->m_conditionalelse ) { // jednoznaczne tylko, gdy nie było else if( m_workevent->Activator ) { multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); @@ -1711,15 +1695,10 @@ event_manager::InitEvents() { event->iFlags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); } } - for( int i = 0; i < 8; ++i ) { - if( event->Params[ i ].asText != nullptr ) { - cellastext = event->Params[ i ].asText; - SafeDeleteArray( event->Params[ i ].asText ); - event->Params[ i ].asEvent = FindEvent( cellastext ); - if( event->Params[ i ].asEvent == nullptr ) { - // Ra: tylko w logu informacja o braku - ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find event \"" + cellastext + "\"" ); - } + for( auto &childevent : event->m_children ) { + std::get( childevent ) = FindEvent( std::get( childevent ) ); + if( std::get( childevent ) == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find event \"" + std::get( childevent ) + "\"" ); } } break; diff --git a/Event.h b/Event.h index 13d62043..3fcf87bc 100644 --- a/Event.h +++ b/Event.h @@ -48,8 +48,6 @@ const int update_only = 0x00000FF; // wartość graniczna const int conditional_memstring = 0x0000100; // porównanie tekstu const int conditional_memval1 = 0x0000200; // porównanie pierwszej wartości liczbowej const int conditional_memval2 = 0x0000400; // porównanie drugiej wartości -const int conditional_else = 0x0010000; // flaga odwrócenia warunku (przesuwana bitowo) -const int conditional_anyelse = 0x0FF0000; // do sprawdzania, czy są odwrócone warunki const int conditional_trackoccupied = 0x1000000; // jeśli tor zajęty const int conditional_trackfree = 0x2000000; // jeśli tor wolny const int conditional_propability = 0x4000000; // zależnie od generatora lizcb losowych @@ -67,7 +65,6 @@ union TParam TTrain *asTrain; TDynamicObject *asDynamic; TEvent *asEvent; - bool asBool; double asdouble; int asInt; sound_source *tsTextSound; @@ -78,10 +75,27 @@ union TParam class TEvent // zmienne: ev* { // zdarzenie - private: - void Conditions(cParser *parser, std::string s); - - public: +public: +// types + // wrapper for binding between editor-supplied name, event, and execution conditional flag + using conditional_event = std::tuple; +// constructors + TEvent(std::string const &m = ""); + ~TEvent(); +// metody + void Load(cParser *parser, Math3D::vector3 const &org); + // sends basic content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; + static void AddToQuery( TEvent *Event, TEvent *&Start ); + std::string CommandGet(); + TCommandType Command(); + double ValueGet(int n); + glm::dvec3 PositionGet() const; + bool StopCommand(); + void StopCommandSent(); + void Append(TEvent *e); +// members std::string asName; bool m_ignored { false }; // replacement for tp_ignored bool bEnabled = false; // false gdy ma nie być dodawany do kolejki (skanowanie sygnałów) @@ -96,22 +110,11 @@ class TEvent // zmienne: ev* std::string asNodeName; // McZapkie-100302 - dodalem zeby zapamietac nazwe toru TEvent *evJoined = nullptr; // kolejny event z tą samą nazwą - od wersji 378 double fRandomDelay = 0.0; // zakres dodatkowego opóźnienia // standardowo nie będzie dodatkowego losowego opóźnienia -public: - // metody - TEvent(std::string const &m = ""); - ~TEvent(); - void Load(cParser *parser, Math3D::vector3 const &org); - // sends basic content of the class in legacy (text) format to provided stream - void - export_as_text( std::ostream &Output ) const; - static void AddToQuery( TEvent *Event, TEvent *&Start ); - std::string CommandGet(); - TCommandType Command(); - double ValueGet(int n); - glm::dvec3 PositionGet() const; - bool StopCommand(); - void StopCommandSent(); - void Append(TEvent *e); + std::vector m_children; // events which are placed in the query when this event is executed + bool m_conditionalelse { false }; // TODO: make a part of condition struct + +private: + void Conditions( cParser *parser, std::string s ); }; class event_manager { diff --git a/scene.cpp b/scene.cpp index ea251a9b..59de3c15 100644 --- a/scene.cpp +++ b/scene.cpp @@ -432,7 +432,7 @@ basic_cell::find( glm::dvec3 const &Point, float const Radius, bool const Onlyco std::tie( vehiclenearest, leastdistance ) = std::tie( vehicle, distance ); } } - return std::tie( vehiclenearest, leastdistance ); + return { vehiclenearest, leastdistance }; } // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint @@ -449,7 +449,7 @@ basic_cell::find( glm::dvec3 const &Point, TTrack const *Exclude ) const { endpointid = path->TestPoint( &point ); if( endpointid >= 0 ) { - return std::tie( path, endpointid ); + return { path, endpointid }; } } return { nullptr, -1 }; @@ -468,7 +468,7 @@ basic_cell::find( glm::dvec3 const &Point, TTraction const *Exclude ) const { endpointid = traction->TestPoint( Point ); if( endpointid >= 0 ) { - return std::tie( traction, endpointid ); + return { traction, endpointid }; } } return { nullptr, -1 }; @@ -729,7 +729,7 @@ basic_section::find( glm::dvec3 const &Point, float const Radius, bool const Onl std::tie( vehiclenearest, distancenearest ) = std::tie( vehiclefound, distancefound ); } } - return std::tie( vehiclenearest, distancenearest ); + return { vehiclenearest, distancenearest }; } // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint @@ -1245,7 +1245,7 @@ basic_region::find_vehicle( glm::dvec3 const &Point, float const Radius, bool co std::tie( nearestvehicle, nearestdistance ) = std::tie( foundvehicle, founddistance ); } } - return std::tie( nearestvehicle, nearestdistance ); + return { nearestvehicle, nearestdistance }; } // finds a path with one of its ends located in specified point. returns: located path and id of the matching endpoint @@ -1258,7 +1258,7 @@ basic_region::find_path( glm::dvec3 const &Point, TTrack const *Exclude ) { return section( Point ).find( Point, Exclude ); } - return std::make_tuple( nullptr, -1 ); + return { nullptr, -1 }; } // finds a traction piece with one of its ends located in specified point. returns: located traction piece and id of the matching endpoint @@ -1271,7 +1271,7 @@ basic_region::find_traction( glm::dvec3 const &Point, TTraction const *Exclude ) return section( Point ).find( Point, Exclude ); } - return std::make_tuple( nullptr, -1 ); + return { nullptr, -1 }; } // finds a traction piece located nearest to specified point, sharing section with specified other piece and powered in specified direction. returns: located traction piece diff --git a/version.h b/version.h index 020fbc89..5058f5a7 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 609 +#define VERSION_MINOR 614 #define VERSION_REVISION 0 From ef5811e6c0f89bb6b06da95f2969bd8956a9e2a7 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 15 Jun 2018 18:56:50 +0200 Subject: [PATCH 344/426] files missing from previous commit --- renderer.cpp | 16 +++++++++++----- renderer.h | 12 +++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/renderer.cpp b/renderer.cpp index b8366cf3..98ac8b80 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -819,14 +819,20 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f auto const zfar = Config.draw_range * Global.fDistanceFactor * Zfar; auto const znear = ( Znear > 0.f ? - Znear * zfar : - 0.1f * Global.ZoomFactor ); + Znear * zfar : + 0.1f * Global.ZoomFactor ); camera.projection() *= glm::perspective( glm::radians( Global.FieldOfView / Global.ZoomFactor ), std::max( 1.f, (float)Global.iWindowWidth ) / std::max( 1.f, (float)Global.iWindowHeight ), znear, zfar ); +/* + m_sunandviewangle = + glm::dot( + m_sunlight.direction, + glm::vec3( 0.f, 0.f, -1.f ) * glm::mat3( viewmatrix ) ); +*/ break; } case rendermode::shadows: { @@ -2965,7 +2971,7 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { ::glColor4fv( glm::value_ptr( glm::vec4{ - Traction->wire_color(), + Traction->wire_color() /* * ( DebugModeFlag ? 1.f : clamp( m_sunandviewangle, 0.25f, 1.f ) ) */, linealpha } ) ); // render m_geometry.draw( Traction->m_geometry ); @@ -3422,7 +3428,7 @@ opengl_renderer::Update_Pick_Control() { return control; } -editor::basic_node const * +scene::basic_node const * opengl_renderer::Update_Pick_Node() { #ifdef EU07_USE_PICKING_FRAMEBUFFER @@ -3457,7 +3463,7 @@ opengl_renderer::Update_Pick_Node() { unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); auto const nodeindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); - editor::basic_node const *node { nullptr }; + scene::basic_node const *node { nullptr }; if( ( nodeindex > 0 ) && ( nodeindex <= m_picksceneryitems.size() ) ) { node = m_picksceneryitems[ nodeindex - 1 ]; diff --git a/renderer.h b/renderer.h index f9b0281e..61fb1ab9 100644 --- a/renderer.h +++ b/renderer.h @@ -163,14 +163,14 @@ public: // utility methods TSubModel const * Pick_Control() const { return m_pickcontrolitem; } - editor::basic_node const * + scene::basic_node const * Pick_Node() const { return m_picksceneryitem; } // maintenance methods void Update( double const Deltatime ); TSubModel const * Update_Pick_Control(); - editor::basic_node const * + scene::basic_node const * Update_Pick_Node(); // debug methods std::string const & @@ -320,7 +320,9 @@ private: texture_manager m_textures; opengl_light m_sunlight; opengllight_array m_lights; - +/* + float m_sunandviewangle; // cached dot product of sunlight and camera vectors +*/ gfx::geometry_handle m_billboardgeometry { 0, 0 }; texture_handle m_glaretexture { -1 }; texture_handle m_suntexture { -1 }; @@ -386,8 +388,8 @@ private: renderpass_config m_cabshadowpass; // parameters of most recent cab shadowmap pass std::vector m_pickcontrolsitems; TSubModel const *m_pickcontrolitem { nullptr }; - std::vector m_picksceneryitems; - editor::basic_node const *m_picksceneryitem { nullptr }; + std::vector m_picksceneryitems; + scene::basic_node const *m_picksceneryitem { nullptr }; #ifdef EU07_USE_DEBUG_CAMERA renderpass_config m_worldcamera; // debug item #endif From 14448d70d1d48a50bf2e0b29e2de2c92eac5b30c Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 16 Jun 2018 15:59:28 +0200 Subject: [PATCH 345/426] maintenance: memory leak fix, default constructors, minor syntax cleanups --- Driver.cpp | 12 ++++++------ Event.cpp | 41 +++++++++++++++-------------------------- Event.h | 2 ++ McZapkie/Mover.cpp | 32 ++++++++++++++++++-------------- Model3d.h | 1 + Timer.h | 4 ++++ Track.cpp | 2 +- Traction.cpp | 4 ++-- audiorenderer.h | 5 ++++- frustum.h | 2 +- openglgeometrybank.h | 2 ++ renderer.h | 6 ++++-- scene.cpp | 1 - scene.h | 4 ++++ sky.h | 8 +++++--- stars.h | 2 +- uilayer.h | 4 ++-- uitranscripts.h | 3 ++- 18 files changed, 74 insertions(+), 61 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index dac6baf9..685647d0 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -521,7 +521,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) pTrack = lastspeedpoint.trTrack; assert( pTrack != nullptr ); // flaga ustawiona, gdy Point2 toru jest blizej - fLastDir = lastspeedpoint.iFlags & spReverse ? -1.0 : 1.0; + fLastDir = ( ( ( lastspeedpoint.iFlags & spReverse ) != 0 ) ? -1.0 : 1.0 ); fCurrentDistance = lastspeedpoint.fDist; // aktualna odleglosc do jego Point1 fTrackLength = pTrack->Length(); } @@ -1286,7 +1286,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN && ( true == TestFlag( sSpeedTable[ i ].iFlags, ( spEnabled | spEvent | spPassengerStopPoint ) ) ) && ( false == isatpassengerstop ) ) { // ma podjechać bliżej - czy na pewno w tym miejscu taki warunek? - a = ( iDrivigFlags & moveStopCloser ? + a = ( ( ( iDrivigFlags & moveStopCloser ) != 0 ) ? fAcc : 0.0 ); } @@ -4575,14 +4575,14 @@ TController::UpdateSituation(double dt) { else { // jeśli oba jadą, to przyhamuj lekko i ogranicz prędkość if( vehicle->fTrackBlock < ( - mvOccupied->CategoryFlag & 2 ? + ( mvOccupied->CategoryFlag & 2 ) ? fMaxProximityDist + 0.5 * vel : // cars 2.0 * fMaxProximityDist + 2.0 * vel ) ) { //others // jak tamten jedzie wolniej a jest w drodze hamowania AccPreferred = std::min( -0.9, AccPreferred ); VelNext = min_speed( std::round( k ) - 5.0, VelDesired ); if( vehicle->fTrackBlock <= ( - mvOccupied->CategoryFlag & 2 ? + ( mvOccupied->CategoryFlag & 2 ) ? fMaxProximityDist : // cars 2.0 * fMaxProximityDist ) ) { //others // try to force speed change if obstacle is really close @@ -4826,7 +4826,7 @@ TController::UpdateSituation(double dt) { else { // jeśli daleko jechać nie można if( ActualProximityDist > ( - mvOccupied->CategoryFlag & 2 ? + ( mvOccupied->CategoryFlag & 2 ) ? fMinProximityDist : // cars fMaxProximityDist ) ) { // trains and others // ale ma kawałek do sygnalizatora @@ -5134,7 +5134,7 @@ TController::UpdateSituation(double dt) { VelDesired - fVelMinus ) ) { // ...jeśli prędkość w kierunku czoła jest mniejsza od dozwolonej o margines if( ( ActualProximityDist > ( - mvOccupied->CategoryFlag & 2 ? + ( mvOccupied->CategoryFlag & 2 ) ? fMinProximityDist : // cars are allowed to move within min proximity distance fMaxProximityDist ) ? // other vehicle types keep wider margin true : diff --git a/Event.cpp b/Event.cpp index 7721cd92..eb9053a6 100644 --- a/Event.cpp +++ b/Event.cpp @@ -39,7 +39,6 @@ TEvent::~TEvent() { switch (Type) { // sprzątanie case tp_Multiple: - // SafeDeleteArray(Params[9].asText); //nie usuwać - nazwa obiektu powiązanego zamieniana na wskaźnik if (iFlags & conditional_memstring) // o ile jest łańcuch do porównania w memcompare SafeDeleteArray(Params[10].asText); break; @@ -71,12 +70,6 @@ void TEvent::Conditions(cParser *parser, std::string s) if (s == "condition") { // jesli nie "endevent" std::string token, str; - if (!asNodeName.empty()) - { // podczepienie łańcucha, jeśli nie jest pusty - // BUG: source of a memory leak -- the array never gets deleted. fix the destructor - Params[9].asText = new char[asNodeName.size() + 1]; // usuwane i zamieniane na wskaźnik - strcpy(Params[9].asText, asNodeName.c_str()); - } parser->getTokens(); *parser >> token; str = token; @@ -1673,26 +1666,22 @@ event_manager::InitEvents() { break; } case tp_Multiple: { - std::string cellastext; - if( event->Params[ 9 ].asText != nullptr ) { // przepisanie nazwy do bufora - cellastext = event->Params[ 9 ].asText; - SafeDeleteArray( event->Params[ 9 ].asText ); - event->Params[ 9 ].asPointer = nullptr; // zerowanie wskaźnika, aby wykryć brak obeiktu - } - if( event->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { - // jeśli chodzi o zajetosc toru - event->Params[ 9 ].asTrack = simulation::Paths.find( cellastext ); - if( event->Params[ 9 ].asTrack == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find track \"" + cellastext + "\"" ); - event->iFlags &= ~( conditional_trackoccupied | conditional_trackfree ); // zerowanie flag + if( false == event->asNodeName.empty() ) { + if( event->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { + // jeśli chodzi o zajetosc toru + event->Params[ 9 ].asTrack = simulation::Paths.find( event->asNodeName ); + if( event->Params[ 9 ].asTrack == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find track \"" + event->asNodeName + "\"" ); + event->iFlags &= ~( conditional_trackoccupied | conditional_trackfree ); // zerowanie flag + } } - } - else if( event->iFlags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) { - // jeśli chodzi o komorke pamieciową - event->Params[ 9 ].asMemCell = simulation::Memory.find( cellastext ); - if( event->Params[ 9 ].asMemCell == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find memory cell \"" + cellastext + "\"" ); - event->iFlags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); + else if( event->iFlags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) { + // jeśli chodzi o komorke pamieciową + event->Params[ 9 ].asMemCell = simulation::Memory.find( event->asNodeName ); + if( event->Params[ 9 ].asMemCell == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find memory cell \"" + event->asNodeName + "\"" ); + event->iFlags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); + } } } for( auto &childevent : event->m_children ) { diff --git a/Event.h b/Event.h index 3fcf87bc..0882f420 100644 --- a/Event.h +++ b/Event.h @@ -120,6 +120,8 @@ private: class event_manager { public: +// constructors + event_manager() = default; // destructor ~event_manager(); // methods diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 56e2505e..4aa42181 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -295,10 +295,10 @@ TMoverParameters::TMoverParameters(double VelInitial, std::string TypeNameInit, int Cab) ://: T_MoverParameters(VelInitial, TypeNameInit, //NameInit, LoadInitial, LoadTypeInitial, Cab) TypeName( TypeNameInit ), +Name( NameInit ), ActiveCab( Cab ), -LoadType( LoadTypeInitial ), Load( LoadInitial ), -Name( NameInit ) +LoadType( LoadTypeInitial ) { WriteLog( "------------------------------------------------------"); @@ -1579,9 +1579,10 @@ void TMoverParameters::WaterHeaterCheck( double const Timestep ) { WaterHeater.is_active = false; } - WaterHeater.is_damaged |= ( - ( true == WaterHeater.is_active ) - && ( false == WaterPump.is_active ) ); + WaterHeater.is_damaged = ( + ( true == WaterHeater.is_damaged ) + || ( ( true == WaterHeater.is_active ) + && ( false == WaterPump.is_active ) ) ); } // fuel pump status update @@ -5988,16 +5989,19 @@ bool TMoverParameters::dizel_AutoGearCheck(void) if (MotorParam[ScndCtrlActualPos].AutoSwitch && (dizel_automaticgearstatus == 0)) // sprawdz czy zmienic biegi { - if ((Vel > MotorParam[ScndCtrlActualPos].mfi) && - (ScndCtrlActualPos < ScndCtrlPosNo)) - { - dizel_automaticgearstatus = 1; - OK = true; + if( Vel > MotorParam[ ScndCtrlActualPos ].mfi ) { + // shift up + if( ScndCtrlActualPos < ScndCtrlPosNo ) { + dizel_automaticgearstatus = 1; + OK = true; + } } - else if ((Vel < MotorParam[ScndCtrlActualPos].fi) && (ScndCtrlActualPos > 0)) - { - dizel_automaticgearstatus = -1; - OK = true; + else if( Vel < MotorParam[ ScndCtrlActualPos ].fi ) { + // shift down + if( ScndCtrlActualPos > 0 ) { + dizel_automaticgearstatus = -1; + OK = true; + } } } } diff --git a/Model3d.h b/Model3d.h index 73e18d8d..0b74e49a 100644 --- a/Model3d.h +++ b/Model3d.h @@ -154,6 +154,7 @@ public: static float fSquareDist; static TModel3d *pRoot; static std::string *pasText; // tekst dla wyświetlacza (!!!! do przemyślenia) + TSubModel() = default; ~TSubModel(); int Load(cParser &Parser, TModel3d *Model, /*int Pos,*/ bool dynamic); void ChildAdd(TSubModel *SubModel); diff --git a/Timer.h b/Timer.h index ffcb45e0..ffc15cb7 100644 --- a/Timer.h +++ b/Timer.h @@ -29,6 +29,9 @@ void UpdateTimers(bool pause); class stopwatch { public: +// constructors + stopwatch() = default; +// methods void start() { m_start = std::chrono::steady_clock::now(); } @@ -40,6 +43,7 @@ public: return m_accumulator / 20.f;} private: +// members std::chrono::time_point m_start { std::chrono::steady_clock::now() }; float m_accumulator { 1000.f / 30.f * 20.f }; // 20 last samples, initial 'neutral' rate of 30 fps }; diff --git a/Track.cpp b/Track.cpp index cc7b9ec9..c436e6c0 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1189,7 +1189,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { { szyna[ i ].texture.x, szyna[ i ].texture.y } }; - if( false == iTrapezoid ) { continue; } + if( iTrapezoid == 0 ) { continue; } // trapez albo przechyłki, to oddzielne punkty na końcu rpts1[ 12 + i ] = { diff --git a/Traction.cpp b/Traction.cpp index e993ff0e..a155e5a7 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -91,8 +91,6 @@ jawnie nazwę sekcji, ewentualnie nazwę zasilacza (zostanie zastąpiona wskazan sekcji z sąsiedniego przęsła). */ -TTraction::TTraction( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} - glm::dvec3 LoadPoint( cParser &Input ) { // pobranie współrzędnych punktu glm::dvec3 point; @@ -104,6 +102,8 @@ glm::dvec3 LoadPoint( cParser &Input ) { return point; } +TTraction::TTraction( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} + void TTraction::Load( cParser *parser, glm::dvec3 const &pOrigin ) { diff --git a/audiorenderer.h b/audiorenderer.h index 54bcc5e9..89b81784 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -53,7 +53,8 @@ struct openal_source { bool is_looping { false }; sound_properties properties; sync_state sync { sync_state::good }; - +// constructors + openal_source() = default; // methods template openal_source & @@ -102,6 +103,8 @@ class openal_renderer { friend class opengl_renderer; public: +// constructors + openal_renderer() = default; // destructor ~openal_renderer(); // methods diff --git a/frustum.h b/frustum.h index 96b456ce..87d2b7fe 100644 --- a/frustum.h +++ b/frustum.h @@ -24,7 +24,7 @@ class cFrustum { public: // constructors: - + cFrustum() = default; // methods: // update the frustum to match current view orientation void diff --git a/openglgeometrybank.h b/openglgeometrybank.h index dd937204..f832bc2f 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -267,6 +267,8 @@ typedef geometry_handle geometrybank_handle; class geometrybank_manager { public: +// constructors + geometrybank_manager() = default; // methods: // performs a resource sweep void update(); diff --git a/renderer.h b/renderer.h index 61fb1ab9..c0f4ef5f 100644 --- a/renderer.h +++ b/renderer.h @@ -52,6 +52,8 @@ struct opengl_technique { class opengl_camera { public: +// constructors + opengl_camera() = default; // methods: inline void @@ -113,10 +115,10 @@ class opengl_renderer { public: // types - +// constructors + opengl_renderer() = default; // destructor ~opengl_renderer() { gluDeleteQuadric( m_quadric ); } - // methods bool Init( GLFWwindow *Window ); diff --git a/scene.cpp b/scene.cpp index 59de3c15..46bcd022 100644 --- a/scene.cpp +++ b/scene.cpp @@ -124,7 +124,6 @@ basic_cell::update_events() { void basic_cell::update_sounds() { - auto const deltatime = Timer::GetDeltaRenderTime(); for( auto *sound : m_sounds ) { sound->play_event(); } diff --git a/scene.h b/scene.h index 8a435ef1..9ec4a714 100644 --- a/scene.h +++ b/scene.h @@ -63,6 +63,8 @@ class basic_cell { friend class opengl_renderer; public: +// constructors + basic_cell() = default; // methods // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void @@ -183,6 +185,8 @@ class basic_section { friend class opengl_renderer; public: +// constructors + basic_section() = default; // methods // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void diff --git a/sky.h b/sky.h index a2e8b76f..e583ff97 100644 --- a/sky.h +++ b/sky.h @@ -16,11 +16,13 @@ class TSky { friend class opengl_renderer; +public: + TSky() = default; + + void Init(); + private: TModel3d *mdCloud { nullptr }; - -public: - void Init(); }; //--------------------------------------------------------------------------- diff --git a/stars.h b/stars.h index 5619a0c1..0de93ea6 100644 --- a/stars.h +++ b/stars.h @@ -16,7 +16,7 @@ public: // methods: void init(); // constructors: - + cStars() = default; // deconstructor: // members: diff --git a/uilayer.h b/uilayer.h index 4b25d88c..7e27aab8 100644 --- a/uilayer.h +++ b/uilayer.h @@ -10,8 +10,8 @@ struct ui_panel { struct text_line { - glm::vec4 color; std::string data; + glm::vec4 color; text_line( std::string const &Data, glm::vec4 const &Color): data(Data), color(Color) @@ -33,7 +33,7 @@ public: // parameters: // constructors: - + ui_layer() = default; // destructor: ~ui_layer(); diff --git a/uitranscripts.h b/uitranscripts.h index 56c27f08..7db201a1 100644 --- a/uitranscripts.h +++ b/uitranscripts.h @@ -19,13 +19,14 @@ struct TTranscript { class TTranscripts { public: +// constructors + TTranscripts() = default; // methods void AddLine( std::string const &txt, float show, float hide, bool it ); // dodanie tekstów, długość dźwięku, czy istotne void Add( std::string const &txt, bool background = false ); // usuwanie niepotrzebnych (ok. 10 razy na sekundę) void Update(); - // members std::deque aLines; From 66184922c1911c4370a734309f51e01e72736c8e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 17 Jun 2018 02:32:55 +0200 Subject: [PATCH 346/426] minor ui and ai logic tweaks, tachometer sound fix --- Driver.cpp | 40 +++++++++++++++++----------------------- Train.cpp | 2 +- uilayer.cpp | 27 ++++++++++++++------------- 3 files changed, 32 insertions(+), 37 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 685647d0..19468bbd 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1202,26 +1202,29 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN sSpeedTable[ i ].iFlags = 0; } } - else if (go == cm_Unknown) // jeśli jeszcze nie ma komendy - if (v != 0.0) // komenda jest tylko gdy ma jechać, bo stoi na podstawie - // tabelki - { // jeśli nie było komendy wcześniej - pierwsza się liczy - ustawianie - // VelSignal + else if( go == cm_Unknown ) { + // jeśli jeszcze nie ma komendy + // komenda jest tylko gdy ma jechać, bo stoi na podstawietabelki + if( v != 0.0 ) { + // jeśli nie było komendy wcześniej - pierwsza się liczy - ustawianie VelSignal go = cm_ShuntVelocity; // w trybie pociągowym tylko jeśli włącza // tryb manewrowy (v!=0.0) // Ra 2014-06: (VelSignal) nie może być tu ustawiane, bo Tm może być // daleko // VelSignal=v; //nie do końca tak, to jest druga prędkość - if (VelSignal == 0.0) - VelSignal = v; // aby stojący ruszył - if (sSpeedTable[i].fDist < 0.0) // jeśli przejechany - { - VelSignal = v; //!!! ustawienie, gdy przejechany jest lepsze niż - // wcale, ale to jeszcze nie to - sSpeedTable[i].iFlags = - 0; // to można usunąć (nie mogą być usuwane w skanowaniu) + if( VelSignal == 0.0 ) { + // aby stojący ruszył + VelSignal = v; + } + if( sSpeedTable[ i ].fDist < 0.0 ) { + // jeśli przejechany + //!!! ustawienie, gdy przejechany jest lepsze niż wcale, ale to jeszcze nie to + VelSignal = v; + // to można usunąć (nie mogą być usuwane w skanowaniu) + sSpeedTable[ i ].iFlags = 0; } } + } } else if( !( sSpeedTable[ i ].iFlags & spSectionVel ) ) { //jeśli jakiś event pasywny ale nie ograniczenie @@ -4648,22 +4651,13 @@ TController::UpdateSituation(double dt) { VelDesired, TrainParams->TTVmax ); } - - if( ( ( iDrivigFlags & moveStopHere ) != 0 ) - && ( vel < 0.01 ) - && ( SemNextIndex != -1 ) - && ( SemNextIndex < sSpeedTable.size() ) // BUG: index can point at non-existing slot. investigate reason(s) - && ( sSpeedTable[ SemNextIndex ].fVelNext == 0.0 ) ) { - // don't depart if told to wait at passenger stop until allowed to by the signal - VelDesired = 0.0; - } } if( ( OrderCurrentGet() & ( Shunt | Obey_train ) ) != 0 ) { // w Connect nie, bo moveStopHere odnosi się do stanu po połączeniu if( ( ( iDrivigFlags & moveStopHere ) != 0 ) && ( vel < 0.01 ) - && ( VelSignal == 0.0 ) ) { + && ( VelSignalNext == 0.0 ) ) { // jeśli ma czekać na wolną drogę, stoi a wyjazdu nie ma, to ma stać VelDesired = 0.0; } diff --git a/Train.cpp b/Train.cpp index ed73145d..f6b5996c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5645,7 +5645,7 @@ TTrain::update_sounds( double const Deltatime ) { m_radiostop.stop(); } - if( fTachoCount > 3.f ) { + if( fTachoCount >= 3.f ) { auto const frequency { ( true == dsbHasler.is_combined() ? fTachoVelocity * 0.01 : diff --git a/uilayer.cpp b/uilayer.cpp index 5c16c0cf..14ac14b7 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -673,19 +673,7 @@ ui_layer::update() { uitextline3 = "vehicles: " + to_string( Timer::subsystem.sim_dynamics.average(), 2 ) + " msec" + " update total: " + to_string( Timer::subsystem.sim_total.average(), 2 ) + " msec"; - - break; - } - - case( GLFW_KEY_F10 ) : { - - uitextline1 = "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]."; - - break; - } - - case( GLFW_KEY_F11 ): { - // scenario inspector + // current event queue auto const time { Timer::GetTime() }; auto const *event { simulation::Events.begin() }; auto eventtableindex{ 0 }; @@ -711,6 +699,19 @@ ui_layer::update() { break; } + case( GLFW_KEY_F10 ) : { + + uitextline1 = "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]."; + + break; + } + + case( GLFW_KEY_F11 ): { + // scenario inspector + + break; + } + case( GLFW_KEY_F12 ) : { // opcje włączenia i wyłączenia logowania uitextline1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); From 6b705d38dd889e7a74eca53cdcd19c293d3e8746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Mon, 18 Jun 2018 22:16:56 +0200 Subject: [PATCH 347/426] Definition of stopping distance before PassengerStopPoint --- Driver.cpp | 20 ++++++++++++++++++++ Driver.h | 1 + 2 files changed, 21 insertions(+) diff --git a/Driver.cpp b/Driver.cpp index 19468bbd..78710425 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -858,6 +858,26 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } } // koniec obsługi przelotu na W4 else { + if ( !sSpeedTable[i].bMoved ) + { + auto L = 0.0; + auto Par1 = sSpeedTable[i].evEvent->ValueGet(1); + auto Par2 = sSpeedTable[i].evEvent->ValueGet(2); + if ((Par2 > 0) || (fLength < -Par2)) { //użyj tego W4 + if (Par1 < 0) { //środek + L = -Par1 - fLength * 0.5 - 10; + } + else { + L = Par1; + } + L = std::max(0.0, std::min(L, abs(Par2) - 10 - fLength)); + sSpeedTable[i].UpdateDistance(L); + sSpeedTable[i].bMoved = true; + } + else { + sSpeedTable[i].iFlags = 0; + } + } // zatrzymanie na W4 isatpassengerstop = ( // Ra 2F1I: odległość plus długość pociągu musi być mniejsza od długości diff --git a/Driver.h b/Driver.h index d54f5fcc..bcd68435 100644 --- a/Driver.h +++ b/Driver.h @@ -131,6 +131,7 @@ class TSpeedPos // zwrotnicy,32-minięty,64=koniec,128=łuk // 0x100=event,0x200=manewrowa,0x400=przystanek,0x800=SBL,0x1000=wysłana komenda,0x2000=W5 // 0x4000=semafor,0x10000=zatkanie + bool bMoved{ false }; // czy przesunięty (dotyczy punktu zatrzymania w peronie) Math3D::vector3 vPos; // współrzędne XYZ do liczenia odległości struct { From c0bf973c58ab53c2bc8f02feb38304f7407a24e4 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 22 Jun 2018 01:48:44 +0200 Subject: [PATCH 348/426] build 180621. serial port input device continuous independent brake control, scenery item selection and info, minor bug fixes, tweaks and refactoring --- Driver.cpp | 22 +++++--- Event.cpp | 125 +++++++++++++++++++++++---------------------- Event.h | 4 +- McZapkie/Mover.cpp | 34 +++--------- Track.cpp | 10 ++++ Track.h | 1 + Train.cpp | 10 +++- TrkFoll.cpp | 75 ++++----------------------- TrkFoll.h | 67 ++++++++++++------------ mouseinput.cpp | 15 +++++- scenenode.cpp | 7 +++ scenenode.h | 6 +++ sound.cpp | 2 +- stdafx.h | 2 + uilayer.cpp | 7 +++ version.h | 2 +- 16 files changed, 188 insertions(+), 201 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 78710425..761ec82f 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -858,19 +858,28 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } } // koniec obsługi przelotu na W4 else { - if ( !sSpeedTable[i].bMoved ) - { + // zatrzymanie na W4 + if ( ( false == sSpeedTable[i].bMoved ) + && ( ( OrderCurrentGet() & ( Obey_train | Shunt ) ) != 0 ) ) { + // potentially shift the stop point in accordance with its defined parameters + /* + // https://rainsted.com/pl/Wersja/18.2.133#Okr.C4.99gi_dla_W4_i_W32 + Pierwszy parametr ujemny - preferowane zatrzymanie czoła składu (np. przed przejściem). + Pierwszy parametr dodatni - preferowane zatrzymanie środka składu (np. przy wiacie, przejściu podziemnym). + Drugi parametr ujemny - wskazanie zatrzymania dla krótszych składów (W32). + Drugi paramer dodatni - długość peronu (W4). + */ auto L = 0.0; auto Par1 = sSpeedTable[i].evEvent->ValueGet(1); auto Par2 = sSpeedTable[i].evEvent->ValueGet(2); if ((Par2 > 0) || (fLength < -Par2)) { //użyj tego W4 if (Par1 < 0) { //środek - L = -Par1 - fLength * 0.5 - 10; + L = -Par1 - fMinProximityDist - fLength * 0.5; } else { L = Par1; } - L = std::max(0.0, std::min(L, abs(Par2) - 10 - fLength)); + L = std::max(0.0, std::min(L, std::abs(Par2) - fMinProximityDist - fLength)); sSpeedTable[i].UpdateDistance(L); sSpeedTable[i].bMoved = true; } @@ -878,7 +887,6 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN sSpeedTable[i].iFlags = 0; } } - // zatrzymanie na W4 isatpassengerstop = ( // Ra 2F1I: odległość plus długość pociągu musi być mniejsza od długości // peronu, chyba że pociąg jest dłuższy, to wtedy minimalna. @@ -887,7 +895,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN ( iDrivigFlags & moveStopCloser ) ? ( sSpeedTable[ i ].fDist + fLength ) <= std::max( - sSpeedTable[ i ].evEvent->ValueGet( 2 ), + std::abs( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ), 2.0 * fMaxProximityDist + fLength ) : // fmaxproximitydist typically equals ~50 m sSpeedTable[ i ].fDist < d_to_next_sem ); @@ -990,7 +998,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // NOTE: this calculation is expected to run after completing loading/unloading AutoRewident(); // nastawianie hamulca do jazdy pociągowej - if( int( floor( sSpeedTable[ i ].evEvent->ValueGet( 1 ) ) ) & 1 ) { + if( static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->ValueGet( 1 ) ) ) ) % 2 ) { // nie podjeżdżać do semafora, jeśli droga nie jest wolna iDrivigFlags |= moveStopHere; } diff --git a/Event.cpp b/Event.cpp index eb9053a6..d4e76a93 100644 --- a/Event.cpp +++ b/Event.cpp @@ -982,75 +982,76 @@ event_manager::FindEvent( std::string const &Name ) { // legacy method, inserts specified event in the event query bool -event_manager::AddToQuery( TEvent *Event, TDynamicObject *Owner ) { +event_manager::AddToQuery( TEvent *Event, TDynamicObject const *Owner ) { - if( true == Event->bEnabled ) { - // jeśli może być dodany do kolejki (nie używany w skanowaniu) - if( !Event->iQueued ) // jeśli nie dodany jeszcze do kolejki - { // kolejka eventów jest posortowana względem (fStartTime) - Event->Activator = Owner; - if( ( Event->Type == tp_AddValues ) - && ( Event->fDelay == 0.0 ) ) { - // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie - // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję - // wykonującą eventy i ją wywołać - if( ( false == Event->m_ignored ) - && ( true == EventConditon( Event ) ) ) { // teraz mogą być warunki do tych eventów + if( false == Event->bEnabled ) { return false; } + if( Event->iQueued != 0 ) { return false; } + // jeśli może być dodany do kolejki (nie używany w skanowaniu) + // jeśli nie dodany jeszcze do kolejki + + // kolejka eventów jest posortowana względem (fStartTime) + Event->Activator = Owner; + if( ( Event->Type == tp_AddValues ) + && ( Event->fDelay == 0.0 ) ) { + // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie + // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję + // wykonującą eventy i ją wywołać + if( ( false == Event->m_ignored ) + && ( true == EventConditon( Event ) ) ) { // teraz mogą być warunki do tych eventów - Event->Params[ 5 ].asMemCell->UpdateValues( - Event->Params[ 0 ].asText, Event->Params[ 1 ].asdouble, - Event->Params[ 2 ].asdouble, Event->iFlags ); + Event->Params[ 5 ].asMemCell->UpdateValues( + Event->Params[ 0 ].asText, Event->Params[ 1 ].asdouble, + Event->Params[ 2 ].asdouble, Event->iFlags ); - if( Event->Params[ 6 ].asTrack ) { // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla - // wszystkich 'dynamic' na danym torze - for( auto dynamic : Event->Params[ 6 ].asTrack->Dynamics ) { - Event->Params[ 5 ].asMemCell->PutCommand( - dynamic->Mechanik, - Event->Params[ 4 ].asLocation ); - } - //if (DebugModeFlag) - WriteLog( - "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues & Track command - [" - + std::string{ Event->Params[ 0 ].asText } + "] [" - + to_string( Event->Params[ 1 ].asdouble, 2 ) + "] [" - + to_string( Event->Params[ 2 ].asdouble, 2 ) + " ]" ); - } - //else if (DebugModeFlag) - WriteLog( - "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues - [" - + std::string( Event->Params[ 0 ].asText ) + "] [" - + to_string( Event->Params[ 1 ].asdouble, 2 ) + "] [" - + to_string( Event->Params[ 2 ].asdouble, 2 ) + "]" ); - } - // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) - do { - Event = Event->evJoined; - // NOTE: we could've received a new event from joint event above, so we need to check conditions just in case and discard the bad events - // TODO: refactor this arrangement, it's hardly optimal - } while( ( Event != nullptr ) - && ( ( false == Event->bEnabled ) - || ( Event->iQueued > 0 ) ) ); - } - if( ( Event != nullptr ) - && ( false == Event->m_ignored ) ) { - // standardowe dodanie do kolejki - ++Event->iQueued; // zabezpieczenie przed podwójnym dodaniem do kolejki - WriteLog( "EVENT ADDED TO QUEUE" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->asName ); - Event->fStartTime = std::abs( Event->fDelay ) + Timer::GetTime(); // czas od uruchomienia scenerii - if( Event->fRandomDelay > 0.0 ) { - // doliczenie losowego czasu opóźnienia - Event->fStartTime += Event->fRandomDelay * Random( 10000 ) * 0.0001; - } - if( QueryRootEvent != nullptr ) { - TEvent::AddToQuery( Event, QueryRootEvent ); - } - else { - QueryRootEvent = Event; - QueryRootEvent->evNext = nullptr; + if( Event->Params[ 6 ].asTrack ) { + // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze + for( auto dynamic : Event->Params[ 6 ].asTrack->Dynamics ) { + Event->Params[ 5 ].asMemCell->PutCommand( + dynamic->Mechanik, + Event->Params[ 4 ].asLocation ); } + //if (DebugModeFlag) + WriteLog( + "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues & Track command - [" + + std::string{ Event->Params[ 0 ].asText } + "] [" + + to_string( Event->Params[ 1 ].asdouble, 2 ) + "] [" + + to_string( Event->Params[ 2 ].asdouble, 2 ) + " ]" ); } + //else if (DebugModeFlag) + WriteLog( + "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues - [" + + std::string( Event->Params[ 0 ].asText ) + "] [" + + to_string( Event->Params[ 1 ].asdouble, 2 ) + "] [" + + to_string( Event->Params[ 2 ].asdouble, 2 ) + "]" ); + } + // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) + do { + Event = Event->evJoined; + // NOTE: we could've received a new event from joint event above, so we need to check conditions just in case and discard the bad events + // TODO: refactor this arrangement, it's hardly optimal + } while( ( Event != nullptr ) + && ( ( false == Event->bEnabled ) + || ( Event->iQueued > 0 ) ) ); + } + if( ( Event != nullptr ) + && ( false == Event->m_ignored ) ) { + // standardowe dodanie do kolejki + ++Event->iQueued; // zabezpieczenie przed podwójnym dodaniem do kolejki + WriteLog( "EVENT ADDED TO QUEUE" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->asName ); + Event->fStartTime = std::abs( Event->fDelay ) + Timer::GetTime(); // czas od uruchomienia scenerii + if( Event->fRandomDelay > 0.0 ) { + // doliczenie losowego czasu opóźnienia + Event->fStartTime += Event->fRandomDelay * Random( 10000 ) * 0.0001; + } + if( QueryRootEvent != nullptr ) { + TEvent::AddToQuery( Event, QueryRootEvent ); + } + else { + QueryRootEvent = Event; + QueryRootEvent->evNext = nullptr; } } + return true; } diff --git a/Event.h b/Event.h index 0882f420..4fa9449e 100644 --- a/Event.h +++ b/Event.h @@ -104,7 +104,7 @@ public: TEventType Type = tp_Unknown; double fStartTime = 0.0; double fDelay = 0.0; - TDynamicObject *Activator = nullptr; + TDynamicObject const *Activator = nullptr; TParam Params[13]; // McZapkie-070502 //Ra: zamienić to na union/struct unsigned int iFlags = 0; // zamiast Params[8] z flagami warunku std::string asNodeName; // McZapkie-100302 - dodalem zeby zapamietac nazwe toru @@ -147,7 +147,7 @@ public: FindEvent( std::string const &Name ); // legacy method, inserts specified event in the event query bool - AddToQuery( TEvent *Event, TDynamicObject *Owner ); + AddToQuery( TEvent *Event, TDynamicObject const *Owner ); // legacy method, executes queued events bool CheckQuery(); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 4aa42181..a1f685e1 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1714,19 +1714,12 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) // szybkie przejœcie na bezoporow¹ if( TrainType == dt_ET40 ) { break; // this means ET40 won't react at all to fast acceleration command. should it issue just IncMainCtrl(1) instead? - } + } while( ( RList[ MainCtrlPos ].R > 0.0 ) && IncMainCtrl( 1 ) ) { // all work is done in the loop header ; } - // OK:=true ; {takie chamskie, potem poprawie} <-Ra: kto mia³ to poprawiæ i po co? - if( ActiveDir < 0 ) { - while( ( RList[ MainCtrlPos ].Bn > 1 ) - && IncMainCtrl( 1 ) ) { - --MainCtrlPos; - } - } OK = false; // shouldn't this be part of the loop above? // if (TrainType=dt_ET40) then // while Abs (Im)>IminHi do @@ -1752,14 +1745,6 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) } } } - if( ActiveDir < 0 ) { - if( ( TrainType != dt_PseudoDiesel ) - && ( RList[ MainCtrlPos ].Bn > 1 ) ) { - // blokada wejścia na równoległą podczas jazdy do tyłu - --MainCtrlPos; - OK = false; - } - } // // if (TrainType == "et40") // if (Abs(Im) > IminHi) @@ -1768,15 +1753,14 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) // OK = false; // } //} - } + } - if( ( TrainType == dt_ET42 ) && ( true == DynamicBrakeFlag ) ) { - if( MainCtrlPos > 20 ) { - MainCtrlPos = 20; + if( ( TrainType == dt_ET42 ) && ( true == DynamicBrakeFlag ) ) { + if( MainCtrlPos > 20 ) { + MainCtrlPos = 20; OK = false; } - } - // return OK; + } break; } @@ -2866,7 +2850,6 @@ bool TMoverParameters::IncLocalBrakeLevel(int CtrlSpeed) while ((LocalBrakePos < LocalBrakePosNo) && (CtrlSpeed > 0)) { LocalBrakePos++; -// LocalBrakePosA = static_cast(LocalBrakePos) / LocalBrakePosNo; // temporary hack until i figure out how this element is supposed to work CtrlSpeed--; } IBL = true; @@ -2890,7 +2873,6 @@ bool TMoverParameters::DecLocalBrakeLevel(int CtrlSpeed) while ((CtrlSpeed > 0) && (LocalBrakePos > 0)) { LocalBrakePos--; -// LocalBrakePosA = static_cast( LocalBrakePos ) / LocalBrakePosNo; // temporary hack until i figure out how this element is supposed to work CtrlSpeed--; } DBL = true; @@ -2912,7 +2894,6 @@ bool TMoverParameters::IncLocalBrakeLevelFAST(void) if (LocalBrakePos < LocalBrakePosNo) { LocalBrakePos = LocalBrakePosNo; -// LocalBrakePosA = static_cast( LocalBrakePos ) / LocalBrakePosNo; // temporary hack until i figure out how this element is supposed to work ILBLF = true; } else @@ -2931,7 +2912,6 @@ bool TMoverParameters::DecLocalBrakeLevelFAST(void) if (LocalBrakePos > 0) { LocalBrakePos = 0; -// LocalBrakePosA = static_cast( LocalBrakePos ) / LocalBrakePosNo; // temporary hack until i figure out how this element is supposed to work DLBLF = true; } else @@ -6472,7 +6452,7 @@ void TMoverParameters::dizel_Heat( double const dt ) { auto const zaluzje2 { ( dizel_heat.zaluzje2 ? 1 : 0 ) }; // auxiliary water circuit heat transfer values auto const kf2 { kurek07 * ( ( dizel_heat.kw * ( 0.3 + 0.7 * zaluzje2 ) ) * dizel_heat.rpmw2 + ( dizel_heat.kv * ( 0.3 + 0.7 * zaluzje2 ) * Vel / 3.6 ) ) + 2 }; - auto const dTs2 { ( ( dizel_heat.kfs * ( 0.3 ) * ( dizel_heat.To - dizel_heat.Tsr2 ) ) ) / ( gw2 * Cw ) }; + auto const dTs2 { ( ( dizel_heat.kfo2 * ( dizel_heat.To - dizel_heat.Tsr2 ) ) ) / ( gw2 * Cw ) }; // przy otwartym kurku B ma³y obieg jest dogrzewany przez du¿y - stosujemy przy korzystaniu z podgrzewacza oraz w zimie auto const Qch2 { -kf2 * ( dizel_heat.Tsr2 - dizel_heat.Te ) + ( 80 * ( true == WaterCircuitsLink ? 1 : 0 ) * ( dizel_heat.Twy - dizel_heat.Tsr2 ) ) }; auto const dTch2 { Qch2 / ( gw2 * Cw ) }; diff --git a/Track.cpp b/Track.cpp index c436e6c0..92232675 100644 --- a/Track.cpp +++ b/Track.cpp @@ -922,6 +922,16 @@ bool TTrack::AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus) return false; }; +void TTrack::QueueEvents( event_sequence const &Events, TDynamicObject const *Owner ) { + + for( auto const &event : Events ) { + if( ( event.second != nullptr ) + && ( event.second->fDelay <= -1.0 ) ) { + simulation::Events.AddToQuery( event.second, Owner ); + } + } +} + std::string TTrack::IsolatedName() { // podaje nazwę odcinka izolowanego, jesli nie ma on jeszcze przypisanych zdarzeń if (pIsolated) diff --git a/Track.h b/Track.h index a97f2601..39c11f1a 100644 --- a/Track.h +++ b/Track.h @@ -247,6 +247,7 @@ public: void Load(cParser *parser, Math3D::vector3 pOrigin); bool AssignEvents(); bool AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus); + void QueueEvents( event_sequence const &Events, TDynamicObject const *Owner ); bool CheckDynamicObject(TDynamicObject *Dynamic); bool AddDynamicObject(TDynamicObject *Dynamic); bool RemoveDynamicObject(TDynamicObject *Dynamic); diff --git a/Train.cpp b/Train.cpp index f6b5996c..878fe33f 100644 --- a/Train.cpp +++ b/Train.cpp @@ -919,7 +919,12 @@ void TTrain::OnCommand_independentbrakedecreasefast( TTrain *Train, command_data } void TTrain::OnCommand_independentbrakeset( TTrain *Train, command_data const &Command ) { - + + Train->mvControlled->LocalBrakePosA = ( + clamp( + reinterpret_cast( Command.param1 ), + 0.0, 1.0 ) ); +/* Train->mvControlled->LocalBrakePos = ( std::round( interpolate( @@ -928,6 +933,7 @@ void TTrain::OnCommand_independentbrakeset( TTrain *Train, command_data const &C clamp( reinterpret_cast( Command.param1 ), 0.0, 1.0 ) ) ) ); +*/ } void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data const &Command ) { @@ -5174,7 +5180,7 @@ bool TTrain::Update( double const Deltatime ) #endif { // standardowa prodedura z kranem powiązanym z klawiaturą - ggLocalBrake.UpdateValue( double( mvOccupied->LocalBrakePos ) ); + ggLocalBrake.UpdateValue( std::max( mvOccupied->LocalBrakePos, mvOccupied->LocalBrakePosA * LocalBrakePosNo ) ); } ggLocalBrake.Update(); } diff --git a/TrkFoll.cpp b/TrkFoll.cpp index b4868e2a..9d8d802a 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -109,19 +109,9 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) if( ( Owner->Mechanik != nullptr ) && ( Owner->Mechanik->Primary() ) ) { // tylko dla jednego członu - for( auto &event : pCurrentTrack->m_events0 ) { - if( ( event.second != nullptr ) - && ( event.second->iQueued == 0 ) ) { - simulation::Events.AddToQuery( event.second, Owner ); - } - } - } - for( auto &event : pCurrentTrack->m_events0all ) { - if( ( event.second != nullptr ) - && ( event.second->iQueued == 0 ) ) { - simulation::Events.AddToQuery( event.second, Owner ); - } + pCurrentTrack->QueueEvents( pCurrentTrack->m_events0, Owner ); } + pCurrentTrack->QueueEvents( pCurrentTrack->m_events0all, Owner ); } else if (fDistance < 0) { // event1, eventall1 @@ -132,26 +122,14 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) // tylko dla jednego członu // McZapkie-280503: wyzwalanie event tylko dla pojazdow z obsada if( true == bPrimary ) { - for( auto &event : pCurrentTrack->m_events1 ) { - if( ( event.second != nullptr ) - && ( event.second->iQueued == 0 ) ) { - // dodanie do kolejki - simulation::Events.AddToQuery( event.second, Owner ); - } - } + pCurrentTrack->QueueEvents( pCurrentTrack->m_events1, Owner ); } } } if( SetFlag( iEventallFlag, -1 ) ) { // McZapkie-280503: wyzwalanie eventall dla wszystkich pojazdow if( true == bPrimary ) { - for( auto &event : pCurrentTrack->m_events1all ) { - if( ( event.second != nullptr ) - && ( event.second->iQueued == 0 ) ) { - // dodanie do kolejki - simulation::Events.AddToQuery( event.second, Owner ); - } - } + pCurrentTrack->QueueEvents( pCurrentTrack->m_events1all, Owner ); } } } @@ -163,26 +141,14 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) && ( Owner->Mechanik->Primary() ) ) { // tylko dla jednego członu if( true == bPrimary ) { - for( auto &event : pCurrentTrack->m_events2 ) { - if( ( event.second != nullptr ) - && ( event.second->iQueued == 0 ) ) { - // dodanie do kolejki - simulation::Events.AddToQuery( event.second, Owner ); - } - } + pCurrentTrack->QueueEvents( pCurrentTrack->m_events2, Owner ); } } } if( SetFlag( iEventallFlag, -2 ) ) { // sprawdza i zeruje na przyszłość, true jeśli zmieni z 2 na 0 if( true == bPrimary ) { - for( auto &event : pCurrentTrack->m_events2all ) { - if( ( event.second != nullptr ) - && ( event.second->iQueued == 0 ) ) { - // dodanie do kolejki - simulation::Events.AddToQuery( event.second, Owner ); - } - } + pCurrentTrack->QueueEvents( pCurrentTrack->m_events2all, Owner ); } } } @@ -279,34 +245,13 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) { // tylko gdy początkowe ustawienie, dodajemy eventy stania do kolejki if (Owner->MoverParameters->ActiveCab != 0) { - for( auto &event : pCurrentTrack->m_events1 ) { - if( ( event.second != nullptr ) - && ( event.second->fDelay <= -1.0 ) ) { - simulation::Events.AddToQuery( event.second, Owner ); - } - } - for( auto &event : pCurrentTrack->m_events2 ) { - if( ( event.second != nullptr ) - && ( event.second->fDelay <= -1.0 ) ) { - simulation::Events.AddToQuery( event.second, Owner ); - } - } - } - for( auto &event : pCurrentTrack->m_events1all ) { - if( ( event.second != nullptr ) - && ( event.second->fDelay <= -1.0 ) ) { - simulation::Events.AddToQuery( event.second, Owner ); - } - } - for( auto &event : pCurrentTrack->m_events2all ) { - if( ( event.second != nullptr ) - && ( event.second->fDelay <= -1.0 ) ) { - simulation::Events.AddToQuery( event.second, Owner ); - } + pCurrentTrack->QueueEvents( pCurrentTrack->m_events1, Owner ); + pCurrentTrack->QueueEvents( pCurrentTrack->m_events2, Owner ); } + pCurrentTrack->QueueEvents( pCurrentTrack->m_events1all, Owner ); + pCurrentTrack->QueueEvents( pCurrentTrack->m_events2all, Owner ); } fCurrentDistance = s; - // fDistance=0; return ComputatePosition(); // przeliczenie XYZ, true o ile nie wyjechał na NULL } } diff --git a/TrkFoll.h b/TrkFoll.h index 4e1a4cfd..b15a38f7 100644 --- a/TrkFoll.h +++ b/TrkFoll.h @@ -13,49 +13,50 @@ http://mozilla.org/MPL/2.0/. #include "classes.h" #include "segment.h" -class TTrackFollower -{ // oś poruszająca się po torze - private: - TTrack *pCurrentTrack = nullptr; // na którym torze siê znajduje - std::shared_ptr pCurrentSegment; // zwrotnice mog¹ mieæ dwa segmenty - double fCurrentDistance = 0.0; // przesuniêcie wzglêdem Point1 w stronê Point2 - double fDirection = 1.0; // ustawienie wzglêdem toru: -1.0 albo 1.0, mno¿one przez dystans // jest przodem do Point2 - bool ComputatePosition(); // przeliczenie pozycji na torze - TDynamicObject *Owner = nullptr; // pojazd posiadający - int iEventFlag = 0; // McZapkie-020602: informacja o tym czy wyzwalac zdarzenie: 0,1,2,3 - int iEventallFlag = 0; - int iSegment = 0; // który segment toru jest używany (żeby nie przeskakiwało po przestawieniu - // zwrotnicy pod taborem) - public: - double fOffsetH = 0.0; // Ra: odległość środka osi od osi toru (dla samochodów) - użyć do wężykowania - Math3D::vector3 pPosition; // współrzędne XYZ w układzie scenerii - Math3D::vector3 vAngles; // x:przechyłka, y:pochylenie, z:kierunek w planie (w radianach) +// oś poruszająca się po torze +class TTrackFollower { + +public: +// constructors TTrackFollower() = default; +// destructor ~TTrackFollower(); +// methods TTrack * SetCurrentTrack(TTrack *pTrack, int end); bool Move(double fDistance, bool bPrimary); - inline TTrack * GetTrack() const - { - return pCurrentTrack; - }; - inline double GetRoll() - { - return vAngles.x; - }; // przechyłka policzona przy ustalaniu pozycji + inline TTrack * GetTrack() const { + return pCurrentTrack; }; + // przechyłka policzona przy ustalaniu pozycji + inline double GetRoll() { + return vAngles.x; }; //{return pCurrentSegment->GetRoll(fCurrentDistance)*fDirection;}; //zamiast liczyć można pobrać - inline double GetDirection() const - { - return fDirection; - }; // zwrot na torze - inline double GetTranslation() const - { - return fCurrentDistance; - }; // ABu-030403 + // zwrot na torze + inline double GetDirection() const { + return fDirection; }; + // ABu-030403 + inline double GetTranslation() const { + return fCurrentDistance; }; // inline double GetLength(vector3 p1, vector3 cp1, vector3 cp2, vector3 p2) //{ return pCurrentSegment->ComputeLength(p1,cp1,cp2,p2); }; // inline double GetRadius(double L, double d); //McZapkie-150503 bool Init(TTrack *pTrack, TDynamicObject *NewOwner, double fDir); void Render(float fNr); +// members + double fOffsetH = 0.0; // Ra: odległość środka osi od osi toru (dla samochodów) - użyć do wężykowania + Math3D::vector3 pPosition; // współrzędne XYZ w układzie scenerii + Math3D::vector3 vAngles; // x:przechyłka, y:pochylenie, z:kierunek w planie (w radianach) +private: +// methods + bool ComputatePosition(); // przeliczenie pozycji na torze +// members + TTrack *pCurrentTrack = nullptr; // na którym torze siê znajduje + std::shared_ptr pCurrentSegment; // zwrotnice mog¹ mieæ dwa segmenty + double fCurrentDistance = 0.0; // przesuniêcie wzglêdem Point1 w stronê Point2 + double fDirection = 1.0; // ustawienie wzglêdem toru: -1.0 albo 1.0, mno¿one przez dystans // jest przodem do Point2 + TDynamicObject *Owner = nullptr; // pojazd posiadający + int iEventFlag = 0; // McZapkie-020602: informacja o tym czy wyzwalac zdarzenie: 0,1,2,3 + int iEventallFlag = 0; + int iSegment = 0; // który segment toru jest używany (żeby nie przeskakiwało po przestawieniu zwrotnicy pod taborem) }; //--------------------------------------------------------------------------- #endif diff --git a/mouseinput.cpp b/mouseinput.cpp index ba9e7288..c55d40ec 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -75,7 +75,7 @@ mouse_input::button( int const Button, int const Action ) { if( true == FreeFlyModeFlag ) { // world editor controls - // currently we only handle view panning in this mode + // TODO: separate behaviour when the scenery editor is active and in 'regular' free fly mode if( Action == GLFW_RELEASE ) { // if it's the right mouse button that got released we were potentially in view panning mode; stop it if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { @@ -84,6 +84,19 @@ mouse_input::button( int const Button, int const Action ) { } else { // button press + if( Button == GLFW_MOUSE_BUTTON_LEFT ) { + // the left button selects scene node + // further behaviour can vary depending on whether we're in editor mode + auto const *node { GfxRenderer.Update_Pick_Node() }; + if( true == EditorModeFlag ) { + // NOTE: until we have proper editor object in place we set the current node manually + editor::Node = node; + } + else { + // launch on_click event associated with to the node + // TODO: implement + } + } if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { // the right button activates mouse panning mode m_pickmodepanning = true; diff --git a/scenenode.cpp b/scenenode.cpp index 19c3ca5a..5022a795 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -762,4 +762,11 @@ basic_node::radius_() { } } // scene + +namespace editor { + +scene::basic_node const *Node { nullptr }; // temporary helper, currently selected scene node + +} // editor + //--------------------------------------------------------------------------- diff --git a/scenenode.h b/scenenode.h index 3b922698..eb986dba 100644 --- a/scenenode.h +++ b/scenenode.h @@ -381,4 +381,10 @@ basic_node::visible() const { } // scene +namespace editor { + +extern scene::basic_node const *Node; // temporary helper, currently selected scene node + +} // editor + //--------------------------------------------------------------------------- diff --git a/sound.cpp b/sound.cpp index da071a6a..a4f1a6c8 100644 --- a/sound.cpp +++ b/sound.cpp @@ -465,7 +465,7 @@ float sound_source::compute_combined_point() const { return ( - m_properties.pitch < 1.1f ? + m_properties.pitch <= 1.f ? // most sounds use 0-1 value range, we clamp these to 0-99 to allow more intuitive sound definition in .mmd files clamp( m_properties.pitch, 0.f, 0.99f ) : std::max( 0.f, m_properties.pitch ) diff --git a/stdafx.h b/stdafx.h index c2bcfa2b..56fb3d16 100644 --- a/stdafx.h +++ b/stdafx.h @@ -85,6 +85,8 @@ //m7todo: jest tu bo nie chciao mi si wpycha do wszystkich plikw #include +#define GLM_ENABLE_EXPERIMENTAL +#define GLM_FORCE_CTOR_INIT #include #include #include diff --git a/uilayer.cpp b/uilayer.cpp index 14ac14b7..7eccd73d 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -708,6 +708,13 @@ ui_layer::update() { case( GLFW_KEY_F11 ): { // scenario inspector + auto const *node { editor::Node }; + + if( node == nullptr ) { break; } + + uitextline1 = + "Node name: " + node->name() + + "; location: [" + to_string( node->location().x, 2 ) + ", " + to_string( node->location().y, 2 ) + ", " + to_string( node->location().z, 2 ) + "]"; break; } diff --git a/version.h b/version.h index 5058f5a7..28fab244 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 614 +#define VERSION_MINOR 621 #define VERSION_REVISION 0 From c40d0abcf98f7230cbcccbc90bf0c8ff71465885 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 22 Jun 2018 18:24:48 +0200 Subject: [PATCH 349/426] build 180622. time zone bias calculation fix, track events fix, passenger stop distance calculation fix --- Driver.cpp | 9 +++++---- Track.cpp | 11 ++++++++++- Track.h | 1 + TrkFoll.cpp | 8 ++++---- World.cpp | 39 +++++++++++++++++++++++++++++++++++++++ World.h | 3 +++ moon.cpp | 19 +++++++++---------- sun.cpp | 32 +++++++------------------------- version.h | 2 +- 9 files changed, 79 insertions(+), 45 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 761ec82f..ebecd129 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -873,11 +873,12 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN auto Par1 = sSpeedTable[i].evEvent->ValueGet(1); auto Par2 = sSpeedTable[i].evEvent->ValueGet(2); if ((Par2 > 0) || (fLength < -Par2)) { //użyj tego W4 - if (Par1 < 0) { //środek - L = -Par1 - fMinProximityDist - fLength * 0.5; - } + if (Par1 < 0) { + L = -Par1; + } else { - L = Par1; + //środek + L = Par1 - fMinProximityDist - fLength * 0.5; } L = std::max(0.0, std::min(L, std::abs(Par2) - fMinProximityDist - fLength)); sSpeedTable[i].UpdateDistance(L); diff --git a/Track.cpp b/Track.cpp index 92232675..a1404217 100644 --- a/Track.cpp +++ b/Track.cpp @@ -924,9 +924,18 @@ bool TTrack::AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus) void TTrack::QueueEvents( event_sequence const &Events, TDynamicObject const *Owner ) { + for( auto const &event : Events ) { + if( event.second != nullptr ) { + simulation::Events.AddToQuery( event.second, Owner ); + } + } +} + +void TTrack::QueueEvents( event_sequence const &Events, TDynamicObject const *Owner, double const Delaylimit ) { + for( auto const &event : Events ) { if( ( event.second != nullptr ) - && ( event.second->fDelay <= -1.0 ) ) { + && ( event.second->fDelay <= Delaylimit) ) { simulation::Events.AddToQuery( event.second, Owner ); } } diff --git a/Track.h b/Track.h index 39c11f1a..97f30815 100644 --- a/Track.h +++ b/Track.h @@ -248,6 +248,7 @@ public: bool AssignEvents(); bool AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus); void QueueEvents( event_sequence const &Events, TDynamicObject const *Owner ); + void QueueEvents( event_sequence const &Events, TDynamicObject const *Owner, double const Delaylimit ); bool CheckDynamicObject(TDynamicObject *Dynamic); bool AddDynamicObject(TDynamicObject *Dynamic); bool RemoveDynamicObject(TDynamicObject *Dynamic); diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 9d8d802a..37029750 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -245,11 +245,11 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) { // tylko gdy początkowe ustawienie, dodajemy eventy stania do kolejki if (Owner->MoverParameters->ActiveCab != 0) { - pCurrentTrack->QueueEvents( pCurrentTrack->m_events1, Owner ); - pCurrentTrack->QueueEvents( pCurrentTrack->m_events2, Owner ); + pCurrentTrack->QueueEvents( pCurrentTrack->m_events1, Owner, -1.0 ); + pCurrentTrack->QueueEvents( pCurrentTrack->m_events2, Owner, -1.0 ); } - pCurrentTrack->QueueEvents( pCurrentTrack->m_events1all, Owner ); - pCurrentTrack->QueueEvents( pCurrentTrack->m_events2all, Owner ); + pCurrentTrack->QueueEvents( pCurrentTrack->m_events1all, Owner, -1.0 ); + pCurrentTrack->QueueEvents( pCurrentTrack->m_events2all, Owner, -1.0 ); } fCurrentDistance = s; return ComputatePosition(); // przeliczenie XYZ, true o ile nie wyjechał na NULL diff --git a/World.cpp b/World.cpp index 37be858b..20f235b4 100644 --- a/World.cpp +++ b/World.cpp @@ -74,6 +74,45 @@ simulation_time::init() { } m_yearday = year_day( m_time.wDay, m_time.wMonth, m_time.wYear ); + + // calculate time zone bias + // retrieve relevant time zone info from system registry (or fall back on supplied default) + // TODO: select timezone matching defined geographic location and/or country + struct registry_time_zone_info { + long Bias; + long StandardBias; + long DaylightBias; + SYSTEMTIME StandardDate; + SYSTEMTIME DaylightDate; + } registrytimezoneinfo = { -60, 0, -60, { 0, 10, 0, 5, 3, 0, 0, 0 }, { 0, 3, 0, 5, 2, 0, 0, 0 } }; + +#ifdef _WIN32 + TCHAR timezonekeyname[] { TEXT( "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\Central European Standard Time" ) }; + HKEY timezonekey { NULL }; + DWORD size { sizeof( registrytimezoneinfo ) }; + if( ::RegOpenKeyEx( HKEY_LOCAL_MACHINE, timezonekeyname, 0, KEY_QUERY_VALUE, &timezonekey ) == ERROR_SUCCESS ) { + ::RegQueryValueEx( timezonekey, "TZI", NULL, NULL, (BYTE *)®istrytimezoneinfo, &size ); + } +#endif + TIME_ZONE_INFORMATION timezoneinfo { 0 }; + timezoneinfo.Bias = registrytimezoneinfo.Bias; + timezoneinfo.DaylightBias = registrytimezoneinfo.DaylightBias; + timezoneinfo.DaylightDate = registrytimezoneinfo.DaylightDate; + timezoneinfo.StandardBias = registrytimezoneinfo.StandardBias; + timezoneinfo.StandardDate = registrytimezoneinfo.StandardDate; + + auto zonebias { timezoneinfo.Bias }; + if( m_yearday < year_day( timezoneinfo.DaylightDate.wDay, timezoneinfo.DaylightDate.wMonth, m_time.wYear ) ) { + zonebias += timezoneinfo.StandardBias; + } + else if( m_yearday < year_day( timezoneinfo.StandardDate.wDay, timezoneinfo.StandardDate.wMonth, m_time.wYear ) ) { + zonebias += timezoneinfo.DaylightBias; + } + else { + zonebias += timezoneinfo.StandardBias; + } + + m_timezonebias = ( zonebias / 60.0 ); } void diff --git a/World.h b/World.h index 5db1287d..731af207 100644 --- a/World.h +++ b/World.h @@ -44,6 +44,8 @@ public: year_day( int Day, int const Month, int const Year ) const; int julian_day() const; + double + zone_bias() const { return m_timezonebias; } private: // calculates day and month from given day of year @@ -54,6 +56,7 @@ private: double m_milliseconds{ 0.0 }; int m_yearday; char m_monthdaycounts[ 2 ][ 13 ]; + double m_timezonebias{ 0.0 }; }; namespace simulation { diff --git a/moon.cpp b/moon.cpp index 68bbfe51..b40d5356 100644 --- a/moon.cpp +++ b/moon.cpp @@ -14,10 +14,6 @@ cMoon::cMoon() { setLocation( 19.00f, 52.00f ); // default location roughly in centre of Poland m_observer.press = 1013.0; // surface pressure, millibars m_observer.temp = 15.0; // ambient dry-bulb temperature, degrees C - - TIME_ZONE_INFORMATION timezoneinfo; // TODO: timezone dependant on geographic location - ::GetTimeZoneInformation( &timezoneinfo ); - m_observer.timezone = -timezoneinfo.Bias / 60.0f; } cMoon::~cMoon() { gluDeleteQuadric( moonsphere ); } @@ -25,16 +21,20 @@ cMoon::~cMoon() { gluDeleteQuadric( moonsphere ); } void cMoon::init() { - moonsphere = gluNewQuadric(); - gluQuadricNormals( moonsphere, GLU_SMOOTH ); + m_observer.timezone = -1.0 * simulation::Time.zone_bias(); // NOTE: we're calculating phase just once, because it's unlikely simulation will last a few days, // plus a sudden texture change would be pretty jarring phase(); + + moonsphere = gluNewQuadric(); + gluQuadricNormals( moonsphere, GLU_SMOOTH ); } void cMoon::update() { + m_observer.temp = Global.AirTemperature; + move(); glm::vec3 position( 0.f, 0.f, -1.f ); position = glm::rotateX( position, glm::radians( static_cast( m_body.elevref ) ) ); @@ -118,7 +118,7 @@ void cMoon::move() { if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } - double ut = + double localut = localtime.wHour + localtime.wMinute / 60.0 // too low resolution, noticeable skips + localtime.wSecond / 3600.0; // good enough in normal circumstances @@ -131,11 +131,10 @@ void cMoon::move() { + 275 * localtime.wMonth / 9 + localtime.wDay - 730530 - + ( ut / 24.0 ); + + ( localut / 24.0 ); // Universal Coordinated (Greenwich standard) time - m_observer.utime = ut * 3600.0; - m_observer.utime = m_observer.utime / 3600.0 - m_observer.timezone; + m_observer.utime = localut - m_observer.timezone; // obliquity of the ecliptic m_body.oblecl = clamp_circular( 23.4393 - 3.563e-7 * daynumber ); diff --git a/sun.cpp b/sun.cpp index 9f6e0a82..fc264f76 100644 --- a/sun.cpp +++ b/sun.cpp @@ -21,34 +21,17 @@ cSun::~cSun() { gluDeleteQuadric( sunsphere ); } void cSun::init() { + m_observer.timezone = -1.0 * simulation::Time.zone_bias(); + sunsphere = gluNewQuadric(); gluQuadricNormals( sunsphere, GLU_SMOOTH ); - - // calculate and set timezone for the current date of the simulation - // TODO: timezone dependant on geographic location - TIME_ZONE_INFORMATION timezoneinfo; - ::GetTimeZoneInformation( &timezoneinfo ); - // account for potential daylight/normal time bias - // NOTE: we're using xp-compatible time zone information and current year, instead of 'historically proper' values - auto zonebias { timezoneinfo.Bias }; - auto const year { simulation::Time.data().wYear }; - auto const yearday { simulation::Time.year_day() }; - if( yearday < simulation::Time.year_day( timezoneinfo.DaylightDate.wDay, timezoneinfo.DaylightDate.wMonth, year ) ) { - zonebias += timezoneinfo.StandardBias; - } - else if( yearday < simulation::Time.year_day( timezoneinfo.StandardDate.wDay, timezoneinfo.StandardDate.wMonth, year ) ) { - zonebias += timezoneinfo.DaylightBias; - } - else { - zonebias += timezoneinfo.StandardBias; - } - - m_observer.timezone = -zonebias / 60.0f; } void cSun::update() { + m_observer.temp = Global.AirTemperature; + move(); glm::vec3 position( 0.f, 0.f, -1.f ); position = glm::rotateX( position, glm::radians( static_cast( m_body.elevref ) ) ); @@ -141,7 +124,7 @@ void cSun::move() { if( m_observer.minute >= 0 ) { localtime.wMinute = m_observer.minute; } if( m_observer.second >= 0 ) { localtime.wSecond = m_observer.second; } - double ut = + double localut = localtime.wHour + localtime.wMinute / 60.0 // too low resolution, noticeable skips + localtime.wSecond / 3600.0; // good enough in normal circumstances @@ -154,11 +137,10 @@ void cSun::move() { + 275 * localtime.wMonth / 9 + localtime.wDay - 730530 - + ( ut / 24.0 ); + + ( localut / 24.0 ); // Universal Coordinated (Greenwich standard) time - m_observer.utime = ut * 3600.0; - m_observer.utime = m_observer.utime / 3600.0 - m_observer.timezone; + m_observer.utime = localut - m_observer.timezone; // perihelion longitude m_body.phlong = 282.9404 + 4.70935e-5 * daynumber; // w // orbit eccentricity diff --git a/version.h b/version.h index 28fab244..be52643b 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 621 +#define VERSION_MINOR 622 #define VERSION_REVISION 0 From 984b7c579af1a49d4f796c783fd4fdc22ca850d9 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 24 Jun 2018 18:43:12 +0200 Subject: [PATCH 350/426] maintenance: removed deprecated code, minor command code touch ups --- McZapkie/Mover.cpp | 86 ++++++++++++++-------------------------------- 1 file changed, 26 insertions(+), 60 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index a1f685e1..70c9d5f0 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -38,16 +38,6 @@ std::vector const TMoverParameters::eimv_labels = { "Fful:" }; -inline long Trunc(float f) -{ - return (long)f; -} - -inline long ROUND(float f) -{ - return Trunc(f + 0.5f); -} - inline double square(double val) // SQR() zle liczylo w current() ... { return val * val; @@ -6909,41 +6899,11 @@ bool startDLIST, startFFLIST, startWWLIST; bool startLIGHTSLIST; int LISTLINE; -// ************************************************************************************************* -// Q: 20160717 -// ************************************************************************************************* -size_t Pos(std::string str_find, std::string in) -{ - size_t pos = in.find(str_find); - return (pos != std::string::npos ? pos+1 : 0); -} -/* -// ************************************************************************************************* -// Q: 20160717 -// ************************************************************************************************* -bool issection(std::string const &name) -{ - sectionname = name; - if (xline.compare(0, name.size(), name) == 0) - { - lastsectionname = name; - return true; - } - else - return false; -} -*/ bool issection( std::string const &Name, std::string const &Input ) { return ( Input.compare( 0, Name.size(), Name ) == 0 ); } -int MARKERROR(int code, std::string type, std::string msg) -{ - WriteLog(msg); - return code; -} - int s2NPW(std::string s) { // wylicza ilosc osi napednych z opisu ukladu osi const char A = 64; @@ -9161,9 +9121,7 @@ bool TMoverParameters::SendCtrlToNext( std::string const CtrlCommand, double con // jakiejś zmiany (np. IncMainCtrl) lepiej wywołać funkcję, czy od razu wysłać komendę. bool TMoverParameters::RunCommand( std::string Command, double CValue1, double CValue2, int const Couplertype ) { - bool OK; - std::string testload; - OK = false; + bool OK { false }; if (Command == "MainCtrl") { @@ -9588,29 +9546,37 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C OK = true; // true, gdy można usunąć komendę } /*naladunek/rozladunek*/ - else if (Pos("Load=", Command) == 1) + else if ( issection( "Load=", Command ) ) { OK = false; // będzie powtarzane aż się załaduje - if ((Vel == 0) && (MaxLoad > 0) && - (Load < MaxLoad * (1.0 + OverLoadFactor))) // czy można ładowac? - if (Distance(Loc, CommandIn.Location, Dim, Dim) < 10) // ten peron/rampa - { - testload = ToLower(DUE(Command)); - if (Pos(testload, LoadAccepted) > 0) // nazwa jest obecna w CHK - OK = LoadingDone(Min0R(CValue2, LoadSpeed), testload); // zmienia LoadStatus - } + if( ( Vel < 0.01 ) + && ( MaxLoad > 0 ) + && ( Load < MaxLoad * ( 1.0 + OverLoadFactor ) ) ) { + // czy można ładowac? + if( Distance( Loc, CommandIn.Location, Dim, Dim ) < 10 ) { + // ten peron/rampa + auto const testload { ToLower( extract_value( "Load", Command ) ) }; + if( LoadAccepted.find( testload ) != std::string::npos ) // nazwa jest obecna w CHK + OK = LoadingDone( Min0R( CValue2, LoadSpeed ), testload ); // zmienia LoadStatus + } + } // if OK then LoadStatus:=0; //nie udalo sie w ogole albo juz skonczone } - else if (Pos("UnLoad=", Command) == 1) + else if( issection( "UnLoad=", Command ) ) { OK = false; // będzie powtarzane aż się rozładuje - if ((Vel == 0) && (Load > 0)) // czy jest co rozladowac? - if (Distance(Loc, CommandIn.Location, Dim, Dim) < 10) // ten peron - { - testload = DUE(Command); // zgodność nazwy ładunku z CHK - if (LoadType == testload) /*mozna to rozladowac*/ - OK = LoadingDone(-Min0R(CValue2, LoadSpeed), testload); - } + if( ( Vel < 0.01 ) + && ( Load > 0 ) ) { + // czy jest co rozladowac? + if( Distance( Loc, CommandIn.Location, Dim, Dim ) < 10 ) { + // ten peron + auto const testload { ToLower( extract_value( "UnLoad", Command ) ) }; // zgodność nazwy ładunku z CHK + if( LoadType == testload ) { + /*mozna to rozladowac*/ + OK = LoadingDone( -Min0R( CValue2, LoadSpeed ), testload ); + } + } + } // if OK then LoadStatus:=0; } else if (Command == "SpeedCntrl") From c6d2f1271dc6517ee5c622a88cc204d02e377afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 24 Jun 2018 18:36:06 +0200 Subject: [PATCH 351/426] Faster reaction of inverters for EIM --- McZapkie/Mover.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 70c9d5f0..a313e7d5 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5064,7 +5064,7 @@ double TMoverParameters::TractionForce( double dt ) { Hamulec->SetED(0); // (Hamulec as TLSt).SetLBP(LocBrakePress); if ((PosRatio > dizel_fill)) - tmp = 1; + tmp = 4; else tmp = 4; // szybkie malenie, powolne wzrastanie } @@ -5073,7 +5073,7 @@ double TMoverParameters::TractionForce( double dt ) { // TODO: gather these in single place so they can be resolved together if( ( SlippingWheels ) ) { PosRatio = 0; - tmp = 9; + tmp = 10; Sandbox( true, range::unit ); } // przeciwposlizg else { @@ -5081,7 +5081,7 @@ double TMoverParameters::TractionForce( double dt ) { Sandbox( false, range::unit ); } - dizel_fill += Max0R(Min0R(PosRatio - dizel_fill, 0.1), -0.1) * 2 * + dizel_fill += Max0R(Min0R(PosRatio - dizel_fill, 0.02), -0.02) * 12 * (tmp /*2{+4*byte(PosRatio Date: Wed, 27 Jun 2018 03:22:50 +0200 Subject: [PATCH 352/426] build 180626. ai power use logic tweaks, basic selected node attributes display in scenery editor, memory cell visualization in scenery editor debug mode, minor bug fixes --- AnimModel.cpp | 2 +- AnimModel.h | 3 +- Driver.cpp | 149 ++++++++++++++++++++++++++++--------------------- Track.h | 2 + Train.cpp | 1 + World.cpp | 13 ++--- renderer.cpp | 54 +++++++++--------- renderer.h | 2 +- scene.cpp | 31 ++++++++-- scene.h | 8 +++ simulation.cpp | 5 +- uilayer.cpp | 117 +++++++++++++++++++++++++++++++++++++- version.h | 2 +- 13 files changed, 278 insertions(+), 111 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index e0f108a6..d364815b 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -550,7 +550,7 @@ void TAnimModel::RaAnimate( unsigned int const Framestamp ) { // Ra 2F1I: to by można pomijać dla modeli bez animacji, których jest większość TAnimContainer *pCurrent; - for (pCurrent = pRoot; pCurrent != NULL; pCurrent = pCurrent->pNext) + for (pCurrent = pRoot; pCurrent != nullptr; pCurrent = pCurrent->pNext) if (!pCurrent->evDone) // jeśli jest bez eventu pCurrent->UpdateModel(); // przeliczenie animacji każdego submodelu // if () //tylko dla modeli z IK !!!! diff --git a/AnimModel.h b/AnimModel.h index de4124ae..b6ec7055 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -125,6 +125,7 @@ class TAnimAdvanced class TAnimModel : public scene::basic_node { friend class opengl_renderer; + friend class ui_layer; public: // constructors @@ -151,7 +152,7 @@ public: return &m_materialdata; } inline TModel3d * - Model() { + Model() const { return pModel; } // members static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania diff --git a/Driver.cpp b/Driver.cpp index ebecd129..81199126 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -872,7 +872,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN auto L = 0.0; auto Par1 = sSpeedTable[i].evEvent->ValueGet(1); auto Par2 = sSpeedTable[i].evEvent->ValueGet(2); - if ((Par2 > 0) || (fLength < -Par2)) { //użyj tego W4 + if ((Par2 >= 0) || (fLength < -Par2)) { //użyj tego W4 if (Par1 < 0) { L = -Par1; } @@ -2732,65 +2732,69 @@ bool TController::IncSpeed() if (!mvControlling->FuseFlag) //&&mvControlling->StLinFlag) //yBARC if ((mvControlling->MainCtrlPos == 0) || (mvControlling->StLinFlag)) // youBy polecił dodać 2012-09-08 v367 - // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe - // (zgaśnie DelayCtrlFlag) - if (Ready || (iDrivigFlags & movePress)) - { - bool scndctrl = ((mvOccupied->Vel <= 30) || - (mvControlling->Imax > mvControlling->ImaxLo) || - (fVoltage + fVoltage < - mvControlling->EnginePowerSource.CollectorParameters.MinV + - mvControlling->EnginePowerSource.CollectorParameters.MaxV) || - (mvControlling->MainCtrlPos == mvControlling->MainCtrlPosNo)); - scndctrl = ((scndctrl) && (mvControlling->MainCtrlPos > 1) && (mvControlling->RList[mvControlling->MainCtrlActualPos].R < 0.01)&& (mvControlling->ScndCtrlPos != mvControlling->ScndCtrlPosNo)); - double Vs = 99999; - if((mvControlling->MainCtrlPos != mvControlling->MainCtrlPosNo)||(mvControlling->ScndCtrlPos!=mvControlling->ScndCtrlPosNo)) - Vs = ESMVelocity(!scndctrl); + // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) + if (Ready || (iDrivigFlags & movePress)) { + // use series mode to build up speed, when high threshold is set for motor overload relay or if the power station is heavily burdened + auto const useseriesmodevoltage { 0.85 * mvControlling->EnginePowerSource.CollectorParameters.MaxV }; + auto const useseriesmode = ( + ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 35 : 25 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) ) + || ( mvControlling->Imax > mvControlling->ImaxLo ) + || ( fVoltage < useseriesmodevoltage ) ); - if ((fabs(mvControlling->Im) < - (fReady < 0.4 ? mvControlling->Imin : mvControlling->IminLo))||(mvControlling->Vel>Vs)) - { // Ra: wywalał nadmiarowy, bo Im może być ujemne; jak nie odhamowany, to nie - // przesadzać z prądem - if ((mvOccupied->Vel <= 30) || - (mvControlling->Imax > mvControlling->ImaxLo) || - (fVoltage + fVoltage < - mvControlling->EnginePowerSource.CollectorParameters.MinV + - mvControlling->EnginePowerSource.CollectorParameters.MaxV)) - { // bocznik na szeregowej przy ciezkich bruttach albo przy wysokim rozruchu - // pod górę albo przy niskim napięciu - if (mvControlling->MainCtrlPos ? - mvControlling->RList[mvControlling->MainCtrlPos].R > 0.0 : - true) // oporowa - { - OK = (mvControlling->DelayCtrlFlag ? - true : - mvControlling->IncMainCtrl(1)); // kręcimy nastawnik jazdy - if ((OK) && - (mvControlling->MainCtrlPos == - 1)) // czekaj na 1 pozycji, zanim się nie włączą liniowe - iDrivigFlags |= moveIncSpeed; - else - iDrivigFlags &= ~moveIncSpeed; // usunięcie flagi czekania - } - else // jeśli bezoporowa (z wyjątekiem 0) - OK = false; // to dać bocznik - } - else - { // przekroczone 30km/h, można wejść na jazdę równoległą - if (mvControlling->ScndCtrlPos) // jeśli ustawiony bocznik - if (mvControlling->MainCtrlPos < - mvControlling->MainCtrlPosNo - 1) // a nie jest ostatnia pozycja - mvControlling->DecScndCtrl(2); // to bocznik na zero po chamsku - // (ktoś miał to poprawić...) - OK = mvControlling->IncMainCtrl(1); - } - if ((mvControlling->MainCtrlPos > 2) && - (mvControlling->Im == 0)) // brak prądu na dalszych pozycjach - Need_TryAgain = true; // nie załączona lokomotywa albo wywalił - // nadmiarowy - else if (!OK) // nie da się wrzucić kolejnej pozycji - OK = mvControlling->IncScndCtrl(1); // to dać bocznik + auto const scndctrl = ( + ( mvControlling->StLinFlag ) + && ( mvControlling->RList[ mvControlling->MainCtrlActualPos ].R < 0.01 ) + && ( useseriesmode ? + mvControlling->RList[ mvControlling->MainCtrlActualPos ].Bn == 1 : + mvControlling->RList[ mvControlling->MainCtrlActualPos ].Bn > 1 ) ); + + double Vs = 99999; + if( scndctrl ? + ( mvControlling->ScndCtrlPos < mvControlling->ScndCtrlPosNo ) : + ( mvControlling->MainCtrlPos < mvControlling->MainCtrlPosNo ) ) { + Vs = ESMVelocity( !scndctrl ); + } + + if( ( std::abs( mvControlling->Im ) < ( fReady < 0.4 ? mvControlling->Imin : mvControlling->IminLo ) ) + || ( mvControlling->Vel > Vs ) ) { + // Ra: wywalał nadmiarowy, bo Im może być ujemne; jak nie odhamowany, to nie przesadzać z prądem + if( scndctrl ) { + // to dać bocznik + // engage the shuntfield only if there's sufficient power margin to draw from + OK = ( + fVoltage > useseriesmodevoltage + 0.0125 * mvControlling->EnginePowerSource.CollectorParameters.MaxV ? + mvControlling->IncScndCtrl( 1 ) : + false ); + } + else { + // jeśli ustawiony bocznik to bocznik na zero po chamsku + if( mvControlling->ScndCtrlPos ) { + mvControlling->DecScndCtrl( 2 ); + } + // kręcimy nastawnik jazdy + OK = ( + mvControlling->DelayCtrlFlag ? + true : + mvControlling->IncMainCtrl( 1 ) ); + // czekaj na 1 pozycji, zanim się nie włączą liniowe + if( true == mvControlling->StLinFlag ) { + iDrivigFlags |= moveIncSpeed; + } + else { + iDrivigFlags &= ~moveIncSpeed; + } + + if( ( mvControlling->Im == 0 ) + && ( mvControlling->MainCtrlPos > 2 ) ) { + // brak prądu na dalszych pozycjach + // nie załączona lokomotywa albo wywalił nadmiarowy + Need_TryAgain = true; + } + } } + else { + OK = false; + } } mvControlling->AutoRelayCheck(); // sprawdzenie logiki sterowania break; @@ -2976,11 +2980,8 @@ void TController::SpeedSet() break; case ElectricSeriesMotor: if( ( false == mvControlling->StLinFlag ) - && ( false == mvControlling->DelayCtrlFlag ) - && ( 0 == ( iDrivigFlags & moveIncSpeed ) ) ) // styczniki liniowe rozłączone yBARC - { - // if (iDrivigFlags&moveIncSpeed) {} //jeśli czeka na załączenie liniowych - // else + && ( false == mvControlling->DelayCtrlFlag ) ) { + // styczniki liniowe rozłączone yBARC while( DecSpeed() ) ; // zerowanie napędu } @@ -3853,6 +3854,28 @@ TController::UpdateSituation(double dt) { } } } + if( fVoltage < 0.8 * mvControlling->EnginePowerSource.CollectorParameters.MaxV ) { + // if the power station is heavily burdened try to reduce the load + switch( mvControlling->EngineType ) { + + case ElectricSeriesMotor: { + if( mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1 ) { + // limit yourself to series mode + if( mvControlling->ScndCtrlPos ) { + mvControlling->DecScndCtrl( 2 ); + } + while( ( mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1 ) + && ( mvControlling->DecMainCtrl( 1 ) ) ) { + ; // all work is performed in the header + } + } + break; + } + default: { + break; + } + } + } } else { if( ( IdleTime > 45.0 ) diff --git a/Track.h b/Track.h index 97f30815..4348d210 100644 --- a/Track.h +++ b/Track.h @@ -127,6 +127,8 @@ private: class TTrack : public scene::basic_node { friend class opengl_renderer; + // NOTE: temporary arrangement + friend class ui_layer; private: TIsolated * pIsolated = nullptr; // obwód izolowany obsługujący zajęcia/zwolnienia grupy torów diff --git a/Train.cpp b/Train.cpp index 878fe33f..c9fd1e74 100644 --- a/Train.cpp +++ b/Train.cpp @@ -6355,6 +6355,7 @@ void TTrain::clear_cab_controls() ggRadioTest.Clear(); ggDoorLeftButton.Clear(); ggDoorRightButton.Clear(); + ggTrainHeatingButton.Clear(); ggDepartureSignalButton.Clear(); ggCompressorButton.Clear(); ggConverterButton.Clear(); diff --git a/World.cpp b/World.cpp index 20f235b4..dc1b6b5a 100644 --- a/World.cpp +++ b/World.cpp @@ -237,15 +237,14 @@ void TWorld::TrainDelete(TDynamicObject *d) if (Train) if (Train->Dynamic() != d) return; // nie tego usuwać -#ifdef EU07_SCENERY_EDITOR - if( ( Train->DynamicObject ) - && ( Train->DynamicObject->Mechanik ) ) { +/* + if( ( Train->Dynamic() ) + && ( Train->Dynamic()->Mechanik ) ) { // likwidacja kabiny wymaga przejęcia przez AI - Train->DynamicObject->Mechanik->TakeControl( true ); + Train->Dynamic()->Mechanik->TakeControl( true ); } -#endif - delete Train; // i nie ma czym sterować - Train = NULL; +*/ + SafeDelete( Train ); // i nie ma czym sterować Controlled = NULL; // tego też już nie ma mvControlled = NULL; }; diff --git a/renderer.cpp b/renderer.cpp index 98ac8b80..63720686 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1806,15 +1806,6 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // tracks // TODO: update after path node refactoring Render( std::begin( cell->m_paths ), std::end( cell->m_paths ) ); -#ifdef EU07_SCENERY_EDITOR - // TODO: re-implement - // memcells - if( EditorModeFlag ) { - for( auto const memcell : Groundsubcell->m_memcells ) { - Render( memcell ); - } - } -#endif #ifdef EU07_USE_DEBUG_CULLING // debug ::glLineWidth( 2.f ); @@ -1884,16 +1875,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); Render( path ); } -#ifdef EU07_SCENERY_EDITOR - // memcells - // TODO: re-implement - if( EditorModeFlag ) { - for( auto const memcell : Groundsubcell->m_memcells ) { - ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); - Render( memcell ); - } - } -#endif + // post-render cleanup ::glPopMatrix(); @@ -1924,6 +1906,17 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator Render( dynamic ); } } + // memcells + if( ( EditorModeFlag ) + && ( DebugModeFlag ) ) { + ::glPushAttrib( GL_ENABLE_BIT ); + ::glDisable( GL_TEXTURE_2D ); + ::glColor3f( 0.36f, 0.75f, 0.35f ); + for( auto const *memorycell : cell->m_memorycells ) { + Render( memorycell ); + } + ::glPopAttrib(); + } break; } case rendermode::pickscenery: { @@ -1933,6 +1926,14 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); Render( instance ); } + // memcells + if( ( EditorModeFlag ) + && ( DebugModeFlag ) ) { + for( auto const *memorycell : cell->m_memorycells ) { + ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); + Render( memorycell ); + } + } // vehicles aren't included in scenery picking for the time being break; } @@ -2754,25 +2755,22 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, } void -opengl_renderer::Render( TMemCell *Memcell ) { +opengl_renderer::Render( TMemCell const *Memcell ) { ::glPushMatrix(); auto const position = Memcell->location() - m_renderpass.camera.position(); ::glTranslated( position.x, position.y + 0.5, position.z ); switch( m_renderpass.draw_mode ) { - case rendermode::color: { - ::glPushAttrib( GL_ENABLE_BIT ); - ::glDisable( GL_TEXTURE_2D ); - ::glColor3f( 0.36f, 0.75f, 0.35f ); - + case rendermode::color: + case rendermode::shadows: { ::gluSphere( m_quadric, 0.35, 4, 2 ); - - ::glPopAttrib(); break; } - case rendermode::shadows: case rendermode::pickscenery: { + // add the node to the pick list + m_picksceneryitems.emplace_back( Memcell ); + ::gluSphere( m_quadric, 0.35, 4, 2 ); break; } diff --git a/renderer.h b/renderer.h index c0f4ef5f..88405377 100644 --- a/renderer.h +++ b/renderer.h @@ -289,7 +289,7 @@ private: bool Render_cab( TDynamicObject const *Dynamic, bool const Alpha = false ); void - Render( TMemCell *Memcell ); + Render( TMemCell const *Memcell ); void Render_Alpha( scene::basic_region *Region ); void diff --git a/scene.cpp b/scene.cpp index 46bcd022..9b6312ec 100644 --- a/scene.cpp +++ b/scene.cpp @@ -360,6 +360,7 @@ basic_cell::insert( sound_source *Sound ) { m_active = true; m_sounds.emplace_back( Sound ); + // NOTE: sound sources are virtual 'points' hence they don't ever expand cell range } // adds provided sound instance to the cell @@ -373,6 +374,16 @@ basic_cell::insert( TEventLauncher *Launcher ) { enclose_area( Launcher ); } +// adds provided memory cell to the cell +void +basic_cell::insert( TMemCell *Memorycell ) { + + m_active = true; + + m_memorycells.emplace_back( Memorycell ); + // NOTE: memory cells are virtual 'points' hence they don't ever expand cell range +} + // registers provided path in the lookup directory of the cell void basic_cell::register_end( TTrack *Path ) { @@ -1132,7 +1143,6 @@ basic_region::insert_lines( lines_node Lines, scratch_data &Scratchpad ) { // inserts provided track in the region void basic_region::insert_path( TTrack *Path, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done auto location = Path->location(); @@ -1154,7 +1164,6 @@ basic_region::insert_path( TTrack *Path, scratch_data &Scratchpad ) { // inserts provided track in the region void basic_region::insert_traction( TTraction *Traction, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done auto location = Traction->location(); @@ -1176,7 +1185,6 @@ basic_region::insert_traction( TTraction *Traction, scratch_data &Scratchpad ) { // inserts provided instance of 3d model in the region void basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done auto location = Instance->location(); @@ -1209,7 +1217,6 @@ basic_region::insert_sound( sound_source *Sound, scratch_data &Scratchpad ) { // inserts provided event launcher in the region void basic_region::insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done auto location = Launcher->location(); @@ -1223,6 +1230,22 @@ basic_region::insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpa } } +// inserts provided memory cell in the region +void +basic_region::insert_memorycell( TMemCell *Memorycell, scratch_data &Scratchpad ) { + // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done + auto location = Memorycell->location(); + + if( point_inside( location ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + section( location ).insert( Memorycell ); + } + else { + // tracks are guaranteed to hava a name so we can skip the check + ErrorLog( "Bad scenario: memory cell \"" + Memorycell->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); + } +} + // find a vehicle located neares to specified location, within specified radius, optionally discarding vehicles without drivers std::tuple basic_region::find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) { diff --git a/scene.h b/scene.h index 9ec4a714..1e0ab86d 100644 --- a/scene.h +++ b/scene.h @@ -114,6 +114,9 @@ public: // adds provided event launcher to the cell void insert( TEventLauncher *Launcher ); + // adds provided memory cell to the cell + void + insert( TMemCell *Memorycell ); // registers provided path in the lookup directory of the cell void register_end( TTrack *Path ); @@ -152,6 +155,7 @@ private: using instance_sequence = std::vector; using sound_sequence = std::vector; using eventlauncher_sequence = std::vector; + using memorycell_sequence = std::vector; // methods void enclose_area( scene::basic_node *Node ); @@ -168,6 +172,7 @@ private: traction_sequence m_traction; sound_sequence m_sounds; eventlauncher_sequence m_eventlaunchers; + memorycell_sequence m_memorycells; // search helpers struct lookup_data { path_sequence paths; @@ -329,6 +334,9 @@ public: // inserts provided event launcher in the region void insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpad ); + // inserts provided memory cell in the region + void + insert_memorycell( TMemCell *Memorycell, scratch_data &Scratchpad ); // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); diff --git a/simulation.cpp b/simulation.cpp index ec2da2f8..39d06723 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -440,10 +440,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == simulation::Memory.insert( memorycell ) ) { ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } -/* - // TODO: implement this - simulation::Region.insert_memorycell( memorycell, Scratchpad ); -*/ + simulation::Region->insert_memorycell( memorycell, Scratchpad ); } else if( nodedata.type == "eventlauncher" ) { diff --git a/uilayer.cpp b/uilayer.cpp index 7eccd73d..f54ca2c3 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -246,6 +246,8 @@ ui_layer::update() { "" ) ); } + EditorModeFlag = ( Global.iTextMode == GLFW_KEY_F11 ); + switch( Global.iTextMode ) { case( GLFW_KEY_F1 ) : { @@ -714,7 +716,120 @@ ui_layer::update() { uitextline1 = "Node name: " + node->name() - + "; location: [" + to_string( node->location().x, 2 ) + ", " + to_string( node->location().y, 2 ) + ", " + to_string( node->location().z, 2 ) + "]"; + + "; location: [" + to_string( node->location().x, 2 ) + ", " + to_string( node->location().y, 2 ) + ", " + to_string( node->location().z, 2 ) + "]" + + " (distance: " + to_string( glm::length( glm::dvec3{ node->location().x, 0.0, node->location().z } -glm::dvec3{ Global.pCameraPosition.x, 0.0, Global.pCameraPosition.z } ), 1 ) + " m)"; + // subclass-specific data + // TBD, TODO: specialized data dump method in each node subclass, or data imports in the panel for provided subclass pointer? + if( typeid( *node ) == typeid( TAnimModel ) ) { + + auto const *subnode = static_cast( node ); + + uitextline2 = "angle: " + to_string( clamp_circular( subnode->vAngle.y, 360.0 ), 2 ) + " deg"; + uitextline2 += "; lights: "; + if( subnode->iNumLights > 0 ) { + uitextline2 += '['; + for( int lightidx = 0; lightidx < subnode->iNumLights; ++lightidx ) { + uitextline2 += to_string( subnode->lsLights[ lightidx ] ); + if( lightidx < subnode->iNumLights - 1 ) { + uitextline2 += ", "; + } + } + uitextline2 += ']'; + } + else { + uitextline2 += "none"; + } + // 3d shape + auto modelfile { ( + subnode->pModel ? + subnode->pModel->NameGet() : + "none" ) }; + if( modelfile.find( szModelPath ) == 0 ) { + // don't include 'models/' in the path + modelfile.erase( 0, std::string{ szModelPath }.size() ); + } + // texture + auto texturefile { ( + subnode->Material()->replacable_skins[ 1 ] != null_handle ? + GfxRenderer.Material( subnode->Material()->replacable_skins[ 1 ] ).name : + "none" ) }; + if( texturefile.find( szTexturePath ) == 0 ) { + // don't include 'textures/' in the path + texturefile.erase( 0, std::string{ szTexturePath }.size() ); + } + uitextline3 = "mesh: " + modelfile; + uitextline4 = "skin: " + texturefile; + } + else if( typeid( *node ) == typeid( TTrack ) ) { + + auto const *subnode = static_cast( node ); + // basic attributes + uitextline2 = + "isolated: " + ( subnode->pIsolated ? subnode->pIsolated->asName : "none" ) + + "; velocity: " + to_string( subnode->SwitchExtension ? subnode->SwitchExtension->fVelocity : subnode->fVelocity ) + + "; width: " + to_string( subnode->fTrackWidth ) + " m" + + "; friction: " + to_string( subnode->fFriction, 2 ) + + "; quality: " + to_string( subnode->iQualityFlag ); + // textures + auto texturefile { ( + subnode->m_material1 != null_handle ? + GfxRenderer.Material( subnode->m_material1 ).name : + "none" ) }; + if( texturefile.find( szTexturePath ) == 0 ) { + texturefile.erase( 0, std::string{ szTexturePath }.size() ); + } + auto texturefile2{ ( + subnode->m_material2 != null_handle ? + GfxRenderer.Material( subnode->m_material2 ).name : + "none" ) }; + if( texturefile2.find( szTexturePath ) == 0 ) { + texturefile2.erase( 0, std::string{ szTexturePath }.size() ); + } + uitextline2 += "; skins: [" + texturefile + ", " + texturefile2 + "]"; + // paths + uitextline3 = "paths: "; + for( auto const &path : subnode->m_paths ) { + uitextline3 += + "[" + + to_string( path.points[ segment_data::point::start ].x, 3 ) + ", " + + to_string( path.points[ segment_data::point::start ].y, 3 ) + ", " + + to_string( path.points[ segment_data::point::start ].z, 3 ) + "]->" + + "[" + + to_string( path.points[ segment_data::point::end ].x, 3 ) + ", " + + to_string( path.points[ segment_data::point::end ].y, 3 ) + ", " + + to_string( path.points[ segment_data::point::end ].z, 3 ) + "] "; + } + // events + std::vector< std::pair< std::string, TTrack::event_sequence const * > > const eventsequences { + { "ev0", &subnode->m_events0 }, { "ev0all", &subnode->m_events0all }, + { "ev1", &subnode->m_events1 }, { "ev1all", &subnode->m_events1all }, + { "ev2", &subnode->m_events2 }, { "ev2all", &subnode->m_events2all } }; + + for( auto const &eventsequence : eventsequences ) { + if( eventsequence.second->empty() ) { continue; } + uitextline4 += eventsequence.first + ": ["; + for( auto const &event : *( eventsequence.second ) ) { + if( uitextline4.back() != '[' ) { + uitextline4 += ", "; + } + if( event.second ) { + uitextline4 += event.second->asName; + } + } + uitextline4 += "] "; + } + + } + else if( typeid( *node ) == typeid( TMemCell ) ) { + + auto const *subnode = static_cast( node ); + + uitextline2 = + "data: [" + subnode->Text() + "]" + + " [" + to_string( subnode->Value1(), 2 ) + "]" + + " [" + to_string( subnode->Value2(), 2 ) + "]"; + uitextline3 = "track: " + ( subnode->asTrackName.empty() ? "none" : subnode->asTrackName ); + } break; } diff --git a/version.h b/version.h index be52643b..de5c235e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 622 +#define VERSION_MINOR 626 #define VERSION_REVISION 0 From 5dfbd5b0f7ecc93359e9f1e4a2a15e6295003172 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 28 Jun 2018 17:48:05 +0200 Subject: [PATCH 353/426] build 180628. ai power use logic tweaks, minor bug fixes --- Driver.cpp | 16 +++++++++----- McZapkie/Mover.cpp | 54 ++++++++++++++++++++++++---------------------- Segment.cpp | 12 +++-------- Segment.h | 5 ++--- Train.cpp | 7 ++++++ version.h | 2 +- 6 files changed, 52 insertions(+), 44 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 81199126..70e5a3a5 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2734,19 +2734,25 @@ bool TController::IncSpeed() (mvControlling->StLinFlag)) // youBy polecił dodać 2012-09-08 v367 // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) if (Ready || (iDrivigFlags & movePress)) { - // use series mode to build up speed, when high threshold is set for motor overload relay or if the power station is heavily burdened - auto const useseriesmodevoltage { 0.85 * mvControlling->EnginePowerSource.CollectorParameters.MaxV }; + // use series mode: + // to build up speed to 30/40 km/h for passenger/cargo train, + // if high threshold is set for motor overload relay, + // if the power station is heavily burdened + auto const useseriesmodevoltage { 0.80 * mvControlling->EnginePowerSource.CollectorParameters.MaxV }; auto const useseriesmode = ( ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 35 : 25 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) ) || ( mvControlling->Imax > mvControlling->ImaxLo ) || ( fVoltage < useseriesmodevoltage ) ); - + // when not in series mode use the first available parallel mode configuration until 50/60 km/h for passenger/cargo train + // (if there's only one parallel mode configuration it'll be used regardless of current speed) auto const scndctrl = ( ( mvControlling->StLinFlag ) && ( mvControlling->RList[ mvControlling->MainCtrlActualPos ].R < 0.01 ) && ( useseriesmode ? mvControlling->RList[ mvControlling->MainCtrlActualPos ].Bn == 1 : - mvControlling->RList[ mvControlling->MainCtrlActualPos ].Bn > 1 ) ); + ( ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 55 : 45 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) ) ? + mvControlling->RList[ mvControlling->MainCtrlActualPos ].Bn > 1 : + mvControlling->MainCtrlPos == mvControlling->MainCtrlPosNo ) ) ); double Vs = 99999; if( scndctrl ? @@ -3854,7 +3860,7 @@ TController::UpdateSituation(double dt) { } } } - if( fVoltage < 0.8 * mvControlling->EnginePowerSource.CollectorParameters.MaxV ) { + if( fVoltage < 0.75 * mvControlling->EnginePowerSource.CollectorParameters.MaxV ) { // if the power station is heavily burdened try to reduce the load switch( mvControlling->EngineType ) { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index a313e7d5..2c3f7b7b 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1151,40 +1151,42 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap hvc = Couplers[ side::front ].power_high.voltage + Couplers[ side::rear ].power_high.voltage; #endif - if( ( std::abs( PantFrontVolt ) + std::abs( PantRearVolt ) < 1.0 ) - && ( hvc > 1.0 ) ) { - // bez napiecia, ale jest cos na sprzegach: - // przekazywanie pradow - for( int side = 0; side < 2; ++side ) { + if( std::abs( PantFrontVolt ) + std::abs( PantRearVolt ) < 1.0 ) { + // bez napiecia... + if( hvc != 0.0 ) { + // ...ale jest cos na sprzegach: + // przekazywanie pradow + for( int side = 0; side < 2; ++side ) { - Couplers[ side ].power_high.local = false; // power, if any, will be from external source + Couplers[ side ].power_high.local = false; // power, if any, will be from external source - if( ( Couplers[ side ].CouplingFlag & ctrain_power ) - || ( ( Heating ) - && ( Couplers[ side ].CouplingFlag & ctrain_heating ) ) ) { + if( ( Couplers[ side ].CouplingFlag & ctrain_power ) + || ( ( Heating ) + && ( Couplers[ side ].CouplingFlag & ctrain_heating ) ) ) { #ifdef EU07_USE_OLD_HVCOUPLERS - auto const oppositeside = ( Couplers[side].ConnectedNr == side::front ? side::rear : side::front ); - HVCouplers[ side ][ hvcoupler::current ] = - Couplers[side].Connected->HVCouplers[oppositeside][hvcoupler::current] + - Itot * HVCouplers[side][hvcoupler::voltage] / hvc; // obciążenie rozkladane stosownie do napiec + auto const oppositeside = ( Couplers[side].ConnectedNr == side::front ? side::rear : side::front ); + HVCouplers[ side ][ hvcoupler::current ] = + Couplers[side].Connected->HVCouplers[oppositeside][hvcoupler::current] + + Itot * HVCouplers[side][hvcoupler::voltage] / hvc; // obciążenie rozkladane stosownie do napiec #else - auto const &connectedsothercoupler = - Couplers[ side ].Connected->Couplers[ - ( Couplers[ side ].ConnectedNr == side::front ? - side::rear : - side::front ) ]; - Couplers[ side ].power_high.current = - connectedsothercoupler.power_high.current - + Itot * Couplers[ side ].power_high.voltage / hvc; // obciążenie rozkladane stosownie do napiec + auto const &connectedsothercoupler = + Couplers[ side ].Connected->Couplers[ + ( Couplers[ side ].ConnectedNr == side::front ? + side::rear : + side::front ) ]; + Couplers[ side ].power_high.current = + connectedsothercoupler.power_high.current + + Itot * Couplers[ side ].power_high.voltage / hvc; // obciążenie rozkladane stosownie do napiec #endif - } - else { + } + else { #ifdef EU07_USE_OLD_HVCOUPLERS - // pierwszy pojazd - HVCouplers[side][hvcoupler::current] = Itot * HVCouplers[side][hvcoupler::voltage] / hvc; + // pierwszy pojazd + HVCouplers[side][hvcoupler::current] = Itot * HVCouplers[side][hvcoupler::voltage] / hvc; #else - Couplers[ side ].power_high.current = Itot * Couplers[ side ].power_high.voltage / hvc; + Couplers[ side ].power_high.current = Itot * Couplers[ side ].power_high.voltage / hvc; #endif + } } } } diff --git a/Segment.cpp b/Segment.cpp index 91999747..fff1b605 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -53,11 +53,6 @@ TSegment::TSegment(TTrack *owner) : pOwner( owner ) {} -TSegment::~TSegment() -{ - SafeDeleteArray(fTsBuffer); -} - bool TSegment::Init(Math3D::vector3 NewPoint1, Math3D::vector3 NewPoint2, double fNewStep, double fNewRoll1, double fNewRoll2) { // wersja dla prostego - wyliczanie punktów kontrolnych Math3D::vector3 dir; @@ -157,8 +152,7 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M */ fStep = fLength / iSegCount; // update step to equalize size of individual pieces - SafeDeleteArray( fTsBuffer ); - fTsBuffer = new double[ iSegCount + 1 ]; + fTsBuffer.resize( iSegCount + 1 ); fTsBuffer[ 0 ] = 0.0; for( int i = 1; i < iSegCount; ++i ) { fTsBuffer[ i ] = GetTFromS( i * fStep ); @@ -230,7 +224,7 @@ double TSegment::GetTFromS(double const s) const do { double fDifference = RombergIntegral(0, fTime) - s; - if( ( fDifference > 0 ? fDifference : -fDifference ) < fTolerance ) { + if( std::abs( fDifference ) < fTolerance ) { return fTime; } @@ -403,7 +397,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori // podany jest przekrój końcowy // podsypka toru jest robiona za pomocą 6 punktów, szyna 12, drogi i rzeki na 3+2+3 - if( !fTsBuffer ) + if( fTsBuffer.empty() ) return false; // prowizoryczne zabezpieczenie przed wysypem - ustalić faktyczną przyczynę glm::vec3 pos1, pos2, dir, parallel1, parallel2, pt, norm; diff --git a/Segment.h b/Segment.h index c2adc3a6..538f3a33 100644 --- a/Segment.h +++ b/Segment.h @@ -40,7 +40,7 @@ class TSegment fRoll1 { 0.f }, fRoll2 { 0.f }; // przechyłka na końcach double fLength { -1.0 }; // długość policzona - double *fTsBuffer = nullptr; // wartości parametru krzywej dla równych odcinków + std::vector fTsBuffer; // wartości parametru krzywej dla równych odcinków double fStep = 0.0; int iSegCount = 0; // ilość odcinków do rysowania krzywej double fDirection = 0.0; // Ra: kąt prostego w planie; dla łuku kąt od Point1 @@ -63,7 +63,6 @@ public: bool bCurve = false; TSegment(TTrack *owner); - ~TSegment(); bool Init( Math3D::vector3 NewPoint1, Math3D::vector3 NewPoint2, double fNewStep, double fNewRoll1 = 0, double fNewRoll2 = 0); bool @@ -125,7 +124,7 @@ public: inline int RaSegCount() const { - return fTsBuffer ? iSegCount : 1; }; + return ( fTsBuffer.empty() ? 1 : iSegCount ); }; }; //--------------------------------------------------------------------------- diff --git a/Train.cpp b/Train.cpp index c9fd1e74..66cb28fc 100644 --- a/Train.cpp +++ b/Train.cpp @@ -6343,6 +6343,7 @@ void TTrain::clear_cab_controls() // hunter-091012 ggCabLightButton.Clear(); ggCabLightDimButton.Clear(); + ggBatteryButton.Clear(); //------- ggFuseButton.Clear(); ggConverterFuseButton.Clear(); @@ -6356,9 +6357,15 @@ void TTrain::clear_cab_controls() ggDoorLeftButton.Clear(); ggDoorRightButton.Clear(); ggTrainHeatingButton.Clear(); + ggSignallingButton.Clear(); + ggDoorSignallingButton.Clear(); ggDepartureSignalButton.Clear(); ggCompressorButton.Clear(); + ggCompressorLocalButton.Clear(); ggConverterButton.Clear(); + ggConverterOffButton.Clear(); + ggConverterLocalButton.Clear(); + ggMainButton.Clear(); ggPantFrontButton.Clear(); ggPantRearButton.Clear(); ggPantSelectedButton.Clear(); diff --git a/version.h b/version.h index de5c235e..21bb6f0b 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 626 +#define VERSION_MINOR 628 #define VERSION_REVISION 0 From 293787c1b4d9fa590c81f0aed886e47314bc2f58 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 30 Jun 2018 19:00:35 +0200 Subject: [PATCH 354/426] build 180629. instanced model light mode 4, ai connect mode tweaks, minor bug fixes --- AnimModel.cpp | 75 +++++++++++++++++++++++++-------------------------- AnimModel.h | 6 ++--- Driver.cpp | 40 +++++++++++++++++---------- DynObj.cpp | 1 - audio.cpp | 43 ++++++++++++++--------------- version.h | 2 +- 6 files changed, 88 insertions(+), 79 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index d364815b..d1917a75 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -566,20 +566,42 @@ void TAnimModel::RaPrepare() for (int i = 0; i < iNumLights; ++i) { auto const lightmode { static_cast( lsLights[ i ] ) }; - switch (lightmode) - { - case ls_Blink: // migotanie - state = ( fBlinkTimer < fOnTime ); - break; - case ls_Dark: // zapalone, gdy ciemno - state = ( - Global.fLuminance <= ( - lsLights[i] == 3.f ? - DefaultDarkThresholdLevel : - ( lsLights[i] - 3.f ) ) ); - break; - default: // zapalony albo zgaszony - state = (lightmode == ls_On); + switch( lightmode ) { + case ls_On: + case ls_Off: { + // zapalony albo zgaszony + state = ( lightmode == ls_On ); + break; + } + case ls_Blink: { + // migotanie + state = ( fBlinkTimer < fOnTime ); + break; + } + case ls_Dark: { + // zapalone, gdy ciemno + state = ( + Global.fLuminance <= ( + lsLights[ i ] == static_cast( ls_Dark ) ? + DefaultDarkThresholdLevel : + ( lsLights[ i ] - static_cast( ls_Dark ) ) ) ); + break; + } + case ls_Home: { + // like ls_dark but off late at night + auto const simulationhour { simulation::Time.data().wHour }; + state = ( + Global.fLuminance <= ( + lsLights[ i ] == static_cast( ls_Home ) ? + DefaultDarkThresholdLevel : + ( lsLights[ i ] - static_cast( ls_Home ) ) ) ); + // force the lights off between 1-5am + state = state && (( simulationhour < 1 ) || ( simulationhour >= 5 )); + break; + } + default: { + break; + } } if (LightsOn[i]) LightsOn[i]->iVisible = state; @@ -756,31 +778,6 @@ void TAnimModel::LightSet(int const n, float const v) if (n >= iMaxNumLights) return; // przekroczony zakres lsLights[ n ] = v; - switch( static_cast( lsLights[ n ] ) ) { - // interpretacja ułamka zależnie od typu - case ls_Off: { - // ustalenie czasu migotania, t<1s (f>1Hz), np. 0.1 => t=0.1 (f=10Hz) - break; - } - case ls_On: { - // ustalenie wypełnienia ułamkiem, np. 1.25 => zapalony przez 1/4 okresu - break; - } - case ls_Blink: { - // ustalenie częstotliwości migotania, f<1Hz (t>1s), np. 2.2 => f=0.2Hz (t=5s) - break; - } - case ls_Dark: { - // zapalenie świateł zależne od oświetlenia scenerii -/* - if( v == 3.f ) { - // standardowy próg zaplania - lsLights[ n ] = 3.f + DefaultDarkThresholdLevel; - } -*/ - break; - } - } }; void TAnimModel::AnimUpdate(double dt) diff --git a/AnimModel.h b/AnimModel.h index b6ec7055..e901f1c5 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -25,12 +25,12 @@ const int iMaxNumLights = 8; float const DefaultDarkThresholdLevel { 0.325f }; // typy stanu świateł -enum TLightState -{ +enum TLightState { ls_Off = 0, // zgaszone ls_On = 1, // zapalone ls_Blink = 2, // migające - ls_Dark = 3 // Ra: zapalajce się automatycznie, gdy zrobi się ciemno + ls_Dark = 3, // Ra: zapalajce się automatycznie, gdy zrobi się ciemno + ls_Home = 4 // like ls_dark but off late at night }; class TAnimVocaloidFrame diff --git a/Driver.cpp b/Driver.cpp index 70e5a3a5..3ec513f1 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1991,7 +1991,6 @@ bool TController::CheckVehicles(TOrders user) } d = p->DirectionSet(d ? 1 : -1); // zwraca położenie następnego (1=zgodny,0=odwrócony - // względem czoła składu) - p->fScanDist = 300.0; // odległość skanowania w poszukiwaniu innych pojazdów p->ctOwner = this; // dominator oznacza swoje terytorium p = p->Next(); // pojazd podłączony od tyłu (licząc od czoła) } @@ -2006,13 +2005,22 @@ bool TController::CheckVehicles(TOrders user) } else if (OrderCurrentGet() & (Shunt | Connect)) { - Lights( - light::headlight_right, - ( pVehicles[ 1 ]->MoverParameters->CabNo ) ? - 1 : - 0 ); //światła manewrowe (Tb1) na pojeździe z napędem - if (OrderCurrentGet() & Connect) // jeśli łączenie, skanować dalej - pVehicles[0]->fScanDist = 5000.0; // odległość skanowania w poszukiwaniu innych pojazdów + // HACK: the 'front' and 'rear' of the consist is determined by current consist direction + // since direction shouldn't affect Tb1 light configuration, we 'counter' this behaviour by virtually swapping end vehicles + if( mvOccupied->ActiveDir > 0 ) { + Lights( + light::headlight_right, + ( pVehicles[ 1 ]->MoverParameters->CabNo != 0 ? + light::headlight_left : + 0 ) ); //światła manewrowe (Tb1) na pojeździe z napędem + } + else { + Lights( + ( pVehicles[ 1 ]->MoverParameters->CabNo != 0 ? + light::headlight_left : + 0 ), + light::headlight_right ); //światła manewrowe (Tb1) na pojeździe z napędem + } } else if( OrderCurrentGet() == Disconnect ) { if( mvOccupied->ActiveDir > 0 ) { @@ -2747,11 +2755,11 @@ bool TController::IncSpeed() // (if there's only one parallel mode configuration it'll be used regardless of current speed) auto const scndctrl = ( ( mvControlling->StLinFlag ) - && ( mvControlling->RList[ mvControlling->MainCtrlActualPos ].R < 0.01 ) + && ( mvControlling->RList[ mvControlling->MainCtrlPos ].R < 0.01 ) && ( useseriesmode ? - mvControlling->RList[ mvControlling->MainCtrlActualPos ].Bn == 1 : + mvControlling->RList[ mvControlling->MainCtrlPos ].Bn == 1 : ( ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 55 : 45 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) ) ? - mvControlling->RList[ mvControlling->MainCtrlActualPos ].Bn > 1 : + mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1 : mvControlling->MainCtrlPos == mvControlling->MainCtrlPosNo ) ) ); double Vs = 99999; @@ -4610,7 +4618,7 @@ TController::UpdateSituation(double dt) { { // jeśli tamten porusza się z niewielką prędkością albo stoi if( OrderCurrentGet() & Connect ) { // jeśli spinanie, to jechać dalej - AccPreferred = std::min( 0.25, AccPreferred ); // nie hamuj + AccPreferred = std::min( 0.35, AccPreferred ); // nie hamuj VelDesired = min_speed( VelDesired, @@ -4662,7 +4670,7 @@ TController::UpdateSituation(double dt) { VelDesired = min_speed( VelDesired, - ( vehicle->fTrackBlock > 150.0 ? + ( vehicle->fTrackBlock > 100.0 ? 20.0 : 4.0 ) ); } @@ -4833,7 +4841,11 @@ TController::UpdateSituation(double dt) { } else { // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) - if( ( std::max( 100.0, fMaxProximityDist ) + fBrakeDist * braking_distance_multiplier( VelNext ) ) >= ( ActualProximityDist - fMaxProximityDist ) ) { + auto const slowdowndistance { ( + ( OrderCurrentGet() & Connect ) == 0 ? + 100.0 : + 25.0 ) }; + if( ( std::max( slowdowndistance, fMaxProximityDist ) + fBrakeDist * braking_distance_multiplier( VelNext ) ) >= ( ActualProximityDist - fMaxProximityDist ) ) { // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); diff --git a/DynObj.cpp b/DynObj.cpp index ffb1401c..74d93abc 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1743,7 +1743,6 @@ TDynamicObject::TDynamicObject() { smBrakeSet = NULL; // nastawa hamulca (wajcha) smLoadSet = NULL; // nastawa ładunku (wajcha) smWiper = NULL; // wycieraczka (poniekąd też wajcha) - fScanDist = 300.0; // odległość skanowania, zwiększana w trybie łączenia ctOwner = NULL; // na początek niczyj iOverheadMask = 0; // maska przydzielana przez AI pojazdom posiadającym // pantograf, aby wymuszały diff --git a/audio.cpp b/audio.cpp index 3ade7513..2ee32d26 100644 --- a/audio.cpp +++ b/audio.cpp @@ -29,27 +29,7 @@ openal_buffer::openal_buffer( std::string const &Filename ) : ::alGenBuffers( 1, &id ); // fetch audio data - if( Filename.substr( Filename.rfind( '.' ) ) == ".ogg" ) { - // vorbis .ogg audio data file - // TBD, TODO: customized vorbis_decode to avoid unnecessary shuffling around of the decoded data - int channels, samplerate; - std::int16_t *filedata { nullptr }; - auto const samplecount{ stb_vorbis_decode_filename( Filename.c_str(), &channels, &samplerate, &filedata ) }; - if( samplecount > 0 ) { - rate = samplerate; - data.resize( samplecount ); - std::copy( filedata, filedata + samplecount, std::begin( data ) ); - free( filedata ); - if( channels > 1 ) { - narrow_to_mono( channels ); - data.resize( samplecount / channels ); - } - } - else { - ErrorLog( "Bad file: failed do load audio file \"" + Filename + "\"", logtype::file ); - } - } - else if( Filename.substr( Filename.rfind( '.' ) ) == ".wav" ) { + if( Filename.substr( Filename.rfind( '.' ) ) == ".wav" ) { // .wav audio data file auto *file { drwav_open_file( Filename.c_str() ) }; if( file != nullptr ) { @@ -93,6 +73,27 @@ openal_buffer::openal_buffer( std::string const &Filename ) : // we're done with the disk data drflac_close( file ); } + else if( Filename.substr( Filename.rfind( '.' ) ) == ".ogg" ) { + // vorbis .ogg audio data file + // TBD, TODO: customized vorbis_decode to avoid unnecessary shuffling around of the decoded data + int channels, samplerate; + std::int16_t *filedata { nullptr }; + auto const samplecount{ stb_vorbis_decode_filename( Filename.c_str(), &channels, &samplerate, &filedata ) }; + if( samplecount > 0 ) { + rate = samplerate; + data.resize( samplecount ); + std::copy( filedata, filedata + samplecount, std::begin( data ) ); + free( filedata ); + if( channels > 1 ) { + narrow_to_mono( channels ); + data.resize( samplecount / channels ); + } + } + else { + ErrorLog( "Bad file: failed do load audio file \"" + Filename + "\"", logtype::file ); + } + } + if( false == data.empty() ) { // send the data to openal side ::alBufferData( id, AL_FORMAT_MONO16, data.data(), data.size() * sizeof( std::int16_t ), rate ); diff --git a/version.h b/version.h index 21bb6f0b..995460b1 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 628 +#define VERSION_MINOR 629 #define VERSION_REVISION 0 From ff1a85fe5d450c352882733493c8f82d1a73b88e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 8 Jul 2018 23:18:27 +0200 Subject: [PATCH 355/426] build 180708. model instance position and rotation adjustment in scenery editor, support for event launcher activation with mouse click, minor refactoring --- AnimModel.cpp | 6 +- AnimModel.h | 13 +++- Camera.cpp | 6 -- Camera.h | 1 - EU07.cpp | 21 ++--- EvLaunch.cpp | 53 +++++++------ EvLaunch.h | 1 + Event.cpp | 2 +- Segment.cpp | 17 +---- Segment.h | 2 +- Track.cpp | 4 +- Track.h | 17 +---- Traction.cpp | 11 --- maszyna.vcxproj.filters | 9 +++ mouseinput.cpp | 140 +++++++++++++++------------------- mouseinput.h | 6 +- renderer.cpp | 60 +++++++++++---- renderer.h | 24 +++--- scene.cpp | 106 +++++++++++++++++++++++--- scene.h | 28 ++++++- sceneeditor.cpp | 165 ++++++++++++++++++++++++++++++++++++++++ sceneeditor.h | 73 ++++++++++++++++++ scenenode.cpp | 14 ++-- scenenode.h | 8 +- simulation.cpp | 14 ++-- uilayer.cpp | 17 +++-- utilities.cpp | 17 ++++- utilities.h | 4 + version.h | 2 +- 29 files changed, 602 insertions(+), 239 deletions(-) create mode 100644 sceneeditor.cpp create mode 100644 sceneeditor.h diff --git a/AnimModel.cpp b/AnimModel.cpp index d1917a75..4676c08a 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -419,7 +419,7 @@ TAnimModel::TAnimModel( scene::node_data const &Nodedata ) : basic_node( Nodedat TAnimModel::~TAnimModel() { - delete pAdvanced; // nie ma zaawansowanej animacji + SafeDelete(pAdvanced); // nie ma zaawansowanej animacji SafeDelete(pRoot); } @@ -630,10 +630,6 @@ int TAnimModel::Flags() //--------------------------------------------------------------------------- -bool TAnimModel::TerrainLoaded() -{ // zliczanie kwadratów kilometrowych (główna linia po Next) do tworznia tablicy - return (this ? pModel != NULL : false); -}; int TAnimModel::TerrainCount() { // zliczanie kwadratów kilometrowych (główna linia po Next) do tworznia tablicy return pModel ? pModel->TerrainCount() : 0; diff --git a/AnimModel.h b/AnimModel.h index e901f1c5..fb109893 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -138,11 +138,8 @@ public: bool Load(cParser *parser, bool ter = false); TAnimContainer * AddContainer(std::string const &Name); TAnimContainer * GetContainer(std::string const &Name = ""); - void RaAnglesSet( glm::vec3 Angles ) { - vAngle = { Angles }; }; void LightSet( int const n, float const v ); void AnimationVND( void *pData, double a, double b, double c, double d ); - bool TerrainLoaded(); int TerrainCount(); TSubModel * TerrainSquare(int n); int Flags(); @@ -154,6 +151,14 @@ public: TModel3d * Model() const { return pModel; } + inline + void + Angles( glm::vec3 const &Angles ) { + vAngle = Angles; } + inline + glm::vec3 + Angles() const { + return vAngle; } // members static TAnimContainer *acAnimList; // lista animacji z eventem, które muszą być przeliczane również bez wyświetlania @@ -178,7 +183,7 @@ private: int iNumLights { 0 }; TSubModel *LightsOn[ iMaxNumLights ]; // Ra: te wskaźniki powinny być w ramach TModel3d TSubModel *LightsOff[ iMaxNumLights ]; - Math3D::vector3 vAngle; // bazowe obroty egzemplarza względem osi + glm::vec3 vAngle; // bazowe obroty egzemplarza względem osi material_data m_materialdata; std::string asText; // tekst dla wyświetlacza znakowego diff --git a/Camera.cpp b/Camera.cpp index b58901f7..6e4f51ed 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -237,9 +237,3 @@ void TCamera::RaLook() m_rotationoffsets.x = 0.0; } }; - -void TCamera::Stop() -{ // wyłącznie bezwładnego ruchu po powrocie do kabiny - Type = tp_Follow; - Velocity = Math3D::vector3(0, 0, 0); -}; diff --git a/Camera.h b/Camera.h index 9a70d438..3ac8b33b 100644 --- a/Camera.h +++ b/Camera.h @@ -31,7 +31,6 @@ class TCamera { Math3D::vector3 GetDirection(); bool SetMatrix(glm::dmat4 &Matrix); void RaLook(); - void Stop(); TCameraType Type; double Pitch; diff --git a/EU07.cpp b/EU07.cpp index ff276ba6..281a8b38 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -22,6 +22,7 @@ Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others #include "World.h" #include "simulation.h" +#include "sceneeditor.h" #include "Globals.h" #include "timer.h" #include "Logs.h" @@ -127,23 +128,25 @@ void window_resize_callback(GLFWwindow *window, int w, int h) void cursor_pos_callback(GLFWwindow *window, double x, double y) { - input::Mouse.move( x, y ); - - if( true == Global.ControlPicking ) { - glfwSetCursorPos( window, x, y ); - } - else { + if( false == Global.ControlPicking ) { glfwSetCursorPos( window, 0, 0 ); } + + // give the potential event recipient a shot at it, in the virtual z order + if( true == scene::Editor.on_mouse_move( x, y ) ) { return; } + input::Mouse.move( x, y ); } void mouse_button_callback( GLFWwindow* window, int button, int action, int mods ) { - if( ( button == GLFW_MOUSE_BUTTON_LEFT ) - || ( button == GLFW_MOUSE_BUTTON_RIGHT ) ) { + if( ( button != GLFW_MOUSE_BUTTON_LEFT ) + && ( button != GLFW_MOUSE_BUTTON_RIGHT ) ) { // we don't care about other mouse buttons at the moment - input::Mouse.button( button, action ); + return; } + // give the potential event recipient a shot at it, in the virtual z order + if( true == scene::Editor.on_mouse_button( button, action ) ) { return; } + input::Mouse.button( button, action ); } void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) { diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 999925d2..c9bf882f 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -135,10 +135,11 @@ bool TEventLauncher::Load(cParser *parser) return true; } -bool TEventLauncher::check_conditions() -{ //"renderowanie" wyzwalacza +bool TEventLauncher::check_activation() { + auto bCond { false }; - if (iKey != 0) { + + if( iKey != 0 ) { if( iKey > 255 ) { // key and modifier auto const modifier = ( iKey & 0xff00 ) >> 8; @@ -151,37 +152,45 @@ bool TEventLauncher::check_conditions() bCond = ( Console::Pressed( iKey & 0xff ) ); // czy klawisz wciśnięty } } - if (DeltaTime > 0) - { - if (UpdatedTime > DeltaTime) - { + if( DeltaTime > 0 ) { + if( UpdatedTime > DeltaTime ) { UpdatedTime = 0; // naliczanie od nowa bCond = true; } - else - UpdatedTime += Timer::GetDeltaTime(); // aktualizacja naliczania czasu + else { + // aktualizacja naliczania czasu + UpdatedTime += Timer::GetDeltaTime(); + } } - else - { // jeśli nie cykliczny, to sprawdzić czas - if (simulation::Time.data().wHour == iHour) - { - if (simulation::Time.data().wMinute == iMinute) - { // zgodność czasu uruchomienia - if (UpdatedTime < 10) - { + else { + // jeśli nie cykliczny, to sprawdzić czas + if( simulation::Time.data().wHour == iHour ) { + if( simulation::Time.data().wMinute == iMinute ) { + // zgodność czasu uruchomienia + if( UpdatedTime < 10 ) { UpdatedTime = 20; // czas do kolejnego wyzwolenia? bCond = true; } } } - else + else { UpdatedTime = 1; + } } - if (bCond) // jeśli spełniony został warunek - { - if ((iCheckMask != 0) && MemCell) // sprawdzanie warunku na komórce pamięci - bCond = MemCell->Compare(szText, fVal1, fVal2, iCheckMask); + + return bCond; +} + +bool TEventLauncher::check_conditions() { + + auto bCond { true }; + + if( ( iCheckMask != 0 ) + && ( MemCell != nullptr ) ) { + // sprawdzanie warunku na komórce pamięci + bCond = MemCell->Compare( szText, fVal1, fVal2, iCheckMask ); } + return bCond; // sprawdzanie dRadius w Ground.cpp } diff --git a/EvLaunch.h b/EvLaunch.h index 83487d50..f545ca57 100644 --- a/EvLaunch.h +++ b/EvLaunch.h @@ -24,6 +24,7 @@ public: // methods bool Load( cParser *parser ); + bool check_activation(); // checks conditions associated with the event. returns: true if the conditions are met bool check_conditions(); bool IsGlobal() const; diff --git a/Event.cpp b/Event.cpp index d4e76a93..c6a0cecc 100644 --- a/Event.cpp +++ b/Event.cpp @@ -894,7 +894,7 @@ event_manager::update() { // test list of global events for possible new additions to the queue for( auto *launcher : m_launcherqueue ) { - if( true == launcher->check_conditions() ) { + if( true == ( launcher->check_activation() && launcher->check_conditions() ) ) { // NOTE: we're presuming global events aren't going to use event2 WriteLog( "Eventlauncher " + launcher->name() ); if( launcher->Event1 ) { diff --git a/Segment.cpp b/Segment.cpp index fff1b605..5d117c14 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -18,23 +18,8 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- -// helper, restores content of a 3d vector from provided input stream -// TODO: review and clean up the helper routines, there's likely some redundant ones -Math3D::vector3 LoadPoint( cParser &Input ) { - // pobranie współrzędnych punktu - Input.getTokens( 3 ); - Math3D::vector3 point; - Input - >> point.x - >> point.y - >> point.z; - - return point; -} - - void -segment_data::deserialize( cParser &Input, Math3D::vector3 const &Offset ) { +segment_data::deserialize( cParser &Input, glm::dvec3 const &Offset ) { points[ segment_data::point::start ] = LoadPoint( Input ) + Offset; Input.getTokens(); diff --git a/Segment.h b/Segment.h index 538f3a33..9410a2f7 100644 --- a/Segment.h +++ b/Segment.h @@ -29,7 +29,7 @@ struct segment_data { // constructors segment_data() = default; // methods - void deserialize( cParser &Input, Math3D::vector3 const &Offset ); + void deserialize( cParser &Input, glm::dvec3 const &Offset ); }; class TSegment diff --git a/Track.cpp b/Track.cpp index a1404217..fc2b4347 100644 --- a/Track.cpp +++ b/Track.cpp @@ -343,7 +343,7 @@ void TTrack::ConnectNextNext(TTrack *pTrack, int typ) } } -void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) +void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) { // pobranie obiektu trajektorii ruchu Math3D::vector3 pt, vec, p1, p2, cp1, cp2, p3, p4, cp3, cp4; // dodatkowe punkty potrzebne do skrzyżowań double a1, a2, r1, r2, r3, r4; @@ -862,7 +862,7 @@ void TTrack::Load(cParser *parser, Math3D::vector3 pOrigin) } // calculate path location - m_area.center = ( glm::dvec3{ ( + location( { ( CurrentSegment()->FastGetPoint_0() + CurrentSegment()->FastGetPoint( 0.5 ) + CurrentSegment()->FastGetPoint_1() ) diff --git a/Track.h b/Track.h index 4348d210..0f54aa4b 100644 --- a/Track.h +++ b/Track.h @@ -170,20 +170,7 @@ public: m_events1, m_events2; bool m_events { false }; // Ra: flaga informująca o obecności eventów -/* - TEvent *evEventall0 = nullptr; // McZapkie-140302: wyzwalany gdy pojazd stoi - TEvent *evEventall1 = nullptr; - TEvent *evEventall2 = nullptr; - TEvent *evEvent0 = nullptr; // McZapkie-280503: wyzwalany tylko gdy headdriver - TEvent *evEvent1 = nullptr; - TEvent *evEvent2 = nullptr; - std::string asEventall0Name; // nazwy eventów - std::string asEventall1Name; - std::string asEventall2Name; - std::string asEvent0Name; - std::string asEvent1Name; - std::string asEvent2Name; -*/ + int iNextDirection = 0; // 0:Point1, 1:Point2, 3:do odchylonego na zwrotnicy int iPrevDirection = 0; // domyślnie wirtualne odcinki dołączamy stroną od Point1 TTrackType eType = tt_Normal; // domyślnie zwykły @@ -246,7 +233,7 @@ public: SwitchExtension != nullptr ? SwitchExtension->iRoads - 1 : 1 ); } - void Load(cParser *parser, Math3D::vector3 pOrigin); + void Load(cParser *parser, glm::dvec3 const &pOrigin); bool AssignEvents(); bool AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus); void QueueEvents( event_sequence const &Events, TDynamicObject const *Owner ); diff --git a/Traction.cpp b/Traction.cpp index a155e5a7..5356c4d5 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -91,17 +91,6 @@ jawnie nazwę sekcji, ewentualnie nazwę zasilacza (zostanie zastąpiona wskazan sekcji z sąsiedniego przęsła). */ -glm::dvec3 LoadPoint( cParser &Input ) { - // pobranie współrzędnych punktu - glm::dvec3 point; - Input.getTokens( 3 ); - Input - >> point.x - >> point.y - >> point.z; - return point; -} - TTraction::TTraction( scene::node_data const &Nodedata ) : basic_node( Nodedata ) {} void diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 9c66e203..84f19a08 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -240,6 +240,12 @@ Source Files + + Source Files + + + Source Files + @@ -467,6 +473,9 @@ Header Files + + Header Files + diff --git a/mouseinput.cpp b/mouseinput.cpp index c55d40ec..4bfceae0 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "utilities.h" #include "globals.h" #include "timer.h" +#include "simulation.h" #include "world.h" #include "train.h" #include "renderer.h" @@ -74,33 +75,21 @@ mouse_input::button( int const Button, int const Action ) { if( false == Global.ControlPicking ) { return; } if( true == FreeFlyModeFlag ) { - // world editor controls - // TODO: separate behaviour when the scenery editor is active and in 'regular' free fly mode - if( Action == GLFW_RELEASE ) { - // if it's the right mouse button that got released we were potentially in view panning mode; stop it - if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { - m_pickmodepanning = false; + // freefly mode + // left mouse button launches on_click event associated with to the node + if( Button == GLFW_MOUSE_BUTTON_LEFT ) { + if( Action == GLFW_PRESS ) { + auto const *node { GfxRenderer.Update_Pick_Node() }; + if( ( node == nullptr ) + || ( typeid( *node ) != typeid( TAnimModel ) ) ) { + return; + } + simulation::Region->on_click( static_cast( node ) ); } } - else { - // button press - if( Button == GLFW_MOUSE_BUTTON_LEFT ) { - // the left button selects scene node - // further behaviour can vary depending on whether we're in editor mode - auto const *node { GfxRenderer.Update_Pick_Node() }; - if( true == EditorModeFlag ) { - // NOTE: until we have proper editor object in place we set the current node manually - editor::Node = node; - } - else { - // launch on_click event associated with to the node - // TODO: implement - } - } - if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { - // the right button activates mouse panning mode - m_pickmodepanning = true; - } + // right button controls panning + if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { + m_pickmodepanning = ( Action == GLFW_PRESS ); } } else { @@ -130,60 +119,57 @@ mouse_input::button( int const Button, int const Action ) { } else { // if not release then it's press - auto train = World.train(); - if( train != nullptr ) { - auto lookup = m_mousecommands.find( train->GetLabel( GfxRenderer.Update_Pick_Control() ) ); - if( lookup != m_mousecommands.end() ) { - mousecommand = ( - Button == GLFW_MOUSE_BUTTON_LEFT ? - lookup->second.left : - lookup->second.right - ); - if( mousecommand != user_command::none ) { - // check manually for commands which have 'fast' variants launched with shift modifier - if( Global.shiftState ) { - switch( mousecommand ) { - case user_command::mastercontrollerincrease: { mousecommand = user_command::mastercontrollerincreasefast; break; } - case user_command::mastercontrollerdecrease: { mousecommand = user_command::mastercontrollerdecreasefast; break; } - case user_command::secondcontrollerincrease: { mousecommand = user_command::secondcontrollerincreasefast; break; } - case user_command::secondcontrollerdecrease: { mousecommand = user_command::secondcontrollerdecreasefast; break; } - case user_command::independentbrakeincrease: { mousecommand = user_command::independentbrakeincreasefast; break; } - case user_command::independentbrakedecrease: { mousecommand = user_command::independentbrakedecreasefast; break; } - default: { break; } - } - } - // NOTE: basic keyboard controls don't have any parameters - // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, 0 ); - m_updateaccumulator = -0.25; // prevent potential command repeat right after issuing one - - switch( mousecommand ) { - case user_command::mastercontrollerincrease: - case user_command::mastercontrollerdecrease: - case user_command::secondcontrollerincrease: - case user_command::secondcontrollerdecrease: - case user_command::trainbrakeincrease: - case user_command::trainbrakedecrease: - case user_command::independentbrakeincrease: - case user_command::independentbrakedecrease: { - // these commands trigger varying repeat rate mode, - // which scales the rate based on the distance of the cursor from its point when the command was first issued - m_commandstartcursor = m_cursorposition; - m_varyingpollrate = true; - break; - } - default: { - break; - } - } + auto const lookup = m_mousecommands.find( World.train()->GetLabel( GfxRenderer.Update_Pick_Control() ) ); + if( lookup != m_mousecommands.end() ) { + // if the recognized element under the cursor has a command associated with the pressed button, notify the recipient + mousecommand = ( + Button == GLFW_MOUSE_BUTTON_LEFT ? + lookup->second.left : + lookup->second.right + ); + if( mousecommand == user_command::none ) { return; } + // check manually for commands which have 'fast' variants launched with shift modifier + if( Global.shiftState ) { + switch( mousecommand ) { + case user_command::mastercontrollerincrease: { mousecommand = user_command::mastercontrollerincreasefast; break; } + case user_command::mastercontrollerdecrease: { mousecommand = user_command::mastercontrollerdecreasefast; break; } + case user_command::secondcontrollerincrease: { mousecommand = user_command::secondcontrollerincreasefast; break; } + case user_command::secondcontrollerdecrease: { mousecommand = user_command::secondcontrollerdecreasefast; break; } + case user_command::independentbrakeincrease: { mousecommand = user_command::independentbrakeincreasefast; break; } + case user_command::independentbrakedecrease: { mousecommand = user_command::independentbrakedecreasefast; break; } + default: { break; } } } - else { - // if we don't have any recognized element under the cursor and the right button was pressed, enter view panning mode - if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { - m_pickmodepanning = true; + // NOTE: basic keyboard controls don't have any parameters + // NOTE: as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( mousecommand, 0, 0, Action, 0 ); + m_updateaccumulator = -0.25; // prevent potential command repeat right after issuing one + + switch( mousecommand ) { + case user_command::mastercontrollerincrease: + case user_command::mastercontrollerdecrease: + case user_command::secondcontrollerincrease: + case user_command::secondcontrollerdecrease: + case user_command::trainbrakeincrease: + case user_command::trainbrakedecrease: + case user_command::independentbrakeincrease: + case user_command::independentbrakedecrease: { + // these commands trigger varying repeat rate mode, + // which scales the rate based on the distance of the cursor from its point when the command was first issued + m_varyingpollrateorigin = m_cursorposition; + m_varyingpollrate = true; + break; } + default: { + break; + } + } + } + else { + // if we don't have any recognized element under the cursor and the right button was pressed, enter view panning mode + if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { + m_pickmodepanning = true; } } } @@ -197,7 +183,7 @@ mouse_input::poll() { auto updaterate { m_updaterate }; if( m_varyingpollrate ) { - updaterate /= std::max( 0.15, 2.0 * glm::length( m_cursorposition - m_commandstartcursor ) / std::max( 1, Global.iWindowHeight ) ); + updaterate /= std::max( 0.15, 2.0 * glm::length( m_cursorposition - m_varyingpollrateorigin ) / std::max( 1, Global.iWindowHeight ) ); } while( m_updateaccumulator > updaterate ) { diff --git a/mouseinput.h b/mouseinput.h index ff9c77eb..e87cdc42 100644 --- a/mouseinput.h +++ b/mouseinput.h @@ -21,10 +21,10 @@ public: // methods bool init(); - void - move( double const Mousex, double const Mousey ); void button( int const Button, int const Action ); + void + move( double const Mousex, double const Mousey ); void poll(); @@ -52,8 +52,8 @@ private: double m_updateaccumulator { 0.0 }; bool m_pickmodepanning { false }; // indicates mouse is in view panning mode glm::dvec2 m_cursorposition; // stored last cursor position, used for panning - glm::dvec2 m_commandstartcursor; // helper, cursor position when the command was initiated bool m_varyingpollrate { false }; // indicates rate of command repeats is affected by the cursor position + glm::dvec2 m_varyingpollrateorigin; // helper, cursor position when the command was initiated }; //--------------------------------------------------------------------------- diff --git a/renderer.cpp b/renderer.cpp index 63720686..42be7b0e 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -449,6 +449,8 @@ opengl_renderer::Render_pass( rendermode const Mode ) { case rendermode::color: { + m_colorpass = m_renderpass; + if( ( true == Global.RenderShadows ) && ( false == Global.bWireFrame ) && ( true == World.InitPerformed() ) @@ -1668,6 +1670,11 @@ opengl_renderer::Render( scene::basic_region *Region ) { Update_Lights( simulation::Lights ); Render( std::begin( m_sectionqueue ), std::end( m_sectionqueue ) ); + if( EditorModeFlag && FreeFlyModeFlag && Global.ControlPicking ) { + // when editor mode is active calculate world position of the cursor + // at this stage the z-buffer is filled with only ground geometry + Update_Mouse_Position(); + } // draw queue is filled while rendering sections Render( std::begin( m_cellqueue ), std::end( m_cellqueue ) ); break; @@ -1912,7 +1919,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator ::glPushAttrib( GL_ENABLE_BIT ); ::glDisable( GL_TEXTURE_2D ); ::glColor3f( 0.36f, 0.75f, 0.35f ); - for( auto const *memorycell : cell->m_memorycells ) { + for( auto *memorycell : cell->m_memorycells ) { Render( memorycell ); } ::glPopAttrib(); @@ -1929,7 +1936,7 @@ opengl_renderer::Render( cell_sequence::iterator First, cell_sequence::iterator // memcells if( ( EditorModeFlag ) && ( DebugModeFlag ) ) { - for( auto const *memorycell : cell->m_memorycells ) { + for( auto *memorycell : cell->m_memorycells ) { ::glColor3fv( glm::value_ptr( pick_color( m_picksceneryitems.size() + 1 ) ) ); Render( memorycell ); } @@ -2310,16 +2317,16 @@ opengl_renderer::Render( TModel3d *Model, material_data const *Material, float c } bool -opengl_renderer::Render( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { +opengl_renderer::Render( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, glm::vec3 const &Angle ) { ::glPushMatrix(); ::glTranslated( Position.x, Position.y, Position.z ); if( Angle.y != 0.0 ) - ::glRotated( Angle.y, 0.0, 1.0, 0.0 ); + ::glRotatef( Angle.y, 0.f, 1.f, 0.f ); if( Angle.x != 0.0 ) - ::glRotated( Angle.x, 1.0, 0.0, 0.0 ); + ::glRotatef( Angle.x, 1.f, 0.f, 0.f ); if( Angle.z != 0.0 ) - ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); + ::glRotatef( Angle.z, 0.f, 0.f, 1.f ); auto const result = Render( Model, Material, Squaredistance ); @@ -2755,7 +2762,7 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, } void -opengl_renderer::Render( TMemCell const *Memcell ) { +opengl_renderer::Render( TMemCell *Memcell ) { ::glPushMatrix(); auto const position = Memcell->location() - m_renderpass.camera.position(); @@ -3129,16 +3136,16 @@ opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, f } bool -opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ) { +opengl_renderer::Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, glm::vec3 const &Angle ) { ::glPushMatrix(); ::glTranslated( Position.x, Position.y, Position.z ); if( Angle.y != 0.0 ) - ::glRotated( Angle.y, 0.0, 1.0, 0.0 ); + ::glRotatef( Angle.y, 0.f, 1.f, 0.f ); if( Angle.x != 0.0 ) - ::glRotated( Angle.x, 1.0, 0.0, 0.0 ); + ::glRotatef( Angle.x, 1.f, 0.f, 0.f ); if( Angle.z != 0.0 ) - ::glRotated( Angle.z, 0.0, 0.0, 1.0 ); + ::glRotatef( Angle.z, 0.f, 0.f, 1.f ); auto const result = Render_Alpha( Model, Material, Squaredistance ); // position is effectively camera offset @@ -3379,7 +3386,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { // utility methods -TSubModel const * +TSubModel * opengl_renderer::Update_Pick_Control() { #ifdef EU07_USE_PICKING_FRAMEBUFFER @@ -3412,7 +3419,7 @@ opengl_renderer::Update_Pick_Control() { unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); auto const controlindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); - TSubModel const *control { nullptr }; + TSubModel *control { nullptr }; if( ( controlindex > 0 ) && ( controlindex <= m_pickcontrolsitems.size() ) ) { control = m_pickcontrolsitems[ controlindex - 1 ]; @@ -3426,7 +3433,7 @@ opengl_renderer::Update_Pick_Control() { return control; } -scene::basic_node const * +scene::basic_node * opengl_renderer::Update_Pick_Node() { #ifdef EU07_USE_PICKING_FRAMEBUFFER @@ -3461,7 +3468,7 @@ opengl_renderer::Update_Pick_Node() { unsigned char pickreadout[4]; ::glReadPixels( pickbufferpos.x, pickbufferpos.y, 1, 1, GL_BGRA, GL_UNSIGNED_BYTE, pickreadout ); auto const nodeindex = pick_index( glm::ivec3{ pickreadout[ 2 ], pickreadout[ 1 ], pickreadout[ 0 ] } ); - scene::basic_node const *node { nullptr }; + scene::basic_node *node { nullptr }; if( ( nodeindex > 0 ) && ( nodeindex <= m_picksceneryitems.size() ) ) { node = m_picksceneryitems[ nodeindex - 1 ]; @@ -3475,6 +3482,29 @@ opengl_renderer::Update_Pick_Node() { return node; } +// converts provided screen coordinates to world coordinates of most recent color pass +glm::dvec3 +opengl_renderer::Update_Mouse_Position() { + + glm::dvec2 mousepos; + glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); + mousepos.x = clamp( mousepos.x, 0, Global.iWindowWidth - 1 ); + mousepos.y = clamp( Global.iWindowHeight - clamp( mousepos.y, 0, Global.iWindowHeight ), 0, Global.iWindowHeight - 1 ) ; + GLfloat pointdepth; + ::glReadPixels( mousepos.x, mousepos.y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &pointdepth ); + + if( pointdepth < 1.0 ) { + m_worldmousecoordinates = + glm::unProject( + glm::vec3{ mousepos, pointdepth }, + glm::mat4{ glm::mat3{ m_colorpass.camera.modelview() } }, + m_colorpass.camera.projection(), + glm::vec4{ 0, 0, Global.iWindowWidth, Global.iWindowHeight } ); + } + + return m_colorpass.camera.position() + glm::dvec3{ m_worldmousecoordinates }; +} + void opengl_renderer::Update( double const Deltatime ) { diff --git a/renderer.h b/renderer.h index 88405377..3db03799 100644 --- a/renderer.h +++ b/renderer.h @@ -167,13 +167,17 @@ public: Pick_Control() const { return m_pickcontrolitem; } scene::basic_node const * Pick_Node() const { return m_picksceneryitem; } + glm::dvec3 + Mouse_Position() const { return m_worldmousecoordinates; } // maintenance methods void Update( double const Deltatime ); - TSubModel const * + TSubModel * Update_Pick_Control(); - scene::basic_node const * + scene::basic_node * Update_Pick_Node(); + glm::dvec3 + Update_Mouse_Position(); // debug methods std::string const & info_times() const; @@ -277,7 +281,7 @@ private: bool Render( TDynamicObject *Dynamic ); bool - Render( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + Render( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, glm::vec3 const &Angle ); bool Render( TModel3d *Model, material_data const *Material, float const Squaredistance ); void @@ -289,7 +293,7 @@ private: bool Render_cab( TDynamicObject const *Dynamic, bool const Alpha = false ); void - Render( TMemCell const *Memcell ); + Render( TMemCell *Memcell ); void Render_Alpha( scene::basic_region *Region ); void @@ -303,7 +307,7 @@ private: bool Render_Alpha( TDynamicObject *Dynamic ); bool - Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, Math3D::vector3 const &Angle ); + Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance, Math3D::vector3 const &Position, glm::vec3 const &Angle ); bool Render_Alpha( TModel3d *Model, material_data const *Material, float const Squaredistance ); void @@ -386,12 +390,14 @@ private: renderpass_config m_renderpass; // parameters for current render pass section_sequence m_sectionqueue; // list of sections in current render pass cell_sequence m_cellqueue; + renderpass_config m_colorpass; // parametrs of most recent color pass renderpass_config m_shadowpass; // parametrs of most recent shadowmap pass renderpass_config m_cabshadowpass; // parameters of most recent cab shadowmap pass - std::vector m_pickcontrolsitems; - TSubModel const *m_pickcontrolitem { nullptr }; - std::vector m_picksceneryitems; - scene::basic_node const *m_picksceneryitem { nullptr }; + std::vector m_pickcontrolsitems; + TSubModel *m_pickcontrolitem { nullptr }; + std::vector m_picksceneryitems; + scene::basic_node *m_picksceneryitem { nullptr }; + glm::vec3 m_worldmousecoordinates { 0.f }; #ifdef EU07_USE_DEBUG_CAMERA renderpass_config m_worldcamera; // debug item #endif diff --git a/scene.cpp b/scene.cpp index 9b6312ec..4586f442 100644 --- a/scene.cpp +++ b/scene.cpp @@ -22,6 +22,19 @@ namespace scene { std::string const EU07_FILEEXTENSION_REGION { ".sbt" }; std::uint32_t const EU07_FILEVERSION_REGION { MAKE_ID4( 'S', 'B', 'T', 1 ) }; +// potentially activates event handler with the same name as provided node, and within handler activation range +void +basic_cell::on_click( TAnimModel const *Instance ) { + + for( auto *launcher : m_eventlaunchers ) { + if( ( launcher->name() == Instance->name() ) + && ( glm::length2( launcher->location() - Instance->location() ) < launcher->dRadius ) + && ( true == launcher->check_conditions() ) ) { + launch_event( launcher ); + } + } +} + // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void basic_cell::update_traction( TDynamicObject *Vehicle, int const Pantographindex ) { @@ -105,17 +118,10 @@ basic_cell::update_events() { // event launchers for( auto *launcher : m_eventlaunchers ) { - if( ( true == launcher->check_conditions() ) + if( ( true == ( launcher->check_activation() && launcher->check_conditions() ) ) && ( SquareMagnitude( launcher->location() - Global.pCameraPosition ) < launcher->dRadius ) ) { - WriteLog( "Eventlauncher " + launcher->name() ); - if( ( true == Global.shiftState ) - && ( launcher->Event2 != nullptr ) ) { - simulation::Events.AddToQuery( launcher->Event2, nullptr ); - } - else if( launcher->Event1 ) { - simulation::Events.AddToQuery( launcher->Event1, nullptr ); - } + launch_event( launcher ); } } } @@ -384,6 +390,38 @@ basic_cell::insert( TMemCell *Memorycell ) { // NOTE: memory cells are virtual 'points' hence they don't ever expand cell range } +// removes provided model instance from the cell +void +basic_cell::erase( TAnimModel *Instance ) { + + auto const flags = Instance->Flags(); + auto alpha = + ( Instance->Material() != nullptr ? + Instance->Material()->textures_alpha : + 0x30300030 ); + + if( alpha & flags & 0x2F2F002F ) { + // instance has translucent pieces + m_instancetranslucent.erase( + std::remove_if( + std::begin( m_instancetranslucent ), std::end( m_instancetranslucent ), + [=]( TAnimModel *instance ) { + return instance == Instance; } ), + std::end( m_instancetranslucent ) ); + } + alpha ^= 0x0F0F000F; // odwrócenie flag tekstur, aby wyłapać nieprzezroczyste + if( alpha & flags & 0x1F1F001F ) { + // instance has opaque pieces + m_instancesopaque.erase( + std::remove_if( + std::begin( m_instancesopaque ), std::end( m_instancesopaque ), + [=]( TAnimModel *instance ) { + return instance == Instance; } ), + std::end( m_instancesopaque ) ); + } + // TODO: update cell bounding area +} + // registers provided path in the lookup directory of the cell void basic_cell::register_end( TTrack *Path ) { @@ -549,6 +587,20 @@ basic_cell::create_geometry( gfx::geometrybank_handle const &Bank ) { m_geometrycreated = true; // helper for legacy animation code, get rid of it after refactoring } +// executes event assigned to specified launcher +void +basic_cell::launch_event( TEventLauncher *Launcher ) { + + WriteLog( "Eventlauncher " + Launcher->name() ); + if( ( true == Global.shiftState ) + && ( Launcher->Event2 != nullptr ) ) { + simulation::Events.AddToQuery( Launcher->Event2, nullptr ); + } + else if( Launcher->Event1 ) { + simulation::Events.AddToQuery( Launcher->Event1, nullptr ); + } +} + // adjusts cell bounding area to enclose specified node void basic_cell::enclose_area( scene::basic_node *Node ) { @@ -560,6 +612,13 @@ basic_cell::enclose_area( scene::basic_node *Node ) { +// potentially activates event handler with the same name as provided node, and within handler activation range +void +basic_section::on_click( TAnimModel const *Instance ) { + + cell( Instance->location() ).on_click( Instance ); +} + // legacy method, finds and assigns traction piece(s) to pantographs of provided vehicle void basic_section::update_traction( TDynamicObject *Vehicle, int const Pantographindex ) { @@ -856,6 +915,19 @@ basic_region::~basic_region() { for( auto *section : m_sections ) { if( section != nullptr ) { delete section; } } } +// potentially activates event handler with the same name as provided node, and within handler activation range +void +basic_region::on_click( TAnimModel const *Instance ) { + + if( Instance->name().empty() || ( Instance->name() == "none" ) ) { return; } + + auto const location { Instance->location() }; + + if( point_inside( location ) ) { + section( location ).on_click( Instance ); + } +} + // legacy method, polls event launchers around camera void basic_region::update_events() { @@ -1185,8 +1257,8 @@ basic_region::insert_traction( TTraction *Traction, scratch_data &Scratchpad ) { // inserts provided instance of 3d model in the region void basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto location = Instance->location(); + + auto const location { Instance->location() }; if( point_inside( location ) ) { // NOTE: nodes placed outside of region boundaries are discarded @@ -1198,6 +1270,18 @@ basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) } } +// removes specified instance of 3d model from the region +void +basic_region::erase_instance( TAnimModel *Instance ) { + + auto const location { Instance->location() }; + + if( point_inside( location ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + section( location ).erase( Instance ); + } +} + // inserts provided sound in the region void basic_region::insert_sound( sound_source *Sound, scratch_data &Scratchpad ) { diff --git a/scene.h b/scene.h index 1e0ab86d..1b7be690 100644 --- a/scene.h +++ b/scene.h @@ -66,6 +66,9 @@ public: // constructors basic_cell() = default; // methods + // potentially activates event handler with the same name as provided node, and within handler activation range + void + on_click( TAnimModel const *Instance ); // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); @@ -123,6 +126,9 @@ public: // registers provided traction piece in the lookup directory of the cell void register_end( TTraction *Traction ); + // removes provided model instance from the cell + void + erase( TAnimModel *Instance ); // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) const; @@ -157,6 +163,8 @@ private: using eventlauncher_sequence = std::vector; using memorycell_sequence = std::vector; // methods + void + launch_event( TEventLauncher *Launcher ); void enclose_area( scene::basic_node *Node ); // members @@ -193,7 +201,10 @@ public: // constructors basic_section() = default; // methods -// legacy method, finds and assigns traction piece to specified pantograph of provided vehicle + // potentially activates event handler with the same name as provided node, and within handler activation range + void + on_click( TAnimModel const *Instance ); + // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); // legacy method, updates sounds and polls event launchers within radius around specified point @@ -230,6 +241,13 @@ public: m_area.radius = std::max( m_area.radius, static_cast( glm::length( m_area.center - targetcell.area().center ) + targetcell.area().radius ) ); } + // erases provided node from the section + template + void + erase( Type_ *Node ) { + auto &targetcell { cell( Node->location() ) }; + // TODO: re-calculate bounding area after removal + targetcell.erase( Node ); } // registers provided node in the lookup directory of the section enclosing specified point template void @@ -289,7 +307,10 @@ public: // destructor ~basic_region(); // methods -// legacy method, finds and assigns traction piece to specified pantograph of provided vehicle + // potentially activates event handler with the same name as provided node, and within handler activation range + void + on_click( TAnimModel const *Instance ); + // legacy method, finds and assigns traction piece to specified pantograph of provided vehicle void update_traction( TDynamicObject *Vehicle, int const Pantographindex ); // legacy method, polls event launchers around camera @@ -337,6 +358,9 @@ public: // inserts provided memory cell in the region void insert_memorycell( TMemCell *Memorycell, scratch_data &Scratchpad ); + // removes specified instance of 3d model from the region + void + erase_instance( TAnimModel *Instance ); // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); diff --git a/sceneeditor.cpp b/sceneeditor.cpp new file mode 100644 index 00000000..fec5381a --- /dev/null +++ b/sceneeditor.cpp @@ -0,0 +1,165 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "sceneeditor.h" + +#include "globals.h" +#include "simulation.h" +#include "renderer.h" + +namespace scene { + +basic_editor Editor; + +bool +basic_editor::on_mouse_button( int const Button, int const Action ) { + + if( false == EditorModeFlag ) { return false; } + // TBD: automatically activate and enforce picking mode and/or freefly mode when editor is active? + if( false == FreeFlyModeFlag ) { return false; } + if( false == Global.ControlPicking ) { return false; } + + if( Button == GLFW_MOUSE_BUTTON_LEFT ) { + + if( Action == GLFW_PRESS ) { + + m_node = GfxRenderer.Update_Pick_Node(); + m_nodesnapshot = { m_node }; + if( m_node ) { + glfwSetInputMode( Global.window, GLFW_CURSOR, GLFW_CURSOR_DISABLED ); + } + } + else { + // left button release + // TODO: record the current undo step on the undo stack + m_nodesnapshot = { m_node }; + if( m_node ) { + glfwSetInputMode( Global.window, GLFW_CURSOR, GLFW_CURSOR_NORMAL ); + } + } + + m_mouseleftbuttondown = ( Action == GLFW_PRESS ); + + return ( m_node != nullptr ); + } + + return false; +} + +bool +basic_editor::on_mouse_move( double const Mousex, double const Mousey ) { + + auto const mousemove { glm::dvec2{ Mousex, Mousey } - m_mouseposition }; + m_mouseposition = { Mousex, Mousey }; + + if( false == EditorModeFlag ) { return false; } + if( false == m_mouseleftbuttondown ) { return false; } + if( m_node == nullptr ) { return false; } + + if( mode_translation() ) { + // move selected node + if( mode_translation_vertical() ) { + auto const translation { mousemove.y * -0.01f }; + translate( translation ); + } + else { + auto const mouseworldposition{ Global.pCamera->Pos + GfxRenderer.Mouse_Position() }; + translate( mouseworldposition ); + } + } + else { + // rotate selected node + auto const rotation { glm::vec3 { mousemove.y, mousemove.x, 0 } * 0.25f }; + rotate( rotation ); + } + + return true; +} + +void +basic_editor::translate( glm::dvec3 const &Location ) { + + auto *node { m_node }; // placeholder for operations on multiple nodes + + auto location { Location }; + + if( typeid( *node ) == typeid( TAnimModel ) ) { + // TBD, TODO: don't modify y coordinate if snap-to-ground mode is active? +// location.y = node->location().y; + translate_instance( static_cast( node ), location ); + } +} + +void +basic_editor::translate( float const Offset ) { + + // NOTE: offset scaling is calculated early so the same multiplier can be applied to potential whole group + auto location { m_node->location() }; + auto const distance { glm::length( location - glm::dvec3{ Global.pCamera->Pos } ) }; + auto const offset { Offset * std::max( 1.0, distance * 0.01 ) }; + + auto *node { m_node }; // placeholder for operations on multiple nodes + + if( typeid( *node ) == typeid( TAnimModel ) ) { + translate_instance( static_cast( node ), offset ); + } +} + +void +basic_editor::translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ) { + + simulation::Region->erase_instance( Instance ); + Instance->location( Location ); + simulation::Region->insert_instance( Instance, scene::scratch_data() ); +} + +void +basic_editor::translate_instance( TAnimModel *Instance, float const Offset ) { + + auto location { Instance->location() }; + location.y += Offset; + Instance->location( location ); +} + +void +basic_editor::rotate( glm::vec3 const &Angle ) { + + auto *node { m_node }; // placeholder for operations on multiple nodes + + if( typeid( *node ) == typeid( TAnimModel ) ) { + rotate_instance( static_cast( node ), Angle ); + } +} + +void +basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) { + + // adjust node data + glm::vec3 angle = glm::dvec3 { Instance->Angles() }; + angle.y = clamp_circular( angle.y + Angle.y, 360.f ); + Instance->Angles( angle ); + // update scene +} + +bool +basic_editor::mode_translation() const { + + return ( false == Global.ctrlState ); +} + +bool +basic_editor::mode_translation_vertical() const { + + return ( true == Global.shiftState ); +} + +} // scene + +//--------------------------------------------------------------------------- diff --git a/sceneeditor.h b/sceneeditor.h new file mode 100644 index 00000000..74f96d4a --- /dev/null +++ b/sceneeditor.h @@ -0,0 +1,73 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "scenenode.h" + +namespace scene { + +class basic_editor { + +public: +// methods + bool + on_mouse_button( int const Button, int const Action ); + bool + on_mouse_move( double const Mousex, double const Mousey ); + scene::basic_node const * + node() const { + return m_node; } +private: +// types + struct node_snapshot { + + scene::basic_node *node; + std::string data; + + node_snapshot( scene::basic_node *Node ) : + node( Node ) { + if( Node != nullptr ) { + Node->export_as_text( data ); } }; + }; + friend bool operator==( basic_editor::node_snapshot const &Left, basic_editor::node_snapshot const &Right ); + friend bool operator!=( basic_editor::node_snapshot const &Left, basic_editor::node_snapshot const &Right ); +// methods + bool + mode_translation() const; + bool + mode_translation_vertical() const; + void + translate( glm::dvec3 const &Location ); + void + translate( float const Offset ); + void + translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ); + void + translate_instance( TAnimModel *Instance, float const Offset ); + void + rotate( glm::vec3 const &Angle ); + void + rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ); +// members + scene::basic_node *m_node; // temporary helper, currently selected scene node + node_snapshot m_nodesnapshot { nullptr }; // currently selected scene node in its pre-modified state + glm::dvec2 m_mouseposition { 0.0 }; + bool m_mouseleftbuttondown { false }; + +}; + +inline bool operator==( basic_editor::node_snapshot const &Left, basic_editor::node_snapshot const &Right ) { return ( ( Left.node == Right.node ) && ( Left.data == Right.data ) ); } +inline bool operator!=( basic_editor::node_snapshot const &Left, basic_editor::node_snapshot const &Right ) { return ( !( Left == Right ) ); } + +extern basic_editor Editor; + +} // scene + +//--------------------------------------------------------------------------- diff --git a/scenenode.cpp b/scenenode.cpp index 5022a795..67efa435 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -743,6 +743,14 @@ basic_node::export_as_text( std::ostream &Output ) const { export_as_text_( Output ); } +void +basic_node::export_as_text( std::string &Output ) const { + + std::stringstream converter; + export_as_text( converter ); + Output += converter.str(); +} + float const & basic_node::radius() { @@ -763,10 +771,4 @@ basic_node::radius_() { } // scene -namespace editor { - -scene::basic_node const *Node { nullptr }; // temporary helper, currently selected scene node - -} // editor - //--------------------------------------------------------------------------- diff --git a/scenenode.h b/scenenode.h index eb986dba..915c60c7 100644 --- a/scenenode.h +++ b/scenenode.h @@ -316,6 +316,8 @@ public: // sends basic content of the class in legacy (text) format to provided stream void export_as_text( std::ostream &Output ) const; + void + export_as_text( std::string &Output ) const; std::string const & name() const; void @@ -381,10 +383,4 @@ basic_node::visible() const { } // scene -namespace editor { - -extern scene::basic_node const *Node; // temporary helper, currently selected scene node - -} // editor - //--------------------------------------------------------------------------- diff --git a/simulation.cpp b/simulation.cpp index 39d06723..39ab215b 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -620,13 +620,13 @@ state_manager::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done auto *track = new TTrack( Nodedata ); - Math3D::vector3 offset = ( + auto const offset { ( Scratchpad.location.offset.empty() ? - Math3D::vector3() : - Math3D::vector3( - Scratchpad.location.offset.top().x, - Scratchpad.location.offset.top().y, - Scratchpad.location.offset.top().z ) ); + glm::dvec3 { 0.0 } : + glm::dvec3 { + Scratchpad.location.offset.top().x, + Scratchpad.location.offset.top().y, + Scratchpad.location.offset.top().z } ) }; track->Load( &Input, offset ); return track; @@ -707,7 +707,7 @@ state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpa >> rotation.y; auto *instance = new TAnimModel( Nodedata ); - instance->RaAnglesSet( Scratchpad.location.rotation + rotation ); // dostosowanie do pochylania linii + instance->Angles( Scratchpad.location.rotation + rotation ); // dostosowanie do pochylania linii if( instance->Load( &Input, false ) ) { instance->location( transform( location, Scratchpad ) ); diff --git a/uilayer.cpp b/uilayer.cpp index f54ca2c3..d0f98db6 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -2,17 +2,14 @@ #include "stdafx.h" #include "uilayer.h" -#include "uitranscripts.h" #include "globals.h" #include "translation.h" #include "simulation.h" #include "mtable.h" #include "train.h" -#include "dynobj.h" -#include "model3d.h" +#include "sceneeditor.h" #include "renderer.h" -#include "timer.h" #include "utilities.h" #include "logs.h" @@ -710,12 +707,16 @@ ui_layer::update() { case( GLFW_KEY_F11 ): { // scenario inspector - auto const *node { editor::Node }; + auto const *node { scene::Editor.node() }; - if( node == nullptr ) { break; } + if( node == nullptr ) { + auto const mouseposition { Global.pCamera->Pos + GfxRenderer.Mouse_Position() }; + uitextline1 = "mouse location: [" + to_string( mouseposition.x, 2 ) + ", " + to_string( mouseposition.y, 2 ) + ", " + to_string( mouseposition.z, 2 ) + "]"; + break; + } uitextline1 = - "Node name: " + node->name() + "node name: " + node->name() + "; location: [" + to_string( node->location().x, 2 ) + ", " + to_string( node->location().y, 2 ) + ", " + to_string( node->location().z, 2 ) + "]" + " (distance: " + to_string( glm::length( glm::dvec3{ node->location().x, 0.0, node->location().z } -glm::dvec3{ Global.pCameraPosition.x, 0.0, Global.pCameraPosition.z } ), 1 ) + " m)"; // subclass-specific data @@ -724,7 +725,7 @@ ui_layer::update() { auto const *subnode = static_cast( node ); - uitextline2 = "angle: " + to_string( clamp_circular( subnode->vAngle.y, 360.0 ), 2 ) + " deg"; + uitextline2 = "angle: " + to_string( clamp_circular( subnode->vAngle.y, 360.f ), 2 ) + " deg"; uitextline2 += "; lights: "; if( subnode->iNumLights > 0 ) { uitextline2 += '['; diff --git a/utilities.cpp b/utilities.cpp index af1deec4..bd8207b2 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -25,10 +25,11 @@ Copyright (C) 2007-2014 Maciej Cierniak #include "utilities.h" #include "globals.h" +#include "parser.h" bool DebugModeFlag = false; bool FreeFlyModeFlag = false; -bool EditorModeFlag = true; +bool EditorModeFlag = false; bool DebugCameraFlag = false; double Max0R(double x1, double x2) @@ -387,3 +388,17 @@ substr_path( std::string const &Filename ) { Filename.substr( 0, Filename.rfind( '/' ) + 1 ) : "" ); } + +// helper, restores content of a 3d vector from provided input stream +// TODO: review and clean up the helper routines, there's likely some redundant ones +glm::dvec3 LoadPoint( cParser &Input ) { + // pobranie współrzędnych punktu + Input.getTokens( 3 ); + glm::dvec3 point; + Input + >> point.x + >> point.y + >> point.z; + + return point; +} diff --git a/utilities.h b/utilities.h index 3bd9f9e8..21dedce9 100644 --- a/utilities.h +++ b/utilities.h @@ -300,4 +300,8 @@ nearest_segment_point( VecType_ const &Segmentstart, VecType_ const &Segmentend, return c1 / c2; } +class cParser; + +glm::dvec3 LoadPoint( cParser &Input ); + //--------------------------------------------------------------------------- diff --git a/version.h b/version.h index 995460b1..13967e6c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 629 +#define VERSION_MINOR 708 #define VERSION_REVISION 0 From d611622fad10149b27755acc0b5ec7fa7cae07da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 8 Jul 2018 11:55:15 +0200 Subject: [PATCH 356/426] PN brake cuts off ED braking --- McZapkie/Mover.cpp | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 2c3f7b7b..7da14ab7 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5029,25 +5029,34 @@ double TMoverParameters::TractionForce( double dt ) { dtrans = Hamulec->GetEDBCP() * eimc[eimc_p_abed]; // stala napedu if ((DynamicBrakeFlag)) { + // ustalanie współczynnika blendingu do luzowania hamulca PN if (eimv[eimv_Fmax] * Sign(V) * DirAbsolute < -1) { PosRatio = -Sign(V) * DirAbsolute * eimv[eimv_Fr] / (eimc[eimc_p_Fh] * Max0R(Max0R(dtrans,0.01) / MaxBrakePress[0], AnPos) /*dizel_fill*/); } - else - PosRatio = 0; - PosRatio = Round(20.0 * PosRatio) / 20.0; + else + { + PosRatio = 0; + } + PosRatio = Round(20.0 * PosRatio) / 20.0; //stopniowanie PN/ED if (PosRatio < 19.5 / 20.0) - PosRatio *= 0.9; - // if PosRatio<0 then - // PosRatio:=2+PosRatio-2; - Hamulec->SetED(Max0R(0.0, std::min(PosRatio, 1.0))); - // (Hamulec as TLSt).SetLBP(LocBrakePress*(1-PosRatio)); - PosRatio = -std::max(std::min(dtrans * 1.0 / MaxBrakePress[0], 1.0), AnPos) * - std::max(0.0, std::min(1.0, (Vel - eimc[eimc_p_Vh0]) / - (eimc[eimc_p_Vh1] - eimc[eimc_p_Vh0]))); - eimv[eimv_Fzad] = -std::max(LocalBrakeRatio(), dtrans / MaxBrakePress[0]); + PosRatio *= 0.9; + Hamulec->SetED(Max0R(0.0, std::min(PosRatio, 1.0))); //ustalenie stopnia zmniejszenia ciśnienia + // ustalanie siły hamowania ED + if ((Hamulec->GetEDBCP() > 0.25) && (eimc[eimc_p_abed] < 0.001)) //jeśli PN wyłącza ED + { + PosRatio = 0; + eimv[eimv_Fzad] = 0; + } + else + { + PosRatio = -std::max(std::min(dtrans * 1.0 / MaxBrakePress[0], 1.0), AnPos) * + std::max(0.0, std::min(1.0, (Vel - eimc[eimc_p_Vh0]) / + (eimc[eimc_p_Vh1] - eimc[eimc_p_Vh0]))); + eimv[eimv_Fzad] = -std::max(LocalBrakeRatio(), dtrans / MaxBrakePress[0]); + } tmp = 5; } else From 67de8b59e7a1e67e96a9e81ddeefe62f00f11c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 8 Jul 2018 11:56:42 +0200 Subject: [PATCH 357/426] MainCtrl connected to 3rd AnalogInput --- Train.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Train.cpp b/Train.cpp index 66cb28fc..81c0d8a6 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5085,6 +5085,20 @@ bool TTrain::Update( double const Deltatime ) // McZapkie-080602: obroty (albo translacje) regulatorow if (ggMainCtrl.SubModel) { +#ifdef _WIN32 + if ((DynamicObject->Mechanik != nullptr) + && (false == DynamicObject->Mechanik->AIControllFlag) // nie blokujemy AI + && (Global.iFeedbackMode == 4) + && (Global.fCalibrateIn[2][1] != 0.0)) { + auto const b = clamp( + Console::AnalogCalibrateGet(2) * mvOccupied->MainCtrlPosNo, + 0.0, + mvOccupied->MainCtrlPosNo); + while (mvOccupied->MainCtrlPos < b) { mvOccupied->MainCtrlPos = b - 1; mvOccupied->IncMainCtrl(1); } + while (mvOccupied->MainCtrlPos > b) { mvOccupied->MainCtrlPos = b + 1; mvOccupied->DecMainCtrl(1); } + } +#endif + if( mvControlled->CoupledCtrl ) { ggMainCtrl.UpdateValue( double( mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos ), @@ -5172,7 +5186,7 @@ bool TTrain::Update( double const Deltatime ) auto const b = clamp( Console::AnalogCalibrateGet( 1 ) * 10.0, 0.0, - ManualBrakePosNo ); + LocalBrakePosNo ); ggLocalBrake.UpdateValue( b ); // przesów bez zaokrąglenia mvOccupied->LocalBrakePos = int( 1.09 * b ); // sposób zaokrąglania jest do ustalenia } From 80909a2a9d899e73bd432f95a146ff7d355deac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 8 Jul 2018 14:22:05 +0200 Subject: [PATCH 358/426] Fixed PN+ED blending --- McZapkie/Mover.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 7da14ab7..cecacec6 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5034,7 +5034,8 @@ double TMoverParameters::TractionForce( double dt ) { { PosRatio = -Sign(V) * DirAbsolute * eimv[eimv_Fr] / (eimc[eimc_p_Fh] * - Max0R(Max0R(dtrans,0.01) / MaxBrakePress[0], AnPos) /*dizel_fill*/); + Max0R(dtrans,Max0R(0.01,Hamulec->GetEDBCP())) / MaxBrakePress[0]); + PosRatio = clamp(PosRatio, 0.0, 1.0); } else { From e01f05f57cb573e7e83597a1decc6b21fd5881ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 8 Jul 2018 15:53:48 +0200 Subject: [PATCH 359/426] Emergency loop for EIM EMUs: emergency brake uses PN+EP --- DynObj.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DynObj.cpp b/DynObj.cpp index 74d93abc..5c1a51a0 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3067,6 +3067,9 @@ bool TDynamicObject::Update(double dt, double dt1) (MoverParameters->LocalBrakeRatio() < 0.01); } auto Fzad = amax * MoverParameters->LocalBrakeRatio() * masa; + if ((MoverParameters->BrakeCtrlPos == MoverParameters->Handle->GetPos(bh_EB)) + && (MoverParameters->eimc[eimc_p_abed] < 0.001)) + Fzad = amax * masa; //pętla bezpieczeństwa - pełne służbowe if ((MoverParameters->ScndS) && (MoverParameters->Vel > MoverParameters->eimc[eimc_p_Vh1]) && (FmaxED > 0)) { @@ -3097,6 +3100,9 @@ bool TDynamicObject::Update(double dt, double dt1) && ( MoverParameters->BrakeOpModeFlag & bom_MED ) ) ) { FzadED = std::min( Fzad, FmaxED ); } + if ((MoverParameters->BrakeCtrlPos == MoverParameters->Handle->GetPos(bh_EB)) + && (MoverParameters->eimc[eimc_p_abed] < 0.001)) + FzadED = 0; //pętla bezpieczeństwa - bez ED auto const FzadPN = Fzad - FrED; //np = 0; // BUG: likely memory leak, allocation per inner loop, deleted only once outside From 219e8badc54622e02c714065128c088ddb33e418 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 10 Jul 2018 01:09:20 +0200 Subject: [PATCH 360/426] position and rotation adjustment value snap mode in scenery editor, position adjustment for memory cells in scenery editor --- EU07.cpp | 2 ++ Globals.h | 1 + renderer.cpp | 2 +- scene.cpp | 23 +++++++++++++++++++ scene.h | 6 +++++ sceneeditor.cpp | 61 +++++++++++++++++++++++++++++++++++++++++++------ sceneeditor.h | 8 +++++++ uilayer.cpp | 9 ++++++-- 8 files changed, 102 insertions(+), 10 deletions(-) diff --git a/EU07.cpp b/EU07.cpp index 281a8b38..0c0b8208 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -153,9 +153,11 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo Global.shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; Global.ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; + Global.altState = ( mods & GLFW_MOD_ALT ) ? true : false; // give the ui first shot at the input processing... if( true == UILayer.on_key( key, action ) ) { return; } + if( true == scene::Editor.on_key( key, action ) ) { return; } // ...if the input is left untouched, pass it on input::Keyboard.key( key, action ); diff --git a/Globals.h b/Globals.h index f141c17e..b9af0d59 100644 --- a/Globals.h +++ b/Globals.h @@ -23,6 +23,7 @@ struct global_settings { GLFWwindow *window{ nullptr }; bool shiftState{ false }; //m7todo: brzydko bool ctrlState{ false }; + bool altState{ false }; std::mt19937 random_engine{ std::mt19937( static_cast( std::time( NULL ) ) ) }; TDynamicObject *changeDynObj{ nullptr };// info o zmianie pojazdu TWorld *pWorld{ nullptr }; // wskaźnik na świat do usuwania pojazdów diff --git a/renderer.cpp b/renderer.cpp index 42be7b0e..a27fbb66 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1670,7 +1670,7 @@ opengl_renderer::Render( scene::basic_region *Region ) { Update_Lights( simulation::Lights ); Render( std::begin( m_sectionqueue ), std::end( m_sectionqueue ) ); - if( EditorModeFlag && FreeFlyModeFlag && Global.ControlPicking ) { + if( EditorModeFlag && FreeFlyModeFlag ) { // when editor mode is active calculate world position of the cursor // at this stage the z-buffer is filled with only ground geometry Update_Mouse_Position(); diff --git a/scene.cpp b/scene.cpp index 4586f442..569af7e3 100644 --- a/scene.cpp +++ b/scene.cpp @@ -422,6 +422,18 @@ basic_cell::erase( TAnimModel *Instance ) { // TODO: update cell bounding area } +// removes provided memory cell from the cell +void +basic_cell::erase( TMemCell *Memorycell ) { + + m_memorycells.erase( + std::remove_if( + std::begin( m_memorycells ), std::end( m_memorycells ), + [=]( TMemCell *memorycell ) { + return memorycell == Memorycell; } ), + std::end( m_memorycells ) ); +} + // registers provided path in the lookup directory of the cell void basic_cell::register_end( TTrack *Path ) { @@ -1282,6 +1294,17 @@ basic_region::erase_instance( TAnimModel *Instance ) { } } +// removes specified memory cell from the region +void +basic_region::erase_memorycell( TMemCell *Memorycell ) { + + auto const location { Memorycell->location() }; + + if( point_inside( location ) ) { + section( location ).erase( Memorycell ); + } +} + // inserts provided sound in the region void basic_region::insert_sound( sound_source *Sound, scratch_data &Scratchpad ) { diff --git a/scene.h b/scene.h index 1b7be690..041c8443 100644 --- a/scene.h +++ b/scene.h @@ -129,6 +129,9 @@ public: // removes provided model instance from the cell void erase( TAnimModel *Instance ); + // removes provided memory cell from the cell + void + erase( TMemCell *Memorycell ); // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple find( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) const; @@ -361,6 +364,9 @@ public: // removes specified instance of 3d model from the region void erase_instance( TAnimModel *Instance ); + // removes specified memory cell from the region + void + erase_memorycell( TMemCell *Memorycell ); // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); diff --git a/sceneeditor.cpp b/sceneeditor.cpp index fec5381a..51289923 100644 --- a/sceneeditor.cpp +++ b/sceneeditor.cpp @@ -18,13 +18,26 @@ namespace scene { basic_editor Editor; +bool +basic_editor::on_key( int const Key, int const Action ) { + + if( false == EditorModeFlag ) { return false; } + + if( ( Key == GLFW_KEY_LEFT_ALT ) + || ( Key == GLFW_KEY_RIGHT_ALT ) ) { + // intercept these while in editor mode + return true; + } + + return false; +} + bool basic_editor::on_mouse_button( int const Button, int const Action ) { - if( false == EditorModeFlag ) { return false; } - // TBD: automatically activate and enforce picking mode and/or freefly mode when editor is active? - if( false == FreeFlyModeFlag ) { return false; } - if( false == Global.ControlPicking ) { return false; } + if( false == EditorModeFlag ) { return false; } + // TBD: automatically activate and enforce freefly mode when editor is active? + if( false == FreeFlyModeFlag ) { return false; } if( Button == GLFW_MOUSE_BUTTON_LEFT ) { @@ -89,12 +102,17 @@ basic_editor::translate( glm::dvec3 const &Location ) { auto *node { m_node }; // placeholder for operations on multiple nodes auto location { Location }; + if( false == mode_snap() ) { + location.y = node->location().y; + } if( typeid( *node ) == typeid( TAnimModel ) ) { - // TBD, TODO: don't modify y coordinate if snap-to-ground mode is active? -// location.y = node->location().y; translate_instance( static_cast( node ), location ); } + else if( typeid( *node ) == typeid( TMemCell ) ) { + translate_memorycell( static_cast( node ), location ); + } + } void @@ -110,6 +128,9 @@ basic_editor::translate( float const Offset ) { if( typeid( *node ) == typeid( TAnimModel ) ) { translate_instance( static_cast( node ), offset ); } + else if( typeid( *node ) == typeid( TMemCell ) ) { + translate_memorycell( static_cast( node ), offset ); + } } void @@ -128,6 +149,22 @@ basic_editor::translate_instance( TAnimModel *Instance, float const Offset ) { Instance->location( location ); } +void +basic_editor::translate_memorycell( TMemCell *Memorycell, glm::dvec3 const &Location ) { + + simulation::Region->erase_memorycell( Memorycell ); + Memorycell->location( Location ); + simulation::Region->insert_memorycell( Memorycell, scene::scratch_data() ); +} + +void +basic_editor::translate_memorycell( TMemCell *Memorycell, float const Offset ) { + + auto location { Memorycell->location() }; + location.y += Offset; + Memorycell->location( location ); +} + void basic_editor::rotate( glm::vec3 const &Angle ) { @@ -144,6 +181,10 @@ basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) { // adjust node data glm::vec3 angle = glm::dvec3 { Instance->Angles() }; angle.y = clamp_circular( angle.y + Angle.y, 360.f ); + if( mode_snap() ) { + auto const quantizationstep { 15.f }; + angle.y = quantizationstep * std::round( angle.y * ( 1.f / quantizationstep ) ); + } Instance->Angles( angle ); // update scene } @@ -151,7 +192,7 @@ basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) { bool basic_editor::mode_translation() const { - return ( false == Global.ctrlState ); + return ( false == Global.altState ); } bool @@ -160,6 +201,12 @@ basic_editor::mode_translation_vertical() const { return ( true == Global.shiftState ); } +bool +basic_editor::mode_snap() const { + + return ( true == Global.ctrlState ); +} + } // scene //--------------------------------------------------------------------------- diff --git a/sceneeditor.h b/sceneeditor.h index 74f96d4a..b69874b8 100644 --- a/sceneeditor.h +++ b/sceneeditor.h @@ -17,6 +17,8 @@ class basic_editor { public: // methods + bool + on_key( int const Key, int const Action ); bool on_mouse_button( int const Button, int const Action ); bool @@ -43,6 +45,8 @@ private: mode_translation() const; bool mode_translation_vertical() const; + bool + mode_snap() const; void translate( glm::dvec3 const &Location ); void @@ -51,6 +55,10 @@ private: translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ); void translate_instance( TAnimModel *Instance, float const Offset ); + void + translate_memorycell( TMemCell *Memorycell, glm::dvec3 const &Location ); + void + translate_memorycell( TMemCell *Memorycell, float const Offset ); void rotate( glm::vec3 const &Angle ); void diff --git a/uilayer.cpp b/uilayer.cpp index d0f98db6..69fd954c 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -105,6 +105,13 @@ ui_layer::on_key( int const Key, int const Action ) { } if( Action == GLFW_RELEASE ) { return true; } // recognized, but ignored + + EditorModeFlag = ( Key == GLFW_KEY_F11 ); + if( ( true == EditorModeFlag ) + && ( false == Global.ControlPicking ) ) { + glfwSetInputMode( m_window, GLFW_CURSOR, GLFW_CURSOR_NORMAL ); + Global.ControlPicking = true; + } } default: { // everything else @@ -243,8 +250,6 @@ ui_layer::update() { "" ) ); } - EditorModeFlag = ( Global.iTextMode == GLFW_KEY_F11 ); - switch( Global.iTextMode ) { case( GLFW_KEY_F1 ) : { From 1056f9bb14c54af587130babaad43a847586c2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Mon, 9 Jul 2018 20:55:49 +0200 Subject: [PATCH 361/426] New proportional clutch regulator for DieselEngine --- McZapkie/Mover.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index cecacec6..bbd2b1df 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6022,6 +6022,12 @@ bool TMoverParameters::dizel_AutoGearCheck(void) else dizel_EngageSwitch(0.66); break; + case 5: + if (Vel>dizel_minVelfullengage) + dizel_EngageSwitch(1.0); + else + dizel_EngageSwitch(0.35*(1+RList[MainCtrlPos].R)*RList[MainCtrlPos].R); + break; default: if (hydro_TC && hydro_TC_Fill>0.01) dizel_EngageSwitch(1.0); @@ -6173,6 +6179,12 @@ double TMoverParameters::dizel_fillcheck(int mcp) else nreg = dizel_nmin * 0.75 + dizel_nmax * 0.25; break; + case 5: + if (Vel > dizel_minVelfullengage) + nreg = dizel_nmax; + else + nreg = dizel_nmin + 0.8 * (dizel_nmax - dizel_nmin) * RList[mcp].R; + break; default: realfill = 0; // sluczaj break; From 12d70fe3203fce97ac8d17b55f49d6825af8304d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 11 Jul 2018 17:45:50 +0200 Subject: [PATCH 362/426] virtual slider mouse input mode, minor refactoring, minor bug fixes --- Camera.cpp | 10 +-- EU07.cpp | 10 ++- Track.cpp | 6 +- Train.cpp | 67 ++++++++++-------- Train.h | 2 + command.cpp | 2 +- command.h | 6 +- gamepadinput.cpp | 10 ++- keyboardinput.cpp | 13 ++-- keyboardinput.h | 5 ++ mouseinput.cpp | 169 +++++++++++++++++++++++++++++++++++++++++----- mouseinput.h | 33 +++++++++ scene.cpp | 151 +---------------------------------------- scene.h | 53 +++++++-------- sceneeditor.cpp | 17 ++--- simulation.cpp | 20 +++--- uart.cpp | 4 +- uilayer.cpp | 10 ++- uilayer.h | 4 ++ utilities.h | 7 ++ 20 files changed, 330 insertions(+), 269 deletions(-) diff --git a/Camera.cpp b/Camera.cpp index 6e4f51ed..91e9cbfe 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -67,8 +67,8 @@ TCamera::OnCommand( command_data const &Command ) { case user_command::viewturn: { OnCursorMove( - reinterpret_cast( Command.param1 ) * 0.005 * Global.fMouseXScale / Global.ZoomFactor, - reinterpret_cast( Command.param2 ) * 0.01 * Global.fMouseYScale / Global.ZoomFactor ); + Command.param1 * 0.005 * Global.fMouseXScale / Global.ZoomFactor, + Command.param2 * 0.01 * Global.fMouseYScale / Global.ZoomFactor ); break; } @@ -86,7 +86,7 @@ TCamera::OnCommand( command_data const &Command ) { 1.0 ); // left-right - auto const movexparam { reinterpret_cast( Command.param1 ) }; + auto const movexparam { Command.param1 }; // 2/3rd of the stick range enables walk speed, past that we lerp between walk and run speed auto const movex { walkspeed + ( std::max( 0.0, std::abs( movexparam ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ) }; @@ -96,7 +96,7 @@ TCamera::OnCommand( command_data const &Command ) { 0.0 ); // forward-back - double const movezparam { reinterpret_cast( Command.param2 ) }; + double const movezparam { Command.param2 }; auto const movez { walkspeed + ( std::max( 0.0, std::abs( movezparam ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ) }; // NOTE: z-axis is flipped given world coordinate system m_moverate.z = ( @@ -121,7 +121,7 @@ TCamera::OnCommand( command_data const &Command ) { 1.0 ); // up-down - auto const moveyparam { reinterpret_cast( Command.param1 ) }; + auto const moveyparam { Command.param1 }; // 2/3rd of the stick range enables walk speed, past that we lerp between walk and run speed auto const movey { walkspeed + ( std::max( 0.0, std::abs( moveyparam ) - 0.65 ) / 0.35 ) * ( movespeed - walkspeed ) }; diff --git a/EU07.cpp b/EU07.cpp index 0c0b8208..c923cbf9 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -72,6 +72,7 @@ mouse_input Mouse; gamepad_input Gamepad; glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode std::unique_ptr uart; +user_command command; // currently issued control command, if any } @@ -170,13 +171,13 @@ void key_callback( GLFWwindow *window, int key, int scancode, int action, int mo if( Global.ControlPicking ) { // switch off glfwGetCursorPos( window, &input::mouse_pickmodepos.x, &input::mouse_pickmodepos.y ); - glfwSetInputMode( window, GLFW_CURSOR, GLFW_CURSOR_DISABLED ); + UILayer.set_cursor( GLFW_CURSOR_DISABLED ); glfwSetCursorPos( window, 0, 0 ); } else { // enter picking mode - glfwSetInputMode( window, GLFW_CURSOR, GLFW_CURSOR_NORMAL ); glfwSetCursorPos( window, input::mouse_pickmodepos.x, input::mouse_pickmodepos.y ); + UILayer.set_cursor( GLFW_CURSOR_NORMAL ); } // actually toggle the mode Global.ControlPicking = !Global.ControlPicking; @@ -461,6 +462,11 @@ int main(int argc, char *argv[]) if( true == Global.InputMouse ) { input::Mouse.poll(); } if( true == Global.InputGamepad ) { input::Gamepad.poll(); } if( input::uart != nullptr ) { input::uart->poll(); } + // TODO: wrap current command in object, include other input sources + input::command = ( + input::Mouse.command() != user_command::none ? + input::Mouse.command() : + input::Keyboard.command() ); } } catch( std::bad_alloc const &Error ) { diff --git a/Track.cpp b/Track.cpp index fc2b4347..375b270c 100644 --- a/Track.cpp +++ b/Track.cpp @@ -179,7 +179,7 @@ TTrack * TTrack::Create400m(int what, double dx) trk->Segment->Init( Math3D::vector3( -dx, 0, 0 ), Math3D::vector3( -dx, 0, 400 ), 10.0, 0, 0 ); // prosty trk->location( glm::dvec3{ -dx, 0, 200 } ); //środek, aby się mogło wyświetlić simulation::Paths.insert( trk ); - simulation::Region->insert_path( trk, scene::scratch_data() ); + simulation::Region->insert( trk ); return trk; }; @@ -273,11 +273,11 @@ TTrack * TTrack::NullCreate(int dir) // trzeba jeszcze dodać do odpowiedniego segmentu, aby się renderowały z niego pojazdy trk->location( glm::dvec3{ 0.5 * ( p1 + p2 ) } ); //środek, aby się mogło wyświetlić simulation::Paths.insert( trk ); - simulation::Region->insert_path( trk, scene::scratch_data() ); + simulation::Region->insert( trk ); if( trk2 ) { trk2->location( trk->location() ); // ten sam środek jest simulation::Paths.insert( trk2 ); - simulation::Region->insert_path( trk2, scene::scratch_data() ); + simulation::Region->insert( trk2 ); } return trk; }; diff --git a/Train.cpp b/Train.cpp index 81c0d8a6..2aa14ed0 100644 --- a/Train.cpp +++ b/Train.cpp @@ -26,6 +26,12 @@ http://mozilla.org/MPL/2.0/. #include "mtable.h" #include "Console.h" +namespace input { + +extern user_command command; + +} + void control_mapper::insert( TGauge const &Gauge, std::string const &Label ) { @@ -922,7 +928,7 @@ void TTrain::OnCommand_independentbrakeset( TTrain *Train, command_data const &C Train->mvControlled->LocalBrakePosA = ( clamp( - reinterpret_cast( Command.param1 ), + Command.param1, 0.0, 1.0 ) ); /* Train->mvControlled->LocalBrakePos = ( @@ -931,7 +937,7 @@ void TTrain::OnCommand_independentbrakeset( TTrain *Train, command_data const &C 0.0, LocalBrakePosNo, clamp( - reinterpret_cast( Command.param1 ), + Command.param1, 0.0, 1.0 ) ) ) ); */ } @@ -1003,26 +1009,16 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co Train->set_train_brake( Train->mvOccupied->BrakeCtrlPos - Global.fBrakeStep ); } } - else { - // release - if( ( Train->mvOccupied->BrakeCtrlPos == -1 ) - && ( Train->mvOccupied->BrakeHandle == FVel6 ) - && ( Train->DynamicObject->Controller != AIdriver ) - && ( Global.iFeedbackMode < 3 ) ) { - // Odskakiwanie hamulce EP - Train->set_train_brake( 0 ); - } - } } void TTrain::OnCommand_trainbrakeset( TTrain *Train, command_data const &Command ) { - Train->mvControlled->BrakeLevelSet( + Train->mvOccupied->BrakeLevelSet( interpolate( - Train->mvControlled->Handle->GetPos( bh_MIN ), - Train->mvControlled->Handle->GetPos( bh_MAX ), + Train->mvOccupied->Handle->GetPos( bh_MIN ), + Train->mvOccupied->Handle->GetPos( bh_MAX ), clamp( - reinterpret_cast( Command.param1 ), + Command.param1, 0.0, 1.0 ) ) ); } @@ -4334,18 +4330,35 @@ bool TTrain::Update( double const Deltatime ) { // Ra: TODO: odczyty klawiatury/pulpitu nie powinny być uzależnione od istnienia modelu kabiny if( ( DynamicObject->Mechanik != nullptr ) - && ( false == DynamicObject->Mechanik->AIControllFlag ) // nie blokujemy AI - && ( ( mvOccupied->TrainType == dt_ET40 ) - || ( mvOccupied->TrainType == dt_EP05 ) ) ) { - // dla ET40 i EU05 automatyczne cofanie nastawnika - i tak nie będzie to działać dobrze... - // TODO: remove direct keyboard check, use deltatime to stabilize speed - if( ( glfwGetKey( Global.window, GLFW_KEY_KP_ADD ) != GLFW_TRUE ) - && ( mvOccupied->MainCtrlPos > mvOccupied->MainCtrlActualPos ) ) { - mvOccupied->DecMainCtrl( 1 ); + && ( false == DynamicObject->Mechanik->AIControllFlag ) ) { + // nie blokujemy AI + if( ( mvOccupied->TrainType == dt_ET40 ) + || ( mvOccupied->TrainType == dt_EP05 ) ) { + // dla ET40 i EU05 automatyczne cofanie nastawnika - i tak nie będzie to działać dobrze... + // TODO: use deltatime to stabilize speed + if( false == ( + ( input::command == user_command::mastercontrollerset ) + || ( input::command == user_command::mastercontrollerincrease ) + || ( input::command == user_command::mastercontrollerdecrease ) ) ) { + if( mvOccupied->MainCtrlPos > mvOccupied->MainCtrlActualPos ) { + mvOccupied->DecMainCtrl( 1 ); + } + else if( mvOccupied->MainCtrlPos < mvOccupied->MainCtrlActualPos ) { + // Ra 15-01: a to nie miało być tylko cofanie? + mvOccupied->IncMainCtrl( 1 ); + } + } } - if( ( glfwGetKey( Global.window, GLFW_KEY_KP_SUBTRACT ) != GLFW_TRUE ) - && ( mvOccupied->MainCtrlPos < mvOccupied->MainCtrlActualPos ) ) { - mvOccupied->IncMainCtrl( 1 ); // Ra 15-01: a to nie miało być tylko cofanie? + + if( ( mvOccupied->BrakeHandle == FVel6 ) + && ( mvOccupied->fBrakeCtrlPos < 0.0 ) + && ( Global.iFeedbackMode < 3 ) ) { + // Odskakiwanie hamulce EP + if( false == ( + ( input::command == user_command::trainbrakeset ) + || ( input::command == user_command::trainbrakedecrease ) ) ) { + set_train_brake( 0 ); + } } } diff --git a/Train.h b/Train.h index 10416620..af61e8d4 100644 --- a/Train.h +++ b/Train.h @@ -648,6 +648,8 @@ private: inline TDynamicObject const *Dynamic() const { return DynamicObject; }; inline TMoverParameters *Controlled() { return mvControlled; }; inline TMoverParameters const *Controlled() const { return mvControlled; }; + inline TMoverParameters *Occupied() { return mvOccupied; }; + inline TMoverParameters const *Occupied() const { return mvOccupied; }; void DynamicSet(TDynamicObject *d); }; diff --git a/command.cpp b/command.cpp index 85d33b61..f3acb430 100644 --- a/command.cpp +++ b/command.cpp @@ -243,7 +243,7 @@ command_queue::pop( command_data &Command, std::size_t const Recipient ) { } void -command_relay::post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, int const Action, std::uint16_t const Recipient ) const { +command_relay::post( user_command const Command, double const Param1, double const Param2, int const Action, std::uint16_t const Recipient ) const { auto const &command = simulation::Commands_descriptions[ static_cast( Command ) ]; if( ( command.target == command_target::vehicle ) diff --git a/command.h b/command.h index d44e90fd..2b9dd446 100644 --- a/command.h +++ b/command.h @@ -231,8 +231,8 @@ struct command_data { user_command command; int action; // press, repeat or release - std::uint64_t param1; - std::uint64_t param2; + double param1; + double param2; double time_delta; }; @@ -282,7 +282,7 @@ public: // posts specified command for the specified recipient // TODO: replace uint16_t with recipient handle, based on item id void - post( user_command const Command, std::uint64_t const Param1, std::uint64_t const Param2, + post( user_command const Command, double const Param1, double const Param2, int const Action, std::uint16_t const Recipient ) const; private: // types diff --git a/gamepadinput.cpp b/gamepadinput.cpp index ec433f1c..95039614 100644 --- a/gamepadinput.cpp +++ b/gamepadinput.cpp @@ -198,8 +198,8 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g double const turny = -Rightstick.y * 10.0 * deltatime; m_relay.post( user_command::viewturn, - reinterpret_cast( turnx ), - reinterpret_cast( turny ), + turnx, + turny, GLFW_PRESS, // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place @@ -211,12 +211,10 @@ gamepad_input::process_axes( glm::vec2 Leftstick, glm::vec2 const &Rightstick, g if( ( Leftstick.x != 0.0 || Leftstick.y != 0.0 ) || ( m_leftstick.x != 0.0 || m_leftstick.y != 0.0 ) ) { - double const movex = static_cast( Leftstick.x ); - double const movez = static_cast( Leftstick.y ); m_relay.post( user_command::movehorizontal, - reinterpret_cast( movex ), - reinterpret_cast( movez ), + Leftstick.x, + Leftstick.y, GLFW_PRESS, 0 ); } diff --git a/keyboardinput.cpp b/keyboardinput.cpp index acede6ab..63b9897f 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -161,6 +161,10 @@ keyboard_input::key( int const Key, int const Action ) { // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place m_relay.post( lookup->second, 0, 0, Action, 0 ); + m_command = ( + Action == GLFW_RELEASE ? + user_command::none : + lookup->second ); return true; } @@ -600,14 +604,12 @@ keyboard_input::poll() { if( ( movementhorizontal.x != 0.f || movementhorizontal.y != 0.f ) || ( m_movementhorizontal.x != 0.f || m_movementhorizontal.y != 0.f ) ) { - double const movexparam = static_cast( movementhorizontal.x ); - double const movezparam = static_cast( movementhorizontal.y ); m_relay.post( ( true == Global.ctrlState ? user_command::movehorizontalfast : user_command::movehorizontal ), - reinterpret_cast( movexparam ), - reinterpret_cast( movezparam ), + movementhorizontal.x, + movementhorizontal.y, GLFW_PRESS, 0 ); } @@ -623,12 +625,11 @@ keyboard_input::poll() { if( ( movementvertical != 0.f ) || ( m_movementvertical != 0.f ) ) { - double const moveyparam = static_cast( movementvertical ); m_relay.post( ( true == Global.ctrlState ? user_command::moveverticalfast : user_command::movevertical ), - reinterpret_cast( moveyparam ), + movementvertical, 0, GLFW_PRESS, 0 ); diff --git a/keyboardinput.h b/keyboardinput.h index ab5bb0bc..720dde3a 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -28,6 +28,10 @@ public: key( int const Key, int const Action ); void poll(); + inline + user_command const + command() const { + return m_command; } private: // types @@ -65,6 +69,7 @@ private: // members commandsetup_sequence m_commands; + user_command m_command; // last, if any, issued command usercommand_map m_bindings; command_relay m_relay; bool m_shift{ false }; diff --git a/mouseinput.cpp b/mouseinput.cpp index 4bfceae0..af45af26 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -16,9 +16,111 @@ http://mozilla.org/MPL/2.0/. #include "world.h" #include "train.h" #include "renderer.h" +#include "uilayer.h" extern TWorld World; +void +mouse_slider::bind( user_command const &Command ) { + + m_command = Command; + + auto const *train { World.train() }; + TMoverParameters const *vehicle { nullptr }; + switch( m_command ) { + case user_command::mastercontrollerset: + case user_command::secondcontrollerset: { + vehicle = ( train ? train->Controlled() : nullptr ); + break; + } + case user_command::trainbrakeset: + case user_command::independentbrakeset: { + vehicle = ( train ? train->Occupied() : nullptr ); + break; + } + default: { + break; + } + } + if( vehicle == nullptr ) { return; } + + // calculate initial value and accepted range + switch( m_command ) { + case user_command::mastercontrollerset: { + m_valuerange = ( + vehicle->CoupledCtrl ? + vehicle->MainCtrlPosNo + vehicle->ScndCtrlPosNo : + vehicle->MainCtrlPosNo ); + m_value = ( + vehicle->CoupledCtrl ? + vehicle->MainCtrlPos + vehicle->ScndCtrlPos : + vehicle->MainCtrlPos ); + m_analogue = false; + break; + } + case user_command::secondcontrollerset: { + m_valuerange = vehicle->ScndCtrlPosNo; + m_value = vehicle->ScndCtrlPos; + m_analogue = false; + break; + } + case user_command::trainbrakeset: { + m_valuerange = 1.0; + m_value = ( vehicle->fBrakeCtrlPos - vehicle->Handle->GetPos( bh_MIN ) ) / ( vehicle->Handle->GetPos( bh_MAX ) - vehicle->Handle->GetPos( bh_MIN ) ); + m_analogue = true; + break; + } + case user_command::independentbrakeset: { + m_valuerange = 1.0; + m_value = vehicle->LocalBrakePosA; + m_analogue = true; + break; + } + default: { + m_valuerange = 1; + break; + } + } + // hide the cursor and place it in accordance with current slider value + glfwGetCursorPos( Global.window, &m_cursorposition.x, &m_cursorposition.y ); + UILayer.set_cursor( GLFW_CURSOR_DISABLED ); + + auto const controlsize { Global.iWindowHeight * 0.75 }; + auto const controledge { Global.iWindowHeight * 0.5 + controlsize * 0.5 }; + auto const stepsize { controlsize / m_valuerange }; + + glfwSetCursorPos( + Global.window, + Global.iWindowWidth * 0.5, + ( m_analogue ? + controledge - ( 1.0 - m_value ) * controlsize : + controledge - m_value * stepsize - 0.5 * stepsize ) ); +} + +void +mouse_slider::release() { + + m_command = user_command::none; + glfwSetCursorPos( Global.window, m_cursorposition.x, m_cursorposition.y ); + UILayer.set_cursor( GLFW_CURSOR_NORMAL ); +} + +void +mouse_slider::on_move( double const Mousex, double const Mousey ) { + + auto const controlsize { Global.iWindowHeight * 0.75 }; + auto const controledge { Global.iWindowHeight * 0.5 + controlsize * 0.5 }; + auto const stepsize { controlsize / m_valuerange }; + + auto mousey = clamp( Mousey, controledge - controlsize, controledge ); + m_value = ( + m_analogue ? + 1.0 - ( ( controledge - mousey ) / controlsize ) : + std::floor( ( controledge - mousey ) / stepsize ) ); +} + + + bool mouse_input::init() { @@ -40,8 +142,8 @@ mouse_input::move( double Mousex, double Mousey ) { // default control mode m_relay.post( user_command::viewturn, - reinterpret_cast( Mousex ), - reinterpret_cast( Mousey ), + Mousex, + Mousey, GLFW_PRESS, // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place @@ -49,6 +151,17 @@ mouse_input::move( double Mousex, double Mousey ) { } else { // control picking mode + if( m_slider.command() != user_command::none ) { + m_slider.on_move( Mousex, Mousey ); + m_relay.post( + m_slider.command(), + m_slider.value(), + 0, + GLFW_PRESS, + // TODO: pass correct entity id once the missing systems are in place + 0 ); + } + if( false == m_pickmodepanning ) { // even if the view panning isn't active we capture the cursor position in case it does get activated m_cursorposition.x = Mousex; @@ -59,8 +172,8 @@ mouse_input::move( double Mousex, double Mousey ) { auto const viewoffset = cursorposition - m_cursorposition; m_relay.post( user_command::viewturn, - reinterpret_cast( viewoffset.x ), - reinterpret_cast( viewoffset.y ), + viewoffset.x, + viewoffset.y, GLFW_PRESS, // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 // TODO: pass correct entity id once the missing systems are in place @@ -109,6 +222,11 @@ mouse_input::button( int const Button, int const Action ) { mousecommand = user_command::none; } else { + if( Button == GLFW_MOUSE_BUTTON_LEFT ) { + if( m_slider.command() != user_command::none ) { + m_slider.release(); + } + } // if it's the right mouse button that got released and we had no command active, we were potentially in view panning mode; stop it if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { m_pickmodepanning = false; @@ -140,11 +258,6 @@ mouse_input::button( int const Button, int const Action ) { default: { break; } } } - // NOTE: basic keyboard controls don't have any parameters - // NOTE: as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 - // TODO: pass correct entity id once the missing systems are in place - m_relay.post( mousecommand, 0, 0, Action, 0 ); - m_updateaccumulator = -0.25; // prevent potential command repeat right after issuing one switch( mousecommand ) { case user_command::mastercontrollerincrease: @@ -161,10 +274,23 @@ mouse_input::button( int const Button, int const Action ) { m_varyingpollrate = true; break; } + case user_command::mastercontrollerset: + case user_command::secondcontrollerset: + case user_command::trainbrakeset: + case user_command::independentbrakeset: { + m_slider.bind( mousecommand ); + mousecommand = user_command::none; + return; + } default: { break; } } + // NOTE: basic keyboard controls don't have any parameters + // NOTE: as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + m_relay.post( mousecommand, 0, 0, Action, 0 ); + m_updateaccumulator = -0.25; // prevent potential command repeat right after issuing one } else { // if we don't have any recognized element under the cursor and the right button was pressed, enter view panning mode @@ -204,16 +330,25 @@ mouse_input::poll() { } } +user_command +mouse_input::command() const { + + return ( + m_slider.command() != user_command::none ? m_slider.command() : + m_mousecommandleft != user_command::none ? m_mousecommandleft : + m_mousecommandright ); +} + void mouse_input::default_bindings() { m_mousecommands = { { "mainctrl:", { - user_command::mastercontrollerincrease, - user_command::mastercontrollerdecrease } }, + user_command::mastercontrollerset, + user_command::none } }, { "scndctrl:", { - user_command::secondcontrollerincrease, - user_command::secondcontrollerdecrease } }, + user_command::secondcontrollerset, + user_command::none } }, { "shuntmodepower:", { user_command::secondcontrollerincrease, user_command::secondcontrollerdecrease } }, @@ -221,11 +356,11 @@ mouse_input::default_bindings() { user_command::reverserincrease, user_command::reverserdecrease } }, { "brakectrl:", { - user_command::trainbrakeincrease, - user_command::trainbrakedecrease } }, + user_command::trainbrakeset, + user_command::none } }, { "localbrake:", { - user_command::independentbrakeincrease, - user_command::independentbrakedecrease } }, + user_command::independentbrakeset, + user_command::none } }, { "manualbrake:", { user_command::manualbrakeincrease, user_command::manualbrakedecrease } }, diff --git a/mouseinput.h b/mouseinput.h index e87cdc42..c0fa2cb2 100644 --- a/mouseinput.h +++ b/mouseinput.h @@ -12,6 +12,36 @@ http://mozilla.org/MPL/2.0/. #include #include "command.h" +// virtual slider; value determined by position of the mouse +class mouse_slider { + +public: +// constructors + mouse_slider() = default; +// methods + void + bind( user_command const &Command ); + void + release(); + void + on_move( double const Mousex, double const Mousey ); + inline + user_command + command() const { + return m_command; } + double + value() const { + return m_value; } + +private: +// members + user_command m_command { user_command::none }; + double m_value { 0.0 }; + double m_valuerange { 0.0 }; + bool m_analogue { false }; + glm::dvec2 m_cursorposition { 0.0 }; +}; + class mouse_input { public: @@ -27,6 +57,8 @@ public: move( double const Mousex, double const Mousey ); void poll(); + user_command + command() const; private: // types @@ -44,6 +76,7 @@ private: // members command_relay m_relay; + mouse_slider m_slider; // virtual control, when active translates intercepted mouse position to a value controlcommands_map m_mousecommands; user_command m_mousecommandleft { user_command::none }; // last if any command issued with left mouse button user_command m_mousecommandright { user_command::none }; // last if any command issued with right mouse button diff --git a/scene.cpp b/scene.cpp index 569af7e3..003e2622 100644 --- a/scene.cpp +++ b/scene.cpp @@ -1118,7 +1118,7 @@ basic_region::RadioStop( glm::dvec3 const &Location ) { } void -basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad, bool const Transform ) { +basic_region::insert( shape_node Shape, scratch_data &Scratchpad, bool const Transform ) { // shape might need to be split into smaller pieces, so we create list of nodes instead of just single one // using deque so we can do single pass iterating and addding generated pieces without invalidating anything @@ -1182,7 +1182,7 @@ basic_region::insert_shape( shape_node Shape, scratch_data &Scratchpad, bool con // inserts provided lines in the region void -basic_region::insert_lines( lines_node Lines, scratch_data &Scratchpad ) { +basic_region::insert( lines_node Lines, scratch_data &Scratchpad ) { if( Lines.m_data.vertices.empty() ) { return; } // transform point coordinates if needed @@ -1224,135 +1224,6 @@ basic_region::insert_lines( lines_node Lines, scratch_data &Scratchpad ) { } } -// inserts provided track in the region -void -basic_region::insert_path( TTrack *Path, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto location = Path->location(); - - if( point_inside( location ) ) { - // NOTE: nodes placed outside of region boundaries are discarded - section( location ).insert( Path ); - } - else { - // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: track node \"" + Path->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); - } - // also register path ends in appropriate sections, for path merging lookups - // TODO: clean this up during track refactoring - for( auto &point : Path->endpoints() ) { - register_path( Path, point ); - } -} - -// inserts provided track in the region -void -basic_region::insert_traction( TTraction *Traction, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto location = Traction->location(); - - if( point_inside( location ) ) { - // NOTE: nodes placed outside of region boundaries are discarded - section( location ).insert( Traction ); - } - else { - // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: traction node \"" + Traction->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); - } - // also register traction ends in appropriate sections, for path merging lookups - // TODO: clean this up during track refactoring - for( auto &point : Traction->endpoints() ) { - register_traction( Traction, point ); - } -} - -// inserts provided instance of 3d model in the region -void -basic_region::insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ) { - - auto const location { Instance->location() }; - - if( point_inside( location ) ) { - // NOTE: nodes placed outside of region boundaries are discarded - section( location ).insert( Instance ); - } - else { - // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: model node \"" + Instance->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); - } -} - -// removes specified instance of 3d model from the region -void -basic_region::erase_instance( TAnimModel *Instance ) { - - auto const location { Instance->location() }; - - if( point_inside( location ) ) { - // NOTE: nodes placed outside of region boundaries are discarded - section( location ).erase( Instance ); - } -} - -// removes specified memory cell from the region -void -basic_region::erase_memorycell( TMemCell *Memorycell ) { - - auto const location { Memorycell->location() }; - - if( point_inside( location ) ) { - section( location ).erase( Memorycell ); - } -} - -// inserts provided sound in the region -void -basic_region::insert_sound( sound_source *Sound, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto location = Sound->location(); - - if( point_inside( location ) ) { - // NOTE: nodes placed outside of region boundaries are discarded - section( location ).insert( Sound ); - } - else { - // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: sound node \"" + Sound->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); - } -} - -// inserts provided event launcher in the region -void -basic_region::insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto location = Launcher->location(); - - if( point_inside( location ) ) { - // NOTE: nodes placed outside of region boundaries are discarded - section( location ).insert( Launcher ); - } - else { - // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: event launcher \"" + Launcher->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); - } -} - -// inserts provided memory cell in the region -void -basic_region::insert_memorycell( TMemCell *Memorycell, scratch_data &Scratchpad ) { - // NOTE: bounding area isn't present/filled until track class and wrapper refactoring is done - auto location = Memorycell->location(); - - if( point_inside( location ) ) { - // NOTE: nodes placed outside of region boundaries are discarded - section( location ).insert( Memorycell ); - } - else { - // tracks are guaranteed to hava a name so we can skip the check - ErrorLog( "Bad scenario: memory cell \"" + Memorycell->name() + "\" placed in location outside region bounds (" + to_string( location ) + ")" ); - } -} - // find a vehicle located neares to specified location, within specified radius, optionally discarding vehicles without drivers std::tuple basic_region::find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ) { @@ -1463,24 +1334,6 @@ basic_region::sections( glm::dvec3 const &Point, float const Radius ) { return m_scratchpad.sections; } -// registers specified path in the lookup directory of a cell enclosing specified point -void -basic_region::register_path( TTrack *Path, glm::dvec3 const &Point ) { - - if( point_inside( Point ) ) { - section( Point ).register_node( Path, Point ); - } -} - -// registers specified end point of the provided traction piece in the lookup directory of the region -void -basic_region::register_traction( TTraction *Traction, glm::dvec3 const &Point ) { - - if( point_inside( Point ) ) { - section( Point ).register_node( Traction, Point ); - } -} - // checks whether specified point is within boundaries of the region bool basic_region::point_inside( glm::dvec3 const &Location ) { diff --git a/scene.h b/scene.h index 041c8443..78ebfbe6 100644 --- a/scene.h +++ b/scene.h @@ -339,34 +339,35 @@ public: RadioStop( glm::dvec3 const &Location ); // inserts provided shape in the region void - insert_shape( shape_node Shape, scratch_data &Scratchpad, bool const Transform ); + insert( shape_node Shape, scratch_data &Scratchpad, bool const Transform ); // inserts provided lines in the region void - insert_lines( lines_node Lines, scratch_data &Scratchpad ); - // inserts provided track in the region + insert( lines_node Lines, scratch_data &Scratchpad ); + // inserts provided node in the region + template void - insert_path( TTrack *Path, scratch_data &Scratchpad ); - // inserts provided track in the region + insert( Type_ *Node ) { + auto const location { Node->location() }; + if( false == point_inside( location ) ) { + // NOTE: nodes placed outside of region boundaries are discarded + // TBD, TODO: clamp coordinates to region boundaries? + return; } + section( location ).insert( Node ); } + // inserts provided node in the region and registers its ends in lookup directory + template void - insert_traction( TTraction *Traction, scratch_data &Scratchpad ); - // inserts provided instance of 3d model in the region + insert_and_register( Type_ *Node ) { + insert( Node ); + for( auto const &point : Node->endpoints() ) { + if( point_inside( point ) ) { + section( point ).register_node( Node, point ); } } } + // removes specified node from the region + template void - insert_instance( TAnimModel *Instance, scratch_data &Scratchpad ); - // inserts provided sound in the region - void - insert_sound( sound_source *Sound, scratch_data &Scratchpad ); - // inserts provided event launcher in the region - void - insert_launcher( TEventLauncher *Launcher, scratch_data &Scratchpad ); - // inserts provided memory cell in the region - void - insert_memorycell( TMemCell *Memorycell, scratch_data &Scratchpad ); - // removes specified instance of 3d model from the region - void - erase_instance( TAnimModel *Instance ); - // removes specified memory cell from the region - void - erase_memorycell( TMemCell *Memorycell ); + erase( Type_ *Node ) { + auto const location{ Node->location() }; + if( point_inside( location ) ) { + section( location ).erase( Node ); } } // find a vehicle located nearest to specified point, within specified radius. reurns: located vehicle and distance std::tuple find_vehicle( glm::dvec3 const &Point, float const Radius, bool const Onlycontrolled, bool const Findbycoupler ); @@ -393,12 +394,6 @@ private: }; // methods - // registers specified end point of the provided path in the lookup directory of the region - void - register_path( TTrack *Path, glm::dvec3 const &Point ); - // registers specified end point of the provided traction piece in the lookup directory of the region - void - register_traction( TTraction *Traction, glm::dvec3 const &Point ); // checks whether specified point is within boundaries of the region bool point_inside( glm::dvec3 const &Location ); diff --git a/sceneeditor.cpp b/sceneeditor.cpp index 51289923..c8144244 100644 --- a/sceneeditor.cpp +++ b/sceneeditor.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "simulation.h" +#include "uilayer.h" #include "renderer.h" namespace scene { @@ -46,7 +47,7 @@ basic_editor::on_mouse_button( int const Button, int const Action ) { m_node = GfxRenderer.Update_Pick_Node(); m_nodesnapshot = { m_node }; if( m_node ) { - glfwSetInputMode( Global.window, GLFW_CURSOR, GLFW_CURSOR_DISABLED ); + UILayer.set_cursor( GLFW_CURSOR_DISABLED ); } } else { @@ -54,7 +55,7 @@ basic_editor::on_mouse_button( int const Button, int const Action ) { // TODO: record the current undo step on the undo stack m_nodesnapshot = { m_node }; if( m_node ) { - glfwSetInputMode( Global.window, GLFW_CURSOR, GLFW_CURSOR_NORMAL ); + UILayer.set_cursor( GLFW_CURSOR_NORMAL ); } } @@ -136,9 +137,9 @@ basic_editor::translate( float const Offset ) { void basic_editor::translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ) { - simulation::Region->erase_instance( Instance ); + simulation::Region->erase( Instance ); Instance->location( Location ); - simulation::Region->insert_instance( Instance, scene::scratch_data() ); + simulation::Region->insert( Instance ); } void @@ -152,9 +153,9 @@ basic_editor::translate_instance( TAnimModel *Instance, float const Offset ) { void basic_editor::translate_memorycell( TMemCell *Memorycell, glm::dvec3 const &Location ) { - simulation::Region->erase_memorycell( Memorycell ); + simulation::Region->erase( Memorycell ); Memorycell->location( Location ); - simulation::Region->insert_memorycell( Memorycell, scene::scratch_data() ); + simulation::Region->insert( Memorycell ); } void @@ -182,8 +183,8 @@ basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) { glm::vec3 angle = glm::dvec3 { Instance->Angles() }; angle.y = clamp_circular( angle.y + Angle.y, 360.f ); if( mode_snap() ) { - auto const quantizationstep { 15.f }; - angle.y = quantizationstep * std::round( angle.y * ( 1.f / quantizationstep ) ); + // TBD, TODO: adjustable quantization step + angle.y = quantize( angle.y, 15.f ); } Instance->Angles( angle ); // update scene diff --git a/simulation.cpp b/simulation.cpp index 39ab215b..e5a7dd65 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -327,7 +327,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad delete pathnode; */ } - simulation::Region->insert_path( path, Scratchpad ); + simulation::Region->insert_and_register( path ); } else if( nodedata.type == "traction" ) { @@ -338,7 +338,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == simulation::Traction.insert( traction ) ) { ErrorLog( "Bad scenario: traction piece with duplicate name \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } - simulation::Region->insert_traction( traction, Scratchpad ); + simulation::Region->insert_and_register( traction ); } else if( nodedata.type == "tractionpowersource" ) { @@ -367,14 +367,14 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad auto const cellcount = instance->TerrainCount() + 1; // zliczenie submodeli for( auto i = 1; i < cellcount; ++i ) { auto *submodel = instance->TerrainSquare( i - 1 ); - simulation::Region->insert_shape( + simulation::Region->insert( scene::shape_node().convert( submodel ), Scratchpad, false ); // if there's more than one group of triangles in the cell they're held as children of the primary submodel submodel = submodel->ChildGet(); while( submodel != nullptr ) { - simulation::Region->insert_shape( + simulation::Region->insert( scene::shape_node().convert( submodel ), Scratchpad, false ); @@ -398,7 +398,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == simulation::Instances.insert( instance ) ) { ErrorLog( "Bad scenario: 3d model instance with duplicate name \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } - simulation::Region->insert_instance( instance, Scratchpad ); + simulation::Region->insert( instance ); } } else if( ( nodedata.type == "triangles" ) @@ -407,7 +407,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == Scratchpad.binary.terrain ) { - simulation::Region->insert_shape( + simulation::Region->insert( scene::shape_node().import( Input, nodedata ), Scratchpad, @@ -424,7 +424,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == Scratchpad.binary.terrain ) { - simulation::Region->insert_lines( + simulation::Region->insert( scene::lines_node().import( Input, nodedata ), Scratchpad ); @@ -440,7 +440,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == simulation::Memory.insert( memorycell ) ) { ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } - simulation::Region->insert_memorycell( memorycell, Scratchpad ); + simulation::Region->insert( memorycell ); } else if( nodedata.type == "eventlauncher" ) { @@ -454,7 +454,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad simulation::Events.queue( eventlauncher ); } else { - simulation::Region->insert_launcher( eventlauncher, Scratchpad ); + simulation::Region->insert( eventlauncher ); } } else if( nodedata.type == "sound" ) { @@ -463,7 +463,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad if( false == simulation::Sounds.insert( sound ) ) { ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } - simulation::Region->insert_sound( sound, Scratchpad ); + simulation::Region->insert( sound ); } } diff --git a/uart.cpp b/uart.cpp index 2672c6bf..c94f7b57 100644 --- a/uart.cpp +++ b/uart.cpp @@ -208,7 +208,7 @@ void uart_input::poll() double const position { (float)( ( (uint16_t)buffer[ 8 ] | ( (uint16_t)buffer[ 9 ] << 8 ) ) - conf.mainbrakemin ) / ( conf.mainbrakemax - conf.mainbrakemin ) }; relay.post( user_command::trainbrakeset, - reinterpret_cast( position ), + position, 0, GLFW_PRESS, // TODO: pass correct entity id once the missing systems are in place @@ -219,7 +219,7 @@ void uart_input::poll() double const position { (float)( ( (uint16_t)buffer[ 10 ] | ( (uint16_t)buffer[ 11 ] << 8 ) ) - conf.localbrakemin ) / ( conf.localbrakemax - conf.localbrakemin ) }; relay.post( user_command::independentbrakeset, - reinterpret_cast( position ), + position, 0, GLFW_PRESS, // TODO: pass correct entity id once the missing systems are in place diff --git a/uilayer.cpp b/uilayer.cpp index 69fd954c..260710c0 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -109,7 +109,7 @@ ui_layer::on_key( int const Key, int const Action ) { EditorModeFlag = ( Key == GLFW_KEY_F11 ); if( ( true == EditorModeFlag ) && ( false == Global.ControlPicking ) ) { - glfwSetInputMode( m_window, GLFW_CURSOR, GLFW_CURSOR_NORMAL ); + set_cursor( GLFW_CURSOR_NORMAL ); Global.ControlPicking = true; } } @@ -1113,6 +1113,13 @@ ui_layer::render() { glPopAttrib(); } +void +ui_layer::set_cursor( int const Mode ) { + + glfwSetInputMode( m_window, GLFW_CURSOR, Mode ); + m_cursorvisible = ( Mode != GLFW_CURSOR_DISABLED ); +} + void ui_layer::set_progress( float const Progress, float const Subtaskprogress ) { @@ -1214,6 +1221,7 @@ void ui_layer::render_tooltip() { if( m_tooltip.empty() ) { return; } + if( false == m_cursorvisible ) { return; } glm::dvec2 mousepos; glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); diff --git a/uilayer.h b/uilayer.h index 7e27aab8..ee6ea8e3 100644 --- a/uilayer.h +++ b/uilayer.h @@ -52,6 +52,9 @@ public: // draws requested UI elements void render(); + // + void + set_cursor( int const Mode ); // stores operation progress void set_progress( float const Progress = 0.0f, float const Subtaskprogress = 0.0f ); @@ -114,6 +117,7 @@ private: int tprev; // poprzedni czas double VelPrev; // poprzednia prędkość double Acc; // przyspieszenie styczne + bool m_cursorvisible { false }; }; extern ui_layer UILayer; diff --git a/utilities.h b/utilities.h index 21dedce9..089c2eb9 100644 --- a/utilities.h +++ b/utilities.h @@ -228,6 +228,13 @@ clamp_circular( Type_ Value, Type_ const Range = static_cast(360) ) { return Value; } +template +Type_ +quantize( Type_ const Value, Type_ const Step ) { + + return ( Step * std::round( Value / Step ) ); +} + template Type_ min_speed( Type_ const Left, Type_ const Right ) { From ed1e0d8a102aff6eda1e8f5ba729df38b1725c26 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 14 Jul 2018 23:44:27 +0200 Subject: [PATCH 363/426] refactoring: basic application code wrapper --- AnimModel.cpp | 1 + AnimModel.h | 6 +- Classes.h | 4 +- Console.cpp | 3 +- Driver.cpp | 7 +- DynObj.h | 2 +- EU07.cpp | 468 +----------------------------------- EvLaunch.cpp | 2 +- Globals.h | 1 - Model3d.cpp | 1 + Model3d.h | 10 +- Track.h | 4 +- Traction.h | 2 +- Train.cpp | 2 +- World.cpp | 206 +--------------- World.h | 49 +--- application.cpp | 514 ++++++++++++++++++++++++++++++++++++++++ application.h | 46 ++++ audiorenderer.h | 3 +- keyboardinput.cpp | 3 - maszyna.vcxproj.filters | 18 +- messaging.cpp | 13 +- moon.cpp | 2 +- mouseinput.cpp | 19 +- mtable.cpp | 4 +- mtable.h | 2 +- renderer.cpp | 2 +- scene.h | 6 +- sceneeditor.cpp | 6 +- simulation.cpp | 144 ++++++----- simulation.h | 26 +- simulationtime.cpp | 192 +++++++++++++++ simulationtime.h | 66 ++++++ sky.h | 2 +- stars.h | 2 +- station.cpp | 6 + station.h | 8 +- sun.cpp | 2 +- uilayer.cpp | 1 + utilities.cpp | 24 +- windows.cpp | 1 - 41 files changed, 1043 insertions(+), 837 deletions(-) create mode 100644 application.cpp create mode 100644 application.h create mode 100644 simulationtime.cpp create mode 100644 simulationtime.h diff --git a/AnimModel.cpp b/AnimModel.cpp index 4676c08a..91b6372e 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/. #include "renderer.h" #include "MdlMngr.h" #include "simulation.h" +#include "simulationtime.h" #include "Globals.h" #include "Timer.h" #include "Logs.h" diff --git a/AnimModel.h b/AnimModel.h index fb109893..626386ba 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -47,7 +47,7 @@ class TEvent; class TAnimContainer { // opakowanie submodelu, określające animację egzemplarza - obsługiwane jako lista - friend class TAnimModel; + friend TAnimModel; private: Math3D::vector3 vRotateAngles; // dla obrotów Eulera @@ -124,8 +124,8 @@ class TAnimAdvanced // opakowanie modelu, określające stan egzemplarza class TAnimModel : public scene::basic_node { - friend class opengl_renderer; - friend class ui_layer; + friend opengl_renderer; + friend ui_layer; public: // constructors diff --git a/Classes.h b/Classes.h index 202ac2aa..c175478d 100644 --- a/Classes.h +++ b/Classes.h @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- // Ra: zestaw klas do robienia wskaźników, aby uporządkować nagłówki //--------------------------------------------------------------------------- +class opengl_renderer; class TTrack; // odcinek trajektorii class TEvent; class TTrain; // pojazd sterowany @@ -29,8 +30,9 @@ class TTraction; // drut class TTractionPowerSource; // zasilanie drutów class TWorld; class TCamera; -class simulation_time; +class scenario_time; class TMoverParameters; +class ui_layer; namespace scene { struct node_data; diff --git a/Console.cpp b/Console.cpp index 5dc0cd3e..6de96f69 100644 --- a/Console.cpp +++ b/Console.cpp @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "Console.h" #include "Globals.h" +#include "application.h" #include "LPT.h" #include "Logs.h" #include "PoKeys55.h" @@ -247,7 +248,7 @@ void Console::BitsUpdate(int mask) bool Console::Pressed(int x) { // na razie tak - czyta się tylko klawiatura - if (glfwGetKey(Global.window, x) == GLFW_TRUE) + if (glfwGetKey(Application.window(), x) == GLFW_TRUE) return true; else return false; diff --git a/Driver.cpp b/Driver.cpp index 3ec513f1..b9ceee3d 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -22,10 +22,11 @@ http://mozilla.org/MPL/2.0/. #include "DynObj.h" #include "Event.h" #include "MemCell.h" -#include "World.h" -#include "utilities.h" -#include "McZapkie/MOVER.h" +#include "world.h" +#include "simulationtime.h" #include "track.h" +#include "station.h" +#include "utilities.h" #define LOGVELOCITY 0 #define LOGORDERS 1 diff --git a/DynObj.h b/DynObj.h index 0ce49ba3..15803796 100644 --- a/DynObj.h +++ b/DynObj.h @@ -157,7 +157,7 @@ struct material_data { class TDynamicObject { // klasa pojazdu - friend class opengl_renderer; + friend opengl_renderer; public: static bool bDynamicRemove; // moved from ground diff --git a/EU07.cpp b/EU07.cpp index c923cbf9..24f64e84 100644 --- a/EU07.cpp +++ b/EU07.cpp @@ -7,8 +7,8 @@ obtain one at http://mozilla.org/MPL/2.0/. */ /* - MaSzyna EU07 locomotive simulator - Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others +MaSzyna EU07 locomotive simulator +Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others */ /* Authors: @@ -16,475 +16,27 @@ MarcinW, McZapkie, Shaxbee, ABu, nbmx, youBy, Ra, winger, mamut, Q424, Stele, firleju, szociu, hunter, ZiomalCl, OLI_EU and others */ #include "stdafx.h" -#ifdef CAN_I_HAS_LIBPNG -#include -#endif -#include "World.h" -#include "simulation.h" -#include "sceneeditor.h" -#include "Globals.h" -#include "timer.h" -#include "Logs.h" -#include "renderer.h" -#include "uilayer.h" -#include "audiorenderer.h" -#include "keyboardinput.h" -#include "mouseinput.h" -#include "gamepadinput.h" -#include "Console.h" -#include "uart.h" -#include "PyInt.h" - -#ifdef EU07_BUILD_STATIC -#pragma comment( lib, "glfw3.lib" ) -#pragma comment( lib, "glew32s.lib" ) -#else -#ifdef _WIN32 -#pragma comment( lib, "glfw3dll.lib" ) -#else -#pragma comment( lib, "glfw3.lib" ) -#endif -#pragma comment( lib, "glew32.lib" ) -#endif // build_static -#pragma comment( lib, "opengl32.lib" ) -#pragma comment( lib, "glu32.lib" ) -#pragma comment( lib, "openal32.lib") -#pragma comment( lib, "setupapi.lib" ) -#pragma comment( lib, "python27.lib" ) -#pragma comment( lib, "libserialport-0.lib" ) -#pragma comment (lib, "dbghelp.lib") -#pragma comment (lib, "version.lib") -#ifdef CAN_I_HAS_LIBPNG -#pragma comment (lib, "libpng16.lib") -#endif +#include "application.h" +#include "logs.h" #ifdef _MSC_VER #pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") #endif -TWorld World; +int main( int argc, char *argv[] ) { -namespace input { - -keyboard_input Keyboard; -mouse_input Mouse; -gamepad_input Gamepad; -glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode -std::unique_ptr uart; -user_command command; // currently issued control command, if any - -} - -#ifdef CAN_I_HAS_LIBPNG -void screenshot_save_thread( char *img ) -{ - png_image png; - memset(&png, 0, sizeof(png_image)); - png.version = PNG_IMAGE_VERSION; - png.width = Global.iWindowWidth; - png.height = Global.iWindowHeight; - png.format = PNG_FORMAT_RGB; - - char datetime[64]; - time_t timer; - struct tm* tm_info; - time(&timer); - tm_info = localtime(&timer); - strftime(datetime, 64, "%Y-%m-%d_%H-%M-%S", tm_info); - - uint64_t perf; - QueryPerformanceCounter((LARGE_INTEGER*)&perf); - - std::string filename = "screenshots/" + std::string(datetime) + - "_" + std::to_string(perf) + ".png"; - - if (png_image_write_to_file(&png, filename.c_str(), 0, img, -Global.iWindowWidth * 3, nullptr) == 1) - WriteLog("saved " + filename + "."); - else - WriteLog("failed to save screenshot."); - - delete[] img; -} - -void make_screenshot() -{ - char *img = new char[Global.iWindowWidth * Global.iWindowHeight * 3]; - glReadPixels(0, 0, Global.iWindowWidth, Global.iWindowHeight, GL_RGB, GL_UNSIGNED_BYTE, (GLvoid*)img); - - std::thread t(screenshot_save_thread, img); - t.detach(); -} -#endif - -void window_resize_callback(GLFWwindow *window, int w, int h) -{ - // NOTE: we have two variables which basically do the same thing as we don't have dynamic fullscreen toggle - // TBD, TODO: merge them? - Global.iWindowWidth = w; - Global.iWindowHeight = h; - Global.fDistanceFactor = std::max( 0.5f, h / 768.0f ); // not sure if this is really something we want to use - glViewport(0, 0, w, h); -} - -void cursor_pos_callback(GLFWwindow *window, double x, double y) -{ - if( false == Global.ControlPicking ) { - glfwSetCursorPos( window, 0, 0 ); - } - - // give the potential event recipient a shot at it, in the virtual z order - if( true == scene::Editor.on_mouse_move( x, y ) ) { return; } - input::Mouse.move( x, y ); -} - -void mouse_button_callback( GLFWwindow* window, int button, int action, int mods ) { - - if( ( button != GLFW_MOUSE_BUTTON_LEFT ) - && ( button != GLFW_MOUSE_BUTTON_RIGHT ) ) { - // we don't care about other mouse buttons at the moment - return; - } - // give the potential event recipient a shot at it, in the virtual z order - if( true == scene::Editor.on_mouse_button( button, action ) ) { return; } - input::Mouse.button( button, action ); -} - -void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) { - - Global.shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; - Global.ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; - Global.altState = ( mods & GLFW_MOD_ALT ) ? true : false; - - // give the ui first shot at the input processing... - if( true == UILayer.on_key( key, action ) ) { return; } - if( true == scene::Editor.on_key( key, action ) ) { return; } - // ...if the input is left untouched, pass it on - input::Keyboard.key( key, action ); - - if( ( true == Global.InputMouse ) - && ( ( key == GLFW_KEY_LEFT_ALT ) - || ( key == GLFW_KEY_RIGHT_ALT ) ) ) { - // if the alt key was pressed toggle control picking mode and set matching cursor behaviour - if( action == GLFW_RELEASE ) { - - if( Global.ControlPicking ) { - // switch off - glfwGetCursorPos( window, &input::mouse_pickmodepos.x, &input::mouse_pickmodepos.y ); - UILayer.set_cursor( GLFW_CURSOR_DISABLED ); - glfwSetCursorPos( window, 0, 0 ); - } - else { - // enter picking mode - glfwSetCursorPos( window, input::mouse_pickmodepos.x, input::mouse_pickmodepos.y ); - UILayer.set_cursor( GLFW_CURSOR_NORMAL ); - } - // actually toggle the mode - Global.ControlPicking = !Global.ControlPicking; - } - } - - if( ( key == GLFW_KEY_LEFT_SHIFT ) - || ( key == GLFW_KEY_LEFT_CONTROL ) - || ( key == GLFW_KEY_LEFT_ALT ) - || ( key == GLFW_KEY_RIGHT_SHIFT ) - || ( key == GLFW_KEY_RIGHT_CONTROL ) - || ( key == GLFW_KEY_RIGHT_ALT ) ) { - // don't bother passing these - return; - } - - if( action == GLFW_PRESS || action == GLFW_REPEAT ) { - - World.OnKeyDown( key ); - -#ifdef CAN_I_HAS_LIBPNG - switch( key ) - { - case GLFW_KEY_PRINT_SCREEN: { - make_screenshot(); - break; - } - default: { break; } - } -#endif - } -} - -void focus_callback( GLFWwindow *window, int focus ) -{ - if( Global.bInactivePause ) // jeśli ma być pauzowanie okna w tle - if( focus ) - Global.iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie - else - Global.iPause |= 4; // włączenie pauzy, gdy nieaktywy -} - -void scroll_callback( GLFWwindow* window, double xoffset, double yoffset ) { - - if( Global.ctrlState ) { - // ctrl + scroll wheel adjusts fov in debug mode - Global.FieldOfView = clamp( static_cast(Global.FieldOfView - yoffset * 20.0 / Global.fFpsAverage), 15.0f, 75.0f ); - } -} - -#ifdef _WIN32 -extern "C" -{ - GLFWAPI HWND glfwGetWin32Window(GLFWwindow* window); -} - -LONG CALLBACK unhandled_handler(::EXCEPTION_POINTERS* e); -LRESULT APIENTRY WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); -extern HWND Hwnd; -extern WNDPROC BaseWindowProc; -#endif - -int main(int argc, char *argv[]) -{ -#if defined(_MSC_VER) && defined (_DEBUG) - // memory leaks - _CrtSetDbgFlag( _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ) | _CRTDBG_LEAK_CHECK_DF ); - // floating point operation errors - auto state = _clearfp(); - state = _control87( 0, 0 ); - // this will turn on FPE for #IND and zerodiv - state = _control87( state & ~( _EM_ZERODIVIDE | _EM_INVALID ), _MCW_EM ); -#endif -#ifdef _WIN32 - ::SetUnhandledExceptionFilter( unhandled_handler ); -#endif - - if (!glfwInit()) - return -1; - -#ifdef _WIN32 - DeleteFile( "log.txt" ); - DeleteFile( "errors.txt" ); - _mkdir("logs"); -#endif - Global.LoadIniFile("eu07.ini"); - - // hunter-271211: ukrywanie konsoli - if( Global.iWriteLogEnabled & 2 ) - { - AllocConsole(); - SetConsoleTextAttribute( GetStdHandle( STD_OUTPUT_HANDLE ), FOREGROUND_GREEN ); - } -/* - std::string executable( argv[ 0 ] ); auto const pathend = executable.rfind( '\\' ); - Global.ExecutableName = - ( pathend != std::string::npos ? - executable.substr( executable.rfind( '\\' ) + 1 ) : - executable ); -*/ - // retrieve product version from the file's version data table - { - auto const fileversionsize = ::GetFileVersionInfoSize( argv[ 0 ], NULL ); - std::vectorfileversiondata; fileversiondata.resize( fileversionsize ); - if( ::GetFileVersionInfo( argv[ 0 ], 0, fileversionsize, fileversiondata.data() ) ) { - - struct lang_codepage { - WORD language; - WORD codepage; - } *langcodepage; - UINT datasize; - - ::VerQueryValue( - fileversiondata.data(), - TEXT( "\\VarFileInfo\\Translation" ), - (LPVOID*)&langcodepage, - &datasize ); - - std::string subblock; subblock.resize( 50 ); - ::StringCchPrintf( - &subblock[0], subblock.size(), - TEXT( "\\StringFileInfo\\%04x%04x\\ProductVersion" ), - langcodepage->language, - langcodepage->codepage ); - - VOID *stringdata; - if( ::VerQueryValue( - fileversiondata.data(), - subblock.data(), - &stringdata, - &datasize ) ) { - - Global.asVersion = std::string( reinterpret_cast(stringdata) ); - } - } - } - - for (int i = 1; i < argc; ++i) - { - std::string token(argv[i]); - - if (token == "-e3d") { - if (Global.iConvertModels > 0) - Global.iConvertModels = -Global.iConvertModels; - else - Global.iConvertModels = -7; // z optymalizacją, bananami i prawidłowym Opacity - } - else if (i + 1 < argc && token == "-s") - Global.SceneryFile = std::string(argv[++i]); - else if (i + 1 < argc && token == "-v") - { - std::string v(argv[++i]); - std::transform(v.begin(), v.end(), v.begin(), ::tolower); - Global.asHumanCtrlVehicle = v; - } - else - { - std::cout - << "usage: " << std::string(argv[0]) - << " [-s sceneryfilepath]" - << " [-v vehiclename]" - << " [-e3d]" - << std::endl; - return -1; - } - } - - // match requested video mode to current to allow for - // fullwindow creation when resolution is the same - GLFWmonitor *monitor = glfwGetPrimaryMonitor(); - const GLFWvidmode *vmode = glfwGetVideoMode(monitor); - - glfwWindowHint(GLFW_RED_BITS, vmode->redBits); - glfwWindowHint(GLFW_GREEN_BITS, vmode->greenBits); - glfwWindowHint(GLFW_BLUE_BITS, vmode->blueBits); - glfwWindowHint(GLFW_REFRESH_RATE, vmode->refreshRate); - - glfwWindowHint(GLFW_AUTO_ICONIFY, GLFW_FALSE); - if( Global.iMultisampling > 0 ) { - glfwWindowHint( GLFW_SAMPLES, 1 << Global.iMultisampling ); - } - - if (Global.bFullScreen) - { - // match screen dimensions with selected monitor, for 'borderless window' in fullscreen mode - Global.iWindowWidth = vmode->width; - Global.iWindowHeight = vmode->height; - } - - GLFWwindow *window = - glfwCreateWindow( - Global.iWindowWidth, - Global.iWindowHeight, - Global.AppName.c_str(), - ( Global.bFullScreen ? - monitor : - nullptr), - nullptr ); - - if (!window) - { - std::cout << "failed to create window" << std::endl; - return -1; - } - glfwMakeContextCurrent(window); - 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); - glfwSetCursorPosCallback(window, cursor_pos_callback); - glfwSetMouseButtonCallback( window, mouse_button_callback ); - glfwSetKeyCallback(window, key_callback); - glfwSetScrollCallback( window, scroll_callback ); - glfwSetWindowFocusCallback(window, focus_callback); - { - int width, height; - glfwGetFramebufferSize(window, &width, &height); - window_resize_callback(window, width, height); - } - - if (glewInit() != GLEW_OK) - { - std::cout << "failed to init GLEW" << std::endl; - return -1; - } - -#ifdef _WIN32 - // setup wrapper for base glfw window proc, to handle copydata messages - Hwnd = glfwGetWin32Window( window ); - BaseWindowProc = (WNDPROC)::SetWindowLongPtr( Hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc ); - // switch off the topmost flag - ::SetWindowPos( Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); -#endif - - if( ( false == GfxRenderer.Init( window ) ) - || ( false == UILayer.init( window ) ) ) { - - return -1; - } - - if( Global.bSoundEnabled ) { - Global.bSoundEnabled &= audio::renderer.init(); - } - - input::Keyboard.init(); - input::Mouse.init(); - input::Gamepad.init(); - if( true == Global.uart_conf.enable ) { - input::uart = std::make_unique(); - input::uart->init(); - } - - Global.pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów try { - if( false == World.Init( window ) ) { - ErrorLog( "Simulation setup failed" ); - return -1; + auto result { Application.init( argc, argv ) }; + if( result == 0 ) { + result = Application.run(); } + Application.exit(); + return result; } catch( std::bad_alloc const &Error ) { ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) ); return -1; } -#ifdef _WIN32 - Console *pConsole = new Console(); // Ra: nie wiem, czy ma to sens, ale jakoś zainicjowac trzeba -#endif - if( Global.iConvertModels < 0 ) { - Global.iConvertModels = -Global.iConvertModels; - World.CreateE3D( szModelPath ); // rekurencyjne przeglądanie katalogów - World.CreateE3D( szDynamicPath, true ); - } // po zrobieniu E3D odpalamy normalnie scenerię, by ją zobaczyć -#ifdef _WIN32 - Console::On(); // włączenie konsoli -#endif - try { - while( ( false == glfwWindowShouldClose( window ) ) - && ( true == World.Update() ) - && ( true == GfxRenderer.Render() ) ) { - glfwPollEvents(); - input::Keyboard.poll(); - if( true == Global.InputMouse ) { input::Mouse.poll(); } - if( true == Global.InputGamepad ) { input::Gamepad.poll(); } - if( input::uart != nullptr ) { input::uart->poll(); } - // TODO: wrap current command in object, include other input sources - input::command = ( - input::Mouse.command() != user_command::none ? - input::Mouse.command() : - input::Keyboard.command() ); - } - } - catch( std::bad_alloc const &Error ) { - - ErrorLog( "Critical error, memory allocation failure: " + std::string( Error.what() ) ); - return -1; - } - -#ifdef _WIN32 - Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) - SafeDelete( pConsole ); -#endif - SafeDelete( simulation::Region ); - - glfwDestroyWindow(window); - glfwTerminate(); - - TPythonInterpreter::killInstance(); - - return 0; } diff --git a/EvLaunch.cpp b/EvLaunch.cpp index c9bf882f..1d0ec0bb 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -23,7 +23,7 @@ http://mozilla.org/MPL/2.0/. #include "Timer.h" #include "parser.h" #include "Console.h" -#include "world.h" +#include "simulationtime.h" #include "utilities.h" //--------------------------------------------------------------------------- diff --git a/Globals.h b/Globals.h index b9af0d59..b924df68 100644 --- a/Globals.h +++ b/Globals.h @@ -20,7 +20,6 @@ struct global_settings { // members // data items // TODO: take these out of the settings - GLFWwindow *window{ nullptr }; bool shiftState{ false }; //m7todo: brzydko bool ctrlState{ false }; bool altState{ false }; diff --git a/Model3d.cpp b/Model3d.cpp index 2fe12510..37a26b42 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -20,6 +20,7 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others #include "utilities.h" #include "renderer.h" #include "Timer.h" +#include "simulationtime.h" #include "mtable.h" #include "sn_utils.h" //--------------------------------------------------------------------------- diff --git a/Model3d.h b/Model3d.h index 0b74e49a..7d6a8427 100644 --- a/Model3d.h +++ b/Model3d.h @@ -55,10 +55,10 @@ class TSubModel { // klasa submodelu - pojedyncza siatka, punkt świetlny albo grupa punktów //m7todo: zrobić normalną serializację - friend class opengl_renderer; - friend class TModel3d; // temporary workaround. TODO: clean up class content/hierarchy - friend class TDynamicObject; // temporary etc - friend class scene::shape_node; // temporary etc + friend opengl_renderer; + friend TModel3d; // temporary workaround. TODO: clean up class content/hierarchy + friend TDynamicObject; // temporary etc + friend scene::shape_node; // temporary etc public: enum normalization { @@ -218,7 +218,7 @@ public: class TModel3d { - friend class opengl_renderer; + friend opengl_renderer; private: TSubModel *Root; // drzewo submodeli diff --git a/Track.h b/Track.h index 0f54aa4b..160fad5a 100644 --- a/Track.h +++ b/Track.h @@ -126,9 +126,9 @@ private: // trajektoria ruchu - opakowanie class TTrack : public scene::basic_node { - friend class opengl_renderer; + friend opengl_renderer; // NOTE: temporary arrangement - friend class ui_layer; + friend ui_layer; private: TIsolated * pIsolated = nullptr; // obwód izolowany obsługujący zajęcia/zwolnienia grupy torów diff --git a/Traction.h b/Traction.h index 120a7599..8a152127 100644 --- a/Traction.h +++ b/Traction.h @@ -20,7 +20,7 @@ class TTractionPowerSource; class TTraction : public scene::basic_node { - friend class opengl_renderer; + friend opengl_renderer; public: // na razie TTractionPowerSource *psPower[ 2 ] { nullptr, nullptr }; // najbliższe zasilacze z obu kierunków diff --git a/Train.cpp b/Train.cpp index 2aa14ed0..76c7fcfa 100644 --- a/Train.cpp +++ b/Train.cpp @@ -17,7 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "Globals.h" #include "simulation.h" -#include "world.h" +#include "simulationtime.h" #include "camera.h" #include "Logs.h" #include "MdlMngr.h" diff --git a/World.cpp b/World.cpp index dc1b6b5a..4c4b1452 100644 --- a/World.cpp +++ b/World.cpp @@ -16,7 +16,9 @@ http://mozilla.org/MPL/2.0/. #include "World.h" #include "Globals.h" +#include "application.h" #include "simulation.h" +#include "simulationtime.h" #include "Logs.h" #include "MdlMngr.h" #include "renderer.h" @@ -33,188 +35,13 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- -namespace simulation { - -simulation_time Time; - -basic_station Station; -} +TWorld World; extern "C" { GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); //m7todo: potrzebne do directsound } -void -simulation_time::init() { - - char monthdaycounts[ 2 ][ 13 ] = { - { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, - { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; - ::memcpy( m_monthdaycounts, monthdaycounts, sizeof( monthdaycounts ) ); - - // potentially adjust scenario clock - auto const requestedtime { clamp_circular( m_time.wHour * 60 + m_time.wMinute + Global.ScenarioTimeOffset * 60, 24 * 60 ) }; - auto const requestedhour { ( requestedtime / 60 ) % 24 }; - auto const requestedminute { requestedtime % 60 }; - // cache requested elements, if any - ::GetLocalTime( &m_time ); - - if( Global.fMoveLight > 0.0 ) { - // day and month of the year can be overriden by scenario setup - daymonth( m_time.wDay, m_time.wMonth, m_time.wYear, static_cast( Global.fMoveLight ) ); - } - - if( requestedhour != -1 ) { m_time.wHour = static_cast( clamp( requestedhour, 0, 23 ) ); } - if( requestedminute != -1 ) { m_time.wMinute = static_cast( clamp( requestedminute, 0, 59 ) ); } - // if the time is taken from the local clock leave the seconds intact, otherwise set them to zero - if( ( requestedhour != -1 ) - || ( requestedminute != 1 ) ) { - m_time.wSecond = 0; - } - - m_yearday = year_day( m_time.wDay, m_time.wMonth, m_time.wYear ); - - // calculate time zone bias - // retrieve relevant time zone info from system registry (or fall back on supplied default) - // TODO: select timezone matching defined geographic location and/or country - struct registry_time_zone_info { - long Bias; - long StandardBias; - long DaylightBias; - SYSTEMTIME StandardDate; - SYSTEMTIME DaylightDate; - } registrytimezoneinfo = { -60, 0, -60, { 0, 10, 0, 5, 3, 0, 0, 0 }, { 0, 3, 0, 5, 2, 0, 0, 0 } }; - -#ifdef _WIN32 - TCHAR timezonekeyname[] { TEXT( "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\Central European Standard Time" ) }; - HKEY timezonekey { NULL }; - DWORD size { sizeof( registrytimezoneinfo ) }; - if( ::RegOpenKeyEx( HKEY_LOCAL_MACHINE, timezonekeyname, 0, KEY_QUERY_VALUE, &timezonekey ) == ERROR_SUCCESS ) { - ::RegQueryValueEx( timezonekey, "TZI", NULL, NULL, (BYTE *)®istrytimezoneinfo, &size ); - } -#endif - TIME_ZONE_INFORMATION timezoneinfo { 0 }; - timezoneinfo.Bias = registrytimezoneinfo.Bias; - timezoneinfo.DaylightBias = registrytimezoneinfo.DaylightBias; - timezoneinfo.DaylightDate = registrytimezoneinfo.DaylightDate; - timezoneinfo.StandardBias = registrytimezoneinfo.StandardBias; - timezoneinfo.StandardDate = registrytimezoneinfo.StandardDate; - - auto zonebias { timezoneinfo.Bias }; - if( m_yearday < year_day( timezoneinfo.DaylightDate.wDay, timezoneinfo.DaylightDate.wMonth, m_time.wYear ) ) { - zonebias += timezoneinfo.StandardBias; - } - else if( m_yearday < year_day( timezoneinfo.StandardDate.wDay, timezoneinfo.StandardDate.wMonth, m_time.wYear ) ) { - zonebias += timezoneinfo.DaylightBias; - } - else { - zonebias += timezoneinfo.StandardBias; - } - - m_timezonebias = ( zonebias / 60.0 ); -} - -void -simulation_time::update( double const Deltatime ) { - - m_milliseconds += ( 1000.0 * Deltatime ); - while( m_milliseconds >= 1000.0 ) { - - ++m_time.wSecond; - m_milliseconds -= 1000.0; - } - m_time.wMilliseconds = std::floor( m_milliseconds ); - while( m_time.wSecond >= 60 ) { - - ++m_time.wMinute; - m_time.wSecond -= 60; - } - while( m_time.wMinute >= 60 ) { - - ++m_time.wHour; - m_time.wMinute -= 60; - } - while( m_time.wHour >= 24 ) { - - ++m_time.wDay; - ++m_time.wDayOfWeek; - if( m_time.wDayOfWeek >= 7 ) { - m_time.wDayOfWeek -= 7; - } - m_time.wHour -= 24; - } - int leap = ( m_time.wYear % 4 == 0 ) && ( m_time.wYear % 100 != 0 ) || ( m_time.wYear % 400 == 0 ); - while( m_time.wDay > m_monthdaycounts[ leap ][ m_time.wMonth ] ) { - - m_time.wDay -= m_monthdaycounts[ leap ][ m_time.wMonth ]; - ++m_time.wMonth; - // unlikely but we might've entered a new year - if( m_time.wMonth > 12 ) { - - ++m_time.wYear; - leap = ( m_time.wYear % 4 == 0 ) && ( m_time.wYear % 100 != 0 ) || ( m_time.wYear % 400 == 0 ); - m_time.wMonth -= 12; - } - } -} - -int -simulation_time::year_day( int Day, const int Month, const int Year ) const { - - char const daytab[ 2 ][ 13 ] = { - { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, - { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } - }; - - int leap { ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ) }; - for( int i = 1; i < Month; ++i ) - Day += daytab[ leap ][ i ]; - - return Day; -} - -void -simulation_time::daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ) { - - WORD daytab[ 2 ][ 13 ] = { - { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, - { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } - }; - - int leap = ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ); - WORD idx = 1; - while( ( idx < 13 ) && ( Yearday >= daytab[ leap ][ idx ] ) ) { - - ++idx; - } - Month = idx; - Day = Yearday - daytab[ leap ][ idx - 1 ]; -} - -int -simulation_time::julian_day() const { - - int yy = ( m_time.wYear < 0 ? m_time.wYear + 1 : m_time.wYear ) - std::floor( ( 12 - m_time.wMonth ) / 10.f ); - int mm = m_time.wMonth + 9; - if( mm >= 12 ) { mm -= 12; } - - int K1 = std::floor( 365.25 * ( yy + 4712 ) ); - int K2 = std::floor( 30.6 * mm + 0.5 ); - - // for dates in Julian calendar - int JD = K1 + K2 + m_time.wDay + 59; - // for dates in Gregorian calendar; 2299160 is October 15th, 1582 - const int gregorianswitchday = 2299160; - if( JD > gregorianswitchday ) { - - int K3 = std::floor( std::floor( ( yy * 0.01 ) + 49 ) * 0.75 ) - 38; - JD -= K3; - } - - return JD; -} - TWorld::TWorld() { Train = NULL; @@ -254,7 +81,6 @@ bool TWorld::Init( GLFWwindow *Window ) { auto timestart = std::chrono::system_clock::now(); window = Window; - Global.window = Window; // do WM_COPYDATA Global.pCamera = &Camera; // Ra: wskaźnik potrzebny do likwidacji drgań WriteLog( "\nStarting MaSzyna rail vehicle simulator (release: " + Global.asVersion + ")" ); @@ -935,7 +761,6 @@ bool TWorld::Update() { audio::renderer.update( dt ); GfxRenderer.Update( dt ); - ResourceSweep(); m_init = true; @@ -1007,12 +832,12 @@ TWorld::Update_Camera( double const Deltatime ) { // double modelrotate = atan2( -tempangle.x, tempangle.z ); if( ( true == Global.ctrlState ) - && ( ( glfwGetKey( Global.window, GLFW_KEY_LEFT ) == GLFW_TRUE ) - || ( glfwGetKey( Global.window, GLFW_KEY_RIGHT ) == GLFW_TRUE ) ) ) { + && ( ( glfwGetKey( Application.window(), GLFW_KEY_LEFT ) == GLFW_TRUE ) + || ( glfwGetKey( Application.window(), GLFW_KEY_RIGHT ) == GLFW_TRUE ) ) ) { // jeśli lusterko lewe albo prawe (bez rzucania na razie) Global.CabWindowOpen = true; - auto const lr { glfwGetKey( Global.window, GLFW_KEY_LEFT ) == GLFW_TRUE }; + auto const lr { glfwGetKey( Application.window(), GLFW_KEY_LEFT ) == GLFW_TRUE }; // Camera.Yaw powinno być wyzerowane, aby po powrocie patrzeć do przodu Camera.Pos = Controlled->GetPosition() + Train->MirrorPosition( lr ); // pozycja lusterka Camera.Yaw = 0; // odchylenie na bok od Camera.LookAt @@ -1079,13 +904,6 @@ void TWorld::Update_Environment() { Environment.update(); } -void TWorld::ResourceSweep() -{ -/* - ResourceManager::Sweep( Timer::GetSimulationTime() ); -*/ -}; - //--------------------------------------------------------------------------- void TWorld::OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) { // odebranie komunikatu z serwera @@ -1445,11 +1263,11 @@ TWorld::compute_season( int const Yearday ) const { using dayseasonpair = std::pair; std::vector seasonsequence { - { 65, "winter" }, - { 158, "spring" }, - { 252, "summer" }, - { 341, "autumn" }, - { 366, "winter" } }; + { 65, "winter:" }, + { 158, "spring:" }, + { 252, "summer:" }, + { 341, "autumn:" }, + { 366, "winter:" } }; auto const lookup = std::lower_bound( std::begin( seasonsequence ), std::end( seasonsequence ), @@ -1457,7 +1275,7 @@ TWorld::compute_season( int const Yearday ) const { []( dayseasonpair const &Left, const int Right ) { return Left.first < Right; } ); - Global.Season = lookup->second + ":"; + Global.Season = lookup->second; // season can affect the weather so if it changes, re-calculate weather as well compute_weather(); } diff --git a/World.h b/World.h index 731af207..c0131762 100644 --- a/World.h +++ b/World.h @@ -20,52 +20,6 @@ http://mozilla.org/MPL/2.0/. #include "stars.h" #include "skydome.h" #include "messaging.h" -#include "station.h" - -// wrapper for simulation time -class simulation_time { - -public: - simulation_time() { m_time.wHour = 10; m_time.wMinute = 30; } - void - init(); - void - update( double const Deltatime ); - SYSTEMTIME & - data() { return m_time; } - SYSTEMTIME const & - data() const { return m_time; } - double - second() const { return ( m_time.wMilliseconds * 0.001 + m_time.wSecond ); } - int - year_day() const { return m_yearday; } - // helper, calculates day of year from given date - int - year_day( int Day, int const Month, int const Year ) const; - int - julian_day() const; - double - zone_bias() const { return m_timezonebias; } - -private: - // calculates day and month from given day of year - void - daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ); - - SYSTEMTIME m_time; - double m_milliseconds{ 0.0 }; - int m_yearday; - char m_monthdaycounts[ 2 ][ 13 ]; - double m_timezonebias{ 0.0 }; -}; - -namespace simulation { - -extern simulation_time Time; - -extern basic_station Station; // temporary object, for station functionality tests - -} // wrapper for environment elements -- sky, sun, stars, clouds etc class world_environment { @@ -126,7 +80,6 @@ TWorld(); private: void Update_Environment(); void Update_Camera( const double Deltatime ); - void ResourceSweep(); // handles vehicle change flag void ChangeDynamic(); void InOutKey( bool const Near = true ); @@ -154,5 +107,7 @@ private: GLFWwindow *window; }; +extern TWorld World; + //--------------------------------------------------------------------------- diff --git a/application.cpp b/application.cpp new file mode 100644 index 00000000..0d409929 --- /dev/null +++ b/application.cpp @@ -0,0 +1,514 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "application.h" + +#include "globals.h" +#include "keyboardinput.h" +#include "mouseinput.h" +#include "gamepadinput.h" +#include "console.h" +#include "simulation.h" +#include "world.h" +#include "pyint.h" +#include "sceneeditor.h" +#include "renderer.h" +#include "uilayer.h" +#include "logs.h" + +#ifdef EU07_BUILD_STATIC +#pragma comment( lib, "glfw3.lib" ) +#pragma comment( lib, "glew32s.lib" ) +#else +#ifdef _WIN32 +#pragma comment( lib, "glfw3dll.lib" ) +#else +#pragma comment( lib, "glfw3.lib" ) +#endif +#pragma comment( lib, "glew32.lib" ) +#endif // build_static +#pragma comment( lib, "opengl32.lib" ) +#pragma comment( lib, "glu32.lib" ) +#pragma comment( lib, "openal32.lib") +#pragma comment( lib, "setupapi.lib" ) +#pragma comment( lib, "python27.lib" ) +#pragma comment( lib, "libserialport-0.lib" ) +#pragma comment (lib, "dbghelp.lib") +#pragma comment (lib, "version.lib") + +eu07_application Application; + +namespace input { + +gamepad_input Gamepad; +mouse_input Mouse; +glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode +keyboard_input Keyboard; +Console console; +std::unique_ptr uart; +user_command command; // currently issued control command, if any + +} + +#ifdef _WIN32 +extern "C" +{ + GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); +} + +LONG CALLBACK unhandled_handler( ::EXCEPTION_POINTERS* e ); +LRESULT APIENTRY WndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); +extern HWND Hwnd; +extern WNDPROC BaseWindowProc; +#endif + +// user input callbacks + +void window_resize_callback( GLFWwindow *window, int w, int h ) { + // NOTE: we have two variables which basically do the same thing as we don't have dynamic fullscreen toggle + // TBD, TODO: merge them? + Global.iWindowWidth = w; + Global.iWindowHeight = h; + Global.fDistanceFactor = std::max( 0.5f, h / 768.0f ); // not sure if this is really something we want to use + glViewport( 0, 0, w, h ); +} + +void cursor_pos_callback( GLFWwindow *window, double x, double y ) { + if( false == Global.ControlPicking ) { + glfwSetCursorPos( window, 0, 0 ); + } + + // give the potential event recipient a shot at it, in the virtual z order + if( true == scene::Editor.on_mouse_move( x, y ) ) { return; } + input::Mouse.move( x, y ); +} + +void mouse_button_callback( GLFWwindow* window, int button, int action, int mods ) { + + if( ( button != GLFW_MOUSE_BUTTON_LEFT ) + && ( button != GLFW_MOUSE_BUTTON_RIGHT ) ) { + // we don't care about other mouse buttons at the moment + return; + } + // give the potential event recipient a shot at it, in the virtual z order + if( true == scene::Editor.on_mouse_button( button, action ) ) { return; } + input::Mouse.button( button, action ); +} + +void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) { + + Global.shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; + Global.ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; + Global.altState = ( mods & GLFW_MOD_ALT ) ? true : false; + + // give the ui first shot at the input processing... + if( true == UILayer.on_key( key, action ) ) { return; } + if( true == scene::Editor.on_key( key, action ) ) { return; } + // ...if the input is left untouched, pass it on + input::Keyboard.key( key, action ); + + if( ( true == Global.InputMouse ) + && ( ( key == GLFW_KEY_LEFT_ALT ) + || ( key == GLFW_KEY_RIGHT_ALT ) ) ) { + // if the alt key was pressed toggle control picking mode and set matching cursor behaviour + if( action == GLFW_RELEASE ) { + + if( Global.ControlPicking ) { + // switch off + Application.get_cursor_pos( input::mouse_pickmodepos.x, input::mouse_pickmodepos.y ); + Application.set_cursor( GLFW_CURSOR_DISABLED ); + Application.set_cursor_pos( 0, 0 ); + } + else { + // enter picking mode + Application.set_cursor_pos( input::mouse_pickmodepos.x, input::mouse_pickmodepos.y ); + Application.set_cursor( GLFW_CURSOR_NORMAL ); + } + // actually toggle the mode + Global.ControlPicking = !Global.ControlPicking; + } + } + + if( ( key == GLFW_KEY_LEFT_SHIFT ) + || ( key == GLFW_KEY_LEFT_CONTROL ) + || ( key == GLFW_KEY_LEFT_ALT ) + || ( key == GLFW_KEY_RIGHT_SHIFT ) + || ( key == GLFW_KEY_RIGHT_CONTROL ) + || ( key == GLFW_KEY_RIGHT_ALT ) ) { + // don't bother passing these + return; + } + + if( action == GLFW_PRESS || action == GLFW_REPEAT ) { + + World.OnKeyDown( key ); + +#ifdef CAN_I_HAS_LIBPNG + switch( key ) { + case GLFW_KEY_PRINT_SCREEN: { + make_screenshot(); + break; + } + default: { break; } + } +#endif + } +} + +void focus_callback( GLFWwindow *window, int focus ) { + if( Global.bInactivePause ) // jeśli ma być pauzowanie okna w tle + if( focus ) + Global.iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie + else + Global.iPause |= 4; // włączenie pauzy, gdy nieaktywy +} + +void scroll_callback( GLFWwindow* window, double xoffset, double yoffset ) { + + if( Global.ctrlState ) { + // ctrl + scroll wheel adjusts fov in debug mode + Global.FieldOfView = clamp( static_cast( Global.FieldOfView - yoffset * 20.0 / Global.fFpsAverage ), 15.0f, 75.0f ); + } +} + +// public: + +int +eu07_application::init( int Argc, char *Argv[] ) { + + int result { 0 }; + + init_debug(); + init_files(); + if( ( result = init_settings( Argc, Argv ) ) != 0 ) { + return result; + } + if( ( result = init_glfw() ) != 0 ) { + return result; + } + init_callbacks(); + if( ( result = init_gfx() ) != 0 ) { + return result; + } + if( ( result = init_audio() ) != 0 ) { + return result; + } + + return result; +} + +int +eu07_application::run() { + + // TODO: move input sources and their initializations to the application mode member + input::Keyboard.init(); + input::Mouse.init(); + input::Gamepad.init(); + if( true == Global.uart_conf.enable ) { + input::uart = std::make_unique(); + input::uart->init(); + } +#ifdef _WIN32 + Console::On(); // włączenie konsoli +#endif + + Global.pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów + + if( false == World.Init( m_window ) ) { + ErrorLog( "Bad init: simulation setup failed" ); + return -1; + } + + if( Global.iConvertModels < 0 ) { + // generate binary files for all 3d models + Global.iConvertModels = -Global.iConvertModels; + World.CreateE3D( szModelPath ); // rekurencyjne przeglądanie katalogów + World.CreateE3D( szDynamicPath, true ); + // auto-close when you're done + WriteLog( "Binary 3d model generation completed" ); + return 0; + } + + set_cursor( GLFW_CURSOR_DISABLED ); + set_cursor_pos( 0, 0 ); + + // main application loop + // TODO: split into parts and delegate these to application mode member + while( ( false == glfwWindowShouldClose( m_window ) ) + && ( true == World.Update() ) + && ( true == GfxRenderer.Render() ) ) { + glfwPollEvents(); + input::Keyboard.poll(); + if( true == Global.InputMouse ) { input::Mouse.poll(); } + if( true == Global.InputGamepad ) { input::Gamepad.poll(); } + if( input::uart != nullptr ) { input::uart->poll(); } + // TODO: wrap current command in object, include other input sources + input::command = ( + input::Mouse.command() != user_command::none ? + input::Mouse.command() : + input::Keyboard.command() ); + } + + return 0; +} + +void +eu07_application::exit() { + +#ifdef _WIN32 + Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) +#endif + SafeDelete( simulation::Region ); + + glfwDestroyWindow( m_window ); + glfwTerminate(); + + TPythonInterpreter::killInstance(); +} + +void +eu07_application::set_cursor( int const Mode ) { + + UILayer.set_cursor( Mode ); +} + +void +eu07_application::set_cursor_pos( double const X, double const Y ) { + + if( m_window != nullptr ) { + glfwSetCursorPos( m_window, X, Y ); + } +} + +void +eu07_application::get_cursor_pos( double &X, double &Y ) const { + + if( m_window != nullptr ) { + glfwGetCursorPos( m_window, &X, &Y ); + } +} + +// private: + +void +eu07_application::init_debug() { + +#if defined(_MSC_VER) && defined (_DEBUG) + // memory leaks + _CrtSetDbgFlag( _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG ) | _CRTDBG_LEAK_CHECK_DF ); + // floating point operation errors + auto state { _clearfp() }; + state = _control87( 0, 0 ); + // this will turn on FPE for #IND and zerodiv + state = _control87( state & ~( _EM_ZERODIVIDE | _EM_INVALID ), _MCW_EM ); +#endif +#ifdef _WIN32 + ::SetUnhandledExceptionFilter( unhandled_handler ); +#endif +} + +void +eu07_application::init_files() { + +#ifdef _WIN32 + DeleteFile( "log.txt" ); + DeleteFile( "errors.txt" ); + _mkdir( "logs" ); +#endif +} + +int +eu07_application::init_settings( int Argc, char *Argv[] ) { + + Global.LoadIniFile( "eu07.ini" ); + if( ( Global.iWriteLogEnabled & 2 ) != 0 ) { + // show output console if requested + AllocConsole(); + } +/* + std::string executable( argv[ 0 ] ); auto const pathend = executable.rfind( '\\' ); + Global.ExecutableName = + ( pathend != std::string::npos ? + executable.substr( executable.rfind( '\\' ) + 1 ) : + executable ); +*/ +#ifdef _WIN32 + // retrieve product version from the file's version data table + { + auto const fileversionsize { ::GetFileVersionInfoSize( Argv[ 0 ], NULL ) }; + std::vectorfileversiondata; fileversiondata.resize( fileversionsize ); + if( ::GetFileVersionInfo( Argv[ 0 ], 0, fileversionsize, fileversiondata.data() ) ) { + + struct lang_codepage { + WORD language; + WORD codepage; + } *langcodepage; + UINT datasize; + + ::VerQueryValue( + fileversiondata.data(), + TEXT( "\\VarFileInfo\\Translation" ), + (LPVOID*)&langcodepage, + &datasize ); + + std::string subblock; subblock.resize( 50 ); + ::StringCchPrintf( + &subblock[0], subblock.size(), + TEXT( "\\StringFileInfo\\%04x%04x\\ProductVersion" ), + langcodepage->language, + langcodepage->codepage ); + + VOID *stringdata; + if( ::VerQueryValue( + fileversiondata.data(), + subblock.data(), + &stringdata, + &datasize ) ) { + + Global.asVersion = std::string( reinterpret_cast(stringdata) ); + } + } + } +#endif + // process command line arguments + for( int i = 1; i < Argc; ++i ) { + + std::string token { Argv[ i ] }; + + if( token == "-e3d" ) { + Global.iConvertModels = ( + Global.iConvertModels > 0 ? + -Global.iConvertModels : + -7 ); // z optymalizacją, bananami i prawidłowym Opacity + } + else if( token == "-s" ) { + if( i + 1 < Argc ) { + Global.SceneryFile = Argv[ ++i ]; + } + } + else if( token == "-v" ) { + if( i + 1 < Argc ) { + Global.asHumanCtrlVehicle = Argv[ ++i ]; + } + } + else { + std::cout + << "usage: " << std::string( Argv[ 0 ] ) + << " [-s sceneryfilepath]" + << " [-v vehiclename]" + << " [-e3d]" + << std::endl; + return -1; + } + } + + return 0; +} + +int +eu07_application::init_glfw() { + + if( glfwInit() == GLFW_FALSE ) { + ErrorLog( "Bad init: failed to initialize glfw" ); + return -1; + } + // match requested video mode to current to allow for + // fullwindow creation when resolution is the same + auto *monitor { glfwGetPrimaryMonitor() }; + auto const *vmode { glfwGetVideoMode( monitor ) }; + + glfwWindowHint( GLFW_RED_BITS, vmode->redBits ); + glfwWindowHint( GLFW_GREEN_BITS, vmode->greenBits ); + glfwWindowHint( GLFW_BLUE_BITS, vmode->blueBits ); + glfwWindowHint( GLFW_REFRESH_RATE, vmode->refreshRate ); + + glfwWindowHint( GLFW_AUTO_ICONIFY, GLFW_FALSE ); + if( Global.iMultisampling > 0 ) { + glfwWindowHint( GLFW_SAMPLES, 1 << Global.iMultisampling ); + } + + if( Global.bFullScreen ) { + // match screen dimensions with selected monitor, for 'borderless window' in fullscreen mode + Global.iWindowWidth = vmode->width; + Global.iWindowHeight = vmode->height; + } + + auto *window { + glfwCreateWindow( + Global.iWindowWidth, + Global.iWindowHeight, + Global.AppName.c_str(), + ( Global.bFullScreen ? + monitor : + nullptr ), + nullptr ) }; + + if( window == nullptr ) { + ErrorLog( "Bad init: failed to create glfw window" ); + return -1; + } + + glfwMakeContextCurrent( window ); + glfwSwapInterval( Global.VSync ? 1 : 0 ); //vsync + +#ifdef _WIN32 +// setup wrapper for base glfw window proc, to handle copydata messages + Hwnd = glfwGetWin32Window( window ); + BaseWindowProc = ( WNDPROC )::SetWindowLongPtr( Hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc ); + // switch off the topmost flag + ::SetWindowPos( Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); +#endif + // TBD, TODO: move the global pointer to a more appropriate place + m_window = window; + + return 0; +} + +void +eu07_application::init_callbacks() { + + glfwSetFramebufferSizeCallback( m_window, window_resize_callback ); + glfwSetCursorPosCallback( m_window, cursor_pos_callback ); + glfwSetMouseButtonCallback( m_window, mouse_button_callback ); + glfwSetKeyCallback( m_window, key_callback ); + glfwSetScrollCallback( m_window, scroll_callback ); + glfwSetWindowFocusCallback( m_window, focus_callback ); + { + int width, height; + glfwGetFramebufferSize( m_window, &width, &height ); + window_resize_callback( m_window, width, height ); + } +} + +int +eu07_application::init_gfx() { + + if( glewInit() != GLEW_OK ) { + ErrorLog( "Bad init: failed to initialize glew" ); + return -1; + } + + if( ( false == GfxRenderer.Init( m_window ) ) + || ( false == UILayer.init( m_window ) ) ) { + return -1; + } + + return 0; +} + +int +eu07_application::init_audio() { + + if( Global.bSoundEnabled ) { + Global.bSoundEnabled &= audio::renderer.init(); + } + // NOTE: lack of audio isn't deemed a failure serious enough to throw in the towel + return 0; +} diff --git a/application.h b/application.h new file mode 100644 index 00000000..719f8ade --- /dev/null +++ b/application.h @@ -0,0 +1,46 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +class eu07_application { + +public: +// constructors + eu07_application() = default; +// methods + int + init( int Argc, char *Argv[] ); + int + run(); + void + exit(); + void + set_cursor( int const Mode ); + void + set_cursor_pos( double const X, double const Y ); + void + get_cursor_pos( double &X, double &Y ) const; + inline + GLFWwindow * + window() { + return m_window; } + +private: +// methods + void init_debug(); + void init_files(); + int init_settings( int Argc, char *Argv[] ); + int init_glfw(); + void init_callbacks(); + int init_gfx(); + int init_audio(); +// members + GLFWwindow * m_window { nullptr }; +}; + +extern eu07_application Application; \ No newline at end of file diff --git a/audiorenderer.h b/audiorenderer.h index 89b81784..d0a89eb0 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "resourcemanager.h" #include "uitranscripts.h" +class opengl_renderer; class sound_source; using uint32_sequence = std::vector; @@ -100,7 +101,7 @@ private: class openal_renderer { - friend class opengl_renderer; + friend opengl_renderer; public: // constructors diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 63b9897f..b68326f8 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -12,9 +12,6 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "logs.h" #include "parser.h" -#include "world.h" - -extern TWorld World; bool keyboard_input::recall_bindings() { diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 84f19a08..f18bbee1 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -51,9 +51,6 @@ Source Files - - Source Files - Source Files @@ -246,6 +243,15 @@ Source Files + + Source Files + + + Source Files + + + Source Files + @@ -476,6 +482,12 @@ Header Files + + Header Files + + + Header Files + diff --git a/messaging.cpp b/messaging.cpp index f651d6c4..6dbc78bd 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "messaging.h" #include "globals.h" +#include "application.h" #include "simulation.h" #include "mtable.h" #include "logs.h" @@ -51,7 +52,7 @@ WyslijEvent(const std::string &e, const std::string &d) cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = (DWORD)(12 + i + j); // 8+dwa liczniki i dwa zera kończące cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + e + " sent" ); #endif } @@ -71,7 +72,7 @@ WyslijUszkodzenia(const std::string &t, char fl) cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = (DWORD)(11 + i); // 8+licznik i zero kończące cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); #endif } @@ -90,7 +91,7 @@ WyslijString(const std::string &t, int n) cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = (DWORD)(10 + i); // 8+licznik i zero kończące cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " " + t + " sent"); #endif } @@ -174,7 +175,7 @@ WyslijNamiary(TDynamicObject const *Vehicle) cData.cbData = (DWORD)(10 + i + j); // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); // WriteLog("Ramka poszla!"); CommLog( Now() + " " + std::to_string(r.iComm) + " " + Vehicle->asName + " sent"); #endif @@ -223,7 +224,7 @@ WyslijObsadzone() cData.cbData = 8 + 1984; // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); CommLog( Now() + " " + std::to_string(r.iComm) + " obsadzone" + " sent"); #endif } @@ -249,7 +250,7 @@ WyslijParam(int nr, int fl) cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura cData.cbData = 12 + i; // 12+rozmiar danych cData.lpData = &r; - Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Global.window ), (LPARAM)&cData ); + Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); #endif } diff --git a/moon.cpp b/moon.cpp index b40d5356..e28a13e7 100644 --- a/moon.cpp +++ b/moon.cpp @@ -4,7 +4,7 @@ #include "globals.h" #include "mtable.h" #include "utilities.h" -#include "world.h" +#include "simulationtime.h" ////////////////////////////////////////////////////////////////////////////////////////// // cSun -- class responsible for dynamic calculation of position and intensity of the Sun, diff --git a/mouseinput.cpp b/mouseinput.cpp index af45af26..cc806416 100644 --- a/mouseinput.cpp +++ b/mouseinput.cpp @@ -9,6 +9,8 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "mouseinput.h" + +#include "application.h" #include "utilities.h" #include "globals.h" #include "timer.h" @@ -18,8 +20,6 @@ http://mozilla.org/MPL/2.0/. #include "renderer.h" #include "uilayer.h" -extern TWorld World; - void mouse_slider::bind( user_command const &Command ) { @@ -82,15 +82,14 @@ mouse_slider::bind( user_command const &Command ) { } } // hide the cursor and place it in accordance with current slider value - glfwGetCursorPos( Global.window, &m_cursorposition.x, &m_cursorposition.y ); - UILayer.set_cursor( GLFW_CURSOR_DISABLED ); + Application.get_cursor_pos( m_cursorposition.x, m_cursorposition.y ); + Application.set_cursor( GLFW_CURSOR_DISABLED ); auto const controlsize { Global.iWindowHeight * 0.75 }; auto const controledge { Global.iWindowHeight * 0.5 + controlsize * 0.5 }; auto const stepsize { controlsize / m_valuerange }; - glfwSetCursorPos( - Global.window, + Application.set_cursor_pos( Global.iWindowWidth * 0.5, ( m_analogue ? controledge - ( 1.0 - m_value ) * controlsize : @@ -101,8 +100,8 @@ void mouse_slider::release() { m_command = user_command::none; - glfwSetCursorPos( Global.window, m_cursorposition.x, m_cursorposition.y ); - UILayer.set_cursor( GLFW_CURSOR_NORMAL ); + Application.set_cursor_pos( m_cursorposition.x, m_cursorposition.y ); + Application.set_cursor( GLFW_CURSOR_NORMAL ); } void @@ -525,10 +524,10 @@ mouse_input::default_bindings() { user_command::pantographtogglerear, user_command::none } }, { "pantfrontoff_sw:", { - user_command::pantographtogglefront, + user_command::pantographlowerfront, user_command::none } }, // TODO: dedicated lower pantograph commands { "pantrearoff_sw:", { - user_command::pantographtogglerear, + user_command::pantographlowerrear, user_command::none } }, // TODO: dedicated lower pantograph commands { "pantalloff_sw:", { user_command::pantographlowerall, diff --git a/mtable.cpp b/mtable.cpp index b92d10b4..1e96c458 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -11,7 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "mtable.h" #include "globals.h" -#include "world.h" +#include "simulationtime.h" #include "utilities.h" double TTrainParameters::CheckTrainLatency() @@ -49,7 +49,7 @@ bool TTrainParameters::IsStop() return true; // na ostatnim się zatrzymać zawsze } -bool TTrainParameters::UpdateMTable( simulation_time const &Time, std::string const &NewName ) { +bool TTrainParameters::UpdateMTable( scenario_time const &Time, std::string const &NewName ) { return UpdateMTable( Time.data().wHour, Time.data().wMinute, NewName ); } diff --git a/mtable.h b/mtable.h index abdb9449..30adc18e 100644 --- a/mtable.h +++ b/mtable.h @@ -75,7 +75,7 @@ class TTrainParameters bool IsStop(); bool IsTimeToGo(double hh, double mm); bool UpdateMTable(double hh, double mm, std::string const &NewName); - bool UpdateMTable( simulation_time const &Time, std::string const &NewName ); + bool UpdateMTable( scenario_time const &Time, std::string const &NewName ); bool RewindTimeTable( std::string actualStationName ); TTrainParameters( std::string const &NewTrainName ); void NewName(std::string const &NewTrainName); diff --git a/renderer.cpp b/renderer.cpp index a27fbb66..0be13091 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "timer.h" #include "simulation.h" +#include "simulationtime.h" #include "world.h" #include "train.h" #include "dynobj.h" @@ -24,7 +25,6 @@ http://mozilla.org/MPL/2.0/. #include "utilities.h" opengl_renderer GfxRenderer; -extern TWorld World; int const EU07_PICKBUFFERSIZE { 1024 }; // size of (square) textures bound with the pick framebuffer int const EU07_ENVIRONMENTBUFFERSIZE { 256 }; // size of (square) environmental cube map texture diff --git a/scene.h b/scene.h index 78ebfbe6..3dc886a3 100644 --- a/scene.h +++ b/scene.h @@ -60,7 +60,7 @@ struct scratch_data { // TBD, TODO: replace with quadtree scheme? class basic_cell { - friend class opengl_renderer; + friend opengl_renderer; public: // constructors @@ -198,7 +198,7 @@ private: // basic scene partitioning structure, holds terrain geometry and collection of cells class basic_section { - friend class opengl_renderer; + friend opengl_renderer; public: // constructors @@ -302,7 +302,7 @@ private: // top-level of scene spatial structure, holds collection of sections class basic_region { - friend class opengl_renderer; + friend opengl_renderer; public: // constructors diff --git a/sceneeditor.cpp b/sceneeditor.cpp index c8144244..3042196c 100644 --- a/sceneeditor.cpp +++ b/sceneeditor.cpp @@ -11,8 +11,8 @@ http://mozilla.org/MPL/2.0/. #include "sceneeditor.h" #include "globals.h" +#include "application.h" #include "simulation.h" -#include "uilayer.h" #include "renderer.h" namespace scene { @@ -47,7 +47,7 @@ basic_editor::on_mouse_button( int const Button, int const Action ) { m_node = GfxRenderer.Update_Pick_Node(); m_nodesnapshot = { m_node }; if( m_node ) { - UILayer.set_cursor( GLFW_CURSOR_DISABLED ); + Application.set_cursor( GLFW_CURSOR_DISABLED ); } } else { @@ -55,7 +55,7 @@ basic_editor::on_mouse_button( int const Button, int const Action ) { // TODO: record the current undo step on the undo stack m_nodesnapshot = { m_node }; if( m_node ) { - UILayer.set_cursor( GLFW_CURSOR_NORMAL ); + Application.set_cursor( GLFW_CURSOR_NORMAL ); } } diff --git a/simulation.cpp b/simulation.cpp index e5a7dd65..a3a076f4 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -10,11 +10,11 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "simulation.h" -#include "world.h" #include "globals.h" -#include "logs.h" +#include "simulationtime.h" #include "uilayer.h" #include "renderer.h" +#include "logs.h" namespace simulation { @@ -32,9 +32,42 @@ light_array Lights; scene::basic_region *Region { nullptr }; + + bool state_manager::deserialize( std::string const &Scenariofile ) { + return m_serializer.deserialize( Scenariofile ); +} + +// stores class data in specified file, in legacy (text) format +void +state_manager::export_as_text( std::string const &Scenariofile ) const { + + return m_serializer.export_as_text( Scenariofile ); +} + +// legacy method, calculates changes in simulation state over specified time +void +state_manager::update( double const Deltatime, int Iterationcount ) { + // aktualizacja animacji krokiem FPS: dt=krok czasu [s], dt*iter=czas od ostatnich przeliczeń + if (Deltatime == 0.0) { + return; + } + + auto const totaltime { Deltatime * Iterationcount }; + // NOTE: we perform animations first, as they can determine factors like contact with powergrid + TAnimModel::AnimUpdate( totaltime ); // wykonanie zakolejkowanych animacji + + simulation::Powergrid.update( totaltime ); + simulation::Vehicles.update( Deltatime, Iterationcount ); +} + + + +bool +state_serializer::deserialize( std::string const &Scenariofile ) { + // TODO: move initialization to separate routine so we can reuse it SafeDelete( Region ); Region = new scene::basic_region(); @@ -61,50 +94,33 @@ state_manager::deserialize( std::string const &Scenariofile ) { return true; } -// legacy method, calculates changes in simulation state over specified time -void -state_manager::update( double const Deltatime, int Iterationcount ) { - // aktualizacja animacji krokiem FPS: dt=krok czasu [s], dt*iter=czas od ostatnich przeliczeń - if (Deltatime == 0.0) { - // jeśli załączona jest pauza, to tylko obsłużyć ruch w kabinie trzeba - return; - } - - auto const totaltime { Deltatime * Iterationcount }; - // NOTE: we perform animations first, as they can determine factors like contact with powergrid - TAnimModel::AnimUpdate( totaltime ); // wykonanie zakolejkowanych animacji - - simulation::Powergrid.update( totaltime ); - simulation::Vehicles.update( Deltatime, Iterationcount ); -} - // restores class data from provided stream void -state_manager::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) { // prepare deserialization function table // since all methods use the same objects, we can have simple, hard-coded binds or lambdas for the task - using deserializefunction = void(state_manager::*)(cParser &, scene::scratch_data &); + using deserializefunction = void( state_serializer::*)(cParser &, scene::scratch_data &); std::vector< std::pair< std::string, deserializefunction> > functionlist = { - { "atmo", &state_manager::deserialize_atmo }, - { "camera", &state_manager::deserialize_camera }, - { "config", &state_manager::deserialize_config }, - { "description", &state_manager::deserialize_description }, - { "event", &state_manager::deserialize_event }, - { "firstinit", &state_manager::deserialize_firstinit }, - { "light", &state_manager::deserialize_light }, - { "node", &state_manager::deserialize_node }, - { "origin", &state_manager::deserialize_origin }, - { "endorigin", &state_manager::deserialize_endorigin }, - { "rotate", &state_manager::deserialize_rotate }, - { "sky", &state_manager::deserialize_sky }, - { "test", &state_manager::deserialize_test }, - { "time", &state_manager::deserialize_time }, - { "trainset", &state_manager::deserialize_trainset }, - { "endtrainset", &state_manager::deserialize_endtrainset } }; + { "atmo", &state_serializer::deserialize_atmo }, + { "camera", &state_serializer::deserialize_camera }, + { "config", &state_serializer::deserialize_config }, + { "description", &state_serializer::deserialize_description }, + { "event", &state_serializer::deserialize_event }, + { "firstinit", &state_serializer::deserialize_firstinit }, + { "light", &state_serializer::deserialize_light }, + { "node", &state_serializer::deserialize_node }, + { "origin", &state_serializer::deserialize_origin }, + { "endorigin", &state_serializer::deserialize_endorigin }, + { "rotate", &state_serializer::deserialize_rotate }, + { "sky", &state_serializer::deserialize_sky }, + { "test", &state_serializer::deserialize_test }, + { "time", &state_serializer::deserialize_time }, + { "trainset", &state_serializer::deserialize_trainset }, + { "endtrainset", &state_serializer::deserialize_endtrainset } }; using deserializefunctionbind = std::function; std::unordered_map< std::string, @@ -146,7 +162,7 @@ state_manager::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) { } void -state_manager::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ) { // NOTE: parameter system needs some decent replacement, but not worth the effort if we're moving to built-in editor // atmosphere color; legacy parameter, no longer used @@ -178,7 +194,7 @@ state_manager::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad } void -state_manager::deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ) { glm::dvec3 xyz, abc; int i = -1, into = -1; // do której definicji kamery wstawić @@ -232,21 +248,21 @@ state_manager::deserialize_camera( cParser &Input, scene::scratch_data &Scratchp } void -state_manager::deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ) { // config parameters (re)definition Global.ConfigParse( Input ); } void -state_manager::deserialize_description( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_description( cParser &Input, scene::scratch_data &Scratchpad ) { // legacy section, never really used; skip_until( Input, "enddescription" ); } void -state_manager::deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ) { // TODO: refactor event class and its de/serialization. do offset and rotation after deserialization is done auto *event = new TEvent(); @@ -265,7 +281,7 @@ state_manager::deserialize_event( cParser &Input, scene::scratch_data &Scratchpa } void -state_manager::deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ) { if( true == Scratchpad.initialized ) { return; } @@ -279,14 +295,14 @@ state_manager::deserialize_firstinit( cParser &Input, scene::scratch_data &Scrat } void -state_manager::deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ) { // legacy section, no longer used nor supported; skip_until( Input, "endlight" ); } void -state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ) { auto const inputline = Input.Line(); // cache in case we need to report error @@ -469,7 +485,7 @@ state_manager::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad } void -state_manager::deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ) { glm::dvec3 offset; Input.getTokens( 3 ); @@ -486,7 +502,7 @@ state_manager::deserialize_origin( cParser &Input, scene::scratch_data &Scratchp } void -state_manager::deserialize_endorigin( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_endorigin( cParser &Input, scene::scratch_data &Scratchpad ) { if( false == Scratchpad.location.offset.empty() ) { Scratchpad.location.offset.pop(); @@ -497,7 +513,7 @@ state_manager::deserialize_endorigin( cParser &Input, scene::scratch_data &Scrat } void -state_manager::deserialize_rotate( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_rotate( cParser &Input, scene::scratch_data &Scratchpad ) { Input.getTokens( 3 ); Input @@ -507,7 +523,7 @@ state_manager::deserialize_rotate( cParser &Input, scene::scratch_data &Scratchp } void -state_manager::deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad ) { // sky model Input.getTokens( 1 ); @@ -518,14 +534,14 @@ state_manager::deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad } void -state_manager::deserialize_test( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_test( cParser &Input, scene::scratch_data &Scratchpad ) { // legacy section, no longer supported; skip_until( Input, "endtest" ); } void -state_manager::deserialize_time( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_time( cParser &Input, scene::scratch_data &Scratchpad ) { // current scenario time cParser timeparser( Input.getToken() ); @@ -548,7 +564,7 @@ state_manager::deserialize_time( cParser &Input, scene::scratch_data &Scratchpad } void -state_manager::deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ) { if( true == Scratchpad.trainset.is_open ) { // shouldn't happen but if it does wrap up currently open trainset and report an error @@ -568,7 +584,7 @@ state_manager::deserialize_trainset( cParser &Input, scene::scratch_data &Scratc } void -state_manager::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ) { +state_serializer::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ) { if( ( false == Scratchpad.trainset.is_open ) || ( true == Scratchpad.trainset.vehicles.empty() ) ) { @@ -616,7 +632,7 @@ state_manager::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scr // creates path and its wrapper, restoring class data from provided stream TTrack * -state_manager::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { +state_serializer::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done auto *track = new TTrack( Nodedata ); @@ -633,7 +649,7 @@ state_manager::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad } TTraction * -state_manager::deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { +state_serializer::deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { if( false == Global.bLoadTraction ) { skip_until( Input, "endtraction" ); @@ -651,7 +667,7 @@ state_manager::deserialize_traction( cParser &Input, scene::scratch_data &Scratc } TTractionPowerSource * -state_manager::deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { +state_serializer::deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { if( false == Global.bLoadTraction ) { skip_until( Input, "end" ); @@ -667,7 +683,7 @@ state_manager::deserialize_tractionpowersource( cParser &Input, scene::scratch_d } TMemCell * -state_manager::deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { +state_serializer::deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { auto *memorycell = new TMemCell( Nodedata ); memorycell->Load( &Input ); @@ -678,7 +694,7 @@ state_manager::deserialize_memorycell( cParser &Input, scene::scratch_data &Scra } TEventLauncher * -state_manager::deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { +state_serializer::deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { glm::dvec3 location; Input.getTokens( 3 ); @@ -695,7 +711,7 @@ state_manager::deserialize_eventlauncher( cParser &Input, scene::scratch_data &S } TAnimModel * -state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { +state_serializer::deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { glm::dvec3 location; glm::vec3 rotation; @@ -721,7 +737,7 @@ state_manager::deserialize_model( cParser &Input, scene::scratch_data &Scratchpa } TDynamicObject * -state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { +state_serializer::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { if( false == Scratchpad.trainset.is_open ) { // part of trainset data is used when loading standalone vehicles, so clear it just in case @@ -846,7 +862,7 @@ state_manager::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratch } sound_source * -state_manager::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { +state_serializer::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { glm::dvec3 location; Input.getTokens( 3 ); @@ -869,7 +885,7 @@ state_manager::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpa // skips content of stream until specified token void -state_manager::skip_until( cParser &Input, std::string const &Token ) { +state_serializer::skip_until( cParser &Input, std::string const &Token ) { std::string token { Input.getToken() }; while( ( false == token.empty() ) @@ -881,7 +897,7 @@ state_manager::skip_until( cParser &Input, std::string const &Token ) { // transforms provided location by specifed rotation and offset glm::dvec3 -state_manager::transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ) { +state_serializer::transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ) { if( Scratchpad.location.rotation != glm::vec3( 0, 0, 0 ) ) { auto const rotation = glm::radians( Scratchpad.location.rotation ); @@ -896,7 +912,7 @@ state_manager::transform( glm::dvec3 Location, scene::scratch_data const &Scratc // stores class data in specified file, in legacy (text) format void -state_manager::export_as_text( std::string const &Scenariofile ) const { +state_serializer::export_as_text( std::string const &Scenariofile ) const { if( Scenariofile == "$.scn" ) { ErrorLog( "Bad file: scenery export not supported for file \"$.scn\"" ); diff --git a/simulation.h b/simulation.h index 91f3785f..3e3a35f0 100644 --- a/simulation.h +++ b/simulation.h @@ -25,15 +25,11 @@ http://mozilla.org/MPL/2.0/. namespace simulation { -class state_manager { +class state_serializer { public: -// types - // methods - // legacy method, calculates changes in simulation state over specified time - void - update( double Deltatime, int Iterationcount ); + // restores simulation data from specified file. returns: true on success, false otherwise bool deserialize( std::string const &Scenariofile ); // stores class data in specified file, in legacy (text) format @@ -72,7 +68,25 @@ private: void skip_until( cParser &Input, std::string const &Token ); // transforms provided location by specifed rotation and offset glm::dvec3 transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ); +}; +class state_manager { + +public: +// methods + // legacy method, calculates changes in simulation state over specified time + void + update( double Deltatime, int Iterationcount ); + // restores simulation data from specified file. returns: true on success, false otherwise + bool + deserialize( std::string const &Scenariofile ); + // stores class data in specified file, in legacy (text) format + void + export_as_text( std::string const &Scenariofile ) const; + +private: +// members + state_serializer m_serializer; }; extern state_manager State; diff --git a/simulationtime.cpp b/simulationtime.cpp new file mode 100644 index 00000000..80994b5e --- /dev/null +++ b/simulationtime.cpp @@ -0,0 +1,192 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "simulationtime.h" + +#include "globals.h" +#include "utilities.h" + +namespace simulation { + +scenario_time Time; + +} // simulation + +void +scenario_time::init() { + + char monthdaycounts[ 2 ][ 13 ] = { + { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, + { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; + ::memcpy( m_monthdaycounts, monthdaycounts, sizeof( monthdaycounts ) ); + + // potentially adjust scenario clock + auto const requestedtime { clamp_circular( m_time.wHour * 60 + m_time.wMinute + Global.ScenarioTimeOffset * 60, 24 * 60 ) }; + auto const requestedhour { ( requestedtime / 60 ) % 24 }; + auto const requestedminute { requestedtime % 60 }; + // cache requested elements, if any + ::GetLocalTime( &m_time ); + + if( Global.fMoveLight > 0.0 ) { + // day and month of the year can be overriden by scenario setup + daymonth( m_time.wDay, m_time.wMonth, m_time.wYear, static_cast( Global.fMoveLight ) ); + } + + if( requestedhour != -1 ) { m_time.wHour = static_cast( clamp( requestedhour, 0, 23 ) ); } + if( requestedminute != -1 ) { m_time.wMinute = static_cast( clamp( requestedminute, 0, 59 ) ); } + // if the time is taken from the local clock leave the seconds intact, otherwise set them to zero + if( ( requestedhour != -1 ) + || ( requestedminute != 1 ) ) { + m_time.wSecond = 0; + } + + m_yearday = year_day( m_time.wDay, m_time.wMonth, m_time.wYear ); + + // calculate time zone bias + // retrieve relevant time zone info from system registry (or fall back on supplied default) + // TODO: select timezone matching defined geographic location and/or country + struct registry_time_zone_info { + long Bias; + long StandardBias; + long DaylightBias; + SYSTEMTIME StandardDate; + SYSTEMTIME DaylightDate; + } registrytimezoneinfo = { -60, 0, -60, { 0, 10, 0, 5, 3, 0, 0, 0 }, { 0, 3, 0, 5, 2, 0, 0, 0 } }; + +#ifdef _WIN32 + TCHAR timezonekeyname[] { TEXT( "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones\\Central European Standard Time" ) }; + HKEY timezonekey { NULL }; + DWORD size { sizeof( registrytimezoneinfo ) }; + if( ::RegOpenKeyEx( HKEY_LOCAL_MACHINE, timezonekeyname, 0, KEY_QUERY_VALUE, &timezonekey ) == ERROR_SUCCESS ) { + ::RegQueryValueEx( timezonekey, "TZI", NULL, NULL, (BYTE *)®istrytimezoneinfo, &size ); + } +#endif + TIME_ZONE_INFORMATION timezoneinfo { 0 }; + timezoneinfo.Bias = registrytimezoneinfo.Bias; + timezoneinfo.DaylightBias = registrytimezoneinfo.DaylightBias; + timezoneinfo.DaylightDate = registrytimezoneinfo.DaylightDate; + timezoneinfo.StandardBias = registrytimezoneinfo.StandardBias; + timezoneinfo.StandardDate = registrytimezoneinfo.StandardDate; + + auto zonebias { timezoneinfo.Bias }; + if( m_yearday < year_day( timezoneinfo.DaylightDate.wDay, timezoneinfo.DaylightDate.wMonth, m_time.wYear ) ) { + zonebias += timezoneinfo.StandardBias; + } + else if( m_yearday < year_day( timezoneinfo.StandardDate.wDay, timezoneinfo.StandardDate.wMonth, m_time.wYear ) ) { + zonebias += timezoneinfo.DaylightBias; + } + else { + zonebias += timezoneinfo.StandardBias; + } + + m_timezonebias = ( zonebias / 60.0 ); +} + +void +scenario_time::update( double const Deltatime ) { + + m_milliseconds += ( 1000.0 * Deltatime ); + while( m_milliseconds >= 1000.0 ) { + + ++m_time.wSecond; + m_milliseconds -= 1000.0; + } + m_time.wMilliseconds = std::floor( m_milliseconds ); + while( m_time.wSecond >= 60 ) { + + ++m_time.wMinute; + m_time.wSecond -= 60; + } + while( m_time.wMinute >= 60 ) { + + ++m_time.wHour; + m_time.wMinute -= 60; + } + while( m_time.wHour >= 24 ) { + + ++m_time.wDay; + ++m_time.wDayOfWeek; + if( m_time.wDayOfWeek >= 7 ) { + m_time.wDayOfWeek -= 7; + } + m_time.wHour -= 24; + } + int leap = ( m_time.wYear % 4 == 0 ) && ( m_time.wYear % 100 != 0 ) || ( m_time.wYear % 400 == 0 ); + while( m_time.wDay > m_monthdaycounts[ leap ][ m_time.wMonth ] ) { + + m_time.wDay -= m_monthdaycounts[ leap ][ m_time.wMonth ]; + ++m_time.wMonth; + // unlikely but we might've entered a new year + if( m_time.wMonth > 12 ) { + + ++m_time.wYear; + leap = ( m_time.wYear % 4 == 0 ) && ( m_time.wYear % 100 != 0 ) || ( m_time.wYear % 400 == 0 ); + m_time.wMonth -= 12; + } + } +} + +int +scenario_time::year_day( int Day, const int Month, const int Year ) const { + + char const daytab[ 2 ][ 13 ] = { + { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }, + { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } + }; + + int leap { ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ) }; + for( int i = 1; i < Month; ++i ) + Day += daytab[ leap ][ i ]; + + return Day; +} + +void +scenario_time::daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ) { + + WORD daytab[ 2 ][ 13 ] = { + { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, + { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } + }; + + int leap = ( Year % 4 == 0 ) && ( Year % 100 != 0 ) || ( Year % 400 == 0 ); + WORD idx = 1; + while( ( idx < 13 ) && ( Yearday >= daytab[ leap ][ idx ] ) ) { + + ++idx; + } + Month = idx; + Day = Yearday - daytab[ leap ][ idx - 1 ]; +} + +int +scenario_time::julian_day() const { + + int yy = ( m_time.wYear < 0 ? m_time.wYear + 1 : m_time.wYear ) - std::floor( ( 12 - m_time.wMonth ) / 10.f ); + int mm = m_time.wMonth + 9; + if( mm >= 12 ) { mm -= 12; } + + int K1 = std::floor( 365.25 * ( yy + 4712 ) ); + int K2 = std::floor( 30.6 * mm + 0.5 ); + + // for dates in Julian calendar + int JD = K1 + K2 + m_time.wDay + 59; + // for dates in Gregorian calendar; 2299160 is October 15th, 1582 + const int gregorianswitchday = 2299160; + if( JD > gregorianswitchday ) { + + int K3 = std::floor( std::floor( ( yy * 0.01 ) + 49 ) * 0.75 ) - 38; + JD -= K3; + } + + return JD; +} + +//--------------------------------------------------------------------------- diff --git a/simulationtime.h b/simulationtime.h new file mode 100644 index 00000000..069a66ca --- /dev/null +++ b/simulationtime.h @@ -0,0 +1,66 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +// wrapper for scenario time +class scenario_time { + +public: + scenario_time() { + m_time.wHour = 10; m_time.wMinute = 30; } + void + init(); + void + update( double const Deltatime ); + inline + SYSTEMTIME & + data() { + return m_time; } + inline + SYSTEMTIME const & + data() const { + return m_time; } + inline + double + second() const { + return ( m_time.wMilliseconds * 0.001 + m_time.wSecond ); } + inline + int + year_day() const { + return m_yearday; } + // helper, calculates day of year from given date + int + year_day( int Day, int const Month, int const Year ) const; + int + julian_day() const; + inline + double + zone_bias() const { + return m_timezonebias; } + +private: + // calculates day and month from given day of year + void + daymonth( WORD &Day, WORD &Month, WORD const Year, WORD const Yearday ); + + SYSTEMTIME m_time; + double m_milliseconds{ 0.0 }; + int m_yearday; + char m_monthdaycounts[ 2 ][ 13 ]; + double m_timezonebias{ 0.0 }; +}; + +namespace simulation { + +extern scenario_time Time; + +} // simulation + +//--------------------------------------------------------------------------- diff --git a/sky.h b/sky.h index e583ff97..571b7aa6 100644 --- a/sky.h +++ b/sky.h @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. class TSky { - friend class opengl_renderer; + friend opengl_renderer; public: TSky() = default; diff --git a/stars.h b/stars.h index 0de93ea6..a76973a9 100644 --- a/stars.h +++ b/stars.h @@ -8,7 +8,7 @@ class cStars { - friend class opengl_renderer; + friend opengl_renderer; public: // types: diff --git a/station.cpp b/station.cpp index ca440dcb..cf09b863 100644 --- a/station.cpp +++ b/station.cpp @@ -13,6 +13,12 @@ http://mozilla.org/MPL/2.0/. #include "dynobj.h" #include "mtable.h" +namespace simulation { + +basic_station Station; + +} + // exchanges load with consist attached to specified vehicle, operating on specified schedule double basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int const Platform ) { diff --git a/station.h b/station.h index 5c7c760b..fca9d922 100644 --- a/station.h +++ b/station.h @@ -19,4 +19,10 @@ public: // exchanges load with consist attached to specified vehicle, operating on specified schedule; returns: time needed for exchange, in seconds double update_load( TDynamicObject *First, Mtable::TTrainParameters &Schedule, int const Platform ); -}; \ No newline at end of file +}; + +namespace simulation { + +extern basic_station Station; // temporary object, for station functionality tests + +} // simulation diff --git a/sun.cpp b/sun.cpp index fc264f76..c29c5856 100644 --- a/sun.cpp +++ b/sun.cpp @@ -4,7 +4,7 @@ #include "globals.h" #include "mtable.h" #include "utilities.h" -#include "world.h" +#include "simulationtime.h" ////////////////////////////////////////////////////////////////////////////////////////// // cSun -- class responsible for dynamic calculation of position and intensity of the Sun, diff --git a/uilayer.cpp b/uilayer.cpp index 260710c0..041b0f84 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -6,6 +6,7 @@ #include "globals.h" #include "translation.h" #include "simulation.h" +#include "simulationtime.h" #include "mtable.h" #include "train.h" #include "sceneeditor.h" diff --git a/utilities.cpp b/utilities.cpp index bd8207b2..0a8e603b 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -257,18 +257,24 @@ int stol_def(const std::string &str, const int &DefaultValue) { return result; } -std::string ToLower(std::string const &text) -{ - std::string lowercase( text ); - std::transform(text.begin(), text.end(), lowercase.begin(), ::tolower); +std::string ToLower(std::string const &text) { + + auto lowercase { text }; + std::transform( + std::begin( text ), std::end( text ), + std::begin( lowercase ), + []( unsigned char c ) { return std::tolower( c ); } ); return lowercase; } -std::string ToUpper(std::string const &text) -{ - std::string uppercase( text ); - std::transform(text.begin(), text.end(), uppercase.begin(), ::toupper); - return uppercase; +std::string ToUpper(std::string const &text) { + + auto uppercase { text }; + std::transform( + std::begin( text ), std::end( text ), + std::begin( uppercase ), + []( unsigned char c ) { return std::toupper( c ); } ); + return uppercase; } // replaces polish letters with basic ascii diff --git a/windows.cpp b/windows.cpp index 5d9cef25..a25e6ae7 100644 --- a/windows.cpp +++ b/windows.cpp @@ -50,7 +50,6 @@ LONG CALLBACK unhandled_handler(::EXCEPTION_POINTERS* e) HWND Hwnd; WNDPROC BaseWindowProc; PCOPYDATASTRUCT pDane; -extern TWorld World; LRESULT APIENTRY WndProc( HWND hWnd, // handle for this window UINT uMsg, // message for this window From 3751c8a0a821b7a49b91ebbd37e7d1aa50b3d5fc Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 16 Jul 2018 02:40:53 +0200 Subject: [PATCH 364/426] dangling pointer crash semi-fix, minor bug fixes, minor code correctness enhancements --- AnimModel.cpp | 7 +- Camera.cpp | 26 +- Camera.h | 2 +- Classes.h | 2 +- Driver.cpp | 240 ++++++------ Driver.h | 4 +- DynObj.cpp | 103 ++--- Event.cpp | 16 +- Gauge.cpp | 30 +- Gauge.h | 4 +- McZapkie/MOVER.h | 103 +++-- McZapkie/Mover.cpp | 905 ++++++++++++++++++++----------------------- MemCell.cpp | 20 +- MemCell.h | 2 +- Model3d.cpp | 119 +++--- Model3d.h | 20 +- Train.cpp | 130 +++---- World.cpp | 8 +- application.cpp | 7 +- audiorenderer.cpp | 18 +- keyboardinput.h | 10 +- messaging.cpp | 2 +- openglgeometrybank.h | 33 +- renderer.cpp | 4 +- uart.cpp | 6 +- uart.h | 2 +- uilayer.cpp | 14 +- utilities.h | 4 +- 28 files changed, 895 insertions(+), 946 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index 91b6372e..62d0b5e0 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -361,13 +361,14 @@ void TAnimContainer::UpdateModelIK() { // odwrotna kinematyka wyliczana dopiero po ustawieniu macierzy w submodelach if (pSubModel) // pozbyć się tego - sprawdzać wcześniej { - if (pSubModel->b_Anim & at_IK) + if ((pSubModel->b_Anim == TAnimType::at_IK) + ||(pSubModel->b_Anim == TAnimType::at_IK22)) { // odwrotna kinematyka float3 d, k; TSubModel *ch = pSubModel->ChildGet(); switch (pSubModel->b_Anim) { - case at_IK11: // stopa: ustawić w kierunku czubka (pierwszy potomny) + case TAnimType::at_IK11: // stopa: ustawić w kierunku czubka (pierwszy potomny) d = ch->Translation1Get(); // wektor względem aktualnego układu (nie uwzględnia // obrotu) k = float3(RadToDeg(atan2(d.z, hypot(d.x, d.y))), 0.0, @@ -377,7 +378,7 @@ void TAnimContainer::UpdateModelIK() // WriteLog("--> "+AnsiString(k.x)+" "+AnsiString(k.y)+" "+AnsiString(k.z)); // Ra: to już jest dobrze, może być inna ćwiartka i znak break; - case at_IK22: // udo: ustawić w kierunku pierwszej potomnej pierwszej potomnej (kostki) + case TAnimType::at_IK22: // udo: ustawić w kierunku pierwszej potomnej pierwszej potomnej (kostki) // pozycję kostki należy określić względem kości centralnej (+biodro może być // pochylone) // potem wyliczyć ewentualne odchylenie w tej i następnej diff --git a/Camera.cpp b/Camera.cpp index 91e9cbfe..f1e077ca 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -27,7 +27,7 @@ void TCamera::Init( Math3D::vector3 NPos, Math3D::vector3 NAngle) { Roll = NAngle.z; Pos = NPos; - Type = (Global.bFreeFly ? tp_Free : tp_Follow); + Type = (Global.bFreeFly ? TCameraType::tp_Free : TCameraType::tp_Follow); }; void TCamera::Reset() { @@ -76,12 +76,12 @@ TCamera::OnCommand( command_data const &Command ) { case user_command::movehorizontalfast: { auto const movespeed = ( - Type == tp_Free ? runspeed : - Type == tp_Follow ? walkspeed : + Type == TCameraType::tp_Free ? runspeed : + Type == TCameraType::tp_Follow ? walkspeed : 0.0 ); auto const speedmultiplier = ( - ( ( Type == tp_Free ) && ( Command.command == user_command::movehorizontalfast ) ) ? + ( ( Type == TCameraType::tp_Free ) && ( Command.command == user_command::movehorizontalfast ) ) ? 30.0 : 1.0 ); @@ -111,12 +111,12 @@ TCamera::OnCommand( command_data const &Command ) { case user_command::moveverticalfast: { auto const movespeed = ( - Type == tp_Free ? runspeed * 0.5 : - Type == tp_Follow ? walkspeed : + Type == TCameraType::tp_Free ? runspeed * 0.5 : + Type == TCameraType::tp_Follow ? walkspeed : 0.0 ); auto const speedmultiplier = ( - ( ( Type == tp_Free ) && ( Command.command == user_command::moveverticalfast ) ) ? + ( ( Type == TCameraType::tp_Free ) && ( Command.command == user_command::moveverticalfast ) ) ? 10.0 : 1.0 ); @@ -145,8 +145,8 @@ TCamera::OnCommand( command_data const &Command ) { void TCamera::Update() { - if( FreeFlyModeFlag == true ) { Type = tp_Free; } - else { Type = tp_Follow; } + if( FreeFlyModeFlag == true ) { Type = TCameraType::tp_Free; } + else { Type = TCameraType::tp_Follow; } // check for sent user commands // NOTE: this is a temporary arrangement, for the transition period from old command setup to the new one @@ -162,7 +162,7 @@ void TCamera::Update() auto const deltatime { Timer::GetDeltaRenderTime() }; // czas bez pauzy // update position - if( ( Type == tp_Free ) + if( ( Type == TCameraType::tp_Free ) || ( false == Global.ctrlState ) || ( true == DebugCameraFlag ) ) { // ctrl is used for mirror view, so we ignore the controls when in vehicle if ctrl is pressed @@ -172,7 +172,7 @@ void TCamera::Update() Velocity.y = clamp( Velocity.y + m_moverate.y * 10.0 * deltatime, -std::abs( m_moverate.y ), std::abs( m_moverate.y ) ); } - if( ( Type == tp_Free ) + if( ( Type == TCameraType::tp_Free ) || ( true == DebugCameraFlag ) ) { // free movement position update is handled here, movement while in vehicle is handled by train update Math3D::vector3 Vec = Velocity; @@ -193,7 +193,7 @@ void TCamera::Update() Pitch -= rotationfactor * m_rotationoffsets.x; m_rotationoffsets.x *= ( 1.0 - rotationfactor ); - if( Type == tp_Follow ) { + if( Type == TCameraType::tp_Follow ) { // jeżeli jazda z pojazdem ograniczenie kąta spoglądania w dół i w górę Pitch = clamp( Pitch, -M_PI_4, M_PI_4 ); } @@ -210,7 +210,7 @@ bool TCamera::SetMatrix( glm::dmat4 &Matrix ) { Matrix = glm::rotate( Matrix, -Pitch, glm::dvec3( 1.0, 0.0, 0.0 ) ); Matrix = glm::rotate( Matrix, -Yaw, glm::dvec3( 0.0, 1.0, 0.0 ) ); // w zewnętrznym widoku: kierunek patrzenia - if( ( Type == tp_Follow ) && ( false == DebugCameraFlag ) ) { + if( ( Type == TCameraType::tp_Follow ) && ( false == DebugCameraFlag ) ) { Matrix *= glm::lookAt( glm::dvec3{ Pos }, diff --git a/Camera.h b/Camera.h index 3ac8b33b..792f488d 100644 --- a/Camera.h +++ b/Camera.h @@ -13,7 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "command.h" //--------------------------------------------------------------------------- -enum TCameraType +enum class TCameraType { // tryby pracy kamery tp_Follow, // jazda z pojazdem tp_Free, // stoi na scenerii diff --git a/Classes.h b/Classes.h index c175478d..e146f462 100644 --- a/Classes.h +++ b/Classes.h @@ -46,7 +46,7 @@ class TMtableTime; // czas dla danego posterunku class TController; // obiekt sterujący pociągiem (AI) -enum TCommandType +enum class TCommandType { // binarne odpowiedniki komend w komórce pamięci cm_Unknown, // ciąg nierozpoznany (nie jest komendą) cm_Ready, // W4 zezwala na odjazd, ale semafor może zatrzymać diff --git a/Driver.cpp b/Driver.cpp index b9ceee3d..4a918991 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -201,12 +201,12 @@ void TSpeedPos::CommandCheck() double value2 = evEvent->ValueGet(2); switch (command) { - case cm_ShuntVelocity: + case TCommandType::cm_ShuntVelocity: // prędkość manewrową zapisać, najwyżej AI zignoruje przy analizie tabelki fVelNext = value1; // powinno być value2, bo druga określa "za"? iFlags |= spShuntSemaphor; break; - case cm_SetVelocity: + case TCommandType::cm_SetVelocity: // w semaforze typu "m" jest ShuntVelocity dla Ms2 i SetVelocity dla S1 // SetVelocity * 0 -> można jechać, ale stanąć przed // SetVelocity 0 20 -> stanąć przed, potem można jechać 20 (SBL) @@ -222,31 +222,31 @@ void TSpeedPos::CommandCheck() iFlags |= spStopOnSBL; // flaga, że ma zatrzymać; na pewno nie zezwoli na manewry } break; - case cm_SectionVelocity: + case TCommandType::cm_SectionVelocity: // odcinek z ograniczeniem prędkości fVelNext = value1; fSectionVelocityDist = value2; iFlags |= spSectionVel; break; - case cm_RoadVelocity: + case TCommandType::cm_RoadVelocity: // prędkość drogowa (od tej pory będzie jako domyślna najwyższa) fVelNext = value1; iFlags |= spRoadVel; break; - case cm_PassengerStopPoint: + case TCommandType::cm_PassengerStopPoint: // nie ma dostępu do rozkładu // przystanek, najwyżej AI zignoruje przy analizie tabelki // if ((iFlags & spPassengerStopPoint) == 0) fVelNext = 0.0; // TrainParams->IsStop()?0.0:-1.0; //na razie tak iFlags |= spPassengerStopPoint; // niestety nie da się w tym miejscu współpracować z rozkładem break; - case cm_SetProximityVelocity: + case TCommandType::cm_SetProximityVelocity: // musi zostać gdyż inaczej nie działają manewry fVelNext = -1; iFlags |= spProximityVelocity; // fSectionVelocityDist = value2; break; - case cm_OutsideStation: + case TCommandType::cm_OutsideStation: // w trybie manewrowym: skanować od niej wstecz i stanąć po wyjechaniu za sygnalizator i // zmienić kierunek // w trybie pociągowym: można przyspieszyć do wskazanej prędkości (po zjechaniu z rozjazdów) @@ -803,7 +803,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN double d; // droga double d_to_next_sem = 10000.0; //ustaiwamy na pewno dalej niż widzi AI bool isatpassengerstop { false }; // true if the consist is within acceptable range of w4 post - TCommandType go = cm_Unknown; + TCommandType go = TCommandType::cm_Unknown; eSignNext = NULL; // te flagi są ustawiane tutaj, w razie potrzeby iDrivigFlags &= ~(moveTrackEnd | moveSwitchFound | moveSemaphorFound | moveSpeedLimitFound); @@ -1011,8 +1011,8 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN iDrivigFlags |= moveStopCloser; // do następnego W4 podjechać blisko (z dociąganiem) sSpeedTable[i].iFlags = 0; // nie liczy się już zupełnie (nie wyśle SetVelocity) sSpeedTable[i].fVelNext = -1; // można jechać za W4 - if (go == cm_Unknown) // jeśli nie było komendy wcześniej - go = cm_Ready; // gotów do odjazdu z W4 (semafor może + if (go == TCommandType::cm_Unknown) // jeśli nie było komendy wcześniej + go = TCommandType::cm_Ready; // gotów do odjazdu z W4 (semafor może // zatrzymać) if( false == tsGuardSignal.empty() ) { // jeśli mamy głos kierownika, to odegrać @@ -1232,12 +1232,12 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN sSpeedTable[ i ].iFlags = 0; } } - else if( go == cm_Unknown ) { + else if( go == TCommandType::cm_Unknown ) { // jeśli jeszcze nie ma komendy // komenda jest tylko gdy ma jechać, bo stoi na podstawietabelki if( v != 0.0 ) { // jeśli nie było komendy wcześniej - pierwsza się liczy - ustawianie VelSignal - go = cm_ShuntVelocity; // w trybie pociągowym tylko jeśli włącza + go = TCommandType::cm_ShuntVelocity; // w trybie pociągowym tylko jeśli włącza // tryb manewrowy (v!=0.0) // Ra 2014-06: (VelSignal) nie może być tu ustawiane, bo Tm może być // daleko @@ -1258,12 +1258,12 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } else if( !( sSpeedTable[ i ].iFlags & spSectionVel ) ) { //jeśli jakiś event pasywny ale nie ograniczenie - if( go == cm_Unknown ) { + if( go == TCommandType::cm_Unknown ) { // jeśli nie było komendy wcześniej - pierwsza się liczy - ustawianie VelSignal if( ( v < 0.0 ) || ( v >= 1.0 ) ) { // bo wartość 0.1 służy do hamowania tylko - go = cm_SetVelocity; // może odjechać + go = TCommandType::cm_SetVelocity; // może odjechać // Ra 2014-06: (VelSignal) nie może być tu ustawiane, bo semafor może być daleko // VelSignal=v; //nie do końca tak, to jest druga prędkość; -1 nie wpisywać... if( VelSignal == 0.0 ) { @@ -1295,12 +1295,12 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN eSignNext = sSpeedTable[ i ].evEvent; // dla informacji if( true == TestFlag( iDrivigFlags, moveStopHere ) ) { // jeśli ma stać, dostaje komendę od razu - go = cm_Command; // komenda z komórki, do wykonania po zatrzymaniu + go = TCommandType::cm_Command; // komenda z komórki, do wykonania po zatrzymaniu } else if( sSpeedTable[ i ].fDist <= fMaxProximityDist ) { // jeśli ma dociągnąć, to niech dociąga // (moveStopCloser dotyczy dociągania do W4, nie semafora) - go = cm_Command; // komenda z komórki, do wykonania po zatrzymaniu + go = TCommandType::cm_Command; // komenda z komórki, do wykonania po zatrzymaniu } } } @@ -1671,7 +1671,7 @@ void TController::Activation() TDynamicObject *old = pVehicle, *d = pVehicle; // w tym siedzi AI TController *drugi; // jakby były dwa, to zamienić miejscami, a nie robić wycieku pamięci // poprzez nadpisanie - int brake = mvOccupied->LocalBrakePos; + auto const localbrakelevel { mvOccupied->LocalBrakePosA }; while (mvControlling->MainCtrlPos) // samo zapętlenie DecSpeed() nie wystarcza :/ DecSpeed(true); // wymuszenie zerowania nastawnika jazdy while (mvOccupied->ActiveDir < 0) @@ -1683,7 +1683,7 @@ void TController::Activation() { mvControlling->MainSwitch( false); // dezaktywacja czuwaka, jeśli przejście do innego członu - mvOccupied->DecLocalBrakeLevel(10); // zwolnienie hamulca w opuszczanym pojeździe + mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); // zwolnienie hamulca w opuszczanym pojeździe // mvOccupied->BrakeLevelSet((mvOccupied->BrakeHandle==FVel6)?4:-2); //odcięcie na // zaworze maszynisty, FVel6 po drugiej stronie nie luzuje mvOccupied->BrakeLevelSet( @@ -1721,7 +1721,7 @@ void TController::Activation() ControllingSet(); // utworzenie połączenia do sterowanego pojazdu (może się zmienić) - // silnikowy dla EZT } - if( mvControlling->EngineType == DieselEngine ) { + if( mvControlling->EngineType == TEngineType::DieselEngine ) { // dla 2Ls150 - przed ustawieniem kierunku - można zmienić tryb pracy if( mvControlling->ShuntModeAllow ) { mvControlling->CurrentSwitch( @@ -1736,8 +1736,8 @@ void TController::Activation() // mvOccupied->ActiveDir=0; //żeby sam ustawił kierunek mvOccupied->CabActivisation(); // uruchomienie kabin w członach DirectionForward(true); // nawrotnik do przodu - if (brake) // hamowanie tylko jeśli był wcześniej zahamowany (bo możliwe, że jedzie!) - mvOccupied->IncLocalBrakeLevel(brake); // zahamuj jak wcześniej + if (localbrakelevel > 0.0) // hamowanie tylko jeśli był wcześniej zahamowany (bo możliwe, że jedzie!) + mvOccupied->LocalBrakePosA = localbrakelevel; // zahamuj jak wcześniej CheckVehicles(); // sprawdzenie składu, AI zapali światła TableClear(); // resetowanie tabelki skanowania torów } @@ -1984,7 +1984,7 @@ bool TController::CheckVehicles(TOrders user) p->DestinationSet(TrainParams->Relation2, TrainParams->TrainName); // relacja docelowa, jeśli nie było if (AIControllFlag) // jeśli prowadzi komputer p->RaLightsSet(0, 0); // gasimy światła - if (p->MoverParameters->EnginePowerSource.SourceType == CurrentCollector) + if (p->MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) { // jeśli pojazd posiada pantograf, to przydzielamy mu maskę, którą będzie informował o // jeździe bezprądowej p->iOverheadMask = pantmask; @@ -2274,7 +2274,7 @@ bool TController::PrepareEngine() ReactionTime = PrepareTime; iDrivigFlags |= moveActive; // może skanować sygnały i reagować na komendy - if ( mvControlling->EnginePowerSource.SourceType == CurrentCollector ) { + if ( mvControlling->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) { voltfront = true; voltrear = true; } @@ -2288,15 +2288,15 @@ bool TController::PrepareEngine() if (AIControllFlag) { // część wykonawcza dla sterowania przez komputer mvOccupied->BatterySwitch( true ); - if( ( mvControlling->EngineType == DieselElectric ) - || ( mvControlling->EngineType == DieselEngine ) ) { + if( ( mvControlling->EngineType == TEngineType::DieselElectric ) + || ( mvControlling->EngineType == TEngineType::DieselEngine ) ) { mvControlling->OilPumpSwitch( true ); workingtemperature = UpdateHeating(); if( true == workingtemperature ) { mvControlling->FuelPumpSwitch( true ); } } - if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) + if (mvControlling->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) { // jeśli silnikowy jest pantografującym mvOccupied->PantFront( true ); mvOccupied->PantRear( true ); @@ -2427,7 +2427,7 @@ bool TController::ReleaseEngine() ReactionTime = PrepareTime; if (AIControllFlag) { // jeśli steruje komputer - if (mvOccupied->DoorCloseCtrl == control::driver) + if (mvOccupied->DoorCloseCtrl == control_t::driver) { // zamykanie drzwi if (mvOccupied->DoorLeftOpened) mvOccupied->DoorLeft(false); @@ -2439,7 +2439,7 @@ bool TController::ReleaseEngine() { mvControlling->CompressorSwitch(false); mvControlling->ConverterSwitch(false); - if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) + if (mvControlling->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) { mvControlling->PantFront(false); mvControlling->PantRear(false); @@ -2474,15 +2474,15 @@ bool TController::ReleaseEngine() { // jeśli się zatrzymał iEngineActive = 0; eStopReason = stopSleep; // stoimy z powodu wyłączenia - eAction = actSleep; //śpi (wygaszony) + eAction = TAction::actSleep; //śpi (wygaszony) if (AIControllFlag) { - if( ( mvControlling->EngineType == DieselElectric ) - || ( mvControlling->EngineType == DieselEngine ) ) { + if( ( mvControlling->EngineType == TEngineType::DieselElectric ) + || ( mvControlling->EngineType == TEngineType::DieselEngine ) ) { // heating/cooling subsystem mvControlling->WaterHeaterSwitch( false ); // optionally turn off the water pump as well - if( mvControlling->WaterPump.start_type != start::battery ) { + if( mvControlling->WaterPump.start_type != start_t::battery ) { mvControlling->WaterPumpSwitch( false ); } // fuel and oil subsystems @@ -2504,8 +2504,8 @@ bool TController::IncBrake() { // zwiększenie hamowania bool OK = false; switch( mvOccupied->BrakeSystem ) { - case Individual: { - if( mvOccupied->LocalBrake == ManualBrake ) { + case TBrakeSystem::Individual: { + if( mvOccupied->LocalBrake == TLocalBrake::ManualBrake ) { OK = mvOccupied->IncManualBrakeLevel( 1 + static_cast( std::floor( 0.5 + std::fabs( AccDesired ) ) ) ); } else { @@ -2513,7 +2513,7 @@ bool TController::IncBrake() } break; } - case Pneumatic: { + case TBrakeSystem::Pneumatic: { // NOTE: can't perform just test whether connected vehicle == nullptr, due to virtual couplers formed with nearby vehicles bool standalone { true }; if( ( mvOccupied->TrainType == dt_ET41 ) @@ -2577,7 +2577,7 @@ bool TController::IncBrake() } pos_corr = pos_corr / fMass * 2.5; - if (mvOccupied->BrakeHandle == FV4a) + if (mvOccupied->BrakeHandle == TBrakeHandle::FV4a) { pos_corr += mvOccupied->Handle->GetCP()*0.2; @@ -2621,9 +2621,9 @@ bool TController::IncBrake() } break; } - case ElectroPneumatic: { - if( mvOccupied->EngineType == ElectricInductionMotor ) { - if (mvOccupied->BrakeHandle == MHZ_EN57) { + case TBrakeSystem::ElectroPneumatic: { + if( mvOccupied->EngineType == TEngineType::ElectricInductionMotor ) { + if (mvOccupied->BrakeHandle == TBrakeHandle::MHZ_EN57) { if (mvOccupied->BrakeCtrlPos < mvOccupied->Handle->GetPos(bh_FB)) OK = mvOccupied->BrakeLevelAdd(1.0); } @@ -2652,13 +2652,13 @@ bool TController::DecBrake() double deltaAcc = 0; switch (mvOccupied->BrakeSystem) { - case Individual: - if (mvOccupied->LocalBrake == ManualBrake) + case TBrakeSystem::Individual: + if (mvOccupied->LocalBrake == TLocalBrake::ManualBrake) OK = mvOccupied->DecManualBrakeLevel(1 + floor(0.5 + fabs(AccDesired))); else OK = mvOccupied->DecLocalBrakeLevel(1 + floor(0.5 + fabs(AccDesired))); break; - case Pneumatic: + case TBrakeSystem::Pneumatic: deltaAcc = -AccDesired*BrakeAccFactor() - (fBrake_a0[0] + 4 * (mvOccupied->BrakeCtrlPosR-1.0)*fBrake_a1[0]); if (deltaAcc < 0) { @@ -2672,13 +2672,13 @@ bool TController::DecBrake() } } if (!OK) - OK = mvOccupied->DecLocalBrakeLevel(2); + OK = mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); if (mvOccupied->PipePress < 3.0) Need_BrakeRelease = true; break; - case ElectroPneumatic: - if (mvOccupied->EngineType == ElectricInductionMotor) { - if (mvOccupied->BrakeHandle == MHZ_EN57) { + case TBrakeSystem::ElectroPneumatic: + if (mvOccupied->EngineType == TEngineType::ElectricInductionMotor) { + if (mvOccupied->BrakeHandle == TBrakeHandle::MHZ_EN57) { if (mvOccupied->BrakeCtrlPos > mvOccupied->Handle->GetPos(bh_RP)) OK = mvOccupied->BrakeLevelAdd(-1.0); } @@ -2696,7 +2696,7 @@ bool TController::DecBrake() else OK = false; if (!OK) - OK = mvOccupied->DecLocalBrakeLevel(2); + OK = mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); break; } return OK; @@ -2726,12 +2726,12 @@ bool TController::IncSpeed() return false; // jak poślizg, to nie przyspieszamy switch (mvOccupied->EngineType) { - case None: // McZapkie-041003: wagon sterowniczy + case TEngineType::None: // McZapkie-041003: wagon sterowniczy if (mvControlling->MainCtrlPosNo > 0) // jeśli ma czym kręcić iDrivigFlags |= moveIncSpeed; // ustawienie flagi jazdy return false; - case ElectricSeriesMotor: - if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) // jeśli pantografujący + case TEngineType::ElectricSeriesMotor: + if (mvControlling->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) // jeśli pantografujący { if (fOverhead2 >= 0.0) // a jazda bezprądowa ustawiana eventami (albo opuszczenie) return false; // to nici z ruszania @@ -2813,8 +2813,8 @@ bool TController::IncSpeed() } mvControlling->AutoRelayCheck(); // sprawdzenie logiki sterowania break; - case Dumb: - case DieselElectric: + case TEngineType::Dumb: + case TEngineType::DieselElectric: if (!mvControlling->FuseFlag) if (Ready || (iDrivigFlags & movePress)) //{(BrakePress<=0.01*MaxBrakePress)} { @@ -2823,7 +2823,7 @@ bool TController::IncSpeed() OK = mvControlling->IncScndCtrl(1); } break; - case ElectricInductionMotor: + case TEngineType::ElectricInductionMotor: if (!mvControlling->FuseFlag) if (Ready || (iDrivigFlags & movePress) || (mvOccupied->ShuntMode)) //{(BrakePress<=0.01*MaxBrakePress)} { @@ -2839,7 +2839,7 @@ bool TController::IncSpeed() } break; - case WheelsDriven: + case TEngineType::WheelsDriven: if (!mvControlling->CabNo) mvControlling->CabActivisation(); if (sin(mvControlling->eAngle) > 0) @@ -2847,7 +2847,7 @@ bool TController::IncSpeed() else mvControlling->DecMainCtrl(3 + 3 * floor(0.5 + fabs(AccDesired))); break; - case DieselEngine: + case TEngineType::DieselEngine: if (mvControlling->ShuntModeAllow) { // dla 2Ls150 można zmienić tryb pracy, jeśli jest w liniowym i nie daje rady (wymaga zerowania kierunku) // mvControlling->ShuntMode=(OrderList[OrderPos]&Shunt)||(fMass>224000.0); @@ -2876,29 +2876,29 @@ bool TController::DecSpeed(bool force) bool OK = false; // domyślnie false, aby wyszło z pętli while switch (mvOccupied->EngineType) { - case None: // McZapkie-041003: wagon sterowniczy + case TEngineType::None: // McZapkie-041003: wagon sterowniczy iDrivigFlags &= ~moveIncSpeed; // usunięcie flagi jazdy if (force) // przy aktywacji kabiny jest potrzeba natychmiastowego wyzerowania if (mvControlling->MainCtrlPosNo > 0) // McZapkie-041003: wagon sterowniczy, np. EZT mvControlling->DecMainCtrl(1 + (mvControlling->MainCtrlPos > 2 ? 1 : 0)); mvControlling->AutoRelayCheck(); // sprawdzenie logiki sterowania return false; - case ElectricSeriesMotor: + case TEngineType::ElectricSeriesMotor: OK = mvControlling->DecScndCtrl(2); // najpierw bocznik na zero if (!OK) OK = mvControlling->DecMainCtrl(1 + (mvControlling->MainCtrlPos > 2 ? 1 : 0)); mvControlling->AutoRelayCheck(); // sprawdzenie logiki sterowania break; - case Dumb: - case DieselElectric: + case TEngineType::Dumb: + case TEngineType::DieselElectric: OK = mvControlling->DecScndCtrl(2); if (!OK) OK = mvControlling->DecMainCtrl(2 + (mvControlling->MainCtrlPos / 2)); break; - case ElectricInductionMotor: + case TEngineType::ElectricInductionMotor: OK = mvControlling->DecMainCtrl(1); break; - case WheelsDriven: + case TEngineType::WheelsDriven: if (!mvControlling->CabNo) mvControlling->CabActivisation(); if (sin(mvControlling->eAngle) < 0) @@ -2906,7 +2906,7 @@ bool TController::DecSpeed(bool force) else mvControlling->DecMainCtrl(3 + 3 * floor(0.5 + fabs(AccDesired))); break; - case DieselEngine: + case TEngineType::DieselEngine: if ((mvControlling->Vel > mvControlling->dizel_minVelfullengage)) { if (mvControlling->RList[mvControlling->MainCtrlPos].Mn > 0) @@ -2928,7 +2928,7 @@ void TController::SpeedSet() // ma dokręcać do bezoporowych i zdejmować pozycje w przypadku przekroczenia prądu switch (mvOccupied->EngineType) { - case None: // McZapkie-041003: wagon sterowniczy + case TEngineType::None: // McZapkie-041003: wagon sterowniczy if (mvControlling->MainCtrlPosNo > 0) { // jeśli ma czym kręcić // TODO: sprawdzanie innego czlonu //if (!FuseFlagCheck()) @@ -2993,7 +2993,7 @@ void TController::SpeedSet() } } break; - case ElectricSeriesMotor: + case TEngineType::ElectricSeriesMotor: if( ( false == mvControlling->StLinFlag ) && ( false == mvControlling->DelayCtrlFlag ) ) { // styczniki liniowe rozłączone yBARC @@ -3063,15 +3063,15 @@ void TController::SpeedSet() // bezoporowej } break; - case Dumb: - case DieselElectric: - case ElectricInductionMotor: + case TEngineType::Dumb: + case TEngineType::DieselElectric: + case TEngineType::ElectricInductionMotor: break; // WheelsDriven : // begin // OK:=False; // end; - case DieselEngine: + case TEngineType::DieselEngine: // Ra 2014-06: "automatyczna" skrzynia biegów... if (!mvControlling->MotorParam[mvControlling->ScndCtrlPos].AutoSwitch) // gdy biegi ręczne if ((mvControlling->ShuntMode ? mvControlling->AnPos : 1.0) * mvControlling->Vel > @@ -3128,7 +3128,7 @@ void TController::Doors( bool const Open, int const Side ) { // wagony muszą mieć baterię załączoną do otwarcia drzwi... vehicle->MoverParameters->BatterySwitch( true ); // otwieranie drzwi w pojazdach - flaga zezwolenia była by lepsza - if( vehicle->MoverParameters->DoorOpenCtrl != control::passenger ) { + if( vehicle->MoverParameters->DoorOpenCtrl != control_t::passenger ) { // if the door are controlled by the driver, we let the user operate them... if( true == AIControllFlag ) { // ...unless this user is an ai @@ -3137,9 +3137,9 @@ void TController::Doors( bool const Open, int const Side ) { auto const lewe = ( vehicle->DirectionGet() > 0 ) ? 1 : 2; auto const prawe = 3 - lewe; if( Side & lewe ) - vehicle->MoverParameters->DoorLeft( true, range::local ); + vehicle->MoverParameters->DoorLeft( true, range_t::local ); if( Side & prawe ) - vehicle->MoverParameters->DoorRight( true, range::local ); + vehicle->MoverParameters->DoorRight( true, range_t::local ); } } // pojazd podłączony z tyłu (patrząc od czoła) @@ -3169,9 +3169,9 @@ void TController::Doors( bool const Open, int const Side ) { auto *vehicle = pVehicles[ 0 ]; // pojazd na czole składu while( vehicle != nullptr ) { // zamykanie drzwi w pojazdach - flaga zezwolenia była by lepsza - if( vehicle->MoverParameters->DoorCloseCtrl != control::autonomous ) { - vehicle->MoverParameters->DoorLeft( false, range::local ); // w lokomotywie można by nie zamykać... - vehicle->MoverParameters->DoorRight( false, range::local ); + if( vehicle->MoverParameters->DoorCloseCtrl != control_t::autonomous ) { + vehicle->MoverParameters->DoorLeft( false, range_t::local ); // w lokomotywie można by nie zamykać... + vehicle->MoverParameters->DoorRight( false, range_t::local ); } vehicle = vehicle->Next(); // pojazd podłączony z tyłu (patrząc od czoła) } @@ -3625,8 +3625,8 @@ void TController::PhysicsLog() << mvControlling->Im << " " << int(mvControlling->MainCtrlPos) << " " << int(mvControlling->ScndCtrlPos) << " " - << int(mvOccupied->BrakeCtrlPos) << " " - << int(mvOccupied->LocalBrakePos) << " " + << mvOccupied->fBrakeCtrlPos << " " + << mvOccupied->LocalBrakePosA << " " << int(mvControlling->ActiveDir) << " " << ( mvOccupied->CommandIn.Command.empty() ? "none" : mvOccupied->CommandIn.Command.c_str() ) << " " << mvOccupied->CommandIn.Value1 << " " @@ -3752,14 +3752,14 @@ TController::UpdateSituation(double dt) { auto const *vehicle { p->MoverParameters }; - if( ( vehicle->EngineType == DieselEngine ) - || ( vehicle->EngineType == DieselElectric ) ) { + if( ( vehicle->EngineType == TEngineType::DieselEngine ) + || ( vehicle->EngineType == TEngineType::DieselElectric ) ) { Ready = ( ( vehicle->Vel > 0.5 ) // already moving || ( false == vehicle->Mains ) // deadweight vehicle || ( vehicle->enrot > 0.8 * ( - vehicle->EngineType == DieselEngine ? + vehicle->EngineType == TEngineType::DieselEngine ? vehicle->dizel_nmin : vehicle->DElist[ 0 ].RPM / 60.0 ) ) ); } @@ -3770,7 +3770,7 @@ TController::UpdateSituation(double dt) { // for human-controlled vehicles with no door control and dynamic brake auto-activating with door open if( ( false == AIControllFlag ) && ( iDrivigFlags & moveDoorOpened ) - && ( mvOccupied->DoorCloseCtrl != control::driver ) + && ( mvOccupied->DoorCloseCtrl != control_t::driver ) && ( mvControlling->MainCtrlPos > 0 ) ) { Doors( false ); } @@ -3790,7 +3790,7 @@ TController::UpdateSituation(double dt) { } } - if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { + if (mvControlling->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) { if( mvOccupied->ScndPipePress > 4.3 ) { // gdy główna sprężarka bezpiecznie nabije ciśnienie to można przestawić kurek na zasilanie pantografów z głównej pneumatyki @@ -3827,7 +3827,7 @@ TController::UpdateSituation(double dt) { */ } - if (mvControlling->EnginePowerSource.SourceType == CurrentCollector) { + if (mvControlling->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) { if( mvOccupied->Vel > 0.05 ) { // is moving @@ -3873,7 +3873,7 @@ TController::UpdateSituation(double dt) { // if the power station is heavily burdened try to reduce the load switch( mvControlling->EngineType ) { - case ElectricSeriesMotor: { + case TEngineType::ElectricSeriesMotor: { if( mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1 ) { // limit yourself to series mode if( mvControlling->ScndCtrlPos ) { @@ -4168,7 +4168,7 @@ TController::UpdateSituation(double dt) { // 3. faza odczepiania. SetVelocity(2, 0); // jazda w ustawionym kierunku z prędkością 2 if ((mvControlling->MainCtrlPos > 0) || - (mvOccupied->BrakeSystem == ElectroPneumatic)) // jeśli jazda + (mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic)) // jeśli jazda { WriteLog(mvOccupied->Name + " odczepianie w kierunku " + std::to_string(mvOccupied->DirAbsolute)); TDynamicObject *p = @@ -4223,7 +4223,7 @@ TController::UpdateSituation(double dt) { // powino zostać wyłączone) // WriteLog("Zahamowanie składu"); mvOccupied->BrakeLevelSet( - mvOccupied->BrakeSystem == ElectroPneumatic ? + mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic ? 1 : 3 ); double p = mvOccupied->BrakePressureActual.PipePressureVal; @@ -4232,18 +4232,18 @@ TController::UpdateSituation(double dt) { // TODO: zabezpieczenie przed dziwnymi CHK do czasu wyjaśnienia sensu 0 oraz -1 w tym miejscu p = 3.9; } - if (mvOccupied->BrakeSystem == ElectroPneumatic ? + if (mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic ? mvOccupied->BrakePress > 2 : mvOccupied->PipePress < p + 0.1) { // jeśli w miarę został zahamowany (ciśnienie mniejsze niż podane na // pozycji 3, zwyle 0.37) - if (mvOccupied->BrakeSystem == ElectroPneumatic) + if (mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic) mvOccupied->BrakeLevelSet(0); // wyłączenie EP, gdy wystarczy (może // nie być potrzebne, bo na początku // jest) WriteLog("Luzowanie lokomotywy i zmiana kierunku"); mvOccupied->BrakeReleaser(1); // wyluzuj lokomotywę; a ST45? - mvOccupied->DecLocalBrakeLevel(10); // zwolnienie hamulca + mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); // zwolnienie hamulca iDrivigFlags |= movePress; // następnie będzie dociskanie DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na przeciwny (dociskanie) CheckVehicles(); // od razu zmienić światła (zgasić) - bez tego się nie odczepi @@ -4512,7 +4512,7 @@ TController::UpdateSituation(double dt) { switch (comm) { // ustawienie VelSignal - trochę proteza = do przemyślenia - case cm_Ready: // W4 zezwolił na jazdę + case TCommandType::cm_Ready: // W4 zezwolił na jazdę // ewentualne doskanowanie trasy za W4, który zezwolił na jazdę TableCheck( routescanrange); TableUpdate(VelDesired, ActualProximityDist, VelNext, AccDesired); // aktualizacja po skanowaniu @@ -4520,21 +4520,21 @@ TController::UpdateSituation(double dt) { break; // ale jak coś z przodu zamyka, to ma stać if (iDrivigFlags & moveStopCloser) VelSignal = -1.0; // ma czekać na sygnał z sygnalizatora! - case cm_SetVelocity: // od wersji 357 semafor nie budzi wyłączonej lokomotywy + case TCommandType::cm_SetVelocity: // od wersji 357 semafor nie budzi wyłączonej lokomotywy if (!(OrderList[OrderPos] & ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders if (fabs(VelSignal) >= 1.0) // 0.1 nie wysyła się do samochodow, bo potem nie ruszą PutCommand("SetVelocity", VelSignal, VelNext, nullptr); // komenda robi dodatkowe operacje break; - case cm_ShuntVelocity: // od wersji 357 Tm nie budzi wyłączonej lokomotywy + case TCommandType::cm_ShuntVelocity: // od wersji 357 Tm nie budzi wyłączonej lokomotywy if (!(OrderList[OrderPos] & ~(Obey_train | Shunt))) // jedzie w dowolnym trybie albo Wait_for_orders PutCommand("ShuntVelocity", VelSignal, VelNext, nullptr); else if (iCoupler) // jeśli jedzie w celu połączenia SetVelocity(VelSignal, VelNext); break; - case cm_Command: // komenda z komórki + case TCommandType::cm_Command: // komenda z komórki if( !( OrderList[ OrderPos ] & ~( Obey_train | Shunt ) ) ) { // jedzie w dowolnym trybie albo Wait_for_orders if( mvOccupied->Vel < 0.1 ) { @@ -4557,12 +4557,12 @@ TController::UpdateSituation(double dt) { if( ( OrderList[ OrderPos ] & Connect ) ? ( pVehicles[ 0 ]->fTrackBlock > 2000 || pVehicles[ 0 ]->fTrackBlock > FirstSemaphorDist ) : true ) { - if( ( comm = BackwardScan() ) != cm_Unknown ) { + if( ( comm = BackwardScan() ) != TCommandType::cm_Unknown ) { // jeśli w drugą można jechać // należy sprawdzać odległość od znalezionego sygnalizatora, // aby w przypadku prędkości 0.1 wyciągnąć najpierw skład za sygnalizator // i dopiero wtedy zmienić kierunek jazdy, oczekując podania prędkości >0.5 - if( comm == cm_Command ) { + if( comm == TCommandType::cm_Command ) { // jeśli komenda Shunt to ją odbierz bez przemieszczania się (np. odczep wagony po dopchnięciu do końca toru) iDrivigFlags |= moveStopHere; } @@ -5044,9 +5044,9 @@ TController::UpdateSituation(double dt) { PrepareEngine(); // próba ponownego załączenia } // włączanie bezpiecznika - if ((mvControlling->EngineType == ElectricSeriesMotor) || + if ((mvControlling->EngineType == TEngineType::ElectricSeriesMotor) || (mvControlling->TrainType & dt_EZT) || - (mvControlling->EngineType == DieselElectric)) + (mvControlling->EngineType == TEngineType::DieselElectric)) if (mvControlling->FuseFlag || Need_TryAgain) { Need_TryAgain = false; // true, jeśli druga pozycja w elektryku nie załapała @@ -5079,8 +5079,8 @@ TController::UpdateSituation(double dt) { ReactionTime = 0.25; } } - if (mvOccupied->BrakeSystem == Pneumatic) // napełnianie uderzeniowe - if (mvOccupied->BrakeHandle == FV4a) + if (mvOccupied->BrakeSystem == TBrakeSystem::Pneumatic) // napełnianie uderzeniowe + if (mvOccupied->BrakeHandle == TBrakeHandle::FV4a) { if( mvOccupied->BrakeCtrlPos == -2 ) { mvOccupied->BrakeLevelSet( 0 ); @@ -5282,7 +5282,7 @@ TController::UpdateSituation(double dt) { if( ( VelDesired == 0.0 ) && ( vel > VelDesired ) && ( ActualProximityDist <= fMinProximityDist ) - && ( mvOccupied->LocalBrakePos == 0 ) ) { + && ( mvOccupied->LocalBrakePosA < 0.01 ) ) { IncBrake(); } } @@ -5335,8 +5335,8 @@ TController::UpdateHeating() { switch( mvControlling->EngineType ) { - case DieselElectric: - case DieselEngine: { + case TEngineType::DieselElectric: + case TEngineType::DieselEngine: { auto const &heat { mvControlling->dizel_heat }; @@ -5368,7 +5368,7 @@ TController::UpdateHeating() { mvControlling->WaterHeaterSwitch( false ); mvControlling->WaterHeaterBreakerSwitch( false ); // optionally turn off the water pump as well - if( mvControlling->WaterPump.start_type != start::battery ) { + if( mvControlling->WaterPump.start_type != start_t::battery ) { mvControlling->WaterPumpSwitch( false ); mvControlling->WaterPumpBreakerSwitch( false ); } @@ -5738,13 +5738,13 @@ TCommandType TController::BackwardScan() // zwraca true, jeśli należy odwrócić kierunek jazdy pojazdu if( ( OrderList[ OrderPos ] & ~( Shunt | Connect ) ) ) { // skanowanie sygnałów tylko gdy jedzie w trybie manewrowym albo czeka na rozkazy - return cm_Unknown; + return TCommandType::cm_Unknown; } // kierunek jazdy względem sprzęgów pojazdu na czele int const startdir = -pVehicles[0]->DirectionGet(); if( startdir == 0 ) { // jeśli kabina i kierunek nie jest określony nie robimy nic - return cm_Unknown; + return TCommandType::cm_Unknown; } // szukamy od pierwszej osi w wybranym kierunku double scandir = startdir * pVehicles[0]->RaDirectionGet(); @@ -5759,7 +5759,7 @@ TCommandType TController::BackwardScan() auto const dir = startdir * pVehicles[0]->VectorFront(); // wektor w kierunku jazdy/szukania if( !scantrack ) { // jeśli wstecz wykryto koniec toru to raczej nic się nie da w takiej sytuacji zrobić - return cm_Unknown; + return TCommandType::cm_Unknown; } else { // a jeśli są dalej tory @@ -5789,7 +5789,7 @@ TCommandType TController::BackwardScan() #if LOGBACKSCAN WriteLog(edir + " - ignored as not passed yet"); #endif - return cm_Unknown; // nic + return TCommandType::cm_Unknown; // nic } vmechmax = e->ValueGet(1); // prędkość przy tym semaforze // przeliczamy odległość od semafora - potrzebne by były współrzędne początku składu @@ -5799,7 +5799,7 @@ TCommandType TController::BackwardScan() scandist = 0; } bool move = false; // czy AI w trybie manewerowym ma dociągnąć pod S1 - if( e->Command() == cm_SetVelocity ) { + if( e->Command() == TCommandType::cm_SetVelocity ) { if( ( vmechmax == 0.0 ) ? ( OrderCurrentGet() & ( Shunt | Connect ) ) : ( OrderCurrentGet() & Connect ) ) { // przy podczepianiu ignorować wyjazd? @@ -5818,8 +5818,8 @@ TCommandType TController::BackwardScan() // SetProximityVelocity(scandist,vmechmax,&sl); return ( vmechmax > 0 ? - cm_SetVelocity : - cm_Unknown ); + TCommandType::cm_SetVelocity : + TCommandType::cm_Unknown ); } else { // ustawiamy prędkość tylko wtedy, gdy ma ruszyć, stanąć albo ma stać @@ -5835,15 +5835,15 @@ TCommandType TController::BackwardScan() #endif return ( vmechmax > 0 ? - cm_SetVelocity : - cm_Unknown ); + TCommandType::cm_SetVelocity : + TCommandType::cm_Unknown ); } } } if (OrderCurrentGet() ? OrderCurrentGet() & (Shunt | Connect) : true) // w Wait_for_orders też widzi tarcze { // reakcja AI w trybie manewrowym dodatkowo na sygnały manewrowe - if (move ? true : e->Command() == cm_ShuntVelocity) + if (move ? true : e->Command() == TCommandType::cm_ShuntVelocity) { // jeśli powyżej było SetVelocity 0 0, to dociągamy pod S1 if ((scandist > fMinProximityDist) ? (mvOccupied->Vel > 0.0) || (vmechmax == 0.0) : @@ -5861,8 +5861,8 @@ TCommandType TController::BackwardScan() #endif // SetProximityVelocity(scandist,vmechmax,&sl); return (iDrivigFlags & moveTrackEnd) ? - cm_ChangeDirection : - cm_Unknown; // jeśli jedzie na W5 albo koniec toru, + TCommandType::cm_ChangeDirection : + TCommandType::cm_Unknown; // jeśli jedzie na W5 albo koniec toru, // to można zmienić kierunek } } @@ -5880,8 +5880,8 @@ TCommandType TController::BackwardScan() #endif return ( vmechmax > 0 ? - cm_ShuntVelocity : - cm_Unknown ); + TCommandType::cm_ShuntVelocity : + TCommandType::cm_Unknown ); } } if ((vmechmax != 0.0) && (scandist < 100.0)) { @@ -5892,19 +5892,19 @@ TCommandType TController::BackwardScan() #endif return ( vmechmax > 0 ? - cm_ShuntVelocity : - cm_Unknown ); + TCommandType::cm_ShuntVelocity : + TCommandType::cm_Unknown ); } } // if (move?... } // if (OrderCurrentGet()==Shunt) if (!e->bEnabled) // jeśli skanowany if (e->StopCommand()) // a podłączona komórka ma komendę - return cm_Command; // to też się obrócić + return TCommandType::cm_Command; // to też się obrócić } // if (e->Type==tp_GetValues) } // if (e) } // if (scantrack) } // if (scandir!=0.0) - return cm_Unknown; // nic + return TCommandType::cm_Unknown; // nic }; std::string TController::NextStop() diff --git a/Driver.h b/Driver.h index bcd68435..791e7721 100644 --- a/Driver.h +++ b/Driver.h @@ -73,7 +73,7 @@ enum TStopReason stopError // z powodu błędu w obliczeniu drogi hamowania }; -enum TAction +enum class TAction : int { // przechowanie aktualnego stanu AI od poprzedniego przebłysku świadomości actUnknown, // stan nieznany (domyślny na początku) actPantUp, // podnieś pantograf (info dla użytkownika) @@ -223,7 +223,7 @@ private: double LastReactionTime = 0.0; double fActionTime = 0.0; // czas używany przy regulacji prędkości i zamykaniu drzwi double m_radiocontroltime{ 0.0 }; // timer used to control speed of radio operations - TAction eAction { actUnknown }; // aktualny stan + TAction eAction { TAction::actUnknown }; // aktualny stan public: inline TAction GetAction() { diff --git a/DynObj.cpp b/DynObj.cpp index 5c1a51a0..053c7943 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -967,7 +967,7 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) } if( ( Mechanik != nullptr ) - && ( Mechanik->GetAction() != actSleep ) ) { + && ( Mechanik->GetAction() != TAction::actSleep ) ) { // rysowanie figurki mechanika btMechanik1.Turn( MoverParameters->ActiveCab > 0 ); btMechanik2.Turn( MoverParameters->ActiveCab < 0 ); @@ -1828,7 +1828,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" return 0.0; // zerowa długość to brak pojazdu } // ustawienie pozycji hamulca - MoverParameters->LocalBrakePos = 0; + MoverParameters->LocalBrakePosA = 0.0; if (driveractive) { if (Cab == 0) @@ -2299,7 +2299,7 @@ TDynamicObject::create_controller( std::string const Type, bool const Trainset ) if( asName == Global.asHumanCtrlVehicle ) { // jeśli pojazd wybrany do prowadzenia - if( MoverParameters->EngineType != Dumb ) { + if( MoverParameters->EngineType != TEngineType::Dumb ) { // wsadzamy tam sterującego Controller = Humandriver; } @@ -2576,16 +2576,16 @@ bool TDynamicObject::UpdateForce(double dt, double dt1, bool FullVer) // initiates load change by specified amounts, with a platform on specified side void TDynamicObject::LoadExchange( int const Disembark, int const Embark, int const Platform ) { - if( ( MoverParameters->DoorOpenCtrl == control::passenger ) - || ( MoverParameters->DoorOpenCtrl == control::mixed ) ) { + if( ( MoverParameters->DoorOpenCtrl == control_t::passenger ) + || ( MoverParameters->DoorOpenCtrl == control_t::mixed ) ) { // jeśli jedzie do tyłu, to drzwi otwiera odwrotnie auto const lewe = ( DirectionGet() > 0 ) ? 1 : 2; auto const prawe = 3 - lewe; if( Platform & lewe ) { - MoverParameters->DoorLeft( true, range::local ); + MoverParameters->DoorLeft( true, range_t::local ); } if( Platform & prawe ) { - MoverParameters->DoorRight( true, range::local ); + MoverParameters->DoorRight( true, range_t::local ); } } m_exchange.unload_count += Disembark; @@ -2645,18 +2645,18 @@ void TDynamicObject::update_exchange( double const Deltatime ) { MoverParameters->LoadStatus = 0; // if the exchange is completed (or canceled) close the door, if applicable - if( ( MoverParameters->DoorCloseCtrl == control::passenger ) - || ( MoverParameters->DoorCloseCtrl == control::mixed ) ) { + if( ( MoverParameters->DoorCloseCtrl == control_t::passenger ) + || ( MoverParameters->DoorCloseCtrl == control_t::mixed ) ) { if( ( MoverParameters->Vel > 2.0 ) || ( Random() < ( // remotely controlled door are more likely to be left open - MoverParameters->DoorCloseCtrl == control::passenger ? + MoverParameters->DoorCloseCtrl == control_t::passenger ? 0.75 : 0.50 ) ) ) { - MoverParameters->DoorLeft( false, range::local ); - MoverParameters->DoorRight( false, range::local ); + MoverParameters->DoorLeft( false, range_t::local ); + MoverParameters->DoorRight( false, range_t::local ); } } } @@ -2794,7 +2794,7 @@ bool TDynamicObject::Update(double dt, double dt1) return false; // a normalnie powinny mieć bEnabled==false // McZapkie-260202 - if ((MoverParameters->EnginePowerSource.SourceType == CurrentCollector) && + if ((MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) && (MoverParameters->Power > 1.0)) // aby rozrządczy nie opuszczał silnikowemu /* if ((MechInside) || (MoverParameters->TrainType == dt_EZT)) @@ -2817,7 +2817,7 @@ bool TDynamicObject::Update(double dt, double dt1) // pressure switch safety measure -- open the line breaker, unless there's alternate source of traction voltage if( MoverParameters->GetTrainsetVoltage() < 0.5 * MoverParameters->EnginePowerSource.MaxVoltage ) { // TODO: check whether line breaker should be open EMU-wide - MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ); + MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? range_t::unit : range_t::local ) ); } } else { @@ -2825,7 +2825,7 @@ bool TDynamicObject::Update(double dt, double dt1) // and prevents their activation until pressure switch is set again MoverParameters->PantPressLockActive = true; // TODO: separate 'heating allowed' from actual heating flag, so we can disable it here without messing up heating toggle - MoverParameters->ConverterSwitch( false, range::unit ); + MoverParameters->ConverterSwitch( false, range_t::unit ); } // mark the pressure switch as spent MoverParameters->PantPressSwitchActive = false; @@ -2923,7 +2923,7 @@ bool TDynamicObject::Update(double dt, double dt1) // znane napięcia // TTractionParam tmpTraction; // tmpTraction.TractionVoltage=0; - if (MoverParameters->EnginePowerSource.SourceType == CurrentCollector) + if (MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) { // dla EZT tylko silnikowy // if (Global.bLiveTraction) { // Ra 2013-12: to niżej jest chyba trochę bez sensu @@ -2988,7 +2988,7 @@ bool TDynamicObject::Update(double dt, double dt1) { // Ra 2F3F: do Driver.cpp to przenieść? MoverParameters->EqvtPipePress = GetEPP(); // srednie cisnienie w PG if( ( Mechanik->Primary() ) - && ( MoverParameters->EngineType == ElectricInductionMotor ) ) { + && ( MoverParameters->EngineType == TEngineType::ElectricInductionMotor ) ) { // jesli glowny i z asynchronami, to niech steruje hamulcem lacznie dla calego pociagu/ezt auto const kier = (DirectionGet() * MoverParameters->ActiveCab > 0); auto FED { 0.0 }; @@ -3082,9 +3082,10 @@ bool TDynamicObject::Update(double dt, double dt1) } if ((Fzad > 1) && (!MEDLogFile.is_open()) && (MoverParameters->Vel > 1)) { - MEDLogFile.open(std::string("MEDLOGS/" + MoverParameters->Name + "_" + to_string(++MEDLogCount) + ".csv"), - std::ios::in | std::ios::out | std::ios::trunc); - MEDLogFile << std::string("t\tVel\tMasa\tOsie\tFmaxPN\tFmaxED\tFfulED\tFrED\tFzad\tFzadED\tFzadPN").c_str(); + MEDLogFile.open( + "MEDLOGS/" + MoverParameters->Name + "_" + to_string( ++MEDLogCount ) + ".csv", + std::ios::in | std::ios::out | std::ios::trunc ); + MEDLogFile << "t\tVel\tMasa\tOsie\tFmaxPN\tFmaxED\tFfulED\tFrED\tFzad\tFzadED\tFzadPN"; for(int k=1;k<=np;k++) { MEDLogFile << "\tBP" << k; @@ -3095,8 +3096,8 @@ bool TDynamicObject::Update(double dt, double dt1) MEDLogTime = 0; } auto FzadED { 0.0 }; - if( ( MoverParameters->EpFuse && (MoverParameters->BrakeHandle != MHZ_EN57)) - || ( ( MoverParameters->BrakeHandle == MHZ_EN57 ) + if( ( MoverParameters->EpFuse && (MoverParameters->BrakeHandle != TBrakeHandle::MHZ_EN57)) + || ( ( MoverParameters->BrakeHandle == TBrakeHandle::MHZ_EN57 ) && ( MoverParameters->BrakeOpModeFlag & bom_MED ) ) ) { FzadED = std::min( Fzad, FmaxED ); } @@ -3280,10 +3281,10 @@ bool TDynamicObject::Update(double dt, double dt1) // NOTE: disabled on account of multi-unit setups, where the unmanned unit wouldn't be affected && ( Controller == Humandriver ) */ - && ( MoverParameters->EngineType != DieselEngine ) - && ( MoverParameters->EngineType != WheelsDriven ) ) + && ( MoverParameters->EngineType != TEngineType::DieselEngine ) + && ( MoverParameters->EngineType != TEngineType::WheelsDriven ) ) { // jeśli bateria wyłączona, a nie diesel ani drezyna reczna - if( MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ) ) { + if( MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? range_t::unit : range_t::local ) ) ) { // wyłączyć zasilanie // NOTE: we turn off entire EMU, but only the affected unit for other multi-unit consists MoverParameters->EventFlag = true; @@ -3625,8 +3626,8 @@ bool TDynamicObject::Update(double dt, double dt1) } */ } - else if (MoverParameters->EnginePowerSource.SourceType == InternalSource) - if (MoverParameters->EnginePowerSource.PowerType == SteamPower) + else if (MoverParameters->EnginePowerSource.SourceType == TPowerSource::InternalSource) + if (MoverParameters->EnginePowerSource.PowerType == TPowerType::SteamPower) // if (smPatykird1[0]) { // Ra: animacja rozrządu parowozu, na razie nieoptymalizowane /* //Ra: tymczasowo wyłączone ze względu na porządkowanie animacji @@ -3986,7 +3987,7 @@ void TDynamicObject::RenderSounds() { // NBMX dzwiek przetwornicy if( MoverParameters->ConverterFlag ) { frequency = ( - MoverParameters->EngineType == ElectricSeriesMotor ? + MoverParameters->EngineType == TEngineType::ElectricSeriesMotor ? ( MoverParameters->RunningTraction.TractionVoltage / MoverParameters->NominalVoltage ) * MoverParameters->RList[ MoverParameters->RlistSize ].Mn : 1.0 ); frequency = sConverter.m_frequencyoffset + sConverter.m_frequencyfactor * frequency; @@ -4617,7 +4618,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } if( !MoverParameters->LoadAccepted.empty() ) { - if( ( MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) + if( ( MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) && ( asLoadName == "pantstate" ) ) { // wartość niby "pantstate" - nazwa dla formalności, ważna jest ilość if( MoverParameters->Load == 1 ) { @@ -5075,7 +5076,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, (k) */ MoverParameters->EnginePowerSource.PowerType = - SteamPower; // Ra: po chamsku, ale z CHK nie działa + TPowerType::SteamPower; // Ra: po chamsku, ale z CHK nie działa } else if( token == "animreturnprefix:" ) { @@ -5271,8 +5272,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.engine.owner( this ); auto const amplitudedivisor = static_cast( ( - MoverParameters->EngineType == DieselEngine ? 1 : - MoverParameters->EngineType == DieselElectric ? 1 : + MoverParameters->EngineType == TEngineType::DieselEngine ? 1 : + MoverParameters->EngineType == TEngineType::DieselElectric ? 1 : MoverParameters->nmax * 60 + MoverParameters->Power * 3 ) ); m_powertrainsounds.engine.m_amplitudefactor /= amplitudedivisor; } @@ -6435,7 +6436,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( ( std::abs( Vehicle.enrot ) > 0.01 ) // McZapkie-280503: zeby dla dumb dzialal silnik na jalowych obrotach - || ( Vehicle.EngineType == Dumb ) ) { + || ( Vehicle.EngineType == TEngineType::Dumb ) ) { // frequency calculation auto const normalizer { ( @@ -6449,14 +6450,14 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub engine.m_frequencyoffset + engine.m_frequencyfactor * std::abs( Vehicle.enrot ) * normalizer; - if( Vehicle.EngineType == Dumb ) { + if( Vehicle.EngineType == TEngineType::Dumb ) { frequency -= 0.2 * Vehicle.EnginePower / ( 1 + Vehicle.Power * 1000 ); } // base volume calculation switch( Vehicle.EngineType ) { // TODO: check calculated values - case DieselElectric: { + case TEngineType::DieselElectric: { volume = engine.m_amplitudeoffset @@ -6465,7 +6466,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub + 0.75 * ( Vehicle.enrot * 60 ) / ( Vehicle.DElist[ Vehicle.MainCtrlPosNo ].RPM ) ); break; } - case DieselEngine: { + case TEngineType::DieselEngine: { if( Vehicle.enrot > 0.0 ) { volume = ( Vehicle.EnginePower > 0 ? @@ -6485,15 +6486,15 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( engine_volume >= 0.05 ) { auto enginerevvolume { 0.f }; - if( ( Vehicle.EngineType == DieselElectric ) - || ( Vehicle.EngineType == DieselEngine ) ) { + if( ( Vehicle.EngineType == TEngineType::DieselElectric ) + || ( Vehicle.EngineType == TEngineType::DieselEngine ) ) { // diesel engine revolutions increase; it can potentially decrease volume of base engine sound if( engine_revs_last != -1.f ) { // calculate potential recent increase of engine revolutions auto const revolutionsperminute { Vehicle.enrot * 60 }; auto const revolutionsdifference { revolutionsperminute - engine_revs_last }; auto const idlerevolutionsthreshold { 1.01 * ( - Vehicle.EngineType == DieselElectric ? + Vehicle.EngineType == TEngineType::DieselElectric ? Vehicle.DElist[ 0 ].RPM : Vehicle.dizel_nmin * 60 ) }; @@ -6620,13 +6621,13 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub // base volume calculation switch( Vehicle.EngineType ) { - case ElectricInductionMotor: { + case TEngineType::ElectricInductionMotor: { volume = motor.m_amplitudeoffset + motor.m_amplitudefactor * ( Vehicle.EnginePower + motorrevolutions * 2 ); break; } - case ElectricSeriesMotor: { + case TEngineType::ElectricSeriesMotor: { volume = motor.m_amplitudeoffset + motor.m_amplitudefactor * ( Vehicle.EnginePower / 1000 + motorrevolutions * 60.0 ); @@ -6640,7 +6641,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub } } - if( Vehicle.EngineType == ElectricSeriesMotor ) { + if( Vehicle.EngineType == TEngineType::ElectricSeriesMotor ) { // volume variation if( ( volume < 1.0 ) && ( Vehicle.EnginePower < 100 ) ) { @@ -6691,7 +6692,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub } } // inverter sounds - if( Vehicle.EngineType == ElectricInductionMotor ) { + if( Vehicle.EngineType == TEngineType::ElectricInductionMotor ) { if( Vehicle.InverterFrequency > 0.1 ) { volume = inverter.m_amplitudeoffset + inverter.m_amplitudefactor * std::sqrt( std::abs( Vehicle.dizel_fill ) ); @@ -6718,8 +6719,8 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub rsWentylator.stop(); } // radiator fan sounds - if( ( Vehicle.EngineType == DieselEngine ) - || ( Vehicle.EngineType == DieselElectric ) ) { + if( ( Vehicle.EngineType == TEngineType::DieselEngine ) + || ( Vehicle.EngineType == TEngineType::DieselElectric ) ) { if( Vehicle.dizel_heat.rpmw > 0.1 ) { // NOTE: fan speed tends to max out at ~100 rpm; by default we try to get pitch range of 0.5-1.5 and volume range of 0.5-1.0 @@ -6813,7 +6814,7 @@ vehicle_table::update( double Deltatime, int Iterationcount ) { for( auto *vehicle : m_items ) { if( false == vehicle->bEnabled ) { continue; } // Ra: zmienić warunek na sprawdzanie pantografów w jednej zmiennej: czy pantografy i czy podniesione - if( vehicle->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) { + if( vehicle->MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) { update_traction( vehicle ); } vehicle->MoverParameters->ComputeConstans(); @@ -6989,16 +6990,22 @@ vehicle_table::erase_disabled() { ++vehicleiter; } else { - if( vehicle->MyTrack != nullptr ) { - vehicle->MyTrack->RemoveDynamicObject( vehicle ); + if( ( vehicle->MyTrack != nullptr ) + && ( true == vehicle->MyTrack->RemoveDynamicObject( vehicle ) ) ) { + vehicle->MyTrack = nullptr; } // clear potential train binding Global.pWorld->TrainDelete( vehicle ); // remove potential entries in the light array simulation::Lights.remove( vehicle ); +/* // finally get rid of the vehicle and its record themselves + // BUG: deleting the vehicle leaves dangling pointers in event->Activator and potentially elsewhere + // TBD, TODO: either mark 'dead' vehicles with additional flag, or delete the references as well SafeDelete( vehicle ); vehicleiter = m_items.erase( vehicleiter ); +*/ + ++vehicleiter; // NOTE: instead of the erase in the disabled section } } // ...and call it a day diff --git a/Event.cpp b/Event.cpp index c6a0cecc..b639a72d 100644 --- a/Event.cpp +++ b/Event.cpp @@ -297,37 +297,37 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) if (token.find('#') != std::string::npos) token.erase(token.find('#')); // obcięcie unikatowości win1250_to_ascii( token ); // get rid of non-ascii chars - Params[6].asCommand = cm_PassengerStopPoint; + Params[6].asCommand = TCommandType::cm_PassengerStopPoint; // nie do kolejki (dla SetVelocity też, ale jak jest do toru dowiązany) bEnabled = false; } else if (token == "SetVelocity") { bEnabled = false; - Params[6].asCommand = cm_SetVelocity; + Params[6].asCommand = TCommandType::cm_SetVelocity; } else if (token == "RoadVelocity") { bEnabled = false; - Params[6].asCommand = cm_RoadVelocity; + Params[6].asCommand = TCommandType::cm_RoadVelocity; } else if (token == "SectionVelocity") { bEnabled = false; - Params[6].asCommand = cm_SectionVelocity; + Params[6].asCommand = TCommandType::cm_SectionVelocity; } else if (token == "ShuntVelocity") { bEnabled = false; - Params[6].asCommand = cm_ShuntVelocity; + Params[6].asCommand = TCommandType::cm_ShuntVelocity; } else if (token == "OutsideStation") { bEnabled = false; // ma być skanowny, aby AI nie przekraczało W5 - Params[6].asCommand = cm_OutsideStation; + Params[6].asCommand = TCommandType::cm_OutsideStation; } else - Params[6].asCommand = cm_Unknown; + Params[6].asCommand = TCommandType::cm_Unknown; Params[0].asText = new char[token.size() + 1]; strcpy(Params[0].asText, token.c_str()); parser->getTokens(); @@ -817,7 +817,7 @@ TCommandType TEvent::Command() case tp_PutValues: return Params[6].asCommand; // komenda zakodowana binarnie } - return cm_Unknown; // inne eventy się nie liczą + return TCommandType::cm_Unknown; // inne eventy się nie liczą }; double TEvent::ValueGet(int n) diff --git a/Gauge.cpp b/Gauge.cpp index bc15ec3a..207c9389 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -45,7 +45,7 @@ void TGauge::Init(TSubModel *Submodel, TGaugeType Type, float Scale, float Offse return; } - if( m_type == gt_Digital ) { + if( m_type == TGaugeType::gt_Digital ) { TSubModel *sm = SubModel->ChildGet(); do { @@ -148,18 +148,18 @@ bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, } std::map gaugetypes { - { "rot", gt_Rotate }, - { "rotvar", gt_Rotate }, - { "mov", gt_Move }, - { "movvar", gt_Move }, - { "wip", gt_Wiper }, - { "dgt", gt_Digital } + { "rot", TGaugeType::gt_Rotate }, + { "rotvar", TGaugeType::gt_Rotate }, + { "mov", TGaugeType::gt_Move }, + { "movvar", TGaugeType::gt_Move }, + { "wip", TGaugeType::gt_Wiper }, + { "dgt", TGaugeType::gt_Digital } }; auto lookup = gaugetypes.find( gaugetypename ); auto const type = ( lookup != gaugetypes.end() ? lookup->second : - gt_Unknown ); + TGaugeType::gt_Unknown ); Init( submodel, type, scale, offset, friction, 0, endvalue, endscale, interpolatescale ); @@ -228,16 +228,16 @@ TGauge::UpdateValue( float fNewDesired, sound_source *Fallbacksound ) { if( ( currentvalue < fNewDesired ) && ( false == m_soundfxincrease.empty() ) ) { // shift up - m_soundfxincrease.play(); + m_soundfxincrease.play( sound_flags::exclusive ); } else if( ( currentvalue > fNewDesired ) && ( false == m_soundfxdecrease.empty() ) ) { // shift down - m_soundfxdecrease.play(); + m_soundfxdecrease.play( sound_flags::exclusive ); } else if( Fallbacksound != nullptr ) { // ...and if that fails too, try the provided fallback sound from legacy system - Fallbacksound->play(); + Fallbacksound->play( sound_flags::exclusive ); } }; @@ -276,15 +276,15 @@ void TGauge::Update() { if( SubModel ) { // warunek na wszelki wypadek, gdyby się submodel nie podłączył switch (m_type) { - case gt_Rotate: { + case TGaugeType::gt_Rotate: { SubModel->SetRotate( float3( 0, 1, 0 ), GetScaledValue() * 360.0 ); break; } - case gt_Move: { + case TGaugeType::gt_Move: { SubModel->SetTranslate( float3( 0, 0, GetScaledValue() ) ); break; } - case gt_Wiper: { + case TGaugeType::gt_Wiper: { auto const scaledvalue { GetScaledValue() }; SubModel->SetRotate( float3( 0, 1, 0 ), scaledvalue * 360.0 ); auto *sm = SubModel->ChildGet(); @@ -296,7 +296,7 @@ void TGauge::Update() { } break; } - case gt_Digital: { + case TGaugeType::gt_Digital: { // Ra 2014-07: licznik cyfrowy auto *sm = SubModel->ChildGet(); /* std::string n = FormatFloat( "0000000000", floor( fValue ) ); // na razie tak trochę bez sensu diff --git a/Gauge.h b/Gauge.h index 87e78781..9baeca83 100644 --- a/Gauge.h +++ b/Gauge.h @@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "Classes.h" #include "sound.h" -enum TGaugeType { +enum class TGaugeType { // typ ruchu gt_Unknown, // na razie nie znany gt_Rotate, // obrót @@ -60,7 +60,7 @@ private: GetScaledValue() const; // members - TGaugeType m_type { gt_Unknown }; // typ ruchu + TGaugeType m_type { TGaugeType::gt_Unknown }; // typ ruchu float m_friction { 0.f }; // hamowanie przy zliżaniu się do zadanej wartości float m_targetvalue { 0.f }; // wartość docelowa float m_value { 0.f }; // wartość obecna diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index dec46d5e..426d3f6f 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -156,13 +156,13 @@ enum coupling { uic = 0x100 }; // possible effect ranges for control commands; exclusive -enum range { +enum class range_t { local, unit, consist }; // start method for devices; exclusive -enum start { +enum class start_t { manual, automatic, manualwithautofallback, @@ -180,7 +180,7 @@ enum light { }; // door operation methods; exclusive -enum control { +enum control_t { passenger, // local, opened/closed for duration of loading driver, // remote, operated by the driver autonomous, // local, closed when vehicle moves and/or after timeout @@ -351,13 +351,13 @@ struct TTractionParam /*powyzsze parametry zwiazane sa z torem po ktorym aktualnie pojazd jedzie*/ /*typy hamulcow zespolonych*/ -enum TBrakeSystem { Individual, Pneumatic, ElectroPneumatic }; +enum class TBrakeSystem { Individual, Pneumatic, ElectroPneumatic }; /*podtypy hamulcow zespolonych*/ -enum TBrakeSubSystem { ss_None, ss_W, ss_K, ss_KK, ss_Hik, ss_ESt, ss_KE, ss_LSt, ss_MT, ss_Dako }; -enum TBrakeValve { NoValve, W, W_Lu_VI, W_Lu_L, W_Lu_XR, K, Kg, Kp, Kss, Kkg, Kkp, Kks, Hikg1, Hikss, Hikp1, KE, SW, EStED, NESt3, ESt3, LSt, ESt4, ESt3AL2, EP1, EP2, M483, CV1_L_TR, CV1, CV1_R, Other }; -enum TBrakeHandle { NoHandle, West, FV4a, M394, M254, FVel1, FVel6, D2, Knorr, FD1, BS2, testH, St113, MHZ_P, MHZ_T, MHZ_EN57, MHZ_K5P }; +enum class TBrakeSubSystem { ss_None, ss_W, ss_K, ss_KK, ss_Hik, ss_ESt, ss_KE, ss_LSt, ss_MT, ss_Dako }; +enum class TBrakeValve { NoValve, W, W_Lu_VI, W_Lu_L, W_Lu_XR, K, Kg, Kp, Kss, Kkg, Kkp, Kks, Hikg1, Hikss, Hikp1, KE, SW, EStED, NESt3, ESt3, LSt, ESt4, ESt3AL2, EP1, EP2, M483, CV1_L_TR, CV1, CV1_R, Other }; +enum class TBrakeHandle { NoHandle, West, FV4a, M394, M254, FVel1, FVel6, D2, Knorr, FD1, BS2, testH, St113, MHZ_P, MHZ_T, MHZ_EN57, MHZ_K5P }; /*typy hamulcow indywidualnych*/ -enum TLocalBrake { NoBrake, ManualBrake, PneumaticBrake, HydraulicBrake }; +enum class TLocalBrake { NoBrake, ManualBrake, PneumaticBrake, HydraulicBrake }; /*dla osob/towar: opoznienie hamowania/odhamowania*/ typedef double TBrakeDelayTable[4]; @@ -366,17 +366,17 @@ struct TBrakePressure double PipePressureVal = 0.0; double BrakePressureVal = 0.0; double FlowSpeedVal = 0.0; - TBrakeSystem BrakeType = Pneumatic; + TBrakeSystem BrakeType = TBrakeSystem::Pneumatic; }; typedef std::map TBrakePressureTable; /*typy napedow*/ -enum TEngineTypes { None, Dumb, WheelsDriven, ElectricSeriesMotor, ElectricInductionMotor, DieselEngine, SteamEngine, DieselElectric }; +enum class TEngineType { None, Dumb, WheelsDriven, ElectricSeriesMotor, ElectricInductionMotor, DieselEngine, SteamEngine, DieselElectric }; /*postac dostarczanej energii*/ -enum TPowerType { NoPower, BioPower, MechPower, ElectricPower, SteamPower }; +enum class TPowerType { NoPower, BioPower, MechPower, ElectricPower, SteamPower }; /*rodzaj paliwa*/ -enum TFuelType { Undefined, Coal, Oil }; +enum class TFuelType { Undefined, Coal, Oil }; /*rodzaj rusztu*/ struct TGrateType { TFuelType FuelType; @@ -425,7 +425,7 @@ struct TCurrentCollector { //} }; /*typy źródeł mocy*/ -enum TPowerSource { NotDefined, InternalSource, Transducer, Generator, Accumulator, CurrentCollector, PowerCable, Heater }; +enum class TPowerSource { NotDefined, InternalSource, Transducer, Generator, Accumulator, CurrentCollector, PowerCable, Heater }; struct _mover__1 @@ -481,7 +481,7 @@ struct TPowerParameters }; struct { - TEngineTypes GeneratorEngine; + TEngineType GeneratorEngine; }; struct { @@ -498,9 +498,9 @@ struct TPowerParameters MaxVoltage = 0.0; MaxCurrent = 0.0; IntR = 0.001; - SourceType = NotDefined; - PowerType = NoPower; - RPowerCable.PowerTrans = NoPower; + SourceType = TPowerSource::NotDefined; + PowerType = TPowerType::NoPower; + RPowerCable.PowerTrans = TPowerType::NoPower; } }; @@ -584,7 +584,7 @@ struct TTransmision double Ratio = 1.0; }; -enum TCouplerType { NoCoupler, Articulated, Bare, Chain, Screw, Automatic }; +enum class TCouplerType { NoCoupler, Articulated, Bare, Chain, Screw, Automatic }; struct power_coupling { double current{ 0.0 }; @@ -601,7 +601,7 @@ struct TCoupling { double FmaxB = 1000.0; double DmaxC = 0.1; double FmaxC = 1000.0; - TCouplerType CouplerType = NoCoupler; /*typ sprzegu*/ + TCouplerType CouplerType = TCouplerType::NoCoupler; /*typ sprzegu*/ /*zmienne*/ int CouplingFlag = 0; /*0 - wirtualnie, 1 - sprzegi, 2 - pneumatycznie, 4 - sterowanie, 8 - kabel mocy*/ int AllowedFlag = 3; //Ra: znaczenie jak wyżej, maska dostępnych @@ -625,7 +625,7 @@ struct fuel_pump { bool is_enabled { false }; // device is allowed/requested to operate bool is_active { false }; // device is working - start start_type { start::manual }; + start_t start_type { start_t::manual }; }; // basic approximation of a fuel pump @@ -634,7 +634,7 @@ struct oil_pump { bool is_enabled { false }; // device is allowed/requested to operate bool is_active { false }; // device is working - start start_type { start::manual }; + start_t start_type { start_t::manual }; float resource_amount { 1.f }; float pressure_minimum { 0.f }; // lowest acceptable working pressure float pressure_maximum { 0.65f }; // oil pressure at maximum engine revolutions @@ -647,7 +647,7 @@ struct water_pump { bool breaker { true }; // device is allowed to operate bool is_enabled { false }; // device is requested to operate bool is_active { false }; // device is working - start start_type { start::manual }; + start_t start_type { start_t::manual }; }; struct water_heater { @@ -728,7 +728,7 @@ public: std::string TypeName; /*nazwa serii/typu*/ //TrainType: string; {typ: EZT/elektrowoz - Winger 040304} int TrainType = 0; /*Ra: powinno być szybciej niż string*/ - TEngineTypes EngineType = None; /*typ napedu*/ + TEngineType EngineType = TEngineType::None; /*typ napedu*/ TPowerParameters EnginePowerSource; /*zrodlo mocy dla silnikow*/ TPowerParameters SystemPowerSource; /*zrodlo mocy dla systemow sterowania/przetwornic/sprezarek*/ TPowerParameters HeatingPowerSource; /*zrodlo mocy dla ogrzewania*/ @@ -766,11 +766,11 @@ public: /*hamulce:*/ int NBpA = 0; /*ilosc el. ciernych na os: 0 1 2 lub 4*/ int SandCapacity = 0; /*zasobnik piasku [kg]*/ - TBrakeSystem BrakeSystem = Individual;/*rodzaj hamulca zespolonego*/ - TBrakeSubSystem BrakeSubsystem = ss_None ; - TBrakeValve BrakeValve = NoValve; - TBrakeHandle BrakeHandle = NoHandle; - TBrakeHandle BrakeLocHandle = NoHandle; + TBrakeSystem BrakeSystem = TBrakeSystem::Individual;/*rodzaj hamulca zespolonego*/ + TBrakeSubSystem BrakeSubsystem = TBrakeSubSystem::ss_None ; + TBrakeValve BrakeValve = TBrakeValve::NoValve; + TBrakeHandle BrakeHandle = TBrakeHandle::NoHandle; + TBrakeHandle BrakeLocHandle = TBrakeHandle::NoHandle; double MBPM = 1.0; /*masa najwiekszego cisnienia*/ std::shared_ptr Hamulec; @@ -779,7 +779,7 @@ public: std::shared_ptr Pipe; std::shared_ptr Pipe2; - TLocalBrake LocalBrake = NoBrake; /*rodzaj hamulca indywidualnego*/ + TLocalBrake LocalBrake = TLocalBrake::NoBrake; /*rodzaj hamulca indywidualnego*/ TBrakePressureTable BrakePressureTable; /*wyszczegolnienie cisnien w rurze*/ TBrakePressure BrakePressureActual; //wartości ważone dla aktualnej pozycji kranu int ASBType = 0; /*0: brak hamulca przeciwposlizgowego, 1: reczny, 2: automat*/ @@ -1006,9 +1006,9 @@ public: bool CompressorAllow = false; /*! zezwolenie na uruchomienie sprezarki NBMX*/ bool CompressorAllowLocal{ true }; // local device state override (most units don't have this fitted so it's set to true not to intefere) bool CompressorGovernorLock{ false }; // indicates whether compressor pressure switch was activated due to reaching cut-out pressure - start CompressorStart{ start::manual }; // whether the compressor is started manually, or another way + start_t CompressorStart{ start_t::manual }; // whether the compressor is started manually, or another way // TODO converter parameters, for when we start cleaning up mover parameters - start ConverterStart{ start::manual }; // whether converter is started manually, or by other means + start_t ConverterStart{ start_t::manual }; // whether converter is started manually, or by other means float ConverterStartDelay{ 0.0f }; // delay (in seconds) before the converter is started, once its activation conditions are met double ConverterStartDelayTimer{ 0.0 }; // helper, for tracking whether converter start delay passed bool ConverterAllow = false; /*zezwolenie na prace przetwornicy NBMX*/ @@ -1024,7 +1024,6 @@ public: int BrakeCtrlPos = -2; /*nastawa hamulca zespolonego*/ double BrakeCtrlPosR = 0.0; /*nastawa hamulca zespolonego - plynna dla FV4a*/ double BrakeCtrlPos2 = 0.0; /*nastawa hamulca zespolonego - kapturek dla FV4a*/ - int LocalBrakePos = 0; /*nastawa hamulca indywidualnego*/ int ManualBrakePos = 0; /*nastawa hamulca recznego*/ double LocalBrakePosA = 0.0; /* @@ -1250,7 +1249,7 @@ public: bool AddPulseForce(int Multipler);/*dla drezyny*/ - bool Sandbox( bool const State, int const Notify = range::consist );/*wlacza/wylacza sypanie piasku*/ + bool Sandbox( bool const State, range_t const Notify = range_t::consist );/*wlacza/wylacza sypanie piasku*/ /*! zbijanie czuwaka/SHP*/ void SSReset(void); @@ -1263,11 +1262,9 @@ public: /*! stopnie hamowania - hamulec zasadniczy*/ bool IncBrakeLevelOld(void); bool DecBrakeLevelOld(void); - bool IncLocalBrakeLevel(int CtrlSpeed); - bool DecLocalBrakeLevel(int CtrlSpeed); + bool IncLocalBrakeLevel(float const CtrlSpeed); + bool DecLocalBrakeLevel(float const CtrlSpeed); /*! ABu 010205: - skrajne polozenia ham. pomocniczego*/ - bool IncLocalBrakeLevelFAST(void); - bool DecLocalBrakeLevelFAST(void); bool IncManualBrakeLevel(int CtrlSpeed); bool DecManualBrakeLevel(int CtrlSpeed); bool DynamicBrakeSwitch(bool Switch); @@ -1309,16 +1306,16 @@ public: /*--funkcje dla lokomotyw*/ bool DirectionBackward(void);/*! kierunek ruchu*/ - bool WaterPumpBreakerSwitch( bool State, int const Notify = range::consist ); // water pump breaker state toggle - bool WaterPumpSwitch( bool State, int const Notify = range::consist ); // water pump state toggle - bool WaterHeaterBreakerSwitch( bool State, int const Notify = range::consist ); // water heater breaker state toggle - bool WaterHeaterSwitch( bool State, int const Notify = range::consist ); // water heater state toggle - bool WaterCircuitsLinkSwitch( bool State, int const Notify = range::consist ); // water circuits link state toggle - bool FuelPumpSwitch( bool State, int const Notify = range::consist ); // fuel pump state toggle - bool OilPumpSwitch( bool State, int const Notify = range::consist ); // oil pump state toggle - bool MainSwitch( bool const State, int const Notify = range::consist );/*! wylacznik glowny*/ - bool ConverterSwitch( bool State, int const Notify = range::consist );/*! wl/wyl przetwornicy*/ - bool CompressorSwitch( bool State, int const Notify = range::consist );/*! wl/wyl sprezarki*/ + bool WaterPumpBreakerSwitch( bool State, range_t const Notify = range_t::consist ); // water pump breaker state toggle + bool WaterPumpSwitch( bool State, range_t const Notify = range_t::consist ); // water pump state toggle + bool WaterHeaterBreakerSwitch( bool State, range_t const Notify = range_t::consist ); // water heater breaker state toggle + bool WaterHeaterSwitch( bool State, range_t const Notify = range_t::consist ); // water heater state toggle + bool WaterCircuitsLinkSwitch( bool State, range_t const Notify = range_t::consist ); // water circuits link state toggle + bool FuelPumpSwitch( bool State, range_t const Notify = range_t::consist ); // fuel pump state toggle + bool OilPumpSwitch( bool State, range_t const Notify = range_t::consist ); // oil pump state toggle + bool MainSwitch( bool const State, range_t const Notify = range_t::consist );/*! wylacznik glowny*/ + bool ConverterSwitch( bool State, range_t const Notify = range_t::consist );/*! wl/wyl przetwornicy*/ + bool CompressorSwitch( bool State, range_t const Notify = range_t::consist );/*! wl/wyl sprezarki*/ /*-funkcje typowe dla lokomotywy elektrycznej*/ void ConverterCheck( double const Timestep ); // przetwornica @@ -1348,8 +1345,8 @@ public: bool AutoRelayCheck(void);//symulacja automatycznego rozruchu bool ResistorsFlagCheck(void); //sprawdzenie kontrolki oporow rozruchowych NBMX - bool PantFront( bool const State, int const Notify = range::consist ); //obsluga pantografou przedniego - bool PantRear( bool const State, int const Notify = range::consist ); //obsluga pantografu tylnego + bool PantFront( bool const State, range_t const Notify = range_t::consist ); //obsluga pantografou przedniego + bool PantRear( bool const State, range_t const Notify = range_t::consist ); //obsluga pantografu tylnego /*-funkcje typowe dla lokomotywy spalinowej z przekladnia mechaniczna*/ bool dizel_EngageSwitch(double state); @@ -1364,10 +1361,10 @@ public: /* funckje dla wagonow*/ bool LoadingDone(double LSpeed, std::string LoadInit); - bool DoorLeft(bool State, int const Notify = range::consist ); //obsluga drzwi lewych - bool DoorRight(bool State, int const Notify = range::consist ); //obsluga drzwi prawych + bool DoorLeft(bool State, range_t const Notify = range_t::consist ); //obsluga drzwi lewych + bool DoorRight(bool State, range_t const Notify = range_t::consist ); //obsluga drzwi prawych bool DoorBlockedFlag(void); //sprawdzenie blokady drzwi - bool signal_departure( bool const State, int const Notify = range::consist ); // toggles departure warning + bool signal_departure( bool const State, range_t const Notify = range_t::consist ); // toggles departure warning void update_autonomous_doors( double const Deltatime ); // automatic door controller update /* funkcje dla samochodow*/ @@ -1403,7 +1400,7 @@ private: void LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparameters, std::string const Prefix, std::string const &Input ); TPowerType LoadFIZ_PowerDecode( std::string const &Power ); TPowerSource LoadFIZ_SourceDecode( std::string const &Source ); - TEngineTypes LoadFIZ_EngineDecode( std::string const &Engine ); + TEngineType LoadFIZ_EngineDecode( std::string const &Engine ); bool readMPT0( std::string const &line ); bool readMPT( std::string const &line ); //Q 20160717 bool readMPTElectricSeries( std::string const &line ); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index bbd2b1df..72b32c95 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -332,7 +332,7 @@ LoadType( LoadTypeInitial ) for (int b = 0; b < 2; ++b) // Ra: kto tu zrobił "for b:=1 to 2 do" ??? { - Couplers[b].CouplerType = NoCoupler; + Couplers[b].CouplerType = TCouplerType::NoCoupler; Couplers[b].SpringKB = 1.0; Couplers[b].SpringKC = 1.0; Couplers[b].DmaxB = 0.1; @@ -467,7 +467,7 @@ bool TMoverParameters::Attach(int ConnectNo, int ConnectToNr, TMoverParameters * auto &othercoupler = ConnectTo->Couplers[ coupler.ConnectedNr ]; if( ( Forced ) || ( ( coupler.CoupleDist <= dEpsilon ) - && ( coupler.CouplerType != NoCoupler ) + && ( coupler.CouplerType != TCouplerType::NoCoupler ) && ( coupler.CouplerType == othercoupler.CouplerType ) ) ) { // stykaja sie zderzaki i kompatybilne typy sprzegow, chyba że łączenie na starcie if( coupler.CouplingFlag == ctrain_virtual ) { @@ -512,7 +512,7 @@ int TMoverParameters::DettachStatus(int ConnectNo) // if (CouplerType==Articulated) return false; //sprzęg nie do rozpięcia - może być tylko urwany // Couplers[ConnectNo].CoupleDist=Distance(Loc,Couplers[ConnectNo].Connected->Loc,Dim,Couplers[ConnectNo].Connected->Dim); CouplerDist(ConnectNo); - if (Couplers[ConnectNo].CouplerType == Screw ? Couplers[ConnectNo].CoupleDist < 0.0 : true) + if (Couplers[ConnectNo].CouplerType == TCouplerType::Screw ? Couplers[ConnectNo].CoupleDist < 0.0 : true) return -Couplers[ConnectNo].CouplingFlag; // można rozłączać, jeśli dociśnięty return (Couplers[ConnectNo].CoupleDist > 0.2) ? -Couplers[ConnectNo].CouplingFlag : Couplers[ConnectNo].CouplingFlag; @@ -653,7 +653,7 @@ bool TMoverParameters::ChangeCab(int direction) { // if (ActiveCab+direction=0) then LastCab:=ActiveCab; ActiveCab = ActiveCab + direction; - if ((BrakeSystem == Pneumatic) && (BrakeCtrlPosNo > 0)) + if ((BrakeSystem == TBrakeSystem::Pneumatic) && (BrakeCtrlPosNo > 0)) { // if (BrakeHandle==FV4a) //!!!POBIERAĆ WARTOŚĆ Z KLASY ZAWORU!!! // BrakeLevelSet(-2); //BrakeCtrlPos=-2; @@ -699,7 +699,7 @@ TMoverParameters::CurrentSwitch(bool const State) { } // TBD, TODO: split off shunt mode toggle into a separate command? It doesn't make much sense to have these two together like that // dla 2Ls150 - if( ( EngineType == DieselEngine ) + if( ( EngineType == TEngineType::DieselEngine ) && ( true == ShuntModeAllow ) && ( ActiveDir == 0 ) ) { // przed ustawieniem kierunku @@ -707,7 +707,7 @@ TMoverParameters::CurrentSwitch(bool const State) { return true; } // for SM42/SP42 - if( ( EngineType == DieselElectric ) + if( ( EngineType == TEngineType::DieselElectric ) && ( true == ShuntModeAllow ) && ( MainCtrlPos == 0 ) ) { ShuntMode = State; @@ -728,7 +728,7 @@ void TMoverParameters::UpdatePantVolume(double dt) } } - if (EnginePowerSource.SourceType == CurrentCollector) // tylko jeśli pantografujący + if (EnginePowerSource.SourceType == TPowerSource::CurrentCollector) // tylko jeśli pantografujący { // Ra 2014-07: zasadniczo, to istnieje zbiornik rozrządu i zbiornik pantografów - na razie mamy razem // Ra 2014-07: kurek trójdrogowy łączy spr.pom. z pantografami i wyłącznikiem ciśnieniowym WS @@ -815,8 +815,8 @@ void TMoverParameters::UpdateBatteryVoltage(double dt) sn4 = 0.0, sn5 = 0.0; // Ra: zrobić z tego amperomierz NN if( ( BatteryVoltage > 0 ) - && ( EngineType != DieselEngine ) - && ( EngineType != WheelsDriven ) + && ( EngineType != TEngineType::DieselEngine ) + && ( EngineType != TEngineType::WheelsDriven ) && ( NominalBatteryVoltage > 0 ) ) { if ((NominalBatteryVoltage / BatteryVoltage < 1.22) && Battery) @@ -879,7 +879,7 @@ void TMoverParameters::UpdateBatteryVoltage(double dt) }; BatteryVoltage -= (sn1 + sn2 + sn3 + sn4 + sn5); if (NominalBatteryVoltage / BatteryVoltage > 1.57) - if (MainSwitch(false) && (EngineType != DieselEngine) && (EngineType != WheelsDriven)) + if (MainSwitch(false) && (EngineType != TEngineType::DieselEngine) && (EngineType != TEngineType::WheelsDriven)) EventFlag = true; // wywalanie szybkiego z powodu zbyt niskiego napiecia if (BatteryVoltage > NominalBatteryVoltage) BatteryVoltage = NominalBatteryVoltage; // wstrzymanie ładowania pow. 110V @@ -938,7 +938,7 @@ ZN //masa double TMoverParameters::LocalBrakeRatio(void) { double LBR; - if (BrakeHandle == MHZ_EN57) + if (BrakeHandle == TBrakeHandle::MHZ_EN57) if ((BrakeOpModeFlag >= bom_EP)) LBR = Handle->GetEP(BrakeCtrlPosR); else @@ -946,7 +946,7 @@ double TMoverParameters::LocalBrakeRatio(void) else { if (LocalBrakePosNo > 0) - LBR = (double)LocalBrakePos / LocalBrakePosNo; + LBR = LocalBrakePosA; else LBR = 0; } @@ -1356,7 +1356,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap UpdatePantVolume(dt); // Ra 2014-07: obsługa zbiornika rozrządu oraz pantografów auto const d { ( - EngineType == WheelsDriven ? + EngineType == TEngineType::WheelsDriven ? dL * CabNo : // na chwile dla testu dL ) }; @@ -1436,7 +1436,7 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape UpdatePantVolume(dt); // Ra 2014-07: obsługa zbiornika rozrządu oraz pantografów auto const d { ( - EngineType == WheelsDriven ? + EngineType == TEngineType::WheelsDriven ? dL * CabNo : // na chwile dla testu dL ) }; @@ -1459,13 +1459,13 @@ void TMoverParameters::compute_movement_( double const Deltatime ) { RunInternalCommand(); // automatyczny rozruch - if (EngineType == ElectricSeriesMotor) + if (EngineType == TEngineType::ElectricSeriesMotor) if (AutoRelayCheck()) SetFlag(SoundFlag, sound::relay); - if( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) { + if( ( EngineType == TEngineType::DieselEngine ) + || ( EngineType == TEngineType::DieselElectric ) ) { if( dizel_Update( Deltatime ) ) { SetFlag( SoundFlag, sound::relay ); } @@ -1525,7 +1525,7 @@ double TMoverParameters::ShowEngineRotation(int VehN) // sprawdzanie przetwornicy void TMoverParameters::ConverterCheck( double const Timestep ) { // TODO: move other converter checks here, to have it all in one place for potential device object - if( ConverterStart == start::automatic ) { + if( ConverterStart == start_t::automatic ) { ConverterAllow = Mains; } @@ -1553,7 +1553,7 @@ void TMoverParameters::WaterPumpCheck( double const Timestep ) { WaterPump.is_active = ( ( true == Battery ) && ( true == WaterPump.breaker ) - && ( ( true == WaterPump.is_enabled ) || ( WaterPump.start_type == start::battery ) ) ); + && ( ( true == WaterPump.is_enabled ) || ( WaterPump.start_type == start_t::battery ) ) ); } // water heater status check @@ -1580,12 +1580,12 @@ void TMoverParameters::WaterHeaterCheck( double const Timestep ) { // fuel pump status update void TMoverParameters::FuelPumpCheck( double const Timestep ) { - if( FuelPump.start_type == start::automatic ) { - FuelPump.is_enabled = ( dizel_startup || Mains ); - } FuelPump.is_active = ( ( true == Battery ) - && ( true == FuelPump.is_enabled ) ); + && ( FuelPump.start_type == start_t::manual ? ( FuelPump.is_enabled ) : + FuelPump.start_type == start_t::automatic ? ( dizel_startup || Mains ) : + FuelPump.start_type == start_t::manualwithautofallback ? ( FuelPump.is_enabled || dizel_startup || Mains ) : + false ) ); // shouldn't ever get this far but, eh } // oil pump status update @@ -1593,13 +1593,13 @@ void TMoverParameters::OilPumpCheck( double const Timestep ) { OilPump.is_active = ( ( true == Battery ) - && ( OilPump.start_type == start::manual ? ( OilPump.is_enabled ) : - OilPump.start_type == start::automatic ? ( dizel_startup || Mains ) : - OilPump.start_type == start::manualwithautofallback ? ( OilPump.is_enabled || dizel_startup || Mains ) : + && ( OilPump.start_type == start_t::manual ? ( OilPump.is_enabled ) : + OilPump.start_type == start_t::automatic ? ( dizel_startup || Mains ) : + OilPump.start_type == start_t::manualwithautofallback ? ( OilPump.is_enabled || dizel_startup || Mains ) : false ) ); // shouldn't ever get this far but, eh auto const maxrevolutions { - EngineType == DieselEngine ? + EngineType == TEngineType::DieselEngine ? dizel_nmax : DElist[ MainCtrlPosNo ].RPM / 60.0 }; auto const minpressure { @@ -1633,7 +1633,7 @@ double TMoverParameters::ShowCurrent(int AmpN) { // Odczyt poboru prądu na podanym amperomierzu switch (EngineType) { - case ElectricInductionMotor: + case TEngineType::ElectricInductionMotor: switch (AmpN) { // do asynchronicznych case 1: @@ -1644,7 +1644,7 @@ double TMoverParameters::ShowCurrent(int AmpN) return ShowCurrentP(AmpN); // T_MoverParameters:: } break; - case DieselElectric: + case TEngineType::DieselElectric: return fabs(Im); break; default: @@ -1682,10 +1682,10 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) if (MainCtrlPos < MainCtrlPosNo) { switch( EngineType ) { - case None: - case Dumb: - case DieselElectric: - case ElectricInductionMotor: + case TEngineType::None: + case TEngineType::Dumb: + case TEngineType::DieselElectric: + case TEngineType::ElectricInductionMotor: { if( CtrlSpeed > 1 ) { OK = ( IncMainCtrl( 1 ) @@ -1698,7 +1698,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) break; } - case ElectricSeriesMotor: + case TEngineType::ElectricSeriesMotor: { if( ActiveDir == 0 ) { return false; } @@ -1756,7 +1756,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) break; } - case DieselEngine: + case TEngineType::DieselEngine: { if( CtrlSpeed > 1 ) { while( MainCtrlPos < MainCtrlPosNo ) { @@ -1772,7 +1772,7 @@ bool TMoverParameters::IncMainCtrl(int CtrlSpeed) break; } - case WheelsDriven: + case TEngineType::WheelsDriven: { OK = AddPulseForce( CtrlSpeed ); break; @@ -1844,14 +1844,14 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) else switch (EngineType) { - case None: - case Dumb: - case DieselElectric: - case ElectricInductionMotor: + case TEngineType::None: + case TEngineType::Dumb: + case TEngineType::DieselElectric: + case TEngineType::ElectricInductionMotor: { if (((CtrlSpeed == 1) && - /*(ScndCtrlPos==0) and*/ (EngineType != DieselElectric)) || - ((CtrlSpeed == 1) && (EngineType == DieselElectric))) + /*(ScndCtrlPos==0) and*/ (EngineType != TEngineType::DieselElectric)) || + ((CtrlSpeed == 1) && (EngineType == TEngineType::DieselElectric))) { MainCtrlPos--; OK = true; @@ -1861,7 +1861,7 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) break; } - case ElectricSeriesMotor: + case TEngineType::ElectricSeriesMotor: { if (CtrlSpeed == 1) /*and (ScndCtrlPos=0)*/ { @@ -1885,7 +1885,7 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) break; } - case DieselEngine: + case TEngineType::DieselEngine: { if (CtrlSpeed == 1) { @@ -1903,7 +1903,7 @@ bool TMoverParameters::DecMainCtrl(int CtrlSpeed) } // switch EngineType } } - else if (EngineType == WheelsDriven) + else if (EngineType == TEngineType::WheelsDriven) OK = AddPulseForce(-CtrlSpeed); else OK = false; @@ -1949,7 +1949,7 @@ bool TMoverParameters::IncScndCtrl(int CtrlSpeed) // if (RList[MainCtrlPos].R=0) and (MainCtrlPos>0) and (ScndCtrlPos CtrlDelay) LastRelayTime = 0; - if ((OK) && (EngineType == ElectricInductionMotor) && (ScndCtrlPosNo == 1)) + if ((OK) && (EngineType == TEngineType::ElectricInductionMotor) && (ScndCtrlPosNo == 1)) { // NOTE: round() already adds 0.5, are the ones added here as well correct? if ((Vmax < 250)) @@ -2008,7 +2008,7 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed) else if ((ScndCtrlPosNo > 0) && (CabNo != 0)) { if ((ScndCtrlPos > 0) && (!CoupledCtrl) && - ((EngineType != DieselElectric) || (!AutoRelayFlag))) + ((EngineType != TEngineType::DieselElectric) || (!AutoRelayFlag))) { if (CtrlSpeed == 1) { @@ -2036,7 +2036,7 @@ bool TMoverParameters::DecScndCtrl(int CtrlSpeed) if (LastRelayTime > CtrlDownDelay) LastRelayTime = 0; - if ((OK) && (EngineType == ElectricInductionMotor) && (ScndCtrlPosNo == 1)) + if ((OK) && (EngineType == TEngineType::ElectricInductionMotor) && (ScndCtrlPosNo == 1)) { ScndCtrlActualPos = 0; SendCtrlToNext("SpeedCntrl", ScndCtrlActualPos, CabNo); @@ -2092,8 +2092,8 @@ bool TMoverParameters::CabDeactivisation(void) bool TMoverParameters::AddPulseForce(int Multipler) { bool APF; - if ((EngineType == WheelsDriven) && (EnginePowerSource.SourceType == InternalSource) && - (EnginePowerSource.PowerType == BioPower)) + if ((EngineType == TEngineType::WheelsDriven) && (EnginePowerSource.SourceType == TPowerSource::InternalSource) && + (EnginePowerSource.PowerType == TPowerType::BioPower)) { ActiveDir = CabNo; DirAbsolute = ActiveDir * CabNo; @@ -2117,7 +2117,7 @@ bool TMoverParameters::AddPulseForce(int Multipler) // Q: 20160713 // sypanie piasku // ************************************************************************************************* -bool TMoverParameters::Sandbox( bool const State, int const Notify ) +bool TMoverParameters::Sandbox( bool const State, range_t const Notify ) { bool result{ false }; @@ -2136,10 +2136,10 @@ bool TMoverParameters::Sandbox( bool const State, int const Notify ) } } - if( Notify != range::local ) { + if( Notify != range_t::local ) { // if requested pass the command on auto const couplingtype = - ( Notify == range::unit ? + ( Notify == range_t::unit ? ctrain_controll | ctrain_depot : ctrain_controll ); @@ -2354,7 +2354,7 @@ bool TMoverParameters::DirectionBackward(void) } if ((MainCtrlPosNo > 0) && (ActiveDir > -1) && (MainCtrlPos == 0)) { - if (EngineType == WheelsDriven) + if (EngineType == TEngineType::WheelsDriven) CabNo--; // else ActiveDir--; @@ -2381,7 +2381,7 @@ bool TMoverParameters::AntiSlippingButton(void) } // water pump breaker state toggle -bool TMoverParameters::WaterPumpBreakerSwitch( bool State, int const Notify ) { +bool TMoverParameters::WaterPumpBreakerSwitch( bool State, range_t const Notify ) { /* if( FuelPump.start_type == start::automatic ) { // automatic fuel pump ignores 'manual' state commands @@ -2392,12 +2392,12 @@ bool TMoverParameters::WaterPumpBreakerSwitch( bool State, int const Notify ) { WaterPump.breaker = State; - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "WaterPumpBreakerSwitch", ( WaterPump.breaker ? 1 : 0 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -2406,9 +2406,9 @@ bool TMoverParameters::WaterPumpBreakerSwitch( bool State, int const Notify ) { } // water pump state toggle -bool TMoverParameters::WaterPumpSwitch( bool State, int const Notify ) { +bool TMoverParameters::WaterPumpSwitch( bool State, range_t const Notify ) { - if( WaterPump.start_type == start::battery ) { + if( WaterPump.start_type == start_t::battery ) { // automatic fuel pump ignores 'manual' state commands return false; } @@ -2417,12 +2417,12 @@ bool TMoverParameters::WaterPumpSwitch( bool State, int const Notify ) { WaterPump.is_enabled = State; - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "WaterPumpSwitch", ( WaterPump.is_enabled ? 1 : 0 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -2431,7 +2431,7 @@ bool TMoverParameters::WaterPumpSwitch( bool State, int const Notify ) { } // water heater breaker state toggle -bool TMoverParameters::WaterHeaterBreakerSwitch( bool State, int const Notify ) { +bool TMoverParameters::WaterHeaterBreakerSwitch( bool State, range_t const Notify ) { /* if( FuelPump.start_type == start::automatic ) { // automatic fuel pump ignores 'manual' state commands @@ -2442,12 +2442,12 @@ bool TMoverParameters::WaterHeaterBreakerSwitch( bool State, int const Notify ) WaterHeater.breaker = State; - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "WaterHeaterBreakerSwitch", ( WaterHeater.breaker ? 1 : 0 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -2456,7 +2456,7 @@ bool TMoverParameters::WaterHeaterBreakerSwitch( bool State, int const Notify ) } // water heater state toggle -bool TMoverParameters::WaterHeaterSwitch( bool State, int const Notify ) { +bool TMoverParameters::WaterHeaterSwitch( bool State, range_t const Notify ) { /* if( FuelPump.start_type == start::automatic ) { // automatic fuel pump ignores 'manual' state commands @@ -2467,12 +2467,12 @@ bool TMoverParameters::WaterHeaterSwitch( bool State, int const Notify ) { WaterHeater.is_enabled = State; - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "WaterHeaterSwitch", ( WaterHeater.is_enabled ? 1 : 0 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -2481,7 +2481,7 @@ bool TMoverParameters::WaterHeaterSwitch( bool State, int const Notify ) { } // water circuits link state toggle -bool TMoverParameters::WaterCircuitsLinkSwitch( bool State, int const Notify ) { +bool TMoverParameters::WaterCircuitsLinkSwitch( bool State, range_t const Notify ) { if( false == dizel_heat.auxiliary_water_circuit ) { // can't link the circuits if the vehicle only has one @@ -2492,12 +2492,12 @@ bool TMoverParameters::WaterCircuitsLinkSwitch( bool State, int const Notify ) { WaterCircuitsLink = State; - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "WaterCircuitsLinkSwitch", ( WaterCircuitsLink ? 1 : 0 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -2506,9 +2506,9 @@ bool TMoverParameters::WaterCircuitsLinkSwitch( bool State, int const Notify ) { } // fuel pump state toggle -bool TMoverParameters::FuelPumpSwitch( bool State, int const Notify ) { +bool TMoverParameters::FuelPumpSwitch( bool State, range_t const Notify ) { - if( FuelPump.start_type == start::automatic ) { + if( FuelPump.start_type == start_t::automatic ) { // automatic fuel pump ignores 'manual' state commands return false; } @@ -2517,12 +2517,12 @@ bool TMoverParameters::FuelPumpSwitch( bool State, int const Notify ) { FuelPump.is_enabled = State; - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "FuelPumpSwitch", ( FuelPump.is_enabled ? 1 : 0 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -2531,9 +2531,9 @@ bool TMoverParameters::FuelPumpSwitch( bool State, int const Notify ) { } // oil pump state toggle -bool TMoverParameters::OilPumpSwitch( bool State, int const Notify ) { +bool TMoverParameters::OilPumpSwitch( bool State, range_t const Notify ) { - if( OilPump.start_type == start::automatic ) { + if( OilPump.start_type == start_t::automatic ) { // automatic pump ignores 'manual' state commands return false; } @@ -2542,12 +2542,12 @@ bool TMoverParameters::OilPumpSwitch( bool State, int const Notify ) { OilPump.is_enabled = State; - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "OilPumpSwitch", ( OilPump.is_enabled ? 1 : 0 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -2559,7 +2559,7 @@ bool TMoverParameters::OilPumpSwitch( bool State, int const Notify ) { // Q: 20160713 // włączenie / wyłączenie obwodu głownego // ************************************************************************************************* -bool TMoverParameters::MainSwitch( bool const State, int const Notify ) +bool TMoverParameters::MainSwitch( bool const State, range_t const Notify ) { bool const initialstate { Mains || dizel_startup }; @@ -2567,7 +2567,7 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) && ( MainCtrlPosNo > 0 ) ) { if( ( false == State ) - || ( ( ( ScndCtrlPos == 0 ) || ( EngineType == ElectricInductionMotor ) ) + || ( ( ( ScndCtrlPos == 0 ) || ( EngineType == TEngineType::ElectricInductionMotor ) ) && ( ( ConvOvldFlag == false ) || ( TrainType == dt_EZT ) ) && ( LastSwitchingTime > CtrlDelay ) && ( false == TestFlag( DamageFlag, dtrain_out ) ) @@ -2575,8 +2575,8 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) if( true == State ) { // switch on - if( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) { + if( ( EngineType == TEngineType::DieselEngine ) + || ( EngineType == TEngineType::DieselElectric ) ) { // launch diesel engine startup procedure dizel_startup = true; } @@ -2598,13 +2598,13 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) LastSwitchingTime = 0; } - if( Notify != range::local ) { + if( Notify != range_t::local ) { // pass the command to other vehicles SendCtrlToNext( "MainSwitch", ( State ? 1 : 0 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -2618,7 +2618,7 @@ bool TMoverParameters::MainSwitch( bool const State, int const Notify ) // Q: 20160713 // włączenie / wyłączenie przetwornicy // ************************************************************************************************* -bool TMoverParameters::ConverterSwitch( bool State, int const Notify ) +bool TMoverParameters::ConverterSwitch( bool State, range_t const Notify ) { bool CS = false; // Ra: normalnie chyba false? @@ -2628,19 +2628,19 @@ bool TMoverParameters::ConverterSwitch( bool State, int const Notify ) CS = true; } if( ConverterAllow == true ) { - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "ConverterSwitch", 1, CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } } else { - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "ConverterSwitch", 0, CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -2653,9 +2653,9 @@ bool TMoverParameters::ConverterSwitch( bool State, int const Notify ) // Q: 20160713 // włączenie / wyłączenie sprężarki // ************************************************************************************************* -bool TMoverParameters::CompressorSwitch( bool State, int const Notify ) +bool TMoverParameters::CompressorSwitch( bool State, range_t const Notify ) { - if( CompressorStart != start::manual ) { + if( CompressorStart != start_t::manual ) { // only pay attention if the compressor can be controlled manually return false; } @@ -2667,19 +2667,19 @@ bool TMoverParameters::CompressorSwitch( bool State, int const Notify ) CS = true; } if( CompressorAllow == true ) { - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "CompressorSwitch", 1, CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } } else { - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( "CompressorSwitch", 0, CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -2765,7 +2765,7 @@ bool TMoverParameters::DecBrakeLevelOld(void) if ((BrakeCtrlPosNo > 0) /*&& (LocalBrakePos == 0)*/) { - if (BrakeCtrlPos > -1 - int(BrakeHandle == FV4a)) + if (BrakeCtrlPos > -1 - int(BrakeHandle == TBrakeHandle::FV4a)) { BrakeCtrlPos--; // BrakeCtrlPosR:=BrakeCtrlPos; @@ -2834,16 +2834,12 @@ bool TMoverParameters::DecBrakeLevelOld(void) // Q: 20160711 // zwiększenie nastawy hamulca pomocnicznego // ************************************************************************************************* -bool TMoverParameters::IncLocalBrakeLevel(int CtrlSpeed) +bool TMoverParameters::IncLocalBrakeLevel(float const CtrlSpeed) { bool IBL; - if ((LocalBrakePos < LocalBrakePosNo) /*and (BrakeCtrlPos<1)*/) + if ((LocalBrakePosA < 1.0) /*and (BrakeCtrlPos<1)*/) { - while ((LocalBrakePos < LocalBrakePosNo) && (CtrlSpeed > 0)) - { - LocalBrakePos++; - CtrlSpeed--; - } + LocalBrakePosA = std::min( 1.0, LocalBrakePosA + CtrlSpeed / LocalBrakePosNo ); IBL = true; } else @@ -2857,16 +2853,12 @@ bool TMoverParameters::IncLocalBrakeLevel(int CtrlSpeed) // Q: 20160711 // zmniejszenie nastawy hamulca pomocniczego // ************************************************************************************************* -bool TMoverParameters::DecLocalBrakeLevel(int CtrlSpeed) +bool TMoverParameters::DecLocalBrakeLevel(float const CtrlSpeed) { bool DBL; - if (LocalBrakePos > 0) + if (LocalBrakePosA > 0) { - while ((CtrlSpeed > 0) && (LocalBrakePos > 0)) - { - LocalBrakePos--; - CtrlSpeed--; - } + LocalBrakePosA = std::max( 0.0, LocalBrakePosA - CtrlSpeed / LocalBrakePosNo ); DBL = true; } else @@ -2876,42 +2868,6 @@ bool TMoverParameters::DecLocalBrakeLevel(int CtrlSpeed) return DBL; } -// ************************************************************************************************* -// Q: 20160711 -// ustawienie pozycji kranu pomocniczego na masymalną wartość -// ************************************************************************************************* -bool TMoverParameters::IncLocalBrakeLevelFAST(void) -{ - bool ILBLF; - if (LocalBrakePos < LocalBrakePosNo) - { - LocalBrakePos = LocalBrakePosNo; - ILBLF = true; - } - else - ILBLF = false; - UnBrake = true; - return ILBLF; -} - -// ************************************************************************************************* -// Q: 20160711 -// ustawienie pozycji hamulca pomocniczego na minimalną -// ************************************************************************************************* -bool TMoverParameters::DecLocalBrakeLevelFAST(void) -{ - bool DLBLF; - if (LocalBrakePos > 0) - { - LocalBrakePos = 0; - DLBLF = true; - } - else - DLBLF = false; - UnBrake = true; - return DLBLF; -} - // ************************************************************************************************* // Q: 20160711 // zwiększenie nastawy hamulca ręcznego @@ -2990,7 +2946,7 @@ bool TMoverParameters::DynamicBrakeSwitch(bool Switch) bool TMoverParameters::RadiostopSwitch(bool Switch) { bool EBS; - if( ( BrakeSystem != Individual ) + if( ( BrakeSystem != TBrakeSystem::Individual ) && ( BrakeCtrlPosNo > 0 ) ) { if( ( true == Switch ) @@ -3069,7 +3025,7 @@ bool TMoverParameters::SwitchEPBrake(int state) double temp; OK = false; - if ((BrakeHandle == St113) && (ActiveCab != 0)) + if ((BrakeHandle == TBrakeHandle::St113) && (ActiveCab != 0)) { if (state > 0) temp = Handle->GetCP(); // TODO: przetlumaczyc @@ -3150,7 +3106,7 @@ bool TMoverParameters::BrakeDelaySwitch(int BDS) { bool rBDS; // if (BrakeCtrlPosNo > 0) - if (BrakeHandle == MHZ_EN57) + if (BrakeHandle == TBrakeHandle::MHZ_EN57) { if ((BDS != BrakeOpModeFlag) && ((BDS & BrakeOpModes) > 0)) { @@ -3270,7 +3226,7 @@ void TMoverParameters::CompressorCheck(double dt) && ( true == Mains ) && ( MainCtrlPos > 0 ) ) { if( Compressor < MaxCompressor ) { - if( ( EngineType == DieselElectric ) + if( ( EngineType == TEngineType::DieselElectric ) && ( CompressorPower > 0 ) ) { CompressedVolume += CompressorSpeed @@ -3295,7 +3251,7 @@ void TMoverParameters::CompressorCheck(double dt) else { if( CompressorPower == 3 ) { // experimental: make sure compressor coupled with diesel engine is always ready for work - CompressorStart = start::automatic; + CompressorStart = start_t::automatic; } if (CompressorFlag) // jeśli sprężarka załączona { // sprawdzić możliwe warunki wyłączenia sprężarki @@ -3303,7 +3259,7 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if( Couplers[ side::rear ].Connected != NULL ) { CompressorFlag = ( - ( ( Couplers[ side::rear ].Connected->CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( Couplers[ side::rear ].Connected->CompressorAllow ) || ( CompressorStart == start_t::automatic ) ) && ( CompressorAllowLocal ) && ( Couplers[ side::rear ].Connected->ConverterFlag ) ); } @@ -3316,7 +3272,7 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if( Couplers[ side::front ].Connected != NULL ) { CompressorFlag = ( - ( ( Couplers[ side::front ].Connected->CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( Couplers[ side::front ].Connected->CompressorAllow ) || ( CompressorStart == start_t::automatic ) ) && ( CompressorAllowLocal ) && ( Couplers[ side::front ].Connected->ConverterFlag ) ); } @@ -3326,7 +3282,7 @@ void TMoverParameters::CompressorCheck(double dt) } else CompressorFlag = ( - ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( CompressorAllow ) || ( CompressorStart == start_t::automatic ) ) && ( CompressorAllowLocal ) && ( Mains ) && ( ( ConverterFlag ) @@ -3379,7 +3335,7 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if( Couplers[ side::rear ].Connected != NULL ) { CompressorFlag = ( - ( ( Couplers[ side::rear ].Connected->CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( Couplers[ side::rear ].Connected->CompressorAllow ) || ( CompressorStart == start_t::automatic ) ) && ( CompressorAllowLocal ) && ( Couplers[ side::rear ].Connected->ConverterFlag ) ); } @@ -3392,7 +3348,7 @@ void TMoverParameters::CompressorCheck(double dt) { // zasilanie sprężarki w członie ra z członu silnikowego (sprzęg 1) if( Couplers[ side::front ].Connected != NULL ) { CompressorFlag = ( - ( ( Couplers[ side::front ].Connected->CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( Couplers[ side::front ].Connected->CompressorAllow ) || ( CompressorStart == start_t::automatic ) ) && ( CompressorAllowLocal ) && ( Couplers[ side::front ].Connected->ConverterFlag ) ); } @@ -3402,7 +3358,7 @@ void TMoverParameters::CompressorCheck(double dt) } else { CompressorFlag = ( - ( ( CompressorAllow ) || ( CompressorStart == start::automatic ) ) + ( ( CompressorAllow ) || ( CompressorStart == start_t::automatic ) ) && ( CompressorAllowLocal ) && ( Mains ) && ( ( ConverterFlag ) @@ -3440,8 +3396,8 @@ void TMoverParameters::CompressorCheck(double dt) // the compressor is coupled with the diesel engine, engine revolutions affect the output if( false == CompressorGovernorLock ) { auto const enginefactor { ( - EngineType == DieselElectric ? ( ( 60.0 * std::abs( enrot ) ) / DElist[ MainCtrlPosNo ].RPM ) : - EngineType == DieselEngine ? ( std::abs( enrot ) / nmax ) : + EngineType == TEngineType::DieselElectric ? ( ( 60.0 * std::abs( enrot ) ) / DElist[ MainCtrlPosNo ].RPM ) : + EngineType == TEngineType::DieselEngine ? ( std::abs( enrot ) / nmax ) : 1.0 ) }; // shouldn't ever get here but, eh CompressedVolume += CompressorSpeed @@ -3506,18 +3462,12 @@ void TMoverParameters::UpdatePipePressure(double dt) if ((BrakeCtrlPosNo > 1) /*&& (ActiveCab != 0)*/) // with BrakePressureTable[BrakeCtrlPos] do { - if ((EngineType != ElectricInductionMotor)) - dpLocalValve = - LocHandle->GetPF(std::max(static_cast(LocalBrakePos) / LocalBrakePosNo, LocalBrakePosA), - Hamulec->GetBCP(), ScndPipePress, dt, 0); - else - dpLocalValve = - LocHandle->GetPF(LocalBrakePosA, Hamulec->GetBCP(), ScndPipePress, dt, 0); + dpLocalValve = LocHandle->GetPF(LocalBrakePosA, Hamulec->GetBCP(), ScndPipePress, dt, 0); - if( ( BrakeHandle == FV4a ) + if( ( BrakeHandle == TBrakeHandle::FV4a ) && ( ( PipePress < 2.75 ) && ( ( Hamulec->GetStatus() & b_rls ) == 0 ) ) - && ( BrakeSubsystem == ss_LSt ) + && ( BrakeSubsystem == TBrakeSubSystem::ss_LSt ) && ( TrainType != dt_EZT ) ) { temp = PipePress + 0.00001; } @@ -3528,7 +3478,7 @@ void TMoverParameters::UpdatePipePressure(double dt) if ((BrakeOpModeFlag != bom_PS)) if ((BrakeOpModeFlag < bom_EP) || ((Handle->GetPos(bh_EB) - 0.5) < BrakeCtrlPosR) || - (BrakeHandle != MHZ_EN57)) + (BrakeHandle != TBrakeHandle::MHZ_EN57)) dpMainValve = Handle->GetPF(BrakeCtrlPosR, PipePress, temp, dt, EqvtPipePress); else dpMainValve = Handle->GetPF(0, PipePress, temp, dt, EqvtPipePress); @@ -3571,10 +3521,10 @@ void TMoverParameters::UpdatePipePressure(double dt) switch (BrakeValve) { - case K: - case W: { + case TBrakeValve::K: + case TBrakeValve::W: { - if( BrakeLocHandle != NoHandle ) { + if( BrakeLocHandle != TBrakeHandle::NoHandle ) { LocBrakePress = LocHandle->GetCP(); //(Hamulec as TWest).SetLBP(LocBrakePress); @@ -3589,8 +3539,8 @@ void TMoverParameters::UpdatePipePressure(double dt) break; } - case LSt: - case EStED: { + case TBrakeValve::LSt: + case TBrakeValve::EStED: { LocBrakePress = LocHandle->GetCP(); for( int b = 0; b < 2; b++ ) @@ -3611,7 +3561,7 @@ void TMoverParameters::UpdatePipePressure(double dt) //(Hamulec as TLSt).SetLBP(LocBrakePress); Hamulec->SetLBP( LocBrakePress ); - if( ( BrakeValve == EStED ) ) + if( ( BrakeValve == TBrakeValve::EStED ) ) if( MBPM < 2 ) Hamulec->PLC( MaxBrakePress[ LoadFlag ] ); else @@ -3619,7 +3569,7 @@ void TMoverParameters::UpdatePipePressure(double dt) break; } - case CV1_L_TR: + case TBrakeValve::CV1_L_TR: { LocBrakePress = LocHandle->GetCP(); //(Hamulec as TCV1L_TR).SetLBP(LocBrakePress); @@ -3627,15 +3577,15 @@ void TMoverParameters::UpdatePipePressure(double dt) break; } - case EP2: + case TBrakeValve::EP2: { Hamulec->PLC( TotalMass ); break; } - case ESt3AL2: - case NESt3: - case ESt4: - case ESt3: + case TBrakeValve::ESt3AL2: + case TBrakeValve::NESt3: + case TBrakeValve::ESt4: + case TBrakeValve::ESt3: { if( MBPM < 2 ) //(Hamulec as TNESt3).PLC(MaxBrakePress[LoadFlag]) @@ -3648,7 +3598,7 @@ void TMoverParameters::UpdatePipePressure(double dt) Hamulec->SetLBP( LocBrakePress ); break; } - case KE: + case TBrakeValve::KE: { LocBrakePress = LocHandle->GetCP(); //(Hamulec as TKE).SetLBP(LocBrakePress); @@ -3670,7 +3620,7 @@ void TMoverParameters::UpdatePipePressure(double dt) } } // switch - if ((BrakeHandle == FVel6) && (ActiveCab != 0)) + if ((BrakeHandle == TBrakeHandle::FVel6) && (ActiveCab != 0)) { if ((Battery) && (ActiveDir != 0) @@ -3936,9 +3886,9 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) // ABu: to dla optymalizacji, bo chyba te rzeczy wystarczy sprawdzac 1 raz na // klatke? LastSwitchingTime += dt1; - if (EngineType == ElectricSeriesMotor) + if (EngineType == TEngineType::ElectricSeriesMotor) LastRelayTime += dt1; - if( Mains && /*(abs(CabNo) < 2) &&*/ ( EngineType == ElectricSeriesMotor ) ) // potem ulepszyc! pantogtrafy! + if( Mains && /*(abs(CabNo) < 2) &&*/ ( EngineType == TEngineType::ElectricSeriesMotor ) ) // potem ulepszyc! pantogtrafy! { // Ra 2014-03: uwzględnienie kierunku jazdy w napięciu na silnikach, a powinien być // zdefiniowany nawrotnik if( CabNo == 0 ) @@ -3946,7 +3896,7 @@ void TMoverParameters::ComputeTotalForce(double dt, double dt1, bool FullVer) else Voltage = RunningTraction.TractionVoltage * DirAbsolute; // ActiveDir*CabNo; } // bo nie dzialalo - else if( ( EngineType == ElectricInductionMotor ) + else if( ( EngineType == TEngineType::ElectricInductionMotor ) || ( ( ( Couplers[ side::front ].CouplingFlag & ctrain_power ) == ctrain_power ) || ( ( Couplers[ side::rear ].CouplingFlag & ctrain_power ) == ctrain_power ) ) ) { // potem ulepszyc! pantogtrafy! @@ -4096,11 +4046,11 @@ double TMoverParameters::BrakeForce( TTrackParam const &Track ) { double K{ 0 }, Fb{ 0 }, sm{ 0 }; switch( LocalBrake ) { - case ManualBrake: { + case TLocalBrake::ManualBrake: { K = MaxBrakeForce * ManualBrakeRatio(); break; } - case HydraulicBrake: { + case TLocalBrake::HydraulicBrake: { K = MaxBrakeForce * LocalBrakeRatio(); break; } @@ -4132,7 +4082,7 @@ double TMoverParameters::BrakeForce( TTrackParam const &Track ) { K += Ntotal; // w kN K *= static_cast(BrakeCylNo) / (NBrakeAxles * static_cast(NBpA)); // w kN na os } - if ((BrakeSystem == Pneumatic) || (BrakeSystem == ElectroPneumatic)) + if ((BrakeSystem == TBrakeSystem::Pneumatic) || (BrakeSystem == TBrakeSystem::ElectroPneumatic)) { u = Hamulec->GetFC(Vel, K); UnitBrakeForce = u * K * 1000.0; // sila na jeden klocek w N @@ -4377,7 +4327,7 @@ double TMoverParameters::CouplerForce(int CouplerN, double dt) //***if -tempdist>(DmaxB+Connected^.Couplers[CNext].DmaxB)/10 then {zderzenie} { Couplers[CouplerN].CheckCollision = true; - if( ( Couplers[ CouplerN ].CouplerType == Automatic ) + if( ( Couplers[ CouplerN ].CouplerType == TCouplerType::Automatic ) && ( Couplers[ CouplerN ].CouplingFlag == coupling::faux ) ) { // sprzeganie wagonow z samoczynnymi sprzegami} // CouplingFlag:=ctrain_coupler+ctrain_pneumatic+ctrain_controll+ctrain_passenger+ctrain_scndpneumatic; @@ -4407,7 +4357,7 @@ double TMoverParameters::TractionForce( double dt ) { dmoment = 0; // youBy switch( EngineType ) { - case DieselElectric: { + case TEngineType::DieselElectric: { if( ( true == Mains ) && ( true == FuelPump.is_active ) ) { @@ -4443,7 +4393,7 @@ double TMoverParameters::TractionForce( double dt ) { } break; } - case DieselEngine: { + case TEngineType::DieselEngine: { if( ShuntMode ) // dodatkowa przekładnia np. dla 2Ls150 dtrans = AnPos * Transmision.Ratio * MotorParam[ ScndCtrlActualPos ].mIsat; else @@ -4471,7 +4421,7 @@ double TMoverParameters::TractionForce( double dt ) { // TBD, TODO: move this to update, it doesn't exactly have much to do with traction switch( EngineType ) { - case ElectricSeriesMotor: { + case TEngineType::ElectricSeriesMotor: { if( true == Mains ) { switch( RVentType ) { @@ -4519,7 +4469,7 @@ double TMoverParameters::TractionForce( double dt ) { break; } - case DieselElectric: { + case TEngineType::DieselElectric: { // NOTE: for this type RventRot is the speed of motor blowers; we also update radiator fans while at it if( true == Mains ) { // TBD, TODO: currently ignores RVentType, fix this? @@ -4535,7 +4485,7 @@ double TMoverParameters::TractionForce( double dt ) { break; } - case DieselEngine: { + case TEngineType::DieselEngine: { // NOTE: we update only radiator fans, as vehicles with diesel engine don't have other ventilators if( true == Mains ) { dizel_heat.rpmw += clamp( dizel_heat.rpmwz - dizel_heat.rpmw, -100.f, 50.f ) * dt; @@ -4554,12 +4504,12 @@ double TMoverParameters::TractionForce( double dt ) { } switch( EngineType ) { - case Dumb: { + case TEngineType::Dumb: { PosRatio = ( MainCtrlPos + ScndCtrlPos ) / ( MainCtrlPosNo + ScndCtrlPosNo + 0.01 ); EnginePower = 1000.0 * Power * PosRatio; break; } - case DieselEngine: { + case TEngineType::DieselEngine: { EnginePower = ( 2 * dizel_Mstand + dmoment ) * enrot * ( 2.0 * M_PI / 1000.0 ); if( MainCtrlPos > 1 ) { // dodatkowe opory z powodu sprezarki} @@ -4567,7 +4517,7 @@ double TMoverParameters::TractionForce( double dt ) { } break; } - case DieselElectric: { + case TEngineType::DieselElectric: { EnginePower = 0; // the actual calculation is done in two steps later in the method break; } @@ -4579,7 +4529,7 @@ double TMoverParameters::TractionForce( double dt ) { if (ActiveDir != 0) switch (EngineType) { - case Dumb: + case TEngineType::Dumb: { if (Mains && (CabNo != 0)) { @@ -4596,10 +4546,10 @@ double TMoverParameters::TractionForce( double dt ) { break; } // Dumb - case WheelsDriven: + case TEngineType::WheelsDriven: { - if (EnginePowerSource.SourceType == InternalSource) - if (EnginePowerSource.PowerType == BioPower) + if (EnginePowerSource.SourceType == TPowerSource::InternalSource) + if (EnginePowerSource.PowerType == TPowerType::BioPower) Ft = Sign(sin(eAngle)) * PulseForce * Transmision.Ratio; PulseForceTimer = PulseForceTimer + dt; if (PulseForceTimer > CtrlDelay) @@ -4612,7 +4562,7 @@ double TMoverParameters::TractionForce( double dt ) { break; } // WheelsDriven - case ElectricSeriesMotor: + case TEngineType::ElectricSeriesMotor: { // enrot:=Transmision.Ratio*nrot; // yB: szereg dwoch sekcji w ET42 @@ -4660,7 +4610,7 @@ double TMoverParameters::TractionForce( double dt ) { if ( (std::max(GetTrainsetVoltage(), std::abs(Voltage)) < EnginePowerSource.CollectorParameters.MinV) || (std::max(GetTrainsetVoltage(), std::abs(Voltage)) * EnginePowerSource.CollectorParameters.OVP > EnginePowerSource.CollectorParameters.MaxV)) - if( MainSwitch( false, ( TrainType == dt_EZT ? range::unit : range::local ) ) ) // TODO: check whether we need to send this EMU-wide + if( MainSwitch( false, ( TrainType == dt_EZT ? range_t::unit : range_t::local ) ) ) // TODO: check whether we need to send this EMU-wide EventFlag = true; // wywalanie szybkiego z powodu niewłaściwego napięcia if (((DynamicBrakeType == dbrake_automatic) || (DynamicBrakeType == dbrake_switch)) && (DynamicBrakeFlag)) @@ -4675,7 +4625,7 @@ double TMoverParameters::TractionForce( double dt ) { break; } - case DieselEngine: + case TEngineType::DieselEngine: { Mm = dmoment; //bylo * dizel_engage Mw = Mm * dtrans; // dmoment i dtrans policzone przy okazji enginerotation @@ -4685,7 +4635,7 @@ double TMoverParameters::TractionForce( double dt ) { break; } - case DieselElectric: // youBy + case TEngineType::DieselElectric: // youBy { // tmpV:=V*CabNo*ActiveDir; auto const tmpV { nrot * Pirazy2 * 0.5 * WheelDiameter * DirAbsolute }; //*CabNo*ActiveDir; @@ -4760,16 +4710,15 @@ double TMoverParameters::TractionForce( double dt ) { else Im = NPoweredAxles * sqrt(abs(Mm * MotorParam[ScndCtrlPos].Isat)); - if (ShuntMode) - { + if( ShuntMode ) { EnginePower = Voltage * Im / 1000.0; - if (EnginePower > tmp) - { - EnginePower = tmp * 1000.0; - Voltage = EnginePower / Im; + if( EnginePower > tmp ) { + EnginePower = tmp; + Voltage = EnginePower * 1000.0 / Im; + } + if( EnginePower < tmp ) { + Ft *= EnginePower / tmp; } - if (EnginePower < tmp) - Ft = Ft * EnginePower / tmp; } else { @@ -4983,13 +4932,13 @@ double TMoverParameters::TractionForce( double dt ) { break; } // DieselElectric - case ElectricInductionMotor: + case TEngineType::ElectricInductionMotor: { if( ( Mains ) ) { // nie wchodzić w funkcję bez potrzeby if( ( std::max( std::abs( Voltage ), GetTrainsetVoltage() ) < EnginePowerSource.CollectorParameters.MinV ) || ( std::max( std::abs( Voltage ), GetTrainsetVoltage() ) > EnginePowerSource.CollectorParameters.MaxV + 200 ) ) { - MainSwitch( false, ( TrainType == dt_EZT ? range::unit : range::local ) ); // TODO: check whether we need to send this EMU-wide + MainSwitch( false, ( TrainType == dt_EZT ? range_t::unit : range_t::local ) ); // TODO: check whether we need to send this EMU-wide } } if( true == Mains ) { @@ -5021,7 +4970,7 @@ double TMoverParameters::TractionForce( double dt ) { if (((DoorLeftOpened) || (DoorRightOpened))) DynamicBrakeFlag = true; else if (((dtrans < 0.25) && (LocHandle->GetCP() < 0.25) && (AnPos < 0.01)) || - ((dtrans < 0.25) && (ShuntModeAllow) && (LocalBrakePos == 0))) + ((dtrans < 0.25) && (ShuntModeAllow) && (LocalBrakePosA < 0.01))) DynamicBrakeFlag = false; else if ((((BrakePress > 0.25) && (dtrans > 0.25) || (LocHandle->GetCP() > 0.25))) || (AnPos > 0.02)) @@ -5086,11 +5035,11 @@ double TMoverParameters::TractionForce( double dt ) { if( ( SlippingWheels ) ) { PosRatio = 0; tmp = 10; - Sandbox( true, range::unit ); + Sandbox( true, range_t::unit ); } // przeciwposlizg else { // switch sandbox off - Sandbox( false, range::unit ); + Sandbox( false, range_t::unit ); } dizel_fill += Max0R(Min0R(PosRatio - dizel_fill, 0.02), -0.02) * 12 * @@ -5241,17 +5190,17 @@ double TMoverParameters::TractionForce( double dt ) { break; } // ElectricInductionMotor - case None: + case TEngineType::None: default: { break; } } // case EngineType switch( EngineType ) { - case DieselElectric: { + case TEngineType::DieselElectric: { // rough approximation of extra effort to overcome friction etc auto const rpmratio{ 60.0 * enrot / DElist[ MainCtrlPosNo ].RPM }; - EnginePower += rpmratio * 0.2 * DElist[ MainCtrlPosNo ].GenPower; + EnginePower += rpmratio * 0.15 * DElist[ MainCtrlPosNo ].GenPower; break; } default: { @@ -5313,7 +5262,7 @@ bool TMoverParameters::FuseOn(void) ((Mains) || (TrainType != dt_EZT)) && (!TestFlag(EngDmgFlag, 1))) { // w ET40 jest blokada nastawnika, ale czy działa dobrze? SendCtrlToNext("FuseSwitch", 1, CabNo); - if (((EngineType == ElectricSeriesMotor) || ((EngineType == DieselElectric))) && FuseFlag) + if (((EngineType == TEngineType::ElectricSeriesMotor) || ((EngineType == TEngineType::DieselElectric))) && FuseFlag) { FuseFlag = false; // wlaczenie ponowne obwodu FO = true; @@ -5405,7 +5354,7 @@ double TMoverParameters::MomentumF(double I, double Iw, int SCP) bool TMoverParameters::CutOffEngine(void) { bool COE = false; // Ra: wartość domyślna, sprawdzić to trzeba - if ((NPoweredAxles > 0) && (CabNo == 0) && (EngineType == ElectricSeriesMotor)) + if ((NPoweredAxles > 0) && (CabNo == 0) && (EngineType == TEngineType::ElectricSeriesMotor)) { if (SetFlag(DamageFlag, -dtrain_engine)) { @@ -5423,7 +5372,7 @@ bool TMoverParameters::CutOffEngine(void) bool TMoverParameters::MaxCurrentSwitch(bool State) { bool MCS = false; - if (EngineType == ElectricSeriesMotor) + if (EngineType == TEngineType::ElectricSeriesMotor) if (ImaxHi > ImaxLo) { if (State && (Imax == ImaxLo) && (RList[MainCtrlPos].Bn < 2) && @@ -5454,7 +5403,7 @@ bool TMoverParameters::MaxCurrentSwitch(bool State) bool TMoverParameters::MinCurrentSwitch(bool State) { bool MCS = false; - if (((EngineType == ElectricSeriesMotor) && (IminHi > IminLo)) || (TrainType == dt_EZT)) + if (((EngineType == TEngineType::ElectricSeriesMotor) && (IminHi > IminLo)) || (TrainType == dt_EZT)) { if (State && (Imin == IminLo)) { @@ -5796,7 +5745,7 @@ bool TMoverParameters::AutoRelayCheck(void) // Q: 20160713 // Podnosi / opuszcza przedni pantograf. Returns: state of the pantograph after the operation // ************************************************************************************************* -bool TMoverParameters::PantFront( bool const State, int const Notify ) +bool TMoverParameters::PantFront( bool const State, range_t const Notify ) { /* if( ( true == Battery ) @@ -5806,22 +5755,22 @@ bool TMoverParameters::PantFront( bool const State, int const Notify ) PantFrontUp = State; if( State == true ) { PantFrontStart = 0; - if( Notify != range::local ) { + if( Notify != range_t::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "PantFront", 1, CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } } else { PantFrontStart = 1; - if( Notify != range::local ) { + if( Notify != range_t::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "PantFront", 0, CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -5849,7 +5798,7 @@ bool TMoverParameters::PantFront( bool const State, int const Notify ) // Q: 20160713 // Podnoszenie / opuszczanie pantografu tylnego // ************************************************************************************************* -bool TMoverParameters::PantRear( bool const State, int const Notify ) +bool TMoverParameters::PantRear( bool const State, range_t const Notify ) { /* if( ( true == Battery ) @@ -5859,22 +5808,22 @@ bool TMoverParameters::PantRear( bool const State, int const Notify ) PantRearUp = State; if( State == true ) { PantRearStart = 0; - if( Notify != range::local ) { + if( Notify != range_t::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "PantRear", 1, CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } } else { PantRearStart = 1; - if( Notify != range::local ) { + if( Notify != range_t::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "PantRear", 0, CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? ctrain_controll | ctrain_depot : ctrain_controll ) ); } @@ -5904,7 +5853,7 @@ bool TMoverParameters::PantRear( bool const State, int const Notify ) // ************************************************************************************************* bool TMoverParameters::dizel_EngageSwitch(double state) { - if ((EngineType == DieselEngine) && (state <= 1) && (state >= 0) && + if ((EngineType == TEngineType::DieselEngine) && (state <= 1) && (state >= 0) && (state != dizel_engagestate)) { dizel_engagestate = state; @@ -6050,9 +5999,10 @@ bool TMoverParameters::dizel_StartupCheck() { auto engineisready { true }; // make inital optimistic presumption, then watch the reality crush it // test the fuel pump + // TODO: add fuel pressure check if( false == FuelPump.is_active ) { engineisready = false; - if( FuelPump.start_type == start::manual ) { + if( FuelPump.start_type == start_t::manual ) { // with manual pump control startup procedure is done only once per starter switch press dizel_startup = false; } @@ -6061,7 +6011,7 @@ bool TMoverParameters::dizel_StartupCheck() { if( ( false == OilPump.is_active ) || ( OilPump.pressure_present < OilPump.pressure_minimum ) ) { engineisready = false; - if( OilPump.start_type == start::manual ) { + if( OilPump.start_type == start_t::manual ) { // with manual pump control startup procedure is done only once per starter switch press dizel_startup = false; } @@ -6102,7 +6052,7 @@ bool TMoverParameters::dizel_Update(double dt) { enrot = std::max( enrot, 0.35 * ( // TODO: dac zaleznie od temperatury i baterii - EngineType == DieselEngine ? + EngineType == TEngineType::DieselEngine ? dizel_nmin : DElist[ 0 ].RPM / 60.0 ) ); @@ -6117,7 +6067,7 @@ bool TMoverParameters::dizel_Update(double dt) { bool DU { false }; - if( EngineType == DieselEngine ) { + if( EngineType == TEngineType::DieselEngine ) { dizel_EngageChange( dt ); DU = dizel_AutoGearCheck(); double const fillspeed { 2 }; @@ -6385,8 +6335,8 @@ void TMoverParameters::dizel_Heat( double const dt ) { auto const rpm { enrot * 60 }; // TODO: calculate this once and cache for further use, instead of doing it repeatedly all over the place auto const maxrevolutions { ( - EngineType == DieselEngine ? dizel_nmax * 60 : - EngineType == DieselElectric ? DElist[ MainCtrlPosNo ].RPM : + EngineType == TEngineType::DieselEngine ? dizel_nmax * 60 : + EngineType == TEngineType::DieselElectric ? DElist[ MainCtrlPosNo ].RPM : std::numeric_limits::max() ) }; // shouldn't ever get here but, eh auto const revolutionsfactor { clamp( rpm / maxrevolutions, 0.0, 1.0 ) }; auto const waterpump { WaterPump.is_active ? 1 : 0 }; @@ -6625,7 +6575,7 @@ bool TMoverParameters::DoorBlockedFlag(void) // ************************************************************************************************* // NOTE: door methods work regardless of vehicle door control type, // but commands issued through the command system work only for vehicles which accept remote door control -bool TMoverParameters::DoorLeft(bool State, int const Notify ) { +bool TMoverParameters::DoorLeft(bool State, range_t const Notify ) { if( DoorLeftOpened == State ) { // TBD: should the command be passed to other vehicles regardless of whether it affected the primary target? @@ -6642,7 +6592,7 @@ bool TMoverParameters::DoorLeft(bool State, int const Notify ) { DoorLeftOpened = State; result = true; - if( DoorCloseCtrl == control::autonomous ) { + if( DoorCloseCtrl == control_t::autonomous ) { // activate or disable the door timer depending on whether door were open or closed // NOTE: this it a local-only operation but shouldn't be an issue as automatic door are operated locally anyway DoorLeftOpenTimer = ( @@ -6651,7 +6601,7 @@ bool TMoverParameters::DoorLeft(bool State, int const Notify ) { -1.0 ); } } - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( ( State == true ? @@ -6661,7 +6611,7 @@ bool TMoverParameters::DoorLeft(bool State, int const Notify ) { 1 : 2 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -6675,7 +6625,7 @@ bool TMoverParameters::DoorLeft(bool State, int const Notify ) { // ************************************************************************************************* // NOTE: door methods work regardless of vehicle door control type, // but commands issued through the command system work only for vehicles which accept remote door control -bool TMoverParameters::DoorRight(bool State, int const Notify ) { +bool TMoverParameters::DoorRight(bool State, range_t const Notify ) { if( DoorRightOpened == State ) { // TBD: should the command be passed to other vehicles regardless of whether it affected the primary target? @@ -6692,7 +6642,7 @@ bool TMoverParameters::DoorRight(bool State, int const Notify ) { DoorRightOpened = State; result = true; - if( DoorCloseCtrl == control::autonomous ) { + if( DoorCloseCtrl == control_t::autonomous ) { // activate or disable the door timer depending on whether door were open or closed // NOTE: this it a local-only operation but shouldn't be an issue as automatic door are operated locally anyway DoorRightOpenTimer = ( @@ -6701,7 +6651,7 @@ bool TMoverParameters::DoorRight(bool State, int const Notify ) { -1.0 ); } } - if( Notify != range::local ) { + if( Notify != range_t::local ) { SendCtrlToNext( ( State == true ? @@ -6711,7 +6661,7 @@ bool TMoverParameters::DoorRight(bool State, int const Notify ) { 2 : 1 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -6721,7 +6671,7 @@ bool TMoverParameters::DoorRight(bool State, int const Notify ) { // toggles departure warning bool -TMoverParameters::signal_departure( bool const State, int const Notify ) { +TMoverParameters::signal_departure( bool const State, range_t const Notify ) { if( DepartureSignal == State ) { // TBD: should the command be passed to other vehicles regardless of whether it affected the primary target? @@ -6729,7 +6679,7 @@ TMoverParameters::signal_departure( bool const State, int const Notify ) { } DepartureSignal = State; - if( Notify != range::local ) { + if( Notify != range_t::local ) { // wysłanie wyłączenia do pozostałych? SendCtrlToNext( "DepartureSignal", @@ -6737,7 +6687,7 @@ TMoverParameters::signal_departure( bool const State, int const Notify ) { 1 : 0 ), CabNo, - ( Notify == range::unit ? + ( Notify == range_t::unit ? coupling::control | coupling::permanent : coupling::control ) ); } @@ -6749,7 +6699,7 @@ TMoverParameters::signal_departure( bool const State, int const Notify ) { void TMoverParameters::update_autonomous_doors( double const Deltatime ) { - if( ( DoorCloseCtrl != control::autonomous ) + if( ( DoorCloseCtrl != control_t::autonomous ) || ( ( false == DoorLeftOpened ) && ( false == DoorRightOpened ) ) ) { // nothing to do @@ -6772,14 +6722,14 @@ TMoverParameters::update_autonomous_doors( double const Deltatime ) { if( ( ( DoorStayOpen > 0.0 ) && ( DoorLeftOpenTimer < 0.0 ) ) || ( Vel > 5.0 ) ) { // close the door and set the timer to expired state (closing may happen sooner if vehicle starts moving) - DoorLeft( false, range::local ); + DoorLeft( false, range_t::local ); } } if( true == DoorRightOpened ) { if( ( ( DoorStayOpen > 0.0 ) && ( DoorRightOpenTimer < 0.0 ) ) || ( Vel > 5.0 ) ) { // close the door and set the timer to expired state (closing may happen sooner if vehicle starts moving) - DoorRight( false, range::local ); + DoorRight( false, range_t::local ); } } } @@ -6989,10 +6939,10 @@ bool TMoverParameters::readMPT( std::string const &line ) { switch( EngineType ) { - case ElectricSeriesMotor: { return readMPTElectricSeries( line ); } - case DieselElectric: { return readMPTDieselElectric( line ); } - case DieselEngine: { return readMPTDieselEngine( line ); } - default: { return false; } + case TEngineType::ElectricSeriesMotor: { return readMPTElectricSeries( line ); } + case TEngineType::DieselElectric: { return readMPTDieselElectric( line ); } + case TEngineType::DieselEngine: { return readMPTDieselEngine( line ); } + default: { return false; } } } @@ -7080,9 +7030,9 @@ bool TMoverParameters::readBPT( std::string const &line ) { >> BrakePressureTable[ idx ].BrakePressureVal >> BrakePressureTable[ idx ].FlowSpeedVal >> braketype; - if( braketype == "Pneumatic" ) { BrakePressureTable[ idx ].BrakeType = Pneumatic; } - else if( braketype == "ElectroPneumatic" ) { BrakePressureTable[ idx ].BrakeType = ElectroPneumatic; } - else { BrakePressureTable[ idx ].BrakeType = Individual; } + if( braketype == "Pneumatic" ) { BrakePressureTable[ idx ].BrakeType = TBrakeSystem::Pneumatic; } + else if( braketype == "ElectroPneumatic" ) { BrakePressureTable[ idx ].BrakeType = TBrakeSystem::ElectroPneumatic; } + else { BrakePressureTable[ idx ].BrakeType = TBrakeSystem::Individual; } return true; } @@ -7206,46 +7156,46 @@ bool TMoverParameters::readLightsList( std::string const &Input ) { // ************************************************************************************************* void TMoverParameters::BrakeValveDecode( std::string const &Valve ) { - std::map valvetypes{ - { "W", W }, - { "W_Lu_L", W_Lu_L }, - { "W_Lu_XR", W_Lu_XR }, - { "W_Lu_VI", W_Lu_VI }, - { "K", K }, - { "Kg", Kg }, - { "Kp", Kp }, - { "Kss", Kss }, - { "Kkg", Kkg }, - { "Kkp", Kkp }, - { "Kks", Kks }, - { "Hikp1", Hikp1 }, - { "Hikss", Hikss }, - { "Hikg1", Hikg1 }, - { "KE", KE }, - { "SW", SW }, - { "EStED", EStED }, - { "NESt3", NESt3 }, - { "ESt3", ESt3 }, - { "LSt", LSt }, - { "ESt4", ESt4 }, - { "ESt3AL2", ESt3AL2 }, - { "EP1", EP1 }, - { "EP2", EP2 }, - { "M483", M483 }, - { "CV1_L_TR", CV1_L_TR }, - { "CV1", CV1 }, - { "CV1_R", CV1_R } + std::map valvetypes { + { "W", TBrakeValve::W }, + { "W_Lu_L", TBrakeValve::W_Lu_L }, + { "W_Lu_XR", TBrakeValve::W_Lu_XR }, + { "W_Lu_VI", TBrakeValve::W_Lu_VI }, + { "K", TBrakeValve::K }, + { "Kg", TBrakeValve::Kg }, + { "Kp", TBrakeValve::Kp }, + { "Kss", TBrakeValve::Kss }, + { "Kkg", TBrakeValve::Kkg }, + { "Kkp", TBrakeValve::Kkp }, + { "Kks", TBrakeValve::Kks }, + { "Hikp1", TBrakeValve::Hikp1 }, + { "Hikss", TBrakeValve::Hikss }, + { "Hikg1", TBrakeValve::Hikg1 }, + { "KE", TBrakeValve::KE }, + { "SW", TBrakeValve::SW }, + { "EStED", TBrakeValve::EStED }, + { "NESt3", TBrakeValve::NESt3 }, + { "ESt3", TBrakeValve::ESt3 }, + { "LSt", TBrakeValve::LSt }, + { "ESt4", TBrakeValve::ESt4 }, + { "ESt3AL2", TBrakeValve::ESt3AL2 }, + { "EP1", TBrakeValve::EP1 }, + { "EP2", TBrakeValve::EP2 }, + { "M483", TBrakeValve::M483 }, + { "CV1_L_TR", TBrakeValve::CV1_L_TR }, + { "CV1", TBrakeValve::CV1 }, + { "CV1_R", TBrakeValve::CV1_R } }; auto lookup = valvetypes.find( Valve ); BrakeValve = lookup != valvetypes.end() ? lookup->second : - Other; + TBrakeValve::Other; - if( ( BrakeValve == Other ) + if( ( BrakeValve == TBrakeValve::Other ) && ( Valve.find( "ESt" ) != std::string::npos ) ) { - BrakeValve = ESt3; + BrakeValve = TBrakeValve::ESt3; } } @@ -7254,32 +7204,32 @@ void TMoverParameters::BrakeValveDecode( std::string const &Valve ) { // ************************************************************************************************* void TMoverParameters::BrakeSubsystemDecode() { - BrakeSubsystem = ss_None; + BrakeSubsystem = TBrakeSubSystem::ss_None; switch (BrakeValve) { - case W: - case W_Lu_L: - case W_Lu_VI: - case W_Lu_XR: - BrakeSubsystem = ss_W; + case TBrakeValve::W: + case TBrakeValve::W_Lu_L: + case TBrakeValve::W_Lu_VI: + case TBrakeValve::W_Lu_XR: + BrakeSubsystem = TBrakeSubSystem::ss_W; break; - case ESt3: - case ESt3AL2: - case ESt4: - case EP2: - case EP1: - BrakeSubsystem = ss_ESt; + case TBrakeValve::ESt3: + case TBrakeValve::ESt3AL2: + case TBrakeValve::ESt4: + case TBrakeValve::EP2: + case TBrakeValve::EP1: + BrakeSubsystem = TBrakeSubSystem::ss_ESt; break; - case KE: - BrakeSubsystem = ss_KE; + case TBrakeValve::KE: + BrakeSubsystem = TBrakeSubSystem::ss_KE; break; - case CV1: - case CV1_L_TR: - BrakeSubsystem = ss_Dako; + case TBrakeValve::CV1: + case TBrakeValve::CV1_L_TR: + BrakeSubsystem = TBrakeSubSystem::ss_Dako; break; - case LSt: - case EStED: - BrakeSubsystem = ss_LSt; + case TBrakeValve::LSt: + case TBrakeValve::EStED: + BrakeSubsystem = TBrakeSubSystem::ss_LSt; break; } } @@ -7865,11 +7815,11 @@ void TMoverParameters::LoadFIZ_Brake( std::string const &line ) { void TMoverParameters::LoadFIZ_Doors( std::string const &line ) { std::map doorcontrols { - { "Passenger", control::passenger }, - { "AutomaticCtrl", control::autonomous }, - { "DriverCtrl", control::driver }, - { "Conductor", control::conductor }, - { "Mixed", control::mixed } + { "Passenger", control_t::passenger }, + { "AutomaticCtrl", control_t::autonomous }, + { "DriverCtrl", control_t::driver }, + { "Conductor", control_t::conductor }, + { "Mixed", control_t::mixed } }; // opening method { @@ -7877,7 +7827,7 @@ void TMoverParameters::LoadFIZ_Doors( std::string const &line ) { DoorOpenCtrl = lookup != doorcontrols.end() ? lookup->second : - control::passenger; + control_t::passenger; } // closing method { @@ -7885,10 +7835,10 @@ void TMoverParameters::LoadFIZ_Doors( std::string const &line ) { DoorCloseCtrl = lookup != doorcontrols.end() ? lookup->second : - control::passenger; + control_t::passenger; } // automatic closing timer - if( DoorCloseCtrl == control::autonomous ) { extract_value( DoorStayOpen, "DoorStayOpen", line, "" ); } + if( DoorCloseCtrl == control_t::autonomous ) { extract_value( DoorStayOpen, "DoorStayOpen", line, "" ); } extract_value( DoorOpenSpeed, "OpenSpeed", line, "" ); extract_value( DoorCloseSpeed, "CloseSpeed", line, "" ); @@ -7924,17 +7874,17 @@ void TMoverParameters::LoadFIZ_BuffCoupl( std::string const &line, int const Ind else { coupler = &Couplers[ 0 ]; } std::map couplertypes { - { "Automatic", Automatic }, - { "Screw", Screw }, - { "Chain", Chain }, - { "Bare", Bare }, - { "Articulated", Articulated }, + { "Automatic", TCouplerType::Automatic }, + { "Screw", TCouplerType::Screw }, + { "Chain", TCouplerType::Chain }, + { "Bare", TCouplerType::Bare }, + { "Articulated", TCouplerType::Articulated }, }; auto lookup = couplertypes.find( extract_value( "CType", line ) ); coupler->CouplerType = ( lookup != couplertypes.end() ? lookup->second : - NoCoupler ); + TCouplerType::NoCoupler ); extract_value( coupler->SpringKC, "kC", line, "" ); extract_value( coupler->DmaxC, "DmaxC", line, "" ); @@ -7950,16 +7900,16 @@ void TMoverParameters::LoadFIZ_BuffCoupl( std::string const &line, int const Ind coupler->AllowedFlag = ( ( -coupler->AllowedFlag ) | ctrain_depot ); } - if( ( coupler->CouplerType != NoCoupler ) - && ( coupler->CouplerType != Bare ) - && ( coupler->CouplerType != Articulated ) ) { + if( ( coupler->CouplerType != TCouplerType::NoCoupler ) + && ( coupler->CouplerType != TCouplerType::Bare ) + && ( coupler->CouplerType != TCouplerType::Articulated ) ) { coupler->SpringKC *= 1000; coupler->FmaxC *= 1000; coupler->SpringKB *= 1000; coupler->FmaxB *= 1000; } - else if( coupler->CouplerType == Bare ) { + else if( coupler->CouplerType == TCouplerType::Bare ) { coupler->SpringKC = 50.0 * Mass + Ftmax / 0.05; coupler->DmaxC = 0.05; @@ -7969,7 +7919,7 @@ void TMoverParameters::LoadFIZ_BuffCoupl( std::string const &line, int const Ind coupler->FmaxB = 50.0 * Mass + 2.0 * Ftmax; coupler->beta = 0.3; } - else if( coupler->CouplerType == Articulated ) { + else if( coupler->CouplerType == TCouplerType::Articulated ) { coupler->SpringKC = 60.0 * Mass + 1000; coupler->DmaxC = 0.05; @@ -7995,16 +7945,16 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { { std::map brakesystems{ - { "Pneumatic", Pneumatic }, - { "ElectroPneumatic", ElectroPneumatic } + { "Pneumatic", TBrakeSystem::Pneumatic }, + { "ElectroPneumatic", TBrakeSystem::ElectroPneumatic } }; auto lookup = brakesystems.find( extract_value( "BrakeSystem", line ) ); BrakeSystem = lookup != brakesystems.end() ? lookup->second : - Individual; + TBrakeSystem::Individual; } - if( BrakeSystem != Individual ) { + if( BrakeSystem != TBrakeSystem::Individual ) { extract_value( BrakeCtrlPosNo, "BCPN", line, "" ); for( int idx = 0; idx < 4; ++idx ) { @@ -8013,7 +7963,7 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { } // brakedelays, brakedelayflag { - std::map brakedelays{ + std::map brakedelays { { "GPR", bdelay_G + bdelay_P + bdelay_R }, { "PR", bdelay_P + bdelay_R }, { "GP", bdelay_G + bdelay_P }, @@ -8023,7 +7973,7 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { { "GPR+Mg", bdelay_G + bdelay_P + bdelay_R + bdelay_M }, { "PR+Mg", bdelay_P + bdelay_R + bdelay_M } }; - std::map brakedelayflags{ + std::map brakedelayflags { { "R", bdelay_R }, { "P", bdelay_P }, { "G", bdelay_G } @@ -8034,7 +7984,7 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { BrakeDelays = lookup != brakedelays.end() ? lookup->second : - Individual; + 0; lookup = brakedelayflags.find( brakedelay ); BrakeDelayFlag = lookup != brakedelayflags.end() ? @@ -8056,35 +8006,35 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { // brakehandle { std::map brakehandles{ - { "FV4a", FV4a }, - { "test", testH }, - { "D2", D2 }, - { "MHZ_EN57", MHZ_EN57 }, - { "MHZ_K5P", MHZ_K5P }, - { "M394", M394 }, - { "Knorr", Knorr }, - { "Westinghouse", West }, - { "FVel6", FVel6 }, - { "St113", St113 } + { "FV4a", TBrakeHandle::FV4a }, + { "test", TBrakeHandle::testH }, + { "D2", TBrakeHandle::D2 }, + { "MHZ_EN57", TBrakeHandle::MHZ_EN57 }, + { "MHZ_K5P", TBrakeHandle::MHZ_K5P }, + { "M394", TBrakeHandle::M394 }, + { "Knorr", TBrakeHandle::Knorr }, + { "Westinghouse", TBrakeHandle::West }, + { "FVel6", TBrakeHandle::FVel6 }, + { "St113", TBrakeHandle::St113 } }; auto lookup = brakehandles.find( extract_value( "BrakeHandle", line ) ); BrakeHandle = lookup != brakehandles.end() ? lookup->second : - NoHandle; + TBrakeHandle::NoHandle; } // brakelochandle { std::map locbrakehandles{ - { "FD1", FD1 }, - { "Knorr", Knorr }, - { "Westinghouse", West } + { "FD1", TBrakeHandle::FD1 }, + { "Knorr", TBrakeHandle::Knorr }, + { "Westinghouse", TBrakeHandle::West } }; auto lookup = locbrakehandles.find( extract_value( "LocBrakeHandle", line ) ); BrakeLocHandle = lookup != locbrakehandles.end() ? lookup->second : - NoHandle; + TBrakeHandle::NoHandle; } // mbpm @@ -8111,15 +8061,15 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { // localbrake { std::map localbrakes{ - { "ManualBrake", ManualBrake }, - { "PneumaticBrake", PneumaticBrake }, - { "HydraulicBrake", HydraulicBrake } + { "ManualBrake", TLocalBrake::ManualBrake }, + { "PneumaticBrake", TLocalBrake::PneumaticBrake }, + { "HydraulicBrake", TLocalBrake::HydraulicBrake } }; auto lookup = localbrakes.find( extract_value( "LocalBrake", line ) ); LocalBrake = lookup != localbrakes.end() ? lookup->second : - NoBrake; + TLocalBrake::NoBrake; } // mbrake MBrake = ( extract_value( "ManualBrake", line ) == "Yes" ); @@ -8170,69 +8120,70 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { // converter { - std::map starts { - { "Manual", start::manual }, - { "Automatic", start::automatic } + std::map starts { + { "Manual", start_t::manual }, + { "Automatic", start_t::automatic } }; auto lookup = starts.find( extract_value( "ConverterStart", line ) ); ConverterStart = lookup != starts.end() ? lookup->second : - start::manual; + start_t::manual; } extract_value( ConverterStartDelay, "ConverterStartDelay", line, "" ); // compressor { - std::map starts { - { "Manual", start::manual }, - { "Automatic", start::automatic } + std::map starts { + { "Manual", start_t::manual }, + { "Automatic", start_t::automatic } }; auto lookup = starts.find( extract_value( "CompressorStart", line ) ); CompressorStart = lookup != starts.end() ? lookup->second : - start::manual; + start_t::manual; } // fuel pump { - std::map starts { - { "Manual", start::manual }, - { "Automatic", start::automatic } + std::map starts { + { "Manual", start_t::manual }, + { "Automatic", start_t::automatic }, + { "Mixed", start_t::manualwithautofallback } }; auto lookup = starts.find( extract_value( "FuelStart", line ) ); FuelPump.start_type = lookup != starts.end() ? lookup->second : - start::manual; + start_t::manual; } // oil pump { - std::map starts { - { "Manual", start::manual }, - { "Automatic", start::automatic }, - { "Mixed", start::manualwithautofallback } + std::map starts { + { "Manual", start_t::manual }, + { "Automatic", start_t::automatic }, + { "Mixed", start_t::manualwithautofallback } }; auto lookup = starts.find( extract_value( "OilStart", line ) ); OilPump.start_type = lookup != starts.end() ? lookup->second : - start::manual; + start_t::manual; } // water pump { - std::map starts { - { "Manual", start::manual }, - { "Battery", start::battery } + std::map starts { + { "Manual", start_t::manual }, + { "Battery", start_t::battery } }; auto lookup = starts.find( extract_value( "WaterStart", line ) ); WaterPump.start_type = lookup != starts.end() ? lookup->second : - start::manual; + start_t::manual; } } @@ -8290,14 +8241,14 @@ void TMoverParameters::LoadFIZ_Power( std::string const &Line ) { EnginePowerSource.SourceType = LoadFIZ_SourceDecode( extract_value( "EnginePower", Line ) ); LoadFIZ_PowerParamsDecode( EnginePowerSource, "", Line ); - if( ( EnginePowerSource.SourceType == Generator ) - && ( EnginePowerSource.GeneratorEngine == WheelsDriven ) ) { + if( ( EnginePowerSource.SourceType == TPowerSource::Generator ) + && ( EnginePowerSource.GeneratorEngine == TEngineType::WheelsDriven ) ) { // perpetuum mobile? ConversionError = 666; } if( Power == 0.0 ) { //jeśli nie ma mocy, np. rozrządcze EZT - EnginePowerSource.SourceType = NotDefined; + EnginePowerSource.SourceType = TPowerSource::NotDefined; } SystemPowerSource.SourceType = LoadFIZ_SourceDecode( extract_value( "SystemPower", Line ) ); @@ -8328,7 +8279,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { switch( EngineType ) { - case ElectricSeriesMotor: { + case TEngineType::ElectricSeriesMotor: { extract_value( NominalVoltage, "Volt", Input, "" ); extract_value( WindingRes, "WindingRes", Input, "" ); @@ -8340,13 +8291,13 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { nmax /= 60.0; break; } - case WheelsDriven: - case Dumb: { + case TEngineType::WheelsDriven: + case TEngineType::Dumb: { extract_value( Ftmax, "Ftmax", Input, "" ); break; } - case DieselEngine: { + case TEngineType::DieselEngine: { extract_value( dizel_nmin, "nmin", Input, "" ); dizel_nmin /= 60.0; @@ -8398,7 +8349,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { } break; } - case DieselElectric: { //youBy + case TEngineType::DieselElectric: { //youBy extract_value( Ftmax, "Ftmax", Input, "" ); Flat = ( extract_value( "Flat", Input ) == "1" ); @@ -8419,7 +8370,7 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value( EngineHeatingRPM, "HeatingRPM", Input, "" ); break; } - case ElectricInductionMotor: { + case TEngineType::ElectricInductionMotor: { RVentnmax = 1.0; extract_value( NominalVoltage, "Volt", Input, "" ); @@ -8456,8 +8407,8 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { } // engine type // NOTE: elements shared by both diesel engine variants; crude but, eh - if( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) { + if( ( EngineType == TEngineType::DieselEngine ) + || ( EngineType == TEngineType::DieselElectric ) ) { // oil pump extract_value( OilPump.pressure_minimum, "OilMinPressure", Input, "" ); extract_value( OilPump.pressure_maximum, "OilMaxPressure", Input, "" ); @@ -8503,7 +8454,7 @@ void TMoverParameters::LoadFIZ_MotorParamTable( std::string const &Input ) { switch( EngineType ) { - case DieselEngine: { + case TEngineType::DieselEngine: { extract_value( dizel_minVelfullengage, "minVelfullengage", Input, "" ); extract_value( dizel_engageDia, "engageDia", Input, "" ); @@ -8586,29 +8537,29 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet switch( Powerparameters.SourceType ) { - case NotDefined: - case InternalSource: { + case TPowerSource::NotDefined: + case TPowerSource::InternalSource: { Powerparameters.PowerType = LoadFIZ_PowerDecode( extract_value( Prefix + "PowerType", Line ) ); break; } - case Transducer: { + case TPowerSource::Transducer: { extract_value( Powerparameters.InputVoltage, Prefix + "TransducerInputV", Line, "" ); break; } - case Generator: { + case TPowerSource::Generator: { Powerparameters.GeneratorEngine = LoadFIZ_EngineDecode( extract_value( Prefix + "GeneratorEngine", Line ) ); break; } - case Accumulator: { + case TPowerSource::Accumulator: { extract_value( Powerparameters.RAccumulator.MaxCapacity, Prefix + "Cap", Line, "" ); Powerparameters.RAccumulator.RechargeSource = LoadFIZ_SourceDecode( extract_value( Prefix + "RS", Line ) ); break; } - case CurrentCollector: { + case TPowerSource::CurrentCollector: { auto &collectorparameters = Powerparameters.CollectorParameters; @@ -8634,16 +8585,16 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet extract_value( collectorparameters.MaxPress, "MaxPress", Line, "" ); break; } - case PowerCable: { + case TPowerSource::PowerCable: { Powerparameters.RPowerCable.PowerTrans = LoadFIZ_PowerDecode( extract_value( Prefix + "PowerTrans", Line ) ); - if( Powerparameters.RPowerCable.PowerTrans == SteamPower ) { + if( Powerparameters.RPowerCable.PowerTrans == TPowerType::SteamPower ) { extract_value( Powerparameters.RPowerCable.SteamPressure, Prefix + "SteamPress", Line, "" ); } break; } - case Heater: { + case TPowerSource::Heater: { //jeszcze nie skonczone! break; } @@ -8651,8 +8602,8 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet ; // nothing here } - if( ( Powerparameters.SourceType != Heater ) - && ( Powerparameters.SourceType != InternalSource ) ) { + if( ( Powerparameters.SourceType != TPowerSource::Heater ) + && ( Powerparameters.SourceType != TPowerSource::InternalSource ) ) { extract_value( Powerparameters.MaxVoltage, Prefix + "MaxVoltage", Line, "" ); @@ -8664,53 +8615,53 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet TPowerType TMoverParameters::LoadFIZ_PowerDecode( std::string const &Power ) { std::map powertypes{ - { "BioPower", BioPower }, - { "MechPower", MechPower }, - { "ElectricPower", ElectricPower }, - { "SteamPower", SteamPower } + { "BioPower", TPowerType::BioPower }, + { "MechPower", TPowerType::MechPower }, + { "ElectricPower", TPowerType::ElectricPower }, + { "SteamPower", TPowerType::SteamPower } }; auto lookup = powertypes.find( Power ); return lookup != powertypes.end() ? lookup->second : - NoPower; + TPowerType::NoPower; } TPowerSource TMoverParameters::LoadFIZ_SourceDecode( std::string const &Source ) { std::map powersources{ - { "Transducer", Transducer }, - { "Generator", Generator }, - { "Accu", Accumulator }, - { "CurrentCollector", CurrentCollector }, - { "PowerCable", PowerCable }, - { "Heater", Heater }, - { "Internal", InternalSource } + { "Transducer", TPowerSource::Transducer }, + { "Generator", TPowerSource::Generator }, + { "Accu", TPowerSource::Accumulator }, + { "CurrentCollector", TPowerSource::CurrentCollector }, + { "PowerCable", TPowerSource::PowerCable }, + { "Heater", TPowerSource::Heater }, + { "Internal", TPowerSource::InternalSource } }; auto lookup = powersources.find( Source ); return lookup != powersources.end() ? lookup->second : - NotDefined; + TPowerSource::NotDefined; } -TEngineTypes TMoverParameters::LoadFIZ_EngineDecode( std::string const &Engine ) { +TEngineType TMoverParameters::LoadFIZ_EngineDecode( std::string const &Engine ) { - std::map enginetypes{ - { "ElectricSeriesMotor", ElectricSeriesMotor }, - { "DieselEngine", DieselEngine }, - { "SteamEngine", SteamEngine }, - { "WheelsDriven", WheelsDriven }, - { "Dumb", Dumb }, - { "DieselElectric", DieselElectric }, - { "DumbDE", DieselElectric }, - { "ElectricInductionMotor", ElectricInductionMotor } + std::map enginetypes { + { "ElectricSeriesMotor", TEngineType::ElectricSeriesMotor }, + { "DieselEngine", TEngineType::DieselEngine }, + { "SteamEngine", TEngineType::SteamEngine }, + { "WheelsDriven", TEngineType::WheelsDriven }, + { "Dumb", TEngineType::Dumb }, + { "DieselElectric", TEngineType::DieselElectric }, + { "DumbDE", TEngineType::DieselElectric }, + { "ElectricInductionMotor", TEngineType::ElectricInductionMotor } }; auto lookup = enginetypes.find( Engine ); return lookup != enginetypes.end() ? lookup->second : - None; + TEngineType::None; } // ************************************************************************************************* @@ -8729,14 +8680,14 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) // NOTE: for diesel-powered vehicles we automatically convert legacy "main" power source to more accurate "engine" if( ( CompressorPower == 0 ) - && ( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) ) { + && ( ( EngineType == TEngineType::DieselEngine ) + || ( EngineType == TEngineType::DieselElectric ) ) ) { CompressorPower = 3; } // WriteLog("aa = " + AxleArangement + " " + std::string( Pos("o", AxleArangement)) ); - if( ( AxleArangement.find( "o" ) != std::string::npos ) && ( EngineType == ElectricSeriesMotor ) ) { + if( ( AxleArangement.find( "o" ) != std::string::npos ) && ( EngineType == TEngineType::ElectricSeriesMotor ) ) { // test poprawnosci ilosci osi indywidualnie napedzanych OK = ( ( RList[ 1 ].Bn * RList[ 1 ].Mn ) == NPoweredAxles ); // WriteLogSS("aa ok", BoolToYN(OK)); @@ -8747,11 +8698,11 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) Load = 0.0; } - if (BrakeSystem == Individual) - if (BrakeSubsystem != ss_None) + if (BrakeSystem == TBrakeSystem::Individual) + if (BrakeSubsystem != TBrakeSubSystem::ss_None) OK = false; //! - if( ( BrakeVVolume == 0 ) && ( MaxBrakePress[ 3 ] > 0 ) && ( BrakeSystem != Individual ) ) { + if( ( BrakeVVolume == 0 ) && ( MaxBrakePress[ 3 ] > 0 ) && ( BrakeSystem != TBrakeSystem::Individual ) ) { BrakeVVolume = MaxBrakePress[ 3 ] / ( 5.0 - MaxBrakePress[ 3 ] ) * ( BrakeCylRadius * BrakeCylRadius * BrakeCylDist * BrakeCylNo * M_PI ) * 1000; @@ -8763,8 +8714,8 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) switch( BrakeValve ) { - case W: - case K: + case TBrakeValve::W: + case TBrakeValve::K: { WriteLog( "XBT W, K" ); Hamulec = std::make_shared( MaxBrakePress[ 3 ], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA ); @@ -8774,7 +8725,7 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) Hamulec->SetLP( Mass, MBPM, MaxBrakePress[ 1 ] ); break; } - case KE: + case TBrakeValve::KE: { WriteLog( "XBT WKE" ); Hamulec = std::make_shared( MaxBrakePress[ 3 ], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA ); @@ -8785,10 +8736,10 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) Hamulec->SetLP( Mass, MBPM, MaxBrakePress[ 1 ] ); break; } - case NESt3: - case ESt3: - case ESt3AL2: - case ESt4: + case TBrakeValve::NESt3: + case TBrakeValve::ESt3: + case TBrakeValve::ESt3AL2: + case TBrakeValve::ESt4: { WriteLog( "XBT NESt3, ESt3, ESt3AL2, ESt4" ); Hamulec = std::make_shared( MaxBrakePress[ 3 ], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA ); @@ -8799,14 +8750,14 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) Hamulec->SetLP( Mass, MBPM, MaxBrakePress[ 1 ] ); break; } - case LSt: + case TBrakeValve::LSt: { WriteLog( "XBT LSt" ); Hamulec = std::make_shared( MaxBrakePress[ 3 ], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA ); Hamulec->SetRM( RapidMult ); break; } - case EStED: + case TBrakeValve::EStED: { WriteLog( "XBT EStED" ); Hamulec = std::make_shared( MaxBrakePress[ 3 ], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA ); @@ -8821,20 +8772,20 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) } break; } - case EP2: + case TBrakeValve::EP2: { WriteLog( "XBT EP2" ); Hamulec = std::make_shared( MaxBrakePress[ 3 ], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA ); Hamulec->SetLP( Mass, MBPM, MaxBrakePress[ 1 ] ); break; } - case CV1: + case TBrakeValve::CV1: { WriteLog( "XBT CV1" ); Hamulec = std::make_shared( MaxBrakePress[ 3 ], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA ); break; } - case CV1_L_TR: + case TBrakeValve::CV1_L_TR: { WriteLog( "XBT CV1_L_T" ); Hamulec = std::make_shared( MaxBrakePress[ 3 ], BrakeCylRadius, BrakeCylDist, BrakeVVolume, BrakeCylNo, BrakeDelays, BrakeMethod, NAxles, NBpA ); @@ -8847,28 +8798,28 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) Hamulec->SetASBP( MaxBrakePress[ 4 ] ); switch( BrakeHandle ) { - case FV4a: + case TBrakeHandle::FV4a: Handle = std::make_shared(); break; - case MHZ_EN57: + case TBrakeHandle::MHZ_EN57: Handle = std::make_shared(); break; - case FVel6: + case TBrakeHandle::FVel6: Handle = std::make_shared(); break; - case testH: + case TBrakeHandle::testH: Handle = std::make_shared(); break; - case M394: + case TBrakeHandle::M394: Handle = std::make_shared(); break; - case Knorr: + case TBrakeHandle::Knorr: Handle = std::make_shared(); break; - case St113: + case TBrakeHandle::St113: Handle = std::make_shared(); break; - case MHZ_K5P: + case TBrakeHandle::MHZ_K5P: Handle = std::make_shared(); break; default: @@ -8876,7 +8827,7 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) } switch( BrakeLocHandle ) { - case FD1: + case TBrakeHandle::FD1: { LocHandle = std::make_shared(); LocHandle->Init( MaxBrakePress[ 0 ] ); @@ -8886,7 +8837,7 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) } break; } - case Knorr: + case TBrakeHandle::Knorr: { LocHandle = std::make_shared(); LocHandle->Init( MaxBrakePress[ 0 ] ); @@ -8925,7 +8876,7 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) 0.0 ); PipePress = CntrlPipePress; BrakePress = 0.0; - LocalBrakePos = 0; + LocalBrakePosA = 0.0; if( CabNo == 0 ) BrakeCtrlPos = static_cast( Handle->GetPos( bh_NP ) ); else @@ -8956,7 +8907,7 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) PipePress = LowPipePress; PipeBrakePress = MaxBrakePress[ 3 ] * 0.5; BrakePress = MaxBrakePress[ 3 ] * 0.5; - LocalBrakePos = 0; + LocalBrakePosA = 0.0; BrakeCtrlPos = static_cast( Handle->GetPos( bh_NP ) ); LimPipePress = LowPipePress; } @@ -8964,8 +8915,8 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) ActFlowSpeed = 0.0; BrakeCtrlPosR = BrakeCtrlPos; - if( BrakeLocHandle == Knorr ) - LocalBrakePos = 5; + if( BrakeLocHandle == TBrakeHandle::Knorr ) + LocalBrakePosA = 0.5; Pipe->CreatePress( PipePress ); Pipe2->CreatePress( ScndPipePress ); @@ -9192,7 +9143,7 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if( Command == "WaterPumpSwitch" ) { - if( WaterPump.start_type != start::battery ) { + if( WaterPump.start_type != start_t::battery ) { // automatic fuel pump ignores 'manual' state commands WaterPump.is_enabled = ( CValue1 == 1 ); } @@ -9228,14 +9179,14 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "FuelPumpSwitch") { - if( FuelPump.start_type != start::automatic ) { + if( FuelPump.start_type != start_t::automatic ) { // automatic fuel pump ignores 'manual' state commands FuelPump.is_enabled = ( CValue1 == 1 ); } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "OilPumpSwitch") { - if( OilPump.start_type != start::automatic ) { + if( OilPump.start_type != start_t::automatic ) { // automatic pump ignores 'manual' state commands OilPump.is_enabled = ( CValue1 == 1 ); } @@ -9245,8 +9196,8 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C { if (CValue1 == 1) { - if( ( EngineType == DieselEngine ) - || ( EngineType == DieselElectric ) ) { + if( ( EngineType == TEngineType::DieselEngine ) + || ( EngineType == TEngineType::DieselElectric ) ) { dizel_startup = true; } else { @@ -9295,7 +9246,7 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "FuseSwitch") { - if (((EngineType == ElectricSeriesMotor) || (EngineType == DieselElectric)) && FuseFlag && + if (((EngineType == TEngineType::ElectricSeriesMotor) || (EngineType == TEngineType::DieselElectric)) && FuseFlag && (CValue1 == 1) && (MainCtrlActualPos == 0) && (ScndCtrlActualPos == 0) && Mains) /* if (EngineType=ElectricSeriesMotor) and (CValue1=1) and (MainCtrlActualPos=0) and (ScndCtrlActualPos=0) and Mains then*/ @@ -9333,16 +9284,16 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C // end else if (Command == "CompressorSwitch") /*NBMX*/ { - if( CompressorStart == start::manual ) { + if( CompressorStart == start_t::manual ) { CompressorAllow = ( CValue1 == 1 ); } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } else if (Command == "DoorOpen") /*NBMX*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów - if( ( DoorOpenCtrl == control::conductor ) - || ( DoorOpenCtrl == control::driver ) - || ( DoorOpenCtrl == control::mixed ) ) { + if( ( DoorOpenCtrl == control_t::conductor ) + || ( DoorOpenCtrl == control_t::driver ) + || ( DoorOpenCtrl == control_t::mixed ) ) { // ignore remote command if the door is only operated locally if( CValue2 > 0 ) { // normalne ustawienie pojazdu @@ -9379,9 +9330,9 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "DoorClose") /*NBMX*/ { // Ra: uwzględnić trzeba jeszcze zgodność sprzęgów - if( ( DoorCloseCtrl == control::conductor ) - || ( DoorCloseCtrl == control::driver ) - || ( DoorCloseCtrl == control::mixed ) ) { + if( ( DoorCloseCtrl == control_t::conductor ) + || ( DoorCloseCtrl == control_t::driver ) + || ( DoorCloseCtrl == control_t::mixed ) ) { // ignore remote command if the door is only operated locally if( CValue2 > 0 ) { // normalne ustawienie pojazdu @@ -9552,7 +9503,7 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "Sandbox") { - OK = Sandbox( CValue1 == 1, range::local ); + OK = Sandbox( CValue1 == 1, range_t::local ); } else if (Command == "CabSignal") /*SHP,Indusi*/ { // Ra: to powinno działać tylko w członie obsadzonym @@ -9605,7 +9556,7 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else if (Command == "SpeedCntrl") { - if ((EngineType == ElectricInductionMotor)) + if ((EngineType == TEngineType::ElectricInductionMotor)) ScndCtrlActualPos = static_cast(round(CValue1)); OK = SendCtrlToNext(Command, CValue1, CValue2, Couplertype); } diff --git a/MemCell.cpp b/MemCell.cpp index 12128e24..0fab54cc 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -51,37 +51,37 @@ TCommandType TMemCell::CommandCheck() { // rozpoznanie komendy if( szText == "SetVelocity" ) // najpopularniejsze { - eCommand = cm_SetVelocity; + eCommand = TCommandType::cm_SetVelocity; bCommand = false; // ta komenda nie jest wysyłana } else if( szText == "ShuntVelocity" ) // w tarczach manewrowych { - eCommand = cm_ShuntVelocity; + eCommand = TCommandType::cm_ShuntVelocity; bCommand = false; // ta komenda nie jest wysyłana } else if( szText == "Change_direction" ) // zdarza się { - eCommand = cm_ChangeDirection; + eCommand = TCommandType::cm_ChangeDirection; bCommand = true; // do wysłania } else if( szText == "OutsideStation" ) // zdarza się { - eCommand = cm_OutsideStation; + eCommand = TCommandType::cm_OutsideStation; bCommand = false; // tego nie powinno być w komórce } else if( szText.compare( 0, 19, "PassengerStopPoint:" ) == 0 ) // porównanie początków { - eCommand = cm_PassengerStopPoint; + eCommand = TCommandType::cm_PassengerStopPoint; bCommand = false; // tego nie powinno być w komórce } else if( szText == "SetProximityVelocity" ) // nie powinno tego być { - eCommand = cm_SetProximityVelocity; + eCommand = TCommandType::cm_SetProximityVelocity; bCommand = false; // ta komenda nie jest wysyłana } else { - eCommand = cm_Unknown; // ciąg nierozpoznany (nie jest komendą) + eCommand = TCommandType::cm_Unknown; // ciąg nierozpoznany (nie jest komendą) bCommand = true; // do wysłania } return eCommand; @@ -141,11 +141,11 @@ bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, bool TMemCell::IsVelocity() const { // sprawdzenie, czy event odczytu tej komórki ma być do skanowania, czy do kolejkowania - if (eCommand == cm_SetVelocity) + if (eCommand == TCommandType::cm_SetVelocity) return true; - if (eCommand == cm_ShuntVelocity) + if (eCommand == TCommandType::cm_ShuntVelocity) return true; - return (eCommand == cm_SetProximityVelocity); + return (eCommand == TCommandType::cm_SetProximityVelocity); }; void TMemCell::StopCommandSent() diff --git a/MemCell.h b/MemCell.h index de54860f..993d99f2 100644 --- a/MemCell.h +++ b/MemCell.h @@ -64,7 +64,7 @@ private: double fValue1 { 0.0 }; double fValue2 { 0.0 }; // other - TCommandType eCommand { cm_Unknown }; + TCommandType eCommand { TCommandType::cm_Unknown }; bool bCommand { false }; // czy zawiera komendę dla zatrzymanego AI TEvent *OnSent { nullptr }; // event dodawany do kolejki po wysłaniu komendy zatrzymującej skład }; diff --git a/Model3d.cpp b/Model3d.cpp index 37a26b42..26b3e3b3 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -107,22 +107,6 @@ int TSubModel::SeekFaceNormal(std::vector const &Masks, int const float emm1[] = { 1, 1, 1, 0 }; float emm2[] = { 0, 0, 0, 1 }; -inline double readIntAsDouble(cParser &parser, int base = 255) -{ - int value = parser.getToken(false); - return (static_cast(value) / base); -}; - -template inline void readColor(cParser &parser, ColorT *color) -{ - double discard; - parser.getTokens(4, false); - 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, glm::vec4 &color) { int discard; @@ -192,41 +176,41 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic { iFlags |= 0x4000; // jak animacja, to trzeba przechowywać macierz zawsze if (type == "seconds_jump") - b_Anim = b_aAnim = at_SecondsJump; // sekundy z przeskokiem + b_Anim = b_aAnim = TAnimType::at_SecondsJump; // sekundy z przeskokiem else if (type == "minutes_jump") - b_Anim = b_aAnim = at_MinutesJump; // minuty z przeskokiem + b_Anim = b_aAnim = TAnimType::at_MinutesJump; // minuty z przeskokiem else if (type == "hours_jump") - b_Anim = b_aAnim = at_HoursJump; // godziny z przeskokiem + b_Anim = b_aAnim = TAnimType::at_HoursJump; // godziny z przeskokiem else if (type == "hours24_jump") - b_Anim = b_aAnim = at_Hours24Jump; // godziny z przeskokiem + b_Anim = b_aAnim = TAnimType::at_Hours24Jump; // godziny z przeskokiem else if (type == "seconds") - b_Anim = b_aAnim = at_Seconds; // minuty płynnie + b_Anim = b_aAnim = TAnimType::at_Seconds; // minuty płynnie else if (type == "minutes") - b_Anim = b_aAnim = at_Minutes; // minuty płynnie + b_Anim = b_aAnim = TAnimType::at_Minutes; // minuty płynnie else if (type == "hours") - b_Anim = b_aAnim = at_Hours; // godziny płynnie + b_Anim = b_aAnim = TAnimType::at_Hours; // godziny płynnie else if (type == "hours24") - b_Anim = b_aAnim = at_Hours24; // godziny płynnie + b_Anim = b_aAnim = TAnimType::at_Hours24; // godziny płynnie else if (type == "billboard") - b_Anim = b_aAnim = at_Billboard; // obrót w pionie do kamery + b_Anim = b_aAnim = TAnimType::at_Billboard; // obrót w pionie do kamery else if (type == "wind") - b_Anim = b_aAnim = at_Wind; // ruch pod wpływem wiatru + b_Anim = b_aAnim = TAnimType::at_Wind; // ruch pod wpływem wiatru else if (type == "sky") - b_Anim = b_aAnim = at_Sky; // aniamacja nieba + b_Anim = b_aAnim = TAnimType::at_Sky; // aniamacja nieba else if (type == "ik") - b_Anim = b_aAnim = at_IK; // IK: zadający + b_Anim = b_aAnim = TAnimType::at_IK; // IK: zadający else if (type == "ik11") - b_Anim = b_aAnim = at_IK11; // IK: kierunkowany + b_Anim = b_aAnim = TAnimType::at_IK11; // IK: kierunkowany else if (type == "ik21") - b_Anim = b_aAnim = at_IK21; // IK: kierunkowany + b_Anim = b_aAnim = TAnimType::at_IK21; // IK: kierunkowany else if (type == "ik22") - b_Anim = b_aAnim = at_IK22; // IK: kierunkowany + b_Anim = b_aAnim = TAnimType::at_IK22; // IK: kierunkowany else if (type == "digital") - b_Anim = b_aAnim = at_Digital; // licznik mechaniczny + b_Anim = b_aAnim = TAnimType::at_Digital; // licznik mechaniczny else if (type == "digiclk") - b_Anim = b_aAnim = at_DigiClk; // zegar cyfrowy + b_Anim = b_aAnim = TAnimType::at_DigiClk; // zegar cyfrowy else - b_Anim = b_aAnim = at_Undefined; // nieznana forma animacji + b_Anim = b_aAnim = TAnimType::at_Undefined; // nieznana forma animacji } } if (eType < TP_ROTATOR) @@ -281,19 +265,16 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic else if (eType < TP_ROTATOR) { std::string discard; - parser.getTokens(5, false); + parser.getTokens(6, false); parser >> discard >> bWire >> discard >> fWireSize - >> discard; + >> discard >> Opacity; // wymagane jest 0 dla szyb, 100 idzie w nieprzezroczyste - Opacity = readIntAsDouble(parser, 100.0f); - if (Opacity > 1.0f) - Opacity *= 0.01f; // w 2013 był błąd i aby go obejść, trzeba było wpisać 10000.0 -/* - if ((Global.iConvertModels & 1) == 0) // dla zgodności wstecz - Opacity = 0.0; // wszystko idzie w przezroczyste albo zależnie od tekstury -*/ + if( Opacity > 1.f ) { + Opacity = std::min( 1.f, Opacity * 0.01f ); + } + if (!parser.expectToken("map:")) Error("Model map parse failure!"); std::string material = parser.getToken(); @@ -793,8 +774,8 @@ void TSubModel::SetRotate(float3 vNewRotateAxis, float fNewAngle) f_Angle = fNewAngle; if (fNewAngle != 0.0) { - b_Anim = at_Rotate; - b_aAnim = at_Rotate; + b_Anim = TAnimType::at_Rotate; + b_aAnim = TAnimType::at_Rotate; } iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } @@ -804,8 +785,8 @@ void TSubModel::SetRotateXYZ(float3 vNewAngles) // podane kąty wokół osi // lokalnego układu v_Angles = vNewAngles; - b_Anim = at_RotateXYZ; - b_aAnim = at_RotateXYZ; + b_Anim = TAnimType::at_RotateXYZ; + b_aAnim = TAnimType::at_RotateXYZ; iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } @@ -816,16 +797,16 @@ void TSubModel::SetRotateXYZ( Math3D::vector3 vNewAngles) v_Angles.x = vNewAngles.x; v_Angles.y = vNewAngles.y; v_Angles.z = vNewAngles.z; - b_Anim = at_RotateXYZ; - b_aAnim = at_RotateXYZ; + b_Anim = TAnimType::at_RotateXYZ; + b_aAnim = TAnimType::at_RotateXYZ; iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } void TSubModel::SetTranslate(float3 vNewTransVector) { // przesunięcie submodelu (np. w kabinie) v_TransVector = vNewTransVector; - b_Anim = at_Translate; - b_aAnim = at_Translate; + b_Anim = TAnimType::at_Translate; + b_aAnim = TAnimType::at_Translate; iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } @@ -834,8 +815,8 @@ void TSubModel::SetTranslate( Math3D::vector3 vNewTransVector) v_TransVector.x = vNewTransVector.x; v_TransVector.y = vNewTransVector.y; v_TransVector.z = vNewTransVector.z; - b_Anim = at_Translate; - b_aAnim = at_Translate; + b_Anim = TAnimType::at_Translate; + b_aAnim = TAnimType::at_Translate; iAnimOwner = iInstance; // zapamiętanie czyja jest animacja } @@ -891,17 +872,17 @@ void TSubModel::RaAnimation(TAnimType a) { // wykonanie animacji niezależnie od renderowania switch (a) { // korekcja położenia, jeśli submodel jest animowany - case at_Translate: // Ra: było "true" + case TAnimType::at_Translate: // Ra: było "true" if (iAnimOwner != iInstance) break; // cudza animacja glTranslatef(v_TransVector.x, v_TransVector.y, v_TransVector.z); break; - case at_Rotate: // Ra: było "true" + case TAnimType::at_Rotate: // Ra: było "true" if (iAnimOwner != iInstance) break; // cudza animacja glRotatef(f_Angle, v_RotateAxis.x, v_RotateAxis.y, v_RotateAxis.z); break; - case at_RotateXYZ: + case TAnimType::at_RotateXYZ: if (iAnimOwner != iInstance) break; // cudza animacja glTranslatef(v_TransVector.x, v_TransVector.y, v_TransVector.z); @@ -909,31 +890,31 @@ void TSubModel::RaAnimation(TAnimType a) glRotatef(v_Angles.y, 0.0f, 1.0f, 0.0f); glRotatef(v_Angles.z, 0.0f, 0.0f, 1.0f); break; - case at_SecondsJump: // sekundy z przeskokiem + case TAnimType::at_SecondsJump: // sekundy z przeskokiem glRotatef(simulation::Time.data().wSecond * 6.0, 0.0, 1.0, 0.0); break; - case at_MinutesJump: // minuty z przeskokiem + case TAnimType::at_MinutesJump: // minuty z przeskokiem glRotatef(simulation::Time.data().wMinute * 6.0, 0.0, 1.0, 0.0); break; - case at_HoursJump: // godziny skokowo 12h/360° + case TAnimType::at_HoursJump: // godziny skokowo 12h/360° glRotatef(simulation::Time.data().wHour * 30.0 * 0.5, 0.0, 1.0, 0.0); break; - case at_Hours24Jump: // godziny skokowo 24h/360° + case TAnimType::at_Hours24Jump: // godziny skokowo 24h/360° glRotatef(simulation::Time.data().wHour * 15.0 * 0.25, 0.0, 1.0, 0.0); break; - case at_Seconds: // sekundy płynnie + case TAnimType::at_Seconds: // sekundy płynnie glRotatef(simulation::Time.second() * 6.0, 0.0, 1.0, 0.0); break; - case at_Minutes: // minuty płynnie + case TAnimType::at_Minutes: // minuty płynnie glRotatef(simulation::Time.data().wMinute * 6.0 + simulation::Time.second() * 0.1, 0.0, 1.0, 0.0); break; - case at_Hours: // godziny płynnie 12h/360° + case TAnimType::at_Hours: // godziny płynnie 12h/360° glRotatef(2.0 * Global.fTimeAngleDeg, 0.0, 1.0, 0.0); break; - case at_Hours24: // godziny płynnie 24h/360° + case TAnimType::at_Hours24: // godziny płynnie 24h/360° glRotatef(Global.fTimeAngleDeg, 0.0, 1.0, 0.0); break; - case at_Billboard: // obrót w pionie do kamery + case TAnimType::at_Billboard: // obrót w pionie do kamery { Math3D::matrix4x4 mat; mat.OpenGL_Matrix( OpenGLMatrices.data_array( GL_MODELVIEW ) ); float3 gdzie = float3(mat[3][0], mat[3][1], mat[3][2]); // początek układu współrzędnych submodelu względem kamery @@ -944,19 +925,19 @@ void TSubModel::RaAnimation(TAnimType a) 0.0); // jedynie obracamy w pionie o kąt } break; - case at_Wind: // ruch pod wpływem wiatru (wiatr będziemy liczyć potem...) + case TAnimType::at_Wind: // ruch pod wpływem wiatru (wiatr będziemy liczyć potem...) glRotated(1.5 * std::sin(M_PI * simulation::Time.second() / 6.0), 0.0, 1.0, 0.0); break; - case at_Sky: // animacja nieba + case TAnimType::at_Sky: // animacja nieba glRotated(Global.fLatitudeDeg, 1.0, 0.0, 0.0); // ustawienie osi OY na północ // glRotatef(Global.fTimeAngleDeg,0.0,1.0,0.0); //obrót dobowy osi OX glRotated(-fmod(Global.fTimeAngleDeg, 360.0), 0.0, 1.0, 0.0); // obrót dobowy osi OX break; - case at_IK11: // ostatni element animacji szkieletowej (podudzie, stopa) + case TAnimType::at_IK11: // ostatni element animacji szkieletowej (podudzie, stopa) glRotatef(v_Angles.z, 0.0f, 1.0f, 0.0f); // obrót względem osi pionowej (azymut) glRotatef(v_Angles.x, 1.0f, 0.0f, 0.0f); // obrót względem poziomu (deklinacja) break; - case at_DigiClk: // animacja zegara cyfrowego + case TAnimType::at_DigiClk: // animacja zegara cyfrowego { // ustawienie animacji w submodelach potomnych TSubModel *sm = ChildGet(); do diff --git a/Model3d.h b/Model3d.h index 7d6a8427..d2c8d17b 100644 --- a/Model3d.h +++ b/Model3d.h @@ -21,7 +21,7 @@ const int TP_FREESPOTLIGHT = 257; const int TP_STARS = 258; const int TP_TEXT = 259; -enum TAnimType // rodzaj animacji +enum class TAnimType // rodzaj animacji { at_None, // brak at_Rotate, // obrót względem wektora o kąt @@ -38,13 +38,13 @@ enum TAnimType // rodzaj animacji at_Billboard, // obrót w pionie do kamery at_Wind, // ruch pod wpływem wiatru at_Sky, // animacja nieba - at_IK = 0x100, // odwrotna kinematyka - submodel sterujący (np. staw skokowy) - at_IK11 = 0x101, // odwrotna kinematyka - submodel nadrzędny do sterowango (np. stopa) - at_IK21 = 0x102, // odwrotna kinematyka - submodel nadrzędny do sterowango (np. podudzie) - at_IK22 = 0x103, // odwrotna kinematyka - submodel nadrzędny do nadrzędnego sterowango (np. udo) - at_Digital = 0x200, // dziesięciocyfrowy licznik mechaniczny (z cylindrami) - at_DigiClk = 0x201, // zegar cyfrowy jako licznik na dziesięciościanach - at_Undefined = 0x800000FF // animacja chwilowo nieokreślona + at_IK, // odwrotna kinematyka - submodel sterujący (np. staw skokowy) + at_IK11, // odwrotna kinematyka - submodel nadrzędny do sterowango (np. stopa) + at_IK21, // odwrotna kinematyka - submodel nadrzędny do sterowango (np. podudzie) + at_IK22, // odwrotna kinematyka - submodel nadrzędny do nadrzędnego sterowango (np. udo) + at_Digital, // dziesięciocyfrowy licznik mechaniczny (z cylindrami) + at_DigiClk, // zegar cyfrowy jako licznik na dziesięciościanach + at_Undefined // animacja chwilowo nieokreślona }; namespace scene { @@ -73,7 +73,7 @@ private: int eType{ TP_ROTATOR }; // Ra: modele binarne dają więcej możliwości niż mesh złożony z trójkątów int iName{ -1 }; // numer łańcucha z nazwą submodelu, albo -1 gdy anonimowy public: // chwilowo - TAnimType b_Anim{ at_None }; + TAnimType b_Anim{ TAnimType::at_None }; private: int iFlags{ 0x0200 }; // bit 9=1: submodel został utworzony a nie ustawiony na wczytany plik @@ -136,7 +136,7 @@ public: // chwilowo gfx::vertex_array Vertices; float m_boundingradius { 0 }; size_t iAnimOwner{ 0 }; // roboczy numer egzemplarza, który ustawił animację - TAnimType b_aAnim{ at_None }; // kody animacji oddzielnie, bo zerowane + TAnimType b_aAnim{ TAnimType::at_None }; // kody animacji oddzielnie, bo zerowane float4x4 *mAnimMatrix{ nullptr }; // macierz do animacji kwaternionowych (należy do AnimContainer) TSubModel **smLetter{ nullptr }; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) TSubModel *Parent{ nullptr }; // nadrzędny, np. do wymnażania macierzy diff --git a/Train.cpp b/Train.cpp index 76c7fcfa..47d43099 100644 --- a/Train.cpp +++ b/Train.cpp @@ -600,7 +600,7 @@ bool TTrain::is_eztoer() const { return ( ( mvControlled->TrainType == dt_EZT ) - && ( mvOccupied->BrakeSubsystem == ss_ESt ) + && ( mvOccupied->BrakeSubsystem == TBrakeSubSystem::ss_ESt ) && ( mvControlled->Battery == true ) && ( mvControlled->EpFuse == true ) && ( mvControlled->ActiveDir != 0 ) ); // od yB @@ -769,7 +769,7 @@ void TTrain::OnCommand_secondcontrollerincrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold - if( ( Train->mvControlled->EngineType == DieselElectric ) + if( ( Train->mvControlled->EngineType == TEngineType::DieselElectric ) && ( true == Train->mvControlled->ShuntMode ) ) { Train->mvControlled->AnPos = clamp( Train->mvControlled->AnPos + 0.025, @@ -785,7 +785,7 @@ void TTrain::OnCommand_secondcontrollerincreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold - if( ( Train->mvControlled->EngineType == DieselElectric ) + if( ( Train->mvControlled->EngineType == TEngineType::DieselElectric ) && ( true == Train->mvControlled->ShuntMode ) ) { Train->mvControlled->AnPos = 1.0; } @@ -837,7 +837,7 @@ void TTrain::OnCommand_secondcontrollerdecrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { // on press or hold - if( ( Train->mvControlled->EngineType == DieselElectric ) + if( ( Train->mvControlled->EngineType == TEngineType::DieselElectric ) && ( true == Train->mvControlled->ShuntMode ) ) { Train->mvControlled->AnPos = clamp( Train->mvControlled->AnPos - 0.025, @@ -853,7 +853,7 @@ void TTrain::OnCommand_secondcontrollerdecreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { // on press or hold - if( ( Train->mvControlled->EngineType == DieselElectric ) + if( ( Train->mvControlled->EngineType == TEngineType::DieselElectric ) && ( true == Train->mvControlled->ShuntMode ) ) { Train->mvControlled->AnPos = 0.0; } @@ -882,7 +882,7 @@ void TTrain::OnCommand_independentbrakeincrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { - if( Train->mvOccupied->LocalBrake != ManualBrake ) { + if( Train->mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) { Train->mvOccupied->IncLocalBrakeLevel( 1 ); } } @@ -892,8 +892,8 @@ void TTrain::OnCommand_independentbrakeincreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { - if( Train->mvOccupied->LocalBrake != ManualBrake ) { - Train->mvOccupied->IncLocalBrakeLevel( 2 ); + if( Train->mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) { + Train->mvOccupied->IncLocalBrakeLevel( LocalBrakePosNo ); } } } @@ -902,10 +902,10 @@ void TTrain::OnCommand_independentbrakedecrease( TTrain *Train, command_data con if( Command.action != GLFW_RELEASE ) { - if( ( Train->mvOccupied->LocalBrake != ManualBrake ) + if( ( Train->mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - odhamować jakoś trzeba // TODO: sort AI out so it doesn't do things it doesn't have equipment for - || ( Train->mvOccupied->LocalBrakePos != 0 ) ) { + || ( Train->mvOccupied->LocalBrakePosA > 0 ) ) { Train->mvOccupied->DecLocalBrakeLevel( 1 ); } } @@ -915,11 +915,11 @@ void TTrain::OnCommand_independentbrakedecreasefast( TTrain *Train, command_data if( Command.action != GLFW_RELEASE ) { - if( ( Train->mvOccupied->LocalBrake != ManualBrake ) + if( ( Train->mvOccupied->LocalBrake != TLocalBrake::ManualBrake ) // Ra 1014-06: AI potrafi zahamować pomocniczym mimo jego braku - odhamować jakoś trzeba // TODO: sort AI out so it doesn't do things it doesn't have equipment for - || ( Train->mvOccupied->LocalBrakePos != 0 ) ) { - Train->mvOccupied->DecLocalBrakeLevel( 2 ); + || ( Train->mvOccupied->LocalBrakePosA > 0 ) ) { + Train->mvOccupied->DecLocalBrakeLevel( LocalBrakePosNo ); } } } @@ -948,9 +948,9 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons // TODO: check if this set of conditions can be simplified. // it'd be more flexible to have an attribute indicating whether bail off position is supported if( ( Train->mvControlled->TrainType != dt_EZT ) - && ( ( Train->mvControlled->EngineType == ElectricSeriesMotor ) - || ( Train->mvControlled->EngineType == DieselElectric ) - || ( Train->mvControlled->EngineType == ElectricInductionMotor ) ) + && ( ( Train->mvControlled->EngineType == TEngineType::ElectricSeriesMotor ) + || ( Train->mvControlled->EngineType == TEngineType::DieselElectric ) + || ( Train->mvControlled->EngineType == TEngineType::ElectricInductionMotor ) ) && ( Train->mvOccupied->BrakeCtrlPosNo > 0 ) ) { if( Command.action == GLFW_PRESS ) { @@ -989,7 +989,7 @@ void TTrain::OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Co if( Command.action != GLFW_RELEASE ) { - if( Train->mvOccupied->BrakeHandle == FV4a ) { + if( Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a ) { Train->mvOccupied->BrakeLevelAdd( 0.1 /*15.0 * Command.time_delta*/ ); } else { @@ -1002,7 +1002,7 @@ void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Co if( Command.action != GLFW_RELEASE ) { // press or hold - if( Train->mvOccupied->BrakeHandle == FV4a ) { + if( Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a ) { Train->mvOccupied->BrakeLevelAdd( -0.1 /*-15.0 * Command.time_delta*/ ); } else { @@ -1031,7 +1031,7 @@ void TTrain::OnCommand_trainbrakecharging( TTrain *Train, command_data const &Co else { // release if( ( Train->mvOccupied->BrakeCtrlPos == -1 ) - && ( Train->mvOccupied->BrakeHandle == FVel6 ) + && ( Train->mvOccupied->BrakeHandle == TBrakeHandle::FVel6 ) && ( Train->DynamicObject->Controller != AIdriver ) && ( Global.iFeedbackMode < 3 ) ) { // Odskakiwanie hamulce EP @@ -1062,7 +1062,7 @@ void TTrain::OnCommand_trainbrakeservice( TTrain *Train, command_data const &Com Train->set_train_brake( ( Train->mvOccupied->BrakeCtrlPosNo / 2 - + ( Train->mvOccupied->BrakeHandle == FV4a ? + + ( Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a ? 1 : 0 ) ) ); } @@ -1103,7 +1103,7 @@ void TTrain::OnCommand_trainbrakebasepressureincrease( TTrain *Train, command_da if( Command.action != GLFW_RELEASE ) { switch( Train->mvOccupied->BrakeHandle ) { - case FV4a: { + case TBrakeHandle::FV4a: { Train->mvOccupied->BrakeCtrlPos2 = clamp( Train->mvOccupied->BrakeCtrlPos2 - 0.01, -1.5, 2.0 ); break; } @@ -1120,7 +1120,7 @@ void TTrain::OnCommand_trainbrakebasepressuredecrease( TTrain *Train, command_da if( Command.action != GLFW_RELEASE ) { switch( Train->mvOccupied->BrakeHandle ) { - case FV4a: { + case TBrakeHandle::FV4a: { Train->mvOccupied->BrakeCtrlPos2 = clamp( Train->mvOccupied->BrakeCtrlPos2 + 0.01, -1.5, 2.0 ); break; } @@ -1158,7 +1158,7 @@ void TTrain::OnCommand_manualbrakeincrease( TTrain *Train, command_data const &C auto *vehicle { Train->find_nearest_consist_vehicle() }; if( vehicle == nullptr ) { return; } - if( ( vehicle->MoverParameters->LocalBrake == ManualBrake ) + if( ( vehicle->MoverParameters->LocalBrake == TLocalBrake::ManualBrake ) || ( vehicle->MoverParameters->MBrake == true ) ) { vehicle->MoverParameters->IncManualBrakeLevel( 1 ); @@ -1173,7 +1173,7 @@ void TTrain::OnCommand_manualbrakedecrease( TTrain *Train, command_data const &C auto *vehicle { Train->find_nearest_consist_vehicle() }; if( vehicle == nullptr ) { return; } - if( ( vehicle->MoverParameters->LocalBrake == ManualBrake ) + if( ( vehicle->MoverParameters->LocalBrake == TLocalBrake::ManualBrake ) || ( vehicle->MoverParameters->MBrake == true ) ) { vehicle->MoverParameters->DecManualBrakeLevel( 1 ); @@ -1210,7 +1210,7 @@ void TTrain::OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const return; } - if( Train->mvOccupied->BrakeSystem != ElectroPneumatic ) { + if( Train->mvOccupied->BrakeSystem != TBrakeSystem::ElectroPneumatic ) { // standard behaviour if( Command.action == GLFW_PRESS ) { // visual feedback @@ -1229,7 +1229,7 @@ void TTrain::OnCommand_wheelspinbrakeactivate( TTrain *Train, command_data const // visual feedback Train->ggAntiSlipButton.UpdateValue( 1.0, Train->dsbPneumaticSwitch ); - if( ( Train->mvOccupied->BrakeHandle == St113 ) + if( ( Train->mvOccupied->BrakeHandle == TBrakeHandle::St113 ) && ( Train->mvControlled->EpFuse == true ) ) { Train->mvOccupied->SwitchEPBrake( 1 ); } @@ -2074,8 +2074,8 @@ void TTrain::OnCommand_linebreakerclose( TTrain *Train, command_data const &Comm if( Train->m_linebreakerstate == 2 ) { // we don't need to start the diesel twice, but the other types (with impulse switch setup) still need to be launched - if( ( Train->mvControlled->EngineType != DieselEngine ) - && ( Train->mvControlled->EngineType != DieselElectric ) ) { + if( ( Train->mvControlled->EngineType != TEngineType::DieselEngine ) + && ( Train->mvControlled->EngineType != TEngineType::DieselElectric ) ) { // try to finalize state change of the line breaker, set the state based on the outcome Train->m_linebreakerstate = ( Train->mvControlled->MainSwitch( true ) ? @@ -2387,7 +2387,7 @@ void TTrain::OnCommand_convertertoggle( TTrain *Train, command_data const &Comma void TTrain::OnCommand_converterenable( TTrain *Train, command_data const &Command ) { - if( Train->mvControlled->ConverterStart == start::automatic ) { + if( Train->mvControlled->ConverterStart == start_t::automatic ) { // let the automatic thing do its automatic thing... return; } @@ -2421,7 +2421,7 @@ void TTrain::OnCommand_converterenable( TTrain *Train, command_data const &Comma void TTrain::OnCommand_converterdisable( TTrain *Train, command_data const &Command ) { - if( Train->mvControlled->ConverterStart == start::automatic ) { + if( Train->mvControlled->ConverterStart == start_t::automatic ) { // let the automatic thing do its automatic thing... return; } @@ -2461,7 +2461,7 @@ void TTrain::OnCommand_converterdisable( TTrain *Train, command_data const &Comm void TTrain::OnCommand_convertertogglelocal( TTrain *Train, command_data const &Command ) { - if( Train->mvOccupied->ConverterStart == start::automatic ) { + if( Train->mvOccupied->ConverterStart == start_t::automatic ) { // let the automatic thing do its automatic thing... return; } @@ -3714,7 +3714,7 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman Train->mvOccupied->DoorLeftOpened : Train->mvOccupied->DoorRightOpened ) ) { // open - if( Train->mvOccupied->DoorOpenCtrl != control::driver ) { + if( Train->mvOccupied->DoorOpenCtrl != control_t::driver ) { return; } if( Train->mvOccupied->ActiveCab == 1 ) { @@ -3729,7 +3729,7 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman } else { // close - if( Train->mvOccupied->DoorCloseCtrl != control::driver ) { + if( Train->mvOccupied->DoorCloseCtrl != control_t::driver ) { return; } // TODO: move door opening/closing to the update, so the switch animation doesn't hinge on door working @@ -3755,7 +3755,7 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma Train->mvOccupied->DoorRightOpened : Train->mvOccupied->DoorLeftOpened ) ) { // open - if( Train->mvOccupied->DoorOpenCtrl != control::driver ) { + if( Train->mvOccupied->DoorOpenCtrl != control_t::driver ) { return; } if( Train->mvOccupied->ActiveCab == 1 ) { @@ -3770,7 +3770,7 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma } else { // close - if( Train->mvOccupied->DoorCloseCtrl != control::driver ) { + if( Train->mvOccupied->DoorCloseCtrl != control_t::driver ) { return; } if( Train->mvOccupied->ActiveCab == 1 ) { @@ -4107,8 +4107,8 @@ void TTrain::UpdateMechPosition(double dt) && ( pMechOffset.y < 4.0 ) ) // Ra 15-01: przy oglądaniu pantografu bujanie przeszkadza { Math3D::vector3 shakevector; - if( ( mvOccupied->EngineType == DieselElectric ) - || ( mvOccupied->EngineType == DieselEngine ) ) { + if( ( mvOccupied->EngineType == TEngineType::DieselElectric ) + || ( mvOccupied->EngineType == TEngineType::DieselEngine ) ) { if( std::abs( mvOccupied->enrot ) > 0.0 ) { // engine vibration shakevector.x += @@ -4258,8 +4258,8 @@ bool TTrain::Update( double const Deltatime ) || ( ggMainOnButton.GetDesiredValue() > 0.95 ) ) { // keep track of period the line breaker button is held down, to determine when/if circuit closes if( ( fHVoltage > 0.5 * mvControlled->EnginePowerSource.MaxVoltage ) - || ( ( mvControlled->EngineType != ElectricSeriesMotor ) - && ( mvControlled->EngineType != ElectricInductionMotor ) + || ( ( mvControlled->EngineType != TEngineType::ElectricSeriesMotor ) + && ( mvControlled->EngineType != TEngineType::ElectricInductionMotor ) && ( true == mvControlled->Battery ) ) ) { // prevent the switch from working if there's no power // TODO: consider whether it makes sense for diesel engines and such @@ -4284,8 +4284,8 @@ bool TTrain::Update( double const Deltatime ) if( m_linebreakerstate == 2 ) { // for diesels and/or vehicles with toggle switch setup we complete the engine start here if( ( ggMainOnButton.SubModel == nullptr ) - || ( ( mvControlled->EngineType == DieselEngine ) - || ( mvControlled->EngineType == DieselElectric ) ) ) { + || ( ( mvControlled->EngineType == TEngineType::DieselEngine ) + || ( mvControlled->EngineType == TEngineType::DieselElectric ) ) ) { // try to finalize state change of the line breaker, set the state based on the outcome m_linebreakerstate = ( mvControlled->MainSwitch( true ) ? @@ -4350,7 +4350,7 @@ bool TTrain::Update( double const Deltatime ) } } - if( ( mvOccupied->BrakeHandle == FVel6 ) + if( ( mvOccupied->BrakeHandle == TBrakeHandle::FVel6 ) && ( mvOccupied->fBrakeCtrlPos < 0.0 ) && ( Global.iFeedbackMode < 3 ) ) { // Odskakiwanie hamulce EP @@ -4389,8 +4389,8 @@ bool TTrain::Update( double const Deltatime ) } // Ra 2014-09: napięcia i prądy muszą być ustalone najpierw, bo wysyłane są ewentualnie na PoKeys - if ((mvControlled->EngineType != DieselElectric) - && (mvControlled->EngineType != ElectricInductionMotor)) // Ra 2014-09: czy taki rozdzia? ma sens? + if ((mvControlled->EngineType != TEngineType::DieselElectric) + && (mvControlled->EngineType != TEngineType::ElectricInductionMotor)) // Ra 2014-09: czy taki rozdzia? ma sens? fHVoltage = mvControlled->RunningTraction.TractionVoltage; // Winger czy to nie jest zle? // *mvControlled->Mains); else @@ -4453,7 +4453,7 @@ bool TTrain::Update( double const Deltatime ) asCarName[i] = p->name(); bPants[iUnitNo - 1][0] = (bPants[iUnitNo - 1][0] || p->MoverParameters->PantFrontUp); bPants[iUnitNo - 1][1] = (bPants[iUnitNo - 1][1] || p->MoverParameters->PantRearUp); - bComp[iUnitNo - 1][0] = (bComp[iUnitNo - 1][0] || p->MoverParameters->CompressorAllow || (p->MoverParameters->CompressorStart == start::automatic)); + bComp[iUnitNo - 1][0] = (bComp[iUnitNo - 1][0] || p->MoverParameters->CompressorAllow || (p->MoverParameters->CompressorStart == start_t::automatic)); bSlip[i] = p->MoverParameters->SlippingWheels; if (p->MoverParameters->CompressorSpeed > 0.00001) { @@ -4552,12 +4552,12 @@ bool TTrain::Update( double const Deltatime ) // hunter-080812: wyrzucanie szybkiego na elektrykach gdy nie ma napiecia przy dowolnym ustawieniu kierunkowego // Ra: to już jest w T_MoverParameters::TractionForce(), ale zależy od kierunku if( ( mvControlled->Mains ) - && ( mvControlled->EngineType == ElectricSeriesMotor ) ) { + && ( mvControlled->EngineType == TEngineType::ElectricSeriesMotor ) ) { if( std::max( mvControlled->GetTrainsetVoltage(), std::fabs( mvControlled->RunningTraction.TractionVoltage ) ) < 0.5 * mvControlled->EnginePowerSource.MaxVoltage ) { // TODO: check whether it should affect entire consist for EMU // TODO: check whether it should happen if there's power supplied alternatively through hvcouplers // TODO: potentially move this to the mover module, as there isn't much reason to have this dependent on the operator presence - mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? range::unit : range::local ) ); + mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? range_t::unit : range_t::local ) ); } } @@ -4579,7 +4579,7 @@ bool TTrain::Update( double const Deltatime ) { fConverterTimer += Deltatime; if ((mvControlled->CompressorFlag == true) && (mvControlled->CompressorPower == 1) && - ((mvControlled->EngineType == ElectricSeriesMotor) || + ((mvControlled->EngineType == TEngineType::ElectricSeriesMotor) || (mvControlled->TrainType == dt_EZT)) && (DynamicObject->Controller == Humandriver)) // hunter-110212: poprawka dla EZT { // hunter-091012: poprawka (zmiana warunku z CompressorPower /rozne od @@ -4588,7 +4588,7 @@ bool TTrain::Update( double const Deltatime ) { mvControlled->ConvOvldFlag = true; if (mvControlled->TrainType != dt_EZT) - mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? range::unit : range::local ) ); + mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? range_t::unit : range_t::local ) ); } else if( fConverterTimer >= fConverterPrzekaznik ) { // changed switch from always true to take into account state of the compressor switch @@ -4707,13 +4707,13 @@ bool TTrain::Update( double const Deltatime ) ggLVoltage.Update(); } - if (mvControlled->EngineType == DieselElectric) + if (mvControlled->EngineType == TEngineType::DieselElectric) { // ustawienie zmiennych dla silnika spalinowego fEngine[1] = mvControlled->ShowEngineRotation(1); fEngine[2] = mvControlled->ShowEngineRotation(2); } - else if (mvControlled->EngineType == DieselEngine) + else if (mvControlled->EngineType == TEngineType::DieselEngine) { // albo dla innego spalinowego fEngine[1] = mvControlled->ShowEngineRotation(1); fEngine[2] = mvControlled->ShowEngineRotation(2); @@ -5161,7 +5161,7 @@ bool TTrain::Update( double const Deltatime ) false) // nie blokujemy AI { // Ra: nie najlepsze miejsce, ale na początek gdzieś to dać trzeba // Firleju: dlatego kasujemy i zastepujemy funkcją w Console - if (mvOccupied->BrakeHandle == FV4a) + if (mvOccupied->BrakeHandle == TBrakeHandle::FV4a) { double b = Console::AnalogCalibrateGet(0); b = b * 8.0 - 2.0; @@ -5169,7 +5169,7 @@ bool TTrain::Update( double const Deltatime ) ggBrakeCtrl.UpdateValue(b); // przesów bez zaokrąglenia mvOccupied->BrakeLevelSet(b); } - if (mvOccupied->BrakeHandle == FVel6) // może można usunąć ograniczenie do FV4a i FVel6? + if (mvOccupied->BrakeHandle == TBrakeHandle::FVel6) // może można usunąć ograniczenie do FV4a i FVel6? { double b = Console::AnalogCalibrateGet(0); b = b * 7.0 - 1.0; @@ -5191,23 +5191,23 @@ bool TTrain::Update( double const Deltatime ) #ifdef _WIN32 if( ( DynamicObject->Mechanik != nullptr ) && ( false == DynamicObject->Mechanik->AIControllFlag ) // nie blokujemy AI - && ( mvOccupied->BrakeLocHandle == FD1 ) + && ( mvOccupied->BrakeLocHandle == TBrakeHandle::FD1 ) && ( ( Global.iFeedbackMode == 4 ) /*|| ( Global.bMWDmasterEnable && Global.bMWDBreakEnable )*/ ) ) { // Ra: nie najlepsze miejsce, ale na początek gdzieś to dać trzeba // Firleju: dlatego kasujemy i zastepujemy funkcją w Console auto const b = clamp( - Console::AnalogCalibrateGet( 1 ) * 10.0, + Console::AnalogCalibrateGet( 1 ), 0.0, - LocalBrakePosNo ); - ggLocalBrake.UpdateValue( b ); // przesów bez zaokrąglenia - mvOccupied->LocalBrakePos = int( 1.09 * b ); // sposób zaokrąglania jest do ustalenia + 1.0 ); + mvOccupied->LocalBrakePosA = b; + ggLocalBrake.UpdateValue( b * LocalBrakePosNo ); } else #endif { // standardowa prodedura z kranem powiązanym z klawiaturą - ggLocalBrake.UpdateValue( std::max( mvOccupied->LocalBrakePos, mvOccupied->LocalBrakePosA * LocalBrakePosNo ) ); + ggLocalBrake.UpdateValue( mvOccupied->LocalBrakePosA * LocalBrakePosNo ); } ggLocalBrake.Update(); } @@ -5369,7 +5369,7 @@ bool TTrain::Update( double const Deltatime ) } // anti slip system activation, maintained while the control button is down - if( mvOccupied->BrakeSystem != ElectroPneumatic ) { + if( mvOccupied->BrakeSystem != TBrakeSystem::ElectroPneumatic ) { if( ggAntiSlipButton.GetDesiredValue() > 0.95 ) { mvControlled->AntiSlippingBrake(); } @@ -5475,8 +5475,8 @@ TTrain::update_sounds( double const Deltatime ) { // McZapkie-280302 - syczenie // TODO: softer volume reduction than plain abrupt stop, perhaps as reusable wrapper? - if( ( mvOccupied->BrakeHandle == FV4a ) - || ( mvOccupied->BrakeHandle == FVel6 ) ) { + if( ( mvOccupied->BrakeHandle == TBrakeHandle::FV4a ) + || ( mvOccupied->BrakeHandle == TBrakeHandle::FVel6 ) ) { // upuszczanie z PG fPPress = interpolate( fPPress, static_cast( mvOccupied->Handle->GetSound( s_fv4a_b ) ), 0.05f ); volume = ( @@ -7139,9 +7139,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con if (Parser.getToken() == "analog") { // McZapkie-300302: zegarek - ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), gt_Rotate, 1.0/60.0); - ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), gt_Rotate, 1.0/60.0); - ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), gt_Rotate, 1.0/12.0); + ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), TGaugeType::gt_Rotate, 1.0/60.0); + ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), TGaugeType::gt_Rotate, 1.0/60.0); + ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), TGaugeType::gt_Rotate, 1.0/12.0); } } else if (Label == "evoltage:") diff --git a/World.cpp b/World.cpp index 4c4b1452..7c5ce712 100644 --- a/World.cpp +++ b/World.cpp @@ -128,7 +128,7 @@ bool TWorld::Init( GLFWwindow *Window ) { Controlled = NULL; mvControlled = NULL; SafeDelete( Train ); - Camera.Type = tp_Free; + Camera.Type = TCameraType::tp_Free; } } else @@ -141,7 +141,7 @@ bool TWorld::Init( GLFWwindow *Window ) { glfwSwapBuffers( window ); Controlled = NULL; mvControlled = NULL; - Camera.Type = tp_Free; + Camera.Type = TCameraType::tp_Free; DebugCamera = Camera; Global.DebugCameraPosition = DebugCamera.Pos; } @@ -699,7 +699,7 @@ bool TWorld::Update() { // fixed step part of the camera update if( ( Train != nullptr ) - && ( Camera.Type == tp_Follow ) + && ( Camera.Type == TCameraType::tp_Follow ) && ( false == DebugCameraFlag ) ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery Train->UpdateMechPosition( m_secondaryupdaterate ); @@ -825,7 +825,7 @@ TWorld::Update_Camera( double const Deltatime ) { Global.CabWindowOpen = false; if( ( Train != nullptr ) - && ( Camera.Type == tp_Follow ) + && ( Camera.Type == TCameraType::tp_Follow ) && ( false == DebugCameraFlag ) ) { // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery auto tempangle = Controlled->VectorFront() * ( Controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); diff --git a/application.cpp b/application.cpp index 0d409929..4bbca8a0 100644 --- a/application.cpp +++ b/application.cpp @@ -207,6 +207,8 @@ eu07_application::init( int Argc, char *Argv[] ) { int eu07_application::run() { + // HACK: prevent mouse capture before simulation starts + Global.ControlPicking = true; // TODO: move input sources and their initializations to the application mode member input::Keyboard.init(); input::Mouse.init(); @@ -238,6 +240,7 @@ eu07_application::run() { set_cursor( GLFW_CURSOR_DISABLED ); set_cursor_pos( 0, 0 ); + Global.ControlPicking = false; // main application loop // TODO: split into parts and delegate these to application mode member @@ -390,12 +393,12 @@ eu07_application::init_settings( int Argc, char *Argv[] ) { } else if( token == "-s" ) { if( i + 1 < Argc ) { - Global.SceneryFile = Argv[ ++i ]; + Global.SceneryFile = ToLower( Argv[ ++i ] ); } } else if( token == "-v" ) { if( i + 1 < Argc ) { - Global.asHumanCtrlVehicle = Argv[ ++i ]; + Global.asHumanCtrlVehicle = ToLower( Argv[ ++i ] ); } } else { diff --git a/audiorenderer.cpp b/audiorenderer.cpp index 9c50de25..03184ee2 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -21,6 +21,20 @@ namespace audio { openal_renderer renderer; float const EU07_SOUND_CUTOFFRANGE { 3000.f }; // 2750 m = max expected emitter spawn range, plus safety margin +float const EU07_SOUND_VELOCITYLIMIT { 250 / 3.6f }; // 343 m/sec ~= speed of sound; arbitrary limit of 250 km/h + +// potentially clamps length of provided vector to 343 meters +// TBD: make a generic method for utilities out of this +glm::vec3 +limit_velocity( glm::vec3 const &Velocity ) { + + auto const ratio { glm::length( Velocity ) / EU07_SOUND_VELOCITYLIMIT }; + + return ( + ratio > 1.f ? + Velocity / ratio : + Velocity ); +} // starts playback of queued buffers void @@ -97,7 +111,7 @@ openal_source::sync_with( sound_properties const &State ) { && ( sound_range >= 0 ) && ( properties.location != glm::dvec3() ) ) { // after sound position was initialized we can start velocity calculations - sound_velocity = ( State.location - properties.location ) / update_deltatime; + sound_velocity = limit_velocity( ( State.location - properties.location ) / update_deltatime ); } // NOTE: velocity at this point can be either listener velocity for global sounds, actual sound velocity, or 0 if sound position is yet unknown ::alSourcefv( id, AL_VELOCITY, glm::value_ptr( sound_velocity ) ); @@ -311,7 +325,7 @@ openal_renderer::update( double const Deltatime ) { m_listenerposition = listenerposition; m_listenervelocity = ( glm::length( listenermovement ) < 1000.0 ? // large jumps are typically camera changes - listenermovement / Deltatime : + limit_velocity( listenermovement / Deltatime ) : glm::vec3() ); ::alListenerfv( AL_VELOCITY, reinterpret_cast( glm::value_ptr( m_listenervelocity ) ) ); } diff --git a/keyboardinput.h b/keyboardinput.h index 720dde3a..0e59b258 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -69,14 +69,14 @@ private: // members commandsetup_sequence m_commands; - user_command m_command; // last, if any, issued command + user_command m_command { user_command::none }; // last, if any, issued command usercommand_map m_bindings; command_relay m_relay; - bool m_shift{ false }; - bool m_ctrl{ false }; + bool m_shift { false }; + bool m_ctrl { false }; bindings_cache m_bindingscache; - glm::vec2 m_movementhorizontal; - float m_movementvertical; + glm::vec2 m_movementhorizontal { 0.f }; + float m_movementvertical { 0.f }; std::array m_keys; }; diff --git a/messaging.cpp b/messaging.cpp index 6dbc78bd..8d081b57 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -200,7 +200,7 @@ WyslijObsadzone() r.fPar[ 16 * i + 4 ] = vehicle->GetPosition().x; r.fPar[ 16 * i + 5 ] = vehicle->GetPosition().y; r.fPar[ 16 * i + 6 ] = vehicle->GetPosition().z; - r.iPar[ 16 * i + 7 ] = vehicle->Mechanik->GetAction(); + r.iPar[ 16 * i + 7 ] = static_cast( vehicle->Mechanik->GetAction() ); strcpy( r.cString + 64 * i + 32, vehicle->GetTrack()->IsolatedName().c_str() ); strcpy( r.cString + 64 * i + 48, vehicle->Mechanik->TrainName().c_str() ); i++; diff --git a/openglgeometrybank.h b/openglgeometrybank.h index f832bc2f..f83d575d 100644 --- a/openglgeometrybank.h +++ b/openglgeometrybank.h @@ -51,7 +51,7 @@ struct stream_units { std::vector texture { GL_TEXTURE0 }; // unit associated with main texture data stream. TODO: allow multiple units per stream }; -typedef std::vector vertex_array; +using vertex_array = std::vector; // generic geometry bank class, allows storage, update and drawing of geometry chunks @@ -130,7 +130,7 @@ protected: } }; - typedef std::vector geometrychunk_sequence; + using geometrychunk_sequence = std::vector; // methods inline @@ -182,21 +182,21 @@ private: bool is_good{ false }; // true if local content of the chunk matches the data on the opengl end }; - typedef std::vector chunkrecord_sequence; + using chunkrecord_sequence = std::vector; // methods: // create() subclass details void - create_( gfx::geometry_handle const &Geometry ); + create_( gfx::geometry_handle const &Geometry ) override; // replace() subclass details void - replace_( gfx::geometry_handle const &Geometry ); + replace_( gfx::geometry_handle const &Geometry ) override; // draw() subclass details void - draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ); + draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ) override; // release() subclass details void - release_(); + release_() override; void bind_buffer(); void @@ -237,21 +237,21 @@ private: unsigned int streams { 0 }; // stream combination used to generate the display list }; - typedef std::vector chunkrecord_sequence; + using chunkrecord_sequence = std::vector; // methods: // create() subclass details void - create_( gfx::geometry_handle const &Geometry ); + create_( gfx::geometry_handle const &Geometry ) override; // replace() subclass details void - replace_( gfx::geometry_handle const &Geometry ); + replace_( gfx::geometry_handle const &Geometry ) override; // draw() subclass details void - draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ); + draw_( gfx::geometry_handle const &Geometry, gfx::stream_units const &Units, unsigned int const Streams ) override; // release () subclass details void - release_(); + release_() override; void delete_list( gfx::geometry_handle const &Geometry ); @@ -262,7 +262,7 @@ private: // geometry bank manager, holds collection of geometry banks -typedef geometry_handle geometrybank_handle; +using geometrybank_handle = geometry_handle; class geometrybank_manager { @@ -302,11 +302,8 @@ public: private: // types: - typedef std::pair< - std::shared_ptr, - resource_timestamp > geometrybanktimepoint_pair; - - typedef std::deque< geometrybanktimepoint_pair > geometrybanktimepointpair_sequence; + using geometrybanktimepoint_pair = std::pair< std::shared_ptr, resource_timestamp >; + using geometrybanktimepointpair_sequence = std::deque< geometrybanktimepoint_pair >; // members: geometrybanktimepointpair_sequence m_geometrybanks; diff --git a/renderer.cpp b/renderer.cpp index 0be13091..808a5e75 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -2350,7 +2350,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { ::glPushMatrix(); if( Submodel->fMatrix ) ::glMultMatrixf( Submodel->fMatrix->readArray() ); - if( Submodel->b_Anim ) + if( Submodel->b_Anim != TAnimType::at_None ) Submodel->RaAnimation( Submodel->b_Anim ); } @@ -3169,7 +3169,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { ::glPushMatrix(); if( Submodel->fMatrix ) ::glMultMatrixf( Submodel->fMatrix->readArray() ); - if( Submodel->b_aAnim ) + if( Submodel->b_aAnim != TAnimType::at_None ) Submodel->RaAnimation( Submodel->b_aAnim ); } diff --git a/uart.cpp b/uart.cpp index c94f7b57..eaeada83 100644 --- a/uart.cpp +++ b/uart.cpp @@ -95,7 +95,7 @@ uart_input::recall_bindings() { auto const bindingtype { typelookup->second }; std::array bindingcommands { user_command::none, user_command::none }; - auto const commandcount { ( bindingtype == toggle ? 2 : 1 ) }; + auto const commandcount { ( bindingtype == input_type_t::toggle ? 2 : 1 ) }; for( int commandidx = 0; commandidx < commandcount; ++commandidx ) { // grab command(s) associated with the input pin auto const bindingcommandname { entryparser.getToken() }; @@ -166,14 +166,14 @@ void uart_input::poll() auto const type { std::get( entry ) }; auto const action { ( - type != impulse ? + type != input_type_t::impulse ? GLFW_PRESS : ( true == state ? GLFW_PRESS : GLFW_RELEASE ) ) }; auto const command { ( - type != toggle ? + type != input_type_t::toggle ? std::get<2>( entry ) : ( true == state ? std::get<2>( entry ) : diff --git a/uart.h b/uart.h index f4544110..b6e1dd6b 100644 --- a/uart.h +++ b/uart.h @@ -48,7 +48,7 @@ public: private: // types - enum input_type_t + enum class input_type_t { toggle, // two commands, each mapped to one state; press event on state change impulse, // one command; press event when set, release when cleared diff --git a/uilayer.cpp b/uilayer.cpp index 041b0f84..a7fd6ce4 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -276,7 +276,7 @@ ui_layer::update() { else if( mover->ActiveDir < 0 ) { uitextline2 += " R"; } else { uitextline2 += " N"; } - uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + std::to_string( mover->LocalBrakePos ) + ( mover->SlippingWheels ? " !" : " " ); + uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + to_string( mover->LocalBrakePosA * LocalBrakePosNo, 0 ) + ( mover->SlippingWheels ? " !" : " " ); uitextline4 = ( true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? @@ -472,7 +472,7 @@ ui_layer::update() { uitextline2 += ( vehicle->MoverParameters->OilPump.is_active ? "O" : ( vehicle->MoverParameters->OilPump.is_enabled ? "o" : "." ) ); uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); - uitextline2 += ( vehicle->MoverParameters->CompressorFlag ? "C" : ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorStart == start::automatic ) ? "c" : "." ) ) ); + uitextline2 += ( vehicle->MoverParameters->CompressorFlag ? "C" : ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorStart == start_t::automatic ) ? "c" : "." ) ) ); uitextline2 += ( vehicle->MoverParameters->CompressorGovernorLock ? "!" : "." ); auto const train { Global.pWorld->train() }; @@ -876,9 +876,9 @@ ui_layer::update() { uitextline2 = "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) - + "; HamP=" + std::to_string( vehicle->MoverParameters->LocalBrakePos ) + "/" + to_string( vehicle->MoverParameters->LocalBrakePosA, 2 ) + + "; HamP=" + to_string( vehicle->MoverParameters->LocalBrakePosA, 2 ) + "; NasJ=" + std::to_string( vehicle->MoverParameters->MainCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->MainCtrlActualPos ) + ")" - + ( ( vehicle->MoverParameters->ShuntMode && vehicle->MoverParameters->EngineType == DieselElectric ) ? + + ( ( vehicle->MoverParameters->ShuntMode && vehicle->MoverParameters->EngineType == TEngineType::DieselElectric ) ? "; NasB=" + to_string( vehicle->MoverParameters->AnPos, 2 ) : "; NasB=" + std::to_string( vehicle->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->ScndCtrlActualPos ) + ")" ) + "; I=" + @@ -943,7 +943,7 @@ ui_layer::update() { uitextline3 += " Vtrack " + to_string( vehicle->MoverParameters->RunningTrack.Velmax, 2 ); } - if( ( vehicle->MoverParameters->EnginePowerSource.SourceType == CurrentCollector ) + if( ( vehicle->MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) || ( vehicle->MoverParameters->TrainType == dt_EZT ) ) { uitextline3 += "; pant. " + to_string( vehicle->MoverParameters->PantPress, 2 ) @@ -971,7 +971,7 @@ ui_layer::update() { } // induction motor data - if( vehicle->MoverParameters->EngineType == ElectricInductionMotor ) { + if( vehicle->MoverParameters->EngineType == TEngineType::ElectricInductionMotor ) { UITable->text_lines.emplace_back( " eimc: eimv: press:", Global.UITextColor ); for( int i = 0; i <= 20; ++i ) { @@ -994,7 +994,7 @@ ui_layer::update() { UITable->text_lines.emplace_back( parameters, Global.UITextColor ); } } - if (vehicle->MoverParameters->EngineType == DieselEngine) { + if (vehicle->MoverParameters->EngineType == TEngineType::DieselEngine) { std::string parameters = "param value"; UITable->text_lines.emplace_back(parameters, Global.UITextColor); parameters = "efill: " + to_string(vehicle->MoverParameters->dizel_fill, 2, 9); diff --git a/utilities.h b/utilities.h index 089c2eb9..ff94ba34 100644 --- a/utilities.h +++ b/utilities.h @@ -307,8 +307,6 @@ nearest_segment_point( VecType_ const &Segmentstart, VecType_ const &Segmentend, return c1 / c2; } -class cParser; - -glm::dvec3 LoadPoint( cParser &Input ); +glm::dvec3 LoadPoint( class cParser &Input ); //--------------------------------------------------------------------------- From 387f396ecb6c2d0abe616dedbf5cca2202fdca19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Mon, 16 Jul 2018 18:46:07 +0200 Subject: [PATCH 365/426] Fix for EP/MED brake after LBP changes --- DynObj.cpp | 10 +++++----- McZapkie/MOVER.h | 3 ++- McZapkie/Mover.cpp | 6 ++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 053c7943..ee5920b6 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3206,20 +3206,20 @@ bool TDynamicObject::Update(double dt, double dt1) p->MoverParameters->Hamulec->GetFC( Nmax / (p->MoverParameters->NAxles * p->MoverParameters->NBpA), VelC) * 1000; // sila hamowania pn - p->MoverParameters->LocalBrakePosA = (p->MoverParameters->SlippingWheels ? 0 : FzEP[i] / FmaxPoj); - if (p->MoverParameters->LocalBrakePosA>0.009) + p->MoverParameters->LocalBrakePosAEIM = (p->MoverParameters->SlippingWheels ? 0 : FzEP[i] / FmaxPoj); + if (p->MoverParameters->LocalBrakePosAEIM>0.009) if (p->MoverParameters->P2FTrans * p->MoverParameters->BrakeCylMult[0] * p->MoverParameters->MaxBrakePress[0] != 0) { float x = (p->MoverParameters->BrakeSlckAdj / p->MoverParameters->BrakeCylMult[0] + p->MoverParameters->BrakeCylSpring) / (p->MoverParameters->P2FTrans * p->MoverParameters->MaxBrakePress[0]); - p->MoverParameters->LocalBrakePosA = x + (1 - x) * p->MoverParameters->LocalBrakePosA; + p->MoverParameters->LocalBrakePosAEIM = x + (1 - x) * p->MoverParameters->LocalBrakePosAEIM; } else - p->MoverParameters->LocalBrakePosA = p->MoverParameters->LocalBrakePosA; + p->MoverParameters->LocalBrakePosAEIM = p->MoverParameters->LocalBrakePosAEIM; else - p->MoverParameters->LocalBrakePosA = 0; + p->MoverParameters->LocalBrakePosAEIM = 0; ++i; } diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 426d3f6f..69801a14 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1025,7 +1025,8 @@ public: double BrakeCtrlPosR = 0.0; /*nastawa hamulca zespolonego - plynna dla FV4a*/ double BrakeCtrlPos2 = 0.0; /*nastawa hamulca zespolonego - kapturek dla FV4a*/ int ManualBrakePos = 0; /*nastawa hamulca recznego*/ - double LocalBrakePosA = 0.0; + double LocalBrakePosA = 0.0; /*nastawa hamulca pomocniczego*/ + double LocalBrakePosAEIM = 0.0; /*pozycja hamulca pomocniczego ep dla asynchronicznych ezt*/ /* int BrakeStatus = b_off; //0 - odham, 1 - ham., 2 - uszk., 4 - odluzniacz, 8 - antyposlizg, 16 - uzyte EP, 32 - pozycja R, 64 - powrot z R */ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 72b32c95..8b1b5c17 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3462,8 +3462,10 @@ void TMoverParameters::UpdatePipePressure(double dt) if ((BrakeCtrlPosNo > 1) /*&& (ActiveCab != 0)*/) // with BrakePressureTable[BrakeCtrlPos] do { - dpLocalValve = LocHandle->GetPF(LocalBrakePosA, Hamulec->GetBCP(), ScndPipePress, dt, 0); - + if ((EngineType != TEngineType::ElectricInductionMotor)) + dpLocalValve = LocHandle->GetPF(std::max(LocalBrakePosA, LocalBrakePosAEIM), Hamulec->GetBCP(), ScndPipePress, dt, 0); + else + dpLocalValve = LocHandle->GetPF(LocalBrakePosAEIM, Hamulec->GetBCP(), ScndPipePress, dt, 0); if( ( BrakeHandle == TBrakeHandle::FV4a ) && ( ( PipePress < 2.75 ) && ( ( Hamulec->GetStatus() & b_rls ) == 0 ) ) From cd10b72821d5bf3286e56e15e4ede1f6926d5dc5 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 19 Jul 2018 02:25:52 +0200 Subject: [PATCH 366/426] build 180718. ai slope logic tweaks, track grade ui indicator, minor bug fixes --- Driver.cpp | 125 +++++++++++++++++++++++++++++++--------------------- DynObj.h | 4 +- Train.cpp | 57 +++++++++++++----------- Train.h | 2 + uilayer.cpp | 11 +++-- utilities.h | 4 +- version.h | 2 +- 7 files changed, 121 insertions(+), 84 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 4a918991..26faab2f 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1410,16 +1410,24 @@ TController::braking_distance_multiplier( float const Targetvelocity ) const { if( Targetvelocity > 65.f ) { return 1.f; } if( Targetvelocity < 5.f ) { - + // HACK: engaged automatic transmission means extra/earlier braking effort is needed for the last leg before full stop if( ( mvOccupied->TrainType == dt_DMU ) && ( mvOccupied->Vel < 40.0 ) && ( Targetvelocity == 0.f ) ) { - // HACK: engaged automatic transmission means extra/earlier braking effort is needed for the last leg before full stop return interpolate( 2.f, 1.f, static_cast( mvOccupied->Vel / 40.0 ) ); } - else { - return 1.f; + // HACK: cargo trains or trains going downhill with high braking threshold need more distance to come to a full stop + if( ( fBrake_a0[ 0 ] > 0.2 ) + && ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) + || ( fAccGravity > 0.025 ) ) { + return interpolate( + 1.f, 3.f, + clamp( + ( fBrake_a0[ 0 ] - 0.2 ) / 0.2, + 0.0, 1.0 ) ); } + + return 1.f; } // stretch the braking distance up to 3 times; the lower the speed, the greater the stretch return interpolate( 3.f, 1.f, ( Targetvelocity - 5.f ) / 60.f ); @@ -1546,7 +1554,7 @@ TController::TController(bool AI, TDynamicObject *NewControll, bool InitPsyche, // fAccThreshold może podlegać uczeniu się - hamowanie powinno być rejestrowane, a potem analizowane // próg opóźnienia dla zadziałania hamulca fAccThreshold = ( - mvOccupied->TrainType == dt_EZT ? -0.6 : + mvOccupied->TrainType == dt_EZT ? -0.55 : mvOccupied->TrainType == dt_DMU ? -0.45 : -0.2 ); } @@ -1868,7 +1876,7 @@ void TController::AutoRewident() fBrake_a1[i+1] /= (12*fMass); } if( mvOccupied->TrainType == dt_EZT ) { - fAccThreshold = std::max(-fBrake_a0[BrakeAccTableSize] - 8 * fBrake_a1[BrakeAccTableSize], -0.6); + fAccThreshold = std::max(-fBrake_a0[BrakeAccTableSize] - 8 * fBrake_a1[BrakeAccTableSize], -0.55); fBrakeReaction = 0.25; } else if( mvOccupied->TrainType == dt_DMU ) { @@ -2744,12 +2752,12 @@ bool TController::IncSpeed() // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) if (Ready || (iDrivigFlags & movePress)) { // use series mode: - // to build up speed to 30/40 km/h for passenger/cargo train, + // to build up speed to 30/40 km/h for passenger/cargo train (less if going uphill, more if downhill) // if high threshold is set for motor overload relay, // if the power station is heavily burdened auto const useseriesmodevoltage { 0.80 * mvControlling->EnginePowerSource.CollectorParameters.MaxV }; auto const useseriesmode = ( - ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 35 : 25 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) ) + ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 35 : 25 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) + ( fAccGravity * 100 ) ) || ( mvControlling->Imax > mvControlling->ImaxLo ) || ( fVoltage < useseriesmodevoltage ) ); // when not in series mode use the first available parallel mode configuration until 50/60 km/h for passenger/cargo train @@ -3731,13 +3739,14 @@ TController::UpdateSituation(double dt) { if( ( dy = p->VectorFront().y ) != 0.0 ) { // istotne tylko dla pojazdów na pochyleniu // ciężar razy składowa styczna grawitacji - fAccGravity -= p->DirectionGet() * p->MoverParameters->TotalMassxg * dy; + fAccGravity -= p->MoverParameters->TotalMassxg * dy * ( p->DirectionGet() == iDirection ? 1 : -1 ); } p = p->Next(); // pojazd podłączony z tyłu (patrząc od czoła) } if( iDirection ) { // siłę generują pojazdy na pochyleniu ale działa ona całość składu, więc a=F/m - fAccGravity /= iDirection * fMass; + fAccGravity *= iDirection; + fAccGravity /= fMass; } if (!Ready) // v367: jeśli wg powyższych warunków skład nie jest odhamowany if (fAccGravity < -0.05) // jeśli ma pod górę na tyle, by się stoczyć @@ -4924,30 +4933,29 @@ TController::UpdateSituation(double dt) { // decisions based on current speed if( mvOccupied->CategoryFlag == 1 ) { - if( fAccGravity < 0.025 ) { - // on flats on uphill we can be less careful - if( vel > VelDesired ) { - // jesli jedzie za szybko do AKTUALNEGO - if( VelDesired == 0.0 ) { - // jesli stoj, to hamuj, ale i tak juz za pozno :) - AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie + // on flats or uphill we can be less careful + if( vel > VelDesired ) { + // jesli jedzie za szybko do AKTUALNEGO + if( VelDesired == 0.0 ) { + // jesli stoj, to hamuj, ale i tak juz za pozno :) + AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie + } + else { + // slow down, not full stop + if( vel > ( VelDesired + fVelPlus ) ) { + // hamuj tak średnio + AccDesired = std::min( AccDesired, -0.25 ); } else { - // slow down, not full stop - if( vel > ( VelDesired + fVelPlus ) ) { - // hamuj tak średnio - AccDesired = std::min( AccDesired, -0.25 ); - } - else { - // o 5 km/h to olej (zacznij luzować) - AccDesired = std::min( - AccDesired, // but don't override decceleration for VelNext - std::max( 0.0, AccPreferred ) ); - } + // o 5 km/h to olej (zacznij luzować) + AccDesired = std::min( + AccDesired, // but don't override decceleration for VelNext + std::max( 0.0, AccPreferred ) ); } } } - else { + + if( fAccGravity > 0.025 ) { // going sharply downhill we may need to start braking sooner than usual // try to estimate increase of current velocity before engaged brakes start working auto const speedestimate = vel + ( 1.0 - fBrake_a0[ 0 ] ) * 30.0 * AbsAccS; @@ -4958,20 +4966,39 @@ TController::UpdateSituation(double dt) { AccDesired = std::min( AccDesired, -0.85 ); // hamuj solidnie } else { - if( speedestimate > ( VelDesired + fVelPlus ) ) { - // if it looks like we'll exceed maximum allowed speed start thinking about slight slowing down - AccDesired = std::min( AccDesired, -0.25 ); - } - else { - // close enough to target to stop accelerating - AccDesired = std::min( - AccDesired, // but don't override decceleration for VelNext - interpolate( // ease off as you close to the target velocity - -0.06, AccPreferred, - clamp( speedestimate - vel, 0.0, fVelPlus ) / fVelPlus ) ); + // if it looks like we'll exceed maximum speed start thinking about slight slowing down + AccDesired = std::min( AccDesired, -0.25 ); + // HACK: for cargo trains with high braking threshold ensure we cross that threshold + if( ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) + && ( fBrake_a0[ 0 ] > 0.2 ) ) { + AccDesired -= clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 ); } } } + else { + // stop accelerating when close enough to target speed + AccDesired = std::min( + AccDesired, // but don't override decceleration for VelNext + interpolate( // ease off as you close to the target velocity + -0.06, AccPreferred, + clamp( VelDesired - speedestimate, 0.0, fVelMinus ) / fVelMinus ) ); + } + // final tweaks + if( vel > 0.1 ) { + // going downhill also take into account impact of gravity + AccDesired -= fAccGravity; + // HACK: if the max allowed speed was exceeded something went wrong; brake harder + AccDesired -= 0.15 * clamp( vel - VelDesired, 0.0, 5.0 ); +/* + if( ( vel > VelDesired ) + && ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) + && ( fBrake_a0[ 0 ] > 0.2 ) ) { + AccDesired = clamp( + AccDesired - clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 ), + -0.9, 0.9 ); + } +*/ + } } } else { @@ -5001,14 +5028,7 @@ TController::UpdateSituation(double dt) { // last step sanity check, until the whole calculation is straightened out AccDesired = std::min( AccDesired, AccPreferred ); - - if( ( mvOccupied->CategoryFlag == 1 ) - && ( fAccGravity > 0.025 ) ) { - // going downhill also take into account impact of gravity - AccDesired = clamp( AccDesired - fAccGravity, -0.9, 0.9 ); - } - - + AccDesired = clamp( AccDesired, -0.9, 0.9 ); if (AIControllFlag) { // część wykonawcza tylko dla AI, dla człowieka jedynie napisy @@ -5214,7 +5234,12 @@ TController::UpdateSituation(double dt) { if( mvOccupied->TrainType == dt_EZT ) { // właściwie, to warunek powinien być na działający EP // Ra: to dobrze hamuje EP w EZT - if( ( AccDesired <= fAccThreshold ) // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold + // HACK: when going downhill be more responsive to desired deceleration + auto const accthreshold { ( + fAccGravity < 0.025 ? + fAccThreshold : + std::max( -0.2, fAccThreshold ) ) }; + if( ( AccDesired <= accthreshold ) // jeśli hamować - u góry ustawia się hamowanie na fAccThreshold && ( ( AbsAccS > AccDesired ) || ( mvOccupied->BrakeCtrlPos < 0 ) ) ) { // hamować bardziej, gdy aktualne opóźnienie hamowania mniejsze niż (AccDesired) @@ -5242,7 +5267,7 @@ TController::UpdateSituation(double dt) { } // type & dt_ezt else { // a stara wersja w miarę dobrze działa na składy wagonowe - if( ( ( fAccGravity < -0.05 ) && ( vel < 0.0 ) ) + if( ( ( fAccGravity < -0.05 ) && ( vel < -0.1 ) ) // brake if uphill and slipping back || ( ( AccDesired < fAccGravity - 0.1 ) && ( AbsAccS > AccDesired + fBrake_a1[ 0 ] ) ) ) { // u góry ustawia się hamowanie na fAccThreshold if( ( fBrakeTime < 0.0 ) diff --git a/DynObj.h b/DynObj.h index 15803796..8d5f75f4 100644 --- a/DynObj.h +++ b/DynObj.h @@ -564,12 +564,12 @@ private: inline double ABuGetDirection() const { // ABu. return (Axle1.GetTrack() == MyTrack ? Axle1.GetDirection() : Axle0.GetDirection()); }; // zwraca kierunek pojazdu na torze z aktywną osą - inline double RaDirectionGet() { + inline double RaDirectionGet() const { return iAxleFirst ? Axle1.GetDirection() : Axle0.GetDirection(); }; // zwraca przesunięcie wózka względem Point1 toru z aktywną osią - inline double RaTranslationGet() { + inline double RaTranslationGet() const { return iAxleFirst ? Axle1.GetTranslation() : Axle0.GetTranslation(); }; diff --git a/Train.cpp b/Train.cpp index 47d43099..22e13a9c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -606,6 +606,28 @@ bool TTrain::is_eztoer() const { && ( mvControlled->ActiveDir != 0 ) ); // od yB } +// mover master controller to specified position +void TTrain::set_master_controller( double const Position ) { + + auto positionchange { + std::min( + Position, + ( mvControlled->CoupledCtrl ? + mvControlled->MainCtrlPosNo + mvControlled->ScndCtrlPosNo : + mvControlled->MainCtrlPosNo ) ) + - ( mvControlled->CoupledCtrl ? + mvControlled->MainCtrlPos + mvControlled->ScndCtrlPos : + mvControlled->MainCtrlPos ) }; + while( ( positionchange < 0 ) + && ( true == mvControlled->DecMainCtrl( 1 ) ) ) { + ++positionchange; + } + while( ( positionchange > 0 ) + && ( true == mvControlled->IncMainCtrl( 1 ) ) ) { + --positionchange; + } +} + // moves train brake lever to specified position, potentially emits switch sound if conditions are met void TTrain::set_train_brake( double const Position ) { @@ -746,22 +768,9 @@ void TTrain::OnCommand_mastercontrollerdecreasefast( TTrain *Train, command_data void TTrain::OnCommand_mastercontrollerset( TTrain *Train, command_data const &Command ) { - auto positionchange { - std::min( - Command.param1, - ( Train->mvControlled->CoupledCtrl ? - Train->mvControlled->MainCtrlPosNo + Train->mvControlled->ScndCtrlPosNo : - Train->mvControlled->MainCtrlPosNo ) ) - - ( Train->mvControlled->CoupledCtrl ? - Train->mvControlled->MainCtrlPos + Train->mvControlled->ScndCtrlPos : - Train->mvControlled->MainCtrlPos ) }; - while( ( positionchange < 0 ) - && ( true == Train->mvControlled->DecMainCtrl( 1 ) ) ) { - ++positionchange; - } - while( ( positionchange > 0 ) - && ( true == Train->mvControlled->IncMainCtrl( 1 ) ) ) { - --positionchange; + if( Command.action != GLFW_RELEASE ) { + // on press or hold + Train->set_master_controller( Command.param1 ); } } @@ -5099,16 +5108,12 @@ bool TTrain::Update( double const Deltatime ) if (ggMainCtrl.SubModel) { #ifdef _WIN32 - if ((DynamicObject->Mechanik != nullptr) - && (false == DynamicObject->Mechanik->AIControllFlag) // nie blokujemy AI - && (Global.iFeedbackMode == 4) - && (Global.fCalibrateIn[2][1] != 0.0)) { - auto const b = clamp( - Console::AnalogCalibrateGet(2) * mvOccupied->MainCtrlPosNo, - 0.0, - mvOccupied->MainCtrlPosNo); - while (mvOccupied->MainCtrlPos < b) { mvOccupied->MainCtrlPos = b - 1; mvOccupied->IncMainCtrl(1); } - while (mvOccupied->MainCtrlPos > b) { mvOccupied->MainCtrlPos = b + 1; mvOccupied->DecMainCtrl(1); } + if( ( DynamicObject->Mechanik != nullptr ) + && ( false == DynamicObject->Mechanik->AIControllFlag ) // nie blokujemy AI + && ( Global.iFeedbackMode == 4 ) + && ( Global.fCalibrateIn[ 2 ][ 1 ] != 0.0 ) ) { + + set_master_controller( Console::AnalogCalibrateGet( 2 ) * mvOccupied->MainCtrlPosNo ); } #endif diff --git a/Train.h b/Train.h index af61e8d4..14d1510f 100644 --- a/Train.h +++ b/Train.h @@ -132,6 +132,8 @@ class TTrain bool is_eztoer() const; // locates nearest vehicle belonging to the consist TDynamicObject *find_nearest_consist_vehicle() const; + // mover master controller to specified position + void set_master_controller( double const Position ); // moves train brake lever to specified position, potentially emits switch sound if conditions are met void set_train_brake( double const Position ); // sets specified brake acting speed for specified vehicle, potentially updating state of cab controls to match diff --git a/uilayer.cpp b/uilayer.cpp index a7fd6ce4..867a74ea 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -293,13 +293,18 @@ ui_layer::update() { uitextline2 += " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" + " (limit: " + std::to_string( speedlimit ) + " km/h"; - auto const nextspeedlimit { static_cast( std::floor( controlled->Mechanik->VelNext ) ) }; + auto const nextspeedlimit { static_cast( std::floor( driver->VelNext ) ) }; if( nextspeedlimit != speedlimit ) { uitextline2 += ", new limit: " + std::to_string( nextspeedlimit ) + " km/h" - + " in " + to_string( controlled->Mechanik->ActualProximityDist * 0.001, 1 ) + " km"; + + " in " + to_string( driver->ActualProximityDist * 0.001, 1 ) + " km"; } uitextline2 += ")"; + auto const reverser { ( mover->ActiveDir > 0 ? 1 : -1 ) }; + auto const grade { controlled->VectorFront().y * 100 * ( controlled->DirectionGet() == reverser ? 1 : -1 ) * reverser }; + if( std::abs( grade ) >= 0.25 ) { + uitextline2 += " Grade: " + to_string( grade, 1 ) + "%"; + } uitextline3 += " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; @@ -513,7 +518,7 @@ ui_layer::update() { + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : "" ); if( vehicle->Mechanik ) { - uitextline2 += "; Ag: " + to_string( vehicle->Mechanik->fAccGravity, 2 ); + uitextline2 += "; Ag: " + to_string( vehicle->Mechanik->fAccGravity, 2 ) + " (" + ( vehicle->Mechanik->fAccGravity > 0.01 ? "\\" : ( vehicle->Mechanik->fAccGravity < -0.01 ? "/" : "-" ) ) + ")"; } uitextline2 += diff --git a/utilities.h b/utilities.h index ff94ba34..6c188c40 100644 --- a/utilities.h +++ b/utilities.h @@ -254,14 +254,14 @@ template Type_ interpolate( Type_ const &First, Type_ const &Second, float const Factor ) { - return ( First * ( 1.0f - Factor ) ) + ( Second * Factor ); + return static_cast( ( First * ( 1.0f - Factor ) ) + ( Second * Factor ) ); } template Type_ interpolate( Type_ const &First, Type_ const &Second, double const Factor ) { - return ( First * ( 1.0 - Factor ) ) + ( Second * Factor ); + return static_cast( ( First * ( 1.0 - Factor ) ) + ( Second * Factor ) ); } // tests whether provided points form a degenerate triangle diff --git a/version.h b/version.h index 13967e6c..3272ba5f 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 708 +#define VERSION_MINOR 718 #define VERSION_REVISION 0 From 460bf6d382196c894e4f200e8f2e6d44bdeacf18 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 19 Jul 2018 22:11:22 +0200 Subject: [PATCH 367/426] ai braking logic tweaks and bug fixes --- Driver.cpp | 20 ++++++++++++++------ Train.cpp | 3 ++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 26faab2f..6d9c4430 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1421,7 +1421,7 @@ TController::braking_distance_multiplier( float const Targetvelocity ) const { && ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) || ( fAccGravity > 0.025 ) ) { return interpolate( - 1.f, 3.f, + 1.f, 2.f, clamp( ( fBrake_a0[ 0 ] - 0.2 ) / 0.2, 0.0, 1.0 ) ); @@ -2680,7 +2680,7 @@ bool TController::DecBrake() } } if (!OK) - OK = mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); + OK = mvOccupied->DecLocalBrakeLevel(2); if (mvOccupied->PipePress < 3.0) Need_BrakeRelease = true; break; @@ -2704,7 +2704,7 @@ bool TController::DecBrake() else OK = false; if (!OK) - OK = mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); + OK = mvOccupied->DecLocalBrakeLevel(2); break; } return OK; @@ -2752,12 +2752,12 @@ bool TController::IncSpeed() // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) if (Ready || (iDrivigFlags & movePress)) { // use series mode: - // to build up speed to 30/40 km/h for passenger/cargo train (less if going uphill, more if downhill) + // to build up speed to 30/40 km/h for passenger/cargo train (10 km/h less if going uphill) // if high threshold is set for motor overload relay, // if the power station is heavily burdened auto const useseriesmodevoltage { 0.80 * mvControlling->EnginePowerSource.CollectorParameters.MaxV }; auto const useseriesmode = ( - ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 35 : 25 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) + ( fAccGravity * 100 ) ) + ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 35 : 25 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) - ( ( fAccGravity < -0.025 ) ? 10 : 0 ) ) || ( mvControlling->Imax > mvControlling->ImaxLo ) || ( fVoltage < useseriesmodevoltage ) ); // when not in series mode use the first available parallel mode configuration until 50/60 km/h for passenger/cargo train @@ -4301,6 +4301,10 @@ TController::UpdateSituation(double dt) { // additional safety margin for cargo consists fMinProximityDist *= 2.0; fMaxProximityDist *= 2.0; + if( fBrake_a0[ 0 ] >= 0.35 ) { + // cargo trains with high braking threshold may require even larger safety margin + fMaxProximityDist += 20.0; + } } } fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania @@ -4335,7 +4339,11 @@ TController::UpdateSituation(double dt) { if( mvOccupied->BrakeDelayFlag == bdelay_G ) { // increase distances for cargo trains to take into account slower reaction to brakes fMinProximityDist += 10.0; - fMaxProximityDist += 10.0; + fMaxProximityDist += 15.0; + if( fBrake_a0[ 0 ] >= 0.35 ) { + // cargo trains with high braking threshold may require even larger safety margin + fMaxProximityDist += 20.0; + } } } else { diff --git a/Train.cpp b/Train.cpp index 22e13a9c..88b1bbb4 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4365,7 +4365,8 @@ bool TTrain::Update( double const Deltatime ) // Odskakiwanie hamulce EP if( false == ( ( input::command == user_command::trainbrakeset ) - || ( input::command == user_command::trainbrakedecrease ) ) ) { + || ( input::command == user_command::trainbrakedecrease ) + || ( input::command == user_command::trainbrakecharging ) ) ) { set_train_brake( 0 ); } } From ff6bed67a95780cf5decff112c72b7775c6ee5cc Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 2 Aug 2018 20:39:19 +0200 Subject: [PATCH 368/426] refactoring: application mode code split --- AnimModel.cpp | 3 +- AnimModel.h | 2 +- Camera.cpp | 8 +- Camera.h | 2 +- Classes.h | 8 +- Console.cpp | 3 +- Driver.cpp | 9 +- DynObj.cpp | 13 +- Event.cpp | 12 +- Globals.cpp | 7 +- Globals.h | 3 +- McZapkie/MOVER.h | 8 +- McZapkie/Mover.cpp | 8 +- MemCell.cpp | 2 + Model3d.cpp | 5 +- Model3d.h | 2 +- Segment.cpp | 25 +- Segment.h | 2 + Track.cpp | 5 + Track.h | 2 +- Traction.cpp | 1 + Train.cpp | 2 + TrkFoll.cpp | 2 + application.cpp | 303 ++++--- application.h | 44 +- applicationmode.h | 67 ++ combustionengine.cpp | 13 + combustionengine.h | 20 + driverkeyboardinput.cpp | 215 +++++ driverkeyboardinput.h | 27 + drivermode.cpp | 1007 +++++++++++++++++++++++ drivermode.h | 87 ++ mouseinput.cpp => drivermouseinput.cpp | 19 +- mouseinput.h => drivermouseinput.h | 3 + driveruilayer.cpp | 904 +++++++++++++++++++++ driveruilayer.h | 36 + dumb3d.h | 9 +- editorkeyboardinput.cpp | 37 + editorkeyboardinput.h | 27 + editormode.cpp | 278 +++++++ editormode.h | 84 ++ editormouseinput.cpp | 55 ++ editormouseinput.h | 44 + editoruilayer.cpp | 205 +++++ editoruilayer.h | 39 + keyboardinput.cpp | 453 ++--------- keyboardinput.h | 67 +- maszyna.vcxproj.filters | 194 +++-- messaging.cpp | 163 ++++ messaging.h | 2 + World.cpp => old/World.cpp | 0 World.h => old/World.h | 0 renderer.cpp | 65 +- renderer.h | 2 +- scenarioloadermode.cpp | 79 ++ scenarioloadermode.h | 41 + scenarioloaderuilayer.h | 17 + scene.cpp | 3 + sceneeditor.cpp | 124 +-- sceneeditor.h | 64 +- simulation.cpp | 930 +-------------------- simulation.h | 68 +- simulationenvironment.cpp | 158 ++++ simulationenvironment.h | 52 ++ simulationstateserializer.cpp | 934 +++++++++++++++++++++ simulationstateserializer.h | 64 ++ sound.cpp | 14 +- uart.cpp | 4 +- uilayer.cpp | 1033 +----------------------- uilayer.h | 56 +- utilities.cpp | 44 +- utilities.h | 2 +- version.h | 2 +- windows.cpp | 4 +- 74 files changed, 5375 insertions(+), 2921 deletions(-) create mode 100644 applicationmode.h create mode 100644 combustionengine.cpp create mode 100644 combustionengine.h create mode 100644 driverkeyboardinput.cpp create mode 100644 driverkeyboardinput.h create mode 100644 drivermode.cpp create mode 100644 drivermode.h rename mouseinput.cpp => drivermouseinput.cpp (98%) rename mouseinput.h => drivermouseinput.h (95%) create mode 100644 driveruilayer.cpp create mode 100644 driveruilayer.h create mode 100644 editorkeyboardinput.cpp create mode 100644 editorkeyboardinput.h create mode 100644 editormode.cpp create mode 100644 editormode.h create mode 100644 editormouseinput.cpp create mode 100644 editormouseinput.h create mode 100644 editoruilayer.cpp create mode 100644 editoruilayer.h rename World.cpp => old/World.cpp (100%) rename World.h => old/World.h (100%) create mode 100644 scenarioloadermode.cpp create mode 100644 scenarioloadermode.h create mode 100644 scenarioloaderuilayer.h create mode 100644 simulationenvironment.cpp create mode 100644 simulationenvironment.h create mode 100644 simulationstateserializer.cpp create mode 100644 simulationstateserializer.h diff --git a/AnimModel.cpp b/AnimModel.cpp index 62d0b5e0..b4b40cf0 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "MdlMngr.h" #include "simulation.h" #include "simulationtime.h" +#include "event.h" #include "Globals.h" #include "Timer.h" #include "Logs.h" @@ -610,7 +611,7 @@ void TAnimModel::RaPrepare() if (LightsOff[i]) LightsOff[i]->iVisible = !state; } - TSubModel::iInstance = (size_t)this; //żeby nie robić cudzych animacji + TSubModel::iInstance = reinterpret_cast( this ); //żeby nie robić cudzych animacji TSubModel::pasText = &asText; // przekazanie tekstu do wyświetlacza (!!!! do przemyślenia) if (pAdvanced) // jeśli jest zaawansowana animacja Advanced(); // wykonać co tam trzeba diff --git a/AnimModel.h b/AnimModel.h index 626386ba..16f3a558 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -125,7 +125,7 @@ class TAnimAdvanced class TAnimModel : public scene::basic_node { friend opengl_renderer; - friend ui_layer; + friend editor_ui; public: // constructors diff --git a/Camera.cpp b/Camera.cpp index f1e077ca..47272eb3 100644 --- a/Camera.cpp +++ b/Camera.cpp @@ -18,16 +18,16 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- -void TCamera::Init( Math3D::vector3 NPos, Math3D::vector3 NAngle) { +void TCamera::Init( Math3D::vector3 const &NPos, Math3D::vector3 const &NAngle, TCameraType const NType ) { - vUp = Math3D::vector3(0, 1, 0); - Velocity = Math3D::vector3(0, 0, 0); + vUp = { 0, 1, 0 }; + Velocity = { 0, 0, 0 }; Pitch = NAngle.x; Yaw = NAngle.y; Roll = NAngle.z; Pos = NPos; - Type = (Global.bFreeFly ? TCameraType::tp_Free : TCameraType::tp_Follow); + Type = NType; }; void TCamera::Reset() { diff --git a/Camera.h b/Camera.h index 792f488d..b2792b18 100644 --- a/Camera.h +++ b/Camera.h @@ -23,7 +23,7 @@ enum class TCameraType class TCamera { public: // McZapkie: potrzebuje do kiwania na boki - void Init( Math3D::vector3 NPos, Math3D::vector3 NAngle); + void Init( Math3D::vector3 const &Location, Math3D::vector3 const &Angle, TCameraType const Type ); void Reset(); void OnCursorMove(double const x, double const y); bool OnCommand( command_data const &Command ); diff --git a/Classes.h b/Classes.h index e146f462..e1c3d2b5 100644 --- a/Classes.h +++ b/Classes.h @@ -28,11 +28,17 @@ class sound_source; class TEventLauncher; class TTraction; // drut class TTractionPowerSource; // zasilanie drutów -class TWorld; class TCamera; class scenario_time; class TMoverParameters; class ui_layer; +class editor_ui; +class event_manager; +class memory_table; +class powergridsource_table; +class instance_table; +class vehicle_table; +struct light_array; namespace scene { struct node_data; diff --git a/Console.cpp b/Console.cpp index 6de96f69..42e536f6 100644 --- a/Console.cpp +++ b/Console.cpp @@ -89,8 +89,7 @@ Console::Console() Console::~Console() { - delete PoKeys55[0]; - delete PoKeys55[1]; + Console::Off(); }; void Console::ModeSet(int m, int h) diff --git a/Driver.cpp b/Driver.cpp index 6d9c4430..2e9baffd 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -18,11 +18,12 @@ http://mozilla.org/MPL/2.0/. #include #include "Globals.h" #include "Logs.h" +#include "train.h" #include "mtable.h" #include "DynObj.h" #include "Event.h" #include "MemCell.h" -#include "world.h" +#include "simulation.h" #include "simulationtime.h" #include "track.h" #include "station.h" @@ -1725,7 +1726,11 @@ void TController::Activation() } if (pVehicle != old) { // jeśli zmieniony został pojazd prowadzony - Global.pWorld->CabChange(old, pVehicle); // ewentualna zmiana kabiny użytkownikowi + if( ( simulation::Train ) + && ( simulation::Train->Dynamic() == old ) ) { + // ewentualna zmiana kabiny użytkownikowi + Global.changeDynObj = pVehicle; // uruchomienie protezy + } ControllingSet(); // utworzenie połączenia do sterowanego pojazdu (może się zmienić) - // silnikowy dla EZT } diff --git a/DynObj.cpp b/DynObj.cpp index ee5920b6..f6b98ae2 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -16,15 +16,17 @@ http://mozilla.org/MPL/2.0/. #include "DynObj.h" #include "simulation.h" -#include "world.h" #include "train.h" +#include "driver.h" #include "Globals.h" #include "Timer.h" #include "logs.h" #include "Console.h" #include "MdlMngr.h" +#include "model3d.h" #include "renderer.h" #include "uitranscripts.h" +#include "messaging.h" // Ra: taki zapis funkcjonuje lepiej, ale może nie jest optymalny #define vWorldFront Math3D::vector3(0, 0, 1) @@ -4305,7 +4307,7 @@ void TDynamicObject::RenderSounds() { FreeFlyModeFlag ? true : // in external view all vehicles emit outer noise // Global.pWorld->train() == nullptr ? true : // (can skip this check, with no player train the external view is a given) ctOwner == nullptr ? true : // standalone vehicle, can't be part of user-driven train - ctOwner != Global.pWorld->train()->Dynamic()->ctOwner ? true : // confirmed isn't a part of the user-driven train + ctOwner != simulation::Train->Dynamic()->ctOwner ? true : // confirmed isn't a part of the user-driven train Global.CabWindowOpen ? true : // sticking head out we get to hear outer noise false ) ) { @@ -6994,8 +6996,11 @@ vehicle_table::erase_disabled() { && ( true == vehicle->MyTrack->RemoveDynamicObject( vehicle ) ) ) { vehicle->MyTrack = nullptr; } - // clear potential train binding - Global.pWorld->TrainDelete( vehicle ); + if( simulation::Train->Dynamic() == vehicle ) { + // clear potential train binding + // TBD, TODO: manually eject the driver first ? + SafeDelete( simulation::Train ); + } // remove potential entries in the light array simulation::Lights.remove( vehicle ); /* diff --git a/Event.cpp b/Event.cpp index b639a72d..13646dd3 100644 --- a/Event.cpp +++ b/Event.cpp @@ -17,8 +17,16 @@ http://mozilla.org/MPL/2.0/. #include "event.h" #include "simulation.h" -#include "world.h" +#include "messaging.h" #include "globals.h" +#include "memcell.h" +#include "track.h" +#include "traction.h" +#include "tractionpower.h" +#include "sound.h" +#include "animmodel.h" +#include "dynobj.h" +#include "driver.h" #include "timer.h" #include "logs.h" @@ -1207,7 +1215,7 @@ event_manager::CheckQuery() { } case 1: { if( m_workevent->Params[ 1 ].asdouble > 0.0 ) { - Global.pWorld->radio_message( + simulation::radio_message( m_workevent->Params[ 9 ].tsTextSound, static_cast( m_workevent->Params[ 1 ].asdouble ) ); } diff --git a/Globals.cpp b/Globals.cpp index df17cb64..10b63e7b 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -14,8 +14,9 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "globals.h" -#include "world.h" #include "simulation.h" +#include "simulationenvironment.h" +#include "driver.h" #include "logs.h" #include "Console.h" #include "PyInt.h" @@ -94,7 +95,7 @@ global_settings::ConfigParse(cParser &Parser) { { // Mczapkie-130302 Parser.getTokens(); - Parser >> bFreeFly; + Parser >> FreeFlyModeFlag; Parser.getTokens(3, false); Parser >> FreeCameraInit[0].x, @@ -298,7 +299,7 @@ global_settings::ConfigParse(cParser &Parser) { std::tm *localtime = std::localtime(&timenow); fMoveLight = localtime->tm_yday + 1; // numer bieżącego dnia w roku } - pWorld->compute_season( fMoveLight ); + simulation::Environment.compute_season( fMoveLight ); } else if( token == "dynamiclights" ) { // number of dynamic lights in the scene diff --git a/Globals.h b/Globals.h index b924df68..f542aac1 100644 --- a/Globals.h +++ b/Globals.h @@ -25,8 +25,8 @@ struct global_settings { bool altState{ false }; std::mt19937 random_engine{ std::mt19937( static_cast( std::time( NULL ) ) ) }; TDynamicObject *changeDynObj{ nullptr };// info o zmianie pojazdu - TWorld *pWorld{ nullptr }; // wskaźnik na świat do usuwania pojazdów TCamera *pCamera{ nullptr }; // parametry kamery + TCamera *pDebugCamera{ nullptr }; Math3D::vector3 pCameraPosition; // pozycja kamery w świecie Math3D::vector3 DebugCameraPosition; // pozycja kamery w świecie std::vector FreeCameraInit; // pozycje kamery @@ -64,7 +64,6 @@ struct global_settings { unsigned int DisabledLogTypes{ 0 }; // simulation bool RealisticControlMode{ false }; // controls ability to steer the vehicle from outside views - bool bFreeFly{ false }; bool bEnableTraction{ true }; float fFriction{ 1.f }; // mnożnik tarcia - KURS90 bool bLiveTraction{ true }; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 69801a14..17b27181 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1294,7 +1294,7 @@ public: void ComputeConstans(void);//ABu: wczesniejsze wyznaczenie stalych dla liczenia sil double ComputeMass(void); void ComputeTotalForce(double dt, double dt1, bool FullVer); - double Adhesive(double staticfriction); + double Adhesive(double staticfriction) const; double TractionForce(double dt); double FrictionForce(double R, int TDamage); double BrakeForceR(double ratio, double velocity); @@ -1327,8 +1327,8 @@ public: bool FuseOn(void); //bezpiecznik nadamiary bool FuseFlagCheck(void); // sprawdzanie flagi nadmiarowego void FuseOff(void); // wylaczenie nadmiarowego - double ShowCurrent( int AmpN ); //pokazuje bezwgl. wartosc pradu na wybranym amperomierzu - double ShowCurrentP(int AmpN); //pokazuje bezwgl. wartosc pradu w wybranym pojezdzie //Q 20160722 + double ShowCurrent( int AmpN ) const; //pokazuje bezwgl. wartosc pradu na wybranym amperomierzu + double ShowCurrentP(int AmpN) const; //pokazuje bezwgl. wartosc pradu w wybranym pojezdzie //Q 20160722 /*!o pokazuje bezwgl. wartosc obrotow na obrotomierzu jednego z 3 pojazdow*/ /*function ShowEngineRotation(VehN:int): integer; //Ra 2014-06: przeniesione do C++*/ @@ -1374,7 +1374,7 @@ public: /*funkcje ladujace pliki opisujace pojazd*/ bool LoadFIZ(std::string chkpath); //Q 20160717 bool LoadChkFile(std::string chkpath); bool CheckLocomotiveParameters( bool ReadyFlag, int Dir ); - std::string EngineDescription( int what ); + std::string EngineDescription( int what ) const; private: void LoadFIZ_Param( std::string const &line ); void LoadFIZ_Load( std::string const &line ); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 8b1b5c17..7289e340 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1629,7 +1629,7 @@ void TMoverParameters::OilPumpCheck( double const Timestep ) { } -double TMoverParameters::ShowCurrent(int AmpN) +double TMoverParameters::ShowCurrent(int AmpN) const { // Odczyt poboru prądu na podanym amperomierzu switch (EngineType) { @@ -4124,7 +4124,7 @@ double TMoverParameters::FrictionForce(double R, int TDamage) // Q: 20160713 // Oblicza przyczepność // ************************************************************************************************* -double TMoverParameters::Adhesive(double staticfriction) +double TMoverParameters::Adhesive(double staticfriction) const { double adhesion = 0.0; const double adh_factor = 0.25; //współczynnik określający, jak bardzo spada tarcie przy poślizgu @@ -6763,7 +6763,7 @@ bool TMoverParameters::ChangeOffsetH(double DeltaOffset) // Q: 20160713 // Testuje zmienną (narazie tylko 0) i na podstawie uszkodzenia zwraca informację tekstową // ************************************************************************************************* -std::string TMoverParameters::EngineDescription(int what) +std::string TMoverParameters::EngineDescription(int what) const { std::string outstr { "OK" }; switch (what) { @@ -9599,7 +9599,7 @@ bool TMoverParameters::RunInternalCommand() // Q: 20160714 // Zwraca wartość natężenia prądu na wybranym amperomierzu. Podfunkcja do ShowCurrent. // ************************************************************************************************* -double TMoverParameters::ShowCurrentP(int AmpN) +double TMoverParameters::ShowCurrentP(int AmpN) const { int b, Bn; bool Grupowy; diff --git a/MemCell.cpp b/MemCell.cpp index 0fab54cc..b958d37e 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -17,6 +17,8 @@ http://mozilla.org/MPL/2.0/. #include "memcell.h" #include "simulation.h" +#include "driver.h" +#include "event.h" #include "logs.h" //--------------------------------------------------------------------------- diff --git a/Model3d.cpp b/Model3d.cpp index 26b3e3b3..60243a7d 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -20,6 +20,7 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others #include "utilities.h" #include "renderer.h" #include "Timer.h" +#include "simulation.h" #include "simulationtime.h" #include "mtable.h" #include "sn_utils.h" @@ -28,7 +29,7 @@ Copyright (C) 2001-2004 Marcin Wozniak, Maciej Czapkiewicz and others using namespace Mtable; float TSubModel::fSquareDist = 0.f; -size_t TSubModel::iInstance; // numer renderowanego egzemplarza obiektu +std::uintptr_t TSubModel::iInstance; // numer renderowanego egzemplarza obiektu texture_handle const *TSubModel::ReplacableSkinId = NULL; int TSubModel::iAlpha = 0x30300030; // maska do testowania flag tekstur wymiennych TModel3d *TSubModel::pRoot; // Ra: tymczasowo wskaźnik na model widoczny z submodelu @@ -1191,7 +1192,7 @@ TSubModel::offset( float const Geometrytestoffsetthreshold ) const { if( true == TestFlag( iFlags, 0x0200 ) ) { // flip coordinates for t3d file which wasn't yet initialized - if( ( false == Global.pWorld->InitPerformed() ) + if( ( false == simulation::is_ready ) || ( false == Vertices.empty() ) ) { // NOTE, HACK: results require flipping if the model wasn't yet initialized, so we're using crude method to detect possible cases // TODO: sort out this mess, either unify offset lookups to take place before (or after) initialization, diff --git a/Model3d.h b/Model3d.h index d2c8d17b..6ae4b2f3 100644 --- a/Model3d.h +++ b/Model3d.h @@ -135,7 +135,7 @@ public: // chwilowo float3 v_TransVector { 0.0f, 0.0f, 0.0f }; gfx::vertex_array Vertices; float m_boundingradius { 0 }; - size_t iAnimOwner{ 0 }; // roboczy numer egzemplarza, który ustawił animację + std::uintptr_t iAnimOwner{ 0 }; // roboczy numer egzemplarza, który ustawił animację TAnimType b_aAnim{ TAnimType::at_None }; // kody animacji oddzielnie, bo zerowane float4x4 *mAnimMatrix{ nullptr }; // macierz do animacji kwaternionowych (należy do AnimContainer) TSubModel **smLetter{ nullptr }; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) diff --git a/Segment.cpp b/Segment.cpp index 5d117c14..5f2e16b4 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -203,16 +203,15 @@ double TSegment::GetTFromS(double const s) const // initial guess for Newton's method double fTolerance = 0.001; double fRatio = s / RombergIntegral(0, 1); - double fOmRatio = 1.0 - fRatio; - double fTime = fOmRatio * 0 + fRatio * 1; - int iteration = 0; + double fTime = interpolate( 0.0, 1.0, fRatio ); + int iteration = 0; + double fDifference {}; // exposed for debug down the road do { - double fDifference = RombergIntegral(0, fTime) - s; + fDifference = RombergIntegral(0, fTime) - s; if( std::abs( fDifference ) < fTolerance ) { return fTime; } - fTime -= fDifference / GetFirstDerivative(fTime).Length(); ++iteration; } @@ -323,7 +322,7 @@ Math3D::vector3 TSegment::FastGetDirection(double fDistance, double fOffset) return (Point2 - CPointIn); // wektor na końcu jest stały return (FastGetPoint(t2) - FastGetPoint(t1)); } - +/* Math3D::vector3 TSegment::GetPoint(double const fDistance) const { // wyliczenie współrzędnych XYZ na torze w odległości (fDistance) od Point1 if (bCurve) @@ -332,13 +331,17 @@ Math3D::vector3 TSegment::GetPoint(double const fDistance) const // return Interpolate(t,Point1,CPointOut,CPointIn,Point2); return RaInterpolate(t); } - else - { // wyliczenie dla odcinka prostego jest prostsze - double t = fDistance / fLength; // zerowych torów nie ma - return ((1.0 - t) * Point1 + (t)*Point2); + else { + // wyliczenie dla odcinka prostego jest prostsze + return + interpolate( + Point1, Point2, + clamp( + fDistance / fLength, + 0.0, 1.0 ) ); } }; - +*/ // ustalenie pozycji osi na torze, przechyłki, pochylenia i kierunku jazdy void TSegment::RaPositionGet(double const fDistance, Math3D::vector3 &p, Math3D::vector3 &a) const { diff --git a/Segment.h b/Segment.h index 9410a2f7..81970cd9 100644 --- a/Segment.h +++ b/Segment.h @@ -88,8 +88,10 @@ public: return CPointOut; }; Math3D::vector3 FastGetDirection(double const fDistance, double const fOffset); +/* Math3D::vector3 GetPoint(double const fDistance) const; +*/ void RaPositionGet(double const fDistance, Math3D::vector3 &p, Math3D::vector3 &a) const; Math3D::vector3 diff --git a/Track.cpp b/Track.cpp index 375b270c..31787522 100644 --- a/Track.cpp +++ b/Track.cpp @@ -17,6 +17,11 @@ http://mozilla.org/MPL/2.0/. #include "simulation.h" #include "globals.h" +#include "event.h" +#include "messaging.h" +#include "dynobj.h" +#include "animmodel.h" +#include "track.h" #include "timer.h" #include "logs.h" #include "renderer.h" diff --git a/Track.h b/Track.h index 160fad5a..4218ef0e 100644 --- a/Track.h +++ b/Track.h @@ -128,7 +128,7 @@ class TTrack : public scene::basic_node { friend opengl_renderer; // NOTE: temporary arrangement - friend ui_layer; + friend editor_ui; private: TIsolated * pIsolated = nullptr; // obwód izolowany obsługujący zajęcia/zwolnienia grupy torów diff --git a/Traction.cpp b/Traction.cpp index 5356c4d5..71ec2aee 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -17,6 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation.h" #include "Globals.h" +#include "tractionpower.h" #include "logs.h" #include "renderer.h" diff --git a/Train.cpp b/Train.cpp index 88b1bbb4..69ffef85 100644 --- a/Train.cpp +++ b/Train.cpp @@ -21,8 +21,10 @@ http://mozilla.org/MPL/2.0/. #include "camera.h" #include "Logs.h" #include "MdlMngr.h" +#include "model3d.h" #include "Timer.h" #include "Driver.h" +#include "dynobj.h" #include "mtable.h" #include "Console.h" diff --git a/TrkFoll.cpp b/TrkFoll.cpp index 37029750..b1bfab6c 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -18,6 +18,8 @@ http://mozilla.org/MPL/2.0/. #include "simulation.h" #include "Globals.h" +#include "dynobj.h" +#include "driver.h" #include "Logs.h" TTrackFollower::~TTrackFollower() diff --git a/application.cpp b/application.cpp index 4bbca8a0..6c457219 100644 --- a/application.cpp +++ b/application.cpp @@ -9,14 +9,13 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "application.h" +#include "scenarioloadermode.h" +#include "drivermode.h" +#include "editormode.h" #include "globals.h" -#include "keyboardinput.h" -#include "mouseinput.h" -#include "gamepadinput.h" -#include "console.h" #include "simulation.h" -#include "world.h" +#include "train.h" #include "pyint.h" #include "sceneeditor.h" #include "renderer.h" @@ -45,17 +44,7 @@ http://mozilla.org/MPL/2.0/. eu07_application Application; -namespace input { - -gamepad_input Gamepad; -mouse_input Mouse; -glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode -keyboard_input Keyboard; -Console console; -std::unique_ptr uart; -user_command command; // currently issued control command, if any - -} +ui_layer uilayerstaticinitializer; #ifdef _WIN32 extern "C" @@ -71,6 +60,14 @@ extern WNDPROC BaseWindowProc; // user input callbacks +void focus_callback( GLFWwindow *window, int focus ) { + if( Global.bInactivePause ) // jeśli ma być pauzowanie okna w tle + if( focus ) + Global.iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie + else + Global.iPause |= 4; // włączenie pauzy, gdy nieaktywy +} + void window_resize_callback( GLFWwindow *window, int w, int h ) { // NOTE: we have two variables which basically do the same thing as we don't have dynamic fullscreen toggle // TBD, TODO: merge them? @@ -81,101 +78,23 @@ void window_resize_callback( GLFWwindow *window, int w, int h ) { } void cursor_pos_callback( GLFWwindow *window, double x, double y ) { - if( false == Global.ControlPicking ) { - glfwSetCursorPos( window, 0, 0 ); - } - // give the potential event recipient a shot at it, in the virtual z order - if( true == scene::Editor.on_mouse_move( x, y ) ) { return; } - input::Mouse.move( x, y ); + Application.on_cursor_pos( x, y ); } void mouse_button_callback( GLFWwindow* window, int button, int action, int mods ) { - if( ( button != GLFW_MOUSE_BUTTON_LEFT ) - && ( button != GLFW_MOUSE_BUTTON_RIGHT ) ) { - // we don't care about other mouse buttons at the moment - return; - } - // give the potential event recipient a shot at it, in the virtual z order - if( true == scene::Editor.on_mouse_button( button, action ) ) { return; } - input::Mouse.button( button, action ); -} - -void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) { - - Global.shiftState = ( mods & GLFW_MOD_SHIFT ) ? true : false; - Global.ctrlState = ( mods & GLFW_MOD_CONTROL ) ? true : false; - Global.altState = ( mods & GLFW_MOD_ALT ) ? true : false; - - // give the ui first shot at the input processing... - if( true == UILayer.on_key( key, action ) ) { return; } - if( true == scene::Editor.on_key( key, action ) ) { return; } - // ...if the input is left untouched, pass it on - input::Keyboard.key( key, action ); - - if( ( true == Global.InputMouse ) - && ( ( key == GLFW_KEY_LEFT_ALT ) - || ( key == GLFW_KEY_RIGHT_ALT ) ) ) { - // if the alt key was pressed toggle control picking mode and set matching cursor behaviour - if( action == GLFW_RELEASE ) { - - if( Global.ControlPicking ) { - // switch off - Application.get_cursor_pos( input::mouse_pickmodepos.x, input::mouse_pickmodepos.y ); - Application.set_cursor( GLFW_CURSOR_DISABLED ); - Application.set_cursor_pos( 0, 0 ); - } - else { - // enter picking mode - Application.set_cursor_pos( input::mouse_pickmodepos.x, input::mouse_pickmodepos.y ); - Application.set_cursor( GLFW_CURSOR_NORMAL ); - } - // actually toggle the mode - Global.ControlPicking = !Global.ControlPicking; - } - } - - if( ( key == GLFW_KEY_LEFT_SHIFT ) - || ( key == GLFW_KEY_LEFT_CONTROL ) - || ( key == GLFW_KEY_LEFT_ALT ) - || ( key == GLFW_KEY_RIGHT_SHIFT ) - || ( key == GLFW_KEY_RIGHT_CONTROL ) - || ( key == GLFW_KEY_RIGHT_ALT ) ) { - // don't bother passing these - return; - } - - if( action == GLFW_PRESS || action == GLFW_REPEAT ) { - - World.OnKeyDown( key ); - -#ifdef CAN_I_HAS_LIBPNG - switch( key ) { - case GLFW_KEY_PRINT_SCREEN: { - make_screenshot(); - break; - } - default: { break; } - } -#endif - } -} - -void focus_callback( GLFWwindow *window, int focus ) { - if( Global.bInactivePause ) // jeśli ma być pauzowanie okna w tle - if( focus ) - Global.iPause &= ~4; // odpauzowanie, gdy jest na pierwszym planie - else - Global.iPause |= 4; // włączenie pauzy, gdy nieaktywy + Application.on_mouse_button( button, action, mods ); } void scroll_callback( GLFWwindow* window, double xoffset, double yoffset ) { - if( Global.ctrlState ) { - // ctrl + scroll wheel adjusts fov in debug mode - Global.FieldOfView = clamp( static_cast( Global.FieldOfView - yoffset * 20.0 / Global.fFpsAverage ), 15.0f, 75.0f ); - } + Application.on_scroll( xoffset, yoffset ); +} + +void key_callback( GLFWwindow *window, int key, int scancode, int action, int mods ) { + + Application.on_key( key, scancode, action, mods ); } // public: @@ -190,6 +109,12 @@ eu07_application::init( int Argc, char *Argv[] ) { if( ( result = init_settings( Argc, Argv ) ) != 0 ) { return result; } + + WriteLog( "Starting MaSzyna rail vehicle simulator (release: " + Global.asVersion + ")" ); + WriteLog( "For online documentation and additional files refer to: http://eu07.pl" ); + 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\n" ); + if( ( result = init_glfw() ) != 0 ) { return result; } @@ -200,6 +125,9 @@ eu07_application::init( int Argc, char *Argv[] ) { if( ( result = init_audio() ) != 0 ) { return result; } + if( ( result = init_modes() ) != 0 ) { + return result; + } return result; } @@ -207,56 +135,12 @@ eu07_application::init( int Argc, char *Argv[] ) { int eu07_application::run() { - // HACK: prevent mouse capture before simulation starts - Global.ControlPicking = true; - // TODO: move input sources and their initializations to the application mode member - input::Keyboard.init(); - input::Mouse.init(); - input::Gamepad.init(); - if( true == Global.uart_conf.enable ) { - input::uart = std::make_unique(); - input::uart->init(); - } -#ifdef _WIN32 - Console::On(); // włączenie konsoli -#endif - - Global.pWorld = &World; // Ra: wskaźnik potrzebny do usuwania pojazdów - - if( false == World.Init( m_window ) ) { - ErrorLog( "Bad init: simulation setup failed" ); - return -1; - } - - if( Global.iConvertModels < 0 ) { - // generate binary files for all 3d models - Global.iConvertModels = -Global.iConvertModels; - World.CreateE3D( szModelPath ); // rekurencyjne przeglądanie katalogów - World.CreateE3D( szDynamicPath, true ); - // auto-close when you're done - WriteLog( "Binary 3d model generation completed" ); - return 0; - } - - set_cursor( GLFW_CURSOR_DISABLED ); - set_cursor_pos( 0, 0 ); - Global.ControlPicking = false; - // main application loop - // TODO: split into parts and delegate these to application mode member while( ( false == glfwWindowShouldClose( m_window ) ) - && ( true == World.Update() ) + && ( false == m_modestack.empty() ) + && ( true == m_modes[ m_modestack.top() ]->update() ) && ( true == GfxRenderer.Render() ) ) { glfwPollEvents(); - input::Keyboard.poll(); - if( true == Global.InputMouse ) { input::Mouse.poll(); } - if( true == Global.InputGamepad ) { input::Gamepad.poll(); } - if( input::uart != nullptr ) { input::uart->poll(); } - // TODO: wrap current command in object, include other input sources - input::command = ( - input::Mouse.command() != user_command::none ? - input::Mouse.command() : - input::Keyboard.command() ); } return 0; @@ -265,9 +149,7 @@ eu07_application::run() { void eu07_application::exit() { -#ifdef _WIN32 - Console::Off(); // wyłączenie konsoli (komunikacji zwrotnej) -#endif + SafeDelete( simulation::Train ); SafeDelete( simulation::Region ); glfwDestroyWindow( m_window ); @@ -276,28 +158,103 @@ eu07_application::exit() { TPythonInterpreter::killInstance(); } +void +eu07_application::render_ui() { + + if( m_modestack.empty() ) { return; } + + m_modes[ m_modestack.top() ]->render_ui(); +} + +bool +eu07_application::pop_mode() { + + if( m_modestack.empty() ) { return false; } + + m_modes[ m_modestack.top() ]->exit(); + m_modestack.pop(); + return true; +} + +bool +eu07_application::push_mode( eu07_application::mode const Mode ) { + + if( Mode >= mode::count_ ) { return false; } + + m_modes[ Mode ]->enter(); + m_modestack.push( Mode ); + + return true; +} + +void +eu07_application::set_title( std::string const &Title ) { + + glfwSetWindowTitle( m_window, Title.c_str() ); +} + +void +eu07_application::set_progress( float const Progress, float const Subtaskprogress ) { + + if( m_modestack.empty() ) { return; } + + m_modes[ m_modestack.top() ]->set_progress( Progress, Subtaskprogress ); +} + void eu07_application::set_cursor( int const Mode ) { - UILayer.set_cursor( Mode ); + ui_layer::set_cursor( Mode ); } void -eu07_application::set_cursor_pos( double const X, double const Y ) { +eu07_application::set_cursor_pos( double const Horizontal, double const Vertical ) { if( m_window != nullptr ) { - glfwSetCursorPos( m_window, X, Y ); + glfwSetCursorPos( m_window, Horizontal, Vertical ); } } void -eu07_application::get_cursor_pos( double &X, double &Y ) const { +eu07_application::get_cursor_pos( double &Horizontal, double &Vertical ) const { if( m_window != nullptr ) { - glfwGetCursorPos( m_window, &X, &Y ); + glfwGetCursorPos( m_window, &Horizontal, &Vertical ); } } +void +eu07_application::on_key( int const Key, int const Scancode, int const Action, int const Mods ) { + + if( m_modestack.empty() ) { return; } + + m_modes[ m_modestack.top() ]->on_key( Key, Scancode, Action, Mods ); +} + +void +eu07_application::on_cursor_pos( double const Horizontal, double const Vertical ) { + + if( m_modestack.empty() ) { return; } + + m_modes[ m_modestack.top() ]->on_cursor_pos( Horizontal, Vertical ); +} + +void +eu07_application::on_mouse_button( int const Button, int const Action, int const Mods ) { + + if( m_modestack.empty() ) { return; } + + m_modes[ m_modestack.top() ]->on_mouse_button( Button, Action, Mods ); +} + +void +eu07_application::on_scroll( double const Xoffset, double const Yoffset ) { + + if( m_modestack.empty() ) { return; } + + m_modes[ m_modestack.top() ]->on_scroll( Xoffset, Yoffset ); +} + // private: void @@ -385,13 +342,7 @@ eu07_application::init_settings( int Argc, char *Argv[] ) { std::string token { Argv[ i ] }; - if( token == "-e3d" ) { - Global.iConvertModels = ( - Global.iConvertModels > 0 ? - -Global.iConvertModels : - -7 ); // z optymalizacją, bananami i prawidłowym Opacity - } - else if( token == "-s" ) { + if( token == "-s" ) { if( i + 1 < Argc ) { Global.SceneryFile = ToLower( Argv[ ++i ] ); } @@ -406,7 +357,6 @@ eu07_application::init_settings( int Argc, char *Argv[] ) { << "usage: " << std::string( Argv[ 0 ] ) << " [-s sceneryfilepath]" << " [-v vehiclename]" - << " [-e3d]" << std::endl; return -1; } @@ -468,7 +418,6 @@ eu07_application::init_glfw() { // switch off the topmost flag ::SetWindowPos( Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); #endif - // TBD, TODO: move the global pointer to a more appropriate place m_window = window; return 0; @@ -499,7 +448,7 @@ eu07_application::init_gfx() { } if( ( false == GfxRenderer.Init( m_window ) ) - || ( false == UILayer.init( m_window ) ) ) { + || ( false == ui_layer::init( m_window ) ) ) { return -1; } @@ -515,3 +464,25 @@ eu07_application::init_audio() { // NOTE: lack of audio isn't deemed a failure serious enough to throw in the towel return 0; } + +int +eu07_application::init_modes() { + + // NOTE: we could delay creation/initialization until transition to specific mode is requested, + // but doing it in one go at the start saves us some error checking headache down the road + + // create all application behaviour modes + m_modes[ mode::scenarioloader ] = std::make_shared(); + m_modes[ mode::driver ] = std::make_shared(); + m_modes[ mode::editor ] = std::make_shared(); + // initialize the mode objects + for( auto &mode : m_modes ) { + if( false == mode->init() ) { + return -1; + } + } + // activate the default mode + push_mode( mode::scenarioloader ); + + return 0; +} diff --git a/application.h b/application.h index 719f8ade..d7cbea69 100644 --- a/application.h +++ b/application.h @@ -7,9 +7,21 @@ obtain one at http://mozilla.org/MPL/2.0/. */ +#pragma once + +#include "applicationmode.h" + class eu07_application { public: +// types + enum mode { +// launcher = 0, + scenarioloader, + driver, + editor, + count_ + }; // constructors eu07_application() = default; // methods @@ -19,18 +31,41 @@ public: run(); void exit(); + void + render_ui(); + // switches application to specified mode + bool + pop_mode(); + bool + push_mode( eu07_application::mode const Mode ); + void + set_title( std::string const &Title ); + void + set_progress( float const Progress = 0.f, float const Subtaskprogress = 0.f ); void set_cursor( int const Mode ); void - set_cursor_pos( double const X, double const Y ); + set_cursor_pos( double const Horizontal, double const Vertical ); void - get_cursor_pos( double &X, double &Y ) const; + get_cursor_pos( double &Horizontal, double &Vertical ) const; + // input handlers + void + on_key( int const Key, int const Scancode, int const Action, int const Mods ); + void + on_cursor_pos( double const Horizontal, double const Vertical ); + void + on_mouse_button( int const Button, int const Action, int const Mods ); + void + on_scroll( double const Xoffset, double const Yoffset ); inline GLFWwindow * window() { return m_window; } private: +// types + using modeptr_array = std::array, static_cast( mode::count_ )>; + using mode_stack = std::stack; // methods void init_debug(); void init_files(); @@ -39,8 +74,11 @@ private: void init_callbacks(); int init_gfx(); int init_audio(); + int init_modes(); // members GLFWwindow * m_window { nullptr }; + modeptr_array m_modes { nullptr }; // collection of available application behaviour modes + mode_stack m_modestack; // current behaviour mode }; -extern eu07_application Application; \ No newline at end of file +extern eu07_application Application; diff --git a/applicationmode.h b/applicationmode.h new file mode 100644 index 00000000..3bba4c28 --- /dev/null +++ b/applicationmode.h @@ -0,0 +1,67 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "uilayer.h" + +// component implementing specific mode of application behaviour +// base interface +class application_mode { + +public: +// destructor + virtual + ~application_mode() = default; +// methods; + // initializes internal data structures of the mode. returns: true on success, false otherwise + virtual + bool + init() = 0; + // mode-specific update of simulation data. returns: false on error, true otherwise + virtual + bool + update() = 0; + // draws node-specific user interface + inline + void + render_ui() { + if( m_userinterface != nullptr ) { + m_userinterface->render(); } } + inline + void + set_progress( float const Progress = 0.f, float const Subtaskprogress = 0.f ) { + if( m_userinterface != nullptr ) { + m_userinterface->set_progress( Progress, Subtaskprogress ); } } + // maintenance method, called when the mode is activated + virtual + void + enter() = 0; + // maintenance method, called when the mode is deactivated + virtual + void + exit() = 0; + // input handlers + virtual + void + on_key( int const Key, int const Scancode, int const Action, int const Mods ) = 0; + virtual + void + on_cursor_pos( double const X, double const Y ) = 0; + virtual + void + on_mouse_button( int const Button, int const Action, int const Mods ) = 0; + virtual + void + on_scroll( double const Xoffset, double const Yoffset ) = 0; + +protected: +// members + std::shared_ptr m_userinterface; +}; diff --git a/combustionengine.cpp b/combustionengine.cpp new file mode 100644 index 00000000..d751f06d --- /dev/null +++ b/combustionengine.cpp @@ -0,0 +1,13 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "combustionengine.h" + +//--------------------------------------------------------------------------- diff --git a/combustionengine.h b/combustionengine.h new file mode 100644 index 00000000..07a378bd --- /dev/null +++ b/combustionengine.h @@ -0,0 +1,20 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +// basic approximation of a fuel pump +// TODO: fuel consumption, optional automatic engine start after activation +struct fuel_pump { + + bool is_enabled { false }; // device is allowed/requested to operate + bool is_active { false }; // device is working +}; + +//--------------------------------------------------------------------------- diff --git a/driverkeyboardinput.cpp b/driverkeyboardinput.cpp new file mode 100644 index 00000000..c6f34552 --- /dev/null +++ b/driverkeyboardinput.cpp @@ -0,0 +1,215 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "driverkeyboardinput.h" + +bool +driverkeyboard_input::init() { + + default_bindings(); + + return recall_bindings(); +} + +void +driverkeyboard_input::default_bindings() { + + m_bindingsetups = { + { user_command::aidriverenable, GLFW_KEY_Q | keymodifier::shift }, + { user_command::aidriverdisable, GLFW_KEY_Q }, + { user_command::mastercontrollerincrease, GLFW_KEY_KP_ADD }, + { user_command::mastercontrollerincreasefast, GLFW_KEY_KP_ADD | keymodifier::shift }, + { user_command::mastercontrollerdecrease, GLFW_KEY_KP_SUBTRACT }, + { user_command::mastercontrollerdecreasefast, GLFW_KEY_KP_SUBTRACT | keymodifier::shift }, + // mastercontrollerset, + { user_command::secondcontrollerincrease, GLFW_KEY_KP_DIVIDE }, + { user_command::secondcontrollerincreasefast, GLFW_KEY_KP_DIVIDE | keymodifier::shift }, + { user_command::secondcontrollerdecrease, GLFW_KEY_KP_MULTIPLY }, + { user_command::secondcontrollerdecreasefast, GLFW_KEY_KP_MULTIPLY | keymodifier::shift }, + // secondcontrollerset, + { user_command::mucurrentindicatorothersourceactivate, GLFW_KEY_Z | keymodifier::shift }, + { user_command::independentbrakeincrease, GLFW_KEY_KP_1 }, + { user_command::independentbrakeincreasefast, GLFW_KEY_KP_1 | keymodifier::shift }, + { user_command::independentbrakedecrease, GLFW_KEY_KP_7 }, + { user_command::independentbrakedecreasefast, GLFW_KEY_KP_7 | keymodifier::shift }, + // independentbrakeset, + { user_command::independentbrakebailoff, GLFW_KEY_KP_4 }, + { user_command::trainbrakeincrease, GLFW_KEY_KP_3 }, + { user_command::trainbrakedecrease, GLFW_KEY_KP_9 }, + // trainbrakeset, + { user_command::trainbrakecharging, GLFW_KEY_KP_DECIMAL }, + { user_command::trainbrakerelease, GLFW_KEY_KP_6 }, + { user_command::trainbrakefirstservice, GLFW_KEY_KP_8 }, + { user_command::trainbrakeservice, GLFW_KEY_KP_5 }, + { user_command::trainbrakefullservice, GLFW_KEY_KP_2 }, + { user_command::trainbrakehandleoff, GLFW_KEY_KP_5 | keymodifier::control }, + { user_command::trainbrakeemergency, GLFW_KEY_KP_0 }, + { user_command::trainbrakebasepressureincrease, GLFW_KEY_KP_3 | keymodifier::control }, + { user_command::trainbrakebasepressuredecrease, GLFW_KEY_KP_9 | keymodifier::control }, + { user_command::trainbrakebasepressurereset, GLFW_KEY_KP_6 | keymodifier::control }, + { user_command::trainbrakeoperationtoggle, GLFW_KEY_KP_4 | keymodifier::control }, + { user_command::manualbrakeincrease, GLFW_KEY_KP_1 | keymodifier::control }, + { user_command::manualbrakedecrease, GLFW_KEY_KP_7 | keymodifier::control }, + { user_command::alarmchaintoggle, GLFW_KEY_B | keymodifier::shift | keymodifier::control }, + { user_command::wheelspinbrakeactivate, GLFW_KEY_KP_ENTER }, + { user_command::sandboxactivate, GLFW_KEY_S }, + { user_command::reverserincrease, GLFW_KEY_D }, + { user_command::reverserdecrease, GLFW_KEY_R }, + // reverserforwardhigh, + // reverserforward, + // reverserneutral, + // reverserbackward, + { user_command::waterpumpbreakertoggle, GLFW_KEY_W | keymodifier::control }, + // waterpumpbreakerclose, + // waterpumpbreakeropen, + { user_command::waterpumptoggle, GLFW_KEY_W }, + // waterpumpenable, + // waterpumpdisable, + { user_command::waterheaterbreakertoggle, GLFW_KEY_W | keymodifier::control | keymodifier::shift }, + // waterheaterbreakerclose, + // waterheaterbreakeropen, + { user_command::waterheatertoggle, GLFW_KEY_W | keymodifier::shift }, + // waterheaterenable, + // waterheaterdisable, + { user_command::watercircuitslinktoggle, GLFW_KEY_H | keymodifier::shift }, + // watercircuitslinkenable, + // watercircuitslinkdisable, + { user_command::fuelpumptoggle, GLFW_KEY_F }, + // fuelpumpenable, + // fuelpumpdisable, + { user_command::oilpumptoggle, GLFW_KEY_F | keymodifier::shift }, + // oilpumpenable, + // oilpumpdisable, + { user_command::linebreakertoggle, GLFW_KEY_M }, + // linebreakeropen, + // linebreakerclose, + { user_command::convertertoggle, GLFW_KEY_X }, + // converterenable, + // converterdisable, + { user_command::convertertogglelocal, GLFW_KEY_X | keymodifier::shift }, + { user_command::converteroverloadrelayreset, GLFW_KEY_N | keymodifier::control }, + { user_command::compressortoggle, GLFW_KEY_C }, + // compressorenable, + // compressordisable, + { user_command::compressortogglelocal, GLFW_KEY_C | keymodifier::shift }, + { user_command::motoroverloadrelaythresholdtoggle, GLFW_KEY_F }, + // motoroverloadrelaythresholdsetlow, + // motoroverloadrelaythresholdsethigh, + { user_command::motoroverloadrelayreset, GLFW_KEY_N }, + { user_command::notchingrelaytoggle, GLFW_KEY_G }, + { user_command::epbrakecontroltoggle, GLFW_KEY_Z | keymodifier::control }, + { user_command::trainbrakeoperationmodeincrease, GLFW_KEY_KP_2 | keymodifier::control }, + { user_command::trainbrakeoperationmodedecrease, GLFW_KEY_KP_8 | keymodifier::control }, + { user_command::brakeactingspeedincrease, GLFW_KEY_B | keymodifier::shift }, + { user_command::brakeactingspeeddecrease, GLFW_KEY_B }, + // brakeactingspeedsetcargo, + // brakeactingspeedsetpassenger, + // brakeactingspeedsetrapid, + { user_command::brakeloadcompensationincrease, GLFW_KEY_H | keymodifier::shift | keymodifier::control }, + { user_command::brakeloadcompensationdecrease, GLFW_KEY_H | keymodifier::control }, + { user_command::mubrakingindicatortoggle, GLFW_KEY_L | keymodifier::shift }, + { user_command::alerteracknowledge, GLFW_KEY_SPACE }, + { user_command::hornlowactivate, GLFW_KEY_A }, + { user_command::hornhighactivate, GLFW_KEY_S }, + { user_command::whistleactivate, GLFW_KEY_Z }, + { user_command::radiotoggle, GLFW_KEY_R | keymodifier::control }, + { user_command::radiochannelincrease, GLFW_KEY_R | keymodifier::shift }, + { user_command::radiochanneldecrease, GLFW_KEY_R }, + { user_command::radiostopsend, GLFW_KEY_PAUSE | keymodifier::shift | keymodifier::control }, + { user_command::radiostoptest, GLFW_KEY_R | keymodifier::shift | keymodifier::control }, + { user_command::cabchangeforward, GLFW_KEY_HOME }, + { user_command::cabchangebackward, GLFW_KEY_END }, + // viewturn, + // movehorizontal, + // movehorizontalfast, + // movevertical, + // moveverticalfast, + { user_command::moveleft, GLFW_KEY_LEFT }, + { user_command::moveright, GLFW_KEY_RIGHT }, + { user_command::moveforward, GLFW_KEY_UP }, + { user_command::moveback, GLFW_KEY_DOWN }, + { user_command::moveup, GLFW_KEY_PAGE_UP }, + { user_command::movedown, GLFW_KEY_PAGE_DOWN }, + { user_command::carcouplingincrease, GLFW_KEY_INSERT }, + { user_command::carcouplingdisconnect, GLFW_KEY_DELETE }, + { user_command::doortoggleleft, GLFW_KEY_COMMA }, + { user_command::doortoggleright, GLFW_KEY_PERIOD }, + { user_command::departureannounce, GLFW_KEY_SLASH }, + { user_command::doorlocktoggle, GLFW_KEY_S | keymodifier::shift }, + { user_command::pantographcompressorvalvetoggle, GLFW_KEY_V | keymodifier::control }, + { user_command::pantographcompressoractivate, GLFW_KEY_V | keymodifier::shift }, + { user_command::pantographtogglefront, GLFW_KEY_P }, + { user_command::pantographtogglerear, GLFW_KEY_O }, + // pantographraisefront, + // pantographraiserear, + // pantographlowerfront, + // pantographlowerrear, + { user_command::pantographlowerall, GLFW_KEY_P | keymodifier::control }, + { user_command::heatingtoggle, GLFW_KEY_H }, + // heatingenable, + // heatingdisable, + { user_command::lightspresetactivatenext, GLFW_KEY_T | keymodifier::shift }, + { user_command::lightspresetactivateprevious, GLFW_KEY_T }, + { user_command::headlighttoggleleft, GLFW_KEY_Y }, + // headlightenableleft, + // headlightdisableleft, + { user_command::headlighttoggleright, GLFW_KEY_I }, + // headlightenableright, + // headlightdisableright, + { user_command::headlighttoggleupper, GLFW_KEY_U }, + // headlightenableupper, + // headlightdisableupper, + { user_command::redmarkertoggleleft, GLFW_KEY_Y | keymodifier::shift }, + // redmarkerenableleft, + // redmarkerdisableleft, + { user_command::redmarkertoggleright, GLFW_KEY_I | keymodifier::shift }, + // redmarkerenableright, + // redmarkerdisableright, + { user_command::headlighttogglerearleft, GLFW_KEY_Y | keymodifier::control }, + { user_command::headlighttogglerearright, GLFW_KEY_I | keymodifier::control }, + { user_command::headlighttogglerearupper, GLFW_KEY_U | keymodifier::control }, + { user_command::redmarkertogglerearleft, GLFW_KEY_Y | keymodifier::control | keymodifier::shift }, + { user_command::redmarkertogglerearright, GLFW_KEY_I | keymodifier::control | keymodifier::shift }, + { user_command::redmarkerstoggle, GLFW_KEY_E | keymodifier::shift }, + { user_command::endsignalstoggle, GLFW_KEY_E }, + { user_command::headlightsdimtoggle, GLFW_KEY_L | keymodifier::control }, + // headlightsdimenable, + // headlightsdimdisable, + { user_command::motorconnectorsopen, GLFW_KEY_L }, + // motorconnectorsclose, + { user_command::motordisconnect, GLFW_KEY_E | keymodifier::control }, + { user_command::interiorlighttoggle, GLFW_KEY_APOSTROPHE }, + // interiorlightenable, + // interiorlightdisable, + { user_command::interiorlightdimtoggle, GLFW_KEY_APOSTROPHE | keymodifier::control }, + // interiorlightdimenable, + // interiorlightdimdisable, + { user_command::instrumentlighttoggle, GLFW_KEY_SEMICOLON }, + // instrumentlightenable, + // instrumentlightdisable, + { user_command::generictoggle0, GLFW_KEY_0 }, + { user_command::generictoggle1, GLFW_KEY_1 }, + { user_command::generictoggle2, GLFW_KEY_2 }, + { user_command::generictoggle3, GLFW_KEY_3 }, + { user_command::generictoggle4, GLFW_KEY_4 }, + { user_command::generictoggle5, GLFW_KEY_5 }, + { user_command::generictoggle6, GLFW_KEY_6 }, + { user_command::generictoggle7, GLFW_KEY_7 }, + { user_command::generictoggle8, GLFW_KEY_8 }, + { user_command::generictoggle9, GLFW_KEY_9 }, + { user_command::batterytoggle, GLFW_KEY_J }, + // batteryenable, + // batterydisable, + }; + + bind(); +} + +//--------------------------------------------------------------------------- diff --git a/driverkeyboardinput.h b/driverkeyboardinput.h new file mode 100644 index 00000000..c18871df --- /dev/null +++ b/driverkeyboardinput.h @@ -0,0 +1,27 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "keyboardinput.h" + +class driverkeyboard_input : public keyboard_input { + +public: +// methods + bool + init() override; + +protected: +// methods + void + default_bindings(); +}; + +//--------------------------------------------------------------------------- diff --git a/drivermode.cpp b/drivermode.cpp new file mode 100644 index 00000000..72283022 --- /dev/null +++ b/drivermode.cpp @@ -0,0 +1,1007 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "drivermode.h" +#include "driveruilayer.h" + +#include "globals.h" +#include "application.h" +#include "simulation.h" +#include "simulationtime.h" +#include "simulationenvironment.h" +#include "lightarray.h" +#include "train.h" +#include "driver.h" +#include "dynobj.h" +#include "model3d.h" +#include "event.h" +#include "messaging.h" +#include "timer.h" +#include "renderer.h" +#include "utilities.h" +#include "logs.h" + +namespace input { + +user_command command; // currently issued control command, if any + +} + +void +driver_mode::drivermode_input::poll() { + + keyboard.poll(); + if( true == Global.InputMouse ) { + mouse.poll(); + } + if( true == Global.InputGamepad ) { + gamepad.poll(); + } + if( uart != nullptr ) { + uart->poll(); + } + // TBD, TODO: wrap current command in object, include other input sources? + input::command = ( + mouse.command() != user_command::none ? + mouse.command() : + keyboard.command() ); +} + +bool +driver_mode::drivermode_input::init() { + + // initialize input devices + auto result = ( + keyboard.init() + && mouse.init() + && gamepad.init() ); + if( true == Global.uart_conf.enable ) { + uart = std::make_unique(); + result = ( result && uart->init() ); + } +#ifdef _WIN32 + Console::On(); // włączenie konsoli +#endif + + return result; +} + +driver_mode::driver_mode() { + + m_userinterface = std::make_shared(); +} + +// initializes internal data structures of the mode. returns: true on success, false otherwise +bool +driver_mode::init() { + + return m_input.init(); +} + +// mode-specific update of simulation data. returns: false on error, true otherwise +bool +driver_mode::update() { + + Timer::UpdateTimers(Global.iPause != 0); + Timer::subsystem.sim_total.start(); + + double const deltatime = Timer::GetDeltaTime(); // 0.0 gdy pauza + + if( Global.iPause == 0 ) { + // jak pauza, to nie ma po co tego przeliczać + simulation::Time.update( deltatime ); + } + simulation::State.update_clocks(); + simulation::Environment.update(); + + // fixed step, simulation time based updates +// m_primaryupdateaccumulator += dt; // unused for the time being + m_secondaryupdateaccumulator += deltatime; +/* + // NOTE: until we have no physics state interpolation during render, we need to rely on the old code, + // as doing fixed step calculations but flexible step render results in ugly mini jitter + // core routines (physics) + int updatecount = 0; + while( ( m_primaryupdateaccumulator >= m_primaryupdaterate ) + &&( updatecount < 20 ) ) { + // no more than 20 updates per single pass, to keep physics from hogging up all run time + Ground.Update( m_primaryupdaterate, 1 ); + ++updatecount; + m_primaryupdateaccumulator -= m_primaryupdaterate; + } +*/ + int updatecount = 1; + if( deltatime > m_primaryupdaterate ) // normalnie 0.01s + { +/* + // NOTE: experimentally disabled physics update cap + auto const iterations = std::ceil(dt / m_primaryupdaterate); + updatecount = std::min( 20, static_cast( iterations ) ); +*/ + updatecount = std::ceil( deltatime / m_primaryupdaterate ); +/* + // NOTE: changing dt wrecks things further down the code. re-acquire proper value later or cleanup here + dt = dt / iterations; // Ra: fizykę lepiej by było przeliczać ze stałym krokiem +*/ + } + auto const stepdeltatime { deltatime / updatecount }; + // NOTE: updates are limited to 20, but dt is distributed over potentially many more iterations + // this means at count > 20 simulation and render are going to desync. is that right? + // NOTE: experimentally changing this to prevent the desync. + // TODO: test what happens if we hit more than 20 * 0.01 sec slices, i.e. less than 5 fps + Timer::subsystem.sim_dynamics.start(); + if( true == Global.FullPhysics ) { + // mixed calculation mode, steps calculated in ~0.05s chunks + while( updatecount >= 5 ) { + simulation::State.update( stepdeltatime, 5 ); + updatecount -= 5; + } + if( updatecount ) { + simulation::State.update( stepdeltatime, updatecount ); + } + } + else { + // simplified calculation mode; faster but can lead to errors + simulation::State.update( stepdeltatime, updatecount ); + } + Timer::subsystem.sim_dynamics.stop(); + + // secondary fixed step simulation time routines + while( m_secondaryupdateaccumulator >= m_secondaryupdaterate ) { + + // awaria PoKeys mogła włączyć pauzę - przekazać informację + if( Global.iMultiplayer ) // dajemy znać do serwera o wykonaniu + if( iPause != Global.iPause ) { // przesłanie informacji o pauzie do programu nadzorującego + multiplayer::WyslijParam( 5, 3 ); // ramka 5 z czasem i stanem zapauzowania + iPause = Global.iPause; + } + + // fixed step part of the camera update + if( ( simulation::Train != nullptr ) + && ( Camera.Type == TCameraType::tp_Follow ) + && ( false == DebugCameraFlag ) ) { + // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery + simulation::Train->UpdateMechPosition( m_secondaryupdaterate ); + } + + m_secondaryupdateaccumulator -= m_secondaryupdaterate; // these should be inexpensive enough we have no cap + } + + // variable step simulation time routines + + if( Global.changeDynObj ) { + // ABu zmiana pojazdu - przejście do innego + ChangeDynamic(); + } + + if( simulation::Train != nullptr ) { + TSubModel::iInstance = reinterpret_cast( simulation::Train->Dynamic() ); + simulation::Train->Update( deltatime ); + } + else { + TSubModel::iInstance = 0; + } + + simulation::Events.update(); + simulation::Region->update_events(); + simulation::Lights.update(); + + // render time routines follow: + + auto const deltarealtime = Timer::GetDeltaRenderTime(); // nie uwzględnia pauzowania ani mnożenia czasu + + // fixed step render time routines + + fTime50Hz += deltarealtime; // w pauzie też trzeba zliczać czas, bo przy dużym FPS będzie problem z odczytem ramek + while( fTime50Hz >= 1.0 / 50.0 ) { + Console::Update(); // to i tak trzeba wywoływać + ui::Transcripts.Update(); // obiekt obsługujący stenogramy dźwięków na ekranie + m_userinterface->update(); + // decelerate camera + Camera.Velocity *= 0.65; + if( std::abs( Camera.Velocity.x ) < 0.01 ) { Camera.Velocity.x = 0.0; } + if( std::abs( Camera.Velocity.y ) < 0.01 ) { Camera.Velocity.y = 0.0; } + if( std::abs( Camera.Velocity.z ) < 0.01 ) { Camera.Velocity.z = 0.0; } + // decelerate debug camera too + DebugCamera.Velocity *= 0.65; + if( std::abs( DebugCamera.Velocity.x ) < 0.01 ) { DebugCamera.Velocity.x = 0.0; } + if( std::abs( DebugCamera.Velocity.y ) < 0.01 ) { DebugCamera.Velocity.y = 0.0; } + if( std::abs( DebugCamera.Velocity.z ) < 0.01 ) { DebugCamera.Velocity.z = 0.0; } + + fTime50Hz -= 1.0 / 50.0; + } + + // variable step render time routines + + update_camera( deltarealtime ); + + Timer::subsystem.sim_total.stop(); + + simulation::Region->update_sounds(); + audio::renderer.update( deltarealtime ); + + GfxRenderer.Update( deltarealtime ); + + simulation::is_ready = true; + + m_input.poll(); + + return true; +} + +// maintenance method, called when the mode is activated +void +driver_mode::enter() { + + Camera.Init(Global.FreeCameraInit[0], Global.FreeCameraInitAngle[0], ( FreeFlyModeFlag ? TCameraType::tp_Free : TCameraType::tp_Follow ) ); + Global.pCamera = &Camera; + Global.pDebugCamera = &DebugCamera; + + TDynamicObject *nPlayerTrain { ( + ( Global.asHumanCtrlVehicle != "ghostview" ) ? + simulation::Vehicles.find( Global.asHumanCtrlVehicle ) : + nullptr ) }; + + if (nPlayerTrain) + { + WriteLog( "Initializing player train, \"" + Global.asHumanCtrlVehicle + "\"" ); + + if( simulation::Train == nullptr ) { + simulation::Train = new TTrain(); + } + if( simulation::Train->Init( nPlayerTrain ) ) + { + WriteLog("Player train initialization OK"); + + Application.set_title( Global.AppName + " (" + simulation::Train->Controlled()->Name + " @ " + Global.SceneryFile + ")" ); + + FollowView(); + } + else + { + Error("Bad init: player train initialization failed"); + FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie + SafeDelete( simulation::Train ); + Camera.Type = TCameraType::tp_Free; + } + } + else + { + if (Global.asHumanCtrlVehicle != "ghostview") + { + Error("Bad scenario: failed to locate player train, \"" + Global.asHumanCtrlVehicle + "\"" ); + } + FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie + Camera.Type = TCameraType::tp_Free; + DebugCamera = Camera; + Global.DebugCameraPosition = DebugCamera.Pos; + } + + // if (!Global.bMultiplayer) //na razie włączone + { // eventy aktywowane z klawiatury tylko dla jednego użytkownika + KeyEvents[ 0 ] = simulation::Events.FindEvent( "keyctrl00" ); + KeyEvents[ 1 ] = simulation::Events.FindEvent( "keyctrl01" ); + KeyEvents[ 2 ] = simulation::Events.FindEvent( "keyctrl02" ); + KeyEvents[ 3 ] = simulation::Events.FindEvent( "keyctrl03" ); + KeyEvents[ 4 ] = simulation::Events.FindEvent( "keyctrl04" ); + KeyEvents[ 5 ] = simulation::Events.FindEvent( "keyctrl05" ); + KeyEvents[ 6 ] = simulation::Events.FindEvent( "keyctrl06" ); + KeyEvents[ 7 ] = simulation::Events.FindEvent( "keyctrl07" ); + KeyEvents[ 8 ] = simulation::Events.FindEvent( "keyctrl08" ); + KeyEvents[ 9 ] = simulation::Events.FindEvent( "keyctrl09" ); + } + + Timer::ResetTimers(); + + Application.set_cursor( GLFW_CURSOR_DISABLED ); + Application.set_cursor_pos( 0, 0 ); + Global.ControlPicking = false; +} + +// maintenance method, called when the mode is deactivated +void +driver_mode::exit() { + +} + +void +driver_mode::on_key( int const Key, int const Scancode, int const Action, int const Mods ) { + + Global.shiftState = ( Mods & GLFW_MOD_SHIFT ) ? true : false; + Global.ctrlState = ( Mods & GLFW_MOD_CONTROL ) ? true : false; + Global.altState = ( Mods & GLFW_MOD_ALT ) ? true : false; + + // give the ui first shot at the input processing... + if( true == m_userinterface->on_key( Key, Action ) ) { return; } + // ...if the input is left untouched, pass it on + if( true == m_input.keyboard.key( Key, Action ) ) { return; } + + if( ( true == Global.InputMouse ) + && ( ( Key == GLFW_KEY_LEFT_ALT ) + || ( Key == GLFW_KEY_RIGHT_ALT ) ) ) { + // if the alt key was pressed toggle control picking mode and set matching cursor behaviour + if( Action == GLFW_PRESS ) { + + if( Global.ControlPicking ) { + // switch off + Application.get_cursor_pos( m_input.mouse_pickmodepos.x, m_input.mouse_pickmodepos.y ); + Application.set_cursor( GLFW_CURSOR_DISABLED ); + Application.set_cursor_pos( 0, 0 ); + } + else { + // enter picking mode + Application.set_cursor_pos( m_input.mouse_pickmodepos.x, m_input.mouse_pickmodepos.y ); + Application.set_cursor( GLFW_CURSOR_NORMAL ); + } + // actually toggle the mode + Global.ControlPicking = !Global.ControlPicking; + } + } + + if( ( Key == GLFW_KEY_LEFT_SHIFT ) + || ( Key == GLFW_KEY_LEFT_CONTROL ) + || ( Key == GLFW_KEY_LEFT_ALT ) + || ( Key == GLFW_KEY_RIGHT_SHIFT ) + || ( Key == GLFW_KEY_RIGHT_CONTROL ) + || ( Key == GLFW_KEY_RIGHT_ALT ) ) { + // don't bother passing these + return; + } + + if( Action == GLFW_PRESS || Action == GLFW_REPEAT ) { + + OnKeyDown( Key ); + +#ifdef CAN_I_HAS_LIBPNG + switch( key ) { + case GLFW_KEY_PRINT_SCREEN: { + make_screenshot(); + break; + } + default: { break; } + } +#endif + } +} + +void +driver_mode::on_cursor_pos( double const Horizontal, double const Vertical ) { + + if( false == Global.ControlPicking ) { + // in regular view mode keep cursor on screen + Application.set_cursor_pos( 0, 0 ); + } + // give the potential event recipient a shot at it, in the virtual z order + m_input.mouse.move( Horizontal, Vertical ); +} + +void +driver_mode::on_mouse_button( int const Button, int const Action, int const Mods ) { + + // give the potential event recipient a shot at it, in the virtual z order + m_input.mouse.button( Button, Action ); +} + +void +driver_mode::on_scroll( double const Xoffset, double const Yoffset ) { + + if( Global.ctrlState ) { + // ctrl + scroll wheel adjusts fov + Global.FieldOfView = clamp( static_cast( Global.FieldOfView - Yoffset * 20.0 / Timer::subsystem.gfx_total.average() ), 15.0f, 75.0f ); + } +} + +void +driver_mode::update_camera( double const Deltatime ) { + + auto *controlled = ( + simulation::Train ? + simulation::Train->Dynamic() : + nullptr ); + + if( false == Global.ControlPicking ) { + if( m_input.mouse.button( GLFW_MOUSE_BUTTON_LEFT ) == GLFW_PRESS ) { + Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe + if( controlled && LengthSquared3( controlled->GetPosition() - Camera.Pos ) < ( 1500 * 1500 ) ) { + // gdy bliżej niż 1.5km + Camera.LookAt = controlled->GetPosition(); + } + else { + TDynamicObject *d = std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 300, false, false ) ); + if( !d ) + d = std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 1000, false, false ) ); // dalej szukanie, jesli bliżej nie ma + + if( d && pDynamicNearest ) { + // jeśli jakiś jest znaleziony wcześniej + if( 100.0 * LengthSquared3( d->GetPosition() - Camera.Pos ) > LengthSquared3( pDynamicNearest->GetPosition() - Camera.Pos ) ) { + d = pDynamicNearest; // jeśli najbliższy nie jest 10 razy bliżej niż + } + } + // poprzedni najbliższy, zostaje poprzedni + if( d ) + pDynamicNearest = d; // zmiana na nowy, jeśli coś znaleziony niepusty + if( pDynamicNearest ) + Camera.LookAt = pDynamicNearest->GetPosition(); + } + if( FreeFlyModeFlag ) + Camera.RaLook(); // jednorazowe przestawienie kamery + } + else if( m_input.mouse.button( GLFW_MOUSE_BUTTON_RIGHT ) == GLFW_PRESS ) { + FollowView( false ); // bez wyciszania dźwięków + } + } + + if( m_input.mouse.button( GLFW_MOUSE_BUTTON_MIDDLE ) == GLFW_PRESS ) { + // middle mouse button controls zoom. + Global.ZoomFactor = std::min( 4.5f, Global.ZoomFactor + 15.0f * static_cast( Deltatime ) ); + } + else if( m_input.mouse.button( GLFW_MOUSE_BUTTON_MIDDLE ) != GLFW_PRESS ) { + // reset zoom level if the button is no longer held down. + // NOTE: yes, this is terrible way to go about it. it'll do for now. + Global.ZoomFactor = std::max( 1.0f, Global.ZoomFactor - 15.0f * static_cast( Deltatime ) ); + } + + if( DebugCameraFlag ) { DebugCamera.Update(); } + else { Camera.Update(); } // uwzględnienie ruchu wywołanego klawiszami + + if( ( false == FreeFlyModeFlag ) + && ( false == Global.CabWindowOpen ) + && ( simulation::Train != nullptr ) ) { + // cache cab camera view angles in case of view type switch + simulation::Train->pMechViewAngle = { Camera.Pitch, Camera.Yaw }; + } + + // reset window state, it'll be set again if applicable in a check below + Global.CabWindowOpen = false; + + if( ( simulation::Train != nullptr ) + && ( Camera.Type == TCameraType::tp_Follow ) + && ( false == DebugCameraFlag ) ) { + // jeśli jazda w kabinie, przeliczyć trzeba parametry kamery +/* + auto tempangle = controlled->VectorFront() * ( controlled->MoverParameters->ActiveCab == -1 ? -1 : 1 ); + double modelrotate = atan2( -tempangle.x, tempangle.z ); +*/ + if( ( true == Global.ctrlState ) + && ( ( m_input.keyboard.key( GLFW_KEY_LEFT ) != GLFW_RELEASE ) + || ( m_input.keyboard.key( GLFW_KEY_RIGHT ) != GLFW_RELEASE ) ) ) { + // jeśli lusterko lewe albo prawe (bez rzucania na razie) + Global.CabWindowOpen = true; + + auto const lr { m_input.keyboard.key( GLFW_KEY_LEFT ) != GLFW_RELEASE }; + // Camera.Yaw powinno być wyzerowane, aby po powrocie patrzeć do przodu + Camera.Pos = controlled->GetPosition() + simulation::Train->MirrorPosition( lr ); // pozycja lusterka + Camera.Yaw = 0; // odchylenie na bok od Camera.LookAt + if( simulation::Train->Occupied()->ActiveCab == 0 ) + Camera.LookAt = Camera.Pos - simulation::Train->GetDirection(); // gdy w korytarzu + else if( Global.shiftState ) { + // patrzenie w bok przez szybę + Camera.LookAt = Camera.Pos - ( lr ? -1 : 1 ) * controlled->VectorLeft() * simulation::Train->Occupied()->ActiveCab; + } + else { // patrzenie w kierunku osi pojazdu, z uwzględnieniem kabiny - jakby z lusterka, + // ale bez odbicia + Camera.LookAt = Camera.Pos - simulation::Train->GetDirection() * simulation::Train->Occupied()->ActiveCab; //-1 albo 1 + } + Camera.Roll = std::atan( simulation::Train->pMechShake.x * simulation::Train->fMechRoll ); // hustanie kamery na boki + Camera.Pitch = 0.5 * std::atan( simulation::Train->vMechVelocity.z * simulation::Train->fMechPitch ); // hustanie kamery przod tyl + Camera.vUp = controlled->VectorUp(); + } + else { + // patrzenie standardowe + // potentially restore view angle after returning from external view + // TODO: mirror view toggle as separate method + Camera.Pitch = simulation::Train->pMechViewAngle.x; + Camera.Yaw = simulation::Train->pMechViewAngle.y; + + Camera.Pos = simulation::Train->GetWorldMechPosition(); // Train.GetPosition1(); + if( !Global.iPause ) { + // podczas pauzy nie przeliczać kątów przypadkowymi wartościami + // hustanie kamery na boki + Camera.Roll = atan( simulation::Train->vMechVelocity.x * simulation::Train->fMechRoll ); + // hustanie kamery przod tyl + // Ra: tu jest uciekanie kamery w górę!!! + Camera.Pitch -= 0.5 * atan( simulation::Train->vMechVelocity.z * simulation::Train->fMechPitch ); + } +/* + // ABu011104: rzucanie pudlem + vector3 temp; + if( abs( Train->pMechShake.y ) < 0.25 ) + temp = vector3( 0, 0, 6 * Train->pMechShake.y ); + else if( ( Train->pMechShake.y ) > 0 ) + temp = vector3( 0, 0, 6 * 0.25 ); + else + temp = vector3( 0, 0, -6 * 0.25 ); + if( Controlled ) + Controlled->ABuSetModelShake( temp ); + // ABu: koniec rzucania +*/ + if( simulation::Train->Occupied()->ActiveCab == 0 ) + Camera.LookAt = simulation::Train->GetWorldMechPosition() + simulation::Train->GetDirection() * 5.0; // gdy w korytarzu + else // patrzenie w kierunku osi pojazdu, z uwzględnieniem kabiny + Camera.LookAt = simulation::Train->GetWorldMechPosition() + simulation::Train->GetDirection() * 5.0 * simulation::Train->Occupied()->ActiveCab; //-1 albo 1 + Camera.vUp = simulation::Train->GetUp(); + } + } + // all done, update camera position to the new value + Global.pCameraPosition = Camera.Pos; + Global.DebugCameraPosition = DebugCamera.Pos; +} + +void +driver_mode::OnKeyDown(int cKey) { + // dump keypress info in the log + // podczas pauzy klawisze nie działają + std::string keyinfo; + auto keyname = glfwGetKeyName( cKey, 0 ); + if( keyname != nullptr ) { + keyinfo += std::string( keyname ); + } + else { + switch( cKey ) { + + case GLFW_KEY_SPACE: { keyinfo += "Space"; break; } + case GLFW_KEY_ENTER: { keyinfo += "Enter"; break; } + case GLFW_KEY_ESCAPE: { keyinfo += "Esc"; break; } + case GLFW_KEY_TAB: { keyinfo += "Tab"; break; } + case GLFW_KEY_INSERT: { keyinfo += "Insert"; break; } + case GLFW_KEY_DELETE: { keyinfo += "Delete"; break; } + case GLFW_KEY_HOME: { keyinfo += "Home"; break; } + case GLFW_KEY_END: { keyinfo += "End"; break; } + case GLFW_KEY_F1: { keyinfo += "F1"; break; } + case GLFW_KEY_F2: { keyinfo += "F2"; break; } + case GLFW_KEY_F3: { keyinfo += "F3"; break; } + case GLFW_KEY_F4: { keyinfo += "F4"; break; } + case GLFW_KEY_F5: { keyinfo += "F5"; break; } + case GLFW_KEY_F6: { keyinfo += "F6"; break; } + case GLFW_KEY_F7: { keyinfo += "F7"; break; } + case GLFW_KEY_F8: { keyinfo += "F8"; break; } + case GLFW_KEY_F9: { keyinfo += "F9"; break; } + case GLFW_KEY_F10: { keyinfo += "F10"; break; } + case GLFW_KEY_F11: { keyinfo += "F11"; break; } + case GLFW_KEY_F12: { keyinfo += "F12"; break; } + case GLFW_KEY_PAUSE: { keyinfo += "Pause"; break; } + } + } + if( keyinfo.empty() == false ) { + + std::string keymodifiers; + if( Global.shiftState ) + keymodifiers += "[Shift]+"; + if( Global.ctrlState ) + keymodifiers += "[Ctrl]+"; + + WriteLog( "Key pressed: " + keymodifiers + "[" + keyinfo + "]" ); + } + + // actual key processing + // TODO: redo the input system + if( ( cKey >= GLFW_KEY_0 ) && ( cKey <= GLFW_KEY_9 ) ) // klawisze cyfrowe + { + int i = cKey - GLFW_KEY_0; // numer klawisza + if (Global.shiftState) { + // z [Shift] uruchomienie eventu + if( ( false == Global.iPause ) // podczas pauzy klawisze nie działają + && ( KeyEvents[ i ] != nullptr ) ) { + simulation::Events.AddToQuery( KeyEvents[ i ], NULL ); + } + } + else // zapamiętywanie kamery może działać podczas pauzy + if( FreeFlyModeFlag ) { + // w trybie latania można przeskakiwać do ustawionych kamer + if( ( !Global.FreeCameraInit[ i ].x ) + && ( !Global.FreeCameraInit[ i ].y ) + && ( !Global.FreeCameraInit[ i ].z ) ) { + // jeśli kamera jest w punkcie zerowym, zapamiętanie współrzędnych i kątów + Global.FreeCameraInit[ i ] = Camera.Pos; + Global.FreeCameraInitAngle[ i ].x = Camera.Pitch; + Global.FreeCameraInitAngle[ i ].y = Camera.Yaw; + Global.FreeCameraInitAngle[ i ].z = Camera.Roll; + // logowanie, żeby można było do scenerii przepisać + WriteLog( + "camera " + std::to_string( Global.FreeCameraInit[ i ].x ) + " " + + std::to_string( Global.FreeCameraInit[ i ].y ) + " " + + std::to_string( Global.FreeCameraInit[ i ].z ) + " " + + std::to_string( RadToDeg( Global.FreeCameraInitAngle[ i ].x ) ) + " " + + std::to_string( RadToDeg( Global.FreeCameraInitAngle[ i ].y ) ) + " " + + std::to_string( RadToDeg( Global.FreeCameraInitAngle[ i ].z ) ) + " " + + std::to_string( i ) + " endcamera" ); + } + else // również przeskakiwanie + { // Ra: to z tą kamerą (Camera.Pos i Global.pCameraPosition) jest trochę bez sensu + Global.pCameraPosition = Global.FreeCameraInit[ i ]; // nowa pozycja dla generowania obiektów + Camera.Init( Global.FreeCameraInit[ i ], Global.FreeCameraInitAngle[ i ], TCameraType::tp_Free ); // przestawienie + } + } + // będzie jeszcze załączanie sprzęgów z [Ctrl] + } + else if( ( cKey >= GLFW_KEY_F1 ) && ( cKey <= GLFW_KEY_F12 ) ) + { + switch (cKey) { + + case GLFW_KEY_F1: { + + if( DebugModeFlag ) { + // additional simulation clock jump keys in debug mode + if( Global.ctrlState ) { + // ctrl-f1 + simulation::Time.update( 20.0 * 60.0 ); + } + else if( Global.shiftState ) { + // shift-f1 + simulation::Time.update( 5.0 * 60.0 ); + } + } + break; + } + + case GLFW_KEY_F4: { + + InOutKey( !Global.shiftState ); // distant view with Shift, short distance step out otherwise + break; + } + case GLFW_KEY_F5: { + // przesiadka do innego pojazdu + if( false == FreeFlyModeFlag ) { + // only available in free fly mode + break; + } + + TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 50, true, false ) ); + + if( tmp != nullptr ) { + + if( simulation::Train ) {// jeśli mielismy pojazd + if( simulation::Train->Dynamic()->Mechanik ) { // na skutek jakiegoś błędu może czasem zniknąć + simulation::Train->Dynamic()->Mechanik->TakeControl( true ); // oddajemy dotychczasowy AI + } + } + + if( ( true == DebugModeFlag ) + || ( tmp->MoverParameters->Vel <= 5.0 ) ) { + // works always in debug mode, or for stopped/slow moving vehicles otherwise + if( simulation::Train == nullptr ) { + simulation::Train = new TTrain(); // jeśli niczym jeszcze nie jeździlismy + } + if( simulation::Train->Init( tmp ) ) { // przejmujemy sterowanie + simulation::Train->Dynamic()->Mechanik->TakeControl( false ); + } + else { + SafeDelete( simulation::Train ); // i nie ma czym sterować + } + if( simulation::Train ) { + InOutKey(); // do kabiny + } + } + } + break; + } + case GLFW_KEY_F6: { + // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! + if( DebugModeFlag ) { + + if( Global.ctrlState ) { Global.fTimeSpeed = ( Global.shiftState ? 60.0 : 20.0 ); } + else { Global.fTimeSpeed = ( Global.shiftState ? 5.0 : 1.0 ); } + } + break; + } + case GLFW_KEY_F7: { + // debug mode functions + if( DebugModeFlag ) { + + if( Global.ctrlState + && Global.shiftState ) { + // shift + ctrl + f7 toggles between debug and regular camera + DebugCameraFlag = !DebugCameraFlag; + } + else if( Global.ctrlState ) { + // ctrl + f7 toggles static daylight + simulation::Environment.toggle_daylight(); + break; + } + else if( Global.shiftState ) { + // shift + f7 is currently unused + } + else { + // f7: wireframe toggle + // TODO: pass this to renderer instead of making direct calls + Global.bWireFrame = !Global.bWireFrame; + if( true == Global.bWireFrame ) { + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + } + else { + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + } + } + } + break; + } + case GLFW_KEY_F11: { + // editor mode + if( ( false == Global.ctrlState ) + && ( false == Global.shiftState ) ) { + Application.push_mode( eu07_application::mode::editor ); + } + break; + } + case GLFW_KEY_F12: { + // quick debug mode toggle + if( Global.ctrlState + && Global.shiftState ) { + DebugModeFlag = !DebugModeFlag; + } + break; + } + + default: { + break; + } + } + // if (cKey!=VK_F4) + return; // nie są przekazywane do pojazdu wcale + } + + if ((Global.iTextMode == GLFW_KEY_F12) ? (cKey >= '0') && (cKey <= '9') : false) + { // tryb konfiguracji debugmode (przestawianie kamery już wyłączone + if (!Global.shiftState) // bez [Shift] + { + if (cKey == GLFW_KEY_1) + Global.iWriteLogEnabled ^= 1; // włącz/wyłącz logowanie do pliku + else if (cKey == GLFW_KEY_2) + { // włącz/wyłącz okno konsoli + Global.iWriteLogEnabled ^= 2; + if ((Global.iWriteLogEnabled & 2) == 0) // nie było okienka + { // otwarcie okna + AllocConsole(); // jeśli konsola już jest, to zwróci błąd; uwalniać nie ma po + // co, bo się odłączy + SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN); + } + } + // else if (cKey=='3') Global.iWriteLogEnabled^=4; //wypisywanie nazw torów + } + } + else if( cKey == GLFW_KEY_ESCAPE ) { + // toggle pause + if( Global.iPause & 1 ) // jeśli pauza startowa + Global.iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować + else if( !( Global.iMultiplayer & 2 ) ) // w multiplayerze pauza nie ma sensu + Global.iPause ^= 2; // zmiana stanu zapauzowania + if( Global.iPause ) {// jak pauza + Global.iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację + } + } + else { + + if( ( true == DebugModeFlag ) + && ( false == Global.shiftState ) + && ( true == Global.ctrlState ) + && ( simulation::Train != nullptr ) + && ( simulation::Train->Dynamic()->Controller == Humandriver ) ) { + + if( DebugModeFlag ) { + // przesuwanie składu o 100m + auto *vehicle { simulation::Train->Dynamic() }; + TDynamicObject *d = vehicle; + if( cKey == GLFW_KEY_LEFT_BRACKET ) { + while( d ) { + d->Move( 100.0 * d->DirectionGet() ); + d = d->Next(); // pozostałe też + } + d = vehicle->Prev(); + while( d ) { + d->Move( 100.0 * d->DirectionGet() ); + d = d->Prev(); // w drugą stronę też + } + } + else if( cKey == GLFW_KEY_RIGHT_BRACKET ) { + while( d ) { + d->Move( -100.0 * d->DirectionGet() ); + d = d->Next(); // pozostałe też + } + d = vehicle->Prev(); + while( d ) { + d->Move( -100.0 * d->DirectionGet() ); + d = d->Prev(); // w drugą stronę też + } + } + else if( cKey == GLFW_KEY_TAB ) { + while( d ) { + d->MoverParameters->V += d->DirectionGet()*2.78; + d = d->Next(); // pozostałe też + } + d = vehicle->Prev(); + while( d ) { + d->MoverParameters->V += d->DirectionGet()*2.78; + d = d->Prev(); // w drugą stronę też + } + } + } + } + } +} + +// places camera outside the controlled vehicle, or nearest if nothing is under control +// depending on provided switch the view is placed right outside, or at medium distance +void +driver_mode::DistantView( bool const Near ) { + + TDynamicObject const *vehicle = { ( + ( simulation::Train != nullptr ) ? + simulation::Train->Dynamic() : + pDynamicNearest ) }; + + if( vehicle == nullptr ) { return; } + + auto const cab = + ( vehicle->MoverParameters->ActiveCab == 0 ? + 1 : + vehicle->MoverParameters->ActiveCab ); + auto const left = vehicle->VectorLeft() * cab; + + if( true == Near ) { + + Camera.Pos = + Math3D::vector3( Camera.Pos.x, vehicle->GetPosition().y, Camera.Pos.z ) + + left * vehicle->GetWidth() + + Math3D::vector3( 1.25 * left.x, 1.6, 1.25 * left.z ); + } + else { + + Camera.Pos = + vehicle->GetPosition() + + vehicle->VectorFront() * vehicle->MoverParameters->ActiveCab * 50.0 + + Math3D::vector3( -10.0 * left.x, 1.6, -10.0 * left.z ); + } + + Camera.LookAt = vehicle->GetPosition(); + Camera.RaLook(); // jednorazowe przestawienie kamery +} + +// ustawienie śledzenia pojazdu +void +driver_mode::FollowView(bool wycisz) { + + Camera.Reset(); // likwidacja obrotów - patrzy horyzontalnie na południe + + auto *train { simulation::Train }; + + if (train != nullptr ) // jest pojazd do prowadzenia? + { + if (FreeFlyModeFlag) + { // jeżeli poza kabiną, przestawiamy w jej okolicę - OK + // wyłączenie trzęsienia na siłę? + train->Dynamic()->ABuSetModelShake( {} ); + + DistantView(); // przestawienie kamery + //żeby nie bylo numerów z 'fruwajacym' lokiem - konsekwencja bujania pudła + // tu ustawić nową, bo od niej liczą się odległości + Global.pCameraPosition = Camera.Pos; + } + else { + Camera.Pos = train->pMechPosition; + // potentially restore cached camera angles + Camera.Pitch = train->pMechViewAngle.x; + Camera.Yaw = train->pMechViewAngle.y; + + Camera.Roll = std::atan(train->pMechShake.x * train->fMechRoll); // hustanie kamery na boki + Camera.Pitch -= 0.5 * std::atan(train->vMechVelocity.z * train->fMechPitch); // hustanie kamery przod tyl + + if( train->Occupied()->ActiveCab == 0 ) { + Camera.LookAt = + train->pMechPosition + + train->GetDirection() * 5.0; + } + else { + // patrz w strone wlasciwej kabiny + Camera.LookAt = + train->pMechPosition + + train->GetDirection() * 5.0 * train->Occupied()->ActiveCab; + } + train->pMechOffset = train->pMechSittingPosition; + } + } + else + DistantView(); +} + +void +driver_mode::ChangeDynamic() { + + auto *train { simulation::Train }; + if( train == nullptr ) { return; } + + auto *vehicle { train->Dynamic() }; + auto *occupied { train->Occupied() }; + auto *driver { vehicle->Mechanik }; + // Ra: to nie może być tak robione, to zbytnia proteza jest + if( driver ) { + // AI może sobie samo pójść + if( false == driver->AIControllFlag ) { + // tylko jeśli ręcznie prowadzony + // jeśli prowadzi AI, to mu nie robimy dywersji! + occupied->CabDeactivisation(); + occupied->ActiveCab = 0; + occupied->BrakeLevelSet( occupied->Handle->GetPos( bh_NP ) ); //rozwala sterowanie hamulcem GF 04-2016 + vehicle->MechInside = false; + vehicle->Controller = AIdriver; + } + } + TDynamicObject *temp = Global.changeDynObj; + vehicle->bDisplayCab = false; + vehicle->ABuSetModelShake( {} ); + + if( driver ) // AI może sobie samo pójść + if( false == driver->AIControllFlag ) { + // tylko jeśli ręcznie prowadzony + // przsunięcie obiektu zarządzającego + driver->MoveTo( temp ); + } + + train->DynamicSet( temp ); + // update helpers + train = simulation::Train; + vehicle = train->Dynamic(); + occupied = train->Occupied(); + driver = vehicle->Mechanik; + Global.asHumanCtrlVehicle = vehicle->name(); + if( driver ) // AI może sobie samo pójść + if( false == driver->AIControllFlag ) // tylko jeśli ręcznie prowadzony + { + occupied->LimPipePress = occupied->PipePress; + occupied->CabActivisation(); // załączenie rozrządu (wirtualne kabiny) + vehicle->MechInside = true; + vehicle->Controller = Humandriver; + } + train->InitializeCab( + occupied->CabNo, + vehicle->asBaseDir + occupied->TypeName + ".mmd" ); + if( false == FreeFlyModeFlag ) { + vehicle->bDisplayCab = true; + vehicle->ABuSetModelShake( {} ); // zerowanie przesunięcia przed powrotem? + train->MechStop(); + FollowView(); // na pozycję mecha + } + Global.changeDynObj = nullptr; +} + +void +driver_mode::InOutKey( bool const Near ) +{ // przełączenie widoku z kabiny na zewnętrzny i odwrotnie + FreeFlyModeFlag = !FreeFlyModeFlag; // zmiana widoku + + auto *train { simulation::Train }; + + if (FreeFlyModeFlag) { + // jeżeli poza kabiną, przestawiamy w jej okolicę - OK + if (train) { + // cache current cab position so there's no need to set it all over again after each out-in switch + train->pMechSittingPosition = train->pMechOffset; + + train->Dynamic()->bDisplayCab = false; + DistantView( Near ); + } + DebugCamera = Camera; + Global.DebugCameraPosition = DebugCamera.Pos; + } + else + { // jazda w kabinie + if (train) + { + train->Dynamic()->bDisplayCab = true; + // zerowanie przesunięcia przed powrotem? + train->Dynamic()->ABuSetModelShake( { 0, 0, 0 } ); + train->MechStop(); + FollowView(); // na pozycję mecha + } + else + FreeFlyModeFlag = true; // nadal poza kabiną + } + // update window title to reflect the situation + Application.set_title( Global.AppName + " (" + ( train != nullptr ? train->Occupied()->Name : "" ) + " @ " + Global.SceneryFile + ")" ); +} diff --git a/drivermode.h b/drivermode.h new file mode 100644 index 00000000..81085a66 --- /dev/null +++ b/drivermode.h @@ -0,0 +1,87 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "applicationmode.h" + +#include "driverkeyboardinput.h" +#include "drivermouseinput.h" +#include "gamepadinput.h" +#include "uart.h" +#include "console.h" +#include "camera.h" +#include "classes.h" + +class driver_mode : public application_mode { + +public: +// constructors + driver_mode(); + +// methods + // initializes internal data structures of the mode. returns: true on success, false otherwise + bool + init() override; + // mode-specific update of simulation data. returns: false on error, true otherwise + bool + update() override; + // maintenance method, called when the mode is activated + void + enter() override; + // maintenance method, called when the mode is deactivated + void + exit() override; + // input handlers + void + on_key( int const Key, int const Scancode, int const Action, int const Mods ) override; + void + on_cursor_pos( double const Horizontal, double const Vertical ) override; + void + on_mouse_button( int const Button, int const Action, int const Mods ) override; + void + on_scroll( double const Xoffset, double const Yoffset ) override; + +private: +// types + struct drivermode_input { + + gamepad_input gamepad; + mouse_input mouse; + glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode + driverkeyboard_input keyboard; + Console console; + std::unique_ptr uart; + + bool init(); + void poll(); + }; + +// methods + void update_camera( const double Deltatime ); + // handles vehicle change flag + void OnKeyDown( int cKey ); + void ChangeDynamic(); + void InOutKey( bool const Near = true ); + void FollowView( bool wycisz = true ); + void DistantView( bool const Near = false ); + +// members + drivermode_input m_input; + std::array KeyEvents { nullptr }; // eventy wyzwalane z klawiaury + TCamera Camera; + TCamera DebugCamera; + TDynamicObject *pDynamicNearest { nullptr }; // vehicle nearest to the active camera. TODO: move to camera + double fTime50Hz { 0.0 }; // bufor czasu dla komunikacji z PoKeys + double const m_primaryupdaterate { 1.0 / 100.0 }; + double const m_secondaryupdaterate { 1.0 / 50.0 }; + double m_primaryupdateaccumulator { m_secondaryupdaterate }; // keeps track of elapsed simulation time, for core fixed step routines + double m_secondaryupdateaccumulator { m_secondaryupdaterate }; // keeps track of elapsed simulation time, for less important fixed step routines + int iPause { 0 }; // wykrywanie zmian w zapauzowaniu +}; diff --git a/mouseinput.cpp b/drivermouseinput.cpp similarity index 98% rename from mouseinput.cpp rename to drivermouseinput.cpp index cc806416..2035b896 100644 --- a/mouseinput.cpp +++ b/drivermouseinput.cpp @@ -8,15 +8,15 @@ http://mozilla.org/MPL/2.0/. */ #include "stdafx.h" -#include "mouseinput.h" +#include "drivermouseinput.h" #include "application.h" #include "utilities.h" #include "globals.h" #include "timer.h" #include "simulation.h" -#include "world.h" #include "train.h" +#include "animmodel.h" #include "renderer.h" #include "uilayer.h" @@ -25,7 +25,7 @@ mouse_slider::bind( user_command const &Command ) { m_command = Command; - auto const *train { World.train() }; + auto const *train { simulation::Train }; TMoverParameters const *vehicle { nullptr }; switch( m_command ) { case user_command::mastercontrollerset: @@ -184,6 +184,11 @@ mouse_input::move( double Mousex, double Mousey ) { void mouse_input::button( int const Button, int const Action ) { + // store key state + if( Button >= 0 ) { + m_buttons[ Button ] = Action; + } + if( false == Global.ControlPicking ) { return; } if( true == FreeFlyModeFlag ) { @@ -236,7 +241,7 @@ mouse_input::button( int const Button, int const Action ) { } else { // if not release then it's press - auto const lookup = m_mousecommands.find( World.train()->GetLabel( GfxRenderer.Update_Pick_Control() ) ); + auto const lookup = m_mousecommands.find( simulation::Train->GetLabel( GfxRenderer.Update_Pick_Control() ) ); if( lookup != m_mousecommands.end() ) { // if the recognized element under the cursor has a command associated with the pressed button, notify the recipient mousecommand = ( @@ -301,6 +306,12 @@ mouse_input::button( int const Button, int const Action ) { } } +int +mouse_input::button( int const Button ) const { + + return m_buttons[ Button ]; +} + void mouse_input::poll() { diff --git a/mouseinput.h b/drivermouseinput.h similarity index 95% rename from mouseinput.h rename to drivermouseinput.h index c0fa2cb2..4e06c6b4 100644 --- a/mouseinput.h +++ b/drivermouseinput.h @@ -53,6 +53,8 @@ public: init(); void button( int const Button, int const Action ); + int + button( int const Button ) const; void move( double const Mousex, double const Mousey ); void @@ -87,6 +89,7 @@ private: glm::dvec2 m_cursorposition; // stored last cursor position, used for panning bool m_varyingpollrate { false }; // indicates rate of command repeats is affected by the cursor position glm::dvec2 m_varyingpollrateorigin; // helper, cursor position when the command was initiated + std::array m_buttons; }; //--------------------------------------------------------------------------- diff --git a/driveruilayer.cpp b/driveruilayer.cpp new file mode 100644 index 00000000..e103ac42 --- /dev/null +++ b/driveruilayer.cpp @@ -0,0 +1,904 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "driveruilayer.h" + +#include "globals.h" +#include "translation.h" +#include "simulation.h" +#include "simulationtime.h" +#include "event.h" +#include "camera.h" +#include "mtable.h" +#include "train.h" +#include "driver.h" +#include "animmodel.h" +#include "dynobj.h" +#include "model3d.h" +#include "renderer.h" +#include "utilities.h" +#include "logs.h" + +driver_ui::driver_ui() { + + clear_texts(); +/* + UIHeader = std::make_shared( 20, 20 ); // header ui panel + UITable = std::make_shared( 20, 100 ); // schedule or scan table + UITranscripts = std::make_shared( 85, 600 ); // voice transcripts +*/ + // make 4 empty lines for the ui header, to cut down on work down the road + UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + // bind the panels with ui object. maybe not the best place for this but, eh + push_back( &UIHeader ); + push_back( &UITable ); + push_back( &UITranscripts ); +} + +// potentially processes provided input key. returns: true if key was processed, false otherwise +bool +driver_ui::on_key( int const Key, int const Action ) { + // TODO: pass the input first through an active ui element if there's any + // if the ui element shows no interest or we don't have one, try to interpret the input yourself: + // shared conditions + switch( Key ) { + + case GLFW_KEY_F1: + case GLFW_KEY_F2: + case GLFW_KEY_F3: + case GLFW_KEY_F8: + case GLFW_KEY_F9: + case GLFW_KEY_F10: + case GLFW_KEY_F12: { // ui mode selectors + + if( ( true == Global.ctrlState ) + || ( true == Global.shiftState ) ) { + // only react to keys without modifiers + return false; + } + + if( Action == GLFW_RELEASE ) { return true; } // recognized, but ignored +/* + EditorModeFlag = ( Key == GLFW_KEY_F11 ); + if( ( true == EditorModeFlag ) + && ( false == Global.ControlPicking ) ) { + set_cursor( GLFW_CURSOR_NORMAL ); + Global.ControlPicking = true; + } +*/ + } + + default: { // everything else + break; + } + } + + switch (Key) { + + case GLFW_KEY_F1: { + // basic consist info + if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } + if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { + // wyłączenie napisów + Global.iTextMode = 0; + Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; + } + else { + Global.iTextMode = Key; + } + return true; + } + + case GLFW_KEY_F2: { + // parametry pojazdu + if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } + if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { + // wyłączenie napisów + Global.iTextMode = 0; + Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; + } + else { + Global.iTextMode = Key; + } + return true; + } + + case GLFW_KEY_F3: { + // timetable + if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } + if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { + // wyłączenie napisów + Global.iTextMode = 0; + Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; + } + else { + Global.iTextMode = Key; + } + return true; + } + + case GLFW_KEY_F8: { + // renderer debug data + Global.iTextMode = Key; + return true; + } + + case GLFW_KEY_F9: { + // wersja + Global.iTextMode = Key; + return true; + } + + case GLFW_KEY_F10: { + // quit + if( Global.iTextMode == Key ) { + Global.iTextMode = + ( Global.iPause && ( Key != GLFW_KEY_F1 ) ? + GLFW_KEY_F1 : + 0 ); // wyłączenie napisów, chyba że pauza + } + else { + Global.iTextMode = Key; + } + return true; + } +/* + case GLFW_KEY_F11: { + // scenario inspector + Global.iTextMode = Key; + return true; + } +*/ + case GLFW_KEY_F12: { + // coś tam jeszcze + Global.iTextMode = Key; + return true; + } + + case GLFW_KEY_Y: { + // potentially quit + if( Global.iTextMode != GLFW_KEY_F10 ) { return false; } // not in quit mode + + if( Action == GLFW_RELEASE ) { return true; } // recognized, but ignored + + glfwSetWindowShouldClose( m_window, 1 ); + return true; + } + + default: { + break; + } + } + + return false; +} + +// updates state of UI elements +void +driver_ui::update() { + + UITable.text_lines.clear(); + std::string uitextline1, uitextline2, uitextline3, uitextline4; + set_tooltip( "" ); + + auto const *train { simulation::Train }; + auto const *controlled { ( train ? train->Dynamic() : nullptr ) }; + auto const *camera { Global.pCamera }; + + if( ( train != nullptr ) && ( false == FreeFlyModeFlag ) ) { + if( false == DebugModeFlag ) { + // in regular mode show control functions, for defined controls + set_tooltip( locale::label_cab_control( train->GetLabel( GfxRenderer.Pick_Control() ) ) ); + } + else { + // in debug mode show names of submodels, to help with cab setup and/or debugging + auto const cabcontrol = GfxRenderer.Pick_Control(); + set_tooltip( ( cabcontrol ? cabcontrol->pName : "" ) ); + } + } + if( ( true == Global.ControlPicking ) && ( true == FreeFlyModeFlag ) && ( true == DebugModeFlag ) ) { + auto const scenerynode = GfxRenderer.Pick_Node(); + set_tooltip( + ( scenerynode ? + scenerynode->name() : + "" ) ); + } + + switch( Global.iTextMode ) { + + case( GLFW_KEY_F1 ) : { + // f1, default mode: current time and timetable excerpt + auto const &time = simulation::Time.data(); + uitextline1 = + "Time: " + + to_string( time.wHour ) + ":" + + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" + + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); + if( Global.iPause ) { + uitextline1 += " (paused)"; + } + + if( ( controlled != nullptr ) + && ( controlled->Mechanik != nullptr ) ) { + + auto const *mover = controlled->MoverParameters; + auto const *driver = controlled->Mechanik; + + uitextline2 = "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ); + if( mover->ActiveDir > 0 ) { uitextline2 += " D"; } + else if( mover->ActiveDir < 0 ) { uitextline2 += " R"; } + else { uitextline2 += " N"; } + + uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + to_string( mover->LocalBrakePosA * LocalBrakePosNo, 0 ) + ( mover->SlippingWheels ? " !" : " " ); + + uitextline4 = ( + true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? + "!ALERTER! " : + " " ); + uitextline4 += ( + true == TestFlag( mover->SecuritySystem.Status, s_active ) ? + "!SHP! " : + " " ); + + if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { + // detail mode on second key press + auto const speedlimit { static_cast( std::floor( driver->VelDesired ) ) }; + uitextline2 += + " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" + + " (limit: " + std::to_string( speedlimit ) + " km/h"; + auto const nextspeedlimit { static_cast( std::floor( driver->VelNext ) ) }; + if( nextspeedlimit != speedlimit ) { + uitextline2 += + ", new limit: " + std::to_string( nextspeedlimit ) + " km/h" + + " in " + to_string( driver->ActualProximityDist * 0.001, 1 ) + " km"; + } + uitextline2 += ")"; + auto const reverser { ( mover->ActiveDir > 0 ? 1 : -1 ) }; + auto const grade { controlled->VectorFront().y * 100 * ( controlled->DirectionGet() == reverser ? 1 : -1 ) * reverser }; + if( std::abs( grade ) >= 0.25 ) { + uitextline2 += " Grade: " + to_string( grade, 1 ) + "%"; + } + uitextline3 += + " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; + + auto const stoptime { static_cast( -1.0 * controlled->Mechanik->fStopTime ) }; + if( stoptime > 0 ) { + uitextline4 += " Loading/unloading in progress (" + to_string( stoptime ) + ( stoptime > 1 ? " seconds" : " second" ) + " left)"; + } + else { + auto const trackblockdistance{ std::abs( controlled->Mechanik->TrackBlock() ) }; + if( trackblockdistance <= 75.0 ) { + uitextline4 += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; + } + } + } + } + + break; + } + + case( GLFW_KEY_F2 ) : { + // timetable + auto *vehicle { + ( FreeFlyModeFlag ? + std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : + controlled ) }; // w trybie latania lokalizujemy wg mapy + + if( vehicle == nullptr ) { break; } + // if the nearest located vehicle doesn't have a direct driver, try to query its owner + auto const owner = ( + ( ( vehicle->Mechanik != nullptr ) && ( vehicle->Mechanik->Primary() ) ) ? + vehicle->Mechanik : + vehicle->ctOwner ); + if( owner == nullptr ){ break; } + + auto const *table = owner->TrainTimetable(); + if( table == nullptr ) { break; } + + auto const &time = simulation::Time.data(); + uitextline1 = + "Time: " + + to_string( time.wHour ) + ":" + + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" + + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); + if( Global.iPause ) { + uitextline1 += " (paused)"; + } + + uitextline2 = Bezogonkow( owner->Relation(), true ) + " (" + Bezogonkow( owner->TrainName(), true ) + ")"; + auto const nextstation = Bezogonkow( owner->NextStop(), true ); + if( !nextstation.empty() ) { + // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania + uitextline3 = " -> " + nextstation; + } + + if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { + + if( 0 == table->StationCount ) { + // only bother if there's stations to list + UITable.text_lines.emplace_back( "(no timetable)", Global.UITextColor ); + } + else { + // header + UITable.text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); + + TMTableLine const *tableline; + for( int i = owner->iStationStart; i <= std::min( owner->iStationStart + 10, table->StationCount ); ++i ) { + // wyświetlenie pozycji z rozkładu + tableline = table->TimeTable + i; // linijka rozkładu + + std::string vmax = + " " + + to_string( tableline->vmax, 0 ); + vmax = vmax.substr( vmax.size() - 3, 3 ); // z wyrównaniem do prawej + std::string const station = ( + Bezogonkow( tableline->StationName, true ) + + " " ) + .substr( 0, 34 ); + std::string const location = ( + ( tableline->km > 0.0 ? + to_string( tableline->km, 2 ) : + "" ) + + " " ) + .substr( 0, 34 - tableline->StationWare.size() ); + std::string const arrival = ( + tableline->Ah >= 0 ? + to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : + " | " ); + std::string const departure = ( + tableline->Dh >= 0 ? + to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : + " | " ); + auto const candeparture = ( + ( owner->iStationStart < table->StationIndex ) + && ( i < table->StationIndex ) + && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ); + auto traveltime = + " " + + ( i < 2 ? "" : + tableline->Ah >= 0 ? to_string( CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Ah, tableline->Am ), 0 ) : + to_string( std::max( 0.0, CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Dh, tableline->Dm ) - 0.5 ), 0 ) ); + traveltime = traveltime.substr( traveltime.size() - 3, 3 ); // z wyrównaniem do prawej + + UITable.text_lines.emplace_back( + ( "| " + vmax + " | " + station + " | " + arrival + " | " + traveltime + " |" ), + ( candeparture ? + glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono + Global.UITextColor ) ); + UITable.text_lines.emplace_back( + ( "| | " + location + tableline->StationWare + " | " + departure + " | |" ), + ( candeparture ? + glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono + Global.UITextColor ) ); + // divider/footer + UITable.text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); + } + if( owner->iStationStart + 10 < table->StationCount ) { + // if we can't display entire timetable, add a scrolling indicator at the bottom + UITable.text_lines.emplace_back( " ... ", Global.UITextColor ); + } + } + } + + break; + } + + case( GLFW_KEY_F3 ) : { + + auto const *vehicle { + ( FreeFlyModeFlag ? + std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : + controlled ) }; // w trybie latania lokalizujemy wg mapy + + if( vehicle != nullptr ) { + // jeśli domyślny ekran po pierwszym naciśnięciu + auto const *mover { vehicle->MoverParameters }; + + uitextline1 = "Vehicle name: " + mover->Name; + + if( ( vehicle->Mechanik == nullptr ) && ( vehicle->ctOwner ) ) { + // for cars other than leading unit indicate the leader + uitextline1 += ", owned by " + vehicle->ctOwner->OwnerName(); + } + uitextline1 += "; Status: " + mover->EngineDescription( 0 ); + + // informacja o sprzęgach + uitextline1 += + "; C0:" + + ( vehicle->PrevConnected ? + vehicle->PrevConnected->name() + ":" + to_string( mover->Couplers[ 0 ].CouplingFlag ) + ( + mover->Couplers[ 0 ].CouplingFlag == 0 ? + " (" + to_string( mover->Couplers[ 0 ].CoupleDist, 1 ) + " m)" : + "" ) : + "none" ); + uitextline1 += + " C1:" + + ( vehicle->NextConnected ? + vehicle->NextConnected->name() + ":" + to_string( mover->Couplers[ 1 ].CouplingFlag ) + ( + mover->Couplers[ 1 ].CouplingFlag == 0 ? + " (" + to_string( mover->Couplers[ 1 ].CoupleDist, 1 ) + " m)" : + "" ) : + "none" ); + + // equipment flags + uitextline2 = ( mover->Battery ? "B" : "." ); + uitextline2 += ( mover->Mains ? "M" : "." ); + uitextline2 += ( mover->PantRearUp ? ( mover->PantRearVolt > 0.0 ? "O" : "o" ) : "." ); + uitextline2 += ( mover->PantFrontUp ? ( mover->PantFrontVolt > 0.0 ? "P" : "p" ) : "." ); + uitextline2 += ( mover->PantPressLockActive ? "!" : ( mover->PantPressSwitchActive ? "*" : "." ) ); + uitextline2 += ( mover->WaterPump.is_active ? "W" : ( false == mover->WaterPump.breaker ? "-" : ( mover->WaterPump.is_enabled ? "w" : "." ) ) ); + uitextline2 += ( true == mover->WaterHeater.is_damaged ? "!" : ( mover->WaterHeater.is_active ? "H" : ( false == mover->WaterHeater.breaker ? "-" : ( mover->WaterHeater.is_enabled ? "h" : "." ) ) ) ); + uitextline2 += ( mover->FuelPump.is_active ? "F" : ( mover->FuelPump.is_enabled ? "f" : "." ) ); + uitextline2 += ( mover->OilPump.is_active ? "O" : ( mover->OilPump.is_enabled ? "o" : "." ) ); + uitextline2 += ( false == mover->ConverterAllowLocal ? "-" : ( mover->ConverterAllow ? ( mover->ConverterFlag ? "X" : "x" ) : "." ) ); + uitextline2 += ( mover->ConvOvldFlag ? "!" : "." ); + uitextline2 += ( mover->CompressorFlag ? "C" : ( false == mover->CompressorAllowLocal ? "-" : ( ( mover->CompressorAllow || mover->CompressorStart == start_t::automatic ) ? "c" : "." ) ) ); + uitextline2 += ( mover->CompressorGovernorLock ? "!" : "." ); + + auto const *train { simulation::Train }; + if( ( train != nullptr ) && ( train->Dynamic() == vehicle ) ) { + uitextline2 += ( mover->Radio ? " R: " : " r: " ) + std::to_string( train->RadioChannel() ); + } + uitextline2 += " Bdelay: "; + if( ( mover->BrakeDelayFlag & bdelay_G ) == bdelay_G ) + uitextline2 += "G"; + if( ( mover->BrakeDelayFlag & bdelay_P ) == bdelay_P ) + uitextline2 += "P"; + if( ( mover->BrakeDelayFlag & bdelay_R ) == bdelay_R ) + uitextline2 += "R"; + if( ( mover->BrakeDelayFlag & bdelay_M ) == bdelay_M ) + uitextline2 += "+Mg"; + + uitextline2 += ", Load: " + to_string( mover->Load, 0 ) + " (" + to_string( mover->LoadFlag, 0 ) + ")"; + + uitextline2 += + "; Pant: " + + to_string( mover->PantPress, 2 ) + + ( mover->bPantKurek3 ? "-ZG" : "|ZG" ); + + uitextline2 += + "; Ft: " + to_string( + mover->Ft * 0.001f * ( + mover->ActiveCab ? mover->ActiveCab : + vehicle->ctOwner ? vehicle->ctOwner->Controlling()->ActiveCab : + 1 ), 1 ) + + ", Fb: " + to_string( mover->Fb * 0.001f, 1 ) + + ", Fr: " + to_string( mover->Adhesive( mover->RunningTrack.friction ), 2 ) + + ( mover->SlippingWheels ? " (!)" : "" ); + + if( vehicle->Mechanik ) { + uitextline2 += "; Ag: " + to_string( vehicle->Mechanik->fAccGravity, 2 ) + " (" + ( vehicle->Mechanik->fAccGravity > 0.01 ? "\\" : ( vehicle->Mechanik->fAccGravity < -0.01 ? "/" : "-" ) ) + ")"; + } + + uitextline2 += + "; TC:" + + to_string( mover->TotalCurrent, 0 ); + auto const frontcouplerhighvoltage = + to_string( mover->Couplers[ side::front ].power_high.voltage, 0 ) + + "@" + + to_string( mover->Couplers[ side::front ].power_high.current, 0 ); + auto const rearcouplerhighvoltage = + to_string( mover->Couplers[ side::rear ].power_high.voltage, 0 ) + + "@" + + to_string( mover->Couplers[ side::rear ].power_high.current, 0 ); + uitextline2 += ", HV: "; + if( mover->Couplers[ side::front ].power_high.local == false ) { + uitextline2 += + "(" + frontcouplerhighvoltage + ")-" + + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" + + "-(" + rearcouplerhighvoltage + ")"; + } + else { + uitextline2 += + frontcouplerhighvoltage + + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" + + rearcouplerhighvoltage; + } + + uitextline3 += + "TrB: " + to_string( mover->BrakePress, 2 ) + + ", " + to_hex_str( mover->Hamulec->GetBrakeStatus(), 2 ); + + uitextline3 += + "; LcB: " + to_string( mover->LocBrakePress, 2 ) + + "; hat: " + to_string( mover->BrakeCtrlPos2, 2 ) + + "; pipes: " + to_string( mover->PipePress, 2 ) + + "/" + to_string( mover->ScndPipePress, 2 ) + + "/" + to_string( mover->EqvtPipePress, 2 ) + + ", MT: " + to_string( mover->CompressedVolume, 3 ) + + ", BT: " + to_string( mover->Volume, 3 ) + + ", CtlP: " + to_string( mover->CntrlPipePress, 3 ) + + ", CtlT: " + to_string( mover->Hamulec->GetCRP(), 3 ); + + if( mover->ManualBrakePos > 0 ) { + + uitextline3 += "; manual brake on"; + } + + if( vehicle->Mechanik ) { + // o ile jest ktoś w środku + std::string flags = "cpapcplhhndoiefgvdpseil "; // flagi AI (definicja w Driver.h) + for( int i = 0, j = 1; i < 23; ++i, j <<= 1 ) + if( false == ( vehicle->Mechanik->DrivigFlags() & j ) ) // jak bit ustawiony + flags[ i ] = '.';// std::toupper( flags[ i ] ); // ^= 0x20; // to zmiana na wielką literę + + uitextline4 = flags; + + uitextline4 += + "Driver: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) + + " Ad=" + to_string( vehicle->Mechanik->AccDesired, 2 ) + + " Ah=" + to_string( vehicle->Mechanik->fAccThreshold, 2 ) + + "@" + to_string( vehicle->Mechanik->fBrake_a0[ 0 ], 2 ) + + "+" + to_string( vehicle->Mechanik->fBrake_a1[ 0 ], 2 ) + + " Bd=" + to_string( vehicle->Mechanik->fBrakeDist, 0 ) + + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ) + + " VSl=" + to_string( vehicle->Mechanik->VelSignalLast, 0 ) + + " VLl=" + to_string( vehicle->Mechanik->VelLimitLast, 0 ) + + " VRd=" + to_string( vehicle->Mechanik->VelRoad, 0 ) + + " VRst=" + to_string( vehicle->Mechanik->VelRestricted, 0 ); + + if( ( vehicle->Mechanik->VelNext == 0.0 ) + && ( vehicle->Mechanik->eSignNext ) ) { + // jeśli ma zapamiętany event semafora, nazwa eventu semafora + uitextline4 += " (" + Bezogonkow( vehicle->Mechanik->eSignNext->asName ) + ")"; + } + + // biezaca komenda dla AI + uitextline4 += ", command: " + vehicle->Mechanik->OrderCurrent(); + } + + if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { + // f2 screen, track scan mode + if( vehicle->Mechanik == nullptr ) { + //żeby była tabelka, musi być AI + break; + } + + std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( vehicle->Mechanik->TableSize() ) - 1, 0, 30 ); + do { + std::string scanline = vehicle->Mechanik->TableText( i ); + if( scanline.empty() ) { break; } + UITable.text_lines.emplace_back( Bezogonkow( scanline ), Global.UITextColor ); + ++i; + } while( i < speedtablesize ); // TController:iSpeedTableSize TODO: change when the table gets recoded + } + } + else { + // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika + uitextline1 = + "Camera position: " + + to_string( camera->Pos.x, 2 ) + " " + + to_string( camera->Pos.y, 2 ) + " " + + to_string( camera->Pos.z, 2 ) + + ", azimuth: " + + to_string( 180.0 - glm::degrees( camera->Yaw ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód + + " " + + std::string( "S SEE NEN NWW SW" ) + .substr( 0 + 2 * floor( fmod( 8 + ( camera->Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); + // current luminance level + uitextline2 = "Light level: " + to_string( Global.fLuminance, 3 ); + if( Global.FakeLight ) { uitextline2 += "(*)"; } + } + + break; + } + + case( GLFW_KEY_F8 ) : { + // gfx renderer data + uitextline1 = + "FoV: " + to_string( Global.FieldOfView / Global.ZoomFactor, 1 ) + + ", Draw range x " + to_string( Global.fDistanceFactor, 1 ) +// + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) +// + ", FPS: " + to_string( Timer::GetFPS(), 2 ); + + ", FPS: " + std::to_string( static_cast(std::round(GfxRenderer.Framerate())) ); + if( Global.iSlowMotion ) { + uitextline1 += " (slowmotion " + to_string( Global.iSlowMotion ) + ")"; + } + + uitextline2 = + std::string( "Rendering mode: " ) + + ( Global.bUseVBO ? + "VBO" : + "Display Lists" ) + + " "; + if( false == Global.LastGLError.empty() ) { + uitextline2 += + "Last openGL error: " + + Global.LastGLError; + } + // renderer stats + uitextline3 = GfxRenderer.info_times(); + uitextline4 = GfxRenderer.info_stats(); + + break; + } + + case( GLFW_KEY_F9 ) : { + // informacja o wersji + uitextline1 = "MaSzyna " + Global.asVersion; // informacja o wersji + if( Global.iMultiplayer ) { + uitextline1 += " (multiplayer mode is active)"; + } + uitextline3 = + "vehicles: " + to_string( Timer::subsystem.sim_dynamics.average(), 2 ) + " msec" + + " update total: " + to_string( Timer::subsystem.sim_total.average(), 2 ) + " msec"; + // current event queue + auto const time { Timer::GetTime() }; + auto const *event { simulation::Events.begin() }; + auto eventtableindex{ 0 }; + while( ( event != nullptr ) + && ( eventtableindex < 30 ) ) { + + if( ( false == event->m_ignored ) + && ( true == event->bEnabled ) ) { + + auto const delay { " " + to_string( std::max( 0.0, event->fStartTime - time ), 1 ) }; + auto const eventline = + "Delay: " + delay.substr( delay.length() - 6 ) + + ", Event: " + event->asName + + ( event->Activator ? " (by: " + event->Activator->asName + ")" : "" ) + + ( event->evJoined ? " (joint event)" : "" ); + + UITable.text_lines.emplace_back( eventline, Global.UITextColor ); + ++eventtableindex; + } + event = event->evNext; + } + + break; + } + + case( GLFW_KEY_F10 ) : { + + uitextline1 = "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]."; + + break; + } + + case( GLFW_KEY_F12 ) : { + // opcje włączenia i wyłączenia logowania + uitextline1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); + uitextline2 = "[1] log.txt " + std::string( ( Global.iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); + uitextline3 = "[2] Console " + std::string( ( Global.iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); + + break; + } + + default: { + // uncovered cases, nothing to do here... + // ... unless we're in debug mode + if( DebugModeFlag ) { + + auto const *vehicle { + ( FreeFlyModeFlag ? + std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : + controlled ) }; // w trybie latania lokalizujemy wg mapy + if( vehicle == nullptr ) { + break; + } + auto const *mover { vehicle->MoverParameters }; + uitextline1 = + "vel: " + to_string( vehicle->GetVelocity(), 2 ) + "/" + to_string( mover->nrot* M_PI * mover->WheelDiameter * 3.6, 2 ) + + " km/h;" + ( mover->SlippingWheels ? " (!)" : " " ) + + " dist: " + to_string( mover->DistCounter, 2 ) + " km" + + "; pos: [" + to_string( vehicle->GetPosition().x, 2 ) + ", " + to_string( vehicle->GetPosition().y, 2 ) + ", " + to_string( vehicle->GetPosition().z, 2 ) + "]" + + ", PM=" + to_string( mover->WheelFlat, 1 ) + + " mm; enpwr=" + to_string( mover->EnginePower, 1 ) + + "; enrot=" + to_string( mover->enrot * 60, 0 ) + + " tmrot=" + to_string( std::abs( mover->nrot ) * mover->Transmision.Ratio * 60, 0 ) + + "; ventrot=" + to_string( mover->RventRot * 60, 1 ) + + "; fanrot=" + to_string( mover->dizel_heat.rpmw, 1 ) + ", " + to_string( mover->dizel_heat.rpmw2, 1 ); + + uitextline2 = + "HamZ=" + to_string( mover->fBrakeCtrlPos, 2 ) + + "; HamP=" + to_string( mover->LocalBrakePosA, 2 ) + + "; NasJ=" + std::to_string( mover->MainCtrlPos ) + "(" + std::to_string( mover->MainCtrlActualPos ) + ")" + + ( ( mover->ShuntMode && mover->EngineType == TEngineType::DieselElectric ) ? + "; NasB=" + to_string( mover->AnPos, 2 ) : + "; NasB=" + std::to_string( mover->ScndCtrlPos ) + "(" + std::to_string( mover->ScndCtrlActualPos ) + ")" ) + + "; I=" + + ( mover->TrainType == dt_EZT ? + std::to_string( int( mover->ShowCurrent( 0 ) ) ) : + std::to_string( int( mover->Im ) ) ) + + "; U=" + to_string( int( mover->RunningTraction.TractionVoltage + 0.5 ) ) + + "; R=" + + ( std::abs( mover->RunningShape.R ) > 10000.0 ? + "~0.0" : + to_string( mover->RunningShape.R, 1 ) ) + + " An=" + to_string( mover->AccN, 2 ); // przyspieszenie poprzeczne + + if( tprev != simulation::Time.data().wSecond ) { + tprev = simulation::Time.data().wSecond; + Acc = ( mover->Vel - VelPrev ) / 3.6; + VelPrev = mover->Vel; + } + uitextline2 += "; As=" + to_string( Acc, 2 ); // przyspieszenie wzdłużne +// uitextline2 += " eAngle=" + to_string( std::cos( mover->eAngle ), 2 ); + uitextline2 += "; oilP=" + to_string( mover->OilPump.pressure_present, 3 ); + uitextline2 += " oilT=" + to_string( mover->dizel_heat.To, 2 ); + uitextline2 += "; waterT=" + to_string( mover->dizel_heat.temperatura1, 2 ); + uitextline2 += ( mover->WaterCircuitsLink ? "-" : "|" ); + uitextline2 += to_string( mover->dizel_heat.temperatura2, 2 ); + uitextline2 += "; engineT=" + to_string( mover->dizel_heat.Ts, 2 ); + + uitextline3 = + "cyl.ham. " + to_string( mover->BrakePress, 2 ) + + "; prz.gl. " + to_string( mover->PipePress, 2 ) + + "; zb.gl. " + to_string( mover->CompressedVolume, 2 ) + // youBy - drugi wezyk + + "; p.zas. " + to_string( mover->ScndPipePress, 2 ); + + // McZapkie: warto wiedziec w jakim stanie sa przelaczniki + if( mover->ConvOvldFlag ) + uitextline3 += " C! "; + else if( mover->FuseFlag ) + uitextline3 += " F! "; + else if( !mover->Mains ) + uitextline3 += " () "; + else { + switch( + mover->ActiveDir * + ( mover->Imin == mover->IminLo ? + 1 : + 2 ) ) { + case 2: { uitextline3 += " >> "; break; } + case 1: { uitextline3 += " -> "; break; } + case 0: { uitextline3 += " -- "; break; } + case -1: { uitextline3 += " <- "; break; } + case -2: { uitextline3 += " << "; break; } + } + } + // McZapkie: predkosc szlakowa + if( mover->RunningTrack.Velmax == -1 ) { + uitextline3 += " Vtrack=Vmax"; + } + else { + uitextline3 += " Vtrack " + to_string( mover->RunningTrack.Velmax, 2 ); + } + + if( ( mover->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) + || ( mover->TrainType == dt_EZT ) ) { + uitextline3 += + "; pant. " + to_string( mover->PantPress, 2 ) + + ( mover->bPantKurek3 ? "=" : "^" ) + "ZG"; + } + + // McZapkie: komenda i jej parametry + if( mover->CommandIn.Command != ( "" ) ) { + uitextline4 = + "C:" + mover->CommandIn.Command + + " V1=" + to_string( mover->CommandIn.Value1, 0 ) + + " V2=" + to_string( mover->CommandIn.Value2, 0 ); + } + if( ( vehicle->Mechanik ) + && ( vehicle->Mechanik->AIControllFlag == AIdriver ) ) { + uitextline4 += + "AI: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) + + " ad=" + to_string(vehicle->Mechanik->AccDesired, 2) + + "/" + to_string(vehicle->Mechanik->AccDesired*vehicle->Mechanik->BrakeAccFactor(), 2) + + " atrain=" + to_string(vehicle->Mechanik->fBrake_a0[0], 2) + + "+" + to_string(vehicle->Mechanik->fBrake_a1[0], 2) + + " aS=" + to_string(vehicle->Mechanik->AbsAccS_pub, 2) + + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) + + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ); + } + + // induction motor data + if( mover->EngineType == TEngineType::ElectricInductionMotor ) { + + UITable.text_lines.emplace_back( " eimc: eimv: press:", Global.UITextColor ); + for( int i = 0; i <= 20; ++i ) { + + std::string parameters = + mover->eimc_labels[ i ] + to_string( mover->eimc[ i ], 2, 9 ) + + " | " + + mover->eimv_labels[ i ] + to_string( mover->eimv[ i ], 2, 9 ); + + if( i < 10 ) { + parameters += " | " + train->fPress_labels[i] + to_string( train->fPress[ i ][ 0 ], 2, 9 ); + } + else if( i == 12 ) { + parameters += " med:"; + } + else if( i >= 13 ) { + parameters += " | " + vehicle->MED_labels[ i - 13 ] + to_string( vehicle->MED[ 0 ][ i - 13 ], 2, 9 ); + } + + UITable.text_lines.emplace_back( parameters, Global.UITextColor ); + } + } + if (mover->EngineType == TEngineType::DieselEngine) { + std::string parameters = "param value"; + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "efill: " + to_string(mover->dizel_fill, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "etorq: " + to_string(mover->dizel_Torque, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "creal: " + to_string(mover->dizel_engage, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "cdesi: " + to_string(mover->dizel_engagestate, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "cdelt: " + to_string(mover->dizel_engagedeltaomega, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "gears: " + to_string(mover->dizel_automaticgearstatus, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hydro value"; + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCnI: " + to_string(mover->hydro_TC_nIn, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCnO: " + to_string(mover->hydro_TC_nOut, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCTM: " + to_string(mover->hydro_TC_TMRatio, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCTI: " + to_string(mover->hydro_TC_TorqueIn, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCTO: " + to_string(mover->hydro_TC_TorqueOut, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCfl: " + to_string(mover->hydro_TC_Fill, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + parameters = "hTCLR: " + to_string(mover->hydro_TC_LockupRate, 2, 9); + UITable.text_lines.emplace_back(parameters, Global.UITextColor); + //parameters = "hTCXX: " + to_string(mover->hydro_TC_nIn, 2, 9); + //UITable.text_lines.emplace_back(parameters, Global.UITextColor); + } + + } // if( DebugModeFlag && Controlled ) + + break; + } + } + +#ifdef EU07_USE_OLD_UI_CODE + if( Controlled && DebugModeFlag && !Global.iTextMode ) { + + uitextline1 += + ( "; d_omega " ) + to_string( Controlled->MoverParameters->dizel_engagedeltaomega, 3 ); + + if( Controlled->MoverParameters->EngineType == ElectricInductionMotor ) { + + for( int i = 0; i <= 8; i++ ) { + for( int j = 0; j <= 9; j++ ) { + glRasterPos2f( 0.05f + 0.03f * i, 0.16f - 0.01f * j ); + uitextline4 = to_string( Train->fEIMParams[ i ][ j ], 2 ); + } + } + } + } +#endif + + // update the ui header texts + auto &headerdata = UIHeader.text_lines; + headerdata[ 0 ].data = uitextline1; + headerdata[ 1 ].data = uitextline2; + headerdata[ 2 ].data = uitextline3; + headerdata[ 3 ].data = uitextline4; + + // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) + auto &transcripts = UITranscripts.text_lines; + transcripts.clear(); + for( auto const &transcript : ui::Transcripts.aLines ) { + + if( Global.fTimeAngleDeg >= transcript.fShow ) { + + cParser parser( transcript.asText ); + while( true == parser.getTokens( 1, false, "|" ) ) { + + std::string transcriptline; parser >> transcriptline; + transcripts.emplace_back( transcriptline, glm::vec4( 1.0f, 1.0f, 0.0f, 1.0f ) ); + } + } + } + +} diff --git a/driveruilayer.h b/driveruilayer.h new file mode 100644 index 00000000..6d22e578 --- /dev/null +++ b/driveruilayer.h @@ -0,0 +1,36 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "uilayer.h" + +class driver_ui : public ui_layer { + +public: +// constructors + driver_ui(); +// methods + // potentially processes provided input key. returns: true if the input was processed, false otherwise + bool + on_key( int const Key, int const Action ) override; + // updates state of UI elements + void + update() override; + +private: +// members + ui_panel UIHeader { 20, 20 }; // header ui panel + ui_panel UITable { 20, 100 };// schedule or scan table + ui_panel UITranscripts { 85, 600 }; // voice transcripts + int tprev { 0 }; // poprzedni czas + double VelPrev { 0.0 }; // poprzednia prędkość + double Acc { 0.0 }; // przyspieszenie styczne + +}; diff --git a/dumb3d.h b/dumb3d.h index ceec7c21..8a39af53 100644 --- a/dumb3d.h +++ b/dumb3d.h @@ -68,12 +68,13 @@ class vector3 vector3( scalar_t X, scalar_t Y, scalar_t Z ) : x( X ), y( Y ), z( Z ) {} - vector3( glm::dvec3 const &Vector ) : + template + vector3( glm::tvec3 const &Vector ) : x( Vector.x ), y( Vector.y ), z( Vector.z ) {} - template - operator glm::tvec3() const { - return glm::tvec3{ x, y, z }; } + template + operator glm::tvec3() const { + return glm::tvec3{ x, y, z }; } // The int parameter is the number of elements to copy from initArray (3 or 4) // explicit vector3(scalar_t* initArray, int arraySize = 3) // { for (int i = 0;i(); +} + +// initializes internal data structures of the mode. returns: true on success, false otherwise +bool +editor_mode::init() { + + Camera.Init( {}, {}, TCameraType::tp_Free ); + + return m_input.init(); +} + +// mode-specific update of simulation data. returns: false on error, true otherwise +bool +editor_mode::update() { + + Timer::UpdateTimers( true ); + + simulation::State.update_clocks(); + simulation::Environment.update(); + + // render time routines follow: + auto const deltarealtime = Timer::GetDeltaRenderTime(); // nie uwzględnia pauzowania ani mnożenia czasu + + // fixed step render time routines: + fTime50Hz += deltarealtime; // w pauzie też trzeba zliczać czas, bo przy dużym FPS będzie problem z odczytem ramek + while( fTime50Hz >= 1.0 / 50.0 ) { + Console::Update(); // to i tak trzeba wywoływać + m_userinterface->update(); + // decelerate camera + Camera.Velocity *= 0.65; + if( std::abs( Camera.Velocity.x ) < 0.01 ) { Camera.Velocity.x = 0.0; } + if( std::abs( Camera.Velocity.y ) < 0.01 ) { Camera.Velocity.y = 0.0; } + if( std::abs( Camera.Velocity.z ) < 0.01 ) { Camera.Velocity.z = 0.0; } + + fTime50Hz -= 1.0 / 50.0; + } + + // variable step render time routines: + update_camera( deltarealtime ); + + simulation::Region->update_sounds(); + audio::renderer.update( deltarealtime ); + + GfxRenderer.Update( deltarealtime ); + + simulation::is_ready = true; + + m_input.poll(); + + return true; +} + +void +editor_mode::update_camera( double const Deltatime ) { + + // uwzględnienie ruchu wywołanego klawiszami + Camera.Update(); + // reset window state, it'll be set again if applicable in a check below + Global.CabWindowOpen = false; + // all done, update camera position to the new value + Global.pCameraPosition = Camera.Pos; +} + +// maintenance method, called when the mode is activated +void +editor_mode::enter() { + + m_statebackup = { Global.pCamera, FreeFlyModeFlag, Global.ControlPicking }; + + Global.pCamera = &Camera; + FreeFlyModeFlag = true; + Global.ControlPicking = true; + EditorModeFlag = true; + + Application.set_cursor( GLFW_CURSOR_NORMAL ); +} + +// maintenance method, called when the mode is deactivated +void +editor_mode::exit() { + + EditorModeFlag = false; + Global.ControlPicking = m_statebackup.picking; + FreeFlyModeFlag = m_statebackup.freefly; + Global.pCamera = m_statebackup.camera; + + Application.set_cursor( + ( Global.ControlPicking ? + GLFW_CURSOR_NORMAL : + GLFW_CURSOR_DISABLED ) ); +} + +void +editor_mode::on_key( int const Key, int const Scancode, int const Action, int const Mods ) { + + Global.shiftState = ( Mods & GLFW_MOD_SHIFT ) ? true : false; + Global.ctrlState = ( Mods & GLFW_MOD_CONTROL ) ? true : false; + Global.altState = ( Mods & GLFW_MOD_ALT ) ? true : false; + + // give the ui first shot at the input processing... + if( true == m_userinterface->on_key( Key, Action ) ) { return; } + // ...if the input is left untouched, pass it on + if( true == m_input.keyboard.key( Key, Action ) ) { return; } + + if( Action == GLFW_RELEASE ) { return; } + + if( ( Key == GLFW_KEY_LEFT_SHIFT ) + || ( Key == GLFW_KEY_LEFT_CONTROL ) + || ( Key == GLFW_KEY_LEFT_ALT ) + || ( Key == GLFW_KEY_RIGHT_SHIFT ) + || ( Key == GLFW_KEY_RIGHT_CONTROL ) + || ( Key == GLFW_KEY_RIGHT_ALT ) ) { + // don't bother passing these + return; + } + + // legacy hardcoded keyboard commands + // TODO: replace with current command system, move to input object(s) + switch( Key ) { + + case GLFW_KEY_F11: { + + if( Action != GLFW_PRESS ) { break; } + // mode switch + // TODO: unsaved changes warning + if( ( false == Global.ctrlState ) + && ( false == Global.shiftState ) ) { + Application.pop_mode(); + } + // scenery export + if( Global.ctrlState + && Global.shiftState ) { + simulation::State.export_as_text( Global.SceneryFile ); + } + break; + } + + case GLFW_KEY_F12: { + // quick debug mode toggle + if( Global.ctrlState + && Global.shiftState ) { + DebugModeFlag = !DebugModeFlag; + } + break; + } + + default: { + break; + } + } +} + +void +editor_mode::on_cursor_pos( double const Horizontal, double const Vertical ) { + + auto const mousemove { glm::dvec2{ Horizontal, Vertical } - m_input.mouse.position() }; + m_input.mouse.position( Horizontal, Vertical ); + + if( m_input.mouse.button( GLFW_MOUSE_BUTTON_LEFT ) == GLFW_RELEASE ) { return; } + if( m_node == nullptr ) { return; } + + if( m_takesnapshot ) { + // take a snapshot of selected node(s) + // TODO: implement this + m_takesnapshot = false; + } + + if( mode_translation() ) { + // move selected node + if( mode_translation_vertical() ) { + auto const translation { mousemove.y * -0.01f }; + m_editor.translate( m_node, translation ); + } + else { + auto const mouseworldposition { Camera.Pos + GfxRenderer.Mouse_Position() }; + m_editor.translate( m_node, mouseworldposition, mode_snap() ); + } + } + else { + // rotate selected node + auto const rotation { glm::vec3 { mousemove.y, mousemove.x, 0 } * 0.25f }; + auto const quantization { ( + mode_snap() ? + 15.f : // TODO: put quantization value in a variable + 0.f ) }; + m_editor.rotate( m_node, rotation, quantization ); + } + +} + +void +editor_mode::on_mouse_button( int const Button, int const Action, int const Mods ) { + + if( Button == GLFW_MOUSE_BUTTON_LEFT ) { + + if( Action == GLFW_PRESS ) { + // left button press + m_node = GfxRenderer.Update_Pick_Node(); + if( m_node ) { + Application.set_cursor( GLFW_CURSOR_DISABLED ); + } + dynamic_cast( m_userinterface.get() )->set_node( m_node ); + } + else { + // left button release + if( m_node ) { + Application.set_cursor( GLFW_CURSOR_NORMAL ); + } + // prime history stack for another snapshot + m_takesnapshot = true; + } + } + + m_input.mouse.button( Button, Action ); +} + +bool +editor_mode::mode_translation() const { + + return ( false == Global.altState ); +} + +bool +editor_mode::mode_translation_vertical() const { + + return ( true == Global.shiftState ); +} + +bool +editor_mode::mode_rotation() const { + + return ( true == Global.altState ); +} + +bool +editor_mode::mode_snap() const { + + return ( true == Global.ctrlState ); +} diff --git a/editormode.h b/editormode.h new file mode 100644 index 00000000..012752ff --- /dev/null +++ b/editormode.h @@ -0,0 +1,84 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "applicationmode.h" +#include "editormouseinput.h" +#include "editorkeyboardinput.h" +#include "camera.h" +#include "sceneeditor.h" +#include "scenenode.h" + +class editor_mode : public application_mode { + +public: +// constructors + editor_mode(); +// methods + // initializes internal data structures of the mode. returns: true on success, false otherwise + bool + init() override; + // mode-specific update of simulation data. returns: false on error, true otherwise + bool + update() override; + // maintenance method, called when the mode is activated + void + enter() override; + // maintenance method, called when the mode is deactivated + void + exit() override; + // input handlers + void + on_key( int const Key, int const Scancode, int const Action, int const Mods ) override; + void + on_cursor_pos( double const Horizontal, double const Vertical ) override; + void + on_mouse_button( int const Button, int const Action, int const Mods ) override; + void + on_scroll( double const Xoffset, double const Yoffset ) override { ; } + +private: +// types + struct editormode_input { + + editormouse_input mouse; + editorkeyboard_input keyboard; + + bool init(); + void poll(); + }; + + struct state_backup { + + TCamera *camera; + bool freefly; + bool picking; + }; +// methods + void + update_camera( double const Deltatime ); + bool + mode_translation() const; + bool + mode_translation_vertical() const; + bool + mode_rotation() const; + bool + mode_snap() const; +// members + editormode_input m_input; + TCamera Camera; + double fTime50Hz { 0.0 }; // bufor czasu dla komunikacji z PoKeys + scene::basic_editor m_editor; + scene::basic_node *m_node; // currently selected scene node + bool m_takesnapshot { true }; // helper, hints whether snapshot of selected node(s) should be taken before modification + state_backup m_statebackup; // helper, cached variables to be restored on mode exit + +}; diff --git a/editormouseinput.cpp b/editormouseinput.cpp new file mode 100644 index 00000000..a8a01ad2 --- /dev/null +++ b/editormouseinput.cpp @@ -0,0 +1,55 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editormouseinput.h" + +bool +editormouse_input::init() { + + return true; +} + +void +editormouse_input::position( double Horizontal, double Vertical ) { + + if( false == m_pickmodepanning ) { + // even if the view panning isn't active we capture the cursor position in case it does get activated + m_cursorposition.x = Horizontal; + m_cursorposition.y = Vertical; + return; + } + glm::dvec2 cursorposition { Horizontal, Vertical }; + auto const viewoffset = cursorposition - m_cursorposition; + m_relay.post( + user_command::viewturn, + viewoffset.x, + viewoffset.y, + GLFW_PRESS, + // as we haven't yet implemented either item id system or multiplayer, the 'local' controlled vehicle and entity have temporary ids of 0 + // TODO: pass correct entity id once the missing systems are in place + 0 ); + m_cursorposition = cursorposition; +} + +void +editormouse_input::button( int const Button, int const Action ) { + + // store key state + if( Button >= 0 ) { + m_buttons[ Button ] = Action; + } + + // right button controls panning + if( Button == GLFW_MOUSE_BUTTON_RIGHT ) { + m_pickmodepanning = ( Action == GLFW_PRESS ); + } +} + +//--------------------------------------------------------------------------- diff --git a/editormouseinput.h b/editormouseinput.h new file mode 100644 index 00000000..3f33af2c --- /dev/null +++ b/editormouseinput.h @@ -0,0 +1,44 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "command.h" + +class editormouse_input { + +public: +// constructors + editormouse_input() = default; + +// methods + bool + init(); + void + position( double const Horizontal, double const Vertical ); + inline + glm::dvec2 + position() const { + return m_cursorposition; } + void + button( int const Button, int const Action ); + inline + int + button( int const Button ) const { + return m_buttons[ Button ]; } + +private: +// members + command_relay m_relay; + bool m_pickmodepanning { false }; // indicates mouse is in view panning mode + glm::dvec2 m_cursorposition { 0.0 }; // stored last cursor position, used for panning + std::array m_buttons { GLFW_RELEASE }; +}; + +//--------------------------------------------------------------------------- diff --git a/editoruilayer.cpp b/editoruilayer.cpp new file mode 100644 index 00000000..be96c79b --- /dev/null +++ b/editoruilayer.cpp @@ -0,0 +1,205 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editoruilayer.h" + +#include "globals.h" +#include "camera.h" +#include "animmodel.h" +#include "track.h" +#include "event.h" +#include "renderer.h" +#include "utilities.h" +#include "logs.h" + +editor_ui::editor_ui() { + + clear_texts(); +/* + UIHeader = std::make_shared( 20, 20 ); // header ui panel +*/ + // make 4 empty lines for the ui header, to cut down on work down the road + UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + // bind the panels with ui object. maybe not the best place for this but, eh + push_back( &UIHeader ); +} + +// potentially processes provided input key. returns: true if key was processed, false otherwise +bool +editor_ui::on_key( int const Key, int const Action ) { + + return false; +} + +// updates state of UI elements +void +editor_ui::update() { + + std::string uitextline1, uitextline2, uitextline3, uitextline4; + set_tooltip( "" ); + + auto const *camera { Global.pCamera }; + + if( ( true == Global.ControlPicking ) + && ( true == DebugModeFlag ) ) { + + auto const scenerynode = GfxRenderer.Pick_Node(); + set_tooltip( + ( scenerynode ? + scenerynode->name() : + "" ) ); + } + + + // scenario inspector + auto const *node { m_node }; + + if( node == nullptr ) { + auto const mouseposition { Global.pCamera->Pos + GfxRenderer.Mouse_Position() }; + uitextline1 = "mouse location: [" + to_string( mouseposition.x, 2 ) + ", " + to_string( mouseposition.y, 2 ) + ", " + to_string( mouseposition.z, 2 ) + "]"; + goto update; + } + + uitextline1 = + "node name: " + node->name() + + "; location: [" + to_string( node->location().x, 2 ) + ", " + to_string( node->location().y, 2 ) + ", " + to_string( node->location().z, 2 ) + "]" + + " (distance: " + to_string( glm::length( glm::dvec3{ node->location().x, 0.0, node->location().z } -glm::dvec3{ Global.pCameraPosition.x, 0.0, Global.pCameraPosition.z } ), 1 ) + " m)"; + // subclass-specific data + // TBD, TODO: specialized data dump method in each node subclass, or data imports in the panel for provided subclass pointer? + if( typeid( *node ) == typeid( TAnimModel ) ) { + + auto const *subnode = static_cast( node ); + + uitextline2 = "angle: " + to_string( clamp_circular( subnode->vAngle.y, 360.f ), 2 ) + " deg"; + uitextline2 += "; lights: "; + if( subnode->iNumLights > 0 ) { + uitextline2 += '['; + for( int lightidx = 0; lightidx < subnode->iNumLights; ++lightidx ) { + uitextline2 += to_string( subnode->lsLights[ lightidx ] ); + if( lightidx < subnode->iNumLights - 1 ) { + uitextline2 += ", "; + } + } + uitextline2 += ']'; + } + else { + uitextline2 += "none"; + } + // 3d shape + auto modelfile { ( + ( subnode->pModel != nullptr ) ? + subnode->pModel->NameGet() : + "none" ) }; + if( modelfile.find( szModelPath ) == 0 ) { + // don't include 'models/' in the path + modelfile.erase( 0, std::string{ szModelPath }.size() ); + } + // texture + auto texturefile { ( + ( subnode->Material()->replacable_skins[ 1 ] != null_handle ) ? + GfxRenderer.Material( subnode->Material()->replacable_skins[ 1 ] ).name : + "none" ) }; + if( texturefile.find( szTexturePath ) == 0 ) { + // don't include 'textures/' in the path + texturefile.erase( 0, std::string{ szTexturePath }.size() ); + } + uitextline3 = "mesh: " + modelfile; + uitextline4 = "skin: " + texturefile; + } + else if( typeid( *node ) == typeid( TTrack ) ) { + + auto const *subnode = static_cast( node ); + // basic attributes + uitextline2 = + "isolated: " + ( ( subnode->pIsolated != nullptr ) ? subnode->pIsolated->asName : "none" ) + + "; velocity: " + to_string( subnode->SwitchExtension ? subnode->SwitchExtension->fVelocity : subnode->fVelocity ) + + "; width: " + to_string( subnode->fTrackWidth ) + " m" + + "; friction: " + to_string( subnode->fFriction, 2 ) + + "; quality: " + to_string( subnode->iQualityFlag ); + // textures + auto texturefile { ( + ( subnode->m_material1 != null_handle ) ? + GfxRenderer.Material( subnode->m_material1 ).name : + "none" ) }; + if( texturefile.find( szTexturePath ) == 0 ) { + texturefile.erase( 0, std::string{ szTexturePath }.size() ); + } + auto texturefile2{ ( + ( subnode->m_material2 != null_handle ) ? + GfxRenderer.Material( subnode->m_material2 ).name : + "none" ) }; + if( texturefile2.find( szTexturePath ) == 0 ) { + texturefile2.erase( 0, std::string{ szTexturePath }.size() ); + } + uitextline2 += "; skins: [" + texturefile + ", " + texturefile2 + "]"; + // paths + uitextline3 = "paths: "; + for( auto const &path : subnode->m_paths ) { + uitextline3 += + "[" + + to_string( path.points[ segment_data::point::start ].x, 3 ) + ", " + + to_string( path.points[ segment_data::point::start ].y, 3 ) + ", " + + to_string( path.points[ segment_data::point::start ].z, 3 ) + "]->" + + "[" + + to_string( path.points[ segment_data::point::end ].x, 3 ) + ", " + + to_string( path.points[ segment_data::point::end ].y, 3 ) + ", " + + to_string( path.points[ segment_data::point::end ].z, 3 ) + "] "; + } + // events + std::vector< std::pair< std::string, TTrack::event_sequence const * > > const eventsequences { + { "ev0", &subnode->m_events0 }, { "ev0all", &subnode->m_events0all }, + { "ev1", &subnode->m_events1 }, { "ev1all", &subnode->m_events1all }, + { "ev2", &subnode->m_events2 }, { "ev2all", &subnode->m_events2all } }; + + for( auto const &eventsequence : eventsequences ) { + + if( eventsequence.second->empty() ) { continue; } + + uitextline4 += eventsequence.first + ": ["; + for( auto const &event : *( eventsequence.second ) ) { + if( uitextline4.back() != '[' ) { + uitextline4 += ", "; + } + if( event.second ) { + uitextline4 += event.second->asName; + } + } + uitextline4 += "] "; + } + + } + else if( typeid( *node ) == typeid( TMemCell ) ) { + + auto const *subnode = static_cast( node ); + + uitextline2 = + "data: [" + subnode->Text() + "]" + + " [" + to_string( subnode->Value1(), 2 ) + "]" + + " [" + to_string( subnode->Value2(), 2 ) + "]"; + uitextline3 = "track: " + ( subnode->asTrackName.empty() ? "none" : subnode->asTrackName ); + } + +update: + // update the ui header texts + auto &headerdata = UIHeader.text_lines; + headerdata[ 0 ].data = uitextline1; + headerdata[ 1 ].data = uitextline2; + headerdata[ 2 ].data = uitextline3; + headerdata[ 3 ].data = uitextline4; +} + +void +editor_ui::set_node( scene::basic_node * Node ) { + + m_node = Node; +} diff --git a/editoruilayer.h b/editoruilayer.h new file mode 100644 index 00000000..f0bafc87 --- /dev/null +++ b/editoruilayer.h @@ -0,0 +1,39 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "uilayer.h" + +namespace scene { + +class basic_node; + +} + +class editor_ui : public ui_layer { + +public: +// constructors + editor_ui(); +// methods + // potentially processes provided input key. returns: true if the input was processed, false otherwise + bool + on_key( int const Key, int const Action ) override; + // updates state of UI elements + void + update() override; + void + set_node( scene::basic_node * Node ); + +private: +// members + ui_panel UIHeader { 20, 20 }; // header ui panel + scene::basic_node * m_node { nullptr }; // currently bound scene node, if any +}; diff --git a/keyboardinput.cpp b/keyboardinput.cpp index b68326f8..1c88d955 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -13,6 +13,15 @@ http://mozilla.org/MPL/2.0/. #include "logs.h" #include "parser.h" +namespace input { + +std::array keys { GLFW_RELEASE }; +bool key_alt; +bool key_ctrl; +bool key_shift; + +} + bool keyboard_input::recall_bindings() { @@ -94,7 +103,7 @@ keyboard_input::recall_bindings() { } if( ( binding & 0xffff ) != 0 ) { - m_commands.at( static_cast( lookup->second ) ).binding = binding; + m_bindingsetups.emplace_back( binding_setup{ lookup->second, binding } ); } } } @@ -113,7 +122,7 @@ keyboard_input::key( int const Key, int const Action ) { if( ( Key == GLFW_KEY_LEFT_SHIFT ) || ( Key == GLFW_KEY_RIGHT_SHIFT ) ) { // update internal state, but don't bother passing these - m_shift = + input::key_shift = ( Action == GLFW_RELEASE ? false : true ); @@ -122,20 +131,23 @@ keyboard_input::key( int const Key, int const Action ) { } if( ( Key == GLFW_KEY_LEFT_CONTROL ) || ( Key == GLFW_KEY_RIGHT_CONTROL ) ) { // update internal state, but don't bother passing these - m_ctrl = + input::key_ctrl = ( Action == GLFW_RELEASE ? false : true ); modifier = true; } if( ( Key == GLFW_KEY_LEFT_ALT ) || ( Key == GLFW_KEY_RIGHT_ALT ) ) { - // currently we have no interest in these whatsoever - return false; + // update internal state, but don't bother passing these + input::key_alt = + ( Action == GLFW_RELEASE ? + false : + true ); } // store key state if( Key != -1 ) { - m_keys[ Key ] = Action; + input::keys[ Key ] = Action; } if( true == is_movement_key( Key ) ) { @@ -146,8 +158,8 @@ keyboard_input::key( int const Key, int const Action ) { // include active modifiers for currently pressed key, except if the key is a modifier itself auto const key = Key - | ( modifier ? 0 : ( m_shift ? keymodifier::shift : 0 ) ) - | ( modifier ? 0 : ( m_ctrl ? keymodifier::control : 0 ) ); + | ( modifier ? 0 : ( input::key_shift ? keymodifier::shift : 0 ) ) + | ( modifier ? 0 : ( input::key_ctrl ? keymodifier::control : 0 ) ); auto const lookup = m_bindings.find( key ); if( lookup == m_bindings.end() ) { @@ -166,384 +178,10 @@ keyboard_input::key( int const Key, int const Action ) { return true; } -void -keyboard_input::default_bindings() { - - m_commands = { - // aidriverenable - { GLFW_KEY_Q | keymodifier::shift }, - // aidriverdisable - { GLFW_KEY_Q }, - // mastercontrollerincrease - { GLFW_KEY_KP_ADD }, - // mastercontrollerincreasefast - { GLFW_KEY_KP_ADD | keymodifier::shift }, - // mastercontrollerdecrease - { GLFW_KEY_KP_SUBTRACT }, - // mastercontrollerdecreasefast - { GLFW_KEY_KP_SUBTRACT | keymodifier::shift }, - // mastercontrollerset - { -1 }, - // secondcontrollerincrease - { GLFW_KEY_KP_DIVIDE }, - // secondcontrollerincreasefast - { GLFW_KEY_KP_DIVIDE | keymodifier::shift }, - // secondcontrollerdecrease - { GLFW_KEY_KP_MULTIPLY }, - // secondcontrollerdecreasefast - { GLFW_KEY_KP_MULTIPLY | keymodifier::shift }, - // secondcontrollerset - { -1 }, - // mucurrentindicatorothersourceactivate - { GLFW_KEY_Z | keymodifier::shift }, - // independentbrakeincrease - { GLFW_KEY_KP_1 }, - // independentbrakeincreasefast - { GLFW_KEY_KP_1 | keymodifier::shift }, - // independentbrakedecrease - { GLFW_KEY_KP_7 }, - // independentbrakedecreasefast - { GLFW_KEY_KP_7 | keymodifier::shift }, - // independentbrakeset - { -1 }, - // independentbrakebailoff - { GLFW_KEY_KP_4 }, - // trainbrakeincrease - { GLFW_KEY_KP_3 }, - // trainbrakedecrease - { GLFW_KEY_KP_9 }, - // trainbrakeset - { -1 }, - // trainbrakecharging - { GLFW_KEY_KP_DECIMAL }, - // trainbrakerelease - { GLFW_KEY_KP_6 }, - // trainbrakefirstservice - { GLFW_KEY_KP_8 }, - // trainbrakeservice - { GLFW_KEY_KP_5 }, - // trainbrakefullservice - { GLFW_KEY_KP_2 }, - // trainbrakehandleoff - { GLFW_KEY_KP_5 | keymodifier::control }, - // trainbrakeemergency - { GLFW_KEY_KP_0 }, - // trainbrakebasepressureincrease - { GLFW_KEY_KP_3 | keymodifier::control }, - // trainbrakebasepressuredecrease - { GLFW_KEY_KP_9 | keymodifier::control }, - // trainbrakebasepressurereset - { GLFW_KEY_KP_6 | keymodifier::control }, - // trainbrakeoperationtoggle - { GLFW_KEY_KP_4 | keymodifier::control }, - // manualbrakeincrease - { GLFW_KEY_KP_1 | keymodifier::control }, - // manualbrakedecrease - { GLFW_KEY_KP_7 | keymodifier::control }, - // alarm chain toggle - { GLFW_KEY_B | keymodifier::shift | keymodifier::control }, - // wheelspinbrakeactivate - { GLFW_KEY_KP_ENTER }, - // sandboxactivate - { GLFW_KEY_S }, - // reverserincrease - { GLFW_KEY_D }, - // reverserdecrease - { GLFW_KEY_R }, - // reverserforwardhigh - { -1 }, - // reverserforward - { -1 }, - // reverserneutral - { -1 }, - // reverserbackward - { -1 }, - // waterpumpbreakertoggle - { GLFW_KEY_W | keymodifier::control }, - // waterpumpbreakerclose - { -1 }, - // waterpumpbreakeropen - { -1 }, - // waterpumptoggle - { GLFW_KEY_W }, - // waterpumpenable - { -1 }, - // waterpumpdisable - { -1 }, - // waterheaterbreakertoggle - { GLFW_KEY_W | keymodifier::control | keymodifier::shift }, - // waterheaterbreakerclose - { -1 }, - // waterheaterbreakeropen - { -1 }, - // waterheatertoggle - { GLFW_KEY_W | keymodifier::shift }, - // waterheaterenable - { -1 }, - // waterheaterdisable - { -1 }, - // watercircuitslinktoggle - { GLFW_KEY_H | keymodifier::shift }, - // watercircuitslinkenable - { -1 }, - // watercircuitslinkdisable - { -1 }, - // fuelpumptoggle - { GLFW_KEY_F }, - // fuelpumpenable, - { -1 }, - // fuelpumpdisable, - { -1 }, - // oilpumptoggle - { GLFW_KEY_F | keymodifier::shift }, - // oilpumpenable, - { -1 }, - // oilpumpdisable, - { -1 }, - // linebreakertoggle - { GLFW_KEY_M }, - // linebreakeropen - { -1 }, - // linebreakerclose - { -1 }, - // convertertoggle - { GLFW_KEY_X }, - // converterenable, - { -1 }, - // converterdisable, - { -1 }, - // convertertogglelocal - { GLFW_KEY_X | keymodifier::shift }, - // converteroverloadrelayreset - { GLFW_KEY_N | keymodifier::control }, - // compressortoggle - { GLFW_KEY_C }, - // compressorenable - { -1 }, - // compressordisable - { -1 }, - // compressortoggleloal - { GLFW_KEY_C | keymodifier::shift }, - // motoroverloadrelaythresholdtoggle - { GLFW_KEY_F }, - // motoroverloadrelaythresholdsetlow - { -1 }, - // motoroverloadrelaythresholdsethigh - { -1 }, - // motoroverloadrelayreset - { GLFW_KEY_N }, - // notchingrelaytoggle - { GLFW_KEY_G }, - // epbrakecontroltoggle - { GLFW_KEY_Z | keymodifier::control }, - // trainbrakeoperationmodeincrease - { GLFW_KEY_KP_2 | keymodifier::control }, - // trainbrakeoperationmodedecrease - { GLFW_KEY_KP_8 | keymodifier::control }, - // brakeactingspeedincrease - { GLFW_KEY_B | keymodifier::shift }, - // brakeactingspeeddecrease - { GLFW_KEY_B }, - // brakeactingspeedsetcargo - { -1 }, - // brakeactingspeedsetpassenger - { -1 }, - // brakeactingspeedsetrapid - { -1 }, - // brakeloadcompensationincrease - { GLFW_KEY_H | keymodifier::shift | keymodifier::control }, - // brakeloadcompensationdecrease - { GLFW_KEY_H | keymodifier::control }, - // mubrakingindicatortoggle - { GLFW_KEY_L | keymodifier::shift }, - // alerteracknowledge - { GLFW_KEY_SPACE }, - // hornlowactivate - { GLFW_KEY_A }, - // hornhighactivate - { GLFW_KEY_S }, - // whistleactivate - { GLFW_KEY_Z }, - // radiotoggle - { GLFW_KEY_R | keymodifier::control }, - // radiochannelincrease - { GLFW_KEY_R | keymodifier::shift }, - // radiochanneldecrease - { GLFW_KEY_R }, - // radiostopsend - { GLFW_KEY_PAUSE | keymodifier::shift | keymodifier::control }, - // radiostoptest - { GLFW_KEY_R | keymodifier::shift | keymodifier::control }, - // cabchangeforward - { GLFW_KEY_HOME }, - // cabchangebackward - { GLFW_KEY_END }, - // viewturn - { -1 }, - // movehorizontal - { -1 }, - // movehorizontalfast - { -1 }, - // movevertical - { -1 }, - // moveverticalfast - { -1 }, - // moveleft - { GLFW_KEY_LEFT }, - // moveright - { GLFW_KEY_RIGHT }, - // moveforward - { GLFW_KEY_UP }, - // moveback - { GLFW_KEY_DOWN }, - // moveup - { GLFW_KEY_PAGE_UP }, - // movedown - { GLFW_KEY_PAGE_DOWN }, - // carcouplingincrease - { GLFW_KEY_INSERT }, - // carcouplingdisconnect - { GLFW_KEY_DELETE }, - // doortoggleleft - { GLFW_KEY_COMMA }, - // doortoggleright - { GLFW_KEY_PERIOD }, - // departureannounce - { GLFW_KEY_SLASH }, - // doorlocktoggle - { GLFW_KEY_S | keymodifier::shift }, - // pantographcompressorvalvetoggle - { GLFW_KEY_V | keymodifier::control }, - // pantographcompressoractivate - { GLFW_KEY_V | keymodifier::shift }, - // pantographtogglefront - { GLFW_KEY_P }, - // pantographtogglerear - { GLFW_KEY_O }, - // pantographraisefront - { -1 }, - // pantographraiserear - { -1 }, - // pantographlowerfront - { -1 }, - // pantographlowerrear - { -1 }, - // pantographlowerall - { GLFW_KEY_P | keymodifier::control }, - // heatingtoggle - { GLFW_KEY_H }, - // heatingenable - { -1 }, - // heatingdisable - { -1 }, - // lightspresetactivatenext - { GLFW_KEY_T | keymodifier::shift }, - // lightspresetactivateprevious - { GLFW_KEY_T }, - // headlighttoggleleft - { GLFW_KEY_Y }, - // headlightenableleft - { -1 }, - // headlightdisableleft - { -1 }, - // headlighttoggleright - { GLFW_KEY_I }, - // headlightenableright - { -1 }, - // headlightdisableright - { -1 }, - // headlighttoggleupper - { GLFW_KEY_U }, - // headlightenableupper - { -1 }, - // headlightdisableupper - { -1 }, - // redmarkertoggleleft - { GLFW_KEY_Y | keymodifier::shift }, - // redmarkerenableleft - { -1 }, - // redmarkerdisableleft - { -1 }, - // redmarkertoggleright - { GLFW_KEY_I | keymodifier::shift }, - // redmarkerenableright - { -1 }, - // redmarkerdisableright - { -1 }, - // headlighttogglerearleft - { GLFW_KEY_Y | keymodifier::control }, - // headlighttogglerearright - { GLFW_KEY_I | keymodifier::control }, - // headlighttogglerearupper - { GLFW_KEY_U | keymodifier::control }, - // redmarkertogglerearleft - { GLFW_KEY_Y | keymodifier::control | keymodifier::shift }, - // redmarkertogglerearright - { GLFW_KEY_I | keymodifier::control | keymodifier::shift }, - // redmarkerstoggle - { GLFW_KEY_E | keymodifier::shift }, - // endsignalstoggle - { GLFW_KEY_E }, - // headlightsdimtoggle - { GLFW_KEY_L | keymodifier::control }, - // headlightsdimenable - { -1 }, - // headlightsdimdisable - { -1 }, - // motorconnectorsopen - { GLFW_KEY_L }, - // motorconnectorsclose - { -1 }, - // motordisconnect - { GLFW_KEY_E | keymodifier::control }, - // interiorlighttoggle - { GLFW_KEY_APOSTROPHE }, - // interiorlightenable - { -1 }, - // interiorlightdisable - { -1 }, - // interiorlightdimtoggle - { GLFW_KEY_APOSTROPHE | keymodifier::control }, - // interiorlightdimenable - { -1 }, - // interiorlightdimdisable - { -1 }, - // instrumentlighttoggle - { GLFW_KEY_SEMICOLON }, - // instrumentlightenable - { -1 }, - // instrumentlightdisable, - { -1 }, - // "generictoggle0" - { GLFW_KEY_0 }, - // "generictoggle1" - { GLFW_KEY_1 }, - // "generictoggle2" - { GLFW_KEY_2 }, - // "generictoggle3" - { GLFW_KEY_3 }, - // "generictoggle4" - { GLFW_KEY_4 }, - // "generictoggle5" - { GLFW_KEY_5 }, - // "generictoggle6" - { GLFW_KEY_6 }, - // "generictoggle7" - { GLFW_KEY_7 }, - // "generictoggle8" - { GLFW_KEY_8 }, - // "generictoggle9" - { GLFW_KEY_9 }, - // "batterytoggle" - { GLFW_KEY_J }, - // batteryenable - { -1 }, - // batterydisable - { -1 }, - }; - - bind(); +int +keyboard_input::key( int const Key ) const { + return input::keys[ Key ]; } void @@ -551,23 +189,32 @@ keyboard_input::bind() { m_bindings.clear(); - int commandcode{ 0 }; - for( auto const &command : m_commands ) { + for( auto const &bindingsetup : m_bindingsetups ) { - if( command.binding != -1 ) { + if( bindingsetup.binding != -1 ) { m_bindings.emplace( - command.binding, - static_cast( commandcode ) ); + bindingsetup.binding, + bindingsetup.command ); } - ++commandcode; } // cache movement key bindings - m_bindingscache.forward = m_commands[ static_cast( user_command::moveforward ) ].binding; - m_bindingscache.back = m_commands[ static_cast( user_command::moveback ) ].binding; - m_bindingscache.left = m_commands[ static_cast( user_command::moveleft ) ].binding; - m_bindingscache.right = m_commands[ static_cast( user_command::moveright ) ].binding; - m_bindingscache.up = m_commands[ static_cast( user_command::moveup ) ].binding; - m_bindingscache.down = m_commands[ static_cast( user_command::movedown ) ].binding; + m_bindingscache.forward = binding( user_command::moveforward ); + m_bindingscache.back = binding( user_command::moveback ); + m_bindingscache.left = binding( user_command::moveleft ); + m_bindingscache.right = binding( user_command::moveright ); + m_bindingscache.up = binding( user_command::moveup ); + m_bindingscache.down = binding( user_command::movedown ); +} + +int +keyboard_input::binding( user_command const Command ) const { + + for( auto const &binding : m_bindings ) { + if( binding.second == Command ) { + return binding.first; + } + } + return -1; } bool @@ -590,13 +237,13 @@ keyboard_input::poll() { glm::vec2 const movementhorizontal { // x-axis ( Global.shiftState ? 1.f : 0.5f ) * - ( m_keys[ m_bindingscache.left ] != GLFW_RELEASE ? -1.f : - m_keys[ m_bindingscache.right ] != GLFW_RELEASE ? 1.f : + ( input::keys[ m_bindingscache.left ] != GLFW_RELEASE ? -1.f : + input::keys[ m_bindingscache.right ] != GLFW_RELEASE ? 1.f : 0.f ), // z-axis ( Global.shiftState ? 1.f : 0.5f ) * - ( m_keys[ m_bindingscache.forward ] != GLFW_RELEASE ? 1.f : - m_keys[ m_bindingscache.back ] != GLFW_RELEASE ? -1.f : + ( input::keys[ m_bindingscache.forward ] != GLFW_RELEASE ? 1.f : + input::keys[ m_bindingscache.back ] != GLFW_RELEASE ? -1.f : 0.f ) }; if( ( movementhorizontal.x != 0.f || movementhorizontal.y != 0.f ) @@ -616,8 +263,8 @@ keyboard_input::poll() { float const movementvertical { // y-axis ( Global.shiftState ? 1.f : 0.5f ) * - ( m_keys[ m_bindingscache.up ] != GLFW_RELEASE ? 1.f : - m_keys[ m_bindingscache.down ] != GLFW_RELEASE ? -1.f : + ( input::keys[ m_bindingscache.up ] != GLFW_RELEASE ? 1.f : + input::keys[ m_bindingscache.down ] != GLFW_RELEASE ? -1.f : 0.f ) }; if( ( movementvertical != 0.f ) diff --git a/keyboardinput.h b/keyboardinput.h index 0e59b258..aa64ed9e 100644 --- a/keyboardinput.h +++ b/keyboardinput.h @@ -13,19 +13,32 @@ http://mozilla.org/MPL/2.0/. #include #include "command.h" +namespace input { + +extern std::array keys; +extern bool key_alt; +extern bool key_ctrl; +extern bool key_shift; + +} + class keyboard_input { public: // constructors - keyboard_input() { default_bindings(); } + keyboard_input() = default; + +// destructor + virtual ~keyboard_input() = default; // methods + virtual bool - init() { return recall_bindings(); } - bool - recall_bindings(); + init() { return true; } bool key( int const Key, int const Action ); + int + key( int const Key ) const; void poll(); inline @@ -33,7 +46,7 @@ public: command() const { return m_command; } -private: +protected: // types enum keymodifier : int { @@ -41,43 +54,53 @@ private: control = 0x20000 }; - struct command_setup { + struct binding_setup { + user_command command; int binding; }; - typedef std::vector commandsetup_sequence; - typedef std::unordered_map usercommand_map; + using bindingsetup_sequence = std::vector; + +// methods + virtual + void + default_bindings() = 0; + bool + recall_bindings(); + void + bind(); + +// members + bindingsetup_sequence m_bindingsetups; + +private: +// types + using usercommand_map = std::unordered_map; struct bindings_cache { - int forward{ -1 }; - int back{ -1 }; - int left{ -1 }; - int right{ -1 }; - int up{ -1 }; - int down{ -1 }; + int forward { -1 }; + int back { -1 }; + int left { -1 }; + int right { -1 }; + int up { -1 }; + int down { -1 }; }; // methods - void - default_bindings(); - void - bind(); + int + binding( user_command const Command ) const; bool is_movement_key( int const Key ) const; // members - commandsetup_sequence m_commands; user_command m_command { user_command::none }; // last, if any, issued command usercommand_map m_bindings; command_relay m_relay; - bool m_shift { false }; - bool m_ctrl { false }; bindings_cache m_bindingscache; glm::vec2 m_movementhorizontal { 0.f }; float m_movementvertical { 0.f }; - std::array m_keys; }; //--------------------------------------------------------------------------- diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index f18bbee1..36823659 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -19,11 +19,35 @@ {36684428-8a48-435f-bca4-a24d9bfe2587} - - {cdf75bec-91f7-413c-8b57-9e32cba49148} + + {035056ae-b8d6-4338-9d1f-514a0ce5f1e0} - - {2d73d7b2-5252-499c-963a-88fa3cb1af53} + + {395be8b7-094b-4e4d-918e-02369cd6013b} + + + {1ea7a1f1-5728-478c-8593-b6f4eecefdbf} + + + {89843d2c-930c-4135-8575-714040f117ac} + + + {ab9c6f13-eb8f-497b-b21d-66f8c0220cf8} + + + {492181c1-fa1a-4087-be99-5d88edf66c69} + + + {e8c50720-4d83-4722-8ac9-16ea6af834b5} + + + {ecadb5ae-48aa-4811-909d-56e8a01badb2} + + + {ba04e497-9bfa-4cfd-883f-7f018ac76301} + + + {0630616b-1afe-4fb6-96d1-3755834ba8aa} @@ -120,27 +144,18 @@ Source Files - - Source Files - Source Files\mczapkie Source Files\mczapkie - - Source Files\input - Source Files\mczapkie Source Files\mczapkie - - Source Files\input - Source Files @@ -180,21 +195,12 @@ Source Files - - Source Files\input - - - Source Files\input - Source Files Source Files - - Source Files\input - Source Files @@ -231,27 +237,72 @@ Source Files - - Source Files\input - Source Files Source Files - - Source Files - Source Files - - Source Files - Source Files + + Source Files\application + + + Source Files + + + Source Files + + + Source Files + + + Source Files\application\mode_driver + + + Source Files\application\mode_driver + + + Source Files\application\mode_editor + + + Source Files\application\mode_editor + + + Source Files\application\mode_scenarioloader + + + Source Files\application\mode_driver + + + Source Files\application\mode_driver + + + Source Files\application\mode_editor + + + Source Files\application\mode_driver + + + Source Files\application\mode_driver + + + Source Files\application\mode_driver + + + Source Files\application\mode_driver + + + Source Files\application\mode_editor + + + Source Files\application\input + @@ -266,9 +317,6 @@ Header Files\mczapkie - - Header Files - Header Files @@ -317,12 +365,6 @@ Header Files\mczapkie - - Header Files\input - - - Header Files\input - Header Files @@ -419,21 +461,12 @@ Header Files - - Header Files\input - - - Header Files\input - Header Files Header Files - - Header Files\input - Header Files @@ -473,21 +506,72 @@ Header Files - - Header Files\input - Header Files - - Header Files - Header Files + + Header Files\application + + Header Files\application + + Header Files + + Header Files + + + Header Files + + + Header Files\application\mode_driver + + + Header Files\application\mode_driver + + + Header Files\application\mode_driver + + + Header Files\application\mode_driver + + + Header Files\application\mode_driver + + + Header Files\application\mode_driver + + + Header Files\application\mode_driver + + + Header Files\application\mode_driver + + + Header Files\application\mode_editor + + + Header Files\application\mode_editor + + + Header Files\application\mode_editor + + + Header Files\application\mode_scenarioloader + + + Header Files\application\mode_scenarioloader + + + Header Files\application\mode_editor + + + Header Files\application\input + diff --git a/messaging.cpp b/messaging.cpp index 8d081b57..57ef9977 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -13,6 +13,10 @@ http://mozilla.org/MPL/2.0/. #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" @@ -36,6 +40,165 @@ Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) { #endif } +void +OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) +{ // odebranie komunikatu z serwera + if (pRozkaz->iSygn == MAKE_ID4('E','U','0','7') ) + switch (pRozkaz->iComm) + { + case 0: // odesłanie identyfikatora wersji + CommLog( Now() + " " + std::to_string(pRozkaz->iComm) + " version" + " rcvd"); + WyslijString(Global.asVersion, 0); // przedsatwienie się + break; + case 1: // odesłanie identyfikatora wersji + CommLog( Now() + " " + std::to_string(pRozkaz->iComm) + " scenery" + " rcvd"); + WyslijString(Global.SceneryFile, 1); // nazwa scenerii + break; + case 2: { + // event + CommLog( Now() + " " + std::to_string( pRozkaz->iComm ) + " " + + std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) + " rcvd" ); + + if( Global.iMultiplayer ) { + auto *event = simulation::Events.FindEvent( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); + if( event != nullptr ) { + if( ( event->Type == tp_Multiple ) + || ( event->Type == tp_Lights ) + || ( event->evJoined != 0 ) ) { + // tylko jawne albo niejawne Multiple + simulation::Events.AddToQuery( event, nullptr ); // drugi parametr to dynamic wywołujący - tu brak + } + } + } + break; + } + case 3: // rozkaz dla AI + if (Global.iMultiplayer) + { + int i = int(pRozkaz->cString[8]); // długość pierwszego łańcucha (z przodu dwa floaty) + CommLog( + Now() + " " + to_string(pRozkaz->iComm) + " " + + std::string(pRozkaz->cString + 11 + i, (unsigned)(pRozkaz->cString[10 + i])) + + " rcvd"); + // nazwa pojazdu jest druga + auto *vehicle = simulation::Vehicles.find( { pRozkaz->cString + 11 + i, (unsigned)pRozkaz->cString[ 10 + i ] } ); + if( ( vehicle != nullptr ) + && ( vehicle->Mechanik != nullptr ) ) { + vehicle->Mechanik->PutCommand( + { pRozkaz->cString + 9, static_cast(i) }, + pRozkaz->fPar[0], pRozkaz->fPar[1], + nullptr, + stopExt ); // floaty są z przodu + WriteLog("AI command: " + std::string(pRozkaz->cString + 9, i)); + } + } + break; + case 4: // badanie zajętości toru + { + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); + + auto *track = simulation::Paths.find( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); + if( ( track != nullptr ) + && ( track->IsEmpty() ) ) { + WyslijWolny( track->name() ); + } + } + break; + case 5: // ustawienie parametrów + { + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " params " + to_string(*pRozkaz->iPar) + " rcvd"); + if (*pRozkaz->iPar == 0) // sprawdzenie czasu + if (*pRozkaz->iPar & 1) // ustawienie czasu + { + double t = pRozkaz->fPar[1]; + simulation::Time.data().wDay = std::floor(t); // niby nie powinno być dnia, ale... + if (Global.fMoveLight >= 0) + Global.fMoveLight = t; // trzeba by deklinację Słońca przeliczyć + simulation::Time.data().wHour = std::floor(24 * t) - 24.0 * simulation::Time.data().wDay; + simulation::Time.data().wMinute = std::floor(60 * 24 * t) - 60.0 * (24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour); + simulation::Time.data().wSecond = std::floor( 60 * 60 * 24 * t ) - 60.0 * ( 60.0 * ( 24.0 * simulation::Time.data().wDay + simulation::Time.data().wHour ) + simulation::Time.data().wMinute ); + } + if (*pRozkaz->iPar & 2) + { // ustawienie flag zapauzowania + Global.iPause = pRozkaz->fPar[2]; // zakładamy, że wysyłający wie, co robi + } + } + break; + case 6: // pobranie parametrów ruchu pojazdu + if (Global.iMultiplayer) { + // Ra 2014-12: to ma działać również dla pojazdów bez obsady + CommLog( + Now() + " " + + to_string( pRozkaz->iComm ) + " " + + std::string{ pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) } + + " rcvd" ); + if (pRozkaz->cString[0]) { + // jeśli długość nazwy jest niezerowa szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #7 + auto *vehicle = ( + pRozkaz->cString[ 1 ] == '*' ? + simulation::Vehicles.find( Global.asHumanCtrlVehicle ) : + simulation::Vehicles.find( std::string{ pRozkaz->cString + 1, (unsigned)pRozkaz->cString[ 0 ] } ) ); + if( vehicle != nullptr ) { + WyslijNamiary( vehicle ); // wysłanie informacji o pojeździe + } + } + else { + // dla pustego wysyłamy ramki 6 z nazwami pojazdów AI (jeśli potrzebne wszystkie, to rozpoznać np. "*") + simulation::Vehicles.DynamicList(); + } + } + break; + case 8: // ponowne wysłanie informacji o zajętych odcinkach toru + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " all busy track" + " rcvd"); + simulation::Paths.TrackBusyList(); + break; + case 9: // ponowne wysłanie informacji o zajętych odcinkach izolowanych + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " all busy isolated" + " rcvd"); + simulation::Paths.IsolatedBusyList(); + break; + case 10: // badanie zajętości jednego odcinka izolowanego + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + " rcvd"); + simulation::Paths.IsolatedBusy( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); + break; + case 11: // ustawienie parametrów ruchu pojazdu + // Ground.IsolatedBusy(AnsiString(pRozkaz->cString+1,(unsigned)(pRozkaz->cString[0]))); + break; + case 12: // skrocona ramka parametrow pojazdow AI (wszystkich!!) + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " obsadzone" + " rcvd"); + WyslijObsadzone(); + // Ground.IsolatedBusy(AnsiString(pRozkaz->cString+1,(unsigned)(pRozkaz->cString[0]))); + break; + case 13: // ramka uszkodzenia i innych stanow pojazdu, np. wylaczenie CA, wlaczenie recznego itd. + CommLog(Now() + " " + to_string(pRozkaz->iComm) + " " + + std::string(pRozkaz->cString + 1, (unsigned)(pRozkaz->cString[0])) + + " rcvd"); + if( pRozkaz->cString[ 1 ] ) // jeśli długość nazwy jest niezerowa + { // szukamy pierwszego pojazdu o takiej nazwie i odsyłamy parametry ramką #13 + auto *lookup = ( + pRozkaz->cString[ 2 ] == '*' ? + simulation::Vehicles.find( Global.asHumanCtrlVehicle ) : // nazwa pojazdu użytkownika + simulation::Vehicles.find( std::string( pRozkaz->cString + 2, (unsigned)pRozkaz->cString[ 1 ] ) ) ); // nazwa pojazdu + if( lookup == nullptr ) { break; } // nothing found, nothing to do + auto *d { lookup }; + while( d != nullptr ) { + d->Damage( pRozkaz->cString[ 0 ] ); + d = d->Next(); // pozostałe też + } + d = lookup->Prev(); + while( d != nullptr ) { + d->Damage( pRozkaz->cString[ 0 ] ); + d = d->Prev(); // w drugą stronę też + } + WyslijUszkodzenia( lookup->asName, lookup->MoverParameters->EngDmgFlag ); // zwrot informacji o pojeździe + } + break; + default: + break; + } +} + void WyslijEvent(const std::string &e, const std::string &d) { // Ra: jeszcze do wyczyszczenia diff --git a/messaging.h b/messaging.h index 6bd7a0e3..46624bfe 100644 --- a/messaging.h +++ b/messaging.h @@ -37,6 +37,8 @@ struct DaneRozkaz2 { // struktura komunikacji z EU07.EXE void Navigate( std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam ); +void OnCommandGet( multiplayer::DaneRozkaz *pRozkaz ); + void WyslijEvent( const std::string &e, const std::string &d ); void WyslijString( const std::string &t, int n ); void WyslijWolny( const std::string &t ); diff --git a/World.cpp b/old/World.cpp similarity index 100% rename from World.cpp rename to old/World.cpp diff --git a/World.h b/old/World.h similarity index 100% rename from World.h rename to old/World.h diff --git a/renderer.cpp b/renderer.cpp index 808a5e75..e39db423 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -12,15 +12,15 @@ http://mozilla.org/MPL/2.0/. #include "renderer.h" #include "color.h" #include "globals.h" +#include "camera.h" #include "timer.h" #include "simulation.h" #include "simulationtime.h" -#include "world.h" #include "train.h" #include "dynobj.h" #include "animmodel.h" #include "traction.h" -#include "uilayer.h" +#include "application.h" #include "logs.h" #include "utilities.h" @@ -128,7 +128,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { std::vector{ m_diffusetextureunit } : std::vector{ m_normaltextureunit, m_diffusetextureunit } ); m_textures.assign_units( m_helpertextureunit, m_shadowtextureunit, m_normaltextureunit, m_diffusetextureunit ); // TODO: add reflections unit - UILayer.set_unit( m_diffusetextureunit ); + ui_layer::set_unit( m_diffusetextureunit ); select_unit( m_diffusetextureunit ); ::glDepthFunc( GL_LEQUAL ); @@ -397,7 +397,7 @@ opengl_renderer::Render() { Timer::subsystem.gfx_total.start(); // note: gfx_total is actually frame total, clean this up Timer::subsystem.gfx_color.start(); // fetch simulation data - if( World.InitPerformed() ) { + if( simulation::is_ready ) { m_sunlight = Global.DayLight; // quantize sun angle to reduce shadow crawl auto const quantizationstep { 0.004f }; @@ -453,7 +453,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( ( true == Global.RenderShadows ) && ( false == Global.bWireFrame ) - && ( true == World.InitPerformed() ) + && ( true == simulation::is_ready ) && ( m_shadowcolor != colors::white ) ) { // run shadowmaps pass before color @@ -492,7 +492,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } if( ( true == m_environmentcubetexturesupport ) - && ( true == World.InitPerformed() ) ) { + && ( true == simulation::is_ready ) ) { // potentially update environmental cube map if( true == Render_reflections() ) { setup_pass( m_renderpass, Mode ); // restore draw mode. TBD, TODO: render mode stack @@ -501,8 +501,8 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glViewport( 0, 0, Global.iWindowWidth, Global.iWindowHeight ); - if( World.InitPerformed() ) { - auto const skydomecolour = World.Environment.m_skydome.GetAverageColor(); + if( simulation::is_ready ) { + auto const skydomecolour = simulation::Environment.m_skydome.GetAverageColor(); ::glClearColor( skydomecolour.x, skydomecolour.y, skydomecolour.z, 0.f ); // kolor nieba } else { @@ -510,13 +510,13 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - if( World.InitPerformed() ) { + if( simulation::is_ready ) { // setup setup_matrices(); // render setup_drawing( true ); setup_units( true, false, false ); - Render( &World.Environment ); + Render( &simulation::Environment ); // opaque parts... setup_drawing( false ); setup_units( true, true, true ); @@ -544,7 +544,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_shadow_map( m_cabshadowtexture, m_cabshadowtexturematrix ); // cache shadow colour in case we need to account for cab light auto const shadowcolor { m_shadowcolor }; - auto const *vehicle{ World.Train->Dynamic() }; + auto const *vehicle{ simulation::Train->Dynamic() }; if( vehicle->InteriorLightLevel > 0.f ) { setup_shadow_color( glm::min( colors::white, shadowcolor + glm::vec4( vehicle->InteriorLight * vehicle->InteriorLightLevel, 1.f ) ) ); } @@ -565,7 +565,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_shadow_map( m_cabshadowtexture, m_cabshadowtexturematrix ); // cache shadow colour in case we need to account for cab light auto const shadowcolor{ m_shadowcolor }; - auto const *vehicle{ World.Train->Dynamic() }; + auto const *vehicle{ simulation::Train->Dynamic() }; if( vehicle->InteriorLightLevel > 0.f ) { setup_shadow_color( glm::min( colors::white, shadowcolor + glm::vec4( vehicle->InteriorLight * vehicle->InteriorLightLevel, 1.f ) ) ); } @@ -584,13 +584,13 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glMatrixMode( GL_MODELVIEW ); } } - UILayer.render(); + Application.render_ui(); break; } case rendermode::shadows: { - if( World.InitPerformed() ) { + if( simulation::is_ready ) { // setup ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting ::glPolygonOffset( 1.f, 1.f ); @@ -631,7 +631,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { case rendermode::cabshadows: { - if( ( World.InitPerformed() ) + if( ( simulation::is_ready ) && ( false == FreeFlyModeFlag ) ) { // setup ::glEnable( GL_POLYGON_OFFSET_FILL ); // alleviate depth-fighting @@ -659,8 +659,8 @@ opengl_renderer::Render_pass( rendermode const Mode ) { #else setup_units( false, false, false ); #endif - Render_cab( World.Train->Dynamic(), false ); - Render_cab( World.Train->Dynamic(), true ); + Render_cab( simulation::Train->Dynamic(), false ); + Render_cab( simulation::Train->Dynamic(), true ); m_cabshadowpass = m_renderpass; // post-render restore @@ -678,7 +678,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glClearColor( 0.f, 0.f, 0.f, 1.f ); ::glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); - if( World.InitPerformed() ) { + if( simulation::is_ready ) { ::glColorMask( GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE ); // setup @@ -686,7 +686,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // render setup_drawing( true ); setup_units( true, false, false ); - Render( &World.Environment ); + Render( &simulation::Environment ); // opaque parts... setup_drawing( false ); setup_units( true, true, true ); @@ -708,7 +708,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { } case rendermode::pickcontrols: { - if( World.InitPerformed() ) { + if( simulation::is_ready ) { // setup #ifdef EU07_USE_PICKING_FRAMEBUFFER ::glViewport( 0, 0, EU07_PICKBUFFERSIZE, EU07_PICKBUFFERSIZE ); @@ -723,14 +723,14 @@ opengl_renderer::Render_pass( rendermode const Mode ) { setup_drawing( false ); setup_units( false, false, false ); // cab render skips translucent parts, so we can do it here - if( World.Train != nullptr ) { Render_cab( World.Train->Dynamic() ); } + if( simulation::Train != nullptr ) { Render_cab( simulation::Train->Dynamic() ); } // post-render cleanup } break; } case rendermode::pickscenery: { - if( World.InitPerformed() ) { + if( simulation::is_ready ) { // setup m_picksceneryitems.clear(); #ifdef EU07_USE_PICKING_FRAMEBUFFER @@ -789,12 +789,12 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f Config.draw_mode = Mode; - if( false == World.InitPerformed() ) { return; } + if( false == simulation::is_ready ) { return; } // setup draw range switch( Mode ) { case rendermode::color: { Config.draw_range = Global.BaseDrawRange; break; } case rendermode::shadows: { Config.draw_range = Global.BaseDrawRange * 0.5f; break; } - case rendermode::cabshadows: { Config.draw_range = ( Global.pWorld->train()->Dynamic()->MoverParameters->ActiveCab != 0 ? 10.f : 20.f ); break; } + case rendermode::cabshadows: { Config.draw_range = ( simulation::Train->Occupied()->ActiveCab != 0 ? 10.f : 20.f ); break; } case rendermode::reflections: { Config.draw_range = Global.BaseDrawRange; break; } case rendermode::pickcontrols: { Config.draw_range = 50.f; break; } case rendermode::pickscenery: { Config.draw_range = Global.BaseDrawRange * 0.5f; break; } @@ -811,11 +811,11 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // modelview if( ( false == DebugCameraFlag ) || ( true == Ignoredebug ) ) { camera.position() = Global.pCameraPosition; - World.Camera.SetMatrix( viewmatrix ); + Global.pCamera->SetMatrix( viewmatrix ); } else { camera.position() = Global.DebugCameraPosition; - World.DebugCamera.SetMatrix( viewmatrix ); + Global.pDebugCamera->SetMatrix( viewmatrix ); } // projection auto const zfar = Config.draw_range * Global.fDistanceFactor * Zfar; @@ -972,7 +972,7 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // TODO: scissor test for pick modes // modelview camera.position() = Global.pCameraPosition; - World.Camera.SetMatrix( viewmatrix ); + Global.pCamera->SetMatrix( viewmatrix ); // projection camera.projection() *= glm::perspective( @@ -1670,7 +1670,7 @@ opengl_renderer::Render( scene::basic_region *Region ) { Update_Lights( simulation::Lights ); Render( std::begin( m_sectionqueue ), std::end( m_sectionqueue ) ); - if( EditorModeFlag && FreeFlyModeFlag ) { + if( EditorModeFlag ) { // when editor mode is active calculate world position of the cursor // at this stage the z-buffer is filled with only ground geometry Update_Mouse_Position(); @@ -2099,7 +2099,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { ++m_debugstats.dynamics; // setup - TSubModel::iInstance = ( size_t )Dynamic; //żeby nie robić cudzych animacji + TSubModel::iInstance = reinterpret_cast( Dynamic ); //żeby nie robić cudzych animacji glm::dvec3 const originoffset = Dynamic->vPosition - m_renderpass.camera.position(); // lod visibility ranges are defined for base (x 1.0) viewing distance. for render we adjust them for actual range multiplier and zoom float squaredistance; @@ -2201,7 +2201,7 @@ opengl_renderer::Render_cab( TDynamicObject const *Dynamic, bool const Alpha ) { return false; } - TSubModel::iInstance = reinterpret_cast( Dynamic ); + TSubModel::iInstance = reinterpret_cast( Dynamic ); if( ( true == FreeFlyModeFlag ) || ( false == Dynamic->bDisplayCab ) @@ -3487,7 +3487,8 @@ glm::dvec3 opengl_renderer::Update_Mouse_Position() { glm::dvec2 mousepos; - glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); + Application.get_cursor_pos( mousepos.x, mousepos.y ); +// glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); mousepos.x = clamp( mousepos.x, 0, Global.iWindowWidth - 1 ); mousepos.y = clamp( Global.iWindowHeight - clamp( mousepos.y, 0, Global.iWindowHeight ), 0, Global.iWindowHeight - 1 ) ; GLfloat pointdepth; @@ -3550,7 +3551,7 @@ opengl_renderer::Update( double const Deltatime ) { } if( ( true == Global.ResourceSweep ) - && ( true == World.InitPerformed() ) ) { + && ( true == simulation::is_ready ) ) { // garbage collection m_geometry.update(); m_textures.update(); diff --git a/renderer.h b/renderer.h index 3db03799..6c47ad05 100644 --- a/renderer.h +++ b/renderer.h @@ -17,7 +17,7 @@ http://mozilla.org/MPL/2.0/. #include "dumb3d.h" #include "frustum.h" #include "scene.h" -#include "world.h" +#include "simulationenvironment.h" #include "memcell.h" #define EU07_USE_PICKING_FRAMEBUFFER diff --git a/scenarioloadermode.cpp b/scenarioloadermode.cpp new file mode 100644 index 00000000..128ce548 --- /dev/null +++ b/scenarioloadermode.cpp @@ -0,0 +1,79 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scenarioloadermode.h" + +#include "globals.h" +#include "simulation.h" +#include "simulationtime.h" +#include "timer.h" +#include "application.h" +#include "scenarioloaderuilayer.h" +#include "renderer.h" +#include "logs.h" + + +scenarioloader_mode::scenarioloader_mode() { + + m_userinterface = std::make_shared(); +} + +// initializes internal data structures of the mode. returns: true on success, false otherwise +bool +scenarioloader_mode::init() { + // nothing to do here + return true; +} + +// mode-specific update of simulation data. returns: false on error, true otherwise +bool +scenarioloader_mode::update() { + + WriteLog( "\nLoading scenario..." ); + + auto timestart = std::chrono::system_clock::now(); + + if( true == simulation::State.deserialize( Global.SceneryFile ) ) { + WriteLog( "Scenario loading time: " + std::to_string( std::chrono::duration_cast( ( std::chrono::system_clock::now() - timestart ) ).count() ) + " seconds" ); + // TODO: implement and use next mode cue + Application.pop_mode(); + Application.push_mode( eu07_application::mode::driver ); + } + else { + ErrorLog( "Bad init: scenario loading failed" ); + Application.pop_mode(); + } + + return true; +} + +// maintenance method, called when the mode is activated +void +scenarioloader_mode::enter() { + + // TBD: hide cursor in fullscreen mode? + Application.set_cursor( GLFW_CURSOR_NORMAL ); + + simulation::is_ready = false; + + m_userinterface->set_background( "logo" ); + Application.set_title( Global.AppName + " (" + Global.SceneryFile + ")" ); + m_userinterface->set_progress(); + m_userinterface->set_progress( "Loading scenery / Wczytywanie scenerii" ); + GfxRenderer.Render(); +} + +// maintenance method, called when the mode is deactivated +void +scenarioloader_mode::exit() { + + simulation::Time.init(); + simulation::Environment.init(); +} diff --git a/scenarioloadermode.h b/scenarioloadermode.h new file mode 100644 index 00000000..18c603d8 --- /dev/null +++ b/scenarioloadermode.h @@ -0,0 +1,41 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "applicationmode.h" + +class scenarioloader_mode : public application_mode { + +public: +// constructors + scenarioloader_mode(); +// methods + // initializes internal data structures of the mode. returns: true on success, false otherwise + bool + init() override; + // mode-specific update of simulation data. returns: false on error, true otherwise + bool + update() override; + // maintenance method, called when the mode is activated + void + enter() override; + // maintenance method, called when the mode is deactivated + void + exit() override; + // input handlers + void + on_key( int const Key, int const Scancode, int const Action, int const Mods ) override { ; } + void + on_cursor_pos( double const Horizontal, double const Vertical ) override { ; } + void + on_mouse_button( int const Button, int const Action, int const Mods ) override { ; } + void + on_scroll( double const Xoffset, double const Yoffset ) override { ; } +}; diff --git a/scenarioloaderuilayer.h b/scenarioloaderuilayer.h new file mode 100644 index 00000000..c167a444 --- /dev/null +++ b/scenarioloaderuilayer.h @@ -0,0 +1,17 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "uilayer.h" + +class scenarioloader_ui : public ui_layer { + + // TODO: implement mode-specific elements +}; diff --git a/scene.cpp b/scene.cpp index 003e2622..f12054b8 100644 --- a/scene.cpp +++ b/scene.cpp @@ -12,6 +12,9 @@ http://mozilla.org/MPL/2.0/. #include "simulation.h" #include "globals.h" +#include "animmodel.h" +#include "event.h" +#include "evlaunch.h" #include "timer.h" #include "logs.h" #include "sn_utils.h" diff --git a/sceneeditor.cpp b/sceneeditor.cpp index 3042196c..c79d4bb0 100644 --- a/sceneeditor.cpp +++ b/sceneeditor.cpp @@ -13,97 +13,19 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "application.h" #include "simulation.h" +#include "camera.h" +#include "animmodel.h" #include "renderer.h" namespace scene { -basic_editor Editor; - -bool -basic_editor::on_key( int const Key, int const Action ) { - - if( false == EditorModeFlag ) { return false; } - - if( ( Key == GLFW_KEY_LEFT_ALT ) - || ( Key == GLFW_KEY_RIGHT_ALT ) ) { - // intercept these while in editor mode - return true; - } - - return false; -} - -bool -basic_editor::on_mouse_button( int const Button, int const Action ) { - - if( false == EditorModeFlag ) { return false; } - // TBD: automatically activate and enforce freefly mode when editor is active? - if( false == FreeFlyModeFlag ) { return false; } - - if( Button == GLFW_MOUSE_BUTTON_LEFT ) { - - if( Action == GLFW_PRESS ) { - - m_node = GfxRenderer.Update_Pick_Node(); - m_nodesnapshot = { m_node }; - if( m_node ) { - Application.set_cursor( GLFW_CURSOR_DISABLED ); - } - } - else { - // left button release - // TODO: record the current undo step on the undo stack - m_nodesnapshot = { m_node }; - if( m_node ) { - Application.set_cursor( GLFW_CURSOR_NORMAL ); - } - } - - m_mouseleftbuttondown = ( Action == GLFW_PRESS ); - - return ( m_node != nullptr ); - } - - return false; -} - -bool -basic_editor::on_mouse_move( double const Mousex, double const Mousey ) { - - auto const mousemove { glm::dvec2{ Mousex, Mousey } - m_mouseposition }; - m_mouseposition = { Mousex, Mousey }; - - if( false == EditorModeFlag ) { return false; } - if( false == m_mouseleftbuttondown ) { return false; } - if( m_node == nullptr ) { return false; } - - if( mode_translation() ) { - // move selected node - if( mode_translation_vertical() ) { - auto const translation { mousemove.y * -0.01f }; - translate( translation ); - } - else { - auto const mouseworldposition{ Global.pCamera->Pos + GfxRenderer.Mouse_Position() }; - translate( mouseworldposition ); - } - } - else { - // rotate selected node - auto const rotation { glm::vec3 { mousemove.y, mousemove.x, 0 } * 0.25f }; - rotate( rotation ); - } - - return true; -} - void -basic_editor::translate( glm::dvec3 const &Location ) { +basic_editor::translate( scene::basic_node *Node, glm::dvec3 const &Location, bool const Snaptoground ) { - auto *node { m_node }; // placeholder for operations on multiple nodes + auto *node { Node }; // placeholder for operations on multiple nodes auto location { Location }; - if( false == mode_snap() ) { + if( false == Snaptoground ) { location.y = node->location().y; } @@ -117,14 +39,14 @@ basic_editor::translate( glm::dvec3 const &Location ) { } void -basic_editor::translate( float const Offset ) { +basic_editor::translate( scene::basic_node *Node, float const Offset ) { // NOTE: offset scaling is calculated early so the same multiplier can be applied to potential whole group - auto location { m_node->location() }; + auto location { Node->location() }; auto const distance { glm::length( location - glm::dvec3{ Global.pCamera->Pos } ) }; auto const offset { Offset * std::max( 1.0, distance * 0.01 ) }; - auto *node { m_node }; // placeholder for operations on multiple nodes + auto *node { Node }; // placeholder for operations on multiple nodes if( typeid( *node ) == typeid( TAnimModel ) ) { translate_instance( static_cast( node ), offset ); @@ -167,47 +89,29 @@ basic_editor::translate_memorycell( TMemCell *Memorycell, float const Offset ) { } void -basic_editor::rotate( glm::vec3 const &Angle ) { +basic_editor::rotate( scene::basic_node *Node, glm::vec3 const &Angle, float const Quantization ) { - auto *node { m_node }; // placeholder for operations on multiple nodes + auto *node { Node }; // placeholder for operations on multiple nodes if( typeid( *node ) == typeid( TAnimModel ) ) { - rotate_instance( static_cast( node ), Angle ); + rotate_instance( static_cast( node ), Angle, Quantization ); } } void -basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) { +basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle, float const Quantization ) { // adjust node data glm::vec3 angle = glm::dvec3 { Instance->Angles() }; angle.y = clamp_circular( angle.y + Angle.y, 360.f ); - if( mode_snap() ) { + if( Quantization > 0.f ) { // TBD, TODO: adjustable quantization step - angle.y = quantize( angle.y, 15.f ); + angle.y = quantize( angle.y, Quantization ); } Instance->Angles( angle ); // update scene } -bool -basic_editor::mode_translation() const { - - return ( false == Global.altState ); -} - -bool -basic_editor::mode_translation_vertical() const { - - return ( true == Global.shiftState ); -} - -bool -basic_editor::mode_snap() const { - - return ( true == Global.ctrlState ); -} - } // scene //--------------------------------------------------------------------------- diff --git a/sceneeditor.h b/sceneeditor.h index b69874b8..583bce27 100644 --- a/sceneeditor.h +++ b/sceneeditor.h @@ -13,44 +13,29 @@ http://mozilla.org/MPL/2.0/. namespace scene { +// TODO: move the snapshot to history stack +struct node_snapshot { + + scene::basic_node *node; + std::string data; + + node_snapshot( scene::basic_node *Node ) : + node( Node ) { + if( Node != nullptr ) { + Node->export_as_text( data ); } }; +}; + +inline bool operator==( node_snapshot const &Left, node_snapshot const &Right ) { return ( ( Left.node == Right.node ) && ( Left.data == Right.data ) ); } +inline bool operator!=( node_snapshot const &Left, node_snapshot const &Right ) { return ( !( Left == Right ) ); } + class basic_editor { public: // methods - bool - on_key( int const Key, int const Action ); - bool - on_mouse_button( int const Button, int const Action ); - bool - on_mouse_move( double const Mousex, double const Mousey ); - scene::basic_node const * - node() const { - return m_node; } -private: -// types - struct node_snapshot { - - scene::basic_node *node; - std::string data; - - node_snapshot( scene::basic_node *Node ) : - node( Node ) { - if( Node != nullptr ) { - Node->export_as_text( data ); } }; - }; - friend bool operator==( basic_editor::node_snapshot const &Left, basic_editor::node_snapshot const &Right ); - friend bool operator!=( basic_editor::node_snapshot const &Left, basic_editor::node_snapshot const &Right ); -// methods - bool - mode_translation() const; - bool - mode_translation_vertical() const; - bool - mode_snap() const; void - translate( glm::dvec3 const &Location ); + translate( scene::basic_node *Node, glm::dvec3 const &Location, bool const Snaptoground ); void - translate( float const Offset ); + translate( scene::basic_node *Node, float const Offset ); void translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ); void @@ -60,22 +45,11 @@ private: void translate_memorycell( TMemCell *Memorycell, float const Offset ); void - rotate( glm::vec3 const &Angle ); + rotate( scene::basic_node *Node, glm::vec3 const &Angle, float const Quantization ); void - rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ); -// members - scene::basic_node *m_node; // temporary helper, currently selected scene node - node_snapshot m_nodesnapshot { nullptr }; // currently selected scene node in its pre-modified state - glm::dvec2 m_mouseposition { 0.0 }; - bool m_mouseleftbuttondown { false }; - + rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle, float const Quantization ); }; -inline bool operator==( basic_editor::node_snapshot const &Left, basic_editor::node_snapshot const &Right ) { return ( ( Left.node == Right.node ) && ( Left.data == Right.data ) ); } -inline bool operator!=( basic_editor::node_snapshot const &Left, basic_editor::node_snapshot const &Right ) { return ( !( Left == Right ) ); } - -extern basic_editor Editor; - } // scene //--------------------------------------------------------------------------- diff --git a/simulation.cpp b/simulation.cpp index a3a076f4..779ce554 100644 --- a/simulation.cpp +++ b/simulation.cpp @@ -9,13 +9,20 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "simulation.h" +#include "simulationtime.h" #include "globals.h" -#include "simulationtime.h" -#include "uilayer.h" -#include "renderer.h" -#include "logs.h" - +#include "event.h" +#include "memcell.h" +#include "track.h" +#include "traction.h" +#include "tractionpower.h" +#include "sound.h" +#include "animmodel.h" +#include "dynobj.h" +#include "lightarray.h" +#include "scene.h" +#include "train.h" namespace simulation { @@ -31,8 +38,9 @@ vehicle_table Vehicles; light_array Lights; scene::basic_region *Region { nullptr }; +TTrain *Train { nullptr }; - +bool is_ready { false }; bool state_manager::deserialize( std::string const &Scenariofile ) { @@ -63,909 +71,27 @@ state_manager::update( double const Deltatime, int Iterationcount ) { simulation::Vehicles.update( Deltatime, Iterationcount ); } - - -bool -state_serializer::deserialize( std::string const &Scenariofile ) { - - // TODO: move initialization to separate routine so we can reuse it - SafeDelete( Region ); - Region = new scene::basic_region(); - - // TODO: check first for presence of serialized binary files - // if this fails, fall back on the legacy text format - scene::scratch_data importscratchpad; - if( Scenariofile != "$.scn" ) { - // compilation to binary file isn't supported for rainsted-created overrides - importscratchpad.binary.terrain = Region->deserialize( Scenariofile ); - } - // NOTE: for the time being import from text format is a given, since we don't have full binary serialization - cParser scenarioparser( Scenariofile, cParser::buffer_FILE, Global.asCurrentSceneryPath, Global.bLoadTraction ); - - if( false == scenarioparser.ok() ) { return false; } - - deserialize( scenarioparser, importscratchpad ); - if( ( false == importscratchpad.binary.terrain ) - && ( Scenariofile != "$.scn" ) ) { - // if we didn't find usable binary version of the scenario files, create them now for future use - // as long as the scenario file wasn't rainsted-created base file override - Region->serialize( Scenariofile ); - } - return true; -} - -// restores class data from provided stream void -state_serializer::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) { +state_manager::update_clocks() { - // prepare deserialization function table - // since all methods use the same objects, we can have simple, hard-coded binds or lambdas for the task - using deserializefunction = void( state_serializer::*)(cParser &, scene::scratch_data &); - std::vector< - std::pair< - std::string, - deserializefunction> > functionlist = { - { "atmo", &state_serializer::deserialize_atmo }, - { "camera", &state_serializer::deserialize_camera }, - { "config", &state_serializer::deserialize_config }, - { "description", &state_serializer::deserialize_description }, - { "event", &state_serializer::deserialize_event }, - { "firstinit", &state_serializer::deserialize_firstinit }, - { "light", &state_serializer::deserialize_light }, - { "node", &state_serializer::deserialize_node }, - { "origin", &state_serializer::deserialize_origin }, - { "endorigin", &state_serializer::deserialize_endorigin }, - { "rotate", &state_serializer::deserialize_rotate }, - { "sky", &state_serializer::deserialize_sky }, - { "test", &state_serializer::deserialize_test }, - { "time", &state_serializer::deserialize_time }, - { "trainset", &state_serializer::deserialize_trainset }, - { "endtrainset", &state_serializer::deserialize_endtrainset } }; - using deserializefunctionbind = std::function; - std::unordered_map< - std::string, - deserializefunctionbind> functionmap; - for( auto &function : functionlist ) { - functionmap.emplace( function.first, std::bind( function.second, this, std::ref( Input ), std::ref( Scratchpad ) ) ); - } - - // deserialize content from the provided input - auto - timelast { std::chrono::steady_clock::now() }, - timenow { timelast }; - std::string token { Input.getToken() }; - while( false == token.empty() ) { - - auto lookup = functionmap.find( token ); - if( lookup != functionmap.end() ) { - lookup->second(); - } - else { - ErrorLog( "Bad scenario: unexpected token \"" + token + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); - } - - timenow = std::chrono::steady_clock::now(); - if( std::chrono::duration_cast( timenow - timelast ).count() >= 200 ) { - timelast = timenow; - glfwPollEvents(); - UILayer.set_progress( Input.getProgress(), Input.getFullProgress() ); - GfxRenderer.Render(); - } - - token = Input.getToken(); - } - - if( false == Scratchpad.initialized ) { - // manually perform scenario initialization - deserialize_firstinit( Input, Scratchpad ); - } + // Ra 2014-07: przeliczenie kąta czasu (do animacji zależnych od czasu) + auto const &time = simulation::Time.data(); + Global.fTimeAngleDeg = time.wHour * 15.0 + time.wMinute * 0.25 + ( ( time.wSecond + 0.001 * time.wMilliseconds ) / 240.0 ); + Global.fClockAngleDeg[ 0 ] = 36.0 * ( time.wSecond % 10 ); // jednostki sekund + Global.fClockAngleDeg[ 1 ] = 36.0 * ( time.wSecond / 10 ); // dziesiątki sekund + Global.fClockAngleDeg[ 2 ] = 36.0 * ( time.wMinute % 10 ); // jednostki minut + Global.fClockAngleDeg[ 3 ] = 36.0 * ( time.wMinute / 10 ); // dziesiątki minut + Global.fClockAngleDeg[ 4 ] = 36.0 * ( time.wHour % 10 ); // jednostki godzin + Global.fClockAngleDeg[ 5 ] = 36.0 * ( time.wHour / 10 ); // dziesiątki godzin } +// passes specified sound to all vehicles within range as a radio message broadcasted on specified channel void -state_serializer::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ) { +radio_message( sound_source *Message, int const Channel ) { - // NOTE: parameter system needs some decent replacement, but not worth the effort if we're moving to built-in editor - // atmosphere color; legacy parameter, no longer used - Input.getTokens( 3 ); - // fog range - Input.getTokens( 2 ); - Input - >> Global.fFogStart - >> Global.fFogEnd; - - if( Global.fFogEnd > 0.0 ) { - // fog colour; optional legacy parameter, no longer used - Input.getTokens( 3 ); + if( Train != nullptr ) { + Train->radio_message( Message, Channel ); } - - std::string token { Input.getToken() }; - if( token != "endatmo" ) { - // optional overcast parameter - Global.Overcast = clamp( std::stof( token ), 0.f, 2.f ); - // overcast drives weather so do a calculation here - // NOTE: ugly, clean it up when we're done with world refactoring - Global.pWorld->compute_weather(); - } - while( ( false == token.empty() ) - && ( token != "endatmo" ) ) { - // anything else left in the section has no defined meaning - token = Input.getToken(); - } -} - -void -state_serializer::deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ) { - - glm::dvec3 xyz, abc; - int i = -1, into = -1; // do której definicji kamery wstawić - std::string token; - do { // opcjonalna siódma liczba określa numer kamery, a kiedyś były tylko 3 - Input.getTokens(); - Input >> token; - switch( ++i ) { // kiedyś camera miało tylko 3 współrzędne - case 0: { xyz.x = atof( token.c_str() ); break; } - case 1: { xyz.y = atof( token.c_str() ); break; } - case 2: { xyz.z = atof( token.c_str() ); break; } - case 3: { abc.x = atof( token.c_str() ); break; } - case 4: { abc.y = atof( token.c_str() ); break; } - case 5: { abc.z = atof( token.c_str() ); break; } - case 6: { into = atoi( token.c_str() ); break; } // takie sobie, bo można wpisać -1 - default: { break; } - } - } while( token.compare( "endcamera" ) != 0 ); - if( into < 0 ) - into = ++Global.iCameraLast; - if( into < 10 ) { // przepisanie do odpowiedniego miejsca w tabelce - Global.FreeCameraInit[ into ] = xyz; - Global.FreeCameraInitAngle[ into ] = - Math3D::vector3( - glm::radians( abc.x ), - glm::radians( abc.y ), - glm::radians( abc.z ) ); - Global.iCameraLast = into; // numer ostatniej - } -/* - // cleaned up version of the above. - // NOTE: no longer supports legacy mode where some parameters were optional - Input.getTokens( 7 ); - glm::vec3 - position, - rotation; - int index; - Input - >> position.x - >> position.y - >> position.z - >> rotation.x - >> rotation.y - >> rotation.z - >> index; - - skip_until( Input, "endcamera" ); - - // TODO: finish this -*/ -} - -void -state_serializer::deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ) { - - // config parameters (re)definition - Global.ConfigParse( Input ); -} - -void -state_serializer::deserialize_description( cParser &Input, scene::scratch_data &Scratchpad ) { - - // legacy section, never really used; - skip_until( Input, "enddescription" ); -} - -void -state_serializer::deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ) { - - // TODO: refactor event class and its de/serialization. do offset and rotation after deserialization is done - auto *event = new TEvent(); - Math3D::vector3 offset = ( - Scratchpad.location.offset.empty() ? - Math3D::vector3() : - Math3D::vector3( - Scratchpad.location.offset.top().x, - Scratchpad.location.offset.top().y, - Scratchpad.location.offset.top().z ) ); - event->Load( &Input, offset ); - - if( false == simulation::Events.insert( event ) ) { - delete event; - } -} - -void -state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ) { - - if( true == Scratchpad.initialized ) { return; } - - simulation::Paths.InitTracks(); - simulation::Traction.InitTraction(); - simulation::Events.InitEvents(); - simulation::Events.InitLaunchers(); - simulation::Memory.InitCells(); - - Scratchpad.initialized = true; -} - -void -state_serializer::deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ) { - - // legacy section, no longer used nor supported; - skip_until( Input, "endlight" ); -} - -void -state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ) { - - auto const inputline = Input.Line(); // cache in case we need to report error - - scene::node_data nodedata; - // common data and node type indicator - Input.getTokens( 4 ); - Input - >> nodedata.range_max - >> nodedata.range_min - >> nodedata.name - >> nodedata.type; - // type-based deserialization. not elegant but it'll do - if( nodedata.type == "dynamic" ) { - - auto *vehicle { deserialize_dynamic( Input, Scratchpad, nodedata ) }; - // vehicle import can potentially fail - if( vehicle == nullptr ) { return; } - - if( false == simulation::Vehicles.insert( vehicle ) ) { - - ErrorLog( "Bad scenario: vehicle with duplicate name \"" + vehicle->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); - } - - if( ( vehicle->MoverParameters->CategoryFlag == 1 ) // trains only - && ( ( ( vehicle->LightList( side::front ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) ) != 0 ) - || ( ( vehicle->LightList( side::rear ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) ) != 0 ) ) ) { - simulation::Lights.insert( vehicle ); - } - } - else if( nodedata.type == "track" ) { - - auto *path { deserialize_path( Input, Scratchpad, nodedata ) }; - // duplicates of named tracks are currently experimentally allowed - if( false == simulation::Paths.insert( path ) ) { - ErrorLog( "Bad scenario: track with duplicate name \"" + path->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); -/* - delete path; - delete pathnode; -*/ - } - simulation::Region->insert_and_register( path ); - } - else if( nodedata.type == "traction" ) { - - auto *traction { deserialize_traction( Input, Scratchpad, nodedata ) }; - // traction loading is optional - if( traction == nullptr ) { return; } - - if( false == simulation::Traction.insert( traction ) ) { - ErrorLog( "Bad scenario: traction piece with duplicate name \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); - } - simulation::Region->insert_and_register( traction ); - } - else if( nodedata.type == "tractionpowersource" ) { - - auto *powersource { deserialize_tractionpowersource( Input, Scratchpad, nodedata ) }; - // traction loading is optional - if( powersource == nullptr ) { return; } - - if( false == simulation::Powergrid.insert( powersource ) ) { - ErrorLog( "Bad scenario: power grid source with duplicate name \"" + powersource->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); - } -/* - // TODO: implement this - simulation::Region.insert_powersource( powersource, Scratchpad ); -*/ - } - else if( nodedata.type == "model" ) { - - if( nodedata.range_min < 0.0 ) { - // 3d terrain - if( false == Scratchpad.binary.terrain ) { - // if we're loading data from text .scn file convert and import - auto *instance { deserialize_model( Input, Scratchpad, nodedata ) }; - // model import can potentially fail - if( instance == nullptr ) { return; } - // go through submodels, and import them as shapes - auto const cellcount = instance->TerrainCount() + 1; // zliczenie submodeli - for( auto i = 1; i < cellcount; ++i ) { - auto *submodel = instance->TerrainSquare( i - 1 ); - simulation::Region->insert( - scene::shape_node().convert( submodel ), - Scratchpad, - false ); - // if there's more than one group of triangles in the cell they're held as children of the primary submodel - submodel = submodel->ChildGet(); - while( submodel != nullptr ) { - simulation::Region->insert( - scene::shape_node().convert( submodel ), - Scratchpad, - false ); - submodel = submodel->NextGet(); - } - } - // with the import done we can get rid of the source model - delete instance; - } - else { - // if binary terrain file was present, we already have this data - skip_until( Input, "endmodel" ); - } - } - else { - // regular instance of 3d mesh - auto *instance { deserialize_model( Input, Scratchpad, nodedata ) }; - // model import can potentially fail - if( instance == nullptr ) { return; } - - if( false == simulation::Instances.insert( instance ) ) { - ErrorLog( "Bad scenario: 3d model instance with duplicate name \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); - } - simulation::Region->insert( instance ); - } - } - else if( ( nodedata.type == "triangles" ) - || ( nodedata.type == "triangle_strip" ) - || ( nodedata.type == "triangle_fan" ) ) { - - if( false == Scratchpad.binary.terrain ) { - - simulation::Region->insert( - scene::shape_node().import( - Input, nodedata ), - Scratchpad, - true ); - } - else { - // all shapes were already loaded from the binary version of the file - skip_until( Input, "endtri" ); - } - } - else if( ( nodedata.type == "lines" ) - || ( nodedata.type == "line_strip" ) - || ( nodedata.type == "line_loop" ) ) { - - if( false == Scratchpad.binary.terrain ) { - - simulation::Region->insert( - scene::lines_node().import( - Input, nodedata ), - Scratchpad ); - } - else { - // all lines were already loaded from the binary version of the file - skip_until( Input, "endline" ); - } - } - else if( nodedata.type == "memcell" ) { - - auto *memorycell { deserialize_memorycell( Input, Scratchpad, nodedata ) }; - if( false == simulation::Memory.insert( memorycell ) ) { - ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); - } - simulation::Region->insert( memorycell ); - } - else if( nodedata.type == "eventlauncher" ) { - - auto *eventlauncher { deserialize_eventlauncher( Input, Scratchpad, nodedata ) }; - if( false == simulation::Events.insert( eventlauncher ) ) { - ErrorLog( "Bad scenario: event launcher with duplicate name \"" + eventlauncher->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); - } - // event launchers can be either global, or local with limited range of activation - // each gets assigned different caretaker - if( true == eventlauncher->IsGlobal() ) { - simulation::Events.queue( eventlauncher ); - } - else { - simulation::Region->insert( eventlauncher ); - } - } - else if( nodedata.type == "sound" ) { - - auto *sound { deserialize_sound( Input, Scratchpad, nodedata ) }; - if( false == simulation::Sounds.insert( sound ) ) { - ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); - } - simulation::Region->insert( sound ); - } - -} - -void -state_serializer::deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ) { - - glm::dvec3 offset; - Input.getTokens( 3 ); - Input - >> offset.x - >> offset.y - >> offset.z; - // sumowanie całkowitego przesunięcia - Scratchpad.location.offset.emplace( - offset + ( - Scratchpad.location.offset.empty() ? - glm::dvec3() : - Scratchpad.location.offset.top() ) ); -} - -void -state_serializer::deserialize_endorigin( cParser &Input, scene::scratch_data &Scratchpad ) { - - if( false == Scratchpad.location.offset.empty() ) { - Scratchpad.location.offset.pop(); - } - else { - ErrorLog( "Bad origin: endorigin instruction with empty origin stack in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); - } -} - -void -state_serializer::deserialize_rotate( cParser &Input, scene::scratch_data &Scratchpad ) { - - Input.getTokens( 3 ); - Input - >> Scratchpad.location.rotation.x - >> Scratchpad.location.rotation.y - >> Scratchpad.location.rotation.z; -} - -void -state_serializer::deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad ) { - - // sky model - Input.getTokens( 1 ); - Input - >> Global.asSky; - // anything else left in the section has no defined meaning - skip_until( Input, "endsky" ); -} - -void -state_serializer::deserialize_test( cParser &Input, scene::scratch_data &Scratchpad ) { - - // legacy section, no longer supported; - skip_until( Input, "endtest" ); -} - -void -state_serializer::deserialize_time( cParser &Input, scene::scratch_data &Scratchpad ) { - - // current scenario time - cParser timeparser( Input.getToken() ); - timeparser.getTokens( 2, false, ":" ); - auto &time = simulation::Time.data(); - timeparser - >> time.wHour - >> time.wMinute; - - if( true == Global.ScenarioTimeCurrent ) { - // calculate time shift required to match scenario time with local clock - auto timenow = std::time( 0 ); - auto const *localtime = std::localtime( &timenow ); - Global.ScenarioTimeOffset = ( ( localtime->tm_hour * 60 + localtime->tm_min ) - ( time.wHour * 60 + time.wMinute ) ) / 60.f; - } - - // remaining sunrise and sunset parameters are no longer used, as they're now calculated dynamically - // anything else left in the section has no defined meaning - skip_until( Input, "endtime" ); -} - -void -state_serializer::deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ) { - - if( true == Scratchpad.trainset.is_open ) { - // shouldn't happen but if it does wrap up currently open trainset and report an error - deserialize_endtrainset( Input, Scratchpad ); - ErrorLog( "Bad scenario: encountered nested trainset definitions in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() ) + ")" ); - } - - Scratchpad.trainset = scene::scratch_data::trainset_data(); - Scratchpad.trainset.is_open = true; - - Input.getTokens( 4 ); - Input - >> Scratchpad.trainset.name - >> Scratchpad.trainset.track - >> Scratchpad.trainset.offset - >> Scratchpad.trainset.velocity; -} - -void -state_serializer::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ) { - - if( ( false == Scratchpad.trainset.is_open ) - || ( true == Scratchpad.trainset.vehicles.empty() ) ) { - // not bloody likely but we better check for it just the same - ErrorLog( "Bad trainset: empty trainset defined in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); - Scratchpad.trainset.is_open = false; - return; - } - - std::size_t vehicleindex { 0 }; - for( auto *vehicle : Scratchpad.trainset.vehicles ) { - // go through list of vehicles in the trainset, coupling them together and checking for potential driver - if( ( vehicle->Mechanik != nullptr ) - && ( vehicle->Mechanik->Primary() ) ) { - // primary driver will receive the timetable for this trainset - Scratchpad.trainset.driver = vehicle; - } - if( vehicleindex > 0 ) { - // from second vehicle on couple it with the previous one - Scratchpad.trainset.vehicles[ vehicleindex - 1 ]->AttachPrev( - vehicle, - Scratchpad.trainset.couplings[ vehicleindex - 1 ] ); - } - ++vehicleindex; - } - - if( Scratchpad.trainset.driver != nullptr ) { - // if present, send timetable to the driver - // wysłanie komendy "Timetable" ustawia odpowiedni tryb jazdy - auto *controller = Scratchpad.trainset.driver->Mechanik; - controller->DirectionInitial(); - controller->PutCommand( - "Timetable:" + Scratchpad.trainset.name, - Scratchpad.trainset.velocity, - 0, - nullptr ); - } - if( Scratchpad.trainset.couplings.back() == coupling::faux ) { - // jeśli ostatni pojazd ma sprzęg 0 to założymy mu końcówki blaszane (jak AI się odpali, to sobie poprawi) - Scratchpad.trainset.vehicles.back()->RaLightsSet( -1, light::rearendsignals ); - } - // all done - Scratchpad.trainset.is_open = false; -} - -// creates path and its wrapper, restoring class data from provided stream -TTrack * -state_serializer::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - - // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done - auto *track = new TTrack( Nodedata ); - auto const offset { ( - Scratchpad.location.offset.empty() ? - glm::dvec3 { 0.0 } : - glm::dvec3 { - Scratchpad.location.offset.top().x, - Scratchpad.location.offset.top().y, - Scratchpad.location.offset.top().z } ) }; - track->Load( &Input, offset ); - - return track; -} - -TTraction * -state_serializer::deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - - if( false == Global.bLoadTraction ) { - skip_until( Input, "endtraction" ); - return nullptr; - } - // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done - auto *traction = new TTraction( Nodedata ); - auto offset = ( - Scratchpad.location.offset.empty() ? - glm::dvec3() : - Scratchpad.location.offset.top() ); - traction->Load( &Input, offset ); - - return traction; -} - -TTractionPowerSource * -state_serializer::deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - - if( false == Global.bLoadTraction ) { - skip_until( Input, "end" ); - return nullptr; - } - - auto *powersource = new TTractionPowerSource( Nodedata ); - powersource->Load( &Input ); - // adjust location - powersource->location( transform( powersource->location(), Scratchpad ) ); - - return powersource; -} - -TMemCell * -state_serializer::deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - - auto *memorycell = new TMemCell( Nodedata ); - memorycell->Load( &Input ); - // adjust location - memorycell->location( transform( memorycell->location(), Scratchpad ) ); - - return memorycell; -} - -TEventLauncher * -state_serializer::deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - - glm::dvec3 location; - Input.getTokens( 3 ); - Input - >> location.x - >> location.y - >> location.z; - - auto *eventlauncher = new TEventLauncher( Nodedata ); - eventlauncher->Load( &Input ); - eventlauncher->location( transform( location, Scratchpad ) ); - - return eventlauncher; -} - -TAnimModel * -state_serializer::deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - - glm::dvec3 location; - glm::vec3 rotation; - Input.getTokens( 4 ); - Input - >> location.x - >> location.y - >> location.z - >> rotation.y; - - auto *instance = new TAnimModel( Nodedata ); - instance->Angles( Scratchpad.location.rotation + rotation ); // dostosowanie do pochylania linii - - if( instance->Load( &Input, false ) ) { - instance->location( transform( location, Scratchpad ) ); - } - else { - // model nie wczytał się - ignorowanie node - SafeDelete( instance ); - } - - return instance; -} - -TDynamicObject * -state_serializer::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - - if( false == Scratchpad.trainset.is_open ) { - // part of trainset data is used when loading standalone vehicles, so clear it just in case - Scratchpad.trainset = scene::scratch_data::trainset_data(); - } - auto const inputline { Input.Line() }; // cache in case of errors - // basic attributes - auto const datafolder { Input.getToken() }; - auto const skinfile { Input.getToken() }; - auto const mmdfile { Input.getToken() }; - auto const pathname = ( - Scratchpad.trainset.is_open ? - Scratchpad.trainset.track : - Input.getToken() ); - auto const offset { Input.getToken( false ) }; - auto const drivertype { Input.getToken() }; - auto const couplingdata = ( - Scratchpad.trainset.is_open ? - Input.getToken() : - "3" ); - auto const velocity = ( - Scratchpad.trainset.is_open ? - Scratchpad.trainset.velocity : - Input.getToken( false ) ); - // extract coupling type and optional parameters - auto const couplingdatawithparams = couplingdata.find( '.' ); - auto coupling = ( - couplingdatawithparams != std::string::npos ? - std::atoi( couplingdata.substr( 0, couplingdatawithparams ).c_str() ) : - std::atoi( couplingdata.c_str() ) ); - if( coupling < 0 ) { - // sprzęg zablokowany (pojazdy nierozłączalne przy manewrach) - coupling = ( -coupling ) | coupling::permanent; - } - if( ( offset != -1.0 ) - && ( std::abs( offset ) > 0.5 ) ) { // maksymalna odległość między sprzęgami - do przemyślenia - // likwidacja sprzęgu, jeśli odległość zbyt duża - to powinno być uwzględniane w fizyce sprzęgów... - coupling = coupling::faux; - } - auto const params = ( - couplingdatawithparams != std::string::npos ? - couplingdata.substr( couplingdatawithparams + 1 ) : - "" ); - // load amount and type - auto loadcount { Input.getToken( false ) }; - auto loadtype = ( - loadcount ? - Input.getToken() : - "" ); - if( loadtype == "enddynamic" ) { - // idiotoodporność: ładunek bez podanego typu nie liczy się jako ładunek - loadcount = 0; - loadtype = ""; - } - - auto *path = simulation::Paths.find( pathname ); - if( path == nullptr ) { - - ErrorLog( "Bad scenario: vehicle \"" + Nodedata.name + "\" placed on nonexistent path \"" + pathname + "\" in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); - skip_until( Input, "enddynamic" ); - return nullptr; - } - - if( ( true == Scratchpad.trainset.vehicles.empty() ) // jeśli pierwszy pojazd, - && ( false == path->m_events0.empty() ) // tor ma Event0 - && ( std::abs( velocity ) <= 1.f ) // a skład stoi - && ( Scratchpad.trainset.offset >= 0.0 ) // ale może nie sięgać na owy tor - && ( Scratchpad.trainset.offset < 8.0 ) ) { // i raczej nie sięga - // przesuwamy około pół EU07 dla wstecznej zgodności - Scratchpad.trainset.offset = 8.0; - } - - auto *vehicle = new TDynamicObject(); - - auto const length = - vehicle->Init( - Nodedata.name, - datafolder, skinfile, mmdfile, - path, - ( offset == -1.0 ? - Scratchpad.trainset.offset : - Scratchpad.trainset.offset - offset ), - drivertype, - velocity, - Scratchpad.trainset.name, - loadcount, loadtype, - ( offset == -1.0 ), - params ); - - if( length != 0.0 ) { // zero oznacza błąd - // przesunięcie dla kolejnego, minus bo idziemy w stronę punktu 1 - Scratchpad.trainset.offset -= length; - // automatically establish permanent connections for couplers which specify them in their definitions - if( ( coupling != 0 ) - && ( vehicle->MoverParameters->Couplers[ ( offset == -1.0 ? side::front : side::rear ) ].AllowedFlag & coupling::permanent ) ) { - coupling |= coupling::permanent; - } - if( true == Scratchpad.trainset.is_open ) { - Scratchpad.trainset.vehicles.emplace_back( vehicle ); - Scratchpad.trainset.couplings.emplace_back( coupling ); - } - } - else { - if( vehicle->MyTrack != nullptr ) { - // rare failure case where vehicle with length of 0 is added to the track, - // treated as error code and consequently deleted, but still remains on the track - vehicle->MyTrack->RemoveDynamicObject( vehicle ); - } - delete vehicle; - skip_until( Input, "enddynamic" ); - return nullptr; - } - - auto const destination { Input.getToken() }; - if( destination != "enddynamic" ) { - // optional vehicle destination parameter - vehicle->asDestination = Input.getToken(); - skip_until( Input, "enddynamic" ); - } - - return vehicle; -} - -sound_source * -state_serializer::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { - - glm::dvec3 location; - Input.getTokens( 3 ); - Input - >> location.x - >> location.y - >> location.z; - // adjust location - location = transform( location, Scratchpad ); - - auto *sound = new sound_source( sound_placement::external, Nodedata.range_max ); - sound->offset( location ); - sound->name( Nodedata.name ); - sound->deserialize( Input, sound_type::single ); - - skip_until( Input, "endsound" ); - - return sound; -} - -// skips content of stream until specified token -void -state_serializer::skip_until( cParser &Input, std::string const &Token ) { - - std::string token { Input.getToken() }; - while( ( false == token.empty() ) - && ( token != Token ) ) { - - token = Input.getToken(); - } -} - -// transforms provided location by specifed rotation and offset -glm::dvec3 -state_serializer::transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ) { - - if( Scratchpad.location.rotation != glm::vec3( 0, 0, 0 ) ) { - auto const rotation = glm::radians( Scratchpad.location.rotation ); - Location = glm::rotateY( Location, rotation.y ); // Ra 2014-11: uwzględnienie rotacji - } - if( false == Scratchpad.location.offset.empty() ) { - Location += Scratchpad.location.offset.top(); - } - return Location; -} - - -// stores class data in specified file, in legacy (text) format -void -state_serializer::export_as_text( std::string const &Scenariofile ) const { - - if( Scenariofile == "$.scn" ) { - ErrorLog( "Bad file: scenery export not supported for file \"$.scn\"" ); - } - else { - WriteLog( "Scenery data export in progress..." ); - } - - auto filename { Scenariofile }; - while( filename[ 0 ] == '$' ) { - // trim leading $ char rainsted utility may add to the base name for modified .scn files - filename.erase( 0, 1 ); - } - erase_extension( filename ); - filename = Global.asCurrentSceneryPath + filename + "_export"; - - std::ofstream scmfile { filename + ".scm" }; - // tracks - scmfile << "// paths\n"; - for( auto const *path : Paths.sequence() ) { - path->export_as_text( scmfile ); - } - // traction - scmfile << "// traction\n"; - for( auto const *traction : Traction.sequence() ) { - traction->export_as_text( scmfile ); - } - // power grid - scmfile << "// traction power sources\n"; - for( auto const *powersource : Powergrid.sequence() ) { - powersource->export_as_text( scmfile ); - } - // models - scmfile << "// instanced models\n"; - for( auto const *instance : Instances.sequence() ) { - instance->export_as_text( scmfile ); - } - // sounds - scmfile << "// sounds\n"; - Region->export_as_text( scmfile ); - - std::ofstream ctrfile { filename + ".ctr" }; - // mem cells - ctrfile << "// memory cells\n"; - for( auto const *memorycell : Memory.sequence() ) { - if( true == memorycell->is_exportable ) { - memorycell->export_as_text( ctrfile ); - } - } - // events - Events.export_as_text( ctrfile ); - - WriteLog( "Scenery data export done." ); } } // simulation diff --git a/simulation.h b/simulation.h index 3e3a35f0..28d76da6 100644 --- a/simulation.h +++ b/simulation.h @@ -9,67 +9,11 @@ http://mozilla.org/MPL/2.0/. #pragma once -#include "parser.h" -#include "scene.h" -#include "event.h" -#include "memcell.h" -#include "evlaunch.h" -#include "track.h" -#include "traction.h" -#include "tractionpower.h" -#include "sound.h" -#include "animmodel.h" -#include "dynobj.h" -#include "driver.h" -#include "lightarray.h" +#include "simulationstateserializer.h" +#include "classes.h" namespace simulation { -class state_serializer { - -public: -// methods - // restores simulation data from specified file. returns: true on success, false otherwise - bool - deserialize( std::string const &Scenariofile ); - // stores class data in specified file, in legacy (text) format - void - export_as_text( std::string const &Scenariofile ) const; - -private: -// methods - // restores class data from provided stream - void deserialize( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_description( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_endorigin( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_rotate( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_test( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_time( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ); - void deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ); - TTrack * deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); - TTraction * deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); - TTractionPowerSource * deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); - TMemCell * deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); - TEventLauncher * deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); - TAnimModel * deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); - TDynamicObject * deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); - sound_source * deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); - // skips content of stream until specified token - void skip_until( cParser &Input, std::string const &Token ); - // transforms provided location by specifed rotation and offset - glm::dvec3 transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ); -}; - class state_manager { public: @@ -77,6 +21,8 @@ public: // legacy method, calculates changes in simulation state over specified time void update( double Deltatime, int Iterationcount ); + void + update_clocks(); // restores simulation data from specified file. returns: true on success, false otherwise bool deserialize( std::string const &Scenariofile ); @@ -89,6 +35,9 @@ private: state_serializer m_serializer; }; +// passes specified sound to all vehicles within range as a radio message broadcasted on specified channel +void radio_message( sound_source *Message, int const Channel ); + extern state_manager State; extern event_manager Events; extern memory_table Memory; @@ -101,6 +50,9 @@ extern vehicle_table Vehicles; extern light_array Lights; extern scene::basic_region *Region; +extern TTrain *Train; + +extern bool is_ready; } // simulation diff --git a/simulationenvironment.cpp b/simulationenvironment.cpp new file mode 100644 index 00000000..5cef14eb --- /dev/null +++ b/simulationenvironment.cpp @@ -0,0 +1,158 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "simulationenvironment.h" + +#include "globals.h" + +namespace simulation { + +world_environment Environment; + +} // simulation + +void +world_environment::toggle_daylight() { + + Global.FakeLight = !Global.FakeLight; + + if( Global.FakeLight ) { + // for fake daylight enter fixed hour + time( 10, 30, 0 ); + } + else { + // local clock based calculation + time(); + } +} + +// calculates current season of the year based on set simulation date +void +world_environment::compute_season( int const Yearday ) const { + + using dayseasonpair = std::pair; + + std::vector seasonsequence { + { 65, "winter:" }, + { 158, "spring:" }, + { 252, "summer:" }, + { 341, "autumn:" }, + { 366, "winter:" } }; + auto const lookup = + std::lower_bound( + std::begin( seasonsequence ), std::end( seasonsequence ), + clamp( Yearday, 1, seasonsequence.back().first ), + []( dayseasonpair const &Left, const int Right ) { + return Left.first < Right; } ); + + Global.Season = lookup->second; + // season can affect the weather so if it changes, re-calculate weather as well + compute_weather(); +} + +// calculates current weather +void +world_environment::compute_weather() const { + + Global.Weather = ( + Global.Overcast < 0.25 ? "clear:" : + Global.Overcast < 1.0 ? "cloudy:" : + ( Global.Season != "winter:" ? + "rain:" : + "snow:" ) ); +} + +void +world_environment::init() { + + m_sun.init(); + m_moon.init(); + m_stars.init(); + m_clouds.Init(); +} + +void +world_environment::update() { + // move celestial bodies... + m_sun.update(); + m_moon.update(); + // ...determine source of key light and adjust global state accordingly... + // diffuse (sun) intensity goes down after twilight, and reaches minimum 18 degrees below horizon + float twilightfactor = clamp( -m_sun.getAngle(), 0.0f, 18.0f ) / 18.0f; + // NOTE: sun light receives extra padding to prevent moon from kicking in too soon + auto const sunlightlevel = m_sun.getIntensity() + 0.05f * ( 1.f - twilightfactor ); + auto const moonlightlevel = m_moon.getIntensity() * 0.65f; // scaled down by arbitrary factor, it's pretty bright otherwise + float keylightintensity; + glm::vec3 keylightcolor; + if( moonlightlevel > sunlightlevel ) { + // rare situations when the moon is brighter than the sun, typically at night + Global.SunAngle = m_moon.getAngle(); + Global.DayLight.position = m_moon.getDirection(); + Global.DayLight.direction = -1.0f * m_moon.getDirection(); + keylightintensity = moonlightlevel; + // if the moon is up, it overrides the twilight + twilightfactor = 0.0f; + keylightcolor = glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 202.0f / 255.0f ); + } + else { + // regular situation with sun as the key light + Global.SunAngle = m_sun.getAngle(); + Global.DayLight.position = m_sun.getDirection(); + Global.DayLight.direction = -1.0f * m_sun.getDirection(); + keylightintensity = sunlightlevel; + // include 'golden hour' effect in twilight lighting + float const duskfactor = 1.0f - clamp( Global.SunAngle, 0.0f, 18.0f ) / 18.0f; + keylightcolor = interpolate( + glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), + glm::vec3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), + duskfactor ); + } + // ...update skydome to match the current sun position as well... + m_skydome.SetOvercastFactor( Global.Overcast ); + m_skydome.Update( m_sun.getDirection() ); + // ...retrieve current sky colour and brightness... + auto const skydomecolour = m_skydome.GetAverageColor(); + auto const skydomehsv = colors::RGBtoHSV( skydomecolour ); + // sun strength is reduced by overcast level + keylightintensity *= ( 1.0f - std::min( 1.f, Global.Overcast ) * 0.65f ); + + // intensity combines intensity of the sun and the light reflected by the sky dome + // it'd be more technically correct to have just the intensity of the sun here, + // but whether it'd _look_ better is something to be tested + auto const intensity = std::min( 1.15f * ( 0.05f + keylightintensity + skydomehsv.z ), 1.25f ); + // the impact of sun component is reduced proportionally to overcast level, as overcast increases role of ambient light + auto const diffuselevel = interpolate( keylightintensity, intensity * ( 1.0f - twilightfactor ), 1.0f - std::min( 1.f, Global.Overcast ) * 0.75f ); + // ...update light colours and intensity. + keylightcolor = keylightcolor * diffuselevel; + Global.DayLight.diffuse = glm::vec4( keylightcolor, Global.DayLight.diffuse.a ); + Global.DayLight.specular = glm::vec4( keylightcolor * 0.85f, diffuselevel ); + + // tonal impact of skydome color is inversely proportional to how high the sun is above the horizon + // (this is pure conjecture, aimed more to 'look right' than be accurate) + float const ambienttone = clamp( 1.0f - ( Global.SunAngle / 90.0f ), 0.0f, 1.0f ); + Global.DayLight.ambient[ 0 ] = interpolate( skydomehsv.z, skydomecolour.r, ambienttone ); + Global.DayLight.ambient[ 1 ] = interpolate( skydomehsv.z, skydomecolour.g, ambienttone ); + Global.DayLight.ambient[ 2 ] = interpolate( skydomehsv.z, skydomecolour.b, ambienttone ); + + Global.fLuminance = intensity; + + // update the fog. setting it to match the average colour of the sky dome is cheap + // but quite effective way to make the distant items blend with background better + // NOTE: base brightness calculation provides scaled up value, so we bring it back to 'real' one here + Global.FogColor = m_skydome.GetAverageHorizonColor(); +} + +void +world_environment::time( int const Hour, int const Minute, int const Second ) { + + m_sun.setTime( Hour, Minute, Second ); +} + +//--------------------------------------------------------------------------- diff --git a/simulationenvironment.h b/simulationenvironment.h new file mode 100644 index 00000000..ce3b83a4 --- /dev/null +++ b/simulationenvironment.h @@ -0,0 +1,52 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "sky.h" +#include "sun.h" +#include "moon.h" +#include "stars.h" +#include "skydome.h" + +class opengl_renderer; + +// wrapper for environment elements -- sky, sun, stars, clouds etc +class world_environment { + + friend opengl_renderer; + +public: +// methods + void init(); + void update(); + void time( int const Hour = -1, int const Minute = -1, int const Second = -1 ); + // switches between static and dynamic daylight calculation + void toggle_daylight(); + // calculates current season of the year based on set simulation date + void compute_season( int const Yearday ) const; + // calculates current weather + void compute_weather() const; + +private: +// members + CSkyDome m_skydome; + cStars m_stars; + cSun m_sun; + cMoon m_moon; + TSky m_clouds; +}; + +namespace simulation { + +extern world_environment Environment; + +} // simulation + +//--------------------------------------------------------------------------- diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp new file mode 100644 index 00000000..bd589bc7 --- /dev/null +++ b/simulationstateserializer.cpp @@ -0,0 +1,934 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "stdafx.h" +#include "simulationstateserializer.h" + +#include "globals.h" +#include "simulation.h" +#include "simulationtime.h" +#include "event.h" +#include "driver.h" +#include "dynobj.h" +#include "animmodel.h" +#include "tractionpower.h" +#include "application.h" +#include "renderer.h" +#include "logs.h" + +namespace simulation { + +bool +state_serializer::deserialize( std::string const &Scenariofile ) { + + // TODO: move initialization to separate routine so we can reuse it + SafeDelete( Region ); + Region = new scene::basic_region(); + + // TODO: check first for presence of serialized binary files + // if this fails, fall back on the legacy text format + scene::scratch_data importscratchpad; + if( Scenariofile != "$.scn" ) { + // compilation to binary file isn't supported for rainsted-created overrides + importscratchpad.binary.terrain = Region->deserialize( Scenariofile ); + } + // NOTE: for the time being import from text format is a given, since we don't have full binary serialization + cParser scenarioparser( Scenariofile, cParser::buffer_FILE, Global.asCurrentSceneryPath, Global.bLoadTraction ); + + if( false == scenarioparser.ok() ) { return false; } + + deserialize( scenarioparser, importscratchpad ); + if( ( false == importscratchpad.binary.terrain ) + && ( Scenariofile != "$.scn" ) ) { + // if we didn't find usable binary version of the scenario files, create them now for future use + // as long as the scenario file wasn't rainsted-created base file override + Region->serialize( Scenariofile ); + } + return true; +} + +// restores class data from provided stream +void +state_serializer::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) { + + // prepare deserialization function table + // since all methods use the same objects, we can have simple, hard-coded binds or lambdas for the task + using deserializefunction = void( state_serializer::*)(cParser &, scene::scratch_data &); + std::vector< + std::pair< + std::string, + deserializefunction> > functionlist = { + { "atmo", &state_serializer::deserialize_atmo }, + { "camera", &state_serializer::deserialize_camera }, + { "config", &state_serializer::deserialize_config }, + { "description", &state_serializer::deserialize_description }, + { "event", &state_serializer::deserialize_event }, + { "firstinit", &state_serializer::deserialize_firstinit }, + { "light", &state_serializer::deserialize_light }, + { "node", &state_serializer::deserialize_node }, + { "origin", &state_serializer::deserialize_origin }, + { "endorigin", &state_serializer::deserialize_endorigin }, + { "rotate", &state_serializer::deserialize_rotate }, + { "sky", &state_serializer::deserialize_sky }, + { "test", &state_serializer::deserialize_test }, + { "time", &state_serializer::deserialize_time }, + { "trainset", &state_serializer::deserialize_trainset }, + { "endtrainset", &state_serializer::deserialize_endtrainset } }; + using deserializefunctionbind = std::function; + std::unordered_map< + std::string, + deserializefunctionbind> functionmap; + for( auto &function : functionlist ) { + functionmap.emplace( function.first, std::bind( function.second, this, std::ref( Input ), std::ref( Scratchpad ) ) ); + } + + // deserialize content from the provided input + auto + timelast { std::chrono::steady_clock::now() }, + timenow { timelast }; + std::string token { Input.getToken() }; + while( false == token.empty() ) { + + auto lookup = functionmap.find( token ); + if( lookup != functionmap.end() ) { + lookup->second(); + } + else { + ErrorLog( "Bad scenario: unexpected token \"" + token + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); + } + + timenow = std::chrono::steady_clock::now(); + if( std::chrono::duration_cast( timenow - timelast ).count() >= 200 ) { + timelast = timenow; + glfwPollEvents(); + Application.set_progress( Input.getProgress(), Input.getFullProgress() ); + GfxRenderer.Render(); + } + + token = Input.getToken(); + } + + if( false == Scratchpad.initialized ) { + // manually perform scenario initialization + deserialize_firstinit( Input, Scratchpad ); + } +} + +void +state_serializer::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ) { + + // NOTE: parameter system needs some decent replacement, but not worth the effort if we're moving to built-in editor + // atmosphere color; legacy parameter, no longer used + Input.getTokens( 3 ); + // fog range + Input.getTokens( 2 ); + Input + >> Global.fFogStart + >> Global.fFogEnd; + + if( Global.fFogEnd > 0.0 ) { + // fog colour; optional legacy parameter, no longer used + Input.getTokens( 3 ); + } + + std::string token { Input.getToken() }; + if( token != "endatmo" ) { + // optional overcast parameter + Global.Overcast = clamp( std::stof( token ), 0.f, 2.f ); + // overcast drives weather so do a calculation here + // NOTE: ugly, clean it up when we're done with world refactoring + simulation::Environment.compute_weather(); + } + while( ( false == token.empty() ) + && ( token != "endatmo" ) ) { + // anything else left in the section has no defined meaning + token = Input.getToken(); + } +} + +void +state_serializer::deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ) { + + glm::dvec3 xyz, abc; + int i = -1, into = -1; // do której definicji kamery wstawić + std::string token; + do { // opcjonalna siódma liczba określa numer kamery, a kiedyś były tylko 3 + Input.getTokens(); + Input >> token; + switch( ++i ) { // kiedyś camera miało tylko 3 współrzędne + case 0: { xyz.x = atof( token.c_str() ); break; } + case 1: { xyz.y = atof( token.c_str() ); break; } + case 2: { xyz.z = atof( token.c_str() ); break; } + case 3: { abc.x = atof( token.c_str() ); break; } + case 4: { abc.y = atof( token.c_str() ); break; } + case 5: { abc.z = atof( token.c_str() ); break; } + case 6: { into = atoi( token.c_str() ); break; } // takie sobie, bo można wpisać -1 + default: { break; } + } + } while( token.compare( "endcamera" ) != 0 ); + if( into < 0 ) + into = ++Global.iCameraLast; + if( into < 10 ) { // przepisanie do odpowiedniego miejsca w tabelce + Global.FreeCameraInit[ into ] = xyz; + Global.FreeCameraInitAngle[ into ] = + Math3D::vector3( + glm::radians( abc.x ), + glm::radians( abc.y ), + glm::radians( abc.z ) ); + Global.iCameraLast = into; // numer ostatniej + } +/* + // cleaned up version of the above. + // NOTE: no longer supports legacy mode where some parameters were optional + Input.getTokens( 7 ); + glm::vec3 + position, + rotation; + int index; + Input + >> position.x + >> position.y + >> position.z + >> rotation.x + >> rotation.y + >> rotation.z + >> index; + + skip_until( Input, "endcamera" ); + + // TODO: finish this +*/ +} + +void +state_serializer::deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ) { + + // config parameters (re)definition + Global.ConfigParse( Input ); +} + +void +state_serializer::deserialize_description( cParser &Input, scene::scratch_data &Scratchpad ) { + + // legacy section, never really used; + skip_until( Input, "enddescription" ); +} + +void +state_serializer::deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ) { + + // TODO: refactor event class and its de/serialization. do offset and rotation after deserialization is done + auto *event = new TEvent(); + Math3D::vector3 offset = ( + Scratchpad.location.offset.empty() ? + Math3D::vector3() : + Math3D::vector3( + Scratchpad.location.offset.top().x, + Scratchpad.location.offset.top().y, + Scratchpad.location.offset.top().z ) ); + event->Load( &Input, offset ); + + if( false == simulation::Events.insert( event ) ) { + delete event; + } +} + +void +state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ) { + + if( true == Scratchpad.initialized ) { return; } + + simulation::Paths.InitTracks(); + simulation::Traction.InitTraction(); + simulation::Events.InitEvents(); + simulation::Events.InitLaunchers(); + simulation::Memory.InitCells(); + + Scratchpad.initialized = true; +} + +void +state_serializer::deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ) { + + // legacy section, no longer used nor supported; + skip_until( Input, "endlight" ); +} + +void +state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ) { + + auto const inputline = Input.Line(); // cache in case we need to report error + + scene::node_data nodedata; + // common data and node type indicator + Input.getTokens( 4 ); + Input + >> nodedata.range_max + >> nodedata.range_min + >> nodedata.name + >> nodedata.type; + // type-based deserialization. not elegant but it'll do + if( nodedata.type == "dynamic" ) { + + auto *vehicle { deserialize_dynamic( Input, Scratchpad, nodedata ) }; + // vehicle import can potentially fail + if( vehicle == nullptr ) { return; } + + if( false == simulation::Vehicles.insert( vehicle ) ) { + + ErrorLog( "Bad scenario: vehicle with duplicate name \"" + vehicle->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + + if( ( vehicle->MoverParameters->CategoryFlag == 1 ) // trains only + && ( ( ( vehicle->LightList( side::front ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) ) != 0 ) + || ( ( vehicle->LightList( side::rear ) & ( light::headlight_left | light::headlight_right | light::headlight_upper ) ) != 0 ) ) ) { + simulation::Lights.insert( vehicle ); + } + } + else if( nodedata.type == "track" ) { + + auto *path { deserialize_path( Input, Scratchpad, nodedata ) }; + // duplicates of named tracks are currently experimentally allowed + if( false == simulation::Paths.insert( path ) ) { + ErrorLog( "Bad scenario: track with duplicate name \"" + path->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); +/* + delete path; + delete pathnode; +*/ + } + simulation::Region->insert_and_register( path ); + } + else if( nodedata.type == "traction" ) { + + auto *traction { deserialize_traction( Input, Scratchpad, nodedata ) }; + // traction loading is optional + if( traction == nullptr ) { return; } + + if( false == simulation::Traction.insert( traction ) ) { + ErrorLog( "Bad scenario: traction piece with duplicate name \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + simulation::Region->insert_and_register( traction ); + } + else if( nodedata.type == "tractionpowersource" ) { + + auto *powersource { deserialize_tractionpowersource( Input, Scratchpad, nodedata ) }; + // traction loading is optional + if( powersource == nullptr ) { return; } + + if( false == simulation::Powergrid.insert( powersource ) ) { + ErrorLog( "Bad scenario: power grid source with duplicate name \"" + powersource->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } +/* + // TODO: implement this + simulation::Region.insert_powersource( powersource, Scratchpad ); +*/ + } + else if( nodedata.type == "model" ) { + + if( nodedata.range_min < 0.0 ) { + // 3d terrain + if( false == Scratchpad.binary.terrain ) { + // if we're loading data from text .scn file convert and import + auto *instance { deserialize_model( Input, Scratchpad, nodedata ) }; + // model import can potentially fail + if( instance == nullptr ) { return; } + // go through submodels, and import them as shapes + auto const cellcount = instance->TerrainCount() + 1; // zliczenie submodeli + for( auto i = 1; i < cellcount; ++i ) { + auto *submodel = instance->TerrainSquare( i - 1 ); + simulation::Region->insert( + scene::shape_node().convert( submodel ), + Scratchpad, + false ); + // if there's more than one group of triangles in the cell they're held as children of the primary submodel + submodel = submodel->ChildGet(); + while( submodel != nullptr ) { + simulation::Region->insert( + scene::shape_node().convert( submodel ), + Scratchpad, + false ); + submodel = submodel->NextGet(); + } + } + // with the import done we can get rid of the source model + delete instance; + } + else { + // if binary terrain file was present, we already have this data + skip_until( Input, "endmodel" ); + } + } + else { + // regular instance of 3d mesh + auto *instance { deserialize_model( Input, Scratchpad, nodedata ) }; + // model import can potentially fail + if( instance == nullptr ) { return; } + + if( false == simulation::Instances.insert( instance ) ) { + ErrorLog( "Bad scenario: 3d model instance with duplicate name \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + simulation::Region->insert( instance ); + } + } + else if( ( nodedata.type == "triangles" ) + || ( nodedata.type == "triangle_strip" ) + || ( nodedata.type == "triangle_fan" ) ) { + + if( false == Scratchpad.binary.terrain ) { + + simulation::Region->insert( + scene::shape_node().import( + Input, nodedata ), + Scratchpad, + true ); + } + else { + // all shapes were already loaded from the binary version of the file + skip_until( Input, "endtri" ); + } + } + else if( ( nodedata.type == "lines" ) + || ( nodedata.type == "line_strip" ) + || ( nodedata.type == "line_loop" ) ) { + + if( false == Scratchpad.binary.terrain ) { + + simulation::Region->insert( + scene::lines_node().import( + Input, nodedata ), + Scratchpad ); + } + else { + // all lines were already loaded from the binary version of the file + skip_until( Input, "endline" ); + } + } + else if( nodedata.type == "memcell" ) { + + auto *memorycell { deserialize_memorycell( Input, Scratchpad, nodedata ) }; + if( false == simulation::Memory.insert( memorycell ) ) { + ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + simulation::Region->insert( memorycell ); + } + else if( nodedata.type == "eventlauncher" ) { + + auto *eventlauncher { deserialize_eventlauncher( Input, Scratchpad, nodedata ) }; + if( false == simulation::Events.insert( eventlauncher ) ) { + ErrorLog( "Bad scenario: event launcher with duplicate name \"" + eventlauncher->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + // event launchers can be either global, or local with limited range of activation + // each gets assigned different caretaker + if( true == eventlauncher->IsGlobal() ) { + simulation::Events.queue( eventlauncher ); + } + else { + simulation::Region->insert( eventlauncher ); + } + } + else if( nodedata.type == "sound" ) { + + auto *sound { deserialize_sound( Input, Scratchpad, nodedata ) }; + if( false == simulation::Sounds.insert( sound ) ) { + ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + } + simulation::Region->insert( sound ); + } + +} + +void +state_serializer::deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ) { + + glm::dvec3 offset; + Input.getTokens( 3 ); + Input + >> offset.x + >> offset.y + >> offset.z; + // sumowanie całkowitego przesunięcia + Scratchpad.location.offset.emplace( + offset + ( + Scratchpad.location.offset.empty() ? + glm::dvec3() : + Scratchpad.location.offset.top() ) ); +} + +void +state_serializer::deserialize_endorigin( cParser &Input, scene::scratch_data &Scratchpad ) { + + if( false == Scratchpad.location.offset.empty() ) { + Scratchpad.location.offset.pop(); + } + else { + ErrorLog( "Bad origin: endorigin instruction with empty origin stack in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); + } +} + +void +state_serializer::deserialize_rotate( cParser &Input, scene::scratch_data &Scratchpad ) { + + Input.getTokens( 3 ); + Input + >> Scratchpad.location.rotation.x + >> Scratchpad.location.rotation.y + >> Scratchpad.location.rotation.z; +} + +void +state_serializer::deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad ) { + + // sky model + Input.getTokens( 1 ); + Input + >> Global.asSky; + // anything else left in the section has no defined meaning + skip_until( Input, "endsky" ); +} + +void +state_serializer::deserialize_test( cParser &Input, scene::scratch_data &Scratchpad ) { + + // legacy section, no longer supported; + skip_until( Input, "endtest" ); +} + +void +state_serializer::deserialize_time( cParser &Input, scene::scratch_data &Scratchpad ) { + + // current scenario time + cParser timeparser( Input.getToken() ); + timeparser.getTokens( 2, false, ":" ); + auto &time = simulation::Time.data(); + timeparser + >> time.wHour + >> time.wMinute; + + if( true == Global.ScenarioTimeCurrent ) { + // calculate time shift required to match scenario time with local clock + auto timenow = std::time( 0 ); + auto const *localtime = std::localtime( &timenow ); + Global.ScenarioTimeOffset = ( ( localtime->tm_hour * 60 + localtime->tm_min ) - ( time.wHour * 60 + time.wMinute ) ) / 60.f; + } + + // remaining sunrise and sunset parameters are no longer used, as they're now calculated dynamically + // anything else left in the section has no defined meaning + skip_until( Input, "endtime" ); +} + +void +state_serializer::deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ) { + + if( true == Scratchpad.trainset.is_open ) { + // shouldn't happen but if it does wrap up currently open trainset and report an error + deserialize_endtrainset( Input, Scratchpad ); + ErrorLog( "Bad scenario: encountered nested trainset definitions in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() ) + ")" ); + } + + Scratchpad.trainset = scene::scratch_data::trainset_data(); + Scratchpad.trainset.is_open = true; + + Input.getTokens( 4 ); + Input + >> Scratchpad.trainset.name + >> Scratchpad.trainset.track + >> Scratchpad.trainset.offset + >> Scratchpad.trainset.velocity; +} + +void +state_serializer::deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ) { + + if( ( false == Scratchpad.trainset.is_open ) + || ( true == Scratchpad.trainset.vehicles.empty() ) ) { + // not bloody likely but we better check for it just the same + ErrorLog( "Bad trainset: empty trainset defined in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); + Scratchpad.trainset.is_open = false; + return; + } + + std::size_t vehicleindex { 0 }; + for( auto *vehicle : Scratchpad.trainset.vehicles ) { + // go through list of vehicles in the trainset, coupling them together and checking for potential driver + if( ( vehicle->Mechanik != nullptr ) + && ( vehicle->Mechanik->Primary() ) ) { + // primary driver will receive the timetable for this trainset + Scratchpad.trainset.driver = vehicle; + } + if( vehicleindex > 0 ) { + // from second vehicle on couple it with the previous one + Scratchpad.trainset.vehicles[ vehicleindex - 1 ]->AttachPrev( + vehicle, + Scratchpad.trainset.couplings[ vehicleindex - 1 ] ); + } + ++vehicleindex; + } + + if( Scratchpad.trainset.driver != nullptr ) { + // if present, send timetable to the driver + // wysłanie komendy "Timetable" ustawia odpowiedni tryb jazdy + auto *controller = Scratchpad.trainset.driver->Mechanik; + controller->DirectionInitial(); + controller->PutCommand( + "Timetable:" + Scratchpad.trainset.name, + Scratchpad.trainset.velocity, + 0, + nullptr ); + } + if( Scratchpad.trainset.couplings.back() == coupling::faux ) { + // jeśli ostatni pojazd ma sprzęg 0 to założymy mu końcówki blaszane (jak AI się odpali, to sobie poprawi) + Scratchpad.trainset.vehicles.back()->RaLightsSet( -1, light::rearendsignals ); + } + // all done + Scratchpad.trainset.is_open = false; +} + +// creates path and its wrapper, restoring class data from provided stream +TTrack * +state_serializer::deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done + auto *track = new TTrack( Nodedata ); + auto const offset { ( + Scratchpad.location.offset.empty() ? + glm::dvec3 { 0.0 } : + glm::dvec3 { + Scratchpad.location.offset.top().x, + Scratchpad.location.offset.top().y, + Scratchpad.location.offset.top().z } ) }; + track->Load( &Input, offset ); + + return track; +} + +TTraction * +state_serializer::deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + if( false == Global.bLoadTraction ) { + skip_until( Input, "endtraction" ); + return nullptr; + } + // TODO: refactor track and wrapper classes and their de/serialization. do offset and rotation after deserialization is done + auto *traction = new TTraction( Nodedata ); + auto offset = ( + Scratchpad.location.offset.empty() ? + glm::dvec3() : + Scratchpad.location.offset.top() ); + traction->Load( &Input, offset ); + + return traction; +} + +TTractionPowerSource * +state_serializer::deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + if( false == Global.bLoadTraction ) { + skip_until( Input, "end" ); + return nullptr; + } + + auto *powersource = new TTractionPowerSource( Nodedata ); + powersource->Load( &Input ); + // adjust location + powersource->location( transform( powersource->location(), Scratchpad ) ); + + return powersource; +} + +TMemCell * +state_serializer::deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + auto *memorycell = new TMemCell( Nodedata ); + memorycell->Load( &Input ); + // adjust location + memorycell->location( transform( memorycell->location(), Scratchpad ) ); + + return memorycell; +} + +TEventLauncher * +state_serializer::deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + glm::dvec3 location; + Input.getTokens( 3 ); + Input + >> location.x + >> location.y + >> location.z; + + auto *eventlauncher = new TEventLauncher( Nodedata ); + eventlauncher->Load( &Input ); + eventlauncher->location( transform( location, Scratchpad ) ); + + return eventlauncher; +} + +TAnimModel * +state_serializer::deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + glm::dvec3 location; + glm::vec3 rotation; + Input.getTokens( 4 ); + Input + >> location.x + >> location.y + >> location.z + >> rotation.y; + + auto *instance = new TAnimModel( Nodedata ); + instance->Angles( Scratchpad.location.rotation + rotation ); // dostosowanie do pochylania linii + + if( instance->Load( &Input, false ) ) { + instance->location( transform( location, Scratchpad ) ); + } + else { + // model nie wczytał się - ignorowanie node + SafeDelete( instance ); + } + + return instance; +} + +TDynamicObject * +state_serializer::deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + if( false == Scratchpad.trainset.is_open ) { + // part of trainset data is used when loading standalone vehicles, so clear it just in case + Scratchpad.trainset = scene::scratch_data::trainset_data(); + } + auto const inputline { Input.Line() }; // cache in case of errors + // basic attributes + auto const datafolder { Input.getToken() }; + auto const skinfile { Input.getToken() }; + auto const mmdfile { Input.getToken() }; + auto const pathname = ( + Scratchpad.trainset.is_open ? + Scratchpad.trainset.track : + Input.getToken() ); + auto const offset { Input.getToken( false ) }; + auto const drivertype { Input.getToken() }; + auto const couplingdata = ( + Scratchpad.trainset.is_open ? + Input.getToken() : + "3" ); + auto const velocity = ( + Scratchpad.trainset.is_open ? + Scratchpad.trainset.velocity : + Input.getToken( false ) ); + // extract coupling type and optional parameters + auto const couplingdatawithparams = couplingdata.find( '.' ); + auto coupling = ( + couplingdatawithparams != std::string::npos ? + std::atoi( couplingdata.substr( 0, couplingdatawithparams ).c_str() ) : + std::atoi( couplingdata.c_str() ) ); + if( coupling < 0 ) { + // sprzęg zablokowany (pojazdy nierozłączalne przy manewrach) + coupling = ( -coupling ) | coupling::permanent; + } + if( ( offset != -1.0 ) + && ( std::abs( offset ) > 0.5 ) ) { // maksymalna odległość między sprzęgami - do przemyślenia + // likwidacja sprzęgu, jeśli odległość zbyt duża - to powinno być uwzględniane w fizyce sprzęgów... + coupling = coupling::faux; + } + auto const params = ( + couplingdatawithparams != std::string::npos ? + couplingdata.substr( couplingdatawithparams + 1 ) : + "" ); + // load amount and type + auto loadcount { Input.getToken( false ) }; + auto loadtype = ( + loadcount ? + Input.getToken() : + "" ); + if( loadtype == "enddynamic" ) { + // idiotoodporność: ładunek bez podanego typu nie liczy się jako ładunek + loadcount = 0; + loadtype = ""; + } + + auto *path = simulation::Paths.find( pathname ); + if( path == nullptr ) { + + ErrorLog( "Bad scenario: vehicle \"" + Nodedata.name + "\" placed on nonexistent path \"" + pathname + "\" in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + skip_until( Input, "enddynamic" ); + return nullptr; + } + + if( ( true == Scratchpad.trainset.vehicles.empty() ) // jeśli pierwszy pojazd, + && ( false == path->m_events0.empty() ) // tor ma Event0 + && ( std::abs( velocity ) <= 1.f ) // a skład stoi + && ( Scratchpad.trainset.offset >= 0.0 ) // ale może nie sięgać na owy tor + && ( Scratchpad.trainset.offset < 8.0 ) ) { // i raczej nie sięga + // przesuwamy około pół EU07 dla wstecznej zgodności + Scratchpad.trainset.offset = 8.0; + } + + auto *vehicle = new TDynamicObject(); + + auto const length = + vehicle->Init( + Nodedata.name, + datafolder, skinfile, mmdfile, + path, + ( offset == -1.0 ? + Scratchpad.trainset.offset : + Scratchpad.trainset.offset - offset ), + drivertype, + velocity, + Scratchpad.trainset.name, + loadcount, loadtype, + ( offset == -1.0 ), + params ); + + if( length != 0.0 ) { // zero oznacza błąd + // przesunięcie dla kolejnego, minus bo idziemy w stronę punktu 1 + Scratchpad.trainset.offset -= length; + // automatically establish permanent connections for couplers which specify them in their definitions + if( ( coupling != 0 ) + && ( vehicle->MoverParameters->Couplers[ ( offset == -1.0 ? side::front : side::rear ) ].AllowedFlag & coupling::permanent ) ) { + coupling |= coupling::permanent; + } + if( true == Scratchpad.trainset.is_open ) { + Scratchpad.trainset.vehicles.emplace_back( vehicle ); + Scratchpad.trainset.couplings.emplace_back( coupling ); + } + } + else { + if( vehicle->MyTrack != nullptr ) { + // rare failure case where vehicle with length of 0 is added to the track, + // treated as error code and consequently deleted, but still remains on the track + vehicle->MyTrack->RemoveDynamicObject( vehicle ); + } + delete vehicle; + skip_until( Input, "enddynamic" ); + return nullptr; + } + + auto const destination { Input.getToken() }; + if( destination != "enddynamic" ) { + // optional vehicle destination parameter + vehicle->asDestination = Input.getToken(); + skip_until( Input, "enddynamic" ); + } + + return vehicle; +} + +sound_source * +state_serializer::deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ) { + + glm::dvec3 location; + Input.getTokens( 3 ); + Input + >> location.x + >> location.y + >> location.z; + // adjust location + location = transform( location, Scratchpad ); + + auto *sound = new sound_source( sound_placement::external, Nodedata.range_max ); + sound->offset( location ); + sound->name( Nodedata.name ); + sound->deserialize( Input, sound_type::single ); + + skip_until( Input, "endsound" ); + + return sound; +} + +// skips content of stream until specified token +void +state_serializer::skip_until( cParser &Input, std::string const &Token ) { + + std::string token { Input.getToken() }; + while( ( false == token.empty() ) + && ( token != Token ) ) { + + token = Input.getToken(); + } +} + +// transforms provided location by specifed rotation and offset +glm::dvec3 +state_serializer::transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ) { + + if( Scratchpad.location.rotation != glm::vec3( 0, 0, 0 ) ) { + auto const rotation = glm::radians( Scratchpad.location.rotation ); + Location = glm::rotateY( Location, rotation.y ); // Ra 2014-11: uwzględnienie rotacji + } + if( false == Scratchpad.location.offset.empty() ) { + Location += Scratchpad.location.offset.top(); + } + return Location; +} + + +// stores class data in specified file, in legacy (text) format +void +state_serializer::export_as_text( std::string const &Scenariofile ) const { + + if( Scenariofile == "$.scn" ) { + ErrorLog( "Bad file: scenery export not supported for file \"$.scn\"" ); + } + else { + WriteLog( "Scenery data export in progress..." ); + } + + auto filename { Scenariofile }; + while( filename[ 0 ] == '$' ) { + // trim leading $ char rainsted utility may add to the base name for modified .scn files + filename.erase( 0, 1 ); + } + erase_extension( filename ); + filename = Global.asCurrentSceneryPath + filename + "_export"; + + std::ofstream scmfile { filename + ".scm" }; + // tracks + scmfile << "// paths\n"; + for( auto const *path : Paths.sequence() ) { + path->export_as_text( scmfile ); + } + // traction + scmfile << "// traction\n"; + for( auto const *traction : Traction.sequence() ) { + traction->export_as_text( scmfile ); + } + // power grid + scmfile << "// traction power sources\n"; + for( auto const *powersource : Powergrid.sequence() ) { + powersource->export_as_text( scmfile ); + } + // models + scmfile << "// instanced models\n"; + for( auto const *instance : Instances.sequence() ) { + instance->export_as_text( scmfile ); + } + // sounds + scmfile << "// sounds\n"; + Region->export_as_text( scmfile ); + + std::ofstream ctrfile { filename + ".ctr" }; + // mem cells + ctrfile << "// memory cells\n"; + for( auto const *memorycell : Memory.sequence() ) { + if( true == memorycell->is_exportable ) { + memorycell->export_as_text( ctrfile ); + } + } + // events + Events.export_as_text( ctrfile ); + + WriteLog( "Scenery data export done." ); +} + +} // simulation + + //--------------------------------------------------------------------------- diff --git a/simulationstateserializer.h b/simulationstateserializer.h new file mode 100644 index 00000000..306d81b2 --- /dev/null +++ b/simulationstateserializer.h @@ -0,0 +1,64 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "parser.h" +#include "scene.h" + +namespace simulation { + +class state_serializer { + +public: +// methods + // restores simulation data from specified file. returns: true on success, false otherwise + bool + deserialize( std::string const &Scenariofile ); + // stores class data in specified file, in legacy (text) format + void + export_as_text( std::string const &Scenariofile ) const; + +private: +// methods + // restores class data from provided stream + void deserialize( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_description( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_endorigin( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_rotate( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_sky( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_test( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_time( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_trainset( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_endtrainset( cParser &Input, scene::scratch_data &Scratchpad ); + TTrack * deserialize_path( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TTraction * deserialize_traction( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TTractionPowerSource * deserialize_tractionpowersource( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TMemCell * deserialize_memorycell( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TEventLauncher * deserialize_eventlauncher( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TAnimModel * deserialize_model( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + TDynamicObject * deserialize_dynamic( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + sound_source * deserialize_sound( cParser &Input, scene::scratch_data &Scratchpad, scene::node_data const &Nodedata ); + // skips content of stream until specified token + void skip_until( cParser &Input, std::string const &Token ); + // transforms provided location by specifed rotation and offset + glm::dvec3 transform( glm::dvec3 Location, scene::scratch_data const &Scratchpad ); +}; + +} // simulation + +//--------------------------------------------------------------------------- diff --git a/sound.cpp b/sound.cpp index a4f1a6c8..10a95dbb 100644 --- a/sound.cpp +++ b/sound.cpp @@ -12,9 +12,9 @@ http://mozilla.org/MPL/2.0/. #include "sound.h" #include "parser.h" #include "globals.h" -#include "world.h" #include "train.h" #include "dynobj.h" +#include "simulation.h" // constructors sound_source::sound_source( sound_placement const Placement, float const Range ) : @@ -910,15 +910,15 @@ sound_source::update_soundproofing() { int const activecab = ( Global.CabWindowOpen ? 2 : FreeFlyModeFlag ? 0 : - ( Global.pWorld->train() ? - Global.pWorld->train()->Dynamic()->MoverParameters->ActiveCab : + ( simulation::Train ? + simulation::Train->Occupied()->ActiveCab : 0 ) ); // location-based gain factor: std::uintptr_t soundproofingstamp = reinterpret_cast( ( FreeFlyModeFlag ? nullptr : - ( Global.pWorld->train() ? - Global.pWorld->train()->Dynamic() : + ( simulation::Train ? + simulation::Train->Dynamic() : nullptr ) ) ) + activecab; @@ -941,7 +941,7 @@ sound_source::update_soundproofing() { m_properties.soundproofing = ( soundproofingstamp == 0 ? EU07_SOUNDPROOFING_STRONG : // listener outside HACK: won't be true if active vehicle has open window - ( Global.pWorld->train()->Dynamic() != m_owner ? + ( simulation::Train->Dynamic() != m_owner ? EU07_SOUNDPROOFING_STRONG : // in another vehicle ( activecab == 0 ? EU07_SOUNDPROOFING_STRONG : // listener in the engine compartment @@ -952,7 +952,7 @@ sound_source::update_soundproofing() { m_properties.soundproofing = ( ( ( soundproofingstamp == 0 ) || ( true == Global.CabWindowOpen ) ) ? EU07_SOUNDPROOFING_SOME : // listener outside or has a window open - ( Global.pWorld->train()->Dynamic() != m_owner ? + ( simulation::Train->Dynamic() != m_owner ? EU07_SOUNDPROOFING_STRONG : // in another vehicle ( activecab == 0 ? EU07_SOUNDPROOFING_NONE : // listener in the engine compartment diff --git a/uart.cpp b/uart.cpp index eaeada83..c617b1fc 100644 --- a/uart.cpp +++ b/uart.cpp @@ -2,7 +2,7 @@ #include "uart.h" #include "Globals.h" -#include "World.h" +#include "simulation.h" #include "Train.h" #include "parser.h" #include "Logs.h" @@ -130,7 +130,7 @@ void uart_input::poll() return; last_update = now; - auto *t = Global.pWorld->train(); + auto const *t =simulation::Train; if (!t) return; diff --git a/uilayer.cpp b/uilayer.cpp index 867a74ea..cefc1988 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -1,4 +1,11 @@ - +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ #include "stdafx.h" #include "uilayer.h" @@ -7,20 +14,30 @@ #include "translation.h" #include "simulation.h" #include "simulationtime.h" +#include "event.h" +#include "camera.h" #include "mtable.h" #include "train.h" +#include "driver.h" #include "sceneeditor.h" +#include "animmodel.h" +#include "dynobj.h" +#include "model3d.h" #include "renderer.h" #include "utilities.h" #include "logs.h" -ui_layer UILayer; - extern "C" { GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); //m7todo: potrzebne do directsound } +GLFWwindow * ui_layer::m_window { nullptr }; +GLint ui_layer::m_textureunit { GL_TEXTURE0 }; +GLuint ui_layer::m_fontbase { (GLuint)-1 }; // numer DL dla znaków w napisach +bool ui_layer::m_cursorvisible { true }; + + ui_layer::~ui_layer() { /* // this should be invoked manually, or we risk trying to delete the lists after the context is gone @@ -32,21 +49,6 @@ ui_layer::~ui_layer() { bool ui_layer::init( GLFWwindow *Window ) { - clear_texts(); - - UIHeader = std::make_shared( 20, 20 ); // header ui panel - UITable = std::make_shared( 20, 100 ); // schedule or scan table - UITranscripts = std::make_shared( 85, 600 ); // voice transcripts - // make 4 empty lines for the ui header, to cut down on work down the road - UIHeader->text_lines.emplace_back( "", Global.UITextColor ); - UIHeader->text_lines.emplace_back( "", Global.UITextColor ); - UIHeader->text_lines.emplace_back( "", Global.UITextColor ); - UIHeader->text_lines.emplace_back( "", Global.UITextColor ); - // bind the panels with ui object. maybe not the best place for this but, eh - push_back( UIHeader ); - push_back( UITable ); - push_back( UITranscripts ); - m_window = Window; HFONT font; // Windows Font ID m_fontbase = ::glGenLists(96); // storage for 96 characters @@ -82,1007 +84,12 @@ ui_layer::init( GLFWwindow *Window ) { } } -// potentially processes provided input key. returns: true if key was processed, false otherwise bool ui_layer::on_key( int const Key, int const Action ) { - // TODO: pass the input first through an active ui element if there's any - // if the ui element shows no interest or we don't have one, try to interpret the input yourself: - // shared conditions - switch( Key ) { - - case GLFW_KEY_F1: - case GLFW_KEY_F2: - case GLFW_KEY_F3: - case GLFW_KEY_F8: - case GLFW_KEY_F9: - case GLFW_KEY_F10: - case GLFW_KEY_F11: - case GLFW_KEY_F12: { // ui mode selectors - - if( ( true == Global.ctrlState ) - || ( true == Global.shiftState ) ) { - // only react to keys without modifiers - return false; - } - - if( Action == GLFW_RELEASE ) { return true; } // recognized, but ignored - - EditorModeFlag = ( Key == GLFW_KEY_F11 ); - if( ( true == EditorModeFlag ) - && ( false == Global.ControlPicking ) ) { - set_cursor( GLFW_CURSOR_NORMAL ); - Global.ControlPicking = true; - } - } - - default: { // everything else - break; - } - } - - switch (Key) { - - case GLFW_KEY_F1: { - // basic consist info - if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } - if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { - // wyłączenie napisów - Global.iTextMode = 0; - Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; - } - else { - Global.iTextMode = Key; - } - return true; - } - - case GLFW_KEY_F2: { - // parametry pojazdu - if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } - if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { - // wyłączenie napisów - Global.iTextMode = 0; - Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; - } - else { - Global.iTextMode = Key; - } - return true; - } - - case GLFW_KEY_F3: { - // timetable - if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } - if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { - // wyłączenie napisów - Global.iTextMode = 0; - Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; - } - else { - Global.iTextMode = Key; - } - return true; - } - - case GLFW_KEY_F8: { - // renderer debug data - Global.iTextMode = Key; - return true; - } - - case GLFW_KEY_F9: { - // wersja - Global.iTextMode = Key; - return true; - } - - case GLFW_KEY_F10: { - // quit - if( Global.iTextMode == Key ) { - Global.iTextMode = - ( Global.iPause && ( Key != GLFW_KEY_F1 ) ? - GLFW_KEY_F1 : - 0 ); // wyłączenie napisów, chyba że pauza - } - else { - Global.iTextMode = Key; - } - return true; - } - - case GLFW_KEY_F11: { - // scenario inspector - Global.iTextMode = Key; - return true; - } - - case GLFW_KEY_F12: { - // coś tam jeszcze - Global.iTextMode = Key; - return true; - } - - case GLFW_KEY_Y: { - // potentially quit - if( Global.iTextMode != GLFW_KEY_F10 ) { return false; } // not in quit mode - - if( Action == GLFW_RELEASE ) { return true; } // recognized, but ignored - - glfwSetWindowShouldClose( m_window, 1 ); - return true; - } - - default: { - break; - } - } return false; } -// updates state of UI elements -void -ui_layer::update() { - - UITable->text_lines.clear(); - std::string uitextline1, uitextline2, uitextline3, uitextline4; - UILayer.set_tooltip( "" ); - - auto const *train { ( Global.pWorld ? Global.pWorld->train() : nullptr ) }; - auto const *controlled { ( Global.pWorld ? Global.pWorld->controlled() : nullptr ) }; - auto const *camera { Global.pCamera }; - - if( ( train != nullptr ) && ( false == FreeFlyModeFlag ) ) { - if( false == DebugModeFlag ) { - // in regular mode show control functions, for defined controls - UILayer.set_tooltip( locale::label_cab_control( train->GetLabel( GfxRenderer.Pick_Control() ) ) ); - } - else { - // in debug mode show names of submodels, to help with cab setup and/or debugging - auto const cabcontrol = GfxRenderer.Pick_Control(); - UILayer.set_tooltip( ( cabcontrol ? cabcontrol->pName : "" ) ); - } - } - if( ( true == Global.ControlPicking ) && ( true == FreeFlyModeFlag ) && ( true == DebugModeFlag ) ) { - auto const scenerynode = GfxRenderer.Pick_Node(); - UILayer.set_tooltip( - ( scenerynode ? - scenerynode->name() : - "" ) ); - } - - switch( Global.iTextMode ) { - - case( GLFW_KEY_F1 ) : { - // f1, default mode: current time and timetable excerpt - auto const &time = simulation::Time.data(); - uitextline1 = - "Time: " - + to_string( time.wHour ) + ":" - + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" - + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); - if( Global.iPause ) { - uitextline1 += " (paused)"; - } - - if( ( controlled != nullptr ) - && ( controlled->Mechanik != nullptr ) ) { - - auto const &mover = controlled->MoverParameters; - auto const &driver = controlled->Mechanik; - - uitextline2 = "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ); - if( mover->ActiveDir > 0 ) { uitextline2 += " D"; } - else if( mover->ActiveDir < 0 ) { uitextline2 += " R"; } - else { uitextline2 += " N"; } - - uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + to_string( mover->LocalBrakePosA * LocalBrakePosNo, 0 ) + ( mover->SlippingWheels ? " !" : " " ); - - uitextline4 = ( - true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? - "!ALERTER! " : - " " ); - uitextline4 += ( - true == TestFlag( mover->SecuritySystem.Status, s_active ) ? - "!SHP! " : - " " ); - - if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { - // detail mode on second key press - auto const speedlimit { static_cast( std::floor( driver->VelDesired ) ) }; - uitextline2 += - " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" - + " (limit: " + std::to_string( speedlimit ) + " km/h"; - auto const nextspeedlimit { static_cast( std::floor( driver->VelNext ) ) }; - if( nextspeedlimit != speedlimit ) { - uitextline2 += - ", new limit: " + std::to_string( nextspeedlimit ) + " km/h" - + " in " + to_string( driver->ActualProximityDist * 0.001, 1 ) + " km"; - } - uitextline2 += ")"; - auto const reverser { ( mover->ActiveDir > 0 ? 1 : -1 ) }; - auto const grade { controlled->VectorFront().y * 100 * ( controlled->DirectionGet() == reverser ? 1 : -1 ) * reverser }; - if( std::abs( grade ) >= 0.25 ) { - uitextline2 += " Grade: " + to_string( grade, 1 ) + "%"; - } - uitextline3 += - " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" - + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; - - auto const stoptime { static_cast( -1.0 * controlled->Mechanik->fStopTime ) }; - if( stoptime > 0 ) { - uitextline4 += " Loading/unloading in progress (" + to_string( stoptime ) + ( stoptime > 1 ? " seconds" : " second" ) + " left)"; - } - else { - auto const trackblockdistance{ std::abs( controlled->Mechanik->TrackBlock() ) }; - if( trackblockdistance <= 75.0 ) { - uitextline4 += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; - } - } - } - } - - break; - } - - case( GLFW_KEY_F2 ) : { - // timetable - auto *vehicle { - ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : - controlled ) }; // w trybie latania lokalizujemy wg mapy - - if( vehicle == nullptr ) { break; } - // if the nearest located vehicle doesn't have a direct driver, try to query its owner - auto const owner = ( - ( ( vehicle->Mechanik != nullptr ) && ( vehicle->Mechanik->Primary() ) ) ? - vehicle->Mechanik : - vehicle->ctOwner ); - if( owner == nullptr ){ break; } - - auto const *table = owner->TrainTimetable(); - if( table == nullptr ) { break; } - - auto const &time = simulation::Time.data(); - uitextline1 = - "Time: " - + to_string( time.wHour ) + ":" - + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" - + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); - if( Global.iPause ) { - uitextline1 += " (paused)"; - } - - uitextline2 = Bezogonkow( owner->Relation(), true ) + " (" + Bezogonkow( owner->TrainName(), true ) + ")"; - auto const nextstation = Bezogonkow( owner->NextStop(), true ); - if( !nextstation.empty() ) { - // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania - uitextline3 = " -> " + nextstation; - } - - if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { - - if( 0 == table->StationCount ) { - // only bother if there's stations to list - UITable->text_lines.emplace_back( "(no timetable)", Global.UITextColor ); - } - else { - // header - UITable->text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); - - TMTableLine const *tableline; - for( int i = owner->iStationStart; i <= std::min( owner->iStationStart + 10, table->StationCount ); ++i ) { - // wyświetlenie pozycji z rozkładu - tableline = table->TimeTable + i; // linijka rozkładu - - std::string vmax = - " " - + to_string( tableline->vmax, 0 ); - vmax = vmax.substr( vmax.size() - 3, 3 ); // z wyrównaniem do prawej - std::string const station = ( - Bezogonkow( tableline->StationName, true ) - + " " ) - .substr( 0, 34 ); - std::string const location = ( - ( tableline->km > 0.0 ? - to_string( tableline->km, 2 ) : - "" ) - + " " ) - .substr( 0, 34 - tableline->StationWare.size() ); - std::string const arrival = ( - tableline->Ah >= 0 ? - to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : - " | " ); - std::string const departure = ( - tableline->Dh >= 0 ? - to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : - " | " ); - auto const candeparture = ( - ( owner->iStationStart < table->StationIndex ) - && ( i < table->StationIndex ) - && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ); - auto traveltime = - " " - + ( i < 2 ? "" : - tableline->Ah >= 0 ? to_string( CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Ah, tableline->Am ), 0 ) : - to_string( std::max( 0.0, CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Dh, tableline->Dm ) - 0.5 ), 0 ) ); - traveltime = traveltime.substr( traveltime.size() - 3, 3 ); // z wyrównaniem do prawej - - UITable->text_lines.emplace_back( - ( "| " + vmax + " | " + station + " | " + arrival + " | " + traveltime + " |" ), - ( candeparture ? - glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono - Global.UITextColor ) ); - UITable->text_lines.emplace_back( - ( "| | " + location + tableline->StationWare + " | " + departure + " | |" ), - ( candeparture ? - glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono - Global.UITextColor ) ); - // divider/footer - UITable->text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); - } - if( owner->iStationStart + 10 < table->StationCount ) { - // if we can't display entire timetable, add a scrolling indicator at the bottom - UITable->text_lines.emplace_back( " ... ", Global.UITextColor ); - } - } - } - - break; - } - - case( GLFW_KEY_F3 ) : { - - auto *vehicle{ - ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : - controlled ) }; // w trybie latania lokalizujemy wg mapy - - if( vehicle != nullptr ) { - // jeśli domyślny ekran po pierwszym naciśnięciu - uitextline1 = "Vehicle name: " + vehicle->MoverParameters->Name; - - if( ( vehicle->Mechanik == nullptr ) && ( vehicle->ctOwner ) ) { - // for cars other than leading unit indicate the leader - uitextline1 += ", owned by " + vehicle->ctOwner->OwnerName(); - } - uitextline1 += "; Status: " + vehicle->MoverParameters->EngineDescription( 0 ); - // informacja o sprzęgach - uitextline1 += - "; C0:" + - ( vehicle->PrevConnected ? - vehicle->PrevConnected->name() + ":" + to_string( vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag ) + ( - vehicle->MoverParameters->Couplers[ 0 ].CouplingFlag == 0 ? - " (" + to_string( vehicle->MoverParameters->Couplers[ 0 ].CoupleDist, 1 ) + " m)" : - "" ) : - "none" ); - uitextline1 += - " C1:" + - ( vehicle->NextConnected ? - vehicle->NextConnected->name() + ":" + to_string( vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag ) + ( - vehicle->MoverParameters->Couplers[ 1 ].CouplingFlag == 0 ? - " (" + to_string( vehicle->MoverParameters->Couplers[ 1 ].CoupleDist, 1 ) + " m)" : - "" ) : - "none" ); - - // equipment flags - uitextline2 = ( vehicle->MoverParameters->Battery ? "B" : "." ); - uitextline2 += ( vehicle->MoverParameters->Mains ? "M" : "." ); - uitextline2 += ( vehicle->MoverParameters->PantRearUp ? ( vehicle->MoverParameters->PantRearVolt > 0.0 ? "O" : "o" ) : "." ); - uitextline2 += ( vehicle->MoverParameters->PantFrontUp ? ( vehicle->MoverParameters->PantFrontVolt > 0.0 ? "P" : "p" ) : "." ); - uitextline2 += ( vehicle->MoverParameters->PantPressLockActive ? "!" : ( vehicle->MoverParameters->PantPressSwitchActive ? "*" : "." ) ); - uitextline2 += ( vehicle->MoverParameters->WaterPump.is_active ? "W" : ( false == vehicle->MoverParameters->WaterPump.breaker ? "-" : ( vehicle->MoverParameters->WaterPump.is_enabled ? "w" : "." ) ) ); - uitextline2 += ( true == vehicle->MoverParameters->WaterHeater.is_damaged ? "!" : ( vehicle->MoverParameters->WaterHeater.is_active ? "H" : ( false == vehicle->MoverParameters->WaterHeater.breaker ? "-" : ( vehicle->MoverParameters->WaterHeater.is_enabled ? "h" : "." ) ) ) ); - uitextline2 += ( vehicle->MoverParameters->FuelPump.is_active ? "F" : ( vehicle->MoverParameters->FuelPump.is_enabled ? "f" : "." ) ); - uitextline2 += ( vehicle->MoverParameters->OilPump.is_active ? "O" : ( vehicle->MoverParameters->OilPump.is_enabled ? "o" : "." ) ); - uitextline2 += ( false == vehicle->MoverParameters->ConverterAllowLocal ? "-" : ( vehicle->MoverParameters->ConverterAllow ? ( vehicle->MoverParameters->ConverterFlag ? "X" : "x" ) : "." ) ); - uitextline2 += ( vehicle->MoverParameters->ConvOvldFlag ? "!" : "." ); - uitextline2 += ( vehicle->MoverParameters->CompressorFlag ? "C" : ( false == vehicle->MoverParameters->CompressorAllowLocal ? "-" : ( ( vehicle->MoverParameters->CompressorAllow || vehicle->MoverParameters->CompressorStart == start_t::automatic ) ? "c" : "." ) ) ); - uitextline2 += ( vehicle->MoverParameters->CompressorGovernorLock ? "!" : "." ); - - auto const train { Global.pWorld->train() }; - if( ( train != nullptr ) && ( train->Dynamic() == vehicle ) ) { - uitextline2 += ( vehicle->MoverParameters->Radio ? " R: " : " r: " ) + std::to_string( train->RadioChannel() ); - } -/* - uitextline2 += - " AnlgB: " + to_string( tmp->MoverParameters->AnPos, 1 ) - + "+" - + to_string( tmp->MoverParameters->LocalBrakePosA, 1 ) -*/ - uitextline2 += " Bdelay: "; - if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_G ) == bdelay_G ) - uitextline2 += "G"; - if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_P ) == bdelay_P ) - uitextline2 += "P"; - if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_R ) == bdelay_R ) - uitextline2 += "R"; - if( ( vehicle->MoverParameters->BrakeDelayFlag & bdelay_M ) == bdelay_M ) - uitextline2 += "+Mg"; - - uitextline2 += ", Load: " + to_string( vehicle->MoverParameters->Load, 0 ) + " (" + to_string( vehicle->MoverParameters->LoadFlag, 0 ) + ")"; - - uitextline2 += - "; Pant: " - + to_string( vehicle->MoverParameters->PantPress, 2 ) - + ( vehicle->MoverParameters->bPantKurek3 ? "-ZG" : "|ZG" ); - - uitextline2 += - "; Ft: " + to_string( - vehicle->MoverParameters->Ft * 0.001f * ( - vehicle->MoverParameters->ActiveCab ? vehicle->MoverParameters->ActiveCab : - vehicle->ctOwner ? vehicle->ctOwner->Controlling()->ActiveCab : - 1 ), 1 ) - + ", Fb: " + to_string( vehicle->MoverParameters->Fb * 0.001f, 1 ) - + ", Fr: " + to_string( vehicle->MoverParameters->Adhesive( vehicle->MoverParameters->RunningTrack.friction ), 2 ) - + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : "" ); - - if( vehicle->Mechanik ) { - uitextline2 += "; Ag: " + to_string( vehicle->Mechanik->fAccGravity, 2 ) + " (" + ( vehicle->Mechanik->fAccGravity > 0.01 ? "\\" : ( vehicle->Mechanik->fAccGravity < -0.01 ? "/" : "-" ) ) + ")"; - } - - uitextline2 += - "; TC:" - + to_string( vehicle->MoverParameters->TotalCurrent, 0 ); - auto const frontcouplerhighvoltage = - to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.voltage, 0 ) - + "@" - + to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.current, 0 ); - auto const rearcouplerhighvoltage = - to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.voltage, 0 ) - + "@" - + to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.current, 0 ); - uitextline2 += ", HV: "; - if( vehicle->MoverParameters->Couplers[ side::front ].power_high.local == false ) { - uitextline2 += - "(" + frontcouplerhighvoltage + ")-" - + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" - + "-(" + rearcouplerhighvoltage + ")"; - } - else { - uitextline2 += - frontcouplerhighvoltage - + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" - + rearcouplerhighvoltage; - } - - uitextline3 += - "TrB: " + to_string( vehicle->MoverParameters->BrakePress, 2 ) - + ", " + to_hex_str( vehicle->MoverParameters->Hamulec->GetBrakeStatus(), 2 ); - - uitextline3 += - "; LcB: " + to_string( vehicle->MoverParameters->LocBrakePress, 2 ) - + "; hat: " + to_string( vehicle->MoverParameters->BrakeCtrlPos2, 2 ) - + "; pipes: " + to_string( vehicle->MoverParameters->PipePress, 2 ) - + "/" + to_string( vehicle->MoverParameters->ScndPipePress, 2 ) - + "/" + to_string( vehicle->MoverParameters->EqvtPipePress, 2 ) - + ", MT: " + to_string( vehicle->MoverParameters->CompressedVolume, 3 ) - + ", BT: " + to_string( vehicle->MoverParameters->Volume, 3 ) - + ", CtlP: " + to_string( vehicle->MoverParameters->CntrlPipePress, 3 ) - + ", CtlT: " + to_string( vehicle->MoverParameters->Hamulec->GetCRP(), 3 ); - - if( vehicle->MoverParameters->ManualBrakePos > 0 ) { - - uitextline3 += "; manual brake on"; - } -/* - if( tmp->MoverParameters->LocalBrakePos > 0 ) { - - uitextline3 += ", local brake on"; - } - else { - - uitextline3 += ", local brake off"; - } -*/ - if( vehicle->Mechanik ) { - // o ile jest ktoś w środku - std::string flags = "cpapcplhhndoiefgvdpseil "; // flagi AI (definicja w Driver.h) - for( int i = 0, j = 1; i < 23; ++i, j <<= 1 ) - if( false == ( vehicle->Mechanik->DrivigFlags() & j ) ) // jak bit ustawiony - flags[ i ] = '.';// std::toupper( flags[ i ] ); // ^= 0x20; // to zmiana na wielką literę - - uitextline4 = flags; - - uitextline4 += - "Driver: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) - + " Ad=" + to_string( vehicle->Mechanik->AccDesired, 2 ) - + " Ah=" + to_string( vehicle->Mechanik->fAccThreshold, 2 ) - + "@" + to_string( vehicle->Mechanik->fBrake_a0[ 0 ], 2 ) - + "+" + to_string( vehicle->Mechanik->fBrake_a1[ 0 ], 2 ) - + " Bd=" + to_string( vehicle->Mechanik->fBrakeDist, 0 ) - + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ) - + " VSl=" + to_string( vehicle->Mechanik->VelSignalLast, 0 ) - + " VLl=" + to_string( vehicle->Mechanik->VelLimitLast, 0 ) - + " VRd=" + to_string( vehicle->Mechanik->VelRoad, 0 ) - + " VRst=" + to_string( vehicle->Mechanik->VelRestricted, 0 ); - - if( ( vehicle->Mechanik->VelNext == 0.0 ) - && ( vehicle->Mechanik->eSignNext ) ) { - // jeśli ma zapamiętany event semafora, nazwa eventu semafora - uitextline4 += " (" + Bezogonkow( vehicle->Mechanik->eSignNext->asName ) + ")"; - } - - // biezaca komenda dla AI - uitextline4 += ", command: " + vehicle->Mechanik->OrderCurrent(); - } - - if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { - // f2 screen, track scan mode - if( vehicle->Mechanik == nullptr ) { - //żeby była tabelka, musi być AI - break; - } - - std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( vehicle->Mechanik->TableSize() ) - 1, 0, 30 ); - do { - std::string scanline = vehicle->Mechanik->TableText( i ); - if( scanline.empty() ) { break; } - UITable->text_lines.emplace_back( Bezogonkow( scanline ), Global.UITextColor ); - ++i; - } while( i < speedtablesize ); // TController:iSpeedTableSize TODO: change when the table gets recoded - } - } - else { - // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika - uitextline1 = - "Camera position: " - + to_string( camera->Pos.x, 2 ) + " " - + to_string( camera->Pos.y, 2 ) + " " - + to_string( camera->Pos.z, 2 ) - + ", azimuth: " - + to_string( 180.0 - glm::degrees( camera->Yaw ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód - + " " - + std::string( "S SEE NEN NWW SW" ) - .substr( 0 + 2 * floor( fmod( 8 + ( camera->Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); - // current luminance level - uitextline2 = "Light level: " + to_string( Global.fLuminance, 3 ); - if( Global.FakeLight ) { uitextline2 += "(*)"; } - } - - break; - } - - case( GLFW_KEY_F8 ) : { - // gfx renderer data - uitextline1 = - "FoV: " + to_string( Global.FieldOfView / Global.ZoomFactor, 1 ) - + ", Draw range x " + to_string( Global.fDistanceFactor, 1 ) -// + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) -// + ", FPS: " + to_string( Timer::GetFPS(), 2 ); - + ", FPS: " + std::to_string( static_cast(std::round(GfxRenderer.Framerate())) ); - if( Global.iSlowMotion ) { - uitextline1 += " (slowmotion " + to_string( Global.iSlowMotion ) + ")"; - } - - uitextline2 = - std::string( "Rendering mode: " ) - + ( Global.bUseVBO ? - "VBO" : - "Display Lists" ) - + " "; - if( false == Global.LastGLError.empty() ) { - uitextline2 += - "Last openGL error: " - + Global.LastGLError; - } - // renderer stats - uitextline3 = GfxRenderer.info_times(); - uitextline4 = GfxRenderer.info_stats(); - - break; - } - - case( GLFW_KEY_F9 ) : { - // informacja o wersji - uitextline1 = "MaSzyna " + Global.asVersion; // informacja o wersji - if( Global.iMultiplayer ) { - uitextline1 += " (multiplayer mode is active)"; - } - uitextline3 = - "vehicles: " + to_string( Timer::subsystem.sim_dynamics.average(), 2 ) + " msec" - + " update total: " + to_string( Timer::subsystem.sim_total.average(), 2 ) + " msec"; - // current event queue - auto const time { Timer::GetTime() }; - auto const *event { simulation::Events.begin() }; - auto eventtableindex{ 0 }; - while( ( event != nullptr ) - && ( eventtableindex < 30 ) ) { - - if( ( false == event->m_ignored ) - && ( true == event->bEnabled ) ) { - - auto const delay { " " + to_string( std::max( 0.0, event->fStartTime - time ), 1 ) }; - auto const eventline = - "Delay: " + delay.substr( delay.length() - 6 ) - + ", Event: " + event->asName - + ( event->Activator ? " (by: " + event->Activator->asName + ")" : "" ) - + ( event->evJoined ? " (joint event)" : "" ); - - UITable->text_lines.emplace_back( eventline, Global.UITextColor ); - ++eventtableindex; - } - event = event->evNext; - } - - break; - } - - case( GLFW_KEY_F10 ) : { - - uitextline1 = "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]."; - - break; - } - - case( GLFW_KEY_F11 ): { - // scenario inspector - auto const *node { scene::Editor.node() }; - - if( node == nullptr ) { - auto const mouseposition { Global.pCamera->Pos + GfxRenderer.Mouse_Position() }; - uitextline1 = "mouse location: [" + to_string( mouseposition.x, 2 ) + ", " + to_string( mouseposition.y, 2 ) + ", " + to_string( mouseposition.z, 2 ) + "]"; - break; - } - - uitextline1 = - "node name: " + node->name() - + "; location: [" + to_string( node->location().x, 2 ) + ", " + to_string( node->location().y, 2 ) + ", " + to_string( node->location().z, 2 ) + "]" - + " (distance: " + to_string( glm::length( glm::dvec3{ node->location().x, 0.0, node->location().z } -glm::dvec3{ Global.pCameraPosition.x, 0.0, Global.pCameraPosition.z } ), 1 ) + " m)"; - // subclass-specific data - // TBD, TODO: specialized data dump method in each node subclass, or data imports in the panel for provided subclass pointer? - if( typeid( *node ) == typeid( TAnimModel ) ) { - - auto const *subnode = static_cast( node ); - - uitextline2 = "angle: " + to_string( clamp_circular( subnode->vAngle.y, 360.f ), 2 ) + " deg"; - uitextline2 += "; lights: "; - if( subnode->iNumLights > 0 ) { - uitextline2 += '['; - for( int lightidx = 0; lightidx < subnode->iNumLights; ++lightidx ) { - uitextline2 += to_string( subnode->lsLights[ lightidx ] ); - if( lightidx < subnode->iNumLights - 1 ) { - uitextline2 += ", "; - } - } - uitextline2 += ']'; - } - else { - uitextline2 += "none"; - } - // 3d shape - auto modelfile { ( - subnode->pModel ? - subnode->pModel->NameGet() : - "none" ) }; - if( modelfile.find( szModelPath ) == 0 ) { - // don't include 'models/' in the path - modelfile.erase( 0, std::string{ szModelPath }.size() ); - } - // texture - auto texturefile { ( - subnode->Material()->replacable_skins[ 1 ] != null_handle ? - GfxRenderer.Material( subnode->Material()->replacable_skins[ 1 ] ).name : - "none" ) }; - if( texturefile.find( szTexturePath ) == 0 ) { - // don't include 'textures/' in the path - texturefile.erase( 0, std::string{ szTexturePath }.size() ); - } - uitextline3 = "mesh: " + modelfile; - uitextline4 = "skin: " + texturefile; - } - else if( typeid( *node ) == typeid( TTrack ) ) { - - auto const *subnode = static_cast( node ); - // basic attributes - uitextline2 = - "isolated: " + ( subnode->pIsolated ? subnode->pIsolated->asName : "none" ) - + "; velocity: " + to_string( subnode->SwitchExtension ? subnode->SwitchExtension->fVelocity : subnode->fVelocity ) - + "; width: " + to_string( subnode->fTrackWidth ) + " m" - + "; friction: " + to_string( subnode->fFriction, 2 ) - + "; quality: " + to_string( subnode->iQualityFlag ); - // textures - auto texturefile { ( - subnode->m_material1 != null_handle ? - GfxRenderer.Material( subnode->m_material1 ).name : - "none" ) }; - if( texturefile.find( szTexturePath ) == 0 ) { - texturefile.erase( 0, std::string{ szTexturePath }.size() ); - } - auto texturefile2{ ( - subnode->m_material2 != null_handle ? - GfxRenderer.Material( subnode->m_material2 ).name : - "none" ) }; - if( texturefile2.find( szTexturePath ) == 0 ) { - texturefile2.erase( 0, std::string{ szTexturePath }.size() ); - } - uitextline2 += "; skins: [" + texturefile + ", " + texturefile2 + "]"; - // paths - uitextline3 = "paths: "; - for( auto const &path : subnode->m_paths ) { - uitextline3 += - "[" - + to_string( path.points[ segment_data::point::start ].x, 3 ) + ", " - + to_string( path.points[ segment_data::point::start ].y, 3 ) + ", " - + to_string( path.points[ segment_data::point::start ].z, 3 ) + "]->" - + "[" - + to_string( path.points[ segment_data::point::end ].x, 3 ) + ", " - + to_string( path.points[ segment_data::point::end ].y, 3 ) + ", " - + to_string( path.points[ segment_data::point::end ].z, 3 ) + "] "; - } - // events - std::vector< std::pair< std::string, TTrack::event_sequence const * > > const eventsequences { - { "ev0", &subnode->m_events0 }, { "ev0all", &subnode->m_events0all }, - { "ev1", &subnode->m_events1 }, { "ev1all", &subnode->m_events1all }, - { "ev2", &subnode->m_events2 }, { "ev2all", &subnode->m_events2all } }; - - for( auto const &eventsequence : eventsequences ) { - if( eventsequence.second->empty() ) { continue; } - uitextline4 += eventsequence.first + ": ["; - for( auto const &event : *( eventsequence.second ) ) { - if( uitextline4.back() != '[' ) { - uitextline4 += ", "; - } - if( event.second ) { - uitextline4 += event.second->asName; - } - } - uitextline4 += "] "; - } - - } - else if( typeid( *node ) == typeid( TMemCell ) ) { - - auto const *subnode = static_cast( node ); - - uitextline2 = - "data: [" + subnode->Text() + "]" - + " [" + to_string( subnode->Value1(), 2 ) + "]" - + " [" + to_string( subnode->Value2(), 2 ) + "]"; - uitextline3 = "track: " + ( subnode->asTrackName.empty() ? "none" : subnode->asTrackName ); - } - - break; - } - - case( GLFW_KEY_F12 ) : { - // opcje włączenia i wyłączenia logowania - uitextline1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); - uitextline2 = "[1] log.txt " + std::string( ( Global.iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); - uitextline3 = "[2] Console " + std::string( ( Global.iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); - - break; - } - - default: { - // uncovered cases, nothing to do here... - // ... unless we're in debug mode - if( DebugModeFlag ) { - - auto *vehicle { - ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : - controlled ) }; // w trybie latania lokalizujemy wg mapy - if( vehicle == nullptr ) { - break; - } - uitextline1 = - "vel: " + to_string( vehicle->GetVelocity(), 2 ) + "/" + to_string( vehicle->MoverParameters->nrot* M_PI * vehicle->MoverParameters->WheelDiameter * 3.6, 2 ) - + " km/h;" + ( vehicle->MoverParameters->SlippingWheels ? " (!)" : " " ) - + " dist: " + to_string( vehicle->MoverParameters->DistCounter, 2 ) + " km" - + "; pos: [" + to_string( vehicle->GetPosition().x, 2 ) + ", " + to_string( vehicle->GetPosition().y, 2 ) + ", " + to_string( vehicle->GetPosition().z, 2 ) + "]" - + ", PM=" + to_string( vehicle->MoverParameters->WheelFlat, 1 ) - + " mm; enpwr=" + to_string( vehicle->MoverParameters->EnginePower, 1 ) - + "; enrot=" + to_string( vehicle->MoverParameters->enrot * 60, 0 ) - + " tmrot=" + to_string( std::abs( vehicle->MoverParameters->nrot ) * vehicle->MoverParameters->Transmision.Ratio * 60, 0 ) - + "; ventrot=" + to_string( vehicle->MoverParameters->RventRot * 60, 1 ) - + "; fanrot=" + to_string( vehicle->MoverParameters->dizel_heat.rpmw, 1 ) + ", " + to_string( vehicle->MoverParameters->dizel_heat.rpmw2, 1 ); - - uitextline2 = - "HamZ=" + to_string( vehicle->MoverParameters->fBrakeCtrlPos, 2 ) - + "; HamP=" + to_string( vehicle->MoverParameters->LocalBrakePosA, 2 ) - + "; NasJ=" + std::to_string( vehicle->MoverParameters->MainCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->MainCtrlActualPos ) + ")" - + ( ( vehicle->MoverParameters->ShuntMode && vehicle->MoverParameters->EngineType == TEngineType::DieselElectric ) ? - "; NasB=" + to_string( vehicle->MoverParameters->AnPos, 2 ) : - "; NasB=" + std::to_string( vehicle->MoverParameters->ScndCtrlPos ) + "(" + std::to_string( vehicle->MoverParameters->ScndCtrlActualPos ) + ")" ) - + "; I=" + - ( vehicle->MoverParameters->TrainType == dt_EZT ? - std::to_string( int( vehicle->MoverParameters->ShowCurrent( 0 ) ) ) : - std::to_string( int( vehicle->MoverParameters->Im ) ) ) - + "; U=" + to_string( int( vehicle->MoverParameters->RunningTraction.TractionVoltage + 0.5 ) ) - + "; R=" + - ( std::abs( vehicle->MoverParameters->RunningShape.R ) > 10000.0 ? - "~0.0" : - to_string( vehicle->MoverParameters->RunningShape.R, 1 ) ) - + " An=" + to_string( vehicle->MoverParameters->AccN, 2 ); // przyspieszenie poprzeczne - - if( tprev != simulation::Time.data().wSecond ) { - tprev = simulation::Time.data().wSecond; - Acc = ( vehicle->MoverParameters->Vel - VelPrev ) / 3.6; - VelPrev = vehicle->MoverParameters->Vel; - } - uitextline2 += "; As=" + to_string( Acc, 2 ); // przyspieszenie wzdłużne -/* - uitextline2 += " eAngle=" + to_string( std::cos( vehicle->MoverParameters->eAngle ), 2 ); -*/ - uitextline2 += "; oilP=" + to_string( vehicle->MoverParameters->OilPump.pressure_present, 3 ); - uitextline2 += " oilT=" + to_string( vehicle->MoverParameters->dizel_heat.To, 2 ); - uitextline2 += "; waterT=" + to_string( vehicle->MoverParameters->dizel_heat.temperatura1, 2 ); - uitextline2 += ( vehicle->MoverParameters->WaterCircuitsLink ? "-" : "|" ); - uitextline2 += to_string( vehicle->MoverParameters->dizel_heat.temperatura2, 2 ); - uitextline2 += "; engineT=" + to_string( vehicle->MoverParameters->dizel_heat.Ts, 2 ); - - uitextline3 = - "cyl.ham. " + to_string( vehicle->MoverParameters->BrakePress, 2 ) - + "; prz.gl. " + to_string( vehicle->MoverParameters->PipePress, 2 ) - + "; zb.gl. " + to_string( vehicle->MoverParameters->CompressedVolume, 2 ) - // youBy - drugi wezyk - + "; p.zas. " + to_string( vehicle->MoverParameters->ScndPipePress, 2 ); - - // McZapkie: warto wiedziec w jakim stanie sa przelaczniki - if( vehicle->MoverParameters->ConvOvldFlag ) - uitextline3 += " C! "; - else if( vehicle->MoverParameters->FuseFlag ) - uitextline3 += " F! "; - else if( !vehicle->MoverParameters->Mains ) - uitextline3 += " () "; - else { - switch( - vehicle->MoverParameters->ActiveDir * - ( vehicle->MoverParameters->Imin == vehicle->MoverParameters->IminLo ? - 1 : - 2 ) ) { - case 2: { uitextline3 += " >> "; break; } - case 1: { uitextline3 += " -> "; break; } - case 0: { uitextline3 += " -- "; break; } - case -1: { uitextline3 += " <- "; break; } - case -2: { uitextline3 += " << "; break; } - } - } - // McZapkie: predkosc szlakowa - if( vehicle->MoverParameters->RunningTrack.Velmax == -1 ) { - uitextline3 += " Vtrack=Vmax"; - } - else { - uitextline3 += " Vtrack " + to_string( vehicle->MoverParameters->RunningTrack.Velmax, 2 ); - } - - if( ( vehicle->MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) - || ( vehicle->MoverParameters->TrainType == dt_EZT ) ) { - uitextline3 += - "; pant. " + to_string( vehicle->MoverParameters->PantPress, 2 ) - + ( vehicle->MoverParameters->bPantKurek3 ? "=" : "^" ) + "ZG"; - } - - // McZapkie: komenda i jej parametry - if( vehicle->MoverParameters->CommandIn.Command != ( "" ) ) { - uitextline4 = - "C:" + vehicle->MoverParameters->CommandIn.Command - + " V1=" + to_string( vehicle->MoverParameters->CommandIn.Value1, 0 ) - + " V2=" + to_string( vehicle->MoverParameters->CommandIn.Value2, 0 ); - } - if( ( vehicle->Mechanik ) - && ( vehicle->Mechanik->AIControllFlag == AIdriver ) ) { - uitextline4 += - "AI: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) - + " ad=" + to_string(vehicle->Mechanik->AccDesired, 2) - + "/" + to_string(vehicle->Mechanik->AccDesired*vehicle->Mechanik->BrakeAccFactor(), 2) - + " atrain=" + to_string(vehicle->Mechanik->fBrake_a0[0], 2) - + "+" + to_string(vehicle->Mechanik->fBrake_a1[0], 2) - + " aS=" + to_string(vehicle->Mechanik->AbsAccS_pub, 2) - + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ); - } - - // induction motor data - if( vehicle->MoverParameters->EngineType == TEngineType::ElectricInductionMotor ) { - - UITable->text_lines.emplace_back( " eimc: eimv: press:", Global.UITextColor ); - for( int i = 0; i <= 20; ++i ) { - - std::string parameters = - vehicle->MoverParameters->eimc_labels[ i ] + to_string( vehicle->MoverParameters->eimc[ i ], 2, 9 ) - + " | " - + vehicle->MoverParameters->eimv_labels[ i ] + to_string( vehicle->MoverParameters->eimv[ i ], 2, 9 ); - - if( i < 10 ) { - parameters += " | " + train->fPress_labels[i] + to_string( train->fPress[ i ][ 0 ], 2, 9 ); - } - else if( i == 12 ) { - parameters += " med:"; - } - else if( i >= 13 ) { - parameters += " | " + vehicle->MED_labels[ i - 13 ] + to_string( vehicle->MED[ 0 ][ i - 13 ], 2, 9 ); - } - - UITable->text_lines.emplace_back( parameters, Global.UITextColor ); - } - } - if (vehicle->MoverParameters->EngineType == TEngineType::DieselEngine) { - std::string parameters = "param value"; - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "efill: " + to_string(vehicle->MoverParameters->dizel_fill, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "etorq: " + to_string(vehicle->MoverParameters->dizel_Torque, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "creal: " + to_string(vehicle->MoverParameters->dizel_engage, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "cdesi: " + to_string(vehicle->MoverParameters->dizel_engagestate, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "cdelt: " + to_string(vehicle->MoverParameters->dizel_engagedeltaomega, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "gears: " + to_string(vehicle->MoverParameters->dizel_automaticgearstatus, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hydro value"; - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCnI: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCnO: " + to_string(vehicle->MoverParameters->hydro_TC_nOut, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTM: " + to_string(vehicle->MoverParameters->hydro_TC_TMRatio, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTI: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueIn, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTO: " + to_string(vehicle->MoverParameters->hydro_TC_TorqueOut, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCfl: " + to_string(vehicle->MoverParameters->hydro_TC_Fill, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCLR: " + to_string(vehicle->MoverParameters->hydro_TC_LockupRate, 2, 9); - UITable->text_lines.emplace_back(parameters, Global.UITextColor); - //parameters = "hTCXX: " + to_string(vehicle->MoverParameters->hydro_TC_nIn, 2, 9); - //UITable->text_lines.emplace_back(parameters, Global.UITextColor); - } - - } // if( DebugModeFlag && Controlled ) - - break; - } - } - -#ifdef EU07_USE_OLD_UI_CODE - if( Controlled && DebugModeFlag && !Global.iTextMode ) { - - uitextline1 += - ( "; d_omega " ) + to_string( Controlled->MoverParameters->dizel_engagedeltaomega, 3 ); - - if( Controlled->MoverParameters->EngineType == ElectricInductionMotor ) { - - for( int i = 0; i <= 8; i++ ) { - for( int j = 0; j <= 9; j++ ) { - glRasterPos2f( 0.05f + 0.03f * i, 0.16f - 0.01f * j ); - uitextline4 = to_string( Train->fEIMParams[ i ][ j ], 2 ); - } - } - } - } -#endif - - // update the ui header texts - auto &headerdata = UIHeader->text_lines; - headerdata[ 0 ].data = uitextline1; - headerdata[ 1 ].data = uitextline2; - headerdata[ 2 ].data = uitextline3; - headerdata[ 3 ].data = uitextline4; - - // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) - auto &transcripts = UITranscripts->text_lines; - transcripts.clear(); - for( auto const &transcript : ui::Transcripts.aLines ) { - - if( Global.fTimeAngleDeg >= transcript.fShow ) { - - cParser parser( transcript.asText ); - while( true == parser.getTokens( 1, false, "|" ) ) { - - std::string transcriptline; parser >> transcriptline; - transcripts.emplace_back( transcriptline, glm::vec4( 1.0f, 1.0f, 0.0f, 1.0f ) ); - } - } - } - -} - void ui_layer::render() { diff --git a/uilayer.h b/uilayer.h index ee6ea8e3..1cb72ec3 100644 --- a/uilayer.h +++ b/uilayer.h @@ -1,4 +1,12 @@ - +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #pragma once #include @@ -30,29 +38,32 @@ struct ui_panel { class ui_layer { public: -// parameters: - -// constructors: +// constructors ui_layer() = default; -// destructor: - ~ui_layer(); +// destructor + virtual ~ui_layer(); -// methods: +// methods + static bool init( GLFWwindow *Window ); // assign texturing hardware unit + static void set_unit( GLint const Textureunit ) { m_textureunit = Textureunit; } // potentially processes provided input key. returns: true if the input was processed, false otherwise + virtual bool on_key( int const Key, int const Action ); // updates state of UI elements + virtual void - update(); + update() {} // draws requested UI elements void render(); // + static void set_cursor( int const Mode ); // stores operation progress @@ -70,12 +81,15 @@ public: void clear_texts() { m_panels.clear(); } void - push_back( std::shared_ptr Panel ) { m_panels.emplace_back( Panel ); } + push_back( ui_panel *Panel ) { m_panels.emplace_back( Panel ); } -// members: +protected: +// members + static GLFWwindow *m_window; + static bool m_cursorvisible; private: -// methods: +// methods // draws background quad with specified earlier texture void render_background(); @@ -94,11 +108,9 @@ private: // draws a quad between coordinates x,y and z,w with uv-coordinates spanning 0-1 void quad( glm::vec4 const &Coordinates, glm::vec4 const &Color ); - -// members: - GLFWwindow *m_window { nullptr }; - GLint m_textureunit{ GL_TEXTURE0 }; - GLuint m_fontbase { (GLuint)-1 }; // numer DL dla znaków w napisach +// members + static GLint m_textureunit; + static GLuint m_fontbase; // numer DL dla znaków w napisach // progress bar config. TODO: put these together into an object float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. @@ -108,16 +120,6 @@ private: texture_handle m_background { null_handle }; // path to texture used as the background. size depends on mAspect. GLuint m_texture { 0 }; - std::vector > m_panels; + std::vector m_panels; std::string m_tooltip; - // TODO: clean these legacy components up - std::shared_ptr UIHeader; // header ui panel - std::shared_ptr UITable; // schedule or scan table - std::shared_ptr UITranscripts; // voice transcripts - int tprev; // poprzedni czas - double VelPrev; // poprzednia prędkość - double Acc; // przyspieszenie styczne - bool m_cursorvisible { false }; }; - -extern ui_layer UILayer; diff --git a/utilities.cpp b/utilities.cpp index 0a8e603b..7b8a17c3 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -281,7 +281,7 @@ std::string ToUpper(std::string const &text) { void win1250_to_ascii( std::string &Input ) { - std::unordered_map charmap{ + std::unordered_map const charmap { { 165, 'A' }, { 198, 'C' }, { 202, 'E' }, { 163, 'L' }, { 209, 'N' }, { 211, 'O' }, { 140, 'S' }, { 143, 'Z' }, { 175, 'Z' }, { 185, 'a' }, { 230, 'c' }, { 234, 'e' }, { 179, 'l' }, { 241, 'n' }, { 243, 'o' }, { 156, 's' }, { 159, 'z' }, { 191, 'z' } }; @@ -293,23 +293,33 @@ win1250_to_ascii( std::string &Input ) { } // Ra: tymczasowe rozwiązanie kwestii zagranicznych (czeskich) napisów -char bezogonkowo[] = "E?,?\"_++?%Sstzz" - " ^^L$A|S^CS<--RZo±,l'uP.,as>L\"lz" - "RAAAALCCCEEEEIIDDNNOOOOxRUUUUYTB" - "raaaalccceeeeiiddnnoooo-ruuuuyt?"; +char charsetconversiontable[] = + "E?,?\"_++?%Sstzz" + " ^^L$A|S^CS<--RZo±,l'uP.,as>L\"lz" + "RAAAALCCCEEEEIIDDNNOOOOxRUUUUYTB" + "raaaalccceeeeiiddnnoooo-ruuuuyt?"; -std::string Bezogonkow(std::string str, bool _) -{ // wycięcie liter z ogonkami, bo OpenGL nie umie wyświetlić - for (unsigned int i = 1; i < str.length(); ++i) - if (str[i] & 0x80) - str[i] = bezogonkowo[str[i] & 0x7F]; - else if (str[i] < ' ') // znaki sterujące nie są obsługiwane - str[i] = ' '; - else if (_) - if (str[i] == '_') // nazwy stacji nie mogą zawierać spacji - str[i] = ' '; // więc trzeba wyświetlać inaczej - return str; -}; +// wycięcie liter z ogonkami +std::string Bezogonkow(std::string Input, bool const Underscorestospaces) { + + char const extendedcharsetbit { static_cast( 0x80 ) }; + char const space { ' ' }; + char const underscore { '_' }; + + for( auto &input : Input ) { + if( input & extendedcharsetbit ) { + input = charsetconversiontable[ input ^ extendedcharsetbit ]; + } + else if( input < space ) { + input = space; + } + else if( Underscorestospaces && ( input == underscore ) ) { + input = space; + } + } + + return Input; +} template <> bool diff --git a/utilities.h b/utilities.h index 6c188c40..2b447f39 100644 --- a/utilities.h +++ b/utilities.h @@ -130,7 +130,7 @@ std::string ToUpper(std::string const &text); // replaces polish letters with basic ascii void win1250_to_ascii( std::string &Input ); // TODO: unify with win1250_to_ascii() -std::string Bezogonkow( std::string str, bool _ = false ); +std::string Bezogonkow( std::string Input, bool const Underscorestospaces = false ); inline std::string diff --git a/version.h b/version.h index 3272ba5f..3d4afa1c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 718 +#define VERSION_MINOR 802 #define VERSION_REVISION 0 diff --git a/windows.cpp b/windows.cpp index a25e6ae7..70c29127 100644 --- a/windows.cpp +++ b/windows.cpp @@ -1,5 +1,5 @@ #include "stdafx.h" -#include "World.h" +#include "messaging.h" #include "utilities.h" #pragma warning (disable: 4091) @@ -62,7 +62,7 @@ LRESULT APIENTRY WndProc( HWND hWnd, // handle for this window // obsługa danych przesłanych przez program sterujący pDane = (PCOPYDATASTRUCT)lParam; if( pDane->dwData == MAKE_ID4('E', 'U', '0', '7')) // sygnatura danych - World.OnCommandGet( ( multiplayer::DaneRozkaz *)( pDane->lpData ) ); + multiplayer::OnCommandGet( ( multiplayer::DaneRozkaz *)( pDane->lpData ) ); break; } } From ec1a625c1298de3da9a4dbaa8a0296859e2b3059 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 3 Aug 2018 16:07:50 +0200 Subject: [PATCH 369/426] minor camera refactoring, division by zero guards --- Driver.cpp | 12 +++++++++--- DynObj.cpp | 7 ++++--- Globals.cpp | 2 -- Globals.h | 17 ++++++++--------- Model3d.h | 7 ++----- Traction.cpp | 15 +++++++++++---- Train.cpp | 20 ++++++++++---------- audiorenderer.cpp | 6 +++--- drivermode.cpp | 32 ++++++++------------------------ driveruilayer.cpp | 18 +++++++++--------- editormode.cpp | 23 ++++++++++------------- editormode.h | 2 +- editoruilayer.cpp | 7 +++---- renderer.cpp | 34 +++++++++++++++++----------------- scene.cpp | 11 ++++++----- sceneeditor.cpp | 2 +- scenenode.h | 2 +- sound.cpp | 3 ++- uilayer.cpp | 4 ++++ uilayer.h | 2 +- 20 files changed, 110 insertions(+), 116 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 2e9baffd..9a6cf96b 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1926,8 +1926,15 @@ double TController::ESMVelocity(bool Main) for (int i = 0; i < 5; i++) { MS = mvControlling->MomentumF(IF, IF, SCPN); - Fmax = MS * mvControlling->RList[MCPN].Bn*mvControlling->RList[MCPN].Mn * 2 / mvControlling->WheelDiameter * mvControlling->Transmision.Ratio; - IF = 0.5*IF*(1 + FrictionMax/Fmax); + Fmax = MS * mvControlling->RList[MCPN].Bn * mvControlling->RList[MCPN].Mn * 2 / mvControlling->WheelDiameter * mvControlling->Transmision.Ratio; + if( Fmax != 0.0 ) { + IF = 0.5 * IF * ( 1 + FrictionMax / Fmax ); + } + else { + // NOTE: gets trimmed to actual highest acceptable value after the loop + IF = std::numeric_limits::max(); + break; + } } IF = std::min(IF, mvControlling->Imax*fCurrentCoeff); double R = mvControlling->RList[MCPN].R + mvControlling->CircuitRes + mvControlling->RList[MCPN].Mn*mvControlling->WindingRes; @@ -1938,7 +1945,6 @@ double TController::ESMVelocity(bool Main) ESMVel = ns * mvControlling->WheelDiameter*M_PI*3.6/mvControlling->Transmision.Ratio; return ESMVel; } -; int TController::CheckDirection() { diff --git a/DynObj.cpp b/DynObj.cpp index f6b98ae2..654f881a 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -16,6 +16,7 @@ http://mozilla.org/MPL/2.0/. #include "DynObj.h" #include "simulation.h" +#include "camera.h" #include "train.h" #include "driver.h" #include "Globals.h" @@ -1061,19 +1062,19 @@ TDynamicObject * TDynamicObject::ABuFindNearestObject(TTrack *Track, TDynamicObj if( CouplNr == -2 ) { // wektor [kamera-obiekt] - poszukiwanie obiektu - if( Math3D::LengthSquared3( Global.pCameraPosition - dynamic->vPosition ) < 100.0 ) { + if( Math3D::LengthSquared3( Global.pCamera.Pos - dynamic->vPosition ) < 100.0 ) { // 10 metrów return dynamic; } } else { // jeśli (CouplNr) inne niz -2, szukamy sprzęgu - if( Math3D::LengthSquared3( Global.pCameraPosition - dynamic->vCoulpler[ 0 ] ) < 25.0 ) { + if( Math3D::LengthSquared3( Global.pCamera.Pos - dynamic->vCoulpler[ 0 ] ) < 25.0 ) { // 5 metrów CouplNr = 0; return dynamic; } - if( Math3D::LengthSquared3( Global.pCameraPosition - dynamic->vCoulpler[ 1 ] ) < 25.0 ) { + if( Math3D::LengthSquared3( Global.pCamera.Pos - dynamic->vCoulpler[ 1 ] ) < 25.0 ) { // 5 metrów CouplNr = 1; return dynamic; diff --git a/Globals.cpp b/Globals.cpp index 10b63e7b..e55c7dc0 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -26,8 +26,6 @@ global_settings Global; void global_settings::LoadIniFile(std::string asFileName) { - FreeCameraInit.resize( 10 ); - FreeCameraInitAngle.resize( 10 ); cParser parser(asFileName, cParser::buffer_FILE); ConfigParse(parser); }; diff --git a/Globals.h b/Globals.h index f542aac1..c6c39279 100644 --- a/Globals.h +++ b/Globals.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "classes.h" +#include "camera.h" #include "dumb3d.h" #include "float3d.h" #include "light.h" @@ -25,12 +26,10 @@ struct global_settings { bool altState{ false }; std::mt19937 random_engine{ std::mt19937( static_cast( std::time( NULL ) ) ) }; TDynamicObject *changeDynObj{ nullptr };// info o zmianie pojazdu - TCamera *pCamera{ nullptr }; // parametry kamery - TCamera *pDebugCamera{ nullptr }; - Math3D::vector3 pCameraPosition; // pozycja kamery w świecie - Math3D::vector3 DebugCameraPosition; // pozycja kamery w świecie - std::vector FreeCameraInit; // pozycje kamery - std::vector FreeCameraInitAngle; + TCamera pCamera; // parametry kamery + TCamera pDebugCamera; + std::array FreeCameraInit; // pozycje kamery + std::array FreeCameraInitAngle; int iCameraLast{ -1 }; int iSlowMotion{ 0 }; // info o malym FPS: 0-OK, 1-wyłączyć multisampling, 3-promień 1.5km, 7-1km basic_light DayLight; @@ -46,15 +45,15 @@ struct global_settings { bool bActive{ true }; // czy jest aktywnym oknem int iPause{ 0 }; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie float AirTemperature{ 15.f }; + std::string asCurrentSceneryPath{ "scenery/" }; + std::string asCurrentTexturePath{ szTexturePath }; + std::string asCurrentDynamicPath; // settings // filesystem bool bLoadTraction{ true }; std::string szTexturesTGA{ ".tga" }; // lista tekstur od TGA std::string szTexturesDDS{ ".dds" }; // lista tekstur od DDS std::string szDefaultExt{ szTexturesDDS }; - std::string asCurrentSceneryPath{ "scenery/" }; - std::string asCurrentTexturePath{ szTexturePath }; - std::string asCurrentDynamicPath; std::string SceneryFile{ "td.scn" }; std::string asHumanCtrlVehicle{ "EU07-424" }; int iConvertModels{ 0 }; // tworzenie plików binarnych diff --git a/Model3d.h b/Model3d.h index 6ae4b2f3..157bb992 100644 --- a/Model3d.h +++ b/Model3d.h @@ -179,11 +179,8 @@ public: void create_geometry( std::size_t &Dataoffset, gfx::geometrybank_handle const &Bank ); int FlagsCheck(); - void WillBeAnimated() - { - if (this) - iFlags |= 0x4000; - }; + void WillBeAnimated() { + iFlags |= 0x4000; }; void InitialRotate(bool doit); void BinInit(TSubModel *s, float4x4 *m, std::vector *t, std::vector *n, bool dynamic); static void ReplacableSet(material_handle const *r, int a) { diff --git a/Traction.cpp b/Traction.cpp index 71ec2aee..28ff95a7 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -477,10 +477,17 @@ double TTraction::VoltageGet(double u, double i) // 1. zasilacz psPower[0] z rezystancją fResistance[0] oraz jego wewnętrzną // 2. zasilacz psPower[1] z rezystancją fResistance[1] oraz jego wewnętrzną // 3. zasilacz psPowered z jego wewnętrzną rezystancją dla przęseł zasilanych bezpośrednio - double res = (i != 0.0) ? (u / i) : 10000.0; - if (psPowered) - return psPowered->CurrentGet(res) * - res; // yB: dla zasilanego nie baw się w gwiazdy, tylko bierz bezpośrednio + double res = ( + (i != 0.0) ? + (u / i) : + 10000.0 ); + if( psPowered != nullptr ) { + // yB: dla zasilanego nie baw się w gwiazdy, tylko bierz bezpośrednio + return ( + ( res != 0.0 ) ? + psPowered->CurrentGet( res ) * res : + 0.0 ); + } double r0t, r1t, r0g, r1g; double i0, i1; r0t = fResistance[0]; //średni pomysł, ale lepsze niż nic diff --git a/Train.cpp b/Train.cpp index 69ffef85..386ebefa 100644 --- a/Train.cpp +++ b/Train.cpp @@ -3360,14 +3360,14 @@ void TTrain::OnCommand_redmarkerstoggle( TTrain *Train, command_data const &Comm if( ( true == FreeFlyModeFlag ) && ( Command.action == GLFW_PRESS ) ) { - auto *vehicle { std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 10, false, true ) ) }; + auto *vehicle { std::get( simulation::Region->find_vehicle( Global.pCamera.Pos, 10, false, true ) ) }; if( vehicle == nullptr ) { return; } int const CouplNr { clamp( vehicle->DirectionGet() - * ( LengthSquared3( vehicle->HeadPosition() - Global.pCameraPosition ) > LengthSquared3( vehicle->RearPosition() - Global.pCameraPosition ) ? + * ( LengthSquared3( vehicle->HeadPosition() - Global.pCamera.Pos ) > LengthSquared3( vehicle->RearPosition() - Global.pCamera.Pos ) ? 1 : -1 ), 0, 1 ) }; // z [-1,1] zrobić [0,1] @@ -3386,14 +3386,14 @@ void TTrain::OnCommand_endsignalstoggle( TTrain *Train, command_data const &Comm if( ( true == FreeFlyModeFlag ) && ( Command.action == GLFW_PRESS ) ) { - auto *vehicle { std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 10, false, true ) ) }; + auto *vehicle { std::get( simulation::Region->find_vehicle( Global.pCamera.Pos, 10, false, true ) ) }; if( vehicle == nullptr ) { return; } int const CouplNr { clamp( vehicle->DirectionGet() - * ( LengthSquared3( vehicle->HeadPosition() - Global.pCameraPosition ) > LengthSquared3( vehicle->RearPosition() - Global.pCameraPosition ) ? + * ( LengthSquared3( vehicle->HeadPosition() - Global.pCamera.Pos ) > LengthSquared3( vehicle->RearPosition() - Global.pCamera.Pos ) ? 1 : -1 ), 0, 1 ) }; // z [-1,1] zrobić [0,1] @@ -4327,13 +4327,13 @@ bool TTrain::Update( double const Deltatime ) // update driver's position { - auto Vec = Global.pCamera->Velocity * -2.0;// -7.5 * Timer::GetDeltaRenderTime(); + auto Vec = Global.pCamera.Velocity * -2.0;// -7.5 * Timer::GetDeltaRenderTime(); Vec.y = -Vec.y; if( mvOccupied->ActiveCab < 0 ) { Vec *= -1.0f; Vec.y = -Vec.y; } - Vec.RotateY( Global.pCamera->Yaw ); + Vec.RotateY( Global.pCamera.Yaw ); vMechMovement = Vec; } @@ -5949,8 +5949,8 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) } // reset view angles pMechViewAngle = { 0.0, 0.0 }; - Global.pCamera->Pitch = pMechViewAngle.x; - Global.pCamera->Yaw = pMechViewAngle.y; + Global.pCamera.Pitch = pMechViewAngle.x; + Global.pCamera.Yaw = pMechViewAngle.y; pyScreens.reset(this); pyScreens.setLookupPath(DynamicObject->asBaseDir); @@ -6016,8 +6016,8 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) >> viewangle.y // yaw first, then pitch >> viewangle.x; pMechViewAngle = glm::radians( viewangle ); - Global.pCamera->Pitch = pMechViewAngle.x; - Global.pCamera->Yaw = pMechViewAngle.y; + Global.pCamera.Pitch = pMechViewAngle.x; + Global.pCamera.Yaw = pMechViewAngle.y; parser->getTokens(); *parser >> token; diff --git a/audiorenderer.cpp b/audiorenderer.cpp index 03184ee2..b29057a9 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -117,7 +117,7 @@ openal_source::sync_with( sound_properties const &State ) { ::alSourcefv( id, AL_VELOCITY, glm::value_ptr( sound_velocity ) ); // location properties.location = State.location; - sound_distance = properties.location - glm::dvec3 { Global.pCameraPosition }; + sound_distance = properties.location - glm::dvec3 { Global.pCamera.Pos }; if( sound_range > 0 ) { // range cutoff check auto const cutoffrange = ( @@ -312,7 +312,7 @@ openal_renderer::update( double const Deltatime ) { // update listener // orientation glm::dmat4 cameramatrix; - Global.pCamera->SetMatrix( cameramatrix ); + Global.pCamera.SetMatrix( cameramatrix ); auto rotationmatrix { glm::mat3{ cameramatrix } }; glm::vec3 const orientation[] = { glm::vec3{ 0, 0,-1 } * rotationmatrix , @@ -320,7 +320,7 @@ openal_renderer::update( double const Deltatime ) { ::alListenerfv( AL_ORIENTATION, reinterpret_cast( orientation ) ); // velocity if( Deltatime > 0 ) { - glm::dvec3 const listenerposition { Global.pCameraPosition }; + glm::dvec3 const listenerposition { Global.pCamera.Pos }; glm::dvec3 const listenermovement { listenerposition - m_listenerposition }; m_listenerposition = listenerposition; m_listenervelocity = ( diff --git a/drivermode.cpp b/drivermode.cpp index 72283022..3198e308 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -241,8 +241,8 @@ void driver_mode::enter() { Camera.Init(Global.FreeCameraInit[0], Global.FreeCameraInitAngle[0], ( FreeFlyModeFlag ? TCameraType::tp_Free : TCameraType::tp_Follow ) ); - Global.pCamera = &Camera; - Global.pDebugCamera = &DebugCamera; + Global.pCamera = Camera; + Global.pDebugCamera = DebugCamera; TDynamicObject *nPlayerTrain { ( ( Global.asHumanCtrlVehicle != "ghostview" ) ? @@ -281,7 +281,6 @@ driver_mode::enter() { FreeFlyModeFlag = true; // Ra: automatycznie włączone latanie Camera.Type = TCameraType::tp_Free; DebugCamera = Camera; - Global.DebugCameraPosition = DebugCamera.Pos; } // if (!Global.bMultiplayer) //na razie włączone @@ -345,17 +344,7 @@ driver_mode::on_key( int const Key, int const Scancode, int const Action, int co } } - if( ( Key == GLFW_KEY_LEFT_SHIFT ) - || ( Key == GLFW_KEY_LEFT_CONTROL ) - || ( Key == GLFW_KEY_LEFT_ALT ) - || ( Key == GLFW_KEY_RIGHT_SHIFT ) - || ( Key == GLFW_KEY_RIGHT_CONTROL ) - || ( Key == GLFW_KEY_RIGHT_ALT ) ) { - // don't bother passing these - return; - } - - if( Action == GLFW_PRESS || Action == GLFW_REPEAT ) { + if( Action == GLFW_PRESS ) { OnKeyDown( Key ); @@ -414,9 +403,9 @@ driver_mode::update_camera( double const Deltatime ) { Camera.LookAt = controlled->GetPosition(); } else { - TDynamicObject *d = std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 300, false, false ) ); + TDynamicObject *d = std::get( simulation::Region->find_vehicle( Global.pCamera.Pos, 300, false, false ) ); if( !d ) - d = std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 1000, false, false ) ); // dalej szukanie, jesli bliżej nie ma + d = std::get( simulation::Region->find_vehicle( Global.pCamera.Pos, 1000, false, false ) ); // dalej szukanie, jesli bliżej nie ma if( d && pDynamicNearest ) { // jeśli jakiś jest znaleziony wcześniej @@ -530,8 +519,7 @@ driver_mode::update_camera( double const Deltatime ) { } } // all done, update camera position to the new value - Global.pCameraPosition = Camera.Pos; - Global.DebugCameraPosition = DebugCamera.Pos; + Global.pCamera = Camera; } void @@ -615,7 +603,7 @@ driver_mode::OnKeyDown(int cKey) { } else // również przeskakiwanie { // Ra: to z tą kamerą (Camera.Pos i Global.pCameraPosition) jest trochę bez sensu - Global.pCameraPosition = Global.FreeCameraInit[ i ]; // nowa pozycja dla generowania obiektów + Global.pCamera.Pos = Global.FreeCameraInit[ i ]; // nowa pozycja dla generowania obiektów Camera.Init( Global.FreeCameraInit[ i ], Global.FreeCameraInitAngle[ i ], TCameraType::tp_Free ); // przestawienie } } @@ -653,7 +641,7 @@ driver_mode::OnKeyDown(int cKey) { break; } - TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global.pCameraPosition, 50, true, false ) ); + TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global.pCamera.Pos, 50, true, false ) ); if( tmp != nullptr ) { @@ -879,9 +867,6 @@ driver_mode::FollowView(bool wycisz) { train->Dynamic()->ABuSetModelShake( {} ); DistantView(); // przestawienie kamery - //żeby nie bylo numerów z 'fruwajacym' lokiem - konsekwencja bujania pudła - // tu ustawić nową, bo od niej liczą się odległości - Global.pCameraPosition = Camera.Pos; } else { Camera.Pos = train->pMechPosition; @@ -987,7 +972,6 @@ driver_mode::InOutKey( bool const Near ) DistantView( Near ); } DebugCamera = Camera; - Global.DebugCameraPosition = DebugCamera.Pos; } else { // jazda w kabinie diff --git a/driveruilayer.cpp b/driveruilayer.cpp index e103ac42..08fb23b0 100644 --- a/driveruilayer.cpp +++ b/driveruilayer.cpp @@ -193,7 +193,7 @@ driver_ui::update() { auto const *train { simulation::Train }; auto const *controlled { ( train ? train->Dynamic() : nullptr ) }; - auto const *camera { Global.pCamera }; + auto const &camera { Global.pCamera }; if( ( train != nullptr ) && ( false == FreeFlyModeFlag ) ) { if( false == DebugModeFlag ) { @@ -292,7 +292,7 @@ driver_ui::update() { // timetable auto *vehicle { ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : + std::get( simulation::Region->find_vehicle( camera.Pos, 20, false, false ) ) : controlled ) }; // w trybie latania lokalizujemy wg mapy if( vehicle == nullptr ) { break; } @@ -398,7 +398,7 @@ driver_ui::update() { auto const *vehicle { ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : + std::get( simulation::Region->find_vehicle( camera.Pos, 20, false, false ) ) : controlled ) }; // w trybie latania lokalizujemy wg mapy if( vehicle != nullptr ) { @@ -579,14 +579,14 @@ driver_ui::update() { // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika uitextline1 = "Camera position: " - + to_string( camera->Pos.x, 2 ) + " " - + to_string( camera->Pos.y, 2 ) + " " - + to_string( camera->Pos.z, 2 ) + + to_string( camera.Pos.x, 2 ) + " " + + to_string( camera.Pos.y, 2 ) + " " + + to_string( camera.Pos.z, 2 ) + ", azimuth: " - + to_string( 180.0 - glm::degrees( camera->Yaw ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód + + to_string( 180.0 - glm::degrees( camera.Yaw ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód + " " + std::string( "S SEE NEN NWW SW" ) - .substr( 0 + 2 * floor( fmod( 8 + ( camera->Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); + .substr( 0 + 2 * floor( fmod( 8 + ( camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); // current luminance level uitextline2 = "Light level: " + to_string( Global.fLuminance, 3 ); if( Global.FakeLight ) { uitextline2 += "(*)"; } @@ -683,7 +683,7 @@ driver_ui::update() { auto const *vehicle { ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( camera->Pos, 20, false, false ) ) : + std::get( simulation::Region->find_vehicle( camera.Pos, 20, false, false ) ) : controlled ) }; // w trybie latania lokalizujemy wg mapy if( vehicle == nullptr ) { break; diff --git a/editormode.cpp b/editormode.cpp index 235dba27..19726fd8 100644 --- a/editormode.cpp +++ b/editormode.cpp @@ -43,7 +43,10 @@ editor_mode::editor_mode() { bool editor_mode::init() { - Camera.Init( {}, {}, TCameraType::tp_Free ); + Camera.Init( { 0, 15, 0 }, { glm::radians( -30.0 ), glm::radians( 180.0 ), 0 }, TCameraType::tp_Free ); + + m_userinterface->set_progress( "Scenario editor is active. Press F11 to return to driver mode" ); + m_userinterface->set_progress( 0, 100 ); return m_input.init(); } @@ -97,7 +100,7 @@ editor_mode::update_camera( double const Deltatime ) { // reset window state, it'll be set again if applicable in a check below Global.CabWindowOpen = false; // all done, update camera position to the new value - Global.pCameraPosition = Camera.Pos; + Global.pCamera = Camera; } // maintenance method, called when the mode is activated @@ -106,7 +109,7 @@ editor_mode::enter() { m_statebackup = { Global.pCamera, FreeFlyModeFlag, Global.ControlPicking }; - Global.pCamera = &Camera; + Global.pCamera = Camera; FreeFlyModeFlag = true; Global.ControlPicking = true; EditorModeFlag = true; @@ -127,6 +130,10 @@ editor_mode::exit() { ( Global.ControlPicking ? GLFW_CURSOR_NORMAL : GLFW_CURSOR_DISABLED ) ); + + if( false == Global.ControlPicking ) { + Application.set_cursor_pos( 0, 0 ); + } } void @@ -143,16 +150,6 @@ editor_mode::on_key( int const Key, int const Scancode, int const Action, int co if( Action == GLFW_RELEASE ) { return; } - if( ( Key == GLFW_KEY_LEFT_SHIFT ) - || ( Key == GLFW_KEY_LEFT_CONTROL ) - || ( Key == GLFW_KEY_LEFT_ALT ) - || ( Key == GLFW_KEY_RIGHT_SHIFT ) - || ( Key == GLFW_KEY_RIGHT_CONTROL ) - || ( Key == GLFW_KEY_RIGHT_ALT ) ) { - // don't bother passing these - return; - } - // legacy hardcoded keyboard commands // TODO: replace with current command system, move to input object(s) switch( Key ) { diff --git a/editormode.h b/editormode.h index 012752ff..99565f94 100644 --- a/editormode.h +++ b/editormode.h @@ -57,7 +57,7 @@ private: struct state_backup { - TCamera *camera; + TCamera camera; bool freefly; bool picking; }; diff --git a/editoruilayer.cpp b/editoruilayer.cpp index be96c79b..5b6df31f 100644 --- a/editoruilayer.cpp +++ b/editoruilayer.cpp @@ -48,7 +48,7 @@ editor_ui::update() { std::string uitextline1, uitextline2, uitextline3, uitextline4; set_tooltip( "" ); - auto const *camera { Global.pCamera }; + auto const &camera { Global.pCamera }; if( ( true == Global.ControlPicking ) && ( true == DebugModeFlag ) ) { @@ -60,12 +60,11 @@ editor_ui::update() { "" ) ); } - // scenario inspector auto const *node { m_node }; if( node == nullptr ) { - auto const mouseposition { Global.pCamera->Pos + GfxRenderer.Mouse_Position() }; + auto const mouseposition { camera.Pos + GfxRenderer.Mouse_Position() }; uitextline1 = "mouse location: [" + to_string( mouseposition.x, 2 ) + ", " + to_string( mouseposition.y, 2 ) + ", " + to_string( mouseposition.z, 2 ) + "]"; goto update; } @@ -73,7 +72,7 @@ editor_ui::update() { uitextline1 = "node name: " + node->name() + "; location: [" + to_string( node->location().x, 2 ) + ", " + to_string( node->location().y, 2 ) + ", " + to_string( node->location().z, 2 ) + "]" - + " (distance: " + to_string( glm::length( glm::dvec3{ node->location().x, 0.0, node->location().z } -glm::dvec3{ Global.pCameraPosition.x, 0.0, Global.pCameraPosition.z } ), 1 ) + " m)"; + + " (distance: " + to_string( glm::length( glm::dvec3{ node->location().x, 0.0, node->location().z } -glm::dvec3{ camera.Pos.x, 0.0, camera.Pos.z } ), 1 ) + " m)"; // subclass-specific data // TBD, TODO: specialized data dump method in each node subclass, or data imports in the panel for provided subclass pointer? if( typeid( *node ) == typeid( TAnimModel ) ) { diff --git a/renderer.cpp b/renderer.cpp index e39db423..eeab2f70 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -810,12 +810,12 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f case rendermode::color: { // modelview if( ( false == DebugCameraFlag ) || ( true == Ignoredebug ) ) { - camera.position() = Global.pCameraPosition; - Global.pCamera->SetMatrix( viewmatrix ); + camera.position() = Global.pCamera.Pos; + Global.pCamera.SetMatrix( viewmatrix ); } else { - camera.position() = Global.DebugCameraPosition; - Global.pDebugCamera->SetMatrix( viewmatrix ); + camera.position() = Global.pDebugCamera.Pos; + Global.pDebugCamera.SetMatrix( viewmatrix ); } // projection auto const zfar = Config.draw_range * Global.fDistanceFactor * Zfar; @@ -921,10 +921,10 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f m_sunlight.direction.x, std::min( m_sunlight.direction.y, -0.2f ), m_sunlight.direction.z } ); - camera.position() = Global.pCameraPosition - glm::dvec3 { lightvector }; + camera.position() = Global.pCamera.Pos - glm::dvec3 { lightvector }; viewmatrix *= glm::lookAt( camera.position(), - glm::dvec3 { Global.pCameraPosition }, + glm::dvec3 { Global.pCamera.Pos }, glm::dvec3 { 0.f, 1.f, 0.f } ); // projection auto const maphalfsize { Config.draw_range * 0.5f }; @@ -947,8 +947,8 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f // modelview camera.position() = ( ( ( true == DebugCameraFlag ) && ( false == Ignoredebug ) ) ? - Global.DebugCameraPosition : - Global.pCameraPosition ); + Global.pDebugCamera.Pos : + Global.pCamera.Pos ); glm::dvec3 const cubefacetargetvectors[ 6 ] = { { 1.0, 0.0, 0.0 }, { -1.0, 0.0, 0.0 }, { 0.0, 1.0, 0.0 }, { 0.0, -1.0, 0.0 }, { 0.0, 0.0, 1.0 }, { 0.0, 0.0, -1.0 } }; glm::dvec3 const cubefaceupvectors[ 6 ] = { { 0.0, -1.0, 0.0 }, { 0.0, -1.0, 0.0 }, { 0.0, 0.0, 1.0 }, { 0.0, 0.0, -1.0 }, { 0.0, -1.0, 0.0 }, { 0.0, -1.0, 0.0 } }; auto const cubefaceindex = m_environmentcubetextureface - GL_TEXTURE_CUBE_MAP_POSITIVE_X; @@ -971,8 +971,8 @@ opengl_renderer::setup_pass( renderpass_config &Config, rendermode const Mode, f case rendermode::pickscenery: { // TODO: scissor test for pick modes // modelview - camera.position() = Global.pCameraPosition; - Global.pCamera->SetMatrix( viewmatrix ); + camera.position() = Global.pCamera.Pos; + Global.pCamera.SetMatrix( viewmatrix ); // projection camera.projection() *= glm::perspective( @@ -1997,7 +1997,7 @@ opengl_renderer::Render( scene::shape_node const &Shape, bool const Ignorerange switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = Math3D::SquareMagnitude( ( data.area.center - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( data.area.center - Global.pCamera.Pos ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { @@ -2051,7 +2051,7 @@ opengl_renderer::Render( TAnimModel *Instance ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = Math3D::SquareMagnitude( ( Instance->location() - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( Instance->location() - Global.pCamera.Pos ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { @@ -2105,7 +2105,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { float squaredistance; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { - squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global.pCameraPosition } } / Global.ZoomFactor ) / Global.fDistanceFactor; + squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global.pCamera.Pos } } / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { @@ -2901,7 +2901,7 @@ opengl_renderer::Render_Alpha( TAnimModel *Instance ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = Math3D::SquareMagnitude( ( Instance->location() - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( Instance->location() - Global.pCamera.Pos ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { @@ -2933,7 +2933,7 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = Math3D::SquareMagnitude( ( Traction->location() - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( Traction->location() - Global.pCamera.Pos ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { @@ -2994,7 +2994,7 @@ opengl_renderer::Render_Alpha( scene::lines_node const &Lines ) { switch( m_renderpass.draw_mode ) { case rendermode::shadows: { // 'camera' for the light pass is the light source, but we need to draw what the 'real' camera sees - distancesquared = Math3D::SquareMagnitude( ( data.area.center - Global.pCameraPosition ) / Global.ZoomFactor ) / Global.fDistanceFactor; + distancesquared = Math3D::SquareMagnitude( ( data.area.center - Global.pCamera.Pos ) / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { @@ -3042,7 +3042,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { float squaredistance; switch( m_renderpass.draw_mode ) { case rendermode::shadows: { - squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global.pCameraPosition } } / Global.ZoomFactor ) / Global.fDistanceFactor; + squaredistance = glm::length2( glm::vec3{ glm::dvec3{ Dynamic->vPosition - Global.pCamera.Pos } } / Global.ZoomFactor ) / Global.fDistanceFactor; break; } default: { diff --git a/scene.cpp b/scene.cpp index f12054b8..738dbb1c 100644 --- a/scene.cpp +++ b/scene.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "simulation.h" #include "globals.h" +#include "camera.h" #include "animmodel.h" #include "event.h" #include "evlaunch.h" @@ -122,7 +123,7 @@ basic_cell::update_events() { // event launchers for( auto *launcher : m_eventlaunchers ) { if( ( true == ( launcher->check_activation() && launcher->check_conditions() ) ) - && ( SquareMagnitude( launcher->location() - Global.pCameraPosition ) < launcher->dRadius ) ) { + && ( SquareMagnitude( launcher->location() - Global.pCamera.Pos ) < launcher->dRadius ) ) { launch_event( launcher ); } @@ -948,9 +949,9 @@ void basic_region::update_events() { // render events and sounds from sectors near enough to the viewer auto const range = EU07_SECTIONSIZE; // arbitrary range - auto const §ionlist = sections( Global.pCameraPosition, range ); + auto const §ionlist = sections( Global.pCamera.Pos, range ); for( auto *section : sectionlist ) { - section->update_events( Global.pCameraPosition, range ); + section->update_events( Global.pCamera.Pos, range ); } } @@ -959,9 +960,9 @@ void basic_region::update_sounds() { // render events and sounds from sectors near enough to the viewer auto const range = 2750.f; // audible range of 100 db sound - auto const §ionlist = sections( Global.pCameraPosition, range ); + auto const §ionlist = sections( Global.pCamera.Pos, range ); for( auto *section : sectionlist ) { - section->update_sounds( Global.pCameraPosition, range ); + section->update_sounds( Global.pCamera.Pos, range ); } } diff --git a/sceneeditor.cpp b/sceneeditor.cpp index c79d4bb0..78b87a6b 100644 --- a/sceneeditor.cpp +++ b/sceneeditor.cpp @@ -43,7 +43,7 @@ basic_editor::translate( scene::basic_node *Node, float const Offset ) { // NOTE: offset scaling is calculated early so the same multiplier can be applied to potential whole group auto location { Node->location() }; - auto const distance { glm::length( location - glm::dvec3{ Global.pCamera->Pos } ) }; + auto const distance { glm::length( location - glm::dvec3{ Global.pCamera.Pos } ) }; auto const offset { Offset * std::max( 1.0, distance * 0.01 ) }; auto *node { Node }; // placeholder for operations on multiple nodes diff --git a/scenenode.h b/scenenode.h index 915c60c7..feb14a5b 100644 --- a/scenenode.h +++ b/scenenode.h @@ -299,7 +299,7 @@ private: // base interface for nodes which can be actvated in scenario editor -struct basic_node { +class basic_node { public: // constructor diff --git a/sound.cpp b/sound.cpp index 10a95dbb..416cfdb9 100644 --- a/sound.cpp +++ b/sound.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "sound.h" #include "parser.h" #include "globals.h" +#include "camera.h" #include "train.h" #include "dynobj.h" #include "simulation.h" @@ -357,7 +358,7 @@ sound_source::play( int const Flags ) { if( m_range > 0 ) { auto const cutoffrange { m_range * 5 }; - if( glm::length2( location() - glm::dvec3 { Global.pCameraPosition } ) > std::min( 2750.f * 2750.f, cutoffrange * cutoffrange ) ) { + if( glm::length2( location() - glm::dvec3 { Global.pCamera.Pos } ) > std::min( 2750.f * 2750.f, cutoffrange * cutoffrange ) ) { // while we drop sounds from beyond sensible and/or audible range // we act as if it was activated normally, meaning no need to include the opening bookend in subsequent calls m_playbeginning = false; diff --git a/uilayer.cpp b/uilayer.cpp index cefc1988..cf8f6925 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -149,10 +149,14 @@ ui_layer::set_background( std::string const &Filename ) { else { m_background = null_handle; } + if( m_background != null_handle ) { auto const &texture = GfxRenderer.Texture( m_background ); m_progressbottom = ( texture.width() != texture.height() ); } + else { + m_progressbottom = true; + } } void diff --git a/uilayer.h b/uilayer.h index 1cb72ec3..d95dba3f 100644 --- a/uilayer.h +++ b/uilayer.h @@ -116,7 +116,7 @@ private: float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. float m_subtaskprogress{ 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. std::string m_progresstext; // label placed over the progress bar - bool m_progressbottom { false }; // location of the progress bar + bool m_progressbottom { true }; // location of the progress bar texture_handle m_background { null_handle }; // path to texture used as the background. size depends on mAspect. GLuint m_texture { 0 }; From cf7b9652e0a5778d1e19d062e095d986c874d82d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 4 Aug 2018 12:34:51 +0200 Subject: [PATCH 370/426] build 180804. configurable command bindings for scroll wheel, minor bug fixes --- application.cpp | 1 + applicationmode.h | 5 +- driverkeyboardinput.cpp | 12 ++-- drivermode.cpp | 21 ++++--- drivermode.h | 4 +- drivermouseinput.cpp | 130 ++++++++++++++++++++++++++++++++++++---- drivermouseinput.h | 26 ++++++-- editorkeyboardinput.cpp | 3 +- editormode.cpp | 8 ++- editormode.h | 2 + keyboardinput.cpp | 10 +--- scenarioloadermode.h | 2 + scene.h | 3 +- version.h | 2 +- 14 files changed, 180 insertions(+), 49 deletions(-) diff --git a/application.cpp b/application.cpp index 6c457219..ad12acf1 100644 --- a/application.cpp +++ b/application.cpp @@ -141,6 +141,7 @@ eu07_application::run() { && ( true == m_modes[ m_modestack.top() ]->update() ) && ( true == GfxRenderer.Render() ) ) { glfwPollEvents(); + m_modes[ m_modestack.top() ]->on_event_poll(); } return 0; diff --git a/applicationmode.h b/applicationmode.h index 3bba4c28..0bc0eaa0 100644 --- a/applicationmode.h +++ b/applicationmode.h @@ -35,7 +35,7 @@ public: if( m_userinterface != nullptr ) { m_userinterface->render(); } } inline - void + void set_progress( float const Progress = 0.f, float const Subtaskprogress = 0.f ) { if( m_userinterface != nullptr ) { m_userinterface->set_progress( Progress, Subtaskprogress ); } } @@ -60,6 +60,9 @@ public: virtual void on_scroll( double const Xoffset, double const Yoffset ) = 0; + virtual + void + on_event_poll() = 0; protected: // members diff --git a/driverkeyboardinput.cpp b/driverkeyboardinput.cpp index c6f34552..362c5467 100644 --- a/driverkeyboardinput.cpp +++ b/driverkeyboardinput.cpp @@ -14,8 +14,10 @@ bool driverkeyboard_input::init() { default_bindings(); + recall_bindings(); + bind(); - return recall_bindings(); + return true; } void @@ -59,7 +61,7 @@ driverkeyboard_input::default_bindings() { { user_command::manualbrakedecrease, GLFW_KEY_KP_7 | keymodifier::control }, { user_command::alarmchaintoggle, GLFW_KEY_B | keymodifier::shift | keymodifier::control }, { user_command::wheelspinbrakeactivate, GLFW_KEY_KP_ENTER }, - { user_command::sandboxactivate, GLFW_KEY_S }, + { user_command::sandboxactivate, GLFW_KEY_S | keymodifier::shift }, { user_command::reverserincrease, GLFW_KEY_D }, { user_command::reverserdecrease, GLFW_KEY_R }, // reverserforwardhigh, @@ -99,7 +101,7 @@ driverkeyboard_input::default_bindings() { // compressorenable, // compressordisable, { user_command::compressortogglelocal, GLFW_KEY_C | keymodifier::shift }, - { user_command::motoroverloadrelaythresholdtoggle, GLFW_KEY_F }, + { user_command::motoroverloadrelaythresholdtoggle, GLFW_KEY_F | keymodifier::control }, // motoroverloadrelaythresholdsetlow, // motoroverloadrelaythresholdsethigh, { user_command::motoroverloadrelayreset, GLFW_KEY_N }, @@ -142,7 +144,7 @@ driverkeyboard_input::default_bindings() { { user_command::doortoggleleft, GLFW_KEY_COMMA }, { user_command::doortoggleright, GLFW_KEY_PERIOD }, { user_command::departureannounce, GLFW_KEY_SLASH }, - { user_command::doorlocktoggle, GLFW_KEY_S | keymodifier::shift }, + { user_command::doorlocktoggle, GLFW_KEY_S | keymodifier::control }, { user_command::pantographcompressorvalvetoggle, GLFW_KEY_V | keymodifier::control }, { user_command::pantographcompressoractivate, GLFW_KEY_V | keymodifier::shift }, { user_command::pantographtogglefront, GLFW_KEY_P }, @@ -208,8 +210,6 @@ driverkeyboard_input::default_bindings() { // batteryenable, // batterydisable, }; - - bind(); } //--------------------------------------------------------------------------- diff --git a/drivermode.cpp b/drivermode.cpp index 3198e308..504934e7 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -60,11 +60,13 @@ driver_mode::drivermode_input::init() { // initialize input devices auto result = ( keyboard.init() - && mouse.init() - && gamepad.init() ); + && mouse.init() ); + if( true == Global.InputGamepad ) { + gamepad.init(); + } if( true == Global.uart_conf.enable ) { uart = std::make_unique(); - result = ( result && uart->init() ); + uart->init(); } #ifdef _WIN32 Console::On(); // włączenie konsoli @@ -231,8 +233,6 @@ driver_mode::update() { simulation::is_ready = true; - m_input.poll(); - return true; } @@ -381,10 +381,13 @@ driver_mode::on_mouse_button( int const Button, int const Action, int const Mods void driver_mode::on_scroll( double const Xoffset, double const Yoffset ) { - if( Global.ctrlState ) { - // ctrl + scroll wheel adjusts fov - Global.FieldOfView = clamp( static_cast( Global.FieldOfView - Yoffset * 20.0 / Timer::subsystem.gfx_total.average() ), 15.0f, 75.0f ); - } + m_input.mouse.scroll( Xoffset, Yoffset ); +} + +void +driver_mode::on_event_poll() { + + m_input.poll(); } void diff --git a/drivermode.h b/drivermode.h index 81085a66..66701ca8 100644 --- a/drivermode.h +++ b/drivermode.h @@ -47,13 +47,15 @@ public: on_mouse_button( int const Button, int const Action, int const Mods ) override; void on_scroll( double const Xoffset, double const Yoffset ) override; + void + on_event_poll() override; private: // types struct drivermode_input { gamepad_input gamepad; - mouse_input mouse; + drivermouse_input mouse; glm::dvec2 mouse_pickmodepos; // stores last mouse position in control picking mode driverkeyboard_input keyboard; Console console; diff --git a/drivermouseinput.cpp b/drivermouseinput.cpp index 2035b896..56d46799 100644 --- a/drivermouseinput.cpp +++ b/drivermouseinput.cpp @@ -19,6 +19,7 @@ http://mozilla.org/MPL/2.0/. #include "animmodel.h" #include "renderer.h" #include "uilayer.h" +#include "logs.h" void mouse_slider::bind( user_command const &Command ) { @@ -121,7 +122,7 @@ mouse_slider::on_move( double const Mousex, double const Mousey ) { bool -mouse_input::init() { +drivermouse_input::init() { #ifdef _WIN32 DWORD systemkeyboardspeed; @@ -131,11 +132,75 @@ mouse_input::init() { ::SystemParametersInfo( SPI_GETKEYBOARDDELAY, 0, &systemkeyboarddelay, 0 ); m_updatedelay = interpolate( 0.25, 1.0, systemkeyboarddelay / 3.0 ); #endif + + default_bindings(); + recall_bindings(); + + return true; +} + +bool +drivermouse_input::recall_bindings() { + + cParser bindingparser( "eu07_input-mouse.ini", cParser::buffer_FILE ); + if( false == bindingparser.ok() ) { + return false; + } + + // build helper translation tables + std::unordered_map nametocommandmap; + std::size_t commandid = 0; + for( auto const &description : simulation::Commands_descriptions ) { + nametocommandmap.emplace( + description.name, + static_cast( commandid ) ); + ++commandid; + } + + // NOTE: to simplify things we expect one entry per line, and whole entry in one line + while( true == bindingparser.getTokens( 1, true, "\n" ) ) { + + std::string bindingentry; + bindingparser >> bindingentry; + cParser entryparser( bindingentry ); + + if( true == entryparser.getTokens( 1, true, "\n\r\t " ) ) { + + std::string bindingpoint {}; + entryparser >> bindingpoint; + + std::vector< std::reference_wrapper > bindingtargets; + + if( bindingpoint == "wheel" ) { + bindingtargets.emplace_back( std::ref( m_wheelbindings.up ) ); + bindingtargets.emplace_back( std::ref( m_wheelbindings.down ) ); + } + // TODO: binding targets for mouse buttons + + for( auto &bindingtarget : bindingtargets ) { + // grab command(s) associated with the input pin + auto const bindingcommandname{ entryparser.getToken() }; + if( true == bindingcommandname.empty() ) { + // no tokens left, may as well complain then call it a day + WriteLog( "Mouse binding for " + bindingpoint + " didn't specify associated command(s)" ); + break; + } + auto const commandlookup = nametocommandmap.find( bindingcommandname ); + if( commandlookup == nametocommandmap.end() ) { + WriteLog( "Mouse binding for " + bindingpoint + " specified unknown command, \"" + bindingcommandname + "\"" ); + } + else { + bindingtarget.get() = commandlookup->second; + } + } + } + } + return true; } void -mouse_input::move( double Mousex, double Mousey ) { +drivermouse_input::move( double Mousex, double Mousey ) { if( false == Global.ControlPicking ) { // default control mode @@ -182,7 +247,33 @@ mouse_input::move( double Mousex, double Mousey ) { } void -mouse_input::button( int const Button, int const Action ) { +drivermouse_input::scroll( double const Xoffset, double const Yoffset ) { + + if( Global.ctrlState ) { + // ctrl + scroll wheel adjusts fov + Global.FieldOfView = clamp( static_cast( Global.FieldOfView - Yoffset * 20.0 / Timer::subsystem.gfx_total.average() ), 15.0f, 75.0f ); + } + else { + // scroll adjusts master controller + // TODO: allow configurable scroll commands + auto command { + adjust_command( + ( Yoffset > 0.0 ) ? + m_wheelbindings.up : + m_wheelbindings.down ) }; + + m_relay.post( + command, + 0, + 0, + GLFW_PRESS, + // TODO: pass correct entity id once the missing systems are in place + 0 ); + } +} + +void +drivermouse_input::button( int const Button, int const Action ) { // store key state if( Button >= 0 ) { @@ -241,8 +332,8 @@ mouse_input::button( int const Button, int const Action ) { } else { // if not release then it's press - auto const lookup = m_mousecommands.find( simulation::Train->GetLabel( GfxRenderer.Update_Pick_Control() ) ); - if( lookup != m_mousecommands.end() ) { + auto const lookup = m_buttonbindings.find( simulation::Train->GetLabel( GfxRenderer.Update_Pick_Control() ) ); + if( lookup != m_buttonbindings.end() ) { // if the recognized element under the cursor has a command associated with the pressed button, notify the recipient mousecommand = ( Button == GLFW_MOUSE_BUTTON_LEFT ? @@ -307,13 +398,13 @@ mouse_input::button( int const Button, int const Action ) { } int -mouse_input::button( int const Button ) const { +drivermouse_input::button( int const Button ) const { return m_buttons[ Button ]; } void -mouse_input::poll() { +drivermouse_input::poll() { m_updateaccumulator += Timer::GetDeltaRenderTime(); @@ -341,7 +432,7 @@ mouse_input::poll() { } user_command -mouse_input::command() const { +drivermouse_input::command() const { return ( m_slider.command() != user_command::none ? m_slider.command() : @@ -350,9 +441,9 @@ mouse_input::command() const { } void -mouse_input::default_bindings() { +drivermouse_input::default_bindings() { - m_mousecommands = { + m_buttonbindings = { { "mainctrl:", { user_command::mastercontrollerset, user_command::none } }, @@ -612,4 +703,23 @@ mouse_input::default_bindings() { }; } +user_command +drivermouse_input::adjust_command( user_command Command ) { + + if( ( true == Global.shiftState ) + && ( Command != user_command::none ) ) { + switch( Command ) { + case user_command::mastercontrollerincrease: { Command = user_command::mastercontrollerincreasefast; break; } + case user_command::mastercontrollerdecrease: { Command = user_command::mastercontrollerdecreasefast; break; } + case user_command::secondcontrollerincrease: { Command = user_command::secondcontrollerincreasefast; break; } + case user_command::secondcontrollerdecrease: { Command = user_command::secondcontrollerdecreasefast; break; } + case user_command::independentbrakeincrease: { Command = user_command::independentbrakeincreasefast; break; } + case user_command::independentbrakedecrease: { Command = user_command::independentbrakedecreasefast; break; } + default: { break; } + } + } + + return Command; +} + //--------------------------------------------------------------------------- diff --git a/drivermouseinput.h b/drivermouseinput.h index 4e06c6b4..b8b40a4e 100644 --- a/drivermouseinput.h +++ b/drivermouseinput.h @@ -42,21 +42,25 @@ private: glm::dvec2 m_cursorposition { 0.0 }; }; -class mouse_input { +class drivermouse_input { public: // constructors - mouse_input() { default_bindings(); } + drivermouse_input() = default; // methods bool init(); + bool + recall_bindings(); void button( int const Button, int const Action ); int button( int const Button ) const; void - move( double const Mousex, double const Mousey ); + move( double const Horizontal, double const Vertical ); + void + scroll( double const Xoffset, double const Yoffset ); void poll(); user_command @@ -64,22 +68,32 @@ public: private: // types - struct mouse_commands { + struct button_bindings { user_command left; user_command right; }; - typedef std::unordered_map controlcommands_map; + struct wheel_bindings { + + user_command up; + user_command down; + }; + + typedef std::unordered_map buttonbindings_map; // methods void default_bindings(); + // potentially replaces supplied command with a more relevant one + user_command + adjust_command( user_command Command ); // members command_relay m_relay; mouse_slider m_slider; // virtual control, when active translates intercepted mouse position to a value - controlcommands_map m_mousecommands; + buttonbindings_map m_buttonbindings; + wheel_bindings m_wheelbindings { user_command::mastercontrollerincrease, user_command::mastercontrollerdecrease }; // commands bound to the scroll wheel user_command m_mousecommandleft { user_command::none }; // last if any command issued with left mouse button user_command m_mousecommandright { user_command::none }; // last if any command issued with right mouse button double m_updaterate { 0.075 }; diff --git a/editorkeyboardinput.cpp b/editorkeyboardinput.cpp index 4cd1fe3d..1934ffa7 100644 --- a/editorkeyboardinput.cpp +++ b/editorkeyboardinput.cpp @@ -16,6 +16,7 @@ editorkeyboard_input::init() { default_bindings(); // TODO: re-enable after mode-specific binding import is in place // return recall_bindings(); + bind(); return true; } @@ -30,8 +31,6 @@ editorkeyboard_input::default_bindings() { { user_command::moveup, GLFW_KEY_PAGE_UP }, { user_command::movedown, GLFW_KEY_PAGE_DOWN }, }; - - bind(); } //--------------------------------------------------------------------------- diff --git a/editormode.cpp b/editormode.cpp index 19726fd8..fdcaad9b 100644 --- a/editormode.cpp +++ b/editormode.cpp @@ -87,8 +87,6 @@ editor_mode::update() { simulation::is_ready = true; - m_input.poll(); - return true; } @@ -250,6 +248,12 @@ editor_mode::on_mouse_button( int const Button, int const Action, int const Mods m_input.mouse.button( Button, Action ); } +void +editor_mode::on_event_poll() { + + m_input.poll(); +} + bool editor_mode::mode_translation() const { diff --git a/editormode.h b/editormode.h index 99565f94..2a996caa 100644 --- a/editormode.h +++ b/editormode.h @@ -43,6 +43,8 @@ public: on_mouse_button( int const Button, int const Action, int const Mods ) override; void on_scroll( double const Xoffset, double const Yoffset ) override { ; } + void + on_event_poll() override; private: // types diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 1c88d955..09f52b50 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -110,8 +110,6 @@ keyboard_input::recall_bindings() { } } - bind(); - return true; } @@ -187,15 +185,9 @@ keyboard_input::key( int const Key ) const { void keyboard_input::bind() { - m_bindings.clear(); - for( auto const &bindingsetup : m_bindingsetups ) { - if( bindingsetup.binding != -1 ) { - m_bindings.emplace( - bindingsetup.binding, - bindingsetup.command ); - } + m_bindings[ bindingsetup.binding ] = bindingsetup.command; } // cache movement key bindings m_bindingscache.forward = binding( user_command::moveforward ); diff --git a/scenarioloadermode.h b/scenarioloadermode.h index 18c603d8..630c8655 100644 --- a/scenarioloadermode.h +++ b/scenarioloadermode.h @@ -38,4 +38,6 @@ public: on_mouse_button( int const Button, int const Action, int const Mods ) override { ; } void on_scroll( double const Xoffset, double const Yoffset ) override { ; } + void + on_event_poll() override { ; } }; diff --git a/scene.h b/scene.h index 3dc886a3..8a0745e3 100644 --- a/scene.h +++ b/scene.h @@ -172,8 +172,7 @@ private: enclose_area( scene::basic_node *Node ); // members scene::bounding_area m_area { glm::dvec3(), static_cast( 0.5 * M_SQRT2 * EU07_CELLSIZE ) }; - bool m_active { false }; // whether the cell holds any actual data - // content + bool m_active { false }; // whether the cell holds any actual data content shapenode_sequence m_shapesopaque; // opaque pieces of geometry shapenode_sequence m_shapestranslucent; // translucent pieces of geometry linesnode_sequence m_lines; diff --git a/version.h b/version.h index 3d4afa1c..af63ee2f 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 802 +#define VERSION_MINOR 804 #define VERSION_REVISION 0 From 9830e6c15ed93fef3be2434b1e82f5c25cbd89cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 22 Jul 2018 11:01:11 +0200 Subject: [PATCH 371/426] DynamicBrake parameters in FIZ file --- McZapkie/MOVER.h | 7 +++++++ McZapkie/Mover.cpp | 17 +++++++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 17b27181..2e384ccd 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -859,6 +859,13 @@ public: //CouplerNr: TCouplerNr; {ABu: nr sprzegu podlaczonego w drugim obiekcie} bool IsCoupled = false; /*czy jest sprzezony ale jedzie z tylu*/ int DynamicBrakeType = 0; /*patrz dbrake_**/ + int DynamicBrakeAmpmeters = 2; /*liczba amperomierzy przy hamowaniu ED*/ + double DynamicBrakeRes = 5.8; /*rezystancja oporników przy hamowaniu ED*/ + double TUHEX_Sum = 750; /*nastawa sterownika hamowania ED*/ + double TUHEX_Diff = 10; /*histereza działania sterownika hamowania ED*/ + double TUHEX_MinIw = 60; /*minimalny prąd wzbudzenia przy hamowaniu ED - wynika z chk silnika*/ + double TUHEX_MaxIw = 400; /*maksymalny prąd wzbudzenia przy hamowaniu ED - ograniczenie max siły*/ + int RVentType = 0; /*0 - brak, 1 - jest, 2 - automatycznie wlaczany*/ double RVentnmax = 1.0; /*maks. obroty wentylatorow oporow rozruchowych*/ double RVentCutOff = 0.0; /*rezystancja wylaczania wentylatorow dla RVentType=2*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 7289e340..4a8d9979 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -88,7 +88,6 @@ double TMoverParameters::Current(double n, double U) // w zaleznosci od polozenia nastawnikow MainCtrl i ScndCtrl oraz predkosci obrotowej n // a takze wywala bezpiecznik nadmiarowy gdy za duzy prad lub za male napiecie // jest takze mozliwosc uszkodzenia silnika wskutek nietypowych parametrow - double const ep09resED = 5.8; // TODO: dobrac tak aby sie zgadzalo ze wbudzeniem double R, MotorCurrent; double Rz, Delta, Isf; @@ -166,7 +165,7 @@ double TMoverParameters::Current(double n, double U) { // TODO: zrobic bardziej uniwersalne nie tylko dla EP09 MotorCurrent = - -Max0R(MotorParam[0].fi * (Vadd / (Vadd + MotorParam[0].Isat) - MotorParam[0].fi0), 0) * n * 2.0 / ep09resED; + -Max0R(MotorParam[0].fi * (Vadd / (Vadd + MotorParam[0].Isat) - MotorParam[0].fi0), 0) * n * 2.0 / DynamicBrakeRes; } else if( ( RList[ MainCtrlActualPos ].Bn == 0 ) || ( false == StLinFlag ) ) { @@ -4581,16 +4580,16 @@ double TMoverParameters::TractionForce( double dt ) { } if ((DynamicBrakeType == dbrake_automatic) && (DynamicBrakeFlag)) { - if (((Vadd + abs(Im)) > 760) || (Hamulec->GetEDBCP() < 0.25)) + if (((Vadd + abs(Im)) > TUHEX_Sum + TUHEX_Diff) || (Hamulec->GetEDBCP() < 0.25)) { Vadd -= 500.0 * dt; if (Vadd < 1) Vadd = 0; } - else if ((DynamicBrakeFlag) && ((Vadd + abs(Im)) < 740)) + else if ((DynamicBrakeFlag) && ((Vadd + abs(Im)) < TUHEX_Sum - TUHEX_Diff)) { Vadd += 70.0 * dt; - Vadd = Min0R(Max0R(Vadd, 60), 400); + Vadd = Min0R(Max0R(Vadd, TUHEX_MinIw), TUHEX_MaxIw); } if (Vadd > 0) Mm = MomentumF(Im, Vadd, 0); @@ -8088,6 +8087,7 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { lookup != dynamicbrakes.end() ? lookup->second : dbrake_none; + extract_value(DynamicBrakeAmpmeters, "DBAM", line, ""); } extract_value( MainCtrlPosNo, "MCPN", line, "" ); @@ -8479,6 +8479,10 @@ void TMoverParameters::LoadFIZ_Circuit( std::string const &Input ) { extract_value( ImaxHi, "ImaxHi", Input, "" ); Imin = IminLo; Imax = ImaxLo; + extract_value( TUHEX_Sum, "TUHEX_Sum", Input, "" ); + extract_value( TUHEX_Diff, "TUHEX_Diff", Input, "" ); + extract_value( TUHEX_MaxIw, "TUHEX_MaxIw", Input, "" ); + extract_value( TUHEX_MinIw, "TUHEX_MinIw", Input, "" ); } void TMoverParameters::LoadFIZ_RList( std::string const &Input ) { @@ -8506,6 +8510,7 @@ void TMoverParameters::LoadFIZ_RList( std::string const &Input ) { } extract_value( RVentMinI, "RVentMinI", Input, "" ); extract_value( RVentSpeed, "RVentSpeed", Input, "" ); + extract_value( DynamicBrakeRes, "DynBrakeRes", Input, ""); } void TMoverParameters::LoadFIZ_DList( std::string const &Input ) { @@ -9609,7 +9614,7 @@ double TMoverParameters::ShowCurrentP(int AmpN) const Bn = RList[MainCtrlActualPos].Bn; // ile równoległych gałęzi silników if ((DynamicBrakeType == dbrake_automatic) && (DynamicBrakeFlag)) - Bn = 2; + Bn = DynamicBrakeAmpmeters; if (Power > 0.01) { if (AmpN > 0) // podać prąd w gałęzi From 47d8944d179c2686a31eea065338715a5f8a368f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 5 Aug 2018 13:22:21 +0200 Subject: [PATCH 372/426] build 180805. minor bug fixes --- audiorenderer.cpp | 9 +++++++++ audiorenderer.h | 1 + driverkeyboardinput.cpp | 1 + drivermode.cpp | 2 +- editorkeyboardinput.cpp | 2 ++ keyboardinput.cpp | 10 +++++----- sound.cpp | 8 +++----- version.h | 2 +- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/audiorenderer.cpp b/audiorenderer.cpp index b29057a9..a9b66e47 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -44,10 +44,16 @@ openal_source::play() { ::alGetError(); // pop the error stack ::alSourcePlay( id ); + + ALint state; + ::alGetSourcei( id, AL_SOURCE_STATE, &state ); + is_playing = ( state == AL_PLAYING ); +/* is_playing = ( ::alGetError() == AL_NO_ERROR ? true : false ); +*/ } // stops the playback @@ -78,14 +84,17 @@ openal_source::update( double const Deltatime, glm::vec3 const &Listenervelocity if( id != audio::null_resource ) { + sound_change = false; ::alGetSourcei( id, AL_BUFFERS_PROCESSED, &sound_index ); // for multipart sounds trim away processed sources until only one remains, the last one may be set to looping by the controller + // TBD, TODO: instead of change flag move processed buffer ids to separate queue, for accurate tracking of longer buffer sequences ALuint bufferid; while( ( sound_index > 0 ) && ( sounds.size() > 1 ) ) { ::alSourceUnqueueBuffers( id, 1, &bufferid ); sounds.erase( std::begin( sounds ) ); --sound_index; + sound_change = true; } int state; diff --git a/audiorenderer.h b/audiorenderer.h index d0a89eb0..dbe95758 100644 --- a/audiorenderer.h +++ b/audiorenderer.h @@ -50,6 +50,7 @@ struct openal_source { uint32_sequence sounds; // // buffer_sequence buffers; // sequence of samples the source will emit int sound_index { 0 }; // currently queued sample from the buffer sequence + bool sound_change { false }; // indicates currently queued sample has changed bool is_playing { false }; bool is_looping { false }; sound_properties properties; diff --git a/driverkeyboardinput.cpp b/driverkeyboardinput.cpp index 362c5467..5242d3dd 100644 --- a/driverkeyboardinput.cpp +++ b/driverkeyboardinput.cpp @@ -16,6 +16,7 @@ driverkeyboard_input::init() { default_bindings(); recall_bindings(); bind(); + m_bindingsetups.clear(); return true; } diff --git a/drivermode.cpp b/drivermode.cpp index 504934e7..0667f0a9 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -344,7 +344,7 @@ driver_mode::on_key( int const Key, int const Scancode, int const Action, int co } } - if( Action == GLFW_PRESS ) { + if( Action != GLFW_RELEASE ) { OnKeyDown( Key ); diff --git a/editorkeyboardinput.cpp b/editorkeyboardinput.cpp index 1934ffa7..0e88137a 100644 --- a/editorkeyboardinput.cpp +++ b/editorkeyboardinput.cpp @@ -17,6 +17,8 @@ editorkeyboard_input::init() { // TODO: re-enable after mode-specific binding import is in place // return recall_bindings(); bind(); + m_bindingsetups.clear(); + return true; } diff --git a/keyboardinput.cpp b/keyboardinput.cpp index 09f52b50..1e05bed8 100644 --- a/keyboardinput.cpp +++ b/keyboardinput.cpp @@ -87,7 +87,7 @@ keyboard_input::recall_bindings() { if( bindingkeyname == "shift" ) { binding |= keymodifier::shift; } else if( bindingkeyname == "ctrl" ) { binding |= keymodifier::control; } - else if( bindingkeyname == "none" ) { binding = -1; } + else if( bindingkeyname == "none" ) { binding = 0; } else { // regular key, convert it to glfw key code auto const keylookup = nametokeymap.find( bindingkeyname ); @@ -143,10 +143,10 @@ keyboard_input::key( int const Key, int const Action ) { true ); } + if( Key == -1 ) { return false; } + // store key state - if( Key != -1 ) { - input::keys[ Key ] = Action; - } + input::keys[ Key ] = Action; if( true == is_movement_key( Key ) ) { // if the received key was one of movement keys, it's been handled and we don't need to bother further @@ -187,7 +187,7 @@ keyboard_input::bind() { for( auto const &bindingsetup : m_bindingsetups ) { - m_bindings[ bindingsetup.binding ] = bindingsetup.command; + m_bindings[ bindingsetup.binding ] = bindingsetup.command; } // cache movement key bindings m_bindingscache.forward = binding( user_command::moveforward ); diff --git a/sound.cpp b/sound.cpp index 416cfdb9..0189721c 100644 --- a/sound.cpp +++ b/sound.cpp @@ -533,9 +533,8 @@ sound_source::update_basic( audio::openal_source &Source ) { if( sound( sound_id::begin ).buffer != null_handle ) { // potentially a multipart sound // detect the moment when the sound moves from startup sample to the main - if( ( false == Source.is_looping ) - && ( soundhandle == sound_id::main ) ) { - // when it happens update active sample counters, and activate the looping + if( true == Source.sound_change ) { + // when it happens update active sample counters, and potentially activate the looping update_counter( sound_id::begin, -1 ); update_counter( soundhandle, 1 ); Source.loop( TestFlag( m_flags, sound_flags::looping ) ); @@ -618,8 +617,7 @@ sound_source::update_combined( audio::openal_source &Source ) { if( sound( sound_id::begin ).buffer != null_handle ) { // potentially a multipart sound // detect the moment when the sound moves from startup sample to the main - if( ( false == Source.is_looping ) - && ( soundhandle == ( sound_id::chunk | 0 ) ) ) { + if( true == Source.sound_change ) { // when it happens update active sample counters, and activate the looping update_counter( sound_id::begin, -1 ); update_counter( soundhandle, 1 ); diff --git a/version.h b/version.h index af63ee2f..e33273e4 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 804 +#define VERSION_MINOR 805 #define VERSION_REVISION 0 From e2fdf16fdc53a735ae0f3030c800ed2015f8a28f Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 6 Aug 2018 17:01:20 +0200 Subject: [PATCH 373/426] additional door cab controls, light configuration ai command, line breaker state change sounds, texture scaling crash fix --- Driver.cpp | 166 +++++++++++++------- Driver.h | 1 + DynObj.cpp | 22 ++- DynObj.h | 2 + Gauge.cpp | 14 +- Gauge.h | 1 + McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 8 +- Texture.cpp | 3 + Track.cpp | 8 +- Train.cpp | 338 ++++++++++++++++++++++++++++++++++++---- Train.h | 10 ++ command.cpp | 5 + command.h | 5 + driverkeyboardinput.cpp | 5 + drivermouseinput.cpp | 15 ++ translation.h | 5 + 17 files changed, 510 insertions(+), 99 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 9a6cf96b..cae6bb84 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -27,6 +27,7 @@ http://mozilla.org/MPL/2.0/. #include "simulationtime.h" #include "track.h" #include "station.h" +#include "keyboardinput.h" #include "utilities.h" #define LOGVELOCITY 0 @@ -603,6 +604,17 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) if (pTrack->eType == tt_Cross) { // na skrzyżowaniach trzeba wybrać segment, po którym pojedzie pojazd // dopiero tutaj jest ustalany kierunek segmentu na skrzyżowaniu + int routewanted; + if( false == AIControllFlag ) { + routewanted = ( + input::keys[ GLFW_KEY_LEFT ] != GLFW_RELEASE ? 1 : + input::keys[ GLFW_KEY_RIGHT ] != GLFW_RELEASE ? 2 : + 3 ); + } + else { + routewanted = 1 + std::floor( Random( static_cast( pTrack->RouteCount() ) - 0.001 ) ); + } + sSpeedTable[iLast].iFlags |= ( ( pTrack->CrossSegment( (fLastDir < 0 ? @@ -611,7 +623,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) /* iRouteWanted ) */ - 1 + std::floor( Random( static_cast(pTrack->RouteCount()) - 0.001 ) ) ) + routewanted ) & 0xf ) << 28 ); // ostatnie 4 bity pola flag sSpeedTable[iLast].iFlags &= ~spReverse; // usunięcie flagi kierunku, bo może być błędna if (sSpeedTable[iLast].iFlags < 0) { @@ -1969,8 +1981,7 @@ bool TController::CheckVehicles(TOrders user) fVelMax = -1; // ustalenie prędkości dla składu bool main = true; // czy jest głównym sterującym iDrivigFlags |= moveOerlikons; // zakładamy, że są same Oerlikony - // Ra 2014-09: ustawić moveMultiControl, jeśli wszystkie są w ukrotnieniu (i skrajne mają - // kabinę?) + // Ra 2014-09: ustawić moveMultiControl, jeśli wszystkie są w ukrotnieniu (i skrajne mają kabinę?) while (p) { // sprawdzanie, czy jest głównym sterującym, żeby nie było konfliktu if (p->Mechanik) // jeśli ma obsadę @@ -2016,9 +2027,20 @@ bool TController::CheckVehicles(TOrders user) } if (AIControllFlag) { // jeśli prowadzi komputer - if (OrderCurrentGet() == Obey_train) // jeśli jazda pociągowa - { - Lights(1 + 4 + 16, 2 + 32 + 64); //światła pociągowe (Pc1) i końcówki (Pc5) + if (OrderCurrentGet() == Obey_train) { + // jeśli jazda pociągowa + // światła pociągowe (Pc1) i końcówki (Pc5) + auto const frontlights { ( + ( m_lighthints[ side::front ] != -1 ) ? + m_lighthints[ side::front ] : + light::headlight_left | light::headlight_right | light::headlight_upper ) }; + auto const rearlights { ( + ( m_lighthints[ side::rear ] != -1 ) ? + m_lighthints[ side::rear ] : + light::redmarker_left | light::redmarker_right | light::rearendsignals ) }; + Lights( + frontlights, + rearlights ); #if LOGPRESS == 0 AutoRewident(); // nastawianie hamulca do jazdy pociągowej #endif @@ -2090,6 +2112,9 @@ bool TController::CheckVehicles(TOrders user) JumpToNextOrder(); // zmianę kierunku też można olać, ale zmienić kierunek // skanowania! } + break; + default: + break; } // Ra 2014-09: tymczasowo prymitywne ustawienie warunku pod kątem SN61 if( ( mvOccupied->TrainType == dt_EZT ) @@ -3249,6 +3274,7 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N mvOccupied->RunInternalCommand(); // rozpoznaj komende bo lokomotywa jej nie rozpoznaje return true; // załatwione } + if (NewCommand == "Overhead") { // informacja o stanie sieci trakcyjnej fOverhead1 = @@ -3257,13 +3283,15 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N // opuszczonym i ograniczeniem prędkości) return true; // załatwione } - else if (NewCommand == "Emergency_brake") // wymuszenie zatrzymania, niezależnie kto prowadzi + + if (NewCommand == "Emergency_brake") // wymuszenie zatrzymania, niezależnie kto prowadzi { // Ra: no nadal nie jest zbyt pięknie SetVelocity(0, 0, reason); mvOccupied->PutCommand("Emergency_brake", 1.0, 1.0, mvOccupied->Loc); return true; // załatwione } - else if (NewCommand.compare(0, 10, "Timetable:") == 0) + + if (NewCommand.compare(0, 10, "Timetable:") == 0) { // przypisanie nowego rozkładu jazdy, również prowadzonemu przez użytkownika NewCommand.erase(0, 10); // zostanie nazwa pliku z rozkładem #if LOGSTOPS @@ -3374,6 +3402,7 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N // TrainNumber=floor(NewValue1); //i co potem ??? return true; // załatwione } + if (NewCommand == "SetVelocity") { if (NewLocation) @@ -3393,16 +3422,20 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N iDrivigFlags |= moveStopHere; // stać do momentu podania komendy jazdy SetVelocity(NewValue1, NewValue2, reason); // bylo: nic nie rob bo SetVelocity zewnetrznie // jest wywolywane przez dynobj.cpp + return true; } - else if (NewCommand == "SetProximityVelocity") + + if (NewCommand == "SetProximityVelocity") { /* if (SetProximityVelocity(NewValue1,NewValue2)) if (NewLocation) vCommandLocation=*NewLocation; */ + return true; } - else if (NewCommand == "ShuntVelocity") + + if (NewCommand == "ShuntVelocity") { // uruchomienie jazdy manewrowej bądź zmiana prędkości if (NewLocation) vCommandLocation = *NewLocation; @@ -3426,15 +3459,21 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N iDrivigFlags |= moveStopHere; // ma stać w miejscu if (fabs(NewValue1) > 2.0) // o ile wartość jest sensowna (-1 nie jest konkretną wartością) fShuntVelocity = fabs(NewValue1); // zapamiętanie obowiązującej prędkości dla manewrów + + return true; } - else if (NewCommand == "Wait_for_orders") + + if (NewCommand == "Wait_for_orders") { // oczekiwanie; NewValue1 - czas oczekiwania, -1 = na inną komendę if (NewValue1 > 0.0 ? NewValue1 > fStopTime : false) fStopTime = NewValue1; // Ra: włączenie czekania bez zmiany komendy else OrderList[OrderPos] = Wait_for_orders; // czekanie na komendę (albo dać OrderPos=0) + + return true; } - else if (NewCommand == "Prepare_engine") + + if (NewCommand == "Prepare_engine") { // włączenie albo wyłączenie silnika (w szerokim sensie) OrdersClear(); // czyszczenie tabelki rozkazów, aby nic dalej nie robił if (NewValue1 == 0.0) @@ -3442,8 +3481,10 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N else if (NewValue1 > 0.0) OrderNext(Prepare_engine); // odpalić silnik (wyłączyć wszystko, co się da) // po załączeniu przejdzie do kolejnej komendy, po wyłączeniu na Wait_for_orders + return true; } - else if (NewCommand == "Change_direction") + + if (NewCommand == "Change_direction") { TOrders o = OrderList[OrderPos]; // co robił przed zmianą kierunku if (!iEngineActive) @@ -3469,16 +3510,21 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N if (mvOccupied->Vel >= 1.0) // jeśli jedzie iDrivigFlags &= ~moveStartHorn; // to bez trąbienia po ruszeniu z zatrzymania // Change_direction wykona się samo i następnie przejdzie do kolejnej komendy + return true; } - else if (NewCommand == "Obey_train") + + if (NewCommand == "Obey_train") { if (!iEngineActive) OrderNext(Prepare_engine); // trzeba odpalić silnik najpierw OrderNext(Obey_train); // if (NewValue1>0) TrainNumber=floor(NewValue1); //i co potem ??? OrderCheck(); // jeśli jazda pociągowa teraz, to wykonać niezbędne operacje + + return true; } - else if (NewCommand == "Shunt") + + if (NewCommand == "Shunt") { // NewValue1 - ilość wagonów (-1=wszystkie); NewValue2: 0=odczep, 1..63=dołącz, -1=bez zmian //-3,-y - podłączyć do całego stojącego składu (sprzęgiem y>=1), zmienić kierunek i czekać w // trybie pociągowym @@ -3552,70 +3598,73 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N if (VelDesired==0) SetVelocity(20,0); //to niech jedzie */ + return true; } - else if (NewCommand == "Jump_to_first_order") + + if( NewCommand == "Jump_to_first_order" ) { JumpToFirstOrder(); - else if (NewCommand == "Jump_to_order") + return true; + } + + if (NewCommand == "Jump_to_order") { - if (NewValue1 == -1.0) + if( NewValue1 == -1.0 ) { JumpToNextOrder(); + } else if ((NewValue1 >= 0) && (NewValue1 < maxorders)) { OrderPos = floor(NewValue1); - if (!OrderPos) - OrderPos = 1; // zgodność wstecz: dopiero pierwsza uruchamia + if( !OrderPos ) { + // zgodność wstecz: dopiero pierwsza uruchamia + OrderPos = 1; + } #if LOGORDERS WriteLog("--> Jump_to_order"); OrdersDump(); #endif } - /* - if (WriteLogFlag) - { - append(AIlogFile); - writeln(AILogFile,ElapsedTime:5:2," - new order: ",Order2Str( OrderList[OrderPos])," @ - ",OrderPos); - close(AILogFile); - } - */ + return true; } - /* //ta komenda jest teraz skanowana, więc wysyłanie jej eventem nie ma sensu - else if (NewCommand=="OutsideStation") //wskaznik W5 - { - if (OrderList[OrderPos]==Obey_train) - SetVelocity(NewValue1,NewValue2,stopOut); //koniec stacji - predkosc szlakowa - else //manewry - zawracaj - { - iDirectionOrder=-iDirection; //zmiana na przeciwny niż obecny - OrderNext(Change_direction); //zmiana kierunku - OrderNext(Shunt); //a dalej manewry - iDrivigFlags&=~moveStartHorn; //bez trąbienia po zatrzymaniu - } - } - */ - else if (NewCommand == "Warning_signal") + + if (NewCommand == "Warning_signal") { - if (AIControllFlag) // poniższa komenda nie jest wykonywana przez użytkownika - if (NewValue1 > 0) - { + if( AIControllFlag ) { + // poniższa komenda nie jest wykonywana przez użytkownika + if( NewValue1 > 0 ) { fWarningDuration = NewValue1; // czas trąbienia mvOccupied->WarningSignal = NewValue2; // horn combination flag } + } + return true; } - else if (NewCommand == "Radio_channel") - { // wybór kanału radiowego (którego powinien używać AI, ręczny maszynista musi go ustawić sam) - if (NewValue1 >= 0) // wartości ujemne są zarezerwowane, -1 = nie zmieniać kanału - { + + if (NewCommand == "Radio_channel") { + // wybór kanału radiowego (którego powinien używać AI, ręczny maszynista musi go ustawić sam) + if (NewValue1 >= 0) { + // wartości ujemne są zarezerwowane, -1 = nie zmieniać kanału iRadioChannel = NewValue1; - if (iGuardRadio) - iGuardRadio = iRadioChannel; // kierownikowi też zmienić + if( iGuardRadio ) { + // kierownikowi też zmienić + iGuardRadio = iRadioChannel; + } } // NewValue2 może zawierać dodatkowo oczekiwany kod odpowiedzi, np. dla W29 "nawiązać // łączność radiową z dyżurnym ruchu odcinkowym" + return true; } - else - return false; // nierozpoznana - wysłać bezpośrednio do pojazdu - return true; // komenda została przetworzona + + if( NewCommand == "SetLights" ) { + // set consist lights pattern hints + m_lighthints[ side::front ] = static_cast( NewValue1 ); + m_lighthints[ side::rear ] = static_cast( NewValue2 ); + if( OrderCurrentGet() == Obey_train ) { + // light hints only apply in the obey_train mode + CheckVehicles(); + } + return true; + } + + return false; // nierozpoznana - wysłać bezpośrednio do pojazdu }; void TController::PhysicsLog() @@ -5465,6 +5514,11 @@ void TController::JumpToFirstOrder() void TController::OrderCheck() { // reakcja na zmianę rozkazu + + if( OrderList[ OrderPos ] != Obey_train ) { + // reset light hints + m_lighthints[ side::front ] = m_lighthints[ side::rear ] = -1; + } if( OrderList[ OrderPos ] & ( Shunt | Connect | Obey_train ) ) { CheckVehicles(); // sprawdzić światła } diff --git a/Driver.h b/Driver.h index 791e7721..581ba9b4 100644 --- a/Driver.h +++ b/Driver.h @@ -241,6 +241,7 @@ private: int iRadioChannel = 1; // numer aktualnego kanału radiowego int iGuardRadio = 0; // numer kanału radiowego kierownika (0, gdy nie używa radia) sound_source tsGuardSignal { sound_placement::internal }; + std::array m_lighthints { -1 }; // suggested light patterns public: double AccPreferred = 0.0; // preferowane przyspieszenie (wg psychiki kierującego, zmniejszana przy wykryciu kolizji) double AccDesired = AccPreferred; // przyspieszenie, jakie ma utrzymywać (<0:nie przyspieszaj,<-0.1:hamuj) diff --git a/DynObj.cpp b/DynObj.cpp index 654f881a..15a4cec7 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -5690,6 +5690,14 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_powertrainsounds.rsEngageSlippery.m_frequencyfactor /= ( 1 + MoverParameters->nmax ); } + else if( token == "linebreakerclose:" ) { + m_powertrainsounds.linebreaker_close.deserialize( parser, sound_type::single ); + m_powertrainsounds.linebreaker_close.owner( this ); + } + else if( token == "linebreakeropen:" ) { + m_powertrainsounds.linebreaker_open.deserialize( parser, sound_type::single ); + m_powertrainsounds.linebreaker_open.owner( this ); + } else if( token == "relay:" ) { // styczniki itp: m_powertrainsounds.motor_relay.deserialize( parser, sound_type::single ); @@ -6421,16 +6429,26 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( engine_state_last != Vehicle.Mains ) { if( true == Vehicle.Mains ) { - // main circuit/engine activation // TODO: separate engine and main circuit + // engine activation engine_ignition .pitch( engine_ignition.m_frequencyoffset + engine_ignition.m_frequencyfactor * 1.f ) .gain( engine_ignition.m_amplitudeoffset + engine_ignition.m_amplitudefactor * 1.f ) .play( sound_flags::exclusive ); + // main circuit activation + linebreaker_close + .pitch( linebreaker_close.m_frequencyoffset + linebreaker_close.m_frequencyfactor * 1.f ) + .gain( linebreaker_close.m_amplitudeoffset + linebreaker_close.m_amplitudefactor * 1.f ) + .play(); } else { - // main circuit/engine deactivation + // engine deactivation engine_ignition.stop(); + // main circuit + linebreaker_open + .pitch( linebreaker_open.m_frequencyoffset + linebreaker_open.m_frequencyfactor * 1.f ) + .gain( linebreaker_open.m_amplitudeoffset + linebreaker_open.m_amplitudefactor * 1.f ) + .play(); } engine_state_last = Vehicle.Mains; } diff --git a/DynObj.h b/DynObj.h index 8d5f75f4..8d0f5de6 100644 --- a/DynObj.h +++ b/DynObj.h @@ -331,6 +331,8 @@ private: sound_source dsbWejscie_na_bezoporow { sound_placement::engine }; // moved from cab sound_source motor_parallel { sound_placement::engine }; // moved from cab sound_source motor_shuntfield { sound_placement::engine }; + sound_source linebreaker_close { sound_placement::engine }; + sound_source linebreaker_open { sound_placement::engine }; sound_source rsWentylator { sound_placement::engine }; // McZapkie-030302 sound_source engine { sound_placement::engine }; // generally diesel engine sound_source engine_ignition { sound_placement::engine }; // moved from cab diff --git a/Gauge.cpp b/Gauge.cpp index 207c9389..7666055e 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -215,7 +215,8 @@ TGauge::UpdateValue( float fNewDesired, sound_source *Fallbacksound ) { m_targetvalue = fNewDesired; // if there's any sound associated with new requested value, play it // check value-specific table first... - if( desiredtimes100 % 100 == 0 ) { + auto const fullinteger { desiredtimes100 % 100 == 0 }; + if( fullinteger ) { // filter out values other than full integers auto const lookup = m_soundfxvalues.find( desiredtimes100 / 100 ); if( lookup != m_soundfxvalues.end() ) { @@ -223,21 +224,26 @@ TGauge::UpdateValue( float fNewDesired, sound_source *Fallbacksound ) { return; } } + else { + // toggle the control to continous range/exclusive sound mode from now on + m_soundtype = sound_flags::exclusive; + } // ...and if there isn't any, fall back on the basic set... auto const currentvalue = GetValue(); + // HACK: crude way to discern controls with continuous and quantized value range if( ( currentvalue < fNewDesired ) && ( false == m_soundfxincrease.empty() ) ) { // shift up - m_soundfxincrease.play( sound_flags::exclusive ); + m_soundfxincrease.play( m_soundtype ); } else if( ( currentvalue > fNewDesired ) && ( false == m_soundfxdecrease.empty() ) ) { // shift down - m_soundfxdecrease.play( sound_flags::exclusive ); + m_soundfxdecrease.play( m_soundtype ); } else if( Fallbacksound != nullptr ) { // ...and if that fails too, try the provided fallback sound from legacy system - Fallbacksound->play( sound_flags::exclusive ); + Fallbacksound->play( m_soundtype ); } }; diff --git a/Gauge.h b/Gauge.h index 9baeca83..a73aad2f 100644 --- a/Gauge.h +++ b/Gauge.h @@ -76,6 +76,7 @@ private: double *dData { nullptr }; int *iData; }; + int m_soundtype { 0 }; // toggle between exclusive and multiple sound generation sound_source m_soundtemplate { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // shared properties for control's sounds sound_source m_soundfxincrease { m_soundtemplate }; // sound associated with increasing control's value sound_source m_soundfxdecrease { m_soundtemplate }; // sound associated with decreasing control's value diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 2e384ccd..278f22a6 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -951,6 +951,7 @@ public: int DoorOpenCtrl = 0; int DoorCloseCtrl = 0; /*0: przez pasazera, 1: przez maszyniste, 2: samoczynne (zamykanie)*/ double DoorStayOpen = 0.0; /*jak dlugo otwarte w przypadku DoorCloseCtrl=2*/ bool DoorClosureWarning = false; /*czy jest ostrzeganie przed zamknieciem*/ + bool DoorClosureWarningAuto = false; // departure signal plays automatically while door closing button is held down double DoorOpenSpeed = 1.0; double DoorCloseSpeed = 1.0; /*predkosc otwierania i zamykania w j.u. */ double DoorMaxShiftL = 0.5; double DoorMaxShiftR = 0.5; double DoorMaxPlugShift = 0.1;/*szerokosc otwarcia lub kat*/ int DoorOpenMethod = 2; /*sposob otwarcia - 1: przesuwne, 2: obrotowe, 3: trójelementowe*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 4a8d9979..25133abb 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -7853,11 +7853,9 @@ void TMoverParameters::LoadFIZ_Doors( std::string const &line ) { else if( openmethod == "Fold" ) { DoorOpenMethod = 3; } //3 submodele się obracają else if( openmethod == "Plug" ) { DoorOpenMethod = 4; } //odskokowo-przesuwne - std::string closurewarning; extract_value( closurewarning, "DoorClosureWarning", line, "" ); - DoorClosureWarning = ( closurewarning == "Yes" ); - - std::string doorblocked; extract_value( doorblocked, "DoorBlocked", line, "" ); - DoorBlocked = ( doorblocked == "Yes" ); + extract_value( DoorClosureWarning, "DoorClosureWarning", line, "" ); + extract_value( DoorClosureWarningAuto, "DoorClosureWarningAuto", line, "" ); + extract_value( DoorBlocked, "DoorBlocked", line, "" ); extract_value( PlatformSpeed, "PlatformSpeed", line, "" ); extract_value( PlatformMaxShift, "PlatformMaxShift", line, "" ); diff --git a/Texture.cpp b/Texture.cpp index 6ab10f62..857ad9e1 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -698,6 +698,9 @@ opengl_texture::downsize( GLuint const Format ) { } WriteLog( "Texture size exceeds specified limits, downsampling data" ); + // trim potential odd texture sizes + data_width -= ( data_width % 2 ); + data_height -= ( data_height % 2 ); switch( Format ) { case GL_RGB: { downsample< glm::tvec3 >( data_width, data_height, data.data() ); break; } diff --git a/Track.cpp b/Track.cpp index 31787522..497ddfb2 100644 --- a/Track.cpp +++ b/Track.cpp @@ -2372,18 +2372,18 @@ int TTrack::CrossSegment(int from, int into) switch (into) { case 0: // stop -// WriteLog( "Stopping in P" + to_string( from + 1 ) + " on " + pMyNode->asName ); +// WriteLog( "Stopping in P" + to_string( from + 1 ) + " on " + name() ); break; case 1: // left -// WriteLog( "Turning left from P" + to_string( from + 1 ) + " on " + pMyNode->asName ); +// WriteLog( "Turning left from P" + to_string( from + 1 ) + " on " + name() ); i = (SwitchExtension->iRoads == 4) ? iLewo4[from] : iLewo3[from]; break; case 2: // right -// WriteLog( "Turning right from P" + to_string( from + 1 ) + " on " + pMyNode->asName ); +// WriteLog( "Turning right from P" + to_string( from + 1 ) + " on " + name() ); i = (SwitchExtension->iRoads == 4) ? iPrawo4[from] : iPrawo3[from]; break; case 3: // stright -// WriteLog( "Going straight from P" + to_string( from + 1 ) + " on " + pMyNode->asName ); +// WriteLog( "Going straight from P" + to_string( from + 1 ) + " on " + name() ); i = (SwitchExtension->iRoads == 4) ? iProsto4[from] : iProsto3[from]; break; } diff --git a/Train.cpp b/Train.cpp index 386ebefa..56628dce 100644 --- a/Train.cpp +++ b/Train.cpp @@ -313,6 +313,11 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::doorlocktoggle, &TTrain::OnCommand_doorlocktoggle }, { user_command::doortoggleleft, &TTrain::OnCommand_doortoggleleft }, { user_command::doortoggleright, &TTrain::OnCommand_doortoggleright }, + { user_command::dooropenleft, &TTrain::OnCommand_dooropenleft }, + { user_command::dooropenright, &TTrain::OnCommand_dooropenright }, + { user_command::doorcloseleft, &TTrain::OnCommand_doorcloseleft }, + { user_command::doorcloseright, &TTrain::OnCommand_doorcloseright }, + { user_command::doorcloseall, &TTrain::OnCommand_doorcloseall }, { user_command::carcouplingincrease, &TTrain::OnCommand_carcouplingincrease }, { user_command::carcouplingdisconnect, &TTrain::OnCommand_carcouplingdisconnect }, { user_command::departureannounce, &TTrain::OnCommand_departureannounce }, @@ -3725,24 +3730,106 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman Train->mvOccupied->DoorLeftOpened : Train->mvOccupied->DoorRightOpened ) ) { // open - if( Train->mvOccupied->DoorOpenCtrl != control_t::driver ) { - return; - } - if( Train->mvOccupied->ActiveCab == 1 ) { - Train->mvOccupied->DoorLeft( true ); - } - else { - // in the rear cab sides are reversed... - Train->mvOccupied->DoorRight( true ); - } - // visual feedback - Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); + OnCommand_dooropenleft( Train, Command ); } else { // close - if( Train->mvOccupied->DoorCloseCtrl != control_t::driver ) { + if( ( Train->ggDoorAllOffButton.SubModel != nullptr ) + && ( Train->ggDoorLeftOffButton.SubModel == nullptr ) ) { + // OnCommand_doorcloseall( Train, Command ); + // if two-button setup lacks dedicated closing button require the user to press appropriate button manually return; } + else { + OnCommand_doorcloseleft( Train, Command ); + } + } + } + else if( Command.action == GLFW_RELEASE ) { + + if( true == ( + Train->mvOccupied->ActiveCab == 1 ? + Train->mvOccupied->DoorLeftOpened : + Train->mvOccupied->DoorRightOpened ) ) { + // open + if( ( Train->mvOccupied->DoorClosureWarningAuto ) + && ( Train->mvOccupied->DepartureSignal ) ) { + // complete closing the doors + if( ( Train->ggDoorAllOffButton.SubModel != nullptr ) + && ( Train->ggDoorLeftOffButton.SubModel == nullptr ) ) { + // OnCommand_doorcloseall( Train, Command ); + // if two-button setup lacks dedicated closing button require the user to press appropriate button manually + return; + } + else { + OnCommand_doorcloseleft( Train, Command ); + } + } + else { + OnCommand_dooropenleft( Train, Command ); + } + } + else { + // close + if( ( Train->ggDoorAllOffButton.SubModel != nullptr ) + && ( Train->ggDoorLeftOffButton.SubModel == nullptr ) ) { + // OnCommand_doorcloseall( Train, Command ); + // if two-button setup lacks dedicated closing button require the user to press appropriate button manually + return; + } + else { + OnCommand_doorcloseleft( Train, Command ); + } + } + } +} + +void TTrain::OnCommand_dooropenleft( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // NOTE: test how the door state check works with consists where the occupied vehicle doesn't have opening doors + if( Train->mvOccupied->DoorOpenCtrl != control_t::driver ) { + return; + } + if( Train->mvOccupied->ActiveCab == 1 ) { + Train->mvOccupied->DoorLeft( true ); + } + else { + // in the rear cab sides are reversed... + Train->mvOccupied->DoorRight( true ); + } + // visual feedback + if( Train->ggDoorLeftOnButton.SubModel != nullptr ) { + // two separate impulse switches + Train->ggDoorLeftOnButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // single two-state switch + Train->ggDoorLeftButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + if( Train->ggDoorLeftOnButton.SubModel != nullptr ) { + // two separate impulse switches + Train->ggDoorLeftOnButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + } +} + +void TTrain::OnCommand_doorcloseleft( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + if( Train->mvOccupied->DoorCloseCtrl != control_t::driver ) { + return; + } + + if( Train->mvOccupied->DoorClosureWarningAuto ) { + // automatic departure signal delays actual door closing until the button is released + Train->mvOccupied->signal_departure( true ); + } + else { // TODO: move door opening/closing to the update, so the switch animation doesn't hinge on door working if( Train->mvOccupied->ActiveCab == 1 ) { Train->mvOccupied->DoorLeft( false ); @@ -3751,10 +3838,36 @@ void TTrain::OnCommand_doortoggleleft( TTrain *Train, command_data const &Comman // in the rear cab sides are reversed... Train->mvOccupied->DoorRight( false ); } - // visual feedback + } + // visual feedback + if( Train->ggDoorLeftOffButton.SubModel != nullptr ) { + // two separate switches to open and close the door + Train->ggDoorLeftOffButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // single two-state switch Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); } } + else if( Command.action == GLFW_RELEASE ) { + + if( Train->mvOccupied->DoorClosureWarningAuto ) { + // automatic departure signal delays actual door closing until the button is released + Train->mvOccupied->signal_departure( false ); + // now we can actually close the door + if( Train->mvOccupied->ActiveCab == 1 ) { + Train->mvOccupied->DoorLeft( false ); + } + else { + // in the rear cab sides are reversed... + Train->mvOccupied->DoorRight( false ); + } + } + // visual feedback + // dedicated closing buttons are presumed to be impulse switches and return automatically to neutral position + if( Train->ggDoorLeftOffButton.SubModel ) + Train->ggDoorLeftOffButton.UpdateValue( 0.0, Train->dsbSwitch ); + } } void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Command ) { @@ -3766,24 +3879,107 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma Train->mvOccupied->DoorRightOpened : Train->mvOccupied->DoorLeftOpened ) ) { // open - if( Train->mvOccupied->DoorOpenCtrl != control_t::driver ) { - return; - } - if( Train->mvOccupied->ActiveCab == 1 ) { - Train->mvOccupied->DoorRight( true ); - } - else { - // in the rear cab sides are reversed... - Train->mvOccupied->DoorLeft( true ); - } - // visual feedback - Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); + OnCommand_dooropenright( Train, Command ); } else { // close - if( Train->mvOccupied->DoorCloseCtrl != control_t::driver ) { + if( ( Train->ggDoorAllOffButton.SubModel != nullptr ) + && ( Train->ggDoorRightOffButton.SubModel == nullptr ) ) { + // OnCommand_doorcloseall( Train, Command ); + // if two-button setup lacks dedicated closing button require the user to press appropriate button manually return; } + else { + OnCommand_doorcloseright( Train, Command ); + } + } + } + else if( Command.action == GLFW_RELEASE ) { + + if( true == ( + Train->mvOccupied->ActiveCab == 1 ? + Train->mvOccupied->DoorRightOpened : + Train->mvOccupied->DoorLeftOpened ) ) { + // open + if( ( Train->mvOccupied->DoorClosureWarningAuto ) + && ( Train->mvOccupied->DepartureSignal ) ) { + // complete closing the doors + if( ( Train->ggDoorAllOffButton.SubModel != nullptr ) + && ( Train->ggDoorRightOffButton.SubModel == nullptr ) ) { + // OnCommand_doorcloseall( Train, Command ); + // if two-button setup lacks dedicated closing button require the user to press appropriate button manually + return; + } + else { + OnCommand_doorcloseright( Train, Command ); + } + } + else { + OnCommand_dooropenright( Train, Command ); + } + } + else { + // close + if( ( Train->ggDoorAllOffButton.SubModel != nullptr ) + && ( Train->ggDoorRightOffButton.SubModel == nullptr ) ) { + // OnCommand_doorcloseall( Train, Command ); + // if two-button setup lacks dedicated closing button require the user to press appropriate button manually + return; + } + else { + OnCommand_doorcloseright( Train, Command ); + } + } + } +} + +void TTrain::OnCommand_dooropenright( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + // NOTE: test how the door state check works with consists where the occupied vehicle doesn't have opening doors + if( Train->mvOccupied->DoorOpenCtrl != control_t::driver ) { + return; + } + if( Train->mvOccupied->ActiveCab == 1 ) { + Train->mvOccupied->DoorRight( true ); + } + else { + // in the rear cab sides are reversed... + Train->mvOccupied->DoorLeft( true ); + } + // visual feedback + if( Train->ggDoorRightOnButton.SubModel != nullptr ) { + // two separate impulse switches + Train->ggDoorRightOnButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // single two-state switch + Train->ggDoorRightButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + if( Train->ggDoorRightOnButton.SubModel != nullptr ) { + // two separate impulse switches + Train->ggDoorRightOnButton.UpdateValue( 0.0, Train->dsbSwitch ); + } + } +} + +void TTrain::OnCommand_doorcloseright( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_PRESS ) { + + if( Train->mvOccupied->DoorCloseCtrl != control_t::driver ) { + return; + } + + if( Train->mvOccupied->DoorClosureWarningAuto ) { + // automatic departure signal delays actual door closing until the button is released + Train->mvOccupied->signal_departure( true ); + } + else { + // TODO: move door opening/closing to the update, so the switch animation doesn't hinge on door working if( Train->mvOccupied->ActiveCab == 1 ) { Train->mvOccupied->DoorRight( false ); } @@ -3791,10 +3987,81 @@ void TTrain::OnCommand_doortoggleright( TTrain *Train, command_data const &Comma // in the rear cab sides are reversed... Train->mvOccupied->DoorLeft( false ); } - // visual feedback + } + // visual feedback + if( Train->ggDoorRightOffButton.SubModel != nullptr ) { + // two separate switches to open and close the door + Train->ggDoorRightOffButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + // single two-state switch Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); } } + else if( Command.action == GLFW_RELEASE ) { + + if( Train->mvOccupied->DoorClosureWarningAuto ) { + // automatic departure signal delays actual door closing until the button is released + Train->mvOccupied->signal_departure( false ); + // now we can actually close the door + if( Train->mvOccupied->ActiveCab == 1 ) { + Train->mvOccupied->DoorRight( false ); + } + else { + // in the rear cab sides are reversed... + Train->mvOccupied->DoorLeft( false ); + } + } + // visual feedback + // dedicated closing buttons are presumed to be impulse switches and return automatically to neutral position + if( Train->ggDoorRightOffButton.SubModel ) + Train->ggDoorRightOffButton.UpdateValue( 0.0, Train->dsbSwitch ); + } +} + +void TTrain::OnCommand_doorcloseall( TTrain *Train, command_data const &Command ) { + + if( Train->ggDoorAllOffButton.SubModel == nullptr ) { + // TODO: expand definition of cab controls so we can know if the control is present without testing for presence of 3d switch + if( Command.action == GLFW_PRESS ) { + WriteLog( "Close All Doors switch is missing, or wasn't defined" ); + } + return; + } + + if( Command.action == GLFW_PRESS ) { + + if( Train->mvOccupied->DoorCloseCtrl != control_t::driver ) { + return; + } + + if( Train->mvOccupied->DoorClosureWarningAuto ) { + // automatic departure signal delays actual door closing until the button is released + Train->mvOccupied->signal_departure( true ); + } + else { + Train->mvOccupied->DoorRight( false ); + Train->mvOccupied->DoorLeft( false ); + } + // visual feedback + Train->ggDoorLeftButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->ggDoorRightButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Train->ggDoorAllOffButton.SubModel ) + Train->ggDoorAllOffButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else if( Command.action == GLFW_RELEASE ) { + // release the button + if( Train->mvOccupied->DoorClosureWarningAuto ) { + // automatic departure signal delays actual door closing until the button is released + Train->mvOccupied->signal_departure( false ); + // now we can actually close the door + Train->mvOccupied->DoorRight( false ); + Train->mvOccupied->DoorLeft( false ); + } + // visual feedback + if( Train->ggDoorAllOffButton.SubModel ) + Train->ggDoorAllOffButton.UpdateValue( 0.0 ); + } } void TTrain::OnCommand_carcouplingincrease( TTrain *Train, command_data const &Command ) { @@ -5231,6 +5498,11 @@ bool TTrain::Update( double const Deltatime ) // NBMX wrzesien 2003 - drzwi ggDoorLeftButton.Update(); ggDoorRightButton.Update(); + ggDoorLeftOnButton.Update(); + ggDoorRightOnButton.Update(); + ggDoorLeftOffButton.Update(); + ggDoorRightOffButton.Update(); + ggDoorAllOffButton.Update(); ggDoorSignallingButton.Update(); // NBMX dzwignia sprezarki ggCompressorButton.Update(); @@ -6391,6 +6663,11 @@ void TTrain::clear_cab_controls() ggRadioTest.Clear(); ggDoorLeftButton.Clear(); ggDoorRightButton.Clear(); + ggDoorLeftOnButton.Clear(); + ggDoorRightOnButton.Clear(); + ggDoorLeftOffButton.Clear(); + ggDoorRightOffButton.Clear(); + ggDoorAllOffButton.Clear(); ggTrainHeatingButton.Clear(); ggSignallingButton.Clear(); ggDoorSignallingButton.Clear(); @@ -6908,6 +7185,11 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "stlinoff_bt:", ggStLinOffButton }, { "door_left_sw:", ggDoorLeftButton }, { "door_right_sw:", ggDoorRightButton }, + { "doorlefton_sw:", ggDoorLeftOnButton }, + { "doorrighton_sw:", ggDoorRightOnButton }, + { "doorleftoff_sw:", ggDoorLeftOffButton }, + { "doorrightoff_sw:", ggDoorRightOffButton }, + { "dooralloff_sw:", ggDoorAllOffButton }, { "departure_signal_bt:", ggDepartureSignalButton }, { "upperlight_sw:", ggUpperLightButton }, { "leftlight_sw:", ggLeftLightButton }, diff --git a/Train.h b/Train.h index 14d1510f..5f80c0a3 100644 --- a/Train.h +++ b/Train.h @@ -297,6 +297,11 @@ class TTrain static void OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleright( TTrain *Train, command_data const &Command ); + static void OnCommand_dooropenleft( TTrain *Train, command_data const &Command ); + static void OnCommand_dooropenright( TTrain *Train, command_data const &Command ); + static void OnCommand_doorcloseleft( TTrain *Train, command_data const &Command ); + static void OnCommand_doorcloseright( TTrain *Train, command_data const &Command ); + static void OnCommand_doorcloseall( TTrain *Train, command_data const &Command ); static void OnCommand_carcouplingincrease( TTrain *Train, command_data const &Command ); static void OnCommand_carcouplingdisconnect( TTrain *Train, command_data const &Command ); static void OnCommand_departureannounce( TTrain *Train, command_data const &Command ); @@ -416,6 +421,11 @@ public: // reszta może by?publiczna // NBMX wrzesien 2003 - obsluga drzwi TGauge ggDoorLeftButton; TGauge ggDoorRightButton; + TGauge ggDoorLeftOnButton; + TGauge ggDoorRightOnButton; + TGauge ggDoorLeftOffButton; + TGauge ggDoorRightOffButton; + TGauge ggDoorAllOffButton; TGauge ggDepartureSignalButton; // Winger 160204 - obsluga pantografow - ZROBIC diff --git a/command.cpp b/command.cpp index f3acb430..259e6f7a 100644 --- a/command.cpp +++ b/command.cpp @@ -142,6 +142,11 @@ commanddescription_sequence Commands_descriptions = { { "carcouplingdisconnect", command_target::vehicle }, { "doortoggleleft", command_target::vehicle }, { "doortoggleright", command_target::vehicle }, + { "dooropenleft", command_target::vehicle }, + { "dooropenright", command_target::vehicle }, + { "doorlcloseleft", command_target::vehicle }, + { "doorcloseright", command_target::vehicle }, + { "doorcloseall", command_target::vehicle }, { "departureannounce", command_target::vehicle }, { "doorlocktoggle", command_target::vehicle }, { "pantographcompressorvalvetoggle", command_target::vehicle }, diff --git a/command.h b/command.h index 2b9dd446..4fa04d00 100644 --- a/command.h +++ b/command.h @@ -135,6 +135,11 @@ enum class user_command { carcouplingdisconnect, doortoggleleft, doortoggleright, + dooropenleft, + dooropenright, + doorcloseleft, + doorcloseright, + doorcloseall, departureannounce, doorlocktoggle, pantographcompressorvalvetoggle, diff --git a/driverkeyboardinput.cpp b/driverkeyboardinput.cpp index 5242d3dd..60fa407c 100644 --- a/driverkeyboardinput.cpp +++ b/driverkeyboardinput.cpp @@ -144,6 +144,11 @@ driverkeyboard_input::default_bindings() { { user_command::carcouplingdisconnect, GLFW_KEY_DELETE }, { user_command::doortoggleleft, GLFW_KEY_COMMA }, { user_command::doortoggleright, GLFW_KEY_PERIOD }, + // dooropenleft, + // dooropenright, + // doorcloseleft, + // doorcloseright, + { user_command::doorcloseall, GLFW_KEY_SLASH | keymodifier::control }, { user_command::departureannounce, GLFW_KEY_SLASH }, { user_command::doorlocktoggle, GLFW_KEY_S | keymodifier::control }, { user_command::pantographcompressorvalvetoggle, GLFW_KEY_V | keymodifier::control }, diff --git a/drivermouseinput.cpp b/drivermouseinput.cpp index 56d46799..b099be2b 100644 --- a/drivermouseinput.cpp +++ b/drivermouseinput.cpp @@ -544,6 +544,21 @@ drivermouse_input::default_bindings() { { "door_right_sw:", { user_command::doortoggleright, user_command::none } }, + { "doorlefton_sw:", { + user_command::dooropenleft, + user_command::none } }, + { "doorrighton_sw:", { + user_command::dooropenright, + user_command::none } }, + { "doorleftoff_sw:", { + user_command::doorcloseleft, + user_command::none } }, + { "doorrightoff_sw:", { + user_command::doorcloseright, + user_command::none } }, + { "dooralloff_sw:", { + user_command::doorcloseall, + user_command::none } }, { "departure_signal_bt:", { user_command::departureannounce, user_command::none } }, diff --git a/translation.h b/translation.h index 5c35b97c..dd4ae559 100644 --- a/translation.h +++ b/translation.h @@ -52,6 +52,11 @@ static std::unordered_map m_cabcontrols = { { "stlinoff_bt:", "motor connectors" }, { "door_left_sw:", "left door" }, { "door_right_sw:", "right door" }, + { "doorlefton_sw:", "left door" }, + { "doorrighton_sw:", "right door" }, + { "doorleftoff_sw:", "left door" }, + { "doorrightoff_sw:", "right door" }, + { "dooralloff_sw:", "all doors" }, { "departure_signal_bt:", "departure signal" }, { "upperlight_sw:", "upper headlight" }, { "leftlight_sw:", "left headlight" }, From 249e01375b92a992c6c20edc7bb8579d7814d977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Tue, 7 Aug 2018 16:06:08 +0200 Subject: [PATCH 374/426] Velocity Correction in pure EP mode for MED brake for certain time --- DynObj.cpp | 7 ++++++- McZapkie/MOVER.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/DynObj.cpp b/DynObj.cpp index 15a4cec7..ce9c6424 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3204,7 +3204,12 @@ bool TDynamicObject::Update(double dt, double dt1) p->MoverParameters->BrakeCylMult[0] - p->MoverParameters->BrakeSlckAdj) * p->MoverParameters->BrakeCylNo * p->MoverParameters->BrakeRigEff; - float VelC = ((FrED > 0.1) || p->MoverParameters->MED_EPVC ? clamp(p->MoverParameters->Vel, p->MoverParameters->MED_Vmin, p->MoverParameters->MED_Vmax) : p->MoverParameters->MED_Vref);//korekcja EP po prędkości + if (FrED > 0.1) + p->MoverParameters->MED_EPVC_CurrentTime = 0; + else + p->MoverParameters->MED_EPVC_CurrentTime += dt1; + bool EPVC = ((p->MoverParameters->MED_EPVC) && ((p->MoverParameters->MED_EPVC_Time < 0) || (p->MoverParameters->MED_EPVC_CurrentTime < p->MoverParameters->MED_EPVC_Time))); + float VelC = (EPVC ? clamp(p->MoverParameters->Vel, p->MoverParameters->MED_Vmin, p->MoverParameters->MED_Vmax) : p->MoverParameters->MED_Vref);//korekcja EP po prędkości float FmaxPoj = Nmax * p->MoverParameters->Hamulec->GetFC( Nmax / (p->MoverParameters->NAxles * p->MoverParameters->NBpA), VelC) * diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 278f22a6..a26a5618 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -942,6 +942,7 @@ public: double MED_Vref = 0; // predkosc referencyjna dla obliczen dostepnej sily hamowania EP w MED double MED_amax = 9.81; // maksymalne opoznienie hamowania sluzbowego MED bool MED_EPVC = 0; // czy korekcja sily hamowania EP, gdy nie ma dostepnego ED + double MED_EPVC_Time = 7; // czas korekcji sily hamowania EP, gdy nie ma dostepnego ED bool MED_Ncor = 0; // czy korekcja sily hamowania z uwzglednieniem nacisku /*-dla wagonow*/ float MaxLoad = 0.f; /*masa w T lub ilosc w sztukach - ladownosc*/ @@ -1152,6 +1153,7 @@ public: static std::vector const eimv_labels; double SpeedCtrlTimer = 0; /*zegar dzialania tempomatu z wybieralna predkoscia*/ double NewSpeed = 0; /*nowa predkosc do zadania*/ + double MED_EPVC_CurrentTime = 0; /*aktualny czas licznika czasu korekcji siły EP*/ /*-zmienne dla drezyny*/ double PulseForce = 0.0; /*przylozona sila*/ From cbaa5f78173a6fd25ed73f80d491b415ce0e5ebe Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 9 Aug 2018 22:24:42 +0200 Subject: [PATCH 375/426] build 180809. scenery node groups, AI shunt mode braking tweaks --- Driver.cpp | 11 +++ Model3d.cpp | 2 +- Train.cpp | 96 ++++++++++++++++++-------- maszyna.vcxproj.filters | 6 ++ parser.cpp | 19 +++-- parser.h | 12 ++-- sceneeditor.cpp | 126 ++++++++++++++++++++++++++-------- sceneeditor.h | 13 +++- scenenode.h | 19 +++++ scenenodegroups.cpp | 97 ++++++++++++++++++++++++++ scenenodegroups.h | 64 +++++++++++++++++ simulationstateserializer.cpp | 6 ++ version.h | 2 +- 13 files changed, 398 insertions(+), 75 deletions(-) create mode 100644 scenenodegroups.cpp create mode 100644 scenenodegroups.h diff --git a/Driver.cpp b/Driver.cpp index cae6bb84..7eb533e4 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4350,8 +4350,10 @@ TController::UpdateSituation(double dt) { } case Shunt: { // na jaką odleglość i z jaką predkością ma podjechać +/* fMinProximityDist = 5.0; fMaxProximityDist = 10.0; //[m] + if( pVehicles[ 0 ] != pVehicles[ 1 ] ) { // for larger consists increase margins to account for slower braking etc // NOTE: this will affect also multi-unit vehicles TBD: is this what we want? @@ -4367,6 +4369,15 @@ TController::UpdateSituation(double dt) { } } } +*/ + fMinProximityDist = std::min( 5 + iVehicles, 25 ); + fMaxProximityDist = std::min( 10 + iVehicles, 50 ); + if( ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) + && ( fBrake_a0[ 0 ] >= 0.35 ) ) { + // cargo trains with high braking threshold may require even larger safety margin + fMaxProximityDist *= 1.5; + } + fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania // margines prędkości powodujący załączenie napędu // były problemy z jazdą np. 3km/h podczas ładowania wagonów diff --git a/Model3d.cpp b/Model3d.cpp index 60243a7d..41bd1ccb 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -224,7 +224,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic f4Specular = glm::vec4{ 0.0f, 0.0f, 0.0f, 1.0f }; } } - parser.ignoreTokens(1); // zignorowanie nazwy "SelfIllum:" + parser.ignoreToken(); // zignorowanie nazwy "SelfIllum:" { std::string light = parser.getToken(); if (light == "true") diff --git a/Train.cpp b/Train.cpp index 56628dce..310ca4f3 100644 --- a/Train.cpp +++ b/Train.cpp @@ -22,6 +22,7 @@ http://mozilla.org/MPL/2.0/. #include "Logs.h" #include "MdlMngr.h" #include "model3d.h" +#include "dumb3d.h" #include "Timer.h" #include "Driver.h" #include "dynobj.h" @@ -6243,7 +6244,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) } std::string cabstr("cab" + std::to_string(cabindex) + "definition:"); - std::shared_ptr parser = std::make_shared(asFileName, cParser::buffer_FILE); + cParser parser(asFileName, cParser::buffer_FILE); // NOTE: yaml-style comments are disabled until conflict in use of # is resolved // parser.addCommentStyle( "#", "\n" ); std::string token; @@ -6251,11 +6252,45 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { // szukanie kabiny token = ""; - parser->getTokens(); - *parser >> token; + parser.getTokens(); + parser >> token; +/* + if( token == "locations:" ) { + do { + token = ""; + parser.getTokens(); parser >> token; + if( token == "radio:" ) { + // point in 3d space, in format [ x, y, z ] + glm::vec3 radiolocation; + parser.getTokens( 3, false, "\n\r\t ,;[]" ); + parser + >> radiolocation.x + >> radiolocation.y + >> radiolocation.z; + radiolocation *= glm::vec3( NewCabNo, 1, NewCabNo ); + m_radiosound.offset( radiolocation ); + } + + else if( token == "alerter:" ) { + // point in 3d space, in format [ x, y, z ] + glm::vec3 alerterlocation; + parser.getTokens( 3, false, "\n\r\t ,;[]" ); + parser + >> alerterlocation.x + >> alerterlocation.y + >> alerterlocation.z; + alerterlocation *= glm::vec3( NewCabNo, 1, NewCabNo ); + dsbBuzzer.offset( alerterlocation ); + } + + } while( ( token != "" ) + && ( token != "endlocations" ) ); + + } // locations: +*/ } while ((token != "") && (token != cabstr)); - +/* if ((cabindex != 1) && (token != cabstr)) { // jeśli nie znaleziony wpis kabiny, próba szukania kabiny 1 @@ -6267,65 +6302,66 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) do { token = ""; - parser->getTokens(); - *parser >> token; + parser.getTokens(); + parser >> token; } while ((token != "") && (token != cabstr)); } +*/ if (token == cabstr) { // jeśli znaleziony wpis kabiny - Cabine[cabindex].Load(*parser); + Cabine[cabindex].Load(parser); // NOTE: the position and angle definitions depend on strict entry order // TODO: refactor into more flexible arrangement - parser->getTokens(); - *parser >> token; + parser.getTokens(); + parser >> token; if( token == std::string( "driver" + std::to_string( cabindex ) + "angle:" ) ) { // camera view angle - parser->getTokens( 2, false ); + parser.getTokens( 2, false ); // angle is specified in degrees but internally stored in radians glm::vec2 viewangle; - *parser + parser >> viewangle.y // yaw first, then pitch >> viewangle.x; pMechViewAngle = glm::radians( viewangle ); Global.pCamera.Pitch = pMechViewAngle.x; Global.pCamera.Yaw = pMechViewAngle.y; - parser->getTokens(); - *parser >> token; + parser.getTokens(); + parser >> token; } if (token == std::string("driver" + std::to_string(cabindex) + "pos:")) { // pozycja poczatkowa maszynisty - parser->getTokens(3, false); - *parser + parser.getTokens(3, false); + parser >> pMechOffset.x >> pMechOffset.y >> pMechOffset.z; pMechSittingPosition = pMechOffset; - parser->getTokens(); - *parser >> token; + parser.getTokens(); + parser >> token; } // ABu: pozycja siedzaca mechanika if (token == std::string("driver" + std::to_string(cabindex) + "sitpos:")) { // ABu 180404 pozycja siedzaca maszynisty - parser->getTokens(3, false); - *parser + parser.getTokens(3, false); + parser >> pMechSittingPosition.x >> pMechSittingPosition.y >> pMechSittingPosition.z; - parser->getTokens(); - *parser >> token; + parser.getTokens(); + parser >> token; } // else parse=false; do { if( parse == true ) { token = ""; - parser->getTokens(); - *parser >> token; + parser.getTokens(); + parser >> token; } else { parse = true; @@ -6338,8 +6374,8 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) if (token == std::string("cab" + std::to_string(cabindex) + "model:")) { // model kabiny - parser->getTokens(); - *parser >> token; + parser.getTokens(); + parser >> token; if (token != "none") { // bieżąca sciezka do tekstur to dynamic/... @@ -6375,19 +6411,19 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) // don't bother with other parts until the cab is initialised continue; } - else if (true == initialize_gauge(*parser, token, cabindex)) + else if (true == initialize_gauge(parser, token, cabindex)) { // matched the token, grab the next one continue; } - else if (true == initialize_button(*parser, token, cabindex)) + else if (true == initialize_button(parser, token, cabindex)) { // matched the token, grab the next one continue; } else if (token == "pyscreen:") { - pyScreens.init(*parser, DynamicObject->mdKabina, DynamicObject->name(), NewCabNo); + pyScreens.init(parser, DynamicObject->mdKabina, DynamicObject->name(), NewCabNo); } // btLampkaUnknown.Init("unknown",mdKabina,false); } while (token != ""); @@ -6415,10 +6451,10 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) } // radio has two potential items which can provide the position if( m_radiosound.offset() == nullvector ) { - m_radiosound.offset( ggRadioButton.model_offset() ); + m_radiosound.offset( btLampkaRadio.model_offset() ); } if( m_radiosound.offset() == nullvector ) { - m_radiosound.offset( btLampkaRadio.model_offset() ); + m_radiosound.offset( ggRadioButton.model_offset() ); } if( m_radiostop.offset() == nullvector ) { m_radiostop.offset( m_radiosound.offset() ); diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 36823659..2f20ee62 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -303,6 +303,9 @@ Source Files\application\input + + Source Files + @@ -572,6 +575,9 @@ Header Files\application\input + + Header Files + diff --git a/parser.cpp b/parser.cpp index d8ccec70..3691658e 100644 --- a/parser.cpp +++ b/parser.cpp @@ -9,8 +9,11 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "parser.h" +#include "utilities.h" #include "logs.h" +#include "scenenodegroups.h" + /* MaSzyna EU07 locomotive simulator parser Copyright (C) 2003 TOLARIS @@ -24,11 +27,6 @@ http://mozilla.org/MPL/2.0/. cParser::cParser( std::string const &Stream, buffertype const Type, std::string Path, bool const Loadtraction, std::vector Parameters ) : mPath(Path), LoadTraction( Loadtraction ) { - // build comments map - mComments.insert(commentmap::value_type("/*", "*/")); - mComments.insert(commentmap::value_type("//", "\n")); - // mComments.insert(commentmap::value_type("--","\n")); //Ra: to chyba nie używane - // store to calculate sub-sequent includes from relative path if( Type == buffertype::buffer_FILE ) { mFile = Stream; @@ -38,6 +36,12 @@ cParser::cParser( std::string const &Stream, buffertype const Type, std::string case buffer_FILE: { Path.append( Stream ); mStream = std::make_shared( Path ); + // content of *.inc files is potentially grouped together + if( ( Stream.size() >= 4 ) + && ( ToLower( Stream.substr( Stream.size() - 4 ) ) == ".inc" ) ) { + mIncFile = true; + scene::Groups.begin(); + } break; } case buffer_TEXT: { @@ -69,7 +73,10 @@ cParser::cParser( std::string const &Stream, buffertype const Type, std::string // destructor cParser::~cParser() { - mComments.clear(); + if( true == mIncFile ) { + // wrap up the node group holding content of processed file + scene::Groups.end(); + } } template<> diff --git a/parser.h b/parser.h index 3c3ee511..3a099fb1 100644 --- a/parser.h +++ b/parser.h @@ -47,11 +47,6 @@ class cParser //: public std::stringstream ignoreToken() { readToken(); }; inline - void - ignoreTokens(int count) { - for( int i = 0; i < count; ++i ) { - readToken(); } }; - inline bool expectToken( std::string const &Value ) { return readToken() == Value; }; @@ -97,14 +92,17 @@ class cParser //: public std::stringstream std::size_t count(); // members: bool m_autoclear { true }; // not retrieved tokens are discarded when another read command is issued (legacy behaviour) - bool LoadTraction; // load traction? + bool LoadTraction { true }; // load traction? std::shared_ptr mStream; // relevant kind of buffer is attached on creation. std::string mFile; // name of the open file, if any std::string mPath; // path to open stream, for relative path lookups. std::streamoff mSize { 0 }; // size of open stream, for progress report. std::size_t mLine { 0 }; // currently processed line + bool mIncFile { false }; // the parser is processing an *.inc file typedef std::map commentmap; - commentmap mComments; + commentmap mComments { + commentmap::value_type( "/*", "*/" ), + commentmap::value_type( "//", "\n" ) }; std::shared_ptr mIncludeParser; // child class to handle include directives. std::vector parameters; // parameter list for included file. std::deque tokens; diff --git a/sceneeditor.cpp b/sceneeditor.cpp index 78b87a6b..2961a602 100644 --- a/sceneeditor.cpp +++ b/sceneeditor.cpp @@ -9,6 +9,7 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "sceneeditor.h" +#include "scenenodegroups.h" #include "globals.h" #include "application.h" @@ -22,20 +23,26 @@ namespace scene { void basic_editor::translate( scene::basic_node *Node, glm::dvec3 const &Location, bool const Snaptoground ) { - auto *node { Node }; // placeholder for operations on multiple nodes - - auto location { Location }; + auto const initiallocation { Node->location() }; + auto targetlocation { Location }; if( false == Snaptoground ) { - location.y = node->location().y; + targetlocation.y = initiallocation.y; } + // NOTE: bit of a waste for single nodes, for the sake of less varied code down the road + auto const translation { targetlocation - initiallocation }; - if( typeid( *node ) == typeid( TAnimModel ) ) { - translate_instance( static_cast( node ), location ); + if( Node->group() == null_handle ) { + translate_node( Node, Node->location() + translation ); } - else if( typeid( *node ) == typeid( TMemCell ) ) { - translate_memorycell( static_cast( node ), location ); + else { + // translate entire group + // TODO: contextual switch between group and item translation + auto nodegroup { scene::Groups.group( Node->group() ) }; + std::for_each( + nodegroup.first, nodegroup.second, + [&]( auto *node ) { + translate_node( node, node->location() + translation ); } ); } - } void @@ -44,15 +51,41 @@ basic_editor::translate( scene::basic_node *Node, float const Offset ) { // NOTE: offset scaling is calculated early so the same multiplier can be applied to potential whole group auto location { Node->location() }; auto const distance { glm::length( location - glm::dvec3{ Global.pCamera.Pos } ) }; - auto const offset { Offset * std::max( 1.0, distance * 0.01 ) }; + auto const offset { static_cast( Offset * std::max( 1.0, distance * 0.01 ) ) }; - auto *node { Node }; // placeholder for operations on multiple nodes - - if( typeid( *node ) == typeid( TAnimModel ) ) { - translate_instance( static_cast( node ), offset ); + if( Node->group() == null_handle ) { + translate_node( Node, offset ); } - else if( typeid( *node ) == typeid( TMemCell ) ) { - translate_memorycell( static_cast( node ), offset ); + else { + // translate entire group + // TODO: contextual switch between group and item translation + auto nodegroup { scene::Groups.group( Node->group() ) }; + std::for_each( + nodegroup.first, nodegroup.second, + [&]( auto *node ) { + translate_node( node, offset ); } ); + } +} + +void +basic_editor::translate_node( scene::basic_node *Node, glm::dvec3 const &Location ) { + + if( typeid( *Node ) == typeid( TAnimModel ) ) { + translate_instance( static_cast( Node ), Location ); + } + else if( typeid( *Node ) == typeid( TMemCell ) ) { + translate_memorycell( static_cast( Node ), Location ); + } +} + +void +basic_editor::translate_node( scene::basic_node *Node, float const Offset ) { + + if( typeid( *Node ) == typeid( TAnimModel ) ) { + translate_instance( static_cast( Node ), Offset ); + } + else if( typeid( *Node ) == typeid( TMemCell ) ) { + translate_memorycell( static_cast( Node ), Offset ); } } @@ -91,25 +124,62 @@ basic_editor::translate_memorycell( TMemCell *Memorycell, float const Offset ) { void basic_editor::rotate( scene::basic_node *Node, glm::vec3 const &Angle, float const Quantization ) { - auto *node { Node }; // placeholder for operations on multiple nodes + glm::vec3 rotation { 0, Angle.y, 0 }; - if( typeid( *node ) == typeid( TAnimModel ) ) { - rotate_instance( static_cast( node ), Angle, Quantization ); + // quantize resulting angle if requested and type of the node allows it + // TBD, TODO: angle quantization for types other than instanced models + if( ( Quantization > 0.f ) + && ( typeid( *Node ) == typeid( TAnimModel ) ) ) { + + auto const initialangle { static_cast( Node )->Angles() }; + rotation += initialangle; + + // TBD, TODO: adjustable quantization step + rotation.y = quantize( rotation.y, Quantization ); + + rotation -= initialangle; + } + + if( Node->group() == null_handle ) { + rotate_node( Node, rotation ); + } + else { + // rotate entire group + // TODO: contextual switch between group and item rotation + auto const rotationcenter { Node->location() }; + auto nodegroup { scene::Groups.group( Node->group() ) }; + std::for_each( + nodegroup.first, nodegroup.second, + [&]( auto *node ) { + rotate_node( node, rotation ); + if( node != Node ) { + translate_node( + node, + rotationcenter + + glm::rotateY( + node->location() - rotationcenter, + glm::radians( rotation.y ) ) ); } } ); } } void -basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle, float const Quantization ) { +basic_editor::rotate_node( scene::basic_node *Node, glm::vec3 const &Angle ) { - // adjust node data - glm::vec3 angle = glm::dvec3 { Instance->Angles() }; - angle.y = clamp_circular( angle.y + Angle.y, 360.f ); - if( Quantization > 0.f ) { - // TBD, TODO: adjustable quantization step - angle.y = quantize( angle.y, Quantization ); + if( typeid( *Node ) == typeid( TAnimModel ) ) { + rotate_instance( static_cast( Node ), Angle ); } - Instance->Angles( angle ); - // update scene +} + +void +basic_editor::rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ) { + + auto targetangle { Instance->Angles() + Angle }; + + targetangle.x = clamp_circular( targetangle.x, 360.f ); + targetangle.y = clamp_circular( targetangle.y, 360.f ); + targetangle.z = clamp_circular( targetangle.z, 360.f ); + + Instance->Angles( targetangle ); } } // scene diff --git a/sceneeditor.h b/sceneeditor.h index 583bce27..75e0ff6c 100644 --- a/sceneeditor.h +++ b/sceneeditor.h @@ -36,6 +36,15 @@ public: translate( scene::basic_node *Node, glm::dvec3 const &Location, bool const Snaptoground ); void translate( scene::basic_node *Node, float const Offset ); + void + rotate( scene::basic_node *Node, glm::vec3 const &Angle, float const Quantization ); + +private: +// methods + void + translate_node( scene::basic_node *Node, glm::dvec3 const &Location ); + void + translate_node( scene::basic_node *Node, float const Offset ); void translate_instance( TAnimModel *Instance, glm::dvec3 const &Location ); void @@ -45,9 +54,9 @@ public: void translate_memorycell( TMemCell *Memorycell, float const Offset ); void - rotate( scene::basic_node *Node, glm::vec3 const &Angle, float const Quantization ); + rotate_node( scene::basic_node *Node, glm::vec3 const &Angle ); void - rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle, float const Quantization ); + rotate_instance( TAnimModel *Instance, glm::vec3 const &Angle ); }; } // scene diff --git a/scenenode.h b/scenenode.h index feb14a5b..0d8fc1c5 100644 --- a/scenenode.h +++ b/scenenode.h @@ -64,6 +64,8 @@ struct bounding_area { deserialize( std::istream &Input ); }; +using group_handle = std::size_t; + struct node_data { double range_min { 0.0 }; @@ -330,9 +332,14 @@ public: visible( bool const Visible ); bool visible() const; + void + group( scene::group_handle Group ); + scene::group_handle + group() const; protected: // members + scene::group_handle m_group { null_handle }; // group this node belongs to, if any scene::bounding_area m_area; double m_rangesquaredmin { 0.0 }; // visibility range, min double m_rangesquaredmax { 0.0 }; // visibility range, max @@ -381,6 +388,18 @@ basic_node::visible() const { return m_visible; } +inline +void +basic_node::group( scene::group_handle Group ) { + m_group = Group; +} + +inline +scene::group_handle +basic_node::group() const { + return m_group; +} + } // scene //--------------------------------------------------------------------------- diff --git a/scenenodegroups.cpp b/scenenodegroups.cpp new file mode 100644 index 00000000..0399af7f --- /dev/null +++ b/scenenodegroups.cpp @@ -0,0 +1,97 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "scenenodegroups.h" + +namespace scene { + +node_groups Groups; + +// requests creation of a new node group. returns: handle to the group +scene::group_handle +node_groups::begin() { + + m_activegroup.push( create_handle() ); + + return handle(); +} + +// indicates creation of current group ended. returns: handle to the parent group or null_handle if group stack is empty +scene::group_handle +node_groups::end() { + + if( false == m_activegroup.empty() ) { + + auto const closinggroup { m_activegroup.top() }; + m_activegroup.pop(); + // if the completed group holds only one item and there's no chance more items will be added, disband it + if( ( true == m_activegroup.empty() ) + || ( m_activegroup.top() != closinggroup ) ) { + + auto lookup { m_groupmap.find( closinggroup ) }; + if( ( lookup != m_groupmap.end() ) + && ( lookup->second.size() <= 1 ) ) { + + erase( lookup ); + } + } + } + return handle(); +} + +// returns current active group, or null_handle if group stack is empty +group_handle +node_groups::handle() const { + + return ( + m_activegroup.empty() ? + null_handle : + m_activegroup.top() ); +} + +// places provided node in specified group +void +node_groups::register_node( scene::basic_node *Node, scene::group_handle const Group ) { + + // TBD, TODO: automatically unregister the node from its current group? + Node->group( Group ); + + if( Group == null_handle ) { return; } + + auto &nodesequence { m_groupmap[ Group ] }; + if( std::find( std::begin( nodesequence ), std::end( nodesequence ), Node ) == std::end( nodesequence ) ) { + // don't add the same node twice + nodesequence.emplace_back( Node ); + } +} + +// removes specified group from the group list and group information from the group's nodes +void +node_groups::erase( group_map::const_iterator Group ) { + + for( auto *node : Group->second ) { + node->group( null_handle ); + } + m_groupmap.erase( Group ); +} + +// creates handle for a new group +group_handle +node_groups::create_handle() { + // NOTE: for simplification nested group structure are flattened + return( + m_activegroup.empty() ? + m_groupmap.size() + 1 : // new group isn't created until node registration + m_activegroup.top() ); +} + +} // scene + +//--------------------------------------------------------------------------- diff --git a/scenenodegroups.h b/scenenodegroups.h new file mode 100644 index 00000000..906b8639 --- /dev/null +++ b/scenenodegroups.h @@ -0,0 +1,64 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "scenenode.h" + +namespace scene { + +// holds lists of grouped scene nodes +class node_groups { + // NOTE: during scenario deserialization encountering *.inc file causes creation of a new group on the group stack + // this allows all nodes listed in this *.inc file to be grouped and potentially modified together by the editor. +private: + // types + using node_sequence = std::vector; + +public: +// constructors + node_groups() = default; +// methods + // requests creation of a new node group. returns: handle to the group + group_handle + begin(); + // indicates creation of current group ended. returns: handle to the parent group or null_handle if group stack is empty + group_handle + end(); + // returns current active group, or null_handle if group stack is empty + group_handle + handle() const; + // places provided node in specified group + void + register_node( scene::basic_node *Node, scene::group_handle const Group ); + std::pair + group( scene::group_handle const Group ) { + auto &group { m_groupmap[ Group ] }; + return { std::begin( group ), std::end( group ) }; } + +private: +// types + using group_map = std::unordered_map; +// methods + // removes specified group from the group list and group information from the group's nodes + void + erase( group_map::const_iterator Group ); + // creates handle for a new group + group_handle + create_handle(); +// members + group_map m_groupmap; // map of established node groups + std::stack m_activegroup; // helper, group to be assigned to newly created nodes +}; + +extern node_groups Groups; + +} // scene + +//--------------------------------------------------------------------------- diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index bd589bc7..f2cdc672 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -15,6 +15,7 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "simulation.h" #include "simulationtime.h" +#include "scenenodegroups.h" #include "event.h" #include "driver.h" #include "dynobj.h" @@ -304,6 +305,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch delete pathnode; */ } + scene::Groups.register_node( path, scene::Groups.handle() ); simulation::Region->insert_and_register( path ); } else if( nodedata.type == "traction" ) { @@ -315,6 +317,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( false == simulation::Traction.insert( traction ) ) { ErrorLog( "Bad scenario: traction piece with duplicate name \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } + scene::Groups.register_node( traction, scene::Groups.handle() ); simulation::Region->insert_and_register( traction ); } else if( nodedata.type == "tractionpowersource" ) { @@ -375,6 +378,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( false == simulation::Instances.insert( instance ) ) { ErrorLog( "Bad scenario: 3d model instance with duplicate name \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } + scene::Groups.register_node( instance, scene::Groups.handle() ); simulation::Region->insert( instance ); } } @@ -417,6 +421,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( false == simulation::Memory.insert( memorycell ) ) { ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } + scene::Groups.register_node( memorycell, scene::Groups.handle() ); simulation::Region->insert( memorycell ); } else if( nodedata.type == "eventlauncher" ) { @@ -431,6 +436,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch simulation::Events.queue( eventlauncher ); } else { + scene::Groups.register_node( eventlauncher, scene::Groups.handle() ); simulation::Region->insert( eventlauncher ); } } diff --git a/version.h b/version.h index e33273e4..c945cd61 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 805 +#define VERSION_MINOR 809 #define VERSION_REVISION 0 From 5e52467746622ed4d77efe831b6646be1d493ff0 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 11 Aug 2018 01:42:22 +0200 Subject: [PATCH 376/426] car route scanning accuracy improvement, AI coasting logic tweaks, AI car braking fix --- Driver.cpp | 66 ++++++++++++++++++++++++++++++--------------------- DynObj.cpp | 69 ++++++++++++++++++++++-------------------------------- DynObj.h | 12 ++++++++++ 3 files changed, 79 insertions(+), 68 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 7eb533e4..6a80d78c 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -475,12 +475,11 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) pTrack = pVehicle->RaTrackGet(); // odcinek, na którym stoi fTrackLength = pVehicle->RaTranslationGet(); // pozycja na tym torze (odległość od Point1) fLastDir = pVehicle->DirectionGet() * pVehicle->RaDirectionGet(); // ustalenie kierunku skanowania na torze - double odl_czola_od_wozka = (pVehicle->AxlePositionGet() - pVehicle->RearPosition()).Length(); if( fLastDir < 0.0 ) { // jeśli w kierunku Point2 toru fTrackLength = pTrack->Length() - fTrackLength; // przeskanowana zostanie odległość do Point2 } - fTrackLength -= odl_czola_od_wozka; + fTrackLength -= pVehicle->tracing_offset(); fCurrentDistance = -fLength - fTrackLength; // aktualna odległość ma być ujemna gdyż jesteśmy na końcu składu fLastVel = -1.0; // pTrack->VelocityGet(); // aktualna prędkość // changed to -1 to recognize speed limit, if any sSpeedTable.clear(); @@ -1878,10 +1877,16 @@ void TController::AutoRewident() } // 4. Przeliczanie siły hamowania d = pVehicles[0]; // pojazd na czele składu + // HACK: calculated brake thresholds for cars are so high they prevent the AI from effectively braking + // thus we artificially reduce them until a better solution for the problem is found + auto const braketablescale { ( + d->MoverParameters->CategoryFlag == 2 ? + 0.6 : + 1.0 ) }; while (d) { for( int i = 0; i < BrakeAccTableSize; ++i ) { - fBrake_a0[ i + 1 ] += d->MoverParameters->BrakeForceR( 0.25, velstep*( 1 + 2 * i ) ); - fBrake_a1[ i + 1 ] += d->MoverParameters->BrakeForceR( 1.00, velstep*( 1 + 2 * i ) ); + fBrake_a0[ i + 1 ] += braketablescale * d->MoverParameters->BrakeForceR( 0.25, velstep*( 1 + 2 * i ) ); + fBrake_a1[ i + 1 ] += braketablescale * d->MoverParameters->BrakeForceR( 1.00, velstep*( 1 + 2 * i ) ); } d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } @@ -4550,7 +4555,6 @@ TController::UpdateSituation(double dt) { if( ( true == AIControllFlag) && ( true == TestFlag( OrderList[ OrderPos ], Change_direction ) ) ) { // sprobuj zmienic kierunek (może być zmieszane z jeszcze jakąś komendą) - SetVelocity( 0, 0, stopDir ); // najpierw trzeba się zatrzymać if( mvOccupied->Vel < 0.1 ) { // jeśli się zatrzymał, to zmieniamy kierunek jazdy, a nawet kabinę/człon Activation(); // ustawienie zadanego wcześniej kierunku i ewentualne przemieszczenie AI @@ -4598,8 +4602,8 @@ TController::UpdateSituation(double dt) { // Ra: odczyt (ActualProximityDist), (VelNext) i (AccPreferred) z tabelki prędkosci TCommandType comm = TableUpdate(VelDesired, ActualProximityDist, VelNext, AccDesired); - switch (comm) - { // ustawienie VelSignal - trochę proteza = do przemyślenia + switch (comm) { + // ustawienie VelSignal - trochę proteza = do przemyślenia case TCommandType::cm_Ready: // W4 zezwolił na jazdę // ewentualne doskanowanie trasy za W4, który zezwolił na jazdę TableCheck( routescanrange); @@ -4636,6 +4640,11 @@ TController::UpdateSituation(double dt) { break; } + if( true == TestFlag( OrderList[ OrderPos ], Change_direction ) ) { + // if ordered to change direction, try to stop + SetVelocity( 0, 0, stopDir ); + } + if( VelNext == 0.0 ) { if( !( OrderList[ OrderPos ] & ~( Shunt | Connect ) ) ) { // jedzie w Shunt albo Connect, albo Wait_for_orders @@ -4909,7 +4918,7 @@ TController::UpdateSituation(double dt) { if( VelNext == 0.0 ) { if( mvOccupied->CategoryFlag & 1 ) { // trains - if( ( OrderCurrentGet() & Shunt ) + if( ( OrderCurrentGet() & ( Shunt | Connect ) ) && ( pVehicles[0]->fTrackBlock < 50.0 ) ) { // crude detection of edge case, if approaching another vehicle coast slowly until min distance // this should allow to bunch up trainsets more on sidings @@ -4929,25 +4938,28 @@ TController::UpdateSituation(double dt) { } } else { - // przy dużej różnicy wysoki stopień (1,00 potrzebnego opoznienia) - auto const slowdowndistance { ( - ( OrderCurrentGet() & Connect ) == 0 ? - 100.0 : - 25.0 ) }; - if( ( std::max( slowdowndistance, fMaxProximityDist ) + fBrakeDist * braking_distance_multiplier( VelNext ) ) >= ( ActualProximityDist - fMaxProximityDist ) ) { - // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good - // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever - auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); - AccDesired = std::min( - AccDesired, - ( VelNext * VelNext - vel * vel ) - / ( 25.92 - * std::max( - ActualProximityDist - brakingpointoffset, - std::min( - ActualProximityDist, - brakingpointoffset ) ) - + 0.1 ) ); // najpierw hamuje mocniej, potem zluzuje + // outside of max safe range + if( vel > min_speed( 10.0, VelDesired ) ) { + // allow to coast at reasonably low speed + auto const slowdowndistance { ( + ( OrderCurrentGet() & Connect ) == 0 ? + 100.0 : + 25.0 ) }; + if( ( std::max( slowdowndistance, fMaxProximityDist ) + fBrakeDist * braking_distance_multiplier( VelNext ) ) >= ( ActualProximityDist - fMaxProximityDist ) ) { + // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good + // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever + auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); + AccDesired = std::min( + AccDesired, + ( VelNext * VelNext - vel * vel ) + / ( 25.92 + * std::max( + ActualProximityDist - brakingpointoffset, + std::min( + ActualProximityDist, + brakingpointoffset ) ) + + 0.1 ) ); // najpierw hamuje mocniej, potem zluzuje + } } } AccDesired = std::min( AccDesired, AccPreferred ); diff --git a/DynObj.cpp b/DynObj.cpp index ce9c6424..c019cd46 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2216,45 +2216,26 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // iNumAxles=(MoverParameters->NAxles>3 ? 4 : 2 ); iNumAxles = 2; // McZapkie-090402: odleglosc miedzy czopami skretu lub osiami - fAxleDist = Max0R(MoverParameters->BDist, MoverParameters->ADist); - if (fAxleDist < 0.2f) - fAxleDist = 0.2f; //żeby się dało wektory policzyć - if (fAxleDist > MoverParameters->Dim.L - 0.2) // nie mogą być za daleko - fAxleDist = MoverParameters->Dim.L - 0.2; // bo będzie "walenie w mur" + fAxleDist = clamp( + std::max( MoverParameters->BDist, MoverParameters->ADist ), + 0.2, //żeby się dało wektory policzyć + MoverParameters->Dim.L - 0.2 ); // nie mogą być za daleko bo będzie "walenie w mur" double fAxleDistHalf = fAxleDist * 0.5; - // WriteLog("Dynamic "+Type_Name+" of length "+MoverParameters->Dim.L+" at - // "+AnsiString(fDist)); - // if (Cab) //jeśli ma obsadę - zgodność wstecz, jeśli tor startowy ma Event0 - // if (Track->Event0) //jeśli tor ma Event0 - // if (fDist>=0.0) //jeśli jeśli w starych sceneriach początek składu byłby - // wysunięty na ten - // tor - // if (fDist<=0.5*MoverParameters->Dim.L+0.2) //ale nie jest wysunięty - // fDist+=0.5*MoverParameters->Dim.L+0.2; //wysunąć go na ten tor // przesuwanie pojazdu tak, aby jego początek był we wskazanym miejcu - fDist -= 0.5 * MoverParameters->Dim.L; // dodajemy pół długości pojazdu, bo - // ustawiamy jego środek (zliczanie na - // minus) + fDist -= 0.5 * MoverParameters->Dim.L; // dodajemy pół długości pojazdu, bo ustawiamy jego środek (zliczanie na minus) switch (iNumAxles) { // Ra: pojazdy wstawiane są na tor początkowy, a potem przesuwane case 2: // ustawianie osi na torze Axle0.Init(Track, this, iDirection ? 1 : -1); Axle0.Move((iDirection ? fDist : -fDist) + fAxleDistHalf, false); Axle1.Init(Track, this, iDirection ? 1 : -1); - Axle1.Move((iDirection ? fDist : -fDist) - fAxleDistHalf, - false); // false, żeby nie generować eventów - // Axle2.Init(Track,this,iDirection?1:-1); - // Axle2.Move((iDirection?fDist:-fDist)-fAxleDistHalft+0.01),false); - // Axle3.Init(Track,this,iDirection?1:-1); - // Axle3.Move((iDirection?fDist:-fDist)+fAxleDistHalf-0.01),false); + Axle1.Move((iDirection ? fDist : -fDist) - fAxleDistHalf, false); // false, żeby nie generować eventów break; case 4: Axle0.Init(Track, this, iDirection ? 1 : -1); - Axle0.Move((iDirection ? fDist : -fDist) + (fAxleDistHalf + MoverParameters->ADist * 0.5), - false); + Axle0.Move((iDirection ? fDist : -fDist) + (fAxleDistHalf + MoverParameters->ADist * 0.5), false); Axle1.Init(Track, this, iDirection ? 1 : -1); - Axle1.Move((iDirection ? fDist : -fDist) - (fAxleDistHalf + MoverParameters->ADist * 0.5), - false); + Axle1.Move((iDirection ? fDist : -fDist) - (fAxleDistHalf + MoverParameters->ADist * 0.5), false); // Axle2.Init(Track,this,iDirection?1:-1); // Axle2.Move((iDirection?fDist:-fDist)-(fAxleDistHalf-MoverParameters->ADist*0.5),false); // Axle3.Init(Track,this,iDirection?1:-1); @@ -2392,8 +2373,7 @@ void TDynamicObject::Move(double fDistance) // fAdjustment=0.0; vFront = Normalize(vFront); // kierunek ustawienia pojazdu (wektor jednostkowy) vLeft = Normalize(CrossProduct(vWorldUp, vFront)); // wektor poziomy w lewo, - // normalizacja potrzebna z powodu - // pochylenia (vFront) + // normalizacja potrzebna z powodu pochylenia (vFront) vUp = CrossProduct(vFront, vLeft); // wektor w górę, będzie jednostkowy modelRot.z = atan2(-vFront.x, vFront.z); // kąt obrotu pojazdu [rad]; z ABuBogies() double a = ((Axle1.GetRoll() + Axle0.GetRoll())); // suma przechyłek @@ -2409,17 +2389,13 @@ void TDynamicObject::Move(double fDistance) vLeft = Normalize(CrossProduct(vUp, vFront)); // wektor w lewo // vUp=CrossProduct(vFront,vLeft); //wektor w górę } - mMatrix.Identity(); // to też można by od razu policzyć, ale potrzebne jest - // do wyświetlania - mMatrix.BasisChange(vLeft, vUp, vFront); // przesuwanie jest jednak rzadziej niż - // renderowanie - mMatrix = Inverse(mMatrix); // wyliczenie macierzy dla pojazdu (potrzebna - // tylko do wyświetlania?) + mMatrix.Identity(); // to też można by od razu policzyć, ale potrzebne jest do wyświetlania + mMatrix.BasisChange(vLeft, vUp, vFront); // przesuwanie jest jednak rzadziej niż renderowanie + mMatrix = Inverse(mMatrix); // wyliczenie macierzy dla pojazdu (potrzebna tylko do wyświetlania?) // if (MoverParameters->CategoryFlag&2) { // przesunięcia są używane po wyrzuceniu pociągu z toru vPosition.x += MoverParameters->OffsetTrackH * vLeft.x; // dodanie przesunięcia w bok - vPosition.z += - MoverParameters->OffsetTrackH * vLeft.z; // vLeft jest wektorem poprzecznym + vPosition.z += MoverParameters->OffsetTrackH * vLeft.z; // vLeft jest wektorem poprzecznym // if () na przechyłce będzie dodatkowo zmiana wysokości samochodu vPosition.y += MoverParameters->OffsetTrackV; // te offsety są liczone przez moverparam } @@ -2429,10 +2405,10 @@ void TDynamicObject::Move(double fDistance) // MoverParameters->Loc.Z= vPosition.y; // obliczanie pozycji sprzęgów do liczenia zderzeń auto dir = (0.5 * MoverParameters->Dim.L) * vFront; // wektor sprzęgu - vCoulpler[0] = vPosition + dir; // współrzędne sprzęgu na początku - vCoulpler[1] = vPosition - dir; // współrzędne sprzęgu na końcu - MoverParameters->vCoulpler[0] = vCoulpler[0]; // tymczasowo kopiowane na inny poziom - MoverParameters->vCoulpler[1] = vCoulpler[1]; + vCoulpler[side::front] = vPosition + dir; // współrzędne sprzęgu na początku + vCoulpler[side::rear] = vPosition - dir; // współrzędne sprzęgu na końcu + MoverParameters->vCoulpler[side::front] = vCoulpler[side::front]; // tymczasowo kopiowane na inny poziom + MoverParameters->vCoulpler[side::rear] = vCoulpler[side::rear]; // bCameraNear= // if (bCameraNear) //jeśli istotne są szczegóły (blisko kamery) { // przeliczenie cienia @@ -4503,6 +4479,17 @@ void TDynamicObject::RenderSounds() { } } +// calculates distance between event-starting axle and front of the vehicle +double +TDynamicObject::tracing_offset() const { + + auto const axletoend{ ( GetLength() - fAxleDist ) * 0.5 }; + return ( + iAxleFirst ? + axletoend : + axletoend + iDirection * fAxleDist ); +} + // McZapkie-250202 // wczytywanie pliku z danymi multimedialnymi (dzwieki) void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, std::string ReplacableSkin ) { diff --git a/DynObj.h b/DynObj.h index 8d0f5de6..0bd80c0e 100644 --- a/DynObj.h +++ b/DynObj.h @@ -539,6 +539,16 @@ private: return iAxleFirst ? Axle1.pPosition : Axle0.pPosition; }; +/* + // TODO: check if scanning takes into account direction when selecting axle + // if it does, replace the version above + // if it doesn't, fix it so it does + inline Math3D::vector3 AxlePositionGet() { + return ( + iDirection ? + ( iAxleFirst ? Axle1.pPosition : Axle0.pPosition ) : + ( iAxleFirst ? Axle0.pPosition : Axle1.pPosition ) ); } +*/ inline Math3D::vector3 VectorFront() const { return vFront; }; inline Math3D::vector3 VectorUp() const { @@ -555,6 +565,8 @@ private: return MoverParameters->Dim.L; }; inline double GetWidth() const { return MoverParameters->Dim.W; }; + // calculates distance between event-starting axle and front of the vehicle + double tracing_offset() const; inline TTrack * GetTrack() { return (iAxleFirst ? Axle1.GetTrack() : From 4aeb98ecbebbb5c7da399f1336b25eddc031e4fe Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 17 Aug 2018 01:17:22 +0200 Subject: [PATCH 377/426] interior lighting power source lookup enhancement, track event activation filtering, switch geometry normal fix, material parsing enhancements, AI acceleration and braking logic tweaks, AI car route scanning accuracy fix, AI braking delay fix --- Driver.cpp | 245 +++++++++++++++++++++++++-------------------- Driver.h | 18 +++- DynObj.cpp | 60 ----------- McZapkie/Mover.cpp | 183 ++++++++++----------------------- Track.cpp | 19 ++-- Train.cpp | 36 ++++--- TrkFoll.cpp | 12 ++- material.cpp | 6 +- 8 files changed, 247 insertions(+), 332 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 6a80d78c..d99c45ba 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -479,9 +479,17 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) // jeśli w kierunku Point2 toru fTrackLength = pTrack->Length() - fTrackLength; // przeskanowana zostanie odległość do Point2 } - fTrackLength -= pVehicle->tracing_offset(); - fCurrentDistance = -fLength - fTrackLength; // aktualna odległość ma być ujemna gdyż jesteśmy na końcu składu - fLastVel = -1.0; // pTrack->VelocityGet(); // aktualna prędkość // changed to -1 to recognize speed limit, if any + // account for the fact tracing begins from active axle, not the actual front of the vehicle + // NOTE: position of the couplers is modified by track offset, but the axles ain't, so we need to account for this as well + fTrackLength -= ( + pVehicle->AxlePositionGet() + - pVehicle->RearPosition() + + pVehicle->VectorLeft() * pVehicle->MoverParameters->OffsetTrackH ) + .Length(); + // aktualna odległość ma być ujemna gdyż jesteśmy na końcu składu + fCurrentDistance = -fLength - fTrackLength; + // aktualna prędkość // changed to -1 to recognize speed limit, if any + fLastVel = -1.0; sSpeedTable.clear(); iLast = -1; tLast = nullptr; //żaden nie sprawdzony @@ -1429,13 +1437,13 @@ TController::braking_distance_multiplier( float const Targetvelocity ) const { return interpolate( 2.f, 1.f, static_cast( mvOccupied->Vel / 40.0 ) ); } // HACK: cargo trains or trains going downhill with high braking threshold need more distance to come to a full stop - if( ( fBrake_a0[ 0 ] > 0.2 ) - && ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) - || ( fAccGravity > 0.025 ) ) { + if( ( fBrake_a0[ 1 ] > 0.2 ) + && ( ( true == IsCargoTrain ) + || ( fAccGravity > 0.025 ) ) ) { return interpolate( 1.f, 2.f, clamp( - ( fBrake_a0[ 0 ] - 0.2 ) / 0.2, + ( fBrake_a0[ 1 ] - 0.2 ) / 0.2, 0.0, 1.0 ) ); } @@ -1868,59 +1876,71 @@ void TController::AutoRewident() } d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } - //teraz zerujemy tabelkę opóźnienia hamowania - double velstep = (mvOccupied->Vmax*0.5) / BrakeAccTableSize; - for (int i = 0; i < BrakeAccTableSize; i++) + //ustawianie trybu pracy zadajnika hamulca, wystarczy raz po inicjalizacji AI + for( int i = 1; i <= 8; i *= 2 ) { + if( ( mvOccupied->BrakeOpModes & i ) > 0 ) { + mvOccupied->BrakeOpModeFlag = i; + } + } + // teraz zerujemy tabelkę opóźnienia hamowania + for (int i = 0; i < BrakeAccTableSize; ++i) { fBrake_a0[i+1] = 0; fBrake_a1[i+1] = 0; } // 4. Przeliczanie siły hamowania + double const velstep = ( mvOccupied->Vmax*0.5 ) / BrakeAccTableSize; d = pVehicles[0]; // pojazd na czele składu - // HACK: calculated brake thresholds for cars are so high they prevent the AI from effectively braking - // thus we artificially reduce them until a better solution for the problem is found - auto const braketablescale { ( - d->MoverParameters->CategoryFlag == 2 ? - 0.6 : - 1.0 ) }; while (d) { for( int i = 0; i < BrakeAccTableSize; ++i ) { - fBrake_a0[ i + 1 ] += braketablescale * d->MoverParameters->BrakeForceR( 0.25, velstep*( 1 + 2 * i ) ); - fBrake_a1[ i + 1 ] += braketablescale * d->MoverParameters->BrakeForceR( 1.00, velstep*( 1 + 2 * i ) ); + fBrake_a0[ i + 1 ] += d->MoverParameters->BrakeForceR( 0.25, velstep*( 1 + 2 * i ) ); + fBrake_a1[ i + 1 ] += d->MoverParameters->BrakeForceR( 1.00, velstep*( 1 + 2 * i ) ); } d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } - for (int i = 0; i < BrakeAccTableSize; i++) + for (int i = 0; i < BrakeAccTableSize; ++i) { fBrake_a1[i+1] -= fBrake_a0[i+1]; fBrake_a0[i+1] /= fMass; fBrake_a0[i + 1] += 0.001*velstep*(1 + 2 * i); fBrake_a1[i+1] /= (12*fMass); } + + IsCargoTrain = ( mvOccupied->CategoryFlag == 1 ) && ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ); + IsHeavyCargoTrain = ( true == IsCargoTrain ) && ( fBrake_a0[ 1 ] > 0.4 ); + + BrakingInitialLevel = ( + IsHeavyCargoTrain ? 1.25 : + IsCargoTrain ? 1.25 : + 1.00 ); + + BrakingLevelIncrease = ( + IsHeavyCargoTrain ? 0.25 : + IsCargoTrain ? 0.25 : + 0.25 ); + if( mvOccupied->TrainType == dt_EZT ) { - fAccThreshold = std::max(-fBrake_a0[BrakeAccTableSize] - 8 * fBrake_a1[BrakeAccTableSize], -0.55); + fAccThreshold = std::max( -0.55, -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ] ); fBrakeReaction = 0.25; } else if( mvOccupied->TrainType == dt_DMU ) { - fAccThreshold = std::max( -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ], -0.45 ); + fAccThreshold = std::max( -0.45, -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ] ); fBrakeReaction = 0.25; } - else if (ustaw > 16) - { - fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 4 * fBrake_a1[BrakeAccTableSize]; + else if (ustaw > 16) { + fAccThreshold = -fBrake_a0[ BrakeAccTableSize ] - 4 * fBrake_a1[ BrakeAccTableSize ]; fBrakeReaction = 1.00 + fLength*0.004; } - else - { - fAccThreshold = -fBrake_a0[BrakeAccTableSize] - 1 * fBrake_a1[BrakeAccTableSize]; + else { + fAccThreshold = -fBrake_a0[ BrakeAccTableSize ] - 1 * fBrake_a1[ BrakeAccTableSize ]; fBrakeReaction = 1.00 + fLength*0.005; } - for (int i = 1; i <= 8; i *= 2) //ustawianie trybu pracy zadajnika hamulca, wystarczy raz po inicjalizacji AI - { - if ((mvOccupied->BrakeOpModes & i) > 0) { - mvOccupied->BrakeOpModeFlag = i; - } - } +/* + if( IsHeavyCargoTrain ) { + // HACK: heavy cargo trains don't activate brakes early enough + fAccThreshold = std::max( -0.2, fAccThreshold ); + } +*/ } double TController::ESMVelocity(bool Main) @@ -2418,7 +2438,10 @@ bool TController::PrepareEngine() mvControlling->IncMainCtrl( 1 ); } } - mvControlling->MainSwitch(true); + if( ( mvControlling->EnginePowerSource.SourceType != TPowerSource::CurrentCollector ) + || ( std::max( mvControlling->GetTrainsetVoltage(), std::abs( mvControlling->RunningTraction.TractionVoltage ) ) > mvControlling->EnginePowerSource.CollectorParameters.MinV ) ) { + mvControlling->MainSwitch( true ); + } /* if (mvControlling->EngineType == DieselEngine) { // Ra 2014-06: dla SN61 trzeba wrzucić pierwszą pozycję - nie wiem, czy tutaj... @@ -2621,7 +2644,9 @@ bool TController::IncBrake() d = pVehicles[0]; // pojazd na czele składu while (d) { // przeliczanie dodatkowego potrzebnego spadku ciśnienia - pos_corr+=(d->MoverParameters->Hamulec->GetCRP() - 5.0)*d->MoverParameters->TotalMass; + if( ( d->MoverParameters->Hamulec->GetBrakeStatus() & b_dmg ) == 0 ) { + pos_corr += ( d->MoverParameters->Hamulec->GetCRP() - 5.0 ) * d->MoverParameters->TotalMass; + } d = d->Next(); // kolejny pojazd, podłączony od tyłu (licząc od czoła) } pos_corr = pos_corr / fMass * 2.5; @@ -2636,10 +2661,7 @@ bool TController::IncBrake() if( deltaAcc > fBrake_a1[0]) { if( mvOccupied->BrakeCtrlPosR < 0.1 ) { - OK = mvOccupied->BrakeLevelAdd( ( - mvOccupied->BrakeDelayFlag > bdelay_G ? - 1.0 : - 1.25 ) ); + OK = mvOccupied->BrakeLevelAdd( BrakingInitialLevel ); /* // HACK: stronger braking to overcome SA134 engine behaviour if( ( mvOccupied->TrainType == dt_DMU ) @@ -2654,10 +2676,11 @@ bool TController::IncBrake() } else { - OK = mvOccupied->BrakeLevelAdd( 0.25 ); - if( ( deltaAcc > 5 * fBrake_a1[ 0 ] ) - && ( mvOccupied->BrakeCtrlPosR <= 3.0 ) ) { - mvOccupied->BrakeLevelAdd( 0.75 ); + OK = mvOccupied->BrakeLevelAdd( BrakingLevelIncrease ); + // brake harder if the acceleration is much higher than desired + if( ( deltaAcc > 2 * fBrake_a1[ 0 ] ) + && ( mvOccupied->BrakeCtrlPosR + BrakingLevelIncrease <= 5.0 ) ) { + mvOccupied->BrakeLevelAdd( BrakingLevelIncrease ); } } } @@ -2793,36 +2816,42 @@ bool TController::IncSpeed() // na pozycji 0 przejdzie, a na pozostałych będzie czekać, aż się załączą liniowe (zgaśnie DelayCtrlFlag) if (Ready || (iDrivigFlags & movePress)) { // use series mode: - // to build up speed to 30/40 km/h for passenger/cargo train (10 km/h less if going uphill) // if high threshold is set for motor overload relay, - // if the power station is heavily burdened + // if the power station is heavily burdened, + // if it generates enough traction force + // to build up speed to 30/40 km/h for passenger/cargo train (10 km/h less if going uphill) + auto const sufficienttractionforce { std::abs( mvControlling->Ft ) > ( IsHeavyCargoTrain ? 125 : 100 ) * 1000.0 }; auto const useseriesmodevoltage { 0.80 * mvControlling->EnginePowerSource.CollectorParameters.MaxV }; + auto const seriesmodefieldshunting { ( mvControlling->ScndCtrlPos > 0 ) && ( mvControlling->RList[ mvControlling->MainCtrlPos ].Bn == 1 ) }; + auto const parallelmodefieldshunting { ( mvControlling->ScndCtrlPos > 0 ) && ( mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1 ) }; auto const useseriesmode = ( - ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 35 : 25 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) - ( ( fAccGravity < -0.025 ) ? 10 : 0 ) ) - || ( mvControlling->Imax > mvControlling->ImaxLo ) - || ( fVoltage < useseriesmodevoltage ) ); + ( mvControlling->Imax > mvControlling->ImaxLo ) + || ( fVoltage < useseriesmodevoltage ) + || ( ( true == sufficienttractionforce ) + && ( mvOccupied->Vel <= ( IsCargoTrain ? 35 : 25 ) + ( seriesmodefieldshunting ? 5 : 0 ) - ( ( fAccGravity < -0.025 ) ? 10 : 0 ) ) ) ); // when not in series mode use the first available parallel mode configuration until 50/60 km/h for passenger/cargo train // (if there's only one parallel mode configuration it'll be used regardless of current speed) - auto const scndctrl = ( + auto const usefieldshunting = ( ( mvControlling->StLinFlag ) && ( mvControlling->RList[ mvControlling->MainCtrlPos ].R < 0.01 ) && ( useseriesmode ? mvControlling->RList[ mvControlling->MainCtrlPos ].Bn == 1 : - ( ( mvOccupied->Vel <= ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ? 55 : 45 ) + ( mvControlling->ScndCtrlPos == 0 ? 0 : 5 ) ) ? + ( ( true == sufficienttractionforce ) + && ( mvOccupied->Vel <= ( IsCargoTrain ? 55 : 45 ) + ( parallelmodefieldshunting ? 5 : 0 ) ) ? mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1 : mvControlling->MainCtrlPos == mvControlling->MainCtrlPosNo ) ) ); double Vs = 99999; - if( scndctrl ? + if( usefieldshunting ? ( mvControlling->ScndCtrlPos < mvControlling->ScndCtrlPosNo ) : ( mvControlling->MainCtrlPos < mvControlling->MainCtrlPosNo ) ) { - Vs = ESMVelocity( !scndctrl ); + Vs = ESMVelocity( !usefieldshunting ); } if( ( std::abs( mvControlling->Im ) < ( fReady < 0.4 ? mvControlling->Imin : mvControlling->IminLo ) ) || ( mvControlling->Vel > Vs ) ) { // Ra: wywalał nadmiarowy, bo Im może być ujemne; jak nie odhamowany, to nie przesadzać z prądem - if( scndctrl ) { + if( usefieldshunting ) { // to dać bocznik // engage the shuntfield only if there's sufficient power margin to draw from OK = ( @@ -3787,12 +3816,13 @@ TController::UpdateSituation(double dt) { // Ra: odluźnianie przeładowanych lokomotyw, ciągniętych na zimno - prowizorka... if (AIControllFlag) // skład jak dotąd był wyluzowany { - if (mvOccupied->BrakeCtrlPos == 0) // jest pozycja jazdy - if ((p->MoverParameters->PipePress - 5.0) > - -0.1) // jeśli ciśnienie jak dla jazdy - if (p->MoverParameters->Hamulec->GetCRP() > - p->MoverParameters->PipePress + 0.12) // za dużo w zbiorniku - p->MoverParameters->BrakeReleaser(1); // indywidualne luzowanko + if( ( mvOccupied->BrakeCtrlPos == 0 ) // jest pozycja jazdy + && ( ( p->MoverParameters->Hamulec->GetBrakeStatus() & b_dmg ) == 0 ) // brake isn't broken + && ( p->MoverParameters->PipePress - 5.0 > -0.1 ) // jeśli ciśnienie jak dla jazdy + && ( p->MoverParameters->Hamulec->GetCRP() > p->MoverParameters->PipePress + 0.12 ) ) { // za dużo w zbiorniku + // indywidualne luzowanko + p->MoverParameters->BrakeReleaser( 1 ); + } if (p->MoverParameters->Power > 0.01) // jeśli ma silnik if (p->MoverParameters->FuseFlag) // wywalony nadmiarowy Need_TryAgain = true; // reset jak przy wywaleniu nadmiarowego @@ -4355,34 +4385,14 @@ TController::UpdateSituation(double dt) { } case Shunt: { // na jaką odleglość i z jaką predkością ma podjechać -/* - fMinProximityDist = 5.0; - fMaxProximityDist = 10.0; //[m] - - if( pVehicles[ 0 ] != pVehicles[ 1 ] ) { - // for larger consists increase margins to account for slower braking etc - // NOTE: this will affect also multi-unit vehicles TBD: is this what we want? - fMinProximityDist *= 2.0; - fMaxProximityDist *= 2.0; - if( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) { - // additional safety margin for cargo consists - fMinProximityDist *= 2.0; - fMaxProximityDist *= 2.0; - if( fBrake_a0[ 0 ] >= 0.35 ) { - // cargo trains with high braking threshold may require even larger safety margin - fMaxProximityDist += 20.0; - } - } - } -*/ + // TODO: test if we can use the distances calculation from obey_train fMinProximityDist = std::min( 5 + iVehicles, 25 ); fMaxProximityDist = std::min( 10 + iVehicles, 50 ); - if( ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) - && ( fBrake_a0[ 0 ] >= 0.35 ) ) { - // cargo trains with high braking threshold may require even larger safety margin +/* + if( IsHeavyCargoTrain ) { fMaxProximityDist *= 1.5; } - +*/ fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania // margines prędkości powodujący załączenie napędu // były problemy z jazdą np. 3km/h podczas ładowania wagonów @@ -4393,11 +4403,25 @@ TController::UpdateSituation(double dt) { // na jaka odleglosc i z jaka predkoscia ma podjechac do przeszkody if( mvOccupied->CategoryFlag & 1 ) { // jeśli pociąg - fMinProximityDist = 15.0; - fMaxProximityDist = - ( mvOccupied->Vel > 0.0 ) ? - 25.0 : - 50.0; //[m] jak stanie za daleko, to niech nie dociąga paru metrów + fMinProximityDist = clamp( 5 + iVehicles, 10, 15 ); + fMaxProximityDist = clamp( 10 + iVehicles, 15, 40 ); + + if( IsCargoTrain ) { + // increase distances for cargo trains to take into account slower reaction to brakes + fMinProximityDist += 10.0; + fMaxProximityDist += 10.0; +/* + if( IsHeavyCargoTrain ) { + // cargo trains with high braking threshold may require even larger safety margin + fMaxProximityDist += 20.0; + } +*/ + } + if( mvOccupied->Vel < 0.1 ) { + // jak stanie za daleko, to niech nie dociąga paru metrów + fMaxProximityDist = 50.0; + } + if( iDrivigFlags & moveLate ) { // jeśli spóźniony, to gna fVelMinus = 1.0; @@ -4412,20 +4436,11 @@ TController::UpdateSituation(double dt) { // bottom margin raised to 2 km/h to give the AI more leeway at low speed limits fVelPlus = clamp( std::ceil( 0.05 * VelDesired ), 2.0, 5.0 ); } - if( mvOccupied->BrakeDelayFlag == bdelay_G ) { - // increase distances for cargo trains to take into account slower reaction to brakes - fMinProximityDist += 10.0; - fMaxProximityDist += 15.0; - if( fBrake_a0[ 0 ] >= 0.35 ) { - // cargo trains with high braking threshold may require even larger safety margin - fMaxProximityDist += 20.0; - } - } } else { // samochod (sokista też) - fMinProximityDist = std::max( 3.0, mvOccupied->Vel * 0.2 ); - fMaxProximityDist = std::max( 9.0, mvOccupied->Vel * 0.375 ); //[m] + fMinProximityDist = std::max( 3.5, mvOccupied->Vel * 0.2 ); + fMaxProximityDist = std::max( 9.5, mvOccupied->Vel * 0.375 ); //[m] // margines prędkości powodujący załączenie napędu fVelMinus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania @@ -4701,14 +4716,15 @@ TController::UpdateSituation(double dt) { fMinProximityDist : // cars can bunch up tighter fMaxProximityDist ) ); // other vehicle types less so */ - ActualProximityDist = std::min( - ActualProximityDist, - vehicle->fTrackBlock ); double k = coupler->Connected->Vel; // prędkość pojazdu z przodu (zakładając, // że jedzie w tę samą stronę!!!) - if( k - vel < 10 ) { + if( k - vel < 5 ) { // porównanie modułów prędkości [km/h] // zatroszczyć się trzeba, jeśli tamten nie jedzie znacząco szybciej + ActualProximityDist = std::min( + ActualProximityDist, + vehicle->fTrackBlock ); + double const distance = vehicle->fTrackBlock - fMaxProximityDist - ( fBrakeDist * 1.15 ); // odległość bezpieczna zależy od prędkości if( distance < 0.0 ) { // jeśli odległość jest zbyt mała @@ -4939,13 +4955,17 @@ TController::UpdateSituation(double dt) { } else { // outside of max safe range + AccDesired = AccPreferred; if( vel > min_speed( 10.0, VelDesired ) ) { // allow to coast at reasonably low speed + auto const brakingdistance { fBrakeDist * braking_distance_multiplier( VelNext ) }; auto const slowdowndistance { ( - ( OrderCurrentGet() & Connect ) == 0 ? - 100.0 : - 25.0 ) }; - if( ( std::max( slowdowndistance, fMaxProximityDist ) + fBrakeDist * braking_distance_multiplier( VelNext ) ) >= ( ActualProximityDist - fMaxProximityDist ) ) { + mvOccupied->CategoryFlag == 2 ? // cars can stop on a dime, for bigger vehicles we enforce some minimal braking distance + brakingdistance : + std::max( + ( ( OrderCurrentGet() & Connect ) == 0 ? 100.0 : 25.0 ), + brakingdistance ) ) }; + if( ( brakingdistance + std::max( slowdowndistance, fMaxProximityDist ) ) >= ( ActualProximityDist - fMaxProximityDist ) ) { // don't slow down prematurely; as long as we have room to come to a full stop at a safe distance, we're good // ensure some minimal coasting speed, otherwise a vehicle entering this zone at very low speed will be crawling forever auto const brakingpointoffset = VelNext * braking_distance_multiplier( VelNext ); @@ -5060,8 +5080,8 @@ TController::UpdateSituation(double dt) { // if it looks like we'll exceed maximum speed start thinking about slight slowing down AccDesired = std::min( AccDesired, -0.25 ); // HACK: for cargo trains with high braking threshold ensure we cross that threshold - if( ( ( mvOccupied->BrakeDelayFlag & bdelay_G ) != 0 ) - && ( fBrake_a0[ 0 ] > 0.2 ) ) { + if( ( true == IsCargoTrain ) + && ( fBrake_a0[ 0 ] > 0.2 ) ) { AccDesired -= clamp( fBrake_a0[ 0 ] - 0.2, 0.0, 0.15 ); } } @@ -5119,7 +5139,10 @@ TController::UpdateSituation(double dt) { // last step sanity check, until the whole calculation is straightened out AccDesired = std::min( AccDesired, AccPreferred ); - AccDesired = clamp( AccDesired, -0.9, 0.9 ); + AccDesired = clamp( + AccDesired, + ( mvControlling->CategoryFlag == 2 ? -2.0 : -0.9 ), + ( mvControlling->CategoryFlag == 2 ? 2.0 : 0.9 ) ); if (AIControllFlag) { // część wykonawcza tylko dla AI, dla człowieka jedynie napisy @@ -5211,7 +5234,7 @@ TController::UpdateSituation(double dt) { && ( BrakeChargingCooldown >= 0.0 ) ) { if( ( iDrivigFlags & moveOerlikons ) - || ( mvOccupied->BrakeDelayFlag & bdelay_G ) ) { + || ( true == IsCargoTrain ) ) { // napełnianie w Oerlikonie mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_FS ) ); // don't charge the brakes too often, or we risk overcharging diff --git a/Driver.h b/Driver.h index 581ba9b4..e7a05617 100644 --- a/Driver.h +++ b/Driver.h @@ -13,6 +13,7 @@ http://mozilla.org/MPL/2.0/. #include "Classes.h" #include "mczapkie/mover.h" #include "sound.h" +#include "dynobj.h" enum TOrders { // rozkazy dla AI @@ -208,8 +209,15 @@ public: double fBrakeReaction = 1.0; //opóźnienie zadziałania hamulca - czas w s / (km/h) double fAccThreshold = 0.0; // próg opóźnienia dla zadziałania hamulca double AbsAccS_pub = 0.0; // próg opóźnienia dla zadziałania hamulca - double fBrake_a0[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca - double fBrake_a1[BrakeAccTableSize+1] = { 0.0 }; // próg opóźnienia dla zadziałania hamulca + // dla fBrake_aX: + // indeks [0] - wartości odpowiednie dla aktualnej prędkości + // a potem jest 20 wartości dla różnych prędkości zmieniających się co 5 % Vmax pojazdu obsadzonego + double fBrake_a0[BrakeAccTableSize+1] = { 0.0 }; // opóźnienia hamowania przy ustawieniu zaworu maszynisty w pozycji 1.0 + double fBrake_a1[BrakeAccTableSize+1] = { 0.0 }; // przyrost opóźnienia hamowania po przestawieniu zaworu maszynisty o 0,25 pozycji + double BrakingInitialLevel{ 1.0 }; + double BrakingLevelIncrease{ 0.25 }; + bool IsCargoTrain{ false }; + bool IsHeavyCargoTrain{ false }; double fLastStopExpDist = -1.0; // odległość wygasania ostateniego przystanku double ReactionTime = 0.0; // czas reakcji Ra: czego i na co? świadomości AI double fBrakeTime = 0.0; // wpisana wartość jest zmniejszana do 0, gdy ujemna należy zmienić nastawę hamulca @@ -354,7 +362,7 @@ private: std::vector CheckTrackEvent(TTrack *Track, double const fDirection ) const; bool TableAddNew(); bool TableNotFound(TEvent const *Event) const; - void TableTraceRoute(double fDistance, TDynamicObject *pVehicle = nullptr); + void TableTraceRoute(double fDistance, TDynamicObject *pVehicle); void TableCheck(double fDistance); TCommandType TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc); // modifies brake distance for low target speeds, to ease braking rate in such situations @@ -412,4 +420,8 @@ private: std::string OwnerName() const; TMoverParameters const *Controlling() const { return mvControlling; } + int Direction() const { + return iDirection; } + TDynamicObject const *Vehicle() const { + return pVehicle; } }; diff --git a/DynObj.cpp b/DynObj.cpp index c019cd46..2cd111c3 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2772,66 +2772,6 @@ bool TDynamicObject::Update(double dt, double dt1) if (!bEnabled) return false; // a normalnie powinny mieć bEnabled==false - // McZapkie-260202 - if ((MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) && - (MoverParameters->Power > 1.0)) // aby rozrządczy nie opuszczał silnikowemu -/* - if ((MechInside) || (MoverParameters->TrainType == dt_EZT)) - { -*/ - // if - // ((!MoverParameters->PantCompFlag)&&(MoverParameters->CompressedVolume>=2.8)) - // MoverParameters->PantVolume=MoverParameters->CompressedVolume; - - if( MoverParameters->PantPress < MoverParameters->EnginePowerSource.CollectorParameters.MinPress ) { - // 3.5 wg http://www.transportszynowy.pl/eu06-07pneumat.php - if( true == MoverParameters->PantPressSwitchActive ) { - // opuszczenie pantografów przy niskim ciśnieniu -/* - // NOTE: disabled, the pantographs drop by themseleves when the pantograph tank pressure gets low enough - MoverParameters->PantFront( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ); - MoverParameters->PantRear( false, ( MoverParameters->TrainType == dt_EZT ? range::unit : range::local ) ); -*/ - if( MoverParameters->TrainType != dt_EZT ) { - // pressure switch safety measure -- open the line breaker, unless there's alternate source of traction voltage - if( MoverParameters->GetTrainsetVoltage() < 0.5 * MoverParameters->EnginePowerSource.MaxVoltage ) { - // TODO: check whether line breaker should be open EMU-wide - MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? range_t::unit : range_t::local ) ); - } - } - else { - // specialized variant for EMU -- pwr system disables converter and heating, - // and prevents their activation until pressure switch is set again - MoverParameters->PantPressLockActive = true; - // TODO: separate 'heating allowed' from actual heating flag, so we can disable it here without messing up heating toggle - MoverParameters->ConverterSwitch( false, range_t::unit ); - } - // mark the pressure switch as spent - MoverParameters->PantPressSwitchActive = false; - } - } - else { - if( MoverParameters->PantPress >= 4.6 ) { - // NOTE: we require active low power source to prime the pressure switch - // this is a work-around for potential isssues caused by the switch activating on otherwise idle vehicles, but should check whether it's accurate - if( ( true == MoverParameters->Battery ) - || ( true == MoverParameters->ConverterFlag ) ) { - // prime the pressure switch - MoverParameters->PantPressSwitchActive = true; - // turn off the subsystems lock - MoverParameters->PantPressLockActive = false; - } - - if( MoverParameters->PantPress >= 4.8 ) { - // Winger - automatyczne wylaczanie malej sprezarki - // TODO: governor lock, disables usage until pressure drop below 3.8 (should really make compressor object we could reuse) - MoverParameters->PantCompFlag = false; - } - } - } -/* - } // Ra: do Mover to trzeba przenieść, żeby AI też mogło sobie podpompować -*/ double dDOMoveLen; TLocation l; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 25133abb..1fb943dd 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -733,8 +733,9 @@ void TMoverParameters::UpdatePantVolume(double dt) // Ra 2014-07: kurek trójdrogowy łączy spr.pom. z pantografami i wyłącznikiem ciśnieniowym WS // Ra 2014-07: zbiornika rozrządu nie pompuje się tu, tylko pantografy; potem można zamknąć // WS i odpalić resztę - if ((TrainType == dt_EZT) ? (PantPress < ScndPipePress) : - bPantKurek3) // kurek zamyka połączenie z ZG + if ((TrainType == dt_EZT) ? + (PantPress < ScndPipePress) : + bPantKurek3) // kurek zamyka połączenie z ZG { // zbiornik pantografu połączony ze zbiornikiem głównym - małą sprężarką się tego nie napompuje // Ra 2013-12: Niebugocław mówi, że w EZT nie ma potrzeby odcinać kurkiem PantPress = ScndPipePress; @@ -758,33 +759,48 @@ void TMoverParameters::UpdatePantVolume(double dt) } if( !PantCompFlag && ( PantVolume > 0.1 ) ) PantVolume -= dt * 0.0003 * std::max( 1.0, PantPress * 0.5 ); // nieszczelności: 0.0003=0.3l/s -/* - // NOTE: disabled as this is redundant with check done in dynobj.update() - // TODO: determine if this isn't a mistake -- - // though unlikely it's possible this is emulation of a different circuit than the pantograph pressure switch, with similar function? - // TBD, TODO: alternatively, move the dynobj.update() subroutine here, as it doesn't touch elements outside of the mover object - if( Mains ) { - // nie wchodzić w funkcję bez potrzeby - if( EngineType == ElectricSeriesMotor ) { - // nie dotyczy... czego właściwie? - if( ( true == PantPressSwitchActive ) - && ( PantPress < EnginePowerSource.CollectorParameters.MinPress ) ) { - // wywalenie szybkiego z powodu niskiego ciśnienia - if( GetTrainsetVoltage() < 0.5 * EnginePowerSource.MaxVoltage ) { - // to jest trochę proteza; zasilanie członu może być przez sprzęg WN - if( MainSwitch( false, ( TrainType == dt_EZT ? range::unit : range::local ) ) ) { - EventFlag = true; - } + + if( PantPress < EnginePowerSource.CollectorParameters.MinPress ) { + // 3.5 wg http://www.transportszynowy.pl/eu06-07pneumat.php + if( true == PantPressSwitchActive ) { + // opuszczenie pantografów przy niskim ciśnieniu + if( TrainType != dt_EZT ) { + // pressure switch safety measure -- open the line breaker, unless there's alternate source of traction voltage + if( GetTrainsetVoltage() < EnginePowerSource.CollectorParameters.MinV ) { + // TODO: check whether line breaker should be open EMU-wide + MainSwitch( false, ( TrainType == dt_EZT ? range_t::unit : range_t::local ) ); } + } + else { + // specialized variant for EMU -- pwr system disables converter and heating, + // and prevents their activation until pressure switch is set again + PantPressLockActive = true; + // TODO: separate 'heating allowed' from actual heating flag, so we can disable it here without messing up heating toggle + ConverterSwitch( false, range_t::unit ); + } + // mark the pressure switch as spent + PantPressSwitchActive = false; + } + } + else { + if( PantPress >= 4.6 ) { + // NOTE: we require active low power source to prime the pressure switch + // this is a work-around for potential isssues caused by the switch activating on otherwise idle vehicles, but should check whether it's accurate + if( ( true == Battery ) + || ( true == ConverterFlag ) ) { + // prime the pressure switch + PantPressSwitchActive = true; + // turn off the subsystems lock + PantPressLockActive = false; + } - // NOTE: disabled, the flag gets set in dynobj.update() when the pantograph actually drops - // mark the pressure switch as spent, regardless whether line breaker actually opened - PantPressSwitchActive = false; - + if( PantPress >= 4.8 ) { + // Winger - automatyczne wylaczanie malej sprezarki + // TODO: governor lock, disables usage until pressure drop below 3.8 (should really make compressor object we could reuse) + PantCompFlag = false; } } } -*/ /* // NOTE: pantograph tank pressure sharing experimentally disabled for more accurate simulation if (TrainType != dt_EZT) // w EN57 pompuje się tylko w silnikowym @@ -1351,9 +1367,6 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap } // liczone dL, predkosc i przyspieszenie - if (Power > 1.0) // w rozrządczym nie (jest błąd w FIZ!) - Ra 2014-07: teraz we wszystkich - UpdatePantVolume(dt); // Ra 2014-07: obsługa zbiornika rozrządu oraz pantografów - auto const d { ( EngineType == TEngineType::WheelsDriven ? dL * CabNo : // na chwile dla testu @@ -1364,6 +1377,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap // koniec procedury, tu nastepuja dodatkowe procedury pomocnicze compute_movement_( dt ); + // security system if (!DebugModeFlag) SecuritySystemCheck(dt1); @@ -1430,9 +1444,6 @@ double TMoverParameters::FastComputeMovement(double dt, const TTrackShape &Shape if (Couplers[b].CheckCollision) CollisionDetect(b, dt); // zmienia niejawnie AccS, V !!! } // liczone dL, predkosc i przyspieszenie - // QQQ - if (Power > 1.0) // w rozrządczym nie (jest błąd w FIZ!) - UpdatePantVolume(dt); // Ra 2014-07: obsługa zbiornika rozrządu oraz pantografów auto const d { ( EngineType == TEngineType::WheelsDriven ? @@ -1482,6 +1493,11 @@ void TMoverParameters::compute_movement_( double const Deltatime ) { // sprężarka musi mieć jakąś niezerową wydajność żeby rozważać jej załączenie i pracę CompressorCheck( Deltatime ); } + if( Power > 1.0 ) { + // w rozrządczym nie (jest błąd w FIZ!) - Ra 2014-07: teraz we wszystkich + UpdatePantVolume( Deltatime ); // Ra 2014-07: obsługa zbiornika rozrządu oraz pantografów + } + UpdateBrakePressure(Deltatime); UpdatePipePressure(Deltatime); UpdateBatteryVoltage(Deltatime); @@ -2695,61 +2711,21 @@ bool TMoverParameters::IncBrakeLevelOld(void) { bool IBLO = false; - if ((BrakeCtrlPosNo > 0) /*and (LocalBrakePos=0)*/) + if (BrakeCtrlPosNo > 0) { if (BrakeCtrlPos < BrakeCtrlPosNo) { - BrakeCtrlPos++; - // BrakeCtrlPosR = BrakeCtrlPos; - - // youBy: wywalilem to, jak jest EP, to sa przenoszone sygnaly nt. co ma robic, a nie - // poszczegolne pozycje; - // wystarczy spojrzec na Knorra i Oerlikona EP w EN57; mogly ze soba - // wspolapracowac - //{ - // if (BrakeSystem==ElectroPneumatic) - // if (BrakePressureActual.BrakeType==ElectroPneumatic) - // { - // BrakeStatus = ord(BrakeCtrlPos > 0); - // SendCtrlToNext("BrakeCtrl", BrakeCtrlPos, CabNo); - // } - // else SendCtrlToNext("BrakeCtrl", -2, CabNo); - // else - // if (!TestFlag(BrakeStatus,b_dmg)) - // BrakeStatus = b_on;} - + ++BrakeCtrlPos; // youBy: EP po nowemu - IBLO = true; if ((BrakePressureActual.PipePressureVal < 0) && (BrakePressureTable[BrakeCtrlPos - 1].PipePressureVal > 0)) LimPipePress = PipePress; - - //ten kawałek jest bez sensu gdyż nic nie robił. Zakomntowałem. GF 20161124 - //if (BrakeSystem == ElectroPneumatic) - // if (BrakeSubsystem != ss_K) - // { - // if ((BrakeCtrlPos * BrakeCtrlPos) == 1) - // { - // // SendCtrlToNext('Brake',BrakeCtrlPos,CabNo); - // // SetFlag(BrakeStatus,b_epused); - // } - // else - // { - // // SendCtrlToNext('Brake',0,CabNo); - // // SetFlag(BrakeStatus,-b_epused); - // } - // } } - else - { + else { IBLO = false; - // if (BrakeSystem == Pneumatic) - // EmergencyBrakeSwitch(true); } } - else - IBLO = false; return IBLO; } @@ -2762,69 +2738,20 @@ bool TMoverParameters::DecBrakeLevelOld(void) { bool DBLO = false; - if ((BrakeCtrlPosNo > 0) /*&& (LocalBrakePos == 0)*/) + if (BrakeCtrlPosNo > 0) { - if (BrakeCtrlPos > -1 - int(BrakeHandle == TBrakeHandle::FV4a)) + if (BrakeCtrlPos > ( ( BrakeHandle == TBrakeHandle::FV4a ) ? -2 : -1 ) ) { - BrakeCtrlPos--; - // BrakeCtrlPosR:=BrakeCtrlPos; - //if (EmergencyBrakeFlag) - //{ - // EmergencyBrakeFlag = false; //!!! - // SendCtrlToNext("Emergency_brake", 0, CabNo); - //} - - // youBy: wywalilem to, jak jest EP, to sa przenoszone sygnaly nt. co ma robic, a nie - // poszczegolne pozycje; - // wystarczy spojrzec na Knorra i Oerlikona EP w EN57; mogly ze soba - // wspolapracowac - /* - if (BrakeSystem == ElectroPneumatic) - if (BrakePressureActual.BrakeType == ElectroPneumatic) - { - // BrakeStatus =ord(BrakeCtrlPos > 0); - SendCtrlToNext("BrakeCtrl",BrakeCtrlPos,CabNo); - } - else SendCtrlToNext('BrakeCtrl',-2,CabNo); - // else} - // if (not TestFlag(BrakeStatus,b_dmg) and (not - TestFlag(BrakeStatus,b_release))) then - // BrakeStatus:=b_off; {luzowanie jesli dziala oraz nie byl wlaczony - odluzniacz - */ - + --BrakeCtrlPos; // youBy: EP po nowemu DBLO = true; - // if ((BrakePressureTable[BrakeCtrlPos].PipePressureVal<0.0) && - // (BrakePressureTable[BrakeCtrlPos+1].PipePressureVal > 0)) - // LimPipePress:=PipePress; - - // to nic nie robi. Zakomentowałem. GF 20161124 - //if (BrakeSystem == ElectroPneumatic) - // if (BrakeSubsystem != ss_K) - // { - // if ((BrakeCtrlPos * BrakeCtrlPos) == 1) - // { - // // SendCtrlToNext("Brake", BrakeCtrlPos, CabNo); - // // SetFlag(BrakeStatus, b_epused); - // } - // else - // { - // // SendCtrlToNext("Brake", 0, CabNo); - // // SetFlag(BrakeStatus, -b_epused); - // } - // } - // for b:=0 to 1 do {poprawic to!} - // with Couplers[b] do - // if CouplingFlag and ctrain_controll=ctrain_controll then - // Connected^.BrakeCtrlPos:=BrakeCtrlPos; - // +// if ((BrakePressureTable[BrakeCtrlPos].PipePressureVal<0.0) && +// (BrakePressureTable[BrakeCtrlPos+1].PipePressureVal > 0)) +// LimPipePress=PipePress; } else DBLO = false; } - else - DBLO = false; return DBLO; } diff --git a/Track.cpp b/Track.cpp index 497ddfb2..09663ef7 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1409,7 +1409,10 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { case tt_Switch: // dla zwrotnicy dwa razy szyny if( m_material1 || m_material2 ) { // iglice liczone tylko dla zwrotnic - gfx::basic_vertex rpts3[24], rpts4[24]; + gfx::basic_vertex + rpts3[24], + rpts4[24]; + glm::vec3 const flipxvalue { -1, 1, 1 }; for( int i = 0; i < 12; ++i ) { rpts3[ i ] = { @@ -1428,17 +1431,17 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { { ( -fHTW - iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, -( -fHTW - iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, 0.f}, - {iglica[ i ].normal}, + {iglica[ i ].normal * flipxvalue}, {iglica[ i ].texture.x, 0.f} }; rpts4[ 23 - i ] = { { ( -fHTW2 - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, -( -fHTW2 - szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, 0.f}, - {szyna[ i ].normal}, + {szyna[ i ].normal * flipxvalue}, {szyna[ i ].texture.x, 0.f} }; } // TODO, TBD: change all track geometry to triangles, to allow packing data in less, larger buffers - auto const bladelength { 2 * Global.SplineFidelity }; + auto const bladelength { static_cast( std::ceil( SwitchExtension->Segments[ 0 ]->RaSegCount() * 0.65 ) ) }; if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa gfx::vertex_array vertices; @@ -2464,6 +2467,7 @@ TTrack * TTrack::RaAnimate() gfx::basic_vertex rpts3[ 24 ], rpts4[ 24 ]; + glm::vec3 const flipxvalue { -1, 1, 1 }; for (int i = 0; i < 12; ++i) { rpts3[ i ] = { @@ -2482,19 +2486,18 @@ TTrack * TTrack::RaAnimate() {+( -fHTW - iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, -( -fHTW - iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, 0.f}, - {iglica[ i ].normal}, + {iglica[ i ].normal * flipxvalue}, {iglica[ i ].texture.x, 0.f} }; rpts4[ 23 - i ] = { { ( -fHTW2 - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, -( -fHTW2 - szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, 0.f}, - {szyna[ i ].normal}, + {szyna[ i ].normal * flipxvalue}, {szyna[ i ].texture.x, 0.f} }; } gfx::vertex_array vertices; - - auto const bladelength { 2 * Global.SplineFidelity }; + auto const bladelength { static_cast( std::ceil( SwitchExtension->Segments[ 0 ]->RaSegCount() * 0.65 ) ) }; if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa if( m_material1 ) { diff --git a/Train.cpp b/Train.cpp index 310ca4f3..0009c254 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4832,8 +4832,8 @@ bool TTrain::Update( double const Deltatime ) // hunter-080812: wyrzucanie szybkiego na elektrykach gdy nie ma napiecia przy dowolnym ustawieniu kierunkowego // Ra: to już jest w T_MoverParameters::TractionForce(), ale zależy od kierunku if( ( mvControlled->Mains ) - && ( mvControlled->EngineType == TEngineType::ElectricSeriesMotor ) ) { - if( std::max( mvControlled->GetTrainsetVoltage(), std::fabs( mvControlled->RunningTraction.TractionVoltage ) ) < 0.5 * mvControlled->EnginePowerSource.MaxVoltage ) { + && ( mvControlled->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) ) { + if( std::max( mvControlled->GetTrainsetVoltage(), std::abs( mvControlled->RunningTraction.TractionVoltage ) ) < 0.5 * mvControlled->EnginePowerSource.MaxVoltage ) { // TODO: check whether it should affect entire consist for EMU // TODO: check whether it should happen if there's power supplied alternatively through hvcouplers // TODO: potentially move this to the mover module, as there isn't much reason to have this dependent on the operator presence @@ -5627,24 +5627,28 @@ bool TTrain::Update( double const Deltatime ) } case 1: { //światło wewnętrzne przygaszone (255 216 176) - if( mvOccupied->ConverterFlag == true ) { - // jasnosc dla zalaczonej przetwornicy - DynamicObject->InteriorLightLevel = 0.4f; - } - else { - DynamicObject->InteriorLightLevel = 0.2f; - } + auto const converteractive { ( + ( mvOccupied->ConverterFlag ) + || ( ( ( mvOccupied->Couplers[ side::front ].CouplingFlag & coupling::permanent ) != 0 ) && mvOccupied->Couplers[ side::front ].Connected->ConverterFlag ) + || ( ( ( mvOccupied->Couplers[ side::rear ].CouplingFlag & coupling::permanent ) != 0 ) && mvOccupied->Couplers[ side::rear ].Connected->ConverterFlag ) ) }; + + DynamicObject->InteriorLightLevel = ( + converteractive ? + 0.4f : + 0.2f ); break; } case 2: { //światło wewnętrzne zapalone (255 216 176) - if( mvOccupied->ConverterFlag == true ) { - // jasnosc dla zalaczonej przetwornicy - DynamicObject->InteriorLightLevel = 1.0f; - } - else { - DynamicObject->InteriorLightLevel = 0.5f; - } + auto const converteractive { ( + ( mvOccupied->ConverterFlag ) + || ( ( ( mvOccupied->Couplers[ side::front ].CouplingFlag & coupling::permanent ) != 0 ) && mvOccupied->Couplers[ side::front ].Connected->ConverterFlag ) + || ( ( ( mvOccupied->Couplers[ side::rear ].CouplingFlag & coupling::permanent ) != 0 ) && mvOccupied->Couplers[ side::rear ].Connected->ConverterFlag ) ) }; + + DynamicObject->InteriorLightLevel = ( + converteractive ? + 1.0f : + 0.5f ); break; } } diff --git a/TrkFoll.cpp b/TrkFoll.cpp index b1bfab6c..0d828768 100644 --- a/TrkFoll.cpp +++ b/TrkFoll.cpp @@ -95,6 +95,11 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) { // przesuwanie wózka po torach o odległość (fDistance), z wyzwoleniem eventów // bPrimary=true - jest pierwszą osią w pojeździe, czyli generuje eventy i przepisuje pojazd // Ra: zwraca false, jeśli pojazd ma być usunięty + auto const ismoving { ( std::abs( fDistance ) > 0.01 ) && ( Owner->GetVelocity() > 0.01 ) }; + int const eventfilter { ( + ( ( true == ismoving ) && ( Owner->ctOwner != nullptr ) ) ? + Owner->ctOwner->Direction() * ( Owner->ctOwner->Vehicle()->DirectionGet() == Owner->DirectionGet() ? 1 : -1 ) * ( fDirection > 0 ? 1 : -1 ) : + 0 ) }; fDistance *= fDirection; // dystans mnożnony przez kierunek double s; // roboczy dystans double dir; // zapamiętany kierunek do sprawdzenia, czy się zmienił @@ -105,8 +110,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) // TODO: refactor following block as track method if( pCurrentTrack->m_events ) { // sumaryczna informacja o eventach // omijamy cały ten blok, gdy tor nie ma on żadnych eventów (większość nie ma) - if( ( std::abs( fDistance ) < 0.01 ) - && ( Owner->GetVelocity() < 0.01 ) ) { + if( false == ismoving ) { //McZapkie-140602: wyzwalanie zdarzenia gdy pojazd stoi if( ( Owner->Mechanik != nullptr ) && ( Owner->Mechanik->Primary() ) ) { @@ -115,7 +119,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) } pCurrentTrack->QueueEvents( pCurrentTrack->m_events0all, Owner ); } - else if (fDistance < 0) { + else if( (fDistance < 0) && ( eventfilter < 0 ) ) { // event1, eventall1 if( SetFlag( iEventFlag, -1 ) ) { // zawsze zeruje flagę sprawdzenia, jak mechanik dosiądzie, to się nie wykona @@ -135,7 +139,7 @@ bool TTrackFollower::Move(double fDistance, bool bPrimary) } } } - else if (fDistance > 0) { + else if( ( fDistance > 0 ) && ( eventfilter > 0 ) ) { // event2, eventall2 if( SetFlag( iEventFlag, -2 ) ) { // zawsze ustawia flagę sprawdzenia, jak mechanik dosiądzie, to się nie wykona diff --git a/material.cpp b/material.cpp index 0cfad9d4..f11b97a1 100644 --- a/material.cpp +++ b/material.cpp @@ -55,14 +55,16 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c ; // all work is done in the header } } - else if( key == "texture1:" ) { + else if( ( key == "texture1:" ) + || ( key == "texture_diffuse:" ) ) { if( ( texture1 == null_handle ) || ( Priority > priority1 ) ) { texture1 = GfxRenderer.Fetch_Texture( value, Loadnow ); priority1 = Priority; } } - else if( key == "texture2:" ) { + else if( ( key == "texture2:" ) + || ( key == "texture_normalmap:" ) ) { if( ( texture2 == null_handle ) || ( Priority > priority2 ) ) { texture2 = GfxRenderer.Fetch_Texture( value, Loadnow ); From 24eda2d63f473f225c384d6df64922a657abaa51 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 19 Aug 2018 14:40:48 +0200 Subject: [PATCH 378/426] AI cruise control fix, minor refactoring --- Driver.cpp | 47 +++++++++-------------------------- Driver.h | 1 - McZapkie/Mover.cpp | 15 +++++------ parser.cpp | 4 +-- scenenodegroups.cpp | 6 ++--- scenenodegroups.h | 6 ++--- simulationstateserializer.cpp | 10 ++++---- 7 files changed, 33 insertions(+), 56 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index d99c45ba..d253e5df 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2906,15 +2906,12 @@ bool TController::IncSpeed() if (Ready || (iDrivigFlags & movePress) || (mvOccupied->ShuntMode)) //{(BrakePress<=0.01*MaxBrakePress)} { OK = mvControlling->IncMainCtrl(std::max(1,mvOccupied->MainCtrlPosNo/10)); - //tutaj jeszcze powinien być tempomat - - double SpeedCntrlVel = VelDesired; - if (fProximityDist < 50) - { - SpeedCntrlVel = std::min(SpeedCntrlVel, VelNext); - } + // cruise control + auto const SpeedCntrlVel { ( + ( ActualProximityDist > std::max( 50.0, fMaxProximityDist ) ) ? + VelDesired : + min_speed( VelDesired, VelNext ) ) }; SpeedCntrl(SpeedCntrlVel); - } break; case TEngineType::WheelsDriven: @@ -3081,20 +3078,15 @@ void TController::SpeedSet() else if (Ready || (iDrivigFlags & movePress)) // o ile może jechać if (fAccGravity < -0.10) // i jedzie pod górę większą niż 10 promil { // procedura wjeżdżania na ekstremalne wzniesienia - if (fabs(mvControlling->Im) > - 0.85 * mvControlling->Imax) // a prąd jest większy niż 85% nadmiarowego - // if (mvControlling->Imin*mvControlling->Voltage/(fMass*fAccGravity)<-2.8) //a - // na niskim się za szybko nie pojedzie - if (mvControlling->Imax * mvControlling->Voltage / (fMass * fAccGravity) < - -2.8) // a na niskim się za szybko nie pojedzie + if (fabs(mvControlling->Im) > 0.85 * mvControlling->Imax) // a prąd jest większy niż 85% nadmiarowego + if (mvControlling->Imax * mvControlling->Voltage / (fMass * fAccGravity) < -2.8) // a na niskim się za szybko nie pojedzie { // włączenie wysokiego rozruchu; // (I*U)[A*V=W=kg*m*m/sss]/(m[kg]*a[m/ss])=v[m/s]; 2.8m/ss=10km/h if (mvControlling->RList[mvControlling->MainCtrlPos].Bn > 1) { // jeśli jedzie na równoległym, to zbijamy do szeregowego, aby włączyć // wysoki rozruch if (mvControlling->ScndCtrlPos > 0) // jeżeli jest bocznik - mvControlling->DecScndCtrl( - 2); // wyłączyć bocznik, bo może blokować skręcenie NJ + mvControlling->DecScndCtrl(2); // wyłączyć bocznik, bo może blokować skręcenie NJ do // skręcanie do bezoporowej na szeregowym mvControlling->DecMainCtrl(1); // kręcimy nastawnik jazdy o 1 wstecz while (mvControlling->MainCtrlPos ? @@ -3102,8 +3094,7 @@ void TController::SpeedSet() false); // oporowa zapętla } if (mvControlling->Imax < mvControlling->ImaxHi) // jeśli da się na wysokim - mvControlling->CurrentSwitch( - true); // rozruch wysoki (za to może się ślizgać) + mvControlling->CurrentSwitch(true); // rozruch wysoki (za to może się ślizgać) if (ReactionTime > 0.1) ReactionTime = 0.1; // orientuj się szybciej } // if (Im>Imin) @@ -3132,23 +3123,12 @@ void TController::SpeedSet() if (mvOccupied->Vel >= 30.0) // jak się rozpędził if (fAccGravity > -0.02) // a i pochylenie mnijsze niż 2‰ mvControlling->CurrentSwitch(false); // rozruch wysoki wyłącz - // dokręcanie do bezoporowej, bo IncSpeed() może nie być wywoływane - // if (mvOccupied->Vel-0.1) //nie ma hamować - // if (Controlling->RList[MainCtrlPos].R>0.0) - // if (Im<1.3*Imin) //lekkie przekroczenie miimalnego prądu jest dopuszczalne - // IncMainCtrl(1); //zwieksz nastawnik skoro możesz - tak aby się ustawic na - // bezoporowej } break; case TEngineType::Dumb: case TEngineType::DieselElectric: case TEngineType::ElectricInductionMotor: break; - // WheelsDriven : - // begin - // OK:=False; - // end; case TEngineType::DieselEngine: // Ra 2014-06: "automatyczna" skrzynia biegów... if (!mvControlling->MotorParam[mvControlling->ScndCtrlPos].AutoSwitch) // gdy biegi ręczne @@ -4901,13 +4881,10 @@ TController::UpdateSituation(double dt) { #endif // ustalanie zadanego przyspieszenia //(ActualProximityDist) - odległość do miejsca zmniejszenia prędkości - //(AccPreferred) - wynika z psychyki oraz uwzglęnia już ewentualne zderzenie z - // pojazdem z przodu, ujemne gdy należy hamować + //(AccPreferred) - wynika z psychyki oraz uwzglęnia już ewentualne zderzenie z pojazdem z przodu, ujemne gdy należy hamować //(AccDesired) - uwzględnia sygnały na drodze ruchu, ujemne gdy należy hamować - //(fAccGravity) - chwilowe przspieszenie grawitacyjne, ujemne działa przeciwnie do - // zadanego kierunku jazdy - //(AbsAccS) - chwilowe przyspieszenie pojazu (uwzględnia grawitację), ujemne działa - // przeciwnie do zadanego kierunku jazdy + //(fAccGravity) - chwilowe przspieszenie grawitacyjne, ujemne działa przeciwnie do zadanego kierunku jazdy + //(AbsAccS) - chwilowe przyspieszenie pojazu (uwzględnia grawitację), ujemne działa przeciwnie do zadanego kierunku jazdy //(AccDesired) porównujemy z (fAccGravity) albo (AbsAccS) if( ( VelNext >= 0.0 ) && ( ActualProximityDist <= routescanrange ) diff --git a/Driver.h b/Driver.h index e7a05617..6ec94085 100644 --- a/Driver.h +++ b/Driver.h @@ -265,7 +265,6 @@ private: double VelNext = 120.0; // prędkość, jaka ma być po przejechaniu długości ProximityDist double VelRestricted = -1.0; // speed of travel after passing a permissive signal at stop private: - double fProximityDist = 0.0; // odleglosc podawana w SetProximityVelocity(); >0:przeliczać do punktu, <0:podana wartość double FirstSemaphorDist = 10000.0; // odległość do pierwszego znalezionego semafora public: double ActualProximityDist = 1.0; // odległość brana pod uwagę przy wyliczaniu prędkości i przyspieszenia diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 1fb943dd..b1a2408e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5398,8 +5398,6 @@ bool TMoverParameters::AutoRelaySwitch(bool State) bool TMoverParameters::AutoRelayCheck(void) { bool OK = false; // b:int; - bool ARFASI = false; - bool ARFASI2 = false; // sprawdzenie wszystkich warunkow (AutoRelayFlag, AutoSwitch, Im= 4 ) && ( ToLower( Stream.substr( Stream.size() - 4 ) ) == ".inc" ) ) { mIncFile = true; - scene::Groups.begin(); + scene::Groups.create(); } break; } @@ -75,7 +75,7 @@ cParser::~cParser() { if( true == mIncFile ) { // wrap up the node group holding content of processed file - scene::Groups.end(); + scene::Groups.close(); } } diff --git a/scenenodegroups.cpp b/scenenodegroups.cpp index 0399af7f..c8720c25 100644 --- a/scenenodegroups.cpp +++ b/scenenodegroups.cpp @@ -16,7 +16,7 @@ node_groups Groups; // requests creation of a new node group. returns: handle to the group scene::group_handle -node_groups::begin() { +node_groups::create() { m_activegroup.push( create_handle() ); @@ -25,7 +25,7 @@ node_groups::begin() { // indicates creation of current group ended. returns: handle to the parent group or null_handle if group stack is empty scene::group_handle -node_groups::end() { +node_groups::close() { if( false == m_activegroup.empty() ) { @@ -58,7 +58,7 @@ node_groups::handle() const { // places provided node in specified group void -node_groups::register_node( scene::basic_node *Node, scene::group_handle const Group ) { +node_groups::insert( scene::group_handle const Group, scene::basic_node *Node ) { // TBD, TODO: automatically unregister the node from its current group? Node->group( Group ); diff --git a/scenenodegroups.h b/scenenodegroups.h index 906b8639..762f4789 100644 --- a/scenenodegroups.h +++ b/scenenodegroups.h @@ -27,16 +27,16 @@ public: // methods // requests creation of a new node group. returns: handle to the group group_handle - begin(); + create(); // indicates creation of current group ended. returns: handle to the parent group or null_handle if group stack is empty group_handle - end(); + close(); // returns current active group, or null_handle if group stack is empty group_handle handle() const; // places provided node in specified group void - register_node( scene::basic_node *Node, scene::group_handle const Group ); + insert( scene::group_handle const Group, scene::basic_node *Node ); std::pair group( scene::group_handle const Group ) { auto &group { m_groupmap[ Group ] }; diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index f2cdc672..6de89e12 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -305,7 +305,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch delete pathnode; */ } - scene::Groups.register_node( path, scene::Groups.handle() ); + scene::Groups.insert( scene::Groups.handle(), path ); simulation::Region->insert_and_register( path ); } else if( nodedata.type == "traction" ) { @@ -317,7 +317,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( false == simulation::Traction.insert( traction ) ) { ErrorLog( "Bad scenario: traction piece with duplicate name \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } - scene::Groups.register_node( traction, scene::Groups.handle() ); + scene::Groups.insert( scene::Groups.handle(), traction ); simulation::Region->insert_and_register( traction ); } else if( nodedata.type == "tractionpowersource" ) { @@ -378,7 +378,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( false == simulation::Instances.insert( instance ) ) { ErrorLog( "Bad scenario: 3d model instance with duplicate name \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } - scene::Groups.register_node( instance, scene::Groups.handle() ); + scene::Groups.insert( scene::Groups.handle(), instance ); simulation::Region->insert( instance ); } } @@ -421,7 +421,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( false == simulation::Memory.insert( memorycell ) ) { ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } - scene::Groups.register_node( memorycell, scene::Groups.handle() ); + scene::Groups.insert( scene::Groups.handle(), memorycell ); simulation::Region->insert( memorycell ); } else if( nodedata.type == "eventlauncher" ) { @@ -436,7 +436,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch simulation::Events.queue( eventlauncher ); } else { - scene::Groups.register_node( eventlauncher, scene::Groups.handle() ); + scene::Groups.insert( scene::Groups.handle(), eventlauncher ); simulation::Region->insert( eventlauncher ); } } From 09f24df109cca32cbd6dc200795dbb60b49c8c04 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 24 Aug 2018 21:11:35 +0200 Subject: [PATCH 379/426] scenery groups export and deserialization, associated events included in scenery node groups, AI brake charging tweak, door locking and vehicle hunting oscillation sounds --- Console.cpp | 27 +++---- Driver.cpp | 24 +++--- DynObj.cpp | 51 ++++++++++++- DynObj.h | 11 ++- Event.cpp | 8 +- Event.h | 19 +++++ Globals.h | 12 +-- Train.cpp | 133 ++++++++++++++++++++-------------- Train.h | 3 + sceneeditor.cpp | 15 ++-- scenenodegroups.cpp | 51 ++++++++++++- scenenodegroups.h | 24 ++++-- simulationstateserializer.cpp | 42 +++++++++-- simulationstateserializer.h | 2 + 14 files changed, 304 insertions(+), 118 deletions(-) diff --git a/Console.cpp b/Console.cpp index 42e536f6..4556b727 100644 --- a/Console.cpp +++ b/Console.cpp @@ -275,14 +275,13 @@ void Console::ValueSet(int x, double y) WriteLog( " fraction=" + std::to_string( y ) ); } } - double temp = (((((Global.fCalibrateOut[x][5] * y) + Global.fCalibrateOut[x][4]) * y + - Global.fCalibrateOut[x][3]) * - y + - Global.fCalibrateOut[x][2]) * - y + - Global.fCalibrateOut[x][1]) * - y + - Global.fCalibrateOut[x][0]; // zakres <0;1> + double temp = ((((( + Global.fCalibrateOut[x][5] * y) + + Global.fCalibrateOut[x][4]) * y + + Global.fCalibrateOut[x][3]) * y + + Global.fCalibrateOut[x][2]) * y + + Global.fCalibrateOut[x][1]) * y + + Global.fCalibrateOut[x][0]; // zakres <0;1> if( Global.iCalibrateOutDebugInfo == x ) { WriteLog( " calibrated=" + std::to_string( temp ) ); } @@ -320,11 +319,13 @@ float Console::AnalogCalibrateGet(int x) if (iMode == 4 && PoKeys55[0]) { float b = PoKeys55[0]->fAnalog[x]; - b = (((((Global.fCalibrateIn[x][5] * b) + Global.fCalibrateIn[x][4]) * b + - Global.fCalibrateIn[x][3]) * b + - Global.fCalibrateIn[x][2]) * b + - Global.fCalibrateIn[x][1]) * b + - Global.fCalibrateIn[x][0]; + b = ((((( + Global.fCalibrateIn[x][5] * b) + + Global.fCalibrateIn[x][4]) * b + + Global.fCalibrateIn[x][3]) * b + + Global.fCalibrateIn[x][2]) * b + + Global.fCalibrateIn[x][1]) * b + + Global.fCalibrateIn[x][0]; if (x == 0) return (b + 2) / 8; if (x == 1) return b/10; else return b; diff --git a/Driver.cpp b/Driver.cpp index d253e5df..14a54f55 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2021,8 +2021,12 @@ bool TController::CheckVehicles(TOrders user) pVehicles[1] = p; // zapamiętanie ostatniego fLength += p->MoverParameters->Dim.L; // dodanie długości pojazdu fMass += p->MoverParameters->TotalMass; // dodanie masy łącznie z ładunkiem - if (fVelMax < 0 ? true : p->MoverParameters->Vmax < fVelMax) - fVelMax = p->MoverParameters->Vmax; // ustalenie maksymalnej prędkości dla składu + fVelMax = min_speed( fVelMax, p->MoverParameters->Vmax ); // ustalenie maksymalnej prędkości dla składu + // reset oerlikon brakes consist flag as different type was detected + if( ( p->MoverParameters->BrakeSubsystem != TBrakeSubSystem::ss_ESt ) + && ( p->MoverParameters->BrakeSubsystem != TBrakeSubSystem::ss_LSt ) ) { + iDrivigFlags &= ~( moveOerlikons ); + } p = p->Neightbour(dir); // pojazd podłączony od wskazanej strony } if (main) @@ -2034,9 +2038,8 @@ bool TController::CheckVehicles(TOrders user) p = pVehicles[0]; while (p) { - if (TrainParams) - if (p->asDestination == "none") - p->DestinationSet(TrainParams->Relation2, TrainParams->TrainName); // relacja docelowa, jeśli nie było + if (p->asDestination == "none") + p->DestinationSet(TrainParams->Relation2, TrainParams->TrainName); // relacja docelowa, jeśli nie było if (AIControllFlag) // jeśli prowadzi komputer p->RaLightsSet(0, 0); // gasimy światła if (p->MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) @@ -3020,10 +3023,8 @@ void TController::SpeedSet() mvOccupied->DirectionForward(); //żeby EN57 jechały na drugiej nastawie { if (mvControlling->MainCtrlPos && - !mvControlling - ->StLinFlag) // jak niby jedzie, ale ma rozłączone liniowe - mvControlling->DecMainCtrl( - 2); // to na zero i czekać na przewalenie kułakowego + !mvControlling->StLinFlag) // jak niby jedzie, ale ma rozłączone liniowe + mvControlling->DecMainCtrl(2); // to na zero i czekać na przewalenie kułakowego else switch (mvControlling->MainCtrlPos) { // ruch nastawnika uzależniony jest od aktualnie ustawionej @@ -5225,10 +5226,7 @@ TController::UpdateSituation(double dt) { } if( ( mvOccupied->BrakeCtrlPos < 0 ) - && ( mvOccupied->EqvtPipePress > ( - fReady < 0.25 ? - 5.1 : - 5.2 ) ) ) { + && ( mvOccupied->EqvtPipePress > ( fReady < 0.25 ? 5.1 : 5.2 ) ) ) { mvOccupied->BrakeLevelSet( mvOccupied->Handle->GetPos( bh_RP ) ); } } diff --git a/DynObj.cpp b/DynObj.cpp index 2cd111c3..a8dc1adb 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -4203,6 +4203,21 @@ void TDynamicObject::RenderSounds() { } } } + // door locks + if( MoverParameters->DoorBlockedFlag() != m_doorlocks ) { + // toggle state of the locks... + m_doorlocks = !m_doorlocks; + // ...and play relevant sounds + for( auto &door : m_doorsounds ) { + if( m_doorlocks ) { + door.lock.play( sound_flags::exclusive ); + } + else { + door.unlock.play( sound_flags::exclusive ); + } + } + } + // horns if( TestFlag( MoverParameters->WarningSignal, 1 ) ) { sHorn1.play( sound_flags::exclusive | sound_flags::looping ); @@ -5413,7 +5428,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else if( token == "dooropen:" ) { - sound_source soundtemplate { sound_placement::general }; + sound_source soundtemplate { sound_placement::general, 25.f }; soundtemplate.deserialize( parser, sound_type::single ); soundtemplate.owner( this ); for( auto &door : m_doorsounds ) { @@ -5425,7 +5440,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else if( token == "doorclose:" ) { - sound_source soundtemplate { sound_placement::general }; + sound_source soundtemplate { sound_placement::general, 25.f }; soundtemplate.deserialize( parser, sound_type::single ); soundtemplate.owner( this ); for( auto &door : m_doorsounds ) { @@ -5436,8 +5451,32 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } } + else if( token == "doorlock:" ) { + sound_source soundtemplate { sound_placement::general, 12.5f }; + soundtemplate.deserialize( parser, sound_type::single ); + soundtemplate.owner( this ); + for( auto &door : m_doorsounds ) { + // apply configuration to all defined doors, but preserve their individual offsets + auto const dooroffset { door.lock.offset() }; + door.lock = soundtemplate; + door.lock.offset( dooroffset ); + } + } + + else if( token == "doorunlock:" ) { + sound_source soundtemplate { sound_placement::general, 12.5f }; + soundtemplate.deserialize( parser, sound_type::single ); + soundtemplate.owner( this ); + for( auto &door : m_doorsounds ) { + // apply configuration to all defined doors, but preserve their individual offsets + auto const dooroffset { door.unlock.offset() }; + door.unlock = soundtemplate; + door.unlock.offset( dooroffset ); + } + } + else if( token == "doorstepopen:" ) { - sound_source soundtemplate { sound_placement::general }; + sound_source soundtemplate { sound_placement::general, 20.f }; soundtemplate.deserialize( parser, sound_type::single ); soundtemplate.owner( this ); for( auto &door : m_doorsounds ) { @@ -5449,7 +5488,7 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else if( token == "doorstepclose:" ) { - sound_source soundtemplate { sound_placement::general }; + sound_source soundtemplate { sound_placement::general, 20.f }; soundtemplate.deserialize( parser, sound_type::single ); soundtemplate.owner( this ); for( auto &door : m_doorsounds ) { @@ -5539,6 +5578,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, auto const location { glm::vec3 { MoverParameters->Dim.W * 0.5f, MoverParameters->Dim.H * 0.5f, offset } }; door.rsDoorClose.offset( location ); door.rsDoorOpen.offset( location ); + door.lock.offset( location ); + door.unlock.offset( location ); door.step_close.offset( location ); door.step_open.offset( location ); m_doorsounds.emplace_back( door ); @@ -5549,6 +5590,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, auto const location { glm::vec3 { MoverParameters->Dim.W * -0.5f, MoverParameters->Dim.H * 0.5f, offset } }; door.rsDoorClose.offset( location ); door.rsDoorOpen.offset( location ); + door.lock.offset( location ); + door.unlock.offset( location ); door.step_close.offset( location ); door.step_open.offset( location ); m_doorsounds.emplace_back( door ); diff --git a/DynObj.h b/DynObj.h index 0bd80c0e..3a99b2f6 100644 --- a/DynObj.h +++ b/DynObj.h @@ -305,10 +305,12 @@ private: }; struct door_sounds { - sound_source rsDoorOpen { sound_placement::general, 25.f }; // Ra: przeniesione z kabiny - sound_source rsDoorClose { sound_placement::general, 25.f }; - sound_source step_open { sound_placement::general, 25.f }; - sound_source step_close { sound_placement::general, 25.f }; + sound_source rsDoorOpen { sound_placement::general }; // Ra: przeniesione z kabiny + sound_source rsDoorClose { sound_placement::general }; + sound_source lock { sound_placement::general }; + sound_source unlock { sound_placement::general }; + sound_source step_open { sound_placement::general }; + sound_source step_close { sound_placement::general }; }; struct exchange_sounds { @@ -423,6 +425,7 @@ private: std::array m_couplersounds; // always front and rear std::vector m_pantographsounds; // typically 2 but can be less (or more?) std::vector m_doorsounds; // can expect symmetrical arrangement, but don't count on it + bool m_doorlocks { false }; // sound helper, current state of door locks sound_source sDepartureSignal { sound_placement::general }; sound_source sHorn1 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; sound_source sHorn2 { sound_placement::external, 5 * EU07_SOUND_RUNNINGNOISECUTOFFRANGE }; diff --git a/Event.cpp b/Event.cpp index 13646dd3..14f631fa 100644 --- a/Event.cpp +++ b/Event.cpp @@ -1764,11 +1764,15 @@ event_manager::export_as_text( std::ostream &Output ) const { Output << "// events\n"; for( auto const *event : m_events ) { - event->export_as_text( Output ); + if( event->group() == null_handle ) { + event->export_as_text( Output ); + } } Output << "// event launchers\n"; for( auto const *launcher : m_launchers.sequence() ) { - launcher->export_as_text( Output ); + if( launcher->group() == null_handle ) { + launcher->export_as_text( Output ); + } } } diff --git a/Event.h b/Event.h index 4fa9449e..9593f932 100644 --- a/Event.h +++ b/Event.h @@ -95,6 +95,10 @@ public: bool StopCommand(); void StopCommandSent(); void Append(TEvent *e); + void + group( scene::group_handle Group ); + scene::group_handle + group() const; // members std::string asName; bool m_ignored { false }; // replacement for tp_ignored @@ -114,9 +118,24 @@ public: bool m_conditionalelse { false }; // TODO: make a part of condition struct private: +// methods void Conditions( cParser *parser, std::string s ); +// members + scene::group_handle m_group { null_handle }; // group this event belongs to, if any }; +inline +void +TEvent::group( scene::group_handle Group ) { + m_group = Group; +} + +inline +scene::group_handle +TEvent::group() const { + return m_group; +} + class event_manager { public: diff --git a/Globals.h b/Globals.h index c6c39279..c94a9282 100644 --- a/Globals.h +++ b/Globals.h @@ -141,12 +141,12 @@ struct global_settings { double fBrakeStep{ 1.0 }; // krok zmiany hamulca dla klawiszy [Num3] i [Num9] // parametry kalibracyjne wejść z pulpitu double fCalibrateIn[ 6 ][ 6 ] = { - { 0, 1, 0, 0, 0, 0 }, - { 0, 1, 0, 0, 0, 0 }, - { 0, 1, 0, 0, 0, 0 }, - { 0, 1, 0, 0, 0, 0 }, - { 0, 1, 0, 0, 0, 0 }, - { 0, 1, 0, 0, 0, 0 } }; + { 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0 }, + { 0, 0, 0, 0, 0, 0 } }; // parametry kalibracyjne wyjść dla pulpitu double fCalibrateOut[ 7 ][ 6 ] = { { 0, 1, 0, 0, 0, 0 }, diff --git a/Train.cpp b/Train.cpp index 0009c254..f059b765 100644 --- a/Train.cpp +++ b/Train.cpp @@ -4409,13 +4409,16 @@ void TTrain::UpdateMechPosition(double dt) && ( true == mvOccupied->TruckHunting ) ) { // hunting oscillation HuntingAngle = clamp_circular( HuntingAngle + 4.0 * HuntingShake.frequency * dt * mvOccupied->Vel, 360.0 ); - shakevector.x += - ( std::sin( glm::radians( HuntingAngle ) ) * dt * HuntingShake.scale ) - * interpolate( + auto const huntingamount = + interpolate( 0.0, 1.0, clamp( ( mvOccupied->Vel - HuntingShake.fadein_begin ) / ( HuntingShake.fadein_end - HuntingShake.fadein_begin ), 0.0, 1.0 ) ); + shakevector.x += + ( std::sin( glm::radians( HuntingAngle ) ) * dt * HuntingShake.scale ) + * huntingamount; + IsHunting = ( huntingamount > 0.025 ); } if( iVel > 0.5 ) { @@ -5873,60 +5876,24 @@ TTrain::update_sounds( double const Deltatime ) { && ( false == Global.CabWindowOpen ) && ( DynamicObject->GetVelocity() > 0.5 ) ) { - // frequency calculation - auto const normalizer { ( - true == rsRunningNoise.is_combined() ? - mvOccupied->Vmax * 0.01f : - 1.f ) }; - auto const frequency { - rsRunningNoise.m_frequencyoffset - + rsRunningNoise.m_frequencyfactor * mvOccupied->Vel * normalizer }; - - // volume calculation - volume = - rsRunningNoise.m_amplitudeoffset - + rsRunningNoise.m_amplitudefactor * mvOccupied->Vel; - if( std::abs( mvOccupied->nrot ) > 0.01 ) { - // hamulce wzmagaja halas - auto const brakeforceratio { ( - clamp( - mvOccupied->UnitBrakeForce / std::max( 1.0, mvOccupied->BrakeForceR( 1.0, mvOccupied->Vel ) / ( mvOccupied->NAxles * std::max( 1, mvOccupied->NBpA ) ) ), - 0.0, 1.0 ) ) }; - - volume *= 1 + 0.125 * brakeforceratio; - } - // scale volume by track quality - // TODO: track quality and/or environment factors as separate subroutine - volume *= - interpolate( - 0.8, 1.2, - clamp( - DynamicObject->MyTrack->iQualityFlag / 20.0, - 0.0, 1.0 ) ); - // for single sample sounds muffle the playback at low speeds - if( false == rsRunningNoise.is_combined() ) { - volume *= - interpolate( - 0.0, 1.0, - clamp( - mvOccupied->Vel / 40.0, - 0.0, 1.0 ) ); - } - - if( volume > 0.05 ) { - rsRunningNoise - .pitch( frequency ) - .gain( volume ) - .play( sound_flags::exclusive | sound_flags::looping ); - } - else { - rsRunningNoise.stop(); - } + update_sounds_runningnoise( rsRunningNoise ); } else { // don't play the optional ending sound if the listener switches views rsRunningNoise.stop( true == FreeFlyModeFlag ); } + // hunting oscillation noise + if( ( false == FreeFlyModeFlag ) + && ( false == Global.CabWindowOpen ) + && ( DynamicObject->GetVelocity() > 0.5 ) + && ( IsHunting ) ) { + + update_sounds_runningnoise( rsHuntingNoise ); + } + else { + // don't play the optional ending sound if the listener switches views + rsHuntingNoise.stop( true == FreeFlyModeFlag ); + } // McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa if (mvOccupied->SecuritySystem.Status > 0) { @@ -5977,6 +5944,58 @@ TTrain::update_sounds( double const Deltatime ) { } } +void TTrain::update_sounds_runningnoise( sound_source &Sound ) { + // frequency calculation + auto const normalizer { ( + true == Sound.is_combined() ? + mvOccupied->Vmax * 0.01f : + 1.f ) }; + auto const frequency { + Sound.m_frequencyoffset + + Sound.m_frequencyfactor * mvOccupied->Vel * normalizer }; + + // volume calculation + auto volume = + Sound.m_amplitudeoffset + + Sound.m_amplitudefactor * mvOccupied->Vel; + if( std::abs( mvOccupied->nrot ) > 0.01 ) { + // hamulce wzmagaja halas + auto const brakeforceratio { ( + clamp( + mvOccupied->UnitBrakeForce / std::max( 1.0, mvOccupied->BrakeForceR( 1.0, mvOccupied->Vel ) / ( mvOccupied->NAxles * std::max( 1, mvOccupied->NBpA ) ) ), + 0.0, 1.0 ) ) }; + + volume *= 1 + 0.125 * brakeforceratio; + } + // scale volume by track quality + // TODO: track quality and/or environment factors as separate subroutine + volume *= + interpolate( + 0.8, 1.2, + clamp( + DynamicObject->MyTrack->iQualityFlag / 20.0, + 0.0, 1.0 ) ); + // for single sample sounds muffle the playback at low speeds + if( false == Sound.is_combined() ) { + volume *= + interpolate( + 0.0, 1.0, + clamp( + mvOccupied->Vel / 40.0, + 0.0, 1.0 ) ); + } + + if( volume > 0.05 ) { + Sound + .pitch( frequency ) + .gain( volume ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + Sound.stop(); + } +} + bool TTrain::CabChange(int iDirection) { // McZapkie-090902: zmiana kabiny 1->0->2 i z powrotem if( ( DynamicObject->Mechanik == nullptr ) @@ -6146,6 +6165,14 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) rsRunningNoise.m_amplitudefactor /= ( 1 + mvOccupied->Vmax ); rsRunningNoise.m_frequencyfactor /= ( 1 + mvOccupied->Vmax ); } + else if( token == "huntingnoise:" ) { + // hunting oscillation sound: + rsHuntingNoise.deserialize( parser, sound_type::single, sound_parameters::amplitude | sound_parameters::frequency, mvOccupied->Vmax ); + rsHuntingNoise.owner( DynamicObject ); + + rsHuntingNoise.m_amplitudefactor /= ( 1 + mvOccupied->Vmax ); + rsHuntingNoise.m_frequencyfactor /= ( 1 + mvOccupied->Vmax ); + } else if (token == "mechspring:") { // parametry bujania kamery: @@ -6217,7 +6244,7 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) &dsbReverserKey, &dsbNastawnikJazdy, &dsbNastawnikBocz, &dsbSwitch, &dsbPneumaticSwitch, &rsHiss, &rsHissU, &rsHissE, &rsHissX, &rsHissT, &rsSBHiss, &rsSBHissU, - &rsFadeSound, &rsRunningNoise, + &rsFadeSound, &rsRunningNoise, &rsHuntingNoise, &dsbHasler, &dsbBuzzer, &dsbSlipAlarm, &m_radiosound, &m_radiostop }; for( auto sound : sounds ) { diff --git a/Train.h b/Train.h index 5f80c0a3..f2c57078 100644 --- a/Train.h +++ b/Train.h @@ -142,6 +142,7 @@ class TTrain void set_paired_open_motor_connectors_button( bool const State ); // update function subroutines void update_sounds( double const Deltatime ); + void update_sounds_runningnoise( sound_source &Sound ); // command handlers // NOTE: we're currently using universal handlers and static handler map but it may be beneficial to have these implemented on individual class instance basis @@ -572,6 +573,7 @@ public: // reszta może by?publiczna float fadein_end { 0.f }; // full effect speed in km/h } HuntingShake; float HuntingAngle { 0.f }; // crude approximation of hunting oscillation; current angle of sine wave + bool IsHunting { false }; sound_source dsbReverserKey { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // hunter-121211 sound_source dsbNastawnikJazdy { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; @@ -591,6 +593,7 @@ public: // reszta może by?publiczna sound_source rsFadeSound { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source rsRunningNoise{ sound_placement::internal, EU07_SOUND_GLOBALRANGE }; + sound_source rsHuntingNoise{ sound_placement::internal, EU07_SOUND_GLOBALRANGE }; sound_source dsbHasler { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbBuzzer { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; diff --git a/sceneeditor.cpp b/sceneeditor.cpp index 2961a602..5aafa4ab 100644 --- a/sceneeditor.cpp +++ b/sceneeditor.cpp @@ -37,9 +37,10 @@ basic_editor::translate( scene::basic_node *Node, glm::dvec3 const &Location, bo else { // translate entire group // TODO: contextual switch between group and item translation - auto nodegroup { scene::Groups.group( Node->group() ) }; + // TODO: translation of affected/relevant events + auto &nodegroup { scene::Groups.group( Node->group() ).nodes }; std::for_each( - nodegroup.first, nodegroup.second, + std::begin( nodegroup ), std::end( nodegroup ), [&]( auto *node ) { translate_node( node, node->location() + translation ); } ); } @@ -59,9 +60,10 @@ basic_editor::translate( scene::basic_node *Node, float const Offset ) { else { // translate entire group // TODO: contextual switch between group and item translation - auto nodegroup { scene::Groups.group( Node->group() ) }; + // TODO: translation of affected/relevant events + auto &nodegroup { scene::Groups.group( Node->group() ).nodes }; std::for_each( - nodegroup.first, nodegroup.second, + std::begin( nodegroup ), std::end( nodegroup ), [&]( auto *node ) { translate_node( node, offset ); } ); } @@ -146,10 +148,11 @@ basic_editor::rotate( scene::basic_node *Node, glm::vec3 const &Angle, float con else { // rotate entire group // TODO: contextual switch between group and item rotation + // TODO: translation of affected/relevant events auto const rotationcenter { Node->location() }; - auto nodegroup { scene::Groups.group( Node->group() ) }; + auto &nodegroup { scene::Groups.group( Node->group() ).nodes }; std::for_each( - nodegroup.first, nodegroup.second, + std::begin( nodegroup ), std::end( nodegroup ), [&]( auto *node ) { rotate_node( node, rotation ); if( node != Node ) { diff --git a/scenenodegroups.cpp b/scenenodegroups.cpp index c8720c25..68fe4123 100644 --- a/scenenodegroups.cpp +++ b/scenenodegroups.cpp @@ -10,6 +10,9 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "scenenodegroups.h" +#include "event.h" +#include "memcell.h" + namespace scene { node_groups Groups; @@ -37,7 +40,7 @@ node_groups::close() { auto lookup { m_groupmap.find( closinggroup ) }; if( ( lookup != m_groupmap.end() ) - && ( lookup->second.size() <= 1 ) ) { + && ( ( lookup->second.nodes.size() + lookup->second.events.size() ) <= 1 ) ) { erase( lookup ); } @@ -65,20 +68,62 @@ node_groups::insert( scene::group_handle const Group, scene::basic_node *Node ) if( Group == null_handle ) { return; } - auto &nodesequence { m_groupmap[ Group ] }; + auto &nodesequence { m_groupmap[ Group ].nodes }; if( std::find( std::begin( nodesequence ), std::end( nodesequence ), Node ) == std::end( nodesequence ) ) { // don't add the same node twice nodesequence.emplace_back( Node ); } } +// places provided event in specified group +void +node_groups::insert( scene::group_handle const Group, TEvent *Event ) { + + // TBD, TODO: automatically unregister the event from its current group? + Event->group( Group ); + + if( Group == null_handle ) { return; } + + auto &eventsequence { m_groupmap[ Group ].events }; + if( std::find( std::begin( eventsequence ), std::end( eventsequence ), Event ) == std::end( eventsequence ) ) { + // don't add the same node twice + eventsequence.emplace_back( Event ); + } +} + +// sends basic content of the class in legacy (text) format to provided stream +void +node_groups::export_as_text( std::ostream &Output ) const { + + for( auto const &group : m_groupmap ) { + + Output << "group\n"; + for( auto *node : group.second.nodes ) { + // HACK: auto-generated memory cells aren't exported, so we check for this + // TODO: is_exportable as basic_node method + if( ( typeid( *node ) == typeid( TMemCell ) ) + && ( false == static_cast( node )->is_exportable ) ) { + continue; + } + node->export_as_text( Output ); + } + for( auto *event : group.second.events ) { + event->export_as_text( Output ); + } + Output << "endgroup\n"; + } +} + // removes specified group from the group list and group information from the group's nodes void node_groups::erase( group_map::const_iterator Group ) { - for( auto *node : Group->second ) { + for( auto *node : Group->second.nodes ) { node->group( null_handle ); } + for( auto *event : Group->second.events ) { + event->group( null_handle ); + } m_groupmap.erase( Group ); } diff --git a/scenenodegroups.h b/scenenodegroups.h index 762f4789..0ad9a6a8 100644 --- a/scenenodegroups.h +++ b/scenenodegroups.h @@ -13,14 +13,16 @@ http://mozilla.org/MPL/2.0/. namespace scene { +struct basic_group { +// members + std::vector nodes; + std::vector events; +}; + // holds lists of grouped scene nodes class node_groups { // NOTE: during scenario deserialization encountering *.inc file causes creation of a new group on the group stack // this allows all nodes listed in this *.inc file to be grouped and potentially modified together by the editor. -private: - // types - using node_sequence = std::vector; - public: // constructors node_groups() = default; @@ -37,14 +39,20 @@ public: // places provided node in specified group void insert( scene::group_handle const Group, scene::basic_node *Node ); - std::pair + // places provided event in specified group + void + insert( scene::group_handle const Group, TEvent *Event ); + // grants direct access to specified group + scene::basic_group & group( scene::group_handle const Group ) { - auto &group { m_groupmap[ Group ] }; - return { std::begin( group ), std::end( group ) }; } + return m_groupmap[ Group ]; } + // sends basic content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; private: // types - using group_map = std::unordered_map; + using group_map = std::unordered_map; // methods // removes specified group from the group list and group information from the group's nodes void diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index 6de89e12..1a556164 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -73,6 +73,8 @@ state_serializer::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) { "description", &state_serializer::deserialize_description }, { "event", &state_serializer::deserialize_event }, { "firstinit", &state_serializer::deserialize_firstinit }, + { "group", &state_serializer::deserialize_group }, + { "endgroup", &state_serializer::deserialize_endgroup }, { "light", &state_serializer::deserialize_light }, { "node", &state_serializer::deserialize_node }, { "origin", &state_serializer::deserialize_origin }, @@ -237,7 +239,10 @@ state_serializer::deserialize_event( cParser &Input, scene::scratch_data &Scratc Scratchpad.location.offset.top().z ) ); event->Load( &Input, offset ); - if( false == simulation::Events.insert( event ) ) { + if( true == simulation::Events.insert( event ) ) { + scene::Groups.insert( scene::Groups.handle(), event ); + } + else { delete event; } } @@ -256,6 +261,18 @@ state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Sc Scratchpad.initialized = true; } +void +state_serializer::deserialize_group( cParser &Input, scene::scratch_data &Scratchpad ) { + + scene::Groups.create(); +} + +void +state_serializer::deserialize_endgroup( cParser &Input, scene::scratch_data &Scratchpad ) { + + scene::Groups.close(); +} + void state_serializer::deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ) { @@ -897,27 +914,39 @@ state_serializer::export_as_text( std::string const &Scenariofile ) const { filename = Global.asCurrentSceneryPath + filename + "_export"; std::ofstream scmfile { filename + ".scm" }; + // groups + scmfile << "// groups\n"; + scene::Groups.export_as_text( scmfile ); // tracks scmfile << "// paths\n"; for( auto const *path : Paths.sequence() ) { - path->export_as_text( scmfile ); + if( path->group() == null_handle ) { + path->export_as_text( scmfile ); + } } // traction scmfile << "// traction\n"; for( auto const *traction : Traction.sequence() ) { - traction->export_as_text( scmfile ); + if( traction->group() == null_handle ) { + traction->export_as_text( scmfile ); + } } // power grid scmfile << "// traction power sources\n"; for( auto const *powersource : Powergrid.sequence() ) { - powersource->export_as_text( scmfile ); + if( powersource->group() == null_handle ) { + powersource->export_as_text( scmfile ); + } } // models scmfile << "// instanced models\n"; for( auto const *instance : Instances.sequence() ) { - instance->export_as_text( scmfile ); + if( instance->group() == null_handle ) { + instance->export_as_text( scmfile ); + } } // sounds + // NOTE: sounds currently aren't included in groups scmfile << "// sounds\n"; Region->export_as_text( scmfile ); @@ -925,7 +954,8 @@ state_serializer::export_as_text( std::string const &Scenariofile ) const { // mem cells ctrfile << "// memory cells\n"; for( auto const *memorycell : Memory.sequence() ) { - if( true == memorycell->is_exportable ) { + if( ( true == memorycell->is_exportable ) + && ( memorycell->group() == null_handle ) ) { memorycell->export_as_text( ctrfile ); } } diff --git a/simulationstateserializer.h b/simulationstateserializer.h index 306d81b2..09938dc1 100644 --- a/simulationstateserializer.h +++ b/simulationstateserializer.h @@ -35,6 +35,8 @@ private: void deserialize_description( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_firstinit( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_group( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_endgroup( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_light( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_node( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_origin( cParser &Input, scene::scratch_data &Scratchpad ); From 924e709284a0090e266839fb597fc2aa4e049b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Fri, 17 Aug 2018 18:42:02 +0200 Subject: [PATCH 380/426] Disabling AntiSlippingBrake in MED calculation --- DynObj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DynObj.cpp b/DynObj.cpp index a8dc1adb..1376f152 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3130,7 +3130,7 @@ bool TDynamicObject::Update(double dt, double dt1) p->MoverParameters->Hamulec->GetFC( Nmax / (p->MoverParameters->NAxles * p->MoverParameters->NBpA), VelC) * 1000; // sila hamowania pn - p->MoverParameters->LocalBrakePosAEIM = (p->MoverParameters->SlippingWheels ? 0 : FzEP[i] / FmaxPoj); + p->MoverParameters->LocalBrakePosAEIM = FzEP[i] / FmaxPoj; if (p->MoverParameters->LocalBrakePosAEIM>0.009) if (p->MoverParameters->P2FTrans * p->MoverParameters->BrakeCylMult[0] * p->MoverParameters->MaxBrakePress[0] != 0) From 1df53cfc6c47d85a63ae7c795ca8b50a3e4db8de Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 25 Aug 2018 22:44:09 +0200 Subject: [PATCH 381/426] build 180825. radio message playback enhancements and fixes --- Train.cpp | 73 +++++++++++++++++++++++++++++++++++-------------------- Train.h | 3 ++- sound.cpp | 9 +++++-- version.h | 2 +- 4 files changed, 56 insertions(+), 31 deletions(-) diff --git a/Train.cpp b/Train.cpp index f059b765..d1a73140 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5703,16 +5703,6 @@ bool TTrain::Update( double const Deltatime ) // sounds update_sounds( Deltatime ); - if( false == m_radiomessages.empty() ) { - // erase completed radio messages from the list - m_radiomessages.erase( - std::remove_if( - std::begin( m_radiomessages ), std::end( m_radiomessages ), - []( sound_source const &source ) { - return ( false == source.is_playing() ); } ), - std::end( m_radiomessages ) ); - } - return true; //(DynamicObject->Update(dt)); } // koniec update @@ -5921,14 +5911,7 @@ TTrain::update_sounds( double const Deltatime ) { } } - // radiostop - if( ( true == mvOccupied->Radio ) - && ( true == mvOccupied->RadioStopFlag ) ) { - m_radiostop.play( sound_flags::exclusive | sound_flags::looping ); - } - else { - m_radiostop.stop(); - } + update_sounds_radio(); if( fTachoCount >= 3.f ) { auto const frequency { ( @@ -5996,6 +5979,37 @@ void TTrain::update_sounds_runningnoise( sound_source &Sound ) { } } +void TTrain::update_sounds_radio() { + + if( false == m_radiomessages.empty() ) { + // erase completed radio messages from the list + m_radiomessages.erase( + std::remove_if( + std::begin( m_radiomessages ), std::end( m_radiomessages ), + []( auto const &source ) { + return ( false == source.second->is_playing() ); } ), + std::end( m_radiomessages ) ); + } + // adjust audibility of remaining messages based on current radio conditions + auto const radioenabled { ( true == mvOccupied->Radio ) && ( mvControlled->Battery || mvControlled->ConverterFlag ) }; + for( auto &message : m_radiomessages ) { + auto const volume { + ( true == radioenabled ) + && ( message.first == iRadioChannel ) ? + 1.0 : + 0.0 }; + message.second->gain( volume ); + } + // radiostop + if( ( true == radioenabled ) + && ( true == mvOccupied->RadioStopFlag ) ) { + m_radiostop.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + m_radiostop.stop(); + } +} + bool TTrain::CabChange(int iDirection) { // McZapkie-090902: zmiana kabiny 1->0->2 i z powrotem if( ( DynamicObject->Mechanik == nullptr ) @@ -6613,23 +6627,28 @@ void TTrain::DynamicSet(TDynamicObject *d) void TTrain::radio_message( sound_source *Message, int const Channel ) { - if( ( false == mvOccupied->Radio ) - || ( iRadioChannel != Channel ) ) { - // skip message playback if the radio isn't able to receive it - return; - } auto const soundrange { Message->range() }; if( ( soundrange > 0 ) && ( glm::length2( Message->location() - glm::dvec3 { DynamicObject->GetPosition() } ) > ( soundrange * soundrange ) ) ) { // skip message playback if the receiver is outside of the emitter's range return; } - - m_radiomessages.emplace_back( m_radiosound ); + // NOTE: we initiate playback of all sounds in range, in case the user switches on the radio or tunes to the right channel mid-play + m_radiomessages.emplace_back( + Channel, + std::make_shared( m_radiosound ) ); // assign sound to the template and play it - m_radiomessages.back() + auto &message = *( m_radiomessages.back().second.get() ); + auto const radioenabled { ( true == mvOccupied->Radio ) && ( mvControlled->Battery || mvControlled->ConverterFlag ) }; + auto const volume { + ( true == radioenabled ) + && ( Channel == iRadioChannel ) ? + 1.0 : + 0.0 }; + message .copy_sounds( *Message ) - .play( sound_flags::exclusive ); + .gain( volume ) + .play(); } void TTrain::SetLights() diff --git a/Train.h b/Train.h index f2c57078..d365f4c0 100644 --- a/Train.h +++ b/Train.h @@ -143,6 +143,7 @@ class TTrain // update function subroutines void update_sounds( double const Deltatime ); void update_sounds_runningnoise( sound_source &Sound ); + void update_sounds_radio(); // command handlers // NOTE: we're currently using universal handlers and static handler map but it may be beneficial to have these implemented on individual class instance basis @@ -599,7 +600,7 @@ public: // reszta może by?publiczna sound_source dsbBuzzer { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; sound_source dsbSlipAlarm { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // Bombardier 011010: alarm przy poslizgu dla 181/182 sound_source m_radiosound { sound_placement::internal, 2 * EU07_SOUND_CABCONTROLSCUTOFFRANGE }; // cached template for radio messages - std::vector m_radiomessages; // list of currently played radio messages + std::vector>> m_radiomessages; // list of currently played radio messages sound_source m_radiostop { sound_placement::internal, EU07_SOUND_CABCONTROLSCUTOFFRANGE }; int iCabLightFlag; // McZapkie:120503: oswietlenie kabiny (0: wyl, 1: przyciemnione, 2: pelne) diff --git a/sound.cpp b/sound.cpp index 0189721c..aceec296 100644 --- a/sound.cpp +++ b/sound.cpp @@ -338,8 +338,13 @@ sound_source::copy_sounds( sound_source const &Source ) { m_sounds = Source.m_sounds; m_soundchunks = Source.m_soundchunks; m_soundchunksempty = Source.m_soundchunksempty; - // NOTE: should probably zero the .playing fields here as precaution - // TODO: add this if we ever start copying sounds from active sources + // reset source's playback counters + for( auto &sound : m_sounds ) { + sound.playing = 0; + } + for( auto &sound : m_soundchunks ) { + sound.first.playing = 0; + } return *this; } diff --git a/version.h b/version.h index c945cd61..3b5b4521 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 809 +#define VERSION_MINOR 825 #define VERSION_REVISION 0 From 8b285834b0d630b1799e237f1c235d80e7207c4c Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 27 Aug 2018 17:03:17 +0200 Subject: [PATCH 382/426] door locking logic tweaks --- McZapkie/MOVER.h | 2 +- McZapkie/Mover.cpp | 14 ++- Train.cpp | 259 +++++++++++++++++++-------------------------- 3 files changed, 118 insertions(+), 157 deletions(-) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index a26a5618..b3a60950 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -747,7 +747,6 @@ public: bool Battery = false; /*Czy sa zalavzone baterie*/ bool EpFuse = true; /*Czy sa zalavzone baterie*/ bool Signalling = false; /*Czy jest zalaczona sygnalizacja hamowania ostatniego wagonu*/ - bool DoorSignalling = false; /*Czy jest zalaczona sygnalizacja blokady drzwi*/ bool Radio = true; /*Czy jest zalaczony radiotelefon*/ float NominalBatteryVoltage = 0.f; /*Winger - baterie w elektrykach*/ TDimension Dim; /*wymiary*/ @@ -1170,6 +1169,7 @@ public: double LastLoadChangeTime = 0.0; //raz (roz)ładowania bool DoorBlocked = false; //Czy jest blokada drzwi + bool DoorLockEnabled { true }; bool DoorLeftOpened = false; //stan drzwi double DoorLeftOpenTimer { -1.0 }; // left door closing timer for automatic door type bool DoorRightOpened = false; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b1a2408e..7d525039 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6488,14 +6488,12 @@ bool TMoverParameters::LoadingDone(double LSpeed, std::string LoadInit) // Q: 20160713 // Zwraca informacje o działającej blokadzie drzwi // ************************************************************************************************* -bool TMoverParameters::DoorBlockedFlag(void) -{ - // if (DoorBlocked=true) and (Vel<5.0) then - bool DBF = false; - if ((DoorBlocked == true) && (Vel >= 5.0)) - DBF = true; - - return DBF; +bool TMoverParameters::DoorBlockedFlag( void ) { + // TBD: configurable lock activation threshold? + return ( + ( true == DoorBlocked ) + && ( true == DoorLockEnabled ) + && ( Vel >= 10.0 ) ); } // ************************************************************************************************* diff --git a/Train.cpp b/Train.cpp index d1a73140..a0144cee 100644 --- a/Train.cpp +++ b/Train.cpp @@ -3703,19 +3703,17 @@ void TTrain::OnCommand_doorlocktoggle( TTrain *Train, command_data const &Comman if( Command.action == GLFW_PRESS ) { // only reacting to press, so the sound can loop uninterrupted - if( false == Train->mvControlled->DoorSignalling ) { + if( false == Train->mvOccupied->DoorLockEnabled ) { // turn on - // TODO: check wheter we really need separate flags for this - Train->mvControlled->DoorSignalling = true; - Train->mvOccupied->DoorBlocked = true; + // TODO: door lock command to send through consist + Train->mvOccupied->DoorLockEnabled = true; // visual feedback Train->ggDoorSignallingButton.UpdateValue( 1.0, Train->dsbSwitch ); } else { // turn off - // TODO: check wheter we really need separate flags for this - Train->mvControlled->DoorSignalling = false; - Train->mvOccupied->DoorBlocked = false; + // TODO: door lock command to send through consist + Train->mvOccupied->DoorLockEnabled = false; // visual feedback Train->ggDoorSignallingButton.UpdateValue( 0.0, Train->dsbSwitch ); } @@ -5039,8 +5037,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaNadmSil.Turn( false ); } - if (mvControlled->Battery || mvControlled->ConverterFlag) - { + if (mvControlled->Battery || mvControlled->ConverterFlag) { // alerter test if( true == CAflag ) { if( ggSecurityResetButton.GetDesiredValue() > 0.95 ) { @@ -5056,7 +5053,6 @@ bool TTrain::Update( double const Deltatime ) fBlinkTimer = -fCzuwakBlink; else fBlinkTimer += Deltatime; - // hunter-091012: dodanie testu czuwaka if( ( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) || ( TestFlag( mvOccupied->SecuritySystem.Status, s_CAtest ) ) ) { @@ -5157,6 +5153,72 @@ bool TTrain::Update( double const Deltatime ) btLampkaBocznik3.Turn( false ); btLampkaBocznik4.Turn( false ); } + + if( mvControlled->Signalling == true ) { + if( mvOccupied->BrakePress >= 0.145f * 10 ) { + btLampkaHamowanie1zes.Turn( true ); + } + if( mvControlled->BrakePress < 0.075f * 10 ) { + btLampkaHamowanie1zes.Turn( false ); + } + } + else { + btLampkaHamowanie1zes.Turn( false ); + } + + switch (mvControlled->TrainType) { + // zależnie od typu lokomotywy + case dt_EZT: { + btLampkaHamienie.Turn( ( mvControlled->BrakePress >= 0.2 ) && mvControlled->Signalling ); + break; + } + case dt_ET41: { + // odhamowanie drugiego członu + if( mvSecond ) { + // bo może komuś przyjść do głowy jeżdżenie jednym członem + btLampkaHamienie.Turn( mvSecond->BrakePress < 0.4 ); + } + break; + } + default: { + btLampkaHamienie.Turn( ( mvOccupied->BrakePress >= 0.1 ) || mvControlled->DynamicBrakeFlag ); + btLampkaBrakingOff.Turn( ( mvOccupied->BrakePress < 0.1 ) && ( false == mvControlled->DynamicBrakeFlag ) ); + break; + } + } + // KURS90 + btLampkaMaxSila.Turn(abs(mvControlled->Im) >= 350); + btLampkaPrzekrMaxSila.Turn(abs(mvControlled->Im) >= 450); + btLampkaRadio.Turn(mvOccupied->Radio); + btLampkaRadioStop.Turn( mvOccupied->Radio && mvOccupied->RadioStopFlag ); + btLampkaHamulecReczny.Turn(mvOccupied->ManualBrakePos > 0); + // NBMX wrzesien 2003 - drzwi oraz sygnał odjazdu + btLampkaDoorLeft.Turn(mvOccupied->DoorLeftOpened); + btLampkaDoorRight.Turn(mvOccupied->DoorRightOpened); + btLampkaBlokadaDrzwi.Turn(mvOccupied->DoorBlockedFlag()); + btLampkaDepartureSignal.Turn( mvControlled->DepartureSignal ); + btLampkaNapNastHam.Turn((mvControlled->ActiveDir != 0) && (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym + btLampkaForward.Turn(mvControlled->ActiveDir > 0); // jazda do przodu + btLampkaBackward.Turn(mvControlled->ActiveDir < 0); // jazda do tyłu + btLampkaED.Turn(mvControlled->DynamicBrakeFlag); // hamulec ED + btLampkaBrakeProfileG.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_G ) ); + btLampkaBrakeProfileP.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_P ) ); + btLampkaBrakeProfileR.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_R ) ); + // light indicators + // NOTE: sides are hardcoded to deal with setups where single cab is equipped with all indicators + btLampkaUpperLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_upper ) != 0 ); + btLampkaLeftLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_left ) != 0 ); + btLampkaRightLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_right ) != 0 ); + btLampkaLeftEndLight.Turn( ( mvOccupied->iLights[ side::front ] & light::redmarker_left ) != 0 ); + btLampkaRightEndLight.Turn( ( mvOccupied->iLights[ side::front ] & light::redmarker_right ) != 0 ); + btLampkaRearUpperLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_upper ) != 0 ); + btLampkaRearLeftLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_left ) != 0 ); + btLampkaRearRightLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_right ) != 0 ); + btLampkaRearLeftEndLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::redmarker_left ) != 0 ); + btLampkaRearRightEndLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::redmarker_right ) != 0 ); + // others + btLampkaMalfunction.Turn( mvControlled->dizel_heat.PA ); + btLampkaMotorBlowers.Turn( mvControlled->RventRot > 0.1 ); } else { // wylaczone @@ -5178,27 +5240,40 @@ bool TTrain::Update( double const Deltatime ) btLampkaSprezarkaOff.Turn( false ); btLampkaFuelPumpOff.Turn( false ); btLampkaBezoporowa.Turn( false ); - } - if (mvControlled->Signalling == true) { - - if( ( mvOccupied->BrakePress >= 0.145f ) - && ( mvControlled->Battery == true ) - && ( mvControlled->Signalling == true ) ) { - - btLampkaHamowanie1zes.Turn( true ); - } - if (mvControlled->BrakePress < 0.075f) { - - btLampkaHamowanie1zes.Turn( false ); - } - } - else { - btLampkaHamowanie1zes.Turn( false ); + btLampkaHamienie.Turn( false ); + btLampkaBrakingOff.Turn( false ); + btLampkaBrakeProfileG.Turn( false ); + btLampkaBrakeProfileP.Turn( false ); + btLampkaBrakeProfileR.Turn( false ); + btLampkaMaxSila.Turn( false ); + btLampkaPrzekrMaxSila.Turn( false ); + btLampkaRadio.Turn( false ); + btLampkaRadioStop.Turn( false ); + btLampkaHamulecReczny.Turn( false ); + btLampkaDoorLeft.Turn( false ); + btLampkaDoorRight.Turn( false ); + btLampkaBlokadaDrzwi.Turn( false ); + btLampkaDepartureSignal.Turn( false ); + btLampkaNapNastHam.Turn( false ); + btLampkaForward.Turn( false ); + btLampkaBackward.Turn( false ); + btLampkaED.Turn( false ); + // light indicators + btLampkaUpperLight.Turn( false ); + btLampkaLeftLight.Turn( false ); + btLampkaRightLight.Turn( false ); + btLampkaLeftEndLight.Turn( false ); + btLampkaRightEndLight.Turn( false ); + btLampkaRearUpperLight.Turn( false ); + btLampkaRearLeftLight.Turn( false ); + btLampkaRearRightLight.Turn( false ); + btLampkaRearLeftEndLight.Turn( false ); + btLampkaRearRightEndLight.Turn( false ); + // others + btLampkaMalfunction.Turn( false ); + btLampkaMotorBlowers.Turn( false ); } - btLampkaBlokadaDrzwi.Turn(mvControlled->DoorSignalling ? - mvOccupied->DoorBlockedFlag() && mvControlled->Battery : - false); { // yB - wskazniki drugiego czlonu TDynamicObject *tmp; //=mvControlled->mvSecond; //Ra 2014-07: trzeba to @@ -5231,39 +5306,16 @@ bool TTrain::Update( double const Deltatime ) else if( tmp->MoverParameters->BrakePress < 0.1 ) { btLampkaStycznB.Turn( true ); // mozna prowadzic rozruch } - - //----------------- - // //hunter-271211: brak jazdy w drugim czlonie, gdy w - // pierwszym tez nie ma (i odwrotnie) - Ra: tutaj? w kabinie? - // if (tmp->MoverParameters->TrainType!=dt_EZT) - // if (((tmp->MoverParameters->BrakePress > 2) || ( - // tmp->MoverParameters->PipePress < 3.6 )) && ( - // tmp->MoverParameters->MainCtrlPos != 0 )) - // { - // tmp->MoverParameters->MainCtrlActualPos=0; //inaczej - // StLinFlag nie zmienia sie na false w drugim pojezdzie - // //tmp->MoverParameters->StLinFlag=true; - // mvControlled->StLinFlag=true; - // } - // if (mvControlled->StLinFlag==true) - // tmp->MoverParameters->MainCtrlActualPos=0; - // //tmp->MoverParameters->StLinFlag=true; - - //----------------- - // hunter-271211: sygnalizacja poslizgu w pierwszym pojezdzie, gdy - // wystapi w drugim + // hunter-271211: sygnalizacja poslizgu w pierwszym pojezdzie, gdy wystapi w drugim btLampkaPoslizg.Turn(tmp->MoverParameters->SlippingWheels); - //----------------- btLampkaSprezarkaB.Turn( tmp->MoverParameters->CompressorFlag ); // mutopsitka dziala btLampkaSprezarkaBOff.Turn( false == tmp->MoverParameters->CompressorFlag ); - if ((tmp->MoverParameters->BrakePress >= 0.145f * 10) && - (mvControlled->Battery == true) && (mvControlled->Signalling == true)) + if ((tmp->MoverParameters->BrakePress >= 0.145f * 10) && (mvControlled->Signalling == true)) { btLampkaHamowanie2zes.Turn( true ); } - if ((tmp->MoverParameters->BrakePress < 0.075f * 10) || - (mvControlled->Battery == false) || (mvControlled->Signalling == false)) + if ((tmp->MoverParameters->BrakePress < 0.075f * 10) || (mvControlled->Signalling == false)) { btLampkaHamowanie2zes.Turn( false ); } @@ -5288,96 +5340,6 @@ bool TTrain::Update( double const Deltatime ) btLampkaMalfunctionB.Turn( false ); } } - - if( mvControlled->Battery || mvControlled->ConverterFlag ) { - switch (mvControlled->TrainType) { - // zależnie od typu lokomotywy - case dt_EZT: { - btLampkaHamienie.Turn( ( mvControlled->BrakePress >= 0.2 ) && mvControlled->Signalling ); - break; - } - case dt_ET41: { - // odhamowanie drugiego członu - if( mvSecond ) { - // bo może komuś przyjść do głowy jeżdżenie jednym członem - btLampkaHamienie.Turn( mvSecond->BrakePress < 0.4 ); - } - break; - } - default: { - btLampkaHamienie.Turn( ( mvOccupied->BrakePress >= 0.1 ) || mvControlled->DynamicBrakeFlag ); - btLampkaBrakingOff.Turn( ( mvOccupied->BrakePress < 0.1 ) && ( false == mvControlled->DynamicBrakeFlag ) ); - break; - } - } - // KURS90 - btLampkaMaxSila.Turn(abs(mvControlled->Im) >= 350); - btLampkaPrzekrMaxSila.Turn(abs(mvControlled->Im) >= 450); - btLampkaRadio.Turn(mvOccupied->Radio); - btLampkaRadioStop.Turn( mvOccupied->Radio && mvOccupied->RadioStopFlag ); - btLampkaHamulecReczny.Turn(mvOccupied->ManualBrakePos > 0); - // NBMX wrzesien 2003 - drzwi oraz sygnał odjazdu - btLampkaDoorLeft.Turn(mvOccupied->DoorLeftOpened); - btLampkaDoorRight.Turn(mvOccupied->DoorRightOpened); - btLampkaDepartureSignal.Turn( mvControlled->DepartureSignal ); - btLampkaNapNastHam.Turn((mvControlled->ActiveDir != 0) && (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym - btLampkaForward.Turn(mvControlled->ActiveDir > 0); // jazda do przodu - btLampkaBackward.Turn(mvControlled->ActiveDir < 0); // jazda do tyłu - btLampkaED.Turn(mvControlled->DynamicBrakeFlag); // hamulec ED - btLampkaBrakeProfileG.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_G ) ); - btLampkaBrakeProfileP.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_P ) ); - btLampkaBrakeProfileR.Turn( TestFlag( mvOccupied->BrakeDelayFlag, bdelay_R ) ); - // light indicators - // NOTE: sides are hardcoded to deal with setups where single cab is equipped with all indicators - btLampkaUpperLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_upper ) != 0 ); - btLampkaLeftLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_left ) != 0 ); - btLampkaRightLight.Turn( ( mvOccupied->iLights[ side::front ] & light::headlight_right ) != 0 ); - btLampkaLeftEndLight.Turn( ( mvOccupied->iLights[ side::front ] & light::redmarker_left ) != 0 ); - btLampkaRightEndLight.Turn( ( mvOccupied->iLights[ side::front ] & light::redmarker_right ) != 0 ); - btLampkaRearUpperLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_upper ) != 0 ); - btLampkaRearLeftLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_left ) != 0 ); - btLampkaRearRightLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::headlight_right ) != 0 ); - btLampkaRearLeftEndLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::redmarker_left ) != 0 ); - btLampkaRearRightEndLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::redmarker_right ) != 0 ); - // others - btLampkaMalfunction.Turn( mvControlled->dizel_heat.PA ); - btLampkaMotorBlowers.Turn( mvControlled->RventRot > 0.1 ); - } - else - { // gdy bateria wyłączona - btLampkaHamienie.Turn( false ); - btLampkaBrakingOff.Turn( false ); - btLampkaBrakeProfileG.Turn( false ); - btLampkaBrakeProfileP.Turn( false ); - btLampkaBrakeProfileR.Turn( false ); - btLampkaMaxSila.Turn( false ); - btLampkaPrzekrMaxSila.Turn( false ); - btLampkaRadio.Turn( false ); - btLampkaRadioStop.Turn( false ); - btLampkaHamulecReczny.Turn( false ); - btLampkaDoorLeft.Turn( false ); - btLampkaDoorRight.Turn( false ); - btLampkaDepartureSignal.Turn( false ); - btLampkaNapNastHam.Turn( false ); - btLampkaForward.Turn( false ); - btLampkaBackward.Turn( false ); - btLampkaED.Turn( false ); - // light indicators - btLampkaUpperLight.Turn( false ); - btLampkaLeftLight.Turn( false ); - btLampkaRightLight.Turn( false ); - btLampkaLeftEndLight.Turn( false ); - btLampkaRightEndLight.Turn( false ); - btLampkaRearUpperLight.Turn( false ); - btLampkaRearLeftLight.Turn( false ); - btLampkaRearRightLight.Turn( false ); - btLampkaRearLeftEndLight.Turn( false ); - btLampkaRearRightEndLight.Turn( false ); - // others - btLampkaMalfunction.Turn( false ); - btLampkaMotorBlowers.Turn( false ); - } - // McZapkie-080602: obroty (albo translacje) regulatorow if (ggMainCtrl.SubModel) { @@ -7041,9 +7003,10 @@ void TTrain::set_cab_controls() { ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1.0 : 0.0 ); ggDoorRightButton.PutValue( mvOccupied->DoorRightOpened ? 1.0 : 0.0 ); // door lock - if( true == mvControlled->DoorSignalling ) { - ggDoorSignallingButton.PutValue( 1.0 ); - } + ggDoorSignallingButton.PutValue( + mvOccupied->DoorLockEnabled ? + 1.0 : + 0.0 ); // heating if( true == mvControlled->Heating ) { ggTrainHeatingButton.PutValue( 1.0 ); From 0c062e9041ecf6503f9b80faee919eba6ee5e0c5 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 30 Aug 2018 20:41:14 +0200 Subject: [PATCH 383/426] imgui user interface implementation --- AnimModel.h | 2 +- Classes.h | 2 + Driver.cpp | 24 +- Driver.h | 18 +- Track.h | 2 +- application.cpp | 2 + drivermode.cpp | 57 ++- drivermode.h | 1 + driveruilayer.cpp | 849 +++---------------------------------- driveruilayer.h | 15 +- driveruipanels.cpp | 896 ++++++++++++++++++++++++++++++++++++++++ driveruipanels.h | 93 +++++ editormode.cpp | 3 - editoruilayer.cpp | 158 +------ editoruilayer.h | 3 +- editoruipanels.cpp | 196 +++++++++ editoruipanels.h | 24 ++ maszyna.vcxproj.filters | 27 ++ mtable.cpp | 6 +- mtable.h | 6 +- renderer.cpp | 28 +- skydome.cpp | 6 +- stdafx.h | 20 + uilayer.cpp | 194 +++++---- uilayer.h | 49 ++- 25 files changed, 1563 insertions(+), 1118 deletions(-) create mode 100644 driveruipanels.cpp create mode 100644 driveruipanels.h create mode 100644 editoruipanels.cpp create mode 100644 editoruipanels.h diff --git a/AnimModel.h b/AnimModel.h index 16f3a558..f3ddf10e 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -125,7 +125,7 @@ class TAnimAdvanced class TAnimModel : public scene::basic_node { friend opengl_renderer; - friend editor_ui; + friend itemproperties_panel; public: // constructors diff --git a/Classes.h b/Classes.h index e1c3d2b5..62faa4eb 100644 --- a/Classes.h +++ b/Classes.h @@ -33,6 +33,7 @@ class scenario_time; class TMoverParameters; class ui_layer; class editor_ui; +class itemproperties_panel; class event_manager; class memory_table; class powergridsource_table; @@ -42,6 +43,7 @@ struct light_array; namespace scene { struct node_data; +class basic_node; } namespace Mtable diff --git a/Driver.cpp b/Driver.cpp index 14a54f55..d8034036 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -321,7 +321,7 @@ bool TSpeedPos::Update() return false; }; -std::string TSpeedPos::GetName() +std::string TSpeedPos::GetName() const { if (iFlags & spTrack) // jeśli tor return trTrack->name(); @@ -331,7 +331,7 @@ std::string TSpeedPos::GetName() return ""; } -std::string TSpeedPos::TableText() +std::string TSpeedPos::TableText() const { // pozycja tabelki pr?dko?ci if (iFlags & spEnabled) { // o ile pozycja istotna @@ -1639,7 +1639,7 @@ TController::~TController() CloseLog(); }; -std::string TController::Order2Str(TOrders Order) +std::string TController::Order2Str(TOrders Order) const { // zamiana kodu rozkazu na opis if (Order & Change_direction) return "Change_direction"; // może być nałożona na inną i wtedy ma priorytet @@ -1674,9 +1674,9 @@ std::string TController::Order2Str(TOrders Order) return "Undefined!"; } -std::string TController::OrderCurrent() +std::string TController::OrderCurrent() const { // pobranie aktualnego rozkazu celem wyświetlenia - return std::to_string(OrderPos) + ". " + Order2Str(OrderList[OrderPos]); + return "[" + std::to_string(OrderPos) + "] " + Order2Str(OrderList[OrderPos]); }; void TController::OrdersClear() @@ -2244,7 +2244,7 @@ void TController::SetVelocity(double NewVel, double NewVelNext, TStopReason r) VelNext = NewVelNext; // prędkość przy następnym obiekcie } -double TController::BrakeAccFactor() +double TController::BrakeAccFactor() const { double Factor = 1.0; if( ( ActualProximityDist > fMinProximityDist ) @@ -4916,7 +4916,7 @@ TController::UpdateSituation(double dt) { && ( pVehicles[0]->fTrackBlock < 50.0 ) ) { // crude detection of edge case, if approaching another vehicle coast slowly until min distance // this should allow to bunch up trainsets more on sidings - VelDesired = min_speed( VelDesired, 5.0 ); + VelDesired = min_speed( 5.0, VelDesired ); } else { // hamowanie tak, aby stanąć @@ -4934,7 +4934,7 @@ TController::UpdateSituation(double dt) { else { // outside of max safe range AccDesired = AccPreferred; - if( vel > min_speed( 10.0, VelDesired ) ) { + if( vel > min_speed( (ActualProximityDist > 10.0 ? 10.0 : 5.0 ), VelDesired ) ) { // allow to coast at reasonably low speed auto const brakingdistance { fBrakeDist * braking_distance_multiplier( VelNext ) }; auto const slowdowndistance { ( @@ -6026,7 +6026,7 @@ TCommandType TController::BackwardScan() return TCommandType::cm_Unknown; // nic }; -std::string TController::NextStop() +std::string TController::NextStop() const { // informacja o następnym zatrzymaniu, wyświetlane pod [F1] if (asNextStop == "[End of route]") return ""; // nie zawiera nazwy stacji, gdy dojechał do końca @@ -6130,7 +6130,7 @@ TController::TrainTimetable() const { return TrainParams; } -std::string TController::Relation() +std::string TController::Relation() const { // zwraca relację pociągu return TrainParams->ShowRelation(); }; @@ -6150,7 +6150,7 @@ int TController::StationIndex() const return TrainParams->StationIndex; }; -bool TController::IsStop() +bool TController::IsStop() const { // informuje, czy jest zatrzymanie na najbliższej stacji return TrainParams->IsStop(); }; @@ -6181,7 +6181,7 @@ void TController::ControllingSet() mvControlling = pVehicle->ControlledFind()->MoverParameters; // poszukiwanie członu sterowanego }; -std::string TController::TableText( std::size_t const Index ) +std::string TController::TableText( std::size_t const Index ) const { // pozycja tabelki prędkości if( Index < sSpeedTable.size() ) { return sSpeedTable[ Index ].TableText(); diff --git a/Driver.h b/Driver.h index 6ec94085..ca01241a 100644 --- a/Driver.h +++ b/Driver.h @@ -154,8 +154,8 @@ class TSpeedPos fDist -= dist; } bool Set(TEvent *e, double d, TOrders order = Wait_for_orders); void Set(TTrack *t, double d, int f); - std::string TableText(); - std::string GetName(); + std::string TableText() const; + std::string GetName() const; bool IsProperSemaphor(TOrders order = Wait_for_orders); }; @@ -205,7 +205,7 @@ public: double fVelMax = -1.0; // maksymalna prędkość składu (sprawdzany każdy pojazd) public: double fBrakeDist = 0.0; // przybliżona droga hamowania - double BrakeAccFactor(); + double BrakeAccFactor() const; double fBrakeReaction = 1.0; //opóźnienie zadziałania hamulca - czas w s / (km/h) double fAccThreshold = 0.0; // próg opóźnienia dla zadziałania hamulca double AbsAccS_pub = 0.0; // próg opóźnienia dla zadziałania hamulca @@ -349,11 +349,11 @@ private: void OrdersClear(); void OrdersDump(); TController( bool AI, TDynamicObject *NewControll, bool InitPsyche, bool primary = true ); - std::string OrderCurrent(); + std::string OrderCurrent() const; void WaitingSet(double Seconds); private: - std::string Order2Str(TOrders Order); + std::string Order2Str(TOrders Order) const; void DirectionForward(bool forward); int OrderDirectionChange(int newdir, TMoverParameters *Vehicle); void Lights(int head, int rear); @@ -395,11 +395,11 @@ private: void TakeControl(bool yes); Mtable::TTrainParameters const * TrainTimetable() const; std::string TrainName() const; - std::string Relation(); + std::string Relation() const; int StationCount() const; int StationIndex() const; - bool IsStop(); - std::string NextStop(); + bool IsStop() const; + std::string NextStop() const; inline bool Primary() const { return ( ( iDrivigFlags & movePrimary ) != 0 ); }; @@ -411,7 +411,7 @@ private: TrackBlock() const; void MoveTo(TDynamicObject *to); void DirectionInitial(); - std::string TableText(std::size_t const Index); + std::string TableText(std::size_t const Index) const; int CrossRoute(TTrack *tr); /* void RouteSwitch(int d); diff --git a/Track.h b/Track.h index 4218ef0e..1b34b00d 100644 --- a/Track.h +++ b/Track.h @@ -128,7 +128,7 @@ class TTrack : public scene::basic_node { friend opengl_renderer; // NOTE: temporary arrangement - friend editor_ui; + friend itemproperties_panel; private: TIsolated * pIsolated = nullptr; // obwód izolowany obsługujący zajęcia/zwolnienia grupy torów diff --git a/application.cpp b/application.cpp index ad12acf1..4680596c 100644 --- a/application.cpp +++ b/application.cpp @@ -153,6 +153,8 @@ eu07_application::exit() { SafeDelete( simulation::Train ); SafeDelete( simulation::Region ); + ui_layer::shutdown(); + glfwDestroyWindow( m_window ); glfwTerminate(); diff --git a/drivermode.cpp b/drivermode.cpp index 0667f0a9..01bec808 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -327,24 +327,12 @@ driver_mode::on_key( int const Key, int const Scancode, int const Action, int co || ( Key == GLFW_KEY_RIGHT_ALT ) ) ) { // if the alt key was pressed toggle control picking mode and set matching cursor behaviour if( Action == GLFW_PRESS ) { - - if( Global.ControlPicking ) { - // switch off - Application.get_cursor_pos( m_input.mouse_pickmodepos.x, m_input.mouse_pickmodepos.y ); - Application.set_cursor( GLFW_CURSOR_DISABLED ); - Application.set_cursor_pos( 0, 0 ); - } - else { - // enter picking mode - Application.set_cursor_pos( m_input.mouse_pickmodepos.x, m_input.mouse_pickmodepos.y ); - Application.set_cursor( GLFW_CURSOR_NORMAL ); - } - // actually toggle the mode - Global.ControlPicking = !Global.ControlPicking; + // toggle picking mode + set_picking( !Global.ControlPicking ); } } - if( Action != GLFW_RELEASE ) { + if( Action == GLFW_PRESS ) { OnKeyDown( Key ); @@ -737,7 +725,7 @@ driver_mode::OnKeyDown(int cKey) { // if (cKey!=VK_F4) return; // nie są przekazywane do pojazdu wcale } - +/* if ((Global.iTextMode == GLFW_KEY_F12) ? (cKey >= '0') && (cKey <= '9') : false) { // tryb konfiguracji debugmode (przestawianie kamery już wyłączone if (!Global.shiftState) // bez [Shift] @@ -757,14 +745,21 @@ driver_mode::OnKeyDown(int cKey) { // else if (cKey=='3') Global.iWriteLogEnabled^=4; //wypisywanie nazw torów } } - else if( cKey == GLFW_KEY_ESCAPE ) { + else */ + if( cKey == GLFW_KEY_ESCAPE ) { // toggle pause - if( Global.iPause & 1 ) // jeśli pauza startowa - Global.iPause &= ~1; // odpauzowanie, gdy po wczytaniu miało nie startować - else if( !( Global.iMultiplayer & 2 ) ) // w multiplayerze pauza nie ma sensu + if( Global.iPause & 1 ) { + // jeśli pauza startowa + // odpauzowanie, gdy po wczytaniu miało nie startować + Global.iPause &= ~1; + } + else if( ( Global.iMultiplayer & 2 ) == 0 ) { + // w multiplayerze pauza nie ma sensu Global.iPause ^= 2; // zmiana stanu zapauzowania - if( Global.iPause ) {// jak pauza - Global.iTextMode = GLFW_KEY_F1; // to wyświetlić zegar i informację + if( ( Global.iPause & 2 ) + && ( false == Global.ControlPicking ) ) { + set_picking( true ); + } } } else { @@ -992,3 +987,21 @@ driver_mode::InOutKey( bool const Near ) // update window title to reflect the situation Application.set_title( Global.AppName + " (" + ( train != nullptr ? train->Occupied()->Name : "" ) + " @ " + Global.SceneryFile + ")" ); } + +void +driver_mode::set_picking( bool const Picking ) { + + if( Picking ) { + // enter picking mode + Application.set_cursor_pos( m_input.mouse_pickmodepos.x, m_input.mouse_pickmodepos.y ); + Application.set_cursor( GLFW_CURSOR_NORMAL ); + } + else { + // switch off + Application.get_cursor_pos( m_input.mouse_pickmodepos.x, m_input.mouse_pickmodepos.y ); + Application.set_cursor( GLFW_CURSOR_DISABLED ); + Application.set_cursor_pos( 0, 0 ); + } + // actually toggle the mode + Global.ControlPicking = Picking; +} diff --git a/drivermode.h b/drivermode.h index 66701ca8..297da859 100644 --- a/drivermode.h +++ b/drivermode.h @@ -73,6 +73,7 @@ private: void InOutKey( bool const Near = true ); void FollowView( bool wycisz = true ); void DistantView( bool const Near = false ); + void set_picking( bool const Picking ); // members drivermode_input m_input; diff --git a/driveruilayer.cpp b/driveruilayer.cpp index 08fb23b0..19c1bd5b 100644 --- a/driveruilayer.cpp +++ b/driveruilayer.cpp @@ -28,21 +28,18 @@ http://mozilla.org/MPL/2.0/. driver_ui::driver_ui() { - clear_texts(); -/* - UIHeader = std::make_shared( 20, 20 ); // header ui panel - UITable = std::make_shared( 20, 100 ); // schedule or scan table - UITranscripts = std::make_shared( 85, 600 ); // voice transcripts -*/ - // make 4 empty lines for the ui header, to cut down on work down the road - UIHeader.text_lines.emplace_back( "", Global.UITextColor ); - UIHeader.text_lines.emplace_back( "", Global.UITextColor ); - UIHeader.text_lines.emplace_back( "", Global.UITextColor ); - UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + clear_panels(); // bind the panels with ui object. maybe not the best place for this but, eh - push_back( &UIHeader ); - push_back( &UITable ); - push_back( &UITranscripts ); + push_back( &m_aidpanel ); + push_back( &m_timetablepanel ); + push_back( &m_debugpanel ); + push_back( &m_transcriptspanel ); + + m_timetablepanel.size_min = { 435, 110 }; + m_timetablepanel.size_max = { 435, Global.iWindowHeight * 0.95 }; + + m_transcriptspanel.size_min = { 435, 85 }; + m_transcriptspanel.size_max = { Global.iWindowWidth * 0.95, Global.iWindowHeight * 0.95 }; } // potentially processes provided input key. returns: true if key was processed, false otherwise @@ -55,9 +52,6 @@ driver_ui::on_key( int const Key, int const Action ) { case GLFW_KEY_F1: case GLFW_KEY_F2: - case GLFW_KEY_F3: - case GLFW_KEY_F8: - case GLFW_KEY_F9: case GLFW_KEY_F10: case GLFW_KEY_F12: { // ui mode selectors @@ -67,15 +61,7 @@ driver_ui::on_key( int const Key, int const Action ) { return false; } - if( Action == GLFW_RELEASE ) { return true; } // recognized, but ignored -/* - EditorModeFlag = ( Key == GLFW_KEY_F11 ); - if( ( true == EditorModeFlag ) - && ( false == Global.ControlPicking ) ) { - set_cursor( GLFW_CURSOR_NORMAL ); - Global.ControlPicking = true; - } -*/ + if( Action != GLFW_PRESS ) { return true; } // recognized, but ignored } default: { // everything else @@ -87,91 +73,35 @@ driver_ui::on_key( int const Key, int const Action ) { case GLFW_KEY_F1: { // basic consist info - if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } - if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { - // wyłączenie napisów - Global.iTextMode = 0; - Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; - } - else { - Global.iTextMode = Key; - } + auto state = ( + ( m_aidpanel.is_open == false ) ? 0 : + ( m_aidpanel.is_expanded == false ) ? 1 : + 2 ); + state = clamp_circular( ++state, 3 ); + + m_aidpanel.is_open = ( state > 0 ); + m_aidpanel.is_expanded = ( state > 1 ); + return true; } case GLFW_KEY_F2: { - // parametry pojazdu - if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } - if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { - // wyłączenie napisów - Global.iTextMode = 0; - Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; - } - else { - Global.iTextMode = Key; - } - return true; - } - - case GLFW_KEY_F3: { // timetable - if( Global.iTextMode == Key ) { ++Global.iScreenMode[ Key - GLFW_KEY_F1 ]; } - if( Global.iScreenMode[ Key - GLFW_KEY_F1 ] > 1 ) { - // wyłączenie napisów - Global.iTextMode = 0; - Global.iScreenMode[ Key - GLFW_KEY_F1 ] = 0; - } - else { - Global.iTextMode = Key; - } + auto state = ( + ( m_timetablepanel.is_open == false ) ? 0 : + ( m_timetablepanel.is_expanded == false ) ? 1 : + 2 ); + state = clamp_circular( ++state, 3 ); + + m_timetablepanel.is_open = ( state > 0 ); + m_timetablepanel.is_expanded = ( state > 1 ); + return true; } - case GLFW_KEY_F8: { - // renderer debug data - Global.iTextMode = Key; - return true; - } - - case GLFW_KEY_F9: { - // wersja - Global.iTextMode = Key; - return true; - } - - case GLFW_KEY_F10: { - // quit - if( Global.iTextMode == Key ) { - Global.iTextMode = - ( Global.iPause && ( Key != GLFW_KEY_F1 ) ? - GLFW_KEY_F1 : - 0 ); // wyłączenie napisów, chyba że pauza - } - else { - Global.iTextMode = Key; - } - return true; - } -/* - case GLFW_KEY_F11: { - // scenario inspector - Global.iTextMode = Key; - return true; - } -*/ case GLFW_KEY_F12: { - // coś tam jeszcze - Global.iTextMode = Key; - return true; - } - - case GLFW_KEY_Y: { - // potentially quit - if( Global.iTextMode != GLFW_KEY_F10 ) { return false; } // not in quit mode - - if( Action == GLFW_RELEASE ) { return true; } // recognized, but ignored - - glfwSetWindowShouldClose( m_window, 1 ); + // debug panel + m_debugpanel.is_open = !m_debugpanel.is_open; return true; } @@ -187,13 +117,9 @@ driver_ui::on_key( int const Key, int const Action ) { void driver_ui::update() { - UITable.text_lines.clear(); - std::string uitextline1, uitextline2, uitextline3, uitextline4; set_tooltip( "" ); auto const *train { simulation::Train }; - auto const *controlled { ( train ? train->Dynamic() : nullptr ) }; - auto const &camera { Global.pCamera }; if( ( train != nullptr ) && ( false == FreeFlyModeFlag ) ) { if( false == DebugModeFlag ) { @@ -214,691 +140,28 @@ driver_ui::update() { "" ) ); } - switch( Global.iTextMode ) { - - case( GLFW_KEY_F1 ) : { - // f1, default mode: current time and timetable excerpt - auto const &time = simulation::Time.data(); - uitextline1 = - "Time: " - + to_string( time.wHour ) + ":" - + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" - + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); - if( Global.iPause ) { - uitextline1 += " (paused)"; - } - - if( ( controlled != nullptr ) - && ( controlled->Mechanik != nullptr ) ) { - - auto const *mover = controlled->MoverParameters; - auto const *driver = controlled->Mechanik; - - uitextline2 = "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ); - if( mover->ActiveDir > 0 ) { uitextline2 += " D"; } - else if( mover->ActiveDir < 0 ) { uitextline2 += " R"; } - else { uitextline2 += " N"; } - - uitextline3 = "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + "+" + to_string( mover->LocalBrakePosA * LocalBrakePosNo, 0 ) + ( mover->SlippingWheels ? " !" : " " ); - - uitextline4 = ( - true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? - "!ALERTER! " : - " " ); - uitextline4 += ( - true == TestFlag( mover->SecuritySystem.Status, s_active ) ? - "!SHP! " : - " " ); - - if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { - // detail mode on second key press - auto const speedlimit { static_cast( std::floor( driver->VelDesired ) ) }; - uitextline2 += - " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" - + " (limit: " + std::to_string( speedlimit ) + " km/h"; - auto const nextspeedlimit { static_cast( std::floor( driver->VelNext ) ) }; - if( nextspeedlimit != speedlimit ) { - uitextline2 += - ", new limit: " + std::to_string( nextspeedlimit ) + " km/h" - + " in " + to_string( driver->ActualProximityDist * 0.001, 1 ) + " km"; - } - uitextline2 += ")"; - auto const reverser { ( mover->ActiveDir > 0 ? 1 : -1 ) }; - auto const grade { controlled->VectorFront().y * 100 * ( controlled->DirectionGet() == reverser ? 1 : -1 ) * reverser }; - if( std::abs( grade ) >= 0.25 ) { - uitextline2 += " Grade: " + to_string( grade, 1 ) + "%"; - } - uitextline3 += - " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" - + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; - - auto const stoptime { static_cast( -1.0 * controlled->Mechanik->fStopTime ) }; - if( stoptime > 0 ) { - uitextline4 += " Loading/unloading in progress (" + to_string( stoptime ) + ( stoptime > 1 ? " seconds" : " second" ) + " left)"; - } - else { - auto const trackblockdistance{ std::abs( controlled->Mechanik->TrackBlock() ) }; - if( trackblockdistance <= 75.0 ) { - uitextline4 += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; - } - } - } - } - - break; - } - - case( GLFW_KEY_F2 ) : { - // timetable - auto *vehicle { - ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( camera.Pos, 20, false, false ) ) : - controlled ) }; // w trybie latania lokalizujemy wg mapy - - if( vehicle == nullptr ) { break; } - // if the nearest located vehicle doesn't have a direct driver, try to query its owner - auto const owner = ( - ( ( vehicle->Mechanik != nullptr ) && ( vehicle->Mechanik->Primary() ) ) ? - vehicle->Mechanik : - vehicle->ctOwner ); - if( owner == nullptr ){ break; } - - auto const *table = owner->TrainTimetable(); - if( table == nullptr ) { break; } - - auto const &time = simulation::Time.data(); - uitextline1 = - "Time: " - + to_string( time.wHour ) + ":" - + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" - + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); - if( Global.iPause ) { - uitextline1 += " (paused)"; - } - - uitextline2 = Bezogonkow( owner->Relation(), true ) + " (" + Bezogonkow( owner->TrainName(), true ) + ")"; - auto const nextstation = Bezogonkow( owner->NextStop(), true ); - if( !nextstation.empty() ) { - // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania - uitextline3 = " -> " + nextstation; - } - - if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { - - if( 0 == table->StationCount ) { - // only bother if there's stations to list - UITable.text_lines.emplace_back( "(no timetable)", Global.UITextColor ); - } - else { - // header - UITable.text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); - - TMTableLine const *tableline; - for( int i = owner->iStationStart; i <= std::min( owner->iStationStart + 10, table->StationCount ); ++i ) { - // wyświetlenie pozycji z rozkładu - tableline = table->TimeTable + i; // linijka rozkładu - - std::string vmax = - " " - + to_string( tableline->vmax, 0 ); - vmax = vmax.substr( vmax.size() - 3, 3 ); // z wyrównaniem do prawej - std::string const station = ( - Bezogonkow( tableline->StationName, true ) - + " " ) - .substr( 0, 34 ); - std::string const location = ( - ( tableline->km > 0.0 ? - to_string( tableline->km, 2 ) : - "" ) - + " " ) - .substr( 0, 34 - tableline->StationWare.size() ); - std::string const arrival = ( - tableline->Ah >= 0 ? - to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : - " | " ); - std::string const departure = ( - tableline->Dh >= 0 ? - to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : - " | " ); - auto const candeparture = ( - ( owner->iStationStart < table->StationIndex ) - && ( i < table->StationIndex ) - && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ); - auto traveltime = - " " - + ( i < 2 ? "" : - tableline->Ah >= 0 ? to_string( CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Ah, tableline->Am ), 0 ) : - to_string( std::max( 0.0, CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Dh, tableline->Dm ) - 0.5 ), 0 ) ); - traveltime = traveltime.substr( traveltime.size() - 3, 3 ); // z wyrównaniem do prawej - - UITable.text_lines.emplace_back( - ( "| " + vmax + " | " + station + " | " + arrival + " | " + traveltime + " |" ), - ( candeparture ? - glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono - Global.UITextColor ) ); - UITable.text_lines.emplace_back( - ( "| | " + location + tableline->StationWare + " | " + departure + " | |" ), - ( candeparture ? - glm::vec4( 0.0f, 1.0f, 0.0f, 1.0f ) :// czas minął i odjazd był, to nazwa stacji będzie na zielono - Global.UITextColor ) ); - // divider/footer - UITable.text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); - } - if( owner->iStationStart + 10 < table->StationCount ) { - // if we can't display entire timetable, add a scrolling indicator at the bottom - UITable.text_lines.emplace_back( " ... ", Global.UITextColor ); - } - } - } - - break; - } - - case( GLFW_KEY_F3 ) : { - - auto const *vehicle { - ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( camera.Pos, 20, false, false ) ) : - controlled ) }; // w trybie latania lokalizujemy wg mapy - - if( vehicle != nullptr ) { - // jeśli domyślny ekran po pierwszym naciśnięciu - auto const *mover { vehicle->MoverParameters }; - - uitextline1 = "Vehicle name: " + mover->Name; - - if( ( vehicle->Mechanik == nullptr ) && ( vehicle->ctOwner ) ) { - // for cars other than leading unit indicate the leader - uitextline1 += ", owned by " + vehicle->ctOwner->OwnerName(); - } - uitextline1 += "; Status: " + mover->EngineDescription( 0 ); - - // informacja o sprzęgach - uitextline1 += - "; C0:" + - ( vehicle->PrevConnected ? - vehicle->PrevConnected->name() + ":" + to_string( mover->Couplers[ 0 ].CouplingFlag ) + ( - mover->Couplers[ 0 ].CouplingFlag == 0 ? - " (" + to_string( mover->Couplers[ 0 ].CoupleDist, 1 ) + " m)" : - "" ) : - "none" ); - uitextline1 += - " C1:" + - ( vehicle->NextConnected ? - vehicle->NextConnected->name() + ":" + to_string( mover->Couplers[ 1 ].CouplingFlag ) + ( - mover->Couplers[ 1 ].CouplingFlag == 0 ? - " (" + to_string( mover->Couplers[ 1 ].CoupleDist, 1 ) + " m)" : - "" ) : - "none" ); - - // equipment flags - uitextline2 = ( mover->Battery ? "B" : "." ); - uitextline2 += ( mover->Mains ? "M" : "." ); - uitextline2 += ( mover->PantRearUp ? ( mover->PantRearVolt > 0.0 ? "O" : "o" ) : "." ); - uitextline2 += ( mover->PantFrontUp ? ( mover->PantFrontVolt > 0.0 ? "P" : "p" ) : "." ); - uitextline2 += ( mover->PantPressLockActive ? "!" : ( mover->PantPressSwitchActive ? "*" : "." ) ); - uitextline2 += ( mover->WaterPump.is_active ? "W" : ( false == mover->WaterPump.breaker ? "-" : ( mover->WaterPump.is_enabled ? "w" : "." ) ) ); - uitextline2 += ( true == mover->WaterHeater.is_damaged ? "!" : ( mover->WaterHeater.is_active ? "H" : ( false == mover->WaterHeater.breaker ? "-" : ( mover->WaterHeater.is_enabled ? "h" : "." ) ) ) ); - uitextline2 += ( mover->FuelPump.is_active ? "F" : ( mover->FuelPump.is_enabled ? "f" : "." ) ); - uitextline2 += ( mover->OilPump.is_active ? "O" : ( mover->OilPump.is_enabled ? "o" : "." ) ); - uitextline2 += ( false == mover->ConverterAllowLocal ? "-" : ( mover->ConverterAllow ? ( mover->ConverterFlag ? "X" : "x" ) : "." ) ); - uitextline2 += ( mover->ConvOvldFlag ? "!" : "." ); - uitextline2 += ( mover->CompressorFlag ? "C" : ( false == mover->CompressorAllowLocal ? "-" : ( ( mover->CompressorAllow || mover->CompressorStart == start_t::automatic ) ? "c" : "." ) ) ); - uitextline2 += ( mover->CompressorGovernorLock ? "!" : "." ); - - auto const *train { simulation::Train }; - if( ( train != nullptr ) && ( train->Dynamic() == vehicle ) ) { - uitextline2 += ( mover->Radio ? " R: " : " r: " ) + std::to_string( train->RadioChannel() ); - } - uitextline2 += " Bdelay: "; - if( ( mover->BrakeDelayFlag & bdelay_G ) == bdelay_G ) - uitextline2 += "G"; - if( ( mover->BrakeDelayFlag & bdelay_P ) == bdelay_P ) - uitextline2 += "P"; - if( ( mover->BrakeDelayFlag & bdelay_R ) == bdelay_R ) - uitextline2 += "R"; - if( ( mover->BrakeDelayFlag & bdelay_M ) == bdelay_M ) - uitextline2 += "+Mg"; - - uitextline2 += ", Load: " + to_string( mover->Load, 0 ) + " (" + to_string( mover->LoadFlag, 0 ) + ")"; - - uitextline2 += - "; Pant: " - + to_string( mover->PantPress, 2 ) - + ( mover->bPantKurek3 ? "-ZG" : "|ZG" ); - - uitextline2 += - "; Ft: " + to_string( - mover->Ft * 0.001f * ( - mover->ActiveCab ? mover->ActiveCab : - vehicle->ctOwner ? vehicle->ctOwner->Controlling()->ActiveCab : - 1 ), 1 ) - + ", Fb: " + to_string( mover->Fb * 0.001f, 1 ) - + ", Fr: " + to_string( mover->Adhesive( mover->RunningTrack.friction ), 2 ) - + ( mover->SlippingWheels ? " (!)" : "" ); - - if( vehicle->Mechanik ) { - uitextline2 += "; Ag: " + to_string( vehicle->Mechanik->fAccGravity, 2 ) + " (" + ( vehicle->Mechanik->fAccGravity > 0.01 ? "\\" : ( vehicle->Mechanik->fAccGravity < -0.01 ? "/" : "-" ) ) + ")"; - } - - uitextline2 += - "; TC:" - + to_string( mover->TotalCurrent, 0 ); - auto const frontcouplerhighvoltage = - to_string( mover->Couplers[ side::front ].power_high.voltage, 0 ) - + "@" - + to_string( mover->Couplers[ side::front ].power_high.current, 0 ); - auto const rearcouplerhighvoltage = - to_string( mover->Couplers[ side::rear ].power_high.voltage, 0 ) - + "@" - + to_string( mover->Couplers[ side::rear ].power_high.current, 0 ); - uitextline2 += ", HV: "; - if( mover->Couplers[ side::front ].power_high.local == false ) { - uitextline2 += - "(" + frontcouplerhighvoltage + ")-" - + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" - + "-(" + rearcouplerhighvoltage + ")"; - } - else { - uitextline2 += - frontcouplerhighvoltage - + ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:" - + rearcouplerhighvoltage; - } - - uitextline3 += - "TrB: " + to_string( mover->BrakePress, 2 ) - + ", " + to_hex_str( mover->Hamulec->GetBrakeStatus(), 2 ); - - uitextline3 += - "; LcB: " + to_string( mover->LocBrakePress, 2 ) - + "; hat: " + to_string( mover->BrakeCtrlPos2, 2 ) - + "; pipes: " + to_string( mover->PipePress, 2 ) - + "/" + to_string( mover->ScndPipePress, 2 ) - + "/" + to_string( mover->EqvtPipePress, 2 ) - + ", MT: " + to_string( mover->CompressedVolume, 3 ) - + ", BT: " + to_string( mover->Volume, 3 ) - + ", CtlP: " + to_string( mover->CntrlPipePress, 3 ) - + ", CtlT: " + to_string( mover->Hamulec->GetCRP(), 3 ); - - if( mover->ManualBrakePos > 0 ) { - - uitextline3 += "; manual brake on"; - } - - if( vehicle->Mechanik ) { - // o ile jest ktoś w środku - std::string flags = "cpapcplhhndoiefgvdpseil "; // flagi AI (definicja w Driver.h) - for( int i = 0, j = 1; i < 23; ++i, j <<= 1 ) - if( false == ( vehicle->Mechanik->DrivigFlags() & j ) ) // jak bit ustawiony - flags[ i ] = '.';// std::toupper( flags[ i ] ); // ^= 0x20; // to zmiana na wielką literę - - uitextline4 = flags; - - uitextline4 += - "Driver: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) - + " Ad=" + to_string( vehicle->Mechanik->AccDesired, 2 ) - + " Ah=" + to_string( vehicle->Mechanik->fAccThreshold, 2 ) - + "@" + to_string( vehicle->Mechanik->fBrake_a0[ 0 ], 2 ) - + "+" + to_string( vehicle->Mechanik->fBrake_a1[ 0 ], 2 ) - + " Bd=" + to_string( vehicle->Mechanik->fBrakeDist, 0 ) - + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ) - + " VSl=" + to_string( vehicle->Mechanik->VelSignalLast, 0 ) - + " VLl=" + to_string( vehicle->Mechanik->VelLimitLast, 0 ) - + " VRd=" + to_string( vehicle->Mechanik->VelRoad, 0 ) - + " VRst=" + to_string( vehicle->Mechanik->VelRestricted, 0 ); - - if( ( vehicle->Mechanik->VelNext == 0.0 ) - && ( vehicle->Mechanik->eSignNext ) ) { - // jeśli ma zapamiętany event semafora, nazwa eventu semafora - uitextline4 += " (" + Bezogonkow( vehicle->Mechanik->eSignNext->asName ) + ")"; - } - - // biezaca komenda dla AI - uitextline4 += ", command: " + vehicle->Mechanik->OrderCurrent(); - } - - if( Global.iScreenMode[ Global.iTextMode - GLFW_KEY_F1 ] == 1 ) { - // f2 screen, track scan mode - if( vehicle->Mechanik == nullptr ) { - //żeby była tabelka, musi być AI - break; - } - - std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( vehicle->Mechanik->TableSize() ) - 1, 0, 30 ); - do { - std::string scanline = vehicle->Mechanik->TableText( i ); - if( scanline.empty() ) { break; } - UITable.text_lines.emplace_back( Bezogonkow( scanline ), Global.UITextColor ); - ++i; - } while( i < speedtablesize ); // TController:iSpeedTableSize TODO: change when the table gets recoded - } - } - else { - // wyświetlenie współrzędnych w scenerii oraz kąta kamery, gdy nie mamy wskaźnika - uitextline1 = - "Camera position: " - + to_string( camera.Pos.x, 2 ) + " " - + to_string( camera.Pos.y, 2 ) + " " - + to_string( camera.Pos.z, 2 ) - + ", azimuth: " - + to_string( 180.0 - glm::degrees( camera.Yaw ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód - + " " - + std::string( "S SEE NEN NWW SW" ) - .substr( 0 + 2 * floor( fmod( 8 + ( camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); - // current luminance level - uitextline2 = "Light level: " + to_string( Global.fLuminance, 3 ); - if( Global.FakeLight ) { uitextline2 += "(*)"; } - } - - break; - } - - case( GLFW_KEY_F8 ) : { - // gfx renderer data - uitextline1 = - "FoV: " + to_string( Global.FieldOfView / Global.ZoomFactor, 1 ) - + ", Draw range x " + to_string( Global.fDistanceFactor, 1 ) -// + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) -// + ", FPS: " + to_string( Timer::GetFPS(), 2 ); - + ", FPS: " + std::to_string( static_cast(std::round(GfxRenderer.Framerate())) ); - if( Global.iSlowMotion ) { - uitextline1 += " (slowmotion " + to_string( Global.iSlowMotion ) + ")"; - } - - uitextline2 = - std::string( "Rendering mode: " ) - + ( Global.bUseVBO ? - "VBO" : - "Display Lists" ) - + " "; - if( false == Global.LastGLError.empty() ) { - uitextline2 += - "Last openGL error: " - + Global.LastGLError; - } - // renderer stats - uitextline3 = GfxRenderer.info_times(); - uitextline4 = GfxRenderer.info_stats(); - - break; - } - - case( GLFW_KEY_F9 ) : { - // informacja o wersji - uitextline1 = "MaSzyna " + Global.asVersion; // informacja o wersji - if( Global.iMultiplayer ) { - uitextline1 += " (multiplayer mode is active)"; - } - uitextline3 = - "vehicles: " + to_string( Timer::subsystem.sim_dynamics.average(), 2 ) + " msec" - + " update total: " + to_string( Timer::subsystem.sim_total.average(), 2 ) + " msec"; - // current event queue - auto const time { Timer::GetTime() }; - auto const *event { simulation::Events.begin() }; - auto eventtableindex{ 0 }; - while( ( event != nullptr ) - && ( eventtableindex < 30 ) ) { - - if( ( false == event->m_ignored ) - && ( true == event->bEnabled ) ) { - - auto const delay { " " + to_string( std::max( 0.0, event->fStartTime - time ), 1 ) }; - auto const eventline = - "Delay: " + delay.substr( delay.length() - 6 ) - + ", Event: " + event->asName - + ( event->Activator ? " (by: " + event->Activator->asName + ")" : "" ) - + ( event->evJoined ? " (joint event)" : "" ); - - UITable.text_lines.emplace_back( eventline, Global.UITextColor ); - ++eventtableindex; - } - event = event->evNext; - } - - break; - } - - case( GLFW_KEY_F10 ) : { - - uitextline1 = "Press [Y] key to quit / Aby zakonczyc program, przycisnij klawisz [Y]."; - - break; - } - - case( GLFW_KEY_F12 ) : { - // opcje włączenia i wyłączenia logowania - uitextline1 = "[0] Debugmode " + std::string( DebugModeFlag ? "(on)" : "(off)" ); - uitextline2 = "[1] log.txt " + std::string( ( Global.iWriteLogEnabled & 1 ) ? "(on)" : "(off)" ); - uitextline3 = "[2] Console " + std::string( ( Global.iWriteLogEnabled & 2 ) ? "(on)" : "(off)" ); - - break; - } - - default: { - // uncovered cases, nothing to do here... - // ... unless we're in debug mode - if( DebugModeFlag ) { - - auto const *vehicle { - ( FreeFlyModeFlag ? - std::get( simulation::Region->find_vehicle( camera.Pos, 20, false, false ) ) : - controlled ) }; // w trybie latania lokalizujemy wg mapy - if( vehicle == nullptr ) { - break; - } - auto const *mover { vehicle->MoverParameters }; - uitextline1 = - "vel: " + to_string( vehicle->GetVelocity(), 2 ) + "/" + to_string( mover->nrot* M_PI * mover->WheelDiameter * 3.6, 2 ) - + " km/h;" + ( mover->SlippingWheels ? " (!)" : " " ) - + " dist: " + to_string( mover->DistCounter, 2 ) + " km" - + "; pos: [" + to_string( vehicle->GetPosition().x, 2 ) + ", " + to_string( vehicle->GetPosition().y, 2 ) + ", " + to_string( vehicle->GetPosition().z, 2 ) + "]" - + ", PM=" + to_string( mover->WheelFlat, 1 ) - + " mm; enpwr=" + to_string( mover->EnginePower, 1 ) - + "; enrot=" + to_string( mover->enrot * 60, 0 ) - + " tmrot=" + to_string( std::abs( mover->nrot ) * mover->Transmision.Ratio * 60, 0 ) - + "; ventrot=" + to_string( mover->RventRot * 60, 1 ) - + "; fanrot=" + to_string( mover->dizel_heat.rpmw, 1 ) + ", " + to_string( mover->dizel_heat.rpmw2, 1 ); - - uitextline2 = - "HamZ=" + to_string( mover->fBrakeCtrlPos, 2 ) - + "; HamP=" + to_string( mover->LocalBrakePosA, 2 ) - + "; NasJ=" + std::to_string( mover->MainCtrlPos ) + "(" + std::to_string( mover->MainCtrlActualPos ) + ")" - + ( ( mover->ShuntMode && mover->EngineType == TEngineType::DieselElectric ) ? - "; NasB=" + to_string( mover->AnPos, 2 ) : - "; NasB=" + std::to_string( mover->ScndCtrlPos ) + "(" + std::to_string( mover->ScndCtrlActualPos ) + ")" ) - + "; I=" + - ( mover->TrainType == dt_EZT ? - std::to_string( int( mover->ShowCurrent( 0 ) ) ) : - std::to_string( int( mover->Im ) ) ) - + "; U=" + to_string( int( mover->RunningTraction.TractionVoltage + 0.5 ) ) - + "; R=" + - ( std::abs( mover->RunningShape.R ) > 10000.0 ? - "~0.0" : - to_string( mover->RunningShape.R, 1 ) ) - + " An=" + to_string( mover->AccN, 2 ); // przyspieszenie poprzeczne - - if( tprev != simulation::Time.data().wSecond ) { - tprev = simulation::Time.data().wSecond; - Acc = ( mover->Vel - VelPrev ) / 3.6; - VelPrev = mover->Vel; - } - uitextline2 += "; As=" + to_string( Acc, 2 ); // przyspieszenie wzdłużne -// uitextline2 += " eAngle=" + to_string( std::cos( mover->eAngle ), 2 ); - uitextline2 += "; oilP=" + to_string( mover->OilPump.pressure_present, 3 ); - uitextline2 += " oilT=" + to_string( mover->dizel_heat.To, 2 ); - uitextline2 += "; waterT=" + to_string( mover->dizel_heat.temperatura1, 2 ); - uitextline2 += ( mover->WaterCircuitsLink ? "-" : "|" ); - uitextline2 += to_string( mover->dizel_heat.temperatura2, 2 ); - uitextline2 += "; engineT=" + to_string( mover->dizel_heat.Ts, 2 ); - - uitextline3 = - "cyl.ham. " + to_string( mover->BrakePress, 2 ) - + "; prz.gl. " + to_string( mover->PipePress, 2 ) - + "; zb.gl. " + to_string( mover->CompressedVolume, 2 ) - // youBy - drugi wezyk - + "; p.zas. " + to_string( mover->ScndPipePress, 2 ); - - // McZapkie: warto wiedziec w jakim stanie sa przelaczniki - if( mover->ConvOvldFlag ) - uitextline3 += " C! "; - else if( mover->FuseFlag ) - uitextline3 += " F! "; - else if( !mover->Mains ) - uitextline3 += " () "; - else { - switch( - mover->ActiveDir * - ( mover->Imin == mover->IminLo ? - 1 : - 2 ) ) { - case 2: { uitextline3 += " >> "; break; } - case 1: { uitextline3 += " -> "; break; } - case 0: { uitextline3 += " -- "; break; } - case -1: { uitextline3 += " <- "; break; } - case -2: { uitextline3 += " << "; break; } - } - } - // McZapkie: predkosc szlakowa - if( mover->RunningTrack.Velmax == -1 ) { - uitextline3 += " Vtrack=Vmax"; - } - else { - uitextline3 += " Vtrack " + to_string( mover->RunningTrack.Velmax, 2 ); - } - - if( ( mover->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) - || ( mover->TrainType == dt_EZT ) ) { - uitextline3 += - "; pant. " + to_string( mover->PantPress, 2 ) - + ( mover->bPantKurek3 ? "=" : "^" ) + "ZG"; - } - - // McZapkie: komenda i jej parametry - if( mover->CommandIn.Command != ( "" ) ) { - uitextline4 = - "C:" + mover->CommandIn.Command - + " V1=" + to_string( mover->CommandIn.Value1, 0 ) - + " V2=" + to_string( mover->CommandIn.Value2, 0 ); - } - if( ( vehicle->Mechanik ) - && ( vehicle->Mechanik->AIControllFlag == AIdriver ) ) { - uitextline4 += - "AI: Vd=" + to_string( vehicle->Mechanik->VelDesired, 0 ) - + " ad=" + to_string(vehicle->Mechanik->AccDesired, 2) - + "/" + to_string(vehicle->Mechanik->AccDesired*vehicle->Mechanik->BrakeAccFactor(), 2) - + " atrain=" + to_string(vehicle->Mechanik->fBrake_a0[0], 2) - + "+" + to_string(vehicle->Mechanik->fBrake_a1[0], 2) - + " aS=" + to_string(vehicle->Mechanik->AbsAccS_pub, 2) - + " Pd=" + to_string( vehicle->Mechanik->ActualProximityDist, 0 ) - + " Vn=" + to_string( vehicle->Mechanik->VelNext, 0 ); - } - - // induction motor data - if( mover->EngineType == TEngineType::ElectricInductionMotor ) { - - UITable.text_lines.emplace_back( " eimc: eimv: press:", Global.UITextColor ); - for( int i = 0; i <= 20; ++i ) { - - std::string parameters = - mover->eimc_labels[ i ] + to_string( mover->eimc[ i ], 2, 9 ) - + " | " - + mover->eimv_labels[ i ] + to_string( mover->eimv[ i ], 2, 9 ); - - if( i < 10 ) { - parameters += " | " + train->fPress_labels[i] + to_string( train->fPress[ i ][ 0 ], 2, 9 ); - } - else if( i == 12 ) { - parameters += " med:"; - } - else if( i >= 13 ) { - parameters += " | " + vehicle->MED_labels[ i - 13 ] + to_string( vehicle->MED[ 0 ][ i - 13 ], 2, 9 ); - } - - UITable.text_lines.emplace_back( parameters, Global.UITextColor ); - } - } - if (mover->EngineType == TEngineType::DieselEngine) { - std::string parameters = "param value"; - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "efill: " + to_string(mover->dizel_fill, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "etorq: " + to_string(mover->dizel_Torque, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "creal: " + to_string(mover->dizel_engage, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "cdesi: " + to_string(mover->dizel_engagestate, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "cdelt: " + to_string(mover->dizel_engagedeltaomega, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "gears: " + to_string(mover->dizel_automaticgearstatus, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hydro value"; - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCnI: " + to_string(mover->hydro_TC_nIn, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCnO: " + to_string(mover->hydro_TC_nOut, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTM: " + to_string(mover->hydro_TC_TMRatio, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTI: " + to_string(mover->hydro_TC_TorqueIn, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTO: " + to_string(mover->hydro_TC_TorqueOut, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCfl: " + to_string(mover->hydro_TC_Fill, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - parameters = "hTCLR: " + to_string(mover->hydro_TC_LockupRate, 2, 9); - UITable.text_lines.emplace_back(parameters, Global.UITextColor); - //parameters = "hTCXX: " + to_string(mover->hydro_TC_nIn, 2, 9); - //UITable.text_lines.emplace_back(parameters, Global.UITextColor); - } - - } // if( DebugModeFlag && Controlled ) - - break; - } - } - -#ifdef EU07_USE_OLD_UI_CODE - if( Controlled && DebugModeFlag && !Global.iTextMode ) { - - uitextline1 += - ( "; d_omega " ) + to_string( Controlled->MoverParameters->dizel_engagedeltaomega, 3 ); - - if( Controlled->MoverParameters->EngineType == ElectricInductionMotor ) { - - for( int i = 0; i <= 8; i++ ) { - for( int j = 0; j <= 9; j++ ) { - glRasterPos2f( 0.05f + 0.03f * i, 0.16f - 0.01f * j ); - uitextline4 = to_string( Train->fEIMParams[ i ][ j ], 2 ); - } - } - } - } -#endif - - // update the ui header texts - auto &headerdata = UIHeader.text_lines; - headerdata[ 0 ].data = uitextline1; - headerdata[ 1 ].data = uitextline2; - headerdata[ 2 ].data = uitextline3; - headerdata[ 3 ].data = uitextline4; - - // stenogramy dźwięków (ukryć, gdy tabelka skanowania lub rozkład?) - auto &transcripts = UITranscripts.text_lines; - transcripts.clear(); - for( auto const &transcript : ui::Transcripts.aLines ) { - - if( Global.fTimeAngleDeg >= transcript.fShow ) { - - cParser parser( transcript.asText ); - while( true == parser.getTokens( 1, false, "|" ) ) { - - std::string transcriptline; parser >> transcriptline; - transcripts.emplace_back( transcriptline, glm::vec4( 1.0f, 1.0f, 0.0f, 1.0f ) ); - } - } - } - + ui_layer::update(); +} + +// render() subclass details +void +driver_ui::render_() { + + auto const pausemask { 1 | 2 }; + if( ( Global.iPause & pausemask ) != 0 ) { + // pause/quit modal + auto const popupheader{ "Simulation Paused" }; + ImGui::OpenPopup( popupheader ); + if( ImGui::BeginPopupModal( popupheader, nullptr, ImGuiWindowFlags_AlwaysAutoResize ) ) { + if( ImGui::Button( "Resume", ImVec2( 120, 0 ) ) ) { + ImGui::CloseCurrentPopup(); + Global.iPause &= ~pausemask; + } + if( ImGui::Button( "Quit", ImVec2( 120, 0 ) ) ) { + ImGui::CloseCurrentPopup(); + glfwSetWindowShouldClose( m_window, 1 ); + } + ImGui::EndPopup(); + } + } } diff --git a/driveruilayer.h b/driveruilayer.h index 6d22e578..3ef0c638 100644 --- a/driveruilayer.h +++ b/driveruilayer.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "uilayer.h" +#include "driveruipanels.h" class driver_ui : public ui_layer { @@ -25,12 +26,14 @@ public: update() override; private: +// methods + // render() subclass details + void + render_() override; // members - ui_panel UIHeader { 20, 20 }; // header ui panel - ui_panel UITable { 20, 100 };// schedule or scan table - ui_panel UITranscripts { 85, 600 }; // voice transcripts - int tprev { 0 }; // poprzedni czas - double VelPrev { 0.0 }; // poprzednia prędkość - double Acc { 0.0 }; // przyspieszenie styczne + drivingaid_panel m_aidpanel { "Driving Aid", true }; + timetable_panel m_timetablepanel { "Timetable", false }; + debug_panel m_debugpanel { "Debug Data", false }; + transcripts_panel m_transcriptspanel { "Transcripts", true }; // voice transcripts }; diff --git a/driveruipanels.cpp b/driveruipanels.cpp new file mode 100644 index 00000000..b677c8aa --- /dev/null +++ b/driveruipanels.cpp @@ -0,0 +1,896 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "driveruipanels.h" + +#include "globals.h" +#include "translation.h" +#include "simulation.h" +#include "simulationtime.h" +#include "event.h" +#include "camera.h" +#include "mtable.h" +#include "train.h" +#include "driver.h" +#include "animmodel.h" +#include "dynobj.h" +#include "model3d.h" +#include "renderer.h" +#include "utilities.h" +#include "logs.h" + +void +drivingaid_panel::update() { + + if( false == is_open ) { return; } + + text_lines.clear(); + + auto const *train { simulation::Train }; + auto const *controlled { ( train ? train->Dynamic() : nullptr ) }; + + if( ( controlled == nullptr ) + || ( controlled->Mechanik == nullptr ) ) { return; } + + auto const *mover = controlled->MoverParameters; + auto const *driver = controlled->Mechanik; + + { // throttle, velocity, speed limits and grade + auto textline = + "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) + + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ) + + " " + + ( mover->ActiveDir > 0 ? 'D' : + mover->ActiveDir < 0 ? 'R' : + 'N' ); + + if( is_expanded ) { + + auto const speedlimit { static_cast( std::floor( driver->VelDesired ) ) }; + textline += + " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" + + " (limit: " + std::to_string( speedlimit ) + " km/h"; + auto const nextspeedlimit { static_cast( std::floor( driver->VelNext ) ) }; + if( nextspeedlimit != speedlimit ) { + textline += + ", new limit: " + std::to_string( nextspeedlimit ) + " km/h" + + " in " + to_string( driver->ActualProximityDist * 0.001, 1 ) + " km"; + } + textline += ")"; + auto const reverser { ( mover->ActiveDir > 0 ? 1 : -1 ) }; + auto const grade { controlled->VectorFront().y * 100 * ( controlled->DirectionGet() == reverser ? 1 : -1 ) * reverser }; + if( std::abs( grade ) >= 0.25 ) { + textline += " Grade: " + to_string( grade, 1 ) + "%%"; + } + } + + text_lines.emplace_back( textline, Global.UITextColor ); + } + + { // brakes, air pressure + auto textline = + "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) + + "+" + to_string( mover->LocalBrakePosA * LocalBrakePosNo, 0 ) + + ( mover->SlippingWheels ? " !" : " " ); + if( textline.size() > 16 ) { + textline.erase( 16 ); + } + + if( is_expanded ) { + + textline += + " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" + + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; + } + + text_lines.emplace_back( textline, Global.UITextColor ); + } + + { // alerter, hints + std::string textline = + ( true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? + "!ALERTER! " : + " " ); + textline += + ( true == TestFlag( mover->SecuritySystem.Status, s_active ) ? + "!SHP! " : + " " ); + + if( is_expanded ) { + + auto const stoptime { static_cast( -1.0 * controlled->Mechanik->fStopTime ) }; + if( stoptime > 0 ) { + textline += " Loading/unloading in progress (" + to_string( stoptime ) + ( stoptime > 1 ? " seconds" : " second" ) + " left)"; + } + else { + auto const trackblockdistance { std::abs( controlled->Mechanik->TrackBlock() ) }; + if( trackblockdistance <= 75.0 ) { + textline += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; + } + } + } + + text_lines.emplace_back( textline, Global.UITextColor ); + } + + auto const sizex = ( is_expanded ? 660 : 130 ); + size = { sizex, 85 }; +} + +void +timetable_panel::update() { + + if( false == is_open ) { return; } + + text_lines.clear(); + + auto const *train { simulation::Train }; + auto const *controlled { ( train ? train->Dynamic() : nullptr ) }; + auto const &camera { Global.pCamera }; + auto const &time { simulation::Time.data() }; + + { // current time + auto textline = + "Time: " + + to_string( time.wHour ) + ":" + + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" + + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); + + text_lines.emplace_back( textline, Global.UITextColor ); + } + + auto *vehicle { + ( FreeFlyModeFlag ? + std::get( simulation::Region->find_vehicle( camera.Pos, 20, false, false ) ) : + controlled ) }; // w trybie latania lokalizujemy wg mapy + + if( vehicle == nullptr ) { return; } + // if the nearest located vehicle doesn't have a direct driver, try to query its owner + auto const *owner = ( + ( ( vehicle->Mechanik != nullptr ) && ( vehicle->Mechanik->Primary() ) ) ? + vehicle->Mechanik : + vehicle->ctOwner ); + if( owner == nullptr ) { return; } + + auto const *table = owner->TrainTimetable(); + if( table == nullptr ) { return; } + + { // destination + auto textline = Bezogonkow( owner->Relation(), true ); + if( false == textline.empty() ) { + textline += " (" + Bezogonkow( owner->TrainName(), true ) + ")"; + } + + text_lines.emplace_back( textline, Global.UITextColor ); + } + + { // next station + auto const nextstation = Bezogonkow( owner->NextStop(), true ); + if( false == nextstation.empty() ) { + // jeśli jest podana relacja, to dodajemy punkt następnego zatrzymania + auto textline = " -> " + nextstation; + + text_lines.emplace_back( textline, Global.UITextColor ); + } + } + + if( is_expanded ) { + + text_lines.emplace_back( "", Global.UITextColor ); + + if( 0 == table->StationCount ) { + // only bother if there's stations to list + text_lines.emplace_back( "(no timetable)", Global.UITextColor ); + } + else { + auto const readycolor { glm::vec4( 84.0f / 255.0f, 164.0f / 255.0f, 132.0f / 255.0f, 1.f ) }; + // header + text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); + + TMTableLine const *tableline; + for( int i = owner->iStationStart; i <= table->StationCount; ++i ) { + // wyświetlenie pozycji z rozkładu + tableline = table->TimeTable + i; // linijka rozkładu + + std::string vmax = + " " + + to_string( tableline->vmax, 0 ); + vmax = vmax.substr( vmax.size() - 3, 3 ); // z wyrównaniem do prawej + std::string const station = ( + Bezogonkow( tableline->StationName, true ) + + " " ) + .substr( 0, 34 ); + std::string const location = ( + ( tableline->km > 0.0 ? + to_string( tableline->km, 2 ) : + "" ) + + " " ) + .substr( 0, 34 - tableline->StationWare.size() ); + std::string const arrival = ( + tableline->Ah >= 0 ? + to_string( int( 100 + tableline->Ah ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Am ) ).substr( 1, 2 ) : + " | " ); + std::string const departure = ( + tableline->Dh >= 0 ? + to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : + " | " ); + auto const candeparture = ( + ( owner->iStationStart < table->StationIndex ) + && ( i < table->StationIndex ) + && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ); + auto traveltime = + " " + + ( i < 2 ? "" : + tableline->Ah >= 0 ? to_string( CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Ah, tableline->Am ), 0 ) : + to_string( std::max( 0.0, CompareTime( table->TimeTable[ i - 1 ].Dh, table->TimeTable[ i - 1 ].Dm, tableline->Dh, tableline->Dm ) - 0.5 ), 0 ) ); + traveltime = traveltime.substr( traveltime.size() - 3, 3 ); // z wyrównaniem do prawej + + text_lines.emplace_back( + ( "| " + vmax + " | " + station + " | " + arrival + " | " + traveltime + " |" ), + ( candeparture ? + readycolor :// czas minął i odjazd był, to nazwa stacji będzie na zielono + Global.UITextColor ) ); + text_lines.emplace_back( + ( "| | " + location + tableline->StationWare + " | " + departure + " | |" ), + ( candeparture ? + readycolor :// czas minął i odjazd był, to nazwa stacji będzie na zielono + Global.UITextColor ) ); + // divider/footer + text_lines.emplace_back( "+-----+------------------------------------+-------+-----+", Global.UITextColor ); + } + } + } // is_expanded +} + +void +debug_panel::update() { + + if( false == is_open ) { return; } + + // input item bindings + m_input.train = simulation::Train; + m_input.controlled = ( m_input.train ? m_input.train->Dynamic() : nullptr ); + m_input.camera = &( Global.pCamera ); + m_input.vehicle = + ( FreeFlyModeFlag ? + std::get( simulation::Region->find_vehicle( m_input.camera->Pos, 20, false, false ) ) : + m_input.controlled ); // w trybie latania lokalizujemy wg mapy + m_input.mover = + ( m_input.vehicle != nullptr ? + m_input.vehicle->MoverParameters : + nullptr ); + m_input.mechanik = ( + m_input.vehicle != nullptr ? + m_input.vehicle->Mechanik : + nullptr ); + + // header section + text_lines.clear(); + + auto textline = "Version " + Global.asVersion; + + text_lines.emplace_back( textline, Global.UITextColor ); + + // sub-sections + m_vehiclelines.clear(); + m_enginelines.clear(); + m_ailines.clear(); + m_scantablelines.clear(); + m_scenariolines.clear(); + m_eventqueuelines.clear(); + m_cameralines.clear(); + m_rendererlines.clear(); + + update_section_vehicle( m_vehiclelines ); + update_section_engine( m_enginelines ); + update_section_ai( m_ailines ); + update_section_scantable( m_scantablelines ); + update_section_scenario( m_scenariolines ); + update_section_eventqueue( m_eventqueuelines ); + update_section_camera( m_cameralines ); + update_section_renderer( m_rendererlines ); +} + +void +debug_panel::render() { + + if( false == is_open ) { return; } + + auto flags = + ImGuiWindowFlags_NoFocusOnAppearing + | ImGuiWindowFlags_NoCollapse + | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); + + if( size.x > 0 ) { + ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); + } + if( size_min.x > 0 ) { + ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); + } + if( true == ImGui::Begin( name.c_str(), &is_open, flags ) ) { + // header section + for( auto const &line : text_lines ) { + ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); + } + // sections + ImGui::Separator(); + render_section( "Vehicle", m_vehiclelines ); + render_section( "Vehicle Engine", m_enginelines ); + render_section( "Vehicle AI", m_ailines ); + render_section( "Vehicle Scan Table", m_scantablelines ); + render_section( "Scenario", m_scenariolines ); + render_section( "Scenario Event Queue", m_eventqueuelines ); + render_section( "Camera", m_cameralines ); + render_section( "Gfx Renderer", m_rendererlines ); + // toggles + ImGui::Separator(); + ImGui::Checkbox( "Debug Mode", &DebugModeFlag ); + } + ImGui::End(); +} + +void +debug_panel::update_section_vehicle( std::vector &Output ) { + + if( m_input.vehicle == nullptr ) { return; } + if( m_input.mover == nullptr ) { return; } + + auto const &vehicle { *m_input.vehicle }; + auto const &mover { *m_input.mover }; + + // f3 data + auto textline = "Vehicle name: " + mover.Name; + + if( ( vehicle.Mechanik == nullptr ) && ( vehicle.ctOwner ) ) { + // for cars other than leading unit indicate the leader + textline += ", owned by " + vehicle.ctOwner->OwnerName(); + } + textline += "\nStatus: " + mover.EngineDescription( 0 ); + if( mover.WheelFlat > 0.01 ) { + textline += " Flat: " + to_string( mover.WheelFlat, 1 ) + " mm"; + } + + // informacja o sprzęgach + textline += + "\nC0:" + + ( vehicle.PrevConnected ? + vehicle.PrevConnected->name() + ":" + to_string( mover.Couplers[ 0 ].CouplingFlag ) + ( + mover.Couplers[ 0 ].CouplingFlag == 0 ? + " (" + to_string( mover.Couplers[ 0 ].CoupleDist, 1 ) + " m)" : + "" ) : + "none" ); + textline += + " C1:" + + ( vehicle.NextConnected ? + vehicle.NextConnected->name() + ":" + to_string( mover.Couplers[ 1 ].CouplingFlag ) + ( + mover.Couplers[ 1 ].CouplingFlag == 0 ? + " (" + to_string( mover.Couplers[ 1 ].CoupleDist, 1 ) + " m)" : + "" ) : + "none" ); + + Output.emplace_back( textline, Global.UITextColor ); + + // equipment flags + textline = ( mover.Battery ? "B" : "." ); + textline += ( mover.Mains ? "M" : "." ); + textline += ( mover.PantRearUp ? ( mover.PantRearVolt > 0.0 ? "O" : "o" ) : "." ); + textline += ( mover.PantFrontUp ? ( mover.PantFrontVolt > 0.0 ? "P" : "p" ) : "." ); + textline += ( mover.PantPressLockActive ? "!" : ( mover.PantPressSwitchActive ? "*" : "." ) ); + textline += ( mover.WaterPump.is_active ? "W" : ( false == mover.WaterPump.breaker ? "-" : ( mover.WaterPump.is_enabled ? "w" : "." ) ) ); + textline += ( true == mover.WaterHeater.is_damaged ? "!" : ( mover.WaterHeater.is_active ? "H" : ( false == mover.WaterHeater.breaker ? "-" : ( mover.WaterHeater.is_enabled ? "h" : "." ) ) ) ); + textline += ( mover.FuelPump.is_active ? "F" : ( mover.FuelPump.is_enabled ? "f" : "." ) ); + textline += ( mover.OilPump.is_active ? "O" : ( mover.OilPump.is_enabled ? "o" : "." ) ); + textline += ( false == mover.ConverterAllowLocal ? "-" : ( mover.ConverterAllow ? ( mover.ConverterFlag ? "X" : "x" ) : "." ) ); + textline += ( mover.ConvOvldFlag ? "!" : "." ); + textline += ( mover.CompressorFlag ? "C" : ( false == mover.CompressorAllowLocal ? "-" : ( ( mover.CompressorAllow || mover.CompressorStart == start_t::automatic ) ? "c" : "." ) ) ); + textline += ( mover.CompressorGovernorLock ? "!" : "." ); + + if( ( m_input.train != nullptr ) && ( m_input.train->Dynamic() == m_input.vehicle ) ) { + textline += ( mover.Radio ? " R: " : " r: " ) + std::to_string( m_input.train->RadioChannel() ); + } + textline += " Bdelay: "; + if( ( mover.BrakeDelayFlag & bdelay_G ) == bdelay_G ) + textline += "G"; + if( ( mover.BrakeDelayFlag & bdelay_P ) == bdelay_P ) + textline += "P"; + if( ( mover.BrakeDelayFlag & bdelay_R ) == bdelay_R ) + textline += "R"; + if( ( mover.BrakeDelayFlag & bdelay_M ) == bdelay_M ) + textline += "+Mg"; + + textline += ", Load: " + to_string( mover.Load, 0 ) + " (" + to_string( mover.LoadFlag, 0 ) + ")"; + + textline += + "\nFt: " + to_string( + mover.Ft * 0.001f * ( + mover.ActiveCab ? mover.ActiveCab : + vehicle.ctOwner ? vehicle.ctOwner->Controlling()->ActiveCab : + 1 ), 1 ) + + ", Fb: " + to_string( mover.Fb * 0.001f, 1 ) + + ", Fr: " + to_string( mover.Adhesive( mover.RunningTrack.friction ), 2 ) + + ( mover.SlippingWheels ? " (!)" : "" ); + + textline += + "\nPant: " + + to_string( mover.PantPress, 2 ) + + ( mover.bPantKurek3 ? "-ZG" : "|ZG" ); + textline += + " TC:" + + to_string( mover.TotalCurrent, 0 ); + auto const frontcouplerhighvoltage = + to_string( mover.Couplers[ side::front ].power_high.voltage, 0 ) + + "@" + + to_string( mover.Couplers[ side::front ].power_high.current, 0 ); + auto const rearcouplerhighvoltage = + to_string( mover.Couplers[ side::rear ].power_high.voltage, 0 ) + + "@" + + to_string( mover.Couplers[ side::rear ].power_high.current, 0 ); + textline += ", HV: "; + if( mover.Couplers[ side::front ].power_high.local == false ) { + textline += + "(" + frontcouplerhighvoltage + ")-" + + ":F" + ( vehicle.DirectionGet() ? "<<" : ">>" ) + "R:" + + "-(" + rearcouplerhighvoltage + ")"; + } + else { + textline += + frontcouplerhighvoltage + + ":F" + ( vehicle.DirectionGet() ? "<<" : ">>" ) + "R:" + + rearcouplerhighvoltage; + } + + Output.emplace_back( textline, Global.UITextColor ); + + textline = + "TrB: " + to_string( mover.BrakePress, 2 ) + + ", " + to_hex_str( mover.Hamulec->GetBrakeStatus(), 2 ); + + textline += + "; LcB: " + to_string( mover.LocBrakePress, 2 ) + + "; hat: " + to_string( mover.BrakeCtrlPos2, 2 ) + + "\npipes: " + to_string( mover.PipePress, 2 ) + + "/" + to_string( mover.ScndPipePress, 2 ) + + "/" + to_string( mover.EqvtPipePress, 2 ) + + "\nMT: " + to_string( mover.CompressedVolume, 3 ) + + ", BT: " + to_string( mover.Volume, 3 ) + + ", CtlP: " + to_string( mover.CntrlPipePress, 3 ) + + ", CtlT: " + to_string( mover.Hamulec->GetCRP(), 3 ); + + if( mover.ManualBrakePos > 0 ) { + + textline += "; manual brake on"; + } + + Output.emplace_back( textline, Global.UITextColor ); + + // debug mode f1 data + textline = + "vel: " + to_string( vehicle.GetVelocity(), 2 ) + "/" + to_string( mover.nrot* M_PI * mover.WheelDiameter * 3.6, 2 ) + + " km/h;" + + " dist: " + to_string( mover.DistCounter, 2 ) + " km" + + "\npos: [" + to_string( vehicle.GetPosition().x, 2 ) + ", " + to_string( vehicle.GetPosition().y, 2 ) + ", " + to_string( vehicle.GetPosition().z, 2 ) + "]" + + "\nenpwr=" + to_string( mover.EnginePower, 1 ) + + "; enrot=" + to_string( mover.enrot * 60, 0 ) + + " tmrot=" + to_string( std::abs( mover.nrot ) * mover.Transmision.Ratio * 60, 0 ) + + "; ventrot=" + to_string( mover.RventRot * 60, 1 ) + + "; fanrot=" + to_string( mover.dizel_heat.rpmw, 1 ) + ", " + to_string( mover.dizel_heat.rpmw2, 1 ); + + Output.emplace_back( textline, Global.UITextColor ); + + textline = + "HamZ=" + to_string( mover.fBrakeCtrlPos, 2 ) + + "; HamP=" + to_string( mover.LocalBrakePosA, 2 ) + + "; NasJ=" + std::to_string( mover.MainCtrlPos ) + "(" + std::to_string( mover.MainCtrlActualPos ) + ")" + + ( ( mover.ShuntMode && mover.EngineType == TEngineType::DieselElectric ) ? + "; NasB=" + to_string( mover.AnPos, 2 ) : + "; NasB=" + std::to_string( mover.ScndCtrlPos ) + "(" + std::to_string( mover.ScndCtrlActualPos ) + ")" ) + + "\nI=" + + ( mover.TrainType == dt_EZT ? + std::to_string( int( mover.ShowCurrent( 0 ) ) ) : + std::to_string( int( mover.Im ) ) ) + + "; U=" + to_string( int( mover.RunningTraction.TractionVoltage + 0.5 ) ) + + "; R=" + + ( std::abs( mover.RunningShape.R ) > 10000.0 ? + "~0.0" : + to_string( mover.RunningShape.R, 1 ) ) + + " An=" + to_string( mover.AccN, 2 ); // przyspieszenie poprzeczne + + if( tprev != simulation::Time.data().wSecond ) { + tprev = simulation::Time.data().wSecond; + Acc = ( mover.Vel - VelPrev ) / 3.6; + VelPrev = mover.Vel; + } + textline += "; As=" + to_string( Acc, 2 ); // przyspieszenie wzdłużne + // uitextline2 += " eAngle=" + to_string( std::cos( mover.eAngle ), 2 ); + textline += "\noilP=" + to_string( mover.OilPump.pressure_present, 3 ); + textline += " oilT=" + to_string( mover.dizel_heat.To, 2 ); + textline += "; waterT=" + to_string( mover.dizel_heat.temperatura1, 2 ); + textline += ( mover.WaterCircuitsLink ? "-" : "|" ); + textline += to_string( mover.dizel_heat.temperatura2, 2 ); + textline += "; engineT=" + to_string( mover.dizel_heat.Ts, 2 ); + + Output.emplace_back( textline, Global.UITextColor ); + + textline = + "cyl.ham. " + to_string( mover.BrakePress, 2 ) + + "; prz.gl. " + to_string( mover.PipePress, 2 ) + + "; zb.gl. " + to_string( mover.CompressedVolume, 2 ) + // youBy - drugi wezyk + + "; p.zas. " + to_string( mover.ScndPipePress, 2 ); + + // McZapkie: warto wiedziec w jakim stanie sa przelaczniki + if( mover.ConvOvldFlag ) + textline += " C! "; + else if( mover.FuseFlag ) + textline += " F! "; + else if( !mover.Mains ) + textline += " () "; + else { + switch( + mover.ActiveDir * + ( mover.Imin == mover.IminLo ? + 1 : + 2 ) ) { + case 2: { textline += " >> "; break; } + case 1: { textline += " -> "; break; } + case 0: { textline += " -- "; break; } + case -1: { textline += " <- "; break; } + case -2: { textline += " << "; break; } + } + } + + Output.emplace_back( textline, Global.UITextColor ); + + // McZapkie: komenda i jej parametry + if( mover.CommandIn.Command != ( "" ) ) { + textline = + "C:" + mover.CommandIn.Command + + " V1=" + to_string( mover.CommandIn.Value1, 0 ) + + " V2=" + to_string( mover.CommandIn.Value2, 0 ); + + Output.emplace_back( textline, Global.UITextColor ); + } +} + +void +debug_panel::update_section_engine( std::vector &Output ) { + + if( m_input.train == nullptr ) { return; } + if( m_input.vehicle == nullptr ) { return; } + if( m_input.mover == nullptr ) { return; } + + auto const &train { *m_input.train }; + auto const &vehicle{ *m_input.vehicle }; + auto const &mover{ *m_input.mover }; + + // engine data + // induction motor data + if( mover.EngineType == TEngineType::ElectricInductionMotor ) { + + Output.emplace_back( " eimc: eimv: press:", Global.UITextColor ); + for( int i = 0; i <= 20; ++i ) { + + std::string parameters = + mover.eimc_labels[ i ] + to_string( mover.eimc[ i ], 2, 9 ) + + " | " + + mover.eimv_labels[ i ] + to_string( mover.eimv[ i ], 2, 9 ); + + if( i < 10 ) { + parameters += " | " + train.fPress_labels[i] + to_string( train.fPress[ i ][ 0 ], 2, 9 ); + } + else if( i == 12 ) { + parameters += " med:"; + } + else if( i >= 13 ) { + parameters += " | " + vehicle.MED_labels[ i - 13 ] + to_string( vehicle.MED[ 0 ][ i - 13 ], 2, 9 ); + } + + Output.emplace_back( parameters, Global.UITextColor ); + } + } + if ( mover.EngineType == TEngineType::DieselEngine) { + std::string parameters = "param value"; + Output.emplace_back(parameters, Global.UITextColor); + parameters = "efill: " + to_string( mover.dizel_fill, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "etorq: " + to_string( mover.dizel_Torque, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "creal: " + to_string( mover.dizel_engage, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "cdesi: " + to_string( mover.dizel_engagestate, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "cdelt: " + to_string( mover.dizel_engagedeltaomega, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "gears: " + to_string( mover.dizel_automaticgearstatus, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "hydro value"; + Output.emplace_back(parameters, Global.UITextColor); + parameters = "hTCnI: " + to_string( mover.hydro_TC_nIn, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "hTCnO: " + to_string( mover.hydro_TC_nOut, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "hTCTM: " + to_string( mover.hydro_TC_TMRatio, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "hTCTI: " + to_string( mover.hydro_TC_TorqueIn, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "hTCTO: " + to_string( mover.hydro_TC_TorqueOut, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "hTCfl: " + to_string( mover.hydro_TC_Fill, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + parameters = "hTCLR: " + to_string( mover.hydro_TC_LockupRate, 2, 9); + Output.emplace_back(parameters, Global.UITextColor); + //parameters = "hTCXX: " + to_string(mover->hydro_TC_nIn, 2, 9); + //engine_lines.emplace_back(parameters, Global.UITextColor); + } +} + +void +debug_panel::update_section_ai( std::vector &Output ) { + + if( m_input.mover == nullptr ) { return; } + if( m_input.mechanik == nullptr ) { return; } + + auto const &mover{ *m_input.mover }; + auto const &mechanik{ *m_input.mechanik }; + + // biezaca komenda dla AI + auto textline = "Current order: " + mechanik.OrderCurrent(); + + Output.emplace_back( textline, Global.UITextColor ); + + if( ( mechanik.VelNext == 0.0 ) + && ( mechanik.eSignNext ) ) { + // jeśli ma zapamiętany event semafora, nazwa eventu semafora + Output.emplace_back( "Current signal: " + Bezogonkow( mechanik.eSignNext->asName ), Global.UITextColor ); + } + + // distances + textline = + "Distances:\n proximity: " + to_string( mechanik.ActualProximityDist, 0 ) + + ", braking: " + to_string( mechanik.fBrakeDist, 0 ); + + Output.emplace_back( textline, Global.UITextColor ); + + // velocity factors + textline = + "Velocity:\n desired: " + to_string( mechanik.VelDesired, 0 ) + + ", next: " + to_string( mechanik.VelNext, 0 ); + + std::vector< std::pair< double, std::string > > const restrictions{ + { mechanik.VelSignalLast, "signal" }, + { mechanik.VelLimitLast, "limit" }, + { mechanik.VelRoad, "road" }, + { mechanik.VelRestricted, "restricted" }, + { mover.RunningTrack.Velmax, "track" } }; + + std::string restrictionstext; + for( auto const &restriction : restrictions ) { + if( restriction.first < 0.0 ) { continue; } + if( false == restrictionstext.empty() ) { + restrictionstext += ", "; + } + restrictionstext += + to_string( restriction.first, 0 ) + + " (" + restriction.second + ")"; + } + + if( false == restrictionstext.empty() ) { + textline += "\n restrictions: " + restrictionstext; + } + + Output.emplace_back( textline, Global.UITextColor ); + + // acceleration + textline = + "Acceleration:\n desired: " + to_string( mechanik.AccDesired, 2 ) + + ", corrected: " + to_string( mechanik.AccDesired * mechanik.BrakeAccFactor(), 2 ) + + "\n current: " + to_string( mechanik.AbsAccS_pub, 2 ) + + ", slope: " + to_string( mechanik.fAccGravity, 2 ) + " (" + ( mechanik.fAccGravity > 0.01 ? "\\" : ( mechanik.fAccGravity < -0.01 ? "/" : "-" ) ) + ")" + + "\n brake threshold: " + to_string( mechanik.fAccThreshold, 2 ) + + ", delays: " + to_string( mechanik.fBrake_a0[ 0 ], 2 ) + + "+" + to_string( mechanik.fBrake_a1[ 0 ], 2 ); + + Output.emplace_back( textline, Global.UITextColor ); + + // ai driving flags + std::vector const drivingflagnames { + "StopCloser", "StopPoint", "Active", "Press", "Connect", "Primary", "Late", "StopHere", + "StartHorn", "StartHornNow", "StartHornDone", "Oerlikons", "IncSpeed", "TrackEnd", "SwitchFound", "GuardSignal", + "Visibility", "DoorOpened", "PushPull", "SemaphorFound", "SemaphorWasElapsed", "TrainInsideStation", "SpeedLimitFound" }; + + textline = "Driving flags:"; + for( int idx = 0, flagbit = 1; idx < drivingflagnames.size(); ++idx, flagbit <<= 1 ) { + if( mechanik.DrivigFlags() & flagbit ) { + textline += "\n " + drivingflagnames[ idx ]; + } + } + + Output.emplace_back( textline, Global.UITextColor ); +} + +void +debug_panel::update_section_scantable( std::vector &Output ) { + + if( m_input.mechanik == nullptr ) { return; } + + auto const &mechanik{ *m_input.mechanik }; + + std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( mechanik.TableSize() ) - 1, 0, 30 ); + do { + auto const scanline = mechanik.TableText( i ); + if( scanline.empty() ) { break; } + Output.emplace_back( Bezogonkow( scanline ), Global.UITextColor ); + ++i; + } while( i < speedtablesize ); + if( Output.empty() ) { + Output.emplace_back( "(no points of interest)", Global.UITextColor ); + } +} + +void +debug_panel::update_section_scenario( std::vector &Output ) { + + auto textline = + "vehicles: " + to_string( Timer::subsystem.sim_dynamics.average(), 2 ) + " msec" + + " update total: " + to_string( Timer::subsystem.sim_total.average(), 2 ) + " msec"; + + Output.emplace_back( textline, Global.UITextColor ); + // current luminance level + textline = "Light level: " + to_string( Global.fLuminance, 3 ); + if( Global.FakeLight ) { textline += "(*)"; } + + Output.emplace_back( textline, Global.UITextColor ); +} + +void +debug_panel::update_section_eventqueue( std::vector &Output ) { + + std::string textline; + + // current event queue + auto const time { Timer::GetTime() }; + auto const *event { simulation::Events.begin() }; + auto eventtableindex{ 0 }; + while( ( event != nullptr ) + && ( eventtableindex < 30 ) ) { + + if( ( false == event->m_ignored ) + && ( true == event->bEnabled ) ) { + + auto const delay { " " + to_string( std::max( 0.0, event->fStartTime - time ), 1 ) }; + textline = + "Delay: " + delay.substr( delay.length() - 6 ) + + ", Event: " + event->asName + + ( event->Activator ? " (by: " + event->Activator->asName + ")" : "" ) + + ( event->evJoined ? " (joint event)" : "" ); + + Output.emplace_back( textline, Global.UITextColor ); + ++eventtableindex; + } + event = event->evNext; + } + if( Output.empty() ) { + textline = "(no queued events)"; + Output.emplace_back( textline, Global.UITextColor ); + } +} + +void +debug_panel::update_section_camera( std::vector &Output ) { + + if( m_input.camera == nullptr ) { return; } + + auto const &camera{ *m_input.camera }; + + // camera data + auto textline = + "Position: [" + + to_string( camera.Pos.x, 2 ) + ", " + + to_string( camera.Pos.y, 2 ) + ", " + + to_string( camera.Pos.z, 2 ) + "]"; + + Output.emplace_back( textline, Global.UITextColor ); + + textline = + "Azimuth: " + + to_string( 180.0 - glm::degrees( camera.Yaw ), 0 ) // ma być azymut, czyli 0 na północy i rośnie na wschód + + " " + + std::string( "S SEE NEN NWW SW" ) + .substr( 0 + 2 * floor( fmod( 8 + ( camera.Yaw + 0.5 * M_PI_4 ) / M_PI_4, 8 ) ), 2 ); + + Output.emplace_back( textline, Global.UITextColor ); +} + +void +debug_panel::update_section_renderer( std::vector &Output ) { + + // gfx renderer data + auto textline = + "FoV: " + to_string( Global.FieldOfView / Global.ZoomFactor, 1 ) + + ", Draw range x " + to_string( Global.fDistanceFactor, 1 ) +// + "; sectors: " + std::to_string( GfxRenderer.m_drawcount ) +// + ", FPS: " + to_string( Timer::GetFPS(), 2 ); + + ", FPS: " + std::to_string( static_cast(std::round(GfxRenderer.Framerate())) ); + if( Global.iSlowMotion ) { + textline += " (slowmotion " + to_string( Global.iSlowMotion ) + ")"; + } + + Output.emplace_back( textline, Global.UITextColor ); + + textline = + std::string( "Rendering mode: " ) + + ( Global.bUseVBO ? + "VBO" : + "Display Lists" ) + + " "; + if( false == Global.LastGLError.empty() ) { + textline += + "Last openGL error: " + + Global.LastGLError; + } + + Output.emplace_back( textline, Global.UITextColor ); + + // renderer stats + Output.emplace_back( GfxRenderer.info_times(), Global.UITextColor ); + Output.emplace_back( GfxRenderer.info_stats(), Global.UITextColor ); +} + +void +debug_panel::render_section( std::string const &Header, std::vector const &Lines ) { + + if( Lines.empty() ) { return; } + if( false == ImGui::CollapsingHeader( Header.c_str() ) ) { return; } + + for( auto const &line : Lines ) { + ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); + } +} + +void +transcripts_panel::update() { + + if( false == is_open ) { return; } + + text_lines.clear(); + + for( auto const &transcript : ui::Transcripts.aLines ) { + if( Global.fTimeAngleDeg >= transcript.fShow ) { + // NOTE: legacy transcript lines use | as new line mark + text_lines.emplace_back( ExchangeCharInString( transcript.asText, '|', ' ' ), colors::white ); + } + } +} + +void +transcripts_panel::render() { + + if( false == is_open ) { return; } + if( true == text_lines.empty() ) { return; } + + auto flags = + ImGuiWindowFlags_NoFocusOnAppearing + | ImGuiWindowFlags_NoCollapse + | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); + + if( size.x > 0 ) { + ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); + } + if( size_min.x > 0 ) { + ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); + } + if( true == ImGui::Begin( name.c_str(), &is_open, flags ) ) { + // header section + for( auto const &line : text_lines ) { + ImGui::TextWrapped( line.data.c_str() ); + } + } + ImGui::End(); +} diff --git a/driveruipanels.h b/driveruipanels.h new file mode 100644 index 00000000..60315500 --- /dev/null +++ b/driveruipanels.h @@ -0,0 +1,93 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "uilayer.h" +#include "classes.h" + +class drivingaid_panel : public ui_panel { + +public: + drivingaid_panel( std::string const Name, bool const Isopen ) + : ui_panel( Name, Isopen ) + {} + + void update() override; + + bool is_expanded { false }; +}; + +class timetable_panel : public ui_panel { + +public: + timetable_panel( std::string const Name, bool const Isopen ) + : ui_panel( Name, Isopen ) {} + + void update() override; + + bool is_expanded{ false }; +}; + +class debug_panel : public ui_panel { + +public: + debug_panel( std::string const Name, bool const Isopen ) + : ui_panel( Name, Isopen ) {} + + void update() override; + void render() override; + +private: +// types + struct input_data { + TTrain const *train; + TDynamicObject const *controlled; + TCamera const *camera; + TDynamicObject const *vehicle; + TMoverParameters const *mover; + TController const *mechanik; + }; +// methods + // generate and send section data to provided output + void update_section_vehicle( std::vector &Output ); + void update_section_engine( std::vector &Output ); + void update_section_ai( std::vector &Output ); + void update_section_scantable( std::vector &Output ); + void update_section_scenario( std::vector &Output ); + void update_section_eventqueue( std::vector &Output ); + void update_section_camera( std::vector &Output ); + void update_section_renderer( std::vector &Output ); + // renders provided lines, under specified collapsing header + void render_section( std::string const &Header, std::vector const &Lines ); +// members + input_data m_input; + std::vector + m_vehiclelines, + m_enginelines, + m_ailines, + m_scantablelines, + m_cameralines, + m_scenariolines, + m_eventqueuelines, + m_rendererlines; + int tprev { 0 }; // poprzedni czas + double VelPrev { 0.0 }; // poprzednia prędkość + double Acc { 0.0 }; // przyspieszenie styczne +}; + +class transcripts_panel : public ui_panel { + +public: + transcripts_panel( std::string const Name, bool const Isopen ) + : ui_panel( Name, Isopen ) {} + + void update() override; + void render() override; +}; diff --git a/editormode.cpp b/editormode.cpp index fdcaad9b..cd376707 100644 --- a/editormode.cpp +++ b/editormode.cpp @@ -45,9 +45,6 @@ editor_mode::init() { Camera.Init( { 0, 15, 0 }, { glm::radians( -30.0 ), glm::radians( 180.0 ), 0 }, TCameraType::tp_Free ); - m_userinterface->set_progress( "Scenario editor is active. Press F11 to return to driver mode" ); - m_userinterface->set_progress( 0, 100 ); - return m_input.init(); } diff --git a/editoruilayer.cpp b/editoruilayer.cpp index 5b6df31f..2513b07b 100644 --- a/editoruilayer.cpp +++ b/editoruilayer.cpp @@ -11,27 +11,13 @@ http://mozilla.org/MPL/2.0/. #include "editoruilayer.h" #include "globals.h" -#include "camera.h" -#include "animmodel.h" -#include "track.h" -#include "event.h" #include "renderer.h" -#include "utilities.h" -#include "logs.h" editor_ui::editor_ui() { - clear_texts(); -/* - UIHeader = std::make_shared( 20, 20 ); // header ui panel -*/ - // make 4 empty lines for the ui header, to cut down on work down the road - UIHeader.text_lines.emplace_back( "", Global.UITextColor ); - UIHeader.text_lines.emplace_back( "", Global.UITextColor ); - UIHeader.text_lines.emplace_back( "", Global.UITextColor ); - UIHeader.text_lines.emplace_back( "", Global.UITextColor ); + clear_panels(); // bind the panels with ui object. maybe not the best place for this but, eh - push_back( &UIHeader ); + push_back( &m_itempropertiespanel ); } // potentially processes provided input key. returns: true if key was processed, false otherwise @@ -45,11 +31,8 @@ editor_ui::on_key( int const Key, int const Action ) { void editor_ui::update() { - std::string uitextline1, uitextline2, uitextline3, uitextline4; set_tooltip( "" ); - auto const &camera { Global.pCamera }; - if( ( true == Global.ControlPicking ) && ( true == DebugModeFlag ) ) { @@ -60,141 +43,8 @@ editor_ui::update() { "" ) ); } - // scenario inspector - auto const *node { m_node }; - - if( node == nullptr ) { - auto const mouseposition { camera.Pos + GfxRenderer.Mouse_Position() }; - uitextline1 = "mouse location: [" + to_string( mouseposition.x, 2 ) + ", " + to_string( mouseposition.y, 2 ) + ", " + to_string( mouseposition.z, 2 ) + "]"; - goto update; - } - - uitextline1 = - "node name: " + node->name() - + "; location: [" + to_string( node->location().x, 2 ) + ", " + to_string( node->location().y, 2 ) + ", " + to_string( node->location().z, 2 ) + "]" - + " (distance: " + to_string( glm::length( glm::dvec3{ node->location().x, 0.0, node->location().z } -glm::dvec3{ camera.Pos.x, 0.0, camera.Pos.z } ), 1 ) + " m)"; - // subclass-specific data - // TBD, TODO: specialized data dump method in each node subclass, or data imports in the panel for provided subclass pointer? - if( typeid( *node ) == typeid( TAnimModel ) ) { - - auto const *subnode = static_cast( node ); - - uitextline2 = "angle: " + to_string( clamp_circular( subnode->vAngle.y, 360.f ), 2 ) + " deg"; - uitextline2 += "; lights: "; - if( subnode->iNumLights > 0 ) { - uitextline2 += '['; - for( int lightidx = 0; lightidx < subnode->iNumLights; ++lightidx ) { - uitextline2 += to_string( subnode->lsLights[ lightidx ] ); - if( lightidx < subnode->iNumLights - 1 ) { - uitextline2 += ", "; - } - } - uitextline2 += ']'; - } - else { - uitextline2 += "none"; - } - // 3d shape - auto modelfile { ( - ( subnode->pModel != nullptr ) ? - subnode->pModel->NameGet() : - "none" ) }; - if( modelfile.find( szModelPath ) == 0 ) { - // don't include 'models/' in the path - modelfile.erase( 0, std::string{ szModelPath }.size() ); - } - // texture - auto texturefile { ( - ( subnode->Material()->replacable_skins[ 1 ] != null_handle ) ? - GfxRenderer.Material( subnode->Material()->replacable_skins[ 1 ] ).name : - "none" ) }; - if( texturefile.find( szTexturePath ) == 0 ) { - // don't include 'textures/' in the path - texturefile.erase( 0, std::string{ szTexturePath }.size() ); - } - uitextline3 = "mesh: " + modelfile; - uitextline4 = "skin: " + texturefile; - } - else if( typeid( *node ) == typeid( TTrack ) ) { - - auto const *subnode = static_cast( node ); - // basic attributes - uitextline2 = - "isolated: " + ( ( subnode->pIsolated != nullptr ) ? subnode->pIsolated->asName : "none" ) - + "; velocity: " + to_string( subnode->SwitchExtension ? subnode->SwitchExtension->fVelocity : subnode->fVelocity ) - + "; width: " + to_string( subnode->fTrackWidth ) + " m" - + "; friction: " + to_string( subnode->fFriction, 2 ) - + "; quality: " + to_string( subnode->iQualityFlag ); - // textures - auto texturefile { ( - ( subnode->m_material1 != null_handle ) ? - GfxRenderer.Material( subnode->m_material1 ).name : - "none" ) }; - if( texturefile.find( szTexturePath ) == 0 ) { - texturefile.erase( 0, std::string{ szTexturePath }.size() ); - } - auto texturefile2{ ( - ( subnode->m_material2 != null_handle ) ? - GfxRenderer.Material( subnode->m_material2 ).name : - "none" ) }; - if( texturefile2.find( szTexturePath ) == 0 ) { - texturefile2.erase( 0, std::string{ szTexturePath }.size() ); - } - uitextline2 += "; skins: [" + texturefile + ", " + texturefile2 + "]"; - // paths - uitextline3 = "paths: "; - for( auto const &path : subnode->m_paths ) { - uitextline3 += - "[" - + to_string( path.points[ segment_data::point::start ].x, 3 ) + ", " - + to_string( path.points[ segment_data::point::start ].y, 3 ) + ", " - + to_string( path.points[ segment_data::point::start ].z, 3 ) + "]->" - + "[" - + to_string( path.points[ segment_data::point::end ].x, 3 ) + ", " - + to_string( path.points[ segment_data::point::end ].y, 3 ) + ", " - + to_string( path.points[ segment_data::point::end ].z, 3 ) + "] "; - } - // events - std::vector< std::pair< std::string, TTrack::event_sequence const * > > const eventsequences { - { "ev0", &subnode->m_events0 }, { "ev0all", &subnode->m_events0all }, - { "ev1", &subnode->m_events1 }, { "ev1all", &subnode->m_events1all }, - { "ev2", &subnode->m_events2 }, { "ev2all", &subnode->m_events2all } }; - - for( auto const &eventsequence : eventsequences ) { - - if( eventsequence.second->empty() ) { continue; } - - uitextline4 += eventsequence.first + ": ["; - for( auto const &event : *( eventsequence.second ) ) { - if( uitextline4.back() != '[' ) { - uitextline4 += ", "; - } - if( event.second ) { - uitextline4 += event.second->asName; - } - } - uitextline4 += "] "; - } - - } - else if( typeid( *node ) == typeid( TMemCell ) ) { - - auto const *subnode = static_cast( node ); - - uitextline2 = - "data: [" + subnode->Text() + "]" - + " [" + to_string( subnode->Value1(), 2 ) + "]" - + " [" + to_string( subnode->Value2(), 2 ) + "]"; - uitextline3 = "track: " + ( subnode->asTrackName.empty() ? "none" : subnode->asTrackName ); - } - -update: - // update the ui header texts - auto &headerdata = UIHeader.text_lines; - headerdata[ 0 ].data = uitextline1; - headerdata[ 1 ].data = uitextline2; - headerdata[ 2 ].data = uitextline3; - headerdata[ 3 ].data = uitextline4; + ui_layer::update(); + m_itempropertiespanel.update( m_node ); } void diff --git a/editoruilayer.h b/editoruilayer.h index f0bafc87..95b06169 100644 --- a/editoruilayer.h +++ b/editoruilayer.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "uilayer.h" +#include "editoruipanels.h" namespace scene { @@ -34,6 +35,6 @@ public: private: // members - ui_panel UIHeader { 20, 20 }; // header ui panel + itemproperties_panel m_itempropertiespanel { "Node Properties", true }; scene::basic_node * m_node { nullptr }; // currently bound scene node, if any }; diff --git a/editoruipanels.cpp b/editoruipanels.cpp new file mode 100644 index 00000000..fdc642a0 --- /dev/null +++ b/editoruipanels.cpp @@ -0,0 +1,196 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "editoruipanels.h" + +#include "globals.h" +#include "camera.h" +#include "animmodel.h" +#include "track.h" +#include "event.h" +#include "renderer.h" +#include "utilities.h" + +void +itemproperties_panel::update( scene::basic_node const *Node ) { + + if( false == is_open ) { return; } + + text_lines.clear(); + std::string textline; + + // scenario inspector + auto const *node { Node }; + auto const &camera { Global.pCamera }; + + if( node == nullptr ) { + auto const mouseposition { camera.Pos + GfxRenderer.Mouse_Position() }; + textline = "mouse location: [" + to_string( mouseposition.x, 2 ) + ", " + to_string( mouseposition.y, 2 ) + ", " + to_string( mouseposition.z, 2 ) + "]"; + text_lines.emplace_back( textline, Global.UITextColor ); + return; + } + + textline = + "node name: " + node->name() + + "\nlocation: [" + to_string( node->location().x, 2 ) + ", " + to_string( node->location().y, 2 ) + ", " + to_string( node->location().z, 2 ) + "]" + + " (distance: " + to_string( glm::length( glm::dvec3{ node->location().x, 0.0, node->location().z } -glm::dvec3{ camera.Pos.x, 0.0, camera.Pos.z } ), 1 ) + " m)"; + text_lines.emplace_back( textline, Global.UITextColor ); + + // subclass-specific data + // TBD, TODO: specialized data dump method in each node subclass, or data imports in the panel for provided subclass pointer? + if( typeid( *node ) == typeid( TAnimModel ) ) { + + auto const *subnode = static_cast( node ); + + textline = "angle: " + to_string( clamp_circular( subnode->vAngle.y, 360.f ), 2 ) + " deg"; + textline += "; lights: "; + if( subnode->iNumLights > 0 ) { + textline += '['; + for( int lightidx = 0; lightidx < subnode->iNumLights; ++lightidx ) { + textline += to_string( subnode->lsLights[ lightidx ] ); + if( lightidx < subnode->iNumLights - 1 ) { + textline += ", "; + } + } + textline += ']'; + } + else { + textline += "none"; + } + text_lines.emplace_back( textline, Global.UITextColor ); + + // 3d shape + auto modelfile { ( + ( subnode->pModel != nullptr ) ? + subnode->pModel->NameGet() : + "none" ) }; + if( modelfile.find( szModelPath ) == 0 ) { + // don't include 'models/' in the path + modelfile.erase( 0, std::string{ szModelPath }.size() ); + } + // texture + auto texturefile { ( + ( subnode->Material()->replacable_skins[ 1 ] != null_handle ) ? + GfxRenderer.Material( subnode->Material()->replacable_skins[ 1 ] ).name : + "none" ) }; + if( texturefile.find( szTexturePath ) == 0 ) { + // don't include 'textures/' in the path + texturefile.erase( 0, std::string{ szTexturePath }.size() ); + } + text_lines.emplace_back( "mesh: " + modelfile, Global.UITextColor ); + text_lines.emplace_back( "skin: " + texturefile, Global.UITextColor ); + } + else if( typeid( *node ) == typeid( TTrack ) ) { + + auto const *subnode = static_cast( node ); + // basic attributes + textline = + "isolated: " + ( ( subnode->pIsolated != nullptr ) ? subnode->pIsolated->asName : "none" ) + + "\nvelocity: " + to_string( subnode->SwitchExtension ? subnode->SwitchExtension->fVelocity : subnode->fVelocity ) + + "\nwidth: " + to_string( subnode->fTrackWidth ) + " m" + + "\nfriction: " + to_string( subnode->fFriction, 2 ) + + "\nquality: " + to_string( subnode->iQualityFlag ); + text_lines.emplace_back( textline, Global.UITextColor ); + // textures + auto texturefile { ( + ( subnode->m_material1 != null_handle ) ? + GfxRenderer.Material( subnode->m_material1 ).name : + "none" ) }; + if( texturefile.find( szTexturePath ) == 0 ) { + texturefile.erase( 0, std::string{ szTexturePath }.size() ); + } + auto texturefile2{ ( + ( subnode->m_material2 != null_handle ) ? + GfxRenderer.Material( subnode->m_material2 ).name : + "none" ) }; + if( texturefile2.find( szTexturePath ) == 0 ) { + texturefile2.erase( 0, std::string{ szTexturePath }.size() ); + } + textline = "skins:\n " + texturefile + "\n " + texturefile2; + text_lines.emplace_back( textline, Global.UITextColor ); + // paths + textline = "paths: "; + for( auto const &path : subnode->m_paths ) { + textline += + "\n [" + + to_string( path.points[ segment_data::point::start ].x, 3 ) + ", " + + to_string( path.points[ segment_data::point::start ].y, 3 ) + ", " + + to_string( path.points[ segment_data::point::start ].z, 3 ) + "]->" + + "[" + + to_string( path.points[ segment_data::point::end ].x, 3 ) + ", " + + to_string( path.points[ segment_data::point::end ].y, 3 ) + ", " + + to_string( path.points[ segment_data::point::end ].z, 3 ) + "] "; + } + text_lines.emplace_back( textline, Global.UITextColor ); + // events + textline.clear(); + + std::vector< std::pair< std::string, TTrack::event_sequence const * > > const eventsequences { + { "ev0", &subnode->m_events0 }, { "ev0all", &subnode->m_events0all }, + { "ev1", &subnode->m_events1 }, { "ev1all", &subnode->m_events1all }, + { "ev2", &subnode->m_events2 }, { "ev2all", &subnode->m_events2all } }; + + for( auto const &eventsequence : eventsequences ) { + + if( eventsequence.second->empty() ) { continue; } + + textline += ( textline.empty() ? "" : "\n" ) + eventsequence.first + ": ["; + for( auto const &event : *( eventsequence.second ) ) { + if( textline.back() != '[' ) { + textline += ", "; + } + textline += ( + event.second ? + event.second->asName : + event.first + " (missing)" ); + } + textline += "] "; + } + text_lines.emplace_back( textline, Global.UITextColor ); + } + else if( typeid( *node ) == typeid( TMemCell ) ) { + + auto const *subnode = static_cast( node ); + + textline = + "data: [" + subnode->Text() + "]" + + " [" + to_string( subnode->Value1(), 2 ) + "]" + + " [" + to_string( subnode->Value2(), 2 ) + "]"; + text_lines.emplace_back( textline, Global.UITextColor ); + textline = "track: " + ( subnode->asTrackName.empty() ? "none" : subnode->asTrackName ); + text_lines.emplace_back( textline, Global.UITextColor ); + } +} + +void +itemproperties_panel::render() { + + if( false == is_open ) { return; } + if( true == text_lines.empty() ) { return; } + + auto flags = + ImGuiWindowFlags_NoFocusOnAppearing + | ImGuiWindowFlags_NoCollapse + | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); + + if( size.x > 0 ) { + ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); + } + if( size_min.x > 0 ) { + ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); + } + if( true == ImGui::Begin( name.c_str(), nullptr, flags ) ) { + // header section + for( auto const &line : text_lines ) { + ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); + } + } + ImGui::End(); +} diff --git a/editoruipanels.h b/editoruipanels.h new file mode 100644 index 00000000..2023aec1 --- /dev/null +++ b/editoruipanels.h @@ -0,0 +1,24 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "uilayer.h" +#include "classes.h" + +class itemproperties_panel : public ui_panel { + +public: + itemproperties_panel( std::string const Name, bool const Isopen ) + : ui_panel( Name, Isopen ) + {} + + void update( scene::basic_node const *Node ); + void render() override; +}; diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 2f20ee62..b3368c08 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -49,6 +49,9 @@ {0630616b-1afe-4fb6-96d1-3755834ba8aa} + + {33f7f4ae-692b-4989-a71a-004e0d48ed4f} + @@ -306,6 +309,24 @@ Source Files + + Source Files\imgui + + + Source Files\imgui + + + Source Files\imgui + + + Source Files\imgui + + + Source Files\application\mode_driver + + + Source Files\application\mode_editor + @@ -578,6 +599,12 @@ Header Files + + Header Files\application\mode_driver + + + Header Files\application\mode_editor + diff --git a/mtable.cpp b/mtable.cpp index 1e96c458..81cfd90b 100644 --- a/mtable.cpp +++ b/mtable.cpp @@ -33,7 +33,7 @@ double TTrainParameters::WatchMTable(double DistCounter) return dist; } -std::string TTrainParameters::NextStop() +std::string TTrainParameters::NextStop() const { // pobranie nazwy następnego miejsca zatrzymania if (StationIndex <= StationCount) return NextStationName; // nazwa następnego przystanku; @@ -41,7 +41,7 @@ std::string TTrainParameters::NextStop() return "[End of route]"; //że niby koniec } -bool TTrainParameters::IsStop() +bool TTrainParameters::IsStop() const { // zapytanie, czy zatrzymywać na następnym punkcie rozkładu if ((StationIndex < StationCount)) return TimeTable[StationIndex].Ah >= 0; //-1 to brak postoju @@ -129,7 +129,7 @@ bool TTrainParameters::IsTimeToGo(double hh, double mm) return false; // dalej nie jechać } -std::string TTrainParameters::ShowRelation() +std::string TTrainParameters::ShowRelation() const /*zwraca informację o relacji*/ { // if (Relation1=TimeTable[1].StationName) and (Relation2=TimeTable[StationCount].StationName) diff --git a/mtable.h b/mtable.h index 30adc18e..f079790c 100644 --- a/mtable.h +++ b/mtable.h @@ -69,10 +69,10 @@ class TTrainParameters int Direction; /*kierunek jazdy w/g kilometrazu*/ double CheckTrainLatency(); /*todo: str hh:mm to int i z powrotem*/ - std::string ShowRelation(); + std::string ShowRelation() const; double WatchMTable(double DistCounter); - std::string NextStop(); - bool IsStop(); + std::string NextStop() const; + bool IsStop() const; bool IsTimeToGo(double hh, double mm); bool UpdateMTable(double hh, double mm, std::string const &NewName); bool UpdateMTable( scenario_time const &Time, std::string const &NewName ); diff --git a/renderer.cpp b/renderer.cpp index eeab2f70..a1b74e29 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -409,6 +409,9 @@ opengl_renderer::Render() { m_debugstats = debug_stats(); Render_pass( rendermode::color ); Timer::subsystem.gfx_color.stop(); + // add user interface + setup_units( true, false, false ); + Application.render_ui(); Timer::subsystem.gfx_swap.start(); glfwSwapBuffers( m_window ); @@ -416,15 +419,19 @@ opengl_renderer::Render() { m_drawcount = m_cellqueue.size(); m_debugtimestext - += "frame: " + to_string( Timer::subsystem.gfx_color.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) " - += "gpu side: " + to_string( Timer::subsystem.gfx_swap.average(), 2 ) + " msec " - += "(" + to_string( Timer::subsystem.gfx_color.average() + Timer::subsystem.gfx_swap.average(), 2 ) + " msec total)"; + += "color: " + to_string( Timer::subsystem.gfx_color.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors)\n" + += "gpu side: " + to_string( Timer::subsystem.gfx_swap.average(), 2 ) + " msec\n" + += "frame total: " + to_string( Timer::subsystem.gfx_color.average() + Timer::subsystem.gfx_swap.average(), 2 ) + " msec"; m_debugstatstext = - "drawcalls: " + to_string( m_debugstats.drawcalls ) - + "; dyn: " + to_string( m_debugstats.dynamics ) + " mod: " + to_string( m_debugstats.models ) + " sub: " + to_string( m_debugstats.submodels ) - + "; trk: " + to_string( m_debugstats.paths ) + " shp: " + to_string( m_debugstats.shapes ) - + " trc: " + to_string( m_debugstats.traction ) + " lin: " + to_string( m_debugstats.lines ); + "drawcalls: " + to_string( m_debugstats.drawcalls ) + "\n" + + " vehicles: " + to_string( m_debugstats.dynamics ) + "\n" + + " models: " + to_string( m_debugstats.models ) + "\n" + + " submodels: " + to_string( m_debugstats.submodels ) + "\n" + + " paths: " + to_string( m_debugstats.paths ) + "\n" + + " shapes: " + to_string( m_debugstats.shapes ) + "\n" + + " traction: " + to_string( m_debugstats.traction ) + "\n" + + " lines: " + to_string( m_debugstats.lines ); ++m_framestamp; @@ -463,7 +470,7 @@ opengl_renderer::Render_pass( rendermode const Mode ) { Render_pass( rendermode::cabshadows ); } Timer::subsystem.gfx_shadows.stop(); - m_debugtimestext += "shadows: " + to_string( Timer::subsystem.gfx_shadows.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors) "; + m_debugtimestext += "shadows: " + to_string( Timer::subsystem.gfx_shadows.average(), 2 ) + " msec (" + std::to_string( m_cellqueue.size() ) + " sectors)\n"; #ifdef EU07_USE_DEBUG_SHADOWMAP UILayer.set_texture( m_shadowdebugtexture ); #endif @@ -584,7 +591,6 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glMatrixMode( GL_MODELVIEW ); } } - Application.render_ui(); break; } @@ -1413,10 +1419,6 @@ opengl_renderer::Render( world_environment *Environment ) { // skydome Environment->m_skydome.Render(); - if( true == Global.bUseVBO ) { - // skydome uses a custom vbo which could potentially confuse the main geometry system. hardly elegant but, eh - gfx::opengl_vbogeometrybank::reset(); - } // stars if( Environment->m_stars.m_stars != nullptr ) { // setup diff --git a/skydome.cpp b/skydome.cpp index a4f426ad..d36f1f10 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -118,6 +118,9 @@ void CSkyDome::Update( glm::vec3 const &Sun ) { // render skydome to screen void CSkyDome::Render() { + // cache entry state + ::glPushClientAttrib( GL_CLIENT_VERTEX_ARRAY_BIT ); + if( m_vertexbuffer == -1 ) { // build the buffers ::glGenBuffers( 1, &m_vertexbuffer ); @@ -146,8 +149,7 @@ void CSkyDome::Render() { ::glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_indexbuffer ); ::glDrawElements( GL_TRIANGLES, static_cast( m_indices.size() ), GL_UNSIGNED_SHORT, reinterpret_cast( 0 ) ); // cleanup - ::glDisableClientState( GL_COLOR_ARRAY ); - ::glDisableClientState( GL_VERTEX_ARRAY ); + ::glPopClientAttrib(); } bool CSkyDome::SetSunPosition( glm::vec3 const &Direction ) { diff --git a/stdafx.h b/stdafx.h index 56fb3d16..74568b22 100644 --- a/stdafx.h +++ b/stdafx.h @@ -77,13 +77,20 @@ #define GLFW_DLL #endif // _windows #endif // build_static +#ifndef __ANDROID__ #include "GL/glew.h" +#else +#include +#include +#endif #ifdef _WIN32 #include "GL/wglew.h" #endif #define GLFW_INCLUDE_GLU //m7todo: jest tu bo nie chciao mi si wpycha do wszystkich plikw +#ifndef __ANDROID__ #include +#endif #define GLM_ENABLE_EXPERIMENTAL #define GLM_FORCE_CTOR_INIT @@ -96,3 +103,16 @@ #include #include "openglmatrixstack.h" + +// imgui.h comes with its own operator new which gets wrecked by dbg_new, so we temporarily disable the latter +#ifdef _MSC_VER +#ifdef _DEBUG +#undef new +#endif // _DEBUG +#endif +#include "imgui.h" +#ifdef _MSC_VER +#ifdef _DEBUG +#define new DBG_NEW +#endif // _DEBUG +#endif diff --git a/uilayer.cpp b/uilayer.cpp index cf8f6925..817d9a49 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -27,61 +27,107 @@ http://mozilla.org/MPL/2.0/. #include "utilities.h" #include "logs.h" +#include "imgui_impl_glfw.h" +#include "imgui_impl_opengl2.h" + extern "C" { GLFWAPI HWND glfwGetWin32Window( GLFWwindow* window ); //m7todo: potrzebne do directsound } GLFWwindow * ui_layer::m_window { nullptr }; +ImGuiIO *ui_layer::m_imguiio { nullptr }; GLint ui_layer::m_textureunit { GL_TEXTURE0 }; -GLuint ui_layer::m_fontbase { (GLuint)-1 }; // numer DL dla znaków w napisach bool ui_layer::m_cursorvisible { true }; -ui_layer::~ui_layer() { -/* -// this should be invoked manually, or we risk trying to delete the lists after the context is gone - if( m_fontbase != -1 ) - ::glDeleteLists( m_fontbase, 96 ); -*/ +ui_panel::ui_panel( std::string const Name, bool const Isopen ) + : name( Name ), is_open( Isopen ) +{} + +void +ui_panel::render() { + + if( false == is_open ) { return; } + if( true == text_lines.empty() ) { return; } + + auto flags = + ImGuiWindowFlags_NoFocusOnAppearing + | ImGuiWindowFlags_NoCollapse + | ( size.x > 0 ? ImGuiWindowFlags_NoResize : 0 ); + + if( size.x > 0 ) { + ImGui::SetNextWindowSize( ImVec2( size.x, size.y ) ); + } + if( size_min.x > 0 ) { + ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); + } + if( true == ImGui::Begin( name.c_str(), &is_open, flags ) ) { + for( auto const &line : text_lines ) { + ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); + } + } + ImGui::End(); } +ui_layer::~ui_layer() {} + bool ui_layer::init( GLFWwindow *Window ) { m_window = Window; - HFONT font; // Windows Font ID - m_fontbase = ::glGenLists(96); // storage for 96 characters - HDC hDC = ::GetDC( glfwGetWin32Window( m_window ) ); - font = ::CreateFont( -MulDiv( 10, ::GetDeviceCaps( hDC, LOGPIXELSY ), 72 ), // height of font - 0, // width of font - 0, // angle of escapement - 0, // orientation angle - (Global.bGlutFont ? FW_MEDIUM : FW_HEAVY), // font weight - FALSE, // italic - FALSE, // underline - FALSE, // strikeout - DEFAULT_CHARSET, // character set identifier - OUT_DEFAULT_PRECIS, // output precision - CLIP_DEFAULT_PRECIS, // clipping precision - (Global.bGlutFont ? CLEARTYPE_QUALITY : PROOF_QUALITY), // output quality - DEFAULT_PITCH | FF_DONTCARE, // family and pitch - "Lucida Console"); // font name - ::SelectObject(hDC, font); // selects the font we want - if( TRUE == ::wglUseFontBitmaps( hDC, 32, 96, m_fontbase ) ) { - // builds 96 characters starting at character 32 - WriteLog( "Display Lists font used" ); //+AnsiString(glGetError()) - WriteLog( "Font init OK" ); //+AnsiString(glGetError()) - Global.DLFont = true; - return true; - } - else { - ErrorLog( "Font init failed" ); -// return false; - // NOTE: we report success anyway, given some cards can't produce fonts in this manner - Global.DLFont = false; - return true; - } + + IMGUI_CHECKVERSION(); + ImGui::CreateContext(); + m_imguiio = &ImGui::GetIO(); +// m_imguiio->Fonts->AddFontFromFileTTF( "c:/windows/fonts/lucon.ttf", 13.0f ); + + ImGui_ImplGlfw_InitForOpenGL( m_window, false ); + ImGui_ImplOpenGL2_Init(); + + init_colors(); + + return true; +} + +void +ui_layer::init_colors() { + + // configure ui colours + auto *style = &ImGui::GetStyle(); + auto *colors = style->Colors; + auto const background { ImVec4( 38.0f / 255.0f, 38.0f / 255.0f, 38.0f / 255.0f, 0.65f ) }; + auto const accent { ImVec4( 44.0f / 255.0f, 88.0f / 255.0f, 72.0f / 255.0f, 0.75f ) }; + auto const itembase { ImVec4( accent.x, accent.y, accent.z, 0.35f ) }; + auto const itemhover { ImVec4( accent.x, accent.y, accent.z, 0.65f ) }; + auto const itemactive { ImVec4( accent.x, accent.y, accent.z, 0.95f ) }; + + colors[ ImGuiCol_WindowBg ] = background; + colors[ ImGuiCol_PopupBg ] = background; + colors[ ImGuiCol_FrameBg ] = itembase; + colors[ ImGuiCol_FrameBgHovered ] = itemhover; + colors[ ImGuiCol_FrameBgActive ] = itemactive; + colors[ ImGuiCol_TitleBg ] = background; + colors[ ImGuiCol_TitleBgActive ] = background; + colors[ ImGuiCol_TitleBgCollapsed ] = background; + colors[ ImGuiCol_CheckMark ] = colors[ ImGuiCol_Text ]; + colors[ ImGuiCol_Button ] = itembase; + colors[ ImGuiCol_ButtonHovered ] = itemhover; + colors[ ImGuiCol_ButtonActive ] = itemactive; + colors[ ImGuiCol_Header ] = itembase; + colors[ ImGuiCol_HeaderHovered ] = itemhover; + colors[ ImGuiCol_HeaderActive ] = itemactive; + colors[ ImGuiCol_ResizeGrip ] = itembase; + colors[ ImGuiCol_ResizeGripHovered ] = itemhover; + colors[ ImGuiCol_ResizeGripActive ] = itemactive; +} + +void +ui_layer::shutdown() { + + ImGui_ImplOpenGL2_Shutdown(); + ImGui_ImplGlfw_Shutdown(); + ImGui::DestroyContext(); } bool @@ -90,9 +136,18 @@ ui_layer::on_key( int const Key, int const Action ) { return false; } +void +ui_layer::update() { + + for( auto *panel : m_panels ) { + panel->update(); + } +} + void ui_layer::render() { + // legacy ui code glMatrixMode(GL_PROJECTION); glLoadIdentity(); glOrtho( 0, std::max( 1, Global.iWindowWidth ), std::max( 1, Global.iWindowHeight ), 0, -1, 1 ); @@ -120,10 +175,27 @@ ui_layer::render() { glDisable( GL_BLEND ); + glPopAttrib(); + + // imgui ui code + ::glPushClientAttrib( GL_CLIENT_VERTEX_ARRAY_BIT ); + + ::glClientActiveTexture( m_textureunit ); + ::glBindBuffer( GL_ARRAY_BUFFER, 0 ); + + ImGui_ImplOpenGL2_NewFrame(); + ImGui_ImplGlfw_NewFrame(); + ImGui::NewFrame(); + render_panels(); render_tooltip(); + // template method implementation + render_(); - glPopAttrib(); + ImGui::Render(); + ImGui_ImplOpenGL2_RenderDrawData( ImGui::GetDrawData() ); + + ::glPopClientAttrib(); } void @@ -207,30 +279,14 @@ ui_layer::render_progress() { ::glRasterPos2f( ( 0.5f * ( Global.iWindowWidth - width ) + origin.x * heightratio ) + ( ( size.x * heightratio - textwidth ) * 0.5f * heightratio ), ( 0.5f * ( Global.iWindowHeight - height ) + origin.y * heightratio ) + ( charsize ) + ( ( size.y * heightratio - textheight ) * 0.5f * heightratio ) ); - print( m_progresstext ); } } void ui_layer::render_panels() { - if( m_panels.empty() ) { return; } - - float const width = std::min( 4.f / 3.f, static_cast(Global.iWindowWidth) / std::max( 1, Global.iWindowHeight ) ) * Global.iWindowHeight; - float const height = Global.iWindowHeight / 768.f; - - for( auto const &panel : m_panels ) { - - int lineidx = 0; - for( auto const &line : panel->text_lines ) { - - ::glColor4fv( glm::value_ptr( line.color ) ); - ::glRasterPos2f( - 0.5f * ( Global.iWindowWidth - width ) + panel->origin_x * height, - panel->origin_y * height + 20.f * lineidx ); - print( line.data ); - ++lineidx; - } + for( auto *panel : m_panels ) { + panel->render(); } } @@ -240,12 +296,7 @@ ui_layer::render_tooltip() { if( m_tooltip.empty() ) { return; } if( false == m_cursorvisible ) { return; } - glm::dvec2 mousepos; - glfwGetCursorPos( m_window, &mousepos.x, &mousepos.y ); - - ::glColor4fv( glm::value_ptr( colors::white ) ); - ::glRasterPos2f( mousepos.x + 20.0f, mousepos.y + 25.0f ); - print( m_tooltip ); + ImGui::SetTooltip( m_tooltip.c_str() ); } void @@ -295,21 +346,6 @@ ui_layer::render_texture() { } } -void -ui_layer::print( std::string const &Text ) -{ - if( (false == Global.DLFont) - || (true == Text.empty()) ) - return; - - ::glPushAttrib( GL_LIST_BIT ); - - ::glListBase( m_fontbase - 32 ); - ::glCallLists( Text.size(), GL_UNSIGNED_BYTE, Text.c_str() ); - - ::glPopAttrib(); -} - void ui_layer::quad( glm::vec4 const &Coordinates, glm::vec4 const &Color ) { diff --git a/uilayer.h b/uilayer.h index d95dba3f..038e3f5a 100644 --- a/uilayer.h +++ b/uilayer.h @@ -14,25 +14,35 @@ http://mozilla.org/MPL/2.0/. // GuiLayer -- basic user interface class. draws requested information on top of openGL screen -struct ui_panel { +class ui_panel { +public: +// constructor + ui_panel( std::string const Name, bool const Isopen ); +// methods + virtual void update() {}; + virtual void render(); + // temporary access +// types struct text_line { std::string data; glm::vec4 color; - text_line( std::string const &Data, glm::vec4 const &Color): - data(Data), color(Color) + text_line( std::string const &Data, glm::vec4 const &Color) + : data(Data), color(Color) {} }; - - ui_panel( const int X, const int Y): - origin_x(X), origin_y(Y) - {} - +// members + bool is_open; + glm::ivec2 size { -1, -1 }; + glm::ivec2 size_min { -1, -1 }; + glm::ivec2 size_max { -1, -1 }; std::vector text_lines; - int origin_x; - int origin_y; + +protected: +// members + std::string name; }; class ui_layer { @@ -51,6 +61,9 @@ public: static void set_unit( GLint const Textureunit ) { m_textureunit = Textureunit; } + static + void + shutdown(); // potentially processes provided input key. returns: true if the input was processed, false otherwise virtual bool @@ -58,7 +71,7 @@ public: // updates state of UI elements virtual void - update() {} + update(); // draws requested UI elements void render(); @@ -79,17 +92,25 @@ public: void set_tooltip( std::string const &Tooltip ) { m_tooltip = Tooltip; } void - clear_texts() { m_panels.clear(); } + clear_panels() { m_panels.clear(); } void push_back( ui_panel *Panel ) { m_panels.emplace_back( Panel ); } protected: // members static GLFWwindow *m_window; + static ImGuiIO *m_imguiio; static bool m_cursorvisible; private: // methods + static + void + init_colors(); + // render() subclass details + virtual + void + render_() {}; // draws background quad with specified earlier texture void render_background(); @@ -102,15 +123,11 @@ private: render_panels(); void render_tooltip(); - // prints specified text, using display lists font - void - print( std::string const &Text ); // draws a quad between coordinates x,y and z,w with uv-coordinates spanning 0-1 void quad( glm::vec4 const &Coordinates, glm::vec4 const &Color ); // members static GLint m_textureunit; - static GLuint m_fontbase; // numer DL dla znaków w napisach // progress bar config. TODO: put these together into an object float m_progress { 0.0f }; // percentage of filled progres bar, to indicate lengthy operations. From 1cfaaa24f65f8af20ad439bf9e57cc33494a7b99 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 30 Aug 2018 20:41:44 +0200 Subject: [PATCH 384/426] build 180830. minor bug fixes --- DynObj.cpp | 4 ++-- McZapkie/Mover.cpp | 2 +- command.cpp | 2 +- parser.h | 2 +- version.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 1376f152..b0903db6 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -6474,7 +6474,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub default: { volume = engine.m_amplitudeoffset - + engine.m_amplitudefactor * ( Vehicle.EnginePower / 1000 + std::fabs( Vehicle.enrot ) * 60.0 ); + + engine.m_amplitudefactor * ( Vehicle.EnginePower + std::fabs( Vehicle.enrot ) * 60.0 ); break; } } @@ -6626,7 +6626,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub case TEngineType::ElectricSeriesMotor: { volume = motor.m_amplitudeoffset - + motor.m_amplitudefactor * ( Vehicle.EnginePower / 1000 + motorrevolutions * 60.0 ); + + motor.m_amplitudefactor * ( Vehicle.EnginePower + motorrevolutions * 60.0 ); break; } default: { diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 7d525039..72060b43 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -250,7 +250,7 @@ double TMoverParameters::Current(double n, double U) else Im = MotorCurrent; - EnginePower = abs(Itot) * (1 + RList[MainCtrlActualPos].Mn) * abs(U); + EnginePower = abs(Itot) * (1 + RList[MainCtrlActualPos].Mn) * abs(U) / 1000.0; // awarie MotorCurrent = abs(Im); // zmienna pomocnicza diff --git a/command.cpp b/command.cpp index 259e6f7a..dd08c5bc 100644 --- a/command.cpp +++ b/command.cpp @@ -144,7 +144,7 @@ commanddescription_sequence Commands_descriptions = { { "doortoggleright", command_target::vehicle }, { "dooropenleft", command_target::vehicle }, { "dooropenright", command_target::vehicle }, - { "doorlcloseleft", command_target::vehicle }, + { "doorcloseleft", command_target::vehicle }, { "doorcloseright", command_target::vehicle }, { "doorcloseall", command_target::vehicle }, { "departureannounce", command_target::vehicle }, diff --git a/parser.h b/parser.h index 3a099fb1..9dd96657 100644 --- a/parser.h +++ b/parser.h @@ -91,7 +91,7 @@ class cParser //: public std::stringstream bool trimComments( std::string &String ); std::size_t count(); // members: - bool m_autoclear { true }; // not retrieved tokens are discarded when another read command is issued (legacy behaviour) + bool m_autoclear { true }; // unretrieved tokens are discarded when another read command is issued (legacy behaviour) bool LoadTraction { true }; // load traction? std::shared_ptr mStream; // relevant kind of buffer is attached on creation. std::string mFile; // name of the open file, if any diff --git a/version.h b/version.h index 3b5b4521..9b7e61b3 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 825 +#define VERSION_MINOR 830 #define VERSION_REVISION 0 From 955e8915a5bc8250398948ef4db8592972c44e9d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 31 Aug 2018 17:04:20 +0200 Subject: [PATCH 385/426] build 180831. vehicle debug panel content cleanup, configurable ui panel opacity, ai coasting logic tweaks --- Driver.cpp | 30 ++--- Globals.cpp | 6 + Globals.h | 1 + McZapkie/MOVER.h | 2 +- McZapkie/Mover.cpp | 2 +- drivermode.cpp | 2 +- driveruilayer.cpp | 9 -- driveruipanels.cpp | 312 ++++++++++++++++++++++----------------------- uilayer.cpp | 16 +-- version.h | 2 +- 10 files changed, 176 insertions(+), 206 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index d8034036..55a114cb 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -5282,25 +5282,11 @@ TController::UpdateSituation(double dt) { } } } - // margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest większa od 5km/h - if( false == TestFlag( iDrivigFlags, movePress ) ) { - // jeśli nie dociskanie - if( AccDesired < -0.05 ) { - while( true == DecSpeed() ) { ; } // jeśli hamujemy, to nie przyspieszamy - } - else if( ( vel > VelDesired ) - || ( fAccGravity < -0.01 ? - AccDesired < 0.0 : - AbsAccS > AccDesired ) ) { - // jak za bardzo przyspiesza albo prędkość przekroczona - DecSpeed(); // pojedyncze cofnięcie pozycji, bo na zero to przesada - } - } // yB: usunięte różne dziwne warunki, oddzielamy część zadającą od wykonawczej // zwiekszanie predkosci // Ra 2F1H: jest konflikt histerezy pomiędzy nastawioną pozycją a uzyskiwanym // przyspieszeniem - utrzymanie pozycji powoduje przekroczenie przyspieszenia - if( AbsAccS < AccDesired ) { + if( ( AccDesired - AbsAccS > 0.01 ) ) { // jeśli przyspieszenie pojazdu jest mniejsze niż żądane oraz... if( vel < ( VelDesired == 1.0 ? // work around for trains getting stuck on tracks with speed limit = 1 @@ -5320,6 +5306,20 @@ TController::UpdateSituation(double dt) { } // yB: usunięte różne dziwne warunki, oddzielamy część zadającą od wykonawczej // zmniejszanie predkosci + // margines dla prędkości jest doliczany tylko jeśli oczekiwana prędkość jest większa od 5km/h + if( false == TestFlag( iDrivigFlags, movePress ) ) { + // jeśli nie dociskanie + if( AccDesired < -0.05 ) { + while( true == DecSpeed() ) { ; } // jeśli hamujemy, to nie przyspieszamy + } + else if( ( vel > VelDesired ) + || ( fAccGravity < -0.01 ? + AccDesired < 0.0 : + AbsAccS > AccDesired ) ) { + // jak za bardzo przyspiesza albo prędkość przekroczona + DecSpeed(); // pojedyncze cofnięcie pozycji, bo na zero to przesada + } + } if( mvOccupied->TrainType == dt_EZT ) { // właściwie, to warunek powinien być na działający EP // Ra: to dobrze hamuje EP w EZT diff --git a/Globals.cpp b/Globals.cpp index e55c7dc0..a766bd8c 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -593,6 +593,12 @@ global_settings::ConfigParse(cParser &Parser) { UITextColor = UITextColor / 255.f; UITextColor.a = 1.f; } + else if( token == "ui.bg.opacity" ) { + // czy grupować eventy o tych samych nazwach + Parser.getTokens(); + Parser >> UIBgOpacity; + UIBgOpacity = clamp( UIBgOpacity, 0.f, 1.f ); + } else if( token == "input.gamepad" ) { // czy grupować eventy o tych samych nazwach Parser.getTokens(); diff --git a/Globals.h b/Globals.h index c94a9282..963249b4 100644 --- a/Globals.h +++ b/Globals.h @@ -91,6 +91,7 @@ struct global_settings { int iTextMode{ 0 }; // tryb pracy wyświetlacza tekstowego int iScreenMode[ 12 ] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; // numer ekranu wyświetlacza tekstowego glm::vec4 UITextColor { glm::vec4( 225.f / 255.f, 225.f / 255.f, 225.f / 255.f, 1.f ) }; // base color of UI text + float UIBgOpacity { 0.65f }; // opacity of ui windows std::string asLang{ "pl" }; // domyślny język - http://tools.ietf.org/html/bcp47 // gfx int iWindowWidth{ 800 }; diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index b3a60950..c4bc99e3 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1236,7 +1236,7 @@ public: double ManualBrakeRatio(void); double PipeRatio(void);/*ile napelniac*/ double RealPipeRatio(void);/*jak szybko*/ - double BrakeVP(void); + double BrakeVP(void) const; /*! przesylanie komend sterujacych*/ bool SendCtrlBroadcast(std::string CtrlCommand, double ctrlvalue); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 72060b43..188a8f2b 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -989,7 +989,7 @@ double TMoverParameters::ManualBrakeRatio(void) // Q: 20160713 // Zwraca objętość // ***************************************************************************** -double TMoverParameters::BrakeVP(void) +double TMoverParameters::BrakeVP(void) const { if (BrakeVVolume > 0) return Volume / (10.0 * BrakeVVolume); diff --git a/drivermode.cpp b/drivermode.cpp index 01bec808..54ec80a8 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -332,7 +332,7 @@ driver_mode::on_key( int const Key, int const Scancode, int const Action, int co } } - if( Action == GLFW_PRESS ) { + if( Action != GLFW_RELEASE ) { OnKeyDown( Key ); diff --git a/driveruilayer.cpp b/driveruilayer.cpp index 19c1bd5b..8057011a 100644 --- a/driveruilayer.cpp +++ b/driveruilayer.cpp @@ -13,18 +13,9 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "translation.h" #include "simulation.h" -#include "simulationtime.h" -#include "event.h" -#include "camera.h" -#include "mtable.h" #include "train.h" -#include "driver.h" #include "animmodel.h" -#include "dynobj.h" -#include "model3d.h" #include "renderer.h" -#include "utilities.h" -#include "logs.h" driver_ui::driver_ui() { diff --git a/driveruipanels.cpp b/driveruipanels.cpp index b677c8aa..71d54c45 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -346,12 +346,13 @@ debug_panel::update_section_vehicle( std::vector &Output ) { auto const &mover { *m_input.mover }; // f3 data - auto textline = "Vehicle name: " + mover.Name; + auto textline = "Name: " + mover.Name; if( ( vehicle.Mechanik == nullptr ) && ( vehicle.ctOwner ) ) { // for cars other than leading unit indicate the leader textline += ", owned by " + vehicle.ctOwner->OwnerName(); } + textline += "\nLoad: " + to_string( mover.Load, 0 ) + ' ' + mover.LoadType; textline += "\nStatus: " + mover.EngineDescription( 0 ); if( mover.WheelFlat > 0.01 ) { textline += " Flat: " + to_string( mover.WheelFlat, 1 ) + " mm"; @@ -359,17 +360,16 @@ debug_panel::update_section_vehicle( std::vector &Output ) { // informacja o sprzęgach textline += - "\nC0:" + + "\nCouplers:\n front: " + ( vehicle.PrevConnected ? - vehicle.PrevConnected->name() + ":" + to_string( mover.Couplers[ 0 ].CouplingFlag ) + ( + vehicle.PrevConnected->name() + " [" + to_string( mover.Couplers[ 0 ].CouplingFlag ) + "]" + ( mover.Couplers[ 0 ].CouplingFlag == 0 ? " (" + to_string( mover.Couplers[ 0 ].CoupleDist, 1 ) + " m)" : "" ) : - "none" ); - textline += - " C1:" + + "none" ) + + "\n rear: " + ( vehicle.NextConnected ? - vehicle.NextConnected->name() + ":" + to_string( mover.Couplers[ 1 ].CouplingFlag ) + ( + vehicle.NextConnected->name() + " [" + to_string( mover.Couplers[ 1 ].CouplingFlag ) + "]" + ( mover.Couplers[ 1 ].CouplingFlag == 0 ? " (" + to_string( mover.Couplers[ 1 ].CoupleDist, 1 ) + " m)" : "" ) : @@ -378,8 +378,10 @@ debug_panel::update_section_vehicle( std::vector &Output ) { Output.emplace_back( textline, Global.UITextColor ); // equipment flags - textline = ( mover.Battery ? "B" : "." ); + textline = "Devices: "; + textline += ( mover.Battery ? "B" : "." ); textline += ( mover.Mains ? "M" : "." ); + textline += ( mover.FuseFlag ? "!" : "." ); textline += ( mover.PantRearUp ? ( mover.PantRearVolt > 0.0 ? "O" : "o" ) : "." ); textline += ( mover.PantFrontUp ? ( mover.PantFrontVolt > 0.0 ? "P" : "p" ) : "." ); textline += ( mover.PantPressLockActive ? "!" : ( mover.PantPressSwitchActive ? "*" : "." ) ); @@ -393,37 +395,13 @@ debug_panel::update_section_vehicle( std::vector &Output ) { textline += ( mover.CompressorGovernorLock ? "!" : "." ); if( ( m_input.train != nullptr ) && ( m_input.train->Dynamic() == m_input.vehicle ) ) { - textline += ( mover.Radio ? " R: " : " r: " ) + std::to_string( m_input.train->RadioChannel() ); + textline += " radio: " + ( mover.Radio ? std::to_string( m_input.train->RadioChannel() ) : "(off)" ); + } + if( ( mover.EngineType == TEngineType::DieselElectric ) + || ( mover.EngineType == TEngineType::DieselEngine ) ) { + textline += ", oil pressure: " + to_string( mover.OilPump.pressure_present, 2 ); } - textline += " Bdelay: "; - if( ( mover.BrakeDelayFlag & bdelay_G ) == bdelay_G ) - textline += "G"; - if( ( mover.BrakeDelayFlag & bdelay_P ) == bdelay_P ) - textline += "P"; - if( ( mover.BrakeDelayFlag & bdelay_R ) == bdelay_R ) - textline += "R"; - if( ( mover.BrakeDelayFlag & bdelay_M ) == bdelay_M ) - textline += "+Mg"; - textline += ", Load: " + to_string( mover.Load, 0 ) + " (" + to_string( mover.LoadFlag, 0 ) + ")"; - - textline += - "\nFt: " + to_string( - mover.Ft * 0.001f * ( - mover.ActiveCab ? mover.ActiveCab : - vehicle.ctOwner ? vehicle.ctOwner->Controlling()->ActiveCab : - 1 ), 1 ) - + ", Fb: " + to_string( mover.Fb * 0.001f, 1 ) - + ", Fr: " + to_string( mover.Adhesive( mover.RunningTrack.friction ), 2 ) - + ( mover.SlippingWheels ? " (!)" : "" ); - - textline += - "\nPant: " - + to_string( mover.PantPress, 2 ) - + ( mover.bPantKurek3 ? "-ZG" : "|ZG" ); - textline += - " TC:" - + to_string( mover.TotalCurrent, 0 ); auto const frontcouplerhighvoltage = to_string( mover.Couplers[ side::front ].power_high.voltage, 0 ) + "@" @@ -432,7 +410,8 @@ debug_panel::update_section_vehicle( std::vector &Output ) { to_string( mover.Couplers[ side::rear ].power_high.voltage, 0 ) + "@" + to_string( mover.Couplers[ side::rear ].power_high.current, 0 ); - textline += ", HV: "; + + textline += "\nPower transfers: "; if( mover.Couplers[ side::front ].power_high.local == false ) { textline += "(" + frontcouplerhighvoltage + ")-" @@ -448,91 +427,101 @@ debug_panel::update_section_vehicle( std::vector &Output ) { Output.emplace_back( textline, Global.UITextColor ); - textline = - "TrB: " + to_string( mover.BrakePress, 2 ) - + ", " + to_hex_str( mover.Hamulec->GetBrakeStatus(), 2 ); + textline = "Controllers:\n master: " + std::to_string( mover.MainCtrlPos ) + "(" + std::to_string( mover.MainCtrlActualPos ) + ")" + + ", secondary: " + + ( ( mover.ShuntMode && mover.EngineType == TEngineType::DieselElectric ) ? + to_string( mover.AnPos, 2 ) + " (shunt mode)" : + std::to_string( mover.ScndCtrlPos ) + "(" + std::to_string( mover.ScndCtrlActualPos ) + ")" ); - textline += - "; LcB: " + to_string( mover.LocBrakePress, 2 ) - + "; hat: " + to_string( mover.BrakeCtrlPos2, 2 ) - + "\npipes: " + to_string( mover.PipePress, 2 ) - + "/" + to_string( mover.ScndPipePress, 2 ) - + "/" + to_string( mover.EqvtPipePress, 2 ) - + "\nMT: " + to_string( mover.CompressedVolume, 3 ) - + ", BT: " + to_string( mover.Volume, 3 ) - + ", CtlP: " + to_string( mover.CntrlPipePress, 3 ) - + ", CtlT: " + to_string( mover.Hamulec->GetCRP(), 3 ); + textline += "\nEngine output: " + to_string( mover.EnginePower, 1 ); + textline += ", current: " + + ( mover.TrainType == dt_EZT ? + std::to_string( int( mover.ShowCurrent( 0 ) ) ) : + std::to_string( int( mover.Im ) ) ); - if( mover.ManualBrakePos > 0 ) { - - textline += "; manual brake on"; + textline += "\nRevolutions:\n engine: " + to_string( mover.enrot * 60, 0 ) + + ", motors: " + to_string( std::abs( mover.nrot ) * mover.Transmision.Ratio * 60, 0 ) + + ", ventilators: " + to_string( mover.RventRot * 60, 0 ) + + ", fans: " + to_string( mover.dizel_heat.rpmw, 0 ) + "+" + to_string( mover.dizel_heat.rpmw2, 0 ); + if( ( mover.EngineType == TEngineType::DieselElectric ) + || ( mover.EngineType == TEngineType::DieselEngine ) ) { + textline += + "\nTemperatures:\n engine: " + to_string( mover.dizel_heat.Ts, 2 ) + + ", oil: " + to_string( mover.dizel_heat.To, 2 ) + + ", water: " + to_string( mover.dizel_heat.temperatura1, 2 ) + + ( mover.WaterCircuitsLink ? "-" : "|" ) + + to_string( mover.dizel_heat.temperatura2, 2 ); } Output.emplace_back( textline, Global.UITextColor ); - // debug mode f1 data - textline = - "vel: " + to_string( vehicle.GetVelocity(), 2 ) + "/" + to_string( mover.nrot* M_PI * mover.WheelDiameter * 3.6, 2 ) - + " km/h;" - + " dist: " + to_string( mover.DistCounter, 2 ) + " km" - + "\npos: [" + to_string( vehicle.GetPosition().x, 2 ) + ", " + to_string( vehicle.GetPosition().y, 2 ) + ", " + to_string( vehicle.GetPosition().z, 2 ) + "]" - + "\nenpwr=" + to_string( mover.EnginePower, 1 ) - + "; enrot=" + to_string( mover.enrot * 60, 0 ) - + " tmrot=" + to_string( std::abs( mover.nrot ) * mover.Transmision.Ratio * 60, 0 ) - + "; ventrot=" + to_string( mover.RventRot * 60, 1 ) - + "; fanrot=" + to_string( mover.dizel_heat.rpmw, 1 ) + ", " + to_string( mover.dizel_heat.rpmw2, 1 ); + textline = "Brakes:\n train: " + to_string( mover.fBrakeCtrlPos, 2 ) + + ", independent: " + to_string( mover.LocalBrakePosA, 2 ) + + ", delay: "; + if( ( mover.BrakeDelayFlag & bdelay_G ) == bdelay_G ) + textline += "G"; + if( ( mover.BrakeDelayFlag & bdelay_P ) == bdelay_P ) + textline += "P"; + if( ( mover.BrakeDelayFlag & bdelay_R ) == bdelay_R ) + textline += "R"; + if( ( mover.BrakeDelayFlag & bdelay_M ) == bdelay_M ) + textline += "+Mg"; + textline += ", load flag: " + to_string( mover.LoadFlag, 0 ); +/* + if( mover.ManualBrakePos > 0 ) { + + textline += "; manual brake on"; + } +*/ + textline += "\nBrake cylinder pressures:\n train: " + to_string( mover.BrakePress, 2 ) + + ", independent: " + to_string( mover.LocBrakePress, 2 ) + + ", status: " + to_hex_str( mover.Hamulec->GetBrakeStatus(), 2 ); + + textline += "\nPipe pressures:\n brake: " + to_string( mover.PipePress, 2 ) + + " (hat: " + to_string( mover.BrakeCtrlPos2, 2 ) + ")" + + ", main: " + to_string( mover.ScndPipePress, 2 ) + + ", control: " + to_string( mover.CntrlPipePress, 2 ); + + textline += "\nTank pressures:\n brake: " + to_string( mover.Volume, 2 ) + + ", main: " + to_string( mover.Compressor, 2 ) + + ", control: " + to_string( mover.Hamulec->GetCRP(), 2 ); + if( mover.EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) { + textline += ", pantograph: " + to_string( mover.PantPress, 2 ) + ( mover.bPantKurek3 ? "-MT" : "|MT" ); + } Output.emplace_back( textline, Global.UITextColor ); - textline = - "HamZ=" + to_string( mover.fBrakeCtrlPos, 2 ) - + "; HamP=" + to_string( mover.LocalBrakePosA, 2 ) - + "; NasJ=" + std::to_string( mover.MainCtrlPos ) + "(" + std::to_string( mover.MainCtrlActualPos ) + ")" - + ( ( mover.ShuntMode && mover.EngineType == TEngineType::DieselElectric ) ? - "; NasB=" + to_string( mover.AnPos, 2 ) : - "; NasB=" + std::to_string( mover.ScndCtrlPos ) + "(" + std::to_string( mover.ScndCtrlActualPos ) + ")" ) - + "\nI=" + - ( mover.TrainType == dt_EZT ? - std::to_string( int( mover.ShowCurrent( 0 ) ) ) : - std::to_string( int( mover.Im ) ) ) - + "; U=" + to_string( int( mover.RunningTraction.TractionVoltage + 0.5 ) ) - + "; R=" + - ( std::abs( mover.RunningShape.R ) > 10000.0 ? - "~0.0" : - to_string( mover.RunningShape.R, 1 ) ) - + " An=" + to_string( mover.AccN, 2 ); // przyspieszenie poprzeczne + textline = "Forces:\n tractive: " + to_string( + mover.Ft * 0.001f * ( + mover.ActiveCab ? mover.ActiveCab : + vehicle.ctOwner ? vehicle.ctOwner->Controlling()->ActiveCab : + 1 ) + 0.001f, 1 ) + + ", brake: " + to_string( mover.Fb * 0.001f, 1 ) + + ", friction: " + to_string( mover.Adhesive( mover.RunningTrack.friction ), 2 ) + + ( mover.SlippingWheels ? " (!)" : "" ); if( tprev != simulation::Time.data().wSecond ) { tprev = simulation::Time.data().wSecond; Acc = ( mover.Vel - VelPrev ) / 3.6; VelPrev = mover.Vel; } - textline += "; As=" + to_string( Acc, 2 ); // przyspieszenie wzdłużne - // uitextline2 += " eAngle=" + to_string( std::cos( mover.eAngle ), 2 ); - textline += "\noilP=" + to_string( mover.OilPump.pressure_present, 3 ); - textline += " oilT=" + to_string( mover.dizel_heat.To, 2 ); - textline += "; waterT=" + to_string( mover.dizel_heat.temperatura1, 2 ); - textline += ( mover.WaterCircuitsLink ? "-" : "|" ); - textline += to_string( mover.dizel_heat.temperatura2, 2 ); - textline += "; engineT=" + to_string( mover.dizel_heat.Ts, 2 ); + + textline += "\nAcceleration:\n tangential: " + to_string( Acc, 2 ) + + ", normal: " + to_string( mover.AccN, 2 ) + + " (path radius: " + ( std::abs( mover.RunningShape.R ) > 10000.0 ? + "~0.0" : + to_string( mover.RunningShape.R, 0 ) ) + ")"; + + textline += "\nVelocity: " + to_string( vehicle.GetVelocity(), 2 ) + " / " + to_string( mover.nrot* M_PI * mover.WheelDiameter * 3.6, 2 ) + + ", distance traveled: " + to_string( mover.DistCounter, 2 ) + + "\nPosition: [" + to_string( vehicle.GetPosition().x, 2 ) + ", " + to_string( vehicle.GetPosition().y, 2 ) + ", " + to_string( vehicle.GetPosition().z, 2 ) + "]"; Output.emplace_back( textline, Global.UITextColor ); - - textline = - "cyl.ham. " + to_string( mover.BrakePress, 2 ) - + "; prz.gl. " + to_string( mover.PipePress, 2 ) - + "; zb.gl. " + to_string( mover.CompressedVolume, 2 ) - // youBy - drugi wezyk - + "; p.zas. " + to_string( mover.ScndPipePress, 2 ); - +/* + textline = " TC:" + to_string( mover.TotalCurrent, 0 ); +*/ +/* // McZapkie: warto wiedziec w jakim stanie sa przelaczniki - if( mover.ConvOvldFlag ) - textline += " C! "; - else if( mover.FuseFlag ) - textline += " F! "; - else if( !mover.Mains ) - textline += " () "; - else { switch( mover.ActiveDir * ( mover.Imin == mover.IminLo ? @@ -544,9 +533,6 @@ debug_panel::update_section_vehicle( std::vector &Output ) { case -1: { textline += " <- "; break; } case -2: { textline += " << "; break; } } - } - - Output.emplace_back( textline, Global.UITextColor ); // McZapkie: komenda i jej parametry if( mover.CommandIn.Command != ( "" ) ) { @@ -554,9 +540,8 @@ debug_panel::update_section_vehicle( std::vector &Output ) { "C:" + mover.CommandIn.Command + " V1=" + to_string( mover.CommandIn.Value1, 0 ) + " V2=" + to_string( mover.CommandIn.Value2, 0 ); - - Output.emplace_back( textline, Global.UITextColor ); } +*/ } void @@ -572,63 +557,58 @@ debug_panel::update_section_engine( std::vector &Output ) { // engine data // induction motor data - if( mover.EngineType == TEngineType::ElectricInductionMotor ) { + if( mover.EngineType == TEngineType::ElectricInductionMotor ) { - Output.emplace_back( " eimc: eimv: press:", Global.UITextColor ); - for( int i = 0; i <= 20; ++i ) { + Output.emplace_back( " eimc: eimv: press:", Global.UITextColor ); + for( int i = 0; i <= 20; ++i ) { - std::string parameters = - mover.eimc_labels[ i ] + to_string( mover.eimc[ i ], 2, 9 ) - + " | " - + mover.eimv_labels[ i ] + to_string( mover.eimv[ i ], 2, 9 ); + std::string parameters = + mover.eimc_labels[ i ] + to_string( mover.eimc[ i ], 2, 9 ) + + " | " + + mover.eimv_labels[ i ] + to_string( mover.eimv[ i ], 2, 9 ); - if( i < 10 ) { - parameters += " | " + train.fPress_labels[i] + to_string( train.fPress[ i ][ 0 ], 2, 9 ); - } - else if( i == 12 ) { - parameters += " med:"; - } - else if( i >= 13 ) { - parameters += " | " + vehicle.MED_labels[ i - 13 ] + to_string( vehicle.MED[ 0 ][ i - 13 ], 2, 9 ); - } + if( i < 10 ) { + parameters += " | " + train.fPress_labels[ i ] + to_string( train.fPress[ i ][ 0 ], 2, 9 ); + } + else if( i == 12 ) { + parameters += " med:"; + } + else if( i >= 13 ) { + parameters += " | " + vehicle.MED_labels[ i - 13 ] + to_string( vehicle.MED[ 0 ][ i - 13 ], 2, 9 ); + } - Output.emplace_back( parameters, Global.UITextColor ); - } - } - if ( mover.EngineType == TEngineType::DieselEngine) { - std::string parameters = "param value"; - Output.emplace_back(parameters, Global.UITextColor); - parameters = "efill: " + to_string( mover.dizel_fill, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "etorq: " + to_string( mover.dizel_Torque, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "creal: " + to_string( mover.dizel_engage, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "cdesi: " + to_string( mover.dizel_engagestate, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "cdelt: " + to_string( mover.dizel_engagedeltaomega, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "gears: " + to_string( mover.dizel_automaticgearstatus, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "hydro value"; - Output.emplace_back(parameters, Global.UITextColor); - parameters = "hTCnI: " + to_string( mover.hydro_TC_nIn, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "hTCnO: " + to_string( mover.hydro_TC_nOut, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTM: " + to_string( mover.hydro_TC_TMRatio, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTI: " + to_string( mover.hydro_TC_TorqueIn, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "hTCTO: " + to_string( mover.hydro_TC_TorqueOut, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "hTCfl: " + to_string( mover.hydro_TC_Fill, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - parameters = "hTCLR: " + to_string( mover.hydro_TC_LockupRate, 2, 9); - Output.emplace_back(parameters, Global.UITextColor); - //parameters = "hTCXX: " + to_string(mover->hydro_TC_nIn, 2, 9); - //engine_lines.emplace_back(parameters, Global.UITextColor); - } + Output.emplace_back( parameters, Global.UITextColor ); + } + } + if( mover.EngineType == TEngineType::DieselEngine ) { + + std::string parameterstext = "param value"; + std::vector< std::pair > const paramvalues { + { "efill: ", mover.dizel_fill }, + { "etorq: ", mover.dizel_Torque }, + { "creal: ", mover.dizel_engage }, + { "cdesi: ", mover.dizel_engagestate }, + { "cdelt: ", mover.dizel_engagedeltaomega }, + { "gears: ", mover.dizel_automaticgearstatus} }; + for( auto const ¶meter : paramvalues ) { + parameterstext += "\n" + parameter.first + to_string( parameter.second, 2, 9 ); + } + Output.emplace_back( parameterstext, Global.UITextColor ); + + parameterstext = "hydro value"; + std::vector< std::pair > const hydrovalues { + { "hTCnI: ", mover.hydro_TC_nIn }, + { "hTCnO: ", mover.hydro_TC_nOut }, + { "hTCTM: ", mover.hydro_TC_TMRatio }, + { "hTCTI: ", mover.hydro_TC_TorqueIn }, + { "hTCTO: ", mover.hydro_TC_TorqueOut }, + { "hTCfl: ", mover.hydro_TC_Fill }, + { "hTCLR: ", mover.hydro_TC_LockupRate } }; + for( auto const ¶meter : hydrovalues ) { + parameterstext += "\n" + parameter.first + to_string( parameter.second, 2, 9 ); + } + Output.emplace_back( parameterstext, Global.UITextColor ); + } } void @@ -699,6 +679,12 @@ debug_panel::update_section_ai( std::vector &Output ) { Output.emplace_back( textline, Global.UITextColor ); + // brakes + textline = + "Brakes:\n consist: " + to_string( mechanik.fReady, 2 ) + " or less"; + + Output.emplace_back( textline, Global.UITextColor ); + // ai driving flags std::vector const drivingflagnames { "StopCloser", "StopPoint", "Active", "Press", "Connect", "Primary", "Late", "StopHere", diff --git a/uilayer.cpp b/uilayer.cpp index 817d9a49..38495317 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -11,21 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "uilayer.h" #include "globals.h" -#include "translation.h" -#include "simulation.h" -#include "simulationtime.h" -#include "event.h" -#include "camera.h" -#include "mtable.h" -#include "train.h" -#include "driver.h" -#include "sceneeditor.h" -#include "animmodel.h" -#include "dynobj.h" -#include "model3d.h" #include "renderer.h" -#include "utilities.h" -#include "logs.h" #include "imgui_impl_glfw.h" #include "imgui_impl_opengl2.h" @@ -96,7 +82,7 @@ ui_layer::init_colors() { // configure ui colours auto *style = &ImGui::GetStyle(); auto *colors = style->Colors; - auto const background { ImVec4( 38.0f / 255.0f, 38.0f / 255.0f, 38.0f / 255.0f, 0.65f ) }; + auto const background { ImVec4( 38.0f / 255.0f, 38.0f / 255.0f, 38.0f / 255.0f, Global.UIBgOpacity ) }; auto const accent { ImVec4( 44.0f / 255.0f, 88.0f / 255.0f, 72.0f / 255.0f, 0.75f ) }; auto const itembase { ImVec4( accent.x, accent.y, accent.z, 0.35f ) }; auto const itemhover { ImVec4( accent.x, accent.y, accent.z, 0.65f ) }; diff --git a/version.h b/version.h index 9b7e61b3..10c18563 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 830 +#define VERSION_MINOR 831 #define VERSION_REVISION 0 From 6d16d523564bd2fd64ce7439f643615f959e45f0 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 2 Sep 2018 16:09:05 +0200 Subject: [PATCH 386/426] basic text localization system --- application.cpp | 12 ++ application.h | 1 + driveruilayer.cpp | 11 +- driveruipanels.cpp | 492 +++++++++++++++++++++++++-------------------- driveruipanels.h | 12 ++ editoruipanels.cpp | 2 +- stdafx.h | 1 + translation.cpp | 191 ++++++++++++++++++ translation.h | 135 ++++--------- uilayer.cpp | 11 +- uilayer.h | 5 +- 11 files changed, 555 insertions(+), 318 deletions(-) diff --git a/application.cpp b/application.cpp index 4680596c..8330e5bb 100644 --- a/application.cpp +++ b/application.cpp @@ -20,6 +20,7 @@ http://mozilla.org/MPL/2.0/. #include "sceneeditor.h" #include "renderer.h" #include "uilayer.h" +#include "translation.h" #include "logs.h" #ifdef EU07_BUILD_STATIC @@ -109,6 +110,9 @@ eu07_application::init( int Argc, char *Argv[] ) { if( ( result = init_settings( Argc, Argv ) ) != 0 ) { return result; } + if( ( result = init_locale() ) != 0 ) { + return result; + } WriteLog( "Starting MaSzyna rail vehicle simulator (release: " + Global.asVersion + ")" ); WriteLog( "For online documentation and additional files refer to: http://eu07.pl" ); @@ -368,6 +372,14 @@ eu07_application::init_settings( int Argc, char *Argv[] ) { return 0; } +int +eu07_application::init_locale() { + + locale::init(); + + return 0; +} + int eu07_application::init_glfw() { diff --git a/application.h b/application.h index d7cbea69..17f9048c 100644 --- a/application.h +++ b/application.h @@ -70,6 +70,7 @@ private: void init_debug(); void init_files(); int init_settings( int Argc, char *Argv[] ); + int init_locale(); int init_glfw(); void init_callbacks(); int init_gfx(); diff --git a/driveruilayer.cpp b/driveruilayer.cpp index 8057011a..a346adef 100644 --- a/driveruilayer.cpp +++ b/driveruilayer.cpp @@ -26,9 +26,13 @@ driver_ui::driver_ui() { push_back( &m_debugpanel ); push_back( &m_transcriptspanel ); + m_aidpanel.name = locale::strings[ locale::string::driver_aid_header ]; + + m_timetablepanel.name = locale::strings[ locale::string::driver_timetable_header ]; m_timetablepanel.size_min = { 435, 110 }; m_timetablepanel.size_max = { 435, Global.iWindowHeight * 0.95 }; + m_transcriptspanel.name = locale::strings[ locale::string::driver_transcripts_header ]; m_transcriptspanel.size_min = { 435, 85 }; m_transcriptspanel.size_max = { Global.iWindowWidth * 0.95, Global.iWindowHeight * 0.95 }; } @@ -141,14 +145,15 @@ driver_ui::render_() { auto const pausemask { 1 | 2 }; if( ( Global.iPause & pausemask ) != 0 ) { // pause/quit modal - auto const popupheader{ "Simulation Paused" }; + auto const popupheader { locale::strings[ locale::string::driver_pause_header ].c_str() }; ImGui::OpenPopup( popupheader ); if( ImGui::BeginPopupModal( popupheader, nullptr, ImGuiWindowFlags_AlwaysAutoResize ) ) { - if( ImGui::Button( "Resume", ImVec2( 120, 0 ) ) ) { + auto const popupwidth{ locale::strings[ locale::string::driver_pause_header ].size() * 7 }; + if( ImGui::Button( locale::strings[ locale::string::driver_pause_resume ].c_str(), ImVec2( popupwidth, 0 ) ) ) { ImGui::CloseCurrentPopup(); Global.iPause &= ~pausemask; } - if( ImGui::Button( "Quit", ImVec2( 120, 0 ) ) ) { + if( ImGui::Button( locale::strings[ locale::string::driver_pause_quit ].c_str(), ImVec2( popupwidth, 0 ) ) ) { ImGui::CloseCurrentPopup(); glfwSetWindowShouldClose( m_window, 1 ); } diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 71d54c45..0e4b7ef3 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -14,6 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "translation.h" #include "simulation.h" #include "simulationtime.h" +#include "timer.h" #include "event.h" #include "camera.h" #include "mtable.h" @@ -26,6 +27,8 @@ http://mozilla.org/MPL/2.0/. #include "utilities.h" #include "logs.h" +#undef snprintf // defined by train.h->pyint.h->python + void drivingaid_panel::update() { @@ -43,84 +46,109 @@ drivingaid_panel::update() { auto const *driver = controlled->Mechanik; { // throttle, velocity, speed limits and grade - auto textline = - "Throttle: " + to_string( driver->Controlling()->MainCtrlPos, 0, 2 ) - + "+" + std::to_string( driver->Controlling()->ScndCtrlPos ) - + " " - + ( mover->ActiveDir > 0 ? 'D' : - mover->ActiveDir < 0 ? 'R' : - 'N' ); - + std::string expandedtext; if( is_expanded ) { - - auto const speedlimit { static_cast( std::floor( driver->VelDesired ) ) }; - textline += - " Speed: " + std::to_string( static_cast( std::floor( mover->Vel ) ) ) + " km/h" - + " (limit: " + std::to_string( speedlimit ) + " km/h"; - auto const nextspeedlimit { static_cast( std::floor( driver->VelNext ) ) }; - if( nextspeedlimit != speedlimit ) { - textline += - ", new limit: " + std::to_string( nextspeedlimit ) + " km/h" - + " in " + to_string( driver->ActualProximityDist * 0.001, 1 ) + " km"; - } - textline += ")"; + // grade + std::string gradetext; auto const reverser { ( mover->ActiveDir > 0 ? 1 : -1 ) }; auto const grade { controlled->VectorFront().y * 100 * ( controlled->DirectionGet() == reverser ? 1 : -1 ) * reverser }; if( std::abs( grade ) >= 0.25 ) { - textline += " Grade: " + to_string( grade, 1 ) + "%%"; + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::driver_aid_grade ].c_str(), + grade ); + gradetext = m_buffer.data(); } + // next speed limit + auto const speedlimit { static_cast( std::floor( driver->VelDesired ) ) }; + auto const nextspeedlimit { static_cast( std::floor( driver->VelNext ) ) }; + std::string nextspeedlimittext; + if( nextspeedlimit != speedlimit ) { + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::driver_aid_nextlimit ].c_str(), + nextspeedlimit, + driver->ActualProximityDist * 0.001 ); + nextspeedlimittext = m_buffer.data(); + } + // current speed and limit + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::driver_aid_speedlimit ].c_str(), + static_cast( std::floor( mover->Vel ) ), + speedlimit, + nextspeedlimittext.c_str(), + gradetext.c_str() ); + expandedtext = m_buffer.data(); } + // base data and optional bits put together + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::driver_aid_throttle ].c_str(), + driver->Controlling()->MainCtrlPos, + driver->Controlling()->ScndCtrlPos, + ( mover->ActiveDir > 0 ? 'D' : mover->ActiveDir < 0 ? 'R' : 'N' ), + expandedtext.c_str()); - text_lines.emplace_back( textline, Global.UITextColor ); + text_lines.emplace_back( m_buffer.data(), Global.UITextColor ); } { // brakes, air pressure - auto textline = - "Brakes:" + to_string( mover->fBrakeCtrlPos, 1, 5 ) - + "+" + to_string( mover->LocalBrakePosA * LocalBrakePosNo, 0 ) - + ( mover->SlippingWheels ? " !" : " " ); - if( textline.size() > 16 ) { - textline.erase( 16 ); - } - + std::string expandedtext; if( is_expanded ) { - - textline += - " Pressure: " + to_string( mover->BrakePress * 100.0, 2 ) + " kPa" - + " (train pipe: " + to_string( mover->PipePress * 100.0, 2 ) + " kPa)"; + std::snprintf ( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::driver_aid_pressures ].c_str(), + mover->BrakePress * 100, + mover->PipePress * 100 ); + expandedtext = m_buffer.data(); } + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::driver_aid_brakes ].c_str(), + mover->fBrakeCtrlPos, + mover->LocalBrakePosA * LocalBrakePosNo, + ( mover->SlippingWheels ? '!' : ' ' ), + expandedtext.c_str() ); - text_lines.emplace_back( textline, Global.UITextColor ); + text_lines.emplace_back( m_buffer.data(), Global.UITextColor ); } { // alerter, hints - std::string textline = - ( true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? - "!ALERTER! " : - " " ); - textline += - ( true == TestFlag( mover->SecuritySystem.Status, s_active ) ? - "!SHP! " : - " " ); - + std::string expandedtext; if( is_expanded ) { - auto const stoptime { static_cast( -1.0 * controlled->Mechanik->fStopTime ) }; if( stoptime > 0 ) { - textline += " Loading/unloading in progress (" + to_string( stoptime ) + ( stoptime > 1 ? " seconds" : " second" ) + " left)"; + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::driver_aid_loadinginprogress ].c_str(), + stoptime ); + expandedtext = m_buffer.data(); } else { - auto const trackblockdistance { std::abs( controlled->Mechanik->TrackBlock() ) }; + auto const trackblockdistance{ std::abs( controlled->Mechanik->TrackBlock() ) }; if( trackblockdistance <= 75.0 ) { - textline += " Another vehicle ahead (distance: " + to_string( trackblockdistance, 1 ) + " m)"; + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::driver_aid_vehicleahead ].c_str(), + trackblockdistance ); + expandedtext = m_buffer.data(); } } } + std::string textline = + ( true == TestFlag( mover->SecuritySystem.Status, s_aware ) ? + locale::strings[ locale::string::driver_aid_alerter ] : + " " ); + textline += + ( true == TestFlag( mover->SecuritySystem.Status, s_active ) ? + locale::strings[ locale::string::driver_aid_shp ] : + " " ); - text_lines.emplace_back( textline, Global.UITextColor ); + text_lines.emplace_back( textline + " " + expandedtext, Global.UITextColor ); } - auto const sizex = ( is_expanded ? 660 : 130 ); + auto const sizex = ( is_expanded ? 660 : 135 ); size = { sizex, 85 }; } @@ -137,13 +165,14 @@ timetable_panel::update() { auto const &time { simulation::Time.data() }; { // current time - auto textline = - "Time: " - + to_string( time.wHour ) + ":" - + ( time.wMinute < 10 ? "0" : "" ) + to_string( time.wMinute ) + ":" - + ( time.wSecond < 10 ? "0" : "" ) + to_string( time.wSecond ); + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::driver_timetable_time ].c_str(), + time.wHour, + time.wMinute, + time.wSecond ); - text_lines.emplace_back( textline, Global.UITextColor ); + text_lines.emplace_back( m_buffer.data(), Global.UITextColor ); } auto *vehicle { @@ -187,7 +216,7 @@ timetable_panel::update() { if( 0 == table->StationCount ) { // only bother if there's stations to list - text_lines.emplace_back( "(no timetable)", Global.UITextColor ); + text_lines.emplace_back( locale::strings[ locale::string::driver_timetable_notimetable ], Global.UITextColor ); } else { auto const readycolor { glm::vec4( 84.0f / 255.0f, 164.0f / 255.0f, 132.0f / 255.0f, 1.f ) }; @@ -314,7 +343,7 @@ debug_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); } - if( true == ImGui::Begin( name.c_str(), &is_open, flags ) ) { + if( true == ImGui::Begin( identifier.c_str(), &is_open, flags ) ) { // header section for( auto const &line : text_lines ) { ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); @@ -345,180 +374,160 @@ debug_panel::update_section_vehicle( std::vector &Output ) { auto const &vehicle { *m_input.vehicle }; auto const &mover { *m_input.mover }; - // f3 data - auto textline = "Name: " + mover.Name; + auto const isowned { ( vehicle.Mechanik == nullptr ) && ( vehicle.ctOwner != nullptr ) }; + auto const isplayervehicle { ( m_input.train != nullptr ) && ( m_input.train->Dynamic() == m_input.vehicle ) }; + auto const isdieselenginepowered { ( mover.EngineType == TEngineType::DieselElectric ) || ( mover.EngineType == TEngineType::DieselEngine ) }; + auto const isdieselinshuntmode { mover.ShuntMode && mover.EngineType == TEngineType::DieselElectric }; - if( ( vehicle.Mechanik == nullptr ) && ( vehicle.ctOwner ) ) { - // for cars other than leading unit indicate the leader - textline += ", owned by " + vehicle.ctOwner->OwnerName(); - } - textline += "\nLoad: " + to_string( mover.Load, 0 ) + ' ' + mover.LoadType; - textline += "\nStatus: " + mover.EngineDescription( 0 ); - if( mover.WheelFlat > 0.01 ) { - textline += " Flat: " + to_string( mover.WheelFlat, 1 ) + " mm"; - } + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::debug_vehicle_nameloadstatuscouplers ].c_str(), + mover.Name.c_str(), + std::string( isowned ? locale::strings[ locale::string::debug_vehicle_owned ].c_str() + vehicle.ctOwner->OwnerName() : "" ).c_str(), + mover.Load, + mover.LoadType.c_str(), + mover.EngineDescription( 0 ).c_str(), + // TODO: put wheel flat reporting in the enginedescription() + std::string( mover.WheelFlat > 0.01 ? " Flat: " + to_string( mover.WheelFlat, 1 ) + " mm" : "" ).c_str(), + update_vehicle_coupler( side::front ).c_str(), + update_vehicle_coupler( side::rear ).c_str() ); - // informacja o sprzęgach - textline += - "\nCouplers:\n front: " + - ( vehicle.PrevConnected ? - vehicle.PrevConnected->name() + " [" + to_string( mover.Couplers[ 0 ].CouplingFlag ) + "]" + ( - mover.Couplers[ 0 ].CouplingFlag == 0 ? - " (" + to_string( mover.Couplers[ 0 ].CoupleDist, 1 ) + " m)" : - "" ) : - "none" ) - + "\n rear: " + - ( vehicle.NextConnected ? - vehicle.NextConnected->name() + " [" + to_string( mover.Couplers[ 1 ].CouplingFlag ) + "]" + ( - mover.Couplers[ 1 ].CouplingFlag == 0 ? - " (" + to_string( mover.Couplers[ 1 ].CoupleDist, 1 ) + " m)" : - "" ) : - "none" ); + Output.emplace_back( std::string{ m_buffer.data() }, Global.UITextColor ); - Output.emplace_back( textline, Global.UITextColor ); + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::debug_vehicle_devicespower ].c_str(), + // devices + ( mover.Battery ? 'B' : '.' ), + ( mover.Mains ? 'M' : '.' ), + ( mover.FuseFlag ? '!' : '.' ), + ( mover.PantRearUp ? ( mover.PantRearVolt > 0.0 ? 'O' : 'o' ) : '.' ), + ( mover.PantFrontUp ? ( mover.PantFrontVolt > 0.0 ? 'P' : 'p' ) : '.' ), + ( mover.PantPressLockActive ? '!' : ( mover.PantPressSwitchActive ? '*' : '.' ) ), + ( mover.WaterPump.is_active ? 'W' : ( false == mover.WaterPump.breaker ? '-' : ( mover.WaterPump.is_enabled ? 'w' : '.' ) ) ), + ( true == mover.WaterHeater.is_damaged ? '!' : ( mover.WaterHeater.is_active ? 'H' : ( false == mover.WaterHeater.breaker ? '-' : ( mover.WaterHeater.is_enabled ? 'h' : '.' ) ) ) ), + ( mover.FuelPump.is_active ? 'F' : ( mover.FuelPump.is_enabled ? 'f' : '.' ) ), + ( mover.OilPump.is_active ? 'O' : ( mover.OilPump.is_enabled ? 'o' : '.' ) ), + ( false == mover.ConverterAllowLocal ? '-' : ( mover.ConverterAllow ? ( mover.ConverterFlag ? 'X' : 'x' ) : '.' ) ), + ( mover.ConvOvldFlag ? '!' : '.' ), + ( mover.CompressorFlag ? 'C' : ( false == mover.CompressorAllowLocal ? '-' : ( ( mover.CompressorAllow || mover.CompressorStart == start_t::automatic ) ? 'c' : '.' ) ) ), + ( mover.CompressorGovernorLock ? '!' : '.' ), + std::string( isplayervehicle ? locale::strings[ locale::string::debug_vehicle_radio ] + ( mover.Radio ? std::to_string( m_input.train->RadioChannel() ) : "-" ) : "" ).c_str(), + std::string( isdieselenginepowered ? locale::strings[ locale::string::debug_vehicle_oilpressure ] + to_string( mover.OilPump.pressure_present, 2 ) : "" ).c_str(), + // power transfers + mover.Couplers[ side::front ].power_high.voltage, + mover.Couplers[ side::front ].power_high.current, + std::string( mover.Couplers[ side::front ].power_high.local ? "" : "-" ).c_str(), + std::string( vehicle.DirectionGet() ? ":<<:" : ":>>:" ).c_str(), + std::string( mover.Couplers[ side::rear ].power_high.local ? "" : "-" ).c_str(), + mover.Couplers[ side::rear ].power_high.voltage, + mover.Couplers[ side::rear ].power_high.current ); - // equipment flags - textline = "Devices: "; - textline += ( mover.Battery ? "B" : "." ); - textline += ( mover.Mains ? "M" : "." ); - textline += ( mover.FuseFlag ? "!" : "." ); - textline += ( mover.PantRearUp ? ( mover.PantRearVolt > 0.0 ? "O" : "o" ) : "." ); - textline += ( mover.PantFrontUp ? ( mover.PantFrontVolt > 0.0 ? "P" : "p" ) : "." ); - textline += ( mover.PantPressLockActive ? "!" : ( mover.PantPressSwitchActive ? "*" : "." ) ); - textline += ( mover.WaterPump.is_active ? "W" : ( false == mover.WaterPump.breaker ? "-" : ( mover.WaterPump.is_enabled ? "w" : "." ) ) ); - textline += ( true == mover.WaterHeater.is_damaged ? "!" : ( mover.WaterHeater.is_active ? "H" : ( false == mover.WaterHeater.breaker ? "-" : ( mover.WaterHeater.is_enabled ? "h" : "." ) ) ) ); - textline += ( mover.FuelPump.is_active ? "F" : ( mover.FuelPump.is_enabled ? "f" : "." ) ); - textline += ( mover.OilPump.is_active ? "O" : ( mover.OilPump.is_enabled ? "o" : "." ) ); - textline += ( false == mover.ConverterAllowLocal ? "-" : ( mover.ConverterAllow ? ( mover.ConverterFlag ? "X" : "x" ) : "." ) ); - textline += ( mover.ConvOvldFlag ? "!" : "." ); - textline += ( mover.CompressorFlag ? "C" : ( false == mover.CompressorAllowLocal ? "-" : ( ( mover.CompressorAllow || mover.CompressorStart == start_t::automatic ) ? "c" : "." ) ) ); - textline += ( mover.CompressorGovernorLock ? "!" : "." ); + Output.emplace_back( m_buffer.data(), Global.UITextColor ); - if( ( m_input.train != nullptr ) && ( m_input.train->Dynamic() == m_input.vehicle ) ) { - textline += " radio: " + ( mover.Radio ? std::to_string( m_input.train->RadioChannel() ) : "(off)" ); - } - if( ( mover.EngineType == TEngineType::DieselElectric ) - || ( mover.EngineType == TEngineType::DieselEngine ) ) { - textline += ", oil pressure: " + to_string( mover.OilPump.pressure_present, 2 ); - } + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::debug_vehicle_controllersenginerevolutions ].c_str(), + // controllers + mover.MainCtrlPos, + mover.MainCtrlActualPos, + std::string( isdieselinshuntmode ? to_string( mover.AnPos, 2 ) + locale::strings[ locale::string::debug_vehicle_shuntmode ] : std::to_string( mover.ScndCtrlPos ) + "(" + std::to_string( mover.ScndCtrlActualPos ) + ")" ).c_str(), + // engine + mover.EnginePower, + ( mover.TrainType == dt_EZT ? mover.ShowCurrent( 0 ) : mover.Im ), + // revolutions + mover.enrot * 60, + std::abs( mover.nrot ) * mover.Transmision.Ratio * 60, + mover.RventRot * 60, + mover.dizel_heat.rpmw, + mover.dizel_heat.rpmw2 ); - auto const frontcouplerhighvoltage = - to_string( mover.Couplers[ side::front ].power_high.voltage, 0 ) - + "@" - + to_string( mover.Couplers[ side::front ].power_high.current, 0 ); - auto const rearcouplerhighvoltage = - to_string( mover.Couplers[ side::rear ].power_high.voltage, 0 ) - + "@" - + to_string( mover.Couplers[ side::rear ].power_high.current, 0 ); + std::string textline { m_buffer.data() }; - textline += "\nPower transfers: "; - if( mover.Couplers[ side::front ].power_high.local == false ) { - textline += - "(" + frontcouplerhighvoltage + ")-" - + ":F" + ( vehicle.DirectionGet() ? "<<" : ">>" ) + "R:" - + "-(" + rearcouplerhighvoltage + ")"; - } - else { - textline += - frontcouplerhighvoltage - + ":F" + ( vehicle.DirectionGet() ? "<<" : ">>" ) + "R:" - + rearcouplerhighvoltage; - } + if( isdieselenginepowered ) { + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::debug_vehicle_temperatures ].c_str(), + mover.dizel_heat.Ts, + mover.dizel_heat.To, + mover.dizel_heat.temperatura1, + ( mover.WaterCircuitsLink ? '-' : '|' ), + mover.dizel_heat.temperatura2 ); + textline += m_buffer.data(); + } - Output.emplace_back( textline, Global.UITextColor ); + Output.emplace_back( textline, Global.UITextColor ); - textline = "Controllers:\n master: " + std::to_string( mover.MainCtrlPos ) + "(" + std::to_string( mover.MainCtrlActualPos ) + ")" - + ", secondary: " + - ( ( mover.ShuntMode && mover.EngineType == TEngineType::DieselElectric ) ? - to_string( mover.AnPos, 2 ) + " (shunt mode)" : - std::to_string( mover.ScndCtrlPos ) + "(" + std::to_string( mover.ScndCtrlActualPos ) + ")" ); + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::debug_vehicle_brakespressures ].c_str(), + // brakes + mover.fBrakeCtrlPos, + mover.LocalBrakePosA, + update_vehicle_brake().c_str(), + mover.LoadFlag, + // cylinders + mover.BrakePress, + mover.LocBrakePress, + mover.Hamulec->GetBrakeStatus(), + // pipes + mover.PipePress, + mover.BrakeCtrlPos2, + mover.ScndPipePress, + mover.CntrlPipePress, + // tanks + mover.Volume, + mover.Compressor, + mover.Hamulec->GetCRP() ); - textline += "\nEngine output: " + to_string( mover.EnginePower, 1 ); - textline += ", current: " + - ( mover.TrainType == dt_EZT ? - std::to_string( int( mover.ShowCurrent( 0 ) ) ) : - std::to_string( int( mover.Im ) ) ); + textline = m_buffer.data(); - textline += "\nRevolutions:\n engine: " + to_string( mover.enrot * 60, 0 ) - + ", motors: " + to_string( std::abs( mover.nrot ) * mover.Transmision.Ratio * 60, 0 ) - + ", ventilators: " + to_string( mover.RventRot * 60, 0 ) - + ", fans: " + to_string( mover.dizel_heat.rpmw, 0 ) + "+" + to_string( mover.dizel_heat.rpmw2, 0 ); - if( ( mover.EngineType == TEngineType::DieselElectric ) - || ( mover.EngineType == TEngineType::DieselEngine ) ) { - textline += - "\nTemperatures:\n engine: " + to_string( mover.dizel_heat.Ts, 2 ) - + ", oil: " + to_string( mover.dizel_heat.To, 2 ) - + ", water: " + to_string( mover.dizel_heat.temperatura1, 2 ) - + ( mover.WaterCircuitsLink ? "-" : "|" ) - + to_string( mover.dizel_heat.temperatura2, 2 ); - } + if( mover.EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) { + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::debug_vehicle_pantograph ].c_str(), + mover.PantPress, + ( mover.bPantKurek3 ? '-' : '|' ) ); + textline += m_buffer.data(); + } - Output.emplace_back( textline, Global.UITextColor ); + Output.emplace_back( textline, Global.UITextColor ); - textline = "Brakes:\n train: " + to_string( mover.fBrakeCtrlPos, 2 ) - + ", independent: " + to_string( mover.LocalBrakePosA, 2 ) - + ", delay: "; - if( ( mover.BrakeDelayFlag & bdelay_G ) == bdelay_G ) - textline += "G"; - if( ( mover.BrakeDelayFlag & bdelay_P ) == bdelay_P ) - textline += "P"; - if( ( mover.BrakeDelayFlag & bdelay_R ) == bdelay_R ) - textline += "R"; - if( ( mover.BrakeDelayFlag & bdelay_M ) == bdelay_M ) - textline += "+Mg"; - textline += ", load flag: " + to_string( mover.LoadFlag, 0 ); + if( tprev != simulation::Time.data().wSecond ) { + tprev = simulation::Time.data().wSecond; + Acc = ( mover.Vel - VelPrev ) / 3.6; + VelPrev = mover.Vel; + } + + std::snprintf( + m_buffer.data(), m_buffer.size(), + locale::strings[ locale::string::debug_vehicle_forcesaccelerationvelocityposition ].c_str(), + // forces + mover.Ft * 0.001f * ( mover.ActiveCab ? mover.ActiveCab : vehicle.ctOwner ? vehicle.ctOwner->Controlling()->ActiveCab : 1 ) + 0.001f, + mover.Fb * 0.001f, + mover.Adhesive( mover.RunningTrack.friction ), + ( mover.SlippingWheels ? " (!)" : "" ), + // acceleration + Acc, + mover.AccN + 0.001f, + std::string( std::abs( mover.RunningShape.R ) > 10000.0 ? "~0.0" : to_string( mover.RunningShape.R, 0 ) ).c_str(), + // velocity + vehicle.GetVelocity(), + mover.DistCounter, + // position + vehicle.GetPosition().x, + vehicle.GetPosition().y, + vehicle.GetPosition().z ); + + Output.emplace_back( m_buffer.data(), Global.UITextColor ); +/* + textline = " TC:" + to_string( mover.TotalCurrent, 0 ); +*/ /* if( mover.ManualBrakePos > 0 ) { textline += "; manual brake on"; } -*/ - textline += "\nBrake cylinder pressures:\n train: " + to_string( mover.BrakePress, 2 ) - + ", independent: " + to_string( mover.LocBrakePress, 2 ) - + ", status: " + to_hex_str( mover.Hamulec->GetBrakeStatus(), 2 ); - - textline += "\nPipe pressures:\n brake: " + to_string( mover.PipePress, 2 ) - + " (hat: " + to_string( mover.BrakeCtrlPos2, 2 ) + ")" - + ", main: " + to_string( mover.ScndPipePress, 2 ) - + ", control: " + to_string( mover.CntrlPipePress, 2 ); - - textline += "\nTank pressures:\n brake: " + to_string( mover.Volume, 2 ) - + ", main: " + to_string( mover.Compressor, 2 ) - + ", control: " + to_string( mover.Hamulec->GetCRP(), 2 ); - if( mover.EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) { - textline += ", pantograph: " + to_string( mover.PantPress, 2 ) + ( mover.bPantKurek3 ? "-MT" : "|MT" ); - } - - Output.emplace_back( textline, Global.UITextColor ); - - textline = "Forces:\n tractive: " + to_string( - mover.Ft * 0.001f * ( - mover.ActiveCab ? mover.ActiveCab : - vehicle.ctOwner ? vehicle.ctOwner->Controlling()->ActiveCab : - 1 ) + 0.001f, 1 ) - + ", brake: " + to_string( mover.Fb * 0.001f, 1 ) - + ", friction: " + to_string( mover.Adhesive( mover.RunningTrack.friction ), 2 ) - + ( mover.SlippingWheels ? " (!)" : "" ); - - if( tprev != simulation::Time.data().wSecond ) { - tprev = simulation::Time.data().wSecond; - Acc = ( mover.Vel - VelPrev ) / 3.6; - VelPrev = mover.Vel; - } - - textline += "\nAcceleration:\n tangential: " + to_string( Acc, 2 ) - + ", normal: " + to_string( mover.AccN, 2 ) - + " (path radius: " + ( std::abs( mover.RunningShape.R ) > 10000.0 ? - "~0.0" : - to_string( mover.RunningShape.R, 0 ) ) + ")"; - - textline += "\nVelocity: " + to_string( vehicle.GetVelocity(), 2 ) + " / " + to_string( mover.nrot* M_PI * mover.WheelDiameter * 3.6, 2 ) - + ", distance traveled: " + to_string( mover.DistCounter, 2 ) - + "\nPosition: [" + to_string( vehicle.GetPosition().x, 2 ) + ", " + to_string( vehicle.GetPosition().y, 2 ) + ", " + to_string( vehicle.GetPosition().z, 2 ) + "]"; - - Output.emplace_back( textline, Global.UITextColor ); -/* - textline = " TC:" + to_string( mover.TotalCurrent, 0 ); */ /* // McZapkie: warto wiedziec w jakim stanie sa przelaczniki @@ -544,6 +553,52 @@ debug_panel::update_section_vehicle( std::vector &Output ) { */ } +std::string +debug_panel::update_vehicle_coupler( int const Side ) { + // NOTE: mover and vehicle are guaranteed to be valid by the caller + std::string couplerstatus { locale::strings[ locale::string::debug_vehicle_none ] }; + + auto const *connected { ( + Side == side::front ? + m_input.vehicle->PrevConnected : + m_input.vehicle->NextConnected ) }; + + if( connected == nullptr ) { return couplerstatus; } + + auto const &mover { *( m_input.mover ) }; + + std::snprintf( + m_buffer.data(), m_buffer.size(), + "%s [%d]%s", + connected->name().c_str(), + mover.Couplers[ Side ].CouplingFlag, + std::string( mover.Couplers[ Side ].CouplingFlag == 0 ? " (" + to_string( mover.Couplers[ Side ].CoupleDist, 1 ) + " m)" : "" ).c_str() ); + + return { m_buffer.data() }; +} + +std::string +debug_panel::update_vehicle_brake() const { + // NOTE: mover is guaranteed to be valid by the caller + auto const &mover { *( m_input.mover ) }; + + std::string brakedelay; + + std::vector> delays { + { bdelay_G, "G" }, + { bdelay_P, "P" }, + { bdelay_R, "R" }, + { bdelay_M, "+Mg" } }; + + for( auto const &delay : delays ) { + if( ( mover.BrakeDelayFlag & delay.first ) == delay.first ) { + brakedelay += delay.second; + } + } + + return brakedelay; +} + void debug_panel::update_section_engine( std::vector &Output ) { @@ -672,7 +727,7 @@ debug_panel::update_section_ai( std::vector &Output ) { "Acceleration:\n desired: " + to_string( mechanik.AccDesired, 2 ) + ", corrected: " + to_string( mechanik.AccDesired * mechanik.BrakeAccFactor(), 2 ) + "\n current: " + to_string( mechanik.AbsAccS_pub, 2 ) - + ", slope: " + to_string( mechanik.fAccGravity, 2 ) + " (" + ( mechanik.fAccGravity > 0.01 ? "\\" : ( mechanik.fAccGravity < -0.01 ? "/" : "-" ) ) + ")" + + ", slope: " + to_string( mechanik.fAccGravity + 0.001f, 2 ) + " (" + ( mechanik.fAccGravity > 0.01 ? "\\" : ( mechanik.fAccGravity < -0.01 ? "/" : "-" ) ) + ")" + "\n brake threshold: " + to_string( mechanik.fAccThreshold, 2 ) + ", delays: " + to_string( mechanik.fBrake_a0[ 0 ], 2 ) + "+" + to_string( mechanik.fBrake_a1[ 0 ], 2 ); @@ -872,7 +927,12 @@ transcripts_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); } - if( true == ImGui::Begin( name.c_str(), &is_open, flags ) ) { + auto const panelname { ( + name.empty() ? + identifier : + name ) + + "###" + identifier }; + if( true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { // header section for( auto const &line : text_lines ) { ImGui::TextWrapped( line.data.c_str() ); diff --git a/driveruipanels.h b/driveruipanels.h index 60315500..8f6e402c 100644 --- a/driveruipanels.h +++ b/driveruipanels.h @@ -22,6 +22,10 @@ public: void update() override; bool is_expanded { false }; + +private: +// members + std::array m_buffer; }; class timetable_panel : public ui_panel { @@ -33,6 +37,10 @@ public: void update() override; bool is_expanded{ false }; + +private: + // members + std::array m_buffer; }; class debug_panel : public ui_panel { @@ -64,9 +72,13 @@ private: void update_section_eventqueue( std::vector &Output ); void update_section_camera( std::vector &Output ); void update_section_renderer( std::vector &Output ); + // section update helpers + std::string update_vehicle_coupler( int const Side ); + std::string update_vehicle_brake() const; // renders provided lines, under specified collapsing header void render_section( std::string const &Header, std::vector const &Lines ); // members + std::array m_buffer; input_data m_input; std::vector m_vehiclelines, diff --git a/editoruipanels.cpp b/editoruipanels.cpp index fdc642a0..1facdf69 100644 --- a/editoruipanels.cpp +++ b/editoruipanels.cpp @@ -186,7 +186,7 @@ itemproperties_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); } - if( true == ImGui::Begin( name.c_str(), nullptr, flags ) ) { + if( true == ImGui::Begin( identifier.c_str(), nullptr, flags ) ) { // header section for( auto const &line : text_lines ) { ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); diff --git a/stdafx.h b/stdafx.h index 74568b22..194b7018 100644 --- a/stdafx.h +++ b/stdafx.h @@ -31,6 +31,7 @@ // stl #include #include +#include #include #define _USE_MATH_DEFINES #include diff --git a/translation.cpp b/translation.cpp index efa9efaf..bc5bc9d0 100644 --- a/translation.cpp +++ b/translation.cpp @@ -14,8 +14,103 @@ http://mozilla.org/MPL/2.0/. #include "stdafx.h" #include "translation.h" +#include "globals.h" + namespace locale { +void +init() { + // TODO: import localized strings from localization files + std::unordered_map> stringmap; + + stringmap.insert( + { "en", + { + "Driving Aid", + "Throttle: %2d+%d %c%s", + " Speed: %d km/h (limit %d km/h%s)%s", + ", new limit: %d km/h in %.1f km", + " Grade: %.1f%%", + "Brakes: %4.1f+%-2.0f%c%s", + " Pressure: %.2f kPa (train pipe: %.2f kPa)", + "!ALERTER! ", + "!SHP!", + " Loading/unloading in progress (%d s left)", + " Another vehicle ahead (distance: %.1f m)", + + "Timetable", + "Time: %d:%02d:%02d", + "(no timetable)", + + "Transcripts", + + "Simulation Paused", + "Resume", + "Quit", + + "Name: %s%s\nLoad: %d %s\nStatus: %s%s\nCouplers:\n front: %s\n rear: %s", + ", owned by: ", + "none", + "Devices: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nPower transfers: %.0f@%.0f%s%s%s%.0f@%.0f", + " radio: ", + " oil pressure: ", + "Controllers:\n master: %d(%d), secondary: %s\nEngine output: %.1f, current: %.0f\nRevolutions:\n engine: %.0f, motors: %.0f, ventilators: %.0f, fans: %.0f+%.0f", + " (shunt mode)", + "\nTemperatures:\n engine: %.2f, oil: %.2f, water: %.2f%c%.2f", + "Brakes:\n train: %.2f, independent: %.2f, delay: %s, load flag: %d\nBrake cylinder pressures:\n train: %.2f, independent: %.2f, status: 0x%.2x\nPipe pressures:\n brake: %.2f (hat: %.2f), main: %.2f, control: %.2f\nTank pressures:\n auxiliary: %.2f, main: %.2f, control: %.2f", + " pantograph: %.2f%cMT", + "Forces:\n tractive: %.1f, brake: %.1f, friction: %.2f%s\nAcceleration:\n tangential: %.2f, normal: %.2f (path radius: %s)\nVelocity: %.2f, distance traveled: %.2f\nPosition: [%.2f, %.2f, %.2f]" + } + } ); + + stringmap.insert( + { "pl", + { + "Pomocnik", + "Nastawnik: %2d+%d %c%s", + " Predkosc: %d km/h (limit %d km/h%s)%s", + ", nowy limit: %d km/h za %.1f km", + " Pochylenie: %.1f%%", + "Hamulce: %4.1f+%-2.0f%c%s", + " Cisnienie: %.2f kPa (przewod glowny: %.2f kPa)", + "!CZUWAK! ", + "!SHP!", + " Wsiadanie/wysiadanie pasazerow (do zakonczenia %d s)", + " Inny pojazd na drodze (odleglosc: %.1f m)", + + "Rozklad jazdy", + "Godzina: %d:%02d:%02d", + "(brak rozkladu)", + + "Transkrypcje", + + "Symulacja wstrzymana", + "Wznow", + "Zakoncz", + + "Nazwa: %s%s\nLadunek: %d %s\nStatus: %s%s\nSprzegi:\n przedni: %s\n tylny: %s", + ", wlasciciel: ", + "wolny", + "Urzadzenia: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nTransfer pradow: %.0f@%.0f%s%s%s%.0f@%.0f", + " radio: ", + " cisn.oleju: ", + "Nastawniki:\n glowny: %d(%d), dodatkowy: %s\nMoc silnika: %.1f, prad silnika: %.0f\nObroty:\n silnik: %.0f, motory: %.0f, went.silnika: %.0f, went.chlodnicy: %.0f+%.0f", + " (tryb manewrowy)", + "\nTemperatury:\n silnik: %.2f, olej: %.2f, woda: %.2f%c%.2f", + "Hamulce:\n zespolony: %.2f, pomocniczy: %.2f, nastawa: %s, ladunek: %d\nCisnienie w cylindrach:\n zespolony: %.2f, pomocniczy: %.2f, status: 0x%.2x\nCisnienia w przewodach:\n glowny: %.2f (kapturek: %.2f), zasilajacy: %.2f, kontrolny: %.2f\nCisnienia w zbiornikach:\n pomocniczy: %.2f, glowny: %.2f, sterujacy: %.2f", + " pantograf: %.2f%cZG", + "Sily:\n napedna: %.1f, hamowania: %.1f, tarcie: %.2f%s\nPrzyspieszenia:\n styczne: %.2f, normalne: %.2f (promien: %s)\nPredkosc: %.2f, pokonana odleglosc: %.2f\nPozycja: [%.2f, %.2f, %.2f]" + } + } ); + + auto const lookup = stringmap.find( Global.asLang ); + + locale::strings = ( + lookup != stringmap.end() ? + lookup->second : + stringmap.find( "en" )->second ); +} + std::string label_cab_control( std::string const &Label ) { @@ -26,6 +121,102 @@ label_cab_control( std::string const &Label ) { "" ); } +std::vector strings; + +std::unordered_map m_cabcontrols = { + { "mainctrl:", "master controller" }, + { "scndctrl:", "second controller" }, + { "shuntmodepower:", "shunt mode power" }, + { "dirkey:" , "reverser" }, + { "brakectrl:", "train brake" }, + { "localbrake:", "independent brake" }, + { "manualbrake:", "manual brake" }, + { "alarmchain:", "emergency brake" }, + { "brakeprofile_sw:", "brake acting speed" }, + { "brakeprofileg_sw:", "brake acting speed: cargo" }, + { "brakeprofiler_sw:", "brake acting speed: rapid" }, + { "maxcurrent_sw:", "motor overload relay threshold" }, + { "waterpump_sw:", "water pump" }, + { "waterpumpbreaker_sw:", "water pump breaker" }, + { "waterheater_sw:", "water heater" }, + { "waterheaterbreaker_sw:", "water heater breaker" }, + { "watercircuitslink_sw:", "water circuits link" }, + { "fuelpump_sw:", "fuel pump" }, + { "oilpump_sw:", "oil pump" }, + { "main_off_bt:", "line breaker" }, + { "main_on_bt:", "line breaker" }, + { "security_reset_bt:", "alerter" }, + { "releaser_bt:", "independent brake releaser" }, + { "sand_bt:", "sandbox" }, + { "antislip_bt:", "wheelspin brake" }, + { "horn_bt:", "horn" }, + { "hornlow_bt:", "low tone horn" }, + { "hornhigh_bt:", "high tone horn" }, + { "whistle_bt:", "whistle" }, + { "fuse_bt:", "motor overload relay reset" }, + { "converterfuse_bt:", "converter overload relay reset" }, + { "stlinoff_bt:", "motor connectors" }, + { "door_left_sw:", "left door" }, + { "door_right_sw:", "right door" }, + { "doorlefton_sw:", "left door" }, + { "doorrighton_sw:", "right door" }, + { "doorleftoff_sw:", "left door" }, + { "doorrightoff_sw:", "right door" }, + { "dooralloff_sw:", "all doors" }, + { "departure_signal_bt:", "departure signal" }, + { "upperlight_sw:", "upper headlight" }, + { "leftlight_sw:", "left headlight" }, + { "rightlight_sw:", "right headlight" }, + { "dimheadlights_sw:", "headlights dimmer" }, + { "leftend_sw:", "left marker light" }, + { "rightend_sw:", "right marker light" }, + { "lights_sw:", "light pattern" }, + { "rearupperlight_sw:", "rear upper headlight" }, + { "rearleftlight_sw:", "rear left headlight" }, + { "rearrightlight_sw:", "rear right headlight" }, + { "rearleftend_sw:", "rear left marker light" }, + { "rearrightend_sw:", "rear right marker light" }, + { "compressor_sw:", "compressor" }, + { "compressorlocal_sw:", "local compressor" }, + { "converter_sw:", "converter" }, + { "converterlocal_sw:", "local converter" }, + { "converteroff_sw:", "converter" }, + { "main_sw:", "line breaker" }, + { "radio_sw:", "radio" }, + { "radiochannel_sw:", "radio channel" }, + { "radiochannelprev_sw:", "radio channel" }, + { "radiochannelnext_sw:", "radio channel" }, + { "radiotest_sw:", "radiostop test" }, + { "radiostop_sw:", "radiostop" }, + { "pantfront_sw:", "pantograph A" }, + { "pantrear_sw:", "pantograph B" }, + { "pantfrontoff_sw:", "pantograph A" }, + { "pantrearoff_sw:", "pantograph B" }, + { "pantalloff_sw:", "all pantographs" }, + { "pantselected_sw:", "selected pantograph" }, + { "pantselectedoff_sw:", "selected pantograph" }, + { "pantcompressor_sw:", "pantograph compressor" }, + { "pantcompressorvalve_sw:", "pantograph 3 way valve" }, + { "trainheating_sw:", "heating" }, + { "signalling_sw:", "braking indicator" }, + { "door_signalling_sw:", "door locking" }, + { "nextcurrent_sw:", "current indicator source" }, + { "instrumentlight_sw:", "instrument light" }, + { "cablight_sw:", "interior light" }, + { "cablightdim_sw:", "interior light dimmer" }, + { "battery_sw:", "battery" }, + { "universal0:", "generic" }, + { "universal1:", "generic" }, + { "universal2:", "generic" }, + { "universal3:", "generic" }, + { "universal4:", "generic" }, + { "universal5:", "generic" }, + { "universal6:", "generic" }, + { "universal7:", "generic" }, + { "universal8:", "generic" }, + { "universal9:", "generic" } +}; + } // namespace locale //--------------------------------------------------------------------------- diff --git a/translation.h b/translation.h index dd4ae559..260e0f8f 100644 --- a/translation.h +++ b/translation.h @@ -14,102 +14,51 @@ http://mozilla.org/MPL/2.0/. namespace locale { +enum string { + driver_aid_header, + driver_aid_throttle, + driver_aid_speedlimit, + driver_aid_nextlimit, + driver_aid_grade, + driver_aid_brakes, + driver_aid_pressures, + driver_aid_alerter, + driver_aid_shp, + driver_aid_loadinginprogress, + driver_aid_vehicleahead, + + driver_timetable_header, + driver_timetable_time, + driver_timetable_notimetable, + + driver_transcripts_header, + + driver_pause_header, + driver_pause_resume, + driver_pause_quit, + + debug_vehicle_nameloadstatuscouplers, + debug_vehicle_owned, + debug_vehicle_none, + debug_vehicle_devicespower, + debug_vehicle_radio, + debug_vehicle_oilpressure, + debug_vehicle_controllersenginerevolutions, + debug_vehicle_shuntmode, + debug_vehicle_temperatures, + debug_vehicle_brakespressures, + debug_vehicle_pantograph, + debug_vehicle_forcesaccelerationvelocityposition +}; + +void + init(); std::string label_cab_control( std::string const &Label ); -static std::unordered_map m_cabcontrols = { - { "mainctrl:", "master controller" }, - { "scndctrl:", "second controller" }, - { "shuntmodepower:", "shunt mode power" }, - { "dirkey:" , "reverser" }, - { "brakectrl:", "train brake" }, - { "localbrake:", "independent brake" }, - { "manualbrake:", "manual brake" }, - { "alarmchain:", "emergency brake" }, - { "brakeprofile_sw:", "brake acting speed" }, - { "brakeprofileg_sw:", "brake acting speed: cargo" }, - { "brakeprofiler_sw:", "brake acting speed: rapid" }, - { "maxcurrent_sw:", "motor overload relay threshold" }, - { "waterpump_sw:", "water pump" }, - { "waterpumpbreaker_sw:", "water pump breaker" }, - { "waterheater_sw:", "water heater" }, - { "waterheaterbreaker_sw:", "water heater breaker" }, - { "watercircuitslink_sw:", "water circuits link" }, - { "fuelpump_sw:", "fuel pump" }, - { "oilpump_sw:", "oil pump" }, - { "main_off_bt:", "line breaker" }, - { "main_on_bt:", "line breaker" }, - { "security_reset_bt:", "alerter" }, - { "releaser_bt:", "independent brake releaser" }, - { "sand_bt:", "sandbox" }, - { "antislip_bt:", "wheelspin brake" }, - { "horn_bt:", "horn" }, - { "hornlow_bt:", "low tone horn" }, - { "hornhigh_bt:", "high tone horn" }, - { "whistle_bt:", "whistle" }, - { "fuse_bt:", "motor overload relay reset" }, - { "converterfuse_bt:", "converter overload relay reset" }, - { "stlinoff_bt:", "motor connectors" }, - { "door_left_sw:", "left door" }, - { "door_right_sw:", "right door" }, - { "doorlefton_sw:", "left door" }, - { "doorrighton_sw:", "right door" }, - { "doorleftoff_sw:", "left door" }, - { "doorrightoff_sw:", "right door" }, - { "dooralloff_sw:", "all doors" }, - { "departure_signal_bt:", "departure signal" }, - { "upperlight_sw:", "upper headlight" }, - { "leftlight_sw:", "left headlight" }, - { "rightlight_sw:", "right headlight" }, - { "dimheadlights_sw:", "headlights dimmer" }, - { "leftend_sw:", "left marker light" }, - { "rightend_sw:", "right marker light" }, - { "lights_sw:", "light pattern" }, - { "rearupperlight_sw:", "rear upper headlight" }, - { "rearleftlight_sw:", "rear left headlight" }, - { "rearrightlight_sw:", "rear right headlight" }, - { "rearleftend_sw:", "rear left marker light" }, - { "rearrightend_sw:", "rear right marker light" }, - { "compressor_sw:", "compressor" }, - { "compressorlocal_sw:", "local compressor" }, - { "converter_sw:", "converter" }, - { "converterlocal_sw:", "local converter" }, - { "converteroff_sw:", "converter" }, - { "main_sw:", "line breaker" }, - { "radio_sw:", "radio" }, - { "radiochannel_sw:", "radio channel" }, - { "radiochannelprev_sw:", "radio channel" }, - { "radiochannelnext_sw:", "radio channel" }, - { "radiotest_sw:", "radiostop test" }, - { "radiostop_sw:", "radiostop" }, - { "pantfront_sw:", "pantograph A" }, - { "pantrear_sw:", "pantograph B" }, - { "pantfrontoff_sw:", "pantograph A" }, - { "pantrearoff_sw:", "pantograph B" }, - { "pantalloff_sw:", "all pantographs" }, - { "pantselected_sw:", "selected pantograph" }, - { "pantselectedoff_sw:", "selected pantograph" }, - { "pantcompressor_sw:", "pantograph compressor" }, - { "pantcompressorvalve_sw:", "pantograph 3 way valve" }, - { "trainheating_sw:", "heating" }, - { "signalling_sw:", "braking indicator" }, - { "door_signalling_sw:", "door locking" }, - { "nextcurrent_sw:", "current indicator source" }, - { "instrumentlight_sw:", "instrument light" }, - { "cablight_sw:", "interior light" }, - { "cablightdim_sw:", "interior light dimmer" }, - { "battery_sw:", "battery" }, - { "universal0:", "generic" }, - { "universal1:", "generic" }, - { "universal2:", "generic" }, - { "universal3:", "generic" }, - { "universal4:", "generic" }, - { "universal5:", "generic" }, - { "universal6:", "generic" }, - { "universal7:", "generic" }, - { "universal8:", "generic" }, - { "universal9:", "generic" } -}; +extern std::vector strings; + +extern std::unordered_map m_cabcontrols; } diff --git a/uilayer.cpp b/uilayer.cpp index 38495317..8c0e4f28 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -27,8 +27,8 @@ GLint ui_layer::m_textureunit { GL_TEXTURE0 }; bool ui_layer::m_cursorvisible { true }; -ui_panel::ui_panel( std::string const Name, bool const Isopen ) - : name( Name ), is_open( Isopen ) +ui_panel::ui_panel( std::string const Identifier, bool const Isopen ) + : identifier( Identifier ), is_open( Isopen ) {} void @@ -48,7 +48,12 @@ ui_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); } - if( true == ImGui::Begin( name.c_str(), &is_open, flags ) ) { + auto const panelname { ( + name.empty() ? + identifier : + name ) + + "###" + identifier }; + if( true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { for( auto const &line : text_lines ) { ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); } diff --git a/uilayer.h b/uilayer.h index 038e3f5a..d22461b8 100644 --- a/uilayer.h +++ b/uilayer.h @@ -18,7 +18,7 @@ class ui_panel { public: // constructor - ui_panel( std::string const Name, bool const Isopen ); + ui_panel( std::string const Identifier, bool const Isopen ); // methods virtual void update() {}; virtual void render(); @@ -34,6 +34,7 @@ public: {} }; // members + std::string name; bool is_open; glm::ivec2 size { -1, -1 }; glm::ivec2 size_min { -1, -1 }; @@ -42,7 +43,7 @@ public: protected: // members - std::string name; + std::string identifier; }; class ui_layer { From bd5968cb4b15a1b4b91865b6470579b3948d17a9 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 3 Sep 2018 13:26:35 +0200 Subject: [PATCH 387/426] minor ai logic enhancements, minor bug fixes --- Driver.cpp | 162 +++++++++++++++++++++------------------------ DynObj.cpp | 3 +- McZapkie/Mover.cpp | 14 ++-- Model3d.cpp | 10 ++- drivermode.cpp | 11 +-- material.cpp | 3 +- 6 files changed, 100 insertions(+), 103 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 55a114cb..94af7998 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2256,11 +2256,9 @@ double TController::BrakeAccFactor() const void TController::SetDriverPsyche() { - // double maxdist=0.5; //skalowanie dystansu od innego pojazdu, zmienic to!!! if ((Psyche == Aggressive) && (OrderList[OrderPos] == Obey_train)) { ReactionTime = HardReactionTime; // w zaleznosci od charakteru maszynisty - // if (pOccupied) if (mvOccupied->CategoryFlag & 2) { WaitingExpireTime = 1; // tyle ma czekać samochód, zanim się ruszy @@ -2292,48 +2290,6 @@ void TController::SetDriverPsyche() ReactionTime = mvControlling->InitialCtrlDelay + ReactionTime; if (mvOccupied->BrakeCtrlPos > 1) ReactionTime = 0.5 * ReactionTime; - /* - if (mvOccupied->Vel>0.1) //o ile jedziemy - {//sprawdzenie jazdy na widoczność - TCoupling - *c=pVehicles[0]->MoverParameters->Couplers+(pVehicles[0]->DirectionGet()>0?0:1); //sprzęg - z przodu składu - if (c->Connected) //a mamy coś z przodu - if (c->CouplingFlag==0) //jeśli to coś jest podłączone sprzęgiem wirtualnym - {//wyliczanie optymalnego przyspieszenia do jazdy na widoczność (Ra: na pewno tutaj?) - double k=c->Connected->Vel; //prędkość pojazdu z przodu (zakładając, że jedzie w tę - samą stronę!!!) - if (k<=mvOccupied->Vel) //porównanie modułów prędkości [km/h] - {if (pVehicles[0]->fTrackBlockfTrackBlock-0.5*fabs(mvOccupied->V)-fMaxProximityDist); - //bezpieczna odległość za poprzednim - //a=(v2*v2-v1*v1)/(25.92*(d-0.5*v1)) - //(v2*v2-v1*v1)/2 to różnica energii kinetycznych na jednostkę masy - //jeśli v2=50km/h,v1=60km/h,d=200m => k=(192.9-277.8)/(25.92*(200-0.5*16.7)=-0.0171 - [m/s^2] - //jeśli v2=50km/h,v1=60km/h,d=100m => k=(192.9-277.8)/(25.92*(100-0.5*16.7)=-0.0357 - [m/s^2] - //jeśli v2=50km/h,v1=60km/h,d=50m => k=(192.9-277.8)/(25.92*( 50-0.5*16.7)=-0.0786 - [m/s^2] - //jeśli v2=50km/h,v1=60km/h,d=25m => k=(192.9-277.8)/(25.92*( 25-0.5*16.7)=-0.1967 - [m/s^2] - if (d>0) //bo jak ujemne, to zacznie przyspieszać, aby się zderzyć - k=(k*k-mvOccupied->Vel*mvOccupied->Vel)/(25.92*d); //energia kinetyczna dzielona - przez masę i drogę daje przyspieszenie - else - k=0.0; //może lepiej nie przyspieszać -AccPreferred; //hamowanie - //WriteLog(pVehicle->asName+" "+AnsiString(k)); - } - if (dDoorCloseCtrl == control_t::driver) - { // zamykanie drzwi - if (mvOccupied->DoorLeftOpened) - mvOccupied->DoorLeft(false); - if (mvOccupied->DoorRightOpened) - mvOccupied->DoorRight(false); + + if( mvOccupied->Vel > 0.01 ) { + // TBD, TODO: make a dedicated braking procedure out of it for potential reuse + VelDesired = 0.0; + AccDesired = std::min( AccDesired, -1.25 ); // hamuj solidnie + ReactionTime = 0.1; + while( DecSpeed( true ) ) { + ; // zerowanie nastawników } - if (mvOccupied->ActiveDir == 0) - if (mvControlling->Mains) - { - mvControlling->CompressorSwitch(false); - mvControlling->ConverterSwitch(false); - if (mvControlling->EnginePowerSource.SourceType == TPowerSource::CurrentCollector) - { - mvControlling->PantFront(false); - mvControlling->PantRear(false); - } - // line breaker - OK = mvControlling->MainSwitch(false); - } - else - OK = true; - } - else if( mvOccupied->ActiveDir == 0 ) { - // tylko to testujemy dla pojazdu człowieka - OK = mvControlling->Mains; + IncBrake(); + return OK; // don't bother with the rest until we're standing still } - if( AIControllFlag ) { + LastReactionTime = 0.0; + ReactionTime = PrepareTime; + + if( false == AIControllFlag ) { + // tylko to testujemy dla pojazdu człowieka + OK = ( ( mvOccupied->ActiveDir == 0 ) && ( mvControlling->Mains ) ); + } + else { + // jeśli steruje komputer mvOccupied->BrakeReleaser( 0 ); - if( !mvOccupied->DecBrakeLevel() ) { - // tu moze zmieniać na -2, ale to bez znaczenia - if( !mvOccupied->IncLocalBrakeLevel( 1 ) ) { - while( DecSpeed( true ) ) - ; // zerowanie nastawników - while( mvOccupied->ActiveDir > 0 ) - mvOccupied->DirectionBackward(); - while( mvOccupied->ActiveDir < 0 ) - mvOccupied->DirectionForward(); + if( std::abs( fAccGravity ) < 0.01 ) { + // release train brake if on flats... + // TODO: check if we shouldn't leave it engaged instead + while( true == mvOccupied->DecBrakeLevel() ) { + // tu moze zmieniać na -2, ale to bez znaczenia + ; + } + // ...and engage independent brake + while( true == mvOccupied->IncLocalBrakeLevel( 1 ) ) { + ; } } + else { + // on slopes engage train brake + AccDesired = std::min( AccDesired, -0.9 ); + while( true == IncBrake() ) { + ; + } + } + while( DecSpeed( true ) ) { + ; // zerowanie nastawników + } + // set direction to neutral + while( ( mvOccupied->ActiveDir > 0 ) && ( mvOccupied->DirectionBackward() ) ) { ; } + while( ( mvOccupied->ActiveDir < 0 ) && ( mvOccupied->DirectionForward() ) ) { ; } + + if( mvOccupied->DoorCloseCtrl == control_t::driver ) { + // zamykanie drzwi + if( mvOccupied->DoorLeftOpened ) { + mvOccupied->DoorLeft( false ); + } + if( mvOccupied->DoorRightOpened ) { + mvOccupied->DoorRight( false ); + } + } + + if( mvControlling->Mains ) { + mvControlling->CompressorSwitch( false ); + mvControlling->ConverterSwitch( false ); + // line breaker/engine + OK = mvControlling->MainSwitch( false ); + if( mvControlling->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) { + mvControlling->PantFront( false ); + mvControlling->PantRear( false ); + } + } + else { + OK = true; + } } - OK = OK && (mvOccupied->Vel < 0.01); + if (OK) { // jeśli się zatrzymał iEngineActive = 0; @@ -4823,6 +4808,11 @@ TController::UpdateSituation(double dt) { VelDesired = 0.0; } } + + if( ( OrderCurrentGet() & Wait_for_orders ) != 0 ) { + // wait means sit and wait + VelDesired = 0.0; + } // end of speed caps checks if( ( ( OrderCurrentGet() & Obey_train ) != 0 ) diff --git a/DynObj.cpp b/DynObj.cpp index b0903db6..a3186f51 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -970,7 +970,8 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) } if( ( Mechanik != nullptr ) - && ( Mechanik->GetAction() != TAction::actSleep ) ) { + && ( ( Mechanik->GetAction() != TAction::actSleep ) + || ( MoverParameters->Battery ) ) ) { // rysowanie figurki mechanika btMechanik1.Turn( MoverParameters->ActiveCab > 0 ); btMechanik2.Turn( MoverParameters->ActiveCab < 0 ); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 188a8f2b..b2ce0b5c 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -740,8 +740,7 @@ void TMoverParameters::UpdatePantVolume(double dt) // Ra 2013-12: Niebugocław mówi, że w EZT nie ma potrzeby odcinać kurkiem PantPress = ScndPipePress; // ograniczenie ciśnienia do MaxPress (tylko w pantografach!) - PantPress = std::min( PantPress, EnginePowerSource.CollectorParameters.MaxPress ); - PantPress = std::max( PantPress, 0.0 ); + PantPress = clamp( ScndPipePress, 0.0, EnginePowerSource.CollectorParameters.MaxPress ); PantVolume = (PantPress + 1.0) * 0.1; // objętość, na wypadek odcięcia kurkiem } else @@ -754,8 +753,7 @@ void TMoverParameters::UpdatePantVolume(double dt) * ( TrainType == dt_EZT ? 0.003 : 0.005 ) / std::max( 1.0, PantPress ) * ( 0.45 - ( ( 0.1 / PantVolume / 10 ) - 0.1 ) ) / 0.45; } - PantPress = std::min( (10.0 * PantVolume) - 1.0, EnginePowerSource.CollectorParameters.MaxPress ); // tu by się przydała objętość zbiornika - PantPress = std::max( PantPress, 0.0 ); + PantPress = clamp( ( 10.0 * PantVolume ) - 1.0, 0.0, EnginePowerSource.CollectorParameters.MaxPress ); // tu by się przydała objętość zbiornika } if( !PantCompFlag && ( PantVolume > 0.1 ) ) PantVolume -= dt * 0.0003 * std::max( 1.0, PantPress * 0.5 ); // nieszczelności: 0.0003=0.3l/s @@ -4355,7 +4353,7 @@ double TMoverParameters::TractionForce( double dt ) { case 1: { // manual if( ( ActiveDir != 0 ) - && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { + && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { RventRot += ( RVentnmax - RventRot ) * RVentSpeed * dt; } else { @@ -4367,7 +4365,7 @@ double TMoverParameters::TractionForce( double dt ) { case 2: { // automatic auto const motorcurrent{ std::min( ImaxHi, std::abs( Im ) ) }; if( ( std::abs( Itot ) > RVentMinI ) - && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { + && ( RList[ MainCtrlActualPos ].R > RVentCutOff ) ) { RventRot += ( RVentnmax @@ -8512,8 +8510,8 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet //ciśnienie rozłączające WS extract_value( collectorparameters.MinPress, "MinPress", Line, "3.5" ); //domyślnie 2 bary do załączenia WS //maksymalne ciśnienie za reduktorem - collectorparameters.MaxPress = 5.0 + 0.001 * ( Random( 50 ) - Random( 50 ) ); - extract_value( collectorparameters.MaxPress, "MaxPress", Line, "" ); +// collectorparameters.MaxPress = 5.0 + 0.001 * ( Random( 50 ) - Random( 50 ) ); + extract_value( collectorparameters.MaxPress, "MaxPress", Line, "5.0" ); break; } case TPowerSource::PowerCable: { diff --git a/Model3d.cpp b/Model3d.cpp index 41bd1ccb..2631d0f4 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -431,6 +431,12 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic >> Vertices[i].normal.x >> Vertices[i].normal.y >> Vertices[i].normal.z; + if( glm::length2( Vertices[ i ].normal ) > 0.0f ) { + glm::normalize( Vertices[ i ].normal ); + } + else { + WriteLog( "Bad model: zero length normal vector specified in: \"" + pName + "\", vertex " + std::to_string(i), logtype::model ); + } wsp[i] = i; // wektory normalne "są już policzone" } parser.getTokens(2, false); @@ -464,7 +470,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic /* glm::vec3 *n = new glm::vec3[iNumFaces]; // tablica wektorów normalnych dla trójkątów */ - std::vector facenormals; + std::vector facenormals; facenormals.reserve( facecount ); for( int i = 0; i < facecount; ++i ) { // pętla po trójkątach - będzie szybciej, jak wstępnie przeliczymy normalne trójkątów auto facenormal = @@ -1127,7 +1133,7 @@ TSubModel *TModel3d::AddToNamed(const char *Name, TSubModel *SubModel) TSubModel *sm = Name ? GetFromName(Name) : nullptr; if( ( sm == nullptr ) && ( Name != nullptr ) && ( std::strcmp( Name, "none" ) != 0 ) ) { - ErrorLog( "Bad model: parent for sub-model \"" + SubModel->pName +"\" doesn't exist or is located after in the model data", logtype::model ); + ErrorLog( "Bad model: parent for sub-model \"" + SubModel->pName +"\" doesn't exist or is located later in the model data", logtype::model ); } AddTo(sm, SubModel); // szukanie nadrzędnego return sm; // zwracamy wskaźnik do nadrzędnego submodelu diff --git a/drivermode.cpp b/drivermode.cpp index 54ec80a8..e952a0ae 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -571,12 +571,13 @@ driver_mode::OnKeyDown(int cKey) { simulation::Events.AddToQuery( KeyEvents[ i ], NULL ); } } - else // zapamiętywanie kamery może działać podczas pauzy + else if( Global.ctrlState ) { + // zapamiętywanie kamery może działać podczas pauzy if( FreeFlyModeFlag ) { // w trybie latania można przeskakiwać do ustawionych kamer - if( ( !Global.FreeCameraInit[ i ].x ) - && ( !Global.FreeCameraInit[ i ].y ) - && ( !Global.FreeCameraInit[ i ].z ) ) { + if( ( Global.FreeCameraInit[ i ].x == 0.0 ) + && ( Global.FreeCameraInit[ i ].y == 0.0 ) + && ( Global.FreeCameraInit[ i ].z == 0.0 ) ) { // jeśli kamera jest w punkcie zerowym, zapamiętanie współrzędnych i kątów Global.FreeCameraInit[ i ] = Camera.Pos; Global.FreeCameraInitAngle[ i ].x = Camera.Pitch; @@ -598,7 +599,7 @@ driver_mode::OnKeyDown(int cKey) { Camera.Init( Global.FreeCameraInit[ i ], Global.FreeCameraInitAngle[ i ], TCameraType::tp_Free ); // przestawienie } } - // będzie jeszcze załączanie sprzęgów z [Ctrl] + } } else if( ( cKey >= GLFW_KEY_F1 ) && ( cKey <= GLFW_KEY_F12 ) ) { diff --git a/material.cpp b/material.cpp index f11b97a1..5fedce14 100644 --- a/material.cpp +++ b/material.cpp @@ -38,7 +38,8 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } - auto const value { Input.getToken( true, "\n\r\t ,;" ) }; + // NOTE: comma can be part of legacy file names, so we don't treat it as a separator here + auto const value { Input.getToken( true, "\n\r\t ;" ) }; if( Priority != -1 ) { // regular attribute processing mode From 36ff8d83e8d8ec88c1255288022091b3c7d70bd0 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 4 Sep 2018 00:48:26 +0200 Subject: [PATCH 388/426] minor ai logic tweaks, minor bug fixes --- Driver.cpp | 43 ++++++++++++++++++++++++++----------------- driveruipanels.cpp | 3 ++- material.cpp | 2 +- translation.cpp | 8 ++++---- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 94af7998..22bfede6 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1373,6 +1373,12 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // ograniczenie aktualnej prędkości aż do wyjechania za ograniczenie fVelDes = v; } + if( ( sSpeedTable[ i ].iFlags & spEnd ) + && ( mvOccupied->CategoryFlag & 1 ) ) { + // if the railway track ends here set the velnext accordingly as well + // TODO: test this with turntables and such + fNext = 0.0; + } // if (v==0.0) fAcc=-0.9; //hamowanie jeśli stop continue; // i tyle wystarczy } @@ -2455,8 +2461,6 @@ bool TController::PrepareEngine() // wyłączanie silnika (test wyłączenia, a część wykonawcza tylko jeśli steruje komputer) bool TController::ReleaseEngine() { - bool OK = false; - if( mvOccupied->Vel > 0.01 ) { // TBD, TODO: make a dedicated braking procedure out of it for potential reuse VelDesired = 0.0; @@ -2466,12 +2470,15 @@ bool TController::ReleaseEngine() { ; // zerowanie nastawników } IncBrake(); - return OK; // don't bother with the rest until we're standing still + // don't bother with the rest until we're standing still + return false; } LastReactionTime = 0.0; ReactionTime = PrepareTime; + bool OK { false }; + if( false == AIControllFlag ) { // tylko to testujemy dla pojazdu człowieka OK = ( ( mvOccupied->ActiveDir == 0 ) && ( mvControlling->Mains ) ); @@ -2515,7 +2522,7 @@ bool TController::ReleaseEngine() { } } - if( mvControlling->Mains ) { + if( true == mvControlling->Mains ) { mvControlling->CompressorSwitch( false ); mvControlling->ConverterSwitch( false ); // line breaker/engine @@ -2528,15 +2535,9 @@ bool TController::ReleaseEngine() { else { OK = true; } - } - if (OK) - { // jeśli się zatrzymał - iEngineActive = 0; - eStopReason = stopSleep; // stoimy z powodu wyłączenia - eAction = TAction::actSleep; //śpi (wygaszony) - if (AIControllFlag) - { + if( OK ) { + // finish vehicle shutdown if( ( mvControlling->EngineType == TEngineType::DieselElectric ) || ( mvControlling->EngineType == TEngineType::DieselEngine ) ) { // heating/cooling subsystem @@ -2550,9 +2551,17 @@ bool TController::ReleaseEngine() { mvControlling->OilPumpSwitch( false ); } // gasimy światła - Lights(0, 0); - mvOccupied->BatterySwitch(false); + Lights( 0, 0 ); + mvOccupied->BatterySwitch( false ); } + } + + if (OK) { + // jeśli się zatrzymał + iEngineActive = 0; + eStopReason = stopSleep; // stoimy z powodu wyłączenia + eAction = TAction::actSleep; //śpi (wygaszony) + OrderNext(Wait_for_orders); //żeby nie próbował coś robić dalej TableClear(); // zapominamy ograniczenia iDrivigFlags &= ~moveActive; // ma nie skanować sygnałów i nie reagować na komendy @@ -4415,8 +4424,8 @@ TController::UpdateSituation(double dt) { break; } default: { - fMinProximityDist = 0.01; - fMaxProximityDist = 2.0; //[m] + fMinProximityDist = 5.0; + fMaxProximityDist = 10.0; //[m] fVelPlus = 2.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania fVelMinus = 5.0; // margines prędkości powodujący załączenie napędu } @@ -4809,7 +4818,7 @@ TController::UpdateSituation(double dt) { } } - if( ( OrderCurrentGet() & Wait_for_orders ) != 0 ) { + if( OrderCurrentGet() == Wait_for_orders ) { // wait means sit and wait VelDesired = 0.0; } diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 0e4b7ef3..ec4c9ad9 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -148,7 +148,7 @@ drivingaid_panel::update() { text_lines.emplace_back( textline + " " + expandedtext, Global.UITextColor ); } - auto const sizex = ( is_expanded ? 660 : 135 ); + auto const sizex = ( is_expanded ? 735 : 135 ); size = { sizex, 85 }; } @@ -786,6 +786,7 @@ debug_panel::update_section_scenario( std::vector &Output ) { // current luminance level textline = "Light level: " + to_string( Global.fLuminance, 3 ); if( Global.FakeLight ) { textline += "(*)"; } + textline += "\nAir temperature: " + to_string( Global.AirTemperature, 1 ) + " deg C"; Output.emplace_back( textline, Global.UITextColor ); } diff --git a/material.cpp b/material.cpp index 5fedce14..5503eb41 100644 --- a/material.cpp +++ b/material.cpp @@ -34,7 +34,7 @@ opengl_material::deserialize( cParser &Input, bool const Loadnow ) { bool opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow ) { // token can be a key or block end - std::string const key { Input.getToken( true, "\n\r\t ,;[]" ) }; + std::string const key { Input.getToken( true, "\n\r\t ;[]" ) }; if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } diff --git a/translation.cpp b/translation.cpp index bc5bc9d0..ad37b57d 100644 --- a/translation.cpp +++ b/translation.cpp @@ -30,7 +30,7 @@ init() { "Throttle: %2d+%d %c%s", " Speed: %d km/h (limit %d km/h%s)%s", ", new limit: %d km/h in %.1f km", - " Grade: %.1f%%", + " Grade: %.1f%%%%", "Brakes: %4.1f+%-2.0f%c%s", " Pressure: %.2f kPa (train pipe: %.2f kPa)", "!ALERTER! ", @@ -48,7 +48,7 @@ init() { "Resume", "Quit", - "Name: %s%s\nLoad: %d %s\nStatus: %s%s\nCouplers:\n front: %s\n rear: %s", + "Name: %s%s\nLoad: %.0f %s\nStatus: %s%s\nCouplers:\n front: %s\n rear: %s", ", owned by: ", "none", "Devices: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nPower transfers: %.0f@%.0f%s%s%s%.0f@%.0f", @@ -70,7 +70,7 @@ init() { "Nastawnik: %2d+%d %c%s", " Predkosc: %d km/h (limit %d km/h%s)%s", ", nowy limit: %d km/h za %.1f km", - " Pochylenie: %.1f%%", + " Pochylenie: %.1f%%%%", "Hamulce: %4.1f+%-2.0f%c%s", " Cisnienie: %.2f kPa (przewod glowny: %.2f kPa)", "!CZUWAK! ", @@ -88,7 +88,7 @@ init() { "Wznow", "Zakoncz", - "Nazwa: %s%s\nLadunek: %d %s\nStatus: %s%s\nSprzegi:\n przedni: %s\n tylny: %s", + "Nazwa: %s%s\nLadunek: %.0f %s\nStatus: %s%s\nSprzegi:\n przedni: %s\n tylny: %s", ", wlasciciel: ", "wolny", "Urzadzenia: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nTransfer pradow: %.0f@%.0f%s%s%s%.0f@%.0f", From bbe5fe9758f68c1bd259a111baeba88b473da4d7 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 4 Sep 2018 22:05:34 +0200 Subject: [PATCH 389/426] build 180904. sunlight applied to clouds, cab control labels included in the localization system, minor bug fixes --- Train.cpp | 8 +- driveruipanels.cpp | 6 +- renderer.cpp | 66 +++++--- renderer.h | 1 + translation.cpp | 396 +++++++++++++++++++++++++++++++++------------ translation.h | 96 ++++++++++- uilayer.cpp | 2 + version.h | 2 +- 8 files changed, 443 insertions(+), 134 deletions(-) diff --git a/Train.cpp b/Train.cpp index a0144cee..8626184c 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5155,10 +5155,10 @@ bool TTrain::Update( double const Deltatime ) } if( mvControlled->Signalling == true ) { - if( mvOccupied->BrakePress >= 0.145f * 10 ) { + if( mvOccupied->BrakePress >= 0.145f ) { btLampkaHamowanie1zes.Turn( true ); } - if( mvControlled->BrakePress < 0.075f * 10 ) { + if( mvControlled->BrakePress < 0.075f ) { btLampkaHamowanie1zes.Turn( false ); } } @@ -5311,11 +5311,11 @@ bool TTrain::Update( double const Deltatime ) btLampkaSprezarkaB.Turn( tmp->MoverParameters->CompressorFlag ); // mutopsitka dziala btLampkaSprezarkaBOff.Turn( false == tmp->MoverParameters->CompressorFlag ); - if ((tmp->MoverParameters->BrakePress >= 0.145f * 10) && (mvControlled->Signalling == true)) + if ((tmp->MoverParameters->BrakePress >= 0.145f) && (mvControlled->Signalling == true)) { btLampkaHamowanie2zes.Turn( true ); } - if ((tmp->MoverParameters->BrakePress < 0.075f * 10) || (mvControlled->Signalling == false)) + if ((tmp->MoverParameters->BrakePress < 0.075f) || (mvControlled->Signalling == false)) { btLampkaHamowanie2zes.Turn( false ); } diff --git a/driveruipanels.cpp b/driveruipanels.cpp index ec4c9ad9..a26b9178 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -434,9 +434,9 @@ debug_panel::update_section_vehicle( std::vector &Output ) { std::string( isdieselinshuntmode ? to_string( mover.AnPos, 2 ) + locale::strings[ locale::string::debug_vehicle_shuntmode ] : std::to_string( mover.ScndCtrlPos ) + "(" + std::to_string( mover.ScndCtrlActualPos ) + ")" ).c_str(), // engine mover.EnginePower, - ( mover.TrainType == dt_EZT ? mover.ShowCurrent( 0 ) : mover.Im ), + std::abs( mover.TrainType == dt_EZT ? mover.ShowCurrent( 0 ) : mover.Im ), // revolutions - mover.enrot * 60, + std::abs( mover.enrot ) * 60, std::abs( mover.nrot ) * mover.Transmision.Ratio * 60, mover.RventRot * 60, mover.dizel_heat.rpmw, @@ -510,7 +510,7 @@ debug_panel::update_section_vehicle( std::vector &Output ) { // acceleration Acc, mover.AccN + 0.001f, - std::string( std::abs( mover.RunningShape.R ) > 10000.0 ? "~0.0" : to_string( mover.RunningShape.R, 0 ) ).c_str(), + std::string( std::abs( mover.RunningShape.R ) > 10000.0 ? "~0" : to_string( mover.RunningShape.R, 0 ) ).c_str(), // velocity vehicle.GetVelocity(), mover.DistCounter, diff --git a/renderer.cpp b/renderer.cpp index a1b74e29..ca5bb328 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1416,7 +1416,6 @@ opengl_renderer::Render( world_environment *Environment ) { ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); ::glPushMatrix(); - // skydome Environment->m_skydome.Render(); // stars @@ -1432,7 +1431,6 @@ opengl_renderer::Render( world_environment *Environment ) { ::glPointSize( 3.f ); ::glPopMatrix(); } - // celestial bodies float const duskfactor = 1.0f - clamp( std::abs( Environment->m_sun.getAngle() ), 0.0f, 12.0f ) / 12.0f; glm::vec3 suncolor = interpolate( @@ -1523,30 +1521,30 @@ opengl_renderer::Render( world_environment *Environment ) { } ::glPopAttrib(); + m_sunlight.apply_angle(); + m_sunlight.apply_intensity(); + // clouds if( Environment->m_clouds.mdCloud ) { // setup Disable_Lights(); + ::glEnable( GL_LIGHT0 ); // other lights will be enabled during lights update ::glEnable( GL_LIGHTING ); ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( interpolate( Environment->m_skydome.GetAverageColor(), suncolor, duskfactor * 0.25f ) * interpolate( 1.f, 0.35f, Global.Overcast / 2.f ) // overcast darkens the clouds - * 2.5f // arbitrary adjustment factor + * 0.5f // arbitrary adjustment factor ) ); // render - Render( Environment->m_clouds.mdCloud, nullptr, 100.0 ); +// Render( Environment->m_clouds.mdCloud, nullptr, 100.0 ); Render_Alpha( Environment->m_clouds.mdCloud, nullptr, 100.0 ); // post-render cleanup ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( colors::none ) ); - ::glEnable( GL_LIGHT0 ); // other lights will be enabled during lights update ::glDisable( GL_LIGHTING ); } - m_sunlight.apply_angle(); - m_sunlight.apply_intensity(); - ::glPopMatrix(); ::glDepthMask( GL_TRUE ); ::glEnable( GL_DEPTH_TEST ); @@ -2409,7 +2407,17 @@ opengl_renderer::Render( TSubModel *Submodel ) { // main draw call m_geometry.draw( Submodel->m_geometry ); - +/* + if( DebugModeFlag ) { + auto const & vertices { m_geometry.vertices( Submodel->m_geometry ) }; + ::glBegin( GL_LINES ); + for( auto const &vertex : vertices ) { + ::glVertex3fv( glm::value_ptr( vertex.position ) ); + ::glVertex3fv( glm::value_ptr( vertex.position + vertex.normal * 0.2f ) ); + } + ::glEnd(); + } +*/ // post-draw reset if( ( true == m_renderspecular ) && ( m_sunlight.specular.a > 0.01f ) ) { ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); @@ -3511,6 +3519,30 @@ opengl_renderer::Update_Mouse_Position() { void opengl_renderer::Update( double const Deltatime ) { + m_pickupdateaccumulator += Deltatime; + + if( m_updateaccumulator > 0.5 ) { + + m_pickupdateaccumulator = 0.0; + + if( ( true == Global.ControlPicking ) + && ( false == FreeFlyModeFlag ) ) { + Update_Pick_Control(); + } + else { + m_pickcontrolitem = nullptr; + } + // temporary conditions for testing. eventually will be coupled with editor mode + if( ( true == Global.ControlPicking ) + && ( true == DebugModeFlag ) + && ( true == FreeFlyModeFlag ) ) { + Update_Pick_Node(); + } + else { + m_picksceneryitem = nullptr; + } + } + m_updateaccumulator += Deltatime; if( m_updateaccumulator < 1.0 ) { @@ -3563,22 +3595,6 @@ opengl_renderer::Update( double const Deltatime ) { m_debugtimestext += m_textures.info(); } - if( ( true == Global.ControlPicking ) - && ( false == FreeFlyModeFlag ) ) { - Update_Pick_Control(); - } - else { - m_pickcontrolitem = nullptr; - } - // temporary conditions for testing. eventually will be coupled with editor mode - if( ( true == Global.ControlPicking ) - && ( true == DebugModeFlag ) - && ( true == FreeFlyModeFlag ) ) { - Update_Pick_Node(); - } - else { - m_picksceneryitem = nullptr; - } // dump last opengl error, if any auto const glerror = ::glGetError(); if( glerror != GL_NO_ERROR ) { diff --git a/renderer.h b/renderer.h index 6c47ad05..1b04ddc9 100644 --- a/renderer.h +++ b/renderer.h @@ -375,6 +375,7 @@ private: unsigned int m_framestamp; // id of currently rendered gfx frame float m_framerate; double m_updateaccumulator { 0.0 }; + double m_pickupdateaccumulator { 0.0 }; std::string m_debugtimestext; std::string m_pickdebuginfo; debug_stats m_debugstats; diff --git a/translation.cpp b/translation.cpp index ad37b57d..e8fe4cd8 100644 --- a/translation.cpp +++ b/translation.cpp @@ -59,7 +59,99 @@ init() { "\nTemperatures:\n engine: %.2f, oil: %.2f, water: %.2f%c%.2f", "Brakes:\n train: %.2f, independent: %.2f, delay: %s, load flag: %d\nBrake cylinder pressures:\n train: %.2f, independent: %.2f, status: 0x%.2x\nPipe pressures:\n brake: %.2f (hat: %.2f), main: %.2f, control: %.2f\nTank pressures:\n auxiliary: %.2f, main: %.2f, control: %.2f", " pantograph: %.2f%cMT", - "Forces:\n tractive: %.1f, brake: %.1f, friction: %.2f%s\nAcceleration:\n tangential: %.2f, normal: %.2f (path radius: %s)\nVelocity: %.2f, distance traveled: %.2f\nPosition: [%.2f, %.2f, %.2f]" + "Forces:\n tractive: %.1f, brake: %.1f, friction: %.2f%s\nAcceleration:\n tangential: %.2f, normal: %.2f (path radius: %s)\nVelocity: %.2f, distance traveled: %.2f\nPosition: [%.2f, %.2f, %.2f]", + + "master controller", + "second controller", + "shunt mode power", + "reverser", + "train brake", + "independent brake", + "manual brake", + "emergency brake", + "brake acting speed", + "brake acting speed: cargo", + "brake acting speed: rapid", + "motor overload relay threshold", + "water pump", + "water pump breaker", + "water heater", + "water heater breaker", + "water circuits link", + "fuel pump", + "oil pump", + "line breaker", + "line breaker", + "alerter", + "independent brake releaser", + "sandbox", + "wheelspin brake", + "horn", + "low tone horn", + "high tone horn", + "whistle", + "motor overload relay reset", + "converter overload relay reset", + "motor connectors", + "left door", + "right door", + "left door", + "right door", + "left door", + "right door", + "all doors", + "departure signal", + "upper headlight", + "left headlight", + "right headlight", + "headlights dimmer", + "left marker light", + "right marker light", + "light pattern", + "rear upper headlight", + "rear left headlight", + "rear right headlight", + "rear left marker light", + "rear right marker light", + "compressor", + "local compressor", + "converter", + "local converter", + "converter", + "line breaker", + "radio", + "radio channel", + "radio channel", + "radio channel", + "radiostop test", + "radiostop", + "pantograph A", + "pantograph B", + "pantograph A", + "pantograph B", + "all pantographs", + "selected pantograph", + "selected pantograph", + "pantograph compressor", + "pantograph 3 way valve", + "heating", + "braking indicator", + "door locking", + "current indicator source", + "instrument light", + "interior light", + "interior light dimmer", + "battery", + "interactive part", + "interactive part", + "interactive part", + "interactive part", + "interactive part", + "interactive part", + "interactive part", + "interactive part", + "interactive part", + "interactive part" } } ); @@ -99,21 +191,217 @@ init() { "\nTemperatury:\n silnik: %.2f, olej: %.2f, woda: %.2f%c%.2f", "Hamulce:\n zespolony: %.2f, pomocniczy: %.2f, nastawa: %s, ladunek: %d\nCisnienie w cylindrach:\n zespolony: %.2f, pomocniczy: %.2f, status: 0x%.2x\nCisnienia w przewodach:\n glowny: %.2f (kapturek: %.2f), zasilajacy: %.2f, kontrolny: %.2f\nCisnienia w zbiornikach:\n pomocniczy: %.2f, glowny: %.2f, sterujacy: %.2f", " pantograf: %.2f%cZG", - "Sily:\n napedna: %.1f, hamowania: %.1f, tarcie: %.2f%s\nPrzyspieszenia:\n styczne: %.2f, normalne: %.2f (promien: %s)\nPredkosc: %.2f, pokonana odleglosc: %.2f\nPozycja: [%.2f, %.2f, %.2f]" + "Sily:\n napedna: %.1f, hamowania: %.1f, tarcie: %.2f%s\nPrzyspieszenia:\n styczne: %.2f, normalne: %.2f (promien: %s)\nPredkosc: %.2f, pokonana odleglosc: %.2f\nPozycja: [%.2f, %.2f, %.2f]", + + "nastawnik", + "nastawnik dodatkowy", + "sterowanie analogowe", + "nastawnik jazdy", + "hamulec zespolony", + "hamulec pomocniczy", + "hamulec reczny", + "hamulec bezpieczenstwa", + "nastawa hamulca", + "nastawa hamulca: towarowy", + "nastawa hamulca: pospieszny", + "rozruch niski/wysoki", + "pompa wody", + "wylacznik samoczynny pompy wody", + "podgrzewacz wody", + "wylacznik samoczynny podgrzewacza wody", + "zawor polaczenia obiegow wody", + "pompa paliwa", + "pompa oleju", + "wylacznik szybki", + "wylacznik szybki", + "czuwak", + "odluzniacz", + "piasecznica", + "hamulec przeciwposlizgowy", + "syrena", + "syrena (ton niski)", + "syrena (ton wysoki)", + "gwizdawka", + "przekaznik nadmiarowy motorow trakcyjnych", + "przekaznik nadmiarowy przetwornicy", + "styczniki liniowe", + "drzwi lewe", + "drzwi prawe", + "drzwi lewe", + "drzwi prawe", + "drzwi lewe", + "drzwi prawe", + "drzwi", + "sygnal odjazdu", + "reflektor gorny", + "reflektor lewy", + "reflektor prawy", + "przyciemnienie reflektorow", + "sygnal lewy", + "sygnal prawy", + "programator swiatel", + "tylny reflektor gorny", + "tylny reflektor lewy", + "tylny reflektor prawy", + "tylny sygnal lewy", + "tylny sygnal prawy", + "sprezarka", + "sprezarka lokalna", + "przetwornica", + "przetwornica lokalna", + "przetwornica", + "wylacznik szybki", + "radio", + "kanal radia", + "kanal radia", + "kanal radia", + "test radiostopu", + "radiostop", + "pantograf A", + "pantograf B", + "pantograf A", + "pantograf B", + "wszystkie pantografy", + "wybrany pantograf", + "wybrany pantograf", + "sprezarka pantografow", + "kurek trojdrogowy pantografow", + "ogrzewanie pociagu", + "sygnalizacja hamowania", + "sygnalizacja blokady drzwi", + "prady drugiego czlonu", + "oswietlenie przyrzadow", + "oswietlenie kabiny", + "przyciemnienie oswietlenia kabiny", + "bateria", + "element ruchomy", + "element ruchomy", + "element ruchomy", + "element ruchomy", + "element ruchomy", + "element ruchomy", + "element ruchomy", + "element ruchomy", + "element ruchomy", + "element ruchomy" } } ); - auto const lookup = stringmap.find( Global.asLang ); + auto lookup { stringmap.find( Global.asLang ) }; + if( lookup == stringmap.end() ) { + lookup = stringmap.find( "en" ); + } - locale::strings = ( - lookup != stringmap.end() ? - lookup->second : - stringmap.find( "en" )->second ); + locale::strings = lookup->second; + + // prepare cab controls translation table + { + std::vector cabcontrols = { + "mainctrl:", + "scndctrl:", + "shuntmodepower:", + "dirkey:", + "brakectrl:", + "localbrake:", + "manualbrake:", + "alarmchain:", + "brakeprofile_sw:", + "brakeprofileg_sw:", + "brakeprofiler_sw:", + "maxcurrent_sw:", + "waterpump_sw:", + "waterpumpbreaker_sw:", + "waterheater_sw:", + "waterheaterbreaker_sw:", + "watercircuitslink_sw:", + "fuelpump_sw:", + "oilpump_sw:", + "main_off_bt:", + "main_on_bt:", + "security_reset_bt:", + "releaser_bt:", + "sand_bt:", + "antislip_bt:", + "horn_bt:", + "hornlow_bt:", + "hornhigh_bt:", + "whistle_bt:", + "fuse_bt:", + "converterfuse_bt:", + "stlinoff_bt:", + "door_left_sw:", + "door_right_sw:", + "doorlefton_sw:", + "doorrighton_sw:", + "doorleftoff_sw:", + "doorrightoff_sw:", + "dooralloff_sw:", + "departure_signal_bt:", + "upperlight_sw:", + "leftlight_sw:", + "rightlight_sw:", + "dimheadlights_sw:", + "leftend_sw:", + "rightend_sw:", + "lights_sw:", + "rearupperlight_sw:", + "rearleftlight_sw:", + "rearrightlight_sw:", + "rearleftend_sw:", + "rearrightend_sw:", + "compressor_sw:", + "compressorlocal_sw:", + "converter_sw:", + "converterlocal_sw:", + "converteroff_sw:", + "main_sw:", + "radio_sw:", + "radiochannel_sw:", + "radiochannelprev_sw:", + "radiochannelnext_sw:", + "radiotest_sw:", + "radiostop_sw:", + "pantfront_sw:", + "pantrear_sw:", + "pantfrontoff_sw:", + "pantrearoff_sw:", + "pantalloff_sw:", + "pantselected_sw:", + "pantselectedoff_sw:", + "pantcompressor_sw:", + "pantcompressorvalve_sw:", + "trainheating_sw:", + "signalling_sw:", + "door_signalling_sw:", + "nextcurrent_sw:", + "instrumentlight_sw:", + "cablight_sw:", + "cablightdim_sw:", + "battery_sw:", + "universal0:", + "universal1:", + "universal2:", + "universal3:", + "universal4:", + "universal5:", + "universal6:", + "universal7:", + "universal8:", + "universal9:" + }; + + std::size_t stringidx { string::cab_mainctrl }; + for( auto const &cabcontrol : cabcontrols ) { + m_cabcontrols.insert( { cabcontrol, strings[ stringidx++ ] } ); + } + } } std::string label_cab_control( std::string const &Label ) { + if( Label.empty() ) { return ""; } + auto const lookup = m_cabcontrols.find( Label ); return ( lookup != m_cabcontrols.end() ? @@ -123,99 +411,7 @@ label_cab_control( std::string const &Label ) { std::vector strings; -std::unordered_map m_cabcontrols = { - { "mainctrl:", "master controller" }, - { "scndctrl:", "second controller" }, - { "shuntmodepower:", "shunt mode power" }, - { "dirkey:" , "reverser" }, - { "brakectrl:", "train brake" }, - { "localbrake:", "independent brake" }, - { "manualbrake:", "manual brake" }, - { "alarmchain:", "emergency brake" }, - { "brakeprofile_sw:", "brake acting speed" }, - { "brakeprofileg_sw:", "brake acting speed: cargo" }, - { "brakeprofiler_sw:", "brake acting speed: rapid" }, - { "maxcurrent_sw:", "motor overload relay threshold" }, - { "waterpump_sw:", "water pump" }, - { "waterpumpbreaker_sw:", "water pump breaker" }, - { "waterheater_sw:", "water heater" }, - { "waterheaterbreaker_sw:", "water heater breaker" }, - { "watercircuitslink_sw:", "water circuits link" }, - { "fuelpump_sw:", "fuel pump" }, - { "oilpump_sw:", "oil pump" }, - { "main_off_bt:", "line breaker" }, - { "main_on_bt:", "line breaker" }, - { "security_reset_bt:", "alerter" }, - { "releaser_bt:", "independent brake releaser" }, - { "sand_bt:", "sandbox" }, - { "antislip_bt:", "wheelspin brake" }, - { "horn_bt:", "horn" }, - { "hornlow_bt:", "low tone horn" }, - { "hornhigh_bt:", "high tone horn" }, - { "whistle_bt:", "whistle" }, - { "fuse_bt:", "motor overload relay reset" }, - { "converterfuse_bt:", "converter overload relay reset" }, - { "stlinoff_bt:", "motor connectors" }, - { "door_left_sw:", "left door" }, - { "door_right_sw:", "right door" }, - { "doorlefton_sw:", "left door" }, - { "doorrighton_sw:", "right door" }, - { "doorleftoff_sw:", "left door" }, - { "doorrightoff_sw:", "right door" }, - { "dooralloff_sw:", "all doors" }, - { "departure_signal_bt:", "departure signal" }, - { "upperlight_sw:", "upper headlight" }, - { "leftlight_sw:", "left headlight" }, - { "rightlight_sw:", "right headlight" }, - { "dimheadlights_sw:", "headlights dimmer" }, - { "leftend_sw:", "left marker light" }, - { "rightend_sw:", "right marker light" }, - { "lights_sw:", "light pattern" }, - { "rearupperlight_sw:", "rear upper headlight" }, - { "rearleftlight_sw:", "rear left headlight" }, - { "rearrightlight_sw:", "rear right headlight" }, - { "rearleftend_sw:", "rear left marker light" }, - { "rearrightend_sw:", "rear right marker light" }, - { "compressor_sw:", "compressor" }, - { "compressorlocal_sw:", "local compressor" }, - { "converter_sw:", "converter" }, - { "converterlocal_sw:", "local converter" }, - { "converteroff_sw:", "converter" }, - { "main_sw:", "line breaker" }, - { "radio_sw:", "radio" }, - { "radiochannel_sw:", "radio channel" }, - { "radiochannelprev_sw:", "radio channel" }, - { "radiochannelnext_sw:", "radio channel" }, - { "radiotest_sw:", "radiostop test" }, - { "radiostop_sw:", "radiostop" }, - { "pantfront_sw:", "pantograph A" }, - { "pantrear_sw:", "pantograph B" }, - { "pantfrontoff_sw:", "pantograph A" }, - { "pantrearoff_sw:", "pantograph B" }, - { "pantalloff_sw:", "all pantographs" }, - { "pantselected_sw:", "selected pantograph" }, - { "pantselectedoff_sw:", "selected pantograph" }, - { "pantcompressor_sw:", "pantograph compressor" }, - { "pantcompressorvalve_sw:", "pantograph 3 way valve" }, - { "trainheating_sw:", "heating" }, - { "signalling_sw:", "braking indicator" }, - { "door_signalling_sw:", "door locking" }, - { "nextcurrent_sw:", "current indicator source" }, - { "instrumentlight_sw:", "instrument light" }, - { "cablight_sw:", "interior light" }, - { "cablightdim_sw:", "interior light dimmer" }, - { "battery_sw:", "battery" }, - { "universal0:", "generic" }, - { "universal1:", "generic" }, - { "universal2:", "generic" }, - { "universal3:", "generic" }, - { "universal4:", "generic" }, - { "universal5:", "generic" }, - { "universal6:", "generic" }, - { "universal7:", "generic" }, - { "universal8:", "generic" }, - { "universal9:", "generic" } -}; +std::unordered_map m_cabcontrols; } // namespace locale diff --git a/translation.h b/translation.h index 260e0f8f..652444bd 100644 --- a/translation.h +++ b/translation.h @@ -48,7 +48,101 @@ enum string { debug_vehicle_temperatures, debug_vehicle_brakespressures, debug_vehicle_pantograph, - debug_vehicle_forcesaccelerationvelocityposition + debug_vehicle_forcesaccelerationvelocityposition, + + cab_mainctrl, + cab_scndctrl, + cab_shuntmodepower, + cab_dirkey, + cab_brakectrl, + cab_localbrake, + cab_manualbrake, + cab_alarmchain, + cab_brakeprofile_sw, + cab_brakeprofileg_sw, + cab_brakeprofiler_sw, + cab_maxcurrent_sw, + cab_waterpump_sw, + cab_waterpumpbreaker_sw, + cab_waterheater_sw, + cab_waterheaterbreaker_sw, + cab_watercircuitslink_sw, + cab_fuelpump_sw, + cab_oilpump_sw, + cab_main_off_bt, + cab_main_on_bt, + cab_security_reset_bt, + cab_releaser_bt, + cab_sand_bt, + cab_antislip_bt, + cab_horn_bt, + cab_hornlow_bt, + cab_hornhigh_bt, + cab_whistle_bt, + cab_fuse_bt, + cab_converterfuse_bt, + cab_stlinoff_bt, + cab_door_left_sw, + cab_door_right_sw, + cab_doorlefton_sw, + cab_doorrighton_sw, + cab_doorleftoff_sw, + cab_doorrightoff_sw, + cab_dooralloff_sw, + cab_departure_signal_bt, + cab_upperlight_sw, + cab_leftlight_sw, + cab_rightlight_sw, + cab_dimheadlights_sw, + cab_leftend_sw, + cab_rightend_sw, + cab_lights_sw, + cab_rearupperlight_sw, + cab_rearleftlight_sw, + cab_rearrightlight_sw, + cab_rearleftend_sw, + cab_rearrightend_sw, + cab_compressor_sw, + cab_compressorlocal_sw, + cab_converter_sw, + cab_converterlocal_sw, + cab_converteroff_sw, + cab_main_sw, + cab_radio_sw, + cab_radiochannel_sw, + cab_radiochannelprev_sw, + cab_radiochannelnext_sw, + cab_radiotest_sw, + cab_radiostop_sw, + cab_pantfront_sw, + cab_pantrear_sw, + cab_pantfrontoff_sw, + cab_pantrearoff_sw, + cab_pantalloff_sw, + cab_pantselected_sw, + cab_pantselectedoff_sw, + cab_pantcompressor_sw, + cab_pantcompressorvalve_sw, + cab_trainheating_sw, + cab_signalling_sw, + cab_door_signalling_sw, + cab_nextcurrent_sw, + cab_instrumentlight_sw, + cab_cablight_sw, + cab_cablightdim_sw, + cab_battery_sw, + cab_universal0, + cab_universal1, + cab_universal2, + cab_universal3, + cab_universal4, + cab_universal5, + cab_universal6, + cab_universal7, + cab_universal8, + cab_universal9, + + string_count }; void diff --git a/uilayer.cpp b/uilayer.cpp index 8c0e4f28..f4e32e98 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -92,6 +92,7 @@ ui_layer::init_colors() { auto const itembase { ImVec4( accent.x, accent.y, accent.z, 0.35f ) }; auto const itemhover { ImVec4( accent.x, accent.y, accent.z, 0.65f ) }; auto const itemactive { ImVec4( accent.x, accent.y, accent.z, 0.95f ) }; + auto const modalbackground { ImVec4( accent.x, accent.y, accent.z, 0.95f ) }; colors[ ImGuiCol_WindowBg ] = background; colors[ ImGuiCol_PopupBg ] = background; @@ -111,6 +112,7 @@ ui_layer::init_colors() { colors[ ImGuiCol_ResizeGrip ] = itembase; colors[ ImGuiCol_ResizeGripHovered ] = itemhover; colors[ ImGuiCol_ResizeGripActive ] = itemactive; + colors[ ImGuiCol_ModalWindowDimBg ] = modalbackground; } void diff --git a/version.h b/version.h index 10c18563..46909a86 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 831 +#define VERSION_MINOR 904 #define VERSION_REVISION 0 From bb0e1eb3bf99177e58129ab077700eec196ad01e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 5 Sep 2018 13:49:48 +0200 Subject: [PATCH 390/426] disable interaction in pause mode, audio volume calculations tweak --- Globals.cpp | 2 +- Globals.h | 2 +- audiorenderer.cpp | 9 +- drivermode.cpp | 372 +++++++++++++++++++++------------------------- driveruilayer.cpp | 61 +++++++- driveruilayer.h | 10 ++ uilayer.cpp | 12 ++ uilayer.h | 8 + 8 files changed, 265 insertions(+), 211 deletions(-) diff --git a/Globals.cpp b/Globals.cpp index a766bd8c..2c4d8ab8 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -127,7 +127,7 @@ global_settings::ConfigParse(cParser &Parser) { // selected device for audio renderer Parser.getTokens(); Parser >> AudioVolume; - AudioVolume = clamp( AudioVolume, 1.f, 4.f ); + AudioVolume = clamp( AudioVolume, 0.0f, 2.f ); } // else if (str==AnsiString("renderalpha")) //McZapkie-1312302 - dwuprzebiegowe renderowanie // bRenderAlpha=(GetNextSymbol().LowerCase()==AnsiString("yes")); diff --git a/Globals.h b/Globals.h index 963249b4..b5b842fa 100644 --- a/Globals.h +++ b/Globals.h @@ -40,7 +40,7 @@ struct global_settings { std::string LastGLError; float ZoomFactor{ 1.f }; // determines current camera zoom level. TODO: move it to the renderer bool CabWindowOpen{ false }; // controls sound attenuation between cab and outside - bool ControlPicking{ false }; // indicates controls pick mode is active + bool ControlPicking{ true }; // indicates controls pick mode is active bool DLFont{ false }; // switch indicating presence of basic font bool bActive{ true }; // czy jest aktywnym oknem int iPause{ 0 }; // globalna pauza ruchu: b0=start,b1=klawisz,b2=tło,b3=lagi,b4=wczytywanie diff --git a/audiorenderer.cpp b/audiorenderer.cpp index a9b66e47..c02379fb 100644 --- a/audiorenderer.cpp +++ b/audiorenderer.cpp @@ -154,7 +154,7 @@ openal_source::sync_with( sound_properties const &State ) { properties.soundproofing = State.soundproofing; properties.soundproofing_stamp = State.soundproofing_stamp; - ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * Global.AudioVolume ); + ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing ); } if( sound_range > 0 ) { auto const rangesquared { sound_range * sound_range }; @@ -170,7 +170,7 @@ openal_source::sync_with( sound_properties const &State ) { clamp( ( distancesquared - rangesquared ) / ( fadedistance * fadedistance ), 0.f, 1.f ) ) }; - ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * rangefactor * Global.AudioVolume ); + ::alSourcef( id, AL_GAIN, properties.gain * properties.soundproofing * rangefactor ); } is_in_range = ( distancesquared <= rangesquared ); } @@ -283,10 +283,7 @@ openal_renderer::init() { // basic initialization failed return false; } - // -// ::alDistanceModel( AL_LINEAR_DISTANCE ); ::alDistanceModel( AL_INVERSE_DISTANCE_CLAMPED ); - ::alListenerf( AL_GAIN, clamp( Global.AudioVolume, 1.f, 4.f ) ); // all done m_ready = true; return true; @@ -319,6 +316,8 @@ void openal_renderer::update( double const Deltatime ) { // update listener + // gain + ::alListenerf( AL_GAIN, clamp( Global.AudioVolume, 0.f, 2.f ) * ( Global.iPause == 0 ? 1.f : 0.15f ) ); // orientation glm::dmat4 cameramatrix; Global.pCamera.SetMatrix( cameramatrix ); diff --git a/drivermode.cpp b/drivermode.cpp index e952a0ae..05488a7f 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -299,9 +299,7 @@ driver_mode::enter() { Timer::ResetTimers(); - Application.set_cursor( GLFW_CURSOR_DISABLED ); - Application.set_cursor_pos( 0, 0 ); - Global.ControlPicking = false; + set_picking( Global.ControlPicking ); } // maintenance method, called when the mode is deactivated @@ -351,6 +349,9 @@ driver_mode::on_key( int const Key, int const Scancode, int const Action, int co void driver_mode::on_cursor_pos( double const Horizontal, double const Vertical ) { + // give the ui first shot at the input processing... + if( true == m_userinterface->on_cursor_pos( Horizontal, Vertical ) ) { return; } + if( false == Global.ControlPicking ) { // in regular view mode keep cursor on screen Application.set_cursor_pos( 0, 0 ); @@ -362,6 +363,9 @@ driver_mode::on_cursor_pos( double const Horizontal, double const Vertical ) { void driver_mode::on_mouse_button( int const Button, int const Action, int const Mods ) { + // give the ui first shot at the input processing... + if( true == m_userinterface->on_mouse_button( Button, Action ) ) { return; } + // give the potential event recipient a shot at it, in the virtual z order m_input.mouse.button( Button, Action ); } @@ -561,8 +565,8 @@ driver_mode::OnKeyDown(int cKey) { // actual key processing // TODO: redo the input system - if( ( cKey >= GLFW_KEY_0 ) && ( cKey <= GLFW_KEY_9 ) ) // klawisze cyfrowe - { + if( ( cKey >= GLFW_KEY_0 ) && ( cKey <= GLFW_KEY_9 ) ) { + // klawisze cyfrowe int i = cKey - GLFW_KEY_0; // numer klawisza if (Global.shiftState) { // z [Shift] uruchomienie eventu @@ -600,217 +604,183 @@ driver_mode::OnKeyDown(int cKey) { } } } + return; } - else if( ( cKey >= GLFW_KEY_F1 ) && ( cKey <= GLFW_KEY_F12 ) ) - { - switch (cKey) { - case GLFW_KEY_F1: { + switch (cKey) { - if( DebugModeFlag ) { - // additional simulation clock jump keys in debug mode - if( Global.ctrlState ) { - // ctrl-f1 - simulation::Time.update( 20.0 * 60.0 ); - } - else if( Global.shiftState ) { - // shift-f1 - simulation::Time.update( 5.0 * 60.0 ); - } - } - break; - } - - case GLFW_KEY_F4: { - - InOutKey( !Global.shiftState ); // distant view with Shift, short distance step out otherwise - break; - } - case GLFW_KEY_F5: { - // przesiadka do innego pojazdu - if( false == FreeFlyModeFlag ) { - // only available in free fly mode - break; - } - - TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global.pCamera.Pos, 50, true, false ) ); - - if( tmp != nullptr ) { - - if( simulation::Train ) {// jeśli mielismy pojazd - if( simulation::Train->Dynamic()->Mechanik ) { // na skutek jakiegoś błędu może czasem zniknąć - simulation::Train->Dynamic()->Mechanik->TakeControl( true ); // oddajemy dotychczasowy AI - } - } - - if( ( true == DebugModeFlag ) - || ( tmp->MoverParameters->Vel <= 5.0 ) ) { - // works always in debug mode, or for stopped/slow moving vehicles otherwise - if( simulation::Train == nullptr ) { - simulation::Train = new TTrain(); // jeśli niczym jeszcze nie jeździlismy - } - if( simulation::Train->Init( tmp ) ) { // przejmujemy sterowanie - simulation::Train->Dynamic()->Mechanik->TakeControl( false ); - } - else { - SafeDelete( simulation::Train ); // i nie ma czym sterować - } - if( simulation::Train ) { - InOutKey(); // do kabiny - } - } - } - break; - } - case GLFW_KEY_F6: { - // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! - if( DebugModeFlag ) { - - if( Global.ctrlState ) { Global.fTimeSpeed = ( Global.shiftState ? 60.0 : 20.0 ); } - else { Global.fTimeSpeed = ( Global.shiftState ? 5.0 : 1.0 ); } - } - break; - } - case GLFW_KEY_F7: { - // debug mode functions - if( DebugModeFlag ) { - - if( Global.ctrlState - && Global.shiftState ) { - // shift + ctrl + f7 toggles between debug and regular camera - DebugCameraFlag = !DebugCameraFlag; - } - else if( Global.ctrlState ) { - // ctrl + f7 toggles static daylight - simulation::Environment.toggle_daylight(); - break; - } - else if( Global.shiftState ) { - // shift + f7 is currently unused - } - else { - // f7: wireframe toggle - // TODO: pass this to renderer instead of making direct calls - Global.bWireFrame = !Global.bWireFrame; - if( true == Global.bWireFrame ) { - glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); - } - else { - glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); - } - } - } - break; - } - case GLFW_KEY_F11: { - // editor mode - if( ( false == Global.ctrlState ) - && ( false == Global.shiftState ) ) { - Application.push_mode( eu07_application::mode::editor ); - } - break; - } - case GLFW_KEY_F12: { - // quick debug mode toggle - if( Global.ctrlState - && Global.shiftState ) { - DebugModeFlag = !DebugModeFlag; - } - break; - } - - default: { - break; - } - } - // if (cKey!=VK_F4) - return; // nie są przekazywane do pojazdu wcale - } -/* - if ((Global.iTextMode == GLFW_KEY_F12) ? (cKey >= '0') && (cKey <= '9') : false) - { // tryb konfiguracji debugmode (przestawianie kamery już wyłączone - if (!Global.shiftState) // bez [Shift] - { - if (cKey == GLFW_KEY_1) - Global.iWriteLogEnabled ^= 1; // włącz/wyłącz logowanie do pliku - else if (cKey == GLFW_KEY_2) - { // włącz/wyłącz okno konsoli - Global.iWriteLogEnabled ^= 2; - if ((Global.iWriteLogEnabled & 2) == 0) // nie było okienka - { // otwarcie okna - AllocConsole(); // jeśli konsola już jest, to zwróci błąd; uwalniać nie ma po - // co, bo się odłączy - SetConsoleTextAttribute(GetStdHandle(STD_OUTPUT_HANDLE), FOREGROUND_GREEN); - } - } - // else if (cKey=='3') Global.iWriteLogEnabled^=4; //wypisywanie nazw torów - } - } - else */ - if( cKey == GLFW_KEY_ESCAPE ) { - // toggle pause - if( Global.iPause & 1 ) { - // jeśli pauza startowa - // odpauzowanie, gdy po wczytaniu miało nie startować - Global.iPause &= ~1; - } - else if( ( Global.iMultiplayer & 2 ) == 0 ) { - // w multiplayerze pauza nie ma sensu - Global.iPause ^= 2; // zmiana stanu zapauzowania - if( ( Global.iPause & 2 ) - && ( false == Global.ControlPicking ) ) { - set_picking( true ); - } - } - } - else { - - if( ( true == DebugModeFlag ) - && ( false == Global.shiftState ) - && ( true == Global.ctrlState ) - && ( simulation::Train != nullptr ) - && ( simulation::Train->Dynamic()->Controller == Humandriver ) ) { + case GLFW_KEY_F1: { if( DebugModeFlag ) { - // przesuwanie składu o 100m - auto *vehicle { simulation::Train->Dynamic() }; - TDynamicObject *d = vehicle; - if( cKey == GLFW_KEY_LEFT_BRACKET ) { - while( d ) { - d->Move( 100.0 * d->DirectionGet() ); - d = d->Next(); // pozostałe też - } - d = vehicle->Prev(); - while( d ) { - d->Move( 100.0 * d->DirectionGet() ); - d = d->Prev(); // w drugą stronę też + // additional simulation clock jump keys in debug mode + if( Global.ctrlState ) { + // ctrl-f1 + simulation::Time.update( 20.0 * 60.0 ); + } + else if( Global.shiftState ) { + // shift-f1 + simulation::Time.update( 5.0 * 60.0 ); + } + } + break; + } + + case GLFW_KEY_F4: { + + InOutKey( !Global.shiftState ); // distant view with Shift, short distance step out otherwise + break; + } + case GLFW_KEY_F5: { + // przesiadka do innego pojazdu + if( false == FreeFlyModeFlag ) { + // only available in free fly mode + break; + } + + TDynamicObject *tmp = std::get( simulation::Region->find_vehicle( Global.pCamera.Pos, 50, true, false ) ); + + if( tmp != nullptr ) { + + if( simulation::Train ) {// jeśli mielismy pojazd + if( simulation::Train->Dynamic()->Mechanik ) { // na skutek jakiegoś błędu może czasem zniknąć + simulation::Train->Dynamic()->Mechanik->TakeControl( true ); // oddajemy dotychczasowy AI } } - else if( cKey == GLFW_KEY_RIGHT_BRACKET ) { - while( d ) { - d->Move( -100.0 * d->DirectionGet() ); - d = d->Next(); // pozostałe też + + if( ( true == DebugModeFlag ) + || ( tmp->MoverParameters->Vel <= 5.0 ) ) { + // works always in debug mode, or for stopped/slow moving vehicles otherwise + if( simulation::Train == nullptr ) { + simulation::Train = new TTrain(); // jeśli niczym jeszcze nie jeździlismy } - d = vehicle->Prev(); - while( d ) { - d->Move( -100.0 * d->DirectionGet() ); - d = d->Prev(); // w drugą stronę też + if( simulation::Train->Init( tmp ) ) { // przejmujemy sterowanie + simulation::Train->Dynamic()->Mechanik->TakeControl( false ); } - } - else if( cKey == GLFW_KEY_TAB ) { - while( d ) { - d->MoverParameters->V += d->DirectionGet()*2.78; - d = d->Next(); // pozostałe też + else { + SafeDelete( simulation::Train ); // i nie ma czym sterować } - d = vehicle->Prev(); - while( d ) { - d->MoverParameters->V += d->DirectionGet()*2.78; - d = d->Prev(); // w drugą stronę też + if( simulation::Train ) { + InOutKey(); // do kabiny } } } + break; + } + case GLFW_KEY_F6: { + // przyspieszenie symulacji do testowania scenerii... uwaga na FPS! + if( DebugModeFlag ) { + + if( Global.ctrlState ) { Global.fTimeSpeed = ( Global.shiftState ? 60.0 : 20.0 ); } + else { Global.fTimeSpeed = ( Global.shiftState ? 5.0 : 1.0 ); } + } + break; + } + case GLFW_KEY_F7: { + // debug mode functions + if( DebugModeFlag ) { + + if( Global.ctrlState + && Global.shiftState ) { + // shift + ctrl + f7 toggles between debug and regular camera + DebugCameraFlag = !DebugCameraFlag; + } + else if( Global.ctrlState ) { + // ctrl + f7 toggles static daylight + simulation::Environment.toggle_daylight(); + break; + } + else if( Global.shiftState ) { + // shift + f7 is currently unused + } + else { + // f7: wireframe toggle + // TODO: pass this to renderer instead of making direct calls + Global.bWireFrame = !Global.bWireFrame; + if( true == Global.bWireFrame ) { + glPolygonMode( GL_FRONT_AND_BACK, GL_LINE ); + } + else { + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + } + } + } + break; + } + case GLFW_KEY_F11: { + // editor mode + if( ( false == Global.ctrlState ) + && ( false == Global.shiftState ) ) { + Application.push_mode( eu07_application::mode::editor ); + } + break; + } + case GLFW_KEY_F12: { + // quick debug mode toggle + if( Global.ctrlState + && Global.shiftState ) { + DebugModeFlag = !DebugModeFlag; + } + break; + } + + case GLFW_KEY_LEFT_BRACKET: + case GLFW_KEY_RIGHT_BRACKET: + case GLFW_KEY_TAB: { + // consist movement in debug mode + if( ( true == DebugModeFlag ) + && ( false == Global.shiftState ) + && ( true == Global.ctrlState ) + && ( simulation::Train != nullptr ) + && ( simulation::Train->Dynamic()->Controller == Humandriver ) ) { + + if( DebugModeFlag ) { + // przesuwanie składu o 100m + auto *vehicle { simulation::Train->Dynamic() }; + TDynamicObject *d = vehicle; + if( cKey == GLFW_KEY_LEFT_BRACKET ) { + while( d ) { + d->Move( 100.0 * d->DirectionGet() ); + d = d->Next(); // pozostałe też + } + d = vehicle->Prev(); + while( d ) { + d->Move( 100.0 * d->DirectionGet() ); + d = d->Prev(); // w drugą stronę też + } + } + else if( cKey == GLFW_KEY_RIGHT_BRACKET ) { + while( d ) { + d->Move( -100.0 * d->DirectionGet() ); + d = d->Next(); // pozostałe też + } + d = vehicle->Prev(); + while( d ) { + d->Move( -100.0 * d->DirectionGet() ); + d = d->Prev(); // w drugą stronę też + } + } + else if( cKey == GLFW_KEY_TAB ) { + while( d ) { + d->MoverParameters->V += d->DirectionGet()*2.78; + d = d->Next(); // pozostałe też + } + d = vehicle->Prev(); + while( d ) { + d->MoverParameters->V += d->DirectionGet()*2.78; + d = d->Prev(); // w drugą stronę też + } + } + } + } + break; + } + + default: { + break; } } + + return; // nie są przekazywane do pojazdu wcale } // places camera outside the controlled vehicle, or nearest if nothing is under control diff --git a/driveruilayer.cpp b/driveruilayer.cpp index a346adef..6fd4be74 100644 --- a/driveruilayer.cpp +++ b/driveruilayer.cpp @@ -11,6 +11,7 @@ http://mozilla.org/MPL/2.0/. #include "driveruilayer.h" #include "globals.h" +#include "application.h" #include "translation.h" #include "simulation.h" #include "train.h" @@ -42,7 +43,26 @@ bool driver_ui::on_key( int const Key, int const Action ) { // TODO: pass the input first through an active ui element if there's any // if the ui element shows no interest or we don't have one, try to interpret the input yourself: - // shared conditions + + if( Key == GLFW_KEY_ESCAPE ) { + // toggle pause + if( Action != GLFW_PRESS ) { return true; } // recognized, but ignored + + if( Global.iPause & 1 ) { + // jeśli pauza startowa + // odpauzowanie, gdy po wczytaniu miało nie startować + Global.iPause ^= 1; + } + else if( ( Global.iMultiplayer & 2 ) == 0 ) { + // w multiplayerze pauza nie ma sensu + Global.iPause ^= 2; // zmiana stanu zapauzowania + } + return true; + } + + // if the pause is on ignore block other input + if( m_paused ) { return true; } + switch( Key ) { case GLFW_KEY_F1: @@ -108,10 +128,32 @@ driver_ui::on_key( int const Key, int const Action ) { return false; } +// potentially processes provided mouse movement. returns: true if the input was processed, false otherwise +bool +driver_ui::on_cursor_pos( double const Horizontal, double const Vertical ) { + // intercept mouse movement when the pause window is on + return m_paused; +} + +// potentially processes provided mouse button. returns: true if the input was processed, false otherwise +bool +driver_ui::on_mouse_button( int const Button, int const Action ) { + // intercept mouse movement when the pause window is on + return m_paused; +} + // updates state of UI elements void driver_ui::update() { + auto const pausemask { 1 | 2 }; + auto ispaused { ( Global.iPause & pausemask ) != 0 }; + if( ( ispaused != m_paused ) + && ( false == Global.ControlPicking ) ) { + set_cursor( ispaused ); + } + m_paused = ispaused; + set_tooltip( "" ); auto const *train { simulation::Train }; @@ -138,12 +180,24 @@ driver_ui::update() { ui_layer::update(); } +void +driver_ui::set_cursor( bool const Visible ) { + + if( Visible ) { + Application.set_cursor( GLFW_CURSOR_NORMAL ); + Application.set_cursor_pos( Global.iWindowWidth / 2, Global.iWindowHeight / 2 ); + } + else { + Application.set_cursor( GLFW_CURSOR_DISABLED ); + Application.set_cursor_pos( 0, 0 ); + } +} + // render() subclass details void driver_ui::render_() { - auto const pausemask { 1 | 2 }; - if( ( Global.iPause & pausemask ) != 0 ) { + if( m_paused ) { // pause/quit modal auto const popupheader { locale::strings[ locale::string::driver_pause_header ].c_str() }; ImGui::OpenPopup( popupheader ); @@ -151,6 +205,7 @@ driver_ui::render_() { auto const popupwidth{ locale::strings[ locale::string::driver_pause_header ].size() * 7 }; if( ImGui::Button( locale::strings[ locale::string::driver_pause_resume ].c_str(), ImVec2( popupwidth, 0 ) ) ) { ImGui::CloseCurrentPopup(); + auto const pausemask { 1 | 2 }; Global.iPause &= ~pausemask; } if( ImGui::Button( locale::strings[ locale::string::driver_pause_quit ].c_str(), ImVec2( popupwidth, 0 ) ) ) { diff --git a/driveruilayer.h b/driveruilayer.h index 3ef0c638..28a6d94b 100644 --- a/driveruilayer.h +++ b/driveruilayer.h @@ -21,12 +21,21 @@ public: // potentially processes provided input key. returns: true if the input was processed, false otherwise bool on_key( int const Key, int const Action ) override; + // potentially processes provided mouse movement. returns: true if the input was processed, false otherwise + bool + on_cursor_pos( double const Horizontal, double const Vertical ) override; + // potentially processes provided mouse button. returns: true if the input was processed, false otherwise + bool + on_mouse_button( int const Button, int const Action ) override; // updates state of UI elements void update() override; private: // methods + // sets visibility of the cursor + void + set_cursor( bool const Visible ); // render() subclass details void render_() override; @@ -35,5 +44,6 @@ private: timetable_panel m_timetablepanel { "Timetable", false }; debug_panel m_debugpanel { "Debug Data", false }; transcripts_panel m_transcriptspanel { "Transcripts", true }; // voice transcripts + bool m_paused { false }; }; diff --git a/uilayer.cpp b/uilayer.cpp index f4e32e98..b373afdb 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -129,6 +129,18 @@ ui_layer::on_key( int const Key, int const Action ) { return false; } +bool +ui_layer::on_cursor_pos( double const Horizontal, double const Vertical ) { + + return false; +} + +bool +ui_layer::on_mouse_button( int const Button, int const Action ) { + + return false; +} + void ui_layer::update() { diff --git a/uilayer.h b/uilayer.h index d22461b8..4bed2010 100644 --- a/uilayer.h +++ b/uilayer.h @@ -69,6 +69,14 @@ public: virtual bool on_key( int const Key, int const Action ); + // potentially processes provided mouse movement. returns: true if the input was processed, false otherwise + virtual + bool + on_cursor_pos( double const Horizontal, double const Vertical ); + // potentially processes provided mouse button. returns: true if the input was processed, false otherwise + virtual + bool + on_mouse_button( int const Button, int const Action ); // updates state of UI elements virtual void From 8f1292118b9ea1ae6dfc5cbbffe08b49ec76c355 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 6 Sep 2018 20:24:59 +0200 Subject: [PATCH 391/426] ai disconnect logic fix, non modal debug mode pause, minor render code reverts to track down potential crash source --- Driver.cpp | 21 ++++++++++----------- driveruilayer.cpp | 2 +- renderer.cpp | 24 ++++++++++++++++++++---- renderer.h | 2 +- translation.cpp | 2 +- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 22bfede6..d13f553b 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -996,7 +996,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } } - if (OrderCurrentGet() == Shunt) { + if (OrderCurrentGet() & Shunt) { OrderNext(Obey_train); // uruchomić jazdę pociągową CheckVehicles(); // zmienić światła } @@ -1060,12 +1060,11 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN sSpeedTable[i].iFlags = 0; // W4 nie liczy się już (nie wyśle SetVelocity) sSpeedTable[i].fVelNext = -1; // można jechać za W4 fLastStopExpDist = -1.0f; // nie ma rozkładu, nie ma usuwania stacji -/* - // NOTE: disabled as it's no longer needed, required time is calculated as part of loading/unloading procedure - WaitingSet(60); // tak ze 2 minuty, aż wszyscy wysiądą -*/ // wykonanie kolejnego rozkazu (Change_direction albo Shunt) - JumpToNextOrder(); + // FIX: don't automatically advance if there's disconnect procedure in progress + if( false == TestFlag( OrderCurrentGet(), Disconnect ) ) { + JumpToNextOrder(); + } // ma się nie ruszać aż do momentu podania sygnału iDrivigFlags |= moveStopHere | moveStartHorn; continue; // nie analizować prędkości @@ -2061,7 +2060,7 @@ bool TController::CheckVehicles(TOrders user) } if (AIControllFlag) { // jeśli prowadzi komputer - if (OrderCurrentGet() == Obey_train) { + if( true == TestFlag( OrderCurrentGet(), Obey_train ) ) { // jeśli jazda pociągowa // światła pociągowe (Pc1) i końcówki (Pc5) auto const frontlights { ( @@ -2098,7 +2097,7 @@ bool TController::CheckVehicles(TOrders user) light::headlight_right ); //światła manewrowe (Tb1) na pojeździe z napędem } } - else if( OrderCurrentGet() == Disconnect ) { + else if( true == TestFlag( OrderCurrentGet(), Disconnect ) ) { if( mvOccupied->ActiveDir > 0 ) { // jak ma kierunek do przodu // światła manewrowe (Tb1) tylko z przodu, aby nie pozostawić odczepionego ze światłem @@ -3666,7 +3665,7 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N // set consist lights pattern hints m_lighthints[ side::front ] = static_cast( NewValue1 ); m_lighthints[ side::rear ] = static_cast( NewValue2 ); - if( OrderCurrentGet() == Obey_train ) { + if( true == TestFlag( OrderCurrentGet(), Obey_train ) ) { // light hints only apply in the obey_train mode CheckVehicles(); } @@ -4296,7 +4295,7 @@ TController::UpdateSituation(double dt) { IncSpeed(); // dla (Ready)==false nie ruszy } } - if ((mvOccupied->Vel == 0.0) && !(iDrivigFlags & movePress)) + if ((mvOccupied->Vel < 0.01) && !(iDrivigFlags & movePress)) { // 2. faza odczepiania: zmień kierunek na przeciwny i dociśnij // za radą yB ustawiamy pozycję 3 kranu (ruszanie kranem w innych miejscach // powino zostać wyłączone) @@ -4333,7 +4332,7 @@ TController::UpdateSituation(double dt) { } } else { - if( mvOccupied->Vel > 0.0 ) { + if( mvOccupied->Vel > 0.01 ) { // 1st phase(?) // bring it to stop if it's not already stopped SetVelocity( 0, 0, stopJoin ); // wyłączyć przyspieszanie diff --git a/driveruilayer.cpp b/driveruilayer.cpp index 6fd4be74..8fd4aa1a 100644 --- a/driveruilayer.cpp +++ b/driveruilayer.cpp @@ -147,7 +147,7 @@ void driver_ui::update() { auto const pausemask { 1 | 2 }; - auto ispaused { ( Global.iPause & pausemask ) != 0 }; + auto ispaused { ( false == DebugModeFlag ) && ( ( Global.iPause & pausemask ) != 0 ) }; if( ( ispaused != m_paused ) && ( false == Global.ControlPicking ) ) { set_cursor( ispaused ); diff --git a/renderer.cpp b/renderer.cpp index ca5bb328..3a508f7f 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1528,8 +1528,8 @@ opengl_renderer::Render( world_environment *Environment ) { if( Environment->m_clouds.mdCloud ) { // setup Disable_Lights(); - ::glEnable( GL_LIGHT0 ); // other lights will be enabled during lights update ::glEnable( GL_LIGHTING ); + ::glEnable( GL_LIGHT0 ); // other lights will be enabled during lights update ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( @@ -1538,7 +1538,7 @@ opengl_renderer::Render( world_environment *Environment ) { * 0.5f // arbitrary adjustment factor ) ); // render -// Render( Environment->m_clouds.mdCloud, nullptr, 100.0 ); + Render( Environment->m_clouds.mdCloud, nullptr, 100.0 ); Render_Alpha( Environment->m_clouds.mdCloud, nullptr, 100.0 ); // post-render cleanup ::glLightModelfv( GL_LIGHT_MODEL_AMBIENT, glm::value_ptr( colors::none ) ); @@ -3518,7 +3518,7 @@ opengl_renderer::Update_Mouse_Position() { void opengl_renderer::Update( double const Deltatime ) { - +/* m_pickupdateaccumulator += Deltatime; if( m_updateaccumulator > 0.5 ) { @@ -3542,7 +3542,7 @@ opengl_renderer::Update( double const Deltatime ) { m_picksceneryitem = nullptr; } } - +*/ m_updateaccumulator += Deltatime; if( m_updateaccumulator < 1.0 ) { @@ -3595,6 +3595,22 @@ opengl_renderer::Update( double const Deltatime ) { m_debugtimestext += m_textures.info(); } + if( ( true == Global.ControlPicking ) + && ( false == FreeFlyModeFlag ) ) { + Update_Pick_Control(); + } + else { + m_pickcontrolitem = nullptr; + } + // temporary conditions for testing. eventually will be coupled with editor mode + if( ( true == Global.ControlPicking ) + && ( true == DebugModeFlag ) + && ( true == FreeFlyModeFlag ) ) { + Update_Pick_Node(); + } + else { + m_picksceneryitem = nullptr; + } // dump last opengl error, if any auto const glerror = ::glGetError(); if( glerror != GL_NO_ERROR ) { diff --git a/renderer.h b/renderer.h index 1b04ddc9..b9ac02a9 100644 --- a/renderer.h +++ b/renderer.h @@ -375,7 +375,7 @@ private: unsigned int m_framestamp; // id of currently rendered gfx frame float m_framerate; double m_updateaccumulator { 0.0 }; - double m_pickupdateaccumulator { 0.0 }; +// double m_pickupdateaccumulator { 0.0 }; std::string m_debugtimestext; std::string m_pickdebuginfo; debug_stats m_debugstats; diff --git a/translation.cpp b/translation.cpp index e8fe4cd8..5ba5aa81 100644 --- a/translation.cpp +++ b/translation.cpp @@ -204,7 +204,7 @@ init() { "nastawa hamulca", "nastawa hamulca: towarowy", "nastawa hamulca: pospieszny", - "rozruch niski/wysoki", + "zakres pradu rozruchu", "pompa wody", "wylacznik samoczynny pompy wody", "podgrzewacz wody", From 3b00005857db4b6bfacedac81fb818611fc7e222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Mr=C3=B3z?= Date: Mon, 18 Jun 2018 23:30:19 +0200 Subject: [PATCH 392/426] FS#124 Added sound entry for engine shutdown event. --- DynObj.cpp | 10 ++++++++-- DynObj.h | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index a3186f51..a8c21ae8 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -5658,6 +5658,9 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // odpalanie silnika m_powertrainsounds.engine_ignition.deserialize( parser, sound_type::single ); m_powertrainsounds.engine_ignition.owner( this ); + } else if (token == "shutdown:") { + m_powertrainsounds.engine_shutdown.deserialize(parser, sound_type::single); + m_powertrainsounds.engine_shutdown.owner(this); } else if( token == "engageslippery:" ) { // tarcie tarcz sprzegla: @@ -6371,7 +6374,7 @@ TDynamicObject::powertrain_sounds::position( glm::vec3 const Location ) { std::vector enginesounds = { &inverter, &motor_relay, &dsbWejscie_na_bezoporow, &motor_parallel, &motor_shuntfield, &rsWentylator, - &engine, &engine_ignition, &engine_revving, &engine_turbo, &oil_pump, &radiator_fan, &radiator_fan_aux, + &engine, &engine_ignition, &engine_shutdown, &engine_revving, &engine_turbo, &oil_pump, &radiator_fan, &radiator_fan_aux, &transmission, &rsEngageSlippery }; for( auto sound : enginesounds ) { @@ -6406,7 +6409,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( true == Vehicle.Mains ) { // TODO: separate engine and main circuit - // engine activation + engine_shutdown.stop(); engine_ignition .pitch( engine_ignition.m_frequencyoffset + engine_ignition.m_frequencyfactor * 1.f ) .gain( engine_ignition.m_amplitudeoffset + engine_ignition.m_amplitudefactor * 1.f ) @@ -6420,6 +6423,9 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub else { // engine deactivation engine_ignition.stop(); + engine_shutdown.pitch( engine_shutdown.m_frequencyoffset + engine_shutdown.m_frequencyfactor * 1.f ) + .gain( engine_shutdown.m_amplitudeoffset + engine_shutdown.m_amplitudefactor * 1.f ) + .play( sound_flags::exclusive ); // main circuit linebreaker_open .pitch( linebreaker_open.m_frequencyoffset + linebreaker_open.m_frequencyfactor * 1.f ) diff --git a/DynObj.h b/DynObj.h index 3a99b2f6..6589cd10 100644 --- a/DynObj.h +++ b/DynObj.h @@ -338,6 +338,7 @@ private: sound_source rsWentylator { sound_placement::engine }; // McZapkie-030302 sound_source engine { sound_placement::engine }; // generally diesel engine sound_source engine_ignition { sound_placement::engine }; // moved from cab + sound_source engine_shutdown { sound_placement::engine }; bool engine_state_last { false }; // helper, cached previous state of the engine double engine_volume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal sound_source engine_revving { sound_placement::engine }; // youBy From e4789db1d5b189b9a28fdf2fc85c83612f3cd166 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 7 Sep 2018 16:24:05 +0200 Subject: [PATCH 393/426] maintenance: minor code cleanup --- DynObj.cpp | 3 ++- Model3d.cpp | 24 ++++++++---------------- driveruilayer.cpp | 6 +++--- driveruipanels.cpp | 10 +++++----- driveruipanels.h | 8 ++++---- editoruipanels.cpp | 7 ++++++- editoruipanels.h | 2 +- messaging.cpp | 28 +++++++++++++++------------- scene.cpp | 5 +++-- uilayer.cpp | 12 ++++++------ uilayer.h | 6 +++--- utilities.cpp | 28 +++++++++++++--------------- utilities.h | 20 ++++++++++---------- 13 files changed, 79 insertions(+), 80 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index a8c21ae8..6c799cbc 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -6409,6 +6409,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub if( true == Vehicle.Mains ) { // TODO: separate engine and main circuit + // engine activation engine_shutdown.stop(); engine_ignition .pitch( engine_ignition.m_frequencyoffset + engine_ignition.m_frequencyfactor * 1.f ) @@ -6426,7 +6427,7 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub engine_shutdown.pitch( engine_shutdown.m_frequencyoffset + engine_shutdown.m_frequencyfactor * 1.f ) .gain( engine_shutdown.m_amplitudeoffset + engine_shutdown.m_amplitudefactor * 1.f ) .play( sound_flags::exclusive ); - // main circuit + // main circuit deactivation linebreaker_open .pitch( linebreaker_open.m_frequencyoffset + linebreaker_open.m_frequencyfactor * 1.f ) .gain( linebreaker_open.m_amplitudeoffset + linebreaker_open.m_amplitudefactor * 1.f ) diff --git a/Model3d.cpp b/Model3d.cpp index 2631d0f4..08eb2292 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1314,14 +1314,10 @@ void TSubModel::serialize(std::ostream &s, sn_utils::ls_float32(s, fVisible); sn_utils::ls_float32(s, fLight); - for (size_t i = 0; i < 4; i++) - sn_utils::ls_float32(s, f4Ambient[i]); - for (size_t i = 0; i < 4; i++) - sn_utils::ls_float32(s, f4Diffuse[i]); - for (size_t i = 0; i < 4; i++) - sn_utils::ls_float32(s, f4Specular[i]); - for (size_t i = 0; i < 4; i++) - sn_utils::ls_float32(s, f4Emision[i]); + sn_utils::s_vec4(s, f4Ambient); + sn_utils::s_vec4(s, f4Diffuse); + sn_utils::s_vec4(s, f4Specular); + sn_utils::s_vec4(s, f4Emision); sn_utils::ls_float32(s, fWireSize); sn_utils::ls_float32(s, fSquareMaxDist); @@ -1438,14 +1434,10 @@ void TSubModel::deserialize(std::istream &s) fVisible = sn_utils::ld_float32(s); fLight = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; ++i) - f4Ambient[i] = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; ++i) - f4Diffuse[i] = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; ++i) - f4Specular[i] = sn_utils::ld_float32(s); - for (size_t i = 0; i < 4; ++i) - f4Emision[i] = sn_utils::ld_float32(s); + f4Ambient = sn_utils::d_vec4(s); + f4Diffuse = sn_utils::d_vec4(s); + f4Specular = sn_utils::d_vec4(s); + f4Emision = sn_utils::d_vec4(s); fWireSize = sn_utils::ld_float32(s); fSquareMaxDist = sn_utils::ld_float32(s); diff --git a/driveruilayer.cpp b/driveruilayer.cpp index 8fd4aa1a..8433d709 100644 --- a/driveruilayer.cpp +++ b/driveruilayer.cpp @@ -27,13 +27,13 @@ driver_ui::driver_ui() { push_back( &m_debugpanel ); push_back( &m_transcriptspanel ); - m_aidpanel.name = locale::strings[ locale::string::driver_aid_header ]; + m_aidpanel.title = locale::strings[ locale::string::driver_aid_header ]; - m_timetablepanel.name = locale::strings[ locale::string::driver_timetable_header ]; + m_timetablepanel.title = locale::strings[ locale::string::driver_timetable_header ]; m_timetablepanel.size_min = { 435, 110 }; m_timetablepanel.size_max = { 435, Global.iWindowHeight * 0.95 }; - m_transcriptspanel.name = locale::strings[ locale::string::driver_transcripts_header ]; + m_transcriptspanel.title = locale::strings[ locale::string::driver_transcripts_header ]; m_transcriptspanel.size_min = { 435, 85 }; m_transcriptspanel.size_max = { Global.iWindowWidth * 0.95, Global.iWindowHeight * 0.95 }; } diff --git a/driveruipanels.cpp b/driveruipanels.cpp index a26b9178..315cb07c 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -343,7 +343,7 @@ debug_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); } - if( true == ImGui::Begin( identifier.c_str(), &is_open, flags ) ) { + if( true == ImGui::Begin( name.c_str(), &is_open, flags ) ) { // header section for( auto const &line : text_lines ) { ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); @@ -929,10 +929,10 @@ transcripts_panel::render() { ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); } auto const panelname { ( - name.empty() ? - identifier : - name ) - + "###" + identifier }; + title.empty() ? + name : + title ) + + "###" + name }; if( true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { // header section for( auto const &line : text_lines ) { diff --git a/driveruipanels.h b/driveruipanels.h index 8f6e402c..abd09a3f 100644 --- a/driveruipanels.h +++ b/driveruipanels.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. class drivingaid_panel : public ui_panel { public: - drivingaid_panel( std::string const Name, bool const Isopen ) + drivingaid_panel( std::string const &Name, bool const Isopen ) : ui_panel( Name, Isopen ) {} @@ -31,7 +31,7 @@ private: class timetable_panel : public ui_panel { public: - timetable_panel( std::string const Name, bool const Isopen ) + timetable_panel( std::string const &Name, bool const Isopen ) : ui_panel( Name, Isopen ) {} void update() override; @@ -46,7 +46,7 @@ private: class debug_panel : public ui_panel { public: - debug_panel( std::string const Name, bool const Isopen ) + debug_panel( std::string const &Name, bool const Isopen ) : ui_panel( Name, Isopen ) {} void update() override; @@ -97,7 +97,7 @@ private: class transcripts_panel : public ui_panel { public: - transcripts_panel( std::string const Name, bool const Isopen ) + transcripts_panel( std::string const &Name, bool const Isopen ) : ui_panel( Name, Isopen ) {} void update() override; diff --git a/editoruipanels.cpp b/editoruipanels.cpp index 1facdf69..dd544e4d 100644 --- a/editoruipanels.cpp +++ b/editoruipanels.cpp @@ -186,7 +186,12 @@ itemproperties_panel::render() { if( size_min.x > 0 ) { ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); } - if( true == ImGui::Begin( identifier.c_str(), nullptr, flags ) ) { + auto const panelname { ( + title.empty() ? + name : + title ) + + "###" + name }; + if( true == ImGui::Begin( panelname.c_str(), nullptr, flags ) ) { // header section for( auto const &line : text_lines ) { ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); diff --git a/editoruipanels.h b/editoruipanels.h index 2023aec1..7664d4be 100644 --- a/editoruipanels.h +++ b/editoruipanels.h @@ -15,7 +15,7 @@ http://mozilla.org/MPL/2.0/. class itemproperties_panel : public ui_panel { public: - itemproperties_panel( std::string const Name, bool const Isopen ) + itemproperties_panel( std::string const &Name, bool const Isopen ) : ui_panel( Name, Isopen ) {} diff --git a/messaging.cpp b/messaging.cpp index 57ef9977..3e7776fe 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -29,6 +29,8 @@ extern "C" namespace multiplayer { +std::uint32_t const EU07_MESSAGEHEADER { MAKE_ID4( 'E','U','0','7' ) }; + void Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) { #ifdef _WIN32 @@ -43,7 +45,7 @@ Navigate(std::string const &ClassName, UINT Msg, WPARAM wParam, LPARAM lParam) { void OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) { // odebranie komunikatu z serwera - if (pRozkaz->iSygn == MAKE_ID4('E','U','0','7') ) + if (pRozkaz->iSygn == EU07_MESSAGEHEADER ) switch (pRozkaz->iComm) { case 0: // odesłanie identyfikatora wersji @@ -204,7 +206,7 @@ WyslijEvent(const std::string &e, const std::string &d) { // Ra: jeszcze do wyczyszczenia #ifdef _WIN32 DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iSygn = EU07_MESSAGEHEADER; r.iComm = 2; // 2 - event size_t i = e.length(), j = d.length(); r.cString[0] = char(i); @@ -212,7 +214,7 @@ WyslijEvent(const std::string &e, const std::string &d) r.cString[i + 2] = char(j); // licznik po zerze kończącym strcpy(r.cString + 3 + i, d.c_str()); // zakończony zerem COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.dwData = EU07_MESSAGEHEADER; // sygnatura cData.cbData = (DWORD)(12 + i + j); // 8+dwa liczniki i dwa zera kończące cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); @@ -225,14 +227,14 @@ WyslijUszkodzenia(const std::string &t, char fl) { // wysłanie informacji w postaci pojedynczego tekstu #ifdef _WIN32 DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iSygn = EU07_MESSAGEHEADER; r.iComm = 13; // numer komunikatu size_t i = t.length(); r.cString[0] = char(fl); r.cString[1] = char(i); strcpy(r.cString + 2, t.c_str()); // z zerem kończącym COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.dwData = EU07_MESSAGEHEADER; // sygnatura cData.cbData = (DWORD)(11 + i); // 8+licznik i zero kończące cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); @@ -245,13 +247,13 @@ WyslijString(const std::string &t, int n) { // wysłanie informacji w postaci pojedynczego tekstu #ifdef _WIN32 DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iSygn = EU07_MESSAGEHEADER; r.iComm = n; // numer komunikatu size_t i = t.length(); r.cString[0] = char(i); strcpy(r.cString + 1, t.c_str()); // z zerem kończącym COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.dwData = EU07_MESSAGEHEADER; // sygnatura cData.cbData = (DWORD)(10 + i); // 8+licznik i zero kończące cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); @@ -271,7 +273,7 @@ WyslijNamiary(TDynamicObject const *Vehicle) #ifdef _WIN32 // WriteLog("Wysylam pojazd"); DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iSygn = EU07_MESSAGEHEADER; r.iComm = 7; // 7 - dane pojazdu int i = 32; size_t j = Vehicle->asName.length(); @@ -334,7 +336,7 @@ WyslijNamiary(TDynamicObject const *Vehicle) r.cString[i] = char(j); // na końcu nazwa, żeby jakoś zidentyfikować strcpy(r.cString + i + 1, Vehicle->asName.c_str()); // zakończony zerem COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.dwData = EU07_MESSAGEHEADER; // sygnatura cData.cbData = (DWORD)(10 + i + j); // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); @@ -349,7 +351,7 @@ WyslijObsadzone() { // wysłanie informacji o pojeździe #ifdef _WIN32 DaneRozkaz2 r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iSygn = EU07_MESSAGEHEADER; r.iComm = 12; // kod 12 for (int i=0; i<1984; ++i) r.cString[i] = 0; @@ -383,7 +385,7 @@ WyslijObsadzone() } COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.dwData = EU07_MESSAGEHEADER; // sygnatura cData.cbData = 8 + 1984; // 8+licznik i zero kończące cData.lpData = &r; // WriteLog("Ramka gotowa"); @@ -397,7 +399,7 @@ WyslijParam(int nr, int fl) { // wysłanie parametrów symulacji w ramce (nr) z flagami (fl) #ifdef _WIN32 DaneRozkaz r; - r.iSygn = MAKE_ID4( 'E', 'U', '0', '7' ); + r.iSygn = EU07_MESSAGEHEADER; r.iComm = nr; // zwykle 5 r.iPar[0] = fl; // flagi istotności kolejnych parametrów int i = 0; // domyślnie brak danych @@ -410,7 +412,7 @@ WyslijParam(int nr, int fl) break; } COPYDATASTRUCT cData; - cData.dwData = MAKE_ID4( 'E', 'U', '0', '7' ); // sygnatura + cData.dwData = EU07_MESSAGEHEADER; // sygnatura cData.cbData = 12 + i; // 12+rozmiar danych cData.lpData = &r; Navigate( "TEU07SRK", WM_COPYDATA, (WPARAM)glfwGetWin32Window( Application.window() ), (LPARAM)&cData ); diff --git a/scene.cpp b/scene.cpp index 738dbb1c..82022b1b 100644 --- a/scene.cpp +++ b/scene.cpp @@ -24,6 +24,7 @@ http://mozilla.org/MPL/2.0/. namespace scene { std::string const EU07_FILEEXTENSION_REGION { ".sbt" }; +std::uint32_t const EU07_FILEHEADER { MAKE_ID4( 'E','U','0','7' ) }; std::uint32_t const EU07_FILEVERSION_REGION { MAKE_ID4( 'S', 'B', 'T', 1 ) }; // potentially activates event handler with the same name as provided node, and within handler activation range @@ -1002,7 +1003,7 @@ basic_region::serialize( std::string const &Scenariofile ) const { // region file version 1 // header: EU07SBT + version (0-255) - sn_utils::ls_uint32( output, MAKE_ID4( 'E', 'U', '0', '7' ) ); + sn_utils::ls_uint32( output, EU07_FILEHEADER ); sn_utils::ls_uint32( output, EU07_FILEVERSION_REGION ); // sections // TBD, TODO: build table of sections and file offsets, if we postpone section loading until they're within range @@ -1047,7 +1048,7 @@ basic_region::deserialize( std::string const &Scenariofile ) { uint32_t headermain { sn_utils::ld_uint32( input ) }; uint32_t headertype { sn_utils::ld_uint32( input ) }; - if( ( headermain != MAKE_ID4( 'E', 'U', '0', '7' ) + if( ( headermain != EU07_FILEHEADER || ( headertype != EU07_FILEVERSION_REGION ) ) ) { // wrong file type WriteLog( "Bad file: \"" + filename + "\" is of either unrecognized type or version" ); diff --git a/uilayer.cpp b/uilayer.cpp index b373afdb..b7d26251 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -27,8 +27,8 @@ GLint ui_layer::m_textureunit { GL_TEXTURE0 }; bool ui_layer::m_cursorvisible { true }; -ui_panel::ui_panel( std::string const Identifier, bool const Isopen ) - : identifier( Identifier ), is_open( Isopen ) +ui_panel::ui_panel( std::string const &Identifier, bool const Isopen ) + : name( Identifier ), is_open( Isopen ) {} void @@ -49,10 +49,10 @@ ui_panel::render() { ImGui::SetNextWindowSizeConstraints( ImVec2( size_min.x, size_min.y ), ImVec2( size_max.x, size_max.y ) ); } auto const panelname { ( - name.empty() ? - identifier : - name ) - + "###" + identifier }; + title.empty() ? + name : + title ) + + "###" + name }; if( true == ImGui::Begin( panelname.c_str(), &is_open, flags ) ) { for( auto const &line : text_lines ) { ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); diff --git a/uilayer.h b/uilayer.h index 4bed2010..156d8b8d 100644 --- a/uilayer.h +++ b/uilayer.h @@ -18,7 +18,7 @@ class ui_panel { public: // constructor - ui_panel( std::string const Identifier, bool const Isopen ); + ui_panel( std::string const &Identifier, bool const Isopen ); // methods virtual void update() {}; virtual void render(); @@ -34,7 +34,7 @@ public: {} }; // members - std::string name; + std::string title; bool is_open; glm::ivec2 size { -1, -1 }; glm::ivec2 size_min { -1, -1 }; @@ -43,7 +43,7 @@ public: protected: // members - std::string identifier; + std::string name; }; class ui_layer { diff --git a/utilities.cpp b/utilities.cpp index 7b8a17c3..08ed4463 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -64,13 +64,11 @@ std::string Now() { // na dłuższą metę trzeba uwzględnić datę, jakby opóżnienia miały przekraczać 12h (towarowych) double CompareTime(double t1h, double t1m, double t2h, double t2m) { - double t; - if ((t2h < 0)) return 0; else { - t = (t2h - t1h) * 60 + t2m - t1m; // jeśli t2=00:05, a t1=23:50, to różnica wyjdzie ujemna + auto t = (t2h - t1h) * 60 + t2m - t1m; // jeśli t2=00:05, a t1=23:50, to różnica wyjdzie ujemna if ((t < -720)) // jeśli różnica przekracza 12h na minus t = t + 1440; // to dodanie doby minut;else if ((t > 720)) // jeśli przekracza 12h na plus @@ -188,49 +186,49 @@ std::vector Split(const std::string &s) return elems; } -std::string to_string(int _Val) +std::string to_string(int Value) { std::ostringstream o; - o << _Val; + o << Value; return o.str(); }; -std::string to_string(unsigned int _Val) +std::string to_string(unsigned int Value) { std::ostringstream o; - o << _Val; + o << Value; return o.str(); }; -std::string to_string(double _Val) +std::string to_string(double Value) { std::ostringstream o; - o << _Val; + o << Value; return o.str(); }; -std::string to_string(int _Val, int precision) +std::string to_string(int Value, int precision) { std::ostringstream o; o << std::fixed << std::setprecision(precision); - o << _Val; + o << Value; return o.str(); }; -std::string to_string(double _Val, int precision) +std::string to_string(double Value, int precision) { std::ostringstream o; o << std::fixed << std::setprecision(precision); - o << _Val; + o << Value; return o.str(); }; -std::string to_string(int _Val, int precision, int width) +std::string to_string(int Value, int precision, int width) { std::ostringstream o; o.width(width); o << std::fixed << std::setprecision(precision); - o << _Val; + o << Value; return o.str(); }; diff --git a/utilities.h b/utilities.h index 2b447f39..b92f0290 100644 --- a/utilities.h +++ b/utilities.h @@ -98,18 +98,18 @@ std::vector &Split(const std::string &s, char delim, std::vector Split(const std::string &s, char delim); //std::vector Split(const std::string &s); -std::string to_string(int _Val); -std::string to_string(unsigned int _Val); -std::string to_string(int _Val, int precision); -std::string to_string(int _Val, int precision, int width); -std::string to_string(double _Val); -std::string to_string(double _Val, int precision); -std::string to_string(double _Val, int precision, int width); -std::string to_hex_str( int const _Val, int const width = 4 ); +std::string to_string(int Value); +std::string to_string(unsigned int Value); +std::string to_string(int Value, int precision); +std::string to_string(int Value, int precision, int width); +std::string to_string(double Value); +std::string to_string(double Value, int precision); +std::string to_string(double Value, int precision, int width); +std::string to_hex_str( int const Value, int const width = 4 ); -inline std::string to_string(bool _Val) { +inline std::string to_string(bool Value) { - return _Val == true ? "true" : "false"; + return ( Value == true ? "true" : "false" ); } template From 397628242c9c60cdde6dce23e7a80051a8e4bf88 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 8 Sep 2018 19:55:13 +0200 Subject: [PATCH 394/426] external cargo included in the vehicle load visualization system, cargo model offset parameter --- DynObj.cpp | 122 +++++++++++++++++++++++++++++---------------- DynObj.h | 11 ++-- McZapkie/MOVER.h | 1 + McZapkie/Mover.cpp | 18 +++---- Model3d.cpp | 2 +- Model3d.h | 2 +- renderer.cpp | 4 +- 7 files changed, 100 insertions(+), 60 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 6c799cbc..7e6a5b6e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -621,26 +621,26 @@ TDynamicObject::toggle_lights() { if( true == SectionLightsActive ) { // switch all lights off - for( auto §ionlight : SectionLightLevels ) { - sectionlight.level = 0.0f; + for( auto §ion : Sections ) { + section.light_level = 0.0f; } SectionLightsActive = false; } else { // set lights with probability depending on the compartment type. TODO: expose this in .mmd file - for( auto §ionlight : SectionLightLevels ) { + for( auto §ion : Sections ) { - std::string const &compartmentname = sectionlight.compartment->pName; - if( ( compartmentname.find( "corridor" ) == 0 ) - || ( compartmentname.find( "korytarz" ) == 0 ) ) { + auto const sectionname { section.compartment->pName }; + if( ( sectionname.find( "corridor" ) == 0 ) + || ( sectionname.find( "korytarz" ) == 0 ) ) { // corridors are lit 100% of time - sectionlight.level = 0.75f; + section.light_level = 0.75f; } else if( - ( compartmentname.find( "compartment" ) == 0 ) - || ( compartmentname.find( "przedzial" ) == 0 ) ) { + ( sectionname.find( "compartment" ) == 0 ) + || ( sectionname.find( "przedzial" ) == 0 ) ) { // compartments are lit with 75% probability - sectionlight.level = ( Random() < 0.75 ? 0.75f : 0.15f ); + section.light_level = ( Random() < 0.75 ? 0.75f : 0.15f ); } } SectionLightsActive = true; @@ -1024,10 +1024,10 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist) // else btHeadSignals23.TurnOff(); } // interior light levels - for( auto const §ion : SectionLightLevels ) { - section.compartment->SetLightLevel( section.level, true ); + for( auto const §ion : Sections ) { + section.compartment->SetLightLevel( section.light_level, true ); if( section.load != nullptr ) { - section.load->SetLightLevel( section.level, true ); + section.load->SetLightLevel( section.light_level, true ); } } // load chunks visibility @@ -2161,35 +2161,21 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // check the low poly interior for potential compartments of interest, ie ones which can be individually lit // TODO: definition of relevant compartments in the .mmd file TSubModel *submodel { nullptr }; - if( ( submodel = mdLowPolyInt->GetFromName( "cab1" ) ) != nullptr ) { SectionLightLevels.push_back( { submodel, nullptr, 0.0f } ); } - if( ( submodel = mdLowPolyInt->GetFromName( "cab2" ) ) != nullptr ) { SectionLightLevels.push_back( { submodel, nullptr, 0.0f } ); } - if( ( submodel = mdLowPolyInt->GetFromName( "cab0" ) ) != nullptr ) { SectionLightLevels.push_back( { submodel, nullptr, 0.0f } ); } + if( ( submodel = mdLowPolyInt->GetFromName( "cab1" ) ) != nullptr ) { Sections.push_back( { submodel, nullptr, 0.0f } ); } + if( ( submodel = mdLowPolyInt->GetFromName( "cab2" ) ) != nullptr ) { Sections.push_back( { submodel, nullptr, 0.0f } ); } + if( ( submodel = mdLowPolyInt->GetFromName( "cab0" ) ) != nullptr ) { Sections.push_back( { submodel, nullptr, 0.0f } ); } // passenger car compartments std::vector nameprefixes = { "corridor", "korytarz", "compartment", "przedzial" }; - int compartmentindex; - std::string compartmentname; for( auto const &nameprefix : nameprefixes ) { - compartmentindex = 0; - do { - compartmentname = - nameprefix + ( - compartmentindex < 10 ? - "0" + std::to_string( compartmentindex ) : - std::to_string( compartmentindex ) ); - submodel = mdLowPolyInt->GetFromName( compartmentname ); - if( submodel != nullptr ) { - SectionLightLevels.push_back( { - submodel, - nullptr, // pointers to load sections are generated afterwards - 0.0f } ); - } - ++compartmentindex; - } while( ( submodel != nullptr ) - || ( compartmentindex < 2 ) ); // chain can start from prefix00 or prefix01 + init_sections( mdLowPolyInt, nameprefix ); } - update_load_sections(); - update_load_visibility(); } + // 'external_load' is an optional special section in the main model, pointing to submodel of external load + if( mdModel ) { + init_sections( mdModel, "external_load" ); + } + update_load_sections(); + update_load_visibility(); // wyszukiwanie zderzakow if( mdModel ) { // jeśli ma w czym szukać @@ -2277,6 +2263,35 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" return MoverParameters->Dim.L; } +int +TDynamicObject::init_sections( TModel3d const *Model, std::string const &Nameprefix ) { + + std::string sectionname; + auto sectioncount = 0; + auto sectionindex = 0; + TSubModel *sectionsubmodel { nullptr }; + + do { + sectionname = + Nameprefix + ( + sectionindex < 10 ? + "0" + std::to_string( sectionindex ) : + std::to_string( sectionindex ) ); + sectionsubmodel = Model->GetFromName( sectionname ); + if( sectionsubmodel != nullptr ) { + Sections.push_back( { + sectionsubmodel, + nullptr, // pointers to load sections are generated afterwards + 0.0f } ); + ++sectioncount; + } + ++sectionindex; + } while( ( sectionsubmodel != nullptr ) + || ( sectionindex < 2 ) ); // chain can start from prefix00 or prefix01 + + return sectioncount; +} + void TDynamicObject::create_controller( std::string const Type, bool const Trainset ) { @@ -2580,6 +2595,9 @@ void TDynamicObject::LoadExchange( int const Disembark, int const Embark, int co // update state of load exchange operation void TDynamicObject::update_exchange( double const Deltatime ) { + // TODO: move offset calculation after initial check, when the loading system is all unified + update_load_offset(); + if( ( m_exchange.unload_count < 0.01 ) && ( m_exchange.load_count < 0.01 ) ) { return; } if( ( MoverParameters->Vel < 2.0 ) @@ -2686,7 +2704,7 @@ TDynamicObject::update_load_sections() { SectionLoadVisibility.clear(); - for( auto §ion : SectionLightLevels ) { + for( auto §ion : Sections ) { section.load = ( mdLoad != nullptr ? @@ -2737,6 +2755,19 @@ TDynamicObject::update_load_visibility() { } } ); } +void +TDynamicObject::update_load_offset() { + + if( MoverParameters->LoadMinOffset == 0.f ) { return; } + + auto const loadpercentage { ( + MoverParameters->MaxLoad == 0.0 ? + 0.0 : + 100.0 * MoverParameters->Load / MoverParameters->MaxLoad ) }; + + LoadOffset = interpolate( MoverParameters->LoadMinOffset, 0.f, clamp( 0.0, 1.0, loadpercentage * 0.01 ) ); +} + void TDynamicObject::shuffle_load_sections() { @@ -2748,6 +2779,8 @@ TDynamicObject::shuffle_load_sections() { return ( ( section.submodel->pName.find( "compartment" ) == 0 ) || ( section.submodel->pName.find( "przedzial" ) == 0 ) ); } ); + // NOTE: potentially we're left with a mix of corridor and external section loads + // but that's not necessarily a wrong outcome, so we leave it this way for the time being } /* @@ -3807,10 +3840,11 @@ bool TDynamicObject::Update(double dt, double dt1) MoverParameters->DerailReason = 0; //żeby tylko raz } - update_exchange( dt ); - if (MoverParameters->LoadStatus) + if( MoverParameters->LoadStatus ) { LoadUpdate(); // zmiana modelu ładunku - + } + update_exchange( dt ); + return true; // Ra: chyba tak? } @@ -3848,9 +3882,11 @@ bool TDynamicObject::FastUpdate(double dt) // ResetdMoveLen(); FastMove(dDOMoveLen); - update_exchange( dt ); - if (MoverParameters->LoadStatus) + if( MoverParameters->LoadStatus ) { LoadUpdate(); // zmiana modelu ładunku + } + update_exchange( dt ); + return true; // Ra: chyba tak? } diff --git a/DynObj.h b/DynObj.h index 6589cd10..094a919a 100644 --- a/DynObj.h +++ b/DynObj.h @@ -196,16 +196,17 @@ public: TModel3d *mdLoad; // model zmiennego ładunku TModel3d *mdKabina; // model kabiny dla użytkownika; McZapkie-030303: to z train.h TModel3d *mdLowPolyInt; // ABu 010305: wnetrze lowpoly + float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) + float LoadOffset { 0.f }; glm::vec3 InteriorLight { 0.9f * 255.f / 255.f, 0.9f * 216.f / 255.f, 0.9f * 176.f / 255.f }; // tungsten light. TODO: allow definition of light type? float InteriorLightLevel { 0.0f }; // current level of interior lighting - struct section_light { + struct vehicle_section { TSubModel *compartment; TSubModel *load; - float level; + float light_level; }; - std::vector SectionLightLevels; // table of light levels for specific compartments of associated 3d model + std::vector Sections; // table of recognized vehicle sections bool SectionLightsActive { false }; // flag indicating whether section lights were set. - float fShade; // zacienienie: 0:normalnie, -1:w ciemności, +1:dodatkowe światło (brak koloru?) struct section_visibility { TSubModel *submodel; bool visible; @@ -517,6 +518,7 @@ private: std::string Name, std::string BaseDir, std::string asReplacableSkin, std::string Type_Name, TTrack *Track, double fDist, std::string DriverType, double fVel, std::string TrainName, float Load, std::string LoadType, bool Reversed, std::string); + int init_sections( TModel3d const *Model, std::string const &Nameprefix ); void create_controller( std::string const Type, bool const Trainset ); void AttachPrev(TDynamicObject *Object, int iType = 1); bool UpdateForce(double dt, double dt1, bool FullVer); @@ -525,6 +527,7 @@ private: void LoadUpdate(); void update_load_sections(); void update_load_visibility(); + void update_load_offset(); void shuffle_load_sections(); bool Update(double dt, double dt1); bool FastUpdate(double dt); diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index c4bc99e3..a5512bce 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -947,6 +947,7 @@ public: float MaxLoad = 0.f; /*masa w T lub ilosc w sztukach - ladownosc*/ std::string LoadAccepted; std::string LoadQuantity; /*co moze byc zaladowane, jednostki miary*/ double OverLoadFactor = 0.0; /*ile razy moze byc przekroczona ladownosc*/ + float LoadMinOffset { 0.f }; // offset applied to cargo model when load amount is 0 float LoadSpeed = 0.f; float UnLoadSpeed = 0.f;/*szybkosc na- i rozladunku jednostki/s*/ int DoorOpenCtrl = 0; int DoorCloseCtrl = 0; /*0: przez pasazera, 1: przez maszyniste, 2: samoczynne (zamykanie)*/ double DoorStayOpen = 0.0; /*jak dlugo otwarte w przypadku DoorCloseCtrl=2*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b2ce0b5c..74bc21e5 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6624,12 +6624,9 @@ TMoverParameters::signal_departure( bool const State, range_t const Notify ) { void TMoverParameters::update_autonomous_doors( double const Deltatime ) { - if( ( DoorCloseCtrl != control_t::autonomous ) - || ( ( false == DoorLeftOpened ) - && ( false == DoorRightOpened ) ) ) { - // nothing to do - return; - } + if( DoorCloseCtrl != control_t::autonomous ) { return; } + if( ( false == DoorLeftOpened ) + && ( false == DoorRightOpened ) ) { return; } if( DoorStayOpen > 0.0 ) { // update door timers if the door close after defined time @@ -6641,18 +6638,19 @@ TMoverParameters::update_autonomous_doors( double const Deltatime ) { if( true == DoorLeftOpened ) { DoorLeftOpenTimer = DoorStayOpen; } if( true == DoorRightOpened ) { DoorRightOpenTimer = DoorStayOpen; } } - // the door are closed if their timer goes below 0, or if the vehicle is moving at > 5 km/h + // the door are closed if their timer goes below 0, or if the vehicle is moving at > 10 km/h + auto const closingspeed { 10.0 }; // NOTE: timer value of 0 is 'special' as it means the door will stay open until vehicle is moving if( true == DoorLeftOpened ) { if( ( ( DoorStayOpen > 0.0 ) && ( DoorLeftOpenTimer < 0.0 ) ) - || ( Vel > 5.0 ) ) { + || ( Vel > closingspeed ) ) { // close the door and set the timer to expired state (closing may happen sooner if vehicle starts moving) DoorLeft( false, range_t::local ); } } if( true == DoorRightOpened ) { if( ( ( DoorStayOpen > 0.0 ) && ( DoorRightOpenTimer < 0.0 ) ) - || ( Vel > 5.0 ) ) { + || ( Vel > closingspeed ) ) { // close the door and set the timer to expired state (closing may happen sooner if vehicle starts moving) DoorRight( false, range_t::local ); } @@ -7576,6 +7574,8 @@ void TMoverParameters::LoadFIZ_Load( std::string const &line ) { extract_value( OverLoadFactor, "OverLoadFactor", line, "" ); extract_value( LoadSpeed, "LoadSpeed", line, "" ); extract_value( UnLoadSpeed, "UnLoadSpeed", line, "" ); + + extract_value( LoadMinOffset, "LoadMinOffset", line, "" ); } void TMoverParameters::LoadFIZ_Dimensions( std::string const &line ) { diff --git a/Model3d.cpp b/Model3d.cpp index 08eb2292..a2010d63 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -1154,7 +1154,7 @@ void TModel3d::AddTo(TSubModel *tmp, TSubModel *SubModel) { iFlags |= 0x0200; // submodele są oddzielne }; -TSubModel *TModel3d::GetFromName(std::string const &Name) +TSubModel *TModel3d::GetFromName(std::string const &Name) const { // wyszukanie submodelu po nazwie if (Name.empty()) return Root; // potrzebne do terenu z E3D diff --git a/Model3d.h b/Model3d.h index 157bb992..7c8317a1 100644 --- a/Model3d.h +++ b/Model3d.h @@ -241,7 +241,7 @@ public: Root->m_boundingradius : 0.f ); } inline TSubModel * GetSMRoot() { return (Root); }; - TSubModel * GetFromName(std::string const &Name); + TSubModel * GetFromName(std::string const &Name) const; TSubModel * AddToNamed(const char *Name, TSubModel *SubModel); void AddTo(TSubModel *tmp, TSubModel *SubModel); void LoadFromTextFile(std::string const &FileName, bool dynamic); diff --git a/renderer.cpp b/renderer.cpp index 3a508f7f..a85679c0 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -2151,7 +2151,7 @@ opengl_renderer::Render( TDynamicObject *Dynamic ) { Render( Dynamic->mdModel, Dynamic->Material(), squaredistance ); if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + Render( Dynamic->mdLoad, Dynamic->Material(), squaredistance, { 0.f, Dynamic->LoadOffset, 0.f }, {} ); // post-render cleanup m_renderspecular = false; @@ -3096,7 +3096,7 @@ opengl_renderer::Render_Alpha( TDynamicObject *Dynamic ) { Render_Alpha( Dynamic->mdModel, Dynamic->Material(), squaredistance ); if( Dynamic->mdLoad ) // renderowanie nieprzezroczystego ładunku - Render_Alpha( Dynamic->mdLoad, Dynamic->Material(), squaredistance ); + Render_Alpha( Dynamic->mdLoad, Dynamic->Material(), squaredistance, { 0.f, Dynamic->LoadOffset, 0.f }, {} ); // post-render cleanup m_renderspecular = false; From 251a31a705618a4bed6232c5b6b85e968c8275c5 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 9 Sep 2018 21:25:09 +0200 Subject: [PATCH 395/426] build 180909. scenario time override, support for random texture sets in .mat files, minor bug fixes --- Driver.cpp | 2 +- Globals.cpp | 6 ++++ Globals.h | 1 + McZapkie/MOVER.h | 3 +- McZapkie/Mover.cpp | 22 ++++++++---- Train.cpp | 33 ++++++++++-------- material.cpp | 27 ++++++++------- material.h | 3 ++ simulationstateserializer.cpp | 4 +++ sound.cpp | 64 +++++++---------------------------- sound.h | 3 -- utilities.cpp | 26 ++++++++++++++ utilities.h | 4 +++ version.h | 2 +- 14 files changed, 107 insertions(+), 93 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index d13f553b..3cb1ec32 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2817,9 +2817,9 @@ bool TController::IncSpeed() // if it generates enough traction force // to build up speed to 30/40 km/h for passenger/cargo train (10 km/h less if going uphill) auto const sufficienttractionforce { std::abs( mvControlling->Ft ) > ( IsHeavyCargoTrain ? 125 : 100 ) * 1000.0 }; - auto const useseriesmodevoltage { 0.80 * mvControlling->EnginePowerSource.CollectorParameters.MaxV }; auto const seriesmodefieldshunting { ( mvControlling->ScndCtrlPos > 0 ) && ( mvControlling->RList[ mvControlling->MainCtrlPos ].Bn == 1 ) }; auto const parallelmodefieldshunting { ( mvControlling->ScndCtrlPos > 0 ) && ( mvControlling->RList[ mvControlling->MainCtrlPos ].Bn > 1 ) }; + auto const useseriesmodevoltage { 0.80 * mvControlling->EnginePowerSource.CollectorParameters.MaxV }; auto const useseriesmode = ( ( mvControlling->Imax > mvControlling->ImaxLo ) || ( fVoltage < useseriesmodevoltage ) diff --git a/Globals.cpp b/Globals.cpp index 2c4d8ab8..9b66abbf 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -307,6 +307,12 @@ global_settings::ConfigParse(cParser &Parser) { // max 8 lights per opengl specs, minus one used for sun. at least one light for controlled vehicle DynamicLightCount = clamp( DynamicLightCount, 1, 7 ); } + else if( token == "scenario.time.override" ) { + // shift (in hours) applied to train timetables + Parser.getTokens( 1, false ); + Parser >> ScenarioTimeOverride; + ScenarioTimeOverride = clamp( ScenarioTimeOverride, 0.f, 24 * 1439 / 1440.f ); + } else if( token == "scenario.time.offset" ) { // shift (in hours) applied to train timetables Parser.getTokens( 1, false ); diff --git a/Globals.h b/Globals.h index b5b842fa..7d230f4a 100644 --- a/Globals.h +++ b/Globals.h @@ -78,6 +78,7 @@ struct global_settings { bool FakeLight{ false }; // toggle between fixed and dynamic daylight double fTimeSpeed{ 1.0 }; // przyspieszenie czasu, zmienna do testów double fLatitudeDeg{ 52.0 }; // szerokość geograficzna + float ScenarioTimeOverride { std::numeric_limits::quiet_NaN() }; // requested scenario start time float ScenarioTimeOffset { 0.f }; // time shift (in hours) applied to train timetables bool ScenarioTimeCurrent { false }; // automatic time shift to match scenario time with local clock bool bInactivePause{ true }; // automatyczna pauza, gdy okno nieaktywne diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index a5512bce..a7258151 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -1127,7 +1127,8 @@ public: double dizel_engage = 0.0; /*sprzeglo skrzyni biegow: aktualny docisk*/ double dizel_automaticgearstatus = 0.0; /*0 - bez zmiany, -1 zmiana na nizszy +1 zmiana na wyzszy*/ bool dizel_startup { false }; // engine startup procedure request indicator - bool dizel_ignition = false; // engine ignition request indicator + bool dizel_ignition { false }; // engine ignition request indicator + bool dizel_spinup { false }; // engine spin up to idle speed flag double dizel_engagedeltaomega = 0.0; /*roznica predkosci katowych tarcz sprzegla*/ double dizel_n_old = 0.0; /*poredkosc na potrzeby obliczen sprzegiel*/ double dizel_Torque = 0.0; /*poredkosc na potrzeby obliczen sprzegiel*/ diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 74bc21e5..38f9ba89 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -5974,8 +5974,9 @@ bool TMoverParameters::dizel_Update(double dt) { dizel_startup = false; dizel_ignition = false; // TODO: split engine and main circuit state indicator in two separate flags - Mains = true; LastSwitchingTime = 0; + Mains = true; + dizel_spinup = true; enrot = std::max( enrot, 0.35 * ( // TODO: dac zaleznie od temperatury i baterii @@ -5985,6 +5986,14 @@ bool TMoverParameters::dizel_Update(double dt) { } + dizel_spinup = ( + dizel_spinup + && Mains + && ( enrot < 0.95 * ( + EngineType == TEngineType::DieselEngine ? + dizel_nmin : + DElist[ 0 ].RPM / 60.0 ) ) ); + if( ( true == Mains ) && ( false == FuelPump.is_active ) ) { // knock out the engine if the fuel pump isn't feeding it @@ -6105,7 +6114,7 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) // wstrzymywanie przy malych obrotach Moment -= dizel_Mstand; } - if (true == dizel_ignition) + if (true == dizel_spinup) Moment += dizel_Mstand / (0.3 + std::max(0.0, enrot/dizel_nmin)); //rozrusznik dizel_Torque = Moment; @@ -6216,11 +6225,10 @@ double TMoverParameters::dizel_Momentum(double dizel_fill, double n, double dt) } - if ((enrot <= 0) && (!dizel_ignition)) - { - Mains = false; - enrot = 0; - } + if( ( enrot <= 0 ) && ( false == dizel_spinup ) ) { + MainSwitch( false ); + enrot = 0; + } dizel_n_old = n; //obecna predkosc katowa na potrzeby kolejnej klatki diff --git a/Train.cpp b/Train.cpp index 8626184c..789b770f 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5094,16 +5094,16 @@ bool TTrain::Update( double const Deltatime ) ( true == mvControlled->ResistorsFlagCheck() ) || ( mvControlled->MainCtrlActualPos == 0 ) ); // do EU04 - if( ( mvControlled->Im != 0 ) - || ( mvOccupied->BrakePress > 2 ) + if( ( mvControlled->StLinFlag ) + || ( mvOccupied->BrakePress > 2.0 ) || ( mvOccupied->PipePress < 3.6 ) ) { // Ra: czy to jest udawanie działania styczników liniowych? btLampkaStyczn.Turn( false ); } - else if( mvOccupied->BrakePress < 1 ) + else if( mvOccupied->BrakePress < 1.0 ) btLampkaStyczn.Turn( true ); // mozna prowadzic rozruch - if( ( ( TestFlag( mvControlled->Couplers[ 1 ].CouplingFlag, ctrain_controll ) ) && ( mvControlled->CabNo == 1 ) ) || - ( ( TestFlag( mvControlled->Couplers[ 0 ].CouplingFlag, ctrain_controll ) ) && ( mvControlled->CabNo == -1 ) ) ) + if( ( ( TestFlag( mvControlled->Couplers[ side::rear ].CouplingFlag, coupling::control ) ) && ( mvControlled->CabNo == 1 ) ) + || ( ( TestFlag( mvControlled->Couplers[ side::front ].CouplingFlag, coupling::control ) ) && ( mvControlled->CabNo == -1 ) ) ) btLampkaUkrotnienie.Turn( true ); else btLampkaUkrotnienie.Turn( false ); @@ -5155,10 +5155,10 @@ bool TTrain::Update( double const Deltatime ) } if( mvControlled->Signalling == true ) { - if( mvOccupied->BrakePress >= 0.145f ) { + if( mvOccupied->BrakePress >= 1.45f ) { btLampkaHamowanie1zes.Turn( true ); } - if( mvControlled->BrakePress < 0.075f ) { + if( mvControlled->BrakePress < 0.75f ) { btLampkaHamowanie1zes.Turn( false ); } } @@ -5298,12 +5298,12 @@ bool TTrain::Update( double const Deltatime ) ( true == tmp->MoverParameters->ResistorsFlagCheck() ) || ( tmp->MoverParameters->MainCtrlActualPos == 0 ) ); // do EU04 - if( ( tmp->MoverParameters->Itot != 0 ) - || ( tmp->MoverParameters->BrakePress > 0.2 ) + if( ( tmp->MoverParameters->StLinFlag ) + || ( tmp->MoverParameters->BrakePress > 2.0 ) || ( tmp->MoverParameters->PipePress < 0.36 ) ) { btLampkaStycznB.Turn( false ); } - else if( tmp->MoverParameters->BrakePress < 0.1 ) { + else if( tmp->MoverParameters->BrakePress < 1.0 ) { btLampkaStycznB.Turn( true ); // mozna prowadzic rozruch } // hunter-271211: sygnalizacja poslizgu w pierwszym pojezdzie, gdy wystapi w drugim @@ -5311,12 +5311,15 @@ bool TTrain::Update( double const Deltatime ) btLampkaSprezarkaB.Turn( tmp->MoverParameters->CompressorFlag ); // mutopsitka dziala btLampkaSprezarkaBOff.Turn( false == tmp->MoverParameters->CompressorFlag ); - if ((tmp->MoverParameters->BrakePress >= 0.145f) && (mvControlled->Signalling == true)) - { - btLampkaHamowanie2zes.Turn( true ); + if( mvControlled->Signalling == true ) { + if( tmp->MoverParameters->BrakePress >= 1.45f ) { + btLampkaHamowanie2zes.Turn( true ); + } + if( tmp->MoverParameters->BrakePress < 0.75f ) { + btLampkaHamowanie2zes.Turn( false ); + } } - if ((tmp->MoverParameters->BrakePress < 0.075f) || (mvControlled->Signalling == false)) - { + else { btLampkaHamowanie2zes.Turn( false ); } btLampkaNadmPrzetwB.Turn( tmp->MoverParameters->ConvOvldFlag ); // nadmiarowy przetwornicy? diff --git a/material.cpp b/material.cpp index 5503eb41..e3d2daed 100644 --- a/material.cpp +++ b/material.cpp @@ -33,13 +33,10 @@ opengl_material::deserialize( cParser &Input, bool const Loadnow ) { // imports member data pair from the config file bool opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow ) { - // token can be a key or block end - std::string const key { Input.getToken( true, "\n\r\t ;[]" ) }; - - if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } - // NOTE: comma can be part of legacy file names, so we don't treat it as a separator here - auto const value { Input.getToken( true, "\n\r\t ;" ) }; + std::string const key { Input.getToken( true, "\n\r\t ;[]" ) }; + // key can be an actual key or block end + if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } if( Priority != -1 ) { // regular attribute processing mode @@ -60,7 +57,7 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c || ( key == "texture_diffuse:" ) ) { if( ( texture1 == null_handle ) || ( Priority > priority1 ) ) { - texture1 = GfxRenderer.Fetch_Texture( value, Loadnow ); + texture1 = GfxRenderer.Fetch_Texture( deserialize_random_set( Input ), Loadnow ); priority1 = Priority; } } @@ -68,20 +65,24 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c || ( key == "texture_normalmap:" ) ) { if( ( texture2 == null_handle ) || ( Priority > priority2 ) ) { - texture2 = GfxRenderer.Fetch_Texture( value, Loadnow ); + texture2 = GfxRenderer.Fetch_Texture( deserialize_random_set( Input ), Loadnow ); priority2 = Priority; } } - else if( value == "{" ) { - // unrecognized or ignored token, but comes with attribute block and potential further nesting - // go through it and discard the content - while( true == deserialize_mapping( Input, -1, Loadnow ) ) { - ; // all work is done in the header + else { + auto const value { Input.getToken( true, "\n\r\t ;" ) }; + if( value == "{" ) { + // unrecognized or ignored token, but comes with attribute block and potential further nesting + // go through it and discard the content + while( true == deserialize_mapping( Input, -1, Loadnow ) ) { + ; // all work is done in the header + } } } } else { // discard mode; ignores all retrieved tokens + auto const value { Input.getToken( true, "\n\r\t ;" ) }; if( value == "{" ) { // ignored tokens can come with their own blocks, ignore these recursively // go through it and discard the content diff --git a/material.h b/material.h index 11c035db..d4f64088 100644 --- a/material.h +++ b/material.h @@ -37,6 +37,9 @@ private: // imports member data pair from the config file, overriding existing parameter values of lower priority bool deserialize_mapping( cParser &Input, int const Priority, bool const Loadnow ); + // extracts name of the sound file from provided data stream + std::string + deserialize_filename( cParser &Input ); // members int priority1 { -1 }; // priority of last loaded primary texture diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index 1a556164..78e62339 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -541,6 +541,10 @@ state_serializer::deserialize_time( cParser &Input, scene::scratch_data &Scratch auto const *localtime = std::localtime( &timenow ); Global.ScenarioTimeOffset = ( ( localtime->tm_hour * 60 + localtime->tm_min ) - ( time.wHour * 60 + time.wMinute ) ) / 60.f; } + else if( false == std::isnan( Global.ScenarioTimeOverride ) ) { + // scenario time override takes precedence over scenario time offset + Global.ScenarioTimeOffset = ( ( Global.ScenarioTimeOverride * 60 ) - ( time.wHour * 60 + time.wMinute ) ) / 60.f; + } // remaining sunrise and sunset parameters are no longer used, as they're now calculated dynamically // anything else left in the section has no defined meaning diff --git a/sound.cpp b/sound.cpp index aceec296..3f349a1e 100644 --- a/sound.cpp +++ b/sound.cpp @@ -101,13 +101,13 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons switch( Legacytype ) { case sound_type::single: { // single sample only - m_sounds[ main ].buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + m_sounds[ main ].buffer = audio::renderer.fetch_buffer( deserialize_random_set( Input, "\n\r\t ,;" ) ); break; } case sound_type::multipart: { // three samples: start, middle, stop for( auto &sound : m_sounds ) { - sound.buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + sound.buffer = audio::renderer.fetch_buffer( deserialize_random_set( Input, "\n\r\t ,;" ) ); } break; } @@ -147,32 +147,6 @@ sound_source::deserialize( cParser &Input, sound_type const Legacytype, int cons return *this; } -// extracts name of the sound file from provided data stream -std::string -sound_source::deserialize_filename( cParser &Input ) { - - auto token { Input.getToken( true, "\n\r\t ,;" ) }; - if( token != "[" ) { - // simple case, single file - return token; - } - // if instead of filename we've encountered '[' this marks a beginning of random sounds - // we retrieve all entries, then return a random one - std::vector filenames; - while( ( ( token = Input.getToken( true, "\n\r\t ,;" ) ) != "" ) - && ( token != "]" ) ) { - filenames.emplace_back( token ); - } - if( false == filenames.empty() ) { - std::shuffle( std::begin( filenames ), std::end( filenames ), Global.random_engine ); - return filenames.front(); - } - else { - // shouldn't ever get here but, eh - return ""; - } -} - // imports member data pair from the config file bool sound_source::deserialize_mapping( cParser &Input ) { @@ -183,16 +157,16 @@ sound_source::deserialize_mapping( cParser &Input ) { // if not block end then the key is followed by assigned value or sub-block if( key == "soundmain:" ) { - sound( sound_id::main ).buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + sound( sound_id::main ).buffer = audio::renderer.fetch_buffer( deserialize_random_set( Input, "\n\r\t ,;" ) ); } else if( key == "soundset:" ) { deserialize_soundset( Input ); } else if( key == "soundbegin:" ) { - sound( sound_id::begin ).buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + sound( sound_id::begin ).buffer = audio::renderer.fetch_buffer( deserialize_random_set( Input, "\n\r\t ,;" ) ); } else if( key == "soundend:" ) { - sound( sound_id::end ).buffer = audio::renderer.fetch_buffer( deserialize_filename( Input ) ); + sound( sound_id::end ).buffer = audio::renderer.fetch_buffer( deserialize_random_set( Input, "\n\r\t ,;" ) ); } else if( key.compare( 0, std::min( key.size(), 5 ), "sound" ) == 0 ) { // sound chunks, defined with key soundX where X = activation threshold @@ -203,7 +177,7 @@ sound_source::deserialize_mapping( cParser &Input ) { m_soundchunks.emplace_back( soundchunk_pair { // sound data - { audio::renderer.fetch_buffer( deserialize_filename( Input ) ), 0 }, + { audio::renderer.fetch_buffer( deserialize_random_set( Input, "\n\r\t ,;" ) ), 0 }, // chunk data { std::stoi( key.substr( indexstart, indexend - indexstart ) ), 0, 0, 1.f } } ); } @@ -272,26 +246,12 @@ sound_source::deserialize_mapping( cParser &Input ) { void sound_source::deserialize_soundset( cParser &Input ) { - auto token { Input.getToken( true, "\n\r\t ,;|" ) }; - if( token != "[" ) { - // simple case, basic set of three filenames separated with | - // three samples: start, middle, stop - sound( sound_id::begin ).buffer = audio::renderer.fetch_buffer( token ); - sound( sound_id::main ).buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;|" ) ); - sound( sound_id::end ).buffer = audio::renderer.fetch_buffer( Input.getToken( true, "\n\r\t ,;|" ) ); - return; - } - // if instead of filename we've encountered '[' this marks a beginning of random sets - // we retrieve all entries, then process a random one - std::vector soundsets; - while( ( ( token = Input.getToken( true, "\n\r\t ,;" ) ) != "" ) - && ( token != "]" ) ) { - soundsets.emplace_back( token ); - } - if( false == soundsets.empty() ) { - std::shuffle( std::begin( soundsets ), std::end( soundsets ), Global.random_engine ); - return deserialize_soundset( cParser( soundsets.front() ) ); - } + auto const soundset { deserialize_random_set( Input, "\n\r\t ,;" ) }; + // split retrieved set + cParser setparser( soundset ); + sound( sound_id::begin ).buffer = audio::renderer.fetch_buffer( setparser.getToken( true, "|" ) ); + sound( sound_id::main ).buffer = audio::renderer.fetch_buffer( setparser.getToken( true, "|" ) ); + sound( sound_id::end ).buffer = audio::renderer.fetch_buffer( setparser.getToken( true, "|" ) ); } // sends content of the class in legacy (text) format to provided stream diff --git a/sound.h b/sound.h index 7a3b1cde..c1d012b7 100644 --- a/sound.h +++ b/sound.h @@ -150,9 +150,6 @@ private: }; // methods - // extracts name of the sound file from provided data stream - std::string - deserialize_filename( cParser &Input ); // imports member data pair from the provided data stream bool deserialize_mapping( cParser &Input ); diff --git a/utilities.cpp b/utilities.cpp index 08ed4463..ea27dd69 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -416,3 +416,29 @@ glm::dvec3 LoadPoint( cParser &Input ) { return point; } + +// extracts a group of tokens from provided data stream, returns one of them picked randomly +std::string +deserialize_random_set( cParser &Input, char const *Break ) { + + auto token { Input.getToken( true, Break ) }; + if( token != "[" ) { + // simple case, single token + return token; + } + // if instead of a single token we've encountered '[' this marks a beginning of a random set + // we retrieve all entries, then return a random one + std::vector tokens; + while( ( ( token = deserialize_random_set( Input, Break ) ) != "" ) + && ( token != "]" ) ) { + tokens.emplace_back( token ); + } + if( false == tokens.empty() ) { + std::shuffle( std::begin( tokens ), std::end( tokens ), Global.random_engine ); + return tokens.front(); + } + else { + // shouldn't ever get here but, eh + return ""; + } +} diff --git a/utilities.h b/utilities.h index b92f0290..be746026 100644 --- a/utilities.h +++ b/utilities.h @@ -309,4 +309,8 @@ nearest_segment_point( VecType_ const &Segmentstart, VecType_ const &Segmentend, glm::dvec3 LoadPoint( class cParser &Input ); +// extracts a group of tokens from provided data stream +std::string +deserialize_random_set( cParser &Input, char const *Break = "\n\r\t ;" ); + //--------------------------------------------------------------------------- diff --git a/version.h b/version.h index 46909a86..1c68578c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 904 +#define VERSION_MINOR 909 #define VERSION_REVISION 0 From d05e404d758c3ce814ab56c34c6690a6763f4b68 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 11 Sep 2018 23:17:59 +0200 Subject: [PATCH 396/426] basic isolated track section hierarchy, track vertical radius property, ai passenger stop logic tweaks, ai signal speed limit tracking logic tweaks --- Driver.cpp | 77 +++++++++++++++++------------- Driver.h | 3 ++ Track.cpp | 89 ++++++++++++++++++----------------- Track.h | 31 ++++++++---- driveruipanels.cpp | 9 ++-- editoruipanels.cpp | 2 +- parser.cpp | 2 +- simulationstateserializer.cpp | 15 ++++++ simulationstateserializer.h | 1 + version.h | 2 +- 10 files changed, 140 insertions(+), 91 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 3cb1ec32..2aa98b08 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -812,6 +812,8 @@ void TController::TableCheck(double fDistance) } }; +auto const passengerstopmaxdistance { 400.0 }; // maximum allowed distance between passenger stop point and consist head + TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc) { // ustalenie parametrów, zwraca typ komendy, jeśli sygnał podaje prędkość do jazdy // fVelDes - prędkość zadana @@ -826,14 +828,17 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN TCommandType go = TCommandType::cm_Unknown; eSignNext = NULL; // te flagi są ustawiane tutaj, w razie potrzeby - iDrivigFlags &= ~(moveTrackEnd | moveSwitchFound | moveSemaphorFound | moveSpeedLimitFound); + iDrivigFlags &= ~(moveTrackEnd | moveSwitchFound | moveSemaphorFound | /*moveSpeedLimitFound*/ moveStopPointFound ); for( std::size_t i = 0; i < sSpeedTable.size(); ++i ) { // sprawdzenie rekordów od (iFirst) do (iLast), o ile są istotne if (sSpeedTable[i].iFlags & spEnabled) // badanie istotności { // o ile dana pozycja tabelki jest istotna - if (sSpeedTable[i].iFlags & spPassengerStopPoint) - { // jeśli przystanek, trzeba obsłużyć wg rozkładu + if (sSpeedTable[i].iFlags & spPassengerStopPoint) { + // jeśli przystanek, trzeba obsłużyć wg rozkładu + iDrivigFlags |= moveStopPointFound; + // stop points are irrelevant when not in one of the basic modes + if( ( OrderCurrentGet() & ( Obey_train | Shunt ) ) == 0 ) { continue; } // first 19 chars of the command is expected to be "PassengerStopPoint:" so we skip them if ( ToLower(sSpeedTable[i].evEvent->CommandGet()).compare( 19, sizeof(asNextStop), ToLower(asNextStop)) != 0 ) { // jeśli nazwa nie jest zgodna @@ -858,7 +863,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN { // jeśli nie ma tu postoju sSpeedTable[i].fVelNext = -1; // maksymalna prędkość w tym miejscu // przy 160km/h jedzie 44m/s, to da dokładność rzędu 5 sekund - if (sSpeedTable[i].fDist < 200.0) { + if (sSpeedTable[i].fDist < passengerstopmaxdistance * 0.5 ) { // zaliczamy posterunek w pewnej odległości przed (choć W4 nie zasłania już semafora) #if LOGSTOPS WriteLog( @@ -880,8 +885,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } // koniec obsługi przelotu na W4 else { // zatrzymanie na W4 - if ( ( false == sSpeedTable[i].bMoved ) - && ( ( OrderCurrentGet() & ( Obey_train | Shunt ) ) != 0 ) ) { + if ( false == sSpeedTable[i].bMoved ) { // potentially shift the stop point in accordance with its defined parameters /* // https://rainsted.com/pl/Wersja/18.2.133#Okr.C4.99gi_dla_W4_i_W32 @@ -910,16 +914,17 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } } isatpassengerstop = ( + ( sSpeedTable[ i ].fDist <= passengerstopmaxdistance ) // Ra 2F1I: odległość plus długość pociągu musi być mniejsza od długości // peronu, chyba że pociąg jest dłuższy, to wtedy minimalna. // jeśli długość peronu ((sSpeedTable[i].evEvent->ValueGet(2)) nie podana, // przyjąć odległość fMinProximityDist - ( iDrivigFlags & moveStopCloser ) ? - ( sSpeedTable[ i ].fDist + fLength ) <= - std::max( - std::abs( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ), - 2.0 * fMaxProximityDist + fLength ) : // fmaxproximitydist typically equals ~50 m - sSpeedTable[ i ].fDist < d_to_next_sem ); + && ( ( iDrivigFlags & moveStopCloser ) != 0 ? + sSpeedTable[ i ].fDist + fLength <= + std::max( + std::abs( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ), + 2.0 * fMaxProximityDist + fLength ) : // fmaxproximitydist typically equals ~50 m + sSpeedTable[ i ].fDist < d_to_next_sem ) ); if( !eSignNext ) { //jeśli nie widzi następnego sygnału ustawia dotychczasową @@ -928,8 +933,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if( mvOccupied->Vel > 0.3 ) { // jeśli jedzie (nie trzeba czekać, aż się drgania wytłumią - drzwi zamykane od 1.0) to będzie zatrzymanie sSpeedTable[ i ].fVelNext = 0; - } - else if( true == isatpassengerstop ) { + } else if( true == isatpassengerstop ) { // jeśli się zatrzymał przy W4, albo stał w momencie zobaczenia W4 if( !AIControllFlag ) { // w razie przełączenia na AI ma nie podciągać do W4, gdy użytkownik zatrzymał za daleko @@ -1069,7 +1073,11 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN iDrivigFlags |= moveStopHere | moveStartHorn; continue; // nie analizować prędkości } // koniec obsługi ostatniej stacji - } // if (MoverParameters->Vel==0.0) + } // vel 0, at passenger stop + else { + // HACK: momentarily deactivate W4 to trick the controller into moving closer + sSpeedTable[ i ].fVelNext = -1; + } // vel 0, outside of passenger stop } // koniec obsługi zatrzymania na W4 } // koniec warunku pomijania W4 podczas zmiany czoła else @@ -1121,15 +1129,11 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if (sSpeedTable[i].iFlags & spOutsideStation) { // jeśli W5, to reakcja zależna od trybu jazdy if (OrderCurrentGet() & Obey_train) - { // w trybie pociągowym: można przyspieszyć do wskazanej prędkości (po - // zjechaniu z rozjazdów) + { // w trybie pociągowym: można przyspieszyć do wskazanej prędkości (po zjechaniu z rozjazdów) v = -1.0; // ignorować? -//TODO trzeba zmienić przypisywanie VelSignal na VelSignalLast if (sSpeedTable[i].fDist < 0.0) // jeśli wskaźnik został minięty { VelSignalLast = v; //ustawienie prędkości na -1 - // iStationStart=TrainParams->StationIndex; //zaktualizować - // wyświetlanie rozkładu } else if (!(iDrivigFlags & moveSwitchFound)) // jeśli rozjazdy już minięte VelSignalLast = v; //!!! to też koniec ograniczenia @@ -1174,7 +1178,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN else { iDrivigFlags |= moveSemaphorFound; //jeśli z przodu to dajemy falgę, że jest - d_to_next_sem = Min0R(sSpeedTable[i].fDist, d_to_next_sem); + d_to_next_sem = std::min(sSpeedTable[i].fDist, d_to_next_sem); } if( sSpeedTable[ i ].fDist <= d_to_next_sem ) { @@ -1338,7 +1342,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN && ( true == TestFlag( sSpeedTable[ i ].iFlags, ( spEnabled | spEvent | spPassengerStopPoint ) ) ) && ( false == isatpassengerstop ) ) { // ma podjechać bliżej - czy na pewno w tym miejscu taki warunek? - a = ( ( ( iDrivigFlags & moveStopCloser ) != 0 ) ? + a = ( ( d > passengerstopmaxdistance ) || ( ( iDrivigFlags & moveStopCloser ) != 0 ) ? fAcc : 0.0 ); } @@ -1409,9 +1413,12 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } // if (sSpeedTable[i].iFlags&1) } // for - if (VelSignalLast >= 0.0 && !(iDrivigFlags & (moveSemaphorFound | moveSwitchFound)) && - (OrderCurrentGet() & Obey_train)) - VelSignalLast = -1.0; // jeśli mieliśmy ograniczenie z semafora i nie ma przed nami + // jeśli mieliśmy ograniczenie z semafora i nie ma przed nami + if( ( VelSignalLast >= 0.0 ) + && ( ( iDrivigFlags & ( moveSemaphorFound | moveSwitchFound | moveStopPointFound ) ) == 0 ) + && ( true == TestFlag( OrderCurrentGet(), Obey_train ) ) ) { + VelSignalLast = -1.0; + } //analiza spisanych z tabelki ograniczeń i nadpisanie aktualnego if( ( true == isatpassengerstop ) && ( mvOccupied->Vel < 0.01 ) ) { @@ -2562,8 +2569,9 @@ bool TController::ReleaseEngine() { eAction = TAction::actSleep; //śpi (wygaszony) OrderNext(Wait_for_orders); //żeby nie próbował coś robić dalej - TableClear(); // zapominamy ograniczenia iDrivigFlags &= ~moveActive; // ma nie skanować sygnałów i nie reagować na komendy + TableClear(); // zapominamy ograniczenia + VelSignalLast = -1.0; } return OK; } @@ -3332,10 +3340,10 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N iStationStart = TrainParams->StationIndex; asNextStop = TrainParams->NextStop(); iDrivigFlags |= movePrimary; // skoro dostał rozkład, to jest teraz głównym - NewCommand = Global.asCurrentSceneryPath + NewCommand; +// NewCommand = Global.asCurrentSceneryPath + NewCommand; auto lookup = FileExists( - { NewCommand }, + { Global.asCurrentSceneryPath + NewCommand, szSoundPath + NewCommand }, { ".ogg", ".flac", ".wav" } ); if( false == lookup.first.empty() ) { // wczytanie dźwięku odjazdu podawanego bezpośrenido @@ -3343,9 +3351,10 @@ bool TController::PutCommand( std::string NewCommand, double NewValue1, double N iGuardRadio = 0; // nie przez radio } else { + NewCommand += "radio"; auto lookup = FileExists( - { NewCommand + "radio" }, + { Global.asCurrentSceneryPath + NewCommand, szSoundPath + NewCommand }, { ".ogg", ".flac", ".wav" } ); if( false == lookup.first.empty() ) { // wczytanie dźwięku odjazdu w wersji radiowej (słychać tylko w kabinie) @@ -4051,10 +4060,12 @@ TController::UpdateSituation(double dt) { } */ // route scan - double routescanrange = ( - mvOccupied->Vel > 5.0 ? - 400 + fBrakeDist : - 30.0 * fDriverDist ); // 1500m dla stojących pociągów; + auto const routescanrange { + std::max( + 750.0, + mvOccupied->Vel > 5.0 ? + 400 + fBrakeDist : + 30.0 * fDriverDist ) }; // 1500m dla stojących pociągów; // Ra 2015-01: przy dłuższej drodze skanowania AI jeździ spokojniej // 2. Sprawdzić, czy tabelka pokrywa założony odcinek (nie musi, jeśli jest STOP). // 3. Sprawdzić, czy trajektoria ruchu przechodzi przez zwrotnice - jeśli tak, to sprawdzić, diff --git a/Driver.h b/Driver.h index ca01241a..e508b747 100644 --- a/Driver.h +++ b/Driver.h @@ -52,9 +52,12 @@ enum TMovementStatus moveDoorOpened = 0x20000, // drzwi zostały otwarte - doliczyć czas na zamknięcie movePushPull = 0x40000, // zmiana czoła przez zmianę kabiny - nie odczepiać przy zmianie kierunku moveSemaphorFound = 0x80000, // na drodze skanowania został znaleziony semafor + moveStopPointFound = 0x100000 // stop point detected ahead +/* moveSemaphorWasElapsed = 0x100000, // minięty został semafor moveTrainInsideStation = 0x200000, // pociąg między semaforem a rozjazdami lub następnym semaforem moveSpeedLimitFound = 0x400000 // pociąg w ograniczeniu z podaną jego długością +*/ }; enum TStopReason diff --git a/Track.cpp b/Track.cpp index 09663ef7..c68d81a4 100644 --- a/Track.cpp +++ b/Track.cpp @@ -68,12 +68,12 @@ TSwitchExtension::TSwitchExtension(TTrack *owner, int const what) TSwitchExtension::~TSwitchExtension() { // nie ma nic do usuwania } - +/* TIsolated::TIsolated() { // utworznie pustego TIsolated("none", NULL); }; - +*/ TIsolated::TIsolated(std::string const &n, TIsolated *i) : asName( n ), pNext( i ) { @@ -102,6 +102,15 @@ TIsolated * TIsolated::Find(std::string const &n) return pRoot; }; +bool +TIsolated::AssignEvents() { + + evBusy = simulation::Events.FindEvent( asName + ":busy" ); + evFree = simulation::Events.FindEvent( asName + ":free" ); + + return ( evBusy != nullptr ) && ( evFree != nullptr ); +} + void TIsolated::Modify(int i, TDynamicObject *o) { // dodanie lub odjęcie osi if (iAxles) @@ -131,6 +140,10 @@ void TIsolated::Modify(int i, TDynamicObject *o) pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) | 1, update_memval2 ); // zmieniamy ostatnią wartość na nieparzystą } } + // pass the event to the parent + if( pParent != nullptr ) { + pParent->Modify( i, o ); + } }; // tworzenie nowego odcinka ruchu @@ -851,6 +864,12 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) iAction |= 0x40; // flaga opuszczenia pantografu (tor uwzględniany w skanowaniu jako // ograniczenie dla pantografujących) } + else if( str == "vradius" ) { + // y-axis track radius + // NOTE: not used/implemented + parser->getTokens(); + *parser >> fVerticalRadius; + } else ErrorLog("Unknown property: \"" + str + "\" in track \"" + m_name + "\""); parser->getTokens(); @@ -954,19 +973,6 @@ std::string TTrack::IsolatedName() return ""; }; -bool TTrack::IsolatedEventsAssign(TEvent *busy, TEvent *free) -{ // ustawia zdarzenia dla odcinka izolowanego - if (pIsolated) - { - if (busy) - pIsolated->evBusy = busy; - if (free) - pIsolated->evFree = free; - return true; - } - return false; -}; - // ABu: przeniesione z Path.h i poprawione!!! bool TTrack::AddDynamicObject(TDynamicObject *Dynamic) { // dodanie pojazdu do trajektorii @@ -2764,7 +2770,7 @@ TTrack::export_as_text_( std::ostream &Output ) const { eEnvironment == e_canyon ? "canyon" : eEnvironment == e_mountains ? "mountains" : "none" ) - << ' '; + << ' '; // visibility // NOTE: 'invis' would be less wrong than 'unvis', but potentially incompatible with old 3rd party tools Output << ( m_visible ? "vis" : "unvis" ) << ' '; @@ -2772,8 +2778,8 @@ TTrack::export_as_text_( std::ostream &Output ) const { // texture parameters are supplied only if the path is set as visible auto texturefile { ( m_material1 != null_handle ? - GfxRenderer.Material( m_material1 ).name : - "none" ) }; + GfxRenderer.Material( m_material1 ).name : + "none" ) }; if( texturefile.find( szTexturePath ) == 0 ) { // don't include 'textures/' in the path texturefile.erase( 0, std::string{ szTexturePath }.size() ); @@ -2784,8 +2790,8 @@ TTrack::export_as_text_( std::ostream &Output ) const { texturefile = ( m_material2 != null_handle ? - GfxRenderer.Material( m_material2 ).name : - "none" ); + GfxRenderer.Material( m_material2 ).name : + "none" ); if( texturefile.find( szTexturePath ) == 0 ) { // don't include 'textures/' in the path texturefile.erase( 0, std::string{ szTexturePath }.size() ); @@ -2828,11 +2834,14 @@ TTrack::export_as_text_( std::ostream &Output ) const { for( auto &eventsequence : eventsequences ) { for( auto &event : *( eventsequence.second ) ) { - if( false == event.first.empty() ) { - Output - << eventsequence.first << ' ' - << event.first << ' '; - } + // NOTE: actual event name can be potentially different from its cached name, if it was renamed in the editor + // therefore on export we pull the name from the event itself, if the binding isn't broken + Output + << eventsequence.first << ' ' + << ( event.second != nullptr ? + event.second->asName : + event.first ) + << ' '; } } if( ( SwitchExtension ) @@ -2850,6 +2859,9 @@ TTrack::export_as_text_( std::ostream &Output ) const { if( fOverhead != -1.0 ) { Output << "overhead " << fOverhead << ' '; } + if( fVerticalRadius != 0.f ) { + Output << "vradius " << fVerticalRadius << ' '; + } // footer Output << "endtrack" @@ -3091,15 +3103,6 @@ path_table::InitTracks() { } } // switch - // pobranie nazwy odcinka izolowanego - auto const isolatedname { track->IsolatedName() }; - if( false == isolatedname.empty() ) { - // jeśli została zwrócona nazwa - track->IsolatedEventsAssign( - simulation::Events.FindEvent( isolatedname + ":busy" ), - simulation::Events.FindEvent( isolatedname + ":free" ) ); - } - if( ( trackname[ 0 ] == '*' ) && ( !track->CurrentPrev() && track->CurrentNext() ) ) { // możliwy portal, jeśli nie podłączony od strony 1 @@ -3108,25 +3111,25 @@ path_table::InitTracks() { } } - TIsolated *isolated = TIsolated::Root(); + auto *isolated = TIsolated::Root(); while( isolated ) { - // jeśli się znajdzie, to podać wskaźnik + + isolated->AssignEvents(); + auto *memorycell = simulation::Memory.find( isolated->asName ); // czy jest komóka o odpowiedniej nazwie - if( memorycell != nullptr ) { - // przypisanie powiązanej komórki - isolated->pMemCell = memorycell; - } - else { + if( memorycell == nullptr ) { // utworzenie automatycznej komórki // TODO: determine suitable location for this one, create and add world reference node scene::node_data nodedata; nodedata.name = isolated->asName; - auto *memorycell = new TMemCell( nodedata ); // to nie musi mieć nazwy, nazwa w wyszukiwarce wystarczy + memorycell = new TMemCell( nodedata ); // to nie musi mieć nazwy, nazwa w wyszukiwarce wystarczy // NOTE: autogenerated cells aren't exported; they'll be autogenerated anew when exported file is loaded memorycell->is_exportable = false; simulation::Memory.insert( memorycell ); - isolated->pMemCell = memorycell; // wskaźnik komóki przekazany do odcinka izolowanego } + // przypisanie powiązanej komórki + isolated->pMemCell = memorycell; + isolated = isolated->Next(); } } diff --git a/Track.h b/Track.h index 1b34b00d..5efc6527 100644 --- a/Track.h +++ b/Track.h @@ -99,18 +99,32 @@ class TIsolated { // obiekt zbierający zajętości z kilku odcinków public: // constructors - TIsolated(); TIsolated(const std::string &n, TIsolated *i); // methods static void DeleteAll(); static TIsolated * Find(const std::string &n); // znalezienie obiektu albo utworzenie nowego + bool AssignEvents(); void Modify(int i, TDynamicObject *o); // dodanie lub odjęcie osi - bool Busy() { - return (iAxles > 0); }; - static TIsolated * Root() { - return (pRoot); }; - TIsolated * Next() { - return (pNext); }; + inline + bool + Busy() { + return (iAxles > 0); }; + inline + static TIsolated * + Root() { + return (pRoot); }; + inline + TIsolated * + Next() { + return (pNext); }; + inline + void + parent( TIsolated *Parent ) { + pParent = Parent; } + inline + TIsolated * + parent() const { + return pParent; } // members std::string asName; // nazwa obiektu, baza do nazw eventów TEvent *evBusy { nullptr }; // zdarzenie wyzwalane po zajęciu grupy @@ -120,6 +134,7 @@ private: // members int iAxles { 0 }; // ilość osi na odcinkach obsługiwanych przez obiekt TIsolated *pNext { nullptr }; // odcinki izolowane są trzymane w postaci listy jednikierunkowej + TIsolated *pParent { nullptr }; // optional parent piece, collecting data from its children static TIsolated *pRoot; // początek listy }; @@ -140,6 +155,7 @@ private: // McZapkie-070402: dodalem zmienne opisujace rozmiary tekstur int iTrapezoid = 0; // 0-standard, 1-przechyłka, 2-trapez, 3-oba double fRadiusTable[ 2 ] = { 0.0, 0.0 }; // dwa promienie, drugi dla zwrotnicy + float fVerticalRadius { 0.f }; // y-axis track radius (currently not supported) float fTexLength = 4.0f; // długość powtarzania tekstury w metrach float fTexRatio1 = 1.0f; // proporcja boków tekstury nawierzchni (żeby zaoszczędzić na rozmiarach tekstur...) float fTexRatio2 = 1.0f; // proporcja boków tekstury chodnika (żeby zaoszczędzić na rozmiarach tekstur...) @@ -265,7 +281,6 @@ public: if (pIsolated) pIsolated->Modify(i, o); }; // dodanie lub odjęcie osi std::string IsolatedName(); - bool IsolatedEventsAssign(TEvent *busy, TEvent *free); double WidthTotal(); bool IsGroupable(); int TestPoint( Math3D::vector3 *Point); diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 315cb07c..603de77c 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -251,9 +251,10 @@ timetable_panel::update() { to_string( int( 100 + tableline->Dh ) ).substr( 1, 2 ) + ":" + to_string( int( 100 + tableline->Dm ) ).substr( 1, 2 ) : " | " ); auto const candeparture = ( - ( owner->iStationStart < table->StationIndex ) + ( owner->iStationStart < table->StationIndex ) && ( i < table->StationIndex ) - && ( ( time.wHour * 60 + time.wMinute ) >= ( tableline->Dh * 60 + tableline->Dm ) ) ); + && ( ( tableline->Ah < 0 ) // pass-through, always valid + || ( time.wHour * 60 + time.wMinute >= tableline->Dh * 60 + tableline->Dm ) ) ); auto traveltime = " " + ( i < 2 ? "" : @@ -726,7 +727,7 @@ debug_panel::update_section_ai( std::vector &Output ) { textline = "Acceleration:\n desired: " + to_string( mechanik.AccDesired, 2 ) + ", corrected: " + to_string( mechanik.AccDesired * mechanik.BrakeAccFactor(), 2 ) - + "\n current: " + to_string( mechanik.AbsAccS_pub, 2 ) + + "\n current: " + to_string( mechanik.AbsAccS_pub + 0.001f, 2 ) + ", slope: " + to_string( mechanik.fAccGravity + 0.001f, 2 ) + " (" + ( mechanik.fAccGravity > 0.01 ? "\\" : ( mechanik.fAccGravity < -0.01 ? "/" : "-" ) ) + ")" + "\n brake threshold: " + to_string( mechanik.fAccThreshold, 2 ) + ", delays: " + to_string( mechanik.fBrake_a0[ 0 ], 2 ) @@ -744,7 +745,7 @@ debug_panel::update_section_ai( std::vector &Output ) { std::vector const drivingflagnames { "StopCloser", "StopPoint", "Active", "Press", "Connect", "Primary", "Late", "StopHere", "StartHorn", "StartHornNow", "StartHornDone", "Oerlikons", "IncSpeed", "TrackEnd", "SwitchFound", "GuardSignal", - "Visibility", "DoorOpened", "PushPull", "SemaphorFound", "SemaphorWasElapsed", "TrainInsideStation", "SpeedLimitFound" }; + "Visibility", "DoorOpened", "PushPull", "SemaphorFound", "StopPointFound" /*"SemaphorWasElapsed", "TrainInsideStation", "SpeedLimitFound"*/ }; textline = "Driving flags:"; for( int idx = 0, flagbit = 1; idx < drivingflagnames.size(); ++idx, flagbit <<= 1 ) { diff --git a/editoruipanels.cpp b/editoruipanels.cpp index dd544e4d..74de4c7a 100644 --- a/editoruipanels.cpp +++ b/editoruipanels.cpp @@ -147,7 +147,7 @@ itemproperties_panel::update( scene::basic_node const *Node ) { textline += ", "; } textline += ( - event.second ? + event.second != nullptr ? event.second->asName : event.first + " (missing)" ); } diff --git a/parser.cpp b/parser.cpp index 69ff87bf..01820a80 100644 --- a/parser.cpp +++ b/parser.cpp @@ -196,7 +196,7 @@ std::string cParser::readToken( bool ToLower, const char *Break ) { // update line counter ++mLine; } - } while( token == "" && mStream->peek() != EOF ); // double check to deal with trailing spaces + } while( token == "" && mStream->peek() != EOF ); // double check in case of consecutive separators } if( false == parameters.empty() ) { diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index 78e62339..001a5d60 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -67,6 +67,7 @@ state_serializer::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) std::pair< std::string, deserializefunction> > functionlist = { + { "area", &state_serializer::deserialize_area }, { "atmo", &state_serializer::deserialize_atmo }, { "camera", &state_serializer::deserialize_camera }, { "config", &state_serializer::deserialize_config }, @@ -125,6 +126,20 @@ state_serializer::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) } } +void +state_serializer::deserialize_area( cParser &Input, scene::scratch_data &Scratchpad ) { + // first parameter specifies name of parent piece... + auto token { Input.getToken() }; + auto *groupowner { TIsolated::Find( token ) }; + // ...followed by list of its children + while( ( false == ( token = Input.getToken() ).empty() ) + && ( token != "endarea" ) ) { + // bind the children with their parent + auto *isolated { TIsolated::Find( token ) }; + isolated->parent( groupowner ); + } +} + void state_serializer::deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ) { diff --git a/simulationstateserializer.h b/simulationstateserializer.h index 09938dc1..58c8058f 100644 --- a/simulationstateserializer.h +++ b/simulationstateserializer.h @@ -29,6 +29,7 @@ private: // methods // restores class data from provided stream void deserialize( cParser &Input, scene::scratch_data &Scratchpad ); + void deserialize_area( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_atmo( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_camera( cParser &Input, scene::scratch_data &Scratchpad ); void deserialize_config( cParser &Input, scene::scratch_data &Scratchpad ); diff --git a/version.h b/version.h index 1c68578c..458ffd4c 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 909 +#define VERSION_MINOR 911 #define VERSION_REVISION 0 From 450b60d7bd05535a8c74b7b48c4b0e1296d60559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Mon, 10 Sep 2018 21:27:12 +0200 Subject: [PATCH 397/426] Variable fAccThreshold for dt_EZT and dt_DMU --- Driver.cpp | 14 ++++++++++---- Driver.h | 3 ++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 2aa98b08..c180ea66 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1932,21 +1932,22 @@ void TController::AutoRewident() 0.25 ); if( mvOccupied->TrainType == dt_EZT ) { - fAccThreshold = std::max( -0.55, -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ] ); + fNominalAccThreshold = std::max( -0.75, -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ] ); fBrakeReaction = 0.25; } else if( mvOccupied->TrainType == dt_DMU ) { - fAccThreshold = std::max( -0.45, -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ] ); + fNominalAccThreshold = std::max( -0.45, -fBrake_a0[ BrakeAccTableSize ] - 8 * fBrake_a1[ BrakeAccTableSize ] ); fBrakeReaction = 0.25; } else if (ustaw > 16) { - fAccThreshold = -fBrake_a0[ BrakeAccTableSize ] - 4 * fBrake_a1[ BrakeAccTableSize ]; + fNominalAccThreshold = -fBrake_a0[ BrakeAccTableSize ] - 4 * fBrake_a1[ BrakeAccTableSize ]; fBrakeReaction = 1.00 + fLength*0.004; } else { - fAccThreshold = -fBrake_a0[ BrakeAccTableSize ] - 1 * fBrake_a1[ BrakeAccTableSize ]; + fNominalAccThreshold = -fBrake_a0[ BrakeAccTableSize ] - 1 * fBrake_a1[ BrakeAccTableSize ]; fBrakeReaction = 1.00 + fLength*0.005; } + fAccThreshold = fNominalAccThreshold; /* if( IsHeavyCargoTrain ) { // HACK: heavy cargo trains don't activate brakes early enough @@ -3783,6 +3784,11 @@ TController::UpdateSituation(double dt) { fBrake_a0[0] = fBrake_a0[index]; fBrake_a1[0] = fBrake_a1[index]; + if ((mvOccupied->TrainType == dt_EZT) || (mvOccupied->TrainType == dt_DMU)) { + auto Coeff = clamp( mvOccupied->Vel*0.015 , 0.5 , 1.0); + fAccThreshold = fNominalAccThreshold * Coeff - fBrake_a0[BrakeAccTableSize] * (1.0 - Coeff); + } + Ready = true; // wstępnie gotowy fReady = 0.0; // założenie, że odhamowany fAccGravity = 0.0; // przyspieszenie wynikające z pochylenia diff --git a/Driver.h b/Driver.h index e508b747..1956f0cc 100644 --- a/Driver.h +++ b/Driver.h @@ -210,7 +210,8 @@ public: double fBrakeDist = 0.0; // przybliżona droga hamowania double BrakeAccFactor() const; double fBrakeReaction = 1.0; //opóźnienie zadziałania hamulca - czas w s / (km/h) - double fAccThreshold = 0.0; // próg opóźnienia dla zadziałania hamulca + double fNominalAccThreshold = 0.0; // nominalny próg opóźnienia dla zadziałania hamulca + double fAccThreshold = 0.0; // aktualny próg opóźnienia dla zadziałania hamulca double AbsAccS_pub = 0.0; // próg opóźnienia dla zadziałania hamulca // dla fBrake_aX: // indeks [0] - wartości odpowiednie dla aktualnej prędkości From e881092ca0812c07449a1816e5ae0a8ca9393c2e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 12 Sep 2018 21:33:40 +0200 Subject: [PATCH 398/426] voltage relays, additional light cab controls, minor cab control fixes --- Button.h | 2 +- McZapkie/MOVER.h | 22 +++--- McZapkie/Mover.cpp | 46 ++++++++---- Train.cpp | 157 +++++++++++++++++++++++++++------------- Train.h | 23 ++++-- command.cpp | 2 + command.h | 2 + driverkeyboardinput.cpp | 2 + drivermouseinput.cpp | 6 ++ translation.cpp | 6 ++ translation.h | 2 + 11 files changed, 189 insertions(+), 81 deletions(-) diff --git a/Button.h b/Button.h index 7eced4e4..bfb993ac 100644 --- a/Button.h +++ b/Button.h @@ -25,7 +25,7 @@ public: void Turn( bool const State ); inline bool GetValue() const { - return ( m_state ? 1 : 0 ); } + return m_state; } inline bool Active() { return ( ( pModelOn != nullptr ) diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index a7258151..3866c478 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -410,14 +410,14 @@ struct TBoilerType { }; /*rodzaj odbieraka pradu*/ struct TCurrentCollector { - long CollectorsNo; //musi być tu, bo inaczej się kopie - double MinH; double MaxH; //zakres ruchu pantografu, nigdzie nie używany - double CSW; //szerokość części roboczej (styku) ślizgacza - double MinV; double MaxV; //minimalne i maksymalne akceptowane napięcie - double OVP; //czy jest przekaznik nadnapieciowy - double InsetV; //minimalne napięcie wymagane do załączenia - double MinPress; //minimalne ciśnienie do załączenia WS - double MaxPress; //maksymalne ciśnienie za reduktorem + long CollectorsNo{0}; //musi być tu, bo inaczej się kopie + double MinH{ 0.0 }; double MaxH{ 0.0 }; //zakres ruchu pantografu, nigdzie nie używany + double CSW{ 0.0 }; //szerokość części roboczej (styku) ślizgacza + double MinV{ 0.0 }; double MaxV{ 0.0 }; //minimalne i maksymalne akceptowane napięcie + bool OVP{ false }; //czy jest przekaznik nadnapieciowy + double InsetV{ 0.0 }; //minimalne napięcie wymagane do załączenia + double MinPress{ 0.0 }; //minimalne ciśnienie do załączenia WS + double MaxPress{ 0.0 }; //maksymalne ciśnienie za reduktorem //inline TCurrentCollector() { // CollectorsNo = 0; // MinH, MaxH, CSW, MinV, MaxV = 0.0; @@ -1119,6 +1119,8 @@ public: double PantPress = 0.0; /*Cisnienie w zbiornikach pantografow*/ bool PantPressSwitchActive{ false }; // state of the pantograph pressure switch. gets primed at defined pressure level in pantograph air system bool PantPressLockActive{ false }; // pwr system state flag. fires when pressure switch activates by pantograph pressure dropping below defined level + bool NoVoltRelay{ true }; // switches off if the power level drops below threshold + bool OvervoltageRelay{ true }; // switches off if the power level goes above threshold bool s_CAtestebrake = false; //hunter-091012: zmienna dla testu ca /*-zmienne dla lokomotywy spalinowej z przekladnia mechaniczna*/ @@ -1337,7 +1339,7 @@ public: void FuelPumpCheck( double const Timestep ); void OilPumpCheck( double const Timestep ); bool FuseOn(void); //bezpiecznik nadamiary - bool FuseFlagCheck(void); // sprawdzanie flagi nadmiarowego + bool FuseFlagCheck(void) const; // sprawdzanie flagi nadmiarowego void FuseOff(void); // wylaczenie nadmiarowego double ShowCurrent( int AmpN ) const; //pokazuje bezwgl. wartosc pradu na wybranym amperomierzu double ShowCurrentP(int AmpN) const; //pokazuje bezwgl. wartosc pradu w wybranym pojezdzie //Q 20160722 @@ -1357,7 +1359,7 @@ public: bool AutoRelaySwitch(bool State); //przelacznik automatycznego rozruchu bool AutoRelayCheck(void);//symulacja automatycznego rozruchu - bool ResistorsFlagCheck(void); //sprawdzenie kontrolki oporow rozruchowych NBMX + bool ResistorsFlagCheck(void) const; //sprawdzenie kontrolki oporow rozruchowych NBMX bool PantFront( bool const State, range_t const Notify = range_t::consist ); //obsluga pantografou przedniego bool PantRear( bool const State, range_t const Notify = range_t::consist ); //obsluga pantografu tylnego diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 38f9ba89..f413f14a 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -2582,6 +2582,8 @@ bool TMoverParameters::MainSwitch( bool const State, range_t const Notify ) if( ( false == State ) || ( ( ( ScndCtrlPos == 0 ) || ( EngineType == TEngineType::ElectricInductionMotor ) ) && ( ( ConvOvldFlag == false ) || ( TrainType == dt_EZT ) ) + && ( true == NoVoltRelay ) + && ( true == OvervoltageRelay ) && ( LastSwitchingTime > CtrlDelay ) && ( false == TestFlag( DamageFlag, dtrain_out ) ) && ( false == TestFlag( EngDmgFlag, 1 ) ) ) ) { @@ -4452,6 +4454,32 @@ double TMoverParameters::TractionForce( double dt ) { } } + switch( EngineType ) { + + case TEngineType::ElectricSeriesMotor: { +/* + if ((Mains)) // nie wchodzić w funkcję bez potrzeby + if ( (std::max(GetTrainsetVoltage(), std::abs(Voltage)) < EnginePowerSource.CollectorParameters.MinV) || + (std::max(GetTrainsetVoltage(), std::abs(Voltage)) * EnginePowerSource.CollectorParameters.OVP > + EnginePowerSource.CollectorParameters.MaxV)) + if( MainSwitch( false, ( TrainType == dt_EZT ? range_t::unit : range_t::local ) ) ) // TODO: check whether we need to send this EMU-wide + EventFlag = true; // wywalanie szybkiego z powodu niewłaściwego napięcia +*/ + // update the state of voltage relays + auto const voltage { std::max( GetTrainsetVoltage(), std::abs( RunningTraction.TractionVoltage ) ) }; + NoVoltRelay = ( voltage >= EnginePowerSource.CollectorParameters.MinV ); + OvervoltageRelay = ( voltage <= EnginePowerSource.CollectorParameters.MaxV ) || ( false == EnginePowerSource.CollectorParameters.OVP ); + // wywalanie szybkiego z powodu niewłaściwego napięcia + EventFlag |= ( ( true == Mains ) + && ( ( false == NoVoltRelay ) || ( false == OvervoltageRelay ) ) + && ( MainSwitch( false, ( TrainType == dt_EZT ? range_t::unit : range_t::local ) ) ) ); // TODO: check whether we need to send this EMU-wide + break; + } + default: { + break; + } + } + if (ActiveDir != 0) switch (EngineType) { @@ -4532,13 +4560,6 @@ double TMoverParameters::TractionForce( double dt ) { if (Vhyp > CtrlDelay / 2) // jesli czas oddzialywania przekroczony FuseOff(); // wywalanie bezpiecznika z powodu przetezenia silnikow - if ((Mains)) // nie wchodzić w funkcję bez potrzeby - if ( (std::max(GetTrainsetVoltage(), std::abs(Voltage)) < EnginePowerSource.CollectorParameters.MinV) || - (std::max(GetTrainsetVoltage(), std::abs(Voltage)) * EnginePowerSource.CollectorParameters.OVP > - EnginePowerSource.CollectorParameters.MaxV)) - if( MainSwitch( false, ( TrainType == dt_EZT ? range_t::unit : range_t::local ) ) ) // TODO: check whether we need to send this EMU-wide - EventFlag = true; // wywalanie szybkiego z powodu niewłaściwego napięcia - if (((DynamicBrakeType == dbrake_automatic) || (DynamicBrakeType == dbrake_switch)) && (DynamicBrakeFlag)) Itot = Im * 2; // 2x2 silniki w EP09 else if ((TrainType == dt_EZT) && (Imin == IminLo) && (ScndS)) // yBARC - boczniki na szeregu poprawnie @@ -5161,7 +5182,7 @@ double TMoverParameters::ComputeRotatingWheel(double WForce, double dt, double n // Q: 20160713 // Sprawdzenie bezpiecznika nadmiarowego // ************************************************************************************************* -bool TMoverParameters::FuseFlagCheck(void) +bool TMoverParameters::FuseFlagCheck(void) const { bool FFC; @@ -5353,7 +5374,7 @@ bool TMoverParameters::MinCurrentSwitch(bool State) // Q: 20160713 // Sprawdzenie wskaźnika jazdy na oporach // ************************************************************************************************* -bool TMoverParameters::ResistorsFlagCheck(void) +bool TMoverParameters::ResistorsFlagCheck(void) const { bool RFC = false; @@ -8500,15 +8521,14 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet auto &collectorparameters = Powerparameters.CollectorParameters; + collectorparameters = TCurrentCollector(); + extract_value( collectorparameters.CollectorsNo, "CollectorsNo", Line, "" ); extract_value( collectorparameters.MinH, "MinH", Line, "" ); extract_value( collectorparameters.MaxH, "MaxH", Line, "" ); extract_value( collectorparameters.CSW, "CSW", Line, "" ); //szerokość części roboczej extract_value( collectorparameters.MaxV, "MaxVoltage", Line, "" ); - collectorparameters.OVP = //przekaźnik nadnapięciowy - extract_value( "OverVoltProt", Line ) == "Yes" ? - 1 : - 0; + extract_value( collectorparameters.OVP, "OverVoltProt", Line, "" ); //przekaźnik nadnapięciowy //napięcie rozłączające WS collectorparameters.MinV = 0.5 * collectorparameters.MaxV; //gdyby parametr nie podany extract_value( collectorparameters.MinV, "MinV", Line, "" ); diff --git a/Train.cpp b/Train.cpp index 789b770f..203f4dd2 100644 --- a/Train.cpp +++ b/Train.cpp @@ -311,6 +311,8 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::instrumentlighttoggle, &TTrain::OnCommand_instrumentlighttoggle }, { user_command::instrumentlightenable, &TTrain::OnCommand_instrumentlightenable }, { user_command::instrumentlightdisable, &TTrain::OnCommand_instrumentlightdisable }, + { user_command::dashboardlighttoggle, &TTrain::OnCommand_dashboardlighttoggle }, + { user_command::timetablelighttoggle, &TTrain::OnCommand_timetablelighttoggle }, { user_command::doorlocktoggle, &TTrain::OnCommand_doorlocktoggle }, { user_command::doortoggleleft, &TTrain::OnCommand_doortoggleleft }, { user_command::doortoggleright, &TTrain::OnCommand_doortoggleright }, @@ -370,7 +372,6 @@ TTrain::TTrain() { bCabLightDim = false; //----- pMechSittingPosition = Math3D::vector3(0, 0, 0); // ABu: 180404 - InstrumentLightActive = false; // ABu: 030405 fTachoTimer = 0.0; // włączenie skoków wskazań prędkościomierza // @@ -3619,6 +3620,54 @@ void TTrain::OnCommand_instrumentlightdisable( TTrain *Train, command_data const } } +void TTrain::OnCommand_dashboardlighttoggle( TTrain *Train, command_data const &Command ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Command.action != GLFW_PRESS ) { return; } + + if( Train->ggDashboardLightButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Dashboard Light switch is missing, or wasn't defined" ); + return; + } + + if( false == Train->DashboardLightActive ) { + // turn on + Train->DashboardLightActive = true; + // visual feedback + Train->ggDashboardLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + //turn off + Train->DashboardLightActive = false; + // visual feedback + Train->ggDashboardLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + } +} + +void TTrain::OnCommand_timetablelighttoggle( TTrain *Train, command_data const &Command ) { + // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Command.action != GLFW_PRESS ) { return; } + + if( Train->ggTimetableLightButton.SubModel == nullptr ) { + // TODO: proper control deviced definition for the interiors, that doesn't hinge of presence of 3d submodels + WriteLog( "Timetable Light switch is missing, or wasn't defined" ); + return; + } + + if( false == Train->TimetableLightActive ) { + // turn on + Train->TimetableLightActive = true; + // visual feedback + Train->ggTimetableLightButton.UpdateValue( 1.0, Train->dsbSwitch ); + } + else { + //turn off + Train->TimetableLightActive = false; + // visual feedback + Train->ggTimetableLightButton.UpdateValue( 0.0, Train->dsbSwitch ); + } +} + void TTrain::OnCommand_heatingtoggle( TTrain *Train, command_data const &Command ) { if( Train->ggTrainHeatingButton.SubModel == nullptr ) { @@ -4830,18 +4879,6 @@ bool TTrain::Update( double const Deltatime ) Console::ValueSet(6, fTachoVelocity); } #endif - // hunter-080812: wyrzucanie szybkiego na elektrykach gdy nie ma napiecia przy dowolnym ustawieniu kierunkowego - // Ra: to już jest w T_MoverParameters::TractionForce(), ale zależy od kierunku - if( ( mvControlled->Mains ) - && ( mvControlled->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) ) { - if( std::max( mvControlled->GetTrainsetVoltage(), std::abs( mvControlled->RunningTraction.TractionVoltage ) ) < 0.5 * mvControlled->EnginePowerSource.MaxVoltage ) { - // TODO: check whether it should affect entire consist for EMU - // TODO: check whether it should happen if there's power supplied alternatively through hvcouplers - // TODO: potentially move this to the mover module, as there isn't much reason to have this dependent on the operator presence - mvControlled->MainSwitch( false, ( mvControlled->TrainType == dt_EZT ? range_t::unit : range_t::local ) ); - } - } - // hunter-091012: swiatlo if (bCabLight == true) { @@ -5290,42 +5327,49 @@ bool TTrain::Update( double const Deltatime ) if (tmp) if ( mvControlled->Battery || mvControlled->ConverterFlag ) { - btLampkaWylSzybkiB.Turn( tmp->MoverParameters->Mains ); - btLampkaWylSzybkiBOff.Turn( false == tmp->MoverParameters->Mains ); + auto const *mover { tmp->MoverParameters }; - btLampkaOporyB.Turn(tmp->MoverParameters->ResistorsFlagCheck()); + btLampkaWylSzybkiB.Turn( mover->Mains ); + btLampkaWylSzybkiBOff.Turn( false == mover->Mains ); + + btLampkaOporyB.Turn(mover->ResistorsFlagCheck()); btLampkaBezoporowaB.Turn( - ( true == tmp->MoverParameters->ResistorsFlagCheck() ) - || ( tmp->MoverParameters->MainCtrlActualPos == 0 ) ); // do EU04 + ( true == mover->ResistorsFlagCheck() ) + || ( mover->MainCtrlActualPos == 0 ) ); // do EU04 - if( ( tmp->MoverParameters->StLinFlag ) - || ( tmp->MoverParameters->BrakePress > 2.0 ) - || ( tmp->MoverParameters->PipePress < 0.36 ) ) { + if( ( mover->StLinFlag ) + || ( mover->BrakePress > 2.0 ) + || ( mover->PipePress < 0.36 ) ) { btLampkaStycznB.Turn( false ); } - else if( tmp->MoverParameters->BrakePress < 1.0 ) { + else if( mover->BrakePress < 1.0 ) { btLampkaStycznB.Turn( true ); // mozna prowadzic rozruch } // hunter-271211: sygnalizacja poslizgu w pierwszym pojezdzie, gdy wystapi w drugim - btLampkaPoslizg.Turn(tmp->MoverParameters->SlippingWheels); + btLampkaPoslizg.Turn(mover->SlippingWheels); - btLampkaSprezarkaB.Turn( tmp->MoverParameters->CompressorFlag ); // mutopsitka dziala - btLampkaSprezarkaBOff.Turn( false == tmp->MoverParameters->CompressorFlag ); + btLampkaSprezarkaB.Turn( mover->CompressorFlag ); // mutopsitka dziala + btLampkaSprezarkaBOff.Turn( false == mover->CompressorFlag ); if( mvControlled->Signalling == true ) { - if( tmp->MoverParameters->BrakePress >= 1.45f ) { + if( mover->BrakePress >= 1.45f ) { btLampkaHamowanie2zes.Turn( true ); } - if( tmp->MoverParameters->BrakePress < 0.75f ) { + if( mover->BrakePress < 0.75f ) { btLampkaHamowanie2zes.Turn( false ); } } else { btLampkaHamowanie2zes.Turn( false ); } - btLampkaNadmPrzetwB.Turn( tmp->MoverParameters->ConvOvldFlag ); // nadmiarowy przetwornicy? - btLampkaPrzetwB.Turn( tmp->MoverParameters->ConverterFlag ); // zalaczenie przetwornicy - btLampkaPrzetwBOff.Turn( false == tmp->MoverParameters->ConverterFlag ); - btLampkaMalfunctionB.Turn( tmp->MoverParameters->dizel_heat.PA ); + btLampkaNadmPrzetwB.Turn( mover->ConvOvldFlag ); // nadmiarowy przetwornicy? + btLampkaPrzetwB.Turn( mover->ConverterFlag ); // zalaczenie przetwornicy + btLampkaPrzetwBOff.Turn( false == mover->ConverterFlag ); + btLampkaHVoltageB.Turn( mover->NoVoltRelay && mover->OvervoltageRelay ); + btLampkaMalfunctionB.Turn( mover->dizel_heat.PA ); + // motor fuse indicator turns on if the fuse was blown in any unit under control + if( mover->Mains ) { + btLampkaNadmSil.Turn( btLampkaNadmSil.GetValue() || mover->FuseFlagCheck() ); + } } else // wylaczone { @@ -5340,6 +5384,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaNadmPrzetwB.Turn( false ); btLampkaPrzetwB.Turn( false ); btLampkaPrzetwBOff.Turn( false ); + btLampkaHVoltageB.Turn( false ); btLampkaMalfunctionB.Turn( false ); } } @@ -5488,25 +5533,15 @@ bool TTrain::Update( double const Deltatime ) //---------- - // przelaczniki - // ABu030405 obsluga lampki uniwersalnej: - if( btInstrumentLight.Active() ) // w ogóle jest - if( InstrumentLightActive ) // załączona - switch( InstrumentLightType ) { - case 0: - btInstrumentLight.Turn( mvControlled->Battery || mvControlled->ConverterFlag ); - break; - case 1: - btInstrumentLight.Turn( mvControlled->Mains ); - break; - case 2: - btInstrumentLight.Turn( mvControlled->ConverterFlag ); - break; - default: - btInstrumentLight.Turn( false ); - } - else - btInstrumentLight.Turn( false ); + // lights + auto const lightpower { ( + InstrumentLightType == 0 ? mvControlled->Battery || mvControlled->ConverterFlag : + InstrumentLightType == 1 ? mvControlled->Mains : + InstrumentLightType == 2 ? mvControlled->ConverterFlag : + false ) }; + btInstrumentLight.Turn( InstrumentLightActive && lightpower ); + btDashboardLight.Turn( DashboardLightActive && lightpower ); + btTimetableLight.Turn( TimetableLightActive && lightpower ); // guziki: ggMainOffButton.Update(); @@ -5566,6 +5601,8 @@ bool TTrain::Update( double const Deltatime ) } // hunter-091012 ggInstrumentLightButton.Update(); + ggDashboardLightButton.Update(); + ggTimetableLightButton.Update(); ggCabLightButton.Update(); ggCabLightDimButton.Update(); ggBatteryButton.Update(); @@ -6698,6 +6735,8 @@ void TTrain::clear_cab_controls() universal.Clear(); } ggInstrumentLightButton.Clear(); + ggDashboardLightButton.Clear(); + ggTimetableLightButton.Clear(); // hunter-091012 ggCabLightButton.Clear(); ggCabLightDimButton.Clear(); @@ -6781,6 +6820,8 @@ void TTrain::clear_cab_controls() btLampkaHamulecReczny.Clear(); btLampkaBlokadaDrzwi.Clear(); btInstrumentLight.Clear(); + btDashboardLight.Clear(); + btTimetableLight.Clear(); btLampkaWentZaluzje.Clear(); btLampkaDoorLeft.Clear(); btLampkaDoorRight.Clear(); @@ -6794,6 +6835,7 @@ void TTrain::clear_cab_controls() btLampkaRadiotelefon.Clear(); btLampkaHamienie.Clear(); btLampkaBrakingOff.Clear(); + btLampkaED.Clear(); btLampkaBrakeProfileG.Clear(); btLampkaBrakeProfileP.Clear(); btLampkaBrakeProfileR.Clear(); @@ -6803,10 +6845,12 @@ void TTrain::clear_cab_controls() btLampkaSprezarkaBOff.Clear(); btLampkaFuelPumpOff.Clear(); btLampkaNapNastHam.Clear(); + btLampkaOporyB.Clear(); btLampkaStycznB.Clear(); btLampkaHamowanie1zes.Clear(); btLampkaHamowanie2zes.Clear(); btLampkaNadmPrzetwB.Clear(); + btLampkaHVoltageB.Clear(); btLampkaForward.Clear(); btLampkaBackward.Clear(); // light indicators @@ -7001,6 +7045,14 @@ void TTrain::set_cab_controls() { InstrumentLightActive ? 1.0 : 0.0 ) ); + ggDashboardLightButton.PutValue( ( + DashboardLightActive ? + 1.0 : + 0.0 ) ); + ggTimetableLightButton.PutValue( ( + TimetableLightActive ? + 1.0 : + 0.0 ) ); // doors // NOTE: we're relying on the cab models to have switches reversed for the rear cab(?) ggDoorLeftButton.PutValue( mvOccupied->DoorLeftOpened ? 1.0 : 0.0 ); @@ -7149,6 +7201,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-resistorsb:", btLampkaOporyB }, { "i-contactorsb:", btLampkaStycznB }, { "i-conv_ovldb:", btLampkaNadmPrzetwB }, + { "i-hvoltageb:", btLampkaHVoltageB }, { "i-malfunction:", btLampkaMalfunction }, { "i-malfunctionb:", btLampkaMalfunctionB }, { "i-forward:", btLampkaForward }, @@ -7163,6 +7216,8 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-rearrightlight:", btLampkaRearRightLight }, { "i-rearleftend:", btLampkaRearLeftEndLight }, { "i-rearrightend:", btLampkaRearRightEndLight }, + { "i-dashboardlight:", btDashboardLight }, + { "i-timetablelight:", btTimetableLight }, { "i-cablight:", btCabLight } }; auto lookup = lights.find( Label ); @@ -7290,6 +7345,8 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "door_signalling_sw:", ggDoorSignallingButton }, { "nextcurrent_sw:", ggNextCurrentButton }, { "instrumentlight_sw:", ggInstrumentLightButton }, + { "dashboardlight_sw:", ggDashboardLightButton }, + { "timetablelight_sw:", ggTimetableLightButton }, { "cablight_sw:", ggCabLightButton }, { "cablightdim_sw:", ggCabLightDimButton }, { "battery_sw:", ggBatteryButton }, diff --git a/Train.h b/Train.h index d365f4c0..8358dbf5 100644 --- a/Train.h +++ b/Train.h @@ -296,6 +296,8 @@ class TTrain static void OnCommand_instrumentlighttoggle( TTrain *Train, command_data const &Command ); static void OnCommand_instrumentlightenable( TTrain *Train, command_data const &Command ); static void OnCommand_instrumentlightdisable( TTrain *Train, command_data const &Command ); + static void OnCommand_dashboardlighttoggle( TTrain *Train, command_data const &Command ); + static void OnCommand_timetablelighttoggle( TTrain *Train, command_data const &Command ); static void OnCommand_doorlocktoggle( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleleft( TTrain *Train, command_data const &Command ); static void OnCommand_doortoggleright( TTrain *Train, command_data const &Command ); @@ -415,6 +417,8 @@ public: // reszta może by?publiczna std::array ggUniversals; // NOTE: temporary arrangement until we have dynamically built control table TGauge ggInstrumentLightButton; + TGauge ggDashboardLightButton; + TGauge ggTimetableLightButton; TGauge ggCabLightButton; // hunter-091012: przelacznik oswietlania kabiny TGauge ggCabLightDimButton; // hunter-091012: przelacznik przyciemnienia TGauge ggBatteryButton; // Stele 161228 hebelek baterii @@ -458,13 +462,13 @@ public: // reszta może by?publiczna TButton btLampkaNadmPrzetw; TButton btLampkaPrzetw; TButton btLampkaPrzetwOff; - TButton btLampkaPrzekRozn; - TButton btLampkaPrzekRoznPom; + TButton btLampkaPrzekRozn; // TODO: implement + TButton btLampkaPrzekRoznPom; // TODO: implement TButton btLampkaNadmSil; TButton btLampkaWylSzybki; TButton btLampkaWylSzybkiOff; TButton btLampkaNadmWent; - TButton btLampkaNadmSpr; + TButton btLampkaNadmSpr; // TODO: implement // yB: drugie lampki dla EP05 i ET42 TButton btLampkaOporyB; TButton btLampkaStycznB; @@ -473,6 +477,7 @@ public: // reszta może by?publiczna TButton btLampkaNadmPrzetwB; TButton btLampkaPrzetwB; TButton btLampkaPrzetwBOff; + TButton btLampkaHVoltageB; // TODO: implement // KURS90 lampki jazdy bezoporowej dla EU04 TButton btLampkaBezoporowaB; TButton btLampkaBezoporowa; @@ -485,9 +490,13 @@ public: // reszta może by?publiczna TButton btLampkaOpory; TButton btLampkaWysRozr; TButton btInstrumentLight; - int InstrumentLightType; // ABu 030405 - swiecenie uzaleznione od: 0-nic, 1-obw.gl, 2-przetw. - bool InstrumentLightActive; - TButton btLampkaWentZaluzje; // ET22 + TButton btDashboardLight; + TButton btTimetableLight; + int InstrumentLightType{ 0 }; // ABu 030405 - swiecenie uzaleznione od: 0-nic, 1-obw.gl, 2-przetw. + bool InstrumentLightActive{ false }; + bool DashboardLightActive{ false }; + bool TimetableLightActive{ false }; + TButton btLampkaWentZaluzje; // ET22 // TODO: implement TButton btLampkaOgrzewanieSkladu; TButton btLampkaSHP; TButton btLampkaCzuwaka; // McZapkie-141102 @@ -503,7 +512,7 @@ public: // reszta może by?publiczna TButton btLampkaBocznik2; TButton btLampkaBocznik3; TButton btLampkaBocznik4; - TButton btLampkaRadiotelefon; + TButton btLampkaRadiotelefon; // TODO: implement TButton btLampkaHamienie; TButton btLampkaBrakingOff; TButton btLampkaED; // Stele 161228 hamowanie elektrodynamiczne diff --git a/command.cpp b/command.cpp index dd08c5bc..f00a3683 100644 --- a/command.cpp +++ b/command.cpp @@ -200,6 +200,8 @@ commanddescription_sequence Commands_descriptions = { { "instrumentlighttoggle", command_target::vehicle }, { "instrumentlightenable", command_target::vehicle }, { "instrumentlightdisable", command_target::vehicle }, + { "dshboardlighttoggle", command_target::vehicle }, + { "timetablelighttoggle", command_target::vehicle }, { "generictoggle0", command_target::vehicle }, { "generictoggle1", command_target::vehicle }, { "generictoggle2", command_target::vehicle }, diff --git a/command.h b/command.h index 4fa04d00..e6048bee 100644 --- a/command.h +++ b/command.h @@ -193,6 +193,8 @@ enum class user_command { instrumentlighttoggle, instrumentlightenable, instrumentlightdisable, + dashboardlighttoggle, + timetablelighttoggle, generictoggle0, generictoggle1, generictoggle2, diff --git a/driverkeyboardinput.cpp b/driverkeyboardinput.cpp index 60fa407c..efe49008 100644 --- a/driverkeyboardinput.cpp +++ b/driverkeyboardinput.cpp @@ -202,6 +202,8 @@ driverkeyboard_input::default_bindings() { { user_command::instrumentlighttoggle, GLFW_KEY_SEMICOLON }, // instrumentlightenable, // instrumentlightdisable, + // dashboardlighttoggle, + // timetablelighttoggle, { user_command::generictoggle0, GLFW_KEY_0 }, { user_command::generictoggle1, GLFW_KEY_1 }, { user_command::generictoggle2, GLFW_KEY_2 }, diff --git a/drivermouseinput.cpp b/drivermouseinput.cpp index b099be2b..235bc589 100644 --- a/drivermouseinput.cpp +++ b/drivermouseinput.cpp @@ -676,6 +676,12 @@ drivermouse_input::default_bindings() { { "instrumentlight_sw:", { user_command::instrumentlighttoggle, user_command::none } }, + { "dashboardlight_sw:", { + user_command::dashboardlighttoggle, + user_command::none } }, + { "timetablelight_sw:", { + user_command::timetablelighttoggle, + user_command::none } }, { "cablight_sw:", { user_command::interiorlighttoggle, user_command::none } }, diff --git a/translation.cpp b/translation.cpp index 5ba5aa81..36884796 100644 --- a/translation.cpp +++ b/translation.cpp @@ -139,6 +139,8 @@ init() { "door locking", "current indicator source", "instrument light", + "dashboard light", + "timetable light", "interior light", "interior light dimmer", "battery", @@ -271,6 +273,8 @@ init() { "sygnalizacja blokady drzwi", "prady drugiego czlonu", "oswietlenie przyrzadow", + "oswietlenie pulpitu", + "oswietlenie rozkladu jazdy", "oswietlenie kabiny", "przyciemnienie oswietlenia kabiny", "bateria", @@ -375,6 +379,8 @@ init() { "door_signalling_sw:", "nextcurrent_sw:", "instrumentlight_sw:", + "dashboardlight_sw:", + "timetablelight_sw:", "cablight_sw:", "cablightdim_sw:", "battery_sw:", diff --git a/translation.h b/translation.h index 652444bd..2c39471e 100644 --- a/translation.h +++ b/translation.h @@ -128,6 +128,8 @@ enum string { cab_door_signalling_sw, cab_nextcurrent_sw, cab_instrumentlight_sw, + cab_dashboardlight_sw, + cab_timetablelight_sw, cab_cablight_sw, cab_cablightdim_sw, cab_battery_sw, From 6c68cff4c5d1e93be0ddba731b1a573e2e6bb875 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 15 Sep 2018 16:35:03 +0200 Subject: [PATCH 399/426] additional train state data exposed to uart interface, minor bug fixes --- Driver.cpp | 54 ++++++++++++++++++------------------------------- Model3d.cpp | 18 +++++++++-------- Names.h | 2 +- Train.cpp | 1 + Train.h | 1 + command.cpp | 2 +- skydome.cpp | 8 +++++++- translation.cpp | 6 +++--- uart.cpp | 3 ++- 9 files changed, 46 insertions(+), 49 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index c180ea66..36dd52e0 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -1651,39 +1651,25 @@ TController::~TController() CloseLog(); }; -std::string TController::Order2Str(TOrders Order) const -{ // zamiana kodu rozkazu na opis - if (Order & Change_direction) - return "Change_direction"; // może być nałożona na inną i wtedy ma priorytet - if (Order == Wait_for_orders) - return "Wait_for_orders"; - if (Order == Prepare_engine) - return "Prepare_engine"; - if (Order == Shunt) - return "Shunt"; - if (Order == Connect) - return "Connect"; - if (Order == Disconnect) - return "Disconnect"; - if (Order == Obey_train) - return "Obey_train"; - if (Order == Release_engine) - return "Release_engine"; - if (Order == Jump_to_first_order) - return "Jump_to_first_order"; - /* Ra: wersja ze switch nie działa prawidłowo (czemu?) - switch (Order) - { - Wait_for_orders: return "Wait_for_orders"; - Prepare_engine: return "Prepare_engine"; - Shunt: return "Shunt"; - Change_direction: return "Change_direction"; - Obey_train: return "Obey_train"; - Release_engine: return "Release_engine"; - Jump_to_first_order: return "Jump_to_first_order"; - } - */ - return "Undefined!"; +// zamiana kodu rozkazu na opis +std::string TController::Order2Str(TOrders Order) const { + + if( Order & Change_direction ) { + // może być nałożona na inną i wtedy ma priorytet + return "Change_direction"; + } + switch( Order ) { + case Wait_for_orders: return "Wait_for_orders"; + case Prepare_engine: return "Prepare_engine"; + case Release_engine: return "Release_engine"; + case Change_direction: return "Change_direction"; + case Connect: return "Connect"; + case Disconnect: return "Disconnect"; + case Shunt: return "Shunt"; + case Obey_train: return "Obey_train"; + case Jump_to_first_order: return "Jump_to_first_order"; + default: return "Undefined"; + } } std::string TController::OrderCurrent() const @@ -5611,7 +5597,7 @@ void TController::OrderPush(TOrders NewOrder) if (OrderTop >= maxorders) ErrorLog("Commands overflow: The program will now crash"); #if LOGORDERS - WriteLog("--> OrderPush"); + WriteLog("--> OrderPush: [" + Order2Str( NewOrder ) + "]"); OrdersDump(); // normalnie nie ma po co tego wypisywać #endif } diff --git a/Model3d.cpp b/Model3d.cpp index a2010d63..e72bb784 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -947,14 +947,16 @@ void TSubModel::RaAnimation(TAnimType a) case TAnimType::at_DigiClk: // animacja zegara cyfrowego { // ustawienie animacji w submodelach potomnych TSubModel *sm = ChildGet(); - do - { // pętla po submodelach potomnych i obracanie ich o kąt zależy od czasu - if (sm->pName.size()) - { // musi mieć niepustą nazwę - if ((sm->pName[0]) >= '0') - if ((sm->pName[0]) <= '5') // zegarek ma 6 cyfr maksymalnie - sm->SetRotate(float3(0, 1, 0), - -Global.fClockAngleDeg[(sm->pName[0]) - '0']); + do { // pętla po submodelach potomnych i obracanie ich o kąt zależy od czasu + if( sm->pName.size() ) { + // musi mieć niepustą nazwę + if( ( sm->pName[ 0 ] >= '0' ) + && ( sm->pName[ 0 ] <= '5') ) { + // zegarek ma 6 cyfr maksymalnie + sm->SetRotate( + float3( 0, 1, 0 ), + -Global.fClockAngleDeg[ sm->pName[ 0 ] - '0' ] ); + } } sm = sm->NextGet(); } while (sm); diff --git a/Names.h b/Names.h index e8cc93b0..9c6652ab 100644 --- a/Names.h +++ b/Names.h @@ -40,7 +40,7 @@ public: return false; } // locates item with specified name. returns pointer to the item, or nullptr Type_ * - find( std::string const &Name ) { + find( std::string const &Name ) const { auto lookup = m_itemmap.find( Name ); return ( lookup != m_itemmap.end() ? diff --git a/Train.cpp b/Train.cpp index 203f4dd2..b7a50b4d 100644 --- a/Train.cpp +++ b/Train.cpp @@ -596,6 +596,7 @@ TTrain::get_state() const { btHaslerBrakes.GetValue(), btHaslerCurrent.GetValue(), ( TestFlag( mvOccupied->SecuritySystem.Status, s_CAalarm ) || TestFlag( mvOccupied->SecuritySystem.Status, s_SHPalarm ) ), + btLampkaHVoltageB.GetValue(), fTachoVelocity, static_cast( mvOccupied->Compressor ), static_cast( mvOccupied->PipePress ), diff --git a/Train.h b/Train.h index 8358dbf5..f0049c24 100644 --- a/Train.h +++ b/Train.h @@ -85,6 +85,7 @@ class TTrain std::uint8_t recorder_braking; std::uint8_t recorder_power; std::uint8_t alerter_sound; + std::uint8_t coupled_hv_voltage_relays; float velocity; float reservoir_pressure; float pipe_pressure; diff --git a/command.cpp b/command.cpp index f00a3683..d1e7e768 100644 --- a/command.cpp +++ b/command.cpp @@ -200,7 +200,7 @@ commanddescription_sequence Commands_descriptions = { { "instrumentlighttoggle", command_target::vehicle }, { "instrumentlightenable", command_target::vehicle }, { "instrumentlightdisable", command_target::vehicle }, - { "dshboardlighttoggle", command_target::vehicle }, + { "dashboardlighttoggle", command_target::vehicle }, { "timetablelighttoggle", command_target::vehicle }, { "generictoggle0", command_target::vehicle }, { "generictoggle1", command_target::vehicle }, diff --git a/skydome.cpp b/skydome.cpp index d36f1f10..020ead60 100644 --- a/skydome.cpp +++ b/skydome.cpp @@ -348,10 +348,16 @@ void CSkyDome::RebuildColors() { if( m_coloursbuffer != -1 ) { // the colour buffer was already initialized, so on this run we update its content + // cache entry state + ::glPushClientAttrib( GL_CLIENT_VERTEX_ARRAY_BIT ); + // begin + ::glEnableClientState( GL_VERTEX_ARRAY ); + // update ::glBindBuffer( GL_ARRAY_BUFFER, m_coloursbuffer ); ::glBufferSubData( GL_ARRAY_BUFFER, 0, m_colours.size() * sizeof( glm::vec3 ), m_colours.data() ); + // cleanup + ::glPopClientAttrib(); } - } //******************************************************************************// diff --git a/translation.cpp b/translation.cpp index 36884796..52f255da 100644 --- a/translation.cpp +++ b/translation.cpp @@ -195,10 +195,10 @@ init() { " pantograf: %.2f%cZG", "Sily:\n napedna: %.1f, hamowania: %.1f, tarcie: %.2f%s\nPrzyspieszenia:\n styczne: %.2f, normalne: %.2f (promien: %s)\nPredkosc: %.2f, pokonana odleglosc: %.2f\nPozycja: [%.2f, %.2f, %.2f]", - "nastawnik", + "nastawnik jazdy", "nastawnik dodatkowy", "sterowanie analogowe", - "nastawnik jazdy", + "nastawnik kierunku", "hamulec zespolony", "hamulec pomocniczy", "hamulec reczny", @@ -224,7 +224,7 @@ init() { "syrena (ton niski)", "syrena (ton wysoki)", "gwizdawka", - "przekaznik nadmiarowy motorow trakcyjnych", + "przekaznik nadmiarowy silnikow trakcyjnych", "przekaznik nadmiarowy przetwornicy", "styczniki liniowe", "drzwi lewe", diff --git a/uart.cpp b/uart.cpp index c617b1fc..55d3b56d 100644 --- a/uart.cpp +++ b/uart.cpp @@ -253,7 +253,8 @@ void uart_input::poll() trainstate.ventilator_overload << 1 | trainstate.motor_overload_threshold << 2), //byte 3 - 0, + (uint8_t)( + trainstate.coupled_hv_voltage_relays << 0), //byte 4 (uint8_t)( trainstate.train_heating << 0 From 77d0592e51e0bdf0bed48902dfea5c6d0dd8a048 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 15 Sep 2018 16:36:49 +0200 Subject: [PATCH 400/426] basic events code refactor, support for multiple event targets --- Event.cpp | 1753 +++++++++++++++++++++++++++++++++++++++++++++++++++ Event.h | 237 +++++++ MemCell.cpp | 13 +- MemCell.h | 14 +- 4 files changed, 2008 insertions(+), 9 deletions(-) diff --git a/Event.cpp b/Event.cpp index 14f631fa..18cd4fa2 100644 --- a/Event.cpp +++ b/Event.cpp @@ -30,6 +30,7 @@ http://mozilla.org/MPL/2.0/. #include "timer.h" #include "logs.h" +#ifdef EU07_USE_LEGACY_EVENTS TEvent::TEvent( std::string const &m ) : asNodeName( m ) { @@ -1840,3 +1841,1755 @@ event_manager::EventConditon( TEvent *Event ) { // unrecognized request return false; } +#else +TMemCell const * +TEvent::update_data::data_cell() const { + + return static_cast( std::get( data_source ) ); +} +TMemCell * +TEvent::update_data::data_cell() { + + return static_cast( std::get( data_source ) ); +} + +TEvent::TEvent() { +/* + if( false == m.empty() ) { + // utworzenie niejawnego odczytu komórki pamięci w torze + Type = tp_GetValues; + } + for( int i = 0; i < 13; ++i ) { + Params[ i ].asPointer = nullptr; + } +*/ +}; + +TEvent::~TEvent() { + + switch (Type) + { // sprzątanie + case tp_Animation: // nic + if( m_animationtype == 4 ) { + // jeśli z pliku VMD + SafeDeleteArray( m_animationfiledata ); // zwolnić obszar + } + break; + default: + break; + } + evJoined = nullptr; // nie usuwać podczepionych tutaj + +}; + +void TEvent::Load(cParser *parser, Math3D::vector3 const &org) +{ + std::string token; + + bEnabled = true; // zmieniane na false dla eventów używanych do skanowania sygnałów + + parser->getTokens(); + *parser >> token; + asName = ToLower(token); // użycie parametrów może dawać wielkie + + parser->getTokens(); + *parser >> token; + + if (token == "updatevalues") + Type = tp_UpdateValues; + else if (token == "getvalues") + Type = tp_GetValues; + else if (token == "putvalues") + Type = tp_PutValues; + else if (token == "sound") + Type = tp_Sound; + else if (token == "animation") + Type = tp_Animation; + else if (token == "lights") + Type = tp_Lights; + else if (token == "visible") + Type = tp_Visible; // zmiana wyświetlania obiektu + else if (token == "switch") + Type = tp_Switch; + else if (token == "trackvel") + Type = tp_TrackVel; + else if (token == "multiple") + Type = tp_Multiple; + else if (token == "addvalues") + Type = tp_AddValues; + else if (token == "copyvalues") + Type = tp_CopyValues; + else if (token == "whois") + Type = tp_WhoIs; + else if (token == "logvalues") + Type = tp_LogValues; + else if (token == "voltage") + Type = tp_Voltage; // zmiana napięcia w zasilaczu (TractionPowerSource) + else if (token == "message") + Type = tp_Message; // wyświetlenie komunikatu + else if (token == "friction") + Type = tp_Friction; // zmiana tarcia na scenerii + else + Type = tp_Unknown; + + parser->getTokens(); + *parser >> fDelay; + + parser->getTokens(); + *parser >> token; +/* + if( token != "none" ) { + asNodeName = token; // nazwa obiektu powiązanego + } +*/ + load_targets( token ); + + if (asName.substr(0, 5) == "none_") + m_ignored = true; // Ra: takie są ignorowane + + switch (Type) { + case tp_AddValues: { + m_update.flags = update_memadd; // dodawanko + // NOTE: AddValues and UpdateValues are largely the same + } + case tp_UpdateValues: { + // update data, previously stored in params 0, 1, 2 + parser->getTokens( 1, false ); // case sensitive + *parser >> m_update.data_text; + if( m_update.data_text != "*" ) { //"*" - nie brac command pod uwage + m_update.flags |= update_memstring; + } + parser->getTokens(); + if( parser->peek() != "*" ) { //"*" - nie brac val1 pod uwage + *parser >> m_update.data_value_1; + m_update.flags |= update_memval1; + } + parser->getTokens(); + if( parser->peek() != "*" ) { //"*" - nie brac val2 pod uwage + *parser >> m_update.data_value_2; + m_update.flags |= update_memval2; + } + // optional blocks + while( ( false == ( token = parser->getToken() ).empty() ) + && ( token != "endevent" ) ) { + + if( token == "condition" ) { + m_condition.load( *parser ); + // NOTE: load() call leaves a preloaded token if it's not recognized + *parser >> token; + if( ( true == token.empty() ) || ( token == "endevent" ) ) { break; } + } + if( token == "randomdelay" ) { // losowe opóźnienie + parser->getTokens(); + *parser >> fRandomDelay; // Ra 2014-03-11 + } + } + break; + } + case tp_CopyValues: { + m_update.flags = update_memstring | update_memval1 | update_memval2; // normalnie trzy + int paramidx { 0 }; + while( ( false == ( token = parser->getToken() ).empty() ) + && ( token != "endevent" ) ) { + switch( ++paramidx ) { + case 1: { // nazwa drugiej komórki (źródłowej) // previously stored in param 9 + std::get( m_update.data_source ) = token; + break; + } + case 2: { // maska wartości + m_update.flags = stol_def( token, ( update_memstring | update_memval1 | update_memval2 ) ); + break; + } + default: { + break; + } + } + } + break; + } + case tp_WhoIs: { + m_update.flags = update_memstring | update_memval1 | update_memval2; // normalnie trzy + int paramidx { 0 }; + while( ( false == ( token = parser->getToken() ).empty() ) + && ( token != "endevent" ) ) { + switch( ++paramidx ) { + case 1: { // maska wartości + m_update.flags = stol_def( token, ( update_memstring | update_memval1 | update_memval2 ) ); + break; + } + default: { + break; + } + } + } + break; + } + case tp_GetValues: + case tp_LogValues: { + parser->getTokens(); //"endevent" + *parser >> token; + break; + } + case tp_PutValues: { + parser->getTokens( 3 ); + // location, previously held in param 3, 4, 5 + *parser + >> m_update.location.x + >> m_update.location.y + >> m_update.location.z; + // przesunięcie + // tmp->pCenter.RotateY(aRotate.y/180.0*M_PI); //Ra 2014-11: uwzględnienie rotacji + // TBD, TODO: take into account rotation as well? + m_update.location += glm::dvec3{ org }; + + parser->getTokens( 1, false ); // komendy 'case sensitive' + *parser >> token; + // command type, previously held in param 6 + if( token.substr( 0, 19 ) == "PassengerStopPoint:" ) { + if( token.find( '#' ) != std::string::npos ) + token.erase( token.find( '#' ) ); // obcięcie unikatowości + win1250_to_ascii( token ); // get rid of non-ascii chars + m_update.command_type = TCommandType::cm_PassengerStopPoint; + // nie do kolejki (dla SetVelocity też, ale jak jest do toru dowiązany) + bEnabled = false; + } + else if( token == "SetVelocity" ) { + m_update.command_type = TCommandType::cm_SetVelocity; + bEnabled = false; + } + else if( token == "RoadVelocity" ) { + m_update.command_type = TCommandType::cm_RoadVelocity; + bEnabled = false; + } + else if( token == "SectionVelocity" ) { + m_update.command_type = TCommandType::cm_SectionVelocity; + bEnabled = false; + } + else if( token == "ShuntVelocity" ) { + m_update.command_type = TCommandType::cm_ShuntVelocity; + bEnabled = false; + } + else if( token == "OutsideStation" ) { + m_update.command_type = TCommandType::cm_OutsideStation; + bEnabled = false; // ma być skanowny, aby AI nie przekraczało W5 + } + else { + m_update.command_type = TCommandType::cm_Unknown; + } + // update data, previously stored in params 0, 1, 2 + m_update.data_text = token; + parser->getTokens(); + if( parser->peek() != "none" ) { + *parser >> m_update.data_value_1; + } + parser->getTokens(); + if( parser->peek() != "none" ) { + *parser >> m_update.data_value_2; + } + parser->getTokens(); + *parser >> token; + break; + } + case tp_Lights: { + // TBD, TODO: remove light count limit? + auto const lightcountlimit { 8 }; + m_lights.resize( lightcountlimit ); + int paramidx { 0 }; + parser->getTokens(); + while( ( false == ( token = parser->peek() ).empty() ) + && ( token != "endevent" ) ) { + + if( paramidx < lightcountlimit ) { + *parser >> m_lights[ paramidx++ ]; + } + else { + ErrorLog( "Bad event: lights event \"" + asName + "\" with more than " + to_string( lightcountlimit ) + " parameters" ); + } + parser->getTokens(); + } + while( paramidx < lightcountlimit ) { + // HACK: mark unspecified lights with magic value + m_lights[ paramidx++ ] = -2.f; + } + break; + } + case tp_Visible: // zmiana wyświetlania obiektu + parser->getTokens(); + // visibility flag, previously held in param 0 + *parser >> m_visible; + parser->getTokens(); + *parser >> token; + break; + case tp_Sound: + parser->getTokens(); + // playback mode, previously held in param 0 // 0: wylaczyc, 1: wlaczyc; -1: wlaczyc zapetlone + *parser >> m_soundmode; + parser->getTokens(); + if( parser->peek() != "endevent" ) { + // optional parameter, radio channel to receive/broadcast the sound, previously held in param 1 + *parser >> m_soundradiochannel; + parser->getTokens(); + } + *parser >> token; + break; + case tp_Animation: + parser->getTokens(); + *parser >> token; + if (token.compare("rotate") == 0) + { // obrót względem osi + parser->getTokens(); + // animation submodel, previously held in param 9 + *parser >> m_animationsubmodel; + // animation type, previously held in param 0 + m_animationtype = 1; + parser->getTokens( 4 ); + // animation params, previously held in param 1, 2, 3, 4 + *parser + >> m_animationparams[ 0 ] + >> m_animationparams[ 1 ] + >> m_animationparams[ 2 ] + >> m_animationparams[ 3 ]; + } + else if (token.compare("translate") == 0) + { // przesuw o wektor + parser->getTokens(); + // animation submodel, previously held in param 9 + *parser >> m_animationsubmodel; + // animation type, previously held in param 0 + m_animationtype = 2; + parser->getTokens( 4 ); + // animation params, previously held in param 1, 2, 3, 4 + *parser + >> m_animationparams[ 0 ] + >> m_animationparams[ 1 ] + >> m_animationparams[ 2 ] + >> m_animationparams[ 3 ]; + } + else if (token.compare("digital") == 0) + { // licznik cyfrowy + parser->getTokens(); + // animation submodel, previously held in param 9 + *parser >> m_animationsubmodel; + // animation type, previously held in param 0 + m_animationtype = 8; + parser->getTokens( 4 ); + // animation params, previously held in param 1, 2, 3, 4 + *parser + >> m_animationparams[ 0 ] + >> m_animationparams[ 1 ] + >> m_animationparams[ 2 ] + >> m_animationparams[ 3 ]; + } + else if (token.substr(token.length() - 4, 4) == ".vmd") // na razie tu, może będzie inaczej + { // animacja z pliku VMD + { + m_animationfilename = token; + std::ifstream file( szModelPath + m_animationfilename, std::ios::binary | std::ios::ate ); file.unsetf( std::ios::skipws ); + auto size = file.tellg(); // ios::ate already positioned us at the end of the file + file.seekg( 0, std::ios::beg ); // rewind the caret afterwards + // animation size, previously held in param 7 + m_animationfilesize = size; + // animation data, previously held in param 8 + m_animationfiledata = new char[size]; + file.read( m_animationfiledata, size ); // wczytanie pliku + } + parser->getTokens(); + // animation submodel, previously held in param 9 + *parser >> m_animationsubmodel; + // animation type, previously held in param 0 + m_animationtype = 4; + parser->getTokens( 4 ); + // animation params, previously held in param 1, 2, 3, 4 + *parser + >> m_animationparams[ 0 ] + >> m_animationparams[ 1 ] + >> m_animationparams[ 2 ] + >> m_animationparams[ 3 ]; + } + parser->getTokens(); + *parser >> token; + break; + case tp_Switch: + parser->getTokens(); + // switch state, previously held in param 0 + *parser >> m_switchstate; + parser->getTokens(); + if (parser->peek() != "endevent") { + // prędkość liniowa ruchu iglic + // previously held in param 1 + *parser >> m_switchmoverate; + parser->getTokens(); + } + if (parser->peek() != "endevent") { + // dodatkowy ruch drugiej iglicy (zamknięcie nastawnicze) + // previously held in param 2 + *parser >> m_switchmovedelay; + parser->getTokens(); + } + break; + case tp_TrackVel: + parser->getTokens(); + // velocity, previously held in param 0 + *parser >> m_velocity; + parser->getTokens(); + *parser >> token; + break; + case tp_Multiple: { + m_condition.has_else = false; + while( ( false == ( token = parser->getToken() ).empty() ) + && ( token != "endevent" ) ) { + + if( token == "condition" ) { + m_condition.load( *parser ); + // NOTE: load() call leaves a preloaded token if it's not recognized + *parser >> token; + if( ( true == token.empty() ) || ( token == "endevent" ) ) { break; } + } + + if( token == "randomdelay" ) { // losowe opóźnienie + parser->getTokens(); + *parser >> fRandomDelay; // Ra 2014-03-11 + } + else if( token == "else" ) { + // zmiana flagi dla słowa "else" + m_condition.has_else = !m_condition.has_else; + } + else { + // potentially valid event name + if( token.substr( 0, 5 ) != "none_" ) { + // eventy rozpoczynające się od "none_" są ignorowane + m_children.emplace_back( token, nullptr, ( m_condition.has_else == false ) ); + } + else { + WriteLog( "Multi-event \"" + asName + "\" ignored link to event \"" + token + "\"" ); + } + } + } + break; + } + case tp_Voltage: // zmiana napięcia w zasilaczu (TractionPowerSource) + parser->getTokens(); + // voltage, previously held in param 0 + *parser >> m_voltage; + parser->getTokens(); + *parser >> token; + break; + case tp_Friction: // zmiana przyczepnosci na scenerii + parser->getTokens(); + // friction, previously held in param 0 + *parser >> m_friction; + parser->getTokens(); + *parser >> token; + break; + case tp_Message: // wyświetlenie komunikatu + do + { + parser->getTokens(); + *parser >> token; + // str = AnsiString(token.c_str()); + } while (token != "endevent"); + break; + case tp_Unknown: // nieznany + do + { + parser->getTokens(); + *parser >> token; + // str = AnsiString(token.c_str()); + } while (token != "endevent"); + WriteLog("Bad event: \"" + asName + + (Type == tp_Unknown ? "\" has unknown type." : "\" is ignored.")); + break; + } +}; + +void +TEvent::init_conditions() { + + m_condition.tracks.clear(); + + if( m_condition.flags & ( conditional_trackoccupied | conditional_trackfree ) ) { + for( auto &target : m_targets ) { + m_condition.tracks.emplace_back( simulation::Paths.find( std::get( target ) ) ); + if( m_condition.tracks.back() == nullptr ) { +// m_ignored = true; // deaktywacja + ErrorLog( "Bad event: track \"" + std::get( target ) + "\" referenced in event \"" + asName + "\" doesn't exist" ); + m_condition.flags &= ~( conditional_trackoccupied | conditional_trackfree ); // zerowanie flag + } + } + } +} + +void +TEvent::condition_data::load( cParser &Input ) +{ // przetwarzanie warunków, wspólne dla Multiple i UpdateValues + + std::string token; + while( ( true == Input.getTokens() ) + && ( false == ( token = Input.peek() ).empty() ) + && ( token != "endevent" ) + && ( token != "randomdelay" ) ) { + + if( token == "trackoccupied" ) { + flags |= conditional_trackoccupied; + } + else if( token == "trackfree" ) { + flags |= conditional_trackfree; + } + else if( token == "propability" ) { + flags |= conditional_propability; + Input.getTokens(); + Input >> probability; + } + else if( token == "memcompare" ) { + flags |= conditional_memcompare; + Input.getTokens( 1, false ); // case sensitive + if( Input.peek() != "*" ) //"*" - nie brac command pod uwage + { // zapamiętanie łańcucha do porównania + Input >> match_text; + flags |= conditional_memstring; + } + Input.getTokens(); + if( Input.peek() != "*" ) //"*" - nie brac val1 pod uwage + { + Input >> match_value_1; + flags |= conditional_memval1; + } + Input.getTokens(); + if( Input.peek() != "*" ) //"*" - nie brac val2 pod uwage + { + Input >> match_value_2; + flags |= conditional_memval2; + } + } + } +} + +void TEvent::load_targets( std::string const &Input ) { + + cParser targetparser{ Input }; + std::string target; + while( false == ( target = targetparser.getToken( true, "|," ) ).empty() ) { + // actual bindings to targets of proper type are created during scenario initialization + if( target != "none" ) { + // sound objects don't inherit from scene node, so we can't use the same container + // TODO: fix this, having sounds as scene nodes (or a node wrapper for one) might have benefits elsewhere + if( Type != tp_Sound ) { + m_targets.emplace_back( target, nullptr ); + } + else { + m_sounds.emplace_back( target, nullptr ); + } + } + } +} + +std::string +TEvent::type_to_string() const { + + std::vector const types { + "unknown", "sound", "animation", "lights", "updatevalues", + "getvalues", "putvalues", "switch", "trackvel", "multiple", + "addvalues", "copyvalues", "whois", "logvalues", "visible", + "voltage", "message", "friction" }; + + return types[ Type ]; +} + +// sends basic content of the class in legacy (text) format to provided stream +void +TEvent::export_as_text( std::ostream &Output ) const { + + if( Type == tp_Unknown ) { return; } + + // header + Output << "event "; + // name + Output << asName << ' '; + // type + Output << type_to_string() << ' '; + // delay + Output << fDelay << ' '; + // target node(s) + if( m_targets.empty() ) { + Output << "none"; + } + else { + auto targetidx { 0 }; + for( auto &target : m_targets ) { + auto *targetnode { std::get( target ) }; + Output + << ( targetnode != nullptr ? targetnode->name() : std::get( target ) ) + << ( ++targetidx < m_targets.size() ? '|' : ' ' ); + } + } + // type-specific attributes + switch( Type ) { + case tp_AddValues: + case tp_UpdateValues: { + Output + << ( ( m_update.flags & update_memstring ) == 0 ? "*" : m_update.data_text ) << ' ' + << ( ( m_update.flags & update_memval1 ) == 0 ? "*" : to_string( m_update.data_value_1 ) ) << ' ' + << ( ( m_update.flags & update_memval2 ) == 0 ? "*" : to_string( m_update.data_value_2 ) ) << ' '; + break; + } + case tp_CopyValues: { + auto const *datasource = static_cast( std::get( m_update.data_source ) ); + Output + << ( datasource != nullptr ? + datasource->name() : + std::get( m_update.data_source ) ) + << ' ' << ( m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ) << ' '; + break; + } + case tp_PutValues: { + Output + // location + << m_update.location.x << ' ' + << m_update.location.y << ' ' + << m_update.location.z << ' ' + // command + << m_update.data_text << ' ' + << m_update.data_value_1 << ' ' + << m_update.data_value_2 << ' '; + break; + } + case tp_Multiple: { + for( auto const &childevent : m_children ) { + if( true == std::get( childevent ) ) { + auto *childeventdata { std::get( childevent ) }; + Output + << ( childeventdata != nullptr ? + childeventdata->asName : + std::get( childevent ) ) + << ' '; + } + } + // optional 'else' block + if( false == m_condition.has_else ) { break; } + Output << "else "; + for( auto const &childevent : m_children ) { + if( false == std::get( childevent ) ) { + auto *childeventdata { std::get( childevent ) }; + Output + << ( childeventdata != nullptr ? + childeventdata->asName : + std::get( childevent ) ) + << ' '; + } + } + break; + } + case tp_Visible: { + Output << ( m_visible ? 1 : 0 ) << ' '; + break; + } + case tp_Switch: { + Output << m_switchstate << ' '; + if( ( m_switchmoverate < 0.f ) + || ( m_switchmovedelay < 0.f ) ) { + Output << m_switchmoverate << ' '; + } + if( m_switchmovedelay < 0.f ) { + Output << m_switchmovedelay << ' '; + } + break; + } + case tp_Lights: { + auto lightidx { 0 }; + while( ( lightidx < iMaxNumLights ) + && ( m_lights[ lightidx ] > -2.0 ) ) { + Output << m_lights[ lightidx ] << ' '; + ++lightidx; + } + break; + } + case tp_Animation: { + // animation type + Output << ( + m_animationtype == 1 ? "rotate" : + m_animationtype == 2 ? "translate" : + m_animationtype == 4 ? m_animationfilename : + m_animationtype == 8 ? "digital" : + "none" ) + << ' '; + // submodel + Output << m_animationsubmodel << ' '; + // animation parameters + Output + << m_animationparams[0] << ' ' + << m_animationparams[1] << ' ' + << m_animationparams[2] << ' ' + << m_animationparams[3] << ' '; + break; + } + case tp_Sound: { + // playback mode + Output << m_soundmode << ' '; + // optional radio channel + if( m_soundradiochannel > 0 ) { + Output << m_soundradiochannel << ' '; + } + break; + } + case tp_TrackVel: + Output << m_velocity << ' '; + break; + case tp_Voltage: + Output << m_voltage << ' '; + break; + case tp_Friction: { + Output << m_friction << ' '; + break; + } + case tp_WhoIs: { + Output + << ( m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ) << ' '; + break; + } + default: { + break; + } + } + // optional conditions + // NOTE: for flexibility condition check and export is performed for all event types rather than only for these which support it currently + auto const isconditional { ( conditional_trackoccupied | conditional_trackfree | conditional_propability | conditional_memcompare ) }; + if( ( ( m_condition.flags & isconditional ) != 0 ) ) { + Output << "condition "; + if( ( m_condition.flags & conditional_trackoccupied ) != 0 ) { + Output << "trackoccupied "; + } + if( ( m_condition.flags & conditional_trackfree ) != 0 ) { + Output << "trackfree "; + } + if( ( m_condition.flags & conditional_propability ) != 0 ) { + Output + << "propability " + << m_condition.probability << ' '; + } + if( ( m_condition.flags & conditional_memcompare ) != 0 ) { + Output + << "memcompare " + << ( ( m_condition.flags & conditional_memstring ) == 0 ? "*" : m_condition.match_text ) << ' ' + << ( ( m_condition.flags & conditional_memval1 ) == 0 ? "*" : to_string( m_condition.match_value_1 ) ) << ' ' + << ( ( m_condition.flags & conditional_memval2 ) == 0 ? "*" : to_string( m_condition.match_value_2 ) ) << ' '; + } + } + if( fRandomDelay != 0.0 ) { + Output + << "randomdelay " + << fRandomDelay << ' '; + } + // footer + Output + << "endevent" + << "\n"; +} + +void TEvent::AddToQuery( TEvent *Event, TEvent *&Start ) { + + TEvent *target( Start ); + TEvent *previous( nullptr ); + while( ( Event->fStartTime >= target->fStartTime ) + && ( target->evNext != nullptr ) ) { + previous = target; + target = target->evNext; + } + // the new event will be either before or after the one we located + if( Event->fStartTime >= target->fStartTime ) { + assert( target->evNext == nullptr ); + target->evNext = Event; + // if we have resurrected event land at the end of list, the link from previous run could potentially "add" unwanted events to the queue + Event->evNext = nullptr; + } + else { + if( previous != nullptr ) { + previous->evNext = Event; + Event->evNext = target; + } + else { + // special case, we're inserting our event before the provided start point + Event->evNext = Start; + Start = Event; + } + } +} + +//--------------------------------------------------------------------------- + +std::string TEvent::CommandGet() const +{ // odczytanie komendy z eventu + switch (Type) + { // to się wykonuje również składu jadącego bez obsługi + case tp_GetValues: + return m_update.data_cell()->Text(); + case tp_PutValues: + return m_update.data_text; + } + return ""; // inne eventy się nie liczą +}; + +TCommandType TEvent::Command() const +{ // odczytanie komendy z eventu + switch (Type) + { // to się wykonuje również dla składu jadącego bez obsługi + case tp_GetValues: + return m_update.data_cell()->Command(); + case tp_PutValues: + return m_update.command_type; // komenda zakodowana binarnie + } + return TCommandType::cm_Unknown; // inne eventy się nie liczą +}; + +double TEvent::ValueGet(int n) const +{ // odczytanie komendy z eventu + n &= 1; // tylko 1 albo 2 jest prawidłowy + switch (Type) + { // to się wykonuje również składu jadącego bez obsługi + case tp_GetValues: + return ( n ? m_update.data_cell()->Value1() : m_update.data_cell()->Value2() ); + case tp_PutValues: + return ( n ? m_update.data_value_1 : m_update.data_value_2 ); + } + return 0.0; // inne eventy się nie liczą +}; + +glm::dvec3 TEvent::PositionGet() const +{ // pobranie współrzędnych eventu + switch (Type) + { // + case tp_GetValues: + return m_update.data_cell()->location(); // współrzędne podłączonej komórki pamięci + case tp_PutValues: + return m_update.location; + } + return glm::dvec3(0, 0, 0); // inne eventy się nie liczą +}; + +bool TEvent::StopCommand() const +{ // + if (Type == tp_GetValues) + return m_update.data_cell()->StopCommand(); // info o komendzie z komórki + + return false; +}; + +void TEvent::StopCommandSent() +{ + if (Type == tp_GetValues) + m_update.data_cell()->StopCommandSent(); // komenda z komórki została wysłana +}; + +void TEvent::Append(TEvent *e) +{ // doczepienie kolejnych z tą samą nazwą + if (evJoined) + evJoined->Append(e); // rekurencja! - góra kilkanaście eventów będzie potrzebne + else + { + evJoined = e; + e->bEnabled = true; // ten doczepiony może być tylko kolejkowany + } +}; + + + +event_manager::~event_manager() { + + for( auto *event : m_events ) { + delete event; + } +} + +// adds specified event launcher to the list of global launchers +void +event_manager::queue( TEventLauncher *Launcher ) { + + m_launcherqueue.emplace_back( Launcher ); +} + +// legacy method, updates event queues +void +event_manager::update() { + + // process currently queued events + CheckQuery(); + // test list of global events for possible new additions to the queue + for( auto *launcher : m_launcherqueue ) { + + if( true == ( launcher->check_activation() && launcher->check_conditions() ) ) { + // NOTE: we're presuming global events aren't going to use event2 + WriteLog( "Eventlauncher " + launcher->name() ); + if( launcher->Event1 ) { + AddToQuery( launcher->Event1, nullptr ); + } + } + } +} + +// adds provided event to the collection. returns: true on success +// TODO: return handle instead of pointer +bool +event_manager::insert( TEvent *Event ) { + + if( Event->Type == tp_Unknown ) { return false; } + + // najpierw sprawdzamy, czy nie ma, a potem dopisujemy + auto lookup = m_eventmap.find( Event->asName ); + if( lookup != m_eventmap.end() ) { + // duplicate of already existing event + auto const size = Event->asName.size(); + // zawsze jeden znak co najmniej jest + if( Event->asName[ 0 ] == '#' ) { + // utylizacja duplikatu z krzyżykiem + return false; + } + // tymczasowo wyjątki: + else if( ( size > 8 ) + && ( Event->asName.substr( 0, 9 ) == "lineinfo:" ) ) { + // tymczasowa utylizacja duplikatów W5 + return false; + } + else if( ( size > 8 ) + && ( Event->asName.substr( size - 8 ) == "_warning" ) ) { + // tymczasowa utylizacja duplikatu z trąbieniem + return false; + } + else if( ( size > 4 ) + && ( Event->asName.substr( size - 4 ) == "_shp" ) ) { + // nie podlegają logowaniu + // tymczasowa utylizacja duplikatu SHP + return false; + } + + auto *duplicate = m_events[ lookup->second ]; + if( Global.bJoinEvents ) { + // doczepka (taki wirtualny multiple bez warunków) + duplicate->Append( Event ); + } + else { + // NOTE: somewhat convoluted way to deal with 'replacing' events without leaving dangling pointers + // can be cleaned up if pointers to events were replaced with handles + ErrorLog( "Bad event: encountered duplicated event, \"" + Event->asName + "\"" ); + duplicate->Append( Event ); // doczepka (taki wirtualny multiple bez warunków) + duplicate->m_ignored = true; // dezaktywacja pierwotnego - taka proteza na wsteczną zgodność + } + } + + m_events.emplace_back( Event ); + if( lookup == m_eventmap.end() ) { + // if it's first event with such name, it's potential candidate for the execution queue + m_eventmap.emplace( Event->asName, m_events.size() - 1 ); + if( ( Event->m_ignored != true ) + && ( Event->asName.find( "onstart" ) != std::string::npos ) ) { + // event uruchamiany automatycznie po starcie + AddToQuery( Event, nullptr ); + } + } + + return true; +} + +// legacy method, returns pointer to specified event, or null +TEvent * +event_manager::FindEvent( std::string const &Name ) { + + if( Name.empty() ) { return nullptr; } + + auto const lookup = m_eventmap.find( Name ); + return ( + lookup != m_eventmap.end() ? + m_events[ lookup->second ] : + nullptr ); +} + +// legacy method, inserts specified event in the event query +bool +event_manager::AddToQuery( TEvent *Event, TDynamicObject const *Owner ) { + + if( false == Event->bEnabled ) { return false; } + if( Event->iQueued != 0 ) { return false; } + // jeśli może być dodany do kolejki (nie używany w skanowaniu) + // jeśli nie dodany jeszcze do kolejki + + // kolejka eventów jest posortowana względem (fStartTime) + Event->Activator = Owner; + if( ( Event->Type == tp_AddValues ) + && ( Event->fDelay == 0.0 ) ) { + // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie + // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję + // wykonującą eventy i ją wywołać + if( ( false == Event->m_ignored ) + && ( true == EventConditon( Event ) ) ) { // teraz mogą być warunki do tych eventów + + WriteLog( "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->asName ); + WriteLog( "Type: AddValues & Track command - [" + + Event->m_update.data_text + "] [" + + to_string( Event->m_update.data_value_1, 2 ) + "] [" + + to_string( Event->m_update.data_value_2, 2 ) + "]" ); + // TODO: dump status of target cells after the operation + for( auto &target : Event->m_targets ) { + auto *memcell = static_cast( std::get( target ) ); + if( memcell == nullptr ) { continue; } + memcell->UpdateValues( + Event->m_update.data_text, + Event->m_update.data_value_1, + Event->m_update.data_value_2, + Event->m_update.flags ); + if( memcell->Track == nullptr ) { continue; } + // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze + auto const location { memcell->location() }; + for( auto dynamic : memcell->Track->Dynamics ) { + memcell->PutCommand( + dynamic->Mechanik, + &location ); + } + } + } + // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) + do { + Event = Event->evJoined; + // NOTE: we could've received a new event from joint event above, so we need to check conditions just in case and discard the bad events + // TODO: refactor this arrangement, it's hardly optimal + } while( ( Event != nullptr ) + && ( ( false == Event->bEnabled ) + || ( Event->iQueued > 0 ) ) ); + } + if( ( Event != nullptr ) + && ( false == Event->m_ignored ) ) { + // standardowe dodanie do kolejki + ++Event->iQueued; // zabezpieczenie przed podwójnym dodaniem do kolejki + WriteLog( "EVENT ADDED TO QUEUE" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->asName ); + Event->fStartTime = std::abs( Event->fDelay ) + Timer::GetTime(); // czas od uruchomienia scenerii + if( Event->fRandomDelay > 0.0 ) { + // doliczenie losowego czasu opóźnienia + Event->fStartTime += Event->fRandomDelay * Random( 10000 ) * 0.0001; + } + if( QueryRootEvent != nullptr ) { + TEvent::AddToQuery( Event, QueryRootEvent ); + } + else { + QueryRootEvent = Event; + QueryRootEvent->evNext = nullptr; + } + } + + return true; +} + +// legacy method, executes queued events +bool +event_manager::CheckQuery() { + + TLocation loc; + int i; + while( ( QueryRootEvent != nullptr ) + && ( QueryRootEvent->fStartTime < Timer::GetTime() ) ) + { // eventy są posortowana wg czasu wykonania + m_workevent = QueryRootEvent; // wyjęcie eventu z kolejki + if (QueryRootEvent->evJoined) // jeśli jest kolejny o takiej samej nazwie + { // to teraz on będzie następny do wykonania + QueryRootEvent = QueryRootEvent->evJoined; // następny będzie ten doczepiony + QueryRootEvent->evNext = m_workevent->evNext; // pamiętając o następnym z kolejki + QueryRootEvent->fStartTime = m_workevent->fStartTime; // czas musi być ten sam, bo nie jest aktualizowany + QueryRootEvent->Activator = m_workevent->Activator; // pojazd aktywujący + QueryRootEvent->iQueued = 1; + // w sumie można by go dodać normalnie do kolejki, ale trzeba te połączone posortować wg czasu wykonania + } + else // a jak nazwa jest unikalna, to kolejka idzie dalej + QueryRootEvent = QueryRootEvent->evNext; // NULL w skrajnym przypadku + if( ( false == m_workevent->m_ignored ) && ( true == m_workevent->bEnabled ) ) { + // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć + --m_workevent->iQueued; // teraz moze być ponownie dodany do kolejki + WriteLog( "EVENT LAUNCHED" + ( m_workevent->Activator ? ( " by " + m_workevent->Activator->asName ) : "" ) + ": " + m_workevent->asName ); + switch (m_workevent->Type) { + case tp_CopyValues: { + // skopiowanie wartości z innej komórki + auto const *datasource = static_cast( std::get( m_workevent->m_update.data_source ) ); + m_workevent->m_update.data_text = datasource->Text(); + m_workevent->m_update.data_value_1 = datasource->Value1(); + m_workevent->m_update.data_value_2 = datasource->Value2(); + } + case tp_AddValues: // różni się jedną flagą od UpdateValues + case tp_UpdateValues: { + if( false == EventConditon( m_workevent ) ) { break; } + WriteLog( "Type: " + std::string( m_workevent->Type == tp_AddValues ? "AddValues & Track command" : "UpdateValues" ) + " - [" + + m_workevent->m_update.data_text + "] [" + + to_string( m_workevent->m_update.data_value_1, 2 ) + "] [" + + to_string( m_workevent->m_update.data_value_2, 2 ) + "]" ); + // TODO: dump status of target cells after the operation + for( auto &target : m_workevent->m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { continue; } + targetcell->UpdateValues( + m_workevent->m_update.data_text, + m_workevent->m_update.data_value_1, + m_workevent->m_update.data_value_2, + m_workevent->m_update.flags ); + if( targetcell->Track == nullptr ) { continue; } + // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze + auto const location { targetcell->location() }; + for( auto dynamic : targetcell->Track->Dynamics ) { + targetcell->PutCommand( + dynamic->Mechanik, + &location ); + } + } + break; + } + case tp_GetValues: { + WriteLog( "Type: GetValues" ); + if( m_workevent->Activator ) { + // TODO: re-enable when messaging module is in place + if( Global.iMultiplayer ) { + // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) + multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); + } + m_workevent->m_update.data_cell()->PutCommand( + m_workevent->Activator->Mechanik, + &(m_workevent->m_update.data_cell()->location()) ); + } + break; + } + case tp_PutValues: { + WriteLog( "Type: PutValues - [" + + m_workevent->m_update.data_text + "] [" + + to_string( m_workevent->m_update.data_value_1, 2 ) + "] [" + + to_string( m_workevent->m_update.data_value_2, 2 ) + "]" ); + if (m_workevent->Activator) { + // zamiana, bo fizyka ma inaczej niż sceneria + // NOTE: y & z swap, negative x + loc.X = -m_workevent->m_update.location.x; + loc.Y = m_workevent->m_update.location.z; + loc.Z = m_workevent->m_update.location.y; + if( m_workevent->Activator->Mechanik ) { + // przekazanie rozkazu do AI + m_workevent->Activator->Mechanik->PutCommand( + m_workevent->m_update.data_text, + m_workevent->m_update.data_value_1, + m_workevent->m_update.data_value_2, + loc); + } + else { + // przekazanie do pojazdu + m_workevent->Activator->MoverParameters->PutCommand( + m_workevent->m_update.data_text, + m_workevent->m_update.data_value_1, + m_workevent->m_update.data_value_2, + loc); + } + } + break; + } + case tp_Lights: { + for( auto &target : m_workevent->m_targets ) { + auto *targetmodel = static_cast( std::get( target ) ); + if( targetmodel == nullptr ) { continue; } + // event effect code + for( i = 0; i < iMaxNumLights; ++i ) { + if( m_workevent->m_lights[ i ] == -2.f ) { + // processed all supplied values, bail out + break; + } + if( m_workevent->m_lights[ i ] >= 0.f ) { + // -1 zostawia bez zmiany + targetmodel->LightSet( + i, + m_workevent->m_lights[ i ] ); + } + } + } + break; + } + case tp_Visible: { + for( auto &target : m_workevent->m_targets ) { + auto *targetnode = std::get( target ); + if( targetnode == nullptr ) { continue; } + // event effect code + targetnode->visible( m_workevent->m_visible ); + } + break; + } + case tp_Sound: { + for( auto &target : m_workevent->m_sounds ) { + auto *targetsound = std::get( target ); + if( targetsound == nullptr ) { continue; } + // event effect code + switch( m_workevent->m_soundmode ) { + // trzy możliwe przypadki: + case 0: { + targetsound->stop(); + break; + } + case 1: { + if( m_workevent->m_soundradiochannel > 0 ) { + simulation::radio_message( + targetsound, + m_workevent->m_soundradiochannel ); + } + else { + targetsound->play( sound_flags::exclusive | sound_flags::event ); + } + break; + } + case -1: { + targetsound->play( sound_flags::exclusive | sound_flags::looping | sound_flags::event ); + break; + } + default: { + break; + } + } + } + break; + } + case tp_Animation: { + WriteLog( "Type: Animation" ); + if( m_workevent->m_animationtype == 4 ) { + // vmd mode targets the entire model + for( auto &target : m_workevent->m_targets ) { + auto *targetmodel = static_cast( std::get( target ) ); + if( targetmodel == nullptr ) { continue; } + // event effect code + targetmodel->AnimationVND( + m_workevent->m_animationfiledata, + m_workevent->m_animationparams[ 0 ], // tu mogą być dodatkowe parametry, np. od-do + m_workevent->m_animationparams[ 1 ], + m_workevent->m_animationparams[ 2 ], + m_workevent->m_animationparams[ 3 ] ); + } + } + else { + // other animation modes target specific submodels + for( auto *targetcontainer : m_workevent->m_animationcontainers ) { + switch( m_workevent->m_animationtype ) { + case 1: { // rotate + targetcontainer->SetRotateAnim( + glm::make_vec3( m_workevent->m_animationparams.data() ), + m_workevent->m_animationparams[ 3 ] ); + break; + } + case 2: { // translate + targetcontainer->SetTranslateAnim( + glm::make_vec3( m_workevent->m_animationparams.data() ), + m_workevent->m_animationparams[ 3 ] ); + break; + } + // TODO: implement digital mode + default: { + break; + } + } + } + } + break; + } + case tp_Switch: { + for( auto &target : m_workevent->m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // event effect code + targettrack->Switch( + m_workevent->m_switchstate, + m_workevent->m_switchmoverate, + m_workevent->m_switchmovedelay ); + } + if( Global.iMultiplayer ) { + // dajemy znać do serwera o przełożeniu + multiplayer::WyslijEvent( m_workevent->asName, "" ); // wysłanie nazwy eventu przełączajacego + } + // Ra: bardziej by się przydała nazwa toru, ale nie ma do niej stąd dostępu + break; + } + case tp_TrackVel: { + WriteLog( "Type: TrackVel - [" + to_string( m_workevent->m_velocity, 2 ) + "]" ); + for( auto &target : m_workevent->m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // event effect code + targettrack->VelocitySet( m_workevent->m_velocity ); + if( DebugModeFlag ) { + WriteLog( "actual track velocity for " + targettrack->name() + " [" + to_string( targettrack->VelocityGet(), 2 ) + "]" ); + } + } + break; + } + case tp_Multiple: { + auto const condition { EventConditon( m_workevent ) }; + if( ( true == condition ) + || ( true == m_workevent->m_condition.has_else ) ) { + // warunek spelniony albo było użyte else + WriteLog("Type: Multi-event"); + for( auto &childevent : m_workevent->m_children ) { + auto *childeventdata { std::get( childevent ) }; + if( childeventdata == nullptr ) { continue; } + if( std::get( childevent ) != condition ) { continue; } + + if( childeventdata != m_workevent ) { + // normalnie dodać + AddToQuery( childeventdata, m_workevent->Activator ); + } + else { + // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania + if( m_workevent->fDelay >= 5.0 ) { + AddToQuery( m_workevent, m_workevent->Activator ); + } + } + } + if( Global.iMultiplayer ) { + // dajemy znać do serwera o wykonaniu + if( false == m_workevent->m_condition.has_else ) { + // jednoznaczne tylko, gdy nie było else + if( m_workevent->Activator ) { + multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); + } + else { + multiplayer::WyslijEvent( m_workevent->asName, "" ); + } + } + } + } + break; + } + case tp_WhoIs: { + for( auto &target : m_workevent->m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { continue; } + // event effect code + if( m_workevent->m_update.flags & update_load ) { + // jeśli pytanie o ładunek + if( m_workevent->m_update.flags & update_memadd ) { + // jeśli typ pojazdu + // TODO: define and recognize individual request types + auto const owner = ( + ( ( m_workevent->Activator->Mechanik != nullptr ) && ( m_workevent->Activator->Mechanik->Primary() ) ) ? + m_workevent->Activator->Mechanik : + m_workevent->Activator->ctOwner ); + auto const consistbrakelevel = ( + owner != nullptr ? + owner->fReady : + -1.0 ); + auto const collisiondistance = ( + owner != nullptr ? + owner->TrackBlock() : + -1.0 ); + + targetcell->UpdateValues( + m_workevent->Activator->MoverParameters->TypeName, // typ pojazdu + consistbrakelevel, + collisiondistance, + m_workevent->m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_workevent->m_update.flags ) + ") - " + + "[name: " + m_workevent->Activator->MoverParameters->TypeName + "], " + + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " + + "[obstacle distance: " + to_string( collisiondistance, 2 ) + " m]" ); + } + else { + // jeśli parametry ładunku + targetcell->UpdateValues( + m_workevent->Activator->MoverParameters->LoadType, // nazwa ładunku + m_workevent->Activator->MoverParameters->Load, // aktualna ilość + m_workevent->Activator->MoverParameters->MaxLoad, // maksymalna ilość + m_workevent->m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_workevent->m_update.flags ) + ") - " + + "[load type: " + m_workevent->Activator->MoverParameters->LoadType + "], " + + "[current load: " + to_string( m_workevent->Activator->MoverParameters->Load, 2 ) + "], " + + "[max load: " + to_string( m_workevent->Activator->MoverParameters->MaxLoad, 2 ) + "]" ); + } + } + else if( m_workevent->m_update.flags & update_memadd ) { // jeśli miejsce docelowe pojazdu + targetcell->UpdateValues( + m_workevent->Activator->asDestination, // adres docelowy + m_workevent->Activator->DirectionGet(), // kierunek pojazdu względem czoła składu (1=zgodny,-1=przeciwny) + m_workevent->Activator->MoverParameters->Power, // moc pojazdu silnikowego: 0 dla wagonu + m_workevent->m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_workevent->m_update.flags ) + ") - " + + "[destination: " + m_workevent->Activator->asDestination + "], " + + "[direction: " + to_string( m_workevent->Activator->DirectionGet() ) + "], " + + "[engine power: " + to_string( m_workevent->Activator->MoverParameters->Power, 2 ) + "]" ); + } + else if( m_workevent->Activator->Mechanik ) { + if( m_workevent->Activator->Mechanik->Primary() ) { // tylko jeśli ktoś tam siedzi - nie powinno dotyczyć pasażera! + targetcell->UpdateValues( + m_workevent->Activator->Mechanik->TrainName(), + m_workevent->Activator->Mechanik->StationCount() - m_workevent->Activator->Mechanik->StationIndex(), // ile przystanków do końca + m_workevent->Activator->Mechanik->IsStop() ? + 1 : + 0, // 1, gdy ma tu zatrzymanie + m_workevent->m_update.flags ); + WriteLog( "Train detected: " + m_workevent->Activator->Mechanik->TrainName() ); + } + } + } + break; + } + case tp_LogValues: { // zapisanie zawartości komórki pamięci do logu + if( m_workevent->m_targets.empty() ) { + // lista wszystkich + simulation::Memory.log_all(); + } + else { + // jeśli była podana nazwa komórki + for( auto &target : m_workevent->m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { continue; } + WriteLog( "Memcell \"" + targetcell->name() + "\": [" + + targetcell->Text() + "] [" + + to_string( targetcell->Value1(), 2 ) + "] [" + + to_string( targetcell->Value2(), 2 ) + "]" ); + } + } + break; + } + case tp_Voltage: { // zmiana napięcia w zasilaczu (TractionPowerSource) + WriteLog( "Type: Voltage [" + to_string( m_workevent->m_voltage, 2 ) + "]" ); + for( auto &target : m_workevent->m_targets ) { + auto *targetpowersource = static_cast( std::get( target ) ); + if( targetpowersource == nullptr ) { continue; } + targetpowersource->VoltageSet( m_workevent->m_voltage ); + } + break; + } + case tp_Friction: { // zmiana tarcia na scenerii + // na razie takie chamskie ustawienie napięcia zasilania + WriteLog("Type: Friction"); + Global.fFriction = (m_workevent->m_friction); + break; + } + case tp_Message: { // wyświetlenie komunikatu + break; + } + } // switch (tmpEvent->Type) + } // if (tmpEvent->bEnabled) + } // while + return true; +} + +// legacy method, initializes events after deserialization from scenario file +void +event_manager::InitEvents() { + + //łączenie eventów z pozostałymi obiektami + for( auto *event : m_events ) { + + switch( event->Type ) { + + case tp_AddValues: // sumowanie wartości + case tp_UpdateValues: { // zmiana wartości + // target memory cell(s), previously held in param 5, copy held in param 9 for memcompare + event->init_targets( simulation::Memory, "memory cell" ); + // conditional data + event->init_conditions(); + break; + } + case tp_LogValues: { + // skojarzenie z memcell + event->init_targets( simulation::Memory, "memory cell" ); + break; + } + case tp_GetValues: { + event->init_targets( simulation::Memory, "memory cell" ); + // custom target initialization code + for( auto &target : event->m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { continue; } + if( targetcell->IsVelocity() ) { + // jeśli odczyt komórki a komórka zawiera komendę SetVelocity albo ShuntVelocity + // to event nie będzie dodawany do kolejki + event->bEnabled = false; + } + } + // NOTE: GetValues retrieves data only from first specified memory cell + // TBD, TODO: allow retrieval from more than one cell? + event->m_update.data_source = event->m_targets.front(); + break; + } + case tp_WhoIs: { + event->init_targets( simulation::Memory, "memory cell" ); + break; + } + case tp_CopyValues: { + // skopiowanie komórki do innej + event->init_targets( simulation::Memory, "memory cell" ); + // source cell + std::get( event->m_update.data_source ) = simulation::Memory.find( std::get( event->m_update.data_source ) ); + if( std::get( event->m_update.data_source ) == nullptr ) { + event->m_ignored = true; // deaktywacja + ErrorLog( "Bad event: copyvalues event \"" + event->asName + "\" cannot find memcell \"" + std::get( event->m_update.data_source ) + "\"" ); + } + break; + } + case tp_Animation: { + // animacja modelu + event->init_targets( simulation::Instances, "model instance" ); + // custom target initialization code + if( event->m_animationtype == 4 ) { + // vmd animations target whole model + break; + } + // locate and set up animated submodels + event->m_animationcontainers.clear(); + for( auto &target : event->m_targets ) { + auto *targetmodel { static_cast( std::get( target ) ) }; + if( targetmodel == nullptr ) { continue; } + auto *targetcontainer { targetmodel->GetContainer( event->m_animationsubmodel ) }; + if( targetcontainer == nullptr ) { + event->m_ignored = true; + ErrorLog( "Bad event: animation event \"" + event->asName + "\" cannot find submodel " + event->m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" ); + break; + } + targetcontainer->WillBeAnimated(); // oflagowanie animacji + if( targetcontainer->Event() == nullptr ) { + // nie szukać, gdy znaleziony + targetcontainer->EventAssign( FindEvent( targetmodel->name() + '.' + event->m_animationsubmodel + ":done" ) ); + } + event->m_animationcontainers.emplace_back( targetcontainer ); + } + break; + } + case tp_Lights: { + // zmiana świeteł modelu + event->init_targets( simulation::Instances, "model instance" ); + break; + } + case tp_Visible: { + // ukrycie albo przywrócenie obiektu + for( auto &target : event->m_targets ) { + auto &targetnode { std::get( target ) }; + auto &targetname { std::get( target ) }; + // najpierw model + targetnode = simulation::Instances.find( targetname ); + if( targetnode == nullptr ) { + // albo tory? + targetnode = simulation::Paths.find( targetname ); + } + if( targetnode == nullptr ) { + // może druty? + targetnode = simulation::Traction.find( targetname ); + } + if( targetnode == nullptr ) { + event->m_ignored = true; // deaktywacja + ErrorLog( "Bad event: event \"" + event->asName + "\" [" + event->type_to_string() + "] cannot find item \"" + std::get( target ) + "\"" ); + } + } + break; + } + case tp_Switch: { + // przełożenie zwrotnicy albo zmiana stanu obrotnicy + event->init_targets( simulation::Paths, "track" ); + // custom target initialization code + for( auto &target : event->m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // dowiązanie toru + if( targettrack->iAction == 0 ) { + // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia + targettrack->iAction |= 0x100; + } + if( ( event->m_switchstate == 0 ) + && ( event->m_switchmovedelay >= 0.0 ) ) { + // jeśli przełącza do stanu 0 & jeśli jest zdefiniowany dodatkowy ruch iglic + // przesłanie parametrów + targettrack->Switch( + event->m_switchstate, + event->m_switchmoverate, + event->m_switchmovedelay ); + } + } + break; + } + case tp_Sound: { + // odtworzenie dźwięku + for( auto &target : event->m_sounds ) { + std::get( target ) = simulation::Sounds.find( std::get( target ) ); + if( std::get( target ) == nullptr ) { + event->m_ignored = true; // deaktywacja + ErrorLog( "Bad event: event \"" + event->asName + "\" [" + event->type_to_string() + "] cannot find static sound \"" + std::get( target ) + "\"" ); + } + } + break; + } + case tp_TrackVel: { + // ustawienie prędkości na torze + event->init_targets( simulation::Paths, "track" ); + // custom target initialization code + for( auto &target : event->m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // flaga zmiany prędkości toru jest istotna dla skanowania + targettrack->iAction |= 0x200; + } + break; + } + case tp_Multiple: { + // conditional data + event->init_targets( simulation::Memory, "memory cell", false ); + if( event->m_ignored ) { + event->m_condition.flags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); + event->m_ignored = false; + } + event->init_conditions(); + // child events bindings + for( auto &childevent : event->m_children ) { + std::get( childevent ) = FindEvent( std::get( childevent ) ); + if( std::get( childevent ) == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find event \"" + std::get( childevent ) + "\"" ); + } + } + break; + } + case tp_Voltage: { + // zmiana napięcia w zasilaczu (TractionPowerSource) + event->init_targets( simulation::Powergrid, "power source" ); + break; + } + case tp_Message: { + // wyświetlenie komunikatu + break; + } + default: { + break; + } + } // switch + + if( event->fDelay < 0 ) { AddToQuery( event, nullptr ); } + } +} + +// legacy method, initializes event launchers after deserialization from scenario file +void +event_manager::InitLaunchers() { + + for( auto *launcher : m_launchers.sequence() ) { + + if( launcher->iCheckMask != 0 ) { + if( launcher->asMemCellName != "none" ) { + // jeśli jest powiązana komórka pamięci + launcher->MemCell = simulation::Memory.find( launcher->asMemCellName ); + if( launcher->MemCell == nullptr ) { + ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find memcell \"" + launcher->asMemCellName + "\"" ); + } + } + else { + launcher->MemCell = nullptr; + } + } + + if( launcher->asEvent1Name != "none" ) { + launcher->Event1 = simulation::Events.FindEvent( launcher->asEvent1Name ); + if( launcher->Event1 == nullptr ) { + ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent1Name + "\"" ); + } + } + + if( launcher->asEvent2Name != "none" ) { + launcher->Event2 = simulation::Events.FindEvent( launcher->asEvent2Name ); + if( launcher->Event2 == nullptr ) { + ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent2Name + "\"" ); + } + } + } +} + +// sends basic content of the class in legacy (text) format to provided stream +void +event_manager::export_as_text( std::ostream &Output ) const { + + Output << "// events\n"; + for( auto const *event : m_events ) { + if( event->group() == null_handle ) { + event->export_as_text( Output ); + } + } + Output << "// event launchers\n"; + for( auto const *launcher : m_launchers.sequence() ) { + if( launcher->group() == null_handle ) { + launcher->export_as_text( Output ); + } + } +} + +// legacy method, verifies condition for specified event +bool +event_manager::EventConditon( TEvent *Event ) { + + if( Event->m_condition.flags == 0 ) { + return true; // bezwarunkowo + } + // if there's conditions, check them + if( Event->m_condition.flags & conditional_propability ) { + auto const rprobability { static_cast( Random() ) }; + WriteLog( "Test: Random integer - [" + std::to_string( rprobability ) + "] / [" + std::to_string( Event->m_condition.probability ) + "]" ); + if( rprobability > Event->m_condition.probability ) { + return false; + } + } + if( Event->m_condition.flags & conditional_trackoccupied ) { + for( auto *track : Event->m_condition.tracks ) { + if( true == track->IsEmpty() ) { + return false; + } + } + } + if( Event->m_condition.flags & conditional_trackfree ) { + for( auto *track : Event->m_condition.tracks ) { + if( false == track->IsEmpty() ) { + return false; + } + } + } + if( Event->m_condition.flags & conditional_memcompare ) { + // porównanie wartości + for( auto &target : m_workevent->m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { + ErrorLog( "Event " + Event->asName + " trying conditional_memcompare with nonexistent memcell" ); + continue; // though this is technically error, we treat it as a success to maintain backward compatibility + } + auto const comparisonresult = + targetcell->Compare( + Event->m_condition.match_text, + Event->m_condition.match_value_1, + Event->m_condition.match_value_2, + Event->m_condition.flags ); + + std::string comparisonlog = "Test: MemCompare - "; + + comparisonlog += + "[" + targetcell->Text() + "]" + + " [" + to_string( targetcell->Value1(), 2 ) + "]" + + " [" + to_string( targetcell->Value2(), 2 ) + "]"; + + comparisonlog += ( + true == comparisonresult ? + " == " : + " != " ); + + comparisonlog += ( + TestFlag( Event->m_condition.flags, conditional_memstring ) ? + "[" + std::string( m_workevent->m_condition.match_text ) + "]" : + "[*]" ); + comparisonlog += ( + TestFlag( m_workevent->m_condition.flags, conditional_memval1 ) ? + " [" + to_string( m_workevent->m_condition.match_value_1, 2 ) + "]" : + " [*]" ); + comparisonlog += ( + TestFlag( m_workevent->m_condition.flags, conditional_memval2 ) ? + " [" + to_string( m_workevent->m_condition.match_value_2, 2 ) + "]" : + " [*]" ); + + WriteLog( comparisonlog ); + + if( false == comparisonresult ) { + return false; + } + } + } + // if we made it here it means we passed all checks + return true; +} +#endif diff --git a/Event.h b/Event.h index 9593f932..c54642d1 100644 --- a/Event.h +++ b/Event.h @@ -14,6 +14,9 @@ http://mozilla.org/MPL/2.0/. #include "names.h" #include "evlaunch.h" +//#define EU07_USE_LEGACY_EVENTS + +#ifdef EU07_USE_LEGACY_EVENTS enum TEventType { tp_Unknown, tp_Sound, @@ -204,5 +207,239 @@ private: basic_table m_launchers; eventlauncher_sequence m_launcherqueue; }; +#else +enum TEventType { + tp_Unknown, + tp_Sound, + tp_Animation, + tp_Lights, + tp_UpdateValues, + tp_GetValues, + tp_PutValues, + tp_Switch, + tp_TrackVel, + tp_Multiple, + tp_AddValues, + tp_CopyValues, + tp_WhoIs, + tp_LogValues, + tp_Visible, + tp_Voltage, + tp_Message, + tp_Friction +}; +const int update_memstring = 0x0000001; // zmodyfikować tekst (UpdateValues) +const int update_memval1 = 0x0000002; // zmodyfikować pierwszą wartosć +const int update_memval2 = 0x0000004; // zmodyfikować drugą wartosć +const int update_memadd = 0x0000008; // dodać do poprzedniej zawartości +const int update_load = 0x0000010; // odczytać ładunek +const int conditional_memstring = 0x0000100; // porównanie tekstu +const int conditional_memval1 = 0x0000200; // porównanie pierwszej wartości liczbowej +const int conditional_memval2 = 0x0000400; // porównanie drugiej wartości +const int conditional_trackoccupied = 0x1000000; // jeśli tor zajęty +const int conditional_trackfree = 0x2000000; // jeśli tor wolny +const int conditional_propability = 0x4000000; // zależnie od generatora lizcb losowych +const int conditional_memcompare = 0x8000000; // porównanie zawartości + +// zdarzenie +class TEvent { + + friend event_manager; + +public: +// types + // wrapper for binding between editor-supplied name, event, and execution conditional flag + using conditional_event = std::tuple; + using basic_node = std::tuple; + using basic_sound = std::tuple; +// constructors + TEvent(); + ~TEvent(); +// metody + void Load(cParser *parser, Math3D::vector3 const &org); + // sends basic content of the class in legacy (text) format to provided stream + template + void + init_targets( TableType_ &Repository, std::string const &Targettype, bool const Logerrors = true ); + void + init_conditions(); + void + export_as_text( std::ostream &Output ) const; + static void AddToQuery( TEvent *Event, TEvent *&Start ); + std::string CommandGet() const; + TCommandType Command() const; + double ValueGet(int n) const; + glm::dvec3 PositionGet() const; + bool StopCommand() const; + void StopCommandSent(); + void Append(TEvent *e); + void + group( scene::group_handle Group ); + scene::group_handle + group() const; +// members + std::string asName; + TEventType Type = tp_Unknown; + TEvent *evNext = nullptr; // następny w kolejce + bool m_ignored{ false }; // replacement for tp_ignored + bool bEnabled = false; // false gdy ma nie być dodawany do kolejki (skanowanie sygnałów) + int iQueued = 0; // ile razy dodany do kolejki + TDynamicObject const *Activator = nullptr; + double fStartTime = 0.0; + double fDelay = 0.0; + double fRandomDelay = 0.0; // zakres dodatkowego opóźnienia // standardowo nie będzie dodatkowego losowego opóźnienia + TEvent *evJoined = nullptr; // kolejny event z tą samą nazwą - od wersji 378 + std::vector m_targets; // targets of operation performed when this event is executed + std::vector m_children; // events which are placed in the query when this event is executed + std::vector m_lights; // for tp_lights + bool m_visible { true }; // for tp_visible + double m_velocity { 0.0 }; // for tp_trackvel + std::vector m_sounds; // for tp_sound + int m_soundmode{ 0 }; + int m_soundradiochannel{ 0 }; + int m_animationtype{ 0 }; // for tp_animation + std::array m_animationparams{ 0.0 }; + std::string m_animationsubmodel; + std::vector m_animationcontainers; + std::string m_animationfilename; + std::size_t m_animationfilesize{ 0 }; + char *m_animationfiledata{ nullptr }; + int m_switchstate{ 0 }; // for tp_switch + float m_switchmoverate{ -1.f }; + float m_switchmovedelay{ -1.f }; + float m_friction { -1.f }; // for tp_friction + float m_voltage{ -1.f }; // for tp_voltage + +private: +// types + struct update_data { + unsigned int flags { 0 }; + std::string data_text; + double data_value_1 { 0.0 }; + double data_value_2 { 0.0 }; + basic_node data_source { "", nullptr }; + glm::dvec3 location { 0.0 }; + TCommandType command_type { TCommandType::cm_Unknown }; + + TMemCell const * data_cell() const; + TMemCell * data_cell(); + }; + struct condition_data { + unsigned int flags { 0 }; + float probability { 0.0 }; // used by conditional_probability + double match_value_1 { 0.0 }; // used by conditional_memcompare + double match_value_2 { 0.0 }; // used by conditional_memcompare + std::string match_text; // used by conditional_memcompare + std::vector tracks; // used by conditional_track + bool has_else { false }; + + void load( cParser &Input ); + }; +// methods + void load_targets( std::string const &Input ); + std::string type_to_string() const; +// members + scene::group_handle m_group { null_handle }; // group this event belongs to, if any + update_data m_update; + condition_data m_condition; +}; + +inline +void +TEvent::group( scene::group_handle Group ) { + m_group = Group; +} + +inline +scene::group_handle +TEvent::group() const { + return m_group; +} + +template +void +TEvent::init_targets( TableType_ &Repository, std::string const &Targettype, bool const Logerrors ) { + + for( auto &target : m_targets ) { + std::get( target ) = Repository.find( std::get( target ) ); + if( std::get( target ) == nullptr ) { + m_ignored = true; // deaktywacja + if( Logerrors ) + ErrorLog( "Bad event: " + type_to_string() + " event \"" + asName + "\" cannot find " + Targettype +" \"" + std::get( target ) + "\"" ); + } + } +} + + + +class event_manager { + +public: +// constructors + event_manager() = default; +// destructor + ~event_manager(); +// methods + // adds specified event launcher to the list of global launchers + void + queue( TEventLauncher *Launcher ); + // legacy method, updates event queues + void + update(); + // adds provided event to the collection. returns: true on success + // TBD, TODO: return handle to the event + bool + insert( TEvent *Event ); + bool + insert( TEventLauncher *Launcher ) { + return m_launchers.insert( Launcher ); } + // returns first event in the queue + TEvent * + begin() { + return QueryRootEvent; } + // legacy method, returns pointer to specified event, or null + TEvent * + FindEvent( std::string const &Name ); + // legacy method, inserts specified event in the event query + bool + AddToQuery( TEvent *Event, TDynamicObject const *Owner ); + // legacy method, executes queued events + bool + CheckQuery(); + // legacy method, initializes events after deserialization from scenario file + void + InitEvents(); + // legacy method, initializes event launchers after deserialization from scenario file + void + InitLaunchers(); + // sends basic content of the class in legacy (text) format to provided stream + void + export_as_text( std::ostream &Output ) const; + +private: +// types + using event_sequence = std::deque; + using event_map = std::unordered_map; + using eventlauncher_sequence = std::vector; + +// methods + // legacy method, verifies condition for specified event + bool + EventConditon( TEvent *Event ); + +// members + event_sequence m_events; +/* + // NOTE: disabled until event class refactoring + event_sequence m_eventqueue; +*/ + // legacy version of the above + TEvent *QueryRootEvent { nullptr }; + TEvent *m_workevent { nullptr }; + event_map m_eventmap; + basic_table m_launchers; + eventlauncher_sequence m_launcherqueue; +}; +#endif //--------------------------------------------------------------------------- diff --git a/MemCell.cpp b/MemCell.cpp index b958d37e..780ffc1e 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -112,13 +112,13 @@ bool TMemCell::Load(cParser *parser) return true; } -void TMemCell::PutCommand( TController *Mech, glm::dvec3 const *Loc ) +void TMemCell::PutCommand( TController *Mech, glm::dvec3 const *Loc ) const { // wysłanie zawartości komórki do AI if (Mech) Mech->PutCommand(szText, fValue1, fValue2, Loc); } -bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ) { +bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ) const { // porównanie zawartości komórki pamięci z podanymi wartościami if( TestFlag( CheckMask, conditional_memstring ) ) { // porównać teksty @@ -194,7 +194,7 @@ TMemCell::export_as_text_( std::ostream &Output ) const { << fValue1 << ' ' << fValue2 << ' ' // associated track - << ( asTrackName.empty() ? "none" : asTrackName ) << ' ' + << ( Track ? Track->name() : asTrackName.empty() ? "none" : asTrackName ) << ' ' // footer << "endmemcell" << "\n"; @@ -210,6 +210,13 @@ memory_table::InitCells() { for( auto *cell : m_items ) { // Ra: eventy komórek pamięci, wykonywane po wysłaniu komendy do zatrzymanego pojazdu cell->AssignEvents( simulation::Events.FindEvent( cell->name() + ":sent" ) ); + // bind specified path with the memory cell + if( false == cell->asTrackName.empty() ) { + cell->Track = simulation::Paths.find( cell->asTrackName ); + if( cell->Track == nullptr ) { + ErrorLog( "Bad memcell: track \"" + cell->asTrackName + "\" referenced in memcell \"" + cell->name() + "\" doesn't exist" ); + } + } } } diff --git a/MemCell.h b/MemCell.h index 993d99f2..3d6298c1 100644 --- a/MemCell.h +++ b/MemCell.h @@ -16,19 +16,17 @@ http://mozilla.org/MPL/2.0/. class TMemCell : public scene::basic_node { public: - std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac - bool is_exportable { true }; // export helper; autogenerated cells don't need to be exported - +// constructors explicit TMemCell( scene::node_data const &Nodedata ); - +// methods void UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ); bool Load(cParser *parser); void - PutCommand( TController *Mech, glm::dvec3 const *Loc ); + PutCommand( TController *Mech, glm::dvec3 const *Loc ) const; bool - Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ); + Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ) const; std::string const & Text() const { return szText; } @@ -48,6 +46,10 @@ public: TCommandType CommandCheck(); bool IsVelocity() const; void AssignEvents(TEvent *e); +// members + std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac + TTrack *Track { nullptr }; // resolved binding with the specified track + bool is_exportable { true }; // export helper; autogenerated cells don't need to be exported private: // methods From 4da8b300e87241e0cc2c0732f6e44eaa5a52b74e Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 16 Sep 2018 00:43:00 +0200 Subject: [PATCH 401/426] maintenance: event code refactoring, removed deprecated event code --- DynObj.cpp | 61 +- Event.cpp | 3133 +++++++++----------------------------------- Event.h | 282 +--- McZapkie/MOVER.h | 16 +- McZapkie/Mover.cpp | 1 + 5 files changed, 726 insertions(+), 2767 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 7e6a5b6e..1c9da755 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2234,11 +2234,11 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" // zrobiło tego Move( 0.0001 ); ABuCheckMyTrack(); // zmiana toru na ten, co oś Axle0 (oś z przodu) - TLocation loc; // Ra: ustawienie pozycji do obliczania sprzęgów - loc.X = -vPosition.x; - loc.Y = vPosition.z; - loc.Z = vPosition.y; - MoverParameters->Loc = loc; // normalnie przesuwa ComputeMovement() w Update() + // Ra: ustawienie pozycji do obliczania sprzęgów + MoverParameters->Loc = { + -vPosition.x, + vPosition.z, + vPosition.y }; // normalnie przesuwa ComputeMovement() w Update() // ABuWozki 060504 if (mdModel) // jeśli ma w czym szukać { @@ -2807,20 +2807,7 @@ bool TDynamicObject::Update(double dt, double dt1) return false; // a normalnie powinny mieć bEnabled==false double dDOMoveLen; - - TLocation l; - l.X = -vPosition.x; // przekazanie pozycji do fizyki - l.Y = vPosition.z; - l.Z = vPosition.y; - TRotation r; - r.Rx = r.Ry = r.Rz = 0; // McZapkie: parametry powinny byc pobierane z toru - - // TTrackShape ts; - // ts.R=MyTrack->fRadius; - // if (ABuGetDirection()<0) ts.R=-ts.R; - // ts.R=MyTrack->fRadius; //ujemne promienie są już zamienione przy - // wczytywaniu if (Axle0.vAngles.z != Axle1.vAngles.z) { // wyliczenie promienia z obrotów osi - modyfikację zgłosił youBy ts.R = Axle0.vAngles.z - Axle1.vAngles.z; // różnica może dawać stałą ±M_2PI @@ -3232,16 +3219,15 @@ bool TDynamicObject::Update(double dt, double dt1) } // fragment "z EXE Kursa" - if (MoverParameters->Mains) // nie wchodzić w funkcję bez potrzeby - if ( ( false == MoverParameters->Battery ) - && ( false == MoverParameters->ConverterFlag ) // added alternative power source. TODO: more generic power check + if( MoverParameters->Mains ) { // nie wchodzić w funkcję bez potrzeby + if( ( false == MoverParameters->Battery ) + && ( false == MoverParameters->ConverterFlag ) // added alternative power source. TODO: more generic power check /* - // NOTE: disabled on account of multi-unit setups, where the unmanned unit wouldn't be affected - && ( Controller == Humandriver ) + // NOTE: disabled on account of multi-unit setups, where the unmanned unit wouldn't be affected + && ( Controller == Humandriver ) */ - && ( MoverParameters->EngineType != TEngineType::DieselEngine ) - && ( MoverParameters->EngineType != TEngineType::WheelsDriven ) ) - { // jeśli bateria wyłączona, a nie diesel ani drezyna reczna + && ( MoverParameters->EngineType != TEngineType::DieselEngine ) + && ( MoverParameters->EngineType != TEngineType::WheelsDriven ) ) { // jeśli bateria wyłączona, a nie diesel ani drezyna reczna if( MoverParameters->MainSwitch( false, ( MoverParameters->TrainType == dt_EZT ? range_t::unit : range_t::local ) ) ) { // wyłączyć zasilanie // NOTE: we turn off entire EMU, but only the affected unit for other multi-unit consists @@ -3256,7 +3242,16 @@ bool TDynamicObject::Update(double dt, double dt1) */ } } + } + // przekazanie pozycji do fizyki + // NOTE: coordinate system swap + // TODO: replace with regular glm vectors + TLocation const l { + -vPosition.x, + vPosition.z, + vPosition.y }; + TRotation r { 0.0, 0.0, 0.0 }; // McZapkie-260202 - dMoveLen przyda sie przy stukocie kol dDOMoveLen = GetdMoveLen() + MoverParameters->ComputeMovement(dt, dt1, ts, tp, tmpTraction, l, r); if( Mechanik ) @@ -3859,13 +3854,13 @@ bool TDynamicObject::FastUpdate(double dt) if (!bEnabled) return false; - TLocation l; - l.X = -vPosition.x; - l.Y = vPosition.z; - l.Z = vPosition.y; - TRotation r; - r.Rx = r.Ry = r.Rz = 0.0; - + // NOTE: coordinate system swap + // TODO: replace with regular glm vectors + TLocation const l { + -vPosition.x, + vPosition.z, + vPosition.y }; + TRotation r { 0.0, 0.0, 0.0 }; // McZapkie: parametry powinny byc pobierane z toru // ts.R=MyTrack->fRadius; // ts.Len= Max0R(MoverParameters->BDist,MoverParameters->ADist); diff --git a/Event.cpp b/Event.cpp index 18cd4fa2..6c4fb07f 100644 --- a/Event.cpp +++ b/Event.cpp @@ -30,1818 +30,6 @@ http://mozilla.org/MPL/2.0/. #include "timer.h" #include "logs.h" -#ifdef EU07_USE_LEGACY_EVENTS -TEvent::TEvent( std::string const &m ) : - asNodeName( m ) -{ - if( false == m.empty() ) { - // utworzenie niejawnego odczytu komórki pamięci w torze - Type = tp_GetValues; - } - for( int i = 0; i < 13; ++i ) { - Params[ i ].asPointer = nullptr; - } -}; - -TEvent::~TEvent() { - - switch (Type) - { // sprzątanie - case tp_Multiple: - if (iFlags & conditional_memstring) // o ile jest łańcuch do porównania w memcompare - SafeDeleteArray(Params[10].asText); - break; - case tp_UpdateValues: - case tp_AddValues: - SafeDeleteArray(Params[0].asText); - if (iFlags & conditional_memstring) // o ile jest łańcuch do porównania w memcompare - SafeDeleteArray(Params[10].asText); - break; - case tp_Animation: // nic - // SafeDeleteArray(Params[9].asText); //nie usuwać - nazwa jest zamieniana na wskaźnik do submodelu - if (Params[0].asInt == 4) // jeśli z pliku VMD - SafeDeleteArray( Params[8].asPointer ); // zwolnić obszar - break; - case tp_GetValues: // nic - break; - case tp_PutValues: // params[0].astext stores the token - SafeDeleteArray( Params[ 0 ].asText ); - break; - default: - break; - } - evJoined = nullptr; // nie usuwać podczepionych tutaj - -}; - -void TEvent::Conditions(cParser *parser, std::string s) -{ // przetwarzanie warunków, wspólne dla Multiple i UpdateValues - if (s == "condition") - { // jesli nie "endevent" - std::string token, str; - parser->getTokens(); - *parser >> token; - str = token; - if (str == "trackoccupied") - iFlags |= conditional_trackoccupied; - else if (str == "trackfree") - iFlags |= conditional_trackfree; - else if (str == "propability") - { - iFlags |= conditional_propability; - parser->getTokens(); - *parser >> Params[10].asdouble; - } - else if (str == "memcompare") - { - iFlags |= conditional_memcompare; - parser->getTokens(1, false); // case sensitive - *parser >> token; - str = token; - if (str != "*") //"*" - nie brac command pod uwage - { // zapamiętanie łańcucha do porównania - Params[10].asText = new char[str.size() + 1]; - strcpy(Params[10].asText, str.c_str()); - iFlags |= conditional_memstring; - } - parser->getTokens(); - *parser >> token; - str = token; - if (str != "*") //"*" - nie brac val1 pod uwage - { - Params[11].asdouble = atof(str.c_str()); - iFlags |= conditional_memval1; - } - parser->getTokens(); - *parser >> token; - str = token; - if (str != "*") //"*" - nie brac val2 pod uwage - { - Params[12].asdouble = atof(str.c_str()); - iFlags |= conditional_memval2; - } - } - parser->getTokens(); - *parser >> token; - s = token; // ewentualnie dalej losowe opóźnienie - } - if (s == "randomdelay") - { // losowe opóźnienie - std::string token; - parser->getTokens(); - *parser >> fRandomDelay; // Ra 2014-03-11 - parser->getTokens(); - *parser >> token; // endevent - } -}; - -void TEvent::Load(cParser *parser, Math3D::vector3 const &org) -{ - std::string token; - - bEnabled = true; // zmieniane na false dla eventów używanych do skanowania sygnałów - - parser->getTokens(); - *parser >> token; - asName = ToLower(token); // użycie parametrów może dawać wielkie - - parser->getTokens(); - *parser >> token; - // str = AnsiString(token.c_str()); - - if (token == "exit") - Type = tp_Exit; - else if (token == "updatevalues") - Type = tp_UpdateValues; - else if (token == "getvalues") - Type = tp_GetValues; - else if (token == "putvalues") - Type = tp_PutValues; - else if (token == "disable") - Type = tp_Disable; - else if (token == "sound") - Type = tp_Sound; - else if (token == "velocity") - Type = tp_Velocity; - else if (token == "animation") - Type = tp_Animation; - else if (token == "lights") - Type = tp_Lights; - else if (token == "visible") - Type = tp_Visible; // zmiana wyświetlania obiektu - else if (token == "switch") - Type = tp_Switch; - else if (token == "dynvel") - Type = tp_DynVel; - else if (token == "trackvel") - Type = tp_TrackVel; - else if (token == "multiple") - Type = tp_Multiple; - else if (token == "addvalues") - Type = tp_AddValues; - else if (token == "copyvalues") - Type = tp_CopyValues; - else if (token == "whois") - Type = tp_WhoIs; - else if (token == "logvalues") - Type = tp_LogValues; - else if (token == "voltage") - Type = tp_Voltage; // zmiana napięcia w zasilaczu (TractionPowerSource) - else if (token == "message") - Type = tp_Message; // wyświetlenie komunikatu - else if (token == "friction") - Type = tp_Friction; // zmiana tarcia na scenerii - else - Type = tp_Unknown; - - parser->getTokens(); - *parser >> fDelay; - - parser->getTokens(); - *parser >> token; - - if (token != "none") - asNodeName = token; // nazwa obiektu powiązanego - - if (asName.substr(0, 5) == "none_") - m_ignored = true; // Ra: takie są ignorowane - - switch (Type) - { - case tp_AddValues: - iFlags = update_memadd; // dodawanko - case tp_UpdateValues: - // if (Type==tp_UpdateValues) iFlags=0; //co modyfikować - parser->getTokens(1, false); // case sensitive - *parser >> token; - Params[0].asText = new char[token.size() + 1]; - strcpy(Params[0].asText, token.c_str()); - if (token != "*") // czy ma zostać bez zmian? - iFlags |= update_memstring; - parser->getTokens(); - *parser >> token; - if (token != "*") // czy ma zostać bez zmian? - { - Params[1].asdouble = atof(token.c_str()); - iFlags |= update_memval1; - } - else - Params[1].asdouble = 0; - parser->getTokens(); - *parser >> token; - if (token != "*") // czy ma zostać bez zmian? - { - Params[2].asdouble = atof(token.c_str()); - iFlags |= update_memval2; - } - else - Params[2].asdouble = 0; - parser->getTokens(); - *parser >> token; - Conditions(parser, token); // sprawdzanie warunków - break; - case tp_CopyValues: { - Params[9].asText = nullptr; - iFlags = update_memstring | update_memval1 | update_memval2; // normalanie trzy - int paramidx { 0 }; - parser->getTokens(); - *parser >> token; // nazwa drugiej komórki (źródłowej) - while (token.compare("endevent") != 0) { - - switch (++paramidx) - { // znaczenie kolejnych parametrów - case 1: // nazwa drugiej komórki (źródłowej) - Params[9].asText = new char[token.size() + 1]; // usuwane i zamieniane na wskaźnik - strcpy(Params[9].asText, token.c_str()); - break; - case 2: // maska wartości - iFlags = stol_def(token, (update_memstring | update_memval1 | update_memval2)); - break; - } - parser->getTokens(); - *parser >> token; - } - break; - } - case tp_WhoIs: { - iFlags = update_memstring | update_memval1 | update_memval2; // normalanie trzy - int paramidx { 0 }; - parser->getTokens(); - *parser >> token; // nazwa drugiej komórki (źródłowej) - while( token.compare( "endevent" ) != 0 ) { - switch( ++paramidx ) { // znaczenie kolejnych parametrów - case 1: // maska wartości - iFlags = stol_def( token, ( update_memstring | update_memval1 | update_memval2 ) ); - break; - default: - break; - } - parser->getTokens(); - *parser >> token; - } - break; - } - case tp_GetValues: - case tp_LogValues: - parser->getTokens(); //"endevent" - *parser >> token; - break; - case tp_PutValues: - parser->getTokens(3); - *parser >> Params[3].asdouble >> Params[4].asdouble >> Params[5].asdouble; // położenie - // X,Y,Z - if ( !(org == Math3D::vector3()) ) - { // przesunięcie - // tmp->pCenter.RotateY(aRotate.y/180.0*M_PI); //Ra 2014-11: uwzględnienie rotacji - Params[3].asdouble += org.x; // współrzędne w scenerii - Params[4].asdouble += org.y; - Params[5].asdouble += org.z; - } - // Params[12].asInt=0; - parser->getTokens(1, false); // komendy 'case sensitive' - *parser >> token; - // str = AnsiString(token.c_str()); - if (token.substr(0, 19) == "PassengerStopPoint:") - { - if (token.find('#') != std::string::npos) - token.erase(token.find('#')); // obcięcie unikatowości - win1250_to_ascii( token ); // get rid of non-ascii chars - Params[6].asCommand = TCommandType::cm_PassengerStopPoint; - // nie do kolejki (dla SetVelocity też, ale jak jest do toru dowiązany) - bEnabled = false; - } - else if (token == "SetVelocity") - { - bEnabled = false; - Params[6].asCommand = TCommandType::cm_SetVelocity; - } - else if (token == "RoadVelocity") - { - bEnabled = false; - Params[6].asCommand = TCommandType::cm_RoadVelocity; - } - else if (token == "SectionVelocity") - { - bEnabled = false; - Params[6].asCommand = TCommandType::cm_SectionVelocity; - } - else if (token == "ShuntVelocity") - { - bEnabled = false; - Params[6].asCommand = TCommandType::cm_ShuntVelocity; - } - else if (token == "OutsideStation") - { - bEnabled = false; // ma być skanowny, aby AI nie przekraczało W5 - Params[6].asCommand = TCommandType::cm_OutsideStation; - } - else - Params[6].asCommand = TCommandType::cm_Unknown; - Params[0].asText = new char[token.size() + 1]; - strcpy(Params[0].asText, token.c_str()); - parser->getTokens(); - *parser >> token; - // str = AnsiString(token.c_str()); - if (token == "none") - Params[1].asdouble = 0.0; - else - try - { - Params[1].asdouble = atof(token.c_str()); - } - catch (...) - { - Params[1].asdouble = 0.0; - WriteLog("Error: number expected in PutValues event, found: " + token); - } - parser->getTokens(); - *parser >> token; - // str = AnsiString(token.c_str()); - if (token == "none") - Params[2].asdouble = 0.0; - else - try - { - Params[2].asdouble = atof(token.c_str()); - } - catch (...) - { - Params[2].asdouble = 0.0; - WriteLog("Error: number expected in PutValues event, found: " + token); - } - parser->getTokens(); - *parser >> token; - break; - case tp_Lights: { - int paramidx { 0 }; - do { - parser->getTokens(); - *parser >> token; - if( token.compare( "endevent" ) != 0 ) { - - if( paramidx < 8 ) { - Params[ paramidx ].asdouble = atof( token.c_str() ); // teraz może mieć ułamek - ++paramidx; - } - else { - ErrorLog( "Bad event: lights event \"" + asName + "\" with more than 8 parameters" ); - } - } - } while( token.compare( "endevent" ) != 0 ); - while( paramidx < 8 ) { - // HACK: mark unspecified lights with magic value - Params[ paramidx ].asdouble = -2.0; - ++paramidx; - } - break; - } - case tp_Visible: // zmiana wyświetlania obiektu - parser->getTokens(); - *parser >> token; - Params[0].asInt = atoi(token.c_str()); - parser->getTokens(); - *parser >> token; - break; - case tp_Velocity: - parser->getTokens(); - *parser >> token; - Params[0].asdouble = atof(token.c_str()) * ( 1000.0 / 3600.0 ); - parser->getTokens(); - *parser >> token; - break; - case tp_Sound: - parser->getTokens(); - *parser >> Params[0].asInt; // 0: wylaczyc, 1: wlaczyc; -1: wlaczyc zapetlone - Params[1].asdouble = 0.0; - parser->getTokens(); - if( parser->peek() != "endevent" ) { - // optional parameter, radio channel to receive/broadcast the sound - *parser >> Params[1].asdouble; - parser->getTokens(); - } - *parser >> token; - break; - case tp_Exit: - parser->getTokens(); - *parser >> token; - break; - case tp_Disable: - parser->getTokens(); - *parser >> token; - break; - case tp_Animation: - parser->getTokens(); - *parser >> token; - Params[0].asInt = 0; // na razie nieznany typ - if (token.compare("rotate") == 0) - { // obrót względem osi - parser->getTokens(); - *parser >> token; - Params[9].asText = new char[token.size() + 1]; // nazwa submodelu - std::strcpy(Params[9].asText, token.c_str()); - Params[0].asInt = 1; - parser->getTokens(4); - *parser - >> Params[1].asdouble - >> Params[2].asdouble - >> Params[3].asdouble - >> Params[4].asdouble; - } - else if (token.compare("translate") == 0) - { // przesuw o wektor - parser->getTokens(); - *parser >> token; - Params[9].asText = new char[token.size() + 1]; // nazwa submodelu - std::strcpy(Params[9].asText, token.c_str()); - Params[0].asInt = 2; - parser->getTokens(4); - *parser - >> Params[1].asdouble - >> Params[2].asdouble - >> Params[3].asdouble - >> Params[4].asdouble; - } - else if (token.compare("digital") == 0) - { // licznik cyfrowy - parser->getTokens(); - *parser >> token; - Params[9].asText = new char[token.size() + 1]; // nazwa submodelu - std::strcpy(Params[9].asText, token.c_str()); - Params[0].asInt = 8; - parser->getTokens(4); // jaki ma być sens tych parametrów? - *parser - >> Params[1].asdouble - >> Params[2].asdouble - >> Params[3].asdouble - >> Params[4].asdouble; - } - else if (token.substr(token.length() - 4, 4) == ".vmd") // na razie tu, może będzie inaczej - { // animacja z pliku VMD - { - std::ifstream file( szModelPath + token, std::ios::binary | std::ios::ate ); file.unsetf( std::ios::skipws ); - auto size = file.tellg(); // ios::ate already positioned us at the end of the file - file.seekg( 0, std::ios::beg ); // rewind the caret afterwards - Params[ 7 ].asInt = size; - Params[8].asPointer = new char[size]; - file.read( static_cast(Params[ 8 ].asPointer), size ); // wczytanie pliku - } - parser->getTokens(); - *parser >> token; - Params[9].asText = new char[token.size() + 1]; // nazwa submodelu - std::strcpy(Params[9].asText, token.c_str()); - Params[0].asInt = 4; // rodzaj animacji - parser->getTokens(4); - *parser - >> Params[1].asdouble - >> Params[2].asdouble - >> Params[3].asdouble - >> Params[4].asdouble; - } - parser->getTokens(); - *parser >> token; - break; - case tp_Switch: - parser->getTokens(); - *parser >> Params[0].asInt; - parser->getTokens(); - *parser >> token; - // str = AnsiString(token.c_str()); - if (token != "endevent") - { - Params[1].asdouble = atof(token.c_str()); // prędkość liniowa ruchu iglic - parser->getTokens(); - *parser >> token; - // str = AnsiString(token.c_str()); - } - else - Params[1].asdouble = -1.0; // użyć domyślnej - if (token != "endevent") - { - Params[2].asdouble = - atof(token.c_str()); // dodatkowy ruch drugiej iglicy (zamknięcie nastawnicze) - parser->getTokens(); - *parser >> token; - } - else - Params[2].asdouble = -1.0; // użyć domyślnej - break; - case tp_DynVel: - parser->getTokens(); - *parser >> Params[0].asdouble; // McZapkie-090302 *0.28; - parser->getTokens(); - *parser >> token; - break; - case tp_TrackVel: - parser->getTokens(); - *parser >> Params[0].asdouble; // McZapkie-090302 *0.28; - parser->getTokens(); - *parser >> token; - break; - case tp_Multiple: { - bool conditionalelse { false }; // flaga dla else - parser->getTokens(); - *parser >> token; - - while( ( token != "endevent" ) - && ( token != "condition" ) - && ( token != "randomdelay" ) ) { - - if( token != "else" ) { - if( token.substr( 0, 5 ) != "none_" ) { - // eventy rozpoczynające się od "none_" są ignorowane - m_children.emplace_back( token, nullptr, ( conditionalelse == false ) ); - } - else { - WriteLog( "Multi-event \"" + asName + "\" ignored link to event \"" + token + "\"" ); - } - } - else { - // zmiana flagi dla słowa "else" - conditionalelse = !conditionalelse; - m_conditionalelse = true; - } - parser->getTokens(); - *parser >> token; - } - Conditions(parser, token); // sprawdzanie warunków - break; - } - case tp_Voltage: // zmiana napięcia w zasilaczu (TractionPowerSource) - case tp_Friction: // zmiana przyczepnosci na scenerii - parser->getTokens(); - *parser >> Params[0].asdouble; // Ra 2014-01-27 - parser->getTokens(); - *parser >> token; - break; - case tp_Message: // wyświetlenie komunikatu - do - { - parser->getTokens(); - *parser >> token; - // str = AnsiString(token.c_str()); - } while (token != "endevent"); - break; -// case tp_Ignored: // ignorowany - case tp_Unknown: // nieznany - do - { - parser->getTokens(); - *parser >> token; - // str = AnsiString(token.c_str()); - } while (token != "endevent"); - WriteLog("Bad event: \"" + asName + - (Type == tp_Unknown ? "\" has unknown type." : "\" is ignored.")); - break; - } -}; - -// sends basic content of the class in legacy (text) format to provided stream -void -TEvent::export_as_text( std::ostream &Output ) const { - - if( Type == tp_Unknown ) { return; } - - // header - Output << "event "; - // name - Output << asName << ' '; - // type - std::vector const types { - "unknown", "sound", "exit", "disable", "velocity", "animation", "lights", - "updatevalues", "getvalues", "putvalues", "switch", "dynvel", "trackvel", - "multiple", "addvalues", "copyvalues", "whois", "logvalues", "visible", - "voltage", "message", "friction" }; - Output << types[ Type ] << ' '; - // delay - Output << fDelay << ' '; - // associated node - Output << ( asNodeName.empty() ? "none" : asNodeName ) << ' '; - // type-specific attributes - switch( Type ) { - case tp_AddValues: - case tp_UpdateValues: { - Output - << ( ( iFlags & update_memstring ) == 0 ? "*" : Params[ 0 ].asText ) << ' ' - << ( ( iFlags & update_memval1 ) == 0 ? "*" : to_string( Params[ 1 ].asdouble ) ) << ' ' - << ( ( iFlags & update_memval2 ) == 0 ? "*" : to_string( Params[ 2 ].asdouble ) ) << ' '; - break; - } - case tp_CopyValues: { - // NOTE: there's no way to get the original parameter value if it doesn't point to existing memcell - Output - << ( Params[ 9 ].asMemCell == nullptr ? "none" : Params[ 9 ].asMemCell->name() ) << ' ' - << ( iFlags & ( update_memstring | update_memval1 | update_memval2 ) ) << ' '; - break; - } - case tp_PutValues: { - Output - // location - << Params[ 3 ].asdouble << ' ' - << Params[ 4 ].asdouble << ' ' - << Params[ 5 ].asdouble << ' ' - // command - << Params[ 0 ].asText << ' ' - << Params[ 1 ].asdouble << ' ' - << Params[ 2 ].asdouble << ' '; - break; - } - case tp_Multiple: { - for( auto const &childevent : m_children ) { - if( std::get( childevent ) == nullptr ) { continue; } - if( true == std::get( childevent ) ) { - Output << std::get( childevent ) << ' '; - } - } - // optional 'else' block - if( true == m_conditionalelse ) { - Output << "else "; - for( auto const &childevent : m_children ) { - if( std::get( childevent ) == nullptr ) { continue; } - if( false == std::get( childevent ) ) { - Output << std::get( childevent ) << ' '; - } - } - } - break; - } - case tp_Visible: { - Output << Params[ 0 ].asInt << ' '; - break; - } - case tp_Switch: { - Output << Params[ 0 ].asInt << ' '; - if( ( Params[ 1 ].asdouble != -1.0 ) - || ( Params[ 2 ].asdouble != -1.0 ) ) { - Output << Params[ 1 ].asdouble << ' '; - } - if( Params[ 2 ].asdouble != -1.0 ) { - Output << Params[ 2 ].asdouble << ' '; - } - break; - } - case tp_Lights: { - auto lightidx { 0 }; - while( ( lightidx < iMaxNumLights ) - && ( Params[ lightidx ].asdouble > -2.0 ) ) { - Output << Params[ lightidx ].asdouble << ' '; - ++lightidx; - } - break; - } - case tp_Animation: { - // animation type - Output << ( - Params[ 0 ].asInt == 1 ? "rotate" : - Params[ 0 ].asInt == 2 ? "translate" : - // NOTE: .vmd animation doesn't preserve file name, can't be exported. TODO: fix this - Params[ 0 ].asInt == 8 ? "digital" : - "none" ) - << ' '; - // submodel - Output << ( - Params[ 9 ].asAnimContainer != nullptr ? - Params[ 9 ].asAnimContainer->NameGet() : - "none" ) << ' '; - // animation parameters - Output - << Params[ 1 ].asdouble << ' ' - << Params[ 2 ].asdouble << ' ' - << Params[ 3 ].asdouble << ' ' - << Params[ 4 ].asdouble << ' '; - break; - } - case tp_Sound: { - // playback mode - Output << Params[ 0 ].asInt << ' '; - // optional radio channel - if( Params[ 1 ].asdouble > 0.0 ) { - Output << Params[ 1 ].asdouble << ' '; - } - break; - } - case tp_DynVel: - case tp_TrackVel: - case tp_Voltage: - case tp_Friction: { - Output << Params[ 0 ].asdouble << ' '; - break; - } - case tp_Velocity: { - Output << Params[ 0 ].asdouble * ( 3600.0 / 1000.0 ) << ' '; - break; - } - case tp_WhoIs: { - Output - << ( iFlags & ( update_memstring | update_memval1 | update_memval2 ) ) << ' '; - break; - } - default: { - break; - } - } - // optional conditions - // NOTE: for flexibility condition check and export is performed for all event types rather than only for these which support it currently - auto const isconditional { ( conditional_trackoccupied | conditional_trackfree | conditional_propability | conditional_memcompare ) }; - if( ( ( iFlags & isconditional ) != 0 ) ) { - Output << "condition "; - if( ( iFlags & conditional_trackoccupied ) != 0 ) { - Output << "trackoccupied "; - } - else if( ( iFlags & conditional_trackfree ) != 0 ) { - Output << "trackfree "; - } - else if( ( iFlags & conditional_propability ) != 0 ) { - Output - << "propability " - << Params[ 10 ].asdouble << ' '; - } - else if( ( iFlags & conditional_memcompare ) != 0 ) { - Output - << "memcompare " - << ( ( iFlags & conditional_memstring ) == 0 ? "*" : Params[ 10 ].asText ) << ' ' - << ( ( iFlags & conditional_memval1 ) == 0 ? "*" : to_string( Params[ 11 ].asdouble ) ) << ' ' - << ( ( iFlags & conditional_memval2 ) == 0 ? "*" : to_string( Params[ 12 ].asdouble ) ) << ' '; - } - } - if( fRandomDelay != 0.0 ) { - Output - << "randomdelay " - << fRandomDelay << ' '; - } - // footer - Output - << "endevent" - << "\n"; -} - -void TEvent::AddToQuery( TEvent *Event, TEvent *&Start ) { - - TEvent *target( Start ); - TEvent *previous( nullptr ); - while( ( Event->fStartTime >= target->fStartTime ) - && ( target->evNext != nullptr ) ) { - previous = target; - target = target->evNext; - } - // the new event will be either before or after the one we located - if( Event->fStartTime >= target->fStartTime ) { - assert( target->evNext == nullptr ); - target->evNext = Event; - // if we have resurrected event land at the end of list, the link from previous run could potentially "add" unwanted events to the queue - Event->evNext = nullptr; - } - else { - if( previous != nullptr ) { - previous->evNext = Event; - Event->evNext = target; - } - else { - // special case, we're inserting our event before the provided start point - Event->evNext = Start; - Start = Event; - } - } -} - -//--------------------------------------------------------------------------- - -std::string TEvent::CommandGet() -{ // odczytanie komendy z eventu - switch (Type) - { // to się wykonuje również składu jadącego bez obsługi - case tp_GetValues: - return std::string(Params[9].asMemCell->Text()); - case tp_PutValues: - return std::string(Params[0].asText); - } - return ""; // inne eventy się nie liczą -}; - -TCommandType TEvent::Command() -{ // odczytanie komendy z eventu - switch (Type) - { // to się wykonuje również dla składu jadącego bez obsługi - case tp_GetValues: - return Params[9].asMemCell->Command(); - case tp_PutValues: - return Params[6].asCommand; // komenda zakodowana binarnie - } - return TCommandType::cm_Unknown; // inne eventy się nie liczą -}; - -double TEvent::ValueGet(int n) -{ // odczytanie komendy z eventu - n &= 1; // tylko 1 albo 2 jest prawidłowy - switch (Type) - { // to się wykonuje również składu jadącego bez obsługi - case tp_GetValues: - return n ? Params[9].asMemCell->Value1() : Params[9].asMemCell->Value2(); - case tp_PutValues: - return Params[2 - n].asdouble; - } - return 0.0; // inne eventy się nie liczą -}; - -glm::dvec3 TEvent::PositionGet() const -{ // pobranie współrzędnych eventu - switch (Type) - { // - case tp_GetValues: - return Params[9].asMemCell->location(); // współrzędne podłączonej komórki pamięci - case tp_PutValues: - return glm::dvec3(Params[3].asdouble, Params[4].asdouble, Params[5].asdouble); - } - return glm::dvec3(0, 0, 0); // inne eventy się nie liczą -}; - -bool TEvent::StopCommand() -{ // - if (Type == tp_GetValues) - return Params[9].asMemCell->StopCommand(); // info o komendzie z komórki - return false; -}; - -void TEvent::StopCommandSent() -{ - if (Type == tp_GetValues) - Params[9].asMemCell->StopCommandSent(); // komenda z komórki została wysłana -}; - -void TEvent::Append(TEvent *e) -{ // doczepienie kolejnych z tą samą nazwą - if (evJoined) - evJoined->Append(e); // rekurencja! - góra kilkanaście eventów będzie potrzebne - else - { - evJoined = e; - e->bEnabled = true; // ten doczepiony może być tylko kolejkowany - } -}; - - - -event_manager::~event_manager() { - - for( auto *event : m_events ) { - delete event; - } -} - -// adds specified event launcher to the list of global launchers -void -event_manager::queue( TEventLauncher *Launcher ) { - - m_launcherqueue.emplace_back( Launcher ); -} - -// legacy method, updates event queues -void -event_manager::update() { - - // process currently queued events - CheckQuery(); - // test list of global events for possible new additions to the queue - for( auto *launcher : m_launcherqueue ) { - - if( true == ( launcher->check_activation() && launcher->check_conditions() ) ) { - // NOTE: we're presuming global events aren't going to use event2 - WriteLog( "Eventlauncher " + launcher->name() ); - if( launcher->Event1 ) { - AddToQuery( launcher->Event1, nullptr ); - } - } - } -} - -// adds provided event to the collection. returns: true on success -// TODO: return handle instead of pointer -bool -event_manager::insert( TEvent *Event ) { - - if( Event->Type == tp_Unknown ) { return false; } - - // najpierw sprawdzamy, czy nie ma, a potem dopisujemy - auto lookup = m_eventmap.find( Event->asName ); - if( lookup != m_eventmap.end() ) { - // duplicate of already existing event - auto const size = Event->asName.size(); - // zawsze jeden znak co najmniej jest - if( Event->asName[ 0 ] == '#' ) { - // utylizacja duplikatu z krzyżykiem - return false; - } - // tymczasowo wyjątki: - else if( ( size > 8 ) - && ( Event->asName.substr( 0, 9 ) == "lineinfo:" ) ) { - // tymczasowa utylizacja duplikatów W5 - return false; - } - else if( ( size > 8 ) - && ( Event->asName.substr( size - 8 ) == "_warning" ) ) { - // tymczasowa utylizacja duplikatu z trąbieniem - return false; - } - else if( ( size > 4 ) - && ( Event->asName.substr( size - 4 ) == "_shp" ) ) { - // nie podlegają logowaniu - // tymczasowa utylizacja duplikatu SHP - return false; - } - - auto *duplicate = m_events[ lookup->second ]; - if( Global.bJoinEvents ) { - // doczepka (taki wirtualny multiple bez warunków) - duplicate->Append( Event ); - } - else { - // NOTE: somewhat convoluted way to deal with 'replacing' events without leaving dangling pointers - // can be cleaned up if pointers to events were replaced with handles - ErrorLog( "Bad event: encountered duplicated event, \"" + Event->asName + "\"" ); - duplicate->Append( Event ); // doczepka (taki wirtualny multiple bez warunków) - duplicate->m_ignored = true; // dezaktywacja pierwotnego - taka proteza na wsteczną zgodność - } - } - - m_events.emplace_back( Event ); - if( lookup == m_eventmap.end() ) { - // if it's first event with such name, it's potential candidate for the execution queue - m_eventmap.emplace( Event->asName, m_events.size() - 1 ); - if( ( Event->m_ignored != true ) - && ( Event->asName.find( "onstart" ) != std::string::npos ) ) { - // event uruchamiany automatycznie po starcie - AddToQuery( Event, nullptr ); - } - } - - return true; -} - -// legacy method, returns pointer to specified event, or null -TEvent * -event_manager::FindEvent( std::string const &Name ) { - - if( Name.empty() ) { return nullptr; } - - auto const lookup = m_eventmap.find( Name ); - return ( - lookup != m_eventmap.end() ? - m_events[ lookup->second ] : - nullptr ); -} - -// legacy method, inserts specified event in the event query -bool -event_manager::AddToQuery( TEvent *Event, TDynamicObject const *Owner ) { - - if( false == Event->bEnabled ) { return false; } - if( Event->iQueued != 0 ) { return false; } - // jeśli może być dodany do kolejki (nie używany w skanowaniu) - // jeśli nie dodany jeszcze do kolejki - - // kolejka eventów jest posortowana względem (fStartTime) - Event->Activator = Owner; - if( ( Event->Type == tp_AddValues ) - && ( Event->fDelay == 0.0 ) ) { - // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie - // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję - // wykonującą eventy i ją wywołać - if( ( false == Event->m_ignored ) - && ( true == EventConditon( Event ) ) ) { // teraz mogą być warunki do tych eventów - - Event->Params[ 5 ].asMemCell->UpdateValues( - Event->Params[ 0 ].asText, Event->Params[ 1 ].asdouble, - Event->Params[ 2 ].asdouble, Event->iFlags ); - - if( Event->Params[ 6 ].asTrack ) { - // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze - for( auto dynamic : Event->Params[ 6 ].asTrack->Dynamics ) { - Event->Params[ 5 ].asMemCell->PutCommand( - dynamic->Mechanik, - Event->Params[ 4 ].asLocation ); - } - //if (DebugModeFlag) - WriteLog( - "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues & Track command - [" - + std::string{ Event->Params[ 0 ].asText } + "] [" - + to_string( Event->Params[ 1 ].asdouble, 2 ) + "] [" - + to_string( Event->Params[ 2 ].asdouble, 2 ) + " ]" ); - } - //else if (DebugModeFlag) - WriteLog( - "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": AddValues - [" - + std::string( Event->Params[ 0 ].asText ) + "] [" - + to_string( Event->Params[ 1 ].asdouble, 2 ) + "] [" - + to_string( Event->Params[ 2 ].asdouble, 2 ) + "]" ); - } - // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) - do { - Event = Event->evJoined; - // NOTE: we could've received a new event from joint event above, so we need to check conditions just in case and discard the bad events - // TODO: refactor this arrangement, it's hardly optimal - } while( ( Event != nullptr ) - && ( ( false == Event->bEnabled ) - || ( Event->iQueued > 0 ) ) ); - } - if( ( Event != nullptr ) - && ( false == Event->m_ignored ) ) { - // standardowe dodanie do kolejki - ++Event->iQueued; // zabezpieczenie przed podwójnym dodaniem do kolejki - WriteLog( "EVENT ADDED TO QUEUE" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->asName ); - Event->fStartTime = std::abs( Event->fDelay ) + Timer::GetTime(); // czas od uruchomienia scenerii - if( Event->fRandomDelay > 0.0 ) { - // doliczenie losowego czasu opóźnienia - Event->fStartTime += Event->fRandomDelay * Random( 10000 ) * 0.0001; - } - if( QueryRootEvent != nullptr ) { - TEvent::AddToQuery( Event, QueryRootEvent ); - } - else { - QueryRootEvent = Event; - QueryRootEvent->evNext = nullptr; - } - } - - return true; -} - -// legacy method, executes queued events -bool -event_manager::CheckQuery() { - - TLocation loc; - int i; - while( ( QueryRootEvent != nullptr ) - && ( QueryRootEvent->fStartTime < Timer::GetTime() ) ) - { // eventy są posortowana wg czasu wykonania - m_workevent = QueryRootEvent; // wyjęcie eventu z kolejki - if (QueryRootEvent->evJoined) // jeśli jest kolejny o takiej samej nazwie - { // to teraz on będzie następny do wykonania - QueryRootEvent = QueryRootEvent->evJoined; // następny będzie ten doczepiony - QueryRootEvent->evNext = m_workevent->evNext; // pamiętając o następnym z kolejki - QueryRootEvent->fStartTime = m_workevent->fStartTime; // czas musi być ten sam, bo nie jest aktualizowany - QueryRootEvent->Activator = m_workevent->Activator; // pojazd aktywujący - QueryRootEvent->iQueued = 1; - // w sumie można by go dodać normalnie do kolejki, ale trzeba te połączone posortować wg czasu wykonania - } - else // a jak nazwa jest unikalna, to kolejka idzie dalej - QueryRootEvent = QueryRootEvent->evNext; // NULL w skrajnym przypadku - if( ( false == m_workevent->m_ignored ) && ( true == m_workevent->bEnabled ) ) { - // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć - --m_workevent->iQueued; // teraz moze być ponownie dodany do kolejki - WriteLog( "EVENT LAUNCHED" + ( m_workevent->Activator ? ( " by " + m_workevent->Activator->asName ) : "" ) + ": " + m_workevent->asName ); - switch (m_workevent->Type) - { - case tp_CopyValues: // skopiowanie wartości z innej komórki - m_workevent->Params[5].asMemCell->UpdateValues( - m_workevent->Params[9].asMemCell->Text(), - m_workevent->Params[9].asMemCell->Value1(), - m_workevent->Params[9].asMemCell->Value2(), - m_workevent->iFlags // flagi określają, co ma być skopiowane - ); - // break; //żeby się wysłało do torów i nie było potrzeby na AddValues * 0 0 - case tp_AddValues: // różni się jedną flagą od UpdateValues - case tp_UpdateValues: - if (EventConditon(m_workevent)) - { // teraz mogą być warunki do tych eventów - if (m_workevent->Type != tp_CopyValues) // dla CopyValues zrobiło się wcześniej - m_workevent->Params[5].asMemCell->UpdateValues( - m_workevent->Params[0].asText, - m_workevent->Params[1].asdouble, - m_workevent->Params[2].asdouble, - m_workevent->iFlags); - if (m_workevent->Params[6].asTrack) - { // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla - // wszystkich 'dynamic' na danym torze - for( auto dynamic : m_workevent->Params[ 6 ].asTrack->Dynamics ) { - m_workevent->Params[ 5 ].asMemCell->PutCommand( - dynamic->Mechanik, - m_workevent->Params[ 4 ].asLocation ); - } - //if (DebugModeFlag) - WriteLog("Type: UpdateValues & Track command - [" + - m_workevent->Params[5].asMemCell->Text() + "] [" + - to_string( m_workevent->Params[ 5 ].asMemCell->Value1(), 2 ) + "] [" + - to_string( m_workevent->Params[ 5 ].asMemCell->Value2(), 2 ) + "]" ); - } - else //if (DebugModeFlag) - WriteLog("Type: UpdateValues - [" + - m_workevent->Params[5].asMemCell->Text() + "] [" + - to_string( m_workevent->Params[ 5 ].asMemCell->Value1(), 2 ) + "] [" + - to_string( m_workevent->Params[ 5 ].asMemCell->Value2(), 2 ) + "]" ); - } - break; - case tp_GetValues: { - if( m_workevent->Activator ) { - // TODO: re-enable when messaging module is in place - if( Global.iMultiplayer ) { - // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) - multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); - } - m_workevent->Params[ 9 ].asMemCell->PutCommand( - m_workevent->Activator->Mechanik, - m_workevent->Params[ 8 ].asLocation ); - } - WriteLog( "Type: GetValues" ); - break; - } - case tp_PutValues: { - if (m_workevent->Activator) { - // zamiana, bo fizyka ma inaczej niż sceneria - loc.X = -m_workevent->Params[3].asdouble; - loc.Y = m_workevent->Params[5].asdouble; - loc.Z = m_workevent->Params[4].asdouble; - if( m_workevent->Activator->Mechanik ) { - // przekazanie rozkazu do AI - m_workevent->Activator->Mechanik->PutCommand( - m_workevent->Params[0].asText, m_workevent->Params[1].asdouble, - m_workevent->Params[2].asdouble, loc); - } - else { - // przekazanie do pojazdu - m_workevent->Activator->MoverParameters->PutCommand( - m_workevent->Params[0].asText, m_workevent->Params[1].asdouble, - m_workevent->Params[2].asdouble, loc); - } - WriteLog("Type: PutValues - [" + - std::string(m_workevent->Params[0].asText) + "] [" + - to_string( m_workevent->Params[ 1 ].asdouble, 2 ) + "] [" + - to_string( m_workevent->Params[ 2 ].asdouble, 2 ) + "]" ); - } - break; - } - case tp_Lights: { - if( m_workevent->Params[ 9 ].asModel ) { - for( i = 0; i < iMaxNumLights; ++i ) { - if( m_workevent->Params[ i ].asdouble == -2.0 ) { - // processed all supplied values, bail out - break; - } - if( m_workevent->Params[ i ].asdouble >= 0 ) { - // -1 zostawia bez zmiany - m_workevent->Params[ 9 ].asModel->LightSet( - i, - m_workevent->Params[ i ].asdouble ); - } - } - } - break; - } - case tp_Visible: { - if( m_workevent->Params[ 9 ].asSceneNode ) - m_workevent->Params[ 9 ].asSceneNode->visible( m_workevent->Params[ 0 ].asInt > 0 ); - break; - } - case tp_Velocity: { - Error( "Not implemented yet :(" ); - break; - } - case tp_Exit: { - // wyłączenie takie samo jak sekwencja F10 -> Y - MessageBox( - 0, - ExchangeCharInString( m_workevent->asNodeName, '_', ' ' ).c_str(), - " THE END ", - MB_OK ); - return false; - } - case tp_Sound: { - if( m_workevent->Params[ 9 ].tsTextSound == nullptr ) { - break; - } - switch( m_workevent->Params[ 0 ].asInt ) { - // trzy możliwe przypadki: - case 0: { - m_workevent->Params[ 9 ].tsTextSound->stop(); - break; - } - case 1: { - if( m_workevent->Params[ 1 ].asdouble > 0.0 ) { - simulation::radio_message( - m_workevent->Params[ 9 ].tsTextSound, - static_cast( m_workevent->Params[ 1 ].asdouble ) ); - } - else { - m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive | sound_flags::event ); - } - break; - } - case -1: { - m_workevent->Params[ 9 ].tsTextSound->play( sound_flags::exclusive | sound_flags::looping | sound_flags::event ); - break; - } - default: { - break; - } - } - break; - } - case tp_Disable: - Error("Not implemented yet :("); - break; - case tp_Animation: { - switch( m_workevent->Params[ 0 ].asInt ) { - case 1: { - m_workevent->Params[ 9 ].asAnimContainer->SetRotateAnim( - Math3D::vector3 { - m_workevent->Params[ 1 ].asdouble, - m_workevent->Params[ 2 ].asdouble, - m_workevent->Params[ 3 ].asdouble }, - m_workevent->Params[ 4 ].asdouble ); - break; - } - case 2: { - m_workevent->Params[ 9 ].asAnimContainer->SetTranslateAnim( - Math3D::vector3 { - m_workevent->Params[ 1 ].asdouble, - m_workevent->Params[ 2 ].asdouble, - m_workevent->Params[ 3 ].asdouble }, - m_workevent->Params[ 4 ].asdouble ); - break; - } - case 4: { - m_workevent->Params[ 9 ].asModel->AnimationVND( - m_workevent->Params[ 8 ].asPointer, - m_workevent->Params[ 1 ].asdouble, // tu mogą być dodatkowe parametry, np. od-do - m_workevent->Params[ 2 ].asdouble, - m_workevent->Params[ 3 ].asdouble, - m_workevent->Params[ 4 ].asdouble ); - break; - } - default: { - break; - } - } - break; - } - case tp_Switch: { - if( m_workevent->Params[ 9 ].asTrack ) { - m_workevent->Params[ 9 ].asTrack->Switch( - m_workevent->Params[ 0 ].asInt, - m_workevent->Params[ 1 ].asdouble, - m_workevent->Params[ 2 ].asdouble ); - } - if( Global.iMultiplayer ) { - // dajemy znać do serwera o przełożeniu - multiplayer::WyslijEvent( m_workevent->asName, "" ); // wysłanie nazwy eventu przełączajacego - } - // Ra: bardziej by się przydała nazwa toru, ale nie ma do niej stąd dostępu - break; - } - case tp_TrackVel: - if (m_workevent->Params[9].asTrack) { - // prędkość na zwrotnicy może być ograniczona z góry we wpisie, większej się nie ustawi eventem - m_workevent->Params[9].asTrack->VelocitySet(m_workevent->Params[0].asdouble); - // wyświetlana jest ta faktycznie ustawiona - WriteLog( "Type: TrackVel - [" - + to_string( m_workevent->Params[ 0 ].asdouble, 2 ) + "]" - + ( DebugModeFlag ? - ", actual [ " + to_string( m_workevent->Params[ 9 ].asTrack->VelocityGet(), 2 ) + "]" : - "" ) ); - } - break; - case tp_DynVel: - Error("Event \"DynVel\" is obsolete"); - break; - case tp_Multiple: { - auto const condition { EventConditon( m_workevent ) }; - if( ( true == condition ) - || ( true == m_workevent->m_conditionalelse ) ) { - // warunek spelniony albo było użyte else - WriteLog("Type: Multi-event"); - for( auto &childevent : m_workevent->m_children ) { - auto *childeventdata { std::get( childevent ) }; - if( childeventdata == nullptr ) { continue; } - if( std::get( childevent ) != condition ) { continue; } - - if( childeventdata != m_workevent ) { - // normalnie dodać - AddToQuery( childeventdata, m_workevent->Activator ); - } - else { - // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania - if( m_workevent->fDelay >= 5.0 ) { - AddToQuery( m_workevent, m_workevent->Activator ); - } - } - } - if( Global.iMultiplayer ) { - // dajemy znać do serwera o wykonaniu - if( false == m_workevent->m_conditionalelse ) { - // jednoznaczne tylko, gdy nie było else - if( m_workevent->Activator ) { - multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); - } - else { - multiplayer::WyslijEvent( m_workevent->asName, "" ); - } - } - } - } - break; - } - case tp_WhoIs: { - // pobranie nazwy pociągu do komórki pamięci - if (m_workevent->iFlags & update_load) { - // jeśli pytanie o ładunek - if( m_workevent->iFlags & update_memadd ) { - // jeśli typ pojazdu - // TODO: define and recognize individual request types - auto const owner = ( - ( ( m_workevent->Activator->Mechanik != nullptr ) && ( m_workevent->Activator->Mechanik->Primary() ) ) ? - m_workevent->Activator->Mechanik : - m_workevent->Activator->ctOwner ); - auto const consistbrakelevel = ( - owner != nullptr ? - owner->fReady : - -1.0 ); - auto const collisiondistance = ( - owner != nullptr ? - owner->TrackBlock() : - -1.0 ); - - m_workevent->Params[ 9 ].asMemCell->UpdateValues( - m_workevent->Activator->MoverParameters->TypeName, // typ pojazdu - consistbrakelevel, - collisiondistance, - m_workevent->iFlags & ( update_memstring | update_memval1 | update_memval2 ) ); - - WriteLog( - "Type: WhoIs (" + to_string( m_workevent->iFlags ) + ") - " - + "[name: " + m_workevent->Activator->MoverParameters->TypeName + "], " - + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " - + "[obstacle distance: " + to_string( collisiondistance, 2 ) + " m]" ); - } - else { - // jeśli parametry ładunku - m_workevent->Params[ 9 ].asMemCell->UpdateValues( - m_workevent->Activator->MoverParameters->LoadType, // nazwa ładunku - m_workevent->Activator->MoverParameters->Load, // aktualna ilość - m_workevent->Activator->MoverParameters->MaxLoad, // maksymalna ilość - m_workevent->iFlags & ( update_memstring | update_memval1 | update_memval2 ) ); - - WriteLog( - "Type: WhoIs (" + to_string( m_workevent->iFlags ) + ") - " - + "[load type: " + m_workevent->Activator->MoverParameters->LoadType + "], " - + "[current load: " + to_string( m_workevent->Activator->MoverParameters->Load, 2 ) + "], " - + "[max load: " + to_string( m_workevent->Activator->MoverParameters->MaxLoad, 2 ) + "]" ); - } - } - else if (m_workevent->iFlags & update_memadd) - { // jeśli miejsce docelowe pojazdu - m_workevent->Params[ 9 ].asMemCell->UpdateValues( - m_workevent->Activator->asDestination, // adres docelowy - m_workevent->Activator->DirectionGet(), // kierunek pojazdu względem czoła składu (1=zgodny,-1=przeciwny) - m_workevent->Activator->MoverParameters->Power, // moc pojazdu silnikowego: 0 dla wagonu - m_workevent->iFlags & (update_memstring | update_memval1 | update_memval2)); - - WriteLog( - "Type: WhoIs (" + to_string( m_workevent->iFlags ) + ") - " - + "[destination: " + m_workevent->Activator->asDestination + "], " - + "[direction: " + to_string( m_workevent->Activator->DirectionGet() ) + "], " - + "[engine power: " + to_string( m_workevent->Activator->MoverParameters->Power, 2 ) + "]" ); - } - else if (m_workevent->Activator->Mechanik) - if (m_workevent->Activator->Mechanik->Primary()) - { // tylko jeśli ktoś tam siedzi - nie powinno dotyczyć pasażera! - m_workevent->Params[ 9 ].asMemCell->UpdateValues( - m_workevent->Activator->Mechanik->TrainName(), - m_workevent->Activator->Mechanik->StationCount() - m_workevent->Activator->Mechanik->StationIndex(), // ile przystanków do końca - m_workevent->Activator->Mechanik->IsStop() ? - 1 : - 0, // 1, gdy ma tu zatrzymanie - m_workevent->iFlags); - WriteLog("Train detected: " + m_workevent->Activator->Mechanik->TrainName()); - } - break; - } - case tp_LogValues: { - // zapisanie zawartości komórki pamięci do logu - if( m_workevent->Params[ 9 ].asMemCell ) { - // jeśli była podana nazwa komórki - WriteLog( "Memcell \"" + m_workevent->asNodeName + "\": [" - + m_workevent->Params[ 9 ].asMemCell->Text() + "] [" - + to_string( m_workevent->Params[ 9 ].asMemCell->Value1(), 2 ) + "] [" - + to_string( m_workevent->Params[ 9 ].asMemCell->Value2(), 2 ) + "]" ); - } - else { - // lista wszystkich - simulation::Memory.log_all(); - } - break; - } - case tp_Voltage: // zmiana napięcia w zasilaczu (TractionPowerSource) - if (m_workevent->Params[9].psPower) - { // na razie takie chamskie ustawienie napięcia zasilania - WriteLog("Type: Voltage"); - m_workevent->Params[9].psPower->VoltageSet(m_workevent->Params[0].asdouble); - } - case tp_Friction: // zmiana tarcia na scenerii - { // na razie takie chamskie ustawienie napięcia zasilania - WriteLog("Type: Friction"); - Global.fFriction = (m_workevent->Params[0].asdouble); - } - break; - case tp_Message: // wyświetlenie komunikatu - break; - } // switch (tmpEvent->Type) - } // if (tmpEvent->bEnabled) - } // while - return true; -} - -// legacy method, initializes events after deserialization from scenario file -void -event_manager::InitEvents() { - - //łączenie eventów z pozostałymi obiektami - for( auto *event : m_events ) { - - switch( event->Type ) { - - case tp_AddValues: // sumowanie wartości - case tp_UpdateValues: { // zmiana wartości - auto *cell = simulation::Memory.find( event->asNodeName ); // nazwa komórki powiązanej z eventem - if( cell != nullptr ) { // McZapkie-100302 - if( event->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { - // jeśli chodzi o zajetosc toru (tor może być inny, niż wpisany w komórce) - // nazwa toru ta sama, co nazwa komórki - event->Params[ 9 ].asTrack = simulation::Paths.find( event->asNodeName ); - if( event->Params[ 9 ].asTrack == nullptr ) { - ErrorLog( "Bad event: track \"" + event->asNodeName + "\" referenced in event \"" + event->asName + "\" doesn't exist" ); - } - } - event->Params[ 4 ].asLocation = &( cell->location() ); - event->Params[ 5 ].asMemCell = cell; // komórka do aktualizacji - if( event->iFlags & ( conditional_memcompare ) ) { - // komórka do badania warunku - event->Params[ 9 ].asMemCell = cell; - } - if( false == cell->asTrackName.empty() ) { - // tor powiązany z komórką powiązaną z eventem - // tu potrzebujemy wskaźnik do komórki w (tmp) - event->Params[ 6 ].asTrack = simulation::Paths.find( cell->asTrackName ); - if( event->Params[ 6 ].asTrack == nullptr ) { - ErrorLog( "Bad memcell: track \"" + cell->asTrackName + "\" referenced in memcell \"" + cell->name() + "\" doesn't exist" ); - } - } - else { - event->Params[ 6 ].asTrack = nullptr; - } - } - else { - // nie ma komórki, to nie będzie działał poprawnie - event->m_ignored = true; // deaktywacja - ErrorLog( "Bad event: event \"" + event->asName + "\" cannot find memcell \"" + event->asNodeName + "\"" ); - } - break; - } - case tp_LogValues: { - // skojarzenie z memcell - if( event->asNodeName.empty() ) { // brak skojarzenia daje logowanie wszystkich - event->Params[ 9 ].asMemCell = nullptr; - break; - } - } - case tp_GetValues: - case tp_WhoIs: { - auto *cell = simulation::Memory.find( event->asNodeName ); - if( cell != nullptr ) { - event->Params[ 8 ].asLocation = &( cell->location() ); - event->Params[ 9 ].asMemCell = cell; - if( ( event->Type == tp_GetValues ) - && ( cell->IsVelocity() ) ) { - // jeśli odczyt komórki a komórka zawiera komendę SetVelocity albo ShuntVelocity - // to event nie będzie dodawany do kolejki - event->bEnabled = false; - } - } - else { - // nie ma komórki, to nie będzie działał poprawnie - event->m_ignored = true; // deaktywacja - ErrorLog( "Bad event: event \"" + event->asName + "\" cannot find memcell \"" + event->asNodeName + "\"" ); - } - break; - } - case tp_CopyValues: { - // skopiowanie komórki do innej - auto *cell = simulation::Memory.find( event->asNodeName ); // komórka docelowa - if( cell != nullptr ) { - event->Params[ 4 ].asLocation = &( cell->location() ); - event->Params[ 5 ].asMemCell = cell; // komórka docelowa - if( false == cell->asTrackName.empty() ) { - // tor powiązany z komórką powiązaną z eventem - // tu potrzebujemy wskaźnik do komórki w (tmp) - event->Params[ 6 ].asTrack = simulation::Paths.find( cell->asTrackName ); - if( event->Params[ 6 ].asTrack == nullptr ) { - ErrorLog( "Bad memcell: track \"" + cell->asTrackName + "\" referenced in memcell \"" + cell->name() + "\" doesn't exists" ); - } - } - else { - event->Params[ 6 ].asTrack = nullptr; - } - } - else { - ErrorLog( "Bad event: copyvalues event \"" + event->asName + "\" cannot find memcell \"" + event->asNodeName + "\"" ); - } - std::string const cellastext { event->Params[ 9 ].asText }; - cell = simulation::Memory.find( event->Params[ 9 ].asText ); // komórka źódłowa - SafeDeleteArray( event->Params[ 9 ].asText ); // usunięcie nazwy komórki - if( cell != nullptr ) { - event->Params[ 8 ].asLocation = &( cell->location() ); - event->Params[ 9 ].asMemCell = cell; // komórka źródłowa - } - else { - ErrorLog( "Bad event: copyvalues event \"" + event->asName + "\" cannot find memcell \"" + cellastext + "\"" ); - } - break; - } - case tp_Animation: { - // animacja modelu - // retrieve target name parameter - std::string const cellastext = event->Params[ 9 ].asText; - SafeDeleteArray( event->Params[ 9 ].asText ); - // egzemplarz modelu do animowania - auto *instance = simulation::Instances.find( event->asNodeName ); - if( instance != nullptr ) { - if( event->Params[ 0 ].asInt == 4 ) { - // model dla całomodelowych animacji - event->Params[ 9 ].asModel = instance; - } - else { - // standardowo przypisanie submodelu - event->Params[ 9 ].asAnimContainer = instance->GetContainer( cellastext ); // submodel - if( event->Params[ 9 ].asAnimContainer ) { - event->Params[ 9 ].asAnimContainer->WillBeAnimated(); // oflagowanie animacji - if( event->Params[ 9 ].asAnimContainer->Event() == nullptr ) { - // nie szukać, gdy znaleziony - event->Params[ 9 ].asAnimContainer->EventAssign( - FindEvent( event->asNodeName + "." + cellastext + ":done" ) ); - } - } - } - } - else { - ErrorLog( "Bad event: animation event \"" + event->asName + "\" cannot find model instance \"" + event->asNodeName + "\"" ); - } - break; - } - case tp_Lights: { - // zmiana świeteł modelu - auto *instance = simulation::Instances.find( event->asNodeName ); - if( instance != nullptr ) - event->Params[ 9 ].asModel = instance; - else - ErrorLog( "Bad event: lights event \"" + event->asName + "\" cannot find model instance \"" + event->asNodeName + "\"" ); - break; - } - case tp_Visible: { - // ukrycie albo przywrócenie obiektu - scene::basic_node *node = simulation::Instances.find( event->asNodeName ); // najpierw model - if( node == nullptr ) { - // albo tory? - node = simulation::Paths.find( event->asNodeName ); - } - if( node == nullptr ) { - // może druty? - node = simulation::Traction.find( event->asNodeName ); - } - if( node != nullptr ) - event->Params[ 9 ].asSceneNode = node; - else { - event->m_ignored = true; - ErrorLog( "Bad event: visibility event \"" + event->asName + "\" cannot find item \"" + event->asNodeName + "\"" ); - } - break; - } - case tp_Switch: { - // przełożenie zwrotnicy albo zmiana stanu obrotnicy - auto *track = simulation::Paths.find( event->asNodeName ); - if( track != nullptr ) { - // dowiązanie toru - if( track->iAction == 0 ) { - // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia - track->iAction |= 0x100; - } - event->Params[ 9 ].asTrack = track; - if( ( event->Params[ 0 ].asInt == 0 ) - && ( event->Params[ 2 ].asdouble >= 0.0 ) ) { - // jeśli przełącza do stanu 0 & jeśli jest zdefiniowany dodatkowy ruch iglic - // przesłanie parametrów - event->Params[ 9 ].asTrack->Switch( - event->Params[ 0 ].asInt, - event->Params[ 1 ].asdouble, - event->Params[ 2 ].asdouble ); - } - } - else { - ErrorLog( "Bad event: switch event \"" + event->asName + "\" cannot find track \"" + event->asNodeName + "\"" ); - } - break; - } - case tp_Sound: { - // odtworzenie dźwięku - auto *sound = simulation::Sounds.find( event->asNodeName ); - if( sound != nullptr ) - event->Params[ 9 ].tsTextSound = sound; - else - ErrorLog( "Bad event: sound event \"" + event->asName + "\" cannot find static sound \"" + event->asNodeName + "\"" ); - break; - } - case tp_TrackVel: { - // ustawienie prędkości na torze - if( false == event->asNodeName.empty() ) { - auto *track = simulation::Paths.find( event->asNodeName ); - if( track != nullptr ) { - // flaga zmiany prędkości toru jest istotna dla skanowania - track->iAction |= 0x200; - event->Params[ 9 ].asTrack = track; - } - else { - ErrorLog( "Bad event: track velocity event \"" + event->asName + "\" cannot find track \"" + event->asNodeName + "\"" ); - } - } - break; - } - case tp_DynVel: { - // komunikacja z pojazdem o konkretnej nazwie - if( event->asNodeName == "activator" ) - event->Params[ 9 ].asDynamic = nullptr; - else { - auto *vehicle = simulation::Vehicles.find( event->asNodeName ); - if( vehicle != nullptr ) - event->Params[ 9 ].asDynamic = vehicle; - else - ErrorLog( "Bad event: vehicle velocity event \"" + event->asName + "\" cannot find vehicle \"" + event->asNodeName + "\"" ); - } - break; - } - case tp_Multiple: { - if( false == event->asNodeName.empty() ) { - if( event->iFlags & ( conditional_trackoccupied | conditional_trackfree ) ) { - // jeśli chodzi o zajetosc toru - event->Params[ 9 ].asTrack = simulation::Paths.find( event->asNodeName ); - if( event->Params[ 9 ].asTrack == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find track \"" + event->asNodeName + "\"" ); - event->iFlags &= ~( conditional_trackoccupied | conditional_trackfree ); // zerowanie flag - } - } - else if( event->iFlags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) { - // jeśli chodzi o komorke pamieciową - event->Params[ 9 ].asMemCell = simulation::Memory.find( event->asNodeName ); - if( event->Params[ 9 ].asMemCell == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find memory cell \"" + event->asNodeName + "\"" ); - event->iFlags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); - } - } - } - for( auto &childevent : event->m_children ) { - std::get( childevent ) = FindEvent( std::get( childevent ) ); - if( std::get( childevent ) == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find event \"" + std::get( childevent ) + "\"" ); - } - } - break; - } - case tp_Voltage: { - // zmiana napięcia w zasilaczu (TractionPowerSource) - if( false == event->asNodeName.empty() ) { - auto *powersource = simulation::Powergrid.find( event->asNodeName ); // podłączenie zasilacza - if( powersource != nullptr ) - event->Params[ 9 ].psPower = powersource; - else - ErrorLog( "Bad event: voltage event \"" + event->asName + "\" cannot find power source \"" + event->asNodeName + "\"" ); - } - break; - } - case tp_Message: { - // wyświetlenie komunikatu - break; - } - - } // switch - - if( event->fDelay < 0 ) { AddToQuery( event, nullptr ); } - } -} - -// legacy method, initializes event launchers after deserialization from scenario file -void -event_manager::InitLaunchers() { - - for( auto *launcher : m_launchers.sequence() ) { - - if( launcher->iCheckMask != 0 ) { - if( launcher->asMemCellName != "none" ) { - // jeśli jest powiązana komórka pamięci - launcher->MemCell = simulation::Memory.find( launcher->asMemCellName ); - if( launcher->MemCell == nullptr ) { - ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find memcell \"" + launcher->asMemCellName + "\"" ); - } - } - else { - launcher->MemCell = nullptr; - } - } - - if( launcher->asEvent1Name != "none" ) { - launcher->Event1 = simulation::Events.FindEvent( launcher->asEvent1Name ); - if( launcher->Event1 == nullptr ) { - ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent1Name + "\"" ); - } - } - - if( launcher->asEvent2Name != "none" ) { - launcher->Event2 = simulation::Events.FindEvent( launcher->asEvent2Name ); - if( launcher->Event2 == nullptr ) { - ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent2Name + "\"" ); - } - } - } -} - -// sends basic content of the class in legacy (text) format to provided stream -void -event_manager::export_as_text( std::ostream &Output ) const { - - Output << "// events\n"; - for( auto const *event : m_events ) { - if( event->group() == null_handle ) { - event->export_as_text( Output ); - } - } - Output << "// event launchers\n"; - for( auto const *launcher : m_launchers.sequence() ) { - if( launcher->group() == null_handle ) { - launcher->export_as_text( Output ); - } - } -} - -// legacy method, verifies condition for specified event -bool -event_manager::EventConditon( TEvent *Event ) { - - if (Event->iFlags <= update_only) - return true; // bezwarunkowo - - if (Event->iFlags & conditional_trackoccupied) - return (!Event->Params[9].asTrack->IsEmpty()); - else if (Event->iFlags & conditional_trackfree) - return (Event->Params[9].asTrack->IsEmpty()); - else if (Event->iFlags & conditional_propability) - { - double rprobability = Random(); - WriteLog( "Random integer: " + std::to_string( rprobability ) + " / " + std::to_string( Event->Params[ 10 ].asdouble ) ); - return (Event->Params[10].asdouble > rprobability); - } - else if( Event->iFlags & conditional_memcompare ) { - // porównanie wartości - if( nullptr == Event->Params[9].asMemCell ) { - - ErrorLog( "Event " + Event->asName + " trying conditional_memcompare with nonexistent memcell" ); - return true; // though this is technically error, we report success to maintain backward compatibility - } - auto const comparisonresult = - m_workevent->Params[ 9 ].asMemCell->Compare( - ( Event->Params[ 10 ].asText != nullptr ? - Event->Params[ 10 ].asText : - "" ), - Event->Params[ 11 ].asdouble, - Event->Params[ 12 ].asdouble, - Event->iFlags ); - - std::string comparisonlog = "Type: MemCompare - "; - - comparisonlog += - "[" + Event->Params[ 9 ].asMemCell->Text() + "]" - + " [" + to_string( Event->Params[ 9 ].asMemCell->Value1(), 2 ) + "]" - + " [" + to_string( m_workevent->Params[ 9 ].asMemCell->Value2(), 2 ) + "]"; - - comparisonlog += ( - true == comparisonresult ? - " == " : - " != " ); - - comparisonlog += ( - TestFlag( Event->iFlags, conditional_memstring ) ? - "[" + std::string( m_workevent->Params[ 10 ].asText ) + "]" : - "[*]" ); - comparisonlog += ( - TestFlag( m_workevent->iFlags, conditional_memval1 ) ? - " [" + to_string( m_workevent->Params[ 11 ].asdouble, 2 ) + "]" : - " [*]" ); - comparisonlog += ( - TestFlag( m_workevent->iFlags, conditional_memval2 ) ? - " [" + to_string( m_workevent->Params[ 12 ].asdouble, 2 ) + "]" : - " [*]" ); - - WriteLog( comparisonlog ); - return comparisonresult; - } - // unrecognized request - return false; -} -#else TMemCell const * TEvent::update_data::data_cell() const { @@ -1853,18 +41,6 @@ TEvent::update_data::data_cell() { return static_cast( std::get( data_source ) ); } -TEvent::TEvent() { -/* - if( false == m.empty() ) { - // utworzenie niejawnego odczytu komórki pamięci w torze - Type = tp_GetValues; - } - for( int i = 0; i < 13; ++i ) { - Params[ i ].asPointer = nullptr; - } -*/ -}; - TEvent::~TEvent() { switch (Type) @@ -2302,6 +478,641 @@ void TEvent::Load(cParser *parser, Math3D::vector3 const &org) } }; +// prepares event for use +void +TEvent::init() { + + switch( Type ) { + + case tp_AddValues: // sumowanie wartości + case tp_UpdateValues: { // zmiana wartości + // target memory cell(s), previously held in param 5, copy held in param 9 for memcompare + init_targets( simulation::Memory, "memory cell" ); + // conditional data + init_conditions(); + break; + } + case tp_LogValues: { + // skojarzenie z memcell + init_targets( simulation::Memory, "memory cell" ); + break; + } + case tp_GetValues: { + init_targets( simulation::Memory, "memory cell" ); + // custom target initialization code + for( auto &target : m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { continue; } + if( targetcell->IsVelocity() ) { + // jeśli odczyt komórki a komórka zawiera komendę SetVelocity albo ShuntVelocity + // to event nie będzie dodawany do kolejki + bEnabled = false; + } + } + // NOTE: GetValues retrieves data only from first specified memory cell + // TBD, TODO: allow retrieval from more than one cell? + m_update.data_source = m_targets.front(); + break; + } + case tp_WhoIs: { + init_targets( simulation::Memory, "memory cell" ); + break; + } + case tp_CopyValues: { + // skopiowanie komórki do innej + init_targets( simulation::Memory, "memory cell" ); + // source cell + std::get( m_update.data_source ) = simulation::Memory.find( std::get( m_update.data_source ) ); + if( std::get( m_update.data_source ) == nullptr ) { + m_ignored = true; // deaktywacja + ErrorLog( "Bad event: copyvalues event \"" + asName + "\" cannot find memcell \"" + std::get( m_update.data_source ) + "\"" ); + } + break; + } + case tp_Animation: { + // animacja modelu + init_targets( simulation::Instances, "model instance" ); + // custom target initialization code + if( m_animationtype == 4 ) { + // vmd animations target whole model + break; + } + // locate and set up animated submodels + m_animationcontainers.clear(); + for( auto &target : m_targets ) { + auto *targetmodel{ static_cast( std::get( target ) ) }; + if( targetmodel == nullptr ) { continue; } + auto *targetcontainer{ targetmodel->GetContainer( m_animationsubmodel ) }; + if( targetcontainer == nullptr ) { + m_ignored = true; + ErrorLog( "Bad event: animation event \"" + asName + "\" cannot find submodel " + m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" ); + break; + } + targetcontainer->WillBeAnimated(); // oflagowanie animacji + if( targetcontainer->Event() == nullptr ) { + // nie szukać, gdy znaleziony + targetcontainer->EventAssign( simulation::Events.FindEvent( targetmodel->name() + '.' + m_animationsubmodel + ":done" ) ); + } + m_animationcontainers.emplace_back( targetcontainer ); + } + break; + } + case tp_Lights: { + // zmiana świeteł modelu + init_targets( simulation::Instances, "model instance" ); + break; + } + case tp_Visible: { + // ukrycie albo przywrócenie obiektu + for( auto &target : m_targets ) { + auto &targetnode{ std::get( target ) }; + auto &targetname{ std::get( target ) }; + // najpierw model + targetnode = simulation::Instances.find( targetname ); + if( targetnode == nullptr ) { + // albo tory? + targetnode = simulation::Paths.find( targetname ); + } + if( targetnode == nullptr ) { + // może druty? + targetnode = simulation::Traction.find( targetname ); + } + if( targetnode == nullptr ) { + m_ignored = true; // deaktywacja + ErrorLog( "Bad event: event \"" + asName + "\" [" + type_to_string() + "] cannot find item \"" + std::get( target ) + "\"" ); + } + } + break; + } + case tp_Switch: { + // przełożenie zwrotnicy albo zmiana stanu obrotnicy + init_targets( simulation::Paths, "track" ); + // custom target initialization code + for( auto &target : m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // dowiązanie toru + if( targettrack->iAction == 0 ) { + // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia + targettrack->iAction |= 0x100; + } + if( ( m_switchstate == 0 ) + && ( m_switchmovedelay >= 0.0 ) ) { + // jeśli przełącza do stanu 0 & jeśli jest zdefiniowany dodatkowy ruch iglic + // przesłanie parametrów + targettrack->Switch( + m_switchstate, + m_switchmoverate, + m_switchmovedelay ); + } + } + break; + } + case tp_Sound: { + // odtworzenie dźwięku + for( auto &target : m_sounds ) { + std::get( target ) = simulation::Sounds.find( std::get( target ) ); + if( std::get( target ) == nullptr ) { + m_ignored = true; // deaktywacja + ErrorLog( "Bad event: event \"" + asName + "\" [" + type_to_string() + "] cannot find static sound \"" + std::get( target ) + "\"" ); + } + } + break; + } + case tp_TrackVel: { + // ustawienie prędkości na torze + init_targets( simulation::Paths, "track" ); + // custom target initialization code + for( auto &target : m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // flaga zmiany prędkości toru jest istotna dla skanowania + targettrack->iAction |= 0x200; + } + break; + } + case tp_Multiple: { + // conditional data + init_targets( simulation::Memory, "memory cell", false ); + if( m_ignored ) { + m_condition.flags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); + m_ignored = false; + } + init_conditions(); + // child events bindings + for( auto &childevent : m_children ) { + std::get( childevent ) = simulation::Events.FindEvent( std::get( childevent ) ); + if( std::get( childevent ) == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + asName + "\" cannot find event \"" + std::get( childevent ) + "\"" ); + } + } + break; + } + case tp_Voltage: { + // zmiana napięcia w zasilaczu (TractionPowerSource) + init_targets( simulation::Powergrid, "power source" ); + break; + } + case tp_Message: { + // wyświetlenie komunikatu + break; + } + default: { + break; + } + } // switch +} + +bool +TEvent::test_condition() const { + + if( m_condition.flags == 0 ) { + return true; // bezwarunkowo + } + // if there's conditions, check them + if( m_condition.flags & conditional_propability ) { + auto const rprobability { static_cast( Random() ) }; + WriteLog( "Test: Random integer - [" + std::to_string( rprobability ) + "] / [" + std::to_string( m_condition.probability ) + "]" ); + if( rprobability > m_condition.probability ) { + return false; + } + } + if( m_condition.flags & conditional_trackoccupied ) { + for( auto *track : m_condition.tracks ) { + if( true == track->IsEmpty() ) { + return false; + } + } + } + if( m_condition.flags & conditional_trackfree ) { + for( auto *track : m_condition.tracks ) { + if( false == track->IsEmpty() ) { + return false; + } + } + } + if( m_condition.flags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) { + // porównanie wartości + for( auto &target : m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { + ErrorLog( "Event " + asName + " trying conditional_memcompare with nonexistent memcell" ); + continue; // though this is technically error, we treat it as a success to maintain backward compatibility + } + auto const comparisonresult = + targetcell->Compare( + m_condition.match_text, + m_condition.match_value_1, + m_condition.match_value_2, + m_condition.flags ); + + std::string comparisonlog = "Test: MemCompare - "; + + comparisonlog += + "[" + targetcell->Text() + "]" + + " [" + to_string( targetcell->Value1(), 2 ) + "]" + + " [" + to_string( targetcell->Value2(), 2 ) + "]"; + + comparisonlog += ( + true == comparisonresult ? + " == " : + " != " ); + + comparisonlog += ( + TestFlag( m_condition.flags, conditional_memstring ) ? + "[" + std::string( m_condition.match_text ) + "]" : + "[*]" ); + comparisonlog += ( + TestFlag( m_condition.flags, conditional_memval1 ) ? + " [" + to_string( m_condition.match_value_1, 2 ) + "]" : + " [*]" ); + comparisonlog += ( + TestFlag( m_condition.flags, conditional_memval2 ) ? + " [" + to_string( m_condition.match_value_2, 2 ) + "]" : + " [*]" ); + + WriteLog( comparisonlog ); + + if( false == comparisonresult ) { + return false; + } + } + } + // if we made it here it means we passed all checks + return true; +} + +void +TEvent::run() { + + WriteLog( "EVENT LAUNCHED" + ( Activator ? ( " by " + Activator->asName ) : "" ) + ": " + asName ); + switch (Type) { + case tp_CopyValues: { + // skopiowanie wartości z innej komórki + auto const *datasource = static_cast( std::get( m_update.data_source ) ); + m_update.data_text = datasource->Text(); + m_update.data_value_1 = datasource->Value1(); + m_update.data_value_2 = datasource->Value2(); + } + case tp_AddValues: // różni się jedną flagą od UpdateValues + case tp_UpdateValues: { + if( false == test_condition() ) { break; } + WriteLog( "Type: " + std::string( Type == tp_AddValues ? "AddValues & Track command" : "UpdateValues" ) + " - [" + + m_update.data_text + "] [" + + to_string( m_update.data_value_1, 2 ) + "] [" + + to_string( m_update.data_value_2, 2 ) + "]" ); + // TODO: dump status of target cells after the operation + for( auto &target : m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { continue; } + targetcell->UpdateValues( + m_update.data_text, + m_update.data_value_1, + m_update.data_value_2, + m_update.flags ); + if( targetcell->Track == nullptr ) { continue; } + // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze + auto const location { targetcell->location() }; + for( auto dynamic : targetcell->Track->Dynamics ) { + targetcell->PutCommand( + dynamic->Mechanik, + &location ); + } + } + break; + } + case tp_GetValues: { + WriteLog( "Type: GetValues" ); + if( Activator ) { + // TODO: re-enable when messaging module is in place + if( Global.iMultiplayer ) { + // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) + multiplayer::WyslijEvent( asName, Activator->name() ); + } + m_update.data_cell()->PutCommand( + Activator->Mechanik, + &(m_update.data_cell()->location()) ); + } + break; + } + case tp_PutValues: { + WriteLog( "Type: PutValues - [" + + m_update.data_text + "] [" + + to_string( m_update.data_value_1, 2 ) + "] [" + + to_string( m_update.data_value_2, 2 ) + "]" ); + if (Activator) { + // zamiana, bo fizyka ma inaczej niż sceneria + // NOTE: y & z swap, negative x + TLocation const loc { + -m_update.location.x, + m_update.location.z, + m_update.location.y }; + if( Activator->Mechanik ) { + // przekazanie rozkazu do AI + Activator->Mechanik->PutCommand( + m_update.data_text, + m_update.data_value_1, + m_update.data_value_2, + loc); + } + else { + // przekazanie do pojazdu + Activator->MoverParameters->PutCommand( + m_update.data_text, + m_update.data_value_1, + m_update.data_value_2, + loc); + } + } + break; + } + case tp_Lights: { + for( auto &target : m_targets ) { + auto *targetmodel = static_cast( std::get( target ) ); + if( targetmodel == nullptr ) { continue; } + // event effect code + for( auto i = 0; i < iMaxNumLights; ++i ) { + if( m_lights[ i ] == -2.f ) { + // processed all supplied values, bail out + break; + } + if( m_lights[ i ] >= 0.f ) { + // -1 zostawia bez zmiany + targetmodel->LightSet( + i, + m_lights[ i ] ); + } + } + } + break; + } + case tp_Visible: { + for( auto &target : m_targets ) { + auto *targetnode = std::get( target ); + if( targetnode == nullptr ) { continue; } + // event effect code + targetnode->visible( m_visible ); + } + break; + } + case tp_Sound: { + for( auto &target : m_sounds ) { + auto *targetsound = std::get( target ); + if( targetsound == nullptr ) { continue; } + // event effect code + switch( m_soundmode ) { + // trzy możliwe przypadki: + case 0: { + targetsound->stop(); + break; + } + case 1: { + if( m_soundradiochannel > 0 ) { + simulation::radio_message( + targetsound, + m_soundradiochannel ); + } + else { + targetsound->play( sound_flags::exclusive | sound_flags::event ); + } + break; + } + case -1: { + targetsound->play( sound_flags::exclusive | sound_flags::looping | sound_flags::event ); + break; + } + default: { + break; + } + } + } + break; + } + case tp_Animation: { + WriteLog( "Type: Animation" ); + if( m_animationtype == 4 ) { + // vmd mode targets the entire model + for( auto &target : m_targets ) { + auto *targetmodel = static_cast( std::get( target ) ); + if( targetmodel == nullptr ) { continue; } + // event effect code + targetmodel->AnimationVND( + m_animationfiledata, + m_animationparams[ 0 ], // tu mogą być dodatkowe parametry, np. od-do + m_animationparams[ 1 ], + m_animationparams[ 2 ], + m_animationparams[ 3 ] ); + } + } + else { + // other animation modes target specific submodels + for( auto *targetcontainer : m_animationcontainers ) { + switch( m_animationtype ) { + case 1: { // rotate + targetcontainer->SetRotateAnim( + glm::make_vec3( m_animationparams.data() ), + m_animationparams[ 3 ] ); + break; + } + case 2: { // translate + targetcontainer->SetTranslateAnim( + glm::make_vec3( m_animationparams.data() ), + m_animationparams[ 3 ] ); + break; + } + // TODO: implement digital mode + default: { + break; + } + } + } + } + break; + } + case tp_Switch: { + for( auto &target : m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // event effect code + targettrack->Switch( + m_switchstate, + m_switchmoverate, + m_switchmovedelay ); + } + if( Global.iMultiplayer ) { + // dajemy znać do serwera o przełożeniu + multiplayer::WyslijEvent( asName, "" ); // wysłanie nazwy eventu przełączajacego + } + // Ra: bardziej by się przydała nazwa toru, ale nie ma do niej stąd dostępu + break; + } + case tp_TrackVel: { + WriteLog( "Type: TrackVel - [" + to_string( m_velocity, 2 ) + "]" ); + for( auto &target : m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // event effect code + targettrack->VelocitySet( m_velocity ); + if( DebugModeFlag ) { + WriteLog( "actual track velocity for " + targettrack->name() + " [" + to_string( targettrack->VelocityGet(), 2 ) + "]" ); + } + } + break; + } + case tp_Multiple: { + auto const condition { test_condition() }; + if( ( true == condition ) + || ( true == m_condition.has_else ) ) { + // warunek spelniony albo było użyte else + WriteLog("Type: Multi-event"); + for( auto &childevent : m_children ) { + auto *childeventdata { std::get( childevent ) }; + if( childeventdata == nullptr ) { continue; } + if( std::get( childevent ) != condition ) { continue; } + + if( childeventdata != this ) { + // normalnie dodać + simulation::Events.AddToQuery( childeventdata, Activator ); + } + else { + // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania + if( fDelay >= 5.0 ) { + simulation::Events.AddToQuery( this, Activator ); + } + } + } + if( Global.iMultiplayer ) { + // dajemy znać do serwera o wykonaniu + if( false == m_condition.has_else ) { + // jednoznaczne tylko, gdy nie było else + if( Activator ) { + multiplayer::WyslijEvent( asName, Activator->name() ); + } + else { + multiplayer::WyslijEvent( asName, "" ); + } + } + } + } + break; + } + case tp_WhoIs: { + for( auto &target : m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { continue; } + // event effect code + if( m_update.flags & update_load ) { + // jeśli pytanie o ładunek + if( m_update.flags & update_memadd ) { + // jeśli typ pojazdu + // TODO: define and recognize individual request types + auto const owner = ( + ( ( Activator->Mechanik != nullptr ) && ( Activator->Mechanik->Primary() ) ) ? + Activator->Mechanik : + Activator->ctOwner ); + auto const consistbrakelevel = ( + owner != nullptr ? + owner->fReady : + -1.0 ); + auto const collisiondistance = ( + owner != nullptr ? + owner->TrackBlock() : + -1.0 ); + + targetcell->UpdateValues( + Activator->MoverParameters->TypeName, // typ pojazdu + consistbrakelevel, + collisiondistance, + m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_update.flags ) + ") - " + + "[name: " + Activator->MoverParameters->TypeName + "], " + + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " + + "[obstacle distance: " + to_string( collisiondistance, 2 ) + " m]" ); + } + else { + // jeśli parametry ładunku + targetcell->UpdateValues( + Activator->MoverParameters->LoadType, // nazwa ładunku + Activator->MoverParameters->Load, // aktualna ilość + Activator->MoverParameters->MaxLoad, // maksymalna ilość + m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_update.flags ) + ") - " + + "[load type: " + Activator->MoverParameters->LoadType + "], " + + "[current load: " + to_string( Activator->MoverParameters->Load, 2 ) + "], " + + "[max load: " + to_string( Activator->MoverParameters->MaxLoad, 2 ) + "]" ); + } + } + else if( m_update.flags & update_memadd ) { // jeśli miejsce docelowe pojazdu + targetcell->UpdateValues( + Activator->asDestination, // adres docelowy + Activator->DirectionGet(), // kierunek pojazdu względem czoła składu (1=zgodny,-1=przeciwny) + Activator->MoverParameters->Power, // moc pojazdu silnikowego: 0 dla wagonu + m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_update.flags ) + ") - " + + "[destination: " + Activator->asDestination + "], " + + "[direction: " + to_string( Activator->DirectionGet() ) + "], " + + "[engine power: " + to_string( Activator->MoverParameters->Power, 2 ) + "]" ); + } + else if( Activator->Mechanik ) { + if( Activator->Mechanik->Primary() ) { // tylko jeśli ktoś tam siedzi - nie powinno dotyczyć pasażera! + targetcell->UpdateValues( + Activator->Mechanik->TrainName(), + Activator->Mechanik->StationCount() - Activator->Mechanik->StationIndex(), // ile przystanków do końca + Activator->Mechanik->IsStop() ? + 1 : + 0, // 1, gdy ma tu zatrzymanie + m_update.flags ); + WriteLog( "Train detected: " + Activator->Mechanik->TrainName() ); + } + } + } + break; + } + case tp_LogValues: { // zapisanie zawartości komórki pamięci do logu + if( m_targets.empty() ) { + // lista wszystkich + simulation::Memory.log_all(); + } + else { + // jeśli była podana nazwa komórki + for( auto &target : m_targets ) { + auto *targetcell = static_cast( std::get( target ) ); + if( targetcell == nullptr ) { continue; } + WriteLog( "Memcell \"" + targetcell->name() + "\": [" + + targetcell->Text() + "] [" + + to_string( targetcell->Value1(), 2 ) + "] [" + + to_string( targetcell->Value2(), 2 ) + "]" ); + } + } + break; + } + case tp_Voltage: { // zmiana napięcia w zasilaczu (TractionPowerSource) + WriteLog( "Type: Voltage [" + to_string( m_voltage, 2 ) + "]" ); + for( auto &target : m_targets ) { + auto *targetpowersource = static_cast( std::get( target ) ); + if( targetpowersource == nullptr ) { continue; } + targetpowersource->VoltageSet( m_voltage ); + } + break; + } + case tp_Friction: { // zmiana tarcia na scenerii + // na razie takie chamskie ustawienie napięcia zasilania + WriteLog("Type: Friction"); + Global.fFriction = (m_friction); + break; + } + case tp_Message: { // wyświetlenie komunikatu + break; + } + } // switch (tmpEvent->Type) +} + void TEvent::init_conditions() { @@ -2341,7 +1152,6 @@ TEvent::condition_data::load( cParser &Input ) Input >> probability; } else if( token == "memcompare" ) { - flags |= conditional_memcompare; Input.getTokens( 1, false ); // case sensitive if( Input.peek() != "*" ) //"*" - nie brac command pod uwage { // zapamiętanie łańcucha do porównania @@ -2552,8 +1362,7 @@ TEvent::export_as_text( std::ostream &Output ) const { } // optional conditions // NOTE: for flexibility condition check and export is performed for all event types rather than only for these which support it currently - auto const isconditional { ( conditional_trackoccupied | conditional_trackfree | conditional_propability | conditional_memcompare ) }; - if( ( ( m_condition.flags & isconditional ) != 0 ) ) { + if( m_condition.flags != 0 ) { Output << "condition "; if( ( m_condition.flags & conditional_trackoccupied ) != 0 ) { Output << "trackoccupied "; @@ -2566,7 +1375,7 @@ TEvent::export_as_text( std::ostream &Output ) const { << "propability " << m_condition.probability << ' '; } - if( ( m_condition.flags & conditional_memcompare ) != 0 ) { + if( ( m_condition.flags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) != 0 ) { Output << "memcompare " << ( ( m_condition.flags & conditional_memstring ) == 0 ? "*" : m_condition.match_text ) << ' ' @@ -2805,44 +1614,16 @@ event_manager::FindEvent( std::string const &Name ) { bool event_manager::AddToQuery( TEvent *Event, TDynamicObject const *Owner ) { - if( false == Event->bEnabled ) { return false; } - if( Event->iQueued != 0 ) { return false; } - // jeśli może być dodany do kolejki (nie używany w skanowaniu) - // jeśli nie dodany jeszcze do kolejki + if( false == Event->bEnabled ) { return false; } // jeśli może być dodany do kolejki (nie używany w skanowaniu) + if( Event->iQueued != 0 ) { return false; } // jeśli nie dodany jeszcze do kolejki // kolejka eventów jest posortowana względem (fStartTime) Event->Activator = Owner; if( ( Event->Type == tp_AddValues ) && ( Event->fDelay == 0.0 ) ) { // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie - // Ra: kopiowanie wykonania tu jest bez sensu, lepiej by było wydzielić funkcję - // wykonującą eventy i ją wywołać - if( ( false == Event->m_ignored ) - && ( true == EventConditon( Event ) ) ) { // teraz mogą być warunki do tych eventów - - WriteLog( "EVENT EXECUTED" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->asName ); - WriteLog( "Type: AddValues & Track command - [" - + Event->m_update.data_text + "] [" - + to_string( Event->m_update.data_value_1, 2 ) + "] [" - + to_string( Event->m_update.data_value_2, 2 ) + "]" ); - // TODO: dump status of target cells after the operation - for( auto &target : Event->m_targets ) { - auto *memcell = static_cast( std::get( target ) ); - if( memcell == nullptr ) { continue; } - memcell->UpdateValues( - Event->m_update.data_text, - Event->m_update.data_value_1, - Event->m_update.data_value_2, - Event->m_update.flags ); - if( memcell->Track == nullptr ) { continue; } - // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze - auto const location { memcell->location() }; - for( auto dynamic : memcell->Track->Dynamics ) { - memcell->PutCommand( - dynamic->Mechanik, - &location ); - } - } + if( false == Event->m_ignored ) { + Event->run(); } // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) do { @@ -2879,8 +1660,6 @@ event_manager::AddToQuery( TEvent *Event, TDynamicObject const *Owner ) { bool event_manager::CheckQuery() { - TLocation loc; - int i; while( ( QueryRootEvent != nullptr ) && ( QueryRootEvent->fStartTime < Timer::GetTime() ) ) { // eventy są posortowana wg czasu wykonania @@ -2899,371 +1678,7 @@ event_manager::CheckQuery() { if( ( false == m_workevent->m_ignored ) && ( true == m_workevent->bEnabled ) ) { // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć --m_workevent->iQueued; // teraz moze być ponownie dodany do kolejki - WriteLog( "EVENT LAUNCHED" + ( m_workevent->Activator ? ( " by " + m_workevent->Activator->asName ) : "" ) + ": " + m_workevent->asName ); - switch (m_workevent->Type) { - case tp_CopyValues: { - // skopiowanie wartości z innej komórki - auto const *datasource = static_cast( std::get( m_workevent->m_update.data_source ) ); - m_workevent->m_update.data_text = datasource->Text(); - m_workevent->m_update.data_value_1 = datasource->Value1(); - m_workevent->m_update.data_value_2 = datasource->Value2(); - } - case tp_AddValues: // różni się jedną flagą od UpdateValues - case tp_UpdateValues: { - if( false == EventConditon( m_workevent ) ) { break; } - WriteLog( "Type: " + std::string( m_workevent->Type == tp_AddValues ? "AddValues & Track command" : "UpdateValues" ) + " - [" - + m_workevent->m_update.data_text + "] [" - + to_string( m_workevent->m_update.data_value_1, 2 ) + "] [" - + to_string( m_workevent->m_update.data_value_2, 2 ) + "]" ); - // TODO: dump status of target cells after the operation - for( auto &target : m_workevent->m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { continue; } - targetcell->UpdateValues( - m_workevent->m_update.data_text, - m_workevent->m_update.data_value_1, - m_workevent->m_update.data_value_2, - m_workevent->m_update.flags ); - if( targetcell->Track == nullptr ) { continue; } - // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze - auto const location { targetcell->location() }; - for( auto dynamic : targetcell->Track->Dynamics ) { - targetcell->PutCommand( - dynamic->Mechanik, - &location ); - } - } - break; - } - case tp_GetValues: { - WriteLog( "Type: GetValues" ); - if( m_workevent->Activator ) { - // TODO: re-enable when messaging module is in place - if( Global.iMultiplayer ) { - // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) - multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); - } - m_workevent->m_update.data_cell()->PutCommand( - m_workevent->Activator->Mechanik, - &(m_workevent->m_update.data_cell()->location()) ); - } - break; - } - case tp_PutValues: { - WriteLog( "Type: PutValues - [" + - m_workevent->m_update.data_text + "] [" + - to_string( m_workevent->m_update.data_value_1, 2 ) + "] [" + - to_string( m_workevent->m_update.data_value_2, 2 ) + "]" ); - if (m_workevent->Activator) { - // zamiana, bo fizyka ma inaczej niż sceneria - // NOTE: y & z swap, negative x - loc.X = -m_workevent->m_update.location.x; - loc.Y = m_workevent->m_update.location.z; - loc.Z = m_workevent->m_update.location.y; - if( m_workevent->Activator->Mechanik ) { - // przekazanie rozkazu do AI - m_workevent->Activator->Mechanik->PutCommand( - m_workevent->m_update.data_text, - m_workevent->m_update.data_value_1, - m_workevent->m_update.data_value_2, - loc); - } - else { - // przekazanie do pojazdu - m_workevent->Activator->MoverParameters->PutCommand( - m_workevent->m_update.data_text, - m_workevent->m_update.data_value_1, - m_workevent->m_update.data_value_2, - loc); - } - } - break; - } - case tp_Lights: { - for( auto &target : m_workevent->m_targets ) { - auto *targetmodel = static_cast( std::get( target ) ); - if( targetmodel == nullptr ) { continue; } - // event effect code - for( i = 0; i < iMaxNumLights; ++i ) { - if( m_workevent->m_lights[ i ] == -2.f ) { - // processed all supplied values, bail out - break; - } - if( m_workevent->m_lights[ i ] >= 0.f ) { - // -1 zostawia bez zmiany - targetmodel->LightSet( - i, - m_workevent->m_lights[ i ] ); - } - } - } - break; - } - case tp_Visible: { - for( auto &target : m_workevent->m_targets ) { - auto *targetnode = std::get( target ); - if( targetnode == nullptr ) { continue; } - // event effect code - targetnode->visible( m_workevent->m_visible ); - } - break; - } - case tp_Sound: { - for( auto &target : m_workevent->m_sounds ) { - auto *targetsound = std::get( target ); - if( targetsound == nullptr ) { continue; } - // event effect code - switch( m_workevent->m_soundmode ) { - // trzy możliwe przypadki: - case 0: { - targetsound->stop(); - break; - } - case 1: { - if( m_workevent->m_soundradiochannel > 0 ) { - simulation::radio_message( - targetsound, - m_workevent->m_soundradiochannel ); - } - else { - targetsound->play( sound_flags::exclusive | sound_flags::event ); - } - break; - } - case -1: { - targetsound->play( sound_flags::exclusive | sound_flags::looping | sound_flags::event ); - break; - } - default: { - break; - } - } - } - break; - } - case tp_Animation: { - WriteLog( "Type: Animation" ); - if( m_workevent->m_animationtype == 4 ) { - // vmd mode targets the entire model - for( auto &target : m_workevent->m_targets ) { - auto *targetmodel = static_cast( std::get( target ) ); - if( targetmodel == nullptr ) { continue; } - // event effect code - targetmodel->AnimationVND( - m_workevent->m_animationfiledata, - m_workevent->m_animationparams[ 0 ], // tu mogą być dodatkowe parametry, np. od-do - m_workevent->m_animationparams[ 1 ], - m_workevent->m_animationparams[ 2 ], - m_workevent->m_animationparams[ 3 ] ); - } - } - else { - // other animation modes target specific submodels - for( auto *targetcontainer : m_workevent->m_animationcontainers ) { - switch( m_workevent->m_animationtype ) { - case 1: { // rotate - targetcontainer->SetRotateAnim( - glm::make_vec3( m_workevent->m_animationparams.data() ), - m_workevent->m_animationparams[ 3 ] ); - break; - } - case 2: { // translate - targetcontainer->SetTranslateAnim( - glm::make_vec3( m_workevent->m_animationparams.data() ), - m_workevent->m_animationparams[ 3 ] ); - break; - } - // TODO: implement digital mode - default: { - break; - } - } - } - } - break; - } - case tp_Switch: { - for( auto &target : m_workevent->m_targets ) { - auto *targettrack = static_cast( std::get( target ) ); - if( targettrack == nullptr ) { continue; } - // event effect code - targettrack->Switch( - m_workevent->m_switchstate, - m_workevent->m_switchmoverate, - m_workevent->m_switchmovedelay ); - } - if( Global.iMultiplayer ) { - // dajemy znać do serwera o przełożeniu - multiplayer::WyslijEvent( m_workevent->asName, "" ); // wysłanie nazwy eventu przełączajacego - } - // Ra: bardziej by się przydała nazwa toru, ale nie ma do niej stąd dostępu - break; - } - case tp_TrackVel: { - WriteLog( "Type: TrackVel - [" + to_string( m_workevent->m_velocity, 2 ) + "]" ); - for( auto &target : m_workevent->m_targets ) { - auto *targettrack = static_cast( std::get( target ) ); - if( targettrack == nullptr ) { continue; } - // event effect code - targettrack->VelocitySet( m_workevent->m_velocity ); - if( DebugModeFlag ) { - WriteLog( "actual track velocity for " + targettrack->name() + " [" + to_string( targettrack->VelocityGet(), 2 ) + "]" ); - } - } - break; - } - case tp_Multiple: { - auto const condition { EventConditon( m_workevent ) }; - if( ( true == condition ) - || ( true == m_workevent->m_condition.has_else ) ) { - // warunek spelniony albo było użyte else - WriteLog("Type: Multi-event"); - for( auto &childevent : m_workevent->m_children ) { - auto *childeventdata { std::get( childevent ) }; - if( childeventdata == nullptr ) { continue; } - if( std::get( childevent ) != condition ) { continue; } - - if( childeventdata != m_workevent ) { - // normalnie dodać - AddToQuery( childeventdata, m_workevent->Activator ); - } - else { - // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania - if( m_workevent->fDelay >= 5.0 ) { - AddToQuery( m_workevent, m_workevent->Activator ); - } - } - } - if( Global.iMultiplayer ) { - // dajemy znać do serwera o wykonaniu - if( false == m_workevent->m_condition.has_else ) { - // jednoznaczne tylko, gdy nie było else - if( m_workevent->Activator ) { - multiplayer::WyslijEvent( m_workevent->asName, m_workevent->Activator->name() ); - } - else { - multiplayer::WyslijEvent( m_workevent->asName, "" ); - } - } - } - } - break; - } - case tp_WhoIs: { - for( auto &target : m_workevent->m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { continue; } - // event effect code - if( m_workevent->m_update.flags & update_load ) { - // jeśli pytanie o ładunek - if( m_workevent->m_update.flags & update_memadd ) { - // jeśli typ pojazdu - // TODO: define and recognize individual request types - auto const owner = ( - ( ( m_workevent->Activator->Mechanik != nullptr ) && ( m_workevent->Activator->Mechanik->Primary() ) ) ? - m_workevent->Activator->Mechanik : - m_workevent->Activator->ctOwner ); - auto const consistbrakelevel = ( - owner != nullptr ? - owner->fReady : - -1.0 ); - auto const collisiondistance = ( - owner != nullptr ? - owner->TrackBlock() : - -1.0 ); - - targetcell->UpdateValues( - m_workevent->Activator->MoverParameters->TypeName, // typ pojazdu - consistbrakelevel, - collisiondistance, - m_workevent->m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); - - WriteLog( - "Type: WhoIs (" + to_string( m_workevent->m_update.flags ) + ") - " - + "[name: " + m_workevent->Activator->MoverParameters->TypeName + "], " - + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " - + "[obstacle distance: " + to_string( collisiondistance, 2 ) + " m]" ); - } - else { - // jeśli parametry ładunku - targetcell->UpdateValues( - m_workevent->Activator->MoverParameters->LoadType, // nazwa ładunku - m_workevent->Activator->MoverParameters->Load, // aktualna ilość - m_workevent->Activator->MoverParameters->MaxLoad, // maksymalna ilość - m_workevent->m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); - - WriteLog( - "Type: WhoIs (" + to_string( m_workevent->m_update.flags ) + ") - " - + "[load type: " + m_workevent->Activator->MoverParameters->LoadType + "], " - + "[current load: " + to_string( m_workevent->Activator->MoverParameters->Load, 2 ) + "], " - + "[max load: " + to_string( m_workevent->Activator->MoverParameters->MaxLoad, 2 ) + "]" ); - } - } - else if( m_workevent->m_update.flags & update_memadd ) { // jeśli miejsce docelowe pojazdu - targetcell->UpdateValues( - m_workevent->Activator->asDestination, // adres docelowy - m_workevent->Activator->DirectionGet(), // kierunek pojazdu względem czoła składu (1=zgodny,-1=przeciwny) - m_workevent->Activator->MoverParameters->Power, // moc pojazdu silnikowego: 0 dla wagonu - m_workevent->m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); - - WriteLog( - "Type: WhoIs (" + to_string( m_workevent->m_update.flags ) + ") - " - + "[destination: " + m_workevent->Activator->asDestination + "], " - + "[direction: " + to_string( m_workevent->Activator->DirectionGet() ) + "], " - + "[engine power: " + to_string( m_workevent->Activator->MoverParameters->Power, 2 ) + "]" ); - } - else if( m_workevent->Activator->Mechanik ) { - if( m_workevent->Activator->Mechanik->Primary() ) { // tylko jeśli ktoś tam siedzi - nie powinno dotyczyć pasażera! - targetcell->UpdateValues( - m_workevent->Activator->Mechanik->TrainName(), - m_workevent->Activator->Mechanik->StationCount() - m_workevent->Activator->Mechanik->StationIndex(), // ile przystanków do końca - m_workevent->Activator->Mechanik->IsStop() ? - 1 : - 0, // 1, gdy ma tu zatrzymanie - m_workevent->m_update.flags ); - WriteLog( "Train detected: " + m_workevent->Activator->Mechanik->TrainName() ); - } - } - } - break; - } - case tp_LogValues: { // zapisanie zawartości komórki pamięci do logu - if( m_workevent->m_targets.empty() ) { - // lista wszystkich - simulation::Memory.log_all(); - } - else { - // jeśli była podana nazwa komórki - for( auto &target : m_workevent->m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { continue; } - WriteLog( "Memcell \"" + targetcell->name() + "\": [" - + targetcell->Text() + "] [" - + to_string( targetcell->Value1(), 2 ) + "] [" - + to_string( targetcell->Value2(), 2 ) + "]" ); - } - } - break; - } - case tp_Voltage: { // zmiana napięcia w zasilaczu (TractionPowerSource) - WriteLog( "Type: Voltage [" + to_string( m_workevent->m_voltage, 2 ) + "]" ); - for( auto &target : m_workevent->m_targets ) { - auto *targetpowersource = static_cast( std::get( target ) ); - if( targetpowersource == nullptr ) { continue; } - targetpowersource->VoltageSet( m_workevent->m_voltage ); - } - break; - } - case tp_Friction: { // zmiana tarcia na scenerii - // na razie takie chamskie ustawienie napięcia zasilania - WriteLog("Type: Friction"); - Global.fFriction = (m_workevent->m_friction); - break; - } - case tp_Message: { // wyświetlenie komunikatu - break; - } - } // switch (tmpEvent->Type) + m_workevent->run(); } // if (tmpEvent->bEnabled) } // while return true; @@ -3272,190 +1687,9 @@ event_manager::CheckQuery() { // legacy method, initializes events after deserialization from scenario file void event_manager::InitEvents() { - //łączenie eventów z pozostałymi obiektami for( auto *event : m_events ) { - - switch( event->Type ) { - - case tp_AddValues: // sumowanie wartości - case tp_UpdateValues: { // zmiana wartości - // target memory cell(s), previously held in param 5, copy held in param 9 for memcompare - event->init_targets( simulation::Memory, "memory cell" ); - // conditional data - event->init_conditions(); - break; - } - case tp_LogValues: { - // skojarzenie z memcell - event->init_targets( simulation::Memory, "memory cell" ); - break; - } - case tp_GetValues: { - event->init_targets( simulation::Memory, "memory cell" ); - // custom target initialization code - for( auto &target : event->m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { continue; } - if( targetcell->IsVelocity() ) { - // jeśli odczyt komórki a komórka zawiera komendę SetVelocity albo ShuntVelocity - // to event nie będzie dodawany do kolejki - event->bEnabled = false; - } - } - // NOTE: GetValues retrieves data only from first specified memory cell - // TBD, TODO: allow retrieval from more than one cell? - event->m_update.data_source = event->m_targets.front(); - break; - } - case tp_WhoIs: { - event->init_targets( simulation::Memory, "memory cell" ); - break; - } - case tp_CopyValues: { - // skopiowanie komórki do innej - event->init_targets( simulation::Memory, "memory cell" ); - // source cell - std::get( event->m_update.data_source ) = simulation::Memory.find( std::get( event->m_update.data_source ) ); - if( std::get( event->m_update.data_source ) == nullptr ) { - event->m_ignored = true; // deaktywacja - ErrorLog( "Bad event: copyvalues event \"" + event->asName + "\" cannot find memcell \"" + std::get( event->m_update.data_source ) + "\"" ); - } - break; - } - case tp_Animation: { - // animacja modelu - event->init_targets( simulation::Instances, "model instance" ); - // custom target initialization code - if( event->m_animationtype == 4 ) { - // vmd animations target whole model - break; - } - // locate and set up animated submodels - event->m_animationcontainers.clear(); - for( auto &target : event->m_targets ) { - auto *targetmodel { static_cast( std::get( target ) ) }; - if( targetmodel == nullptr ) { continue; } - auto *targetcontainer { targetmodel->GetContainer( event->m_animationsubmodel ) }; - if( targetcontainer == nullptr ) { - event->m_ignored = true; - ErrorLog( "Bad event: animation event \"" + event->asName + "\" cannot find submodel " + event->m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" ); - break; - } - targetcontainer->WillBeAnimated(); // oflagowanie animacji - if( targetcontainer->Event() == nullptr ) { - // nie szukać, gdy znaleziony - targetcontainer->EventAssign( FindEvent( targetmodel->name() + '.' + event->m_animationsubmodel + ":done" ) ); - } - event->m_animationcontainers.emplace_back( targetcontainer ); - } - break; - } - case tp_Lights: { - // zmiana świeteł modelu - event->init_targets( simulation::Instances, "model instance" ); - break; - } - case tp_Visible: { - // ukrycie albo przywrócenie obiektu - for( auto &target : event->m_targets ) { - auto &targetnode { std::get( target ) }; - auto &targetname { std::get( target ) }; - // najpierw model - targetnode = simulation::Instances.find( targetname ); - if( targetnode == nullptr ) { - // albo tory? - targetnode = simulation::Paths.find( targetname ); - } - if( targetnode == nullptr ) { - // może druty? - targetnode = simulation::Traction.find( targetname ); - } - if( targetnode == nullptr ) { - event->m_ignored = true; // deaktywacja - ErrorLog( "Bad event: event \"" + event->asName + "\" [" + event->type_to_string() + "] cannot find item \"" + std::get( target ) + "\"" ); - } - } - break; - } - case tp_Switch: { - // przełożenie zwrotnicy albo zmiana stanu obrotnicy - event->init_targets( simulation::Paths, "track" ); - // custom target initialization code - for( auto &target : event->m_targets ) { - auto *targettrack = static_cast( std::get( target ) ); - if( targettrack == nullptr ) { continue; } - // dowiązanie toru - if( targettrack->iAction == 0 ) { - // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia - targettrack->iAction |= 0x100; - } - if( ( event->m_switchstate == 0 ) - && ( event->m_switchmovedelay >= 0.0 ) ) { - // jeśli przełącza do stanu 0 & jeśli jest zdefiniowany dodatkowy ruch iglic - // przesłanie parametrów - targettrack->Switch( - event->m_switchstate, - event->m_switchmoverate, - event->m_switchmovedelay ); - } - } - break; - } - case tp_Sound: { - // odtworzenie dźwięku - for( auto &target : event->m_sounds ) { - std::get( target ) = simulation::Sounds.find( std::get( target ) ); - if( std::get( target ) == nullptr ) { - event->m_ignored = true; // deaktywacja - ErrorLog( "Bad event: event \"" + event->asName + "\" [" + event->type_to_string() + "] cannot find static sound \"" + std::get( target ) + "\"" ); - } - } - break; - } - case tp_TrackVel: { - // ustawienie prędkości na torze - event->init_targets( simulation::Paths, "track" ); - // custom target initialization code - for( auto &target : event->m_targets ) { - auto *targettrack = static_cast( std::get( target ) ); - if( targettrack == nullptr ) { continue; } - // flaga zmiany prędkości toru jest istotna dla skanowania - targettrack->iAction |= 0x200; - } - break; - } - case tp_Multiple: { - // conditional data - event->init_targets( simulation::Memory, "memory cell", false ); - if( event->m_ignored ) { - event->m_condition.flags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); - event->m_ignored = false; - } - event->init_conditions(); - // child events bindings - for( auto &childevent : event->m_children ) { - std::get( childevent ) = FindEvent( std::get( childevent ) ); - if( std::get( childevent ) == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + event->asName + "\" cannot find event \"" + std::get( childevent ) + "\"" ); - } - } - break; - } - case tp_Voltage: { - // zmiana napięcia w zasilaczu (TractionPowerSource) - event->init_targets( simulation::Powergrid, "power source" ); - break; - } - case tp_Message: { - // wyświetlenie komunikatu - break; - } - default: { - break; - } - } // switch - + event->init(); if( event->fDelay < 0 ) { AddToQuery( event, nullptr ); } } } @@ -3512,84 +1746,3 @@ event_manager::export_as_text( std::ostream &Output ) const { } } } - -// legacy method, verifies condition for specified event -bool -event_manager::EventConditon( TEvent *Event ) { - - if( Event->m_condition.flags == 0 ) { - return true; // bezwarunkowo - } - // if there's conditions, check them - if( Event->m_condition.flags & conditional_propability ) { - auto const rprobability { static_cast( Random() ) }; - WriteLog( "Test: Random integer - [" + std::to_string( rprobability ) + "] / [" + std::to_string( Event->m_condition.probability ) + "]" ); - if( rprobability > Event->m_condition.probability ) { - return false; - } - } - if( Event->m_condition.flags & conditional_trackoccupied ) { - for( auto *track : Event->m_condition.tracks ) { - if( true == track->IsEmpty() ) { - return false; - } - } - } - if( Event->m_condition.flags & conditional_trackfree ) { - for( auto *track : Event->m_condition.tracks ) { - if( false == track->IsEmpty() ) { - return false; - } - } - } - if( Event->m_condition.flags & conditional_memcompare ) { - // porównanie wartości - for( auto &target : m_workevent->m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { - ErrorLog( "Event " + Event->asName + " trying conditional_memcompare with nonexistent memcell" ); - continue; // though this is technically error, we treat it as a success to maintain backward compatibility - } - auto const comparisonresult = - targetcell->Compare( - Event->m_condition.match_text, - Event->m_condition.match_value_1, - Event->m_condition.match_value_2, - Event->m_condition.flags ); - - std::string comparisonlog = "Test: MemCompare - "; - - comparisonlog += - "[" + targetcell->Text() + "]" - + " [" + to_string( targetcell->Value1(), 2 ) + "]" - + " [" + to_string( targetcell->Value2(), 2 ) + "]"; - - comparisonlog += ( - true == comparisonresult ? - " == " : - " != " ); - - comparisonlog += ( - TestFlag( Event->m_condition.flags, conditional_memstring ) ? - "[" + std::string( m_workevent->m_condition.match_text ) + "]" : - "[*]" ); - comparisonlog += ( - TestFlag( m_workevent->m_condition.flags, conditional_memval1 ) ? - " [" + to_string( m_workevent->m_condition.match_value_1, 2 ) + "]" : - " [*]" ); - comparisonlog += ( - TestFlag( m_workevent->m_condition.flags, conditional_memval2 ) ? - " [" + to_string( m_workevent->m_condition.match_value_2, 2 ) + "]" : - " [*]" ); - - WriteLog( comparisonlog ); - - if( false == comparisonresult ) { - return false; - } - } - } - // if we made it here it means we passed all checks - return true; -} -#endif diff --git a/Event.h b/Event.h index c54642d1..94da96c0 100644 --- a/Event.h +++ b/Event.h @@ -14,200 +14,6 @@ http://mozilla.org/MPL/2.0/. #include "names.h" #include "evlaunch.h" -//#define EU07_USE_LEGACY_EVENTS - -#ifdef EU07_USE_LEGACY_EVENTS -enum TEventType { - tp_Unknown, - tp_Sound, - tp_Exit, - tp_Disable, - tp_Velocity, - tp_Animation, - tp_Lights, - tp_UpdateValues, - tp_GetValues, - tp_PutValues, - tp_Switch, - tp_DynVel, - tp_TrackVel, - tp_Multiple, - tp_AddValues, - tp_CopyValues, - tp_WhoIs, - tp_LogValues, - tp_Visible, - tp_Voltage, - tp_Message, - tp_Friction -}; - -const int update_memstring = 0x0000001; // zmodyfikować tekst (UpdateValues) -const int update_memval1 = 0x0000002; // zmodyfikować pierwszą wartosć -const int update_memval2 = 0x0000004; // zmodyfikować drugą wartosć -const int update_memadd = 0x0000008; // dodać do poprzedniej zawartości -const int update_load = 0x0000010; // odczytać ładunek -const int update_only = 0x00000FF; // wartość graniczna -const int conditional_memstring = 0x0000100; // porównanie tekstu -const int conditional_memval1 = 0x0000200; // porównanie pierwszej wartości liczbowej -const int conditional_memval2 = 0x0000400; // porównanie drugiej wartości -const int conditional_trackoccupied = 0x1000000; // jeśli tor zajęty -const int conditional_trackfree = 0x2000000; // jeśli tor wolny -const int conditional_propability = 0x4000000; // zależnie od generatora lizcb losowych -const int conditional_memcompare = 0x8000000; // porównanie zawartości - -union TParam -{ - void *asPointer; - TMemCell *asMemCell; - scene::basic_node *asSceneNode; - glm::dvec3 const *asLocation; - TTrack *asTrack; - TAnimModel *asModel; - TAnimContainer *asAnimContainer; - TTrain *asTrain; - TDynamicObject *asDynamic; - TEvent *asEvent; - double asdouble; - int asInt; - sound_source *tsTextSound; - char *asText; - TCommandType asCommand; - TTractionPowerSource *psPower; -}; - -class TEvent // zmienne: ev* -{ // zdarzenie -public: -// types - // wrapper for binding between editor-supplied name, event, and execution conditional flag - using conditional_event = std::tuple; -// constructors - TEvent(std::string const &m = ""); - ~TEvent(); -// metody - void Load(cParser *parser, Math3D::vector3 const &org); - // sends basic content of the class in legacy (text) format to provided stream - void - export_as_text( std::ostream &Output ) const; - static void AddToQuery( TEvent *Event, TEvent *&Start ); - std::string CommandGet(); - TCommandType Command(); - double ValueGet(int n); - glm::dvec3 PositionGet() const; - bool StopCommand(); - void StopCommandSent(); - void Append(TEvent *e); - void - group( scene::group_handle Group ); - scene::group_handle - group() const; -// members - std::string asName; - bool m_ignored { false }; // replacement for tp_ignored - bool bEnabled = false; // false gdy ma nie być dodawany do kolejki (skanowanie sygnałów) - int iQueued = 0; // ile razy dodany do kolejki - TEvent *evNext = nullptr; // następny w kolejce - TEventType Type = tp_Unknown; - double fStartTime = 0.0; - double fDelay = 0.0; - TDynamicObject const *Activator = nullptr; - TParam Params[13]; // McZapkie-070502 //Ra: zamienić to na union/struct - unsigned int iFlags = 0; // zamiast Params[8] z flagami warunku - std::string asNodeName; // McZapkie-100302 - dodalem zeby zapamietac nazwe toru - TEvent *evJoined = nullptr; // kolejny event z tą samą nazwą - od wersji 378 - double fRandomDelay = 0.0; // zakres dodatkowego opóźnienia // standardowo nie będzie dodatkowego losowego opóźnienia - std::vector m_children; // events which are placed in the query when this event is executed - bool m_conditionalelse { false }; // TODO: make a part of condition struct - -private: -// methods - void Conditions( cParser *parser, std::string s ); -// members - scene::group_handle m_group { null_handle }; // group this event belongs to, if any -}; - -inline -void -TEvent::group( scene::group_handle Group ) { - m_group = Group; -} - -inline -scene::group_handle -TEvent::group() const { - return m_group; -} - -class event_manager { - -public: -// constructors - event_manager() = default; -// destructor - ~event_manager(); -// methods - // adds specified event launcher to the list of global launchers - void - queue( TEventLauncher *Launcher ); - // legacy method, updates event queues - void - update(); - // adds provided event to the collection. returns: true on success - // TBD, TODO: return handle to the event - bool - insert( TEvent *Event ); - bool - insert( TEventLauncher *Launcher ) { - return m_launchers.insert( Launcher ); } - // returns first event in the queue - TEvent * - begin() { - return QueryRootEvent; } - // legacy method, returns pointer to specified event, or null - TEvent * - FindEvent( std::string const &Name ); - // legacy method, inserts specified event in the event query - bool - AddToQuery( TEvent *Event, TDynamicObject const *Owner ); - // legacy method, executes queued events - bool - CheckQuery(); - // legacy method, initializes events after deserialization from scenario file - void - InitEvents(); - // legacy method, initializes event launchers after deserialization from scenario file - void - InitLaunchers(); - // sends basic content of the class in legacy (text) format to provided stream - void - export_as_text( std::ostream &Output ) const; - -private: -// types - using event_sequence = std::deque; - using event_map = std::unordered_map; - using eventlauncher_sequence = std::vector; - -// methods - // legacy method, verifies condition for specified event - bool - EventConditon( TEvent *Event ); - -// members - event_sequence m_events; -/* - // NOTE: disabled until event class refactoring - event_sequence m_eventqueue; -*/ - // legacy version of the above - TEvent *QueryRootEvent { nullptr }; - TEvent *m_workevent { nullptr }; - event_map m_eventmap; - basic_table m_launchers; - eventlauncher_sequence m_launcherqueue; -}; -#else enum TEventType { tp_Unknown, tp_Sound, @@ -240,30 +46,26 @@ const int conditional_memval2 = 0x0000400; // porównanie drugiej wartości const int conditional_trackoccupied = 0x1000000; // jeśli tor zajęty const int conditional_trackfree = 0x2000000; // jeśli tor wolny const int conditional_propability = 0x4000000; // zależnie od generatora lizcb losowych -const int conditional_memcompare = 0x8000000; // porównanie zawartości // zdarzenie class TEvent { - friend event_manager; - public: -// types - // wrapper for binding between editor-supplied name, event, and execution conditional flag - using conditional_event = std::tuple; - using basic_node = std::tuple; - using basic_sound = std::tuple; // constructors - TEvent(); + TEvent() = default; +// destructor ~TEvent(); // metody void Load(cParser *parser, Math3D::vector3 const &org); - // sends basic content of the class in legacy (text) format to provided stream - template + // prepares event for use void - init_targets( TableType_ &Repository, std::string const &Targettype, bool const Logerrors = true ); + init(); + // legacy method, verifies event condition + bool + test_condition() const; + // executes event void - init_conditions(); + run(); void export_as_text( std::ostream &Output ) const; static void AddToQuery( TEvent *Event, TEvent *&Start ); @@ -290,29 +92,14 @@ public: double fDelay = 0.0; double fRandomDelay = 0.0; // zakres dodatkowego opóźnienia // standardowo nie będzie dodatkowego losowego opóźnienia TEvent *evJoined = nullptr; // kolejny event z tą samą nazwą - od wersji 378 - std::vector m_targets; // targets of operation performed when this event is executed - std::vector m_children; // events which are placed in the query when this event is executed - std::vector m_lights; // for tp_lights - bool m_visible { true }; // for tp_visible - double m_velocity { 0.0 }; // for tp_trackvel - std::vector m_sounds; // for tp_sound - int m_soundmode{ 0 }; - int m_soundradiochannel{ 0 }; - int m_animationtype{ 0 }; // for tp_animation - std::array m_animationparams{ 0.0 }; - std::string m_animationsubmodel; - std::vector m_animationcontainers; - std::string m_animationfilename; - std::size_t m_animationfilesize{ 0 }; - char *m_animationfiledata{ nullptr }; - int m_switchstate{ 0 }; // for tp_switch - float m_switchmoverate{ -1.f }; - float m_switchmovedelay{ -1.f }; - float m_friction { -1.f }; // for tp_friction - float m_voltage{ -1.f }; // for tp_voltage private: // types + // wrapper for binding between editor-supplied name, event, and execution conditional flag + using conditional_event = std::tuple; + using basic_node = std::tuple; + using basic_sound = std::tuple; + struct update_data { unsigned int flags { 0 }; std::string data_text; @@ -337,12 +124,41 @@ private: void load( cParser &Input ); }; // methods - void load_targets( std::string const &Input ); - std::string type_to_string() const; + void + load_targets( std::string const &Input ); + // sends basic content of the class in legacy (text) format to provided stream + template + void + init_targets( TableType_ &Repository, std::string const &Targettype, bool const Logerrors = true ); + void + init_conditions(); + std::string + type_to_string() const; // members scene::group_handle m_group { null_handle }; // group this event belongs to, if any update_data m_update; condition_data m_condition; + std::vector m_targets; // targets of operation performed when this event is executed + std::vector m_children; // events which are placed in the query when this event is executed + // specialized fields + std::vector m_lights; // for tp_lights + bool m_visible { true }; // for tp_visible + double m_velocity { 0.0 }; // for tp_trackvel + std::vector m_sounds; // for tp_sound + int m_soundmode{ 0 }; + int m_soundradiochannel{ 0 }; + int m_animationtype{ 0 }; // for tp_animation + std::array m_animationparams{ 0.0 }; + std::string m_animationsubmodel; + std::vector m_animationcontainers; + std::string m_animationfilename; + std::size_t m_animationfilesize{ 0 }; + char *m_animationfiledata{ nullptr }; + int m_switchstate{ 0 }; // for tp_switch + float m_switchmoverate{ -1.f }; + float m_switchmovedelay{ -1.f }; + float m_friction { -1.f }; // for tp_friction + float m_voltage{ -1.f }; // for tp_voltage }; inline @@ -422,12 +238,6 @@ private: using event_sequence = std::deque; using event_map = std::unordered_map; using eventlauncher_sequence = std::vector; - -// methods - // legacy method, verifies condition for specified event - bool - EventConditon( TEvent *Event ); - // members event_sequence m_events; /* @@ -441,5 +251,5 @@ private: basic_table m_launchers; eventlauncher_sequence m_launcherqueue; }; -#endif + //--------------------------------------------------------------------------- diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 3866c478..32bf7ac9 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -294,16 +294,16 @@ enum TProblem // lista problemów taboru, które uniemożliwiają jazdę /*lokacja*/ struct TLocation { - double X = 0.0; - double Y = 0.0; - double Z = 0.0; + double X; + double Y; + double Z; }; /*rotacja*/ struct TRotation { - double Rx = 0.0; - double Ry = 0.0; - double Rz = 0.0; + double Rx; + double Ry; + double Rz; }; /*wymiary*/ struct TDimension @@ -965,8 +965,8 @@ public: double SpeedCtrlDelay = 2; /*opoznienie dzialania tempomatu z wybieralna predkoscia*/ /*--sekcja zmiennych*/ /*--opis konkretnego egzemplarza taboru*/ - TLocation Loc; //pozycja pojazdów do wyznaczenia odległości pomiędzy sprzęgami - TRotation Rot; + TLocation Loc { 0.0, 0.0, 0.0 }; //pozycja pojazdów do wyznaczenia odległości pomiędzy sprzęgami + TRotation Rot { 0.0, 0.0, 0.0 }; std::string Name; /*nazwa wlasna*/ TCoupling Couplers[2]; //urzadzenia zderzno-sprzegowe, polaczenia miedzy wagonami #ifdef EU07_USE_OLD_HVCOUPLERS diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index f413f14a..b226c6f8 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1255,6 +1255,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap OffsetTrackH = Sign(RunningShape.R) * 0.2; } + // TODO: investigate, seems supplied NewRot is always 0 although the code here suggests some actual values are expected Loc = NewLoc; Rot = NewRot; NewRot.Rx = 0; From 40afc461fa6612cde21eb61d92cb08fa469402b4 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 18 Sep 2018 03:57:32 +0200 Subject: [PATCH 402/426] maintenance: event code refactoring --- AnimModel.cpp | 2 +- AnimModel.h | 8 +- Classes.h | 2 +- Driver.cpp | 95 +- Driver.h | 18 +- EvLaunch.cpp | 10 +- EvLaunch.h | 4 +- Event.cpp | 3170 +++++++++++++++++++-------------- Event.h | 665 +++++-- McZapkie/MOVER.h | 16 +- McZapkie/Mover.cpp | 2 +- MemCell.cpp | 24 +- MemCell.h | 4 +- Track.cpp | 12 +- Track.h | 14 +- Train.cpp | 2 +- drivermode.h | 2 +- driveruipanels.cpp | 14 +- editoruipanels.cpp | 2 +- messaging.cpp | 6 +- scenenodegroups.cpp | 2 +- scenenodegroups.h | 4 +- simulationstateserializer.cpp | 17 +- 23 files changed, 2451 insertions(+), 1644 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index b4b40cf0..b77987ce 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -403,7 +403,7 @@ bool TAnimContainer::InMovement() return (fRotateSpeed != 0.0) || (fTranslateSpeed != 0.0); } -void TAnimContainer::EventAssign(TEvent *ev) +void TAnimContainer::EventAssign(basic_event *ev) { // przypisanie eventu wykonywanego po zakończeniu animacji evDone = ev; }; diff --git a/AnimModel.h b/AnimModel.h index f3ddf10e..6384f164 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -43,7 +43,7 @@ class TAnimVocaloidFrame char cBezier[64]; // krzywe Béziera do interpolacji dla x,y,z i obrotu }; -class TEvent; +class basic_event; class TAnimContainer { // opakowanie submodelu, określające animację egzemplarza - obsługiwane jako lista @@ -73,7 +73,7 @@ class TAnimContainer { // mogą być animacje klatkowe różnego typu, wskaźniki używa AnimModel TAnimVocaloidFrame *pMovementData; // wskaźnik do klatki }; - TEvent *evDone; // ewent wykonywany po zakończeniu animacji, np. zapór, obrotnicy + basic_event *evDone; // ewent wykonywany po zakończeniu animacji, np. zapór, obrotnicy public: TAnimContainer *pNext; TAnimContainer *acAnimNext; // lista animacji z eventem, które muszą być przeliczane również bez @@ -101,9 +101,9 @@ class TAnimContainer void WillBeAnimated() { if (pSubModel) pSubModel->WillBeAnimated(); }; - void EventAssign(TEvent *ev); + void EventAssign(basic_event *ev); inline - TEvent * Event() { + basic_event * Event() { return evDone; }; }; diff --git a/Classes.h b/Classes.h index 62faa4eb..ba1bb3ac 100644 --- a/Classes.h +++ b/Classes.h @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. //--------------------------------------------------------------------------- class opengl_renderer; class TTrack; // odcinek trajektorii -class TEvent; +class basic_event; class TTrain; // pojazd sterowany class TDynamicObject; // pojazd w scenerii struct material_data; diff --git a/Driver.cpp b/Driver.cpp index 36dd52e0..9462ce99 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -39,22 +39,22 @@ http://mozilla.org/MPL/2.0/. // finds point of specified track nearest to specified event. returns: distance to that point from the specified end of the track // TODO: move this to file with all generic routines, too easy to forget it's here and it may come useful double -ProjectEventOnTrack( TEvent const *Event, TTrack const *Track, double const Direction ) { +ProjectEventOnTrack( basic_event const *Event, TTrack const *Track, double const Direction ) { auto const segment = Track->CurrentSegment(); - auto const nearestpoint = segment->find_nearest_point( Event->PositionGet() ); + auto const nearestpoint = segment->find_nearest_point( Event->input_location() ); return ( Direction > 0 ? nearestpoint * segment->GetLength() : // measure from point1 ( 1.0 - nearestpoint ) * segment->GetLength() ); // measure from point2 }; -double GetDistanceToEvent(TTrack const *track, TEvent const *event, double scan_dir, double start_dist, int iter = 0, bool back = false) +double GetDistanceToEvent(TTrack const *track, basic_event const *event, double scan_dir, double start_dist, int iter = 0, bool back = false) { if( track == nullptr ) { return start_dist; } auto const segment = track->CurrentSegment(); - auto const pos_event = event->PositionGet(); + auto const pos_event = event->input_location(); double len1, len2; double sd = scan_dir; double seg_len = scan_dir > 0 ? 0.0 : 1.0; @@ -181,7 +181,7 @@ TSpeedPos::TSpeedPos(TTrack *track, double dist, int flag) Set(track, dist, flag); }; -TSpeedPos::TSpeedPos(TEvent *event, double dist, TOrders order) +TSpeedPos::TSpeedPos(basic_event *event, double dist, TOrders order) { Set(event, dist, order); }; @@ -198,9 +198,9 @@ void TSpeedPos::Clear() void TSpeedPos::CommandCheck() { // sprawdzenie typu komendy w evencie i określenie prędkości - TCommandType command = evEvent->Command(); - double value1 = evEvent->ValueGet(1); - double value2 = evEvent->ValueGet(2); + TCommandType command = evEvent->input_command(); + double value1 = evEvent->input_value(1); + double value2 = evEvent->input_value(2); switch (command) { case TCommandType::cm_ShuntVelocity: @@ -326,7 +326,7 @@ std::string TSpeedPos::GetName() const if (iFlags & spTrack) // jeśli tor return trTrack->name(); else if( iFlags & spEvent ) // jeśli event - return evEvent->asName; + return evEvent->m_name; else return ""; } @@ -358,12 +358,12 @@ bool TSpeedPos::IsProperSemaphor(TOrders order) return false; // true gdy zatrzymanie, wtedy nie ma po co skanować dalej } -bool TSpeedPos::Set(TEvent *event, double dist, TOrders order) +bool TSpeedPos::Set(basic_event *event, double dist, TOrders order) { // zapamiętanie zdarzenia fDist = dist; iFlags = spEnabled | spEvent; // event+istotny evEvent = event; - vPos = event->PositionGet(); // współrzędne eventu albo komórki pamięci (zrzutować na tor?) + vPos = event->input_location(); // współrzędne eventu albo komórki pamięci (zrzutować na tor?) CommandCheck(); // sprawdzenie typu komendy w evencie i określenie prędkości // zależnie od trybu sprawdzenie czy jest tutaj gdzieś semafor lub tarcza manewrowa // jeśli wskazuje stop wtedy wystawiamy true jako koniec sprawdzania @@ -421,13 +421,13 @@ void TController::TableClear() eSignSkip = nullptr; // nic nie pomijamy }; -std::vector TController::CheckTrackEvent( TTrack *Track, double const fDirection ) const +std::vector TController::CheckTrackEvent( TTrack *Track, double const fDirection ) const { // sprawdzanie eventów na podanym torze do podstawowego skanowania - std::vector events; + std::vector events; auto const &eventsequence { ( fDirection > 0 ? Track->m_events2 : Track->m_events1 ) }; for( auto const &event : eventsequence ) { if( ( event.second != nullptr ) - && ( false == event.second->bEnabled ) ) { + && ( event.second->m_passive ) ) { events.emplace_back( event.second ); } } @@ -441,7 +441,7 @@ bool TController::TableAddNew() return true; // false gdy się nałoży }; -bool TController::TableNotFound(TEvent const *Event) const +bool TController::TableNotFound(basic_event const *Event) const { // sprawdzenie, czy nie został już dodany do tabelki (np. podwójne W4 robi problemy) auto lookup = std::find_if( @@ -453,7 +453,7 @@ bool TController::TableNotFound(TEvent const *Event) const if( ( Global.iWriteLogEnabled & 8 ) && ( lookup != sSpeedTable.end() ) ) { - WriteLog( "Speed table for " + OwnerName() + " already contains event " + lookup->evEvent->asName ); + WriteLog( "Speed table for " + OwnerName() + " already contains event " + lookup->evEvent->m_name ); } return lookup == sSpeedTable.end(); @@ -558,7 +558,7 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) TableAddNew(); // zawsze jest true if (Global.iWriteLogEnabled & 8) { - WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->asName); + WriteLog("Speed table for " + OwnerName() + " found new event, " + pEvent->m_name); } auto &newspeedpoint = sSpeedTable[iLast]; /* @@ -788,7 +788,7 @@ void TController::TableCheck(double fDistance) else if (sSpeedTable[i].iFlags & spEvent) // jeśli event { if (sSpeedTable[i].fDist < ( - sSpeedTable[i].evEvent->Type == tp_PutValues ? + typeid( *(sSpeedTable[i].evEvent) ) == typeid( putvalues_event ) ? -fLength : 0)) // jeśli jest z tyłu if ((mvOccupied->CategoryFlag & 1) ? false : @@ -840,13 +840,13 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // stop points are irrelevant when not in one of the basic modes if( ( OrderCurrentGet() & ( Obey_train | Shunt ) ) == 0 ) { continue; } // first 19 chars of the command is expected to be "PassengerStopPoint:" so we skip them - if ( ToLower(sSpeedTable[i].evEvent->CommandGet()).compare( 19, sizeof(asNextStop), ToLower(asNextStop)) != 0 ) + if ( ToLower(sSpeedTable[i].evEvent->input_text()).compare( 19, sizeof(asNextStop), ToLower(asNextStop)) != 0 ) { // jeśli nazwa nie jest zgodna if (sSpeedTable[i].fDist < 300.0 && sSpeedTable[i].fDist > 0) // tylko jeśli W4 jest blisko, przy dwóch może zaczać szaleć { // porównuje do następnej stacji, więc trzeba przewinąć do poprzedniej // nastepnie ustawić następną na aktualną tak żeby prawidłowo ją obsłużył w następnym kroku - if( true == TrainParams->RewindTimeTable( sSpeedTable[ i ].evEvent->CommandGet() ) ) { + if( true == TrainParams->RewindTimeTable( sSpeedTable[ i ].evEvent->input_text() ) ) { asNextStop = TrainParams->NextStop(); iStationStart = TrainParams->StationIndex; } @@ -895,8 +895,8 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN Drugi paramer dodatni - długość peronu (W4). */ auto L = 0.0; - auto Par1 = sSpeedTable[i].evEvent->ValueGet(1); - auto Par2 = sSpeedTable[i].evEvent->ValueGet(2); + auto Par1 = sSpeedTable[i].evEvent->input_value(1); + auto Par2 = sSpeedTable[i].evEvent->input_value(2); if ((Par2 >= 0) || (fLength < -Par2)) { //użyj tego W4 if (Par1 < 0) { L = -Par1; @@ -922,7 +922,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN && ( ( iDrivigFlags & moveStopCloser ) != 0 ? sSpeedTable[ i ].fDist + fLength <= std::max( - std::abs( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ), + std::abs( sSpeedTable[ i ].evEvent->input_value( 2 ) ), 2.0 * fMaxProximityDist + fLength ) : // fmaxproximitydist typically equals ~50 m sSpeedTable[ i ].fDist < d_to_next_sem ) ); @@ -943,7 +943,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if( ( iDrivigFlags & moveDoorOpened ) == 0 ) { // drzwi otwierać jednorazowo iDrivigFlags |= moveDoorOpened; // nie wykonywać drugi raz - Doors( true, static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) ) % 10 ); + Doors( true, static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->input_value( 2 ) ) ) ) % 10 ); } if (TrainParams->UpdateMTable( simulation::Time, asNextStop) ) { @@ -955,7 +955,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } // perform loading/unloading - auto const platformside = static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->ValueGet( 2 ) ) ) ) % 10; + auto const platformside = static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->input_value( 2 ) ) ) ) % 10; auto const exchangetime = simulation::Station.update_load( pVehicles[ 0 ], *TrainParams, platformside ); WaitingSet( std::max( -fStopTime, exchangetime ) ); // na końcu rozkładu się ustawia 60s i tu by było skrócenie @@ -1024,7 +1024,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // NOTE: this calculation is expected to run after completing loading/unloading AutoRewident(); // nastawianie hamulca do jazdy pociągowej - if( static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->ValueGet( 1 ) ) ) ) % 2 ) { + if( static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->input_value( 1 ) ) ) ) % 2 ) { // nie podjeżdżać do semafora, jeśli droga nie jest wolna iDrivigFlags |= moveStopHere; } @@ -1162,12 +1162,12 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // ostrożnie interpretować sygnały - semafor może zezwalać na jazdę pociągu z przodu! iDrivigFlags |= moveVisibility; // store the ordered restricted speed and don't exceed it until the flag is cleared - VelRestricted = sSpeedTable[ i ].evEvent->ValueGet( 2 ); + VelRestricted = sSpeedTable[ i ].evEvent->input_value( 2 ); } } if( eSignSkip != sSpeedTable[ i ].evEvent ) { // jeśli ten SBL nie jest do pominięcia to ma 0 odczytywać - v = sSpeedTable[ i ].evEvent->ValueGet( 1 ); + v = sSpeedTable[ i ].evEvent->input_value( 1 ); // TODO sprawdzić do której zmiennej jest przypisywane v i zmienić to tutaj } } @@ -1197,7 +1197,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN if (sSpeedTable[i].fSectionVelocityDist == 0.0) { if (Global.iWriteLogEnabled & 8) - WriteLog("TableUpdate: Event is behind. SVD = 0: " + sSpeedTable[i].evEvent->asName); + WriteLog("TableUpdate: Event is behind. SVD = 0: " + sSpeedTable[i].evEvent->m_name); sSpeedTable[i].iFlags = 0; // jeśli punktowy to kasujemy i nie dajemy ograniczenia na stałe } else if (sSpeedTable[i].fSectionVelocityDist < 0.0) @@ -1211,7 +1211,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN { // jeśli większe to musi wyjechać za poprzednie VelLimitLast = sSpeedTable[i].fVelNext; if (Global.iWriteLogEnabled & 8) - WriteLog("TableUpdate: Event is behind. SVD < 0: " + sSpeedTable[i].evEvent->asName); + WriteLog("TableUpdate: Event is behind. SVD < 0: " + sSpeedTable[i].evEvent->m_name); sSpeedTable[i].iFlags = 0; // wyjechaliśmy poza poprzednie, można skasować } } @@ -1230,7 +1230,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN { // VelLimitLast = -1.0; if (Global.iWriteLogEnabled & 8) - WriteLog("TableUpdate: Event is behind. SVD > 0: " + sSpeedTable[i].evEvent->asName); + WriteLog("TableUpdate: Event is behind. SVD > 0: " + sSpeedTable[i].evEvent->m_name); sSpeedTable[i].iFlags = 0; // wyjechaliśmy poza poprzednie, można skasować } } @@ -1313,7 +1313,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN sSpeedTable[ i ].iFlags = 0; } } - else if( sSpeedTable[ i ].evEvent->StopCommand() ) { + else if( sSpeedTable[ i ].evEvent->is_command() ) { // jeśli prędkość jest zerowa, a komórka zawiera komendę eSignNext = sSpeedTable[ i ].evEvent; // dla informacji if( true == TestFlag( iDrivigFlags, moveStopHere ) ) { @@ -4623,8 +4623,11 @@ TController::UpdateSituation(double dt) { // jedzie w dowolnym trybie albo Wait_for_orders if( mvOccupied->Vel < 0.1 ) { // dopiero jak stanie - PutCommand( eSignNext->CommandGet(), eSignNext->ValueGet( 1 ), eSignNext->ValueGet( 2 ), nullptr ); +/* + PutCommand( eSignNext->text(), eSignNext->value( 1 ), eSignNext->value( 2 ), nullptr ); eSignNext->StopCommandSent(); // się wykonało już +*/ // replacement of the above + eSignNext->send_command( *this ); } } break; @@ -5744,22 +5747,22 @@ bool TController::BackwardTrackBusy(TTrack *Track) return false; // wolny }; -TEvent * TController::CheckTrackEventBackward(double fDirection, TTrack *Track) +basic_event * TController::CheckTrackEventBackward(double fDirection, TTrack *Track) { // sprawdzanie eventu w torze, czy jest sygnałowym - skanowanie do tyłu // NOTE: this method returns only one event which meets the conditions, due to limitations in the caller // TBD, TODO: clean up the caller and return all suitable events, as in theory things will go awry if the track has more than one signal auto const &eventsequence { ( fDirection > 0 ? Track->m_events2 : Track->m_events1 ) }; for( auto const &event : eventsequence ) { if( ( event.second != nullptr ) - && ( false == event.second->bEnabled ) - && ( event.second->Type == tp_GetValues ) ) { + && ( event.second->m_passive ) + && ( typeid(*(event.second)) == typeid( getvalues_event ) ) ) { return event.second; } } return nullptr; }; -TTrack * TController::BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, TEvent *&Event) +TTrack * TController::BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, basic_event *&Event) { // szukanie sygnalizatora w kierunku przeciwnym jazdy (eventu odczytu komórki pamięci) TTrack *pTrackChVel = Track; // tor ze zmianą prędkości TTrack *pTrackFrom; // odcinek poprzedni, do znajdywania końca dróg @@ -5873,7 +5876,7 @@ TCommandType TController::BackwardScan() // Ra: przy wstecznym skanowaniu prędkość nie ma znaczenia double scanmax = 1000; // 1000m do tyłu, żeby widział przeciwny koniec stacji double scandist = scanmax; // zmodyfikuje na rzeczywiście przeskanowane - TEvent *e = NULL; // event potencjalnie od semafora + basic_event *e = NULL; // event potencjalnie od semafora // opcjonalnie może być skanowanie od "wskaźnika" z przodu, np. W5, Tm=Ms1, koniec toru wg drugiej osi w kierunku ruchu TTrack *scantrack = BackwardTraceRoute(scandist, scandir, pVehicles[0]->RaTrackGet(), e); auto const dir = startdir * pVehicles[0]->VectorFront(); // wektor w kierunku jazdy/szukania @@ -5896,12 +5899,12 @@ TCommandType TController::BackwardScan() #endif // najpierw sprawdzamy, czy semafor czy inny znak został przejechany auto pos = pVehicles[1]->RearPosition(); // pozycja tyłu - if (e->Type == tp_GetValues) + if( typeid( *e ) == typeid( getvalues_event ) ) { // przesłać info o zbliżającym się semaforze #if LOGBACKSCAN edir += "(" + ( e->asNodeName ) + ")"; #endif - auto sl = e->PositionGet(); // położenie komórki pamięci + auto sl = e->input_location(); // położenie komórki pamięci auto sem = sl - pos; // wektor do komórki pamięci od końca składu if (dir.x * sem.x + dir.z * sem.z < 0) { // jeśli został minięty @@ -5911,7 +5914,7 @@ TCommandType TController::BackwardScan() #endif return TCommandType::cm_Unknown; // nic } - vmechmax = e->ValueGet(1); // prędkość przy tym semaforze + vmechmax = e->input_value(1); // prędkość przy tym semaforze // przeliczamy odległość od semafora - potrzebne by były współrzędne początku składu scandist = sem.Length() - 2; // 2m luzu przy manewrach wystarczy if( scandist < 0 ) { @@ -5919,7 +5922,7 @@ TCommandType TController::BackwardScan() scandist = 0; } bool move = false; // czy AI w trybie manewerowym ma dociągnąć pod S1 - if( e->Command() == TCommandType::cm_SetVelocity ) { + if( e->input_command() == TCommandType::cm_SetVelocity ) { if( ( vmechmax == 0.0 ) ? ( OrderCurrentGet() & ( Shunt | Connect ) ) : ( OrderCurrentGet() & Connect ) ) { // przy podczepianiu ignorować wyjazd? @@ -5963,7 +5966,7 @@ TCommandType TController::BackwardScan() if (OrderCurrentGet() ? OrderCurrentGet() & (Shunt | Connect) : true) // w Wait_for_orders też widzi tarcze { // reakcja AI w trybie manewrowym dodatkowo na sygnały manewrowe - if (move ? true : e->Command() == TCommandType::cm_ShuntVelocity) + if (move ? true : e->input_command() == TCommandType::cm_ShuntVelocity) { // jeśli powyżej było SetVelocity 0 0, to dociągamy pod S1 if ((scandist > fMinProximityDist) ? (mvOccupied->Vel > 0.0) || (vmechmax == 0.0) : @@ -5996,7 +5999,7 @@ TCommandType TController::BackwardScan() WriteLog( edir + " - [ShuntVelocity] [" + to_string( vmechmax, 2 ) + "] [" - + to_string( e->ValueGet( 2 ), 2 ) + "]" ); + + to_string( e->value( 2 ), 2 ) + "]" ); #endif return ( vmechmax > 0 ? @@ -6017,8 +6020,8 @@ TCommandType TController::BackwardScan() } } // if (move?... } // if (OrderCurrentGet()==Shunt) - if (!e->bEnabled) // jeśli skanowany - if (e->StopCommand()) // a podłączona komórka ma komendę + if (e->m_passive) // jeśli skanowany + if (e->is_command()) // a podłączona komórka ma komendę return TCommandType::cm_Command; // to też się obrócić } // if (e->Type==tp_GetValues) } // if (e) diff --git a/Driver.h b/Driver.h index 1956f0cc..33afad06 100644 --- a/Driver.h +++ b/Driver.h @@ -140,13 +140,13 @@ class TSpeedPos struct { TTrack *trTrack{ nullptr }; // wskaźnik na tor o zmiennej prędkości (zwrotnica, obrotnica) - TEvent *evEvent{ nullptr }; // połączenie z eventem albo komórką pamięci + basic_event *evEvent{ nullptr }; // połączenie z eventem albo komórką pamięci }; void CommandCheck(); public: TSpeedPos(TTrack *track, double dist, int flag); - TSpeedPos(TEvent *event, double dist, TOrders order); + TSpeedPos(basic_event *event, double dist, TOrders order); TSpeedPos() = default; void Clear(); bool Update(); @@ -155,7 +155,7 @@ class TSpeedPos void UpdateDistance( double dist ) { fDist -= dist; } - bool Set(TEvent *e, double d, TOrders order = Wait_for_orders); + bool Set(basic_event *e, double d, TOrders order = Wait_for_orders); void Set(TTrack *t, double d, int f); std::string TableText() const; std::string GetName() const; @@ -181,7 +181,7 @@ class TController { std::vector sSpeedTable; double fLastVel = 0.0; // prędkość na poprzednio sprawdzonym torze TTrack *tLast = nullptr; // ostatni analizowany tor - TEvent *eSignSkip = nullptr; // można pominąć ten SBL po zatrzymaniu + basic_event *eSignSkip = nullptr; // można pominąć ten SBL po zatrzymaniu std::size_t SemNextIndex{ std::size_t(-1) }; std::size_t SemNextStopIndex{ std::size_t( -1 ) }; double dMoveLen = 0.0; // odległość przejechana od ostatniego sprawdzenia tabelki @@ -190,7 +190,7 @@ class TController { double fMass = 0.0; // całkowita masa do liczenia stycznej składowej grawitacji public: double fAccGravity = 0.0; // przyspieszenie składowej stycznej grawitacji - TEvent *eSignNext = nullptr; // sygnał zmieniający prędkość, do pokazania na [F2] + basic_event *eSignNext = nullptr; // sygnał zmieniający prędkość, do pokazania na [F2] std::string asNextStop; // nazwa następnego punktu zatrzymania wg rozkładu int iStationStart = 0; // numer pierwszej stacji pokazywanej na podglądzie rozkładu // parametry sterowania pojazdem (stan, hamowanie) @@ -362,9 +362,9 @@ private: int OrderDirectionChange(int newdir, TMoverParameters *Vehicle); void Lights(int head, int rear); // Ra: metody obsługujące skanowanie toru - std::vector CheckTrackEvent(TTrack *Track, double const fDirection ) const; + std::vector CheckTrackEvent(TTrack *Track, double const fDirection ) const; bool TableAddNew(); - bool TableNotFound(TEvent const *Event) const; + bool TableNotFound(basic_event const *Event) const; void TableTraceRoute(double fDistance, TDynamicObject *pVehicle); void TableCheck(double fDistance); TCommandType TableUpdate(double &fVelDes, double &fDist, double &fNext, double &fAcc); @@ -387,8 +387,8 @@ private: private: // Ra: stare funkcje skanujące, używane do szukania sygnalizatora z tyłu bool BackwardTrackBusy(TTrack *Track); - TEvent *CheckTrackEventBackward(double fDirection, TTrack *Track); - TTrack *BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, TEvent *&Event); + basic_event *CheckTrackEventBackward(double fDirection, TTrack *Track); + TTrack *BackwardTraceRoute(double &fDistance, double &fDirection, TTrack *Track, basic_event *&Event); void SetProximityVelocity( double dist, double vel, glm::dvec3 const *pos ); TCommandType BackwardScan(); diff --git a/EvLaunch.cpp b/EvLaunch.cpp index 1d0ec0bb..aa41b9e4 100644 --- a/EvLaunch.cpp +++ b/EvLaunch.cpp @@ -110,12 +110,12 @@ bool TEventLauncher::Load(cParser *parser) *parser >> token; szText = token; if (token != "*") //*=nie brać command pod uwagę - iCheckMask |= conditional_memstring; + iCheckMask |= basic_event::flags::text; parser->getTokens(); *parser >> token; if (token != "*") //*=nie brać wartości 1. pod uwagę { - iCheckMask |= conditional_memval1; + iCheckMask |= basic_event::flags::value_1; fVal1 = atof(token.c_str()); } else @@ -124,7 +124,7 @@ bool TEventLauncher::Load(cParser *parser) *parser >> token; if (token.compare("*") != 0) //*=nie brać wartości 2. pod uwagę { - iCheckMask |= conditional_memval2; + iCheckMask |= basic_event::flags::value_2; fVal2 = atof(token.c_str()); } else @@ -280,8 +280,8 @@ TEventLauncher::export_as_text_( std::ostream &Output ) const { << "condition " << asMemCellName << ' ' << szText << ' ' - << ( ( iCheckMask & conditional_memval1 ) != 0 ? to_string( fVal1 ) : "*" ) << ' ' - << ( ( iCheckMask & conditional_memval2 ) != 0 ? to_string( fVal2 ) : "*" ) << ' '; + << ( ( iCheckMask & basic_event::flags::value_1 ) != 0 ? to_string( fVal1 ) : "*" ) << ' ' + << ( ( iCheckMask & basic_event::flags::value_2 ) != 0 ? to_string( fVal2 ) : "*" ) << ' '; } // footer Output diff --git a/EvLaunch.h b/EvLaunch.h index f545ca57..84512e56 100644 --- a/EvLaunch.h +++ b/EvLaunch.h @@ -32,8 +32,8 @@ public: std::string asEvent1Name; std::string asEvent2Name; std::string asMemCellName; - TEvent *Event1 { nullptr }; - TEvent *Event2 { nullptr }; + basic_event *Event1 { nullptr }; + basic_event *Event2 { nullptr }; TMemCell *MemCell { nullptr }; int iCheckMask { 0 }; double dRadius { 0.0 }; diff --git a/Event.cpp b/Event.cpp index 6c4fb07f..e1268c79 100644 --- a/Event.cpp +++ b/Event.cpp @@ -30,688 +30,79 @@ http://mozilla.org/MPL/2.0/. #include "timer.h" #include "logs.h" -TMemCell const * -TEvent::update_data::data_cell() const { - - return static_cast( std::get( data_source ) ); -} -TMemCell * -TEvent::update_data::data_cell() { - - return static_cast( std::get( data_source ) ); -} - -TEvent::~TEvent() { - - switch (Type) - { // sprzątanie - case tp_Animation: // nic - if( m_animationtype == 4 ) { - // jeśli z pliku VMD - SafeDeleteArray( m_animationfiledata ); // zwolnić obszar - } - break; - default: - break; - } - evJoined = nullptr; // nie usuwać podczepionych tutaj - -}; - -void TEvent::Load(cParser *parser, Math3D::vector3 const &org) -{ - std::string token; - - bEnabled = true; // zmieniane na false dla eventów używanych do skanowania sygnałów - - parser->getTokens(); - *parser >> token; - asName = ToLower(token); // użycie parametrów może dawać wielkie - - parser->getTokens(); - *parser >> token; - - if (token == "updatevalues") - Type = tp_UpdateValues; - else if (token == "getvalues") - Type = tp_GetValues; - else if (token == "putvalues") - Type = tp_PutValues; - else if (token == "sound") - Type = tp_Sound; - else if (token == "animation") - Type = tp_Animation; - else if (token == "lights") - Type = tp_Lights; - else if (token == "visible") - Type = tp_Visible; // zmiana wyświetlania obiektu - else if (token == "switch") - Type = tp_Switch; - else if (token == "trackvel") - Type = tp_TrackVel; - else if (token == "multiple") - Type = tp_Multiple; - else if (token == "addvalues") - Type = tp_AddValues; - else if (token == "copyvalues") - Type = tp_CopyValues; - else if (token == "whois") - Type = tp_WhoIs; - else if (token == "logvalues") - Type = tp_LogValues; - else if (token == "voltage") - Type = tp_Voltage; // zmiana napięcia w zasilaczu (TractionPowerSource) - else if (token == "message") - Type = tp_Message; // wyświetlenie komunikatu - else if (token == "friction") - Type = tp_Friction; // zmiana tarcia na scenerii - else - Type = tp_Unknown; - - parser->getTokens(); - *parser >> fDelay; - - parser->getTokens(); - *parser >> token; -/* - if( token != "none" ) { - asNodeName = token; // nazwa obiektu powiązanego - } -*/ - load_targets( token ); - - if (asName.substr(0, 5) == "none_") - m_ignored = true; // Ra: takie są ignorowane - - switch (Type) { - case tp_AddValues: { - m_update.flags = update_memadd; // dodawanko - // NOTE: AddValues and UpdateValues are largely the same - } - case tp_UpdateValues: { - // update data, previously stored in params 0, 1, 2 - parser->getTokens( 1, false ); // case sensitive - *parser >> m_update.data_text; - if( m_update.data_text != "*" ) { //"*" - nie brac command pod uwage - m_update.flags |= update_memstring; - } - parser->getTokens(); - if( parser->peek() != "*" ) { //"*" - nie brac val1 pod uwage - *parser >> m_update.data_value_1; - m_update.flags |= update_memval1; - } - parser->getTokens(); - if( parser->peek() != "*" ) { //"*" - nie brac val2 pod uwage - *parser >> m_update.data_value_2; - m_update.flags |= update_memval2; - } - // optional blocks - while( ( false == ( token = parser->getToken() ).empty() ) - && ( token != "endevent" ) ) { - - if( token == "condition" ) { - m_condition.load( *parser ); - // NOTE: load() call leaves a preloaded token if it's not recognized - *parser >> token; - if( ( true == token.empty() ) || ( token == "endevent" ) ) { break; } - } - if( token == "randomdelay" ) { // losowe opóźnienie - parser->getTokens(); - *parser >> fRandomDelay; // Ra 2014-03-11 - } - } - break; - } - case tp_CopyValues: { - m_update.flags = update_memstring | update_memval1 | update_memval2; // normalnie trzy - int paramidx { 0 }; - while( ( false == ( token = parser->getToken() ).empty() ) - && ( token != "endevent" ) ) { - switch( ++paramidx ) { - case 1: { // nazwa drugiej komórki (źródłowej) // previously stored in param 9 - std::get( m_update.data_source ) = token; - break; - } - case 2: { // maska wartości - m_update.flags = stol_def( token, ( update_memstring | update_memval1 | update_memval2 ) ); - break; - } - default: { - break; - } - } - } - break; - } - case tp_WhoIs: { - m_update.flags = update_memstring | update_memval1 | update_memval2; // normalnie trzy - int paramidx { 0 }; - while( ( false == ( token = parser->getToken() ).empty() ) - && ( token != "endevent" ) ) { - switch( ++paramidx ) { - case 1: { // maska wartości - m_update.flags = stol_def( token, ( update_memstring | update_memval1 | update_memval2 ) ); - break; - } - default: { - break; - } - } - } - break; - } - case tp_GetValues: - case tp_LogValues: { - parser->getTokens(); //"endevent" - *parser >> token; - break; - } - case tp_PutValues: { - parser->getTokens( 3 ); - // location, previously held in param 3, 4, 5 - *parser - >> m_update.location.x - >> m_update.location.y - >> m_update.location.z; - // przesunięcie - // tmp->pCenter.RotateY(aRotate.y/180.0*M_PI); //Ra 2014-11: uwzględnienie rotacji - // TBD, TODO: take into account rotation as well? - m_update.location += glm::dvec3{ org }; - - parser->getTokens( 1, false ); // komendy 'case sensitive' - *parser >> token; - // command type, previously held in param 6 - if( token.substr( 0, 19 ) == "PassengerStopPoint:" ) { - if( token.find( '#' ) != std::string::npos ) - token.erase( token.find( '#' ) ); // obcięcie unikatowości - win1250_to_ascii( token ); // get rid of non-ascii chars - m_update.command_type = TCommandType::cm_PassengerStopPoint; - // nie do kolejki (dla SetVelocity też, ale jak jest do toru dowiązany) - bEnabled = false; - } - else if( token == "SetVelocity" ) { - m_update.command_type = TCommandType::cm_SetVelocity; - bEnabled = false; - } - else if( token == "RoadVelocity" ) { - m_update.command_type = TCommandType::cm_RoadVelocity; - bEnabled = false; - } - else if( token == "SectionVelocity" ) { - m_update.command_type = TCommandType::cm_SectionVelocity; - bEnabled = false; - } - else if( token == "ShuntVelocity" ) { - m_update.command_type = TCommandType::cm_ShuntVelocity; - bEnabled = false; - } - else if( token == "OutsideStation" ) { - m_update.command_type = TCommandType::cm_OutsideStation; - bEnabled = false; // ma być skanowny, aby AI nie przekraczało W5 - } - else { - m_update.command_type = TCommandType::cm_Unknown; - } - // update data, previously stored in params 0, 1, 2 - m_update.data_text = token; - parser->getTokens(); - if( parser->peek() != "none" ) { - *parser >> m_update.data_value_1; - } - parser->getTokens(); - if( parser->peek() != "none" ) { - *parser >> m_update.data_value_2; - } - parser->getTokens(); - *parser >> token; - break; - } - case tp_Lights: { - // TBD, TODO: remove light count limit? - auto const lightcountlimit { 8 }; - m_lights.resize( lightcountlimit ); - int paramidx { 0 }; - parser->getTokens(); - while( ( false == ( token = parser->peek() ).empty() ) - && ( token != "endevent" ) ) { - - if( paramidx < lightcountlimit ) { - *parser >> m_lights[ paramidx++ ]; - } - else { - ErrorLog( "Bad event: lights event \"" + asName + "\" with more than " + to_string( lightcountlimit ) + " parameters" ); - } - parser->getTokens(); - } - while( paramidx < lightcountlimit ) { - // HACK: mark unspecified lights with magic value - m_lights[ paramidx++ ] = -2.f; - } - break; - } - case tp_Visible: // zmiana wyświetlania obiektu - parser->getTokens(); - // visibility flag, previously held in param 0 - *parser >> m_visible; - parser->getTokens(); - *parser >> token; - break; - case tp_Sound: - parser->getTokens(); - // playback mode, previously held in param 0 // 0: wylaczyc, 1: wlaczyc; -1: wlaczyc zapetlone - *parser >> m_soundmode; - parser->getTokens(); - if( parser->peek() != "endevent" ) { - // optional parameter, radio channel to receive/broadcast the sound, previously held in param 1 - *parser >> m_soundradiochannel; - parser->getTokens(); - } - *parser >> token; - break; - case tp_Animation: - parser->getTokens(); - *parser >> token; - if (token.compare("rotate") == 0) - { // obrót względem osi - parser->getTokens(); - // animation submodel, previously held in param 9 - *parser >> m_animationsubmodel; - // animation type, previously held in param 0 - m_animationtype = 1; - parser->getTokens( 4 ); - // animation params, previously held in param 1, 2, 3, 4 - *parser - >> m_animationparams[ 0 ] - >> m_animationparams[ 1 ] - >> m_animationparams[ 2 ] - >> m_animationparams[ 3 ]; - } - else if (token.compare("translate") == 0) - { // przesuw o wektor - parser->getTokens(); - // animation submodel, previously held in param 9 - *parser >> m_animationsubmodel; - // animation type, previously held in param 0 - m_animationtype = 2; - parser->getTokens( 4 ); - // animation params, previously held in param 1, 2, 3, 4 - *parser - >> m_animationparams[ 0 ] - >> m_animationparams[ 1 ] - >> m_animationparams[ 2 ] - >> m_animationparams[ 3 ]; - } - else if (token.compare("digital") == 0) - { // licznik cyfrowy - parser->getTokens(); - // animation submodel, previously held in param 9 - *parser >> m_animationsubmodel; - // animation type, previously held in param 0 - m_animationtype = 8; - parser->getTokens( 4 ); - // animation params, previously held in param 1, 2, 3, 4 - *parser - >> m_animationparams[ 0 ] - >> m_animationparams[ 1 ] - >> m_animationparams[ 2 ] - >> m_animationparams[ 3 ]; - } - else if (token.substr(token.length() - 4, 4) == ".vmd") // na razie tu, może będzie inaczej - { // animacja z pliku VMD - { - m_animationfilename = token; - std::ifstream file( szModelPath + m_animationfilename, std::ios::binary | std::ios::ate ); file.unsetf( std::ios::skipws ); - auto size = file.tellg(); // ios::ate already positioned us at the end of the file - file.seekg( 0, std::ios::beg ); // rewind the caret afterwards - // animation size, previously held in param 7 - m_animationfilesize = size; - // animation data, previously held in param 8 - m_animationfiledata = new char[size]; - file.read( m_animationfiledata, size ); // wczytanie pliku - } - parser->getTokens(); - // animation submodel, previously held in param 9 - *parser >> m_animationsubmodel; - // animation type, previously held in param 0 - m_animationtype = 4; - parser->getTokens( 4 ); - // animation params, previously held in param 1, 2, 3, 4 - *parser - >> m_animationparams[ 0 ] - >> m_animationparams[ 1 ] - >> m_animationparams[ 2 ] - >> m_animationparams[ 3 ]; - } - parser->getTokens(); - *parser >> token; - break; - case tp_Switch: - parser->getTokens(); - // switch state, previously held in param 0 - *parser >> m_switchstate; - parser->getTokens(); - if (parser->peek() != "endevent") { - // prędkość liniowa ruchu iglic - // previously held in param 1 - *parser >> m_switchmoverate; - parser->getTokens(); - } - if (parser->peek() != "endevent") { - // dodatkowy ruch drugiej iglicy (zamknięcie nastawnicze) - // previously held in param 2 - *parser >> m_switchmovedelay; - parser->getTokens(); - } - break; - case tp_TrackVel: - parser->getTokens(); - // velocity, previously held in param 0 - *parser >> m_velocity; - parser->getTokens(); - *parser >> token; - break; - case tp_Multiple: { - m_condition.has_else = false; - while( ( false == ( token = parser->getToken() ).empty() ) - && ( token != "endevent" ) ) { - - if( token == "condition" ) { - m_condition.load( *parser ); - // NOTE: load() call leaves a preloaded token if it's not recognized - *parser >> token; - if( ( true == token.empty() ) || ( token == "endevent" ) ) { break; } - } - - if( token == "randomdelay" ) { // losowe opóźnienie - parser->getTokens(); - *parser >> fRandomDelay; // Ra 2014-03-11 - } - else if( token == "else" ) { - // zmiana flagi dla słowa "else" - m_condition.has_else = !m_condition.has_else; - } - else { - // potentially valid event name - if( token.substr( 0, 5 ) != "none_" ) { - // eventy rozpoczynające się od "none_" są ignorowane - m_children.emplace_back( token, nullptr, ( m_condition.has_else == false ) ); - } - else { - WriteLog( "Multi-event \"" + asName + "\" ignored link to event \"" + token + "\"" ); - } - } - } - break; - } - case tp_Voltage: // zmiana napięcia w zasilaczu (TractionPowerSource) - parser->getTokens(); - // voltage, previously held in param 0 - *parser >> m_voltage; - parser->getTokens(); - *parser >> token; - break; - case tp_Friction: // zmiana przyczepnosci na scenerii - parser->getTokens(); - // friction, previously held in param 0 - *parser >> m_friction; - parser->getTokens(); - *parser >> token; - break; - case tp_Message: // wyświetlenie komunikatu - do - { - parser->getTokens(); - *parser >> token; - // str = AnsiString(token.c_str()); - } while (token != "endevent"); - break; - case tp_Unknown: // nieznany - do - { - parser->getTokens(); - *parser >> token; - // str = AnsiString(token.c_str()); - } while (token != "endevent"); - WriteLog("Bad event: \"" + asName + - (Type == tp_Unknown ? "\" has unknown type." : "\" is ignored.")); - break; - } -}; - -// prepares event for use void -TEvent::init() { +basic_event::event_conditions::bind( basic_event::node_sequence *Nodes ) { - switch( Type ) { + cells = Nodes; +} - case tp_AddValues: // sumowanie wartości - case tp_UpdateValues: { // zmiana wartości - // target memory cell(s), previously held in param 5, copy held in param 9 for memcompare - init_targets( simulation::Memory, "memory cell" ); - // conditional data - init_conditions(); - break; - } - case tp_LogValues: { - // skojarzenie z memcell - init_targets( simulation::Memory, "memory cell" ); - break; - } - case tp_GetValues: { - init_targets( simulation::Memory, "memory cell" ); - // custom target initialization code - for( auto &target : m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { continue; } - if( targetcell->IsVelocity() ) { - // jeśli odczyt komórki a komórka zawiera komendę SetVelocity albo ShuntVelocity - // to event nie będzie dodawany do kolejki - bEnabled = false; - } +void +basic_event::event_conditions::init() { + + tracks.clear(); + + if( flags & ( flags::track_busy | flags::track_free ) ) { + for( auto &target : *cells ) { + tracks.emplace_back( simulation::Paths.find( std::get( target ) ) ); + if( tracks.back() == nullptr ) { + // legacy compatibility behaviour, instead of disabling the event we disable the memory cell comparison test +// m_ignored = true; // deaktywacja +// ErrorLog( "Bad event: track \"" + std::get( target ) + "\" referenced in event \"" + asName + "\" doesn't exist" ); + flags &= ~( flags::track_busy | flags::track_free ); // zerowanie flag } - // NOTE: GetValues retrieves data only from first specified memory cell - // TBD, TODO: allow retrieval from more than one cell? - m_update.data_source = m_targets.front(); - break; } - case tp_WhoIs: { - init_targets( simulation::Memory, "memory cell" ); - break; - } - case tp_CopyValues: { - // skopiowanie komórki do innej - init_targets( simulation::Memory, "memory cell" ); - // source cell - std::get( m_update.data_source ) = simulation::Memory.find( std::get( m_update.data_source ) ); - if( std::get( m_update.data_source ) == nullptr ) { - m_ignored = true; // deaktywacja - ErrorLog( "Bad event: copyvalues event \"" + asName + "\" cannot find memcell \"" + std::get( m_update.data_source ) + "\"" ); - } - break; - } - case tp_Animation: { - // animacja modelu - init_targets( simulation::Instances, "model instance" ); - // custom target initialization code - if( m_animationtype == 4 ) { - // vmd animations target whole model - break; - } - // locate and set up animated submodels - m_animationcontainers.clear(); - for( auto &target : m_targets ) { - auto *targetmodel{ static_cast( std::get( target ) ) }; - if( targetmodel == nullptr ) { continue; } - auto *targetcontainer{ targetmodel->GetContainer( m_animationsubmodel ) }; - if( targetcontainer == nullptr ) { - m_ignored = true; - ErrorLog( "Bad event: animation event \"" + asName + "\" cannot find submodel " + m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" ); - break; - } - targetcontainer->WillBeAnimated(); // oflagowanie animacji - if( targetcontainer->Event() == nullptr ) { - // nie szukać, gdy znaleziony - targetcontainer->EventAssign( simulation::Events.FindEvent( targetmodel->name() + '.' + m_animationsubmodel + ":done" ) ); - } - m_animationcontainers.emplace_back( targetcontainer ); - } - break; - } - case tp_Lights: { - // zmiana świeteł modelu - init_targets( simulation::Instances, "model instance" ); - break; - } - case tp_Visible: { - // ukrycie albo przywrócenie obiektu - for( auto &target : m_targets ) { - auto &targetnode{ std::get( target ) }; - auto &targetname{ std::get( target ) }; - // najpierw model - targetnode = simulation::Instances.find( targetname ); - if( targetnode == nullptr ) { - // albo tory? - targetnode = simulation::Paths.find( targetname ); - } - if( targetnode == nullptr ) { - // może druty? - targetnode = simulation::Traction.find( targetname ); - } - if( targetnode == nullptr ) { - m_ignored = true; // deaktywacja - ErrorLog( "Bad event: event \"" + asName + "\" [" + type_to_string() + "] cannot find item \"" + std::get( target ) + "\"" ); - } - } - break; - } - case tp_Switch: { - // przełożenie zwrotnicy albo zmiana stanu obrotnicy - init_targets( simulation::Paths, "track" ); - // custom target initialization code - for( auto &target : m_targets ) { - auto *targettrack = static_cast( std::get( target ) ); - if( targettrack == nullptr ) { continue; } - // dowiązanie toru - if( targettrack->iAction == 0 ) { - // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia - targettrack->iAction |= 0x100; - } - if( ( m_switchstate == 0 ) - && ( m_switchmovedelay >= 0.0 ) ) { - // jeśli przełącza do stanu 0 & jeśli jest zdefiniowany dodatkowy ruch iglic - // przesłanie parametrów - targettrack->Switch( - m_switchstate, - m_switchmoverate, - m_switchmovedelay ); - } - } - break; - } - case tp_Sound: { - // odtworzenie dźwięku - for( auto &target : m_sounds ) { - std::get( target ) = simulation::Sounds.find( std::get( target ) ); - if( std::get( target ) == nullptr ) { - m_ignored = true; // deaktywacja - ErrorLog( "Bad event: event \"" + asName + "\" [" + type_to_string() + "] cannot find static sound \"" + std::get( target ) + "\"" ); - } - } - break; - } - case tp_TrackVel: { - // ustawienie prędkości na torze - init_targets( simulation::Paths, "track" ); - // custom target initialization code - for( auto &target : m_targets ) { - auto *targettrack = static_cast( std::get( target ) ); - if( targettrack == nullptr ) { continue; } - // flaga zmiany prędkości toru jest istotna dla skanowania - targettrack->iAction |= 0x200; - } - break; - } - case tp_Multiple: { - // conditional data - init_targets( simulation::Memory, "memory cell", false ); - if( m_ignored ) { - m_condition.flags &= ~( conditional_memstring | conditional_memval1 | conditional_memval2 ); - m_ignored = false; - } - init_conditions(); - // child events bindings - for( auto &childevent : m_children ) { - std::get( childevent ) = simulation::Events.FindEvent( std::get( childevent ) ); - if( std::get( childevent ) == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + asName + "\" cannot find event \"" + std::get( childevent ) + "\"" ); - } - } - break; - } - case tp_Voltage: { - // zmiana napięcia w zasilaczu (TractionPowerSource) - init_targets( simulation::Powergrid, "power source" ); - break; - } - case tp_Message: { - // wyświetlenie komunikatu - break; - } - default: { - break; - } - } // switch + } } bool -TEvent::test_condition() const { +basic_event::event_conditions::test() const { - if( m_condition.flags == 0 ) { + if( flags == 0 ) { return true; // bezwarunkowo } // if there's conditions, check them - if( m_condition.flags & conditional_propability ) { - auto const rprobability { static_cast( Random() ) }; - WriteLog( "Test: Random integer - [" + std::to_string( rprobability ) + "] / [" + std::to_string( m_condition.probability ) + "]" ); - if( rprobability > m_condition.probability ) { + if( flags & flags::probability ) { + auto const randomroll { static_cast( Random() ) }; + WriteLog( "Test: Random integer - [" + std::to_string( randomroll ) + "] / [" + std::to_string( probability ) + "]" ); + if( randomroll > probability ) { return false; } } - if( m_condition.flags & conditional_trackoccupied ) { - for( auto *track : m_condition.tracks ) { + if( flags & flags::track_busy ) { + for( auto *track : tracks ) { if( true == track->IsEmpty() ) { return false; } } } - if( m_condition.flags & conditional_trackfree ) { - for( auto *track : m_condition.tracks ) { + if( flags & flags::track_free ) { + for( auto *track : tracks ) { if( false == track->IsEmpty() ) { return false; } } } - if( m_condition.flags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) { + if( flags & ( flags::text | flags::value_1 | flags::value_2 ) ) { // porównanie wartości - for( auto &target : m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { - ErrorLog( "Event " + asName + " trying conditional_memcompare with nonexistent memcell" ); + for( auto &cellwrapper : *cells ) { + auto *cell { static_cast( std::get( cellwrapper ) ) }; + if( cell == nullptr ) { +// ErrorLog( "Event " + asName + " trying conditional_memcompare with nonexistent memcell" ); continue; // though this is technically error, we treat it as a success to maintain backward compatibility } auto const comparisonresult = - targetcell->Compare( - m_condition.match_text, - m_condition.match_value_1, - m_condition.match_value_2, - m_condition.flags ); + cell->Compare( + match_text, + match_value_1, + match_value_2, + flags ); std::string comparisonlog = "Test: MemCompare - "; comparisonlog += - "[" + targetcell->Text() + "]" - + " [" + to_string( targetcell->Value1(), 2 ) + "]" - + " [" + to_string( targetcell->Value2(), 2 ) + "]"; + "[" + cell->Text() + "]" + + " [" + to_string( cell->Value1(), 2 ) + "]" + + " [" + to_string( cell->Value2(), 2 ) + "]"; comparisonlog += ( true == comparisonresult ? @@ -719,16 +110,16 @@ TEvent::test_condition() const { " != " ); comparisonlog += ( - TestFlag( m_condition.flags, conditional_memstring ) ? - "[" + std::string( m_condition.match_text ) + "]" : + TestFlag( flags, flags::text ) ? + "[" + std::string( match_text ) + "]" : "[*]" ); comparisonlog += ( - TestFlag( m_condition.flags, conditional_memval1 ) ? - " [" + to_string( m_condition.match_value_1, 2 ) + "]" : + TestFlag( flags, flags::value_1 ) ? + " [" + to_string( match_value_1, 2 ) + "]" : " [*]" ); comparisonlog += ( - TestFlag( m_condition.flags, conditional_memval2 ) ? - " [" + to_string( m_condition.match_value_2, 2 ) + "]" : + TestFlag( flags, flags::value_2 ) ? + " [" + to_string( match_value_2, 2 ) + "]" : " [*]" ); WriteLog( comparisonlog ); @@ -743,411 +134,21 @@ TEvent::test_condition() const { } void -TEvent::run() { - - WriteLog( "EVENT LAUNCHED" + ( Activator ? ( " by " + Activator->asName ) : "" ) + ": " + asName ); - switch (Type) { - case tp_CopyValues: { - // skopiowanie wartości z innej komórki - auto const *datasource = static_cast( std::get( m_update.data_source ) ); - m_update.data_text = datasource->Text(); - m_update.data_value_1 = datasource->Value1(); - m_update.data_value_2 = datasource->Value2(); - } - case tp_AddValues: // różni się jedną flagą od UpdateValues - case tp_UpdateValues: { - if( false == test_condition() ) { break; } - WriteLog( "Type: " + std::string( Type == tp_AddValues ? "AddValues & Track command" : "UpdateValues" ) + " - [" - + m_update.data_text + "] [" - + to_string( m_update.data_value_1, 2 ) + "] [" - + to_string( m_update.data_value_2, 2 ) + "]" ); - // TODO: dump status of target cells after the operation - for( auto &target : m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { continue; } - targetcell->UpdateValues( - m_update.data_text, - m_update.data_value_1, - m_update.data_value_2, - m_update.flags ); - if( targetcell->Track == nullptr ) { continue; } - // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze - auto const location { targetcell->location() }; - for( auto dynamic : targetcell->Track->Dynamics ) { - targetcell->PutCommand( - dynamic->Mechanik, - &location ); - } - } - break; - } - case tp_GetValues: { - WriteLog( "Type: GetValues" ); - if( Activator ) { - // TODO: re-enable when messaging module is in place - if( Global.iMultiplayer ) { - // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) - multiplayer::WyslijEvent( asName, Activator->name() ); - } - m_update.data_cell()->PutCommand( - Activator->Mechanik, - &(m_update.data_cell()->location()) ); - } - break; - } - case tp_PutValues: { - WriteLog( "Type: PutValues - [" + - m_update.data_text + "] [" + - to_string( m_update.data_value_1, 2 ) + "] [" + - to_string( m_update.data_value_2, 2 ) + "]" ); - if (Activator) { - // zamiana, bo fizyka ma inaczej niż sceneria - // NOTE: y & z swap, negative x - TLocation const loc { - -m_update.location.x, - m_update.location.z, - m_update.location.y }; - if( Activator->Mechanik ) { - // przekazanie rozkazu do AI - Activator->Mechanik->PutCommand( - m_update.data_text, - m_update.data_value_1, - m_update.data_value_2, - loc); - } - else { - // przekazanie do pojazdu - Activator->MoverParameters->PutCommand( - m_update.data_text, - m_update.data_value_1, - m_update.data_value_2, - loc); - } - } - break; - } - case tp_Lights: { - for( auto &target : m_targets ) { - auto *targetmodel = static_cast( std::get( target ) ); - if( targetmodel == nullptr ) { continue; } - // event effect code - for( auto i = 0; i < iMaxNumLights; ++i ) { - if( m_lights[ i ] == -2.f ) { - // processed all supplied values, bail out - break; - } - if( m_lights[ i ] >= 0.f ) { - // -1 zostawia bez zmiany - targetmodel->LightSet( - i, - m_lights[ i ] ); - } - } - } - break; - } - case tp_Visible: { - for( auto &target : m_targets ) { - auto *targetnode = std::get( target ); - if( targetnode == nullptr ) { continue; } - // event effect code - targetnode->visible( m_visible ); - } - break; - } - case tp_Sound: { - for( auto &target : m_sounds ) { - auto *targetsound = std::get( target ); - if( targetsound == nullptr ) { continue; } - // event effect code - switch( m_soundmode ) { - // trzy możliwe przypadki: - case 0: { - targetsound->stop(); - break; - } - case 1: { - if( m_soundradiochannel > 0 ) { - simulation::radio_message( - targetsound, - m_soundradiochannel ); - } - else { - targetsound->play( sound_flags::exclusive | sound_flags::event ); - } - break; - } - case -1: { - targetsound->play( sound_flags::exclusive | sound_flags::looping | sound_flags::event ); - break; - } - default: { - break; - } - } - } - break; - } - case tp_Animation: { - WriteLog( "Type: Animation" ); - if( m_animationtype == 4 ) { - // vmd mode targets the entire model - for( auto &target : m_targets ) { - auto *targetmodel = static_cast( std::get( target ) ); - if( targetmodel == nullptr ) { continue; } - // event effect code - targetmodel->AnimationVND( - m_animationfiledata, - m_animationparams[ 0 ], // tu mogą być dodatkowe parametry, np. od-do - m_animationparams[ 1 ], - m_animationparams[ 2 ], - m_animationparams[ 3 ] ); - } - } - else { - // other animation modes target specific submodels - for( auto *targetcontainer : m_animationcontainers ) { - switch( m_animationtype ) { - case 1: { // rotate - targetcontainer->SetRotateAnim( - glm::make_vec3( m_animationparams.data() ), - m_animationparams[ 3 ] ); - break; - } - case 2: { // translate - targetcontainer->SetTranslateAnim( - glm::make_vec3( m_animationparams.data() ), - m_animationparams[ 3 ] ); - break; - } - // TODO: implement digital mode - default: { - break; - } - } - } - } - break; - } - case tp_Switch: { - for( auto &target : m_targets ) { - auto *targettrack = static_cast( std::get( target ) ); - if( targettrack == nullptr ) { continue; } - // event effect code - targettrack->Switch( - m_switchstate, - m_switchmoverate, - m_switchmovedelay ); - } - if( Global.iMultiplayer ) { - // dajemy znać do serwera o przełożeniu - multiplayer::WyslijEvent( asName, "" ); // wysłanie nazwy eventu przełączajacego - } - // Ra: bardziej by się przydała nazwa toru, ale nie ma do niej stąd dostępu - break; - } - case tp_TrackVel: { - WriteLog( "Type: TrackVel - [" + to_string( m_velocity, 2 ) + "]" ); - for( auto &target : m_targets ) { - auto *targettrack = static_cast( std::get( target ) ); - if( targettrack == nullptr ) { continue; } - // event effect code - targettrack->VelocitySet( m_velocity ); - if( DebugModeFlag ) { - WriteLog( "actual track velocity for " + targettrack->name() + " [" + to_string( targettrack->VelocityGet(), 2 ) + "]" ); - } - } - break; - } - case tp_Multiple: { - auto const condition { test_condition() }; - if( ( true == condition ) - || ( true == m_condition.has_else ) ) { - // warunek spelniony albo było użyte else - WriteLog("Type: Multi-event"); - for( auto &childevent : m_children ) { - auto *childeventdata { std::get( childevent ) }; - if( childeventdata == nullptr ) { continue; } - if( std::get( childevent ) != condition ) { continue; } - - if( childeventdata != this ) { - // normalnie dodać - simulation::Events.AddToQuery( childeventdata, Activator ); - } - else { - // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania - if( fDelay >= 5.0 ) { - simulation::Events.AddToQuery( this, Activator ); - } - } - } - if( Global.iMultiplayer ) { - // dajemy znać do serwera o wykonaniu - if( false == m_condition.has_else ) { - // jednoznaczne tylko, gdy nie było else - if( Activator ) { - multiplayer::WyslijEvent( asName, Activator->name() ); - } - else { - multiplayer::WyslijEvent( asName, "" ); - } - } - } - } - break; - } - case tp_WhoIs: { - for( auto &target : m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { continue; } - // event effect code - if( m_update.flags & update_load ) { - // jeśli pytanie o ładunek - if( m_update.flags & update_memadd ) { - // jeśli typ pojazdu - // TODO: define and recognize individual request types - auto const owner = ( - ( ( Activator->Mechanik != nullptr ) && ( Activator->Mechanik->Primary() ) ) ? - Activator->Mechanik : - Activator->ctOwner ); - auto const consistbrakelevel = ( - owner != nullptr ? - owner->fReady : - -1.0 ); - auto const collisiondistance = ( - owner != nullptr ? - owner->TrackBlock() : - -1.0 ); - - targetcell->UpdateValues( - Activator->MoverParameters->TypeName, // typ pojazdu - consistbrakelevel, - collisiondistance, - m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); - - WriteLog( - "Type: WhoIs (" + to_string( m_update.flags ) + ") - " - + "[name: " + Activator->MoverParameters->TypeName + "], " - + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " - + "[obstacle distance: " + to_string( collisiondistance, 2 ) + " m]" ); - } - else { - // jeśli parametry ładunku - targetcell->UpdateValues( - Activator->MoverParameters->LoadType, // nazwa ładunku - Activator->MoverParameters->Load, // aktualna ilość - Activator->MoverParameters->MaxLoad, // maksymalna ilość - m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); - - WriteLog( - "Type: WhoIs (" + to_string( m_update.flags ) + ") - " - + "[load type: " + Activator->MoverParameters->LoadType + "], " - + "[current load: " + to_string( Activator->MoverParameters->Load, 2 ) + "], " - + "[max load: " + to_string( Activator->MoverParameters->MaxLoad, 2 ) + "]" ); - } - } - else if( m_update.flags & update_memadd ) { // jeśli miejsce docelowe pojazdu - targetcell->UpdateValues( - Activator->asDestination, // adres docelowy - Activator->DirectionGet(), // kierunek pojazdu względem czoła składu (1=zgodny,-1=przeciwny) - Activator->MoverParameters->Power, // moc pojazdu silnikowego: 0 dla wagonu - m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ); - - WriteLog( - "Type: WhoIs (" + to_string( m_update.flags ) + ") - " - + "[destination: " + Activator->asDestination + "], " - + "[direction: " + to_string( Activator->DirectionGet() ) + "], " - + "[engine power: " + to_string( Activator->MoverParameters->Power, 2 ) + "]" ); - } - else if( Activator->Mechanik ) { - if( Activator->Mechanik->Primary() ) { // tylko jeśli ktoś tam siedzi - nie powinno dotyczyć pasażera! - targetcell->UpdateValues( - Activator->Mechanik->TrainName(), - Activator->Mechanik->StationCount() - Activator->Mechanik->StationIndex(), // ile przystanków do końca - Activator->Mechanik->IsStop() ? - 1 : - 0, // 1, gdy ma tu zatrzymanie - m_update.flags ); - WriteLog( "Train detected: " + Activator->Mechanik->TrainName() ); - } - } - } - break; - } - case tp_LogValues: { // zapisanie zawartości komórki pamięci do logu - if( m_targets.empty() ) { - // lista wszystkich - simulation::Memory.log_all(); - } - else { - // jeśli była podana nazwa komórki - for( auto &target : m_targets ) { - auto *targetcell = static_cast( std::get( target ) ); - if( targetcell == nullptr ) { continue; } - WriteLog( "Memcell \"" + targetcell->name() + "\": [" - + targetcell->Text() + "] [" - + to_string( targetcell->Value1(), 2 ) + "] [" - + to_string( targetcell->Value2(), 2 ) + "]" ); - } - } - break; - } - case tp_Voltage: { // zmiana napięcia w zasilaczu (TractionPowerSource) - WriteLog( "Type: Voltage [" + to_string( m_voltage, 2 ) + "]" ); - for( auto &target : m_targets ) { - auto *targetpowersource = static_cast( std::get( target ) ); - if( targetpowersource == nullptr ) { continue; } - targetpowersource->VoltageSet( m_voltage ); - } - break; - } - case tp_Friction: { // zmiana tarcia na scenerii - // na razie takie chamskie ustawienie napięcia zasilania - WriteLog("Type: Friction"); - Global.fFriction = (m_friction); - break; - } - case tp_Message: { // wyświetlenie komunikatu - break; - } - } // switch (tmpEvent->Type) -} - -void -TEvent::init_conditions() { - - m_condition.tracks.clear(); - - if( m_condition.flags & ( conditional_trackoccupied | conditional_trackfree ) ) { - for( auto &target : m_targets ) { - m_condition.tracks.emplace_back( simulation::Paths.find( std::get( target ) ) ); - if( m_condition.tracks.back() == nullptr ) { -// m_ignored = true; // deaktywacja - ErrorLog( "Bad event: track \"" + std::get( target ) + "\" referenced in event \"" + asName + "\" doesn't exist" ); - m_condition.flags &= ~( conditional_trackoccupied | conditional_trackfree ); // zerowanie flag - } - } - } -} - -void -TEvent::condition_data::load( cParser &Input ) -{ // przetwarzanie warunków, wspólne dla Multiple i UpdateValues +basic_event::event_conditions::deserialize( cParser &Input ) { // przetwarzanie warunków, wspólne dla Multiple i UpdateValues std::string token; while( ( true == Input.getTokens() ) && ( false == ( token = Input.peek() ).empty() ) - && ( token != "endevent" ) - && ( token != "randomdelay" ) ) { + && ( false == basic_event::is_keyword( token ) ) ) { if( token == "trackoccupied" ) { - flags |= conditional_trackoccupied; + flags |= flags::track_busy; } else if( token == "trackfree" ) { - flags |= conditional_trackfree; + flags |= flags::track_free; } else if( token == "propability" ) { - flags |= conditional_propability; + flags |= flags::probability; Input.getTokens(); Input >> probability; } @@ -1156,69 +157,115 @@ TEvent::condition_data::load( cParser &Input ) if( Input.peek() != "*" ) //"*" - nie brac command pod uwage { // zapamiętanie łańcucha do porównania Input >> match_text; - flags |= conditional_memstring; + flags |= flags::text; } Input.getTokens(); if( Input.peek() != "*" ) //"*" - nie brac val1 pod uwage { Input >> match_value_1; - flags |= conditional_memval1; + flags |= flags::value_1; } Input.getTokens(); if( Input.peek() != "*" ) //"*" - nie brac val2 pod uwage { Input >> match_value_2; - flags |= conditional_memval2; + flags |= flags::value_2; } } } } -void TEvent::load_targets( std::string const &Input ) { - - cParser targetparser{ Input }; - std::string target; - while( false == ( target = targetparser.getToken( true, "|," ) ).empty() ) { - // actual bindings to targets of proper type are created during scenario initialization - if( target != "none" ) { - // sound objects don't inherit from scene node, so we can't use the same container - // TODO: fix this, having sounds as scene nodes (or a node wrapper for one) might have benefits elsewhere - if( Type != tp_Sound ) { - m_targets.emplace_back( target, nullptr ); - } - else { - m_sounds.emplace_back( target, nullptr ); - } - } - } -} - -std::string -TEvent::type_to_string() const { - - std::vector const types { - "unknown", "sound", "animation", "lights", "updatevalues", - "getvalues", "putvalues", "switch", "trackvel", "multiple", - "addvalues", "copyvalues", "whois", "logvalues", "visible", - "voltage", "message", "friction" }; - - return types[ Type ]; -} - // sends basic content of the class in legacy (text) format to provided stream void -TEvent::export_as_text( std::ostream &Output ) const { +basic_event::event_conditions::export_as_text( std::ostream &Output ) const { - if( Type == tp_Unknown ) { return; } + if( flags != 0 ) { + Output << "condition "; + if( ( flags & flags::track_busy ) != 0 ) { + Output << "trackoccupied "; + } + if( ( flags & flags::track_free ) != 0 ) { + Output << "trackfree "; + } + if( ( flags & flags::probability ) != 0 ) { + Output + << "propability " + << probability << ' '; + } + if( ( flags & ( flags::text | flags::value_1 | flags::value_2 ) ) != 0 ) { + Output + << "memcompare " + << ( ( flags & flags::text ) == 0 ? "*" : match_text ) << ' ' + << ( ( flags & flags::value_1 ) == 0 ? "*" : to_string( match_value_1 ) ) << ' ' + << ( ( flags & flags::value_2 ) == 0 ? "*" : to_string( match_value_2 ) ) << ' '; + } + } +} +basic_event::~basic_event() { + + m_sibling = nullptr; // nie usuwać podczepionych tutaj +} + +void +basic_event::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) { + + std::string token; + + Input.getTokens(); + Input >> m_delay; + + Input.getTokens(); + Input >> token; + deserialize_targets( token ); + + if (m_name.substr(0, 5) == "none_") + m_ignored = true; // Ra: takie są ignorowane + + deserialize_( Input, Scratchpad ); + // subclass method is expected to leave next token past its own data preloaded on its exit + while( ( false == ( token = Input.peek() ).empty() ) + && ( token != "endevent" ) ) { + + if( token == "randomdelay" ) { // losowe opóźnienie + Input.getTokens(); + Input >> m_delayrandom; // Ra 2014-03-11 + } + Input.getTokens(); + } +} + +void +basic_event::deserialize_targets( std::string const &Input ) { + + cParser targetparser { Input }; + std::string target; + while( false == ( target = targetparser.getToken( true, "|," ) ).empty() ) { + // actual bindings to targets of proper type are created during scenario initialization + if( target != "none" ) { + m_targets.emplace_back( target, nullptr ); + } + } +} + +void +basic_event::run() { + + WriteLog( "EVENT LAUNCHED" + ( m_activator ? ( " by " + m_activator->asName ) : "" ) + ": " + m_name ); + run_(); +} + +// sends basic content of the class in legacy (text) format to provided stream +void +basic_event::export_as_text( std::ostream &Output ) const { // header Output << "event "; // name - Output << asName << ' '; + Output << m_name << ' '; // type - Output << type_to_string() << ' '; + Output << type() << ' '; // delay - Output << fDelay << ' '; + Output << m_delay << ' '; // target node(s) if( m_targets.empty() ) { Output << "none"; @@ -1233,160 +280,12 @@ TEvent::export_as_text( std::ostream &Output ) const { } } // type-specific attributes - switch( Type ) { - case tp_AddValues: - case tp_UpdateValues: { - Output - << ( ( m_update.flags & update_memstring ) == 0 ? "*" : m_update.data_text ) << ' ' - << ( ( m_update.flags & update_memval1 ) == 0 ? "*" : to_string( m_update.data_value_1 ) ) << ' ' - << ( ( m_update.flags & update_memval2 ) == 0 ? "*" : to_string( m_update.data_value_2 ) ) << ' '; - break; - } - case tp_CopyValues: { - auto const *datasource = static_cast( std::get( m_update.data_source ) ); - Output - << ( datasource != nullptr ? - datasource->name() : - std::get( m_update.data_source ) ) - << ' ' << ( m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ) << ' '; - break; - } - case tp_PutValues: { - Output - // location - << m_update.location.x << ' ' - << m_update.location.y << ' ' - << m_update.location.z << ' ' - // command - << m_update.data_text << ' ' - << m_update.data_value_1 << ' ' - << m_update.data_value_2 << ' '; - break; - } - case tp_Multiple: { - for( auto const &childevent : m_children ) { - if( true == std::get( childevent ) ) { - auto *childeventdata { std::get( childevent ) }; - Output - << ( childeventdata != nullptr ? - childeventdata->asName : - std::get( childevent ) ) - << ' '; - } - } - // optional 'else' block - if( false == m_condition.has_else ) { break; } - Output << "else "; - for( auto const &childevent : m_children ) { - if( false == std::get( childevent ) ) { - auto *childeventdata { std::get( childevent ) }; - Output - << ( childeventdata != nullptr ? - childeventdata->asName : - std::get( childevent ) ) - << ' '; - } - } - break; - } - case tp_Visible: { - Output << ( m_visible ? 1 : 0 ) << ' '; - break; - } - case tp_Switch: { - Output << m_switchstate << ' '; - if( ( m_switchmoverate < 0.f ) - || ( m_switchmovedelay < 0.f ) ) { - Output << m_switchmoverate << ' '; - } - if( m_switchmovedelay < 0.f ) { - Output << m_switchmovedelay << ' '; - } - break; - } - case tp_Lights: { - auto lightidx { 0 }; - while( ( lightidx < iMaxNumLights ) - && ( m_lights[ lightidx ] > -2.0 ) ) { - Output << m_lights[ lightidx ] << ' '; - ++lightidx; - } - break; - } - case tp_Animation: { - // animation type - Output << ( - m_animationtype == 1 ? "rotate" : - m_animationtype == 2 ? "translate" : - m_animationtype == 4 ? m_animationfilename : - m_animationtype == 8 ? "digital" : - "none" ) - << ' '; - // submodel - Output << m_animationsubmodel << ' '; - // animation parameters - Output - << m_animationparams[0] << ' ' - << m_animationparams[1] << ' ' - << m_animationparams[2] << ' ' - << m_animationparams[3] << ' '; - break; - } - case tp_Sound: { - // playback mode - Output << m_soundmode << ' '; - // optional radio channel - if( m_soundradiochannel > 0 ) { - Output << m_soundradiochannel << ' '; - } - break; - } - case tp_TrackVel: - Output << m_velocity << ' '; - break; - case tp_Voltage: - Output << m_voltage << ' '; - break; - case tp_Friction: { - Output << m_friction << ' '; - break; - } - case tp_WhoIs: { - Output - << ( m_update.flags & ( update_memstring | update_memval1 | update_memval2 ) ) << ' '; - break; - } - default: { - break; - } - } - // optional conditions - // NOTE: for flexibility condition check and export is performed for all event types rather than only for these which support it currently - if( m_condition.flags != 0 ) { - Output << "condition "; - if( ( m_condition.flags & conditional_trackoccupied ) != 0 ) { - Output << "trackoccupied "; - } - if( ( m_condition.flags & conditional_trackfree ) != 0 ) { - Output << "trackfree "; - } - if( ( m_condition.flags & conditional_propability ) != 0 ) { - Output - << "propability " - << m_condition.probability << ' '; - } - if( ( m_condition.flags & ( conditional_memstring | conditional_memval1 | conditional_memval2 ) ) != 0 ) { - Output - << "memcompare " - << ( ( m_condition.flags & conditional_memstring ) == 0 ? "*" : m_condition.match_text ) << ' ' - << ( ( m_condition.flags & conditional_memval1 ) == 0 ? "*" : to_string( m_condition.match_value_1 ) ) << ' ' - << ( ( m_condition.flags & conditional_memval2 ) == 0 ? "*" : to_string( m_condition.match_value_2 ) ) << ' '; - } - } - if( fRandomDelay != 0.0 ) { + export_as_text_( Output ); + + if( m_delayrandom != 0.0 ) { Output << "randomdelay " - << fRandomDelay << ' '; + << m_delayrandom << ' '; } // footer Output @@ -1394,113 +293,1612 @@ TEvent::export_as_text( std::ostream &Output ) const { << "\n"; } -void TEvent::AddToQuery( TEvent *Event, TEvent *&Start ) { - - TEvent *target( Start ); - TEvent *previous( nullptr ); - while( ( Event->fStartTime >= target->fStartTime ) - && ( target->evNext != nullptr ) ) { - previous = target; - target = target->evNext; - } - // the new event will be either before or after the one we located - if( Event->fStartTime >= target->fStartTime ) { - assert( target->evNext == nullptr ); - target->evNext = Event; - // if we have resurrected event land at the end of list, the link from previous run could potentially "add" unwanted events to the queue - Event->evNext = nullptr; - } +void +basic_event::append( basic_event *Event ) { + // doczepienie kolejnych z tą samą nazwą + // TODO: remove recursion + if( m_sibling ) + m_sibling->append( Event ); // rekurencja! - góra kilkanaście eventów będzie potrzebne else { - if( previous != nullptr ) { - previous->evNext = Event; - Event->evNext = target; - } - else { - // special case, we're inserting our event before the provided start point - Event->evNext = Start; - Start = Event; - } + m_sibling = Event; + Event->m_passive = false; // ten doczepiony może być tylko kolejkowany } +}; + +// returns: true if the event should be executed immediately +bool +basic_event::is_instant() const { + + return false; } -//--------------------------------------------------------------------------- +// sends content of associated data cell to specified vehicle controller +void +basic_event::send_command( TController &Controller ) { -std::string TEvent::CommandGet() const -{ // odczytanie komendy z eventu - switch (Type) - { // to się wykonuje również składu jadącego bez obsługi - case tp_GetValues: - return m_update.data_cell()->Text(); - case tp_PutValues: - return m_update.data_text; - } - return ""; // inne eventy się nie liczą -}; + return; +} -TCommandType TEvent::Command() const -{ // odczytanie komendy z eventu - switch (Type) - { // to się wykonuje również dla składu jadącego bez obsługi - case tp_GetValues: - return m_update.data_cell()->Command(); - case tp_PutValues: - return m_update.command_type; // komenda zakodowana binarnie - } - return TCommandType::cm_Unknown; // inne eventy się nie liczą -}; - -double TEvent::ValueGet(int n) const -{ // odczytanie komendy z eventu - n &= 1; // tylko 1 albo 2 jest prawidłowy - switch (Type) - { // to się wykonuje również składu jadącego bez obsługi - case tp_GetValues: - return ( n ? m_update.data_cell()->Value1() : m_update.data_cell()->Value2() ); - case tp_PutValues: - return ( n ? m_update.data_value_1 : m_update.data_value_2 ); - } - return 0.0; // inne eventy się nie liczą -}; - -glm::dvec3 TEvent::PositionGet() const -{ // pobranie współrzędnych eventu - switch (Type) - { // - case tp_GetValues: - return m_update.data_cell()->location(); // współrzędne podłączonej komórki pamięci - case tp_PutValues: - return m_update.location; - } - return glm::dvec3(0, 0, 0); // inne eventy się nie liczą -}; - -bool TEvent::StopCommand() const -{ // - if (Type == tp_GetValues) - return m_update.data_cell()->StopCommand(); // info o komendzie z komórki +// returns: true if associated data cell contains a command for vehicle controller +bool +basic_event::is_command() const { return false; }; -void TEvent::StopCommandSent() -{ - if (Type == tp_GetValues) - m_update.data_cell()->StopCommandSent(); // komenda z komórki została wysłana +std::string +basic_event::input_text() const { + // odczytanie komendy z eventu + return ""; }; -void TEvent::Append(TEvent *e) -{ // doczepienie kolejnych z tą samą nazwą - if (evJoined) - evJoined->Append(e); // rekurencja! - góra kilkanaście eventów będzie potrzebne - else - { - evJoined = e; - e->bEnabled = true; // ten doczepiony może być tylko kolejkowany +TCommandType +basic_event::input_command() const { + // odczytanie komendy z eventu + return TCommandType::cm_Unknown; +}; + +double +basic_event::input_value( int Index ) const { + // odczytanie komendy z eventu + return 0.0; +}; + +glm::dvec3 +basic_event::input_location() const { + // pobranie współrzędnych eventu + return glm::dvec3( 0, 0, 0 ); +}; + +bool +basic_event::is_keyword( std::string const &Token ) { + + return ( Token == "endevent" ) + || ( Token == "randomdelay" ); +} + + + +TMemCell const * +input_event::input_data::data_cell() const { + + return static_cast( std::get( data_source ) ); +} +TMemCell * +input_event::input_data::data_cell() { + + return static_cast( std::get( data_source ) ); +} + + + +// prepares event for use +void +updatevalues_event::init() { + // sumowanie wartości // zmiana wartości + init_targets( simulation::Memory, "memory cell" ); + // conditional data + m_conditions.bind( &m_targets ); + m_conditions.init(); +} + +// event type string +std::string +updatevalues_event::type() const { + + return ( + ( m_input.flags & flags::mode_add ) == 0 ? + "updatevalues" : + "addvalues" ); +} + +// deserialize() subclass details +void +updatevalues_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + Input.getTokens( 1, false ); // case sensitive + Input >> m_input.data_text; + if( m_input.data_text != "*" ) { //"*" - nie brac command pod uwage + m_input.flags |= flags::text; } -}; + Input.getTokens(); + if( Input.peek() != "*" ) { //"*" - nie brac val1 pod uwage + Input >> m_input.data_value_1; + m_input.flags |= flags::value_1; + } + Input.getTokens(); + if( Input.peek() != "*" ) { //"*" - nie brac val2 pod uwage + Input >> m_input.data_value_2; + m_input.flags |= flags::value_2; + } + Input.getTokens(); + // optional blocks + std::string token; + while( ( false == ( token = Input.peek() ).empty() ) + && ( false == is_keyword( token ) ) ) { + + if( token == "condition" ) { + m_conditions.deserialize( Input ); + // NOTE: condition deserialization leaves preloaded next token + } + } +} + +// run() subclass details +// TODO: update and copy values run_ methods are largely identical, refactor to a single helper +void +updatevalues_event::run_() { + + if( false == m_conditions.test() ) { return; } + + WriteLog( "Type: " + std::string( ( m_input.flags & flags::mode_add ) ? "AddValues" : "UpdateValues" ) + " & Track command - [" + + ( ( m_input.flags & flags::text ) ? m_input.data_text : "X" ) + "] [" + + ( ( m_input.flags & flags::value_1 ) ? to_string( m_input.data_value_1, 2 ) : "X" ) + "] [" + + ( ( m_input.flags & flags::value_2 ) ? to_string( m_input.data_value_2, 2 ) : "X" ) + "]" ); + // TODO: dump status of target cells after the operation + for( auto &target : m_targets ) { + auto *targetcell { static_cast( std::get( target ) ) }; + if( targetcell == nullptr ) { continue; } + targetcell->UpdateValues( + m_input.data_text, + m_input.data_value_1, + m_input.data_value_2, + m_input.flags ); + if( targetcell->Track == nullptr ) { continue; } + // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze + auto const location { targetcell->location() }; + for( auto dynamic : targetcell->Track->Dynamics ) { + targetcell->PutCommand( + dynamic->Mechanik, + &location ); + } + } +} + +// export_as_text() subclass details +void +updatevalues_event::export_as_text_( std::ostream &Output ) const { + + Output + << ( ( m_input.flags & flags::text ) == 0 ? "*" : m_input.data_text ) << ' ' + << ( ( m_input.flags & flags::value_1 ) == 0 ? "*" : to_string( m_input.data_value_1 ) ) << ' ' + << ( ( m_input.flags & flags::value_2 ) == 0 ? "*" : to_string( m_input.data_value_2 ) ) << ' '; + + m_conditions.export_as_text( Output ); +} + +// returns: true if the event should be executed immediately +bool +updatevalues_event::is_instant() const { + + return ( ( ( m_input.flags & flags::mode_add ) != 0 ) && ( m_delay == 0.0 ) ); +} +// prepares event for use +void +getvalues_event::init() { + + init_targets( simulation::Memory, "memory cell" ); + // custom target initialization code + for( auto &target : m_targets ) { + auto *targetcell { static_cast( std::get( target ) ) }; + if( targetcell == nullptr ) { continue; } + if( targetcell->IsVelocity() ) { + // jeśli odczyt komórki a komórka zawiera komendę SetVelocity albo ShuntVelocity + // to event nie będzie dodawany do kolejki + m_passive = true; + } + } + // NOTE: GetValues retrieves data only from first specified memory cell + // TBD, TODO: allow retrieval from more than one cell? + m_input.data_source = m_targets.front(); +} + +// event type string +std::string +getvalues_event::type() const { + + return "getvalues"; +} + +// deserialize() subclass details +void +getvalues_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + // nothing to do here, just preload next token + Input.getTokens(); +} + +// run() subclass details +void +getvalues_event::run_() { + + WriteLog( "Type: GetValues" ); + + if( m_activator == nullptr ) { return; } + + m_input.data_cell()->PutCommand( + m_activator->Mechanik, + &( m_input.data_cell()->location() ) ); + + // potwierdzenie wykonania dla serwera (odczyt semafora już tak nie działa) + if( Global.iMultiplayer ) { + multiplayer::WyslijEvent( m_name, m_activator->name() ); + } +} + +// export_as_text() subclass details +void +getvalues_event::export_as_text_( std::ostream &Output ) const { + // nothing to do here +} + +// sends content of associated data cell to specified vehicle controller +void +getvalues_event::send_command( TController &Controller ) { + + Controller.PutCommand( input_text(), input_value( 1 ), input_value( 2 ), nullptr ); + m_input.data_cell()->StopCommandSent(); // komenda z komórki została wysłana +} +// returns: true if associated data cell contains a command for vehicle controller +bool +getvalues_event::is_command() const { + // info o komendzie z komórki + return m_input.data_cell()->StopCommand(); +} + +// input data access +std::string +getvalues_event::input_text() const { + + return m_input.data_cell()->Text(); +} + +TCommandType +getvalues_event::input_command() const { + + return m_input.data_cell()->Command(); +} + +double +getvalues_event::input_value( int Index ) const { + + Index &= 1; // tylko 1 albo 2 jest prawidłowy + return ( Index == 1 ? m_input.data_cell()->Value1() : m_input.data_cell()->Value2() ); +} + +glm::dvec3 +getvalues_event::input_location() const { + + return m_input.data_cell()->location(); // współrzędne podłączonej komórki pamięci +} + + + +// prepares event for use +void +putvalues_event::init() { + // nothing to do here +} + +// event type string +std::string +putvalues_event::type() const { + + return "putvalues"; +} + +// deserialize() subclass details +void +putvalues_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + Input.getTokens( 3 ); + // location, previously held in param 3, 4, 5 + Input + >> m_input.location.x + >> m_input.location.y + >> m_input.location.z; + // przesunięcie + // tmp->pCenter.RotateY(aRotate.y/180.0*M_PI); //Ra 2014-11: uwzględnienie rotacji + // TBD, TODO: take into account rotation as well? + if( false == Scratchpad.location.offset.empty() ) { + m_input.location += Scratchpad.location.offset.top(); + } + + std::string token; + Input.getTokens( 1, false ); // komendy 'case sensitive' + Input >> token; + // command type, previously held in param 6 + if( token.substr( 0, 19 ) == "PassengerStopPoint:" ) { + if( token.find( '#' ) != std::string::npos ) + token.erase( token.find( '#' ) ); // obcięcie unikatowości + win1250_to_ascii( token ); // get rid of non-ascii chars + m_input.command_type = TCommandType::cm_PassengerStopPoint; + // nie do kolejki (dla SetVelocity też, ale jak jest do toru dowiązany) + m_passive = true; + } + else if( token == "SetVelocity" ) { + m_input.command_type = TCommandType::cm_SetVelocity; + m_passive = true; + } + else if( token == "RoadVelocity" ) { + m_input.command_type = TCommandType::cm_RoadVelocity; + m_passive = true; + } + else if( token == "SectionVelocity" ) { + m_input.command_type = TCommandType::cm_SectionVelocity; + m_passive = true; + } + else if( token == "ShuntVelocity" ) { + m_input.command_type = TCommandType::cm_ShuntVelocity; + m_passive = true; + } + else if( token == "OutsideStation" ) { + m_input.command_type = TCommandType::cm_OutsideStation; + m_passive = true; // ma być skanowny, aby AI nie przekraczało W5 + } + else { + m_input.command_type = TCommandType::cm_Unknown; + } + // update data, previously stored in params 0, 1, 2 + m_input.data_text = token; + Input.getTokens(); + if( Input.peek() != "none" ) { + Input >> m_input.data_value_1; + } + Input.getTokens(); + if( Input.peek() != "none" ) { + Input >> m_input.data_value_2; + } + // preload next token + Input.getTokens(); +} + +// run() subclass details +void +putvalues_event::run_() { + + WriteLog( + "Type: PutValues - [" + + m_input.data_text + "] [" + + to_string( m_input.data_value_1, 2 ) + "] [" + + to_string( m_input.data_value_2, 2 ) + "]" ); + + if( m_activator == nullptr ) { return; } + // zamiana, bo fizyka ma inaczej niż sceneria + // NOTE: y & z swap, negative x + TLocation const loc { + -m_input.location.x, + m_input.location.z, + m_input.location.y }; + + if( m_activator->Mechanik ) { + // przekazanie rozkazu do AI + m_activator->Mechanik->PutCommand( + m_input.data_text, + m_input.data_value_1, + m_input.data_value_2, + loc ); + } + else { + // przekazanie do pojazdu + m_activator->MoverParameters->PutCommand( + m_input.data_text, + m_input.data_value_1, + m_input.data_value_2, + loc ); + } +} + +// export_as_text() subclass details +void +putvalues_event::export_as_text_( std::ostream &Output ) const { + + Output + // location + << m_input.location.x << ' ' + << m_input.location.y << ' ' + << m_input.location.z << ' ' + // command + << m_input.data_text << ' ' + << m_input.data_value_1 << ' ' + << m_input.data_value_2 << ' '; +} + +// input data access +std::string +putvalues_event::input_text() const { + + return m_input.data_text; +} + +TCommandType +putvalues_event::input_command() const { + + return m_input.command_type; // komenda zakodowana binarnie +} + +double +putvalues_event::input_value( int Index ) const { + + Index &= 1; // tylko 1 albo 2 jest prawidłowy + return ( Index == 1 ? m_input.data_value_1 : m_input.data_value_2 ); +} + +glm::dvec3 +putvalues_event::input_location() const { + + return m_input.location; +} + + + +// prepares event for use +void +copyvalues_event::init() { + // skopiowanie komórki do innej + init_targets( simulation::Memory, "memory cell" ); + // source cell + std::get( m_input.data_source ) = simulation::Memory.find( std::get( m_input.data_source ) ); + if( std::get( m_input.data_source ) == nullptr ) { + m_ignored = true; // deaktywacja + ErrorLog( "Bad event: copyvalues event \"" + m_name + "\" cannot find memcell \"" + std::get( m_input.data_source ) + "\"" ); + } +} + +// event type string +std::string +copyvalues_event::type() const { + + return "copyvalues"; +} + +// deserialize() subclass details +void +copyvalues_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + m_input.flags = ( flags::text | flags::value_1 | flags::value_2 ); // normalnie trzy + + std::string token; + int paramidx { 0 }; + + while( ( true == Input.getTokens() ) + && ( false == ( token = Input.peek() ).empty() ) + && ( false == is_keyword( token ) ) ) { + + Input >> token; + switch( ++paramidx ) { + case 1: { // nazwa drugiej komórki (źródłowej) // previously stored in param 9 + std::get( m_input.data_source ) = token; + break; + } + case 2: { // maska wartości + m_input.flags = stol_def( token, ( flags::text | flags::value_1 | flags::value_2 ) ); + break; + } + default: { + break; + } + } + } +} + +// run() subclass details +// TODO: update and copy values run_ methods are largely identical, refactor to a single helper +void +copyvalues_event::run_() { + // skopiowanie wartości z innej komórki + auto const *datasource { static_cast( std::get( m_input.data_source ) ) }; + m_input.data_text = datasource->Text(); + m_input.data_value_1 = datasource->Value1(); + m_input.data_value_2 = datasource->Value2(); + + WriteLog( "Type: CopyValues - [" + + ( ( m_input.flags & flags::text ) ? m_input.data_text : "X" ) + "] [" + + ( ( m_input.flags & flags::value_1 ) ? to_string( m_input.data_value_1, 2 ) : "X" ) + "] [" + + ( ( m_input.flags & flags::value_2 ) ? to_string( m_input.data_value_2, 2 ) : "X" ) + "]" ); + // TODO: dump status of target cells after the operation + for( auto &target : m_targets ) { + auto *targetcell { static_cast( std::get( target ) ) }; + if( targetcell == nullptr ) { continue; } + targetcell->UpdateValues( + m_input.data_text, + m_input.data_value_1, + m_input.data_value_2, + m_input.flags ); + if( targetcell->Track == nullptr ) { continue; } + // McZapkie-100302 - updatevalues oprocz zmiany wartosci robi putcommand dla wszystkich 'dynamic' na danym torze + auto const location { targetcell->location() }; + for( auto dynamic : targetcell->Track->Dynamics ) { + targetcell->PutCommand( + dynamic->Mechanik, + &location ); + } + } +} + +// export_as_text() subclass details +void +copyvalues_event::export_as_text_( std::ostream &Output ) const { + + auto const *datasource { static_cast( std::get( m_input.data_source ) ) }; + Output + << ( datasource != nullptr ? + datasource->name() : + std::get( m_input.data_source ) ) + << ' ' << ( m_input.flags & ( flags::text | flags::value_1 | flags::value_2 ) ) << ' '; +} + + + +// prepares event for use +void +whois_event::init() { + + init_targets( simulation::Memory, "memory cell" ); +} + +// event type string +std::string +whois_event::type() const { + + return "whois"; +} + +// deserialize() subclass details +void +whois_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + m_input.flags = ( flags::text | flags::value_1 | flags::value_2 ); // normalnie trzy + + std::string token; + int paramidx { 0 }; + + while( ( true == Input.getTokens() ) + && ( false == ( token = Input.peek() ).empty() ) + && ( false == is_keyword( token ) ) ) { + + Input >> token; + switch( ++paramidx ) { + case 1: { // maska wartości + m_input.flags = stol_def( token, ( flags::text | flags::value_1 | flags::value_2 ) ); + break; + } + default: { + break; + } + } + } +} + +// run() subclass details +void +whois_event::run_() { + + for( auto &target : m_targets ) { + auto *targetcell { static_cast( std::get( target ) ) }; + if( targetcell == nullptr ) { continue; } + // event effect code + if( m_input.flags & flags::load ) { + // jeśli pytanie o ładunek + if( m_input.flags & flags::mode_add ) { + // jeśli typ pojazdu + // TODO: define and recognize individual request types + auto const owner { ( + ( ( m_activator->Mechanik != nullptr ) && ( m_activator->Mechanik->Primary() ) ) ? + m_activator->Mechanik : + m_activator->ctOwner ) }; + auto const consistbrakelevel { ( + owner != nullptr ? + owner->fReady : + -1.0 ) }; + auto const collisiondistance { ( + owner != nullptr ? + owner->TrackBlock() : + -1.0 ) }; + + targetcell->UpdateValues( + m_activator->MoverParameters->TypeName, // typ pojazdu + consistbrakelevel, + collisiondistance, + m_input.flags & ( flags::text | flags::value_1 | flags::value_2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_input.flags ) + ") - " + + "[name: " + m_activator->MoverParameters->TypeName + "], " + + "[consist brake level: " + to_string( consistbrakelevel, 2 ) + "], " + + "[obstacle distance: " + to_string( collisiondistance, 2 ) + " m]" ); + } + else { + // jeśli parametry ładunku + targetcell->UpdateValues( + m_activator->MoverParameters->LoadType, // nazwa ładunku + m_activator->MoverParameters->Load, // aktualna ilość + m_activator->MoverParameters->MaxLoad, // maksymalna ilość + m_input.flags & ( flags::text | flags::value_1 | flags::value_2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_input.flags ) + ") - " + + "[load type: " + m_activator->MoverParameters->LoadType + "], " + + "[current load: " + to_string( m_activator->MoverParameters->Load, 2 ) + "], " + + "[max load: " + to_string( m_activator->MoverParameters->MaxLoad, 2 ) + "]" ); + } + } + else if( m_input.flags & flags::mode_add ) { // jeśli miejsce docelowe pojazdu + targetcell->UpdateValues( + m_activator->asDestination, // adres docelowy + m_activator->DirectionGet(), // kierunek pojazdu względem czoła składu (1=zgodny,-1=przeciwny) + m_activator->MoverParameters->Power, // moc pojazdu silnikowego: 0 dla wagonu + m_input.flags & ( flags::text | flags::value_1 | flags::value_2 ) ); + + WriteLog( + "Type: WhoIs (" + to_string( m_input.flags ) + ") - " + + "[destination: " + m_activator->asDestination + "], " + + "[direction: " + to_string( m_activator->DirectionGet() ) + "], " + + "[engine power: " + to_string( m_activator->MoverParameters->Power, 2 ) + "]" ); + } + else if( m_activator->Mechanik ) { + if( m_activator->Mechanik->Primary() ) { // tylko jeśli ktoś tam siedzi - nie powinno dotyczyć pasażera! + targetcell->UpdateValues( + m_activator->Mechanik->TrainName(), + m_activator->Mechanik->StationCount() - m_activator->Mechanik->StationIndex(), // ile przystanków do końca + m_activator->Mechanik->IsStop() ? + 1 : + 0, // 1, gdy ma tu zatrzymanie + m_input.flags ); + WriteLog( "Train detected: " + m_activator->Mechanik->TrainName() ); + } + } + } +} + +// export_as_text() subclass details +void +whois_event::export_as_text_( std::ostream &Output ) const { + + Output << ( m_input.flags & ( flags::text | flags::value_1 | flags::value_2 ) ) << ' '; +} + + + +// prepares event for use +void +logvalues_event::init() { + + init_targets( simulation::Memory, "memory cell" ); +} + +// event type string +std::string +logvalues_event::type() const { + + return "logvalues"; +} + +// deserialize() subclass details +void +logvalues_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + // nothing to do here, just preload next token + Input.getTokens(); +} + +// run() subclass details +void +logvalues_event::run_() { + // zapisanie zawartości komórki pamięci do logu + if( m_targets.empty() ) { + // lista wszystkich + simulation::Memory.log_all(); + } + else { + // jeśli była podana nazwa komórki + for( auto &target : m_targets ) { + auto *targetcell { static_cast( std::get( target ) ) }; + if( targetcell == nullptr ) { continue; } + WriteLog( + "Memcell \"" + targetcell->name() + "\": [" + + targetcell->Text() + "] [" + + to_string( targetcell->Value1(), 2 ) + "] [" + + to_string( targetcell->Value2(), 2 ) + "]" ); + } + } +} + +// export_as_text() subclass details +void +logvalues_event::export_as_text_( std::ostream &Output ) const { + +} + + + +// prepares event for use +void +multi_event::init() { + + init_targets( simulation::Memory, "memory cell" ); + if( m_ignored ) { + // legacy compatibility behaviour, instead of disabling the event we disable the memory cell comparison test + m_conditions.flags &= ~( flags::text | flags::value_1 | flags::value_2 ); + m_ignored = false; + } + // conditional data + m_conditions.bind( &m_targets ); + m_conditions.init(); + // child events bindings + for( auto &childevent : m_children ) { + std::get( childevent ) = simulation::Events.FindEvent( std::get( childevent ) ); + if( std::get( childevent ) == nullptr ) { + ErrorLog( "Bad event: multi-event \"" + m_name + "\" cannot find event \"" + std::get( childevent ) + "\"" ); + } + } +} + +// event type string +std::string +multi_event::type() const { + + return "multiple"; +} + +// deserialize() subclass details +void +multi_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + m_conditions.has_else = false; + + std::string token; + while( ( true == Input.getTokens() ) + && ( false == ( token = Input.peek() ).empty() ) + && ( false == is_keyword( token ) ) ) { + + if( token == "condition" ) { + m_conditions.deserialize( Input ); + // NOTE: condition block comes last so we can bail out afterwards + break; + } + + else if( token == "else" ) { + // zmiana flagi dla słowa "else" + m_conditions.has_else = !m_conditions.has_else; + } + else { + // potentially valid event name + if( token.substr( 0, 5 ) != "none_" ) { + // eventy rozpoczynające się od "none_" są ignorowane + m_children.emplace_back( token, nullptr, ( m_conditions.has_else == false ) ); + } + else { + WriteLog( "Multi-event \"" + m_name + "\" ignored link to event \"" + token + "\"" ); + } + } + } +} + +// run() subclass details +void +multi_event::run_() { + + auto const conditiontest { m_conditions.test() }; + if( conditiontest + || m_conditions.has_else ) { + // warunek spelniony albo było użyte else + WriteLog( "Type: Multi-event" ); + for( auto &childwrapper : m_children ) { + auto *childevent { std::get( childwrapper ) }; + if( childevent == nullptr ) { continue; } + if( std::get( childwrapper ) != conditiontest ) { continue; } + + if( childevent != this ) { + // normalnie dodać + simulation::Events.AddToQuery( childevent, m_activator ); + } + else { + // jeśli ma być rekurencja to musi mieć sensowny okres powtarzania + if( m_delay >= 5.0 ) { + simulation::Events.AddToQuery( this, m_activator ); + } + } + } + if( Global.iMultiplayer ) { + // dajemy znać do serwera o wykonaniu + if( false == m_conditions.has_else ) { + // jednoznaczne tylko, gdy nie było else + if( m_activator ) { + multiplayer::WyslijEvent( m_name, m_activator->name() ); + } + else { + multiplayer::WyslijEvent( m_name, "" ); + } + } + } + } +} + +// export_as_text() subclass details +void +multi_event::export_as_text_( std::ostream &Output ) const { + + for( auto const &childevent : m_children ) { + if( true == std::get( childevent ) ) { + auto *childeventdata { std::get( childevent ) }; + Output + << ( childeventdata != nullptr ? + childeventdata->m_name : + std::get( childevent ) ) + << ' '; + } + } + // optional 'else' block + if( true == m_conditions.has_else ) { + Output << "else "; + for( auto const &childevent : m_children ) { + if( false == std::get( childevent ) ) { + auto *childeventdata{ std::get( childevent ) }; + Output + << ( childeventdata != nullptr ? + childeventdata->m_name : + std::get( childevent ) ) + << ' '; + } + } + } + + m_conditions.export_as_text( Output ); +} + + + +// prepares event for use +void +sound_event::init() { + // odtworzenie dźwięku + for( auto &target : m_sounds ) { + std::get( target ) = simulation::Sounds.find( std::get( target ) ); + if( std::get( target ) == nullptr ) { + m_ignored = true; // deaktywacja + ErrorLog( "Bad event: sound event \"" + m_name + "\" cannot find static sound \"" + std::get( target ) + "\"" ); + } + } +} + +// event type string +std::string +sound_event::type() const { + + return "sound"; +} + +// deserialize() subclass details +void +sound_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + Input.getTokens(); + // playback mode, previously held in param 0 // 0: wylaczyc, 1: wlaczyc; -1: wlaczyc zapetlone + Input >> m_soundmode; + Input.getTokens(); + if( false == is_keyword( Input.peek() ) ) { + // optional parameter, radio channel to receive/broadcast the sound, previously held in param 1 + Input >> m_soundradiochannel; + Input.getTokens(); // preload next token + } +} + +// run() subclass details +void +sound_event::run_() { + + WriteLog( + "Type: Sound - [" + std::string( m_soundmode == 1 ? "play" : m_soundmode == -1 ? "loop" : "stop" ) + "]" + + ( m_soundradiochannel > 0 ? " [channel " + to_string( m_soundradiochannel ) + "]" : "" ) ); + for( auto &target : m_sounds ) { + auto *targetsound = std::get( target ); + if( targetsound == nullptr ) { continue; } + // event effect code + switch( m_soundmode ) { + // trzy możliwe przypadki: + case 0: { + targetsound->stop(); + break; + } + case 1: { + if( m_soundradiochannel > 0 ) { + simulation::radio_message( + targetsound, + m_soundradiochannel ); + } + else { + targetsound->play( sound_flags::exclusive | sound_flags::event ); + } + break; + } + case -1: { + targetsound->play( sound_flags::exclusive | sound_flags::looping | sound_flags::event ); + break; + } + default: { + break; + } + } + } +} + +// export_as_text() subclass details +void +sound_event::export_as_text_( std::ostream &Output ) const { + + // playback mode + Output << m_soundmode << ' '; + // optional radio channel + if( m_soundradiochannel > 0 ) { + Output << m_soundradiochannel << ' '; + } +} + +void +sound_event::deserialize_targets( std::string const &Input ) { + // sound objects don't inherit from scene node, so we can't use the same container + // TODO: fix this, having sounds as scene nodes (or a node wrapper for one) might have benefits elsewhere + cParser targetparser{ Input }; + std::string target; + while( false == ( target = targetparser.getToken( true, "|," ) ).empty() ) { + // actual bindings to targets of proper type are created during scenario initialization + if( target != "none" ) { + m_sounds.emplace_back( target, nullptr ); + } + } +} + + + +// destructor +animation_event::~animation_event() { + + if( m_animationtype == 4 ) { + // jeśli z pliku VMD + SafeDeleteArray( m_animationfiledata ); // zwolnić obszar + } +} + +// prepares event for use +void +animation_event::init() { + // animacja modelu + init_targets( simulation::Instances, "model instance" ); + // custom target initialization code + if( m_animationtype == 4 ) { + // vmd animations target whole model + return; + } + // locate and set up animated submodels + m_animationcontainers.clear(); + for( auto &target : m_targets ) { + auto *targetmodel { static_cast( std::get( target ) ) }; + if( targetmodel == nullptr ) { continue; } + auto *targetcontainer{ targetmodel->GetContainer( m_animationsubmodel ) }; + if( targetcontainer == nullptr ) { + m_ignored = true; + ErrorLog( "Bad event: animation event \"" + m_name + "\" cannot find submodel " + m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" ); + break; + } + targetcontainer->WillBeAnimated(); // oflagowanie animacji + if( targetcontainer->Event() == nullptr ) { + // nie szukać, gdy znaleziony + targetcontainer->EventAssign( simulation::Events.FindEvent( targetmodel->name() + '.' + m_animationsubmodel + ":done" ) ); + } + m_animationcontainers.emplace_back( targetcontainer ); + } +} + +// event type string +std::string +animation_event::type() const { + + return "animation"; +} + +// deserialize() subclass details +void +animation_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + std::string token; + + Input.getTokens(); + Input >> token; + if( token.compare( "rotate" ) == 0 ) { // obrót względem osi + Input.getTokens(); + // animation submodel, previously held in param 9 + Input >> m_animationsubmodel; + // animation type, previously held in param 0 + m_animationtype = 1; + Input.getTokens( 4 ); + // animation params, previously held in param 1, 2, 3, 4 + Input + >> m_animationparams[ 0 ] + >> m_animationparams[ 1 ] + >> m_animationparams[ 2 ] + >> m_animationparams[ 3 ]; + } + else if( token.compare( "translate" ) == 0 ) { // przesuw o wektor + Input.getTokens(); + // animation submodel, previously held in param 9 + Input >> m_animationsubmodel; + // animation type, previously held in param 0 + m_animationtype = 2; + Input.getTokens( 4 ); + // animation params, previously held in param 1, 2, 3, 4 + Input + >> m_animationparams[ 0 ] + >> m_animationparams[ 1 ] + >> m_animationparams[ 2 ] + >> m_animationparams[ 3 ]; + } + else if( token.compare( "digital" ) == 0 ) { // licznik cyfrowy + Input.getTokens(); + // animation submodel, previously held in param 9 + Input >> m_animationsubmodel; + // animation type, previously held in param 0 + m_animationtype = 8; + Input.getTokens( 4 ); + // animation params, previously held in param 1, 2, 3, 4 + Input + >> m_animationparams[ 0 ] + >> m_animationparams[ 1 ] + >> m_animationparams[ 2 ] + >> m_animationparams[ 3 ]; + } + else if( token.substr( token.length() - 4, 4 ) == ".vmd" ) // na razie tu, może będzie inaczej + { // animacja z pliku VMD + { + m_animationfilename = token; + std::ifstream file( szModelPath + m_animationfilename, std::ios::binary | std::ios::ate ); file.unsetf( std::ios::skipws ); + auto size = file.tellg(); // ios::ate already positioned us at the end of the file + file.seekg( 0, std::ios::beg ); // rewind the caret afterwards + // animation size, previously held in param 7 + m_animationfilesize = size; + // animation data, previously held in param 8 + m_animationfiledata = new char[ size ]; + file.read( m_animationfiledata, size ); // wczytanie pliku + } + Input.getTokens(); + // animation submodel, previously held in param 9 + Input >> m_animationsubmodel; + // animation type, previously held in param 0 + m_animationtype = 4; + Input.getTokens( 4 ); + // animation params, previously held in param 1, 2, 3, 4 + Input + >> m_animationparams[ 0 ] + >> m_animationparams[ 1 ] + >> m_animationparams[ 2 ] + >> m_animationparams[ 3 ]; + } + // preload next token + Input.getTokens(); +} + +// run() subclass details +void +animation_event::run_() { + + WriteLog( "Type: Animation" ); + if( m_animationtype == 4 ) { + // vmd mode targets the entire model + for( auto &target : m_targets ) { + auto *targetmodel = static_cast( std::get( target ) ); + if( targetmodel == nullptr ) { continue; } + // event effect code + targetmodel->AnimationVND( + m_animationfiledata, + m_animationparams[ 0 ], // tu mogą być dodatkowe parametry, np. od-do + m_animationparams[ 1 ], + m_animationparams[ 2 ], + m_animationparams[ 3 ] ); + } + } + else { + // other animation modes target specific submodels + for( auto *targetcontainer : m_animationcontainers ) { + switch( m_animationtype ) { + case 1: { // rotate + targetcontainer->SetRotateAnim( + glm::make_vec3( m_animationparams.data() ), + m_animationparams[ 3 ] ); + break; + } + case 2: { // translate + targetcontainer->SetTranslateAnim( + glm::make_vec3( m_animationparams.data() ), + m_animationparams[ 3 ] ); + break; + } + // TODO: implement digital mode + default: { + break; + } + } + } + } +} + +// export_as_text() subclass details +void +animation_event::export_as_text_( std::ostream &Output ) const { + + // animation type + Output << ( + m_animationtype == 1 ? "rotate" : + m_animationtype == 2 ? "translate" : + m_animationtype == 4 ? m_animationfilename : + m_animationtype == 8 ? "digital" : + "none" ) + << ' '; + // submodel + Output << m_animationsubmodel << ' '; + // animation parameters + Output + << m_animationparams[ 0 ] << ' ' + << m_animationparams[ 1 ] << ' ' + << m_animationparams[ 2 ] << ' ' + << m_animationparams[ 3 ] << ' '; +} + + + +// prepares event for use +void +lights_event::init() { + // zmiana świeteł modelu + init_targets( simulation::Instances, "model instance" ); +} + +// event type string +std::string +lights_event::type() const { + + return "lights"; +} + +// deserialize() subclass details +void +lights_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + // TBD, TODO: remove light count limit? + auto const lightcountlimit { 8 }; + m_lights.resize( lightcountlimit ); + int lightidx { 0 }; + + std::string token; + while( ( true == Input.getTokens() ) + && ( false == ( token = Input.peek() ).empty() ) + && ( false == is_keyword( token ) ) ) { + + if( lightidx < lightcountlimit ) { + Input >> m_lights[ lightidx++ ]; + } + else { + ErrorLog( "Bad event: lights event \"" + m_name + "\" with more than " + to_string( lightcountlimit ) + " parameters" ); + } + } + while( lightidx < lightcountlimit ) { + // HACK: mark unspecified lights with magic value + m_lights[ lightidx++ ] = -2.f; + } +} + +// run() subclass details +void +lights_event::run_() { + + for( auto &target : m_targets ) { + auto *targetmodel = static_cast( std::get( target ) ); + if( targetmodel == nullptr ) { continue; } + // event effect code + for( auto lightidx = 0; lightidx < iMaxNumLights; ++lightidx ) { + if( m_lights[ lightidx ] == -2.f ) { + // processed all supplied values, bail out + break; + } + if( m_lights[ lightidx ] >= 0.f ) { + // -1 zostawia bez zmiany + targetmodel->LightSet( + lightidx, + m_lights[ lightidx ] ); + } + } + } +} + +// export_as_text() subclass details +void +lights_event::export_as_text_( std::ostream &Output ) const { + + auto lightidx{ 0 }; + while( ( lightidx < iMaxNumLights ) + && ( m_lights[ lightidx ] > -2.0 ) ) { + Output << m_lights[ lightidx ] << ' '; + ++lightidx; + } +} + + + +// prepares event for use +void +switch_event::init() { + // przełożenie zwrotnicy albo zmiana stanu obrotnicy + init_targets( simulation::Paths, "track" ); + // custom target initialization code + for( auto &target : m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // dowiązanie toru + if( targettrack->iAction == 0 ) { + // jeśli nie jest zwrotnicą ani obrotnicą to będzie się zmieniał stan uszkodzenia + targettrack->iAction |= 0x100; + } + if( ( m_switchstate == 0 ) + && ( m_switchmovedelay >= 0.0 ) ) { + // jeśli przełącza do stanu 0 & jeśli jest zdefiniowany dodatkowy ruch iglic + // przesłanie parametrów + targettrack->Switch( + m_switchstate, + m_switchmoverate, + m_switchmovedelay ); + } + } +} + +// event type string +std::string +switch_event::type() const { + + return "switch"; +} + +// deserialize() subclass details +void +switch_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + Input.getTokens(); + // switch state, previously held in param 0 + Input >> m_switchstate; + Input.getTokens(); + if( false == is_keyword( Input.peek() ) ) { + // prędkość liniowa ruchu iglic + // previously held in param 1 + Input >> m_switchmoverate; + Input.getTokens(); + } + if( false == is_keyword( Input.peek() ) ) { + // dodatkowy ruch drugiej iglicy (zamknięcie nastawnicze) + // previously held in param 2 + Input >> m_switchmovedelay; + Input.getTokens(); + } +} + +// run() subclass details +void +switch_event::run_() { + + for( auto &target : m_targets ) { + auto *targettrack { static_cast( std::get( target ) ) }; + if( targettrack == nullptr ) { continue; } + // event effect code + targettrack->Switch( + m_switchstate, + m_switchmoverate, + m_switchmovedelay ); + } + if( Global.iMultiplayer ) { + // dajemy znać do serwera o przełożeniu + multiplayer::WyslijEvent( m_name, "" ); // wysłanie nazwy eventu przełączajacego + } + // Ra: bardziej by się przydała nazwa toru, ale nie ma do niej stąd dostępu +} + +// export_as_text() subclass details +void +switch_event::export_as_text_( std::ostream &Output ) const { + + Output << m_switchstate << ' '; + if( ( m_switchmoverate < 0.f ) + || ( m_switchmovedelay < 0.f ) ) { + Output << m_switchmoverate << ' '; + } + if( m_switchmovedelay < 0.f ) { + Output << m_switchmovedelay << ' '; + } +} + + + +// prepares event for use +void +track_event::init() { + // ustawienie prędkości na torze + init_targets( simulation::Paths, "track" ); + // custom target initialization code + for( auto &target : m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // flaga zmiany prędkości toru jest istotna dla skanowania + targettrack->iAction |= 0x200; + } +} + +// event type string +std::string +track_event::type() const { + + return "trackvel"; +} + +// deserialize() subclass details +void +track_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + + Input.getTokens(); + Input >> m_velocity; + // preload next token + Input.getTokens(); +} + +// run() subclass details +void +track_event::run_() { + + WriteLog( "Type: TrackVel - [" + to_string( m_velocity, 2 ) + "]" ); + for( auto &target : m_targets ) { + auto *targettrack = static_cast( std::get( target ) ); + if( targettrack == nullptr ) { continue; } + // event effect code + targettrack->VelocitySet( m_velocity ); + if( DebugModeFlag ) { + WriteLog( "actual track velocity for " + targettrack->name() + " [" + to_string( targettrack->VelocityGet(), 2 ) + "]" ); + } + } +} + +// export_as_text() subclass details +void +track_event::export_as_text_( std::ostream &Output ) const { + + Output << m_velocity << ' '; +} + + + +// prepares event for use +void +voltage_event::init() { + // zmiana napięcia w zasilaczu (TractionPowerSource) + init_targets( simulation::Powergrid, "power source" ); +} + +// event type string +std::string +voltage_event::type() const { + + return "voltage"; +} + +// deserialize() subclass details +void +voltage_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + // zmiana napięcia w zasilaczu (TractionPowerSource) + Input.getTokens(); + Input >> m_voltage; + // preload next token + Input.getTokens(); +} + +// run() subclass details +void +voltage_event::run_() { + // zmiana napięcia w zasilaczu (TractionPowerSource) + WriteLog( "Type: Voltage [" + to_string( m_voltage, 2 ) + "]" ); + for( auto &target : m_targets ) { + auto *targetpowersource = static_cast( std::get( target ) ); + if( targetpowersource == nullptr ) { continue; } + // na razie takie chamskie ustawienie napięcia zasilania + targetpowersource->VoltageSet( m_voltage ); + } +} + +// export_as_text() subclass details +void +voltage_event::export_as_text_( std::ostream &Output ) const { + + Output << m_voltage << ' '; +} + + + +// prepares event for use +void +visible_event::init() { + // ukrycie albo przywrócenie obiektu + for( auto &target : m_targets ) { + auto &targetnode{ std::get( target ) }; + auto &targetname{ std::get( target ) }; + // najpierw model + targetnode = simulation::Instances.find( targetname ); + if( targetnode == nullptr ) { + // albo tory? + targetnode = simulation::Paths.find( targetname ); + } + if( targetnode == nullptr ) { + // może druty? + targetnode = simulation::Traction.find( targetname ); + } + if( targetnode == nullptr ) { + m_ignored = true; // deaktywacja + ErrorLog( "Bad event: visibility event \"" + m_name + "\" cannot find item \"" + std::get( target ) + "\"" ); + } + } +} + +// event type string +std::string +visible_event::type() const { + + return "visible"; +} + +// deserialize() subclass details +void +visible_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + // zmiana wyświetlania obiektu + Input.getTokens(); + Input >> m_visible; + // preload next token + Input.getTokens(); +} + +// run() subclass details +void +visible_event::run_() { + + for( auto &target : m_targets ) { + auto *targetnode = std::get( target ); + if( targetnode == nullptr ) { continue; } + // event effect code + targetnode->visible( m_visible ); + } +} + +// export_as_text() subclass details +void +visible_event::export_as_text_( std::ostream &Output ) const { + + Output << ( m_visible ? 1 : 0 ) << ' '; +} + + + +// prepares event for use +void +friction_event::init() { + // nothing to do here +} + +// event type string +std::string +friction_event::type() const { + + return "friction"; +} + +// deserialize() subclass details +void +friction_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + // zmiana przyczepnosci na scenerii + Input.getTokens(); + Input >> m_friction; + // preload next token + Input.getTokens(); +} + +// run() subclass details +void +friction_event::run_() { + // zmiana tarcia na scenerii + WriteLog( "Type: Friction" ); + Global.fFriction = ( m_friction ); +} + +// export_as_text() subclass details +void +friction_event::export_as_text_( std::ostream &Output ) const { + + Output << m_friction << ' '; +} + + + +// prepares event for use +void +message_event::init() { + // nothing to do here +} + +// event type string +std::string +message_event::type() const { + + return "message"; +} + +// deserialize() subclass details +void +message_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { + // wyświetlenie komunikatu + std::string token; + while( ( true == Input.getTokens() ) + && ( false == ( token = Input.peek() ).empty() ) + && ( false == is_keyword( token ) ) ) { + m_message += ( m_message.empty() ? "" : " " ) + token; + } +} + +// run() subclass details +void +message_event::run_() { + // TODO: implement +} + +// export_as_text() subclass details +void +message_event::export_as_text_( std::ostream &Output ) const { + + Output << '\"' << m_message << '\"' << ' '; +} + +//--------------------------------------------------------------------------- + +basic_event * +make_event( cParser &Input, scene::scratch_data &Scratchpad ) { + + auto const name = ToLower( Input.getToken() ); + auto const type = Input.getToken(); + + basic_event *event { nullptr }; + + if( type == "addvalues" ) { event = new updatevalues_event(); } + else if( type == "updatevalues" ) { event = new updatevalues_event(); } + else if( type == "copyvalues" ) { event = new copyvalues_event(); } + else if( type == "getvalues" ) { event = new getvalues_event(); } + else if( type == "putvalues" ) { event = new putvalues_event(); } + else if( type == "whois" ) { event = new whois_event(); } + else if( type == "logvalues" ) { event = new logvalues_event(); } + else if( type == "multiple" ) { event = new multi_event(); } + else if( type == "switch" ) { event = new switch_event(); } + else if( type == "trackvel" ) { event = new track_event(); } + else if( type == "sound" ) { event = new sound_event(); } + else if( type == "animation" ) { event = new animation_event(); } + else if( type == "lights" ) { event = new lights_event(); } + else if( type == "voltage" ) { event = new voltage_event(); } + else if( type == "visible" ) { event = new visible_event(); } + else if( type == "friction" ) { event = new friction_event(); } + else if( type == "message" ) { event = new message_event(); } + + if( event == nullptr ) { + WriteLog( "Bad event: unrecognized type \"" + type + "\" specified for event \"" + name + "\"." ); + return event; + } + + event->m_name = name; + if( type == "addvalues" ) { + static_cast( event )->m_input.flags = basic_event::flags::mode_add; + } + return event; +} + +//--------------------------------------------------------------------------- + event_manager::~event_manager() { for( auto *event : m_events ) { @@ -1535,35 +1933,32 @@ event_manager::update() { } // adds provided event to the collection. returns: true on success -// TODO: return handle instead of pointer +// TBD, TODO: return handle instead of pointer bool -event_manager::insert( TEvent *Event ) { - - if( Event->Type == tp_Unknown ) { return false; } - +event_manager::insert( basic_event *Event ) { // najpierw sprawdzamy, czy nie ma, a potem dopisujemy - auto lookup = m_eventmap.find( Event->asName ); + auto lookup = m_eventmap.find( Event->m_name ); if( lookup != m_eventmap.end() ) { // duplicate of already existing event - auto const size = Event->asName.size(); + auto const size = Event->m_name.size(); // zawsze jeden znak co najmniej jest - if( Event->asName[ 0 ] == '#' ) { + if( Event->m_name[ 0 ] == '#' ) { // utylizacja duplikatu z krzyżykiem return false; } // tymczasowo wyjątki: else if( ( size > 8 ) - && ( Event->asName.substr( 0, 9 ) == "lineinfo:" ) ) { + && ( Event->m_name.substr( 0, 9 ) == "lineinfo:" ) ) { // tymczasowa utylizacja duplikatów W5 return false; } else if( ( size > 8 ) - && ( Event->asName.substr( size - 8 ) == "_warning" ) ) { + && ( Event->m_name.substr( size - 8 ) == "_warning" ) ) { // tymczasowa utylizacja duplikatu z trąbieniem return false; } else if( ( size > 4 ) - && ( Event->asName.substr( size - 4 ) == "_shp" ) ) { + && ( Event->m_name.substr( size - 4 ) == "_shp" ) ) { // nie podlegają logowaniu // tymczasowa utylizacja duplikatu SHP return false; @@ -1572,13 +1967,13 @@ event_manager::insert( TEvent *Event ) { auto *duplicate = m_events[ lookup->second ]; if( Global.bJoinEvents ) { // doczepka (taki wirtualny multiple bez warunków) - duplicate->Append( Event ); + duplicate->append( Event ); } else { // NOTE: somewhat convoluted way to deal with 'replacing' events without leaving dangling pointers // can be cleaned up if pointers to events were replaced with handles - ErrorLog( "Bad event: encountered duplicated event, \"" + Event->asName + "\"" ); - duplicate->Append( Event ); // doczepka (taki wirtualny multiple bez warunków) + ErrorLog( "Bad event: encountered duplicated event, \"" + Event->m_name + "\"" ); + duplicate->append( Event ); // doczepka (taki wirtualny multiple bez warunków) duplicate->m_ignored = true; // dezaktywacja pierwotnego - taka proteza na wsteczną zgodność } } @@ -1586,9 +1981,9 @@ event_manager::insert( TEvent *Event ) { m_events.emplace_back( Event ); if( lookup == m_eventmap.end() ) { // if it's first event with such name, it's potential candidate for the execution queue - m_eventmap.emplace( Event->asName, m_events.size() - 1 ); + m_eventmap.emplace( Event->m_name, m_events.size() - 1 ); if( ( Event->m_ignored != true ) - && ( Event->asName.find( "onstart" ) != std::string::npos ) ) { + && ( Event->m_name.find( "onstart" ) != std::string::npos ) ) { // event uruchamiany automatycznie po starcie AddToQuery( Event, nullptr ); } @@ -1598,7 +1993,7 @@ event_manager::insert( TEvent *Event ) { } // legacy method, returns pointer to specified event, or null -TEvent * +basic_event * event_manager::FindEvent( std::string const &Name ) { if( Name.empty() ) { return nullptr; } @@ -1612,44 +2007,67 @@ event_manager::FindEvent( std::string const &Name ) { // legacy method, inserts specified event in the event query bool -event_manager::AddToQuery( TEvent *Event, TDynamicObject const *Owner ) { +event_manager::AddToQuery( basic_event *Event, TDynamicObject const *Owner ) { - if( false == Event->bEnabled ) { return false; } // jeśli może być dodany do kolejki (nie używany w skanowaniu) - if( Event->iQueued != 0 ) { return false; } // jeśli nie dodany jeszcze do kolejki + if( Event->m_passive ) { return false; } // jeśli może być dodany do kolejki (nie używany w skanowaniu) + if( Event->m_inqueue > 0 ) { return false; } // jeśli nie dodany jeszcze do kolejki // kolejka eventów jest posortowana względem (fStartTime) - Event->Activator = Owner; - if( ( Event->Type == tp_AddValues ) - && ( Event->fDelay == 0.0 ) ) { + Event->m_activator = Owner; + if( Event->is_instant() ) { // eventy AddValues trzeba wykonywać natychmiastowo, inaczej kolejka może zgubić jakieś dodawanie if( false == Event->m_ignored ) { Event->run(); } // jeśli jest kolejny o takiej samej nazwie, to idzie do kolejki (and if there's no joint event it'll be set to null and processing will end here) do { - Event = Event->evJoined; + Event = Event->m_sibling; // NOTE: we could've received a new event from joint event above, so we need to check conditions just in case and discard the bad events // TODO: refactor this arrangement, it's hardly optimal } while( ( Event != nullptr ) - && ( ( false == Event->bEnabled ) - || ( Event->iQueued > 0 ) ) ); + && ( ( Event->m_passive ) + || ( Event->m_inqueue > 0 ) ) ); } if( ( Event != nullptr ) && ( false == Event->m_ignored ) ) { // standardowe dodanie do kolejki - ++Event->iQueued; // zabezpieczenie przed podwójnym dodaniem do kolejki - WriteLog( "EVENT ADDED TO QUEUE" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->asName ); - Event->fStartTime = std::abs( Event->fDelay ) + Timer::GetTime(); // czas od uruchomienia scenerii - if( Event->fRandomDelay > 0.0 ) { + ++(Event->m_inqueue); // zabezpieczenie przed podwójnym dodaniem do kolejki + WriteLog( "EVENT ADDED TO QUEUE" + ( Owner ? ( " by " + Owner->asName ) : "" ) + ": " + Event->m_name ); + Event->m_launchtime = std::abs( Event->m_delay ) + Timer::GetTime(); // czas od uruchomienia scenerii + if( Event->m_delayrandom > 0.0 ) { // doliczenie losowego czasu opóźnienia - Event->fStartTime += Event->fRandomDelay * Random( 10000 ) * 0.0001; + Event->m_launchtime += Event->m_delayrandom * Random(); } if( QueryRootEvent != nullptr ) { - TEvent::AddToQuery( Event, QueryRootEvent ); + basic_event *target { QueryRootEvent }; + basic_event *previous { nullptr }; + while( ( Event->m_launchtime >= target->m_launchtime ) + && ( target->m_next != nullptr ) ) { + previous = target; + target = target->m_next; + } + // the new event will be either before or after the one we located + if( Event->m_launchtime >= target->m_launchtime ) { + assert( target->m_next == nullptr ); + target->m_next = Event; + // if we have resurrected event land at the end of list, the link from previous run could potentially "add" unwanted events to the queue + Event->m_next = nullptr; + } + else { + if( previous != nullptr ) { + previous->m_next = Event; + Event->m_next = target; + } + else { + // special case, we're inserting our event at the very start + Event->m_next = QueryRootEvent; + QueryRootEvent = Event; + } + } } else { QueryRootEvent = Event; - QueryRootEvent->evNext = nullptr; + QueryRootEvent->m_next = nullptr; } } @@ -1661,23 +2079,23 @@ bool event_manager::CheckQuery() { while( ( QueryRootEvent != nullptr ) - && ( QueryRootEvent->fStartTime < Timer::GetTime() ) ) + && ( QueryRootEvent->m_launchtime < Timer::GetTime() ) ) { // eventy są posortowana wg czasu wykonania m_workevent = QueryRootEvent; // wyjęcie eventu z kolejki - if (QueryRootEvent->evJoined) // jeśli jest kolejny o takiej samej nazwie + if (QueryRootEvent->m_sibling) // jeśli jest kolejny o takiej samej nazwie { // to teraz on będzie następny do wykonania - QueryRootEvent = QueryRootEvent->evJoined; // następny będzie ten doczepiony - QueryRootEvent->evNext = m_workevent->evNext; // pamiętając o następnym z kolejki - QueryRootEvent->fStartTime = m_workevent->fStartTime; // czas musi być ten sam, bo nie jest aktualizowany - QueryRootEvent->Activator = m_workevent->Activator; // pojazd aktywujący - QueryRootEvent->iQueued = 1; + QueryRootEvent = QueryRootEvent->m_sibling; // następny będzie ten doczepiony + QueryRootEvent->m_next = m_workevent->m_next; // pamiętając o następnym z kolejki + QueryRootEvent->m_launchtime = m_workevent->m_launchtime; // czas musi być ten sam, bo nie jest aktualizowany + QueryRootEvent->m_activator = m_workevent->m_activator; // pojazd aktywujący + QueryRootEvent->m_inqueue = 1; // w sumie można by go dodać normalnie do kolejki, ale trzeba te połączone posortować wg czasu wykonania } else // a jak nazwa jest unikalna, to kolejka idzie dalej - QueryRootEvent = QueryRootEvent->evNext; // NULL w skrajnym przypadku - if( ( false == m_workevent->m_ignored ) && ( true == m_workevent->bEnabled ) ) { + QueryRootEvent = QueryRootEvent->m_next; // NULL w skrajnym przypadku + if( ( false == m_workevent->m_ignored ) && ( false == m_workevent->m_passive ) ) { // w zasadzie te wyłączone są skanowane i nie powinny się nigdy w kolejce znaleźć - --m_workevent->iQueued; // teraz moze być ponownie dodany do kolejki + --(m_workevent->m_inqueue); // teraz moze być ponownie dodany do kolejki m_workevent->run(); } // if (tmpEvent->bEnabled) } // while @@ -1690,7 +2108,7 @@ event_manager::InitEvents() { //łączenie eventów z pozostałymi obiektami for( auto *event : m_events ) { event->init(); - if( event->fDelay < 0 ) { AddToQuery( event, nullptr ); } + if( event->m_delay < 0 ) { AddToQuery( event, nullptr ); } } } diff --git a/Event.h b/Event.h index 94da96c0..60e35277 100644 --- a/Event.h +++ b/Event.h @@ -10,97 +10,142 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "classes.h" -#include "dumb3d.h" +#include "scene.h" #include "names.h" #include "evlaunch.h" -enum TEventType { - tp_Unknown, - tp_Sound, - tp_Animation, - tp_Lights, - tp_UpdateValues, - tp_GetValues, - tp_PutValues, - tp_Switch, - tp_TrackVel, - tp_Multiple, - tp_AddValues, - tp_CopyValues, - tp_WhoIs, - tp_LogValues, - tp_Visible, - tp_Voltage, - tp_Message, - tp_Friction -}; - -const int update_memstring = 0x0000001; // zmodyfikować tekst (UpdateValues) -const int update_memval1 = 0x0000002; // zmodyfikować pierwszą wartosć -const int update_memval2 = 0x0000004; // zmodyfikować drugą wartosć -const int update_memadd = 0x0000008; // dodać do poprzedniej zawartości -const int update_load = 0x0000010; // odczytać ładunek -const int conditional_memstring = 0x0000100; // porównanie tekstu -const int conditional_memval1 = 0x0000200; // porównanie pierwszej wartości liczbowej -const int conditional_memval2 = 0x0000400; // porównanie drugiej wartości -const int conditional_trackoccupied = 0x1000000; // jeśli tor zajęty -const int conditional_trackfree = 0x2000000; // jeśli tor wolny -const int conditional_propability = 0x4000000; // zależnie od generatora lizcb losowych - -// zdarzenie -class TEvent { +// common event interface +class basic_event { public: -// constructors - TEvent() = default; +// types + enum flags { + // shared values + text = 1 << 0, + value_1 = 1 << 1, + value_2 = 1 << 2, + // update values + load = 1 << 3, + mode_add = 1 << 4, + // condition values + track_busy = 1 << 3, + track_free = 1 << 4, + probability = 1 << 5 + }; +// constructor + basic_event() = default; // destructor - ~TEvent(); -// metody - void Load(cParser *parser, Math3D::vector3 const &org); - // prepares event for use + virtual ~basic_event(); +// methods + // restores event data from provided stream + virtual void - init(); - // legacy method, verifies event condition - bool - test_condition() const; + deserialize( cParser &Input, scene::scratch_data &Scratchpad ); + // prepares event for use + virtual + void + init() = 0; // executes event + virtual void run(); + // sends basic content of the class in legacy (text) format to provided stream + virtual void export_as_text( std::ostream &Output ) const; - static void AddToQuery( TEvent *Event, TEvent *&Start ); - std::string CommandGet() const; - TCommandType Command() const; - double ValueGet(int n) const; - glm::dvec3 PositionGet() const; - bool StopCommand() const; - void StopCommandSent(); - void Append(TEvent *e); + // adds a sibling event executed together void - group( scene::group_handle Group ); - scene::group_handle - group() const; + append( basic_event *Event ); + // returns: true if the event should be executed immediately + virtual + bool + is_instant() const; + // sends content of associated data cell to specified vehicle controller + virtual + void + send_command( TController &Controller ); + // returns: true if associated data cell contains a command for vehicle controller + virtual + bool + is_command() const; + // input data access + virtual std::string input_text() const; + virtual TCommandType input_command() const; + virtual double input_value( int Index ) const; + virtual glm::dvec3 input_location() const; + void group( scene::group_handle Group ); + scene::group_handle group() const; // members - std::string asName; - TEventType Type = tp_Unknown; - TEvent *evNext = nullptr; // następny w kolejce - bool m_ignored{ false }; // replacement for tp_ignored - bool bEnabled = false; // false gdy ma nie być dodawany do kolejki (skanowanie sygnałów) - int iQueued = 0; // ile razy dodany do kolejki - TDynamicObject const *Activator = nullptr; - double fStartTime = 0.0; - double fDelay = 0.0; - double fRandomDelay = 0.0; // zakres dodatkowego opóźnienia // standardowo nie będzie dodatkowego losowego opóźnienia - TEvent *evJoined = nullptr; // kolejny event z tą samą nazwą - od wersji 378 + basic_event *m_next { nullptr }; // następny w kolejce // TODO: replace with event list in the manager + basic_event *m_sibling { nullptr }; // kolejny event z tą samą nazwą - od wersji 378 + std::string m_name; + bool m_ignored { false }; // replacement for tp_ignored + bool m_passive { false }; // false gdy ma nie być dodawany do kolejki (skanowanie sygnałów) + int m_inqueue { 0 }; // ile razy dodany do kolejki + TDynamicObject const *m_activator { nullptr }; + double m_launchtime { 0.0 }; + double m_delay { 0.0 }; + double m_delayrandom { 0.0 }; // zakres dodatkowego opóźnienia // standardowo nie będzie dodatkowego losowego opóźnienia + +protected: +// types + using basic_node = std::tuple; + using node_sequence = std::vector; + + struct event_conditions { + unsigned int flags { 0 }; + float probability { 0.0 }; // used by conditional_probability + double match_value_1 { 0.0 }; // used by conditional_memcompare + double match_value_2 { 0.0 }; // used by conditional_memcompare + std::string match_text; // used by conditional_memcompare + basic_event::node_sequence *cells; // used by conditional_memcompare + std::vector tracks; // used by conditional_track + bool has_else { false }; + + void deserialize( cParser &Input ); + void bind( basic_event::node_sequence *Nodes ); + void init(); + // verifies whether event meets execution condition(s) + bool test() const; + // sends basic content of the class in legacy (text) format to provided stream + void export_as_text( std::ostream &Output ) const; + }; +// methods + template + void init_targets( TableType_ &Repository, std::string const &Targettype, bool const Logerrors = true ); + // returns true if provided token is a an event desription keyword, false otherwise + static bool is_keyword( std::string const &Token ); + +// members + node_sequence m_targets; // targets of operation performed when this event is executed private: -// types - // wrapper for binding between editor-supplied name, event, and execution conditional flag - using conditional_event = std::tuple; - using basic_node = std::tuple; - using basic_sound = std::tuple; +// methods + // event type string + virtual std::string type() const = 0; + // deserialization helper, converts provided string to a list of target nodes + virtual void deserialize_targets( std::string const &Input ); + // deserialize() subclass details + virtual void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) = 0; + // run() subclass details + virtual void run_() = 0; + // export_as_text() subclass details + virtual void export_as_text_( std::ostream &Output ) const = 0; +// members + scene::group_handle m_group { null_handle }; // group this event belongs to, if any +}; - struct update_data { + + +// specialized event, sends received input to its target(s) +// TBD: replace the generic module with specialized mixins +class input_event : public basic_event { + + friend basic_event * make_event( cParser &Input, scene::scratch_data &Scratchpad ); + +protected: +// types + struct input_data { unsigned int flags { 0 }; std::string data_text; double data_value_1 { 0.0 }; @@ -112,80 +157,392 @@ private: TMemCell const * data_cell() const; TMemCell * data_cell(); }; - struct condition_data { - unsigned int flags { 0 }; - float probability { 0.0 }; // used by conditional_probability - double match_value_1 { 0.0 }; // used by conditional_memcompare - double match_value_2 { 0.0 }; // used by conditional_memcompare - std::string match_text; // used by conditional_memcompare - std::vector tracks; // used by conditional_track - bool has_else { false }; - void load( cParser &Input ); - }; -// methods - void - load_targets( std::string const &Input ); - // sends basic content of the class in legacy (text) format to provided stream - template - void - init_targets( TableType_ &Repository, std::string const &Targettype, bool const Logerrors = true ); - void - init_conditions(); - std::string - type_to_string() const; // members - scene::group_handle m_group { null_handle }; // group this event belongs to, if any - update_data m_update; - condition_data m_condition; - std::vector m_targets; // targets of operation performed when this event is executed + input_data m_input; +}; + + + +class updatevalues_event : public input_event { + +public: +// methods + // prepares event for use + void init() override; + // returns: true if the event should be executed immediately + bool is_instant() const override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + event_conditions m_conditions; +}; + + + +class copyvalues_event : public input_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +}; + + + +class getvalues_event : public input_event { + +public: +// methods + // prepares event for use + void init() override; + // sends content of associated data cell to specified vehicle controller + void send_command( TController &Controller ) override; + // returns: true if associated data cell contains a command for vehicle controller + bool is_command() const override; + // input data access + std::string input_text() const override; + TCommandType input_command() const override; + double input_value( int Index ) const override; + glm::dvec3 input_location() const override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +}; + + + +class putvalues_event : public input_event { + +public: +// methods + // prepares event for use + void init() override; + // input data access + std::string input_text() const override; + TCommandType input_command() const override; + double input_value( int Index ) const override; + glm::dvec3 input_location() const override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +}; + + + +class whois_event : public input_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +}; + + + +class logvalues_event : public basic_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +}; + + + +class multi_event : public basic_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// types + // wrapper for binding between editor-supplied name, event, and execution conditional flag + using conditional_event = std::tuple; +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members std::vector m_children; // events which are placed in the query when this event is executed - // specialized fields - std::vector m_lights; // for tp_lights - bool m_visible { true }; // for tp_visible - double m_velocity { 0.0 }; // for tp_trackvel - std::vector m_sounds; // for tp_sound + event_conditions m_conditions; +}; + +class sound_event : public basic_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// types + // wrapper for binding between editor-supplied name and sound object + using basic_sound = std::tuple; +// methods + // event type string + std::string type() const override; + // deserialization helper, converts provided string to a list of target nodes + void deserialize_targets( std::string const &Input ) override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + std::vector m_sounds; int m_soundmode{ 0 }; int m_soundradiochannel{ 0 }; - int m_animationtype{ 0 }; // for tp_animation +}; + +class animation_event : public basic_event { + +public: +// destuctor + ~animation_event() override; +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + int m_animationtype{ 0 }; std::array m_animationparams{ 0.0 }; std::string m_animationsubmodel; std::vector m_animationcontainers; std::string m_animationfilename; std::size_t m_animationfilesize{ 0 }; char *m_animationfiledata{ nullptr }; - int m_switchstate{ 0 }; // for tp_switch - float m_switchmoverate{ -1.f }; - float m_switchmovedelay{ -1.f }; - float m_friction { -1.f }; // for tp_friction - float m_voltage{ -1.f }; // for tp_voltage }; -inline -void -TEvent::group( scene::group_handle Group ) { - m_group = Group; -} +class lights_event : public basic_event { -inline -scene::group_handle -TEvent::group() const { - return m_group; -} +public: +// methods + // prepares event for use + void init() override; -template -void -TEvent::init_targets( TableType_ &Repository, std::string const &Targettype, bool const Logerrors ) { +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + std::vector m_lights; +}; - for( auto &target : m_targets ) { - std::get( target ) = Repository.find( std::get( target ) ); - if( std::get( target ) == nullptr ) { - m_ignored = true; // deaktywacja - if( Logerrors ) - ErrorLog( "Bad event: " + type_to_string() + " event \"" + asName + "\" cannot find " + Targettype +" \"" + std::get( target ) + "\"" ); - } - } -} +class switch_event : public basic_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + int m_switchstate{ 0 }; + float m_switchmoverate{ -1.f }; + float m_switchmovedelay{ -1.f }; +}; + +class track_event : public basic_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + float m_velocity{ 0.f }; +}; + +class voltage_event : public basic_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + float m_voltage{ -1.f }; +}; + +class visible_event : public basic_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + bool m_visible{ true }; +}; + +class friction_event : public basic_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + float m_friction{ -1.f }; +}; + +class message_event : public basic_event { + +public: +// methods + // prepares event for use + void init() override; + +private: +// methods + // event type string + std::string type() const override; + // deserialize() subclass details + void deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) override; + // run() subclass details + void run_() override; + // export_as_text() subclass details + void export_as_text_( std::ostream &Output ) const override; +// members + std::string m_message; +}; + + + +basic_event * +make_event( cParser &Input, scene::scratch_data &Scratchpad ); @@ -206,20 +563,22 @@ public: // adds provided event to the collection. returns: true on success // TBD, TODO: return handle to the event bool - insert( TEvent *Event ); + insert( basic_event *Event ); + inline bool insert( TEventLauncher *Launcher ) { return m_launchers.insert( Launcher ); } // returns first event in the queue - TEvent * + inline + basic_event * begin() { return QueryRootEvent; } // legacy method, returns pointer to specified event, or null - TEvent * + basic_event * FindEvent( std::string const &Name ); // legacy method, inserts specified event in the event query bool - AddToQuery( TEvent *Event, TDynamicObject const *Owner ); + AddToQuery( basic_event *Event, TDynamicObject const *Owner ); // legacy method, executes queued events bool CheckQuery(); @@ -235,7 +594,7 @@ public: private: // types - using event_sequence = std::deque; + using event_sequence = std::deque; using event_map = std::unordered_map; using eventlauncher_sequence = std::vector; // members @@ -245,11 +604,39 @@ private: event_sequence m_eventqueue; */ // legacy version of the above - TEvent *QueryRootEvent { nullptr }; - TEvent *m_workevent { nullptr }; + basic_event *QueryRootEvent { nullptr }; + basic_event *m_workevent { nullptr }; event_map m_eventmap; basic_table m_launchers; eventlauncher_sequence m_launcherqueue; }; + + +inline +void +basic_event::group( scene::group_handle Group ) { + m_group = Group; +} + +inline +scene::group_handle +basic_event::group() const { + return m_group; +} + +template +void +basic_event::init_targets( TableType_ &Repository, std::string const &Targettype, bool const Logerrors ) { + + for( auto &target : m_targets ) { + std::get( target ) = Repository.find( std::get( target ) ); + if( std::get( target ) == nullptr ) { + m_ignored = true; // deaktywacja + if( Logerrors ) + ErrorLog( "Bad event: " + type() + " event \"" + m_name + "\" cannot find " + Targettype +" \"" + std::get( target ) + "\"" ); + } + } +} + //--------------------------------------------------------------------------- diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 32bf7ac9..3b04861b 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -410,14 +410,14 @@ struct TBoilerType { }; /*rodzaj odbieraka pradu*/ struct TCurrentCollector { - long CollectorsNo{0}; //musi być tu, bo inaczej się kopie - double MinH{ 0.0 }; double MaxH{ 0.0 }; //zakres ruchu pantografu, nigdzie nie używany - double CSW{ 0.0 }; //szerokość części roboczej (styku) ślizgacza - double MinV{ 0.0 }; double MaxV{ 0.0 }; //minimalne i maksymalne akceptowane napięcie - bool OVP{ false }; //czy jest przekaznik nadnapieciowy - double InsetV{ 0.0 }; //minimalne napięcie wymagane do załączenia - double MinPress{ 0.0 }; //minimalne ciśnienie do załączenia WS - double MaxPress{ 0.0 }; //maksymalne ciśnienie za reduktorem + long CollectorsNo; //musi być tu, bo inaczej się kopie + double MinH; double MaxH; //zakres ruchu pantografu, nigdzie nie używany + double CSW; //szerokość części roboczej (styku) ślizgacza + double MinV; double MaxV; //minimalne i maksymalne akceptowane napięcie + bool OVP; //czy jest przekaznik nadnapieciowy + double InsetV; //minimalne napięcie wymagane do załączenia + double MinPress; //minimalne ciśnienie do załączenia WS + double MaxPress; //maksymalne ciśnienie za reduktorem //inline TCurrentCollector() { // CollectorsNo = 0; // MinH, MaxH, CSW, MinV, MaxV = 0.0; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b226c6f8..2e2b7a5f 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -8522,7 +8522,7 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet auto &collectorparameters = Powerparameters.CollectorParameters; - collectorparameters = TCurrentCollector(); + collectorparameters = TCurrentCollector { 0, 0, 0, 0, 0, 0, false, 0, 0, 0 }; extract_value( collectorparameters.CollectorsNo, "CollectorsNo", Line, "" ); extract_value( collectorparameters.MinH, "MinH", Line, "" ); diff --git a/MemCell.cpp b/MemCell.cpp index 780ffc1e..ca7fd120 100644 --- a/MemCell.cpp +++ b/MemCell.cpp @@ -27,25 +27,25 @@ TMemCell::TMemCell( scene::node_data const &Nodedata ) : basic_node( Nodedata ) void TMemCell::UpdateValues( std::string const &szNewText, double const fNewValue1, double const fNewValue2, int const CheckMask ) { - if (CheckMask & update_memadd) + if (CheckMask & basic_event::flags::mode_add) { // dodawanie wartości - if( TestFlag( CheckMask, update_memstring ) ) + if( TestFlag( CheckMask, basic_event::flags::text ) ) szText += szNewText; - if (TestFlag(CheckMask, update_memval1)) + if (TestFlag(CheckMask, basic_event::flags::value_1)) fValue1 += fNewValue1; - if (TestFlag(CheckMask, update_memval2)) + if (TestFlag(CheckMask, basic_event::flags::value_2)) fValue2 += fNewValue2; } else { - if( TestFlag( CheckMask, update_memstring ) ) + if( TestFlag( CheckMask, basic_event::flags::text ) ) szText = szNewText; - if (TestFlag(CheckMask, update_memval1)) + if (TestFlag(CheckMask, basic_event::flags::value_1)) fValue1 = fNewValue1; - if (TestFlag(CheckMask, update_memval2)) + if (TestFlag(CheckMask, basic_event::flags::value_2)) fValue2 = fNewValue2; } - if (TestFlag(CheckMask, update_memstring)) + if (TestFlag(CheckMask, basic_event::flags::text)) CommandCheck(); // jeśli zmieniony tekst, próbujemy rozpoznać komendę } @@ -120,7 +120,7 @@ void TMemCell::PutCommand( TController *Mech, glm::dvec3 const *Loc ) const bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, double const fTestValue2, int const CheckMask ) const { // porównanie zawartości komórki pamięci z podanymi wartościami - if( TestFlag( CheckMask, conditional_memstring ) ) { + if( TestFlag( CheckMask, basic_event::flags::text ) ) { // porównać teksty auto range = szTestText.find( '*' ); if( range != std::string::npos ) { @@ -137,8 +137,8 @@ bool TMemCell::Compare( std::string const &szTestText, double const fTestValue1, } } // tekst zgodny, porównać resztę - return ( ( !TestFlag( CheckMask, conditional_memval1 ) || ( fValue1 == fTestValue1 ) ) - && ( !TestFlag( CheckMask, conditional_memval2 ) || ( fValue2 == fTestValue2 ) ) ); + return ( ( !TestFlag( CheckMask, basic_event::flags::value_1 ) || ( fValue1 == fTestValue1 ) ) + && ( !TestFlag( CheckMask, basic_event::flags::value_2 ) || ( fValue2 == fTestValue2 ) ) ); }; bool TMemCell::IsVelocity() const @@ -161,7 +161,7 @@ void TMemCell::StopCommandSent() } }; -void TMemCell::AssignEvents(TEvent *e) +void TMemCell::AssignEvents(basic_event *e) { // powiązanie eventu OnSent = e; }; diff --git a/MemCell.h b/MemCell.h index 3d6298c1..a98d751c 100644 --- a/MemCell.h +++ b/MemCell.h @@ -45,7 +45,7 @@ public: void StopCommandSent(); TCommandType CommandCheck(); bool IsVelocity() const; - void AssignEvents(TEvent *e); + void AssignEvents(basic_event *e); // members std::string asTrackName; // McZapkie-100302 - zeby nazwe toru na ktory jest Putcommand wysylane pamietac TTrack *Track { nullptr }; // resolved binding with the specified track @@ -68,7 +68,7 @@ private: // other TCommandType eCommand { TCommandType::cm_Unknown }; bool bCommand { false }; // czy zawiera komendę dla zatrzymanego AI - TEvent *OnSent { nullptr }; // event dodawany do kolejki po wysłaniu komendy zatrzymującej skład + basic_event *OnSent { nullptr }; // event dodawany do kolejki po wysłaniu komendy zatrzymującej skład }; diff --git a/Track.cpp b/Track.cpp index c68d81a4..b5d24ef8 100644 --- a/Track.cpp +++ b/Track.cpp @@ -124,7 +124,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) multiplayer::WyslijString(asName, 10); // wysłanie pakietu o zwolnieniu if (pMemCell) // w powiązanej komórce pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) & ~0xFF, - update_memval2 ); //"zerujemy" ostatnią wartość + basic_event::flags::value_2 ); //"zerujemy" ostatnią wartość } } else @@ -137,7 +137,7 @@ void TIsolated::Modify(int i, TDynamicObject *o) if (Global.iMultiplayer) // jeśli multiplayer multiplayer::WyslijString(asName, 11); // wysłanie pakietu o zajęciu if (pMemCell) // w powiązanej komórce - pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) | 1, update_memval2 ); // zmieniamy ostatnią wartość na nieparzystą + pMemCell->UpdateValues( "", 0, int( pMemCell->Value2() ) | 1, basic_event::flags::value_2 ); // zmieniamy ostatnią wartość na nieparzystą } } // pass the event to the parent @@ -933,7 +933,7 @@ bool TTrack::AssignEvents() { return ( lookupfail == false ); } -bool TTrack::AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus) +bool TTrack::AssignForcedEvents(basic_event *NewEventPlus, basic_event *NewEventMinus) { // ustawienie eventów sygnalizacji rozprucia if (SwitchExtension) { @@ -959,7 +959,7 @@ void TTrack::QueueEvents( event_sequence const &Events, TDynamicObject const *Ow for( auto const &event : Events ) { if( ( event.second != nullptr ) - && ( event.second->fDelay <= Delaylimit) ) { + && ( event.second->m_delay <= Delaylimit) ) { simulation::Events.AddToQuery( event.second, Owner ); } } @@ -1115,7 +1115,7 @@ bool TTrack::InMovement() return false; }; -void TTrack::RaAssign( TAnimModel *am, TEvent *done, TEvent *joined ) +void TTrack::RaAssign( TAnimModel *am, basic_event *done, basic_event *joined ) { // Ra: wiązanie toru z modelem obrotnicy if (eType == tt_Table) { @@ -2839,7 +2839,7 @@ TTrack::export_as_text_( std::ostream &Output ) const { Output << eventsequence.first << ' ' << ( event.second != nullptr ? - event.second->asName : + event.second->m_name : event.first ) << ' '; } diff --git a/Track.h b/Track.h index 5efc6527..9fb57165 100644 --- a/Track.h +++ b/Track.h @@ -44,7 +44,7 @@ enum TEnvironmentType { }; // Ra: opracować alternatywny system cieni/świateł z definiowaniem koloru oświetlenia w halach -class TEvent; +class basic_event; class TTrack; class TGroundNode; class TSubRect; @@ -89,7 +89,7 @@ class TSwitchExtension bool bMovement = false; // czy w trakcie animacji scene::basic_cell *pOwner = nullptr; // TODO: convert this to observer pattern TTrack *pNextAnim = nullptr; // następny tor do animowania - TEvent *evPlus = nullptr, + basic_event *evPlus = nullptr, *evMinus = nullptr; // zdarzenia sygnalizacji rozprucia float fVelocity = -1.0; // maksymalne ograniczenie prędkości (ustawianej eventem) Math3D::vector3 vTrans; // docelowa translacja przesuwnicy @@ -127,8 +127,8 @@ public: return pParent; } // members std::string asName; // nazwa obiektu, baza do nazw eventów - TEvent *evBusy { nullptr }; // zdarzenie wyzwalane po zajęciu grupy - TEvent *evFree { nullptr }; // zdarzenie wyzwalane po całkowitym zwolnieniu zajętości grupy + basic_event *evBusy { nullptr }; // zdarzenie wyzwalane po zajęciu grupy + basic_event *evFree { nullptr }; // zdarzenie wyzwalane po całkowitym zwolnieniu zajętości grupy TMemCell *pMemCell { nullptr }; // automatyczna komórka pamięci, która współpracuje z odcinkiem izolowanym private: // members @@ -175,7 +175,7 @@ private: public: using dynamics_sequence = std::deque; - using event_sequence = std::vector >; + using event_sequence = std::vector >; dynamics_sequence Dynamics; event_sequence @@ -251,7 +251,7 @@ public: 1 ); } void Load(cParser *parser, glm::dvec3 const &pOrigin); bool AssignEvents(); - bool AssignForcedEvents(TEvent *NewEventPlus, TEvent *NewEventMinus); + bool AssignForcedEvents(basic_event *NewEventPlus, basic_event *NewEventMinus); void QueueEvents( event_sequence const &Events, TDynamicObject const *Owner ); void QueueEvents( event_sequence const &Events, TDynamicObject const *Owner, double const Delaylimit ); bool CheckDynamicObject(TDynamicObject *Dynamic); @@ -272,7 +272,7 @@ public: void RaOwnerSet( scene::basic_cell *o ) { if( SwitchExtension ) { SwitchExtension->pOwner = o; } }; bool InMovement(); // czy w trakcie animacji? - void RaAssign( TAnimModel *am, TEvent *done, TEvent *joined ); + void RaAssign( TAnimModel *am, basic_event *done, basic_event *joined ); void RaAnimListAdd(TTrack *t); TTrack * RaAnimate(); diff --git a/Train.cpp b/Train.cpp index b7a50b4d..16a8e5d0 100644 --- a/Train.cpp +++ b/Train.cpp @@ -3729,7 +3729,7 @@ void TTrain::OnCommand_generictoggle( TTrain *Train, command_data const &Command if( Command.action == GLFW_PRESS ) { // only reacting to press, so the switch doesn't flip back and forth if key is held down - if( item.GetValue() < 0.25 ) { + if( item.GetDesiredValue() < 0.5 ) { // turn on // visual feedback item.UpdateValue( 1.0, Train->dsbSwitch ); diff --git a/drivermode.h b/drivermode.h index 297da859..cd616a41 100644 --- a/drivermode.h +++ b/drivermode.h @@ -77,7 +77,7 @@ private: // members drivermode_input m_input; - std::array KeyEvents { nullptr }; // eventy wyzwalane z klawiaury + std::array KeyEvents { nullptr }; // eventy wyzwalane z klawiaury TCamera Camera; TCamera DebugCamera; TDynamicObject *pDynamicNearest { nullptr }; // vehicle nearest to the active camera. TODO: move to camera diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 603de77c..174bc700 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -684,7 +684,7 @@ debug_panel::update_section_ai( std::vector &Output ) { if( ( mechanik.VelNext == 0.0 ) && ( mechanik.eSignNext ) ) { // jeśli ma zapamiętany event semafora, nazwa eventu semafora - Output.emplace_back( "Current signal: " + Bezogonkow( mechanik.eSignNext->asName ), Global.UITextColor ); + Output.emplace_back( "Current signal: " + Bezogonkow( mechanik.eSignNext->m_name ), Global.UITextColor ); } // distances @@ -805,19 +805,19 @@ debug_panel::update_section_eventqueue( std::vector &Output ) { && ( eventtableindex < 30 ) ) { if( ( false == event->m_ignored ) - && ( true == event->bEnabled ) ) { + && ( false == event->m_passive ) ) { - auto const delay { " " + to_string( std::max( 0.0, event->fStartTime - time ), 1 ) }; + auto const delay { " " + to_string( std::max( 0.0, event->m_launchtime - time ), 1 ) }; textline = "Delay: " + delay.substr( delay.length() - 6 ) - + ", Event: " + event->asName - + ( event->Activator ? " (by: " + event->Activator->asName + ")" : "" ) - + ( event->evJoined ? " (joint event)" : "" ); + + ", Event: " + event->m_name + + ( event->m_activator ? " (by: " + event->m_activator->asName + ")" : "" ) + + ( event->m_sibling ? " (joint event)" : "" ); Output.emplace_back( textline, Global.UITextColor ); ++eventtableindex; } - event = event->evNext; + event = event->m_next; } if( Output.empty() ) { textline = "(no queued events)"; diff --git a/editoruipanels.cpp b/editoruipanels.cpp index 74de4c7a..18d0a6df 100644 --- a/editoruipanels.cpp +++ b/editoruipanels.cpp @@ -148,7 +148,7 @@ itemproperties_panel::update( scene::basic_node const *Node ) { } textline += ( event.second != nullptr ? - event.second->asName : + event.second->m_name : event.first + " (missing)" ); } textline += "] "; diff --git a/messaging.cpp b/messaging.cpp index 3e7776fe..f1826507 100644 --- a/messaging.cpp +++ b/messaging.cpp @@ -64,9 +64,9 @@ OnCommandGet(multiplayer::DaneRozkaz *pRozkaz) if( Global.iMultiplayer ) { auto *event = simulation::Events.FindEvent( std::string( pRozkaz->cString + 1, (unsigned)( pRozkaz->cString[ 0 ] ) ) ); if( event != nullptr ) { - if( ( event->Type == tp_Multiple ) - || ( event->Type == tp_Lights ) - || ( event->evJoined != 0 ) ) { + if( ( typeid( *event ) == typeid( multi_event ) ) + || ( typeid( *event ) == typeid( lights_event ) ) + || ( event->m_sibling != 0 ) ) { // tylko jawne albo niejawne Multiple simulation::Events.AddToQuery( event, nullptr ); // drugi parametr to dynamic wywołujący - tu brak } diff --git a/scenenodegroups.cpp b/scenenodegroups.cpp index 68fe4123..72b1351d 100644 --- a/scenenodegroups.cpp +++ b/scenenodegroups.cpp @@ -77,7 +77,7 @@ node_groups::insert( scene::group_handle const Group, scene::basic_node *Node ) // places provided event in specified group void -node_groups::insert( scene::group_handle const Group, TEvent *Event ) { +node_groups::insert( scene::group_handle const Group, basic_event *Event ) { // TBD, TODO: automatically unregister the event from its current group? Event->group( Group ); diff --git a/scenenodegroups.h b/scenenodegroups.h index 0ad9a6a8..d0815bae 100644 --- a/scenenodegroups.h +++ b/scenenodegroups.h @@ -16,7 +16,7 @@ namespace scene { struct basic_group { // members std::vector nodes; - std::vector events; + std::vector events; }; // holds lists of grouped scene nodes @@ -41,7 +41,7 @@ public: insert( scene::group_handle const Group, scene::basic_node *Node ); // places provided event in specified group void - insert( scene::group_handle const Group, TEvent *Event ); + insert( scene::group_handle const Group, basic_event *Event ); // grants direct access to specified group scene::basic_group & group( scene::group_handle const Group ) { diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index 001a5d60..ed6a52c9 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -244,15 +244,14 @@ void state_serializer::deserialize_event( cParser &Input, scene::scratch_data &Scratchpad ) { // TODO: refactor event class and its de/serialization. do offset and rotation after deserialization is done - auto *event = new TEvent(); - Math3D::vector3 offset = ( - Scratchpad.location.offset.empty() ? - Math3D::vector3() : - Math3D::vector3( - Scratchpad.location.offset.top().x, - Scratchpad.location.offset.top().y, - Scratchpad.location.offset.top().z ) ); - event->Load( &Input, offset ); + auto *event = make_event( Input, Scratchpad ); + if( event == nullptr ) { + // something went wrong at initial stage, move on + skip_until( Input, "endevent" ); + return; + } + + event->deserialize( Input, Scratchpad ); if( true == simulation::Events.insert( event ) ) { scene::Groups.insert( scene::Groups.handle(), event ); From 496a680e44f2505324fbd3e60d695142a075f701 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 18 Sep 2018 05:04:15 +0200 Subject: [PATCH 403/426] build 180918. imgui implementation upgraded to opengl3, opengl version requirement raised to 3.0 --- maszyna.vcxproj.filters | 9 ++++++--- renderer.cpp | 4 ++-- stdafx.h | 13 +++++-------- uilayer.cpp | 11 ++++++----- version.h | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index b3368c08..665a7b90 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -315,9 +315,6 @@ Source Files\imgui - - Source Files\imgui - Source Files\imgui @@ -327,6 +324,12 @@ Source Files\application\mode_editor + + Source Files\imgui + + + Source Files\imgui + diff --git a/renderer.cpp b/renderer.cpp index a85679c0..4821d118 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -3722,8 +3722,8 @@ opengl_renderer::Init_caps() { + " Vendor: " + std::string( (char *)glGetString( GL_VENDOR ) ) + " OpenGL Version: " + oglversion ); - if( !GLEW_VERSION_1_5 ) { - ErrorLog( "Requires openGL >= 1.5" ); + if( !GLEW_VERSION_3_0 ) { + ErrorLog( "Requires openGL >= 3.0" ); // technically 1.5 for now, but imgui wants more return false; } diff --git a/stdafx.h b/stdafx.h index 194b7018..145bed1f 100644 --- a/stdafx.h +++ b/stdafx.h @@ -106,14 +106,11 @@ #include "openglmatrixstack.h" // imgui.h comes with its own operator new which gets wrecked by dbg_new, so we temporarily disable the latter -#ifdef _MSC_VER -#ifdef _DEBUG +#ifdef DBG_NEW +#pragma push_macro("new") #undef new -#endif // _DEBUG -#endif #include "imgui.h" -#ifdef _MSC_VER -#ifdef _DEBUG -#define new DBG_NEW -#endif // _DEBUG +#pragma pop_macro("new") +#else +#include "imgui.h" #endif diff --git a/uilayer.cpp b/uilayer.cpp index b7d26251..c5ed4262 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -14,7 +14,7 @@ http://mozilla.org/MPL/2.0/. #include "renderer.h" #include "imgui_impl_glfw.h" -#include "imgui_impl_opengl2.h" +#include "imgui_impl_opengl3.h" extern "C" { @@ -74,7 +74,8 @@ ui_layer::init( GLFWwindow *Window ) { // m_imguiio->Fonts->AddFontFromFileTTF( "c:/windows/fonts/lucon.ttf", 13.0f ); ImGui_ImplGlfw_InitForOpenGL( m_window, false ); - ImGui_ImplOpenGL2_Init(); +// ImGui_ImplOpenGL3_Init( "#version 140" ); + ImGui_ImplOpenGL3_Init(); init_colors(); @@ -118,7 +119,7 @@ ui_layer::init_colors() { void ui_layer::shutdown() { - ImGui_ImplOpenGL2_Shutdown(); + ImGui_ImplOpenGL3_Shutdown(); ImGui_ImplGlfw_Shutdown(); ImGui::DestroyContext(); } @@ -188,7 +189,7 @@ ui_layer::render() { ::glClientActiveTexture( m_textureunit ); ::glBindBuffer( GL_ARRAY_BUFFER, 0 ); - ImGui_ImplOpenGL2_NewFrame(); + ImGui_ImplOpenGL3_NewFrame(); ImGui_ImplGlfw_NewFrame(); ImGui::NewFrame(); @@ -198,7 +199,7 @@ ui_layer::render() { render_(); ImGui::Render(); - ImGui_ImplOpenGL2_RenderDrawData( ImGui::GetDrawData() ); + ImGui_ImplOpenGL3_RenderDrawData( ImGui::GetDrawData() ); ::glPopClientAttrib(); } diff --git a/version.h b/version.h index 458ffd4c..abe477cd 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 911 +#define VERSION_MINOR 918 #define VERSION_REVISION 0 From 4c7d254539949aef140bad404775eee9a8a2242b Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 18 Sep 2018 20:29:23 +0200 Subject: [PATCH 404/426] minor logging message tweaks --- Event.cpp | 20 ++++++++++---------- Event.h | 2 +- Track.cpp | 2 +- scenenode.cpp | 2 +- simulationstateserializer.cpp | 18 +++++++++--------- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Event.cpp b/Event.cpp index e1268c79..a0fc5c32 100644 --- a/Event.cpp +++ b/Event.cpp @@ -743,7 +743,7 @@ copyvalues_event::init() { std::get( m_input.data_source ) = simulation::Memory.find( std::get( m_input.data_source ) ); if( std::get( m_input.data_source ) == nullptr ) { m_ignored = true; // deaktywacja - ErrorLog( "Bad event: copyvalues event \"" + m_name + "\" cannot find memcell \"" + std::get( m_input.data_source ) + "\"" ); + ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find memory cell \"" + std::get( m_input.data_source ) + "\"" ); } } @@ -1030,7 +1030,7 @@ multi_event::init() { for( auto &childevent : m_children ) { std::get( childevent ) = simulation::Events.FindEvent( std::get( childevent ) ); if( std::get( childevent ) == nullptr ) { - ErrorLog( "Bad event: multi-event \"" + m_name + "\" cannot find event \"" + std::get( childevent ) + "\"" ); + ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find event \"" + std::get( childevent ) + "\"" ); } } } @@ -1158,7 +1158,7 @@ sound_event::init() { std::get( target ) = simulation::Sounds.find( std::get( target ) ); if( std::get( target ) == nullptr ) { m_ignored = true; // deaktywacja - ErrorLog( "Bad event: sound event \"" + m_name + "\" cannot find static sound \"" + std::get( target ) + "\"" ); + ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find static sound \"" + std::get( target ) + "\"" ); } } } @@ -1279,7 +1279,7 @@ animation_event::init() { auto *targetcontainer{ targetmodel->GetContainer( m_animationsubmodel ) }; if( targetcontainer == nullptr ) { m_ignored = true; - ErrorLog( "Bad event: animation event \"" + m_name + "\" cannot find submodel " + m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" ); + ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find submodel " + m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" ); break; } targetcontainer->WillBeAnimated(); // oflagowanie animacji @@ -1478,7 +1478,7 @@ lights_event::deserialize_( cParser &Input, scene::scratch_data &Scratchpad ) { Input >> m_lights[ lightidx++ ]; } else { - ErrorLog( "Bad event: lights event \"" + m_name + "\" with more than " + to_string( lightcountlimit ) + " parameters" ); + ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") with more than " + to_string( lightcountlimit ) + " parameters" ); } } while( lightidx < lightcountlimit ) { @@ -1736,7 +1736,7 @@ visible_event::init() { } if( targetnode == nullptr ) { m_ignored = true; // deaktywacja - ErrorLog( "Bad event: visibility event \"" + m_name + "\" cannot find item \"" + std::get( target ) + "\"" ); + ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find item \"" + std::get( target ) + "\"" ); } } } @@ -1972,7 +1972,7 @@ event_manager::insert( basic_event *Event ) { else { // NOTE: somewhat convoluted way to deal with 'replacing' events without leaving dangling pointers // can be cleaned up if pointers to events were replaced with handles - ErrorLog( "Bad event: encountered duplicated event, \"" + Event->m_name + "\"" ); + ErrorLog( "Bad scenario: duplicate event name \"" + Event->m_name + "\"" ); duplicate->append( Event ); // doczepka (taki wirtualny multiple bez warunków) duplicate->m_ignored = true; // dezaktywacja pierwotnego - taka proteza na wsteczną zgodność } @@ -2123,7 +2123,7 @@ event_manager::InitLaunchers() { // jeśli jest powiązana komórka pamięci launcher->MemCell = simulation::Memory.find( launcher->asMemCellName ); if( launcher->MemCell == nullptr ) { - ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find memcell \"" + launcher->asMemCellName + "\"" ); + ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" can't find memcell \"" + launcher->asMemCellName + "\"" ); } } else { @@ -2134,14 +2134,14 @@ event_manager::InitLaunchers() { if( launcher->asEvent1Name != "none" ) { launcher->Event1 = simulation::Events.FindEvent( launcher->asEvent1Name ); if( launcher->Event1 == nullptr ) { - ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent1Name + "\"" ); + ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" can't find event \"" + launcher->asEvent1Name + "\"" ); } } if( launcher->asEvent2Name != "none" ) { launcher->Event2 = simulation::Events.FindEvent( launcher->asEvent2Name ); if( launcher->Event2 == nullptr ) { - ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" cannot find event \"" + launcher->asEvent2Name + "\"" ); + ErrorLog( "Bad scenario: event launcher \"" + launcher->name() + "\" can't find event \"" + launcher->asEvent2Name + "\"" ); } } } diff --git a/Event.h b/Event.h index 60e35277..d32c0381 100644 --- a/Event.h +++ b/Event.h @@ -634,7 +634,7 @@ basic_event::init_targets( TableType_ &Repository, std::string const &Targettype if( std::get( target ) == nullptr ) { m_ignored = true; // deaktywacja if( Logerrors ) - ErrorLog( "Bad event: " + type() + " event \"" + m_name + "\" cannot find " + Targettype +" \"" + std::get( target ) + "\"" ); + ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find " + Targettype +" \"" + std::get( target ) + "\"" ); } } } diff --git a/Track.cpp b/Track.cpp index b5d24ef8..982b77c6 100644 --- a/Track.cpp +++ b/Track.cpp @@ -909,7 +909,7 @@ bool TTrack::AssignEvents() { m_events = true; } else { - ErrorLog( "Bad event: event \"" + event.first + "\" assigned to track \"" + m_name + "\" does not exist" ); + ErrorLog( "Bad track: \"" + m_name + "\" can't find assigned event \"" + event.first + "\"" ); lookupfail = true; } } diff --git a/scenenode.cpp b/scenenode.cpp index 67efa435..1f1d9f8d 100644 --- a/scenenode.cpp +++ b/scenenode.cpp @@ -606,7 +606,7 @@ lines_node::import( cParser &Input, scene::node_data const &Nodedata ) { m_data.vertices.emplace_back( vertex0 ); } if( m_data.vertices.size() % 2 != 0 ) { - ErrorLog( "Lines node specified odd number of vertices, encountered in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); + ErrorLog( "Lines node specified odd number of vertices, defined in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); m_data.vertices.pop_back(); } diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index ed6a52c9..49410389 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -106,7 +106,7 @@ state_serializer::deserialize( cParser &Input, scene::scratch_data &Scratchpad ) lookup->second(); } else { - ErrorLog( "Bad scenario: unexpected token \"" + token + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); + ErrorLog( "Bad scenario: unexpected token \"" + token + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( Input.Line() - 1 ) + ")" ); } timenow = std::chrono::steady_clock::now(); @@ -316,7 +316,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( false == simulation::Vehicles.insert( vehicle ) ) { - ErrorLog( "Bad scenario: vehicle with duplicate name \"" + vehicle->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: duplicate vehicle name \"" + vehicle->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } if( ( vehicle->MoverParameters->CategoryFlag == 1 ) // trains only @@ -330,7 +330,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch auto *path { deserialize_path( Input, Scratchpad, nodedata ) }; // duplicates of named tracks are currently experimentally allowed if( false == simulation::Paths.insert( path ) ) { - ErrorLog( "Bad scenario: track with duplicate name \"" + path->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: duplicate track name \"" + path->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); /* delete path; delete pathnode; @@ -346,7 +346,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( traction == nullptr ) { return; } if( false == simulation::Traction.insert( traction ) ) { - ErrorLog( "Bad scenario: traction piece with duplicate name \"" + traction->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: duplicate traction piece name \"" + traction->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } scene::Groups.insert( scene::Groups.handle(), traction ); simulation::Region->insert_and_register( traction ); @@ -358,7 +358,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( powersource == nullptr ) { return; } if( false == simulation::Powergrid.insert( powersource ) ) { - ErrorLog( "Bad scenario: power grid source with duplicate name \"" + powersource->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: duplicate power grid source name \"" + powersource->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } /* // TODO: implement this @@ -407,7 +407,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch if( instance == nullptr ) { return; } if( false == simulation::Instances.insert( instance ) ) { - ErrorLog( "Bad scenario: 3d model instance with duplicate name \"" + instance->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: duplicate 3d model instance name \"" + instance->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } scene::Groups.insert( scene::Groups.handle(), instance ); simulation::Region->insert( instance ); @@ -450,7 +450,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch auto *memorycell { deserialize_memorycell( Input, Scratchpad, nodedata ) }; if( false == simulation::Memory.insert( memorycell ) ) { - ErrorLog( "Bad scenario: memory memorycell with duplicate name \"" + memorycell->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: duplicate memory cell name \"" + memorycell->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } scene::Groups.insert( scene::Groups.handle(), memorycell ); simulation::Region->insert( memorycell ); @@ -459,7 +459,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch auto *eventlauncher { deserialize_eventlauncher( Input, Scratchpad, nodedata ) }; if( false == simulation::Events.insert( eventlauncher ) ) { - ErrorLog( "Bad scenario: event launcher with duplicate name \"" + eventlauncher->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: duplicate event launcher name \"" + eventlauncher->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } // event launchers can be either global, or local with limited range of activation // each gets assigned different caretaker @@ -475,7 +475,7 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch auto *sound { deserialize_sound( Input, Scratchpad, nodedata ) }; if( false == simulation::Sounds.insert( sound ) ) { - ErrorLog( "Bad scenario: sound node with duplicate name \"" + sound->name() + "\" encountered in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); + ErrorLog( "Bad scenario: duplicate sound node name \"" + sound->name() + "\" defined in file \"" + Input.Name() + "\" (line " + std::to_string( inputline ) + ")" ); } simulation::Region->insert( sound ); } From 38591a09f2a38a881e32d46977f11b07df338464 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 19 Sep 2018 19:12:53 +0200 Subject: [PATCH 405/426] basic cargo attributes system, minor cargo enhancements and fixes --- DynObj.cpp | 147 +++++++++-------------- DynObj.h | 5 +- Event.cpp | 8 +- McZapkie/MOVER.h | 28 +++-- McZapkie/Mover.cpp | 289 +++++++++++++++++++++++++-------------------- Model3d.cpp | 4 +- driveruipanels.cpp | 4 +- station.cpp | 13 +- 8 files changed, 253 insertions(+), 245 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 1c9da755..1c8b4267 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -1783,7 +1783,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" asBaseDir = szDynamicPath + BaseDir + "/"; // McZapkie-310302 replace_slashes( asBaseDir ); asName = Name; - std::string asAnimName = ""; // zmienna robocza do wyszukiwania osi i wózków + std::string asAnimName; // zmienna robocza do wyszukiwania osi i wózków // Ra: zmieniamy znaczenie obsady na jednoliterowe, żeby dosadzić kierownika if (DriverType == "headdriver") DriverType = "1"; // sterujący kabiną +1 @@ -1810,7 +1810,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" } */ // utworzenie parametrów fizyki - MoverParameters = new TMoverParameters(iDirection ? fVel : -fVel, Type_Name, asName, Load, LoadType, Cab); + MoverParameters = new TMoverParameters(iDirection ? fVel : -fVel, Type_Name, asName, Cab); iLights = MoverParameters->iLights; // wskaźnik na stan własnych świateł // McZapkie: TypeName musi byc nazwą CHK/MMD pojazdu if (!MoverParameters->LoadFIZ(asBaseDir)) @@ -1822,6 +1822,9 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" } return 0.0; // zerowa długość to brak pojazdu } + // load the cargo now that we know whether the vehicle will allow it + MoverParameters->AssignLoad( LoadType, Load ); + bool driveractive = (fVel != 0.0); // jeśli prędkość niezerowa, to aktywujemy ruch if (!MoverParameters->CheckLocomotiveParameters( driveractive, @@ -2095,7 +2098,8 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" iAxles = std::min( MoverParameters->NAxles, MaxAxles ); // ilość osi */ // wczytywanie z pliku nazwatypu.mmd, w tym model - LoadMMediaFile(asBaseDir, Type_Name, asReplacableSkin); + erase_extension( asReplacableSkin ); + LoadMMediaFile(Type_Name, asReplacableSkin); // McZapkie-100402: wyszukiwanie submodeli sprzegów btCoupler1.Init( "coupler1", mdModel, false ); // false - ma być wyłączony btCoupler2.Init( "coupler2", mdModel, false); @@ -2612,13 +2616,13 @@ void TDynamicObject::update_exchange( double const Deltatime ) { auto const exchangesize = std::min( m_exchange.unload_count, MoverParameters->UnLoadSpeed * m_exchange.speed_factor ); m_exchange.unload_count -= exchangesize; MoverParameters->LoadStatus = 1; - MoverParameters->Load = std::max( 0.f, MoverParameters->Load - exchangesize ); + MoverParameters->LoadAmount = std::max( 0.f, MoverParameters->LoadAmount - exchangesize ); update_load_visibility(); } if( m_exchange.unload_count < 0.01 ) { // finish any potential unloading operation before adding new load // don't load more than can fit - m_exchange.load_count = std::min( m_exchange.load_count, MoverParameters->MaxLoad - MoverParameters->Load ); + m_exchange.load_count = std::min( m_exchange.load_count, MoverParameters->MaxLoad - MoverParameters->LoadAmount ); while( ( m_exchange.load_count > 0.01 ) && ( m_exchange.time >= 1.0 ) ) { @@ -2626,7 +2630,7 @@ void TDynamicObject::update_exchange( double const Deltatime ) { auto const exchangesize = std::min( m_exchange.load_count, MoverParameters->LoadSpeed * m_exchange.speed_factor ); m_exchange.load_count -= exchangesize; MoverParameters->LoadStatus = 2; - MoverParameters->Load = std::min( MoverParameters->MaxLoad, MoverParameters->Load + exchangesize ); // std::max not strictly needed but, eh + MoverParameters->LoadAmount = std::min( MoverParameters->MaxLoad, MoverParameters->LoadAmount + exchangesize ); // std::max not strictly needed but, eh update_load_visibility(); } } @@ -2664,34 +2668,28 @@ void TDynamicObject::LoadUpdate() { // przeładowanie modelu ładunku // Ra: nie próbujemy wczytywać modeli miliony razy podczas renderowania!!! if( ( mdLoad == nullptr ) - && ( MoverParameters->Load > 0 ) ) { + && ( MoverParameters->LoadAmount > 0 ) ) { - if( false == MoverParameters->LoadType.empty() ) { + if( false == MoverParameters->LoadType.name.empty() ) { + // bieżąca ścieżka do tekstur to dynamic/... + Global.asCurrentTexturePath = asBaseDir; - Global.asCurrentTexturePath = asBaseDir; // bieżąca ścieżka do tekstur to dynamic/... - - // try first specialized version of the load model, vehiclename_loadname - auto const specializedloadfilename { asBaseDir + MoverParameters->TypeName + "_" + MoverParameters->LoadType }; - mdLoad = TModelsManager::GetModel( specializedloadfilename, true ); - if( mdLoad == nullptr ) { - // if this fails, try generic load model - auto const genericloadfilename { asBaseDir + MoverParameters->LoadType }; - mdLoad = TModelsManager::GetModel( genericloadfilename, true ); - } + mdLoad = LoadMMediaFile_mdload( MoverParameters->LoadType.name ); + // TODO: discern from vehicle component which merely uses vehicle directory and has no animations, so it can be initialized outright + // and actual vehicles which get their initialization after their animations are set up if( mdLoad != nullptr ) { - // TODO: discern from vehicle component which merely uses vehicle directory and has no animations, so it can be initialized outright - // and actual vehicles which get their initialization after their animations are set up mdLoad->Init(); } // update bindings between lowpoly sections and potential load chunks placed inside them update_load_sections(); - - Global.asCurrentTexturePath = std::string( szTexturePath ); // z powrotem defaultowa sciezka do tekstur + // z powrotem defaultowa sciezka do tekstur + Global.asCurrentTexturePath = std::string( szTexturePath ); } // Ra: w MMD można by zapisać położenie modelu ładunku (np. węgiel) w zależności od załadowania } - else if( MoverParameters->Load == 0 ) { + else if( MoverParameters->LoadAmount == 0 ) { // nie ma ładunku + MoverParameters->AssignLoad( "" ); mdLoad = nullptr; // erase bindings between lowpoly sections and potential load chunks placed inside them update_load_sections(); @@ -2729,7 +2727,7 @@ TDynamicObject::update_load_visibility() { auto loadpercentage { ( MoverParameters->MaxLoad == 0.0 ? 0.0 : - 100.0 * MoverParameters->Load / MoverParameters->MaxLoad ) }; + 100.0 * MoverParameters->LoadAmount / MoverParameters->MaxLoad ) }; auto const sectionloadpercentage { ( SectionLoadVisibility.empty() ? 0.0 : @@ -2758,14 +2756,14 @@ TDynamicObject::update_load_visibility() { void TDynamicObject::update_load_offset() { - if( MoverParameters->LoadMinOffset == 0.f ) { return; } + if( MoverParameters->LoadType.offset_min == 0.f ) { return; } auto const loadpercentage { ( MoverParameters->MaxLoad == 0.0 ? 0.0 : - 100.0 * MoverParameters->Load / MoverParameters->MaxLoad ) }; + 100.0 * MoverParameters->LoadAmount / MoverParameters->MaxLoad ) }; - LoadOffset = interpolate( MoverParameters->LoadMinOffset, 0.f, clamp( 0.0, 1.0, loadpercentage * 0.01 ) ); + LoadOffset = interpolate( MoverParameters->LoadType.offset_min, 0.f, clamp( 0.0, 1.0, loadpercentage * 0.01 ) ); } void @@ -4479,20 +4477,14 @@ TDynamicObject::tracing_offset() const { // McZapkie-250202 // wczytywanie pliku z danymi multimedialnymi (dzwieki) -void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, std::string ReplacableSkin ) { - - replace_slashes( BaseDir ); - Global.asCurrentDynamicPath = BaseDir; - std::string asFileName = BaseDir + TypeName + ".mmd"; - std::string asLoadName; - if( false == MoverParameters->LoadType.empty() ) { - asLoadName = BaseDir + MoverParameters->LoadType; - } +void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string const &ReplacableSkin ) { + Global.asCurrentDynamicPath = asBaseDir; + std::string asFileName = asBaseDir + TypeName + ".mmd"; std::string asAnimName; bool Stop_InternalData = false; pants = NULL; // wskaźnik pierwszego obiektu animującego dla pantografów - cParser parser( TypeName + ".mmd", cParser::buffer_FILE, BaseDir ); + cParser parser( TypeName + ".mmd", cParser::buffer_FILE, asBaseDir ); if( false == parser.ok() ) { ErrorLog( "Failed to load appearance data for vehicle " + MoverParameters->Name ); return; @@ -4526,8 +4518,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } m_materialdata.multi_textures = clamp( m_materialdata.multi_textures, 0, 1 ); // na razie ustawiamy na 1 } - asModel = BaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje modele w dynamics/basedir - Global.asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... + asModel = asBaseDir + asModel; // McZapkie 2002-07-20: dynamics maja swoje modele w dynamics/basedir + Global.asCurrentTexturePath = asBaseDir; // biezaca sciezka do tekstur to dynamic/... mdModel = TModelsManager::GetModel(asModel, true); if (ReplacableSkin != "none") { @@ -4553,7 +4545,6 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, } else { // otherwise try the basic approach - erase_extension( ReplacableSkin ); int skinindex = 0; do { material_handle material = GfxRenderer.Fetch_Material( ReplacableSkin + "," + std::to_string( skinindex + 1 ), true ); @@ -4598,53 +4589,9 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_materialdata.textures_alpha |= 0x08080008; } } - if( !MoverParameters->LoadAccepted.empty() ) { - - if( ( MoverParameters->EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) - && ( asLoadName == "pantstate" ) ) { - // wartość niby "pantstate" - nazwa dla formalności, ważna jest ilość - if( MoverParameters->Load == 1 ) { - MoverParameters->PantFront( true ); - } - else if( MoverParameters->Load == 2 ) { - MoverParameters->PantRear( true ); - } - else if( MoverParameters->Load == 3 ) { - MoverParameters->PantFront( true ); - MoverParameters->PantRear( true ); - } - else if( MoverParameters->Load == 4 ) { - MoverParameters->DoubleTr = -1; - } - else if( MoverParameters->Load == 5 ) { - MoverParameters->DoubleTr = -1; - MoverParameters->PantRear( true ); - } - else if( MoverParameters->Load == 6 ) { - MoverParameters->DoubleTr = -1; - MoverParameters->PantFront( true ); - } - else if( MoverParameters->Load == 7 ) { - MoverParameters->DoubleTr = -1; - MoverParameters->PantFront( true ); - MoverParameters->PantRear( true ); - } - } - else { - // Ra: tu wczytywanie modelu ładunku jest w porządku - if( false == asLoadName.empty() ) { - // try first specialized version of the load model, vehiclename_loadname - auto const specializedloadfilename { BaseDir + TypeName + "_" + MoverParameters->LoadType }; - if( ( true == FileExists( specializedloadfilename + ".e3d" ) ) - || ( true == FileExists( specializedloadfilename + ".t3d" ) ) ) { - mdLoad = TModelsManager::GetModel( specializedloadfilename, true ); - } - if( mdLoad == nullptr ) { - // if this fails, try generic load model - mdLoad = TModelsManager::GetModel( asLoadName, true ); - } - } - } + if( false == MoverParameters->LoadAttributes.empty() ) { + // Ra: tu wczytywanie modelu ładunku jest w porządku + mdLoad = LoadMMediaFile_mdload( MoverParameters->LoadType.name ); } Global.asCurrentTexturePath = szTexturePath; // z powrotem defaultowa sciezka do tekstur do { @@ -4707,8 +4654,8 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, // filename can potentially begin with a slash, and we don't need it asModel.erase( 0, 1 ); } - asModel = BaseDir + asModel; // McZapkie-200702 - dynamics maja swoje modele w dynamic/basedir - Global.asCurrentTexturePath = BaseDir; // biezaca sciezka do tekstur to dynamic/... + asModel = asBaseDir + asModel; // McZapkie-200702 - dynamics maja swoje modele w dynamic/basedir + Global.asCurrentTexturePath = asBaseDir; // biezaca sciezka do tekstur to dynamic/... mdLowPolyInt = TModelsManager::GetModel(asModel, true); } @@ -5925,6 +5872,25 @@ void TDynamicObject::LoadMMediaFile( std::string BaseDir, std::string TypeName, m_couplersounds[ side::rear ].dsbBufferClamp_loud.offset( rearcoupleroffset ); } +TModel3d * +TDynamicObject::LoadMMediaFile_mdload( std::string const &Name ) const { + + if( Name.empty() ) { return nullptr; } + + // try first specialized version of the load model, vehiclename_loadname + TModel3d *loadmodel { nullptr }; + auto const specializedloadfilename { asBaseDir + MoverParameters->TypeName + "_" + Name }; + if( ( true == FileExists( specializedloadfilename + ".e3d" ) ) + || ( true == FileExists( specializedloadfilename + ".t3d" ) ) ) { + loadmodel = TModelsManager::GetModel( specializedloadfilename, true ); + } + if( loadmodel == nullptr ) { + // if this fails, try generic load model + loadmodel = TModelsManager::GetModel( asBaseDir + Name, true ); + } + return loadmodel; +} + //--------------------------------------------------------------------------- void TDynamicObject::RadioStop() { // zatrzymanie pojazdu @@ -7029,7 +6995,8 @@ vehicle_table::erase_disabled() { && ( true == vehicle->MyTrack->RemoveDynamicObject( vehicle ) ) ) { vehicle->MyTrack = nullptr; } - if( simulation::Train->Dynamic() == vehicle ) { + if( ( simulation::Train != nullptr ) + && ( simulation::Train->Dynamic() == vehicle ) ) { // clear potential train binding // TBD, TODO: manually eject the driver first ? SafeDelete( simulation::Train ); diff --git a/DynObj.h b/DynObj.h index 094a919a..0976e11e 100644 --- a/DynObj.h +++ b/DynObj.h @@ -458,7 +458,7 @@ private: public: void ABuScanObjects(int ScanDir, double ScanDist); - protected: + private: TDynamicObject *ABuFindObject( int &Foundcoupler, double &Distance, TTrack const *Track, int const Direction, int const Mycoupler ); void ABuCheckMyTrack(); @@ -580,7 +580,8 @@ private: Axle0.GetTrack()); }; // McZapkie-260202 - void LoadMMediaFile(std::string BaseDir, std::string TypeName, std::string ReplacableSkin); + void LoadMMediaFile(std::string const &TypeName, std::string const &ReplacableSkin); + TModel3d *LoadMMediaFile_mdload( std::string const &Name ) const; inline double ABuGetDirection() const { // ABu. return (Axle1.GetTrack() == MyTrack ? Axle1.GetDirection() : Axle0.GetDirection()); }; diff --git a/Event.cpp b/Event.cpp index a0fc5c32..9eb39692 100644 --- a/Event.cpp +++ b/Event.cpp @@ -913,15 +913,15 @@ whois_event::run_() { else { // jeśli parametry ładunku targetcell->UpdateValues( - m_activator->MoverParameters->LoadType, // nazwa ładunku - m_activator->MoverParameters->Load, // aktualna ilość + m_activator->MoverParameters->LoadType.name, // nazwa ładunku + m_activator->MoverParameters->LoadAmount, // aktualna ilość m_activator->MoverParameters->MaxLoad, // maksymalna ilość m_input.flags & ( flags::text | flags::value_1 | flags::value_2 ) ); WriteLog( "Type: WhoIs (" + to_string( m_input.flags ) + ") - " - + "[load type: " + m_activator->MoverParameters->LoadType + "], " - + "[current load: " + to_string( m_activator->MoverParameters->Load, 2 ) + "], " + + "[load type: " + m_activator->MoverParameters->LoadType.name + "], " + + "[current load: " + to_string( m_activator->MoverParameters->LoadAmount, 2 ) + "], " + "[max load: " + to_string( m_activator->MoverParameters->MaxLoad, 2 ) + "]" ); } } diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 3b04861b..9dcbaadb 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -944,11 +944,19 @@ public: double MED_EPVC_Time = 7; // czas korekcji sily hamowania EP, gdy nie ma dostepnego ED bool MED_Ncor = 0; // czy korekcja sily hamowania z uwzglednieniem nacisku /*-dla wagonow*/ + struct load_attributes { + std::string name; // name of the cargo + float offset_min { 0.f }; // offset applied to cargo model when load amount is 0 + + load_attributes() = default; + load_attributes( std::string const &Name, float const Offsetmin ) : + name( Name ), offset_min( Offsetmin ) + {} + }; + std::vector LoadAttributes; float MaxLoad = 0.f; /*masa w T lub ilosc w sztukach - ladownosc*/ - std::string LoadAccepted; std::string LoadQuantity; /*co moze byc zaladowane, jednostki miary*/ - double OverLoadFactor = 0.0; /*ile razy moze byc przekroczona ladownosc*/ - float LoadMinOffset { 0.f }; // offset applied to cargo model when load amount is 0 - float LoadSpeed = 0.f; float UnLoadSpeed = 0.f;/*szybkosc na- i rozladunku jednostki/s*/ + double OverLoadFactor = 0.0; /*ile razy moze byc przekroczona ladownosc*/ + float LoadSpeed = 0.f; float UnLoadSpeed = 0.f;/*szybkosc na- i rozladunku jednostki/s*/ int DoorOpenCtrl = 0; int DoorCloseCtrl = 0; /*0: przez pasazera, 1: przez maszyniste, 2: samoczynne (zamykanie)*/ double DoorStayOpen = 0.0; /*jak dlugo otwarte w przypadku DoorCloseCtrl=2*/ bool DoorClosureWarning = false; /*czy jest ostrzeganie przed zamknieciem*/ @@ -1167,9 +1175,10 @@ public: double eAngle = M_PI * 0.5; /*-dla wagonow*/ - float Load = 0.f; /*masa w T lub ilosc w sztukach - zaladowane*/ - std::string LoadType; /*co jest zaladowane*/ - int LoadStatus = 0; //+1=trwa rozladunek,+2=trwa zaladunek,+4=zakończono,0=zaktualizowany model + float LoadAmount = 0.f; /*masa w T lub ilosc w sztukach - zaladowane*/ + load_attributes LoadType; + std::string LoadQuantity; // jednostki miary + int LoadStatus = 0; //+1=trwa rozladunek,+2=trwa zaladunek,+4=zakończono,0=zaktualizowany model double LastLoadChangeTime = 0.0; //raz (roz)ładowania bool DoorBlocked = false; //Czy jest blokada drzwi @@ -1211,7 +1220,7 @@ private: double CouplerDist(int Coupler); public: - TMoverParameters(double VelInitial, std::string TypeNameInit, std::string NameInit, int LoadInitial, std::string LoadTypeInitial, int Cab); + TMoverParameters(double VelInitial, std::string TypeNameInit, std::string NameInit, int Cab); // obsługa sprzęgów double Distance(const TLocation &Loc1, const TLocation &Loc2, const TDimension &Dim1, const TDimension &Dim2); /* double Distance(const vector3 &Loc1, const vector3 &Loc2, const vector3 &Dim1, const vector3 &Dim2); @@ -1375,7 +1384,8 @@ public: bool dizel_Update(double dt); /* funckje dla wagonow*/ - bool LoadingDone(double LSpeed, std::string LoadInit); + bool AssignLoad( std::string const &Name, float const Amount = 0.f ); + bool LoadingDone(double LSpeed, std::string const &Loadname); bool DoorLeft(bool State, range_t const Notify = range_t::consist ); //obsluga drzwi lewych bool DoorRight(bool State, range_t const Notify = range_t::consist ); //obsluga drzwi prawych bool DoorBlockedFlag(void); //sprawdzenie blokady drzwi diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 2e2b7a5f..06d4100e 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -278,21 +278,14 @@ double TMoverParameters::Current(double n, double U) // ************************************************************************************************* // główny konstruktor // ************************************************************************************************* -TMoverParameters::TMoverParameters(double VelInitial, std::string TypeNameInit, - std::string NameInit, int LoadInitial, - std::string LoadTypeInitial, - int Cab) ://: T_MoverParameters(VelInitial, TypeNameInit, - //NameInit, LoadInitial, LoadTypeInitial, Cab) +TMoverParameters::TMoverParameters(double VelInitial, std::string TypeNameInit, std::string NameInit, int Cab) : TypeName( TypeNameInit ), Name( NameInit ), -ActiveCab( Cab ), -Load( LoadInitial ), -LoadType( LoadTypeInitial ) +ActiveCab( Cab ) { WriteLog( "------------------------------------------------------"); - WriteLog("init default physic values for " + NameInit + ", [" + TypeNameInit + "], [" + - LoadTypeInitial + "]"); + WriteLog("init default physic values for " + NameInit + ", [" + TypeNameInit + "]"); Dim = TDimension(); // BrakeLevelSet(-2); //Pascal ustawia na 0, przestawimy na odcięcie (CHK jest jeszcze nie wczytane!) @@ -354,10 +347,6 @@ LoadType( LoadTypeInitial ) } eimc[eimc_p_eped] = 1.5; - // inicjalizacja zmiennych} - // Loc:=LocInitial; //Ra: to i tak trzeba potem przesunąć, po ustaleniu pozycji na torze - // (potrzebna długość) - // Rot:=RotInitial; for (int b = 0; b < 2; ++b) { Couplers[b].AllowedFlag = 3; // domyślnie hak i hamulec, inne trzeba włączyć jawnie w FIZ @@ -409,20 +398,6 @@ LoadType( LoadTypeInitial ) SecuritySystem.RadioStop = false; // domyślnie nie ma SecuritySystem.AwareMinSpeed = 0.1 * Vmax; s_CAtestebrake = false; - // ABu 240105: - // CouplerNr[0]:=1; - // CouplerNr[1]:=0; - - // TO POTEM TU UAKTYWNIC A WYWALIC Z CHECKPARAM} - //{ - // if Pos(LoadTypeInitial,LoadAccepted)>0 then - // begin - //} - - //{ - // end - // else Load:=0; - // } }; double TMoverParameters::Distance(const TLocation &Loc1, const TLocation &Loc2, @@ -3758,27 +3733,25 @@ void TMoverParameters::ComputeConstans(void) // ************************************************************************************************* double TMoverParameters::ComputeMass(void) { - double M; - LoadType = ToLower(LoadType); // po co zakładać jak można mieć na pewno - if (Load > 0) - { // zakładamy, że ładunek jest pisany małymi literami + double M { 0.0 }; + // TODO: unit weight table, pulled from external data file + if( LoadAmount > 0 ) { + if (ToLower(LoadQuantity) == "tonns") - M = Load * 1000; - else if (LoadType == "passengers") - M = Load * 80; - else if (LoadType == "luggage") - M = Load * 100; - else if (LoadType == "cars") - M = Load * 1200; // 800 kilo to miał maluch - else if (LoadType == "containers") - M = Load * 8000; - else if (LoadType == "transformers") - M = Load * 50000; + M = LoadAmount * 1000; + else if (LoadType.name == "passengers") + M = LoadAmount * 80; + else if (LoadType.name == "luggage") + M = LoadAmount * 100; + else if (LoadType.name == "cars") + M = LoadAmount * 1200; // 800 kilo to miał maluch + else if (LoadType.name == "containers") + M = LoadAmount * 8000; + else if (LoadType.name == "transformers") + M = LoadAmount * 50000; else - M = Load * 1000; + M = LoadAmount * 1000; } - else - M = 0; // Ra: na razie tak, ale nie wszędzie masy wirujące się wliczają return Mass + M + Mred; } @@ -6458,58 +6431,105 @@ void TMoverParameters::dizel_Heat( double const dt ) { */ } +bool +TMoverParameters::AssignLoad( std::string const &Name, float const Amount ) { + + if( Name == "pantstate" ) { + if( EnginePowerSource.SourceType == TPowerSource::CurrentCollector ) { + // wartość niby "pantstate" - nazwa dla formalności, ważna jest ilość + auto const pantographsetup { static_cast( Amount ) }; + if( pantographsetup & ( 1 << 2 ) ) { + DoubleTr = -1; + } + if( pantographsetup & ( 1 << 0 ) ) { + if( DoubleTr == 1 ) { PantFront( true ); } + else { PantRear( true ); } + } + if( pantographsetup & ( 1 << 1 ) ) { + if( DoubleTr == 1 ) { PantRear( true ); } + else { PantFront( true ); } + } + return true; + } + else { + return false; + } + } + + // can't mix load types, at least for the time being + if( ( LoadAmount > 0 ) && ( LoadType.name != Name ) ) { return false; } + + if( Name.empty() ) { + // empty the vehicle + LoadType = load_attributes(); + LoadAmount = 0.f; + return true; + } + + for( auto const &loadattributes : LoadAttributes ) { + if( Name == loadattributes.name ) { + LoadType = loadattributes; + LoadAmount = Amount; + return true; + } + } + // didn't find matching load configuration, this type is unsupported + return false; +} + // ************************************************************************************************* // Q: 20160713 // Test zakończenia załadunku / rozładunku // ************************************************************************************************* -bool TMoverParameters::LoadingDone(double LSpeed, std::string LoadInit) -{ - // test zakończenia załadunku/rozładunku - long LoadChange = 0; - bool LD = false; +bool TMoverParameters::LoadingDone(double const LSpeed, std::string const &Loadname) { - // ClearPendingExceptions; // zabezpieczenie dla Trunc() - // LoadingDone:=false; //nie zakończone - if (!LoadInit.empty()) // nazwa ładunku niepusta - { - if (Load > MaxLoad) - LoadChange = abs(long(LSpeed * LastLoadChangeTime / 2.0)); // przeładowanie? - else - LoadChange = abs(long(LSpeed * LastLoadChangeTime)); - if (LSpeed < 0) // gdy rozładunek - { - LoadStatus = 2; // trwa rozładunek (włączenie naliczania czasu) - if (LoadChange != 0) // jeśli coś przeładowano - { - LastLoadChangeTime = 0; // naliczony czas został zużyty - Load -= LoadChange; // zmniejszenie ilości ładunku - CommandIn.Value1 = - CommandIn.Value1 - LoadChange; // zmniejszenie ilości do rozładowania - if (Load < 0) - Load = 0; //ładunek nie może być ujemny - if ((Load == 0) || (CommandIn.Value1 < 0)) // pusto lub rozładowano żądaną ilość - LoadStatus = 4; // skończony rozładunek - if (Load == 0) - LoadType.clear(); // jak nic nie ma, to nie ma też nazwy - } - } - else if (LSpeed > 0) // gdy załadunek - { - LoadStatus = 1; // trwa załadunek (włączenie naliczania czasu) - if (LoadChange != 0) // jeśli coś przeładowano - { - LastLoadChangeTime = 0; // naliczony czas został zużyty - LoadType = LoadInit; // nazwa - Load += LoadChange; // zwiększenie ładunku - CommandIn.Value1 = CommandIn.Value1 - LoadChange; - if ((Load >= MaxLoad * (1.0 + OverLoadFactor)) || (CommandIn.Value1 < 0)) - LoadStatus = 4; // skończony załadunek - } - } - else - LoadStatus = 4; // zerowa prędkość zmiany, to koniec + if( LSpeed == 0.0 ) { + // zerowa prędkość zmiany, to koniec + LoadStatus = 4; + return true; } - return (LoadStatus >= 4); + + if( Loadname.empty() ) { return ( LoadStatus >= 4 ); } + if( Loadname != LoadType.name ) { return ( LoadStatus >= 4 ); } + + // test zakończenia załadunku/rozładunku + // load exchange speed is reduced if the wagon is overloaded + auto const loadchange { static_cast( std::abs( LSpeed * LastLoadChangeTime ) * ( LoadAmount > MaxLoad ? 0.5 : 1.0 ) ) }; + + if( LSpeed < 0 ) { + // gdy rozładunek + LoadStatus = 2; // trwa rozładunek (włączenie naliczania czasu) + if( loadchange > 0 ) // jeśli coś przeładowano + { + LastLoadChangeTime = 0; // naliczony czas został zużyty + LoadAmount -= loadchange; // zmniejszenie ilości ładunku + CommandIn.Value1 -= loadchange; // zmniejszenie ilości do rozładowania + if( ( LoadAmount <= 0 ) || ( CommandIn.Value1 <= 0 ) ) { + // pusto lub rozładowano żądaną ilość + LoadStatus = 4; // skończony rozładunek + LoadAmount = std::max( 0.f, LoadAmount ); //ładunek nie może być ujemny + } + if( LoadAmount == 0.f ) { + AssignLoad(""); // jak nic nie ma, to nie ma też nazwy + } + } + } + else if( LSpeed > 0 ) { + // gdy załadunek + LoadStatus = 1; // trwa załadunek (włączenie naliczania czasu) + if( loadchange > 0 ) // jeśli coś przeładowano + { + LastLoadChangeTime = 0; // naliczony czas został zużyty + LoadAmount += loadchange; // zwiększenie ładunku + CommandIn.Value1 -= loadchange; + if( ( LoadAmount >= MaxLoad * ( 1.0 + OverLoadFactor ) ) || ( CommandIn.Value1 <= 0 ) ) { + LoadStatus = 4; // skończony załadunek + LoadAmount = std::min( MaxLoad * ( 1.0 + OverLoadFactor ), LoadAmount ); + } + } + } + + return ( LoadStatus >= 4 ); } // ************************************************************************************************* @@ -7593,19 +7613,30 @@ void TMoverParameters::LoadFIZ_Param( std::string const &line ) { void TMoverParameters::LoadFIZ_Load( std::string const &line ) { - extract_value( LoadAccepted, "LoadAccepted", line, "" ); - if( true == LoadAccepted.empty() ) { - return; + auto const acceptedloads { Split( extract_value( "LoadAccepted", line ), ',' ) }; + + if( acceptedloads.empty() ) { return; } + + auto const minoffsets { Split( extract_value( "LoadMinOffset", line ), ',' ) }; + auto minoffset { 0.f }; + auto minoffsetsiterator { std::begin( minoffsets ) }; + // NOTE: last (if any) offset parameter retrieved from the list applies to the remainder of the list + // TBD, TODO: include other load parameters in this system + for( auto &load : acceptedloads ) { + if( minoffsetsiterator != std::end( minoffsets ) ) { + minoffset = std::stof( *minoffsetsiterator ); + ++minoffsetsiterator; + } + LoadAttributes.emplace_back( + ToLower( load ), + minoffset ); } - LoadAccepted = ToLower( LoadAccepted ); extract_value( MaxLoad, "MaxLoad", line, "" ); extract_value( LoadQuantity, "LoadQ", line, "" ); extract_value( OverLoadFactor, "OverLoadFactor", line, "" ); extract_value( LoadSpeed, "LoadSpeed", line, "" ); extract_value( UnLoadSpeed, "UnLoadSpeed", line, "" ); - - extract_value( LoadMinOffset, "LoadMinOffset", line, "" ); } void TMoverParameters::LoadFIZ_Dimensions( std::string const &line ) { @@ -8651,11 +8682,6 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) // WriteLogSS("aa ok", BoolToYN(OK)); } - if( ( LoadType.empty() == false ) && ( LoadAccepted.find( LoadType ) == std::string::npos ) ) { - // remove load if the type isn't supported - Load = 0.0; - } - if (BrakeSystem == TBrakeSystem::Individual) if (BrakeSubsystem != TBrakeSubSystem::ss_None) OK = false; //! @@ -8889,16 +8915,16 @@ bool TMoverParameters::CheckLocomotiveParameters(bool ReadyFlag, int Dir) if( LoadFlag > 0 ) { - if( Load < MaxLoad * 0.45 ) { + if( LoadAmount < MaxLoad * 0.45 ) { IncBrakeMult(); IncBrakeMult(); DecBrakeMult(); // TODO: przeinesiono do mover.cpp - if( Load < MaxLoad * 0.35 ) + if( LoadAmount < MaxLoad * 0.35 ) DecBrakeMult(); } else { IncBrakeMult(); // TODO: przeinesiono do mover.cpp - if( Load >= MaxLoad * 0.55 ) + if( LoadAmount >= MaxLoad * 0.55 ) IncBrakeMult(); } } @@ -9479,39 +9505,44 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C OK = true; // true, gdy można usunąć komendę } /*naladunek/rozladunek*/ - else if ( issection( "Load=", Command ) ) + // TODO: have these commands leverage load exchange system instead + else if ( issection( "Load=", Command ) ) { OK = false; // będzie powtarzane aż się załaduje - if( ( Vel < 0.01 ) + if( ( Vel < 0.1 ) // tolerance margin for small vehicle movements in the consist && ( MaxLoad > 0 ) - && ( Load < MaxLoad * ( 1.0 + OverLoadFactor ) ) ) { - // czy można ładowac? - if( Distance( Loc, CommandIn.Location, Dim, Dim ) < 10 ) { - // ten peron/rampa - auto const testload { ToLower( extract_value( "Load", Command ) ) }; - if( LoadAccepted.find( testload ) != std::string::npos ) // nazwa jest obecna w CHK - OK = LoadingDone( Min0R( CValue2, LoadSpeed ), testload ); // zmienia LoadStatus + && ( LoadAmount < MaxLoad * ( 1.0 + OverLoadFactor ) ) + && ( Distance( Loc, CommandIn.Location, Dim, Dim ) < 10 ) ) { // ten peron/rampa + + auto const loadname { ToLower( extract_value( "Load", Command ) ) }; + if( LoadAmount == 0.f ) { + AssignLoad( loadname ); } + OK = LoadingDone( + std::min( CValue2, LoadSpeed ), + loadname ); // zmienia LoadStatus + } + else { + // no loading can be done if conditions aren't met + LastLoadChangeTime = 0.0; } - // if OK then LoadStatus:=0; //nie udalo sie w ogole albo juz skonczone } else if( issection( "UnLoad=", Command ) ) { OK = false; // będzie powtarzane aż się rozładuje - if( ( Vel < 0.01 ) - && ( Load > 0 ) ) { - // czy jest co rozladowac? - if( Distance( Loc, CommandIn.Location, Dim, Dim ) < 10 ) { - // ten peron - auto const testload { ToLower( extract_value( "UnLoad", Command ) ) }; // zgodność nazwy ładunku z CHK - if( LoadType == testload ) { - /*mozna to rozladowac*/ - OK = LoadingDone( -Min0R( CValue2, LoadSpeed ), testload ); - } - } + if( ( Vel < 0.1 ) // tolerance margin for small vehicle movements in the consist + && ( LoadAmount > 0 ) // czy jest co rozladowac? + && ( Distance( Loc, CommandIn.Location, Dim, Dim ) < 10 ) ) { // ten peron + /*mozna to rozladowac*/ + OK = LoadingDone( + -1.f * std::min( CValue2, LoadSpeed ), + ToLower( extract_value( "UnLoad", Command ) ) ); } - // if OK then LoadStatus:=0; - } + else { + // no loading can be done if conditions aren't met + LastLoadChangeTime = 0.0; + } + } else if (Command == "SpeedCntrl") { if ((EngineType == TEngineType::ElectricInductionMotor)) diff --git a/Model3d.cpp b/Model3d.cpp index e72bb784..63f75d55 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -79,12 +79,12 @@ TSubModel::SetLightLevel( float const Level, bool const Includechildren, bool co if( true == Includesiblings ) { auto sibling { this }; while( ( sibling = sibling->Next ) != nullptr ) { - sibling->f4Emision.a = Level; + sibling->SetLightLevel( Level, Includechildren, false ); // no need for all siblings to duplicate the work } } if( ( true == Includechildren ) && ( Child != nullptr ) ) { - Child->SetLightLevel( Level, true, true ); // node's children include child's siblings and children + Child->SetLightLevel( Level, Includechildren, true ); // node's children include child's siblings and children } } diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 174bc700..84b930f6 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -385,8 +385,8 @@ debug_panel::update_section_vehicle( std::vector &Output ) { locale::strings[ locale::string::debug_vehicle_nameloadstatuscouplers ].c_str(), mover.Name.c_str(), std::string( isowned ? locale::strings[ locale::string::debug_vehicle_owned ].c_str() + vehicle.ctOwner->OwnerName() : "" ).c_str(), - mover.Load, - mover.LoadType.c_str(), + mover.LoadAmount, + mover.LoadType.name.c_str(), mover.EngineDescription( 0 ).c_str(), // TODO: put wheel flat reporting in the enginedescription() std::string( mover.WheelFlat > 0.01 ? " Flat: " + to_string( mover.WheelFlat, 1 ) + " mm" : "" ).c_str(), diff --git a/station.cpp b/station.cpp index cf09b863..75f7f267 100644 --- a/station.cpp +++ b/station.cpp @@ -49,20 +49,19 @@ basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Sch auto ¶meters { *vehicle->MoverParameters }; - if( ( true == parameters.LoadType.empty() ) - && ( parameters.LoadAccepted.find( "passengers" ) != std::string::npos ) ) { - // set the type for empty cars - parameters.LoadType = "passengers"; + if( parameters.LoadType.name.empty() ) { + // (try to) set the cargo type for empty cars + parameters.AssignLoad( "passengers" ); } - if( parameters.LoadType == "passengers" ) { + if( parameters.LoadType.name == "passengers" ) { // NOTE: for the time being we're doing simple, random load change calculation // TODO: exchange driven by station parameters and time of the day auto unloadcount = static_cast( - laststop ? parameters.Load : + laststop ? parameters.LoadAmount : firststop ? 0 : std::min( - parameters.Load, + parameters.LoadAmount, Random( parameters.MaxLoad * 0.10 * stationsizemodifier ) ) ); auto loadcount = static_cast( laststop ? From 2448e59dc8c4f20550b609fc3c69d1c2dca24d4d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 19 Sep 2018 21:47:58 +0200 Subject: [PATCH 406/426] build 180919. gldrawarrays() crash fix --- renderer.cpp | 4 ++++ version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/renderer.cpp b/renderer.cpp index 4821d118..c2f4adfc 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -413,6 +413,10 @@ opengl_renderer::Render() { setup_units( true, false, false ); Application.render_ui(); + if( Global.bUseVBO ) { + // swapbuffers() will unbind current buffers so we prepare for it on our end + gfx::opengl_vbogeometrybank::reset(); + } Timer::subsystem.gfx_swap.start(); glfwSwapBuffers( m_window ); Timer::subsystem.gfx_swap.stop(); diff --git a/version.h b/version.h index abe477cd..48c50999 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 918 +#define VERSION_MINOR 919 #define VERSION_REVISION 0 From e1b20a025ab6c038532575f68d4f48fd6d5f44b7 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 23 Sep 2018 19:13:33 +0200 Subject: [PATCH 407/426] build 180923. basic precipitation visualization system, minor bug fixes --- Driver.cpp | 88 ++++++++------- Driver.h | 4 +- DynObj.cpp | 10 +- DynObj.h | 2 + Globals.h | 1 + Train.cpp | 49 ++++----- drivermode.cpp | 3 + maszyna.vcxproj.filters | 6 ++ material.cpp | 4 + precipitation.cpp | 197 ++++++++++++++++++++++++++++++++++ precipitation.h | 59 ++++++++++ renderer.cpp | 71 +++++++++++- renderer.h | 2 + scene.cpp | 35 +++++- scene.h | 4 + simulationenvironment.cpp | 21 ++++ simulationenvironment.h | 6 ++ simulationstateserializer.cpp | 10 +- version.h | 2 +- 19 files changed, 495 insertions(+), 79 deletions(-) create mode 100644 precipitation.cpp create mode 100644 precipitation.h diff --git a/Driver.cpp b/Driver.cpp index 9462ce99..be6c926e 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -238,9 +238,16 @@ void TSpeedPos::CommandCheck() case TCommandType::cm_PassengerStopPoint: // nie ma dostępu do rozkładu // przystanek, najwyżej AI zignoruje przy analizie tabelki -// if ((iFlags & spPassengerStopPoint) == 0) - fVelNext = 0.0; // TrainParams->IsStop()?0.0:-1.0; //na razie tak + fVelNext = 0.0; iFlags |= spPassengerStopPoint; // niestety nie da się w tym miejscu współpracować z rozkładem +/* + // NOTE: not used for now as it might be unnecessary + // special case, potentially override any set speed limits if requested + // NOTE: we test it here because for the time being it's only used for passenger stops + if( TestFlag( iFlags, spDontApplySpeedLimit ) ) { + fVelNext = -1; + } +*/ break; case TCommandType::cm_SetProximityVelocity: // musi zostać gdyż inaczej nie działają manewry @@ -879,7 +886,6 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // TableClear(); //aby od nowa sprawdziło W4 z inną nazwą już - to nie // jest dobry pomysł sSpeedTable[i].iFlags = 0; // nie liczy się już - sSpeedTable[i].fVelNext = -1; // jechać continue; // nie analizować prędkości } } // koniec obsługi przelotu na W4 @@ -1035,9 +1041,12 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN iDrivigFlags |= moveStopCloser; // do następnego W4 podjechać blisko (z dociąganiem) sSpeedTable[i].iFlags = 0; // nie liczy się już zupełnie (nie wyśle SetVelocity) sSpeedTable[i].fVelNext = -1; // można jechać za W4 + if( ( sSpeedTable[ i ].fDist <= 0.0 ) && ( eSignNext == sSpeedTable[ i ].evEvent ) ) { + // sanity check, if we're held by this stop point, let us go + VelSignalLast = -1; + } if (go == TCommandType::cm_Unknown) // jeśli nie było komendy wcześniej - go = TCommandType::cm_Ready; // gotów do odjazdu z W4 (semafor może - // zatrzymać) + go = TCommandType::cm_Ready; // gotów do odjazdu z W4 (semafor może zatrzymać) if( false == tsGuardSignal.empty() ) { // jeśli mamy głos kierownika, to odegrać iDrivigFlags |= moveGuardSignal; @@ -1061,14 +1070,15 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // if the consist can change direction through a simple cab change it doesn't need fiddling with recognition of passenger stops iDrivigFlags &= ~( moveStopPoint ); } + fLastStopExpDist = -1.0f; // nie ma rozkładu, nie ma usuwania stacji sSpeedTable[i].iFlags = 0; // W4 nie liczy się już (nie wyśle SetVelocity) sSpeedTable[i].fVelNext = -1; // można jechać za W4 - fLastStopExpDist = -1.0f; // nie ma rozkładu, nie ma usuwania stacji - // wykonanie kolejnego rozkazu (Change_direction albo Shunt) - // FIX: don't automatically advance if there's disconnect procedure in progress - if( false == TestFlag( OrderCurrentGet(), Disconnect ) ) { - JumpToNextOrder(); + if( ( sSpeedTable[ i ].fDist <= 0.0 ) && ( eSignNext == sSpeedTable[ i ].evEvent ) ) { + // sanity check, if we're held by this stop point, let us go + VelSignalLast = -1; } + // wykonanie kolejnego rozkazu (Change_direction albo Shunt) + JumpToNextOrder(); // ma się nie ruszać aż do momentu podania sygnału iDrivigFlags |= moveStopHere | moveStartHorn; continue; // nie analizować prędkości @@ -1094,36 +1104,42 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN } else if (sSpeedTable[i].iFlags & spEvent) // W4 może się deaktywować { // jeżeli event, może być potrzeba wysłania komendy, aby ruszył - // sprawdzanie eventów pasywnych miniętych - if( (sSpeedTable[ i ].fDist < 0.0) && (SemNextIndex == i) ) - { - if( Global.iWriteLogEnabled & 8 ) { - WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextIndex ].GetName() ); + if( sSpeedTable[ i ].fDist < 0.0 ) { + // sprawdzanie eventów pasywnych miniętych +/* + if( ( eSignNext != nullptr ) && ( sSpeedTable[ i ].evEvent == eSignNext ) ) { + VelSignalLast = sSpeedTable[ i ].fVelNext; } - SemNextIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód - } - if( (sSpeedTable[ i ].fDist < 0.0) && (SemNextStopIndex == i) ) - { - if( Global.iWriteLogEnabled & 8 ) { - WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextStopIndex ].GetName() ); - } - SemNextStopIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód - } - if (sSpeedTable[i].fDist > 0.0 && - sSpeedTable[i].IsProperSemaphor(OrderCurrentGet())) - { - if( SemNextIndex == -1 ) { - // jeśli jest mienięty poprzedni semafor a wcześniej - // byl nowy to go dorzucamy do zmiennej, żeby cały czas widział najbliższy - SemNextIndex = i; +*/ + if( SemNextIndex == i ) { if( Global.iWriteLogEnabled & 8 ) { - WriteLog( "Speed table update for " + OwnerName() + ", next semaphor is " + sSpeedTable[ SemNextIndex ].GetName() ); + WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextIndex ].GetName() ); } + SemNextIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód } - if( ( SemNextStopIndex == -1 ) - || ( ( sSpeedTable[SemNextStopIndex].fVelNext != 0 ) - && ( sSpeedTable[ i ].fVelNext == 0 ) ) ) { - SemNextStopIndex = i; + if( SemNextStopIndex == i ) { + if( Global.iWriteLogEnabled & 8 ) { + WriteLog( "Speed table update for " + OwnerName() + ", passed semaphor " + sSpeedTable[ SemNextStopIndex ].GetName() ); + } + SemNextStopIndex = -1; // jeśli minęliśmy semafor od ograniczenia to go kasujemy ze zmiennej sprawdzającej dla skanowania w przód + } + } + if( sSpeedTable[ i ].fDist > 0.0 ) { + // check signals ahead + if( sSpeedTable[ i ].IsProperSemaphor( OrderCurrentGet() ) ) { + if( SemNextIndex == -1 ) { + // jeśli jest mienięty poprzedni semafor a wcześniej + // byl nowy to go dorzucamy do zmiennej, żeby cały czas widział najbliższy + SemNextIndex = i; + if( Global.iWriteLogEnabled & 8 ) { + WriteLog( "Speed table update for " + OwnerName() + ", next semaphor is " + sSpeedTable[ SemNextIndex ].GetName() ); + } + } + if( ( SemNextStopIndex == -1 ) + || ( ( sSpeedTable[ SemNextStopIndex ].fVelNext != 0 ) + && ( sSpeedTable[ i ].fVelNext == 0 ) ) ) { + SemNextStopIndex = i; + } } } if (sSpeedTable[i].iFlags & spOutsideStation) diff --git a/Driver.h b/Driver.h index 33afad06..b86f7fd4 100644 --- a/Driver.h +++ b/Driver.h @@ -119,8 +119,8 @@ enum TSpeedPosFlag spSemaphor = 0x4000, // semafor pociągowy spRoadVel = 0x8000, // zadanie prędkości drogowej spSectionVel = 0x20000, // odcinek z ograniczeniem - spProximityVelocity = 0x40000, // odcinek z ograniczeniem i podaną jego długościa - spEndOfTable = 0x10000 // zatkanie tabelki + spProximityVelocity = 0x40000 // odcinek z ograniczeniem i podaną jego długościa +// spDontApplySpeedLimit = 0x10000 // this point won't apply its speed limit. potentially set by the scanning vehicle }; class TSpeedPos diff --git a/DynObj.cpp b/DynObj.cpp index 1c8b4267..f9fc47c2 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2014,7 +2014,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" auto const indexstart { 1 }; auto const indexend { ActPar.find_first_not_of( "1234567890", indexstart ) }; auto const huntingchance { std::atoi( ActPar.substr( indexstart, indexend ).c_str() ) }; - MoverParameters->TruckHunting = ( Random( 0, 100 ) <= huntingchance ); + MoverParameters->TruckHunting = ( Random( 0, 100 ) < huntingchance ); ActPar.erase( 0, indexend ); break; } @@ -2396,12 +2396,12 @@ void TDynamicObject::Move(double fDistance) // normalizacja potrzebna z powodu pochylenia (vFront) vUp = CrossProduct(vFront, vLeft); // wektor w górę, będzie jednostkowy modelRot.z = atan2(-vFront.x, vFront.z); // kąt obrotu pojazdu [rad]; z ABuBogies() - double a = ((Axle1.GetRoll() + Axle0.GetRoll())); // suma przechyłek - if (a != 0.0) + auto const roll { Roll() }; // suma przechyłek + if (roll != 0.0) { // wyznaczanie przechylenia tylko jeśli jest przechyłka // można by pobrać wektory normalne z toru... mMatrix.Identity(); // ta macierz jest potrzebna głównie do wyświetlania - mMatrix.Rotation(a * 0.5, vFront); // obrót wzdłuż osi o przechyłkę + mMatrix.Rotation(roll * 0.5, vFront); // obrót wzdłuż osi o przechyłkę vUp = mMatrix * vUp; // wektor w górę pojazdu (przekręcenie na przechyłce) // vLeft=mMatrix*DynamicObject->vLeft; // vUp=CrossProduct(vFront,vLeft); //wektor w górę @@ -2838,7 +2838,7 @@ bool TDynamicObject::Update(double dt, double dt1) // TTrackParam tp; tp.Width = MyTrack->fTrackWidth; // McZapkie-250202 - tp.friction = MyTrack->fFriction * Global.fFriction; + tp.friction = MyTrack->fFriction * Global.fFriction * Global.FrictionWeatherFactor; tp.CategoryFlag = MyTrack->iCategoryFlag & 15; tp.DamageFlag = MyTrack->iDamageFlag; tp.QualityFlag = MyTrack->iQualityFlag; diff --git a/DynObj.h b/DynObj.h index 0976e11e..8c899e52 100644 --- a/DynObj.h +++ b/DynObj.h @@ -546,6 +546,8 @@ private: return iAxleFirst ? Axle1.pPosition : Axle0.pPosition; }; + inline double Roll() { + return ( ( Axle1.GetRoll() + Axle0.GetRoll() ) ); } /* // TODO: check if scanning takes into account direction when selecting axle // if it does, replace the version above diff --git a/Globals.h b/Globals.h index 7d230f4a..8caf793a 100644 --- a/Globals.h +++ b/Globals.h @@ -65,6 +65,7 @@ struct global_settings { bool RealisticControlMode{ false }; // controls ability to steer the vehicle from outside views bool bEnableTraction{ true }; float fFriction{ 1.f }; // mnożnik tarcia - KURS90 + float FrictionWeatherFactor { 1.f }; bool bLiveTraction{ true }; float Overcast{ 0.1f }; // NOTE: all this weather stuff should be moved elsewhere glm::vec3 FogColor = { 0.6f, 0.7f, 0.8f }; diff --git a/Train.cpp b/Train.cpp index 16a8e5d0..974f2cd2 100644 --- a/Train.cpp +++ b/Train.cpp @@ -527,9 +527,9 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "unit_no", PyGetInt( iUnitNo ) ); for( int i = 0; i < 20; i++ ) { - PyDict_SetItemString( dict, ( "doors_" + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 0 ] ) ); - PyDict_SetItemString( dict, ( "doors_r_" + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 1 ] ) ); - PyDict_SetItemString( dict, ( "doors_l_" + std::to_string( i + 1 ) ).c_str(), PyGetFloatS( bDoors[ i ][ 2 ] ) ); + PyDict_SetItemString( dict, ( "doors_" + std::to_string( i + 1 ) ).c_str(), PyGetBool( bDoors[ i ][ 0 ] ) ); + PyDict_SetItemString( dict, ( "doors_r_" + std::to_string( i + 1 ) ).c_str(), PyGetBool( bDoors[ i ][ 1 ] ) ); + PyDict_SetItemString( dict, ( "doors_l_" + std::to_string( i + 1 ) ).c_str(), PyGetBool( bDoors[ i ][ 2 ] ) ); PyDict_SetItemString( dict, ( "doors_no_" + std::to_string( i + 1 ) ).c_str(), PyGetInt( iDoorNo[ i ] ) ); PyDict_SetItemString( dict, ( "code_" + std::to_string( i + 1 ) ).c_str(), PyGetString( ( std::to_string( iUnits[ i ] ) + cCode[ i ] ).c_str() ) ); PyDict_SetItemString( dict, ( "car_name" + std::to_string( i + 1 ) ).c_str(), PyGetString( asCarName[ i ].c_str() ) ); @@ -4529,31 +4529,14 @@ void TTrain::UpdateMechPosition(double dt) 2 : DynamicObject->MoverParameters->ActiveCab ); if( !DebugModeFlag ) { // sprawdzaj więzy //Ra: nie tu! - if( pMechPosition.x < Cabine[ iCabn ].CabPos1.x ) - pMechPosition.x = Cabine[ iCabn ].CabPos1.x; - if( pMechPosition.x > Cabine[ iCabn ].CabPos2.x ) - pMechPosition.x = Cabine[ iCabn ].CabPos2.x; - if( pMechPosition.z < Cabine[ iCabn ].CabPos1.z ) - pMechPosition.z = Cabine[ iCabn ].CabPos1.z; - if( pMechPosition.z > Cabine[ iCabn ].CabPos2.z ) - pMechPosition.z = Cabine[ iCabn ].CabPos2.z; - if( pMechPosition.y > Cabine[ iCabn ].CabPos1.y + 1.8 ) - pMechPosition.y = Cabine[ iCabn ].CabPos1.y + 1.8; - if( pMechPosition.y < Cabine[ iCabn ].CabPos1.y + 0.5 ) - pMechPosition.y = Cabine[ iCabn ].CabPos2.y + 0.5; - if( pMechOffset.x < Cabine[ iCabn ].CabPos1.x ) - pMechOffset.x = Cabine[ iCabn ].CabPos1.x; - if( pMechOffset.x > Cabine[ iCabn ].CabPos2.x ) - pMechOffset.x = Cabine[ iCabn ].CabPos2.x; - if( pMechOffset.z < Cabine[ iCabn ].CabPos1.z ) - pMechOffset.z = Cabine[ iCabn ].CabPos1.z; - if( pMechOffset.z > Cabine[ iCabn ].CabPos2.z ) - pMechOffset.z = Cabine[ iCabn ].CabPos2.z; - if( pMechOffset.y > Cabine[ iCabn ].CabPos1.y + 1.8 ) - pMechOffset.y = Cabine[ iCabn ].CabPos1.y + 1.8; - if( pMechOffset.y < Cabine[ iCabn ].CabPos1.y + 0.5 ) - pMechOffset.y = Cabine[ iCabn ].CabPos2.y + 0.5; + pMechPosition.x = clamp( pMechPosition.x, Cabine[ iCabn ].CabPos1.x, Cabine[ iCabn ].CabPos2.x ); + pMechPosition.y = clamp( pMechPosition.y, Cabine[ iCabn ].CabPos1.y + 0.5, Cabine[ iCabn ].CabPos2.y + 1.8 ); + pMechPosition.z = clamp( pMechPosition.z, Cabine[ iCabn ].CabPos1.z, Cabine[ iCabn ].CabPos2.z ); + + pMechOffset.x = clamp( pMechOffset.x, Cabine[ iCabn ].CabPos1.x, Cabine[ iCabn ].CabPos2.x ); + pMechOffset.y = clamp( pMechOffset.y, Cabine[ iCabn ].CabPos1.y + 0.5, Cabine[ iCabn ].CabPos2.y + 1.8 ); + pMechOffset.z = clamp( pMechOffset.z, Cabine[ iCabn ].CabPos1.z, Cabine[ iCabn ].CabPos2.z ); } }; @@ -5863,7 +5846,7 @@ TTrain::update_sounds( double const Deltatime ) { dsbSlipAlarm.stop(); } } - +/* // szum w czasie jazdy if( ( false == FreeFlyModeFlag ) && ( false == Global.CabWindowOpen ) @@ -5875,6 +5858,7 @@ TTrain::update_sounds( double const Deltatime ) { // don't play the optional ending sound if the listener switches views rsRunningNoise.stop( true == FreeFlyModeFlag ); } + */ // hunting oscillation noise if( ( false == FreeFlyModeFlag ) && ( false == Global.CabWindowOpen ) @@ -5882,6 +5866,15 @@ TTrain::update_sounds( double const Deltatime ) { && ( IsHunting ) ) { update_sounds_runningnoise( rsHuntingNoise ); + // modify calculated sound volume by hunting amount + auto const huntingamount = + interpolate( + 0.0, 1.0, + clamp( + ( mvOccupied->Vel - HuntingShake.fadein_begin ) / ( HuntingShake.fadein_end - HuntingShake.fadein_begin ), + 0.0, 1.0 ) ); + + rsHuntingNoise.gain( rsHuntingNoise.gain() * huntingamount ); } else { // don't play the optional ending sound if the listener switches views diff --git a/drivermode.cpp b/drivermode.cpp index 05488a7f..77dd143c 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -224,6 +224,8 @@ driver_mode::update() { update_camera( deltarealtime ); + simulation::Environment.update_precipitation(); // has to be launched after camera step to work properly + Timer::subsystem.sim_total.stop(); simulation::Region->update_sounds(); @@ -951,6 +953,7 @@ driver_mode::InOutKey( bool const Near ) train->Dynamic()->ABuSetModelShake( { 0, 0, 0 } ); train->MechStop(); FollowView(); // na pozycję mecha + train->UpdateMechPosition( m_secondaryupdaterate ); } else FreeFlyModeFlag = true; // nadal poza kabiną diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 665a7b90..761c958b 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -330,6 +330,9 @@ Source Files\imgui + + Source Files + @@ -608,6 +611,9 @@ Header Files\application\mode_editor + + Header Files + diff --git a/material.cpp b/material.cpp index e3d2daed..d5c03784 100644 --- a/material.cpp +++ b/material.cpp @@ -43,12 +43,16 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c if( key == Global.Weather ) { // weather textures override generic (pri 0) and seasonal (pri 1) textures // seasonal weather textures (pri 1+2=3) override generic weather (pri 2) textures + // skip the opening bracket + auto const value { Input.getToken( true, "\n\r\t ;" ) }; while( true == deserialize_mapping( Input, Priority + 2, Loadnow ) ) { ; // all work is done in the header } } else if( key == Global.Season ) { // seasonal textures override generic textures + // skip the opening bracket + auto const value { Input.getToken( true, "\n\r\t ;" ) }; while( true == deserialize_mapping( Input, 1, Loadnow ) ) { ; // all work is done in the header } diff --git a/precipitation.cpp b/precipitation.cpp new file mode 100644 index 00000000..54264bc2 --- /dev/null +++ b/precipitation.cpp @@ -0,0 +1,197 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "precipitation.h" + +#include "globals.h" +#include "openglmatrixstack.h" +#include "renderer.h" +#include "timer.h" +#include "simulation.h" +#include "train.h" + +basic_precipitation::~basic_precipitation() { + // TODO: release allocated resources +} + +void +basic_precipitation::create( int const Tesselation ) { + + auto const heightfactor { 10.f }; // height-to-radius factor + m_moverate *= heightfactor; + auto const verticaltexturestretchfactor { 1.5f }; // crude motion blur + + // create geometry chunk + auto const latitudes { 3 }; // just a cylinder with end cones + auto const longitudes { Tesselation }; + auto const longitudehalfstep { 0.5f * static_cast( 2.0 * M_PI * 1.f / longitudes ) }; // for crude uv correction + + std::uint16_t index = 0; + +// auto const radius { 25.f }; // cylinder radius + std::vector radii { 25.f, 10.f, 5.f, 1.f }; + for( auto radius : radii ) { + + for( int i = 0; i <= latitudes; ++i ) { + + auto const latitude{ static_cast( M_PI * ( -0.5f + (float)( i ) / latitudes ) ) }; + auto const z{ std::sin( latitude ) }; + auto const zr{ std::cos( latitude ) }; + + for( int j = 0; j <= longitudes; ++j ) { + // NOTE: for the first and last row half of the points we create end up unused but, eh + auto const longitude{ static_cast( 2.0 * M_PI * (float)( j ) / longitudes ) }; + auto const x{ std::cos( longitude ) }; + auto const y{ std::sin( longitude ) }; + // NOTE: cartesian to opengl swap would be: -x, -z, -y + m_vertices.emplace_back( glm::vec3( -x * zr, -z * heightfactor, -y * zr ) * radius ); + // uvs + // NOTE: first and last row receives modified u values to deal with limitation of mapping onto triangles + auto u = ( + i == 0 ? longitude + longitudehalfstep : + i == latitudes ? longitude - longitudehalfstep : + longitude ); + m_uvs.emplace_back( + u / ( 2.0 * M_PI ) * radius, + 1.f - (float)( i ) / latitudes * radius * heightfactor * 0.5f / verticaltexturestretchfactor ); + + if( ( i == 0 ) || ( j == 0 ) ) { + // initial edge of the dome, don't start indices yet + ++index; + } + else { + // the end cones are built from one triangle of each quad, the middle rows use both + if( i < latitudes ) { + m_indices.emplace_back( index - 1 - ( longitudes + 1 ) ); + m_indices.emplace_back( index - 1 ); + m_indices.emplace_back( index ); + } + if( i > 1 ) { + m_indices.emplace_back( index ); + m_indices.emplace_back( index - ( longitudes + 1 ) ); + m_indices.emplace_back( index - 1 - ( longitudes + 1 ) ); + } + ++index; + } + } // longitude + } // latitude + } // radius +} + +bool +basic_precipitation::init() { + + create( 18 ); + + // TODO: select texture based on current overcast level + if( Global.Weather == "rain:" ) { + m_texture = GfxRenderer.Fetch_Texture( "fx/rain_medium" ); + m_moverateweathertypefactor = 2.f; + } + else if( Global.Weather == "snow:" ) { + m_texture = GfxRenderer.Fetch_Texture( "fx/snow_medium" ); + m_moverateweathertypefactor = 1.25f; + } + + return true; +} + +void +basic_precipitation::update() { + + auto const timedelta { static_cast( ( DebugModeFlag ? Timer::GetDeltaTime() : Timer::GetDeltaTime() ) ) }; + + if( timedelta == 0.0 ) { return; } + + m_textureoffset += m_moverate * m_moverateweathertypefactor * timedelta; + m_textureoffset = clamp_circular( m_textureoffset, 1.f ); + + auto cameramove { glm::dvec3{ Global.pCamera.Pos - m_camerapos} }; + cameramove.y = 0.0; // vertical movement messes up vector calculation + + m_camerapos = Global.pCamera.Pos; + + // intercept sudden user-induced camera jumps + if( m_freeflymode != FreeFlyModeFlag ) { + m_freeflymode = FreeFlyModeFlag; + if( true == m_freeflymode ) { + // cache last precipitation vector in the cab + m_cabcameramove = m_cameramove; + // don't carry previous precipitation vector to a new unrelated location + m_cameramove = glm::dvec3{ 0.0 }; + } + else { + // restore last cached precipitation vector + m_cameramove = m_cabcameramove; + } + cameramove = glm::dvec3{ 0.0 }; + } + if( m_windowopen != Global.CabWindowOpen ) { + m_windowopen = Global.CabWindowOpen; + cameramove = glm::dvec3{ 0.0 }; + } + if( ( simulation::Train != nullptr ) && ( simulation::Train->iCabn != m_activecab ) ) { + m_activecab = simulation::Train->iCabn; + cameramove = glm::dvec3{ 0.0 }; + } + if( glm::length( cameramove ) > 100.0 ) { + cameramove = glm::dvec3{ 0.0 }; + } + + m_cameramove = m_cameramove * std::max( 0.0, 1.0 - 5.0 * timedelta ) + cameramove * ( 30.0 * timedelta ); + if( std::abs( m_cameramove.x ) < 0.001 ) { m_cameramove.x = 0.0; } + if( std::abs( m_cameramove.y ) < 0.001 ) { m_cameramove.y = 0.0; } + if( std::abs( m_cameramove.z ) < 0.001 ) { m_cameramove.z = 0.0; } +} + +void +basic_precipitation::render() { + + GfxRenderer.Bind_Texture( m_texture ); + + // cache entry state + ::glPushClientAttrib( GL_CLIENT_VERTEX_ARRAY_BIT ); + + if( m_vertexbuffer == -1 ) { + // build the buffers + ::glGenBuffers( 1, &m_vertexbuffer ); + ::glBindBuffer( GL_ARRAY_BUFFER, m_vertexbuffer ); + ::glBufferData( GL_ARRAY_BUFFER, m_vertices.size() * sizeof( glm::vec3 ), m_vertices.data(), GL_STATIC_DRAW ); + + ::glGenBuffers( 1, &m_uvbuffer ); + ::glBindBuffer( GL_ARRAY_BUFFER, m_uvbuffer ); + ::glBufferData( GL_ARRAY_BUFFER, m_uvs.size() * sizeof( glm::vec2 ), m_uvs.data(), GL_STATIC_DRAW ); + + ::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 + } + // positions + ::glBindBuffer( GL_ARRAY_BUFFER, m_vertexbuffer ); + ::glVertexPointer( 3, GL_FLOAT, sizeof( glm::vec3 ), reinterpret_cast( 0 ) ); + ::glEnableClientState( GL_VERTEX_ARRAY ); + // uvs + ::glBindBuffer( GL_ARRAY_BUFFER, m_uvbuffer ); + ::glClientActiveTexture( m_textureunit ); + ::glTexCoordPointer( 2, GL_FLOAT, sizeof( glm::vec2 ), reinterpret_cast( 0 ) ); + ::glEnableClientState( GL_TEXTURE_COORD_ARRAY ); + // uv transformation matrix + ::glMatrixMode( GL_TEXTURE ); + ::glLoadIdentity(); + ::glTranslatef( 0.f, m_textureoffset, 0.f ); + // indices + ::glBindBuffer( GL_ELEMENT_ARRAY_BUFFER, m_indexbuffer ); + ::glDrawElements( GL_TRIANGLES, static_cast( m_indices.size() ), GL_UNSIGNED_SHORT, reinterpret_cast( 0 ) ); + // cleanup + ::glLoadIdentity(); + ::glMatrixMode( GL_MODELVIEW ); + ::glPopClientAttrib(); +} diff --git a/precipitation.h b/precipitation.h new file mode 100644 index 00000000..f2f2fcd8 --- /dev/null +++ b/precipitation.h @@ -0,0 +1,59 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +#include "texture.h" + +// based on "Rendering Falling Rain and Snow" +// by Niniane Wang, Bretton Wade + +class basic_precipitation { + +public: +// constructors + basic_precipitation() = default; +// destructor + ~basic_precipitation(); +// methods + inline + void + set_unit( GLint const Textureunit ) { + m_textureunit = Textureunit; } + bool + init(); + void + update(); + void + render(); + + glm::dvec3 m_cameramove{ 0.0 }; + +private: +// methods + void create( int const Tesselation ); + +// members + std::vector m_vertices; + std::vector m_uvs; + std::vector m_indices; + GLuint m_vertexbuffer { (GLuint)-1 }; + GLuint m_uvbuffer { (GLuint)-1 }; + GLuint m_indexbuffer { (GLuint)-1 }; + GLint m_textureunit { 0 }; + texture_handle m_texture { -1 }; + float m_textureoffset { 0.f }; + float m_moverate { 30 * 0.001f }; + float m_moverateweathertypefactor { 1.f }; // medium-dependent; 1.0 for snow, faster for rain + glm::dvec3 m_camerapos { 0.0 }; + bool m_freeflymode { true }; + bool m_windowopen { true }; + int m_activecab{ 0 }; + glm::dvec3 m_cabcameramove{ 0.0 }; +}; diff --git a/renderer.cpp b/renderer.cpp index c2f4adfc..28e9d0e0 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -129,6 +129,7 @@ opengl_renderer::Init( GLFWwindow *Window ) { std::vector{ m_normaltextureunit, m_diffusetextureunit } ); m_textures.assign_units( m_helpertextureunit, m_shadowtextureunit, m_normaltextureunit, m_diffusetextureunit ); // TODO: add reflections unit ui_layer::set_unit( m_diffusetextureunit ); + simulation::Environment.m_precipitation.set_unit( m_diffusetextureunit ); select_unit( m_diffusetextureunit ); ::glDepthFunc( GL_LEQUAL ); @@ -550,7 +551,9 @@ opengl_renderer::Render_pass( rendermode const Mode ) { ::glEnable( GL_TEXTURE_2D ); } #endif - if( false == FreeFlyModeFlag ) { + // without rain/snow we can render the cab early to limit the overdraw + if( ( false == FreeFlyModeFlag ) + && ( Global.Overcast <= 1.f ) ) { // precipitation happens when overcast is in 1-2 range switch_units( true, true, false ); setup_shadow_map( m_cabshadowtexture, m_cabshadowtexturematrix ); // cache shadow colour in case we need to account for cab light @@ -570,8 +573,10 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // ...translucent parts setup_drawing( true ); Render_Alpha( simulation::Region ); + // precipitation; done at the end, only before cab render + Render_precipitation(); + // cab render if( false == FreeFlyModeFlag ) { - // cab render is performed without shadows, due to low resolution and number of models without windows :| switch_units( true, true, false ); setup_shadow_map( m_cabshadowtexture, m_cabshadowtexturematrix ); // cache shadow colour in case we need to account for cab light @@ -580,6 +585,12 @@ opengl_renderer::Render_pass( rendermode const Mode ) { if( vehicle->InteriorLightLevel > 0.f ) { setup_shadow_color( glm::min( colors::white, shadowcolor + glm::vec4( vehicle->InteriorLight * vehicle->InteriorLightLevel, 1.f ) ) ); } + if( Global.Overcast > 1.f ) { + // with active precipitation draw the opaque cab parts here to mask rain/snow placed 'inside' the cab + setup_drawing( false ); + Render_cab( vehicle, false ); + setup_drawing( true ); + } Render_cab( vehicle, true ); if( vehicle->InteriorLightLevel > 0.f ) { setup_shadow_color( shadowcolor ); @@ -590,7 +601,8 @@ opengl_renderer::Render_pass( rendermode const Mode ) { // restore default texture matrix for reflections cube map select_unit( m_helpertextureunit ); ::glMatrixMode( GL_TEXTURE ); - ::glPopMatrix(); +// ::glPopMatrix(); + ::glLoadIdentity(); select_unit( m_diffusetextureunit ); ::glMatrixMode( GL_MODELVIEW ); } @@ -1011,7 +1023,8 @@ opengl_renderer::setup_matrices() { // special case, for colour render pass setup texture matrix for reflections cube map select_unit( m_helpertextureunit ); ::glMatrixMode( GL_TEXTURE ); - ::glPushMatrix(); +// ::glPushMatrix(); + ::glLoadIdentity(); ::glMultMatrixf( glm::value_ptr( glm::inverse( glm::mat4{ glm::mat3{ m_renderpass.camera.modelview() } } ) ) ); select_unit( m_diffusetextureunit ); } @@ -1459,7 +1472,7 @@ opengl_renderer::Render( world_environment *Environment ) { // sun { Bind_Texture( m_suntexture ); - ::glColor4f( suncolor.x, suncolor.y, suncolor.z, 1.0f ); + ::glColor4f( suncolor.x, suncolor.y, suncolor.z, clamp( 1.5f - Global.Overcast, 0.f, 1.f ) ); auto const sunvector = Environment->m_sun.getDirection(); auto const sunposition = modelview * glm::vec4( sunvector.x, sunvector.y, sunvector.z, 1.0f ); @@ -2807,6 +2820,54 @@ opengl_renderer::Render( TMemCell *Memcell ) { ::glPopMatrix(); } +void +opengl_renderer::Render_precipitation() { + + if( Global.Overcast <= 1.f ) { return; } + + switch_units( true, false, false ); + +// ::glColor4fv( glm::value_ptr( glm::vec4( glm::min( glm::vec3( Global.fLuminance ), glm::vec3( 1 ) ), 1 ) ) ); + ::glColor4fv( + glm::value_ptr( + interpolate( + 0.5f * ( Global.DayLight.diffuse + Global.DayLight.ambient ), + colors::white, + 0.5f * clamp( Global.fLuminance, 0.f, 1.f ) ) ) ); + ::glPushMatrix(); + + auto const velocity { simulation::Environment.m_precipitation.m_cameramove * -1.0 }; + if( glm::length2( velocity ) > 0.0 ) { + auto const forward{ glm::normalize( velocity ) }; + if( false == FreeFlyModeFlag ) { + // counter potential vehicle roll + auto const roll { simulation::Train->Dynamic()->Roll() }; + if( roll != 0.0 ) { + ::glRotated( roll, forward.x, 0.0, forward.z ); + } + } + auto left { glm::cross( forward, {0.0,1.0,0.0} ) }; + auto const rotationangle { + std::min( + 45.0, + ( FreeFlyModeFlag ? + 5 * glm::length( velocity ) : + simulation::Train->Dynamic()->GetVelocity() * 0.2 ) ) }; + ::glRotated( rotationangle, left.x, 0.0, left.z ); + } + + // TBD: leave lighting on to allow vehicle lights to affect it? + ::glDisable( GL_LIGHTING ); + // momentarily disable depth write, to allow vehicle cab drawn afterwards to mask it instead of leaving it 'inside' + ::glDepthMask( GL_FALSE ); + + simulation::Environment.m_precipitation.render(); + + ::glDepthMask( GL_TRUE ); + ::glEnable( GL_LIGHTING ); + ::glPopMatrix(); +} + void opengl_renderer::Render_Alpha( scene::basic_region *Region ) { diff --git a/renderer.h b/renderer.h index b9ac02a9..34c73e10 100644 --- a/renderer.h +++ b/renderer.h @@ -294,6 +294,8 @@ private: Render_cab( TDynamicObject const *Dynamic, bool const Alpha = false ); void Render( TMemCell *Memcell ); + void + Render_precipitation(); void Render_Alpha( scene::basic_region *Region ); void diff --git a/scene.cpp b/scene.cpp index 82022b1b..45558a94 100644 --- a/scene.cpp +++ b/scene.cpp @@ -986,6 +986,37 @@ basic_region::update_traction( TDynamicObject *Vehicle, int const Pantographinde } } +// checks whether specified file is a valid region data file +bool +basic_region::is_scene( std::string const &Scenariofile ) const { + + auto filename { Scenariofile }; + while( filename[ 0 ] == '$' ) { + // trim leading $ char rainsted utility may add to the base name for modified .scn files + filename.erase( 0, 1 ); + } + erase_extension( filename ); + filename = Global.asCurrentSceneryPath + filename; + filename += EU07_FILEEXTENSION_REGION; + + if( false == FileExists( filename ) ) { + return false; + } + // file type and version check + std::ifstream input( filename, std::ios::binary ); + + uint32_t headermain{ sn_utils::ld_uint32( input ) }; + uint32_t headertype{ sn_utils::ld_uint32( input ) }; + + if( ( headermain != EU07_FILEHEADER + || ( headertype != EU07_FILEVERSION_REGION ) ) ) { + // wrong file type + return false; + } + + return true; +} + // stores content of the class in file with specified name void basic_region::serialize( std::string const &Scenariofile ) const { @@ -1062,7 +1093,9 @@ basic_region::deserialize( std::string const &Scenariofile ) { // section index, followed by section data size, followed by section data auto *§ion { m_sections[ sn_utils::ld_uint32( input ) ] }; auto const sectionsize { sn_utils::ld_uint32( input ) }; - section = new basic_section(); + if( section == nullptr ) { + section = new basic_section(); + } section->deserialize( input ); } diff --git a/scene.h b/scene.h index 8a0745e3..926629ce 100644 --- a/scene.h +++ b/scene.h @@ -53,6 +53,7 @@ struct scratch_data { bool is_open { false }; } trainset; + std::string name; bool initialized { false }; }; @@ -321,6 +322,9 @@ public: // legacy method, updates sounds around camera void update_sounds(); + // checks whether specified file is a valid region data file + bool + is_scene( std::string const &Scenariofile ) const; // stores content of the class in file with specified name void serialize( std::string const &Scenariofile ) const; diff --git a/simulationenvironment.cpp b/simulationenvironment.cpp index 5cef14eb..5602f7af 100644 --- a/simulationenvironment.cpp +++ b/simulationenvironment.cpp @@ -76,6 +76,9 @@ world_environment::init() { m_moon.init(); m_stars.init(); m_clouds.Init(); + m_precipitation.init(); + + m_precipitationsound.deserialize( "rain-sound-loop", sound_type::single ); } void @@ -147,6 +150,24 @@ world_environment::update() { // but quite effective way to make the distant items blend with background better // NOTE: base brightness calculation provides scaled up value, so we bring it back to 'real' one here Global.FogColor = m_skydome.GetAverageHorizonColor(); + + // weather-related simulation factors + // TODO: dynamic change of air temperature and overcast levels + if( Global.Weather == "rain:" ) { + // reduce friction in rain + Global.FrictionWeatherFactor = 0.85f; + m_precipitationsound.play( sound_flags::exclusive | sound_flags::looping ); + } + else if( Global.Weather == "snow:" ) { + // reduce friction due to snow + Global.FrictionWeatherFactor = 0.75f; + } +} + +void +world_environment::update_precipitation() { + + m_precipitation.update(); } void diff --git a/simulationenvironment.h b/simulationenvironment.h index ce3b83a4..2f69f631 100644 --- a/simulationenvironment.h +++ b/simulationenvironment.h @@ -14,6 +14,8 @@ http://mozilla.org/MPL/2.0/. #include "moon.h" #include "stars.h" #include "skydome.h" +#include "precipitation.h" +#include "sound.h" class opengl_renderer; @@ -26,6 +28,7 @@ public: // methods void init(); void update(); + void update_precipitation(); void time( int const Hour = -1, int const Minute = -1, int const Second = -1 ); // switches between static and dynamic daylight calculation void toggle_daylight(); @@ -41,6 +44,9 @@ private: cSun m_sun; cMoon m_moon; TSky m_clouds; + basic_precipitation m_precipitation; + + sound_source m_precipitationsound { sound_placement::external, -1 }; }; namespace simulation { diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index 49410389..ba327225 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -37,9 +37,11 @@ state_serializer::deserialize( std::string const &Scenariofile ) { // TODO: check first for presence of serialized binary files // if this fails, fall back on the legacy text format scene::scratch_data importscratchpad; + importscratchpad.name = Scenariofile; if( Scenariofile != "$.scn" ) { // compilation to binary file isn't supported for rainsted-created overrides - importscratchpad.binary.terrain = Region->deserialize( Scenariofile ); + // NOTE: we postpone actual loading of the scene until we process time, season and weather data + importscratchpad.binary.terrain = Region->is_scene( Scenariofile ) ; } // NOTE: for the time being import from text format is a given, since we don't have full binary serialization cParser scenarioparser( Scenariofile, cParser::buffer_FILE, Global.asCurrentSceneryPath, Global.bLoadTraction ); @@ -266,6 +268,12 @@ state_serializer::deserialize_firstinit( cParser &Input, scene::scratch_data &Sc if( true == Scratchpad.initialized ) { return; } + if( true == Scratchpad.binary.terrain ) { + // at this stage it should be safe to import terrain from the binary scene file + // TBD: postpone loading furter and only load required blocks during the simulation? + Region->deserialize( Scratchpad.name ); + } + simulation::Paths.InitTracks(); simulation::Traction.InitTraction(); simulation::Events.InitEvents(); diff --git a/version.h b/version.h index 48c50999..2140e45d 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 919 +#define VERSION_MINOR 923 #define VERSION_REVISION 0 From e378965ef3101a404f5be4edf60b1a289d49b923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 23 Sep 2018 16:32:14 +0200 Subject: [PATCH 408/426] Adding BrakeDelayFlag to Python dictionary --- Train.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Train.cpp b/Train.cpp index 974f2cd2..9972622a 100644 --- a/Train.cpp +++ b/Train.cpp @@ -477,6 +477,7 @@ PyObject *TTrain::GetTrainState() { else bPN = false; PyDict_SetItemString( dict, "indir_brake", PyGetBool( bPN ) ); + PyDict_SetItemString( dict, "brake_delay_flag", PyGetInt( mvControlled->BrakeDelayFlag )); // other controls PyDict_SetItemString( dict, "ca", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) ); PyDict_SetItemString( dict, "shp", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_active ) ) ); From 8b4be0a6456d8ec460c76bf17d1f0e191c98b0fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 23 Sep 2018 16:44:17 +0200 Subject: [PATCH 409/426] Added BrakeOpModeFlag to Python dictionary --- Train.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Train.cpp b/Train.cpp index 9972622a..3add1665 100644 --- a/Train.cpp +++ b/Train.cpp @@ -478,6 +478,7 @@ PyObject *TTrain::GetTrainState() { bPN = false; PyDict_SetItemString( dict, "indir_brake", PyGetBool( bPN ) ); PyDict_SetItemString( dict, "brake_delay_flag", PyGetInt( mvControlled->BrakeDelayFlag )); + PyDict_SetItemString( dict, "brake_op_mode_flag", PyGetInt( mvControlled->BrakeOpModeFlag )); // other controls PyDict_SetItemString( dict, "ca", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_aware ) ) ); PyDict_SetItemString( dict, "shp", PyGetBool( TestFlag( mvOccupied->SecuritySystem.Status, s_active ) ) ); From 001d202055c81d8b4e594f3edca3339ccd348be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kr=C3=B3lik=20Uszasty?= Date: Sun, 23 Sep 2018 16:55:28 +0200 Subject: [PATCH 410/426] Added cab control for BrakeOpModeFlag --- Train.cpp | 9 +++++++++ Train.h | 1 + 2 files changed, 10 insertions(+) diff --git a/Train.cpp b/Train.cpp index 3add1665..b0353901 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5494,6 +5494,7 @@ bool TTrain::Update( double const Deltatime ) ggBrakeProfileCtrl.Update(); ggBrakeProfileG.Update(); ggBrakeProfileR.Update(); + ggBrakeOperationModeCtrl.Update(); ggMaxCurrentCtrl.Update(); // NBMX wrzesien 2003 - drzwi ggDoorLeftButton.Update(); @@ -6715,6 +6716,7 @@ void TTrain::clear_cab_controls() ggBrakeProfileCtrl.Clear(); ggBrakeProfileG.Clear(); ggBrakeProfileR.Clear(); + ggBrakeOperationModeCtrl.Clear(); ggMaxCurrentCtrl.Clear(); ggMainOffButton.Clear(); ggMainOnButton.Clear(); @@ -7081,6 +7083,12 @@ void TTrain::set_cab_controls() { 1.0 : 0.0 ); } + if (ggBrakeOperationModeCtrl.SubModel != nullptr) { + ggBrakeOperationModeCtrl.PutValue( + (mvOccupied->BrakeOpModeFlag > 0 ? + log2(mvOccupied->BrakeOpModeFlag) : + 0)); + } // alarm chain ggAlarmChain.PutValue( mvControlled->AlarmChainFlag ? @@ -7272,6 +7280,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "brakeprofile_sw:", ggBrakeProfileCtrl }, { "brakeprofileg_sw:", ggBrakeProfileG }, { "brakeprofiler_sw:", ggBrakeProfileR }, + { "brakeopmode_sw:", ggBrakeOperationModeCtrl }, { "maxcurrent_sw:", ggMaxCurrentCtrl }, { "main_off_bt:", ggMainOffButton }, { "main_on_bt:", ggMainOnButton }, diff --git a/Train.h b/Train.h index f0049c24..4c19b5d2 100644 --- a/Train.h +++ b/Train.h @@ -366,6 +366,7 @@ public: // reszta może by?publiczna TGauge ggBrakeProfileCtrl; // nastawiacz GPR - przelacznik obrotowy TGauge ggBrakeProfileG; // nastawiacz GP - hebelek towarowy TGauge ggBrakeProfileR; // nastawiacz PR - hamowanie dwustopniowe + TGauge ggBrakeOperationModeCtrl; //przełącznik trybu pracy PS/PN/EP/MED TGauge ggMaxCurrentCtrl; From 3d64d7fb9f6f1f9f5dd0bde4031755d7e2dc1b44 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 23 Sep 2018 21:37:29 +0200 Subject: [PATCH 411/426] minor bug fixes --- Event.cpp | 4 +++- Train.cpp | 14 +++++++++----- scene.cpp | 11 ++++++----- version.h | 2 +- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/Event.cpp b/Event.cpp index 9eb39692..498d231f 100644 --- a/Event.cpp +++ b/Event.cpp @@ -1017,7 +1017,9 @@ logvalues_event::export_as_text_( std::ostream &Output ) const { void multi_event::init() { - init_targets( simulation::Memory, "memory cell" ); + auto const conditiontchecksmemcell { m_conditions.flags & ( flags::text | flags::value_1 | flags::value_2 ) }; + // not all multi-events have memory cell checks, for the ones which don't we can keep quiet about it + init_targets( simulation::Memory, "memory cell", ( false == conditiontchecksmemcell ) ); if( m_ignored ) { // legacy compatibility behaviour, instead of disabling the event we disable the memory cell comparison test m_conditions.flags &= ~( flags::text | flags::value_1 | flags::value_2 ); diff --git a/Train.cpp b/Train.cpp index b0353901..42a378eb 100644 --- a/Train.cpp +++ b/Train.cpp @@ -1325,9 +1325,11 @@ void TTrain::OnCommand_trainbrakeoperationmodeincrease(TTrain *Train, command_da // audio feedback Train->dsbPneumaticSwitch.play(); // visual feedback - // NOTE: there's no button for brake operation mode switch - // TBD, TODO: add brake operation mode switch? - } + Train->ggBrakeOperationModeCtrl.UpdateValue( + Train->mvOccupied->BrakeOpModeFlag > 0 ? + std::log2( Train->mvOccupied->BrakeOpModeFlag ) : + 0 ); + } } } @@ -1341,8 +1343,10 @@ void TTrain::OnCommand_trainbrakeoperationmodedecrease(TTrain *Train, command_da // audio feedback Train->dsbPneumaticSwitch.play(); // visual feedback - // NOTE: there's no button for brake operation mode switch - // TBD, TODO: add brake operation mode switch? + Train->ggBrakeOperationModeCtrl.UpdateValue( + Train->mvOccupied->BrakeOpModeFlag > 0 ? + std::log2( Train->mvOccupied->BrakeOpModeFlag ) : + 0 ); } } } diff --git a/scene.cpp b/scene.cpp index 45558a94..29da186f 100644 --- a/scene.cpp +++ b/scene.cpp @@ -233,7 +233,8 @@ basic_cell::deserialize( std::istream &Input ) { } // cell activation flag m_active = ( - ( false == m_shapesopaque.empty() ) + ( true == m_active ) + || ( false == m_shapesopaque.empty() ) || ( false == m_shapestranslucent.empty() ) || ( false == m_lines.empty() ) ); } @@ -1091,12 +1092,12 @@ basic_region::deserialize( std::string const &Scenariofile ) { auto sectioncount { sn_utils::ld_uint32( input ) }; while( sectioncount-- ) { // section index, followed by section data size, followed by section data - auto *§ion { m_sections[ sn_utils::ld_uint32( input ) ] }; + auto const sectionindex { sn_utils::ld_uint32( input ) }; auto const sectionsize { sn_utils::ld_uint32( input ) }; - if( section == nullptr ) { - section = new basic_section(); + if( m_sections[ sectionindex ] == nullptr ) { + m_sections[ sectionindex ] = new basic_section(); } - section->deserialize( input ); + m_sections[ sectionindex ]->deserialize( input ); } return true; diff --git a/version.h b/version.h index 2140e45d..944d092c 100644 --- a/version.h +++ b/version.h @@ -2,4 +2,4 @@ #define VERSION_MAJOR 18 #define VERSION_MINOR 923 -#define VERSION_REVISION 0 +#define VERSION_REVISION 1 From 308bea337d6fbdfad0ad2392857fc01d4d7879a5 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 24 Sep 2018 22:01:14 +0200 Subject: [PATCH 412/426] virtual opengl color, overcast level based tweaks to light glare and freespot strength, precipitation based fog density adjustment, overcast level included in the light activation threshold --- AnimModel.cpp | 4 +-- Segment.cpp | 5 +-- Segment.h | 2 ++ maszyna.vcxproj.filters | 6 ++++ openglcolor.cpp | 13 ++++++++ openglcolor.h | 69 +++++++++++++++++++++++++++++++++++++++++ openglgeometrybank.cpp | 1 + renderer.cpp | 29 ++++++++--------- stdafx.h | 1 + uilayer.cpp | 2 +- 10 files changed, 113 insertions(+), 19 deletions(-) create mode 100644 openglcolor.cpp create mode 100644 openglcolor.h diff --git a/AnimModel.cpp b/AnimModel.cpp index b77987ce..be263b5b 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -584,7 +584,7 @@ void TAnimModel::RaPrepare() case ls_Dark: { // zapalone, gdy ciemno state = ( - Global.fLuminance <= ( + Global.fLuminance - std::max( 0.f, Global.Overcast - 1.f ) <= ( lsLights[ i ] == static_cast( ls_Dark ) ? DefaultDarkThresholdLevel : ( lsLights[ i ] - static_cast( ls_Dark ) ) ) ); @@ -594,7 +594,7 @@ void TAnimModel::RaPrepare() // like ls_dark but off late at night auto const simulationhour { simulation::Time.data().wHour }; state = ( - Global.fLuminance <= ( + Global.fLuminance - std::max( 0.f, Global.Overcast - 1.f ) <= ( lsLights[ i ] == static_cast( ls_Home ) ? DefaultDarkThresholdLevel : ( lsLights[ i ] - static_cast( ls_Home ) ) ) ); diff --git a/Segment.cpp b/Segment.cpp index 5f2e16b4..97b5b877 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -524,7 +524,8 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori } return true; }; - +/* +// NOTE: legacy leftover, potentially usable (but not really) void TSegment::Render() { Math3D::vector3 pt; @@ -572,5 +573,5 @@ void TSegment::Render() glEnd(); } } - +*/ //--------------------------------------------------------------------------- diff --git a/Segment.h b/Segment.h index 81970cd9..2304a62d 100644 --- a/Segment.h +++ b/Segment.h @@ -117,8 +117,10 @@ public: bool RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Origin, gfx::basic_vertex const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, float fOffsetX = 0.f, glm::vec3 **p = nullptr, bool bRender = true); +/* void Render(); +*/ inline double GetLength() const { diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index 761c958b..bdbf15fc 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -333,6 +333,9 @@ Source Files + + Source Files + @@ -614,6 +617,9 @@ Header Files + + Header Files + diff --git a/openglcolor.cpp b/openglcolor.cpp new file mode 100644 index 00000000..65e36d51 --- /dev/null +++ b/openglcolor.cpp @@ -0,0 +1,13 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#include "stdafx.h" +#include "openglcolor.h" + +opengl_color OpenGLColor; diff --git a/openglcolor.h b/openglcolor.h new file mode 100644 index 00000000..a40f0732 --- /dev/null +++ b/openglcolor.h @@ -0,0 +1,69 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + +#pragma once + +// encapsulation of the fixed pipeline opengl color +class opengl_color { + +public: +// constructors: + opengl_color() = default; + +// methods: + inline + void + color3( glm::vec3 const &Color ) { + return color4( glm::vec4{ Color, 1.f } ); } + inline + void + color3( float const Red, float const Green, float const Blue ) { + return color3( glm::vec3 { Red, Green, Blue } ); } + inline + void + color3( float const *Value ) { + return color3( glm::make_vec3( Value ) ); } + inline + void + color4( glm::vec4 const &Color ) { + if( Color != m_color ) { + m_color = Color; + ::glColor4fv( glm::value_ptr( m_color ) ); } } + inline + void + color4( float const Red, float const Green, float const Blue, float const Alpha ) { + return color4( glm::vec4{ Red, Green, Blue, Alpha } ); } + inline + void + color4( float const *Value ) { + return color4( glm::make_vec4( Value ) ); + } + inline + glm::vec4 const & + data() const { + return m_color; } + inline + float const * + data_array() const { + return glm::value_ptr( m_color ); } + +private: +// members: + glm::vec4 m_color { -1 }; +}; + +extern opengl_color OpenGLColor; + +// NOTE: standard opengl calls re-definitions +#define glColor3f OpenGLColor.color3 +#define glColor3fv OpenGLColor.color3 +#define glColor4f OpenGLColor.color4 +#define glColor4fv OpenGLColor.color4 + +//--------------------------------------------------------------------------- diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index 02fde9db..ba29170e 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -341,6 +341,7 @@ opengl_dlgeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stream_ auto const &chunk = gfx::geometry_bank::chunk( Geometry ); ::glNewList( chunkrecord.list, GL_COMPILE ); + ::glColor3f( -1.f, -1.f, -1.f ); // HACK: force the opengl color wrapper to include color call in the display list regardless of currently active color ::glBegin( chunk.type ); for( auto const &vertex : chunk.vertices ) { if( Streams & gfx::stream::normal ) { ::glNormal3fv( glm::value_ptr( vertex.normal ) ); } diff --git a/renderer.cpp b/renderer.cpp index 28e9d0e0..9a0adf7d 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1058,8 +1058,9 @@ opengl_renderer::setup_drawing( bool const Alpha ) { // setup fog if( Global.fFogEnd > 0 ) { // fog setup + auto const adjustedfogrange { Global.fFogEnd / std::max( 1.f, Global.Overcast * 2.f ) }; ::glFogfv( GL_FOG_COLOR, glm::value_ptr( Global.FogColor ) ); - ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / Global.fFogEnd ) ); + ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / adjustedfogrange ) ); ::glEnable( GL_FOG ); } else { ::glDisable( GL_FOG ); } @@ -1461,7 +1462,7 @@ opengl_renderer::Render( world_environment *Environment ) { Environment->m_moon.render(); } // render actual sun and moon - ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); + ::glPushAttrib( GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT ); ::glDisable( GL_LIGHTING ); ::glDisable( GL_ALPHA_TEST ); @@ -2529,15 +2530,16 @@ opengl_renderer::Render( TSubModel *Submodel ) { 0.f, 1.f ); // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances - float const distancefactor = std::max( 0.5f, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / Submodel->fSquareMaxDist ); + float const distancefactor { std::max( 0.5f, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / Submodel->fSquareMaxDist ) }; + float const precipitationfactor { std::max( 1.f, Global.Overcast - 1.f ) }; if( lightlevel > 0.f ) { // material configuration: - ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); + ::glPushAttrib( GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); Bind_Material( null_handle ); ::glPointSize( std::max( 3.f, 5.f * distancefactor * anglefactor ) ); - ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], lightlevel * anglefactor ); + ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], std::min( 1.f, lightlevel * anglefactor * precipitationfactor ) ); ::glDisable( GL_LIGHTING ); ::glEnable( GL_BLEND ); @@ -2580,7 +2582,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { if( Global.fLuminance < Submodel->fLight ) { // material configuration: - ::glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT ); + ::glPushAttrib( GL_ENABLE_BIT ); Bind_Material( null_handle ); ::glDisable( GL_LIGHTING ); @@ -3352,7 +3354,7 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { } else if( Submodel->eType == TP_FREESPOTLIGHT ) { - if( Global.fLuminance < Submodel->fLight ) { + if( ( Global.fLuminance < Submodel->fLight ) || ( Global.Overcast > 1.f ) ) { // NOTE: we're forced here to redo view angle calculations etc, because this data isn't instanced but stored along with the single mesh // TODO: separate instance data from reusable geometry auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); @@ -3367,18 +3369,17 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { float glarelevel = 0.6f; // luminosity at night is at level of ~0.1, so the overall resulting transparency in clear conditions is ~0.5 at full 'brightness' if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) { // only bother if the viewer is inside the visibility cone - if( Global.Overcast > 1.0 ) { - // increase the glare in rainy/foggy conditions - glarelevel += std::max( 0.f, 0.5f * ( Global.Overcast - 1.f ) ); - } + auto glarelevel { clamp( + 0.6f + - Global.fLuminance // reduce the glare in bright daylight + + std::max( 0.f, Global.Overcast - 1.f ), // increase the glare in rainy/foggy conditions + 0.f, 1.f ) }; // scale it down based on view angle glarelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); - // reduce the glare in bright daylight - glarelevel = clamp( glarelevel - static_cast(Global.fLuminance), 0.f, 1.f ); if( glarelevel > 0.0f ) { // setup - ::glPushAttrib( GL_CURRENT_BIT | GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT ); + ::glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT ); Bind_Texture( m_glaretexture ); ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], glarelevel ); diff --git a/stdafx.h b/stdafx.h index 145bed1f..c59fc775 100644 --- a/stdafx.h +++ b/stdafx.h @@ -104,6 +104,7 @@ #include #include "openglmatrixstack.h" +#include "openglcolor.h" // imgui.h comes with its own operator new which gets wrecked by dbg_new, so we temporarily disable the latter #ifdef DBG_NEW diff --git a/uilayer.cpp b/uilayer.cpp index c5ed4262..94ccfaea 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -161,7 +161,7 @@ ui_layer::render() { glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - glPushAttrib( GL_ENABLE_BIT | GL_CURRENT_BIT | GL_COLOR_BUFFER_BIT ); // blendfunc included since 3rd party gui doesn't play nice + glPushAttrib( GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT ); // blendfunc included since 3rd party gui doesn't play nice glDisable( GL_LIGHTING ); glDisable( GL_DEPTH_TEST ); glDisable( GL_ALPHA_TEST ); From 7c60829f54404074c129e44373384d2f127f1f31 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 28 Sep 2018 19:16:41 +0200 Subject: [PATCH 413/426] python interpreter refactored to a task queue --- Classes.h | 2 + PyInt.cpp | 817 +++++++++++++++------------------------------- PyInt.h | 137 ++++---- ResourceManager.h | 2 - Train.cpp | 51 ++- Train.h | 8 +- application.cpp | 68 ++-- application.h | 11 +- stdafx.h | 2 + utilities.h | 57 ++++ 10 files changed, 485 insertions(+), 670 deletions(-) diff --git a/Classes.h b/Classes.h index ba1bb3ac..1fe63ed0 100644 --- a/Classes.h +++ b/Classes.h @@ -70,4 +70,6 @@ enum class TCommandType cm_Command // komenda pobierana z komórki }; +using material_handle = int; + #endif diff --git a/PyInt.cpp b/PyInt.cpp index 4ce82105..7a201cfc 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -1,24 +1,56 @@ +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ + #include "stdafx.h" #include "PyInt.h" #include "globals.h" -#include "parser.h" +#include "application.h" #include "renderer.h" -#include "Model3d.h" -#include "Train.h" #include "Logs.h" -TPythonInterpreter *TPythonInterpreter::_instance = NULL; +void render_task::run() { + // call the renderer + auto *output { PyObject_CallMethod( m_renderer, "render", "O", m_input ) }; + Py_DECREF( m_input ); -//#define _PY_INT_MORE_LOG + if( output != nullptr ) { + auto *outputwidth { PyObject_CallMethod( m_renderer, "get_width", nullptr ) }; + auto *outputheight { PyObject_CallMethod( m_renderer, "get_height", nullptr ) }; + // upload texture data + if( ( outputwidth != nullptr ) + && ( outputheight != nullptr ) ) { -#ifdef __GNUC__ -#pragma GCC diagnostic ignored "-Wwrite-strings" -#endif + GfxRenderer.Bind_Material( m_target ); + // setup texture parameters + ::glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); + ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); + ::glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0 ); + // build texture + ::glTexImage2D( + GL_TEXTURE_2D, 0, + GL_RGBA8, + PyInt_AsLong( outputwidth ), PyInt_AsLong( outputheight ), 0, + GL_RGB, GL_UNSIGNED_BYTE, reinterpret_cast( PyString_AsString( output ) ) ); + } + Py_DECREF( outputheight ); + Py_DECREF( outputwidth ); + Py_DECREF( output ); + } + // clean up after yourself + delete this; +} + +// initializes the module. returns true on success +auto python_taskqueue::init() -> bool { -TPythonInterpreter::TPythonInterpreter() -{ - WriteLog("Loading Python ..."); #ifdef _WIN32 if (sizeof(void*) == 8) Py_SetPythonHome("python64"); @@ -31,568 +63,253 @@ TPythonInterpreter::TPythonInterpreter() Py_SetPythonHome("linuxpython"); #endif Py_Initialize(); - _main = PyImport_ImportModule("__main__"); - if (_main == NULL) - { - WriteLog("Cannot import Python module __main__"); + PyEval_InitThreads(); + // save a pointer to the main PyThreadState object + m_mainthread = PyThreadState_Get(); + // do the setup work while we hold the lock + m_main = PyImport_ImportModule("__main__"); + if (m_main == nullptr) { + ErrorLog( "Python Interpreter: __main__ module is missing" ); + goto release_and_exit; } - PyObject *cStringModule = PyImport_ImportModule("cStringIO"); - _stdErr = NULL; - if (cStringModule == NULL) - return; - PyObject *cStringClassName = PyObject_GetAttrString(cStringModule, "StringIO"); - if (cStringClassName == NULL) - return; - PyObject *cString = PyObject_CallObject(cStringClassName, NULL); - if (cString == NULL) - return; - if (PySys_SetObject("stderr", cString) != 0) - return; - _stdErr = cString; + + auto *stringiomodule { PyImport_ImportModule( "cStringIO" ) }; + auto *stringioclassname { ( + stringiomodule != nullptr ? + PyObject_GetAttrString( stringiomodule, "StringIO" ) : + nullptr ) }; + auto *stringioobject { ( + stringioclassname != nullptr ? + PyObject_CallObject( stringioclassname, nullptr ) : + nullptr ) }; + m_error = { ( + stringioobject == nullptr ? nullptr : + PySys_SetObject( "stderr", stringioobject ) != 0 ? nullptr : + stringioobject ) }; + + if( m_error == nullptr ) { goto release_and_exit; } + + if( false == run_file( "abstractscreenrenderer" ) ) { goto release_and_exit; } + + // release the lock + PyEval_ReleaseLock(); + + WriteLog( "Python Interpreter setup complete" ); + + // init workers + for( auto &worker : m_workers ) { + + auto *openglcontextwindow { Application.window( -1 ) }; + worker = + std::make_unique( + &python_taskqueue::run, this, + openglcontextwindow, std::ref( m_tasks ), std::ref( m_condition ), std::ref( m_exit ) ); + + if( worker == nullptr ) { return false; } + } + + return true; + +release_and_exit: + PyEval_ReleaseLock(); + return false; } -TPythonInterpreter *TPythonInterpreter::getInstance() -{ - if (!_instance) - { - _instance = new TPythonInterpreter(); +// shuts down the module +void python_taskqueue::exit() { + // let the workers know we're done with them + m_exit = true; + m_condition.notify_all(); + // let them free up their shit before we proceed + for( auto const &worker : m_workers ) { + worker->join(); } - return _instance; + // get rid of the leftover tasks + // with the workers dead we don't have to worry about concurrent access anymore + for( auto *task : m_tasks.data ) { + delete task; + } + // take a bow + PyEval_AcquireLock(); + PyThreadState_Swap( m_mainthread ); + Py_Finalize(); } -void -TPythonInterpreter::killInstance() { +// adds specified task along with provided collection of data to the work queue. returns true on success +auto python_taskqueue::insert( task_request const &Task ) -> bool { - delete _instance; -} + if( ( Task.renderer.empty() ) + || ( Task.input == nullptr ) + || ( Task.target == null_handle ) ) { return false; } -bool TPythonInterpreter::loadClassFile( std::string const &lookupPath, std::string const &className ) -{ - std::set::const_iterator it = _classes.find(className); - if (it == _classes.end()) + auto *renderer { fetch_renderer( Task.renderer ) }; + if( renderer == nullptr ) { return false; } + // acquire a lock on the task queue and add a new task { - FILE *sourceFile = _getFile(lookupPath, className); - if (sourceFile != nullptr) - { - fseek(sourceFile, 0, SEEK_END); - auto const fsize = ftell(sourceFile); - char *buffer = (char *)calloc(fsize + 1, sizeof(char)); - fseek(sourceFile, 0, SEEK_SET); - auto const freaded = fread(buffer, sizeof(char), fsize, sourceFile); - buffer[freaded] = 0; // z jakiegos powodu czytamy troche mniej i trzczeba dodac konczace -// zero do bufora (mimo ze calloc teoretycznie powiniene zwrocic -// wyzerowana pamiec) -#ifdef _PY_INT_MORE_LOG - char buf[255]; - sprintf(buf, "readed %d / %d characters for %s", freaded, fsize, className); - WriteLog(buf); -#endif // _PY_INT_MORE_LOG - fclose(sourceFile); - if (PyRun_SimpleString(buffer) != 0) - { - handleError(); - return false; - } - _classes.insert( className ); -/* - char *classNameToRemember = (char *)calloc(strlen(className) + 1, sizeof(char)); - strcpy(classNameToRemember, className); - _classes.insert(classNameToRemember); -*/ - free(buffer); - return true; - } - return false; + std::lock_guard lock( m_tasks.mutex ); + m_tasks.data.emplace_back( new render_task( renderer, Task.input, Task.target ) ); } + // potentially wake a worker to handle the new task + m_condition.notify_one(); + // all done return true; } -PyObject *TPythonInterpreter::newClass( std::string const &className ) -{ - return newClass(className, NULL); +// executes python script stored in specified file. returns true on success +auto python_taskqueue::run_file( std::string const &File, std::string const &Path ) -> bool { + + auto const lookup { FileExists( { Path + File, "python/local/" + File }, { ".py" } ) }; + if( lookup.first.empty() ) { return false; } + + std::ifstream inputfile { lookup.first + lookup.second }; + std::string input; + input.assign( std::istreambuf_iterator( inputfile ), std::istreambuf_iterator() ); + + if( PyRun_SimpleString( input.c_str() ) != 0 ) { + error(); + return false; + } + + return true; } -FILE *TPythonInterpreter::_getFile( std::string const &lookupPath, std::string const &className ) -{ - if( false == lookupPath.empty() ) { - std::string const sourcefilepath = lookupPath + className + ".py"; - FILE *file = fopen( sourcefilepath.c_str(), "r" ); -#ifdef _PY_INT_MORE_LOG - WriteLog( sourceFilePath ); -#endif // _PY_INT_MORE_LOG - if( nullptr != file ) { return file; } - } - std::string sourcefilepath = "python/local/" + className + ".py"; - FILE *file = fopen( sourcefilepath.c_str(), "r" ); -#ifdef _PY_INT_MORE_LOG - WriteLog( sourceFilePath ); -#endif // _PY_INT_MORE_LOG - return file; // either the file, or a nullptr on fail -/* - char *sourceFilePath; - if (lookupPath != NULL) - { - sourceFilePath = (char *)calloc(strlen(lookupPath) + strlen(className) + 4, sizeof(char)); - strcat(sourceFilePath, lookupPath); - strcat(sourceFilePath, className); - strcat(sourceFilePath, ".py"); +auto python_taskqueue::fetch_renderer( std::string const Renderer ) ->PyObject * { - FILE *file = fopen(sourceFilePath, "r"); -#ifdef _PY_INT_MORE_LOG - WriteLog(sourceFilePath); -#endif // _PY_INT_MORE_LOG - free(sourceFilePath); - if (file != NULL) - { - return file; + auto const lookup { m_renderers.find( Renderer ) }; + if( lookup != std::end( m_renderers ) ) { + return lookup->second; + } + // try to load specified renderer class + auto const path { substr_path( Renderer ) }; + auto const file { Renderer.substr( path.size() ) }; + PyObject *renderer { nullptr }; + if( m_main == nullptr ) { + ErrorLog( "Python Renderer: __main__ module is missing" ); + goto cache_and_return; + } + + PyEval_AcquireLock(); + { + PyObject *rendererarguments{ nullptr }; + if( false == run_file( file, path ) ) { + goto cache_and_return; + } + auto *renderername{ PyObject_GetAttrString( m_main, file.c_str() ) }; + if( renderername == nullptr ) { + ErrorLog( "Python Renderer: class \"" + file + "\" not defined" ); + goto cache_and_return; + } + rendererarguments = Py_BuildValue( "(s)", path.c_str() ); + if( rendererarguments == nullptr ) { + ErrorLog( "Python Renderer: failed to create initialization arguments" ); + goto cache_and_return; + } + renderer = PyObject_CallObject( renderername, rendererarguments ); + + if( PyErr_Occurred() != nullptr ) { + error(); + renderer = nullptr; + } + +cache_and_return: + // clean up after yourself + if( rendererarguments != nullptr ) { + Py_DECREF( rendererarguments ); } } - char *basePath = "python/local/"; - sourceFilePath = (char *)calloc(strlen(basePath) + strlen(className) + 4, sizeof(char)); - strcat(sourceFilePath, basePath); - strcat(sourceFilePath, className); - strcat(sourceFilePath, ".py"); - - FILE *file = fopen(sourceFilePath, "r"); -#ifdef _PY_INT_MORE_LOG - WriteLog(sourceFilePath); -#endif // _PY_INT_MORE_LOG - free(sourceFilePath); - if (file != NULL) - { - return file; - } - return NULL; -*/ + PyEval_ReleaseLock(); + // cache the failures as well so we don't try again on subsequent requests + m_renderers.emplace( Renderer, renderer ); + return renderer; } -void TPythonInterpreter::handleError() -{ -#ifdef _PY_INT_MORE_LOG - WriteLog("Python Error occured"); -#endif // _PY_INT_MORE_LOG - if (_stdErr != NULL) - { // std err pythona jest buforowane +void python_taskqueue::run( GLFWwindow *Context, rendertask_sequence &Tasks, threading::condition_variable &Condition, std::atomic &Exit ) { + + glfwMakeContextCurrent( Context ); + // create a state object for this thread + PyEval_AcquireLock(); + auto *threadstate { PyThreadState_New( m_mainthread->interp ) }; + PyEval_ReleaseLock(); + + render_task *task { nullptr }; + + while( false == Exit.load() ) { + // regardless of the reason we woke up prime the spurious wakeup flag for the next time + Condition.spurious( true ); + // keep working as long as there's any scheduled tasks + do { + task = nullptr; + // acquire a lock on the task queue and potentially grab a task from it + { + std::lock_guard lock( Tasks.mutex ); + if( false == Tasks.data.empty() ) { + // fifo + task = Tasks.data.front(); + Tasks.data.pop_front(); + } + } + if( task != nullptr ) { + // swap in my thread state + PyEval_AcquireLock(); + PyThreadState_Swap( threadstate ); + // execute python code + task->run(); + error(); + // clear the thread state + PyThreadState_Swap( nullptr ); + PyEval_ReleaseLock(); + } + // TBD, TODO: add some idle time between tasks in case we're on a single thread cpu? + } while( task != nullptr ); + // if there's nothing left to do wait until there is + // but check every now and then on your own to minimize potential deadlock situations + Condition.wait_for( std::chrono::seconds( 5 ) ); + } + // clean up thread state data + PyEval_AcquireLock(); + PyThreadState_Swap( nullptr ); + PyThreadState_Clear( threadstate ); + PyThreadState_Delete( threadstate ); + PyEval_ReleaseLock(); +} + +void +python_taskqueue::error() { + + if( PyErr_Occurred() == nullptr ) { return; } + + if( m_error != nullptr ) { + // std err pythona jest buforowane PyErr_Print(); - PyObject *bufferContent = PyObject_CallMethod(_stdErr, "getvalue", NULL); - PyObject_CallMethod(_stdErr, "truncate", "i", 0); // czyscimy bufor na kolejne bledy - WriteLog(PyString_AsString(bufferContent)); + auto *errortext { PyObject_CallMethod( m_error, "getvalue", nullptr ) }; + ErrorLog( PyString_AsString( errortext ) ); + // czyscimy bufor na kolejne bledy + PyObject_CallMethod( m_error, "truncate", "i", 0 ); } - else - { // nie dziala buffor pythona - if (PyErr_Occurred() != NULL) - { - PyObject *ptype, *pvalue, *ptraceback; - PyErr_Fetch(&ptype, &pvalue, &ptraceback); - if (ptype == NULL) - { - WriteLog("Don't konw how to handle NULL exception"); - } - PyErr_NormalizeException(&ptype, &pvalue, &ptraceback); - if (ptype == NULL) - { - WriteLog("Don't konw how to handle NULL exception"); - } - PyObject *pStrType = PyObject_Str(ptype); - if (pStrType != NULL) - { - WriteLog(PyString_AsString(pStrType)); - } - WriteLog(PyString_AsString(pvalue)); - PyObject *pStrTraceback = PyObject_Str(ptraceback); - if (pStrTraceback != NULL) - { - WriteLog(PyString_AsString(pStrTraceback)); - } - else - { - WriteLog("Python Traceback cannot be shown"); - } + else { + // nie dziala buffor pythona + PyObject *type, *value, *traceback; + PyErr_Fetch( &type, &value, &traceback ); + if( type == nullptr ) { + ErrorLog( "Python Interpreter: don't know how to handle null exception" ); } - else - { -#ifdef _PY_INT_MORE_LOG - WriteLog("Called python error handler when no error occured!"); -#endif // _PY_INT_MORE_LOG + PyErr_NormalizeException( &type, &value, &traceback ); + if( type == nullptr ) { + ErrorLog( "Python Interpreter: don't know how to handle null exception" ); + } + auto *typetext { PyObject_Str( type ) }; + if( typetext != nullptr ) { + ErrorLog( PyString_AsString( typetext ) ); + } + if( value != nullptr ) { + ErrorLog( PyString_AsString( value ) ); + } + auto *tracebacktext { PyObject_Str( traceback ) }; + if( tracebacktext != nullptr ) { + WriteLog( PyString_AsString( tracebacktext ) ); + } + else { + WriteLog( "Python Interpreter: failed to retrieve the stack traceback" ); } } } -PyObject *TPythonInterpreter::newClass(std::string const &className, PyObject *argsTuple) -{ - if (_main == NULL) - { - WriteLog("main turned into null"); - return NULL; - } - PyObject *classNameObj = PyObject_GetAttrString(_main, className.c_str()); - if (classNameObj == NULL) - { -#ifdef _PY_INT_MORE_LOG - char buf[255]; - sprintf(buf, "Python class %s not defined!", className); - WriteLog(buf); -#endif // _PY_INT_MORE_LOG - return NULL; - } - PyObject *object = PyObject_CallObject(classNameObj, argsTuple); - - if (PyErr_Occurred() != NULL) - { - handleError(); - return NULL; - } - return object; -} - -TPythonScreenRenderer::TPythonScreenRenderer(int textureId, PyObject *renderer) -{ - _textureId = textureId; - _pyRenderer = renderer; -} - -void TPythonScreenRenderer::updateTexture() -{ - int width, height; - if (_pyWidth == NULL || _pyHeight == NULL) - { - WriteLog("Unknown python texture size!"); - return; - } - width = PyInt_AsLong(_pyWidth); - height = PyInt_AsLong(_pyHeight); - if (_pyTexture != NULL) - { - char *textureData = PyString_AsString(_pyTexture); - if (textureData != NULL) - { -#ifdef _PY_INT_MORE_LOG - char buff[255]; - sprintf(buff, "Sending texture id: %d w: %d h: %d", _textureId, width, height); - WriteLog(buff); -#endif // _PY_INT_MORE_LOG -/* - glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); - glPixelStorei( GL_PACK_ALIGNMENT, 1 ); -*/ - GfxRenderer.Bind_Material(_textureId); - // setup texture parameters - glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE ); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); - glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); - glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0 ); - // build texture - glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA8, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, textureData ); - -#ifdef _PY_INT_MORE_LOG - GLenum status = glGetError(); - switch (status) - { - case GL_INVALID_ENUM: - WriteLog("An unacceptable value is specified for an enumerated argument. The " - "offending function is ignored, having no side effect other than to set " - "the error flag."); - break; - case GL_INVALID_VALUE: - WriteLog("A numeric argument is out of range. The offending function is ignored, " - "having no side effect other than to set the error flag."); - break; - case GL_INVALID_OPERATION: - WriteLog("The specified operation is not allowed in the current state. The " - "offending function is ignored, having no side effect other than to set " - "the error flag."); - break; - case GL_NO_ERROR: - WriteLog("No error has been recorded. The value of this symbolic constant is " - "guaranteed to be zero."); - break; - case GL_STACK_OVERFLOW: - WriteLog("This function would cause a stack overflow. The offending function is " - "ignored, having no side effect other than to set the error flag."); - break; - case GL_STACK_UNDERFLOW: - WriteLog("This function would cause a stack underflow. The offending function is " - "ignored, having no side effect other than to set the error flag."); - break; - case GL_OUT_OF_MEMORY: - WriteLog("There is not enough memory left to execute the function. The state of " - "OpenGL is undefined, except for the state of the error flags, after this " - "error is recorded."); - break; - }; -#endif // _PY_INT_MORE_LOG - } - else - { - WriteLog("RAW python texture data is NULL!"); - } - } - else - { - WriteLog("Python texture object is NULL!"); - } -} - -void TPythonScreenRenderer::render(PyObject *trainState) -{ -#ifdef _PY_INT_MORE_LOG - WriteLog("Python rendering texture ..."); -#endif // _PY_INT_MORE_LOG - _pyTexture = PyObject_CallMethod(_pyRenderer, "render", "O", trainState); - - if (_pyTexture == NULL) - { - TPythonInterpreter::getInstance()->handleError(); - } - else - { - _pyWidth = PyObject_CallMethod(_pyRenderer, "get_width", NULL); - if (_pyWidth == NULL) - { - TPythonInterpreter::getInstance()->handleError(); - } - _pyHeight = PyObject_CallMethod(_pyRenderer, "get_height", NULL); - if (_pyHeight == NULL) - { - TPythonInterpreter::getInstance()->handleError(); - } - } -} - -#ifdef __GNUC__ -#pragma GCC diagnostic pop -#endif - -TPythonScreenRenderer::~TPythonScreenRenderer() -{ -#ifdef _PY_INT_MORE_LOG - WriteLog("PythonScreenRenderer descturctor called"); -#endif // _PY_INT_MORE_LOG - if (_pyRenderer != NULL) - { - Py_CLEAR(_pyRenderer); - } - cleanup(); -#ifdef _PY_INT_MORE_LOG - WriteLog("PythonScreenRenderer desctructor finished"); -#endif // _PY_INT_MORE_LOG -} - -void TPythonScreenRenderer::cleanup() -{ - if (_pyTexture != NULL) - { - Py_CLEAR(_pyTexture); - _pyTexture = NULL; - } - if (_pyWidth != NULL) - { - Py_CLEAR(_pyWidth); - _pyWidth = NULL; - } - if (_pyHeight != NULL) - { - Py_CLEAR(_pyHeight); - _pyHeight = NULL; - } -} - -void TPythonScreens::reset(void *train) -{ - _terminationFlag = true; - if (_thread != NULL) - { -// WriteLog("Awaiting python thread to end"); - _thread->join(); - delete _thread; - _thread = nullptr; - } - _terminationFlag = false; - _cleanupReadyFlag = false; - _renderReadyFlag = false; - for (std::vector::iterator i = _screens.begin(); i != _screens.end(); - ++i) - { - delete *i; - } -#ifdef _PY_INT_MORE_LOG - WriteLog("Clearing renderer vector"); -#endif // _PY_INT_MORE_LOG - _screens.clear(); - _train = train; -} - -void TPythonScreens::init(cParser &parser, TModel3d *model, std::string const &name, int const cab) -{ - std::string asSubModelName, asPyClassName; - parser.getTokens( 2, false ); - parser - >> asSubModelName - >> asPyClassName; - std::string subModelName = ToLower( asSubModelName ); - std::string pyClassName = ToLower( asPyClassName ); - TSubModel *subModel = model->GetFromName(subModelName); - if (subModel == NULL) - { - WriteLog( "Python Screen: submodel " + subModelName + " not found - Ignoring screen" ); - return; // nie ma takiego sub modelu w danej kabinie pomijamy - } - auto textureId = subModel->GetMaterial(); - if (textureId <= 0) - { - WriteLog( "Python Screen: invalid texture id " + std::to_string(textureId) + " - Ignoring screen" ); - return; // sub model nie posiada tekstury lub tekstura wymienna - nie obslugiwana - } - TPythonInterpreter *python = TPythonInterpreter::getInstance(); - python->loadClassFile(_lookupPath, pyClassName); - PyObject *args = Py_BuildValue("(ssi)", _lookupPath.c_str(), name.c_str(), cab); - if (args == NULL) - { - WriteLog("Python Screen: cannot create __init__ arguments"); - return; - } - PyObject *pyRenderer = python->newClass(pyClassName, args); - Py_CLEAR(args); - if (pyRenderer == NULL) - { - WriteLog( "Python Screen: null renderer for " + pyClassName + " - Ignoring screen" ); - return; // nie mozna utworzyc obiektu Pythonowego - } - m_updaterate = Global.PythonScreenUpdateRate; - TPythonScreenRenderer *renderer = new TPythonScreenRenderer(textureId, pyRenderer); - _screens.push_back(renderer); - WriteLog( "Created python screen " + pyClassName + " on submodel " + subModelName + " (" + std::to_string(textureId) + ")" ); -} - -void TPythonScreens::update() -{ - if (!_renderReadyFlag) - { - return; - } - _renderReadyFlag = false; - for (std::vector::iterator i = _screens.begin(); i != _screens.end(); - ++i) - { - (*i)->updateTexture(); - } - _cleanupReadyFlag = true; -} - -void TPythonScreens::setLookupPath(std::string const &path) -{ - _lookupPath = path; - replace_slashes( _lookupPath ); -} - -TPythonScreens::TPythonScreens() -{ - TPythonInterpreter::getInstance()->loadClassFile("", "abstractscreenrenderer"); -} - -TPythonScreens::~TPythonScreens() -{ -#ifdef _PY_INT_MORE_LOG - WriteLog("Called python sceeens destructor"); -#endif // _PY_INT_MORE_LOG - reset(NULL); -/* - if (_lookupPath != NULL) - { -#ifdef _PY_INT_MORE_LOG - WriteLog("Freeing lookup path"); -#endif // _PY_INT_MORE_LOG - free(_lookupPath); - } -*/ -} - -void TPythonScreens::run() -{ - while (1) - { - m_updatestopwatch.start(); - if (_terminationFlag) - { - return; - } - TTrain *train = (TTrain *)_train; - _trainState = train->GetTrainState(); - if (_terminationFlag) - { - _freeTrainState(); - return; - } - for (std::vector::iterator i = _screens.begin(); - i != _screens.end(); ++i) - { - (*i)->render(_trainState); - } - _freeTrainState(); - if (_terminationFlag) - { - _cleanup(); - return; - } - _renderReadyFlag = true; - m_updatestopwatch.stop(); - while (!_cleanupReadyFlag && !_terminationFlag) - { - auto const sleeptime { - std::max( - 100, - m_updaterate - static_cast( m_updatestopwatch.average() ) ) }; -#ifdef _WIN32 - Sleep( sleeptime ); -#elif __linux__ - usleep( sleeptime * 1000 ); -#endif - } - if (_terminationFlag) - { - return; - } - _cleanup(); - } -} - -void TPythonScreens::finish() -{ - // nothing to do here, proper clean up takes place afterwards -} - -void ScreenRendererThread(TPythonScreens* renderer) -{ - renderer->run(); - renderer->finish(); -#ifdef _PY_INT_MORE_LOG - WriteLog("Python Screen Renderer Thread Ends"); -#endif // _PY_INT_MORE_LOG -} - -void TPythonScreens::start() -{ - if (_screens.size() > 0) - { - _thread = new std::thread(ScreenRendererThread, this); - } -} - -void TPythonScreens::_cleanup() -{ - _cleanupReadyFlag = false; - for (std::vector::iterator i = _screens.begin(); i != _screens.end(); - ++i) - { - (*i)->cleanup(); - } -} - -void TPythonScreens::_freeTrainState() -{ - if (_trainState != NULL) - { - PyDict_Clear(_trainState); - Py_CLEAR(_trainState); - _trainState = NULL; - } -} \ No newline at end of file diff --git a/PyInt.h b/PyInt.h index bb4f8281..1bf215b9 100644 --- a/PyInt.h +++ b/PyInt.h @@ -1,13 +1,13 @@ -#ifndef PyIntH -#define PyIntH +/* +This Source Code Form is subject to the +terms of the Mozilla Public License, v. +2.0. If a copy of the MPL was not +distributed with this file, You can +obtain one at +http://mozilla.org/MPL/2.0/. +*/ -#ifdef _POSIX_C_SOURCE -#undef _POSIX_C_SOURCE -#endif - -#ifdef _XOPEN_SOURCE -#undef _XOPEN_SOURCE -#endif +#pragma once #ifdef _DEBUG #undef _DEBUG // bez tego macra Py_DECREF powoduja problemy przy linkowaniu @@ -17,78 +17,69 @@ #include "Python.h" #endif #include "Classes.h" -#include "timer.h" #define PyGetFloat(param) PyFloat_FromDouble(param >= 0 ? param : -param) #define PyGetFloatS(param) PyFloat_FromDouble(param) #define PyGetInt(param) PyInt_FromLong(param) -#define PyGetFloatS(param) PyFloat_FromDouble(param) #define PyGetBool(param) param ? Py_True : Py_False #define PyGetString(param) PyString_FromString(param) -class TPythonInterpreter -{ - protected: - TPythonInterpreter(); - ~TPythonInterpreter() {} - static TPythonInterpreter *_instance; - std::set _classes; - PyObject *_main; - PyObject *_stdErr; - FILE *_getFile( std::string const &lookupPath, std::string const &className ); +// TODO: extract common base and inherit specialization from it +class render_task { - public: - static TPythonInterpreter *getInstance(); - static void killInstance(); - bool loadClassFile( std::string const &lookupPath, std::string const &className ); - PyObject *newClass( std::string const &className ); - PyObject *newClass( std::string const &className, PyObject *argsTuple ); - void handleError(); -}; - -class TPythonScreenRenderer -{ - protected: - PyObject *_pyRenderer; - PyObject *_pyTexture; - int _textureId; - PyObject *_pyWidth; - PyObject *_pyHeight; - - public: - TPythonScreenRenderer(int textureId, PyObject *renderer); - ~TPythonScreenRenderer(); - void render(PyObject *trainState); - void cleanup(); - void updateTexture(); -}; - -class TPythonScreens -{ - protected: - bool _cleanupReadyFlag{ false }; - bool _renderReadyFlag{ false }; - bool _terminationFlag{ false }; - std::thread *_thread{ nullptr }; - std::vector _screens; - std::string _lookupPath; - void *_train; - void _cleanup(); - void _freeTrainState(); - PyObject *_trainState; - int m_updaterate { 200 }; - Timer::stopwatch m_updatestopwatch; - - public: - void reset(void *train); - void setLookupPath(std::string const &path); - void init(cParser &parser, TModel3d *model, std::string const &name, int const cab); - void update(); - TPythonScreens(); - ~TPythonScreens(); +public: +// constructors + render_task( PyObject *Renderer, PyObject *Input, material_handle Target ) : + m_renderer( Renderer ), m_input( Input ), m_target( Target ) + {} +// methods void run(); - void start(); - void finish(); + +private: +// members + PyObject *m_renderer {nullptr}; + PyObject *m_input { nullptr }; + material_handle m_target { null_handle }; }; -#endif // PyIntH \ No newline at end of file +class python_taskqueue { + +public: +// types + struct task_request { + + std::string const &renderer; + PyObject *input; + material_handle target; + }; +// constructors + python_taskqueue() = default; +// methods + // initializes the module. returns true on success + auto init() -> bool; + // shuts down the module + void exit(); + // adds specified task along with provided collection of data to the work queue. returns true on success + auto insert( task_request const &Task ) -> bool; + // executes python script stored in specified file. returns true on success + auto run_file( std::string const &File, std::string const &Path = "" ) -> bool; + +private: +// types + static int const WORKERCOUNT { 1 }; + using worker_array = std::array, WORKERCOUNT >; + using rendertask_sequence = threading::lockable< std::deque >; +// methods + auto fetch_renderer( std::string const Renderer ) -> PyObject *; + void run( GLFWwindow *Context, rendertask_sequence &Tasks, threading::condition_variable &Condition, std::atomic &Exit ); + void error(); +// members + PyObject *m_main { nullptr }; + PyObject *m_error { nullptr }; + PyThreadState *m_mainthread{ nullptr }; + worker_array m_workers; + threading::condition_variable m_condition; // wakes up the workers + std::atomic m_exit { false }; // signals the workers to quit + std::unordered_map m_renderers; // cache of python classes + rendertask_sequence m_tasks; +}; diff --git a/ResourceManager.h b/ResourceManager.h index 81e631a8..f75d8b43 100644 --- a/ResourceManager.h +++ b/ResourceManager.h @@ -9,8 +9,6 @@ http://mozilla.org/MPL/2.0/. #pragma once -int const null_handle = 0; - enum class resource_state { none, loading, diff --git a/Train.cpp b/Train.cpp index 42a378eb..bded4fe9 100644 --- a/Train.cpp +++ b/Train.cpp @@ -28,6 +28,7 @@ http://mozilla.org/MPL/2.0/. #include "dynobj.h" #include "mtable.h" #include "Console.h" +#include "application.h" namespace input { @@ -449,6 +450,7 @@ PyObject *TTrain::GetTrainState() { return nullptr; } + PyDict_SetItemString( dict, "name", PyGetString( DynamicObject->asName.c_str() ) ); PyDict_SetItemString( dict, "cab", PyGetInt( mover->ActiveCab ) ); // basic systems state data PyDict_SetItemString( dict, "battery", PyGetBool( mvControlled->Battery ) ); @@ -469,7 +471,7 @@ PyObject *TTrain::GetTrainState() { PyDict_SetItemString( dict, "dir_brake", PyGetBool( bEP ) ); bool bPN; if( ( typeid( *mvControlled->Hamulec ) == typeid( TLSt ) ) - || ( typeid( *mvControlled->Hamulec ) == typeid( TEStED ) ) ) { + || ( typeid( *mvControlled->Hamulec ) == typeid( TEStED ) ) ) { TBrake* temp_ham = mvControlled->Hamulec.get(); bPN = ( static_cast( temp_ham )->GetEDBCP() > 0.2 ); @@ -4682,7 +4684,6 @@ bool TTrain::Update( double const Deltatime ) } } - tor = DynamicObject->GetTrack(); // McZapkie-180203 // McZapkie: predkosc wyswietlana na tachometrze brana jest z obrotow kol auto const maxtacho { 3.0 }; fTachoVelocity = static_cast( std::min( std::abs(11.31 * mvControlled->WheelDiameter * mvControlled->nrot), mvControlled->Vmax * 1.05) ); @@ -5606,7 +5607,6 @@ bool TTrain::Update( double const Deltatime ) ggFuelPumpButton.Update(); ggOilPumpButton.Update(); //------ - pyScreens.update(); } // wyprowadzenie sygnałów dla haslera na PoKeys (zaznaczanie na taśmie) btHaslerBrakes.Turn(DynamicObject->MoverParameters->BrakePress > 0.4); // ciśnienie w cylindrach @@ -5676,8 +5676,8 @@ bool TTrain::Update( double const Deltatime ) } } /* - // NOTE: disabled while switch state isn't preserved while moving between compartments // check whether we should raise the pantographs, based on volume in pantograph tank + // NOTE: disabled while switch state isn't preserved while moving between compartments if( mvControlled->PantPress > ( mvControlled->TrainType == dt_EZT ? 2.4 : @@ -5692,7 +5692,15 @@ bool TTrain::Update( double const Deltatime ) } } */ - + // screens + fScreenTimer += Deltatime; + if( ( fScreenTimer > Global.PythonScreenUpdateRate * 0.001f ) + && ( false == FreeFlyModeFlag ) ) { // don't bother if we're outside + fScreenTimer = 0.f; + for( auto const &screen : m_screens ) { + Application.request( { screen.first, GetTrainState(), screen.second } ); + } + } // sounds update_sounds( Deltatime ); @@ -5853,7 +5861,6 @@ TTrain::update_sounds( double const Deltatime ) { dsbSlipAlarm.stop(); } } -/* // szum w czasie jazdy if( ( false == FreeFlyModeFlag ) && ( false == Global.CabWindowOpen ) @@ -5865,7 +5872,6 @@ TTrain::update_sounds( double const Deltatime ) { // don't play the optional ending sound if the listener switches views rsRunningNoise.stop( true == FreeFlyModeFlag ); } - */ // hunting oscillation noise if( ( false == FreeFlyModeFlag ) && ( false == Global.CabWindowOpen ) @@ -6255,6 +6261,8 @@ bool TTrain::LoadMMediaFile(std::string const &asFileName) bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { m_controlmapper.clear(); + // clear python screens + m_screens.clear(); // reset sound positions and owner auto const nullvector { glm::vec3() }; std::vector sounds = { @@ -6272,9 +6280,6 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) pMechViewAngle = { 0.0, 0.0 }; Global.pCamera.Pitch = pMechViewAngle.x; Global.pCamera.Yaw = pMechViewAngle.y; - - pyScreens.reset(this); - pyScreens.setLookupPath(DynamicObject->asBaseDir); bool parse = false; int cabindex = 0; DynamicObject->mdKabina = NULL; // likwidacja wskaźnika na dotychczasową kabinę @@ -6469,9 +6474,32 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) // matched the token, grab the next one continue; } + // TODO: add "pydestination:" else if (token == "pyscreen:") { - pyScreens.init(parser, DynamicObject->mdKabina, DynamicObject->name(), NewCabNo); + std::string submodelname, renderername; + parser.getTokens( 2 ); + parser + >> submodelname + >> renderername; + + auto const *submodel { DynamicObject->mdKabina->GetFromName( submodelname ) }; + if( submodel == nullptr ) { + WriteLog( "Python Screen: submodel " + submodelname + " not found - Ignoring screen" ); + continue; + } + auto const material { submodel->GetMaterial() }; + if( material <= 0 ) { + // sub model nie posiada tekstury lub tekstura wymienna - nie obslugiwana + WriteLog( "Python Screen: invalid texture id " + std::to_string( material ) + " - Ignoring screen" ); + continue; + } + // record renderer and material binding for future update requests + m_screens.emplace_back( + ( substr_path(renderername).empty() ? // supply vehicle folder as path if none is provided + DynamicObject->asBaseDir + renderername : + renderername ), + material ); } // btLampkaUnknown.Init("unknown",mdKabina,false); } while (token != ""); @@ -6480,7 +6508,6 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName) { return false; } - pyScreens.start(); if (DynamicObject->mdKabina) { // configure placement of sound emitters which aren't bound with any device model, and weren't placed manually diff --git a/Train.h b/Train.h index 4c19b5d2..2a84462d 100644 --- a/Train.h +++ b/Train.h @@ -628,12 +628,10 @@ private: float fConverterTimer; // hunter-261211: dla przekaznika float fMainRelayTimer; // hunter-141211: zalaczanie WSa z opoznieniem float fCzuwakTestTimer; // hunter-091012: do testu czuwaka - float fLightsTimer; // yB 150617: timer do swiatel + float fScreenTimer { 0.f }; bool CAflag { false }; // hunter-131211: dla osobnego zbijania CA i SHP - double fPoslizgTimer; - TTrack *tor; // McZapkie-240302 - przyda sie do tachometru float fTachoVelocity{ 0.0f }; float fTachoVelocityJump{ 0.0f }; // ze skakaniem @@ -659,10 +657,8 @@ private: bool bHeat[8]; // grzanie // McZapkie: do syczenia float fPPress, fNPress; -// float fSPPress, fSNPress; - int iSekunda; // Ra: sekunda aktualizacji pr?dko?ci int iRadioChannel { 1 }; // numer aktualnego kana?u radiowego - TPythonScreens pyScreens; + std::vector> m_screens; public: float fPress[20][3]; // cisnienia dla wszystkich czlonow diff --git a/application.cpp b/application.cpp index 8330e5bb..d35fb33e 100644 --- a/application.cpp +++ b/application.cpp @@ -16,7 +16,6 @@ http://mozilla.org/MPL/2.0/. #include "globals.h" #include "simulation.h" #include "train.h" -#include "pyint.h" #include "sceneeditor.h" #include "renderer.h" #include "uilayer.h" @@ -129,6 +128,7 @@ eu07_application::init( int Argc, char *Argv[] ) { if( ( result = init_audio() ) != 0 ) { return result; } + m_taskqueue.init(); if( ( result = init_modes() ) != 0 ) { return result; } @@ -140,7 +140,7 @@ int eu07_application::run() { // main application loop - while( ( false == glfwWindowShouldClose( m_window ) ) + while( ( false == glfwWindowShouldClose( m_windows.front() ) ) && ( false == m_modestack.empty() ) && ( true == m_modes[ m_modestack.top() ]->update() ) && ( true == GfxRenderer.Render() ) ) { @@ -151,6 +151,12 @@ eu07_application::run() { return 0; } +bool +eu07_application::request( python_taskqueue::task_request const &Task ) { + + return m_taskqueue.insert( Task ); +} + void eu07_application::exit() { @@ -159,10 +165,11 @@ eu07_application::exit() { ui_layer::shutdown(); - glfwDestroyWindow( m_window ); + for( auto *window : m_windows ) { + glfwDestroyWindow( window ); + } glfwTerminate(); - - TPythonInterpreter::killInstance(); + m_taskqueue.exit(); } void @@ -197,7 +204,7 @@ eu07_application::push_mode( eu07_application::mode const Mode ) { void eu07_application::set_title( std::string const &Title ) { - glfwSetWindowTitle( m_window, Title.c_str() ); + glfwSetWindowTitle( m_windows.front(), Title.c_str() ); } void @@ -217,17 +224,13 @@ eu07_application::set_cursor( int const Mode ) { void eu07_application::set_cursor_pos( double const Horizontal, double const Vertical ) { - if( m_window != nullptr ) { - glfwSetCursorPos( m_window, Horizontal, Vertical ); - } + glfwSetCursorPos( m_windows.front(), Horizontal, Vertical ); } void eu07_application::get_cursor_pos( double &Horizontal, double &Vertical ) const { - if( m_window != nullptr ) { - glfwGetCursorPos( m_window, &Horizontal, &Vertical ); - } + glfwGetCursorPos( m_windows.front(), &Horizontal, &Vertical ); } void @@ -262,6 +265,24 @@ eu07_application::on_scroll( double const Xoffset, double const Yoffset ) { m_modes[ m_modestack.top() ]->on_scroll( Xoffset, Yoffset ); } +GLFWwindow * +eu07_application::window( int const Windowindex ) { + + if( Windowindex >= 0 ) { + return ( + Windowindex < m_windows.size() ? + m_windows[ Windowindex ] : + nullptr ); + } + // for index -1 create a new child window + glfwWindowHint( GLFW_VISIBLE, GL_FALSE ); + auto *childwindow = glfwCreateWindow( 1, 1, "eu07helper", nullptr, m_windows.front() ); + if( childwindow != nullptr ) { + m_windows.emplace_back( childwindow ); + } + return childwindow; +} + // private: void @@ -433,7 +454,7 @@ eu07_application::init_glfw() { // switch off the topmost flag ::SetWindowPos( Hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE ); #endif - m_window = window; + m_windows.emplace_back( window ); return 0; } @@ -441,16 +462,17 @@ eu07_application::init_glfw() { void eu07_application::init_callbacks() { - glfwSetFramebufferSizeCallback( m_window, window_resize_callback ); - glfwSetCursorPosCallback( m_window, cursor_pos_callback ); - glfwSetMouseButtonCallback( m_window, mouse_button_callback ); - glfwSetKeyCallback( m_window, key_callback ); - glfwSetScrollCallback( m_window, scroll_callback ); - glfwSetWindowFocusCallback( m_window, focus_callback ); + auto *window { m_windows.front() }; + glfwSetFramebufferSizeCallback( window, window_resize_callback ); + glfwSetCursorPosCallback( window, cursor_pos_callback ); + glfwSetMouseButtonCallback( window, mouse_button_callback ); + glfwSetKeyCallback( window, key_callback ); + glfwSetScrollCallback( window, scroll_callback ); + glfwSetWindowFocusCallback( window, focus_callback ); { int width, height; - glfwGetFramebufferSize( m_window, &width, &height ); - window_resize_callback( m_window, width, height ); + glfwGetFramebufferSize( window, &width, &height ); + window_resize_callback( window, width, height ); } } @@ -462,8 +484,8 @@ eu07_application::init_gfx() { return -1; } - if( ( false == GfxRenderer.Init( m_window ) ) - || ( false == ui_layer::init( m_window ) ) ) { + if( ( false == GfxRenderer.Init( m_windows.front() ) ) + || ( false == ui_layer::init( m_windows.front() ) ) ) { return -1; } diff --git a/application.h b/application.h index 17f9048c..7aceda31 100644 --- a/application.h +++ b/application.h @@ -10,6 +10,7 @@ http://mozilla.org/MPL/2.0/. #pragma once #include "applicationmode.h" +#include "pyint.h" class eu07_application { @@ -29,6 +30,8 @@ public: init( int Argc, char *Argv[] ); int run(); + bool + request( python_taskqueue::task_request const &Task ); void exit(); void @@ -57,10 +60,9 @@ public: on_mouse_button( int const Button, int const Action, int const Mods ); void on_scroll( double const Xoffset, double const Yoffset ); - inline + // gives access to specified window, creates a new window if index == -1 GLFWwindow * - window() { - return m_window; } + window( int const Windowindex = 0 ); private: // types @@ -77,9 +79,10 @@ private: int init_audio(); int init_modes(); // members - GLFWwindow * m_window { nullptr }; modeptr_array m_modes { nullptr }; // collection of available application behaviour modes mode_stack m_modestack; // current behaviour mode + python_taskqueue m_taskqueue; + std::vector m_windows; }; extern eu07_application Application; diff --git a/stdafx.h b/stdafx.h index c59fc775..57bdfa9b 100644 --- a/stdafx.h +++ b/stdafx.h @@ -103,6 +103,8 @@ #include #include +int const null_handle = 0; + #include "openglmatrixstack.h" #include "openglcolor.h" diff --git a/utilities.h b/utilities.h index be746026..ee086586 100644 --- a/utilities.h +++ b/utilities.h @@ -313,4 +313,61 @@ glm::dvec3 LoadPoint( class cParser &Input ); std::string deserialize_random_set( cParser &Input, char const *Break = "\n\r\t ;" ); +namespace threading { + +// simple POD pairing of a data item and a mutex +// NOTE: doesn't do any locking itself, it's merely for cleaner argument arrangement and passing +template +struct lockable { + + Type_ data; + std::mutex mutex; +}; + +// basic wrapper simplifying use of std::condition_variable for most typical cases. +// has its own mutex and secondary variable to ignore spurious wakeups +class condition_variable { + +public: +// methods + void + wait() { + std::unique_lock lock( m_mutex ); + m_condition.wait( + lock, + [ this ]() { + return m_spurious == false; } ); } + template< class Rep_, class Period_ > + void + wait_for( const std::chrono::duration &Time ) { + std::unique_lock lock( m_mutex ); + m_condition.wait_for( + lock, + Time, + [ this ]() { + return m_spurious == false; } ); } + void + notify_one() { + spurious( false ); + m_condition.notify_one(); + } + void + notify_all() { + spurious( false ); + m_condition.notify_all(); + } + void + spurious( bool const Spurious ) { + std::lock_guard lock( m_mutex ); + m_spurious = Spurious; } + +private: +// members + mutable std::mutex m_mutex; + std::condition_variable m_condition; + bool m_spurious { true }; +}; + +} // threading + //--------------------------------------------------------------------------- From 226ddb6291077c3c890f7978856cdba4d1241480 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 28 Sep 2018 19:18:24 +0200 Subject: [PATCH 414/426] build 180928. heater sound, minor precipitation tweaks, minor bug fixes --- DynObj.cpp | 17 +++++++++++++++-- DynObj.h | 1 + Gauge.cpp | 2 +- Texture.cpp | 9 ++++++--- openglcolor.h | 4 +++- openglgeometrybank.cpp | 1 - renderer.cpp | 22 ++++++++++++++-------- version.h | 4 ++-- 8 files changed, 42 insertions(+), 18 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index f9fc47c2..f9321f88 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2157,7 +2157,7 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424" btShutters1.Init( "shutters1", mdModel, false ); } if( MoverParameters->dizel_heat.water_aux.config.shutters ) { - btShutters1.Init( "shutters2", mdModel, false ); + btShutters2.Init( "shutters2", mdModel, false ); } TurnOff(); // resetowanie zmiennych submodeli @@ -3971,6 +3971,13 @@ void TDynamicObject::RenderSounds() { sSmallCompressor.stop(); } + // heating sound + if( MoverParameters->Heating ) { + sHeater.play( sound_flags::exclusive | sound_flags::looping ); + } + else { + sHeater.stop(); + } // brake system and braking sounds: @@ -5393,6 +5400,12 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co sConverter.owner( this ); } + else if( token == "heater:" ) { + // train heating device + sHeater.deserialize( parser, sound_type::single ); + sHeater.owner( this ); + } + else if( token == "turbo:" ) { // pliki z turbogeneratorem m_powertrainsounds.engine_turbo.deserialize( parser, sound_type::multipart, sound_parameters::range ); @@ -5827,7 +5840,7 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co // other engine compartment sounds auto const nullvector { glm::vec3() }; std::vector enginesounds = { - &sConverter, &sCompressor, &sSmallCompressor + &sConverter, &sCompressor, &sSmallCompressor, &sHeater }; for( auto sound : enginesounds ) { if( sound->offset() == nullvector ) { diff --git a/DynObj.h b/DynObj.h index 8c899e52..0a19dee1 100644 --- a/DynObj.h +++ b/DynObj.h @@ -409,6 +409,7 @@ private: sound_source sConverter { sound_placement::engine }; sound_source sCompressor { sound_placement::engine }; // NBMX wrzesien 2003 sound_source sSmallCompressor { sound_placement::engine }; + sound_source sHeater { sound_placement::engine }; // braking sounds sound_source dsbPneumaticRelay { sound_placement::external }; sound_source rsBrake { sound_placement::external, EU07_SOUND_BRAKINGCUTOFFRANGE }; // moved from cab diff --git a/Gauge.cpp b/Gauge.cpp index 7666055e..ca49c85e 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -209,7 +209,7 @@ void TGauge::UpdateValue( float fNewDesired, sound_source *Fallbacksound ) { auto const desiredtimes100 = static_cast( std::round( 100.0 * fNewDesired ) ); - if( desiredtimes100 == static_cast( 100.0 * m_targetvalue ) ) { + if( desiredtimes100 == static_cast( std::round( 100.0 * m_targetvalue ) ) ) { return; } m_targetvalue = fNewDesired; diff --git a/Texture.cpp b/Texture.cpp index 857ad9e1..665a2598 100644 --- a/Texture.cpp +++ b/Texture.cpp @@ -814,14 +814,17 @@ void texture_manager::bind( std::size_t const Unit, texture_handle const Texture ) { m_textures[ Texture ].second = m_garbagecollector.timestamp(); - + if( m_units[ Unit ].unit == 0 ) { + // no texture unit, nothing to bind the texture to + return; + } + // even if we may skip texture binding make sure the relevant texture unit is activated + unit( m_units[ Unit ].unit ); if( Texture == m_units[ Unit ].texture ) { // don't bind again what's already active return; } // TBD, TODO: do binding in texture object, add support for other types than 2d - if( m_units[ Unit ].unit == 0 ) { return; } - unit( m_units[ Unit ].unit ); if( Texture != null_handle ) { #ifndef EU07_DEFERRED_TEXTURE_UPLOAD // NOTE: we could bind dedicated 'error' texture here if the id isn't valid diff --git a/openglcolor.h b/openglcolor.h index a40f0732..39281880 100644 --- a/openglcolor.h +++ b/openglcolor.h @@ -9,6 +9,8 @@ http://mozilla.org/MPL/2.0/. #pragma once +#include "globals.h" + // encapsulation of the fixed pipeline opengl color class opengl_color { @@ -32,7 +34,7 @@ public: inline void color4( glm::vec4 const &Color ) { - if( Color != m_color ) { + if( ( Color != m_color ) || ( false == Global.bUseVBO ) ) { m_color = Color; ::glColor4fv( glm::value_ptr( m_color ) ); } } inline diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp index ba29170e..02fde9db 100644 --- a/openglgeometrybank.cpp +++ b/openglgeometrybank.cpp @@ -341,7 +341,6 @@ opengl_dlgeometrybank::draw_( gfx::geometry_handle const &Geometry, gfx::stream_ auto const &chunk = gfx::geometry_bank::chunk( Geometry ); ::glNewList( chunkrecord.list, GL_COMPILE ); - ::glColor3f( -1.f, -1.f, -1.f ); // HACK: force the opengl color wrapper to include color call in the display list regardless of currently active color ::glBegin( chunk.type ); for( auto const &vertex : chunk.vertices ) { if( Streams & gfx::stream::normal ) { ::glNormal3fv( glm::value_ptr( vertex.normal ) ); } diff --git a/renderer.cpp b/renderer.cpp index 9a0adf7d..f5d6d9c4 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -2837,17 +2837,10 @@ opengl_renderer::Render_precipitation() { colors::white, 0.5f * clamp( Global.fLuminance, 0.f, 1.f ) ) ) ); ::glPushMatrix(); - + // tilt the precipitation cone against the velocity vector for crude motion blur auto const velocity { simulation::Environment.m_precipitation.m_cameramove * -1.0 }; if( glm::length2( velocity ) > 0.0 ) { auto const forward{ glm::normalize( velocity ) }; - if( false == FreeFlyModeFlag ) { - // counter potential vehicle roll - auto const roll { simulation::Train->Dynamic()->Roll() }; - if( roll != 0.0 ) { - ::glRotated( roll, forward.x, 0.0, forward.z ); - } - } auto left { glm::cross( forward, {0.0,1.0,0.0} ) }; auto const rotationangle { std::min( @@ -2857,6 +2850,19 @@ opengl_renderer::Render_precipitation() { simulation::Train->Dynamic()->GetVelocity() * 0.2 ) ) }; ::glRotated( rotationangle, left.x, 0.0, left.z ); } + if( false == FreeFlyModeFlag ) { + // counter potential vehicle roll + auto const roll { 0.5 * glm::degrees( simulation::Train->Dynamic()->Roll() ) }; + if( roll != 0.0 ) { + auto const forward { simulation::Train->Dynamic()->VectorFront() }; + auto const vehicledirection = simulation::Train->Dynamic()->DirectionGet(); + ::glRotated( roll, forward.x, 0.0, forward.z ); + } + } + if( Global.Weather == "rain:" ) { + // oddly enough random streaks produce more natural looking rain than ones the eye can follow + ::glRotated( Random() * 360, 0.0, 1.0, 0.0 ); + } // TBD: leave lighting on to allow vehicle lights to affect it? ::glDisable( GL_LIGHTING ); diff --git a/version.h b/version.h index 944d092c..66a33f7e 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 923 -#define VERSION_REVISION 1 +#define VERSION_MINOR 928 +#define VERSION_REVISION 0 From 467d46eba2e0cdeb2856b1c5bfc718d6b40a52fe Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sat, 29 Sep 2018 20:14:28 +0200 Subject: [PATCH 415/426] partial support for cab switch types, basic precipitation level texture selection --- Gauge.cpp | 47 ++++++---- Gauge.h | 13 ++- McZapkie/MOVER.h | 11 ++- McZapkie/Mover.cpp | 215 ++++++++++++++++++++++++++++++++---------- Segment.cpp | 4 +- Train.cpp | 226 +++++++++++++++++++++++++++++++++------------ precipitation.cpp | 11 ++- 7 files changed, 389 insertions(+), 138 deletions(-) diff --git a/Gauge.cpp b/Gauge.cpp index ca49c85e..1f87a7b8 100644 --- a/Gauge.cpp +++ b/Gauge.cpp @@ -28,11 +28,11 @@ TGauge::TGauge( sound_source const &Soundtemplate ) : m_soundfxdecrease = m_soundtemplate; } -void TGauge::Init(TSubModel *Submodel, TGaugeType Type, float Scale, float Offset, float Friction, float Value, float const Endvalue, float const Endscale, bool const Interpolatescale ) +void TGauge::Init(TSubModel *Submodel, TGaugeAnimation Type, float Scale, float Offset, float Friction, float Value, float const Endvalue, float const Endscale, bool const Interpolatescale ) { // ustawienie parametrów animacji submodelu SubModel = Submodel; m_value = Value; - m_type = Type; + m_animation = Type; m_scale = Scale; m_offset = Offset; m_friction = Friction; @@ -45,7 +45,7 @@ void TGauge::Init(TSubModel *Submodel, TGaugeType Type, float Scale, float Offse return; } - if( m_type == TGaugeType::gt_Digital ) { + if( m_animation == TGaugeAnimation::gt_Digital ) { TSubModel *sm = SubModel->ChildGet(); do { @@ -147,19 +147,19 @@ bool TGauge::Load( cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, ErrorLog( "Bad model: failed to locate sub-model \"" + submodelname + "\" in 3d model \"" + md1->NameGet() + "\"", logtype::model ); } - std::map gaugetypes { - { "rot", TGaugeType::gt_Rotate }, - { "rotvar", TGaugeType::gt_Rotate }, - { "mov", TGaugeType::gt_Move }, - { "movvar", TGaugeType::gt_Move }, - { "wip", TGaugeType::gt_Wiper }, - { "dgt", TGaugeType::gt_Digital } + std::map gaugetypes { + { "rot", TGaugeAnimation::gt_Rotate }, + { "rotvar", TGaugeAnimation::gt_Rotate }, + { "mov", TGaugeAnimation::gt_Move }, + { "movvar", TGaugeAnimation::gt_Move }, + { "wip", TGaugeAnimation::gt_Wiper }, + { "dgt", TGaugeAnimation::gt_Digital } }; auto lookup = gaugetypes.find( gaugetypename ); auto const type = ( lookup != gaugetypes.end() ? lookup->second : - TGaugeType::gt_Unknown ); + TGaugeAnimation::gt_Unknown ); Init( submodel, type, scale, offset, friction, 0, endvalue, endscale, interpolatescale ); @@ -170,10 +170,17 @@ bool TGauge::Load_mapping( cParser &Input ) { // token can be a key or block end - std::string const key { Input.getToken( true, "\n\r\t ,;" ) }; + auto const key { Input.getToken( true, "\n\r\t ,;" ) }; if( ( true == key.empty() ) || ( key == "}" ) ) { return false; } // if not block end then the key is followed by assigned value or sub-block - if( key == "soundinc:" ) { + if( key == "type:" ) { + auto const gaugetype { Input.getToken( true, "\n\r\t ,;" ) }; + m_type = ( + gaugetype == "impulse" ? TGaugeType::push : + gaugetype == "return" ? TGaugeType::push : + TGaugeType::toggle ); // default + } + else if( key == "soundinc:" ) { m_soundfxincrease.deserialize( Input, sound_type::single ); } else if( key == "sounddec:" ) { @@ -281,16 +288,16 @@ void TGauge::Update() { } if( SubModel ) { // warunek na wszelki wypadek, gdyby się submodel nie podłączył - switch (m_type) { - case TGaugeType::gt_Rotate: { + switch (m_animation) { + case TGaugeAnimation::gt_Rotate: { SubModel->SetRotate( float3( 0, 1, 0 ), GetScaledValue() * 360.0 ); break; } - case TGaugeType::gt_Move: { + case TGaugeAnimation::gt_Move: { SubModel->SetTranslate( float3( 0, 0, GetScaledValue() ) ); break; } - case TGaugeType::gt_Wiper: { + case TGaugeAnimation::gt_Wiper: { auto const scaledvalue { GetScaledValue() }; SubModel->SetRotate( float3( 0, 1, 0 ), scaledvalue * 360.0 ); auto *sm = SubModel->ChildGet(); @@ -302,7 +309,7 @@ void TGauge::Update() { } break; } - case TGaugeType::gt_Digital: { + case TGaugeAnimation::gt_Digital: { // Ra 2014-07: licznik cyfrowy auto *sm = SubModel->ChildGet(); /* std::string n = FormatFloat( "0000000000", floor( fValue ) ); // na razie tak trochę bez sensu @@ -390,4 +397,8 @@ TGauge::model_offset() const { glm::vec3() ); } +TGaugeType +TGauge::type() const { + return m_type; +} //--------------------------------------------------------------------------- diff --git a/Gauge.h b/Gauge.h index a73aad2f..82de24af 100644 --- a/Gauge.h +++ b/Gauge.h @@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "Classes.h" #include "sound.h" -enum class TGaugeType { +enum class TGaugeAnimation { // typ ruchu gt_Unknown, // na razie nie znany gt_Rotate, // obrót @@ -21,6 +21,11 @@ enum class TGaugeType { gt_Digital // licznik cyfrowy, np. kilometrów }; +enum class TGaugeType { + toggle, + push +}; + // animowany wskaźnik, mogący przyjmować wiele stanów pośrednich class TGauge { @@ -32,7 +37,7 @@ public: inline void Clear() { *this = TGauge(); } - void Init(TSubModel *Submodel, TGaugeType Type, float Scale = 1, float Offset = 0, float Friction = 0, float Value = 0, float const Endvalue = -1.0, float const Endscale = -1.0, bool const Interpolate = false ); + void Init(TSubModel *Submodel, TGaugeAnimation Type, float Scale = 1, float Offset = 0, float Friction = 0, float Value = 0, float const Endvalue = -1.0, float const Endscale = -1.0, bool const Interpolate = false ); bool Load(cParser &Parser, TDynamicObject const *Owner, TModel3d *md1, TModel3d *md2 = nullptr, double mul = 1.0); void UpdateValue( float fNewDesired ); void UpdateValue( float fNewDesired, sound_source &Fallbacksound ); @@ -46,6 +51,7 @@ public: void UpdateValue(); // returns offset of submodel associated with the button from the model centre glm::vec3 model_offset() const; + TGaugeType type() const; // members TSubModel *SubModel { nullptr }; // McZapkie-310302: zeby mozna bylo sprawdzac czy zainicjowany poprawnie @@ -60,7 +66,8 @@ private: GetScaledValue() const; // members - TGaugeType m_type { TGaugeType::gt_Unknown }; // typ ruchu + TGaugeAnimation m_animation { TGaugeAnimation::gt_Unknown }; // typ ruchu + TGaugeType m_type { TGaugeType::toggle }; // switch type float m_friction { 0.f }; // hamowanie przy zliżaniu się do zadanej wartości float m_targetvalue { 0.f }; // wartość docelowa float m_value { 0.f }; // wartość obecna diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index 9dcbaadb..fed359ee 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -624,6 +624,7 @@ struct TCoupling { struct fuel_pump { bool is_enabled { false }; // device is allowed/requested to operate + bool is_disabled { false }; // device is requested to stop bool is_active { false }; // device is working start_t start_type { start_t::manual }; }; @@ -633,6 +634,7 @@ struct fuel_pump { struct oil_pump { bool is_enabled { false }; // device is allowed/requested to operate + bool is_disabled { false }; // device is requested to stop bool is_active { false }; // device is working start_t start_type { start_t::manual }; float resource_amount { 1.f }; @@ -646,6 +648,7 @@ struct water_pump { bool breaker { true }; // device is allowed to operate bool is_enabled { false }; // device is requested to operate + bool is_disabled { false }; // device is requested to stop bool is_active { false }; // device is working start_t start_type { start_t::manual }; }; @@ -1332,11 +1335,14 @@ public: bool DirectionBackward(void);/*! kierunek ruchu*/ bool WaterPumpBreakerSwitch( bool State, range_t const Notify = range_t::consist ); // water pump breaker state toggle bool WaterPumpSwitch( bool State, range_t const Notify = range_t::consist ); // water pump state toggle + bool WaterPumpSwitchOff( bool State, range_t const Notify = range_t::consist ); // water pump state toggle bool WaterHeaterBreakerSwitch( bool State, range_t const Notify = range_t::consist ); // water heater breaker state toggle bool WaterHeaterSwitch( bool State, range_t const Notify = range_t::consist ); // water heater state toggle bool WaterCircuitsLinkSwitch( bool State, range_t const Notify = range_t::consist ); // water circuits link state toggle bool FuelPumpSwitch( bool State, range_t const Notify = range_t::consist ); // fuel pump state toggle + bool FuelPumpSwitchOff( bool State, range_t const Notify = range_t::consist ); // fuel pump state toggle bool OilPumpSwitch( bool State, range_t const Notify = range_t::consist ); // oil pump state toggle + bool OilPumpSwitchOff( bool State, range_t const Notify = range_t::consist ); // oil pump state toggle bool MainSwitch( bool const State, range_t const Notify = range_t::consist );/*! wylacznik glowny*/ bool ConverterSwitch( bool State, range_t const Notify = range_t::consist );/*! wl/wyl przetwornicy*/ bool CompressorSwitch( bool State, range_t const Notify = range_t::consist );/*! wl/wyl sprezarki*/ @@ -1366,7 +1372,8 @@ public: bool MaxCurrentSwitch(bool State); //przelacznik pradu wysokiego rozruchu bool MinCurrentSwitch(bool State); //przelacznik pradu automatycznego rozruchu bool AutoRelaySwitch(bool State); //przelacznik automatycznego rozruchu - bool AutoRelayCheck(void);//symulacja automatycznego rozruchu + bool AutoRelayCheck();//symulacja automatycznego rozruchu + bool MotorConnectorsCheck(); bool ResistorsFlagCheck(void) const; //sprawdzenie kontrolki oporow rozruchowych NBMX bool PantFront( bool const State, range_t const Notify = range_t::consist ); //obsluga pantografou przedniego @@ -1441,4 +1448,4 @@ private: void BrakeSubsystemDecode(); //Q 20160719 }; -extern double Distance(TLocation Loc1, TLocation Loc2, TDimension Dim1, TDimension Dim2); +//double Distance(TLocation Loc1, TLocation Loc2, TDimension Dim1, TDimension Dim2); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 06d4100e..b9f521e8 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -144,22 +144,6 @@ double TMoverParameters::Current(double n, double U) Mn = RList[ MainCtrlActualPos ].Mn * RList[ MainCtrlActualPos ].Bn; } - // writepaslog("#", - // "C++-----------------------------------------------------------------------------"); - // writepaslog("MCAP ", IntToStr(MainCtrlActualPos)); - // writepaslog("SCAP ", IntToStr(ScndCtrlActualPos)); - // writepaslog("n ", FloatToStr(n)); - // writepaslog("StLinFlag ", BoolToYN(StLinFlag)); - // writepaslog("DelayCtrlFlag ", booltoYN(DelayCtrlFlag)); - // writepaslog("Bn ", FloatToStr(Bn)); - // writepaslog("R ", FloatToStr(R)); - // writepaslog("Mn ", IntToStr(Mn)); - // writepaslog("RList[MCAP].Bn ", FloatToStr(RList[MainCtrlActualPos].Bn)); - // writepaslog("RList[MCAP].Mn ", FloatToStr(RList[MainCtrlActualPos].Mn)); - // writepaslog("RList[MCAP].R ", FloatToStr(RList[MainCtrlActualPos].R)); - - // z Megapacka ... bylo tutaj zakomentowane Q: no to usuwam... - if (DynamicBrakeFlag && (!FuseFlag) && (DynamicBrakeType == dbrake_automatic) && ConverterFlag && Mains) // hamowanie EP09 //TUHEX { @@ -1300,7 +1284,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap if (SetFlag(DamageFlag, dtrain_out)) { EventFlag = true; - Mains = false; + MainSwitch( false, range_t::local ); RunningShape.R = 0; if (TestFlag(Track.DamageFlag, dtrack_norail)) DerailReason = 1; // Ra: powód wykolejenia: brak szyn @@ -1312,7 +1296,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap if (SetFlag(DamageFlag, dtrain_out)) { EventFlag = true; - Mains = false; + MainSwitch( false, range_t::local ); RunningShape.R = 0; DerailReason = 3; // Ra: powód wykolejenia: za szeroki tor } @@ -1322,7 +1306,7 @@ double TMoverParameters::ComputeMovement(double dt, double dt1, const TTrackShap if (SetFlag(DamageFlag, dtrain_out)) { EventFlag = true; - Mains = false; + MainSwitch( false, range_t::local ); DerailReason = 4; // Ra: powód wykolejenia: nieodpowiednia trajektoria } if( ( true == TestFlag( DamageFlag, dtrain_out ) ) @@ -1542,7 +1526,9 @@ void TMoverParameters::WaterPumpCheck( double const Timestep ) { WaterPump.is_active = ( ( true == Battery ) && ( true == WaterPump.breaker ) - && ( ( true == WaterPump.is_enabled ) || ( WaterPump.start_type == start_t::battery ) ) ); + && ( false == WaterPump.is_disabled ) + && ( ( true == WaterPump.is_active ) + || ( true == WaterPump.is_enabled ) || ( WaterPump.start_type == start_t::battery ) ) ); } // water heater status check @@ -1571,10 +1557,12 @@ void TMoverParameters::FuelPumpCheck( double const Timestep ) { FuelPump.is_active = ( ( true == Battery ) - && ( FuelPump.start_type == start_t::manual ? ( FuelPump.is_enabled ) : - FuelPump.start_type == start_t::automatic ? ( dizel_startup || Mains ) : - FuelPump.start_type == start_t::manualwithautofallback ? ( FuelPump.is_enabled || dizel_startup || Mains ) : - false ) ); // shouldn't ever get this far but, eh + && ( false == FuelPump.is_disabled ) + && ( ( FuelPump.is_active ) + || ( FuelPump.start_type == start_t::manual ? ( FuelPump.is_enabled ) : + FuelPump.start_type == start_t::automatic ? ( dizel_startup || Mains ) : + FuelPump.start_type == start_t::manualwithautofallback ? ( FuelPump.is_enabled || dizel_startup || Mains ) : + false ) ) ); // shouldn't ever get this far but, eh } // oil pump status update @@ -1582,10 +1570,12 @@ void TMoverParameters::OilPumpCheck( double const Timestep ) { OilPump.is_active = ( ( true == Battery ) - && ( OilPump.start_type == start_t::manual ? ( OilPump.is_enabled ) : - OilPump.start_type == start_t::automatic ? ( dizel_startup || Mains ) : - OilPump.start_type == start_t::manualwithautofallback ? ( OilPump.is_enabled || dizel_startup || Mains ) : - false ) ); // shouldn't ever get this far but, eh + && ( false == OilPump.is_disabled ) + && ( ( OilPump.is_active ) + || ( OilPump.start_type == start_t::manual ? ( OilPump.is_enabled ) : + OilPump.start_type == start_t::automatic ? ( dizel_startup || Mains ) : + OilPump.start_type == start_t::manualwithautofallback ? ( OilPump.is_enabled || dizel_startup || Mains ) : + false ) ) ); // shouldn't ever get this far but, eh auto const maxrevolutions { EngineType == TEngineType::DieselEngine ? @@ -2419,6 +2409,31 @@ bool TMoverParameters::WaterPumpSwitch( bool State, range_t const Notify ) { return ( WaterPump.is_enabled != initialstate ); } +// water pump state toggle +bool TMoverParameters::WaterPumpSwitchOff( bool State, range_t const Notify ) { + + if( WaterPump.start_type == start_t::battery ) { + // automatic fuel pump ignores 'manual' state commands + return false; + } + + bool const initialstate { WaterPump.is_disabled }; + + WaterPump.is_disabled = State; + + if( Notify != range_t::local ) { + SendCtrlToNext( + "WaterPumpSwitchOff", + ( WaterPump.is_disabled ? 1 : 0 ), + CabNo, + ( Notify == range_t::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( WaterPump.is_disabled != initialstate ); +} + // water heater breaker state toggle bool TMoverParameters::WaterHeaterBreakerSwitch( bool State, range_t const Notify ) { /* @@ -2519,6 +2534,30 @@ bool TMoverParameters::FuelPumpSwitch( bool State, range_t const Notify ) { return ( FuelPump.is_enabled != initialstate ); } +bool TMoverParameters::FuelPumpSwitchOff( bool State, range_t const Notify ) { + + if( FuelPump.start_type == start_t::automatic ) { + // automatic fuel pump ignores 'manual' state commands + return false; + } + + bool const initialstate { FuelPump.is_disabled }; + + FuelPump.is_disabled = State; + + if( Notify != range_t::local ) { + SendCtrlToNext( + "FuelPumpSwitchOff", + ( FuelPump.is_disabled ? 1 : 0 ), + CabNo, + ( Notify == range_t::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( FuelPump.is_disabled != initialstate ); +} + // oil pump state toggle bool TMoverParameters::OilPumpSwitch( bool State, range_t const Notify ) { @@ -2544,6 +2583,30 @@ bool TMoverParameters::OilPumpSwitch( bool State, range_t const Notify ) { return ( OilPump.is_enabled != initialstate ); } +bool TMoverParameters::OilPumpSwitchOff( bool State, range_t const Notify ) { + + if( OilPump.start_type == start_t::automatic ) { + // automatic pump ignores 'manual' state commands + return false; + } + + bool const initialstate { OilPump.is_disabled }; + + OilPump.is_disabled = State; + + if( Notify != range_t::local ) { + SendCtrlToNext( + "OilPumpSwitchOff", + ( OilPump.is_disabled ? 1 : 0 ), + CabNo, + ( Notify == range_t::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( OilPump.is_disabled != initialstate ); +} + // ************************************************************************************************* // Q: 20160713 // włączenie / wyłączenie obwodu głownego @@ -2577,6 +2640,10 @@ bool TMoverParameters::MainSwitch( bool const State, range_t const Notify ) } else { Mains = false; + // potentially knock out the pumps if their switch doesn't force them on + WaterPump.is_active &= WaterPump.is_enabled; + OilPump.is_active &= OilPump.is_enabled; + FuelPump.is_active &= FuelPump.is_enabled; } if( ( TrainType == dt_EZT ) @@ -4449,6 +4516,13 @@ double TMoverParameters::TractionForce( double dt ) { && ( MainSwitch( false, ( TrainType == dt_EZT ? range_t::unit : range_t::local ) ) ) ); // TODO: check whether we need to send this EMU-wide break; } + + case TEngineType::DieselElectric: { + // TODO: move this to the auto relay check when the electric engine code paths are unified + StLinFlag = MotorConnectorsCheck(); + break; + } + default: { break; } @@ -5393,19 +5467,14 @@ bool TMoverParameters::AutoRelayCheck(void) bool OK = false; // b:int; bool ARC = false; + auto const motorconnectors { MotorConnectorsCheck() }; + // Ra 2014-06: dla SN61 nie działa prawidłowo - // rozlaczanie stycznikow liniowych - if( ( false == Mains ) - || ( true == FuseFlag ) - || ( true == StLinSwitchOff ) - || ( MainCtrlPos == 0 ) - || ( ( TrainType != dt_EZT ) && ( BrakePress > 2.1 ) ) - || ( ActiveDir == 0 ) ) // hunter-111211: wylacznik cisnieniowy - { - StLinFlag = false; // yBARC - rozlaczenie stycznikow liniowych + // yBARC - rozlaczenie stycznikow liniowych + if( false == motorconnectors ) { + StLinFlag = false; OK = false; - if (!DynamicBrakeFlag) - { + if( false == DynamicBrakeFlag ) { Im = 0; Itot = 0; ResistorsFlag = false; @@ -5580,17 +5649,11 @@ bool TMoverParameters::AutoRelayCheck(void) else // not StLinFlag { OK = false; - // ybARC - tutaj sa wszystkie warunki, jakie musza byc spelnione, zeby mozna byla - // zalaczyc styczniki liniowe - if (((MainCtrlPos == 1) || ((TrainType == dt_EZT) && (MainCtrlPos > 0))) && - (!FuseFlag) && (Mains) && ((BrakePress < 1.0) || (TrainType == dt_EZT)) && - (MainCtrlActualPos == 0) && (ActiveDir != 0)) - { //^^ TODO: sprawdzic BUG, prawdopodobnie w CreateBrakeSys() + // ybARC - zalaczenie stycznikow liniowych + if( true == motorconnectors ) { DelayCtrlFlag = true; - if( (LastRelayTime >= InitialCtrlDelay) - && ( false == StLinSwitchOff ) ) - { - StLinFlag = true; // ybARC - zalaczenie stycznikow liniowych + if( LastRelayTime >= InitialCtrlDelay ) { + StLinFlag = true; MainCtrlActualPos = 1; DelayCtrlFlag = false; SetFlag(SoundFlag, sound::relay | sound::loud); @@ -5663,6 +5726,34 @@ bool TMoverParameters::AutoRelayCheck(void) } } +bool TMoverParameters::MotorConnectorsCheck() { + + // hunter-111211: wylacznik cisnieniowy + auto const pressureswitch { + ( TrainType != dt_EZT ) + && ( ( BrakePress > 2.0 ) + || ( PipePress < 3.6 ) ) }; + + if( pressureswitch ) { return false; } + + auto const connectorsoff { + ( false == Mains ) + || ( true == FuseFlag ) + || ( true == StLinSwitchOff ) + || ( MainCtrlPos == 0 ) + || ( ActiveDir == 0 ) }; + + if( connectorsoff ) { return false; } + + auto const connectorson { + ( true == StLinFlag ) + || ( ( MainCtrlActualPos == 0 ) + && ( ( MainCtrlPos == 1 ) + || ( ( TrainType == dt_EZT ) && ( MainCtrlPos > 0 ) ) ) ) }; + + return connectorson; +} + // ************************************************************************************************* // Q: 20160713 // Podnosi / opuszcza przedni pantograf. Returns: state of the pantograph after the operation @@ -9133,6 +9224,14 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } + else if( Command == "WaterPumpSwitchOff" ) { + + if( WaterPump.start_type != start_t::battery ) { + // automatic fuel pump ignores 'manual' state commands + WaterPump.is_disabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } else if( Command == "WaterHeaterBreakerSwitch" ) { /* if( FuelPump.start_type != start::automatic ) { @@ -9169,6 +9268,13 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } + else if (Command == "FuelPumpSwitchOff") { + if( FuelPump.start_type != start_t::automatic ) { + // automatic fuel pump ignores 'manual' state commands + FuelPump.is_disabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } else if (Command == "OilPumpSwitch") { if( OilPump.start_type != start_t::automatic ) { // automatic pump ignores 'manual' state commands @@ -9176,6 +9282,13 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } + else if (Command == "OilPumpSwitchOff") { + if( OilPump.start_type != start_t::automatic ) { + // automatic pump ignores 'manual' state commands + OilPump.is_disabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } else if (Command == "MainSwitch") { if (CValue1 == 1) { @@ -9190,6 +9303,10 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } else { Mains = false; + // potentially knock out the pumps if their switch doesn't force them on + WaterPump.is_active &= WaterPump.is_enabled; + OilPump.is_active &= OilPump.is_enabled; + FuelPump.is_active &= FuelPump.is_enabled; } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } diff --git a/Segment.cpp b/Segment.cpp index 97b5b877..10bf62cc 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -397,7 +397,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori float m1, jmm1, m2, jmm2; // pozycje względne na odcinku 0...1 (ale nie parametr Beziera) step = fStep; - tv1 = 1.0; // Ra: to by można było wyliczać dla odcinka, wyglądało by lepiej + tv1 = 0.0; // Ra: to by można było wyliczać dla odcinka, wyglądało by lepiej s = fStep * iSkip; // iSkip - ile odcinków z początku pominąć int i = iSkip; // domyślnie 0 t = fTsBuffer[ i ]; // tabela wattości t dla segmentów @@ -435,7 +435,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori while( tv1 < 0.0 ) { tv1 += 1.0; } - tv2 = tv1 - step / texturelength; // mapowanie na końcu segmentu + tv2 = tv1 + step / texturelength; // mapowanie na końcu segmentu t = fTsBuffer[ i ]; // szybsze od GetTFromS(s); pos2 = glm::dvec3{ FastGetPoint( t ) - Origin }; diff --git a/Train.cpp b/Train.cpp index bded4fe9..22ff5ab3 100644 --- a/Train.cpp +++ b/Train.cpp @@ -2117,8 +2117,17 @@ void TTrain::OnCommand_linebreakerclose( TTrain *Train, command_data const &Comm void TTrain::OnCommand_fuelpumptoggle( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggFuelPumpButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no off button so we always try to turn it on + OnCommand_fuelpumpenable( Train, Command ); + } + else { + // two-state switch + if( Command.action == GLFW_RELEASE ) { return; } + if( false == Train->mvControlled->FuelPump.is_enabled ) { // turn on OnCommand_fuelpumpenable( Train, Command ); @@ -2132,32 +2141,65 @@ void TTrain::OnCommand_fuelpumptoggle( TTrain *Train, command_data const &Comman void TTrain::OnCommand_fuelpumpenable( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { - // visual feedback - Train->ggFuelPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Command.action == GLFW_REPEAT ) { return; } - if( true == Train->mvControlled->FuelPump.is_enabled ) { return; } // already enabled - - Train->mvControlled->FuelPumpSwitch( true ); + if( Train->ggFuelPumpButton.type() == TGaugeType::push ) { + // impulse switch + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggFuelPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + Train->mvControlled->FuelPumpSwitch( true ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggFuelPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->mvControlled->FuelPumpSwitch( false ); + } + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggFuelPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + Train->mvControlled->FuelPumpSwitch( true ); + Train->mvControlled->FuelPumpSwitchOff( false ); + } } } void TTrain::OnCommand_fuelpumpdisable( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { - // visual feedback - Train->ggFuelPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Command.action == GLFW_REPEAT ) { return; } - if( false == Train->mvControlled->FuelPump.is_enabled ) { return; } // already disabled - - Train->mvControlled->FuelPumpSwitch( false ); + if( Train->ggFuelPumpButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no disable return type switch + return; + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggFuelPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->mvControlled->FuelPumpSwitch( false ); + Train->mvControlled->FuelPumpSwitchOff( true ); + } } } void TTrain::OnCommand_oilpumptoggle( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggOilPumpButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no off button so we always try to turn it on + OnCommand_oilpumpenable( Train, Command ); + } + else { + // two-state switch + if( Command.action == GLFW_RELEASE ) { return; } + if( false == Train->mvControlled->OilPump.is_enabled ) { // turn on OnCommand_oilpumpenable( Train, Command ); @@ -2171,25 +2213,49 @@ void TTrain::OnCommand_oilpumptoggle( TTrain *Train, command_data const &Command void TTrain::OnCommand_oilpumpenable( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { - // visual feedback - Train->ggOilPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Command.action == GLFW_REPEAT ) { return; } - if( true == Train->mvControlled->OilPump.is_enabled ) { return; } // already enabled - - Train->mvControlled->OilPumpSwitch( true ); + if( Train->ggOilPumpButton.type() == TGaugeType::push ) { + // impulse switch + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggOilPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + Train->mvControlled->OilPumpSwitch( true ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggOilPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->mvControlled->OilPumpSwitch( false ); + } + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggOilPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + Train->mvControlled->OilPumpSwitch( true ); + Train->mvControlled->OilPumpSwitchOff( false ); + } } } void TTrain::OnCommand_oilpumpdisable( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { - // visual feedback - Train->ggOilPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Command.action == GLFW_REPEAT ) { return; } - if( false == Train->mvControlled->OilPump.is_enabled ) { return; } // already disabled - - Train->mvControlled->OilPumpSwitch( false ); + if( Train->ggOilPumpButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no disable return type switch + return; + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggOilPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->mvControlled->OilPumpSwitch( false ); + Train->mvControlled->OilPumpSwitchOff( true ); + } } } @@ -2312,8 +2378,17 @@ void TTrain::OnCommand_waterpumpbreakeropen( TTrain *Train, command_data const & void TTrain::OnCommand_waterpumptoggle( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { - // only reacting to press, so the switch doesn't flip back and forth if key is held down + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggWaterPumpButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no off button so we always try to turn it on + OnCommand_waterpumpenable( Train, Command ); + } + else { + // two-state switch + if( Command.action == GLFW_RELEASE ) { return; } + if( false == Train->mvControlled->WaterPump.is_enabled ) { // turn on OnCommand_waterpumpenable( Train, Command ); @@ -2327,25 +2402,49 @@ void TTrain::OnCommand_waterpumptoggle( TTrain *Train, command_data const &Comma void TTrain::OnCommand_waterpumpenable( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { - // visual feedback - Train->ggWaterPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + if( Command.action == GLFW_REPEAT ) { return; } - if( true == Train->mvControlled->WaterPump.is_enabled ) { return; } // already enabled - - Train->mvControlled->WaterPumpSwitch( true ); + if( Train->ggWaterPumpButton.type() == TGaugeType::push ) { + // impulse switch + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + Train->mvControlled->WaterPumpSwitch( true ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggWaterPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->mvControlled->WaterPumpSwitch( false ); + } + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterPumpButton.UpdateValue( 1.0, Train->dsbSwitch ); + Train->mvControlled->WaterPumpSwitch( true ); + Train->mvControlled->WaterPumpSwitchOff( false ); + } } } void TTrain::OnCommand_waterpumpdisable( TTrain *Train, command_data const &Command ) { - if( Command.action == GLFW_PRESS ) { - // visual feedback - Train->ggWaterPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + if( Command.action == GLFW_REPEAT ) { return; } - if( false == Train->mvControlled->WaterPump.is_enabled ) { return; } // already disabled - - Train->mvControlled->WaterPumpSwitch( false ); + if( Train->ggWaterPumpButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no disable return type switch + return; + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggWaterPumpButton.UpdateValue( 0.0, Train->dsbSwitch ); + Train->mvControlled->WaterPumpSwitch( false ); + Train->mvControlled->WaterPumpSwitchOff( true ); + } } } @@ -5122,14 +5221,13 @@ bool TTrain::Update( double const Deltatime ) ( true == mvControlled->ResistorsFlagCheck() ) || ( mvControlled->MainCtrlActualPos == 0 ) ); // do EU04 - if( ( mvControlled->StLinFlag ) - || ( mvOccupied->BrakePress > 2.0 ) - || ( mvOccupied->PipePress < 3.6 ) ) { - // Ra: czy to jest udawanie działania styczników liniowych? + if( mvControlled->StLinFlag ) { btLampkaStyczn.Turn( false ); } - else if( mvOccupied->BrakePress < 1.0 ) - btLampkaStyczn.Turn( true ); // mozna prowadzic rozruch + else { + // mozna prowadzic rozruch + btLampkaStyczn.Turn( mvOccupied->BrakePress < 1.0 ); + } if( ( ( TestFlag( mvControlled->Couplers[ side::rear ].CouplingFlag, coupling::control ) ) && ( mvControlled->CabNo == 1 ) ) || ( ( TestFlag( mvControlled->Couplers[ side::front ].CouplingFlag, coupling::control ) ) && ( mvControlled->CabNo == -1 ) ) ) btLampkaUkrotnienie.Turn( true ); @@ -7140,10 +7238,12 @@ void TTrain::set_cab_controls() { mvControlled->WaterPump.breaker ? 1.0 : 0.0 ); - ggWaterPumpButton.PutValue( - mvControlled->WaterPump.is_enabled ? - 1.0 : - 0.0 ); + if( ggWaterPumpButton.type() != TGaugeType::push ) { + ggWaterPumpButton.PutValue( + mvControlled->WaterPump.is_enabled ? + 1.0 : + 0.0 ); + } // water heater ggWaterHeaterBreakerButton.PutValue( mvControlled->WaterHeater.breaker ? @@ -7158,15 +7258,19 @@ void TTrain::set_cab_controls() { 1.0 : 0.0 ); // fuel pump - ggFuelPumpButton.PutValue( - mvControlled->FuelPump.is_enabled ? - 1.0 : - 0.0 ); + if( ggFuelPumpButton.type() != TGaugeType::push ) { + ggFuelPumpButton.PutValue( + mvControlled->FuelPump.is_enabled ? + 1.0 : + 0.0 ); + } // oil pump - ggOilPumpButton.PutValue( - mvControlled->OilPump.is_enabled ? + if( ggOilPumpButton.type() != TGaugeType::push ) { + ggOilPumpButton.PutValue( + mvControlled->OilPump.is_enabled ? 1.0 : 0.0 ); + } // we reset all indicators, as they're set during the update pass // TODO: when cleaning up break setting indicator state into a separate function, so we can reuse it @@ -7574,9 +7678,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con if (Parser.getToken() == "analog") { // McZapkie-300302: zegarek - ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), TGaugeType::gt_Rotate, 1.0/60.0); - ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), TGaugeType::gt_Rotate, 1.0/60.0); - ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), TGaugeType::gt_Rotate, 1.0/12.0); + ggClockSInd.Init(DynamicObject->mdKabina->GetFromName("ClockShand"), TGaugeAnimation::gt_Rotate, 1.0/60.0); + ggClockMInd.Init(DynamicObject->mdKabina->GetFromName("ClockMhand"), TGaugeAnimation::gt_Rotate, 1.0/60.0); + ggClockHInd.Init(DynamicObject->mdKabina->GetFromName("ClockHhand"), TGaugeAnimation::gt_Rotate, 1.0/12.0); } } else if (Label == "evoltage:") diff --git a/precipitation.cpp b/precipitation.cpp index 54264bc2..848fec24 100644 --- a/precipitation.cpp +++ b/precipitation.cpp @@ -91,13 +91,18 @@ basic_precipitation::init() { create( 18 ); // TODO: select texture based on current overcast level + // TODO: when the overcast level dynamic change is in check the current level during render and pick the appropriate texture on the fly + std::string const densitysuffix { ( + Global.Overcast < 1.35 ? + "_light" : + "_medium" ) }; if( Global.Weather == "rain:" ) { - m_texture = GfxRenderer.Fetch_Texture( "fx/rain_medium" ); m_moverateweathertypefactor = 2.f; + m_texture = GfxRenderer.Fetch_Texture( "fx/rain" + densitysuffix ); } else if( Global.Weather == "snow:" ) { - m_texture = GfxRenderer.Fetch_Texture( "fx/snow_medium" ); m_moverateweathertypefactor = 1.25f; + m_texture = GfxRenderer.Fetch_Texture( "fx/snow" + densitysuffix ); } return true; @@ -111,7 +116,7 @@ basic_precipitation::update() { if( timedelta == 0.0 ) { return; } m_textureoffset += m_moverate * m_moverateweathertypefactor * timedelta; - m_textureoffset = clamp_circular( m_textureoffset, 1.f ); + m_textureoffset = clamp_circular( m_textureoffset, 10.f ); auto cameramove { glm::dvec3{ Global.pCamera.Pos - m_camerapos} }; cameramove.y = 0.0; // vertical movement messes up vector calculation From 913541bbee8ba811dd54fb375c47983d6b1ff4f6 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Mon, 1 Oct 2018 15:54:46 +0200 Subject: [PATCH 416/426] build 181001. texture size definition, fog influence on skydome, minor vehicle logic bug fixes --- Driver.cpp | 2 +- DynObj.cpp | 15 +++-- McZapkie/Mover.cpp | 9 ++- Model3d.cpp | 8 +-- PyInt.cpp | 4 ++ Track.cpp | 119 +++++++++++++++++++++++--------------- Track.h | 3 +- material.cpp | 7 +++ material.h | 1 + openglmatrixstack.h | 21 +++++-- renderer.cpp | 26 +++++---- simulationenvironment.cpp | 4 +- station.cpp | 1 + version.h | 2 +- 14 files changed, 142 insertions(+), 80 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index be6c926e..a4666bea 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -962,7 +962,7 @@ TCommandType TController::TableUpdate(double &fVelDes, double &fDist, double &fN // perform loading/unloading auto const platformside = static_cast( std::floor( std::abs( sSpeedTable[ i ].evEvent->input_value( 2 ) ) ) ) % 10; - auto const exchangetime = simulation::Station.update_load( pVehicles[ 0 ], *TrainParams, platformside ); + auto const exchangetime = std::max( 5.0, simulation::Station.update_load( pVehicles[ 0 ], *TrainParams, platformside ) ); WaitingSet( std::max( -fStopTime, exchangetime ) ); // na końcu rozkładu się ustawia 60s i tu by było skrócenie if( TrainParams->CheckTrainLatency() < 0.0 ) { diff --git a/DynObj.cpp b/DynObj.cpp index f9321f88..360ff418 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -3971,9 +3971,15 @@ void TDynamicObject::RenderSounds() { sSmallCompressor.stop(); } - // heating sound - if( MoverParameters->Heating ) { - sHeater.play( sound_flags::exclusive | sound_flags::looping ); + // heater sound + if( ( true == MoverParameters->Heating ) + && ( std::abs( MoverParameters->enrot ) > 0.01 ) ) { + // TBD: check whether heating should depend on 'engine rotations' for electric vehicles + sHeater + .pitch( true == sHeater.is_combined() ? + std::abs( MoverParameters->enrot ) * 60.f * 0.01f : + 1.f ) + .play( sound_flags::exclusive | sound_flags::looping ); } else { sHeater.stop(); @@ -3997,8 +4003,7 @@ void TDynamicObject::RenderSounds() { } else if( quantizedratiochange < 0 ) { m_brakecylinderpistonrecede - .pitch( - true == m_brakecylinderpistonrecede.is_combined() ? + .pitch( true == m_brakecylinderpistonrecede.is_combined() ? quantizedratio * 0.01f : m_brakecylinderpistonrecede.m_frequencyoffset + m_brakecylinderpistonrecede.m_frequencyfactor * 1.f ) .play(); diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index b9f521e8..34fd7fd3 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1570,11 +1570,12 @@ void TMoverParameters::OilPumpCheck( double const Timestep ) { OilPump.is_active = ( ( true == Battery ) + && ( false == Mains ) && ( false == OilPump.is_disabled ) && ( ( OilPump.is_active ) || ( OilPump.start_type == start_t::manual ? ( OilPump.is_enabled ) : - OilPump.start_type == start_t::automatic ? ( dizel_startup || Mains ) : - OilPump.start_type == start_t::manualwithautofallback ? ( OilPump.is_enabled || dizel_startup || Mains ) : + OilPump.start_type == start_t::automatic ? ( dizel_startup ) : + OilPump.start_type == start_t::manualwithautofallback ? ( OilPump.is_enabled || dizel_startup ) : false ) ) ); // shouldn't ever get this far but, eh auto const maxrevolutions { @@ -2642,7 +2643,6 @@ bool TMoverParameters::MainSwitch( bool const State, range_t const Notify ) Mains = false; // potentially knock out the pumps if their switch doesn't force them on WaterPump.is_active &= WaterPump.is_enabled; - OilPump.is_active &= OilPump.is_enabled; FuelPump.is_active &= FuelPump.is_enabled; } @@ -4765,7 +4765,7 @@ double TMoverParameters::TractionForce( double dt ) { Voltage = 0; // przekazniki bocznikowania, kazdy inny dla kazdej pozycji - if ((MainCtrlPos == 0) || (ShuntMode)) + if ((MainCtrlPos == 0) || (ShuntMode) || (false==Mains)) ScndCtrlPos = 0; else { @@ -9305,7 +9305,6 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C Mains = false; // potentially knock out the pumps if their switch doesn't force them on WaterPump.is_active &= WaterPump.is_enabled; - OilPump.is_active &= OilPump.is_enabled; FuelPump.is_active &= FuelPump.is_enabled; } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); diff --git a/Model3d.cpp b/Model3d.cpp index 63f75d55..272cb7cb 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -135,7 +135,7 @@ int TSubModel::Load( cParser &parser, TModel3d *Model, /*int Pos,*/ bool dynamic iVboPtr = Pos; // pozycja w VBO */ if (!parser.expectToken("type:")) - Error("Model type parse failure!"); + ErrorLog("Bad model: expected submodel type definition not found while loading model \"" + Model->NameGet() + "\"" ); { std::string type = parser.getToken(); if (type == "mesh") @@ -1225,8 +1225,10 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) } */ auto const name { FileName }; + // cache the file name, in case someone wants it later + m_filename = name; - asBinary = name + ".e3d"; + asBinary = name + ".e3d"; if (FileExists(asBinary)) { LoadFromBinFile(asBinary, dynamic); @@ -1244,8 +1246,6 @@ bool TModel3d::LoadFromFile(std::string const &FileName, bool dynamic) } } } - // cache the file name, in case someone wants it later - m_filename = name; bool const result = Root ? (iSubModelsCount > 0) : false; // brak pliku albo problem z wczytaniem if (false == result) diff --git a/PyInt.cpp b/PyInt.cpp index 7a201cfc..ff4ddeb3 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -32,6 +32,10 @@ void render_task::run() { ::glTexParameteri( GL_TEXTURE_2D, GL_GENERATE_MIPMAP, GL_TRUE ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); ::glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR ); + if( GLEW_EXT_texture_filter_anisotropic ) { + // anisotropic filtering + ::glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, Global.AnisotropicFiltering ); + } ::glTexEnvf( GL_TEXTURE_FILTER_CONTROL, GL_TEXTURE_LOD_BIAS, -1.0 ); // build texture ::glTexImage2D( diff --git a/Track.cpp b/Track.cpp index 982b77c6..598e7f52 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1254,8 +1254,10 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { case tt_Normal: if (m_material2) { // podsypka z podkładami jest tylko dla zwykłego toru + // potentially retrieve texture length override from the assigned material + auto const texturelength { texture_length( m_material2 ) }; gfx::basic_vertex bpts1[ 8 ]; // punkty głównej płaszczyzny nie przydają się do robienia boków - if( fTexLength == 4.f ) { + if( texturelength == 4.f ) { // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy profil auto const normalx = std::cos( glm::radians( 75.f ) ); auto const normaly = std::sin( glm::radians( 75.f ) ); @@ -1318,7 +1320,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { } else { // mapowanie proporcjonalne do powierzchni, rozmiar w poprzek określa fTexLength - auto const max = fTexRatio2 * fTexLength; // szerokość proporcjonalna do długości + auto const max = fTexRatio2 * texturelength; // szerokość proporcjonalna do długości auto const map11 = max > 0.f ? (fHTW + side) / max : 0.25f; // załamanie od strony 1 auto const map12 = max > 0.f ? (fHTW + side + hypot1) / max : 0.5f; // brzeg od strony 1 if (iTrapezoid) { @@ -1383,7 +1385,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { } } gfx::vertex_array vertices; - Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -4 : 4, fTexLength); + Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -4 : 4, texturelength); if( ( Bank != 0 ) && ( true == Geometry2.empty() ) ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } @@ -1394,20 +1396,21 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { } if (m_material1) { // szyny - generujemy dwie, najwyżej rysować się będzie jedną + auto const texturelength { texture_length( m_material1 ) }; gfx::vertex_array vertices; if( ( Bank != 0 ) && ( true == Geometry1.empty() ) ) { - Segment->RenderLoft( vertices, m_origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, texturelength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // reuse the scratchpad - Segment->RenderLoft( vertices, m_origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, texturelength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } if( ( Bank == 0 ) && ( false == Geometry1.empty() ) ) { // special variant, replace existing data for a turntable track - Segment->RenderLoft( vertices, m_origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts1, iTrapezoid ? -nnumPts : nnumPts, texturelength ); GfxRenderer.Replace( vertices, Geometry1[ 0 ] ); vertices.clear(); // reuse the scratchpad - Segment->RenderLoft( vertices, m_origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts2, iTrapezoid ? -nnumPts : nnumPts, texturelength ); GfxRenderer.Replace( vertices, Geometry1[ 1 ] ); } } @@ -1452,28 +1455,30 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { { // nowa wersja z SPKS, ale odwrotnie lewa/prawa gfx::vertex_array vertices; if( m_material1 ) { + auto const texturelength { texture_length( m_material1 ) }; // fixed parts - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, texturelength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength, 1.0, bladelength ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, texturelength, 1.0, bladelength ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // left blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, bladelength, SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, texturelength, 1.0, 0, bladelength, SwitchExtension->fOffset2 ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } if( m_material2 ) { + auto const texturelength { texture_length( m_material2 ) }; // fixed parts - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, texturelength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength, 1.0, bladelength ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, texturelength, 1.0, bladelength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // right blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, bladelength, -fMaxOffset + SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, texturelength, 1.0, 0, bladelength, -fMaxOffset + SwitchExtension->fOffset1 ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -1482,28 +1487,30 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { { // lewa działa lepiej niż prawa gfx::vertex_array vertices; if( m_material1 ) { + auto const texturelength { texture_length( m_material1 ) }; // fixed parts - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength ); // lewa szyna normalna cała + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, texturelength ); // lewa szyna normalna cała Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength, 1.0, bladelength ); // prawa szyna za iglicą + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, texturelength, 1.0, bladelength ); // prawa szyna za iglicą Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // right blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, bladelength, -SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, texturelength, 1.0, 0, bladelength, -SwitchExtension->fOffset2 ); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } if( m_material2 ) { + auto const texturelength { texture_length( m_material2 ) }; // fixed parts - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, fTexLength ); // prawa szyna normalnie cała + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, nnumPts, texturelength ); // prawa szyna normalnie cała Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, fTexLength, 1.0, bladelength ); // lewa szyna za iglicą + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts1, nnumPts, texturelength, 1.0, bladelength ); // lewa szyna za iglicą Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); // left blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, bladelength, fMaxOffset - SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, texturelength, 1.0, 0, bladelength, fMaxOffset - SwitchExtension->fOffset1 ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -1521,10 +1528,8 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { gfx::basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków if (m_material1 || m_material2) { // punkty się przydadzą, nawet jeśli nawierzchni nie ma -/* - double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% -*/ - auto const max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości + auto const texturelength { texture_length( m_material1 ) }; + auto const max = fTexRatio1 * texturelength; // test: szerokość proporcjonalna do długości auto const map1 = max > 0.f ? fHTW / max : 0.5f; // obcięcie tekstury od strony 1 auto const map2 = max > 0.f ? fHTW2 / max : 0.5f; // obcięcie tekstury od strony 2 if (iTrapezoid) { @@ -1561,12 +1566,14 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { } if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy + auto const texturelength { texture_length( m_material1 ) }; gfx::vertex_array vertices; - Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -2 : 2, fTexLength); + Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -2 : 2, texturelength); Geometry1.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) + auto const texturelength { texture_length( m_material2 ) }; gfx::basic_vertex rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony @@ -1629,7 +1636,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { // mapowanie propocjonalne do szerokości chodnika // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy auto const d = -fTexHeight1 / 3.75f; // krawężnik o wysokości 150mm jest pochylony 40mm - auto const max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości + auto const max = fTexRatio2 * texturelength; // test: szerokość proporcjonalna do długości auto const map1l = ( max > 0.f ? side / max : @@ -1726,24 +1733,24 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony // odcinka if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - Segment->RenderLoft( vertices, m_origin, rpts1, -3, fTexLength ); // tylko jeśli jest z prawej + Segment->RenderLoft( vertices, m_origin, rpts1, -3, texturelength ); // tylko jeśli jest z prawej Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - Segment->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength ); // tylko jeśli jest z lewej + Segment->RenderLoft( vertices, m_origin, rpts2, -3, texturelength ); // tylko jeśli jest z lewej Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } } else { // pobocza zwykłe, brak przechyłki if( ( fTexHeight1 >= 0.0 ) || ( slop != 0.0 ) ) { - Segment->RenderLoft( vertices, m_origin, rpts1, 3, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts1, 3, texturelength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - Segment->RenderLoft( vertices, m_origin, rpts2, 3, fTexLength ); + Segment->RenderLoft( vertices, m_origin, rpts2, 3, texturelength ); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } @@ -1803,7 +1810,8 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { gfx::basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% - auto const max = fTexRatio1 * fTexLength; // test: szerokość proporcjonalna do długości + auto const texturelength { texture_length( m_material1 ) }; + auto const max = fTexRatio1 * texturelength; // test: szerokość proporcjonalna do długości auto const map1 = max > 0.f ? fHTW / max : 0.5f; // obcięcie tekstury od strony 1 auto const map2 = max > 0.f ? fHTW2 / max : 0.5f; // obcięcie tekstury od strony 2 // if (iTrapezoid) //trapez albo przechyłki @@ -1833,6 +1841,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie w swoim czasie if( m_material2 ) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) + auto const texturelength { texture_length( m_material2 ) }; gfx::basic_vertex rpts1[6], rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony @@ -1896,7 +1905,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { // mapowanie propocjonalne do szerokości chodnika // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy auto const d = -fTexHeight1 / 3.75f; // krawężnik o wysokości 150mm jest pochylony 40mm - auto const max = fTexRatio2 * fTexLength; // test: szerokość proporcjonalna do długości + auto const max = fTexRatio2 * texturelength; // test: szerokość proporcjonalna do długości auto const map1l = ( max > 0.f ? side / max : @@ -1976,22 +1985,22 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, m_origin, rpts2, -3, texturelength, 1.0, 0, 0, 0.0, &b, render ); if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 3 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 3 ]->RenderLoft( vertices, m_origin, rpts2, -3, texturelength, 1.0, 0, 0, 0.0, &b, render ); if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 4 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 4 ]->RenderLoft( vertices, m_origin, rpts2, -3, texturelength, 1.0, 0, 0, 0.0, &b, render ); if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 5 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); + SwitchExtension->Segments[ 5 ]->RenderLoft( vertices, m_origin, rpts2, -3, texturelength, 1.0, 0, 0, 0.0, &b, render ); if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); @@ -2001,17 +2010,17 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { else { // punkt 3 pokrywa się z punktem 1, jak w zwrotnicy; połączenie 1->2 nie musi być prostoliniowe if( ( fTexHeight1 >= 0.0 ) || ( side != 0.0 ) ) { - SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P2 do P4 + SwitchExtension->Segments[ 2 ]->RenderLoft( vertices, m_origin, rpts2, -3, texturelength, 1.0, 0, 0, 0.0, &b, render ); // z P2 do P4 if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P4 do P3=P1 (odwrócony) + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts2, -3, texturelength, 1.0, 0, 0, 0.0, &b, render ); // z P4 do P3=P1 (odwrócony) if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); } - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, -3, fTexLength, 1.0, 0, 0, 0.0, &b, render ); // z P1 do P2 + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts2, -3, texturelength, 1.0, 0, 0, 0.0, &b, render ); // z P1 do P2 if( true == render ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); @@ -2028,6 +2037,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { } if( m_material1 ) { + auto const texturelength { texture_length( m_material1 ) }; gfx::vertex_array vertices; // jeśli podana tekstura nawierzchni // we start with a vertex in the middle... @@ -2039,8 +2049,8 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { glm::vec3{ 0.0f, 1.0f, 0.0f }, glm::vec2{ 0.5f, 0.5f } ); // ...and add one extra vertex to close the fan... - u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x + m_origin.x ) / fTexLength; - v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z + m_origin.z ) / ( fTexRatio1 * fTexLength ); + u = ( SwitchExtension->vPoints[ 0 ].x - oxz.x + m_origin.x ) / texturelength; + v = ( SwitchExtension->vPoints[ 0 ].z - oxz.z + m_origin.z ) / ( fTexRatio1 * texturelength ); vertices.emplace_back( glm::vec3 { SwitchExtension->vPoints[ 0 ].x, @@ -2054,8 +2064,8 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { // ...then draw the precalculated rest for (int i = pointcount + SwitchExtension->iRoads - 1; i >= 0; --i) { // mapowanie we współrzędnych scenerii - u = ( SwitchExtension->vPoints[ i ].x - oxz.x + m_origin.x ) / fTexLength; - v = ( SwitchExtension->vPoints[ i ].z - oxz.z + m_origin.z ) / ( fTexRatio1 * fTexLength ); + u = ( SwitchExtension->vPoints[ i ].x - oxz.x + m_origin.x ) / texturelength; + v = ( SwitchExtension->vPoints[ i ].z - oxz.z + m_origin.z ) / ( fTexRatio1 * texturelength ); vertices.emplace_back( glm::vec3 { SwitchExtension->vPoints[ i ].x, @@ -2507,28 +2517,32 @@ TTrack * TTrack::RaAnimate() if (SwitchExtension->RightSwitch) { // nowa wersja z SPKS, ale odwrotnie lewa/prawa if( m_material1 ) { + auto const texturelength { texture_length( m_material1 ) }; // left blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, bladelength, SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, texturelength, 1.0, 0, bladelength, SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } if( m_material2 ) { + auto const texturelength { texture_length( m_material2 ) }; // right blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, bladelength, -fMaxOffset + SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, texturelength, 1.0, 0, bladelength, -fMaxOffset + SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); vertices.clear(); } } else { // lewa działa lepiej niż prawa if( m_material1 ) { + auto const texturelength { texture_length( m_material1 ) }; // right blade - SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, fTexLength, 1.0, 0, bladelength, -SwitchExtension->fOffset2 ); + SwitchExtension->Segments[ 0 ]->RenderLoft( vertices, m_origin, rpts4, -nnumPts, texturelength, 1.0, 0, bladelength, -SwitchExtension->fOffset2 ); GfxRenderer.Replace( vertices, Geometry1[ 2 ] ); vertices.clear(); } if( m_material2 ) { + auto const texturelength { texture_length( m_material2 ) }; // left blade - SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, fTexLength, 1.0, 0, bladelength, fMaxOffset - SwitchExtension->fOffset1 ); + SwitchExtension->Segments[ 1 ]->RenderLoft( vertices, m_origin, rpts3, -nnumPts, texturelength, 1.0, 0, bladelength, fMaxOffset - SwitchExtension->fOffset1 ); GfxRenderer.Replace( vertices, Geometry2[ 2 ] ); vertices.clear(); } @@ -2868,6 +2882,19 @@ TTrack::export_as_text_( std::ostream &Output ) const { << "\n"; } +float +TTrack::texture_length( material_handle const Material ) { + + if( Material == null_handle ) { + return fTexLength; + } + auto const texturelength { GfxRenderer.Material( Material ).size.y }; + return ( + texturelength < 0.f ? + fTexLength : + texturelength ); +} + void TTrack::MovedUp1(float const dh) { // poprawienie przechyłki wymaga wydłużenia podsypki fTexHeight1 += dh; diff --git a/Track.h b/Track.h index 9fb57165..e3ca3233 100644 --- a/Track.h +++ b/Track.h @@ -298,7 +298,8 @@ private: void deserialize_( std::istream &Input ); // export() subclass details, sends basic content of the class in legacy (text) format to provided stream void export_as_text_( std::ostream &Output ) const; - + // returns texture length for specified material + float texture_length( material_handle const Material ); }; diff --git a/material.cpp b/material.cpp index d5c03784..f83c5e58 100644 --- a/material.cpp +++ b/material.cpp @@ -12,6 +12,7 @@ http://mozilla.org/MPL/2.0/. #include "material.h" #include "renderer.h" #include "utilities.h" +#include "sn_utils.h" #include "globals.h" bool @@ -73,6 +74,12 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c priority2 = Priority; } } + else if( key == "size:" ) { + Input.getTokens( 2 ); + Input + >> size.x + >> size.y; + } else { auto const value { Input.getToken( true, "\n\r\t ;" ) }; if( value == "{" ) { diff --git a/material.h b/material.h index d4f64088..104990de 100644 --- a/material.h +++ b/material.h @@ -24,6 +24,7 @@ struct opengl_material { bool has_alpha { false }; // alpha state, calculated from presence of alpha in texture1 std::string name; + glm::vec2 size { -1.f, -1.f }; // 'physical' size of bound texture, in meters // constructors opengl_material() = default; diff --git a/openglmatrixstack.h b/openglmatrixstack.h index d37a8cf1..b37a1532 100644 --- a/openglmatrixstack.h +++ b/openglmatrixstack.h @@ -57,6 +57,10 @@ public: translate( glm::vec3 const &Translation ) { m_stack.top() = glm::translate( m_stack.top(), Translation ); upload(); } + void + scale( glm::vec3 const &Scale ) { + m_stack.top() = glm::scale( m_stack.top(), Scale ); + upload(); } void multiply( glm::mat4 const &Matrix ) { m_stack.top() *= Matrix; @@ -133,9 +137,9 @@ public: m_stacks[ m_mode ].rotate( static_cast(glm::radians(Angle)), glm::vec3( - static_cast(X), - static_cast(Y), - static_cast(Z) ) ); } + static_cast( X ), + static_cast( Y ), + static_cast( Z ) ) ); } template void translate( Type_ const X, Type_ const Y, Type_ const Z ) { @@ -145,6 +149,14 @@ public: static_cast( Y ), static_cast( Z ) ) ); } template + void + scale( Type_ const X, Type_ const Y, Type_ const Z ) { + m_stacks[ m_mode ].scale( + glm::vec3( + static_cast( X ), + static_cast( Y ), + static_cast( Z ) ) ); } + template void multiply( Type_ const *Matrix ) { m_stacks[ m_mode ].multiply( @@ -204,7 +216,8 @@ extern opengl_matrices OpenGLMatrices; #define glRotatef OpenGLMatrices.rotate #define glTranslated OpenGLMatrices.translate #define glTranslatef OpenGLMatrices.translate -// NOTE: no scale override as we aren't using it anywhere +#define glScaled OpenGLMatrices.scale +#define glScalef OpenGLMatrices.scale #define glMultMatrixd OpenGLMatrices.multiply #define glMultMatrixf OpenGLMatrices.multiply #define glOrtho OpenGLMatrices.ortho diff --git a/renderer.cpp b/renderer.cpp index f5d6d9c4..bdcd6d15 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1433,9 +1433,12 @@ opengl_renderer::Render( world_environment *Environment ) { ::glDisable( GL_LIGHTING ); ::glDisable( GL_DEPTH_TEST ); ::glDepthMask( GL_FALSE ); - ::glPushMatrix(); // skydome + // drawn with 500m radius to blend in if the fog range is low + ::glPushMatrix(); + ::glScalef( 500.f, 500.f, 500.f ); Environment->m_skydome.Render(); + ::glPopMatrix(); // stars if( Environment->m_stars.m_stars != nullptr ) { // setup @@ -1450,12 +1453,6 @@ opengl_renderer::Render( world_environment *Environment ) { ::glPopMatrix(); } // celestial bodies - float const duskfactor = 1.0f - clamp( std::abs( Environment->m_sun.getAngle() ), 0.0f, 12.0f ) / 12.0f; - glm::vec3 suncolor = interpolate( - glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), - glm::vec3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), - duskfactor ); - if( DebugModeFlag == true ) { // mark sun position for easier debugging Environment->m_sun.render(); @@ -1470,10 +1467,17 @@ opengl_renderer::Render( world_environment *Environment ) { ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); auto const &modelview = OpenGLMatrices.data( GL_MODELVIEW ); + + auto const fogfactor { clamp( Global.fFogEnd / 2000.f, 0.f, 1.f ) }; // stronger fog reduces opacity of the celestial bodies + float const duskfactor = 1.0f - clamp( std::abs( Environment->m_sun.getAngle() ), 0.0f, 12.0f ) / 12.0f; + glm::vec3 suncolor = interpolate( + glm::vec3( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ), + glm::vec3( 235.0f / 255.0f, 140.0f / 255.0f, 36.0f / 255.0f ), + duskfactor ); // sun { Bind_Texture( m_suntexture ); - ::glColor4f( suncolor.x, suncolor.y, suncolor.z, clamp( 1.5f - Global.Overcast, 0.f, 1.f ) ); + ::glColor4f( suncolor.x, suncolor.y, suncolor.z, clamp( 1.5f - Global.Overcast, 0.f, 1.f ) * fogfactor ); auto const sunvector = Environment->m_sun.getDirection(); auto const sunposition = modelview * glm::vec4( sunvector.x, sunvector.y, sunvector.z, 1.0f ); @@ -1495,14 +1499,15 @@ opengl_renderer::Render( world_environment *Environment ) { { Bind_Texture( m_moontexture ); glm::vec3 mooncolor( 255.0f / 255.0f, 242.0f / 255.0f, 231.0f / 255.0f ); - // fade the moon if it's near the sun in the sky, especially during the day ::glColor4f( mooncolor.r, mooncolor.g, mooncolor.b, + // fade the moon if it's near the sun in the sky, especially during the day std::max( 0.f, 1.0 - 0.5 * Global.fLuminance - - 0.65 * std::max( 0.f, glm::dot( Environment->m_sun.getDirection(), Environment->m_moon.getDirection() ) ) ) ); + - 0.65 * std::max( 0.f, glm::dot( Environment->m_sun.getDirection(), Environment->m_moon.getDirection() ) ) ) + * fogfactor ); auto const moonposition = modelview * glm::vec4( Environment->m_moon.getDirection(), 1.0f ); ::glPushMatrix(); @@ -1563,7 +1568,6 @@ opengl_renderer::Render( world_environment *Environment ) { ::glDisable( GL_LIGHTING ); } - ::glPopMatrix(); ::glDepthMask( GL_TRUE ); ::glEnable( GL_DEPTH_TEST ); ::glEnable( GL_LIGHTING ); diff --git a/simulationenvironment.cpp b/simulationenvironment.cpp index 5602f7af..5033c753 100644 --- a/simulationenvironment.cpp +++ b/simulationenvironment.cpp @@ -62,8 +62,8 @@ void world_environment::compute_weather() const { Global.Weather = ( - Global.Overcast < 0.25 ? "clear:" : - Global.Overcast < 1.0 ? "cloudy:" : + Global.Overcast <= 0.25 ? "clear:" : + Global.Overcast <= 1.0 ? "cloudy:" : ( Global.Season != "winter:" ? "rain:" : "snow:" ) ); diff --git a/station.cpp b/station.cpp index 75f7f267..63b5b0a6 100644 --- a/station.cpp +++ b/station.cpp @@ -51,6 +51,7 @@ basic_station::update_load( TDynamicObject *First, Mtable::TTrainParameters &Sch if( parameters.LoadType.name.empty() ) { // (try to) set the cargo type for empty cars + parameters.LoadAmount = 0.f; // safety measure against edge cases parameters.AssignLoad( "passengers" ); } diff --git a/version.h b/version.h index 66a33f7e..abf7d5cf 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 928 +#define VERSION_MINOR 1001 #define VERSION_REVISION 0 From 044e3c921a9e7dfaa3275524329712632e103059 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 2 Oct 2018 22:38:01 +0200 Subject: [PATCH 417/426] ai order list size increase, random overcast value, minor bug fixes --- Driver.h | 2 +- PyInt.cpp | 12 ++++++------ simulationstateserializer.cpp | 10 +++++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Driver.h b/Driver.h index b86f7fd4..dce4b815 100644 --- a/Driver.h +++ b/Driver.h @@ -167,7 +167,7 @@ static const bool Aggressive = true; static const bool Easyman = false; static const bool AIdriver = true; static const bool Humandriver = false; -static const int maxorders = 32; // ilość rozkazów w tabelce +static const int maxorders = 64; // ilość rozkazów w tabelce static const int maxdriverfails = 4; // ile błędów może zrobić AI zanim zmieni nastawienie extern bool WriteLogFlag; // logowanie parametrów fizycznych static const int BrakeAccTableSize = 20; diff --git a/PyInt.cpp b/PyInt.cpp index ff4ddeb3..95d44486 100644 --- a/PyInt.cpp +++ b/PyInt.cpp @@ -187,14 +187,14 @@ auto python_taskqueue::fetch_renderer( std::string const Renderer ) ->PyObject * auto const path { substr_path( Renderer ) }; auto const file { Renderer.substr( path.size() ) }; PyObject *renderer { nullptr }; - if( m_main == nullptr ) { - ErrorLog( "Python Renderer: __main__ module is missing" ); - goto cache_and_return; - } - + PyObject *rendererarguments { nullptr }; PyEval_AcquireLock(); { - PyObject *rendererarguments{ nullptr }; + if( m_main == nullptr ) { + ErrorLog( "Python Renderer: __main__ module is missing" ); + goto cache_and_return; + } + if( false == run_file( file, path ) ) { goto cache_and_return; } diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index ba327225..0671ba44 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -162,7 +162,15 @@ state_serializer::deserialize_atmo( cParser &Input, scene::scratch_data &Scratch std::string token { Input.getToken() }; if( token != "endatmo" ) { // optional overcast parameter - Global.Overcast = clamp( std::stof( token ), 0.f, 2.f ); + Global.Overcast = std::stof( token ); + if( Global.Overcast < 0.f ) { + // negative overcast means random value in range 0-abs(specified range) + Global.Overcast = + Random( + clamp( + std::abs( Global.Overcast ), + 0.f, 2.f ) ); + } // overcast drives weather so do a calculation here // NOTE: ugly, clean it up when we're done with world refactoring simulation::Environment.compute_weather(); From 682514fe7bf66b08832b44f9ec099440511ca489 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 4 Oct 2018 02:39:55 +0200 Subject: [PATCH 418/426] basic motor blowers implementation --- Driver.cpp | 5 + DynObj.cpp | 53 ++++++++++ DynObj.h | 1 + McZapkie/MOVER.h | 220 +++++++++++++++++++++------------------ McZapkie/Mover.cpp | 194 +++++++++++++++++++++++++++------- Train.cpp | 223 +++++++++++++++++++++++++++++++++++++++- Train.h | 13 ++- command.cpp | 8 +- command.h | 3 + driverkeyboardinput.cpp | 4 + drivermouseinput.cpp | 9 ++ driveruipanels.cpp | 4 +- translation.cpp | 13 ++- translation.h | 3 + 14 files changed, 609 insertions(+), 144 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index a4666bea..ddba2e45 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -2440,6 +2440,11 @@ bool TController::PrepareEngine() mvOccupied->ConverterSwitch( true ); // w EN57 sprężarka w ra jest zasilana z silnikowego mvOccupied->CompressorSwitch( true ); + // enable motor blowers + mvOccupied->MotorBlowersSwitchOff( false, side::front ); + mvOccupied->MotorBlowersSwitch( true, side::front ); + mvOccupied->MotorBlowersSwitchOff( false, side::rear ); + mvOccupied->MotorBlowersSwitch( true, side::rear ); } } else diff --git a/DynObj.cpp b/DynObj.cpp index 360ff418..6f92ca1e 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -5257,6 +5257,35 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co } } + else if( token == "motorblower:" ) { + + sound_source blowertemplate { sound_placement::engine }; + blowertemplate.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); + blowertemplate.owner( this ); + + auto const amplitudedivisor = static_cast( + MoverParameters->MotorBlowers[ side::front ].speed > 0.f ? + MoverParameters->MotorBlowers[ side::front ].speed * MoverParameters->nmax * 60 + MoverParameters->Power * 3 : + MoverParameters->MotorBlowers[ side::front ].speed * -1 ); + blowertemplate.m_amplitudefactor /= amplitudedivisor; + blowertemplate.m_frequencyfactor /= amplitudedivisor; + + if( true == m_powertrainsounds.motors.empty() ) { + // fallback for cases without specified motor locations, convert sound template to a single sound source + m_powertrainsounds.motorblowers.emplace_back( blowertemplate ); + } + else { + // apply configuration to all defined motor blowers + for( auto &blower : m_powertrainsounds.motorblowers ) { + // combine potential x- and y-axis offsets of the sound template with z-axis offsets of individual blowers + auto bloweroffset { blowertemplate.offset() }; + bloweroffset.z = blower.offset().z; + blower = blowertemplate; + blower.offset( bloweroffset ); + } + } + } + else if( token == "inverter:" ) { // plik z dzwiekiem wentylatora, mnozniki i ofsety amp. i czest. m_powertrainsounds.inverter.deserialize( parser, sound_type::single, sound_parameters::range | sound_parameters::amplitude | sound_parameters::frequency ); @@ -5604,10 +5633,13 @@ void TDynamicObject::LoadMMediaFile( std::string const &TypeName, std::string co auto const offset { std::atof( token.c_str() ) * -1.f }; // NOTE: we skip setting owner of the sounds, it'll be done during individual sound deserialization sound_source motor { sound_placement::external }; // generally traction motor + sound_source motorblower { sound_placement::engine }; // associated motor blowers // add entry to the list auto const location { glm::vec3 { 0.f, 0.f, offset } }; motor.offset( location ); m_powertrainsounds.motors.emplace_back( motor ); + motorblower.offset( location ); + m_powertrainsounds.motorblowers.emplace_back( motorblower ); } } @@ -6710,6 +6742,27 @@ TDynamicObject::powertrain_sounds::render( TMoverParameters const &Vehicle, doub motor.stop(); } } + // motor blowers + if( false == motorblowers.empty() ) { + for( auto &blowersound : motorblowers ) { + // match the motor blower and the sound source based on whether they're located in the front or the back of the vehicle + auto const &blower { Vehicle.MotorBlowers[ ( blowersound.offset().z > 0 ? side::front : side::rear ) ] }; + if( blower.revolutions > 1 ) { + + blowersound + .pitch( + true == blowersound.is_combined() ? + blower.revolutions * 0.01f : + blowersound.m_frequencyoffset + blowersound.m_frequencyfactor * blower.revolutions ) + .gain( blowersound.m_amplitudeoffset + blowersound.m_amplitudefactor * blower.revolutions ) + .play( sound_flags::exclusive | sound_flags::looping ); + } + else { + blowersound.stop(); + } + } + } + // inverter sounds if( Vehicle.EngineType == TEngineType::ElectricInductionMotor ) { if( Vehicle.InverterFrequency > 0.1 ) { diff --git a/DynObj.h b/DynObj.h index 0a19dee1..f0731d3a 100644 --- a/DynObj.h +++ b/DynObj.h @@ -327,6 +327,7 @@ private: struct powertrain_sounds { sound_source inverter { sound_placement::engine }; + std::vector motorblowers; std::vector motors; // generally traction motor(s) double motor_volume { 0.0 }; // MC: pomocnicze zeby gladziej silnik buczal float motor_momentum { 0.f }; // recent change in motor revolutions diff --git a/McZapkie/MOVER.h b/McZapkie/MOVER.h index fed359ee..57d948a1 100644 --- a/McZapkie/MOVER.h +++ b/McZapkie/MOVER.h @@ -166,6 +166,7 @@ enum class start_t { manual, automatic, manualwithautofallback, + converter, battery }; // recognized vehicle light locations and types; can be combined @@ -619,107 +620,122 @@ struct TCoupling { int sounds { 0 }; // sounds emitted by the coupling devices }; -// basic approximation of a fuel pump -// TODO: fuel consumption, optional automatic engine start after activation -struct fuel_pump { - - bool is_enabled { false }; // device is allowed/requested to operate - bool is_disabled { false }; // device is requested to stop - bool is_active { false }; // device is working - start_t start_type { start_t::manual }; -}; - -// basic approximation of a fuel pump -// TODO: fuel consumption, optional automatic engine start after activation -struct oil_pump { - - bool is_enabled { false }; // device is allowed/requested to operate - bool is_disabled { false }; // device is requested to stop - bool is_active { false }; // device is working - start_t start_type { start_t::manual }; - float resource_amount { 1.f }; - float pressure_minimum { 0.f }; // lowest acceptable working pressure - float pressure_maximum { 0.65f }; // oil pressure at maximum engine revolutions - float pressure_target { 0.f }; - float pressure_present { 0.f }; -}; - -struct water_pump { - - bool breaker { true }; // device is allowed to operate - bool is_enabled { false }; // device is requested to operate - bool is_disabled { false }; // device is requested to stop - bool is_active { false }; // device is working - start_t start_type { start_t::manual }; -}; - -struct water_heater { - - bool breaker { true }; // device is allowed to operate - bool is_enabled { false }; // device is requested to operate - bool is_active { false }; // device is working - bool is_damaged { false }; // device is damaged - - struct heater_config_t { - float temp_min { -1 }; // lowest accepted temperature - float temp_max { -1 }; // highest accepted temperature - } config; -}; - -struct heat_data { - // input, state of relevant devices - bool cooling { false }; // TODO: user controlled device, implement -// bool okienko { true }; // window in the engine compartment - // system configuration - bool auxiliary_water_circuit { false }; // cooling system has an extra water circuit - double fan_speed { 0.075 }; // cooling fan rpm; either fraction of engine rpm, or absolute value if negative - // heat exchange factors - double kw { 0.35 }; - double kv { 0.6 }; - double kfe { 1.0 }; - double kfs { 80.0 }; - double kfo { 25.0 }; - double kfo2 { 25.0 }; - // system parts - struct fluid_circuit_t { - - struct circuit_config_t { - float temp_min { -1 }; // lowest accepted temperature - float temp_max { -1 }; // highest accepted temperature - float temp_cooling { -1 }; // active cooling activation point - float temp_flow { -1 }; // fluid flow activation point - bool shutters { false }; // the radiator has shutters to assist the cooling - } config; - bool is_cold { false }; // fluid is too cold - bool is_warm { false }; // fluid is too hot - bool is_hot { false }; // fluid temperature crossed cooling threshold - bool is_flowing { false }; // fluid is being pushed through the circuit - } water, - water_aux, - oil; - // output, state of affected devices - bool PA { false }; // malfunction flag - float rpmw { 0.0 }; // current main circuit fan revolutions - float rpmwz { 0.0 }; // desired main circuit fan revolutions - bool zaluzje1 { false }; - float rpmw2 { 0.0 }; // current auxiliary circuit fan revolutions - float rpmwz2 { 0.0 }; // desired auxiliary circuit fan revolutions - bool zaluzje2 { false }; - // output, temperatures - float Te { 15.0 }; // ambient temperature TODO: get it from environment data - // NOTE: by default the engine is initialized in warm, startup-ready state - float Ts { 50.0 }; // engine temperature - float To { 45.0 }; // oil temperature - float Tsr { 50.0 }; // main circuit radiator temperature (?) - float Twy { 50.0 }; // main circuit water temperature - float Tsr2 { 40.0 }; // secondary circuit radiator temperature (?) - float Twy2 { 40.0 }; // secondary circuit water temperature - float temperatura1 { 50.0 }; - float temperatura2 { 40.0 }; -}; - class TMoverParameters { // Ra: wrapper na kod pascalowy, przejmujący jego funkcje Q: 20160824 - juz nie wrapper a klasa bazowa :) +private: +// types + + // basic approximation of a generic device + // TBD: inheritance or composition? + struct basic_device { + // config + start_t start_type { start_t::manual }; + // ld inputs + bool is_enabled { false }; // device is allowed/requested to operate + bool is_disabled { false }; // device is requested to stop + // TODO: add remaining inputs; start conditions and potential breakers + // ld outputs + bool is_active { false }; // device is working + }; + + struct cooling_fan : public basic_device { + // config + float speed { 0.f }; // cooling fan rpm; either fraction of parent rpm, or absolute value if negative + // ld outputs + float revolutions { 0.f }; // current fan rpm + }; + + // basic approximation of a fuel pump + struct fuel_pump : public basic_device { + // TODO: fuel consumption, optional automatic engine start after activation + }; + + // basic approximation of an oil pump + struct oil_pump : public basic_device { + // config + float pressure_minimum { 0.f }; // lowest acceptable working pressure + float pressure_maximum { 0.65f }; // oil pressure at maximum engine revolutions + // ld inputs + float resource_amount { 1.f }; // amount of affected resource, compared to nominal value + // internal data + float pressure_target { 0.f }; + // ld outputs + float pressure { 0.f }; // current pressure + }; + + // basic approximation of a water pump + struct water_pump : public basic_device { + // ld inputs + // TODO: move to breaker list in the basic device once implemented + bool breaker { true }; // device is allowed to operate + }; + + struct water_heater { + // config + struct heater_config_t { + float temp_min { -1 }; // lowest accepted temperature + float temp_max { -1 }; // highest accepted temperature + } config; + // ld inputs + bool breaker { true }; // device is allowed to operate + bool is_enabled { false }; // device is requested to operate + // ld outputs + bool is_active { false }; // device is working + bool is_damaged { false }; // device is damaged + }; + + struct heat_data { + // input, state of relevant devices + bool cooling { false }; // TODO: user controlled device, implement + // bool okienko { true }; // window in the engine compartment + // system configuration + bool auxiliary_water_circuit { false }; // cooling system has an extra water circuit + double fan_speed { 0.075 }; // cooling fan rpm; either fraction of engine rpm, or absolute value if negative + // heat exchange factors + double kw { 0.35 }; + double kv { 0.6 }; + double kfe { 1.0 }; + double kfs { 80.0 }; + double kfo { 25.0 }; + double kfo2 { 25.0 }; + // system parts + struct fluid_circuit_t { + + struct circuit_config_t { + float temp_min { -1 }; // lowest accepted temperature + float temp_max { -1 }; // highest accepted temperature + float temp_cooling { -1 }; // active cooling activation point + float temp_flow { -1 }; // fluid flow activation point + bool shutters { false }; // the radiator has shutters to assist the cooling + } config; + bool is_cold { false }; // fluid is too cold + bool is_warm { false }; // fluid is too hot + bool is_hot { false }; // fluid temperature crossed cooling threshold + bool is_flowing { false }; // fluid is being pushed through the circuit + } water, + water_aux, + oil; + // output, state of affected devices + bool PA { false }; // malfunction flag + float rpmw { 0.0 }; // current main circuit fan revolutions + float rpmwz { 0.0 }; // desired main circuit fan revolutions + bool zaluzje1 { false }; + float rpmw2 { 0.0 }; // current auxiliary circuit fan revolutions + float rpmwz2 { 0.0 }; // desired auxiliary circuit fan revolutions + bool zaluzje2 { false }; + // output, temperatures + float Te { 15.0 }; // ambient temperature TODO: get it from environment data + // NOTE: by default the engine is initialized in warm, startup-ready state + float Ts { 50.0 }; // engine temperature + float To { 45.0 }; // oil temperature + float Tsr { 50.0 }; // main circuit radiator temperature (?) + float Twy { 50.0 }; // main circuit water temperature + float Tsr2 { 40.0 }; // secondary circuit radiator temperature (?) + float Twy2 { 40.0 }; // secondary circuit water temperature + float temperatura1 { 50.0 }; + float temperatura2 { 40.0 }; + }; + public: double dMoveLen = 0.0; @@ -1040,6 +1056,7 @@ public: water_heater WaterHeater; bool WaterCircuitsLink { false }; // optional connection between water circuits heat_data dizel_heat; + std::array MotorBlowers; int BrakeCtrlPos = -2; /*nastawa hamulca zespolonego*/ double BrakeCtrlPosR = 0.0; /*nastawa hamulca zespolonego - plynna dla FV4a*/ @@ -1126,7 +1143,7 @@ public: bool StLinSwitchOff{ false }; // state of the button forcing motor connectors open bool ResistorsFlag = false; /*!o jazda rezystorowa*/ double RventRot = 0.0; /*!s obroty wentylatorow rozruchowych*/ - bool UnBrake = false; /*w EZT - nacisniete odhamowywanie*/ + bool UnBrake = false; /*w EZT - nacisniete odhamowywanie*/ double PantPress = 0.0; /*Cisnienie w zbiornikach pantografow*/ bool PantPressSwitchActive{ false }; // state of the pantograph pressure switch. gets primed at defined pressure level in pantograph air system bool PantPressLockActive{ false }; // pwr system state flag. fires when pressure switch activates by pantograph pressure dropping below defined level @@ -1343,6 +1360,8 @@ public: bool FuelPumpSwitchOff( bool State, range_t const Notify = range_t::consist ); // fuel pump state toggle bool OilPumpSwitch( bool State, range_t const Notify = range_t::consist ); // oil pump state toggle bool OilPumpSwitchOff( bool State, range_t const Notify = range_t::consist ); // oil pump state toggle + bool MotorBlowersSwitch( bool State, side const Side, range_t const Notify = range_t::consist ); // traction motor fan state toggle + bool MotorBlowersSwitchOff( bool State, side const Side, range_t const Notify = range_t::consist ); // traction motor fan state toggle bool MainSwitch( bool const State, range_t const Notify = range_t::consist );/*! wylacznik glowny*/ bool ConverterSwitch( bool State, range_t const Notify = range_t::consist );/*! wl/wyl przetwornicy*/ bool CompressorSwitch( bool State, range_t const Notify = range_t::consist );/*! wl/wyl sprezarki*/ @@ -1353,6 +1372,7 @@ public: void WaterHeaterCheck( double const Timestep ); void FuelPumpCheck( double const Timestep ); void OilPumpCheck( double const Timestep ); + void MotorBlowersCheck( double const Timestep ); bool FuseOn(void); //bezpiecznik nadamiary bool FuseFlagCheck(void) const; // sprawdzanie flagi nadmiarowego void FuseOff(void); // wylaczenie nadmiarowego diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 34fd7fd3..02a2a78b 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1438,6 +1438,8 @@ void TMoverParameters::compute_movement_( double const Deltatime ) { SetFlag( SoundFlag, sound::relay ); } } + // traction motors + MotorBlowersCheck( Deltatime ); // uklady hamulcowe: ConverterCheck( Deltatime ); if (VeselVolume > 0) @@ -1534,6 +1536,11 @@ void TMoverParameters::WaterPumpCheck( double const Timestep ) { // water heater status check void TMoverParameters::WaterHeaterCheck( double const Timestep ) { + WaterHeater.is_damaged = ( + ( true == WaterHeater.is_damaged ) + || ( ( true == WaterHeater.is_active ) + && ( false == WaterPump.is_active ) ) ); + WaterHeater.is_active = ( ( false == WaterHeater.is_damaged ) && ( true == Battery ) @@ -1545,11 +1552,6 @@ void TMoverParameters::WaterHeaterCheck( double const Timestep ) { && ( dizel_heat.temperatura1 > WaterHeater.config.temp_max ) ) { WaterHeater.is_active = false; } - - WaterHeater.is_damaged = ( - ( true == WaterHeater.is_damaged ) - || ( ( true == WaterHeater.is_active ) - && ( false == WaterPump.is_active ) ) ); } // fuel pump status update @@ -1592,20 +1594,57 @@ void TMoverParameters::OilPumpCheck( double const Timestep ) { true == OilPump.is_active ? std::min( minpressure + 0.1f, OilPump.pressure_maximum ) : // slight pressure margin to give time to switch off the pump and start the engine 0.f ); - if( OilPump.pressure_present < OilPump.pressure_target ) { + if( OilPump.pressure < OilPump.pressure_target ) { // TODO: scale change rate from 0.01-0.05 with oil/engine temperature/idle time - OilPump.pressure_present = + OilPump.pressure = std::min( OilPump.pressure_target, - OilPump.pressure_present + ( enrot > 5.0 ? 0.05 : 0.035 ) * Timestep ); + OilPump.pressure + ( enrot > 5.0 ? 0.05 : 0.035 ) * Timestep ); } - if( OilPump.pressure_present > OilPump.pressure_target ) { - OilPump.pressure_present = + if( OilPump.pressure > OilPump.pressure_target ) { + OilPump.pressure = std::max( OilPump.pressure_target, - OilPump.pressure_present - 0.01 * Timestep ); + OilPump.pressure - 0.01 * Timestep ); + } + OilPump.pressure = clamp( OilPump.pressure, 0.f, 1.5f ); +} + +void TMoverParameters::MotorBlowersCheck( double const Timestep ) { + // activation check + for( auto &blower : MotorBlowers ) { + + blower.is_active = ( + // TODO: bind properly power source when ld is in place + ( blower.start_type == start_t::battery ? Battery : + blower.start_type == start_t::converter ? ConverterFlag : + Mains ) // power source + // breaker condition disabled until it's implemented in the class data +// && ( true == blower.breaker ) + && ( false == blower.is_disabled ) + && ( ( true == blower.is_active ) + || ( blower.start_type == start_t::manual ? blower.is_enabled : true ) ) ); + } + // update + for( auto &fan : MotorBlowers ) { + + auto const revolutionstarget { ( + fan.is_active ? + ( fan.speed > 0.f ? fan.speed * static_cast( enrot ) * 60 : fan.speed * -1 ) : + 0.f ) }; + + if( std::abs( fan.revolutions - revolutionstarget ) < 0.01f ) { + fan.revolutions = revolutionstarget; + continue; + } + if( revolutionstarget > 0.f ) { + auto const speedincreasecap { std::max( 50.f, fan.speed * 0.05f * -1 ) }; // 5% of fixed revolution speed, or 50 + fan.revolutions += clamp( revolutionstarget - fan.revolutions, speedincreasecap * -2, speedincreasecap ) * Timestep; + } + else { + fan.revolutions *= std::max( 0.0, 1.0 - Timestep ); + } } - OilPump.pressure_present = clamp( OilPump.pressure_present, 0.f, 1.5f ); } @@ -2608,6 +2647,60 @@ bool TMoverParameters::OilPumpSwitchOff( bool State, range_t const Notify ) { return ( OilPump.is_disabled != initialstate ); } +bool TMoverParameters::MotorBlowersSwitch( bool State, side const Side, range_t const Notify ) { + + auto &fan { MotorBlowers[ Side ] }; + + if( ( fan.start_type != start_t::manual ) + && ( fan.start_type != start_t::manualwithautofallback ) ) { + // automatic device ignores 'manual' state commands + return false; + } + + bool const initialstate { fan.is_enabled }; + + fan.is_enabled = State; + + if( Notify != range_t::local ) { + SendCtrlToNext( + ( Side == side::front ? "MotorBlowersFrontSwitch" : "MotorBlowersRearSwitch" ), + ( fan.is_enabled ? 1 : 0 ), + CabNo, + ( Notify == range_t::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( fan.is_enabled != initialstate ); +} + +bool TMoverParameters::MotorBlowersSwitchOff( bool State, side const Side, range_t const Notify ) { + + auto &fan { MotorBlowers[ Side ] }; + + if( ( fan.start_type != start_t::manual ) + && ( fan.start_type != start_t::manualwithautofallback ) ) { + // automatic device ignores 'manual' state commands + return false; + } + + bool const initialstate { fan.is_disabled }; + + fan.is_disabled = State; + + if( Notify != range_t::local ) { + SendCtrlToNext( + ( Side == side::front ? "MotorBlowersFrontSwitchOff" : "MotorBlowersRearSwitchOff" ), + ( fan.is_disabled ? 1 : 0 ), + CabNo, + ( Notify == range_t::unit ? + coupling::control | coupling::permanent : + coupling::control ) ); + } + + return ( fan.is_disabled != initialstate ); +} + // ************************************************************************************************* // Q: 20160713 // włączenie / wyłączenie obwodu głownego @@ -6022,7 +6115,7 @@ bool TMoverParameters::dizel_StartupCheck() { } // test the oil pump if( ( false == OilPump.is_active ) - || ( OilPump.pressure_present < OilPump.pressure_minimum ) ) { + || ( OilPump.pressure < OilPump.pressure_minimum ) ) { engineisready = false; if( OilPump.start_type == start_t::manual ) { // with manual pump control startup procedure is done only once per starter switch press @@ -8208,59 +8301,54 @@ void TMoverParameters::LoadFIZ_Cntrl( std::string const &line ) { } extract_value( ConverterStartDelay, "ConverterStartDelay", line, "" ); + // devices + std::map starts { + { "Manual", start_t::manual }, + { "Automatic", start_t::automatic }, + { "Mixed", start_t::manualwithautofallback }, + { "Battery", start_t::battery }, + { "Converter", start_t::converter } }; // compressor { - std::map starts { - { "Manual", start_t::manual }, - { "Automatic", start_t::automatic } - }; auto lookup = starts.find( extract_value( "CompressorStart", line ) ); CompressorStart = lookup != starts.end() ? lookup->second : start_t::manual; } - // fuel pump { - std::map starts { - { "Manual", start_t::manual }, - { "Automatic", start_t::automatic }, - { "Mixed", start_t::manualwithautofallback } - }; auto lookup = starts.find( extract_value( "FuelStart", line ) ); FuelPump.start_type = lookup != starts.end() ? lookup->second : start_t::manual; } - // oil pump { - std::map starts { - { "Manual", start_t::manual }, - { "Automatic", start_t::automatic }, - { "Mixed", start_t::manualwithautofallback } - }; auto lookup = starts.find( extract_value( "OilStart", line ) ); OilPump.start_type = lookup != starts.end() ? lookup->second : start_t::manual; } - // water pump { - std::map starts { - { "Manual", start_t::manual }, - { "Battery", start_t::battery } - }; auto lookup = starts.find( extract_value( "WaterStart", line ) ); WaterPump.start_type = lookup != starts.end() ? lookup->second : start_t::manual; } + // traction motor fans + { + auto lookup = starts.find( extract_value( "MotorBlowersStart", line ) ); + MotorBlowers[side::front].start_type = + MotorBlowers[side::rear].start_type = + lookup != starts.end() ? + lookup->second : + start_t::manual; + } } void TMoverParameters::LoadFIZ_Blending(std::string const &line) { @@ -8513,6 +8601,10 @@ void TMoverParameters::LoadFIZ_Engine( std::string const &Input ) { extract_value( WaterHeater.config.temp_min, "HeaterMinTemperature", Input, "" ); extract_value( WaterHeater.config.temp_max, "HeaterMaxTemperature", Input, "" ); } + + // traction motors + extract_value( MotorBlowers[ side::front ].speed, "MotorBlowersSpeed", Input, "" ); + MotorBlowers[ side::rear ] = MotorBlowers[ side::front ]; } void TMoverParameters::LoadFIZ_Switches( std::string const &Input ) { @@ -9289,7 +9381,39 @@ bool TMoverParameters::RunCommand( std::string Command, double CValue1, double C } OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); } - else if (Command == "MainSwitch") + else if( Command == "MotorBlowersFrontSwitch" ) { + if( ( MotorBlowers[ side::front ].start_type != start_t::manual ) + && ( MotorBlowers[ side::front ].start_type != start_t::manualwithautofallback ) ) { + // automatic device ignores 'manual' state commands + MotorBlowers[side::front].is_enabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } + else if( Command == "MotorBlowersFrontSwitchOff" ) { + if( ( MotorBlowers[ side::front ].start_type != start_t::manual ) + && ( MotorBlowers[ side::front ].start_type != start_t::manualwithautofallback ) ) { + // automatic device ignores 'manual' state commands + MotorBlowers[side::front].is_disabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } + else if( Command == "MotorBlowersRearSwitch" ) { + if( ( MotorBlowers[ side::rear ].start_type != start_t::manual ) + && ( MotorBlowers[ side::rear ].start_type != start_t::manualwithautofallback ) ) { + // automatic device ignores 'manual' state commands + MotorBlowers[side::rear].is_enabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } + else if( Command == "MotorBlowersRearSwitchOff" ) { + if( ( MotorBlowers[ side::rear ].start_type != start_t::manual ) + && ( MotorBlowers[ side::rear ].start_type != start_t::manualwithautofallback ) ) { + // automatic device ignores 'manual' state commands + MotorBlowers[side::rear].is_disabled = ( CValue1 == 1 ); + } + OK = SendCtrlToNext( Command, CValue1, CValue2, Couplertype ); + } + else if (Command == "MainSwitch") { if (CValue1 == 1) { diff --git a/Train.cpp b/Train.cpp index 22ff5ab3..e9b0312a 100644 --- a/Train.cpp +++ b/Train.cpp @@ -266,6 +266,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = { { user_command::compressorenable, &TTrain::OnCommand_compressorenable }, { user_command::compressordisable, &TTrain::OnCommand_compressordisable }, { user_command::compressortogglelocal, &TTrain::OnCommand_compressortogglelocal }, + { user_command::motorblowerstogglefront, &TTrain::OnCommand_motorblowerstogglefront }, + { user_command::motorblowerstogglerear, &TTrain::OnCommand_motorblowerstogglerear }, + { user_command::motorblowersdisableall, &TTrain::OnCommand_motorblowersdisableall }, { user_command::motorconnectorsopen, &TTrain::OnCommand_motorconnectorsopen }, { user_command::motorconnectorsclose, &TTrain::OnCommand_motorconnectorsclose }, { user_command::motordisconnect, &TTrain::OnCommand_motordisconnect }, @@ -2770,6 +2773,191 @@ void TTrain::OnCommand_compressortogglelocal( TTrain *Train, command_data const } } +void TTrain::OnCommand_motorblowerstogglefront( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggMotorBlowersFrontButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no off button so we always try to turn it on + OnCommand_motorblowersenablefront( Train, Command ); + } + else { + // two-state switch + if( Command.action == GLFW_RELEASE ) { return; } + + if( false == Train->mvControlled->MotorBlowers[side::front].is_enabled ) { + // turn on + OnCommand_motorblowersenablefront( Train, Command ); + } + else { + //turn off + OnCommand_motorblowersdisablefront( Train, Command ); + } + } +} + +void TTrain::OnCommand_motorblowersenablefront( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggMotorBlowersFrontButton.type() == TGaugeType::push ) { + // impulse switch + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggMotorBlowersFrontButton.UpdateValue( 1.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitch( true, side::front ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggMotorBlowersFrontButton.UpdateValue( 0.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitch( false, side::front ); + } + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggMotorBlowersFrontButton.UpdateValue( 1.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitch( true, side::front ); + Train->mvControlled->MotorBlowersSwitchOff( false, side::front ); + } + } +} + +void TTrain::OnCommand_motorblowersdisablefront( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggMotorBlowersFrontButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no disable return type switch + return; + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggMotorBlowersFrontButton.UpdateValue( 0.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitch( false, side::front ); + Train->mvControlled->MotorBlowersSwitchOff( true, side::front ); + } + } +} + +void TTrain::OnCommand_motorblowerstogglerear( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggMotorBlowersRearButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no off button so we always try to turn it on + OnCommand_motorblowersenablerear( Train, Command ); + } + else { + // two-state switch + if( Command.action == GLFW_RELEASE ) { return; } + + if( false == Train->mvControlled->MotorBlowers[ side::rear ].is_enabled ) { + // turn on + OnCommand_motorblowersenablerear( Train, Command ); + } + else { + //turn off + OnCommand_motorblowersdisablerear( Train, Command ); + } + } +} + +void TTrain::OnCommand_motorblowersenablerear( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggMotorBlowersRearButton.type() == TGaugeType::push ) { + // impulse switch + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggMotorBlowersRearButton.UpdateValue( 1.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitch( true, side::rear ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggMotorBlowersRearButton.UpdateValue( 0.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitch( false, side::rear ); + } + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggMotorBlowersRearButton.UpdateValue( 1.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitch( true, side::rear ); + Train->mvControlled->MotorBlowersSwitchOff( false, side::rear ); + } + } +} + +void TTrain::OnCommand_motorblowersdisablerear( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggMotorBlowersRearButton.type() == TGaugeType::push ) { + // impulse switch + // currently there's no disable return type switch + return; + } + else { + // two-state switch, only cares about press events + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggMotorBlowersRearButton.UpdateValue( 0.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitch( false, side::rear ); + Train->mvControlled->MotorBlowersSwitchOff( true, side::rear ); + } + } +} + +void TTrain::OnCommand_motorblowersdisableall( TTrain *Train, command_data const &Command ) { + + if( Command.action == GLFW_REPEAT ) { return; } + + if( Train->ggMotorBlowersAllOffButton.type() == TGaugeType::push ) { + // impulse switch + if( Command.action == GLFW_PRESS ) { + // visual feedback + Train->ggMotorBlowersAllOffButton.UpdateValue( 1.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitchOff( true, side::front ); + Train->mvControlled->MotorBlowersSwitchOff( true, side::rear ); + } + else if( Command.action == GLFW_RELEASE ) { + // visual feedback + Train->ggMotorBlowersAllOffButton.UpdateValue( 0.f, Train->dsbSwitch ); + Train->mvControlled->MotorBlowersSwitchOff( false, side::front ); + Train->mvControlled->MotorBlowersSwitchOff( false, side::rear ); + } + } + else { + // two-state switch, only cares about press events + // NOTE: generally this switch doesn't come in two-state form + if( Command.action == GLFW_PRESS ) { + if( Train->ggMotorBlowersAllOffButton.GetDesiredValue() < 0.5f ) { + // switch is off, activate + Train->mvControlled->MotorBlowersSwitchOff( true, side::front ); + Train->mvControlled->MotorBlowersSwitchOff( true, side::rear ); + // visual feedback + Train->ggMotorBlowersRearButton.UpdateValue( 1.f, Train->dsbSwitch ); + } + else { + // deactivate + Train->mvControlled->MotorBlowersSwitchOff( false, side::front ); + Train->mvControlled->MotorBlowersSwitchOff( false, side::rear ); + // visual feedback + Train->ggMotorBlowersRearButton.UpdateValue( 0.f, Train->dsbSwitch ); + } + } + } +} + void TTrain::OnCommand_motorconnectorsopen( TTrain *Train, command_data const &Command ) { // TODO: don't rely on presense of 3d model to determine presence of the switch @@ -5043,7 +5231,7 @@ bool TTrain::Update( double const Deltatime ) ggWater1TempB.Update(); } if( ggOilPressB.SubModel ) { - ggOilPressB.UpdateValue( tmp->MoverParameters->OilPump.pressure_present ); + ggOilPressB.UpdateValue( tmp->MoverParameters->OilPump.pressure ); ggOilPressB.Update(); } } @@ -5344,7 +5532,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaRearRightEndLight.Turn( ( mvOccupied->iLights[ side::rear ] & light::redmarker_right ) != 0 ); // others btLampkaMalfunction.Turn( mvControlled->dizel_heat.PA ); - btLampkaMotorBlowers.Turn( mvControlled->RventRot > 0.1 ); + btLampkaMotorBlowers.Turn( ( mvControlled->MotorBlowers[ side::front ].is_active ) && ( mvControlled->MotorBlowers[ side::rear ].is_active ) ); } else { // wylaczone @@ -5704,6 +5892,9 @@ bool TTrain::Update( double const Deltatime ) ggWaterCircuitsLinkButton.Update(); ggFuelPumpButton.Update(); ggOilPumpButton.Update(); + ggMotorBlowersFrontButton.Update(); + ggMotorBlowersRearButton.Update(); + ggMotorBlowersAllOffButton.Update(); //------ } // wyprowadzenie sygnałów dla haslera na PoKeys (zaznaczanie na taśmie) @@ -6927,6 +7118,9 @@ void TTrain::clear_cab_controls() ggWaterCircuitsLinkButton.Clear(); ggFuelPumpButton.Clear(); ggOilPumpButton.Clear(); + ggMotorBlowersFrontButton.Clear(); + ggMotorBlowersRearButton.Clear(); + ggMotorBlowersAllOffButton.Clear(); btLampkaPrzetw.Clear(); btLampkaPrzetwB.Clear(); @@ -7271,6 +7465,26 @@ void TTrain::set_cab_controls() { 1.0 : 0.0 ); } + // traction motor fans + if( ggMotorBlowersFrontButton.type() != TGaugeType::push ) { + ggMotorBlowersFrontButton.PutValue( + mvControlled->MotorBlowers[side::front].is_enabled ? + 1.0 : + 0.0 ); + } + if( ggMotorBlowersRearButton.type() != TGaugeType::push ) { + ggMotorBlowersRearButton.PutValue( + mvControlled->MotorBlowers[side::rear].is_enabled ? + 1.0 : + 0.0 ); + } + if( ggMotorBlowersAllOffButton.type() != TGaugeType::push ) { + ggMotorBlowersAllOffButton.PutValue( + ( mvControlled->MotorBlowers[side::front].is_disabled + || mvControlled->MotorBlowers[ side::front ].is_disabled ) ? + 1.0 : + 0.0 ); + } // we reset all indicators, as they're set during the update pass // TODO: when cleaning up break setting indicator state into a separate function, so we can reuse it @@ -7465,6 +7679,9 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con { "fuelpump_sw:", ggFuelPumpButton }, { "oilpump_sw:", ggOilPumpButton }, { "oilpressb:", ggOilPressB }, + { "motorblowersfront_sw:", ggMotorBlowersFrontButton }, + { "motorblowersrear_sw:", ggMotorBlowersRearButton }, + { "motorblowersalloff_sw:", ggMotorBlowersAllOffButton }, { "radio_sw:", ggRadioButton }, { "radiochannel_sw:", ggRadioChannelSelector }, { "radiochannelprev_sw:", ggRadioChannelPrevious }, @@ -7630,7 +7847,7 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con // oil pressure auto &gauge = Cabine[ Cabindex ].Gauge( -1 ); // pierwsza wolna gałka gauge.Load( Parser, DynamicObject, DynamicObject->mdKabina, nullptr ); - gauge.AssignFloat( &mvControlled->OilPump.pressure_present ); + gauge.AssignFloat( &mvControlled->OilPump.pressure ); } else if( Label == "oiltemp:" ) { // oil temperature diff --git a/Train.h b/Train.h index 2a84462d..dd6296dd 100644 --- a/Train.h +++ b/Train.h @@ -251,6 +251,13 @@ class TTrain static void OnCommand_compressorenable( TTrain *Train, command_data const &Command ); static void OnCommand_compressordisable( TTrain *Train, command_data const &Command ); static void OnCommand_compressortogglelocal( TTrain *Train, command_data const &Command ); + static void OnCommand_motorblowerstogglefront( TTrain *Train, command_data const &Command ); + static void OnCommand_motorblowersenablefront( TTrain *Train, command_data const &Command ); + static void OnCommand_motorblowersdisablefront( TTrain *Train, command_data const &Command ); + static void OnCommand_motorblowerstogglerear( TTrain *Train, command_data const &Command ); + static void OnCommand_motorblowersenablerear( TTrain *Train, command_data const &Command ); + static void OnCommand_motorblowersdisablerear( TTrain *Train, command_data const &Command ); + static void OnCommand_motorblowersdisableall( TTrain *Train, command_data const &Command ); static void OnCommand_motorconnectorsopen( TTrain *Train, command_data const &Command ); static void OnCommand_motorconnectorsclose( TTrain *Train, command_data const &Command ); static void OnCommand_motordisconnect( TTrain *Train, command_data const &Command ); @@ -322,6 +329,7 @@ class TTrain static void OnCommand_cabchangebackward( TTrain *Train, command_data const &Command ); static void OnCommand_generictoggle( TTrain *Train, command_data const &Command ); + // members TDynamicObject *DynamicObject { nullptr }; // przestawia zmiana pojazdu [F5] TMoverParameters *mvControlled { nullptr }; // człon, w którym sterujemy silnikiem @@ -350,7 +358,7 @@ public: // reszta może by?publiczna TGauge ggI3B; TGauge ggItotalB; - TGauge ggOilPressB; + TGauge ggOilPressB; // other unit oil pressure indicator TGauge ggWater1TempB; // McZapkie: definicje regulatorow @@ -458,6 +466,9 @@ public: // reszta może by?publiczna TGauge ggWaterCircuitsLinkButton; TGauge ggFuelPumpButton; // fuel pump switch TGauge ggOilPumpButton; // fuel pump switch + TGauge ggMotorBlowersFrontButton; // front traction motor fan switch + TGauge ggMotorBlowersRearButton; // rear traction motor fan switch + TGauge ggMotorBlowersAllOffButton; // motor fans shutdown switch TButton btLampkaPoslizg; TButton btLampkaStyczn; diff --git a/command.cpp b/command.cpp index d1e7e768..6edade69 100644 --- a/command.cpp +++ b/command.cpp @@ -214,10 +214,14 @@ commanddescription_sequence Commands_descriptions = { { "generictoggle9", command_target::vehicle }, { "batterytoggle", command_target::vehicle }, { "batteryenable", command_target::vehicle }, - { "batterydisable", command_target::vehicle } + { "batterydisable", command_target::vehicle }, + { "motorblowerstogglefront", command_target::vehicle }, + { "motorblowerstogglerear", command_target::vehicle }, + { "motorblowersdisableall", command_target::vehicle } + }; -} +} // simulation // posts specified command for specified recipient void diff --git a/command.h b/command.h index e6048bee..5f34b6fd 100644 --- a/command.h +++ b/command.h @@ -208,6 +208,9 @@ enum class user_command { batterytoggle, batteryenable, batterydisable, + motorblowerstogglefront, + motorblowerstogglerear, + motorblowersdisableall, none = -1 }; diff --git a/driverkeyboardinput.cpp b/driverkeyboardinput.cpp index efe49008..ae8aab93 100644 --- a/driverkeyboardinput.cpp +++ b/driverkeyboardinput.cpp @@ -217,6 +217,10 @@ driverkeyboard_input::default_bindings() { { user_command::batterytoggle, GLFW_KEY_J }, // batteryenable, // batterydisable, + { user_command::motorblowerstogglefront, GLFW_KEY_N | keymodifier::shift }, + { user_command::motorblowerstogglerear, GLFW_KEY_M | keymodifier::shift }, + { user_command::motorblowersdisableall, GLFW_KEY_M | keymodifier::control } + }; } diff --git a/drivermouseinput.cpp b/drivermouseinput.cpp index 235bc589..0a34c2f2 100644 --- a/drivermouseinput.cpp +++ b/drivermouseinput.cpp @@ -499,6 +499,15 @@ drivermouse_input::default_bindings() { { "oilpump_sw:", { user_command::oilpumptoggle, user_command::none } }, + { "motorblowersfront_sw:", { + user_command::motorblowerstogglefront, + user_command::none } }, + { "motorblowersrear_sw:", { + user_command::motorblowerstogglerear, + user_command::none } }, + { "motorblowersalloff_sw:", { + user_command::motorblowersdisableall, + user_command::none } }, { "main_off_bt:", { user_command::linebreakeropen, user_command::none } }, diff --git a/driveruipanels.cpp b/driveruipanels.cpp index 84b930f6..ceb9253f 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -414,7 +414,7 @@ debug_panel::update_section_vehicle( std::vector &Output ) { ( mover.CompressorFlag ? 'C' : ( false == mover.CompressorAllowLocal ? '-' : ( ( mover.CompressorAllow || mover.CompressorStart == start_t::automatic ) ? 'c' : '.' ) ) ), ( mover.CompressorGovernorLock ? '!' : '.' ), std::string( isplayervehicle ? locale::strings[ locale::string::debug_vehicle_radio ] + ( mover.Radio ? std::to_string( m_input.train->RadioChannel() ) : "-" ) : "" ).c_str(), - std::string( isdieselenginepowered ? locale::strings[ locale::string::debug_vehicle_oilpressure ] + to_string( mover.OilPump.pressure_present, 2 ) : "" ).c_str(), + std::string( isdieselenginepowered ? locale::strings[ locale::string::debug_vehicle_oilpressure ] + to_string( mover.OilPump.pressure, 2 ) : "" ).c_str(), // power transfers mover.Couplers[ side::front ].power_high.voltage, mover.Couplers[ side::front ].power_high.current, @@ -440,6 +440,8 @@ debug_panel::update_section_vehicle( std::vector &Output ) { std::abs( mover.enrot ) * 60, std::abs( mover.nrot ) * mover.Transmision.Ratio * 60, mover.RventRot * 60, + mover.MotorBlowers[side::front].revolutions, + mover.MotorBlowers[side::rear].revolutions, mover.dizel_heat.rpmw, mover.dizel_heat.rpmw2 ); diff --git a/translation.cpp b/translation.cpp index 52f255da..c9bc66f9 100644 --- a/translation.cpp +++ b/translation.cpp @@ -54,7 +54,7 @@ init() { "Devices: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nPower transfers: %.0f@%.0f%s%s%s%.0f@%.0f", " radio: ", " oil pressure: ", - "Controllers:\n master: %d(%d), secondary: %s\nEngine output: %.1f, current: %.0f\nRevolutions:\n engine: %.0f, motors: %.0f, ventilators: %.0f, fans: %.0f+%.0f", + "Controllers:\n master: %d(%d), secondary: %s\nEngine output: %.1f, current: %.0f\nRevolutions:\n engine: %.0f, motors: %.0f\n engine fans: %.0f, motor fans: %.0f+%.0f, cooling fans: %.0f+%.0f", " (shunt mode)", "\nTemperatures:\n engine: %.2f, oil: %.2f, water: %.2f%c%.2f", "Brakes:\n train: %.2f, independent: %.2f, delay: %s, load flag: %d\nBrake cylinder pressures:\n train: %.2f, independent: %.2f, status: 0x%.2x\nPipe pressures:\n brake: %.2f (hat: %.2f), main: %.2f, control: %.2f\nTank pressures:\n auxiliary: %.2f, main: %.2f, control: %.2f", @@ -80,6 +80,9 @@ init() { "water circuits link", "fuel pump", "oil pump", + "motor blowers A", + "motor blowers B", + "all motor blowers", "line breaker", "line breaker", "alerter", @@ -188,7 +191,7 @@ init() { "Urzadzenia: %c%c%c%c%c%c%c%c%c%c%c%c%c%c%s%s\nTransfer pradow: %.0f@%.0f%s%s%s%.0f@%.0f", " radio: ", " cisn.oleju: ", - "Nastawniki:\n glowny: %d(%d), dodatkowy: %s\nMoc silnika: %.1f, prad silnika: %.0f\nObroty:\n silnik: %.0f, motory: %.0f, went.silnika: %.0f, went.chlodnicy: %.0f+%.0f", + "Nastawniki:\n glowny: %d(%d), dodatkowy: %s\nMoc silnika: %.1f, prad silnika: %.0f\nObroty:\n silnik: %.0f, motory: %.0f\n went.silnika: %.0f, went.motorow: %.0f+%.0f, went.chlodnicy: %.0f+%.0f", " (tryb manewrowy)", "\nTemperatury:\n silnik: %.2f, olej: %.2f, woda: %.2f%c%.2f", "Hamulce:\n zespolony: %.2f, pomocniczy: %.2f, nastawa: %s, ladunek: %d\nCisnienie w cylindrach:\n zespolony: %.2f, pomocniczy: %.2f, status: 0x%.2x\nCisnienia w przewodach:\n glowny: %.2f (kapturek: %.2f), zasilajacy: %.2f, kontrolny: %.2f\nCisnienia w zbiornikach:\n pomocniczy: %.2f, glowny: %.2f, sterujacy: %.2f", @@ -214,6 +217,9 @@ init() { "zawor polaczenia obiegow wody", "pompa paliwa", "pompa oleju", + "wentylatory silnikow trakcyjnych A", + "wentylatory silnikow trakcyjnych B", + "wszystkie wentylatory silnikow trakcyjnych", "wylacznik szybki", "wylacznik szybki", "czuwak", @@ -320,6 +326,9 @@ init() { "watercircuitslink_sw:", "fuelpump_sw:", "oilpump_sw:", + "motorblowersfront_sw:", + "motorblowersrear_sw:", + "motorblowersalloff_sw:", "main_off_bt:", "main_on_bt:", "security_reset_bt:", diff --git a/translation.h b/translation.h index 2c39471e..4d40b762 100644 --- a/translation.h +++ b/translation.h @@ -69,6 +69,9 @@ enum string { cab_watercircuitslink_sw, cab_fuelpump_sw, cab_oilpump_sw, + cab_motorblowersfront_sw, + cab_motorblowersrear_sw, + cab_motorblowersalloff_sw, cab_main_off_bt, cab_main_on_bt, cab_security_reset_bt, From 8b1a26632d71cdd3619a84cd2316d20524fcdd46 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 5 Oct 2018 21:57:49 +0200 Subject: [PATCH 419/426] build 181005. automatic switch trackbed generation --- DynObj.cpp | 2 +- Globals.cpp | 5 + Globals.h | 1 + McZapkie/Mover.cpp | 7 +- Segment.cpp | 18 +- Segment.h | 2 +- Track.cpp | 1517 ++++++++++++++++----------------- Track.h | 14 +- renderer.cpp | 64 +- scene.cpp | 19 + simulationstateserializer.cpp | 12 +- version.h | 2 +- 12 files changed, 879 insertions(+), 784 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index 6f92ca1e..dc833bd3 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -2689,7 +2689,7 @@ void TDynamicObject::LoadUpdate() { } else if( MoverParameters->LoadAmount == 0 ) { // nie ma ładunku - MoverParameters->AssignLoad( "" ); +// MoverParameters->AssignLoad( "" ); mdLoad = nullptr; // erase bindings between lowpoly sections and potential load chunks placed inside them update_load_sections(); diff --git a/Globals.cpp b/Globals.cpp index 9b66abbf..a6a01fd6 100644 --- a/Globals.cpp +++ b/Globals.cpp @@ -369,6 +369,11 @@ global_settings::ConfigParse(cParser &Parser) { Parser >> splinefidelity; SplineFidelity = clamp( splinefidelity, 1.f, 4.f ); } + else if( token == "createswitchtrackbeds" ) { + // podwójna jasność ambient + Parser.getTokens(); + Parser >> CreateSwitchTrackbeds; + } else if( token == "gfx.resource.sweep" ) { Parser.getTokens(); diff --git a/Globals.h b/Globals.h index 8caf793a..2dc2c7c1 100644 --- a/Globals.h +++ b/Globals.h @@ -51,6 +51,7 @@ struct global_settings { // settings // filesystem bool bLoadTraction{ true }; + bool CreateSwitchTrackbeds { true }; std::string szTexturesTGA{ ".tga" }; // lista tekstur od TGA std::string szTexturesDDS{ ".dds" }; // lista tekstur od DDS std::string szDefaultExt{ szTexturesDDS }; diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 02a2a78b..da6b7884 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -6640,15 +6640,14 @@ TMoverParameters::AssignLoad( std::string const &Name, float const Amount ) { } } - // can't mix load types, at least for the time being - if( ( LoadAmount > 0 ) && ( LoadType.name != Name ) ) { return false; } - if( Name.empty() ) { - // empty the vehicle + // empty the vehicle if requested LoadType = load_attributes(); LoadAmount = 0.f; return true; } + // can't mix load types, at least for the time being + if( ( LoadAmount > 0 ) && ( LoadType.name != Name ) ) { return false; } for( auto const &loadattributes : LoadAttributes ) { if( Name == loadattributes.name ) { diff --git a/Segment.cpp b/Segment.cpp index 10bf62cc..0bc1c272 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -114,9 +114,6 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M ErrorLog( "Bad track: zero length spline \"" + pOwner->name() + "\" (location: " + to_string( glm::dvec3{ Point1 } ) + ")" ); fLength = 0.01; // crude workaround TODO: fix this properly -/* - return false; // zerowe nie mogą być -*/ } fStoop = std::atan2((Point2.y - Point1.y), fLength); // pochylenie toru prostego, żeby nie liczyć wielokrotnie @@ -128,13 +125,12 @@ bool TSegment::Init( Math3D::vector3 &NewPoint1, Math3D::vector3 NewCPointOut, M // NOTE: a workaround for too short switches (less than 3 segments) messing up animation/generation of blades fStep = fLength / ( 3.0 * Global.SplineFidelity ); } - iSegCount = static_cast( std::ceil( fLength / fStep ) ); // potrzebne do VBO -/* +// iSegCount = static_cast( std::ceil( fLength / fStep ) ); // potrzebne do VBO iSegCount = ( pOwner->eType == tt_Switch ? 6 * Global.SplineFidelity : static_cast( std::ceil( fLength / fStep ) ) ); // potrzebne do VBO -*/ + fStep = fLength / iSegCount; // update step to equalize size of individual pieces fTsBuffer.resize( iSegCount + 1 ); @@ -378,7 +374,7 @@ Math3D::vector3 TSegment::FastGetPoint(double const t) const interpolate( Point1, Point2, t ) ); } -bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Origin, const gfx::basic_vertex *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, float fOffsetX, glm::vec3 **p, bool bRender) +bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Origin, const gfx::vertex_array &ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale, int iSkip, int iEnd, float fOffsetX, glm::vec3 **p, bool bRender) { // generowanie trójkątów dla odcinka trajektorii ruchu // standardowo tworzy triangle_strip dla prostego albo ich zestaw dla łuku // po modyfikacji - dla ujemnego (iNumShapePoints) w dodatkowych polach tabeli @@ -459,7 +455,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori Output.emplace_back( pt, glm::normalize( norm ), - glm::vec2 { ( jmm1 * ShapePoints[ j ].texture.x + m1 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv1 } ); + glm::vec2 { 1.f - ( jmm1 * ShapePoints[ j ].texture.x + m1 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv1 } ); } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -479,7 +475,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori Output.emplace_back( pt, glm::normalize( norm ), - glm::vec2 { ( jmm2 * ShapePoints[ j ].texture.x + m2 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv2 } ); + glm::vec2 { 1.f - ( jmm2 * ShapePoints[ j ].texture.x + m2 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv2 } ); } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -503,7 +499,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori Output.emplace_back( pt, glm::normalize( norm ), - glm::vec2 { ShapePoints[ j ].texture.x / texturescale, tv1 } ); + glm::vec2 { 1.f - ShapePoints[ j ].texture.x / texturescale, tv1 } ); pt = parallel2 * ShapePoints[ j ].position.x + pos2; pt.y += ShapePoints[ j ].position.y; @@ -514,7 +510,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori Output.emplace_back( pt, glm::normalize( norm ), - glm::vec2 { ShapePoints[ j ].texture.x / texturescale, tv2 } ); + glm::vec2 { 1.f - ShapePoints[ j ].texture.x / texturescale, tv2 } ); } } } diff --git a/Segment.h b/Segment.h index 2304a62d..2f5cd2f9 100644 --- a/Segment.h +++ b/Segment.h @@ -116,7 +116,7 @@ public: r2 = fRoll2; } bool - RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Origin, gfx::basic_vertex const *ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, float fOffsetX = 0.f, glm::vec3 **p = nullptr, bool bRender = true); + RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Origin, gfx::vertex_array const &ShapePoints, int iNumShapePoints, double fTextureLength, double Texturescale = 1.0, int iSkip = 0, int iEnd = 0, float fOffsetX = 0.f, glm::vec3 **p = nullptr, bool bRender = true); /* void Render(); diff --git a/Track.cpp b/Track.cpp index 598e7f52..73254f87 100644 --- a/Track.cpp +++ b/Track.cpp @@ -1131,259 +1131,23 @@ void TTrack::RaAssign( TAnimModel *am, basic_event *done, basic_event *joined ) // wypełnianie tablic VBO void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { - // Ra: trzeba rozdzielić szyny od podsypki, aby móc grupować wg tekstur - auto const fHTW = 0.5f * std::abs(fTrackWidth); - auto const side = std::abs(fTexWidth); // szerokść podsypki na zewnątrz szyny albo pobocza - auto const slop = std::abs(fTexSlope); // brzeg zewnętrzny - auto const rozp = fHTW + side + slop; // brzeg zewnętrzny - auto hypot1 = std::hypot(slop, fTexHeight1); // rozmiar pochylenia do liczenia normalnych - if( hypot1 == 0.f ) - hypot1 = 1.f; - glm::vec3 const normalup{ 0.f, 1.f, 0.f }; - glm::vec3 normal1 { fTexHeight1 / hypot1, fTexSlope / hypot1, 0.f }; // wektor normalny - if( glm::length( normal1 ) == 0.f ) { - // fix normal for vertical surfaces - normal1 = glm::vec3 { 1.f, 0.f, 0.f }; - } - glm::vec3 normal2; - float fHTW2, side2, slop2, rozp2, fTexHeight2, hypot2; - if( iTrapezoid & 2 ) { - // ten bit oznacza, że istnieje odpowiednie pNext - // Ra: jest OK - fHTW2 = 0.5f * std::fabs(trNext->fTrackWidth); // połowa rozstawu/nawierzchni - side2 = std::fabs(trNext->fTexWidth); - slop2 = std::fabs(trNext->fTexSlope); // nie jest używane później - rozp2 = fHTW2 + side2 + slop2; - fTexHeight2 = trNext->fTexHeight1; - hypot2 = std::hypot(slop2, fTexHeight2); - if( hypot2 == 0.f ) - hypot2 = 1.f; - normal2 = { fTexHeight2 / hypot2, trNext->fTexSlope / hypot2, 0.f }; - if( glm::length( normal2 ) == 0.f ) { - // fix normal for vertical surfaces - normal2 = glm::vec3 { 1.f, 0.f, 0.f }; - } - } - else { - // gdy nie ma następnego albo jest nieodpowiednim końcem podpięty - fHTW2 = fHTW; - side2 = side; - slop2 = slop; - rozp2 = rozp; - fTexHeight2 = fTexHeight1; - hypot2 = hypot1; - normal2 = normal1; - } - float roll1, roll2; switch (iCategoryFlag & 15) { case 1: // tor { - if (Segment) - Segment->GetRolls(roll1, roll2); - else - roll1 = roll2 = 0.0; // dla zwrotnic - float const - sin1 = std::sin(roll1), - cos1 = std::cos(roll1), - sin2 = std::sin(roll2), - cos2 = std::cos(roll2); // zwykla szyna: //Ra: czemu główki są asymetryczne na wysokości 0.140? - gfx::basic_vertex rpts1[24], rpts2[24], rpts3[24], rpts4[24]; - for( int i = 0; i < 12; ++i ) { - - rpts1[ i ] = { - // position - {( fHTW + szyna[ i ].position.x ) * cos1 + szyna[ i ].position.y * sin1, - -( fHTW + szyna[ i ].position.x ) * sin1 + szyna[ i ].position.y * cos1, - szyna[ i ].position.z}, - // normal - { szyna[ i ].normal.x * cos1 + szyna[ i ].normal.y * sin1, - -szyna[ i ].normal.x * sin1 + szyna[ i ].normal.y * cos1, - szyna[ i ].normal.z }, - // texture - { szyna[ i ].texture.x, - szyna[ i ].texture.y } }; - - rpts2[ 11 - i ] = { - // position - {(-fHTW - szyna[ i ].position.x ) * cos1 + szyna[ i ].position.y * sin1, - -(-fHTW - szyna[ i ].position.x ) * sin1 + szyna[ i ].position.y * cos1, - szyna[ i ].position.z}, - // normal - {-szyna[ i ].normal.x * cos1 + szyna[ i ].normal.y * sin1, - szyna[ i ].normal.x * sin1 + szyna[ i ].normal.y * cos1, - szyna[ i ].normal.z }, - // texture - { szyna[ i ].texture.x, - szyna[ i ].texture.y } }; - - if( iTrapezoid == 0 ) { continue; } - // trapez albo przechyłki, to oddzielne punkty na końcu - - rpts1[ 12 + i ] = { - // position - {( fHTW + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, - -( fHTW + szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, - szyna[ i ].position.z}, - // normal - { szyna[ i ].normal.x * cos2 + szyna[ i ].normal.y * sin2, - -szyna[ i ].normal.x * sin2 + szyna[ i ].normal.y * cos2, - szyna[ i ].normal.z }, - // texture - { szyna[ i ].texture.x, - szyna[ i ].texture.y } }; - - rpts2[ 23 - i ] = { - // position - {(-fHTW - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, - -(-fHTW - szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, - szyna[ i ].position.z}, - // normal - {-szyna[ i ].normal.x * cos2 + szyna[ i ].normal.y * sin2, - szyna[ i ].normal.x * sin2 + szyna[ i ].normal.y * cos2, - szyna[ i ].normal.z }, - // texture - { szyna[ i ].texture.x, - szyna[ i ].texture.y } }; - } + gfx::vertex_array rpts1, rpts2; + create_rail_profile( rpts1, rpts2 ); switch (eType) // dalej zależnie od typu { case tt_Table: // obrotnica jak zwykły tor, tylko animacja dochodzi case tt_Normal: if (m_material2) { // podsypka z podkładami jest tylko dla zwykłego toru - // potentially retrieve texture length override from the assigned material + gfx::vertex_array bpts1; + create_trackbed_profile( bpts1, trPrev, trNext ); auto const texturelength { texture_length( m_material2 ) }; - gfx::basic_vertex bpts1[ 8 ]; // punkty głównej płaszczyzny nie przydają się do robienia boków - if( texturelength == 4.f ) { - // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy profil - auto const normalx = std::cos( glm::radians( 75.f ) ); - auto const normaly = std::sin( glm::radians( 75.f ) ); - if( iTrapezoid ) { - // trapez albo przechyłki - // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 ((0.3464,0.6536) - // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[ 0 ] = { - {rozp, -fTexHeight1 - 0.18f, 0.f}, - {normalx, normaly, 0.f}, - {0.00f, 0.f} }; // lewy brzeg - bpts1[ 1 ] = { - {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - 0.18f, 0.f}, - {normalx, normaly, 0.f}, - {0.33f, 0.f} }; // krawędź załamania - bpts1[ 2 ] = { - {-bpts1[ 1 ].position.x, +( fHTW + side ) * sin1 - 0.18f, 0.f}, - {-normalx, normaly, 0.f}, - {0.67f, 0.f} }; // prawy brzeg początku symetrycznie - bpts1[ 3 ] = { - {-rozp, -fTexHeight1 - 0.18f, 0.f}, - {-normalx, normaly, 0.f}, - {1.f, 0.f} }; // prawy skos - // końcowy przekrój - bpts1[ 4 ] = { - {rozp2, -fTexHeight2 - 0.18f, 0.f}, - {normalx, normaly, 0.f}, - {0.00f, 0.f} }; // lewy brzeg - bpts1[ 5 ] = { - {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, - {normalx, normaly, 0.f}, - {0.33f, 0.f} }; // krawędź załamania - bpts1[ 6 ] = { - {-bpts1[ 5 ].position.x, +( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, - {-normalx, normaly, 0.f}, - {0.67f, 0.f} }; // prawy brzeg początku symetrycznie - bpts1[ 7 ] = { - {-rozp2, -fTexHeight2 - 0.18f, 0.f}, - {-normalx, normaly, 0.f}, - {1.00f, 0.f} }; // prawy skos - } - else { - bpts1[ 0 ] = { - {rozp, -fTexHeight1 - 0.18f, 0.f}, - {normalx, normaly, 0.f}, - {0.00f, 0.f} }; // lewy brzeg - bpts1[ 1 ] = { - {fHTW + side, -0.18f, 0.f}, - {normalx, normaly, 0.f}, - {0.33f, 0.f} }; // krawędź załamania - bpts1[ 2 ] = { - {-fHTW - side, -0.18f, 0.f}, - {-normalx, normaly, 0.f}, - {0.67f, 0.f} }; // druga - bpts1[ 3 ] = { - {-rozp, -fTexHeight1 - 0.18f, 0.f}, - {-normalx, normaly, 0.f}, - {1.00f, 0.f} }; // prawy skos - } - } - else { - // mapowanie proporcjonalne do powierzchni, rozmiar w poprzek określa fTexLength - auto const max = fTexRatio2 * texturelength; // szerokość proporcjonalna do długości - auto const map11 = max > 0.f ? (fHTW + side) / max : 0.25f; // załamanie od strony 1 - auto const map12 = max > 0.f ? (fHTW + side + hypot1) / max : 0.5f; // brzeg od strony 1 - if (iTrapezoid) { - // trapez albo przechyłki - auto const map21 = max > 0.f ? (fHTW2 + side2) / max : 0.25f; // załamanie od strony 2 - auto const map22 = max > 0.f ? (fHTW2 + side2 + hypot2) / max : 0.5f; // brzeg od strony 2 - // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 - // ((0.3464,0.6536) - // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu - bpts1[ 0 ] = { - {rozp, -fTexHeight1 - 0.18f, 0.f}, - {normal1.x, normal1.y, 0.f}, - {0.5f - map12, 0.f} }; // lewy brzeg - bpts1[ 1 ] = { - {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - 0.18f, 0.f}, - {normal1.x, normal1.y, 0.f}, - {0.5f - map11 , 0.f} }; // krawędź załamania - bpts1[ 2 ] = { - {-bpts1[ 1 ].position.x, +( fHTW + side ) * sin1 - 0.18f, 0.f}, - {-normal1.x, normal1.y, 0.f}, - {0.5 + map11, 0.f} }; // prawy brzeg początku symetrycznie - bpts1[ 3 ] = { - {-rozp, -fTexHeight1 - 0.18f, 0.f}, - {-normal1.x, normal1.y, 0.f}, - {0.5f + map12, 0.f} }; // prawy skos - // przekrój końcowy - bpts1[ 4 ] = { - {rozp2, -fTexHeight2 - 0.18f, 0.f}, - {normal2.x, normal2.y, 0.f}, - {0.5f - map22, 0.f} }; // lewy brzeg - bpts1[ 5 ] = { - {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, - {normal2.x, normal2.y, 0.f}, - {0.5f - map21 , 0.f} }; // krawędź załamania - bpts1[ 6 ] = { - {-bpts1[ 5 ].position.x, +( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, - {-normal2.x, normal2.y, 0.f}, - {0.5f + map21, 0.f} }; // prawy brzeg początku symetrycznie - bpts1[ 7 ] = { - {-rozp2, -fTexHeight2 - 0.18f, 0.f}, - {-normal2.x, normal2.y, 0.f}, - {0.5f + map22, 0.f} }; // prawy skos - } - else - { - bpts1[ 0 ] = { - {rozp, -fTexHeight1 - 0.18f, 0.f}, - {+normal1.x, normal1.y, 0.f}, - {0.5f - map12, 0.f} }; // lewy brzeg - bpts1[ 1 ] = { - {fHTW + side, - 0.18f, 0.f}, - {+normal1.x, normal1.y, 0.f}, - {0.5f - map11, 0.f} }; // krawędź załamania - bpts1[ 2 ] = { - {-fHTW - side, - 0.18f, 0.f}, - {-normal1.x, normal1.y, 0.f}, - {0.5f + map11, 0.f} }; // druga - bpts1[ 3 ] = { - {-rozp, -fTexHeight1 - 0.18f, 0.f}, - {-normal1.x, normal1.y, 0.f}, - {0.5f + map12, 0.f} }; // prawy skos - } - } gfx::vertex_array vertices; Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -4 : 4, texturelength); if( ( Bank != 0 ) && ( true == Geometry2.empty() ) ) { @@ -1418,37 +1182,8 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { case tt_Switch: // dla zwrotnicy dwa razy szyny if( m_material1 || m_material2 ) { // iglice liczone tylko dla zwrotnic - gfx::basic_vertex - rpts3[24], - rpts4[24]; - glm::vec3 const flipxvalue { -1, 1, 1 }; - for( int i = 0; i < 12; ++i ) { - - rpts3[ i ] = { - {+( fHTW + iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, - -( fHTW + iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, - 0.f}, - {iglica[ i ].normal}, - {iglica[ i ].texture.x, 0.f} }; - rpts3[ i + 12 ] = { - {+( fHTW2 + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, - -( fHTW2 + szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, - 0.f}, - {szyna[ i ].normal}, - {szyna[ i ].texture.x, 0.f} }; - rpts4[ 11 - i ] = { - { ( -fHTW - iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, - -( -fHTW - iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, - 0.f}, - {iglica[ i ].normal * flipxvalue}, - {iglica[ i ].texture.x, 0.f} }; - rpts4[ 23 - i ] = { - { ( -fHTW2 - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, - -( -fHTW2 - szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, - 0.f}, - {szyna[ i ].normal * flipxvalue}, - {szyna[ i ].texture.x, 0.f} }; - } + gfx::vertex_array rpts3, rpts4; + create_blade_profile( rpts3, rpts4 ); // TODO, TBD: change all track geometry to triangles, to allow packing data in less, larger buffers auto const bladelength { static_cast( std::ceil( SwitchExtension->Segments[ 0 ]->RaSegCount() * 0.65 ) ) }; if (SwitchExtension->RightSwitch) @@ -1516,6 +1251,14 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { } } } + // auto-generated switch trackbed + if( true == Global.CreateSwitchTrackbeds ) { + gfx::vertex_array vertices; + create_switch_trackbed( vertices ); + SwitchExtension->m_geometry3 = GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ); + vertices.clear(); + } + break; } } // koniec obsługi torów @@ -1525,44 +1268,10 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { { case tt_Normal: // drogi proste, bo skrzyżowania osobno { - gfx::basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków + gfx::vertex_array bpts1; // punkty głównej płaszczyzny przydają się do robienia boków if (m_material1 || m_material2) { // punkty się przydadzą, nawet jeśli nawierzchni nie ma - auto const texturelength { texture_length( m_material1 ) }; - auto const max = fTexRatio1 * texturelength; // test: szerokość proporcjonalna do długości - auto const map1 = max > 0.f ? fHTW / max : 0.5f; // obcięcie tekstury od strony 1 - auto const map2 = max > 0.f ? fHTW2 / max : 0.5f; // obcięcie tekstury od strony 2 - if (iTrapezoid) { - // trapez albo przechyłki - Segment->GetRolls(roll1, roll2); - bpts1[ 0 ] = { - {fHTW * std::cos( roll1 ), -fHTW * std::sin( roll1 ), 0.f}, - normalup, - {0.5f - map1, 0.f} }; // lewy brzeg początku - bpts1[ 1 ] = { - {-bpts1[ 0 ].position.x, -bpts1[ 0 ].position.y, 0.f}, - normalup, - {0.5f + map1, 0.f} }; // prawy brzeg początku symetrycznie - bpts1[ 2 ] = { - {fHTW2 * std::cos( roll2 ), -fHTW2 * std::sin( roll2 ), 0.f}, - normalup, - {0.5f - map2, 0.f} }; // lewy brzeg końca - bpts1[ 3 ] = { - {-bpts1[ 2 ].position.x, -bpts1[ 2 ].position.y, 0.f}, - normalup, - {0.5f + map2, 0.f} }; // prawy brzeg początku symetrycznie - } - else - { - bpts1[ 0 ] = { - {fHTW, 0.f, 0.f}, - normalup, - {0.5f - map1, 0.f} }; - bpts1[ 1 ] = { - {-fHTW, 0.f, 0.f}, - normalup, - {0.5f + map1, 0.f} }; - } + create_road_profile( bpts1 ); } if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy @@ -1573,161 +1282,11 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { } if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) + auto const side{ std::abs( fTexWidth ) }; // szerokść podsypki na zewnątrz szyny albo pobocza + auto const slop{ std::abs( fTexSlope ) }; // brzeg zewnętrzny auto const texturelength { texture_length( m_material2 ) }; - gfx::basic_vertex - rpts1[6], - rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony - if (fTexHeight1 >= 0.f) - { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo - rpts1[ 0 ] = { - {rozp, -fTexHeight1, 0.f}, - { 1.f, 0.f, 0.f }, - {0.f, 0.f} }; // lewy brzeg podstawy - rpts1[ 1 ] = { - {bpts1[ 0 ].position.x + side, bpts1[ 0 ].position.y, 0.f}, - normalup, - {0.5, 0.f} }; // lewa krawędź załamania - rpts1[ 2 ] = { - {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, - normalup, - {1.f, 0.f} }; // lewy brzeg pobocza (mapowanie może być inne - rpts2[ 0 ] = { - {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, - normalup, - {1.f, 0.f} }; // prawy brzeg pobocza - rpts2[ 1 ] = { - {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; // prawa krawędź załamania - rpts2[ 2 ] = { - {-rozp, -fTexHeight1, 0.f}, - { -1.f, 0.f, 0.f }, - {0.f, 0.f} }; // prawy brzeg podstawy - if (iTrapezoid) { - // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - rpts1[ 3 ] = { - {rozp2, -fTexHeight2, 0.f}, - { 1.f, 0.f, 0.f }, - {0.f, 0.f} }; // lewy brzeg lewego pobocza - rpts1[ 4 ] = { - {bpts1[ 2 ].position.x + side2, bpts1[ 2 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; // krawędź załamania - rpts1[ 5 ] = { - {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, - normalup, - {1.f, 0.f} }; // brzeg pobocza - rpts2[ 3 ] = { - {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, - normalup, - {1.f, 0.f} }; - rpts2[ 4 ] = { - {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; - rpts2[ 5 ] = { - {-rozp2, -fTexHeight2, 0.f}, - { -1.f, 0.f, 0.f }, - {0.f, 0.f} }; // prawy brzeg prawego pobocza - } - } - else - { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości - // mapowanie propocjonalne do szerokości chodnika - // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy - auto const d = -fTexHeight1 / 3.75f; // krawężnik o wysokości 150mm jest pochylony 40mm - auto const max = fTexRatio2 * texturelength; // test: szerokość proporcjonalna do długości - auto const map1l = ( - max > 0.f ? - side / max : - 0.484375f ); // obcięcie tekstury od lewej strony punktu 1 - auto const map1r = ( - max > 0.f ? - slop / max : - 0.484375f ); // obcięcie tekstury od prawej strony punktu 1 - auto const h1r = ( - slop > d ? - -fTexHeight1 : - 0.f ); - auto const h1l = ( - side > d ? - -fTexHeight1 : - 0.f ); - - rpts1[ 0 ] = { - {bpts1[ 0 ].position.x + slop, bpts1[ 0 ].position.y + h1r, 0.f}, - normalup, - {0.515625f + map1r, 0.f} }; // prawy brzeg prawego chodnika - rpts1[ 1 ] = { - {bpts1[ 0 ].position.x + d, bpts1[ 0 ].position.y + h1r, 0.f}, - normalup, - {0.515625f, 0.f} }; // prawy krawężnik u góry - rpts1[ 2 ] = { - {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, - { -1.f, 0.f, 0.f }, - {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu - rpts2[ 0 ] = { - {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, - { 1.f, 0.f, 0.f }, - {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu - rpts2[ 1 ] = { - {bpts1[ 1 ].position.x - d, bpts1[ 1 ].position.y + h1l, 0.f}, - normalup, - {0.484375f, 0.f} }; // lewy krawężnik u góry - rpts2[ 2 ] = { - {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y + h1l, 0.f}, - normalup, - {0.484375f - map1l, 0.f} }; // lewy brzeg lewego chodnika - - if (iTrapezoid) { - // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - slop2 = ( - std::fabs((iTrapezoid & 2) ? - slop2 : - slop) ); // szerokość chodnika po prawej - auto const map2l = ( - max > 0.f ? - side2 / max : - 0.484375f ); // obcięcie tekstury od lewej strony punktu 2 - auto const map2r = ( - max > 0.f ? - slop2 / max : - 0.484375f ); // obcięcie tekstury od prawej strony punktu 2 - auto const h2r = ( - slop2 > d ? - -fTexHeight2 : - 0.f ); - auto const h2l = ( - side2 > d ? - -fTexHeight2 : - 0.f ); - - rpts1[ 3 ] = { - {bpts1[ 2 ].position.x + slop2, bpts1[ 2 ].position.y + h2r, 0.f}, - normalup, - {0.515625f + map2r, 0.f} }; // prawy brzeg prawego chodnika - rpts1[ 4 ] = { - {bpts1[ 2 ].position.x + d, bpts1[ 2 ].position.y + h2r, 0.f}, - normalup, - {0.515625f, 0.f} }; // prawy krawężnik u góry - rpts1[ 5 ] = { - {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, - { -1.f, 0.f, 0.f }, - {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu - rpts2[ 3 ] = { - {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, - { 1.f, 0.f, 0.f }, - {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu - rpts2[ 4 ] = { - {bpts1[ 3 ].position.x - d, bpts1[ 3 ].position.y + h2l, 0.f}, - normalup, - {0.484375f, 0.f} }; // lewy krawężnik u góry - rpts2[ 5 ] = { - {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y + h2l, 0.f}, - normalup, - {0.484375f - map2l, 0.f} }; // lewy brzeg lewego chodnika - } - } + gfx::vertex_array rpts1, rpts2; // współrzędne przekroju i mapowania dla prawej i lewej strony + create_sidewalk_profile( rpts1, rpts2, bpts1 ); gfx::vertex_array vertices; if( iTrapezoid ) // trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony @@ -1807,33 +1366,9 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { SwitchExtension->bPoints ? nullptr : SwitchExtension->vPoints; // zmienna robocza, NULL gdy tablica punktów już jest wypełniona - gfx::basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma - { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% - auto const texturelength { texture_length( m_material1 ) }; - auto const max = fTexRatio1 * texturelength; // test: szerokość proporcjonalna do długości - auto const map1 = max > 0.f ? fHTW / max : 0.5f; // obcięcie tekstury od strony 1 - auto const map2 = max > 0.f ? fHTW2 / max : 0.5f; // obcięcie tekstury od strony 2 - // if (iTrapezoid) //trapez albo przechyłki - { // nawierzchnia trapezowata - Segment->GetRolls(roll1, roll2); - bpts1[ 0 ] = { - {fHTW * std::cos( roll1 ), -fHTW * std::sin( roll1 ), 0.f}, - {std::sin( roll1 ), std::cos( roll1 ), 0.f}, - {0.5f - map1, 0.f} }; // lewy brzeg początku - bpts1[ 1 ] = { - {-bpts1[ 0 ].position.x, -bpts1[ 0 ].position.y, 0.f}, - {-std::sin( roll1 ), std::cos( roll1 ), 0.f}, - {0.5f + map1, 0.f} }; // prawy brzeg początku symetrycznie - bpts1[ 2 ] = { - {fHTW2 * std::cos( roll2 ), -fHTW2 * std::sin( roll2 ), 0.f}, - {std::sin( roll2 ), std::cos( roll2 ), 0.f}, - {0.5f - map2, 0.f} }; // lewy brzeg końca - bpts1[ 3 ] = { - {-bpts1[ 2 ].position.x, -bpts1[ 2 ].position.y, 0.f}, - {-std::sin( roll2 ), std::cos( roll2 ), 0.f}, - {0.5 + map2, 0.f} }; // prawy brzeg początku symetrycznie - } + gfx::vertex_array bpts1; // punkty głównej płaszczyzny przydają się do robienia boków + if (m_material1 || m_material2) { // punkty się przydadzą, nawet jeśli nawierzchni nie ma + create_road_profile( bpts1, true ); } // najpierw renderowanie poboczy i zapamiętywanie punktów // problem ze skrzyżowaniami jest taki, że teren chce się pogrupować wg tekstur, ale zaczyna od nawierzchni @@ -1841,146 +1376,12 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { // ale pobocza renderują się później, więc nawierzchnia nie załapuje się na renderowanie w swoim czasie if( m_material2 ) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) - auto const texturelength { texture_length( m_material2 ) }; - gfx::basic_vertex - rpts1[6], - rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony + gfx::vertex_array rpts1, rpts2; // współrzędne przekroju i mapowania dla prawej i lewej strony + create_sidewalk_profile( rpts1, rpts2, bpts1, true ); // Ra 2014-07: trzeba to przerobić na pętlę i pobierać profile (przynajmniej 2..4) z sąsiednich dróg - if (fTexHeight1 >= 0.0) - { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo - rpts1[ 0 ] = { - {rozp, -fTexHeight1, 0.f}, - { 1.f, 0.f, 0.f }, - {0.f, 0.f} }; // lewy brzeg podstawy - rpts1[ 1 ] = { - {bpts1[ 0 ].position.x + side, bpts1[ 0 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} };// lewa krawędź załamania - rpts1[ 2 ] = { - {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, - normalup, - {1.f, 0.f} }; // lewy brzeg pobocza (mapowanie może być inne - rpts2[ 0 ] = { - {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, - normalup, - {1.f, 0.f} }; // prawy brzeg pobocza - rpts2[ 1 ] = { - {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; // prawa krawędź załamania - rpts2[ 2 ] = { - {-rozp, -fTexHeight1, 0.f}, - { -1.f, 0.f, 0.f }, - {0.f, 0.f} }; // prawy brzeg podstawy - // if (iTrapezoid) //trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - rpts1[ 3 ] = { - {rozp2, -fTexHeight2, 0.f}, - { 1.f, 0.f, 0.f }, - {0.f, 0.f} }; // lewy brzeg lewego pobocza - rpts1[ 4 ] = { - {bpts1[ 2 ].position.x + side2, bpts1[ 2 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; // krawędź załamania - rpts1[ 5 ] = { - {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, - normalup, - {1.f, 0.f} }; // brzeg pobocza - rpts2[ 3 ] = { - {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, - normalup, - {1.f, 0.f} }; - rpts2[ 4 ] = { - {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; - rpts2[ 5 ] = { - {-rozp2, -fTexHeight2, 0.f}, - { -1.f, 0.f, 0.f }, - {0.f, 0.f} }; // prawy brzeg prawego pobocza - } - } - else - { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości - // mapowanie propocjonalne do szerokości chodnika - // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy - auto const d = -fTexHeight1 / 3.75f; // krawężnik o wysokości 150mm jest pochylony 40mm - auto const max = fTexRatio2 * texturelength; // test: szerokość proporcjonalna do długości - auto const map1l = ( - max > 0.f ? - side / max : - 0.484375f ); // obcięcie tekstury od lewej strony punktu 1 - auto const map1r = ( - max > 0.f ? - slop / max : - 0.484375f ); // obcięcie tekstury od prawej strony punktu 1 - - rpts1[ 0 ] = { - {bpts1[ 0 ].position.x + slop, bpts1[ 0 ].position.y - fTexHeight1, 0.f}, - normalup, - { 0.515625f + map1r, 0.f} }; // prawy brzeg prawego chodnika - rpts1[ 1 ] = { - {bpts1[ 0 ].position.x + d, bpts1[ 0 ].position.y - fTexHeight1, 0.f}, - normalup, - {0.515625f, 0.f} }; // prawy krawężnik u góry - rpts1[ 2 ] = { - {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, - { -1.f, 0.f, 0.f }, - {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu - rpts2[ 0 ] = { - {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, - { 1.f, 0.f, 0.f }, - {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu - rpts2[ 1 ] = { - {bpts1[ 1 ].position.x - d, bpts1[ 1 ].position.y - fTexHeight1, 0.f}, - normalup, - {0.484375f, 0.f} }; // lewy krawężnik u góry - rpts2[ 2 ] = { - {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y - fTexHeight1, 0.f}, - normalup, - {0.484375f - map1l, 0.f} }; // lewy brzeg lewego chodnika - // if (iTrapezoid) //trapez albo przechyłki - { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - slop2 = std::abs( - ( (iTrapezoid & 2) ? - slop2 : - slop ) ); // szerokość chodnika po prawej - auto const map2l = ( - max > 0.f ? - side2 / max : - 0.484375f ); // obcięcie tekstury od lewej strony punktu 2 - auto const map2r = ( - max > 0.f ? - slop2 / max : - 0.484375f ); // obcięcie tekstury od prawej strony punktu 2 - - rpts1[ 3 ] = { - {bpts1[ 2 ].position.x + slop2, bpts1[ 2 ].position.y - fTexHeight2, 0.f}, - normalup, - { 0.515625f + map2r, 0.f} }; // prawy brzeg prawego chodnika - rpts1[ 4 ] = { - {bpts1[ 2 ].position.x + d, bpts1[ 2 ].position.y - fTexHeight2, 0.f}, - normalup, - {0.515625f, 0.f} }; // prawy krawężnik u góry - rpts1[ 5 ] = { - {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, - { -1.f, 0.f, 0.f }, - {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu - rpts2[ 3 ] = { - {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, - { 1.f, 0.f, 0.f }, - {0.484375f + d / 2.56, 0.f} }; // lewy krawężnik u dołu - rpts2[ 4 ] = { - {bpts1[ 3 ].position.x - d, bpts1[ 3 ].position.y - fTexHeight2, 0.f}, - normalup, - {0.484375f, 0.f} }; // lewy krawężnik u góry - rpts2[ 5 ] = { - {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y - fTexHeight2, 0.f}, - normalup, - {0.484375f - map2l, 0.f} }; // lewy brzeg lewego chodnika - } - } bool render = ( m_material2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni + auto const side{ std::abs( fTexWidth ) }; // szerokść podsypki na zewnątrz szyny albo pobocza + auto const texturelength{ texture_length( m_material2 ) }; gfx::vertex_array vertices; if (SwitchExtension->iRoads == 4) { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka @@ -2088,53 +1489,9 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { { case tt_Normal: // drogi proste, bo skrzyżowania osobno { - gfx::basic_vertex bpts1[4]; // punkty głównej płaszczyzny przydają się do robienia boków - if (m_material1 || m_material2) // punkty się przydadzą, nawet jeśli nawierzchni nie ma - { // double max=2.0*(fHTW>fHTW2?fHTW:fHTW2); //z szerszej strony jest 100% - auto const max = ( - ( iCategoryFlag & 4 ) ? - 0.f : - fTexLength ); // test: szerokość dróg proporcjonalna do długości - auto const map1 = ( - max > 0.f ? - fHTW / max : - 0.5f ); // obcięcie tekstury od strony 1 - auto const map2 = ( - max > 0.f ? - fHTW2 / max : - 0.5f ); // obcięcie tekstury od strony 2 - - if (iTrapezoid) { - // nawierzchnia trapezowata - Segment->GetRolls(roll1, roll2); - bpts1[ 0 ] = { - {fHTW * std::cos( roll1 ), -fHTW * std::sin( roll1 ), 0.f}, - normalup, - {0.5f - map1, 0.f} }; // lewy brzeg początku - bpts1[ 1 ] = { - {-bpts1[ 0 ].position.x, -bpts1[ 0 ].position.y, 0.f}, - normalup, - {0.5f + map1, 0.f} }; // prawy brzeg początku symetrycznie - bpts1[ 2 ] = { - {fHTW2 * std::cos( roll2 ), -fHTW2 * std::sin( roll2 ), 0.f}, - normalup, - {0.5f - map2, 0.f} }; // lewy brzeg końca - bpts1[ 3 ] = { - {-bpts1[ 2 ].position.x, -bpts1[ 2 ].position.y, 0.f}, - normalup, - {0.5f + map2, 0.f} }; // prawy brzeg początku symetrycznie - } - else - { - bpts1[ 0 ] = { - {fHTW, 0.f, 0.f}, - normalup, - {0.5 - map1, 0.f} }; // zawsze standardowe mapowanie - bpts1[ 1 ] = { - {-fHTW, 0.f, 0.f}, - normalup, - {0.5f + map1, 0.f} }; - } + gfx::vertex_array bpts1; // punkty głównej płaszczyzny przydają się do robienia boków + if (m_material1 || m_material2) { // punkty się przydadzą, nawet jeśli nawierzchni nie ma + create_road_profile( bpts1 ); } if (m_material1) // jeśli podana była tekstura, generujemy trójkąty { // tworzenie trójkątów nawierzchni szosy @@ -2144,61 +1501,11 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { } if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) + gfx::vertex_array rpts1, rpts2; // współrzędne przekroju i mapowania dla prawej i lewej strony + create_sidewalk_profile( rpts1, rpts2, bpts1 ); gfx::vertex_array vertices; - gfx::basic_vertex - rpts1[6], - rpts2[6]; // współrzędne przekroju i mapowania dla prawej i lewej strony - - rpts1[ 0 ] = { - {rozp, -fTexHeight1, 0.f}, - normalup, - {0.0f, 0.f} }; // lewy brzeg podstawy - rpts1[ 1 ] = { - {bpts1[ 0 ].position.x + side, bpts1[ 0 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; // lewa krawędź załamania - rpts1[ 2 ] = { - {bpts1[ 0 ].position.x, bpts1[ 0 ].position.y, 0.f}, - normalup, - {1.0f, 0.f} }; // lewy brzeg pobocza (mapowanie może być inne - rpts2[ 0 ] = { - {bpts1[ 1 ].position.x, bpts1[ 1 ].position.y, 0.f}, - normalup, - {1.0f, 0.f} }; // prawy brzeg pobocza - rpts2[ 1 ] = { - {bpts1[ 1 ].position.x - side, bpts1[ 1 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; // prawa krawędź załamania - rpts2[ 2 ] = { - {-rozp, -fTexHeight1, 0.f}, - normalup, - {0.0f, 0.f} }; // prawy brzeg podstawy if (iTrapezoid) // trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka - rpts1[ 3 ] = { - {rozp2, -fTexHeight2, 0.f}, - normalup, - {0.0f, 0.f} }; // lewy brzeg lewego pobocza - rpts1[ 4 ] = { - {bpts1[ 2 ].position.x + side2, bpts1[ 2 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; // krawędź załamania - rpts1[ 5 ] = { - {bpts1[ 2 ].position.x, bpts1[ 2 ].position.y, 0.f}, - normalup, - {1.0f, 0.f} }; // brzeg pobocza - rpts2[ 3 ] = { - {bpts1[ 3 ].position.x, bpts1[ 3 ].position.y, 0.f}, - normalup, - {1.0f, 0.f} }; - rpts2[ 4 ] = { - {bpts1[ 3 ].position.x - side2, bpts1[ 3 ].position.y, 0.f}, - normalup, - {0.5f, 0.f} }; - rpts2[ 5 ] = { - {-rozp2, -fTexHeight2, 0.f}, - normalup, - {0.0f, 0.f} }; // prawy brzeg prawego pobocza Segment->RenderLoft(vertices, m_origin, rpts1, -3, fTexLength); Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); vertices.clear(); @@ -2476,42 +1783,8 @@ TTrack * TTrack::RaAnimate() && ( ( false == Geometry1.empty() ) || ( false == Geometry2.empty() ) ) ) { // iglice liczone tylko dla zwrotnic - auto const fHTW = 0.5f * std::abs( fTrackWidth ); - auto const fHTW2 = fHTW; // Ra: na razie niech tak będzie - auto const cos1 = 1.0f, sin1 = 0.0f, cos2 = 1.0f, sin2 = 0.0f; // Ra: ... - - gfx::basic_vertex - rpts3[ 24 ], - rpts4[ 24 ]; - glm::vec3 const flipxvalue { -1, 1, 1 }; - for (int i = 0; i < 12; ++i) { - - rpts3[ i ] = { - {+( fHTW + iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, - -( fHTW + iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, - 0.f}, - {iglica[ i ].normal}, - {iglica[ i ].texture.x, 0.f} }; - rpts3[ i + 12 ] = { - {+( fHTW2 + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, - -( fHTW2 + szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, - 0.f}, - {szyna[ i ].normal}, - {szyna[ i ].texture.x, 0.f} }; - rpts4[ 11 - i ] = { - {+( -fHTW - iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, - -( -fHTW - iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, - 0.f}, - {iglica[ i ].normal * flipxvalue}, - {iglica[ i ].texture.x, 0.f} }; - rpts4[ 23 - i ] = { - { ( -fHTW2 - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, - -( -fHTW2 - szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, - 0.f}, - {szyna[ i ].normal * flipxvalue}, - {szyna[ i ].texture.x, 0.f} }; - } - + gfx::vertex_array rpts3, rpts4; + create_blade_profile( rpts3, rpts4 ); gfx::vertex_array vertices; auto const bladelength { static_cast( std::ceil( SwitchExtension->Segments[ 0 ]->RaSegCount() * 0.65 ) ) }; if (SwitchExtension->RightSwitch) @@ -2944,6 +2217,21 @@ void TTrack::ConnectionsLog() } }; +bool +TTrack::DoubleSlip() const { + + // crude way to discern part of double slip switch: + // a switch with name ending in _a or _b or _c or _d + return ( + ( iCategoryFlag == 1 ) + && ( eType == tt_Switch ) + && ( m_name.size() > 2 ) + && ( m_name[ m_name.size() - 2 ] == '_' ) + && ( m_name.back() >= 'a' ) + && ( m_name.back() <= 'd' ) ); +} + + TTrack * TTrack::Connected(int s, double &d) const { // zwraca wskaźnik na sąsiedni tor, w kierunku określonym znakiem (s), odwraca (d) w razie // niezgodności kierunku torów @@ -2994,6 +2282,705 @@ TTrack * TTrack::Connected(int s, double &d) const return NULL; }; +// creates rail profile data for current track +void +TTrack::create_rail_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ) { + + auto const fHTW { 0.5f * std::abs( fTrackWidth ) }; + + float + roll1{ 0.f }, + roll2{ 0.f }; + + if( Segment ) { + Segment->GetRolls( roll1, roll2 ); + } + + float const + sin1 { std::sin( roll1 ) }, + cos1 { std::cos( roll1 ) }, + sin2 { std::sin( roll2 ) }, + cos2 { std::cos( roll2 ) }; + + auto const pointcount { iTrapezoid == 0 ? 12 : 24 }; + Right.resize( pointcount ); + Left.resize( pointcount ); + + for( int i = 0; i < 12; ++i ) { + + Right[ i ] = { + // position + {( fHTW + szyna[ i ].position.x ) * cos1 + szyna[ i ].position.y * sin1, + -( fHTW + szyna[ i ].position.x ) * sin1 + szyna[ i ].position.y * cos1, + szyna[ i ].position.z}, + // normal + { szyna[ i ].normal.x * cos1 + szyna[ i ].normal.y * sin1, + -szyna[ i ].normal.x * sin1 + szyna[ i ].normal.y * cos1, + szyna[ i ].normal.z }, + // texture + { szyna[ i ].texture.x, + szyna[ i ].texture.y } }; + + Left[ 11 - i ] = { + // position + {(-fHTW - szyna[ i ].position.x ) * cos1 + szyna[ i ].position.y * sin1, + -(-fHTW - szyna[ i ].position.x ) * sin1 + szyna[ i ].position.y * cos1, + szyna[ i ].position.z}, + // normal + {-szyna[ i ].normal.x * cos1 + szyna[ i ].normal.y * sin1, + szyna[ i ].normal.x * sin1 + szyna[ i ].normal.y * cos1, + szyna[ i ].normal.z }, + // texture + { szyna[ i ].texture.x, + szyna[ i ].texture.y } }; + + if( iTrapezoid == 0 ) { continue; } + // trapez albo przechyłki, to oddzielne punkty na końcu + + Right[ 12 + i ] = { + // position + {( fHTW + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -( fHTW + szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, + szyna[ i ].position.z}, + // normal + { szyna[ i ].normal.x * cos2 + szyna[ i ].normal.y * sin2, + -szyna[ i ].normal.x * sin2 + szyna[ i ].normal.y * cos2, + szyna[ i ].normal.z }, + // texture + { szyna[ i ].texture.x, + szyna[ i ].texture.y } }; + + Left[ 23 - i ] = { + // position + {(-fHTW - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -(-fHTW - szyna[ i ].position.x ) * sin2 + szyna[ i ].position.y * cos2, + szyna[ i ].position.z}, + // normal + {-szyna[ i ].normal.x * cos2 + szyna[ i ].normal.y * sin2, + szyna[ i ].normal.x * sin2 + szyna[ i ].normal.y * cos2, + szyna[ i ].normal.z }, + // texture + { szyna[ i ].texture.x, + szyna[ i ].texture.y } }; + } +} + +// creates switch blades profile data for current track +void +TTrack::create_blade_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ) { + + auto const fHTW { 0.5f * std::abs( fTrackWidth ) }; + float const fHTW2 { ( + ( iTrapezoid & 2 ) != 0 ? // ten bit oznacza, że istnieje odpowiednie pNext + 0.5f * std::fabs( trNext->fTrackWidth ) : // połowa rozstawu/nawierzchni + fHTW ) }; + + float + roll1 { 0.f }, + roll2 { 0.f }; + + if( Segment ) { + Segment->GetRolls( roll1, roll2 ); + } + + float const + sin1 { std::sin( roll1 ) }, + cos1 { std::cos( roll1 ) }, + sin2 { std::sin( roll2 ) }, + cos2 { std::cos( roll2 ) }; + + auto const pointcount { 24 }; + Right.resize( pointcount ); + Left.resize( pointcount ); + + glm::vec3 const flipxvalue { -1, 1, 1 }; + for( int i = 0; i < 12; ++i ) { + + Right[ i ] = { + {+( fHTW + iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, + -( fHTW + iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, + 0.f}, + {iglica[ i ].normal}, + {iglica[ i ].texture.x, 0.f} }; + Right[ i + 12 ] = { + {+( fHTW2 + szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -( fHTW2 + szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, + 0.f}, + {szyna[ i ].normal}, + {szyna[ i ].texture.x, 0.f} }; + Left[ 11 - i ] = { + { ( -fHTW - iglica[ i ].position.x ) * cos1 + iglica[ i ].position.y * sin1, + -( -fHTW - iglica[ i ].position.x ) * sin1 + iglica[ i ].position.y * cos1, + 0.f}, + {iglica[ i ].normal * flipxvalue}, + {iglica[ i ].texture.x, 0.f} }; + Left[ 23 - i ] = { + { ( -fHTW2 - szyna[ i ].position.x ) * cos2 + szyna[ i ].position.y * sin2, + -( -fHTW2 - szyna[ i ].position.x ) * sin2 + iglica[ i ].position.y * cos2, + 0.f}, + {szyna[ i ].normal * flipxvalue}, + {szyna[ i ].texture.x, 0.f} }; + } +} + +// creates trackbed profile data for current track +void +TTrack::create_trackbed_profile( gfx::vertex_array &Output, TTrack const *Previous, TTrack const *Next ) { + // geometry parameters + auto * profilesource = ( + eType != tt_Switch ? this : + Previous && Previous->eType != tt_Switch ? Previous : + Next && Next->eType != tt_Switch ? Next : + this ); + + auto const texheight1 { profilesource->fTexHeight1 }; + auto const texwidth { profilesource->fTexWidth }; + auto const texslope { profilesource->fTexSlope }; + + auto const fHTW { 0.5f * std::abs( fTrackWidth ) }; + auto const side { std::abs( texwidth ) }; // szerokść podsypki na zewnątrz szyny albo pobocza + auto const slop { std::abs( texslope ) }; // brzeg zewnętrzny + auto const rozp { fHTW + side + slop }; // brzeg zewnętrzny + + auto hypot1 { std::hypot( slop, texheight1 ) }; // rozmiar pochylenia do liczenia normalnych + if( hypot1 == 0.f ) + hypot1 = 1.f; + + glm::vec3 normal1 { texheight1 / hypot1, texslope / hypot1, 0.f }; // wektor normalny + if( glm::length( normal1 ) == 0.f ) { + // fix normal for vertical surfaces + normal1 = glm::vec3 { 1.f, 0.f, 0.f }; + } + + glm::vec3 normal2; + float fHTW2, side2, slop2, rozp2, fTexHeight2, hypot2; + if( ( Next != nullptr ) + && ( Next->eType != tt_Switch ) + && ( ( iTrapezoid & 2 ) // ten bit oznacza, że istnieje odpowiednie pNext + || ( eType == tt_Switch ) ) ) { + fHTW2 = 0.5f * std::abs(Next->fTrackWidth); // połowa rozstawu/nawierzchni + side2 = std::abs(Next->fTexWidth); + slop2 = std::abs(Next->fTexSlope); // nie jest używane później + rozp2 = fHTW2 + side2 + slop2; + fTexHeight2 = Next->fTexHeight1; + hypot2 = std::hypot(slop2, fTexHeight2); + if( hypot2 == 0.f ) + hypot2 = 1.f; + normal2 = { fTexHeight2 / hypot2, Next->fTexSlope / hypot2, 0.f }; + if( glm::length( normal2 ) == 0.f ) { + // fix normal for vertical surfaces + normal2 = glm::vec3 { 1.f, 0.f, 0.f }; + } + } + else { + // gdy nie ma następnego albo jest nieodpowiednim końcem podpięty + fHTW2 = fHTW; + side2 = side; + slop2 = slop; + rozp2 = rozp; + fTexHeight2 = texheight1; + hypot2 = hypot1; + normal2 = normal1; + } + + float + roll1{ 0.f }, + roll2{ 0.f }; + + if( Segment ) { + Segment->GetRolls( roll1, roll2 ); + } + + float const + sin1 { std::sin( roll1 ) }, + cos1 { std::cos( roll1 ) }, + sin2 { std::sin( roll2 ) }, + cos2 { std::cos( roll2 ) }; + + // profile + auto const transition { ( iTrapezoid != 0 ) || ( eType == tt_Switch ) }; + auto const pointcount { transition ? 8 : 4 }; + Output.resize( pointcount ); + // potentially retrieve texture length override from the assigned material + auto const texturelength { texture_length( profilesource->m_material2 ) }; + if( texturelength == 4.f ) { + // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy profil + auto const normalx = std::cos( glm::radians( 75.f ) ); + auto const normaly = std::sin( glm::radians( 75.f ) ); + if( transition ) { + // trapez albo przechyłki + // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 ((0.3464,0.6536) + // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu + Output[ 0 ] = { + {rozp, -texheight1 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.00f, 0.f} }; // lewy brzeg + Output[ 1 ] = { + {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.33f, 0.f} }; // krawędź załamania + Output[ 2 ] = { + {-Output[ 1 ].position.x, +( fHTW + side ) * sin1 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {0.67f, 0.f} }; // prawy brzeg początku symetrycznie + Output[ 3 ] = { + {-rozp, -texheight1 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {1.f, 0.f} }; // prawy skos + // końcowy przekrój + Output[ 4 ] = { + {rozp2, -fTexHeight2 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.00f, 0.f} }; // lewy brzeg + Output[ 5 ] = { + {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.33f, 0.f} }; // krawędź załamania + Output[ 6 ] = { + {-Output[ 5 ].position.x, +( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {0.67f, 0.f} }; // prawy brzeg początku symetrycznie + Output[ 7 ] = { + {-rozp2, -fTexHeight2 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {1.00f, 0.f} }; // prawy skos + } + else { + Output[ 0 ] = { + {rozp, -texheight1 - 0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.00f, 0.f} }; // lewy brzeg + Output[ 1 ] = { + {fHTW + side, -0.18f, 0.f}, + {normalx, normaly, 0.f}, + {0.33f, 0.f} }; // krawędź załamania + Output[ 2 ] = { + {-fHTW - side, -0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {0.67f, 0.f} }; // druga + Output[ 3 ] = { + {-rozp, -texheight1 - 0.18f, 0.f}, + {-normalx, normaly, 0.f}, + {1.00f, 0.f} }; // prawy skos + } + } + else { + // mapowanie proporcjonalne do powierzchni, rozmiar w poprzek określa fTexLength + auto const max = fTexRatio2 * texturelength; // szerokość proporcjonalna do długości + auto const map11 = max > 0.f ? (fHTW + side) / max : 0.25f; // załamanie od strony 1 + auto const map12 = max > 0.f ? (fHTW + side + hypot1) / max : 0.5f; // brzeg od strony 1 + if (transition) { + // trapez albo przechyłki + auto const map21 = max > 0.f ? (fHTW2 + side2) / max : 0.25f; // załamanie od strony 2 + auto const map22 = max > 0.f ? (fHTW2 + side2 + hypot2) / max : 0.5f; // brzeg od strony 2 + // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 + // ((0.3464,0.6536) + // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu + Output[ 0 ] = { + {rozp, -texheight1 - 0.18f, 0.f}, + {normal1.x, normal1.y, 0.f}, + {0.5f - map12, 0.f} }; // lewy brzeg + Output[ 1 ] = { + {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - 0.18f, 0.f}, + {normal1.x, normal1.y, 0.f}, + {0.5f - map11 , 0.f} }; // krawędź załamania + Output[ 2 ] = { + {-Output[ 1 ].position.x, +( fHTW + side ) * sin1 - 0.18f, 0.f}, + {-normal1.x, normal1.y, 0.f}, + {0.5 + map11, 0.f} }; // prawy brzeg początku symetrycznie + Output[ 3 ] = { + {-rozp, -texheight1 - 0.18f, 0.f}, + {-normal1.x, normal1.y, 0.f}, + {0.5f + map12, 0.f} }; // prawy skos + // przekrój końcowy + Output[ 4 ] = { + {rozp2, -fTexHeight2 - 0.18f, 0.f}, + {normal2.x, normal2.y, 0.f}, + {0.5f - map22, 0.f} }; // lewy brzeg + Output[ 5 ] = { + {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + {normal2.x, normal2.y, 0.f}, + {0.5f - map21 , 0.f} }; // krawędź załamania + Output[ 6 ] = { + {-Output[ 5 ].position.x, +( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + {-normal2.x, normal2.y, 0.f}, + {0.5f + map21, 0.f} }; // prawy brzeg początku symetrycznie + Output[ 7 ] = { + {-rozp2, -fTexHeight2 - 0.18f, 0.f}, + {-normal2.x, normal2.y, 0.f}, + {0.5f + map22, 0.f} }; // prawy skos + } + else + { + Output[ 0 ] = { + {rozp, -texheight1 - 0.18f, 0.f}, + {+normal1.x, normal1.y, 0.f}, + {0.5f - map12, 0.f} }; // lewy brzeg + Output[ 1 ] = { + {fHTW + side, - 0.18f, 0.f}, + {+normal1.x, normal1.y, 0.f}, + {0.5f - map11, 0.f} }; // krawędź załamania + Output[ 2 ] = { + {-fHTW - side, - 0.18f, 0.f}, + {-normal1.x, normal1.y, 0.f}, + {0.5f + map11, 0.f} }; // druga + Output[ 3 ] = { + {-rozp, -texheight1 - 0.18f, 0.f}, + {-normal1.x, normal1.y, 0.f}, + {0.5f + map12, 0.f} }; // prawy skos + } + } +} + +// creates road profile data for current path +void +TTrack::create_road_profile( gfx::vertex_array &Output, bool const Forcetransition ) { + + auto const fHTW { 0.5f * std::abs( fTrackWidth ) }; + float const fHTW2 { ( + ( iTrapezoid & 2 ) != 0 ? // ten bit oznacza, że istnieje odpowiednie pNext + 0.5f * std::fabs( trNext->fTrackWidth ) : // połowa rozstawu/nawierzchni + fHTW ) }; + + glm::vec3 const normalup { 0.f, 1.f, 0.f }; + + auto const texturelength { texture_length( m_material1 ) }; + auto const max = fTexRatio1 * texturelength; // test: szerokość proporcjonalna do długości + auto const map1 = max > 0.f ? fHTW / max : 0.5f; // obcięcie tekstury od strony 1 + auto const map2 = max > 0.f ? fHTW2 / max : 0.5f; // obcięcie tekstury od strony 2 + + auto const transition { ( true == Forcetransition ) || ( iTrapezoid != 0 ) }; + + auto const pointcount{ transition ? 4 : 2 }; + Output.resize( pointcount ); + + if( transition ) { + // trapez albo przechyłki + float + roll1 { 0.f }, + roll2 { 0.f }; + + if( Segment ) { + Segment->GetRolls( roll1, roll2 ); + } + + Output[ 0 ] = { + {fHTW * std::cos( roll1 ), -fHTW * std::sin( roll1 ), 0.f}, + normalup, + {0.5f - map1, 0.f} }; // lewy brzeg początku + Output[ 1 ] = { + {-Output[ 0 ].position.x, -Output[ 0 ].position.y, 0.f}, + normalup, + {0.5f + map1, 0.f} }; // prawy brzeg początku symetrycznie + Output[ 2 ] = { + {fHTW2 * std::cos( roll2 ), -fHTW2 * std::sin( roll2 ), 0.f}, + normalup, + {0.5f - map2, 0.f} }; // lewy brzeg końca + Output[ 3 ] = { + {-Output[ 2 ].position.x, -Output[ 2 ].position.y, 0.f}, + normalup, + {0.5f + map2, 0.f} }; // prawy brzeg początku symetrycznie + } + else { + Output[ 0 ] = { + {fHTW, 0.f, 0.f}, + normalup, + {0.5f - map1, 0.f} }; + Output[ 1 ] = { + {-fHTW, 0.f, 0.f}, + normalup, + {0.5f + map1, 0.f} }; + } +} + +void +TTrack::create_sidewalk_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition ) { + + auto const fHTW{ 0.5f * std::abs( fTrackWidth ) }; + auto const side{ std::abs( fTexWidth ) }; // szerokść podsypki na zewnątrz szyny albo pobocza + auto const slop{ std::abs( fTexSlope ) }; // brzeg zewnętrzny + auto const rozp{ fHTW + side + slop }; // brzeg zewnętrzny + + float fHTW2, side2, slop2, rozp2, fTexHeight2; + if( iTrapezoid & 2 ) { + // ten bit oznacza, że istnieje odpowiednie pNext + // Ra: jest OK + fHTW2 = 0.5f * std::fabs( trNext->fTrackWidth ); // połowa rozstawu/nawierzchni + side2 = std::fabs( trNext->fTexWidth ); + slop2 = std::fabs( trNext->fTexSlope ); // nie jest używane później + rozp2 = fHTW2 + side2 + slop2; + fTexHeight2 = trNext->fTexHeight1; + } + else { + // gdy nie ma następnego albo jest nieodpowiednim końcem podpięty + fHTW2 = fHTW; + side2 = side; + slop2 = slop; + rozp2 = rozp; + fTexHeight2 = fTexHeight1; + } + + glm::vec3 const normalup{ 0.f, 1.f, 0.f }; + + auto const texturelength{ texture_length( m_material2 ) }; + + auto const transition { ( true == Forcetransition ) || ( iTrapezoid != 0 ) }; + + auto const pointcount{ transition ? 6 : 3 }; + Right.resize( pointcount ); + Left.resize( pointcount ); + + + if( fTexHeight1 >= 0.f ) { // standardowo: od zewnątrz pochylenie, a od wewnątrz poziomo + Right[ 0 ] = { + {rozp, -fTexHeight1, 0.f}, + { 1.f, 0.f, 0.f }, + {0.f, 0.f} }; // lewy brzeg podstawy + Right[ 1 ] = { + {Road[ 0 ].position.x + side, Road[ 0 ].position.y, 0.f}, + normalup, + {0.5, 0.f} }; // lewa krawędź załamania + Right[ 2 ] = { + {Road[ 0 ].position.x, Road[ 0 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; // lewy brzeg pobocza (mapowanie może być inne + Left[ 0 ] = { + {Road[ 1 ].position.x, Road[ 1 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; // prawy brzeg pobocza + Left[ 1 ] = { + {Road[ 1 ].position.x - side, Road[ 1 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; // prawa krawędź załamania + Left[ 2 ] = { + {-rozp, -fTexHeight1, 0.f}, + { -1.f, 0.f, 0.f }, + {0.f, 0.f} }; // prawy brzeg podstawy + if( transition ) { + // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + Right[ 3 ] = { + {rozp2, -fTexHeight2, 0.f}, + { 1.f, 0.f, 0.f }, + {0.f, 0.f} }; // lewy brzeg lewego pobocza + Right[ 4 ] = { + {Road[ 2 ].position.x + side2, Road[ 2 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; // krawędź załamania + Right[ 5 ] = { + {Road[ 2 ].position.x, Road[ 2 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; // brzeg pobocza + Left[ 3 ] = { + {Road[ 3 ].position.x, Road[ 3 ].position.y, 0.f}, + normalup, + {1.f, 0.f} }; + Left[ 4 ] = { + {Road[ 3 ].position.x - side2, Road[ 3 ].position.y, 0.f}, + normalup, + {0.5f, 0.f} }; + Left[ 5 ] = { + {-rozp2, -fTexHeight2, 0.f}, + { -1.f, 0.f, 0.f }, + {0.f, 0.f} }; // prawy brzeg prawego pobocza + } + } + else { // wersja dla chodnika: skos 1:3.75, każdy chodnik innej szerokości + // mapowanie propocjonalne do szerokości chodnika + // krawężnik jest mapowany od 31/64 do 32/64 lewy i od 32/64 do 33/64 prawy + auto const d = -fTexHeight1 / 3.75f; // krawężnik o wysokości 150mm jest pochylony 40mm + auto const max = fTexRatio2 * texturelength; // test: szerokość proporcjonalna do długości + auto const map1l = ( + max > 0.f ? + side / max : + 0.484375f ); // obcięcie tekstury od lewej strony punktu 1 + auto const map1r = ( + max > 0.f ? + slop / max : + 0.484375f ); // obcięcie tekstury od prawej strony punktu 1 + auto const h1r = ( + slop > d ? + -fTexHeight1 : + 0.f ); + auto const h1l = ( + side > d ? + -fTexHeight1 : + 0.f ); + + Right[ 0 ] = { + {Road[ 0 ].position.x + slop, Road[ 0 ].position.y + h1r, 0.f}, + normalup, + {0.515625f + map1r, 0.f} }; // prawy brzeg prawego chodnika + Right[ 1 ] = { + {Road[ 0 ].position.x + d, Road[ 0 ].position.y + h1r, 0.f}, + normalup, + {0.515625f, 0.f} }; // prawy krawężnik u góry + Right[ 2 ] = { + {Road[ 0 ].position.x, Road[ 0 ].position.y, 0.f}, + { -1.f, 0.f, 0.f }, + {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu + Left[ 0 ] = { + {Road[ 1 ].position.x, Road[ 1 ].position.y, 0.f}, + { 1.f, 0.f, 0.f }, + {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu + Left[ 1 ] = { + {Road[ 1 ].position.x - d, Road[ 1 ].position.y + h1l, 0.f}, + normalup, + {0.484375f, 0.f} }; // lewy krawężnik u góry + Left[ 2 ] = { + {Road[ 1 ].position.x - side, Road[ 1 ].position.y + h1l, 0.f}, + normalup, + {0.484375f - map1l, 0.f} }; // lewy brzeg lewego chodnika + + if( transition ) { + // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka + slop2 = ( + std::fabs( ( iTrapezoid & 2 ) ? + slop2 : + slop ) ); // szerokość chodnika po prawej + auto const map2l = ( + max > 0.f ? + side2 / max : + 0.484375f ); // obcięcie tekstury od lewej strony punktu 2 + auto const map2r = ( + max > 0.f ? + slop2 / max : + 0.484375f ); // obcięcie tekstury od prawej strony punktu 2 + auto const h2r = ( + slop2 > d ? + -fTexHeight2 : + 0.f ); + auto const h2l = ( + side2 > d ? + -fTexHeight2 : + 0.f ); + + Right[ 3 ] = { + {Road[ 2 ].position.x + slop2, Road[ 2 ].position.y + h2r, 0.f}, + normalup, + {0.515625f + map2r, 0.f} }; // prawy brzeg prawego chodnika + Right[ 4 ] = { + {Road[ 2 ].position.x + d, Road[ 2 ].position.y + h2r, 0.f}, + normalup, + {0.515625f, 0.f} }; // prawy krawężnik u góry + Right[ 5 ] = { + {Road[ 2 ].position.x, Road[ 2 ].position.y, 0.f}, + { -1.f, 0.f, 0.f }, + {0.515625f - d / 2.56f, 0.f} }; // prawy krawężnik u dołu + Left[ 3 ] = { + {Road[ 3 ].position.x, Road[ 3 ].position.y, 0.f}, + { 1.f, 0.f, 0.f }, + {0.484375f + d / 2.56f, 0.f} }; // lewy krawężnik u dołu + Left[ 4 ] = { + {Road[ 3 ].position.x - d, Road[ 3 ].position.y + h2l, 0.f}, + normalup, + {0.484375f, 0.f} }; // lewy krawężnik u góry + Left[ 5 ] = { + {Road[ 3 ].position.x - side2, Road[ 3 ].position.y + h2l, 0.f}, + normalup, + {0.484375f - map2l, 0.f} }; // lewy brzeg lewego chodnika + } + } +} + +void +TTrack::create_switch_trackbed( gfx::vertex_array &Output ) { + // try to get trackbed material from a regular track connected to the primary path + if( ( trPrev != nullptr ) + && ( trPrev->eType == tt_Normal ) ) { + SwitchExtension->m_material3 = trPrev->m_material2; + } + else if( ( trNext != nullptr ) + && ( trNext->eType == tt_Normal ) ) { + SwitchExtension->m_material3 = trNext->m_material2; + } + // without material don't bother + if( SwitchExtension->m_material3 == null_handle ) { return; } + // generate trackbed for each path of the switch... + // TODO: create proper profile for each path + auto const texturelength { texture_length( SwitchExtension->m_material3 ) }; + gfx::vertex_array trackbedprofile; + gfx::vertex_array trackbedvertices1, trackbedvertices2; + create_trackbed_profile( trackbedprofile, SwitchExtension->pPrevs[ 0 ], SwitchExtension->pNexts[ 0 ] ); + SwitchExtension->Segments[ 0 ]->RenderLoft( trackbedvertices1, m_origin, trackbedprofile, -4, texturelength ); + create_trackbed_profile( trackbedprofile, SwitchExtension->pPrevs[ 1 ], SwitchExtension->pNexts[ 1 ] ); + SwitchExtension->Segments[ 1 ]->RenderLoft( trackbedvertices2, m_origin, trackbedprofile, -4, texturelength ); +// Output = trackbedvertices1; +// return; + // ...and take outer edge from each to create combined trackbed + auto const segmentsize { 8 }; + auto const segmentcount { trackbedvertices1.size() / segmentsize }; + auto const *sampler1 { trackbedvertices1.data() }; + auto const *sampler2 { trackbedvertices2.data() }; + auto const isright { SwitchExtension->RightSwitch }; + auto const isleft { false == isright }; + auto const samplersoffset { isright ? 2 : 0 }; + for( int segment = 0; segment < segmentcount; ++segment ) { + Output.emplace_back( *( sampler1 + samplersoffset + 0 ) ); if( isright ) { Output.back().position.y -= 0.02f; } + Output.emplace_back( *( sampler1 + samplersoffset + 1 ) ); if( isright ) { Output.back().position.y -= 0.02f; } + + Output.emplace_back( *( sampler1 + samplersoffset + 2 ) ); + Output.emplace_back( *( sampler1 + samplersoffset + 3 ) ); + + Output.emplace_back( *( sampler1 + samplersoffset + 4 ) ); if( isleft ) { Output.back().position.y -= 0.02f; } + Output.emplace_back( *( sampler1 + samplersoffset + 5 ) ); if( isleft ) { Output.back().position.y -= 0.02f; } + + Output.emplace_back( *( sampler2 - samplersoffset + 2 ) ); if( isleft ) { Output.back().position.y -= 0.02f; } + Output.emplace_back( *( sampler2 - samplersoffset + 3 ) ); if( isleft ) { Output.back().position.y -= 0.02f; } + + Output.emplace_back( *( sampler2 - samplersoffset + 4 ) ); + Output.emplace_back( *( sampler2 - samplersoffset + 5 ) ); + + Output.emplace_back( *( sampler2 - samplersoffset + 6 ) ); if( isright ) { Output.back().position.y -= 0.02f; } + Output.emplace_back( *( sampler2 - samplersoffset + 7 ) ); if( isright ) { Output.back().position.y -= 0.02f; } + + sampler1 += segmentsize; + sampler2 += segmentsize; + } +} + +material_handle +TTrack::copy_adjacent_trackbed_material( TTrack const *Exclude ) { + + if( iCategoryFlag != 1 ) { return null_handle; } // tracks only + + auto &material { eType == tt_Switch ? SwitchExtension->m_material3 : m_material2 }; + + if( material != null_handle ) { return material; } // already has material + + std::vector adjacents; + switch( eType ) { + case tt_Normal: { + // for regular tracks don't set the trackbed texture if we aren't sitting next to a part of a double slip + auto const hasadjacentdoubleslip { + ( trPrev ? trPrev->DoubleSlip() : false ) + || ( trNext ? trNext->DoubleSlip() : false ) }; + + if( true == hasadjacentdoubleslip ) { + adjacents.emplace_back( trPrev ); + adjacents.emplace_back( trNext ); + } + break; + } + case tt_Switch: { + // only check the neighbour on the joint side + adjacents.emplace_back( SwitchExtension->pPrevs[ 0 ] ); + break; + } + default: { + break; + } + } + + for( auto *adjacent : adjacents ) { + if( ( adjacent != nullptr ) && ( adjacent != Exclude ) ) { + material = adjacent->copy_adjacent_trackbed_material( this ); + if( material != null_handle ) { break; } // got what we wanted + } + } + + return material; +} + path_table::~path_table() { @@ -3116,6 +3103,10 @@ path_table::InitTracks() { break; } } + if( Global.CreateSwitchTrackbeds ) { + // when autogenerating trackbeds, try to restore trackbeds for tracks neighbouring double slips + track->copy_adjacent_trackbed_material(); + } break; } case tt_Switch: { @@ -3123,6 +3114,10 @@ path_table::InitTracks() { track->AssignForcedEvents( simulation::Events.FindEvent( trackname + ":forced+" ), simulation::Events.FindEvent( trackname + ":forced-" ) ); + if( Global.CreateSwitchTrackbeds ) { + // when autogenerating trackbeds, try to restore trackbeds for tracks neighbouring double slips + track->copy_adjacent_trackbed_material(); + } break; } default: { diff --git a/Track.h b/Track.h index e3ca3233..821dae90 100644 --- a/Track.h +++ b/Track.h @@ -93,6 +93,9 @@ class TSwitchExtension *evMinus = nullptr; // zdarzenia sygnalizacji rozprucia float fVelocity = -1.0; // maksymalne ograniczenie prędkości (ustawianej eventem) Math3D::vector3 vTrans; // docelowa translacja przesuwnicy + material_handle m_material3 = 0; // texture of auto generated switch trackbed + gfx::geometry_handle m_geometry3; // geometry of auto generated switch trackbed + }; class TIsolated @@ -134,7 +137,7 @@ private: // members int iAxles { 0 }; // ilość osi na odcinkach obsługiwanych przez obiekt TIsolated *pNext { nullptr }; // odcinki izolowane są trzymane w postaci listy jednikierunkowej - TIsolated *pParent { nullptr }; // optional parent piece, collecting data from its children + TIsolated *pParent { nullptr }; // optional parent piece, receiving data from its children static TIsolated *pRoot; // początek listy }; @@ -222,6 +225,7 @@ public: void ConnectPrevNext(TTrack *pNewPrev, int typ); void ConnectNextPrev(TTrack *pNewNext, int typ); void ConnectNextNext(TTrack *pNewNext, int typ); + material_handle copy_adjacent_trackbed_material( TTrack const *Exclude = nullptr ); inline double Length() const { return Segment->GetLength(); }; inline std::shared_ptr CurrentSegment() const { @@ -288,6 +292,7 @@ public: void VelocitySet(float v); double VelocityGet(); void ConnectionsLog(); + bool DoubleSlip() const; private: // radius() subclass details, calculates node's bounding radius @@ -300,6 +305,13 @@ private: void export_as_text_( std::ostream &Output ) const; // returns texture length for specified material float texture_length( material_handle const Material ); + // creates profile for a part of current path + void create_rail_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ); + void create_blade_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ); + void create_trackbed_profile( gfx::vertex_array &Output, TTrack const *Previous, TTrack const *Next ); + void create_road_profile( gfx::vertex_array &Output, bool const Forcetransition = false ); + void create_sidewalk_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition = false ); + void create_switch_trackbed( gfx::vertex_array &Output ); }; diff --git a/renderer.cpp b/renderer.cpp index bdcd6d15..883ffb47 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -2624,7 +2624,9 @@ void opengl_renderer::Render( TTrack *Track ) { if( ( Track->m_material1 == 0 ) - && ( Track->m_material2 == 0 ) ) { + && ( Track->m_material2 == 0 ) + && ( ( Track->eType != tt_Switch ) + || ( Track->SwitchExtension->m_material3 == 0 ) ) ) { return; } if( false == Track->m_visible ) { @@ -2646,6 +2648,11 @@ opengl_renderer::Render( TTrack *Track ) { Bind_Material( Track->m_material2 ); m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); } + if( ( Track->eType == tt_Switch ) + && ( Track->SwitchExtension->m_material3 != 0 ) ) { + Bind_Material( Track->SwitchExtension->m_material3 ); + m_geometry.draw( Track->SwitchExtension->m_geometry3 ); + } setup_environment_light(); break; } @@ -2666,6 +2673,11 @@ opengl_renderer::Render( TTrack *Track ) { Bind_Material( Track->m_material2 ); m_geometry.draw( std::begin( Track->Geometry2 ), std::end( Track->Geometry2 ) ); } + if( ( Track->eType == tt_Switch ) + && ( Track->SwitchExtension->m_material3 != 0 ) ) { + Bind_Material( Track->SwitchExtension->m_material3 ); + m_geometry.draw( Track->SwitchExtension->m_geometry3 ); + } break; } case rendermode::pickcontrols: @@ -2692,6 +2704,7 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, } } + // TODO: render auto generated trackbeds together with regular trackbeds in pass 1, and all rails in pass 2 // first pass, material 1 for( auto first { First }; first != Last; ++first ) { @@ -2782,6 +2795,53 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, } } } + // third pass, material 3 + for( auto first { First }; first != Last; ++first ) { + + auto const track { *first }; + + if( track->eType != tt_Switch ) { + continue; + } + if( track->SwitchExtension->m_material3 == 0 ) { + continue; + } + if( false == track->m_visible ) { + continue; + } + + switch( m_renderpass.draw_mode ) { + case rendermode::color: + case rendermode::reflections: { + if( track->eEnvironment != e_flat ) { + setup_environment_light( track->eEnvironment ); + } + Bind_Material( track->SwitchExtension->m_material3 ); + m_geometry.draw( track->SwitchExtension->m_geometry3 ); + if( track->eEnvironment != e_flat ) { + // restore default lighting + setup_environment_light(); + } + break; + } + case rendermode::shadows: { + if( ( std::abs( track->fTexHeight1 ) < 0.35f ) + || ( ( track->iCategoryFlag == 1 ) + && ( track->eType != tt_Normal ) ) ) { + // shadows are only calculated for high enough trackbeds + continue; + } + Bind_Material( track->SwitchExtension->m_material3 ); + m_geometry.draw( track->SwitchExtension->m_geometry3 ); + break; + } + case rendermode::pickscenery: // pick scenery mode uses piece-by-piece approach + case rendermode::pickcontrols: + default: { + break; + } + } + } // post-render reset switch( m_renderpass.draw_mode ) { case rendermode::shadows: { @@ -3058,7 +3118,7 @@ opengl_renderer::Render_Alpha( TTraction *Traction ) { ::glLineWidth( clamp( 0.5f * linealpha + Traction->WireThickness * Traction->radius() / 1000.f, - 1.f, 1.5f ) ); + 1.f, 1.75f ) ); // McZapkie-261102: kolor zalezy od materialu i zasniedzenia ::glColor4fv( glm::value_ptr( diff --git a/scene.cpp b/scene.cpp index 29da186f..7c334196 100644 --- a/scene.cpp +++ b/scene.cpp @@ -1156,9 +1156,28 @@ basic_region::RadioStop( glm::dvec3 const &Location ) { } } +std::vector switchtrackbedtextures { + "rozkrz8r150-1pods-new", + "rozkrz8r150-2pods-new", + "rozkrz34r150-tpbps-new2", + "rozkrz34r150-tpd1", + "rkpd34r190-tpd1", + "rkpd34r190-tpd2", + "rkpd34r190-tpd-oil2" }; + void basic_region::insert( shape_node Shape, scratch_data &Scratchpad, bool const Transform ) { + if( Global.CreateSwitchTrackbeds ) { + + auto const materialname{ GfxRenderer.Material( Shape.data().material ).name }; + for( auto const &switchtrackbedtexture : switchtrackbedtextures ) { + if( materialname.find( switchtrackbedtexture ) != std::string::npos ) { + // geometry with blacklisted texture, part of old switch trackbed; ignore it + return; + } + } + } // shape might need to be split into smaller pieces, so we create list of nodes instead of just single one // using deque so we can do single pass iterating and addding generated pieces without invalidating anything std::deque shapes { Shape }; diff --git a/simulationstateserializer.cpp b/simulationstateserializer.cpp index 0671ba44..d22a007b 100644 --- a/simulationstateserializer.cpp +++ b/simulationstateserializer.cpp @@ -433,7 +433,16 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch || ( nodedata.type == "triangle_strip" ) || ( nodedata.type == "triangle_fan" ) ) { - if( false == Scratchpad.binary.terrain ) { + auto const skip { + // all shapes will be loaded from the binary version of the file + ( true == Scratchpad.binary.terrain ) + // crude way to detect fixed switch trackbed geometry + || ( ( true == Global.CreateSwitchTrackbeds ) + && ( Input.Name().size() >= 15 ) + && ( Input.Name().substr( 0, 11 ) == "scenery/zwr" ) + && ( Input.Name().substr( Input.Name().size() - 4 ) == ".inc" ) ) }; + + if( false == skip ) { simulation::Region->insert( scene::shape_node().import( @@ -442,7 +451,6 @@ state_serializer::deserialize_node( cParser &Input, scene::scratch_data &Scratch true ); } else { - // all shapes were already loaded from the binary version of the file skip_until( Input, "endtri" ); } } diff --git a/version.h b/version.h index abf7d5cf..2ab9ae6d 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 1001 +#define VERSION_MINOR 1005 #define VERSION_REVISION 0 From 06abe187c68f931fe150808cd5950ad7b8877303 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Sun, 7 Oct 2018 15:43:30 +0200 Subject: [PATCH 420/426] build 181007. automatic switch trackbed enhancements, portal crash fix, minor bug fixes --- DynObj.cpp | 2 +- Track.cpp | 227 +++++++++++++++++++++++++--------------- Track.h | 13 ++- Train.cpp | 2 + drivermode.cpp | 5 + maszyna.vcxproj.filters | 3 + renderer.cpp | 15 ++- renderer.h | 1 + scene.cpp | 5 +- uilayer.cpp | 20 ++++ version.h | 2 +- 11 files changed, 195 insertions(+), 100 deletions(-) diff --git a/DynObj.cpp b/DynObj.cpp index dc833bd3..fc522fe6 100644 --- a/DynObj.cpp +++ b/DynObj.cpp @@ -7069,7 +7069,7 @@ vehicle_table::erase_disabled() { if( ( simulation::Train != nullptr ) && ( simulation::Train->Dynamic() == vehicle ) ) { // clear potential train binding - // TBD, TODO: manually eject the driver first ? + // TBD, TODO: kill vehicle sounds SafeDelete( simulation::Train ); } // remove potential entries in the light array diff --git a/Track.cpp b/Track.cpp index 73254f87..ca006e48 100644 --- a/Track.cpp +++ b/Track.cpp @@ -870,6 +870,13 @@ void TTrack::Load(cParser *parser, glm::dvec3 const &pOrigin) parser->getTokens(); *parser >> fVerticalRadius; } + else if( str == "trackbed" ) { + // switch trackbed texture + auto const trackbedtexture { parser->getToken() }; + if( eType == tt_Switch ) { + SwitchExtension->m_material3 = GfxRenderer.Fetch_Material( trackbedtexture ); + } + } else ErrorLog("Unknown property: \"" + str + "\" in track \"" + m_name + "\""); parser->getTokens(); @@ -1138,7 +1145,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { { // zwykla szyna: //Ra: czemu główki są asymetryczne na wysokości 0.140? gfx::vertex_array rpts1, rpts2; - create_rail_profile( rpts1, rpts2 ); + create_track_rail_profile( rpts1, rpts2 ); switch (eType) // dalej zależnie od typu { case tt_Table: // obrotnica jak zwykły tor, tylko animacja dochodzi @@ -1146,10 +1153,10 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { if (m_material2) { // podsypka z podkładami jest tylko dla zwykłego toru gfx::vertex_array bpts1; - create_trackbed_profile( bpts1, trPrev, trNext ); + create_track_bed_profile( bpts1, trPrev, trNext ); auto const texturelength { texture_length( m_material2 ) }; gfx::vertex_array vertices; - Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -4 : 4, texturelength); + Segment->RenderLoft(vertices, m_origin, bpts1, iTrapezoid ? -5 : 5, texturelength); if( ( Bank != 0 ) && ( true == Geometry2.empty() ) ) { Geometry2.emplace_back( GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ) ); } @@ -1183,7 +1190,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { if( m_material1 || m_material2 ) { // iglice liczone tylko dla zwrotnic gfx::vertex_array rpts3, rpts4; - create_blade_profile( rpts3, rpts4 ); + create_track_blade_profile( rpts3, rpts4 ); // TODO, TBD: change all track geometry to triangles, to allow packing data in less, larger buffers auto const bladelength { static_cast( std::ceil( SwitchExtension->Segments[ 0 ]->RaSegCount() * 0.65 ) ) }; if (SwitchExtension->RightSwitch) @@ -1255,7 +1262,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { if( true == Global.CreateSwitchTrackbeds ) { gfx::vertex_array vertices; create_switch_trackbed( vertices ); - SwitchExtension->m_geometry3 = GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ); + SwitchExtension->Geometry3 = GfxRenderer.Insert( vertices, Bank, GL_TRIANGLE_STRIP ); vertices.clear(); } @@ -1286,7 +1293,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { auto const slop{ std::abs( fTexSlope ) }; // brzeg zewnętrzny auto const texturelength { texture_length( m_material2 ) }; gfx::vertex_array rpts1, rpts2; // współrzędne przekroju i mapowania dla prawej i lewej strony - create_sidewalk_profile( rpts1, rpts2, bpts1 ); + create_road_side_profile( rpts1, rpts2, bpts1 ); gfx::vertex_array vertices; if( iTrapezoid ) // trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony @@ -1377,7 +1384,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { if( m_material2 ) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) gfx::vertex_array rpts1, rpts2; // współrzędne przekroju i mapowania dla prawej i lewej strony - create_sidewalk_profile( rpts1, rpts2, bpts1, true ); + create_road_side_profile( rpts1, rpts2, bpts1, true ); // Ra 2014-07: trzeba to przerobić na pętlę i pobierać profile (przynajmniej 2..4) z sąsiednich dróg bool render = ( m_material2 != 0 ); // renderować nie trzeba, ale trzeba wyznaczyć punkty brzegowe nawierzchni auto const side{ std::abs( fTexWidth ) }; // szerokść podsypki na zewnątrz szyny albo pobocza @@ -1502,7 +1509,7 @@ void TTrack::create_geometry( gfx::geometrybank_handle const &Bank ) { if (m_material2) { // pobocze drogi - poziome przy przechyłce (a może krawężnik i chodnik zrobić jak w Midtown Madness 2?) gfx::vertex_array rpts1, rpts2; // współrzędne przekroju i mapowania dla prawej i lewej strony - create_sidewalk_profile( rpts1, rpts2, bpts1 ); + create_road_side_profile( rpts1, rpts2, bpts1 ); gfx::vertex_array vertices; if (iTrapezoid) // trapez albo przechyłki { // pobocza do trapezowatej nawierzchni - dodatkowe punkty z drugiej strony odcinka @@ -1784,7 +1791,7 @@ TTrack * TTrack::RaAnimate() || ( false == Geometry2.empty() ) ) ) { // iglice liczone tylko dla zwrotnic gfx::vertex_array rpts3, rpts4; - create_blade_profile( rpts3, rpts4 ); + create_track_blade_profile( rpts3, rpts4 ); gfx::vertex_array vertices; auto const bladelength { static_cast( std::ceil( SwitchExtension->Segments[ 0 ]->RaSegCount() * 0.65 ) ) }; if (SwitchExtension->RightSwitch) @@ -2226,9 +2233,10 @@ TTrack::DoubleSlip() const { ( iCategoryFlag == 1 ) && ( eType == tt_Switch ) && ( m_name.size() > 2 ) - && ( m_name[ m_name.size() - 2 ] == '_' ) && ( m_name.back() >= 'a' ) - && ( m_name.back() <= 'd' ) ); + && ( m_name.back() <= 'd' ) + && ( ( m_name[ m_name.size() - 2 ] == '_' ) + || ( m_name.rfind( '_' ) != std::string::npos ) ) ); } @@ -2284,7 +2292,7 @@ TTrack * TTrack::Connected(int s, double &d) const // creates rail profile data for current track void -TTrack::create_rail_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ) { +TTrack::create_track_rail_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ) { auto const fHTW { 0.5f * std::abs( fTrackWidth ) }; @@ -2367,7 +2375,7 @@ TTrack::create_rail_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ) // creates switch blades profile data for current track void -TTrack::create_blade_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ) { +TTrack::create_track_blade_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ) { auto const fHTW { 0.5f * std::abs( fTrackWidth ) }; float const fHTW2 { ( @@ -2425,7 +2433,7 @@ TTrack::create_blade_profile( gfx::vertex_array &Right, gfx::vertex_array &Left // creates trackbed profile data for current track void -TTrack::create_trackbed_profile( gfx::vertex_array &Output, TTrack const *Previous, TTrack const *Next ) { +TTrack::create_track_bed_profile( gfx::vertex_array &Output, TTrack const *Previous, TTrack const *Next ) { // geometry parameters auto * profilesource = ( eType != tt_Switch ? this : @@ -2499,10 +2507,11 @@ TTrack::create_trackbed_profile( gfx::vertex_array &Output, TTrack const *Previo // profile auto const transition { ( iTrapezoid != 0 ) || ( eType == tt_Switch ) }; - auto const pointcount { transition ? 8 : 4 }; + auto const pointcount { transition ? 10 : 5 }; Output.resize( pointcount ); // potentially retrieve texture length override from the assigned material - auto const texturelength { texture_length( profilesource->m_material2 ) }; + auto const texturelength { texture_length( copy_adjacent_trackbed_material() ) }; + auto const railheight { 0.18f }; if( texturelength == 4.f ) { // stare mapowanie z różną gęstością pikseli i oddzielnymi teksturami na każdy profil auto const normalx = std::cos( glm::radians( 75.f ) ); @@ -2512,54 +2521,66 @@ TTrack::create_trackbed_profile( gfx::vertex_array &Output, TTrack const *Previo // ewentualnie poprawić mapowanie, żeby środek mapował się na 1.435/4.671 ((0.3464,0.6536) // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu Output[ 0 ] = { - {rozp, -texheight1 - 0.18f, 0.f}, + {rozp, -texheight1 - railheight, 0.f}, {normalx, normaly, 0.f}, {0.00f, 0.f} }; // lewy brzeg Output[ 1 ] = { - {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - 0.18f, 0.f}, + {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - railheight, 0.f}, {normalx, normaly, 0.f}, {0.33f, 0.f} }; // krawędź załamania Output[ 2 ] = { - {-Output[ 1 ].position.x, +( fHTW + side ) * sin1 - 0.18f, 0.f}, + {0.f, -railheight + 0.01f, 0.f}, + {0.f, 1.f, 0.f}, + {0.5f, 0.f} }; // middle + Output[ 3 ] = { + {-Output[ 1 ].position.x, +( fHTW + side ) * sin1 - railheight, 0.f}, {-normalx, normaly, 0.f}, {0.67f, 0.f} }; // prawy brzeg początku symetrycznie - Output[ 3 ] = { - {-rozp, -texheight1 - 0.18f, 0.f}, + Output[ 4 ] = { + {-rozp, -texheight1 - railheight, 0.f}, {-normalx, normaly, 0.f}, {1.f, 0.f} }; // prawy skos // końcowy przekrój - Output[ 4 ] = { - {rozp2, -fTexHeight2 - 0.18f, 0.f}, + Output[ 5 ] = { + {rozp2, -fTexHeight2 - railheight, 0.f}, {normalx, normaly, 0.f}, {0.00f, 0.f} }; // lewy brzeg - Output[ 5 ] = { - {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + Output[ 6 ] = { + {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - railheight, 0.f}, {normalx, normaly, 0.f}, {0.33f, 0.f} }; // krawędź załamania - Output[ 6 ] = { - {-Output[ 5 ].position.x, +( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + Output[ 7 ] = { + {0.f, -railheight + 0.01f, 0.f}, + {0.f, 1.f, 0.f}, + {0.5f, 0.f} }; // middle + Output[ 8 ] = { + {-Output[ 6 ].position.x, +( fHTW2 + side2 ) * sin2 - railheight, 0.f}, {-normalx, normaly, 0.f}, {0.67f, 0.f} }; // prawy brzeg początku symetrycznie - Output[ 7 ] = { - {-rozp2, -fTexHeight2 - 0.18f, 0.f}, + Output[ 9 ] = { + {-rozp2, -fTexHeight2 - railheight, 0.f}, {-normalx, normaly, 0.f}, {1.00f, 0.f} }; // prawy skos } else { Output[ 0 ] = { - {rozp, -texheight1 - 0.18f, 0.f}, + {rozp, -texheight1 - railheight, 0.f}, {normalx, normaly, 0.f}, {0.00f, 0.f} }; // lewy brzeg Output[ 1 ] = { - {fHTW + side, -0.18f, 0.f}, + {fHTW + side, -railheight, 0.f}, {normalx, normaly, 0.f}, {0.33f, 0.f} }; // krawędź załamania Output[ 2 ] = { - {-fHTW - side, -0.18f, 0.f}, + {0.f, -railheight + 0.01f, 0.f}, + {0.f, 1.f, 0.f}, + {0.5f, 0.f} }; // middle + Output[ 3 ] = { + {-fHTW - side, -railheight, 0.f}, {-normalx, normaly, 0.f}, {0.67f, 0.f} }; // druga - Output[ 3 ] = { - {-rozp, -texheight1 - 0.18f, 0.f}, + Output[ 4 ] = { + {-rozp, -texheight1 - railheight, 0.f}, {-normalx, normaly, 0.f}, {1.00f, 0.f} }; // prawy skos } @@ -2577,55 +2598,67 @@ TTrack::create_trackbed_profile( gfx::vertex_array &Output, TTrack const *Previo // ((0.3464,0.6536) // bo się tekstury podsypki rozjeżdżają po zmianie proporcji profilu Output[ 0 ] = { - {rozp, -texheight1 - 0.18f, 0.f}, + {rozp, -texheight1 - railheight, 0.f}, {normal1.x, normal1.y, 0.f}, {0.5f - map12, 0.f} }; // lewy brzeg Output[ 1 ] = { - {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - 0.18f, 0.f}, + {( fHTW + side ) * cos1, -( fHTW + side ) * sin1 - railheight, 0.f}, {normal1.x, normal1.y, 0.f}, {0.5f - map11 , 0.f} }; // krawędź załamania Output[ 2 ] = { - {-Output[ 1 ].position.x, +( fHTW + side ) * sin1 - 0.18f, 0.f}, + {0.f, -railheight + 0.01f, 0.f}, + {0.f, 1.f, 0.f}, + {0.5f, 0.f} }; // middle + Output[ 3 ] = { + {-Output[ 1 ].position.x, +( fHTW + side ) * sin1 - railheight, 0.f}, {-normal1.x, normal1.y, 0.f}, {0.5 + map11, 0.f} }; // prawy brzeg początku symetrycznie - Output[ 3 ] = { - {-rozp, -texheight1 - 0.18f, 0.f}, + Output[ 4 ] = { + {-rozp, -texheight1 - railheight, 0.f}, {-normal1.x, normal1.y, 0.f}, {0.5f + map12, 0.f} }; // prawy skos // przekrój końcowy - Output[ 4 ] = { - {rozp2, -fTexHeight2 - 0.18f, 0.f}, + Output[ 5 ] = { + {rozp2, -fTexHeight2 - railheight, 0.f}, {normal2.x, normal2.y, 0.f}, {0.5f - map22, 0.f} }; // lewy brzeg - Output[ 5 ] = { - {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + Output[ 6 ] = { + {( fHTW2 + side2 ) * cos2, -( fHTW2 + side2 ) * sin2 - railheight, 0.f}, {normal2.x, normal2.y, 0.f}, {0.5f - map21 , 0.f} }; // krawędź załamania - Output[ 6 ] = { - {-Output[ 5 ].position.x, +( fHTW2 + side2 ) * sin2 - 0.18f, 0.f}, + Output[ 7 ] = { + {0.f, -railheight + 0.01f, 0.f}, + {0.f, 1.f, 0.f}, + {0.5f, 0.f} }; // middle + Output[ 8 ] = { + {-Output[ 6 ].position.x, +( fHTW2 + side2 ) * sin2 - railheight, 0.f}, {-normal2.x, normal2.y, 0.f}, {0.5f + map21, 0.f} }; // prawy brzeg początku symetrycznie - Output[ 7 ] = { - {-rozp2, -fTexHeight2 - 0.18f, 0.f}, + Output[ 9 ] = { + {-rozp2, -fTexHeight2 - railheight, 0.f}, {-normal2.x, normal2.y, 0.f}, {0.5f + map22, 0.f} }; // prawy skos } else { Output[ 0 ] = { - {rozp, -texheight1 - 0.18f, 0.f}, + {rozp, -texheight1 - railheight, 0.f}, {+normal1.x, normal1.y, 0.f}, {0.5f - map12, 0.f} }; // lewy brzeg Output[ 1 ] = { - {fHTW + side, - 0.18f, 0.f}, + {fHTW + side, - railheight, 0.f}, {+normal1.x, normal1.y, 0.f}, {0.5f - map11, 0.f} }; // krawędź załamania Output[ 2 ] = { - {-fHTW - side, - 0.18f, 0.f}, + {0.f, -railheight + 0.01f, 0.f}, + {0.f, 1.f, 0.f}, + {0.5f, 0.f} }; // middle + Output[ 3 ] = { + {-fHTW - side, - railheight, 0.f}, {-normal1.x, normal1.y, 0.f}, {0.5f + map11, 0.f} }; // druga - Output[ 3 ] = { - {-rozp, -texheight1 - 0.18f, 0.f}, + Output[ 4 ] = { + {-rozp, -texheight1 - railheight, 0.f}, {-normal1.x, normal1.y, 0.f}, {0.5f + map12, 0.f} }; // prawy skos } @@ -2694,7 +2727,7 @@ TTrack::create_road_profile( gfx::vertex_array &Output, bool const Forcetransiti } void -TTrack::create_sidewalk_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition ) { +TTrack::create_road_side_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition ) { auto const fHTW{ 0.5f * std::abs( fTrackWidth ) }; auto const side{ std::abs( fTexWidth ) }; // szerokść podsypki na zewnątrz szyny albo pobocza @@ -2885,54 +2918,67 @@ TTrack::create_sidewalk_profile( gfx::vertex_array &Right, gfx::vertex_array &Le void TTrack::create_switch_trackbed( gfx::vertex_array &Output ) { // try to get trackbed material from a regular track connected to the primary path - if( ( trPrev != nullptr ) + if( ( SwitchExtension->m_material3 == null_handle ) + && ( trPrev != nullptr ) && ( trPrev->eType == tt_Normal ) ) { SwitchExtension->m_material3 = trPrev->m_material2; } - else if( ( trNext != nullptr ) - && ( trNext->eType == tt_Normal ) ) { + if( ( SwitchExtension->m_material3 == null_handle ) + && ( trNext != nullptr ) + && ( trNext->eType == tt_Normal ) ) { SwitchExtension->m_material3 = trNext->m_material2; } // without material don't bother if( SwitchExtension->m_material3 == null_handle ) { return; } // generate trackbed for each path of the switch... - // TODO: create proper profile for each path auto const texturelength { texture_length( SwitchExtension->m_material3 ) }; gfx::vertex_array trackbedprofile; gfx::vertex_array trackbedvertices1, trackbedvertices2; - create_trackbed_profile( trackbedprofile, SwitchExtension->pPrevs[ 0 ], SwitchExtension->pNexts[ 0 ] ); - SwitchExtension->Segments[ 0 ]->RenderLoft( trackbedvertices1, m_origin, trackbedprofile, -4, texturelength ); - create_trackbed_profile( trackbedprofile, SwitchExtension->pPrevs[ 1 ], SwitchExtension->pNexts[ 1 ] ); - SwitchExtension->Segments[ 1 ]->RenderLoft( trackbedvertices2, m_origin, trackbedprofile, -4, texturelength ); -// Output = trackbedvertices1; -// return; - // ...and take outer edge from each to create combined trackbed - auto const segmentsize { 8 }; + // main trackbed + create_track_bed_profile( trackbedprofile, SwitchExtension->pPrevs[ 0 ], SwitchExtension->pNexts[ 0 ] ); + SwitchExtension->Segments[ 0 ]->RenderLoft( trackbedvertices1, m_origin, trackbedprofile, -5, texturelength ); + // side trackbed + create_track_bed_profile( trackbedprofile, SwitchExtension->pPrevs[ 1 ], SwitchExtension->pNexts[ 1 ] ); + SwitchExtension->Segments[ 1 ]->RenderLoft( trackbedvertices2, m_origin, trackbedprofile, -5, texturelength ); + // ...then combine them into a single geometry sequence + auto const segmentsize { 10 }; auto const segmentcount { trackbedvertices1.size() / segmentsize }; - auto const *sampler1 { trackbedvertices1.data() }; - auto const *sampler2 { trackbedvertices2.data() }; + auto *sampler1 { trackbedvertices1.data() }; + auto *sampler2 { trackbedvertices2.data() }; auto const isright { SwitchExtension->RightSwitch }; auto const isleft { false == isright }; auto const samplersoffset { isright ? 2 : 0 }; + auto const geometryoffset { 0.025f }; for( int segment = 0; segment < segmentcount; ++segment ) { - Output.emplace_back( *( sampler1 + samplersoffset + 0 ) ); if( isright ) { Output.back().position.y -= 0.02f; } - Output.emplace_back( *( sampler1 + samplersoffset + 1 ) ); if( isright ) { Output.back().position.y -= 0.02f; } - - Output.emplace_back( *( sampler1 + samplersoffset + 2 ) ); - Output.emplace_back( *( sampler1 + samplersoffset + 3 ) ); - - Output.emplace_back( *( sampler1 + samplersoffset + 4 ) ); if( isleft ) { Output.back().position.y -= 0.02f; } - Output.emplace_back( *( sampler1 + samplersoffset + 5 ) ); if( isleft ) { Output.back().position.y -= 0.02f; } - - Output.emplace_back( *( sampler2 - samplersoffset + 2 ) ); if( isleft ) { Output.back().position.y -= 0.02f; } - Output.emplace_back( *( sampler2 - samplersoffset + 3 ) ); if( isleft ) { Output.back().position.y -= 0.02f; } - - Output.emplace_back( *( sampler2 - samplersoffset + 4 ) ); - Output.emplace_back( *( sampler2 - samplersoffset + 5 ) ); - - Output.emplace_back( *( sampler2 - samplersoffset + 6 ) ); if( isright ) { Output.back().position.y -= 0.02f; } - Output.emplace_back( *( sampler2 - samplersoffset + 7 ) ); if( isright ) { Output.back().position.y -= 0.02f; } - + // main trackbed + // lower outer edge to avoid z-fighting + if( isright ) { + ( sampler1 + samplersoffset + 0 )->position.y -= geometryoffset; + ( sampler1 + samplersoffset + 1 )->position.y -= geometryoffset; + } + if( isleft ) { + ( sampler1 + samplersoffset + 6 )->position.y -= geometryoffset; + ( sampler1 + samplersoffset + 7 )->position.y -= geometryoffset; + } + // copy the data + for( auto pointidx = 0; pointidx < segmentsize; ++pointidx ) { + Output.emplace_back( *( sampler1 + pointidx ) ); + } + // side trackbed + // lower outer edge to avoid z-fighting + if( isleft ) { + ( sampler2 - samplersoffset + 2 )->position.y -= geometryoffset; + ( sampler2 - samplersoffset + 3 )->position.y -= geometryoffset; + } + if( isright ) { + ( sampler2 - samplersoffset + 8 )->position.y -= geometryoffset; + ( sampler2 - samplersoffset + 9 )->position.y -= geometryoffset; + } + // copy the data + for( auto pointidx = 0; pointidx < segmentsize; ++pointidx ) { + Output.emplace_back( *( sampler2 + pointidx ) ); + } + // switch to next segment data sampler1 += segmentsize; sampler2 += segmentsize; } @@ -2951,6 +2997,7 @@ TTrack::copy_adjacent_trackbed_material( TTrack const *Exclude ) { switch( eType ) { case tt_Normal: { // for regular tracks don't set the trackbed texture if we aren't sitting next to a part of a double slip +/* auto const hasadjacentdoubleslip { ( trPrev ? trPrev->DoubleSlip() : false ) || ( trNext ? trNext->DoubleSlip() : false ) }; @@ -2959,6 +3006,16 @@ TTrack::copy_adjacent_trackbed_material( TTrack const *Exclude ) { adjacents.emplace_back( trPrev ); adjacents.emplace_back( trNext ); } +*/ + auto const hasadjacentswitch { + ( trPrev && trPrev->eType == tt_Switch ) + || ( trNext && trNext->eType == tt_Switch ) }; + +// if( true == hasadjacentdoubleslip ) { + if( true == hasadjacentswitch ) { + adjacents.emplace_back( trPrev ); + adjacents.emplace_back( trNext ); + } break; } case tt_Switch: { diff --git a/Track.h b/Track.h index 821dae90..c2384802 100644 --- a/Track.h +++ b/Track.h @@ -94,8 +94,7 @@ class TSwitchExtension float fVelocity = -1.0; // maksymalne ograniczenie prędkości (ustawianej eventem) Math3D::vector3 vTrans; // docelowa translacja przesuwnicy material_handle m_material3 = 0; // texture of auto generated switch trackbed - gfx::geometry_handle m_geometry3; // geometry of auto generated switch trackbed - + gfx::geometry_handle Geometry3; // geometry of auto generated switch trackbed }; class TIsolated @@ -306,12 +305,12 @@ private: // returns texture length for specified material float texture_length( material_handle const Material ); // creates profile for a part of current path - void create_rail_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ); - void create_blade_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ); - void create_trackbed_profile( gfx::vertex_array &Output, TTrack const *Previous, TTrack const *Next ); - void create_road_profile( gfx::vertex_array &Output, bool const Forcetransition = false ); - void create_sidewalk_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition = false ); void create_switch_trackbed( gfx::vertex_array &Output ); + void create_track_rail_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ); + void create_track_blade_profile( gfx::vertex_array &Right, gfx::vertex_array &Left ); + void create_track_bed_profile( gfx::vertex_array &Output, TTrack const *Previous, TTrack const *Next ); + void create_road_profile( gfx::vertex_array &Output, bool const Forcetransition = false ); + void create_road_side_profile( gfx::vertex_array &Right, gfx::vertex_array &Left, gfx::vertex_array const &Road, bool const Forcetransition = false ); }; diff --git a/Train.cpp b/Train.cpp index e9b0312a..e224af50 100644 --- a/Train.cpp +++ b/Train.cpp @@ -447,7 +447,9 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d) PyObject *TTrain::GetTrainState() { auto const *mover = DynamicObject->MoverParameters; + PyEval_AcquireLock(); auto *dict = PyDict_New(); + PyEval_ReleaseLock(); if( ( dict == nullptr ) || ( mover == nullptr ) ) { return nullptr; diff --git a/drivermode.cpp b/drivermode.cpp index 77dd143c..cc5d8ce1 100644 --- a/drivermode.cpp +++ b/drivermode.cpp @@ -178,6 +178,11 @@ driver_mode::update() { // variable step simulation time routines + if( ( simulation::Train == nullptr ) && ( false == FreeFlyModeFlag ) ) { + // intercept cases when the driven train got removed after entering portal + InOutKey(); + } + if( Global.changeDynObj ) { // ABu zmiana pojazdu - przejście do innego ChangeDynamic(); diff --git a/maszyna.vcxproj.filters b/maszyna.vcxproj.filters index bdbf15fc..7bf6e177 100644 --- a/maszyna.vcxproj.filters +++ b/maszyna.vcxproj.filters @@ -336,6 +336,9 @@ Source Files + + Source Files\imgui + diff --git a/renderer.cpp b/renderer.cpp index 883ffb47..a18be646 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -2651,7 +2651,7 @@ opengl_renderer::Render( TTrack *Track ) { if( ( Track->eType == tt_Switch ) && ( Track->SwitchExtension->m_material3 != 0 ) ) { Bind_Material( Track->SwitchExtension->m_material3 ); - m_geometry.draw( Track->SwitchExtension->m_geometry3 ); + m_geometry.draw( Track->SwitchExtension->Geometry3 ); } setup_environment_light(); break; @@ -2676,7 +2676,7 @@ opengl_renderer::Render( TTrack *Track ) { if( ( Track->eType == tt_Switch ) && ( Track->SwitchExtension->m_material3 != 0 ) ) { Bind_Material( Track->SwitchExtension->m_material3 ); - m_geometry.draw( Track->SwitchExtension->m_geometry3 ); + m_geometry.draw( Track->SwitchExtension->Geometry3 ); } break; } @@ -2817,7 +2817,7 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, setup_environment_light( track->eEnvironment ); } Bind_Material( track->SwitchExtension->m_material3 ); - m_geometry.draw( track->SwitchExtension->m_geometry3 ); + m_geometry.draw( track->SwitchExtension->Geometry3 ); if( track->eEnvironment != e_flat ) { // restore default lighting setup_environment_light(); @@ -2832,7 +2832,7 @@ opengl_renderer::Render( scene::basic_cell::path_sequence::const_iterator First, continue; } Bind_Material( track->SwitchExtension->m_material3 ); - m_geometry.draw( track->SwitchExtension->m_geometry3 ); + m_geometry.draw( track->SwitchExtension->Geometry3 ); break; } case rendermode::pickscenery: // pick scenery mode uses piece-by-piece approach @@ -3858,8 +3858,13 @@ opengl_renderer::Init_caps() { + " Vendor: " + std::string( (char *)glGetString( GL_VENDOR ) ) + " OpenGL Version: " + oglversion ); +#ifdef EU07_USEIMGUIIMPLOPENGL2 + if( !GLEW_VERSION_1_5 ) { + ErrorLog( "Requires openGL >= 1.5" ); +#else if( !GLEW_VERSION_3_0 ) { - ErrorLog( "Requires openGL >= 3.0" ); // technically 1.5 for now, but imgui wants more + ErrorLog( "Requires openGL >= 3.0" ); +#endif return false; } diff --git a/renderer.h b/renderer.h index 34c73e10..2ce563d8 100644 --- a/renderer.h +++ b/renderer.h @@ -25,6 +25,7 @@ http://mozilla.org/MPL/2.0/. //#define EU07_USE_DEBUG_CABSHADOWMAP //#define EU07_USE_DEBUG_CAMERA //#define EU07_USE_DEBUG_SOUNDEMITTERS +#define EU07_USEIMGUIIMPLOPENGL2 struct opengl_light : public basic_light { diff --git a/scene.cpp b/scene.cpp index 7c334196..81933f3f 100644 --- a/scene.cpp +++ b/scene.cpp @@ -1163,7 +1163,10 @@ std::vector switchtrackbedtextures { "rozkrz34r150-tpd1", "rkpd34r190-tpd1", "rkpd34r190-tpd2", - "rkpd34r190-tpd-oil2" }; + "rkpd34r190-tpd-oil2", + "zwr41r500", + "zwrot-tpd-oil1", + "zwrot34r300pods-new" }; void basic_region::insert( shape_node Shape, scratch_data &Scratchpad, bool const Transform ) { diff --git a/uilayer.cpp b/uilayer.cpp index 94ccfaea..f0d998f9 100644 --- a/uilayer.cpp +++ b/uilayer.cpp @@ -14,7 +14,11 @@ http://mozilla.org/MPL/2.0/. #include "renderer.h" #include "imgui_impl_glfw.h" +#ifdef EU07_USEIMGUIIMPLOPENGL2 +#include "imgui_impl_opengl2.h" +#else #include "imgui_impl_opengl3.h" +#endif extern "C" { @@ -74,8 +78,12 @@ ui_layer::init( GLFWwindow *Window ) { // m_imguiio->Fonts->AddFontFromFileTTF( "c:/windows/fonts/lucon.ttf", 13.0f ); ImGui_ImplGlfw_InitForOpenGL( m_window, false ); +#ifdef EU07_USEIMGUIIMPLOPENGL2 + ImGui_ImplOpenGL2_Init(); +#else // ImGui_ImplOpenGL3_Init( "#version 140" ); ImGui_ImplOpenGL3_Init(); +#endif init_colors(); @@ -119,7 +127,11 @@ ui_layer::init_colors() { void ui_layer::shutdown() { +#ifdef EU07_USEIMGUIIMPLOPENGL2 + ImGui_ImplOpenGL2_Shutdown(); +#else ImGui_ImplOpenGL3_Shutdown(); +#endif ImGui_ImplGlfw_Shutdown(); ImGui::DestroyContext(); } @@ -189,7 +201,11 @@ ui_layer::render() { ::glClientActiveTexture( m_textureunit ); ::glBindBuffer( GL_ARRAY_BUFFER, 0 ); +#ifdef EU07_USEIMGUIIMPLOPENGL2 + ImGui_ImplOpenGL2_NewFrame(); +#else ImGui_ImplOpenGL3_NewFrame(); +#endif ImGui_ImplGlfw_NewFrame(); ImGui::NewFrame(); @@ -199,7 +215,11 @@ ui_layer::render() { render_(); ImGui::Render(); +#ifdef EU07_USEIMGUIIMPLOPENGL2 + ImGui_ImplOpenGL2_RenderDrawData( ImGui::GetDrawData() ); +#else ImGui_ImplOpenGL3_RenderDrawData( ImGui::GetDrawData() ); +#endif ::glPopClientAttrib(); } diff --git a/version.h b/version.h index 2ab9ae6d..452cdd08 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 1005 +#define VERSION_MINOR 1007 #define VERSION_REVISION 0 From 9cacf191c60046853da1947eead273e9a9db326d Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Tue, 9 Oct 2018 18:48:24 +0200 Subject: [PATCH 421/426] submodel opacity parameter, additional light blinking modes, scenario event queue filtering --- AnimModel.cpp | 110 +++++++++++++++++++++++++++++++++++++-------- AnimModel.h | 11 +++-- Driver.cpp | 4 +- Model3d.cpp | 23 +++++++++- Model3d.h | 6 ++- Traction.cpp | 2 +- driveruipanels.cpp | 68 +++++++++++++++------------- driveruipanels.h | 3 +- renderer.cpp | 36 +++++++++++---- 9 files changed, 195 insertions(+), 68 deletions(-) diff --git a/AnimModel.cpp b/AnimModel.cpp index be263b5b..c004a647 100644 --- a/AnimModel.cpp +++ b/AnimModel.cpp @@ -444,8 +444,9 @@ bool TAnimModel::Init(std::string const &asName, std::string const &asReplacable // tekstura nieprzezroczysta - nie renderować w cyklu przezroczystych m_materialdata.textures_alpha = 0x30300030; } - - fBlinkTimer = double( Random( 1000 * fOffTime ) ) / ( 1000 * fOffTime ); + +// TODO: redo the random timer initialization +// fBlinkTimer = Random() * ( fOnTime + fOffTime ); pModel = TModelsManager::GetModel( asName ); return ( pModel != nullptr ); @@ -547,9 +548,73 @@ void TAnimModel::RaAnimate( unsigned int const Framestamp ) { if( Framestamp == m_framestamp ) { return; } - fBlinkTimer -= Timer::GetDeltaTime(); - if( fBlinkTimer <= 0 ) - fBlinkTimer += fOffTime; + auto const timedelta { Timer::GetDeltaTime() }; + + // interpretacja ułamka zależnie od typu + // case ls_Off: ustalenie czasu migotania, t<1s (f>1Hz), np. 0.1 => t=0.1 (f=10Hz) + // case ls_On: ustalenie wypełnienia ułamkiem, np. 1.25 => zapalony przez 1/4 okresu + // case ls_Blink: ustalenie częstotliwości migotania, f<1Hz (t>1s), np. 2.2 => f=0.2Hz (t=5s) + float modeintegral, modefractional; + for( int idx = 0; idx < iNumLights; ++idx ) { + + modefractional = std::modf( std::abs( lsLights[ idx ] ), &modeintegral ); + + if( modeintegral >= ls_Dark ) { + // light threshold modes don't use timers + continue; + } + auto const mode { static_cast( modeintegral ) }; + + auto &opacity { m_lightopacities[ idx ] }; + auto &timer { m_lighttimers[ idx ] }; + if( ( modeintegral < ls_Blink ) && ( modefractional < 0.01f ) ) { + // simple flip modes + switch( mode ) { + case ls_Off: { + // reduce to zero + timer = std::max( 0.f, timer - timedelta ); + break; + } + case ls_On: { + // increase to max value + timer = std::min( fTransitionTime, timer + timedelta ); + break; + } + default: { + break; + } + } + opacity = timer / fTransitionTime; + } + else { + // blink modes + auto const ontime { ( + ( mode == ls_Blink ) ? ( ( modefractional < 0.01f ) ? fOnTime : ( 1.f / modefractional ) * 0.5f ) : + ( mode == ls_Off ) ? modefractional * 0.5f : + ( mode == ls_On ) ? modefractional * ( fOnTime + fOffTime ) : + fOnTime ) }; // fallback + auto const offtime { ( + ( mode == ls_Blink ) ? ( ( modefractional < 0.01f ) ? fOffTime : ontime ) : + ( mode == ls_Off ) ? ontime : + ( mode == ls_On ) ? ( fOnTime + fOffTime ) - ontime : + fOffTime ) }; // fallback + auto const transitiontime { + std::min( + 1.f, + std::min( ontime, offtime ) * 0.9f ) }; + + timer = clamp_circular( timer + timedelta * ( lsLights[ idx ] > 0.f ? 1.f : -1.f ), ontime + offtime ); + // set opacity depending on blink stage + if( timer < ontime ) { + // blink on + opacity = clamp( timer / transitiontime, 0.f, 1.f ); + } + else { + // blink off + opacity = 1.f - clamp( ( timer - ontime ) / transitiontime, 0.f, 1.f ); + } + } + } // Ra 2F1I: to by można pomijać dla modeli bez animacji, których jest większość TAnimContainer *pCurrent; @@ -568,17 +633,19 @@ void TAnimModel::RaPrepare() bool state; // stan światła for (int i = 0; i < iNumLights; ++i) { - auto const lightmode { static_cast( lsLights[ i ] ) }; + auto const lightmode { static_cast( std::abs( lsLights[ i ] ) ) }; switch( lightmode ) { case ls_On: - case ls_Off: { - // zapalony albo zgaszony - state = ( lightmode == ls_On ); - break; - } + case ls_Off: case ls_Blink: { - // migotanie - state = ( fBlinkTimer < fOnTime ); + if (LightsOn[i]) { + LightsOn[i]->iVisible = ( m_lightopacities[i] > 0.f ); + LightsOn[i]->SetVisibilityLevel( m_lightopacities[i], true, false ); + } + if (LightsOff[i]) { + LightsOff[i]->iVisible = ( m_lightopacities[i] < 1.f ); + LightsOff[i]->SetVisibilityLevel( 1.f, true, false ); + } break; } case ls_Dark: { @@ -606,10 +673,16 @@ void TAnimModel::RaPrepare() break; } } - if (LightsOn[i]) - LightsOn[i]->iVisible = state; - if (LightsOff[i]) - LightsOff[i]->iVisible = !state; + if( lightmode >= ls_Dark ) { + // crude as hell but for test will do :x + if (LightsOn[i]) { + LightsOn[i]->iVisible = state; + // TODO: set visibility for the entire submodel's children as well + LightsOn[i]->fVisible = m_lightopacities[i]; + } + if (LightsOff[i]) + LightsOff[i]->iVisible = !state; + } } TSubModel::iInstance = reinterpret_cast( this ); //żeby nie robić cudzych animacji TSubModel::pasText = &asText; // przekazanie tekstu do wyświetlacza (!!!! do przemyślenia) @@ -774,8 +847,9 @@ void TAnimModel::AnimationVND(void *pData, double a, double b, double c, double //--------------------------------------------------------------------------- void TAnimModel::LightSet(int const n, float const v) { // ustawienie światła (n) na wartość (v) - if (n >= iMaxNumLights) + if( n >= iMaxNumLights ) { return; // przekroczony zakres + } lsLights[ n ] = v; }; diff --git a/AnimModel.h b/AnimModel.h index 6384f164..63f06a59 100644 --- a/AnimModel.h +++ b/AnimModel.h @@ -179,7 +179,7 @@ private: // members TAnimContainer *pRoot { nullptr }; // pojemniki sterujące, tylko dla aniomowanych submodeli TModel3d *pModel { nullptr }; - double fBlinkTimer { 0.0 }; +// double fBlinkTimer { 0.0 }; int iNumLights { 0 }; TSubModel *LightsOn[ iMaxNumLights ]; // Ra: te wskaźniki powinny być w ramach TModel3d TSubModel *LightsOff[ iMaxNumLights ]; @@ -188,10 +188,13 @@ private: std::string asText; // tekst dla wyświetlacza znakowego TAnimAdvanced *pAdvanced { nullptr }; + // TODO: wrap into a light state struct float lsLights[ iMaxNumLights ]; -// float fDark { DefaultDarkThresholdLevel }; // poziom zapalanie światła (powinno być chyba powiązane z danym światłem?) - float fOnTime { 0.66f }; - float fOffTime { 0.66f + 0.66f }; // były stałymi, teraz mogą być zmienne dla każdego egzemplarza + std::array m_lighttimers { 0.f }; + std::array m_lightopacities { 1.f }; + float fOnTime { 1.f / 2 };// { 60.f / 45.f / 2 }; + float fOffTime { 1.f / 2 };// { 60.f / 45.f / 2 }; // były stałymi, teraz mogą być zmienne dla każdego egzemplarza + float fTransitionTime { fOnTime * 0.9f }; // time unsigned int m_framestamp { 0 }; // id of last rendered gfx frame }; diff --git a/Driver.cpp b/Driver.cpp index ddba2e45..1a7daf0a 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -342,8 +342,8 @@ std::string TSpeedPos::TableText() const { // pozycja tabelki pr?dko?ci if (iFlags & spEnabled) { // o ile pozycja istotna - return "Flags:" + to_hex_str(iFlags, 8) + ", Dist:" + to_string(fDist, 1, 6) + - ", Vel:" + (fVelNext == -1.0 ? " - " : to_string(static_cast(fVelNext), 0, 3)) + ", Name:" + GetName(); + return to_hex_str(iFlags, 8) + " " + to_string(fDist, 1, 6) + + " " + (fVelNext == -1.0 ? " -" : to_string(static_cast(fVelNext), 0, 3)) + " " + GetName(); } return "Empty"; } diff --git a/Model3d.cpp b/Model3d.cpp index 272cb7cb..ecf7ed53 100644 --- a/Model3d.cpp +++ b/Model3d.cpp @@ -71,6 +71,23 @@ void TSubModel::Name(std::string const &Name) pName = Name; }; +// sets visibility level (alpha component) to specified value +void +TSubModel::SetVisibilityLevel( float const Level, bool const Includechildren, bool const Includesiblings ) { + + fVisible = Level; + if( true == Includesiblings ) { + auto sibling { this }; + while( ( sibling = sibling->Next ) != nullptr ) { + sibling->SetVisibilityLevel( Level, Includechildren, false ); // no need for all siblings to duplicate the work + } + } + if( ( true == Includechildren ) + && ( Child != nullptr ) ) { + Child->SetVisibilityLevel( Level, Includechildren, true ); // node's children include child's siblings and children + } +} + // sets light level (alpha component of illumination color) to specified value void TSubModel::SetLightLevel( float const Level, bool const Includechildren, bool const Includesiblings ) { @@ -1313,7 +1330,8 @@ void TSubModel::serialize(std::ostream &s, else sn_utils::ls_int32(s, (int32_t)get_container_pos(textures, m_materialname)); - sn_utils::ls_float32(s, fVisible); +// sn_utils::ls_float32(s, fVisible); + sn_utils::ls_float32(s, 1.f); sn_utils::ls_float32(s, fLight); sn_utils::s_vec4(s, f4Ambient); @@ -1433,7 +1451,8 @@ void TSubModel::deserialize(std::istream &s) tVboPtr = sn_utils::ld_int32(s); iTexture = sn_utils::ld_int32(s); - fVisible = sn_utils::ld_float32(s); +// fVisible = sn_utils::ld_float32(s); + auto discard = sn_utils::ld_float32(s); fLight = sn_utils::ld_float32(s); f4Ambient = sn_utils::d_vec4(s); diff --git a/Model3d.h b/Model3d.h index 7c8317a1..68a82983 100644 --- a/Model3d.h +++ b/Model3d.h @@ -98,7 +98,6 @@ private: int iNumVerts { -1 }; // ilość wierzchołków (1 dla FreeSpotLight) int tVboPtr; // początek na liście wierzchołków albo indeksów int iTexture { 0 }; // numer nazwy tekstury, -1 wymienna, 0 brak - float fVisible { 0.0f }; // próg jasności światła do załączenia submodelu float fLight { -1.0f }; // próg jasności światła do zadziałania selfillum glm::vec4 f4Ambient { 1.0f,1.0f,1.0f,1.0f }, @@ -140,7 +139,8 @@ public: // chwilowo float4x4 *mAnimMatrix{ nullptr }; // macierz do animacji kwaternionowych (należy do AnimContainer) TSubModel **smLetter{ nullptr }; // wskaźnik na tablicę submdeli do generoania tekstu (docelowo zapisać do E3D) TSubModel *Parent{ nullptr }; // nadrzędny, np. do wymnażania macierzy - int iVisible{ 1 }; // roboczy stan widoczności + int iVisible { 1 }; // roboczy stan widoczności + float fVisible { 1.f }; // visibility level std::string m_materialname; // robocza nazwa tekstury do zapisania w pliku binarnym std::string pName; // robocza nazwa private: @@ -192,6 +192,8 @@ public: int Flags() const { return iFlags; }; void UnFlagNext() { iFlags &= 0x00FFFFFF; }; void ColorsSet( glm::vec3 const &Ambient, glm::vec3 const &Diffuse, glm::vec3 const &Specular ); + // sets visibility level (alpha component) to specified value + void SetVisibilityLevel( float const Level, bool const Includechildren = false, bool const Includesiblings = false ); // sets light level (alpha component of illumination color) to specified value void SetLightLevel( float const Level, bool const Includechildren = false, bool const Includesiblings = false ); inline float3 Translation1Get() { diff --git a/Traction.cpp b/Traction.cpp index 28ff95a7..9839ea64 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -565,7 +565,7 @@ TTraction::wire_color() const { color.r *= Global.DayLight.ambient[ 0 ]; color.g *= Global.DayLight.ambient[ 1 ]; color.b *= Global.DayLight.ambient[ 2 ]; - color *= 0.5f; + color *= 0.35f; } else { // tymczasowo pokazanie zasilanych odcinków diff --git a/driveruipanels.cpp b/driveruipanels.cpp index ceb9253f..71572dc1 100644 --- a/driveruipanels.cpp +++ b/driveruipanels.cpp @@ -356,7 +356,10 @@ debug_panel::render() { render_section( "Vehicle AI", m_ailines ); render_section( "Vehicle Scan Table", m_scantablelines ); render_section( "Scenario", m_scenariolines ); - render_section( "Scenario Event Queue", m_eventqueuelines ); + if( true == render_section( "Scenario Event Queue", m_eventqueuelines ) ) { + // event queue filter + ImGui::Checkbox( "By This Vehicle Only", &m_eventqueueactivevehicleonly ); + } render_section( "Camera", m_cameralines ); render_section( "Gfx Renderer", m_rendererlines ); // toggles @@ -764,6 +767,8 @@ debug_panel::update_section_scantable( std::vector &Output ) { if( m_input.mechanik == nullptr ) { return; } + Output.emplace_back( "Flags: Dist: Vel: Name:", Global.UITextColor ); + auto const &mechanik{ *m_input.mechanik }; std::size_t i = 0; std::size_t const speedtablesize = clamp( static_cast( mechanik.TableSize() ) - 1, 0, 30 ); @@ -773,8 +778,8 @@ debug_panel::update_section_scantable( std::vector &Output ) { Output.emplace_back( Bezogonkow( scanline ), Global.UITextColor ); ++i; } while( i < speedtablesize ); - if( Output.empty() ) { - Output.emplace_back( "(no points of interest)", Global.UITextColor ); + if( Output.size() == 1 ) { + Output.front().data = "(no points of interest)"; } } @@ -787,7 +792,8 @@ debug_panel::update_section_scenario( std::vector &Output ) { Output.emplace_back( textline, Global.UITextColor ); // current luminance level - textline = "Light level: " + to_string( Global.fLuminance, 3 ); + textline = "Cloud cover: " + to_string( Global.Overcast, 3 ); + textline += "\nLight level: " + to_string( Global.fLuminance, 3 ); if( Global.FakeLight ) { textline += "(*)"; } textline += "\nAir temperature: " + to_string( Global.AirTemperature, 1 ) + " deg C"; @@ -799,32 +805,33 @@ debug_panel::update_section_eventqueue( std::vector &Output ) { std::string textline; - // current event queue - auto const time { Timer::GetTime() }; - auto const *event { simulation::Events.begin() }; - auto eventtableindex{ 0 }; - while( ( event != nullptr ) - && ( eventtableindex < 30 ) ) { + // current event queue + auto const time { Timer::GetTime() }; + auto const *event { simulation::Events.begin() }; - if( ( false == event->m_ignored ) - && ( false == event->m_passive ) ) { + Output.emplace_back( "Delay: Event:", Global.UITextColor ); - auto const delay { " " + to_string( std::max( 0.0, event->m_launchtime - time ), 1 ) }; - textline = - "Delay: " + delay.substr( delay.length() - 6 ) - + ", Event: " + event->m_name - + ( event->m_activator ? " (by: " + event->m_activator->asName + ")" : "" ) - + ( event->m_sibling ? " (joint event)" : "" ); + while( ( event != nullptr ) + && ( Output.size() < 30 ) ) { - Output.emplace_back( textline, Global.UITextColor ); - ++eventtableindex; - } - event = event->m_next; - } - if( Output.empty() ) { - textline = "(no queued events)"; - Output.emplace_back( textline, Global.UITextColor ); - } + if( ( false == event->m_ignored ) + && ( false == event->m_passive ) + && ( ( false == m_eventqueueactivevehicleonly ) + || ( event->m_activator == m_input.vehicle ) ) ) { + + auto const delay { " " + to_string( std::max( 0.0, event->m_launchtime - time ), 1 ) }; + textline = delay.substr( delay.length() - 6 ) + + " " + event->m_name + + ( event->m_activator ? " (by: " + event->m_activator->asName + ")" : "" ) + + ( event->m_sibling ? " (joint event)" : "" ); + + Output.emplace_back( textline, Global.UITextColor ); + } + event = event->m_next; + } + if( Output.size() == 1 ) { + Output.front().data = "(no queued events)"; + } } void @@ -888,15 +895,16 @@ debug_panel::update_section_renderer( std::vector &Output ) { Output.emplace_back( GfxRenderer.info_stats(), Global.UITextColor ); } -void +bool debug_panel::render_section( std::string const &Header, std::vector const &Lines ) { - if( Lines.empty() ) { return; } - if( false == ImGui::CollapsingHeader( Header.c_str() ) ) { return; } + if( true == Lines.empty() ) { return false; } + if( false == ImGui::CollapsingHeader( Header.c_str() ) ) { return false; } for( auto const &line : Lines ) { ImGui::TextColored( ImVec4( line.color.r, line.color.g, line.color.b, line.color.a ), line.data.c_str() ); } + return true; } void diff --git a/driveruipanels.h b/driveruipanels.h index abd09a3f..505565be 100644 --- a/driveruipanels.h +++ b/driveruipanels.h @@ -76,7 +76,7 @@ private: std::string update_vehicle_coupler( int const Side ); std::string update_vehicle_brake() const; // renders provided lines, under specified collapsing header - void render_section( std::string const &Header, std::vector const &Lines ); + bool render_section( std::string const &Header, std::vector const &Lines ); // members std::array m_buffer; input_data m_input; @@ -92,6 +92,7 @@ private: int tprev { 0 }; // poprzedni czas double VelPrev { 0.0 }; // poprzednia prędkość double Acc { 0.0 }; // przyspieszenie styczne + bool m_eventqueueactivevehicleonly { false }; }; class transcripts_panel : public ui_panel { diff --git a/renderer.cpp b/renderer.cpp index a18be646..f172bf0b 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -2409,7 +2409,20 @@ opengl_renderer::Render( TSubModel *Submodel ) { Bind_Material( Submodel->m_material ); } // ...colors... - ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub + if( Submodel->fVisible < 1.f ) { + // setup + ::glAlphaFunc( GL_GREATER, 0.f ); + ::glEnable( GL_BLEND ); + ::glColor4f( + Submodel->f4Diffuse.r, + Submodel->f4Diffuse.g, + Submodel->f4Diffuse.b, + Submodel->fVisible ); + } + else { + ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub + } + // ...specular... if( ( true == m_renderspecular ) && ( m_sunlight.specular.a > 0.01f ) ) { // specular strength in legacy models is set uniformly to 150, 150, 150 so we scale it down for opaque elements ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * m_sunlight.specular.a * m_specularopaquescalefactor ) ); @@ -2441,6 +2454,10 @@ opengl_renderer::Render( TSubModel *Submodel ) { } */ // post-draw reset + if( Submodel->fVisible < 1.f ) { + ::glAlphaFunc( GL_GREATER, 0.5f ); + ::glDisable( GL_BLEND ); + } if( ( true == m_renderspecular ) && ( m_sunlight.specular.a > 0.01f ) ) { ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( colors::none ) ); } @@ -2535,7 +2552,7 @@ opengl_renderer::Render( TSubModel *Submodel ) { // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances float const distancefactor { std::max( 0.5f, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / Submodel->fSquareMaxDist ) }; - float const precipitationfactor { std::max( 1.f, Global.Overcast - 1.f ) }; + float const precipitationfactor { std::max( 1.f, 0.5f * ( Global.Overcast - 1.f ) ) }; if( lightlevel > 0.f ) { // material configuration: @@ -2543,9 +2560,11 @@ opengl_renderer::Render( TSubModel *Submodel ) { Bind_Material( null_handle ); ::glPointSize( std::max( 3.f, 5.f * distancefactor * anglefactor ) ); - ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], std::min( 1.f, lightlevel * anglefactor * precipitationfactor ) ); + ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], Submodel->fVisible * std::min( 1.f, lightlevel * anglefactor * precipitationfactor ) ); ::glDisable( GL_LIGHTING ); + ::glDisable( GL_FOG ); ::glEnable( GL_BLEND ); + ::glAlphaFunc( GL_GREATER, 0.f ); ::glPushMatrix(); ::glLoadIdentity(); @@ -3439,10 +3458,10 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { float glarelevel = 0.6f; // luminosity at night is at level of ~0.1, so the overall resulting transparency in clear conditions is ~0.5 at full 'brightness' if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) { // only bother if the viewer is inside the visibility cone - auto glarelevel { clamp( - 0.6f - - Global.fLuminance // reduce the glare in bright daylight - + std::max( 0.f, Global.Overcast - 1.f ), // increase the glare in rainy/foggy conditions + auto glarelevel { clamp( + std::max( + 0.6f - Global.fLuminance, // reduce the glare in bright daylight + Global.Overcast - 1.f ), // ensure some glare in rainy/foggy conditions 0.f, 1.f ) }; // scale it down based on view angle glarelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); @@ -3452,8 +3471,9 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { ::glPushAttrib( GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT ); Bind_Texture( m_glaretexture ); - ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], glarelevel ); + ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], Submodel->fVisible * glarelevel ); ::glDisable( GL_LIGHTING ); + ::glDisable( GL_FOG ); ::glDepthMask( GL_FALSE ); ::glBlendFunc( GL_SRC_ALPHA, GL_ONE ); From 8a904f4da3192164b4f512291f6e11cc56e512a3 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Wed, 10 Oct 2018 18:44:39 +0200 Subject: [PATCH 422/426] build 181010. ai disconnect logic tweak, fog-driven freespot blur --- Driver.cpp | 251 ++++++++++++++++++++++++++------------------------- renderer.cpp | 66 +++++++++----- renderer.h | 1 + version.h | 2 +- 4 files changed, 174 insertions(+), 146 deletions(-) diff --git a/Driver.cpp b/Driver.cpp index 1a7daf0a..1ad4807e 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -4262,123 +4262,6 @@ TController::UpdateSituation(double dt) { fMaxProximityDist = 10.0; //[m] fVelPlus = 1.0; // dopuszczalne przekroczenie prędkości na ograniczeniu bez hamowania fVelMinus = 0.5; // margines prędkości powodujący załączenie napędu - if (AIControllFlag) { - if (iVehicleCount >= 0) { - // jeśli była podana ilość wagonów - if (iDrivigFlags & movePress) { - // jeśli dociskanie w celu odczepienia - // 3. faza odczepiania. - SetVelocity(2, 0); // jazda w ustawionym kierunku z prędkością 2 - if ((mvControlling->MainCtrlPos > 0) || - (mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic)) // jeśli jazda - { - WriteLog(mvOccupied->Name + " odczepianie w kierunku " + std::to_string(mvOccupied->DirAbsolute)); - TDynamicObject *p = - pVehicle; // pojazd do odczepienia, w (pVehicle) siedzi AI - int d; // numer sprzęgu, który sprawdzamy albo odczepiamy - int n = iVehicleCount; // ile wagonów ma zostać - do - { // szukanie pojazdu do odczepienia - d = p->DirectionGet() > 0 ? - 0 : - 1; // numer sprzęgu od strony czoła składu - // if (p->MoverParameters->Couplers[d].CouplerType==Articulated) - // //jeśli sprzęg typu wózek (za mało) - if (p->MoverParameters->Couplers[d].CouplingFlag & - ctrain_depot) // jeżeli sprzęg zablokowany - // if (p->GetTrack()->) //a nie stoi na torze warsztatowym - // (ustalić po czym poznać taki tor) - ++n; // to liczymy człony jako jeden - p->MoverParameters->BrakeReleaser(1); // wyluzuj pojazd, aby dało się dopychać - p->MoverParameters->BrakeLevelSet(0); // hamulec na zero, aby nie hamował - if (n) - { // jeśli jeszcze nie koniec - p = p->Prev(); // kolejny w stronę czoła składu (licząc od - // tyłu), bo dociskamy - if (!p) - iVehicleCount = -2, - n = 0; // nie ma co dalej sprawdzać, doczepianie zakończone - } - } while (n--); - if( p ? p->MoverParameters->Couplers[ d ].CouplingFlag == coupling::faux : true ) { - // no target, or already just virtual coupling - WriteLog( mvOccupied->Name + " didn't find anything to disconnect." ); - iVehicleCount = -2; // odczepiono, co było do odczepienia - } else if ( p->Dettach(d) == coupling::faux ) { - // tylko jeśli odepnie - WriteLog( mvOccupied->Name + " odczepiony." ); - iVehicleCount = -2; - } // a jak nie, to dociskać dalej - } - if (iVehicleCount >= 0) // zmieni się po odczepieniu - if (!mvOccupied->DecLocalBrakeLevel(1)) - { // dociśnij sklad - WriteLog( mvOccupied->Name + " dociskanie..." ); - // mvOccupied->BrakeReleaser(); //wyluzuj lokomotywę - // Ready=true; //zamiast sprawdzenia odhamowania całego składu - IncSpeed(); // dla (Ready)==false nie ruszy - } - } - if ((mvOccupied->Vel < 0.01) && !(iDrivigFlags & movePress)) - { // 2. faza odczepiania: zmień kierunek na przeciwny i dociśnij - // za radą yB ustawiamy pozycję 3 kranu (ruszanie kranem w innych miejscach - // powino zostać wyłączone) - // WriteLog("Zahamowanie składu"); - mvOccupied->BrakeLevelSet( - mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic ? - 1 : - 3 ); - double p = mvOccupied->BrakePressureActual.PipePressureVal; - if( p < 3.9 ) { - // tu może być 0 albo -1 nawet - // TODO: zabezpieczenie przed dziwnymi CHK do czasu wyjaśnienia sensu 0 oraz -1 w tym miejscu - p = 3.9; - } - if (mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic ? - mvOccupied->BrakePress > 2 : - mvOccupied->PipePress < p + 0.1) - { // jeśli w miarę został zahamowany (ciśnienie mniejsze niż podane na - // pozycji 3, zwyle 0.37) - if (mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic) - mvOccupied->BrakeLevelSet(0); // wyłączenie EP, gdy wystarczy (może - // nie być potrzebne, bo na początku - // jest) - WriteLog("Luzowanie lokomotywy i zmiana kierunku"); - mvOccupied->BrakeReleaser(1); // wyluzuj lokomotywę; a ST45? - mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); // zwolnienie hamulca - iDrivigFlags |= movePress; // następnie będzie dociskanie - DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na przeciwny (dociskanie) - CheckVehicles(); // od razu zmienić światła (zgasić) - bez tego się nie odczepi -/* - // NOTE: disabled to prevent closing the door before passengers can disembark - fStopTime = 0.0; // nie ma na co czekać z odczepianiem -*/ - } - } - else { - if( mvOccupied->Vel > 0.01 ) { - // 1st phase(?) - // bring it to stop if it's not already stopped - SetVelocity( 0, 0, stopJoin ); // wyłączyć przyspieszanie - } - } - } // odczepiania - else // to poniżej jeśli ilość wagonów ujemna - if (iDrivigFlags & movePress) - { // 4. faza odczepiania: zwolnij i zmień kierunek - SetVelocity(0, 0, stopJoin); // wyłączyć przyspieszanie - if (!DecSpeed()) // jeśli już bardziej wyłączyć się nie da - { // ponowna zmiana kierunku - WriteLog( mvOccupied->Name + " ponowna zmiana kierunku" ); - DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na właściwy - iDrivigFlags &= ~movePress; // koniec dociskania - JumpToNextOrder(); // zmieni światła - TableClear(); // skanowanie od nowa - iDrivigFlags &= ~moveStartHorn; // bez trąbienia przed ruszeniem - SetVelocity(fShuntVelocity, fShuntVelocity); // ustawienie prędkości jazdy - } - } - } break; } case Shunt: { @@ -4593,10 +4476,13 @@ TController::UpdateSituation(double dt) { } // ustalanie zadanej predkosci - if (iDrivigFlags & moveActive) // jeśli może skanować sygnały i reagować na komendy - { // jeśli jest wybrany kierunek jazdy, można ustalić prędkość jazdy - // Ra: tu by jeszcze trzeba było wstawić uzależnienie (VelDesired) od odległości od - // przeszkody + if (iDrivigFlags & moveActive) { + + SetDriverPsyche(); // ustawia AccPreferred (potrzebne tu?) + + // jeśli może skanować sygnały i reagować na komendy + // jeśli jest wybrany kierunek jazdy, można ustalić prędkość jazdy + // Ra: tu by jeszcze trzeba było wstawić uzależnienie (VelDesired) od odległości od przeszkody // no chyba żeby to uwzgldnić już w (ActualProximityDist) VelDesired = fVelMax; // wstępnie prędkość maksymalna dla pojazdu(-ów), będzie // następnie ograniczana @@ -4605,9 +4491,6 @@ TController::UpdateSituation(double dt) { // jeśli ma rozkład i ograniczenie w rozkładzie to nie przekraczać rozkladowej VelDesired = min_speed( VelDesired, TrainParams->TTVmax ); } - - SetDriverPsyche(); // ustawia AccPreferred (potrzebne tu?) - // szukanie optymalnych wartości AccDesired = AccPreferred; // AccPreferred wynika z osobowości mechanika VelNext = VelDesired; // maksymalna prędkość wynikająca z innych czynników niż trajektoria ruchu @@ -4655,6 +4538,126 @@ TController::UpdateSituation(double dt) { default: break; } + // disconnect mode potentially overrides scan results + // TBD: when in this mode skip scanning altogether? + if( ( OrderCurrentGet() & Disconnect ) != 0 ) { + + if (AIControllFlag) { + if (iVehicleCount >= 0) { + // jeśli była podana ilość wagonów + if (iDrivigFlags & movePress) { + // jeśli dociskanie w celu odczepienia + // 3. faza odczepiania. + SetVelocity(2, 0); // jazda w ustawionym kierunku z prędkością 2 + if ((mvControlling->MainCtrlPos > 0) || + (mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic)) // jeśli jazda + { + WriteLog(mvOccupied->Name + " odczepianie w kierunku " + std::to_string(mvOccupied->DirAbsolute)); + TDynamicObject *p = + pVehicle; // pojazd do odczepienia, w (pVehicle) siedzi AI + int d; // numer sprzęgu, który sprawdzamy albo odczepiamy + int n = iVehicleCount; // ile wagonów ma zostać + do + { // szukanie pojazdu do odczepienia + d = p->DirectionGet() > 0 ? + 0 : + 1; // numer sprzęgu od strony czoła składu + // if (p->MoverParameters->Couplers[d].CouplerType==Articulated) + // //jeśli sprzęg typu wózek (za mało) + if (p->MoverParameters->Couplers[d].CouplingFlag & ctrain_depot) // jeżeli sprzęg zablokowany + // if (p->GetTrack()->) //a nie stoi na torze warsztatowym + // (ustalić po czym poznać taki tor) + ++n; // to liczymy człony jako jeden + p->MoverParameters->BrakeReleaser(1); // wyluzuj pojazd, aby dało się dopychać + p->MoverParameters->BrakeLevelSet(0); // hamulec na zero, aby nie hamował + if (n) + { // jeśli jeszcze nie koniec + p = p->Prev(); // kolejny w stronę czoła składu (licząc od + // tyłu), bo dociskamy + if (!p) + iVehicleCount = -2, + n = 0; // nie ma co dalej sprawdzać, doczepianie zakończone + } + } while (n--); + if( p ? p->MoverParameters->Couplers[ d ].CouplingFlag == coupling::faux : true ) { + // no target, or already just virtual coupling + WriteLog( mvOccupied->Name + " didn't find anything to disconnect." ); + iVehicleCount = -2; // odczepiono, co było do odczepienia + } else if ( p->Dettach(d) == coupling::faux ) { + // tylko jeśli odepnie + WriteLog( mvOccupied->Name + " odczepiony." ); + iVehicleCount = -2; + } // a jak nie, to dociskać dalej + } + if (iVehicleCount >= 0) // zmieni się po odczepieniu + if (!mvOccupied->DecLocalBrakeLevel(1)) + { // dociśnij sklad + WriteLog( mvOccupied->Name + " dociskanie..." ); + // mvOccupied->BrakeReleaser(); //wyluzuj lokomotywę + // Ready=true; //zamiast sprawdzenia odhamowania całego składu + IncSpeed(); // dla (Ready)==false nie ruszy + } + } + if ((mvOccupied->Vel < 0.01) && !(iDrivigFlags & movePress)) + { // 2. faza odczepiania: zmień kierunek na przeciwny i dociśnij + // za radą yB ustawiamy pozycję 3 kranu (ruszanie kranem w innych miejscach + // powino zostać wyłączone) + // WriteLog("Zahamowanie składu"); + mvOccupied->BrakeLevelSet( + mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic ? + 1 : + 3 ); + double p = mvOccupied->BrakePressureActual.PipePressureVal; + if( p < 3.9 ) { + // tu może być 0 albo -1 nawet + // TODO: zabezpieczenie przed dziwnymi CHK do czasu wyjaśnienia sensu 0 oraz -1 w tym miejscu + p = 3.9; + } + if (mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic ? + mvOccupied->BrakePress > 2 : + mvOccupied->PipePress < p + 0.1) + { // jeśli w miarę został zahamowany (ciśnienie mniejsze niż podane na + // pozycji 3, zwyle 0.37) + if (mvOccupied->BrakeSystem == TBrakeSystem::ElectroPneumatic) + mvOccupied->BrakeLevelSet(0); // wyłączenie EP, gdy wystarczy (może + // nie być potrzebne, bo na początku jest) + WriteLog("Luzowanie lokomotywy i zmiana kierunku"); + mvOccupied->BrakeReleaser(1); // wyluzuj lokomotywę; a ST45? + mvOccupied->DecLocalBrakeLevel(LocalBrakePosNo); // zwolnienie hamulca + iDrivigFlags |= movePress; // następnie będzie dociskanie + DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na przeciwny (dociskanie) + CheckVehicles(); // od razu zmienić światła (zgasić) - bez tego się nie odczepi + /* + // NOTE: disabled to prevent closing the door before passengers can disembark + fStopTime = 0.0; // nie ma na co czekać z odczepianiem + */ + } + } + else { + if( mvOccupied->Vel > 0.01 ) { + // 1st phase(?) + // bring it to stop if it's not already stopped + SetVelocity( 0, 0, stopJoin ); // wyłączyć przyspieszanie + } + } + } // odczepiania + else // to poniżej jeśli ilość wagonów ujemna + if (iDrivigFlags & movePress) + { // 4. faza odczepiania: zwolnij i zmień kierunek + SetVelocity(0, 0, stopJoin); // wyłączyć przyspieszanie + if (!DecSpeed()) // jeśli już bardziej wyłączyć się nie da + { // ponowna zmiana kierunku + WriteLog( mvOccupied->Name + " ponowna zmiana kierunku" ); + DirectionForward(mvOccupied->ActiveDir < 0); // zmiana kierunku jazdy na właściwy + iDrivigFlags &= ~movePress; // koniec dociskania + JumpToNextOrder(); // zmieni światła + TableClear(); // skanowanie od nowa + iDrivigFlags &= ~moveStartHorn; // bez trąbienia przed ruszeniem + SetVelocity(fShuntVelocity, fShuntVelocity); // ustawienie prędkości jazdy + } + } + } + } if( true == TestFlag( OrderList[ OrderPos ], Change_direction ) ) { // if ordered to change direction, try to stop diff --git a/renderer.cpp b/renderer.cpp index f172bf0b..521c2cab 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -1058,9 +1058,9 @@ opengl_renderer::setup_drawing( bool const Alpha ) { // setup fog if( Global.fFogEnd > 0 ) { // fog setup - auto const adjustedfogrange { Global.fFogEnd / std::max( 1.f, Global.Overcast * 2.f ) }; + m_fogrange = Global.fFogEnd / std::max( 1.f, Global.Overcast * 2.f ); ::glFogfv( GL_FOG_COLOR, glm::value_ptr( Global.FogColor ) ); - ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / adjustedfogrange ) ); + ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / m_fogrange ) ); ::glEnable( GL_FOG ); } else { ::glDisable( GL_FOG ); } @@ -2549,44 +2549,65 @@ opengl_renderer::Render( TSubModel *Submodel ) { float const anglefactor = clamp( ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( Submodel->fCosHotspotAngle - Submodel->fCosFalloffAngle ), 0.f, 1.f ); - // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation - // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances - float const distancefactor { std::max( 0.5f, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / Submodel->fSquareMaxDist ) }; - float const precipitationfactor { std::max( 1.f, 0.5f * ( Global.Overcast - 1.f ) ) }; + lightlevel *= anglefactor; + float const precipitationfactor { interpolate( 1.f, 0.25f, clamp( Global.Overcast * 0.75f - 0.5f, 0.f, 1.f ) ) }; + lightlevel *= precipitationfactor; if( lightlevel > 0.f ) { - // material configuration: - ::glPushAttrib( GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); + // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation + // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances + float const distancefactor { std::max( 0.5f, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / Submodel->fSquareMaxDist ) }; + auto const pointsize { std::max( 3.f, 5.f * distancefactor * anglefactor ) }; + // material configuration: Bind_Material( null_handle ); - ::glPointSize( std::max( 3.f, 5.f * distancefactor * anglefactor ) ); - ::glColor4f( Submodel->f4Diffuse[ 0 ], Submodel->f4Diffuse[ 1 ], Submodel->f4Diffuse[ 2 ], Submodel->fVisible * std::min( 1.f, lightlevel * anglefactor * precipitationfactor ) ); + // limit impact of dense fog on the lights + ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / std::min( Global.fFogEnd, m_fogrange * 2 ) ) ); + + ::glPushAttrib( GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_POINT_BIT ); ::glDisable( GL_LIGHTING ); - ::glDisable( GL_FOG ); ::glEnable( GL_BLEND ); ::glAlphaFunc( GL_GREATER, 0.f ); ::glPushMatrix(); ::glLoadIdentity(); ::glTranslatef( lightcenter.x, lightcenter.y, lightcenter.z ); // początek układu zostaje bez zmian -/* - setup_shadow_color( colors::white ); -*/ + auto const unitstate = m_unitstate; switch_units( m_unitstate.diffuse, false, false ); // main draw call + if( Global.Overcast > 1.f ) { + // fake fog halo + float const fogfactor { + interpolate( + 2.f, 1.f, + clamp( Global.fFogEnd / 2000, 0.f, 1.f ) ) + * std::max( 1.f, Global.Overcast ) }; + ::glPointSize( pointsize * fogfactor ); + ::glColor4f( + Submodel->f4Diffuse[ 0 ], + Submodel->f4Diffuse[ 1 ], + Submodel->f4Diffuse[ 2 ], + Submodel->fVisible * std::min( 1.f, lightlevel ) * 0.5f ); + ::glDepthMask( GL_FALSE ); + m_geometry.draw( Submodel->m_geometry ); + ::glDepthMask( GL_TRUE ); + } + ::glPointSize( pointsize ); + ::glColor4f( + Submodel->f4Diffuse[ 0 ], + Submodel->f4Diffuse[ 1 ], + Submodel->f4Diffuse[ 2 ], + Submodel->fVisible * std::min( 1.f, lightlevel ) ); m_geometry.draw( Submodel->m_geometry ); // post-draw reset - // re-enable shadows -/* - setup_shadow_color( m_shadowcolor ); -*/ switch_units( unitstate.diffuse, unitstate.shadows, unitstate.reflections ); ::glPopMatrix(); ::glPopAttrib(); + ::glFogf( GL_FOG_DENSITY, static_cast( 1.0 / m_fogrange ) ); } } break; @@ -3455,16 +3476,19 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { static_cast( TSubModel::fSquareDist / Submodel->fSquareMaxDist ) ); // pozycja punktu świecącego względem kamery Submodel->fCosViewAngle = glm::dot( glm::normalize( modelview * glm::vec4( 0.f, 0.f, -1.f, 1.f ) - lightcenter ), glm::normalize( -lightcenter ) ); - float glarelevel = 0.6f; // luminosity at night is at level of ~0.1, so the overall resulting transparency in clear conditions is ~0.5 at full 'brightness' if( Submodel->fCosViewAngle > Submodel->fCosFalloffAngle ) { // only bother if the viewer is inside the visibility cone + // luminosity at night is at level of ~0.1, so the overall resulting transparency in clear conditions is ~0.5 at full 'brightness' auto glarelevel { clamp( std::max( 0.6f - Global.fLuminance, // reduce the glare in bright daylight Global.Overcast - 1.f ), // ensure some glare in rainy/foggy conditions 0.f, 1.f ) }; - // scale it down based on view angle - glarelevel *= ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( 1.0f - Submodel->fCosFalloffAngle ); + // view angle attenuation + float const anglefactor { clamp( + ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( Submodel->fCosHotspotAngle - Submodel->fCosFalloffAngle ), + 0.f, 1.f ) }; + glarelevel *= anglefactor; if( glarelevel > 0.0f ) { // setup diff --git a/renderer.h b/renderer.h index 2ce563d8..bf6c6d5f 100644 --- a/renderer.h +++ b/renderer.h @@ -386,6 +386,7 @@ private: glm::vec4 m_baseambient { 0.0f, 0.0f, 0.0f, 1.0f }; glm::vec4 m_shadowcolor { colors::shadow }; + float m_fogrange { 2000.f }; // TEnvironmentType m_environment { e_flat }; float m_specularopaquescalefactor { 1.f }; float m_speculartranslucentscalefactor { 1.f }; diff --git a/version.h b/version.h index 452cdd08..195f3b38 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 1007 +#define VERSION_MINOR 1010 #define VERSION_REVISION 0 From 67211a43525e9946ba6eefaf829ae7b23e3cf490 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 11 Oct 2018 15:18:26 +0200 Subject: [PATCH 423/426] build 181011. door locking cab indicator, freespot opacity tweak --- Train.cpp | 4 ++++ Train.h | 1 + renderer.cpp | 31 +++++++++++++++++++++++-------- translation.cpp | 2 +- version.h | 2 +- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/Train.cpp b/Train.cpp index e224af50..3bc3d315 100644 --- a/Train.cpp +++ b/Train.cpp @@ -5512,6 +5512,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaDoorLeft.Turn(mvOccupied->DoorLeftOpened); btLampkaDoorRight.Turn(mvOccupied->DoorRightOpened); btLampkaBlokadaDrzwi.Turn(mvOccupied->DoorBlockedFlag()); + btLampkaDoorLockOff.Turn( false == mvOccupied->DoorLockEnabled ); btLampkaDepartureSignal.Turn( mvControlled->DepartureSignal ); btLampkaNapNastHam.Turn((mvControlled->ActiveDir != 0) && (mvOccupied->EpFuse)); // napiecie na nastawniku hamulcowym btLampkaForward.Turn(mvControlled->ActiveDir > 0); // jazda do przodu @@ -5570,6 +5571,7 @@ bool TTrain::Update( double const Deltatime ) btLampkaDoorLeft.Turn( false ); btLampkaDoorRight.Turn( false ); btLampkaBlokadaDrzwi.Turn( false ); + btLampkaDoorLockOff.Turn( false ); btLampkaDepartureSignal.Turn( false ); btLampkaNapNastHam.Turn( false ); btLampkaForward.Turn( false ); @@ -7142,6 +7144,7 @@ void TTrain::clear_cab_controls() btLampkaRadioStop.Clear(); btLampkaHamulecReczny.Clear(); btLampkaBlokadaDrzwi.Clear(); + btLampkaDoorLockOff.Clear(); btInstrumentLight.Clear(); btDashboardLight.Clear(); btTimetableLight.Clear(); @@ -7503,6 +7506,7 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co { "i-radiostop:", btLampkaRadioStop }, { "i-manual_brake:", btLampkaHamulecReczny }, { "i-door_blocked:", btLampkaBlokadaDrzwi }, + { "i-door_blockedoff:", btLampkaDoorLockOff }, { "i-slippery:", btLampkaPoslizg }, { "i-contactors:", btLampkaStyczn }, { "i-conv_ovld:", btLampkaNadmPrzetw }, diff --git a/Train.h b/Train.h index dd6296dd..de0888ab 100644 --- a/Train.h +++ b/Train.h @@ -540,6 +540,7 @@ public: // reszta może by?publiczna TButton btLampkaDoorRight; TButton btLampkaDepartureSignal; TButton btLampkaBlokadaDrzwi; + TButton btLampkaDoorLockOff; TButton btLampkaHamulecReczny; TButton btLampkaForward; // Ra: lampki w przód i w ty?dla komputerowych kabin TButton btLampkaBackward; diff --git a/renderer.cpp b/renderer.cpp index 521c2cab..f8f81058 100644 --- a/renderer.cpp +++ b/renderer.cpp @@ -2550,15 +2550,21 @@ opengl_renderer::Render( TSubModel *Submodel ) { ( Submodel->fCosViewAngle - Submodel->fCosFalloffAngle ) / ( Submodel->fCosHotspotAngle - Submodel->fCosFalloffAngle ), 0.f, 1.f ); lightlevel *= anglefactor; - float const precipitationfactor { interpolate( 1.f, 0.25f, clamp( Global.Overcast * 0.75f - 0.5f, 0.f, 1.f ) ) }; - lightlevel *= precipitationfactor; + // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation + // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances + float const distancefactor { std::max( 0.5f, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / Submodel->fSquareMaxDist ) }; + auto const pointsize { std::max( 3.f, 5.f * distancefactor * anglefactor ) }; + // additionally reduce light strength for farther sources in rain or snow + if( Global.Overcast > 0.75f ) { + float const precipitationfactor{ + interpolate( + interpolate( 1.f, 0.25f, clamp( Global.Overcast * 0.75f - 0.5f, 0.f, 1.f ) ), + 1.f, + distancefactor ) }; + lightlevel *= precipitationfactor; + } if( lightlevel > 0.f ) { - // distance attenuation. NOTE: since it's fixed pipeline with built-in gamma correction we're using linear attenuation - // we're capping how much effect the distance attenuation can have, otherwise the lights get too tiny at regular distances - float const distancefactor { std::max( 0.5f, ( Submodel->fSquareMaxDist - TSubModel::fSquareDist ) / Submodel->fSquareMaxDist ) }; - auto const pointsize { std::max( 3.f, 5.f * distancefactor * anglefactor ) }; - // material configuration: Bind_Material( null_handle ); // limit impact of dense fog on the lights @@ -3393,7 +3399,16 @@ opengl_renderer::Render_Alpha( TSubModel *Submodel ) { Bind_Material( Submodel->m_material ); } // ...colors... - ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub + if( Submodel->fVisible < 1.f ) { + ::glColor4f( + Submodel->f4Diffuse.r, + Submodel->f4Diffuse.g, + Submodel->f4Diffuse.b, + Submodel->fVisible ); + } + else { + ::glColor3fv( glm::value_ptr( Submodel->f4Diffuse ) ); // McZapkie-240702: zamiast ub + } if( ( true == m_renderspecular ) && ( m_sunlight.specular.a > 0.01f ) ) { ::glMaterialfv( GL_FRONT, GL_SPECULAR, glm::value_ptr( Submodel->f4Specular * m_sunlight.specular.a * m_speculartranslucentscalefactor ) ); } diff --git a/translation.cpp b/translation.cpp index c9bc66f9..1ffa38f9 100644 --- a/translation.cpp +++ b/translation.cpp @@ -276,7 +276,7 @@ init() { "kurek trojdrogowy pantografow", "ogrzewanie pociagu", "sygnalizacja hamowania", - "sygnalizacja blokady drzwi", + "blokada drzwi", "prady drugiego czlonu", "oswietlenie przyrzadow", "oswietlenie pulpitu", diff --git a/version.h b/version.h index 195f3b38..534a83d6 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 18 -#define VERSION_MINOR 1010 +#define VERSION_MINOR 1011 #define VERSION_REVISION 0 From 77d2b33af8401a8aacadfc6e5beeaf9d58df8fda Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Thu, 11 Oct 2018 17:25:35 +0200 Subject: [PATCH 424/426] path uv mapping fix --- Segment.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Segment.cpp b/Segment.cpp index 0bc1c272..92a3a9ca 100644 --- a/Segment.cpp +++ b/Segment.cpp @@ -393,7 +393,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori float m1, jmm1, m2, jmm2; // pozycje względne na odcinku 0...1 (ale nie parametr Beziera) step = fStep; - tv1 = 0.0; // Ra: to by można było wyliczać dla odcinka, wyglądało by lepiej + tv1 = 1.0; // Ra: to by można było wyliczać dla odcinka, wyglądało by lepiej s = fStep * iSkip; // iSkip - ile odcinków z początku pominąć int i = iSkip; // domyślnie 0 t = fTsBuffer[ i ]; // tabela wattości t dla segmentów @@ -431,7 +431,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori while( tv1 < 0.0 ) { tv1 += 1.0; } - tv2 = tv1 + step / texturelength; // mapowanie na końcu segmentu + tv2 = tv1 - step / texturelength; // mapowanie na końcu segmentu t = fTsBuffer[ i ]; // szybsze od GetTFromS(s); pos2 = glm::dvec3{ FastGetPoint( t ) - Origin }; @@ -455,7 +455,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori Output.emplace_back( pt, glm::normalize( norm ), - glm::vec2 { 1.f - ( jmm1 * ShapePoints[ j ].texture.x + m1 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv1 } ); + glm::vec2 { ( jmm1 * ShapePoints[ j ].texture.x + m1 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv1 } ); } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -475,7 +475,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori Output.emplace_back( pt, glm::normalize( norm ), - glm::vec2 { 1.f - ( jmm2 * ShapePoints[ j ].texture.x + m2 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv2 } ); + glm::vec2 { ( jmm2 * ShapePoints[ j ].texture.x + m2 * ShapePoints[ j + iNumShapePoints ].texture.x ) / texturescale, tv2 } ); } if( p ) // jeśli jest wskaźnik do tablicy if( *p ) @@ -499,7 +499,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori Output.emplace_back( pt, glm::normalize( norm ), - glm::vec2 { 1.f - ShapePoints[ j ].texture.x / texturescale, tv1 } ); + glm::vec2 { ShapePoints[ j ].texture.x / texturescale, tv1 } ); pt = parallel2 * ShapePoints[ j ].position.x + pos2; pt.y += ShapePoints[ j ].position.y; @@ -510,7 +510,7 @@ bool TSegment::RenderLoft( gfx::vertex_array &Output, Math3D::vector3 const &Ori Output.emplace_back( pt, glm::normalize( norm ), - glm::vec2 { 1.f - ShapePoints[ j ].texture.x / texturescale, tv2 } ); + glm::vec2 { ShapePoints[ j ].texture.x / texturescale, tv2 } ); } } } From f8c2f17f8229ccfe830455e51c1f39dce3e6c365 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 12 Oct 2018 00:05:14 +0200 Subject: [PATCH 425/426] material priority tweak, traction geometry creation fix --- Traction.cpp | 8 +++----- material.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Traction.cpp b/Traction.cpp index 9839ea64..5981f614 100644 --- a/Traction.cpp +++ b/Traction.cpp @@ -286,14 +286,12 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { // Przewody pionowe (wieszaki) 'Marcin, poprawki na 2 przewody jezdne 'Winger if( Wires > 1 ) { + auto const flo { static_cast( Wires == 4 ? 0.25f * fHeightDifference : 0 ) }; + auto const flo1 { static_cast( Wires == 4 ? +0.05 : 0 ) }; for( int i = 0; i < iNumSections - 1; ++i ) { - float flo, flo1; - flo = ( Wires == 4 ? 0.25f * fHeightDifference : 0 ); - flo1 = ( Wires == 4 ? +0.05 : 0 ); pt3 = pPoint3 + v1 * f; pt4 = pPoint1 + v2 * f; t = ( 1 - std::fabs( f - mid ) * 2 ); - if( ( i % 2 ) == 0 ) { startvertex.position = glm::vec3( @@ -318,7 +316,7 @@ TTraction::create_geometry( gfx::geometrybank_handle const &Bank ) { glm::vec3( pt4.x + ( pPoint2.z / ddp - pPoint1.z / ddp ) * WireOffset - m_origin.x, pt4.y - m_origin.y, - pt4.z - ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z ); + pt4.z + ( -pPoint2.x / ddp + pPoint1.x / ddp ) * WireOffset - m_origin.z ); vertices.emplace_back( startvertex ); vertices.emplace_back( endvertex ); } diff --git a/material.cpp b/material.cpp index f83c5e58..d8402acf 100644 --- a/material.cpp +++ b/material.cpp @@ -54,7 +54,7 @@ opengl_material::deserialize_mapping( cParser &Input, int const Priority, bool c // seasonal textures override generic textures // skip the opening bracket auto const value { Input.getToken( true, "\n\r\t ;" ) }; - while( true == deserialize_mapping( Input, 1, Loadnow ) ) { + while( true == deserialize_mapping( Input, Priority + 1, Loadnow ) ) { ; // all work is done in the header } } From 44b652cc5ef25352630c9aa9b57fe72180e5e899 Mon Sep 17 00:00:00 2001 From: tmj-fstate Date: Fri, 12 Oct 2018 03:17:10 +0200 Subject: [PATCH 426/426] ai direction change logic tweak --- Driver.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Driver.cpp b/Driver.cpp index 1ad4807e..3de429cd 100644 --- a/Driver.cpp +++ b/Driver.cpp @@ -502,6 +502,10 @@ void TController::TableTraceRoute(double fDistance, TDynamicObject *pVehicle) tLast = nullptr; //żaden nie sprawdzony SemNextIndex = -1; SemNextStopIndex = -1; + if( VelSignalLast == 0.0 ) { + // don't allow potential red light overrun keep us from reversing + VelSignalLast = -1.0; + } fTrackLength = pTrack->Length(); //skasowanie zmian w zmiennej żeby poprawnie liczyło w dalszych krokach MoveDistanceReset(); // AI startuje 1s po zaczęciu jazdy i mógł już coś przejechać }

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 diff --git a/opengl/glew32s.lib b/opengl/glew32s.lib deleted file mode 100644 index 18510029c78364637fc65df33c1c80a7868bb152..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2141998 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